diff --git a/src/bootsupport/modules/logger-0.9.5.tm b/src/bootsupport/modules/logger-0.9.5.tm
new file mode 100644
index 00000000..739e1c91
--- /dev/null
+++ b/src/bootsupport/modules/logger-0.9.5.tm
@@ -0,0 +1,1297 @@
+# logger.tcl --
+#
+#   Tcl implementation of a general logging facility.
+#
+# Copyright (c) 2003      by David N. Welton <davidw@dedasys.com>
+# Copyright (c) 2004-2011 by Michael Schlenker <mic42@users.sourceforge.net>
+# Copyright (c) 2006,2015 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file license.terms.
+
+# The logger package provides an 'object oriented' log facility that
+# lets you have trees of services, that inherit from one another.
+# This is accomplished through the use of Tcl namespaces.
+
+
+package require Tcl 8.5 9
+package provide logger 0.9.5
+
+namespace eval ::logger {
+    namespace eval tree {}
+    namespace export init enable disable services servicecmd import
+
+    # The active services.
+    variable services {}
+
+    # The log 'levels'.
+    variable levels [list debug info notice warn error critical alert emergency]
+
+    # The default global log level used for new logging services
+    variable enabled "debug"
+
+    # Tcl return codes (in numeric order)
+    variable RETURN_CODES   [list "ok" "error" "return" "break" "continue"]
+}
+
+# Try to load msgcat and fall back to format if it fails
+if {[catch {package require msgcat}]} {
+  interp alias {} ::logger::mc {} ::format
+} else {
+  namespace eval ::logger {
+    namespace import ::msgcat::mc
+  }
+}
+
+# ::logger::_nsExists --
+#
+#   Workaround for missing namespace exists in Tcl 8.2 and 8.3.
+#
+
+if {[package vcompare [package provide Tcl] 8.4] < 0} {
+    proc ::logger::_nsExists {ns} {
+        expr {![catch {namespace parent $ns}]}
+    }
+} else {
+    proc ::logger::_nsExists {ns} {
+        namespace exists $ns
+    }
+}
+
+# ::logger::_cmdPrefixExists --
+#
+# Utility function to check if a given callback prefix exists,
+# this should catch all oddities in prefix names, including spaces,
+# glob patterns, non normalized namespaces etc.
+#
+# Arguments:
+#   prefix - The command prefix to check
+#
+# Results:
+#   1 or 0 for yes or no
+#
+proc ::logger::_cmdPrefixExists {prefix} {
+    set cmd [lindex $prefix 0]
+    set full [namespace eval :: namespace which [list $cmd]]
+    if {[string equal $full ""]} {return 0} else {return 1}
+    # normalize namespaces
+    set ns [namespace qualifiers $cmd]
+    set cmd ${ns}::[namespace tail $cmd]
+    set matches [::info commands ${ns}::*]
+    if {[lsearch -exact $matches $cmd] != -1} {return 1}
+    return 0
+}
+
+# ::logger::walk --
+#
+#   Walk namespaces, starting in 'start', and evaluate 'code' in
+#   them.
+#
+# Arguments:
+#   start - namespace to start in.
+#   code - code to execute in namespaces walked.
+#
+# Side Effects:
+#   Side effects of code executed.
+#
+# Results:
+#   None.
+
+proc ::logger::walk { start code } {
+    set children [namespace children $start]
+    foreach c $children {
+    logger::walk $c $code
+    namespace eval $c $code
+    }
+}
+
+proc ::logger::init {service} {
+    variable levels
+    variable services
+    variable enabled
+
+    if {[string length [string trim $service {:}]] == 0} {
+        return -code error \
+               -errorcode [list LOGGER EMPTY_SERVICENAME] \
+               [::logger::mc "Service name invalid. May not consist only of : or be empty"]
+    }
+    # We create a 'tree' namespace to house all the services, so
+    # they are in a 'safe' namespace sandbox, and won't overwrite
+    # any commands.
+    namespace eval tree::${service} {
+        variable service
+        variable levels
+        variable oldname
+        variable enabled
+    }
+
+    lappend services $service
+
+    set [namespace current]::tree::${service}::service $service
+    set [namespace current]::tree::${service}::levels $levels
+    set [namespace current]::tree::${service}::oldname $service
+    set [namespace current]::tree::${service}::enabled $enabled
+
+    namespace eval tree::${service} {
+	# Callback to use when the service in question is shut down.
+	variable delcallback [namespace current]::no-op
+
+	# Callback when the loglevel is changed
+	variable levelchangecallback [namespace current]::no-op
+
+	# State variable to decide when to call levelcallback
+	variable inSetLevel 0
+
+	# The currently configured levelcommands
+	variable lvlcmds
+	array set lvlcmds {}
+
+	# List of procedures registered via the trace command
+	variable traceList ""
+
+	# Flag indicating whether or not tracing is currently enabled
+	variable tracingEnabled 0
+
+	# We use this to disable a service completely.  In Tcl 8.4
+	# or greater, by using this, disabled log calls are a
+	# no-op!
+
+	proc no-op args {}
+
+	proc stdoutcmd {level text} {
+	    variable service
+	    puts "\[[clock format [clock seconds]]\] \[$service\] \[$level\] \'$text\'"
+	}
+
+	proc stderrcmd {level text} {
+	    variable service
+	    puts stderr "\[[clock format [clock seconds]]\] \[$service\] \[$level\] \'$text\'"
+	}
+
+
+	# setlevel --
+	#
+	#   This command differs from enable and disable in that
+	#   it disables all the levels below that selected, and
+	#   then enables all levels above it, which enable/disable
+	#   do not do.
+	#
+	# Arguments:
+	#   lv - the level, as defined in $levels.
+	#
+	# Side Effects:
+	#   Runs disable for the level, and then enable, in order
+	#   to ensure that all levels are set correctly.
+	#
+	# Results:
+	#   None.
+
+
+	proc setlevel {lv} {
+	    variable inSetLevel 1
+	    set oldlvl [currentloglevel]
+
+	    # do not allow enable and disable to do recursion
+	    if {[catch {
+		disable $lv 0
+		set newlvl [enable $lv 0]
+	    } msg] == 1} {
+		return -code error -errorcode $::errorCode $msg
+	    }
+	    # do the recursion here
+	    logger::walk [namespace current] [list setlevel $lv]
+
+	    set inSetLevel 0
+	    lvlchangewrapper $oldlvl $newlvl
+	    return
+	}
+
+	# enable --
+	#
+	#   Enable a particular 'level', and above, for the
+	#   service, and its 'children'.
+	#
+	# Arguments:
+	#   lv - the level, as defined in $levels.
+	#
+	# Side Effects:
+	#   Enables logging for the particular level, and all
+	#   above it (those more important).  It also walks
+	#   through all services that are 'children' and enables
+	#   them at the same level or above.
+	#
+	# Results:
+	#   None.
+
+	proc enable {lv {recursion 1}} {
+	    variable levels
+	    set lvnum [lsearch -exact $levels $lv]
+	    if { $lvnum == -1 } {
+		return -code error \
+		    -errorcode [list LOGGER INVALID_LEVEL] \
+		    [::logger::mc "Invalid level '%s' - levels are %s" $lv $levels]
+	    }
+
+	    variable enabled
+	    set newlevel $enabled
+	    set elnum [lsearch -exact $levels $enabled]
+	    if {($elnum == -1) || ($elnum > $lvnum)} {
+		set newlevel $lv
+	    }
+
+	    variable service
+	    while { $lvnum <  [llength $levels] } {
+		interp alias {} [namespace current]::[lindex $levels $lvnum] \
+		    {} [namespace current]::[lindex $levels $lvnum]cmd
+		incr lvnum
+	    }
+
+	    if {$recursion} {
+		logger::walk [namespace current] [list enable $lv]
+	    }
+	    lvlchangewrapper $enabled $newlevel
+	    set enabled $newlevel
+	}
+
+	# disable --
+	#
+	#   Disable a particular 'level', and below, for the
+	#   service, and its 'children'.
+	#
+	# Arguments:
+	#   lv - the level, as defined in $levels.
+	#
+	# Side Effects:
+	#   Disables logging for the particular level, and all
+	#   below it (those less important).  It also walks
+	#   through all services that are 'children' and disables
+	#   them at the same level or below.
+	#
+	# Results:
+	#   None.
+
+	proc disable {lv {recursion 1}} {
+	    variable levels
+	    set lvnum [lsearch -exact $levels $lv]
+	    if { $lvnum == -1 } {
+		return -code error \
+		    -errorcode [list LOGGER INVALID_LEVEL] \
+		    [::logger::mc "Invalid level '%s' - levels are %s" $lv $levels]
+	    }
+
+	    variable enabled
+	    set newlevel $enabled
+	    set elnum [lsearch -exact $levels $enabled]
+	    if {($elnum > -1) && ($elnum <= $lvnum)} {
+		if {$lvnum+1 >= [llength $levels]} {
+		    set newlevel "none"
+		} else {
+		    set newlevel [lindex $levels [expr {$lvnum+1}]]
+		}
+	    }
+
+	    while { $lvnum >= 0 } {
+
+		interp alias {} [namespace current]::[lindex $levels $lvnum] {} \
+		    [namespace current]::no-op
+		incr lvnum -1
+	    }
+	    if {$recursion} {
+		logger::walk [namespace current] [list disable $lv]
+	    }
+	    lvlchangewrapper $enabled $newlevel
+	    set enabled $newlevel
+	}
+
+	# currentloglevel --
+	#
+	#   Get the currently enabled log level for this service.
+	#
+	# Arguments:
+	#   none
+	#
+	# Side Effects:
+	#   none
+	#
+	# Results:
+	#   current log level
+	#
+
+	proc currentloglevel {} {
+	    variable enabled
+	    return $enabled
+	}
+
+	# lvlchangeproc --
+	#
+	#   Set or introspect a callback for when the logger instance
+	#   changes its loglevel.
+	#
+	# Arguments:
+	#   cmd - the Tcl command to call, it is called with two parameters, old and new log level.
+	#   or none for introspection
+	#
+	# Side Effects:
+	#   None.
+	#
+	# Results:
+	#   If no arguments are given return the current callback cmd.
+
+	proc lvlchangeproc {args} {
+	    variable levelchangecallback
+
+	    switch -exact -- [llength [::info level 0]] {
+                1   {return $levelchangecallback}
+                2   {
+		    if {[::logger::_cmdPrefixExists [lindex $args 0]]} {
+                        set levelchangecallback [lindex $args 0]
+		    } else {
+                        return -code error \
+			    -errorcode [list LOGGER INVALID_CMD] \
+			    [::logger::mc "Invalid cmd '%s' - does not exist" [lindex $args 0]]
+		    }
+		}
+                default {
+                    return -code error \
+			-errorcode [list LOGGER WRONG_NUM_ARGS] \
+			[::logger::mc "Wrong # of arguments. Usage: \${log}::lvlchangeproc ?cmd?"]
+                }
+	    }
+	}
+
+	proc lvlchangewrapper {old new} {
+	    variable inSetLevel
+
+	    # we are called after disable and enable are finished
+	    if {$inSetLevel} {return}
+
+	    # no action if level does not change
+	    if {[string equal $old $new]} {return}
+
+	    variable levelchangecallback
+	    # no action if levelchangecallback isn't a valid command
+	    if {[::logger::_cmdPrefixExists $levelchangecallback]} {
+		catch {
+		    uplevel \#0 [linsert $levelchangecallback end $old $new]
+		}
+	    }
+	}
+
+	# logproc --
+	#
+	#   Command used to create a procedure that is executed to
+	#   perform the logging.  This could write to disk, out to
+	#   the network, or something else.
+	#   If two arguments are given, use an existing command.
+	#   If three arguments are given, create a proc.
+	#
+	# Arguments:
+	#   lv - the level to log, which must be one of $levels.
+	#   args - either zero, one or two arguments.
+	#          if zero this returns the current command registered
+	#          if one, this is a cmd name that is called for this level
+	#          if two, these are an argument and proc body
+	#
+	# Side Effects:
+	#   Creates a logging command to take care of the details
+	#   of logging an event.
+	#
+	# Results:
+	#   If called with zero length args, returns the name of the currently
+	#   configured logging procedure.
+	#
+	#
+
+	proc logproc {lv args} {
+	    variable levels
+	    variable lvlcmds
+
+	    set lvnum [lsearch -exact $levels $lv]
+	    if { ($lvnum == -1) && ($lv != "trace") } {
+		return -code error \
+		    -errorcode [list LOGGER INVALID_LEVEL] \
+		    [::logger::mc "Invalid level '%s' - levels are %s" $lv $levels]
+	    }
+	    switch -exact -- [llength $args] {
+		0  {
+		    return $lvlcmds($lv)
+		}
+		1  {
+		    set cmd [lindex $args 0]
+		    if {[string equal "[namespace current]::${lv}cmd" $cmd]} {return}
+		    if {[llength [::info commands $cmd]]} {
+			proc ${lv}cmd args [format {
+			    uplevel 1 [list %s [expr {[llength $args]==1 ? [lindex $args end] : $args}]]
+			} $cmd]
+		    } else {
+			return -code error \
+			    -errorcode [list LOGGER INVALID_CMD] \
+			    [::logger::mc "Invalid cmd '%s' - does not exist" $cmd]
+		    }
+		    set lvlcmds($lv) $cmd
+		}
+		2  {
+		    foreach {arg body} $args {break}
+		    proc ${lv}cmd args [format {\
+						    _setservicename args
+			set val [%s [expr {[llength $args]==1 ? [lindex $args end] : $args}]]
+			_restoreservice
+			set val} ${lv}customcmd]
+		    proc ${lv}customcmd $arg $body
+		    set lvlcmds($lv) [namespace current]::${lv}customcmd
+		}
+		default {
+		    return -code error \
+			-errorcode [list LOGGER WRONG_USAGE] \
+			[::logger::mc \
+			     "Usage: \${log}::logproc level ?cmd?\nor \${log}::logproc level argname body" ]
+		}
+	    }
+	}
+
+
+	# delproc --
+	#
+	#   Set or introspect a callback for when the logger instance
+	#   is deleted.
+	#
+	# Arguments:
+	#   cmd - the Tcl command to call.
+	#   or none for introspection
+	#
+	# Side Effects:
+	#   None.
+	#
+	# Results:
+	#   If no arguments are given return the current callback cmd.
+
+	proc delproc {args} {
+	    variable delcallback
+
+	    switch -exact -- [llength [::info level 0]] {
+                1   {return $delcallback}
+                2   { if {[::logger::_cmdPrefixExists [lindex $args 0]]} {
+		    set delcallback [lindex $args 0]
+		} else {
+		    return -code error \
+			-errorcode [list LOGGER INVALID_CMD] \
+			[::logger::mc "Invalid cmd '%s' - does not exist" [lindex $args 0]]
+		}
+		}
+                default {
+                    return -code error \
+			-errorcode [list LOGGER WRONG_NUM_ARGS] \
+			[::logger::mc "Wrong # of arguments. Usage: \${log}::delproc ?cmd?"]
+                }
+	    }
+	}
+
+
+	# delete --
+	#
+	#   Delete the namespace and its children.
+
+	proc delete {} {
+	    variable delcallback
+	    variable service
+
+	    logger::walk [namespace current] delete
+	    if {[::logger::_cmdPrefixExists $delcallback]} {
+		uplevel \#0 [lrange $delcallback 0 end]
+	    }
+	    # clean up the global services list
+	    set idx [lsearch -exact [logger::services] $service]
+	    if {$idx !=-1} {
+		set ::logger::services [lreplace [logger::services] $idx $idx]
+	    }
+
+	    namespace delete [namespace current]
+
+	}
+
+	# services --
+	#
+	#   Return all child services
+
+	proc services {} {
+	    variable service
+
+	    set children [list]
+	    foreach srv [logger::services] {
+		if {[string match "${service}::*" $srv]} {
+		    lappend children $srv
+		}
+	    }
+	    return $children
+	}
+
+	# servicename --
+	#
+	#   Return the name of the service
+
+	proc servicename {} {
+	    variable service
+	    return $service
+	}
+
+	proc _setservicename {argname} {
+	    variable service
+	    variable oldname
+	    upvar 1 $argname arg
+	    if {[llength $arg] <= 1} {
+		return
+	    }
+
+	    set count -1
+	    set newname ""
+	    while {[string equal [lindex $arg [expr {$count+1}]] "-_logger::service"]} {
+		incr count 2
+		set newname [lindex $arg $count]
+	    }
+	    if {[string equal $newname ""]} {
+		return
+	    }
+	    set oldname $service
+	    set service $newname
+	    # Pop off "-_logger::service <service>" from argument list
+	    set arg [lreplace $arg 0 $count]
+	}
+
+	proc _restoreservice {} {
+	    variable service
+	    variable oldname
+	    set service $oldname
+	    return
+	}
+
+	proc trace { action args } {
+	    variable service
+
+	    # Allow other boolean values (true, false, yes, no, 0, 1) to be used
+	    # as synonymns for "on" and "off".
+
+	    if {[string is boolean $action]} {
+		set xaction [expr {($action && 1) ? "on" : "off"}]
+	    } else {
+		set xaction $action
+	    }
+
+	    # Check for required arguments for actions/subcommands and dispatch
+	    # to the appropriate procedure.
+
+	    switch -- $xaction {
+		"status" {
+		    return [uplevel 1 [list logger::_trace_status $service $args]]
+		}
+		"on" {
+		    if {[llength $args]} {
+			return -code error \
+			    -errorcode [list LOGGER WRONG_NUM_ARGS] \
+                            [::logger::mc "wrong # args: should be \"trace on\""]
+		    }
+		    return [logger::_trace_on $service]
+		}
+		"off" {
+		    if {[llength $args]} {
+			return -code error \
+			    -errorcode [list LOGGER WRONG_NUM_ARGS] \
+                            [::logger::mc "wrong # args: should be \"trace off\""]
+		    }
+		    return [logger::_trace_off $service]
+		}
+		"add" {
+		    if {![llength $args]} {
+			return -code error \
+			    -errorcode [list LOGGER WRONG_NUM_ARGS] \
+			    [::logger::mc "wrong # args: should be \"trace add ?-ns? <proc> ...\""]
+		    }
+		    return [uplevel 1 [list ::logger::_trace_add $service $args]]
+		}
+		"remove" {
+		    if {![llength $args]} {
+			return -code error \
+			    -errorcode [list LOGGER WRONG_NUM_ARGS] \
+                            [::logger::mc "wrong # args: should be \"trace remove ?-ns? <proc> ...\""]
+		    }
+		    return [uplevel 1 [list ::logger::_trace_remove $service $args]]
+		}
+
+		default {
+		    return -code error \
+			-errorcode [list LOGGER INVALID_ARG] \
+			[::logger::mc "Invalid action \"%s\": must be status, add, remove,\
+                    on, or off" $action]
+		}
+	    }
+	}
+
+	# Walk the parent service namespaces to see first, if they
+	# exist, and if any are enabled, and then, as a
+	# consequence, enable this one
+	# too.
+
+	enable $enabled
+	variable parent [namespace parent]
+	while {[string compare $parent "::logger::tree"]} {
+	    # If the 'enabled' variable doesn't exist, create the
+	    # whole thing.
+	    if { ! [::info exists ${parent}::enabled] } {
+		logger::init [string range $parent 16 end]
+	    }
+	    set enabled [set ${parent}::enabled]
+	    enable $enabled
+	    set parent [namespace parent $parent]
+	}
+    }
+
+    # Now create the commands for different levels.
+
+    namespace eval tree::${service} {
+	set parent [namespace parent]
+
+	# We 'inherit' the commands from the parents.  This
+	# means that, if you want to share the same methods with
+	# children, they should be instantiated after the parent's
+	# methods have been defined.
+
+	variable lvl ; # prevent creative writing to the global scope
+	if {[string compare $parent "::logger::tree"]} {
+	    foreach lvl [::logger::levels] {
+		# OPTIMIZE: do not allow multiple aliases in the hierarchy
+		#           they can always be replaced by more efficient
+		#           direct aliases to the target procs.
+		interp alias {} [namespace current]::${lvl}cmd \
+		    {} ${parent}::${lvl}cmd -_logger::service $service
+	    }
+	    # inherit the starting loglevel of the parent service
+	    setlevel [${parent}::currentloglevel]
+	} else {
+	    foreach lvl [concat [::logger::levels] "trace"] {
+		proc ${lvl}cmd args [format {\
+						 _setservicename args
+		    set val [stdoutcmd %s [expr {[llength $args]==1 ? [lindex $args end] : $args}]]
+		    _restoreservice
+		    set val } $lvl]
+
+		set lvlcmds($lvl) [namespace current]::${lvl}cmd
+	    }
+	    setlevel $::logger::enabled
+	}
+	unset lvl ; # drop the temp iteration variable
+    }
+
+    return ::logger::tree::${service}
+}
+
+# ::logger::services --
+#
+#   Returns a list of all active services.
+#
+# Arguments:
+#   None.
+#
+# Side Effects:
+#   None.
+#
+# Results:
+#   List of active services.
+
+proc ::logger::services {} {
+    variable services
+    return $services
+}
+
+# ::logger::enable --
+#
+#   Global enable for a certain level.  NOTE - this implementation
+#   isn't terribly effective at the moment, because it might hit
+#   children before their parents, who will then walk down the
+#   tree attempting to disable the children again.
+#
+# Arguments:
+#   lv - level above which to enable logging.
+#
+# Side Effects:
+#   Enables logging in a given level, and all higher levels.
+#
+# Results:
+#   None.
+
+proc ::logger::enable {lv} {
+    variable services
+    if {[catch {
+        foreach sv $services {
+        ::logger::tree::${sv}::enable $lv
+        }
+    } msg] == 1} {
+        return -code error -errorcode $::errorCode $msg
+    }
+}
+
+proc ::logger::disable {lv} {
+    variable services
+    if {[catch {
+        foreach sv $services {
+        ::logger::tree::${sv}::disable $lv
+        }
+    } msg] == 1} {
+        return -code error -errorcode $::errorCode $msg
+    }
+}
+
+proc ::logger::setlevel {lv} {
+    variable services
+    variable enabled
+    variable levels
+    if {[lsearch -exact $levels $lv] == -1} {
+        return -code error \
+               -errorcode [list LOGGER INVALID_LEVEL] \
+               [::logger::mc "Invalid level '%s' - levels are %s" $lv $levels]
+    }
+    set enabled $lv
+    if {[catch {
+        foreach sv $services {
+        ::logger::tree::${sv}::setlevel $lv
+        }
+    } msg] == 1} {
+        return -code error -errorcode $::errorCode $msg
+    }
+}
+
+# ::logger::levels --
+#
+#   Introspect the available log levels.  Provided so a caller does
+#   not need to know implementation details or code the list
+#   himself.
+#
+# Arguments:
+#   None.
+#
+# Side Effects:
+#   None.
+#
+# Results:
+#   levels - The list of valid log levels accepted by enable and disable
+
+proc ::logger::levels {} {
+    variable levels
+    return $levels
+}
+
+# ::logger::servicecmd --
+#
+#   Get the command token for a given service name.
+#
+# Arguments:
+#   service - name of the service.
+#
+# Side Effects:
+#   none
+#
+# Results:
+#   log - namespace token for this service
+
+proc ::logger::servicecmd {service} {
+    variable services
+    if {[lsearch -exact $services $service] == -1} {
+        return -code error \
+               -errorcode [list LOGGER NO_SUCH_SERVICE] \
+               [::logger::mc "Service \"%s\" does not exist." $service]
+    }
+    return "::logger::tree::${service}"
+}
+
+# ::logger::import --
+#
+#   Import the logging commands.
+#
+# Arguments:
+#   service - name of the service.
+#
+# Side Effects:
+#   creates aliases in the target namespace
+#
+# Results:
+#   none
+
+proc ::logger::import {args} {
+    variable services
+
+    if {[llength $args] == 0 || [llength $args] > 7} {
+    return -code error \
+           -errorcode [list LOGGER WRONG_NUM_ARGS] \
+           [::logger::mc \
+                       "Wrong # of arguments: \"logger::import ?-all?\
+                        ?-force?\
+                        ?-prefix prefix? ?-namespace namespace? service\""]
+    }
+
+    # process options
+    #
+    set import_all 0
+    set force 0
+    set prefix ""
+    set ns [uplevel 1 namespace current]
+    while {[llength $args] > 1} {
+        set opt [lindex $args 0]
+        set args [lrange $args 1 end]
+        switch  -exact -- $opt {
+            -all    { set import_all 1}
+            -prefix { set prefix [lindex $args 0]
+                      set args [lrange $args 1 end]
+                    }
+            -namespace {
+                      set ns [lindex $args 0]
+                      set args [lrange $args 1 end]
+            }
+            -force {
+                     set force 1
+            }
+            default {
+                return -code error \
+                       -errorcode [list LOGGER UNKNOWN_ARG] \
+                       [::logger::mc \
+                       "Unknown argument: \"%s\" :\nUsage:\
+                      \"logger::import ?-all? ?-force?\
+                        ?-prefix prefix? ?-namespace namespace? service\"" $opt]
+            }
+        }
+    }
+
+    #
+    # build the list of commands to import
+    #
+
+    set cmds [logger::levels]
+    lappend cmds "trace"
+    if {$import_all} {
+        lappend cmds setlevel enable disable logproc delproc services
+        lappend cmds servicename currentloglevel delete
+    }
+
+    #
+    # check the service argument
+    #
+
+    set service [lindex $args 0]
+    if {[lsearch -exact $services $service] == -1} {
+            return -code error \
+                   -errorcode [list LOGGER NO_SUCH_SERVICE] \
+                   [::logger::mc "Service \"%s\" does not exist." $service]
+    }
+
+    #
+    # setup the namespace for the import
+    #
+
+    set sourcens [logger::servicecmd $service]
+    set localns  [uplevel 1 namespace current]
+
+    if {[string match ::* $ns]} {
+        set importns $ns
+    } else {
+        set importns ${localns}::$ns
+    }
+
+    # fake namespace exists for Tcl 8.2 - 8.3
+    if {![_nsExists $importns]} {
+        namespace eval $importns {}
+    }
+
+
+    #
+    # prepare the import
+    #
+
+    set imports ""
+    foreach cmd $cmds {
+        set cmdname ${importns}::${prefix}$cmd
+        set collision [llength [info commands $cmdname]]
+        if {$collision && !$force} {
+            return -code error \
+                   -errorcode [list LOGGER IMPORT_NAME_EXISTS] \
+                   [::logger::mc "can't import command \"%s\": already exists" $cmdname]
+        }
+        lappend imports ${importns}::${prefix}$cmd ${sourcens}::${cmd}
+    }
+
+    #
+    # and execute the aliasing after checking all is well
+    #
+
+    foreach {target source} $imports {
+        proc $target {args} "uplevel 1 \[linsert \$args 0 $source \]"
+    }
+}
+
+# ::logger::initNamespace --
+#
+#   Creates a logger for the specified namespace and makes the log
+#   commands available to said namespace as well. Allows the initial
+#   setting of a default log level.
+#
+# Arguments:
+#   ns    - Namespace to initialize, is also the service name, modulo a ::-prefix
+#   level - Initial log level, optional, defaults to 'warn'.
+#
+# Side Effects:
+#   creates aliases in the target namespace
+#
+# Results:
+#   none
+
+proc ::logger::initNamespace {ns {level {}}} {
+    set service [string trimleft $ns :]
+    if {$level == ""} {
+	# No user-specified level. Figure something out.
+	# - If the parent service exists then the 'logger::init'
+	#   below will automatically inherit its level. Good enough.
+	# - Without a parent service go and use a default level of 'warn'.
+	set parent    [string trimleft [namespace qualifiers $service] :]
+	set hasparent [expr {($parent != {}) && [_nsExists ::logger::tree::${parent}]}]
+	if {!$hasparent} {
+	    set level warn
+	}
+    }
+
+    namespace eval $ns [list ::logger::init $service]
+    namespace eval $ns [list ::logger::import -force -all -namespace log $service]
+    if {$level != ""} {
+	namespace eval $ns [list log::setlevel $level]
+    }
+    return
+}
+
+# This procedure handles the "logger::trace status" command.  Given no
+# arguments, returns a list of all procedures that have been registered
+# via "logger::trace add".  Given one or more procedure names, it will
+# return 1 if all were registered, or 0 if any were not.
+
+proc ::logger::_trace_status { service procList } {
+    upvar #0 ::logger::tree::${service}::traceList traceList
+
+    # If no procedure names were given, just return the registered list
+
+    if {![llength $procList]} {
+        return $traceList
+    }
+
+    # Get caller's namespace for qualifying unqualified procedure names
+
+    set caller_ns [uplevel 1 namespace current]
+    set caller_ns [string trimright $caller_ns ":"]
+
+    # Search for any specified proc names that are *not* registered
+
+    foreach procName $procList {
+        # Make sure the procedure namespace is qualified
+
+        if {![string match "::*" $procName]} {
+            set procName ${caller_ns}::$procName
+        }
+
+        # Check if the procedure has been registered for tracing
+
+        if {[lsearch -exact $traceList $procName] == -1} {
+	    return 0
+        }
+    }
+
+    return 1
+}
+
+# This procedure handles the "logger::trace on" command.  If tracing
+# is turned off, it will enable Tcl trace handlers for all of the procedures
+# registered via "logger::trace add".  Does nothing if tracing is already
+# turned on.
+
+proc ::logger::_trace_on { service } {
+    set tcl_version [package provide Tcl]
+
+    if {[package vcompare $tcl_version "8.4"] < 0} {
+        return -code error \
+               -errorcode [list LOGGER TRACE_NOT_AVAILABLE] \
+              [::logger::mc "execution tracing is not available in Tcl %s" $tcl_version]
+    }
+
+    namespace eval ::logger::tree::${service} {
+        if {!$tracingEnabled} {
+            set tracingEnabled 1
+            ::logger::_enable_traces $service $traceList
+        }
+    }
+
+    return 1
+}
+
+# This procedure handles the "logger::trace off" command.  If tracing
+# is turned on, it will disable Tcl trace handlers for all of the procedures
+# registered via "logger::trace add", leaving them in the list so they
+# tracing on all of them can be enabled again with "logger::trace on".
+# Does nothing if tracing is already turned off.
+
+proc ::logger::_trace_off { service } {
+    namespace eval ::logger::tree::${service} {
+        if {$tracingEnabled} {
+            ::logger::_disable_traces $service $traceList
+            set tracingEnabled 0
+        }
+    }
+
+    return 1
+}
+
+# This procedure is used by the logger::trace add and remove commands to
+# process the arguments in a common fashion.  If the -ns switch is given
+# first, this procedure will return a list of all existing procedures in
+# all of the namespaces given in remaining arguments.  Otherwise, each
+# argument is taken to be either a pattern for a glob-style search of
+# procedure names or, failing that, a namespace, in which case this
+# procedure returns a list of all the procedures matching the given
+# pattern (or all in the named namespace, if no procedures match).
+
+proc ::logger::_trace_get_proclist { inputList } {
+    set procList ""
+
+    if {[string equal [lindex $inputList 0] "-ns"]} {
+	# Verify that at least one target namespace was supplied
+
+	set inputList [lrange $inputList 1 end]
+	if {![llength $inputList]} {
+	    return -code error \
+                   -errorcode [list LOGGER TARGET_MISSING] \
+                   [::logger::mc "Must specify at least one namespace target"]
+	}
+
+	# Rebuild the argument list to contain namespace procedures
+
+	foreach namespace $inputList {
+            # Don't allow tracing of the logger (or child) namespaces
+
+	    if {![string match "::logger::*" $namespace]} {
+		set nsProcList  [::info procs ${namespace}::*]
+                set procList    [concat $procList $nsProcList]
+            }
+	}
+    } else {
+        # Search for procs or namespaces matching each of the specified
+        # patterns.
+
+        foreach pattern $inputList {
+	    set matches [uplevel 1 ::info proc $pattern]
+
+	    if {![llength $matches]} {
+	        if {[uplevel 1 namespace exists $pattern]} {
+		    set matches [::info procs ${pattern}::*]
+	        }
+
+                # Matched procs will be qualified due to above pattern
+
+                set procList [concat $procList $matches]
+            } elseif {[string match "::*" $pattern]} {
+                # Patterns were pre-qualified - add them directly
+
+                set procList [concat $procList $matches]
+            } else {
+                # Qualify each proc with the namespace it was in
+
+                set ns [uplevel 1 namespace current]
+                if {$ns == "::"} {
+                    set ns ""
+                }
+                foreach proc $matches {
+                    lappend procList ${ns}::$proc
+                }
+            }
+        }
+    }
+
+    return $procList
+}
+
+# This procedure handles the "logger::trace add" command.  If the tracing
+# feature is enabled, it will enable the Tcl entry and leave trace handlers
+# for each procedure specified that isn't already being traced.  Each
+# procedure is added to the list of procedures that the logger trace feature
+# should log when tracing is enabled.
+
+proc ::logger::_trace_add { service procList } {
+    upvar #0 ::logger::tree::${service}::traceList traceList
+
+    # Handle -ns switch and glob search patterns for procedure names
+
+    set procList [uplevel 1 [list logger::_trace_get_proclist $procList]]
+
+    # Enable tracing for each procedure that has not previously been
+    # specified via logger::trace add.  If tracing is off, this will just
+    # store the name of the procedure for later when tracing is turned on.
+
+    foreach procName $procList {
+        if {[lsearch -exact $traceList $procName] == -1} {
+            lappend traceList $procName
+            ::logger::_enable_traces $service [list $procName]
+        }
+    }
+}
+
+# This procedure handles the "logger::trace remove" command.  If the tracing
+# feature is enabled, it will remove the Tcl entry and leave trace handlers
+# for each procedure specified.  Each procedure is removed from the list
+# of procedures that the logger trace feature should log when tracing is
+# enabled.
+
+proc ::logger::_trace_remove { service procList } {
+    upvar #0 ::logger::tree::${service}::traceList traceList
+
+    # Handle -ns switch and glob search patterns for procedure names
+
+    set procList [uplevel 1 [list logger::_trace_get_proclist $procList]]
+
+    # Disable tracing for each proc that previously had been specified
+    # via logger::trace add.  If tracing is off, this will just
+    # remove the name of the procedure from the trace list so that it
+    # will be excluded when tracing is turned on.
+
+    foreach procName $procList {
+        set index [lsearch -exact $traceList $procName]
+        if {$index != -1} {
+            set traceList [lreplace $traceList $index $index]
+            ::logger::_disable_traces $service [list $procName]
+        }
+    }
+}
+
+# This procedure enables Tcl trace handlers for all procedures specified.
+# It is used both to enable Tcl's tracing for a single procedure when
+# removed via "logger::trace add", as well as to enable all traces
+# via "logger::trace on".
+
+proc ::logger::_enable_traces { service procList } {
+    upvar #0 ::logger::tree::${service}::tracingEnabled tracingEnabled
+
+    if {$tracingEnabled} {
+        foreach procName $procList {
+            ::trace add execution $procName enter \
+                [list ::logger::_trace_enter $service]
+            ::trace add execution $procName leave \
+                [list ::logger::_trace_leave $service]
+        }
+    }
+}
+
+# This procedure disables Tcl trace handlers for all procedures specified.
+# It is used both to disable Tcl's tracing for a single procedure when
+# removed via "logger::trace remove", as well as to disable all traces
+# via "logger::trace off".
+
+proc ::logger::_disable_traces { service procList } {
+    upvar #0 ::logger::tree::${service}::tracingEnabled tracingEnabled
+
+    if {$tracingEnabled} {
+        foreach procName $procList {
+            ::trace remove execution $procName enter \
+                [list ::logger::_trace_enter $service]
+            ::trace remove execution $procName leave \
+                [list ::logger::_trace_leave $service]
+        }
+    }
+}
+
+########################################################################
+# Trace Handlers
+########################################################################
+
+# This procedure is invoked upon entry into a procedure being traced
+# via "logger::trace add" when tracing is enabled via "logger::trace on"
+# to log information about how the procedure was called.
+
+proc ::logger::_trace_enter { service cmd op } {
+    # Parse the command
+    set procName [uplevel 1 namespace origin [lindex $cmd 0]]
+    set args     [lrange $cmd 1 end]
+
+    # Display the message prefix
+    set callerLvl [expr {[::info level] - 1}]
+    set calledLvl [::info level]
+
+    lappend message "proc" $procName
+    lappend message "level" $calledLvl
+    lappend message "script" [uplevel ::info script]
+
+    # Display the caller information
+    set caller ""
+    if {$callerLvl >= 1} {
+	# Display the name of the caller proc w/prepended namespace
+	catch {
+	    set callerProcName [lindex [::info level $callerLvl] 0]
+	    set caller [uplevel 2 namespace origin $callerProcName]
+	}
+    }
+
+    lappend message "caller" $caller
+
+    # Display the argument names and values
+    set argSpec [uplevel 1 ::info args $procName]
+    set argList ""
+    if {[llength $argSpec]} {
+	foreach argName $argSpec {
+            lappend argList $argName
+
+	    if {$argName == "args"} {
+                lappend argList $args
+                break
+	    } else {
+	        lappend argList [lindex $args 0]
+	        set args [lrange $args 1 end]
+            }
+	}
+    }
+
+    lappend message "procargs" $argList
+    set message [list $op $message]
+
+    ::logger::tree::${service}::tracecmd $message
+}
+
+# This procedure is invoked upon leaving into a procedure being traced
+# via "logger::trace add" when tracing is enabled via "logger::trace on"
+# to log information about the result of the procedure call.
+
+proc ::logger::_trace_leave { service cmd status rc op } {
+    variable RETURN_CODES
+
+    # Parse the command
+    set procName [uplevel 1 namespace origin [lindex $cmd 0]]
+
+    # Gather the caller information
+    set callerLvl [expr {[::info level] - 1}]
+    set calledLvl [::info level]
+
+    lappend message "proc" $procName "level" $calledLvl
+    lappend message "script" [uplevel ::info script]
+
+    # Get the name of the proc being returned to w/prepended namespace
+    set caller ""
+    catch {
+        set callerProcName [lindex [::info level $callerLvl] 0]
+        set caller [uplevel 2 namespace origin $callerProcName]
+    }
+
+    lappend message "caller" $caller
+
+    # Convert the return code from numeric to verbal
+
+    if {$status < [llength $RETURN_CODES]} {
+        set status [lindex $RETURN_CODES $status]
+    }
+
+    lappend message "status" $status
+    lappend message "result" $rc
+
+    # Display the leave message
+
+    set message [list $op $message]
+    ::logger::tree::${service}::tracecmd $message
+
+    return 1
+}
+
diff --git a/src/bootsupport/modules/natsort-0.1.1.6.tm b/src/bootsupport/modules/natsort-0.1.1.6.tm
index 1d91b53f..7f7c33cd 100644
--- a/src/bootsupport/modules/natsort-0.1.1.6.tm
+++ b/src/bootsupport/modules/natsort-0.1.1.6.tm
@@ -5,8 +5,9 @@ package require flagfilter
 namespace import ::flagfilter::check_flags
 
 namespace eval natsort {
+    #REVIEW - determine and document the purpose of scriptdir being added to tm path
      proc scriptdir {} {
-        set possibly_linked_script [file dirname [file normalize [file join [info script] ...]]]
+        set possibly_linked_script [file dirname [file normalize [file join [info script] __dummy__]]]
         if {[file isdirectory $possibly_linked_script]} {
             return $possibly_linked_script
         } else {
@@ -14,7 +15,11 @@ namespace eval natsort {
         }
     }
     if {![interp issafe]} {
-        tcl::tm::add [scriptdir]    
+        set sdir [scriptdir]
+        #puts stderr "natsort tcl::tm::add $sdir"
+        if {$sdir ni [tcl::tm::list]} {
+            catch {tcl::tm::add $sdir}
+        }
     }
 }
 
@@ -36,6 +41,7 @@ namespace eval natsort {
         } else {
             puts stderr "|>natsort_call_err> unable to interpret 2nd argument to do_error: '$then' should be one of '$levels'  or 'exit <numericcode>'"
         }
+        flush stderr
         if {$::tcl_interactive} {
             #may not always be desirable - but assumed to be more useful not to exit despite request, to aid in debugging
             if {[string tolower $type] eq "exit"} {
@@ -43,6 +49,7 @@ namespace eval natsort {
               if {![string is digit -strict $code]} {
                 puts stderr "|>natsort_call_err> unable to interpret 2nd argument to do_error: '$then' should be: 'exit <numericcode>'"
               }
+              flush stderr
             } 
             return -code error $msg
         } else {
@@ -1422,6 +1429,9 @@ namespace eval natsort {
 
     proc called_directly_namematch {} {
         global argv0
+        if {[info script] eq ""} {
+            return 0
+        }
         #see https://wiki.tcl-lang.org/page/main+script  
         #trailing ... let's us resolve symlinks in last component of the path (could be something else like ___ but ... seems unlikely to collide with anything in the filesystem)
         if {[info exists argv0] 
@@ -1440,12 +1450,18 @@ namespace eval natsort {
     #Review issues around comparing names vs using inodes (esp with respect to samba shares)
     proc called_directly_inodematch {} {
         global argv0
+
         if {[info exists argv0]
-         && [file exists [info script]] && [file exists $argv0]} {
+         &&  [file exists [info script]] && [file exists $argv0]} {
             file stat $argv0        argv0Info
             file stat [info script] scriptInfo
-            expr {$argv0Info(dev) == $scriptInfo(dev)
-               && $argv0Info(ino) == $scriptInfo(ino)}
+            if {$argv0Info(ino) == 0 || $scriptInfo(ino) == 0 || $argv0Info(dev) == 0 || $scriptInfo(dev) == 0} {
+                #vfs?
+                #e.g //zipfs:/
+                return 0
+            }
+            return [expr {$argv0Info(dev) == $scriptInfo(dev)
+               && $argv0Info(ino) == $scriptInfo(ino)}]
         } else {
             return 0
         }
@@ -1460,6 +1476,11 @@ namespace eval natsort {
         #-- choose a policy and leave the others commented.
         #set is_called_directly $is_namematch 
         #set is_called_directly $is_inodematch 
+
+        #puts "NATSORT: called_directly_namematch - $is_namematch"
+        #puts "NATSORT: called_directly_inodematch - $is_inodematch"
+        #flush stdout
+
         set is_called_directly [expr {$is_namematch || $is_inodematch}] 
         #set is_called_directly [expr {$is_namematch && $is_inodematch}] 
         ###
@@ -1921,6 +1942,8 @@ namespace eval natsort {
             #set args [check_flags -caller test1 -defaults [list  -collate nocase -algorithm sort -topchars "\uFFFF" -winlike 0 -debug 0 -stacktrace 0 -showsplits 0] -required {all} -extras {none} -commandprocessors {{-cmd -default help} {-cmd -cmdarg1 -default "."} {-cmd -cmdarg2 -default j}} -values $::argv ]
             #set args [check_flags -caller test1 -defaults [list  -collate nocase -algorithm sort -topchars "\uFFFF" -winlike 0 -debug 0 -stacktrace 0 -showsplits 0] -required {all} -extras {none} -commandprocessors {ls {ls lsdir -default "\uFFFF"}} -values $::argv ]
 
+            puts stderr "natsort directcall exit"
+            flush stderr
             exit 0
 
         if {$::argc} {
diff --git a/src/bootsupport/modules/overtype-1.6.5.tm b/src/bootsupport/modules/overtype-1.6.5.tm
index 143794fb..f7e4c1a5 100644
--- a/src/bootsupport/modules/overtype-1.6.5.tm
+++ b/src/bootsupport/modules/overtype-1.6.5.tm
@@ -163,7 +163,7 @@ proc overtype::string_columns {text} {
 tcl::namespace::eval overtype::priv {
 }
 
-#could return larger than colwidth
+#could return larger than renderwidth 
 proc _get_row_append_column {row} {
     upvar outputlines outputlines 
     set idx [expr {$row -1}]
@@ -171,14 +171,14 @@ proc _get_row_append_column {row} {
         return 1
     } else {
         upvar opt_overflow opt_overflow
-        upvar colwidth colwidth
+        upvar renderwidth renderwidth 
         set existinglen [punk::ansi::printing_length [lindex $outputlines $idx]]
         set endpos [expr {$existinglen +1}]
         if {$opt_overflow} {
             return $endpos
         } else {
-            if {$endpos > $colwidth} {
-                return $colwidth + 1
+            if {$endpos > $renderwidth} {
+                return $renderwidth + 1
             } else {
                 return $endpos
             }
@@ -213,7 +213,20 @@ tcl::namespace::eval overtype {
         if {[llength $args] < 2} {
             error {usage: ?-width <int>? ?-startcolumn <int>? ?-transparent [0|1|<char>]? ?-overflow [1|0]? ?-ellipsis [1|0]? ?-ellipsistext ...? undertext overtext}
         }
-        lassign [lrange $args end-1 end] underblock overblock
+        set optargs [lrange $args 0 end-2]
+        if {[llength $optargs] % 2 == 0} {
+            lassign [lrange $args end-1 end] underblock overblock
+            set argsflags [lrange $args 0 end-2]
+        } else {
+            set optargs [lrange $args 0 end-1]
+            if {[llength $optargs] %2 == 0} {
+                set overblock [lindex $args end]
+                set underblock ""
+                set argsflags [lrange $args 0 end-1]
+            } else {
+                error "renderspace expects opt-val pairs followed by: <underblock> <overblock> or just <overblock>"
+            }
+        }
         set opts [tcl::dict::create\
             -bias       ignored\
             -width      \uFFEF\
@@ -230,12 +243,15 @@ tcl::namespace::eval overtype {
             -exposed2 \uFFFD\
             -experimental  0\
             -looplimit  \uFFEF\
+            -crm_mode   0\
+            -reverse_mode 0\
         ]
         #-ellipsis args not used if -wrap is true
-        set argsflags [lrange $args 0 end-2]
         foreach {k v} $argsflags {
             switch -- $k {
-                -looplimit - -width - -height - -startcolumn - -bias - -wrap - -ellipsis - -ellipsistext - -ellipsiswhitespace - -overflow - -appendlines - -transparent - -exposed1 - -exposed2 - -experimental {
+                -looplimit - -width - -height - -startcolumn - -bias - -wrap - -ellipsis - -ellipsistext - -ellipsiswhitespace - -overflow - -appendlines
+                - -transparent - -exposed1 - -exposed2 - -experimental
+                - -reverse_mode - -crm_mode {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -261,6 +277,8 @@ tcl::namespace::eval overtype {
         set opt_exposed1        [tcl::dict::get $opts -exposed1] ;#widechar_exposed_left  - todo
         set opt_exposed2        [tcl::dict::get $opts -exposed2] ;#widechar_exposed_right - todo
         # -- --- --- --- --- ---
+        set opt_crm_mode        [tcl::dict::get $opts -crm_mode]
+        set opt_reverse_mode    [tcl::dict::get $opts -reverse_mode]
 
         # ----------------------------
         #  -experimental dev flag to set flags etc
@@ -295,9 +313,10 @@ tcl::namespace::eval overtype {
         # ----------------------------
 
         #modes
-        set insert_mode 0 ;#can be toggled by insert key or ansi IRM sequence ESC [ 4 h|l
-        set autowrap_mode $opt_wrap
-        set reverse_mode 0
+        set insert_mode     0 ;#can be toggled by insert key or ansi IRM sequence ESC [ 4 h|l
+        set autowrap_mode   $opt_wrap
+        set reverse_mode    $opt_reverse_mode 
+        set crm_mode        $opt_crm_mode 
         
 
         set underblock [tcl::string::map {\r\n \n} $underblock]
@@ -307,33 +326,35 @@ tcl::namespace::eval overtype {
         #set underlines [split $underblock \n]
 
         #underblock is a 'rendered' block - so width height make sense
-        #colwidth & colheight were originally named with reference to rendering into a 'column' of output e.g  a table column - before cursor row/col was implemented.
-        #The naming is now confusing. It should be something like renderwidth renderheight ?? review 
+        #only non-cursor affecting and non-width occupying ANSI codes should be present.
+        #ie SGR codes and perhaps things such as PM - although generally those should have been pushed to the application already
+        #renderwidth & renderheight were originally used with reference to rendering into a 'column' of output e.g  a table column - before cursor row/col was implemented.
         
         if {$opt_width eq "\uFFEF" || $opt_height eq "\uFFEF"} {
-            lassign [blocksize $underblock] _w colwidth _h colheight
+            lassign [blocksize $underblock] _w renderwidth _h renderheight 
             if {$opt_width ne "\uFFEF"} {
-                set colwidth $opt_width
+                set renderwidth $opt_width
             }
             if {$opt_height ne "\uFFEF"} {
-                set colheight $opt_height
+                set renderheight $opt_height
             }
         } else {
-            set colwidth $opt_width
-            set colheight $opt_height
+            set renderwidth $opt_width
+            set renderheight $opt_height
         }
 
         # -- --- --- --- 
         #REVIEW - do we need ansi resets in the underblock?
         if {$underblock eq ""} {
-            set underlines [lrepeat $colheight ""]
+            set underlines [lrepeat $renderheight ""]
         } else {
+            set underblock [textblock::join_basic -- $underblock] ;#ensure properly rendered - ansi per-line resets & replays
             set underlines [split $underblock \n]
         }
         #if {$underblock eq ""} {
         #    set blank "\x1b\[0m\x1b\[0m"
         #    #set underlines [list "\x1b\[0m\x1b\[0m"]
-        #    set underlines [lrepeat $colheight $blank]
+        #    set underlines [lrepeat $renderheight $blank]
         #} else {
         #    #lines_as_list -ansiresets 1 will do nothing if -ansiresets 1 isn't specified - REVIEW
         #    set underlines [lines_as_list -ansiresets 1 $underblock]
@@ -341,7 +362,7 @@ tcl::namespace::eval overtype {
         # -- --- --- --- 
 
         #todo - reconsider the 'line' as the natural chunking mechanism for the overlay.
-        #In practice an overlay ANSI stream can be a single line with ansi moves/restores etc - or even have no moves or newlines, just relying on wrapping at the output colwidth
+        #In practice an overlay ANSI stream can be a single line with ansi moves/restores etc - or even have no moves or newlines, just relying on wrapping at the output renderwidth 
         #In such cases - we process the whole shebazzle for the first output line - only reducing by the applied amount at the head each time, reprocessing the long tail each time.
         #(in cases where there are interline moves or cursor jumps anyway)
         #This works - but doesn't seem efficient.
@@ -409,7 +430,7 @@ tcl::namespace::eval overtype {
 
         set replay_codes_underlay [tcl::dict::create 1 ""] 
         #lappend replay_codes_overlay ""
-        set replay_codes_overlay ""
+        set replay_codes_overlay "[punk::ansi::a]"
         set unapplied ""
         set cursor_saved_position [tcl::dict::create] 
         set cursor_saved_attributes ""
@@ -452,14 +473,25 @@ tcl::namespace::eval overtype {
             }
             #review insert_mode. As an 'overtype' function whose main function is not interactive keystrokes - insert is secondary - 
             #but even if we didn't want it as an option to the function call - to process ansi adequately we need to support IRM (insertion-replacement mode) ESC [ 4 h|l
-            set LASTCALL [list -info 1 -insert_mode $insert_mode -autowrap_mode $autowrap_mode -transparent $opt_transparent -width $colwidth  -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -cursor_column $col -cursor_row $row $undertext $overtext]
+            set LASTCALL [list      -info 1\
+                                    -insert_mode $insert_mode\
+                                    -crm_mode $crm_mode\
+                                    -autowrap_mode $autowrap_mode\
+                                    -reverse_mode $reverse_mode\
+                                    -transparent $opt_transparent\
+                                    -width $renderwidth\
+                                    -exposed1 $opt_exposed1\
+                                    -exposed2 $opt_exposed2\
+                                    -overflow $opt_overflow -cursor_column $col -cursor_row $row $undertext $overtext]
             set rinfo [renderline   -experimental $opt_experimental\
                                     -info 1\
+                                    -crm_mode $crm_mode\
                                     -insert_mode $insert_mode\
-                                    -cursor_restore_attributes $cursor_saved_attributes\
                                     -autowrap_mode $autowrap_mode\
+                                    -reverse_mode  $reverse_mode\
+                                    -cursor_restore_attributes $cursor_saved_attributes\
                                     -transparent $opt_transparent\
-                                    -width $colwidth\
+                                    -width $renderwidth\
                                     -exposed1 $opt_exposed1\
                                     -exposed2 $opt_exposed2\
                                     -overflow $opt_overflow\
@@ -471,7 +503,10 @@ tcl::namespace::eval overtype {
             set instruction                 [tcl::dict::get $rinfo instruction]
             set insert_mode                 [tcl::dict::get $rinfo insert_mode]
             set autowrap_mode               [tcl::dict::get $rinfo autowrap_mode] ;#
-            #set reverse_mode                [tcl::dict::get $rinfo reverse_mode];#how to support in rendered linelist? we need to examine all pt/code blocks and flip each SGR stack?
+            set reverse_mode                [tcl::dict::get $rinfo reverse_mode]
+            #how to support reverse_mode in rendered linelist? we need to examine all pt/code blocks and flip each SGR stack?
+            # - review - the answer is probably that we don't need to - it is set/reset only during application of overtext
+            set crm_mode                    [tcl::dict::get $rinfo crm_mode]
             set rendered                    [tcl::dict::get $rinfo result]
             set overflow_right              [tcl::dict::get $rinfo overflow_right]
             set overflow_right_column       [tcl::dict::get $rinfo overflow_right_column]
@@ -486,7 +521,36 @@ tcl::namespace::eval overtype {
             set insert_lines_below          [tcl::dict::get $rinfo insert_lines_below]
             tcl::dict::set replay_codes_underlay [expr {$renderedrow+1}] [tcl::dict::get $rinfo replay_codes_underlay]
             #lset replay_codes_overlay [expr $overidx+1] [tcl::dict::get $rinfo replay_codes_overlay]
-            set replay_codes_overlay        [tcl::dict::get $rinfo replay_codes_overlay]
+            set replay_codes_overlay    [tcl::dict::get $rinfo replay_codes_overlay]
+            if {0 && $reverse_mode} {
+                puts stderr "---->[ansistring VIEW $replay_codes_overlay] rendered: $rendered"
+                #review
+                #JMN3
+                set existing_reverse_state 0 
+                #split_codes_single is single esc sequence - but could have multiple sgr codes within one esc sequence
+                #e.g \x1b\[0;31;7m  has a reset,colour red and reverse
+                set codeinfo [punk::ansi::codetype::sgr_merge [list $replay_codes_overlay] -info 1]
+                set codestate_reverse [dict get $codeinfo codestate reverse]
+                switch -- $codestate_reverse {
+                    7 {
+                        set existing_reverse_state 1
+                    }
+                    27 {
+                        set existing_reverse_state 0
+                    }
+                    "" {
+                    }
+                }
+                if {$existing_reverse_state == 0} {
+                    set rflip [a+ reverse]
+                } else {
+                    #reverse of reverse
+                    set rflip [a+ noreverse]
+                }
+                #note that mergeresult can have multiple esc (due to unmergeables or non sgr codes)
+                set replay_codes_overlay [punk::ansi::codetype::sgr_merge [list [dict get $codeinfo mergeresult] $rflip]]
+                puts stderr "---->[ansistring VIEW $replay_codes_overlay] rendered: $rendered"
+            }
 
 
 
@@ -520,7 +584,7 @@ tcl::namespace::eval overtype {
                             incr row
                             if {$data_mode} {
                                 set col [_get_row_append_column $row] 
-                                if {$col > $colwidth} {
+                                if {$col > $renderwidth} {
 
                                 }
                             } else {
@@ -563,10 +627,10 @@ tcl::namespace::eval overtype {
                             #we need renderline to return the number of the maximum column filled (or min if we ever do r-to-l)
                             set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                             set lastdatacol [punk::ansi::printing_length $existingdata]
-                            if {$lastdatacol < $colwidth} {
+                            if {$lastdatacol < $renderwidth} {
                                 set col [expr {$lastdatacol+1}]
                             } else {
-                                set col $colwidth 
+                                set col $renderwidth 
                             }
                         }
                         
@@ -601,10 +665,10 @@ tcl::namespace::eval overtype {
                             }
                             set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                             set lastdatacol [punk::ansi::printing_length $existingdata]
-                            if {$lastdatacol < $colwidth} {
+                            if {$lastdatacol < $renderwidth} {
                                 set col [expr {$lastdatacol+1}]
                             } else {
-                                set col $colwidth 
+                                set col $renderwidth 
                             }
 
                         }
@@ -640,9 +704,9 @@ tcl::namespace::eval overtype {
 
                             puts stdout ">>>[a+ red bold]overflow_right during restore_cursor[a]"
 
-                            set sub_info [overtype::renderline -info 1 -width $colwidth -insert_mode $insert_mode -autowrap_mode $autowrap_mode  -overflow [tcl::dict::get $opts -overflow] "" $overflow_right]
+                            set sub_info [overtype::renderline -info 1 -width $renderwidth -insert_mode $insert_mode -autowrap_mode $autowrap_mode  -overflow [tcl::dict::get $opts -overflow] "" $overflow_right]
                             set foldline [tcl::dict::get $sub_info result]
-                            set insert_mode [tcl::dict::get $sub_info insert_mode] ;#probably not needed.. 
+                            set insert_mode [tcl::dict::get $sub_info insert_mode] ;#probably not needed..? 
                             set autowrap_mode [tcl::dict::get $sub_info autowrap_mode] ;#nor this..
                             linsert outputlines $renderedrow $foldline
                             #review - row & col set by restore - but not if there was no save..
@@ -740,7 +804,7 @@ tcl::namespace::eval overtype {
                             }
                     }
                     lf_overflow {
-                            #linefeed after colwidth e.g at column 81 for an 80 col width
+                            #linefeed after renderwidth e.g at column 81 for an 80 col width
                             #we may also have other control sequences that came after col 80 e.g cursor save
 
                             if 0 {
@@ -833,10 +897,10 @@ tcl::namespace::eval overtype {
                             } else {
                                 set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                                 set lastdatacol [punk::ansi::printing_length $existingdata]
-                                if {$lastdatacol < $colwidth} {
+                                if {$lastdatacol < $renderwidth} {
                                     set col [expr {$lastdatacol+1}]
                                 } else {
-                                    set col $colwidth 
+                                    set col $renderwidth 
                                 }
                             }
                         }
@@ -845,12 +909,12 @@ tcl::namespace::eval overtype {
                         #doesn't seem to be used by fruit.ans testfile
                         #used by dzds.ans
                         #note that cursor_forward may move deep into the next line - or even span multiple lines !TODO
-                        set c $colwidth 
+                        set c $renderwidth 
                         set r $post_render_row
-                        if {$post_render_col > $colwidth} {
+                        if {$post_render_col > $renderwidth} {
                             set i $c
                             while {$i <= $post_render_col} {
-                                if {$c == $colwidth+1} {
+                                if {$c == $renderwidth+1} {
                                     incr r
                                     if {$opt_appendlines} {
                                         if {$r < [llength $outputlines]} {
@@ -874,7 +938,7 @@ tcl::namespace::eval overtype {
                         set col $c
                     }
                     wrapmovebackward {
-                        set c $colwidth
+                        set c $renderwidth
                         set r $post_render_row
                         if {$post_render_col < 1} {
                             set c 1 
@@ -883,7 +947,7 @@ tcl::namespace::eval overtype {
                                 if {$c == 0} {
                                     if {$r > 1} {
                                         incr r -1
-                                        set c $colwidth
+                                        set c $renderwidth
                                     } else {
                                         #leave r at 1 set c 1
                                         #testfile besthpav.ans first line top left border alignment
@@ -941,7 +1005,7 @@ tcl::namespace::eval overtype {
                         #2nd half of grapheme would overflow - treggering grapheme is returned in unapplied. There may also be overflow_right from earlier inserts
                         #todo - consider various options .. re-render a single trailing space or placeholder on same output line, etc
                         if {$autowrap_mode} {
-                            if {$colwidth < 2} {
+                            if {$renderwidth < 2} {
                                 #edge case of rendering to a single column output - any 2w char will just cause a loop if we don't substitute with something, or drop the character
                                 set idx 0
                                 set triggering_grapheme_index -1
@@ -960,7 +1024,7 @@ tcl::namespace::eval overtype {
                         } else {
                             set overflow_handled 1
                             #handled by dropping entire overflow if any  
-                            if {$colwidth < 2} {
+                            if {$renderwidth < 2} {
                                 set idx 0
                                 set triggering_grapheme_index -1
                                 foreach u $unapplied_list {
@@ -1141,12 +1205,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        #set renderwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
-        #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {$colwidth - $overblock_width}]
+        set under_exposed_max [expr {$renderwidth - $overblock_width}]
         if {$under_exposed_max > 0} {
             #background block is wider
             if {$under_exposed_max % 2 == 0} {
@@ -1176,14 +1239,14 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 set undertext "$undertext[string repeat { } $udiff]"
             }
             set undertext [tcl::string::cat $replay_codes_underlay $undertext]
             set overtext  [tcl::string::cat $replay_codes_overlay $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             #review - right-to-left langs should elide on left! - extra option required
 
             if {$overflowlength > 0} {
@@ -1196,8 +1259,8 @@ tcl::namespace::eval overtype {
 
                 #overlay line data is wider - trim if overflow not specified in opts - and overtype an ellipsis at right if it was specified
                 if {![tcl::dict::get $opts -overflow]} {
-                    #lappend outputlines [tcl::string::range $overtext 0 [expr {$colwidth - 1}]]
-                    #set overtext [tcl::string::range $overtext 0 $colwidth-1 ]
+                    #lappend outputlines [tcl::string::range $overtext 0 [expr {$renderwidth - 1}]]
+                    #set overtext [tcl::string::range $overtext 0 $renderwidth-1 ]
                     if {$opt_ellipsis} {
                         set show_ellipsis 1
                         if {!$opt_ellipsiswhitespace} {
@@ -1286,12 +1349,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
         #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {max(0,$colwidth - $overblock_width)}]
+        set under_exposed_max [expr {max(0,$renderwidth - $overblock_width)}]
         set left_exposed $under_exposed_max 
 
 
@@ -1307,8 +1369,8 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 #puts xxx
                 append undertext [string repeat { } $udiff]
             }
@@ -1336,10 +1398,17 @@ tcl::namespace::eval overtype {
             set undertext [tcl::string::cat $replay_codes_underlay $undertext]
             set overtext [tcl::string::cat $replay_codes_overlay $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             if {$overflowlength > 0} {	
                 #raw overtext wider than undertext column
-                set rinfo [renderline -info 1 -insert_mode 0 -transparent $opt_transparent -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -startcolumn [expr {1 + $startoffset}] $undertext $overtext]
+                set rinfo [renderline\
+                         -info 1\
+                         -insert_mode 0\
+                         -transparent $opt_transparent\
+                         -exposed1 $opt_exposed1 -exposed2 $opt_exposed2\
+                         -overflow $opt_overflow\
+                         -startcolumn [expr {1 + $startoffset}]\
+                         $undertext $overtext]
                 set replay_codes          [tcl::dict::get $rinfo replay_codes]
                 set rendered [tcl::dict::get $rinfo result]
                 if {!$opt_overflow} {
@@ -1433,12 +1502,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
         #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {max(0,$colwidth - $overblock_width)}]
+        set under_exposed_max [expr {max(0,$renderwidth - $overblock_width)}]
 
         switch -- $opt_blockalign {
             left {
@@ -1484,8 +1552,8 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 #puts xxx
                 append undertext [string repeat { } $udiff]
             }
@@ -1513,7 +1581,7 @@ tcl::namespace::eval overtype {
             set undertext   [tcl::string::cat $replay_codes_underlay    $undertext]
             set overtext    [tcl::string::cat $replay_codes_overlay     $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             if {$overflowlength > 0} {	
                 #raw overtext wider than undertext column
                 set rinfo [renderline -info 1 -insert_mode 0 -transparent $opt_transparent -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -startcolumn [expr {1 + $startoffset}] $undertext $overtext]
@@ -1566,6 +1634,7 @@ tcl::namespace::eval overtype {
                 #lappend outputlines [renderline -insert_mode 0 -transparent $opt_transparent -startcolumn [expr {$left_exposed + 1}] $undertext $overtext]
                 #Note - we still need overflow here - as although the overtext is short - it may oveflow due to the startoffset
                 set rinfo [renderline -info 1  -insert_mode 0 -transparent $opt_transparent -overflow $opt_overflow -startcolumn [expr {$left_exposed + 1 + $startoffset}] $undertext $overtext]
+                #puts stderr "--> [ansistring VIEW -lf 1 -nul 1 $rinfo] <--"
                 set overflow_right  [tcl::dict::get $rinfo overflow_right]
                 set unapplied       [tcl::dict::get $rinfo unapplied]
                 lappend outputlines [tcl::dict::get $rinfo result]
@@ -1629,6 +1698,7 @@ tcl::namespace::eval overtype {
             -cursor_column 1\
             -cursor_row    ""\
             -insert_mode   1\
+            -crm_mode      0\
             -autowrap_mode 1\
             -reverse_mode  0\
             -info          0\
@@ -1649,7 +1719,9 @@ tcl::namespace::eval overtype {
         set argsflags [lrange $args 0 end-2]
         tcl::dict::for {k v} $argsflags {
             switch -- $k {
-                -experimental - -cp437 - -width - -overflow - -transparent - -startcolumn - -cursor_column - -cursor_row - -insert_mode - -autowrap_mode - -reverse_mode - -info - -exposed1 - -exposed2 - -cursor_restore_attributes {
+                -experimental - -cp437 - -width - -overflow - -transparent - -startcolumn - -cursor_column - -cursor_row
+                - -crm_mode - -insert_mode - -autowrap_mode - -reverse_mode
+                - -info - -exposed1 - -exposed2 - -cursor_restore_attributes {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -1676,6 +1748,7 @@ tcl::namespace::eval overtype {
         # -- --- --- --- --- --- --- --- --- --- --- ---
         set opt_autowrap_mode       [tcl::dict::get $opts -autowrap_mode] ;#DECAWM - char or movement can go beyond leftmost/rightmost col to prev/next line
         set opt_reverse_mode        [tcl::dict::get $opts -reverse_mode]  ;#DECSNM
+        set opt_crm_mode            [tcl::dict::get $opts -crm_mode];# CRM - show control character mode
         # -- --- --- --- --- --- --- --- --- --- --- ---
         set temp_cursor_saved       [tcl::dict::get $opts -cursor_restore_attributes]
 
@@ -1721,6 +1794,10 @@ tcl::namespace::eval overtype {
             set cursor_row $opt_row_context
         }
 
+        set insert_mode $opt_insert_mode ;#default 1
+        set autowrap_mode $opt_autowrap_mode ;#default 1
+        set crm_mode $opt_crm_mode ;#default 0 (Show Control Character mode)
+        set reverse_mode $opt_reverse_mode
 
         #-----
         #
@@ -1768,6 +1845,7 @@ tcl::namespace::eval overtype {
         }
         set understacks [list]
         set understacks_gx [list]
+        set pm_list [list]
 
         set i_u -1  ;#underlay may legitimately be empty
         set undercols [list] 
@@ -1834,6 +1912,7 @@ tcl::namespace::eval overtype {
             #underlay should already have been rendered and not have non-sgr codes - but let's retain the check for them and not stack them if other codes are here
 
             #only stack SGR (graphics rendition) codes - not title sets, cursor moves etc 
+            #keep any remaining PMs in place
             if {$code ne ""} {
                 set c1c2 [tcl::string::range $code 0 1]
 
@@ -1841,6 +1920,8 @@ tcl::namespace::eval overtype {
                     \x1b\[          7CSI\
                     \x9b            8CSI\
                     \x1b\(          7GFX\
+                    \x1b^           7PMX\
+                    \x1bX           7SOS\
                 ] $c1c2] 0 3];# leadernorm is 1st 2 chars mapped to normalised indicator - or is original 2 chars
 
                 switch -- $leadernorm {
@@ -1875,6 +1956,26 @@ tcl::namespace::eval overtype {
                             }
                         }
                     }
+                    7PMX - 7SOS {
+                        #we can have PMs or SOS (start of string) in the underlay - though mostly the PMs should have been processed..
+                        #attach the PM/SOS (entire ANSI sequence) to the previous grapheme! 
+                        #It should not affect the size - but terminal display may get thrown out if terminal doesn't support them.
+
+                        #note that there may in theory already be ANSI stored - we don't assume it was a pure grapheme string
+                        set graphemeplus [lindex $undercols end]
+                        if {$graphemeplus ne "\0"} {
+                            append graphemeplus $code
+                        } else {
+                            set graphemeplus $code
+                        }
+                        lset undercols end $graphemeplus
+                        #The grapheme_width_cached function will be called on this later - and doesn't account for ansi.
+                        #we need to manually cache the item with it's proper width 
+                        variable grapheme_widths
+                        #stripped and plus version  keys pointing to same length
+                        dict set grapheme_widths $graphemeplus [grapheme_width_cached [::punk::ansi::ansistrip $graphemeplus]]
+
+                    }
                     default {
 
                     }
@@ -1937,9 +2038,9 @@ tcl::namespace::eval overtype {
 
         }
         if {$opt_width ne "\uFFEF"} {
-            set colwidth $opt_width
+            set renderwidth $opt_width
         } else {
-            set colwidth [llength $undercols]
+            set renderwidth [llength $undercols]
         }
 
 
@@ -2017,12 +2118,30 @@ tcl::namespace::eval overtype {
             }
             append pt_overchars $pt
             #will get empty pt between adjacent codes
-            foreach grapheme [punk::char::grapheme_split $pt] {
-                lappend overstacks $o_codestack
-                lappend overstacks_gx $o_gxstack
-                incr i_o 
-                lappend overlay_grapheme_control_list [list g $grapheme]
-                lappend overlay_grapheme_control_stacks $o_codestack
+            if {!$crm_mode} {
+                foreach grapheme [punk::char::grapheme_split $pt] {
+                    lappend overstacks $o_codestack
+                    lappend overstacks_gx $o_gxstack
+                    incr i_o 
+                    lappend overlay_grapheme_control_list [list g $grapheme]
+                    lappend overlay_grapheme_control_stacks $o_codestack
+                }
+            } else {
+                foreach grapheme_original [punk::char::grapheme_split $pt] {
+                    set pt_crm [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $grapheme_original]
+                    foreach grapheme [punk::char::grapheme_split $pt_crm] {
+                        if {$grapheme eq "\n"} {
+                            lappend overlay_grapheme_control_stacks $o_codestack
+                            lappend overlay_grapheme_control_list [list crmcontrol "\x1b\[00001E"]
+                        } else {
+                            lappend overstacks $o_codestack
+                            lappend overstacks_gx $o_gxstack
+                            incr i_o 
+                            lappend overlay_grapheme_control_list [list g $grapheme]
+                            lappend overlay_grapheme_control_stacks $o_codestack
+                        }
+                    }
+                }
             }
 
             #only stack SGR (graphics rendition) codes - not title sets, cursor moves etc 
@@ -2030,40 +2149,91 @@ tcl::namespace::eval overtype {
             # that pure resets are fairly common - more so than leading resets with other info
             # that non-sgr codes are not that common, so ok to check for resets before verifying it is actually SGR at all.
             if {$code ne ""} {
-                lappend overlay_grapheme_control_stacks $o_codestack
-                #there will always be an empty code at end due to foreach on 2 vars with odd-sized list ending with pt (overmap coming from perlish split) 
-                if {[punk::ansi::codetype::is_sgr_reset $code]} {
-                    set o_codestack [list "\x1b\[m"]  ;#reset better than empty list - fixes some ansi art issues
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
-                    set o_codestack [list $code]
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[priv::is_sgr $code]} {
-                    #basic simplification first - remove straight dupes
-                    set dup_posns [lsearch -all -exact $o_codestack $code] ;#must be -exact because of square-bracket glob chars
-                    set o_codestack [lremove $o_codestack {*}$dup_posns]
-                    lappend o_codestack $code
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[regexp {\x1b7|\x1b\[s} $code]} {
-                    #experiment
-                    #cursor_save - for the replays review.
-                    #jmn
-                    #set temp_cursor_saved [punk::ansi::codetype::sgr_merge_list {*}$o_codestack]
-                    lappend overlay_grapheme_control_list [list other $code]
-                } elseif {[regexp {\x1b8|\x1b\[u} $code]} {
-                    #experiment
-                    #cursor_restore - for the replays
-                    set o_codestack [list $temp_cursor_saved]    
-                    lappend overlay_grapheme_control_list [list other $code]
+                #we need to immediately set crm_mode here if \x1b\[3h received
+                if {$code eq "\x1b\[3h"} {
+                    set crm_mode 1
+                } elseif {$code eq "\x1b\[3l"} {
+                    set crm_mode 0
+                }
+                #else crm_mode could be set either way from options
+                if {$crm_mode && $code ne "\x1b\[00001E"} {
+                    #treat the code as type 'g' like above   - only allow through codes to reset mode REVIEW for now just \x1b\[3l ? 
+                    #we need to somehow convert further \n in the graphical rep to an instruction for newline that will bypass further crm_mode processing or we would loop.
+                    set code_as_pt [ansistring VIEW -nul 1 -lf 1 -vt 1 -ff 1 $code]
+                    #split using standard split for first foreach loop - grapheme based split when processing 2nd foreach loop
+                    set chars [split $code_as_pt ""]
+                    set codeparts [list] ;#list of 2-el lists each element {crmcontrol <ansi>} or {g <text>}
+                    foreach c $chars {
+                        if {$c eq "\n"} {
+                            #use CNL (cursor next line)  \x1b\[00001E  ;#leading zeroes ok for this processor - used as debugging aid to distinguish 
+                            lappend codeparts [list crmcontrol "\x1b\[00001E"]
+                        } else {
+                            if {[llength $codeparts] > 0 && [lindex $codeparts end 0] eq "g"} {
+                                set existing [lindex $codeparts end 1]
+                                lset codeparts end [list g [string cat $existing $c]]
+                            } else {
+                                lappend codeparts [list g $c]
+                            }
+                        }
+                    }
+
+                    set partidx 0
+                    foreach record $codeparts {
+                        lassign $record rtype rval
+                        switch -exact -- $rtype {
+                            g {
+                                append pt_overchars $rval 
+                                foreach grapheme [punk::char::grapheme_split $rval] {
+                                    lappend overstacks $o_codestack
+                                    lappend overstacks_gx $o_gxstack
+                                    incr i_o 
+                                    lappend overlay_grapheme_control_list [list g $grapheme]
+                                    lappend overlay_grapheme_control_stacks $o_codestack
+                                }
+                            }
+                            crmcontrol {
+                                #leave o_codestack
+                                lappend overlay_grapheme_control_stacks $o_codestack
+                                lappend overlay_grapheme_control_list [list crmcontrol $rval]
+                            }
+                        }
+                    }
                 } else {
-                    if {[punk::ansi::codetype::is_gx_open $code]} {
-                        set o_gxstack [list "gx0_on"]
-                        lappend overlay_grapheme_control_list [list gx0 gx0_on] ;#don't store code - will complicate debugging if we spit it out and jump character sets
-                    } elseif {[punk::ansi::codetype::is_gx_close $code]} {
-                        set o_gxstack [list]
-                        lappend overlay_grapheme_control_list [list gx0 gx0_off] ;#don't store code - will complicate debugging if we spit it out and jump character sets
-                    } else {
+                    lappend overlay_grapheme_control_stacks $o_codestack
+                    #there will always be an empty code at end due to foreach on 2 vars with odd-sized list ending with pt (overmap coming from perlish split) 
+                    if {[punk::ansi::codetype::is_sgr_reset $code]} {
+                        set o_codestack [list "\x1b\[m"]  ;#reset better than empty list - fixes some ansi art issues
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
+                        set o_codestack [list $code]
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[priv::is_sgr $code]} {
+                        #basic simplification first - remove straight dupes
+                        set dup_posns [lsearch -all -exact $o_codestack $code] ;#must be -exact because of square-bracket glob chars
+                        set o_codestack [lremove $o_codestack {*}$dup_posns]
+                        lappend o_codestack $code
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[regexp {\x1b7|\x1b\[s} $code]} {
+                        #experiment
+                        #cursor_save - for the replays review.
+                        #jmn
+                        #set temp_cursor_saved [punk::ansi::codetype::sgr_merge_list {*}$o_codestack]
+                        lappend overlay_grapheme_control_list [list other $code]
+                    } elseif {[regexp {\x1b8|\x1b\[u} $code]} {
+                        #experiment
+                        #cursor_restore - for the replays
+                        set o_codestack [list $temp_cursor_saved]    
                         lappend overlay_grapheme_control_list [list other $code]
+                    } else {
+                        if {[punk::ansi::codetype::is_gx_open $code]} {
+                            set o_gxstack [list "gx0_on"]
+                            lappend overlay_grapheme_control_list [list gx0 gx0_on] ;#don't store code - will complicate debugging if we spit it out and jump character sets
+                        } elseif {[punk::ansi::codetype::is_gx_close $code]} {
+                            set o_gxstack [list]
+                            lappend overlay_grapheme_control_list [list gx0 gx0_off] ;#don't store code - will complicate debugging if we spit it out and jump character sets
+                        } else {
+                            lappend overlay_grapheme_control_list [list other $code]
+                        }
                     }
                 }
             }
@@ -2135,9 +2305,6 @@ tcl::namespace::eval overtype {
         #movements only occur within the overlay range.
         #an underlay is however not necessary.. e.g
         #renderline -overflow 1 "" data 
-        #foreach {pt code} $overmap {}
-        set insert_mode $opt_insert_mode ;#default 1
-        set autowrap_mode $opt_autowrap_mode ;#default 1
 
         #set re_mode        {\x1b\[\?([0-9]*)(h|l)}   ;#e.g DECAWM 
         #set re_col_move    {\x1b\[([0-9]*)(C|D|G)$}
@@ -2163,13 +2330,28 @@ tcl::namespace::eval overtype {
             switch -- $type {
                 g { 
                     set ch $item 
+                    #crm_mode affects both graphic and control 
+                    if {$crm_mode} {
+                        set chars [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $ch]
+                        set chars [string map [list \n "\x1b\[00001E"] $chars]
+                        if {[llength [split $chars ""]] > 1} { 
+                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                            #prefix the unapplied controls with the string version of this control
+                            set unapplied_list [linsert $unapplied_list 0 {*}[split $chars ""]]
+                            set unapplied [join $unapplied_list ""]
+                            #incr idx_over
+                            break
+                        } else {
+                            set ch $chars
+                        }
+                    }
                     incr idx_over; #idx_over (until unapplied reached anyway) is per *grapheme* in the overlay - not per col. 
                     if {($idx < ($opt_colstart -1))} {
                         incr idx [grapheme_width_cached $ch]
                         continue
                     }
                     #set within_undercols [expr {$idx <= [llength $undercols]-1}] ;#within our active data width 
-                    set within_undercols [expr {$idx <= $colwidth-1}]
+                    set within_undercols [expr {$idx <= $renderwidth-1}]
 
                     #https://www.enigma.com/resources/blog/the-secret-world-of-newline-characters
                     #\x85 NEL in the c1 control set is treated by some terminal emulators (e.g Hyper) as a newline,
@@ -2311,6 +2493,7 @@ tcl::namespace::eval overtype {
                                 } else {
                                     #todo - punk::char::char_width
                                     set g [lindex $outcols $idx]
+                                    #JMN
                                     set uwidth [grapheme_width_cached $g]
                                     if {[lindex $outcols $idx] eq ""} {
                                         #2nd col of 2-wide char in underlay 
@@ -2485,13 +2668,29 @@ tcl::namespace::eval overtype {
 
 
                 }
-                other {
+                other - crmcontrol {
+                    if {$crm_mode && $type ne "crmcontrol" && $item ne "\x1b\[00001E"} {
+                        if {$item eq "\x1b\[3l"} {
+                            set crm_mode 0
+                        } else {
+                            #When our initial overlay split was done - we weren't in crm_mode - so there are codes that weren't mapped to unicode control character representations
+                            #set within_undercols [expr {$idx <= $renderwidth-1}]
+                            #set chars [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $item]
+                            set chars [ansistring VIEW -nul 1 -lf 1 -vt 1 -ff 1 $item]
+                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                            #prefix the unapplied controls with the string version of this control
+                            set unapplied_list [linsert $unapplied_list 0 {*}[split $chars ""]]
+                            set unapplied [join $unapplied_list ""]
+                            
+                            break
+                        }
+                    }
+
                     #todo - consider CSI s DECSLRM vs ansi.sys \x1b\[s  - we need \x1b\[s for oldschool ansi art - but may have to enable only for that.
-                    #we should probably therefore reverse this mapping so that x1b7 x1b8 are the primary codes for save/restore
+                    #we should possibly therefore reverse this mapping so that x1b7 x1b8 are the primary codes for save/restore?
                     set code [tcl::string::map [list \x1b7 \x1b\[s \x1b8 \x1b\[u ] $item]
                     #since this element isn't a grapheme - advance idx_over to next grapheme overlay when about to fill 'unapplied'
 
-                    set matchinfo [list]
 
                     #remap of DEC cursor_save/cursor_restore from ESC sequence to equivalent CSI
                     #probably not ideal - consider putting cursor_save/cursor_restore in functions so they can be called from the appropriate switch branch instead of using this mapping
@@ -2501,7 +2700,7 @@ tcl::namespace::eval overtype {
                     set c1c2c3 [tcl::string::range $code 0 2]
                     #set re_ST_open {(?:\033P|\u0090|\033X|\u0098|\033\^|\u009e|\033_|\u009f)} 
                     #tcl 8.7 - faster to use inline list than to store it in a local var outside of loop. 
-                    #(surprising - but presumably )
+                    #(somewhat surprising)
                     set leadernorm [tcl::string::range [tcl::string::map [list\
                         \x1b\[<     1006\
                         \x1b\[      7CSI\
@@ -2509,7 +2708,7 @@ tcl::namespace::eval overtype {
                         \x1b\]      7OSC\
                         \x9d        8OSC\
                         \x1b        7ESC\
-                        ] $c1c2c3] 0 3] ;#leadernorm is 1st 2 chars mapped to 4char normalised indicator - or is original 2 chars 
+                        ] $c1c2c3] 0 3] ;#leadernorm is 1st 1,2 or 3 chars mapped to 4char normalised indicator - or is original first chars (1,2 or 3 len) 
 
                     #we leave the tail of the code unmapped for now 
                     switch -- $leadernorm {
@@ -2528,7 +2727,10 @@ tcl::namespace::eval overtype {
                             set codenorm [tcl::string::cat $leadernorm [tcl::string::range $code 1 end]]
                         }
                         default {
+                            puts stderr "Sequence detected as ANSI, but not handled in leadernorm switch. code: [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
                             #we haven't made a mapping for this
+                            #could in theory be 1,2 or 3 in len 
+                            #although we shouldn't be getting here if the regexp for ansi codes is kept in sync with our switch branches
                             set codenorm $code
                         }
                     }
@@ -2551,44 +2753,44 @@ tcl::namespace::eval overtype {
                         {7CSI} - {8CSI} {
                             set param [tcl::string::range $codenorm 4 end-1]
                             #puts stdout "--> CSI [tcl::string::index $leadernorm 0] bit param:$param"
-                            switch -- [tcl::string::index $codenorm end] {
-                                D {
-                                    #Col move
-                                    #puts stdout "<-back"
-                                    #cursor back
-                                    #left-arrow/move-back when ltr mode
+                            set code_end [tcl::string::index $codenorm end] ;#used for e.g h|l set/unset mode
+                            switch -exact -- $code_end {
+                                A {
+                                    #Row move - up
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
                                     set num $param
                                     if {$num eq ""} {set num 1}
+                                    incr cursor_row -$num
 
-                                    set version 2
-                                    if {$version eq "2"} {
-                                        #todo - startcolumn offset!
-                                        if {$cursor_column - $num >= 1} {
-                                            incr idx -$num
-                                            incr cursor_column -$num
-                                        } else {
-                                            if {!$autowrap_mode} {
-                                            set cursor_column 1 
-                                            set idx 0
-                                            } else {
-                                                set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                                incr cursor_column -$num
-                                                priv::render_unapplied $overlay_grapheme_control_list $gci
-                                                set instruction wrapmovebackward
-                                                break
-                                            }
-                                        }
-                                    } else {
-                                        incr idx -$num
-                                        incr cursor_column -$num
-                                        if {$idx < $opt_colstart-1} {
-                                            #wrap to previous line and position cursor at end of data
-                                            set idx [expr {$opt_colstart-1}]
-                                            set cursor_column $opt_colstart
-                                        }
+                                    if {$cursor_row < 1} {
+                                        set cursor_row  1
                                     }
+
+                                    #ensure rest of *overlay* is emitted to remainder
+                                    incr idx_over
+                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                    set instruction up
+                                    #retain cursor_column
+                                    break 
+                                }
+                                B {
+                                    #CUD - Cursor Down
+                                    #Row move - down
+                                    set num $param
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                    #move down
+                                    if {$num eq ""} {set num 1}
+                                    incr cursor_row $num
+
+
+                                    incr idx_over ;#idx_over hasn't encountered a grapheme and hasn't advanced yet 
+                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                    set instruction down
+                                    #retain cursor_column
+                                    break 
                                 }
                                 C {
+                                    #CUF - Cursor Forward
                                     #Col move
                                     #puts stdout "->forward"
                                     #todo - consider right-to-left cursor mode (e.g Hebrew).. some day.
@@ -2692,80 +2894,215 @@ tcl::namespace::eval overtype {
                                         }
                                     }
                                 } 
-                                G {
+                                D {
                                     #Col move
-                                    #move absolute column
-                                    #adjust to colstart - as column 1 is within overlay
-                                    #???
-                                    set idx [expr {$param + $opt_colstart -1}] 
-                                    set cursor_column $param
-                                    error "renderline absolute col move ESC G unimplemented"
-                                }
-                                A {
-                                    #Row move - up
-                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                    #puts stdout "<-back"
+                                    #cursor back
+                                    #left-arrow/move-back when ltr mode
                                     set num $param
                                     if {$num eq ""} {set num 1}
-                                    incr cursor_row -$num
 
-                                    if {$cursor_row < 1} {
-                                        set cursor_row  1
+                                    set version 2
+                                    if {$version eq "2"} {
+                                        #todo - startcolumn offset!
+                                        if {$cursor_column - $num >= 1} {
+                                            incr idx -$num
+                                            incr cursor_column -$num
+                                        } else {
+                                            if {!$autowrap_mode} {
+                                            set cursor_column 1 
+                                            set idx 0
+                                            } else {
+                                                set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                                incr cursor_column -$num
+                                                priv::render_unapplied $overlay_grapheme_control_list $gci
+                                                set instruction wrapmovebackward
+                                                break
+                                            }
+                                        }
+                                    } else {
+                                        incr idx -$num
+                                        incr cursor_column -$num
+                                        if {$idx < $opt_colstart-1} {
+                                            #wrap to previous line and position cursor at end of data
+                                            set idx [expr {$opt_colstart-1}]
+                                            set cursor_column $opt_colstart
+                                        }
                                     }
-
-                                    #ensure rest of *overlay* is emitted to remainder
+                                }
+                                E {
+                                    #CNL - Cursor Next Line
+                                    if {$param eq ""} {
+                                        set downmove 1
+                                    } else {
+                                        set downmove [expr {$param}]
+                                    }
+                                    puts stderr "renderline CNL down-by-$downmove"
+                                    set cursor_column 1
+                                    set cursor_row [expr {$cursor_row + $downmove}]
+                                    set idx [expr {$cursor_column -1}]
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
                                     incr idx_over
                                     priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction up
-                                    #retain cursor_column
-                                    break 
+                                    set instruction move
+                                    break
+
                                 }
-                                B {
-                                    #Row move - down
-                                    set num $param
+                                F {
+                                    #CPL - Cursor Previous Line
+                                    if {$param eq ""} {
+                                        set upmove 1
+                                    } else {
+                                        set upmove [expr {$param}]
+                                    }
+                                    puts stderr "renderline CPL up-by-$upmove"
+                                    set cursor_column 1
+                                    set cursor_row [expr {$cursor_row -$upmove}]
+                                    if {$cursor_row < 1} {
+                                        set cursor_row 1
+                                    } 
+                                    set idx [expr {$cursor_column - 1}]
                                     set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                    #move down
-                                    if {$num eq ""} {set num 1}
-                                    incr cursor_row $num
-
-
-                                    incr idx_over ;#idx_over hasn't encountered a grapheme and hasn't advanced yet 
+                                    incr idx_over
                                     priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction down
-                                    #retain cursor_column
-                                    break 
+                                    set instruction move
+                                    break
+
+                                }
+                                G {
+                                    #CHA - Cursor Horizontal Absolute (move to absolute column no)
+                                    if {$param eq ""} {
+                                        set targetcol 1
+                                    } else {
+                                        set targetcol $param
+                                        if {![string is integer -strict $targetcol]} {
+                                            puts stderr "renderline CHA (Cursor Horizontal Absolute) error. Unrecognised parameter '$param'"
+                                        }
+                                        set targetcol [expr {$param}]
+                                        set max [llength $outcols]
+                                        if {$overflow_idx == -1} {
+                                            incr max
+                                        }
+                                        if {$targetcol > $max} {
+                                            puts stderr "renderline CHA (Cursor Horizontal Absolute) error. Param '$param' > max: $max"
+                                            set targetcol $max
+                                        }
+                                    }
+                                    #adjust to colstart - as column 1 is within overlay
+                                    #??? REVIEW
+                                    set idx [expr {($targetcol -1) + $opt_colstart -1}] 
+                                    
+                                     
+                                    set cursor_column $targetcol
+                                    #puts stderr "renderline absolute col move ESC G (TEST)"
                                 }
                                 H - f {
-                                    #$re_both_move
-                                    lassign [split $param {;}] row col
-                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                    #lassign $matchinfo _match row col 
+                                    #CSI n;m H - CUP - Cursor Position
 
-                                    if {$col eq ""} {set col 1}
-                                    set max [llength $outcols]
-                                    if {$overflow_idx == -1} {
-                                        incr max 
-                                    }
-                                    if {$col > $max} {
-                                        set cursor_column  $max
+                                    #CSI n;m f - HVP - Horizontal Vertical Position REVIEW - same as CUP with differences (what?) in some terminal modes
+                                    # - 'counts as effector format function  (like CR or LF) rather than an editor function (like CUD or CNL)'
+                                    # - REVIEW 
+                                    #see Annex A at: https://www.ecma-international.org/wp-content/uploads/ECMA-48_5th_edition_june_1991.pdf
+
+                                    #test e.g ansicat face_2.ans
+                                    #$re_both_move
+                                    lassign [split $param {;}] paramrow paramcol
+                                    #missing defaults to 1
+                                    #CSI ;5H = CSI 1;5H -> row 1 col 5
+                                    #CSI 17;H = CSI 17H = CSI 17;1H -> row 17 col 1 
+
+                                    if {$paramcol eq ""} {set paramcol 1}
+                                    if {$paramrow eq ""} {set paramrow 1}
+                                    if {![string is integer -strict $paramcol] || ![string is integer -strict $paramrow]} {
+                                        puts stderr "renderline CUP (CSI <param> H) unrecognised param $param"
+                                        #ignore?
                                     } else {
-                                        set cursor_column $col
+                                        set max [llength $outcols]
+                                        if {$overflow_idx == -1} {
+                                            incr max 
+                                        }
+                                        if {$paramcol > $max} {
+                                            set target_column  $max
+                                        } else {
+                                            set target_column [expr {$paramcol}]
+                                        }
+
+
+                                        if {$paramrow < 1} {
+                                            puts stderr "renderline CUP (CSI <param> H) bad row target 0. Assuming 1"
+                                            set target_row 1
+                                        } else {
+                                            set target_row [expr {$paramrow}]
+                                        }
+                                        if {$target_row == $cursor_row} {
+                                            #col move only - no need for break and move
+                                            #puts stderr "renderline CUP col move only to col $target_column param:$param"
+                                            set cursor_column $target_column
+                                            set idx [expr {$cursor_column -1}]
+                                        } else {
+                                            set cursor_row $target_row
+                                            set cursor_column $target_column
+                                            set idx [expr {$cursor_column -1}]
+                                            set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                            incr idx_over
+                                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                                            set instruction move
+                                            break
+                                        }
                                     }
-                                    set idx [expr {$cursor_column -1}]
+                                }
+                                J {
+                                    puts stderr "overtype::renderline ED - ERASE IN DISPLAY (TESTING) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                    if {$param eq ""} {set param 0} 
+                                    switch -exact -- $param {
+                                        0 {
+                                            #clear from cursor to end of screen
+                                        }
+                                        1 {
+                                            #clear from cursor to beginning of screen
+                                        }
+                                        2 {
+                                            #clear entire screen
+                                            #ansi.sys - move cursor to upper left REVIEW
+                                            set cursor_row 1
+                                            set cursor_column 1
+                                            set idx [expr {$cursor_column -1}]
+                                            set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                            incr idx_over
+                                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                                            set instruction move
+                                            break
+                                        }
+                                        3 {
+                                            #clear entire screen. presumably cursor doesn't move - otherwise it would be same as 2J ?
 
-                                    if {$row eq ""} {set row 1}
-                                    set cursor_row $row
-                                    if {$cursor_row < 1} {
-                                        set cursor_row 1
+                                        }
+                                        default {
+                                        }
                                     }
 
-                                    incr idx_over
-                                    priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction move
-                                    break
+                                }
+                                K {
+                                    puts stderr "overtype::renderline EL - ERASE IN LINE (TESTING) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                    if {$param eq ""} {set param 0} 
+                                    switch -exact -- $param {
+                                        0 {
+                                            #clear from cursor to end of line
+                                        }
+                                        1 {
+                                            #clear from cursor to beginning of line
 
+                                        }
+                                        2 {
+                                            #clear entire line
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline EL - ERASE IN LINE PARAM '$param' unrecognised [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                        }
+                                    }
                                 }
                                 X {
-                                    puts stderr "X - $param"
+                                    puts stderr "overtype::renderline X ECH ERASE CHARACTER - $param"
                                     #ECH - erase character
                                     if {$param eq "" || $param eq "0"} {set param 1}; #param=count of chars to erase
                                     priv::render_erasechar $idx $param 
@@ -2789,78 +3126,119 @@ tcl::namespace::eval overtype {
                                     break
                                 }
                                 s {
-                                    # - todo - make ansi.sys CSI s cursor save only apply for certain cases? - may need to support DECSLRM instead which uses same code
-
-                                    #$re_cursor_save
-                                    #cursor save could come after last column  
-                                    if {$overflow_idx != -1 && $idx == $overflow_idx} {
-                                        #bartman2.ans test file - fixes misalignment at bottom of dialog bubble
-                                        #incr cursor_row
-                                        #set cursor_column 1
-                                        #bwings1.ans test file - breaks if we actually incr cursor (has repeated saves)
-                                        set cursor_saved_position [list row [expr {$cursor_row+1}] column 1]
-                                    } else {
-                                        set cursor_saved_position [list row $cursor_row column $cursor_column]
-                                    }
-                                    #there may be overlay stackable codes emitted that aren't in the understacks because they come between the last emmited character and the cursor_save control.
-                                    #we need the SGR and gx overlay codes prior to the cursor_save  
+                                    #code conflict between ansi emulation and DECSLRM - REVIEW
+                                    #ANSISYSSC  (when no parameters) - like other terminals - essentially treat same as DECSC
+                                    # todo - when parameters - support DECSLRM instead
+
+                                    if {$param ne ""} {
+                                        #DECSLRM - should only be recognised if DECLRMM is set  (vertical split screen mode)
+                                        lassign [split $param {;} margin_left margin_right 
+                                        puts stderr "overtype DECSLRM not yet supported - got [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                        if {$margin_left eq ""} {
+                                            set margin_left 1
+                                        }
+                                        set columns_per_page 80 ;#todo - set to 'page width (DECSCPP set columns per page)' - could be 132 or??
+                                        if {$margin_right eq ""} {
+                                            set margin_right $columns_per_page 
+                                        }
+                                        puts stderr "DECSLRM margin left: $margin_left margin right: $margin_right"
+                                        if {![string is integer -strict $margin_left] || $margin_left < 0} {
+                                            puts stderr "DECSLRM invalid margin_left"
+                                        }
+                                        if {![string is integer -strict $margin_right] || $margin_right < 0} {
+                                            puts stderr "DECSLRM invalid margin_right"
+                                        }
+                                        set scrolling_region_size [expr {$margin_right - $margin_left}]
+                                        if {$scrolling_region_size < 2 || $scrolling_region_size > $columns_per_page} {
+                                            puts stderr "DECSLRM region size '$scrolling_regsion_size' must be between 1 and $columns_per_page"
+                                        }
+                                        #todo 
 
-                                    #a real terminal would not be able to know the state of the underlay.. so we should probably ignore it.
-                                    #set sgr_stack [lindex $understacks $idx]
-                                    #set gx_stack [lindex $understacks_gx $idx] ;#not actually a stack - just a boolean state (for now?)
-                                    
-                                    set sgr_stack [list]
-                                    set gx_stack [list]
-
-                                    #we shouldn't need to scan for intermediate cursor save/restores - as restores would throw-back to the calling loop - so our overlay 'line' is since those.
-                                    #The overlay_grapheme_control_list had leading resets from previous lines - so we go back to the beginning not just the first grapheme.
-
-                                    foreach gc [lrange $overlay_grapheme_control_list 0 $gci-1] {
-                                        lassign $gc type code 
-                                        #types g other sgr gx0
-                                        switch -- $type {
-                                            gx0 {
-                                                #code is actually a stand-in for the graphics on/off code  - not the raw code
-                                                #It is either gx0_on or gx0_off 
-                                                set gx_stack [list $code]
-                                            }
-                                            sgr {
-                                                #code is the raw code
-                                                if {[punk::ansi::codetype::is_sgr_reset $code]} {
-                                                    #jmn
-                                                    set sgr_stack [list "\x1b\[m"]
-                                                } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
-                                                    set sgr_stack [list $code]
-                                                    lappend overlay_grapheme_control_list [list sgr $code]
-                                                } elseif {[priv::is_sgr $code]} {
-                                                    #often we don't get resets - and codes just pile up.
-                                                    #as a first step to simplifying - at least remove earlier straight up dupes
-                                                    set dup_posns [lsearch -all -exact $sgr_stack $code] ;#needs -exact - codes have square-brackets (glob chars)
-                                                    set sgr_stack [lremove $sgr_stack {*}$dup_posns]
-                                                    lappend sgr_stack $code
+
+                                    } else {
+                                        #DECSC
+                                        #//notes on expected behaviour:
+                                        #DECSC - saves following items in terminal's memory
+                                        #cursor position
+                                        #character attributes set by the SGR command
+                                        #character sets (G0,G1,G2 or G3) currently in GL and GR
+                                        #Wrap flag (autowrap or no autowrap)
+                                        #State of origin mode (DECOM)
+                                        #selective erase attribute
+                                        #any single shift 2 (SS2) or single shift 3(SSD) functions sent
+
+                                        #$re_cursor_save
+                                        #cursor save could come after last column  
+                                        if {$overflow_idx != -1 && $idx == $overflow_idx} {
+                                            #bartman2.ans test file - fixes misalignment at bottom of dialog bubble
+                                            #incr cursor_row
+                                            #set cursor_column 1
+                                            #bwings1.ans test file - breaks if we actually incr cursor (has repeated saves)
+                                            set cursor_saved_position [list row [expr {$cursor_row+1}] column 1]
+                                        } else {
+                                            set cursor_saved_position [list row $cursor_row column $cursor_column]
+                                        }
+                                        #there may be overlay stackable codes emitted that aren't in the understacks because they come between the last emmited character and the cursor_save control.
+                                        #we need the SGR and gx overlay codes prior to the cursor_save  
+
+                                        #a real terminal would not be able to know the state of the underlay.. so we should probably ignore it.
+                                        #set sgr_stack [lindex $understacks $idx]
+                                        #set gx_stack [lindex $understacks_gx $idx] ;#not actually a stack - just a boolean state (for now?)
+                                        
+                                        set sgr_stack [list]
+                                        set gx_stack [list]
+
+                                        #we shouldn't need to scan for intermediate cursor save/restores - as restores would throw-back to the calling loop - so our overlay 'line' is since those.
+                                        #The overlay_grapheme_control_list had leading resets from previous lines - so we go back to the beginning not just the first grapheme.
+
+                                        foreach gc [lrange $overlay_grapheme_control_list 0 $gci-1] {
+                                            lassign $gc type code 
+                                            #types g other sgr gx0
+                                            switch -- $type {
+                                                gx0 {
+                                                    #code is actually a stand-in for the graphics on/off code  - not the raw code
+                                                    #It is either gx0_on or gx0_off 
+                                                    set gx_stack [list $code]
+                                                }
+                                                sgr {
+                                                    #code is the raw code
+                                                    if {[punk::ansi::codetype::is_sgr_reset $code]} {
+                                                        #jmn
+                                                        set sgr_stack [list "\x1b\[m"]
+                                                    } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
+                                                        set sgr_stack [list $code]
+                                                        lappend overlay_grapheme_control_list [list sgr $code]
+                                                    } elseif {[priv::is_sgr $code]} {
+                                                        #often we don't get resets - and codes just pile up.
+                                                        #as a first step to simplifying - at least remove earlier straight up dupes
+                                                        set dup_posns [lsearch -all -exact $sgr_stack $code] ;#needs -exact - codes have square-brackets (glob chars)
+                                                        set sgr_stack [lremove $sgr_stack {*}$dup_posns]
+                                                        lappend sgr_stack $code
+                                                    }
                                                 }
                                             }
                                         }
-                                    }
-                                    set cursor_saved_attributes ""
-                                    switch -- [lindex $gx_stack 0] {
-                                        gx0_on {
-                                            append cursor_saved_attributes "\x1b(0"
-                                        }
-                                        gx0_off {
-                                            append cursor_saved_attributes "\x1b(B"
+                                        set cursor_saved_attributes ""
+                                        switch -- [lindex $gx_stack 0] {
+                                            gx0_on {
+                                                append cursor_saved_attributes "\x1b(0"
+                                            }
+                                            gx0_off {
+                                                append cursor_saved_attributes "\x1b(B"
+                                            }
                                         }
-                                    }
-                                    #append cursor_saved_attributes [join $sgr_stack ""]
-                                    append cursor_saved_attributes [punk::ansi::codetype::sgr_merge_list {*}$sgr_stack]
+                                        #append cursor_saved_attributes [join $sgr_stack ""]
+                                        append cursor_saved_attributes [punk::ansi::codetype::sgr_merge_list {*}$sgr_stack]
 
-                                    #as there is apparently only one cursor storage element we don't need to throw back to the calling loop for a save.
+                                        #as there is apparently only one cursor storage element we don't need to throw back to the calling loop for a save.
 
-                                    #don't incr index - or the save will cause cursor to move to the right
-                                    #carry on 
-                                    
+                                        #don't incr index - or the save will cause cursor to move to the right
+                                        #carry on 
+                                    }
                                 }
                                 u {
+                                    #ANSISYSRC save cursor (when no parameters)  (DECSC)
+
                                     #$re_cursor_restore
                                     #we are going to jump somewhere.. for now we will assume another line, and process accordingly.
                                     #The caller has the cursor_saved_position/cursor_saved_attributes if any (?review - if we always pass it back it, we could save some calls for moves in same line)
@@ -2903,7 +3281,6 @@ tcl::namespace::eval overtype {
                                 }
                                 ~ {
                                     #$re_vt_sequence
-                                    #lassign $matchinfo _match key mod 
                                     lassign [split $param {;}] key mod
 
                                     #Note that f1 to f4 show as ESCOP|Q|R|S  (VT220?) but f5+ show as ESC\[15~
@@ -2972,64 +3349,129 @@ tcl::namespace::eval overtype {
 
                                 }
                                 h - l {
+                                    #set mode unset mode
                                     #we are matching only last char to get to this arm - but are there other sequences ending in h|l we need to handle?
 
                                     #$re_mode if first after CSI is "?"  
                                     #some docs mention ESC=<mode>h|l  - not seen on windows terminals.. review
                                     #e.g https://www2.math.upenn.edu/~kazdan/210/computer/ansi.html
-                                    if {[tcl::string::index $codenorm 4] eq "?"} {
-                                        set num [tcl::string::range $codenorm 5 end-1] ;#param between ? and h|l
-                                        #lassign $matchinfo _match num type
-                                        switch -- $num {
-                                            5 {
-                                                #DECSNM - reverse video
-                                                #How we simulate this to render within a block of text is an open question.
-                                                #track all SGR stacks and constantly flip based on the current SGR reverse state?
-                                                #It is the job of the calling loop to do this - so at this stage we'll just set the states
-                                                #DECAWM autowrap 
-                                                if {$type eq "h"} {
-                                                    #set (enable)
-                                                    set reverse_mode 1
-                                                } else {
-                                                    #reset (disable)
-                                                    set reverse_mode 0
+                                    set modegroup [tcl::string::index $codenorm 4] ;#e.g ? =
+                                    switch -exact -- $modegroup {
+                                        ? {
+                                            set num [tcl::string::range $codenorm 5 end-1] ;#param between ? and h|l
+                                            switch -- $num {
+                                                5 {
+                                                    #DECSNM - reverse video
+                                                    #How we simulate this to render within a block of text is an open question.
+                                                    #track all SGR stacks and constantly flip based on the current SGR reverse state?
+                                                    #It is the job of the calling loop to do this - so at this stage we'll just set the states
+
+                                                    if {$code_end eq "h"} {
+                                                        #set (enable)
+                                                        set reverse_mode 1
+                                                    } else {
+                                                        #reset (disable)
+                                                        set reverse_mode 0
+                                                    }
+
+                                                }
+                                                7 {
+                                                    #DECAWM autowrap 
+                                                    if {$code_end eq "h"} {
+                                                        #set (enable)
+                                                        set autowrap_mode 1
+                                                        if {$opt_width ne "\uFFEF"} {
+                                                            set overflow_idx $opt_width
+                                                        } else {
+                                                            #review - this is also the cursor position when adding a char at end of line? 
+                                                            set overflow_idx [expr {[llength $undercols]}] ;#index at which we would be *in* overflow a row move may still override it 
+                                                        }
+                                                        #review - can idx ever be beyond overflow_idx limit when we change e.g with a width setting and cursor movements? presume not - but sanity check for now.
+                                                        if {$idx >= $overflow_idx} {
+                                                            puts stderr "renderline error - idx '$idx' >= overflow_idx '$overflow_idx' - unexpected"
+                                                        }
+                                                    } else {
+                                                        #reset (disable)
+                                                        set autowrap_mode 0
+                                                        set overflow_idx -1
+                                                    }
                                                 }
+                                                25 {
+                                                    if {$code_end eq "h"} {
+                                                        #visible cursor
 
+                                                    } else {
+                                                        #invisible cursor
+
+                                                    }
+                                                }
                                             }
-                                            7 {
-                                                #DECAWM autowrap 
-                                                if {$type eq "h"} {
-                                                    #set (enable)
-                                                    set autowrap_mode 1
-                                                    if {$opt_width ne "\uFFEF"} {
-                                                        set overflow_idx $opt_width
+                                        }
+                                        = {
+                                            set num [tcl::string::range $codenorm 5 end-1] ;#param between = and h|l
+                                            puts stderr "overtype::renderline CSI=...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
+                                        default {
+                                            #e.g CSI 4 h
+                                            set num [tcl::string::range $codenorm 4 end-1] ;#param before h|l
+                                            switch -exact -- $num {
+                                                3 {
+                                                    puts stderr "CRM MODE $code_end"
+                                                    #CRM - Show control character mode
+                                                    # 'No control functions are executed except LF,FF and VT which are represented in the CRM FONT before a CRLF(new line) is executed'
+                                                    #  
+                                                    #use ansistring VIEW -nul 1 -lf 2 -ff 2 -vt 2
+                                                    #https://vt100.net/docs/vt510-rm/CRM.html
+                                                    if {$code_end eq "h"} {
+                                                        set crm_mode 1
                                                     } else {
-                                                        #review - this is also the cursor position when adding a char at end of line? 
-                                                        set overflow_idx [expr {[llength $undercols]}] ;#index at which we would be *in* overflow a row move may still override it 
+                                                        set crm_mode 0
                                                     }
-                                                    #review - can idx ever be beyond overflow_idx limit when we change e.g with a width setting and cursor movements? presume not - but sanity check for now.
-                                                    if {$idx >= $overflow_idx} {
-                                                        puts stderr "renderline error - idx '$idx' >= overflow_idx '$overflow_idx' - unexpected"
+                                                }
+                                                4 {
+                                                    #IRM - Insert/Replace Mode
+                                                    if {$code_end eq "h"} {
+                                                        set insert_mode 1
+                                                    } else {
+                                                        #replace mode
+                                                        set insert_mode 0
                                                     }
-                                                } else {
-                                                    #reset (disable)
-                                                    set autowrap_mode 0
-                                                    set overflow_idx -1
                                                 }
+                                                default {
+                                                    puts stderr "overtype::renderline CSI...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                | {
+                                    switch -- [tcl::string::index $codenorm end-1] {
+                                        {$} {
+                                            #CSI ... $ |   DECSCPP set columns per page- (recommended in vt510 docs as preferable to DECCOLM)
+                                            #real terminals generally only supported 80/132
+                                            #some other virtuals support any where from 2 to 65,536?
+                                            #we will allow arbitrary widths >= 2 .. to some as yet undetermined limit.
+                                            #CSI <param> $ |
+                                            #empty or 0 param is 80 for compatibility - other numbers > 2 accepted
+                                            set page_width -1 ;#flag as unset
+                                            if {$param eq ""} {
+                                                set page_width 80
+                                            }  elseif {[string is integer -strict $param] && $param >=2 0} {
+                                                set page_width [expr {$param}] ;#we should allow leading zeros in the number - but lets normalize using expr
+                                            } else {
+                                                puts stderr "overtype::renderline unacceptable DECSPP value '$param'" 
                                             }
-                                            25 {
-                                                if {$type eq "h"} {
-                                                    #visible cursor
 
-                                                } else {
-                                                    #invisible cursor
+                                            if {$page_width > 2} {
+                                                puts stderr "overtype::renderline DECSCPP - not implemented - but selected width '$page_width' looks ok"
+                                                #if cursor already beyond new page_width - will move to right colum - otherwise no cursor movement
 
-                                                }
                                             }
-                                        }
 
-                                    } else {
-                                        puts stderr "overtype::renderline CSI...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline  unrecognised CSI code ending in pipe (|) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
                                     }
                                 }
                                 default {
@@ -3038,8 +3480,9 @@ tcl::namespace::eval overtype {
                             } 
                         } 
                         7ESC {
-                            #$re_other_single
-                            switch -- [tcl::string::index $codenorm end] {
+                            #re_other_single         {\x1b(D|M|E)$}
+                            #also PM \x1b^...(ST)
+                            switch -- [tcl::string::index $codenorm 4] {
                                 D {
                                     #\x84
                                     #index (IND)
@@ -3080,20 +3523,66 @@ tcl::namespace::eval overtype {
                                     puts stderr "ESC E unimplemented"
 
                                 }
+                                ^ {
+                                    #puts stderr "renderline PM"
+                                    #Privacy Message.
+                                    if {[string index $code end] eq "\007"} {
+                                        set pm_content [string range $code 2 end-1] ;#ST is \007
+                                    } else {
+                                        set pm_content [string range $code 2 end-2] ;#ST is \x1b\\
+                                    }
+                                    #We don't want to render it - but we need to make it available to the application
+                                    #see the textblock library in punk, for the exception we make here for single backspace.
+                                    #It is unlikely to be encountered as a useful PM - so we hack to pass it through as a fix 
+                                    #for spacing issues on old terminals which miscalculate the single-width 'Symbols for Legacy Computing'
+                                    if {$pm_content eq "\b"} {
+                                        #puts stderr "renderline PM sole backspace special handling for \U1FB00 - \U1FBFF"
+                                        #esc^\b\007 or esc^\besc\\ 
+                                        #HACKY pass-through - targeting terminals that both mis-space legacy symbols *and* don't support PMs
+                                        #The result is repair of the extra space. If the terminal is a modern one and does support PM - the \b should be hidden anyway.
+                                        #If the terminal has the space problem AND does support PMs - then this just won't fix it.
+                                        #The fix relies on the symbol-supplier to cooperate by appending esc^\b\esc\\ to the problematic symbols.
+
+                                        #priv::render_addchar $idx $code [lindex $overstacks $idx_over] [lindex $overstacks_gx $idx_over] $insert_mode
+                                        #idx has been incremented after last grapheme added
+                                        priv::render_append_to_char [expr {$idx -1}] $code
+                                    }
+                                    #lappend to a dict element in the result for application-specific processing
+                                    lappend pm_list $pm_content
+                                }
+                                N - O {
+                                    puts stderr "overtype::renderline single shift command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                P {
+                                    puts stderr "overtype::renderline DEVICE CONTROL STRING command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                X {
+                                    #SOS
+                                    if {[string index $code end] eq "\007"} {
+                                        set sos_content [string range $code 2 end-1] ;#ST is \007
+                                    } else {
+                                        set sos_content [string range $code 2 end-2] ;#ST is \x1b\\
+                                    }
+                                    #return in some useful form to the caller
+                                    #TODO!
+                                    lappend sos_list [list string $sos_content row $cursor_row column $cursor_column]
+                                    puts stderr "overtype::renderline ESCX SOS UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                _ {
+                                    #APC Application Program Command
+                                    #just warn for now..
+                                    puts stderr "overtype::renderline ESC_ APC command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
                                 default {
-                                    puts stderr "overtype::renderline ESC<x> code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                    puts stderr "overtype::renderline ESC<x> code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented codenorm:[ansistring VIEW -lf 1 -vt 1 -nul 1 $codenorm]"
                                 }
                             }
 
                         }
+                        default {
+                        }
                     }
 
-                    #switch -regexp -matchvar matchinfo -- $code\
-                    #$re_mode {
-                    #}\
-                    #default {
-                    #    puts stderr "overtype::renderline code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
-                    #}
 
                 }
                 default {
@@ -3275,8 +3764,10 @@ tcl::namespace::eval overtype {
                 overflow_right $overflow_right\
                 unapplied $unapplied\
                 unapplied_list $unapplied_list\
-                insert_mode $insert_mode\
-                autowrap_mode $autowrap_mode\
+                insert_mode     $insert_mode\
+                autowrap_mode   $autowrap_mode\
+                crm_mode        $crm_mode\
+                reverse_mode    $reverse_mode\
                 insert_lines_above $insert_lines_above\
                 insert_lines_below $insert_lines_below\
                 cursor_saved_position $cursor_saved_position\
@@ -3287,6 +3778,7 @@ tcl::namespace::eval overtype {
                 replay_codes $replay_codes\
                 replay_codes_underlay $replay_codes_underlay\
                 replay_codes_overlay $replay_codes_overlay\
+                pm_list  $pm_list\
             ]
             if {$opt_returnextra == 1} {
                 return $result
@@ -3370,8 +3862,9 @@ tcl::namespace::eval overtype::piper {
 }
 interp alias "" piper_renderline "" overtype::piper::renderline 
 
-#intended for single grapheme - but will work for multiple
-#cannot contain ansi or newlines 
+#intended primarily for single grapheme - but will work for multiple
+#WARNING: query CAN contain ansi or newlines - but if cache was not already set manually,the answer will be incorrect!
+#We deliberately allow this for PM/SOS attached within a column
 #(a cache of ansifreestring_width calls - as these are quite regex heavy)
 proc overtype::grapheme_width_cached {ch} {
     variable grapheme_widths
@@ -3439,6 +3932,7 @@ tcl::namespace::eval overtype::priv {
         tcl::dict::set cache_is_sgr $code $answer
         return $answer
     }
+    # better named render_to_unapplied?
     proc render_unapplied {overlay_grapheme_control_list gci} {
         upvar idx_over idx_over
         upvar unapplied unapplied
@@ -3532,7 +4026,7 @@ tcl::namespace::eval overtype::priv {
             set ustacks [lreplace $ustacks $i $i]
             set gxstacks [lreplace $gxstacks $i $i]
         } else {
-
+            puts stderr "render_delchar - attempt to delchar at index $i >= number of outcols $nxt - shouldn't happen"
         }
     }
     proc render_erasechar {i count} {
@@ -3563,21 +4057,68 @@ tcl::namespace::eval overtype::priv {
         upvar outcols o
         lset o $i $c
     }
+
+    #Initial usecase is for old-terminal hack to add PM-wrapped \b
+    #review - can be used for other multibyte sequences that occupy one column?
+    #combiners? diacritics?
+    proc render_append_to_char {i c} {
+        upvar outcols o
+        if {$i > [llength $o]-1} {
+            error "render_append_to_char cannot append [ansistring VIEW -lf 1 -nul 1 $c] to existing char at index $i while $i >= llength outcols [llength $o]"
+        }
+        set existing [lindex $o $i]
+        if {$existing eq "\0"} {
+            lset o $i $c
+        } else {
+            lset o $i [string cat $existing $c] 
+        }
+    } 
     #is actually addgrapheme?
     proc render_addchar {i c sgrstack gx0stack {insert_mode 0}} {
         upvar outcols o
         upvar understacks ustacks
         upvar understacks_gx gxstacks
 
-        if 0 {
-        if {$c eq "c"} {
-            puts "i:$i c:$c sgrstack:[ansistring VIEW $sgrstack]"
-            puts "understacks:[ansistring VIEW $ustacks]"
-            upvar overstacks overstacks
-            puts "overstacks:[ansistring VIEW $overstacks]"
-            puts "info level 0:[info level 0]"
-        }
+        # -- --- ---
+        #this is somewhat of a hack.. probably not really the equivalent of proper reverse video? review
+        #we should ideally be able to reverse the video of a sequence that already includes SGR reverse/noreverse attributes
+        upvar reverse_mode do_reverse
+        #if {$do_reverse} {
+        #    lappend sgrstack [a+ reverse]
+        #} else {
+        #    lappend sgrstack [a+ noreverse]
+        #}
+
+        #JMN3
+        if {$do_reverse} {
+            #note we can't just look for \x1b\[7m  or \x1b\[27m
+            # it may be a more complex sequence like \x1b\[0\;\;7\;31m  etc
+
+            set existing_reverse_state 0 
+            set codeinfo [punk::ansi::codetype::sgr_merge $sgrstack -info 1]
+            set codestate_reverse [dict get $codeinfo codestate reverse]
+            switch -- $codestate_reverse {
+                7 {
+                    set existing_reverse_state 1
+                }
+                27 {
+                    set existing_reverse_state 0
+                }
+                "" {
+                }
+            }
+            if {$existing_reverse_state == 0} {
+                set rflip [a+ reverse]
+            } else {
+                #reverse of reverse
+                set rflip [a+ noreverse]
+            }
+            #note that mergeresult can have multiple esc (due to unmergeables or non sgr codes)
+            set sgrstack [list [dict get $codeinfo mergeresult] $rflip]
+            #set sgrstack [punk::ansi::codetype::sgr_merge [list [dict get $codeinfo mergeresult] $rflip]]
         }
+        
+        # -- --- ---
 
         set nxt [llength $o] 
         if {!$insert_mode} {
diff --git a/src/bootsupport/modules/punk/ansi-0.1.1.tm b/src/bootsupport/modules/punk/ansi-0.1.1.tm
index 85cb9f27..7a2f9443 100644
--- a/src/bootsupport/modules/punk/ansi-0.1.1.tm
+++ b/src/bootsupport/modules/punk/ansi-0.1.1.tm
@@ -553,28 +553,51 @@ tcl::namespace::eval punk::ansi {
         $obj destroy
         return $result
     }
-    proc example {} {
+    proc example {args} {
+        set base [punk::repo::find_project]
+        set default_ansibase [file join $base src/testansi]
+
+        set argd [punk::args::get_dict [tstr -return string {
+            *proc -name punk::ansi::example -help "Display .ans image files in a grid that will fit in console
+            "
+            -colwidth -default 82 -help "Width of each column - default of 82 will fit a standard 80wide ansi image (when framed)
+            You can specify a narrower width to truncate images on the right side"
+            -folder -default "${$default_ansibase}"   -help "Base folder for files if relative paths are used.
+            Defaults to <projectbase>/src/testansi - where projectbase is determined from current directory.
+            "
+            *values -min 0 -max -1 
+            files -default {belinda.ans bot.ans flower.ans fish.ans} -multiple true -help "List of filenames - leave empty to display 4 defaults"
+        }] $args]
+        set colwidth [dict get $argd opts -colwidth]
+        set ansibase [file normalize [dict get $argd opts -folder]]
+        set fnames   [dict get $argd values files]
+
+        #assumes fixed column widths e.g 80col images will fit in 82-width frames (common standard for old ansi art) (of arbitrary height)
         #todo - review dependency on punk::repo ?  
         package require textblock
         package require punk::repo
         package require punk::console
 
-        set fnames [list belinda.ans bot.ans flower.ans fish.ans]
-        set base [punk::repo::find_project]
-        set ansibase [file join $base src/testansi]
         if {![file exists $ansibase]} {
-            puts stderr "Missing testansi folder at $base/src/testansi"
+            puts stderr "Missing folder at $ansibase"
             puts stderr "Ensure ansi test files exist: $fnames"
             #error "punk::ansi::example Cannot find example files"
         }
-        set missingbase [a+ yellow][textblock::block 80 23 ?][a]
+        set missingbase [a+ yellow][textblock::block [expr {$colwidth-2}] 23 ?][a] ;#assuming standard frame - subtract 2 for left/right borders
         set pics [list]
         foreach f $fnames {
-            if {![file exists $ansibase/$f]} {
-                set p [overtype::left $missingbase "[a+ red bold]\nMissing file\n$ansibase/$f[a]"]
+            if {[file pathtype $f] ne "absolute"} {
+                set filepath [file normalize $ansibase/$f]
+            } else {
+                set filepath [file normalize $f]
+            }
+            if {![file exists $filepath]} {
+                set p [overtype::left $missingbase "[a+ red bold]\nMissing file\n$f[a]"]
                 lappend pics [tcl::dict::create filename $f pic $p status missing]
             } else {
-                set img [join [lines_as_list -line trimline -block trimtail [ansicat $ansibase/$f]] \n]
+                #set img [join [lines_as_list -line trimline -block trimtail [ansicat $filepath]] \n]
+                #-line trimline will wreck some images
+                set img [join [lines_as_list -block trimtail [ansicat $filepath]] \n]
                 lappend pics [tcl::dict::create filename $f pic $img status ok] 
             }
         }
@@ -582,30 +605,73 @@ tcl::namespace::eval punk::ansi {
         set termsize [punk::console:::get_size] 
         set margin 4
         set freewidth [expr {[tcl::dict::get $termsize columns]-$margin}]
-        set per_row [expr {$freewidth / 80}]
-
-        set rowlist [list]
-        set row [list]
-        set i 1 
+        set per_row [expr {$freewidth / $colwidth}]
+
+        set rowlist [list]      ;# { {<img> <img>} {<img> <img>} }
+        set heightlist [list]   ;# { {<h>   <h>  } {<h>   <h>  } }
+        set maxheights [list]   ;# { <max>  <max>}
+        set row [list]  ;#wip row
+        set rowh [list] ;#wip row img heights
+        set i 1  ;#track image index of whole pics list
+        set rowindex 0
         foreach picinfo $pics {
             set subtitle ""
             if {[tcl::dict::get $picinfo status] ne "ok"} {
                 set subtitle [tcl::dict::get $picinfo status] 
             }
             set title [tcl::dict::get $picinfo filename]
-            lappend row [textblock::frame -subtitle $subtitle -title $title [tcl::dict::get $picinfo pic]]
+            set fr [textblock::frame -width $colwidth -subtitle $subtitle -title $title [tcl::dict::get $picinfo pic]]
+            # -- --- --- --- 
+            #we need the max height of a row  element to use join_basic instead of join below
+            # -- --- --- --- 
+            set fr_height [textblock::height $fr]
+            lappend row $fr
+            lappend rowh $fr_height
+
+            set rowmax [lindex $maxheights $rowindex]
+            if {$rowmax eq ""} {
+                #empty result means no maxheights entry for this row yet
+                set rowmax $fr_height
+                lappend maxheights $rowmax
+            } else {
+                if {$fr_height > $rowmax} {
+                    set rowmax $fr_height
+                    lset maxheights end $rowmax
+                }
+            } 
+            # -- --- --- --- 
+
             if {$i % $per_row == 0} {
                 lappend rowlist $row
+                lappend heightlist $rowh
+                incr rowindex
                 set row [list]
+                set rowh [list]
             } elseif {$i == [llength $pics]} {
                 lappend rowlist $row
+                lappend heightlist $rowh
             }
             incr i
         }
-
+        #puts "--> maxheights: $maxheights"
+        #puts "--> heightlist: $heightlist"
         set result ""
-        foreach r $rowlist {
-            append result [textblock::join_basic -- {*}$r] \n
+        set rowindex 0
+        set blankline [string repeat " " $colwidth]
+        foreach imgs $rowlist heights $heightlist  {
+            set maxheight [lindex $maxheights $rowindex]
+            set adjusted_row [list]
+            foreach i $imgs h $heights {
+                if {$h < $maxheight} {
+                    #add blank lines to bottom of shorter images so join_basic can be used.
+                    #textblock::join of ragged-height images would work and remove the need for all the height calculation
+                    #.. but it requires much more processing 
+                    append i [string repeat \n$blankline [expr {$maxheight - $h}]]
+                } 
+                lappend adjusted_row $i
+            }
+            append result [textblock::join_basic -- {*}$adjusted_row] \n
+            incr rowindex
         }
 
 
@@ -3199,6 +3265,28 @@ Brightblack 100   Brightred 101   Brightgreen 102   Brightyellow 103   Brightblu
         return \x1b8
     }
     # -- ---  --- --- ---
+    #CRM Show Control Character Mode
+    proc enable_crm {} {
+        return \x1b\[3h
+    }
+    proc disable_crm {} {
+        return \x1b\[3l
+    }
+
+    #DECSNM 
+    #Note this can invert the enclosed section including any already reversed by SGR 7  - depending on terminal support.
+    #e.g 
+    #set test [a+ reverse]aaa[a+ noreverse]bbb
+    #  - $test above can't just be reversed by putting another [a+ reverse] in front of it.
+    #  - but the following will work (even if underlying terminal doesn't support ?5 sequences)
+    #overtype::renderspace -width 20  [enable_inverse]$test 
+    proc enable_inverse {} {
+        return \x1b\[?5h
+    }
+    proc disable_inverse {} {
+        return \x1b\[?5l
+    }
+
 
     #DECAWM - automatic line wrapping
     proc enable_line_wrap {} {
@@ -3399,6 +3487,9 @@ Brightblack 100   Brightred 101   Brightgreen 102   Brightyellow 103   Brightblu
         #the purpose of backspace (or line cr) in embedded text is unclear. Should it allow some sort of character combining/overstrike as it has sometimes done historically (nroff/less)?  e.g a\b` as an alternative combiner or bolding if same char
         #This should presumably only be done if the over_strike (os) capability is enabled in the terminal. Either way - it presumably won't affect printing width?
         set line [punk::ansi::ansistrip $line]
+        #ANSI (e.g PM/SOS) can contain \b or \n  or \t  but won't contribute to length
+        #ansistrip must come before any other processing of these chars.
+
         #we can't use simple \b processing if we get ansi codes and aren't actually processing them (e.g moves)
 
         set line [punk::char::strip_nonprinting_ascii $line] ;#only strip nonprinting after ansistrip - some like BEL are part of ansi
@@ -3748,6 +3839,7 @@ tcl::namespace::eval punk::ansi {
             -filter_fg 0\
             -filter_bg 0\
             -filter_reset 0\
+            -info 0\
         ]
 
         #codes *must* already have been split so that one esc per element in codelist
@@ -3760,7 +3852,8 @@ tcl::namespace::eval punk::ansi {
             set opts $defaultopts_sgr_merge_singles
             foreach {k v} $args {
                 switch -- $k {
-                    -filter_fg - -filter_bg - -filter_reset {
+                    -filter_fg - -filter_bg - -filter_reset -
+                    -info {
                         tcl::dict::set opts $k $v
                     }
                     default {
@@ -4139,19 +4232,24 @@ tcl::namespace::eval punk::ansi {
                 set codemerge [tcl::string::trimright $codemerge {;}]
                 if {$unmergeable ne ""} {
                     set unmergeable [tcl::string::trimright $unmergeable {;}]
-                    return "\x1b\[${codemerge}m\x1b\[${unmergeable}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${codemerge}m\x1b\[${unmergeable}m[join $othercodes ""]"
                 } else {
-                    return "\x1b\[${codemerge}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${codemerge}m[join $othercodes ""]"
                 }
             } else {
                 if {$unmergeable eq ""} {
                     #there were no SGR codes - not even resets
-                    return [join $othercodes ""]
+                    set mergeresult [join $othercodes ""]
                 } else {
                     set unmergeable [tcl::string::trimright $unmergeable {;}]
-                    return "\x1b\[${unmergeable}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${unmergeable}m[join $othercodes ""]"
                 }
             }
+            if {[tcl::dict::get $opts -info]} {
+                return [dict create sgr $codemerge unmergeable $unmergeable othercodes $othercodes mergeresult $mergeresult codestate $codestate]
+            } else {
+                return $mergeresult
+            }
         }
 
         #has_sgr_reset  - rather than support this function - create an sgr normalize function that removes dead params and brings reset to front of param list?
@@ -4240,7 +4338,7 @@ tcl::namespace::eval punk::ansi::ta {
     #we also need to track the start of ST terminated code and not add it for replay (in the ansistring functions)
     #variable re_ST  {(?:\x1bX|\u0098|\x1b\^|\u009E|\x1b_|\u009F)(?:[^\x1b\007\u009c]*)(?:\x1b\\|\007|\u009c)} ;#downsides: early terminating with nests, mixes 7bit 8bit start/ends (does that exist in the wild?)   
     #keep our 8bit/7bit start-end codes separate
-    variable re_ST      {(?:\x1bP|\x1bX|\x1b\^|\x1b_)(?:(?!\x1b\\|007).)*(?:\x1b\\|\007)|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)}
+    variable re_ST      {(?:\x1bP|\x1bX|\x1b\^|\x1b_)(?:(?!\x1b\\|\007).)*(?:\x1b\\|\007)|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)}
 
 
 
@@ -4252,7 +4350,7 @@ tcl::namespace::eval punk::ansi::ta {
     # -- --- --- ---
     #handrafted TRIE version of above. Somewhat difficult to construct and maintain. TODO - find a regext TRIE generator that works with Tcl regexes
     #This does make things quicker - but it's too early to finalise the detect/split regexes (e.g missing \U0090 ) - will need to be redone.
-    variable re_ansi_detect {(?:\x1b(?:\((?:0|B)|\[(?:[\x20-\x2f\x30-\x3f]*[\x40-\x7e])|\](?:(?:[^\007]*)\007|(?:(?!\x1b\\).)*\x1b\\)|(?:P|X|\^|_)(?:(?:(?!\x1b\\|007).)*(?:\x1b\\|\007))|c|7|8|M|E|D|H|=|>|(?:#(?:3|4|5|6|8))))|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)|(?:\u009b)[\x20-\x2f\x30-\x3f]*[\x40-\x7e]|(?:\u009d)(?:[^\u009c]*)?\u009c}
+    variable re_ansi_detect {(?:\x1b(?:\((?:0|B)|\[(?:[\x20-\x2f\x30-\x3f]*[\x40-\x7e])|\](?:(?:[^\007]*)\007|(?:(?!\x1b\\).)*\x1b\\)|(?:P|X|\^|_)(?:(?:(?!\x1b\\|\007).)*(?:\x1b\\|\007))|c|7|8|M|E|D|H|=|>|(?:#(?:3|4|5|6|8))))|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)|(?:\u009b)[\x20-\x2f\x30-\x3f]*[\x40-\x7e]|(?:\u009d)(?:[^\u009c]*)?\u009c}
     # -- --- --- ---
 
 
@@ -5674,7 +5772,12 @@ tcl::namespace::eval punk::ansi::ansistring {
         ENQ [list \x05 \u2405]\
         ACK [list \x06 \u2406]\
         BEL [list \x07 \u2407]\
+        BS  [list \x08 \u2408]\
+        HT  [list \x09 \u2409]\
+        LF  [list \x0a \u240a]\
+        VT  [list \x0b \u240b]\
         FF  [list \x0c \u240c]\
+        CR  [list \x0d \u240d]\
         SO  [list \x0e \u240e]\
         SF  [list \x0f \u240f]\
         DLE [list \x10 \u2410]\
@@ -5688,12 +5791,15 @@ tcl::namespace::eval punk::ansi::ansistring {
         CAN [list \x18 \u2418]\
         EM  [list \x19 \u2419]\
         SUB [list \x1a \u241a]\
+        ESC [list \x1b \u241b]\
         FS  [list \x1c \u241c]\
         GS  [list \x1d \u241d]\
         RS  [list \x1e \u241e]\
         US  [list \x1f \u241f]\
+        SP  [list \x20 \u2420]\
         DEL [list \x7f \u2421]\
     ]
+
     #alternate symbols for space
     # \u2422 Blank Symbol (b with forwardslash overly)
     # \u2423 Open Box  (square bracket facing up like a tray/box)
@@ -5836,6 +5942,7 @@ tcl::namespace::eval punk::ansi::ansistring {
             -cr 1\
             -lf 0\
             -vt 0\
+            -ff 1\
             -ht 1\
             -bs 1\
             -sp 1\
@@ -5850,16 +5957,22 @@ tcl::namespace::eval punk::ansi::ansistring {
         set opt_cr      [tcl::dict::get $opts -cr]
         set opt_lf      [tcl::dict::get $opts -lf]
         set opt_vt      [tcl::dict::get $opts -vt]
+        set opt_ff      [tcl::dict::get $opts -ff]
         set opt_ht      [tcl::dict::get $opts -ht]
         set opt_bs      [tcl::dict::get $opts -bs]
         set opt_sp      [tcl::dict::get $opts -sp]
         # -- --- --- --- ---
 
+        # -lf 2, -vt 2 and -ff 2 are useful for CRM mode (Show Control Character Mode) in the terminal - where a newline is expected to display after the character.
 
 
         set visuals_opt $debug_visuals 
+        set visuals_opt [dict remove $visuals_opt CR ESC LF VT FF HT BS SP] 
+
         if {$opt_esc} {
             tcl::dict::set visuals_opt ESC [list \x1b \u241b]
+        } else {
+            tcl::dict::unset visuals_opt ESC
         }
         if {$opt_cr} {
             tcl::dict::set visuals_opt CR [list \x0d \u240d]
@@ -5870,9 +5983,20 @@ tcl::namespace::eval punk::ansi::ansistring {
         if {$opt_lf == 2} {
             tcl::dict::set visuals_opt LF [list \x0a \u240a\n]
         }
-        if {$opt_vt} {
+        if {$opt_vt ==  1} {
             tcl::dict::set visuals_opt VT [list \x0b \u240b]
         }
+        if {$opt_vt ==  2} {
+            tcl::dict::set visuals_opt VT [list \x0b \u240b\n]
+        }
+        switch -exact -- $opt_ff {
+            1 {
+                tcl::dict::set visuals_opt FF [list \x0c \u240c]
+            }
+            2 {
+                tcl::dict::set visuals_opt FF [list \x0c \u240c\n]
+            }
+        }
         if {$opt_ht} {
             tcl::dict::set visuals_opt HT [list \x09 \u2409]
         }
diff --git a/src/bootsupport/modules/punk/char-0.1.0.tm b/src/bootsupport/modules/punk/char-0.1.0.tm
index ed4b22e4..e47ba051 100644
--- a/src/bootsupport/modules/punk/char-0.1.0.tm
+++ b/src/bootsupport/modules/punk/char-0.1.0.tm
@@ -552,13 +552,26 @@ tcl::namespace::eval punk::char {
             string eq $s [encoding convertto $encname [encoding convertfrom $encname $s]]
         }
     } else {
+        #review - use -profile?
         proc encodable "s {enc [encoding system]}" {
             set encname [encname $enc]
-            string eq $s [encoding convertfrom $encname [encoding convertto $encname $s]]
+            if {![catch {
+                string eq $s [encoding convertfrom $encname [encoding convertto $encname $s]]
+            } result]} {
+                return $result
+            } else {
+                return 0
+            }
         }
         proc decodable "s {enc [encoding system]}" {
             set encname [encname $enc]
-            string eq $s [encoding convertto $encname [encoding convertfrom $encname $s]]
+            if {![catch {
+                string eq $s [encoding convertto $encname [encoding convertfrom $encname $s]]
+            } result]} {
+                return $result
+            } else {
+                return 0
+            }
         }
     }
     #-- --- --- --- --- --- --- --- 
diff --git a/src/bootsupport/modules/punk/console-0.1.1.tm b/src/bootsupport/modules/punk/console-0.1.1.tm
index 3c64c7e3..6368aeae 100644
--- a/src/bootsupport/modules/punk/console-0.1.1.tm
+++ b/src/bootsupport/modules/punk/console-0.1.1.tm
@@ -13,11 +13,51 @@
 # @@ Meta End
 
 
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# doctools header
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+#*** !doctools
+#[manpage_begin punkshell_module_punk::console 0 0.1.1]
+#[copyright "2024"]
+#[titledesc {punk console}]  [comment {-- Name section and table of contents description --}]
+#[moddesc {punk console}]             [comment {-- Description at end of page heading --}] 
+#[require punk::console]
+#[keywords module console terminal]
+#[description]
+#[para]
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[section Overview]
+#[para] overview of punk::console
+#[subsection Concepts]
+#[para]
 
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 ##  Requirements
-##e.g package require frobz
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[subsection dependencies]
+#[para] packages used by punk::console
+#[list_begin itemized]
+
+package require Tcl 8.6-
 package require punk::ansi
+#*** !doctools
+#[item] [package {Tcl 8.6-}]
+#[item] [package {punk::ansi}]
+
+
+#*** !doctools
+#[list_end]
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[section API]
+
 
 
 #if {"windows" eq $::tcl_platform(platform)} {
@@ -30,6 +70,13 @@ package require punk::ansi
 
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 namespace eval punk::console {
+    #*** !doctools
+    #[subsection {Namespace punk::console}]
+    #[para]
+
+    #*** !doctools
+    #[list_begin definitions]
+
     variable tabwidth 8  ;#default only - will attempt to detect and set to that configured in terminal
     #Note that windows terminal cooked mode seems to use 8 for interactive use even if set differently
     #e.g typing tab characters may still be echoed 8-spaced while writing to stdout my obey the terminal's tab stops.  
@@ -1028,23 +1075,37 @@ namespace eval punk::console {
         return [split [get_cursor_pos $inoutchannels] ";"]
     }
 
-    #todo - determine cursor on/off state before the call to restore properly. May only be possible 
+    #todo - determine cursor on/off state before the call to restore properly. 
     proc get_size {{inoutchannels {stdin stdout}}} {
         lassign $inoutchannels in out
         #we can't reliably use [chan names] for stdin,stdout. There could be stacked channels and they may have a names such as file22fb27fe810
         #chan eof is faster whether chan exists or not than
-        if {[catch {chan eof $in} is_eof]} {
-                error "punk::console::get_size input channel $in seems to be closed ([info level 1])"
+        if {[catch {chan eof $out} is_eof]} {
+                error "punk::console::get_size output channel $out seems to be closed ([info level 1])"
         } else {
             if {$is_eof} {
-                error "punk::console::get_size eof on input channel $in ([info level 1])"
+                error "punk::console::get_size eof on output channel $out ([info level 1])"
             } 
         }
-        if {[catch {chan eof $out} is_eof]} {
-                error "punk::console::get_size output channel $out seems to be closed ([info level 1])"
+        #we don't need to care about the input channel if chan configure on the output can give us the info.
+        #short circuit ansi cursor movement method if chan configure supports the -winsize value
+        set outconf [chan configure $out]
+        if {[dict exists $outconf -winsize]} {
+            #this mechanism is much faster than ansi cursor movements
+            #REVIEW check if any x-platform anomalies with this method?
+            #can -winsize key exist but contain erroneous info? We will check that we get 2 ints at least 
+            lassign [dict get $outconf -winsize] cols lines
+            if {[string is integer -strict $cols] && [string is integer -strict $lines]} {
+                return [list columns $cols rows $lines]
+            }
+            #continue on to ansi mechanism if we didn't get 2 ints
+        }
+
+        if {[catch {chan eof $in} is_eof]} {
+                error "punk::console::get_size input channel $in seems to be closed ([info level 1])"
         } else {
             if {$is_eof} {
-                error "punk::console::get_size eof on output channel $out ([info level 1])"
+                error "punk::console::get_size eof on input channel $in ([info level 1])"
             } 
         }
 
@@ -1067,18 +1128,28 @@ namespace eval punk::console {
         }
     }
 
-    #faster - but uses cursor_save - which we may want to avoid if calling during another operation which uses cursor save/restore
-    proc get_size_cursorrestore {} {
+    #faster than get_size when it is using ansi mechanism - but uses cursor_save - which we may want to avoid if calling during another operation which uses cursor save/restore
+    proc get_size_cursorrestore {{inoutchannels {stdin stdout}}} {
+        lassign $inoutchannels in out
+        #we use the same shortcircuit mechanism as get_size to avoid ansi at all if the output channel will give us the info directly 
+        set outconf [chan configure $out]
+        if {[dict exists $outconf -winsize]} {
+            lassign [dict get $outconf -winsize] cols lines
+            if {[string is integer -strict $cols] && [string is integer -strict $lines]} {
+                return [list columns $cols rows $lines]
+            }
+        }
+
         if {[catch {
             #some terminals (conemu on windows) scroll the viewport when we make a big move down like this - a  move to 1 1 immediately after cursor_save doesn't seem to fix that.
             #This issue also occurs when switching back from the alternate screen buffer - so perhaps that needs to be addressed elsewhere.
-            puts -nonewline [punk::ansi::cursor_off][punk::ansi::cursor_save_dec][punk::ansi::move 2000 2000]
-            lassign [get_cursor_pos_list] lines cols
-            puts -nonewline [punk::ansi::cursor_restore][punk::console::cursor_on];flush stdout
+            puts -nonewline $out [punk::ansi::cursor_off][punk::ansi::cursor_save_dec][punk::ansi::move 2000 2000]
+            lassign [get_cursor_pos_list $inoutchannels] lines cols
+            puts -nonewline $out [punk::ansi::cursor_restore][punk::console::cursor_on];flush $out 
             set result [list columns $cols rows $lines] 
         } errM]} {
-            puts -nonewline [punk::ansi::cursor_restore_dec]
-            puts -nonewline [punk::ansi::cursor_on]
+            puts -nonewline $out [punk::ansi::cursor_restore_dec]
+            puts -nonewline $out [punk::ansi::cursor_on]
             error "$errM"
         } else {
             return $result
@@ -1803,6 +1874,9 @@ namespace eval punk::console {
     }
     #run the test and allow warnings to be emitted to stderr on package load. User should know the terminal and/or Tcl version are not optimal for unicode character work
     #set testresult [test1]
+
+    #*** !doctools
+    #[list_end] [comment {--- end definitions namespace punk::console ---}]
 }
 
 
@@ -1825,4 +1899,7 @@ package provide punk::console [namespace eval punk::console {
     variable version
     set version 0.1.1 
 }]
-return
\ No newline at end of file
+return
+
+#*** !doctools
+#[manpage_end]
diff --git a/src/bootsupport/modules/punk/du-0.1.0.tm b/src/bootsupport/modules/punk/du-0.1.0.tm
index f0e96a28..1eca1f47 100644
--- a/src/bootsupport/modules/punk/du-0.1.0.tm
+++ b/src/bootsupport/modules/punk/du-0.1.0.tm
@@ -967,7 +967,7 @@ namespace eval punk::du {
             dict set effective_opts -with_times $timed_types
             dict set effective_opts -with_sizes $sized_types
 
-            return [list dirs $dirs vfsmounts $vfsmounts links $links files $files filesizes [dict get $mdata_lists fsizes] sizes [dict get $mdata_lists allsizes] times [dict get $mdata_lists alltimes] flaggedhidden {} flaggedsystem {} flaggedreadonly {} altname {} opts $effective_opts errors $errors]
+            return [list dirs $dirs vfsmounts $vfsmounts links $links files $files filesizes [dict get $mdata_lists fsizes] sizes [dict get $mdata_lists allsizes] times [dict get $mdata_lists alltimes] flaggedhidden $flaggedhidden flaggedsystem {} flaggedreadonly {} altname {} opts $effective_opts errors $errors]
         }
 
         #zipfs attributes/behaviour fairly different to tclvfs - keep separate
diff --git a/src/bootsupport/modules/punk/lib-0.1.1.tm b/src/bootsupport/modules/punk/lib-0.1.1.tm
index cb786f22..63f32dee 100644
--- a/src/bootsupport/modules/punk/lib-0.1.1.tm
+++ b/src/bootsupport/modules/punk/lib-0.1.1.tm
@@ -328,7 +328,17 @@ tcl::namespace::eval punk::lib::compat {
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 namespace eval punk::lib {
     tcl::namespace::export *
-    #variable xyz
+    variable has_struct_list
+    set has_struct_list [expr {![catch {package require struct::list}]}]
+    variable has_struct_set
+    set has_struct_set [expr {![catch {package require struct::set}]}]
+    variable has_punk_ansi
+    set has_punk_ansi [expr {![catch {package require punk::ansi}]}]
+    set has_twapi 0
+    if {"windows" eq $::tcl_platform(platform)} {
+        set has_twapi [expr {![catch {package require twapi}]}]
+    }
+
 
     #*** !doctools
     #[subsection {Namespace punk::lib}]
@@ -614,7 +624,9 @@ namespace eval punk::lib {
     }
 
     proc pdict {args} {
-        if {[catch {package require punk::ansi} errM]} {
+        package require punk::args
+        variable has_punk_ansi
+        if {!$has_punk_ansi} {
             set sep " = "    
         } else {
             #set sep " [a+ Web-seagreen]=[a] "
@@ -691,14 +703,15 @@ namespace eval punk::lib {
     # - Copy proc and attempt rework so we can get back to this as a baseline for functionality
     proc showdict {args} {   ;# analogous to parray (except that it takes the dict as a value)
         #set sep " [a+ Web-seagreen]=[a] "
-        if {[catch {package require punk::ansi} errM]} {
-            set sep " = "
+        variable has_punk_ansi
+        if {!$has_punk_ansi} {
             set RST ""
+            set sep " = "
             set sep_mismatch " mismatch "
         } else {
-            set sep " [punk::ansi::a+ Green]=[punk::ansi::a] " ;#stick to basic default colours for wider terminal support
             set RST [punk::ansi::a]
-            set sep_mismatch " [punk::ansi::a+ Brightred undercurly underline undt-white]mismatch[punk::ansi::a] "
+            set sep " [punk::ansi::a+ Green]=$RST " ;#stick to basic default colours for wider terminal support
+            set sep_mismatch " [punk::ansi::a+ Brightred undercurly underline undt-white]mismatch$RST "
         }
         package require punk ;#we need pipeline pattern matching features
         package require textblock
@@ -836,7 +849,7 @@ namespace eval punk::lib {
                                 lappend keyset_structure dict 
                             }
                             @* {
-                                puts ---->HERE<----
+                                #puts "showdict ---->@*<----"
                                 dict set pattern_this_structure $p list
                                 set keys [punk::lib::range 0 [llength $dval]-1]
                                 lappend keyset {*}$keys
@@ -1405,16 +1418,29 @@ namespace eval punk::lib {
     }
 
     proc is_list_all_in_list {small large} {
-        package require struct::list
-        package require struct::set
         set small_in_large [lsort [struct::set intersect [lsort -unique $small] $large ]]
         return [struct::list equal [lsort $small] $small_in_large]
     }
+    if {!$has_struct_list || !$has_struct_set} {
+        set body {
+            package require struct::list
+            package require struct::set
+        }
+        append body [info body is_list_all_in_list]
+        proc is_list_all_in_list {small large} $body
+    }
+
     proc is_list_all_ni_list {a b} {
-        package require struct::set
         set i [struct::set intersect $a $b]
         return [expr {[llength $i] == 0}]
     }
+    if {!$has_struct_set} {
+        set body {
+            package require struct::list
+        }
+        append body [info body is_list_all_ni_list]
+        proc is_list_all_ni_list {a b} $body
+    }
 
     #somewhat like struct::set difference - but order preserving, and doesn't treat as a 'set' so preserves dupes in fromlist
     #struct::set difference may happen to preserve ordering when items are integers, but order can't be relied on,
@@ -1465,18 +1491,22 @@ namespace eval punk::lib {
         return [array names tmp]
     }
 
-    package require struct::set
-    if {[struct::set equal [struct::set union {a a} {}] {a}]} {
-        proc lunique_unordered {list} {
-            struct::set union $list {}
-        }
-    } else {
-        puts stderr "WARNING: struct::set union <list> <emptylist> no longer dedupes!" 
-        #we could also test a sequence of: struct::set add 
-        proc lunique_unordered {list} {
-            tailcall lunique $list
+    #default/fallback implementation
+    proc lunique_unordered {list} {
+        lunique $list
+    }
+    if {$has_struct_set} {
+        if {[struct::set equal [struct::set union {a a} {}] {a}]} {
+            proc lunique_unordered {list} {
+                struct::set union $list {}
+            }
+        } else {
+            puts stderr "WARNING: struct::set union <list> <emptylist> no longer dedupes!" 
+            #we could also test a sequence of: struct::set add 
         }
     }
+
+
     #order-preserving
     proc lunique {list} {
         set new {}
@@ -1863,14 +1893,14 @@ namespace eval punk::lib {
         set opt_empty [tcl::dict::get $opts -empty_as_hex]
         # -- --- --- --- 
 
-        set list_largeHex [lmap h $list_largeHex[unset list_largeHex] {string map [list _ ""] [string trim $h]}]
+        set list_largeHex [lmap h $list_largeHex[unset list_largeHex] {string map {_ ""} [string trim $h]}]
         if {$opt_validate} {
             #Note appended F so that we accept list of empty strings as per the documentation
             if {![string is xdigit -strict [join $list_largeHex ""]F ]} {
                 error "[namespace current]::hex2dec error: non-hex digits encountered after stripping underscores and leading/trailing whitespace for each element\n $list_largeHex"
             }
         }
-        if {![string is xdigit -strict [string map [list _ ""] $opt_empty]]} {
+        if {![string is xdigit -strict [string map {_ ""} $opt_empty]]} {
             #mapping empty string to a value destroys any advantage of -scanonly
             #todo - document that -scanonly has 2 restrictions - each element must be valid hex and less than 7 chars long
             #set list_largeHex [lmap v $list_largeHex[set list_largeHex {}] {expr {$v eq ""} ? {0} : {[set v]}}]
@@ -1878,7 +1908,7 @@ namespace eval punk::lib {
                 error "[namespace current]::hex2dec error: empty values in list cannot be mapped to non-hex $opt_empty"
             }
         } else {
-            set opt_empty [string trim [string map [list _ ""] $opt_empty]]
+            set opt_empty [string trim [string map {_ ""} $opt_empty]]
             if {[set first_empty [lsearch $list_largeHex ""]] >= 0} {
                 #set list_largeHex [lmap v $list_largeHex[set list_largeHex {}] {expr {$v eq ""} ? {$opt_empty} : {$v}}]
                 set nonempty_head [lrange $list_largeHex 0 $first_empty-1]
@@ -1931,13 +1961,13 @@ namespace eval punk::lib {
         }
         set fmt "%${opt_width}.${opt_width}ll${spec}"
 
-        set list_decimals [lmap d $list_decimals[unset list_decimals] {string map [list _ ""] [string trim $d]}]
-        if {![string is digit -strict [string map [list _ ""] $opt_empty]]} {
+        set list_decimals [lmap d $list_decimals[unset list_decimals] {string map {_ ""} [string trim $d]}]
+        if {![string is digit -strict [string map {_ ""} $opt_empty]]} {
             if {[lsearch $list_decimals ""] >=0} {
                 error "[namespace current]::dec2hex error: empty values in list cannot be mapped to non-decimal $opt_empty"
             }
         } else {
-            set opt_empty [string map [list _ ""] $opt_empty]
+            set opt_empty [string map {_ ""} $opt_empty]
             if {[set first_empty [lsearch $list_decimals ""]] >= 0} {
                 set nonempty_head [lrange $list_decimals 0 $first_empty-1]
                 set list_decimals [concat $nonempty_head [lmap v [lrange $list_decimals $first_empty end] {expr {$v eq ""} ? {$opt_empty} : {$v}}]]
@@ -2402,13 +2432,14 @@ namespace eval punk::lib {
     # important for pipeline & match_assign
     #  -line trimline|trimleft|trimright  -block trimhead|trimtail|triminner|trimall|trimhead1|trimtail1|collateempty -commandprefix {string length} ?
     #  -block trimming only trims completely empty lines. use -line trimming to remove whitespace e.g -line trimright will clear empty lines without affecting leading whitespace on other lines that aren't pure whitespace
-    proc linelist {args} {
+
+    set linelist_body {
         set usage "linelist ?-line trimline|trimleft|trimright? ?-block trimhead|trimtail|triminner|trimall|trimhead1|trimtail1|collateempty? -commandprefix <cmdlist> text"
         if {[llength $args] == 0} {
             error "linelist missing textchunk argument usage:$usage" 
         }
         set text [lindex $args end]
-        set text [string map [list \r\n \n] $text] ;#review - option?
+        set text [string map {\r\n \n} $text] ;#review - option?
 
         set arglist [lrange $args 0 end-1]
         set opts [tcl::dict::create\
@@ -2441,10 +2472,10 @@ namespace eval punk::lib {
                 }
             }
             #normalize certain combos
-            if {[set posn [lsearch $opt_block trimhead1]] >=0 && "trimhead" in $opt_block} {
+            if {"trimhead" in $opt_block && [set posn [lsearch $opt_block trimhead1]] >=0} {
                 set opt_block [lreplace $opt_block $posn $posn]
             }
-            if {[set posn [lsearch $opt_block trimtail1]] >=0 && "trimtail" in $opt_block} {
+            if {"trimtail" in $opt_block && [set posn [lsearch $opt_block trimtail1]] >=0} {
                 set opt_block [lreplace $opt_block $posn $posn]
             }
             if {"trimall" in $opt_block} {
@@ -2594,9 +2625,10 @@ namespace eval punk::lib {
         #Each resulting line should have a reset of some type at start and a pure-reset at end to stop 
         #see if we can find an ST sequence that most terminals will not display for marking sections?
         if {$opt_ansireplays} {
-            package require punk::ansi
+            #package require punk::ansi
+            <require_punk_ansi>
             if {$opt_ansiresets} {
-                set RST [punk::ansi::a]
+                set RST "\x1b\[0m" 
             } else {
                 set RST ""
             }
@@ -2721,6 +2753,15 @@ namespace eval punk::lib {
 
         return $linelist
     }
+    if {$has_punk_ansi} {
+        #optimise linelist as much as possible
+        set linelist_body [string map {<require_punk_ansi> ""} $linelist_body]
+    } else {
+        #punk ansi not avail at time of package load.
+        #by putting in calls to punk::ansi the user will get appropriate error messages 
+        set linelist_body [string map {<require_punk_ansi> "package require punk::ansi"} $linelist_body]
+    }
+    proc linelist {args} $linelist_body 
 
 
     interp alias {} errortime {} punk::lib::errortime
@@ -2846,6 +2887,133 @@ namespace eval punk::lib {
     proc temperature_c_to_f {deg_celsius} {
         return [expr {($deg_celsius * (9/5.0)) + 32}]
     }
+
+    proc interp_sync_package_paths {interp} {
+        if {![interp exists $interp]} {
+            error "interp_sync_package_paths error. interp '$interp' not found. Create it first with \[interp create $interp\]"
+        }
+        interp eval $interp [list set ::auto_path $::auto_path]
+        interp eval $interp {tcl::tm::remove {*}[tcl::tm::list]}
+        interp eval $interp [list tcl::tm::add {*}[lreverse [tcl::tm::list]]]
+    }
+
+    proc objclone {obj} {
+        append obj2 $obj {}
+    }
+
+
+
+    proc format_number {numbers_or_commaformattednumbers {delim ""} {groupsize ""}} {
+        variable has_twapi
+        if {$has_twapi} {
+            if {$delim eq "" && $groupsize eq ""} {
+                set localeid [twapi::get_system_default_lcid]
+            }
+        }
+
+        set results [list]
+        set nums [objclone $numbers_or_commaformattednumbers] ;#stops single num from getting internal rep of list
+        foreach inputnum $nums {
+            set number [objclone $inputnum]
+            #also handle tcl 8.7+ underscores in numbers
+            set number [string map [list _ "" , ""] $number]
+            #normalize e.g 2e4 -> 20000.0
+            set number [expr {$number}]
+
+            if {$has_twapi} {
+                if {$delim eq "" && $groupsize eq ""} {
+                    lappend results [twapi::format_number $number $localeid -idigits -1]
+                    continue
+                } else {
+                    if {$delim eq ""} {set delim ","}
+                    if {$groupsize eq ""} {set groupsize 3}
+                    lappend results [twapi::format_number $number 0 -idigits -1 -sthousand $delim -sgrouping $groupsize]
+                    continue
+                }
+            }
+            #todo - get configured user defaults
+            set delim ","
+            set groupsize 3
+
+            lappend results [delimit_number $number $delim $groupsize]
+        }
+
+        if {[llength $results] == 1} {
+            #keep intrep as string rather than list
+            return [lindex $results 0]
+        }
+        return $results
+    }
+
+
+    #from wiki https://wiki.tcl-lang.org/page/Delimiting+Numberse
+    # Given a number represented as a string, insert delimiters to break it up for
+    # readability. Normally, the delimiter will be a comma which will be inserted every
+    # three digits. However, the delimiter and groupsize are optional arguments,
+    # permitting use in other locales.
+    #
+    # The string is assumed to consist of digits, possibly preceded by spaces,
+    # and possibly containing a decimal point, i.e.: [:space:]*[:digit:]*\.[:digit:]*
+
+    proc delimit_number {unformattednumber {delim ","} {GroupSize 3}} {
+        set number [punk::objclone $unformattednumber]
+        set number [string map {_ ""} $number]
+        #normalize using expr - e.g 2e4 -> 20000.0
+        set number [expr {$number}]
+        # First, extract right hand part of number, up to and including decimal point
+        set point [string last "." $number];
+        if {$point >= 0} {
+            set PostDecimal [string range $number [expr $point + 1] end];
+            set PostDecimalP 1;
+        } else {
+            set point [expr [string length $number] + 1]
+            set PostDecimal "";
+            set PostDecimalP 0;
+        }
+
+        # Now extract any leading spaces. review  - regex for whitespace instead of just ascii space?
+        set ind 0;
+        while {[string equal [string index $number $ind] \u0020]} {
+            incr ind;
+        }
+        set FirstNonSpace $ind;
+        set LastSpace [expr $FirstNonSpace - 1];
+        set LeadingSpaces [string range $number 0 $LastSpace];
+
+        # Now extract the non-fractional part of the number, omitting leading spaces.
+        set MainNumber [string range $number $FirstNonSpace [expr $point -1]];
+
+        # Insert commas into the non-fractional part.
+        set Length [string length $MainNumber];
+        set Phase  [expr $Length % $GroupSize]
+        set PhaseMinusOne  [expr $Phase -1];
+        set DelimitedMain "";
+
+        #First we deal with the extra stuff.
+        if {$Phase > 0} {
+            append DelimitedMain [string range $MainNumber 0 $PhaseMinusOne];
+        }
+        set FirstInGroup $Phase;
+        set LastInGroup [expr $FirstInGroup + $GroupSize -1];
+        while {$LastInGroup < $Length} {
+            if {$FirstInGroup > 0} {
+                append DelimitedMain $delim;
+            }
+            append DelimitedMain [string range $MainNumber $FirstInGroup $LastInGroup];
+            incr FirstInGroup $GroupSize
+            incr LastInGroup  $GroupSize
+        }
+
+        # Reassemble the number.
+        if {$PostDecimalP} {
+            return [format "%s%s.%s" $LeadingSpaces $DelimitedMain $PostDecimal];
+        } else {
+            return [format "%s%s" $LeadingSpaces $DelimitedMain];
+        }
+    }
+
+
+
     #*** !doctools
     #[list_end] [comment {--- end definitions namespace punk::lib ---}]
 }
@@ -2998,7 +3166,9 @@ tcl::namespace::eval punk::lib::system {
         return [concat $smallfactors [lreverse $largefactors] $x]
     }
 
-    # incomplte - report which is the innermost bracket/quote etc awaiting completion for a Tcl command
+
+
+    # incomplete - report which is the innermost bracket/quote etc awaiting completion for a Tcl command
     #important - used by punk::repl
     proc incomplete {partial} {
         #we can apparently get away without concatenating current innerpartial to previous in list - REVIEW.
diff --git a/src/bootsupport/modules/punk/mix/base-0.1.tm b/src/bootsupport/modules/punk/mix/base-0.1.tm
index 1e90b5ca..932c1db6 100644
--- a/src/bootsupport/modules/punk/mix/base-0.1.tm
+++ b/src/bootsupport/modules/punk/mix/base-0.1.tm
@@ -35,12 +35,14 @@ namespace eval punk::mix::base {
         }
         #puts stderr "punk::mix::base extension: [string trimleft $extension :]"
         if {![string length $extension]} {
-            #if still no extension - must have been called dirctly as punk::mix::base::_cli
+            #if still no extension - must have been called directly as punk::mix::base::_cli
             if {![llength $args]} {
                 set args "help"
             }
             set extension [namespace current]
         }
+        #init usually used to load commandsets (and export their names) into the extension namespace/ensemble
+        ${extension}::_init
         if {![llength $args]} {
             if {[info exists ${extension}::default_command]} {
                 tailcall $extension [set ${extension}::default_command]
diff --git a/src/bootsupport/modules/punk/mix/cli-0.3.1.tm b/src/bootsupport/modules/punk/mix/cli-0.3.1.tm
index 5b1ec6da..cd6f3025 100644
--- a/src/bootsupport/modules/punk/mix/cli-0.3.1.tm
+++ b/src/bootsupport/modules/punk/mix/cli-0.3.1.tm
@@ -31,47 +31,58 @@ namespace eval punk::mix::cli {
     namespace eval temp_import {
     }
     namespace ensemble create
+    variable initialised 0
 
-    package require punk::overlay
-    catch {
-        punk::overlay::import_commandset module . ::punk::mix::commandset::module
-    }
-    punk::overlay::import_commandset debug . ::punk::mix::commandset::debug
-    punk::overlay::import_commandset repo  . ::punk::mix::commandset::repo
-    punk::overlay::import_commandset lib   . ::punk::mix::commandset::loadedlib
-
-    catch {
-        package require punk::mix::commandset::project
-        punk::overlay::import_commandset project    .       ::punk::mix::commandset::project
-        punk::overlay::import_commandset projects   .       ::punk::mix::commandset::project::collection 
-    }
-    if {[catch {
-        package require punk::mix::commandset::layout
-        punk::overlay::import_commandset project.layout       . ::punk::mix::commandset::layout
-        punk::overlay::import_commandset project.layouts      . ::punk::mix::commandset::layout::collection
-    } errM]} {
-        puts stderr "error loading punk::mix::commandset::layout"
-        puts stderr $errM
-    }
-    if {[catch {
-        package require punk::mix::commandset::buildsuite
-        punk::overlay::import_commandset buildsuite     .   ::punk::mix::commandset::buildsuite
-        punk::overlay::import_commandset buildsuites    .   ::punk::mix::commandset::buildsuite::collection
-    } errM]} {
-        puts stderr "error loading punk::mix::commandset::buildsuite"
-        puts stderr $errM
-    }
-    punk::overlay::import_commandset scriptwrap  . ::punk::mix::commandset::scriptwrap
-    if {[catch {
-        package require punk::mix::commandset::doc
-        punk::overlay::import_commandset doc . ::punk::mix::commandset::doc
-        punk::overlay::import_commandset ""  ""   ::punk::mix::commandset::doc::collection
-    } errM]} {
-        puts stderr "error loading punk::mix::commandset::doc"
-        puts stderr $errM
+    #lazy _init - called by punk::mix::base::_cli when ensemble used 
+    proc _init {args} {
+        variable initialised
+        if {$initialised} {
+            return
+        }
+        puts stderr "punk::mix::cli::init $args"
+        package require punk::overlay
+        namespace eval ::punk::mix::cli {
+            catch {
+                punk::overlay::import_commandset module . ::punk::mix::commandset::module
+            }
+            punk::overlay::import_commandset debug . ::punk::mix::commandset::debug
+            punk::overlay::import_commandset repo  . ::punk::mix::commandset::repo
+            punk::overlay::import_commandset lib   . ::punk::mix::commandset::loadedlib
+
+            catch {
+                package require punk::mix::commandset::project
+                punk::overlay::import_commandset project    .       ::punk::mix::commandset::project
+                punk::overlay::import_commandset projects   .       ::punk::mix::commandset::project::collection 
+            }
+            if {[catch {
+                package require punk::mix::commandset::layout
+                punk::overlay::import_commandset project.layout       . ::punk::mix::commandset::layout
+                punk::overlay::import_commandset project.layouts      . ::punk::mix::commandset::layout::collection
+            } errM]} {
+                puts stderr "error loading punk::mix::commandset::layout"
+                puts stderr $errM
+            }
+            if {[catch {
+                package require punk::mix::commandset::buildsuite
+                punk::overlay::import_commandset buildsuite     .   ::punk::mix::commandset::buildsuite
+                punk::overlay::import_commandset buildsuites    .   ::punk::mix::commandset::buildsuite::collection
+            } errM]} {
+                puts stderr "error loading punk::mix::commandset::buildsuite"
+                puts stderr $errM
+            }
+            punk::overlay::import_commandset scriptwrap  . ::punk::mix::commandset::scriptwrap
+            if {[catch {
+                package require punk::mix::commandset::doc
+                punk::overlay::import_commandset doc . ::punk::mix::commandset::doc
+                punk::overlay::import_commandset ""  ""   ::punk::mix::commandset::doc::collection
+            } errM]} {
+                puts stderr "error loading punk::mix::commandset::doc"
+                puts stderr $errM
+            }
+        }
+        set initialised 1
     }
 
-
     proc help {args} {
         #set basehelp [punk::mix::base::help -extension [namespace current] {*}$args]
         set basehelp [punk::mix::base help {*}$args]
@@ -210,11 +221,12 @@ namespace eval punk::mix::cli {
         proc validate_modulename {modulename args} {
             set opts [list\
                 -errorprefix validate_modulename\
+                -strict 0\
                 ]
             if {[llength $args] %2 != 0} {error "validate_modulename args must be name-value pairs: received '$args'"}
             foreach {k v} $args {
                 switch -- $k {
-                    -errorprefix {
+                    -errorprefix - -strict {
                         dict set opts $k $v
                     }
                     default {
@@ -223,8 +235,14 @@ namespace eval punk::mix::cli {
                 }
             }
             # -- --- --- --- --- --- --- --- --- --- --- --- --- ---
-            set opt_errorprefix            [dict get $opts -errorprefix]
+            set opt_errorprefix             [dict get $opts -errorprefix]
+            set opt_strict                  [dict get $opts -strict]
             # -- --- --- --- --- --- --- --- --- --- --- --- --- ---
+            if {$opt_strict} {
+                if {[regexp {[A-Z]} $modulename]} {
+                    error "$opt_errorprefix '$modulename' contains uppercase which is not recommended as per tip 590, and option -strict is set to 1" 
+                }
+            }
 
             validate_name_not_empty_or_spaced $modulename -errorprefix $opt_errorprefix
             set testname [string map {:: {}} $modulename]
@@ -239,6 +257,56 @@ namespace eval punk::mix::cli {
             }
             return $modulename
         }
+        proc confirm_modulename {modulename} {
+            set finalised 0
+            set aborted 0
+            while {!$finalised && !$aborted} {
+                #first validate with -strict 0 to confirm acceptable while ignoring case issues.
+                #uppercase is generally valid but not recommended - so has separate prompting.
+                if {[catch {validate_modulename $modulename -strict 0} errM]} {
+                    set msg "Chosen name didn't pass validation\n"
+                    append msg "reason: $errM\n"
+                    append msg "Please retype the modulename. You will be given a further prompt to confirm or abort."
+                    set modulename [util::askuser $msg]
+                } elseif {[regexp {[A-Z]} $modulename]} {
+                    set msg     "module names containing uppercase are not recommended (see tip 590).\n"
+                    append msg  "Please retype the module name '$modulename' to proceed.\n"
+                    append msg  "If you type it exactly as it was you will be allowed to proceed with uppercase anyway\n" 
+                    append msg  "Retype it all in lowercase to use recommended naming"
+                    set answer [util::askuser $msg]
+                    if {[regexp {[A-Z]} $answer]} {
+                        if {$answer eq $modulename} {
+                            #ok - user insists
+                            set finalised 1
+                        } else {
+                            #user supplied a different uppercase name - don't set finalised so we bug them again to type it two times the same way to proceed
+                            puts stdout "A different uppercase name was supplied - reconfirmation required."
+                        }
+                        set modulename $answer
+                    } else {
+                        #user has resupplied modulename all as lowercase 
+                        if {$answer eq [string tolower $modulename]} {
+                            set finalised 1
+                        } else {
+                            #.. but it doesn't match original - require rerun 
+                        }
+                        set modulename $answer
+                    }
+                } else {
+                    set answer [util::askuser "Proceed with the module name '$modulename'? Y to continue N to abort"]
+                    if {[string tolower $answer] eq "y"} {
+                        set finalised 1
+                    } else {
+                        set aborted 1
+                    }
+                }
+            }
+            if {$aborted} {
+                return [dict create status error reason errmsg]
+            } else {
+                return [dict create status ok modulename $modulename]
+            }
+        }
 
         proc validate_projectname {projectname args} {
             set defaults [list\
diff --git a/src/bootsupport/modules/punk/mix/commandset/doc-0.1.0.tm b/src/bootsupport/modules/punk/mix/commandset/doc-0.1.0.tm
index fafc3cec..856c9340 100644
--- a/src/bootsupport/modules/punk/mix/commandset/doc-0.1.0.tm
+++ b/src/bootsupport/modules/punk/mix/commandset/doc-0.1.0.tm
@@ -165,7 +165,17 @@ namespace eval punk::mix::commandset::doc {
 
         cd $original_wd
     }
-    proc validate {} {
+    proc validate {args} {
+        set argd [punk::args::get_dict {
+            --          -type none -optional 1 -help "end of options marker --" 
+            -individual -type boolean -default 1
+            *values -min 0 -max -1
+            patterns -default {*} -type any -multiple 1
+        } $args] 
+        set opt_individual      [tcl::dict::get $argd opts -individual]
+        set patterns        [tcl::dict::get $argd values patterns]
+
+        
         #todo - run and validate punk::docgen output
         set projectdir [punk::repo::find_project]
         if {$projectdir eq ""} {
@@ -180,7 +190,23 @@ namespace eval punk::mix::commandset::doc {
         set docroot $projectdir/src/doc
         cd $docroot
 
-        dtplite validate  $docroot
+        if {!$opt_individual && "*" in $patterns} {
+            if {[catch {
+                dtplite validate  $docroot
+            } errM]} {
+                puts stderr "commandset::doc::validate failed for projectdir '$projectdir'"
+                puts stderr "docroot '$docroot'"
+                puts stderr "dtplite error was: $errM"
+            }
+        } else {
+            foreach p $patterns {
+                set treefiles [punk::path::treefilenames $p]
+                foreach path $treefiles {
+                    puts stdout "dtplite validate $path"
+                    dtplite validate $path
+                }
+            }
+        }
 
         #punk::mix::cli::lib::kettle_call lib validate-doc
 
diff --git a/src/bootsupport/modules/punk/mix/commandset/loadedlib-0.1.0.tm b/src/bootsupport/modules/punk/mix/commandset/loadedlib-0.1.0.tm
index bd0b5358..08d103ee 100644
--- a/src/bootsupport/modules/punk/mix/commandset/loadedlib-0.1.0.tm
+++ b/src/bootsupport/modules/punk/mix/commandset/loadedlib-0.1.0.tm
@@ -179,7 +179,16 @@ namespace eval punk::mix::commandset::loadedlib {
         return [join $loaded_libs \n]
     }
 
-    proc info {libname} {
+    proc info {args} {
+        set argspecs {
+            *values -min 1
+            libname -help "library/package name"
+        }
+        set argd [punk::args::get_dict $argspecs $args]
+        set libname [dict get $argd values libname]
+
+
+
         if {[catch {package require natsort}]} {
             set has_natsort 0
         } else {
diff --git a/src/bootsupport/modules/punk/mix/commandset/module-0.1.0.tm b/src/bootsupport/modules/punk/mix/commandset/module-0.1.0.tm
index 9955c53b..029be3ce 100644
--- a/src/bootsupport/modules/punk/mix/commandset/module-0.1.0.tm
+++ b/src/bootsupport/modules/punk/mix/commandset/module-0.1.0.tm
@@ -204,6 +204,30 @@ namespace eval punk::mix::commandset::module {
             set modulename $module
         }
         punk::mix::cli::lib::validate_modulename $modulename -errorprefix "punk::mix::commandset::module::new"
+
+        if {[regexp {[A-Z]} $module]} {
+            set msg     "module names containing uppercase are not recommended (see tip 590).\n"
+            append msg  "Please retype the module name '$module' to proceed.\n"
+            append msg  "If you type it exactly as it was you will be allowed to proceed with uppercase anyway\n" 
+            append msg  "Retype it all in lowercase to use recommended naming"
+            set answer [util::askuser $msg]
+            if {[regexp {[A-Z]} $answer]} {
+                if {$answer eq $module} {
+                    #ok - user insists
+                } else {
+
+                }
+            } else {
+                #user has resupplied modulename all as lowercase 
+                if {$answer eq [string tolower $module]} {
+                    set module $answer
+                } else {
+                    #.. but it doesn't match original - require rerun 
+                }
+            }
+        }
+
+
         # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
         #options
         # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
diff --git a/src/bootsupport/modules/punk/mix/commandset/project-0.1.0.tm b/src/bootsupport/modules/punk/mix/commandset/project-0.1.0.tm
index aa630d36..9afc685c 100644
--- a/src/bootsupport/modules/punk/mix/commandset/project-0.1.0.tm
+++ b/src/bootsupport/modules/punk/mix/commandset/project-0.1.0.tm
@@ -165,7 +165,7 @@ namespace eval punk::mix::commandset::project {
                 #user can use dev module.new manually or supply module name in -modules
                 set opt_modules [list] 
             } else {
-                set opt_modules [list $projectname]
+                set opt_modules [list [string tolower $projectname]] ;#default modules to lowercase as is the modern (tip 590) recommendation for Tcl
             }
         }
         # -- --- --- --- --- --- --- --- --- --- --- --- ---
@@ -919,10 +919,18 @@ namespace eval punk::mix::commandset::project {
 
             if {[llength $col_states]} {
                 foreach row $col_rowids wd $workdirs db $col_fnames dup $col_dupids pname $col_pnames pcode $col_pcodes s $col_states {
+                    if {![file exists $wd]} {
+                        set row [punk::ansi::a+ strike red]$row[a]
+                        set wd [punk::ansi::a+ red]$wd[a]
+                    }
                     append msg "[overtype::right $col0 $row] [overtype::left $col1 $wd] [overtype::left $col2 $db] [overtype::right $col3 $dup] [overtype::left $col4 $pname] [overtype::left $col5 $pcode] [overtype::left $col6 $s]" \n
                 } 
             } else {
                 foreach row $col_rowids wd $workdirs db $col_fnames dup $col_dupids pname $col_pnames pcode $col_pcodes {
+                    if {![file exists $wd]} {
+                        set row [punk::ansi::a+ strike red]$row[a]
+                        set wd [punk::ansi::a+ red]$wd[a]
+                    }
                     append msg "[overtype::right $col0 $row] [overtype::left $col1 $wd] [overtype::left $col2 $db] [overtype::right $col3 $dup] [overtype::left $col4 $pname] [overtype::left $col5 $pcode]" \n
                 } 
             }
diff --git a/src/bootsupport/modules/punk/overlay-0.1.tm b/src/bootsupport/modules/punk/overlay-0.1.tm
index 5534dad3..73b8ef39 100644
--- a/src/bootsupport/modules/punk/overlay-0.1.tm
+++ b/src/bootsupport/modules/punk/overlay-0.1.tm
@@ -130,6 +130,7 @@ tcl::namespace::eval ::punk::overlay {
         }]
 
         set imported_commands [list]
+        set imported_tails [list]
         set nscaller [uplevel 1 [list tcl::namespace::current]]
         if {[catch {
             #review - noclobber?
@@ -143,7 +144,10 @@ tcl::namespace::eval ::punk::overlay {
                 }
                 rename $cmd  $import_as
                 lappend imported_commands $import_as
+                lappend imported_tails [namespace tail $import_as]
             }
+            #make imported commands exported so they are available to the ensemble
+            tcl::namespace::eval ${nscaller} [list namespace export {*}$imported_tails]
         } errM]} {
             puts stderr "Error loading commandset $prefix $separator $cmdnamespace"
             puts stderr "err: $errM"
diff --git a/src/bootsupport/modules/punk/path-0.1.0.tm b/src/bootsupport/modules/punk/path-0.1.0.tm
index 933ef860..2165c0fd 100644
--- a/src/bootsupport/modules/punk/path-0.1.0.tm
+++ b/src/bootsupport/modules/punk/path-0.1.0.tm
@@ -63,11 +63,11 @@ package require Tcl 8.6-
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 # oo::class namespace
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
-namespace eval punk::path::class {
+#namespace eval punk::path::class {
     #*** !doctools
     #[subsection {Namespace punk::path::class}]
     #[para] class definitions
-    if {[info commands [namespace current]::interface_sample1] eq ""} {
+    #if {[info commands [namespace current]::interface_sample1] eq ""} {
         #*** !doctools
         #[list_begin enumerated]
 
@@ -89,8 +89,8 @@ namespace eval punk::path::class {
 
         #*** !doctools
         #[list_end] [comment {--- end class enumeration ---}]
-    }
-}
+    #}
+#}
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
@@ -105,6 +105,448 @@ namespace eval punk::path {
     #[para] Core API functions for punk::path 
     #[list_begin definitions]
 
+    # -- --- 
+    #punk::path::normjoin
+    # - simplify . and .. segments as far as possible whilst respecting specific types of root.
+    # -- --- 
+    #a form of file normalize that supports //xxx to be treated as server path names
+    #(ie regardless of unices ignoring (generally) leading double slashes, and regardless of windows volumerelative path syntax)
+    #(sometimes //server.com used as a short form for urls - which doesn't seem too incompatible with this anyway) 
+    # -- --- 
+    #This is intended to be purely a string analysis - without reference to filesystem volumes or vfs or zipfs mountpoints etc
+    #
+    #TODO - option for caller to provide a -base below which we can't backtrack.
+    #This is preferable to setting policy here for example regarding forcing no trackback below //servername/share 
+    #Our default is to allow trackback to:
+    #  <scheme>://<something>
+    #  <driveletter>:/
+    #  //./<volume>   (dos device volume)
+    # //server   (while normalizing //./UNC/server to same)
+    # /   (ordinary unix root)
+    # ./../<repeated>  - (track back indefinitely on relpath as we are not resolving to anything physical and can't fully simplify the leading backtracks)
+    #
+    #The caller should do the file/vfs operations to determine this - not us.
+    # -- --- 
+    #simplify path with respect to /./ & /../ elements - independent of platform
+    #NOTE: "anomalies" in standard tcl processing on windows:
+    #e.g file normalize {//host} -> c:/host  (or e.g d:/host if we happen to be on another volume)
+    #file normalize {//host/share} -> //host/share
+    #This is because //host is treated as volume-relative in cmd/powershell and Tcl quite reasonably follows suit.
+    #This prevents cwd and windows commandlines from pointing to the server (above the share)
+    #Explorer however does allow pointing to the //server level and seeing shares as if they are directory entries.
+    #we are more interested in supporting the explorer-like behaviour - as while volumerelative paths are also useful on windows - they are lesser known.
+    #REVIEW.
+    #To get back to some consistent cross platform behaviour - we will treat //something as a root/volume i.e we can't backtrack above it with ".."
+    #note too that file split on UNC paths doesn't give a clear indication of the root
+    # file split //./UNC/server/share/subpath -> //./UNC server share subpath
+    # file split //server/share/subpath -> //server/share subpath
+    #TODO - disallow all change of root or change from relative path to absolute result.
+    #e.g normjoin relpath/../d:/secret should not return d:/secret - but ./d:/secret
+    # ================
+    #known issues:
+    #1)
+    # normjoin d://a//b//c -> d://a/b/c
+    # This is because we don't detect specific schemes. ie it's treated the same as https://a/b/c -> https://a/b/c 
+    # Not considered a problem - just potentially surprising.
+    # To avoid it we would have to enumerate possible schemes. 
+    # As it stands a unix system could define a 'scheme' that happens to match windows style driveletters. Consider a 'feature' ? review.
+    # won't fix?
+    #2)
+    # normjoin https:///real.com/../fake.com -> https:///fake.com
+    # The extra slash means effectively our servername is empty - this is potentially confusing but probably the right thing to do here.
+    # It's a concern only if upstream treats the tripple slash in this case as valid and maps it to https:// - which would probably be bad anyway.
+    # won't fix (review)
+    #3)
+    #similarly
+    # normjoin //./UNC//server/share/subpath -> ///server/share/subpath  (when 2 or more slashes directly after UNC)
+    # normjoin ///server/share  -> ///server/share
+    #This is effectively an empty servername in the input with 'server' being pushed one level down - and the output is consistent
+    # possibly won't fix - review
+    #4) inconsistency 
+    # we return normalized //server/share for //./UNC/server share
+    # but other dos device paths are maintained
+    # e.g //./c:/etc
+    # This is because such paths could contain alternate segment names (windows shortnames) which we aren't in a position to resolve.
+    # caller should 
+    # #as with 'case' below - caller will need to run a post 'file normalize' 
+    #5) we don't normalize case like file normalize does on windows platform.
+    #   This is intentional. It could only be done with reference to underlying filesystem which we don't want here.
+    #  
+    # ================
+    #
+    #relpaths all end up with leading . - while not always the simplest form, this is ok. (helps stop inadvertent conversions to absolutes)
+    # Tests - TODO
+    # normjoin /d:/..//vfs:/test -> /vfs:/test  (good - not converted to //vfs:/test)
+    proc normjoin {args} {
+        set args [lmap a $args {string map "\\\\ /" $a}]
+        set path [plainjoin {*}$args]
+        switch -exact $path {
+            "" {
+                return ""
+            }
+            / - // {
+                #treated in unixlike manner - (but leading doubleslashes with subsequent data are server indication)
+                #// not considered a servername indicator - but /// (for consistency) is. (empty servername?)
+                return /
+            }
+            /// {
+                #if this is effectively //$emptyservername/
+                #then for consistency we should trail //<servername with a slash too?
+                #we can't transform to //  or /  
+                return ///
+                #assert - code below should return /// (empty server prefix) for any number of leading slashes >=3
+                #todo - shortcircuit that here?
+            }
+         }
+        # /// 
+        set doubleslash1_posn [string first // $path] 
+
+        # -- --- --- temp warning on windows only - no x-platform difference in result
+        #on windows //host is of type volumerelative
+        # whereas //host/share is of type absolute
+        if {"windows" eq $::tcl_platform(platform) && [file pathtype $path] eq "volumerelative"} {
+            #volumerelative probably only occurs on windows anyway
+            if {$doubleslash1_posn == 0} {
+                #e.g //something  where no further slashes
+                #review - eventually get rid of this warning and require upstream to know the appropriate usecase
+                puts stderr "Warning - ambiguous path $path - treating as server path - not 'volumerelative'"
+            } else {
+                # /something/etc
+                # /mnt/c/stuff
+                #output will retain leading / as if on unix.
+                #on windows - the result would still be interpreted as volumerelative if the caller normalizes it
+            }
+        }
+        # -- --- ---
+
+        set is_relpath 0 
+
+        #set path [string map [list \\ /] $path]
+        set finalparts [list]
+        set is_nonunc_dosdevice 0
+        if {[punk::winpath::is_dos_device_path $path]} {
+            #review
+            if {[string range $path 4 6] eq "UNC"} {
+                #convert to 'standard' //server/... path for processing
+                set path "/[string range $path 7 end]"  ;# //server/...
+            } else {
+                #error "normjoin non-UNC dos device path '$path' not supported"
+                #first segment after //./ or //?/ represents the volume or drive.
+                #not applicable to unix - but unlikely to conflict with a genuine usecase there (review)
+                #we should pass through and stop navigation below //./vol
+                #!!!
+                #not anomaly in tcl (continues in tcl9)
+                #file exists //./c:/test  -> 0
+                #file exists //?/c:/test  -> 1
+                #file exists //./BootPartition/Windows -> 1
+                #file exists //?/BootPartition/Windows -> 0
+                set is_nonunc_dosdevice 1
+            }
+        }
+
+        if {$is_nonunc_dosdevice} {
+            #dosdevice prefix //./ or //?/  - preserve it (without trailing slash which will be put back in with join)
+            set prefix [string range $path 0 2]
+            set tail [string range $path 4 end]
+            set tailparts [split $tail /]
+            set parts [concat [list $prefix] $tailparts]
+            set rootindex 1 ;#disallow backtrack below //./<volume>
+        } else {
+            #note use of ordinary ::split vs file split is deliberate.
+            if {$doubleslash1_posn == 0} {
+                #this is handled differently on different platforms as far as 'file split' is concerned.
+                #e.g for file split //sharehost/share/path/etc
+                #e.g on windows:  -> //sharehost/share path
+                #e.g on freebsd:  ->  / sharehost share path etc
+                #however..also on windows: file split //sharehost  -> / sharehost
+                #normalize by dropping leading slash before split - and then treating first 2 segments as a root
+                #set parts [file split [string range $path 1 end]]
+                set parts [split $path /]
+                #assert parts here has {} {} as first 2 entries 
+                set rootindex 2
+                #currently prefer can backtrack to the  //zipfs:/  scheme (below the mountpoint - to browse other mounts)
+                #alternative handling for //zipfs:/path - don't go below mountpoint
+                #but we can't determine just from string if mountpoint is direct subpath or a lower one e.g //zipfs:/arbitraryname/actualmountpoint  
+                #review - more generally //<mountmechanism>:/path ?
+                #todo - make an option for zipfs and others to determine the 'base'
+                #if {"zipfs:" eq [lindex $parts 2]} {
+                #    set rootindex 3
+                #}
+            } else {
+                #path may or may not begin with a single slash here.
+                #treat same on unix and windows
+                set rootindex 0
+                #set parts [file split $path]
+                set parts [::split $path /]
+                #e.g /a/b/c -> {} a b c
+                #or relative path a/b/c ->  a b c 
+                #or  c:/a/b/c -> c: a b c
+                if {[string match *: [lindex $parts 0]]} {
+                    if {[lindex $parts 1] eq ""} {
+                        #scheme://x splits to scheme: {} x
+                        set parts [concat [list [lindex $parts 0]/] [lrange $parts 2 end]]
+                        #e.g {scheme:/ x}
+                        set rootindex 1  ;#disallow below first element of scheme
+                    } else {
+                        set rootindex 0
+                    }
+                } elseif {[lindex $parts 0] ne ""} {
+                    #relpath a/b/c
+                    set parts [linsert $parts 0 .]
+                    set rootindex 0 
+                    #allow backtracking arbitrarily for leading .. entries - simplify where possible 
+                    #also need to stop possible conversion to absolute path 
+                    set is_relpath 1
+                }
+            }
+        }
+        set baseparts [lrange $parts 0 $rootindex] ;#base below which we can't retreat via ".."
+        #puts stderr "-->baseparts:$baseparts"
+        #ensure that if our rootindex already spans a dotted segment (after the first one) we remove it
+        #must maintain initial . for relpaths to stop them converting to absolute via backtrack
+        # 
+        set finalparts [list [lindex $baseparts 0]]
+        foreach b [lrange $baseparts 1 end] {
+            if {$b ni {. ..}} {
+                lappend finalparts $b
+            }
+        }
+        set baselen [expr {$rootindex + 1}]
+        if {$is_relpath} {
+            set i [expr {$rootindex+1}]
+            foreach p [lrange $parts $i end] {
+                switch -exact -- $p {
+                    . - "" {}
+                    .. {
+                        switch -exact -- [lindex $finalparts end] {
+                            . - .. {
+                                lappend finalparts ..
+                            }
+                            default {
+                                lpop finalparts
+                            }
+                        }
+                    }
+                    default {
+                        lappend finalparts $p
+                    }
+                }
+                incr i 
+            }
+        } else {
+            foreach p [lrange $parts $rootindex+1 end] {
+                if {[llength $finalparts] <= $baselen} {
+                    if {$p ni {. .. ""}} {
+                        lappend finalparts $p
+                    }
+                } else  {
+                    switch -exact -- $p {
+                        . - "" {}
+                        .. {
+                            lpop finalparts ;#uses punk::lib::compat::lpop if on < 8.7 
+                        }
+                        default {
+                            lappend finalparts $p
+                        }
+                    }
+                }
+            }
+        }
+        puts "==>finalparts: '$finalparts'"
+        # using join - {"" "" server share} -> //server/share  and {a b} -> a/b
+        if {[llength $finalparts] == 1 && [lindex $finalparts 0] eq ""} {
+            #backtracking on unix-style path can end up with empty string as only member of finalparts
+            #e.g /x/..
+            return /
+        }
+        set result [::join $finalparts /]
+        #normalize volumes and mountschemes to have trailing slash if no subpath
+        #e.g c: -> c:/
+        #//zipfs: -> //zipfs:/
+        if {[set lastchar [string index $result end]] eq ":"} {
+            if {$result eq "//zipfs:"} {
+                set result "//zipfs:/"
+            } else {
+                if {[string first / $result] < 0} {
+                    set result $result/
+                }
+            }
+        } elseif {[string match //* $result]} {
+            if {![punk::winpath::is_dos_device_path $result]} {
+                #server
+                set tail [string range $result 2 end]
+                set tailparts [split $tail /]
+                if {[llength $tailparts] <=1} {
+                    #empty //  or //servername
+                    append result /
+                }
+            }
+        } elseif {[llength $finalparts] == 2} {
+            if {[string range [lindex $finalparts 0] end-1 end] eq ":/"} {
+                #e.g https://server/  -> finalparts {https:/ server}
+                #e.g https:/// ->  finalparts {https:/ ""}
+                #scheme based path should always return trailing slash after server component - even if server component empty.
+                lappend finalparts "" ;#force trailing /
+                return [join $finalparts /]
+            }
+        }
+        return $result
+    }
+
+    proc trim_final_slash {str} {
+        if {[string index $str end] eq "/"} {
+            return [string range $str 0 end-1]
+        }
+        return $str
+    }
+
+
+    #x-platform - punk::path::pathtype - can be used in safe interps - different concept of pathtypes to 'file pathtype' 
+    # - no volumerelative 
+    # - no lookup of file volumes (volume is a windows concept - but with //zipfs:/ somewhat applicable to other platforms)
+    # - /* as absolute  (covers also //zipfs:/ (volume),  //server , //./etc , //./UNC)
+    # - xxx:// as absolute (scheme)
+    # - xxx:/ or x:/ as absolute
+    # - x: xxx: -> as absolute (volume-basic or volume-extended) 
+
+    #note also on windows - legacy name for COM devices
+    # COM1 = COM1: 
+    # //./COM1 ??  review
+
+    proc pathtype {str} {
+        set str [string map "\\\\ /" $str]
+        if {[string index $str 0] eq "/"} {
+            #todo - look for //xxx:/ prefix (generalisation of //zipfs:/)  as a 'volume' specifically {volume mount} ?? - review
+            # look for //server prefix as {absolute server}
+            # look for //./UNC/server or //?/UNC/server as  {absolute server UNC} ?
+            # look for //./<dosdevice>  as {absolute dosdevice}
+            return absolute
+        }
+
+        #only firstsegment with single colon at last position (after some non empty string) counts as volume or scheme - review 
+        #e.g a:b:/..  or a::/..  or :/..  is not treated as volume/scheme whereas ab:/ is.
+        set firstslash [string first / $str]
+        if {$firstslash == -1} {
+            set firstsegment $str
+        } else {
+            set firstsegment [string range $str 0 $firstslash-1]
+        }
+        if {[set firstc [string first : $firstsegment]] > 0} {
+            set lhs_firstsegment [string range $firstsegment 0 $firstc-1] 
+            set rhs_firstsegment [string range $firstsegment $firstc+1 end] ;#exclude a:b/ etc
+            if {$rhs_firstsegment eq ""} { 
+                set rhs_entire_path [string range $str $firstc+1 end]
+                #assert lhs_firstsegment not empty since firstc > 0
+                #count following / sequence
+                set i 0
+                set slashes_after_firstsegment "" ;#run of slashes *directly* following first segment
+                while {$i < [string length $rhs_entire_path]} {
+                    if {[string index $rhs_entire_path $i] eq "/"} {
+                        append slashes_after_firstsegment /
+                    } else {
+                        break
+                    }
+                    incr i
+                }
+                switch -exact -- $slashes_after_firstsegment {
+                    "" - / {
+                        if {[string length $lhs_firstsegment] == 1} {
+                            return {absolute volume basic}
+                        } else {
+                            return {absolute volume extended}
+                        }
+                    }
+                    default {
+                        #2 or more /
+                        #this will return 'scheme' even for c://  - even though that may look like a windows volume - review
+                        return {absolute scheme}
+                    }
+                }
+            }
+        }
+        #assert first element of any return has been absolute or relative 
+        return relative
+    }
+
+
+    proc plain {str} {
+        set str [string map "\\\\ /" $str]
+        set pathinfo [punk::path::pathtype $str]
+        if {[lindex $pathinfo 0] eq "relative" && ![string match ./* $str]} {
+            set str ./$str
+        }
+        if {[string index $str end] eq "/"} {
+            if {[string map {/ ""} $str] eq ""} {
+                #all slash segment
+                return $str
+            } else {
+                if {[lindex $pathinfo 1] ni {volume scheme}} {
+                    return [string range $str 0 end-1]
+                }
+            }
+        }
+        return $str
+    }
+    #purely string based - no reference to filesystem knowledge 
+    #unix-style forward slash only
+    proc plainjoin {args} {
+        set args [lmap a $args {string map "\\\\ /" $a}]
+        #if {[llength $args] == 1} {
+        #    return [lindex $args 0]
+        #}
+        set out ""
+        foreach a $args {
+            if {![string length $out]} {
+                append out [plain $a] 
+            } else {
+                set a [plain $a]
+                if {[string map {/ ""} $out] eq ""} {
+                    set out [string range $out 0 end-1]
+                } 
+
+                if {[string map {/ ""} $a] eq ""} {
+                    #all / segment
+                    append out [string range $a 0 end-1]
+                } else {
+                    if {[string length $a] > 2 && [string match "./*" $a]} {
+                        set a [string range $a 2 end]
+                    } 
+                    if {[string index $out end] eq "/"} {
+                        append out $a
+                    } else {
+                        append out / $a 
+                    }
+                }
+            }
+        }
+        return $out 
+    }
+    proc plainjoin1 {args} {
+        if {[llength $args] == 1} {
+            return [lindex $args 0]
+        }
+        set out [trim_final_slash [lindex $args 0]]
+        foreach a [lrange $args 1 end] {
+            set a [trim_final_slash $a]
+            append out / $a 
+        }
+        return $out 
+    }
+
+    #intention?
+    #proc filepath_dotted_dirname {path} {
+    #}
+
+    proc strip_prefixdepth {path prefix} {
+        if {$prefix eq ""} {
+            return [norm $path]
+        }
+        return [file join \
+            {*}[lrange \
+                [file split [norm $path]] \
+                [llength [file split [norm $prefix]]] \
+                end]]
+    }
 
     proc pathglob_as_re {pathglob} {
         #*** !doctools
diff --git a/src/bootsupport/modules/punk/repo-0.1.1.tm b/src/bootsupport/modules/punk/repo-0.1.1.tm
index ee2384b4..2cb5fd1d 100644
--- a/src/bootsupport/modules/punk/repo-0.1.1.tm
+++ b/src/bootsupport/modules/punk/repo-0.1.1.tm
@@ -134,13 +134,30 @@ namespace eval punk::repo {
     }
     interp alias "" fossil "" punk::repo::fossil_proxy
 
+    # ---
+    # Calling auto_execok on an external tool can be too slow to do during package load (e.g could be 150ms)
+
     #safe interps can't call auto_execok
     #At least let them load the package even though much of it may be unusable depending on the safe configuration
-    catch {
-    if {[auto_execok fossil] ne ""} { 
-        interp alias "" FOSSIL "" {*}[auto_execok fossil]
-    }
+    #catch {
+    #    if {[auto_execok fossil] ne ""} { 
+    #        interp alias "" FOSSIL "" {*}[auto_execok fossil]
+    #    }
+    #}
+    # ---
+    # ----------
+    #
+
+    #uppercase FOSSIL to bypass fossil as alias to fossil_proxy
+    proc establish_FOSSIL {args} {
+        if {![info exists ::auto_execs(FOSSIL)]} {
+            set ::auto_execs(FOSSIL) [auto_execok fossil] ;#may fail in safe interp
+        }
+        interp alias "" FOSSIL "" ;#delete establishment alias
+        FOSSIL {*}$args
     }
+    interp alias "" FOSSIL "" punk::repo::establish_FOSSIL
+    # ----------
 
     proc askuser {question} {
         if {![catch {package require punk::lib}]} {
@@ -370,7 +387,16 @@ namespace eval punk::repo {
         }
 
         if {$repodir eq ""} {
-            error "workingdir_state error: No repository found at or above path '$abspath'" 
+            puts stderr "workingdir_state error: No repository found at or above path '$abspath'" 
+            puts stderr "args: $args"
+            dict set resultdict revision {} 
+            dict set resultdict revision_iso8601 {} 
+            dict set resultdict paths {} 
+            dict set resultdict ahead ""
+            dict set resultdict behind ""
+            dict set resultdict error {reason "no_repo_found"}
+            dict set resultdict repotype none
+            return $resultdict
         }
         set subpath [punk::path::relative $repodir $abspath]
         if {$subpath eq "."} {
@@ -644,6 +670,16 @@ namespace eval punk::repo {
         set path_count_fields [list unchanged changed new missing extra]
         set state_fields [list ahead behind repodir subpath repotype revision revision_iso8601]
         set dresult [dict create]
+        if {[dict exists $repostate error]} {
+            foreach f $state_fields {
+                dict set dresult $f ""
+            }
+            foreach f $path_count_fields {
+                dict set dresult $f ""
+            }
+            #todo?
+            return $dresult
+        }
         foreach f $state_fields {
            dict set dresult $f [dict get $repostate $f]
         }
diff --git a/src/bootsupport/modules/punk/winpath-0.1.0.tm b/src/bootsupport/modules/punk/winpath-0.1.0.tm
index b30133ba..6de745a8 100644
--- a/src/bootsupport/modules/punk/winpath-0.1.0.tm
+++ b/src/bootsupport/modules/punk/winpath-0.1.0.tm
@@ -30,7 +30,7 @@ namespace eval punk::winpath {
 
     #\\servername\share etc  or \\?\UNC\servername\share  etc.
     proc is_unc_path {path} {
-        set strcopy_path [punk::objclone $path]
+        set strcopy_path [punk::winpath::system::objclone $path]
         set strcopy_path [string map {\\ /} $strcopy_path] ;#normalize to forward slashes for testing purposes (and forward slashes seem to be auto-translated by windows anyway)
         if {[string first "//" $strcopy_path] == 0} {
             #check for "Dos device path" syntax
@@ -77,7 +77,7 @@ namespace eval punk::winpath {
     #dos device path syntax allows windows api to acces extended-length paths and filenames with illegal path characters such as trailing dots or whitespace
     #(can exist on server shares and on NTFS - but standard apps can't access without dos device syntax)
     proc is_dos_device_path {path} {
-        set strcopy_path [punk::objclone $path]
+        set strcopy_path [punk::winpath::system::objclone $path]
         set strcopy_path [string map {\\ /} $strcopy_path] ;#normalize to forward slashes for testing purposes (and forward slashes seem to be auto-translated by windows anyway)
         if {[string range $strcopy_path 0 3] in {//?/ //./}} {
             return 1
@@ -87,7 +87,7 @@ namespace eval punk::winpath {
     }
     proc strip_dos_device_prefix {path} {
         #it's unlikely to be valid to strip only //?/ from a //?/UNC  path so check for it here and diver to strip that.
-        #(review.. or raise error because a //?/UNC path isn't *strictly* a UNC path? )
+        #(review.. or raise error because a //?/UNC path isn't an ordinary dos device path? )
         if {[is_unc_path $path]} {
             return [strip_unc_path_prefix $path]
         }
@@ -98,18 +98,18 @@ namespace eval punk::winpath {
         }
     }
     proc strip_unc_path_prefix {path} {
-        if {[is_unc_path $path]} {
-            #//?/UNC/server/etc
-            set strcopy_path [punk::objclone $path]
-            set trimmedpath [string range $strcopy_path 7 end]
-            file pathtype $trimmedpath ;#shimmer it to path rep
-            return $trimmedpath
-        } elseif {is_unc_path_plain $path} {
+        if {[is_unc_path_plain $path]} {
             #plain unc //server
-            set strcopy_path [punk::objclone $path]
+            set strcopy_path [punk::winpath::system::objclone $path]
             set trimmedpath [string range $strcopy_path 2 end]
             file pathtype $trimmedpath
             return $trimmedpath
+        } elseif {is_unc_path $path} {
+            #//?/UNC/server/subpath  or  //./UNC/server/subpath
+            set strcopy_path [punk::winpath::system::objclone $path]
+            set trimmedpath [string range $strcopy_path 7 end]
+            file pathtype $trimmedpath ;#shimmer it to path rep
+            return $trimmedpath
         } else {
             return $path
         }
@@ -153,7 +153,7 @@ namespace eval punk::winpath {
             error $err
         }
 
-        set strcopy_path [punk::objclone $path]
+        set strcopy_path [punk::winpath::system::objclone $path]
 
 
         #Note: path could still have leading double slash if it is a Dos device path: e.g. //?/c:/etc
@@ -225,27 +225,124 @@ namespace eval punk::winpath {
         return 0
     }
 
-    proc test_ntfs_tunneling {f1 f2 args} {
-        file mkdir $f1
-        puts stderr  "waiting 15secs..."
-        after 5000 {puts -nonewline stderr .}
-        after 5000 {puts -nonewline stderr .}
-        after 5000 {puts -nonewline stderr .}
-        after 500 {puts stderr \n}
-        file mkdir $f2
-        puts stdout "$f1   [file stat $f1]"
-        puts stdout "$f2   [file stat $f2]"
-        file delete $f1
-        puts stdout "renaming $f2 to $f1"
-        file rename $f2 $f1
-        puts stdout "$f1   [file stat $f1]"
-
+    proc shortname {path} {
+        set shortname "NA"
+        if {[catch {
+            set shortname [dict get [file attributes $path] -shortname]
+        } errM]} {
+            puts stderr "Failed to get shortname for '$path'"
+        }
+        return $shortname
+    }
+    proc test_ntfs_tunneling {prefix args} {
+        puts stderr "We are looking for whether any of the final $prefix files or dirs took over the ctime attribute of the original $prefix files or dirs"
+        puts stderr "We expect the ino values to get potentially reassigned depending on order of deletion/creation so matches are coincidental and not material"
+        puts stderr "The shortnames are similarly allocated as they come - so presumably match by coincidence"
+        puts stderr "However - if we record a file's shortname, then delete it. Recreating it by shortname within the tunneling timeframe will magically reassociate the longname"
+        puts stderr "use test_ntfs_tunneling2 to test shortname tunneling"
+        file mkdir $prefix-dir-rename
+        file mkdir $prefix-dir-recreate
+        set fd [open $prefix-file-recreate.txt w]
+        puts $fd "original for recreate"
+        close $fd
+        set fd [open $prefix-file-rename.txt w]
+        puts $fd "original for rename"
+        close $fd
+        puts stdout "ORIGINAL files/dirs"
+        puts stdout "$prefix-dir-rename           [file stat $prefix-dir-rename] "
+        puts stdout "$prefix-dir-recreate         [file stat $prefix-dir-recreate]"
+        puts stdout "$prefix-file-recreate.txt    [file stat $prefix-file-recreate.txt] short:[shortname $prefix-file-recreate.txt]"
+        puts stdout "$prefix-file-rename.txt      [file stat $prefix-file-rename.txt] short:[shortname $prefix-file-rename.txt]"
+        puts stderr  "waiting 10secs (to have discernable ctime differences)"
+        after 5000 
+        puts -nonewline stderr .
+        after 5000 
+        puts -nonewline stderr .
+        after 500 
+
+        #--
+        #seems to make no diff whether created or copied - no tunneling seen with dirs
+        #file mkdir $prefix-dir-rename-temp
+        file copy $prefix-dir-rename $prefix-dir-rename-temp
+        #-- 
+        puts stderr \n
+        puts stdout "$prefix-dir-rename-temp       [file stat $prefix-dir-rename-temp] (temp to rename into place)"
+        puts stderr "deleting $prefix-dir-rename"
+        file delete $prefix-dir-rename
+        puts stdout "renaming $prefix-dir-rename-temp to $prefix-dir-rename"
+        file rename $prefix-dir-rename-temp $prefix-dir-rename
+
+        puts stderr "deleting $prefix-dir-recreate"
+        file delete $prefix-dir-recreate
+        puts stdout "re-creating $prefix-dir-recreate"
+        file mkdir $prefix-dir-recreate
+
+        puts stderr "deleting $prefix-file-recreate.txt"
+        file delete $prefix-file-recreate.txt
+        puts stderr "Recreating $prefix-file-recreate.txt"
+        set fd [open $prefix-file-recreate.txt w]
+        puts $fd "replacement"
+        close $fd
+        
+        puts stderr "copying $prefix-file-rename.txt to $prefix-file-rename-temp.txt"
+        file copy $prefix-file-rename.txt $prefix-file-rename-temp.txt
+        puts stdout "$prefix-file-rename-temp.txt [file stat $prefix-file-rename-temp.txt] short:[shortname $prefix-file-rename-temp.txt] (status of initial temp copy)"
+        puts stderr "modifying temp copy before deletion of original.. (append)"
+        set fd [open $prefix-file-rename-temp.txt a] 
+        puts $fd "added to file"
+        close $fd
+        puts stdout "$prefix-file-rename-temp.txt [file stat $prefix-file-rename-temp.txt] short:[shortname $prefix-file-rename-temp.txt] (status of appended temp copy)"
+        puts stderr "deleting $prefix-file-rename.txt"
+        file delete  $prefix-file-rename.txt
+        puts stderr "renaming temp file $prefix-file-rename-temp.txt to original $prefix-file-rename.txt"
+        file rename $prefix-file-rename-temp.txt $prefix-file-rename.txt
+
+        puts stdout "Final files/dirs"
+        puts stdout "$prefix-dir-rename           [file stat $prefix-dir-rename]"
+        puts stdout "$prefix-dir-recreate         [file stat $prefix-dir-recreate]"
+        puts stdout "$prefix-file-recreate.txt    [file stat $prefix-file-recreate.txt] short:[shortname $prefix-file-recreate.txt]"
+        puts stdout "$prefix-file-rename.txt      [file stat $prefix-file-rename.txt] short:[shortname $prefix-file-rename.txt]"
+    }
+    proc test_ntfs_tunneling2 {prefix {waitms 15000}} {
+        #shortname -> longname tunneling
+        puts stderr "Tunneling only happens if we delete via shortname? review"
+        set f1 $prefix-longname-file1.txt
+        set f2 $prefix-longname-file2.txt
+
+        set fd [open $f1 w];close $fd
+        set shortname1 [shortname $f1] 
+        puts stderr "longname:$f1 has shortname:$shortname1"
+        set fd [open $f2 w];close $fd
+        set shortname2 [shortname $f2] 
+        puts stderr "longname:$f2 has shortname:$shortname2"
+
+        puts stderr "deleting $f1 via name $shortname1"
+        file delete $shortname1
+        puts stdout "immediately recreating $shortname1 - should retain longname $f1 via tunneling"
+        set fd [open $shortname1 w];close $fd
+        set f1_exists [file exists $f1]
+        puts stdout "file exists $f1 = $f1_exists"
+
+        puts stderr "deleting $f2 via name $shortname2"
+        file delete $shortname2
+        puts stderr "Waiting [expr {$waitms / 1000}] seconds.. (standard tunneling timeframe is 15 seconds if registry hasn't been tweaked)"
+        after $waitms
+        puts stdout "recreating $shortname2 after wait of $waitms ms - longname lost?" 
+        set fd [open $shortname2 w];close $fd
+        set f2_exists [file exists $f2]
+        puts stdout "file exists $f2 = $f2_exists"
+
+        puts stdout -done-
     }
-
 }
 
 
-
+namespace eval punk::winpath::system {
+    #get a copy of the item without affecting internal rep
+    proc objclone {obj} {
+        append obj2 $obj {}
+    }
+}
 
 
 
diff --git a/src/bootsupport/modules/textblock-0.1.1.tm b/src/bootsupport/modules/textblock-0.1.1.tm
index 94af61ba..5d127a38 100644
--- a/src/bootsupport/modules/textblock-0.1.1.tm
+++ b/src/bootsupport/modules/textblock-0.1.1.tm
@@ -12,25 +12,97 @@
 # Meta license      <unspecified>
 # @@ Meta End
 
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# doctools header
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+#*** !doctools
+#[manpage_begin punkshell_module_textblock 0 0.1.1]
+#[copyright "2024"]
+#[titledesc {punk textblock functions}]  [comment {-- Name section and table of contents description --}]
+#[moddesc {punk textblock}]             [comment {-- Description at end of page heading --}] 
+#[require textblock]
+#[keywords module utility lib]
+#[description]
+#[para] Ansi-aware terminal textblock manipulation
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 
+#*** !doctools
+#[section Overview]
+#[para] overview of textblock 
+#[subsection Concepts]
+#[para]
 
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 ##  Requirements
-##e.g package require frobz
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[subsection dependencies]
+#[para] packages used by textblock 
+#[list_begin itemized]
+
+#*** !doctools
+#[item] [package {Tcl 8.6-}]
+#[item] [package {punk::args}]
+#[item] [package {punk::char}]
+#[item] [package {punk::ansi}]
+#[item] [package {punk::lib}]
+#[item] [package {overtype}]
+#[item] [package {term::ansi::code::macros}]
+#[item] [package {textutil}]
+
+##  Requirements
+package require Tcl 8.6-
 package require punk::args
 package require punk::char
 package require punk::ansi
 package require punk::lib
 catch {package require patternpunk}
 package require overtype
+
+#safebase interps as at 2024-08 can't access deeper paths - even though they are below the supposed safe list.
 package require term::ansi::code::macros ;#required for frame if old ansi g0 used - review - make package optional?
 package require textutil
 
+
+#*** !doctools
+#[list_end]
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[section API]
+
+
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
 tcl::namespace::eval textblock {
     #review - what about ansi off in punk::console?
     tcl::namespace::import ::punk::ansi::a ::punk::ansi::a+
     tcl::namespace::export block frame frame_cache framedef frametypes gcross height width widthtopline join join_basic list_as_table pad testblock 
-
+    variable use_md5 ;#framecache
+    set use_md5 1
+    if {[catch {package require md5}]} {
+        set use_md5 0
+    }
+    proc use_md5 {{yes_no ""}} {
+        variable use_md5
+        if {$yes_no eq ""} {
+            return $use_md5
+        }
+        if {![string is boolean -strict $yes_no]} {
+            error "textblock::use_md5 requires a boolean (or empty string to query)"
+        }
+        if {$yes_no} {
+            package require md5
+            set use_md5 1
+        } else {
+            set use_md5 0
+        }
+        return $use_md5
+    }
     tcl::namespace::eval class {
         variable opts_table_defaults
         set opts_table_defaults [tcl::dict::create\
@@ -228,6 +300,7 @@ tcl::namespace::eval textblock {
             }
             return $map
         }
+
         if {[tcl::info::commands [tcl::namespace::current]::table] eq ""} {
             #*** !doctools
             #[subsection {Namespace textblock::class}]
@@ -249,7 +322,7 @@ tcl::namespace::eval textblock {
 
             oo::class create [tcl::namespace::current]::table [tcl::string::map [list %topt_keys% $topt_keys %topt_switchkeys% $switch_keys_valid_topts %copt_keys% $copt_keys %copt_switchkeys% $switch_keys_valid_copts] {
                 #*** !doctools
-                #[enum] CLASS [class interface_caphandler.registry]
+                #[enum] CLASS [class textblock::class::table]
                 #[list_begin definitions]
                 #    [para] [emph METHODS]
                 variable o_opts_table ;#options as configured by user (with exception of -ansireset)
@@ -3986,7 +4059,7 @@ tcl::namespace::eval textblock {
             if append is chosen the new values will always start at the first column"
             -columns    -default "" -type integer   -help "Number of table columns
             Will default to 2 if not using an existing -table object"
-            *values
+            *values -min 0 -max 1
             datalist    -default {}                 -help "flat list of table cell values which will be wrapped based on -columns value"
         }] $args]
         set opts [dict get $argd opts]
@@ -4337,6 +4410,14 @@ tcl::namespace::eval textblock {
 
         return [tcl::dict::create width $width height $height] ;#maintain order in 'image processing' standard width then height - caller may use lassign [tcl::dict::values [blocksize <data>]] width height
     }
+    proc size_as_opts {textblock} {
+        set sz [size $textblock]
+        return [dict create -width [dict get $sz width] -height [dict get $sz height]]
+    }
+    proc size_as_list {textblock} {
+        set sz [size $textblock]
+        return [list [dict get $sz width] [dict get $sz height]]
+    }
     #must be able to handle block as string with or without newlines
     #if no newlines - attempt to treat as a list
     #must handle whitespace-only string,list elements, and/or lines.
@@ -5061,6 +5142,7 @@ tcl::namespace::eval textblock {
              [punk::lib::list_as_lines -- [lrepeat 8 " | "]]
     }
     proc table {args} {
+        #todo - use punk::args
         upvar ::textblock::class::opts_table_defaults toptdefaults
         set defaults [tcl::dict::create\
             -rows [list]\
@@ -5112,7 +5194,7 @@ tcl::namespace::eval textblock {
     }
 
     variable frametypes
-    set frametypes [list light heavy arc double block block1 block2 ascii altg]
+    set frametypes [list light heavy arc double block block1 block2 block2hack ascii altg]
     #class::table needs to be able to determine valid frametypes
     proc frametypes {} {
         variable frametypes
@@ -5121,7 +5203,7 @@ tcl::namespace::eval textblock {
     proc frametype {f} {
         #set custom_keys [list hl hlt hlb vl vll vlr tlc trc blc brc]
         switch -- $f {
-            light - heavy - arc - double - block - block1 - block2 - ascii - altg {
+            light - heavy - arc - double - block - block1 - block2 - block2hack - ascii - altg {
                 return [tcl::dict::create category predefined type $f]
             }
             default {
@@ -5142,7 +5224,7 @@ tcl::namespace::eval textblock {
                     set is_custom_dict_ok 0
                 }
                 if {!$is_custom_dict_ok} {
-                    error "frame option -type must be one of known types: $textblock::frametypes or a dictionary with any of keys hl,hlt,hlb,vl,vll,vlr,tlc,trc,blc,brc"
+                    error "frame option -type must be one of known types: $::textblock::frametypes or a dictionary with any of keys hl,hlt,hlb,vl,vll,vlr,tlc,trc,blc,brc"
                 }
                 set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "]
                 set custom_frame [tcl::dict::merge $default_custom $f]
@@ -6252,9 +6334,12 @@ tcl::namespace::eval textblock {
                 set vlr \u2595 ;# right one eighth block
                 set vll \u258f ;# left one eighth block
 
+                #some terminals (on windows as at 2024) miscount width of these single-width blocks internally
+                #resulting in extra spacing that is sometimes well removed from the character itself (e.g at next ansi reset)
+                #This was fixed in windows-terminal based systems (2021) but persists in others.
+                #https://github.com/microsoft/terminal/issues/11694
                 set tlc \U1fb7d ;#legacy block
                 set trc \U1fb7e ;#legacy block
-
                 set blc \U1fb7c ;#legacy block
                 set brc \U1fb7f ;#legacy block
 
@@ -6265,6 +6350,42 @@ tcl::namespace::eval textblock {
                 set vlrj $vlr
 
             }
+            block2hack {
+                #the resultant table will have text appear towards top of each box 
+                #with 'legacy' computing unicode block - hopefully these become more widely supported - as they are useful and fill in some gaps
+                set hlt \u2594 ;# upper one eighth block
+                set hlb \u2581 ;# lower one eighth block
+                set vlr \u2595 ;# right one eighth block
+                set vll \u258f ;# left one eighth block
+
+                #see comments in block2 regarding the problems in some terminals that this *may* hack around to some extent.
+                #the caller probably only needs block2hack if block2 doesn't work
+
+                #1)
+                #review - this hack looks sort of promising - but overtype::renderline needs fixing ?
+                #set tlc \U1fb7d\b ;#legacy block
+                #set trc \U1fb7e\b ;#legacy block
+                #set blc \U1fb7c\b ;#legacy block
+                #set brc \U1fb7f\b ;#legacy block
+
+                #2) - works on cmd.exe and some others
+                # a 'privacy message' is 'probably' also not supported on the old terminal but is on newer ones
+                #known exception - conemu on windows - displays junk for various ansi codes - (and slow terminal anyway)
+                #this hack has a reasonable chance of working
+                #except that the punk overtype library does recognise PMs 
+                #A single backspace however is an unlikely and generally unuseful PM - so there is a corresponding hack in the renderline system to pass this PM through!
+                #ugly - in that we don't know the application specifics of what the PM data contains and where it's going.
+                set tlc \U1fb7d\x1b^\b\x1b\\ ;#legacy block
+                set trc \U1fb7e\x1b^\b\x1b\\ ;#legacy block
+                set blc \U1fb7c\x1b^\b\x1b\\ ;#legacy block
+                set brc \U1fb7f\x1b^\b\x1b\\ ;#legacy block
+
+                #horizontal and vertical bar joins 
+                set hltj $hlt
+                set hlbj $hlb
+                set vllj $vll
+                set vlrj $vlr
+            }
             block {
                 set hlt \u2580 ;#upper half
                 set hlb \u2584 ;#lower half
@@ -6286,7 +6407,7 @@ tcl::namespace::eval textblock {
                 set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "] ;#only default the general types - these form defaults for more specific types if they're missing
                 if {[llength $f] % 2 != 0} {
                     #todo  - retrieve usage from punk::args
-                    error "textblock::frametype frametype '$f' is not one of the predefined frametypes: $textblock::frametypes and does not appear to be a dictionary for a custom frametype"
+                    error "textblock::frametype frametype '$f' is not one of the predefined frametypes: $::textblock::frametypes and does not appear to be a dictionary for a custom frametype"
                 }
                 #unknown order of keys specified by user - validate before creating vars as we need more general elements to be available as defaults
                 dict for {k v} $f {
@@ -6388,7 +6509,7 @@ tcl::namespace::eval textblock {
 
 
     #options before content argument - which is allowed to be absent
-    #frame performance (noticeable with complex tables even of modest size) is improved significantly by frame_cache - but is still (2024) a fairly expensive operation.
+    #frame performance (noticeable with complex tables even of modest size) is improved somewhat by frame_cache - but is still (2024) a fairly expensive operation.
     #
     #consider if we can use -sticky nsew instead of -blockalign (as per Tk grid -sticky option)
     # This would require some sort of expand equivalent e.g for -sticky ew or -sticky ns - for which we have to decide a meaning for text.. e.g ansi padding?
@@ -6397,6 +6518,7 @@ tcl::namespace::eval textblock {
     # - but we would need to maintain support for the rendered-string based operations too.
     proc frame {args} {
         variable frametypes
+        variable use_md5
 
         #counterintuitively - in-proc dict create each time is generally slightly faster than linked namespace var
         set opts [tcl::dict::create\
@@ -6416,7 +6538,11 @@ tcl::namespace::eval textblock {
             -ellipsis 1\
             -usecache 1\
             -buildcache 1\
+            -pad 1\
+            -crm_mode 0\
         ]
+        #-pad 1 is default so that simple 'textblock::frame "[a+ Red]a  \nbbb[a]"  extends the bg colour on the short ragged lines (and empty lines)
+        # for ansi art - -pad 0 is likely to be preferable
 
         set expect_optval 0
         set argposn 0
@@ -6455,7 +6581,12 @@ tcl::namespace::eval textblock {
         #use -buildcache 1 with -usecache 0 for debugging cache issues so we can inspect using textblock::frame_cache
         foreach {k v} $arglist {
             switch -- $k {
-                -etabs - -type - -boxlimits - -boxmap - -joins - -title - -subtitle - -width - -height - -ansiborder - -ansibase - -blockalign - -textalign - -ellipsis - -usecache - -buildcache {
+                -etabs - -type - -boxlimits - -boxmap - -joins 
+                - -title - -subtitle - -width - -height
+                - -ansiborder - -ansibase
+                - -blockalign - -textalign - -ellipsis
+                - -crm_mode
+                - -usecache - -buildcache - -pad {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -6471,11 +6602,13 @@ tcl::namespace::eval textblock {
         set opt_boxmap      [tcl::dict::get $opts -boxmap]
         set opt_usecache    [tcl::dict::get $opts -usecache]
         set opt_buildcache  [tcl::dict::get $opts -buildcache]
+        set opt_pad         [tcl::dict::get $opts -pad]
+        set opt_crm_mode    [tcl::dict::get $opts -crm_mode]
         set usecache $opt_usecache ;#may need to override
         set buildcache $opt_buildcache
         set custom_keys [list hl hlt hlb vl vll vlr tlc trc blc brc]
 
-        set known_frametypes $frametypes ;# light, heavey etc as defined in textblock::frametypes variable
+        set known_frametypes $frametypes ;# light, heavey etc as defined in the ::textblock::frametypes variable
         set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "]
 
         lassign [textblock::frametype $opt_type] _cat category _type ftype
@@ -6614,6 +6747,19 @@ tcl::namespace::eval textblock {
                 }
             }
             set contents [tcl::string::map [list \r\n \n] $contents]
+            if {$opt_crm_mode} {
+                if {$opt_height eq ""} {
+                    set h [textblock::height $contents]
+                } else {
+                    set h [expr {$opt_height -2}]
+                }
+                if {$opt_width eq ""} {
+                    set w [textblock::width $contents]
+                } else {
+                    set w [expr {$opt_width -2}]
+                }
+                set contents [overtype::renderspace -crm_mode 1 -wrap 1 -width $w -height $h "" $contents]
+            }
             set actual_contentwidth [textblock::width $contents] ;#length of longest line in contents (contents can be ragged)
             set actual_contentheight [textblock::height $contents]
         } else {
@@ -6652,9 +6798,14 @@ tcl::namespace::eval textblock {
         #review - custom frame affects frame_inner_width - exclude from caching?
         #set cache_key [concat $arglist $frame_inner_width $frame_inner_height]
         set hashables [concat $arglist $frame_inner_width $frame_inner_height]
-        package require md5
-        #set hash $hashables
-        set hash [md5::md5 -hex [encoding convertto utf-8 $hashables]] ;#need fast and unique to content - not cryptographic - review
+
+        if {$use_md5} {
+            #package require md5 ;#already required at package load
+            set hash [md5::md5 -hex [encoding convertto utf-8 $hashables]] ;#need fast and unique to content - not cryptographic - review
+        } else {
+            set hash $hashables
+        }
+
         set cache_key "$hash-$frame_inner_width-$frame_inner_height-actualcontentwidth:$actual_contentwidth"
         #should be in a unicode private range different to that used in table construction
         #e.g BMP PUA U+E000 -> U+F8FF  - although this is commonly used for example by nerdfonts
@@ -7057,15 +7208,22 @@ tcl::namespace::eval textblock {
                 append contents [::join [lrepeat $diff \n] ""]
             }
 
-            set paddedcontents [textblock::pad $contents -which $pad -within_ansi 1] ;#autowidth to width of content (should match cache_patternwidth) 
-            set paddedwidth  [textblock::widthtopline $paddedcontents]
-
-            #review - horizontal truncation
-            if {$paddedwidth > $cache_patternwidth} {
-                set paddedcontents [overtype::renderspace -width $cache_patternwidth "" $paddedcontents]
+            if {$opt_pad} {
+                set paddedcontents [textblock::pad $contents -which $pad -within_ansi 1] ;#autowidth to width of content (should match cache_patternwidth) 
+                set paddedwidth  [textblock::widthtopline $paddedcontents]
+                #review - horizontal truncation
+                if {$paddedwidth > $cache_patternwidth} {
+                    set paddedcontents [overtype::renderspace -width $cache_patternwidth "" $paddedcontents]
+                }
+                #important to supply end of opts -- to textblock::join - particularly here with arbitrary data
+                set contentblock [textblock::join -- $paddedcontents] ;#make sure each line has ansi replays
+            } else {
+                set cwidth [textblock::width $contents]
+                if {$cwidth > $cache_patternwidth} {
+                    set contents [overtype::renderspace -width $cache_patternwidth "" $contents]
+                }
+                set contentblock [textblock::join -- $contents]
             }
-            #important to supply end of opts -- to textblock::join - particularly here with arbitrary data
-            set contentblock [textblock::join -- $paddedcontents] ;#make sure each line has ansi replays
 
             set tlines [split $template \n]
 
@@ -7183,7 +7341,6 @@ tcl::namespace::eval textblock {
         #fastest to do row first then columns - because textblock::join must do line by line
 
         if {$crosscount > 1} {
-            package require textblock
             set row [textblock::join -- {*}[lrepeat $crosscount $onecross]]
             set rows [lrepeat $crosscount $row]
             set out [::join $rows \n]
@@ -7223,4 +7380,8 @@ package provide textblock [tcl::namespace::eval textblock {
     variable version
     set version 0.1.1 
 }]
-return
\ No newline at end of file
+return
+
+#*** !doctools
+#[manpage_end]
+
diff --git a/src/make.tcl b/src/make.tcl
index 1cf07c5b..9edd90b0 100644
--- a/src/make.tcl
+++ b/src/make.tcl
@@ -1212,8 +1212,9 @@ foreach vfstail $vfs_tails {
             set rtmountpoint //zipfs:/rtmounts/$runtime_fullname
 
             set changed_unchanged [$vfs_event targetset_source_changes]
+            set vfs_or_runtime_changed [expr {[llength [dict get $changed_unchanged changed]] ||  [llength [$vfs_event get_targets_exist]] < [llength [$vfs_event get_targets]]}]
 
-            if {[llength [dict get $changed_unchanged changed]] ||  [llength [$vfs_event get_targets_exist]] < [llength [$vfs_event get_targets]]} {
+            if {$vfs_or_runtime_changed} {
                 #source .vfs folder has changes
                 $vfs_event targetset_started
                 # -- --- --- --- --- ---
@@ -1283,6 +1284,7 @@ foreach vfstail $vfs_tails {
                                     puts stderr "RUNTIME capabilities unknown. Unsure if zip supported. trying anyway.."
                                 }
                             }
+                            #note - as at 2024-08 - there is some discussion about the interface to mkimg - it is considered unstable (may change to -option value syntax)
                             puts stderr "calling: tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs \"\" $buildfolder/build_$runtime_fullname"
                             tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs "" $buildfolder/build_$runtime_fullname
                         } result ]} {
@@ -1352,9 +1354,10 @@ foreach vfstail $vfs_tails {
                     if {![catch {
                             exec $pscmd | grep $targetkit
                         } still_running]} {
-
-                        puts stdout "found $targetkit instances still running\n"
+                        set still_running_lines [split [string trim $still_running] \n]
+                        puts stdout "found ([llength $still_running_lines]) $targetkit instances still running\n"
                         set count_killed 0
+                        set num_to_kill [llength $still_running_lines]
                         foreach ln [split $still_running \n] {
                             puts stdout "    $ln"
                             
@@ -1387,9 +1390,6 @@ foreach vfstail $vfs_tails {
                                 #review - *no running instance* works with windows taskkill - "*No such process*" works with kill -9 on FreeBSD and linux - other platforms?
                                 if {![string match "*no running instance*" $errMsg] && ![string match "*No such process*" $errMsg]} {
                                     lappend failed_kits [list kit $targetkit reason "could not kill running process for $targetkit (using '$killcmd')"]
-                                    $vfs_event targetset_end FAILED
-                                    $vfs_event destroy
-                                    $vfs_installer destroy
                                     continue
                                 }
                             } else {
@@ -1397,10 +1397,15 @@ foreach vfstail $vfs_tails {
                                 incr count_killed
                             }
                         }
-                        if {$count_killed > 0} {
-                            puts stderr "\nKilled $count_killed processes. Waiting a short time before attempting to delete executable"
-                            after 1000
+                        if {$count_killed < $num_to_kill} {
+                            $vfs_event targetset_end FAILED
+                            $vfs_event destroy
+                            $vfs_installer destroy
+                            continue
                         }
+
+                        puts stderr "\nKilled $count_killed processes. Waiting a short time before attempting to delete executable"
+                        after 1000
                     } else {
                         puts stderr "Ok.. no running '$targetkit' processes found"
                     }
@@ -1426,22 +1431,35 @@ foreach vfstail $vfs_tails {
                 # -- --- --- --- --- ---
                 $vfs_event targetset_end OK
 
+            } else {
+                set skipped_vfs_build 1
+                puts stderr "."
+                puts stdout "Skipping build for vfs $vfstail with runtime $rtname - no change detected"
+                $vfs_event targetset_end SKIPPED
+            }
+            $vfs_event destroy
+            $vfs_installer destroy
 
-                after 200
-                set deployment_folder [file dirname $sourcefolder]/bin
-                file mkdir $deployment_folder
+            after 200
+            set deployment_folder [file dirname $sourcefolder]/bin
+            file mkdir $deployment_folder
 
-                # -- ----------
-                set bin_installer [punkcheck::installtrack new "make.tcl" $deployment_folder/.punkcheck]
-                $bin_installer set_source_target $buildfolder $deployment_folder
-                set bin_event [$bin_installer start_event {-make-step final_kit_install}]
-                $bin_event targetset_init INSTALL $deployment_folder/$targetkit
-                #todo - move final deployment step outside of the build vfs loop? (final deployment can fail and then isn't rerun even though _build and deployed versions differ, unless .vfs modified again)
-                #set last_completion [$bin_event targetset_last_complete]
-
-                $bin_event targetset_addsource $buildfolder/$targetkit
-                $bin_event targetset_started
-                # -- ----------
+            # -- ----------
+            set bin_installer [punkcheck::installtrack new "make.tcl" $deployment_folder/.punkcheck]
+            $bin_installer set_source_target $buildfolder $deployment_folder
+            set bin_event [$bin_installer start_event {-make-step final_kit_install}]
+            $bin_event targetset_init INSTALL $deployment_folder/$targetkit
+            #todo - move final deployment step outside of the build vfs loop? (final deployment can fail and then isn't rerun even though _build and deployed versions differ, unless .vfs modified again)
+            #set last_completion [$bin_event targetset_last_complete]
+
+            $bin_event targetset_addsource $deployment_folder/$targetkit ;#add target as a source of metadata for change detection
+            $bin_event targetset_addsource $buildfolder/$targetkit
+            $bin_event targetset_started
+            # -- ----------
+
+            set changed_unchanged [$bin_event targetset_source_changes]
+            set built_or_installed_kit_changed [expr {[llength [dict get $changed_unchanged changed]] ||  [llength [$bin_event get_targets_exist]] < [llength [$bin_event get_targets]]}]
+            if {$built_or_installed_kit_changed} { 
 
                 if {[file exists $deployment_folder/$targetkit]} {
                     puts stderr "deleting existing deployed at $deployment_folder/$targetkit"
@@ -1467,19 +1485,16 @@ foreach vfstail $vfs_tails {
                 # -- ----------
                 $bin_event targetset_end OK
                 # -- ----------
-                $bin_event destroy
-                $bin_installer destroy
-
             } else {
-                set skipped_vfs_build 1
+                set skipped_kit_install 1
                 puts stderr "."
-                puts stdout "Skipping build for vfs $vfstail with runtime $rtname - no change detected"
-                $vfs_event targetset_end SKIPPED
+                puts stdout "Skipping kit install for $targetkit with vfs $vfstail runtime $rtname - no change detected"
+                $bin_event targetset_end SKIPPED
             }
+            $bin_event destroy
+            $bin_installer destroy
 
 
-            $vfs_event destroy
-            $vfs_installer destroy
 
         } ;#end foreach targetkit
     } ;#end foreach rtname in runtimes
diff --git a/src/modules/punk/ansi-999999.0a1.0.tm b/src/modules/punk/ansi-999999.0a1.0.tm
index 747364c1..6ef15c9e 100644
--- a/src/modules/punk/ansi-999999.0a1.0.tm
+++ b/src/modules/punk/ansi-999999.0a1.0.tm
@@ -106,7 +106,7 @@ tcl::namespace::eval punk::ansi::class {
                     #overflow is a different concept - perhaps not particularly congruent with the idea of the textblock as a mini terminal emulator.
                     #overflow effectively auto-expands the block(terminal?) width
                     #overflow and wrap both being true won't make sense unless we implement a max_overflow concept
-                    set o_rendered [overtype::renderspace -overflow 0 -wrap 1 -width $w -height $h -appendlines 1 "" [$o_ansistringobj get]]
+                    set o_rendered [overtype::renderspace -expand_right 0 -wrap 1 -width $w -height $h -appendlines 1 "" [$o_ansistringobj get]]
                     if {$cksum eq "not-done"} {
                         #if dimensions changed - the checksum won't have been done
                         set o_rendered_what [$o_ansistringobj checksum]
@@ -129,7 +129,7 @@ tcl::namespace::eval punk::ansi::class {
                 set o_dimensions $dimensions
                    
                 
-                set rendered [overtype::renderspace -experimental {test_mode} -overflow 0 -wrap 1 -width $w -height $h -appendlines 1 "" [$o_ansistringobj get]]
+                set rendered [overtype::renderspace -cp437 1 -expand_right 0 -wrap 1 -width $w -height $h -appendlines 1 "" [$o_ansistringobj get]]
                 return $rendered
             }
             method render_to_input_line {args} {
@@ -176,7 +176,7 @@ tcl::namespace::eval punk::ansi::class {
                 if {$opt_minus ne "0"} {
                    set chunk [tcl::string::range $chunk 0 end-$opt_minus] 
                 }
-                set rendered [overtype::renderspace -experimental {test_mode} -overflow 0 -wrap 1 -width $w -height $h -appendlines 1 "" $chunk]
+                set rendered [overtype::renderspace -expand_right 0 -wrap 1 -width $w -height $h -appendlines 1 "" $chunk]
                 set marker ""
                 for {set i 1} {$i <= $w} {incr i} {
                     if {$i % 10 == 0} {
@@ -514,11 +514,8 @@ tcl::namespace::eval punk::ansi {
         set encnames [encoding names]
         set encoding ""
         set dimensions ""
-        set test_mode 0
         foreach a $args {
-            if {$a eq "test_mode"} {
-                set test_mode 1
-            } elseif {$a in $encnames} {
+            if {$a in $encnames} {
                 set encoding $a
             } else {
                 if {[regexp {[0-9]+(?:x|X)[0-9]+} $a]} {
@@ -553,28 +550,51 @@ tcl::namespace::eval punk::ansi {
         $obj destroy
         return $result
     }
-    proc example {} {
+    proc example {args} {
+        set base [punk::repo::find_project]
+        set default_ansibase [file join $base src/testansi]
+
+        set argd [punk::args::get_dict [tstr -return string {
+            *proc -name punk::ansi::example -help "Display .ans image files in a grid that will fit in console
+            "
+            -colwidth -default 82 -help "Width of each column - default of 82 will fit a standard 80wide ansi image (when framed)
+            You can specify a narrower width to truncate images on the right side"
+            -folder -default "${$default_ansibase}"   -help "Base folder for files if relative paths are used.
+            Defaults to <projectbase>/src/testansi - where projectbase is determined from current directory.
+            "
+            *values -min 0 -max -1 
+            files -default {belinda.ans bot.ans flower.ans fish.ans} -multiple true -help "List of filenames - leave empty to display 4 defaults"
+        }] $args]
+        set colwidth [dict get $argd opts -colwidth]
+        set ansibase [file normalize [dict get $argd opts -folder]]
+        set fnames   [dict get $argd values files]
+
+        #assumes fixed column widths e.g 80col images will fit in 82-width frames (common standard for old ansi art) (of arbitrary height)
         #todo - review dependency on punk::repo ?  
         package require textblock
         package require punk::repo
         package require punk::console
 
-        set fnames [list belinda.ans bot.ans flower.ans fish.ans]
-        set base [punk::repo::find_project]
-        set ansibase [file join $base src/testansi]
         if {![file exists $ansibase]} {
-            puts stderr "Missing testansi folder at $base/src/testansi"
+            puts stderr "Missing folder at $ansibase"
             puts stderr "Ensure ansi test files exist: $fnames"
             #error "punk::ansi::example Cannot find example files"
         }
-        set missingbase [a+ yellow][textblock::block 80 23 ?][a]
+        set missingbase [a+ yellow][textblock::block [expr {$colwidth-2}] 23 ?][a] ;#assuming standard frame - subtract 2 for left/right borders
         set pics [list]
         foreach f $fnames {
-            if {![file exists $ansibase/$f]} {
-                set p [overtype::left $missingbase "[a+ red bold]\nMissing file\n$ansibase/$f[a]"]
+            if {[file pathtype $f] ne "absolute"} {
+                set filepath [file normalize $ansibase/$f]
+            } else {
+                set filepath [file normalize $f]
+            }
+            if {![file exists $filepath]} {
+                set p [overtype::left $missingbase "[a+ red bold]\nMissing file\n$f[a]"]
                 lappend pics [tcl::dict::create filename $f pic $p status missing]
             } else {
-                set img [join [lines_as_list -line trimline -block trimtail [ansicat $ansibase/$f]] \n]
+                #set img [join [lines_as_list -line trimline -block trimtail [ansicat $filepath]] \n]
+                #-line trimline will wreck some images
+                set img [join [lines_as_list -block trimtail [ansicat $filepath]] \n]
                 lappend pics [tcl::dict::create filename $f pic $img status ok] 
             }
         }
@@ -582,30 +602,73 @@ tcl::namespace::eval punk::ansi {
         set termsize [punk::console:::get_size] 
         set margin 4
         set freewidth [expr {[tcl::dict::get $termsize columns]-$margin}]
-        set per_row [expr {$freewidth / 80}]
-
-        set rowlist [list]
-        set row [list]
-        set i 1 
+        set per_row [expr {$freewidth / $colwidth}]
+
+        set rowlist [list]      ;# { {<img> <img>} {<img> <img>} }
+        set heightlist [list]   ;# { {<h>   <h>  } {<h>   <h>  } }
+        set maxheights [list]   ;# { <max>  <max>}
+        set row [list]  ;#wip row
+        set rowh [list] ;#wip row img heights
+        set i 1  ;#track image index of whole pics list
+        set rowindex 0
         foreach picinfo $pics {
             set subtitle ""
             if {[tcl::dict::get $picinfo status] ne "ok"} {
                 set subtitle [tcl::dict::get $picinfo status] 
             }
             set title [tcl::dict::get $picinfo filename]
-            lappend row [textblock::frame -subtitle $subtitle -title $title [tcl::dict::get $picinfo pic]]
+            set fr [textblock::frame -width $colwidth -subtitle $subtitle -title $title [tcl::dict::get $picinfo pic]]
+            # -- --- --- --- 
+            #we need the max height of a row  element to use join_basic instead of join below
+            # -- --- --- --- 
+            set fr_height [textblock::height $fr]
+            lappend row $fr
+            lappend rowh $fr_height
+
+            set rowmax [lindex $maxheights $rowindex]
+            if {$rowmax eq ""} {
+                #empty result means no maxheights entry for this row yet
+                set rowmax $fr_height
+                lappend maxheights $rowmax
+            } else {
+                if {$fr_height > $rowmax} {
+                    set rowmax $fr_height
+                    lset maxheights end $rowmax
+                }
+            } 
+            # -- --- --- --- 
+
             if {$i % $per_row == 0} {
                 lappend rowlist $row
+                lappend heightlist $rowh
+                incr rowindex
                 set row [list]
+                set rowh [list]
             } elseif {$i == [llength $pics]} {
                 lappend rowlist $row
+                lappend heightlist $rowh
             }
             incr i
         }
-
+        #puts "--> maxheights: $maxheights"
+        #puts "--> heightlist: $heightlist"
         set result ""
-        foreach r $rowlist {
-            append result [textblock::join_basic -- {*}$r] \n
+        set rowindex 0
+        set blankline [string repeat " " $colwidth]
+        foreach imgs $rowlist heights $heightlist  {
+            set maxheight [lindex $maxheights $rowindex]
+            set adjusted_row [list]
+            foreach i $imgs h $heights {
+                if {$h < $maxheight} {
+                    #add blank lines to bottom of shorter images so join_basic can be used.
+                    #textblock::join of ragged-height images would work and remove the need for all the height calculation
+                    #.. but it requires much more processing 
+                    append i [string repeat \n$blankline [expr {$maxheight - $h}]]
+                } 
+                lappend adjusted_row $i
+            }
+            append result [textblock::join_basic -- {*}$adjusted_row] \n
+            incr rowindex
         }
 
 
@@ -3199,6 +3262,28 @@ Brightblack 100   Brightred 101   Brightgreen 102   Brightyellow 103   Brightblu
         return \x1b8
     }
     # -- ---  --- --- ---
+    #CRM Show Control Character Mode
+    proc enable_crm {} {
+        return \x1b\[3h
+    }
+    proc disable_crm {} {
+        return \x1b\[3l
+    }
+
+    #DECSNM 
+    #Note this can invert the enclosed section including any already reversed by SGR 7  - depending on terminal support.
+    #e.g 
+    #set test [a+ reverse]aaa[a+ noreverse]bbb
+    #  - $test above can't just be reversed by putting another [a+ reverse] in front of it.
+    #  - but the following will work (even if underlying terminal doesn't support ?5 sequences)
+    #overtype::renderspace -width 20  [enable_inverse]$test 
+    proc enable_inverse {} {
+        return \x1b\[?5h
+    }
+    proc disable_inverse {} {
+        return \x1b\[?5l
+    }
+
 
     #DECAWM - automatic line wrapping
     proc enable_line_wrap {} {
@@ -3399,6 +3484,9 @@ Brightblack 100   Brightred 101   Brightgreen 102   Brightyellow 103   Brightblu
         #the purpose of backspace (or line cr) in embedded text is unclear. Should it allow some sort of character combining/overstrike as it has sometimes done historically (nroff/less)?  e.g a\b` as an alternative combiner or bolding if same char
         #This should presumably only be done if the over_strike (os) capability is enabled in the terminal. Either way - it presumably won't affect printing width?
         set line [punk::ansi::ansistrip $line]
+        #ANSI (e.g PM/SOS) can contain \b or \n  or \t  but won't contribute to length
+        #ansistrip must come before any other processing of these chars.
+
         #we can't use simple \b processing if we get ansi codes and aren't actually processing them (e.g moves)
 
         set line [punk::char::strip_nonprinting_ascii $line] ;#only strip nonprinting after ansistrip - some like BEL are part of ansi
@@ -3748,6 +3836,7 @@ tcl::namespace::eval punk::ansi {
             -filter_fg 0\
             -filter_bg 0\
             -filter_reset 0\
+            -info 0\
         ]
 
         #codes *must* already have been split so that one esc per element in codelist
@@ -3760,7 +3849,8 @@ tcl::namespace::eval punk::ansi {
             set opts $defaultopts_sgr_merge_singles
             foreach {k v} $args {
                 switch -- $k {
-                    -filter_fg - -filter_bg - -filter_reset {
+                    -filter_fg - -filter_bg - -filter_reset -
+                    -info {
                         tcl::dict::set opts $k $v
                     }
                     default {
@@ -4139,19 +4229,24 @@ tcl::namespace::eval punk::ansi {
                 set codemerge [tcl::string::trimright $codemerge {;}]
                 if {$unmergeable ne ""} {
                     set unmergeable [tcl::string::trimright $unmergeable {;}]
-                    return "\x1b\[${codemerge}m\x1b\[${unmergeable}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${codemerge}m\x1b\[${unmergeable}m[join $othercodes ""]"
                 } else {
-                    return "\x1b\[${codemerge}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${codemerge}m[join $othercodes ""]"
                 }
             } else {
                 if {$unmergeable eq ""} {
                     #there were no SGR codes - not even resets
-                    return [join $othercodes ""]
+                    set mergeresult [join $othercodes ""]
                 } else {
                     set unmergeable [tcl::string::trimright $unmergeable {;}]
-                    return "\x1b\[${unmergeable}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${unmergeable}m[join $othercodes ""]"
                 }
             }
+            if {[tcl::dict::get $opts -info]} {
+                return [dict create sgr $codemerge unmergeable $unmergeable othercodes $othercodes mergeresult $mergeresult codestate $codestate]
+            } else {
+                return $mergeresult
+            }
         }
 
         #has_sgr_reset  - rather than support this function - create an sgr normalize function that removes dead params and brings reset to front of param list?
@@ -4240,7 +4335,7 @@ tcl::namespace::eval punk::ansi::ta {
     #we also need to track the start of ST terminated code and not add it for replay (in the ansistring functions)
     #variable re_ST  {(?:\x1bX|\u0098|\x1b\^|\u009E|\x1b_|\u009F)(?:[^\x1b\007\u009c]*)(?:\x1b\\|\007|\u009c)} ;#downsides: early terminating with nests, mixes 7bit 8bit start/ends (does that exist in the wild?)   
     #keep our 8bit/7bit start-end codes separate
-    variable re_ST      {(?:\x1bP|\x1bX|\x1b\^|\x1b_)(?:(?!\x1b\\|007).)*(?:\x1b\\|\007)|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)}
+    variable re_ST      {(?:\x1bP|\x1bX|\x1b\^|\x1b_)(?:(?!\x1b\\|\007).)*(?:\x1b\\|\007)|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)}
 
 
 
@@ -4252,7 +4347,7 @@ tcl::namespace::eval punk::ansi::ta {
     # -- --- --- ---
     #handrafted TRIE version of above. Somewhat difficult to construct and maintain. TODO - find a regext TRIE generator that works with Tcl regexes
     #This does make things quicker - but it's too early to finalise the detect/split regexes (e.g missing \U0090 ) - will need to be redone.
-    variable re_ansi_detect {(?:\x1b(?:\((?:0|B)|\[(?:[\x20-\x2f\x30-\x3f]*[\x40-\x7e])|\](?:(?:[^\007]*)\007|(?:(?!\x1b\\).)*\x1b\\)|(?:P|X|\^|_)(?:(?:(?!\x1b\\|007).)*(?:\x1b\\|\007))|c|7|8|M|E|D|H|=|>|(?:#(?:3|4|5|6|8))))|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)|(?:\u009b)[\x20-\x2f\x30-\x3f]*[\x40-\x7e]|(?:\u009d)(?:[^\u009c]*)?\u009c}
+    variable re_ansi_detect {(?:\x1b(?:\((?:0|B)|\[(?:[\x20-\x2f\x30-\x3f]*[\x40-\x7e])|\](?:(?:[^\007]*)\007|(?:(?!\x1b\\).)*\x1b\\)|(?:P|X|\^|_)(?:(?:(?!\x1b\\|\007).)*(?:\x1b\\|\007))|c|7|8|M|E|D|H|=|>|(?:#(?:3|4|5|6|8))))|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)|(?:\u009b)[\x20-\x2f\x30-\x3f]*[\x40-\x7e]|(?:\u009d)(?:[^\u009c]*)?\u009c}
     # -- --- --- ---
 
 
@@ -5674,7 +5769,12 @@ tcl::namespace::eval punk::ansi::ansistring {
         ENQ [list \x05 \u2405]\
         ACK [list \x06 \u2406]\
         BEL [list \x07 \u2407]\
+        BS  [list \x08 \u2408]\
+        HT  [list \x09 \u2409]\
+        LF  [list \x0a \u240a]\
+        VT  [list \x0b \u240b]\
         FF  [list \x0c \u240c]\
+        CR  [list \x0d \u240d]\
         SO  [list \x0e \u240e]\
         SF  [list \x0f \u240f]\
         DLE [list \x10 \u2410]\
@@ -5688,12 +5788,15 @@ tcl::namespace::eval punk::ansi::ansistring {
         CAN [list \x18 \u2418]\
         EM  [list \x19 \u2419]\
         SUB [list \x1a \u241a]\
+        ESC [list \x1b \u241b]\
         FS  [list \x1c \u241c]\
         GS  [list \x1d \u241d]\
         RS  [list \x1e \u241e]\
         US  [list \x1f \u241f]\
+        SP  [list \x20 \u2420]\
         DEL [list \x7f \u2421]\
     ]
+
     #alternate symbols for space
     # \u2422 Blank Symbol (b with forwardslash overly)
     # \u2423 Open Box  (square bracket facing up like a tray/box)
@@ -5836,6 +5939,7 @@ tcl::namespace::eval punk::ansi::ansistring {
             -cr 1\
             -lf 0\
             -vt 0\
+            -ff 1\
             -ht 1\
             -bs 1\
             -sp 1\
@@ -5850,16 +5954,22 @@ tcl::namespace::eval punk::ansi::ansistring {
         set opt_cr      [tcl::dict::get $opts -cr]
         set opt_lf      [tcl::dict::get $opts -lf]
         set opt_vt      [tcl::dict::get $opts -vt]
+        set opt_ff      [tcl::dict::get $opts -ff]
         set opt_ht      [tcl::dict::get $opts -ht]
         set opt_bs      [tcl::dict::get $opts -bs]
         set opt_sp      [tcl::dict::get $opts -sp]
         # -- --- --- --- ---
 
+        # -lf 2, -vt 2 and -ff 2 are useful for CRM mode (Show Control Character Mode) in the terminal - where a newline is expected to display after the character.
 
 
         set visuals_opt $debug_visuals 
+        set visuals_opt [dict remove $visuals_opt CR ESC LF VT FF HT BS SP] 
+
         if {$opt_esc} {
             tcl::dict::set visuals_opt ESC [list \x1b \u241b]
+        } else {
+            tcl::dict::unset visuals_opt ESC
         }
         if {$opt_cr} {
             tcl::dict::set visuals_opt CR [list \x0d \u240d]
@@ -5870,9 +5980,20 @@ tcl::namespace::eval punk::ansi::ansistring {
         if {$opt_lf == 2} {
             tcl::dict::set visuals_opt LF [list \x0a \u240a\n]
         }
-        if {$opt_vt} {
+        if {$opt_vt ==  1} {
             tcl::dict::set visuals_opt VT [list \x0b \u240b]
         }
+        if {$opt_vt ==  2} {
+            tcl::dict::set visuals_opt VT [list \x0b \u240b\n]
+        }
+        switch -exact -- $opt_ff {
+            1 {
+                tcl::dict::set visuals_opt FF [list \x0c \u240c]
+            }
+            2 {
+                tcl::dict::set visuals_opt FF [list \x0c \u240c\n]
+            }
+        }
         if {$opt_ht} {
             tcl::dict::set visuals_opt HT [list \x09 \u2409]
         }
diff --git a/src/modules/punk/basictelnet-999999.0a1.0.tm b/src/modules/punk/basictelnet-999999.0a1.0.tm
index 36c1131b..d4be99f6 100644
--- a/src/modules/punk/basictelnet-999999.0a1.0.tm
+++ b/src/modules/punk/basictelnet-999999.0a1.0.tm
@@ -531,7 +531,7 @@ namespace eval punk::basictelnet {
             # -- --- --- ---
             set tailinfo ""
             if {[string length $nextwaiting]} {
-                set waitingdisplay [overtype::renderspace -wrap 1 -width 77 -height 1 "" [ansistring VIEW -lf 1 -vt 1 $nextwaiting]]
+                set waitingdisplay [overtype::renderspace -cp437 1 -wrap 1 -width 77 -height 1 "" [ansistring VIEW -lf 1 -vt 1 $nextwaiting]]
                 set tailinfo "[a+ red]from waiting:\n $waitingdisplay[a]"
             }
             ::punk::basictelnet::add_debug "[a+ Yellow black]from stdin sending: [ansistring VIEW -lf 1 -vt 1 $chunk][a]\n$tailinfo\n" stdin $sock
@@ -629,7 +629,7 @@ namespace eval punk::basictelnet {
             #set rawview [ansistring VIEW -lf 1 -vt 1 [encoding convertfrom $encoding_guess $data]] 
             set rawview [ansistring VIEW -lf 1 -vt 1 $data] 
             #set viewblock [overtype::left -wrap 1 -width 78 -height 4 "" $rawview] 
-            set viewblock [overtype::renderspace -experimental test_mode -wrap 1 -width 78 -height 4 "" $rawview] 
+            set viewblock [overtype::renderspace -cp437 1 -wrap 1 -width 78 -height 4 "" $rawview] 
             set lines [split $viewblock \n]
             if {[llength $lines] > 4} {
                 append debug_info [join [list {*}[lrange $lines 0 1] "...<[expr {[llength $lines] -4}] lines undisplayed>..." {*}[lrange $lines end-1 end]] \n]
diff --git a/src/modules/punk/blockletter-999999.0a1.0.tm b/src/modules/punk/blockletter-999999.0a1.0.tm
new file mode 100644
index 00000000..70e74271
--- /dev/null
+++ b/src/modules/punk/blockletter-999999.0a1.0.tm
@@ -0,0 +1,358 @@
+# -*- tcl -*-
+# Maintenance Instruction: leave the 999999.xxx.x as is and use punkshell 'pmix make' or bin/punkmake  to update from <pkg>-buildversion.txt
+# module template: shellspy/src/decktemplates/vendor/punk/modules/template_module-0.0.3.tm
+#
+# Please consider using a BSD or MIT style license for greatest compatibility with the Tcl ecosystem.
+# Code using preferred Tcl licenses can be eligible for inclusion in Tcllib, Tklib and the punk package repository.
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# (C) 2024
+#
+# @@ Meta Begin
+# Application punk::blockletter 999999.0a1.0
+# Meta platform     tcl
+# Meta license      <unspecified>
+# @@ Meta End
+
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# doctools header
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+#*** !doctools
+#[manpage_begin shellspy_module_punk::blockletter 0 999999.0a1.0]
+#[copyright "2024"]
+#[titledesc {Module API}]  [comment {-- Name section and table of contents description --}]
+#[moddesc {-}]             [comment {-- Description at end of page heading --}] 
+#[require punk::blockletter]
+#[keywords module]
+#[description]
+#[para] -
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[section Overview]
+#[para] overview of punk::blockletter
+#[subsection Concepts]
+#[para] -
+
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+##  Requirements
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[subsection dependencies]
+#[para] packages used by punk::blockletter
+#[list_begin itemized]
+
+package require Tcl 8.6-
+package require textblock
+#*** !doctools
+#[item] [package {Tcl 8.6}]
+#[item] [package {textblock}]
+
+# #package require frobz
+# #*** !doctools
+# #[item] [package {frobz}]
+
+#*** !doctools
+#[list_end]
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[section API]
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# oo::class namespace
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+#tcl::namespace::eval punk::blockletter::class {
+    #*** !doctools
+    #[subsection {Namespace punk::blockletter::class}]
+    #[para] class definitions
+    #if {[tcl::info::commands [tcl::namespace::current]::interface_sample1] eq ""} {
+        #*** !doctools
+        #[list_begin enumerated]
+
+        # oo::class create interface_sample1 {
+        #     #*** !doctools
+        #     #[enum] CLASS [class interface_sample1]
+        #     #[list_begin definitions]
+
+        #     method test {arg1} {
+        #         #*** !doctools
+        #         #[call class::interface_sample1    [method test] [arg arg1]]
+        #         #[para] test method
+        #         puts "test: $arg1"
+        #     }
+
+        #     #*** !doctools
+        #     #[list_end] [comment {-- end definitions interface_sample1}]
+        # }
+
+        #*** !doctools
+        #[list_end] [comment {--- end class enumeration ---}]
+    #}
+#}
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# Base namespace
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+tcl::namespace::eval punk::blockletter {
+    tcl::namespace::export {[a-z]*}  ;# Convention: export all lowercase
+    #variable xyz
+
+    #*** !doctools
+    #[subsection {Namespace punk::blockletter}]
+    #[para] Core API functions for punk::blockletter 
+    #[list_begin definitions]
+
+    #A 3x4 block font
+
+    variable default_frametype
+    set default_frametype {vl \u00a0 hl \u00a0 tlc \u00a0 trc \u00a0 blc \u00a0 brc \u00a0}
+
+    # colours in order for T c l T k
+    set logo_letter_colours [list Web-red Web-green Web-royalblue Web-purple Web-orange]
+    set logo_letter_colours [list Red Green Blue Purple Yellow]
+
+
+    proc logo {args} {
+        variable logo_letter_colours
+        variable default_frametype
+        set argd [punk::args::get_dict [tstr -return string {
+            -frametype -default {${$default_frametype}}
+            -outlinecolour -default "web-white"
+            -backgroundcolour -default {} -help "e.g Web-white
+            This argument is the name as accepted by punk::ansi::a+"
+            *values -min 0 -max 0
+        }] $args]
+        set f [dict get $argd opts -frametype]
+        set bd [dict get $argd opts -outlinecolour]
+        set bgansi [dict get $argd opts -backgroundcolour] ;#we use ta::detect to see if already ansi and apply as necessary
+
+        #standard red green blue purple yellow
+        lassign $logo_letter_colours c_0 c_1 c_2 c_3 c_4 
+
+        set tc [merge_left_block [T -bg $c_0 -border $bd -frametype $f] [c -bg $c_1 -border $bd -frametype $f]]
+        set tk [merge_left_block [T -bg $c_3 -border $bd -frametype $f] [k_short -bg $c_4 -border $bd -frametype $f]]
+        set logo [textblock::join_basic -- $tc [l -bg $c_2 -border $bd -frametype $f] [textblock::block 2 8 " "] $tk]
+        if {$bgansi ne ""} {
+            lassign [textblock::size_as_list $logo] lwidth lheight
+            set w [expr {$lwidth + 2}]
+            set h [expr {$lheight + 2}]
+            if {![punk::ansi::ta::detect $bgansi]} {
+                set bgansi [punk::ansi::a+ $bgansi]
+            }
+            set logobg $bgansi[textblock::block $w $h " "][punk::ansi::a]
+            set topmargin [string repeat " " $w]
+            set lmargin [textblock::block 1 [expr {$h + 1}] " "]
+            set logo [overtype::left -transparent " " $logobg [textblock::join_basic -- $lmargin $topmargin\n$logo]]
+        }
+        return $logo
+    }
+
+    #for characters where it makes sense - offset left by 4 (1 'block' width)
+    proc merge_left {charleft textright} {
+        if {[string length $charleft] != 1} {
+            error "merge_left requires a single character as the charleft argument"
+        }
+        if {[textblock::height $charleft$textright] > 1} {
+            error "merge_left only operates on a plain char and a plain string with no newlines"
+        }
+        set rhs [textblock::join_basic -- [textblock::block 8 8 " "] [text $textright]]
+        #important to explicitly use -transparent " " (ordinary space) rather than -transparent 1 (any space?)
+        #This is because our frames have NBSP as filler to be non-transparent
+        return [overtype::left -transparent " " -overflow 1 [text $charleft] $rhs]
+    }
+    proc merge_left_block {blockleft blockright} {
+        set rhs [textblock::join_basic -- [textblock::block 8 8 " "] $blockright]
+        return [overtype::left -transparent " " -overflow 1 $blockleft $rhs]
+    }
+
+    proc T {args} {
+        set args [dict remove $args -width -height]
+        append out [lib::hbar {*}$args]\n
+        append out [textblock::join -- "    " [lib::vbar {*}$args] "    "]
+    }
+    proc c {args} {
+        set args [dict remove $args -width -height]
+        append out [textblock::block 12 2 " "]\n 
+        append out [lib::hbar {*}$args]\n
+        append out [textblock::join -- [lib::block {*}$args] "        "]\n
+        append out [lib::hbar {*}$args]
+    }
+    proc l {args} {
+        set args [dict remove $args -width -height]
+        append out [lib::vbar {*}[dict merge {-height 8} $args]]
+    }
+
+    #full height lower k
+    proc k {args} {
+        set args [dict remove $args -width -height]
+        set left [lib::vbar {*}[dict merge {-height 8} $args]]
+        set centre      [textblock::block 4 4 " "]\n
+        append centre   [lib::block {*}$args]\n 
+        append centre   [textblock::block 4 2 " "]
+        set right       [textblock::block 4 2 " "]\n 
+        append right    [lib::block {*}$args]\n 
+        append right    [textblock::block 4 2 " "]\n 
+        append right    [lib::block {*}$args] 
+        append out [textblock::join_basic -- $left $centre $right]
+    }
+    proc k_short {args} {
+        set args [dict remove $args -width -height]
+        append left [textblock::block 4 2 " "]\n 
+        append left [lib::vbar {*}[dict merge {-height 6} $args]]
+        append centre      [textblock::block 4 4 " "]\n
+        append centre   [lib::block {*}$args]\n 
+        append centre   [textblock::block 4 2 " "]
+        append right    [textblock::block 4 2 " "]\n 
+        append right    [lib::block {*}$args]\n 
+        append right    [textblock::block 4 2 " "]\n 
+        append right    [lib::block {*}$args] 
+        append out [textblock::join_basic -- $left $centre $right]
+    }
+
+    proc text {args} {
+        variable default_frametype
+        set argd [punk::args::get_dict [tstr -return string {
+            -bgcolour -default "Web-red"
+            -bordercolour -default "web-white"
+            -frametype -default {${$default_frametype}} 
+            *values -min 1 -max 1
+            str -help "Text to convert to blockletters
+             Requires terminal font to support relevant block characters" 
+            " 
+        }] $args]
+        set opts [dict get $argd opts]
+        set str [dict get $argd values str]
+        set str [string map {\r\n \n} $str]
+        set outblocks [list] 
+        set literals [list \n]
+        foreach char [split $str ""] {
+            if {$char in $literals} {
+                lappend outblocks $char
+                continue
+            }
+            if {$char in [list \t \r]} {
+                lappend outblocks [textblock::block 1 8 $char]
+                continue
+            } 
+            if {[info commands ::punk::blockletter::$char] ne ""} {
+                lappend outblocks [::punk::blockletter::$char {*}$opts]
+            } else {
+                lappend outblocks [textblock::block 12 8 $char]
+            }
+        } 
+        return [textblock::join_basic -- {*}$outblocks]
+    }
+
+
+    #*** !doctools
+    #[list_end] [comment {--- end definitions namespace punk::blockletter ---}]
+}
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# Secondary API namespace
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+tcl::namespace::eval punk::blockletter::lib {
+
+    tcl::namespace::export {[a-z]*}  ;# Convention: export all lowercase
+    tcl::namespace::path [tcl::namespace::parent]
+    #*** !doctools
+    #[subsection {Namespace punk::blockletter::lib}]
+    #[para] Secondary functions that are part of the API 
+    #[list_begin definitions]
+
+    #proc utility1 {p1 args} {
+    #    #*** !doctools
+    #    #[call lib::[fun utility1] [arg p1] [opt {?option value...?}]]
+    #    #[para]Description of utility1 
+    #    return 1 
+    #}
+
+    proc block {args} {
+        upvar ::punk::blockletter::default_frametype ft
+        set argd [punk::args::get_dict [tstr -return string {
+            -height -default 2
+            -width  -default 4
+            -frametype -default {${$ft}} 
+            -bgcolour -default "Web-red"
+            -bordercolour -default "web-white"
+            *values -min 0 -max 0
+        }] $args]
+        set bg [dict get $argd opts -bgcolour]
+        set bd [dict get $argd opts -bordercolour]
+        set h  [dict get $argd opts -height]
+        set w  [dict get $argd opts -width]
+        set f  [dict get $argd opts -frametype]
+
+        #a frame will usually be filled with empty spaces if content not specified
+        #fill the frame with a non-space so we can do transparent overtypes using ordinary space as the transparency character
+        set w_in [expr {$w -2}]
+        set h_in [expr {$h -2}]
+        if {$w_in > 0 && $h_in > 0} { 
+            set inner [textblock::block $w_in $h_in \u00a0]  ;#NBSP
+            textblock::frame -type $f -height $h -width $w -ansiborder [a+ $bd $bg] -ansibase [a+ $bg] $inner
+        } else {
+            #important to use no content arg - as empty string has 'height' of 1 in the textblock context (min height of any string is 1 row in the console)
+            textblock::frame -type $f -height $h -width $w -ansiborder [a+ $bd $bg] -ansibase [a+ $bg]
+        }
+
+    }
+    proc hbar {args} {
+        upvar ::punk::blockletter::default_frametype ft
+        set defaults [dict create\
+        -height 2\
+        -width 12\
+        -frametype $ft\
+        ]
+        set opts [dict merge $defaults $args]
+        block {*}$opts
+    }
+    proc vbar {args} {
+        upvar ::punk::blockletter::default_frametype ft
+        #default height a multiple of default hbar/block height
+        set defaults [dict create\
+        -height 6\
+        -width 4\
+        -frametype $ft\
+        ]
+        set opts [dict merge $defaults $args]
+        [namespace current]::block {*}$opts
+    }
+
+    #*** !doctools
+    #[list_end] [comment {--- end definitions namespace punk::blockletter::lib ---}]
+}
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+#*** !doctools
+#[section Internal]
+#tcl::namespace::eval punk::blockletter::system {
+    #*** !doctools
+    #[subsection {Namespace punk::blockletter::system}]
+    #[para] Internal functions that are not part of the API 
+
+
+
+#}
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+##  Ready   
+package provide punk::blockletter [tcl::namespace::eval punk::blockletter {
+    variable pkg punk::blockletter
+    variable version
+    set version 999999.0a1.0 
+}]
+return
+
+#*** !doctools
+#[manpage_end]
+
diff --git a/src/modules/punk/blockletter-buildversion.txt b/src/modules/punk/blockletter-buildversion.txt
new file mode 100644
index 00000000..f47d01c8
--- /dev/null
+++ b/src/modules/punk/blockletter-buildversion.txt
@@ -0,0 +1,3 @@
+0.1.0
+#First line must be a semantic version number
+#all other lines are ignored.
diff --git a/src/modules/punk/console-999999.0a1.0.tm b/src/modules/punk/console-999999.0a1.0.tm
index ed3c40b1..273d444b 100644
--- a/src/modules/punk/console-999999.0a1.0.tm
+++ b/src/modules/punk/console-999999.0a1.0.tm
@@ -1021,8 +1021,8 @@ namespace eval punk::console {
     #It's known this isn't always the case - but things like textutil::untabify2 take only a single value
     #on some systems test_char_width is a similar speed to get_tabstop_apparent_width - but on some test_char_width is much slower
     #we will use test_char_width as a fallback
-    proc get_tabstop_apparent_width {} {
-        set tslist [get_tabstops]
+    proc get_tabstop_apparent_width {{inoutchannels {stdin stdout}}} {
+        set tslist [get_tabstops $inoutchannels]
         if {![llength $tslist]} {
             #either terminal failed to report - or none set.
             set testw [test_char_width \t]
@@ -1075,23 +1075,37 @@ namespace eval punk::console {
         return [split [get_cursor_pos $inoutchannels] ";"]
     }
 
-    #todo - determine cursor on/off state before the call to restore properly. May only be possible 
+    #todo - determine cursor on/off state before the call to restore properly. 
     proc get_size {{inoutchannels {stdin stdout}}} {
         lassign $inoutchannels in out
         #we can't reliably use [chan names] for stdin,stdout. There could be stacked channels and they may have a names such as file22fb27fe810
         #chan eof is faster whether chan exists or not than
-        if {[catch {chan eof $in} is_eof]} {
-                error "punk::console::get_size input channel $in seems to be closed ([info level 1])"
+        if {[catch {chan eof $out} is_eof]} {
+                error "punk::console::get_size output channel $out seems to be closed ([info level 1])"
         } else {
             if {$is_eof} {
-                error "punk::console::get_size eof on input channel $in ([info level 1])"
+                error "punk::console::get_size eof on output channel $out ([info level 1])"
             } 
         }
-        if {[catch {chan eof $out} is_eof]} {
-                error "punk::console::get_size output channel $out seems to be closed ([info level 1])"
+        #we don't need to care about the input channel if chan configure on the output can give us the info.
+        #short circuit ansi cursor movement method if chan configure supports the -winsize value
+        set outconf [chan configure $out]
+        if {[dict exists $outconf -winsize]} {
+            #this mechanism is much faster than ansi cursor movements
+            #REVIEW check if any x-platform anomalies with this method?
+            #can -winsize key exist but contain erroneous info? We will check that we get 2 ints at least 
+            lassign [dict get $outconf -winsize] cols lines
+            if {[string is integer -strict $cols] && [string is integer -strict $lines]} {
+                return [list columns $cols rows $lines]
+            }
+            #continue on to ansi mechanism if we didn't get 2 ints
+        }
+
+        if {[catch {chan eof $in} is_eof]} {
+                error "punk::console::get_size input channel $in seems to be closed ([info level 1])"
         } else {
             if {$is_eof} {
-                error "punk::console::get_size eof on output channel $out ([info level 1])"
+                error "punk::console::get_size eof on input channel $in ([info level 1])"
             } 
         }
 
@@ -1114,18 +1128,28 @@ namespace eval punk::console {
         }
     }
 
-    #faster - but uses cursor_save - which we may want to avoid if calling during another operation which uses cursor save/restore
-    proc get_size_cursorrestore {} {
+    #faster than get_size when it is using ansi mechanism - but uses cursor_save - which we may want to avoid if calling during another operation which uses cursor save/restore
+    proc get_size_cursorrestore {{inoutchannels {stdin stdout}}} {
+        lassign $inoutchannels in out
+        #we use the same shortcircuit mechanism as get_size to avoid ansi at all if the output channel will give us the info directly 
+        set outconf [chan configure $out]
+        if {[dict exists $outconf -winsize]} {
+            lassign [dict get $outconf -winsize] cols lines
+            if {[string is integer -strict $cols] && [string is integer -strict $lines]} {
+                return [list columns $cols rows $lines]
+            }
+        }
+
         if {[catch {
             #some terminals (conemu on windows) scroll the viewport when we make a big move down like this - a  move to 1 1 immediately after cursor_save doesn't seem to fix that.
             #This issue also occurs when switching back from the alternate screen buffer - so perhaps that needs to be addressed elsewhere.
-            puts -nonewline [punk::ansi::cursor_off][punk::ansi::cursor_save_dec][punk::ansi::move 2000 2000]
-            lassign [get_cursor_pos_list] lines cols
-            puts -nonewline [punk::ansi::cursor_restore][punk::console::cursor_on];flush stdout
+            puts -nonewline $out [punk::ansi::cursor_off][punk::ansi::cursor_save_dec][punk::ansi::move 2000 2000]
+            lassign [get_cursor_pos_list $inoutchannels] lines cols
+            puts -nonewline $out [punk::ansi::cursor_restore][punk::console::cursor_on];flush $out 
             set result [list columns $cols rows $lines] 
         } errM]} {
-            puts -nonewline [punk::ansi::cursor_restore_dec]
-            puts -nonewline [punk::ansi::cursor_on]
+            puts -nonewline $out [punk::ansi::cursor_restore_dec]
+            puts -nonewline $out [punk::ansi::cursor_on]
             error "$errM"
         } else {
             return $result
@@ -1175,7 +1199,7 @@ namespace eval punk::console {
         }
 
         if {!$emit} {
-            puts -nonewline stdout \033\[2K\033\[1G ;#2K erase line 1G cursor at col1
+            puts -nonewline stdout \033\[2K\033\[1G ;#2K erase line, 1G cursor at col1
         }
         set response ""
         if {[catch {
@@ -1405,12 +1429,12 @@ namespace eval punk::console {
         proc cursor_save {} {
             #*** !doctools
             #[call [fun cursor_save]]
-            puts -nonewline \x1b\[s
+            puts -nonewline stdout \x1b\[s
         }
         proc cursor_restore {} {
             #*** !doctools
             #[call [fun cursor_restore]]
-            puts -nonewline \x1b\[u
+            puts -nonewline stdout \x1b\[u
         }
         #DEC equivalents of cursor_save/cursor_restore - perhaps more widely supported?
         proc cursor_save_dec {} {
diff --git a/src/modules/punk/experiment-999999.0a1.0.tm b/src/modules/punk/experiment-999999.0a1.0.tm
index 95436bb5..8b7287db 100644
--- a/src/modules/punk/experiment-999999.0a1.0.tm
+++ b/src/modules/punk/experiment-999999.0a1.0.tm
@@ -474,12 +474,12 @@ namespace eval punk::experiment {
     proc render1 {} {
         variable b1
         variable b2
-        overtype::renderspace -overflow 1 -startcolumn 7 $b1 $b2
+        overtype::renderspace -expand_right 1 -startcolumn 7 $b1 $b2
     }
     proc render2 {} {
         variable b1
         variable b3
-        overtype::renderspace -overflow 1 -transparent @ $b1 $b3
+        overtype::renderspace -expand_right 1 -transparent @ $b1 $b3
     }
 
     oo::class create c1 {
diff --git a/src/modules/punk/mix/commandset/project-999999.0a1.0.tm b/src/modules/punk/mix/commandset/project-999999.0a1.0.tm
index ab79b480..24a2be2d 100644
--- a/src/modules/punk/mix/commandset/project-999999.0a1.0.tm
+++ b/src/modules/punk/mix/commandset/project-999999.0a1.0.tm
@@ -919,10 +919,18 @@ namespace eval punk::mix::commandset::project {
 
             if {[llength $col_states]} {
                 foreach row $col_rowids wd $workdirs db $col_fnames dup $col_dupids pname $col_pnames pcode $col_pcodes s $col_states {
+                    if {![file exists $wd]} {
+                        set row [punk::ansi::a+ strike red]$row[a]
+                        set wd [punk::ansi::a+ red]$wd[a]
+                    }
                     append msg "[overtype::right $col0 $row] [overtype::left $col1 $wd] [overtype::left $col2 $db] [overtype::right $col3 $dup] [overtype::left $col4 $pname] [overtype::left $col5 $pcode] [overtype::left $col6 $s]" \n
                 } 
             } else {
                 foreach row $col_rowids wd $workdirs db $col_fnames dup $col_dupids pname $col_pnames pcode $col_pcodes {
+                    if {![file exists $wd]} {
+                        set row [punk::ansi::a+ strike red]$row[a]
+                        set wd [punk::ansi::a+ red]$wd[a]
+                    }
                     append msg "[overtype::right $col0 $row] [overtype::left $col1 $wd] [overtype::left $col2 $db] [overtype::right $col3 $dup] [overtype::left $col4 $pname] [overtype::left $col5 $pcode]" \n
                 } 
             }
diff --git a/src/modules/punk/repl-0.1.tm b/src/modules/punk/repl-0.1.tm
index 0d3f6115..864c4030 100644
--- a/src/modules/punk/repl-0.1.tm
+++ b/src/modules/punk/repl-0.1.tm
@@ -431,7 +431,7 @@ proc repl::post_operations {} {
        uplevel #0 {eval $::repl::running_script}
     }
     #todo - tidyup so repl could be restarted
-    set repl::post_operations_done 0
+    set ::repl::post_operations_done 0
 }
 
 
@@ -860,7 +860,7 @@ namespace eval punk::repl::class {
                 set o_cursor_col $line_nextchar_col
             }
             
-            set mergedinfo [overtype::renderline -info 1 -overflow 1 -insert_mode $o_insert_mode -cursor_column $o_cursor_col -cursor_row $o_cursor_row $underlay $new0]
+            set mergedinfo [overtype::renderline -info 1 -expand_right 1 -insert_mode $o_insert_mode -cursor_column $o_cursor_col -cursor_row $o_cursor_row $underlay $new0]
 
             set result          [dict get $mergedinfo result]
             set o_insert_mode   [dict get $mergedinfo insert_mode]
@@ -934,13 +934,13 @@ namespace eval punk::repl::class {
                         break
                     }
                 }
-                #puts stderr "overtype::renderline -info 1 -overflow 1 -insert_mode $o_insert_mode -cursor_column $o_cursor_col -cursor_row $o_cursor_row $activeline '$p'"
+                #puts stderr "overtype::renderline -info 1 -expand_right 1 -insert_mode $o_insert_mode -cursor_column $o_cursor_col -cursor_row $o_cursor_row $activeline '$p'"
                 set underlay $activeline 
                 set line_nextchar_col [expr {[punk::char::string_width $underlay] + 1}]
                 if {$o_cursor_col > $line_nextchar_col} {
                     set o_cursor_col $line_nextchar_col
                 } 
-                set mergedinfo [overtype::renderline -info 1 -overflow 1 -insert_mode $o_insert_mode -cursor_column $o_cursor_col -cursor_row $o_cursor_row $underlay $p]
+                set mergedinfo [overtype::renderline -info 1 -expand_right 1 -insert_mode $o_insert_mode -cursor_column $o_cursor_col -cursor_row $o_cursor_row $underlay $p]
                 set debug "add_chunk$i"
                 append debug \n $mergedinfo
                 append debug \n "input:[ansistring VIEW -lf 1 -vt 1 $p]"
@@ -1120,7 +1120,7 @@ namespace eval punk::repl::class {
                 } else {
                     set charhighlight [punk::ansi::a+ reverse]$char_at_cursor[a]
                 }
-                set cursorline [overtype::renderline -transparent 1 -insert_mode 0 -overflow 0 $cursorline $prefix$charhighlight$suffix]
+                set cursorline [overtype::renderline -transparent 1 -insert_mode 0 -expand_right 0 $cursorline $prefix$charhighlight$suffix]
                 lset lines $o_cursor_row-1 $cursorline
             }
 
@@ -1921,7 +1921,7 @@ proc repl::repl_process_data {inputchan chunktype chunk stdinlines prompt_config
 
 
             if {[info complete $commandstr] && [string index $commandstr end] ne "\\"} {
-                #set commandstr [overtype::renderline -overflow 1 "" $commandstr]
+                #set commandstr [overtype::renderline -expand_right 1 "" $commandstr]
 
 
                 set ::repl::output_stdout ""
diff --git a/src/modules/punk/repo-999999.0a1.0.tm b/src/modules/punk/repo-999999.0a1.0.tm
index 436dcdc4..d9f968ed 100644
--- a/src/modules/punk/repo-999999.0a1.0.tm
+++ b/src/modules/punk/repo-999999.0a1.0.tm
@@ -134,13 +134,30 @@ namespace eval punk::repo {
     }
     interp alias "" fossil "" punk::repo::fossil_proxy
 
+    # ---
+    # Calling auto_execok on an external tool can be too slow to do during package load (e.g could be 150ms)
+
     #safe interps can't call auto_execok
     #At least let them load the package even though much of it may be unusable depending on the safe configuration
-    catch {
-    if {[auto_execok fossil] ne ""} { 
-        interp alias "" FOSSIL "" {*}[auto_execok fossil]
-    }
+    #catch {
+    #    if {[auto_execok fossil] ne ""} { 
+    #        interp alias "" FOSSIL "" {*}[auto_execok fossil]
+    #    }
+    #}
+    # ---
+    # ----------
+    #
+
+    #uppercase FOSSIL to bypass fossil as alias to fossil_proxy
+    proc establish_FOSSIL {args} {
+        if {![info exists ::auto_execs(FOSSIL)]} {
+            set ::auto_execs(FOSSIL) [auto_execok fossil] ;#may fail in safe interp
+        }
+        interp alias "" FOSSIL "" ;#delete establishment alias
+        FOSSIL {*}$args
     }
+    interp alias "" FOSSIL "" punk::repo::establish_FOSSIL
+    # ----------
 
     proc askuser {question} {
         if {![catch {package require punk::lib}]} {
@@ -370,7 +387,16 @@ namespace eval punk::repo {
         }
 
         if {$repodir eq ""} {
-            error "workingdir_state error: No repository found at or above path '$abspath'" 
+            puts stderr "workingdir_state error: No repository found at or above path '$abspath'" 
+            puts stderr "args: $args"
+            dict set resultdict revision {} 
+            dict set resultdict revision_iso8601 {} 
+            dict set resultdict paths {} 
+            dict set resultdict ahead ""
+            dict set resultdict behind ""
+            dict set resultdict error {reason "no_repo_found"}
+            dict set resultdict repotype none
+            return $resultdict
         }
         set subpath [punk::path::relative $repodir $abspath]
         if {$subpath eq "."} {
@@ -644,6 +670,16 @@ namespace eval punk::repo {
         set path_count_fields [list unchanged changed new missing extra]
         set state_fields [list ahead behind repodir subpath repotype revision revision_iso8601]
         set dresult [dict create]
+        if {[dict exists $repostate error]} {
+            foreach f $state_fields {
+                dict set dresult $f ""
+            }
+            foreach f $path_count_fields {
+                dict set dresult $f ""
+            }
+            #todo?
+            return $dresult
+        }
         foreach f $state_fields {
            dict set dresult $f [dict get $repostate $f]
         }
diff --git a/src/modules/textblock-999999.0a1.0.tm b/src/modules/textblock-999999.0a1.0.tm
index 0502cc4b..45890bee 100644
--- a/src/modules/textblock-999999.0a1.0.tm
+++ b/src/modules/textblock-999999.0a1.0.tm
@@ -60,6 +60,8 @@ package require punk::ansi
 package require punk::lib
 catch {package require patternpunk}
 package require overtype
+
+#safebase interps as at 2024-08 can't access deeper paths - even though they are below the supposed safe list.
 package require term::ansi::code::macros ;#required for frame if old ansi g0 used - review - make package optional?
 package require textutil
 
@@ -1931,13 +1933,6 @@ tcl::namespace::eval textblock {
                             set hval $ansibase_header$header ;#no reset
                             set rowh [my header_height $hrow]
 
-                            #set h_lines [lrepeat $rowh $hcell_line_blank]
-                            #set hcell_blank [join $h_lines \n]
-                            #set hval_lines [split $hval \n]
-                            #set hval_lines [lrange $hval_lines 0 $rowh-1]
-                            #set hval_block [join $hval_lines \n]
-                            #set headercell [overtype::left -experimental test_mode $ansibase_header$hcell_blank$RST $hval_block]
-
                             if {$hrow == 0} {
                                 set hlims $header_boxlimits_toprow
                                 set rowpos "top"
@@ -2144,7 +2139,7 @@ tcl::namespace::eval textblock {
                                     #puts $hblock
                                     #puts "==>hval:'$hval'[a]"
                                     #puts "==>hval:'[ansistring VIEW $hval]'"
-                                    #set spanned_frame [overtype::renderspace -experimental test_mode -transparent 1 $spanned_frame $hblock]
+                                    #set spanned_frame [overtype::renderspace -transparent 1 $spanned_frame $hblock]
 
                                     #spanned values default left - todo make configurable
 
@@ -3502,11 +3497,11 @@ tcl::namespace::eval textblock {
                             set height [textblock::height $table] ;#only need to get height once at start
                         } else {
                             set nextcol [textblock::join -- [textblock::block $padwidth $height $TSUB] $nextcol]
-                            set table [overtype::renderspace -overflow 1 -experimental test_mode -transparent $TSUB $table[unset table] $nextcol]
+                            set table [overtype::renderspace -expand_right 1  -transparent $TSUB $table[unset table] $nextcol]
                             #JMN
 
                             #set nextcol [textblock::join -- [textblock::block $padwidth $height "\uFFFF"] $nextcol]
-                            #set table [overtype::renderspace -overflow 1 -experimental test_mode -transparent \uFFFF $table $nextcol]
+                            #set table [overtype::renderspace -expand_right 1 -transparent \uFFFF $table $nextcol]
                         }
                         incr padwidth $bodywidth 
                         incr colposn
@@ -3607,14 +3602,7 @@ tcl::namespace::eval textblock {
                             set table $nextcol 
                             set height [textblock::height $table] ;#only need to get height once at start
                         } else {
-                            set table [overtype::renderspace -startcolumn [expr {$padwidth + 1}] -overflow 1 -experimental test_mode -transparent $TSUB $table $nextcol]
-
-                            #set nextcol [textblock::join -- [textblock::block $padwidth $height $TSUB] $nextcol]
-                            #set table [overtype::renderspace -overflow 1 -experimental test_mode -transparent $TSUB $table[unset table] $nextcol]
-                            #JMN
-
-                            #set nextcol [textblock::join -- [textblock::block $padwidth $height "\uFFFF"] $nextcol]
-                            #set table [overtype::renderspace -overflow 1 -experimental test_mode -transparent \uFFFF $table $nextcol]
+                            set table [overtype::renderspace -startcolumn [expr {$padwidth + 1}] -expand_right 1 -transparent $TSUB $table $nextcol]
                         }
                         incr padwidth $bodywidth 
                         incr colposn
@@ -3724,7 +3712,7 @@ tcl::namespace::eval textblock {
                             lappend body_blocks $nextcol_body
                         } else {
                             if {$headerheight > 0} {
-                                set header_build [overtype::renderspace -startcolumn [expr {$padwidth + 1}] -overflow 1 -experimental test_mode -transparent $TSUB $header_build[unset header_build] $nextcol_header[unset nextcol_header]]
+                                set header_build [overtype::renderspace -startcolumn [expr {$padwidth + 1}] -expand_right 1 -transparent $TSUB $header_build[unset header_build] $nextcol_header[unset nextcol_header]]
                             }
                             lappend body_blocks $nextcol_body
                             #set body_build [textblock::join -- $body_build[unset body_build] $nextcol_body]
@@ -4057,7 +4045,7 @@ tcl::namespace::eval textblock {
             if append is chosen the new values will always start at the first column"
             -columns    -default "" -type integer   -help "Number of table columns
             Will default to 2 if not using an existing -table object"
-            *values
+            *values -min 0 -max 1
             datalist    -default {}                 -help "flat list of table cell values which will be wrapped based on -columns value"
         }] $args]
         set opts [dict get $argd opts]
@@ -4408,6 +4396,14 @@ tcl::namespace::eval textblock {
 
         return [tcl::dict::create width $width height $height] ;#maintain order in 'image processing' standard width then height - caller may use lassign [tcl::dict::values [blocksize <data>]] width height
     }
+    proc size_as_opts {textblock} {
+        set sz [size $textblock]
+        return [dict create -width [dict get $sz width] -height [dict get $sz height]]
+    }
+    proc size_as_list {textblock} {
+        set sz [size $textblock]
+        return [list [dict get $sz width] [dict get $sz height]]
+    }
     #must be able to handle block as string with or without newlines
     #if no newlines - attempt to treat as a list
     #must handle whitespace-only string,list elements, and/or lines.
@@ -5132,6 +5128,7 @@ tcl::namespace::eval textblock {
              [punk::lib::list_as_lines -- [lrepeat 8 " | "]]
     }
     proc table {args} {
+        #todo - use punk::args
         upvar ::textblock::class::opts_table_defaults toptdefaults
         set defaults [tcl::dict::create\
             -rows [list]\
@@ -5183,7 +5180,7 @@ tcl::namespace::eval textblock {
     }
 
     variable frametypes
-    set frametypes [list light heavy arc double block block1 block2 ascii altg]
+    set frametypes [list light heavy arc double block block1 block2 block2hack ascii altg]
     #class::table needs to be able to determine valid frametypes
     proc frametypes {} {
         variable frametypes
@@ -5192,7 +5189,7 @@ tcl::namespace::eval textblock {
     proc frametype {f} {
         #set custom_keys [list hl hlt hlb vl vll vlr tlc trc blc brc]
         switch -- $f {
-            light - heavy - arc - double - block - block1 - block2 - ascii - altg {
+            light - heavy - arc - double - block - block1 - block2 - block2hack - ascii - altg {
                 return [tcl::dict::create category predefined type $f]
             }
             default {
@@ -5213,7 +5210,7 @@ tcl::namespace::eval textblock {
                     set is_custom_dict_ok 0
                 }
                 if {!$is_custom_dict_ok} {
-                    error "frame option -type must be one of known types: $textblock::frametypes or a dictionary with any of keys hl,hlt,hlb,vl,vll,vlr,tlc,trc,blc,brc"
+                    error "frame option -type must be one of known types: $::textblock::frametypes or a dictionary with any of keys hl,hlt,hlb,vl,vll,vlr,tlc,trc,blc,brc"
                 }
                 set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "]
                 set custom_frame [tcl::dict::merge $default_custom $f]
@@ -6323,9 +6320,12 @@ tcl::namespace::eval textblock {
                 set vlr \u2595 ;# right one eighth block
                 set vll \u258f ;# left one eighth block
 
+                #some terminals (on windows as at 2024) miscount width of these single-width blocks internally
+                #resulting in extra spacing that is sometimes well removed from the character itself (e.g at next ansi reset)
+                #This was fixed in windows-terminal based systems (2021) but persists in others.
+                #https://github.com/microsoft/terminal/issues/11694
                 set tlc \U1fb7d ;#legacy block
                 set trc \U1fb7e ;#legacy block
-
                 set blc \U1fb7c ;#legacy block
                 set brc \U1fb7f ;#legacy block
 
@@ -6336,6 +6336,42 @@ tcl::namespace::eval textblock {
                 set vlrj $vlr
 
             }
+            block2hack {
+                #the resultant table will have text appear towards top of each box 
+                #with 'legacy' computing unicode block - hopefully these become more widely supported - as they are useful and fill in some gaps
+                set hlt \u2594 ;# upper one eighth block
+                set hlb \u2581 ;# lower one eighth block
+                set vlr \u2595 ;# right one eighth block
+                set vll \u258f ;# left one eighth block
+
+                #see comments in block2 regarding the problems in some terminals that this *may* hack around to some extent.
+                #the caller probably only needs block2hack if block2 doesn't work
+
+                #1)
+                #review - this hack looks sort of promising - but overtype::renderline needs fixing ?
+                #set tlc \U1fb7d\b ;#legacy block
+                #set trc \U1fb7e\b ;#legacy block
+                #set blc \U1fb7c\b ;#legacy block
+                #set brc \U1fb7f\b ;#legacy block
+
+                #2) - works on cmd.exe and some others
+                # a 'privacy message' is 'probably' also not supported on the old terminal but is on newer ones
+                #known exception - conemu on windows - displays junk for various ansi codes - (and slow terminal anyway)
+                #this hack has a reasonable chance of working
+                #except that the punk overtype library does recognise PMs 
+                #A single backspace however is an unlikely and generally unuseful PM - so there is a corresponding hack in the renderline system to pass this PM through!
+                #ugly - in that we don't know the application specifics of what the PM data contains and where it's going.
+                set tlc \U1fb7d\x1b^\b\x1b\\ ;#legacy block
+                set trc \U1fb7e\x1b^\b\x1b\\ ;#legacy block
+                set blc \U1fb7c\x1b^\b\x1b\\ ;#legacy block
+                set brc \U1fb7f\x1b^\b\x1b\\ ;#legacy block
+
+                #horizontal and vertical bar joins 
+                set hltj $hlt
+                set hlbj $hlb
+                set vllj $vll
+                set vlrj $vlr
+            }
             block {
                 set hlt \u2580 ;#upper half
                 set hlb \u2584 ;#lower half
@@ -6357,7 +6393,7 @@ tcl::namespace::eval textblock {
                 set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "] ;#only default the general types - these form defaults for more specific types if they're missing
                 if {[llength $f] % 2 != 0} {
                     #todo  - retrieve usage from punk::args
-                    error "textblock::frametype frametype '$f' is not one of the predefined frametypes: $textblock::frametypes and does not appear to be a dictionary for a custom frametype"
+                    error "textblock::frametype frametype '$f' is not one of the predefined frametypes: $::textblock::frametypes and does not appear to be a dictionary for a custom frametype"
                 }
                 #unknown order of keys specified by user - validate before creating vars as we need more general elements to be available as defaults
                 dict for {k v} $f {
@@ -6488,7 +6524,11 @@ tcl::namespace::eval textblock {
             -ellipsis 1\
             -usecache 1\
             -buildcache 1\
+            -pad 1\
+            -crm_mode 0\
         ]
+        #-pad 1 is default so that simple 'textblock::frame "[a+ Red]a  \nbbb[a]"  extends the bg colour on the short ragged lines (and empty lines)
+        # for ansi art - -pad 0 is likely to be preferable
 
         set expect_optval 0
         set argposn 0
@@ -6527,7 +6567,12 @@ tcl::namespace::eval textblock {
         #use -buildcache 1 with -usecache 0 for debugging cache issues so we can inspect using textblock::frame_cache
         foreach {k v} $arglist {
             switch -- $k {
-                -etabs - -type - -boxlimits - -boxmap - -joins - -title - -subtitle - -width - -height - -ansiborder - -ansibase - -blockalign - -textalign - -ellipsis - -usecache - -buildcache {
+                -etabs - -type - -boxlimits - -boxmap - -joins 
+                - -title - -subtitle - -width - -height
+                - -ansiborder - -ansibase
+                - -blockalign - -textalign - -ellipsis
+                - -crm_mode
+                - -usecache - -buildcache - -pad {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -6543,11 +6588,13 @@ tcl::namespace::eval textblock {
         set opt_boxmap      [tcl::dict::get $opts -boxmap]
         set opt_usecache    [tcl::dict::get $opts -usecache]
         set opt_buildcache  [tcl::dict::get $opts -buildcache]
+        set opt_pad         [tcl::dict::get $opts -pad]
+        set opt_crm_mode    [tcl::dict::get $opts -crm_mode]
         set usecache $opt_usecache ;#may need to override
         set buildcache $opt_buildcache
         set custom_keys [list hl hlt hlb vl vll vlr tlc trc blc brc]
 
-        set known_frametypes $frametypes ;# light, heavey etc as defined in textblock::frametypes variable
+        set known_frametypes $frametypes ;# light, heavey etc as defined in the ::textblock::frametypes variable
         set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "]
 
         lassign [textblock::frametype $opt_type] _cat category _type ftype
@@ -6686,6 +6733,19 @@ tcl::namespace::eval textblock {
                 }
             }
             set contents [tcl::string::map [list \r\n \n] $contents]
+            if {$opt_crm_mode} {
+                if {$opt_height eq ""} {
+                    set h [textblock::height $contents]
+                } else {
+                    set h [expr {$opt_height -2}]
+                }
+                if {$opt_width eq ""} {
+                    set w [textblock::width $contents]
+                } else {
+                    set w [expr {$opt_width -2}]
+                }
+                set contents [overtype::renderspace -crm_mode 1 -wrap 1 -width $w -height $h "" $contents]
+            }
             set actual_contentwidth [textblock::width $contents] ;#length of longest line in contents (contents can be ragged)
             set actual_contentheight [textblock::height $contents]
         } else {
@@ -7134,15 +7194,22 @@ tcl::namespace::eval textblock {
                 append contents [::join [lrepeat $diff \n] ""]
             }
 
-            set paddedcontents [textblock::pad $contents -which $pad -within_ansi 1] ;#autowidth to width of content (should match cache_patternwidth) 
-            set paddedwidth  [textblock::widthtopline $paddedcontents]
-
-            #review - horizontal truncation
-            if {$paddedwidth > $cache_patternwidth} {
-                set paddedcontents [overtype::renderspace -width $cache_patternwidth "" $paddedcontents]
+            if {$opt_pad} {
+                set paddedcontents [textblock::pad $contents -which $pad -within_ansi 1] ;#autowidth to width of content (should match cache_patternwidth) 
+                set paddedwidth  [textblock::widthtopline $paddedcontents]
+                #review - horizontal truncation
+                if {$paddedwidth > $cache_patternwidth} {
+                    set paddedcontents [overtype::renderspace -width $cache_patternwidth "" $paddedcontents]
+                }
+                #important to supply end of opts -- to textblock::join - particularly here with arbitrary data
+                set contentblock [textblock::join -- $paddedcontents] ;#make sure each line has ansi replays
+            } else {
+                set cwidth [textblock::width $contents]
+                if {$cwidth > $cache_patternwidth} {
+                    set contents [overtype::renderspace -width $cache_patternwidth "" $contents]
+                }
+                set contentblock [textblock::join -- $contents]
             }
-            #important to supply end of opts -- to textblock::join - particularly here with arbitrary data
-            set contentblock [textblock::join -- $paddedcontents] ;#make sure each line has ansi replays
 
             set tlines [split $template \n]
 
diff --git a/src/project_layouts/custom/_project/punk.basic/src/make.tcl b/src/project_layouts/custom/_project/punk.basic/src/make.tcl
index 1cf07c5b..9edd90b0 100644
--- a/src/project_layouts/custom/_project/punk.basic/src/make.tcl
+++ b/src/project_layouts/custom/_project/punk.basic/src/make.tcl
@@ -1212,8 +1212,9 @@ foreach vfstail $vfs_tails {
             set rtmountpoint //zipfs:/rtmounts/$runtime_fullname
 
             set changed_unchanged [$vfs_event targetset_source_changes]
+            set vfs_or_runtime_changed [expr {[llength [dict get $changed_unchanged changed]] ||  [llength [$vfs_event get_targets_exist]] < [llength [$vfs_event get_targets]]}]
 
-            if {[llength [dict get $changed_unchanged changed]] ||  [llength [$vfs_event get_targets_exist]] < [llength [$vfs_event get_targets]]} {
+            if {$vfs_or_runtime_changed} {
                 #source .vfs folder has changes
                 $vfs_event targetset_started
                 # -- --- --- --- --- ---
@@ -1283,6 +1284,7 @@ foreach vfstail $vfs_tails {
                                     puts stderr "RUNTIME capabilities unknown. Unsure if zip supported. trying anyway.."
                                 }
                             }
+                            #note - as at 2024-08 - there is some discussion about the interface to mkimg - it is considered unstable (may change to -option value syntax)
                             puts stderr "calling: tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs \"\" $buildfolder/build_$runtime_fullname"
                             tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs "" $buildfolder/build_$runtime_fullname
                         } result ]} {
@@ -1352,9 +1354,10 @@ foreach vfstail $vfs_tails {
                     if {![catch {
                             exec $pscmd | grep $targetkit
                         } still_running]} {
-
-                        puts stdout "found $targetkit instances still running\n"
+                        set still_running_lines [split [string trim $still_running] \n]
+                        puts stdout "found ([llength $still_running_lines]) $targetkit instances still running\n"
                         set count_killed 0
+                        set num_to_kill [llength $still_running_lines]
                         foreach ln [split $still_running \n] {
                             puts stdout "    $ln"
                             
@@ -1387,9 +1390,6 @@ foreach vfstail $vfs_tails {
                                 #review - *no running instance* works with windows taskkill - "*No such process*" works with kill -9 on FreeBSD and linux - other platforms?
                                 if {![string match "*no running instance*" $errMsg] && ![string match "*No such process*" $errMsg]} {
                                     lappend failed_kits [list kit $targetkit reason "could not kill running process for $targetkit (using '$killcmd')"]
-                                    $vfs_event targetset_end FAILED
-                                    $vfs_event destroy
-                                    $vfs_installer destroy
                                     continue
                                 }
                             } else {
@@ -1397,10 +1397,15 @@ foreach vfstail $vfs_tails {
                                 incr count_killed
                             }
                         }
-                        if {$count_killed > 0} {
-                            puts stderr "\nKilled $count_killed processes. Waiting a short time before attempting to delete executable"
-                            after 1000
+                        if {$count_killed < $num_to_kill} {
+                            $vfs_event targetset_end FAILED
+                            $vfs_event destroy
+                            $vfs_installer destroy
+                            continue
                         }
+
+                        puts stderr "\nKilled $count_killed processes. Waiting a short time before attempting to delete executable"
+                        after 1000
                     } else {
                         puts stderr "Ok.. no running '$targetkit' processes found"
                     }
@@ -1426,22 +1431,35 @@ foreach vfstail $vfs_tails {
                 # -- --- --- --- --- ---
                 $vfs_event targetset_end OK
 
+            } else {
+                set skipped_vfs_build 1
+                puts stderr "."
+                puts stdout "Skipping build for vfs $vfstail with runtime $rtname - no change detected"
+                $vfs_event targetset_end SKIPPED
+            }
+            $vfs_event destroy
+            $vfs_installer destroy
 
-                after 200
-                set deployment_folder [file dirname $sourcefolder]/bin
-                file mkdir $deployment_folder
+            after 200
+            set deployment_folder [file dirname $sourcefolder]/bin
+            file mkdir $deployment_folder
 
-                # -- ----------
-                set bin_installer [punkcheck::installtrack new "make.tcl" $deployment_folder/.punkcheck]
-                $bin_installer set_source_target $buildfolder $deployment_folder
-                set bin_event [$bin_installer start_event {-make-step final_kit_install}]
-                $bin_event targetset_init INSTALL $deployment_folder/$targetkit
-                #todo - move final deployment step outside of the build vfs loop? (final deployment can fail and then isn't rerun even though _build and deployed versions differ, unless .vfs modified again)
-                #set last_completion [$bin_event targetset_last_complete]
-
-                $bin_event targetset_addsource $buildfolder/$targetkit
-                $bin_event targetset_started
-                # -- ----------
+            # -- ----------
+            set bin_installer [punkcheck::installtrack new "make.tcl" $deployment_folder/.punkcheck]
+            $bin_installer set_source_target $buildfolder $deployment_folder
+            set bin_event [$bin_installer start_event {-make-step final_kit_install}]
+            $bin_event targetset_init INSTALL $deployment_folder/$targetkit
+            #todo - move final deployment step outside of the build vfs loop? (final deployment can fail and then isn't rerun even though _build and deployed versions differ, unless .vfs modified again)
+            #set last_completion [$bin_event targetset_last_complete]
+
+            $bin_event targetset_addsource $deployment_folder/$targetkit ;#add target as a source of metadata for change detection
+            $bin_event targetset_addsource $buildfolder/$targetkit
+            $bin_event targetset_started
+            # -- ----------
+
+            set changed_unchanged [$bin_event targetset_source_changes]
+            set built_or_installed_kit_changed [expr {[llength [dict get $changed_unchanged changed]] ||  [llength [$bin_event get_targets_exist]] < [llength [$bin_event get_targets]]}]
+            if {$built_or_installed_kit_changed} { 
 
                 if {[file exists $deployment_folder/$targetkit]} {
                     puts stderr "deleting existing deployed at $deployment_folder/$targetkit"
@@ -1467,19 +1485,16 @@ foreach vfstail $vfs_tails {
                 # -- ----------
                 $bin_event targetset_end OK
                 # -- ----------
-                $bin_event destroy
-                $bin_installer destroy
-
             } else {
-                set skipped_vfs_build 1
+                set skipped_kit_install 1
                 puts stderr "."
-                puts stdout "Skipping build for vfs $vfstail with runtime $rtname - no change detected"
-                $vfs_event targetset_end SKIPPED
+                puts stdout "Skipping kit install for $targetkit with vfs $vfstail runtime $rtname - no change detected"
+                $bin_event targetset_end SKIPPED
             }
+            $bin_event destroy
+            $bin_installer destroy
 
 
-            $vfs_event destroy
-            $vfs_installer destroy
 
         } ;#end foreach targetkit
     } ;#end foreach rtname in runtimes
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/fileutil/paths-1.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/fileutil/paths-1.tm
new file mode 100644
index 00000000..e387acf7
--- /dev/null
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/fileutil/paths-1.tm
@@ -0,0 +1,74 @@
+# paths.tcl --
+#
+#	Manage lists of search paths.
+#
+# Copyright (c) 2009-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# Each object instance manages a list of paths.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+package require snit
+
+# ### ### ### ######### ######### #########
+## API
+
+snit::type ::fileutil::paths {
+
+    # ### ### ### ######### ######### #########
+    ## Options :: None
+
+    # ### ### ### ######### ######### #########
+    ## Creation, destruction
+
+    # Default constructor.
+    # Default destructor.
+
+    # ### ### ### ######### ######### #########
+    ## Methods :: Querying and manipulating the list of paths.
+
+    method paths {} {
+	return $mypaths
+    }
+
+    method add {path} {
+	set pos [lsearch $mypaths $path]
+	if {$pos >= 0 } return
+	lappend mypaths $path
+	return
+    }
+
+    method remove {path} {
+	set pos [lsearch $mypaths $path]
+	if {$pos < 0} return
+	set mypaths [lreplace $mypaths $pos $pos]
+	return
+    }
+
+    method clear {} {
+	set mypaths {}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal methods :: None
+
+    # ### ### ### ######### ######### #########
+    ## State :: List of paths.
+
+    variable mypaths {}
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide fileutil::paths 1
+return
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/fileutil/traverse-0.6.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/fileutil/traverse-0.6.tm
new file mode 100644
index 00000000..2f36d109
--- /dev/null
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/fileutil/traverse-0.6.tm
@@ -0,0 +1,504 @@
+# traverse.tcl --
+#
+#	Directory traversal.
+#
+# Copyright (c) 2006-2015 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.3
+
+# OO core
+if {[package vsatisfies [package present Tcl] 8.5]} {
+    # Use new Tcl 8.5a6+ features to specify the allowed packages.
+    # We can use anything above 1.3. This means v2 as well.
+    package require snit 1.3-
+} else {
+    # For Tcl 8.{3,4} only snit1 of a suitable patchlevel is possible.
+    package require snit 1.3
+}
+package require control  ; # Helpers for control structures
+package require fileutil ; # -> fullnormalize
+
+snit::type ::fileutil::traverse {
+
+    # Incremental directory traversal.
+
+    # API
+    # create  %AUTO% basedirectory options... -> object
+    # next    filevar                         -> boolean
+    # foreach filevar script
+    # files                                   -> list (path ...)
+
+    # Options
+    # -prefilter command-prefix
+    # -filter    command-prefix
+    # -errorcmd  command-prefix
+
+    # Use cases
+    #
+    # (a) Basic incremental
+    # - Create and configure a traversal object.
+    # - Execute 'next' to retrieve one path at a time,
+    #   until the command returns False, signaling that
+    #   the iterator has exhausted the supply of paths.
+    #   (The path is stored in the named variable).
+    #
+    # The execution of 'next' can be done in a loop, or via event
+    # processing.
+
+    # (b) Basic loop
+    # - Create and configure a traversal object.
+    # - Run a script for each path, using 'foreach'.
+    #   This is a convenient standard wrapper around 'next'.
+    #
+    # The loop properly handles all possible Tcl result codes.
+
+    # (c) Non-incremental, non-looping.
+    # - Create and configure a traversal object.
+    # - Retrieve a list of all paths via 'files'.
+
+    # The -prefilter callback is executed for directories. Its result
+    # determines if the traverser recurses into the directory or not.
+    # The default is to always recurse into all directories. The call-
+    # back is invoked with a single argument, the path of the
+    # directory.
+    #
+    # The -filter callback is executed for all paths. Its result
+    # determines if the current path is a valid result, and returned
+    # by 'next'. The default is to accept all paths as valid. The
+    # callback is invoked with a single argument, the path to check.
+
+    # The -errorcmd callback is executed for all paths the traverser
+    # has trouble with. Like being unable to cd into them, get their
+    # status, etc. The default is to ignore any such problems. The
+    # callback is invoked with a two arguments, the path for which the
+    # error occured, and the error message. Errors thrown by the
+    # filter callbacks are handled through this callback too. Errors
+    # thrown by the error callback itself are not caught and ignored,
+    # but allowed to pass to the caller, usually of 'next'.
+
+    # Note: Low-level functionality, version and platform dependent is
+    # implemented in procedures, and conditioally defined for optimal
+    # use of features, etc. ...
+
+    # Note: Traversal is done in depth-first pre-order.
+
+    # Note: The options are handled only during
+    # construction. Afterward they are read-only and attempts to
+    # modify them will cause the system to throw errors.
+
+    # ### ### ### ######### ######### #########
+    ## Implementation
+
+    option -filter    -default {} -readonly 1
+    option -prefilter -default {} -readonly 1
+    option -errorcmd  -default {} -readonly 1
+
+    constructor {basedir args} {
+	set _base $basedir
+	$self configurelist $args
+	return
+    }
+
+    method files {} {
+	set files {}
+	$self foreach f {lappend files $f}
+	return $files
+    }
+
+    method foreach {fvar body} {
+	upvar 1 $fvar currentfile
+
+	# (Re-)initialize the traversal state on every call.
+	$self Init
+
+	while {[$self next currentfile]} {
+	    set code [catch {uplevel 1 $body} result]
+
+	    # decide what to do upon the return code:
+	    #
+	    #               0 - the body executed successfully
+	    #               1 - the body raised an error
+	    #               2 - the body invoked [return]
+	    #               3 - the body invoked [break]
+	    #               4 - the body invoked [continue]
+	    # everything else - return and pass on the results
+	    #
+	    switch -exact -- $code {
+		0 {}
+		1 {
+		    return -errorinfo [::control::ErrorInfoAsCaller uplevel foreach]  \
+			    -errorcode $::errorCode -code error $result
+		}
+		3 {
+		    # FRINK: nocheck
+		    return
+		}
+		4 {}
+		default {
+		    return -code $code $result
+		}
+	    }
+	}
+	return
+    }
+
+    method next {fvar} {
+	upvar 1 $fvar currentfile
+
+	# Initialize on first call.
+	if {!$_init} {
+	    $self Init
+	}
+
+	# We (still) have valid paths in the result stack, return the
+	# next one.
+
+	if {[llength $_results]} {
+	    set top      [lindex   $_results end]
+	    set _results [lreplace $_results end end]
+	    set currentfile $top
+	    return 1
+	}
+
+	# Take the next directory waiting in the processing stack and
+	# fill the result stack with all valid files and sub-
+	# directories contained in it. Extend the processing queue
+	# with all sub-directories not yet seen already (!circular
+	# symlinks) and accepted by the prefilter. We stop iterating
+	# when we either have no directories to process anymore, or
+	# the result stack contains at least one path we can return.
+
+	while {[llength $_pending]} {
+	    set top      [lindex   $_pending end]
+	    set _pending [lreplace $_pending end end]
+
+	    # Directory accessible? Skip if not.
+	    if {![ACCESS $top]} {
+		Error $top "Inacessible directory"
+		continue
+	    }
+
+	    # Expand the result stack with all files in the directory,
+	    # modulo filtering.
+
+	    foreach f [GLOBF $top] {
+		if {![Valid $f]} continue
+		lappend _results $f
+	    }
+
+	    # Expand the result stack with all sub-directories in the
+	    # directory, modulo filtering. Further expand the
+	    # processing stack with the same directories, if not seen
+	    # yet and modulo pre-filtering.
+
+	    foreach f [GLOBD $top] {
+		if {
+		    [string equal [file tail $f]  "."] ||
+		    [string equal [file tail $f] ".."]
+		} continue
+
+		if {[Valid $f]} {
+		    lappend _results $f
+		}
+
+		Enter $top $f
+		if {[Cycle $f]} continue
+
+		if {[Recurse $f]} {
+		    lappend _pending $f
+		}
+	    }
+
+	    # Stop expanding if we have paths to return.
+
+	    if {[llength $_results]} {
+		set top      [lindex   $_results end]
+		set _results [lreplace $_results end end]
+		set currentfile $top
+		return 1
+	    }
+	}
+
+	# Allow re-initialization with next call.
+
+	set _init 0
+	return 0
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Traversal state
+
+    # * Initialization flag. Checked in 'next', reset by next when no
+    #   more files are available. Set in 'Init'.
+    # * Base directory (or file) to start the traversal from.
+    # * Stack of prefiltered unknown directories waiting for
+    #   processing, i.e. expansion (TOP at end).
+    # * Stack of valid paths waiting to be returned as results.
+    # * Set of directories already visited (normalized paths), for
+    #   detection of circular symbolic links.
+
+    variable _init         0  ; # Initialization flag.
+    variable _base         {} ; # Base directory.
+    variable _pending      {} ; # Processing stack.
+    variable _results      {} ; # Result stack.
+
+    # sym link handling (to break cycles, while allowing the following of non-cycle links).
+    # Notes
+    # - path parent   tracking is lexical.
+    # - path identity tracking is based on the normalized path, i.e. the path with all
+    #   symlinks resolved.
+    # Maps
+    # - path -> parent     (easier to follow the list than doing dirname's)
+    # - path -> normalized (cache to avoid redundant calls of fullnormalize)
+    # cycle <=> A parent's normalized form (NF) is identical to the current path's NF
+
+    variable _parent -array {}
+    variable _norm   -array {}
+
+    # ### ### ### ######### ######### #########
+    ## Internal helpers.
+
+    proc Enter {parent path} {
+	#puts ___E|$path
+	upvar 1 _parent _parent _norm _norm
+	set _parent($path) $parent
+	set _norm($path)   [fileutil::fullnormalize $path]
+    }
+
+    proc Cycle {path} {
+	upvar 1 _parent _parent _norm _norm
+	set nform $_norm($path)
+	set paren $_parent($path)
+	while {$paren ne {}} {
+	    if {$_norm($paren) eq $nform} { return yes }
+	    set paren $_parent($paren)
+	}
+	return no
+    }
+
+    method Init {} {
+	array unset _parent *
+	array unset _norm   *
+
+	# Path ok as result?
+	if {[Valid $_base]} {
+	    lappend _results $_base
+	}
+
+	# Expansion allowed by prefilter?
+	if {[file isdirectory $_base] && [Recurse $_base]} {
+	    Enter {} $_base
+	    lappend _pending $_base
+	}
+
+	# System is set up now.
+	set _init 1
+	return
+    }
+
+    proc Valid {path} {
+	#puts ___V|$path
+	upvar 1 options options
+	if {![llength $options(-filter)]} {return 1}
+	set path [file normalize $path]
+	set code [catch {uplevel \#0 [linsert $options(-filter) end $path]} valid]
+	if {!$code} {return $valid}
+	Error $path $valid
+	return 0
+    }
+
+    proc Recurse {path} {
+	#puts ___X|$path
+	upvar 1 options options _norm _norm
+	if {![llength $options(-prefilter)]} {return 1}
+	set path [file normalize $path]
+	set code [catch {uplevel \#0 [linsert $options(-prefilter) end $path]} valid]
+	if {!$code} {return $valid}
+	Error $path $valid
+	return 0
+    }
+
+    proc Error {path msg} {
+	upvar 1 options options
+	if {![llength $options(-errorcmd)]} return
+	set path [file normalize $path]
+	uplevel \#0 [linsert $options(-errorcmd) end $path $msg]
+	return
+    }
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+##
+
+# The next three helper commands for the traverser depend strongly on
+# the version of Tcl, and partially on the platform.
+
+# 1. In Tcl 8.3 using -types f will return only true files, but not
+#    links to files. This changed in 8.4+ where links to files are
+#    returned as well. So for 8.3 we have to handle the links
+#    separately (-types l) and also filter on our own.
+#    Note that Windows file links are hard links which are reported by
+#    -types f, but not -types l, so we can optimize that for the two
+#    platforms.
+#
+# 2. In Tcl 8.3 we also have a crashing bug in glob (SIGABRT, "stat on
+#    a known file") when trying to perform 'glob -types {hidden f}' on
+#    a directory without e'x'ecute permissions. We code around by
+#    testing if we can cd into the directory (stat might return enough
+#    information too (mode), but possibly also not portable).
+#
+#    For Tcl 8.2 and 8.4+ glob simply delivers an empty result
+#    (-nocomplain), without crashing. For them this command is defined
+#    so that the bytecode compiler removes it from the bytecode.
+#
+#    This bug made the ACCESS helper necessary.
+#    We code around the problem by testing if we can cd into the
+#    directory (stat might return enough information too (mode), but
+#    possibly also not portable).
+
+if {[package vsatisfies [package present Tcl] 8.5]} {
+    # Tcl 8.5+.
+    # We have to check readability of "current" on our own, glob
+    # changed to error out instead of returning nothing.
+
+    proc ::fileutil::traverse::ACCESS {args} {return 1}
+
+    proc ::fileutil::traverse::GLOBF {current} {
+	if {![file readable $current] ||
+	    [BadLink $current]} {
+	    return {}
+	}
+
+	set res [lsort -unique [concat \
+		     [glob -nocomplain -directory $current -types f          -- *] \
+		     [glob -nocomplain -directory $current -types {hidden f} -- *]]]
+
+	# Look for broken links (They are reported as neither file nor directory).
+	foreach l [lsort -unique [concat \
+		       [glob -nocomplain -directory $current -types l          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden l} -- *]]] {
+	    if {[file isfile      $l]} continue
+	    if {[file isdirectory $l]} continue
+	    lappend res $l
+	}
+	return [lsort -unique $res]
+    }
+
+    proc ::fileutil::traverse::GLOBD {current} {
+	if {![file readable $current] ||
+	    [BadLink $current]} {
+	    return {}
+	}
+
+	lsort -unique [concat \
+	   [glob -nocomplain -directory $current -types d          -- *] \
+	   [glob -nocomplain -directory $current -types {hidden d} -- *]]
+    }
+
+    proc ::fileutil::traverse::BadLink {current} {
+	if {[file type $current] ne "link"} { return no }
+
+	set dst [file join [file dirname $current] [file readlink $current]]
+
+	if {![file exists   $dst] ||
+	    ![file readable $dst]} {
+	    return yes
+	}
+
+	return no
+    }
+
+} elseif {[package vsatisfies [package present Tcl] 8.4]} {
+    # Tcl 8.4+.
+    # (Ad 1) We have -directory, and -types,
+    # (Ad 2) Links are returned for -types f/d if they refer to files/dirs.
+    # (Ad 3) No bug to code around
+
+    proc ::fileutil::traverse::ACCESS {args} {return 1}
+
+    proc ::fileutil::traverse::GLOBF {current} {
+	set res [concat \
+		     [glob -nocomplain -directory $current -types f          -- *] \
+		     [glob -nocomplain -directory $current -types {hidden f} -- *]]
+
+	# Look for broken links (They are reported as neither file nor directory).
+	foreach l [concat \
+		       [glob -nocomplain -directory $current -types l          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden l} -- *] ] {
+	    if {[file isfile      $l]} continue
+	    if {[file isdirectory $l]} continue
+	    lappend res $l
+	}
+	return $res
+    }
+
+    proc ::fileutil::traverse::GLOBD {current} {
+	concat \
+	    [glob -nocomplain -directory $current -types d          -- *] \
+	    [glob -nocomplain -directory $current -types {hidden d} -- *]
+    }
+
+} else {
+    # 8.3.
+    # (Ad 1) We have -directory, and -types,
+    # (Ad 2) Links are NOT returned for -types f/d, collect separately.
+    #        No symbolic file links on Windows.
+    # (Ad 3) Bug to code around.
+
+    proc ::fileutil::traverse::ACCESS {current} {
+	if {[catch {
+	    set h [pwd] ; cd $current ; cd $h
+	}]} {return 0}
+	return 1
+    }
+
+    if {[string equal $::tcl_platform(platform) windows]} {
+	proc ::fileutil::traverse::GLOBF {current} {
+	    concat \
+		[glob -nocomplain -directory $current -types f          -- *] \
+		[glob -nocomplain -directory $current -types {hidden f} -- *]]
+	}
+    } else {
+	proc ::fileutil::traverse::GLOBF {current} {
+	    set l [concat \
+		       [glob -nocomplain -directory $current -types f          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden f} -- *]]
+
+	    foreach x [concat \
+			   [glob -nocomplain -directory $current -types l          -- *] \
+			   [glob -nocomplain -directory $current -types {hidden l} -- *]] {
+		if {[file isdirectory $x]} continue
+		# We have now accepted files, links to files, and broken links.
+		lappend l $x
+	    }
+
+	    return $l
+	}
+    }
+
+    proc ::fileutil::traverse::GLOBD {current} {
+	set l [concat \
+		   [glob -nocomplain -directory $current -types d          -- *] \
+		   [glob -nocomplain -directory $current -types {hidden d} -- *]]
+
+	foreach x [concat \
+		       [glob -nocomplain -directory $current -types l          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden l} -- *]] {
+	    if {![file isdirectory $x]} continue
+	    lappend l $x
+	}
+
+	return $l
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide fileutil::traverse 0.6
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/natsort-0.1.1.6.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/natsort-0.1.1.6.tm
index 1d91b53f..7f7c33cd 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/natsort-0.1.1.6.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/natsort-0.1.1.6.tm
@@ -5,8 +5,9 @@ package require flagfilter
 namespace import ::flagfilter::check_flags
 
 namespace eval natsort {
+    #REVIEW - determine and document the purpose of scriptdir being added to tm path
      proc scriptdir {} {
-        set possibly_linked_script [file dirname [file normalize [file join [info script] ...]]]
+        set possibly_linked_script [file dirname [file normalize [file join [info script] __dummy__]]]
         if {[file isdirectory $possibly_linked_script]} {
             return $possibly_linked_script
         } else {
@@ -14,7 +15,11 @@ namespace eval natsort {
         }
     }
     if {![interp issafe]} {
-        tcl::tm::add [scriptdir]    
+        set sdir [scriptdir]
+        #puts stderr "natsort tcl::tm::add $sdir"
+        if {$sdir ni [tcl::tm::list]} {
+            catch {tcl::tm::add $sdir}
+        }
     }
 }
 
@@ -36,6 +41,7 @@ namespace eval natsort {
         } else {
             puts stderr "|>natsort_call_err> unable to interpret 2nd argument to do_error: '$then' should be one of '$levels'  or 'exit <numericcode>'"
         }
+        flush stderr
         if {$::tcl_interactive} {
             #may not always be desirable - but assumed to be more useful not to exit despite request, to aid in debugging
             if {[string tolower $type] eq "exit"} {
@@ -43,6 +49,7 @@ namespace eval natsort {
               if {![string is digit -strict $code]} {
                 puts stderr "|>natsort_call_err> unable to interpret 2nd argument to do_error: '$then' should be: 'exit <numericcode>'"
               }
+              flush stderr
             } 
             return -code error $msg
         } else {
@@ -1422,6 +1429,9 @@ namespace eval natsort {
 
     proc called_directly_namematch {} {
         global argv0
+        if {[info script] eq ""} {
+            return 0
+        }
         #see https://wiki.tcl-lang.org/page/main+script  
         #trailing ... let's us resolve symlinks in last component of the path (could be something else like ___ but ... seems unlikely to collide with anything in the filesystem)
         if {[info exists argv0] 
@@ -1440,12 +1450,18 @@ namespace eval natsort {
     #Review issues around comparing names vs using inodes (esp with respect to samba shares)
     proc called_directly_inodematch {} {
         global argv0
+
         if {[info exists argv0]
-         && [file exists [info script]] && [file exists $argv0]} {
+         &&  [file exists [info script]] && [file exists $argv0]} {
             file stat $argv0        argv0Info
             file stat [info script] scriptInfo
-            expr {$argv0Info(dev) == $scriptInfo(dev)
-               && $argv0Info(ino) == $scriptInfo(ino)}
+            if {$argv0Info(ino) == 0 || $scriptInfo(ino) == 0 || $argv0Info(dev) == 0 || $scriptInfo(dev) == 0} {
+                #vfs?
+                #e.g //zipfs:/
+                return 0
+            }
+            return [expr {$argv0Info(dev) == $scriptInfo(dev)
+               && $argv0Info(ino) == $scriptInfo(ino)}]
         } else {
             return 0
         }
@@ -1460,6 +1476,11 @@ namespace eval natsort {
         #-- choose a policy and leave the others commented.
         #set is_called_directly $is_namematch 
         #set is_called_directly $is_inodematch 
+
+        #puts "NATSORT: called_directly_namematch - $is_namematch"
+        #puts "NATSORT: called_directly_inodematch - $is_inodematch"
+        #flush stdout
+
         set is_called_directly [expr {$is_namematch || $is_inodematch}] 
         #set is_called_directly [expr {$is_namematch && $is_inodematch}] 
         ###
@@ -1921,6 +1942,8 @@ namespace eval natsort {
             #set args [check_flags -caller test1 -defaults [list  -collate nocase -algorithm sort -topchars "\uFFFF" -winlike 0 -debug 0 -stacktrace 0 -showsplits 0] -required {all} -extras {none} -commandprocessors {{-cmd -default help} {-cmd -cmdarg1 -default "."} {-cmd -cmdarg2 -default j}} -values $::argv ]
             #set args [check_flags -caller test1 -defaults [list  -collate nocase -algorithm sort -topchars "\uFFFF" -winlike 0 -debug 0 -stacktrace 0 -showsplits 0] -required {all} -extras {none} -commandprocessors {ls {ls lsdir -default "\uFFFF"}} -values $::argv ]
 
+            puts stderr "natsort directcall exit"
+            flush stderr
             exit 0
 
         if {$::argc} {
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/overtype-1.6.5.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/overtype-1.6.5.tm
index 143794fb..f7e4c1a5 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/overtype-1.6.5.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/overtype-1.6.5.tm
@@ -163,7 +163,7 @@ proc overtype::string_columns {text} {
 tcl::namespace::eval overtype::priv {
 }
 
-#could return larger than colwidth
+#could return larger than renderwidth 
 proc _get_row_append_column {row} {
     upvar outputlines outputlines 
     set idx [expr {$row -1}]
@@ -171,14 +171,14 @@ proc _get_row_append_column {row} {
         return 1
     } else {
         upvar opt_overflow opt_overflow
-        upvar colwidth colwidth
+        upvar renderwidth renderwidth 
         set existinglen [punk::ansi::printing_length [lindex $outputlines $idx]]
         set endpos [expr {$existinglen +1}]
         if {$opt_overflow} {
             return $endpos
         } else {
-            if {$endpos > $colwidth} {
-                return $colwidth + 1
+            if {$endpos > $renderwidth} {
+                return $renderwidth + 1
             } else {
                 return $endpos
             }
@@ -213,7 +213,20 @@ tcl::namespace::eval overtype {
         if {[llength $args] < 2} {
             error {usage: ?-width <int>? ?-startcolumn <int>? ?-transparent [0|1|<char>]? ?-overflow [1|0]? ?-ellipsis [1|0]? ?-ellipsistext ...? undertext overtext}
         }
-        lassign [lrange $args end-1 end] underblock overblock
+        set optargs [lrange $args 0 end-2]
+        if {[llength $optargs] % 2 == 0} {
+            lassign [lrange $args end-1 end] underblock overblock
+            set argsflags [lrange $args 0 end-2]
+        } else {
+            set optargs [lrange $args 0 end-1]
+            if {[llength $optargs] %2 == 0} {
+                set overblock [lindex $args end]
+                set underblock ""
+                set argsflags [lrange $args 0 end-1]
+            } else {
+                error "renderspace expects opt-val pairs followed by: <underblock> <overblock> or just <overblock>"
+            }
+        }
         set opts [tcl::dict::create\
             -bias       ignored\
             -width      \uFFEF\
@@ -230,12 +243,15 @@ tcl::namespace::eval overtype {
             -exposed2 \uFFFD\
             -experimental  0\
             -looplimit  \uFFEF\
+            -crm_mode   0\
+            -reverse_mode 0\
         ]
         #-ellipsis args not used if -wrap is true
-        set argsflags [lrange $args 0 end-2]
         foreach {k v} $argsflags {
             switch -- $k {
-                -looplimit - -width - -height - -startcolumn - -bias - -wrap - -ellipsis - -ellipsistext - -ellipsiswhitespace - -overflow - -appendlines - -transparent - -exposed1 - -exposed2 - -experimental {
+                -looplimit - -width - -height - -startcolumn - -bias - -wrap - -ellipsis - -ellipsistext - -ellipsiswhitespace - -overflow - -appendlines
+                - -transparent - -exposed1 - -exposed2 - -experimental
+                - -reverse_mode - -crm_mode {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -261,6 +277,8 @@ tcl::namespace::eval overtype {
         set opt_exposed1        [tcl::dict::get $opts -exposed1] ;#widechar_exposed_left  - todo
         set opt_exposed2        [tcl::dict::get $opts -exposed2] ;#widechar_exposed_right - todo
         # -- --- --- --- --- ---
+        set opt_crm_mode        [tcl::dict::get $opts -crm_mode]
+        set opt_reverse_mode    [tcl::dict::get $opts -reverse_mode]
 
         # ----------------------------
         #  -experimental dev flag to set flags etc
@@ -295,9 +313,10 @@ tcl::namespace::eval overtype {
         # ----------------------------
 
         #modes
-        set insert_mode 0 ;#can be toggled by insert key or ansi IRM sequence ESC [ 4 h|l
-        set autowrap_mode $opt_wrap
-        set reverse_mode 0
+        set insert_mode     0 ;#can be toggled by insert key or ansi IRM sequence ESC [ 4 h|l
+        set autowrap_mode   $opt_wrap
+        set reverse_mode    $opt_reverse_mode 
+        set crm_mode        $opt_crm_mode 
         
 
         set underblock [tcl::string::map {\r\n \n} $underblock]
@@ -307,33 +326,35 @@ tcl::namespace::eval overtype {
         #set underlines [split $underblock \n]
 
         #underblock is a 'rendered' block - so width height make sense
-        #colwidth & colheight were originally named with reference to rendering into a 'column' of output e.g  a table column - before cursor row/col was implemented.
-        #The naming is now confusing. It should be something like renderwidth renderheight ?? review 
+        #only non-cursor affecting and non-width occupying ANSI codes should be present.
+        #ie SGR codes and perhaps things such as PM - although generally those should have been pushed to the application already
+        #renderwidth & renderheight were originally used with reference to rendering into a 'column' of output e.g  a table column - before cursor row/col was implemented.
         
         if {$opt_width eq "\uFFEF" || $opt_height eq "\uFFEF"} {
-            lassign [blocksize $underblock] _w colwidth _h colheight
+            lassign [blocksize $underblock] _w renderwidth _h renderheight 
             if {$opt_width ne "\uFFEF"} {
-                set colwidth $opt_width
+                set renderwidth $opt_width
             }
             if {$opt_height ne "\uFFEF"} {
-                set colheight $opt_height
+                set renderheight $opt_height
             }
         } else {
-            set colwidth $opt_width
-            set colheight $opt_height
+            set renderwidth $opt_width
+            set renderheight $opt_height
         }
 
         # -- --- --- --- 
         #REVIEW - do we need ansi resets in the underblock?
         if {$underblock eq ""} {
-            set underlines [lrepeat $colheight ""]
+            set underlines [lrepeat $renderheight ""]
         } else {
+            set underblock [textblock::join_basic -- $underblock] ;#ensure properly rendered - ansi per-line resets & replays
             set underlines [split $underblock \n]
         }
         #if {$underblock eq ""} {
         #    set blank "\x1b\[0m\x1b\[0m"
         #    #set underlines [list "\x1b\[0m\x1b\[0m"]
-        #    set underlines [lrepeat $colheight $blank]
+        #    set underlines [lrepeat $renderheight $blank]
         #} else {
         #    #lines_as_list -ansiresets 1 will do nothing if -ansiresets 1 isn't specified - REVIEW
         #    set underlines [lines_as_list -ansiresets 1 $underblock]
@@ -341,7 +362,7 @@ tcl::namespace::eval overtype {
         # -- --- --- --- 
 
         #todo - reconsider the 'line' as the natural chunking mechanism for the overlay.
-        #In practice an overlay ANSI stream can be a single line with ansi moves/restores etc - or even have no moves or newlines, just relying on wrapping at the output colwidth
+        #In practice an overlay ANSI stream can be a single line with ansi moves/restores etc - or even have no moves or newlines, just relying on wrapping at the output renderwidth 
         #In such cases - we process the whole shebazzle for the first output line - only reducing by the applied amount at the head each time, reprocessing the long tail each time.
         #(in cases where there are interline moves or cursor jumps anyway)
         #This works - but doesn't seem efficient.
@@ -409,7 +430,7 @@ tcl::namespace::eval overtype {
 
         set replay_codes_underlay [tcl::dict::create 1 ""] 
         #lappend replay_codes_overlay ""
-        set replay_codes_overlay ""
+        set replay_codes_overlay "[punk::ansi::a]"
         set unapplied ""
         set cursor_saved_position [tcl::dict::create] 
         set cursor_saved_attributes ""
@@ -452,14 +473,25 @@ tcl::namespace::eval overtype {
             }
             #review insert_mode. As an 'overtype' function whose main function is not interactive keystrokes - insert is secondary - 
             #but even if we didn't want it as an option to the function call - to process ansi adequately we need to support IRM (insertion-replacement mode) ESC [ 4 h|l
-            set LASTCALL [list -info 1 -insert_mode $insert_mode -autowrap_mode $autowrap_mode -transparent $opt_transparent -width $colwidth  -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -cursor_column $col -cursor_row $row $undertext $overtext]
+            set LASTCALL [list      -info 1\
+                                    -insert_mode $insert_mode\
+                                    -crm_mode $crm_mode\
+                                    -autowrap_mode $autowrap_mode\
+                                    -reverse_mode $reverse_mode\
+                                    -transparent $opt_transparent\
+                                    -width $renderwidth\
+                                    -exposed1 $opt_exposed1\
+                                    -exposed2 $opt_exposed2\
+                                    -overflow $opt_overflow -cursor_column $col -cursor_row $row $undertext $overtext]
             set rinfo [renderline   -experimental $opt_experimental\
                                     -info 1\
+                                    -crm_mode $crm_mode\
                                     -insert_mode $insert_mode\
-                                    -cursor_restore_attributes $cursor_saved_attributes\
                                     -autowrap_mode $autowrap_mode\
+                                    -reverse_mode  $reverse_mode\
+                                    -cursor_restore_attributes $cursor_saved_attributes\
                                     -transparent $opt_transparent\
-                                    -width $colwidth\
+                                    -width $renderwidth\
                                     -exposed1 $opt_exposed1\
                                     -exposed2 $opt_exposed2\
                                     -overflow $opt_overflow\
@@ -471,7 +503,10 @@ tcl::namespace::eval overtype {
             set instruction                 [tcl::dict::get $rinfo instruction]
             set insert_mode                 [tcl::dict::get $rinfo insert_mode]
             set autowrap_mode               [tcl::dict::get $rinfo autowrap_mode] ;#
-            #set reverse_mode                [tcl::dict::get $rinfo reverse_mode];#how to support in rendered linelist? we need to examine all pt/code blocks and flip each SGR stack?
+            set reverse_mode                [tcl::dict::get $rinfo reverse_mode]
+            #how to support reverse_mode in rendered linelist? we need to examine all pt/code blocks and flip each SGR stack?
+            # - review - the answer is probably that we don't need to - it is set/reset only during application of overtext
+            set crm_mode                    [tcl::dict::get $rinfo crm_mode]
             set rendered                    [tcl::dict::get $rinfo result]
             set overflow_right              [tcl::dict::get $rinfo overflow_right]
             set overflow_right_column       [tcl::dict::get $rinfo overflow_right_column]
@@ -486,7 +521,36 @@ tcl::namespace::eval overtype {
             set insert_lines_below          [tcl::dict::get $rinfo insert_lines_below]
             tcl::dict::set replay_codes_underlay [expr {$renderedrow+1}] [tcl::dict::get $rinfo replay_codes_underlay]
             #lset replay_codes_overlay [expr $overidx+1] [tcl::dict::get $rinfo replay_codes_overlay]
-            set replay_codes_overlay        [tcl::dict::get $rinfo replay_codes_overlay]
+            set replay_codes_overlay    [tcl::dict::get $rinfo replay_codes_overlay]
+            if {0 && $reverse_mode} {
+                puts stderr "---->[ansistring VIEW $replay_codes_overlay] rendered: $rendered"
+                #review
+                #JMN3
+                set existing_reverse_state 0 
+                #split_codes_single is single esc sequence - but could have multiple sgr codes within one esc sequence
+                #e.g \x1b\[0;31;7m  has a reset,colour red and reverse
+                set codeinfo [punk::ansi::codetype::sgr_merge [list $replay_codes_overlay] -info 1]
+                set codestate_reverse [dict get $codeinfo codestate reverse]
+                switch -- $codestate_reverse {
+                    7 {
+                        set existing_reverse_state 1
+                    }
+                    27 {
+                        set existing_reverse_state 0
+                    }
+                    "" {
+                    }
+                }
+                if {$existing_reverse_state == 0} {
+                    set rflip [a+ reverse]
+                } else {
+                    #reverse of reverse
+                    set rflip [a+ noreverse]
+                }
+                #note that mergeresult can have multiple esc (due to unmergeables or non sgr codes)
+                set replay_codes_overlay [punk::ansi::codetype::sgr_merge [list [dict get $codeinfo mergeresult] $rflip]]
+                puts stderr "---->[ansistring VIEW $replay_codes_overlay] rendered: $rendered"
+            }
 
 
 
@@ -520,7 +584,7 @@ tcl::namespace::eval overtype {
                             incr row
                             if {$data_mode} {
                                 set col [_get_row_append_column $row] 
-                                if {$col > $colwidth} {
+                                if {$col > $renderwidth} {
 
                                 }
                             } else {
@@ -563,10 +627,10 @@ tcl::namespace::eval overtype {
                             #we need renderline to return the number of the maximum column filled (or min if we ever do r-to-l)
                             set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                             set lastdatacol [punk::ansi::printing_length $existingdata]
-                            if {$lastdatacol < $colwidth} {
+                            if {$lastdatacol < $renderwidth} {
                                 set col [expr {$lastdatacol+1}]
                             } else {
-                                set col $colwidth 
+                                set col $renderwidth 
                             }
                         }
                         
@@ -601,10 +665,10 @@ tcl::namespace::eval overtype {
                             }
                             set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                             set lastdatacol [punk::ansi::printing_length $existingdata]
-                            if {$lastdatacol < $colwidth} {
+                            if {$lastdatacol < $renderwidth} {
                                 set col [expr {$lastdatacol+1}]
                             } else {
-                                set col $colwidth 
+                                set col $renderwidth 
                             }
 
                         }
@@ -640,9 +704,9 @@ tcl::namespace::eval overtype {
 
                             puts stdout ">>>[a+ red bold]overflow_right during restore_cursor[a]"
 
-                            set sub_info [overtype::renderline -info 1 -width $colwidth -insert_mode $insert_mode -autowrap_mode $autowrap_mode  -overflow [tcl::dict::get $opts -overflow] "" $overflow_right]
+                            set sub_info [overtype::renderline -info 1 -width $renderwidth -insert_mode $insert_mode -autowrap_mode $autowrap_mode  -overflow [tcl::dict::get $opts -overflow] "" $overflow_right]
                             set foldline [tcl::dict::get $sub_info result]
-                            set insert_mode [tcl::dict::get $sub_info insert_mode] ;#probably not needed.. 
+                            set insert_mode [tcl::dict::get $sub_info insert_mode] ;#probably not needed..? 
                             set autowrap_mode [tcl::dict::get $sub_info autowrap_mode] ;#nor this..
                             linsert outputlines $renderedrow $foldline
                             #review - row & col set by restore - but not if there was no save..
@@ -740,7 +804,7 @@ tcl::namespace::eval overtype {
                             }
                     }
                     lf_overflow {
-                            #linefeed after colwidth e.g at column 81 for an 80 col width
+                            #linefeed after renderwidth e.g at column 81 for an 80 col width
                             #we may also have other control sequences that came after col 80 e.g cursor save
 
                             if 0 {
@@ -833,10 +897,10 @@ tcl::namespace::eval overtype {
                             } else {
                                 set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                                 set lastdatacol [punk::ansi::printing_length $existingdata]
-                                if {$lastdatacol < $colwidth} {
+                                if {$lastdatacol < $renderwidth} {
                                     set col [expr {$lastdatacol+1}]
                                 } else {
-                                    set col $colwidth 
+                                    set col $renderwidth 
                                 }
                             }
                         }
@@ -845,12 +909,12 @@ tcl::namespace::eval overtype {
                         #doesn't seem to be used by fruit.ans testfile
                         #used by dzds.ans
                         #note that cursor_forward may move deep into the next line - or even span multiple lines !TODO
-                        set c $colwidth 
+                        set c $renderwidth 
                         set r $post_render_row
-                        if {$post_render_col > $colwidth} {
+                        if {$post_render_col > $renderwidth} {
                             set i $c
                             while {$i <= $post_render_col} {
-                                if {$c == $colwidth+1} {
+                                if {$c == $renderwidth+1} {
                                     incr r
                                     if {$opt_appendlines} {
                                         if {$r < [llength $outputlines]} {
@@ -874,7 +938,7 @@ tcl::namespace::eval overtype {
                         set col $c
                     }
                     wrapmovebackward {
-                        set c $colwidth
+                        set c $renderwidth
                         set r $post_render_row
                         if {$post_render_col < 1} {
                             set c 1 
@@ -883,7 +947,7 @@ tcl::namespace::eval overtype {
                                 if {$c == 0} {
                                     if {$r > 1} {
                                         incr r -1
-                                        set c $colwidth
+                                        set c $renderwidth
                                     } else {
                                         #leave r at 1 set c 1
                                         #testfile besthpav.ans first line top left border alignment
@@ -941,7 +1005,7 @@ tcl::namespace::eval overtype {
                         #2nd half of grapheme would overflow - treggering grapheme is returned in unapplied. There may also be overflow_right from earlier inserts
                         #todo - consider various options .. re-render a single trailing space or placeholder on same output line, etc
                         if {$autowrap_mode} {
-                            if {$colwidth < 2} {
+                            if {$renderwidth < 2} {
                                 #edge case of rendering to a single column output - any 2w char will just cause a loop if we don't substitute with something, or drop the character
                                 set idx 0
                                 set triggering_grapheme_index -1
@@ -960,7 +1024,7 @@ tcl::namespace::eval overtype {
                         } else {
                             set overflow_handled 1
                             #handled by dropping entire overflow if any  
-                            if {$colwidth < 2} {
+                            if {$renderwidth < 2} {
                                 set idx 0
                                 set triggering_grapheme_index -1
                                 foreach u $unapplied_list {
@@ -1141,12 +1205,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        #set renderwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
-        #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {$colwidth - $overblock_width}]
+        set under_exposed_max [expr {$renderwidth - $overblock_width}]
         if {$under_exposed_max > 0} {
             #background block is wider
             if {$under_exposed_max % 2 == 0} {
@@ -1176,14 +1239,14 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 set undertext "$undertext[string repeat { } $udiff]"
             }
             set undertext [tcl::string::cat $replay_codes_underlay $undertext]
             set overtext  [tcl::string::cat $replay_codes_overlay $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             #review - right-to-left langs should elide on left! - extra option required
 
             if {$overflowlength > 0} {
@@ -1196,8 +1259,8 @@ tcl::namespace::eval overtype {
 
                 #overlay line data is wider - trim if overflow not specified in opts - and overtype an ellipsis at right if it was specified
                 if {![tcl::dict::get $opts -overflow]} {
-                    #lappend outputlines [tcl::string::range $overtext 0 [expr {$colwidth - 1}]]
-                    #set overtext [tcl::string::range $overtext 0 $colwidth-1 ]
+                    #lappend outputlines [tcl::string::range $overtext 0 [expr {$renderwidth - 1}]]
+                    #set overtext [tcl::string::range $overtext 0 $renderwidth-1 ]
                     if {$opt_ellipsis} {
                         set show_ellipsis 1
                         if {!$opt_ellipsiswhitespace} {
@@ -1286,12 +1349,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
         #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {max(0,$colwidth - $overblock_width)}]
+        set under_exposed_max [expr {max(0,$renderwidth - $overblock_width)}]
         set left_exposed $under_exposed_max 
 
 
@@ -1307,8 +1369,8 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 #puts xxx
                 append undertext [string repeat { } $udiff]
             }
@@ -1336,10 +1398,17 @@ tcl::namespace::eval overtype {
             set undertext [tcl::string::cat $replay_codes_underlay $undertext]
             set overtext [tcl::string::cat $replay_codes_overlay $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             if {$overflowlength > 0} {	
                 #raw overtext wider than undertext column
-                set rinfo [renderline -info 1 -insert_mode 0 -transparent $opt_transparent -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -startcolumn [expr {1 + $startoffset}] $undertext $overtext]
+                set rinfo [renderline\
+                         -info 1\
+                         -insert_mode 0\
+                         -transparent $opt_transparent\
+                         -exposed1 $opt_exposed1 -exposed2 $opt_exposed2\
+                         -overflow $opt_overflow\
+                         -startcolumn [expr {1 + $startoffset}]\
+                         $undertext $overtext]
                 set replay_codes          [tcl::dict::get $rinfo replay_codes]
                 set rendered [tcl::dict::get $rinfo result]
                 if {!$opt_overflow} {
@@ -1433,12 +1502,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
         #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {max(0,$colwidth - $overblock_width)}]
+        set under_exposed_max [expr {max(0,$renderwidth - $overblock_width)}]
 
         switch -- $opt_blockalign {
             left {
@@ -1484,8 +1552,8 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 #puts xxx
                 append undertext [string repeat { } $udiff]
             }
@@ -1513,7 +1581,7 @@ tcl::namespace::eval overtype {
             set undertext   [tcl::string::cat $replay_codes_underlay    $undertext]
             set overtext    [tcl::string::cat $replay_codes_overlay     $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             if {$overflowlength > 0} {	
                 #raw overtext wider than undertext column
                 set rinfo [renderline -info 1 -insert_mode 0 -transparent $opt_transparent -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -startcolumn [expr {1 + $startoffset}] $undertext $overtext]
@@ -1566,6 +1634,7 @@ tcl::namespace::eval overtype {
                 #lappend outputlines [renderline -insert_mode 0 -transparent $opt_transparent -startcolumn [expr {$left_exposed + 1}] $undertext $overtext]
                 #Note - we still need overflow here - as although the overtext is short - it may oveflow due to the startoffset
                 set rinfo [renderline -info 1  -insert_mode 0 -transparent $opt_transparent -overflow $opt_overflow -startcolumn [expr {$left_exposed + 1 + $startoffset}] $undertext $overtext]
+                #puts stderr "--> [ansistring VIEW -lf 1 -nul 1 $rinfo] <--"
                 set overflow_right  [tcl::dict::get $rinfo overflow_right]
                 set unapplied       [tcl::dict::get $rinfo unapplied]
                 lappend outputlines [tcl::dict::get $rinfo result]
@@ -1629,6 +1698,7 @@ tcl::namespace::eval overtype {
             -cursor_column 1\
             -cursor_row    ""\
             -insert_mode   1\
+            -crm_mode      0\
             -autowrap_mode 1\
             -reverse_mode  0\
             -info          0\
@@ -1649,7 +1719,9 @@ tcl::namespace::eval overtype {
         set argsflags [lrange $args 0 end-2]
         tcl::dict::for {k v} $argsflags {
             switch -- $k {
-                -experimental - -cp437 - -width - -overflow - -transparent - -startcolumn - -cursor_column - -cursor_row - -insert_mode - -autowrap_mode - -reverse_mode - -info - -exposed1 - -exposed2 - -cursor_restore_attributes {
+                -experimental - -cp437 - -width - -overflow - -transparent - -startcolumn - -cursor_column - -cursor_row
+                - -crm_mode - -insert_mode - -autowrap_mode - -reverse_mode
+                - -info - -exposed1 - -exposed2 - -cursor_restore_attributes {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -1676,6 +1748,7 @@ tcl::namespace::eval overtype {
         # -- --- --- --- --- --- --- --- --- --- --- ---
         set opt_autowrap_mode       [tcl::dict::get $opts -autowrap_mode] ;#DECAWM - char or movement can go beyond leftmost/rightmost col to prev/next line
         set opt_reverse_mode        [tcl::dict::get $opts -reverse_mode]  ;#DECSNM
+        set opt_crm_mode            [tcl::dict::get $opts -crm_mode];# CRM - show control character mode
         # -- --- --- --- --- --- --- --- --- --- --- ---
         set temp_cursor_saved       [tcl::dict::get $opts -cursor_restore_attributes]
 
@@ -1721,6 +1794,10 @@ tcl::namespace::eval overtype {
             set cursor_row $opt_row_context
         }
 
+        set insert_mode $opt_insert_mode ;#default 1
+        set autowrap_mode $opt_autowrap_mode ;#default 1
+        set crm_mode $opt_crm_mode ;#default 0 (Show Control Character mode)
+        set reverse_mode $opt_reverse_mode
 
         #-----
         #
@@ -1768,6 +1845,7 @@ tcl::namespace::eval overtype {
         }
         set understacks [list]
         set understacks_gx [list]
+        set pm_list [list]
 
         set i_u -1  ;#underlay may legitimately be empty
         set undercols [list] 
@@ -1834,6 +1912,7 @@ tcl::namespace::eval overtype {
             #underlay should already have been rendered and not have non-sgr codes - but let's retain the check for them and not stack them if other codes are here
 
             #only stack SGR (graphics rendition) codes - not title sets, cursor moves etc 
+            #keep any remaining PMs in place
             if {$code ne ""} {
                 set c1c2 [tcl::string::range $code 0 1]
 
@@ -1841,6 +1920,8 @@ tcl::namespace::eval overtype {
                     \x1b\[          7CSI\
                     \x9b            8CSI\
                     \x1b\(          7GFX\
+                    \x1b^           7PMX\
+                    \x1bX           7SOS\
                 ] $c1c2] 0 3];# leadernorm is 1st 2 chars mapped to normalised indicator - or is original 2 chars
 
                 switch -- $leadernorm {
@@ -1875,6 +1956,26 @@ tcl::namespace::eval overtype {
                             }
                         }
                     }
+                    7PMX - 7SOS {
+                        #we can have PMs or SOS (start of string) in the underlay - though mostly the PMs should have been processed..
+                        #attach the PM/SOS (entire ANSI sequence) to the previous grapheme! 
+                        #It should not affect the size - but terminal display may get thrown out if terminal doesn't support them.
+
+                        #note that there may in theory already be ANSI stored - we don't assume it was a pure grapheme string
+                        set graphemeplus [lindex $undercols end]
+                        if {$graphemeplus ne "\0"} {
+                            append graphemeplus $code
+                        } else {
+                            set graphemeplus $code
+                        }
+                        lset undercols end $graphemeplus
+                        #The grapheme_width_cached function will be called on this later - and doesn't account for ansi.
+                        #we need to manually cache the item with it's proper width 
+                        variable grapheme_widths
+                        #stripped and plus version  keys pointing to same length
+                        dict set grapheme_widths $graphemeplus [grapheme_width_cached [::punk::ansi::ansistrip $graphemeplus]]
+
+                    }
                     default {
 
                     }
@@ -1937,9 +2038,9 @@ tcl::namespace::eval overtype {
 
         }
         if {$opt_width ne "\uFFEF"} {
-            set colwidth $opt_width
+            set renderwidth $opt_width
         } else {
-            set colwidth [llength $undercols]
+            set renderwidth [llength $undercols]
         }
 
 
@@ -2017,12 +2118,30 @@ tcl::namespace::eval overtype {
             }
             append pt_overchars $pt
             #will get empty pt between adjacent codes
-            foreach grapheme [punk::char::grapheme_split $pt] {
-                lappend overstacks $o_codestack
-                lappend overstacks_gx $o_gxstack
-                incr i_o 
-                lappend overlay_grapheme_control_list [list g $grapheme]
-                lappend overlay_grapheme_control_stacks $o_codestack
+            if {!$crm_mode} {
+                foreach grapheme [punk::char::grapheme_split $pt] {
+                    lappend overstacks $o_codestack
+                    lappend overstacks_gx $o_gxstack
+                    incr i_o 
+                    lappend overlay_grapheme_control_list [list g $grapheme]
+                    lappend overlay_grapheme_control_stacks $o_codestack
+                }
+            } else {
+                foreach grapheme_original [punk::char::grapheme_split $pt] {
+                    set pt_crm [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $grapheme_original]
+                    foreach grapheme [punk::char::grapheme_split $pt_crm] {
+                        if {$grapheme eq "\n"} {
+                            lappend overlay_grapheme_control_stacks $o_codestack
+                            lappend overlay_grapheme_control_list [list crmcontrol "\x1b\[00001E"]
+                        } else {
+                            lappend overstacks $o_codestack
+                            lappend overstacks_gx $o_gxstack
+                            incr i_o 
+                            lappend overlay_grapheme_control_list [list g $grapheme]
+                            lappend overlay_grapheme_control_stacks $o_codestack
+                        }
+                    }
+                }
             }
 
             #only stack SGR (graphics rendition) codes - not title sets, cursor moves etc 
@@ -2030,40 +2149,91 @@ tcl::namespace::eval overtype {
             # that pure resets are fairly common - more so than leading resets with other info
             # that non-sgr codes are not that common, so ok to check for resets before verifying it is actually SGR at all.
             if {$code ne ""} {
-                lappend overlay_grapheme_control_stacks $o_codestack
-                #there will always be an empty code at end due to foreach on 2 vars with odd-sized list ending with pt (overmap coming from perlish split) 
-                if {[punk::ansi::codetype::is_sgr_reset $code]} {
-                    set o_codestack [list "\x1b\[m"]  ;#reset better than empty list - fixes some ansi art issues
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
-                    set o_codestack [list $code]
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[priv::is_sgr $code]} {
-                    #basic simplification first - remove straight dupes
-                    set dup_posns [lsearch -all -exact $o_codestack $code] ;#must be -exact because of square-bracket glob chars
-                    set o_codestack [lremove $o_codestack {*}$dup_posns]
-                    lappend o_codestack $code
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[regexp {\x1b7|\x1b\[s} $code]} {
-                    #experiment
-                    #cursor_save - for the replays review.
-                    #jmn
-                    #set temp_cursor_saved [punk::ansi::codetype::sgr_merge_list {*}$o_codestack]
-                    lappend overlay_grapheme_control_list [list other $code]
-                } elseif {[regexp {\x1b8|\x1b\[u} $code]} {
-                    #experiment
-                    #cursor_restore - for the replays
-                    set o_codestack [list $temp_cursor_saved]    
-                    lappend overlay_grapheme_control_list [list other $code]
+                #we need to immediately set crm_mode here if \x1b\[3h received
+                if {$code eq "\x1b\[3h"} {
+                    set crm_mode 1
+                } elseif {$code eq "\x1b\[3l"} {
+                    set crm_mode 0
+                }
+                #else crm_mode could be set either way from options
+                if {$crm_mode && $code ne "\x1b\[00001E"} {
+                    #treat the code as type 'g' like above   - only allow through codes to reset mode REVIEW for now just \x1b\[3l ? 
+                    #we need to somehow convert further \n in the graphical rep to an instruction for newline that will bypass further crm_mode processing or we would loop.
+                    set code_as_pt [ansistring VIEW -nul 1 -lf 1 -vt 1 -ff 1 $code]
+                    #split using standard split for first foreach loop - grapheme based split when processing 2nd foreach loop
+                    set chars [split $code_as_pt ""]
+                    set codeparts [list] ;#list of 2-el lists each element {crmcontrol <ansi>} or {g <text>}
+                    foreach c $chars {
+                        if {$c eq "\n"} {
+                            #use CNL (cursor next line)  \x1b\[00001E  ;#leading zeroes ok for this processor - used as debugging aid to distinguish 
+                            lappend codeparts [list crmcontrol "\x1b\[00001E"]
+                        } else {
+                            if {[llength $codeparts] > 0 && [lindex $codeparts end 0] eq "g"} {
+                                set existing [lindex $codeparts end 1]
+                                lset codeparts end [list g [string cat $existing $c]]
+                            } else {
+                                lappend codeparts [list g $c]
+                            }
+                        }
+                    }
+
+                    set partidx 0
+                    foreach record $codeparts {
+                        lassign $record rtype rval
+                        switch -exact -- $rtype {
+                            g {
+                                append pt_overchars $rval 
+                                foreach grapheme [punk::char::grapheme_split $rval] {
+                                    lappend overstacks $o_codestack
+                                    lappend overstacks_gx $o_gxstack
+                                    incr i_o 
+                                    lappend overlay_grapheme_control_list [list g $grapheme]
+                                    lappend overlay_grapheme_control_stacks $o_codestack
+                                }
+                            }
+                            crmcontrol {
+                                #leave o_codestack
+                                lappend overlay_grapheme_control_stacks $o_codestack
+                                lappend overlay_grapheme_control_list [list crmcontrol $rval]
+                            }
+                        }
+                    }
                 } else {
-                    if {[punk::ansi::codetype::is_gx_open $code]} {
-                        set o_gxstack [list "gx0_on"]
-                        lappend overlay_grapheme_control_list [list gx0 gx0_on] ;#don't store code - will complicate debugging if we spit it out and jump character sets
-                    } elseif {[punk::ansi::codetype::is_gx_close $code]} {
-                        set o_gxstack [list]
-                        lappend overlay_grapheme_control_list [list gx0 gx0_off] ;#don't store code - will complicate debugging if we spit it out and jump character sets
-                    } else {
+                    lappend overlay_grapheme_control_stacks $o_codestack
+                    #there will always be an empty code at end due to foreach on 2 vars with odd-sized list ending with pt (overmap coming from perlish split) 
+                    if {[punk::ansi::codetype::is_sgr_reset $code]} {
+                        set o_codestack [list "\x1b\[m"]  ;#reset better than empty list - fixes some ansi art issues
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
+                        set o_codestack [list $code]
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[priv::is_sgr $code]} {
+                        #basic simplification first - remove straight dupes
+                        set dup_posns [lsearch -all -exact $o_codestack $code] ;#must be -exact because of square-bracket glob chars
+                        set o_codestack [lremove $o_codestack {*}$dup_posns]
+                        lappend o_codestack $code
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[regexp {\x1b7|\x1b\[s} $code]} {
+                        #experiment
+                        #cursor_save - for the replays review.
+                        #jmn
+                        #set temp_cursor_saved [punk::ansi::codetype::sgr_merge_list {*}$o_codestack]
+                        lappend overlay_grapheme_control_list [list other $code]
+                    } elseif {[regexp {\x1b8|\x1b\[u} $code]} {
+                        #experiment
+                        #cursor_restore - for the replays
+                        set o_codestack [list $temp_cursor_saved]    
                         lappend overlay_grapheme_control_list [list other $code]
+                    } else {
+                        if {[punk::ansi::codetype::is_gx_open $code]} {
+                            set o_gxstack [list "gx0_on"]
+                            lappend overlay_grapheme_control_list [list gx0 gx0_on] ;#don't store code - will complicate debugging if we spit it out and jump character sets
+                        } elseif {[punk::ansi::codetype::is_gx_close $code]} {
+                            set o_gxstack [list]
+                            lappend overlay_grapheme_control_list [list gx0 gx0_off] ;#don't store code - will complicate debugging if we spit it out and jump character sets
+                        } else {
+                            lappend overlay_grapheme_control_list [list other $code]
+                        }
                     }
                 }
             }
@@ -2135,9 +2305,6 @@ tcl::namespace::eval overtype {
         #movements only occur within the overlay range.
         #an underlay is however not necessary.. e.g
         #renderline -overflow 1 "" data 
-        #foreach {pt code} $overmap {}
-        set insert_mode $opt_insert_mode ;#default 1
-        set autowrap_mode $opt_autowrap_mode ;#default 1
 
         #set re_mode        {\x1b\[\?([0-9]*)(h|l)}   ;#e.g DECAWM 
         #set re_col_move    {\x1b\[([0-9]*)(C|D|G)$}
@@ -2163,13 +2330,28 @@ tcl::namespace::eval overtype {
             switch -- $type {
                 g { 
                     set ch $item 
+                    #crm_mode affects both graphic and control 
+                    if {$crm_mode} {
+                        set chars [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $ch]
+                        set chars [string map [list \n "\x1b\[00001E"] $chars]
+                        if {[llength [split $chars ""]] > 1} { 
+                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                            #prefix the unapplied controls with the string version of this control
+                            set unapplied_list [linsert $unapplied_list 0 {*}[split $chars ""]]
+                            set unapplied [join $unapplied_list ""]
+                            #incr idx_over
+                            break
+                        } else {
+                            set ch $chars
+                        }
+                    }
                     incr idx_over; #idx_over (until unapplied reached anyway) is per *grapheme* in the overlay - not per col. 
                     if {($idx < ($opt_colstart -1))} {
                         incr idx [grapheme_width_cached $ch]
                         continue
                     }
                     #set within_undercols [expr {$idx <= [llength $undercols]-1}] ;#within our active data width 
-                    set within_undercols [expr {$idx <= $colwidth-1}]
+                    set within_undercols [expr {$idx <= $renderwidth-1}]
 
                     #https://www.enigma.com/resources/blog/the-secret-world-of-newline-characters
                     #\x85 NEL in the c1 control set is treated by some terminal emulators (e.g Hyper) as a newline,
@@ -2311,6 +2493,7 @@ tcl::namespace::eval overtype {
                                 } else {
                                     #todo - punk::char::char_width
                                     set g [lindex $outcols $idx]
+                                    #JMN
                                     set uwidth [grapheme_width_cached $g]
                                     if {[lindex $outcols $idx] eq ""} {
                                         #2nd col of 2-wide char in underlay 
@@ -2485,13 +2668,29 @@ tcl::namespace::eval overtype {
 
 
                 }
-                other {
+                other - crmcontrol {
+                    if {$crm_mode && $type ne "crmcontrol" && $item ne "\x1b\[00001E"} {
+                        if {$item eq "\x1b\[3l"} {
+                            set crm_mode 0
+                        } else {
+                            #When our initial overlay split was done - we weren't in crm_mode - so there are codes that weren't mapped to unicode control character representations
+                            #set within_undercols [expr {$idx <= $renderwidth-1}]
+                            #set chars [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $item]
+                            set chars [ansistring VIEW -nul 1 -lf 1 -vt 1 -ff 1 $item]
+                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                            #prefix the unapplied controls with the string version of this control
+                            set unapplied_list [linsert $unapplied_list 0 {*}[split $chars ""]]
+                            set unapplied [join $unapplied_list ""]
+                            
+                            break
+                        }
+                    }
+
                     #todo - consider CSI s DECSLRM vs ansi.sys \x1b\[s  - we need \x1b\[s for oldschool ansi art - but may have to enable only for that.
-                    #we should probably therefore reverse this mapping so that x1b7 x1b8 are the primary codes for save/restore
+                    #we should possibly therefore reverse this mapping so that x1b7 x1b8 are the primary codes for save/restore?
                     set code [tcl::string::map [list \x1b7 \x1b\[s \x1b8 \x1b\[u ] $item]
                     #since this element isn't a grapheme - advance idx_over to next grapheme overlay when about to fill 'unapplied'
 
-                    set matchinfo [list]
 
                     #remap of DEC cursor_save/cursor_restore from ESC sequence to equivalent CSI
                     #probably not ideal - consider putting cursor_save/cursor_restore in functions so they can be called from the appropriate switch branch instead of using this mapping
@@ -2501,7 +2700,7 @@ tcl::namespace::eval overtype {
                     set c1c2c3 [tcl::string::range $code 0 2]
                     #set re_ST_open {(?:\033P|\u0090|\033X|\u0098|\033\^|\u009e|\033_|\u009f)} 
                     #tcl 8.7 - faster to use inline list than to store it in a local var outside of loop. 
-                    #(surprising - but presumably )
+                    #(somewhat surprising)
                     set leadernorm [tcl::string::range [tcl::string::map [list\
                         \x1b\[<     1006\
                         \x1b\[      7CSI\
@@ -2509,7 +2708,7 @@ tcl::namespace::eval overtype {
                         \x1b\]      7OSC\
                         \x9d        8OSC\
                         \x1b        7ESC\
-                        ] $c1c2c3] 0 3] ;#leadernorm is 1st 2 chars mapped to 4char normalised indicator - or is original 2 chars 
+                        ] $c1c2c3] 0 3] ;#leadernorm is 1st 1,2 or 3 chars mapped to 4char normalised indicator - or is original first chars (1,2 or 3 len) 
 
                     #we leave the tail of the code unmapped for now 
                     switch -- $leadernorm {
@@ -2528,7 +2727,10 @@ tcl::namespace::eval overtype {
                             set codenorm [tcl::string::cat $leadernorm [tcl::string::range $code 1 end]]
                         }
                         default {
+                            puts stderr "Sequence detected as ANSI, but not handled in leadernorm switch. code: [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
                             #we haven't made a mapping for this
+                            #could in theory be 1,2 or 3 in len 
+                            #although we shouldn't be getting here if the regexp for ansi codes is kept in sync with our switch branches
                             set codenorm $code
                         }
                     }
@@ -2551,44 +2753,44 @@ tcl::namespace::eval overtype {
                         {7CSI} - {8CSI} {
                             set param [tcl::string::range $codenorm 4 end-1]
                             #puts stdout "--> CSI [tcl::string::index $leadernorm 0] bit param:$param"
-                            switch -- [tcl::string::index $codenorm end] {
-                                D {
-                                    #Col move
-                                    #puts stdout "<-back"
-                                    #cursor back
-                                    #left-arrow/move-back when ltr mode
+                            set code_end [tcl::string::index $codenorm end] ;#used for e.g h|l set/unset mode
+                            switch -exact -- $code_end {
+                                A {
+                                    #Row move - up
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
                                     set num $param
                                     if {$num eq ""} {set num 1}
+                                    incr cursor_row -$num
 
-                                    set version 2
-                                    if {$version eq "2"} {
-                                        #todo - startcolumn offset!
-                                        if {$cursor_column - $num >= 1} {
-                                            incr idx -$num
-                                            incr cursor_column -$num
-                                        } else {
-                                            if {!$autowrap_mode} {
-                                            set cursor_column 1 
-                                            set idx 0
-                                            } else {
-                                                set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                                incr cursor_column -$num
-                                                priv::render_unapplied $overlay_grapheme_control_list $gci
-                                                set instruction wrapmovebackward
-                                                break
-                                            }
-                                        }
-                                    } else {
-                                        incr idx -$num
-                                        incr cursor_column -$num
-                                        if {$idx < $opt_colstart-1} {
-                                            #wrap to previous line and position cursor at end of data
-                                            set idx [expr {$opt_colstart-1}]
-                                            set cursor_column $opt_colstart
-                                        }
+                                    if {$cursor_row < 1} {
+                                        set cursor_row  1
                                     }
+
+                                    #ensure rest of *overlay* is emitted to remainder
+                                    incr idx_over
+                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                    set instruction up
+                                    #retain cursor_column
+                                    break 
+                                }
+                                B {
+                                    #CUD - Cursor Down
+                                    #Row move - down
+                                    set num $param
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                    #move down
+                                    if {$num eq ""} {set num 1}
+                                    incr cursor_row $num
+
+
+                                    incr idx_over ;#idx_over hasn't encountered a grapheme and hasn't advanced yet 
+                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                    set instruction down
+                                    #retain cursor_column
+                                    break 
                                 }
                                 C {
+                                    #CUF - Cursor Forward
                                     #Col move
                                     #puts stdout "->forward"
                                     #todo - consider right-to-left cursor mode (e.g Hebrew).. some day.
@@ -2692,80 +2894,215 @@ tcl::namespace::eval overtype {
                                         }
                                     }
                                 } 
-                                G {
+                                D {
                                     #Col move
-                                    #move absolute column
-                                    #adjust to colstart - as column 1 is within overlay
-                                    #???
-                                    set idx [expr {$param + $opt_colstart -1}] 
-                                    set cursor_column $param
-                                    error "renderline absolute col move ESC G unimplemented"
-                                }
-                                A {
-                                    #Row move - up
-                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                    #puts stdout "<-back"
+                                    #cursor back
+                                    #left-arrow/move-back when ltr mode
                                     set num $param
                                     if {$num eq ""} {set num 1}
-                                    incr cursor_row -$num
 
-                                    if {$cursor_row < 1} {
-                                        set cursor_row  1
+                                    set version 2
+                                    if {$version eq "2"} {
+                                        #todo - startcolumn offset!
+                                        if {$cursor_column - $num >= 1} {
+                                            incr idx -$num
+                                            incr cursor_column -$num
+                                        } else {
+                                            if {!$autowrap_mode} {
+                                            set cursor_column 1 
+                                            set idx 0
+                                            } else {
+                                                set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                                incr cursor_column -$num
+                                                priv::render_unapplied $overlay_grapheme_control_list $gci
+                                                set instruction wrapmovebackward
+                                                break
+                                            }
+                                        }
+                                    } else {
+                                        incr idx -$num
+                                        incr cursor_column -$num
+                                        if {$idx < $opt_colstart-1} {
+                                            #wrap to previous line and position cursor at end of data
+                                            set idx [expr {$opt_colstart-1}]
+                                            set cursor_column $opt_colstart
+                                        }
                                     }
-
-                                    #ensure rest of *overlay* is emitted to remainder
+                                }
+                                E {
+                                    #CNL - Cursor Next Line
+                                    if {$param eq ""} {
+                                        set downmove 1
+                                    } else {
+                                        set downmove [expr {$param}]
+                                    }
+                                    puts stderr "renderline CNL down-by-$downmove"
+                                    set cursor_column 1
+                                    set cursor_row [expr {$cursor_row + $downmove}]
+                                    set idx [expr {$cursor_column -1}]
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
                                     incr idx_over
                                     priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction up
-                                    #retain cursor_column
-                                    break 
+                                    set instruction move
+                                    break
+
                                 }
-                                B {
-                                    #Row move - down
-                                    set num $param
+                                F {
+                                    #CPL - Cursor Previous Line
+                                    if {$param eq ""} {
+                                        set upmove 1
+                                    } else {
+                                        set upmove [expr {$param}]
+                                    }
+                                    puts stderr "renderline CPL up-by-$upmove"
+                                    set cursor_column 1
+                                    set cursor_row [expr {$cursor_row -$upmove}]
+                                    if {$cursor_row < 1} {
+                                        set cursor_row 1
+                                    } 
+                                    set idx [expr {$cursor_column - 1}]
                                     set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                    #move down
-                                    if {$num eq ""} {set num 1}
-                                    incr cursor_row $num
-
-
-                                    incr idx_over ;#idx_over hasn't encountered a grapheme and hasn't advanced yet 
+                                    incr idx_over
                                     priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction down
-                                    #retain cursor_column
-                                    break 
+                                    set instruction move
+                                    break
+
+                                }
+                                G {
+                                    #CHA - Cursor Horizontal Absolute (move to absolute column no)
+                                    if {$param eq ""} {
+                                        set targetcol 1
+                                    } else {
+                                        set targetcol $param
+                                        if {![string is integer -strict $targetcol]} {
+                                            puts stderr "renderline CHA (Cursor Horizontal Absolute) error. Unrecognised parameter '$param'"
+                                        }
+                                        set targetcol [expr {$param}]
+                                        set max [llength $outcols]
+                                        if {$overflow_idx == -1} {
+                                            incr max
+                                        }
+                                        if {$targetcol > $max} {
+                                            puts stderr "renderline CHA (Cursor Horizontal Absolute) error. Param '$param' > max: $max"
+                                            set targetcol $max
+                                        }
+                                    }
+                                    #adjust to colstart - as column 1 is within overlay
+                                    #??? REVIEW
+                                    set idx [expr {($targetcol -1) + $opt_colstart -1}] 
+                                    
+                                     
+                                    set cursor_column $targetcol
+                                    #puts stderr "renderline absolute col move ESC G (TEST)"
                                 }
                                 H - f {
-                                    #$re_both_move
-                                    lassign [split $param {;}] row col
-                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                    #lassign $matchinfo _match row col 
+                                    #CSI n;m H - CUP - Cursor Position
 
-                                    if {$col eq ""} {set col 1}
-                                    set max [llength $outcols]
-                                    if {$overflow_idx == -1} {
-                                        incr max 
-                                    }
-                                    if {$col > $max} {
-                                        set cursor_column  $max
+                                    #CSI n;m f - HVP - Horizontal Vertical Position REVIEW - same as CUP with differences (what?) in some terminal modes
+                                    # - 'counts as effector format function  (like CR or LF) rather than an editor function (like CUD or CNL)'
+                                    # - REVIEW 
+                                    #see Annex A at: https://www.ecma-international.org/wp-content/uploads/ECMA-48_5th_edition_june_1991.pdf
+
+                                    #test e.g ansicat face_2.ans
+                                    #$re_both_move
+                                    lassign [split $param {;}] paramrow paramcol
+                                    #missing defaults to 1
+                                    #CSI ;5H = CSI 1;5H -> row 1 col 5
+                                    #CSI 17;H = CSI 17H = CSI 17;1H -> row 17 col 1 
+
+                                    if {$paramcol eq ""} {set paramcol 1}
+                                    if {$paramrow eq ""} {set paramrow 1}
+                                    if {![string is integer -strict $paramcol] || ![string is integer -strict $paramrow]} {
+                                        puts stderr "renderline CUP (CSI <param> H) unrecognised param $param"
+                                        #ignore?
                                     } else {
-                                        set cursor_column $col
+                                        set max [llength $outcols]
+                                        if {$overflow_idx == -1} {
+                                            incr max 
+                                        }
+                                        if {$paramcol > $max} {
+                                            set target_column  $max
+                                        } else {
+                                            set target_column [expr {$paramcol}]
+                                        }
+
+
+                                        if {$paramrow < 1} {
+                                            puts stderr "renderline CUP (CSI <param> H) bad row target 0. Assuming 1"
+                                            set target_row 1
+                                        } else {
+                                            set target_row [expr {$paramrow}]
+                                        }
+                                        if {$target_row == $cursor_row} {
+                                            #col move only - no need for break and move
+                                            #puts stderr "renderline CUP col move only to col $target_column param:$param"
+                                            set cursor_column $target_column
+                                            set idx [expr {$cursor_column -1}]
+                                        } else {
+                                            set cursor_row $target_row
+                                            set cursor_column $target_column
+                                            set idx [expr {$cursor_column -1}]
+                                            set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                            incr idx_over
+                                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                                            set instruction move
+                                            break
+                                        }
                                     }
-                                    set idx [expr {$cursor_column -1}]
+                                }
+                                J {
+                                    puts stderr "overtype::renderline ED - ERASE IN DISPLAY (TESTING) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                    if {$param eq ""} {set param 0} 
+                                    switch -exact -- $param {
+                                        0 {
+                                            #clear from cursor to end of screen
+                                        }
+                                        1 {
+                                            #clear from cursor to beginning of screen
+                                        }
+                                        2 {
+                                            #clear entire screen
+                                            #ansi.sys - move cursor to upper left REVIEW
+                                            set cursor_row 1
+                                            set cursor_column 1
+                                            set idx [expr {$cursor_column -1}]
+                                            set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                            incr idx_over
+                                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                                            set instruction move
+                                            break
+                                        }
+                                        3 {
+                                            #clear entire screen. presumably cursor doesn't move - otherwise it would be same as 2J ?
 
-                                    if {$row eq ""} {set row 1}
-                                    set cursor_row $row
-                                    if {$cursor_row < 1} {
-                                        set cursor_row 1
+                                        }
+                                        default {
+                                        }
                                     }
 
-                                    incr idx_over
-                                    priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction move
-                                    break
+                                }
+                                K {
+                                    puts stderr "overtype::renderline EL - ERASE IN LINE (TESTING) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                    if {$param eq ""} {set param 0} 
+                                    switch -exact -- $param {
+                                        0 {
+                                            #clear from cursor to end of line
+                                        }
+                                        1 {
+                                            #clear from cursor to beginning of line
 
+                                        }
+                                        2 {
+                                            #clear entire line
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline EL - ERASE IN LINE PARAM '$param' unrecognised [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                        }
+                                    }
                                 }
                                 X {
-                                    puts stderr "X - $param"
+                                    puts stderr "overtype::renderline X ECH ERASE CHARACTER - $param"
                                     #ECH - erase character
                                     if {$param eq "" || $param eq "0"} {set param 1}; #param=count of chars to erase
                                     priv::render_erasechar $idx $param 
@@ -2789,78 +3126,119 @@ tcl::namespace::eval overtype {
                                     break
                                 }
                                 s {
-                                    # - todo - make ansi.sys CSI s cursor save only apply for certain cases? - may need to support DECSLRM instead which uses same code
-
-                                    #$re_cursor_save
-                                    #cursor save could come after last column  
-                                    if {$overflow_idx != -1 && $idx == $overflow_idx} {
-                                        #bartman2.ans test file - fixes misalignment at bottom of dialog bubble
-                                        #incr cursor_row
-                                        #set cursor_column 1
-                                        #bwings1.ans test file - breaks if we actually incr cursor (has repeated saves)
-                                        set cursor_saved_position [list row [expr {$cursor_row+1}] column 1]
-                                    } else {
-                                        set cursor_saved_position [list row $cursor_row column $cursor_column]
-                                    }
-                                    #there may be overlay stackable codes emitted that aren't in the understacks because they come between the last emmited character and the cursor_save control.
-                                    #we need the SGR and gx overlay codes prior to the cursor_save  
+                                    #code conflict between ansi emulation and DECSLRM - REVIEW
+                                    #ANSISYSSC  (when no parameters) - like other terminals - essentially treat same as DECSC
+                                    # todo - when parameters - support DECSLRM instead
+
+                                    if {$param ne ""} {
+                                        #DECSLRM - should only be recognised if DECLRMM is set  (vertical split screen mode)
+                                        lassign [split $param {;} margin_left margin_right 
+                                        puts stderr "overtype DECSLRM not yet supported - got [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                        if {$margin_left eq ""} {
+                                            set margin_left 1
+                                        }
+                                        set columns_per_page 80 ;#todo - set to 'page width (DECSCPP set columns per page)' - could be 132 or??
+                                        if {$margin_right eq ""} {
+                                            set margin_right $columns_per_page 
+                                        }
+                                        puts stderr "DECSLRM margin left: $margin_left margin right: $margin_right"
+                                        if {![string is integer -strict $margin_left] || $margin_left < 0} {
+                                            puts stderr "DECSLRM invalid margin_left"
+                                        }
+                                        if {![string is integer -strict $margin_right] || $margin_right < 0} {
+                                            puts stderr "DECSLRM invalid margin_right"
+                                        }
+                                        set scrolling_region_size [expr {$margin_right - $margin_left}]
+                                        if {$scrolling_region_size < 2 || $scrolling_region_size > $columns_per_page} {
+                                            puts stderr "DECSLRM region size '$scrolling_regsion_size' must be between 1 and $columns_per_page"
+                                        }
+                                        #todo 
 
-                                    #a real terminal would not be able to know the state of the underlay.. so we should probably ignore it.
-                                    #set sgr_stack [lindex $understacks $idx]
-                                    #set gx_stack [lindex $understacks_gx $idx] ;#not actually a stack - just a boolean state (for now?)
-                                    
-                                    set sgr_stack [list]
-                                    set gx_stack [list]
-
-                                    #we shouldn't need to scan for intermediate cursor save/restores - as restores would throw-back to the calling loop - so our overlay 'line' is since those.
-                                    #The overlay_grapheme_control_list had leading resets from previous lines - so we go back to the beginning not just the first grapheme.
-
-                                    foreach gc [lrange $overlay_grapheme_control_list 0 $gci-1] {
-                                        lassign $gc type code 
-                                        #types g other sgr gx0
-                                        switch -- $type {
-                                            gx0 {
-                                                #code is actually a stand-in for the graphics on/off code  - not the raw code
-                                                #It is either gx0_on or gx0_off 
-                                                set gx_stack [list $code]
-                                            }
-                                            sgr {
-                                                #code is the raw code
-                                                if {[punk::ansi::codetype::is_sgr_reset $code]} {
-                                                    #jmn
-                                                    set sgr_stack [list "\x1b\[m"]
-                                                } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
-                                                    set sgr_stack [list $code]
-                                                    lappend overlay_grapheme_control_list [list sgr $code]
-                                                } elseif {[priv::is_sgr $code]} {
-                                                    #often we don't get resets - and codes just pile up.
-                                                    #as a first step to simplifying - at least remove earlier straight up dupes
-                                                    set dup_posns [lsearch -all -exact $sgr_stack $code] ;#needs -exact - codes have square-brackets (glob chars)
-                                                    set sgr_stack [lremove $sgr_stack {*}$dup_posns]
-                                                    lappend sgr_stack $code
+
+                                    } else {
+                                        #DECSC
+                                        #//notes on expected behaviour:
+                                        #DECSC - saves following items in terminal's memory
+                                        #cursor position
+                                        #character attributes set by the SGR command
+                                        #character sets (G0,G1,G2 or G3) currently in GL and GR
+                                        #Wrap flag (autowrap or no autowrap)
+                                        #State of origin mode (DECOM)
+                                        #selective erase attribute
+                                        #any single shift 2 (SS2) or single shift 3(SSD) functions sent
+
+                                        #$re_cursor_save
+                                        #cursor save could come after last column  
+                                        if {$overflow_idx != -1 && $idx == $overflow_idx} {
+                                            #bartman2.ans test file - fixes misalignment at bottom of dialog bubble
+                                            #incr cursor_row
+                                            #set cursor_column 1
+                                            #bwings1.ans test file - breaks if we actually incr cursor (has repeated saves)
+                                            set cursor_saved_position [list row [expr {$cursor_row+1}] column 1]
+                                        } else {
+                                            set cursor_saved_position [list row $cursor_row column $cursor_column]
+                                        }
+                                        #there may be overlay stackable codes emitted that aren't in the understacks because they come between the last emmited character and the cursor_save control.
+                                        #we need the SGR and gx overlay codes prior to the cursor_save  
+
+                                        #a real terminal would not be able to know the state of the underlay.. so we should probably ignore it.
+                                        #set sgr_stack [lindex $understacks $idx]
+                                        #set gx_stack [lindex $understacks_gx $idx] ;#not actually a stack - just a boolean state (for now?)
+                                        
+                                        set sgr_stack [list]
+                                        set gx_stack [list]
+
+                                        #we shouldn't need to scan for intermediate cursor save/restores - as restores would throw-back to the calling loop - so our overlay 'line' is since those.
+                                        #The overlay_grapheme_control_list had leading resets from previous lines - so we go back to the beginning not just the first grapheme.
+
+                                        foreach gc [lrange $overlay_grapheme_control_list 0 $gci-1] {
+                                            lassign $gc type code 
+                                            #types g other sgr gx0
+                                            switch -- $type {
+                                                gx0 {
+                                                    #code is actually a stand-in for the graphics on/off code  - not the raw code
+                                                    #It is either gx0_on or gx0_off 
+                                                    set gx_stack [list $code]
+                                                }
+                                                sgr {
+                                                    #code is the raw code
+                                                    if {[punk::ansi::codetype::is_sgr_reset $code]} {
+                                                        #jmn
+                                                        set sgr_stack [list "\x1b\[m"]
+                                                    } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
+                                                        set sgr_stack [list $code]
+                                                        lappend overlay_grapheme_control_list [list sgr $code]
+                                                    } elseif {[priv::is_sgr $code]} {
+                                                        #often we don't get resets - and codes just pile up.
+                                                        #as a first step to simplifying - at least remove earlier straight up dupes
+                                                        set dup_posns [lsearch -all -exact $sgr_stack $code] ;#needs -exact - codes have square-brackets (glob chars)
+                                                        set sgr_stack [lremove $sgr_stack {*}$dup_posns]
+                                                        lappend sgr_stack $code
+                                                    }
                                                 }
                                             }
                                         }
-                                    }
-                                    set cursor_saved_attributes ""
-                                    switch -- [lindex $gx_stack 0] {
-                                        gx0_on {
-                                            append cursor_saved_attributes "\x1b(0"
-                                        }
-                                        gx0_off {
-                                            append cursor_saved_attributes "\x1b(B"
+                                        set cursor_saved_attributes ""
+                                        switch -- [lindex $gx_stack 0] {
+                                            gx0_on {
+                                                append cursor_saved_attributes "\x1b(0"
+                                            }
+                                            gx0_off {
+                                                append cursor_saved_attributes "\x1b(B"
+                                            }
                                         }
-                                    }
-                                    #append cursor_saved_attributes [join $sgr_stack ""]
-                                    append cursor_saved_attributes [punk::ansi::codetype::sgr_merge_list {*}$sgr_stack]
+                                        #append cursor_saved_attributes [join $sgr_stack ""]
+                                        append cursor_saved_attributes [punk::ansi::codetype::sgr_merge_list {*}$sgr_stack]
 
-                                    #as there is apparently only one cursor storage element we don't need to throw back to the calling loop for a save.
+                                        #as there is apparently only one cursor storage element we don't need to throw back to the calling loop for a save.
 
-                                    #don't incr index - or the save will cause cursor to move to the right
-                                    #carry on 
-                                    
+                                        #don't incr index - or the save will cause cursor to move to the right
+                                        #carry on 
+                                    }
                                 }
                                 u {
+                                    #ANSISYSRC save cursor (when no parameters)  (DECSC)
+
                                     #$re_cursor_restore
                                     #we are going to jump somewhere.. for now we will assume another line, and process accordingly.
                                     #The caller has the cursor_saved_position/cursor_saved_attributes if any (?review - if we always pass it back it, we could save some calls for moves in same line)
@@ -2903,7 +3281,6 @@ tcl::namespace::eval overtype {
                                 }
                                 ~ {
                                     #$re_vt_sequence
-                                    #lassign $matchinfo _match key mod 
                                     lassign [split $param {;}] key mod
 
                                     #Note that f1 to f4 show as ESCOP|Q|R|S  (VT220?) but f5+ show as ESC\[15~
@@ -2972,64 +3349,129 @@ tcl::namespace::eval overtype {
 
                                 }
                                 h - l {
+                                    #set mode unset mode
                                     #we are matching only last char to get to this arm - but are there other sequences ending in h|l we need to handle?
 
                                     #$re_mode if first after CSI is "?"  
                                     #some docs mention ESC=<mode>h|l  - not seen on windows terminals.. review
                                     #e.g https://www2.math.upenn.edu/~kazdan/210/computer/ansi.html
-                                    if {[tcl::string::index $codenorm 4] eq "?"} {
-                                        set num [tcl::string::range $codenorm 5 end-1] ;#param between ? and h|l
-                                        #lassign $matchinfo _match num type
-                                        switch -- $num {
-                                            5 {
-                                                #DECSNM - reverse video
-                                                #How we simulate this to render within a block of text is an open question.
-                                                #track all SGR stacks and constantly flip based on the current SGR reverse state?
-                                                #It is the job of the calling loop to do this - so at this stage we'll just set the states
-                                                #DECAWM autowrap 
-                                                if {$type eq "h"} {
-                                                    #set (enable)
-                                                    set reverse_mode 1
-                                                } else {
-                                                    #reset (disable)
-                                                    set reverse_mode 0
+                                    set modegroup [tcl::string::index $codenorm 4] ;#e.g ? =
+                                    switch -exact -- $modegroup {
+                                        ? {
+                                            set num [tcl::string::range $codenorm 5 end-1] ;#param between ? and h|l
+                                            switch -- $num {
+                                                5 {
+                                                    #DECSNM - reverse video
+                                                    #How we simulate this to render within a block of text is an open question.
+                                                    #track all SGR stacks and constantly flip based on the current SGR reverse state?
+                                                    #It is the job of the calling loop to do this - so at this stage we'll just set the states
+
+                                                    if {$code_end eq "h"} {
+                                                        #set (enable)
+                                                        set reverse_mode 1
+                                                    } else {
+                                                        #reset (disable)
+                                                        set reverse_mode 0
+                                                    }
+
+                                                }
+                                                7 {
+                                                    #DECAWM autowrap 
+                                                    if {$code_end eq "h"} {
+                                                        #set (enable)
+                                                        set autowrap_mode 1
+                                                        if {$opt_width ne "\uFFEF"} {
+                                                            set overflow_idx $opt_width
+                                                        } else {
+                                                            #review - this is also the cursor position when adding a char at end of line? 
+                                                            set overflow_idx [expr {[llength $undercols]}] ;#index at which we would be *in* overflow a row move may still override it 
+                                                        }
+                                                        #review - can idx ever be beyond overflow_idx limit when we change e.g with a width setting and cursor movements? presume not - but sanity check for now.
+                                                        if {$idx >= $overflow_idx} {
+                                                            puts stderr "renderline error - idx '$idx' >= overflow_idx '$overflow_idx' - unexpected"
+                                                        }
+                                                    } else {
+                                                        #reset (disable)
+                                                        set autowrap_mode 0
+                                                        set overflow_idx -1
+                                                    }
                                                 }
+                                                25 {
+                                                    if {$code_end eq "h"} {
+                                                        #visible cursor
 
+                                                    } else {
+                                                        #invisible cursor
+
+                                                    }
+                                                }
                                             }
-                                            7 {
-                                                #DECAWM autowrap 
-                                                if {$type eq "h"} {
-                                                    #set (enable)
-                                                    set autowrap_mode 1
-                                                    if {$opt_width ne "\uFFEF"} {
-                                                        set overflow_idx $opt_width
+                                        }
+                                        = {
+                                            set num [tcl::string::range $codenorm 5 end-1] ;#param between = and h|l
+                                            puts stderr "overtype::renderline CSI=...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
+                                        default {
+                                            #e.g CSI 4 h
+                                            set num [tcl::string::range $codenorm 4 end-1] ;#param before h|l
+                                            switch -exact -- $num {
+                                                3 {
+                                                    puts stderr "CRM MODE $code_end"
+                                                    #CRM - Show control character mode
+                                                    # 'No control functions are executed except LF,FF and VT which are represented in the CRM FONT before a CRLF(new line) is executed'
+                                                    #  
+                                                    #use ansistring VIEW -nul 1 -lf 2 -ff 2 -vt 2
+                                                    #https://vt100.net/docs/vt510-rm/CRM.html
+                                                    if {$code_end eq "h"} {
+                                                        set crm_mode 1
                                                     } else {
-                                                        #review - this is also the cursor position when adding a char at end of line? 
-                                                        set overflow_idx [expr {[llength $undercols]}] ;#index at which we would be *in* overflow a row move may still override it 
+                                                        set crm_mode 0
                                                     }
-                                                    #review - can idx ever be beyond overflow_idx limit when we change e.g with a width setting and cursor movements? presume not - but sanity check for now.
-                                                    if {$idx >= $overflow_idx} {
-                                                        puts stderr "renderline error - idx '$idx' >= overflow_idx '$overflow_idx' - unexpected"
+                                                }
+                                                4 {
+                                                    #IRM - Insert/Replace Mode
+                                                    if {$code_end eq "h"} {
+                                                        set insert_mode 1
+                                                    } else {
+                                                        #replace mode
+                                                        set insert_mode 0
                                                     }
-                                                } else {
-                                                    #reset (disable)
-                                                    set autowrap_mode 0
-                                                    set overflow_idx -1
                                                 }
+                                                default {
+                                                    puts stderr "overtype::renderline CSI...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                | {
+                                    switch -- [tcl::string::index $codenorm end-1] {
+                                        {$} {
+                                            #CSI ... $ |   DECSCPP set columns per page- (recommended in vt510 docs as preferable to DECCOLM)
+                                            #real terminals generally only supported 80/132
+                                            #some other virtuals support any where from 2 to 65,536?
+                                            #we will allow arbitrary widths >= 2 .. to some as yet undetermined limit.
+                                            #CSI <param> $ |
+                                            #empty or 0 param is 80 for compatibility - other numbers > 2 accepted
+                                            set page_width -1 ;#flag as unset
+                                            if {$param eq ""} {
+                                                set page_width 80
+                                            }  elseif {[string is integer -strict $param] && $param >=2 0} {
+                                                set page_width [expr {$param}] ;#we should allow leading zeros in the number - but lets normalize using expr
+                                            } else {
+                                                puts stderr "overtype::renderline unacceptable DECSPP value '$param'" 
                                             }
-                                            25 {
-                                                if {$type eq "h"} {
-                                                    #visible cursor
 
-                                                } else {
-                                                    #invisible cursor
+                                            if {$page_width > 2} {
+                                                puts stderr "overtype::renderline DECSCPP - not implemented - but selected width '$page_width' looks ok"
+                                                #if cursor already beyond new page_width - will move to right colum - otherwise no cursor movement
 
-                                                }
                                             }
-                                        }
 
-                                    } else {
-                                        puts stderr "overtype::renderline CSI...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline  unrecognised CSI code ending in pipe (|) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
                                     }
                                 }
                                 default {
@@ -3038,8 +3480,9 @@ tcl::namespace::eval overtype {
                             } 
                         } 
                         7ESC {
-                            #$re_other_single
-                            switch -- [tcl::string::index $codenorm end] {
+                            #re_other_single         {\x1b(D|M|E)$}
+                            #also PM \x1b^...(ST)
+                            switch -- [tcl::string::index $codenorm 4] {
                                 D {
                                     #\x84
                                     #index (IND)
@@ -3080,20 +3523,66 @@ tcl::namespace::eval overtype {
                                     puts stderr "ESC E unimplemented"
 
                                 }
+                                ^ {
+                                    #puts stderr "renderline PM"
+                                    #Privacy Message.
+                                    if {[string index $code end] eq "\007"} {
+                                        set pm_content [string range $code 2 end-1] ;#ST is \007
+                                    } else {
+                                        set pm_content [string range $code 2 end-2] ;#ST is \x1b\\
+                                    }
+                                    #We don't want to render it - but we need to make it available to the application
+                                    #see the textblock library in punk, for the exception we make here for single backspace.
+                                    #It is unlikely to be encountered as a useful PM - so we hack to pass it through as a fix 
+                                    #for spacing issues on old terminals which miscalculate the single-width 'Symbols for Legacy Computing'
+                                    if {$pm_content eq "\b"} {
+                                        #puts stderr "renderline PM sole backspace special handling for \U1FB00 - \U1FBFF"
+                                        #esc^\b\007 or esc^\besc\\ 
+                                        #HACKY pass-through - targeting terminals that both mis-space legacy symbols *and* don't support PMs
+                                        #The result is repair of the extra space. If the terminal is a modern one and does support PM - the \b should be hidden anyway.
+                                        #If the terminal has the space problem AND does support PMs - then this just won't fix it.
+                                        #The fix relies on the symbol-supplier to cooperate by appending esc^\b\esc\\ to the problematic symbols.
+
+                                        #priv::render_addchar $idx $code [lindex $overstacks $idx_over] [lindex $overstacks_gx $idx_over] $insert_mode
+                                        #idx has been incremented after last grapheme added
+                                        priv::render_append_to_char [expr {$idx -1}] $code
+                                    }
+                                    #lappend to a dict element in the result for application-specific processing
+                                    lappend pm_list $pm_content
+                                }
+                                N - O {
+                                    puts stderr "overtype::renderline single shift command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                P {
+                                    puts stderr "overtype::renderline DEVICE CONTROL STRING command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                X {
+                                    #SOS
+                                    if {[string index $code end] eq "\007"} {
+                                        set sos_content [string range $code 2 end-1] ;#ST is \007
+                                    } else {
+                                        set sos_content [string range $code 2 end-2] ;#ST is \x1b\\
+                                    }
+                                    #return in some useful form to the caller
+                                    #TODO!
+                                    lappend sos_list [list string $sos_content row $cursor_row column $cursor_column]
+                                    puts stderr "overtype::renderline ESCX SOS UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                _ {
+                                    #APC Application Program Command
+                                    #just warn for now..
+                                    puts stderr "overtype::renderline ESC_ APC command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
                                 default {
-                                    puts stderr "overtype::renderline ESC<x> code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                    puts stderr "overtype::renderline ESC<x> code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented codenorm:[ansistring VIEW -lf 1 -vt 1 -nul 1 $codenorm]"
                                 }
                             }
 
                         }
+                        default {
+                        }
                     }
 
-                    #switch -regexp -matchvar matchinfo -- $code\
-                    #$re_mode {
-                    #}\
-                    #default {
-                    #    puts stderr "overtype::renderline code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
-                    #}
 
                 }
                 default {
@@ -3275,8 +3764,10 @@ tcl::namespace::eval overtype {
                 overflow_right $overflow_right\
                 unapplied $unapplied\
                 unapplied_list $unapplied_list\
-                insert_mode $insert_mode\
-                autowrap_mode $autowrap_mode\
+                insert_mode     $insert_mode\
+                autowrap_mode   $autowrap_mode\
+                crm_mode        $crm_mode\
+                reverse_mode    $reverse_mode\
                 insert_lines_above $insert_lines_above\
                 insert_lines_below $insert_lines_below\
                 cursor_saved_position $cursor_saved_position\
@@ -3287,6 +3778,7 @@ tcl::namespace::eval overtype {
                 replay_codes $replay_codes\
                 replay_codes_underlay $replay_codes_underlay\
                 replay_codes_overlay $replay_codes_overlay\
+                pm_list  $pm_list\
             ]
             if {$opt_returnextra == 1} {
                 return $result
@@ -3370,8 +3862,9 @@ tcl::namespace::eval overtype::piper {
 }
 interp alias "" piper_renderline "" overtype::piper::renderline 
 
-#intended for single grapheme - but will work for multiple
-#cannot contain ansi or newlines 
+#intended primarily for single grapheme - but will work for multiple
+#WARNING: query CAN contain ansi or newlines - but if cache was not already set manually,the answer will be incorrect!
+#We deliberately allow this for PM/SOS attached within a column
 #(a cache of ansifreestring_width calls - as these are quite regex heavy)
 proc overtype::grapheme_width_cached {ch} {
     variable grapheme_widths
@@ -3439,6 +3932,7 @@ tcl::namespace::eval overtype::priv {
         tcl::dict::set cache_is_sgr $code $answer
         return $answer
     }
+    # better named render_to_unapplied?
     proc render_unapplied {overlay_grapheme_control_list gci} {
         upvar idx_over idx_over
         upvar unapplied unapplied
@@ -3532,7 +4026,7 @@ tcl::namespace::eval overtype::priv {
             set ustacks [lreplace $ustacks $i $i]
             set gxstacks [lreplace $gxstacks $i $i]
         } else {
-
+            puts stderr "render_delchar - attempt to delchar at index $i >= number of outcols $nxt - shouldn't happen"
         }
     }
     proc render_erasechar {i count} {
@@ -3563,21 +4057,68 @@ tcl::namespace::eval overtype::priv {
         upvar outcols o
         lset o $i $c
     }
+
+    #Initial usecase is for old-terminal hack to add PM-wrapped \b
+    #review - can be used for other multibyte sequences that occupy one column?
+    #combiners? diacritics?
+    proc render_append_to_char {i c} {
+        upvar outcols o
+        if {$i > [llength $o]-1} {
+            error "render_append_to_char cannot append [ansistring VIEW -lf 1 -nul 1 $c] to existing char at index $i while $i >= llength outcols [llength $o]"
+        }
+        set existing [lindex $o $i]
+        if {$existing eq "\0"} {
+            lset o $i $c
+        } else {
+            lset o $i [string cat $existing $c] 
+        }
+    } 
     #is actually addgrapheme?
     proc render_addchar {i c sgrstack gx0stack {insert_mode 0}} {
         upvar outcols o
         upvar understacks ustacks
         upvar understacks_gx gxstacks
 
-        if 0 {
-        if {$c eq "c"} {
-            puts "i:$i c:$c sgrstack:[ansistring VIEW $sgrstack]"
-            puts "understacks:[ansistring VIEW $ustacks]"
-            upvar overstacks overstacks
-            puts "overstacks:[ansistring VIEW $overstacks]"
-            puts "info level 0:[info level 0]"
-        }
+        # -- --- ---
+        #this is somewhat of a hack.. probably not really the equivalent of proper reverse video? review
+        #we should ideally be able to reverse the video of a sequence that already includes SGR reverse/noreverse attributes
+        upvar reverse_mode do_reverse
+        #if {$do_reverse} {
+        #    lappend sgrstack [a+ reverse]
+        #} else {
+        #    lappend sgrstack [a+ noreverse]
+        #}
+
+        #JMN3
+        if {$do_reverse} {
+            #note we can't just look for \x1b\[7m  or \x1b\[27m
+            # it may be a more complex sequence like \x1b\[0\;\;7\;31m  etc
+
+            set existing_reverse_state 0 
+            set codeinfo [punk::ansi::codetype::sgr_merge $sgrstack -info 1]
+            set codestate_reverse [dict get $codeinfo codestate reverse]
+            switch -- $codestate_reverse {
+                7 {
+                    set existing_reverse_state 1
+                }
+                27 {
+                    set existing_reverse_state 0
+                }
+                "" {
+                }
+            }
+            if {$existing_reverse_state == 0} {
+                set rflip [a+ reverse]
+            } else {
+                #reverse of reverse
+                set rflip [a+ noreverse]
+            }
+            #note that mergeresult can have multiple esc (due to unmergeables or non sgr codes)
+            set sgrstack [list [dict get $codeinfo mergeresult] $rflip]
+            #set sgrstack [punk::ansi::codetype::sgr_merge [list [dict get $codeinfo mergeresult] $rflip]]
         }
+        
+        # -- --- ---
 
         set nxt [llength $o] 
         if {!$insert_mode} {
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/ansi-0.1.1.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/ansi-0.1.1.tm
index 85cb9f27..7a2f9443 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/ansi-0.1.1.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/ansi-0.1.1.tm
@@ -553,28 +553,51 @@ tcl::namespace::eval punk::ansi {
         $obj destroy
         return $result
     }
-    proc example {} {
+    proc example {args} {
+        set base [punk::repo::find_project]
+        set default_ansibase [file join $base src/testansi]
+
+        set argd [punk::args::get_dict [tstr -return string {
+            *proc -name punk::ansi::example -help "Display .ans image files in a grid that will fit in console
+            "
+            -colwidth -default 82 -help "Width of each column - default of 82 will fit a standard 80wide ansi image (when framed)
+            You can specify a narrower width to truncate images on the right side"
+            -folder -default "${$default_ansibase}"   -help "Base folder for files if relative paths are used.
+            Defaults to <projectbase>/src/testansi - where projectbase is determined from current directory.
+            "
+            *values -min 0 -max -1 
+            files -default {belinda.ans bot.ans flower.ans fish.ans} -multiple true -help "List of filenames - leave empty to display 4 defaults"
+        }] $args]
+        set colwidth [dict get $argd opts -colwidth]
+        set ansibase [file normalize [dict get $argd opts -folder]]
+        set fnames   [dict get $argd values files]
+
+        #assumes fixed column widths e.g 80col images will fit in 82-width frames (common standard for old ansi art) (of arbitrary height)
         #todo - review dependency on punk::repo ?  
         package require textblock
         package require punk::repo
         package require punk::console
 
-        set fnames [list belinda.ans bot.ans flower.ans fish.ans]
-        set base [punk::repo::find_project]
-        set ansibase [file join $base src/testansi]
         if {![file exists $ansibase]} {
-            puts stderr "Missing testansi folder at $base/src/testansi"
+            puts stderr "Missing folder at $ansibase"
             puts stderr "Ensure ansi test files exist: $fnames"
             #error "punk::ansi::example Cannot find example files"
         }
-        set missingbase [a+ yellow][textblock::block 80 23 ?][a]
+        set missingbase [a+ yellow][textblock::block [expr {$colwidth-2}] 23 ?][a] ;#assuming standard frame - subtract 2 for left/right borders
         set pics [list]
         foreach f $fnames {
-            if {![file exists $ansibase/$f]} {
-                set p [overtype::left $missingbase "[a+ red bold]\nMissing file\n$ansibase/$f[a]"]
+            if {[file pathtype $f] ne "absolute"} {
+                set filepath [file normalize $ansibase/$f]
+            } else {
+                set filepath [file normalize $f]
+            }
+            if {![file exists $filepath]} {
+                set p [overtype::left $missingbase "[a+ red bold]\nMissing file\n$f[a]"]
                 lappend pics [tcl::dict::create filename $f pic $p status missing]
             } else {
-                set img [join [lines_as_list -line trimline -block trimtail [ansicat $ansibase/$f]] \n]
+                #set img [join [lines_as_list -line trimline -block trimtail [ansicat $filepath]] \n]
+                #-line trimline will wreck some images
+                set img [join [lines_as_list -block trimtail [ansicat $filepath]] \n]
                 lappend pics [tcl::dict::create filename $f pic $img status ok] 
             }
         }
@@ -582,30 +605,73 @@ tcl::namespace::eval punk::ansi {
         set termsize [punk::console:::get_size] 
         set margin 4
         set freewidth [expr {[tcl::dict::get $termsize columns]-$margin}]
-        set per_row [expr {$freewidth / 80}]
-
-        set rowlist [list]
-        set row [list]
-        set i 1 
+        set per_row [expr {$freewidth / $colwidth}]
+
+        set rowlist [list]      ;# { {<img> <img>} {<img> <img>} }
+        set heightlist [list]   ;# { {<h>   <h>  } {<h>   <h>  } }
+        set maxheights [list]   ;# { <max>  <max>}
+        set row [list]  ;#wip row
+        set rowh [list] ;#wip row img heights
+        set i 1  ;#track image index of whole pics list
+        set rowindex 0
         foreach picinfo $pics {
             set subtitle ""
             if {[tcl::dict::get $picinfo status] ne "ok"} {
                 set subtitle [tcl::dict::get $picinfo status] 
             }
             set title [tcl::dict::get $picinfo filename]
-            lappend row [textblock::frame -subtitle $subtitle -title $title [tcl::dict::get $picinfo pic]]
+            set fr [textblock::frame -width $colwidth -subtitle $subtitle -title $title [tcl::dict::get $picinfo pic]]
+            # -- --- --- --- 
+            #we need the max height of a row  element to use join_basic instead of join below
+            # -- --- --- --- 
+            set fr_height [textblock::height $fr]
+            lappend row $fr
+            lappend rowh $fr_height
+
+            set rowmax [lindex $maxheights $rowindex]
+            if {$rowmax eq ""} {
+                #empty result means no maxheights entry for this row yet
+                set rowmax $fr_height
+                lappend maxheights $rowmax
+            } else {
+                if {$fr_height > $rowmax} {
+                    set rowmax $fr_height
+                    lset maxheights end $rowmax
+                }
+            } 
+            # -- --- --- --- 
+
             if {$i % $per_row == 0} {
                 lappend rowlist $row
+                lappend heightlist $rowh
+                incr rowindex
                 set row [list]
+                set rowh [list]
             } elseif {$i == [llength $pics]} {
                 lappend rowlist $row
+                lappend heightlist $rowh
             }
             incr i
         }
-
+        #puts "--> maxheights: $maxheights"
+        #puts "--> heightlist: $heightlist"
         set result ""
-        foreach r $rowlist {
-            append result [textblock::join_basic -- {*}$r] \n
+        set rowindex 0
+        set blankline [string repeat " " $colwidth]
+        foreach imgs $rowlist heights $heightlist  {
+            set maxheight [lindex $maxheights $rowindex]
+            set adjusted_row [list]
+            foreach i $imgs h $heights {
+                if {$h < $maxheight} {
+                    #add blank lines to bottom of shorter images so join_basic can be used.
+                    #textblock::join of ragged-height images would work and remove the need for all the height calculation
+                    #.. but it requires much more processing 
+                    append i [string repeat \n$blankline [expr {$maxheight - $h}]]
+                } 
+                lappend adjusted_row $i
+            }
+            append result [textblock::join_basic -- {*}$adjusted_row] \n
+            incr rowindex
         }
 
 
@@ -3199,6 +3265,28 @@ Brightblack 100   Brightred 101   Brightgreen 102   Brightyellow 103   Brightblu
         return \x1b8
     }
     # -- ---  --- --- ---
+    #CRM Show Control Character Mode
+    proc enable_crm {} {
+        return \x1b\[3h
+    }
+    proc disable_crm {} {
+        return \x1b\[3l
+    }
+
+    #DECSNM 
+    #Note this can invert the enclosed section including any already reversed by SGR 7  - depending on terminal support.
+    #e.g 
+    #set test [a+ reverse]aaa[a+ noreverse]bbb
+    #  - $test above can't just be reversed by putting another [a+ reverse] in front of it.
+    #  - but the following will work (even if underlying terminal doesn't support ?5 sequences)
+    #overtype::renderspace -width 20  [enable_inverse]$test 
+    proc enable_inverse {} {
+        return \x1b\[?5h
+    }
+    proc disable_inverse {} {
+        return \x1b\[?5l
+    }
+
 
     #DECAWM - automatic line wrapping
     proc enable_line_wrap {} {
@@ -3399,6 +3487,9 @@ Brightblack 100   Brightred 101   Brightgreen 102   Brightyellow 103   Brightblu
         #the purpose of backspace (or line cr) in embedded text is unclear. Should it allow some sort of character combining/overstrike as it has sometimes done historically (nroff/less)?  e.g a\b` as an alternative combiner or bolding if same char
         #This should presumably only be done if the over_strike (os) capability is enabled in the terminal. Either way - it presumably won't affect printing width?
         set line [punk::ansi::ansistrip $line]
+        #ANSI (e.g PM/SOS) can contain \b or \n  or \t  but won't contribute to length
+        #ansistrip must come before any other processing of these chars.
+
         #we can't use simple \b processing if we get ansi codes and aren't actually processing them (e.g moves)
 
         set line [punk::char::strip_nonprinting_ascii $line] ;#only strip nonprinting after ansistrip - some like BEL are part of ansi
@@ -3748,6 +3839,7 @@ tcl::namespace::eval punk::ansi {
             -filter_fg 0\
             -filter_bg 0\
             -filter_reset 0\
+            -info 0\
         ]
 
         #codes *must* already have been split so that one esc per element in codelist
@@ -3760,7 +3852,8 @@ tcl::namespace::eval punk::ansi {
             set opts $defaultopts_sgr_merge_singles
             foreach {k v} $args {
                 switch -- $k {
-                    -filter_fg - -filter_bg - -filter_reset {
+                    -filter_fg - -filter_bg - -filter_reset -
+                    -info {
                         tcl::dict::set opts $k $v
                     }
                     default {
@@ -4139,19 +4232,24 @@ tcl::namespace::eval punk::ansi {
                 set codemerge [tcl::string::trimright $codemerge {;}]
                 if {$unmergeable ne ""} {
                     set unmergeable [tcl::string::trimright $unmergeable {;}]
-                    return "\x1b\[${codemerge}m\x1b\[${unmergeable}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${codemerge}m\x1b\[${unmergeable}m[join $othercodes ""]"
                 } else {
-                    return "\x1b\[${codemerge}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${codemerge}m[join $othercodes ""]"
                 }
             } else {
                 if {$unmergeable eq ""} {
                     #there were no SGR codes - not even resets
-                    return [join $othercodes ""]
+                    set mergeresult [join $othercodes ""]
                 } else {
                     set unmergeable [tcl::string::trimright $unmergeable {;}]
-                    return "\x1b\[${unmergeable}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${unmergeable}m[join $othercodes ""]"
                 }
             }
+            if {[tcl::dict::get $opts -info]} {
+                return [dict create sgr $codemerge unmergeable $unmergeable othercodes $othercodes mergeresult $mergeresult codestate $codestate]
+            } else {
+                return $mergeresult
+            }
         }
 
         #has_sgr_reset  - rather than support this function - create an sgr normalize function that removes dead params and brings reset to front of param list?
@@ -4240,7 +4338,7 @@ tcl::namespace::eval punk::ansi::ta {
     #we also need to track the start of ST terminated code and not add it for replay (in the ansistring functions)
     #variable re_ST  {(?:\x1bX|\u0098|\x1b\^|\u009E|\x1b_|\u009F)(?:[^\x1b\007\u009c]*)(?:\x1b\\|\007|\u009c)} ;#downsides: early terminating with nests, mixes 7bit 8bit start/ends (does that exist in the wild?)   
     #keep our 8bit/7bit start-end codes separate
-    variable re_ST      {(?:\x1bP|\x1bX|\x1b\^|\x1b_)(?:(?!\x1b\\|007).)*(?:\x1b\\|\007)|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)}
+    variable re_ST      {(?:\x1bP|\x1bX|\x1b\^|\x1b_)(?:(?!\x1b\\|\007).)*(?:\x1b\\|\007)|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)}
 
 
 
@@ -4252,7 +4350,7 @@ tcl::namespace::eval punk::ansi::ta {
     # -- --- --- ---
     #handrafted TRIE version of above. Somewhat difficult to construct and maintain. TODO - find a regext TRIE generator that works with Tcl regexes
     #This does make things quicker - but it's too early to finalise the detect/split regexes (e.g missing \U0090 ) - will need to be redone.
-    variable re_ansi_detect {(?:\x1b(?:\((?:0|B)|\[(?:[\x20-\x2f\x30-\x3f]*[\x40-\x7e])|\](?:(?:[^\007]*)\007|(?:(?!\x1b\\).)*\x1b\\)|(?:P|X|\^|_)(?:(?:(?!\x1b\\|007).)*(?:\x1b\\|\007))|c|7|8|M|E|D|H|=|>|(?:#(?:3|4|5|6|8))))|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)|(?:\u009b)[\x20-\x2f\x30-\x3f]*[\x40-\x7e]|(?:\u009d)(?:[^\u009c]*)?\u009c}
+    variable re_ansi_detect {(?:\x1b(?:\((?:0|B)|\[(?:[\x20-\x2f\x30-\x3f]*[\x40-\x7e])|\](?:(?:[^\007]*)\007|(?:(?!\x1b\\).)*\x1b\\)|(?:P|X|\^|_)(?:(?:(?!\x1b\\|\007).)*(?:\x1b\\|\007))|c|7|8|M|E|D|H|=|>|(?:#(?:3|4|5|6|8))))|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)|(?:\u009b)[\x20-\x2f\x30-\x3f]*[\x40-\x7e]|(?:\u009d)(?:[^\u009c]*)?\u009c}
     # -- --- --- ---
 
 
@@ -5674,7 +5772,12 @@ tcl::namespace::eval punk::ansi::ansistring {
         ENQ [list \x05 \u2405]\
         ACK [list \x06 \u2406]\
         BEL [list \x07 \u2407]\
+        BS  [list \x08 \u2408]\
+        HT  [list \x09 \u2409]\
+        LF  [list \x0a \u240a]\
+        VT  [list \x0b \u240b]\
         FF  [list \x0c \u240c]\
+        CR  [list \x0d \u240d]\
         SO  [list \x0e \u240e]\
         SF  [list \x0f \u240f]\
         DLE [list \x10 \u2410]\
@@ -5688,12 +5791,15 @@ tcl::namespace::eval punk::ansi::ansistring {
         CAN [list \x18 \u2418]\
         EM  [list \x19 \u2419]\
         SUB [list \x1a \u241a]\
+        ESC [list \x1b \u241b]\
         FS  [list \x1c \u241c]\
         GS  [list \x1d \u241d]\
         RS  [list \x1e \u241e]\
         US  [list \x1f \u241f]\
+        SP  [list \x20 \u2420]\
         DEL [list \x7f \u2421]\
     ]
+
     #alternate symbols for space
     # \u2422 Blank Symbol (b with forwardslash overly)
     # \u2423 Open Box  (square bracket facing up like a tray/box)
@@ -5836,6 +5942,7 @@ tcl::namespace::eval punk::ansi::ansistring {
             -cr 1\
             -lf 0\
             -vt 0\
+            -ff 1\
             -ht 1\
             -bs 1\
             -sp 1\
@@ -5850,16 +5957,22 @@ tcl::namespace::eval punk::ansi::ansistring {
         set opt_cr      [tcl::dict::get $opts -cr]
         set opt_lf      [tcl::dict::get $opts -lf]
         set opt_vt      [tcl::dict::get $opts -vt]
+        set opt_ff      [tcl::dict::get $opts -ff]
         set opt_ht      [tcl::dict::get $opts -ht]
         set opt_bs      [tcl::dict::get $opts -bs]
         set opt_sp      [tcl::dict::get $opts -sp]
         # -- --- --- --- ---
 
+        # -lf 2, -vt 2 and -ff 2 are useful for CRM mode (Show Control Character Mode) in the terminal - where a newline is expected to display after the character.
 
 
         set visuals_opt $debug_visuals 
+        set visuals_opt [dict remove $visuals_opt CR ESC LF VT FF HT BS SP] 
+
         if {$opt_esc} {
             tcl::dict::set visuals_opt ESC [list \x1b \u241b]
+        } else {
+            tcl::dict::unset visuals_opt ESC
         }
         if {$opt_cr} {
             tcl::dict::set visuals_opt CR [list \x0d \u240d]
@@ -5870,9 +5983,20 @@ tcl::namespace::eval punk::ansi::ansistring {
         if {$opt_lf == 2} {
             tcl::dict::set visuals_opt LF [list \x0a \u240a\n]
         }
-        if {$opt_vt} {
+        if {$opt_vt ==  1} {
             tcl::dict::set visuals_opt VT [list \x0b \u240b]
         }
+        if {$opt_vt ==  2} {
+            tcl::dict::set visuals_opt VT [list \x0b \u240b\n]
+        }
+        switch -exact -- $opt_ff {
+            1 {
+                tcl::dict::set visuals_opt FF [list \x0c \u240c]
+            }
+            2 {
+                tcl::dict::set visuals_opt FF [list \x0c \u240c\n]
+            }
+        }
         if {$opt_ht} {
             tcl::dict::set visuals_opt HT [list \x09 \u2409]
         }
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/char-0.1.0.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/char-0.1.0.tm
index ed4b22e4..e47ba051 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/char-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/char-0.1.0.tm
@@ -552,13 +552,26 @@ tcl::namespace::eval punk::char {
             string eq $s [encoding convertto $encname [encoding convertfrom $encname $s]]
         }
     } else {
+        #review - use -profile?
         proc encodable "s {enc [encoding system]}" {
             set encname [encname $enc]
-            string eq $s [encoding convertfrom $encname [encoding convertto $encname $s]]
+            if {![catch {
+                string eq $s [encoding convertfrom $encname [encoding convertto $encname $s]]
+            } result]} {
+                return $result
+            } else {
+                return 0
+            }
         }
         proc decodable "s {enc [encoding system]}" {
             set encname [encname $enc]
-            string eq $s [encoding convertto $encname [encoding convertfrom $encname $s]]
+            if {![catch {
+                string eq $s [encoding convertto $encname [encoding convertfrom $encname $s]]
+            } result]} {
+                return $result
+            } else {
+                return 0
+            }
         }
     }
     #-- --- --- --- --- --- --- --- 
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/console-0.1.1.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/console-0.1.1.tm
index 3c64c7e3..6368aeae 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/console-0.1.1.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/console-0.1.1.tm
@@ -13,11 +13,51 @@
 # @@ Meta End
 
 
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# doctools header
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+#*** !doctools
+#[manpage_begin punkshell_module_punk::console 0 0.1.1]
+#[copyright "2024"]
+#[titledesc {punk console}]  [comment {-- Name section and table of contents description --}]
+#[moddesc {punk console}]             [comment {-- Description at end of page heading --}] 
+#[require punk::console]
+#[keywords module console terminal]
+#[description]
+#[para]
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[section Overview]
+#[para] overview of punk::console
+#[subsection Concepts]
+#[para]
 
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 ##  Requirements
-##e.g package require frobz
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[subsection dependencies]
+#[para] packages used by punk::console
+#[list_begin itemized]
+
+package require Tcl 8.6-
 package require punk::ansi
+#*** !doctools
+#[item] [package {Tcl 8.6-}]
+#[item] [package {punk::ansi}]
+
+
+#*** !doctools
+#[list_end]
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[section API]
+
 
 
 #if {"windows" eq $::tcl_platform(platform)} {
@@ -30,6 +70,13 @@ package require punk::ansi
 
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 namespace eval punk::console {
+    #*** !doctools
+    #[subsection {Namespace punk::console}]
+    #[para]
+
+    #*** !doctools
+    #[list_begin definitions]
+
     variable tabwidth 8  ;#default only - will attempt to detect and set to that configured in terminal
     #Note that windows terminal cooked mode seems to use 8 for interactive use even if set differently
     #e.g typing tab characters may still be echoed 8-spaced while writing to stdout my obey the terminal's tab stops.  
@@ -1028,23 +1075,37 @@ namespace eval punk::console {
         return [split [get_cursor_pos $inoutchannels] ";"]
     }
 
-    #todo - determine cursor on/off state before the call to restore properly. May only be possible 
+    #todo - determine cursor on/off state before the call to restore properly. 
     proc get_size {{inoutchannels {stdin stdout}}} {
         lassign $inoutchannels in out
         #we can't reliably use [chan names] for stdin,stdout. There could be stacked channels and they may have a names such as file22fb27fe810
         #chan eof is faster whether chan exists or not than
-        if {[catch {chan eof $in} is_eof]} {
-                error "punk::console::get_size input channel $in seems to be closed ([info level 1])"
+        if {[catch {chan eof $out} is_eof]} {
+                error "punk::console::get_size output channel $out seems to be closed ([info level 1])"
         } else {
             if {$is_eof} {
-                error "punk::console::get_size eof on input channel $in ([info level 1])"
+                error "punk::console::get_size eof on output channel $out ([info level 1])"
             } 
         }
-        if {[catch {chan eof $out} is_eof]} {
-                error "punk::console::get_size output channel $out seems to be closed ([info level 1])"
+        #we don't need to care about the input channel if chan configure on the output can give us the info.
+        #short circuit ansi cursor movement method if chan configure supports the -winsize value
+        set outconf [chan configure $out]
+        if {[dict exists $outconf -winsize]} {
+            #this mechanism is much faster than ansi cursor movements
+            #REVIEW check if any x-platform anomalies with this method?
+            #can -winsize key exist but contain erroneous info? We will check that we get 2 ints at least 
+            lassign [dict get $outconf -winsize] cols lines
+            if {[string is integer -strict $cols] && [string is integer -strict $lines]} {
+                return [list columns $cols rows $lines]
+            }
+            #continue on to ansi mechanism if we didn't get 2 ints
+        }
+
+        if {[catch {chan eof $in} is_eof]} {
+                error "punk::console::get_size input channel $in seems to be closed ([info level 1])"
         } else {
             if {$is_eof} {
-                error "punk::console::get_size eof on output channel $out ([info level 1])"
+                error "punk::console::get_size eof on input channel $in ([info level 1])"
             } 
         }
 
@@ -1067,18 +1128,28 @@ namespace eval punk::console {
         }
     }
 
-    #faster - but uses cursor_save - which we may want to avoid if calling during another operation which uses cursor save/restore
-    proc get_size_cursorrestore {} {
+    #faster than get_size when it is using ansi mechanism - but uses cursor_save - which we may want to avoid if calling during another operation which uses cursor save/restore
+    proc get_size_cursorrestore {{inoutchannels {stdin stdout}}} {
+        lassign $inoutchannels in out
+        #we use the same shortcircuit mechanism as get_size to avoid ansi at all if the output channel will give us the info directly 
+        set outconf [chan configure $out]
+        if {[dict exists $outconf -winsize]} {
+            lassign [dict get $outconf -winsize] cols lines
+            if {[string is integer -strict $cols] && [string is integer -strict $lines]} {
+                return [list columns $cols rows $lines]
+            }
+        }
+
         if {[catch {
             #some terminals (conemu on windows) scroll the viewport when we make a big move down like this - a  move to 1 1 immediately after cursor_save doesn't seem to fix that.
             #This issue also occurs when switching back from the alternate screen buffer - so perhaps that needs to be addressed elsewhere.
-            puts -nonewline [punk::ansi::cursor_off][punk::ansi::cursor_save_dec][punk::ansi::move 2000 2000]
-            lassign [get_cursor_pos_list] lines cols
-            puts -nonewline [punk::ansi::cursor_restore][punk::console::cursor_on];flush stdout
+            puts -nonewline $out [punk::ansi::cursor_off][punk::ansi::cursor_save_dec][punk::ansi::move 2000 2000]
+            lassign [get_cursor_pos_list $inoutchannels] lines cols
+            puts -nonewline $out [punk::ansi::cursor_restore][punk::console::cursor_on];flush $out 
             set result [list columns $cols rows $lines] 
         } errM]} {
-            puts -nonewline [punk::ansi::cursor_restore_dec]
-            puts -nonewline [punk::ansi::cursor_on]
+            puts -nonewline $out [punk::ansi::cursor_restore_dec]
+            puts -nonewline $out [punk::ansi::cursor_on]
             error "$errM"
         } else {
             return $result
@@ -1803,6 +1874,9 @@ namespace eval punk::console {
     }
     #run the test and allow warnings to be emitted to stderr on package load. User should know the terminal and/or Tcl version are not optimal for unicode character work
     #set testresult [test1]
+
+    #*** !doctools
+    #[list_end] [comment {--- end definitions namespace punk::console ---}]
 }
 
 
@@ -1825,4 +1899,7 @@ package provide punk::console [namespace eval punk::console {
     variable version
     set version 0.1.1 
 }]
-return
\ No newline at end of file
+return
+
+#*** !doctools
+#[manpage_end]
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/du-0.1.0.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/du-0.1.0.tm
index f0e96a28..1eca1f47 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/du-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/du-0.1.0.tm
@@ -967,7 +967,7 @@ namespace eval punk::du {
             dict set effective_opts -with_times $timed_types
             dict set effective_opts -with_sizes $sized_types
 
-            return [list dirs $dirs vfsmounts $vfsmounts links $links files $files filesizes [dict get $mdata_lists fsizes] sizes [dict get $mdata_lists allsizes] times [dict get $mdata_lists alltimes] flaggedhidden {} flaggedsystem {} flaggedreadonly {} altname {} opts $effective_opts errors $errors]
+            return [list dirs $dirs vfsmounts $vfsmounts links $links files $files filesizes [dict get $mdata_lists fsizes] sizes [dict get $mdata_lists allsizes] times [dict get $mdata_lists alltimes] flaggedhidden $flaggedhidden flaggedsystem {} flaggedreadonly {} altname {} opts $effective_opts errors $errors]
         }
 
         #zipfs attributes/behaviour fairly different to tclvfs - keep separate
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/lib-0.1.1.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/lib-0.1.1.tm
index cb786f22..63f32dee 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/lib-0.1.1.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/lib-0.1.1.tm
@@ -328,7 +328,17 @@ tcl::namespace::eval punk::lib::compat {
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 namespace eval punk::lib {
     tcl::namespace::export *
-    #variable xyz
+    variable has_struct_list
+    set has_struct_list [expr {![catch {package require struct::list}]}]
+    variable has_struct_set
+    set has_struct_set [expr {![catch {package require struct::set}]}]
+    variable has_punk_ansi
+    set has_punk_ansi [expr {![catch {package require punk::ansi}]}]
+    set has_twapi 0
+    if {"windows" eq $::tcl_platform(platform)} {
+        set has_twapi [expr {![catch {package require twapi}]}]
+    }
+
 
     #*** !doctools
     #[subsection {Namespace punk::lib}]
@@ -614,7 +624,9 @@ namespace eval punk::lib {
     }
 
     proc pdict {args} {
-        if {[catch {package require punk::ansi} errM]} {
+        package require punk::args
+        variable has_punk_ansi
+        if {!$has_punk_ansi} {
             set sep " = "    
         } else {
             #set sep " [a+ Web-seagreen]=[a] "
@@ -691,14 +703,15 @@ namespace eval punk::lib {
     # - Copy proc and attempt rework so we can get back to this as a baseline for functionality
     proc showdict {args} {   ;# analogous to parray (except that it takes the dict as a value)
         #set sep " [a+ Web-seagreen]=[a] "
-        if {[catch {package require punk::ansi} errM]} {
-            set sep " = "
+        variable has_punk_ansi
+        if {!$has_punk_ansi} {
             set RST ""
+            set sep " = "
             set sep_mismatch " mismatch "
         } else {
-            set sep " [punk::ansi::a+ Green]=[punk::ansi::a] " ;#stick to basic default colours for wider terminal support
             set RST [punk::ansi::a]
-            set sep_mismatch " [punk::ansi::a+ Brightred undercurly underline undt-white]mismatch[punk::ansi::a] "
+            set sep " [punk::ansi::a+ Green]=$RST " ;#stick to basic default colours for wider terminal support
+            set sep_mismatch " [punk::ansi::a+ Brightred undercurly underline undt-white]mismatch$RST "
         }
         package require punk ;#we need pipeline pattern matching features
         package require textblock
@@ -836,7 +849,7 @@ namespace eval punk::lib {
                                 lappend keyset_structure dict 
                             }
                             @* {
-                                puts ---->HERE<----
+                                #puts "showdict ---->@*<----"
                                 dict set pattern_this_structure $p list
                                 set keys [punk::lib::range 0 [llength $dval]-1]
                                 lappend keyset {*}$keys
@@ -1405,16 +1418,29 @@ namespace eval punk::lib {
     }
 
     proc is_list_all_in_list {small large} {
-        package require struct::list
-        package require struct::set
         set small_in_large [lsort [struct::set intersect [lsort -unique $small] $large ]]
         return [struct::list equal [lsort $small] $small_in_large]
     }
+    if {!$has_struct_list || !$has_struct_set} {
+        set body {
+            package require struct::list
+            package require struct::set
+        }
+        append body [info body is_list_all_in_list]
+        proc is_list_all_in_list {small large} $body
+    }
+
     proc is_list_all_ni_list {a b} {
-        package require struct::set
         set i [struct::set intersect $a $b]
         return [expr {[llength $i] == 0}]
     }
+    if {!$has_struct_set} {
+        set body {
+            package require struct::list
+        }
+        append body [info body is_list_all_ni_list]
+        proc is_list_all_ni_list {a b} $body
+    }
 
     #somewhat like struct::set difference - but order preserving, and doesn't treat as a 'set' so preserves dupes in fromlist
     #struct::set difference may happen to preserve ordering when items are integers, but order can't be relied on,
@@ -1465,18 +1491,22 @@ namespace eval punk::lib {
         return [array names tmp]
     }
 
-    package require struct::set
-    if {[struct::set equal [struct::set union {a a} {}] {a}]} {
-        proc lunique_unordered {list} {
-            struct::set union $list {}
-        }
-    } else {
-        puts stderr "WARNING: struct::set union <list> <emptylist> no longer dedupes!" 
-        #we could also test a sequence of: struct::set add 
-        proc lunique_unordered {list} {
-            tailcall lunique $list
+    #default/fallback implementation
+    proc lunique_unordered {list} {
+        lunique $list
+    }
+    if {$has_struct_set} {
+        if {[struct::set equal [struct::set union {a a} {}] {a}]} {
+            proc lunique_unordered {list} {
+                struct::set union $list {}
+            }
+        } else {
+            puts stderr "WARNING: struct::set union <list> <emptylist> no longer dedupes!" 
+            #we could also test a sequence of: struct::set add 
         }
     }
+
+
     #order-preserving
     proc lunique {list} {
         set new {}
@@ -1863,14 +1893,14 @@ namespace eval punk::lib {
         set opt_empty [tcl::dict::get $opts -empty_as_hex]
         # -- --- --- --- 
 
-        set list_largeHex [lmap h $list_largeHex[unset list_largeHex] {string map [list _ ""] [string trim $h]}]
+        set list_largeHex [lmap h $list_largeHex[unset list_largeHex] {string map {_ ""} [string trim $h]}]
         if {$opt_validate} {
             #Note appended F so that we accept list of empty strings as per the documentation
             if {![string is xdigit -strict [join $list_largeHex ""]F ]} {
                 error "[namespace current]::hex2dec error: non-hex digits encountered after stripping underscores and leading/trailing whitespace for each element\n $list_largeHex"
             }
         }
-        if {![string is xdigit -strict [string map [list _ ""] $opt_empty]]} {
+        if {![string is xdigit -strict [string map {_ ""} $opt_empty]]} {
             #mapping empty string to a value destroys any advantage of -scanonly
             #todo - document that -scanonly has 2 restrictions - each element must be valid hex and less than 7 chars long
             #set list_largeHex [lmap v $list_largeHex[set list_largeHex {}] {expr {$v eq ""} ? {0} : {[set v]}}]
@@ -1878,7 +1908,7 @@ namespace eval punk::lib {
                 error "[namespace current]::hex2dec error: empty values in list cannot be mapped to non-hex $opt_empty"
             }
         } else {
-            set opt_empty [string trim [string map [list _ ""] $opt_empty]]
+            set opt_empty [string trim [string map {_ ""} $opt_empty]]
             if {[set first_empty [lsearch $list_largeHex ""]] >= 0} {
                 #set list_largeHex [lmap v $list_largeHex[set list_largeHex {}] {expr {$v eq ""} ? {$opt_empty} : {$v}}]
                 set nonempty_head [lrange $list_largeHex 0 $first_empty-1]
@@ -1931,13 +1961,13 @@ namespace eval punk::lib {
         }
         set fmt "%${opt_width}.${opt_width}ll${spec}"
 
-        set list_decimals [lmap d $list_decimals[unset list_decimals] {string map [list _ ""] [string trim $d]}]
-        if {![string is digit -strict [string map [list _ ""] $opt_empty]]} {
+        set list_decimals [lmap d $list_decimals[unset list_decimals] {string map {_ ""} [string trim $d]}]
+        if {![string is digit -strict [string map {_ ""} $opt_empty]]} {
             if {[lsearch $list_decimals ""] >=0} {
                 error "[namespace current]::dec2hex error: empty values in list cannot be mapped to non-decimal $opt_empty"
             }
         } else {
-            set opt_empty [string map [list _ ""] $opt_empty]
+            set opt_empty [string map {_ ""} $opt_empty]
             if {[set first_empty [lsearch $list_decimals ""]] >= 0} {
                 set nonempty_head [lrange $list_decimals 0 $first_empty-1]
                 set list_decimals [concat $nonempty_head [lmap v [lrange $list_decimals $first_empty end] {expr {$v eq ""} ? {$opt_empty} : {$v}}]]
@@ -2402,13 +2432,14 @@ namespace eval punk::lib {
     # important for pipeline & match_assign
     #  -line trimline|trimleft|trimright  -block trimhead|trimtail|triminner|trimall|trimhead1|trimtail1|collateempty -commandprefix {string length} ?
     #  -block trimming only trims completely empty lines. use -line trimming to remove whitespace e.g -line trimright will clear empty lines without affecting leading whitespace on other lines that aren't pure whitespace
-    proc linelist {args} {
+
+    set linelist_body {
         set usage "linelist ?-line trimline|trimleft|trimright? ?-block trimhead|trimtail|triminner|trimall|trimhead1|trimtail1|collateempty? -commandprefix <cmdlist> text"
         if {[llength $args] == 0} {
             error "linelist missing textchunk argument usage:$usage" 
         }
         set text [lindex $args end]
-        set text [string map [list \r\n \n] $text] ;#review - option?
+        set text [string map {\r\n \n} $text] ;#review - option?
 
         set arglist [lrange $args 0 end-1]
         set opts [tcl::dict::create\
@@ -2441,10 +2472,10 @@ namespace eval punk::lib {
                 }
             }
             #normalize certain combos
-            if {[set posn [lsearch $opt_block trimhead1]] >=0 && "trimhead" in $opt_block} {
+            if {"trimhead" in $opt_block && [set posn [lsearch $opt_block trimhead1]] >=0} {
                 set opt_block [lreplace $opt_block $posn $posn]
             }
-            if {[set posn [lsearch $opt_block trimtail1]] >=0 && "trimtail" in $opt_block} {
+            if {"trimtail" in $opt_block && [set posn [lsearch $opt_block trimtail1]] >=0} {
                 set opt_block [lreplace $opt_block $posn $posn]
             }
             if {"trimall" in $opt_block} {
@@ -2594,9 +2625,10 @@ namespace eval punk::lib {
         #Each resulting line should have a reset of some type at start and a pure-reset at end to stop 
         #see if we can find an ST sequence that most terminals will not display for marking sections?
         if {$opt_ansireplays} {
-            package require punk::ansi
+            #package require punk::ansi
+            <require_punk_ansi>
             if {$opt_ansiresets} {
-                set RST [punk::ansi::a]
+                set RST "\x1b\[0m" 
             } else {
                 set RST ""
             }
@@ -2721,6 +2753,15 @@ namespace eval punk::lib {
 
         return $linelist
     }
+    if {$has_punk_ansi} {
+        #optimise linelist as much as possible
+        set linelist_body [string map {<require_punk_ansi> ""} $linelist_body]
+    } else {
+        #punk ansi not avail at time of package load.
+        #by putting in calls to punk::ansi the user will get appropriate error messages 
+        set linelist_body [string map {<require_punk_ansi> "package require punk::ansi"} $linelist_body]
+    }
+    proc linelist {args} $linelist_body 
 
 
     interp alias {} errortime {} punk::lib::errortime
@@ -2846,6 +2887,133 @@ namespace eval punk::lib {
     proc temperature_c_to_f {deg_celsius} {
         return [expr {($deg_celsius * (9/5.0)) + 32}]
     }
+
+    proc interp_sync_package_paths {interp} {
+        if {![interp exists $interp]} {
+            error "interp_sync_package_paths error. interp '$interp' not found. Create it first with \[interp create $interp\]"
+        }
+        interp eval $interp [list set ::auto_path $::auto_path]
+        interp eval $interp {tcl::tm::remove {*}[tcl::tm::list]}
+        interp eval $interp [list tcl::tm::add {*}[lreverse [tcl::tm::list]]]
+    }
+
+    proc objclone {obj} {
+        append obj2 $obj {}
+    }
+
+
+
+    proc format_number {numbers_or_commaformattednumbers {delim ""} {groupsize ""}} {
+        variable has_twapi
+        if {$has_twapi} {
+            if {$delim eq "" && $groupsize eq ""} {
+                set localeid [twapi::get_system_default_lcid]
+            }
+        }
+
+        set results [list]
+        set nums [objclone $numbers_or_commaformattednumbers] ;#stops single num from getting internal rep of list
+        foreach inputnum $nums {
+            set number [objclone $inputnum]
+            #also handle tcl 8.7+ underscores in numbers
+            set number [string map [list _ "" , ""] $number]
+            #normalize e.g 2e4 -> 20000.0
+            set number [expr {$number}]
+
+            if {$has_twapi} {
+                if {$delim eq "" && $groupsize eq ""} {
+                    lappend results [twapi::format_number $number $localeid -idigits -1]
+                    continue
+                } else {
+                    if {$delim eq ""} {set delim ","}
+                    if {$groupsize eq ""} {set groupsize 3}
+                    lappend results [twapi::format_number $number 0 -idigits -1 -sthousand $delim -sgrouping $groupsize]
+                    continue
+                }
+            }
+            #todo - get configured user defaults
+            set delim ","
+            set groupsize 3
+
+            lappend results [delimit_number $number $delim $groupsize]
+        }
+
+        if {[llength $results] == 1} {
+            #keep intrep as string rather than list
+            return [lindex $results 0]
+        }
+        return $results
+    }
+
+
+    #from wiki https://wiki.tcl-lang.org/page/Delimiting+Numberse
+    # Given a number represented as a string, insert delimiters to break it up for
+    # readability. Normally, the delimiter will be a comma which will be inserted every
+    # three digits. However, the delimiter and groupsize are optional arguments,
+    # permitting use in other locales.
+    #
+    # The string is assumed to consist of digits, possibly preceded by spaces,
+    # and possibly containing a decimal point, i.e.: [:space:]*[:digit:]*\.[:digit:]*
+
+    proc delimit_number {unformattednumber {delim ","} {GroupSize 3}} {
+        set number [punk::objclone $unformattednumber]
+        set number [string map {_ ""} $number]
+        #normalize using expr - e.g 2e4 -> 20000.0
+        set number [expr {$number}]
+        # First, extract right hand part of number, up to and including decimal point
+        set point [string last "." $number];
+        if {$point >= 0} {
+            set PostDecimal [string range $number [expr $point + 1] end];
+            set PostDecimalP 1;
+        } else {
+            set point [expr [string length $number] + 1]
+            set PostDecimal "";
+            set PostDecimalP 0;
+        }
+
+        # Now extract any leading spaces. review  - regex for whitespace instead of just ascii space?
+        set ind 0;
+        while {[string equal [string index $number $ind] \u0020]} {
+            incr ind;
+        }
+        set FirstNonSpace $ind;
+        set LastSpace [expr $FirstNonSpace - 1];
+        set LeadingSpaces [string range $number 0 $LastSpace];
+
+        # Now extract the non-fractional part of the number, omitting leading spaces.
+        set MainNumber [string range $number $FirstNonSpace [expr $point -1]];
+
+        # Insert commas into the non-fractional part.
+        set Length [string length $MainNumber];
+        set Phase  [expr $Length % $GroupSize]
+        set PhaseMinusOne  [expr $Phase -1];
+        set DelimitedMain "";
+
+        #First we deal with the extra stuff.
+        if {$Phase > 0} {
+            append DelimitedMain [string range $MainNumber 0 $PhaseMinusOne];
+        }
+        set FirstInGroup $Phase;
+        set LastInGroup [expr $FirstInGroup + $GroupSize -1];
+        while {$LastInGroup < $Length} {
+            if {$FirstInGroup > 0} {
+                append DelimitedMain $delim;
+            }
+            append DelimitedMain [string range $MainNumber $FirstInGroup $LastInGroup];
+            incr FirstInGroup $GroupSize
+            incr LastInGroup  $GroupSize
+        }
+
+        # Reassemble the number.
+        if {$PostDecimalP} {
+            return [format "%s%s.%s" $LeadingSpaces $DelimitedMain $PostDecimal];
+        } else {
+            return [format "%s%s" $LeadingSpaces $DelimitedMain];
+        }
+    }
+
+
+
     #*** !doctools
     #[list_end] [comment {--- end definitions namespace punk::lib ---}]
 }
@@ -2998,7 +3166,9 @@ tcl::namespace::eval punk::lib::system {
         return [concat $smallfactors [lreverse $largefactors] $x]
     }
 
-    # incomplte - report which is the innermost bracket/quote etc awaiting completion for a Tcl command
+
+
+    # incomplete - report which is the innermost bracket/quote etc awaiting completion for a Tcl command
     #important - used by punk::repl
     proc incomplete {partial} {
         #we can apparently get away without concatenating current innerpartial to previous in list - REVIEW.
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/base-0.1.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/base-0.1.tm
index 1e90b5ca..932c1db6 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/base-0.1.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/base-0.1.tm
@@ -35,12 +35,14 @@ namespace eval punk::mix::base {
         }
         #puts stderr "punk::mix::base extension: [string trimleft $extension :]"
         if {![string length $extension]} {
-            #if still no extension - must have been called dirctly as punk::mix::base::_cli
+            #if still no extension - must have been called directly as punk::mix::base::_cli
             if {![llength $args]} {
                 set args "help"
             }
             set extension [namespace current]
         }
+        #init usually used to load commandsets (and export their names) into the extension namespace/ensemble
+        ${extension}::_init
         if {![llength $args]} {
             if {[info exists ${extension}::default_command]} {
                 tailcall $extension [set ${extension}::default_command]
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm
index 5b1ec6da..cd6f3025 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm
@@ -31,47 +31,58 @@ namespace eval punk::mix::cli {
     namespace eval temp_import {
     }
     namespace ensemble create
+    variable initialised 0
 
-    package require punk::overlay
-    catch {
-        punk::overlay::import_commandset module . ::punk::mix::commandset::module
-    }
-    punk::overlay::import_commandset debug . ::punk::mix::commandset::debug
-    punk::overlay::import_commandset repo  . ::punk::mix::commandset::repo
-    punk::overlay::import_commandset lib   . ::punk::mix::commandset::loadedlib
-
-    catch {
-        package require punk::mix::commandset::project
-        punk::overlay::import_commandset project    .       ::punk::mix::commandset::project
-        punk::overlay::import_commandset projects   .       ::punk::mix::commandset::project::collection 
-    }
-    if {[catch {
-        package require punk::mix::commandset::layout
-        punk::overlay::import_commandset project.layout       . ::punk::mix::commandset::layout
-        punk::overlay::import_commandset project.layouts      . ::punk::mix::commandset::layout::collection
-    } errM]} {
-        puts stderr "error loading punk::mix::commandset::layout"
-        puts stderr $errM
-    }
-    if {[catch {
-        package require punk::mix::commandset::buildsuite
-        punk::overlay::import_commandset buildsuite     .   ::punk::mix::commandset::buildsuite
-        punk::overlay::import_commandset buildsuites    .   ::punk::mix::commandset::buildsuite::collection
-    } errM]} {
-        puts stderr "error loading punk::mix::commandset::buildsuite"
-        puts stderr $errM
-    }
-    punk::overlay::import_commandset scriptwrap  . ::punk::mix::commandset::scriptwrap
-    if {[catch {
-        package require punk::mix::commandset::doc
-        punk::overlay::import_commandset doc . ::punk::mix::commandset::doc
-        punk::overlay::import_commandset ""  ""   ::punk::mix::commandset::doc::collection
-    } errM]} {
-        puts stderr "error loading punk::mix::commandset::doc"
-        puts stderr $errM
+    #lazy _init - called by punk::mix::base::_cli when ensemble used 
+    proc _init {args} {
+        variable initialised
+        if {$initialised} {
+            return
+        }
+        puts stderr "punk::mix::cli::init $args"
+        package require punk::overlay
+        namespace eval ::punk::mix::cli {
+            catch {
+                punk::overlay::import_commandset module . ::punk::mix::commandset::module
+            }
+            punk::overlay::import_commandset debug . ::punk::mix::commandset::debug
+            punk::overlay::import_commandset repo  . ::punk::mix::commandset::repo
+            punk::overlay::import_commandset lib   . ::punk::mix::commandset::loadedlib
+
+            catch {
+                package require punk::mix::commandset::project
+                punk::overlay::import_commandset project    .       ::punk::mix::commandset::project
+                punk::overlay::import_commandset projects   .       ::punk::mix::commandset::project::collection 
+            }
+            if {[catch {
+                package require punk::mix::commandset::layout
+                punk::overlay::import_commandset project.layout       . ::punk::mix::commandset::layout
+                punk::overlay::import_commandset project.layouts      . ::punk::mix::commandset::layout::collection
+            } errM]} {
+                puts stderr "error loading punk::mix::commandset::layout"
+                puts stderr $errM
+            }
+            if {[catch {
+                package require punk::mix::commandset::buildsuite
+                punk::overlay::import_commandset buildsuite     .   ::punk::mix::commandset::buildsuite
+                punk::overlay::import_commandset buildsuites    .   ::punk::mix::commandset::buildsuite::collection
+            } errM]} {
+                puts stderr "error loading punk::mix::commandset::buildsuite"
+                puts stderr $errM
+            }
+            punk::overlay::import_commandset scriptwrap  . ::punk::mix::commandset::scriptwrap
+            if {[catch {
+                package require punk::mix::commandset::doc
+                punk::overlay::import_commandset doc . ::punk::mix::commandset::doc
+                punk::overlay::import_commandset ""  ""   ::punk::mix::commandset::doc::collection
+            } errM]} {
+                puts stderr "error loading punk::mix::commandset::doc"
+                puts stderr $errM
+            }
+        }
+        set initialised 1
     }
 
-
     proc help {args} {
         #set basehelp [punk::mix::base::help -extension [namespace current] {*}$args]
         set basehelp [punk::mix::base help {*}$args]
@@ -210,11 +221,12 @@ namespace eval punk::mix::cli {
         proc validate_modulename {modulename args} {
             set opts [list\
                 -errorprefix validate_modulename\
+                -strict 0\
                 ]
             if {[llength $args] %2 != 0} {error "validate_modulename args must be name-value pairs: received '$args'"}
             foreach {k v} $args {
                 switch -- $k {
-                    -errorprefix {
+                    -errorprefix - -strict {
                         dict set opts $k $v
                     }
                     default {
@@ -223,8 +235,14 @@ namespace eval punk::mix::cli {
                 }
             }
             # -- --- --- --- --- --- --- --- --- --- --- --- --- ---
-            set opt_errorprefix            [dict get $opts -errorprefix]
+            set opt_errorprefix             [dict get $opts -errorprefix]
+            set opt_strict                  [dict get $opts -strict]
             # -- --- --- --- --- --- --- --- --- --- --- --- --- ---
+            if {$opt_strict} {
+                if {[regexp {[A-Z]} $modulename]} {
+                    error "$opt_errorprefix '$modulename' contains uppercase which is not recommended as per tip 590, and option -strict is set to 1" 
+                }
+            }
 
             validate_name_not_empty_or_spaced $modulename -errorprefix $opt_errorprefix
             set testname [string map {:: {}} $modulename]
@@ -239,6 +257,56 @@ namespace eval punk::mix::cli {
             }
             return $modulename
         }
+        proc confirm_modulename {modulename} {
+            set finalised 0
+            set aborted 0
+            while {!$finalised && !$aborted} {
+                #first validate with -strict 0 to confirm acceptable while ignoring case issues.
+                #uppercase is generally valid but not recommended - so has separate prompting.
+                if {[catch {validate_modulename $modulename -strict 0} errM]} {
+                    set msg "Chosen name didn't pass validation\n"
+                    append msg "reason: $errM\n"
+                    append msg "Please retype the modulename. You will be given a further prompt to confirm or abort."
+                    set modulename [util::askuser $msg]
+                } elseif {[regexp {[A-Z]} $modulename]} {
+                    set msg     "module names containing uppercase are not recommended (see tip 590).\n"
+                    append msg  "Please retype the module name '$modulename' to proceed.\n"
+                    append msg  "If you type it exactly as it was you will be allowed to proceed with uppercase anyway\n" 
+                    append msg  "Retype it all in lowercase to use recommended naming"
+                    set answer [util::askuser $msg]
+                    if {[regexp {[A-Z]} $answer]} {
+                        if {$answer eq $modulename} {
+                            #ok - user insists
+                            set finalised 1
+                        } else {
+                            #user supplied a different uppercase name - don't set finalised so we bug them again to type it two times the same way to proceed
+                            puts stdout "A different uppercase name was supplied - reconfirmation required."
+                        }
+                        set modulename $answer
+                    } else {
+                        #user has resupplied modulename all as lowercase 
+                        if {$answer eq [string tolower $modulename]} {
+                            set finalised 1
+                        } else {
+                            #.. but it doesn't match original - require rerun 
+                        }
+                        set modulename $answer
+                    }
+                } else {
+                    set answer [util::askuser "Proceed with the module name '$modulename'? Y to continue N to abort"]
+                    if {[string tolower $answer] eq "y"} {
+                        set finalised 1
+                    } else {
+                        set aborted 1
+                    }
+                }
+            }
+            if {$aborted} {
+                return [dict create status error reason errmsg]
+            } else {
+                return [dict create status ok modulename $modulename]
+            }
+        }
 
         proc validate_projectname {projectname args} {
             set defaults [list\
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/doc-0.1.0.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/doc-0.1.0.tm
index fafc3cec..856c9340 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/doc-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/doc-0.1.0.tm
@@ -165,7 +165,17 @@ namespace eval punk::mix::commandset::doc {
 
         cd $original_wd
     }
-    proc validate {} {
+    proc validate {args} {
+        set argd [punk::args::get_dict {
+            --          -type none -optional 1 -help "end of options marker --" 
+            -individual -type boolean -default 1
+            *values -min 0 -max -1
+            patterns -default {*} -type any -multiple 1
+        } $args] 
+        set opt_individual      [tcl::dict::get $argd opts -individual]
+        set patterns        [tcl::dict::get $argd values patterns]
+
+        
         #todo - run and validate punk::docgen output
         set projectdir [punk::repo::find_project]
         if {$projectdir eq ""} {
@@ -180,7 +190,23 @@ namespace eval punk::mix::commandset::doc {
         set docroot $projectdir/src/doc
         cd $docroot
 
-        dtplite validate  $docroot
+        if {!$opt_individual && "*" in $patterns} {
+            if {[catch {
+                dtplite validate  $docroot
+            } errM]} {
+                puts stderr "commandset::doc::validate failed for projectdir '$projectdir'"
+                puts stderr "docroot '$docroot'"
+                puts stderr "dtplite error was: $errM"
+            }
+        } else {
+            foreach p $patterns {
+                set treefiles [punk::path::treefilenames $p]
+                foreach path $treefiles {
+                    puts stdout "dtplite validate $path"
+                    dtplite validate $path
+                }
+            }
+        }
 
         #punk::mix::cli::lib::kettle_call lib validate-doc
 
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/loadedlib-0.1.0.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/loadedlib-0.1.0.tm
index bd0b5358..08d103ee 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/loadedlib-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/loadedlib-0.1.0.tm
@@ -179,7 +179,16 @@ namespace eval punk::mix::commandset::loadedlib {
         return [join $loaded_libs \n]
     }
 
-    proc info {libname} {
+    proc info {args} {
+        set argspecs {
+            *values -min 1
+            libname -help "library/package name"
+        }
+        set argd [punk::args::get_dict $argspecs $args]
+        set libname [dict get $argd values libname]
+
+
+
         if {[catch {package require natsort}]} {
             set has_natsort 0
         } else {
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/module-0.1.0.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/module-0.1.0.tm
index 9955c53b..029be3ce 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/module-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/module-0.1.0.tm
@@ -204,6 +204,30 @@ namespace eval punk::mix::commandset::module {
             set modulename $module
         }
         punk::mix::cli::lib::validate_modulename $modulename -errorprefix "punk::mix::commandset::module::new"
+
+        if {[regexp {[A-Z]} $module]} {
+            set msg     "module names containing uppercase are not recommended (see tip 590).\n"
+            append msg  "Please retype the module name '$module' to proceed.\n"
+            append msg  "If you type it exactly as it was you will be allowed to proceed with uppercase anyway\n" 
+            append msg  "Retype it all in lowercase to use recommended naming"
+            set answer [util::askuser $msg]
+            if {[regexp {[A-Z]} $answer]} {
+                if {$answer eq $module} {
+                    #ok - user insists
+                } else {
+
+                }
+            } else {
+                #user has resupplied modulename all as lowercase 
+                if {$answer eq [string tolower $module]} {
+                    set module $answer
+                } else {
+                    #.. but it doesn't match original - require rerun 
+                }
+            }
+        }
+
+
         # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
         #options
         # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/project-0.1.0.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/project-0.1.0.tm
index aa630d36..9afc685c 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/project-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/mix/commandset/project-0.1.0.tm
@@ -165,7 +165,7 @@ namespace eval punk::mix::commandset::project {
                 #user can use dev module.new manually or supply module name in -modules
                 set opt_modules [list] 
             } else {
-                set opt_modules [list $projectname]
+                set opt_modules [list [string tolower $projectname]] ;#default modules to lowercase as is the modern (tip 590) recommendation for Tcl
             }
         }
         # -- --- --- --- --- --- --- --- --- --- --- --- ---
@@ -919,10 +919,18 @@ namespace eval punk::mix::commandset::project {
 
             if {[llength $col_states]} {
                 foreach row $col_rowids wd $workdirs db $col_fnames dup $col_dupids pname $col_pnames pcode $col_pcodes s $col_states {
+                    if {![file exists $wd]} {
+                        set row [punk::ansi::a+ strike red]$row[a]
+                        set wd [punk::ansi::a+ red]$wd[a]
+                    }
                     append msg "[overtype::right $col0 $row] [overtype::left $col1 $wd] [overtype::left $col2 $db] [overtype::right $col3 $dup] [overtype::left $col4 $pname] [overtype::left $col5 $pcode] [overtype::left $col6 $s]" \n
                 } 
             } else {
                 foreach row $col_rowids wd $workdirs db $col_fnames dup $col_dupids pname $col_pnames pcode $col_pcodes {
+                    if {![file exists $wd]} {
+                        set row [punk::ansi::a+ strike red]$row[a]
+                        set wd [punk::ansi::a+ red]$wd[a]
+                    }
                     append msg "[overtype::right $col0 $row] [overtype::left $col1 $wd] [overtype::left $col2 $db] [overtype::right $col3 $dup] [overtype::left $col4 $pname] [overtype::left $col5 $pcode]" \n
                 } 
             }
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/overlay-0.1.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/overlay-0.1.tm
index 5534dad3..73b8ef39 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/overlay-0.1.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/overlay-0.1.tm
@@ -130,6 +130,7 @@ tcl::namespace::eval ::punk::overlay {
         }]
 
         set imported_commands [list]
+        set imported_tails [list]
         set nscaller [uplevel 1 [list tcl::namespace::current]]
         if {[catch {
             #review - noclobber?
@@ -143,7 +144,10 @@ tcl::namespace::eval ::punk::overlay {
                 }
                 rename $cmd  $import_as
                 lappend imported_commands $import_as
+                lappend imported_tails [namespace tail $import_as]
             }
+            #make imported commands exported so they are available to the ensemble
+            tcl::namespace::eval ${nscaller} [list namespace export {*}$imported_tails]
         } errM]} {
             puts stderr "Error loading commandset $prefix $separator $cmdnamespace"
             puts stderr "err: $errM"
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/path-0.1.0.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/path-0.1.0.tm
index 933ef860..2165c0fd 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/path-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/path-0.1.0.tm
@@ -63,11 +63,11 @@ package require Tcl 8.6-
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 # oo::class namespace
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
-namespace eval punk::path::class {
+#namespace eval punk::path::class {
     #*** !doctools
     #[subsection {Namespace punk::path::class}]
     #[para] class definitions
-    if {[info commands [namespace current]::interface_sample1] eq ""} {
+    #if {[info commands [namespace current]::interface_sample1] eq ""} {
         #*** !doctools
         #[list_begin enumerated]
 
@@ -89,8 +89,8 @@ namespace eval punk::path::class {
 
         #*** !doctools
         #[list_end] [comment {--- end class enumeration ---}]
-    }
-}
+    #}
+#}
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
@@ -105,6 +105,448 @@ namespace eval punk::path {
     #[para] Core API functions for punk::path 
     #[list_begin definitions]
 
+    # -- --- 
+    #punk::path::normjoin
+    # - simplify . and .. segments as far as possible whilst respecting specific types of root.
+    # -- --- 
+    #a form of file normalize that supports //xxx to be treated as server path names
+    #(ie regardless of unices ignoring (generally) leading double slashes, and regardless of windows volumerelative path syntax)
+    #(sometimes //server.com used as a short form for urls - which doesn't seem too incompatible with this anyway) 
+    # -- --- 
+    #This is intended to be purely a string analysis - without reference to filesystem volumes or vfs or zipfs mountpoints etc
+    #
+    #TODO - option for caller to provide a -base below which we can't backtrack.
+    #This is preferable to setting policy here for example regarding forcing no trackback below //servername/share 
+    #Our default is to allow trackback to:
+    #  <scheme>://<something>
+    #  <driveletter>:/
+    #  //./<volume>   (dos device volume)
+    # //server   (while normalizing //./UNC/server to same)
+    # /   (ordinary unix root)
+    # ./../<repeated>  - (track back indefinitely on relpath as we are not resolving to anything physical and can't fully simplify the leading backtracks)
+    #
+    #The caller should do the file/vfs operations to determine this - not us.
+    # -- --- 
+    #simplify path with respect to /./ & /../ elements - independent of platform
+    #NOTE: "anomalies" in standard tcl processing on windows:
+    #e.g file normalize {//host} -> c:/host  (or e.g d:/host if we happen to be on another volume)
+    #file normalize {//host/share} -> //host/share
+    #This is because //host is treated as volume-relative in cmd/powershell and Tcl quite reasonably follows suit.
+    #This prevents cwd and windows commandlines from pointing to the server (above the share)
+    #Explorer however does allow pointing to the //server level and seeing shares as if they are directory entries.
+    #we are more interested in supporting the explorer-like behaviour - as while volumerelative paths are also useful on windows - they are lesser known.
+    #REVIEW.
+    #To get back to some consistent cross platform behaviour - we will treat //something as a root/volume i.e we can't backtrack above it with ".."
+    #note too that file split on UNC paths doesn't give a clear indication of the root
+    # file split //./UNC/server/share/subpath -> //./UNC server share subpath
+    # file split //server/share/subpath -> //server/share subpath
+    #TODO - disallow all change of root or change from relative path to absolute result.
+    #e.g normjoin relpath/../d:/secret should not return d:/secret - but ./d:/secret
+    # ================
+    #known issues:
+    #1)
+    # normjoin d://a//b//c -> d://a/b/c
+    # This is because we don't detect specific schemes. ie it's treated the same as https://a/b/c -> https://a/b/c 
+    # Not considered a problem - just potentially surprising.
+    # To avoid it we would have to enumerate possible schemes. 
+    # As it stands a unix system could define a 'scheme' that happens to match windows style driveletters. Consider a 'feature' ? review.
+    # won't fix?
+    #2)
+    # normjoin https:///real.com/../fake.com -> https:///fake.com
+    # The extra slash means effectively our servername is empty - this is potentially confusing but probably the right thing to do here.
+    # It's a concern only if upstream treats the tripple slash in this case as valid and maps it to https:// - which would probably be bad anyway.
+    # won't fix (review)
+    #3)
+    #similarly
+    # normjoin //./UNC//server/share/subpath -> ///server/share/subpath  (when 2 or more slashes directly after UNC)
+    # normjoin ///server/share  -> ///server/share
+    #This is effectively an empty servername in the input with 'server' being pushed one level down - and the output is consistent
+    # possibly won't fix - review
+    #4) inconsistency 
+    # we return normalized //server/share for //./UNC/server share
+    # but other dos device paths are maintained
+    # e.g //./c:/etc
+    # This is because such paths could contain alternate segment names (windows shortnames) which we aren't in a position to resolve.
+    # caller should 
+    # #as with 'case' below - caller will need to run a post 'file normalize' 
+    #5) we don't normalize case like file normalize does on windows platform.
+    #   This is intentional. It could only be done with reference to underlying filesystem which we don't want here.
+    #  
+    # ================
+    #
+    #relpaths all end up with leading . - while not always the simplest form, this is ok. (helps stop inadvertent conversions to absolutes)
+    # Tests - TODO
+    # normjoin /d:/..//vfs:/test -> /vfs:/test  (good - not converted to //vfs:/test)
+    proc normjoin {args} {
+        set args [lmap a $args {string map "\\\\ /" $a}]
+        set path [plainjoin {*}$args]
+        switch -exact $path {
+            "" {
+                return ""
+            }
+            / - // {
+                #treated in unixlike manner - (but leading doubleslashes with subsequent data are server indication)
+                #// not considered a servername indicator - but /// (for consistency) is. (empty servername?)
+                return /
+            }
+            /// {
+                #if this is effectively //$emptyservername/
+                #then for consistency we should trail //<servername with a slash too?
+                #we can't transform to //  or /  
+                return ///
+                #assert - code below should return /// (empty server prefix) for any number of leading slashes >=3
+                #todo - shortcircuit that here?
+            }
+         }
+        # /// 
+        set doubleslash1_posn [string first // $path] 
+
+        # -- --- --- temp warning on windows only - no x-platform difference in result
+        #on windows //host is of type volumerelative
+        # whereas //host/share is of type absolute
+        if {"windows" eq $::tcl_platform(platform) && [file pathtype $path] eq "volumerelative"} {
+            #volumerelative probably only occurs on windows anyway
+            if {$doubleslash1_posn == 0} {
+                #e.g //something  where no further slashes
+                #review - eventually get rid of this warning and require upstream to know the appropriate usecase
+                puts stderr "Warning - ambiguous path $path - treating as server path - not 'volumerelative'"
+            } else {
+                # /something/etc
+                # /mnt/c/stuff
+                #output will retain leading / as if on unix.
+                #on windows - the result would still be interpreted as volumerelative if the caller normalizes it
+            }
+        }
+        # -- --- ---
+
+        set is_relpath 0 
+
+        #set path [string map [list \\ /] $path]
+        set finalparts [list]
+        set is_nonunc_dosdevice 0
+        if {[punk::winpath::is_dos_device_path $path]} {
+            #review
+            if {[string range $path 4 6] eq "UNC"} {
+                #convert to 'standard' //server/... path for processing
+                set path "/[string range $path 7 end]"  ;# //server/...
+            } else {
+                #error "normjoin non-UNC dos device path '$path' not supported"
+                #first segment after //./ or //?/ represents the volume or drive.
+                #not applicable to unix - but unlikely to conflict with a genuine usecase there (review)
+                #we should pass through and stop navigation below //./vol
+                #!!!
+                #not anomaly in tcl (continues in tcl9)
+                #file exists //./c:/test  -> 0
+                #file exists //?/c:/test  -> 1
+                #file exists //./BootPartition/Windows -> 1
+                #file exists //?/BootPartition/Windows -> 0
+                set is_nonunc_dosdevice 1
+            }
+        }
+
+        if {$is_nonunc_dosdevice} {
+            #dosdevice prefix //./ or //?/  - preserve it (without trailing slash which will be put back in with join)
+            set prefix [string range $path 0 2]
+            set tail [string range $path 4 end]
+            set tailparts [split $tail /]
+            set parts [concat [list $prefix] $tailparts]
+            set rootindex 1 ;#disallow backtrack below //./<volume>
+        } else {
+            #note use of ordinary ::split vs file split is deliberate.
+            if {$doubleslash1_posn == 0} {
+                #this is handled differently on different platforms as far as 'file split' is concerned.
+                #e.g for file split //sharehost/share/path/etc
+                #e.g on windows:  -> //sharehost/share path
+                #e.g on freebsd:  ->  / sharehost share path etc
+                #however..also on windows: file split //sharehost  -> / sharehost
+                #normalize by dropping leading slash before split - and then treating first 2 segments as a root
+                #set parts [file split [string range $path 1 end]]
+                set parts [split $path /]
+                #assert parts here has {} {} as first 2 entries 
+                set rootindex 2
+                #currently prefer can backtrack to the  //zipfs:/  scheme (below the mountpoint - to browse other mounts)
+                #alternative handling for //zipfs:/path - don't go below mountpoint
+                #but we can't determine just from string if mountpoint is direct subpath or a lower one e.g //zipfs:/arbitraryname/actualmountpoint  
+                #review - more generally //<mountmechanism>:/path ?
+                #todo - make an option for zipfs and others to determine the 'base'
+                #if {"zipfs:" eq [lindex $parts 2]} {
+                #    set rootindex 3
+                #}
+            } else {
+                #path may or may not begin with a single slash here.
+                #treat same on unix and windows
+                set rootindex 0
+                #set parts [file split $path]
+                set parts [::split $path /]
+                #e.g /a/b/c -> {} a b c
+                #or relative path a/b/c ->  a b c 
+                #or  c:/a/b/c -> c: a b c
+                if {[string match *: [lindex $parts 0]]} {
+                    if {[lindex $parts 1] eq ""} {
+                        #scheme://x splits to scheme: {} x
+                        set parts [concat [list [lindex $parts 0]/] [lrange $parts 2 end]]
+                        #e.g {scheme:/ x}
+                        set rootindex 1  ;#disallow below first element of scheme
+                    } else {
+                        set rootindex 0
+                    }
+                } elseif {[lindex $parts 0] ne ""} {
+                    #relpath a/b/c
+                    set parts [linsert $parts 0 .]
+                    set rootindex 0 
+                    #allow backtracking arbitrarily for leading .. entries - simplify where possible 
+                    #also need to stop possible conversion to absolute path 
+                    set is_relpath 1
+                }
+            }
+        }
+        set baseparts [lrange $parts 0 $rootindex] ;#base below which we can't retreat via ".."
+        #puts stderr "-->baseparts:$baseparts"
+        #ensure that if our rootindex already spans a dotted segment (after the first one) we remove it
+        #must maintain initial . for relpaths to stop them converting to absolute via backtrack
+        # 
+        set finalparts [list [lindex $baseparts 0]]
+        foreach b [lrange $baseparts 1 end] {
+            if {$b ni {. ..}} {
+                lappend finalparts $b
+            }
+        }
+        set baselen [expr {$rootindex + 1}]
+        if {$is_relpath} {
+            set i [expr {$rootindex+1}]
+            foreach p [lrange $parts $i end] {
+                switch -exact -- $p {
+                    . - "" {}
+                    .. {
+                        switch -exact -- [lindex $finalparts end] {
+                            . - .. {
+                                lappend finalparts ..
+                            }
+                            default {
+                                lpop finalparts
+                            }
+                        }
+                    }
+                    default {
+                        lappend finalparts $p
+                    }
+                }
+                incr i 
+            }
+        } else {
+            foreach p [lrange $parts $rootindex+1 end] {
+                if {[llength $finalparts] <= $baselen} {
+                    if {$p ni {. .. ""}} {
+                        lappend finalparts $p
+                    }
+                } else  {
+                    switch -exact -- $p {
+                        . - "" {}
+                        .. {
+                            lpop finalparts ;#uses punk::lib::compat::lpop if on < 8.7 
+                        }
+                        default {
+                            lappend finalparts $p
+                        }
+                    }
+                }
+            }
+        }
+        puts "==>finalparts: '$finalparts'"
+        # using join - {"" "" server share} -> //server/share  and {a b} -> a/b
+        if {[llength $finalparts] == 1 && [lindex $finalparts 0] eq ""} {
+            #backtracking on unix-style path can end up with empty string as only member of finalparts
+            #e.g /x/..
+            return /
+        }
+        set result [::join $finalparts /]
+        #normalize volumes and mountschemes to have trailing slash if no subpath
+        #e.g c: -> c:/
+        #//zipfs: -> //zipfs:/
+        if {[set lastchar [string index $result end]] eq ":"} {
+            if {$result eq "//zipfs:"} {
+                set result "//zipfs:/"
+            } else {
+                if {[string first / $result] < 0} {
+                    set result $result/
+                }
+            }
+        } elseif {[string match //* $result]} {
+            if {![punk::winpath::is_dos_device_path $result]} {
+                #server
+                set tail [string range $result 2 end]
+                set tailparts [split $tail /]
+                if {[llength $tailparts] <=1} {
+                    #empty //  or //servername
+                    append result /
+                }
+            }
+        } elseif {[llength $finalparts] == 2} {
+            if {[string range [lindex $finalparts 0] end-1 end] eq ":/"} {
+                #e.g https://server/  -> finalparts {https:/ server}
+                #e.g https:/// ->  finalparts {https:/ ""}
+                #scheme based path should always return trailing slash after server component - even if server component empty.
+                lappend finalparts "" ;#force trailing /
+                return [join $finalparts /]
+            }
+        }
+        return $result
+    }
+
+    proc trim_final_slash {str} {
+        if {[string index $str end] eq "/"} {
+            return [string range $str 0 end-1]
+        }
+        return $str
+    }
+
+
+    #x-platform - punk::path::pathtype - can be used in safe interps - different concept of pathtypes to 'file pathtype' 
+    # - no volumerelative 
+    # - no lookup of file volumes (volume is a windows concept - but with //zipfs:/ somewhat applicable to other platforms)
+    # - /* as absolute  (covers also //zipfs:/ (volume),  //server , //./etc , //./UNC)
+    # - xxx:// as absolute (scheme)
+    # - xxx:/ or x:/ as absolute
+    # - x: xxx: -> as absolute (volume-basic or volume-extended) 
+
+    #note also on windows - legacy name for COM devices
+    # COM1 = COM1: 
+    # //./COM1 ??  review
+
+    proc pathtype {str} {
+        set str [string map "\\\\ /" $str]
+        if {[string index $str 0] eq "/"} {
+            #todo - look for //xxx:/ prefix (generalisation of //zipfs:/)  as a 'volume' specifically {volume mount} ?? - review
+            # look for //server prefix as {absolute server}
+            # look for //./UNC/server or //?/UNC/server as  {absolute server UNC} ?
+            # look for //./<dosdevice>  as {absolute dosdevice}
+            return absolute
+        }
+
+        #only firstsegment with single colon at last position (after some non empty string) counts as volume or scheme - review 
+        #e.g a:b:/..  or a::/..  or :/..  is not treated as volume/scheme whereas ab:/ is.
+        set firstslash [string first / $str]
+        if {$firstslash == -1} {
+            set firstsegment $str
+        } else {
+            set firstsegment [string range $str 0 $firstslash-1]
+        }
+        if {[set firstc [string first : $firstsegment]] > 0} {
+            set lhs_firstsegment [string range $firstsegment 0 $firstc-1] 
+            set rhs_firstsegment [string range $firstsegment $firstc+1 end] ;#exclude a:b/ etc
+            if {$rhs_firstsegment eq ""} { 
+                set rhs_entire_path [string range $str $firstc+1 end]
+                #assert lhs_firstsegment not empty since firstc > 0
+                #count following / sequence
+                set i 0
+                set slashes_after_firstsegment "" ;#run of slashes *directly* following first segment
+                while {$i < [string length $rhs_entire_path]} {
+                    if {[string index $rhs_entire_path $i] eq "/"} {
+                        append slashes_after_firstsegment /
+                    } else {
+                        break
+                    }
+                    incr i
+                }
+                switch -exact -- $slashes_after_firstsegment {
+                    "" - / {
+                        if {[string length $lhs_firstsegment] == 1} {
+                            return {absolute volume basic}
+                        } else {
+                            return {absolute volume extended}
+                        }
+                    }
+                    default {
+                        #2 or more /
+                        #this will return 'scheme' even for c://  - even though that may look like a windows volume - review
+                        return {absolute scheme}
+                    }
+                }
+            }
+        }
+        #assert first element of any return has been absolute or relative 
+        return relative
+    }
+
+
+    proc plain {str} {
+        set str [string map "\\\\ /" $str]
+        set pathinfo [punk::path::pathtype $str]
+        if {[lindex $pathinfo 0] eq "relative" && ![string match ./* $str]} {
+            set str ./$str
+        }
+        if {[string index $str end] eq "/"} {
+            if {[string map {/ ""} $str] eq ""} {
+                #all slash segment
+                return $str
+            } else {
+                if {[lindex $pathinfo 1] ni {volume scheme}} {
+                    return [string range $str 0 end-1]
+                }
+            }
+        }
+        return $str
+    }
+    #purely string based - no reference to filesystem knowledge 
+    #unix-style forward slash only
+    proc plainjoin {args} {
+        set args [lmap a $args {string map "\\\\ /" $a}]
+        #if {[llength $args] == 1} {
+        #    return [lindex $args 0]
+        #}
+        set out ""
+        foreach a $args {
+            if {![string length $out]} {
+                append out [plain $a] 
+            } else {
+                set a [plain $a]
+                if {[string map {/ ""} $out] eq ""} {
+                    set out [string range $out 0 end-1]
+                } 
+
+                if {[string map {/ ""} $a] eq ""} {
+                    #all / segment
+                    append out [string range $a 0 end-1]
+                } else {
+                    if {[string length $a] > 2 && [string match "./*" $a]} {
+                        set a [string range $a 2 end]
+                    } 
+                    if {[string index $out end] eq "/"} {
+                        append out $a
+                    } else {
+                        append out / $a 
+                    }
+                }
+            }
+        }
+        return $out 
+    }
+    proc plainjoin1 {args} {
+        if {[llength $args] == 1} {
+            return [lindex $args 0]
+        }
+        set out [trim_final_slash [lindex $args 0]]
+        foreach a [lrange $args 1 end] {
+            set a [trim_final_slash $a]
+            append out / $a 
+        }
+        return $out 
+    }
+
+    #intention?
+    #proc filepath_dotted_dirname {path} {
+    #}
+
+    proc strip_prefixdepth {path prefix} {
+        if {$prefix eq ""} {
+            return [norm $path]
+        }
+        return [file join \
+            {*}[lrange \
+                [file split [norm $path]] \
+                [llength [file split [norm $prefix]]] \
+                end]]
+    }
 
     proc pathglob_as_re {pathglob} {
         #*** !doctools
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/repo-0.1.1.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/repo-0.1.1.tm
index ee2384b4..2cb5fd1d 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/repo-0.1.1.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/repo-0.1.1.tm
@@ -134,13 +134,30 @@ namespace eval punk::repo {
     }
     interp alias "" fossil "" punk::repo::fossil_proxy
 
+    # ---
+    # Calling auto_execok on an external tool can be too slow to do during package load (e.g could be 150ms)
+
     #safe interps can't call auto_execok
     #At least let them load the package even though much of it may be unusable depending on the safe configuration
-    catch {
-    if {[auto_execok fossil] ne ""} { 
-        interp alias "" FOSSIL "" {*}[auto_execok fossil]
-    }
+    #catch {
+    #    if {[auto_execok fossil] ne ""} { 
+    #        interp alias "" FOSSIL "" {*}[auto_execok fossil]
+    #    }
+    #}
+    # ---
+    # ----------
+    #
+
+    #uppercase FOSSIL to bypass fossil as alias to fossil_proxy
+    proc establish_FOSSIL {args} {
+        if {![info exists ::auto_execs(FOSSIL)]} {
+            set ::auto_execs(FOSSIL) [auto_execok fossil] ;#may fail in safe interp
+        }
+        interp alias "" FOSSIL "" ;#delete establishment alias
+        FOSSIL {*}$args
     }
+    interp alias "" FOSSIL "" punk::repo::establish_FOSSIL
+    # ----------
 
     proc askuser {question} {
         if {![catch {package require punk::lib}]} {
@@ -370,7 +387,16 @@ namespace eval punk::repo {
         }
 
         if {$repodir eq ""} {
-            error "workingdir_state error: No repository found at or above path '$abspath'" 
+            puts stderr "workingdir_state error: No repository found at or above path '$abspath'" 
+            puts stderr "args: $args"
+            dict set resultdict revision {} 
+            dict set resultdict revision_iso8601 {} 
+            dict set resultdict paths {} 
+            dict set resultdict ahead ""
+            dict set resultdict behind ""
+            dict set resultdict error {reason "no_repo_found"}
+            dict set resultdict repotype none
+            return $resultdict
         }
         set subpath [punk::path::relative $repodir $abspath]
         if {$subpath eq "."} {
@@ -644,6 +670,16 @@ namespace eval punk::repo {
         set path_count_fields [list unchanged changed new missing extra]
         set state_fields [list ahead behind repodir subpath repotype revision revision_iso8601]
         set dresult [dict create]
+        if {[dict exists $repostate error]} {
+            foreach f $state_fields {
+                dict set dresult $f ""
+            }
+            foreach f $path_count_fields {
+                dict set dresult $f ""
+            }
+            #todo?
+            return $dresult
+        }
         foreach f $state_fields {
            dict set dresult $f [dict get $repostate $f]
         }
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/winpath-0.1.0.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/winpath-0.1.0.tm
index b30133ba..6de745a8 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/winpath-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/winpath-0.1.0.tm
@@ -30,7 +30,7 @@ namespace eval punk::winpath {
 
     #\\servername\share etc  or \\?\UNC\servername\share  etc.
     proc is_unc_path {path} {
-        set strcopy_path [punk::objclone $path]
+        set strcopy_path [punk::winpath::system::objclone $path]
         set strcopy_path [string map {\\ /} $strcopy_path] ;#normalize to forward slashes for testing purposes (and forward slashes seem to be auto-translated by windows anyway)
         if {[string first "//" $strcopy_path] == 0} {
             #check for "Dos device path" syntax
@@ -77,7 +77,7 @@ namespace eval punk::winpath {
     #dos device path syntax allows windows api to acces extended-length paths and filenames with illegal path characters such as trailing dots or whitespace
     #(can exist on server shares and on NTFS - but standard apps can't access without dos device syntax)
     proc is_dos_device_path {path} {
-        set strcopy_path [punk::objclone $path]
+        set strcopy_path [punk::winpath::system::objclone $path]
         set strcopy_path [string map {\\ /} $strcopy_path] ;#normalize to forward slashes for testing purposes (and forward slashes seem to be auto-translated by windows anyway)
         if {[string range $strcopy_path 0 3] in {//?/ //./}} {
             return 1
@@ -87,7 +87,7 @@ namespace eval punk::winpath {
     }
     proc strip_dos_device_prefix {path} {
         #it's unlikely to be valid to strip only //?/ from a //?/UNC  path so check for it here and diver to strip that.
-        #(review.. or raise error because a //?/UNC path isn't *strictly* a UNC path? )
+        #(review.. or raise error because a //?/UNC path isn't an ordinary dos device path? )
         if {[is_unc_path $path]} {
             return [strip_unc_path_prefix $path]
         }
@@ -98,18 +98,18 @@ namespace eval punk::winpath {
         }
     }
     proc strip_unc_path_prefix {path} {
-        if {[is_unc_path $path]} {
-            #//?/UNC/server/etc
-            set strcopy_path [punk::objclone $path]
-            set trimmedpath [string range $strcopy_path 7 end]
-            file pathtype $trimmedpath ;#shimmer it to path rep
-            return $trimmedpath
-        } elseif {is_unc_path_plain $path} {
+        if {[is_unc_path_plain $path]} {
             #plain unc //server
-            set strcopy_path [punk::objclone $path]
+            set strcopy_path [punk::winpath::system::objclone $path]
             set trimmedpath [string range $strcopy_path 2 end]
             file pathtype $trimmedpath
             return $trimmedpath
+        } elseif {is_unc_path $path} {
+            #//?/UNC/server/subpath  or  //./UNC/server/subpath
+            set strcopy_path [punk::winpath::system::objclone $path]
+            set trimmedpath [string range $strcopy_path 7 end]
+            file pathtype $trimmedpath ;#shimmer it to path rep
+            return $trimmedpath
         } else {
             return $path
         }
@@ -153,7 +153,7 @@ namespace eval punk::winpath {
             error $err
         }
 
-        set strcopy_path [punk::objclone $path]
+        set strcopy_path [punk::winpath::system::objclone $path]
 
 
         #Note: path could still have leading double slash if it is a Dos device path: e.g. //?/c:/etc
@@ -225,27 +225,124 @@ namespace eval punk::winpath {
         return 0
     }
 
-    proc test_ntfs_tunneling {f1 f2 args} {
-        file mkdir $f1
-        puts stderr  "waiting 15secs..."
-        after 5000 {puts -nonewline stderr .}
-        after 5000 {puts -nonewline stderr .}
-        after 5000 {puts -nonewline stderr .}
-        after 500 {puts stderr \n}
-        file mkdir $f2
-        puts stdout "$f1   [file stat $f1]"
-        puts stdout "$f2   [file stat $f2]"
-        file delete $f1
-        puts stdout "renaming $f2 to $f1"
-        file rename $f2 $f1
-        puts stdout "$f1   [file stat $f1]"
-
+    proc shortname {path} {
+        set shortname "NA"
+        if {[catch {
+            set shortname [dict get [file attributes $path] -shortname]
+        } errM]} {
+            puts stderr "Failed to get shortname for '$path'"
+        }
+        return $shortname
+    }
+    proc test_ntfs_tunneling {prefix args} {
+        puts stderr "We are looking for whether any of the final $prefix files or dirs took over the ctime attribute of the original $prefix files or dirs"
+        puts stderr "We expect the ino values to get potentially reassigned depending on order of deletion/creation so matches are coincidental and not material"
+        puts stderr "The shortnames are similarly allocated as they come - so presumably match by coincidence"
+        puts stderr "However - if we record a file's shortname, then delete it. Recreating it by shortname within the tunneling timeframe will magically reassociate the longname"
+        puts stderr "use test_ntfs_tunneling2 to test shortname tunneling"
+        file mkdir $prefix-dir-rename
+        file mkdir $prefix-dir-recreate
+        set fd [open $prefix-file-recreate.txt w]
+        puts $fd "original for recreate"
+        close $fd
+        set fd [open $prefix-file-rename.txt w]
+        puts $fd "original for rename"
+        close $fd
+        puts stdout "ORIGINAL files/dirs"
+        puts stdout "$prefix-dir-rename           [file stat $prefix-dir-rename] "
+        puts stdout "$prefix-dir-recreate         [file stat $prefix-dir-recreate]"
+        puts stdout "$prefix-file-recreate.txt    [file stat $prefix-file-recreate.txt] short:[shortname $prefix-file-recreate.txt]"
+        puts stdout "$prefix-file-rename.txt      [file stat $prefix-file-rename.txt] short:[shortname $prefix-file-rename.txt]"
+        puts stderr  "waiting 10secs (to have discernable ctime differences)"
+        after 5000 
+        puts -nonewline stderr .
+        after 5000 
+        puts -nonewline stderr .
+        after 500 
+
+        #--
+        #seems to make no diff whether created or copied - no tunneling seen with dirs
+        #file mkdir $prefix-dir-rename-temp
+        file copy $prefix-dir-rename $prefix-dir-rename-temp
+        #-- 
+        puts stderr \n
+        puts stdout "$prefix-dir-rename-temp       [file stat $prefix-dir-rename-temp] (temp to rename into place)"
+        puts stderr "deleting $prefix-dir-rename"
+        file delete $prefix-dir-rename
+        puts stdout "renaming $prefix-dir-rename-temp to $prefix-dir-rename"
+        file rename $prefix-dir-rename-temp $prefix-dir-rename
+
+        puts stderr "deleting $prefix-dir-recreate"
+        file delete $prefix-dir-recreate
+        puts stdout "re-creating $prefix-dir-recreate"
+        file mkdir $prefix-dir-recreate
+
+        puts stderr "deleting $prefix-file-recreate.txt"
+        file delete $prefix-file-recreate.txt
+        puts stderr "Recreating $prefix-file-recreate.txt"
+        set fd [open $prefix-file-recreate.txt w]
+        puts $fd "replacement"
+        close $fd
+        
+        puts stderr "copying $prefix-file-rename.txt to $prefix-file-rename-temp.txt"
+        file copy $prefix-file-rename.txt $prefix-file-rename-temp.txt
+        puts stdout "$prefix-file-rename-temp.txt [file stat $prefix-file-rename-temp.txt] short:[shortname $prefix-file-rename-temp.txt] (status of initial temp copy)"
+        puts stderr "modifying temp copy before deletion of original.. (append)"
+        set fd [open $prefix-file-rename-temp.txt a] 
+        puts $fd "added to file"
+        close $fd
+        puts stdout "$prefix-file-rename-temp.txt [file stat $prefix-file-rename-temp.txt] short:[shortname $prefix-file-rename-temp.txt] (status of appended temp copy)"
+        puts stderr "deleting $prefix-file-rename.txt"
+        file delete  $prefix-file-rename.txt
+        puts stderr "renaming temp file $prefix-file-rename-temp.txt to original $prefix-file-rename.txt"
+        file rename $prefix-file-rename-temp.txt $prefix-file-rename.txt
+
+        puts stdout "Final files/dirs"
+        puts stdout "$prefix-dir-rename           [file stat $prefix-dir-rename]"
+        puts stdout "$prefix-dir-recreate         [file stat $prefix-dir-recreate]"
+        puts stdout "$prefix-file-recreate.txt    [file stat $prefix-file-recreate.txt] short:[shortname $prefix-file-recreate.txt]"
+        puts stdout "$prefix-file-rename.txt      [file stat $prefix-file-rename.txt] short:[shortname $prefix-file-rename.txt]"
+    }
+    proc test_ntfs_tunneling2 {prefix {waitms 15000}} {
+        #shortname -> longname tunneling
+        puts stderr "Tunneling only happens if we delete via shortname? review"
+        set f1 $prefix-longname-file1.txt
+        set f2 $prefix-longname-file2.txt
+
+        set fd [open $f1 w];close $fd
+        set shortname1 [shortname $f1] 
+        puts stderr "longname:$f1 has shortname:$shortname1"
+        set fd [open $f2 w];close $fd
+        set shortname2 [shortname $f2] 
+        puts stderr "longname:$f2 has shortname:$shortname2"
+
+        puts stderr "deleting $f1 via name $shortname1"
+        file delete $shortname1
+        puts stdout "immediately recreating $shortname1 - should retain longname $f1 via tunneling"
+        set fd [open $shortname1 w];close $fd
+        set f1_exists [file exists $f1]
+        puts stdout "file exists $f1 = $f1_exists"
+
+        puts stderr "deleting $f2 via name $shortname2"
+        file delete $shortname2
+        puts stderr "Waiting [expr {$waitms / 1000}] seconds.. (standard tunneling timeframe is 15 seconds if registry hasn't been tweaked)"
+        after $waitms
+        puts stdout "recreating $shortname2 after wait of $waitms ms - longname lost?" 
+        set fd [open $shortname2 w];close $fd
+        set f2_exists [file exists $f2]
+        puts stdout "file exists $f2 = $f2_exists"
+
+        puts stdout -done-
     }
-
 }
 
 
-
+namespace eval punk::winpath::system {
+    #get a copy of the item without affecting internal rep
+    proc objclone {obj} {
+        append obj2 $obj {}
+    }
+}
 
 
 
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/textblock-0.1.1.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/textblock-0.1.1.tm
index 94af61ba..5d127a38 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/textblock-0.1.1.tm
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/textblock-0.1.1.tm
@@ -12,25 +12,97 @@
 # Meta license      <unspecified>
 # @@ Meta End
 
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# doctools header
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+#*** !doctools
+#[manpage_begin punkshell_module_textblock 0 0.1.1]
+#[copyright "2024"]
+#[titledesc {punk textblock functions}]  [comment {-- Name section and table of contents description --}]
+#[moddesc {punk textblock}]             [comment {-- Description at end of page heading --}] 
+#[require textblock]
+#[keywords module utility lib]
+#[description]
+#[para] Ansi-aware terminal textblock manipulation
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 
+#*** !doctools
+#[section Overview]
+#[para] overview of textblock 
+#[subsection Concepts]
+#[para]
 
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 ##  Requirements
-##e.g package require frobz
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[subsection dependencies]
+#[para] packages used by textblock 
+#[list_begin itemized]
+
+#*** !doctools
+#[item] [package {Tcl 8.6-}]
+#[item] [package {punk::args}]
+#[item] [package {punk::char}]
+#[item] [package {punk::ansi}]
+#[item] [package {punk::lib}]
+#[item] [package {overtype}]
+#[item] [package {term::ansi::code::macros}]
+#[item] [package {textutil}]
+
+##  Requirements
+package require Tcl 8.6-
 package require punk::args
 package require punk::char
 package require punk::ansi
 package require punk::lib
 catch {package require patternpunk}
 package require overtype
+
+#safebase interps as at 2024-08 can't access deeper paths - even though they are below the supposed safe list.
 package require term::ansi::code::macros ;#required for frame if old ansi g0 used - review - make package optional?
 package require textutil
 
+
+#*** !doctools
+#[list_end]
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[section API]
+
+
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
 tcl::namespace::eval textblock {
     #review - what about ansi off in punk::console?
     tcl::namespace::import ::punk::ansi::a ::punk::ansi::a+
     tcl::namespace::export block frame frame_cache framedef frametypes gcross height width widthtopline join join_basic list_as_table pad testblock 
-
+    variable use_md5 ;#framecache
+    set use_md5 1
+    if {[catch {package require md5}]} {
+        set use_md5 0
+    }
+    proc use_md5 {{yes_no ""}} {
+        variable use_md5
+        if {$yes_no eq ""} {
+            return $use_md5
+        }
+        if {![string is boolean -strict $yes_no]} {
+            error "textblock::use_md5 requires a boolean (or empty string to query)"
+        }
+        if {$yes_no} {
+            package require md5
+            set use_md5 1
+        } else {
+            set use_md5 0
+        }
+        return $use_md5
+    }
     tcl::namespace::eval class {
         variable opts_table_defaults
         set opts_table_defaults [tcl::dict::create\
@@ -228,6 +300,7 @@ tcl::namespace::eval textblock {
             }
             return $map
         }
+
         if {[tcl::info::commands [tcl::namespace::current]::table] eq ""} {
             #*** !doctools
             #[subsection {Namespace textblock::class}]
@@ -249,7 +322,7 @@ tcl::namespace::eval textblock {
 
             oo::class create [tcl::namespace::current]::table [tcl::string::map [list %topt_keys% $topt_keys %topt_switchkeys% $switch_keys_valid_topts %copt_keys% $copt_keys %copt_switchkeys% $switch_keys_valid_copts] {
                 #*** !doctools
-                #[enum] CLASS [class interface_caphandler.registry]
+                #[enum] CLASS [class textblock::class::table]
                 #[list_begin definitions]
                 #    [para] [emph METHODS]
                 variable o_opts_table ;#options as configured by user (with exception of -ansireset)
@@ -3986,7 +4059,7 @@ tcl::namespace::eval textblock {
             if append is chosen the new values will always start at the first column"
             -columns    -default "" -type integer   -help "Number of table columns
             Will default to 2 if not using an existing -table object"
-            *values
+            *values -min 0 -max 1
             datalist    -default {}                 -help "flat list of table cell values which will be wrapped based on -columns value"
         }] $args]
         set opts [dict get $argd opts]
@@ -4337,6 +4410,14 @@ tcl::namespace::eval textblock {
 
         return [tcl::dict::create width $width height $height] ;#maintain order in 'image processing' standard width then height - caller may use lassign [tcl::dict::values [blocksize <data>]] width height
     }
+    proc size_as_opts {textblock} {
+        set sz [size $textblock]
+        return [dict create -width [dict get $sz width] -height [dict get $sz height]]
+    }
+    proc size_as_list {textblock} {
+        set sz [size $textblock]
+        return [list [dict get $sz width] [dict get $sz height]]
+    }
     #must be able to handle block as string with or without newlines
     #if no newlines - attempt to treat as a list
     #must handle whitespace-only string,list elements, and/or lines.
@@ -5061,6 +5142,7 @@ tcl::namespace::eval textblock {
              [punk::lib::list_as_lines -- [lrepeat 8 " | "]]
     }
     proc table {args} {
+        #todo - use punk::args
         upvar ::textblock::class::opts_table_defaults toptdefaults
         set defaults [tcl::dict::create\
             -rows [list]\
@@ -5112,7 +5194,7 @@ tcl::namespace::eval textblock {
     }
 
     variable frametypes
-    set frametypes [list light heavy arc double block block1 block2 ascii altg]
+    set frametypes [list light heavy arc double block block1 block2 block2hack ascii altg]
     #class::table needs to be able to determine valid frametypes
     proc frametypes {} {
         variable frametypes
@@ -5121,7 +5203,7 @@ tcl::namespace::eval textblock {
     proc frametype {f} {
         #set custom_keys [list hl hlt hlb vl vll vlr tlc trc blc brc]
         switch -- $f {
-            light - heavy - arc - double - block - block1 - block2 - ascii - altg {
+            light - heavy - arc - double - block - block1 - block2 - block2hack - ascii - altg {
                 return [tcl::dict::create category predefined type $f]
             }
             default {
@@ -5142,7 +5224,7 @@ tcl::namespace::eval textblock {
                     set is_custom_dict_ok 0
                 }
                 if {!$is_custom_dict_ok} {
-                    error "frame option -type must be one of known types: $textblock::frametypes or a dictionary with any of keys hl,hlt,hlb,vl,vll,vlr,tlc,trc,blc,brc"
+                    error "frame option -type must be one of known types: $::textblock::frametypes or a dictionary with any of keys hl,hlt,hlb,vl,vll,vlr,tlc,trc,blc,brc"
                 }
                 set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "]
                 set custom_frame [tcl::dict::merge $default_custom $f]
@@ -6252,9 +6334,12 @@ tcl::namespace::eval textblock {
                 set vlr \u2595 ;# right one eighth block
                 set vll \u258f ;# left one eighth block
 
+                #some terminals (on windows as at 2024) miscount width of these single-width blocks internally
+                #resulting in extra spacing that is sometimes well removed from the character itself (e.g at next ansi reset)
+                #This was fixed in windows-terminal based systems (2021) but persists in others.
+                #https://github.com/microsoft/terminal/issues/11694
                 set tlc \U1fb7d ;#legacy block
                 set trc \U1fb7e ;#legacy block
-
                 set blc \U1fb7c ;#legacy block
                 set brc \U1fb7f ;#legacy block
 
@@ -6265,6 +6350,42 @@ tcl::namespace::eval textblock {
                 set vlrj $vlr
 
             }
+            block2hack {
+                #the resultant table will have text appear towards top of each box 
+                #with 'legacy' computing unicode block - hopefully these become more widely supported - as they are useful and fill in some gaps
+                set hlt \u2594 ;# upper one eighth block
+                set hlb \u2581 ;# lower one eighth block
+                set vlr \u2595 ;# right one eighth block
+                set vll \u258f ;# left one eighth block
+
+                #see comments in block2 regarding the problems in some terminals that this *may* hack around to some extent.
+                #the caller probably only needs block2hack if block2 doesn't work
+
+                #1)
+                #review - this hack looks sort of promising - but overtype::renderline needs fixing ?
+                #set tlc \U1fb7d\b ;#legacy block
+                #set trc \U1fb7e\b ;#legacy block
+                #set blc \U1fb7c\b ;#legacy block
+                #set brc \U1fb7f\b ;#legacy block
+
+                #2) - works on cmd.exe and some others
+                # a 'privacy message' is 'probably' also not supported on the old terminal but is on newer ones
+                #known exception - conemu on windows - displays junk for various ansi codes - (and slow terminal anyway)
+                #this hack has a reasonable chance of working
+                #except that the punk overtype library does recognise PMs 
+                #A single backspace however is an unlikely and generally unuseful PM - so there is a corresponding hack in the renderline system to pass this PM through!
+                #ugly - in that we don't know the application specifics of what the PM data contains and where it's going.
+                set tlc \U1fb7d\x1b^\b\x1b\\ ;#legacy block
+                set trc \U1fb7e\x1b^\b\x1b\\ ;#legacy block
+                set blc \U1fb7c\x1b^\b\x1b\\ ;#legacy block
+                set brc \U1fb7f\x1b^\b\x1b\\ ;#legacy block
+
+                #horizontal and vertical bar joins 
+                set hltj $hlt
+                set hlbj $hlb
+                set vllj $vll
+                set vlrj $vlr
+            }
             block {
                 set hlt \u2580 ;#upper half
                 set hlb \u2584 ;#lower half
@@ -6286,7 +6407,7 @@ tcl::namespace::eval textblock {
                 set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "] ;#only default the general types - these form defaults for more specific types if they're missing
                 if {[llength $f] % 2 != 0} {
                     #todo  - retrieve usage from punk::args
-                    error "textblock::frametype frametype '$f' is not one of the predefined frametypes: $textblock::frametypes and does not appear to be a dictionary for a custom frametype"
+                    error "textblock::frametype frametype '$f' is not one of the predefined frametypes: $::textblock::frametypes and does not appear to be a dictionary for a custom frametype"
                 }
                 #unknown order of keys specified by user - validate before creating vars as we need more general elements to be available as defaults
                 dict for {k v} $f {
@@ -6388,7 +6509,7 @@ tcl::namespace::eval textblock {
 
 
     #options before content argument - which is allowed to be absent
-    #frame performance (noticeable with complex tables even of modest size) is improved significantly by frame_cache - but is still (2024) a fairly expensive operation.
+    #frame performance (noticeable with complex tables even of modest size) is improved somewhat by frame_cache - but is still (2024) a fairly expensive operation.
     #
     #consider if we can use -sticky nsew instead of -blockalign (as per Tk grid -sticky option)
     # This would require some sort of expand equivalent e.g for -sticky ew or -sticky ns - for which we have to decide a meaning for text.. e.g ansi padding?
@@ -6397,6 +6518,7 @@ tcl::namespace::eval textblock {
     # - but we would need to maintain support for the rendered-string based operations too.
     proc frame {args} {
         variable frametypes
+        variable use_md5
 
         #counterintuitively - in-proc dict create each time is generally slightly faster than linked namespace var
         set opts [tcl::dict::create\
@@ -6416,7 +6538,11 @@ tcl::namespace::eval textblock {
             -ellipsis 1\
             -usecache 1\
             -buildcache 1\
+            -pad 1\
+            -crm_mode 0\
         ]
+        #-pad 1 is default so that simple 'textblock::frame "[a+ Red]a  \nbbb[a]"  extends the bg colour on the short ragged lines (and empty lines)
+        # for ansi art - -pad 0 is likely to be preferable
 
         set expect_optval 0
         set argposn 0
@@ -6455,7 +6581,12 @@ tcl::namespace::eval textblock {
         #use -buildcache 1 with -usecache 0 for debugging cache issues so we can inspect using textblock::frame_cache
         foreach {k v} $arglist {
             switch -- $k {
-                -etabs - -type - -boxlimits - -boxmap - -joins - -title - -subtitle - -width - -height - -ansiborder - -ansibase - -blockalign - -textalign - -ellipsis - -usecache - -buildcache {
+                -etabs - -type - -boxlimits - -boxmap - -joins 
+                - -title - -subtitle - -width - -height
+                - -ansiborder - -ansibase
+                - -blockalign - -textalign - -ellipsis
+                - -crm_mode
+                - -usecache - -buildcache - -pad {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -6471,11 +6602,13 @@ tcl::namespace::eval textblock {
         set opt_boxmap      [tcl::dict::get $opts -boxmap]
         set opt_usecache    [tcl::dict::get $opts -usecache]
         set opt_buildcache  [tcl::dict::get $opts -buildcache]
+        set opt_pad         [tcl::dict::get $opts -pad]
+        set opt_crm_mode    [tcl::dict::get $opts -crm_mode]
         set usecache $opt_usecache ;#may need to override
         set buildcache $opt_buildcache
         set custom_keys [list hl hlt hlb vl vll vlr tlc trc blc brc]
 
-        set known_frametypes $frametypes ;# light, heavey etc as defined in textblock::frametypes variable
+        set known_frametypes $frametypes ;# light, heavey etc as defined in the ::textblock::frametypes variable
         set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "]
 
         lassign [textblock::frametype $opt_type] _cat category _type ftype
@@ -6614,6 +6747,19 @@ tcl::namespace::eval textblock {
                 }
             }
             set contents [tcl::string::map [list \r\n \n] $contents]
+            if {$opt_crm_mode} {
+                if {$opt_height eq ""} {
+                    set h [textblock::height $contents]
+                } else {
+                    set h [expr {$opt_height -2}]
+                }
+                if {$opt_width eq ""} {
+                    set w [textblock::width $contents]
+                } else {
+                    set w [expr {$opt_width -2}]
+                }
+                set contents [overtype::renderspace -crm_mode 1 -wrap 1 -width $w -height $h "" $contents]
+            }
             set actual_contentwidth [textblock::width $contents] ;#length of longest line in contents (contents can be ragged)
             set actual_contentheight [textblock::height $contents]
         } else {
@@ -6652,9 +6798,14 @@ tcl::namespace::eval textblock {
         #review - custom frame affects frame_inner_width - exclude from caching?
         #set cache_key [concat $arglist $frame_inner_width $frame_inner_height]
         set hashables [concat $arglist $frame_inner_width $frame_inner_height]
-        package require md5
-        #set hash $hashables
-        set hash [md5::md5 -hex [encoding convertto utf-8 $hashables]] ;#need fast and unique to content - not cryptographic - review
+
+        if {$use_md5} {
+            #package require md5 ;#already required at package load
+            set hash [md5::md5 -hex [encoding convertto utf-8 $hashables]] ;#need fast and unique to content - not cryptographic - review
+        } else {
+            set hash $hashables
+        }
+
         set cache_key "$hash-$frame_inner_width-$frame_inner_height-actualcontentwidth:$actual_contentwidth"
         #should be in a unicode private range different to that used in table construction
         #e.g BMP PUA U+E000 -> U+F8FF  - although this is commonly used for example by nerdfonts
@@ -7057,15 +7208,22 @@ tcl::namespace::eval textblock {
                 append contents [::join [lrepeat $diff \n] ""]
             }
 
-            set paddedcontents [textblock::pad $contents -which $pad -within_ansi 1] ;#autowidth to width of content (should match cache_patternwidth) 
-            set paddedwidth  [textblock::widthtopline $paddedcontents]
-
-            #review - horizontal truncation
-            if {$paddedwidth > $cache_patternwidth} {
-                set paddedcontents [overtype::renderspace -width $cache_patternwidth "" $paddedcontents]
+            if {$opt_pad} {
+                set paddedcontents [textblock::pad $contents -which $pad -within_ansi 1] ;#autowidth to width of content (should match cache_patternwidth) 
+                set paddedwidth  [textblock::widthtopline $paddedcontents]
+                #review - horizontal truncation
+                if {$paddedwidth > $cache_patternwidth} {
+                    set paddedcontents [overtype::renderspace -width $cache_patternwidth "" $paddedcontents]
+                }
+                #important to supply end of opts -- to textblock::join - particularly here with arbitrary data
+                set contentblock [textblock::join -- $paddedcontents] ;#make sure each line has ansi replays
+            } else {
+                set cwidth [textblock::width $contents]
+                if {$cwidth > $cache_patternwidth} {
+                    set contents [overtype::renderspace -width $cache_patternwidth "" $contents]
+                }
+                set contentblock [textblock::join -- $contents]
             }
-            #important to supply end of opts -- to textblock::join - particularly here with arbitrary data
-            set contentblock [textblock::join -- $paddedcontents] ;#make sure each line has ansi replays
 
             set tlines [split $template \n]
 
@@ -7183,7 +7341,6 @@ tcl::namespace::eval textblock {
         #fastest to do row first then columns - because textblock::join must do line by line
 
         if {$crosscount > 1} {
-            package require textblock
             set row [textblock::join -- {*}[lrepeat $crosscount $onecross]]
             set rows [lrepeat $crosscount $row]
             set out [::join $rows \n]
@@ -7223,4 +7380,8 @@ package provide textblock [tcl::namespace::eval textblock {
     variable version
     set version 0.1.1 
 }]
-return
\ No newline at end of file
+return
+
+#*** !doctools
+#[manpage_end]
+
diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/make.tcl b/src/project_layouts/custom/_project/punk.project-0.1/src/make.tcl
index 1cf07c5b..9edd90b0 100644
--- a/src/project_layouts/custom/_project/punk.project-0.1/src/make.tcl
+++ b/src/project_layouts/custom/_project/punk.project-0.1/src/make.tcl
@@ -1212,8 +1212,9 @@ foreach vfstail $vfs_tails {
             set rtmountpoint //zipfs:/rtmounts/$runtime_fullname
 
             set changed_unchanged [$vfs_event targetset_source_changes]
+            set vfs_or_runtime_changed [expr {[llength [dict get $changed_unchanged changed]] ||  [llength [$vfs_event get_targets_exist]] < [llength [$vfs_event get_targets]]}]
 
-            if {[llength [dict get $changed_unchanged changed]] ||  [llength [$vfs_event get_targets_exist]] < [llength [$vfs_event get_targets]]} {
+            if {$vfs_or_runtime_changed} {
                 #source .vfs folder has changes
                 $vfs_event targetset_started
                 # -- --- --- --- --- ---
@@ -1283,6 +1284,7 @@ foreach vfstail $vfs_tails {
                                     puts stderr "RUNTIME capabilities unknown. Unsure if zip supported. trying anyway.."
                                 }
                             }
+                            #note - as at 2024-08 - there is some discussion about the interface to mkimg - it is considered unstable (may change to -option value syntax)
                             puts stderr "calling: tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs \"\" $buildfolder/build_$runtime_fullname"
                             tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs "" $buildfolder/build_$runtime_fullname
                         } result ]} {
@@ -1352,9 +1354,10 @@ foreach vfstail $vfs_tails {
                     if {![catch {
                             exec $pscmd | grep $targetkit
                         } still_running]} {
-
-                        puts stdout "found $targetkit instances still running\n"
+                        set still_running_lines [split [string trim $still_running] \n]
+                        puts stdout "found ([llength $still_running_lines]) $targetkit instances still running\n"
                         set count_killed 0
+                        set num_to_kill [llength $still_running_lines]
                         foreach ln [split $still_running \n] {
                             puts stdout "    $ln"
                             
@@ -1387,9 +1390,6 @@ foreach vfstail $vfs_tails {
                                 #review - *no running instance* works with windows taskkill - "*No such process*" works with kill -9 on FreeBSD and linux - other platforms?
                                 if {![string match "*no running instance*" $errMsg] && ![string match "*No such process*" $errMsg]} {
                                     lappend failed_kits [list kit $targetkit reason "could not kill running process for $targetkit (using '$killcmd')"]
-                                    $vfs_event targetset_end FAILED
-                                    $vfs_event destroy
-                                    $vfs_installer destroy
                                     continue
                                 }
                             } else {
@@ -1397,10 +1397,15 @@ foreach vfstail $vfs_tails {
                                 incr count_killed
                             }
                         }
-                        if {$count_killed > 0} {
-                            puts stderr "\nKilled $count_killed processes. Waiting a short time before attempting to delete executable"
-                            after 1000
+                        if {$count_killed < $num_to_kill} {
+                            $vfs_event targetset_end FAILED
+                            $vfs_event destroy
+                            $vfs_installer destroy
+                            continue
                         }
+
+                        puts stderr "\nKilled $count_killed processes. Waiting a short time before attempting to delete executable"
+                        after 1000
                     } else {
                         puts stderr "Ok.. no running '$targetkit' processes found"
                     }
@@ -1426,22 +1431,35 @@ foreach vfstail $vfs_tails {
                 # -- --- --- --- --- ---
                 $vfs_event targetset_end OK
 
+            } else {
+                set skipped_vfs_build 1
+                puts stderr "."
+                puts stdout "Skipping build for vfs $vfstail with runtime $rtname - no change detected"
+                $vfs_event targetset_end SKIPPED
+            }
+            $vfs_event destroy
+            $vfs_installer destroy
 
-                after 200
-                set deployment_folder [file dirname $sourcefolder]/bin
-                file mkdir $deployment_folder
+            after 200
+            set deployment_folder [file dirname $sourcefolder]/bin
+            file mkdir $deployment_folder
 
-                # -- ----------
-                set bin_installer [punkcheck::installtrack new "make.tcl" $deployment_folder/.punkcheck]
-                $bin_installer set_source_target $buildfolder $deployment_folder
-                set bin_event [$bin_installer start_event {-make-step final_kit_install}]
-                $bin_event targetset_init INSTALL $deployment_folder/$targetkit
-                #todo - move final deployment step outside of the build vfs loop? (final deployment can fail and then isn't rerun even though _build and deployed versions differ, unless .vfs modified again)
-                #set last_completion [$bin_event targetset_last_complete]
-
-                $bin_event targetset_addsource $buildfolder/$targetkit
-                $bin_event targetset_started
-                # -- ----------
+            # -- ----------
+            set bin_installer [punkcheck::installtrack new "make.tcl" $deployment_folder/.punkcheck]
+            $bin_installer set_source_target $buildfolder $deployment_folder
+            set bin_event [$bin_installer start_event {-make-step final_kit_install}]
+            $bin_event targetset_init INSTALL $deployment_folder/$targetkit
+            #todo - move final deployment step outside of the build vfs loop? (final deployment can fail and then isn't rerun even though _build and deployed versions differ, unless .vfs modified again)
+            #set last_completion [$bin_event targetset_last_complete]
+
+            $bin_event targetset_addsource $deployment_folder/$targetkit ;#add target as a source of metadata for change detection
+            $bin_event targetset_addsource $buildfolder/$targetkit
+            $bin_event targetset_started
+            # -- ----------
+
+            set changed_unchanged [$bin_event targetset_source_changes]
+            set built_or_installed_kit_changed [expr {[llength [dict get $changed_unchanged changed]] ||  [llength [$bin_event get_targets_exist]] < [llength [$bin_event get_targets]]}]
+            if {$built_or_installed_kit_changed} { 
 
                 if {[file exists $deployment_folder/$targetkit]} {
                     puts stderr "deleting existing deployed at $deployment_folder/$targetkit"
@@ -1467,19 +1485,16 @@ foreach vfstail $vfs_tails {
                 # -- ----------
                 $bin_event targetset_end OK
                 # -- ----------
-                $bin_event destroy
-                $bin_installer destroy
-
             } else {
-                set skipped_vfs_build 1
+                set skipped_kit_install 1
                 puts stderr "."
-                puts stdout "Skipping build for vfs $vfstail with runtime $rtname - no change detected"
-                $vfs_event targetset_end SKIPPED
+                puts stdout "Skipping kit install for $targetkit with vfs $vfstail runtime $rtname - no change detected"
+                $bin_event targetset_end SKIPPED
             }
+            $bin_event destroy
+            $bin_installer destroy
 
 
-            $vfs_event destroy
-            $vfs_installer destroy
 
         } ;#end foreach targetkit
     } ;#end foreach rtname in runtimes
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/fileutil/paths-1.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/fileutil/paths-1.tm
new file mode 100644
index 00000000..e387acf7
--- /dev/null
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/fileutil/paths-1.tm
@@ -0,0 +1,74 @@
+# paths.tcl --
+#
+#	Manage lists of search paths.
+#
+# Copyright (c) 2009-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# Each object instance manages a list of paths.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+package require snit
+
+# ### ### ### ######### ######### #########
+## API
+
+snit::type ::fileutil::paths {
+
+    # ### ### ### ######### ######### #########
+    ## Options :: None
+
+    # ### ### ### ######### ######### #########
+    ## Creation, destruction
+
+    # Default constructor.
+    # Default destructor.
+
+    # ### ### ### ######### ######### #########
+    ## Methods :: Querying and manipulating the list of paths.
+
+    method paths {} {
+	return $mypaths
+    }
+
+    method add {path} {
+	set pos [lsearch $mypaths $path]
+	if {$pos >= 0 } return
+	lappend mypaths $path
+	return
+    }
+
+    method remove {path} {
+	set pos [lsearch $mypaths $path]
+	if {$pos < 0} return
+	set mypaths [lreplace $mypaths $pos $pos]
+	return
+    }
+
+    method clear {} {
+	set mypaths {}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal methods :: None
+
+    # ### ### ### ######### ######### #########
+    ## State :: List of paths.
+
+    variable mypaths {}
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide fileutil::paths 1
+return
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/fileutil/traverse-0.6.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/fileutil/traverse-0.6.tm
new file mode 100644
index 00000000..2f36d109
--- /dev/null
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/fileutil/traverse-0.6.tm
@@ -0,0 +1,504 @@
+# traverse.tcl --
+#
+#	Directory traversal.
+#
+# Copyright (c) 2006-2015 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.3
+
+# OO core
+if {[package vsatisfies [package present Tcl] 8.5]} {
+    # Use new Tcl 8.5a6+ features to specify the allowed packages.
+    # We can use anything above 1.3. This means v2 as well.
+    package require snit 1.3-
+} else {
+    # For Tcl 8.{3,4} only snit1 of a suitable patchlevel is possible.
+    package require snit 1.3
+}
+package require control  ; # Helpers for control structures
+package require fileutil ; # -> fullnormalize
+
+snit::type ::fileutil::traverse {
+
+    # Incremental directory traversal.
+
+    # API
+    # create  %AUTO% basedirectory options... -> object
+    # next    filevar                         -> boolean
+    # foreach filevar script
+    # files                                   -> list (path ...)
+
+    # Options
+    # -prefilter command-prefix
+    # -filter    command-prefix
+    # -errorcmd  command-prefix
+
+    # Use cases
+    #
+    # (a) Basic incremental
+    # - Create and configure a traversal object.
+    # - Execute 'next' to retrieve one path at a time,
+    #   until the command returns False, signaling that
+    #   the iterator has exhausted the supply of paths.
+    #   (The path is stored in the named variable).
+    #
+    # The execution of 'next' can be done in a loop, or via event
+    # processing.
+
+    # (b) Basic loop
+    # - Create and configure a traversal object.
+    # - Run a script for each path, using 'foreach'.
+    #   This is a convenient standard wrapper around 'next'.
+    #
+    # The loop properly handles all possible Tcl result codes.
+
+    # (c) Non-incremental, non-looping.
+    # - Create and configure a traversal object.
+    # - Retrieve a list of all paths via 'files'.
+
+    # The -prefilter callback is executed for directories. Its result
+    # determines if the traverser recurses into the directory or not.
+    # The default is to always recurse into all directories. The call-
+    # back is invoked with a single argument, the path of the
+    # directory.
+    #
+    # The -filter callback is executed for all paths. Its result
+    # determines if the current path is a valid result, and returned
+    # by 'next'. The default is to accept all paths as valid. The
+    # callback is invoked with a single argument, the path to check.
+
+    # The -errorcmd callback is executed for all paths the traverser
+    # has trouble with. Like being unable to cd into them, get their
+    # status, etc. The default is to ignore any such problems. The
+    # callback is invoked with a two arguments, the path for which the
+    # error occured, and the error message. Errors thrown by the
+    # filter callbacks are handled through this callback too. Errors
+    # thrown by the error callback itself are not caught and ignored,
+    # but allowed to pass to the caller, usually of 'next'.
+
+    # Note: Low-level functionality, version and platform dependent is
+    # implemented in procedures, and conditioally defined for optimal
+    # use of features, etc. ...
+
+    # Note: Traversal is done in depth-first pre-order.
+
+    # Note: The options are handled only during
+    # construction. Afterward they are read-only and attempts to
+    # modify them will cause the system to throw errors.
+
+    # ### ### ### ######### ######### #########
+    ## Implementation
+
+    option -filter    -default {} -readonly 1
+    option -prefilter -default {} -readonly 1
+    option -errorcmd  -default {} -readonly 1
+
+    constructor {basedir args} {
+	set _base $basedir
+	$self configurelist $args
+	return
+    }
+
+    method files {} {
+	set files {}
+	$self foreach f {lappend files $f}
+	return $files
+    }
+
+    method foreach {fvar body} {
+	upvar 1 $fvar currentfile
+
+	# (Re-)initialize the traversal state on every call.
+	$self Init
+
+	while {[$self next currentfile]} {
+	    set code [catch {uplevel 1 $body} result]
+
+	    # decide what to do upon the return code:
+	    #
+	    #               0 - the body executed successfully
+	    #               1 - the body raised an error
+	    #               2 - the body invoked [return]
+	    #               3 - the body invoked [break]
+	    #               4 - the body invoked [continue]
+	    # everything else - return and pass on the results
+	    #
+	    switch -exact -- $code {
+		0 {}
+		1 {
+		    return -errorinfo [::control::ErrorInfoAsCaller uplevel foreach]  \
+			    -errorcode $::errorCode -code error $result
+		}
+		3 {
+		    # FRINK: nocheck
+		    return
+		}
+		4 {}
+		default {
+		    return -code $code $result
+		}
+	    }
+	}
+	return
+    }
+
+    method next {fvar} {
+	upvar 1 $fvar currentfile
+
+	# Initialize on first call.
+	if {!$_init} {
+	    $self Init
+	}
+
+	# We (still) have valid paths in the result stack, return the
+	# next one.
+
+	if {[llength $_results]} {
+	    set top      [lindex   $_results end]
+	    set _results [lreplace $_results end end]
+	    set currentfile $top
+	    return 1
+	}
+
+	# Take the next directory waiting in the processing stack and
+	# fill the result stack with all valid files and sub-
+	# directories contained in it. Extend the processing queue
+	# with all sub-directories not yet seen already (!circular
+	# symlinks) and accepted by the prefilter. We stop iterating
+	# when we either have no directories to process anymore, or
+	# the result stack contains at least one path we can return.
+
+	while {[llength $_pending]} {
+	    set top      [lindex   $_pending end]
+	    set _pending [lreplace $_pending end end]
+
+	    # Directory accessible? Skip if not.
+	    if {![ACCESS $top]} {
+		Error $top "Inacessible directory"
+		continue
+	    }
+
+	    # Expand the result stack with all files in the directory,
+	    # modulo filtering.
+
+	    foreach f [GLOBF $top] {
+		if {![Valid $f]} continue
+		lappend _results $f
+	    }
+
+	    # Expand the result stack with all sub-directories in the
+	    # directory, modulo filtering. Further expand the
+	    # processing stack with the same directories, if not seen
+	    # yet and modulo pre-filtering.
+
+	    foreach f [GLOBD $top] {
+		if {
+		    [string equal [file tail $f]  "."] ||
+		    [string equal [file tail $f] ".."]
+		} continue
+
+		if {[Valid $f]} {
+		    lappend _results $f
+		}
+
+		Enter $top $f
+		if {[Cycle $f]} continue
+
+		if {[Recurse $f]} {
+		    lappend _pending $f
+		}
+	    }
+
+	    # Stop expanding if we have paths to return.
+
+	    if {[llength $_results]} {
+		set top      [lindex   $_results end]
+		set _results [lreplace $_results end end]
+		set currentfile $top
+		return 1
+	    }
+	}
+
+	# Allow re-initialization with next call.
+
+	set _init 0
+	return 0
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Traversal state
+
+    # * Initialization flag. Checked in 'next', reset by next when no
+    #   more files are available. Set in 'Init'.
+    # * Base directory (or file) to start the traversal from.
+    # * Stack of prefiltered unknown directories waiting for
+    #   processing, i.e. expansion (TOP at end).
+    # * Stack of valid paths waiting to be returned as results.
+    # * Set of directories already visited (normalized paths), for
+    #   detection of circular symbolic links.
+
+    variable _init         0  ; # Initialization flag.
+    variable _base         {} ; # Base directory.
+    variable _pending      {} ; # Processing stack.
+    variable _results      {} ; # Result stack.
+
+    # sym link handling (to break cycles, while allowing the following of non-cycle links).
+    # Notes
+    # - path parent   tracking is lexical.
+    # - path identity tracking is based on the normalized path, i.e. the path with all
+    #   symlinks resolved.
+    # Maps
+    # - path -> parent     (easier to follow the list than doing dirname's)
+    # - path -> normalized (cache to avoid redundant calls of fullnormalize)
+    # cycle <=> A parent's normalized form (NF) is identical to the current path's NF
+
+    variable _parent -array {}
+    variable _norm   -array {}
+
+    # ### ### ### ######### ######### #########
+    ## Internal helpers.
+
+    proc Enter {parent path} {
+	#puts ___E|$path
+	upvar 1 _parent _parent _norm _norm
+	set _parent($path) $parent
+	set _norm($path)   [fileutil::fullnormalize $path]
+    }
+
+    proc Cycle {path} {
+	upvar 1 _parent _parent _norm _norm
+	set nform $_norm($path)
+	set paren $_parent($path)
+	while {$paren ne {}} {
+	    if {$_norm($paren) eq $nform} { return yes }
+	    set paren $_parent($paren)
+	}
+	return no
+    }
+
+    method Init {} {
+	array unset _parent *
+	array unset _norm   *
+
+	# Path ok as result?
+	if {[Valid $_base]} {
+	    lappend _results $_base
+	}
+
+	# Expansion allowed by prefilter?
+	if {[file isdirectory $_base] && [Recurse $_base]} {
+	    Enter {} $_base
+	    lappend _pending $_base
+	}
+
+	# System is set up now.
+	set _init 1
+	return
+    }
+
+    proc Valid {path} {
+	#puts ___V|$path
+	upvar 1 options options
+	if {![llength $options(-filter)]} {return 1}
+	set path [file normalize $path]
+	set code [catch {uplevel \#0 [linsert $options(-filter) end $path]} valid]
+	if {!$code} {return $valid}
+	Error $path $valid
+	return 0
+    }
+
+    proc Recurse {path} {
+	#puts ___X|$path
+	upvar 1 options options _norm _norm
+	if {![llength $options(-prefilter)]} {return 1}
+	set path [file normalize $path]
+	set code [catch {uplevel \#0 [linsert $options(-prefilter) end $path]} valid]
+	if {!$code} {return $valid}
+	Error $path $valid
+	return 0
+    }
+
+    proc Error {path msg} {
+	upvar 1 options options
+	if {![llength $options(-errorcmd)]} return
+	set path [file normalize $path]
+	uplevel \#0 [linsert $options(-errorcmd) end $path $msg]
+	return
+    }
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+##
+
+# The next three helper commands for the traverser depend strongly on
+# the version of Tcl, and partially on the platform.
+
+# 1. In Tcl 8.3 using -types f will return only true files, but not
+#    links to files. This changed in 8.4+ where links to files are
+#    returned as well. So for 8.3 we have to handle the links
+#    separately (-types l) and also filter on our own.
+#    Note that Windows file links are hard links which are reported by
+#    -types f, but not -types l, so we can optimize that for the two
+#    platforms.
+#
+# 2. In Tcl 8.3 we also have a crashing bug in glob (SIGABRT, "stat on
+#    a known file") when trying to perform 'glob -types {hidden f}' on
+#    a directory without e'x'ecute permissions. We code around by
+#    testing if we can cd into the directory (stat might return enough
+#    information too (mode), but possibly also not portable).
+#
+#    For Tcl 8.2 and 8.4+ glob simply delivers an empty result
+#    (-nocomplain), without crashing. For them this command is defined
+#    so that the bytecode compiler removes it from the bytecode.
+#
+#    This bug made the ACCESS helper necessary.
+#    We code around the problem by testing if we can cd into the
+#    directory (stat might return enough information too (mode), but
+#    possibly also not portable).
+
+if {[package vsatisfies [package present Tcl] 8.5]} {
+    # Tcl 8.5+.
+    # We have to check readability of "current" on our own, glob
+    # changed to error out instead of returning nothing.
+
+    proc ::fileutil::traverse::ACCESS {args} {return 1}
+
+    proc ::fileutil::traverse::GLOBF {current} {
+	if {![file readable $current] ||
+	    [BadLink $current]} {
+	    return {}
+	}
+
+	set res [lsort -unique [concat \
+		     [glob -nocomplain -directory $current -types f          -- *] \
+		     [glob -nocomplain -directory $current -types {hidden f} -- *]]]
+
+	# Look for broken links (They are reported as neither file nor directory).
+	foreach l [lsort -unique [concat \
+		       [glob -nocomplain -directory $current -types l          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden l} -- *]]] {
+	    if {[file isfile      $l]} continue
+	    if {[file isdirectory $l]} continue
+	    lappend res $l
+	}
+	return [lsort -unique $res]
+    }
+
+    proc ::fileutil::traverse::GLOBD {current} {
+	if {![file readable $current] ||
+	    [BadLink $current]} {
+	    return {}
+	}
+
+	lsort -unique [concat \
+	   [glob -nocomplain -directory $current -types d          -- *] \
+	   [glob -nocomplain -directory $current -types {hidden d} -- *]]
+    }
+
+    proc ::fileutil::traverse::BadLink {current} {
+	if {[file type $current] ne "link"} { return no }
+
+	set dst [file join [file dirname $current] [file readlink $current]]
+
+	if {![file exists   $dst] ||
+	    ![file readable $dst]} {
+	    return yes
+	}
+
+	return no
+    }
+
+} elseif {[package vsatisfies [package present Tcl] 8.4]} {
+    # Tcl 8.4+.
+    # (Ad 1) We have -directory, and -types,
+    # (Ad 2) Links are returned for -types f/d if they refer to files/dirs.
+    # (Ad 3) No bug to code around
+
+    proc ::fileutil::traverse::ACCESS {args} {return 1}
+
+    proc ::fileutil::traverse::GLOBF {current} {
+	set res [concat \
+		     [glob -nocomplain -directory $current -types f          -- *] \
+		     [glob -nocomplain -directory $current -types {hidden f} -- *]]
+
+	# Look for broken links (They are reported as neither file nor directory).
+	foreach l [concat \
+		       [glob -nocomplain -directory $current -types l          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden l} -- *] ] {
+	    if {[file isfile      $l]} continue
+	    if {[file isdirectory $l]} continue
+	    lappend res $l
+	}
+	return $res
+    }
+
+    proc ::fileutil::traverse::GLOBD {current} {
+	concat \
+	    [glob -nocomplain -directory $current -types d          -- *] \
+	    [glob -nocomplain -directory $current -types {hidden d} -- *]
+    }
+
+} else {
+    # 8.3.
+    # (Ad 1) We have -directory, and -types,
+    # (Ad 2) Links are NOT returned for -types f/d, collect separately.
+    #        No symbolic file links on Windows.
+    # (Ad 3) Bug to code around.
+
+    proc ::fileutil::traverse::ACCESS {current} {
+	if {[catch {
+	    set h [pwd] ; cd $current ; cd $h
+	}]} {return 0}
+	return 1
+    }
+
+    if {[string equal $::tcl_platform(platform) windows]} {
+	proc ::fileutil::traverse::GLOBF {current} {
+	    concat \
+		[glob -nocomplain -directory $current -types f          -- *] \
+		[glob -nocomplain -directory $current -types {hidden f} -- *]]
+	}
+    } else {
+	proc ::fileutil::traverse::GLOBF {current} {
+	    set l [concat \
+		       [glob -nocomplain -directory $current -types f          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden f} -- *]]
+
+	    foreach x [concat \
+			   [glob -nocomplain -directory $current -types l          -- *] \
+			   [glob -nocomplain -directory $current -types {hidden l} -- *]] {
+		if {[file isdirectory $x]} continue
+		# We have now accepted files, links to files, and broken links.
+		lappend l $x
+	    }
+
+	    return $l
+	}
+    }
+
+    proc ::fileutil::traverse::GLOBD {current} {
+	set l [concat \
+		   [glob -nocomplain -directory $current -types d          -- *] \
+		   [glob -nocomplain -directory $current -types {hidden d} -- *]]
+
+	foreach x [concat \
+		       [glob -nocomplain -directory $current -types l          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden l} -- *]] {
+	    if {![file isdirectory $x]} continue
+	    lappend l $x
+	}
+
+	return $l
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide fileutil::traverse 0.6
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/natsort-0.1.1.6.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/natsort-0.1.1.6.tm
index 1d91b53f..7f7c33cd 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/natsort-0.1.1.6.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/natsort-0.1.1.6.tm
@@ -5,8 +5,9 @@ package require flagfilter
 namespace import ::flagfilter::check_flags
 
 namespace eval natsort {
+    #REVIEW - determine and document the purpose of scriptdir being added to tm path
      proc scriptdir {} {
-        set possibly_linked_script [file dirname [file normalize [file join [info script] ...]]]
+        set possibly_linked_script [file dirname [file normalize [file join [info script] __dummy__]]]
         if {[file isdirectory $possibly_linked_script]} {
             return $possibly_linked_script
         } else {
@@ -14,7 +15,11 @@ namespace eval natsort {
         }
     }
     if {![interp issafe]} {
-        tcl::tm::add [scriptdir]    
+        set sdir [scriptdir]
+        #puts stderr "natsort tcl::tm::add $sdir"
+        if {$sdir ni [tcl::tm::list]} {
+            catch {tcl::tm::add $sdir}
+        }
     }
 }
 
@@ -36,6 +41,7 @@ namespace eval natsort {
         } else {
             puts stderr "|>natsort_call_err> unable to interpret 2nd argument to do_error: '$then' should be one of '$levels'  or 'exit <numericcode>'"
         }
+        flush stderr
         if {$::tcl_interactive} {
             #may not always be desirable - but assumed to be more useful not to exit despite request, to aid in debugging
             if {[string tolower $type] eq "exit"} {
@@ -43,6 +49,7 @@ namespace eval natsort {
               if {![string is digit -strict $code]} {
                 puts stderr "|>natsort_call_err> unable to interpret 2nd argument to do_error: '$then' should be: 'exit <numericcode>'"
               }
+              flush stderr
             } 
             return -code error $msg
         } else {
@@ -1422,6 +1429,9 @@ namespace eval natsort {
 
     proc called_directly_namematch {} {
         global argv0
+        if {[info script] eq ""} {
+            return 0
+        }
         #see https://wiki.tcl-lang.org/page/main+script  
         #trailing ... let's us resolve symlinks in last component of the path (could be something else like ___ but ... seems unlikely to collide with anything in the filesystem)
         if {[info exists argv0] 
@@ -1440,12 +1450,18 @@ namespace eval natsort {
     #Review issues around comparing names vs using inodes (esp with respect to samba shares)
     proc called_directly_inodematch {} {
         global argv0
+
         if {[info exists argv0]
-         && [file exists [info script]] && [file exists $argv0]} {
+         &&  [file exists [info script]] && [file exists $argv0]} {
             file stat $argv0        argv0Info
             file stat [info script] scriptInfo
-            expr {$argv0Info(dev) == $scriptInfo(dev)
-               && $argv0Info(ino) == $scriptInfo(ino)}
+            if {$argv0Info(ino) == 0 || $scriptInfo(ino) == 0 || $argv0Info(dev) == 0 || $scriptInfo(dev) == 0} {
+                #vfs?
+                #e.g //zipfs:/
+                return 0
+            }
+            return [expr {$argv0Info(dev) == $scriptInfo(dev)
+               && $argv0Info(ino) == $scriptInfo(ino)}]
         } else {
             return 0
         }
@@ -1460,6 +1476,11 @@ namespace eval natsort {
         #-- choose a policy and leave the others commented.
         #set is_called_directly $is_namematch 
         #set is_called_directly $is_inodematch 
+
+        #puts "NATSORT: called_directly_namematch - $is_namematch"
+        #puts "NATSORT: called_directly_inodematch - $is_inodematch"
+        #flush stdout
+
         set is_called_directly [expr {$is_namematch || $is_inodematch}] 
         #set is_called_directly [expr {$is_namematch && $is_inodematch}] 
         ###
@@ -1921,6 +1942,8 @@ namespace eval natsort {
             #set args [check_flags -caller test1 -defaults [list  -collate nocase -algorithm sort -topchars "\uFFFF" -winlike 0 -debug 0 -stacktrace 0 -showsplits 0] -required {all} -extras {none} -commandprocessors {{-cmd -default help} {-cmd -cmdarg1 -default "."} {-cmd -cmdarg2 -default j}} -values $::argv ]
             #set args [check_flags -caller test1 -defaults [list  -collate nocase -algorithm sort -topchars "\uFFFF" -winlike 0 -debug 0 -stacktrace 0 -showsplits 0] -required {all} -extras {none} -commandprocessors {ls {ls lsdir -default "\uFFFF"}} -values $::argv ]
 
+            puts stderr "natsort directcall exit"
+            flush stderr
             exit 0
 
         if {$::argc} {
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/overtype-1.6.5.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/overtype-1.6.5.tm
index 143794fb..f7e4c1a5 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/overtype-1.6.5.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/overtype-1.6.5.tm
@@ -163,7 +163,7 @@ proc overtype::string_columns {text} {
 tcl::namespace::eval overtype::priv {
 }
 
-#could return larger than colwidth
+#could return larger than renderwidth 
 proc _get_row_append_column {row} {
     upvar outputlines outputlines 
     set idx [expr {$row -1}]
@@ -171,14 +171,14 @@ proc _get_row_append_column {row} {
         return 1
     } else {
         upvar opt_overflow opt_overflow
-        upvar colwidth colwidth
+        upvar renderwidth renderwidth 
         set existinglen [punk::ansi::printing_length [lindex $outputlines $idx]]
         set endpos [expr {$existinglen +1}]
         if {$opt_overflow} {
             return $endpos
         } else {
-            if {$endpos > $colwidth} {
-                return $colwidth + 1
+            if {$endpos > $renderwidth} {
+                return $renderwidth + 1
             } else {
                 return $endpos
             }
@@ -213,7 +213,20 @@ tcl::namespace::eval overtype {
         if {[llength $args] < 2} {
             error {usage: ?-width <int>? ?-startcolumn <int>? ?-transparent [0|1|<char>]? ?-overflow [1|0]? ?-ellipsis [1|0]? ?-ellipsistext ...? undertext overtext}
         }
-        lassign [lrange $args end-1 end] underblock overblock
+        set optargs [lrange $args 0 end-2]
+        if {[llength $optargs] % 2 == 0} {
+            lassign [lrange $args end-1 end] underblock overblock
+            set argsflags [lrange $args 0 end-2]
+        } else {
+            set optargs [lrange $args 0 end-1]
+            if {[llength $optargs] %2 == 0} {
+                set overblock [lindex $args end]
+                set underblock ""
+                set argsflags [lrange $args 0 end-1]
+            } else {
+                error "renderspace expects opt-val pairs followed by: <underblock> <overblock> or just <overblock>"
+            }
+        }
         set opts [tcl::dict::create\
             -bias       ignored\
             -width      \uFFEF\
@@ -230,12 +243,15 @@ tcl::namespace::eval overtype {
             -exposed2 \uFFFD\
             -experimental  0\
             -looplimit  \uFFEF\
+            -crm_mode   0\
+            -reverse_mode 0\
         ]
         #-ellipsis args not used if -wrap is true
-        set argsflags [lrange $args 0 end-2]
         foreach {k v} $argsflags {
             switch -- $k {
-                -looplimit - -width - -height - -startcolumn - -bias - -wrap - -ellipsis - -ellipsistext - -ellipsiswhitespace - -overflow - -appendlines - -transparent - -exposed1 - -exposed2 - -experimental {
+                -looplimit - -width - -height - -startcolumn - -bias - -wrap - -ellipsis - -ellipsistext - -ellipsiswhitespace - -overflow - -appendlines
+                - -transparent - -exposed1 - -exposed2 - -experimental
+                - -reverse_mode - -crm_mode {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -261,6 +277,8 @@ tcl::namespace::eval overtype {
         set opt_exposed1        [tcl::dict::get $opts -exposed1] ;#widechar_exposed_left  - todo
         set opt_exposed2        [tcl::dict::get $opts -exposed2] ;#widechar_exposed_right - todo
         # -- --- --- --- --- ---
+        set opt_crm_mode        [tcl::dict::get $opts -crm_mode]
+        set opt_reverse_mode    [tcl::dict::get $opts -reverse_mode]
 
         # ----------------------------
         #  -experimental dev flag to set flags etc
@@ -295,9 +313,10 @@ tcl::namespace::eval overtype {
         # ----------------------------
 
         #modes
-        set insert_mode 0 ;#can be toggled by insert key or ansi IRM sequence ESC [ 4 h|l
-        set autowrap_mode $opt_wrap
-        set reverse_mode 0
+        set insert_mode     0 ;#can be toggled by insert key or ansi IRM sequence ESC [ 4 h|l
+        set autowrap_mode   $opt_wrap
+        set reverse_mode    $opt_reverse_mode 
+        set crm_mode        $opt_crm_mode 
         
 
         set underblock [tcl::string::map {\r\n \n} $underblock]
@@ -307,33 +326,35 @@ tcl::namespace::eval overtype {
         #set underlines [split $underblock \n]
 
         #underblock is a 'rendered' block - so width height make sense
-        #colwidth & colheight were originally named with reference to rendering into a 'column' of output e.g  a table column - before cursor row/col was implemented.
-        #The naming is now confusing. It should be something like renderwidth renderheight ?? review 
+        #only non-cursor affecting and non-width occupying ANSI codes should be present.
+        #ie SGR codes and perhaps things such as PM - although generally those should have been pushed to the application already
+        #renderwidth & renderheight were originally used with reference to rendering into a 'column' of output e.g  a table column - before cursor row/col was implemented.
         
         if {$opt_width eq "\uFFEF" || $opt_height eq "\uFFEF"} {
-            lassign [blocksize $underblock] _w colwidth _h colheight
+            lassign [blocksize $underblock] _w renderwidth _h renderheight 
             if {$opt_width ne "\uFFEF"} {
-                set colwidth $opt_width
+                set renderwidth $opt_width
             }
             if {$opt_height ne "\uFFEF"} {
-                set colheight $opt_height
+                set renderheight $opt_height
             }
         } else {
-            set colwidth $opt_width
-            set colheight $opt_height
+            set renderwidth $opt_width
+            set renderheight $opt_height
         }
 
         # -- --- --- --- 
         #REVIEW - do we need ansi resets in the underblock?
         if {$underblock eq ""} {
-            set underlines [lrepeat $colheight ""]
+            set underlines [lrepeat $renderheight ""]
         } else {
+            set underblock [textblock::join_basic -- $underblock] ;#ensure properly rendered - ansi per-line resets & replays
             set underlines [split $underblock \n]
         }
         #if {$underblock eq ""} {
         #    set blank "\x1b\[0m\x1b\[0m"
         #    #set underlines [list "\x1b\[0m\x1b\[0m"]
-        #    set underlines [lrepeat $colheight $blank]
+        #    set underlines [lrepeat $renderheight $blank]
         #} else {
         #    #lines_as_list -ansiresets 1 will do nothing if -ansiresets 1 isn't specified - REVIEW
         #    set underlines [lines_as_list -ansiresets 1 $underblock]
@@ -341,7 +362,7 @@ tcl::namespace::eval overtype {
         # -- --- --- --- 
 
         #todo - reconsider the 'line' as the natural chunking mechanism for the overlay.
-        #In practice an overlay ANSI stream can be a single line with ansi moves/restores etc - or even have no moves or newlines, just relying on wrapping at the output colwidth
+        #In practice an overlay ANSI stream can be a single line with ansi moves/restores etc - or even have no moves or newlines, just relying on wrapping at the output renderwidth 
         #In such cases - we process the whole shebazzle for the first output line - only reducing by the applied amount at the head each time, reprocessing the long tail each time.
         #(in cases where there are interline moves or cursor jumps anyway)
         #This works - but doesn't seem efficient.
@@ -409,7 +430,7 @@ tcl::namespace::eval overtype {
 
         set replay_codes_underlay [tcl::dict::create 1 ""] 
         #lappend replay_codes_overlay ""
-        set replay_codes_overlay ""
+        set replay_codes_overlay "[punk::ansi::a]"
         set unapplied ""
         set cursor_saved_position [tcl::dict::create] 
         set cursor_saved_attributes ""
@@ -452,14 +473,25 @@ tcl::namespace::eval overtype {
             }
             #review insert_mode. As an 'overtype' function whose main function is not interactive keystrokes - insert is secondary - 
             #but even if we didn't want it as an option to the function call - to process ansi adequately we need to support IRM (insertion-replacement mode) ESC [ 4 h|l
-            set LASTCALL [list -info 1 -insert_mode $insert_mode -autowrap_mode $autowrap_mode -transparent $opt_transparent -width $colwidth  -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -cursor_column $col -cursor_row $row $undertext $overtext]
+            set LASTCALL [list      -info 1\
+                                    -insert_mode $insert_mode\
+                                    -crm_mode $crm_mode\
+                                    -autowrap_mode $autowrap_mode\
+                                    -reverse_mode $reverse_mode\
+                                    -transparent $opt_transparent\
+                                    -width $renderwidth\
+                                    -exposed1 $opt_exposed1\
+                                    -exposed2 $opt_exposed2\
+                                    -overflow $opt_overflow -cursor_column $col -cursor_row $row $undertext $overtext]
             set rinfo [renderline   -experimental $opt_experimental\
                                     -info 1\
+                                    -crm_mode $crm_mode\
                                     -insert_mode $insert_mode\
-                                    -cursor_restore_attributes $cursor_saved_attributes\
                                     -autowrap_mode $autowrap_mode\
+                                    -reverse_mode  $reverse_mode\
+                                    -cursor_restore_attributes $cursor_saved_attributes\
                                     -transparent $opt_transparent\
-                                    -width $colwidth\
+                                    -width $renderwidth\
                                     -exposed1 $opt_exposed1\
                                     -exposed2 $opt_exposed2\
                                     -overflow $opt_overflow\
@@ -471,7 +503,10 @@ tcl::namespace::eval overtype {
             set instruction                 [tcl::dict::get $rinfo instruction]
             set insert_mode                 [tcl::dict::get $rinfo insert_mode]
             set autowrap_mode               [tcl::dict::get $rinfo autowrap_mode] ;#
-            #set reverse_mode                [tcl::dict::get $rinfo reverse_mode];#how to support in rendered linelist? we need to examine all pt/code blocks and flip each SGR stack?
+            set reverse_mode                [tcl::dict::get $rinfo reverse_mode]
+            #how to support reverse_mode in rendered linelist? we need to examine all pt/code blocks and flip each SGR stack?
+            # - review - the answer is probably that we don't need to - it is set/reset only during application of overtext
+            set crm_mode                    [tcl::dict::get $rinfo crm_mode]
             set rendered                    [tcl::dict::get $rinfo result]
             set overflow_right              [tcl::dict::get $rinfo overflow_right]
             set overflow_right_column       [tcl::dict::get $rinfo overflow_right_column]
@@ -486,7 +521,36 @@ tcl::namespace::eval overtype {
             set insert_lines_below          [tcl::dict::get $rinfo insert_lines_below]
             tcl::dict::set replay_codes_underlay [expr {$renderedrow+1}] [tcl::dict::get $rinfo replay_codes_underlay]
             #lset replay_codes_overlay [expr $overidx+1] [tcl::dict::get $rinfo replay_codes_overlay]
-            set replay_codes_overlay        [tcl::dict::get $rinfo replay_codes_overlay]
+            set replay_codes_overlay    [tcl::dict::get $rinfo replay_codes_overlay]
+            if {0 && $reverse_mode} {
+                puts stderr "---->[ansistring VIEW $replay_codes_overlay] rendered: $rendered"
+                #review
+                #JMN3
+                set existing_reverse_state 0 
+                #split_codes_single is single esc sequence - but could have multiple sgr codes within one esc sequence
+                #e.g \x1b\[0;31;7m  has a reset,colour red and reverse
+                set codeinfo [punk::ansi::codetype::sgr_merge [list $replay_codes_overlay] -info 1]
+                set codestate_reverse [dict get $codeinfo codestate reverse]
+                switch -- $codestate_reverse {
+                    7 {
+                        set existing_reverse_state 1
+                    }
+                    27 {
+                        set existing_reverse_state 0
+                    }
+                    "" {
+                    }
+                }
+                if {$existing_reverse_state == 0} {
+                    set rflip [a+ reverse]
+                } else {
+                    #reverse of reverse
+                    set rflip [a+ noreverse]
+                }
+                #note that mergeresult can have multiple esc (due to unmergeables or non sgr codes)
+                set replay_codes_overlay [punk::ansi::codetype::sgr_merge [list [dict get $codeinfo mergeresult] $rflip]]
+                puts stderr "---->[ansistring VIEW $replay_codes_overlay] rendered: $rendered"
+            }
 
 
 
@@ -520,7 +584,7 @@ tcl::namespace::eval overtype {
                             incr row
                             if {$data_mode} {
                                 set col [_get_row_append_column $row] 
-                                if {$col > $colwidth} {
+                                if {$col > $renderwidth} {
 
                                 }
                             } else {
@@ -563,10 +627,10 @@ tcl::namespace::eval overtype {
                             #we need renderline to return the number of the maximum column filled (or min if we ever do r-to-l)
                             set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                             set lastdatacol [punk::ansi::printing_length $existingdata]
-                            if {$lastdatacol < $colwidth} {
+                            if {$lastdatacol < $renderwidth} {
                                 set col [expr {$lastdatacol+1}]
                             } else {
-                                set col $colwidth 
+                                set col $renderwidth 
                             }
                         }
                         
@@ -601,10 +665,10 @@ tcl::namespace::eval overtype {
                             }
                             set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                             set lastdatacol [punk::ansi::printing_length $existingdata]
-                            if {$lastdatacol < $colwidth} {
+                            if {$lastdatacol < $renderwidth} {
                                 set col [expr {$lastdatacol+1}]
                             } else {
-                                set col $colwidth 
+                                set col $renderwidth 
                             }
 
                         }
@@ -640,9 +704,9 @@ tcl::namespace::eval overtype {
 
                             puts stdout ">>>[a+ red bold]overflow_right during restore_cursor[a]"
 
-                            set sub_info [overtype::renderline -info 1 -width $colwidth -insert_mode $insert_mode -autowrap_mode $autowrap_mode  -overflow [tcl::dict::get $opts -overflow] "" $overflow_right]
+                            set sub_info [overtype::renderline -info 1 -width $renderwidth -insert_mode $insert_mode -autowrap_mode $autowrap_mode  -overflow [tcl::dict::get $opts -overflow] "" $overflow_right]
                             set foldline [tcl::dict::get $sub_info result]
-                            set insert_mode [tcl::dict::get $sub_info insert_mode] ;#probably not needed.. 
+                            set insert_mode [tcl::dict::get $sub_info insert_mode] ;#probably not needed..? 
                             set autowrap_mode [tcl::dict::get $sub_info autowrap_mode] ;#nor this..
                             linsert outputlines $renderedrow $foldline
                             #review - row & col set by restore - but not if there was no save..
@@ -740,7 +804,7 @@ tcl::namespace::eval overtype {
                             }
                     }
                     lf_overflow {
-                            #linefeed after colwidth e.g at column 81 for an 80 col width
+                            #linefeed after renderwidth e.g at column 81 for an 80 col width
                             #we may also have other control sequences that came after col 80 e.g cursor save
 
                             if 0 {
@@ -833,10 +897,10 @@ tcl::namespace::eval overtype {
                             } else {
                                 set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                                 set lastdatacol [punk::ansi::printing_length $existingdata]
-                                if {$lastdatacol < $colwidth} {
+                                if {$lastdatacol < $renderwidth} {
                                     set col [expr {$lastdatacol+1}]
                                 } else {
-                                    set col $colwidth 
+                                    set col $renderwidth 
                                 }
                             }
                         }
@@ -845,12 +909,12 @@ tcl::namespace::eval overtype {
                         #doesn't seem to be used by fruit.ans testfile
                         #used by dzds.ans
                         #note that cursor_forward may move deep into the next line - or even span multiple lines !TODO
-                        set c $colwidth 
+                        set c $renderwidth 
                         set r $post_render_row
-                        if {$post_render_col > $colwidth} {
+                        if {$post_render_col > $renderwidth} {
                             set i $c
                             while {$i <= $post_render_col} {
-                                if {$c == $colwidth+1} {
+                                if {$c == $renderwidth+1} {
                                     incr r
                                     if {$opt_appendlines} {
                                         if {$r < [llength $outputlines]} {
@@ -874,7 +938,7 @@ tcl::namespace::eval overtype {
                         set col $c
                     }
                     wrapmovebackward {
-                        set c $colwidth
+                        set c $renderwidth
                         set r $post_render_row
                         if {$post_render_col < 1} {
                             set c 1 
@@ -883,7 +947,7 @@ tcl::namespace::eval overtype {
                                 if {$c == 0} {
                                     if {$r > 1} {
                                         incr r -1
-                                        set c $colwidth
+                                        set c $renderwidth
                                     } else {
                                         #leave r at 1 set c 1
                                         #testfile besthpav.ans first line top left border alignment
@@ -941,7 +1005,7 @@ tcl::namespace::eval overtype {
                         #2nd half of grapheme would overflow - treggering grapheme is returned in unapplied. There may also be overflow_right from earlier inserts
                         #todo - consider various options .. re-render a single trailing space or placeholder on same output line, etc
                         if {$autowrap_mode} {
-                            if {$colwidth < 2} {
+                            if {$renderwidth < 2} {
                                 #edge case of rendering to a single column output - any 2w char will just cause a loop if we don't substitute with something, or drop the character
                                 set idx 0
                                 set triggering_grapheme_index -1
@@ -960,7 +1024,7 @@ tcl::namespace::eval overtype {
                         } else {
                             set overflow_handled 1
                             #handled by dropping entire overflow if any  
-                            if {$colwidth < 2} {
+                            if {$renderwidth < 2} {
                                 set idx 0
                                 set triggering_grapheme_index -1
                                 foreach u $unapplied_list {
@@ -1141,12 +1205,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        #set renderwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
-        #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {$colwidth - $overblock_width}]
+        set under_exposed_max [expr {$renderwidth - $overblock_width}]
         if {$under_exposed_max > 0} {
             #background block is wider
             if {$under_exposed_max % 2 == 0} {
@@ -1176,14 +1239,14 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 set undertext "$undertext[string repeat { } $udiff]"
             }
             set undertext [tcl::string::cat $replay_codes_underlay $undertext]
             set overtext  [tcl::string::cat $replay_codes_overlay $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             #review - right-to-left langs should elide on left! - extra option required
 
             if {$overflowlength > 0} {
@@ -1196,8 +1259,8 @@ tcl::namespace::eval overtype {
 
                 #overlay line data is wider - trim if overflow not specified in opts - and overtype an ellipsis at right if it was specified
                 if {![tcl::dict::get $opts -overflow]} {
-                    #lappend outputlines [tcl::string::range $overtext 0 [expr {$colwidth - 1}]]
-                    #set overtext [tcl::string::range $overtext 0 $colwidth-1 ]
+                    #lappend outputlines [tcl::string::range $overtext 0 [expr {$renderwidth - 1}]]
+                    #set overtext [tcl::string::range $overtext 0 $renderwidth-1 ]
                     if {$opt_ellipsis} {
                         set show_ellipsis 1
                         if {!$opt_ellipsiswhitespace} {
@@ -1286,12 +1349,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
         #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {max(0,$colwidth - $overblock_width)}]
+        set under_exposed_max [expr {max(0,$renderwidth - $overblock_width)}]
         set left_exposed $under_exposed_max 
 
 
@@ -1307,8 +1369,8 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 #puts xxx
                 append undertext [string repeat { } $udiff]
             }
@@ -1336,10 +1398,17 @@ tcl::namespace::eval overtype {
             set undertext [tcl::string::cat $replay_codes_underlay $undertext]
             set overtext [tcl::string::cat $replay_codes_overlay $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             if {$overflowlength > 0} {	
                 #raw overtext wider than undertext column
-                set rinfo [renderline -info 1 -insert_mode 0 -transparent $opt_transparent -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -startcolumn [expr {1 + $startoffset}] $undertext $overtext]
+                set rinfo [renderline\
+                         -info 1\
+                         -insert_mode 0\
+                         -transparent $opt_transparent\
+                         -exposed1 $opt_exposed1 -exposed2 $opt_exposed2\
+                         -overflow $opt_overflow\
+                         -startcolumn [expr {1 + $startoffset}]\
+                         $undertext $overtext]
                 set replay_codes          [tcl::dict::get $rinfo replay_codes]
                 set rendered [tcl::dict::get $rinfo result]
                 if {!$opt_overflow} {
@@ -1433,12 +1502,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
         #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {max(0,$colwidth - $overblock_width)}]
+        set under_exposed_max [expr {max(0,$renderwidth - $overblock_width)}]
 
         switch -- $opt_blockalign {
             left {
@@ -1484,8 +1552,8 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 #puts xxx
                 append undertext [string repeat { } $udiff]
             }
@@ -1513,7 +1581,7 @@ tcl::namespace::eval overtype {
             set undertext   [tcl::string::cat $replay_codes_underlay    $undertext]
             set overtext    [tcl::string::cat $replay_codes_overlay     $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             if {$overflowlength > 0} {	
                 #raw overtext wider than undertext column
                 set rinfo [renderline -info 1 -insert_mode 0 -transparent $opt_transparent -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -startcolumn [expr {1 + $startoffset}] $undertext $overtext]
@@ -1566,6 +1634,7 @@ tcl::namespace::eval overtype {
                 #lappend outputlines [renderline -insert_mode 0 -transparent $opt_transparent -startcolumn [expr {$left_exposed + 1}] $undertext $overtext]
                 #Note - we still need overflow here - as although the overtext is short - it may oveflow due to the startoffset
                 set rinfo [renderline -info 1  -insert_mode 0 -transparent $opt_transparent -overflow $opt_overflow -startcolumn [expr {$left_exposed + 1 + $startoffset}] $undertext $overtext]
+                #puts stderr "--> [ansistring VIEW -lf 1 -nul 1 $rinfo] <--"
                 set overflow_right  [tcl::dict::get $rinfo overflow_right]
                 set unapplied       [tcl::dict::get $rinfo unapplied]
                 lappend outputlines [tcl::dict::get $rinfo result]
@@ -1629,6 +1698,7 @@ tcl::namespace::eval overtype {
             -cursor_column 1\
             -cursor_row    ""\
             -insert_mode   1\
+            -crm_mode      0\
             -autowrap_mode 1\
             -reverse_mode  0\
             -info          0\
@@ -1649,7 +1719,9 @@ tcl::namespace::eval overtype {
         set argsflags [lrange $args 0 end-2]
         tcl::dict::for {k v} $argsflags {
             switch -- $k {
-                -experimental - -cp437 - -width - -overflow - -transparent - -startcolumn - -cursor_column - -cursor_row - -insert_mode - -autowrap_mode - -reverse_mode - -info - -exposed1 - -exposed2 - -cursor_restore_attributes {
+                -experimental - -cp437 - -width - -overflow - -transparent - -startcolumn - -cursor_column - -cursor_row
+                - -crm_mode - -insert_mode - -autowrap_mode - -reverse_mode
+                - -info - -exposed1 - -exposed2 - -cursor_restore_attributes {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -1676,6 +1748,7 @@ tcl::namespace::eval overtype {
         # -- --- --- --- --- --- --- --- --- --- --- ---
         set opt_autowrap_mode       [tcl::dict::get $opts -autowrap_mode] ;#DECAWM - char or movement can go beyond leftmost/rightmost col to prev/next line
         set opt_reverse_mode        [tcl::dict::get $opts -reverse_mode]  ;#DECSNM
+        set opt_crm_mode            [tcl::dict::get $opts -crm_mode];# CRM - show control character mode
         # -- --- --- --- --- --- --- --- --- --- --- ---
         set temp_cursor_saved       [tcl::dict::get $opts -cursor_restore_attributes]
 
@@ -1721,6 +1794,10 @@ tcl::namespace::eval overtype {
             set cursor_row $opt_row_context
         }
 
+        set insert_mode $opt_insert_mode ;#default 1
+        set autowrap_mode $opt_autowrap_mode ;#default 1
+        set crm_mode $opt_crm_mode ;#default 0 (Show Control Character mode)
+        set reverse_mode $opt_reverse_mode
 
         #-----
         #
@@ -1768,6 +1845,7 @@ tcl::namespace::eval overtype {
         }
         set understacks [list]
         set understacks_gx [list]
+        set pm_list [list]
 
         set i_u -1  ;#underlay may legitimately be empty
         set undercols [list] 
@@ -1834,6 +1912,7 @@ tcl::namespace::eval overtype {
             #underlay should already have been rendered and not have non-sgr codes - but let's retain the check for them and not stack them if other codes are here
 
             #only stack SGR (graphics rendition) codes - not title sets, cursor moves etc 
+            #keep any remaining PMs in place
             if {$code ne ""} {
                 set c1c2 [tcl::string::range $code 0 1]
 
@@ -1841,6 +1920,8 @@ tcl::namespace::eval overtype {
                     \x1b\[          7CSI\
                     \x9b            8CSI\
                     \x1b\(          7GFX\
+                    \x1b^           7PMX\
+                    \x1bX           7SOS\
                 ] $c1c2] 0 3];# leadernorm is 1st 2 chars mapped to normalised indicator - or is original 2 chars
 
                 switch -- $leadernorm {
@@ -1875,6 +1956,26 @@ tcl::namespace::eval overtype {
                             }
                         }
                     }
+                    7PMX - 7SOS {
+                        #we can have PMs or SOS (start of string) in the underlay - though mostly the PMs should have been processed..
+                        #attach the PM/SOS (entire ANSI sequence) to the previous grapheme! 
+                        #It should not affect the size - but terminal display may get thrown out if terminal doesn't support them.
+
+                        #note that there may in theory already be ANSI stored - we don't assume it was a pure grapheme string
+                        set graphemeplus [lindex $undercols end]
+                        if {$graphemeplus ne "\0"} {
+                            append graphemeplus $code
+                        } else {
+                            set graphemeplus $code
+                        }
+                        lset undercols end $graphemeplus
+                        #The grapheme_width_cached function will be called on this later - and doesn't account for ansi.
+                        #we need to manually cache the item with it's proper width 
+                        variable grapheme_widths
+                        #stripped and plus version  keys pointing to same length
+                        dict set grapheme_widths $graphemeplus [grapheme_width_cached [::punk::ansi::ansistrip $graphemeplus]]
+
+                    }
                     default {
 
                     }
@@ -1937,9 +2038,9 @@ tcl::namespace::eval overtype {
 
         }
         if {$opt_width ne "\uFFEF"} {
-            set colwidth $opt_width
+            set renderwidth $opt_width
         } else {
-            set colwidth [llength $undercols]
+            set renderwidth [llength $undercols]
         }
 
 
@@ -2017,12 +2118,30 @@ tcl::namespace::eval overtype {
             }
             append pt_overchars $pt
             #will get empty pt between adjacent codes
-            foreach grapheme [punk::char::grapheme_split $pt] {
-                lappend overstacks $o_codestack
-                lappend overstacks_gx $o_gxstack
-                incr i_o 
-                lappend overlay_grapheme_control_list [list g $grapheme]
-                lappend overlay_grapheme_control_stacks $o_codestack
+            if {!$crm_mode} {
+                foreach grapheme [punk::char::grapheme_split $pt] {
+                    lappend overstacks $o_codestack
+                    lappend overstacks_gx $o_gxstack
+                    incr i_o 
+                    lappend overlay_grapheme_control_list [list g $grapheme]
+                    lappend overlay_grapheme_control_stacks $o_codestack
+                }
+            } else {
+                foreach grapheme_original [punk::char::grapheme_split $pt] {
+                    set pt_crm [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $grapheme_original]
+                    foreach grapheme [punk::char::grapheme_split $pt_crm] {
+                        if {$grapheme eq "\n"} {
+                            lappend overlay_grapheme_control_stacks $o_codestack
+                            lappend overlay_grapheme_control_list [list crmcontrol "\x1b\[00001E"]
+                        } else {
+                            lappend overstacks $o_codestack
+                            lappend overstacks_gx $o_gxstack
+                            incr i_o 
+                            lappend overlay_grapheme_control_list [list g $grapheme]
+                            lappend overlay_grapheme_control_stacks $o_codestack
+                        }
+                    }
+                }
             }
 
             #only stack SGR (graphics rendition) codes - not title sets, cursor moves etc 
@@ -2030,40 +2149,91 @@ tcl::namespace::eval overtype {
             # that pure resets are fairly common - more so than leading resets with other info
             # that non-sgr codes are not that common, so ok to check for resets before verifying it is actually SGR at all.
             if {$code ne ""} {
-                lappend overlay_grapheme_control_stacks $o_codestack
-                #there will always be an empty code at end due to foreach on 2 vars with odd-sized list ending with pt (overmap coming from perlish split) 
-                if {[punk::ansi::codetype::is_sgr_reset $code]} {
-                    set o_codestack [list "\x1b\[m"]  ;#reset better than empty list - fixes some ansi art issues
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
-                    set o_codestack [list $code]
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[priv::is_sgr $code]} {
-                    #basic simplification first - remove straight dupes
-                    set dup_posns [lsearch -all -exact $o_codestack $code] ;#must be -exact because of square-bracket glob chars
-                    set o_codestack [lremove $o_codestack {*}$dup_posns]
-                    lappend o_codestack $code
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[regexp {\x1b7|\x1b\[s} $code]} {
-                    #experiment
-                    #cursor_save - for the replays review.
-                    #jmn
-                    #set temp_cursor_saved [punk::ansi::codetype::sgr_merge_list {*}$o_codestack]
-                    lappend overlay_grapheme_control_list [list other $code]
-                } elseif {[regexp {\x1b8|\x1b\[u} $code]} {
-                    #experiment
-                    #cursor_restore - for the replays
-                    set o_codestack [list $temp_cursor_saved]    
-                    lappend overlay_grapheme_control_list [list other $code]
+                #we need to immediately set crm_mode here if \x1b\[3h received
+                if {$code eq "\x1b\[3h"} {
+                    set crm_mode 1
+                } elseif {$code eq "\x1b\[3l"} {
+                    set crm_mode 0
+                }
+                #else crm_mode could be set either way from options
+                if {$crm_mode && $code ne "\x1b\[00001E"} {
+                    #treat the code as type 'g' like above   - only allow through codes to reset mode REVIEW for now just \x1b\[3l ? 
+                    #we need to somehow convert further \n in the graphical rep to an instruction for newline that will bypass further crm_mode processing or we would loop.
+                    set code_as_pt [ansistring VIEW -nul 1 -lf 1 -vt 1 -ff 1 $code]
+                    #split using standard split for first foreach loop - grapheme based split when processing 2nd foreach loop
+                    set chars [split $code_as_pt ""]
+                    set codeparts [list] ;#list of 2-el lists each element {crmcontrol <ansi>} or {g <text>}
+                    foreach c $chars {
+                        if {$c eq "\n"} {
+                            #use CNL (cursor next line)  \x1b\[00001E  ;#leading zeroes ok for this processor - used as debugging aid to distinguish 
+                            lappend codeparts [list crmcontrol "\x1b\[00001E"]
+                        } else {
+                            if {[llength $codeparts] > 0 && [lindex $codeparts end 0] eq "g"} {
+                                set existing [lindex $codeparts end 1]
+                                lset codeparts end [list g [string cat $existing $c]]
+                            } else {
+                                lappend codeparts [list g $c]
+                            }
+                        }
+                    }
+
+                    set partidx 0
+                    foreach record $codeparts {
+                        lassign $record rtype rval
+                        switch -exact -- $rtype {
+                            g {
+                                append pt_overchars $rval 
+                                foreach grapheme [punk::char::grapheme_split $rval] {
+                                    lappend overstacks $o_codestack
+                                    lappend overstacks_gx $o_gxstack
+                                    incr i_o 
+                                    lappend overlay_grapheme_control_list [list g $grapheme]
+                                    lappend overlay_grapheme_control_stacks $o_codestack
+                                }
+                            }
+                            crmcontrol {
+                                #leave o_codestack
+                                lappend overlay_grapheme_control_stacks $o_codestack
+                                lappend overlay_grapheme_control_list [list crmcontrol $rval]
+                            }
+                        }
+                    }
                 } else {
-                    if {[punk::ansi::codetype::is_gx_open $code]} {
-                        set o_gxstack [list "gx0_on"]
-                        lappend overlay_grapheme_control_list [list gx0 gx0_on] ;#don't store code - will complicate debugging if we spit it out and jump character sets
-                    } elseif {[punk::ansi::codetype::is_gx_close $code]} {
-                        set o_gxstack [list]
-                        lappend overlay_grapheme_control_list [list gx0 gx0_off] ;#don't store code - will complicate debugging if we spit it out and jump character sets
-                    } else {
+                    lappend overlay_grapheme_control_stacks $o_codestack
+                    #there will always be an empty code at end due to foreach on 2 vars with odd-sized list ending with pt (overmap coming from perlish split) 
+                    if {[punk::ansi::codetype::is_sgr_reset $code]} {
+                        set o_codestack [list "\x1b\[m"]  ;#reset better than empty list - fixes some ansi art issues
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
+                        set o_codestack [list $code]
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[priv::is_sgr $code]} {
+                        #basic simplification first - remove straight dupes
+                        set dup_posns [lsearch -all -exact $o_codestack $code] ;#must be -exact because of square-bracket glob chars
+                        set o_codestack [lremove $o_codestack {*}$dup_posns]
+                        lappend o_codestack $code
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[regexp {\x1b7|\x1b\[s} $code]} {
+                        #experiment
+                        #cursor_save - for the replays review.
+                        #jmn
+                        #set temp_cursor_saved [punk::ansi::codetype::sgr_merge_list {*}$o_codestack]
+                        lappend overlay_grapheme_control_list [list other $code]
+                    } elseif {[regexp {\x1b8|\x1b\[u} $code]} {
+                        #experiment
+                        #cursor_restore - for the replays
+                        set o_codestack [list $temp_cursor_saved]    
                         lappend overlay_grapheme_control_list [list other $code]
+                    } else {
+                        if {[punk::ansi::codetype::is_gx_open $code]} {
+                            set o_gxstack [list "gx0_on"]
+                            lappend overlay_grapheme_control_list [list gx0 gx0_on] ;#don't store code - will complicate debugging if we spit it out and jump character sets
+                        } elseif {[punk::ansi::codetype::is_gx_close $code]} {
+                            set o_gxstack [list]
+                            lappend overlay_grapheme_control_list [list gx0 gx0_off] ;#don't store code - will complicate debugging if we spit it out and jump character sets
+                        } else {
+                            lappend overlay_grapheme_control_list [list other $code]
+                        }
                     }
                 }
             }
@@ -2135,9 +2305,6 @@ tcl::namespace::eval overtype {
         #movements only occur within the overlay range.
         #an underlay is however not necessary.. e.g
         #renderline -overflow 1 "" data 
-        #foreach {pt code} $overmap {}
-        set insert_mode $opt_insert_mode ;#default 1
-        set autowrap_mode $opt_autowrap_mode ;#default 1
 
         #set re_mode        {\x1b\[\?([0-9]*)(h|l)}   ;#e.g DECAWM 
         #set re_col_move    {\x1b\[([0-9]*)(C|D|G)$}
@@ -2163,13 +2330,28 @@ tcl::namespace::eval overtype {
             switch -- $type {
                 g { 
                     set ch $item 
+                    #crm_mode affects both graphic and control 
+                    if {$crm_mode} {
+                        set chars [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $ch]
+                        set chars [string map [list \n "\x1b\[00001E"] $chars]
+                        if {[llength [split $chars ""]] > 1} { 
+                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                            #prefix the unapplied controls with the string version of this control
+                            set unapplied_list [linsert $unapplied_list 0 {*}[split $chars ""]]
+                            set unapplied [join $unapplied_list ""]
+                            #incr idx_over
+                            break
+                        } else {
+                            set ch $chars
+                        }
+                    }
                     incr idx_over; #idx_over (until unapplied reached anyway) is per *grapheme* in the overlay - not per col. 
                     if {($idx < ($opt_colstart -1))} {
                         incr idx [grapheme_width_cached $ch]
                         continue
                     }
                     #set within_undercols [expr {$idx <= [llength $undercols]-1}] ;#within our active data width 
-                    set within_undercols [expr {$idx <= $colwidth-1}]
+                    set within_undercols [expr {$idx <= $renderwidth-1}]
 
                     #https://www.enigma.com/resources/blog/the-secret-world-of-newline-characters
                     #\x85 NEL in the c1 control set is treated by some terminal emulators (e.g Hyper) as a newline,
@@ -2311,6 +2493,7 @@ tcl::namespace::eval overtype {
                                 } else {
                                     #todo - punk::char::char_width
                                     set g [lindex $outcols $idx]
+                                    #JMN
                                     set uwidth [grapheme_width_cached $g]
                                     if {[lindex $outcols $idx] eq ""} {
                                         #2nd col of 2-wide char in underlay 
@@ -2485,13 +2668,29 @@ tcl::namespace::eval overtype {
 
 
                 }
-                other {
+                other - crmcontrol {
+                    if {$crm_mode && $type ne "crmcontrol" && $item ne "\x1b\[00001E"} {
+                        if {$item eq "\x1b\[3l"} {
+                            set crm_mode 0
+                        } else {
+                            #When our initial overlay split was done - we weren't in crm_mode - so there are codes that weren't mapped to unicode control character representations
+                            #set within_undercols [expr {$idx <= $renderwidth-1}]
+                            #set chars [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $item]
+                            set chars [ansistring VIEW -nul 1 -lf 1 -vt 1 -ff 1 $item]
+                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                            #prefix the unapplied controls with the string version of this control
+                            set unapplied_list [linsert $unapplied_list 0 {*}[split $chars ""]]
+                            set unapplied [join $unapplied_list ""]
+                            
+                            break
+                        }
+                    }
+
                     #todo - consider CSI s DECSLRM vs ansi.sys \x1b\[s  - we need \x1b\[s for oldschool ansi art - but may have to enable only for that.
-                    #we should probably therefore reverse this mapping so that x1b7 x1b8 are the primary codes for save/restore
+                    #we should possibly therefore reverse this mapping so that x1b7 x1b8 are the primary codes for save/restore?
                     set code [tcl::string::map [list \x1b7 \x1b\[s \x1b8 \x1b\[u ] $item]
                     #since this element isn't a grapheme - advance idx_over to next grapheme overlay when about to fill 'unapplied'
 
-                    set matchinfo [list]
 
                     #remap of DEC cursor_save/cursor_restore from ESC sequence to equivalent CSI
                     #probably not ideal - consider putting cursor_save/cursor_restore in functions so they can be called from the appropriate switch branch instead of using this mapping
@@ -2501,7 +2700,7 @@ tcl::namespace::eval overtype {
                     set c1c2c3 [tcl::string::range $code 0 2]
                     #set re_ST_open {(?:\033P|\u0090|\033X|\u0098|\033\^|\u009e|\033_|\u009f)} 
                     #tcl 8.7 - faster to use inline list than to store it in a local var outside of loop. 
-                    #(surprising - but presumably )
+                    #(somewhat surprising)
                     set leadernorm [tcl::string::range [tcl::string::map [list\
                         \x1b\[<     1006\
                         \x1b\[      7CSI\
@@ -2509,7 +2708,7 @@ tcl::namespace::eval overtype {
                         \x1b\]      7OSC\
                         \x9d        8OSC\
                         \x1b        7ESC\
-                        ] $c1c2c3] 0 3] ;#leadernorm is 1st 2 chars mapped to 4char normalised indicator - or is original 2 chars 
+                        ] $c1c2c3] 0 3] ;#leadernorm is 1st 1,2 or 3 chars mapped to 4char normalised indicator - or is original first chars (1,2 or 3 len) 
 
                     #we leave the tail of the code unmapped for now 
                     switch -- $leadernorm {
@@ -2528,7 +2727,10 @@ tcl::namespace::eval overtype {
                             set codenorm [tcl::string::cat $leadernorm [tcl::string::range $code 1 end]]
                         }
                         default {
+                            puts stderr "Sequence detected as ANSI, but not handled in leadernorm switch. code: [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
                             #we haven't made a mapping for this
+                            #could in theory be 1,2 or 3 in len 
+                            #although we shouldn't be getting here if the regexp for ansi codes is kept in sync with our switch branches
                             set codenorm $code
                         }
                     }
@@ -2551,44 +2753,44 @@ tcl::namespace::eval overtype {
                         {7CSI} - {8CSI} {
                             set param [tcl::string::range $codenorm 4 end-1]
                             #puts stdout "--> CSI [tcl::string::index $leadernorm 0] bit param:$param"
-                            switch -- [tcl::string::index $codenorm end] {
-                                D {
-                                    #Col move
-                                    #puts stdout "<-back"
-                                    #cursor back
-                                    #left-arrow/move-back when ltr mode
+                            set code_end [tcl::string::index $codenorm end] ;#used for e.g h|l set/unset mode
+                            switch -exact -- $code_end {
+                                A {
+                                    #Row move - up
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
                                     set num $param
                                     if {$num eq ""} {set num 1}
+                                    incr cursor_row -$num
 
-                                    set version 2
-                                    if {$version eq "2"} {
-                                        #todo - startcolumn offset!
-                                        if {$cursor_column - $num >= 1} {
-                                            incr idx -$num
-                                            incr cursor_column -$num
-                                        } else {
-                                            if {!$autowrap_mode} {
-                                            set cursor_column 1 
-                                            set idx 0
-                                            } else {
-                                                set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                                incr cursor_column -$num
-                                                priv::render_unapplied $overlay_grapheme_control_list $gci
-                                                set instruction wrapmovebackward
-                                                break
-                                            }
-                                        }
-                                    } else {
-                                        incr idx -$num
-                                        incr cursor_column -$num
-                                        if {$idx < $opt_colstart-1} {
-                                            #wrap to previous line and position cursor at end of data
-                                            set idx [expr {$opt_colstart-1}]
-                                            set cursor_column $opt_colstart
-                                        }
+                                    if {$cursor_row < 1} {
+                                        set cursor_row  1
                                     }
+
+                                    #ensure rest of *overlay* is emitted to remainder
+                                    incr idx_over
+                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                    set instruction up
+                                    #retain cursor_column
+                                    break 
+                                }
+                                B {
+                                    #CUD - Cursor Down
+                                    #Row move - down
+                                    set num $param
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                    #move down
+                                    if {$num eq ""} {set num 1}
+                                    incr cursor_row $num
+
+
+                                    incr idx_over ;#idx_over hasn't encountered a grapheme and hasn't advanced yet 
+                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                    set instruction down
+                                    #retain cursor_column
+                                    break 
                                 }
                                 C {
+                                    #CUF - Cursor Forward
                                     #Col move
                                     #puts stdout "->forward"
                                     #todo - consider right-to-left cursor mode (e.g Hebrew).. some day.
@@ -2692,80 +2894,215 @@ tcl::namespace::eval overtype {
                                         }
                                     }
                                 } 
-                                G {
+                                D {
                                     #Col move
-                                    #move absolute column
-                                    #adjust to colstart - as column 1 is within overlay
-                                    #???
-                                    set idx [expr {$param + $opt_colstart -1}] 
-                                    set cursor_column $param
-                                    error "renderline absolute col move ESC G unimplemented"
-                                }
-                                A {
-                                    #Row move - up
-                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                    #puts stdout "<-back"
+                                    #cursor back
+                                    #left-arrow/move-back when ltr mode
                                     set num $param
                                     if {$num eq ""} {set num 1}
-                                    incr cursor_row -$num
 
-                                    if {$cursor_row < 1} {
-                                        set cursor_row  1
+                                    set version 2
+                                    if {$version eq "2"} {
+                                        #todo - startcolumn offset!
+                                        if {$cursor_column - $num >= 1} {
+                                            incr idx -$num
+                                            incr cursor_column -$num
+                                        } else {
+                                            if {!$autowrap_mode} {
+                                            set cursor_column 1 
+                                            set idx 0
+                                            } else {
+                                                set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                                incr cursor_column -$num
+                                                priv::render_unapplied $overlay_grapheme_control_list $gci
+                                                set instruction wrapmovebackward
+                                                break
+                                            }
+                                        }
+                                    } else {
+                                        incr idx -$num
+                                        incr cursor_column -$num
+                                        if {$idx < $opt_colstart-1} {
+                                            #wrap to previous line and position cursor at end of data
+                                            set idx [expr {$opt_colstart-1}]
+                                            set cursor_column $opt_colstart
+                                        }
                                     }
-
-                                    #ensure rest of *overlay* is emitted to remainder
+                                }
+                                E {
+                                    #CNL - Cursor Next Line
+                                    if {$param eq ""} {
+                                        set downmove 1
+                                    } else {
+                                        set downmove [expr {$param}]
+                                    }
+                                    puts stderr "renderline CNL down-by-$downmove"
+                                    set cursor_column 1
+                                    set cursor_row [expr {$cursor_row + $downmove}]
+                                    set idx [expr {$cursor_column -1}]
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
                                     incr idx_over
                                     priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction up
-                                    #retain cursor_column
-                                    break 
+                                    set instruction move
+                                    break
+
                                 }
-                                B {
-                                    #Row move - down
-                                    set num $param
+                                F {
+                                    #CPL - Cursor Previous Line
+                                    if {$param eq ""} {
+                                        set upmove 1
+                                    } else {
+                                        set upmove [expr {$param}]
+                                    }
+                                    puts stderr "renderline CPL up-by-$upmove"
+                                    set cursor_column 1
+                                    set cursor_row [expr {$cursor_row -$upmove}]
+                                    if {$cursor_row < 1} {
+                                        set cursor_row 1
+                                    } 
+                                    set idx [expr {$cursor_column - 1}]
                                     set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                    #move down
-                                    if {$num eq ""} {set num 1}
-                                    incr cursor_row $num
-
-
-                                    incr idx_over ;#idx_over hasn't encountered a grapheme and hasn't advanced yet 
+                                    incr idx_over
                                     priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction down
-                                    #retain cursor_column
-                                    break 
+                                    set instruction move
+                                    break
+
+                                }
+                                G {
+                                    #CHA - Cursor Horizontal Absolute (move to absolute column no)
+                                    if {$param eq ""} {
+                                        set targetcol 1
+                                    } else {
+                                        set targetcol $param
+                                        if {![string is integer -strict $targetcol]} {
+                                            puts stderr "renderline CHA (Cursor Horizontal Absolute) error. Unrecognised parameter '$param'"
+                                        }
+                                        set targetcol [expr {$param}]
+                                        set max [llength $outcols]
+                                        if {$overflow_idx == -1} {
+                                            incr max
+                                        }
+                                        if {$targetcol > $max} {
+                                            puts stderr "renderline CHA (Cursor Horizontal Absolute) error. Param '$param' > max: $max"
+                                            set targetcol $max
+                                        }
+                                    }
+                                    #adjust to colstart - as column 1 is within overlay
+                                    #??? REVIEW
+                                    set idx [expr {($targetcol -1) + $opt_colstart -1}] 
+                                    
+                                     
+                                    set cursor_column $targetcol
+                                    #puts stderr "renderline absolute col move ESC G (TEST)"
                                 }
                                 H - f {
-                                    #$re_both_move
-                                    lassign [split $param {;}] row col
-                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                    #lassign $matchinfo _match row col 
+                                    #CSI n;m H - CUP - Cursor Position
 
-                                    if {$col eq ""} {set col 1}
-                                    set max [llength $outcols]
-                                    if {$overflow_idx == -1} {
-                                        incr max 
-                                    }
-                                    if {$col > $max} {
-                                        set cursor_column  $max
+                                    #CSI n;m f - HVP - Horizontal Vertical Position REVIEW - same as CUP with differences (what?) in some terminal modes
+                                    # - 'counts as effector format function  (like CR or LF) rather than an editor function (like CUD or CNL)'
+                                    # - REVIEW 
+                                    #see Annex A at: https://www.ecma-international.org/wp-content/uploads/ECMA-48_5th_edition_june_1991.pdf
+
+                                    #test e.g ansicat face_2.ans
+                                    #$re_both_move
+                                    lassign [split $param {;}] paramrow paramcol
+                                    #missing defaults to 1
+                                    #CSI ;5H = CSI 1;5H -> row 1 col 5
+                                    #CSI 17;H = CSI 17H = CSI 17;1H -> row 17 col 1 
+
+                                    if {$paramcol eq ""} {set paramcol 1}
+                                    if {$paramrow eq ""} {set paramrow 1}
+                                    if {![string is integer -strict $paramcol] || ![string is integer -strict $paramrow]} {
+                                        puts stderr "renderline CUP (CSI <param> H) unrecognised param $param"
+                                        #ignore?
                                     } else {
-                                        set cursor_column $col
+                                        set max [llength $outcols]
+                                        if {$overflow_idx == -1} {
+                                            incr max 
+                                        }
+                                        if {$paramcol > $max} {
+                                            set target_column  $max
+                                        } else {
+                                            set target_column [expr {$paramcol}]
+                                        }
+
+
+                                        if {$paramrow < 1} {
+                                            puts stderr "renderline CUP (CSI <param> H) bad row target 0. Assuming 1"
+                                            set target_row 1
+                                        } else {
+                                            set target_row [expr {$paramrow}]
+                                        }
+                                        if {$target_row == $cursor_row} {
+                                            #col move only - no need for break and move
+                                            #puts stderr "renderline CUP col move only to col $target_column param:$param"
+                                            set cursor_column $target_column
+                                            set idx [expr {$cursor_column -1}]
+                                        } else {
+                                            set cursor_row $target_row
+                                            set cursor_column $target_column
+                                            set idx [expr {$cursor_column -1}]
+                                            set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                            incr idx_over
+                                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                                            set instruction move
+                                            break
+                                        }
                                     }
-                                    set idx [expr {$cursor_column -1}]
+                                }
+                                J {
+                                    puts stderr "overtype::renderline ED - ERASE IN DISPLAY (TESTING) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                    if {$param eq ""} {set param 0} 
+                                    switch -exact -- $param {
+                                        0 {
+                                            #clear from cursor to end of screen
+                                        }
+                                        1 {
+                                            #clear from cursor to beginning of screen
+                                        }
+                                        2 {
+                                            #clear entire screen
+                                            #ansi.sys - move cursor to upper left REVIEW
+                                            set cursor_row 1
+                                            set cursor_column 1
+                                            set idx [expr {$cursor_column -1}]
+                                            set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                            incr idx_over
+                                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                                            set instruction move
+                                            break
+                                        }
+                                        3 {
+                                            #clear entire screen. presumably cursor doesn't move - otherwise it would be same as 2J ?
 
-                                    if {$row eq ""} {set row 1}
-                                    set cursor_row $row
-                                    if {$cursor_row < 1} {
-                                        set cursor_row 1
+                                        }
+                                        default {
+                                        }
                                     }
 
-                                    incr idx_over
-                                    priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction move
-                                    break
+                                }
+                                K {
+                                    puts stderr "overtype::renderline EL - ERASE IN LINE (TESTING) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                    if {$param eq ""} {set param 0} 
+                                    switch -exact -- $param {
+                                        0 {
+                                            #clear from cursor to end of line
+                                        }
+                                        1 {
+                                            #clear from cursor to beginning of line
 
+                                        }
+                                        2 {
+                                            #clear entire line
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline EL - ERASE IN LINE PARAM '$param' unrecognised [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                        }
+                                    }
                                 }
                                 X {
-                                    puts stderr "X - $param"
+                                    puts stderr "overtype::renderline X ECH ERASE CHARACTER - $param"
                                     #ECH - erase character
                                     if {$param eq "" || $param eq "0"} {set param 1}; #param=count of chars to erase
                                     priv::render_erasechar $idx $param 
@@ -2789,78 +3126,119 @@ tcl::namespace::eval overtype {
                                     break
                                 }
                                 s {
-                                    # - todo - make ansi.sys CSI s cursor save only apply for certain cases? - may need to support DECSLRM instead which uses same code
-
-                                    #$re_cursor_save
-                                    #cursor save could come after last column  
-                                    if {$overflow_idx != -1 && $idx == $overflow_idx} {
-                                        #bartman2.ans test file - fixes misalignment at bottom of dialog bubble
-                                        #incr cursor_row
-                                        #set cursor_column 1
-                                        #bwings1.ans test file - breaks if we actually incr cursor (has repeated saves)
-                                        set cursor_saved_position [list row [expr {$cursor_row+1}] column 1]
-                                    } else {
-                                        set cursor_saved_position [list row $cursor_row column $cursor_column]
-                                    }
-                                    #there may be overlay stackable codes emitted that aren't in the understacks because they come between the last emmited character and the cursor_save control.
-                                    #we need the SGR and gx overlay codes prior to the cursor_save  
+                                    #code conflict between ansi emulation and DECSLRM - REVIEW
+                                    #ANSISYSSC  (when no parameters) - like other terminals - essentially treat same as DECSC
+                                    # todo - when parameters - support DECSLRM instead
+
+                                    if {$param ne ""} {
+                                        #DECSLRM - should only be recognised if DECLRMM is set  (vertical split screen mode)
+                                        lassign [split $param {;} margin_left margin_right 
+                                        puts stderr "overtype DECSLRM not yet supported - got [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                        if {$margin_left eq ""} {
+                                            set margin_left 1
+                                        }
+                                        set columns_per_page 80 ;#todo - set to 'page width (DECSCPP set columns per page)' - could be 132 or??
+                                        if {$margin_right eq ""} {
+                                            set margin_right $columns_per_page 
+                                        }
+                                        puts stderr "DECSLRM margin left: $margin_left margin right: $margin_right"
+                                        if {![string is integer -strict $margin_left] || $margin_left < 0} {
+                                            puts stderr "DECSLRM invalid margin_left"
+                                        }
+                                        if {![string is integer -strict $margin_right] || $margin_right < 0} {
+                                            puts stderr "DECSLRM invalid margin_right"
+                                        }
+                                        set scrolling_region_size [expr {$margin_right - $margin_left}]
+                                        if {$scrolling_region_size < 2 || $scrolling_region_size > $columns_per_page} {
+                                            puts stderr "DECSLRM region size '$scrolling_regsion_size' must be between 1 and $columns_per_page"
+                                        }
+                                        #todo 
 
-                                    #a real terminal would not be able to know the state of the underlay.. so we should probably ignore it.
-                                    #set sgr_stack [lindex $understacks $idx]
-                                    #set gx_stack [lindex $understacks_gx $idx] ;#not actually a stack - just a boolean state (for now?)
-                                    
-                                    set sgr_stack [list]
-                                    set gx_stack [list]
-
-                                    #we shouldn't need to scan for intermediate cursor save/restores - as restores would throw-back to the calling loop - so our overlay 'line' is since those.
-                                    #The overlay_grapheme_control_list had leading resets from previous lines - so we go back to the beginning not just the first grapheme.
-
-                                    foreach gc [lrange $overlay_grapheme_control_list 0 $gci-1] {
-                                        lassign $gc type code 
-                                        #types g other sgr gx0
-                                        switch -- $type {
-                                            gx0 {
-                                                #code is actually a stand-in for the graphics on/off code  - not the raw code
-                                                #It is either gx0_on or gx0_off 
-                                                set gx_stack [list $code]
-                                            }
-                                            sgr {
-                                                #code is the raw code
-                                                if {[punk::ansi::codetype::is_sgr_reset $code]} {
-                                                    #jmn
-                                                    set sgr_stack [list "\x1b\[m"]
-                                                } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
-                                                    set sgr_stack [list $code]
-                                                    lappend overlay_grapheme_control_list [list sgr $code]
-                                                } elseif {[priv::is_sgr $code]} {
-                                                    #often we don't get resets - and codes just pile up.
-                                                    #as a first step to simplifying - at least remove earlier straight up dupes
-                                                    set dup_posns [lsearch -all -exact $sgr_stack $code] ;#needs -exact - codes have square-brackets (glob chars)
-                                                    set sgr_stack [lremove $sgr_stack {*}$dup_posns]
-                                                    lappend sgr_stack $code
+
+                                    } else {
+                                        #DECSC
+                                        #//notes on expected behaviour:
+                                        #DECSC - saves following items in terminal's memory
+                                        #cursor position
+                                        #character attributes set by the SGR command
+                                        #character sets (G0,G1,G2 or G3) currently in GL and GR
+                                        #Wrap flag (autowrap or no autowrap)
+                                        #State of origin mode (DECOM)
+                                        #selective erase attribute
+                                        #any single shift 2 (SS2) or single shift 3(SSD) functions sent
+
+                                        #$re_cursor_save
+                                        #cursor save could come after last column  
+                                        if {$overflow_idx != -1 && $idx == $overflow_idx} {
+                                            #bartman2.ans test file - fixes misalignment at bottom of dialog bubble
+                                            #incr cursor_row
+                                            #set cursor_column 1
+                                            #bwings1.ans test file - breaks if we actually incr cursor (has repeated saves)
+                                            set cursor_saved_position [list row [expr {$cursor_row+1}] column 1]
+                                        } else {
+                                            set cursor_saved_position [list row $cursor_row column $cursor_column]
+                                        }
+                                        #there may be overlay stackable codes emitted that aren't in the understacks because they come between the last emmited character and the cursor_save control.
+                                        #we need the SGR and gx overlay codes prior to the cursor_save  
+
+                                        #a real terminal would not be able to know the state of the underlay.. so we should probably ignore it.
+                                        #set sgr_stack [lindex $understacks $idx]
+                                        #set gx_stack [lindex $understacks_gx $idx] ;#not actually a stack - just a boolean state (for now?)
+                                        
+                                        set sgr_stack [list]
+                                        set gx_stack [list]
+
+                                        #we shouldn't need to scan for intermediate cursor save/restores - as restores would throw-back to the calling loop - so our overlay 'line' is since those.
+                                        #The overlay_grapheme_control_list had leading resets from previous lines - so we go back to the beginning not just the first grapheme.
+
+                                        foreach gc [lrange $overlay_grapheme_control_list 0 $gci-1] {
+                                            lassign $gc type code 
+                                            #types g other sgr gx0
+                                            switch -- $type {
+                                                gx0 {
+                                                    #code is actually a stand-in for the graphics on/off code  - not the raw code
+                                                    #It is either gx0_on or gx0_off 
+                                                    set gx_stack [list $code]
+                                                }
+                                                sgr {
+                                                    #code is the raw code
+                                                    if {[punk::ansi::codetype::is_sgr_reset $code]} {
+                                                        #jmn
+                                                        set sgr_stack [list "\x1b\[m"]
+                                                    } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
+                                                        set sgr_stack [list $code]
+                                                        lappend overlay_grapheme_control_list [list sgr $code]
+                                                    } elseif {[priv::is_sgr $code]} {
+                                                        #often we don't get resets - and codes just pile up.
+                                                        #as a first step to simplifying - at least remove earlier straight up dupes
+                                                        set dup_posns [lsearch -all -exact $sgr_stack $code] ;#needs -exact - codes have square-brackets (glob chars)
+                                                        set sgr_stack [lremove $sgr_stack {*}$dup_posns]
+                                                        lappend sgr_stack $code
+                                                    }
                                                 }
                                             }
                                         }
-                                    }
-                                    set cursor_saved_attributes ""
-                                    switch -- [lindex $gx_stack 0] {
-                                        gx0_on {
-                                            append cursor_saved_attributes "\x1b(0"
-                                        }
-                                        gx0_off {
-                                            append cursor_saved_attributes "\x1b(B"
+                                        set cursor_saved_attributes ""
+                                        switch -- [lindex $gx_stack 0] {
+                                            gx0_on {
+                                                append cursor_saved_attributes "\x1b(0"
+                                            }
+                                            gx0_off {
+                                                append cursor_saved_attributes "\x1b(B"
+                                            }
                                         }
-                                    }
-                                    #append cursor_saved_attributes [join $sgr_stack ""]
-                                    append cursor_saved_attributes [punk::ansi::codetype::sgr_merge_list {*}$sgr_stack]
+                                        #append cursor_saved_attributes [join $sgr_stack ""]
+                                        append cursor_saved_attributes [punk::ansi::codetype::sgr_merge_list {*}$sgr_stack]
 
-                                    #as there is apparently only one cursor storage element we don't need to throw back to the calling loop for a save.
+                                        #as there is apparently only one cursor storage element we don't need to throw back to the calling loop for a save.
 
-                                    #don't incr index - or the save will cause cursor to move to the right
-                                    #carry on 
-                                    
+                                        #don't incr index - or the save will cause cursor to move to the right
+                                        #carry on 
+                                    }
                                 }
                                 u {
+                                    #ANSISYSRC save cursor (when no parameters)  (DECSC)
+
                                     #$re_cursor_restore
                                     #we are going to jump somewhere.. for now we will assume another line, and process accordingly.
                                     #The caller has the cursor_saved_position/cursor_saved_attributes if any (?review - if we always pass it back it, we could save some calls for moves in same line)
@@ -2903,7 +3281,6 @@ tcl::namespace::eval overtype {
                                 }
                                 ~ {
                                     #$re_vt_sequence
-                                    #lassign $matchinfo _match key mod 
                                     lassign [split $param {;}] key mod
 
                                     #Note that f1 to f4 show as ESCOP|Q|R|S  (VT220?) but f5+ show as ESC\[15~
@@ -2972,64 +3349,129 @@ tcl::namespace::eval overtype {
 
                                 }
                                 h - l {
+                                    #set mode unset mode
                                     #we are matching only last char to get to this arm - but are there other sequences ending in h|l we need to handle?
 
                                     #$re_mode if first after CSI is "?"  
                                     #some docs mention ESC=<mode>h|l  - not seen on windows terminals.. review
                                     #e.g https://www2.math.upenn.edu/~kazdan/210/computer/ansi.html
-                                    if {[tcl::string::index $codenorm 4] eq "?"} {
-                                        set num [tcl::string::range $codenorm 5 end-1] ;#param between ? and h|l
-                                        #lassign $matchinfo _match num type
-                                        switch -- $num {
-                                            5 {
-                                                #DECSNM - reverse video
-                                                #How we simulate this to render within a block of text is an open question.
-                                                #track all SGR stacks and constantly flip based on the current SGR reverse state?
-                                                #It is the job of the calling loop to do this - so at this stage we'll just set the states
-                                                #DECAWM autowrap 
-                                                if {$type eq "h"} {
-                                                    #set (enable)
-                                                    set reverse_mode 1
-                                                } else {
-                                                    #reset (disable)
-                                                    set reverse_mode 0
+                                    set modegroup [tcl::string::index $codenorm 4] ;#e.g ? =
+                                    switch -exact -- $modegroup {
+                                        ? {
+                                            set num [tcl::string::range $codenorm 5 end-1] ;#param between ? and h|l
+                                            switch -- $num {
+                                                5 {
+                                                    #DECSNM - reverse video
+                                                    #How we simulate this to render within a block of text is an open question.
+                                                    #track all SGR stacks and constantly flip based on the current SGR reverse state?
+                                                    #It is the job of the calling loop to do this - so at this stage we'll just set the states
+
+                                                    if {$code_end eq "h"} {
+                                                        #set (enable)
+                                                        set reverse_mode 1
+                                                    } else {
+                                                        #reset (disable)
+                                                        set reverse_mode 0
+                                                    }
+
+                                                }
+                                                7 {
+                                                    #DECAWM autowrap 
+                                                    if {$code_end eq "h"} {
+                                                        #set (enable)
+                                                        set autowrap_mode 1
+                                                        if {$opt_width ne "\uFFEF"} {
+                                                            set overflow_idx $opt_width
+                                                        } else {
+                                                            #review - this is also the cursor position when adding a char at end of line? 
+                                                            set overflow_idx [expr {[llength $undercols]}] ;#index at which we would be *in* overflow a row move may still override it 
+                                                        }
+                                                        #review - can idx ever be beyond overflow_idx limit when we change e.g with a width setting and cursor movements? presume not - but sanity check for now.
+                                                        if {$idx >= $overflow_idx} {
+                                                            puts stderr "renderline error - idx '$idx' >= overflow_idx '$overflow_idx' - unexpected"
+                                                        }
+                                                    } else {
+                                                        #reset (disable)
+                                                        set autowrap_mode 0
+                                                        set overflow_idx -1
+                                                    }
                                                 }
+                                                25 {
+                                                    if {$code_end eq "h"} {
+                                                        #visible cursor
 
+                                                    } else {
+                                                        #invisible cursor
+
+                                                    }
+                                                }
                                             }
-                                            7 {
-                                                #DECAWM autowrap 
-                                                if {$type eq "h"} {
-                                                    #set (enable)
-                                                    set autowrap_mode 1
-                                                    if {$opt_width ne "\uFFEF"} {
-                                                        set overflow_idx $opt_width
+                                        }
+                                        = {
+                                            set num [tcl::string::range $codenorm 5 end-1] ;#param between = and h|l
+                                            puts stderr "overtype::renderline CSI=...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
+                                        default {
+                                            #e.g CSI 4 h
+                                            set num [tcl::string::range $codenorm 4 end-1] ;#param before h|l
+                                            switch -exact -- $num {
+                                                3 {
+                                                    puts stderr "CRM MODE $code_end"
+                                                    #CRM - Show control character mode
+                                                    # 'No control functions are executed except LF,FF and VT which are represented in the CRM FONT before a CRLF(new line) is executed'
+                                                    #  
+                                                    #use ansistring VIEW -nul 1 -lf 2 -ff 2 -vt 2
+                                                    #https://vt100.net/docs/vt510-rm/CRM.html
+                                                    if {$code_end eq "h"} {
+                                                        set crm_mode 1
                                                     } else {
-                                                        #review - this is also the cursor position when adding a char at end of line? 
-                                                        set overflow_idx [expr {[llength $undercols]}] ;#index at which we would be *in* overflow a row move may still override it 
+                                                        set crm_mode 0
                                                     }
-                                                    #review - can idx ever be beyond overflow_idx limit when we change e.g with a width setting and cursor movements? presume not - but sanity check for now.
-                                                    if {$idx >= $overflow_idx} {
-                                                        puts stderr "renderline error - idx '$idx' >= overflow_idx '$overflow_idx' - unexpected"
+                                                }
+                                                4 {
+                                                    #IRM - Insert/Replace Mode
+                                                    if {$code_end eq "h"} {
+                                                        set insert_mode 1
+                                                    } else {
+                                                        #replace mode
+                                                        set insert_mode 0
                                                     }
-                                                } else {
-                                                    #reset (disable)
-                                                    set autowrap_mode 0
-                                                    set overflow_idx -1
                                                 }
+                                                default {
+                                                    puts stderr "overtype::renderline CSI...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                | {
+                                    switch -- [tcl::string::index $codenorm end-1] {
+                                        {$} {
+                                            #CSI ... $ |   DECSCPP set columns per page- (recommended in vt510 docs as preferable to DECCOLM)
+                                            #real terminals generally only supported 80/132
+                                            #some other virtuals support any where from 2 to 65,536?
+                                            #we will allow arbitrary widths >= 2 .. to some as yet undetermined limit.
+                                            #CSI <param> $ |
+                                            #empty or 0 param is 80 for compatibility - other numbers > 2 accepted
+                                            set page_width -1 ;#flag as unset
+                                            if {$param eq ""} {
+                                                set page_width 80
+                                            }  elseif {[string is integer -strict $param] && $param >=2 0} {
+                                                set page_width [expr {$param}] ;#we should allow leading zeros in the number - but lets normalize using expr
+                                            } else {
+                                                puts stderr "overtype::renderline unacceptable DECSPP value '$param'" 
                                             }
-                                            25 {
-                                                if {$type eq "h"} {
-                                                    #visible cursor
 
-                                                } else {
-                                                    #invisible cursor
+                                            if {$page_width > 2} {
+                                                puts stderr "overtype::renderline DECSCPP - not implemented - but selected width '$page_width' looks ok"
+                                                #if cursor already beyond new page_width - will move to right colum - otherwise no cursor movement
 
-                                                }
                                             }
-                                        }
 
-                                    } else {
-                                        puts stderr "overtype::renderline CSI...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline  unrecognised CSI code ending in pipe (|) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
                                     }
                                 }
                                 default {
@@ -3038,8 +3480,9 @@ tcl::namespace::eval overtype {
                             } 
                         } 
                         7ESC {
-                            #$re_other_single
-                            switch -- [tcl::string::index $codenorm end] {
+                            #re_other_single         {\x1b(D|M|E)$}
+                            #also PM \x1b^...(ST)
+                            switch -- [tcl::string::index $codenorm 4] {
                                 D {
                                     #\x84
                                     #index (IND)
@@ -3080,20 +3523,66 @@ tcl::namespace::eval overtype {
                                     puts stderr "ESC E unimplemented"
 
                                 }
+                                ^ {
+                                    #puts stderr "renderline PM"
+                                    #Privacy Message.
+                                    if {[string index $code end] eq "\007"} {
+                                        set pm_content [string range $code 2 end-1] ;#ST is \007
+                                    } else {
+                                        set pm_content [string range $code 2 end-2] ;#ST is \x1b\\
+                                    }
+                                    #We don't want to render it - but we need to make it available to the application
+                                    #see the textblock library in punk, for the exception we make here for single backspace.
+                                    #It is unlikely to be encountered as a useful PM - so we hack to pass it through as a fix 
+                                    #for spacing issues on old terminals which miscalculate the single-width 'Symbols for Legacy Computing'
+                                    if {$pm_content eq "\b"} {
+                                        #puts stderr "renderline PM sole backspace special handling for \U1FB00 - \U1FBFF"
+                                        #esc^\b\007 or esc^\besc\\ 
+                                        #HACKY pass-through - targeting terminals that both mis-space legacy symbols *and* don't support PMs
+                                        #The result is repair of the extra space. If the terminal is a modern one and does support PM - the \b should be hidden anyway.
+                                        #If the terminal has the space problem AND does support PMs - then this just won't fix it.
+                                        #The fix relies on the symbol-supplier to cooperate by appending esc^\b\esc\\ to the problematic symbols.
+
+                                        #priv::render_addchar $idx $code [lindex $overstacks $idx_over] [lindex $overstacks_gx $idx_over] $insert_mode
+                                        #idx has been incremented after last grapheme added
+                                        priv::render_append_to_char [expr {$idx -1}] $code
+                                    }
+                                    #lappend to a dict element in the result for application-specific processing
+                                    lappend pm_list $pm_content
+                                }
+                                N - O {
+                                    puts stderr "overtype::renderline single shift command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                P {
+                                    puts stderr "overtype::renderline DEVICE CONTROL STRING command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                X {
+                                    #SOS
+                                    if {[string index $code end] eq "\007"} {
+                                        set sos_content [string range $code 2 end-1] ;#ST is \007
+                                    } else {
+                                        set sos_content [string range $code 2 end-2] ;#ST is \x1b\\
+                                    }
+                                    #return in some useful form to the caller
+                                    #TODO!
+                                    lappend sos_list [list string $sos_content row $cursor_row column $cursor_column]
+                                    puts stderr "overtype::renderline ESCX SOS UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                _ {
+                                    #APC Application Program Command
+                                    #just warn for now..
+                                    puts stderr "overtype::renderline ESC_ APC command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
                                 default {
-                                    puts stderr "overtype::renderline ESC<x> code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                    puts stderr "overtype::renderline ESC<x> code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented codenorm:[ansistring VIEW -lf 1 -vt 1 -nul 1 $codenorm]"
                                 }
                             }
 
                         }
+                        default {
+                        }
                     }
 
-                    #switch -regexp -matchvar matchinfo -- $code\
-                    #$re_mode {
-                    #}\
-                    #default {
-                    #    puts stderr "overtype::renderline code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
-                    #}
 
                 }
                 default {
@@ -3275,8 +3764,10 @@ tcl::namespace::eval overtype {
                 overflow_right $overflow_right\
                 unapplied $unapplied\
                 unapplied_list $unapplied_list\
-                insert_mode $insert_mode\
-                autowrap_mode $autowrap_mode\
+                insert_mode     $insert_mode\
+                autowrap_mode   $autowrap_mode\
+                crm_mode        $crm_mode\
+                reverse_mode    $reverse_mode\
                 insert_lines_above $insert_lines_above\
                 insert_lines_below $insert_lines_below\
                 cursor_saved_position $cursor_saved_position\
@@ -3287,6 +3778,7 @@ tcl::namespace::eval overtype {
                 replay_codes $replay_codes\
                 replay_codes_underlay $replay_codes_underlay\
                 replay_codes_overlay $replay_codes_overlay\
+                pm_list  $pm_list\
             ]
             if {$opt_returnextra == 1} {
                 return $result
@@ -3370,8 +3862,9 @@ tcl::namespace::eval overtype::piper {
 }
 interp alias "" piper_renderline "" overtype::piper::renderline 
 
-#intended for single grapheme - but will work for multiple
-#cannot contain ansi or newlines 
+#intended primarily for single grapheme - but will work for multiple
+#WARNING: query CAN contain ansi or newlines - but if cache was not already set manually,the answer will be incorrect!
+#We deliberately allow this for PM/SOS attached within a column
 #(a cache of ansifreestring_width calls - as these are quite regex heavy)
 proc overtype::grapheme_width_cached {ch} {
     variable grapheme_widths
@@ -3439,6 +3932,7 @@ tcl::namespace::eval overtype::priv {
         tcl::dict::set cache_is_sgr $code $answer
         return $answer
     }
+    # better named render_to_unapplied?
     proc render_unapplied {overlay_grapheme_control_list gci} {
         upvar idx_over idx_over
         upvar unapplied unapplied
@@ -3532,7 +4026,7 @@ tcl::namespace::eval overtype::priv {
             set ustacks [lreplace $ustacks $i $i]
             set gxstacks [lreplace $gxstacks $i $i]
         } else {
-
+            puts stderr "render_delchar - attempt to delchar at index $i >= number of outcols $nxt - shouldn't happen"
         }
     }
     proc render_erasechar {i count} {
@@ -3563,21 +4057,68 @@ tcl::namespace::eval overtype::priv {
         upvar outcols o
         lset o $i $c
     }
+
+    #Initial usecase is for old-terminal hack to add PM-wrapped \b
+    #review - can be used for other multibyte sequences that occupy one column?
+    #combiners? diacritics?
+    proc render_append_to_char {i c} {
+        upvar outcols o
+        if {$i > [llength $o]-1} {
+            error "render_append_to_char cannot append [ansistring VIEW -lf 1 -nul 1 $c] to existing char at index $i while $i >= llength outcols [llength $o]"
+        }
+        set existing [lindex $o $i]
+        if {$existing eq "\0"} {
+            lset o $i $c
+        } else {
+            lset o $i [string cat $existing $c] 
+        }
+    } 
     #is actually addgrapheme?
     proc render_addchar {i c sgrstack gx0stack {insert_mode 0}} {
         upvar outcols o
         upvar understacks ustacks
         upvar understacks_gx gxstacks
 
-        if 0 {
-        if {$c eq "c"} {
-            puts "i:$i c:$c sgrstack:[ansistring VIEW $sgrstack]"
-            puts "understacks:[ansistring VIEW $ustacks]"
-            upvar overstacks overstacks
-            puts "overstacks:[ansistring VIEW $overstacks]"
-            puts "info level 0:[info level 0]"
-        }
+        # -- --- ---
+        #this is somewhat of a hack.. probably not really the equivalent of proper reverse video? review
+        #we should ideally be able to reverse the video of a sequence that already includes SGR reverse/noreverse attributes
+        upvar reverse_mode do_reverse
+        #if {$do_reverse} {
+        #    lappend sgrstack [a+ reverse]
+        #} else {
+        #    lappend sgrstack [a+ noreverse]
+        #}
+
+        #JMN3
+        if {$do_reverse} {
+            #note we can't just look for \x1b\[7m  or \x1b\[27m
+            # it may be a more complex sequence like \x1b\[0\;\;7\;31m  etc
+
+            set existing_reverse_state 0 
+            set codeinfo [punk::ansi::codetype::sgr_merge $sgrstack -info 1]
+            set codestate_reverse [dict get $codeinfo codestate reverse]
+            switch -- $codestate_reverse {
+                7 {
+                    set existing_reverse_state 1
+                }
+                27 {
+                    set existing_reverse_state 0
+                }
+                "" {
+                }
+            }
+            if {$existing_reverse_state == 0} {
+                set rflip [a+ reverse]
+            } else {
+                #reverse of reverse
+                set rflip [a+ noreverse]
+            }
+            #note that mergeresult can have multiple esc (due to unmergeables or non sgr codes)
+            set sgrstack [list [dict get $codeinfo mergeresult] $rflip]
+            #set sgrstack [punk::ansi::codetype::sgr_merge [list [dict get $codeinfo mergeresult] $rflip]]
         }
+        
+        # -- --- ---
 
         set nxt [llength $o] 
         if {!$insert_mode} {
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/ansi-0.1.1.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/ansi-0.1.1.tm
index 85cb9f27..7a2f9443 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/ansi-0.1.1.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/ansi-0.1.1.tm
@@ -553,28 +553,51 @@ tcl::namespace::eval punk::ansi {
         $obj destroy
         return $result
     }
-    proc example {} {
+    proc example {args} {
+        set base [punk::repo::find_project]
+        set default_ansibase [file join $base src/testansi]
+
+        set argd [punk::args::get_dict [tstr -return string {
+            *proc -name punk::ansi::example -help "Display .ans image files in a grid that will fit in console
+            "
+            -colwidth -default 82 -help "Width of each column - default of 82 will fit a standard 80wide ansi image (when framed)
+            You can specify a narrower width to truncate images on the right side"
+            -folder -default "${$default_ansibase}"   -help "Base folder for files if relative paths are used.
+            Defaults to <projectbase>/src/testansi - where projectbase is determined from current directory.
+            "
+            *values -min 0 -max -1 
+            files -default {belinda.ans bot.ans flower.ans fish.ans} -multiple true -help "List of filenames - leave empty to display 4 defaults"
+        }] $args]
+        set colwidth [dict get $argd opts -colwidth]
+        set ansibase [file normalize [dict get $argd opts -folder]]
+        set fnames   [dict get $argd values files]
+
+        #assumes fixed column widths e.g 80col images will fit in 82-width frames (common standard for old ansi art) (of arbitrary height)
         #todo - review dependency on punk::repo ?  
         package require textblock
         package require punk::repo
         package require punk::console
 
-        set fnames [list belinda.ans bot.ans flower.ans fish.ans]
-        set base [punk::repo::find_project]
-        set ansibase [file join $base src/testansi]
         if {![file exists $ansibase]} {
-            puts stderr "Missing testansi folder at $base/src/testansi"
+            puts stderr "Missing folder at $ansibase"
             puts stderr "Ensure ansi test files exist: $fnames"
             #error "punk::ansi::example Cannot find example files"
         }
-        set missingbase [a+ yellow][textblock::block 80 23 ?][a]
+        set missingbase [a+ yellow][textblock::block [expr {$colwidth-2}] 23 ?][a] ;#assuming standard frame - subtract 2 for left/right borders
         set pics [list]
         foreach f $fnames {
-            if {![file exists $ansibase/$f]} {
-                set p [overtype::left $missingbase "[a+ red bold]\nMissing file\n$ansibase/$f[a]"]
+            if {[file pathtype $f] ne "absolute"} {
+                set filepath [file normalize $ansibase/$f]
+            } else {
+                set filepath [file normalize $f]
+            }
+            if {![file exists $filepath]} {
+                set p [overtype::left $missingbase "[a+ red bold]\nMissing file\n$f[a]"]
                 lappend pics [tcl::dict::create filename $f pic $p status missing]
             } else {
-                set img [join [lines_as_list -line trimline -block trimtail [ansicat $ansibase/$f]] \n]
+                #set img [join [lines_as_list -line trimline -block trimtail [ansicat $filepath]] \n]
+                #-line trimline will wreck some images
+                set img [join [lines_as_list -block trimtail [ansicat $filepath]] \n]
                 lappend pics [tcl::dict::create filename $f pic $img status ok] 
             }
         }
@@ -582,30 +605,73 @@ tcl::namespace::eval punk::ansi {
         set termsize [punk::console:::get_size] 
         set margin 4
         set freewidth [expr {[tcl::dict::get $termsize columns]-$margin}]
-        set per_row [expr {$freewidth / 80}]
-
-        set rowlist [list]
-        set row [list]
-        set i 1 
+        set per_row [expr {$freewidth / $colwidth}]
+
+        set rowlist [list]      ;# { {<img> <img>} {<img> <img>} }
+        set heightlist [list]   ;# { {<h>   <h>  } {<h>   <h>  } }
+        set maxheights [list]   ;# { <max>  <max>}
+        set row [list]  ;#wip row
+        set rowh [list] ;#wip row img heights
+        set i 1  ;#track image index of whole pics list
+        set rowindex 0
         foreach picinfo $pics {
             set subtitle ""
             if {[tcl::dict::get $picinfo status] ne "ok"} {
                 set subtitle [tcl::dict::get $picinfo status] 
             }
             set title [tcl::dict::get $picinfo filename]
-            lappend row [textblock::frame -subtitle $subtitle -title $title [tcl::dict::get $picinfo pic]]
+            set fr [textblock::frame -width $colwidth -subtitle $subtitle -title $title [tcl::dict::get $picinfo pic]]
+            # -- --- --- --- 
+            #we need the max height of a row  element to use join_basic instead of join below
+            # -- --- --- --- 
+            set fr_height [textblock::height $fr]
+            lappend row $fr
+            lappend rowh $fr_height
+
+            set rowmax [lindex $maxheights $rowindex]
+            if {$rowmax eq ""} {
+                #empty result means no maxheights entry for this row yet
+                set rowmax $fr_height
+                lappend maxheights $rowmax
+            } else {
+                if {$fr_height > $rowmax} {
+                    set rowmax $fr_height
+                    lset maxheights end $rowmax
+                }
+            } 
+            # -- --- --- --- 
+
             if {$i % $per_row == 0} {
                 lappend rowlist $row
+                lappend heightlist $rowh
+                incr rowindex
                 set row [list]
+                set rowh [list]
             } elseif {$i == [llength $pics]} {
                 lappend rowlist $row
+                lappend heightlist $rowh
             }
             incr i
         }
-
+        #puts "--> maxheights: $maxheights"
+        #puts "--> heightlist: $heightlist"
         set result ""
-        foreach r $rowlist {
-            append result [textblock::join_basic -- {*}$r] \n
+        set rowindex 0
+        set blankline [string repeat " " $colwidth]
+        foreach imgs $rowlist heights $heightlist  {
+            set maxheight [lindex $maxheights $rowindex]
+            set adjusted_row [list]
+            foreach i $imgs h $heights {
+                if {$h < $maxheight} {
+                    #add blank lines to bottom of shorter images so join_basic can be used.
+                    #textblock::join of ragged-height images would work and remove the need for all the height calculation
+                    #.. but it requires much more processing 
+                    append i [string repeat \n$blankline [expr {$maxheight - $h}]]
+                } 
+                lappend adjusted_row $i
+            }
+            append result [textblock::join_basic -- {*}$adjusted_row] \n
+            incr rowindex
         }
 
 
@@ -3199,6 +3265,28 @@ Brightblack 100   Brightred 101   Brightgreen 102   Brightyellow 103   Brightblu
         return \x1b8
     }
     # -- ---  --- --- ---
+    #CRM Show Control Character Mode
+    proc enable_crm {} {
+        return \x1b\[3h
+    }
+    proc disable_crm {} {
+        return \x1b\[3l
+    }
+
+    #DECSNM 
+    #Note this can invert the enclosed section including any already reversed by SGR 7  - depending on terminal support.
+    #e.g 
+    #set test [a+ reverse]aaa[a+ noreverse]bbb
+    #  - $test above can't just be reversed by putting another [a+ reverse] in front of it.
+    #  - but the following will work (even if underlying terminal doesn't support ?5 sequences)
+    #overtype::renderspace -width 20  [enable_inverse]$test 
+    proc enable_inverse {} {
+        return \x1b\[?5h
+    }
+    proc disable_inverse {} {
+        return \x1b\[?5l
+    }
+
 
     #DECAWM - automatic line wrapping
     proc enable_line_wrap {} {
@@ -3399,6 +3487,9 @@ Brightblack 100   Brightred 101   Brightgreen 102   Brightyellow 103   Brightblu
         #the purpose of backspace (or line cr) in embedded text is unclear. Should it allow some sort of character combining/overstrike as it has sometimes done historically (nroff/less)?  e.g a\b` as an alternative combiner or bolding if same char
         #This should presumably only be done if the over_strike (os) capability is enabled in the terminal. Either way - it presumably won't affect printing width?
         set line [punk::ansi::ansistrip $line]
+        #ANSI (e.g PM/SOS) can contain \b or \n  or \t  but won't contribute to length
+        #ansistrip must come before any other processing of these chars.
+
         #we can't use simple \b processing if we get ansi codes and aren't actually processing them (e.g moves)
 
         set line [punk::char::strip_nonprinting_ascii $line] ;#only strip nonprinting after ansistrip - some like BEL are part of ansi
@@ -3748,6 +3839,7 @@ tcl::namespace::eval punk::ansi {
             -filter_fg 0\
             -filter_bg 0\
             -filter_reset 0\
+            -info 0\
         ]
 
         #codes *must* already have been split so that one esc per element in codelist
@@ -3760,7 +3852,8 @@ tcl::namespace::eval punk::ansi {
             set opts $defaultopts_sgr_merge_singles
             foreach {k v} $args {
                 switch -- $k {
-                    -filter_fg - -filter_bg - -filter_reset {
+                    -filter_fg - -filter_bg - -filter_reset -
+                    -info {
                         tcl::dict::set opts $k $v
                     }
                     default {
@@ -4139,19 +4232,24 @@ tcl::namespace::eval punk::ansi {
                 set codemerge [tcl::string::trimright $codemerge {;}]
                 if {$unmergeable ne ""} {
                     set unmergeable [tcl::string::trimright $unmergeable {;}]
-                    return "\x1b\[${codemerge}m\x1b\[${unmergeable}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${codemerge}m\x1b\[${unmergeable}m[join $othercodes ""]"
                 } else {
-                    return "\x1b\[${codemerge}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${codemerge}m[join $othercodes ""]"
                 }
             } else {
                 if {$unmergeable eq ""} {
                     #there were no SGR codes - not even resets
-                    return [join $othercodes ""]
+                    set mergeresult [join $othercodes ""]
                 } else {
                     set unmergeable [tcl::string::trimright $unmergeable {;}]
-                    return "\x1b\[${unmergeable}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${unmergeable}m[join $othercodes ""]"
                 }
             }
+            if {[tcl::dict::get $opts -info]} {
+                return [dict create sgr $codemerge unmergeable $unmergeable othercodes $othercodes mergeresult $mergeresult codestate $codestate]
+            } else {
+                return $mergeresult
+            }
         }
 
         #has_sgr_reset  - rather than support this function - create an sgr normalize function that removes dead params and brings reset to front of param list?
@@ -4240,7 +4338,7 @@ tcl::namespace::eval punk::ansi::ta {
     #we also need to track the start of ST terminated code and not add it for replay (in the ansistring functions)
     #variable re_ST  {(?:\x1bX|\u0098|\x1b\^|\u009E|\x1b_|\u009F)(?:[^\x1b\007\u009c]*)(?:\x1b\\|\007|\u009c)} ;#downsides: early terminating with nests, mixes 7bit 8bit start/ends (does that exist in the wild?)   
     #keep our 8bit/7bit start-end codes separate
-    variable re_ST      {(?:\x1bP|\x1bX|\x1b\^|\x1b_)(?:(?!\x1b\\|007).)*(?:\x1b\\|\007)|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)}
+    variable re_ST      {(?:\x1bP|\x1bX|\x1b\^|\x1b_)(?:(?!\x1b\\|\007).)*(?:\x1b\\|\007)|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)}
 
 
 
@@ -4252,7 +4350,7 @@ tcl::namespace::eval punk::ansi::ta {
     # -- --- --- ---
     #handrafted TRIE version of above. Somewhat difficult to construct and maintain. TODO - find a regext TRIE generator that works with Tcl regexes
     #This does make things quicker - but it's too early to finalise the detect/split regexes (e.g missing \U0090 ) - will need to be redone.
-    variable re_ansi_detect {(?:\x1b(?:\((?:0|B)|\[(?:[\x20-\x2f\x30-\x3f]*[\x40-\x7e])|\](?:(?:[^\007]*)\007|(?:(?!\x1b\\).)*\x1b\\)|(?:P|X|\^|_)(?:(?:(?!\x1b\\|007).)*(?:\x1b\\|\007))|c|7|8|M|E|D|H|=|>|(?:#(?:3|4|5|6|8))))|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)|(?:\u009b)[\x20-\x2f\x30-\x3f]*[\x40-\x7e]|(?:\u009d)(?:[^\u009c]*)?\u009c}
+    variable re_ansi_detect {(?:\x1b(?:\((?:0|B)|\[(?:[\x20-\x2f\x30-\x3f]*[\x40-\x7e])|\](?:(?:[^\007]*)\007|(?:(?!\x1b\\).)*\x1b\\)|(?:P|X|\^|_)(?:(?:(?!\x1b\\|\007).)*(?:\x1b\\|\007))|c|7|8|M|E|D|H|=|>|(?:#(?:3|4|5|6|8))))|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)|(?:\u009b)[\x20-\x2f\x30-\x3f]*[\x40-\x7e]|(?:\u009d)(?:[^\u009c]*)?\u009c}
     # -- --- --- ---
 
 
@@ -5674,7 +5772,12 @@ tcl::namespace::eval punk::ansi::ansistring {
         ENQ [list \x05 \u2405]\
         ACK [list \x06 \u2406]\
         BEL [list \x07 \u2407]\
+        BS  [list \x08 \u2408]\
+        HT  [list \x09 \u2409]\
+        LF  [list \x0a \u240a]\
+        VT  [list \x0b \u240b]\
         FF  [list \x0c \u240c]\
+        CR  [list \x0d \u240d]\
         SO  [list \x0e \u240e]\
         SF  [list \x0f \u240f]\
         DLE [list \x10 \u2410]\
@@ -5688,12 +5791,15 @@ tcl::namespace::eval punk::ansi::ansistring {
         CAN [list \x18 \u2418]\
         EM  [list \x19 \u2419]\
         SUB [list \x1a \u241a]\
+        ESC [list \x1b \u241b]\
         FS  [list \x1c \u241c]\
         GS  [list \x1d \u241d]\
         RS  [list \x1e \u241e]\
         US  [list \x1f \u241f]\
+        SP  [list \x20 \u2420]\
         DEL [list \x7f \u2421]\
     ]
+
     #alternate symbols for space
     # \u2422 Blank Symbol (b with forwardslash overly)
     # \u2423 Open Box  (square bracket facing up like a tray/box)
@@ -5836,6 +5942,7 @@ tcl::namespace::eval punk::ansi::ansistring {
             -cr 1\
             -lf 0\
             -vt 0\
+            -ff 1\
             -ht 1\
             -bs 1\
             -sp 1\
@@ -5850,16 +5957,22 @@ tcl::namespace::eval punk::ansi::ansistring {
         set opt_cr      [tcl::dict::get $opts -cr]
         set opt_lf      [tcl::dict::get $opts -lf]
         set opt_vt      [tcl::dict::get $opts -vt]
+        set opt_ff      [tcl::dict::get $opts -ff]
         set opt_ht      [tcl::dict::get $opts -ht]
         set opt_bs      [tcl::dict::get $opts -bs]
         set opt_sp      [tcl::dict::get $opts -sp]
         # -- --- --- --- ---
 
+        # -lf 2, -vt 2 and -ff 2 are useful for CRM mode (Show Control Character Mode) in the terminal - where a newline is expected to display after the character.
 
 
         set visuals_opt $debug_visuals 
+        set visuals_opt [dict remove $visuals_opt CR ESC LF VT FF HT BS SP] 
+
         if {$opt_esc} {
             tcl::dict::set visuals_opt ESC [list \x1b \u241b]
+        } else {
+            tcl::dict::unset visuals_opt ESC
         }
         if {$opt_cr} {
             tcl::dict::set visuals_opt CR [list \x0d \u240d]
@@ -5870,9 +5983,20 @@ tcl::namespace::eval punk::ansi::ansistring {
         if {$opt_lf == 2} {
             tcl::dict::set visuals_opt LF [list \x0a \u240a\n]
         }
-        if {$opt_vt} {
+        if {$opt_vt ==  1} {
             tcl::dict::set visuals_opt VT [list \x0b \u240b]
         }
+        if {$opt_vt ==  2} {
+            tcl::dict::set visuals_opt VT [list \x0b \u240b\n]
+        }
+        switch -exact -- $opt_ff {
+            1 {
+                tcl::dict::set visuals_opt FF [list \x0c \u240c]
+            }
+            2 {
+                tcl::dict::set visuals_opt FF [list \x0c \u240c\n]
+            }
+        }
         if {$opt_ht} {
             tcl::dict::set visuals_opt HT [list \x09 \u2409]
         }
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/char-0.1.0.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/char-0.1.0.tm
index ed4b22e4..e47ba051 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/char-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/char-0.1.0.tm
@@ -552,13 +552,26 @@ tcl::namespace::eval punk::char {
             string eq $s [encoding convertto $encname [encoding convertfrom $encname $s]]
         }
     } else {
+        #review - use -profile?
         proc encodable "s {enc [encoding system]}" {
             set encname [encname $enc]
-            string eq $s [encoding convertfrom $encname [encoding convertto $encname $s]]
+            if {![catch {
+                string eq $s [encoding convertfrom $encname [encoding convertto $encname $s]]
+            } result]} {
+                return $result
+            } else {
+                return 0
+            }
         }
         proc decodable "s {enc [encoding system]}" {
             set encname [encname $enc]
-            string eq $s [encoding convertto $encname [encoding convertfrom $encname $s]]
+            if {![catch {
+                string eq $s [encoding convertto $encname [encoding convertfrom $encname $s]]
+            } result]} {
+                return $result
+            } else {
+                return 0
+            }
         }
     }
     #-- --- --- --- --- --- --- --- 
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/console-0.1.1.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/console-0.1.1.tm
index 3c64c7e3..6368aeae 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/console-0.1.1.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/console-0.1.1.tm
@@ -13,11 +13,51 @@
 # @@ Meta End
 
 
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# doctools header
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+#*** !doctools
+#[manpage_begin punkshell_module_punk::console 0 0.1.1]
+#[copyright "2024"]
+#[titledesc {punk console}]  [comment {-- Name section and table of contents description --}]
+#[moddesc {punk console}]             [comment {-- Description at end of page heading --}] 
+#[require punk::console]
+#[keywords module console terminal]
+#[description]
+#[para]
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[section Overview]
+#[para] overview of punk::console
+#[subsection Concepts]
+#[para]
 
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 ##  Requirements
-##e.g package require frobz
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[subsection dependencies]
+#[para] packages used by punk::console
+#[list_begin itemized]
+
+package require Tcl 8.6-
 package require punk::ansi
+#*** !doctools
+#[item] [package {Tcl 8.6-}]
+#[item] [package {punk::ansi}]
+
+
+#*** !doctools
+#[list_end]
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[section API]
+
 
 
 #if {"windows" eq $::tcl_platform(platform)} {
@@ -30,6 +70,13 @@ package require punk::ansi
 
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 namespace eval punk::console {
+    #*** !doctools
+    #[subsection {Namespace punk::console}]
+    #[para]
+
+    #*** !doctools
+    #[list_begin definitions]
+
     variable tabwidth 8  ;#default only - will attempt to detect and set to that configured in terminal
     #Note that windows terminal cooked mode seems to use 8 for interactive use even if set differently
     #e.g typing tab characters may still be echoed 8-spaced while writing to stdout my obey the terminal's tab stops.  
@@ -1028,23 +1075,37 @@ namespace eval punk::console {
         return [split [get_cursor_pos $inoutchannels] ";"]
     }
 
-    #todo - determine cursor on/off state before the call to restore properly. May only be possible 
+    #todo - determine cursor on/off state before the call to restore properly. 
     proc get_size {{inoutchannels {stdin stdout}}} {
         lassign $inoutchannels in out
         #we can't reliably use [chan names] for stdin,stdout. There could be stacked channels and they may have a names such as file22fb27fe810
         #chan eof is faster whether chan exists or not than
-        if {[catch {chan eof $in} is_eof]} {
-                error "punk::console::get_size input channel $in seems to be closed ([info level 1])"
+        if {[catch {chan eof $out} is_eof]} {
+                error "punk::console::get_size output channel $out seems to be closed ([info level 1])"
         } else {
             if {$is_eof} {
-                error "punk::console::get_size eof on input channel $in ([info level 1])"
+                error "punk::console::get_size eof on output channel $out ([info level 1])"
             } 
         }
-        if {[catch {chan eof $out} is_eof]} {
-                error "punk::console::get_size output channel $out seems to be closed ([info level 1])"
+        #we don't need to care about the input channel if chan configure on the output can give us the info.
+        #short circuit ansi cursor movement method if chan configure supports the -winsize value
+        set outconf [chan configure $out]
+        if {[dict exists $outconf -winsize]} {
+            #this mechanism is much faster than ansi cursor movements
+            #REVIEW check if any x-platform anomalies with this method?
+            #can -winsize key exist but contain erroneous info? We will check that we get 2 ints at least 
+            lassign [dict get $outconf -winsize] cols lines
+            if {[string is integer -strict $cols] && [string is integer -strict $lines]} {
+                return [list columns $cols rows $lines]
+            }
+            #continue on to ansi mechanism if we didn't get 2 ints
+        }
+
+        if {[catch {chan eof $in} is_eof]} {
+                error "punk::console::get_size input channel $in seems to be closed ([info level 1])"
         } else {
             if {$is_eof} {
-                error "punk::console::get_size eof on output channel $out ([info level 1])"
+                error "punk::console::get_size eof on input channel $in ([info level 1])"
             } 
         }
 
@@ -1067,18 +1128,28 @@ namespace eval punk::console {
         }
     }
 
-    #faster - but uses cursor_save - which we may want to avoid if calling during another operation which uses cursor save/restore
-    proc get_size_cursorrestore {} {
+    #faster than get_size when it is using ansi mechanism - but uses cursor_save - which we may want to avoid if calling during another operation which uses cursor save/restore
+    proc get_size_cursorrestore {{inoutchannels {stdin stdout}}} {
+        lassign $inoutchannels in out
+        #we use the same shortcircuit mechanism as get_size to avoid ansi at all if the output channel will give us the info directly 
+        set outconf [chan configure $out]
+        if {[dict exists $outconf -winsize]} {
+            lassign [dict get $outconf -winsize] cols lines
+            if {[string is integer -strict $cols] && [string is integer -strict $lines]} {
+                return [list columns $cols rows $lines]
+            }
+        }
+
         if {[catch {
             #some terminals (conemu on windows) scroll the viewport when we make a big move down like this - a  move to 1 1 immediately after cursor_save doesn't seem to fix that.
             #This issue also occurs when switching back from the alternate screen buffer - so perhaps that needs to be addressed elsewhere.
-            puts -nonewline [punk::ansi::cursor_off][punk::ansi::cursor_save_dec][punk::ansi::move 2000 2000]
-            lassign [get_cursor_pos_list] lines cols
-            puts -nonewline [punk::ansi::cursor_restore][punk::console::cursor_on];flush stdout
+            puts -nonewline $out [punk::ansi::cursor_off][punk::ansi::cursor_save_dec][punk::ansi::move 2000 2000]
+            lassign [get_cursor_pos_list $inoutchannels] lines cols
+            puts -nonewline $out [punk::ansi::cursor_restore][punk::console::cursor_on];flush $out 
             set result [list columns $cols rows $lines] 
         } errM]} {
-            puts -nonewline [punk::ansi::cursor_restore_dec]
-            puts -nonewline [punk::ansi::cursor_on]
+            puts -nonewline $out [punk::ansi::cursor_restore_dec]
+            puts -nonewline $out [punk::ansi::cursor_on]
             error "$errM"
         } else {
             return $result
@@ -1803,6 +1874,9 @@ namespace eval punk::console {
     }
     #run the test and allow warnings to be emitted to stderr on package load. User should know the terminal and/or Tcl version are not optimal for unicode character work
     #set testresult [test1]
+
+    #*** !doctools
+    #[list_end] [comment {--- end definitions namespace punk::console ---}]
 }
 
 
@@ -1825,4 +1899,7 @@ package provide punk::console [namespace eval punk::console {
     variable version
     set version 0.1.1 
 }]
-return
\ No newline at end of file
+return
+
+#*** !doctools
+#[manpage_end]
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/du-0.1.0.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/du-0.1.0.tm
index f0e96a28..1eca1f47 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/du-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/du-0.1.0.tm
@@ -967,7 +967,7 @@ namespace eval punk::du {
             dict set effective_opts -with_times $timed_types
             dict set effective_opts -with_sizes $sized_types
 
-            return [list dirs $dirs vfsmounts $vfsmounts links $links files $files filesizes [dict get $mdata_lists fsizes] sizes [dict get $mdata_lists allsizes] times [dict get $mdata_lists alltimes] flaggedhidden {} flaggedsystem {} flaggedreadonly {} altname {} opts $effective_opts errors $errors]
+            return [list dirs $dirs vfsmounts $vfsmounts links $links files $files filesizes [dict get $mdata_lists fsizes] sizes [dict get $mdata_lists allsizes] times [dict get $mdata_lists alltimes] flaggedhidden $flaggedhidden flaggedsystem {} flaggedreadonly {} altname {} opts $effective_opts errors $errors]
         }
 
         #zipfs attributes/behaviour fairly different to tclvfs - keep separate
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/lib-0.1.1.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/lib-0.1.1.tm
index cb786f22..63f32dee 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/lib-0.1.1.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/lib-0.1.1.tm
@@ -328,7 +328,17 @@ tcl::namespace::eval punk::lib::compat {
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 namespace eval punk::lib {
     tcl::namespace::export *
-    #variable xyz
+    variable has_struct_list
+    set has_struct_list [expr {![catch {package require struct::list}]}]
+    variable has_struct_set
+    set has_struct_set [expr {![catch {package require struct::set}]}]
+    variable has_punk_ansi
+    set has_punk_ansi [expr {![catch {package require punk::ansi}]}]
+    set has_twapi 0
+    if {"windows" eq $::tcl_platform(platform)} {
+        set has_twapi [expr {![catch {package require twapi}]}]
+    }
+
 
     #*** !doctools
     #[subsection {Namespace punk::lib}]
@@ -614,7 +624,9 @@ namespace eval punk::lib {
     }
 
     proc pdict {args} {
-        if {[catch {package require punk::ansi} errM]} {
+        package require punk::args
+        variable has_punk_ansi
+        if {!$has_punk_ansi} {
             set sep " = "    
         } else {
             #set sep " [a+ Web-seagreen]=[a] "
@@ -691,14 +703,15 @@ namespace eval punk::lib {
     # - Copy proc and attempt rework so we can get back to this as a baseline for functionality
     proc showdict {args} {   ;# analogous to parray (except that it takes the dict as a value)
         #set sep " [a+ Web-seagreen]=[a] "
-        if {[catch {package require punk::ansi} errM]} {
-            set sep " = "
+        variable has_punk_ansi
+        if {!$has_punk_ansi} {
             set RST ""
+            set sep " = "
             set sep_mismatch " mismatch "
         } else {
-            set sep " [punk::ansi::a+ Green]=[punk::ansi::a] " ;#stick to basic default colours for wider terminal support
             set RST [punk::ansi::a]
-            set sep_mismatch " [punk::ansi::a+ Brightred undercurly underline undt-white]mismatch[punk::ansi::a] "
+            set sep " [punk::ansi::a+ Green]=$RST " ;#stick to basic default colours for wider terminal support
+            set sep_mismatch " [punk::ansi::a+ Brightred undercurly underline undt-white]mismatch$RST "
         }
         package require punk ;#we need pipeline pattern matching features
         package require textblock
@@ -836,7 +849,7 @@ namespace eval punk::lib {
                                 lappend keyset_structure dict 
                             }
                             @* {
-                                puts ---->HERE<----
+                                #puts "showdict ---->@*<----"
                                 dict set pattern_this_structure $p list
                                 set keys [punk::lib::range 0 [llength $dval]-1]
                                 lappend keyset {*}$keys
@@ -1405,16 +1418,29 @@ namespace eval punk::lib {
     }
 
     proc is_list_all_in_list {small large} {
-        package require struct::list
-        package require struct::set
         set small_in_large [lsort [struct::set intersect [lsort -unique $small] $large ]]
         return [struct::list equal [lsort $small] $small_in_large]
     }
+    if {!$has_struct_list || !$has_struct_set} {
+        set body {
+            package require struct::list
+            package require struct::set
+        }
+        append body [info body is_list_all_in_list]
+        proc is_list_all_in_list {small large} $body
+    }
+
     proc is_list_all_ni_list {a b} {
-        package require struct::set
         set i [struct::set intersect $a $b]
         return [expr {[llength $i] == 0}]
     }
+    if {!$has_struct_set} {
+        set body {
+            package require struct::list
+        }
+        append body [info body is_list_all_ni_list]
+        proc is_list_all_ni_list {a b} $body
+    }
 
     #somewhat like struct::set difference - but order preserving, and doesn't treat as a 'set' so preserves dupes in fromlist
     #struct::set difference may happen to preserve ordering when items are integers, but order can't be relied on,
@@ -1465,18 +1491,22 @@ namespace eval punk::lib {
         return [array names tmp]
     }
 
-    package require struct::set
-    if {[struct::set equal [struct::set union {a a} {}] {a}]} {
-        proc lunique_unordered {list} {
-            struct::set union $list {}
-        }
-    } else {
-        puts stderr "WARNING: struct::set union <list> <emptylist> no longer dedupes!" 
-        #we could also test a sequence of: struct::set add 
-        proc lunique_unordered {list} {
-            tailcall lunique $list
+    #default/fallback implementation
+    proc lunique_unordered {list} {
+        lunique $list
+    }
+    if {$has_struct_set} {
+        if {[struct::set equal [struct::set union {a a} {}] {a}]} {
+            proc lunique_unordered {list} {
+                struct::set union $list {}
+            }
+        } else {
+            puts stderr "WARNING: struct::set union <list> <emptylist> no longer dedupes!" 
+            #we could also test a sequence of: struct::set add 
         }
     }
+
+
     #order-preserving
     proc lunique {list} {
         set new {}
@@ -1863,14 +1893,14 @@ namespace eval punk::lib {
         set opt_empty [tcl::dict::get $opts -empty_as_hex]
         # -- --- --- --- 
 
-        set list_largeHex [lmap h $list_largeHex[unset list_largeHex] {string map [list _ ""] [string trim $h]}]
+        set list_largeHex [lmap h $list_largeHex[unset list_largeHex] {string map {_ ""} [string trim $h]}]
         if {$opt_validate} {
             #Note appended F so that we accept list of empty strings as per the documentation
             if {![string is xdigit -strict [join $list_largeHex ""]F ]} {
                 error "[namespace current]::hex2dec error: non-hex digits encountered after stripping underscores and leading/trailing whitespace for each element\n $list_largeHex"
             }
         }
-        if {![string is xdigit -strict [string map [list _ ""] $opt_empty]]} {
+        if {![string is xdigit -strict [string map {_ ""} $opt_empty]]} {
             #mapping empty string to a value destroys any advantage of -scanonly
             #todo - document that -scanonly has 2 restrictions - each element must be valid hex and less than 7 chars long
             #set list_largeHex [lmap v $list_largeHex[set list_largeHex {}] {expr {$v eq ""} ? {0} : {[set v]}}]
@@ -1878,7 +1908,7 @@ namespace eval punk::lib {
                 error "[namespace current]::hex2dec error: empty values in list cannot be mapped to non-hex $opt_empty"
             }
         } else {
-            set opt_empty [string trim [string map [list _ ""] $opt_empty]]
+            set opt_empty [string trim [string map {_ ""} $opt_empty]]
             if {[set first_empty [lsearch $list_largeHex ""]] >= 0} {
                 #set list_largeHex [lmap v $list_largeHex[set list_largeHex {}] {expr {$v eq ""} ? {$opt_empty} : {$v}}]
                 set nonempty_head [lrange $list_largeHex 0 $first_empty-1]
@@ -1931,13 +1961,13 @@ namespace eval punk::lib {
         }
         set fmt "%${opt_width}.${opt_width}ll${spec}"
 
-        set list_decimals [lmap d $list_decimals[unset list_decimals] {string map [list _ ""] [string trim $d]}]
-        if {![string is digit -strict [string map [list _ ""] $opt_empty]]} {
+        set list_decimals [lmap d $list_decimals[unset list_decimals] {string map {_ ""} [string trim $d]}]
+        if {![string is digit -strict [string map {_ ""} $opt_empty]]} {
             if {[lsearch $list_decimals ""] >=0} {
                 error "[namespace current]::dec2hex error: empty values in list cannot be mapped to non-decimal $opt_empty"
             }
         } else {
-            set opt_empty [string map [list _ ""] $opt_empty]
+            set opt_empty [string map {_ ""} $opt_empty]
             if {[set first_empty [lsearch $list_decimals ""]] >= 0} {
                 set nonempty_head [lrange $list_decimals 0 $first_empty-1]
                 set list_decimals [concat $nonempty_head [lmap v [lrange $list_decimals $first_empty end] {expr {$v eq ""} ? {$opt_empty} : {$v}}]]
@@ -2402,13 +2432,14 @@ namespace eval punk::lib {
     # important for pipeline & match_assign
     #  -line trimline|trimleft|trimright  -block trimhead|trimtail|triminner|trimall|trimhead1|trimtail1|collateempty -commandprefix {string length} ?
     #  -block trimming only trims completely empty lines. use -line trimming to remove whitespace e.g -line trimright will clear empty lines without affecting leading whitespace on other lines that aren't pure whitespace
-    proc linelist {args} {
+
+    set linelist_body {
         set usage "linelist ?-line trimline|trimleft|trimright? ?-block trimhead|trimtail|triminner|trimall|trimhead1|trimtail1|collateempty? -commandprefix <cmdlist> text"
         if {[llength $args] == 0} {
             error "linelist missing textchunk argument usage:$usage" 
         }
         set text [lindex $args end]
-        set text [string map [list \r\n \n] $text] ;#review - option?
+        set text [string map {\r\n \n} $text] ;#review - option?
 
         set arglist [lrange $args 0 end-1]
         set opts [tcl::dict::create\
@@ -2441,10 +2472,10 @@ namespace eval punk::lib {
                 }
             }
             #normalize certain combos
-            if {[set posn [lsearch $opt_block trimhead1]] >=0 && "trimhead" in $opt_block} {
+            if {"trimhead" in $opt_block && [set posn [lsearch $opt_block trimhead1]] >=0} {
                 set opt_block [lreplace $opt_block $posn $posn]
             }
-            if {[set posn [lsearch $opt_block trimtail1]] >=0 && "trimtail" in $opt_block} {
+            if {"trimtail" in $opt_block && [set posn [lsearch $opt_block trimtail1]] >=0} {
                 set opt_block [lreplace $opt_block $posn $posn]
             }
             if {"trimall" in $opt_block} {
@@ -2594,9 +2625,10 @@ namespace eval punk::lib {
         #Each resulting line should have a reset of some type at start and a pure-reset at end to stop 
         #see if we can find an ST sequence that most terminals will not display for marking sections?
         if {$opt_ansireplays} {
-            package require punk::ansi
+            #package require punk::ansi
+            <require_punk_ansi>
             if {$opt_ansiresets} {
-                set RST [punk::ansi::a]
+                set RST "\x1b\[0m" 
             } else {
                 set RST ""
             }
@@ -2721,6 +2753,15 @@ namespace eval punk::lib {
 
         return $linelist
     }
+    if {$has_punk_ansi} {
+        #optimise linelist as much as possible
+        set linelist_body [string map {<require_punk_ansi> ""} $linelist_body]
+    } else {
+        #punk ansi not avail at time of package load.
+        #by putting in calls to punk::ansi the user will get appropriate error messages 
+        set linelist_body [string map {<require_punk_ansi> "package require punk::ansi"} $linelist_body]
+    }
+    proc linelist {args} $linelist_body 
 
 
     interp alias {} errortime {} punk::lib::errortime
@@ -2846,6 +2887,133 @@ namespace eval punk::lib {
     proc temperature_c_to_f {deg_celsius} {
         return [expr {($deg_celsius * (9/5.0)) + 32}]
     }
+
+    proc interp_sync_package_paths {interp} {
+        if {![interp exists $interp]} {
+            error "interp_sync_package_paths error. interp '$interp' not found. Create it first with \[interp create $interp\]"
+        }
+        interp eval $interp [list set ::auto_path $::auto_path]
+        interp eval $interp {tcl::tm::remove {*}[tcl::tm::list]}
+        interp eval $interp [list tcl::tm::add {*}[lreverse [tcl::tm::list]]]
+    }
+
+    proc objclone {obj} {
+        append obj2 $obj {}
+    }
+
+
+
+    proc format_number {numbers_or_commaformattednumbers {delim ""} {groupsize ""}} {
+        variable has_twapi
+        if {$has_twapi} {
+            if {$delim eq "" && $groupsize eq ""} {
+                set localeid [twapi::get_system_default_lcid]
+            }
+        }
+
+        set results [list]
+        set nums [objclone $numbers_or_commaformattednumbers] ;#stops single num from getting internal rep of list
+        foreach inputnum $nums {
+            set number [objclone $inputnum]
+            #also handle tcl 8.7+ underscores in numbers
+            set number [string map [list _ "" , ""] $number]
+            #normalize e.g 2e4 -> 20000.0
+            set number [expr {$number}]
+
+            if {$has_twapi} {
+                if {$delim eq "" && $groupsize eq ""} {
+                    lappend results [twapi::format_number $number $localeid -idigits -1]
+                    continue
+                } else {
+                    if {$delim eq ""} {set delim ","}
+                    if {$groupsize eq ""} {set groupsize 3}
+                    lappend results [twapi::format_number $number 0 -idigits -1 -sthousand $delim -sgrouping $groupsize]
+                    continue
+                }
+            }
+            #todo - get configured user defaults
+            set delim ","
+            set groupsize 3
+
+            lappend results [delimit_number $number $delim $groupsize]
+        }
+
+        if {[llength $results] == 1} {
+            #keep intrep as string rather than list
+            return [lindex $results 0]
+        }
+        return $results
+    }
+
+
+    #from wiki https://wiki.tcl-lang.org/page/Delimiting+Numberse
+    # Given a number represented as a string, insert delimiters to break it up for
+    # readability. Normally, the delimiter will be a comma which will be inserted every
+    # three digits. However, the delimiter and groupsize are optional arguments,
+    # permitting use in other locales.
+    #
+    # The string is assumed to consist of digits, possibly preceded by spaces,
+    # and possibly containing a decimal point, i.e.: [:space:]*[:digit:]*\.[:digit:]*
+
+    proc delimit_number {unformattednumber {delim ","} {GroupSize 3}} {
+        set number [punk::objclone $unformattednumber]
+        set number [string map {_ ""} $number]
+        #normalize using expr - e.g 2e4 -> 20000.0
+        set number [expr {$number}]
+        # First, extract right hand part of number, up to and including decimal point
+        set point [string last "." $number];
+        if {$point >= 0} {
+            set PostDecimal [string range $number [expr $point + 1] end];
+            set PostDecimalP 1;
+        } else {
+            set point [expr [string length $number] + 1]
+            set PostDecimal "";
+            set PostDecimalP 0;
+        }
+
+        # Now extract any leading spaces. review  - regex for whitespace instead of just ascii space?
+        set ind 0;
+        while {[string equal [string index $number $ind] \u0020]} {
+            incr ind;
+        }
+        set FirstNonSpace $ind;
+        set LastSpace [expr $FirstNonSpace - 1];
+        set LeadingSpaces [string range $number 0 $LastSpace];
+
+        # Now extract the non-fractional part of the number, omitting leading spaces.
+        set MainNumber [string range $number $FirstNonSpace [expr $point -1]];
+
+        # Insert commas into the non-fractional part.
+        set Length [string length $MainNumber];
+        set Phase  [expr $Length % $GroupSize]
+        set PhaseMinusOne  [expr $Phase -1];
+        set DelimitedMain "";
+
+        #First we deal with the extra stuff.
+        if {$Phase > 0} {
+            append DelimitedMain [string range $MainNumber 0 $PhaseMinusOne];
+        }
+        set FirstInGroup $Phase;
+        set LastInGroup [expr $FirstInGroup + $GroupSize -1];
+        while {$LastInGroup < $Length} {
+            if {$FirstInGroup > 0} {
+                append DelimitedMain $delim;
+            }
+            append DelimitedMain [string range $MainNumber $FirstInGroup $LastInGroup];
+            incr FirstInGroup $GroupSize
+            incr LastInGroup  $GroupSize
+        }
+
+        # Reassemble the number.
+        if {$PostDecimalP} {
+            return [format "%s%s.%s" $LeadingSpaces $DelimitedMain $PostDecimal];
+        } else {
+            return [format "%s%s" $LeadingSpaces $DelimitedMain];
+        }
+    }
+
+
+
     #*** !doctools
     #[list_end] [comment {--- end definitions namespace punk::lib ---}]
 }
@@ -2998,7 +3166,9 @@ tcl::namespace::eval punk::lib::system {
         return [concat $smallfactors [lreverse $largefactors] $x]
     }
 
-    # incomplte - report which is the innermost bracket/quote etc awaiting completion for a Tcl command
+
+
+    # incomplete - report which is the innermost bracket/quote etc awaiting completion for a Tcl command
     #important - used by punk::repl
     proc incomplete {partial} {
         #we can apparently get away without concatenating current innerpartial to previous in list - REVIEW.
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/base-0.1.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/base-0.1.tm
index 1e90b5ca..932c1db6 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/base-0.1.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/base-0.1.tm
@@ -35,12 +35,14 @@ namespace eval punk::mix::base {
         }
         #puts stderr "punk::mix::base extension: [string trimleft $extension :]"
         if {![string length $extension]} {
-            #if still no extension - must have been called dirctly as punk::mix::base::_cli
+            #if still no extension - must have been called directly as punk::mix::base::_cli
             if {![llength $args]} {
                 set args "help"
             }
             set extension [namespace current]
         }
+        #init usually used to load commandsets (and export their names) into the extension namespace/ensemble
+        ${extension}::_init
         if {![llength $args]} {
             if {[info exists ${extension}::default_command]} {
                 tailcall $extension [set ${extension}::default_command]
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm
index 5b1ec6da..cd6f3025 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/cli-0.3.1.tm
@@ -31,47 +31,58 @@ namespace eval punk::mix::cli {
     namespace eval temp_import {
     }
     namespace ensemble create
+    variable initialised 0
 
-    package require punk::overlay
-    catch {
-        punk::overlay::import_commandset module . ::punk::mix::commandset::module
-    }
-    punk::overlay::import_commandset debug . ::punk::mix::commandset::debug
-    punk::overlay::import_commandset repo  . ::punk::mix::commandset::repo
-    punk::overlay::import_commandset lib   . ::punk::mix::commandset::loadedlib
-
-    catch {
-        package require punk::mix::commandset::project
-        punk::overlay::import_commandset project    .       ::punk::mix::commandset::project
-        punk::overlay::import_commandset projects   .       ::punk::mix::commandset::project::collection 
-    }
-    if {[catch {
-        package require punk::mix::commandset::layout
-        punk::overlay::import_commandset project.layout       . ::punk::mix::commandset::layout
-        punk::overlay::import_commandset project.layouts      . ::punk::mix::commandset::layout::collection
-    } errM]} {
-        puts stderr "error loading punk::mix::commandset::layout"
-        puts stderr $errM
-    }
-    if {[catch {
-        package require punk::mix::commandset::buildsuite
-        punk::overlay::import_commandset buildsuite     .   ::punk::mix::commandset::buildsuite
-        punk::overlay::import_commandset buildsuites    .   ::punk::mix::commandset::buildsuite::collection
-    } errM]} {
-        puts stderr "error loading punk::mix::commandset::buildsuite"
-        puts stderr $errM
-    }
-    punk::overlay::import_commandset scriptwrap  . ::punk::mix::commandset::scriptwrap
-    if {[catch {
-        package require punk::mix::commandset::doc
-        punk::overlay::import_commandset doc . ::punk::mix::commandset::doc
-        punk::overlay::import_commandset ""  ""   ::punk::mix::commandset::doc::collection
-    } errM]} {
-        puts stderr "error loading punk::mix::commandset::doc"
-        puts stderr $errM
+    #lazy _init - called by punk::mix::base::_cli when ensemble used 
+    proc _init {args} {
+        variable initialised
+        if {$initialised} {
+            return
+        }
+        puts stderr "punk::mix::cli::init $args"
+        package require punk::overlay
+        namespace eval ::punk::mix::cli {
+            catch {
+                punk::overlay::import_commandset module . ::punk::mix::commandset::module
+            }
+            punk::overlay::import_commandset debug . ::punk::mix::commandset::debug
+            punk::overlay::import_commandset repo  . ::punk::mix::commandset::repo
+            punk::overlay::import_commandset lib   . ::punk::mix::commandset::loadedlib
+
+            catch {
+                package require punk::mix::commandset::project
+                punk::overlay::import_commandset project    .       ::punk::mix::commandset::project
+                punk::overlay::import_commandset projects   .       ::punk::mix::commandset::project::collection 
+            }
+            if {[catch {
+                package require punk::mix::commandset::layout
+                punk::overlay::import_commandset project.layout       . ::punk::mix::commandset::layout
+                punk::overlay::import_commandset project.layouts      . ::punk::mix::commandset::layout::collection
+            } errM]} {
+                puts stderr "error loading punk::mix::commandset::layout"
+                puts stderr $errM
+            }
+            if {[catch {
+                package require punk::mix::commandset::buildsuite
+                punk::overlay::import_commandset buildsuite     .   ::punk::mix::commandset::buildsuite
+                punk::overlay::import_commandset buildsuites    .   ::punk::mix::commandset::buildsuite::collection
+            } errM]} {
+                puts stderr "error loading punk::mix::commandset::buildsuite"
+                puts stderr $errM
+            }
+            punk::overlay::import_commandset scriptwrap  . ::punk::mix::commandset::scriptwrap
+            if {[catch {
+                package require punk::mix::commandset::doc
+                punk::overlay::import_commandset doc . ::punk::mix::commandset::doc
+                punk::overlay::import_commandset ""  ""   ::punk::mix::commandset::doc::collection
+            } errM]} {
+                puts stderr "error loading punk::mix::commandset::doc"
+                puts stderr $errM
+            }
+        }
+        set initialised 1
     }
 
-
     proc help {args} {
         #set basehelp [punk::mix::base::help -extension [namespace current] {*}$args]
         set basehelp [punk::mix::base help {*}$args]
@@ -210,11 +221,12 @@ namespace eval punk::mix::cli {
         proc validate_modulename {modulename args} {
             set opts [list\
                 -errorprefix validate_modulename\
+                -strict 0\
                 ]
             if {[llength $args] %2 != 0} {error "validate_modulename args must be name-value pairs: received '$args'"}
             foreach {k v} $args {
                 switch -- $k {
-                    -errorprefix {
+                    -errorprefix - -strict {
                         dict set opts $k $v
                     }
                     default {
@@ -223,8 +235,14 @@ namespace eval punk::mix::cli {
                 }
             }
             # -- --- --- --- --- --- --- --- --- --- --- --- --- ---
-            set opt_errorprefix            [dict get $opts -errorprefix]
+            set opt_errorprefix             [dict get $opts -errorprefix]
+            set opt_strict                  [dict get $opts -strict]
             # -- --- --- --- --- --- --- --- --- --- --- --- --- ---
+            if {$opt_strict} {
+                if {[regexp {[A-Z]} $modulename]} {
+                    error "$opt_errorprefix '$modulename' contains uppercase which is not recommended as per tip 590, and option -strict is set to 1" 
+                }
+            }
 
             validate_name_not_empty_or_spaced $modulename -errorprefix $opt_errorprefix
             set testname [string map {:: {}} $modulename]
@@ -239,6 +257,56 @@ namespace eval punk::mix::cli {
             }
             return $modulename
         }
+        proc confirm_modulename {modulename} {
+            set finalised 0
+            set aborted 0
+            while {!$finalised && !$aborted} {
+                #first validate with -strict 0 to confirm acceptable while ignoring case issues.
+                #uppercase is generally valid but not recommended - so has separate prompting.
+                if {[catch {validate_modulename $modulename -strict 0} errM]} {
+                    set msg "Chosen name didn't pass validation\n"
+                    append msg "reason: $errM\n"
+                    append msg "Please retype the modulename. You will be given a further prompt to confirm or abort."
+                    set modulename [util::askuser $msg]
+                } elseif {[regexp {[A-Z]} $modulename]} {
+                    set msg     "module names containing uppercase are not recommended (see tip 590).\n"
+                    append msg  "Please retype the module name '$modulename' to proceed.\n"
+                    append msg  "If you type it exactly as it was you will be allowed to proceed with uppercase anyway\n" 
+                    append msg  "Retype it all in lowercase to use recommended naming"
+                    set answer [util::askuser $msg]
+                    if {[regexp {[A-Z]} $answer]} {
+                        if {$answer eq $modulename} {
+                            #ok - user insists
+                            set finalised 1
+                        } else {
+                            #user supplied a different uppercase name - don't set finalised so we bug them again to type it two times the same way to proceed
+                            puts stdout "A different uppercase name was supplied - reconfirmation required."
+                        }
+                        set modulename $answer
+                    } else {
+                        #user has resupplied modulename all as lowercase 
+                        if {$answer eq [string tolower $modulename]} {
+                            set finalised 1
+                        } else {
+                            #.. but it doesn't match original - require rerun 
+                        }
+                        set modulename $answer
+                    }
+                } else {
+                    set answer [util::askuser "Proceed with the module name '$modulename'? Y to continue N to abort"]
+                    if {[string tolower $answer] eq "y"} {
+                        set finalised 1
+                    } else {
+                        set aborted 1
+                    }
+                }
+            }
+            if {$aborted} {
+                return [dict create status error reason errmsg]
+            } else {
+                return [dict create status ok modulename $modulename]
+            }
+        }
 
         proc validate_projectname {projectname args} {
             set defaults [list\
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/doc-0.1.0.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/doc-0.1.0.tm
index fafc3cec..856c9340 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/doc-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/doc-0.1.0.tm
@@ -165,7 +165,17 @@ namespace eval punk::mix::commandset::doc {
 
         cd $original_wd
     }
-    proc validate {} {
+    proc validate {args} {
+        set argd [punk::args::get_dict {
+            --          -type none -optional 1 -help "end of options marker --" 
+            -individual -type boolean -default 1
+            *values -min 0 -max -1
+            patterns -default {*} -type any -multiple 1
+        } $args] 
+        set opt_individual      [tcl::dict::get $argd opts -individual]
+        set patterns        [tcl::dict::get $argd values patterns]
+
+        
         #todo - run and validate punk::docgen output
         set projectdir [punk::repo::find_project]
         if {$projectdir eq ""} {
@@ -180,7 +190,23 @@ namespace eval punk::mix::commandset::doc {
         set docroot $projectdir/src/doc
         cd $docroot
 
-        dtplite validate  $docroot
+        if {!$opt_individual && "*" in $patterns} {
+            if {[catch {
+                dtplite validate  $docroot
+            } errM]} {
+                puts stderr "commandset::doc::validate failed for projectdir '$projectdir'"
+                puts stderr "docroot '$docroot'"
+                puts stderr "dtplite error was: $errM"
+            }
+        } else {
+            foreach p $patterns {
+                set treefiles [punk::path::treefilenames $p]
+                foreach path $treefiles {
+                    puts stdout "dtplite validate $path"
+                    dtplite validate $path
+                }
+            }
+        }
 
         #punk::mix::cli::lib::kettle_call lib validate-doc
 
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/loadedlib-0.1.0.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/loadedlib-0.1.0.tm
index bd0b5358..08d103ee 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/loadedlib-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/loadedlib-0.1.0.tm
@@ -179,7 +179,16 @@ namespace eval punk::mix::commandset::loadedlib {
         return [join $loaded_libs \n]
     }
 
-    proc info {libname} {
+    proc info {args} {
+        set argspecs {
+            *values -min 1
+            libname -help "library/package name"
+        }
+        set argd [punk::args::get_dict $argspecs $args]
+        set libname [dict get $argd values libname]
+
+
+
         if {[catch {package require natsort}]} {
             set has_natsort 0
         } else {
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/module-0.1.0.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/module-0.1.0.tm
index 9955c53b..029be3ce 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/module-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/module-0.1.0.tm
@@ -204,6 +204,30 @@ namespace eval punk::mix::commandset::module {
             set modulename $module
         }
         punk::mix::cli::lib::validate_modulename $modulename -errorprefix "punk::mix::commandset::module::new"
+
+        if {[regexp {[A-Z]} $module]} {
+            set msg     "module names containing uppercase are not recommended (see tip 590).\n"
+            append msg  "Please retype the module name '$module' to proceed.\n"
+            append msg  "If you type it exactly as it was you will be allowed to proceed with uppercase anyway\n" 
+            append msg  "Retype it all in lowercase to use recommended naming"
+            set answer [util::askuser $msg]
+            if {[regexp {[A-Z]} $answer]} {
+                if {$answer eq $module} {
+                    #ok - user insists
+                } else {
+
+                }
+            } else {
+                #user has resupplied modulename all as lowercase 
+                if {$answer eq [string tolower $module]} {
+                    set module $answer
+                } else {
+                    #.. but it doesn't match original - require rerun 
+                }
+            }
+        }
+
+
         # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
         #options
         # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/project-0.1.0.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/project-0.1.0.tm
index aa630d36..9afc685c 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/project-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/mix/commandset/project-0.1.0.tm
@@ -165,7 +165,7 @@ namespace eval punk::mix::commandset::project {
                 #user can use dev module.new manually or supply module name in -modules
                 set opt_modules [list] 
             } else {
-                set opt_modules [list $projectname]
+                set opt_modules [list [string tolower $projectname]] ;#default modules to lowercase as is the modern (tip 590) recommendation for Tcl
             }
         }
         # -- --- --- --- --- --- --- --- --- --- --- --- ---
@@ -919,10 +919,18 @@ namespace eval punk::mix::commandset::project {
 
             if {[llength $col_states]} {
                 foreach row $col_rowids wd $workdirs db $col_fnames dup $col_dupids pname $col_pnames pcode $col_pcodes s $col_states {
+                    if {![file exists $wd]} {
+                        set row [punk::ansi::a+ strike red]$row[a]
+                        set wd [punk::ansi::a+ red]$wd[a]
+                    }
                     append msg "[overtype::right $col0 $row] [overtype::left $col1 $wd] [overtype::left $col2 $db] [overtype::right $col3 $dup] [overtype::left $col4 $pname] [overtype::left $col5 $pcode] [overtype::left $col6 $s]" \n
                 } 
             } else {
                 foreach row $col_rowids wd $workdirs db $col_fnames dup $col_dupids pname $col_pnames pcode $col_pcodes {
+                    if {![file exists $wd]} {
+                        set row [punk::ansi::a+ strike red]$row[a]
+                        set wd [punk::ansi::a+ red]$wd[a]
+                    }
                     append msg "[overtype::right $col0 $row] [overtype::left $col1 $wd] [overtype::left $col2 $db] [overtype::right $col3 $dup] [overtype::left $col4 $pname] [overtype::left $col5 $pcode]" \n
                 } 
             }
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/overlay-0.1.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/overlay-0.1.tm
index 5534dad3..73b8ef39 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/overlay-0.1.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/overlay-0.1.tm
@@ -130,6 +130,7 @@ tcl::namespace::eval ::punk::overlay {
         }]
 
         set imported_commands [list]
+        set imported_tails [list]
         set nscaller [uplevel 1 [list tcl::namespace::current]]
         if {[catch {
             #review - noclobber?
@@ -143,7 +144,10 @@ tcl::namespace::eval ::punk::overlay {
                 }
                 rename $cmd  $import_as
                 lappend imported_commands $import_as
+                lappend imported_tails [namespace tail $import_as]
             }
+            #make imported commands exported so they are available to the ensemble
+            tcl::namespace::eval ${nscaller} [list namespace export {*}$imported_tails]
         } errM]} {
             puts stderr "Error loading commandset $prefix $separator $cmdnamespace"
             puts stderr "err: $errM"
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/path-0.1.0.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/path-0.1.0.tm
index 933ef860..2165c0fd 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/path-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/path-0.1.0.tm
@@ -63,11 +63,11 @@ package require Tcl 8.6-
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 # oo::class namespace
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
-namespace eval punk::path::class {
+#namespace eval punk::path::class {
     #*** !doctools
     #[subsection {Namespace punk::path::class}]
     #[para] class definitions
-    if {[info commands [namespace current]::interface_sample1] eq ""} {
+    #if {[info commands [namespace current]::interface_sample1] eq ""} {
         #*** !doctools
         #[list_begin enumerated]
 
@@ -89,8 +89,8 @@ namespace eval punk::path::class {
 
         #*** !doctools
         #[list_end] [comment {--- end class enumeration ---}]
-    }
-}
+    #}
+#}
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
@@ -105,6 +105,448 @@ namespace eval punk::path {
     #[para] Core API functions for punk::path 
     #[list_begin definitions]
 
+    # -- --- 
+    #punk::path::normjoin
+    # - simplify . and .. segments as far as possible whilst respecting specific types of root.
+    # -- --- 
+    #a form of file normalize that supports //xxx to be treated as server path names
+    #(ie regardless of unices ignoring (generally) leading double slashes, and regardless of windows volumerelative path syntax)
+    #(sometimes //server.com used as a short form for urls - which doesn't seem too incompatible with this anyway) 
+    # -- --- 
+    #This is intended to be purely a string analysis - without reference to filesystem volumes or vfs or zipfs mountpoints etc
+    #
+    #TODO - option for caller to provide a -base below which we can't backtrack.
+    #This is preferable to setting policy here for example regarding forcing no trackback below //servername/share 
+    #Our default is to allow trackback to:
+    #  <scheme>://<something>
+    #  <driveletter>:/
+    #  //./<volume>   (dos device volume)
+    # //server   (while normalizing //./UNC/server to same)
+    # /   (ordinary unix root)
+    # ./../<repeated>  - (track back indefinitely on relpath as we are not resolving to anything physical and can't fully simplify the leading backtracks)
+    #
+    #The caller should do the file/vfs operations to determine this - not us.
+    # -- --- 
+    #simplify path with respect to /./ & /../ elements - independent of platform
+    #NOTE: "anomalies" in standard tcl processing on windows:
+    #e.g file normalize {//host} -> c:/host  (or e.g d:/host if we happen to be on another volume)
+    #file normalize {//host/share} -> //host/share
+    #This is because //host is treated as volume-relative in cmd/powershell and Tcl quite reasonably follows suit.
+    #This prevents cwd and windows commandlines from pointing to the server (above the share)
+    #Explorer however does allow pointing to the //server level and seeing shares as if they are directory entries.
+    #we are more interested in supporting the explorer-like behaviour - as while volumerelative paths are also useful on windows - they are lesser known.
+    #REVIEW.
+    #To get back to some consistent cross platform behaviour - we will treat //something as a root/volume i.e we can't backtrack above it with ".."
+    #note too that file split on UNC paths doesn't give a clear indication of the root
+    # file split //./UNC/server/share/subpath -> //./UNC server share subpath
+    # file split //server/share/subpath -> //server/share subpath
+    #TODO - disallow all change of root or change from relative path to absolute result.
+    #e.g normjoin relpath/../d:/secret should not return d:/secret - but ./d:/secret
+    # ================
+    #known issues:
+    #1)
+    # normjoin d://a//b//c -> d://a/b/c
+    # This is because we don't detect specific schemes. ie it's treated the same as https://a/b/c -> https://a/b/c 
+    # Not considered a problem - just potentially surprising.
+    # To avoid it we would have to enumerate possible schemes. 
+    # As it stands a unix system could define a 'scheme' that happens to match windows style driveletters. Consider a 'feature' ? review.
+    # won't fix?
+    #2)
+    # normjoin https:///real.com/../fake.com -> https:///fake.com
+    # The extra slash means effectively our servername is empty - this is potentially confusing but probably the right thing to do here.
+    # It's a concern only if upstream treats the tripple slash in this case as valid and maps it to https:// - which would probably be bad anyway.
+    # won't fix (review)
+    #3)
+    #similarly
+    # normjoin //./UNC//server/share/subpath -> ///server/share/subpath  (when 2 or more slashes directly after UNC)
+    # normjoin ///server/share  -> ///server/share
+    #This is effectively an empty servername in the input with 'server' being pushed one level down - and the output is consistent
+    # possibly won't fix - review
+    #4) inconsistency 
+    # we return normalized //server/share for //./UNC/server share
+    # but other dos device paths are maintained
+    # e.g //./c:/etc
+    # This is because such paths could contain alternate segment names (windows shortnames) which we aren't in a position to resolve.
+    # caller should 
+    # #as with 'case' below - caller will need to run a post 'file normalize' 
+    #5) we don't normalize case like file normalize does on windows platform.
+    #   This is intentional. It could only be done with reference to underlying filesystem which we don't want here.
+    #  
+    # ================
+    #
+    #relpaths all end up with leading . - while not always the simplest form, this is ok. (helps stop inadvertent conversions to absolutes)
+    # Tests - TODO
+    # normjoin /d:/..//vfs:/test -> /vfs:/test  (good - not converted to //vfs:/test)
+    proc normjoin {args} {
+        set args [lmap a $args {string map "\\\\ /" $a}]
+        set path [plainjoin {*}$args]
+        switch -exact $path {
+            "" {
+                return ""
+            }
+            / - // {
+                #treated in unixlike manner - (but leading doubleslashes with subsequent data are server indication)
+                #// not considered a servername indicator - but /// (for consistency) is. (empty servername?)
+                return /
+            }
+            /// {
+                #if this is effectively //$emptyservername/
+                #then for consistency we should trail //<servername with a slash too?
+                #we can't transform to //  or /  
+                return ///
+                #assert - code below should return /// (empty server prefix) for any number of leading slashes >=3
+                #todo - shortcircuit that here?
+            }
+         }
+        # /// 
+        set doubleslash1_posn [string first // $path] 
+
+        # -- --- --- temp warning on windows only - no x-platform difference in result
+        #on windows //host is of type volumerelative
+        # whereas //host/share is of type absolute
+        if {"windows" eq $::tcl_platform(platform) && [file pathtype $path] eq "volumerelative"} {
+            #volumerelative probably only occurs on windows anyway
+            if {$doubleslash1_posn == 0} {
+                #e.g //something  where no further slashes
+                #review - eventually get rid of this warning and require upstream to know the appropriate usecase
+                puts stderr "Warning - ambiguous path $path - treating as server path - not 'volumerelative'"
+            } else {
+                # /something/etc
+                # /mnt/c/stuff
+                #output will retain leading / as if on unix.
+                #on windows - the result would still be interpreted as volumerelative if the caller normalizes it
+            }
+        }
+        # -- --- ---
+
+        set is_relpath 0 
+
+        #set path [string map [list \\ /] $path]
+        set finalparts [list]
+        set is_nonunc_dosdevice 0
+        if {[punk::winpath::is_dos_device_path $path]} {
+            #review
+            if {[string range $path 4 6] eq "UNC"} {
+                #convert to 'standard' //server/... path for processing
+                set path "/[string range $path 7 end]"  ;# //server/...
+            } else {
+                #error "normjoin non-UNC dos device path '$path' not supported"
+                #first segment after //./ or //?/ represents the volume or drive.
+                #not applicable to unix - but unlikely to conflict with a genuine usecase there (review)
+                #we should pass through and stop navigation below //./vol
+                #!!!
+                #not anomaly in tcl (continues in tcl9)
+                #file exists //./c:/test  -> 0
+                #file exists //?/c:/test  -> 1
+                #file exists //./BootPartition/Windows -> 1
+                #file exists //?/BootPartition/Windows -> 0
+                set is_nonunc_dosdevice 1
+            }
+        }
+
+        if {$is_nonunc_dosdevice} {
+            #dosdevice prefix //./ or //?/  - preserve it (without trailing slash which will be put back in with join)
+            set prefix [string range $path 0 2]
+            set tail [string range $path 4 end]
+            set tailparts [split $tail /]
+            set parts [concat [list $prefix] $tailparts]
+            set rootindex 1 ;#disallow backtrack below //./<volume>
+        } else {
+            #note use of ordinary ::split vs file split is deliberate.
+            if {$doubleslash1_posn == 0} {
+                #this is handled differently on different platforms as far as 'file split' is concerned.
+                #e.g for file split //sharehost/share/path/etc
+                #e.g on windows:  -> //sharehost/share path
+                #e.g on freebsd:  ->  / sharehost share path etc
+                #however..also on windows: file split //sharehost  -> / sharehost
+                #normalize by dropping leading slash before split - and then treating first 2 segments as a root
+                #set parts [file split [string range $path 1 end]]
+                set parts [split $path /]
+                #assert parts here has {} {} as first 2 entries 
+                set rootindex 2
+                #currently prefer can backtrack to the  //zipfs:/  scheme (below the mountpoint - to browse other mounts)
+                #alternative handling for //zipfs:/path - don't go below mountpoint
+                #but we can't determine just from string if mountpoint is direct subpath or a lower one e.g //zipfs:/arbitraryname/actualmountpoint  
+                #review - more generally //<mountmechanism>:/path ?
+                #todo - make an option for zipfs and others to determine the 'base'
+                #if {"zipfs:" eq [lindex $parts 2]} {
+                #    set rootindex 3
+                #}
+            } else {
+                #path may or may not begin with a single slash here.
+                #treat same on unix and windows
+                set rootindex 0
+                #set parts [file split $path]
+                set parts [::split $path /]
+                #e.g /a/b/c -> {} a b c
+                #or relative path a/b/c ->  a b c 
+                #or  c:/a/b/c -> c: a b c
+                if {[string match *: [lindex $parts 0]]} {
+                    if {[lindex $parts 1] eq ""} {
+                        #scheme://x splits to scheme: {} x
+                        set parts [concat [list [lindex $parts 0]/] [lrange $parts 2 end]]
+                        #e.g {scheme:/ x}
+                        set rootindex 1  ;#disallow below first element of scheme
+                    } else {
+                        set rootindex 0
+                    }
+                } elseif {[lindex $parts 0] ne ""} {
+                    #relpath a/b/c
+                    set parts [linsert $parts 0 .]
+                    set rootindex 0 
+                    #allow backtracking arbitrarily for leading .. entries - simplify where possible 
+                    #also need to stop possible conversion to absolute path 
+                    set is_relpath 1
+                }
+            }
+        }
+        set baseparts [lrange $parts 0 $rootindex] ;#base below which we can't retreat via ".."
+        #puts stderr "-->baseparts:$baseparts"
+        #ensure that if our rootindex already spans a dotted segment (after the first one) we remove it
+        #must maintain initial . for relpaths to stop them converting to absolute via backtrack
+        # 
+        set finalparts [list [lindex $baseparts 0]]
+        foreach b [lrange $baseparts 1 end] {
+            if {$b ni {. ..}} {
+                lappend finalparts $b
+            }
+        }
+        set baselen [expr {$rootindex + 1}]
+        if {$is_relpath} {
+            set i [expr {$rootindex+1}]
+            foreach p [lrange $parts $i end] {
+                switch -exact -- $p {
+                    . - "" {}
+                    .. {
+                        switch -exact -- [lindex $finalparts end] {
+                            . - .. {
+                                lappend finalparts ..
+                            }
+                            default {
+                                lpop finalparts
+                            }
+                        }
+                    }
+                    default {
+                        lappend finalparts $p
+                    }
+                }
+                incr i 
+            }
+        } else {
+            foreach p [lrange $parts $rootindex+1 end] {
+                if {[llength $finalparts] <= $baselen} {
+                    if {$p ni {. .. ""}} {
+                        lappend finalparts $p
+                    }
+                } else  {
+                    switch -exact -- $p {
+                        . - "" {}
+                        .. {
+                            lpop finalparts ;#uses punk::lib::compat::lpop if on < 8.7 
+                        }
+                        default {
+                            lappend finalparts $p
+                        }
+                    }
+                }
+            }
+        }
+        puts "==>finalparts: '$finalparts'"
+        # using join - {"" "" server share} -> //server/share  and {a b} -> a/b
+        if {[llength $finalparts] == 1 && [lindex $finalparts 0] eq ""} {
+            #backtracking on unix-style path can end up with empty string as only member of finalparts
+            #e.g /x/..
+            return /
+        }
+        set result [::join $finalparts /]
+        #normalize volumes and mountschemes to have trailing slash if no subpath
+        #e.g c: -> c:/
+        #//zipfs: -> //zipfs:/
+        if {[set lastchar [string index $result end]] eq ":"} {
+            if {$result eq "//zipfs:"} {
+                set result "//zipfs:/"
+            } else {
+                if {[string first / $result] < 0} {
+                    set result $result/
+                }
+            }
+        } elseif {[string match //* $result]} {
+            if {![punk::winpath::is_dos_device_path $result]} {
+                #server
+                set tail [string range $result 2 end]
+                set tailparts [split $tail /]
+                if {[llength $tailparts] <=1} {
+                    #empty //  or //servername
+                    append result /
+                }
+            }
+        } elseif {[llength $finalparts] == 2} {
+            if {[string range [lindex $finalparts 0] end-1 end] eq ":/"} {
+                #e.g https://server/  -> finalparts {https:/ server}
+                #e.g https:/// ->  finalparts {https:/ ""}
+                #scheme based path should always return trailing slash after server component - even if server component empty.
+                lappend finalparts "" ;#force trailing /
+                return [join $finalparts /]
+            }
+        }
+        return $result
+    }
+
+    proc trim_final_slash {str} {
+        if {[string index $str end] eq "/"} {
+            return [string range $str 0 end-1]
+        }
+        return $str
+    }
+
+
+    #x-platform - punk::path::pathtype - can be used in safe interps - different concept of pathtypes to 'file pathtype' 
+    # - no volumerelative 
+    # - no lookup of file volumes (volume is a windows concept - but with //zipfs:/ somewhat applicable to other platforms)
+    # - /* as absolute  (covers also //zipfs:/ (volume),  //server , //./etc , //./UNC)
+    # - xxx:// as absolute (scheme)
+    # - xxx:/ or x:/ as absolute
+    # - x: xxx: -> as absolute (volume-basic or volume-extended) 
+
+    #note also on windows - legacy name for COM devices
+    # COM1 = COM1: 
+    # //./COM1 ??  review
+
+    proc pathtype {str} {
+        set str [string map "\\\\ /" $str]
+        if {[string index $str 0] eq "/"} {
+            #todo - look for //xxx:/ prefix (generalisation of //zipfs:/)  as a 'volume' specifically {volume mount} ?? - review
+            # look for //server prefix as {absolute server}
+            # look for //./UNC/server or //?/UNC/server as  {absolute server UNC} ?
+            # look for //./<dosdevice>  as {absolute dosdevice}
+            return absolute
+        }
+
+        #only firstsegment with single colon at last position (after some non empty string) counts as volume or scheme - review 
+        #e.g a:b:/..  or a::/..  or :/..  is not treated as volume/scheme whereas ab:/ is.
+        set firstslash [string first / $str]
+        if {$firstslash == -1} {
+            set firstsegment $str
+        } else {
+            set firstsegment [string range $str 0 $firstslash-1]
+        }
+        if {[set firstc [string first : $firstsegment]] > 0} {
+            set lhs_firstsegment [string range $firstsegment 0 $firstc-1] 
+            set rhs_firstsegment [string range $firstsegment $firstc+1 end] ;#exclude a:b/ etc
+            if {$rhs_firstsegment eq ""} { 
+                set rhs_entire_path [string range $str $firstc+1 end]
+                #assert lhs_firstsegment not empty since firstc > 0
+                #count following / sequence
+                set i 0
+                set slashes_after_firstsegment "" ;#run of slashes *directly* following first segment
+                while {$i < [string length $rhs_entire_path]} {
+                    if {[string index $rhs_entire_path $i] eq "/"} {
+                        append slashes_after_firstsegment /
+                    } else {
+                        break
+                    }
+                    incr i
+                }
+                switch -exact -- $slashes_after_firstsegment {
+                    "" - / {
+                        if {[string length $lhs_firstsegment] == 1} {
+                            return {absolute volume basic}
+                        } else {
+                            return {absolute volume extended}
+                        }
+                    }
+                    default {
+                        #2 or more /
+                        #this will return 'scheme' even for c://  - even though that may look like a windows volume - review
+                        return {absolute scheme}
+                    }
+                }
+            }
+        }
+        #assert first element of any return has been absolute or relative 
+        return relative
+    }
+
+
+    proc plain {str} {
+        set str [string map "\\\\ /" $str]
+        set pathinfo [punk::path::pathtype $str]
+        if {[lindex $pathinfo 0] eq "relative" && ![string match ./* $str]} {
+            set str ./$str
+        }
+        if {[string index $str end] eq "/"} {
+            if {[string map {/ ""} $str] eq ""} {
+                #all slash segment
+                return $str
+            } else {
+                if {[lindex $pathinfo 1] ni {volume scheme}} {
+                    return [string range $str 0 end-1]
+                }
+            }
+        }
+        return $str
+    }
+    #purely string based - no reference to filesystem knowledge 
+    #unix-style forward slash only
+    proc plainjoin {args} {
+        set args [lmap a $args {string map "\\\\ /" $a}]
+        #if {[llength $args] == 1} {
+        #    return [lindex $args 0]
+        #}
+        set out ""
+        foreach a $args {
+            if {![string length $out]} {
+                append out [plain $a] 
+            } else {
+                set a [plain $a]
+                if {[string map {/ ""} $out] eq ""} {
+                    set out [string range $out 0 end-1]
+                } 
+
+                if {[string map {/ ""} $a] eq ""} {
+                    #all / segment
+                    append out [string range $a 0 end-1]
+                } else {
+                    if {[string length $a] > 2 && [string match "./*" $a]} {
+                        set a [string range $a 2 end]
+                    } 
+                    if {[string index $out end] eq "/"} {
+                        append out $a
+                    } else {
+                        append out / $a 
+                    }
+                }
+            }
+        }
+        return $out 
+    }
+    proc plainjoin1 {args} {
+        if {[llength $args] == 1} {
+            return [lindex $args 0]
+        }
+        set out [trim_final_slash [lindex $args 0]]
+        foreach a [lrange $args 1 end] {
+            set a [trim_final_slash $a]
+            append out / $a 
+        }
+        return $out 
+    }
+
+    #intention?
+    #proc filepath_dotted_dirname {path} {
+    #}
+
+    proc strip_prefixdepth {path prefix} {
+        if {$prefix eq ""} {
+            return [norm $path]
+        }
+        return [file join \
+            {*}[lrange \
+                [file split [norm $path]] \
+                [llength [file split [norm $prefix]]] \
+                end]]
+    }
 
     proc pathglob_as_re {pathglob} {
         #*** !doctools
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/repo-0.1.1.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/repo-0.1.1.tm
index ee2384b4..2cb5fd1d 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/repo-0.1.1.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/repo-0.1.1.tm
@@ -134,13 +134,30 @@ namespace eval punk::repo {
     }
     interp alias "" fossil "" punk::repo::fossil_proxy
 
+    # ---
+    # Calling auto_execok on an external tool can be too slow to do during package load (e.g could be 150ms)
+
     #safe interps can't call auto_execok
     #At least let them load the package even though much of it may be unusable depending on the safe configuration
-    catch {
-    if {[auto_execok fossil] ne ""} { 
-        interp alias "" FOSSIL "" {*}[auto_execok fossil]
-    }
+    #catch {
+    #    if {[auto_execok fossil] ne ""} { 
+    #        interp alias "" FOSSIL "" {*}[auto_execok fossil]
+    #    }
+    #}
+    # ---
+    # ----------
+    #
+
+    #uppercase FOSSIL to bypass fossil as alias to fossil_proxy
+    proc establish_FOSSIL {args} {
+        if {![info exists ::auto_execs(FOSSIL)]} {
+            set ::auto_execs(FOSSIL) [auto_execok fossil] ;#may fail in safe interp
+        }
+        interp alias "" FOSSIL "" ;#delete establishment alias
+        FOSSIL {*}$args
     }
+    interp alias "" FOSSIL "" punk::repo::establish_FOSSIL
+    # ----------
 
     proc askuser {question} {
         if {![catch {package require punk::lib}]} {
@@ -370,7 +387,16 @@ namespace eval punk::repo {
         }
 
         if {$repodir eq ""} {
-            error "workingdir_state error: No repository found at or above path '$abspath'" 
+            puts stderr "workingdir_state error: No repository found at or above path '$abspath'" 
+            puts stderr "args: $args"
+            dict set resultdict revision {} 
+            dict set resultdict revision_iso8601 {} 
+            dict set resultdict paths {} 
+            dict set resultdict ahead ""
+            dict set resultdict behind ""
+            dict set resultdict error {reason "no_repo_found"}
+            dict set resultdict repotype none
+            return $resultdict
         }
         set subpath [punk::path::relative $repodir $abspath]
         if {$subpath eq "."} {
@@ -644,6 +670,16 @@ namespace eval punk::repo {
         set path_count_fields [list unchanged changed new missing extra]
         set state_fields [list ahead behind repodir subpath repotype revision revision_iso8601]
         set dresult [dict create]
+        if {[dict exists $repostate error]} {
+            foreach f $state_fields {
+                dict set dresult $f ""
+            }
+            foreach f $path_count_fields {
+                dict set dresult $f ""
+            }
+            #todo?
+            return $dresult
+        }
         foreach f $state_fields {
            dict set dresult $f [dict get $repostate $f]
         }
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/winpath-0.1.0.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/winpath-0.1.0.tm
index b30133ba..6de745a8 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/winpath-0.1.0.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/winpath-0.1.0.tm
@@ -30,7 +30,7 @@ namespace eval punk::winpath {
 
     #\\servername\share etc  or \\?\UNC\servername\share  etc.
     proc is_unc_path {path} {
-        set strcopy_path [punk::objclone $path]
+        set strcopy_path [punk::winpath::system::objclone $path]
         set strcopy_path [string map {\\ /} $strcopy_path] ;#normalize to forward slashes for testing purposes (and forward slashes seem to be auto-translated by windows anyway)
         if {[string first "//" $strcopy_path] == 0} {
             #check for "Dos device path" syntax
@@ -77,7 +77,7 @@ namespace eval punk::winpath {
     #dos device path syntax allows windows api to acces extended-length paths and filenames with illegal path characters such as trailing dots or whitespace
     #(can exist on server shares and on NTFS - but standard apps can't access without dos device syntax)
     proc is_dos_device_path {path} {
-        set strcopy_path [punk::objclone $path]
+        set strcopy_path [punk::winpath::system::objclone $path]
         set strcopy_path [string map {\\ /} $strcopy_path] ;#normalize to forward slashes for testing purposes (and forward slashes seem to be auto-translated by windows anyway)
         if {[string range $strcopy_path 0 3] in {//?/ //./}} {
             return 1
@@ -87,7 +87,7 @@ namespace eval punk::winpath {
     }
     proc strip_dos_device_prefix {path} {
         #it's unlikely to be valid to strip only //?/ from a //?/UNC  path so check for it here and diver to strip that.
-        #(review.. or raise error because a //?/UNC path isn't *strictly* a UNC path? )
+        #(review.. or raise error because a //?/UNC path isn't an ordinary dos device path? )
         if {[is_unc_path $path]} {
             return [strip_unc_path_prefix $path]
         }
@@ -98,18 +98,18 @@ namespace eval punk::winpath {
         }
     }
     proc strip_unc_path_prefix {path} {
-        if {[is_unc_path $path]} {
-            #//?/UNC/server/etc
-            set strcopy_path [punk::objclone $path]
-            set trimmedpath [string range $strcopy_path 7 end]
-            file pathtype $trimmedpath ;#shimmer it to path rep
-            return $trimmedpath
-        } elseif {is_unc_path_plain $path} {
+        if {[is_unc_path_plain $path]} {
             #plain unc //server
-            set strcopy_path [punk::objclone $path]
+            set strcopy_path [punk::winpath::system::objclone $path]
             set trimmedpath [string range $strcopy_path 2 end]
             file pathtype $trimmedpath
             return $trimmedpath
+        } elseif {is_unc_path $path} {
+            #//?/UNC/server/subpath  or  //./UNC/server/subpath
+            set strcopy_path [punk::winpath::system::objclone $path]
+            set trimmedpath [string range $strcopy_path 7 end]
+            file pathtype $trimmedpath ;#shimmer it to path rep
+            return $trimmedpath
         } else {
             return $path
         }
@@ -153,7 +153,7 @@ namespace eval punk::winpath {
             error $err
         }
 
-        set strcopy_path [punk::objclone $path]
+        set strcopy_path [punk::winpath::system::objclone $path]
 
 
         #Note: path could still have leading double slash if it is a Dos device path: e.g. //?/c:/etc
@@ -225,27 +225,124 @@ namespace eval punk::winpath {
         return 0
     }
 
-    proc test_ntfs_tunneling {f1 f2 args} {
-        file mkdir $f1
-        puts stderr  "waiting 15secs..."
-        after 5000 {puts -nonewline stderr .}
-        after 5000 {puts -nonewline stderr .}
-        after 5000 {puts -nonewline stderr .}
-        after 500 {puts stderr \n}
-        file mkdir $f2
-        puts stdout "$f1   [file stat $f1]"
-        puts stdout "$f2   [file stat $f2]"
-        file delete $f1
-        puts stdout "renaming $f2 to $f1"
-        file rename $f2 $f1
-        puts stdout "$f1   [file stat $f1]"
-
+    proc shortname {path} {
+        set shortname "NA"
+        if {[catch {
+            set shortname [dict get [file attributes $path] -shortname]
+        } errM]} {
+            puts stderr "Failed to get shortname for '$path'"
+        }
+        return $shortname
+    }
+    proc test_ntfs_tunneling {prefix args} {
+        puts stderr "We are looking for whether any of the final $prefix files or dirs took over the ctime attribute of the original $prefix files or dirs"
+        puts stderr "We expect the ino values to get potentially reassigned depending on order of deletion/creation so matches are coincidental and not material"
+        puts stderr "The shortnames are similarly allocated as they come - so presumably match by coincidence"
+        puts stderr "However - if we record a file's shortname, then delete it. Recreating it by shortname within the tunneling timeframe will magically reassociate the longname"
+        puts stderr "use test_ntfs_tunneling2 to test shortname tunneling"
+        file mkdir $prefix-dir-rename
+        file mkdir $prefix-dir-recreate
+        set fd [open $prefix-file-recreate.txt w]
+        puts $fd "original for recreate"
+        close $fd
+        set fd [open $prefix-file-rename.txt w]
+        puts $fd "original for rename"
+        close $fd
+        puts stdout "ORIGINAL files/dirs"
+        puts stdout "$prefix-dir-rename           [file stat $prefix-dir-rename] "
+        puts stdout "$prefix-dir-recreate         [file stat $prefix-dir-recreate]"
+        puts stdout "$prefix-file-recreate.txt    [file stat $prefix-file-recreate.txt] short:[shortname $prefix-file-recreate.txt]"
+        puts stdout "$prefix-file-rename.txt      [file stat $prefix-file-rename.txt] short:[shortname $prefix-file-rename.txt]"
+        puts stderr  "waiting 10secs (to have discernable ctime differences)"
+        after 5000 
+        puts -nonewline stderr .
+        after 5000 
+        puts -nonewline stderr .
+        after 500 
+
+        #--
+        #seems to make no diff whether created or copied - no tunneling seen with dirs
+        #file mkdir $prefix-dir-rename-temp
+        file copy $prefix-dir-rename $prefix-dir-rename-temp
+        #-- 
+        puts stderr \n
+        puts stdout "$prefix-dir-rename-temp       [file stat $prefix-dir-rename-temp] (temp to rename into place)"
+        puts stderr "deleting $prefix-dir-rename"
+        file delete $prefix-dir-rename
+        puts stdout "renaming $prefix-dir-rename-temp to $prefix-dir-rename"
+        file rename $prefix-dir-rename-temp $prefix-dir-rename
+
+        puts stderr "deleting $prefix-dir-recreate"
+        file delete $prefix-dir-recreate
+        puts stdout "re-creating $prefix-dir-recreate"
+        file mkdir $prefix-dir-recreate
+
+        puts stderr "deleting $prefix-file-recreate.txt"
+        file delete $prefix-file-recreate.txt
+        puts stderr "Recreating $prefix-file-recreate.txt"
+        set fd [open $prefix-file-recreate.txt w]
+        puts $fd "replacement"
+        close $fd
+        
+        puts stderr "copying $prefix-file-rename.txt to $prefix-file-rename-temp.txt"
+        file copy $prefix-file-rename.txt $prefix-file-rename-temp.txt
+        puts stdout "$prefix-file-rename-temp.txt [file stat $prefix-file-rename-temp.txt] short:[shortname $prefix-file-rename-temp.txt] (status of initial temp copy)"
+        puts stderr "modifying temp copy before deletion of original.. (append)"
+        set fd [open $prefix-file-rename-temp.txt a] 
+        puts $fd "added to file"
+        close $fd
+        puts stdout "$prefix-file-rename-temp.txt [file stat $prefix-file-rename-temp.txt] short:[shortname $prefix-file-rename-temp.txt] (status of appended temp copy)"
+        puts stderr "deleting $prefix-file-rename.txt"
+        file delete  $prefix-file-rename.txt
+        puts stderr "renaming temp file $prefix-file-rename-temp.txt to original $prefix-file-rename.txt"
+        file rename $prefix-file-rename-temp.txt $prefix-file-rename.txt
+
+        puts stdout "Final files/dirs"
+        puts stdout "$prefix-dir-rename           [file stat $prefix-dir-rename]"
+        puts stdout "$prefix-dir-recreate         [file stat $prefix-dir-recreate]"
+        puts stdout "$prefix-file-recreate.txt    [file stat $prefix-file-recreate.txt] short:[shortname $prefix-file-recreate.txt]"
+        puts stdout "$prefix-file-rename.txt      [file stat $prefix-file-rename.txt] short:[shortname $prefix-file-rename.txt]"
+    }
+    proc test_ntfs_tunneling2 {prefix {waitms 15000}} {
+        #shortname -> longname tunneling
+        puts stderr "Tunneling only happens if we delete via shortname? review"
+        set f1 $prefix-longname-file1.txt
+        set f2 $prefix-longname-file2.txt
+
+        set fd [open $f1 w];close $fd
+        set shortname1 [shortname $f1] 
+        puts stderr "longname:$f1 has shortname:$shortname1"
+        set fd [open $f2 w];close $fd
+        set shortname2 [shortname $f2] 
+        puts stderr "longname:$f2 has shortname:$shortname2"
+
+        puts stderr "deleting $f1 via name $shortname1"
+        file delete $shortname1
+        puts stdout "immediately recreating $shortname1 - should retain longname $f1 via tunneling"
+        set fd [open $shortname1 w];close $fd
+        set f1_exists [file exists $f1]
+        puts stdout "file exists $f1 = $f1_exists"
+
+        puts stderr "deleting $f2 via name $shortname2"
+        file delete $shortname2
+        puts stderr "Waiting [expr {$waitms / 1000}] seconds.. (standard tunneling timeframe is 15 seconds if registry hasn't been tweaked)"
+        after $waitms
+        puts stdout "recreating $shortname2 after wait of $waitms ms - longname lost?" 
+        set fd [open $shortname2 w];close $fd
+        set f2_exists [file exists $f2]
+        puts stdout "file exists $f2 = $f2_exists"
+
+        puts stdout -done-
     }
-
 }
 
 
-
+namespace eval punk::winpath::system {
+    #get a copy of the item without affecting internal rep
+    proc objclone {obj} {
+        append obj2 $obj {}
+    }
+}
 
 
 
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/textblock-0.1.1.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/textblock-0.1.1.tm
index 94af61ba..5d127a38 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/textblock-0.1.1.tm
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/textblock-0.1.1.tm
@@ -12,25 +12,97 @@
 # Meta license      <unspecified>
 # @@ Meta End
 
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# doctools header
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+#*** !doctools
+#[manpage_begin punkshell_module_textblock 0 0.1.1]
+#[copyright "2024"]
+#[titledesc {punk textblock functions}]  [comment {-- Name section and table of contents description --}]
+#[moddesc {punk textblock}]             [comment {-- Description at end of page heading --}] 
+#[require textblock]
+#[keywords module utility lib]
+#[description]
+#[para] Ansi-aware terminal textblock manipulation
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 
+#*** !doctools
+#[section Overview]
+#[para] overview of textblock 
+#[subsection Concepts]
+#[para]
 
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 ##  Requirements
-##e.g package require frobz
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[subsection dependencies]
+#[para] packages used by textblock 
+#[list_begin itemized]
+
+#*** !doctools
+#[item] [package {Tcl 8.6-}]
+#[item] [package {punk::args}]
+#[item] [package {punk::char}]
+#[item] [package {punk::ansi}]
+#[item] [package {punk::lib}]
+#[item] [package {overtype}]
+#[item] [package {term::ansi::code::macros}]
+#[item] [package {textutil}]
+
+##  Requirements
+package require Tcl 8.6-
 package require punk::args
 package require punk::char
 package require punk::ansi
 package require punk::lib
 catch {package require patternpunk}
 package require overtype
+
+#safebase interps as at 2024-08 can't access deeper paths - even though they are below the supposed safe list.
 package require term::ansi::code::macros ;#required for frame if old ansi g0 used - review - make package optional?
 package require textutil
 
+
+#*** !doctools
+#[list_end]
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[section API]
+
+
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
 tcl::namespace::eval textblock {
     #review - what about ansi off in punk::console?
     tcl::namespace::import ::punk::ansi::a ::punk::ansi::a+
     tcl::namespace::export block frame frame_cache framedef frametypes gcross height width widthtopline join join_basic list_as_table pad testblock 
-
+    variable use_md5 ;#framecache
+    set use_md5 1
+    if {[catch {package require md5}]} {
+        set use_md5 0
+    }
+    proc use_md5 {{yes_no ""}} {
+        variable use_md5
+        if {$yes_no eq ""} {
+            return $use_md5
+        }
+        if {![string is boolean -strict $yes_no]} {
+            error "textblock::use_md5 requires a boolean (or empty string to query)"
+        }
+        if {$yes_no} {
+            package require md5
+            set use_md5 1
+        } else {
+            set use_md5 0
+        }
+        return $use_md5
+    }
     tcl::namespace::eval class {
         variable opts_table_defaults
         set opts_table_defaults [tcl::dict::create\
@@ -228,6 +300,7 @@ tcl::namespace::eval textblock {
             }
             return $map
         }
+
         if {[tcl::info::commands [tcl::namespace::current]::table] eq ""} {
             #*** !doctools
             #[subsection {Namespace textblock::class}]
@@ -249,7 +322,7 @@ tcl::namespace::eval textblock {
 
             oo::class create [tcl::namespace::current]::table [tcl::string::map [list %topt_keys% $topt_keys %topt_switchkeys% $switch_keys_valid_topts %copt_keys% $copt_keys %copt_switchkeys% $switch_keys_valid_copts] {
                 #*** !doctools
-                #[enum] CLASS [class interface_caphandler.registry]
+                #[enum] CLASS [class textblock::class::table]
                 #[list_begin definitions]
                 #    [para] [emph METHODS]
                 variable o_opts_table ;#options as configured by user (with exception of -ansireset)
@@ -3986,7 +4059,7 @@ tcl::namespace::eval textblock {
             if append is chosen the new values will always start at the first column"
             -columns    -default "" -type integer   -help "Number of table columns
             Will default to 2 if not using an existing -table object"
-            *values
+            *values -min 0 -max 1
             datalist    -default {}                 -help "flat list of table cell values which will be wrapped based on -columns value"
         }] $args]
         set opts [dict get $argd opts]
@@ -4337,6 +4410,14 @@ tcl::namespace::eval textblock {
 
         return [tcl::dict::create width $width height $height] ;#maintain order in 'image processing' standard width then height - caller may use lassign [tcl::dict::values [blocksize <data>]] width height
     }
+    proc size_as_opts {textblock} {
+        set sz [size $textblock]
+        return [dict create -width [dict get $sz width] -height [dict get $sz height]]
+    }
+    proc size_as_list {textblock} {
+        set sz [size $textblock]
+        return [list [dict get $sz width] [dict get $sz height]]
+    }
     #must be able to handle block as string with or without newlines
     #if no newlines - attempt to treat as a list
     #must handle whitespace-only string,list elements, and/or lines.
@@ -5061,6 +5142,7 @@ tcl::namespace::eval textblock {
              [punk::lib::list_as_lines -- [lrepeat 8 " | "]]
     }
     proc table {args} {
+        #todo - use punk::args
         upvar ::textblock::class::opts_table_defaults toptdefaults
         set defaults [tcl::dict::create\
             -rows [list]\
@@ -5112,7 +5194,7 @@ tcl::namespace::eval textblock {
     }
 
     variable frametypes
-    set frametypes [list light heavy arc double block block1 block2 ascii altg]
+    set frametypes [list light heavy arc double block block1 block2 block2hack ascii altg]
     #class::table needs to be able to determine valid frametypes
     proc frametypes {} {
         variable frametypes
@@ -5121,7 +5203,7 @@ tcl::namespace::eval textblock {
     proc frametype {f} {
         #set custom_keys [list hl hlt hlb vl vll vlr tlc trc blc brc]
         switch -- $f {
-            light - heavy - arc - double - block - block1 - block2 - ascii - altg {
+            light - heavy - arc - double - block - block1 - block2 - block2hack - ascii - altg {
                 return [tcl::dict::create category predefined type $f]
             }
             default {
@@ -5142,7 +5224,7 @@ tcl::namespace::eval textblock {
                     set is_custom_dict_ok 0
                 }
                 if {!$is_custom_dict_ok} {
-                    error "frame option -type must be one of known types: $textblock::frametypes or a dictionary with any of keys hl,hlt,hlb,vl,vll,vlr,tlc,trc,blc,brc"
+                    error "frame option -type must be one of known types: $::textblock::frametypes or a dictionary with any of keys hl,hlt,hlb,vl,vll,vlr,tlc,trc,blc,brc"
                 }
                 set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "]
                 set custom_frame [tcl::dict::merge $default_custom $f]
@@ -6252,9 +6334,12 @@ tcl::namespace::eval textblock {
                 set vlr \u2595 ;# right one eighth block
                 set vll \u258f ;# left one eighth block
 
+                #some terminals (on windows as at 2024) miscount width of these single-width blocks internally
+                #resulting in extra spacing that is sometimes well removed from the character itself (e.g at next ansi reset)
+                #This was fixed in windows-terminal based systems (2021) but persists in others.
+                #https://github.com/microsoft/terminal/issues/11694
                 set tlc \U1fb7d ;#legacy block
                 set trc \U1fb7e ;#legacy block
-
                 set blc \U1fb7c ;#legacy block
                 set brc \U1fb7f ;#legacy block
 
@@ -6265,6 +6350,42 @@ tcl::namespace::eval textblock {
                 set vlrj $vlr
 
             }
+            block2hack {
+                #the resultant table will have text appear towards top of each box 
+                #with 'legacy' computing unicode block - hopefully these become more widely supported - as they are useful and fill in some gaps
+                set hlt \u2594 ;# upper one eighth block
+                set hlb \u2581 ;# lower one eighth block
+                set vlr \u2595 ;# right one eighth block
+                set vll \u258f ;# left one eighth block
+
+                #see comments in block2 regarding the problems in some terminals that this *may* hack around to some extent.
+                #the caller probably only needs block2hack if block2 doesn't work
+
+                #1)
+                #review - this hack looks sort of promising - but overtype::renderline needs fixing ?
+                #set tlc \U1fb7d\b ;#legacy block
+                #set trc \U1fb7e\b ;#legacy block
+                #set blc \U1fb7c\b ;#legacy block
+                #set brc \U1fb7f\b ;#legacy block
+
+                #2) - works on cmd.exe and some others
+                # a 'privacy message' is 'probably' also not supported on the old terminal but is on newer ones
+                #known exception - conemu on windows - displays junk for various ansi codes - (and slow terminal anyway)
+                #this hack has a reasonable chance of working
+                #except that the punk overtype library does recognise PMs 
+                #A single backspace however is an unlikely and generally unuseful PM - so there is a corresponding hack in the renderline system to pass this PM through!
+                #ugly - in that we don't know the application specifics of what the PM data contains and where it's going.
+                set tlc \U1fb7d\x1b^\b\x1b\\ ;#legacy block
+                set trc \U1fb7e\x1b^\b\x1b\\ ;#legacy block
+                set blc \U1fb7c\x1b^\b\x1b\\ ;#legacy block
+                set brc \U1fb7f\x1b^\b\x1b\\ ;#legacy block
+
+                #horizontal and vertical bar joins 
+                set hltj $hlt
+                set hlbj $hlb
+                set vllj $vll
+                set vlrj $vlr
+            }
             block {
                 set hlt \u2580 ;#upper half
                 set hlb \u2584 ;#lower half
@@ -6286,7 +6407,7 @@ tcl::namespace::eval textblock {
                 set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "] ;#only default the general types - these form defaults for more specific types if they're missing
                 if {[llength $f] % 2 != 0} {
                     #todo  - retrieve usage from punk::args
-                    error "textblock::frametype frametype '$f' is not one of the predefined frametypes: $textblock::frametypes and does not appear to be a dictionary for a custom frametype"
+                    error "textblock::frametype frametype '$f' is not one of the predefined frametypes: $::textblock::frametypes and does not appear to be a dictionary for a custom frametype"
                 }
                 #unknown order of keys specified by user - validate before creating vars as we need more general elements to be available as defaults
                 dict for {k v} $f {
@@ -6388,7 +6509,7 @@ tcl::namespace::eval textblock {
 
 
     #options before content argument - which is allowed to be absent
-    #frame performance (noticeable with complex tables even of modest size) is improved significantly by frame_cache - but is still (2024) a fairly expensive operation.
+    #frame performance (noticeable with complex tables even of modest size) is improved somewhat by frame_cache - but is still (2024) a fairly expensive operation.
     #
     #consider if we can use -sticky nsew instead of -blockalign (as per Tk grid -sticky option)
     # This would require some sort of expand equivalent e.g for -sticky ew or -sticky ns - for which we have to decide a meaning for text.. e.g ansi padding?
@@ -6397,6 +6518,7 @@ tcl::namespace::eval textblock {
     # - but we would need to maintain support for the rendered-string based operations too.
     proc frame {args} {
         variable frametypes
+        variable use_md5
 
         #counterintuitively - in-proc dict create each time is generally slightly faster than linked namespace var
         set opts [tcl::dict::create\
@@ -6416,7 +6538,11 @@ tcl::namespace::eval textblock {
             -ellipsis 1\
             -usecache 1\
             -buildcache 1\
+            -pad 1\
+            -crm_mode 0\
         ]
+        #-pad 1 is default so that simple 'textblock::frame "[a+ Red]a  \nbbb[a]"  extends the bg colour on the short ragged lines (and empty lines)
+        # for ansi art - -pad 0 is likely to be preferable
 
         set expect_optval 0
         set argposn 0
@@ -6455,7 +6581,12 @@ tcl::namespace::eval textblock {
         #use -buildcache 1 with -usecache 0 for debugging cache issues so we can inspect using textblock::frame_cache
         foreach {k v} $arglist {
             switch -- $k {
-                -etabs - -type - -boxlimits - -boxmap - -joins - -title - -subtitle - -width - -height - -ansiborder - -ansibase - -blockalign - -textalign - -ellipsis - -usecache - -buildcache {
+                -etabs - -type - -boxlimits - -boxmap - -joins 
+                - -title - -subtitle - -width - -height
+                - -ansiborder - -ansibase
+                - -blockalign - -textalign - -ellipsis
+                - -crm_mode
+                - -usecache - -buildcache - -pad {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -6471,11 +6602,13 @@ tcl::namespace::eval textblock {
         set opt_boxmap      [tcl::dict::get $opts -boxmap]
         set opt_usecache    [tcl::dict::get $opts -usecache]
         set opt_buildcache  [tcl::dict::get $opts -buildcache]
+        set opt_pad         [tcl::dict::get $opts -pad]
+        set opt_crm_mode    [tcl::dict::get $opts -crm_mode]
         set usecache $opt_usecache ;#may need to override
         set buildcache $opt_buildcache
         set custom_keys [list hl hlt hlb vl vll vlr tlc trc blc brc]
 
-        set known_frametypes $frametypes ;# light, heavey etc as defined in textblock::frametypes variable
+        set known_frametypes $frametypes ;# light, heavey etc as defined in the ::textblock::frametypes variable
         set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "]
 
         lassign [textblock::frametype $opt_type] _cat category _type ftype
@@ -6614,6 +6747,19 @@ tcl::namespace::eval textblock {
                 }
             }
             set contents [tcl::string::map [list \r\n \n] $contents]
+            if {$opt_crm_mode} {
+                if {$opt_height eq ""} {
+                    set h [textblock::height $contents]
+                } else {
+                    set h [expr {$opt_height -2}]
+                }
+                if {$opt_width eq ""} {
+                    set w [textblock::width $contents]
+                } else {
+                    set w [expr {$opt_width -2}]
+                }
+                set contents [overtype::renderspace -crm_mode 1 -wrap 1 -width $w -height $h "" $contents]
+            }
             set actual_contentwidth [textblock::width $contents] ;#length of longest line in contents (contents can be ragged)
             set actual_contentheight [textblock::height $contents]
         } else {
@@ -6652,9 +6798,14 @@ tcl::namespace::eval textblock {
         #review - custom frame affects frame_inner_width - exclude from caching?
         #set cache_key [concat $arglist $frame_inner_width $frame_inner_height]
         set hashables [concat $arglist $frame_inner_width $frame_inner_height]
-        package require md5
-        #set hash $hashables
-        set hash [md5::md5 -hex [encoding convertto utf-8 $hashables]] ;#need fast and unique to content - not cryptographic - review
+
+        if {$use_md5} {
+            #package require md5 ;#already required at package load
+            set hash [md5::md5 -hex [encoding convertto utf-8 $hashables]] ;#need fast and unique to content - not cryptographic - review
+        } else {
+            set hash $hashables
+        }
+
         set cache_key "$hash-$frame_inner_width-$frame_inner_height-actualcontentwidth:$actual_contentwidth"
         #should be in a unicode private range different to that used in table construction
         #e.g BMP PUA U+E000 -> U+F8FF  - although this is commonly used for example by nerdfonts
@@ -7057,15 +7208,22 @@ tcl::namespace::eval textblock {
                 append contents [::join [lrepeat $diff \n] ""]
             }
 
-            set paddedcontents [textblock::pad $contents -which $pad -within_ansi 1] ;#autowidth to width of content (should match cache_patternwidth) 
-            set paddedwidth  [textblock::widthtopline $paddedcontents]
-
-            #review - horizontal truncation
-            if {$paddedwidth > $cache_patternwidth} {
-                set paddedcontents [overtype::renderspace -width $cache_patternwidth "" $paddedcontents]
+            if {$opt_pad} {
+                set paddedcontents [textblock::pad $contents -which $pad -within_ansi 1] ;#autowidth to width of content (should match cache_patternwidth) 
+                set paddedwidth  [textblock::widthtopline $paddedcontents]
+                #review - horizontal truncation
+                if {$paddedwidth > $cache_patternwidth} {
+                    set paddedcontents [overtype::renderspace -width $cache_patternwidth "" $paddedcontents]
+                }
+                #important to supply end of opts -- to textblock::join - particularly here with arbitrary data
+                set contentblock [textblock::join -- $paddedcontents] ;#make sure each line has ansi replays
+            } else {
+                set cwidth [textblock::width $contents]
+                if {$cwidth > $cache_patternwidth} {
+                    set contents [overtype::renderspace -width $cache_patternwidth "" $contents]
+                }
+                set contentblock [textblock::join -- $contents]
             }
-            #important to supply end of opts -- to textblock::join - particularly here with arbitrary data
-            set contentblock [textblock::join -- $paddedcontents] ;#make sure each line has ansi replays
 
             set tlines [split $template \n]
 
@@ -7183,7 +7341,6 @@ tcl::namespace::eval textblock {
         #fastest to do row first then columns - because textblock::join must do line by line
 
         if {$crosscount > 1} {
-            package require textblock
             set row [textblock::join -- {*}[lrepeat $crosscount $onecross]]
             set rows [lrepeat $crosscount $row]
             set out [::join $rows \n]
@@ -7223,4 +7380,8 @@ package provide textblock [tcl::namespace::eval textblock {
     variable version
     set version 0.1.1 
 }]
-return
\ No newline at end of file
+return
+
+#*** !doctools
+#[manpage_end]
+
diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/make.tcl b/src/project_layouts/custom/_project/punk.shell-0.1/src/make.tcl
index 1cf07c5b..9edd90b0 100644
--- a/src/project_layouts/custom/_project/punk.shell-0.1/src/make.tcl
+++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/make.tcl
@@ -1212,8 +1212,9 @@ foreach vfstail $vfs_tails {
             set rtmountpoint //zipfs:/rtmounts/$runtime_fullname
 
             set changed_unchanged [$vfs_event targetset_source_changes]
+            set vfs_or_runtime_changed [expr {[llength [dict get $changed_unchanged changed]] ||  [llength [$vfs_event get_targets_exist]] < [llength [$vfs_event get_targets]]}]
 
-            if {[llength [dict get $changed_unchanged changed]] ||  [llength [$vfs_event get_targets_exist]] < [llength [$vfs_event get_targets]]} {
+            if {$vfs_or_runtime_changed} {
                 #source .vfs folder has changes
                 $vfs_event targetset_started
                 # -- --- --- --- --- ---
@@ -1283,6 +1284,7 @@ foreach vfstail $vfs_tails {
                                     puts stderr "RUNTIME capabilities unknown. Unsure if zip supported. trying anyway.."
                                 }
                             }
+                            #note - as at 2024-08 - there is some discussion about the interface to mkimg - it is considered unstable (may change to -option value syntax)
                             puts stderr "calling: tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs \"\" $buildfolder/build_$runtime_fullname"
                             tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs "" $buildfolder/build_$runtime_fullname
                         } result ]} {
@@ -1352,9 +1354,10 @@ foreach vfstail $vfs_tails {
                     if {![catch {
                             exec $pscmd | grep $targetkit
                         } still_running]} {
-
-                        puts stdout "found $targetkit instances still running\n"
+                        set still_running_lines [split [string trim $still_running] \n]
+                        puts stdout "found ([llength $still_running_lines]) $targetkit instances still running\n"
                         set count_killed 0
+                        set num_to_kill [llength $still_running_lines]
                         foreach ln [split $still_running \n] {
                             puts stdout "    $ln"
                             
@@ -1387,9 +1390,6 @@ foreach vfstail $vfs_tails {
                                 #review - *no running instance* works with windows taskkill - "*No such process*" works with kill -9 on FreeBSD and linux - other platforms?
                                 if {![string match "*no running instance*" $errMsg] && ![string match "*No such process*" $errMsg]} {
                                     lappend failed_kits [list kit $targetkit reason "could not kill running process for $targetkit (using '$killcmd')"]
-                                    $vfs_event targetset_end FAILED
-                                    $vfs_event destroy
-                                    $vfs_installer destroy
                                     continue
                                 }
                             } else {
@@ -1397,10 +1397,15 @@ foreach vfstail $vfs_tails {
                                 incr count_killed
                             }
                         }
-                        if {$count_killed > 0} {
-                            puts stderr "\nKilled $count_killed processes. Waiting a short time before attempting to delete executable"
-                            after 1000
+                        if {$count_killed < $num_to_kill} {
+                            $vfs_event targetset_end FAILED
+                            $vfs_event destroy
+                            $vfs_installer destroy
+                            continue
                         }
+
+                        puts stderr "\nKilled $count_killed processes. Waiting a short time before attempting to delete executable"
+                        after 1000
                     } else {
                         puts stderr "Ok.. no running '$targetkit' processes found"
                     }
@@ -1426,22 +1431,35 @@ foreach vfstail $vfs_tails {
                 # -- --- --- --- --- ---
                 $vfs_event targetset_end OK
 
+            } else {
+                set skipped_vfs_build 1
+                puts stderr "."
+                puts stdout "Skipping build for vfs $vfstail with runtime $rtname - no change detected"
+                $vfs_event targetset_end SKIPPED
+            }
+            $vfs_event destroy
+            $vfs_installer destroy
 
-                after 200
-                set deployment_folder [file dirname $sourcefolder]/bin
-                file mkdir $deployment_folder
+            after 200
+            set deployment_folder [file dirname $sourcefolder]/bin
+            file mkdir $deployment_folder
 
-                # -- ----------
-                set bin_installer [punkcheck::installtrack new "make.tcl" $deployment_folder/.punkcheck]
-                $bin_installer set_source_target $buildfolder $deployment_folder
-                set bin_event [$bin_installer start_event {-make-step final_kit_install}]
-                $bin_event targetset_init INSTALL $deployment_folder/$targetkit
-                #todo - move final deployment step outside of the build vfs loop? (final deployment can fail and then isn't rerun even though _build and deployed versions differ, unless .vfs modified again)
-                #set last_completion [$bin_event targetset_last_complete]
-
-                $bin_event targetset_addsource $buildfolder/$targetkit
-                $bin_event targetset_started
-                # -- ----------
+            # -- ----------
+            set bin_installer [punkcheck::installtrack new "make.tcl" $deployment_folder/.punkcheck]
+            $bin_installer set_source_target $buildfolder $deployment_folder
+            set bin_event [$bin_installer start_event {-make-step final_kit_install}]
+            $bin_event targetset_init INSTALL $deployment_folder/$targetkit
+            #todo - move final deployment step outside of the build vfs loop? (final deployment can fail and then isn't rerun even though _build and deployed versions differ, unless .vfs modified again)
+            #set last_completion [$bin_event targetset_last_complete]
+
+            $bin_event targetset_addsource $deployment_folder/$targetkit ;#add target as a source of metadata for change detection
+            $bin_event targetset_addsource $buildfolder/$targetkit
+            $bin_event targetset_started
+            # -- ----------
+
+            set changed_unchanged [$bin_event targetset_source_changes]
+            set built_or_installed_kit_changed [expr {[llength [dict get $changed_unchanged changed]] ||  [llength [$bin_event get_targets_exist]] < [llength [$bin_event get_targets]]}]
+            if {$built_or_installed_kit_changed} { 
 
                 if {[file exists $deployment_folder/$targetkit]} {
                     puts stderr "deleting existing deployed at $deployment_folder/$targetkit"
@@ -1467,19 +1485,16 @@ foreach vfstail $vfs_tails {
                 # -- ----------
                 $bin_event targetset_end OK
                 # -- ----------
-                $bin_event destroy
-                $bin_installer destroy
-
             } else {
-                set skipped_vfs_build 1
+                set skipped_kit_install 1
                 puts stderr "."
-                puts stdout "Skipping build for vfs $vfstail with runtime $rtname - no change detected"
-                $vfs_event targetset_end SKIPPED
+                puts stdout "Skipping kit install for $targetkit with vfs $vfstail runtime $rtname - no change detected"
+                $bin_event targetset_end SKIPPED
             }
+            $bin_event destroy
+            $bin_installer destroy
 
 
-            $vfs_event destroy
-            $vfs_installer destroy
 
         } ;#end foreach targetkit
     } ;#end foreach rtname in runtimes
diff --git a/src/runtime/mapvfs.config b/src/runtime/mapvfs.config
index 83204502..74876865 100644
--- a/src/runtime/mapvfs.config
+++ b/src/runtime/mapvfs.config
@@ -12,22 +12,32 @@
 #e.g
 #- myproject.vfs
 #- punk86.vfs
-tclkit86bi.exe {punk8win.vfs punkbi kit}
+tclkit86bi.exe          {punk8win.vfs punkbi kit}
+
+#c:\tcl.bawt tcl 8.6.13 bawt
+tclkit-win64-dyn.exe    {punk86bawt.vfs punkbawt kit}
+
 
 #magicsplat tclkit - no Tk
 ##tclkit8613.exe punk86.vfs
 
 #magicsplat modified tclkit - added tk, changed icon
-tclkit8613punk.exe punk86.vfs {punk.vfs punk86b}
+tclkit8613punk.exe punk86.vfs {punk8win.vfs punk86}
 #tclkit8613punk.head.exe {punk8_statictwapi.vfs punk86head}
 
 
-#tclkit87a5.exe {punk86.vfs punk87}  {punk.vfs punkmain}
-tclkit87a5.exe {punk8win.vfs punk87}
+#tclkit87a5.exe punk86.vfs punk87}  {punk.vfs punkmain}
+tclkit87a5.exe          {punk8win.vfs punk87}
+
+
+##################################
+#TCL9
+tclsh90b2               {punk9win.vfs   punk90b2 zip}
+tclsh90b4_piperepl.exe  {punk9win.vfs   punk90b4    zip}   {critcl.vfs     critcl9     zip}
+##################################
+
 
 
-#experimental
-tclsh90zip.exe {punk9win.vfs punk90zip zip}
 
 ##tclkit87a5bawt.exe punk86.vfs
 ##tclkit86bi.exe vfs_windows/punk86win.vfs
@@ -35,7 +45,5 @@ tclsh90zip.exe {punk9win.vfs punk90zip zip}
 
 #temp hack - todo fix .exe for x-platform
 #linux tclsh90 (zip) built with zig.build x-compile on windows
-#tclsh90linux.exe {punk9linux.vfs punk90linux zip}
+#tclsh90linux.exe       {punk9linux.vfs punk90linux zip}
 
-#c:\tcl.bawt tcl 8.6.13 bawt
-tclkit-win64-dyn.exe  {punk86bawt.vfs punkbawt kit}
\ No newline at end of file
diff --git a/src/vendormodules/overtype-1.6.5.tm b/src/vendormodules/overtype-1.6.5.tm
index 143794fb..38ce71c2 100644
--- a/src/vendormodules/overtype-1.6.5.tm
+++ b/src/vendormodules/overtype-1.6.5.tm
@@ -163,22 +163,23 @@ proc overtype::string_columns {text} {
 tcl::namespace::eval overtype::priv {
 }
 
-#could return larger than colwidth
+#could return larger than renderwidth 
 proc _get_row_append_column {row} {
+    #obsolete?
     upvar outputlines outputlines 
     set idx [expr {$row -1}]
     if {$row <= 1 || $row > [llength $outputlines]} {
         return 1
     } else {
-        upvar opt_overflow opt_overflow
-        upvar colwidth colwidth
+        upvar opt_expand_right expand_right 
+        upvar renderwidth renderwidth 
         set existinglen [punk::ansi::printing_length [lindex $outputlines $idx]]
         set endpos [expr {$existinglen +1}]
-        if {$opt_overflow} {
+        if {$expand_right} {
             return $endpos
         } else {
-            if {$endpos > $colwidth} {
-                return $colwidth + 1
+            if {$endpos > $renderwidth} {
+                return $renderwidth + 1
             } else {
                 return $endpos
             }
@@ -204,38 +205,70 @@ tcl::namespace::eval overtype {
     proc renderspace {args} {
         #*** !doctools
         #[call [fun overtype::renderspace] [arg args] ]
-        #[para]	usage: ?-transparent [lb]0|1[rb]? ?-overflow [lb]1|0[rb]? ?-ellipsis [lb]1|0[rb]? ?-ellipsistext ...? undertext overtext
+        #[para]	usage: ?-transparent [lb]0|1[rb]? ?-expand_right [lb]1|0[rb]? ?-ellipsis [lb]1|0[rb]? ?-ellipsistext ...? undertext overtext
 
         # @c overtype starting at left (overstrike) 
         # @c can/should we use something like this?: 'format "%-*s" $len $overtext 
         variable default_ellipsis_horizontal
 
         if {[llength $args] < 2} {
-            error {usage: ?-width <int>? ?-startcolumn <int>? ?-transparent [0|1|<char>]? ?-overflow [1|0]? ?-ellipsis [1|0]? ?-ellipsistext ...? undertext overtext}
+            error {usage: ?-width <int>? ?-startcolumn <int>? ?-transparent [0|1|<char>]? ?-expand_right [1|0]? ?-ellipsis [1|0]? ?-ellipsistext ...? undertext overtext}
+        }
+        set optargs [lrange $args 0 end-2]
+        if {[llength $optargs] % 2 == 0} {
+            lassign [lrange $args end-1 end] underblock overblock
+            set argsflags [lrange $args 0 end-2]
+        } else {
+            set optargs [lrange $args 0 end-1]
+            if {[llength $optargs] %2 == 0} {
+                set overblock [lindex $args end]
+                set underblock ""
+                set argsflags [lrange $args 0 end-1]
+            } else {
+                error "renderspace expects opt-val pairs followed by: <underblock> <overblock> or just <overblock>"
+            }
         }
-        lassign [lrange $args end-1 end] underblock overblock
         set opts [tcl::dict::create\
-            -bias       ignored\
-            -width      \uFFEF\
-            -height     \uFFEF\
+            -bias           ignored\
+            -width          \uFFEF\
+            -height         \uFFEF\
             -startcolumn    1\
-            -wrap       0\
-            -ellipsis   0\
+            -wrap           0\
+            -ellipsis       0\
             -ellipsistext   $default_ellipsis_horizontal\
             -ellipsiswhitespace 0\
-            -overflow   0\
-            -appendlines  1\
-            -transparent 0\
-            -exposed1 \uFFFD\
-            -exposed2 \uFFFD\
-            -experimental  0\
-            -looplimit  \uFFEF\
+            -expand_right       0\
+            -appendlines    1\
+            -transparent    0\
+            -exposed1       \uFFFD\
+            -exposed2       \uFFFD\
+            -experimental   0\
+            -cp437          1\
+            -looplimit      \uFFEF\
+            -crm_mode       0\
+            -reverse_mode   0\
+            -insert_mode    0\
+            -console {stdin stdout stderr}\
         ]
+        #expand_right is perhaps consistent with the idea of the page_size being allowed to grow horizontally..
+        # it does not necessarily mean the viewport grows. (which further implies need for horizontal scrolling)
+        # - it does need to be within some concept of terminal width - as columns must be addressable by ansi sequences.
+        # - This implies the -width option value must grow if it is tied to the concept of renderspace terminal width! REVIEW.
+        # - further implication is that if expand_right grows the virtual renderspace terminal width - 
+        #  then some sort of reflow/rerender needs to be done for preceeding lines?
+        # possibly not - as expand_right is distinct from a normal terminal-width change event, 
+        # expand_right being primarily to support other operations such as textblock::table
+
+        #todo - viewport width/height as separate concept to terminal width/height?
         #-ellipsis args not used if -wrap is true
-        set argsflags [lrange $args 0 end-2]
         foreach {k v} $argsflags {
             switch -- $k {
-                -looplimit - -width - -height - -startcolumn - -bias - -wrap - -ellipsis - -ellipsistext - -ellipsiswhitespace - -overflow - -appendlines - -transparent - -exposed1 - -exposed2 - -experimental {
+                -looplimit - -width - -height - -startcolumn - -bias - -wrap - -ellipsis - -ellipsistext - -ellipsiswhitespace
+                - -transparent - -exposed1 - -exposed2 - -experimental
+                - -expand_right - -appendlines
+                - -reverse_mode - -crm_mode - -insert_mode 
+                - -cp437
+                - -console {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -245,7 +278,8 @@ tcl::namespace::eval overtype {
         }
         #set opts [tcl::dict::merge $defaults $argsflags]
         # -- --- --- --- --- ---
-        set opt_overflow        [tcl::dict::get $opts -overflow] 
+        #review - expand_left for RTL text? 
+        set opt_expand_right    [tcl::dict::get $opts -expand_right] 
         #####
         # review -wrap should map onto DECAWM terminal mode - the wrap 2 idea may not fit in with this?.
         set opt_wrap            [tcl::dict::get $opts -wrap]  ;#wrap 1 is hard wrap cutting word at exact column, or 1 column early for 2w-glyph, wrap 2 is for language-based word-wrap algorithm (todo)
@@ -261,23 +295,33 @@ tcl::namespace::eval overtype {
         set opt_exposed1        [tcl::dict::get $opts -exposed1] ;#widechar_exposed_left  - todo
         set opt_exposed2        [tcl::dict::get $opts -exposed2] ;#widechar_exposed_right - todo
         # -- --- --- --- --- ---
+        set opt_crm_mode        [tcl::dict::get $opts -crm_mode]
+        set opt_reverse_mode    [tcl::dict::get $opts -reverse_mode]
+        set opt_insert_mode     [tcl::dict::get $opts -insert_mode]
+        # -- --- --- --- --- ---
+        set opt_cp437           [tcl::dict::get $opts -cp437]
+
+
+        #initial state for renderspace 'terminal' reset
+        set initial_state [dict create\
+            -width          $opt_width\
+            -height         $opt_height\
+            -crm_mode       $opt_crm_mode\
+            -reverse_mode   $opt_reverse_mode\
+            -insert_mode    $opt_insert_mode\
+            -cp437          $opt_cp437\
+        ]
 
         # ----------------------------
         #  -experimental dev flag to set flags etc
         # ----------------------------
         set data_mode 0
-        set test_mode 1
         set info_mode 0
         set edit_mode 0
         set opt_experimental   [tcl::dict::get $opts -experimental]
         foreach o $opt_experimental {
             switch -- $o {
-                test_mode {
-                    set test_mode 1
-                    set info_mode 1
-                }
                 old_mode {
-                    set test_mode 0
                     set info_mode 1
                 }
                 data_mode {
@@ -291,13 +335,13 @@ tcl::namespace::eval overtype {
                 }
             }
         }
-        set test_mode 1 ;#try to eliminate
         # ----------------------------
 
         #modes
-        set insert_mode 0 ;#can be toggled by insert key or ansi IRM sequence ESC [ 4 h|l
-        set autowrap_mode $opt_wrap
-        set reverse_mode 0
+        set insert_mode     $opt_insert_mode ;#can be toggled by insert key or ansi IRM sequence ESC [ 4 h|l
+        set autowrap_mode   $opt_wrap
+        set reverse_mode    $opt_reverse_mode 
+        set crm_mode        $opt_crm_mode 
         
 
         set underblock [tcl::string::map {\r\n \n} $underblock]
@@ -307,33 +351,35 @@ tcl::namespace::eval overtype {
         #set underlines [split $underblock \n]
 
         #underblock is a 'rendered' block - so width height make sense
-        #colwidth & colheight were originally named with reference to rendering into a 'column' of output e.g  a table column - before cursor row/col was implemented.
-        #The naming is now confusing. It should be something like renderwidth renderheight ?? review 
+        #only non-cursor affecting and non-width occupying ANSI codes should be present.
+        #ie SGR codes and perhaps things such as PM - although generally those should have been pushed to the application already
+        #renderwidth & renderheight were originally used with reference to rendering into a 'column' of output e.g  a table column - before cursor row/col was implemented.
         
         if {$opt_width eq "\uFFEF" || $opt_height eq "\uFFEF"} {
-            lassign [blocksize $underblock] _w colwidth _h colheight
+            lassign [blocksize $underblock] _w renderwidth _h renderheight 
             if {$opt_width ne "\uFFEF"} {
-                set colwidth $opt_width
+                set renderwidth $opt_width
             }
             if {$opt_height ne "\uFFEF"} {
-                set colheight $opt_height
+                set renderheight $opt_height
             }
         } else {
-            set colwidth $opt_width
-            set colheight $opt_height
+            set renderwidth $opt_width
+            set renderheight $opt_height
         }
 
         # -- --- --- --- 
         #REVIEW - do we need ansi resets in the underblock?
         if {$underblock eq ""} {
-            set underlines [lrepeat $colheight ""]
+            set underlines [lrepeat $renderheight ""]
         } else {
+            set underblock [textblock::join_basic -- $underblock] ;#ensure properly rendered - ansi per-line resets & replays
             set underlines [split $underblock \n]
         }
         #if {$underblock eq ""} {
         #    set blank "\x1b\[0m\x1b\[0m"
         #    #set underlines [list "\x1b\[0m\x1b\[0m"]
-        #    set underlines [lrepeat $colheight $blank]
+        #    set underlines [lrepeat $renderheight $blank]
         #} else {
         #    #lines_as_list -ansiresets 1 will do nothing if -ansiresets 1 isn't specified - REVIEW
         #    set underlines [lines_as_list -ansiresets 1 $underblock]
@@ -341,7 +387,7 @@ tcl::namespace::eval overtype {
         # -- --- --- --- 
 
         #todo - reconsider the 'line' as the natural chunking mechanism for the overlay.
-        #In practice an overlay ANSI stream can be a single line with ansi moves/restores etc - or even have no moves or newlines, just relying on wrapping at the output colwidth
+        #In practice an overlay ANSI stream can be a single line with ansi moves/restores etc - or even have no moves or newlines, just relying on wrapping at the output renderwidth 
         #In such cases - we process the whole shebazzle for the first output line - only reducing by the applied amount at the head each time, reprocessing the long tail each time.
         #(in cases where there are interline moves or cursor jumps anyway)
         #This works - but doesn't seem efficient.
@@ -356,49 +402,45 @@ tcl::namespace::eval overtype {
             set looplimit [expr {[tcl::string::length $overblock] + 10}]
         }
 
-        if {!$test_mode} {
-            set inputchunks [split $overblock \n]
-        } else {
-            set scheme 3
-            switch -- $scheme {
-                0 {
-                    #one big chunk
-                    set inputchunks [list $overblock]
+        set scheme 3
+        switch -- $scheme {
+            0 {
+                #one big chunk
+                set inputchunks [list $overblock]
+            }
+            1 {
+                set inputchunks [punk::ansi::ta::split_codes $overblock]
+            }
+            2 {
+
+                #split into lines if possible first - then into plaintext/ansi-sequence chunks ?
+                set inputchunks [list ""] ;#put an empty plaintext split in for starters
+                set i 1
+                set lines [split $overblock \n]
+                foreach ln $lines {
+                    if {$i < [llength $lines]} {
+                        append ln \n
+                    }
+                    set sequence_split [punk::ansi::ta::split_codes_single $ln]  ;#use split_codes Not split_codes_single?
+                    set lastpt [lindex $inputchunks end]
+                    lset inputchunks end [tcl::string::cat $lastpt [lindex $sequence_split 0]]
+                    lappend inputchunks {*}[lrange $sequence_split 1 end]
+                    incr i
                 }
-                1 {
-                    set inputchunks [punk::ansi::ta::split_codes $overblock]
+            }
+            3 {
+                #it turns out line based chunks are faster than the above.. probably because some of those end up doing the regex splitting twice 
+                set lflines [list]
+                set inputchunks [split $overblock \n]
+                foreach ln $inputchunks {
+                    append ln \n
+                    lappend lflines $ln
                 }
-                2 {
-
-                    #split into lines if possible first - then into plaintext/ansi-sequence chunks ?
-                    set inputchunks [list ""] ;#put an empty plaintext split in for starters
-                    set i 1
-                    set lines [split $overblock \n]
-                    foreach ln $lines {
-                        if {$i < [llength $lines]} {
-                            append ln \n
-                        }
-                        set sequence_split [punk::ansi::ta::split_codes_single $ln]  ;#use split_codes Not split_codes_single?
-                        set lastpt [lindex $inputchunks end]
-                        lset inputchunks end [tcl::string::cat $lastpt [lindex $sequence_split 0]]
-                        lappend inputchunks {*}[lrange $sequence_split 1 end]
-                        incr i
-                    }
+                if {[llength $lflines]} {
+                    lset lflines end [tcl::string::range [lindex $lflines end] 0 end-1]
                 }
-                3 {
-                    #it turns out line based chunks are faster than the above.. probably because some of those end up doing the regex splitting twice 
-                    set lflines [list]
-                    set inputchunks [split $overblock \n]
-                    foreach ln $inputchunks {
-                        append ln \n
-                        lappend lflines $ln
-                    }
-                    if {[llength $lflines]} {
-                        lset lflines end [tcl::string::range [lindex $lflines end] 0 end-1]
-                    }
-                    set inputchunks $lflines[unset lflines]
+                set inputchunks $lflines[unset lflines]
 
-                }
             }
         }
 
@@ -409,7 +451,7 @@ tcl::namespace::eval overtype {
 
         set replay_codes_underlay [tcl::dict::create 1 ""] 
         #lappend replay_codes_overlay ""
-        set replay_codes_overlay ""
+        set replay_codes_overlay "[punk::ansi::a]"
         set unapplied ""
         set cursor_saved_position [tcl::dict::create] 
         set cursor_saved_attributes ""
@@ -420,11 +462,11 @@ tcl::namespace::eval overtype {
 
         #underlines are not necessarily processed in order - depending on cursor-moves applied from overtext
         set row 1
-        if {$data_mode} {
-            set col [_get_row_append_column $row] 
-        } else {
+        #if {$data_mode} {
+        #    set col [_get_row_append_column $row] 
+        #} else {
             set col $opt_startcolumn 
-        }
+        #}
 
         set instruction_stats [tcl::dict::create]
 
@@ -452,26 +494,34 @@ tcl::namespace::eval overtype {
             }
             #review insert_mode. As an 'overtype' function whose main function is not interactive keystrokes - insert is secondary - 
             #but even if we didn't want it as an option to the function call - to process ansi adequately we need to support IRM (insertion-replacement mode) ESC [ 4 h|l
-            set LASTCALL [list -info 1 -insert_mode $insert_mode -autowrap_mode $autowrap_mode -transparent $opt_transparent -width $colwidth  -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -cursor_column $col -cursor_row $row $undertext $overtext]
-            set rinfo [renderline   -experimental $opt_experimental\
+            set renderargs [list    -experimental $opt_experimental\
+                                    -cp437        $opt_cp437\
                                     -info 1\
+                                    -crm_mode $crm_mode\
                                     -insert_mode $insert_mode\
-                                    -cursor_restore_attributes $cursor_saved_attributes\
                                     -autowrap_mode $autowrap_mode\
+                                    -reverse_mode $reverse_mode\
+                                    -cursor_restore_attributes $cursor_saved_attributes\
                                     -transparent $opt_transparent\
-                                    -width $colwidth\
+                                    -width $renderwidth\
                                     -exposed1 $opt_exposed1\
                                     -exposed2 $opt_exposed2\
-                                    -overflow $opt_overflow\
+                                    -expand_right $opt_expand_right\
                                     -cursor_column $col\
                                     -cursor_row $row\
                                      $undertext\
                                      $overtext\
-                    ]
+                        ]
+            set LASTCALL $renderargs
+            set rinfo [renderline {*}$renderargs]
+
             set instruction                 [tcl::dict::get $rinfo instruction]
             set insert_mode                 [tcl::dict::get $rinfo insert_mode]
             set autowrap_mode               [tcl::dict::get $rinfo autowrap_mode] ;#
-            #set reverse_mode                [tcl::dict::get $rinfo reverse_mode];#how to support in rendered linelist? we need to examine all pt/code blocks and flip each SGR stack?
+            set reverse_mode                [tcl::dict::get $rinfo reverse_mode]
+            #how to support reverse_mode in rendered linelist? we need to examine all pt/code blocks and flip each SGR stack?
+            # - review - the answer is probably that we don't need to - it is set/reset only during application of overtext
+            set crm_mode                    [tcl::dict::get $rinfo crm_mode]
             set rendered                    [tcl::dict::get $rinfo result]
             set overflow_right              [tcl::dict::get $rinfo overflow_right]
             set overflow_right_column       [tcl::dict::get $rinfo overflow_right_column]
@@ -486,7 +536,37 @@ tcl::namespace::eval overtype {
             set insert_lines_below          [tcl::dict::get $rinfo insert_lines_below]
             tcl::dict::set replay_codes_underlay [expr {$renderedrow+1}] [tcl::dict::get $rinfo replay_codes_underlay]
             #lset replay_codes_overlay [expr $overidx+1] [tcl::dict::get $rinfo replay_codes_overlay]
-            set replay_codes_overlay        [tcl::dict::get $rinfo replay_codes_overlay]
+            set replay_codes_overlay    [tcl::dict::get $rinfo replay_codes_overlay]
+            if {0 && $reverse_mode} {
+                #test branch - todo - prune
+                puts stderr "---->[ansistring VIEW $replay_codes_overlay] rendered: $rendered"
+                #review
+                #JMN3
+                set existing_reverse_state 0 
+                #split_codes_single is single esc sequence - but could have multiple sgr codes within one esc sequence
+                #e.g \x1b\[0;31;7m  has a reset,colour red and reverse
+                set codeinfo [punk::ansi::codetype::sgr_merge [list $replay_codes_overlay] -info 1]
+                set codestate_reverse [dict get $codeinfo codestate reverse]
+                switch -- $codestate_reverse {
+                    7 {
+                        set existing_reverse_state 1
+                    }
+                    27 {
+                        set existing_reverse_state 0
+                    }
+                    "" {
+                    }
+                }
+                if {$existing_reverse_state == 0} {
+                    set rflip [a+ reverse]
+                } else {
+                    #reverse of reverse
+                    set rflip [a+ noreverse]
+                }
+                #note that mergeresult can have multiple esc (due to unmergeables or non sgr codes)
+                set replay_codes_overlay [punk::ansi::codetype::sgr_merge [list [dict get $codeinfo mergeresult] $rflip]]
+                puts stderr "---->[ansistring VIEW $replay_codes_overlay] rendered: $rendered"
+            }
 
 
 
@@ -515,29 +595,17 @@ tcl::namespace::eval overtype {
                 #keeping separate branches for debugging - review and merge as appropriate when stable
                 tcl::dict::incr instruction_stats $instruction 
                 switch -- $instruction {
-                    {} {
-                        if {$test_mode == 0} {
-                            incr row
-                            if {$data_mode} {
-                                set col [_get_row_append_column $row] 
-                                if {$col > $colwidth} {
+                    reset {
+                        #reset the 'renderspace terminal' (not underlying terminal)
+                        set row 1
+                        set col 1
 
-                                }
-                            } else {
-                                set col 1
-                            }
-                        } else {
-                            #lf included in data
-                            set row $post_render_row
-                            set col $post_render_col
 
-                            #set col 1
-                            #if {$post_render_row != $renderedrow} {
-                            #    set col 1
-                            #} else {
-                            #    set col $post_render_col
-                            #}
-                        }
+                    }
+                    {} {
+                        #lf included in data
+                        set row $post_render_row
+                        set col $post_render_col
                     }
                     up {
 
@@ -563,10 +631,10 @@ tcl::namespace::eval overtype {
                             #we need renderline to return the number of the maximum column filled (or min if we ever do r-to-l)
                             set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                             set lastdatacol [punk::ansi::printing_length $existingdata]
-                            if {$lastdatacol < $colwidth} {
+                            if {$lastdatacol < $renderwidth} {
                                 set col [expr {$lastdatacol+1}]
                             } else {
-                                set col $colwidth 
+                                set col $renderwidth 
                             }
                         }
                         
@@ -601,10 +669,10 @@ tcl::namespace::eval overtype {
                             }
                             set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                             set lastdatacol [punk::ansi::printing_length $existingdata]
-                            if {$lastdatacol < $colwidth} {
+                            if {$lastdatacol < $renderwidth} {
                                 set col [expr {$lastdatacol+1}]
                             } else {
-                                set col $colwidth 
+                                set col $renderwidth 
                             }
 
                         }
@@ -640,9 +708,16 @@ tcl::namespace::eval overtype {
 
                             puts stdout ">>>[a+ red bold]overflow_right during restore_cursor[a]"
 
-                            set sub_info [overtype::renderline -info 1 -width $colwidth -insert_mode $insert_mode -autowrap_mode $autowrap_mode  -overflow [tcl::dict::get $opts -overflow] "" $overflow_right]
+                            set sub_info [overtype::renderline -info 1\
+                                            -width $renderwidth\
+                                            -insert_mode $insert_mode\
+                                            -autowrap_mode $autowrap_mode\
+                                            -expand_right [tcl::dict::get $opts -opt_expand_right]\
+                                            ""\
+                                            $overflow_right\
+                                        ]
                             set foldline [tcl::dict::get $sub_info result]
-                            set insert_mode [tcl::dict::get $sub_info insert_mode] ;#probably not needed.. 
+                            set insert_mode [tcl::dict::get $sub_info insert_mode] ;#probably not needed..? 
                             set autowrap_mode [tcl::dict::get $sub_info autowrap_mode] ;#nor this..
                             linsert outputlines $renderedrow $foldline
                             #review - row & col set by restore - but not if there was no save..
@@ -671,7 +746,7 @@ tcl::namespace::eval overtype {
                         #overflow + unapplied?
                     }
                     lf_start {
-                        #raw newlines - must be test_mode
+                        #raw newlines 
                         # ----------------------
                         #test with fruit.ans
                         #test - treating as newline below...
@@ -687,48 +762,58 @@ tcl::namespace::eval overtype {
                     }
                     lf_mid {
 
-                            if 0 {
-                                #set rhswidth [punk::ansi::printing_length $overflow_right]
-                                #only show debug when we have overflow?
-                                set lhs [overtype::left -width 40 -wrap 1 "" [ansistring VIEWSTYLE -nul 1 -lf 1 -vt 1 $rendered]]
-                                set lhs [textblock::frame -title "rendered $visualwidth cols" -subtitle "row-$renderedrow" $lhs]
-
-                                set rhs ""
-                                if {$overflow_right ne ""} {
-                                    set rhs [overtype::left -width 40 -wrap 1 "" [ansistring VIEWSTYLE -nul 1 -lf 1 -vt 1 $overflow_right]]
-                                    set rhs [textblock::frame -title overflow_right $rhs]
-                                }
-                                puts [textblock::join $lhs " $post_render_col " $rhs]
-                            }
-
-                            if {!$test_mode} {
-                                #rendered 
-                                append rendered $overflow_right
-                                #set replay_codes_overlay "" 
+                            set edit_mode 0
+                            if {$edit_mode} {
+                                set inputchunks [linsert $inputchunks 0 $overflow_right$unapplied]
                                 set overflow_right ""
-
-
-                                set row $renderedrow
-
+                                set unapplied ""
+                                set row $post_render_row
+                                #set col $post_render_col
                                 set col $opt_startcolumn 
-                                incr row 
-                                #only add newline if we're at the bottom
                                 if {$row > [llength $outputlines]} {
                                     lappend outputlines {*}[lrepeat 1 ""]
                                 }
                             } else {
-                                set edit_mode 0
-                                if {$edit_mode} {
-                                    set inputchunks [linsert $inputchunks 0 $overflow_right$unapplied]
-                                    set overflow_right ""
-                                    set unapplied ""
+                                if 1 {
+                                    if {$overflow_right ne ""} {
+                                        if {$opt_expand_right} {
+                                            append rendered $overflow_right
+                                            set overflow_right ""
+                                        } else {
+                                            set  overflow_width [punk::ansi::printing_length $overflow_right]
+                                            if {$visualwidth + $overflow_width <= $renderwidth} {
+                                                append rendered $overflow_right
+                                                set overflow_right ""
+                                            } else {
+                                                if {$visualwidth < $renderwidth} {
+                                                    set graphemes [punk::char::grapheme_split $overflow_width]
+                                                    set add "" 
+                                                    set addlen $visualwidth
+                                                    set remaining_overflow $graphemes 
+                                                    foreach g $graphemes {
+                                                        set w [overtype::grapheme_width_cached]
+                                                        if {$addlen + $w <= $renderwidth} {
+                                                            append add $g
+                                                            incr addlen $w
+                                                            lpop remaining_overflow
+                                                        } else {
+                                                            break
+                                                        } 
+                                                    }
+                                                    append rendered $add
+                                                    set overflow_right [join $remaining_overflow ""]
+                                                }
+                                            }
+                                        }
+                                    }
                                     set row $post_render_row
-                                    #set col $post_render_col
                                     set col $opt_startcolumn 
                                     if {$row > [llength $outputlines]} {
                                         lappend outputlines {*}[lrepeat 1 ""]
                                     }
                                 } else {
+                                    #old version - known to work with various ansi graphics - e.g fruit.ans
+                                    # - but fails to limit lines to renderwidth when expand_right == 0
                                     append rendered $overflow_right
                                     set overflow_right ""
                                     set row $post_render_row
@@ -740,7 +825,7 @@ tcl::namespace::eval overtype {
                             }
                     }
                     lf_overflow {
-                            #linefeed after colwidth e.g at column 81 for an 80 col width
+                            #linefeed after renderwidth e.g at column 81 for an 80 col width
                             #we may also have other control sequences that came after col 80 e.g cursor save
 
                             if 0 {
@@ -787,38 +872,28 @@ tcl::namespace::eval overtype {
                             set row $post_render_row
                             set col $post_render_col
                             if {$insert_lines_below == 1} {
-                                if {$test_mode == 0} {
-                                    set row $renderedrow
-                                    set outputlines [linsert $outputlines [expr {$renderedrow }] {*}[lrepeat $insert_lines_below ""]] ;#note - linsert can add to end too
-                                    incr row $insert_lines_below
-                                    set col $opt_startcolumn 
-                                } else {
-                                    #set lhs [overtype::left -width 40 -wrap 1 "" [ansistring VIEWSTYLE -lf 1 -vt 1 $rendered]]
-                                    #set lhs [textblock::frame -title rendered -subtitle "row-$renderedrow" $lhs]
-                                    #set rhs ""
-                                    #if {$overflow_right ne ""} {
-                                    #    set rhs [overtype::left -width 40 -wrap 1 "" [ansistring VIEWSTYLE -lf 1 -vt 1 $overflow_right]]
-                                    #    set rhs [textblock::frame -title overflow_right $rhs]
-                                    #}
-                                    #puts [textblock::join $lhs $rhs]
-
-                                    #rendered 
-                                    append rendered $overflow_right
-                                    #
-
-
-                                    set overflow_right ""
-                                    set row $renderedrow
-                                    #only add newline if we're at the bottom
-                                    if {$row > [llength $outputlines]} {
-                                        lappend outputlines {*}[lrepeat $insert_lines_below ""]
-                                    }
-                                    incr row $insert_lines_below
-                                    set col $opt_startcolumn 
+                                #set lhs [overtype::left -width 40 -wrap 1 "" [ansistring VIEWSTYLE -lf 1 -vt 1 $rendered]]
+                                #set lhs [textblock::frame -title rendered -subtitle "row-$renderedrow" $lhs]
+                                #set rhs ""
+                                #if {$overflow_right ne ""} {
+                                #    set rhs [overtype::left -width 40 -wrap 1 "" [ansistring VIEWSTYLE -lf 1 -vt 1 $overflow_right]]
+                                #    set rhs [textblock::frame -title overflow_right $rhs]
+                                #}
+                                #puts [textblock::join $lhs $rhs]
 
+                                #rendered 
+                                append rendered $overflow_right
+                                #
 
 
+                                set overflow_right ""
+                                set row $renderedrow
+                                #only add newline if we're at the bottom
+                                if {$row > [llength $outputlines]} {
+                                    lappend outputlines {*}[lrepeat $insert_lines_below ""]
                                 }
+                                incr row $insert_lines_below
+                                set col $opt_startcolumn 
                             }
                         } else {
                             set row $post_render_row
@@ -833,10 +908,10 @@ tcl::namespace::eval overtype {
                             } else {
                                 set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                                 set lastdatacol [punk::ansi::printing_length $existingdata]
-                                if {$lastdatacol < $colwidth} {
+                                if {$lastdatacol < $renderwidth} {
                                     set col [expr {$lastdatacol+1}]
                                 } else {
-                                    set col $colwidth 
+                                    set col $renderwidth 
                                 }
                             }
                         }
@@ -845,12 +920,12 @@ tcl::namespace::eval overtype {
                         #doesn't seem to be used by fruit.ans testfile
                         #used by dzds.ans
                         #note that cursor_forward may move deep into the next line - or even span multiple lines !TODO
-                        set c $colwidth 
+                        set c $renderwidth 
                         set r $post_render_row
-                        if {$post_render_col > $colwidth} {
+                        if {$post_render_col > $renderwidth} {
                             set i $c
                             while {$i <= $post_render_col} {
-                                if {$c == $colwidth+1} {
+                                if {$c == $renderwidth+1} {
                                     incr r
                                     if {$opt_appendlines} {
                                         if {$r < [llength $outputlines]} {
@@ -874,7 +949,7 @@ tcl::namespace::eval overtype {
                         set col $c
                     }
                     wrapmovebackward {
-                        set c $colwidth
+                        set c $renderwidth
                         set r $post_render_row
                         if {$post_render_col < 1} {
                             set c 1 
@@ -883,7 +958,7 @@ tcl::namespace::eval overtype {
                                 if {$c == 0} {
                                     if {$r > 1} {
                                         incr r -1
-                                        set c $colwidth
+                                        set c $renderwidth
                                     } else {
                                         #leave r at 1 set c 1
                                         #testfile besthpav.ans first line top left border alignment
@@ -910,7 +985,6 @@ tcl::namespace::eval overtype {
                             incr row
                             set col $opt_startcolumn ;#whether wrap or not - next data is at column 1  ??
                         } else {
-                            #this works for test_mode (which should become the default) - but could give a bad result otherwise - review - add tests fix.
                             set col $post_render_col
                             #set unapplied ""             ;#this seems wrong?
                             #set unapplied [tcl::string::range $unapplied 1 end] 
@@ -941,7 +1015,7 @@ tcl::namespace::eval overtype {
                         #2nd half of grapheme would overflow - treggering grapheme is returned in unapplied. There may also be overflow_right from earlier inserts
                         #todo - consider various options .. re-render a single trailing space or placeholder on same output line, etc
                         if {$autowrap_mode} {
-                            if {$colwidth < 2} {
+                            if {$renderwidth < 2} {
                                 #edge case of rendering to a single column output - any 2w char will just cause a loop if we don't substitute with something, or drop the character
                                 set idx 0
                                 set triggering_grapheme_index -1
@@ -960,7 +1034,7 @@ tcl::namespace::eval overtype {
                         } else {
                             set overflow_handled 1
                             #handled by dropping entire overflow if any  
-                            if {$colwidth < 2} {
+                            if {$renderwidth < 2} {
                                 set idx 0
                                 set triggering_grapheme_index -1
                                 foreach u $unapplied_list {
@@ -988,7 +1062,7 @@ tcl::namespace::eval overtype {
                 }
 
 
-            if {!$opt_overflow && !$autowrap_mode} {
+            if {!$opt_expand_right && !$autowrap_mode} {
                 #not allowed to overflow column or wrap therefore we get overflow data to truncate 
                 if {[tcl::dict::get $opts -ellipsis]} {
                     set show_ellipsis 1
@@ -1066,7 +1140,6 @@ tcl::namespace::eval overtype {
                 set debugmsg ""
                 append debugmsg "${Y}${sep_header}${RST}" \n
                 append debugmsg "looplimit $looplimit reached\n"
-                append debugmsg "test_mode:$test_mode\n"
                 append debugmsg "data_mode:$data_mode\n"
                 append debugmsg "opt_appendlines:$opt_appendlines\n"
                 append debugmsg "prev_row :[tcl::dict::get $LASTCALL -cursor_row]\n"
@@ -1141,12 +1214,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        #set renderwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
-        #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {$colwidth - $overblock_width}]
+        set under_exposed_max [expr {$renderwidth - $overblock_width}]
         if {$under_exposed_max > 0} {
             #background block is wider
             if {$under_exposed_max % 2 == 0} {
@@ -1176,14 +1248,14 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 set undertext "$undertext[string repeat { } $udiff]"
             }
             set undertext [tcl::string::cat $replay_codes_underlay $undertext]
             set overtext  [tcl::string::cat $replay_codes_overlay $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             #review - right-to-left langs should elide on left! - extra option required
 
             if {$overflowlength > 0} {
@@ -1196,8 +1268,8 @@ tcl::namespace::eval overtype {
 
                 #overlay line data is wider - trim if overflow not specified in opts - and overtype an ellipsis at right if it was specified
                 if {![tcl::dict::get $opts -overflow]} {
-                    #lappend outputlines [tcl::string::range $overtext 0 [expr {$colwidth - 1}]]
-                    #set overtext [tcl::string::range $overtext 0 $colwidth-1 ]
+                    #lappend outputlines [tcl::string::range $overtext 0 [expr {$renderwidth - 1}]]
+                    #set overtext [tcl::string::range $overtext 0 $renderwidth-1 ]
                     if {$opt_ellipsis} {
                         set show_ellipsis 1
                         if {!$opt_ellipsiswhitespace} {
@@ -1286,12 +1358,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
         #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {max(0,$colwidth - $overblock_width)}]
+        set under_exposed_max [expr {max(0,$renderwidth - $overblock_width)}]
         set left_exposed $under_exposed_max 
 
 
@@ -1307,8 +1378,8 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 #puts xxx
                 append undertext [string repeat { } $udiff]
             }
@@ -1336,10 +1407,17 @@ tcl::namespace::eval overtype {
             set undertext [tcl::string::cat $replay_codes_underlay $undertext]
             set overtext [tcl::string::cat $replay_codes_overlay $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             if {$overflowlength > 0} {	
                 #raw overtext wider than undertext column
-                set rinfo [renderline -info 1 -insert_mode 0 -transparent $opt_transparent -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -startcolumn [expr {1 + $startoffset}] $undertext $overtext]
+                set rinfo [renderline\
+                         -info 1\
+                         -insert_mode 0\
+                         -transparent $opt_transparent\
+                         -exposed1 $opt_exposed1 -exposed2 $opt_exposed2\
+                         -overflow $opt_overflow\
+                         -startcolumn [expr {1 + $startoffset}]\
+                         $undertext $overtext]
                 set replay_codes          [tcl::dict::get $rinfo replay_codes]
                 set rendered [tcl::dict::get $rinfo result]
                 if {!$opt_overflow} {
@@ -1364,7 +1442,7 @@ tcl::namespace::eval overtype {
                 #padded overtext 
                 #lappend outputlines [renderline -insert_mode 0 -transparent $opt_transparent -startcolumn [expr {$left_exposed + 1}] $undertext $overtext]
                 #Note - we still need overflow here - as although the overtext is short - it may oveflow due to the startoffset
-                set rinfo [renderline -info 1  -insert_mode 0 -transparent $opt_transparent -overflow $opt_overflow -startcolumn [expr {$left_exposed + 1 + $startoffset}] $undertext $overtext]
+                set rinfo [renderline -info 1  -insert_mode 0 -transparent $opt_transparent -expand_right $opt_overflow -startcolumn [expr {$left_exposed + 1 + $startoffset}] $undertext $overtext]
                 lappend outputlines  [tcl::dict::get $rinfo result]
             }
             set replay_codes          [tcl::dict::get $rinfo replay_codes]
@@ -1433,12 +1511,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
         #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {max(0,$colwidth - $overblock_width)}]
+        set under_exposed_max [expr {max(0,$renderwidth - $overblock_width)}]
 
         switch -- $opt_blockalign {
             left {
@@ -1484,8 +1561,8 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 #puts xxx
                 append undertext [string repeat { } $udiff]
             }
@@ -1513,10 +1590,10 @@ tcl::namespace::eval overtype {
             set undertext   [tcl::string::cat $replay_codes_underlay    $undertext]
             set overtext    [tcl::string::cat $replay_codes_overlay     $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             if {$overflowlength > 0} {	
                 #raw overtext wider than undertext column
-                set rinfo [renderline -info 1 -insert_mode 0 -transparent $opt_transparent -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -startcolumn [expr {1 + $startoffset}] $undertext $overtext]
+                set rinfo [renderline -info 1 -insert_mode 0 -transparent $opt_transparent -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -expand_right $opt_overflow -startcolumn [expr {1 + $startoffset}] $undertext $overtext]
                 set replay_codes    [tcl::dict::get $rinfo replay_codes]
                 set rendered        [tcl::dict::get $rinfo result]
                 set overflow_right  [tcl::dict::get $rinfo overflow_right]
@@ -1564,8 +1641,9 @@ tcl::namespace::eval overtype {
             } else {
                 #padded overtext 
                 #lappend outputlines [renderline -insert_mode 0 -transparent $opt_transparent -startcolumn [expr {$left_exposed + 1}] $undertext $overtext]
-                #Note - we still need overflow here - as although the overtext is short - it may oveflow due to the startoffset
-                set rinfo [renderline -info 1  -insert_mode 0 -transparent $opt_transparent -overflow $opt_overflow -startcolumn [expr {$left_exposed + 1 + $startoffset}] $undertext $overtext]
+                #Note - we still need expand_right here - as although the overtext is short - it may oveflow due to the startoffset
+                set rinfo [renderline -info 1  -insert_mode 0 -transparent $opt_transparent -expand_right $opt_overflow -startcolumn [expr {$left_exposed + 1 + $startoffset}] $undertext $overtext]
+                #puts stderr "--> [ansistring VIEW -lf 1 -nul 1 $rinfo] <--"
                 set overflow_right  [tcl::dict::get $rinfo overflow_right]
                 set unapplied       [tcl::dict::get $rinfo unapplied]
                 lappend outputlines [tcl::dict::get $rinfo result]
@@ -1586,7 +1664,8 @@ tcl::namespace::eval overtype {
     #-returnextra enables returning of overflow and length
     #review - use punk::ansi::ta::detect to short-circuit processing and do simpler string calcs as an optimisation?
     #review - DECSWL/DECDWL double width line codes - very difficult/impossible to align and compose with other elements
-    #(could render it by faking it with sixels and a lot of work - find/make a sixel font and ensure it's exactly 2 cols per char)
+    #(could render it by faking it with sixels and a lot of work - find/make a sixel font and ensure it's exactly 2 cols per char?
+    # This would probably be impractical to support for different fonts)
     #todo - review transparency issues with single/double width characters
     #bidi - need a base direction and concept of directional runs for RTL vs LTR - may be best handled at another layer?
     proc renderline {args} {
@@ -1608,8 +1687,10 @@ tcl::namespace::eval overtype {
         #[para] The main 3 are the result, overflow_right, and unapplied.
         #[para] Renderline handles cursor movements from either keystrokes or ANSI sequences but for a full system the aforementioned loop will need to be in place to manage the set of lines under manipulation.
 
+        #puts stderr "renderline '$args'"
+
         if {[llength $args] < 2} {
-            error {usage: ?-info 0|1? ?-startcolumn <int>? ?-cursor_column <int>? ?-cursor_row <int>|""? ?-transparent [0|1|<regexp>]?  ?-overflow [1|0]? undertext overtext}
+            error {usage: ?-info 0|1? ?-startcolumn <int>? ?-cursor_column <int>? ?-cursor_row <int>|""? ?-transparent [0|1|<regexp>]?  ?-expand_right [1|0]? undertext overtext}
         }
         lassign [lrange $args end-1 end] under over
         if {[string first \n $under] >= 0} {
@@ -1623,12 +1704,13 @@ tcl::namespace::eval overtype {
         set opts [tcl::dict::create\
             -etabs         0\
             -width         \uFFEF\
-            -overflow      0\
+            -expand_right  0\
             -transparent   0\
             -startcolumn   1\
             -cursor_column 1\
             -cursor_row    ""\
             -insert_mode   1\
+            -crm_mode      0\
             -autowrap_mode 1\
             -reverse_mode  0\
             -info          0\
@@ -1643,13 +1725,15 @@ tcl::namespace::eval overtype {
         #cursor_row, when numeric will allow detection of certain row moves that are still within our row - allowing us to avoid an early return
         #An empty string for cursor_row tells us we have no info about our own row context, and to return with an unapplied string if any row move occurs
 
-        #exposed1 and exposed2 for first and second col of underying 2wide char which is truncated by transparency or overflow
+        #exposed1 and exposed2 for first and second col of underying 2wide char which is truncated by transparency, currsor movements to 2nd charcol, or overflow/expand_right
         #todo - return info about such grapheme 'cuts' in -info structure and/or create option to raise an error
 
         set argsflags [lrange $args 0 end-2]
         tcl::dict::for {k v} $argsflags {
             switch -- $k {
-                -experimental - -cp437 - -width - -overflow - -transparent - -startcolumn - -cursor_column - -cursor_row - -insert_mode - -autowrap_mode - -reverse_mode - -info - -exposed1 - -exposed2 - -cursor_restore_attributes {
+                -experimental - -cp437 - -width - -expand_right - -transparent - -startcolumn - -cursor_column - -cursor_row
+                - -crm_mode - -insert_mode - -autowrap_mode - -reverse_mode
+                - -info - -exposed1 - -exposed2 - -cursor_restore_attributes {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -1660,7 +1744,7 @@ tcl::namespace::eval overtype {
         # -- --- --- --- --- --- --- --- --- --- --- ---
         set opt_width               [tcl::dict::get $opts -width]
         set opt_etabs               [tcl::dict::get $opts -etabs]
-        set opt_overflow            [tcl::dict::get $opts -overflow]
+        set opt_expand_right        [tcl::dict::get $opts -expand_right]
         set opt_colstart            [tcl::dict::get $opts -startcolumn] ;#lhs limit for overlay - an offset to cursor_column  - first visible column is 1.  0 or < 0 are before the start of the underlay 
         set opt_colcursor           [tcl::dict::get $opts -cursor_column];#start cursor column relative to overlay
         set opt_row_context         [tcl::dict::get $opts -cursor_row]
@@ -1676,20 +1760,11 @@ tcl::namespace::eval overtype {
         # -- --- --- --- --- --- --- --- --- --- --- ---
         set opt_autowrap_mode       [tcl::dict::get $opts -autowrap_mode] ;#DECAWM - char or movement can go beyond leftmost/rightmost col to prev/next line
         set opt_reverse_mode        [tcl::dict::get $opts -reverse_mode]  ;#DECSNM
+        set opt_crm_mode            [tcl::dict::get $opts -crm_mode];# CRM - show control character mode
         # -- --- --- --- --- --- --- --- --- --- --- ---
         set temp_cursor_saved       [tcl::dict::get $opts -cursor_restore_attributes]
 
-        set test_mode 0
         set cp437_glyphs [tcl::dict::get $opts -cp437] 
-        foreach e [tcl::dict::get $opts -experimental] {
-            switch -- $e {
-                test_mode {
-                    set test_mode 1
-                    set cp437_glyphs 1
-                }
-            }
-        }
-        set test_mode 1  ;#try to elminate
         set cp437_map [tcl::dict::create]
         if {$cp437_glyphs} {
             set cp437_map [set ::punk::ansi::cp437_map]
@@ -1721,6 +1796,10 @@ tcl::namespace::eval overtype {
             set cursor_row $opt_row_context
         }
 
+        set insert_mode $opt_insert_mode ;#default 1
+        set autowrap_mode $opt_autowrap_mode ;#default 1
+        set crm_mode $opt_crm_mode ;#default 0 (Show Control Character mode)
+        set reverse_mode $opt_reverse_mode
 
         #-----
         #
@@ -1768,13 +1847,14 @@ tcl::namespace::eval overtype {
         }
         set understacks [list]
         set understacks_gx [list]
+        set pm_list [list]
 
         set i_u -1  ;#underlay may legitimately be empty
         set undercols [list] 
         set u_codestack [list]
         #u_gx_stack probably isn't really a stack -  I don't know if g0 g1 can stack or not - for now we support only g0 anyway
         set u_gx_stack [list] ;#separate stack for g0 (g1 g2 g3?) graphics on and off (DEC special graphics)
-        #set pt_underchars "" ;#for string_columns length calculation for overflow 0 truncation
+        #set pt_underchars "" ;#for string_columns length calculation for expand_right 0 truncation
         set remainder [list] ;#for returnextra
         foreach {pt code} $undermap {
             #pt = plain text
@@ -1834,6 +1914,7 @@ tcl::namespace::eval overtype {
             #underlay should already have been rendered and not have non-sgr codes - but let's retain the check for them and not stack them if other codes are here
 
             #only stack SGR (graphics rendition) codes - not title sets, cursor moves etc 
+            #keep any remaining PMs in place
             if {$code ne ""} {
                 set c1c2 [tcl::string::range $code 0 1]
 
@@ -1841,6 +1922,8 @@ tcl::namespace::eval overtype {
                     \x1b\[          7CSI\
                     \x9b            8CSI\
                     \x1b\(          7GFX\
+                    \x1b^           7PMX\
+                    \x1bX           7SOS\
                 ] $c1c2] 0 3];# leadernorm is 1st 2 chars mapped to normalised indicator - or is original 2 chars
 
                 switch -- $leadernorm {
@@ -1875,6 +1958,26 @@ tcl::namespace::eval overtype {
                             }
                         }
                     }
+                    7PMX - 7SOS {
+                        #we can have PMs or SOS (start of string) in the underlay - though mostly the PMs should have been processed..
+                        #attach the PM/SOS (entire ANSI sequence) to the previous grapheme! 
+                        #It should not affect the size - but terminal display may get thrown out if terminal doesn't support them.
+
+                        #note that there may in theory already be ANSI stored - we don't assume it was a pure grapheme string
+                        set graphemeplus [lindex $undercols end]
+                        if {$graphemeplus ne "\0"} {
+                            append graphemeplus $code
+                        } else {
+                            set graphemeplus $code
+                        }
+                        lset undercols end $graphemeplus
+                        #The grapheme_width_cached function will be called on this later - and doesn't account for ansi.
+                        #we need to manually cache the item with it's proper width 
+                        variable grapheme_widths
+                        #stripped and plus version  keys pointing to same length
+                        dict set grapheme_widths $graphemeplus [grapheme_width_cached [::punk::ansi::ansistrip $graphemeplus]]
+
+                    }
                     default {
 
                     }
@@ -1895,51 +1998,29 @@ tcl::namespace::eval overtype {
             #consider also if there are other codes that should be stacked..?
         }
 
-        if {!$test_mode} {
-            #fill columns to width with spaces, and carry over stacks - we will have to keep track of where the underlying data ends manually - TODO
-            #Specifying a width is suitable for terminal-like applications and text-blocks
-            if {$opt_width ne "\uFFEF"} {
-                if {[llength $understacks]} {
-                    set cs $u_codestack
-                    set gs $u_gx_stack
-                } else {
-                    set cs [list]
-                    set gs [list]
-                }
-                if {[llength $undercols]< $opt_width} {
-                    set diff [expr {$opt_width- [llength $undercols]}]
-                    if {$diff > 0} {
-                        lappend undercols       {*}[lrepeat $diff " "]
-                        lappend understacks     {*}[lrepeat $diff $cs]
-                        lappend understacks_gx  {*}[lrepeat $diff $gs]
-                    }
-                }
+        #NULL empty cell indicator
+        if {$opt_width ne "\uFFEF"} {
+            if {[llength $understacks]} {
+                set cs $u_codestack
+                set gs $u_gx_stack
+            } else {
+                set cs [list]
+                set gs [list]
             }
-        } else {
-            #NULL empty cell indicator
-            if {$opt_width ne "\uFFEF"} {
-                if {[llength $understacks]} {
-                    set cs $u_codestack
-                    set gs $u_gx_stack
-                } else {
-                    set cs [list]
-                    set gs [list]
-                }
-                if {[llength $undercols]< $opt_width} {
-                    set diff [expr {$opt_width- [llength $undercols]}]
-                    if {$diff > 0} {
-                        lappend undercols       {*}[lrepeat $diff "\u0000"]
-                        lappend understacks     {*}[lrepeat $diff $cs]
-                        lappend understacks_gx  {*}[lrepeat $diff $gs]
-                    }
+            if {[llength $undercols]< $opt_width} {
+                set diff [expr {$opt_width- [llength $undercols]}]
+                if {$diff > 0} {
+                    lappend undercols       {*}[lrepeat $diff "\u0000"]
+                    lappend understacks     {*}[lrepeat $diff $cs]
+                    lappend understacks_gx  {*}[lrepeat $diff $gs]
                 }
             }
-
         }
+
         if {$opt_width ne "\uFFEF"} {
-            set colwidth $opt_width
+            set renderwidth $opt_width
         } else {
-            set colwidth [llength $undercols]
+            set renderwidth [llength $undercols]
         }
 
 
@@ -2017,12 +2098,34 @@ tcl::namespace::eval overtype {
             }
             append pt_overchars $pt
             #will get empty pt between adjacent codes
-            foreach grapheme [punk::char::grapheme_split $pt] {
-                lappend overstacks $o_codestack
-                lappend overstacks_gx $o_gxstack
-                incr i_o 
-                lappend overlay_grapheme_control_list [list g $grapheme]
-                lappend overlay_grapheme_control_stacks $o_codestack
+            if {!$crm_mode} {
+                foreach grapheme [punk::char::grapheme_split $pt] {
+                    lappend overstacks $o_codestack
+                    lappend overstacks_gx $o_gxstack
+                    incr i_o 
+                    lappend overlay_grapheme_control_list [list g $grapheme]
+                    lappend overlay_grapheme_control_stacks $o_codestack
+                }
+            } else {
+                set tsbegin [clock micros]
+                foreach grapheme_original [punk::char::grapheme_split $pt] {
+                    set pt_crm [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $grapheme_original]
+                    #puts stderr "ptlen [string length $pt] graphemelen[string length $grapheme_original] pt_crmlen[string length $pt_crm] $pt_crm"
+                    foreach grapheme [punk::char::grapheme_split $pt_crm] {
+                        if {$grapheme eq "\n"} {
+                            lappend overlay_grapheme_control_stacks $o_codestack
+                            lappend overlay_grapheme_control_list [list crmcontrol "\x1b\[00001E"]
+                        } else {
+                            lappend overstacks $o_codestack
+                            lappend overstacks_gx $o_gxstack
+                            incr i_o 
+                            lappend overlay_grapheme_control_list [list g $grapheme]
+                            lappend overlay_grapheme_control_stacks $o_codestack
+                        }
+                    }
+                }
+                set elapsed [expr {[clock micros] - $tsbegin}]
+                puts stderr "ptlen [string length $pt] elapsedus:$elapsed"
             }
 
             #only stack SGR (graphics rendition) codes - not title sets, cursor moves etc 
@@ -2030,40 +2133,91 @@ tcl::namespace::eval overtype {
             # that pure resets are fairly common - more so than leading resets with other info
             # that non-sgr codes are not that common, so ok to check for resets before verifying it is actually SGR at all.
             if {$code ne ""} {
-                lappend overlay_grapheme_control_stacks $o_codestack
-                #there will always be an empty code at end due to foreach on 2 vars with odd-sized list ending with pt (overmap coming from perlish split) 
-                if {[punk::ansi::codetype::is_sgr_reset $code]} {
-                    set o_codestack [list "\x1b\[m"]  ;#reset better than empty list - fixes some ansi art issues
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
-                    set o_codestack [list $code]
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[priv::is_sgr $code]} {
-                    #basic simplification first - remove straight dupes
-                    set dup_posns [lsearch -all -exact $o_codestack $code] ;#must be -exact because of square-bracket glob chars
-                    set o_codestack [lremove $o_codestack {*}$dup_posns]
-                    lappend o_codestack $code
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[regexp {\x1b7|\x1b\[s} $code]} {
-                    #experiment
-                    #cursor_save - for the replays review.
-                    #jmn
-                    #set temp_cursor_saved [punk::ansi::codetype::sgr_merge_list {*}$o_codestack]
-                    lappend overlay_grapheme_control_list [list other $code]
-                } elseif {[regexp {\x1b8|\x1b\[u} $code]} {
-                    #experiment
-                    #cursor_restore - for the replays
-                    set o_codestack [list $temp_cursor_saved]    
-                    lappend overlay_grapheme_control_list [list other $code]
+                #we need to immediately set crm_mode here if \x1b\[3h received
+                if {$code eq "\x1b\[3h"} {
+                    set crm_mode 1
+                } elseif {$code eq "\x1b\[3l"} {
+                    set crm_mode 0
+                }
+                #else crm_mode could be set either way from options
+                if {$crm_mode && $code ne "\x1b\[00001E"} {
+                    #treat the code as type 'g' like above   - only allow through codes to reset mode REVIEW for now just \x1b\[3l ? 
+                    #we need to somehow convert further \n in the graphical rep to an instruction for newline that will bypass further crm_mode processing or we would loop.
+                    set code_as_pt [ansistring VIEW -nul 1 -lf 1 -vt 1 -ff 1 $code]
+                    #split using standard split for first foreach loop - grapheme based split when processing 2nd foreach loop
+                    set chars [split $code_as_pt ""]
+                    set codeparts [list] ;#list of 2-el lists each element {crmcontrol <ansi>} or {g <text>}
+                    foreach c $chars {
+                        if {$c eq "\n"} {
+                            #use CNL (cursor next line)  \x1b\[00001E  ;#leading zeroes ok for this processor - used as debugging aid to distinguish 
+                            lappend codeparts [list crmcontrol "\x1b\[00001E"]
+                        } else {
+                            if {[llength $codeparts] > 0 && [lindex $codeparts end 0] eq "g"} {
+                                set existing [lindex $codeparts end 1]
+                                lset codeparts end [list g [string cat $existing $c]]
+                            } else {
+                                lappend codeparts [list g $c]
+                            }
+                        }
+                    }
+
+                    set partidx 0
+                    foreach record $codeparts {
+                        lassign $record rtype rval
+                        switch -exact -- $rtype {
+                            g {
+                                append pt_overchars $rval 
+                                foreach grapheme [punk::char::grapheme_split $rval] {
+                                    lappend overstacks $o_codestack
+                                    lappend overstacks_gx $o_gxstack
+                                    incr i_o 
+                                    lappend overlay_grapheme_control_list [list g $grapheme]
+                                    lappend overlay_grapheme_control_stacks $o_codestack
+                                }
+                            }
+                            crmcontrol {
+                                #leave o_codestack
+                                lappend overlay_grapheme_control_stacks $o_codestack
+                                lappend overlay_grapheme_control_list [list crmcontrol $rval]
+                            }
+                        }
+                    }
                 } else {
-                    if {[punk::ansi::codetype::is_gx_open $code]} {
-                        set o_gxstack [list "gx0_on"]
-                        lappend overlay_grapheme_control_list [list gx0 gx0_on] ;#don't store code - will complicate debugging if we spit it out and jump character sets
-                    } elseif {[punk::ansi::codetype::is_gx_close $code]} {
-                        set o_gxstack [list]
-                        lappend overlay_grapheme_control_list [list gx0 gx0_off] ;#don't store code - will complicate debugging if we spit it out and jump character sets
-                    } else {
+                    lappend overlay_grapheme_control_stacks $o_codestack
+                    #there will always be an empty code at end due to foreach on 2 vars with odd-sized list ending with pt (overmap coming from perlish split) 
+                    if {[punk::ansi::codetype::is_sgr_reset $code]} {
+                        set o_codestack [list "\x1b\[m"]  ;#reset better than empty list - fixes some ansi art issues
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
+                        set o_codestack [list $code]
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[priv::is_sgr $code]} {
+                        #basic simplification first - remove straight dupes
+                        set dup_posns [lsearch -all -exact $o_codestack $code] ;#must be -exact because of square-bracket glob chars
+                        set o_codestack [lremove $o_codestack {*}$dup_posns]
+                        lappend o_codestack $code
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[regexp {\x1b7|\x1b\[s} $code]} {
+                        #experiment
+                        #cursor_save - for the replays review.
+                        #jmn
+                        #set temp_cursor_saved [punk::ansi::codetype::sgr_merge_list {*}$o_codestack]
+                        lappend overlay_grapheme_control_list [list other $code]
+                    } elseif {[regexp {\x1b8|\x1b\[u} $code]} {
+                        #experiment
+                        #cursor_restore - for the replays
+                        set o_codestack [list $temp_cursor_saved]    
                         lappend overlay_grapheme_control_list [list other $code]
+                    } else {
+                        if {[punk::ansi::codetype::is_gx_open $code]} {
+                            set o_gxstack [list "gx0_on"]
+                            lappend overlay_grapheme_control_list [list gx0 gx0_on] ;#don't store code - will complicate debugging if we spit it out and jump character sets
+                        } elseif {[punk::ansi::codetype::is_gx_close $code]} {
+                            set o_gxstack [list]
+                            lappend overlay_grapheme_control_list [list gx0 gx0_off] ;#don't store code - will complicate debugging if we spit it out and jump character sets
+                        } else {
+                            lappend overlay_grapheme_control_list [list other $code]
+                        }
                     }
                 }
             }
@@ -2089,11 +2243,12 @@ tcl::namespace::eval overtype {
 
         # -- --- ---
         #we need to initialise overflow_idx before any potential row-movements - as they need to perform a loop break and force in_excess to 1 
-        if {$opt_overflow} {
-            #somewhat counterintuitively - overflow true means we can have lines as long as we want, but either way there can be excess data that needs to be thrown back to the calling loop.
+        if {$opt_expand_right} {
+            #expand_right true means we can have lines as long as we want, but either way there can be excess data that needs to be thrown back to the calling loop.
+            #we currently only support horizontal expansion to the right (review regarding RTL text!)
             set overflow_idx -1
         } else {
-            #overflow zero - we can't grow beyond our column width - so we get ellipsis or truncation 
+            #expand_right zero - we can't grow beyond our column width - so we get ellipsis or truncation 
             if {$opt_width ne "\uFFEF"} {
                 set overflow_idx [expr {$opt_width}]
             } else {
@@ -2134,10 +2289,7 @@ tcl::namespace::eval overtype {
 
         #movements only occur within the overlay range.
         #an underlay is however not necessary.. e.g
-        #renderline -overflow 1 "" data 
-        #foreach {pt code} $overmap {}
-        set insert_mode $opt_insert_mode ;#default 1
-        set autowrap_mode $opt_autowrap_mode ;#default 1
+        #renderline -expand_right 1 "" data 
 
         #set re_mode        {\x1b\[\?([0-9]*)(h|l)}   ;#e.g DECAWM 
         #set re_col_move    {\x1b\[([0-9]*)(C|D|G)$}
@@ -2163,13 +2315,28 @@ tcl::namespace::eval overtype {
             switch -- $type {
                 g { 
                     set ch $item 
+                    #crm_mode affects both graphic and control 
+                    if {0 && $crm_mode} {
+                        set chars [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $ch]
+                        set chars [string map [list \n "\x1b\[00001E"] $chars]
+                        if {[llength [split $chars ""]] > 1} { 
+                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                            #prefix the unapplied controls with the string version of this control
+                            set unapplied_list [linsert $unapplied_list 0 {*}[split $chars ""]]
+                            set unapplied [join $unapplied_list ""]
+                            #incr idx_over
+                            break
+                        } else {
+                            set ch $chars
+                        }
+                    }
                     incr idx_over; #idx_over (until unapplied reached anyway) is per *grapheme* in the overlay - not per col. 
                     if {($idx < ($opt_colstart -1))} {
                         incr idx [grapheme_width_cached $ch]
                         continue
                     }
                     #set within_undercols [expr {$idx <= [llength $undercols]-1}] ;#within our active data width 
-                    set within_undercols [expr {$idx <= $colwidth-1}]
+                    set within_undercols [expr {$idx <= $renderwidth-1}]
 
                     #https://www.enigma.com/resources/blog/the-secret-world-of-newline-characters
                     #\x85 NEL in the c1 control set is treated by some terminal emulators (e.g Hyper) as a newline,
@@ -2194,7 +2361,7 @@ tcl::namespace::eval overtype {
                                 #linefeed after final column
                                 #puts "---c <lf> at overflow_idx=$overflow_idx" 
                                 incr cursor_row 
-                                set overflow_idx $idx     ;#override overflow_idx even if it was set to -1 due to opt_overflow = 1|2
+                                set overflow_idx $idx     ;#override overflow_idx even if it was set to -1 due to expand_right = 1
                                 set instruction lf_overflow ;#only special treatment is to give it it's own instruction in case caller needs to handle differently
                                 priv::render_unapplied $overlay_grapheme_control_list $gci
                                 break
@@ -2202,7 +2369,10 @@ tcl::namespace::eval overtype {
                                 #linefeed occurred in middle or at end of text
                                 #puts "---mid-or-end-text-linefeed idx:$idx overflow_idx:$overflow_idx"
                                 incr cursor_row 
-                                set overflow_idx $idx     ;#override overflow_idx even if it was set to -1 due to opt_overflow = 1|2
+                                if {$idx == -1 || $overflow_idx > $idx} {
+                                    #don't set overflow_idx higher if it's already set lower and we're adding graphemes to overflow
+                                    set overflow_idx $idx     ;#override overflow_idx even if it was set to -1 due to expand_right = 1
+                                }
                                 set instruction lf_mid
                                 priv::render_unapplied $overlay_grapheme_control_list $gci
                                 break
@@ -2284,23 +2454,35 @@ tcl::namespace::eval overtype {
                                         #tab of some length dependent on tabstops/elastic tabstop settings?
                                     }
                                 } elseif {$idx >= $overflow_idx} {
-                                    #jmn?
-                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci-1]]
-                                    #set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                    #don't incr idx beyond the overflow_idx
-                                    #idx_over already incremented - decrement so current overlay grapheme stacks go to unapplied
-                                    incr idx_over -1
-                                    #priv::render_unapplied $overlay_grapheme_control_list [expr {$gci-1}] ;#back one index here too
-                                    priv::render_this_unapplied $overlay_grapheme_control_list $gci  ;#
-                                    set instruction overflow
-                                    break
+                                    #REVIEW
+                                    set next_gc [lindex $overlay_grapheme_control_list $gci+1] ;#next grapheme or control
+                                    lassign $next_gc next_type next_item 
+                                    if {$autowrap_mode || $next_type ne "g"} {
+                                        set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci-1]]
+                                        #set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                        #don't incr idx beyond the overflow_idx
+                                        #idx_over already incremented - decrement so current overlay grapheme stacks go to unapplied
+                                        incr idx_over -1
+                                        #priv::render_unapplied $overlay_grapheme_control_list [expr {$gci-1}] ;#back one index here too
+                                        priv::render_this_unapplied $overlay_grapheme_control_list $gci  ;#
+                                        set instruction overflow
+                                        break
+                                    } else {
+                                        #no point throwing back to caller for each grapheme that is overflowing
+                                        #without this branch - renderline would be called with overtext reducing only by one grapheme per call
+                                        #processing a potentially long overtext each time (ie - very slow)
+                                        set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                        #JMN4 
+
+                                    }
                                 }
                             } else {
                                 #review.
-                                #This corresponds to opt_overflow being true (at least until overflow_idx is in some cases forced to a value when throwing back to calling loop)
+                                #overflow_idx = -1 
+                                #This corresponds to expand_right being true (at least until overflow_idx is in some cases forced to a value when throwing back to calling loop)
                             }
 
-                            if {($do_transparency && [regexp $opt_transparent $ch])} {    
+                            if {($do_transparency && [regexp $opt_transparent $ch])} {
                                 #pre opt_colstart is effectively transparent (we have applied padding of required number of columns to left of overlay)
                                 if {$idx > [llength $outcols]-1} {
                                     lappend outcols " "
@@ -2311,6 +2493,7 @@ tcl::namespace::eval overtype {
                                 } else {
                                     #todo - punk::char::char_width
                                     set g [lindex $outcols $idx]
+                                    #JMN
                                     set uwidth [grapheme_width_cached $g]
                                     if {[lindex $outcols $idx] eq ""} {
                                         #2nd col of 2-wide char in underlay 
@@ -2438,7 +2621,7 @@ tcl::namespace::eval overtype {
                                             }
                                             incr idx
                                         }
-                                        if {($cursor_column < [llength $outcols]) || $overflow_idx == -1 || $test_mode} {
+                                        if {($cursor_column < [llength $outcols]) || $overflow_idx == -1} {
                                             incr cursor_column
                                         }
                                     } elseif {$uwidth > 1} {
@@ -2472,12 +2655,6 @@ tcl::namespace::eval overtype {
                                     priv::render_addchar $idx $ch [lindex $overstacks $idx_over] [lindex $overstacks_gx $idx_over] $insert_mode
                                     incr idx
                                     incr cursor_column
-                                    if {$overflow_idx !=-1 && !$test_mode} {
-                                        #overflow
-                                        if {$cursor_column > [llength $outcols]} {
-                                            set cursor_column [llength $outcols]
-                                        }
-                                    }
                                 }
                             }
                         }
@@ -2485,13 +2662,29 @@ tcl::namespace::eval overtype {
 
 
                 }
-                other {
+                other - crmcontrol {
+                    if {$crm_mode && $type ne "crmcontrol" && $item ne "\x1b\[00001E"} {
+                        if {$item eq "\x1b\[3l"} {
+                            set crm_mode 0
+                        } else {
+                            #When our initial overlay split was done - we weren't in crm_mode - so there are codes that weren't mapped to unicode control character representations
+                            #set within_undercols [expr {$idx <= $renderwidth-1}]
+                            #set chars [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $item]
+                            set chars [ansistring VIEW -nul 1 -lf 1 -vt 1 -ff 1 $item]
+                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                            #prefix the unapplied controls with the string version of this control
+                            set unapplied_list [linsert $unapplied_list 0 {*}[split $chars ""]]
+                            set unapplied [join $unapplied_list ""]
+                            
+                            break
+                        }
+                    }
+
                     #todo - consider CSI s DECSLRM vs ansi.sys \x1b\[s  - we need \x1b\[s for oldschool ansi art - but may have to enable only for that.
-                    #we should probably therefore reverse this mapping so that x1b7 x1b8 are the primary codes for save/restore
+                    #we should possibly therefore reverse this mapping so that x1b7 x1b8 are the primary codes for save/restore?
                     set code [tcl::string::map [list \x1b7 \x1b\[s \x1b8 \x1b\[u ] $item]
                     #since this element isn't a grapheme - advance idx_over to next grapheme overlay when about to fill 'unapplied'
 
-                    set matchinfo [list]
 
                     #remap of DEC cursor_save/cursor_restore from ESC sequence to equivalent CSI
                     #probably not ideal - consider putting cursor_save/cursor_restore in functions so they can be called from the appropriate switch branch instead of using this mapping
@@ -2501,15 +2694,16 @@ tcl::namespace::eval overtype {
                     set c1c2c3 [tcl::string::range $code 0 2]
                     #set re_ST_open {(?:\033P|\u0090|\033X|\u0098|\033\^|\u009e|\033_|\u009f)} 
                     #tcl 8.7 - faster to use inline list than to store it in a local var outside of loop. 
-                    #(surprising - but presumably )
+                    #(somewhat surprising)
                     set leadernorm [tcl::string::range [tcl::string::map [list\
                         \x1b\[<     1006\
                         \x1b\[      7CSI\
+                        \x1bP       7DCS\
                         \x9b        8CSI\
                         \x1b\]      7OSC\
                         \x9d        8OSC\
                         \x1b        7ESC\
-                        ] $c1c2c3] 0 3] ;#leadernorm is 1st 2 chars mapped to 4char normalised indicator - or is original 2 chars 
+                        ] $c1c2c3] 0 3] ;#leadernorm is 1st 1,2 or 3 chars mapped to 4char normalised indicator - or is original first chars (1,2 or 3 len) 
 
                     #we leave the tail of the code unmapped for now 
                     switch -- $leadernorm {
@@ -2521,6 +2715,11 @@ tcl::namespace::eval overtype {
                         7CSI - 7OSC {
                             set codenorm [tcl::string::cat $leadernorm [tcl::string::range $code 2 end]]
                         }
+                        7DCS {
+                            #ESC P
+                            #Device Control String  https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h4-Controls-beginning-with-ESC:ESC-F.C74
+                            set codenorm [tcl::string::cat $leadernorm [tcl::string::range $code 2 end]]
+                        }
                         7ESC {
                             set codenorm [tcl::string::cat $leadernorm [tcl::string::range $code 1 end]]
                         }
@@ -2528,7 +2727,10 @@ tcl::namespace::eval overtype {
                             set codenorm [tcl::string::cat $leadernorm [tcl::string::range $code 1 end]]
                         }
                         default {
+                            puts stderr "Sequence detected as ANSI, but not handled in leadernorm switch. code: [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
                             #we haven't made a mapping for this
+                            #could in theory be 1,2 or 3 in len 
+                            #although we shouldn't be getting here if the regexp for ansi codes is kept in sync with our switch branches
                             set codenorm $code
                         }
                     }
@@ -2551,44 +2753,44 @@ tcl::namespace::eval overtype {
                         {7CSI} - {8CSI} {
                             set param [tcl::string::range $codenorm 4 end-1]
                             #puts stdout "--> CSI [tcl::string::index $leadernorm 0] bit param:$param"
-                            switch -- [tcl::string::index $codenorm end] {
-                                D {
-                                    #Col move
-                                    #puts stdout "<-back"
-                                    #cursor back
-                                    #left-arrow/move-back when ltr mode
+                            set code_end [tcl::string::index $codenorm end] ;#used for e.g h|l set/unset mode
+                            switch -exact -- $code_end {
+                                A {
+                                    #Row move - up
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
                                     set num $param
                                     if {$num eq ""} {set num 1}
+                                    incr cursor_row -$num
 
-                                    set version 2
-                                    if {$version eq "2"} {
-                                        #todo - startcolumn offset!
-                                        if {$cursor_column - $num >= 1} {
-                                            incr idx -$num
-                                            incr cursor_column -$num
-                                        } else {
-                                            if {!$autowrap_mode} {
-                                            set cursor_column 1 
-                                            set idx 0
-                                            } else {
-                                                set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                                incr cursor_column -$num
-                                                priv::render_unapplied $overlay_grapheme_control_list $gci
-                                                set instruction wrapmovebackward
-                                                break
-                                            }
-                                        }
-                                    } else {
-                                        incr idx -$num
-                                        incr cursor_column -$num
-                                        if {$idx < $opt_colstart-1} {
-                                            #wrap to previous line and position cursor at end of data
-                                            set idx [expr {$opt_colstart-1}]
-                                            set cursor_column $opt_colstart
-                                        }
+                                    if {$cursor_row < 1} {
+                                        set cursor_row  1
                                     }
+
+                                    #ensure rest of *overlay* is emitted to remainder
+                                    incr idx_over
+                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                    set instruction up
+                                    #retain cursor_column
+                                    break 
+                                }
+                                B {
+                                    #CUD - Cursor Down
+                                    #Row move - down
+                                    set num $param
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                    #move down
+                                    if {$num eq ""} {set num 1}
+                                    incr cursor_row $num
+
+
+                                    incr idx_over ;#idx_over hasn't encountered a grapheme and hasn't advanced yet 
+                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                    set instruction down
+                                    #retain cursor_column
+                                    break 
                                 }
                                 C {
+                                    #CUF - Cursor Forward
                                     #Col move
                                     #puts stdout "->forward"
                                     #todo - consider right-to-left cursor mode (e.g Hebrew).. some day.
@@ -2610,7 +2812,7 @@ tcl::namespace::eval overtype {
                                         if {$overflow_idx == -1} {
                                             incr max
                                         }
-                                        if {$test_mode && $cursor_column == $max+1} {
+                                        if {$cursor_column == $max+1} {
                                             #move_forward while in overflow
                                             incr cursor_column -1
                                         }
@@ -2627,7 +2829,7 @@ tcl::namespace::eval overtype {
                                                 }
 
                                                 #horizontal movement beyond line extent needs to wrap - throw back to caller
-                                                #we may have both overflow_rightand unapplied data
+                                                #we may have both overflow_right and unapplied data
                                                 #(can have overflow_right if we were in insert_mode and processed chars prior to this movement)
                                                 #leave row as is - caller will need to determine how many rows the column-movement has consumed
                                                 incr cursor_column $num ;#give our caller the necessary info as columns from start of row 
@@ -2642,7 +2844,8 @@ tcl::namespace::eval overtype {
                                             }
                                         }
                                     } else {
-                                        if {!$opt_overflow || ($cursor_column + $num) <= [llength $outcols+1]} {
+                                        #review - dead branch
+                                        if {!$expand_right || ($cursor_column + $num) <= [llength $outcols+1]} {
                                             incr idx $num
                                             incr cursor_column $num
                                         } else {
@@ -2692,85 +2895,294 @@ tcl::namespace::eval overtype {
                                         }
                                     }
                                 } 
-                                G {
+                                D {
                                     #Col move
-                                    #move absolute column
-                                    #adjust to colstart - as column 1 is within overlay
-                                    #???
-                                    set idx [expr {$param + $opt_colstart -1}] 
-                                    set cursor_column $param
-                                    error "renderline absolute col move ESC G unimplemented"
-                                }
-                                A {
-                                    #Row move - up
-                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                    #puts stdout "<-back"
+                                    #cursor back
+                                    #left-arrow/move-back when ltr mode
                                     set num $param
                                     if {$num eq ""} {set num 1}
-                                    incr cursor_row -$num
 
-                                    if {$cursor_row < 1} {
-                                        set cursor_row  1
+                                    set version 2
+                                    if {$version eq "2"} {
+                                        #todo - startcolumn offset!
+                                        if {$cursor_column - $num >= 1} {
+                                            incr idx -$num
+                                            incr cursor_column -$num
+                                        } else {
+                                            if {!$autowrap_mode} {
+                                            set cursor_column 1 
+                                            set idx 0
+                                            } else {
+                                                set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                                incr cursor_column -$num
+                                                priv::render_unapplied $overlay_grapheme_control_list $gci
+                                                set instruction wrapmovebackward
+                                                break
+                                            }
+                                        }
+                                    } else {
+                                        incr idx -$num
+                                        incr cursor_column -$num
+                                        if {$idx < $opt_colstart-1} {
+                                            #wrap to previous line and position cursor at end of data
+                                            set idx [expr {$opt_colstart-1}]
+                                            set cursor_column $opt_colstart
+                                        }
                                     }
-
-                                    #ensure rest of *overlay* is emitted to remainder
+                                }
+                                E {
+                                    #CNL - Cursor Next Line
+                                    if {$param eq ""} {
+                                        set downmove 1
+                                    } else {
+                                        set downmove [expr {$param}]
+                                    }
+                                    puts stderr "renderline CNL down-by-$downmove"
+                                    set cursor_column 1
+                                    set cursor_row [expr {$cursor_row + $downmove}]
+                                    set idx [expr {$cursor_column -1}]
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
                                     incr idx_over
                                     priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction up
-                                    #retain cursor_column
-                                    break 
+                                    set instruction move
+                                    break
+
                                 }
-                                B {
-                                    #Row move - down
-                                    set num $param
+                                F {
+                                    #CPL - Cursor Previous Line
+                                    if {$param eq ""} {
+                                        set upmove 1
+                                    } else {
+                                        set upmove [expr {$param}]
+                                    }
+                                    puts stderr "renderline CPL up-by-$upmove"
+                                    set cursor_column 1
+                                    set cursor_row [expr {$cursor_row -$upmove}]
+                                    if {$cursor_row < 1} {
+                                        set cursor_row 1
+                                    } 
+                                    set idx [expr {$cursor_column - 1}]
                                     set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                    #move down
-                                    if {$num eq ""} {set num 1}
-                                    incr cursor_row $num
-
-
-                                    incr idx_over ;#idx_over hasn't encountered a grapheme and hasn't advanced yet 
+                                    incr idx_over
                                     priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction down
-                                    #retain cursor_column
-                                    break 
+                                    set instruction move
+                                    break
+
+                                }
+                                G {
+                                    #CHA - Cursor Horizontal Absolute (move to absolute column no)
+                                    if {$param eq ""} {
+                                        set targetcol 1
+                                    } else {
+                                        set targetcol $param
+                                        if {![string is integer -strict $targetcol]} {
+                                            puts stderr "renderline CHA (Cursor Horizontal Absolute) error. Unrecognised parameter '$param'"
+                                        }
+                                        set targetcol [expr {$param}]
+                                        set max [llength $outcols]
+                                        if {$overflow_idx == -1} {
+                                            incr max
+                                        }
+                                        if {$targetcol > $max} {
+                                            puts stderr "renderline CHA (Cursor Horizontal Absolute) error. Param '$param' > max: $max"
+                                            set targetcol $max
+                                        }
+                                    }
+                                    #adjust to colstart - as column 1 is within overlay
+                                    #??? REVIEW
+                                    set idx [expr {($targetcol -1) + $opt_colstart -1}] 
+                                    
+                                     
+                                    set cursor_column $targetcol
+                                    #puts stderr "renderline absolute col move ESC G (TEST)"
                                 }
                                 H - f {
-                                    #$re_both_move
-                                    lassign [split $param {;}] row col
-                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                    #lassign $matchinfo _match row col 
+                                    #CSI n;m H - CUP - Cursor Position
 
-                                    if {$col eq ""} {set col 1}
-                                    set max [llength $outcols]
-                                    if {$overflow_idx == -1} {
-                                        incr max 
-                                    }
-                                    if {$col > $max} {
-                                        set cursor_column  $max
+                                    #CSI n;m f - HVP - Horizontal Vertical Position REVIEW - same as CUP with differences (what?) in some terminal modes
+                                    # - 'counts as effector format function  (like CR or LF) rather than an editor function (like CUD or CNL)'
+                                    # - REVIEW 
+                                    #see Annex A at: https://www.ecma-international.org/wp-content/uploads/ECMA-48_5th_edition_june_1991.pdf
+
+                                    #test e.g ansicat face_2.ans
+                                    #$re_both_move
+                                    lassign [split $param {;}] paramrow paramcol
+                                    #missing defaults to 1
+                                    #CSI ;5H = CSI 1;5H -> row 1 col 5
+                                    #CSI 17;H = CSI 17H = CSI 17;1H -> row 17 col 1 
+
+                                    if {$paramcol eq ""} {set paramcol 1}
+                                    if {$paramrow eq ""} {set paramrow 1}
+                                    if {![string is integer -strict $paramcol] || ![string is integer -strict $paramrow]} {
+                                        puts stderr "renderline CUP (CSI <param> H) unrecognised param $param"
+                                        #ignore?
                                     } else {
-                                        set cursor_column $col
+                                        set max [llength $outcols]
+                                        if {$overflow_idx == -1} {
+                                            incr max 
+                                        }
+                                        if {$paramcol > $max} {
+                                            set target_column  $max
+                                        } else {
+                                            set target_column [expr {$paramcol}]
+                                        }
+
+
+                                        if {$paramrow < 1} {
+                                            puts stderr "renderline CUP (CSI <param> H) bad row target 0. Assuming 1"
+                                            set target_row 1
+                                        } else {
+                                            set target_row [expr {$paramrow}]
+                                        }
+                                        if {$target_row == $cursor_row} {
+                                            #col move only - no need for break and move
+                                            #puts stderr "renderline CUP col move only to col $target_column param:$param"
+                                            set cursor_column $target_column
+                                            set idx [expr {$cursor_column -1}]
+                                        } else {
+                                            set cursor_row $target_row
+                                            set cursor_column $target_column
+                                            set idx [expr {$cursor_column -1}]
+                                            set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                            incr idx_over
+                                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                                            set instruction move
+                                            break
+                                        }
                                     }
-                                    set idx [expr {$cursor_column -1}]
+                                }
+                                J {
+                                    set modegroup [tcl::string::index $codenorm 4] ;#e.g ? 
+                                    switch -exact -- $modegroup {
+                                        ? {
+                                            #CSI ? Pn J - selective erase
+                                            puts stderr "overtype::renderline ED - SELECTIVE ERASE IN DISPLAY (UNIMPLEMENTED) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline ED - ERASE IN DISPLAY (TESTING) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                            if {$param eq ""} {set param 0} 
+                                            switch -exact -- $param {
+                                                0 {
+                                                    #clear from cursor to end of screen
+                                                }
+                                                1 {
+                                                    #clear from cursor to beginning of screen
+                                                }
+                                                2 {
+                                                    #clear entire screen
+                                                    #ansi.sys - move cursor to upper left REVIEW
+                                                    set cursor_row 1
+                                                    set cursor_column 1
+                                                    set idx [expr {$cursor_column -1}]
+                                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                                    incr idx_over
+                                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                                    set instruction move
+                                                    break
+                                                }
+                                                3 {
+                                                    #clear entire screen. presumably cursor doesn't move - otherwise it would be same as 2J ?
 
-                                    if {$row eq ""} {set row 1}
-                                    set cursor_row $row
-                                    if {$cursor_row < 1} {
-                                        set cursor_row 1
+                                                }
+                                                default {
+                                                }
+                                            }
+
+                                        }
                                     }
+                                }
+                                K {
+                                    #see DECECM regarding background colour
+                                    set modegroup [tcl::string::index $codenorm 4] ;#e.g ? 
+                                    switch -exact -- $modegroup {
+                                        ? {
+                                            puts stderr "overtype::renderline DECSEL - SELECTIVE ERASE IN LINE (UNIMPLEMENTED) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                            set param [string range $param 1 end] ;#chop qmark
+                                            if {$param eq ""} {set param 0} 
+                                            switch -exact -- $param {
+                                                0 {
+                                                    #clear from cursor to end of line - depending on DECSCA
+                                                }
+                                                1 {
+                                                    #clear from cursor to beginning of line - depending on DECSCA
 
-                                    incr idx_over
-                                    priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction move
-                                    break
+                                                }
+                                                2 {
+                                                    #clear entire line - depending on DECSCA
+                                                }
+                                                default {
+                                                    puts stderr "overtype::renderline DECSEL - SELECTIVE ERASE IN LINE PARAM '$param' unrecognised [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                                }
+                                            }
+
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline EL - ERASE IN LINE (TESTING) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                            if {$param eq ""} {set param 0} 
+                                            switch -exact -- $param {
+                                                0 {
+                                                    #clear from cursor to end of line
+                                                }
+                                                1 {
+                                                    #clear from cursor to beginning of line
+
+                                                }
+                                                2 {
+                                                    #clear entire line
+                                                }
+                                                default {
+                                                    puts stderr "overtype::renderline EL - ERASE IN LINE PARAM '$param' unrecognised [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                L {
+                                    puts stderr "overtype::renderline IL -  Insert Line - not implemented [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                M {
+                                    #CSI Pn M - DL - Delete Line
+                                    puts stderr "overtype::renderline DL -  Delete Line - not implemented [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
 
                                 }
                                 X {
-                                    puts stderr "X - $param"
+                                    puts stderr "overtype::renderline X ECH ERASE CHARACTER - $param"
                                     #ECH - erase character
                                     if {$param eq "" || $param eq "0"} {set param 1}; #param=count of chars to erase
                                     priv::render_erasechar $idx $param 
                                     #cursor position doesn't change.
                                 }
+                                q {
+                                    set code_secondlast [tcl::string::index $codenorm end-1]
+                                    switch -exact -- $code_secondlast {
+                                        {"} {
+                                            #DECSCA - Select Character Protection Attribute
+                                            #(for use with selective erase: DECSED and DECSEL)
+                                            set param [tcl::string::range $codenorm 4 end-2]
+                                            if {$param eq ""} {set param 0}
+                                            #TODO - store like SGR in stacks - replays?
+                                            switch -exact -- $param {
+                                                0 - 2 {
+                                                    #canerase
+                                                    puts stderr "overtype::renderline - DECSCA canerase not implemented - [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                                }
+                                                1 {
+                                                    #cannoterase
+                                                    puts stderr "overtype::renderline - DECSCA cannoterase not implemented - [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                                }
+                                                default {
+                                                    puts stderr "overtype::renderline DECSCA param '$param' not understood [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                                }
+                                            }
+
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline - CSI ... q not implemented - [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                        }
+                                    }
+
+                                }
                                 r {
                                     #$re_decstbm
                                     #https://www.vt100.net/docs/vt510-rm/DECSTBM.html
@@ -2789,78 +3201,119 @@ tcl::namespace::eval overtype {
                                     break
                                 }
                                 s {
-                                    # - todo - make ansi.sys CSI s cursor save only apply for certain cases? - may need to support DECSLRM instead which uses same code
-
-                                    #$re_cursor_save
-                                    #cursor save could come after last column  
-                                    if {$overflow_idx != -1 && $idx == $overflow_idx} {
-                                        #bartman2.ans test file - fixes misalignment at bottom of dialog bubble
-                                        #incr cursor_row
-                                        #set cursor_column 1
-                                        #bwings1.ans test file - breaks if we actually incr cursor (has repeated saves)
-                                        set cursor_saved_position [list row [expr {$cursor_row+1}] column 1]
-                                    } else {
-                                        set cursor_saved_position [list row $cursor_row column $cursor_column]
-                                    }
-                                    #there may be overlay stackable codes emitted that aren't in the understacks because they come between the last emmited character and the cursor_save control.
-                                    #we need the SGR and gx overlay codes prior to the cursor_save  
+                                    #code conflict between ansi emulation and DECSLRM - REVIEW
+                                    #ANSISYSSC  (when no parameters) - like other terminals - essentially treat same as DECSC
+                                    # todo - when parameters - support DECSLRM instead
+
+                                    if {$param ne ""} {
+                                        #DECSLRM - should only be recognised if DECLRMM is set  (vertical split screen mode)
+                                        lassign [split $param {;} margin_left margin_right 
+                                        puts stderr "overtype DECSLRM not yet supported - got [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                        if {$margin_left eq ""} {
+                                            set margin_left 1
+                                        }
+                                        set columns_per_page 80 ;#todo - set to 'page width (DECSCPP set columns per page)' - could be 132 or??
+                                        if {$margin_right eq ""} {
+                                            set margin_right $columns_per_page 
+                                        }
+                                        puts stderr "DECSLRM margin left: $margin_left margin right: $margin_right"
+                                        if {![string is integer -strict $margin_left] || $margin_left < 0} {
+                                            puts stderr "DECSLRM invalid margin_left"
+                                        }
+                                        if {![string is integer -strict $margin_right] || $margin_right < 0} {
+                                            puts stderr "DECSLRM invalid margin_right"
+                                        }
+                                        set scrolling_region_size [expr {$margin_right - $margin_left}]
+                                        if {$scrolling_region_size < 2 || $scrolling_region_size > $columns_per_page} {
+                                            puts stderr "DECSLRM region size '$scrolling_regsion_size' must be between 1 and $columns_per_page"
+                                        }
+                                        #todo 
 
-                                    #a real terminal would not be able to know the state of the underlay.. so we should probably ignore it.
-                                    #set sgr_stack [lindex $understacks $idx]
-                                    #set gx_stack [lindex $understacks_gx $idx] ;#not actually a stack - just a boolean state (for now?)
-                                    
-                                    set sgr_stack [list]
-                                    set gx_stack [list]
-
-                                    #we shouldn't need to scan for intermediate cursor save/restores - as restores would throw-back to the calling loop - so our overlay 'line' is since those.
-                                    #The overlay_grapheme_control_list had leading resets from previous lines - so we go back to the beginning not just the first grapheme.
-
-                                    foreach gc [lrange $overlay_grapheme_control_list 0 $gci-1] {
-                                        lassign $gc type code 
-                                        #types g other sgr gx0
-                                        switch -- $type {
-                                            gx0 {
-                                                #code is actually a stand-in for the graphics on/off code  - not the raw code
-                                                #It is either gx0_on or gx0_off 
-                                                set gx_stack [list $code]
-                                            }
-                                            sgr {
-                                                #code is the raw code
-                                                if {[punk::ansi::codetype::is_sgr_reset $code]} {
-                                                    #jmn
-                                                    set sgr_stack [list "\x1b\[m"]
-                                                } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
-                                                    set sgr_stack [list $code]
-                                                    lappend overlay_grapheme_control_list [list sgr $code]
-                                                } elseif {[priv::is_sgr $code]} {
-                                                    #often we don't get resets - and codes just pile up.
-                                                    #as a first step to simplifying - at least remove earlier straight up dupes
-                                                    set dup_posns [lsearch -all -exact $sgr_stack $code] ;#needs -exact - codes have square-brackets (glob chars)
-                                                    set sgr_stack [lremove $sgr_stack {*}$dup_posns]
-                                                    lappend sgr_stack $code
+
+                                    } else {
+                                        #DECSC
+                                        #//notes on expected behaviour:
+                                        #DECSC - saves following items in terminal's memory
+                                        #cursor position
+                                        #character attributes set by the SGR command
+                                        #character sets (G0,G1,G2 or G3) currently in GL and GR
+                                        #Wrap flag (autowrap or no autowrap)
+                                        #State of origin mode (DECOM)
+                                        #selective erase attribute
+                                        #any single shift 2 (SS2) or single shift 3(SSD) functions sent
+
+                                        #$re_cursor_save
+                                        #cursor save could come after last column  
+                                        if {$overflow_idx != -1 && $idx == $overflow_idx} {
+                                            #bartman2.ans test file - fixes misalignment at bottom of dialog bubble
+                                            #incr cursor_row
+                                            #set cursor_column 1
+                                            #bwings1.ans test file - breaks if we actually incr cursor (has repeated saves)
+                                            set cursor_saved_position [list row [expr {$cursor_row+1}] column 1]
+                                        } else {
+                                            set cursor_saved_position [list row $cursor_row column $cursor_column]
+                                        }
+                                        #there may be overlay stackable codes emitted that aren't in the understacks because they come between the last emmited character and the cursor_save control.
+                                        #we need the SGR and gx overlay codes prior to the cursor_save  
+
+                                        #a real terminal would not be able to know the state of the underlay.. so we should probably ignore it.
+                                        #set sgr_stack [lindex $understacks $idx]
+                                        #set gx_stack [lindex $understacks_gx $idx] ;#not actually a stack - just a boolean state (for now?)
+                                        
+                                        set sgr_stack [list]
+                                        set gx_stack [list]
+
+                                        #we shouldn't need to scan for intermediate cursor save/restores - as restores would throw-back to the calling loop - so our overlay 'line' is since those.
+                                        #The overlay_grapheme_control_list had leading resets from previous lines - so we go back to the beginning not just the first grapheme.
+
+                                        foreach gc [lrange $overlay_grapheme_control_list 0 $gci-1] {
+                                            lassign $gc type code 
+                                            #types g other sgr gx0
+                                            switch -- $type {
+                                                gx0 {
+                                                    #code is actually a stand-in for the graphics on/off code  - not the raw code
+                                                    #It is either gx0_on or gx0_off 
+                                                    set gx_stack [list $code]
+                                                }
+                                                sgr {
+                                                    #code is the raw code
+                                                    if {[punk::ansi::codetype::is_sgr_reset $code]} {
+                                                        #jmn
+                                                        set sgr_stack [list "\x1b\[m"]
+                                                    } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
+                                                        set sgr_stack [list $code]
+                                                        lappend overlay_grapheme_control_list [list sgr $code]
+                                                    } elseif {[priv::is_sgr $code]} {
+                                                        #often we don't get resets - and codes just pile up.
+                                                        #as a first step to simplifying - at least remove earlier straight up dupes
+                                                        set dup_posns [lsearch -all -exact $sgr_stack $code] ;#needs -exact - codes have square-brackets (glob chars)
+                                                        set sgr_stack [lremove $sgr_stack {*}$dup_posns]
+                                                        lappend sgr_stack $code
+                                                    }
                                                 }
                                             }
                                         }
-                                    }
-                                    set cursor_saved_attributes ""
-                                    switch -- [lindex $gx_stack 0] {
-                                        gx0_on {
-                                            append cursor_saved_attributes "\x1b(0"
-                                        }
-                                        gx0_off {
-                                            append cursor_saved_attributes "\x1b(B"
+                                        set cursor_saved_attributes ""
+                                        switch -- [lindex $gx_stack 0] {
+                                            gx0_on {
+                                                append cursor_saved_attributes "\x1b(0"
+                                            }
+                                            gx0_off {
+                                                append cursor_saved_attributes "\x1b(B"
+                                            }
                                         }
-                                    }
-                                    #append cursor_saved_attributes [join $sgr_stack ""]
-                                    append cursor_saved_attributes [punk::ansi::codetype::sgr_merge_list {*}$sgr_stack]
+                                        #append cursor_saved_attributes [join $sgr_stack ""]
+                                        append cursor_saved_attributes [punk::ansi::codetype::sgr_merge_list {*}$sgr_stack]
 
-                                    #as there is apparently only one cursor storage element we don't need to throw back to the calling loop for a save.
+                                        #as there is apparently only one cursor storage element we don't need to throw back to the calling loop for a save.
 
-                                    #don't incr index - or the save will cause cursor to move to the right
-                                    #carry on 
-                                    
+                                        #don't incr index - or the save will cause cursor to move to the right
+                                        #carry on 
+                                    }
                                 }
                                 u {
+                                    #ANSISYSRC save cursor (when no parameters)  (DECSC)
+
                                     #$re_cursor_restore
                                     #we are going to jump somewhere.. for now we will assume another line, and process accordingly.
                                     #The caller has the cursor_saved_position/cursor_saved_attributes if any (?review - if we always pass it back it, we could save some calls for moves in same line)
@@ -2901,135 +3354,260 @@ tcl::namespace::eval overtype {
                                     set instruction restore_cursor 
                                     break
                                 }
+                                "{" {
+
+                                    puts stderr "renderline warning - CSI..<leftcurly> - unimplemented [ansistring VIEW -lf 1 -nul 1 $code]"
+                                }
+                                "}" {
+                                    set code_secondlast [tcl::string::index $codenorm end-1]
+                                    switch -exact -- $code_secondlast {
+                                        ' {
+                                            puts stderr "renderline warning - DECIC - Insert Column - CSI...'<rightcurly> - unimplemented [ansistring VIEW -lf 1 -nul 1 $code]"
+                                        }
+                                        default {
+                                            puts stderr "renderline warning - CSI..<rightcurly> - unimplemented [ansistring VIEW -lf 1 -nul 1 $code]"
+                                        }
+                                    }
+                                }
                                 ~ {
-                                    #$re_vt_sequence
-                                    #lassign $matchinfo _match key mod 
-                                    lassign [split $param {;}] key mod
-
-                                    #Note that f1 to f4 show as ESCOP|Q|R|S  (VT220?) but f5+ show as ESC\[15~
-                                    #
-                                    #e.g esc \[2~  insert  esc \[2;2~  shift-insert
-                                    #mod - subtract 1, and then use bitmask
-                                    #shift = 1, (left)Alt = 2, control=4, meta=8  (meta seems to do nothing on many terminals on windows? Intercepted by windows?)
-                                    #puts stderr "vt key:$key mod:$mod  code:[ansistring VIEW $code]" 
-                                    if {$key eq "1"} {
-                                        #home
-                                    } elseif {$key eq "2"} {
-                                        #Insert
-                                        if {$mod eq ""} {
-                                            #no modifier key
-                                            set insert_mode [expr {!$insert_mode}]
-                                            #rather than set the cursor - we return the insert mode state so the caller can decide
+                                    set code_secondlast [tcl::string::index $codenorm end-1] ;#used for e.g CSI x '~ 
+                                    switch -exact -- $code_secondlast {
+                                        ' {
+                                            #DECDC - editing sequence - Delete Column 
+                                            puts stderr "renderline warning - DECDC - unimplemented"
                                         }
-                                    } elseif {$key eq "3"} {
-                                        #Delete - presumably this shifts other chars in the line, with empty cells coming in from the end
-                                        switch -- $mod {
-                                            "" {
-                                                priv::render_delchar $idx
-                                            }
-                                            "5" {
-                                                #ctrl-del - delete to end of word (pwsh) - possibly word on next line if current line empty(?)
+                                        default {
+                                            #$re_vt_sequence
+                                            lassign [split $param {;}] key mod
+
+                                            #Note that f1 to f4 show as ESCOP|Q|R|S  (VT220?) but f5+ show as ESC\[15~
+                                            #
+                                            #e.g esc \[2~  insert  esc \[2;2~  shift-insert
+                                            #mod - subtract 1, and then use bitmask
+                                            #shift = 1, (left)Alt = 2, control=4, meta=8  (meta seems to do nothing on many terminals on windows? Intercepted by windows?)
+                                            #puts stderr "vt key:$key mod:$mod  code:[ansistring VIEW $code]" 
+                                            if {$key eq "1"} {
+                                                #home
+                                            } elseif {$key eq "2"} {
+                                                #Insert
+                                                if {$mod eq ""} {
+                                                    #no modifier key
+                                                    set insert_mode [expr {!$insert_mode}]
+                                                    #rather than set the cursor - we return the insert mode state so the caller can decide
+                                                }
+                                            } elseif {$key eq "3"} {
+                                                #Delete - presumably this shifts other chars in the line, with empty cells coming in from the end
+                                                switch -- $mod {
+                                                    "" {
+                                                        priv::render_delchar $idx
+                                                    }
+                                                    "5" {
+                                                        #ctrl-del - delete to end of word (pwsh) - possibly word on next line if current line empty(?)
+                                                    }
+                                                }
+                                            } elseif {$key eq "4"} {
+                                                #End
+                                            } elseif {$key eq "5"} {
+                                                #pgup
+                                            } elseif {$key eq "6"} {
+                                                #pgDn
+                                            } elseif {$key eq "7"} {
+                                                #Home
+                                                #??
+                                                set idx [expr {$opt_colstart -1}]
+                                                set cursor_column 1
+                                            } elseif {$key eq "8"} {
+                                                #End
+                                            } elseif {$key eq "11"} {
+                                                #F1 - or ESCOP  or  e.g shift F1 ESC\[1;2P
+                                            } elseif {$key eq "12"} {
+                                                #F2 - or ESCOQ
+                                            } elseif {$key eq "13"} {
+                                                #F3 - or ESCOR
+                                            } elseif {$key eq "14"} {
+                                                #F4 - or ESCOS
+                                            } elseif {$key eq "15"} {
+                                                #F5 or shift F5 ESC\[15;2~
+                                            } elseif {$key eq "17"} {
+                                                #F6
+                                            } elseif {$key eq "18"} {
+                                                #F7
+                                            } elseif {$key eq "19"} {
+                                                #F8
+                                            } elseif {$key eq "20"} {
+                                                #F9
+                                            } elseif {$key eq "21"} {
+                                                #F10
+                                            } elseif {$key eq "23"} {
+                                                #F11
+                                            } elseif {$key eq "24"} {
+                                                #F12
                                             }
+
                                         }
-                                    } elseif {$key eq "4"} {
-                                        #End
-                                    } elseif {$key eq "5"} {
-                                        #pgup
-                                    } elseif {$key eq "6"} {
-                                        #pgDn
-                                    } elseif {$key eq "7"} {
-                                        #Home
-                                        #??
-                                        set idx [expr {$opt_colstart -1}]
-                                        set cursor_column 1
-                                    } elseif {$key eq "8"} {
-                                        #End
-                                    } elseif {$key eq "11"} {
-                                        #F1 - or ESCOP  or  e.g shift F1 ESC\[1;2P
-                                    } elseif {$key eq "12"} {
-                                        #F2 - or ESCOQ
-                                    } elseif {$key eq "13"} {
-                                        #F3 - or ESCOR
-                                    } elseif {$key eq "14"} {
-                                        #F4 - or ESCOS
-                                    } elseif {$key eq "15"} {
-                                        #F5 or shift F5 ESC\[15;2~
-                                    } elseif {$key eq "17"} {
-                                        #F6
-                                    } elseif {$key eq "18"} {
-                                        #F7
-                                    } elseif {$key eq "19"} {
-                                        #F8
-                                    } elseif {$key eq "20"} {
-                                        #F9
-                                    } elseif {$key eq "21"} {
-                                        #F10
-                                    } elseif {$key eq "23"} {
-                                        #F11
-                                    } elseif {$key eq "24"} {
-                                        #F12
                                     }
 
                                 }
                                 h - l {
+                                    #set mode unset mode
                                     #we are matching only last char to get to this arm - but are there other sequences ending in h|l we need to handle?
 
                                     #$re_mode if first after CSI is "?"  
                                     #some docs mention ESC=<mode>h|l  - not seen on windows terminals.. review
                                     #e.g https://www2.math.upenn.edu/~kazdan/210/computer/ansi.html
-                                    if {[tcl::string::index $codenorm 4] eq "?"} {
-                                        set num [tcl::string::range $codenorm 5 end-1] ;#param between ? and h|l
-                                        #lassign $matchinfo _match num type
-                                        switch -- $num {
-                                            5 {
-                                                #DECSNM - reverse video
-                                                #How we simulate this to render within a block of text is an open question.
-                                                #track all SGR stacks and constantly flip based on the current SGR reverse state?
-                                                #It is the job of the calling loop to do this - so at this stage we'll just set the states
-                                                #DECAWM autowrap 
-                                                if {$type eq "h"} {
-                                                    #set (enable)
-                                                    set reverse_mode 1
-                                                } else {
-                                                    #reset (disable)
-                                                    set reverse_mode 0
-                                                }
+                                    set modegroup [tcl::string::index $codenorm 4] ;#e.g ? =
+                                    switch -exact -- $modegroup {
+                                        ? {
+                                            set smparams [tcl::string::range $codenorm 5 end-1] ;#params between ? and h|l
+                                            #one or more modes can be set
+                                            set smparam_list [split $smparams {;}]
+                                            foreach num $smparam_list {
+                                                switch -- $num {
+                                                    "" {
+                                                        #ignore empties e.g extra/trailing semicolon in params
+                                                    }
+                                                    5 {
+                                                        #DECSNM - reverse video
+                                                        #How we simulate this to render within a block of text is an open question.
+                                                        #track all SGR stacks and constantly flip based on the current SGR reverse state?
+                                                        #It is the job of the calling loop to do this - so at this stage we'll just set the states
+
+                                                        if {$code_end eq "h"} {
+                                                            #set (enable)
+                                                            set reverse_mode 1
+                                                        } else {
+                                                            #reset (disable)
+                                                            set reverse_mode 0
+                                                        }
+
+                                                    }
+                                                    7 {
+                                                        #DECAWM autowrap 
+                                                        if {$code_end eq "h"} {
+                                                            #set (enable)
+                                                            set autowrap_mode 1
+                                                            if {$opt_width ne "\uFFEF"} {
+                                                                set overflow_idx $opt_width
+                                                            } else {
+                                                                #review - this is also the cursor position when adding a char at end of line? 
+                                                                set overflow_idx [expr {[llength $undercols]}] ;#index at which we would be *in* overflow a row move may still override it 
+                                                            }
+                                                            #review - can idx ever be beyond overflow_idx limit when we change e.g with a width setting and cursor movements?
+                                                            # presume not usually - but sanity check with warning for now.
+                                                            if {$idx >= $overflow_idx} {
+                                                                puts stderr "renderline warning - idx '$idx' >= overflow_idx '$overflow_idx' - unexpected"
+                                                            }
+                                                        } else {
+                                                            #reset (disable)
+                                                            set autowrap_mode 0
+                                                            #REVIEW!
+                                                            set overflow_idx -1
+                                                        }
+                                                    }
+                                                    25 {
+                                                        if {$code_end eq "h"} {
+                                                            #visible cursor
+
+                                                        } else {
+                                                            #invisible cursor
 
+                                                        }
+                                                    }
+                                                    117 {
+                                                        #DECECM - Erase Color Mode
+                                                        #https://invisible-island.net/ncurses/ncurses.faq.html
+                                                        #The Erase color selection controls the background color used when text is erased or new
+                                                        #text is scrolled on to the screen. Screen background causes newly erased areas or
+                                                        #scrolled text to be written using color index zero, the screen background. This is VT
+                                                        #and DECterm compatible. Text background causes erased areas or scrolled text to be
+                                                        #written using the current text background color. This is PC console compatible and is
+                                                        #the factory default.
+
+                                                        #see also: https://unix.stackexchange.com/questions/251726/clear-to-end-of-line-uses-the-wrong-background-color-in-screen
+                                                    }
+                                                }
                                             }
-                                            7 {
-                                                #DECAWM autowrap 
-                                                if {$type eq "h"} {
-                                                    #set (enable)
-                                                    set autowrap_mode 1
-                                                    if {$opt_width ne "\uFFEF"} {
-                                                        set overflow_idx $opt_width
+                                        }
+                                        = {
+                                            set num [tcl::string::range $codenorm 5 end-1] ;#param between = and h|l
+                                            puts stderr "overtype::renderline CSI=...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
+                                        default {
+                                            #e.g CSI 4 h
+                                            set num [tcl::string::range $codenorm 4 end-1] ;#param before h|l
+                                            switch -exact -- $num {
+                                                3 {
+                                                    puts stderr "CRM MODE $code_end"
+                                                    #CRM - Show control character mode
+                                                    # 'No control functions are executed except LF,FF and VT which are represented in the CRM FONT before a CRLF(new line) is executed'
+                                                    #  
+                                                    #use ansistring VIEW -nul 1 -lf 2 -ff 2 -vt 2
+                                                    #https://vt100.net/docs/vt510-rm/CRM.html
+                                                    #NOTE - vt100 CRM always does auto-wrap at right margin.
+                                                    #disabling auto-wrap in set-up or by sequence is disabled.
+                                                    #We should default to turning off auto-wrap when crm_mode enabled.. but
+                                                    #displaying truncated (on rhs) crm can still be very useful - and we have optimisation in overflow to avoid excess renderline calls (per grapheme)
+                                                    #we therefore could reasonably put in an exception to allow auto_wrap to be disabled after crm_mode is engaged,
+                                                    #although this would be potentially an annoying difference to some.. REVIEW
+                                                    if {$code_end eq "h"} {
+                                                        set crm_mode 1
+                                                        set autowrap_mode 1
+                                                        if {$opt_width ne "\uFFEF"} {
+                                                            set overflow_idx $opt_width
+                                                        } else {
+                                                            #review - this is also the cursor position when adding a char at end of line? 
+                                                            set overflow_idx [expr {[llength $undercols]}] ;#index at which we would be *in* overflow a row move may still override it 
+                                                        }
                                                     } else {
-                                                        #review - this is also the cursor position when adding a char at end of line? 
-                                                        set overflow_idx [expr {[llength $undercols]}] ;#index at which we would be *in* overflow a row move may still override it 
+                                                        set crm_mode 0
                                                     }
-                                                    #review - can idx ever be beyond overflow_idx limit when we change e.g with a width setting and cursor movements? presume not - but sanity check for now.
-                                                    if {$idx >= $overflow_idx} {
-                                                        puts stderr "renderline error - idx '$idx' >= overflow_idx '$overflow_idx' - unexpected"
+                                                }
+                                                4 {
+                                                    #IRM - Insert/Replace Mode
+                                                    if {$code_end eq "h"} {
+                                                        #CSI 4 h
+                                                        set insert_mode 1
+                                                    } else {
+                                                        #CSI 4 l
+                                                        #replace mode
+                                                        set insert_mode 0
                                                     }
-                                                } else {
-                                                    #reset (disable)
-                                                    set autowrap_mode 0
-                                                    set overflow_idx -1
                                                 }
+                                                default {
+                                                    puts stderr "overtype::renderline CSI...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                | {
+                                    switch -- [tcl::string::index $codenorm end-1] {
+                                        {$} {
+                                            #CSI ... $ |   DECSCPP set columns per page- (recommended in vt510 docs as preferable to DECCOLM)
+                                            #real terminals generally only supported 80/132
+                                            #some other virtuals support any where from 2 to 65,536?
+                                            #we will allow arbitrary widths >= 2 .. to some as yet undetermined limit.
+                                            #CSI <param> $ |
+                                            #empty or 0 param is 80 for compatibility - other numbers > 2 accepted
+                                            set page_width -1 ;#flag as unset
+                                            if {$param eq ""} {
+                                                set page_width 80
+                                            }  elseif {[string is integer -strict $param] && $param >=2 0} {
+                                                set page_width [expr {$param}] ;#we should allow leading zeros in the number - but lets normalize using expr
+                                            } else {
+                                                puts stderr "overtype::renderline unacceptable DECSPP value '$param'" 
                                             }
-                                            25 {
-                                                if {$type eq "h"} {
-                                                    #visible cursor
 
-                                                } else {
-                                                    #invisible cursor
+                                            if {$page_width > 2} {
+                                                puts stderr "overtype::renderline DECSCPP - not implemented - but selected width '$page_width' looks ok"
+                                                #if cursor already beyond new page_width - will move to right colum - otherwise no cursor movement
 
-                                                }
                                             }
-                                        }
 
-                                    } else {
-                                        puts stderr "overtype::renderline CSI...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline  unrecognised CSI code ending in pipe (|) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
                                     }
                                 }
                                 default {
@@ -3038,24 +3616,49 @@ tcl::namespace::eval overtype {
                             } 
                         } 
                         7ESC {
-                            #$re_other_single
-                            switch -- [tcl::string::index $codenorm end] {
+                            #
+                            #re_other_single         {\x1b(D|M|E)$}
+                            #also PM \x1b^...(ST)
+                            switch -- [tcl::string::index $codenorm 4] {
+                                c {
+                                    #RIS - reset terminal to initial state - where 'terminal' in this case is the renderspace - not the underlying terminal!
+                                    puts stderr "renderline reset"
+                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                    set instruction reset 
+                                    break
+                                }
                                 D {
                                     #\x84
                                     #index (IND)
                                     #vt102-docs: "Moves cursor down one line in same column. If cursor is at bottom margin, screen performs a scroll-up"
-                                    puts stderr "ESC D not fully implemented"
+                                    puts stderr "renderline ESC D not fully implemented"
                                     incr cursor_row 
                                     priv::render_unapplied $overlay_grapheme_control_list $gci
                                     set instruction down
                                     #retain cursor_column
                                     break 
                                 }
+                                E {
+                                    #\x85
+                                    #review - is behaviour different to lf?
+                                    #todo - possibly(?) same logic as <lf> handling above. i.e return instruction depends on where column_cursor is at the time we get NEL
+                                    #leave implementation until logic for <lf> is set in stone... still under review
+                                    #It's arguable NEL is a pure cursor movement as opposed to the semantic meaning of crlf or lf in a file.
+                                    # 
+                                    #Next Line (NEL) "Move the cursor to the left margin on the next line. If the cursor is at the bottom margin, scroll the page up"
+                                    puts stderr "overtype::renderline ESC E unimplemented"
+
+                                }
+                                H {
+                                    #\x88
+                                    #Tab Set
+                                    puts stderr "overtype::renderline ESC H tab set unimplemented"
+                                }
                                 M {
                                     #\x8D
                                     #Reverse Index (RI)
                                     #vt102-docs: "Moves cursor up one line in same column. If cursor is at top margin, screen performs a scroll-down"
-                                    puts stderr "ESC M not fully implemented"
+                                    puts stderr "overtype::renderline ESC M not fully implemented"
 
                                     set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
                                     #move up
@@ -3069,31 +3672,89 @@ tcl::namespace::eval overtype {
                                     #retain cursor_column
                                     break 
                                 }
-                                E {
-                                    #\x85
-                                    #review - is behaviour different to lf?
-                                    #todo - possibly(?) same logic as <lf> handling above. i.e return instruction depends on where column_cursor is at the time we get NEL
-                                    #leave implementation until logic for <lf> is set in stone... still under review
-                                    #It's arguable NEL is a pure cursor movement as opposed to the semantic meaning of crlf or lf in a file.
-                                    # 
-                                    #Next Line (NEL) "Move the cursor to the left margin on the next line. If the cursor is at the bottom margin, scroll the page up"
-                                    puts stderr "ESC E unimplemented"
+                                N {
+                                    #\x8e - affects next character only
+                                    puts stderr "overtype::renderline single shift select G2 command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                O {
+                                    #\x8f - affects next character only
+                                    puts stderr "overtype::renderline single shift select G3 command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                P {
+                                    #\x90
+                                    #DCS - shouldn't get here - handled in 7DCS branch
+                                    #similarly \] OSC (\x9d)  and \\ (\x9c) ST 
+                                }
+                                V {
+                                    #\x96
 
                                 }
+                                W {
+                                    #\x97
+                                }
+                                X {
+                                    #\x98
+                                    #SOS
+                                    if {[string index $code end] eq "\007"} {
+                                        set sos_content [string range $code 2 end-1] ;#ST is \007
+                                    } else {
+                                        set sos_content [string range $code 2 end-2] ;#ST is \x1b\\
+                                    }
+                                    #return in some useful form to the caller
+                                    #TODO!
+                                    lappend sos_list [list string $sos_content row $cursor_row column $cursor_column]
+                                    puts stderr "overtype::renderline ESCX SOS UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                ^ {
+                                    #puts stderr "renderline PM"
+                                    #Privacy Message.
+                                    if {[string index $code end] eq "\007"} {
+                                        set pm_content [string range $code 2 end-1] ;#ST is \007
+                                    } else {
+                                        set pm_content [string range $code 2 end-2] ;#ST is \x1b\\
+                                    }
+                                    #We don't want to render it - but we need to make it available to the application
+                                    #see the textblock library in punk, for the exception we make here for single backspace.
+                                    #It is unlikely to be encountered as a useful PM - so we hack to pass it through as a fix 
+                                    #for spacing issues on old terminals which miscalculate the single-width 'Symbols for Legacy Computing'
+                                    if {$pm_content eq "\b"} {
+                                        #puts stderr "renderline PM sole backspace special handling for \U1FB00 - \U1FBFF"
+                                        #esc^\b\007 or esc^\besc\\ 
+                                        #HACKY pass-through - targeting terminals that both mis-space legacy symbols *and* don't support PMs
+                                        #The result is repair of the extra space. If the terminal is a modern one and does support PM - the \b should be hidden anyway.
+                                        #If the terminal has the space problem AND does support PMs - then this just won't fix it.
+                                        #The fix relies on the symbol-supplier to cooperate by appending esc^\b\esc\\ to the problematic symbols.
+
+                                        #priv::render_addchar $idx $code [lindex $overstacks $idx_over] [lindex $overstacks_gx $idx_over] $insert_mode
+                                        #idx has been incremented after last grapheme added
+                                        priv::render_append_to_char [expr {$idx -1}] $code
+                                    }
+                                    #lappend to a dict element in the result for application-specific processing
+                                    lappend pm_list $pm_content
+                                }
+                                _ {
+                                    #APC Application Program Command
+                                    #just warn for now..
+                                    puts stderr "overtype::renderline ESC_ APC command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
                                 default {
-                                    puts stderr "overtype::renderline ESC<x> code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                    puts stderr "overtype::renderline ESC<x> code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented codenorm:[ansistring VIEW -lf 1 -vt 1 -nul 1 $codenorm]"
                                 }
                             }
 
                         }
+                        7DCS {
+                            puts stderr "overtype::renderline DCS - DEVICE CONTROL STRING command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                            #
+
+                        }
+                        7OSC - 8OSC {
+
+                        }
+                        default {
+                        }
                     }
 
-                    #switch -regexp -matchvar matchinfo -- $code\
-                    #$re_mode {
-                    #}\
-                    #default {
-                    #    puts stderr "overtype::renderline code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
-                    #}
 
                 }
                 default {
@@ -3104,7 +3765,7 @@ tcl::namespace::eval overtype {
         }
 
         #--------
-        if {$opt_overflow == 0} {
+        if {$opt_expand_right == 0} {
             #need to truncate to the width of the original undertext
             #review - string_width vs printing_length here. undertext requirement to be already rendered therefore punk::char::string_width ok?
             #set num_under_columns [punk::char::string_width $pt_underchars] ;#plaintext underchars
@@ -3275,20 +3936,24 @@ tcl::namespace::eval overtype {
                 overflow_right $overflow_right\
                 unapplied $unapplied\
                 unapplied_list $unapplied_list\
-                insert_mode $insert_mode\
-                autowrap_mode $autowrap_mode\
+                insert_mode     $insert_mode\
+                autowrap_mode   $autowrap_mode\
+                crm_mode        $crm_mode\
+                reverse_mode    $reverse_mode\
                 insert_lines_above $insert_lines_above\
                 insert_lines_below $insert_lines_below\
                 cursor_saved_position $cursor_saved_position\
                 cursor_saved_attributes $cursor_saved_attributes\
                 cursor_column   $cursor_column\
                 cursor_row      $cursor_row\
-                opt_overflow    $opt_overflow\
+                expand_right    $opt_expand_right\
                 replay_codes $replay_codes\
                 replay_codes_underlay $replay_codes_underlay\
                 replay_codes_overlay $replay_codes_overlay\
+                pm_list  $pm_list\
             ]
             if {$opt_returnextra == 1} {
+                #puts stderr "renderline: $result"
                 return $result
             } else {
                 #human/debug - map special chars to visual glyphs
@@ -3313,6 +3978,7 @@ tcl::namespace::eval overtype {
                 return $result
             }
         } else {
+            #puts stderr "renderline returning: result $outstring instruction $instruction unapplied $unapplied overflow_right $overflow_right"
             return $outstring
         }
         #return [join $out ""]
@@ -3370,8 +4036,9 @@ tcl::namespace::eval overtype::piper {
 }
 interp alias "" piper_renderline "" overtype::piper::renderline 
 
-#intended for single grapheme - but will work for multiple
-#cannot contain ansi or newlines 
+#intended primarily for single grapheme - but will work for multiple
+#WARNING: query CAN contain ansi or newlines - but if cache was not already set manually,the answer will be incorrect!
+#We deliberately allow this for PM/SOS attached within a column
 #(a cache of ansifreestring_width calls - as these are quite regex heavy)
 proc overtype::grapheme_width_cached {ch} {
     variable grapheme_widths
@@ -3439,6 +4106,7 @@ tcl::namespace::eval overtype::priv {
         tcl::dict::set cache_is_sgr $code $answer
         return $answer
     }
+    # better named render_to_unapplied?
     proc render_unapplied {overlay_grapheme_control_list gci} {
         upvar idx_over idx_over
         upvar unapplied unapplied
@@ -3532,7 +4200,7 @@ tcl::namespace::eval overtype::priv {
             set ustacks [lreplace $ustacks $i $i]
             set gxstacks [lreplace $gxstacks $i $i]
         } else {
-
+            puts stderr "render_delchar - attempt to delchar at index $i >= number of outcols $nxt - shouldn't happen"
         }
     }
     proc render_erasechar {i count} {
@@ -3563,21 +4231,68 @@ tcl::namespace::eval overtype::priv {
         upvar outcols o
         lset o $i $c
     }
+
+    #Initial usecase is for old-terminal hack to add PM-wrapped \b
+    #review - can be used for other multibyte sequences that occupy one column?
+    #combiners? diacritics?
+    proc render_append_to_char {i c} {
+        upvar outcols o
+        if {$i > [llength $o]-1} {
+            error "render_append_to_char cannot append [ansistring VIEW -lf 1 -nul 1 $c] to existing char at index $i while $i >= llength outcols [llength $o]"
+        }
+        set existing [lindex $o $i]
+        if {$existing eq "\0"} {
+            lset o $i $c
+        } else {
+            lset o $i [string cat $existing $c] 
+        }
+    } 
     #is actually addgrapheme?
     proc render_addchar {i c sgrstack gx0stack {insert_mode 0}} {
         upvar outcols o
         upvar understacks ustacks
         upvar understacks_gx gxstacks
 
-        if 0 {
-        if {$c eq "c"} {
-            puts "i:$i c:$c sgrstack:[ansistring VIEW $sgrstack]"
-            puts "understacks:[ansistring VIEW $ustacks]"
-            upvar overstacks overstacks
-            puts "overstacks:[ansistring VIEW $overstacks]"
-            puts "info level 0:[info level 0]"
-        }
+        # -- --- ---
+        #this is somewhat of a hack.. probably not really the equivalent of proper reverse video? review
+        #we should ideally be able to reverse the video of a sequence that already includes SGR reverse/noreverse attributes
+        upvar reverse_mode do_reverse
+        #if {$do_reverse} {
+        #    lappend sgrstack [a+ reverse]
+        #} else {
+        #    lappend sgrstack [a+ noreverse]
+        #}
+
+        #JMN3
+        if {$do_reverse} {
+            #note we can't just look for \x1b\[7m  or \x1b\[27m
+            # it may be a more complex sequence like \x1b\[0\;\;7\;31m  etc
+
+            set existing_reverse_state 0 
+            set codeinfo [punk::ansi::codetype::sgr_merge $sgrstack -info 1]
+            set codestate_reverse [dict get $codeinfo codestate reverse]
+            switch -- $codestate_reverse {
+                7 {
+                    set existing_reverse_state 1
+                }
+                27 {
+                    set existing_reverse_state 0
+                }
+                "" {
+                }
+            }
+            if {$existing_reverse_state == 0} {
+                set rflip [a+ reverse]
+            } else {
+                #reverse of reverse
+                set rflip [a+ noreverse]
+            }
+            #note that mergeresult can have multiple esc (due to unmergeables or non sgr codes)
+            set sgrstack [list [dict get $codeinfo mergeresult] $rflip]
+            #set sgrstack [punk::ansi::codetype::sgr_merge [list [dict get $codeinfo mergeresult] $rflip]]
         }
+        
+        # -- --- ---
 
         set nxt [llength $o] 
         if {!$insert_mode} {
diff --git a/src/vendormodules/test/tomlish-1.1.1.tm b/src/vendormodules/test/tomlish-1.1.1.tm
index e5909c53..885c56a1 100644
Binary files a/src/vendormodules/test/tomlish-1.1.1.tm and b/src/vendormodules/test/tomlish-1.1.1.tm differ
diff --git a/src/vfs/_vfscommon/modules/overtype-1.6.5.tm b/src/vfs/_vfscommon/modules/overtype-1.6.5.tm
index 143794fb..38ce71c2 100644
--- a/src/vfs/_vfscommon/modules/overtype-1.6.5.tm
+++ b/src/vfs/_vfscommon/modules/overtype-1.6.5.tm
@@ -163,22 +163,23 @@ proc overtype::string_columns {text} {
 tcl::namespace::eval overtype::priv {
 }
 
-#could return larger than colwidth
+#could return larger than renderwidth 
 proc _get_row_append_column {row} {
+    #obsolete?
     upvar outputlines outputlines 
     set idx [expr {$row -1}]
     if {$row <= 1 || $row > [llength $outputlines]} {
         return 1
     } else {
-        upvar opt_overflow opt_overflow
-        upvar colwidth colwidth
+        upvar opt_expand_right expand_right 
+        upvar renderwidth renderwidth 
         set existinglen [punk::ansi::printing_length [lindex $outputlines $idx]]
         set endpos [expr {$existinglen +1}]
-        if {$opt_overflow} {
+        if {$expand_right} {
             return $endpos
         } else {
-            if {$endpos > $colwidth} {
-                return $colwidth + 1
+            if {$endpos > $renderwidth} {
+                return $renderwidth + 1
             } else {
                 return $endpos
             }
@@ -204,38 +205,70 @@ tcl::namespace::eval overtype {
     proc renderspace {args} {
         #*** !doctools
         #[call [fun overtype::renderspace] [arg args] ]
-        #[para]	usage: ?-transparent [lb]0|1[rb]? ?-overflow [lb]1|0[rb]? ?-ellipsis [lb]1|0[rb]? ?-ellipsistext ...? undertext overtext
+        #[para]	usage: ?-transparent [lb]0|1[rb]? ?-expand_right [lb]1|0[rb]? ?-ellipsis [lb]1|0[rb]? ?-ellipsistext ...? undertext overtext
 
         # @c overtype starting at left (overstrike) 
         # @c can/should we use something like this?: 'format "%-*s" $len $overtext 
         variable default_ellipsis_horizontal
 
         if {[llength $args] < 2} {
-            error {usage: ?-width <int>? ?-startcolumn <int>? ?-transparent [0|1|<char>]? ?-overflow [1|0]? ?-ellipsis [1|0]? ?-ellipsistext ...? undertext overtext}
+            error {usage: ?-width <int>? ?-startcolumn <int>? ?-transparent [0|1|<char>]? ?-expand_right [1|0]? ?-ellipsis [1|0]? ?-ellipsistext ...? undertext overtext}
+        }
+        set optargs [lrange $args 0 end-2]
+        if {[llength $optargs] % 2 == 0} {
+            lassign [lrange $args end-1 end] underblock overblock
+            set argsflags [lrange $args 0 end-2]
+        } else {
+            set optargs [lrange $args 0 end-1]
+            if {[llength $optargs] %2 == 0} {
+                set overblock [lindex $args end]
+                set underblock ""
+                set argsflags [lrange $args 0 end-1]
+            } else {
+                error "renderspace expects opt-val pairs followed by: <underblock> <overblock> or just <overblock>"
+            }
         }
-        lassign [lrange $args end-1 end] underblock overblock
         set opts [tcl::dict::create\
-            -bias       ignored\
-            -width      \uFFEF\
-            -height     \uFFEF\
+            -bias           ignored\
+            -width          \uFFEF\
+            -height         \uFFEF\
             -startcolumn    1\
-            -wrap       0\
-            -ellipsis   0\
+            -wrap           0\
+            -ellipsis       0\
             -ellipsistext   $default_ellipsis_horizontal\
             -ellipsiswhitespace 0\
-            -overflow   0\
-            -appendlines  1\
-            -transparent 0\
-            -exposed1 \uFFFD\
-            -exposed2 \uFFFD\
-            -experimental  0\
-            -looplimit  \uFFEF\
+            -expand_right       0\
+            -appendlines    1\
+            -transparent    0\
+            -exposed1       \uFFFD\
+            -exposed2       \uFFFD\
+            -experimental   0\
+            -cp437          1\
+            -looplimit      \uFFEF\
+            -crm_mode       0\
+            -reverse_mode   0\
+            -insert_mode    0\
+            -console {stdin stdout stderr}\
         ]
+        #expand_right is perhaps consistent with the idea of the page_size being allowed to grow horizontally..
+        # it does not necessarily mean the viewport grows. (which further implies need for horizontal scrolling)
+        # - it does need to be within some concept of terminal width - as columns must be addressable by ansi sequences.
+        # - This implies the -width option value must grow if it is tied to the concept of renderspace terminal width! REVIEW.
+        # - further implication is that if expand_right grows the virtual renderspace terminal width - 
+        #  then some sort of reflow/rerender needs to be done for preceeding lines?
+        # possibly not - as expand_right is distinct from a normal terminal-width change event, 
+        # expand_right being primarily to support other operations such as textblock::table
+
+        #todo - viewport width/height as separate concept to terminal width/height?
         #-ellipsis args not used if -wrap is true
-        set argsflags [lrange $args 0 end-2]
         foreach {k v} $argsflags {
             switch -- $k {
-                -looplimit - -width - -height - -startcolumn - -bias - -wrap - -ellipsis - -ellipsistext - -ellipsiswhitespace - -overflow - -appendlines - -transparent - -exposed1 - -exposed2 - -experimental {
+                -looplimit - -width - -height - -startcolumn - -bias - -wrap - -ellipsis - -ellipsistext - -ellipsiswhitespace
+                - -transparent - -exposed1 - -exposed2 - -experimental
+                - -expand_right - -appendlines
+                - -reverse_mode - -crm_mode - -insert_mode 
+                - -cp437
+                - -console {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -245,7 +278,8 @@ tcl::namespace::eval overtype {
         }
         #set opts [tcl::dict::merge $defaults $argsflags]
         # -- --- --- --- --- ---
-        set opt_overflow        [tcl::dict::get $opts -overflow] 
+        #review - expand_left for RTL text? 
+        set opt_expand_right    [tcl::dict::get $opts -expand_right] 
         #####
         # review -wrap should map onto DECAWM terminal mode - the wrap 2 idea may not fit in with this?.
         set opt_wrap            [tcl::dict::get $opts -wrap]  ;#wrap 1 is hard wrap cutting word at exact column, or 1 column early for 2w-glyph, wrap 2 is for language-based word-wrap algorithm (todo)
@@ -261,23 +295,33 @@ tcl::namespace::eval overtype {
         set opt_exposed1        [tcl::dict::get $opts -exposed1] ;#widechar_exposed_left  - todo
         set opt_exposed2        [tcl::dict::get $opts -exposed2] ;#widechar_exposed_right - todo
         # -- --- --- --- --- ---
+        set opt_crm_mode        [tcl::dict::get $opts -crm_mode]
+        set opt_reverse_mode    [tcl::dict::get $opts -reverse_mode]
+        set opt_insert_mode     [tcl::dict::get $opts -insert_mode]
+        # -- --- --- --- --- ---
+        set opt_cp437           [tcl::dict::get $opts -cp437]
+
+
+        #initial state for renderspace 'terminal' reset
+        set initial_state [dict create\
+            -width          $opt_width\
+            -height         $opt_height\
+            -crm_mode       $opt_crm_mode\
+            -reverse_mode   $opt_reverse_mode\
+            -insert_mode    $opt_insert_mode\
+            -cp437          $opt_cp437\
+        ]
 
         # ----------------------------
         #  -experimental dev flag to set flags etc
         # ----------------------------
         set data_mode 0
-        set test_mode 1
         set info_mode 0
         set edit_mode 0
         set opt_experimental   [tcl::dict::get $opts -experimental]
         foreach o $opt_experimental {
             switch -- $o {
-                test_mode {
-                    set test_mode 1
-                    set info_mode 1
-                }
                 old_mode {
-                    set test_mode 0
                     set info_mode 1
                 }
                 data_mode {
@@ -291,13 +335,13 @@ tcl::namespace::eval overtype {
                 }
             }
         }
-        set test_mode 1 ;#try to eliminate
         # ----------------------------
 
         #modes
-        set insert_mode 0 ;#can be toggled by insert key or ansi IRM sequence ESC [ 4 h|l
-        set autowrap_mode $opt_wrap
-        set reverse_mode 0
+        set insert_mode     $opt_insert_mode ;#can be toggled by insert key or ansi IRM sequence ESC [ 4 h|l
+        set autowrap_mode   $opt_wrap
+        set reverse_mode    $opt_reverse_mode 
+        set crm_mode        $opt_crm_mode 
         
 
         set underblock [tcl::string::map {\r\n \n} $underblock]
@@ -307,33 +351,35 @@ tcl::namespace::eval overtype {
         #set underlines [split $underblock \n]
 
         #underblock is a 'rendered' block - so width height make sense
-        #colwidth & colheight were originally named with reference to rendering into a 'column' of output e.g  a table column - before cursor row/col was implemented.
-        #The naming is now confusing. It should be something like renderwidth renderheight ?? review 
+        #only non-cursor affecting and non-width occupying ANSI codes should be present.
+        #ie SGR codes and perhaps things such as PM - although generally those should have been pushed to the application already
+        #renderwidth & renderheight were originally used with reference to rendering into a 'column' of output e.g  a table column - before cursor row/col was implemented.
         
         if {$opt_width eq "\uFFEF" || $opt_height eq "\uFFEF"} {
-            lassign [blocksize $underblock] _w colwidth _h colheight
+            lassign [blocksize $underblock] _w renderwidth _h renderheight 
             if {$opt_width ne "\uFFEF"} {
-                set colwidth $opt_width
+                set renderwidth $opt_width
             }
             if {$opt_height ne "\uFFEF"} {
-                set colheight $opt_height
+                set renderheight $opt_height
             }
         } else {
-            set colwidth $opt_width
-            set colheight $opt_height
+            set renderwidth $opt_width
+            set renderheight $opt_height
         }
 
         # -- --- --- --- 
         #REVIEW - do we need ansi resets in the underblock?
         if {$underblock eq ""} {
-            set underlines [lrepeat $colheight ""]
+            set underlines [lrepeat $renderheight ""]
         } else {
+            set underblock [textblock::join_basic -- $underblock] ;#ensure properly rendered - ansi per-line resets & replays
             set underlines [split $underblock \n]
         }
         #if {$underblock eq ""} {
         #    set blank "\x1b\[0m\x1b\[0m"
         #    #set underlines [list "\x1b\[0m\x1b\[0m"]
-        #    set underlines [lrepeat $colheight $blank]
+        #    set underlines [lrepeat $renderheight $blank]
         #} else {
         #    #lines_as_list -ansiresets 1 will do nothing if -ansiresets 1 isn't specified - REVIEW
         #    set underlines [lines_as_list -ansiresets 1 $underblock]
@@ -341,7 +387,7 @@ tcl::namespace::eval overtype {
         # -- --- --- --- 
 
         #todo - reconsider the 'line' as the natural chunking mechanism for the overlay.
-        #In practice an overlay ANSI stream can be a single line with ansi moves/restores etc - or even have no moves or newlines, just relying on wrapping at the output colwidth
+        #In practice an overlay ANSI stream can be a single line with ansi moves/restores etc - or even have no moves or newlines, just relying on wrapping at the output renderwidth 
         #In such cases - we process the whole shebazzle for the first output line - only reducing by the applied amount at the head each time, reprocessing the long tail each time.
         #(in cases where there are interline moves or cursor jumps anyway)
         #This works - but doesn't seem efficient.
@@ -356,49 +402,45 @@ tcl::namespace::eval overtype {
             set looplimit [expr {[tcl::string::length $overblock] + 10}]
         }
 
-        if {!$test_mode} {
-            set inputchunks [split $overblock \n]
-        } else {
-            set scheme 3
-            switch -- $scheme {
-                0 {
-                    #one big chunk
-                    set inputchunks [list $overblock]
+        set scheme 3
+        switch -- $scheme {
+            0 {
+                #one big chunk
+                set inputchunks [list $overblock]
+            }
+            1 {
+                set inputchunks [punk::ansi::ta::split_codes $overblock]
+            }
+            2 {
+
+                #split into lines if possible first - then into plaintext/ansi-sequence chunks ?
+                set inputchunks [list ""] ;#put an empty plaintext split in for starters
+                set i 1
+                set lines [split $overblock \n]
+                foreach ln $lines {
+                    if {$i < [llength $lines]} {
+                        append ln \n
+                    }
+                    set sequence_split [punk::ansi::ta::split_codes_single $ln]  ;#use split_codes Not split_codes_single?
+                    set lastpt [lindex $inputchunks end]
+                    lset inputchunks end [tcl::string::cat $lastpt [lindex $sequence_split 0]]
+                    lappend inputchunks {*}[lrange $sequence_split 1 end]
+                    incr i
                 }
-                1 {
-                    set inputchunks [punk::ansi::ta::split_codes $overblock]
+            }
+            3 {
+                #it turns out line based chunks are faster than the above.. probably because some of those end up doing the regex splitting twice 
+                set lflines [list]
+                set inputchunks [split $overblock \n]
+                foreach ln $inputchunks {
+                    append ln \n
+                    lappend lflines $ln
                 }
-                2 {
-
-                    #split into lines if possible first - then into plaintext/ansi-sequence chunks ?
-                    set inputchunks [list ""] ;#put an empty plaintext split in for starters
-                    set i 1
-                    set lines [split $overblock \n]
-                    foreach ln $lines {
-                        if {$i < [llength $lines]} {
-                            append ln \n
-                        }
-                        set sequence_split [punk::ansi::ta::split_codes_single $ln]  ;#use split_codes Not split_codes_single?
-                        set lastpt [lindex $inputchunks end]
-                        lset inputchunks end [tcl::string::cat $lastpt [lindex $sequence_split 0]]
-                        lappend inputchunks {*}[lrange $sequence_split 1 end]
-                        incr i
-                    }
+                if {[llength $lflines]} {
+                    lset lflines end [tcl::string::range [lindex $lflines end] 0 end-1]
                 }
-                3 {
-                    #it turns out line based chunks are faster than the above.. probably because some of those end up doing the regex splitting twice 
-                    set lflines [list]
-                    set inputchunks [split $overblock \n]
-                    foreach ln $inputchunks {
-                        append ln \n
-                        lappend lflines $ln
-                    }
-                    if {[llength $lflines]} {
-                        lset lflines end [tcl::string::range [lindex $lflines end] 0 end-1]
-                    }
-                    set inputchunks $lflines[unset lflines]
+                set inputchunks $lflines[unset lflines]
 
-                }
             }
         }
 
@@ -409,7 +451,7 @@ tcl::namespace::eval overtype {
 
         set replay_codes_underlay [tcl::dict::create 1 ""] 
         #lappend replay_codes_overlay ""
-        set replay_codes_overlay ""
+        set replay_codes_overlay "[punk::ansi::a]"
         set unapplied ""
         set cursor_saved_position [tcl::dict::create] 
         set cursor_saved_attributes ""
@@ -420,11 +462,11 @@ tcl::namespace::eval overtype {
 
         #underlines are not necessarily processed in order - depending on cursor-moves applied from overtext
         set row 1
-        if {$data_mode} {
-            set col [_get_row_append_column $row] 
-        } else {
+        #if {$data_mode} {
+        #    set col [_get_row_append_column $row] 
+        #} else {
             set col $opt_startcolumn 
-        }
+        #}
 
         set instruction_stats [tcl::dict::create]
 
@@ -452,26 +494,34 @@ tcl::namespace::eval overtype {
             }
             #review insert_mode. As an 'overtype' function whose main function is not interactive keystrokes - insert is secondary - 
             #but even if we didn't want it as an option to the function call - to process ansi adequately we need to support IRM (insertion-replacement mode) ESC [ 4 h|l
-            set LASTCALL [list -info 1 -insert_mode $insert_mode -autowrap_mode $autowrap_mode -transparent $opt_transparent -width $colwidth  -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -cursor_column $col -cursor_row $row $undertext $overtext]
-            set rinfo [renderline   -experimental $opt_experimental\
+            set renderargs [list    -experimental $opt_experimental\
+                                    -cp437        $opt_cp437\
                                     -info 1\
+                                    -crm_mode $crm_mode\
                                     -insert_mode $insert_mode\
-                                    -cursor_restore_attributes $cursor_saved_attributes\
                                     -autowrap_mode $autowrap_mode\
+                                    -reverse_mode $reverse_mode\
+                                    -cursor_restore_attributes $cursor_saved_attributes\
                                     -transparent $opt_transparent\
-                                    -width $colwidth\
+                                    -width $renderwidth\
                                     -exposed1 $opt_exposed1\
                                     -exposed2 $opt_exposed2\
-                                    -overflow $opt_overflow\
+                                    -expand_right $opt_expand_right\
                                     -cursor_column $col\
                                     -cursor_row $row\
                                      $undertext\
                                      $overtext\
-                    ]
+                        ]
+            set LASTCALL $renderargs
+            set rinfo [renderline {*}$renderargs]
+
             set instruction                 [tcl::dict::get $rinfo instruction]
             set insert_mode                 [tcl::dict::get $rinfo insert_mode]
             set autowrap_mode               [tcl::dict::get $rinfo autowrap_mode] ;#
-            #set reverse_mode                [tcl::dict::get $rinfo reverse_mode];#how to support in rendered linelist? we need to examine all pt/code blocks and flip each SGR stack?
+            set reverse_mode                [tcl::dict::get $rinfo reverse_mode]
+            #how to support reverse_mode in rendered linelist? we need to examine all pt/code blocks and flip each SGR stack?
+            # - review - the answer is probably that we don't need to - it is set/reset only during application of overtext
+            set crm_mode                    [tcl::dict::get $rinfo crm_mode]
             set rendered                    [tcl::dict::get $rinfo result]
             set overflow_right              [tcl::dict::get $rinfo overflow_right]
             set overflow_right_column       [tcl::dict::get $rinfo overflow_right_column]
@@ -486,7 +536,37 @@ tcl::namespace::eval overtype {
             set insert_lines_below          [tcl::dict::get $rinfo insert_lines_below]
             tcl::dict::set replay_codes_underlay [expr {$renderedrow+1}] [tcl::dict::get $rinfo replay_codes_underlay]
             #lset replay_codes_overlay [expr $overidx+1] [tcl::dict::get $rinfo replay_codes_overlay]
-            set replay_codes_overlay        [tcl::dict::get $rinfo replay_codes_overlay]
+            set replay_codes_overlay    [tcl::dict::get $rinfo replay_codes_overlay]
+            if {0 && $reverse_mode} {
+                #test branch - todo - prune
+                puts stderr "---->[ansistring VIEW $replay_codes_overlay] rendered: $rendered"
+                #review
+                #JMN3
+                set existing_reverse_state 0 
+                #split_codes_single is single esc sequence - but could have multiple sgr codes within one esc sequence
+                #e.g \x1b\[0;31;7m  has a reset,colour red and reverse
+                set codeinfo [punk::ansi::codetype::sgr_merge [list $replay_codes_overlay] -info 1]
+                set codestate_reverse [dict get $codeinfo codestate reverse]
+                switch -- $codestate_reverse {
+                    7 {
+                        set existing_reverse_state 1
+                    }
+                    27 {
+                        set existing_reverse_state 0
+                    }
+                    "" {
+                    }
+                }
+                if {$existing_reverse_state == 0} {
+                    set rflip [a+ reverse]
+                } else {
+                    #reverse of reverse
+                    set rflip [a+ noreverse]
+                }
+                #note that mergeresult can have multiple esc (due to unmergeables or non sgr codes)
+                set replay_codes_overlay [punk::ansi::codetype::sgr_merge [list [dict get $codeinfo mergeresult] $rflip]]
+                puts stderr "---->[ansistring VIEW $replay_codes_overlay] rendered: $rendered"
+            }
 
 
 
@@ -515,29 +595,17 @@ tcl::namespace::eval overtype {
                 #keeping separate branches for debugging - review and merge as appropriate when stable
                 tcl::dict::incr instruction_stats $instruction 
                 switch -- $instruction {
-                    {} {
-                        if {$test_mode == 0} {
-                            incr row
-                            if {$data_mode} {
-                                set col [_get_row_append_column $row] 
-                                if {$col > $colwidth} {
+                    reset {
+                        #reset the 'renderspace terminal' (not underlying terminal)
+                        set row 1
+                        set col 1
 
-                                }
-                            } else {
-                                set col 1
-                            }
-                        } else {
-                            #lf included in data
-                            set row $post_render_row
-                            set col $post_render_col
 
-                            #set col 1
-                            #if {$post_render_row != $renderedrow} {
-                            #    set col 1
-                            #} else {
-                            #    set col $post_render_col
-                            #}
-                        }
+                    }
+                    {} {
+                        #lf included in data
+                        set row $post_render_row
+                        set col $post_render_col
                     }
                     up {
 
@@ -563,10 +631,10 @@ tcl::namespace::eval overtype {
                             #we need renderline to return the number of the maximum column filled (or min if we ever do r-to-l)
                             set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                             set lastdatacol [punk::ansi::printing_length $existingdata]
-                            if {$lastdatacol < $colwidth} {
+                            if {$lastdatacol < $renderwidth} {
                                 set col [expr {$lastdatacol+1}]
                             } else {
-                                set col $colwidth 
+                                set col $renderwidth 
                             }
                         }
                         
@@ -601,10 +669,10 @@ tcl::namespace::eval overtype {
                             }
                             set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                             set lastdatacol [punk::ansi::printing_length $existingdata]
-                            if {$lastdatacol < $colwidth} {
+                            if {$lastdatacol < $renderwidth} {
                                 set col [expr {$lastdatacol+1}]
                             } else {
-                                set col $colwidth 
+                                set col $renderwidth 
                             }
 
                         }
@@ -640,9 +708,16 @@ tcl::namespace::eval overtype {
 
                             puts stdout ">>>[a+ red bold]overflow_right during restore_cursor[a]"
 
-                            set sub_info [overtype::renderline -info 1 -width $colwidth -insert_mode $insert_mode -autowrap_mode $autowrap_mode  -overflow [tcl::dict::get $opts -overflow] "" $overflow_right]
+                            set sub_info [overtype::renderline -info 1\
+                                            -width $renderwidth\
+                                            -insert_mode $insert_mode\
+                                            -autowrap_mode $autowrap_mode\
+                                            -expand_right [tcl::dict::get $opts -opt_expand_right]\
+                                            ""\
+                                            $overflow_right\
+                                        ]
                             set foldline [tcl::dict::get $sub_info result]
-                            set insert_mode [tcl::dict::get $sub_info insert_mode] ;#probably not needed.. 
+                            set insert_mode [tcl::dict::get $sub_info insert_mode] ;#probably not needed..? 
                             set autowrap_mode [tcl::dict::get $sub_info autowrap_mode] ;#nor this..
                             linsert outputlines $renderedrow $foldline
                             #review - row & col set by restore - but not if there was no save..
@@ -671,7 +746,7 @@ tcl::namespace::eval overtype {
                         #overflow + unapplied?
                     }
                     lf_start {
-                        #raw newlines - must be test_mode
+                        #raw newlines 
                         # ----------------------
                         #test with fruit.ans
                         #test - treating as newline below...
@@ -687,48 +762,58 @@ tcl::namespace::eval overtype {
                     }
                     lf_mid {
 
-                            if 0 {
-                                #set rhswidth [punk::ansi::printing_length $overflow_right]
-                                #only show debug when we have overflow?
-                                set lhs [overtype::left -width 40 -wrap 1 "" [ansistring VIEWSTYLE -nul 1 -lf 1 -vt 1 $rendered]]
-                                set lhs [textblock::frame -title "rendered $visualwidth cols" -subtitle "row-$renderedrow" $lhs]
-
-                                set rhs ""
-                                if {$overflow_right ne ""} {
-                                    set rhs [overtype::left -width 40 -wrap 1 "" [ansistring VIEWSTYLE -nul 1 -lf 1 -vt 1 $overflow_right]]
-                                    set rhs [textblock::frame -title overflow_right $rhs]
-                                }
-                                puts [textblock::join $lhs " $post_render_col " $rhs]
-                            }
-
-                            if {!$test_mode} {
-                                #rendered 
-                                append rendered $overflow_right
-                                #set replay_codes_overlay "" 
+                            set edit_mode 0
+                            if {$edit_mode} {
+                                set inputchunks [linsert $inputchunks 0 $overflow_right$unapplied]
                                 set overflow_right ""
-
-
-                                set row $renderedrow
-
+                                set unapplied ""
+                                set row $post_render_row
+                                #set col $post_render_col
                                 set col $opt_startcolumn 
-                                incr row 
-                                #only add newline if we're at the bottom
                                 if {$row > [llength $outputlines]} {
                                     lappend outputlines {*}[lrepeat 1 ""]
                                 }
                             } else {
-                                set edit_mode 0
-                                if {$edit_mode} {
-                                    set inputchunks [linsert $inputchunks 0 $overflow_right$unapplied]
-                                    set overflow_right ""
-                                    set unapplied ""
+                                if 1 {
+                                    if {$overflow_right ne ""} {
+                                        if {$opt_expand_right} {
+                                            append rendered $overflow_right
+                                            set overflow_right ""
+                                        } else {
+                                            set  overflow_width [punk::ansi::printing_length $overflow_right]
+                                            if {$visualwidth + $overflow_width <= $renderwidth} {
+                                                append rendered $overflow_right
+                                                set overflow_right ""
+                                            } else {
+                                                if {$visualwidth < $renderwidth} {
+                                                    set graphemes [punk::char::grapheme_split $overflow_width]
+                                                    set add "" 
+                                                    set addlen $visualwidth
+                                                    set remaining_overflow $graphemes 
+                                                    foreach g $graphemes {
+                                                        set w [overtype::grapheme_width_cached]
+                                                        if {$addlen + $w <= $renderwidth} {
+                                                            append add $g
+                                                            incr addlen $w
+                                                            lpop remaining_overflow
+                                                        } else {
+                                                            break
+                                                        } 
+                                                    }
+                                                    append rendered $add
+                                                    set overflow_right [join $remaining_overflow ""]
+                                                }
+                                            }
+                                        }
+                                    }
                                     set row $post_render_row
-                                    #set col $post_render_col
                                     set col $opt_startcolumn 
                                     if {$row > [llength $outputlines]} {
                                         lappend outputlines {*}[lrepeat 1 ""]
                                     }
                                 } else {
+                                    #old version - known to work with various ansi graphics - e.g fruit.ans
+                                    # - but fails to limit lines to renderwidth when expand_right == 0
                                     append rendered $overflow_right
                                     set overflow_right ""
                                     set row $post_render_row
@@ -740,7 +825,7 @@ tcl::namespace::eval overtype {
                             }
                     }
                     lf_overflow {
-                            #linefeed after colwidth e.g at column 81 for an 80 col width
+                            #linefeed after renderwidth e.g at column 81 for an 80 col width
                             #we may also have other control sequences that came after col 80 e.g cursor save
 
                             if 0 {
@@ -787,38 +872,28 @@ tcl::namespace::eval overtype {
                             set row $post_render_row
                             set col $post_render_col
                             if {$insert_lines_below == 1} {
-                                if {$test_mode == 0} {
-                                    set row $renderedrow
-                                    set outputlines [linsert $outputlines [expr {$renderedrow }] {*}[lrepeat $insert_lines_below ""]] ;#note - linsert can add to end too
-                                    incr row $insert_lines_below
-                                    set col $opt_startcolumn 
-                                } else {
-                                    #set lhs [overtype::left -width 40 -wrap 1 "" [ansistring VIEWSTYLE -lf 1 -vt 1 $rendered]]
-                                    #set lhs [textblock::frame -title rendered -subtitle "row-$renderedrow" $lhs]
-                                    #set rhs ""
-                                    #if {$overflow_right ne ""} {
-                                    #    set rhs [overtype::left -width 40 -wrap 1 "" [ansistring VIEWSTYLE -lf 1 -vt 1 $overflow_right]]
-                                    #    set rhs [textblock::frame -title overflow_right $rhs]
-                                    #}
-                                    #puts [textblock::join $lhs $rhs]
-
-                                    #rendered 
-                                    append rendered $overflow_right
-                                    #
-
-
-                                    set overflow_right ""
-                                    set row $renderedrow
-                                    #only add newline if we're at the bottom
-                                    if {$row > [llength $outputlines]} {
-                                        lappend outputlines {*}[lrepeat $insert_lines_below ""]
-                                    }
-                                    incr row $insert_lines_below
-                                    set col $opt_startcolumn 
+                                #set lhs [overtype::left -width 40 -wrap 1 "" [ansistring VIEWSTYLE -lf 1 -vt 1 $rendered]]
+                                #set lhs [textblock::frame -title rendered -subtitle "row-$renderedrow" $lhs]
+                                #set rhs ""
+                                #if {$overflow_right ne ""} {
+                                #    set rhs [overtype::left -width 40 -wrap 1 "" [ansistring VIEWSTYLE -lf 1 -vt 1 $overflow_right]]
+                                #    set rhs [textblock::frame -title overflow_right $rhs]
+                                #}
+                                #puts [textblock::join $lhs $rhs]
 
+                                #rendered 
+                                append rendered $overflow_right
+                                #
 
 
+                                set overflow_right ""
+                                set row $renderedrow
+                                #only add newline if we're at the bottom
+                                if {$row > [llength $outputlines]} {
+                                    lappend outputlines {*}[lrepeat $insert_lines_below ""]
                                 }
+                                incr row $insert_lines_below
+                                set col $opt_startcolumn 
                             }
                         } else {
                             set row $post_render_row
@@ -833,10 +908,10 @@ tcl::namespace::eval overtype {
                             } else {
                                 set existingdata [lindex $outputlines [expr {$post_render_row -1}]] 
                                 set lastdatacol [punk::ansi::printing_length $existingdata]
-                                if {$lastdatacol < $colwidth} {
+                                if {$lastdatacol < $renderwidth} {
                                     set col [expr {$lastdatacol+1}]
                                 } else {
-                                    set col $colwidth 
+                                    set col $renderwidth 
                                 }
                             }
                         }
@@ -845,12 +920,12 @@ tcl::namespace::eval overtype {
                         #doesn't seem to be used by fruit.ans testfile
                         #used by dzds.ans
                         #note that cursor_forward may move deep into the next line - or even span multiple lines !TODO
-                        set c $colwidth 
+                        set c $renderwidth 
                         set r $post_render_row
-                        if {$post_render_col > $colwidth} {
+                        if {$post_render_col > $renderwidth} {
                             set i $c
                             while {$i <= $post_render_col} {
-                                if {$c == $colwidth+1} {
+                                if {$c == $renderwidth+1} {
                                     incr r
                                     if {$opt_appendlines} {
                                         if {$r < [llength $outputlines]} {
@@ -874,7 +949,7 @@ tcl::namespace::eval overtype {
                         set col $c
                     }
                     wrapmovebackward {
-                        set c $colwidth
+                        set c $renderwidth
                         set r $post_render_row
                         if {$post_render_col < 1} {
                             set c 1 
@@ -883,7 +958,7 @@ tcl::namespace::eval overtype {
                                 if {$c == 0} {
                                     if {$r > 1} {
                                         incr r -1
-                                        set c $colwidth
+                                        set c $renderwidth
                                     } else {
                                         #leave r at 1 set c 1
                                         #testfile besthpav.ans first line top left border alignment
@@ -910,7 +985,6 @@ tcl::namespace::eval overtype {
                             incr row
                             set col $opt_startcolumn ;#whether wrap or not - next data is at column 1  ??
                         } else {
-                            #this works for test_mode (which should become the default) - but could give a bad result otherwise - review - add tests fix.
                             set col $post_render_col
                             #set unapplied ""             ;#this seems wrong?
                             #set unapplied [tcl::string::range $unapplied 1 end] 
@@ -941,7 +1015,7 @@ tcl::namespace::eval overtype {
                         #2nd half of grapheme would overflow - treggering grapheme is returned in unapplied. There may also be overflow_right from earlier inserts
                         #todo - consider various options .. re-render a single trailing space or placeholder on same output line, etc
                         if {$autowrap_mode} {
-                            if {$colwidth < 2} {
+                            if {$renderwidth < 2} {
                                 #edge case of rendering to a single column output - any 2w char will just cause a loop if we don't substitute with something, or drop the character
                                 set idx 0
                                 set triggering_grapheme_index -1
@@ -960,7 +1034,7 @@ tcl::namespace::eval overtype {
                         } else {
                             set overflow_handled 1
                             #handled by dropping entire overflow if any  
-                            if {$colwidth < 2} {
+                            if {$renderwidth < 2} {
                                 set idx 0
                                 set triggering_grapheme_index -1
                                 foreach u $unapplied_list {
@@ -988,7 +1062,7 @@ tcl::namespace::eval overtype {
                 }
 
 
-            if {!$opt_overflow && !$autowrap_mode} {
+            if {!$opt_expand_right && !$autowrap_mode} {
                 #not allowed to overflow column or wrap therefore we get overflow data to truncate 
                 if {[tcl::dict::get $opts -ellipsis]} {
                     set show_ellipsis 1
@@ -1066,7 +1140,6 @@ tcl::namespace::eval overtype {
                 set debugmsg ""
                 append debugmsg "${Y}${sep_header}${RST}" \n
                 append debugmsg "looplimit $looplimit reached\n"
-                append debugmsg "test_mode:$test_mode\n"
                 append debugmsg "data_mode:$data_mode\n"
                 append debugmsg "opt_appendlines:$opt_appendlines\n"
                 append debugmsg "prev_row :[tcl::dict::get $LASTCALL -cursor_row]\n"
@@ -1141,12 +1214,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        #set renderwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
-        #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {$colwidth - $overblock_width}]
+        set under_exposed_max [expr {$renderwidth - $overblock_width}]
         if {$under_exposed_max > 0} {
             #background block is wider
             if {$under_exposed_max % 2 == 0} {
@@ -1176,14 +1248,14 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 set undertext "$undertext[string repeat { } $udiff]"
             }
             set undertext [tcl::string::cat $replay_codes_underlay $undertext]
             set overtext  [tcl::string::cat $replay_codes_overlay $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             #review - right-to-left langs should elide on left! - extra option required
 
             if {$overflowlength > 0} {
@@ -1196,8 +1268,8 @@ tcl::namespace::eval overtype {
 
                 #overlay line data is wider - trim if overflow not specified in opts - and overtype an ellipsis at right if it was specified
                 if {![tcl::dict::get $opts -overflow]} {
-                    #lappend outputlines [tcl::string::range $overtext 0 [expr {$colwidth - 1}]]
-                    #set overtext [tcl::string::range $overtext 0 $colwidth-1 ]
+                    #lappend outputlines [tcl::string::range $overtext 0 [expr {$renderwidth - 1}]]
+                    #set overtext [tcl::string::range $overtext 0 $renderwidth-1 ]
                     if {$opt_ellipsis} {
                         set show_ellipsis 1
                         if {!$opt_ellipsiswhitespace} {
@@ -1286,12 +1358,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
         #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {max(0,$colwidth - $overblock_width)}]
+        set under_exposed_max [expr {max(0,$renderwidth - $overblock_width)}]
         set left_exposed $under_exposed_max 
 
 
@@ -1307,8 +1378,8 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 #puts xxx
                 append undertext [string repeat { } $udiff]
             }
@@ -1336,10 +1407,17 @@ tcl::namespace::eval overtype {
             set undertext [tcl::string::cat $replay_codes_underlay $undertext]
             set overtext [tcl::string::cat $replay_codes_overlay $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             if {$overflowlength > 0} {	
                 #raw overtext wider than undertext column
-                set rinfo [renderline -info 1 -insert_mode 0 -transparent $opt_transparent -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -startcolumn [expr {1 + $startoffset}] $undertext $overtext]
+                set rinfo [renderline\
+                         -info 1\
+                         -insert_mode 0\
+                         -transparent $opt_transparent\
+                         -exposed1 $opt_exposed1 -exposed2 $opt_exposed2\
+                         -overflow $opt_overflow\
+                         -startcolumn [expr {1 + $startoffset}]\
+                         $undertext $overtext]
                 set replay_codes          [tcl::dict::get $rinfo replay_codes]
                 set rendered [tcl::dict::get $rinfo result]
                 if {!$opt_overflow} {
@@ -1364,7 +1442,7 @@ tcl::namespace::eval overtype {
                 #padded overtext 
                 #lappend outputlines [renderline -insert_mode 0 -transparent $opt_transparent -startcolumn [expr {$left_exposed + 1}] $undertext $overtext]
                 #Note - we still need overflow here - as although the overtext is short - it may oveflow due to the startoffset
-                set rinfo [renderline -info 1  -insert_mode 0 -transparent $opt_transparent -overflow $opt_overflow -startcolumn [expr {$left_exposed + 1 + $startoffset}] $undertext $overtext]
+                set rinfo [renderline -info 1  -insert_mode 0 -transparent $opt_transparent -expand_right $opt_overflow -startcolumn [expr {$left_exposed + 1 + $startoffset}] $undertext $overtext]
                 lappend outputlines  [tcl::dict::get $rinfo result]
             }
             set replay_codes          [tcl::dict::get $rinfo replay_codes]
@@ -1433,12 +1511,11 @@ tcl::namespace::eval overtype {
         set overblock  [tcl::string::map {\r\n \n} $overblock]
 
         set underlines [split $underblock \n]
-        #set colwidth [tcl::mathfunc::max {*}[lmap v $underlines {punk::ansi::printing_length $v}]]
-        lassign [blocksize $underblock] _w colwidth _h colheight
+        lassign [blocksize $underblock] _w renderwidth _h renderheight 
         set overlines  [split $overblock \n]
         #set overblock_width [tcl::mathfunc::max {*}[lmap v $overlines {punk::ansi::printing_length $v}]]
         lassign [blocksize $overblock] _w overblock_width _h overblock_height 
-        set under_exposed_max [expr {max(0,$colwidth - $overblock_width)}]
+        set under_exposed_max [expr {max(0,$renderwidth - $overblock_width)}]
 
         switch -- $opt_blockalign {
             left {
@@ -1484,8 +1561,8 @@ tcl::namespace::eval overtype {
         foreach undertext $underlines overtext $overlines {    
             set overtext_datalen [punk::ansi::printing_length $overtext]
             set ulen [punk::ansi::printing_length $undertext]
-            if {$ulen < $colwidth} {
-                set udiff [expr {$colwidth - $ulen}]
+            if {$ulen < $renderwidth} {
+                set udiff [expr {$renderwidth - $ulen}]
                 #puts xxx
                 append undertext [string repeat { } $udiff]
             }
@@ -1513,10 +1590,10 @@ tcl::namespace::eval overtype {
             set undertext   [tcl::string::cat $replay_codes_underlay    $undertext]
             set overtext    [tcl::string::cat $replay_codes_overlay     $overtext]
 
-            set overflowlength [expr {$overtext_datalen - $colwidth}]
+            set overflowlength [expr {$overtext_datalen - $renderwidth}]
             if {$overflowlength > 0} {	
                 #raw overtext wider than undertext column
-                set rinfo [renderline -info 1 -insert_mode 0 -transparent $opt_transparent -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -overflow $opt_overflow -startcolumn [expr {1 + $startoffset}] $undertext $overtext]
+                set rinfo [renderline -info 1 -insert_mode 0 -transparent $opt_transparent -exposed1 $opt_exposed1 -exposed2 $opt_exposed2 -expand_right $opt_overflow -startcolumn [expr {1 + $startoffset}] $undertext $overtext]
                 set replay_codes    [tcl::dict::get $rinfo replay_codes]
                 set rendered        [tcl::dict::get $rinfo result]
                 set overflow_right  [tcl::dict::get $rinfo overflow_right]
@@ -1564,8 +1641,9 @@ tcl::namespace::eval overtype {
             } else {
                 #padded overtext 
                 #lappend outputlines [renderline -insert_mode 0 -transparent $opt_transparent -startcolumn [expr {$left_exposed + 1}] $undertext $overtext]
-                #Note - we still need overflow here - as although the overtext is short - it may oveflow due to the startoffset
-                set rinfo [renderline -info 1  -insert_mode 0 -transparent $opt_transparent -overflow $opt_overflow -startcolumn [expr {$left_exposed + 1 + $startoffset}] $undertext $overtext]
+                #Note - we still need expand_right here - as although the overtext is short - it may oveflow due to the startoffset
+                set rinfo [renderline -info 1  -insert_mode 0 -transparent $opt_transparent -expand_right $opt_overflow -startcolumn [expr {$left_exposed + 1 + $startoffset}] $undertext $overtext]
+                #puts stderr "--> [ansistring VIEW -lf 1 -nul 1 $rinfo] <--"
                 set overflow_right  [tcl::dict::get $rinfo overflow_right]
                 set unapplied       [tcl::dict::get $rinfo unapplied]
                 lappend outputlines [tcl::dict::get $rinfo result]
@@ -1586,7 +1664,8 @@ tcl::namespace::eval overtype {
     #-returnextra enables returning of overflow and length
     #review - use punk::ansi::ta::detect to short-circuit processing and do simpler string calcs as an optimisation?
     #review - DECSWL/DECDWL double width line codes - very difficult/impossible to align and compose with other elements
-    #(could render it by faking it with sixels and a lot of work - find/make a sixel font and ensure it's exactly 2 cols per char)
+    #(could render it by faking it with sixels and a lot of work - find/make a sixel font and ensure it's exactly 2 cols per char?
+    # This would probably be impractical to support for different fonts)
     #todo - review transparency issues with single/double width characters
     #bidi - need a base direction and concept of directional runs for RTL vs LTR - may be best handled at another layer?
     proc renderline {args} {
@@ -1608,8 +1687,10 @@ tcl::namespace::eval overtype {
         #[para] The main 3 are the result, overflow_right, and unapplied.
         #[para] Renderline handles cursor movements from either keystrokes or ANSI sequences but for a full system the aforementioned loop will need to be in place to manage the set of lines under manipulation.
 
+        #puts stderr "renderline '$args'"
+
         if {[llength $args] < 2} {
-            error {usage: ?-info 0|1? ?-startcolumn <int>? ?-cursor_column <int>? ?-cursor_row <int>|""? ?-transparent [0|1|<regexp>]?  ?-overflow [1|0]? undertext overtext}
+            error {usage: ?-info 0|1? ?-startcolumn <int>? ?-cursor_column <int>? ?-cursor_row <int>|""? ?-transparent [0|1|<regexp>]?  ?-expand_right [1|0]? undertext overtext}
         }
         lassign [lrange $args end-1 end] under over
         if {[string first \n $under] >= 0} {
@@ -1623,12 +1704,13 @@ tcl::namespace::eval overtype {
         set opts [tcl::dict::create\
             -etabs         0\
             -width         \uFFEF\
-            -overflow      0\
+            -expand_right  0\
             -transparent   0\
             -startcolumn   1\
             -cursor_column 1\
             -cursor_row    ""\
             -insert_mode   1\
+            -crm_mode      0\
             -autowrap_mode 1\
             -reverse_mode  0\
             -info          0\
@@ -1643,13 +1725,15 @@ tcl::namespace::eval overtype {
         #cursor_row, when numeric will allow detection of certain row moves that are still within our row - allowing us to avoid an early return
         #An empty string for cursor_row tells us we have no info about our own row context, and to return with an unapplied string if any row move occurs
 
-        #exposed1 and exposed2 for first and second col of underying 2wide char which is truncated by transparency or overflow
+        #exposed1 and exposed2 for first and second col of underying 2wide char which is truncated by transparency, currsor movements to 2nd charcol, or overflow/expand_right
         #todo - return info about such grapheme 'cuts' in -info structure and/or create option to raise an error
 
         set argsflags [lrange $args 0 end-2]
         tcl::dict::for {k v} $argsflags {
             switch -- $k {
-                -experimental - -cp437 - -width - -overflow - -transparent - -startcolumn - -cursor_column - -cursor_row - -insert_mode - -autowrap_mode - -reverse_mode - -info - -exposed1 - -exposed2 - -cursor_restore_attributes {
+                -experimental - -cp437 - -width - -expand_right - -transparent - -startcolumn - -cursor_column - -cursor_row
+                - -crm_mode - -insert_mode - -autowrap_mode - -reverse_mode
+                - -info - -exposed1 - -exposed2 - -cursor_restore_attributes {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -1660,7 +1744,7 @@ tcl::namespace::eval overtype {
         # -- --- --- --- --- --- --- --- --- --- --- ---
         set opt_width               [tcl::dict::get $opts -width]
         set opt_etabs               [tcl::dict::get $opts -etabs]
-        set opt_overflow            [tcl::dict::get $opts -overflow]
+        set opt_expand_right        [tcl::dict::get $opts -expand_right]
         set opt_colstart            [tcl::dict::get $opts -startcolumn] ;#lhs limit for overlay - an offset to cursor_column  - first visible column is 1.  0 or < 0 are before the start of the underlay 
         set opt_colcursor           [tcl::dict::get $opts -cursor_column];#start cursor column relative to overlay
         set opt_row_context         [tcl::dict::get $opts -cursor_row]
@@ -1676,20 +1760,11 @@ tcl::namespace::eval overtype {
         # -- --- --- --- --- --- --- --- --- --- --- ---
         set opt_autowrap_mode       [tcl::dict::get $opts -autowrap_mode] ;#DECAWM - char or movement can go beyond leftmost/rightmost col to prev/next line
         set opt_reverse_mode        [tcl::dict::get $opts -reverse_mode]  ;#DECSNM
+        set opt_crm_mode            [tcl::dict::get $opts -crm_mode];# CRM - show control character mode
         # -- --- --- --- --- --- --- --- --- --- --- ---
         set temp_cursor_saved       [tcl::dict::get $opts -cursor_restore_attributes]
 
-        set test_mode 0
         set cp437_glyphs [tcl::dict::get $opts -cp437] 
-        foreach e [tcl::dict::get $opts -experimental] {
-            switch -- $e {
-                test_mode {
-                    set test_mode 1
-                    set cp437_glyphs 1
-                }
-            }
-        }
-        set test_mode 1  ;#try to elminate
         set cp437_map [tcl::dict::create]
         if {$cp437_glyphs} {
             set cp437_map [set ::punk::ansi::cp437_map]
@@ -1721,6 +1796,10 @@ tcl::namespace::eval overtype {
             set cursor_row $opt_row_context
         }
 
+        set insert_mode $opt_insert_mode ;#default 1
+        set autowrap_mode $opt_autowrap_mode ;#default 1
+        set crm_mode $opt_crm_mode ;#default 0 (Show Control Character mode)
+        set reverse_mode $opt_reverse_mode
 
         #-----
         #
@@ -1768,13 +1847,14 @@ tcl::namespace::eval overtype {
         }
         set understacks [list]
         set understacks_gx [list]
+        set pm_list [list]
 
         set i_u -1  ;#underlay may legitimately be empty
         set undercols [list] 
         set u_codestack [list]
         #u_gx_stack probably isn't really a stack -  I don't know if g0 g1 can stack or not - for now we support only g0 anyway
         set u_gx_stack [list] ;#separate stack for g0 (g1 g2 g3?) graphics on and off (DEC special graphics)
-        #set pt_underchars "" ;#for string_columns length calculation for overflow 0 truncation
+        #set pt_underchars "" ;#for string_columns length calculation for expand_right 0 truncation
         set remainder [list] ;#for returnextra
         foreach {pt code} $undermap {
             #pt = plain text
@@ -1834,6 +1914,7 @@ tcl::namespace::eval overtype {
             #underlay should already have been rendered and not have non-sgr codes - but let's retain the check for them and not stack them if other codes are here
 
             #only stack SGR (graphics rendition) codes - not title sets, cursor moves etc 
+            #keep any remaining PMs in place
             if {$code ne ""} {
                 set c1c2 [tcl::string::range $code 0 1]
 
@@ -1841,6 +1922,8 @@ tcl::namespace::eval overtype {
                     \x1b\[          7CSI\
                     \x9b            8CSI\
                     \x1b\(          7GFX\
+                    \x1b^           7PMX\
+                    \x1bX           7SOS\
                 ] $c1c2] 0 3];# leadernorm is 1st 2 chars mapped to normalised indicator - or is original 2 chars
 
                 switch -- $leadernorm {
@@ -1875,6 +1958,26 @@ tcl::namespace::eval overtype {
                             }
                         }
                     }
+                    7PMX - 7SOS {
+                        #we can have PMs or SOS (start of string) in the underlay - though mostly the PMs should have been processed..
+                        #attach the PM/SOS (entire ANSI sequence) to the previous grapheme! 
+                        #It should not affect the size - but terminal display may get thrown out if terminal doesn't support them.
+
+                        #note that there may in theory already be ANSI stored - we don't assume it was a pure grapheme string
+                        set graphemeplus [lindex $undercols end]
+                        if {$graphemeplus ne "\0"} {
+                            append graphemeplus $code
+                        } else {
+                            set graphemeplus $code
+                        }
+                        lset undercols end $graphemeplus
+                        #The grapheme_width_cached function will be called on this later - and doesn't account for ansi.
+                        #we need to manually cache the item with it's proper width 
+                        variable grapheme_widths
+                        #stripped and plus version  keys pointing to same length
+                        dict set grapheme_widths $graphemeplus [grapheme_width_cached [::punk::ansi::ansistrip $graphemeplus]]
+
+                    }
                     default {
 
                     }
@@ -1895,51 +1998,29 @@ tcl::namespace::eval overtype {
             #consider also if there are other codes that should be stacked..?
         }
 
-        if {!$test_mode} {
-            #fill columns to width with spaces, and carry over stacks - we will have to keep track of where the underlying data ends manually - TODO
-            #Specifying a width is suitable for terminal-like applications and text-blocks
-            if {$opt_width ne "\uFFEF"} {
-                if {[llength $understacks]} {
-                    set cs $u_codestack
-                    set gs $u_gx_stack
-                } else {
-                    set cs [list]
-                    set gs [list]
-                }
-                if {[llength $undercols]< $opt_width} {
-                    set diff [expr {$opt_width- [llength $undercols]}]
-                    if {$diff > 0} {
-                        lappend undercols       {*}[lrepeat $diff " "]
-                        lappend understacks     {*}[lrepeat $diff $cs]
-                        lappend understacks_gx  {*}[lrepeat $diff $gs]
-                    }
-                }
+        #NULL empty cell indicator
+        if {$opt_width ne "\uFFEF"} {
+            if {[llength $understacks]} {
+                set cs $u_codestack
+                set gs $u_gx_stack
+            } else {
+                set cs [list]
+                set gs [list]
             }
-        } else {
-            #NULL empty cell indicator
-            if {$opt_width ne "\uFFEF"} {
-                if {[llength $understacks]} {
-                    set cs $u_codestack
-                    set gs $u_gx_stack
-                } else {
-                    set cs [list]
-                    set gs [list]
-                }
-                if {[llength $undercols]< $opt_width} {
-                    set diff [expr {$opt_width- [llength $undercols]}]
-                    if {$diff > 0} {
-                        lappend undercols       {*}[lrepeat $diff "\u0000"]
-                        lappend understacks     {*}[lrepeat $diff $cs]
-                        lappend understacks_gx  {*}[lrepeat $diff $gs]
-                    }
+            if {[llength $undercols]< $opt_width} {
+                set diff [expr {$opt_width- [llength $undercols]}]
+                if {$diff > 0} {
+                    lappend undercols       {*}[lrepeat $diff "\u0000"]
+                    lappend understacks     {*}[lrepeat $diff $cs]
+                    lappend understacks_gx  {*}[lrepeat $diff $gs]
                 }
             }
-
         }
+
         if {$opt_width ne "\uFFEF"} {
-            set colwidth $opt_width
+            set renderwidth $opt_width
         } else {
-            set colwidth [llength $undercols]
+            set renderwidth [llength $undercols]
         }
 
 
@@ -2017,12 +2098,34 @@ tcl::namespace::eval overtype {
             }
             append pt_overchars $pt
             #will get empty pt between adjacent codes
-            foreach grapheme [punk::char::grapheme_split $pt] {
-                lappend overstacks $o_codestack
-                lappend overstacks_gx $o_gxstack
-                incr i_o 
-                lappend overlay_grapheme_control_list [list g $grapheme]
-                lappend overlay_grapheme_control_stacks $o_codestack
+            if {!$crm_mode} {
+                foreach grapheme [punk::char::grapheme_split $pt] {
+                    lappend overstacks $o_codestack
+                    lappend overstacks_gx $o_gxstack
+                    incr i_o 
+                    lappend overlay_grapheme_control_list [list g $grapheme]
+                    lappend overlay_grapheme_control_stacks $o_codestack
+                }
+            } else {
+                set tsbegin [clock micros]
+                foreach grapheme_original [punk::char::grapheme_split $pt] {
+                    set pt_crm [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $grapheme_original]
+                    #puts stderr "ptlen [string length $pt] graphemelen[string length $grapheme_original] pt_crmlen[string length $pt_crm] $pt_crm"
+                    foreach grapheme [punk::char::grapheme_split $pt_crm] {
+                        if {$grapheme eq "\n"} {
+                            lappend overlay_grapheme_control_stacks $o_codestack
+                            lappend overlay_grapheme_control_list [list crmcontrol "\x1b\[00001E"]
+                        } else {
+                            lappend overstacks $o_codestack
+                            lappend overstacks_gx $o_gxstack
+                            incr i_o 
+                            lappend overlay_grapheme_control_list [list g $grapheme]
+                            lappend overlay_grapheme_control_stacks $o_codestack
+                        }
+                    }
+                }
+                set elapsed [expr {[clock micros] - $tsbegin}]
+                puts stderr "ptlen [string length $pt] elapsedus:$elapsed"
             }
 
             #only stack SGR (graphics rendition) codes - not title sets, cursor moves etc 
@@ -2030,40 +2133,91 @@ tcl::namespace::eval overtype {
             # that pure resets are fairly common - more so than leading resets with other info
             # that non-sgr codes are not that common, so ok to check for resets before verifying it is actually SGR at all.
             if {$code ne ""} {
-                lappend overlay_grapheme_control_stacks $o_codestack
-                #there will always be an empty code at end due to foreach on 2 vars with odd-sized list ending with pt (overmap coming from perlish split) 
-                if {[punk::ansi::codetype::is_sgr_reset $code]} {
-                    set o_codestack [list "\x1b\[m"]  ;#reset better than empty list - fixes some ansi art issues
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
-                    set o_codestack [list $code]
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[priv::is_sgr $code]} {
-                    #basic simplification first - remove straight dupes
-                    set dup_posns [lsearch -all -exact $o_codestack $code] ;#must be -exact because of square-bracket glob chars
-                    set o_codestack [lremove $o_codestack {*}$dup_posns]
-                    lappend o_codestack $code
-                    lappend overlay_grapheme_control_list [list sgr $code]
-                } elseif {[regexp {\x1b7|\x1b\[s} $code]} {
-                    #experiment
-                    #cursor_save - for the replays review.
-                    #jmn
-                    #set temp_cursor_saved [punk::ansi::codetype::sgr_merge_list {*}$o_codestack]
-                    lappend overlay_grapheme_control_list [list other $code]
-                } elseif {[regexp {\x1b8|\x1b\[u} $code]} {
-                    #experiment
-                    #cursor_restore - for the replays
-                    set o_codestack [list $temp_cursor_saved]    
-                    lappend overlay_grapheme_control_list [list other $code]
+                #we need to immediately set crm_mode here if \x1b\[3h received
+                if {$code eq "\x1b\[3h"} {
+                    set crm_mode 1
+                } elseif {$code eq "\x1b\[3l"} {
+                    set crm_mode 0
+                }
+                #else crm_mode could be set either way from options
+                if {$crm_mode && $code ne "\x1b\[00001E"} {
+                    #treat the code as type 'g' like above   - only allow through codes to reset mode REVIEW for now just \x1b\[3l ? 
+                    #we need to somehow convert further \n in the graphical rep to an instruction for newline that will bypass further crm_mode processing or we would loop.
+                    set code_as_pt [ansistring VIEW -nul 1 -lf 1 -vt 1 -ff 1 $code]
+                    #split using standard split for first foreach loop - grapheme based split when processing 2nd foreach loop
+                    set chars [split $code_as_pt ""]
+                    set codeparts [list] ;#list of 2-el lists each element {crmcontrol <ansi>} or {g <text>}
+                    foreach c $chars {
+                        if {$c eq "\n"} {
+                            #use CNL (cursor next line)  \x1b\[00001E  ;#leading zeroes ok for this processor - used as debugging aid to distinguish 
+                            lappend codeparts [list crmcontrol "\x1b\[00001E"]
+                        } else {
+                            if {[llength $codeparts] > 0 && [lindex $codeparts end 0] eq "g"} {
+                                set existing [lindex $codeparts end 1]
+                                lset codeparts end [list g [string cat $existing $c]]
+                            } else {
+                                lappend codeparts [list g $c]
+                            }
+                        }
+                    }
+
+                    set partidx 0
+                    foreach record $codeparts {
+                        lassign $record rtype rval
+                        switch -exact -- $rtype {
+                            g {
+                                append pt_overchars $rval 
+                                foreach grapheme [punk::char::grapheme_split $rval] {
+                                    lappend overstacks $o_codestack
+                                    lappend overstacks_gx $o_gxstack
+                                    incr i_o 
+                                    lappend overlay_grapheme_control_list [list g $grapheme]
+                                    lappend overlay_grapheme_control_stacks $o_codestack
+                                }
+                            }
+                            crmcontrol {
+                                #leave o_codestack
+                                lappend overlay_grapheme_control_stacks $o_codestack
+                                lappend overlay_grapheme_control_list [list crmcontrol $rval]
+                            }
+                        }
+                    }
                 } else {
-                    if {[punk::ansi::codetype::is_gx_open $code]} {
-                        set o_gxstack [list "gx0_on"]
-                        lappend overlay_grapheme_control_list [list gx0 gx0_on] ;#don't store code - will complicate debugging if we spit it out and jump character sets
-                    } elseif {[punk::ansi::codetype::is_gx_close $code]} {
-                        set o_gxstack [list]
-                        lappend overlay_grapheme_control_list [list gx0 gx0_off] ;#don't store code - will complicate debugging if we spit it out and jump character sets
-                    } else {
+                    lappend overlay_grapheme_control_stacks $o_codestack
+                    #there will always be an empty code at end due to foreach on 2 vars with odd-sized list ending with pt (overmap coming from perlish split) 
+                    if {[punk::ansi::codetype::is_sgr_reset $code]} {
+                        set o_codestack [list "\x1b\[m"]  ;#reset better than empty list - fixes some ansi art issues
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
+                        set o_codestack [list $code]
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[priv::is_sgr $code]} {
+                        #basic simplification first - remove straight dupes
+                        set dup_posns [lsearch -all -exact $o_codestack $code] ;#must be -exact because of square-bracket glob chars
+                        set o_codestack [lremove $o_codestack {*}$dup_posns]
+                        lappend o_codestack $code
+                        lappend overlay_grapheme_control_list [list sgr $code]
+                    } elseif {[regexp {\x1b7|\x1b\[s} $code]} {
+                        #experiment
+                        #cursor_save - for the replays review.
+                        #jmn
+                        #set temp_cursor_saved [punk::ansi::codetype::sgr_merge_list {*}$o_codestack]
+                        lappend overlay_grapheme_control_list [list other $code]
+                    } elseif {[regexp {\x1b8|\x1b\[u} $code]} {
+                        #experiment
+                        #cursor_restore - for the replays
+                        set o_codestack [list $temp_cursor_saved]    
                         lappend overlay_grapheme_control_list [list other $code]
+                    } else {
+                        if {[punk::ansi::codetype::is_gx_open $code]} {
+                            set o_gxstack [list "gx0_on"]
+                            lappend overlay_grapheme_control_list [list gx0 gx0_on] ;#don't store code - will complicate debugging if we spit it out and jump character sets
+                        } elseif {[punk::ansi::codetype::is_gx_close $code]} {
+                            set o_gxstack [list]
+                            lappend overlay_grapheme_control_list [list gx0 gx0_off] ;#don't store code - will complicate debugging if we spit it out and jump character sets
+                        } else {
+                            lappend overlay_grapheme_control_list [list other $code]
+                        }
                     }
                 }
             }
@@ -2089,11 +2243,12 @@ tcl::namespace::eval overtype {
 
         # -- --- ---
         #we need to initialise overflow_idx before any potential row-movements - as they need to perform a loop break and force in_excess to 1 
-        if {$opt_overflow} {
-            #somewhat counterintuitively - overflow true means we can have lines as long as we want, but either way there can be excess data that needs to be thrown back to the calling loop.
+        if {$opt_expand_right} {
+            #expand_right true means we can have lines as long as we want, but either way there can be excess data that needs to be thrown back to the calling loop.
+            #we currently only support horizontal expansion to the right (review regarding RTL text!)
             set overflow_idx -1
         } else {
-            #overflow zero - we can't grow beyond our column width - so we get ellipsis or truncation 
+            #expand_right zero - we can't grow beyond our column width - so we get ellipsis or truncation 
             if {$opt_width ne "\uFFEF"} {
                 set overflow_idx [expr {$opt_width}]
             } else {
@@ -2134,10 +2289,7 @@ tcl::namespace::eval overtype {
 
         #movements only occur within the overlay range.
         #an underlay is however not necessary.. e.g
-        #renderline -overflow 1 "" data 
-        #foreach {pt code} $overmap {}
-        set insert_mode $opt_insert_mode ;#default 1
-        set autowrap_mode $opt_autowrap_mode ;#default 1
+        #renderline -expand_right 1 "" data 
 
         #set re_mode        {\x1b\[\?([0-9]*)(h|l)}   ;#e.g DECAWM 
         #set re_col_move    {\x1b\[([0-9]*)(C|D|G)$}
@@ -2163,13 +2315,28 @@ tcl::namespace::eval overtype {
             switch -- $type {
                 g { 
                     set ch $item 
+                    #crm_mode affects both graphic and control 
+                    if {0 && $crm_mode} {
+                        set chars [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $ch]
+                        set chars [string map [list \n "\x1b\[00001E"] $chars]
+                        if {[llength [split $chars ""]] > 1} { 
+                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                            #prefix the unapplied controls with the string version of this control
+                            set unapplied_list [linsert $unapplied_list 0 {*}[split $chars ""]]
+                            set unapplied [join $unapplied_list ""]
+                            #incr idx_over
+                            break
+                        } else {
+                            set ch $chars
+                        }
+                    }
                     incr idx_over; #idx_over (until unapplied reached anyway) is per *grapheme* in the overlay - not per col. 
                     if {($idx < ($opt_colstart -1))} {
                         incr idx [grapheme_width_cached $ch]
                         continue
                     }
                     #set within_undercols [expr {$idx <= [llength $undercols]-1}] ;#within our active data width 
-                    set within_undercols [expr {$idx <= $colwidth-1}]
+                    set within_undercols [expr {$idx <= $renderwidth-1}]
 
                     #https://www.enigma.com/resources/blog/the-secret-world-of-newline-characters
                     #\x85 NEL in the c1 control set is treated by some terminal emulators (e.g Hyper) as a newline,
@@ -2194,7 +2361,7 @@ tcl::namespace::eval overtype {
                                 #linefeed after final column
                                 #puts "---c <lf> at overflow_idx=$overflow_idx" 
                                 incr cursor_row 
-                                set overflow_idx $idx     ;#override overflow_idx even if it was set to -1 due to opt_overflow = 1|2
+                                set overflow_idx $idx     ;#override overflow_idx even if it was set to -1 due to expand_right = 1
                                 set instruction lf_overflow ;#only special treatment is to give it it's own instruction in case caller needs to handle differently
                                 priv::render_unapplied $overlay_grapheme_control_list $gci
                                 break
@@ -2202,7 +2369,10 @@ tcl::namespace::eval overtype {
                                 #linefeed occurred in middle or at end of text
                                 #puts "---mid-or-end-text-linefeed idx:$idx overflow_idx:$overflow_idx"
                                 incr cursor_row 
-                                set overflow_idx $idx     ;#override overflow_idx even if it was set to -1 due to opt_overflow = 1|2
+                                if {$idx == -1 || $overflow_idx > $idx} {
+                                    #don't set overflow_idx higher if it's already set lower and we're adding graphemes to overflow
+                                    set overflow_idx $idx     ;#override overflow_idx even if it was set to -1 due to expand_right = 1
+                                }
                                 set instruction lf_mid
                                 priv::render_unapplied $overlay_grapheme_control_list $gci
                                 break
@@ -2284,23 +2454,35 @@ tcl::namespace::eval overtype {
                                         #tab of some length dependent on tabstops/elastic tabstop settings?
                                     }
                                 } elseif {$idx >= $overflow_idx} {
-                                    #jmn?
-                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci-1]]
-                                    #set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                    #don't incr idx beyond the overflow_idx
-                                    #idx_over already incremented - decrement so current overlay grapheme stacks go to unapplied
-                                    incr idx_over -1
-                                    #priv::render_unapplied $overlay_grapheme_control_list [expr {$gci-1}] ;#back one index here too
-                                    priv::render_this_unapplied $overlay_grapheme_control_list $gci  ;#
-                                    set instruction overflow
-                                    break
+                                    #REVIEW
+                                    set next_gc [lindex $overlay_grapheme_control_list $gci+1] ;#next grapheme or control
+                                    lassign $next_gc next_type next_item 
+                                    if {$autowrap_mode || $next_type ne "g"} {
+                                        set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci-1]]
+                                        #set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                        #don't incr idx beyond the overflow_idx
+                                        #idx_over already incremented - decrement so current overlay grapheme stacks go to unapplied
+                                        incr idx_over -1
+                                        #priv::render_unapplied $overlay_grapheme_control_list [expr {$gci-1}] ;#back one index here too
+                                        priv::render_this_unapplied $overlay_grapheme_control_list $gci  ;#
+                                        set instruction overflow
+                                        break
+                                    } else {
+                                        #no point throwing back to caller for each grapheme that is overflowing
+                                        #without this branch - renderline would be called with overtext reducing only by one grapheme per call
+                                        #processing a potentially long overtext each time (ie - very slow)
+                                        set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                        #JMN4 
+
+                                    }
                                 }
                             } else {
                                 #review.
-                                #This corresponds to opt_overflow being true (at least until overflow_idx is in some cases forced to a value when throwing back to calling loop)
+                                #overflow_idx = -1 
+                                #This corresponds to expand_right being true (at least until overflow_idx is in some cases forced to a value when throwing back to calling loop)
                             }
 
-                            if {($do_transparency && [regexp $opt_transparent $ch])} {    
+                            if {($do_transparency && [regexp $opt_transparent $ch])} {
                                 #pre opt_colstart is effectively transparent (we have applied padding of required number of columns to left of overlay)
                                 if {$idx > [llength $outcols]-1} {
                                     lappend outcols " "
@@ -2311,6 +2493,7 @@ tcl::namespace::eval overtype {
                                 } else {
                                     #todo - punk::char::char_width
                                     set g [lindex $outcols $idx]
+                                    #JMN
                                     set uwidth [grapheme_width_cached $g]
                                     if {[lindex $outcols $idx] eq ""} {
                                         #2nd col of 2-wide char in underlay 
@@ -2438,7 +2621,7 @@ tcl::namespace::eval overtype {
                                             }
                                             incr idx
                                         }
-                                        if {($cursor_column < [llength $outcols]) || $overflow_idx == -1 || $test_mode} {
+                                        if {($cursor_column < [llength $outcols]) || $overflow_idx == -1} {
                                             incr cursor_column
                                         }
                                     } elseif {$uwidth > 1} {
@@ -2472,12 +2655,6 @@ tcl::namespace::eval overtype {
                                     priv::render_addchar $idx $ch [lindex $overstacks $idx_over] [lindex $overstacks_gx $idx_over] $insert_mode
                                     incr idx
                                     incr cursor_column
-                                    if {$overflow_idx !=-1 && !$test_mode} {
-                                        #overflow
-                                        if {$cursor_column > [llength $outcols]} {
-                                            set cursor_column [llength $outcols]
-                                        }
-                                    }
                                 }
                             }
                         }
@@ -2485,13 +2662,29 @@ tcl::namespace::eval overtype {
 
 
                 }
-                other {
+                other - crmcontrol {
+                    if {$crm_mode && $type ne "crmcontrol" && $item ne "\x1b\[00001E"} {
+                        if {$item eq "\x1b\[3l"} {
+                            set crm_mode 0
+                        } else {
+                            #When our initial overlay split was done - we weren't in crm_mode - so there are codes that weren't mapped to unicode control character representations
+                            #set within_undercols [expr {$idx <= $renderwidth-1}]
+                            #set chars [ansistring VIEW -nul 1 -lf 2 -vt 2 -ff 2 $item]
+                            set chars [ansistring VIEW -nul 1 -lf 1 -vt 1 -ff 1 $item]
+                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                            #prefix the unapplied controls with the string version of this control
+                            set unapplied_list [linsert $unapplied_list 0 {*}[split $chars ""]]
+                            set unapplied [join $unapplied_list ""]
+                            
+                            break
+                        }
+                    }
+
                     #todo - consider CSI s DECSLRM vs ansi.sys \x1b\[s  - we need \x1b\[s for oldschool ansi art - but may have to enable only for that.
-                    #we should probably therefore reverse this mapping so that x1b7 x1b8 are the primary codes for save/restore
+                    #we should possibly therefore reverse this mapping so that x1b7 x1b8 are the primary codes for save/restore?
                     set code [tcl::string::map [list \x1b7 \x1b\[s \x1b8 \x1b\[u ] $item]
                     #since this element isn't a grapheme - advance idx_over to next grapheme overlay when about to fill 'unapplied'
 
-                    set matchinfo [list]
 
                     #remap of DEC cursor_save/cursor_restore from ESC sequence to equivalent CSI
                     #probably not ideal - consider putting cursor_save/cursor_restore in functions so they can be called from the appropriate switch branch instead of using this mapping
@@ -2501,15 +2694,16 @@ tcl::namespace::eval overtype {
                     set c1c2c3 [tcl::string::range $code 0 2]
                     #set re_ST_open {(?:\033P|\u0090|\033X|\u0098|\033\^|\u009e|\033_|\u009f)} 
                     #tcl 8.7 - faster to use inline list than to store it in a local var outside of loop. 
-                    #(surprising - but presumably )
+                    #(somewhat surprising)
                     set leadernorm [tcl::string::range [tcl::string::map [list\
                         \x1b\[<     1006\
                         \x1b\[      7CSI\
+                        \x1bP       7DCS\
                         \x9b        8CSI\
                         \x1b\]      7OSC\
                         \x9d        8OSC\
                         \x1b        7ESC\
-                        ] $c1c2c3] 0 3] ;#leadernorm is 1st 2 chars mapped to 4char normalised indicator - or is original 2 chars 
+                        ] $c1c2c3] 0 3] ;#leadernorm is 1st 1,2 or 3 chars mapped to 4char normalised indicator - or is original first chars (1,2 or 3 len) 
 
                     #we leave the tail of the code unmapped for now 
                     switch -- $leadernorm {
@@ -2521,6 +2715,11 @@ tcl::namespace::eval overtype {
                         7CSI - 7OSC {
                             set codenorm [tcl::string::cat $leadernorm [tcl::string::range $code 2 end]]
                         }
+                        7DCS {
+                            #ESC P
+                            #Device Control String  https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h4-Controls-beginning-with-ESC:ESC-F.C74
+                            set codenorm [tcl::string::cat $leadernorm [tcl::string::range $code 2 end]]
+                        }
                         7ESC {
                             set codenorm [tcl::string::cat $leadernorm [tcl::string::range $code 1 end]]
                         }
@@ -2528,7 +2727,10 @@ tcl::namespace::eval overtype {
                             set codenorm [tcl::string::cat $leadernorm [tcl::string::range $code 1 end]]
                         }
                         default {
+                            puts stderr "Sequence detected as ANSI, but not handled in leadernorm switch. code: [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
                             #we haven't made a mapping for this
+                            #could in theory be 1,2 or 3 in len 
+                            #although we shouldn't be getting here if the regexp for ansi codes is kept in sync with our switch branches
                             set codenorm $code
                         }
                     }
@@ -2551,44 +2753,44 @@ tcl::namespace::eval overtype {
                         {7CSI} - {8CSI} {
                             set param [tcl::string::range $codenorm 4 end-1]
                             #puts stdout "--> CSI [tcl::string::index $leadernorm 0] bit param:$param"
-                            switch -- [tcl::string::index $codenorm end] {
-                                D {
-                                    #Col move
-                                    #puts stdout "<-back"
-                                    #cursor back
-                                    #left-arrow/move-back when ltr mode
+                            set code_end [tcl::string::index $codenorm end] ;#used for e.g h|l set/unset mode
+                            switch -exact -- $code_end {
+                                A {
+                                    #Row move - up
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
                                     set num $param
                                     if {$num eq ""} {set num 1}
+                                    incr cursor_row -$num
 
-                                    set version 2
-                                    if {$version eq "2"} {
-                                        #todo - startcolumn offset!
-                                        if {$cursor_column - $num >= 1} {
-                                            incr idx -$num
-                                            incr cursor_column -$num
-                                        } else {
-                                            if {!$autowrap_mode} {
-                                            set cursor_column 1 
-                                            set idx 0
-                                            } else {
-                                                set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                                incr cursor_column -$num
-                                                priv::render_unapplied $overlay_grapheme_control_list $gci
-                                                set instruction wrapmovebackward
-                                                break
-                                            }
-                                        }
-                                    } else {
-                                        incr idx -$num
-                                        incr cursor_column -$num
-                                        if {$idx < $opt_colstart-1} {
-                                            #wrap to previous line and position cursor at end of data
-                                            set idx [expr {$opt_colstart-1}]
-                                            set cursor_column $opt_colstart
-                                        }
+                                    if {$cursor_row < 1} {
+                                        set cursor_row  1
                                     }
+
+                                    #ensure rest of *overlay* is emitted to remainder
+                                    incr idx_over
+                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                    set instruction up
+                                    #retain cursor_column
+                                    break 
+                                }
+                                B {
+                                    #CUD - Cursor Down
+                                    #Row move - down
+                                    set num $param
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                    #move down
+                                    if {$num eq ""} {set num 1}
+                                    incr cursor_row $num
+
+
+                                    incr idx_over ;#idx_over hasn't encountered a grapheme and hasn't advanced yet 
+                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                    set instruction down
+                                    #retain cursor_column
+                                    break 
                                 }
                                 C {
+                                    #CUF - Cursor Forward
                                     #Col move
                                     #puts stdout "->forward"
                                     #todo - consider right-to-left cursor mode (e.g Hebrew).. some day.
@@ -2610,7 +2812,7 @@ tcl::namespace::eval overtype {
                                         if {$overflow_idx == -1} {
                                             incr max
                                         }
-                                        if {$test_mode && $cursor_column == $max+1} {
+                                        if {$cursor_column == $max+1} {
                                             #move_forward while in overflow
                                             incr cursor_column -1
                                         }
@@ -2627,7 +2829,7 @@ tcl::namespace::eval overtype {
                                                 }
 
                                                 #horizontal movement beyond line extent needs to wrap - throw back to caller
-                                                #we may have both overflow_rightand unapplied data
+                                                #we may have both overflow_right and unapplied data
                                                 #(can have overflow_right if we were in insert_mode and processed chars prior to this movement)
                                                 #leave row as is - caller will need to determine how many rows the column-movement has consumed
                                                 incr cursor_column $num ;#give our caller the necessary info as columns from start of row 
@@ -2642,7 +2844,8 @@ tcl::namespace::eval overtype {
                                             }
                                         }
                                     } else {
-                                        if {!$opt_overflow || ($cursor_column + $num) <= [llength $outcols+1]} {
+                                        #review - dead branch
+                                        if {!$expand_right || ($cursor_column + $num) <= [llength $outcols+1]} {
                                             incr idx $num
                                             incr cursor_column $num
                                         } else {
@@ -2692,85 +2895,294 @@ tcl::namespace::eval overtype {
                                         }
                                     }
                                 } 
-                                G {
+                                D {
                                     #Col move
-                                    #move absolute column
-                                    #adjust to colstart - as column 1 is within overlay
-                                    #???
-                                    set idx [expr {$param + $opt_colstart -1}] 
-                                    set cursor_column $param
-                                    error "renderline absolute col move ESC G unimplemented"
-                                }
-                                A {
-                                    #Row move - up
-                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                    #puts stdout "<-back"
+                                    #cursor back
+                                    #left-arrow/move-back when ltr mode
                                     set num $param
                                     if {$num eq ""} {set num 1}
-                                    incr cursor_row -$num
 
-                                    if {$cursor_row < 1} {
-                                        set cursor_row  1
+                                    set version 2
+                                    if {$version eq "2"} {
+                                        #todo - startcolumn offset!
+                                        if {$cursor_column - $num >= 1} {
+                                            incr idx -$num
+                                            incr cursor_column -$num
+                                        } else {
+                                            if {!$autowrap_mode} {
+                                            set cursor_column 1 
+                                            set idx 0
+                                            } else {
+                                                set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                                incr cursor_column -$num
+                                                priv::render_unapplied $overlay_grapheme_control_list $gci
+                                                set instruction wrapmovebackward
+                                                break
+                                            }
+                                        }
+                                    } else {
+                                        incr idx -$num
+                                        incr cursor_column -$num
+                                        if {$idx < $opt_colstart-1} {
+                                            #wrap to previous line and position cursor at end of data
+                                            set idx [expr {$opt_colstart-1}]
+                                            set cursor_column $opt_colstart
+                                        }
                                     }
-
-                                    #ensure rest of *overlay* is emitted to remainder
+                                }
+                                E {
+                                    #CNL - Cursor Next Line
+                                    if {$param eq ""} {
+                                        set downmove 1
+                                    } else {
+                                        set downmove [expr {$param}]
+                                    }
+                                    puts stderr "renderline CNL down-by-$downmove"
+                                    set cursor_column 1
+                                    set cursor_row [expr {$cursor_row + $downmove}]
+                                    set idx [expr {$cursor_column -1}]
+                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
                                     incr idx_over
                                     priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction up
-                                    #retain cursor_column
-                                    break 
+                                    set instruction move
+                                    break
+
                                 }
-                                B {
-                                    #Row move - down
-                                    set num $param
+                                F {
+                                    #CPL - Cursor Previous Line
+                                    if {$param eq ""} {
+                                        set upmove 1
+                                    } else {
+                                        set upmove [expr {$param}]
+                                    }
+                                    puts stderr "renderline CPL up-by-$upmove"
+                                    set cursor_column 1
+                                    set cursor_row [expr {$cursor_row -$upmove}]
+                                    if {$cursor_row < 1} {
+                                        set cursor_row 1
+                                    } 
+                                    set idx [expr {$cursor_column - 1}]
                                     set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                    #move down
-                                    if {$num eq ""} {set num 1}
-                                    incr cursor_row $num
-
-
-                                    incr idx_over ;#idx_over hasn't encountered a grapheme and hasn't advanced yet 
+                                    incr idx_over
                                     priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction down
-                                    #retain cursor_column
-                                    break 
+                                    set instruction move
+                                    break
+
+                                }
+                                G {
+                                    #CHA - Cursor Horizontal Absolute (move to absolute column no)
+                                    if {$param eq ""} {
+                                        set targetcol 1
+                                    } else {
+                                        set targetcol $param
+                                        if {![string is integer -strict $targetcol]} {
+                                            puts stderr "renderline CHA (Cursor Horizontal Absolute) error. Unrecognised parameter '$param'"
+                                        }
+                                        set targetcol [expr {$param}]
+                                        set max [llength $outcols]
+                                        if {$overflow_idx == -1} {
+                                            incr max
+                                        }
+                                        if {$targetcol > $max} {
+                                            puts stderr "renderline CHA (Cursor Horizontal Absolute) error. Param '$param' > max: $max"
+                                            set targetcol $max
+                                        }
+                                    }
+                                    #adjust to colstart - as column 1 is within overlay
+                                    #??? REVIEW
+                                    set idx [expr {($targetcol -1) + $opt_colstart -1}] 
+                                    
+                                     
+                                    set cursor_column $targetcol
+                                    #puts stderr "renderline absolute col move ESC G (TEST)"
                                 }
                                 H - f {
-                                    #$re_both_move
-                                    lassign [split $param {;}] row col
-                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
-                                    #lassign $matchinfo _match row col 
+                                    #CSI n;m H - CUP - Cursor Position
 
-                                    if {$col eq ""} {set col 1}
-                                    set max [llength $outcols]
-                                    if {$overflow_idx == -1} {
-                                        incr max 
-                                    }
-                                    if {$col > $max} {
-                                        set cursor_column  $max
+                                    #CSI n;m f - HVP - Horizontal Vertical Position REVIEW - same as CUP with differences (what?) in some terminal modes
+                                    # - 'counts as effector format function  (like CR or LF) rather than an editor function (like CUD or CNL)'
+                                    # - REVIEW 
+                                    #see Annex A at: https://www.ecma-international.org/wp-content/uploads/ECMA-48_5th_edition_june_1991.pdf
+
+                                    #test e.g ansicat face_2.ans
+                                    #$re_both_move
+                                    lassign [split $param {;}] paramrow paramcol
+                                    #missing defaults to 1
+                                    #CSI ;5H = CSI 1;5H -> row 1 col 5
+                                    #CSI 17;H = CSI 17H = CSI 17;1H -> row 17 col 1 
+
+                                    if {$paramcol eq ""} {set paramcol 1}
+                                    if {$paramrow eq ""} {set paramrow 1}
+                                    if {![string is integer -strict $paramcol] || ![string is integer -strict $paramrow]} {
+                                        puts stderr "renderline CUP (CSI <param> H) unrecognised param $param"
+                                        #ignore?
                                     } else {
-                                        set cursor_column $col
+                                        set max [llength $outcols]
+                                        if {$overflow_idx == -1} {
+                                            incr max 
+                                        }
+                                        if {$paramcol > $max} {
+                                            set target_column  $max
+                                        } else {
+                                            set target_column [expr {$paramcol}]
+                                        }
+
+
+                                        if {$paramrow < 1} {
+                                            puts stderr "renderline CUP (CSI <param> H) bad row target 0. Assuming 1"
+                                            set target_row 1
+                                        } else {
+                                            set target_row [expr {$paramrow}]
+                                        }
+                                        if {$target_row == $cursor_row} {
+                                            #col move only - no need for break and move
+                                            #puts stderr "renderline CUP col move only to col $target_column param:$param"
+                                            set cursor_column $target_column
+                                            set idx [expr {$cursor_column -1}]
+                                        } else {
+                                            set cursor_row $target_row
+                                            set cursor_column $target_column
+                                            set idx [expr {$cursor_column -1}]
+                                            set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                            incr idx_over
+                                            priv::render_unapplied $overlay_grapheme_control_list $gci
+                                            set instruction move
+                                            break
+                                        }
                                     }
-                                    set idx [expr {$cursor_column -1}]
+                                }
+                                J {
+                                    set modegroup [tcl::string::index $codenorm 4] ;#e.g ? 
+                                    switch -exact -- $modegroup {
+                                        ? {
+                                            #CSI ? Pn J - selective erase
+                                            puts stderr "overtype::renderline ED - SELECTIVE ERASE IN DISPLAY (UNIMPLEMENTED) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline ED - ERASE IN DISPLAY (TESTING) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                            if {$param eq ""} {set param 0} 
+                                            switch -exact -- $param {
+                                                0 {
+                                                    #clear from cursor to end of screen
+                                                }
+                                                1 {
+                                                    #clear from cursor to beginning of screen
+                                                }
+                                                2 {
+                                                    #clear entire screen
+                                                    #ansi.sys - move cursor to upper left REVIEW
+                                                    set cursor_row 1
+                                                    set cursor_column 1
+                                                    set idx [expr {$cursor_column -1}]
+                                                    set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
+                                                    incr idx_over
+                                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                                    set instruction move
+                                                    break
+                                                }
+                                                3 {
+                                                    #clear entire screen. presumably cursor doesn't move - otherwise it would be same as 2J ?
 
-                                    if {$row eq ""} {set row 1}
-                                    set cursor_row $row
-                                    if {$cursor_row < 1} {
-                                        set cursor_row 1
+                                                }
+                                                default {
+                                                }
+                                            }
+
+                                        }
                                     }
+                                }
+                                K {
+                                    #see DECECM regarding background colour
+                                    set modegroup [tcl::string::index $codenorm 4] ;#e.g ? 
+                                    switch -exact -- $modegroup {
+                                        ? {
+                                            puts stderr "overtype::renderline DECSEL - SELECTIVE ERASE IN LINE (UNIMPLEMENTED) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                            set param [string range $param 1 end] ;#chop qmark
+                                            if {$param eq ""} {set param 0} 
+                                            switch -exact -- $param {
+                                                0 {
+                                                    #clear from cursor to end of line - depending on DECSCA
+                                                }
+                                                1 {
+                                                    #clear from cursor to beginning of line - depending on DECSCA
 
-                                    incr idx_over
-                                    priv::render_unapplied $overlay_grapheme_control_list $gci
-                                    set instruction move
-                                    break
+                                                }
+                                                2 {
+                                                    #clear entire line - depending on DECSCA
+                                                }
+                                                default {
+                                                    puts stderr "overtype::renderline DECSEL - SELECTIVE ERASE IN LINE PARAM '$param' unrecognised [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                                }
+                                            }
+
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline EL - ERASE IN LINE (TESTING) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                            if {$param eq ""} {set param 0} 
+                                            switch -exact -- $param {
+                                                0 {
+                                                    #clear from cursor to end of line
+                                                }
+                                                1 {
+                                                    #clear from cursor to beginning of line
+
+                                                }
+                                                2 {
+                                                    #clear entire line
+                                                }
+                                                default {
+                                                    puts stderr "overtype::renderline EL - ERASE IN LINE PARAM '$param' unrecognised [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                L {
+                                    puts stderr "overtype::renderline IL -  Insert Line - not implemented [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                M {
+                                    #CSI Pn M - DL - Delete Line
+                                    puts stderr "overtype::renderline DL -  Delete Line - not implemented [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
 
                                 }
                                 X {
-                                    puts stderr "X - $param"
+                                    puts stderr "overtype::renderline X ECH ERASE CHARACTER - $param"
                                     #ECH - erase character
                                     if {$param eq "" || $param eq "0"} {set param 1}; #param=count of chars to erase
                                     priv::render_erasechar $idx $param 
                                     #cursor position doesn't change.
                                 }
+                                q {
+                                    set code_secondlast [tcl::string::index $codenorm end-1]
+                                    switch -exact -- $code_secondlast {
+                                        {"} {
+                                            #DECSCA - Select Character Protection Attribute
+                                            #(for use with selective erase: DECSED and DECSEL)
+                                            set param [tcl::string::range $codenorm 4 end-2]
+                                            if {$param eq ""} {set param 0}
+                                            #TODO - store like SGR in stacks - replays?
+                                            switch -exact -- $param {
+                                                0 - 2 {
+                                                    #canerase
+                                                    puts stderr "overtype::renderline - DECSCA canerase not implemented - [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                                }
+                                                1 {
+                                                    #cannoterase
+                                                    puts stderr "overtype::renderline - DECSCA cannoterase not implemented - [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                                }
+                                                default {
+                                                    puts stderr "overtype::renderline DECSCA param '$param' not understood [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                                }
+                                            }
+
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline - CSI ... q not implemented - [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                        }
+                                    }
+
+                                }
                                 r {
                                     #$re_decstbm
                                     #https://www.vt100.net/docs/vt510-rm/DECSTBM.html
@@ -2789,78 +3201,119 @@ tcl::namespace::eval overtype {
                                     break
                                 }
                                 s {
-                                    # - todo - make ansi.sys CSI s cursor save only apply for certain cases? - may need to support DECSLRM instead which uses same code
-
-                                    #$re_cursor_save
-                                    #cursor save could come after last column  
-                                    if {$overflow_idx != -1 && $idx == $overflow_idx} {
-                                        #bartman2.ans test file - fixes misalignment at bottom of dialog bubble
-                                        #incr cursor_row
-                                        #set cursor_column 1
-                                        #bwings1.ans test file - breaks if we actually incr cursor (has repeated saves)
-                                        set cursor_saved_position [list row [expr {$cursor_row+1}] column 1]
-                                    } else {
-                                        set cursor_saved_position [list row $cursor_row column $cursor_column]
-                                    }
-                                    #there may be overlay stackable codes emitted that aren't in the understacks because they come between the last emmited character and the cursor_save control.
-                                    #we need the SGR and gx overlay codes prior to the cursor_save  
+                                    #code conflict between ansi emulation and DECSLRM - REVIEW
+                                    #ANSISYSSC  (when no parameters) - like other terminals - essentially treat same as DECSC
+                                    # todo - when parameters - support DECSLRM instead
+
+                                    if {$param ne ""} {
+                                        #DECSLRM - should only be recognised if DECLRMM is set  (vertical split screen mode)
+                                        lassign [split $param {;} margin_left margin_right 
+                                        puts stderr "overtype DECSLRM not yet supported - got [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                        if {$margin_left eq ""} {
+                                            set margin_left 1
+                                        }
+                                        set columns_per_page 80 ;#todo - set to 'page width (DECSCPP set columns per page)' - could be 132 or??
+                                        if {$margin_right eq ""} {
+                                            set margin_right $columns_per_page 
+                                        }
+                                        puts stderr "DECSLRM margin left: $margin_left margin right: $margin_right"
+                                        if {![string is integer -strict $margin_left] || $margin_left < 0} {
+                                            puts stderr "DECSLRM invalid margin_left"
+                                        }
+                                        if {![string is integer -strict $margin_right] || $margin_right < 0} {
+                                            puts stderr "DECSLRM invalid margin_right"
+                                        }
+                                        set scrolling_region_size [expr {$margin_right - $margin_left}]
+                                        if {$scrolling_region_size < 2 || $scrolling_region_size > $columns_per_page} {
+                                            puts stderr "DECSLRM region size '$scrolling_regsion_size' must be between 1 and $columns_per_page"
+                                        }
+                                        #todo 
 
-                                    #a real terminal would not be able to know the state of the underlay.. so we should probably ignore it.
-                                    #set sgr_stack [lindex $understacks $idx]
-                                    #set gx_stack [lindex $understacks_gx $idx] ;#not actually a stack - just a boolean state (for now?)
-                                    
-                                    set sgr_stack [list]
-                                    set gx_stack [list]
-
-                                    #we shouldn't need to scan for intermediate cursor save/restores - as restores would throw-back to the calling loop - so our overlay 'line' is since those.
-                                    #The overlay_grapheme_control_list had leading resets from previous lines - so we go back to the beginning not just the first grapheme.
-
-                                    foreach gc [lrange $overlay_grapheme_control_list 0 $gci-1] {
-                                        lassign $gc type code 
-                                        #types g other sgr gx0
-                                        switch -- $type {
-                                            gx0 {
-                                                #code is actually a stand-in for the graphics on/off code  - not the raw code
-                                                #It is either gx0_on or gx0_off 
-                                                set gx_stack [list $code]
-                                            }
-                                            sgr {
-                                                #code is the raw code
-                                                if {[punk::ansi::codetype::is_sgr_reset $code]} {
-                                                    #jmn
-                                                    set sgr_stack [list "\x1b\[m"]
-                                                } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
-                                                    set sgr_stack [list $code]
-                                                    lappend overlay_grapheme_control_list [list sgr $code]
-                                                } elseif {[priv::is_sgr $code]} {
-                                                    #often we don't get resets - and codes just pile up.
-                                                    #as a first step to simplifying - at least remove earlier straight up dupes
-                                                    set dup_posns [lsearch -all -exact $sgr_stack $code] ;#needs -exact - codes have square-brackets (glob chars)
-                                                    set sgr_stack [lremove $sgr_stack {*}$dup_posns]
-                                                    lappend sgr_stack $code
+
+                                    } else {
+                                        #DECSC
+                                        #//notes on expected behaviour:
+                                        #DECSC - saves following items in terminal's memory
+                                        #cursor position
+                                        #character attributes set by the SGR command
+                                        #character sets (G0,G1,G2 or G3) currently in GL and GR
+                                        #Wrap flag (autowrap or no autowrap)
+                                        #State of origin mode (DECOM)
+                                        #selective erase attribute
+                                        #any single shift 2 (SS2) or single shift 3(SSD) functions sent
+
+                                        #$re_cursor_save
+                                        #cursor save could come after last column  
+                                        if {$overflow_idx != -1 && $idx == $overflow_idx} {
+                                            #bartman2.ans test file - fixes misalignment at bottom of dialog bubble
+                                            #incr cursor_row
+                                            #set cursor_column 1
+                                            #bwings1.ans test file - breaks if we actually incr cursor (has repeated saves)
+                                            set cursor_saved_position [list row [expr {$cursor_row+1}] column 1]
+                                        } else {
+                                            set cursor_saved_position [list row $cursor_row column $cursor_column]
+                                        }
+                                        #there may be overlay stackable codes emitted that aren't in the understacks because they come between the last emmited character and the cursor_save control.
+                                        #we need the SGR and gx overlay codes prior to the cursor_save  
+
+                                        #a real terminal would not be able to know the state of the underlay.. so we should probably ignore it.
+                                        #set sgr_stack [lindex $understacks $idx]
+                                        #set gx_stack [lindex $understacks_gx $idx] ;#not actually a stack - just a boolean state (for now?)
+                                        
+                                        set sgr_stack [list]
+                                        set gx_stack [list]
+
+                                        #we shouldn't need to scan for intermediate cursor save/restores - as restores would throw-back to the calling loop - so our overlay 'line' is since those.
+                                        #The overlay_grapheme_control_list had leading resets from previous lines - so we go back to the beginning not just the first grapheme.
+
+                                        foreach gc [lrange $overlay_grapheme_control_list 0 $gci-1] {
+                                            lassign $gc type code 
+                                            #types g other sgr gx0
+                                            switch -- $type {
+                                                gx0 {
+                                                    #code is actually a stand-in for the graphics on/off code  - not the raw code
+                                                    #It is either gx0_on or gx0_off 
+                                                    set gx_stack [list $code]
+                                                }
+                                                sgr {
+                                                    #code is the raw code
+                                                    if {[punk::ansi::codetype::is_sgr_reset $code]} {
+                                                        #jmn
+                                                        set sgr_stack [list "\x1b\[m"]
+                                                    } elseif {[punk::ansi::codetype::has_sgr_leadingreset $code]} {
+                                                        set sgr_stack [list $code]
+                                                        lappend overlay_grapheme_control_list [list sgr $code]
+                                                    } elseif {[priv::is_sgr $code]} {
+                                                        #often we don't get resets - and codes just pile up.
+                                                        #as a first step to simplifying - at least remove earlier straight up dupes
+                                                        set dup_posns [lsearch -all -exact $sgr_stack $code] ;#needs -exact - codes have square-brackets (glob chars)
+                                                        set sgr_stack [lremove $sgr_stack {*}$dup_posns]
+                                                        lappend sgr_stack $code
+                                                    }
                                                 }
                                             }
                                         }
-                                    }
-                                    set cursor_saved_attributes ""
-                                    switch -- [lindex $gx_stack 0] {
-                                        gx0_on {
-                                            append cursor_saved_attributes "\x1b(0"
-                                        }
-                                        gx0_off {
-                                            append cursor_saved_attributes "\x1b(B"
+                                        set cursor_saved_attributes ""
+                                        switch -- [lindex $gx_stack 0] {
+                                            gx0_on {
+                                                append cursor_saved_attributes "\x1b(0"
+                                            }
+                                            gx0_off {
+                                                append cursor_saved_attributes "\x1b(B"
+                                            }
                                         }
-                                    }
-                                    #append cursor_saved_attributes [join $sgr_stack ""]
-                                    append cursor_saved_attributes [punk::ansi::codetype::sgr_merge_list {*}$sgr_stack]
+                                        #append cursor_saved_attributes [join $sgr_stack ""]
+                                        append cursor_saved_attributes [punk::ansi::codetype::sgr_merge_list {*}$sgr_stack]
 
-                                    #as there is apparently only one cursor storage element we don't need to throw back to the calling loop for a save.
+                                        #as there is apparently only one cursor storage element we don't need to throw back to the calling loop for a save.
 
-                                    #don't incr index - or the save will cause cursor to move to the right
-                                    #carry on 
-                                    
+                                        #don't incr index - or the save will cause cursor to move to the right
+                                        #carry on 
+                                    }
                                 }
                                 u {
+                                    #ANSISYSRC save cursor (when no parameters)  (DECSC)
+
                                     #$re_cursor_restore
                                     #we are going to jump somewhere.. for now we will assume another line, and process accordingly.
                                     #The caller has the cursor_saved_position/cursor_saved_attributes if any (?review - if we always pass it back it, we could save some calls for moves in same line)
@@ -2901,135 +3354,260 @@ tcl::namespace::eval overtype {
                                     set instruction restore_cursor 
                                     break
                                 }
+                                "{" {
+
+                                    puts stderr "renderline warning - CSI..<leftcurly> - unimplemented [ansistring VIEW -lf 1 -nul 1 $code]"
+                                }
+                                "}" {
+                                    set code_secondlast [tcl::string::index $codenorm end-1]
+                                    switch -exact -- $code_secondlast {
+                                        ' {
+                                            puts stderr "renderline warning - DECIC - Insert Column - CSI...'<rightcurly> - unimplemented [ansistring VIEW -lf 1 -nul 1 $code]"
+                                        }
+                                        default {
+                                            puts stderr "renderline warning - CSI..<rightcurly> - unimplemented [ansistring VIEW -lf 1 -nul 1 $code]"
+                                        }
+                                    }
+                                }
                                 ~ {
-                                    #$re_vt_sequence
-                                    #lassign $matchinfo _match key mod 
-                                    lassign [split $param {;}] key mod
-
-                                    #Note that f1 to f4 show as ESCOP|Q|R|S  (VT220?) but f5+ show as ESC\[15~
-                                    #
-                                    #e.g esc \[2~  insert  esc \[2;2~  shift-insert
-                                    #mod - subtract 1, and then use bitmask
-                                    #shift = 1, (left)Alt = 2, control=4, meta=8  (meta seems to do nothing on many terminals on windows? Intercepted by windows?)
-                                    #puts stderr "vt key:$key mod:$mod  code:[ansistring VIEW $code]" 
-                                    if {$key eq "1"} {
-                                        #home
-                                    } elseif {$key eq "2"} {
-                                        #Insert
-                                        if {$mod eq ""} {
-                                            #no modifier key
-                                            set insert_mode [expr {!$insert_mode}]
-                                            #rather than set the cursor - we return the insert mode state so the caller can decide
+                                    set code_secondlast [tcl::string::index $codenorm end-1] ;#used for e.g CSI x '~ 
+                                    switch -exact -- $code_secondlast {
+                                        ' {
+                                            #DECDC - editing sequence - Delete Column 
+                                            puts stderr "renderline warning - DECDC - unimplemented"
                                         }
-                                    } elseif {$key eq "3"} {
-                                        #Delete - presumably this shifts other chars in the line, with empty cells coming in from the end
-                                        switch -- $mod {
-                                            "" {
-                                                priv::render_delchar $idx
-                                            }
-                                            "5" {
-                                                #ctrl-del - delete to end of word (pwsh) - possibly word on next line if current line empty(?)
+                                        default {
+                                            #$re_vt_sequence
+                                            lassign [split $param {;}] key mod
+
+                                            #Note that f1 to f4 show as ESCOP|Q|R|S  (VT220?) but f5+ show as ESC\[15~
+                                            #
+                                            #e.g esc \[2~  insert  esc \[2;2~  shift-insert
+                                            #mod - subtract 1, and then use bitmask
+                                            #shift = 1, (left)Alt = 2, control=4, meta=8  (meta seems to do nothing on many terminals on windows? Intercepted by windows?)
+                                            #puts stderr "vt key:$key mod:$mod  code:[ansistring VIEW $code]" 
+                                            if {$key eq "1"} {
+                                                #home
+                                            } elseif {$key eq "2"} {
+                                                #Insert
+                                                if {$mod eq ""} {
+                                                    #no modifier key
+                                                    set insert_mode [expr {!$insert_mode}]
+                                                    #rather than set the cursor - we return the insert mode state so the caller can decide
+                                                }
+                                            } elseif {$key eq "3"} {
+                                                #Delete - presumably this shifts other chars in the line, with empty cells coming in from the end
+                                                switch -- $mod {
+                                                    "" {
+                                                        priv::render_delchar $idx
+                                                    }
+                                                    "5" {
+                                                        #ctrl-del - delete to end of word (pwsh) - possibly word on next line if current line empty(?)
+                                                    }
+                                                }
+                                            } elseif {$key eq "4"} {
+                                                #End
+                                            } elseif {$key eq "5"} {
+                                                #pgup
+                                            } elseif {$key eq "6"} {
+                                                #pgDn
+                                            } elseif {$key eq "7"} {
+                                                #Home
+                                                #??
+                                                set idx [expr {$opt_colstart -1}]
+                                                set cursor_column 1
+                                            } elseif {$key eq "8"} {
+                                                #End
+                                            } elseif {$key eq "11"} {
+                                                #F1 - or ESCOP  or  e.g shift F1 ESC\[1;2P
+                                            } elseif {$key eq "12"} {
+                                                #F2 - or ESCOQ
+                                            } elseif {$key eq "13"} {
+                                                #F3 - or ESCOR
+                                            } elseif {$key eq "14"} {
+                                                #F4 - or ESCOS
+                                            } elseif {$key eq "15"} {
+                                                #F5 or shift F5 ESC\[15;2~
+                                            } elseif {$key eq "17"} {
+                                                #F6
+                                            } elseif {$key eq "18"} {
+                                                #F7
+                                            } elseif {$key eq "19"} {
+                                                #F8
+                                            } elseif {$key eq "20"} {
+                                                #F9
+                                            } elseif {$key eq "21"} {
+                                                #F10
+                                            } elseif {$key eq "23"} {
+                                                #F11
+                                            } elseif {$key eq "24"} {
+                                                #F12
                                             }
+
                                         }
-                                    } elseif {$key eq "4"} {
-                                        #End
-                                    } elseif {$key eq "5"} {
-                                        #pgup
-                                    } elseif {$key eq "6"} {
-                                        #pgDn
-                                    } elseif {$key eq "7"} {
-                                        #Home
-                                        #??
-                                        set idx [expr {$opt_colstart -1}]
-                                        set cursor_column 1
-                                    } elseif {$key eq "8"} {
-                                        #End
-                                    } elseif {$key eq "11"} {
-                                        #F1 - or ESCOP  or  e.g shift F1 ESC\[1;2P
-                                    } elseif {$key eq "12"} {
-                                        #F2 - or ESCOQ
-                                    } elseif {$key eq "13"} {
-                                        #F3 - or ESCOR
-                                    } elseif {$key eq "14"} {
-                                        #F4 - or ESCOS
-                                    } elseif {$key eq "15"} {
-                                        #F5 or shift F5 ESC\[15;2~
-                                    } elseif {$key eq "17"} {
-                                        #F6
-                                    } elseif {$key eq "18"} {
-                                        #F7
-                                    } elseif {$key eq "19"} {
-                                        #F8
-                                    } elseif {$key eq "20"} {
-                                        #F9
-                                    } elseif {$key eq "21"} {
-                                        #F10
-                                    } elseif {$key eq "23"} {
-                                        #F11
-                                    } elseif {$key eq "24"} {
-                                        #F12
                                     }
 
                                 }
                                 h - l {
+                                    #set mode unset mode
                                     #we are matching only last char to get to this arm - but are there other sequences ending in h|l we need to handle?
 
                                     #$re_mode if first after CSI is "?"  
                                     #some docs mention ESC=<mode>h|l  - not seen on windows terminals.. review
                                     #e.g https://www2.math.upenn.edu/~kazdan/210/computer/ansi.html
-                                    if {[tcl::string::index $codenorm 4] eq "?"} {
-                                        set num [tcl::string::range $codenorm 5 end-1] ;#param between ? and h|l
-                                        #lassign $matchinfo _match num type
-                                        switch -- $num {
-                                            5 {
-                                                #DECSNM - reverse video
-                                                #How we simulate this to render within a block of text is an open question.
-                                                #track all SGR stacks and constantly flip based on the current SGR reverse state?
-                                                #It is the job of the calling loop to do this - so at this stage we'll just set the states
-                                                #DECAWM autowrap 
-                                                if {$type eq "h"} {
-                                                    #set (enable)
-                                                    set reverse_mode 1
-                                                } else {
-                                                    #reset (disable)
-                                                    set reverse_mode 0
-                                                }
+                                    set modegroup [tcl::string::index $codenorm 4] ;#e.g ? =
+                                    switch -exact -- $modegroup {
+                                        ? {
+                                            set smparams [tcl::string::range $codenorm 5 end-1] ;#params between ? and h|l
+                                            #one or more modes can be set
+                                            set smparam_list [split $smparams {;}]
+                                            foreach num $smparam_list {
+                                                switch -- $num {
+                                                    "" {
+                                                        #ignore empties e.g extra/trailing semicolon in params
+                                                    }
+                                                    5 {
+                                                        #DECSNM - reverse video
+                                                        #How we simulate this to render within a block of text is an open question.
+                                                        #track all SGR stacks and constantly flip based on the current SGR reverse state?
+                                                        #It is the job of the calling loop to do this - so at this stage we'll just set the states
+
+                                                        if {$code_end eq "h"} {
+                                                            #set (enable)
+                                                            set reverse_mode 1
+                                                        } else {
+                                                            #reset (disable)
+                                                            set reverse_mode 0
+                                                        }
+
+                                                    }
+                                                    7 {
+                                                        #DECAWM autowrap 
+                                                        if {$code_end eq "h"} {
+                                                            #set (enable)
+                                                            set autowrap_mode 1
+                                                            if {$opt_width ne "\uFFEF"} {
+                                                                set overflow_idx $opt_width
+                                                            } else {
+                                                                #review - this is also the cursor position when adding a char at end of line? 
+                                                                set overflow_idx [expr {[llength $undercols]}] ;#index at which we would be *in* overflow a row move may still override it 
+                                                            }
+                                                            #review - can idx ever be beyond overflow_idx limit when we change e.g with a width setting and cursor movements?
+                                                            # presume not usually - but sanity check with warning for now.
+                                                            if {$idx >= $overflow_idx} {
+                                                                puts stderr "renderline warning - idx '$idx' >= overflow_idx '$overflow_idx' - unexpected"
+                                                            }
+                                                        } else {
+                                                            #reset (disable)
+                                                            set autowrap_mode 0
+                                                            #REVIEW!
+                                                            set overflow_idx -1
+                                                        }
+                                                    }
+                                                    25 {
+                                                        if {$code_end eq "h"} {
+                                                            #visible cursor
+
+                                                        } else {
+                                                            #invisible cursor
 
+                                                        }
+                                                    }
+                                                    117 {
+                                                        #DECECM - Erase Color Mode
+                                                        #https://invisible-island.net/ncurses/ncurses.faq.html
+                                                        #The Erase color selection controls the background color used when text is erased or new
+                                                        #text is scrolled on to the screen. Screen background causes newly erased areas or
+                                                        #scrolled text to be written using color index zero, the screen background. This is VT
+                                                        #and DECterm compatible. Text background causes erased areas or scrolled text to be
+                                                        #written using the current text background color. This is PC console compatible and is
+                                                        #the factory default.
+
+                                                        #see also: https://unix.stackexchange.com/questions/251726/clear-to-end-of-line-uses-the-wrong-background-color-in-screen
+                                                    }
+                                                }
                                             }
-                                            7 {
-                                                #DECAWM autowrap 
-                                                if {$type eq "h"} {
-                                                    #set (enable)
-                                                    set autowrap_mode 1
-                                                    if {$opt_width ne "\uFFEF"} {
-                                                        set overflow_idx $opt_width
+                                        }
+                                        = {
+                                            set num [tcl::string::range $codenorm 5 end-1] ;#param between = and h|l
+                                            puts stderr "overtype::renderline CSI=...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
+                                        default {
+                                            #e.g CSI 4 h
+                                            set num [tcl::string::range $codenorm 4 end-1] ;#param before h|l
+                                            switch -exact -- $num {
+                                                3 {
+                                                    puts stderr "CRM MODE $code_end"
+                                                    #CRM - Show control character mode
+                                                    # 'No control functions are executed except LF,FF and VT which are represented in the CRM FONT before a CRLF(new line) is executed'
+                                                    #  
+                                                    #use ansistring VIEW -nul 1 -lf 2 -ff 2 -vt 2
+                                                    #https://vt100.net/docs/vt510-rm/CRM.html
+                                                    #NOTE - vt100 CRM always does auto-wrap at right margin.
+                                                    #disabling auto-wrap in set-up or by sequence is disabled.
+                                                    #We should default to turning off auto-wrap when crm_mode enabled.. but
+                                                    #displaying truncated (on rhs) crm can still be very useful - and we have optimisation in overflow to avoid excess renderline calls (per grapheme)
+                                                    #we therefore could reasonably put in an exception to allow auto_wrap to be disabled after crm_mode is engaged,
+                                                    #although this would be potentially an annoying difference to some.. REVIEW
+                                                    if {$code_end eq "h"} {
+                                                        set crm_mode 1
+                                                        set autowrap_mode 1
+                                                        if {$opt_width ne "\uFFEF"} {
+                                                            set overflow_idx $opt_width
+                                                        } else {
+                                                            #review - this is also the cursor position when adding a char at end of line? 
+                                                            set overflow_idx [expr {[llength $undercols]}] ;#index at which we would be *in* overflow a row move may still override it 
+                                                        }
                                                     } else {
-                                                        #review - this is also the cursor position when adding a char at end of line? 
-                                                        set overflow_idx [expr {[llength $undercols]}] ;#index at which we would be *in* overflow a row move may still override it 
+                                                        set crm_mode 0
                                                     }
-                                                    #review - can idx ever be beyond overflow_idx limit when we change e.g with a width setting and cursor movements? presume not - but sanity check for now.
-                                                    if {$idx >= $overflow_idx} {
-                                                        puts stderr "renderline error - idx '$idx' >= overflow_idx '$overflow_idx' - unexpected"
+                                                }
+                                                4 {
+                                                    #IRM - Insert/Replace Mode
+                                                    if {$code_end eq "h"} {
+                                                        #CSI 4 h
+                                                        set insert_mode 1
+                                                    } else {
+                                                        #CSI 4 l
+                                                        #replace mode
+                                                        set insert_mode 0
                                                     }
-                                                } else {
-                                                    #reset (disable)
-                                                    set autowrap_mode 0
-                                                    set overflow_idx -1
                                                 }
+                                                default {
+                                                    puts stderr "overtype::renderline CSI...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                | {
+                                    switch -- [tcl::string::index $codenorm end-1] {
+                                        {$} {
+                                            #CSI ... $ |   DECSCPP set columns per page- (recommended in vt510 docs as preferable to DECCOLM)
+                                            #real terminals generally only supported 80/132
+                                            #some other virtuals support any where from 2 to 65,536?
+                                            #we will allow arbitrary widths >= 2 .. to some as yet undetermined limit.
+                                            #CSI <param> $ |
+                                            #empty or 0 param is 80 for compatibility - other numbers > 2 accepted
+                                            set page_width -1 ;#flag as unset
+                                            if {$param eq ""} {
+                                                set page_width 80
+                                            }  elseif {[string is integer -strict $param] && $param >=2 0} {
+                                                set page_width [expr {$param}] ;#we should allow leading zeros in the number - but lets normalize using expr
+                                            } else {
+                                                puts stderr "overtype::renderline unacceptable DECSPP value '$param'" 
                                             }
-                                            25 {
-                                                if {$type eq "h"} {
-                                                    #visible cursor
 
-                                                } else {
-                                                    #invisible cursor
+                                            if {$page_width > 2} {
+                                                puts stderr "overtype::renderline DECSCPP - not implemented - but selected width '$page_width' looks ok"
+                                                #if cursor already beyond new page_width - will move to right colum - otherwise no cursor movement
 
-                                                }
                                             }
-                                        }
 
-                                    } else {
-                                        puts stderr "overtype::renderline CSI...h|l code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
+                                        default {
+                                            puts stderr "overtype::renderline  unrecognised CSI code ending in pipe (|) [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                        }
                                     }
                                 }
                                 default {
@@ -3038,24 +3616,49 @@ tcl::namespace::eval overtype {
                             } 
                         } 
                         7ESC {
-                            #$re_other_single
-                            switch -- [tcl::string::index $codenorm end] {
+                            #
+                            #re_other_single         {\x1b(D|M|E)$}
+                            #also PM \x1b^...(ST)
+                            switch -- [tcl::string::index $codenorm 4] {
+                                c {
+                                    #RIS - reset terminal to initial state - where 'terminal' in this case is the renderspace - not the underlying terminal!
+                                    puts stderr "renderline reset"
+                                    priv::render_unapplied $overlay_grapheme_control_list $gci
+                                    set instruction reset 
+                                    break
+                                }
                                 D {
                                     #\x84
                                     #index (IND)
                                     #vt102-docs: "Moves cursor down one line in same column. If cursor is at bottom margin, screen performs a scroll-up"
-                                    puts stderr "ESC D not fully implemented"
+                                    puts stderr "renderline ESC D not fully implemented"
                                     incr cursor_row 
                                     priv::render_unapplied $overlay_grapheme_control_list $gci
                                     set instruction down
                                     #retain cursor_column
                                     break 
                                 }
+                                E {
+                                    #\x85
+                                    #review - is behaviour different to lf?
+                                    #todo - possibly(?) same logic as <lf> handling above. i.e return instruction depends on where column_cursor is at the time we get NEL
+                                    #leave implementation until logic for <lf> is set in stone... still under review
+                                    #It's arguable NEL is a pure cursor movement as opposed to the semantic meaning of crlf or lf in a file.
+                                    # 
+                                    #Next Line (NEL) "Move the cursor to the left margin on the next line. If the cursor is at the bottom margin, scroll the page up"
+                                    puts stderr "overtype::renderline ESC E unimplemented"
+
+                                }
+                                H {
+                                    #\x88
+                                    #Tab Set
+                                    puts stderr "overtype::renderline ESC H tab set unimplemented"
+                                }
                                 M {
                                     #\x8D
                                     #Reverse Index (RI)
                                     #vt102-docs: "Moves cursor up one line in same column. If cursor is at top margin, screen performs a scroll-down"
-                                    puts stderr "ESC M not fully implemented"
+                                    puts stderr "overtype::renderline ESC M not fully implemented"
 
                                     set replay_codes_overlay [punk::ansi::codetype::sgr_merge_list {*}[lindex $overlay_grapheme_control_stacks $gci]]
                                     #move up
@@ -3069,31 +3672,89 @@ tcl::namespace::eval overtype {
                                     #retain cursor_column
                                     break 
                                 }
-                                E {
-                                    #\x85
-                                    #review - is behaviour different to lf?
-                                    #todo - possibly(?) same logic as <lf> handling above. i.e return instruction depends on where column_cursor is at the time we get NEL
-                                    #leave implementation until logic for <lf> is set in stone... still under review
-                                    #It's arguable NEL is a pure cursor movement as opposed to the semantic meaning of crlf or lf in a file.
-                                    # 
-                                    #Next Line (NEL) "Move the cursor to the left margin on the next line. If the cursor is at the bottom margin, scroll the page up"
-                                    puts stderr "ESC E unimplemented"
+                                N {
+                                    #\x8e - affects next character only
+                                    puts stderr "overtype::renderline single shift select G2 command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                O {
+                                    #\x8f - affects next character only
+                                    puts stderr "overtype::renderline single shift select G3 command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                P {
+                                    #\x90
+                                    #DCS - shouldn't get here - handled in 7DCS branch
+                                    #similarly \] OSC (\x9d)  and \\ (\x9c) ST 
+                                }
+                                V {
+                                    #\x96
 
                                 }
+                                W {
+                                    #\x97
+                                }
+                                X {
+                                    #\x98
+                                    #SOS
+                                    if {[string index $code end] eq "\007"} {
+                                        set sos_content [string range $code 2 end-1] ;#ST is \007
+                                    } else {
+                                        set sos_content [string range $code 2 end-2] ;#ST is \x1b\\
+                                    }
+                                    #return in some useful form to the caller
+                                    #TODO!
+                                    lappend sos_list [list string $sos_content row $cursor_row column $cursor_column]
+                                    puts stderr "overtype::renderline ESCX SOS UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
+                                ^ {
+                                    #puts stderr "renderline PM"
+                                    #Privacy Message.
+                                    if {[string index $code end] eq "\007"} {
+                                        set pm_content [string range $code 2 end-1] ;#ST is \007
+                                    } else {
+                                        set pm_content [string range $code 2 end-2] ;#ST is \x1b\\
+                                    }
+                                    #We don't want to render it - but we need to make it available to the application
+                                    #see the textblock library in punk, for the exception we make here for single backspace.
+                                    #It is unlikely to be encountered as a useful PM - so we hack to pass it through as a fix 
+                                    #for spacing issues on old terminals which miscalculate the single-width 'Symbols for Legacy Computing'
+                                    if {$pm_content eq "\b"} {
+                                        #puts stderr "renderline PM sole backspace special handling for \U1FB00 - \U1FBFF"
+                                        #esc^\b\007 or esc^\besc\\ 
+                                        #HACKY pass-through - targeting terminals that both mis-space legacy symbols *and* don't support PMs
+                                        #The result is repair of the extra space. If the terminal is a modern one and does support PM - the \b should be hidden anyway.
+                                        #If the terminal has the space problem AND does support PMs - then this just won't fix it.
+                                        #The fix relies on the symbol-supplier to cooperate by appending esc^\b\esc\\ to the problematic symbols.
+
+                                        #priv::render_addchar $idx $code [lindex $overstacks $idx_over] [lindex $overstacks_gx $idx_over] $insert_mode
+                                        #idx has been incremented after last grapheme added
+                                        priv::render_append_to_char [expr {$idx -1}] $code
+                                    }
+                                    #lappend to a dict element in the result for application-specific processing
+                                    lappend pm_list $pm_content
+                                }
+                                _ {
+                                    #APC Application Program Command
+                                    #just warn for now..
+                                    puts stderr "overtype::renderline ESC_ APC command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                                }
                                 default {
-                                    puts stderr "overtype::renderline ESC<x> code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
+                                    puts stderr "overtype::renderline ESC<x> code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented codenorm:[ansistring VIEW -lf 1 -vt 1 -nul 1 $codenorm]"
                                 }
                             }
 
                         }
+                        7DCS {
+                            puts stderr "overtype::renderline DCS - DEVICE CONTROL STRING command UNIMPLEMENTED. code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code]"
+                            #
+
+                        }
+                        7OSC - 8OSC {
+
+                        }
+                        default {
+                        }
                     }
 
-                    #switch -regexp -matchvar matchinfo -- $code\
-                    #$re_mode {
-                    #}\
-                    #default {
-                    #    puts stderr "overtype::renderline code [ansistring VIEW -lf 1 -vt 1 -nul 1 $code] not implemented"
-                    #}
 
                 }
                 default {
@@ -3104,7 +3765,7 @@ tcl::namespace::eval overtype {
         }
 
         #--------
-        if {$opt_overflow == 0} {
+        if {$opt_expand_right == 0} {
             #need to truncate to the width of the original undertext
             #review - string_width vs printing_length here. undertext requirement to be already rendered therefore punk::char::string_width ok?
             #set num_under_columns [punk::char::string_width $pt_underchars] ;#plaintext underchars
@@ -3275,20 +3936,24 @@ tcl::namespace::eval overtype {
                 overflow_right $overflow_right\
                 unapplied $unapplied\
                 unapplied_list $unapplied_list\
-                insert_mode $insert_mode\
-                autowrap_mode $autowrap_mode\
+                insert_mode     $insert_mode\
+                autowrap_mode   $autowrap_mode\
+                crm_mode        $crm_mode\
+                reverse_mode    $reverse_mode\
                 insert_lines_above $insert_lines_above\
                 insert_lines_below $insert_lines_below\
                 cursor_saved_position $cursor_saved_position\
                 cursor_saved_attributes $cursor_saved_attributes\
                 cursor_column   $cursor_column\
                 cursor_row      $cursor_row\
-                opt_overflow    $opt_overflow\
+                expand_right    $opt_expand_right\
                 replay_codes $replay_codes\
                 replay_codes_underlay $replay_codes_underlay\
                 replay_codes_overlay $replay_codes_overlay\
+                pm_list  $pm_list\
             ]
             if {$opt_returnextra == 1} {
+                #puts stderr "renderline: $result"
                 return $result
             } else {
                 #human/debug - map special chars to visual glyphs
@@ -3313,6 +3978,7 @@ tcl::namespace::eval overtype {
                 return $result
             }
         } else {
+            #puts stderr "renderline returning: result $outstring instruction $instruction unapplied $unapplied overflow_right $overflow_right"
             return $outstring
         }
         #return [join $out ""]
@@ -3370,8 +4036,9 @@ tcl::namespace::eval overtype::piper {
 }
 interp alias "" piper_renderline "" overtype::piper::renderline 
 
-#intended for single grapheme - but will work for multiple
-#cannot contain ansi or newlines 
+#intended primarily for single grapheme - but will work for multiple
+#WARNING: query CAN contain ansi or newlines - but if cache was not already set manually,the answer will be incorrect!
+#We deliberately allow this for PM/SOS attached within a column
 #(a cache of ansifreestring_width calls - as these are quite regex heavy)
 proc overtype::grapheme_width_cached {ch} {
     variable grapheme_widths
@@ -3439,6 +4106,7 @@ tcl::namespace::eval overtype::priv {
         tcl::dict::set cache_is_sgr $code $answer
         return $answer
     }
+    # better named render_to_unapplied?
     proc render_unapplied {overlay_grapheme_control_list gci} {
         upvar idx_over idx_over
         upvar unapplied unapplied
@@ -3532,7 +4200,7 @@ tcl::namespace::eval overtype::priv {
             set ustacks [lreplace $ustacks $i $i]
             set gxstacks [lreplace $gxstacks $i $i]
         } else {
-
+            puts stderr "render_delchar - attempt to delchar at index $i >= number of outcols $nxt - shouldn't happen"
         }
     }
     proc render_erasechar {i count} {
@@ -3563,21 +4231,68 @@ tcl::namespace::eval overtype::priv {
         upvar outcols o
         lset o $i $c
     }
+
+    #Initial usecase is for old-terminal hack to add PM-wrapped \b
+    #review - can be used for other multibyte sequences that occupy one column?
+    #combiners? diacritics?
+    proc render_append_to_char {i c} {
+        upvar outcols o
+        if {$i > [llength $o]-1} {
+            error "render_append_to_char cannot append [ansistring VIEW -lf 1 -nul 1 $c] to existing char at index $i while $i >= llength outcols [llength $o]"
+        }
+        set existing [lindex $o $i]
+        if {$existing eq "\0"} {
+            lset o $i $c
+        } else {
+            lset o $i [string cat $existing $c] 
+        }
+    } 
     #is actually addgrapheme?
     proc render_addchar {i c sgrstack gx0stack {insert_mode 0}} {
         upvar outcols o
         upvar understacks ustacks
         upvar understacks_gx gxstacks
 
-        if 0 {
-        if {$c eq "c"} {
-            puts "i:$i c:$c sgrstack:[ansistring VIEW $sgrstack]"
-            puts "understacks:[ansistring VIEW $ustacks]"
-            upvar overstacks overstacks
-            puts "overstacks:[ansistring VIEW $overstacks]"
-            puts "info level 0:[info level 0]"
-        }
+        # -- --- ---
+        #this is somewhat of a hack.. probably not really the equivalent of proper reverse video? review
+        #we should ideally be able to reverse the video of a sequence that already includes SGR reverse/noreverse attributes
+        upvar reverse_mode do_reverse
+        #if {$do_reverse} {
+        #    lappend sgrstack [a+ reverse]
+        #} else {
+        #    lappend sgrstack [a+ noreverse]
+        #}
+
+        #JMN3
+        if {$do_reverse} {
+            #note we can't just look for \x1b\[7m  or \x1b\[27m
+            # it may be a more complex sequence like \x1b\[0\;\;7\;31m  etc
+
+            set existing_reverse_state 0 
+            set codeinfo [punk::ansi::codetype::sgr_merge $sgrstack -info 1]
+            set codestate_reverse [dict get $codeinfo codestate reverse]
+            switch -- $codestate_reverse {
+                7 {
+                    set existing_reverse_state 1
+                }
+                27 {
+                    set existing_reverse_state 0
+                }
+                "" {
+                }
+            }
+            if {$existing_reverse_state == 0} {
+                set rflip [a+ reverse]
+            } else {
+                #reverse of reverse
+                set rflip [a+ noreverse]
+            }
+            #note that mergeresult can have multiple esc (due to unmergeables or non sgr codes)
+            set sgrstack [list [dict get $codeinfo mergeresult] $rflip]
+            #set sgrstack [punk::ansi::codetype::sgr_merge [list [dict get $codeinfo mergeresult] $rflip]]
         }
+        
+        # -- --- ---
 
         set nxt [llength $o] 
         if {!$insert_mode} {
diff --git a/src/vfs/_vfscommon/modules/punk/ansi-0.1.1.tm b/src/vfs/_vfscommon/modules/punk/ansi-0.1.1.tm
index 85cb9f27..267e680e 100644
--- a/src/vfs/_vfscommon/modules/punk/ansi-0.1.1.tm
+++ b/src/vfs/_vfscommon/modules/punk/ansi-0.1.1.tm
@@ -106,7 +106,7 @@ tcl::namespace::eval punk::ansi::class {
                     #overflow is a different concept - perhaps not particularly congruent with the idea of the textblock as a mini terminal emulator.
                     #overflow effectively auto-expands the block(terminal?) width
                     #overflow and wrap both being true won't make sense unless we implement a max_overflow concept
-                    set o_rendered [overtype::renderspace -overflow 0 -wrap 1 -width $w -height $h -appendlines 1 "" [$o_ansistringobj get]]
+                    set o_rendered [overtype::renderspace -expand_right 0 -wrap 1 -width $w -height $h -appendlines 1 "" [$o_ansistringobj get]]
                     if {$cksum eq "not-done"} {
                         #if dimensions changed - the checksum won't have been done
                         set o_rendered_what [$o_ansistringobj checksum]
@@ -129,7 +129,7 @@ tcl::namespace::eval punk::ansi::class {
                 set o_dimensions $dimensions
                    
                 
-                set rendered [overtype::renderspace -experimental {test_mode} -overflow 0 -wrap 1 -width $w -height $h -appendlines 1 "" [$o_ansistringobj get]]
+                set rendered [overtype::renderspace -cp437 1 -expand_right 0 -wrap 1 -width $w -height $h -appendlines 1 "" [$o_ansistringobj get]]
                 return $rendered
             }
             method render_to_input_line {args} {
@@ -176,7 +176,7 @@ tcl::namespace::eval punk::ansi::class {
                 if {$opt_minus ne "0"} {
                    set chunk [tcl::string::range $chunk 0 end-$opt_minus] 
                 }
-                set rendered [overtype::renderspace -experimental {test_mode} -overflow 0 -wrap 1 -width $w -height $h -appendlines 1 "" $chunk]
+                set rendered [overtype::renderspace -expand_right 0 -wrap 1 -width $w -height $h -appendlines 1 "" $chunk]
                 set marker ""
                 for {set i 1} {$i <= $w} {incr i} {
                     if {$i % 10 == 0} {
@@ -514,11 +514,8 @@ tcl::namespace::eval punk::ansi {
         set encnames [encoding names]
         set encoding ""
         set dimensions ""
-        set test_mode 0
         foreach a $args {
-            if {$a eq "test_mode"} {
-                set test_mode 1
-            } elseif {$a in $encnames} {
+            if {$a in $encnames} {
                 set encoding $a
             } else {
                 if {[regexp {[0-9]+(?:x|X)[0-9]+} $a]} {
@@ -553,28 +550,51 @@ tcl::namespace::eval punk::ansi {
         $obj destroy
         return $result
     }
-    proc example {} {
+    proc example {args} {
+        set base [punk::repo::find_project]
+        set default_ansibase [file join $base src/testansi]
+
+        set argd [punk::args::get_dict [tstr -return string {
+            *proc -name punk::ansi::example -help "Display .ans image files in a grid that will fit in console
+            "
+            -colwidth -default 82 -help "Width of each column - default of 82 will fit a standard 80wide ansi image (when framed)
+            You can specify a narrower width to truncate images on the right side"
+            -folder -default "${$default_ansibase}"   -help "Base folder for files if relative paths are used.
+            Defaults to <projectbase>/src/testansi - where projectbase is determined from current directory.
+            "
+            *values -min 0 -max -1 
+            files -default {belinda.ans bot.ans flower.ans fish.ans} -multiple true -help "List of filenames - leave empty to display 4 defaults"
+        }] $args]
+        set colwidth [dict get $argd opts -colwidth]
+        set ansibase [file normalize [dict get $argd opts -folder]]
+        set fnames   [dict get $argd values files]
+
+        #assumes fixed column widths e.g 80col images will fit in 82-width frames (common standard for old ansi art) (of arbitrary height)
         #todo - review dependency on punk::repo ?  
         package require textblock
         package require punk::repo
         package require punk::console
 
-        set fnames [list belinda.ans bot.ans flower.ans fish.ans]
-        set base [punk::repo::find_project]
-        set ansibase [file join $base src/testansi]
         if {![file exists $ansibase]} {
-            puts stderr "Missing testansi folder at $base/src/testansi"
+            puts stderr "Missing folder at $ansibase"
             puts stderr "Ensure ansi test files exist: $fnames"
             #error "punk::ansi::example Cannot find example files"
         }
-        set missingbase [a+ yellow][textblock::block 80 23 ?][a]
+        set missingbase [a+ yellow][textblock::block [expr {$colwidth-2}] 23 ?][a] ;#assuming standard frame - subtract 2 for left/right borders
         set pics [list]
         foreach f $fnames {
-            if {![file exists $ansibase/$f]} {
-                set p [overtype::left $missingbase "[a+ red bold]\nMissing file\n$ansibase/$f[a]"]
+            if {[file pathtype $f] ne "absolute"} {
+                set filepath [file normalize $ansibase/$f]
+            } else {
+                set filepath [file normalize $f]
+            }
+            if {![file exists $filepath]} {
+                set p [overtype::left $missingbase "[a+ red bold]\nMissing file\n$f[a]"]
                 lappend pics [tcl::dict::create filename $f pic $p status missing]
             } else {
-                set img [join [lines_as_list -line trimline -block trimtail [ansicat $ansibase/$f]] \n]
+                #set img [join [lines_as_list -line trimline -block trimtail [ansicat $filepath]] \n]
+                #-line trimline will wreck some images
+                set img [join [lines_as_list -block trimtail [ansicat $filepath]] \n]
                 lappend pics [tcl::dict::create filename $f pic $img status ok] 
             }
         }
@@ -582,30 +602,73 @@ tcl::namespace::eval punk::ansi {
         set termsize [punk::console:::get_size] 
         set margin 4
         set freewidth [expr {[tcl::dict::get $termsize columns]-$margin}]
-        set per_row [expr {$freewidth / 80}]
-
-        set rowlist [list]
-        set row [list]
-        set i 1 
+        set per_row [expr {$freewidth / $colwidth}]
+
+        set rowlist [list]      ;# { {<img> <img>} {<img> <img>} }
+        set heightlist [list]   ;# { {<h>   <h>  } {<h>   <h>  } }
+        set maxheights [list]   ;# { <max>  <max>}
+        set row [list]  ;#wip row
+        set rowh [list] ;#wip row img heights
+        set i 1  ;#track image index of whole pics list
+        set rowindex 0
         foreach picinfo $pics {
             set subtitle ""
             if {[tcl::dict::get $picinfo status] ne "ok"} {
                 set subtitle [tcl::dict::get $picinfo status] 
             }
             set title [tcl::dict::get $picinfo filename]
-            lappend row [textblock::frame -subtitle $subtitle -title $title [tcl::dict::get $picinfo pic]]
+            set fr [textblock::frame -width $colwidth -subtitle $subtitle -title $title [tcl::dict::get $picinfo pic]]
+            # -- --- --- --- 
+            #we need the max height of a row  element to use join_basic instead of join below
+            # -- --- --- --- 
+            set fr_height [textblock::height $fr]
+            lappend row $fr
+            lappend rowh $fr_height
+
+            set rowmax [lindex $maxheights $rowindex]
+            if {$rowmax eq ""} {
+                #empty result means no maxheights entry for this row yet
+                set rowmax $fr_height
+                lappend maxheights $rowmax
+            } else {
+                if {$fr_height > $rowmax} {
+                    set rowmax $fr_height
+                    lset maxheights end $rowmax
+                }
+            } 
+            # -- --- --- --- 
+
             if {$i % $per_row == 0} {
                 lappend rowlist $row
+                lappend heightlist $rowh
+                incr rowindex
                 set row [list]
+                set rowh [list]
             } elseif {$i == [llength $pics]} {
                 lappend rowlist $row
+                lappend heightlist $rowh
             }
             incr i
         }
-
+        #puts "--> maxheights: $maxheights"
+        #puts "--> heightlist: $heightlist"
         set result ""
-        foreach r $rowlist {
-            append result [textblock::join_basic -- {*}$r] \n
+        set rowindex 0
+        set blankline [string repeat " " $colwidth]
+        foreach imgs $rowlist heights $heightlist  {
+            set maxheight [lindex $maxheights $rowindex]
+            set adjusted_row [list]
+            foreach i $imgs h $heights {
+                if {$h < $maxheight} {
+                    #add blank lines to bottom of shorter images so join_basic can be used.
+                    #textblock::join of ragged-height images would work and remove the need for all the height calculation
+                    #.. but it requires much more processing 
+                    append i [string repeat \n$blankline [expr {$maxheight - $h}]]
+                } 
+                lappend adjusted_row $i
+            }
+            append result [textblock::join_basic -- {*}$adjusted_row] \n
+            incr rowindex
         }
 
 
@@ -3199,6 +3262,28 @@ Brightblack 100   Brightred 101   Brightgreen 102   Brightyellow 103   Brightblu
         return \x1b8
     }
     # -- ---  --- --- ---
+    #CRM Show Control Character Mode
+    proc enable_crm {} {
+        return \x1b\[3h
+    }
+    proc disable_crm {} {
+        return \x1b\[3l
+    }
+
+    #DECSNM 
+    #Note this can invert the enclosed section including any already reversed by SGR 7  - depending on terminal support.
+    #e.g 
+    #set test [a+ reverse]aaa[a+ noreverse]bbb
+    #  - $test above can't just be reversed by putting another [a+ reverse] in front of it.
+    #  - but the following will work (even if underlying terminal doesn't support ?5 sequences)
+    #overtype::renderspace -width 20  [enable_inverse]$test 
+    proc enable_inverse {} {
+        return \x1b\[?5h
+    }
+    proc disable_inverse {} {
+        return \x1b\[?5l
+    }
+
 
     #DECAWM - automatic line wrapping
     proc enable_line_wrap {} {
@@ -3399,6 +3484,9 @@ Brightblack 100   Brightred 101   Brightgreen 102   Brightyellow 103   Brightblu
         #the purpose of backspace (or line cr) in embedded text is unclear. Should it allow some sort of character combining/overstrike as it has sometimes done historically (nroff/less)?  e.g a\b` as an alternative combiner or bolding if same char
         #This should presumably only be done if the over_strike (os) capability is enabled in the terminal. Either way - it presumably won't affect printing width?
         set line [punk::ansi::ansistrip $line]
+        #ANSI (e.g PM/SOS) can contain \b or \n  or \t  but won't contribute to length
+        #ansistrip must come before any other processing of these chars.
+
         #we can't use simple \b processing if we get ansi codes and aren't actually processing them (e.g moves)
 
         set line [punk::char::strip_nonprinting_ascii $line] ;#only strip nonprinting after ansistrip - some like BEL are part of ansi
@@ -3748,6 +3836,7 @@ tcl::namespace::eval punk::ansi {
             -filter_fg 0\
             -filter_bg 0\
             -filter_reset 0\
+            -info 0\
         ]
 
         #codes *must* already have been split so that one esc per element in codelist
@@ -3760,7 +3849,8 @@ tcl::namespace::eval punk::ansi {
             set opts $defaultopts_sgr_merge_singles
             foreach {k v} $args {
                 switch -- $k {
-                    -filter_fg - -filter_bg - -filter_reset {
+                    -filter_fg - -filter_bg - -filter_reset -
+                    -info {
                         tcl::dict::set opts $k $v
                     }
                     default {
@@ -4139,19 +4229,24 @@ tcl::namespace::eval punk::ansi {
                 set codemerge [tcl::string::trimright $codemerge {;}]
                 if {$unmergeable ne ""} {
                     set unmergeable [tcl::string::trimright $unmergeable {;}]
-                    return "\x1b\[${codemerge}m\x1b\[${unmergeable}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${codemerge}m\x1b\[${unmergeable}m[join $othercodes ""]"
                 } else {
-                    return "\x1b\[${codemerge}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${codemerge}m[join $othercodes ""]"
                 }
             } else {
                 if {$unmergeable eq ""} {
                     #there were no SGR codes - not even resets
-                    return [join $othercodes ""]
+                    set mergeresult [join $othercodes ""]
                 } else {
                     set unmergeable [tcl::string::trimright $unmergeable {;}]
-                    return "\x1b\[${unmergeable}m[join $othercodes ""]"
+                    set mergeresult "\x1b\[${unmergeable}m[join $othercodes ""]"
                 }
             }
+            if {[tcl::dict::get $opts -info]} {
+                return [dict create sgr $codemerge unmergeable $unmergeable othercodes $othercodes mergeresult $mergeresult codestate $codestate]
+            } else {
+                return $mergeresult
+            }
         }
 
         #has_sgr_reset  - rather than support this function - create an sgr normalize function that removes dead params and brings reset to front of param list?
@@ -4240,7 +4335,7 @@ tcl::namespace::eval punk::ansi::ta {
     #we also need to track the start of ST terminated code and not add it for replay (in the ansistring functions)
     #variable re_ST  {(?:\x1bX|\u0098|\x1b\^|\u009E|\x1b_|\u009F)(?:[^\x1b\007\u009c]*)(?:\x1b\\|\007|\u009c)} ;#downsides: early terminating with nests, mixes 7bit 8bit start/ends (does that exist in the wild?)   
     #keep our 8bit/7bit start-end codes separate
-    variable re_ST      {(?:\x1bP|\x1bX|\x1b\^|\x1b_)(?:(?!\x1b\\|007).)*(?:\x1b\\|\007)|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)}
+    variable re_ST      {(?:\x1bP|\x1bX|\x1b\^|\x1b_)(?:(?!\x1b\\|\007).)*(?:\x1b\\|\007)|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)}
 
 
 
@@ -4252,7 +4347,7 @@ tcl::namespace::eval punk::ansi::ta {
     # -- --- --- ---
     #handrafted TRIE version of above. Somewhat difficult to construct and maintain. TODO - find a regext TRIE generator that works with Tcl regexes
     #This does make things quicker - but it's too early to finalise the detect/split regexes (e.g missing \U0090 ) - will need to be redone.
-    variable re_ansi_detect {(?:\x1b(?:\((?:0|B)|\[(?:[\x20-\x2f\x30-\x3f]*[\x40-\x7e])|\](?:(?:[^\007]*)\007|(?:(?!\x1b\\).)*\x1b\\)|(?:P|X|\^|_)(?:(?:(?!\x1b\\|007).)*(?:\x1b\\|\007))|c|7|8|M|E|D|H|=|>|(?:#(?:3|4|5|6|8))))|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)|(?:\u009b)[\x20-\x2f\x30-\x3f]*[\x40-\x7e]|(?:\u009d)(?:[^\u009c]*)?\u009c}
+    variable re_ansi_detect {(?:\x1b(?:\((?:0|B)|\[(?:[\x20-\x2f\x30-\x3f]*[\x40-\x7e])|\](?:(?:[^\007]*)\007|(?:(?!\x1b\\).)*\x1b\\)|(?:P|X|\^|_)(?:(?:(?!\x1b\\|\007).)*(?:\x1b\\|\007))|c|7|8|M|E|D|H|=|>|(?:#(?:3|4|5|6|8))))|(?:\u0090|\u0098|\u009E|\u009F)(?:(?!\u009c).)*(?:\u009c)|(?:\u009b)[\x20-\x2f\x30-\x3f]*[\x40-\x7e]|(?:\u009d)(?:[^\u009c]*)?\u009c}
     # -- --- --- ---
 
 
@@ -5674,7 +5769,12 @@ tcl::namespace::eval punk::ansi::ansistring {
         ENQ [list \x05 \u2405]\
         ACK [list \x06 \u2406]\
         BEL [list \x07 \u2407]\
+        BS  [list \x08 \u2408]\
+        HT  [list \x09 \u2409]\
+        LF  [list \x0a \u240a]\
+        VT  [list \x0b \u240b]\
         FF  [list \x0c \u240c]\
+        CR  [list \x0d \u240d]\
         SO  [list \x0e \u240e]\
         SF  [list \x0f \u240f]\
         DLE [list \x10 \u2410]\
@@ -5688,12 +5788,15 @@ tcl::namespace::eval punk::ansi::ansistring {
         CAN [list \x18 \u2418]\
         EM  [list \x19 \u2419]\
         SUB [list \x1a \u241a]\
+        ESC [list \x1b \u241b]\
         FS  [list \x1c \u241c]\
         GS  [list \x1d \u241d]\
         RS  [list \x1e \u241e]\
         US  [list \x1f \u241f]\
+        SP  [list \x20 \u2420]\
         DEL [list \x7f \u2421]\
     ]
+
     #alternate symbols for space
     # \u2422 Blank Symbol (b with forwardslash overly)
     # \u2423 Open Box  (square bracket facing up like a tray/box)
@@ -5836,6 +5939,7 @@ tcl::namespace::eval punk::ansi::ansistring {
             -cr 1\
             -lf 0\
             -vt 0\
+            -ff 1\
             -ht 1\
             -bs 1\
             -sp 1\
@@ -5850,16 +5954,22 @@ tcl::namespace::eval punk::ansi::ansistring {
         set opt_cr      [tcl::dict::get $opts -cr]
         set opt_lf      [tcl::dict::get $opts -lf]
         set opt_vt      [tcl::dict::get $opts -vt]
+        set opt_ff      [tcl::dict::get $opts -ff]
         set opt_ht      [tcl::dict::get $opts -ht]
         set opt_bs      [tcl::dict::get $opts -bs]
         set opt_sp      [tcl::dict::get $opts -sp]
         # -- --- --- --- ---
 
+        # -lf 2, -vt 2 and -ff 2 are useful for CRM mode (Show Control Character Mode) in the terminal - where a newline is expected to display after the character.
 
 
         set visuals_opt $debug_visuals 
+        set visuals_opt [dict remove $visuals_opt CR ESC LF VT FF HT BS SP] 
+
         if {$opt_esc} {
             tcl::dict::set visuals_opt ESC [list \x1b \u241b]
+        } else {
+            tcl::dict::unset visuals_opt ESC
         }
         if {$opt_cr} {
             tcl::dict::set visuals_opt CR [list \x0d \u240d]
@@ -5870,9 +5980,20 @@ tcl::namespace::eval punk::ansi::ansistring {
         if {$opt_lf == 2} {
             tcl::dict::set visuals_opt LF [list \x0a \u240a\n]
         }
-        if {$opt_vt} {
+        if {$opt_vt ==  1} {
             tcl::dict::set visuals_opt VT [list \x0b \u240b]
         }
+        if {$opt_vt ==  2} {
+            tcl::dict::set visuals_opt VT [list \x0b \u240b\n]
+        }
+        switch -exact -- $opt_ff {
+            1 {
+                tcl::dict::set visuals_opt FF [list \x0c \u240c]
+            }
+            2 {
+                tcl::dict::set visuals_opt FF [list \x0c \u240c\n]
+            }
+        }
         if {$opt_ht} {
             tcl::dict::set visuals_opt HT [list \x09 \u2409]
         }
diff --git a/src/vfs/_vfscommon/modules/punk/basictelnet-0.1.0.tm b/src/vfs/_vfscommon/modules/punk/basictelnet-0.1.0.tm
index d2b0cd10..6a5c481d 100644
--- a/src/vfs/_vfscommon/modules/punk/basictelnet-0.1.0.tm
+++ b/src/vfs/_vfscommon/modules/punk/basictelnet-0.1.0.tm
@@ -531,7 +531,7 @@ namespace eval punk::basictelnet {
             # -- --- --- ---
             set tailinfo ""
             if {[string length $nextwaiting]} {
-                set waitingdisplay [overtype::renderspace -wrap 1 -width 77 -height 1 "" [ansistring VIEW -lf 1 -vt 1 $nextwaiting]]
+                set waitingdisplay [overtype::renderspace -cp437 1 -wrap 1 -width 77 -height 1 "" [ansistring VIEW -lf 1 -vt 1 $nextwaiting]]
                 set tailinfo "[a+ red]from waiting:\n $waitingdisplay[a]"
             }
             ::punk::basictelnet::add_debug "[a+ Yellow black]from stdin sending: [ansistring VIEW -lf 1 -vt 1 $chunk][a]\n$tailinfo\n" stdin $sock
@@ -629,7 +629,7 @@ namespace eval punk::basictelnet {
             #set rawview [ansistring VIEW -lf 1 -vt 1 [encoding convertfrom $encoding_guess $data]] 
             set rawview [ansistring VIEW -lf 1 -vt 1 $data] 
             #set viewblock [overtype::left -wrap 1 -width 78 -height 4 "" $rawview] 
-            set viewblock [overtype::renderspace -experimental test_mode -wrap 1 -width 78 -height 4 "" $rawview] 
+            set viewblock [overtype::renderspace -cp437 1 -wrap 1 -width 78 -height 4 "" $rawview] 
             set lines [split $viewblock \n]
             if {[llength $lines] > 4} {
                 append debug_info [join [list {*}[lrange $lines 0 1] "...<[expr {[llength $lines] -4}] lines undisplayed>..." {*}[lrange $lines end-1 end]] \n]
diff --git a/src/vfs/_vfscommon/modules/punk/blockletter-0.1.0.tm b/src/vfs/_vfscommon/modules/punk/blockletter-0.1.0.tm
new file mode 100644
index 00000000..244190fa
--- /dev/null
+++ b/src/vfs/_vfscommon/modules/punk/blockletter-0.1.0.tm
@@ -0,0 +1,358 @@
+# -*- tcl -*-
+# Maintenance Instruction: leave the 999999.xxx.x as is and use punkshell 'pmix make' or bin/punkmake  to update from <pkg>-buildversion.txt
+# module template: shellspy/src/decktemplates/vendor/punk/modules/template_module-0.0.3.tm
+#
+# Please consider using a BSD or MIT style license for greatest compatibility with the Tcl ecosystem.
+# Code using preferred Tcl licenses can be eligible for inclusion in Tcllib, Tklib and the punk package repository.
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# (C) 2024
+#
+# @@ Meta Begin
+# Application punk::blockletter 0.1.0
+# Meta platform     tcl
+# Meta license      <unspecified>
+# @@ Meta End
+
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# doctools header
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+#*** !doctools
+#[manpage_begin shellspy_module_punk::blockletter 0 0.1.0]
+#[copyright "2024"]
+#[titledesc {Module API}]  [comment {-- Name section and table of contents description --}]
+#[moddesc {-}]             [comment {-- Description at end of page heading --}] 
+#[require punk::blockletter]
+#[keywords module]
+#[description]
+#[para] -
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[section Overview]
+#[para] overview of punk::blockletter
+#[subsection Concepts]
+#[para] -
+
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+##  Requirements
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[subsection dependencies]
+#[para] packages used by punk::blockletter
+#[list_begin itemized]
+
+package require Tcl 8.6-
+package require textblock
+#*** !doctools
+#[item] [package {Tcl 8.6}]
+#[item] [package {textblock}]
+
+# #package require frobz
+# #*** !doctools
+# #[item] [package {frobz}]
+
+#*** !doctools
+#[list_end]
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+#*** !doctools
+#[section API]
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# oo::class namespace
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+#tcl::namespace::eval punk::blockletter::class {
+    #*** !doctools
+    #[subsection {Namespace punk::blockletter::class}]
+    #[para] class definitions
+    #if {[tcl::info::commands [tcl::namespace::current]::interface_sample1] eq ""} {
+        #*** !doctools
+        #[list_begin enumerated]
+
+        # oo::class create interface_sample1 {
+        #     #*** !doctools
+        #     #[enum] CLASS [class interface_sample1]
+        #     #[list_begin definitions]
+
+        #     method test {arg1} {
+        #         #*** !doctools
+        #         #[call class::interface_sample1    [method test] [arg arg1]]
+        #         #[para] test method
+        #         puts "test: $arg1"
+        #     }
+
+        #     #*** !doctools
+        #     #[list_end] [comment {-- end definitions interface_sample1}]
+        # }
+
+        #*** !doctools
+        #[list_end] [comment {--- end class enumeration ---}]
+    #}
+#}
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# Base namespace
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+tcl::namespace::eval punk::blockletter {
+    tcl::namespace::export {[a-z]*}  ;# Convention: export all lowercase
+    #variable xyz
+
+    #*** !doctools
+    #[subsection {Namespace punk::blockletter}]
+    #[para] Core API functions for punk::blockletter 
+    #[list_begin definitions]
+
+    #A 3x4 block font
+
+    variable default_frametype
+    set default_frametype {vl \u00a0 hl \u00a0 tlc \u00a0 trc \u00a0 blc \u00a0 brc \u00a0}
+
+    # colours in order for T c l T k
+    set logo_letter_colours [list Web-red Web-green Web-royalblue Web-purple Web-orange]
+    set logo_letter_colours [list Red Green Blue Purple Yellow]
+
+
+    proc logo {args} {
+        variable logo_letter_colours
+        variable default_frametype
+        set argd [punk::args::get_dict [tstr -return string {
+            -frametype -default {${$default_frametype}}
+            -outlinecolour -default "web-white"
+            -backgroundcolour -default {} -help "e.g Web-white
+            This argument is the name as accepted by punk::ansi::a+"
+            *values -min 0 -max 0
+        }] $args]
+        set f [dict get $argd opts -frametype]
+        set bd [dict get $argd opts -outlinecolour]
+        set bgansi [dict get $argd opts -backgroundcolour] ;#we use ta::detect to see if already ansi and apply as necessary
+
+        #standard red green blue purple yellow
+        lassign $logo_letter_colours c_0 c_1 c_2 c_3 c_4 
+
+        set tc [merge_left_block [T -bg $c_0 -border $bd -frametype $f] [c -bg $c_1 -border $bd -frametype $f]]
+        set tk [merge_left_block [T -bg $c_3 -border $bd -frametype $f] [k_short -bg $c_4 -border $bd -frametype $f]]
+        set logo [textblock::join_basic -- $tc [l -bg $c_2 -border $bd -frametype $f] [textblock::block 2 8 " "] $tk]
+        if {$bgansi ne ""} {
+            lassign [textblock::size_as_list $logo] lwidth lheight
+            set w [expr {$lwidth + 2}]
+            set h [expr {$lheight + 2}]
+            if {![punk::ansi::ta::detect $bgansi]} {
+                set bgansi [punk::ansi::a+ $bgansi]
+            }
+            set logobg $bgansi[textblock::block $w $h " "][punk::ansi::a]
+            set topmargin [string repeat " " $w]
+            set lmargin [textblock::block 1 [expr {$h + 1}] " "]
+            set logo [overtype::left -transparent " " $logobg [textblock::join_basic -- $lmargin $topmargin\n$logo]]
+        }
+        return $logo
+    }
+
+    #for characters where it makes sense - offset left by 4 (1 'block' width)
+    proc merge_left {charleft textright} {
+        if {[string length $charleft] != 1} {
+            error "merge_left requires a single character as the charleft argument"
+        }
+        if {[textblock::height $charleft$textright] > 1} {
+            error "merge_left only operates on a plain char and a plain string with no newlines"
+        }
+        set rhs [textblock::join_basic -- [textblock::block 8 8 " "] [text $textright]]
+        #important to explicitly use -transparent " " (ordinary space) rather than -transparent 1 (any space?)
+        #This is because our frames have NBSP as filler to be non-transparent
+        return [overtype::left -transparent " " -overflow 1 [text $charleft] $rhs]
+    }
+    proc merge_left_block {blockleft blockright} {
+        set rhs [textblock::join_basic -- [textblock::block 8 8 " "] $blockright]
+        return [overtype::left -transparent " " -overflow 1 $blockleft $rhs]
+    }
+
+    proc T {args} {
+        set args [dict remove $args -width -height]
+        append out [lib::hbar {*}$args]\n
+        append out [textblock::join -- "    " [lib::vbar {*}$args] "    "]
+    }
+    proc c {args} {
+        set args [dict remove $args -width -height]
+        append out [textblock::block 12 2 " "]\n 
+        append out [lib::hbar {*}$args]\n
+        append out [textblock::join -- [lib::block {*}$args] "        "]\n
+        append out [lib::hbar {*}$args]
+    }
+    proc l {args} {
+        set args [dict remove $args -width -height]
+        append out [lib::vbar {*}[dict merge {-height 8} $args]]
+    }
+
+    #full height lower k
+    proc k {args} {
+        set args [dict remove $args -width -height]
+        set left [lib::vbar {*}[dict merge {-height 8} $args]]
+        set centre      [textblock::block 4 4 " "]\n
+        append centre   [lib::block {*}$args]\n 
+        append centre   [textblock::block 4 2 " "]
+        set right       [textblock::block 4 2 " "]\n 
+        append right    [lib::block {*}$args]\n 
+        append right    [textblock::block 4 2 " "]\n 
+        append right    [lib::block {*}$args] 
+        append out [textblock::join_basic -- $left $centre $right]
+    }
+    proc k_short {args} {
+        set args [dict remove $args -width -height]
+        append left [textblock::block 4 2 " "]\n 
+        append left [lib::vbar {*}[dict merge {-height 6} $args]]
+        append centre      [textblock::block 4 4 " "]\n
+        append centre   [lib::block {*}$args]\n 
+        append centre   [textblock::block 4 2 " "]
+        append right    [textblock::block 4 2 " "]\n 
+        append right    [lib::block {*}$args]\n 
+        append right    [textblock::block 4 2 " "]\n 
+        append right    [lib::block {*}$args] 
+        append out [textblock::join_basic -- $left $centre $right]
+    }
+
+    proc text {args} {
+        variable default_frametype
+        set argd [punk::args::get_dict [tstr -return string {
+            -bgcolour -default "Web-red"
+            -bordercolour -default "web-white"
+            -frametype -default {${$default_frametype}} 
+            *values -min 1 -max 1
+            str -help "Text to convert to blockletters
+             Requires terminal font to support relevant block characters" 
+            " 
+        }] $args]
+        set opts [dict get $argd opts]
+        set str [dict get $argd values str]
+        set str [string map {\r\n \n} $str]
+        set outblocks [list] 
+        set literals [list \n]
+        foreach char [split $str ""] {
+            if {$char in $literals} {
+                lappend outblocks $char
+                continue
+            }
+            if {$char in [list \t \r]} {
+                lappend outblocks [textblock::block 1 8 $char]
+                continue
+            } 
+            if {[info commands ::punk::blockletter::$char] ne ""} {
+                lappend outblocks [::punk::blockletter::$char {*}$opts]
+            } else {
+                lappend outblocks [textblock::block 12 8 $char]
+            }
+        } 
+        return [textblock::join_basic -- {*}$outblocks]
+    }
+
+
+    #*** !doctools
+    #[list_end] [comment {--- end definitions namespace punk::blockletter ---}]
+}
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+# Secondary API namespace
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+tcl::namespace::eval punk::blockletter::lib {
+
+    tcl::namespace::export {[a-z]*}  ;# Convention: export all lowercase
+    tcl::namespace::path [tcl::namespace::parent]
+    #*** !doctools
+    #[subsection {Namespace punk::blockletter::lib}]
+    #[para] Secondary functions that are part of the API 
+    #[list_begin definitions]
+
+    #proc utility1 {p1 args} {
+    #    #*** !doctools
+    #    #[call lib::[fun utility1] [arg p1] [opt {?option value...?}]]
+    #    #[para]Description of utility1 
+    #    return 1 
+    #}
+
+    proc block {args} {
+        upvar ::punk::blockletter::default_frametype ft
+        set argd [punk::args::get_dict [tstr -return string {
+            -height -default 2
+            -width  -default 4
+            -frametype -default {${$ft}} 
+            -bgcolour -default "Web-red"
+            -bordercolour -default "web-white"
+            *values -min 0 -max 0
+        }] $args]
+        set bg [dict get $argd opts -bgcolour]
+        set bd [dict get $argd opts -bordercolour]
+        set h  [dict get $argd opts -height]
+        set w  [dict get $argd opts -width]
+        set f  [dict get $argd opts -frametype]
+
+        #a frame will usually be filled with empty spaces if content not specified
+        #fill the frame with a non-space so we can do transparent overtypes using ordinary space as the transparency character
+        set w_in [expr {$w -2}]
+        set h_in [expr {$h -2}]
+        if {$w_in > 0 && $h_in > 0} { 
+            set inner [textblock::block $w_in $h_in \u00a0]  ;#NBSP
+            textblock::frame -type $f -height $h -width $w -ansiborder [a+ $bd $bg] -ansibase [a+ $bg] $inner
+        } else {
+            #important to use no content arg - as empty string has 'height' of 1 in the textblock context (min height of any string is 1 row in the console)
+            textblock::frame -type $f -height $h -width $w -ansiborder [a+ $bd $bg] -ansibase [a+ $bg]
+        }
+
+    }
+    proc hbar {args} {
+        upvar ::punk::blockletter::default_frametype ft
+        set defaults [dict create\
+        -height 2\
+        -width 12\
+        -frametype $ft\
+        ]
+        set opts [dict merge $defaults $args]
+        block {*}$opts
+    }
+    proc vbar {args} {
+        upvar ::punk::blockletter::default_frametype ft
+        #default height a multiple of default hbar/block height
+        set defaults [dict create\
+        -height 6\
+        -width 4\
+        -frametype $ft\
+        ]
+        set opts [dict merge $defaults $args]
+        [namespace current]::block {*}$opts
+    }
+
+    #*** !doctools
+    #[list_end] [comment {--- end definitions namespace punk::blockletter::lib ---}]
+}
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+
+
+
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+#*** !doctools
+#[section Internal]
+#tcl::namespace::eval punk::blockletter::system {
+    #*** !doctools
+    #[subsection {Namespace punk::blockletter::system}]
+    #[para] Internal functions that are not part of the API 
+
+
+
+#}
+# ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
+##  Ready   
+package provide punk::blockletter [tcl::namespace::eval punk::blockletter {
+    variable pkg punk::blockletter
+    variable version
+    set version 0.1.0 
+}]
+return
+
+#*** !doctools
+#[manpage_end]
+
diff --git a/src/vfs/_vfscommon/modules/punk/console-0.1.1.tm b/src/vfs/_vfscommon/modules/punk/console-0.1.1.tm
index 99c99939..4dd7bd66 100644
--- a/src/vfs/_vfscommon/modules/punk/console-0.1.1.tm
+++ b/src/vfs/_vfscommon/modules/punk/console-0.1.1.tm
@@ -1021,8 +1021,8 @@ namespace eval punk::console {
     #It's known this isn't always the case - but things like textutil::untabify2 take only a single value
     #on some systems test_char_width is a similar speed to get_tabstop_apparent_width - but on some test_char_width is much slower
     #we will use test_char_width as a fallback
-    proc get_tabstop_apparent_width {} {
-        set tslist [get_tabstops]
+    proc get_tabstop_apparent_width {{inoutchannels {stdin stdout}}} {
+        set tslist [get_tabstops $inoutchannels]
         if {![llength $tslist]} {
             #either terminal failed to report - or none set.
             set testw [test_char_width \t]
@@ -1075,23 +1075,37 @@ namespace eval punk::console {
         return [split [get_cursor_pos $inoutchannels] ";"]
     }
 
-    #todo - determine cursor on/off state before the call to restore properly. May only be possible 
+    #todo - determine cursor on/off state before the call to restore properly. 
     proc get_size {{inoutchannels {stdin stdout}}} {
         lassign $inoutchannels in out
         #we can't reliably use [chan names] for stdin,stdout. There could be stacked channels and they may have a names such as file22fb27fe810
         #chan eof is faster whether chan exists or not than
-        if {[catch {chan eof $in} is_eof]} {
-                error "punk::console::get_size input channel $in seems to be closed ([info level 1])"
+        if {[catch {chan eof $out} is_eof]} {
+                error "punk::console::get_size output channel $out seems to be closed ([info level 1])"
         } else {
             if {$is_eof} {
-                error "punk::console::get_size eof on input channel $in ([info level 1])"
+                error "punk::console::get_size eof on output channel $out ([info level 1])"
             } 
         }
-        if {[catch {chan eof $out} is_eof]} {
-                error "punk::console::get_size output channel $out seems to be closed ([info level 1])"
+        #we don't need to care about the input channel if chan configure on the output can give us the info.
+        #short circuit ansi cursor movement method if chan configure supports the -winsize value
+        set outconf [chan configure $out]
+        if {[dict exists $outconf -winsize]} {
+            #this mechanism is much faster than ansi cursor movements
+            #REVIEW check if any x-platform anomalies with this method?
+            #can -winsize key exist but contain erroneous info? We will check that we get 2 ints at least 
+            lassign [dict get $outconf -winsize] cols lines
+            if {[string is integer -strict $cols] && [string is integer -strict $lines]} {
+                return [list columns $cols rows $lines]
+            }
+            #continue on to ansi mechanism if we didn't get 2 ints
+        }
+
+        if {[catch {chan eof $in} is_eof]} {
+                error "punk::console::get_size input channel $in seems to be closed ([info level 1])"
         } else {
             if {$is_eof} {
-                error "punk::console::get_size eof on output channel $out ([info level 1])"
+                error "punk::console::get_size eof on input channel $in ([info level 1])"
             } 
         }
 
@@ -1114,18 +1128,28 @@ namespace eval punk::console {
         }
     }
 
-    #faster - but uses cursor_save - which we may want to avoid if calling during another operation which uses cursor save/restore
-    proc get_size_cursorrestore {} {
+    #faster than get_size when it is using ansi mechanism - but uses cursor_save - which we may want to avoid if calling during another operation which uses cursor save/restore
+    proc get_size_cursorrestore {{inoutchannels {stdin stdout}}} {
+        lassign $inoutchannels in out
+        #we use the same shortcircuit mechanism as get_size to avoid ansi at all if the output channel will give us the info directly 
+        set outconf [chan configure $out]
+        if {[dict exists $outconf -winsize]} {
+            lassign [dict get $outconf -winsize] cols lines
+            if {[string is integer -strict $cols] && [string is integer -strict $lines]} {
+                return [list columns $cols rows $lines]
+            }
+        }
+
         if {[catch {
             #some terminals (conemu on windows) scroll the viewport when we make a big move down like this - a  move to 1 1 immediately after cursor_save doesn't seem to fix that.
             #This issue also occurs when switching back from the alternate screen buffer - so perhaps that needs to be addressed elsewhere.
-            puts -nonewline [punk::ansi::cursor_off][punk::ansi::cursor_save_dec][punk::ansi::move 2000 2000]
-            lassign [get_cursor_pos_list] lines cols
-            puts -nonewline [punk::ansi::cursor_restore][punk::console::cursor_on];flush stdout
+            puts -nonewline $out [punk::ansi::cursor_off][punk::ansi::cursor_save_dec][punk::ansi::move 2000 2000]
+            lassign [get_cursor_pos_list $inoutchannels] lines cols
+            puts -nonewline $out [punk::ansi::cursor_restore][punk::console::cursor_on];flush $out 
             set result [list columns $cols rows $lines] 
         } errM]} {
-            puts -nonewline [punk::ansi::cursor_restore_dec]
-            puts -nonewline [punk::ansi::cursor_on]
+            puts -nonewline $out [punk::ansi::cursor_restore_dec]
+            puts -nonewline $out [punk::ansi::cursor_on]
             error "$errM"
         } else {
             return $result
@@ -1175,7 +1199,7 @@ namespace eval punk::console {
         }
 
         if {!$emit} {
-            puts -nonewline stdout \033\[2K\033\[1G ;#2K erase line 1G cursor at col1
+            puts -nonewline stdout \033\[2K\033\[1G ;#2K erase line, 1G cursor at col1
         }
         set response ""
         if {[catch {
@@ -1405,12 +1429,12 @@ namespace eval punk::console {
         proc cursor_save {} {
             #*** !doctools
             #[call [fun cursor_save]]
-            puts -nonewline \x1b\[s
+            puts -nonewline stdout \x1b\[s
         }
         proc cursor_restore {} {
             #*** !doctools
             #[call [fun cursor_restore]]
-            puts -nonewline \x1b\[u
+            puts -nonewline stdout \x1b\[u
         }
         #DEC equivalents of cursor_save/cursor_restore - perhaps more widely supported?
         proc cursor_save_dec {} {
diff --git a/src/vfs/_vfscommon/modules/punk/experiment-0.1.0.tm b/src/vfs/_vfscommon/modules/punk/experiment-0.1.0.tm
index 89939ade..9d9861f2 100644
--- a/src/vfs/_vfscommon/modules/punk/experiment-0.1.0.tm
+++ b/src/vfs/_vfscommon/modules/punk/experiment-0.1.0.tm
@@ -474,12 +474,12 @@ namespace eval punk::experiment {
     proc render1 {} {
         variable b1
         variable b2
-        overtype::renderspace -overflow 1 -startcolumn 7 $b1 $b2
+        overtype::renderspace -expand_right 1 -startcolumn 7 $b1 $b2
     }
     proc render2 {} {
         variable b1
         variable b3
-        overtype::renderspace -overflow 1 -transparent @ $b1 $b3
+        overtype::renderspace -expand_right 1 -transparent @ $b1 $b3
     }
 
     oo::class create c1 {
diff --git a/src/vfs/_vfscommon/modules/punk/mix/commandset/project-0.1.0.tm b/src/vfs/_vfscommon/modules/punk/mix/commandset/project-0.1.0.tm
index 15281625..9afc685c 100644
--- a/src/vfs/_vfscommon/modules/punk/mix/commandset/project-0.1.0.tm
+++ b/src/vfs/_vfscommon/modules/punk/mix/commandset/project-0.1.0.tm
@@ -919,10 +919,18 @@ namespace eval punk::mix::commandset::project {
 
             if {[llength $col_states]} {
                 foreach row $col_rowids wd $workdirs db $col_fnames dup $col_dupids pname $col_pnames pcode $col_pcodes s $col_states {
+                    if {![file exists $wd]} {
+                        set row [punk::ansi::a+ strike red]$row[a]
+                        set wd [punk::ansi::a+ red]$wd[a]
+                    }
                     append msg "[overtype::right $col0 $row] [overtype::left $col1 $wd] [overtype::left $col2 $db] [overtype::right $col3 $dup] [overtype::left $col4 $pname] [overtype::left $col5 $pcode] [overtype::left $col6 $s]" \n
                 } 
             } else {
                 foreach row $col_rowids wd $workdirs db $col_fnames dup $col_dupids pname $col_pnames pcode $col_pcodes {
+                    if {![file exists $wd]} {
+                        set row [punk::ansi::a+ strike red]$row[a]
+                        set wd [punk::ansi::a+ red]$wd[a]
+                    }
                     append msg "[overtype::right $col0 $row] [overtype::left $col1 $wd] [overtype::left $col2 $db] [overtype::right $col3 $dup] [overtype::left $col4 $pname] [overtype::left $col5 $pcode]" \n
                 } 
             }
diff --git a/src/vfs/_vfscommon/modules/punk/repl-0.1.tm b/src/vfs/_vfscommon/modules/punk/repl-0.1.tm
index 0d3f6115..864c4030 100644
--- a/src/vfs/_vfscommon/modules/punk/repl-0.1.tm
+++ b/src/vfs/_vfscommon/modules/punk/repl-0.1.tm
@@ -431,7 +431,7 @@ proc repl::post_operations {} {
        uplevel #0 {eval $::repl::running_script}
     }
     #todo - tidyup so repl could be restarted
-    set repl::post_operations_done 0
+    set ::repl::post_operations_done 0
 }
 
 
@@ -860,7 +860,7 @@ namespace eval punk::repl::class {
                 set o_cursor_col $line_nextchar_col
             }
             
-            set mergedinfo [overtype::renderline -info 1 -overflow 1 -insert_mode $o_insert_mode -cursor_column $o_cursor_col -cursor_row $o_cursor_row $underlay $new0]
+            set mergedinfo [overtype::renderline -info 1 -expand_right 1 -insert_mode $o_insert_mode -cursor_column $o_cursor_col -cursor_row $o_cursor_row $underlay $new0]
 
             set result          [dict get $mergedinfo result]
             set o_insert_mode   [dict get $mergedinfo insert_mode]
@@ -934,13 +934,13 @@ namespace eval punk::repl::class {
                         break
                     }
                 }
-                #puts stderr "overtype::renderline -info 1 -overflow 1 -insert_mode $o_insert_mode -cursor_column $o_cursor_col -cursor_row $o_cursor_row $activeline '$p'"
+                #puts stderr "overtype::renderline -info 1 -expand_right 1 -insert_mode $o_insert_mode -cursor_column $o_cursor_col -cursor_row $o_cursor_row $activeline '$p'"
                 set underlay $activeline 
                 set line_nextchar_col [expr {[punk::char::string_width $underlay] + 1}]
                 if {$o_cursor_col > $line_nextchar_col} {
                     set o_cursor_col $line_nextchar_col
                 } 
-                set mergedinfo [overtype::renderline -info 1 -overflow 1 -insert_mode $o_insert_mode -cursor_column $o_cursor_col -cursor_row $o_cursor_row $underlay $p]
+                set mergedinfo [overtype::renderline -info 1 -expand_right 1 -insert_mode $o_insert_mode -cursor_column $o_cursor_col -cursor_row $o_cursor_row $underlay $p]
                 set debug "add_chunk$i"
                 append debug \n $mergedinfo
                 append debug \n "input:[ansistring VIEW -lf 1 -vt 1 $p]"
@@ -1120,7 +1120,7 @@ namespace eval punk::repl::class {
                 } else {
                     set charhighlight [punk::ansi::a+ reverse]$char_at_cursor[a]
                 }
-                set cursorline [overtype::renderline -transparent 1 -insert_mode 0 -overflow 0 $cursorline $prefix$charhighlight$suffix]
+                set cursorline [overtype::renderline -transparent 1 -insert_mode 0 -expand_right 0 $cursorline $prefix$charhighlight$suffix]
                 lset lines $o_cursor_row-1 $cursorline
             }
 
@@ -1921,7 +1921,7 @@ proc repl::repl_process_data {inputchan chunktype chunk stdinlines prompt_config
 
 
             if {[info complete $commandstr] && [string index $commandstr end] ne "\\"} {
-                #set commandstr [overtype::renderline -overflow 1 "" $commandstr]
+                #set commandstr [overtype::renderline -expand_right 1 "" $commandstr]
 
 
                 set ::repl::output_stdout ""
diff --git a/src/vfs/_vfscommon/modules/punk/repo-0.1.1.tm b/src/vfs/_vfscommon/modules/punk/repo-0.1.1.tm
index ee2384b4..2cb5fd1d 100644
--- a/src/vfs/_vfscommon/modules/punk/repo-0.1.1.tm
+++ b/src/vfs/_vfscommon/modules/punk/repo-0.1.1.tm
@@ -134,13 +134,30 @@ namespace eval punk::repo {
     }
     interp alias "" fossil "" punk::repo::fossil_proxy
 
+    # ---
+    # Calling auto_execok on an external tool can be too slow to do during package load (e.g could be 150ms)
+
     #safe interps can't call auto_execok
     #At least let them load the package even though much of it may be unusable depending on the safe configuration
-    catch {
-    if {[auto_execok fossil] ne ""} { 
-        interp alias "" FOSSIL "" {*}[auto_execok fossil]
-    }
+    #catch {
+    #    if {[auto_execok fossil] ne ""} { 
+    #        interp alias "" FOSSIL "" {*}[auto_execok fossil]
+    #    }
+    #}
+    # ---
+    # ----------
+    #
+
+    #uppercase FOSSIL to bypass fossil as alias to fossil_proxy
+    proc establish_FOSSIL {args} {
+        if {![info exists ::auto_execs(FOSSIL)]} {
+            set ::auto_execs(FOSSIL) [auto_execok fossil] ;#may fail in safe interp
+        }
+        interp alias "" FOSSIL "" ;#delete establishment alias
+        FOSSIL {*}$args
     }
+    interp alias "" FOSSIL "" punk::repo::establish_FOSSIL
+    # ----------
 
     proc askuser {question} {
         if {![catch {package require punk::lib}]} {
@@ -370,7 +387,16 @@ namespace eval punk::repo {
         }
 
         if {$repodir eq ""} {
-            error "workingdir_state error: No repository found at or above path '$abspath'" 
+            puts stderr "workingdir_state error: No repository found at or above path '$abspath'" 
+            puts stderr "args: $args"
+            dict set resultdict revision {} 
+            dict set resultdict revision_iso8601 {} 
+            dict set resultdict paths {} 
+            dict set resultdict ahead ""
+            dict set resultdict behind ""
+            dict set resultdict error {reason "no_repo_found"}
+            dict set resultdict repotype none
+            return $resultdict
         }
         set subpath [punk::path::relative $repodir $abspath]
         if {$subpath eq "."} {
@@ -644,6 +670,16 @@ namespace eval punk::repo {
         set path_count_fields [list unchanged changed new missing extra]
         set state_fields [list ahead behind repodir subpath repotype revision revision_iso8601]
         set dresult [dict create]
+        if {[dict exists $repostate error]} {
+            foreach f $state_fields {
+                dict set dresult $f ""
+            }
+            foreach f $path_count_fields {
+                dict set dresult $f ""
+            }
+            #todo?
+            return $dresult
+        }
         foreach f $state_fields {
            dict set dresult $f [dict get $repostate $f]
         }
diff --git a/src/vfs/_vfscommon/modules/test/tomlish-1.1.1.tm b/src/vfs/_vfscommon/modules/test/tomlish-1.1.1.tm
index e5909c53..885c56a1 100644
Binary files a/src/vfs/_vfscommon/modules/test/tomlish-1.1.1.tm and b/src/vfs/_vfscommon/modules/test/tomlish-1.1.1.tm differ
diff --git a/src/vfs/_vfscommon/modules/textblock-0.1.1.tm b/src/vfs/_vfscommon/modules/textblock-0.1.1.tm
index 9695822b..88fdc3fd 100644
--- a/src/vfs/_vfscommon/modules/textblock-0.1.1.tm
+++ b/src/vfs/_vfscommon/modules/textblock-0.1.1.tm
@@ -60,6 +60,8 @@ package require punk::ansi
 package require punk::lib
 catch {package require patternpunk}
 package require overtype
+
+#safebase interps as at 2024-08 can't access deeper paths - even though they are below the supposed safe list.
 package require term::ansi::code::macros ;#required for frame if old ansi g0 used - review - make package optional?
 package require textutil
 
@@ -1931,13 +1933,6 @@ tcl::namespace::eval textblock {
                             set hval $ansibase_header$header ;#no reset
                             set rowh [my header_height $hrow]
 
-                            #set h_lines [lrepeat $rowh $hcell_line_blank]
-                            #set hcell_blank [join $h_lines \n]
-                            #set hval_lines [split $hval \n]
-                            #set hval_lines [lrange $hval_lines 0 $rowh-1]
-                            #set hval_block [join $hval_lines \n]
-                            #set headercell [overtype::left -experimental test_mode $ansibase_header$hcell_blank$RST $hval_block]
-
                             if {$hrow == 0} {
                                 set hlims $header_boxlimits_toprow
                                 set rowpos "top"
@@ -2144,7 +2139,7 @@ tcl::namespace::eval textblock {
                                     #puts $hblock
                                     #puts "==>hval:'$hval'[a]"
                                     #puts "==>hval:'[ansistring VIEW $hval]'"
-                                    #set spanned_frame [overtype::renderspace -experimental test_mode -transparent 1 $spanned_frame $hblock]
+                                    #set spanned_frame [overtype::renderspace -transparent 1 $spanned_frame $hblock]
 
                                     #spanned values default left - todo make configurable
 
@@ -3502,11 +3497,11 @@ tcl::namespace::eval textblock {
                             set height [textblock::height $table] ;#only need to get height once at start
                         } else {
                             set nextcol [textblock::join -- [textblock::block $padwidth $height $TSUB] $nextcol]
-                            set table [overtype::renderspace -overflow 1 -experimental test_mode -transparent $TSUB $table[unset table] $nextcol]
+                            set table [overtype::renderspace -expand_right 1  -transparent $TSUB $table[unset table] $nextcol]
                             #JMN
 
                             #set nextcol [textblock::join -- [textblock::block $padwidth $height "\uFFFF"] $nextcol]
-                            #set table [overtype::renderspace -overflow 1 -experimental test_mode -transparent \uFFFF $table $nextcol]
+                            #set table [overtype::renderspace -expand_right 1 -transparent \uFFFF $table $nextcol]
                         }
                         incr padwidth $bodywidth 
                         incr colposn
@@ -3607,14 +3602,7 @@ tcl::namespace::eval textblock {
                             set table $nextcol 
                             set height [textblock::height $table] ;#only need to get height once at start
                         } else {
-                            set table [overtype::renderspace -startcolumn [expr {$padwidth + 1}] -overflow 1 -experimental test_mode -transparent $TSUB $table $nextcol]
-
-                            #set nextcol [textblock::join -- [textblock::block $padwidth $height $TSUB] $nextcol]
-                            #set table [overtype::renderspace -overflow 1 -experimental test_mode -transparent $TSUB $table[unset table] $nextcol]
-                            #JMN
-
-                            #set nextcol [textblock::join -- [textblock::block $padwidth $height "\uFFFF"] $nextcol]
-                            #set table [overtype::renderspace -overflow 1 -experimental test_mode -transparent \uFFFF $table $nextcol]
+                            set table [overtype::renderspace -startcolumn [expr {$padwidth + 1}] -expand_right 1 -transparent $TSUB $table $nextcol]
                         }
                         incr padwidth $bodywidth 
                         incr colposn
@@ -3724,7 +3712,7 @@ tcl::namespace::eval textblock {
                             lappend body_blocks $nextcol_body
                         } else {
                             if {$headerheight > 0} {
-                                set header_build [overtype::renderspace -startcolumn [expr {$padwidth + 1}] -overflow 1 -experimental test_mode -transparent $TSUB $header_build[unset header_build] $nextcol_header[unset nextcol_header]]
+                                set header_build [overtype::renderspace -startcolumn [expr {$padwidth + 1}] -expand_right 1 -transparent $TSUB $header_build[unset header_build] $nextcol_header[unset nextcol_header]]
                             }
                             lappend body_blocks $nextcol_body
                             #set body_build [textblock::join -- $body_build[unset body_build] $nextcol_body]
@@ -4057,7 +4045,7 @@ tcl::namespace::eval textblock {
             if append is chosen the new values will always start at the first column"
             -columns    -default "" -type integer   -help "Number of table columns
             Will default to 2 if not using an existing -table object"
-            *values
+            *values -min 0 -max 1
             datalist    -default {}                 -help "flat list of table cell values which will be wrapped based on -columns value"
         }] $args]
         set opts [dict get $argd opts]
@@ -4408,6 +4396,14 @@ tcl::namespace::eval textblock {
 
         return [tcl::dict::create width $width height $height] ;#maintain order in 'image processing' standard width then height - caller may use lassign [tcl::dict::values [blocksize <data>]] width height
     }
+    proc size_as_opts {textblock} {
+        set sz [size $textblock]
+        return [dict create -width [dict get $sz width] -height [dict get $sz height]]
+    }
+    proc size_as_list {textblock} {
+        set sz [size $textblock]
+        return [list [dict get $sz width] [dict get $sz height]]
+    }
     #must be able to handle block as string with or without newlines
     #if no newlines - attempt to treat as a list
     #must handle whitespace-only string,list elements, and/or lines.
@@ -5132,6 +5128,7 @@ tcl::namespace::eval textblock {
              [punk::lib::list_as_lines -- [lrepeat 8 " | "]]
     }
     proc table {args} {
+        #todo - use punk::args
         upvar ::textblock::class::opts_table_defaults toptdefaults
         set defaults [tcl::dict::create\
             -rows [list]\
@@ -5183,7 +5180,7 @@ tcl::namespace::eval textblock {
     }
 
     variable frametypes
-    set frametypes [list light heavy arc double block block1 block2 ascii altg]
+    set frametypes [list light heavy arc double block block1 block2 block2hack ascii altg]
     #class::table needs to be able to determine valid frametypes
     proc frametypes {} {
         variable frametypes
@@ -5192,7 +5189,7 @@ tcl::namespace::eval textblock {
     proc frametype {f} {
         #set custom_keys [list hl hlt hlb vl vll vlr tlc trc blc brc]
         switch -- $f {
-            light - heavy - arc - double - block - block1 - block2 - ascii - altg {
+            light - heavy - arc - double - block - block1 - block2 - block2hack - ascii - altg {
                 return [tcl::dict::create category predefined type $f]
             }
             default {
@@ -5213,7 +5210,7 @@ tcl::namespace::eval textblock {
                     set is_custom_dict_ok 0
                 }
                 if {!$is_custom_dict_ok} {
-                    error "frame option -type must be one of known types: $textblock::frametypes or a dictionary with any of keys hl,hlt,hlb,vl,vll,vlr,tlc,trc,blc,brc"
+                    error "frame option -type must be one of known types: $::textblock::frametypes or a dictionary with any of keys hl,hlt,hlb,vl,vll,vlr,tlc,trc,blc,brc"
                 }
                 set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "]
                 set custom_frame [tcl::dict::merge $default_custom $f]
@@ -6323,9 +6320,12 @@ tcl::namespace::eval textblock {
                 set vlr \u2595 ;# right one eighth block
                 set vll \u258f ;# left one eighth block
 
+                #some terminals (on windows as at 2024) miscount width of these single-width blocks internally
+                #resulting in extra spacing that is sometimes well removed from the character itself (e.g at next ansi reset)
+                #This was fixed in windows-terminal based systems (2021) but persists in others.
+                #https://github.com/microsoft/terminal/issues/11694
                 set tlc \U1fb7d ;#legacy block
                 set trc \U1fb7e ;#legacy block
-
                 set blc \U1fb7c ;#legacy block
                 set brc \U1fb7f ;#legacy block
 
@@ -6336,6 +6336,42 @@ tcl::namespace::eval textblock {
                 set vlrj $vlr
 
             }
+            block2hack {
+                #the resultant table will have text appear towards top of each box 
+                #with 'legacy' computing unicode block - hopefully these become more widely supported - as they are useful and fill in some gaps
+                set hlt \u2594 ;# upper one eighth block
+                set hlb \u2581 ;# lower one eighth block
+                set vlr \u2595 ;# right one eighth block
+                set vll \u258f ;# left one eighth block
+
+                #see comments in block2 regarding the problems in some terminals that this *may* hack around to some extent.
+                #the caller probably only needs block2hack if block2 doesn't work
+
+                #1)
+                #review - this hack looks sort of promising - but overtype::renderline needs fixing ?
+                #set tlc \U1fb7d\b ;#legacy block
+                #set trc \U1fb7e\b ;#legacy block
+                #set blc \U1fb7c\b ;#legacy block
+                #set brc \U1fb7f\b ;#legacy block
+
+                #2) - works on cmd.exe and some others
+                # a 'privacy message' is 'probably' also not supported on the old terminal but is on newer ones
+                #known exception - conemu on windows - displays junk for various ansi codes - (and slow terminal anyway)
+                #this hack has a reasonable chance of working
+                #except that the punk overtype library does recognise PMs 
+                #A single backspace however is an unlikely and generally unuseful PM - so there is a corresponding hack in the renderline system to pass this PM through!
+                #ugly - in that we don't know the application specifics of what the PM data contains and where it's going.
+                set tlc \U1fb7d\x1b^\b\x1b\\ ;#legacy block
+                set trc \U1fb7e\x1b^\b\x1b\\ ;#legacy block
+                set blc \U1fb7c\x1b^\b\x1b\\ ;#legacy block
+                set brc \U1fb7f\x1b^\b\x1b\\ ;#legacy block
+
+                #horizontal and vertical bar joins 
+                set hltj $hlt
+                set hlbj $hlb
+                set vllj $vll
+                set vlrj $vlr
+            }
             block {
                 set hlt \u2580 ;#upper half
                 set hlb \u2584 ;#lower half
@@ -6357,7 +6393,7 @@ tcl::namespace::eval textblock {
                 set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "] ;#only default the general types - these form defaults for more specific types if they're missing
                 if {[llength $f] % 2 != 0} {
                     #todo  - retrieve usage from punk::args
-                    error "textblock::frametype frametype '$f' is not one of the predefined frametypes: $textblock::frametypes and does not appear to be a dictionary for a custom frametype"
+                    error "textblock::frametype frametype '$f' is not one of the predefined frametypes: $::textblock::frametypes and does not appear to be a dictionary for a custom frametype"
                 }
                 #unknown order of keys specified by user - validate before creating vars as we need more general elements to be available as defaults
                 dict for {k v} $f {
@@ -6488,7 +6524,11 @@ tcl::namespace::eval textblock {
             -ellipsis 1\
             -usecache 1\
             -buildcache 1\
+            -pad 1\
+            -crm_mode 0\
         ]
+        #-pad 1 is default so that simple 'textblock::frame "[a+ Red]a  \nbbb[a]"  extends the bg colour on the short ragged lines (and empty lines)
+        # for ansi art - -pad 0 is likely to be preferable
 
         set expect_optval 0
         set argposn 0
@@ -6527,7 +6567,12 @@ tcl::namespace::eval textblock {
         #use -buildcache 1 with -usecache 0 for debugging cache issues so we can inspect using textblock::frame_cache
         foreach {k v} $arglist {
             switch -- $k {
-                -etabs - -type - -boxlimits - -boxmap - -joins - -title - -subtitle - -width - -height - -ansiborder - -ansibase - -blockalign - -textalign - -ellipsis - -usecache - -buildcache {
+                -etabs - -type - -boxlimits - -boxmap - -joins 
+                - -title - -subtitle - -width - -height
+                - -ansiborder - -ansibase
+                - -blockalign - -textalign - -ellipsis
+                - -crm_mode
+                - -usecache - -buildcache - -pad {
                     tcl::dict::set opts $k $v
                 }
                 default {
@@ -6543,11 +6588,13 @@ tcl::namespace::eval textblock {
         set opt_boxmap      [tcl::dict::get $opts -boxmap]
         set opt_usecache    [tcl::dict::get $opts -usecache]
         set opt_buildcache  [tcl::dict::get $opts -buildcache]
+        set opt_pad         [tcl::dict::get $opts -pad]
+        set opt_crm_mode    [tcl::dict::get $opts -crm_mode]
         set usecache $opt_usecache ;#may need to override
         set buildcache $opt_buildcache
         set custom_keys [list hl hlt hlb vl vll vlr tlc trc blc brc]
 
-        set known_frametypes $frametypes ;# light, heavey etc as defined in textblock::frametypes variable
+        set known_frametypes $frametypes ;# light, heavey etc as defined in the ::textblock::frametypes variable
         set default_custom [tcl::dict::create hl " " vl " " tlc " " trc " " blc " " brc " "]
 
         lassign [textblock::frametype $opt_type] _cat category _type ftype
@@ -6686,6 +6733,19 @@ tcl::namespace::eval textblock {
                 }
             }
             set contents [tcl::string::map [list \r\n \n] $contents]
+            if {$opt_crm_mode} {
+                if {$opt_height eq ""} {
+                    set h [textblock::height $contents]
+                } else {
+                    set h [expr {$opt_height -2}]
+                }
+                if {$opt_width eq ""} {
+                    set w [textblock::width $contents]
+                } else {
+                    set w [expr {$opt_width -2}]
+                }
+                set contents [overtype::renderspace -crm_mode 1 -wrap 1 -width $w -height $h "" $contents]
+            }
             set actual_contentwidth [textblock::width $contents] ;#length of longest line in contents (contents can be ragged)
             set actual_contentheight [textblock::height $contents]
         } else {
@@ -7134,15 +7194,22 @@ tcl::namespace::eval textblock {
                 append contents [::join [lrepeat $diff \n] ""]
             }
 
-            set paddedcontents [textblock::pad $contents -which $pad -within_ansi 1] ;#autowidth to width of content (should match cache_patternwidth) 
-            set paddedwidth  [textblock::widthtopline $paddedcontents]
-
-            #review - horizontal truncation
-            if {$paddedwidth > $cache_patternwidth} {
-                set paddedcontents [overtype::renderspace -width $cache_patternwidth "" $paddedcontents]
+            if {$opt_pad} {
+                set paddedcontents [textblock::pad $contents -which $pad -within_ansi 1] ;#autowidth to width of content (should match cache_patternwidth) 
+                set paddedwidth  [textblock::widthtopline $paddedcontents]
+                #review - horizontal truncation
+                if {$paddedwidth > $cache_patternwidth} {
+                    set paddedcontents [overtype::renderspace -width $cache_patternwidth "" $paddedcontents]
+                }
+                #important to supply end of opts -- to textblock::join - particularly here with arbitrary data
+                set contentblock [textblock::join -- $paddedcontents] ;#make sure each line has ansi replays
+            } else {
+                set cwidth [textblock::width $contents]
+                if {$cwidth > $cache_patternwidth} {
+                    set contents [overtype::renderspace -width $cache_patternwidth "" $contents]
+                }
+                set contentblock [textblock::join -- $contents]
             }
-            #important to supply end of opts -- to textblock::join - particularly here with arbitrary data
-            set contentblock [textblock::join -- $paddedcontents] ;#make sure each line has ansi replays
 
             set tlines [split $template \n]
 
diff --git a/src/vfs/critcl.vfs/README.md b/src/vfs/critcl.vfs/README.md
new file mode 100644
index 00000000..3d8ecd79
--- /dev/null
+++ b/src/vfs/critcl.vfs/README.md
@@ -0,0 +1,111 @@
+# Compiled Runtime In Tcl
+
+ *  Welcome to the C Runtime In Tcl, CriTcl for short, a system to
+    build C extension packages for Tcl on the fly, from C code
+    embedded within Tcl scripts, for all who wish to make their code
+    go faster.
+
+# Website
+
+ *  The main website of this project is http://andreas-kupries.github.io/critcl
+
+    It provides access to pre-made binaries and archives for various
+    platforms, and the full documentation, especially the guides to
+    building and using Critcl.
+
+    Because of the latter this document contains only the most basic
+    instructions on getting, building, and using Critcl.
+
+# Versions
+
+ *  Version 3 is the actively developed version of Critcl, with several
+    new features, listed in section **New Features**, below. This version
+    has changes to the public API which make it incompatible with packages
+    using Critcl version 2.x, or earlier.
+
+ *  The last of version 2 is 2.1, available at the same-named tag in the
+    repository. This version is not developed anymore.
+
+# Getting, Building, and Using Critcl
+
+ *  Retrieve the sources:
+
+    ```% git clone http://github.com/andreas-kupries/critcl```
+
+    Your working directory now contains a directory ```critcl```.
+
+ *  Build and install it:
+
+    Install requisites: cmdline, md5; possibly one of tcllibc, Trf, md5c to accelerate md5.
+
+    ```% cd critcl```
+
+    ```% tclsh ./build.tcl install```
+
+    The generated packages are placed into the **[info library]** directory
+    of the **tclsh** used to run build.tcl. The **critcl** application script
+    is put into the directory of the **tclsh** itself (and modified to
+    use this executable). This may require administrative (root) permissions,
+    depending on the system setup.
+
+ *  It is expected that a working C compiler is available. Installation and
+    setup of such a compiler is platform and vendor specific, and instructions
+    for doing so are very much outside of scope for this document. Please find
+    and read the documentation, how-tos, etc. for your platform or vendor.
+
+ *  With critcl installed try out one of the examples:
+
+    ```% cd examples/stack```
+
+    ```% critcl -keep -cache B -pkg cstack.tcl```
+
+    ```% critcl -keep -cache B -pkg stackc.tcl```
+
+    ```% tclsh```
+
+    ```> lappend auto_path [pwd]/lib```
+
+    ```> package require stackc```
+
+    ```> stackc create S```
+
+    ```> S push FOO```
+
+    ```> S size```
+
+    ```> S destroy```
+
+    ```> exit```
+
+    ```%```
+
+# New Features
+
+ *  Declaration, export and import of C-APIs through stubs tables.
+
+ *  Generation of source packages from critcl-based code containing a
+    TEA-based buildsystem wrapped around the raw critcl.
+
+ *  Declaration, initializaton and use of user-specified configuration
+    options. An important use is the declaration and use of custom
+    build configurations, like 'link a 3rd party library dynamically,
+    statically, build it from copy of its sources, etc.', etc.
+
+ * This is of course not everything. For the details please read the
+   Changes sections of the documentation.
+
+# Documentation
+
+ *  Too much to cover here. Please go to http://andreas-kupries.github.io/critcl
+    for online reading, or the directories **embedded/www** and
+    **embedded/man** for local copies of the documentation in HTML
+    and nroff formats, respectively.
+
+# History
+
+ *  **2013-01-21** : Move code to from jcw to andreas-kupries.
+
+ *  **2011-08-18** : Move code to public repository on GitHub
+
+    The Subversion repository at *svn://svn.equi4.com/critcl* is now obsolete.  
+    GitHub has the new official repository for Critcl.
diff --git a/src/vfs/critcl.vfs/doc/checklist.txt b/src/vfs/critcl.vfs/doc/checklist.txt
new file mode 100644
index 00000000..9bb46bb4
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/checklist.txt
@@ -0,0 +1,20 @@
+When releasing:
+
+  - Run the test suite.
+
+  - Run the examples.
+
+  - Bump version in `doc/version.inc`.
+
+  - If necessary, further bump:
+      - The versions of `package provide/ifneeded` in files:
+          - `lib/critcl-app/pkgindex.tcl`
+          - `lib/critcl/pkgindex.tcl`
+          - `lib/critcl/critcl.tcl`
+      - The version in `doc/pkg_version.inc`.
+
+  - Regenerate the embedded documentation.
+
+  - Commit
+
+  - Push
diff --git a/src/vfs/critcl.vfs/doc/critcl.man b/src/vfs/critcl.vfs/doc/critcl.man
new file mode 100644
index 00000000..ead3b25e
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl.man
@@ -0,0 +1,73 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*- doctools manpage}]
+[include version.inc]
+[manpage_begin critcl n [vset VERSION]]
+[include include/module.inc]
+[titledesc {Introduction To CriTcl}]
+[description]
+[para]
+[include include/welcome.inc]
+[include include/advert.inc]
+[para]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section {History & Motivation}]
+
+[para] [vset critcl] started life as an experiment by [vset jcw] and was a self-contained
+Tcl package to build C code into a Tcl/Tk extension on the fly. It was somewhat inspired
+by Brian Ingerson's [term Inline] for [term Perl], but is considerably more lightweight.
+
+[para] It is for the last 5% to 10% when pure Tcl, which does go a long way, is not
+sufficient anymore. I.e. for
+
+[list_begin enumerated]
+[enum] when the last bits of performance are needed,
+[enum] access to 3rd party libraries,
+[enum] hiding critical pieces of your library or application, and
+[enum] simply needing features provided only by C.
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section Overview]
+
+To make the reader's topics of interest easy to find this documentation is roughly
+organized by [vset quad], i.e. [include include/quad.inc]
+
+[strong Note]: At this point in time the documentation consists mainly of references, and
+a few how-to guides. Tutorials and Explanations are in need of expansion, this is planned.
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section {Known Users}]
+[include include/pkg_users.inc]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section {Tutorials - Practical Study - To Learn}]
+
+This section is currently empty.
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section {Explanations - Theoretical Knowledge - To Understand}]
+
+This section is currently empty.
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section {How-To Guides - Practical Work - To Solve Problems}]
+
+[list_begin enumerated]
+[enum] [term {How To Get The CriTcl Sources}].
+[enum] [term {How To Install CriTcl}].
+[enum] [term {How To Use CriTcl}] - A light introduction through examples.
+[enum] [strong NEW]: [term {How To Adapt Critcl Packages for Tcl 9}].
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section {References - Theoretical Work - To Gain Knowlegde}]
+
+[list_begin enumerated]
+[enum] [term {The CriTcl License}]
+[enum] [term {CriTcl Releases & Changes}]
+[include include/reference_docs.inc]
+[enum] [term {Guide To The CriTcl Internals}]
+[list_end]
+
+[include include/feedback.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_application.man b/src/vfs/critcl.vfs/doc/critcl_application.man
new file mode 100644
index 00000000..72e6f7a3
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_application.man
@@ -0,0 +1,45 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*- doctools manpage}]
+[comment {quadrant: reference}]
+[include pkg_version.inc]
+[manpage_begin critcl_application n [vset VERSION]]
+[include include/module.inc]
+[titledesc {CriTcl Application Reference}]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+This document is the reference manpage for the [cmd critcl] command.
+Its intended audience are people having to build packages using
+[package critcl] for deployment. Writers of packages with embedded C
+code can ignore this document.
+
+[vset see_overview]
+
+[para]
+
+This application resides in the Application Layer of CriTcl.
+[para][image arch_application][para].
+
+[comment {= = == === ===== ======== ============= =====================}]
+
+The application supports the following general command line:
+
+[list_begin definitions]
+[call [cmd critcl] [opt [arg option]...] [opt [arg file]...]]
+
+The exact set of options supported, their meaning, and interaction is
+detailed in section [sectref {Application Options}] below.
+
+For a larger set of examples please see section "Building CriTcl Packages"
+in the document about [manpage {Using CriTcl}].
+
+[list_end]
+
+
+[section {Application Options}]	[include include/aoptions.inc]
+[section {Package Structure}]	[include include/pstructure.inc]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_application_package.man b/src/vfs/critcl.vfs/doc/critcl_application_package.man
new file mode 100644
index 00000000..00603c9c
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_application_package.man
@@ -0,0 +1,62 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*- doctools manpage}]
+[comment {quadrant: reference}]
+[include pkg_version.inc]
+[manpage_begin critcl_application_package n [vset VERSION]]
+[include include/module.inc]
+[titledesc {CriTcl Application Package Reference}]
+[require Tcl 8.6]
+[require critcl::app [opt [vset VERSION]]]
+[require critcl [opt [vset VERSION]]]
+[require platform [opt 1.0.2]]
+[require cmdline]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+This document is the reference manpage for the [package critcl::app]
+package. Its intended audience are developers working on critcl's
+internals.  [vset not_needed_for_critcl_script]
+
+[vset see_overview]
+
+[para]
+
+This package resides in the Application Layer of CriTcl.
+[para][image arch_application][para],
+
+implementing the functionality of the [manpage {CriTcl Application}],
+and through this, the mode [sectref {Modes Of Operation/Use} {generate package}].
+
+The actual application is (only) a shim wrapping around this
+package. It itself is build on top of the core package
+[package critcl].
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section API]
+
+The package exports a single command
+
+[list_begin definitions]
+[call [cmd ::critcl::app::main] [arg commandline]]
+
+The [arg commandline] is a list of zero or more options followed by zero or
+more [vset critcl_script] files.  By default, the [vset critcl_script] files
+are build and the results cached.   This cuts down on the time needed to
+load the package.  The last occurrence of [option -pkg] and [option -tea], if
+provided, selects the corresponding alternative mode of operations.
+
+For a larger set of examples please see section "Building CriTcl Packages"
+in the document about [manpage {Using CriTcl}].
+
+
+[list_end]
+
+The options are:
+[section {Options}]			[include include/aoptions.inc]
+[section {Modes Of Operation/Use}]	[include include/modes.inc]
+[section {Package Structure}]		[include include/pstructure.inc]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_bitmap.man b/src/vfs/critcl.vfs/doc/critcl_bitmap.man
new file mode 100644
index 00000000..15bf5ed2
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_bitmap.man
@@ -0,0 +1,161 @@
+[comment {-*- tcl -*- doctools manpage}]
+[vset bitmap_version 1.1]
+[manpage_begin critcl::bitmap n [vset bitmap_version]]
+[include include/module2.inc]
+[keywords singleton {Tcl Interp Association}]
+[keywords bitmask bitset flags]
+[titledesc {CriTcl - Wrap Support - Bitset en- and decoding}]
+[require Tcl 8.6]
+[require critcl [opt 3.2]]
+[require critcl::bitmap [opt [vset bitmap_version]]]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+This document is the reference manpage for the
+[package critcl::bitmap] package. This package provides convenience
+commands for advanced functionality built on top of both critcl core
+and package [package critcl::iassoc].
+
+[para] C level libraries often use bit-sets to encode many flags into a
+single value. Tcl bindings to such libraries now have the task of
+converting a Tcl representation of such flags (like a list of strings)
+into such bit-sets, and back.
+
+[emph Note] here that the C-level information has to be something which
+already exists. The package does [emph not] create these values. This is
+in contrast to the package [package critcl::enum] which creates an
+enumeration based on the specified symbolic names.
+
+[para] This package was written to make the declaration and management
+of such bit-sets and their associated conversions functions easy,
+hiding all attendant complexity from the user.
+
+[para] Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code.
+
+[para] This package resides in the Core Package Layer of CriTcl.
+[para][image arch_core][para]
+
+[comment {= = == === ===== ======== ============= =====================}]
+
+[section API]
+
+[list_begin definitions]
+[call [cmd ::critcl::bitmap::def] [arg name] [arg definition] [opt [arg exclusions]]]
+
+This command defines two C functions for the conversion of the
+[arg name]d bit-set into Tcl lists, and vice versa.
+
+The underlying mapping tables are automatically initialized on first
+access, and finalized on interpreter destruction.
+
+[para] The [arg definition] dictionary provides the mapping from the
+Tcl-level symbolic names of the flags to their C expressions (often
+the name of the macro specifying the actual value).
+
+[emph Note] here that the C-level information has to be something which
+already exists. The package does [emph not] create these values. This is
+in contrast to the package [package critcl::enum] which creates an
+enumeration based on the specified symbolic names.
+
+[para] The optional [arg exlusion] list is for the flags/bit-sets for
+which conversion from bit-set to flag, i.e. decoding makes no
+sense. One case for such, for example, are flags representing a
+combination of other flags.
+
+[para] The package generates multiple things (declarations and
+definitions) with names derived from [arg name], which has to be a
+proper C identifier.
+
+[list_begin definitions]
+[def [arg name]_encode]
+The function for encoding a Tcl list of strings into the equivalent
+bit-set.
+
+Its signature is
+[para][example_begin]
+int [arg name]_encode (Tcl_Interp* interp, Tcl_Obj* flags, int* result);
+[example_end]
+
+[para] The return value of the function is a Tcl error code,
+i.e. [const TCL_OK], [const TCL_ERROR], etc.
+
+[def [arg name]_decode]
+The function for decoding a bit-set into the equivalent Tcl list of
+strings.
+
+Its signature is
+[para][example_begin]
+Tcl_Obj* [arg name]_decode (Tcl_Interp* interp, int flags);
+[example_end]
+
+[def [arg name].h]
+A header file containing the declarations for the two conversion
+functions, for use by other parts of the system, if necessary.
+
+[para] The generated file is stored in a place where it will not
+interfere with the overall system outside of the package, yet also be
+available for easy inclusion by package files ([cmd csources]).
+
+[def [arg name]]
+The name of a critcl argument type encapsulating the encoder function
+for use by [cmd critcl::cproc].
+
+[def [arg name]]
+The name of a critcl result type encapsulating the decoder function
+for use by [cmd critcl::cproc].
+
+[list_end]
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section Example]
+
+The example shown below is the specification of the event flags pulled
+from the draft work on a Tcl binding to Linux's inotify APIs.
+
+[example {
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::buildrequirement {
+    package require critcl::bitmap
+}
+
+critcl::bitmap::def tcl_inotify_events {
+    accessed       IN_ACCESS
+    all            IN_ALL_EVENTS
+    attribute      IN_ATTRIB
+    closed         IN_CLOSE
+    closed-nowrite IN_CLOSE_NOWRITE
+    closed-write   IN_CLOSE_WRITE
+    created        IN_CREATE
+    deleted        IN_DELETE
+    deleted-self   IN_DELETE_SELF
+    dir-only       IN_ONLYDIR
+    dont-follow    IN_DONT_FOLLOW
+    modified       IN_MODIFY
+    move           IN_MOVE
+    moved-from     IN_MOVED_FROM
+    moved-self     IN_MOVE_SELF
+    moved-to       IN_MOVED_TO
+    oneshot        IN_ONESHOT
+    open           IN_OPEN
+    overflow       IN_Q_OVERFLOW
+    unmount        IN_UNMOUNT
+} {
+    all closed move oneshot
+}
+
+# Declarations:          tcl_inotify_events.h
+# Encoder:      int      tcl_inotify_events_encode (Tcl_Interp* interp, Tcl_Obj* flags, int* result);
+# Decoder:      Tcl_Obj* tcl_inotify_events_decode (Tcl_Interp* interp, int flags);
+# crit arg-type          tcl_inotify_events
+# crit res-type          tcl_inotify_events
+}]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback2.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_build.man b/src/vfs/critcl.vfs/doc/critcl_build.man
new file mode 100644
index 00000000..cb222aa4
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_build.man
@@ -0,0 +1,17 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*- doctools manpage}]
+[comment {quadrant: reference}]
+[include version.inc]
+[manpage_begin critcl_build_tool n [vset VERSION]]
+[include include/module.inc]
+[titledesc {CriTcl build.tcl Tool Reference}]
+[description]
+[include include/welcome.inc]
+
+The script [file build.tcl] found in the top directory of the [vset critcl] sources is the
+main tool of use to a developer or maintainer of [vset critcl] itself.
+
+[para] Invoking it a via [example {./build.tcl help}] provides the online help for this
+tool, explaining the operations available, and their arguments.
+
+[include include/feedback.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_callback.man b/src/vfs/critcl.vfs/doc/critcl_callback.man
new file mode 100644
index 00000000..19890b3b
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_callback.man
@@ -0,0 +1,196 @@
+[vset VERSION 1.1]
+[comment {-*- tcl -*- doctools manpage}]
+[manpage_begin critcl::callback n [vset VERSION]]
+[include include/module2.inc]
+[titledesc {CriTcl - C-level Callback Utilities}]
+[require Tcl 8.6]
+[require critcl [opt 3.2]]
+[require critcl::callback [opt [vset VERSION]]]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+This document is the reference manpage for the
+[package critcl::callback] package.
+
+This package provides, via a stubs API table, data structures and
+functions to manage callbacks from C to Tcl. The package has no
+Tcl-level facilities.
+
+Its intended audience are mainly developers wishing to write Tcl
+packages with embedded C code who have to invoke user-specified
+command (prefixes) in Tcl.
+
+[para]
+This package resides in the Support Package Layer of CriTcl.
+
+[para][image arch_support][para]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section API]
+
+The package API consist of one opaque data structure
+([type critcl_callback_p]) and four functions operating on the same.
+
+These functions are
+
+[list_begin definitions]
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [type critcl_callback_p] [fun critcl_callback_new] \
+     [arg interp] [arg objc] [arg objv] [arg nargs]]
+
+This function creates a new callback (manager) and returns it as its result.
+
+[para]
+The callback is initialized with the Tcl_Interp* [arg interp]
+specifying where to run the callback, the fixed part of the command to
+run in standard [arg objc]/[arg objv] notation, plus the number of
+free arguments to expect after the fixed part.
+
+[para]
+The fixed part is the essentially the command prefix of the callback.
+
+[para]
+All [type Tcl_Obj*] elements of [arg objv] are protected against early
+release by incrementing their reference counts. The callback
+effectively takes ownership of these objects.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [type void] [fun critcl_callback_extend] \
+     [arg callback] [arg argument]]
+
+This function takes a [arg callback] of type [type critcl_callback_p]
+and extends its fixed part with the [arg argument], taking the first
+free slot for arguments to do so.
+
+This means that after the application of this function the specified
+callback has one free argument less.
+
+[para]
+With assertions active attempting to extend beyond the number of free
+arguments will cause a panic. Without assertions active expect a crash
+at some point.
+
+[para]
+This allows the user to extend the fixed part of the callback with
+semi-fixed elements, like method names (See [sectref {Multiple methods}]).
+
+[para]
+The [arg argument] is protected against early release by incrementing
+its reference count. The callback effectively takes ownership of this
+object.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [type void] [fun critcl_callback_destroy] \
+     [arg callback]]
+
+This function takes a [arg callback] of type [type critcl_callback_p]
+and releases all memory associated with it.
+
+After application of this function the callback cannot be used anymore.
+
+[para]
+All fixed elements of the callback (owned by it) are released by
+decrementing their reference counts.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [type int] [fun critcl_callback_invoke] \
+     [arg callback] [arg objc] [arg objv]]
+
+This function invokes the callback in the Tcl interpreter specified at
+the time of construction, in the global level and namespace, with the
+free arguments filled by the [type Tcl_Obj*] objects specified via
+[arg objc]/[arg objv].
+
+[para]
+It returns the Tcl status of the invoked command as its result.
+
+Any further results or error messages will be found in the result area
+of the Tcl interpreter in question. The exact nature of such is
+dependent on the callback itself.
+
+[para]
+With assertions active attempting to use more arguments than available
+will cause a panic. Without assertions active expect a crash at some
+point.
+
+[para]
+While the callback is running all [type Tcl_Obj*] elements of the
+command, fixed and arguments, are protected against early release by
+temporarily incrementing their reference counts.
+
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section Examples]
+
+[subsection {Simple callback}]
+
+The example here shows the important parts of using the functions of
+this package for a simple callback which is invoked with a single
+argument, some kind of data to hand to the Tcl level.
+
+[example {
+    // Create the callback with interpreter and command prefix in
+    // oc/ov, plus space for the argument
+    critcl_callback_p cb = critcl_callback_new (interp, oc, ov, 1);
+
+    // Invoke the callback somewhere in the C package using this one,
+    // with Tcl_Obj* data holding the information to pass up.
+    critcl_callback_invoke (cb, 1, &data);
+
+    // At the end of the lifetime, release the callback.
+    critcl_callback_destroy (cb);
+}]
+
+Note that the functions of this package are designed for the case
+where the created callback ([const cb] above) is kept around for a
+long time, and many different invokations.
+
+[para]
+Using the sequence above as is, creating and destroying the callback
+each time it is invoked will yield very poor performance and lots of
+undesirable memory churn.
+
+
+[subsection {Multiple methods}]
+
+While we can use the methodology of the previous section when a single
+(Tcl-level) callback is invoked from different places in C, with
+different methods, simply having another argument slot and filling it
+an invokation time with the method object, a second methodology is
+open to us due to [fun critcl_callback_extend].
+
+[example {
+
+    // Create one callback manager per different method the callback
+    // will be used with. Fill the first of the two declared arguments
+    // with the different methods.
+    critcl_callback_p cb_a = critcl_callback_new (interp, oc, ov, 2);
+    critcl_callback_p cb_b = critcl_callback_new (interp, oc, ov, 2);
+
+    critcl_callback_extend (cb_a, Tcl_NewStringObj ("method1", -1));
+    critcl_callback_extend (cb_b, Tcl_NewStringObj ("method2", -1));
+
+    // After the extension we have one free argument left, for use in
+    // the invokations.
+
+    critcl_callback_invoke (cb_a, 1, &dataX);
+
+    critcl_callback_invoke (cb_b, 1, &dataY);
+
+
+    // At the end release both managers again
+    critcl_callback_destroy (cb_a);
+    critcl_callback_destroy (cb_b);
+}]
+
+The nice thing here is that the method objects are allocated only once
+and automatically shared by all the calls. No memory churn to
+repeatedly allocate the same string objects over and over again.
+
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback2.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_changes.man b/src/vfs/critcl.vfs/doc/critcl_changes.man
new file mode 100644
index 00000000..5737bc9f
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_changes.man
@@ -0,0 +1,16 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*- doctools manpage}]
+[comment {quadrant: reference}]
+[include version.inc]
+[manpage_begin critcl_changes n [vset VERSION]]
+[include include/module.inc]
+[titledesc {CriTcl Releases & Changes}]
+[description]
+[include include/welcome.inc]
+[include include/advert.inc]
+
+See the changes done in each release of [vset critcl], from the latest at the top to the
+beginning of the project.
+
+[include include/changes.inc]
+[include include/feedback.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_class.man b/src/vfs/critcl.vfs/doc/critcl_class.man
new file mode 100644
index 00000000..68efd81c
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_class.man
@@ -0,0 +1,57 @@
+[comment {-*- tcl -*- doctools manpage}]
+[vset VERSION 1.1]
+[manpage_begin critcl::class n [vset VERSION]]
+[include include/module2.inc]
+[keywords {C class} {C object} {C instance}]
+[titledesc {CriTcl - Code Gen - C Classes}]
+[require Tcl 8.6]
+[require critcl [opt 3.2]]
+[require critcl::class [opt [vset VERSION]]]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+This document is the reference manpage for the [package critcl::class]
+package. This package provides convenience commands for advanced
+functionality built on top of the core.
+
+[para] With it a user wishing to create a C level object with class
+and instance commands can concentrate on specifying the class- and
+instance-variables and -methods in a manner similar to a TclOO class,
+while all the necessary boilerplate around it is managed by this
+package.
+
+[para] Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code.
+
+[para] This package resides in the Core Package Layer of CriTcl.
+[para][image arch_core][para]
+
+[comment {= = == === ===== ======== ============= =====================}]
+
+[section API]
+
+[list_begin definitions]
+[call [cmd ::critcl::class::define] [arg name] [arg script]]
+
+This is the main command to define a new class [arg name], where
+[arg name] is the name of the Tcl command representing the class,
+i.e. the [term {class command}]. The [arg script] provides the
+specification of the class, i.e. information about included headers,
+class- and instance variables, class- and instance-methods, etc.
+
+See the section [sectref {Class Specification API}] below for the
+detailed list of the available commands and their semantics.
+
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section {Class Specification API}][include include/class_spec.inc]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section Example][include include/class_example.inc]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback2.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_cproc.man b/src/vfs/critcl.vfs/doc/critcl_cproc.man
new file mode 100644
index 00000000..2d8f8e31
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_cproc.man
@@ -0,0 +1,40 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*- doctools manpage}]
+[comment {quadrant: reference}]
+[include pkg_version.inc]
+[manpage_begin critcl_cproc_types n [vset VERSION]]
+[include include/module.inc]
+[titledesc {CriTcl cproc Type Reference}]
+[require Tcl 8.6]
+[require critcl [opt [vset VERSION]]]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+This document is a breakout of the descriptions for the predefined argument- and result-types usable
+with the [cmd critcl::cproc] command, as detailed in the reference manpage for the [package critcl]
+package, plus the information on how to extend the predefined set with custom types. The breakout
+was made to make this information easier to find (toplevel document vs. having to search the large
+main reference).
+
+[para] Its intended audience are developers wishing to write Tcl packages with embedded C code.
+
+[section {Standard argument types}]	[include include/cproc/api_stdat_cproc.inc]
+[section {Standard result types}]	[include include/cproc/api_stdrt_cproc.inc]
+[section {Advanced: Adding types}]	[include include/cproc/api_extcproc2.inc]
+
+[section Examples]
+
+The examples shown here have been drawn from the section "Embedding C" in the document about
+[manpage {Using CriTcl}]. Please see that document for many more examples.
+
+[include include/cproc/using_eproc.inc]        [comment {%% cproc}]
+[include include/cproc/using_eprocstr.inc]     [comment {%% cproc, strings}]
+[include include/cproc/using_eproctypes.inc]   [comment {%% cproc types, intro & trivial}]
+[include include/cproc/using_eproctypes2.inc]  [comment {%% cproc types, semi-trivial}]
+[include include/cproc/using_eproctypes3.inc]  [comment {%% cproc types, support (incl alloc'd)}]
+[include include/cproc/using_eproctypes4.inc]  [comment {%% cproc types, results}]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_cutil.man b/src/vfs/critcl.vfs/doc/critcl_cutil.man
new file mode 100644
index 00000000..ff5003b6
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_cutil.man
@@ -0,0 +1,413 @@
+[vset VERSION 0.3]
+[comment {-*- tcl -*- doctools manpage}]
+[manpage_begin critcl::cutil n [vset VERSION]]
+[include include/module2.inc]
+[titledesc {CriTcl - C-level Utilities}]
+[require Tcl 8.6]
+[require critcl [opt 3.2]]
+[require critcl::cutil [opt [vset VERSION]]]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+This document is the reference manpage for the [package critcl::cutil]
+package. This package encapsulates a number of C-level utilites for
+easier writing of memory allocations, assertions, and narrative tracing
+and provides convenience commands to make these utilities accessible
+to critcl projects.
+
+Its intended audience are mainly developers wishing to write Tcl
+packages with embedded C code.
+[para]
+
+This package resides in the Core Package Layer of CriTcl.
+[para][image arch_core][para]
+
+The reason for this is that the main [package critcl] package makes
+use of the facilities for narrative tracing when
+[cmd {critcl::config trace}] is set, to instrument commands and
+procedures.
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section API]
+
+[list_begin definitions]
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd ::critcl::cutil::alloc]]
+
+This command provides a number C-preprocessor macros which make the
+writing of memory allocations for structures and arrays of structures
+easier.
+
+[para] When run the header file [file critcl_alloc.h] is directly made
+available to the [file .critcl] file containing the command, and
+becomes available for use in [cmd {#include}] directives of companion
+C code declared via [cmd critcl::csources].
+
+[para] The macros definitions and their signatures are:
+
+[example {
+    type* ALLOC (type)
+    type* ALLOC_PLUS (type, int n)
+    type* NALLOC (type, int n)
+    type* REALLOC (type* var, type, int n)
+    void  FREE (type* var)
+
+    void STREP    (Tcl_Obj* o, char* s, int len);
+    void STREP_DS (Tcl_Obj* o, Tcl_DString* ds);
+    void STRDUP   (varname, char* str);
+}]
+
+[para] The details of the semantics are explained in section
+[sectref Allocation].
+
+[para] The result of the command is an empty string.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd ::critcl::cutil::assertions] [opt [arg enable]]]
+
+This command provides a number C-preprocessor macros for the writing
+of assertions in C code.
+
+[para] When invoked the header file [file critcl_assert.h] is directly
+made available to the [file .critcl] file containing the command, and
+becomes available for use in [cmd {#include}] directives of companion
+C code declared via [cmd critcl::csources].
+
+[para] The macro definitions and their signatures are
+
+[example {
+    void ASSERT (expression, char* message);
+    void ASSERT_BOUNDS (int index, int size);
+
+    void STOPAFTER (int n);
+}]
+
+[para] Note that these definitions are conditional on the existence of
+the macro [const CRITCL_ASSERT]. 
+
+Without a [cmd {critcl::cflags -DCRITCL_ASSERT}] all assertions in the
+C code are quiescent and not compiled into the object file. In other
+words, assertions can be (de)activated at will during build time, as
+needed by the user.
+
+[para] For convenience this is controlled by [arg enable]. By default
+([const false]) the facility available, but not active.
+
+Using [const true] not only makes it available, but activates it as
+well.
+
+[para] The details of the semantics are explained in section
+[sectref Assertions].
+
+[para] The result of the command is an empty string.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd ::critcl::cutil::tracer] [opt [arg enable]]]
+
+This command provides a number C-preprocessor macros for tracing
+C-level internals.
+
+[para] When invoked the header file [file critcl_trace.h] is directly
+made available to the [file .critcl] file containing the command, and
+becomes available for use in [cmd {#include}] directives of companion
+C code declared via [cmd critcl::csources]. Furthermore the [file .c]
+file containing the runtime support is added to the set of C companion
+files
+
+[para] The macro definitions and their signatures are
+
+[example {
+    /* (de)activation of named logical streams.
+     * These are declarators, not statements.
+     */
+
+    TRACE_ON;
+    TRACE_OFF;
+    TRACE_TAG_ON  (tag_identifier);
+    TRACE_TAG_OFF (tag_identifier);
+
+    /*
+     * Higher level trace statements (convenience commands)
+     */
+
+    void TRACE_FUNC   (const char* format, ...);
+    void TRACE_FUNC_VOID;
+    any  TRACE_RETURN (const char* format, any x);
+    void TRACE_RETURN_VOID;
+    void TRACE (const char* format, ...);
+
+    /*
+     * Low-level trace statements the higher level ones above
+     * are composed from. Scope management and output management.
+     */
+
+    void TRACE_PUSH_SCOPE (const char* scope);
+    void TRACE_PUSH_FUNC;
+    void TRACE_POP;
+
+    void TRACE_HEADER (int indent);
+    void TRACE_ADD (const char* format, ...);
+    void TRACE_CLOSER;
+
+    /*
+     * Convert tag to the underlying status variable.
+     */
+
+    TRACE_TAG_VAR (tag)
+
+    /*
+     * Conditional use of arbitrary code.
+     */
+
+    TRACE_RUN (code);
+    TRACE_DO (code);
+    TRACE_TAG_DO (code);
+}]
+
+[para] Note that these definitions are conditional on the existence of
+the macro [const CRITCL_TRACER]. 
+
+Without a [cmd {critcl::cflags -DCRITCL_TRACER}] all trace
+functionality in the C code is quiescent and not compiled into the
+object file. In other words, tracing can be (de)activated at will
+during build time, as needed by the user.
+
+[para] For convenience this is controlled by [arg enable]. By default
+([const false]) the facility available, but not active.
+
+Using [const true] not only makes it available, but activates it as
+well.
+
+Further note that the command [cmd critcl::config] now accepts a
+boolean option [const trace]. Setting it activates enter/exit tracing
+in all commands based on [cmd critcl::cproc], with proper printing of
+arguments and results. This implicitly activates the tracing facility
+in general.
+
+[para] The details of the semantics are explained in section
+[sectref Tracing]
+
+[para] The result of the command is an empty string.
+
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section Allocation]
+
+[list_begin definitions]
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {type* ALLOC (type)}]]
+
+This macro allocates a single element of the given [arg type] and
+returns a pointer to that memory.
+
+[call [cmd {type* ALLOC_PLUS (type, int n)}]]
+
+This macro allocates a single element of the given [arg type], plus an
+additional [arg n] bytes after the structure and returns a pointer to
+that memory.
+
+[para] This is for variable-sized structures of. An example of such
+could be a generic list element structure which stores management
+information in the structure itself, and the value/payload immediately
+after, in the same memory block.
+
+[call [cmd {type* NALLOC (type, int n)}]]
+
+This macro allocates [arg n] elements of the given [arg type] and
+returns a pointer to that memory.
+
+[call [cmd {type* REALLOC (type* var, type, int n)}]]
+
+This macro expands or shrinks the memory associated with the C
+variable [arg var] of type [arg type] to hold [arg n] elements of the
+type. It returns a pointer to that memory.
+
+Remember, a reallocation may move the data to a new location in memory
+to satisfy the request. Returning a pointer instead of immediately
+assigning it to the [arg var] allows the user to validate the new
+pointer before trying to use it.
+
+[call [cmd {void FREE (type* var)}]]
+
+This macro releases the memory referenced by the pointer variable
+[arg var].
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {void STREP (Tcl_Obj* o, char* s, int len)}]]
+
+This macro properly sets the string representation of the Tcl object
+[arg o] to a copy of the string [arg s], expected to be of length
+[arg len].
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {void STREP_DS (Tcl_Obj* o, Tcl_DString* ds)}]]
+
+This macro properly sets the string representation of the Tcl object
+[arg o] to a copy of the string held by the [type DString] [arg ds].
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {void STRDUP (varname, char* str)}]]
+
+This macro duplicates the string [arg str] into the heap and stores
+the result into the named [type char*] variable [arg var].
+
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section Assertions]
+
+[list_begin definitions]
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {void ASSERT (expression, char* message}]]
+
+This macro tests the [arg expression] and panics if it does not hold.
+The specified [arg message] is used as part of the panic.
+The [arg message] has to be a static string, it cannot be a variable.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {void ASSERT_BOUNDS (int index, int size)}]]
+
+This macro ensures that the [arg index] is in the
+range [const 0] to [const {size-1}].
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {void STOPAFTER(n)}]]
+
+This macro throws a panic after it is called [arg n] times.
+Note, each separate instance of the macro has its own counter.
+
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section Tracing]
+
+All output is printed to [const stdout].
+
+[list_begin definitions]
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd TRACE_ON]]
+[call [cmd TRACE_OFF]]
+[call [cmd {TRACE_TAG_ON  (identifier)}]]
+[call [cmd {TRACE_TAG_OFF (identifier)}]]
+
+These "commands" are actually declarators, for use outside of
+functions. They (de)activate specific logical streams, named either
+explicitly by the user, or implicitly, refering to the current file.
+
+[para] For example:
+[para][example {
+    TRACE_TAG_ON (lexer_in);
+}]
+
+[para] All high- and low-level trace commands producing output have
+the controlling tag as an implicit argument. The scope management
+commands do not take tags.
+
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {void TRACE_FUNC}]]
+[call [cmd {void TRACE_TAG_FUNC (tag)}]]
+[call [cmd {void TRACE_FUNC_VOID}]]
+[call [cmd {void TRACE_TAG_FUNC_VOID (tag)}]]
+
+Use these macros at the beginning of a C function to record entry into
+it. The name of the entered function is an implicit argument
+([var __func__]), forcing users to have a C99 compiler..
+
+[para] The tracer's runtime maintains a stack of active functions and
+expects that function return is signaled by either [fun TRACE_RETURN],
+[fun TRACE_RETURN_VOID], or the equivalent forms taking a tag.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {void TRACE_RETURN_VOID}]]
+[call [cmd {void TRACE_TAG_RETURN_VOID (tag)}]]
+
+Use these macros instead of [example {return}] to return from a void
+function. Beyond returning from the function this also signals the
+same to the tracer's runtime, popping the last entered function from
+its stack of active functions.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {any TRACE_RETURN     (     char* format, any x)}]]
+[call [cmd {any TRACE_TAG_RETURN (tag, char* format, any x)}]]
+
+Use this macro instead of [example {return x}] to return from a
+non-void function.
+
+Beyond returning from the function with value [arg x] this also
+signals the same to the tracer's runtime, popping the last entered
+function from its stack of active functions.
+
+The [arg format] is expected to be a proper formatting string for
+[fun printf] and analogues, able to stringify [arg x].
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {void TRACE     (     char* format, ...)}]]
+[call [cmd {void TRACE_TAG (tag, char* format, ...)}]]
+
+This macro is the trace facilities' equivalent of [fun printf],
+printing arbitrary data under the control of the [arg format].
+
+[para] The printed text is closed with a newline, and indented as per
+the stack of active functions.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {void TRACE_HEADER (int indent)}]]
+[call [cmd {void TRACE_TAG_HEADER (tag, int indent)}]]
+
+This is the low-level macro which prints the beginning of a trace
+line. This prefix consists of physical location (file name and line
+number), if available, indentation as per the stack of active scopes
+(if activated), and the name of the active scope.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {void TRACE_CLOSER}]]
+[call [cmd {void TRACE_TAG_CLOSER (tag)}]]
+
+This is the low-level macro which prints the end of a trace
+line.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {void TRACE_ADD          (const char* format, ...)}]]
+[call [cmd {void TRACE_TAG_ADD (tag, const char* format, ...)}]]
+
+This is the low-level macro which adds formatted data to the line.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {void TRACE_PUSH_SCOPE (const char* name)}]]
+[call [cmd {void TRACE_PUSH_FUNC}]]
+[call [cmd {void TRACE_PUSH_POP}]]
+
+These are the low-level macros for scope management. The first two
+forms push a new scope on the stack of active scopes, and the last
+forms pops the last scope pushed.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {TRACE_TAG_VAR (tag)}]]
+
+Helper macro converting from a tag identifier to the name of the
+underlying status variable.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {TRACE_RUN (code);}]]
+
+Conditionally insert the [arg code] at compile time when the tracing
+facility is activated.
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd {TRACE_DO (code);}]]
+[call [cmd {TRACE_TAG_DO (tag, code);}]]
+
+Insert the [arg code] at compile time when the tracing facility is
+activated, and execute the same when either the implicit tag for the
+file or the user-specified tag is active.
+
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback2.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_devguide.man b/src/vfs/critcl.vfs/doc/critcl_devguide.man
new file mode 100644
index 00000000..2465baeb
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_devguide.man
@@ -0,0 +1,228 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*- doctools manpage}]
+[comment {quadrant: reference}]
+[include version.inc]
+[manpage_begin critcl_devguide n [vset VERSION]]
+[include include/module.inc]
+[titledesc {Guide To The CriTcl Internals}]
+[description]
+[include include/welcome.inc]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section Audience]
+
+[para] This document is a guide for developers working on CriTcl, i.e. maintainers fixing
+bugs, extending the package's functionality, etc.
+
+[para] Please read
+
+[list_begin enum]
+[enum] [term {CriTcl - License}],
+[enum] [term {CriTcl - How To Get The Sources}], and
+[enum] [term {CriTcl - The Installer's Guide}]
+[list_end]
+
+first, if that was not done already.
+
+[para] Here we assume that the sources are already available in a directory of the readers
+choice, and that the reader not only know how to build and install them, but also has all
+the necessary requisites to actually do so. The guide to the sources in particular also
+explains which source code management system is used, where to find it, how to set it up,
+etc.
+
+[section {Playing with CriTcl}]
+[include include/largeexampleref.inc]
+[include include/smallexampleref.inc]
+
+
+[section {Developing for CriTcl}]
+
+[comment @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@]
+[subsection {Architecture & Concepts}]
+[include include/architecture.inc]
+
+[comment @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@]
+[subsection Requirements]
+
+To develop for critcl the following packages and applications must be available in the
+environment. These are all used by the [cmd build.tcl] helper application.
+
+[list_begin definitions]
+[def [syscmd dtplite]]
+
+A Tcl application provided by Tcllib, for the validation and conversion of
+[term doctools]-formatted text.
+
+[def [syscmd dia]]
+
+A Tcl application provided by Tklib, for the validation and conversion
+of [package diagram]-formatted figures into raster images.
+
+[para] Do not confuse this with the Gnome [syscmd dia] application, which is a graphical
+editor for figures and diagrams, and completely unrelated.
+
+[def [package fileutil]]
+A Tcl package provided by Tcllib, providing file system utilities.
+
+[def "[package vfs::mk4], [package vfs]"]
+Tcl packages written in C providing access to Tcl's VFS facilities, required for the
+generation of critcl starkits and starpacks.
+
+[list_end]
+
+[comment @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@]
+[subsection {Directory structure}]
+
+[list_begin definitions][comment {___1___}]
+
+[comment {= = == === ===== ======== ============= =======================}]
+[def Helpers]
+[list_begin definitions]
+[def [file build.tcl]]
+
+This helper application provides various operations needed by a developer for critcl, like
+regenerating the documentation, the figures, building and installing critcl, etc.
+
+[para] Running the command like
+
+[example {
+	./build.tcl help
+}]
+
+will provide more details about the available operations and their arguments.
+[list_end]
+
+[comment {= = == === ===== ======== ============= =======================}]
+[def Documentation]
+[list_begin definitions]
+[def [file doc/]]
+
+This directory contains the documentation sources, for both the text, and the figures.
+The texts are written in [term doctools] format, whereas the figures are written for
+tklib's [package dia](gram) package and application.
+
+[def [file embedded/]]
+
+This directory contains the documentation converted to regular manpages (nroff) and HTML.
+
+It is called embedded because these files, while derived, are part of the git repository,
+i.e. embedded into it. This enables us to place these files where they are visible when
+serving the prject's web interface.
+
+[list_end]
+
+[comment {= = == === ===== ======== ============= =======================}]
+[def Testsuite]
+[list_begin definitions]
+[def [file test/all.tcl]]
+[def [file test/testutilities.tcl]]
+[def [file test/*.test]]
+
+These files are a standard testsuite based on Tcl's [package tcltest] package, with some
+utility code snarfed from [package Tcllib].
+
+[para] This currently tests only some of the [package stubs::*] packages.
+
+[def [file test/*.tcl]]
+
+These files (except for [file all.tcl] and [file testutilities.tcl]) are example files
+(Tcl with embedded C) which can be run through critcl for testing.
+
+[para] [strong TODO] for a maintainers: These should be converted into a proper test suite.
+
+[list_end]
+
+[comment {= = == === ===== ======== ============= =======================}]
+[def {Package Code, General structure}]
+
+[list_begin definitions]
+[list_end]
+
+[comment {= = == === ===== ======== ============= =======================}]
+[def {Package Code, Per Package}]
+[list_begin definitions][comment ----------------------PCPP]
+
+[def [package critcl]]
+[list_begin definitions][comment ---------------critcl]
+[def [file lib/critcl/critcl.tcl]]
+The Tcl code implementing the package.
+
+[def [file lib/critcl/Config]]
+The configuration file for the standard targets and their settings.
+
+[def [file lib/critcl/critcl_c/]]
+Various C code snippets used by the package.
+
+This directory also contains the copies of the Tcl header files used to compile the
+assembled C code, for the major brnaches of Tcl, i.e. 8.4, 8.5, and 8.6.
+
+[list_end][comment -----------------------------critcl]
+
+[def [package critcl::util]]
+[list_begin definitions][comment ---------------critcl::util]
+[def [file lib/critcl-util/util.tcl]]
+The Tcl code implementing the package.
+[list_end][comment -----------------------------critcl::util]
+
+[def [package critcl::app]]
+[list_begin definitions][comment ---------------critcl::app]
+[def [file lib/app-critcl/critcl.tcl]]
+The Tcl code implementing the package.
+[list_end][comment -----------------------------critcl::app]
+
+[def [package critcl::iassoc]]
+[list_begin definitions][comment ---------------critcl::iassoc]
+[def [file lib/critcl-iassoc/iassoc.tcl]]
+The Tcl code implementing the package.
+[def [file lib/critcl-iassoc/iassoc.h]]
+C code template used by the package.
+[list_end][comment -----------------------------critcl::iassoc]
+
+[def [package critcl::class]]
+[list_begin definitions][comment ---------------critcl::class]
+[def [file lib/critcl-class/class.tcl]]
+The Tcl code implementing the package.
+[def [file lib/critcl-class/class.h]]
+C code template used by the package.
+[list_end][comment -----------------------------critcl::class]
+
+
+[def [package stubs::*]]
+[list_begin definitions][comment ---------------stubs]
+[def [file lib/stubs/*]]
+
+A set of non-public (still) packages which provide read and write access to and represent
+Tcl stubs tables. These were created by taking the [file genStubs.tcl] helper application
+coming with the Tcl core sources apart along its internal logical lines.
+
+[list_end][comment -----------------------------stubs]
+
+[def [package critclf]]
+[list_begin definitions][comment ---------------critclf]
+[def [file lib/critclf/]]
+
+Arjen Markus' work on a critcl/Fortran. The code is outdated and has not been adapted to
+the changes in critcl version 3 yet.
+
+[list_end][comment -----------------------------critclf]
+
+[def [package md5]]
+[def [package md5c]]
+[def [package platform]]
+
+These are all external packages whose code has been inlined in the repository for easier
+development (less dependencies to pull), and quicker deployment from the repository
+(generation of starkit and -pack).
+
+[para] [strong TODO] for maintainers: These should all be checked against their origin for
+updates and changes since they were inlined.
+
+[list_end][comment ------------------------------------PCPP]
+
+[list_end][comment {___1___}]
+
+[comment {TODO **** Package dependency diagram ****}]
+[comment {TODO **** Diagram of the internal call graph ? ****}]
+[comment {TODO **** Add test/ ****}]
+
+[include include/feedback.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_emap.man b/src/vfs/critcl.vfs/doc/critcl_emap.man
new file mode 100644
index 00000000..6ad25e07
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_emap.man
@@ -0,0 +1,185 @@
+[comment {-*- tcl -*- doctools manpage}]
+[vset emap_version 1.3]
+[manpage_begin critcl::emap n [vset emap_version]]
+[include include/module2.inc]
+[keywords singleton {Tcl Interp Association}]
+[keywords bitmask bitset flags]
+[titledesc {CriTcl - Wrap Support - Enum en- and decoding}]
+[require Tcl 8.6]
+[require critcl [opt 3.2]]
+[require critcl::emap [opt [vset emap_version]]]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+This document is the reference manpage for the
+[package critcl::emap] package. This package provides convenience
+commands for advanced functionality built on top of both critcl core
+and package [package critcl::iassoc].
+
+[para] C level libraries often use enumerations or integer values to encode
+information, like the state of a system. Tcl bindings to such libraries now
+have the task of converting a Tcl representation, i.e. a string into such
+state, and back.
+
+[emph Note] here that the C-level information has to be something which
+already exists. The package does [emph not] create these values. This is
+in contrast to the package [package critcl::enum] which creates an
+enumeration based on the specified symbolic names.
+
+[para] This package was written to make the declaration and management
+of such enumerations and their associated conversions functions easy,
+hiding all attendant complexity from the user.
+
+[para] Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code.
+
+[para] This package resides in the Core Package Layer of CriTcl.
+[para][image arch_core][para]
+
+[comment {= = == === ===== ======== ============= =====================}]
+
+[section API]
+
+[list_begin definitions]
+[call [cmd ::critcl::emap::def] [arg name] [arg definition] \
+     [opt [option -nocase]] \
+     [opt "[option -mode] [arg mode]"]]
+
+This command defines C functions for the conversion of the [arg name]d
+state code into a Tcl string, and vice versa.
+
+The underlying mapping tables are automatically initialized on first
+access (if not fully constant), and finalized on interpreter
+destruction.
+
+[para] The [arg definition] dictionary provides the mapping from the
+Tcl-level symbolic names of the state to their C expressions (often
+the name of the macro specifying the actual value).
+
+[emph Note] here that the C-level information has to be something which
+already exists. The package does [emph not] create these values. This is
+in contrast to the package [package critcl::enum] which creates an
+enumeration based on the specified symbolic names.
+
+[para] Further note that multiple strings can be mapped to the same C
+expression. When converting to Tcl the first string for the mapping is
+returned. An important thing to know: If all C expressions are
+recognizable as integer numbers and their covered range is not too
+large (at most 50) the package will generate code using direct and
+fast mapping tables instead of using a linear search.
+
+[para] If the option [option -nocase] is specified then the encoder
+will match strings case-insensitively, and the decoder will always
+return a lower-case string, regardless of the string's case in the
+[arg definition].
+
+[para] If the option [option -mode] is specified its contents will
+interpreted as a list of access modes to support.  The two allowed
+modes are [const c] and [const tcl]. Both modes can be used
+together. The default mode is [const tcl].
+
+[para] The package generates multiple things (declarations and
+definitions) with names derived from [arg name], which has to be a
+proper C identifier. Some of the things are generated conditional on
+the chosen [arg mode]s.
+
+[list_begin definitions]
+[def [arg name]_encode]
+The [const tcl]-mode function for encoding a Tcl string into the
+equivalent state code.
+
+Its signature is
+[para][example_begin]
+int [arg name]_encode (Tcl_Interp* interp, Tcl_Obj* state, int* result);
+[example_end]
+
+[para] The return value of the function is a Tcl error code,
+i.e. [const TCL_OK], [const TCL_ERROR], etc.
+
+[def [arg name]_encode_cstr]
+The [const c]-mode function for encoding a C string into the
+equivalent state code.
+
+Its signature is
+[para][example_begin]
+int [arg name]_encode_cstr (const char* state);
+[example_end]
+
+[para] The return value of the function is the encoded state, or -1 if
+the argument is not a vlaid state.
+
+[def [arg name]_decode]
+The [const tcl]-mode function for decoding a state code into the
+equivalent Tcl string.
+
+Its signature is
+[para][example_begin]
+Tcl_Obj* [arg name]_decode (Tcl_Interp* interp, int state);
+[example_end]
+
+[def [arg name]_decode_cstr]
+The [const c]-mode function for decoding a state code into the
+equivalent C string.
+
+Its signature is
+[para][example_begin]
+const char* [arg name]_decode_cstr (int state);
+[example_end]
+
+[para] The return value of the function is the C string for the state,
+or [const NULL] if the [arg state] argument does not contain a valid
+state value.
+
+
+[def [arg name].h]
+A header file containing the declarations for the conversion
+functions, for use by other parts of the system, if necessary.
+
+[para] The generated file is stored in a place where it will not
+interfere with the overall system outside of the package, yet also be
+available for easy inclusion by package files ([cmd csources]).
+
+[def [arg name]]
+For mode [const tcl] the command registers a new argument-type for
+[cmd critcl::cproc] with critcl, encapsulating the encoder function.
+
+[def [arg name]]
+For mode [const tcl] the command registers a new result-type for
+[cmd critcl::cproc] with critcl, encapsulating the decoder function.
+
+[list_end]
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section Example]
+
+The example shown below is the specification for the possible modes of
+entry (normal, no feedback, stars) used by the Tcl binding to the
+linenoise library.
+
+[example {
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::buildrequirement {
+    package require critcl::emap
+}
+
+critcl::emap::def hiddenmode {
+            no  0 n 0 off 0 false 0 0 0
+    all   1 yes 1 y 1 on  1 true  1 1 1
+    stars 2
+} -nocase
+
+# Declarations: hiddenmode.h
+# Encoder:      int      hiddenmode_encode (Tcl_Interp* interp, Tcl_Obj* state, int* result);
+# Decoder:      Tcl_Obj* hiddenmode_decode (Tcl_Interp* interp, int state);
+# ResultType:   hiddenmode
+# ArgumentType: hiddenmode
+}]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback2.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_enum.man b/src/vfs/critcl.vfs/doc/critcl_enum.man
new file mode 100644
index 00000000..6c9d486b
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_enum.man
@@ -0,0 +1,172 @@
+[comment {-*- tcl -*- doctools manpage}]
+[vset enum_version 1.2]
+[manpage_begin critcl::enum n [vset enum_version]]
+[include include/module2.inc]
+[keywords singleton {Tcl Interp Association}]
+[keywords {string pool} {literal pool}]
+[keywords {string to int mapping} conversion]
+[keywords {int to string mapping}]
+[titledesc {CriTcl - Wrap Support - String/Integer mapping}]
+[require Tcl 8.6]
+[require critcl [opt 3.2]]
+[require critcl::enum [opt [vset enum_version]]]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+This document is the reference manpage for the
+[package critcl::enum] package. This package provides convenience
+commands for advanced functionality built on top of both critcl core
+and package [package critcl::literals].
+
+[para] It is an extended form of string pool which not only converts
+integer values into Tcl-level strings, but also handles the reverse
+direction, converting from strings to the associated integer values.
+
+[para] It essentially provides a bi-directional mapping between a C
+enumeration type and a set of strings, one per enumeration value.
+
+[emph Note] that the C enumeration in question is created by the
+definition. It is not possible to use the symbols of an existing
+enumeration type.
+
+[para] This package was written to make the declaration and management
+of such mappings easy. It uses a string pool for one of the directions,
+using its ability to return shared literals and conserve memory.
+
+[para] Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code.
+
+[para] This package resides in the Core Package Layer of CriTcl.
+[para][image arch_core][para]
+
+[comment {= = == === ===== ======== ============= =====================}]
+
+[section API]
+
+[list_begin definitions]
+[call [cmd ::critcl::enum::def] [arg name] [arg definition] [opt [arg mode]]]
+
+This command defines two C functions for the conversion between
+C values and Tcl_Obj'ects, with named derived from [arg name].
+
+[para] The [arg definition] dictionary provides the mapping from the
+specified C-level symbolic names to the strings themselves.
+
+[para]
+The [arg mode]-list configures the output somewhat.
+The two allowed modes are [const +list] and [const tcl].
+All modes can be used together.
+The default mode is [const tcl].
+Using mode [const +list] implies [const tcl] as well.
+
+[para] For mode [const tcl] the new function has two arguments, a
+[type Tcl_Interp*] pointer refering to the interpreter holding the
+string pool, and a code of type "[arg name]_pool_names" (see below),
+the symbolic name of the string to return. The result of the function
+is a [type Tcl_Obj*] pointer to the requested string constant.
+
+[para] For mode [const +list] all of [const tcl] applies, plus an
+additional function is generated which takes three arguments, in
+order: a [type Tcl_Interp*] pointer refering to the interpreter
+holding the string pool, an [type int] holding the size of the last
+argument, and an array of type "[arg name]_pool_names" holding the
+codes (see below), the symbolic names of the strings to return. The
+result of the function is a [type Tcl_Obj*] pointer to a Tcl list
+holding the requested string constants.
+
+[para] The underlying string pool is automatically initialized on
+first access, and finalized on interpreter destruction.
+
+[para] The package generates multiple things (declarations and
+definitions) with names derived from [arg name], which has to be a
+proper C identifier.
+
+[list_begin definitions]
+[def [arg name]_pool_names]
+The C enumeration type containing the specified symbolic names.
+
+[def [arg name]_ToObj]
+The function converting from integer value to Tcl string.
+
+Its signature is
+[para][example_begin]
+Tcl_Obj* [arg name]_ToObj (Tcl_Interp* interp, [arg name]_names literal);
+[example_end]
+
+[def [arg name]_ToObjList]
+The mode [const +list] function converting from integer array to Tcl
+list of strings.
+
+Its signature is
+[para][example_begin]
+Tcl_Obj* [arg name]_ToObjList (Tcl_Interp* interp, int c, [arg name]_names* literal);
+[example_end]
+
+[def [arg name]_GetFromObj]
+The function converting from Tcl string to integer value.
+
+Its signature is
+[para][example_begin]
+int [arg name]_GetFromObj (Tcl_Interp* interp, Tcl_Obj* obj, int flags, int* literal);
+[example_end]
+
+The [arg flags] are like for [fun Tcl_GetIndexFromObj].
+
+[def [arg name].h]
+
+A header file containing the declarations for the converter functions,
+for use by other parts of the system, if necessary.
+
+[para] The generated file is stored in a place where it will not
+interfere with the overall system outside of the package, yet also be
+available for easy inclusion by package files ([cmd csources]).
+
+[def [arg name]]
+At the level of critcl itself the command registers a new result-type
+for [cmd critcl::cproc], which takes an integer result from the function
+and converts it to the equivalent string in the pool for the script.
+
+[def [arg name]]
+At the level of critcl itself the command registers a new argument-type
+for [cmd critcl::cproc], which takes a Tcl string and converts it to the
+equivalent integer for delivery to the function.
+
+[list_end]
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section Example]
+
+The example shown below is the specification for a set of actions, methods,
+and the like, a function may take as argument.
+
+[example {
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::buildrequirement {
+    package require critcl::enum
+}
+
+critcl::enum::def action {
+    w_create	"create"
+    w_directory	"directory"
+    w_events	"events"
+    w_file	"file"
+    w_handler	"handler"
+    w_remove	"remove"
+}
+
+# Declarations: action.h
+# Type:         action_names
+# Accessor:     Tcl_Obj* action_ToObj (Tcl_Interp* interp, int literal);
+# Accessor:     int action_GetFromObj (Tcl_Interp* interp, Tcl_Obj* o, int flags, int* literal);
+# ResultType:   action
+# ArgType:      action
+}]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback2.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_howto_install.man b/src/vfs/critcl.vfs/doc/critcl_howto_install.man
new file mode 100644
index 00000000..1179728a
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_howto_install.man
@@ -0,0 +1,51 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*- doctools manpage}]
+[comment {quadrant: how-to}]
+[include version.inc]
+[manpage_begin critcl_howto_install n [vset VERSION]]
+[include include/module.inc]
+[titledesc {How To Install CriTcl}]
+[description]
+[include include/welcome.inc]
+
+[para] [vset critcl] is installed in four major steps:
+
+[list_begin enumerated]
+[enum] [sectref {Install The Requisites}]
+[enum] Follow the instructions on [term {How To Get The CriTcl Sources}]
+[enum] [sectref {Install The CriTcl Packages}]
+[enum] [sectref {Test The Installation}]
+[list_end]
+
+It is now possible to follow the instructions on [term {How To Use CriTcl}].
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section {Install The Requisites}]
+
+This major step breaks down into three minor steps:
+
+[list_begin enumerated]
+[enum] [sectref {Install A Working C Compiler}] and development environment.
+[enum] [sectref {Install A Working Tcl Shell}]
+[enum] [sectref {Install Supporting Tcl Packages}]
+[list_end]
+
+[subsection {Install A Working C Compiler}]	[include include/rq_cc.inc]
+[subsection {Install A Working Tcl Shell}]	[include include/rq_tcl.inc]
+[subsection {Install Supporting Tcl Packages}]	[include include/rq_tcllib.inc]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section {Install The CriTcl Packages}]
+
+Note that this step has different instructions dependent on the platform [vset critcl] is
+to be installed on. In other words, only one of the sub sections applies, the other can be
+ignored.
+
+[subsection {Install On Unix}]		[include include/b_unix.inc]
+[subsection {Install On Windows}]	[include include/b_windows.inc]
+
+[comment {= = == === ===== ======== ============= =====================}]
+
+[section {Test The Installation}]	[include include/b_test.inc]
+
+[include include/feedback.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_howto_sources.man b/src/vfs/critcl.vfs/doc/critcl_howto_sources.man
new file mode 100644
index 00000000..887a79f8
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_howto_sources.man
@@ -0,0 +1,48 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*- doctools manpage}]
+[comment {quadrant: how-to}]
+[include version.inc]
+[manpage_begin critcl_howto_sources n [vset VERSION]]
+[include include/module.inc]
+[titledesc {How To Get The CriTcl Sources}]
+[description]
+[include include/welcome.inc]
+
+[para] The sources for [vset critcl] are retrieved in two easy steps:
+
+[list_begin enumerated]
+[enum] [sectref {Install the Git Source Code Manager}]
+[enum] [sectref {Retrieve The Sources}]
+[list_end]
+
+It is now possible to follow the instructions on [term {How To Install CriTcl}].
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section {Install the Git Source Code Manager}]
+
+[vset critcl]'s sources are managed by the popular [vset git_home].
+
+[para] Binaries of clients for popular platforms can be found at the [vset git_binaries].
+
+[para] See also if your operating system's package manager provides clients and associated
+tools for installation. If so, follow the instructions for the installation of such
+packages on your system.
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section {Retrieve The Sources}]
+
+[list_begin enumerated]
+[enum] Choose a directory for the sources, and make it the working directory.
+
+[enum] Invoke the command
+[example_begin]
+git clone [vset project_home]
+[example_end]
+
+[enum] The working directory now contains a sub-directory [file critcl] holding the
+sources of [vset critcl].
+
+[list_end]
+
+[include include/feedback.inc]
+[manpage_end]
+
diff --git a/src/vfs/critcl.vfs/doc/critcl_howto_use.man b/src/vfs/critcl.vfs/doc/critcl_howto_use.man
new file mode 100644
index 00000000..cae9260c
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_howto_use.man
@@ -0,0 +1,98 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*- doctools manpage}]
+[comment {quadrant: how-to}]
+[include version.inc]
+[manpage_begin critcl_howto_use n [vset VERSION]]
+[include include/module.inc]
+[titledesc {How To Use CriTcl}]
+[description]
+[para]
+[include include/welcome.inc]
+
+[para] This document assumes the presence of a working [vset critcl] installation.
+
+[para] If that is missing follow the instructions on [term {How To Install CriTcl}].
+
+[comment {= = == === ===== ======== ============= =====================}]
+
+[section Basics]                            [include include/use/first.inc]
+[vset base " Starting from the [sectref Basics]. 
+            Edit the file [file example.tcl].
+            Remove the definition of [cmd hello]. Replace it with "]
+[vset rebuild { and rebuild the package.}]
+
+[subsection {Simple Arguments}]               [include include/use/args.inc]
+[subsection {Simple Results}]                 [include include/use/results.inc]
+[subsection {Range-limited Simple Arguments}] [include include/use/args_range.inc]
+[subsection {String Arguments}]               [include include/use/args_str.inc]
+[subsection {String Results}]                 [include include/use/results_str.inc]
+[subsection {List Arguments}]                 [include include/use/args_list.inc]
+[subsection {Constrained List Arguments}]     [include include/use/args_list_constrained.inc]
+[subsection {Raw Tcl_Obj* Arguments}]         [include include/use/args_obj.inc]
+[subsection {Raw Tcl_Obj* Results}]           [include include/use/results_obj.inc]
+[subsection {Errors & Messages}]              [include include/use/errors.inc]
+[subsection {Tcl_Interp* Access}]             [include include/use/interp.inc]
+[subsection {Binary Data Arguments}]          [include include/use/args_binary.inc]
+[subsection {Constant Binary Data Results}]   [include include/use/results_const_binary.inc]
+[subsection {Tcl Runtime Version}]            [include include/use/runtime.inc]
+[subsection {Additional Tcl Code}]            [include include/use/tcl_sources.inc]
+[subsection {Debugging Support}]              [include include/use/debugging.inc]
+[subsection {Install The Package}]            [include include/use/build_install.inc]
+
+[section {Using External Libraries}]        [include include/use/second.inc]
+[vset ebase " Starting from the [sectref {Using External Libraries} {base wrapper}]. 
+              Edit the file [file example.tcl]. "]
+
+[subsection {Default Values For Arguments}]             [include include/use/args_default.inc]
+[subsection {Custom Argument Validation}]               [include include/use/args_check.inc]
+[subsection {Separating Local C Sources}]               [include include/use/csources.inc]
+[subsection {Very Simple Results}]                      [include include/use/cconst.inc]
+[subsection {Structure Arguments}]                      [include include/use/args_structure.inc]
+[subsection {Structure Results}]                        [include include/use/results_structure.inc]
+[subsection {Structure Types}]                          [include include/use/objtype_structure.inc]
+[subsection {Large Structures}]                         [include include/use/objtype_large.inc]
+[subsection {External Structures}]                      [include include/use/external_struct.inc]
+[subsection {External Enumerations}]                    [include include/use/external_enum.inc]
+[subsection {External Bitsets/Bitmaps/Flags}]           [include include/use/external_bitmap.inc]
+[subsection {Non-standard header/library locations}]    [include include/use/locations.inc]
+[subsection {Non-standard compile/link configuration}]  [include include/use/flags.inc]
+[subsection {Querying the compilation environment}]     [include include/use/env_query.inc]
+[subsection {Shared C Code}]                            [include include/use/csources_ii.inc]
+
+[section Various]
+[subsection {Author, License, Description, Keywords}] [include include/use/meta.inc]
+[subsection {Get Critcl Application Help}]            [include include/use/build_help.inc]
+[subsection {Supported Targets & Configurations}]     [include include/use/build_targets.inc]
+[subsection {Building A Package}]                     [include include/use/build_package.inc]
+[subsection {Building A Package For Debugging}]       [include include/use/build_package_debug.inc]
+
+[comment {
+    [section {-- topics to do --}]
+
+    [list_begin itemized]
+    [item] 'args' handling
+    [item] void and ok results (no results, full custom results)
+    [item] channels arguments, results ?
+    [item] demo: callbacks
+    [item] demo: iassoc
+    [item] demo: string pool
+    [item] demo: assertions        --> cutil
+    [item] demo: memory utilities  -/
+    [item] demo: tracing utilities /
+    [item]
+    [list_end]
+
+    [section {-- topics ignored for now as advanced, niche, without example, superceded --}]
+
+    [list_begin itemized]
+    [item] cdefines - no - better done with emap/bitmap
+    [item] ccommand - no - no real example available. advanced
+    [item] tk       - no - widgets - no example available. advanced
+    [item] fallback to tcl if C not available for platform - niche
+    [item] cross compilation - need external support for that how to
+    [item] custom config - no - advanced
+    [item] prefill result cache - niche
+    [list_end]
+}]
+
+[include include/feedback.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_iassoc.man b/src/vfs/critcl.vfs/doc/critcl_iassoc.man
new file mode 100644
index 00000000..86e0464d
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_iassoc.man
@@ -0,0 +1,129 @@
+[vset VERSION 1.2]
+[comment {-*- tcl -*- doctools manpage}]
+[manpage_begin critcl::iassoc n [vset VERSION]]
+[include include/module2.inc]
+[keywords singleton {Tcl Interp Association}]
+[titledesc {CriTcl - Code Gen - Tcl Interp Associations}]
+[require Tcl 8.6]
+[require critcl [opt 3.2]]
+[require critcl::iassoc [opt [vset VERSION]]]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+This document is the reference manpage for the [package critcl::iassoc]
+package. This package provides convenience commands for advanced
+functionality built on top of the critcl core.
+
+[para] With it a user wishing to associate some data with a Tcl
+interpreter via Tcl's [fun Tcl_(Get|Set)AssocData()] APIs can now
+concentrate on the data itself, while all the necessary boilerplate
+around it is managed by this package.
+
+[para] Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code.
+
+[para] This package resides in the Core Package Layer of CriTcl.
+[para][image arch_core][para]
+
+[comment {= = == === ===== ======== ============= =====================}]
+
+[section API]
+
+[list_begin definitions]
+[call [cmd ::critcl::iassoc::def] [arg name] [arg arguments] [arg struct] \
+	[arg constructor] [arg destructor]]
+
+This command defines a C function with the given [arg name] which
+provides access to a structure associated with a Tcl interpreter.
+
+[para] The C code code fragment [arg struct] defines the elements of
+said structure, whereas the fragments [arg constructor] and
+[arg destructor] are C code blocks executed to initialize and release
+any dynamically allocated parts of this structure, when needed. Note
+that the structure itself is managed by the system.
+
+[para] The new function takes a [const Tcl_Interp*] pointer refering
+to the interpreter whose structure we wish to obtain as the first
+argument, plus the specified [arg arguments] and returns a pointer to
+the associated structure, of type "[arg name]_data" (see below).
+
+[para] The [arg arguments] are a dictionary-like list of C types and
+identifiers specifying additional arguments for the accessor function,
+and, indirectly, the [arg constructor] C code block. This is useful
+for the supplication of initialization values, or the return of more
+complex error information in case of a construction failure.
+
+[para] The C types associated with the structure are derived from
+[arg name], with "[arg name]_data__" the type of the structure itself,
+and "[arg name]_data" representing a pointer to the structure.
+
+The C code blocks can rely on the following C environments:
+[list_begin definitions]
+[def [arg constructor]]
+[list_begin definitions]
+
+[def [var data]] Pointer to the structure (type: [arg name]_data) to
+initialize.
+
+[def [var interp]] Pointer to the Tcl interpreter (type: Tcl_Interp*)
+the new structure will be associated with.
+
+[def error] A C code label the constructor can jump to should it have
+to signal a construction failure. It is the responsibility of the
+constructor to release any fields already initialized before jumping
+to this label.
+
+[def ...] The names of the constructor arguments specified with
+[arg arguments].
+[list_end]
+[def [arg destructor]]
+[list_begin definitions]
+[def [var data]] Pointer to the structure being released.
+[def [var interp]] Pointer to the Tcl interpreter the structure
+belonged to.
+[list_end]
+[list_end]
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section Example]
+
+The example shown below is the specification of a simple interpreter-associated
+counter. The full example, with meta data and other incidentals, can be found
+in the directory [file examples/queue] of the critcl source
+distribution/repository.
+
+[example {
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::buildrequirement {
+    package require critcl::iassoc
+}
+
+critcl::iassoc::def icounter {} {
+    int counter; /* The counter variable */
+} {
+    data->counter = 0;
+} {
+    /* Nothing to release */
+}
+
+critcl::ccode {
+    ... function (...)
+    {
+         /* Access to the data ... */
+         icounter_data D = icounter (interp /* ... any declared arguments, here, none */);
+	 ... D->counter ...
+    }
+}
+# or, of course, 'cproc's, 'ccommand's etc.
+
+package provide icounter 1
+}]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback2.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_license.man b/src/vfs/critcl.vfs/doc/critcl_license.man
new file mode 100644
index 00000000..08fd6810
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_license.man
@@ -0,0 +1,48 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*- doctools manpage}]
+[comment {quadrant: reference}]
+[manpage_begin critcl_license n 1]
+[include include/module.inc]
+[titledesc {The CriTcl License}]
+[description]
+[include include/welcome.inc]
+
+[para] All packages are under the BSD license.
+
+[section License]
+
+[para] This software is copyrighted by Andreas Kupries and other parties.  The following
+terms apply to all files associated with the software unless explicitly disclaimed in
+individual files.
+
+[para] The authors hereby grant permission to use, copy, modify, distribute, and license
+this software and its documentation for any purpose, provided that existing copyright
+notices are retained in all copies and that this notice is included verbatim in any
+distributions. No written agreement, license, or royalty fee is required for any of the
+authorized uses.  Modifications to this software may be copyrighted by their authors and
+need not follow the licensing terms described here, provided that the new terms are
+clearly indicated on the first page of each file where they apply.
+
+[para] IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS
+SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+[para] THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND THE
+AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
+ENHANCEMENTS, OR MODIFICATIONS.
+
+[para] GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights" in the software and
+related documentation as defined in the Federal Acquisition Regulations (FARs) in Clause
+52.227.19 (c) (2).  If you are acquiring the software on behalf of the Department of
+Defense, the software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause 252.227-7014 (b) (3)
+of DFARs.  Notwithstanding the foregoing, the authors grant the U.S. Government and others
+acting in its behalf permission to use and distribute the software in accordance with the
+terms specified in this license.
+
+[include include/feedback.inc]
+[manpage_end]
+
diff --git a/src/vfs/critcl.vfs/doc/critcl_literals.man b/src/vfs/critcl.vfs/doc/critcl_literals.man
new file mode 100644
index 00000000..463224f6
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_literals.man
@@ -0,0 +1,166 @@
+[comment {-*- tcl -*- doctools manpage}]
+[vset literal_version 1.4]
+[manpage_begin critcl::literals n [vset literal_version]]
+[include include/module2.inc]
+[keywords singleton {Tcl Interp Association}]
+[keywords {string pool} {literal pool}]
+[titledesc {CriTcl - Code Gen - Constant string pools}]
+[require Tcl 8.6]
+[require critcl [opt 3.2]]
+[require critcl::literals [opt [vset literal_version]]]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+This document is the reference manpage for the
+[package critcl::literals] package. This package provides convenience
+commands for advanced functionality built on top of both critcl core
+and package [package critcl::iassoc].
+
+[para] Many packages will have a fixed set of string constants
+occuring in one or places. Most of them will be coded to create a new
+string [type Tcl_Obj*] from a C [type char*] every time the constant
+is needed, as this is easy to to, despite the inherent waste of
+memory.
+
+[para] This package was written to make declaration and management of
+string pools which do not waste memory as easy as the wasteful
+solution, hiding all attendant complexity from the user.
+
+[para] Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code.
+
+[para] This package resides in the Core Package Layer of CriTcl.
+[para][image arch_core][para]
+
+[comment {= = == === ===== ======== ============= =====================}]
+
+[section API]
+
+[list_begin definitions]
+[call [cmd ::critcl::literals::def] [arg name] [arg definition] [opt [arg mode]]]
+
+This command defines a C function with the given [arg name] which
+provides access to a pool of constant strings with a Tcl interpreter.
+
+[para] The [arg definition] dictionary provides the mapping from the
+C-level symbolic names to the string themselves.
+
+[para]
+The [arg mode]-list configures the output somewhat.
+The three allowed modes are [const c], [const +list] and [const tcl].
+All modes can be used together.
+The default mode is [const tcl].
+Using mode [const +list] implies [const tcl] as well.
+
+[para] For mode [const tcl] the new function has two arguments, a
+[type Tcl_Interp*] pointer refering to the interpreter holding the
+string pool, and a code of type "[arg name]_names" (see below), the
+symbolic name of the literal to return. The result of the function is
+a [type Tcl_Obj*] pointer to the requested string constant.
+
+[para] For mode [const c] the new function has one argument, a code of
+type "[arg name]_names" (see below), the symbolic name of the literal
+to return. The result of the function is a [type {const char*}]
+pointer to the requested string constant.
+
+[para] For mode [const +list] all of [const tcl] applies, plus an
+additional function is generated which takes three arguments, in
+order, a [type Tcl_Interp*] pointer refering to the interpreter
+holding the string pool, an [type int] holding the size of the last
+argument, and an array of type "[arg name]_names" holding the codes
+(see below), the symbolic names of the literals to return. The result
+of the function is a [type Tcl_Obj*] pointer to a Tcl list holding the
+requested string constants.
+
+[para] The underlying string pool is automatically initialized on
+first access, and finalized on interpreter destruction.
+
+[para] The package generates multiple things (declarations and
+definitions) with names derived from [arg name], which has to be a
+proper C identifier.
+
+[list_begin definitions]
+[def [arg name]]
+The mode [const tcl] function providing access to the string pool.
+
+Its signature is
+[para][example_begin]
+Tcl_Obj* [arg name] (Tcl_Interp* interp, [arg name]_names literal);
+[example_end]
+
+[def [arg name]_list]
+The mode [const +list] function providing multi-access to the string pool.
+
+Its signature is
+[para][example_begin]
+Tcl_Obj* [arg name]_list (Tcl_Interp* interp, int c, [arg name]_names* literal);
+[example_end]
+
+[def [arg name]_cstr]
+The mode [const c] function providing access to the string pool.
+
+Its signature is
+[para][example_begin]
+const char* [arg name]_cstr ([arg name]_names literal);
+[example_end]
+
+[def [arg name]_names]
+A C enumeration type containing the symbolic names of the strings
+provided by the pool.
+
+[def [arg name].h]
+A header file containing the declarations for the accessor functions
+and the enumeration type, for use by other parts of the system, if
+necessary.
+
+[para] The generated file is stored in a place where it will not
+interfere with the overall system outside of the package, yet also be
+available for easy inclusion by package files ([cmd csources]).
+
+[def [arg name]]
+[emph {New in version 1.1}]:
+
+For mode [const tcl] the command registers a new result-type for
+[cmd critcl::cproc] with critcl, which takes an integer result from
+the function and converts it to the equivalent string in the pool for
+the script.
+
+[list_end]
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section Example]
+
+The example shown below is the specification of the string pool pulled
+from the draft work on a Tcl binding to Linux's inotify APIs.
+
+[example {
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::buildrequirement {
+    package require critcl::literals
+}
+
+critcl::literals::def tcl_inotify_strings {
+    w_create	"create"
+    w_directory	"directory"
+    w_events	"events"
+    w_file	"file"
+    w_handler	"handler"
+    w_remove	"remove"
+} {c tcl}
+
+# Declarations: tcl_inotify_strings.h
+# Type:         tcl_inotify_strings_names
+# Accessor:     Tcl_Obj*    tcl_inotify_strings      (Tcl_Interp*               interp,
+#                                                     tcl_inotify_strings_names literal);
+# Accessor:     const char* tcl_inotify_strings_cstr (tcl_inotify_strings_names literal);
+# ResultType:   tcl_inotify_strings
+}]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback2.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_package.man b/src/vfs/critcl.vfs/doc/critcl_package.man
new file mode 100644
index 00000000..282a09c2
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_package.man
@@ -0,0 +1,47 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*- doctools manpage}]
+[comment {quadrant: reference}]
+[include pkg_version.inc]
+[manpage_begin critcl_package n [vset VERSION]]
+[include include/module.inc]
+[titledesc {CriTcl Package Reference}]
+[require Tcl 8.6]
+[require critcl [opt [vset VERSION]]]
+[require platform [opt 1.0.2]]
+[require md5 [opt 2]]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+The [package critcl] package is the core of the system.  For an overview of the
+complete system, see [manpage {Introduction To CriTcl}].  For the usage of the
+standalone [cmd critcl] program, see [manpage {CriTcl Application}].
+
+This core package maybe be used to embed C code into Tcl scripts.  It also
+provides access to the internals that other parts of the core use and which
+are of interest to those wishing to understand the internal workings of the
+core and of the API it provides to the [manpage {CriTcl Application}].  These
+advanced sections are marked as such so that those simply wishing to use the
+package can skip them.
+
+
+[para]
+
+This package resides in the Core Package Layer of CriTcl.
+
+[para][image arch_core][para]
+
+[comment {= = == === ===== ======== ============= =====================}]
+
+[section API]		[include include/api.inc]
+[section {Concepts}]	[include include/concepts.inc]
+
+[comment {= = == === ===== ======== ============= =====================}]
+
+[section Examples]
+
+See section "Embedding C" in [manpage {Using CriTcl}].
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_tcl9.man b/src/vfs/critcl.vfs/doc/critcl_tcl9.man
new file mode 100644
index 00000000..7dd747f7
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_tcl9.man
@@ -0,0 +1,187 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*- doctools manpage}]
+[comment {quadrant: reference}]
+[include pkg_version.inc]
+[manpage_begin critcl_tcl9 n [vset VERSION]]
+[include include/module.inc]
+[titledesc {How To Adapt Critcl Packages for Tcl 9}]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+This guide contains notes and actions to take by writers of [vset critcl]-based
+packages to make their code workable for both Tcl 8.6 and 9.
+
+[comment {= = == === ===== ======== ============= =====================}]
+
+[list_begin enumerated]
+
+[enum] Generally, if there is no interest in moving to Tcl 9, i.e. Tcl 8.[lb]456[rb]
+       are the only supported runtimes, then just keep using [vset critcl] [const 3.2].
+
+[para] The remainder of this document can be ignored.
+
+[enum] Use [vset critcl] version [vset VERSION] [strong {if, and only if}]
+       Tcl 9 support is wanted.
+
+[para] With some work this will then also provide backward compatibility with Tcl 8.6.
+
+[enum] Header [file tcl.h]
+
+[para] Replace any inclusion of Tcl's public [file tcl.h] header file in the package's
+       C code with the inclusion of [vset critcl]'s new header file [file tclpre9compat.h].
+
+[para] This includes [file tcl.h] and further provides a set of compatibility definitions
+       which make supporting both Tcl 8.6 and Tcl 9 in a single code base easier.
+
+[para] The following notes assume that this compatibility layer is in place.
+
+[enum] [cmd critcl::tcl]
+
+[para] Before [vset critcl] [vset VERSION] a single default ([const 8.4]) was used for
+       the minimum Tcl version, to be overriden by an explicit [cmd critcl::tcl] in the
+       package code.
+
+[para] Now the default is dynamic, based on the [strong runtime] version, i.e.
+       [cmd {package provide Tcl}], [vset critcl] is run with/on.
+
+[para] When running on Tcl 9 the new default is version [const 9], and [const 8.6] else.
+       [strong Note] how this other default was bumped up from [const 8.4].
+
+[para] As a consequence it is possible to
+
+[list_begin enumerated]
+
+[enum] Support just Tcl 8.4+, 8.5+, by having an explicit [cmd {critcl::tcl 8.x}] in
+       the package code.
+
+[para] [strong {Remember however}], it is better to simply stick with
+       [vset critcl] [const 3.2] for this.
+
+[enum] Support just Tcl 9 by having an explicit [cmd {critcl::tcl 9}] in the package code.
+
+[enum] Support both Tcl 8.6 and Tcl 9 (but not 8.4/8.5) by leaving [cmd critcl::tcl] out of the code
+       and using the proper [syscmd tclsh] version to run [vset critcl] with.
+[list_end]
+
+[enum] Code checking
+
+[para] [vset critcl] [vset VERSION] comes with a very basic set of code checks pointing
+       out places where compatibility might or will be an issue.
+
+[para] The implementation checks all inlined C code declared by [cmd critcl::ccode],
+       [cmd critcl::ccommand], [cmd critcl::cproc] (and related/derived commands), as well
+       as the C companion files declared with [cmd critcl::csources].
+
+[para] It is very basic because it simply greps the code line by line for a number
+       of patterns and reports on their presence. The C code is not fully parsed.
+       The check can and will report pattern found in C code comments, for example.
+
+[para] The main patterns deal with functions affected by the change to [type Tcl_Size],
+       the removal of old-style interpreter state handling, and command creation.
+
+[para] A warning message is printed for all detections.
+
+[para] This is disabled for the [const Tcl_Size]-related pattern if the line also matches
+       the pattern [const {*OK tcl9*}].
+
+[para] In this way all places in the code already handled can be marked and excluded
+       from the warnings.      
+
+[list_begin enumerated]
+
+[enum] Interpreter State handling
+
+[para] Tcl 9 removed the type [type Tcl_SavedResult] and its associated functions
+       [fun Tcl_SaveResult], [fun Tcl_RestoreResult], and [fun Tcl_DiscardResult].
+
+[para] When a package uses this type and the related functions a rewrite is necessary.
+
+[para] With Tcl 9 use of type [type Tcl_InterpState] and its functions
+       [fun Tcl_SaveInterpState], [fun Tcl_RestoreInterpState], and
+       [fun Tcl_DiscardInterpState] is now required.
+
+[para] As these were introduced with Tcl 8.5 the rewrite gives us compatibility with
+       Tcl 8.6 for free.
+
+[enum] [type Tcl_Size]
+
+[para] One of the main changes introduced with Tcl 9 is the breaking of the 2G barrier
+       for the number of bytes in a string, elements in a list, etc.
+
+       In a lot of interfaces [type int] was replaced with [type Tcl_Size], which is
+       effectively [type ptrdiff_t] behind the scenes.
+
+[para] The [file tclpre9compat.h] header mentioned above provides a suitable definition
+       of [type Tcl_Size] for [const 8.6], i.e. maps it to [type int].
+
+       This enables the package code to use [type Tcl_Size] everywhere and still have it
+       work for both Tcl 8.6 and 9.
+
+[para] It is of course necessary to rewrite the package code to use [type Tcl_Size].
+
+[para] The checker reports all lines in the C code using a function whose signature
+       was changed to use [type Tcl_Size] over [type int].
+
+[para] Note that it is necessary to manually check the package code for places where
+       a [const %d] text formatting specification should be replaced with
+       [const TCL_SIZE_FMT].
+
+[para] I.e. all places where [type Tcl_Size] values are formatted with [fun printf]-style
+       functions a formatting string [example {"... %d ..."}] has to be replaced with
+       [example {"... " TCL_SIZE_FMT " ..."}]
+
+[para] The macro [cmd TCL_SIZE_FMT] is defined by Critcl's compatibility layer, as an
+       extension of the [cmd TCL_SIZE_MODIFIER] macro which only contains the
+       formatting modifier to insert into a plain [const %d] to handle [type Tcl_Size]
+       values.
+
+[para] [strong Note] how the original formatting string is split into multiple strings.
+       The C compiler will fuse these back together into a single string.
+
+[enum] Command creation.
+
+[para] This is technically a part of the [type Tcl_Size] changes.
+
+[para] All places using [fun Tcl_CreateObjCommand] have to be rewritten to use
+       [fun Tcl_CreateObjCommand2] instead, and the registered command functions
+       to use [type Tcl_Size] for their [arg objc] argument.
+
+[para] The [file tclpre9compat.h] header maps this back to the old function
+       when compilation is done against Tcl 8.6.
+
+[para] [vset critcl] does this itself for the commands created via [cmd critcl::ccommand],
+       [cmd critcl::cproc], and derived places ([package critcl::class]).
+
+[enum] TIP 494. This TIP adds three semantic constants wrapping [const -1] to Tcl 9 to
+       make the meaning of code clearer. As part of this it also casts the constant to the
+       proper type. They are:
+
+[list_begin itemized]
+[item] [const TCL_IO_FAILURE]
+[item] [const TCL_AUTO_LENGTH]
+[item] [const TCL_INDEX_NONE]
+[list_end]
+
+[para] Critcl's compatibility layer provides the same constants to Tcl 8.6.
+
+[para] Critcl's new checker highlights places where [const TCL_AUTO_LENGTH] is suitable.
+
+[para] Doing this for the other two constants looks to require deeper and proper parsing
+       of C code, which the checker does not do.
+
+[list_end]
+[list_end]
+
+[section {Additional References}]
+[list_begin enumerated]
+[enum] [uri https://wiki.tcl-lang.org/page/Porting+extensions+to+Tcl+9]
+[enum] [uri https://wiki.tcl-lang.org/page/Tcl+9+functions+using+Tcl%5FSize]
+[enum] [uri https://core.tcl-lang.org/tcl/wiki?name=Migrating%20scripts%20to%20Tcl%209]
+[enum] [uri https://core.tcl-lang.org/tcl/wiki?name=Migrating%20C%20extensions%20to%20Tcl%209]
+[list_end]
+
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/critcl_util.man b/src/vfs/critcl.vfs/doc/critcl_util.man
new file mode 100644
index 00000000..4ed71624
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/critcl_util.man
@@ -0,0 +1,87 @@
+[comment {-*- tcl -*- doctools manpage}]
+[vset version 1.2]
+[manpage_begin critcl::util n [vset version]]
+[include include/module2.inc]
+[titledesc {CriTcl - Utilities}]
+[require Tcl 8.6]
+[require critcl [opt 3.2]]
+[require critcl::util [opt  [vset version]]]
+[description]
+[para]
+[include include/welcome.inc]
+[para]
+
+This document is the reference manpage for the [package critcl::util]
+package. This package provides convenience commands for advanced
+functionality built on top of the core.
+
+Its intended audience are mainly developers wishing to write Tcl
+packages with embedded C code.
+[para]
+
+This package resides in the Core Package Layer of CriTcl.
+[para][image arch_core][para]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[section API]
+
+[list_begin definitions]
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd ::critcl::util::checkfun] [arg name] [opt [arg label]]]
+
+This command checks the build-time environment for the existence of
+the C function [arg name].
+
+It returns [const true] on success, and [const false] otherwise.
+
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd ::critcl::util::def] [arg path] [arg define] [opt [arg value]]]
+
+This command extends the specified configuration file [arg path] with a
+[const \#define] directive for the named [arg define]. If the [arg value]
+is not specified it will default to [const 1].
+
+[para] The result of the command is an empty string.
+
+[para] Note that the configuration file is maintained in the [cmd critcl::cache]
+directory.
+
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd ::critcl::util::undef] [arg path] [arg define]]
+
+This command extends the specified configuration file [arg path] with an
+[const \#undef] directive for the named [arg define].
+
+[para] The result of the command is an empty string.
+
+[para] Note that the configuration file is maintained in the [cmd critcl::cache]
+directory.
+
+
+[comment {* * ** *** ***** ******** ************* *********************}]
+[call [cmd ::critcl::util::locate] [arg label] [arg paths] [opt [arg cmd]]]
+
+This command checks the build-time environment for the existence of a file
+in a set of possible [arg paths].
+
+[para] If the option [arg cmd] prefix is specified it will be called with
+the full path of a found file as its only argument to perform further checks.
+A return value of [const false] will reject the path and continue the search.
+
+[para] The return value of the command is the found path, as listed in
+[arg paths]. As a side effect the command will also print the found path,
+prefixed with the [arg label], using [cmd critcl::msg].
+
+[para] Failure to find the path is reported via [cmd critcl::error], and a
+possible empty string as the result, if [cmd critcl::error] does not
+terminate execution.
+
+[vset relative_path]
+
+[list_end]
+
+[comment {= = == === ===== ======== ============= =====================}]
+[include include/feedback2.inc]
+[manpage_end]
diff --git a/src/vfs/critcl.vfs/doc/figures/arch_application.dia b/src/vfs/critcl.vfs/doc/figures/arch_application.dia
new file mode 100644
index 00000000..22ea2259
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/figures/arch_application.dia
@@ -0,0 +1,4 @@
+# -*- tcl -*- tcl.tk//DSL diagram//EN//1.0
+set mark 0
+source [file join [file dirname [file normalize [info script]]] architecture.dia]
+return
diff --git a/src/vfs/critcl.vfs/doc/figures/arch_application.png b/src/vfs/critcl.vfs/doc/figures/arch_application.png
new file mode 100644
index 00000000..2f732c83
Binary files /dev/null and b/src/vfs/critcl.vfs/doc/figures/arch_application.png differ
diff --git a/src/vfs/critcl.vfs/doc/figures/arch_application.txt b/src/vfs/critcl.vfs/doc/figures/arch_application.txt
new file mode 100644
index 00000000..5b455099
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/figures/arch_application.txt
@@ -0,0 +1,18 @@
+*================*
+|Applications    |
+| critcl         |
+| critcl::app    |
+*================*
+
++----------------+
+|Core Packages   |
+| critcl         |
+| critcl::util   |
++----------------+
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  ...           |
++----------------+
diff --git a/src/vfs/critcl.vfs/doc/figures/arch_core.dia b/src/vfs/critcl.vfs/doc/figures/arch_core.dia
new file mode 100644
index 00000000..a9090b00
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/figures/arch_core.dia
@@ -0,0 +1,4 @@
+# -*- tcl -*- tcl.tk//DSL diagram//EN//1.0
+set mark 1
+source [file join [file dirname [file normalize [info script]]] architecture.dia]
+return
diff --git a/src/vfs/critcl.vfs/doc/figures/arch_core.png b/src/vfs/critcl.vfs/doc/figures/arch_core.png
new file mode 100644
index 00000000..4ae56a7d
Binary files /dev/null and b/src/vfs/critcl.vfs/doc/figures/arch_core.png differ
diff --git a/src/vfs/critcl.vfs/doc/figures/arch_core.txt b/src/vfs/critcl.vfs/doc/figures/arch_core.txt
new file mode 100644
index 00000000..fcd81b03
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/figures/arch_core.txt
@@ -0,0 +1,18 @@
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
+*================*
+|Core Packages   |
+| critcl         |
+| critcl::util   |
+*================*
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  ...           |
++----------------+
diff --git a/src/vfs/critcl.vfs/doc/figures/arch_support.dia b/src/vfs/critcl.vfs/doc/figures/arch_support.dia
new file mode 100644
index 00000000..ac1e034c
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/figures/arch_support.dia
@@ -0,0 +1,4 @@
+# -*- tcl -*- tcl.tk//DSL diagram//EN//1.0
+set mark 2
+source [file join [file dirname [file normalize [info script]]] architecture.dia]
+return
diff --git a/src/vfs/critcl.vfs/doc/figures/arch_support.png b/src/vfs/critcl.vfs/doc/figures/arch_support.png
new file mode 100644
index 00000000..bee761f2
Binary files /dev/null and b/src/vfs/critcl.vfs/doc/figures/arch_support.png differ
diff --git a/src/vfs/critcl.vfs/doc/figures/arch_support.txt b/src/vfs/critcl.vfs/doc/figures/arch_support.txt
new file mode 100644
index 00000000..4d0e8458
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/figures/arch_support.txt
@@ -0,0 +1,18 @@
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
++----------------+
+|Core Packages   |
+| critcl         |
+| critcl::util   |
++----------------+
+
+*================*
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  ...           |
+*================*
diff --git a/src/vfs/critcl.vfs/doc/figures/architecture.dia b/src/vfs/critcl.vfs/doc/figures/architecture.dia
new file mode 100644
index 00000000..e77d0680
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/figures/architecture.dia
@@ -0,0 +1,38 @@
+# -*- tcl -*- tcl.tk//DSL diagram//EN//1.0
+# Parser Tools Architecture Diagram
+
+set counter 0
+if {![info exists mark]} { set mark -1 }
+
+proc xbox {args} {
+    variable mark
+    variable counter
+
+    if {$mark == $counter} {
+	lappend args color red stroke 2
+    }
+    incr counter
+    return [uplevel 1 [list box {*}$args]]
+}
+
+proc area {label args} {
+    set E [xbox fillcolor lightyellow {*}$args]
+    group {
+	text text $label with nw at [last box nw]
+    }
+    return $E
+}
+
+down
+set boxwidth [90 mm]
+set movelength [5 mm]
+
+set A [area Applications]
+move
+set C [area "Core Packages"]
+move
+set S [area "Support Packages"]
+
+text at $A "critcl\ncritcl::app"
+text at $C "critcl\ncritcl::util"
+text at $S "stubs::*, md5, platform ..."
diff --git a/src/vfs/critcl.vfs/doc/figures/architecture.png b/src/vfs/critcl.vfs/doc/figures/architecture.png
new file mode 100644
index 00000000..dacfeb47
Binary files /dev/null and b/src/vfs/critcl.vfs/doc/figures/architecture.png differ
diff --git a/src/vfs/critcl.vfs/doc/figures/architecture.txt b/src/vfs/critcl.vfs/doc/figures/architecture.txt
new file mode 100644
index 00000000..69fdf3c6
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/figures/architecture.txt
@@ -0,0 +1,18 @@
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
++----------------+
+|Core Packages   |
+| critcl         |
+| critcl::util   |
++----------------+
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  ...           |
++----------------+
diff --git a/src/vfs/critcl.vfs/doc/include/advert.inc b/src/vfs/critcl.vfs/doc/include/advert.inc
new file mode 100644
index 00000000..8b61866f
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/advert.inc
@@ -0,0 +1,5 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[para] [vset slogan]
+[para] Improve performance by rewriting the performance bottlenecks in C.
+[para] Import the functionality of shared libraries into Tcl scripts.
diff --git a/src/vfs/critcl.vfs/doc/include/aoptions.inc b/src/vfs/critcl.vfs/doc/include/aoptions.inc
new file mode 100644
index 00000000..9c39f2bd
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/aoptions.inc
@@ -0,0 +1,327 @@
+
+[vset teaignored "
+[para]
+Ignored when generating a TEA package
+(see option [option -tea] below).
+"]
+
+[vset validated_on_build "
+[para] Validated only if one of the input files for the [vset critcl_script]
+actually defines and uses a custom build configuration option with that
+[arg name].
+"]
+
+
+The following options are understood:
+
+[list_begin options]
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -v]
+[opt_def --version]
+
+Print the version to [const stdout] and exit.
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -I path]
+
+Arranges for the compiler to search [arg path] for headers.
+[vset cumulative_opt]
+
+[vset teaignored]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -L path]
+
+Arranges for the linker to search [arg path].
+[vset cumulative_opt]
+
+[vset teaignored]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -cache path]
+
+Sets [arg path] as the directory to use as the result cache. The default is
+[file ~/.critcl/<platform>], or [file ~/.critcl/<pid>.<epoch>] when generating
+a package.  See option [option -pkg], below.
+
+[vset teaignored]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -clean]
+
+Arranges for all files and directories in the result cache to be deleted before
+compilation begins.
+
+[para] Ignored when generating a package because this mode starts out with a
+unique and empty result cache.  See option [option -pkg], below.
+
+[vset teaignored]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -config path]
+
+Provides a custom configuration file.  By default a configuration included in
+the system core is used.
+
+When specified multiple times the last value is used.
+
+[vset teaignored]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -debug mode]
+
+Activates one of the following debugging modes:
+
+
+[list_begin definitions]
+[def [const memory]]
+
+Track and report memory allocations made by the Tcl core.
+
+[def [const symbols]]
+
+Compile all [file .c] files with debugging symbols.
+
+[def [const all]]
+
+Both [const memory] and [const symbols].
+
+[list_end]
+
+[vset teaignored]
+
+[vset cumulative_opt]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -disable name]
+
+Sets the value of the custom build configuration option
+[arg name] to [const false]. It is equivalent to "-with-[arg name] 0".
+
+[vset validated_on_build]
+
+[vset teaignored]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -enable name]
+
+Sets the value of the custom build configuration option
+[arg name] to [const true]. It is equivalent to "-with-[arg name] 1".
+
+[vset validated_on_build]
+
+[vset teaignored]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -force]
+
+Forces compilation even if a shared library for the file already exists.
+Unlike cleaning the cache, this is lazy in the destruction of files and only
+affects relevant files.
+
+[para] Ignored when generating a package (see option [option -pkg], below),
+which starts out with a unique and empty result cache.
+
+[vset teaignored]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -help]
+
+Prints a short description of command line syntax and options and then exits
+the application.
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -keep]
+
+Causes the system to cache compiled [file .c] files.
+
+Also prevents the deletion of the unique result cache used by the run when
+generating a package (see option [option -pkg] below),
+
+Intended for debugging of [cmd critcl] itself, where it may be necessary to
+inspect the generated C code.
+
+[vset teaignored]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -libdir directory]
+
+Adds [arg directory] to the list of directories the linker searches for
+libraries in (like [option -L]).  With [option -pkg], generated packages are
+saved in [arg directory].
+
+When specified multiple times the last value is used.
+
+The default is [file lib], resolved relative to the current working directory.
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -includedir directory]
+
+Adds [arg directory] to the list of directories the compiler searches for
+headers in. With [option -pkg], generated header files are saved in
+[arg directory].
+
+[vset cumulative_opt]
+
+The last value is used as the destination for generated header files.
+
+The default is the relative directory [file include], resolved relative to the
+current working directory.
+
+[vset teaignored]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -pkg]
+
+Generates a package from the [vset critcl_script] files.  Input files are
+processed first as usual, but are then bundled into a single library, with
+additional generated files to form the library into a standard Tcl package.
+
+[para]
+
+generation. If both options, i.e. [option -pkg] and [option -tea] are
+specified the last one specified wins.
+
+[para]
+
+Options [option -clean] and [option -force] are ignored. [option -libdir] is
+relevant in both this and [option -tea] mode.
+
+[para]
+
+[vset pkg_namerules]
+
+
+[para] Examples:
+
+[example {
+	... -pkg ... foo
+
+	=> Package name is: foo
+	=> Input file is:   foo.tcl
+}]
+
+[example {
+	... -pkg ... foo bar.tcl
+
+	=> Package name is: foo
+	=> Input file is:   bar.tcl
+}]
+
+[example {
+	... -pkg ... foo.tcl
+
+	=> Package name is: foo
+	=> Input file is:   foo.tcl
+}]
+
+[example {
+	... -pkg ... foo.so bar.tcl
+
+	=> Package name is: foo
+	=> Input file is:   bar.tcl
+}]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -show]
+
+Prints the configuration of the chosen target to [const stdout] and then exits.
+
+Set [option -target], below.
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -showall]
+
+Prints the whole chosen configuration file to [const stdout] and then exits.
+
+See [option -config], above.
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -target name]
+
+Overrides the default choice of build target.
+
+Only the last occurrence of this option is used.
+
+The named target must exist in the chosen configuration file.
+
+Use [option -targets] (see below) to get a list of the
+acceptable targets.
+
+Use [option -config] to select the configuration file.
+
+[vset teaignored]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -targets]
+
+Prints the list of all known targets from the chosen configuration file to
+[const stdout] and then exits.
+
+Use [option -config] to select the configuration file.
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -tea]
+
+Like [option -pkg], except no binaries are generated. Creates a directory
+hierarchy containing the [vset critcl_script], its companion files, and a
+TEA-conformant build system with most of the needed support code, including
+copies of the critcl packages.
+
+[para]
+
+If both [option -pkg] and [option -tea] are specified the last occurrence wins.
+
+[para]
+
+[option -I], [option -L], [option -clean],
+[option -force], [option -cache], [option -includedir], [option -enable],
+[option -disable], and [option -with-[var FOO]] are
+ignored. In contrast, the option [option -libdir] is relevant in both
+this and [option -pkg] mode.
+
+[para] [vset pkg_namerules]
+
+[para] Examples:
+
+[example {
+	... -tea ... foo
+
+	=> Package name is: foo
+	=> Input file is:   foo.tcl
+}]
+
+[example {
+	... -tea ... foo bar.tcl
+
+	=> Package name is: foo
+	=> Input file is:   bar.tcl
+}]
+
+[example {
+	... -tea ... foo.tcl
+
+	=> Package name is: foo
+	=> Input file is:   foo.tcl
+}]
+
+[example {
+	... -tea ... foo.so bar.tcl
+
+	=> Package name is: foo
+	=> Input file is:   bar.tcl
+}]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[opt_def -with-[var name] value]
+
+This option sets the value of the custom build configuration option
+[arg name] to [arg value].
+
+[para] The information is validated only if one of the [file .critcl]
+input files actually defines and uses a custom build configuration
+option with that [arg name].
+
+[vset teaignored]
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/api.inc b/src/vfs/critcl.vfs/doc/include/api.inc
new file mode 100644
index 00000000..2f9b597f
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api.inc
@@ -0,0 +1,33 @@
+
+A short note ahead of the documentation: Instead of repeatedly talking
+about
+"a Tcl script with embbedded C code", or
+"a Tcl script containing CriTcl commands",
+we call such a script a [vset critcl_script].  A file containing a
+[vset critcl_script] usually has the extension [const .tcl] or
+[const .critcl].
+
+[comment {
+	Uncompleted docs for
+
+	config -I ... - describe the options ...
+
+	Undocumented commands ...
+
+	c++command	-
+}]
+
+[subsection {Embedded C Code}]			[include include/api_embedc.inc]
+[subsection {Stubs Table Management}]		[include include/api_stubs.inc]
+[subsection {Package Meta Data}]		[include include/api_meta.inc]
+[subsection {Control & Interface}]		[include include/api_control.inc]
+[subsection {Introspection}]			[include include/api_introspection.inc]
+[subsection {Build Management}]			[include include/api_bmgmt.inc]
+[subsection {Result Cache Management}]		[include include/api_rcache.inc]
+[subsection {Build Configuration}]		[include include/api_bconfig.inc]
+[subsection {Tool API}]				[include include/api_tools.inc]
+[subsection {Advanced: Embedded C Code}]	[include include/api_aembedc.inc]
+[subsection {Custom Build Configuration}]	[include include/api_cbconfig.inc]
+[subsection {Advanced: Location management}]	[include include/api_location.inc]
+[subsection {Advanced: Diversions}]		[include include/api_diversions.inc]
+[subsection {Advanced: File Generation}]	[include include/api_generation.inc]
diff --git a/src/vfs/critcl.vfs/doc/include/api_aembedc.inc b/src/vfs/critcl.vfs/doc/include/api_aembedc.inc
new file mode 100644
index 00000000..9e212cc7
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_aembedc.inc
@@ -0,0 +1,61 @@
+
+For advanced use, the following commands used by [cmd critcl::cproc] itself are
+exposed.
+
+[vset given_cmd "Given an argument declaration as documented for [cmd critcl::cproc],"]
+
+[list_begin definitions]
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::argnames] [arg arguments]]
+
+[vset given_cmd] returns a list of the corresponding user-visible names.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::argcnames] [arg arguments]]
+
+[vset given_cmd] returns a list of the corresponding C variable names for the
+user-visible names. The names returned here match the names used in the
+declarations and code returned by [cmd ::critcl::argvardecls] and
+[cmd ::critcl::argconversion].
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::argcsignature] [arg arguments]]
+
+[vset given_cmd] returns a list of the corresponding C parameter declarations.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::argvardecls] [arg arguments]]
+
+[vset given_cmd] returns a list of the corresponding C variable declarations.
+The names used in these declarations match the names returned by
+[cmd ::critcl::argcnames].
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::argconversion] [arg arguments] [opt [arg n]]]
+
+[vset given_cmd] returns a list of C code fragments converting the user visible
+arguments found in the declaration from Tcl_Obj* to C types. The names used in
+these statements match the names returned by [cmd ::critcl::argcnames].
+
+[para] The generated code assumes that the procedure arguments start
+at index [arg n] of the [var objv] array.  The default is [const 1].
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::argoptional] [arg arguments]]
+
+[vset given_cmd] returns a list of boolean values indicating which arguments
+are optional ([const true]), and which are not ([const false]).
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::argdefaults] [arg arguments]]
+
+[vset given_cmd] returns a list containing the default values for all optional
+arguments.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::argsupport] [arg arguments]]
+
+[vset given_cmd] returns a list of C code fragments needed to define the
+necessary supporting types.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/api_bconfig.inc b/src/vfs/critcl.vfs/doc/include/api_bconfig.inc
new file mode 100644
index 00000000..46d7a88d
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_bconfig.inc
@@ -0,0 +1,57 @@
+
+The following commands manage the build configuration, i.e. the per-platform
+information about compilers, linkers, and their commandline options.
+
+[vset not_needed_for_critcl_script]
+
+[list_begin definitions]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::readconfig] [arg path]]
+
+Reads the build configuration file at [arg path] and configures the package
+using the information for the target platform.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::showconfig] [opt [arg chan]]]
+
+Converts the active build configuration into a human-readable string and
+returns it, or if [arg chan] is provided prints the result to that channel.
+
+[comment {
+    As a package it would be IMHO better to have these command only
+    return the necessary internal data, and have the application
+    higher up do the formatting.
+}]
+
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::showallconfig] [opt [arg chan]]]
+
+Converts the set of all known build configurations from the currently active
+build configuration file last set with [cmd critcl::readconfig] into a string
+and returns it, or if [arg chan] is provided, prints it to that channel.
+
+[comment {
+    As a package it would be IMHO better to have these command only
+    return the necessary internal data, and have the application
+    higher up do the formatting.
+}]
+
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::chooseconfig] [arg target] [opt [arg nomatcherr]]]
+
+Matches [arg target] against all known targets, returning a list containing
+all the matching ones. This search is first done on an exact basis, and then
+via glob matching. If no known target matches the argument the default is to
+return an empty list. However, if the boolean [arg nomatcherr] is specified and
+set an error is thrown using [cmd critcl::error] instead.
+
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::setconfig] [arg target]]
+
+Configures the package to use the settings of [arg target].
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/api_bmgmt.inc b/src/vfs/critcl.vfs/doc/include/api_bmgmt.inc
new file mode 100644
index 00000000..3a973bc2
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_bmgmt.inc
@@ -0,0 +1,79 @@
+
+The following command manages global settings, i.e. configuration options which
+are independent of any [vset critcl_script].
+
+[para] This command should not be needed to write a [vset critcl_script]. It is
+a management command which is only useful to the [manpage {CriTcl Application}]
+or similar tools.
+
+[list_begin definitions]
+
+[call [cmd ::critcl::config] [arg option] [opt [arg val]]]
+
+Sets and returns the following global configuration options:
+
+[list_begin options]
+[opt_def force bool]
+
+When [const false] (the default), the C files are not built if there is a
+cached shared library.
+
+[opt_def lines bool]
+
+When [const true] (the default), #line directives are embedded into the
+generated C code.
+
+[include rq_cline.inc]
+
+[para] Developers of higher-level packages generating their own C
+code, either directly or indirectly through critcl, should
+also read section [sectref {Advanced: Location management}] to see how
+critcl helps them in generating their directives.
+
+Examples of such packages come with critcl itself. See
+[package critcl::iassoc] and [package critcl::class].
+
+[opt_def trace bool]
+
+When [const false] (the default), no code tracing the entry and exit of
+CriTcl-backed commands in the [vset critcl_script] is inserted.  Insertion of
+such code implicitly activates the tracing facility in general.  See
+[package critcl::cutil].
+
+[opt_def I path]
+
+A single global include path to use for all files. Not set by default.
+
+[opt_def combine enum]
+[list_begin definitions]
+[def "[const dynamic] (the default)"]
+
+Object files have the suffix [const _pic].
+
+[def [const static]]
+
+Object files have the suffix [const _stub].
+
+[def [const standalone]]
+
+Object files have no suffix, and the generated C files are compiled
+without using Tcl/Tk stubs. The result are object files usable for
+static linking into a [term {big shell}].
+
+[list_end]
+
+
+[opt_def language string]
+[opt_def keepsrc bool]
+
+When [const false] (the default), the generated [file .c]
+files are deleted after the [file .o] files have been built.
+
+
+[opt_def outdir directory]
+
+The directory where to place a generated shared library. By default, it is
+placed into the [sectref {Result Cache}].
+
+[list_end]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/api_cbconfig.inc b/src/vfs/critcl.vfs/doc/include/api_cbconfig.inc
new file mode 100644
index 00000000..5a828651
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_cbconfig.inc
@@ -0,0 +1,66 @@
+
+This package provides one command for the management of
+package-specific, i.e. developer-specified custom build configuration
+options.
+
+[list_begin definitions]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::userconfig] [method define] [arg name] [arg description] [arg type] [opt [arg default]]]
+
+This command defines custom build configuration option, with
+[arg description], [arg type] and optional [arg default] value.
+
+[para] The type can be either [const bool], or a list of values.
+
+[list_begin enumerated]
+[enum] For [const bool] the default value, if specified, must be a
+boolean. If it is not specified it defaults to [const true].
+
+[enum] For a list of values the default value, if specified, must be a
+value found in this list. If it is not specified it defaults to the
+first value of the list.
+
+[list_end]
+
+[para] The [arg description] serves as in-code documentation of the
+meaning of the option and is otherwise ignored. When generating a TEA
+wrapper the description is used for the [syscmd configure] option
+derived from the option declared by the command.
+
+[para] A boolean option [var FOO] are translated into a pair of
+configure options, [option --enable-[var FOO]] and
+[option --disable-[var FOO]], whereas an option whose [arg type] is a
+list of values is translated into a single configure option
+[option --with-[var FOO]].
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::userconfig] [method query] [arg name]]
+
+This command queries the database of custom build configuration option
+for the current [file .critcl] file and returns the chosen value.
+This may be the default if no value was set via
+[cmd {::critcl::userconfig set}].
+
+[para] It is at this point that definitions and set values are brought
+together, with the latter validated against the definition.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::userconfig] [method set] [arg name] [arg value]]
+
+This command is for use by a tool, like the [syscmd critcl] application,
+to specify values for custom build configuration options.
+
+[para] At the time this command is used only the association between
+option name and value is recorded, and nothing else is done. This
+behaviour is necessary as the system may not know if an option of the
+specified name exists when the command is invoked, nor its type.
+
+[para] Any and all validation is defered to when the value of an
+option is asked for via [cmd {::critcl::userconfig query}].
+
+[para] This means that it is possible to set values for any option we
+like, and the value will take effect only if such an option is both
+defined and used later on.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/api_control.inc b/src/vfs/critcl.vfs/doc/include/api_control.inc
new file mode 100644
index 00000000..812658f3
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_control.inc
@@ -0,0 +1,161 @@
+
+These commands control the details of compilation and linking a
+[vset critcl_script].  The information is used only to compile/link the
+object for the [vset critcl_script].  For example, information for
+[file FOO.tcl] is kept separate from information for [file BAR.tcl].
+
+[list_begin definitions]
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::cheaders] [opt [arg arg]...]]
+
+Provides additional header locations.
+
+[para] Each argument is a glob pattern.  If an argument begins with [const -]
+it is an argument to the compiler.  Otherwise the parent directory of each
+matching path is a directory to be searched for header files.  Returns an
+error if a pattern matches no files.
+
+[vset relative_pattern]
+
+[para] [const {#include}] lines are not automatically generated for matching
+header files.  Use [cmd critcl::include] or [cmd critcl::ccode] as necessary to
+add them.
+
+[para] [vset cumulative]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::csources] [opt [arg {glob pattern}]...]]
+
+Matching paths become inputs to the compilation of the current object
+along with the sources for the current [vset critcl_script].  Returns an
+error if no paths match a pattern.
+
+[vset relative_pattern]
+
+[para] [vset cumulative]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::clibraries] [opt [arg {glob pattern}]...]]
+
+provides the link step with additional libraries and library locations.
+
+A [arg {glob pattern}] that begins with [const -] is added as an argument to
+the linker.  Otherwise matching files are linked into the shared library.
+Returns an error if no paths match a pattern.
+
+[vset relative_pattern]
+
+[para] [vset cumulative]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::source] [arg {glob pattern}]]
+
+Evaluates as scripts the files matching each [arg {glob pattern}].  Returns an
+error if there are no matching files.
+
+[vset relative_pattern]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::tsources] [arg {glob pattern}]...]
+
+Provides the information about additional Tcl script files to source when the
+shared library is loaded.
+
+[para] Matching paths are made available to the generated shared library when
+it is loaded for the current [vset critcl_script].  Returns an error if a
+pattern matches no files.
+
+[vset relative_pattern]
+
+[para] [vset cumulative]
+
+[para] After the shared library has been loaded, the declared files are sourced
+in the same order that they were provided as arguments.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::owns] [arg {glob pattern}]...]
+
+Ignored in "compile and run" and "generate package" modes.
+
+In "generate TEA" mode each file matching a [arg {glob pattern}] is a file to
+be included in the TEA extension but that could not be ascertained as such from
+previous commands like [cmd critcl::csources] and [cmd critcl::tsources],
+either because of they were specified dynamically or because they were directly
+sourced.
+
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::cflags] [opt [arg arg]...]]
+
+[para] Each [arg arg] is an argument to the compiler.
+
+[para] [vset cumulative]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::ldflags] [opt [arg arg]...]]
+
+[para] Each [arg arg] is an argument to the linker.
+
+[para] [vset cumulative]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::framework] [opt [arg arg]...]]
+
+Each [arg arg] is the name of a framework to link on MacOS X.  This command is
+ignored if OS X is not the target so that frameworks can be specified
+unconditionally.
+
+[para] [vset cumulative]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::tcl] [arg version]]
+
+Specifies the minimum version of the Tcl runtime
+to compile and link the package for.  The default is [const 8.4].
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::tk]]
+
+Arranges to include the Tk headers and link to the Tk stubs.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::preload] [arg lib]...]
+
+Arranges for the external shared library [arg lib] to be loaded
+before the shared library for the [vset critcl_script] is loaded.
+
+[para] [vset cumulative]
+
+[para][include preload_search.inc]
+
+[comment {
+	XXX preload - compile & run - will it work ?
+}]
+
+For developers who want to understand or modify the internals of the
+[package critcl] package, [sectref {Preloading functionality}] explains how
+preloading is implemented.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::debug] [arg area]...]
+
+Specifies what debugging features to activate. Internally each area is translated into
+area-specific flags for the compiler which are then handed over to
+[cmd critcl::cflags].
+
+[list_begin definitions]
+[def [const memory]]
+
+Specifies Tcl memory debugging.
+
+[def [const symbols]]
+
+Specifies compilation and linking with debugging symbols for use by a debugger
+or other tool.
+
+[def [const all]]
+
+Specifies all available debugging.
+
+[list_end]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/api_diversions.inc b/src/vfs/critcl.vfs/doc/include/api_diversions.inc
new file mode 100644
index 00000000..c12ef0f9
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_diversions.inc
@@ -0,0 +1,53 @@
+
+Diversions are for higher-level packages generating their own C code,
+to make their use of critcl's commands generating
+[sectref {Embedded C Code}] easier.
+
+[para] These commands normally generate all of their C code for the
+current [file .critcl] file, which may not be what is wanted by a
+higher-level package.
+
+[para] With a diversion the generator output can be redirected into
+memory and from there on then handled and processed as the caller
+desires before it is committed to an actual [file .c] file.
+
+[para] An example of such a package comes with critcl itself, see the
+implementation of package [package critcl::class].
+
+[para] To help such developers three commands are provided to manage
+diversions and the collection of C code in memory. These are:
+
+[list_begin definitions]
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd ::critcl::collect_begin]]
+
+This command starts the diversion of C code collection into memory.
+
+[para] The result of the command is the empty string.
+
+[para] Multiple calls are allowed, with each call opening a new
+nesting level of diversion.
+
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd ::critcl::collect_end]]
+
+This command end the diversion of C code collection into memory and
+returns the collected C code.
+
+[para] If multiple levels of diversion are open the call only closes
+and returns the data from the last level.
+
+[para] The command will throw an error if no diversion is active,
+indicating a mismatch in the pairing of [cmd collect_begin] and
+[cmd collect_end].
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd ::critcl::collect] [arg script]]
+
+This is a convenience command which runs the [arg script] under
+diversion and returns the collected C code, ensuring the correct
+pairing of [cmd collect_begin] and [cmd collect_end].
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/api_embedc.inc b/src/vfs/critcl.vfs/doc/include/api_embedc.inc
new file mode 100644
index 00000000..b77c412d
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_embedc.inc
@@ -0,0 +1,234 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+The following commands append C code fragments to the current module.  Fragments
+appear in the module in the order they are appended, so the earlier fragments
+(variables, functions, macros, etc.) are visible to later fragments.
+
+[list_begin definitions]
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::ccode] [arg fragment]]
+
+Appends the C code in [arg fragment] to the current module and returns the
+empty string.
+
+See [sectref {Runtime Behaviour}].
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::ccommand] [arg tclname] [arg cname]]
+
+As documented below, except that [arg cname] is the name of a C function
+that already exists.
+
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::ccommand] [arg tclname] [arg arguments] [arg body] [
+	opt "[arg option] [arg value]..."]]
+
+Appends the code to create a Tcl command named [arg tclname] and a
+corresponding C function whose body is [arg body] and which behaves as
+documented for Tcl's own
+[uri https://www.tcl-lang.org/man/tcl/TclLib/CrtObjCmd.htm Tcl_CreateObjCommand].
+
+[para]
+[arg aguments] is a list of zero to four names for the standard arguments
+[const clientdata], [const interp], [const objc], and [const objv].  The
+standard default names are used in place of any missing names.
+
+This is a more low-level way than [cmd critcl::cproc] to define a command, as
+processing of the items in [const objv] is left to the author, affording
+complete control over the handling of the arguments to the command.
+
+See section [sectref {Runtime Behaviour}].
+
+[para]
+Returns the empty string.
+
+[para]
+Each [arg option] may be one of:
+
+[list_begin options]
+[opt_def -clientdata [arg c-expression]]
+
+Provides the client data for the new command.  [const NULL] by default.
+
+[opt_def -delproc [arg c-expression]]
+
+Provides a function pointer of type [uri \
+	https://www.tcl-lang.org/man/tcl/TclLib/CrtObjCmd.htm \
+	Tcl_CmdDeleteProc
+] as the deletion function for the new command.  [const NULL] by default.
+
+
+[include api_embedc_cnameoption.inc]
+
+[list_end]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::cdata] [arg tclname] [arg data]]
+
+Appends the code to create a new Tcl command named [arg tclname] which returns
+[arg data] as a [const ByteArray] result.
+
+[para]
+Returns the empty string.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::cconst] [arg tclname] [arg resulttype] [arg value]]
+
+Appends the code to create a new Tcl command named [arg tclname] which returns
+the constant [arg value] having the Tcl type [arg resulttype].  [arg value] can
+be a C macro or a function [emph call] (including the parentheses) to any
+visible C function that does not take arguments.
+
+Unlike [cmd critcl::cdata], [arg resulttype] can be any type known to
+[cmd critcl::cproc].
+
+Its semantics are equivalent to:
+
+[example {
+    cproc $tclname {} $resulttype "return $value ;"
+}]
+
+[para] This is more efficient than [cmd critcl::cproc] since there is no
+C function generated.
+
+[para]
+Returns the empty string.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::cdefines] [arg {list of glob patterns}] [opt [arg namespace]]]
+
+Arranges for [term {C enum}] and [term #define] values that match one of the
+patterns in [term {glob patterns}] to be created in the namespace
+[arg namespace], each variable having the same as the corresponding C item.
+The default namespace is the global namespace.  A pattern that matches nothing
+is ignored.
+
+[para] The Tcl variables are created when the module is compiled, using the
+preprocessor in order to properly find all matching C definitions.
+
+[para]
+Produces no C code.  The desired C definitions must already exist.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::cproc] [arg name] [arg arguments] [arg resulttype] [arg body] \
+      [opt "[arg option] [arg value]..."]]
+
+Appends a function having [arg body] as its body, another shim function to
+perform the needed conversions, and the code to create a corresponding Tcl
+command named [arg tclname].  Unlike [cmd critcl::ccommand] the arguments and
+result are typed, and CriTcl generates the code to convert between Tcl_Obj
+values and C data types.
+
+See also [sectref {Runtime Behaviour}].
+
+[para]
+Returns the empty string.
+
+[para]
+[list_begin arguments]
+
+[arg_def string option] Each may be one of:
+
+[list_begin options]
+
+[include api_embedc_cnameoption.inc]
+
+[opt_def -pass-cdata [arg boolean]]
+
+If [const false] (the default), the shim function performing the conversion to
+and from Tcl level does not pass the ClientData as the first argument to
+the function.
+
+[opt_def -arg-offset [arg int]]
+
+A non-negative integer, [const 0] by default, indicating the number of hidden
+arguments preceding the actual procedure arguments.  Used by higher-order code
+generators where there are prefix arguments which are not directly seen by the
+function but which influence argument counting and extraction.
+
+[list_end]
+
+[arg_def string resulttype] May be a predefined or a custom type.
+
+See [term {CriTcl cproc Type Reference}] for the full list of predefined types and how to
+extend them.
+
+Unless otherwise noted, the Tcl return code is always [const TCL_OK].
+
+[arg_def list arguments] Is a multi-dictionary where each key is an
+argument type and its value is the argument name.
+
+For example:
+
+[example { int x int y }]
+
+[para] Each argument name must be a valid C identifier.
+
+[para] If the name is a list containing two items, the first item is the name
+and the second item is the default value.  A limited form of variadic arguments
+can be accomplished using such default values.
+
+For example:
+
+[example { int {x 1} }]
+
+Here [arg x] is an optional argument of type [type int] with a default
+value of [const 1].
+
+[para] Argument conversion is completely bypassed when the argument is not
+provided, so a custom converter doing validation does not get the chance to
+validate the default value.  In this case, the value should be checked in the
+body of the function.
+
+[para] Each argument type may be a predefined or custom type.
+
+See [term {CriTcl cproc Type Reference}] for the full list of predefined types and how to
+extend them.
+
+[list_end][comment {-- arguments --}]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::cproc] [arg name] [arg arguments] [arg resulttype]]
+
+As documented below, but used when the C function named [arg name] already
+exists.
+
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::cinit] [arg text] [arg externals]]
+
+Appends the C code in [arg text] and [arg externals], but only after all the
+other fragments appended by the previously-listed commands regardless of their
+placement in the [vset critcl_script] relative to this command.  Thus, all
+their content is visible.  See also [sectref {Runtime Behaviour}].
+
+[para] The C code in [arg text] is placed into the body of the initialization
+function of the shared library backing the [vset critcl_script], and is
+executed when this library is loaded into the interpreter.  It has access to
+the variable [var {Tcl_Interp* interp}] referencing the Tcl interpreter currently
+being initialized.
+
+[para] [arg externals] is placed outside and just before the initialization
+function, making it a good place for any external symbols required by
+initialization function, but which should not be accessible by any other parts
+of the C code.
+
+[para] [vset cumulative]
+
+[para]
+Returns the empty string.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::include] [arg path]]
+
+This command is a convenient shorthand for
+
+[example {
+critcl::code {
+  #include <${path}>
+}
+}]
+
+[comment ---------------------------------------------------------------------]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/api_embedc_cnameoption.inc b/src/vfs/critcl.vfs/doc/include/api_embedc_cnameoption.inc
new file mode 100644
index 00000000..5301c03e
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_embedc_cnameoption.inc
@@ -0,0 +1,5 @@
+[opt_def -cname [arg boolean]]
+
+If [const false] (the default), a name for the corresponding C function is
+automatically derived from the fully-qualified [arg tclname].  Otherwise, name
+of the C function is the last component of [arg tclname].
diff --git a/src/vfs/critcl.vfs/doc/include/api_generation.inc b/src/vfs/critcl.vfs/doc/include/api_generation.inc
new file mode 100644
index 00000000..244a3eb0
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_generation.inc
@@ -0,0 +1,37 @@
+
+While file generation is related to the diversions explained in the
+previous section they are not the same.
+
+Even so, like diversions this feature is for higher-level packages
+generating their own C code.
+
+[para] Three examples of utility packages using this facility comes
+with critcl itself.
+
+See the implementations of packages [package critcl::literals],
+[package critcl::bitmap], and [package critcl::enum].
+
+[para] When splitting a package implementation into pieces it is often
+sensible to have a number of pure C companion files containing
+low-level code, yet these files may require information about the code
+in the main [file .critcl] file. Such declarations are normally not
+exportable and using the stub table support does not make sense, as
+this is completely internal to the package.
+
+[para] With the file generation command below the main [file .critcl]
+file can generate any number of header files for the C companions to
+pick up.
+
+[list_begin definitions]
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd ::critcl::make] [arg path] [arg contents]]
+
+This command creates the file [arg path] in a location where the C
+companion files of the package are able to pick it up by simple
+inclusion of [arg path] during their compilation, without interfering
+with the outer system at all.
+
+[para] The generated file will contain the specified [arg contents].
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/api_introspection.inc b/src/vfs/critcl.vfs/doc/include/api_introspection.inc
new file mode 100644
index 00000000..0672af3f
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_introspection.inc
@@ -0,0 +1,95 @@
+
+The following commands control compilation and linking.
+
+[list_begin definitions]
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::check] [opt [arg label]] [arg text]]
+
+Returns a [const true] if the C code in [arg text] compiles sucessfully, and
+[const false] otherwise.  Used to check for availability of features in the
+build environment.
+
+If provided, [arg label] is used to uniquely mark the results in the generated
+log.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::checklink] [opt [arg label]] [arg text]]
+
+Like [cmd critcl::check] but also links the compiled objects, returning
+[const true] if the link is successful and [const false] otherwise.
+
+If specified, [arg label] is used to uniquely mark the results in the generated
+log.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::msg] [opt [option -nonewline]] [arg msg]]
+
+Scripts using [cmd critcl::check] and [cmd critcl::checklink] can use this
+command to report results.  Does nothing in [term {compile & run}] mode.  Tools
+like the [manpage {CriTcl Aplication}] may redefine this command to implement
+their own message reporting. For example, [package critcl::app] and any
+packages built on it print messages to [term stdout].
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::print] [opt [option -nonewline]] [opt [arg chan]] [arg msg]]
+
+Used by the CriTcl internals to report activity.  By default, effectively the
+same thing as [cmd ::puts].  Tools directly using either the CriTcl package or
+the CriTcl application package may redefine this procedure to implement their
+own output functionality.
+
+[para] For example, the newest revisions of
+[uri https://chiselapp.com/user/andreas_kupries/repository/Kettle/index Kettle]
+use this to highlight build warnings.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::compiled]]
+
+Returns [const true] if the current [vset critcl_script] is already compiled
+and [const false] otherwise.
+
+[para] Enables a [vset critcl_script] used as its own Tcl companion file (see
+[cmd critcl::tsources]) to distinguish between being sourced for compilation in
+[term {compile & run}] mode and being sourced from either the result of
+[term {generate package}] mode or during the load phase of
+[term {compile & run}] mode.
+
+The result is [const false] in the first case and [const true] in the later two
+cases.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::compiling]]
+
+Returns [const true] if a working C compiler is available and [const false]
+otherwise.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::done]]
+
+Returns [const true] when [vset critcl_script] has been built and
+[const false] otherwise.  Only useful from within a [vset critcl_script].
+Enables the Tcl parts of a [vset critcl_script] to distinguish between
+[term {prebuilt package}] mode and [term {compile & run}] mode.
+
+[para] See also [sectref {Modes Of Operation/Use}].
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::failed]]
+
+Returns [const true] if the [vset critcl_script] could not be built, and
+[const false] otherwise.  Forces the building of the package if it hasn't
+already been done, but not its loading.  Thus, a [vset critcl_script] can
+check itself for availability of the compiled components.  Only useful from
+within a [vset critcl_script].
+
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::load]]
+
+Like [cmd critcl::failed] except that it also forces the loading of the
+generated shared library, and that it returns [const true] on success and
+[const false] on failure.  Thus, a [vset critcl_script] can check itself for
+availability of the compiled components.  Only useful from within a
+[vset critcl_script].
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/api_location.inc b/src/vfs/critcl.vfs/doc/include/api_location.inc
new file mode 100644
index 00000000..0f1df825
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_location.inc
@@ -0,0 +1,120 @@
+
+First a small introduction for whose asking themselves
+'what is location management' ?
+
+[para] By default critcl embeds [term #line] directives into the
+generated C code so that any errors, warnings and notes found by the C
+compiler during compilation will refer to the [file .critcl] file the
+faulty code comes from, instead of the generated [file .c] file.
+
+[include rq_cline.inc]
+
+[para] Most users will not care about this feature beyond simply
+wanting it to work and getting proper code references when reading
+compiler output.
+
+[para] Developers of higher-level packages generating their own C code
+however should care about this, to ensure that their generated code
+contains proper references as well. Especially as this is key to
+separating bugs concerning code generated by the package itself and
+bug in the user's code going into the package, if any.
+
+[para] Examples of such packages come with critcl itself, see the
+implementation of packages [package critcl::iassoc] and
+[package critcl::class].
+
+[para] To help such developers eight commands are provided to manage
+such [term location] information. These are listed below.
+
+[para] A main concept is that they all operate on a single
+[term {stored location}], setting, returning and clearing it.
+
+Note that this location information is completely independent of the
+generation of [term #line] directives within critcl itself.
+
+[list_begin definitions]
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::at::caller]]
+
+This command stores the location of the caller of the current
+procedure as a tuple of file name and linenumber. Any previously
+stored location is overwritten.
+
+The result of the command is the empty string.
+
+[call [cmd ::critcl::at::caller] [arg offset]]
+
+As above, the stored line number is modified by the specified
+offset. In essence an implicit call of [cmd critcl::at::incr].
+
+[call [cmd ::critcl::at::caller] [arg offset] [arg level]]
+
+As above, but the level the location information is taken from is
+modified as well. Level [const 0] is the caller, [const -1] its
+caller, etc.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::at::here]]
+
+This command stores the current location in the current procedure as a
+tuple of file name and linenumber. Any previously stored location is
+overwritten.
+
+The result of the command is the empty string.
+
+[para] In terms of [cmd ::critcl::at::caller] this is equivalent to
+[example {
+	critcl::at::caller 0 1
+}]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::at::get*]]
+
+This command takes the stored location and returns a formatted
+[term #line] directive ready for embedding into some C code. The
+stored location is left untouched.
+
+Note that the directive contains its own closing newline.
+
+[para] For proper nesting and use it is recommended that such
+directives are always added to the beginning of a code fragment. This
+way, should deeper layers add their own directives these will come
+before ours and thus be inactive. End result is that the outermost
+layer generating a directive will 'win', i.e. have its directive
+used. As it should be.
+
+[call [cmd ::critcl::at::get]]
+
+This command is like the above, except that it also clears the stored
+location.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::at::=] [arg file] [arg line]]
+
+This command allows the caller to set the stored location to anything
+they want, outside of critcl's control.
+
+The result of the command is the empty string.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::at::incr] [arg n]...]
+[call [cmd ::critcl::at::incrt] [arg str]...]
+
+These commands allow the user to modify the line number of the stored
+location, changing it incrementally. The increment is specified as
+either a series of integer numbers ([cmd incr]), or a series of
+strings to consider ([cmd incrt]). In case of the latter the delta is
+the number of lines endings found in the strings.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::at::caller!]]
+[call [cmd ::critcl::at::caller!] [arg offset]]
+[call [cmd ::critcl::at::caller!] [arg offset] [arg level]]
+[call [cmd ::critcl::at::here!]]
+
+These are convenience commands combining [cmd caller] and [cmd here]
+with [cmd get]. I.e. they store the location and immediately return it
+formatted as proper [term #line] directive. Also note that after their
+use the stored location is cleared.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/api_meta.inc b/src/vfs/critcl.vfs/doc/include/api_meta.inc
new file mode 100644
index 00000000..e37f6e8e
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_meta.inc
@@ -0,0 +1,125 @@
+
+CriTcl versions 3 and later can create TEApot meta-data to be placed into
+[file teapot.txt] in a format suitable for use by the
+[uri {http://docs.activestate.com/activetcl/8.5/tpm/toc.html} {TEApot tools}].
+
+[para]
+In version 2, some meta data support was already present through
+[cmd ::critcl::license], but this was only used to generate [file license.txt].
+
+
+[list_begin definitions]
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::license] [arg author] [opt [arg text]...]]
+
+Ignored in "compile & run" mode.
+
+[para]
+In "generate package" mode provides information about the author of the
+package and the license for the package.
+
+[para]
+[arg text] arguments are concatenated to form the text of the license, which is
+written to [file license.terms] in the same directory as [file pkgIndex.tcl].
+If no [arg text] is provided the license is read from [file license.terms]
+in the same directory as the [vset critcl_script].
+
+[para] This information takes precedence over any information specified through
+the generic API [cmd ::critcl::meta].  It is additionally placed
+into the meta data file [file teapot.txt] under the keys [term as::author] and
+[term license].
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::summary] [arg text]]
+
+Ignored in "compile & run" mode.
+
+[para]
+In "generate package" mode places a short, preferably one-line description of
+the package into the meta data file [file teapot.txt] under the key
+[term summary].  This information takes precedence over information specified
+through the generic API [cmd ::critcl::meta].
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::description] [arg text]]
+
+Ignored in "compile & run" mode.
+
+[para]
+In "generate package" mode places a longer description of the package into the
+meta data file [file teapot.txt], under the key [term description].  The data
+specified by this command takes precedence over any information specified
+through the generic API [cmd ::critcl::meta].
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::subject] [opt [arg key]...]]
+
+Ignored in "compile & run" mode.
+
+[para]
+In "generate package" mode places each [arg key] into the meta data file
+[file teapot.txt], under the key [term subject].  This information takes
+precedence over any information specified through the generic API
+[cmd ::critcl::meta].
+
+[para] Calls to this command are cumulative.
+
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::meta] [arg key] [opt [arg word]...]]
+
+Provides arbitrary meta data outside of the following reserved keys:
+
+[term as::author],
+[term as::build::date],
+[term description],
+[term license],
+[term name],
+[term platform],
+[term require]
+[term subject],
+[term summary], and
+[term version],
+
+Its behaviour is like [cmd ::critcl::subject] in that it treats all
+keys as list of words, with each call providing one or more words for
+the key, and multiple calls extending the data for an existing key, if
+not reserved.
+
+[para] While it is possible to declare information for one of the
+reserved keys with this command such data is ignored when the final
+meta data is assembled and written.
+
+[para] Use the commands
+[cmd ::critcl::license],
+[cmd ::critcl::summary],
+[cmd ::critcl::description]
+[cmd ::critcl::subject],
+[cmd {package require}], and
+[cmd {package provide}]
+to declare data for the reserved keys.
+
+[para] The information for the reserved keys
+
+[term as::build::date] and
+[term platform]
+
+is automatically generated by [package critcl] itself.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::meta?] [arg key]]
+
+Returns the value in the metadata associated with [arg key].
+
+[para] Used primarily to retrieve the name of the package
+from within utility packages having to adapt C code templates to their
+environment. For example, [package critcl::class] uses does this.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::buildrequirement] [arg script]]
+
+Provides control over the capturing of dependencies declared via
+[cmd {package require}]. [arg script] is evaluated and any dependencies
+declared within are ignored, i.e. not recorded in the meta data.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/api_rcache.inc b/src/vfs/critcl.vfs/doc/include/api_rcache.inc
new file mode 100644
index 00000000..05104148
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_rcache.inc
@@ -0,0 +1,23 @@
+
+The following commands control the [sectref {Result Cache}].
+
+[vset not_needed_for_critcl_script]
+
+[list_begin definitions]
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::cache] [opt path]]
+
+Sets and returns the path to the directory for the package's result cache.
+
+[para] The default location is
+[file ~/.critcl/[lb]platform::generic[rb]] and usually does not
+require any changes.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::clean_cache] [opt [arg pattern]...]]
+
+Cleans the result cache, i.e. removes any and all files
+and directories in it. If one or more patterns are specified then only
+the files and directories matching them are removed.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/api_stubs.inc b/src/vfs/critcl.vfs/doc/include/api_stubs.inc
new file mode 100644
index 00000000..c461d27a
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_stubs.inc
@@ -0,0 +1,133 @@
+
+CriTcl versions 3 and later provide [cmd critcl::api] to create and manipulate
+stubs tables, Tcl's dynamic linking mechanism handling the resolution of
+symbols between C extensions.
+
+See [uri http://wiki.tcl-lang.org/285]
+for an introduction, and section [sectref {Stubs Tables}]
+for the details of CriTcl's particular variant.
+
+[para]
+Importing stubs tables, i.e. APIs, from another extension:
+
+[list_begin definitions]
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::api] [method import] [arg name] [arg version]]
+
+Adds the following include directives into the [vset critcl_script]
+[emph and] each of its companion [file .c] files:
+
+[list_begin enumerated]
+[enum] #include <[var name]/[var name]Decls.h>
+[enum] #include <[var name]/[var name]StubLib.h>
+[list_end]
+
+Returns an error if [file [var name]] isn't in the search path for the
+compiler.  See [cmd critcl::cheaders] and the critcl application's [option -I]
+and [option -includedir] options.
+
+[para] [emph Important:] If [var name] is a fully-qualified name in a
+non-global namespace, e.g.
+"c::stack", the namespace separators "::" are converted into underscores
+("_") in path names, C code, etc.
+
+[para] [var name]/[var name]Decls.h contains the stubs table type declarations,
+mapping macros, etc., and may include package-specific headers.  See
+[cmd {critcl::api header}], below.  An [term {#include}] directive is added at
+the beginning of the generated code for [vset critcl_script] and at the
+beginning of each of its companion [file .c] files.
+
+[para] [var name]/[var name]StubLib.h contains the stubs table variable
+definition and the function to initialize it.  An [term {#include}] directive
+for it is added to the initialization code for the [vset critcl_script] ,
+along with a call to the initializer function.
+
+[para] If [file [var name]/[var name].decls] accompanies
+[var name]/[var name]Decls.h, it should contain the external representation of
+the stubs table used to generate the headers. The file is read and the internal
+representation of the stubs table returned for use by the importing package.
+Otherwise, the empy string is returned.
+
+[para] One possible use would be the automatic generation of C code
+calling on the functions listed in the imported API.
+
+[para] When generating a TEA package the names of the imported APIs
+are used to declare [syscmd configure] options with which the user can
+declare a non-standard directory for the headers of the API. Any API
+[var name] is translated into a single configure option
+[option --with-[var name]-include].
+
+[list_end]
+
+
+[para] Declaration and export of a stubs table, i.e. API, for
+the [vset critcl_script]:
+
+[list_begin definitions]
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::api] [method function] [arg resulttype] [arg name] [arg arguments]]
+
+Adds to the public API of the [vset critcl_script] the signature
+for the function named [arg name] and having the signature specified by
+[arg arguments] and [arg resulttype].  Code is generated for a [file .decls]
+file, the corresponding public headers, and a stubs table usable by
+[cmd {critcl::api import}].
+
+[para] [arg arguments] is a multidict where each key is an argument type and its
+value is the argument name, and [arg resulttype] is a C type.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::api] [method header] [opt [arg {glob pattern}]...]]
+
+Each file matching a [arg {glob pattern}] is copied into the directory
+containing the generated headers, and an [term {#include}] directive for it is
+added to [file Decls.h] for the [vset critcl_script].
+
+Returns an error if a [arg {glob pattern}] matches nothing.
+
+[para] [vset relative_pattern]
+
+[comment {
+	I am intentionally not documenting "critcl::api export".
+	I am not convinced yet that this method is needed.
+	The default, using the package name as the stubs table
+	library and interface names seems to me to be not only
+	reasonable, but the only setting truly needed. I simply
+	do not see a use case for having the library and interface
+	named different than the package.
+	(In a bundle, like tcllibc each bundled package still declares
+	itself properly).
+}]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::api] [method extheader] [opt [arg file]...]]
+
+Like [cmd {::critcl::api header}], but each [arg file] should exist in the
+external development environment.  An [term {#include}] directive is added to
+[file [var foo]Decls.h], but [arg file] is not copied to the package header
+directory. [arg file] is not a glob pattern as CriTcl has no context,
+i.e directory, in which to expand such patterns.
+
+[list_end]
+
+As with the headers for an imported API, an [term {#include}] directive is
+added to the generated code for the [vset critcl_script] and to
+each companion [file .c] file.
+
+[para] In "compile & run" mode the generated header files and any companion
+headers are placed in the [sectref {Result Cache}] subdirectory for the
+[vset critcl_script]. This directory is added to the include search path of
+any other package importing this API and and building in mode "compile & run".
+
+[para] In "generate package" mode [option -includedir] specifies the
+subdirectory in the package to place the generated headers in. This
+directory is added to the search paths for header files, ensuring that a
+package importing an API finds it if the package exporting that API used the
+same setting for [option -includedir].
+
+[para] In "generate TEA" mode the static scanner recognizes
+[cmd {critcl::api header}] as a source of companion files.
+It also uses data from calls to [cmd {critcl::api import}] to
+add support for [option --with-[var foo]-include] options into the
+generated [file configure(.in)] so that a user may specify custom
+locations for the headers of any imported API.
diff --git a/src/vfs/critcl.vfs/doc/include/api_tools.inc b/src/vfs/critcl.vfs/doc/include/api_tools.inc
new file mode 100644
index 00000000..bc663eba
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/api_tools.inc
@@ -0,0 +1,176 @@
+
+The following commands provide tools like
+[manpage {CriTcl Application}] or similar with
+deeper access to the package's internals.
+
+[vset not_needed_for_critcl_script]
+
+[list_begin definitions]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::actualtarget]]
+
+Returns the platform identifier for the target platform, i.e. the platform to
+build for. Unlike [cmd ::critcl::targetplatform] this is the true target, with
+any cross-compilation information resolved.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::buildforpackage] [opt [arg flag]]]
+
+Signals whether the next file is to be built for inclusion into a package. If
+not specified the [arg flag] defaults to [const true], i.e. building for a
+package. This disables a number of things in the backend, namely the linking of
+that file into a shared library and the loading of that library. It is expected
+that the build results are later wrapped into a larger collection.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::cnothingtodo] [arg file]]
+
+Checks whether there is anything to build for [arg file].
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::cresults] [opt [arg file]]]
+
+Returns information about building [arg file], or [cmd {info script}] If
+[arg file] is not provided.
+
+The result in question is a dictionary containing the following items:
+
+[list_begin definitions]
+[def [const clibraries]]
+A list of external shared libraries and/or directories needed to link
+[arg file].
+
+[def [const ldflags]]
+A list of linker flags needed to link [arg file].
+
+[def [const license]]
+The text of the license for the package [arg file] is located in.
+
+[def [const mintcl]]
+The minimum version of Tcl required by the package [arg file]
+is in to run successfully. A proper Tcl version number.
+
+[def [const objects]]
+A list of object files to link into [arg file].
+
+[def [const preload]]
+A list of libraries to be preloaded in order to sucessfully load and use
+[arg file].
+
+[def [const tk]]
+[const true] if [arg file] requires Tk and [const false] otherwise.
+
+[def [const tsources]]
+A list of companion [file .tcl] files to source in order to load and use the
+[term {CriTcl script}] [arg file].
+
+[def [const log]]
+The full build log generated by the compiler/linker, including command
+line data from critcl, and other things.
+
+[def [const exl]]
+The raw build log generated by the compiler/linker. Contains the output
+generated by the invoked applications.
+[list_end]
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::crosscheck]]
+
+Determines whether the package is configured for cross-compilation and prints a
+message to the standard error channel if so.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::error] [arg msg]]
+
+Used to report internal errors. The default implementation simply returns the
+error.  Tools like the [manpage {CriTcl Application}] are allowed to redefine
+this procedure to perform their own way of error reporting. There is
+one constraint they are not allowed to change: The procedure must
+[emph {not return}] to the caller.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::knowntargets]]
+
+Returns a list of the identifiers of all targets
+found during the last invocation of [cmd critcl::readconfig].
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::sharedlibext]]
+
+Returns the file extension for shared libraries on the target platform.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::targetconfig]]
+
+Returns the identifier of the target to build for, as specified by either the
+user or the system.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::buildplatform]]
+
+Returns the identifier of the build platform, i.e. where the package is running
+on.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::targetplatform]]
+
+Returns the identifier of the target platform,
+i.e. the platform to compile for. In contrast to
+[cmd ::critcl::actualtarget] this may be the name of a
+cross-compilation target.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::cobjects] [opt [arg {glob pattern}]...]]
+
+Like [cmd ::critcl::clibraries], but instead of matching libraries, each
+[arg {glob pattern}] matches object files to be linked into the
+shared object (at compile time, not runtime). If a [arg {glob pattern}] matches
+nothing an error is returned.
+
+Not listed in [sectref {Control & Interface}] because it is of no use to
+package writers. Only tools like the [manpage {CriTcl Application}] need it.
+
+[para] [vset relative_pattern]
+
+[para] Calls to this command are cumulative.
+
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::scan] [arg path]]
+
+The main entry point to CriTcl's static code scanner.  Used by tools to
+implement processing modes like the assembly of a directory hierarchy
+containing a TEA-lookalike buildystem, etc.
+
+[para]
+Scans [arg path] and returns a dictionary containing the following items:
+
+[list_begin definitions]
+[def version] Package version.
+[def org] Author(ing organization).
+
+[def files] List of the companion files, relative to the directory of the input
+file.
+
+[list_end]
+
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::name2c] [arg name]]
+
+Given the Tcl-level identifier [arg name], returns a list containing the
+following details of its conversion to C:
+
+[list_begin itemized]
+[item] Tcl namespace prefix
+[item] C namespace prefix
+[item] Tcl base name
+[item] C base name
+[list_end]
+
+[para] For use by utilities that provide Tcl commands without going through
+standard commands like [cmd critcl::ccommand] or [cmd critcl::cproc].
+[package critcl::class] does this.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/architecture.inc b/src/vfs/critcl.vfs/doc/include/architecture.inc
new file mode 100644
index 00000000..32b54630
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/architecture.inc
@@ -0,0 +1,57 @@
+
+The system consists of two main layers, as seen in the figure below,
+plus a support layer containing general packages the system uses during
+operation.
+
+[para][image architecture][para]
+
+[list_begin enumerated]
+[enum]
+
+At the top we have an application built on top of the core packages,
+providing command line access to the second and third usage modes,
+i.e. [term {Generate Package}] and [term {Generate TEA Package}].
+
+[list_begin definitions][comment {----- application ---}]
+[def [syscmd critcl]]
+[def [package critcl::app]]
+[list_end][comment {------------------- application ---}]
+
+[enum]
+
+Below that is the core package providing the essential functionality
+of the system, plus various utility packages which make common tasks
+more convenient.
+
+[list_begin definitions][comment {----- core ---}]
+[def [package critcl]]
+[def [package critcl::util]]
+[list_end][comment {------------------- core ---}]
+
+[enum]
+Lastly a layer of supporting packages, mostly external to critcl.
+
+[list_begin definitions][comment {----- support ---}]
+[def [package md5]]
+For this pure-Tcl package to be fast users should get one of several
+possible accelerator packages:
+[list_begin enumerated]
+[enum] [package tcllibc]
+[enum] [package Trf]
+[enum] [package md5c]
+[list_end]
+
+[def [package cmdline]]
+[def [package platform]]
+[def [package stubs::container  ]]
+[def [package stubs::reader     ]]
+[def [package stubs::writer     ]]
+[def [package stubs::gen        ]]
+[def [package stubs::gen::init  ]]
+[def [package stubs::gen::header]]
+[def [package stubs::gen::decl  ]]
+[def [package stubs::gen::macro ]]
+[def [package stubs::gen::slot  ]]
+[def [package stubs::gen::lib   ]]
+[list_end][comment {------------------- support ---}]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/b_test.inc b/src/vfs/critcl.vfs/doc/include/b_test.inc
new file mode 100644
index 00000000..59b614a3
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/b_test.inc
@@ -0,0 +1,19 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+Installing [vset critcl] contains an implicit test of its functionality.
+
+[para] One of its operation modes uses the MD5 hash internally to generate unique ids for
+sources, as a means of detecting changes. To make generation of such hashes fast a
+[vset critcl]-based package for MD5 is installed as part of the main installation process.
+
+[para] In other words, after installing the core packages of [vset critcl] this partial
+installation is used to build the rest.
+
+[para] This is possible because building a package from [vset critcl]-based sources is the
+operation mode not using MD5, therefore there is no circular dependency.
+
+[para] For our purposes this however is also a self-test of the system, verifying that the
+core of [vset critcl] works, as well as the C compiler.
+
+[para] For additional testing simply move on to section [sectref {The First Package}] of
+the guide on [term {How To Use CriTcl}].
diff --git a/src/vfs/critcl.vfs/doc/include/b_unix.inc b/src/vfs/critcl.vfs/doc/include/b_unix.inc
new file mode 100644
index 00000000..813c58b9
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/b_unix.inc
@@ -0,0 +1,42 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+This section offers instructions for installing [vset critcl] on various kinds of Unix and
+Unix-related systems, i.e. [term Linux], the various [term BSD]s, etc. It especially
+covers [term {Mac OS X}] as well.
+
+[para] Use the instructions in section [sectref {Install On Windows}] when installing on a
+Windows platform and not using a unix-like environment as provided by tools like
+[vset mingw], [vset cygwin], [vset git4win], [vset wsl], etc.
+
+[list_begin enumerated]
+
+[enum] Change the working directory to the top level directory of the [vset critcl]
+checkout obtained by following the instructions of [term {How To Get The CriTcl Sources}].
+
+[enum] Verify that the file [file build.tcl] is marked executable. Make it executable if
+it is not.
+
+[enum] Invoke [example { ./build.tcl install }] to perform the installation.
+
+[para] [strong Attention] This command uses default locations for the placement of the
+[cmd critcl] application, the various packages, and header files.
+
+[enum] Invoke [example { ./build.tcl dirs }] to see the chosens paths before actually
+performing the installation.
+
+[enum] [include include/build_install_options.inc]
+
+These options are especially necessary in all environments not using the semi-standard
+[file bin], [file lib], [file include] locations from [syscmd configure].
+
+[para] As an example of such environments, Ubuntu (and possibly Debian) expect Tcl
+packages to be installed into the [file /usr/share/tcltk] directory, therefore requiring
+the use of [example {--lib-dir /usr/share/tcltk}] for proper installation.
+
+[list_end]
+
+[para] [strong Note] that this guide neither covers the details of the [method install]
+method, nor does it cover any of the other methods available through the [cmd build.tcl]
+tool of [vset critcl].
+
+These can be found in the [term {CriTcl build.tcl Tool Reference}].
diff --git a/src/vfs/critcl.vfs/doc/include/b_windows.inc b/src/vfs/critcl.vfs/doc/include/b_windows.inc
new file mode 100644
index 00000000..ac7c243b
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/b_windows.inc
@@ -0,0 +1,38 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+This section offers instructions for installing [vset critcl] on a Windows (tm) host.
+
+[strong Note] that environments as provided by tools like [vset mingw], [vset cygwin],
+[vset git4win], [vset wsl], etc. are classed as Unix-like, and the instructions in section
+[sectref {Install On Unix}] apply.
+
+[list_begin enumerated]
+
+[enum] In a DOS box, change the working directory to the top level directory of the
+[vset critcl] checkout obtained by following the instructions of
+[term {How To Get The CriTcl Sources}].
+
+[enum] In the same DOS box, invoke [example { tclsh.exe ./build.tcl install }] to perform
+the installation.
+
+[para] [strong Attention] This command uses default locations for the placement of the
+[cmd critcl] application, the various packages, and header files.
+
+[enum] Invoke [example { tclsh.exe ./build.tcl dirs }] to see the chosens paths before
+actually performing the installation.
+
+[enum] [include include/build_install_options.inc]
+
+[list_end]
+
+[para] [strong Attention!] The current installer does not put an extension on the
+[syscmd critcl] application. This forces users to either explicitly choose the
+[syscmd tclsh] to run the application, or manually rename the installed file to
+[file critcl.tcl]. The latter assumes that an association for [file .tcl] is available, to
+either [syscmd tclsh], or [syscmd wish].
+
+[para] [strong Note] that this guide neither covers the details of the [method install]
+method, nor does it cover any of the other methods available through the [cmd build.tcl]
+tool of [vset critcl].
+
+These can be found in the [term {CriTcl build.tcl Tool Reference}].
diff --git a/src/vfs/critcl.vfs/doc/include/build_install_options.inc b/src/vfs/critcl.vfs/doc/include/build_install_options.inc
new file mode 100644
index 00000000..2a3c2b55
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/build_install_options.inc
@@ -0,0 +1,12 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+Use the options listed below to change the paths used for installation as desired. This is
+the same method as with [cmd configure] based packages.
+
+[list_begin options]
+[opt_def --prefix      [arg path]] Base path for non-package files.
+[opt_def --include-dir [arg path]] Destination path for header files.
+[opt_def --exec-prefix [arg path]] Base path for applications and packages.
+[opt_def --bin-dir     [arg path]] Destination path for applications.
+[opt_def --lib-dir     [arg path]] Destination path for packages.
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes.inc b/src/vfs/critcl.vfs/doc/include/changes.inc
new file mode 100644
index 00000000..e4e559cb
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes.inc
@@ -0,0 +1,6 @@
+[para] The latest changes are found at the top.
+
+[include changes/32.inc]
+[include changes/31.inc]
+[include changes/3.inc]
+[include changes/21.inc]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/21.inc b/src/vfs/critcl.vfs/doc/include/changes/21.inc
new file mode 100644
index 00000000..7d09142c
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/21.inc
@@ -0,0 +1,127 @@
+[section {Changes for version 2.1}]
+[list_begin enumerated]
+
+[enum] Fixed bug where [cmd critcl::tsources] interpreted relative
+paths as relative to the current working directory instead of
+relative to the [file .critcl] file using the command, as all other
+commands of this type do.
+
+[enum] Fixed internals, preventing information collected for multiple
+[file .critcl] files to leak between them. Notably, [cmd critcl::tk]
+is not a global configuration option anymore.
+
+[enum] Fixed the command [cmd critcl::license] to be a null-operation
+in mode "compile & run", instead of throwing an error.
+
+[enum] Fixed the critcl application's interference with the "compile &
+run" result cache in [option -pkg] mode by having it use a wholly
+separate (and by default transient) directory for that mode.
+
+[enum] Fixed bug where changes to a [file .critcl] file did not result
+in a rebuild for mode "compile & run". All relevant API commands now
+ensure UUID changes.
+
+[enum] Fixed bug in the backend handling of [cmd critcl::debug] where
+the companion c-sources of a [file .critcl] file were not compiled
+with debug options, although the [file .critcl] file was.
+
+[enum] Fixed bug in [cmd critcl::debug] which prevented recognition of
+mode "all" when it was not the first argument to the command.
+
+[enum] Fixed bug in [file preload.c] preventing its compilation on
+non-windows platforms.
+
+[enum] Fixed long-standing bug in the handling of namespace qualifiers
+in the command name argument of [cmd critcl::cproc] and
+[cmd critcl::ccommand]. It is now possible to specify a fully
+qualified command name without issues.
+
+[enum] Extended/reworked [cmd critcl::tsources] to be the canonical
+way of declaring [file .tcl] companion files even for mode "compile &
+run".
+
+[enum] Extended/reworked [cmd critcl::tsources] to allow the use of a
+[file .critcl] file as its own Tcl companion file.
+
+[enum] Extended [cmd critcl::framework] to internally check for OS X
+build target, and to ignore the declaration if its not.
+
+[enum] Extended [cmd critcl::failed] to be callable more than once in
+a [file .critcl] file. The first call forces the build, if it was not
+done already, to get the result. Further calls return the cached
+result of the first call.
+
+[enum] Extended the handling of environment variable CC in the code
+determining the compiler to use to deal with (i.e. remove) paths to
+the compiler, compiler file extensions, and compiler options specified
+after the compiler itself, leaving only the bare name of the compiler.
+
+[enum] Extended the code handling the search for preloaded libraries
+to print the paths it searched, making debugging of a search failure
+easier.
+
+[enum] A new command [cmd critcl::tcl] can be used to declare the
+version of Tcl minimally needed to build and run the [file .critcl]
+file and package. Defaults to 8.4 if not declared. Extended critcl to
+have the stubs and headers for all of Tcl 8.4, 8.5, and 8.6.
+
+[enum] A new command [cmd critcl::load] forces the build and load of a
+[file .critcl] file. This is the official way for overriding critcl's
+default lazy-build-&-load-on-demand scheme for mode "compile & run".
+
+[para] [emph Note] that after using [cmd critcl::load] /
+[cmd critcl::failed] in a [file .critcl] file it is not possible to
+use critcl commands in that file anymore. Doing so will throw an
+error.
+
+[enum] Extended the generation of '#line' pragmas to use
+[cmd {info frame}] (if available) to provide the C compiler with exact
+line numbers into the [file .critcl] file for the reporting of
+warnings and errors.
+
+[enum] Extended [cmd critcl::check] with logging to help with
+debugging build-time checks of the environment, plus an additional
+optional argument to provide labeling.
+
+[enum] Added a new command [cmd critcl::checklink] which not only
+tries to check the environment via compiling the code, but also
+its linkability.
+
+[enum] Added a new command [cmd critcl::msg] for messaging, like
+command [cmd critcl::error] is for error reporting. Likewise this is a
+hook a user of the package is allowed to override. The default
+implementation, used by mode [term {compile & run}] does nothing. The
+implementation for mode [term {generate package}] prints the message
+to stdout.
+
+[para] Envisioned use is for the reporting of results determined by
+[cmd critcl::check] and [cmd critcl::checklink] during building, to
+help with debugging when something goes wrong with a check.
+
+[enum] Exposed the argument processing internals of [cmd critcl::proc]
+for use by advanced users. The new commands are
+
+[list_begin enum]
+[enum] [cmd critcl::argnames]
+[enum] [cmd critcl::argcnames]
+[enum] [cmd critcl::argcsignature]
+[enum] [cmd critcl::argvardecls]
+[enum] [cmd critcl::argconversion]
+[list_end]
+
+Please see section [emph {Advanced Embedded C Code}] of the
+[package critcl] package documentation for details.
+
+[enum] Extended the critcl package to intercept [cmd {package
+provide}] and record the file -> package name mapping. Plus other
+internal changes now allow the use of namespaced package names while
+still using proper path names and init function.
+
+[enum] Dropped the unused commands [cmd critcl::optimize] and
+[cmd critcl::include].
+
+[enum] Dropped [option -lib] mode from the critcl application.
+
+[enum] Dropped remnants of support for Tcl 8.3 and before.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/3.inc b/src/vfs/critcl.vfs/doc/include/changes/3.inc
new file mode 100644
index 00000000..8fd8e431
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/3.inc
@@ -0,0 +1,91 @@
+[include 307.inc]
+[include 306.inc]
+[include 305.inc]
+[include 304.inc]
+[include 303.inc]
+[include 302.inc]
+[include 301.inc]
+
+[section {Changes for version 3}]
+[list_begin enumerated]
+
+[enum] The command [cmd critcl::platform] was deprecated in version
+2.1, superceded by [cmd critcl::targetplatform], yet kept for
+compatibility. Now it has been removed.
+
+[enum] The command [cmd critcl::compiled] was kept with in version 2.1
+with semantics in contradiction to its, for compatibility. This
+contradiction has been removed, changing the visible semantics of the
+command to be in line with its name.
+
+[enum] The change to version 3 became necessary because of the two
+incompatible visible changes above.
+
+[enum] Extended the application package with code handling a new
+option [option -tea]. Specifying this option invokes a special mode
+where critcl generates a TEA package, i.e. wraps the input into a
+directory hierarchy and support files which provide it TEA-lookalike
+buildsystem.
+
+[para] This new option, and [option -pkg], exclude each other. If
+both are specified the last used option takes precedence.
+
+[para] The generated package directory hierarchy is mostly
+self-contained, but not fully. It requires not only a working
+installation of Tcl, but also working installations of the packages
+[package md5] and [package cmdline]. Both of these are provided by the
+[package Tcllib] bundle. Not required, but recommended to have
+installed are any of the packages which can accelerate md5's
+operation, i.e. [package cryptkit], [package tcllibc], or
+[package Trf].
+
+[enum] Extended the critcl package with a new command
+[cmd critcl::scan] taking the path to a [file .critcl] file,
+statically scanning it, and returning license, version, a list of its
+companion files, list of imported APIs, and list of
+developer-specified custom configuration options. This data is the
+foundation for the TEA wrapping described above.
+
+[para] Note that this is a [emph static] scan. While the other build
+modes can (must) execute the [file .critcl] file and make
+platform-specific decisions regarding the assembled C code, companion
+files, etc. the TEA wrap mode is not in a position to make
+platform-specific decisions. It has to wrap everything which might
+conceivably be needed when actually building. Hence the static scan.
+
+This has however its own set of problems, namely the inability to
+figure out any dynamic construction of companion file paths, at least
+on its own. Thus:
+
+[enum] Extended the API used by critcl-based packages with the command
+[cmd critcl::owns]. While this command is ignored by the regular build
+modes the static scanner described above takes its arguments as the
+names of companion files which have to be wrapped into the TEA package
+and could not be figured by the scanner otherwise, like because of
+dynamic paths to [cmd critcl::tsources], [cmd critcl::csources],
+getting sourced directly, or simply being adjunct datafiles.
+
+[enum] Extended the API used by critcl-based packages with the command
+[cmd critcl::api] for the management of stubs tables, be it their use,
+and/or declaration and export.
+
+[para] Please see section [emph {Stubs Table Management}] of the
+[package critcl] package documentation for details.
+
+[enum] Extended the API used by critcl-based packages with the command
+[cmd critcl::userconfig] for the management of developer-specified
+custom configuration options, be it their use and/or declaration.
+
+[para] Please see section [emph {Custom Build Configuration}] of the
+[package critcl] package documentation for details.
+
+[enum] Extended the API used by critcl-based packages with the
+commands [cmd critcl::description], [cmd critcl::summary],
+[cmd critcl::subject], [cmd critcl::meta], and
+[cmd critcl::buildrequirement] for the declaration of TEApot meta data
+for/about the package.
+
+[para] Please see section [emph {Package Meta Data}] of the
+[package critcl] package documentation for details.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/301.inc b/src/vfs/critcl.vfs/doc/include/changes/301.inc
new file mode 100644
index 00000000..d251e25d
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/301.inc
@@ -0,0 +1,41 @@
+[section {Changes for version 3.0.1}]
+[list_begin enumerated]
+
+[enum] Bugfixes all around. In detail:
+
+[enum] Fixed recording of Tcl version requirements. Keep package name
+and version together, unbreaking generated meta data and generated
+package load command.
+
+[enum] Fixed the build scripts: When installing, or wrapping for TEA,
+generate any missing directories
+
+[enum] Modified the build scripts to properly exit the application
+when the window of their GUI is closed through the (X) button.
+
+[enum] Removed an 8.5-ism (open wb) which had slipped into the main
+build script.
+
+[enum] Modified the example build scripts to separate the output for
+the different examples (and packages) by adding empty lines.
+
+[enum] stack::c example bugfix: Include API declarations for use in
+the companion files.
+
+[enum] Extended the documentation: Noted the need for a working
+installation of a C compiler.
+
+[enum] Extended the Windows target definitions and code to handle the
+manifest files used by modern MS development environments. Note that
+this code handles both possibilities, environment using manifests, and
+(old(er)) environments without.
+
+[enum] Extended the Windows 64bit target definitions and code to
+auto-detect the need for the helper library "bufferoverflowU.lib" and
+reconfigure the compile and link commands appropriately. We assume
+that the library must be linked when present. This should be no harm
+if the library is present, yet not needed. Just superfluous. We search
+for the library in the paths specified by the environment variable
+LIB.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/302.inc b/src/vfs/critcl.vfs/doc/include/changes/302.inc
new file mode 100644
index 00000000..48bca053
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/302.inc
@@ -0,0 +1,17 @@
+[section {Changes for version 3.0.2}]
+[list_begin enumerated]
+
+[enum] Fixed issue in compile-and-run mode where commands put into the
+auto_index are not found by Tcl's [lb]unknown[rb] command.
+
+[enum] Fixed an array key mismatch breaking usage of client data and
+delete function for procedure. Reported by Jos DeCoster, with patch.
+
+[enum] Implemented a command line option [option -L], an equivalent of
+option [option -I], just for library search paths.
+
+[enum] Fixed github issues 5 and 8. Working around a missing variable
+::errorInfo. It should always be present, however there seem to be
+revisions of Tcl around which violate this assumption.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/303.inc b/src/vfs/critcl.vfs/doc/include/changes/303.inc
new file mode 100644
index 00000000..2944258e
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/303.inc
@@ -0,0 +1,9 @@
+[section {Changes for version 3.0.3}]
+[list_begin enumerated]
+
+[enum] Fixed github issues 5 and 8, for the example build.tcl
+scripts. Working around a missing variable ::errorInfo. It should
+always be present, however there seem to be revisions of Tcl around
+which violate this assumption.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/304.inc b/src/vfs/critcl.vfs/doc/include/changes/304.inc
new file mode 100644
index 00000000..47c28589
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/304.inc
@@ -0,0 +1,38 @@
+[section {Changes for version 3.0.4}]
+[list_begin enumerated]
+
+[enum]	Fixed generation of the package's initname when the incoming
+	code is read from stdin and has no proper path.
+
+[enum]	Fixed github issue 11. Now using /LIBPATH instead of -L
+	on Windows (libinclude configuration setting).
+
+[enum]	Extended critcl to handle -l:path format of -l options.
+	GNU ld 2.22+ handles this by searching for the path as
+	is. Good when specifying static libraries, as plain -l looks
+	for shared libraries in preference over static. critcl handles
+	it now, as older GNU ld's do not understand it, nor the
+	various vendor-specific linkers.
+
+[enum]	Fixed github issue #12. CriTcl now determines the version of
+	MSVC in use and uses it to switch between various link debug
+	options. Simplified the handling of bufferoverflowU.lib also,
+	making use of the same mechanism and collapsing the two
+	configurations sections we had back into one.
+
+[enum]	Reworked the insertion of #line pragmas into the generated C
+	code to avoid limitations on the line number argument imposed
+	by various compilers, and be more accurate.
+
+[enum]	Modified argument processing. Option -libdir now also
+	implies -L for its argument.
+
+[enum]	Extended handling of option -show ([cmd critcl::showconfig])
+	to list the path of the configuration file the data is coming
+	from. Good for debugging configuration processing.
+
+[enum]	Extended the build script with targets to regenerate the
+	embedded documentation, and diagrams, and to generate a
+	release.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/305.inc b/src/vfs/critcl.vfs/doc/include/changes/305.inc
new file mode 100644
index 00000000..f83e3cb2
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/305.inc
@@ -0,0 +1,10 @@
+[section {Changes for version 3.0.5}]
+[list_begin enumerated]
+
+[enum]  Fixed bug in the new code for #line pragmas triggered when
+	specifying C code without leading whitespace.
+
+[enum]	Extended the documentation to have manpages for the license,
+	source retrieval, installer, and developer's guides.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/306.inc b/src/vfs/critcl.vfs/doc/include/changes/306.inc
new file mode 100644
index 00000000..4dd90439
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/306.inc
@@ -0,0 +1,16 @@
+[section {Changes for version 3.0.6}]
+[list_begin enumerated]
+
+[enum]	Fixed github issue 10. The critcl application now delivers a
+	proper exit code (1) on build failure, instead of always
+	indicating success (status 0).
+
+[enum]	Fixed github issue 13. Handling of bufferoverflowU.lib for
+	release builds was inconsistent with handling for debug
+	builds. It is now identically handled (conditional) by
+	both cases.
+
+[enum] 	Documentation cleanup, mainly in the installation guide, and
+	the README.md shown by github
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/307.inc b/src/vfs/critcl.vfs/doc/include/changes/307.inc
new file mode 100644
index 00000000..5a9d0483
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/307.inc
@@ -0,0 +1,11 @@
+[section {Changes for version 3.0.7}]
+[list_begin enumerated]
+
+[enum]  Fixed the code generated by [cmd critcl::c++command].
+        The emitted code handed a non-static string table to
+	[fun Tcl_GetIndexFromObj], in violation of the contract, which
+	requires the table to have a fixed address. This was a memory
+	smash waiting to happen. Thanks to Brian Griffin for alrerting
+	us to the general problem.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/31.inc b/src/vfs/critcl.vfs/doc/include/changes/31.inc
new file mode 100644
index 00000000..3f5dde95
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/31.inc
@@ -0,0 +1,107 @@
+[include 31181.inc]
+[include 3118.inc]
+[include 3117.inc]
+[include 3116.inc]
+[include 3115.inc]
+[include 3114.inc]
+[include 3113.inc]
+[include 3112.inc]
+[include 3111.inc]
+[include 3110.inc]
+[include 319.inc]
+[include 318.inc]
+[include 317.inc]
+[include 316.inc]
+[include 315.inc]
+[include 314.inc]
+[include 313.inc]
+[include 312.inc]
+[include 311.inc]
+
+[section {Changes for version 3.1}]
+[list_begin enumerated]
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[enum] Added a new higher-level package [package critcl::iassoc].
+
+[para] This package simplifies the creation of code associating data
+with an interpreter via Tcl's [fun Tcl_(Get|Set)AssocData()] APIs. The
+user can concentrate on his data while all the necessary boilerplate
+C code to support this is generated by the package.
+
+[para] This package uses several of the new features which were added
+to the core [package critcl] package, see below.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[enum] Added the higher-level package [package critcl::class].
+
+[para] This package simplifies the creation of C level objects with
+class and instance commands. The user can write a class definition
+with class- and instance-variables and -methods similar to a TclOO
+class, with all the necessary boilerplate C code to support this
+generated by the package.
+
+[para] This package uses several of the new features which were added
+to the core [package critcl] package, see below.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[enum] Extended the API for handling TEApot metadata. Added the
+command [cmd critcl::meta?] to query the stored information. Main use
+currently envisioned is retrieval of the current package's name by
+utility commands, for use in constructed names. This particular
+information is always available due to the static scan of the package
+file on execution of the first critcl command.
+
+[para] The new packages [package critcl::iassoc] and
+[package critcl::class] (see above) are users of this command.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[enum] Extended the API with a command, [cmd critcl::name2c], exposing
+the process of converting a Tcl name into base name, namespace, and C
+namespace. This enables higher-level code generators to generate the same
+type of C identifiers as [package critcl] itself.
+
+[para] The new package [package critcl::class] (see above) is a user
+of this command.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[enum] Extended the API with a command, [cmd critcl::source],
+executing critcl commands found in a separate file in the context of
+the current file. This enables easier management of larger bodies of
+code as it allows the user to split such up into easier to digest
+smaller chunks without causing the generation of multiple packages.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[enum] Related to the previous item, extended the API with commands to
+divert collection of generated C code into memory. This makes it
+easier to use the commands for embedded C code in higher-level code
+generators.
+
+[para] See the section [sectref {Advanced: Diversions}] for details of
+the provided commands.
+
+[para] The new package [package critcl::class] (see above) is a user
+of these facilities.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[enum] Extended the API with commands helping developers with the
+generation of proper C [term #line] directives. This allows
+higher-level code generators to generate and insert their own
+directives, ensuring that compile errors in their code are properly
+attributed.
+
+[para] See the section [sectref {Advanced: Location management}] for
+details of the provided commands.
+
+[para] The new packages [package critcl::iassoc] and
+[package critcl::class] (see above) are users of these facilities.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[enum] Extended the API with commands giving users the ability to
+define custom argument and result types for [cmd ::critcl::cproc].
+
+[para] See the section [sectref {CriTcl cproc Type Reference}] for
+details of the provided commands.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/311.inc b/src/vfs/critcl.vfs/doc/include/changes/311.inc
new file mode 100644
index 00000000..f21f355e
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/311.inc
@@ -0,0 +1,18 @@
+[section {Changes for version 3.1.1}]
+[list_begin enumerated]
+
+[enum] Bugfixes all around. In detail:
+
+[enum] Fixed the generation of wrong#args errors for
+[cmd critcl::cproc] and derived code ([package critcl::class]
+cproc-based methods). Use NULL if there are no arguments, and
+take the offset into account.
+
+[enum] Fixed the handling of package names by
+[package critcl::class]. Forgot that they may contain namespace
+separators. Bumped to version 1.0.1.
+
+[enum] Extended a [package critcl::class] generated error message in
+instance creation for clarity. Bumped to version 1.0.2.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/3110.inc b/src/vfs/critcl.vfs/doc/include/changes/3110.inc
new file mode 100644
index 00000000..81c739d7
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/3110.inc
@@ -0,0 +1,20 @@
+[section {Changes for version 3.1.10}]
+[list_begin enumerated]
+
+[enum]	Fixed code version numbering forgotten with 3.1.9.
+
+[enum]	Fixed issue #35. In package mode (-pkg) the object cache
+	directory is unique to the process, thus we do not need
+	content-hashing to generate unique file names. A simple
+	counter is sufficient and much faster.
+[para]
+	Note that mode "compile & run" is not as blessed and still
+	uses content-hasing with md5 to ensure unique file names
+	in its per-user object cache.
+
+[enum]	Fixed issue where the [cmd ccommand] forgot to use its body as
+	input for the UUID generation. Thus ignoring changes to it in
+	mode compile & run, and not rebuilding a library for changed
+	sources. Bug and fix reported by Peter Spjuth.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/3111.inc b/src/vfs/critcl.vfs/doc/include/changes/3111.inc
new file mode 100644
index 00000000..a568acc7
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/3111.inc
@@ -0,0 +1,27 @@
+[section {Changes for version 3.1.11}]
+[list_begin enumerated]
+
+[enum] Fixed issue #37, via pull request #38, with thanks to
+       Jos DeCoster. Information was stored into the v::delproc
+       and v::clientdata arrays using a different key than when
+       retrieving the same information, thus failing the latter.
+
+[enum] New convenience command [cmd critcl::include] for easy
+       inclusion of headers and other C files.
+
+[enum] New command [cmd critcl::make] to generate a local header of
+       other C files for use by other parts of a package through
+       inclusion.
+
+[enum] New utility package [package critcl::literals] for quick and
+       easy setup of and access to pools of fixed Tcl_Obj* strings.
+
+       Built on top of [package critcl::iassoc].
+
+[enum] New utility package [package critcl::bitmap] for quick and easy
+       setup and use of mappings between C bitsets and Tcl lists whose
+       string elements represent that set.
+
+       Built on top of [package critcl::iassoc].
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/3112.inc b/src/vfs/critcl.vfs/doc/include/changes/3112.inc
new file mode 100644
index 00000000..eac50adb
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/3112.inc
@@ -0,0 +1,36 @@
+[section {Changes for version 3.1.12}]
+[list_begin enumerated]
+
+[enum] Fixed issue 42. Clear ::errorInfo immediately after startup to
+       prevent leakage of irrelevant (caught) errors into our script
+       and confusing the usage code.
+
+[enum] Fixed issue 40. Keep the order of libraries, and allow
+       duplicates. Both are things which are occasionally required for
+       proper linking.
+
+[enum] Extended the utility package [package critcl::literals] to
+       declare a cproc result-type for a pool.
+
+[para] Further fixed the generated header to handle multiple inclusion.
+
+[para] Bumped version to 1.1.
+
+[enum] Fixed issue with utility package [package critcl::bitmap].
+
+[para] Fixed the generated header to handle multiple inclusion.
+
+[para] Bumped version to 1.0.1.
+
+[enum] Created new utility package [package critcl::enum] for the
+       quick and easy setup and use of mappings between C values
+       and Tcl strings.
+
+       Built on top of [package critcl::literals].
+
+[enum] Added examples demonstrating the use of the utility packages
+	[package critcl::literals],
+	[package critcl::bitmap], and
+	[package critcl::enum]
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/3113.inc b/src/vfs/critcl.vfs/doc/include/changes/3113.inc
new file mode 100644
index 00000000..446810a6
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/3113.inc
@@ -0,0 +1,69 @@
+[section {Changes for version 3.1.13}]
+[list_begin enumerated]
+
+[enum]	Merged PR #43. Fixed bug loading adjunct Tcl sources.
+
+[enum]	Fixes in documentation and generated code of package
+	"critcl::enum". Bumped to version 1.0.1.
+
+[enum]	Fixes in documentation of package "critcl::bitmap".
+
+[enum]	New package "critcl::emap". In essence a variant or cross of
+	"critcl::bitmap" with behaviour like "critcl::enum".
+
+[enum]	Merged PR #49. Fixed documentation typo.
+
+[enum]	Merged PR #46. Fixed documentation typo.
+
+[enum]	Merged PR #47. Fixes to test results to match the accumulated
+	code changes. Also made portable across Tcl versions (varying
+	error syntax).
+
+[enum]	New predefined argument- and result-type "wideint" mapping to
+	Tcl_WideInt.
+
+[enum]	New predefined argument-type "bytes" mapping to tuple of
+	byte-array data and length. Note: The existing "bytearray"
+	type (and its aliases) was left untouched, to keep backward
+	compatibility.
+
+[enum]	Modified the internal interface between the Tcl shim and C
+	function underneath "critcl::cproc" with respect to the
+	handling of optional arguments.
+
+	An optional argument "X" now induces the use of two C
+    	arguments, "X" and "has_X".  The new argument "has_X" is of
+    	boolean (int) type. It is set to true when X is set, and set
+    	to false when X has the default value. C code which cares
+    	about knowing if the argument is default or not is now able to
+    	check that quickly, without having to code the default value
+    	inside.
+
+	NOTE: This change is visible in the output of the advanced
+    	      commands "argcnames", "argcsignature", "argvardecls",
+    	      and "argconversion".
+
+[enum]	Fixed issue #50 and documented the availability of variable
+	"interp" (type Tcl_Interp*) within "critcl::cinit" C code
+	fragments.
+
+	Note that while the old, undocumented name of the variable,
+	"ip", is still usable, it is deprecated. It will be fully
+	removed in two releases, i.e. for release 3.1.15.
+
+	The variable name was changed to be consistent with other code
+	environments.
+
+[enum]	Fixed issue #51. Disabled the generation of #line directives
+	for "critcl::config lines 0" coming from template files, or
+	code generated with them before the final value of this
+	setting was known.
+
+[enum]	Fixed issue with handling of namespaced package names in
+	"critcl::iassoc". Equivalent to a bug in "critcl::class" fixed
+	for critcl 3.1.1, critcl::class 1.0.1.
+
+	Note: "literals", "enum", "emap", and "bitmap" do not require
+	a fix as they are all built on top of "iassoc".
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/3114.inc b/src/vfs/critcl.vfs/doc/include/changes/3114.inc
new file mode 100644
index 00000000..49b7eefb
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/3114.inc
@@ -0,0 +1,38 @@
+[section {Changes for version 3.1.14}]
+[list_begin enumerated]
+
+[enum]  Fixed issue #36. Added message to target [const all] of the
+        Makefile generated for TEA mode. Additionally tweaked other
+        parts of the output to be less noisy.
+
+[enum]  Accepted request implied in issue #54. Unconditionally save
+        the compiler/linker build log into key [const log] of the
+        dictionary returned by [cmd cresults], and save a copy of only
+        the execution output in the new key [const exl] ("execution
+        log").
+
+[enum]  Fixed issue #53. Clarified the documentation of commands
+        [cmd critcl::load] and [cmd critcl::failed] with regard
+        to their results and the throwing of errors (does not happen).
+
+[enum]  Fixed issue #48. Modified mode "compile & run" to allow new
+        declarations in a file, after it was build, instead of
+        erroring out. The new decls are build when needed. Mode
+        "precompile" is unchanged and will continue to trap the
+        situation.
+
+[enum]  Fixed issue #52. Updated the local Tcl/Tk headers to
+        8.4.20, 8.5.13, and 8.6.4.
+
+[enum]  Fixed issue #45. New feature command [cmd critcl::cconst].
+
+[enum]  [package critcl::util]: New command [cmd locate] to find a
+        file across a set of paths, and report an error when not
+        found. This is for use in autoconf-like header-searches and
+        similar configuration tests.
+
+[enum]  Modified 'AbortWhenCalledAfterBuild' to dump the entire stack
+        (info frame!). This should make it easier to determine the
+        location of the troubling declaration.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/3115.inc b/src/vfs/critcl.vfs/doc/include/changes/3115.inc
new file mode 100644
index 00000000..227ad30c
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/3115.inc
@@ -0,0 +1,6 @@
+[section {Changes for version 3.1.15}]
+[list_begin enumerated]
+
+[enum]  Fixed version number bogosity with [const 3.1.14].
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/3116.inc b/src/vfs/critcl.vfs/doc/include/changes/3116.inc
new file mode 100644
index 00000000..7ad45543
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/3116.inc
@@ -0,0 +1,59 @@
+[section {Changes for version 3.1.16}]
+[list_begin enumerated]
+
+[enum] New feature. Extended [cmd critcl::cproc]'s argument handling
+       to allow arbitrary mixing of required and optional arguments.
+
+[enum] New feature.
+       [emph {Potential Incompatibility}].
+[para] Extended [cmd critcl::cproc]'s argument handling to treat an
+       argument [const args] as variadic if it is the last argument of
+       the procedure.
+
+[enum] New feature. Added two introspection commands,
+       [cmd critcl::has-argtype] and [cmd critcl::has-resulttype].
+       These enable a user to test if a specific (named) type
+       conversion is implemented or not.
+
+[enum] Added new result type [const Tcl_Obj*0], with alias
+       [const object0]. The difference to [const Tcl_Obj*] is in
+       the reference counting.
+
+[enum] Extended the command [cmd critcl::argtypesupport] with new
+       optional argument through which to explicitly specify the
+       identifier for guarding against multiple definitions.
+
+[enum] Bugfix: Fixed problem with the implementation of issue #54 (See
+       3.1.14). Always create the secondary log file. Otherwise
+       end-of-log handling may break, unconditionally assuming its
+       existence.
+
+[enum] Bugfix: Fixed problem with the internal change to the hook
+       [const HandleDeclAfterBuild]. Corrected the forgotten
+       [cmd critcl::cconst].
+
+[enum] Debugging aid: Added comment holding the name of the result
+       type when emitting result conversions.
+
+[enum] Bugfix: Fixed issue #60. Unbundled the package directories
+       containing multiple packages. All directories under [file lib/]
+       now contain exactly one package.
+
+[enum] Bugfix: Fixed issue #62, a few [cmd {dict exists}] commands
+       operating on a fixed string instead of a variable.
+
+[enum] Bugfix: Fixed issue #56. Release builders are reminded to run
+       the tests.
+
+[enum] Bugfix: Fixed issue #55. For FreeBSD critcl's platform package
+       now identifies the Kernel ABI version. Initialization of the
+       cache directory now also uses [cmd platform::identify] for the
+       default path, instead of [cmd platform::generic].
+
+[enum] Bugfix: Fixed issue #58. Simplified the setup and use of
+       md5. CriTcl now makes use of its own package for md5, using
+       itself to built it. There is no chicken/egg problem with this
+       as the [option -pkg] mode used for this does not use md5. That
+       is limited to mode [term {compile & run}].
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/3117.inc b/src/vfs/critcl.vfs/doc/include/changes/3117.inc
new file mode 100644
index 00000000..fd9af293
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/3117.inc
@@ -0,0 +1,65 @@
+[section {Changes for version 3.1.17}]
+[list_begin enumerated]
+
+[enum] Extension: Allow duplicate arg- and result-type definitions if
+       they are fully identical.
+
+[enum] Bugfix. The application mishandled the possibility of
+       identical-named [cmd critcl::tsource]s. Possible because
+       [cmd critcl::tsource]s can be in subdirectories, a structure
+       which is [emph not] retained in the assembled package, causing
+       such files to overwrite each other and at least one lost. Fixed
+       by adding a serial number to the file names in the assembled
+       package.
+
+[enum] Bugfix in the static scanner which made it loose requirement
+       information. Further added code to generally cleanup results at
+       the end (removal of duplicates, mainly).
+
+[enum] Bugfix: Fixed issue #76.
+       Support installation directories which are not in the [var auto_path].
+       Without the patch the installed [cmd critcl] will not find its
+       own packages and fail. Thank you to
+       [uri https://github.com/lupylucke {Simon Bachmann}] for the
+       report and patch, and then his patience with me to getting to
+       actually apply it.
+
+[enum] Bugfix: Fixed issue #75.
+       Extended [cmd critcl::include] to now take multiple paths.
+
+[enum] Added new compatibility package [package lmap84].
+
+[enum] Fixed typos in various documentation files.
+
+[enum] Fixed bug introduced by commit 86f415dd30 (3.1.16 release). The
+       separation of [cmd critcl::ccode] into user and work layers
+       means that location retrieval has to go one more level up to
+       find the user location.
+
+[enum] New supporting package [package critcl::cutil]. Provides common
+       C level facilities useful to packages (assertions, tracing,
+       memory allocation shorthands).
+
+[enum] Modified package [package critcl] to make use of the new
+       tracing facilities to provide tracing of arguments and results
+       for [cmd critcl::ccommand] and [cmd critcl::cproc] invokations.
+
+[enum] Modified packages [package critcl] and [package critcl::class]
+       to provide better function names for (class) method tracing.
+       Bumped package [package critcl::class] to version 1.0.7.
+
+[enum] Extended the support package [package critcl::literals] with
+       limited configurability. It is now able to generate code for
+       C-level access to the pool without Tcl types (Mode [const c]).
+       The previously existing functionality is accesssible under mode
+       [const tcl], which also is the default. Both modes can be used
+       together.
+
+[enum] Extended the support package [package critcl::emap] with
+       limited configurability. It is now able to generate code for
+       C-level access to the mapping without Tcl types
+       (Mode [const c]). The previously existing functionality is
+       accessible under mode [const tcl], which also is the
+       default. Both modes can be used together.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/3118.inc b/src/vfs/critcl.vfs/doc/include/changes/3118.inc
new file mode 100644
index 00000000..f733b68f
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/3118.inc
@@ -0,0 +1,100 @@
+[section {Changes for version 3.1.18}]
+[list_begin enumerated]
+
+[enum] Feature (Developer support). Merged pull request #96 from
+       sebres/main-direct-invoke. Enables direct invokation of the
+       [file main.tcl] file for starkits from within a dev checkout,
+       i.e. outside of a starkit, or starpack.
+
+[enum] Feature. Added channel types to the set of builtin argument and
+       result types. The argument types are for simple channel access,
+       access requiring unshared channels, and taking the channel
+       fully into the C level, away from Tcl. The result type comes in
+       variants for newly created channels, known channels, and to
+       return taken channels back to Tcl. The first will register the
+       returned value in the interpreter, the second assumes that it
+       already is.
+
+[enum] Bugfix. Issue #96. Reworked the documentation around the
+       argument type [type Tcl_Interp*] to make its special status
+       more visible, explain uses, and call it out from result types
+       where its use will be necessary or at least useful.
+
+[enum] Feature. Package [package critcl::class] bumped to version 1.1.
+       Extended with the ability to create a C API for classes, and
+       the ability to disable the generation of the Tcl API.
+
+[enum] Bugfix. Merged pull request #99 from pooryorick/master. Fixes
+       to the target directory calculations done by the install code.
+
+[enum] Merged pull request #94 from andreas-kupries/documentation.
+       A larger documentation cleanup. The main work was done by
+       pooryorick, followed by tweaks done by myself.
+
+[enum] Extended the test suite with lots of cases based on the
+       examples for the various generator packages. IOW the new test
+       cases replicate/encapsulate the examples and demonstrate that
+       the packages used by the examples generate working code.
+
+[enum] Bugfix. Issue #95. Changed the field [const critcl_bytes.s] to
+       [type {unsigned char*}] to match Tcl's type. Further constified
+       the field to make clear that read-only usage is the common case
+       for it.
+
+[enum] Bugfix/Feature. Package [package critcl::cutil] bumped to
+       version 0.2.  Fixed missing inclusion of header [file string.h]
+       in [file critcl_alloc.h], needed for [fun memcpy] in macro
+       [fun STREP].  Added macros [fun ALLOC_PLUS] and [fun STRDUP].
+       Moved documentation of [fun STREP...] macros into proper place
+       (alloc section, not assert).
+
+[enum] Merged pull request #83 from apnadkarni/vc-fixes.
+       Removed deprecated -Gs for MSVC builds, and other Windows fixups.
+
+[enum] Feature. Package [package critcl::iassoc] bumped to version 1.1.
+       Refactored internals to generate an include header for use by .c files.
+       This now matches what other generator packages do.
+       The template file is inlined and removed.
+
+[enum] Merged pull request #82 from gahr/home-symlink
+       Modified tests to handle possibility of $HOME a symlink.
+
+[enum] Merged pull request #81 from gahr/test-not-installed
+       Modified test support to find uninstalled critcl packages when
+       running tests. Handles all but critcl::md5.
+
+[enum] Merged pull request #85 from snoe925/issue-84
+       to fix Issue #84 breaking installation on OSX.
+
+[enum] Merged pull request #87 from apnadkarni/tea-fixes to fix Issue
+       #86, broken -tea option, generating an incomplete package.
+
+[enum] Feature. New package [package critcl::callback] providing
+       C-level functions and data structures to manage callbacks from
+       C to Tcl.
+
+[enum] Feature. Package [package critcl::literals] bumped to version
+       1.3.  Added mode [const +list] enabling the conversion of
+       multiple literals into a list of their strings.
+
+[enum] Feature. Package [package critcl::enum] bumped to version 1.1.
+       Added basic mode handling, supporting [const tcl] (default) and
+       [const +list] (extension enabling the conversion of multiple
+       enum values into a list of their strings).
+
+[enum] Feature. Package [package critcl::emap] bumped to version 1.2.
+       Extended existing mode handling with [const +list] extension
+       enabling the conversion of multiple emap values into a list of
+       their strings.
+
+[enum] Feature. Extended the set of available types by applying a few
+       range restrictions to the scalar types ([term int],
+       [term long], [term wideint], [term double], [term float]).
+
+       [para] Example: [term {int > 0}] is now a viable type name.
+
+       [para] This is actually more limited than the description might
+       let you believe.
+
+       [para] See the package reference for the details.
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/31181.inc b/src/vfs/critcl.vfs/doc/include/changes/31181.inc
new file mode 100644
index 00000000..8270ddb5
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/31181.inc
@@ -0,0 +1,17 @@
+[section {Changes for version 3.1.18.1}]
+[list_begin enumerated]
+
+[enum] [strong Attention]: While the overall version (of the bundle)
+       moves to 3.1.18.1 the versions of packages [package critcl] and
+       [package critcl::app] are [strong unchanged].
+
+[enum] [strong Bugfix] Generally removed a number of 8.5-isms which
+       slipped into 3.1.18, breaking ability to use it with Tcl 8.4.
+
+[enum] [strong Bugfix] Corrected broken [strong {build.tcl uninstall}].
+
+[enum] [strong Bugfix] Package [package critcl::class] bumped to
+       version 1.1.1. Fixed partial template substitution breaking
+       compilation of the generated code.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/312.inc b/src/vfs/critcl.vfs/doc/include/changes/312.inc
new file mode 100644
index 00000000..89ccbd44
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/312.inc
@@ -0,0 +1,14 @@
+[section {Changes for version 3.1.2}]
+[list_begin enumerated]
+
+[enum] Enhancement. In detail:
+
+[enum] Extended [cmd critcl::cproc] to be able to handle optional
+       arguments, in a limited way. This is automatically available to
+       [package critcl::class] cproc-based methods as well.
+
+[enum] Bugfix in [cmd lassign] emulation for Tcl 8.4.  Properly set
+       unused variables to the empty string.  Bumped version of
+       emulation package [package lassign84] to 1.0.1.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/313.inc b/src/vfs/critcl.vfs/doc/include/changes/313.inc
new file mode 100644
index 00000000..34fccc8d
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/313.inc
@@ -0,0 +1,20 @@
+[section {Changes for version 3.1.3}]
+[list_begin enumerated]
+
+[enum] Enhancement. In detail:
+
+[enum] Added new argument type "pstring", for "Pascal String", a
+       counted string, i.e. a combination of string pointer and string
+       length.
+
+[enum] Added new methods [cmd critcl::argtypesupport] and
+       [cmd ::critcl::argsupport] to define and use additional
+       supporting code for an argument type, here used by "pstring"
+       above to define the necessary structure.
+
+[enum] Semi-bugfixes in the packages [package critcl::class] and
+       [package critcl::iassoc]. Pragmas for the AS meta data scanner
+       to ensure that the template files are made part of the package.
+       Versions bumped to 1.0.4 and 1.0.1 respectively.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/314.inc b/src/vfs/critcl.vfs/doc/include/changes/314.inc
new file mode 100644
index 00000000..9e4bb114
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/314.inc
@@ -0,0 +1,14 @@
+[section {Changes for version 3.1.4}]
+[list_begin enumerated]
+
+[enum] Bugfix in package [package critcl::class]. Generate a dummy
+       field in the class structure if the class has no class
+       variables. Without this change the structure would be empty,
+       and a number of compilers are not able to handle such a type.
+
+[enum] Fixed a typo which broke the win64 configuration.
+
+[enum] Fixed issue #16, a typo in the documentation of command
+       [cmd critcl::class].
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/315.inc b/src/vfs/critcl.vfs/doc/include/changes/315.inc
new file mode 100644
index 00000000..e66e02e9
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/315.inc
@@ -0,0 +1,12 @@
+[section {Changes for version 3.1.5}]
+[list_begin enumerated]
+
+[enum] Fixed issue #19. Made the regular expression extracting the
+       MSVC version number more general to make it work on german
+       language systems. This may have to be revisited in the future,
+       for other Windows locales.
+
+[enum] Fixed issue #20. Made option -tea work on windows, at least in
+       a unix emulation environment like msys/mingw.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/316.inc b/src/vfs/critcl.vfs/doc/include/changes/316.inc
new file mode 100644
index 00000000..b7307ab5
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/316.inc
@@ -0,0 +1,28 @@
+[section {Changes for version 3.1.6}]
+[list_begin enumerated]
+
+[enum] Fixed issue #21. While the multi-definition of the stub-table
+       pointer variables was ok with for all the C linkers seen so far
+       C++ linkers did not like this at all. Reworked the code to
+       ensure that this set of variables is generated only once, in
+       the wrapper around all the pieces to assemble.
+
+[enum] Fixed issue #22, the handling of the command identifier
+       arguments of [cmd critcl::ccommand], [cmd critcl::cproc], and
+       [cmd critcl::cdata]. We now properly allow any Tcl identifier
+       and generate proper internal C identifiers from them.
+
+[para] As part of this the signature of command [cmd critcl::name2c]
+       changed. The command now delivers a list of four values instead
+       of three. The new value was added at the end.
+
+[para] Further adapted the implementation of package
+       [package critcl::class], a user of [cmd critcl::name2c].
+       This package is now at version 1.0.6 and requires critcl 3.1.6
+
+[para] Lastly fixed the mis-handling of option [option -cname] in
+       [cmd critcl::ccommand], and [cmd critcl::cproc].
+
+[enum] Fixed issue #23.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/317.inc b/src/vfs/critcl.vfs/doc/include/changes/317.inc
new file mode 100644
index 00000000..5c36440e
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/317.inc
@@ -0,0 +1,16 @@
+[section {Changes for version 3.1.7}]
+[list_begin enumerated]
+
+[enum]	Fixed issue #24. Extract and unconditionally display compiler
+	warnings found in the build log. Prevents users from missing
+	warnings which, while not causing the build to fail, may
+	still indicate problems.
+
+[enum] 	New feature. Output hook. All non-messaging user output is now
+	routed through the command [cmd critcl::print], and users are
+	allowed to override it when using the critcl application-as-package.
+
+[enum]	New feature, by Ashok P. Nadkarni. Platform configurations can
+	inherit values from configurations defined before them.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/318.inc b/src/vfs/critcl.vfs/doc/include/changes/318.inc
new file mode 100644
index 00000000..8dd6961c
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/318.inc
@@ -0,0 +1,10 @@
+[section {Changes for version 3.1.8}]
+[list_begin enumerated]
+
+[enum]	Fixed issue with package indices generated for Tcl 8.4.
+	Join the list of commands with semi-colon, not newline.
+
+[enum]	Fixed issue #26 which brought up use-cases I had forgotten to
+	consider while fixing bug #21 (see critcl 3.1.6).
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/319.inc b/src/vfs/critcl.vfs/doc/include/changes/319.inc
new file mode 100644
index 00000000..b7eb7c44
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/319.inc
@@ -0,0 +1,31 @@
+[section {Changes for version 3.1.9}]
+[list_begin enumerated]
+
+[enum]	Fixed issue #27. Added missing platform definitions for
+	various alternate linux and OS X targets.
+
+[enum]	Fixed issue #28. Added missing -mXX flags for linking at the
+	linux-{32,64}-* targets.
+
+[enum]	Fixed issue #29. Replaced the use of raw "cheaders"
+	information in the processing of "cdefines" with the proper
+	include directives derived from it.
+
+[enum]	Fixed the issue behind rejected pull request #30 by Andrew
+	Shadura. Dynamically extract the stubs variable declarations
+	from the Tcl header files and generate matching variable
+	definitions for use in the package code. The generated code
+	will now be always consistent with the headers, even when
+	critcl's own copy of them is replaced by system headers.
+
+[enum]	Fixed issue #31. Accepted patch by Andrew Shadura, with
+	changes (comments), for easier integration of critcl with
+	OS package systems, replacing critcl's copies of Tcl headers
+	with their own.
+
+[enum]	Fixed issue #32. Merged pull request by Andrew Shadura.
+	Various typos in documentation and comments.
+
+[enum]	Fixed issue #34. Handle files starting with a dot better.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/32.inc b/src/vfs/critcl.vfs/doc/include/changes/32.inc
new file mode 100644
index 00000000..479713ae
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/32.inc
@@ -0,0 +1,103 @@
+[include 321.inc]
+
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+[section {Changes for version 3.2}]
+
+[list_begin enumerated]
+
+[enum] [strong BREAKING] [vset critcl] now requires Tcl 8.6 to be run.
+
+[para] It also generates Tcl 8.6 extensions by default.
+
+[para] It is still possible to generates extensions for Tcl 8.4 and 8.5,
+       properly setting it via [cmd critcl::tcl].
+
+[para] [strong ATTENTION] It is planned to completely remove 8.4 and 8.5
+       support with [vset critcl] 3.3.
+
+       No date has been set for that release yet.
+
+[para] All utility packages have their versions and requirements bumped accordingly as
+       well.
+
+[enum] [strong BREAKING] [strong {Bug Fix}]
+       Issue [uri https://github.com/andreas-kupries/critcl/issues/115 #115].
+
+[para] Distributions using [syscmd build.tcl] for installation of critcl in their
+       packaging scripts have to be updated to the changed command signature of
+       [syscmd build.tcl] install, etc. See the details below.
+
+[para] Redone the argument handling for [method install], [method uninstall], and
+       [method targets]. The destination argument is gone.  All commands now take options
+       similar to what is known from GNU [syscmd configure], i.e.
+
+[list_begin options]
+[opt_def --prefix path]
+[opt_def --exec-prefix path]
+[opt_def --bin-dir path]
+[opt_def --lib-dir path]
+[opt_def --include-dir path]
+[list_end]
+
+[para] They now also respect the environment variable [var DESTDIR], and the associated
+       option [option --dest-dir].
+
+[para] The [option --prefix] defaults to the topdir from the bin directory holding the
+
+       [syscmd tclsh] running [syscmd build.tcl].  As Tcl command: [example {
+    file dirname [file dirname [info nameofexecutable]]
+}]
+
+[para] Added a command [method dirs] doing the same argument handling, for debugging.
+
+[enum] Removed the irrelevant packages [package autoscroll], [package cmdline],
+       [package dict84], [package lassign84], [package lmap84], [package snit],
+       [package snitbutton], and [package wikit].
+
+[enum] [strong {Documentation Redo}] Issue
+       [uri https://github.com/andreas-kupries/critcl/issues/116 #116].
+       Reworked the documentation to use the system of 4 quadrants.
+       Reworked the introduction (How To Use Critcl) to be strongly
+       based on a series of examples.
+
+[enum] [strong {Bug Fix}] Issue
+       [uri https://github.com/andreas-kupries/critcl/issues/125 #125].
+       Added missing method [method create] in object creation example
+       of installer documentation.
+
+[enum] [strong Feature]. Extended [cmd cproc] argument type processing. Now able to
+       auto-create restricted scalar types. I.e. types derived from [term int], etc. and
+       limited in the range of allowed values.
+
+[para] Further able to auto-create restricted list types, i.e. types derived from
+       [term list] and either limited in length, or in the type of the elements, or both.
+
+[enum] [strong {Bug Fix / Enhancement}] Issue
+       [uri https://github.com/andreas-kupries/critcl/issues/118 #118].  Modified
+       [cmd critcl::cproc] to accept C syntax for arguments, i.e.  Trailing comma on
+       argument names, leading comma on type names, and lone comma characters.
+
+[enum] [strong {Performance Fix}] for [term {compile & run}] mode.
+       Issue [uri https://github.com/andreas-kupries/critcl/issues/112 #112].
+
+[para] Moved the command activating more precise code location tracking out of package
+       [package critcl] into package [package critcl::app].
+
+[para] Because generating packages ahead of time can bear the performance penalty invoked
+       by this [strong global] setting.
+
+[para] Arbitrary libraries and applications using critcl dynamically
+       ([term {compile & run}]) on the other hand likely cannot, and should not.
+
+[enum] [strong Fix]
+       Issue [uri https://github.com/andreas-kupries/critcl/issues/109 #109].
+
+       Ignore [syscmd clang] suffices when computing the target identifier from a
+       configuration identifier.
+
+[enum] [strong Feature]. Bumped package [package critcl::cutil] to version 0.2.1.
+       Simplified the implementation of macro [cmd ASSERT] by taking the underlying
+       [fun Tcl_Panic]'s printf ability into account and added a new macro [cmd ASSERT_VA]
+       exporting the same ability to the user.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/321.inc b/src/vfs/critcl.vfs/doc/include/changes/321.inc
new file mode 100644
index 00000000..ffc08884
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/321.inc
@@ -0,0 +1,52 @@
+[section {Changes for version 3.2.1 (to come)}]
+[list_begin enumerated]
+
+[enum] As announced with 3.2:
+[list_begin enumerated]
+
+[enum] Removed support for Tcl 8.4 and 8.5.
+
+[enum] Removed support for the argument types
+       [type int*],
+       [type float*],
+       [type double*],
+       [type bytearray],
+       [type rawchar], and
+       [type rawchar*].
+[list_end]
+
+[enum] Modified packages to accept operation under Tcl 9.
+       Bumped package versions appropriately.
+       Bumped copyrights.
+
+[para] The [term {How To Adapt Critcl Packages for Tcl 9}]
+       contains the details relevant to writers of [vset critcl]-based packages.
+
+[enum] Set different minimum Tcl requirements for the 8.x and 9.x series.
+
+[para] If no minimum is declared the minimum depends on the Tcl version
+       used to run the critcl package or application.
+
+[para] When running under Tcl 9 the default minimum is version [const 9].
+       For anything else the new default minimum is [const 8.6].
+
+[para] [strong Reminder]: Support for Tcl 8.4 and 8.5 was removed.
+
+[enum] Made [file ~]-handling portable across the 8.x and 9 boundary
+       (via [const HOME] environment variable).
+
+[enum] Bumped embedded [package tclconfig] to version 2.67. Patch supplied by Paul Obermeier.
+
+[enum] [strong {Bug Fix}] [uri https://github.com/andreas-kupries/critcl/issues/127 #127]
+[enum] [strong {Bug Fix}] [uri https://github.com/andreas-kupries/critcl/issues/128 #128]
+[enum] [strong {Bug Fix}] [uri https://github.com/andreas-kupries/critcl/issues/129 #129]
+
+Fixed various typos in the documentation.
+
+[enum] Reworked internals of [package critcl::cutil]'s tracer to support operation in a
+       multi-threaded environment. This new mode is also default. The old single-threaded
+       mode can be (re)activated by defining [const CRITCL_TRACE_NOTHREADS].
+
+[para] Package bumped to version 0.4.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changes/X.inc b/src/vfs/critcl.vfs/doc/include/changes/X.inc
new file mode 100644
index 00000000..9e7004f2
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changes/X.inc
@@ -0,0 +1,10 @@
+[section {Changes for version X}]
+[list_begin enumerated]
+
+[enum] [strong Feature]. Bumped [Package critcl::cutil] to version
+       0.2.1. Simplified the implementation of macro [cmd ASSERT] by
+       taking the underlying Tcl_Panic's printf ability into account
+       and added a new macro [cmd ASSERT_VA] exporting the same
+       ability to the user.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/changesX.inc b/src/vfs/critcl.vfs/doc/include/changesX.inc
new file mode 100644
index 00000000..9e7004f2
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/changesX.inc
@@ -0,0 +1,10 @@
+[section {Changes for version X}]
+[list_begin enumerated]
+
+[enum] [strong Feature]. Bumped [Package critcl::cutil] to version
+       0.2.1. Simplified the implementation of macro [cmd ASSERT] by
+       taking the underlying Tcl_Panic's printf ability into account
+       and added a new macro [cmd ASSERT_VA] exporting the same
+       ability to the user.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/class_example.inc b/src/vfs/critcl.vfs/doc/include/class_example.inc
new file mode 100644
index 00000000..fe55d958
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/class_example.inc
@@ -0,0 +1,79 @@
+
+The example shown below is the specification of queue data structure,
+with most of the method implementations and support code omitted to
+keep the size down.
+
+[para] The full implementation can be found in the directory
+[file examples/queue] of the critcl source distribution/repository.
+
+[example {
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::buildrequirement {
+    package require critcl::class ; # DSL, easy spec of Tcl class/object commands.
+}
+
+critcl::cheaders util.h
+
+critcl::class::define ::queuec {
+    include util.h
+
+    insvariable Tcl_Obj* unget {
+	List object unget elements
+    } {
+	instance->unget = Tcl_NewListObj (0,NULL);
+	Tcl_IncrRefCount (instance->unget);
+    } {
+	Tcl_DecrRefCount (instance->unget);
+    }
+
+    insvariable Tcl_Obj* queue {
+	List object holding the main queue
+    } {
+	instance->queue = Tcl_NewListObj (0,NULL);
+	Tcl_IncrRefCount (instance->queue);
+    } {
+	Tcl_DecrRefCount (instance->queue);
+    }
+
+    insvariable Tcl_Obj* append {
+	List object holding new elements
+    } {
+	instance->append = Tcl_NewListObj (0,NULL);
+	Tcl_IncrRefCount (instance->append);
+    } {
+	Tcl_DecrRefCount (instance->append);
+    }
+
+    insvariable int at {
+	Index of next element to return from the main queue
+    } {
+	instance->at = 0;
+    }
+
+    support {... queue_peekget, queue_size, etc.}
+
+    method clear {} {...}
+    method destroy {...}
+
+    method get  as queue_peekget 1
+    method peek as queue_peekget 0
+
+    method put {item ...}
+
+    method size {} {
+	if ((objc != 2)) {
+	    Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	    return TCL_ERROR;
+	}
+
+	Tcl_SetObjResult (interp, Tcl_NewIntObj (queue_size (instance, NULL, NULL, NULL)));
+	return TCL_OK;
+    }
+
+    method unget {item} {...}
+}
+
+package provide queuec 1
+}]
diff --git a/src/vfs/critcl.vfs/doc/include/class_spec.inc b/src/vfs/critcl.vfs/doc/include/class_spec.inc
new file mode 100644
index 00000000..4a788a90
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/class_spec.inc
@@ -0,0 +1,10 @@
+
+Here we documents all class specification commands available inside of
+the class definition script argument of [cmd ::critcl::class::define].
+
+[subsection {General configuration}]          [include include/class_spec_general.inc]
+[subsection {Class lifetime management}]      [include include/class_spec_clife.inc]
+[subsection {Instance lifetime management}]   [include include/class_spec_ilife.inc]
+[subsection {Class variables and methods}]    [include include/class_spec_cvarm.inc]
+[subsection {Instance variables and methods}] [include include/class_spec_ivarm.inc]
+[subsection {Context dependent interactions}] [include include/class_spec_cdin.inc]
diff --git a/src/vfs/critcl.vfs/doc/include/class_spec_cdin.inc b/src/vfs/critcl.vfs/doc/include/class_spec_cdin.inc
new file mode 100644
index 00000000..bb370975
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/class_spec_cdin.inc
@@ -0,0 +1,52 @@
+
+This section documents the various interactions between the
+specification commands. While these are are all documented with the
+individual commands here they are pulled together to see at a glance.
+
+[list_begin enum]
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+
+[enum]	If you are using the command [cmd type] to specify an external
+	C type to use for the instance structure you are subject to
+	the following constraints and rules:
+
+[list_begin enum]
+[enum]	You cannot define your own instance variables.
+[enum]	You cannot define your own class variables.
+[enum]	You cannot use [cmd method_introspection].
+[enum]	You have to allocate and release the instance structure on your
+	own, through [cmd constructor] and [cmd destructor] code blocks.
+[list_end]
+[comment {-- type done}]
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+
+[enum]	If you declare class variables you are subject to the
+	following constraints and rules:
+
+[list_begin enum]
+[enum]	You cannot use [cmd type].
+[enum]	The system generates an instance variable [const class] for
+	you, which points from instance to class structure. This makes
+	you also subject to the rules below, for instance variables.
+[list_end]
+[comment {-- class variable done}]
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+
+[enum]	If you declare instance variables (possibly automatic, see
+	above) you are subject to following constraints and rules:
+
+[list_begin enum]
+[enum]	You cannot use [cmd type].
+[enum]	The system generates and manages an instance variable
+	[const cmd] for you, which holds the Tcl_Command token
+	of the instance command.
+[enum]	The system generates an instance method [const destroy] for
+	you.
+[enum]	The system manages allocation and release of the instance
+	structure for you. You have to care only about the instance
+	variables themselves.
+[list_end]
+[comment {-- instance variable done}]
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/class_spec_clife.inc b/src/vfs/critcl.vfs/doc/include/class_spec_clife.inc
new file mode 100644
index 00000000..f2fc72ea
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/class_spec_clife.inc
@@ -0,0 +1,77 @@
+
+[list_begin definitions]
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd classconstructor] [arg body]]
+
+This command specifies a C code block surrounding the initialization
+of the class variables, i.e. the fields of the class structure.
+
+[emph Note] that allocation and release of the class structure itself
+is done by the system andf not the responsibility of the user.
+
+[para] For the initialization (and release) of a class variable it is
+recommended to use the [arg constructor] and [arg destructor]
+arguments of the variable's definition (See command
+[cmd classvariable]) for this instead of using a separate
+[cmd classconstructor].
+
+[para] This is an optional command. Using it more than once is allowed
+too and each use will add another C code fragment to use during
+construction. I.e. multiple calls aggregate.
+
+[para] The C code blocks of multiple calls (including the constructors
+of classvariable definitions) are executed in order of specification.
+
+[para] The result of the command is the empty string.
+
+[para] The C code in [arg body] has access to the following
+environment:
+
+[list_begin definitions]
+
+[def [var interp]] Pointer to the Tcl interpreter (Tcl_Interp*) the
+class structure will be associated with. It enables the generation
+of a Tcl error message should construction fail.
+
+[def [var class]] Pointer to the class structure to initialize.
+
+[def error] A C code label the constructor can jump to should it have
+to signal a construction failure. It is the responsibility of the
+constructor to release any variables already initialized before
+jumping to this label. This also why the 'execution in order of
+specification' is documented and can be relied on. It gives us the
+knowledge which other constructors have already been run and
+initialized what other fields.
+
+[list_end]
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd classdestructor] [arg body]]
+
+This command specifies a C code block surrounding the release of the
+class variables, i.e. the fields of the class structure.
+
+[emph Note] that allocation and release of the class structure itself
+is done by the system and not the responsibility of the user.
+
+[para] For the initialization (and release) of a class variable it is
+recommended to use the [arg constructor] and [arg destructor]
+arguments of the variable's definition (See command
+[cmd classvariable]) for this instead of using a separate
+[cmd classconstructor].
+
+[para] This is an optional command. Using it more than once is allowed
+too and each use will add another C code fragment to use during
+construction. I.e. multiple calls aggregate.
+
+[para] The C code blocks of multiple calls (including the constructors
+of class variable definitions) are executed in order of specification.
+
+[para] The result of the command is the empty string.
+
+[para] The C code in [arg body] has access to the same
+environment as the class constructor code blocks.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/class_spec_cvarm.inc b/src/vfs/critcl.vfs/doc/include/class_spec_cvarm.inc
new file mode 100644
index 00000000..76c89066
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/class_spec_cvarm.inc
@@ -0,0 +1,112 @@
+
+[list_begin definitions]
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd classvariable] [arg ctype] [arg name] [opt [arg comment]] \
+     [opt [arg constructor]] [opt [arg destructor]]]
+
+This command specifies a field in the class structure of the class.
+
+Multiple fields can be specified, and are saved in the order
+specified.
+
+[para] [emph Attention:] Specification of a class variable precludes
+the use of an external C [cmd type] for the instance structure.
+
+[para] [emph Attention:] Specification of a class variable
+automatically causes the definition of an instance variable named
+[const class], pointing to the class structure.
+
+[para] Beyond the basic [arg name] and C type of the new variable the
+definition may also contain a [arg comment] describing it, and C code
+blocks to initialize and release the variable.
+
+These are effectively local forms of the commands
+[cmd classconstructor] and [cmd classdestructor]. Please read their
+descriptions for details regarding the C environment available to the
+code.
+
+[para] The comment, if specified will be embedded into the generated C
+code for easier cross-referencing from generated [file .c] file to
+class specification.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd classmethod] [arg name] [method command] [arg arguments] \
+	[arg body]]
+
+This command specifies a class method and the C code block
+implementing its functionality. This is the first of three forms. The
+method is specified like a [cmd critcl::ccommand], with a fixed set of
+C-level arguments. The [arg body] has to perform everything
+(i.e. argument extraction, checking, result return, and of course the
+actual functionality) by itself.
+
+[para] For this the [arg body] has access to
+
+[list_begin definitions]
+[def [var class]] Pointer to the class structure.
+[def [var interp]] Pointer to the Tcl interpreter (Tcl_Interp*) the
+class structure is associated with
+[def [var objc]] The number of method arguments.
+[def [var objv]] The method arguments, as C array of Tcl_Obj pointers.
+[list_end]
+
+The [arg arguments] of the definition are only a human readable form
+of the method arguments and syntax and are not used in the C code,
+except as comments put into the generated code. Again, it is the
+responsibility of the [arg body] to check the number of arguments,
+extract them, check their types, etc.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd classmethod] [arg name] [method proc] [arg arguments] \
+	[arg resulttype] [arg body]]
+
+This command specifies a class method and the C code block
+implementing its functionality.  This is the second of three forms. The
+method is specified like a [cmd critcl::cproc].
+
+Contrary to the first variant here the [arg arguments] are computer
+readable, expected to be in the same format as the [arg arguments] of
+[cmd critcl::cproc]. The same is true for the [arg resulttype].
+
+The system automatically generates a wrapper doing argument checking
+and conversion, and result conversion, like for [cmd critcl::cproc].
+
+[para] The [arg body] has access to
+
+[list_begin definitions]
+[def [var class]] Pointer to the class structure.
+[def [var interp]] Pointer to the Tcl interpreter (Tcl_Interp*) the
+class structure is associated with
+[def ...] All [arg arguments] under their specified names and C types
+as per their definition.
+[list_end]
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd classmethod] [arg name] [method as] [arg funname] \
+	[opt [arg arg]...]]
+
+This command specifies a class method and the C code block
+implementing its functionality. This is the third and last of three
+forms.
+
+[para] The class method is implemented by the external function
+[arg funname], i.e. a function which is declared outside of the class
+code itself, or in a [cmd support] block.
+
+[para] It is assumed that the first four arguments of that function
+represent the parameters
+
+[list_begin definitions]
+[def [var class]] Pointer to the class structure.
+[def [var interp]] Pointer to the Tcl interpreter (Tcl_Interp*) the
+class structure is associated with
+[def [var objc]] The number of method arguments.
+[def [var objv]] The method arguments, as C array of Tcl_Obj pointers.
+[list_end]
+
+Any additional arguments specified will be added after these and are
+passed into the C code as is, i.e. are considered to be C expressions.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/class_spec_general.inc b/src/vfs/critcl.vfs/doc/include/class_spec_general.inc
new file mode 100644
index 00000000..8358ce03
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/class_spec_general.inc
@@ -0,0 +1,56 @@
+
+[list_begin definitions]
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd include] [arg path]]
+
+This command specifies the path of a header file to include within the
+code generated for the class. This is separate from the [cmd support]
+because the generated include directives will be put at the very
+beginning of the generated code. This is done to allow the use of the
+imported declarations within the instance type, and elsewhere.
+
+[para] [vset cumulative]
+
+It is of course possible to not use this command at all, for classes
+not making use of external definitions.
+
+[para] The result is the empty string.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd support] [arg code]]
+
+This command specifies supporting C code, i.e. any definitions (types,
+functions, etc.) needed by the [emph whole] class and not fitting into
+class- and instance-methods. The code is embedded at global level,
+outside of any function or other definition.
+
+[para] [vset cumulative]
+
+It is of course possible to not use this command at all, for classes
+not requiring supporting code.
+
+[para] The result of the command is the empty string.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd type] [arg name]]
+
+This command specifies the name of an external C type to be used as
+the type of the instance structure.
+
+[para] Initialization and release of the structure with the given type
+are the responsibility of the user, through [cmd constructor] and
+[cmd destructor] code fragments.
+
+[para][emph Attention:] Using this command precludes the use of
+regular class- and instance variables. It further precludes the use of
+[cmd method-introspection] as well, as this make use of generated
+instance-variables.
+
+[para] If class- and/or instance-variable have to be used in
+conjunction with an external C type, simply create and use a class- or
+instance-variable with that type.
+
+[para] The result of the command is the empty string.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/class_spec_ilife.inc b/src/vfs/critcl.vfs/doc/include/class_spec_ilife.inc
new file mode 100644
index 00000000..819545fa
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/class_spec_ilife.inc
@@ -0,0 +1,112 @@
+
+[list_begin definitions]
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd constructor] [arg body] [opt [arg postbody]]]
+
+This command specifies a C code block surrounding the initialization
+of the instance variables, i.e. the fields of the instance structure.
+
+[emph Note] that allocation and release of the instance structure
+itself is done by the system and not the responsibility of the user.
+
+[emph {On the other hand}], if an external [cmd type] was specified
+for the instance structure, then instance variables are not possible,
+and the system has no knowledge of the type's structure. In that case
+it is the responsibility of the [arg body] to allocate and free the
+structure itself too.
+
+[para] For the initialization (and release) of an instance variable it
+is recommended to use the [arg constructor] and [arg destructor]
+arguments of the variable's definition (See command [cmd insvariable])
+for this instead of using a separate [cmd constructor].
+
+[para] This is an optional command. Using it more than once is allowed
+too and each use will add another C code fragment to use during
+construction. I.e. multiple calls aggregate.
+
+[para] The C code blocks of multiple calls (including the constructors
+of instance variable definitions) are executed in order of specification.
+
+[para] The result of the command is the empty string.
+
+[para] The C code in [arg body] has access to the following
+environment:
+
+[list_begin definitions]
+
+[def [var interp]] Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure will be associated with. It enables the generation
+of a Tcl error message should construction fail.
+
+[def [var instance]] Pointer to the instance structure to initialize.
+
+[def error] A C code label the constructor can jump to should it have
+to signal a construction failure. It is the responsibility of the
+constructor to release any variables already initialized before
+jumping to this label. This also why the 'execution in order of
+specification' is documented and can be relied on. It gives us the
+knowledge which other constructors have already been run and
+initialized what other fields.
+
+[list_end]
+
+[para] The C code in [arg postbody] is responsible for construction
+actions to be done after the primary construction was done and the
+Tcl-level instance command was successfully created. It has access to
+a slightly different environment:
+
+[list_begin definitions]
+
+[def [var interp]] Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure will be associated with. It enables the generation
+of a Tcl error message should construction fail.
+
+[def [var instance]] Pointer to the instance structure to initialize.
+
+[def [var cmd]] The Tcl_Command token of the Tcl-level instance
+command.
+
+[def [var fqn]] The fully qualified name of the instance command,
+stored in a Tcl_Obj*.
+
+[list_end]
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd destructor] [arg body]]
+
+This command specifies a C code block surrounding the release of the
+instance variables, i.e. the fields of the instance structure.
+
+[emph Note] that allocation and release of the instance structure
+itself is done by the system and not the responsibility of the user.
+
+[emph {On the other hand}], if an external [cmd type] was specified
+for the instance structure, then instance variables are not possible,
+and the system has no knowledge of the type's structure. In that case
+it is the responsibility of the [arg body] to allocate and free the
+structure itself too.
+
+[para] For the initialization (and release) of an instance variable it
+is recommended to use the [arg constructor] and [arg destructor]
+arguments of the variable's definition (See command [cmd insvariable])
+for this instead of using a separate [cmd constructor].
+
+[para] This is an optional command. Using it more than once is allowed
+too and each use will add another C code fragment to use during
+construction. I.e. multiple calls aggregate.
+
+[para] The C code blocks of multiple calls (including the constructors
+of instance variable definitions) are executed in order of specification.
+
+[para] The result of the command is the empty string.
+
+[para] The C code in [arg body] has access to the following
+environment:
+
+[list_begin definitions]
+[def [var instance]] Pointer to the instance structure to release.
+[list_end]
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/class_spec_ivarm.inc b/src/vfs/critcl.vfs/doc/include/class_spec_ivarm.inc
new file mode 100644
index 00000000..8a4b85f1
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/class_spec_ivarm.inc
@@ -0,0 +1,126 @@
+
+[list_begin definitions]
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd insvariable] [arg ctype] [arg name] [opt [arg comment]] \
+     [opt [arg constructor]] [opt [arg destructor]]]
+
+This command specifies a field in the instance structure of the class.
+
+Multiple fields can be specified, and are saved in the order
+specified.
+
+[para] [emph Attention:] Specification of an instance variable
+precludes the use of an external C [cmd type] for the instance
+structure.
+
+[para] [emph Attention:] Specification of an instance variable
+automatically causes the definition of an instance variable of type
+[const Tcl_Command], and named [const cmd], holding the token of the
+instance command, and the definition of an instance method named
+[const destroy]. This implicit instance variable is managed by the
+system.
+
+[para] Beyond the basic [arg name] and C type of the new variable the
+definition may also contain a [arg comment] describing it, and C code
+blocks to initialize and release the variable.
+
+These are effectively local forms of the commands [cmd constructor]
+and [cmd destructor]. Please read their descriptions for details
+regarding the C environment available to the code.
+
+[para] The comment, if specified will be embedded into the generated C
+code for easier cross-referencing from generated [file .c] file to
+class specification.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd method] [arg name] [method command] [arg arguments] \
+	[arg body]]
+
+This command specifies an instance method and the C code block
+implementing its functionality. This is the first of three forms. The
+method is specified like a [cmd critcl::ccommand], with a fixed set of
+C-level arguments. The [arg body] has to perform everything
+(i.e. argument extraction, checking, result return, and of course the
+actual functionality) by itself.
+
+[para] For this the [arg body] has access to
+
+[list_begin definitions]
+[def [var instance]] Pointer to the instance structure.
+[def [var interp]] Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure is associated with
+[def [var objc]] The number of method arguments.
+[def [var objv]] The method arguments, as C array of Tcl_Obj pointers.
+[list_end]
+
+The [arg arguments] of the definition are only a human readable form
+of the method arguments and syntax and are not used in the C code,
+except as comments put into the generated code. Again, it is the
+responsibility of the [arg body] to check the number of arguments,
+extract them, check their types, etc.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd method] [arg name] [method proc] [arg arguments] \
+	[arg resulttype] [arg body]]
+
+This command specifies an instance method and the C code block
+implementing its functionality.  This is the second of three
+forms. The method is specified like a [cmd critcl::cproc].
+
+Contrary to the first variant here the [arg arguments] are computer
+readable, expected to be in the same format as the [arg arguments] of
+[cmd critcl::cproc]. The same is true for the [arg resulttype].
+
+The system automatically generates a wrapper doing argument checking
+and conversion, and result conversion, like for [cmd critcl::cproc].
+
+[para] The [arg body] has access to
+
+[list_begin definitions]
+[def [var instance]] Pointer to the instance structure.
+[def [var interp]] Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure is associated with
+[def ...] All [arg arguments] under their specified names and C types
+as per their definition.
+[list_end]
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd method] [arg name] [method as] [arg funname] \
+	[opt [arg arg]...]]
+
+This command specifies an instance method and the C code block
+implementing its functionality. This is the third and last of three
+forms.
+
+[para] The instance method is implemented by the external function
+[arg funname], i.e. a function which is declared outside of the instance
+code itself, or in a [cmd support] block.
+
+[para] It is assumed that the first four arguments of that function
+represent the parameters
+
+[list_begin definitions]
+[def [var instance]] Pointer to the instance structure.
+[def [var interp]] Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure is associated with
+[def [var objc]] The number of method arguments.
+[def [var objv]] The method arguments, as C array of Tcl_Obj pointers.
+[list_end]
+
+Any additional arguments specified will be added after these and are
+passed into the C code as is, i.e. are considered to be C expressions.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd method_introspection]]
+
+This command generates one class- and one instance-method both of
+which will return a list of the instance methods of the class, and
+supporting structures, like the function to compute the information,
+and a class variable caching it.
+
+[para] The two methods and the class variable are all named
+[const methods].
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/concepts.inc b/src/vfs/critcl.vfs/doc/include/concepts.inc
new file mode 100644
index 00000000..46c59e92
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/concepts.inc
@@ -0,0 +1,14 @@
+[comment {
+	CriTcl concepts necessary to understand the various commands.
+}]
+[subsection {Modes Of Operation/Use}]	[include include/modes.inc]
+
+[para] Regarding the caching of results please read the section about
+the [sectref {Result Cache}] fore more details.
+
+[subsection {Runtime Behaviour}]	[include include/runtime.inc]
+[subsection {File Mapping}]		[include include/mapping.inc]
+[subsection {Result Cache}]		[include include/rcache.inc]
+[subsection {Preloading functionality}]	[include include/preload.inc]
+[subsection {Configuration Internals}]	[include include/iconfig.inc]
+[subsection {Stubs Tables}]		[include include/stubs.inc]
diff --git a/src/vfs/critcl.vfs/doc/include/cproc/api_extcproc.inc b/src/vfs/critcl.vfs/doc/include/cproc/api_extcproc.inc
new file mode 100644
index 00000000..e59e2ec9
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/cproc/api_extcproc.inc
@@ -0,0 +1,162 @@
+
+[para] To get around this limitation the commands in this section
+enable users of [package critcl] to extend the set of argument and
+result types understood by [cmd critcl::cproc]. In other words, they
+allow them to define their own, custom, types.
+
+[list_begin definitions]
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd ::critcl::has-resulttype] [arg name]]
+
+This command tests if the named result-type is known or not.
+
+It returns a boolean value, [const true] if the type is known and
+[const false] otherwise.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd ::critcl::resulttype] [arg name] [arg body] [opt [arg ctype]]]
+
+This command defines the result type [arg name], and associates it
+with the C code doing the conversion ([arg body]) from C to Tcl.
+
+The C return type of the associated function, also the C type of the
+result variable, is [arg ctype]. This type defaults to [arg name] if
+it is not specified.
+
+[para] If [arg name] is already declared an error is thrown.
+
+[emph Attention!] The standard result type [const void] is special as
+it has no accompanying result variable. This cannot be expressed
+by this extension command.
+
+[para] The [arg body]'s responsibility is the conversion of the
+functions result into a Tcl result and a Tcl status. The first has to
+be set into the interpreter we are in, and the second has to be
+returned.
+
+[para] The C code of [arg body] is guaranteed to be called last in the
+wrapper around the actual implementation of the [cmd cproc] in
+question and has access to the following environment:
+
+[list_begin definitions]
+[def [var interp]] A Tcl_Interp* typed C variable referencing the
+                   interpreter the result has to be stored into.
+[def [var rv]] The C variable holding the result to convert, of type
+               [arg ctype].
+[list_end]
+
+As examples here are the definitions of two standard result types:
+
+[example {
+    resulttype int {
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return TCL_OK;
+    }
+
+    resulttype ok {
+	/* interp result must be set by cproc body */
+	return rv;
+    } int
+}]
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd ::critcl::resulttype] [arg name] [method =] [arg origname]]
+
+This form of the [cmd resulttype] command declares [arg name] as an
+alias of result type [arg origname], which has to be defined
+already. If this is not the case an error is thrown.
+
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd ::critcl::has-argtype] [arg name]]
+
+This command tests if the named argument-type is known or not.
+
+It returns a boolean value, [const true] if the type is known and
+[const false] otherwise.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd ::critcl::argtype] [arg name] [arg body] [opt [arg ctype]] [opt [arg ctypefun]]]
+
+This command defines the argument type [arg name], and associates it
+with the C code doing the conversion ([arg body]) from Tcl to C.
+
+[arg ctype] is the C type of the variable to hold the conversion result
+and [arg ctypefun] is the type of the function argument itself.
+Both types default to [arg name] if they are the empty string or are not
+provided.
+
+[para] If [arg name] is already declared an error is thrown.
+
+[para] [arg body] is a C code fragment that converts a Tcl_Obj* into a
+C value which is stored in a helper variable in the underlying function.
+
+[para] [arg body] is called inside its own code block to isolate local
+variables, and the following items are in scope:
+
+[list_begin definitions]
+[def [var interp]] A variable of type [const Tcl_Interp*] which is the
+                   interpreter the code is running in.
+[def [const @@]] A placeholder for an expression that evaluates to the
+                 [const Tcl_Obj*] to convert.
+
+[def [const @A]] A placeholder for the name of the variable to store the
+     	    	 converted argument into.
+[list_end]
+
+As examples, here are the definitions of two standard argument types:
+
+[example {
+    argtype int {
+	if (Tcl_GetIntFromObj(interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    }
+
+    argtype float {
+	double t;
+	if (Tcl_GetDoubleFromObj(interp, @@, &t) != TCL_OK) return TCL_ERROR;
+	@A = (float) t;
+    }
+}]
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[call [cmd ::critcl::argtype] [arg name] [method =] [arg origname]]
+
+This form of the [cmd argtype] command declares [arg name] as an alias
+of argument type [arg origname], which has to be defined already. If
+this is not the case an error is thrown.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::argtypesupport] [arg name] [arg code] [opt [arg guard]]]
+
+This command defines a C code fragment for the already defined
+argument type [arg name] which is inserted before all functions
+using that type. Its purpose is the definition of any supporting C
+types needed by the argument type.
+
+If the type is used by many functions the system ensures that only the
+first of the multiple insertions of the code fragment is active, and
+the others disabled.
+
+The guard identifier is normally derived from [arg name], but can also
+be set explicitly, via [arg guard]. This latter allows different
+custom types to share a common support structure without having to
+perform their own guarding.
+
+[comment ---------------------------------------------------------------------]
+[call [cmd ::critcl::argtyperelease] [arg name] [arg code]]
+
+This command defines a C code fragment for the already defined
+argument type [arg name] which is inserted whenever the worker
+function of a [cmd critcl::cproc] returns to the shim. It is the
+responsibility of this fragment to unconditionally release any
+resources the [cmd critcl::argtype] conversion code allocated.
+
+An example of this are the [emph variadic] types for the support of
+the special, variadic [arg args] argument to [cmd critcl::cproc]'s.
+They allocate a C array for the collected arguments which has to be
+released when the worker returns. This command defines the C code
+for doing that.
+
+[comment {- - -- --- ----- -------- ------------- ---------------------}]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/cproc/api_extcproc1.inc b/src/vfs/critcl.vfs/doc/include/cproc/api_extcproc1.inc
new file mode 100644
index 00000000..fe80855b
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/cproc/api_extcproc1.inc
@@ -0,0 +1,6 @@
+
+While the [cmd critcl::cproc] command understands the most common C
+types (see section [sectref {Embedded C Code}]), sometimes this is not
+enough.
+
+[include api_extcproc.inc]
diff --git a/src/vfs/critcl.vfs/doc/include/cproc/api_extcproc2.inc b/src/vfs/critcl.vfs/doc/include/cproc/api_extcproc2.inc
new file mode 100644
index 00000000..11c07f57
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/cproc/api_extcproc2.inc
@@ -0,0 +1,5 @@
+
+While the [cmd critcl::cproc] command understands the most common C
+types (as per the previous 2 sections), sometimes this is not enough.
+
+[include api_extcproc.inc]
diff --git a/src/vfs/critcl.vfs/doc/include/cproc/api_stdat_cproc.inc b/src/vfs/critcl.vfs/doc/include/cproc/api_stdat_cproc.inc
new file mode 100644
index 00000000..c2d8aae4
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/cproc/api_stdat_cproc.inc
@@ -0,0 +1,369 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+[comment {
+    Standard argument types for use with cproc and cclass methods.
+}]
+
+
+Before going into the details first a quick overview:
+
+[include atypes_table.inc]
+
+And now the details:
+
+[list_begin definitions]
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+
+[def Tcl_Interp*]
+
+[strong Attention]: This is a [strong special] argument type. It can
+[strong only] be used by the [strong first] argument of a function.
+Any other argument using it will cause critcl to throw an error.
+
+[para] When used, the argument will contain a reference to the current
+interpreter that the function body may use. Furthermore the argument
+will [strong not] be an argument of the Tcl command for the function.
+
+[para] This is useful when the function has to do more than simply
+returning a value. Examples would be setting up error messages on
+failure, or querying the interpreter for variables and other data.
+
+[def Tcl_Obj*]
+[def object]
+
+The function takes an argument of type [type Tcl_Obj*].
+No argument checking is done.
+The Tcl level word is passed to the argument as-is.
+
+Note that this value must be treated as [strong read-only] (except for
+hidden changes to its intrep, i.e. [term shimmering]).
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def pstring]
+
+The function takes an argument of type [type critcl_pstring]
+containing the original [type Tcl_Obj*] reference of the Tcl argument,
+plus the length of the string and a pointer to the character array.
+
+[example {
+typedef struct critcl_pstring {
+    Tcl_Obj*    o;
+    const char* s;
+    int         len;
+} critcl_pstring;
+}]
+
+Note the [strong const]. The string is [strong read-only]. Any
+modification can have arbitrary effects, from pulling out the rug
+under the script because of string value and internal representation
+not matching anymore, up to crashes anytime later.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def list]
+[def {[]}]
+[def {[*]}]
+
+The function takes an argument of type [type critcl_list] containing the original [type Tcl_Obj*]
+reference of the Tcl argument, plus the length of the Tcl list and a pointer to the array of the
+list elements.
+
+[example {
+typedef struct critcl_list {
+    Tcl_Obj*        o;
+    Tcl_Obj* const* v;
+    int             c;
+} critcl_list;
+}]
+
+The Tcl argument must be convertible to [type List], an error is thrown otherwise.
+
+[para] Note the [strong const]. The list is [strong read-only].  Any modification can have arbitrary
+effects, from pulling out the rug under the script because of string value and internal
+representation not matching anymore, up to crashes anytime later.
+
+[para] Further note that the system understands a number of more complex syntactical forms which all
+translate into forms of lists under the hood, as described by the following points.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def {[N]}]
+
+A [term list] type with additional checks limiting the length to [const N], an integer
+number greater than zero.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def {[]type}]
+[def {type[]}]
+
+A [term list] type whose elements all have to be convertible for [term type]. All known
+types, including user-defined, are allowed, except for [type list] and derivates. In other
+words, multi-dimensional lists are not supported.
+
+[para] The function will take a structure argument of the general form
+
+[example {
+typedef struct critcl_list_... {
+    Tcl_Obj* o;
+    int      c;
+    (Ctype)* v;
+} critcl_list_...;
+}]
+
+where [const (Ctype)] represents the C type for values of type [type type].
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def {[N]type}]
+[def {type[N]}]
+
+These are [type list] types combining the elements of [example {[N]}] and
+[example {[]type}].
+
+[para] As an example, the specification of [example {int[3] a}] describes argument [arg a]
+as a list of exactly 3 elements, all of which have to be of type [type int].
+
+[para] Note that this example can also be written in the more C-like form of
+[example {int a[3]}]. The system will translate this internally to the first shown form.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def bytes]
+
+This is the [emph new] and usable [type ByteArray] type.
+
+[para] The function takes an argument of type [type critcl_bytes]
+containing the original [type Tcl_Obj*] reference of the Tcl argument,
+plus the length of the byte array and a pointer to the byte data.
+
+[example {
+typedef struct critcl_bytes {
+    Tcl_Obj*             o;
+    const unsigned char* s;
+    int                len;
+} critcl_list;
+}]
+
+The Tcl argument must be convertible to [type ByteArray], an error is
+thrown otherwise.
+
+[para] Note the [strong const]. The bytes are [strong read-only].  Any
+modification can have arbitrary effects, from pulling out the rug
+under the script because of string value and internal representation
+not matching anymore, up to crashes anytime later.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def char*]
+
+The function takes an argument of type [type {const char*}].
+The string representation of the Tcl argument is passed in.
+
+[para] Note the [strong const]. The string is [strong read-only]. Any
+modification can have arbitrary effects, from pulling out the rug
+under the script because of string value and internal representation
+not matching anymore, up to crashes anytime later.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def double]
+
+The function takes an argument of type [type double].
+
+The Tcl argument must be convertible to [type Double], an error is thrown otherwise.
+
+[def {double > N}]
+[def {double >= N}]
+[def {double < N}]
+[def {double <= N}]
+
+These are variants of [term double] above, restricting the argument value to the shown relation.
+
+An error is thrown for Tcl arguments outside of the specified range.
+
+[para] The limiter [arg N] has to be a constant floating point value.
+
+[para] It is possible to use multiple limiters.
+
+For example [term {double > A > B <= C}].
+
+The system will fuse them to a single upper/lower limit (or both).
+
+[para] The system will reject limits describing an empty range of values, or a range containing only
+a single value.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def float]
+
+The function takes an argument of type [type float].
+
+The Tcl argument must be convertible to [type Double], an error is thrown otherwise.
+
+[def {float > N}]
+[def {float >= N}]
+[def {float < N}]
+[def {float <= N}]
+
+These are variants of [term float] above, restricting the argument value to the shown relation.
+
+An error is thrown for Tcl arguments outside of the specified range.
+
+[para] The limiter [arg N] has to be a constant floating point value.
+
+[para] It is possible to use multiple limiters.
+
+For example [term {float > A > B <= C}].
+
+The system will fuse them to a single upper/lower limit (or both).
+
+[para] The system will reject limits describing an empty range of values, or a range containing only
+a single value.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def boolean]
+[def bool]
+
+The function takes an argument of type [type int].
+
+The Tcl argument must be convertible to [type Boolean], an error is
+thrown otherwise.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def channel]
+
+The function takes an argument of type [type Tcl_Channel].
+
+The Tcl argument must be convertible to type [type Channel], an error
+is thrown otherwise.
+
+The channel is further assumed to be [strong {already registered}]
+with the interpreter.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def unshared-channel]
+
+This type is an extension of [type channel] above.
+
+All of the information above applies.
+
+[para] Beyond that the channel must not be shared by multiple
+interpreters, an error is thrown otherwise.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def take-channel]
+
+This type is an extension of [type unshared-channel] above.
+
+All of the information above applies.
+
+[para] Beyond that the code removes the channel from the current
+interpreter without closing it, and disables all pre-existing event
+handling for it.
+
+[para] With this the function takes full ownership of the channel in
+question, taking it away from the interpreter invoking it. It is then
+responsible for the lifecycle of the channel, up to and including
+closing it.
+
+[para] Should the system the function is a part of wish to return
+control of the channel back to the interpeter it then has to use the
+result type [type return-channel]. This will undo the registration
+changes made by this argument type.
+
+[strong Note] however that the removal of pre-existing event handling
+done here cannot be undone.
+
+[para] [strong Attention] Removal from the interpreter without closing
+the channel is effected by incrementing the channel's reference count
+without providing an interpreter, before decrementing the same for the
+current interpreter. This leaves the overall reference count intact
+without causing Tcl to close it when it is removed from the
+interpreter structures. At this point the channel is effectively a
+globally-owned part of the system not associated with any interpreter.
+
+[para] The complementary result type then runs this sequence in
+reverse. And if the channel is never returned to Tcl either the
+function or the system it is a part of have to unregister the global
+reference when they are done with it.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def int]
+
+The function takes an argument of type [type int].
+
+The Tcl argument must be convertible to [type Int], an error is thrown otherwise.
+
+[def {int > N}]
+[def {int >= N}]
+[def {int < N}]
+[def {int <= N}]
+
+These are variants of [term int] above, restricting the argument value to the shown
+relation.
+
+An error is thrown for Tcl arguments outside of the specified range.
+
+[para] The limiter [arg N] has to be a constant integer value.
+
+[para] It is possible to use multiple limiters.
+
+For example [term {int > A > B <= C}].
+
+The system will fuse them to a single upper/lower limit (or both).
+
+[para] The system will reject limits describing an empty range of values, or a range
+containing only a single value.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def long]
+
+The function takes an argument of type [type {long int}].
+
+The Tcl argument must be convertible to [type Long], an error is thrown otherwise.
+
+[def {long > N}]
+[def {long >= N}]
+[def {long < N}]
+[def {long <= N}]
+
+These are variants of [term long] above, restricting the argument value to the shown
+relation.
+
+An error is thrown for Tcl arguments outside of the specified range.
+
+[para] The limiter [arg N] has to be a constant integer value.
+
+[para] It is possible to use multiple limiters.
+
+For example [term {long > A > B <= C}].
+
+The system will fuse them to a single upper/lower limit (or both).
+
+[para] The system will reject limits describing an empty range of values, or a range
+containing only a single value.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def wideint]
+
+The function takes an argument of type [type Tcl_WideInt].
+
+The Tcl argument must be convertible to [type WideInt], an error is thrown otherwise.
+
+[def {wideint > N}]
+[def {wideint >= N}]
+[def {wideint < N}]
+[def {wideint <= N}]
+
+These are variants of [term wideint] above, restricting the argument value to the shown
+relation.
+
+An error is thrown for Tcl arguments outside of the specified range.
+
+[para] The limiter [arg N] has to be a constant integer value.
+
+[para] It is possible to use multiple limiters.
+
+For example [term {wideint > A > B <= C}].
+
+The system will fuse them to a single upper/lower limit (or both).
+
+[para] The system will reject limits describing an empty range of values, or a range
+containing only a single value.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def void*]
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/cproc/api_stdrt_cproc.inc b/src/vfs/critcl.vfs/doc/include/cproc/api_stdrt_cproc.inc
new file mode 100644
index 00000000..d7ca8c2d
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/cproc/api_stdrt_cproc.inc
@@ -0,0 +1,172 @@
+[comment {
+	 Standard result types for use with
+	 cproc and cconst.
+}]
+
+Before going into the details first a quick overview:
+
+[include rtypes_table.inc]
+
+And now the details:
+
+[list_begin definitions]
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def Tcl_Obj*]
+[def object]
+
+If the returned [type Tcl_Obj*] is [const NULL], the Tcl return code
+is [const TCL_ERROR] and the function should [uri \
+	https://www.tcl-lang.org/man/tcl/TclLib/SetResult.htm \
+	{set an error mesage}]
+as the interpreter result.  Otherwise, the returned [type Tcl_Obj*] is
+set as the interpreter result.
+
+[para] Note that setting an error message requires the function body
+to have access to the interpreter the function is running in. See the
+argument type [type Tcl_Interp*] for the details on how to make that
+happen.
+
+[para] Note further that the returned [type Tcl_Obj*] should have a
+reference count greater than [const 0]. This is because the converter
+decrements the reference count to release possession after setting the
+interpreter result. It assumes that the function incremented the
+reference count of the returned [type Tcl_Obj*].
+
+If a [type Tcl_Obj*] with a reference count of [const 0] were
+returned, the reference count would become [const 1] when set as the
+interpreter result, and immediately thereafter be decremented to
+[const 0] again, causing the memory to be freed.  The system is then
+likely to crash at some point after the return due to reuse of the
+freed memory.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def Tcl_Obj*0]
+[def object0]
+
+Like [const Tcl_Obj*] except that this conversion assumes that the
+returned value has a reference count of [const 0] and
+[emph {does not}] decrement it. Returning a value whose reference
+count is greater than [const 0] is therefore likely to cause a memory
+leak.
+
+[para] Note that setting an error message requires the function body
+to have access to the interpreter the function is running in. See the
+argument type [type Tcl_Interp*] for the details on how to make that
+happen.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def new-channel]
+
+A [type String] Tcl_Obj holding the name of the returned
+[type Tcl_Channel] is set as the interpreter result.
+
+The channel is further assumed to be [strong new], and therefore
+registered with the interpreter to make it known.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def known-channel]
+
+A [type String] Tcl_Obj holding the name of the returned
+[type Tcl_Channel] is set as the interpreter result.
+
+The channel is further assumed to be [strong {already registered}]
+with the interpreter.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def return-channel]
+
+This type is a variant of [type new-channel] above.
+
+It varies slightly from it in the registration sequence to be properly
+complementary to the argument type [type take-channel].
+
+
+A [type String] Tcl_Obj holding the name of the returned
+[type Tcl_Channel] is set as the interpreter result.
+
+The channel is further assumed to be [strong new], and therefore
+registered with the interpreter to make it known.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def char*]
+[def vstring]
+
+A [type String] Tcl_Obj holding a [strong copy] of the returned
+[type char*] is set as the interpreter result. If the value is
+allocated then the function itself and the extension it is a part of
+are responsible for releasing the memory when the data is not in use
+any longer.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def {const char*}]
+
+Like [const char*] above, except that the returned string is
+[const const]-qualified.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def string]
+[def dstring]
+
+The returned [type char*] is directly set as the interpreter result
+[strong {without making a copy}].  Therefore it must be dynamically
+allocated via [fun Tcl_Alloc]. Release happens automatically when the
+Interpreter finds that the value is not required any longer.
+
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def double]
+[def float]
+
+The returned [type double] or [type float] is converted to a [type Double]
+Tcl_Obj and set as the interpreter result.
+
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def boolean]
+[def bool]
+
+The returned [type int] value is converted to an [type Int] Tcl_Obj and set as
+the interpreter result.
+
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def int]
+
+The returned [type int] value is converted to an [type Int] Tcl_Obj and set as
+the interpreter result.
+
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def long]
+
+The returned [type {long int}] value is converted to a [type Long] Tcl_Obj and
+set as the interpreter result.
+
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def wideint]
+
+The returned [type Tcl_WideInt] value is converted to a [type WideInt] Tcl_Obj
+and set as the interpreter result.
+
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def ok]
+
+The returned [type int] value becomes the Tcl return code.
+
+The interpreter result is left untouched and can be set by the
+function if desired. Note that doing this requires the function body
+to have access to the interpreter the function is running in. See the
+argument type [type Tcl_Interp*] for the details on how to make that
+happen.
+
+[comment {% % %% %%% %%%%% %%%%%%%% %%%%%%%%%%%%%}]
+[def void]
+
+The function does not return a value.
+
+The interpreter result is left untouched and can be set by the function if
+desired.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/cproc/atypes_table.inc b/src/vfs/critcl.vfs/doc/include/cproc/atypes_table.inc
new file mode 100644
index 00000000..2eed7d08
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/cproc/atypes_table.inc
@@ -0,0 +1,50 @@
+[comment {
+  Table of the standard argument types, for a quick overview
+  of the names, associated C types, behaviour and limits.
+}]
+[example_begin]
+CriTcl type      | C type         | Tcl type  | Notes
+---------------- | -------------- | --------- | ------------------------------
+Tcl_Interp*      | Tcl_Interp*    | n/a       | [strong Special], only first
+---------------- | -------------- | --------- | ------------------------------
+Tcl_Obj*         | Tcl_Obj*       | Any       | [strong Read-only]
+object           |                |           | Alias of [type Tcl_Obj*] above
+list             | critcl_list    | List      | [strong Read-only]
+[lb][rb], [lb]*[rb]          |                |           | Alias of [type list] above
+---------------- | -------------- | --------- | ------------------------------
+[lb]N[rb]              |                |           | Restricted [type list]-types.
+type[lb][rb], type[lb]N[rb]  |                |           | Length-limited ([lb]..[rb]), expected
+[lb][rb]type, [lb]N[rb]type  |                |           | element type, or both.
+                 |                |           |
+                 |                |           | Element types can be all known argument
+                 |                |           | types, except for any kind of list.
+                 |                |           | IOW multi-dimensional lists are not
+                 |                |           | supported.
+---------------- | -------------- | --------- | ------------------------------
+char*            | const char*    | Any       | [strong Read-only], [strong {string rep}]
+pstring          | critcl_pstring | Any       | [strong Read-only]
+bytes            | critcl_bytes   | ByteArray | [strong Read-only]
+---------------- | -------------- | --------- | ------------------------------
+int              | int            | Int       |
+long             | long           | Long      |
+wideint          | Tcl_WideInt    | WideInt   |
+double           | double         | Double    |
+float            | float          | Double    |
+---------------- | -------------- | --------- | ------------------------------
+X > N            |                |           | For X in [type int] ... [type float] above.
+X >= N           |                |           | The C types are as per the base type X.
+X < N            |                |           | N, A, B are expected to be constant integer
+X <= N           |                |           | numbers for types [type int], [type long],
+X > A < B        |                |           | and [type wideint]. For types [type double]
+etc.             |                |           | and [type float] the N, A, and B can be floating
+                 |                |           | point numbers. Multiple restrictions are
+                 |                |           | fused as much as possible to yield at most
+                 |                |           | both upper and lower limits.
+---------------- | -------------- | --------- | ------------------------------
+boolean          | int            | Boolean   |
+bool             |                |           | Alias of [type boolean] above
+---------------- | -------------- | --------- | ------------------------------
+channel          | Tcl_Channel    | String    | Assumed to be registered
+unshared-channel | Tcl_Channel    | String    | As above, limited to current interpreter
+take-channel     | Tcl_Channel    | String    | As above, C code takes ownership
+[example_end]
diff --git a/src/vfs/critcl.vfs/doc/include/cproc/rtypes_table.inc b/src/vfs/critcl.vfs/doc/include/cproc/rtypes_table.inc
new file mode 100644
index 00000000..53beea4d
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/cproc/rtypes_table.inc
@@ -0,0 +1,37 @@
+[comment {
+  Table of the standard result types, for a quick overview
+  of the names, associated C types, behaviour and limits.
+}]
+[example_begin]
+CriTcl type    | C type         | Tcl type  | Notes
+-------------- | -------------- | --------- | ------------------------------
+void           | n/a            | n/a       | Always OK. Body sets result
+ok             | int            | n/a       | Result code. Body sets result
+-------------- | -------------- | --------- | ------------------------------
+int            | int            | Int       |
+boolean        |                |           | Alias of [type int] above
+bool           |                |           | Alias of [type int] above
+long           | long           | Long      |
+wideint        | Tcl_WideInt    | WideInt   |
+double         | double         | Double    |
+float          | float          | Double    |
+-------------- | -------------- | --------- | ------------------------------
+char*          | char*          | String    | [strong {Makes a copy}]
+vstring        |                |           | Alias of [type char*] above
+const char*    | const char*    |           | Behavior of [type char*] above
+-------------- | -------------- | --------- | ------------------------------
+string         |                | String    | Freeable string set directly
+               |                |           | [strong {No copy is made}]
+dstring        |                |           | Alias of [type string] above
+-------------- | -------------- | --------- | ------------------------------
+               |                |           | For all below: Null is ERROR
+               |                |           | Body has to set any message
+Tcl_Obj*       | Tcl_Obj*       | Any       | [strong {refcount --}]
+object         |                |           | Alias of [type Tcl_Obj*] above
+Tcl_Obj*0      |                | Any       | [strong {refcount unchanged}]
+object0        |                |           | Alias of [type Tcl_Obj*0] above
+-------------- | -------------- | --------- | ------------------------------
+known-channel  | Tcl_Channel    | String    | Assumes to already be registered
+new-channel    | Tcl_Channel    | String    | New channel, will be registered
+return-channel | Tcl_Channel    | String    | Inversion of take-channel
+[example_end]
diff --git a/src/vfs/critcl.vfs/doc/include/cproc/using_eproc.inc b/src/vfs/critcl.vfs/doc/include/cproc/using_eproc.inc
new file mode 100644
index 00000000..868e0491
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/cproc/using_eproc.inc
@@ -0,0 +1,69 @@
+[subsection {A Simple Procedure}]
+
+Starting simple, let us assume that the Tcl code in question is
+something like
+
+[example {
+    proc math {x y z} {
+        return [expr {(sin($x)*rand())/$y**log($z)}]
+    }
+}]
+
+with the expression pretending to be something very complex and
+slow. Converting this to C we get:
+
+[example {
+    critcl::cproc math {double x double y double z} double {
+        double up   = rand () * sin (x);
+        double down = pow(y, log (z));
+        return up/down;
+    }
+}]
+
+Notable about this translation:
+
+[list_begin enumerated]
+[enum] All the arguments got type information added to them, here
+       "double".  Like in C the type precedes the argument name. Other
+       than that it is pretty much a Tcl dictionary, with keys and
+       values swapped.
+[enum] We now also have to declare the type of the result, here
+       "double", again.
+[enum] The reference manpage lists all the legal C types supported as
+       arguments and results.
+[list_end]
+
+[para] While the above example was based on type [type double] for
+both arguments and result we have a number of additional types in the
+same category, i.e. simple types. These are:
+
+[example_begin]
+CriTcl type | C type         | Tcl type  | Notes
+----------- | -------------- | --------- | ------------------------------
+bool        |                |           | Alias of [type boolean] below
+boolean     | int            | Boolean   |
+double      | double         | Double    |
+float       | float          | Double    |
+int         | int            | Int       |
+long        | long           | Long      |
+wideint     | Tcl_WideInt    | WideInt   |
+[example_end]
+
+[para] A slightly advanced form of these simple types are a limited
+set of constraints on the argument value. Note that [type bool] and
+alias do not support this.
+
+[example {
+    critcl::cproc sqrt {{double >= 0} x} double {
+        return sqrt(x);
+    }
+}]
+
+[para] In the example above CriTcl's argument handling will reject
+calling the command with a negative number, without ever invoking the
+C code.
+
+[para] These constraints are called [strong limited] because only
+[const 0] and [const 1] can be used as the borders, although all the
+operators [const <], [const <=], [const >], and [const >=] are
+possible. It is also not possible to combine restrictions.
diff --git a/src/vfs/critcl.vfs/doc/include/cproc/using_eprocstr.inc b/src/vfs/critcl.vfs/doc/include/cproc/using_eprocstr.inc
new file mode 100644
index 00000000..d134f297
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/cproc/using_eprocstr.inc
@@ -0,0 +1,98 @@
+[subsection {More Builtin Types: Strings}]
+
+[para] Given that "Everything is a String" is a slogan of Tcl the ability of [cmd cproc]s
+to receive strings as arguments, and return them as results is quite important.
+
+[para] We actually have a variety of builtin string types, all alike, yet different.
+
+[para] For arguments we have:
+
+[example_begin]
+CriTcl type | C type         | Tcl type  | Notes
+----------- | -------------- | --------- | ------------------------------
+char*       | const char*    | Any       | [strong Read-only], [strong {string rep}]
+pstring     | critcl_pstring | Any       | [strong Read-only]
+bytes       | critcl_bytes   | ByteArray | [strong Read-only]
+[example_end]
+
+In C
+
+[example {
+    critcl::cproc takeStrings {
+        char*   cstring
+	pstring pstring
+	bytes   barray
+    } void {
+        printf ("len %d = %s\n", strlen(cstring), cstring);
+	printf ("len %d = %s\n", pstring.len, pstring.s);
+	printf ("len %d = %s\n", barray.len, barray.s);
+        return; // void result, no result
+    }
+}]
+
+Notable about the above:
+
+[list_begin enumerated]
+
+[enum] The [var cstring] is a plain [type {const char*}]. It [strong {points directly}]
+into the [type Tcl_Obj*] holding the argument in the script.
+
+[enum] The [var pstring] is a slight extension to that. The value is actually a structure
+containing the string pointer like [var cstring] (field [const .s]), the length of the
+string (field [const .len]), and a pointer to the [type Tcl_Obj*] these came from.
+
+[enum] The last, [var barray] is like [var pstring], however it has ensured that the
+[type Tcl_Obj*] is a Tcl ByteArray, i.e. binary data.
+
+[list_end]
+
+[para] Treat all of them as [strong {Read Only}]. Do not modify ever.
+
+[para] On the other side, string results, we have:
+
+[example_begin]
+CriTcl type   | C type         | Tcl type  | Notes
+------------- | -------------- | --------- | ------------------------------
+char*         | char*          | String    | [strong {Makes a copy}]
+vstring       |                |           | Alias of [type char*] above
+const char*   | const char*    |           | Behavior of [type char*] above
+------------- | -------------- | --------- | ------------------------------
+string        | char*          | String    | Freeable string set directly
+              |                |           | [strong {No copy is made}]
+dstring       |                |           | Alias of [type string] above
+[example_end]
+
+[example {
+    critcl::cproc returnCString {} char* {
+        return "a string";
+    }
+    critcl::cproc returnString {} string {
+        char* str = Tcl_Alloc (200);
+	sprintf (str, "hello world");
+        return str; 
+    }
+}]
+
+Notable about the above:
+
+[list_begin enumerated]
+
+[enum] The type [type char*] is best used for static strings, or strings in some kind
+fixed buffer.
+
+[para] CriTcl's translation layer makes a copy of it for the result of the command. While
+it is possible to return heap-allocated strings it is the C code who is responsible for
+freeing such at some point. If that is not done they will leak.
+
+[enum] The type [type string] on the other hand is exactly for returning strings allocated
+with [fun Tcl_Alloc] and associates.
+
+[para] For these the translation layer makes no copy at all, and sets them directly as the
+result of the command. A [strong {very important effect}] of this is that the ownership of
+the string pointer moves from the function to Tcl.
+
+[para] [strong Tcl] will release the allocated memory when it does not need it any
+longer. The C code has no say in that.
+
+[list_end]
+
diff --git a/src/vfs/critcl.vfs/doc/include/cproc/using_eproctypes.inc b/src/vfs/critcl.vfs/doc/include/cproc/using_eproctypes.inc
new file mode 100644
index 00000000..508dc4e4
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/cproc/using_eproctypes.inc
@@ -0,0 +1,45 @@
+[subsection {Custom Types, Introduction}]
+
+When writing bindings to external libraries [cmd critcl::cproc] is
+usually the most convenient way of writing the lower layers. This is
+however hampered by the fact that critcl on its own only supports a
+few standard (arguably the most import) standard types, whereas the
+functions we wish to bind most certainly will use much more, specific
+to the library's function.
+
+[para] The critcl commands [cmd argtype], [cmd resulttype] and their
+adjuncts are provided to help here, by allowing a developer to extend
+critcl's type system with custom conversions.
+
+[para] This and the three following sections will demonstrate this,
+from trivial to complex.
+
+[para] The most trivial use is to create types which are aliases of
+existing types, standard or other. As an alias it simply copies and
+uses the conversion code from the referenced types.
+
+[para] Our example is pulled from an incomplete project of mine, a
+binding to [term {Jeffrey Kegler}]'s [term libmarpa] library managing
+Earley parsers. Several custom types simply reflect the typedef's done
+by the library, to make the [cmd critcl::cproc]s as self-documenting
+as the underlying library functions themselves.
+
+[example {
+    critcl::argtype Marpa_Symbol_ID     = int
+    critcl::argtype Marpa_Rule_ID       = int
+    critcl::argtype Marpa_Rule_Int      = int
+    critcl::argtype Marpa_Rank          = int
+    critcl::argtype Marpa_Earleme       = int
+    critcl::argtype Marpa_Earley_Set_ID = int
+
+    ...
+
+    method sym-rank: proc {
+        Marpa_Symbol_ID sym
+        Marpa_Rank      rank
+    } Marpa_Rank {
+        return marpa_g_symbol_rank_set (instance->grammar, sym, rank);
+    }
+
+    ...
+}]
diff --git a/src/vfs/critcl.vfs/doc/include/cproc/using_eproctypes2.inc b/src/vfs/critcl.vfs/doc/include/cproc/using_eproctypes2.inc
new file mode 100644
index 00000000..0acde0fd
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/cproc/using_eproctypes2.inc
@@ -0,0 +1,100 @@
+[subsection {Custom Types, Semi-trivial}]
+
+A more involved custom argument type would be to map from Tcl strings
+to some internal representation, like an integer code.
+
+[para] The first example is taken from the [package tclyaml] package,
+a binding to the [package libyaml] library. In a few places we have to
+map readable names for block styles, scalar styles, etc. to the
+internal enumeration.
+
+[example {
+    critcl::argtype yaml_sequence_style_t {
+        if (!encode_sequence_style (interp, @@, &@A)) return TCL_ERROR;
+    }
+
+    ...
+
+    critcl::ccode {
+        static const char* ty_block_style_names [] = {
+            "any", "block", "flow", NULL
+        };
+
+        static int
+        encode_sequence_style (Tcl_Interp* interp, Tcl_Obj* style,
+                               yaml_sequence_style_t* estyle)
+        {
+            int value;
+            if (Tcl_GetIndexFromObj (interp, style, ty_block_style_names,
+                                     "sequence style", 0, &value) != TCL_OK) {
+                return 0;
+            }
+            *estyle = value;
+            return 1;
+        }
+    }
+
+    ...
+
+    method sequence_start proc {
+        pstring anchor
+        pstring tag
+        int implicit
+        yaml_sequence_style_t style
+    } ok {
+        /* Syntax: <instance> seq_start <anchor> <tag> <implicit> <style> */
+        ...
+    }
+
+    ...
+}]
+
+It should be noted that this code precedes the advent of the
+supporting generator package [package critcl::emap]. using the
+generator the definition of the mapping becomes much simpler:
+
+[example {
+    critcl::emap::def yaml_sequence_style_t {
+        any   0
+        block 1
+        flow  2
+    }
+}]
+
+Note that the generator will not only provide the conversions, but
+also define the argument and result types needed for their use by
+[cmd critcl::cproc].
+
+Another example of such a semi-trivial argument type can be found in
+the [package CRIMP] package, which defines a [type Tcl_ObjType] for
+[term image] values. This not only provides a basic argument type for
+any image, but also derived types which check that the image has a
+specific format. Here we see for the first time non-integer arguments,
+and the need to define the C types used for variables holding the C
+level value, and the type of function parameters (Due to C promotion
+rules we may need different types).
+
+[example {
+    critcl::argtype image {
+        if (crimp_get_image_from_obj (interp, @@, &@A) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    } crimp_image* crimp_image*
+
+    ...
+
+        set map [list <<type>> $type]
+        critcl::argtype image_$type [string map $map {
+            if (crimp_get_image_from_obj (interp, @@, &@A) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            if (@A->itype != crimp_imagetype_find ("crimp::image::<<type>>")) {
+                Tcl_SetObjResult (interp,
+                                  Tcl_NewStringObj ("expected image type <<type>>",
+                                                    -1));
+                return TCL_ERROR;
+            }
+        }] crimp_image* crimp_image*
+
+    ...
+}]
diff --git a/src/vfs/critcl.vfs/doc/include/cproc/using_eproctypes3.inc b/src/vfs/critcl.vfs/doc/include/cproc/using_eproctypes3.inc
new file mode 100644
index 00000000..21c8e0c5
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/cproc/using_eproctypes3.inc
@@ -0,0 +1,70 @@
+[subsection {Custom Types, Support structures}]
+
+The adjunct command [cmd critcl::argtypesupport] is for when the
+conversion needs additional definitions, for example a helper
+structure.
+
+[para] An example of this can be found among the standard types of
+critcl itself, the [type pstring] type. This type provides the C
+function with not only the string pointer, but also the string length,
+and the [type Tcl_Obj*] this data came from. As [cmd critcl::cproc]'s
+calling conventions allow us only one argument for the data of the
+parameter a structure is needed to convey these three pieces of
+information.
+
+[para] Thus the argument type is defined as
+
+[example {
+    critcl::argtype pstring {
+        @A.s = Tcl_GetStringFromObj(@@, &(@A.len));
+        @A.o = @@;
+    } critcl_pstring critcl_pstring
+
+    critcl::argtypesupport pstring {
+        typedef struct critcl_pstring {
+            Tcl_Obj*    o;
+            const char* s;
+            int         len;
+        } critcl_pstring;
+    }
+}]
+
+[para] In the case of such a structure being large we may wish to
+allocate it on the heap instead of having it taking space on the
+stack. If we do that we need another adjunct command,
+[cmd critcl::argtyperelease]. This command specifies the code required
+to release dynamically allocated resources when the worker function
+returns, before the shim returns to the caller in Tcl.
+
+To keep things simple our example is synthetic, a modification of
+[const pstring] above, to demonstrate the technique. An actual, but
+more complex example is the code to support the variadic [arg args]
+argument of [cmd critcl::cproc].
+
+[example {
+    critcl::argtype pstring {
+        @A = (critcl_pstring*) ckalloc(sizeof(critcl_pstring));
+        @A->s = Tcl_GetStringFromObj(@@, &(@A->len));
+        @A->o = @@;
+    } critcl_pstring* critcl_pstring*
+
+    critcl::argtypesupport pstring {
+        typedef struct critcl_pstring {
+            Tcl_Obj*    o;
+            const char* s;
+            int         len;
+        } critcl_pstring;
+    }
+
+    critcl::argtyperelease pstring {
+        ckfree ((char*)) @A);
+    }
+}]
+
+Note, the above example shows only the most simple case of an
+allocated argument, with a conversion that cannot fail (namely, string
+retrieval). If the conversion can fail then either the allocation has
+to be defered to happen only on successful conversion, or the
+conversion code has to release the allocated memory itself in the
+failure path, because it will never reach the code defined via
+[cmd critcl::argtyperelease] in that case.
diff --git a/src/vfs/critcl.vfs/doc/include/cproc/using_eproctypes4.inc b/src/vfs/critcl.vfs/doc/include/cproc/using_eproctypes4.inc
new file mode 100644
index 00000000..4441597a
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/cproc/using_eproctypes4.inc
@@ -0,0 +1,60 @@
+[subsection {Custom Types, Results}]
+
+All of the previous sections dealt with argument conversions,
+i.e. going from Tcl into C.
+
+Custom result types are for the reverse direction, from C to Tcl.
+
+This is usually easier, as most of the time errors should not be
+possible. Supporting structures, or allocating them on the heap are
+not really required and therefore not supported.
+
+[para] The example of a result type shown below was pulled from
+[package KineTcl]. It is a variant of the builtin result type
+[type Tcl_Obj*], aka [type object]. The builtin conversion assumes
+that the object returned by the function has a refcount of 1 (or
+higher), with the function having held the reference, and releases
+that reference after placing the value into the interp result. The
+conversion below on the other hand assumes that the value has a
+refcount of 0 and thus that decrementing it is forbidden, lest it be
+released much to early, and crashing the system.
+
+[example {
+    critcl::resulttype KTcl_Obj* {
+        if (rv == NULL) { return TCL_ERROR; }
+        Tcl_SetObjResult(interp, rv);
+        /* No refcount adjustment */
+        return TCL_OK;
+    } Tcl_Obj*
+}]
+
+This type of definition is also found in [package Marpa] and recent
+hacking hacking on [package CRIMP] introduced it there as well. Which
+is why this definition became a builtin type starting with version
+3.1.16, under the names [type Tcl_Obj*0] and [type object0].
+
+[para] Going back to errors and their handling, of course, if a
+function we are wrapping signals them in-band, then the conversion of
+such results has to deal with that. This happens for example in
+[package KineTcl], where we find
+
+[example {
+    critcl::resulttype XnStatus {
+        if (rv != XN_STATUS_OK) {
+            Tcl_AppendResult (interp, xnGetStatusString (rv), NULL);
+            return TCL_ERROR;
+        }
+        return TCL_OK;
+    }
+
+    critcl::resulttype XnDepthPixel {
+        if (rv == ((XnDepthPixel) -1)) {
+            Tcl_AppendResult (interp,
+                              "Inheritance error: Not a depth generator",
+                              NULL);
+            return TCL_ERROR;
+        }
+        Tcl_SetObjResult (interp, Tcl_NewIntObj (rv));
+        return TCL_OK;
+    }
+}]
diff --git a/src/vfs/critcl.vfs/doc/include/feedback.inc b/src/vfs/critcl.vfs/doc/include/feedback.inc
new file mode 100644
index 00000000..ea1d1adb
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/feedback.inc
@@ -0,0 +1,14 @@
+[comment {--- Standard trailer for all manpages in this module --}]
+[section Authors]
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+[section {Bugs, Ideas, Feedback}]
+
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+
+Please report them at [uri https://github.com/andreas-kupries/critcl/issues].
+
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at [uri https://github.com/andreas-kupries/critcl/issues] as well.
diff --git a/src/vfs/critcl.vfs/doc/include/feedback2.inc b/src/vfs/critcl.vfs/doc/include/feedback2.inc
new file mode 100644
index 00000000..11887054
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/feedback2.inc
@@ -0,0 +1,13 @@
+[comment {--- Standard trailer for all manpages in this module --}]
+[section Authors]
+Andreas Kupries
+
+[section {Bugs, Ideas, Feedback}]
+
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+
+Please report such at [uri https://github.com/andreas-kupries/critcl].
+
+Please also report any ideas for enhancements you may have for either
+package and/or documentation.
diff --git a/src/vfs/critcl.vfs/doc/include/global.inc b/src/vfs/critcl.vfs/doc/include/global.inc
new file mode 100644
index 00000000..def5447a
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/global.inc
@@ -0,0 +1,38 @@
+[vset ctlong [term {C Runtime In Tcl}]]
+[vset critcl [term CriTcl]]
+[vset critcl_script [term {CriTcl script}]]
+
+[vset slogan "Adding C code to [vset tcl_home]/[vset tk_home] has never been easier."]
+
+[vset cumulative     {Calls to this command are cumulative.}]
+[vset cumulative_opt {Uses of this option are cumulative.}]
+
+[vset not_needed_for_critcl_script "
+These commands are not needed to simply write a [term {CriTcl script}].
+"]
+
+[vset pkg_namerules "
+The basename of the first file is the name of the package to generate. If
+its file extension indicates a shared library ([file .so], [file .sl],
+[file .dylib], and [file .dll]) it is also removed from the set of input
+files. Each [vset critcl_script] file is kept as part of the input. A single
+file without a suffix is assumed to be a [vset critcl_script]. A file without
+a suffix, but other input files following is treated like the name of a
+shared library proper, and removed from the set of input files.
+"]
+
+[vset relative_pattern "
+A pattern for a relative path is resolved relative to the directory
+containing the [term {CriTcl script}].
+"]
+
+[vset relative_path "
+A relative path is resolved relative to the directory
+containing the [term {CriTcl script}].
+"]
+
+
+[vset see_overview "
+	If you are in need of an overview of the whole system instead, please
+	go and read the [manpage {Introduction To CriTcl}].
+"]
diff --git a/src/vfs/critcl.vfs/doc/include/iconfig.inc b/src/vfs/critcl.vfs/doc/include/iconfig.inc
new file mode 100644
index 00000000..1f62b6f3
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/iconfig.inc
@@ -0,0 +1,252 @@
+[include skip.inc]
+
+It explains the syntax of configuration files and the configuration
+keys used by [package critcl] to configure its build backend, i.e. how
+this part of the system accesses compiler, linker, etc.
+
+[para]
+
+It is recommended to open the file containing the standard
+configurations ([file path/to/critcl/Config]) in the editor of your
+choice when reading this section of the documentation, using it as an
+extended set of examples going beyond the simple defaults shown here.
+
+[para]
+
+First, the keys and the meaning of their values, plus examples drawn
+from the standard configurations distributed with the package.
+
+Note that when writing a custom configuration it is not necessary to
+specify all the keys listed below, but only those whose default values
+are wrong or insufficient for the platform in question.
+
+[list_begin definitions]
+[comment {============================================================}]
+[def version]
+The command to print the compiler version number.
+Defaults to [example { gcc -v }]
+
+[comment {============================================================}]
+[def compile]
+The command to compile a single C source file to an object file.
+Defaults to [example { gcc -c -fPIC }]
+
+[comment {============================================================}]
+[def debug_memory]
+The list of flags for the compiler to enable memory debugging in
+Tcl.
+Defaults to [example { -DTCL_MEM_DEBUG }]
+
+[comment {============================================================}]
+[def debug_symbols]
+The list of flags for the compiler to add symbols to the object files
+and the resulting library.
+Defaults to [example { -g }]
+
+[comment {============================================================}]
+[def include]
+The compiler flag to add an include directory.
+Defaults to [example { -I }]
+
+[comment {============================================================}]
+[def tclstubs]
+The compiler flag to set USE_TCL_STUBS.
+Defaults to [example { -DUSE_TCL_STUBS }]
+
+[comment {============================================================}]
+[def tkstubs]
+The compiler flag to set USE_TK_STUBS.
+Defaults to [example { -DUSE_TK_STUBS }]
+
+[comment {============================================================}]
+[def threadflags]
+The list of compiler flags to enable a threaded build.
+Defaults to [example {
+    -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1
+    -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1
+    -DTCL_THREADS=1
+}].
+
+[comment {============================================================}]
+[def noassert]
+The compiler flag to turn off assertions in Tcl code.
+Defaults to [example { -DNDEBUG }]
+
+[comment {============================================================}]
+[def optimize]
+The compiler flag to specify optimization level.
+Defaults to [example { -O2 }]
+
+[comment {============================================================}]
+[def output]
+The compiler flags to set the output file of a compilation.
+Defaults to [example { -o [list $outfile] }]
+
+[para] [emph NOTE] the use of Tcl commands and variables here.  At the
+time [package critcl] uses the value of this key the value of the
+referenced variable is substituted into it. The named variable is the
+only variable whose value is defined for this substitution.
+
+[comment {============================================================}]
+[def object]
+The file extension for object files on the platform.
+Defaults to [example { .o }]
+
+[comment {============================================================}]
+[def preproc_define]
+The command to preprocess a C source file without compiling it, but
+leaving #define's in the output. Defaults to [example { gcc -E -dM }]
+
+[comment {============================================================}]
+[def preproc_enum]
+See [const preproc_define], except that #define's are not left in the
+output. Defaults to [example { gcc -E }]
+
+[comment {============================================================}]
+[def link]
+The command to link one or more object files and create a shared
+library. Defaults to [example { gcc -shared }]
+
+[comment {============================================================}]
+[def link_preload]
+The list of linker flags to use when dependent libraries are
+pre-loaded. Defaults to
+[example { --unresolved-symbols=ignore-in-shared-libs }]
+
+[comment {============================================================}]
+[def strip]
+The flag to tell the linker to strip symbols from the shared library.
+Defaults to [example { -Wl,-s }]
+
+
+[comment {============================================================}]
+[def ldoutput]
+Like [const output], but for the linker.
+Defaults to the value of [const output].
+
+[comment {============================================================}]
+[def link_debug]
+The list of linker flags needed to build a shared library with
+symbols. Defaults to the empty string.
+
+One platform requiring this are all variants of Windows, which uses
+[example { -debug:full -debugtype:cv }]
+
+[comment {============================================================}]
+[def link_release]
+The list of linker flags needed to build a shared library without
+symbols, i.e. a regular build. Defaults to the empty string.
+
+One platform requiring this are all variants of Windows, which uses
+[example { -release -opt:ref -opt:icf,3 -ws:aggressive }]
+
+[comment {============================================================}]
+[def sharedlibext]
+The file extension for shared library files on the platform.
+Defaults to [example { [info sharedlibextension] }]
+
+[comment {============================================================}]
+[def platform]
+The identifier of the platform used in generated packages.
+Defaults to [example { [platform::generic] }]
+
+[comment {============================================================}]
+[def target]
+The presence of this key marks the configuration as a
+cross-compilation target and the value is the actual platform
+identifier of the target.  No default.
+
+[list_end]
+[para]
+
+The syntax expected from configuration files is governed by the rules below.
+
+Again, it is recommended to open the file containing the standard
+configurations ([file path/to/critcl/Config]) in the editor of your
+choice when reading this section of the documentation, using it as an
+extended set of examples for the syntax>
+
+[list_begin enumerated]
+[comment {============================================================}]
+[enum] Each logical line of the configuration file consists of one or
+more physical lines. In case of the latter the physical lines have to
+follow each other and all but the first must be marked by a trailing
+backslash. This is the same marker for [term {continuation lines}] as
+used by Tcl itself.
+
+[comment {============================================================}]
+[enum] A (logical) line starting with the character "#" (modulo
+whitespace) is a comment which runs until the end of the line, and is
+otherwise ignored.
+
+[comment {============================================================}]
+[enum] A (logical) line starting with the word "if" (modulo
+whitespace) is interpreted as Tcl's [cmd if] command and executed as
+such. I.e. this command has to follow Tcl's syntax for the command,
+which may stretch across multiple logical lines. The command will be
+run in a save interpreter.
+
+[comment {============================================================}]
+[enum] A (logical) line starting with the word "set" (modulo
+whitespace) is interpreted as Tcl's [cmd set] command and executed as
+such. I.e. this command has to follow Tcl's syntax for the command,
+which may stretch across multiple logical lines. The command will be
+run in a save interpreter.
+
+[comment {============================================================}]
+[enum] A line of the form "[arg platform] [var variable] [arg value]"
+defines a platform specific configuration variable and value.
+
+The [var variable] has to be the name of one of the configuration keys
+listed earlier in this section, and the [arg platform] string
+identifies the platform the setting is for. All settings with the same
+identification string form the [term {configuration block}] for this
+platform.
+
+[comment {============================================================}]
+[enum] A line of the special form
+"[arg platform] [const when] [arg expression]"
+marks the [arg platform] and all the settings in its
+[term {configuration block}] as conditional on the [arg expression].
+
+[para]
+
+If the build platform is not a prefix of [arg platform],
+nor vice versa the whole block is ignored.
+
+Otherwise the [arg expression] is evaluated via [cmd expr], in the
+same safe interpreter used to run any [cmd set] and [cmd if] commands
+found in the configuration file (see above).
+
+[para]
+
+If the expression evaluates to [const true] this configuration block
+is considered to be the build platform fo the host and chosen as the
+default configuration.
+
+An large example of of this feature is the handling of OS X found in
+the standard configuration file, where it selects the architectures to
+build based on the version of the operating system, the available SDK,
+etc. I.e. it chooses whether the output is universal or not, and
+whether it is old-style (ix86 + ppc) versus new-style (ix86 32+64) of
+universality.
+
+[comment {============================================================}]
+[enum] A line of the special form
+"[arg platform] [const copy] [arg sourceplatform]"
+copies the configuration variables and values currently defined in the
+[term {configuration block}] for [arg sourceplatform] to that of
+[arg platform], overwriting existing values, and creating missing
+ones. Variables of [arg platform] not defined by by [arg sourceplatform]
+are not touched.
+
+[para] The copied values can be overridden later in the configuration
+file. Multiple [const copy] lines may exist for a platform and be
+intermixed with normal configuration definitions. Only the last definition of a
+variable is used.
+
+[comment {============================================================}]
+[enum] At last, a line of the form "[var variable] [arg value]"
+defines a default configuration variable and value.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/largeexampleref.inc b/src/vfs/critcl.vfs/doc/include/largeexampleref.inc
new file mode 100644
index 00000000..074641b7
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/largeexampleref.inc
@@ -0,0 +1,4 @@
+
+[para] [strong Note] that the sources of CriTcl, should the reader have gotten them, also
+contain several examples show-casing various aspects of the system. These demonstration
+packages can all be found in the sub-directory [file examples/] of the sources.
diff --git a/src/vfs/critcl.vfs/doc/include/mapping.inc b/src/vfs/critcl.vfs/doc/include/mapping.inc
new file mode 100644
index 00000000..ee37d651
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/mapping.inc
@@ -0,0 +1,24 @@
+
+Each [file .critcl] file is backed by a single private [file .c] file
+containing that code, plus the boilerplate necessary for its
+compilation and linking as a single shared library.
+
+[para] The [sectref {Advanced: Embedded C Code} {Embedded C Code}]
+fragments appear in that file in the exact same order they were
+defined in the [file .critcl] file, with one exception. The C code
+provided via [cmd critcl::cinit] is put after all other fragments.
+
+In other words all fragments have access to the symbols defined by
+earlier fragments, and the [cmd critcl::cinit] fragment has access to
+all, regardless of its placement in the [file .critcl] file.
+
+[para] Note: A [emph limitation] of the current system is the near
+impossibility of C level access between different critcl-based
+packages. The issue is not the necessity of writing and sharing the
+proper [syscmd extern] statements, but that the management (export and
+import) of package-specific stubs-tables is not supported. This means
+that dependent parts have to be forcibly loaded before their user,
+with all that entails. See section [sectref {Runtime Behaviour}] for
+the relevant critcl limitation, and remember that many older platforms
+do not support the necessary resolution of symbols, the reason why
+stubs were invented for Tcl in the first place.
diff --git a/src/vfs/critcl.vfs/doc/include/modes.inc b/src/vfs/critcl.vfs/doc/include/modes.inc
new file mode 100644
index 00000000..4518fc96
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/modes.inc
@@ -0,0 +1,36 @@
+
+CriTcl can be used in three different modes of operation, called
+
+[list_begin enumerated]
+[enum] [term {Compile & Run}], and
+[enum] [term {Generate Package}]
+[enum] [term {Generate TEA Package}]
+[list_end]
+
+[term {Compile & Run}] was the original mode and is the default for
+[manpage {critcl_pkg}].  Collects the C fragments from the
+[vset critcl_script], builds them as needed, and caches the results to
+improve load times later.
+
+[para]
+
+The second mode, [term {Generate Package}], was introduced to enable
+the creation of (prebuilt) deliverable packages which do not depend on
+the existence of a build system, i.e. C compiler, on the target
+machine.
+
+This was originally done through the experimental [cmd Critbind] tool,
+and is now handled by the [manpage {CriTcl Application}], also named
+[cmd critcl].
+
+[para]
+
+Newly introduced with CriTcl version 3 is
+[term {Generate TEA Package}]. This mode constructs a directory
+hierarchy from the package which can later be built like a regular TEA
+package, i.e. using
+
+[example {
+	.../configure --prefix ...
+	make all isntall
+}]
diff --git a/src/vfs/critcl.vfs/doc/include/module.inc b/src/vfs/critcl.vfs/doc/include/module.inc
new file mode 100644
index 00000000..8a3f0a0f
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/module.inc
@@ -0,0 +1,19 @@
+[comment {--- Standard header for all manpages in this module --}]
+[comment {--- Standard links ---}]
+[include include/references.inc]
+[comment {--- Standard phrases ---}]
+[include include/global.inc]
+[comment {--- Copyright, Categorization, Keywords ---}]
+[copyright {Jean-Claude Wippler}]
+[copyright {Steve Landers}]
+[copyright {2011-2024 Andreas Kupries}]
+[moddesc   {C Runtime In Tcl (CriTcl)}]
+[category  {Glueing/Embedded C code}]
+[keywords  {C code} {Embedded C Code}]
+[keywords  {dynamic compilation} {calling C code from Tcl}]
+[keywords  {on-the-fly compilation}]
+[keywords  {on demand compilation}]
+[keywords  {dynamic code generation}]
+[keywords  compiler linker {code generator}]
+[keywords  {compile & run}]
+[keywords  {generate package}]
diff --git a/src/vfs/critcl.vfs/doc/include/module2.inc b/src/vfs/critcl.vfs/doc/include/module2.inc
new file mode 100644
index 00000000..0bee667c
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/module2.inc
@@ -0,0 +1,12 @@
+[comment {--- Standard header for all manpages in this module --}]
+[copyright {2011-2024 Andreas Kupries}]
+[moddesc {C Runtime In Tcl (CriTcl)}]
+[category  {Glueing/Embedded C code}]
+[keywords {C code} {Embedded C Code}]
+[keywords {dynamic compilation}]
+[keywords {on-the-fly compilation}]
+[keywords {on demand compilation}]
+[keywords {dynamic code generation}]
+[keywords compiler linker {code generator}]
+[keywords {compile & run}]
+[keywords {generate package}]
diff --git a/src/vfs/critcl.vfs/doc/include/pkg_users.inc b/src/vfs/critcl.vfs/doc/include/pkg_users.inc
new file mode 100644
index 00000000..8b85afc3
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/pkg_users.inc
@@ -0,0 +1,11 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin itemized]
+[item] [uri https://core.tcl-lang.org/akupries/ankh			  AnKH]
+[item] [uri https://core.tcl.tk/akupries/tclyaml			  TclYAML]
+[item] [uri https://github.com/andreas-kupries/tcl-linenoise		  Linenoise]
+[item] [uri https://core.tcl.tk/akupries/kinetcl			  KineTcl]
+[item] [uri https://chiselapp.com/user/andreas_kupries/repository/inotify Inotify]
+[item] [uri https://core.tcl.tk/akupries/marpa 				  TclMarpa]
+[item] [uri https://core.tcl.tk/akupries/crimp 				  CRIMP]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/preload.inc b/src/vfs/critcl.vfs/doc/include/preload.inc
new file mode 100644
index 00000000..c8ae9e7c
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/preload.inc
@@ -0,0 +1,46 @@
+[include skip.inc]
+
+It explains how the preloading of external libraries is realized.
+
+[para]
+
+Whenever a package declares libraries for preloading critcl will build
+a supporting shared library providing a Tcl package named "preload".
+This package is not distributed separately, but as part of the package
+requiring the preload functionality.
+
+This support package exports a single Tcl command
+
+[list_begin definitions]
+[call [cmd ::preload] [arg library]]
+
+which is invoked once per libraries to preload, with the absolute path
+of that [arg library]. The command then loads the [arg library].
+
+[para]
+
+On windows the command will further use the Tcl command
+[cmd ::critcl::runtime::precopy] to copy the [arg library] to the
+disk, should its path be in a virtual filesystem which doesn't
+directly support the loading of a shared library from it.
+
+[list_end]
+
+The command [cmd ::critcl::runtime::precopy] is provided by the file
+[file critcl-rt.tcl] in the generated package, as is the command
+
+[cmd ::critcl::runtime::loadlib] which generates the
+[term {ifneeded script}] expected by Tcl's package management. This
+generated ifneeded script contains the invocations of [cmd ::preload].
+
+[para]
+
+The C code for the supporting library is found in the file
+[file critcl_c/preload.c], which is part of the [package critcl]
+package.
+
+[para]
+
+The Tcl code for the supporting runtime [file critcl-rt.tcl] is found
+in the file [file runtime.tcl], which is part of the
+[package critcl::app] package.
diff --git a/src/vfs/critcl.vfs/doc/include/preload_search.inc b/src/vfs/critcl.vfs/doc/include/preload_search.inc
new file mode 100644
index 00000000..85634b64
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/preload_search.inc
@@ -0,0 +1,55 @@
+
+Each library [arg FOO] is searched for in the directories listed below, in the order
+listed.  The search stops at the first existing path.
+
+Additional notes:
+
+[list_begin itemized]
+[item] [var platform] is the placeholder for the target platform of the package.
+[item] The extension [file .so] is the placeholder for whatever actual extension is used by the target platform for its shared libraries.
+[item] The search is relative to the current working directory.
+[list_end]
+
+And now the paths, depending on the exact form of the library name:
+
+[list_begin definitions]
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[def FOO]
+[list_begin enumerated]
+[enum] FOO.so
+[enum] FOO/FOO.so
+[enum] FOO/[var platform]/FOO.so
+[list_end]
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[def PATH/FOO]
+The exact set searched depends on the existence of
+directory [file PATH/FOO]. If it exists, critcl searches
+
+[list_begin enumerated]
+[enum] FOO.so
+[enum] PATH/FOO/FOO.so
+[enum] PATH/FOO/[var platform]/FOO.so
+[list_end]
+
+Otherwise it searches
+
+[list_begin enumerated]
+[enum] FOO.so
+[enum] PATH/FOO.so
+[enum] PATH/[var platform]/FOO.so
+[list_end]
+
+instead.
+
+[comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%]
+[def /PATH/FOO]
+Even when specifying FOO with an absolute path the first path searched
+is relative to the current working directory.
+
+[list_begin enumerated]
+[enum] FOO.so
+[enum] /PATH/FOO.so
+[enum] /PATH/[var platform]/FOO.so
+[list_end]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/pstructure.inc b/src/vfs/critcl.vfs/doc/include/pstructure.inc
new file mode 100644
index 00000000..310706ca
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/pstructure.inc
@@ -0,0 +1,64 @@
+
+Packages generated by critcl have the following basic structure:
+
+[example {
+<TOP>
++- pkgIndex.tcl
++- critcl-rt.tcl
++- license.terms (optional)
+|
++- tcl (optional)
+|  +- <tsources files>
+|
++- <platform>
+   +- <shared library>
+}]
+
+[para][emph Notes]
+[list_begin enumerated]
+
+[enum] The file [file pkgIndex.tcl] is the standard package index file
+expected by Tcl's package management. It is sourced during a search
+for packages, and declares the package to Tcl with its files, and how
+to handle them.
+
+[enum] The file [file critcl-rt.tcl] is a helper file containing the
+common code used by [file pkgIndex.tcl] to perform its tasks.
+
+[enum] The file [file license.terms] is optional and appears only if
+the [file .critcl] file the package is generated from used the command
+[cmd critcl::license] to declare package author and license.
+
+[enum] All files declared with the command [cmd critcl::tsources] are
+put into the sub-directory [file tcl].
+
+[enum] The shared library generated by critcl is put into a
+platform-specific sub-directory.
+
+[list_end]
+
+[para] The whole structure, and especially the last point, enable us
+to later merge the results (for the same package, and version) for
+multiple target platforms into a single directory structure without
+conflict, by simply copying the top directories over each other. The
+only files which can conflict are in the <TOP> and [file tcl]
+directories, and for these we know that they are identical across
+targets. The result of such a merge would look like:
+
+[example {
+<TOP>
++- pkgIndex.tcl
++- critcl-rt.tcl
++- license.terms (optional)
+|
++- tcl (optional)
+|  +- <tsources files>
+|
++- <platform1>
+|  +- <shared library1>
++- <platform2>
+|  +- <shared library2>
+...
++- <platformN>
+   +- <shared libraryN>
+}]
diff --git a/src/vfs/critcl.vfs/doc/include/quad.inc b/src/vfs/critcl.vfs/doc/include/quad.inc
new file mode 100644
index 00000000..bf2c41d9
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/quad.inc
@@ -0,0 +1,14 @@
+
+[vset reference [sectref {References - Theoretical Work - To Gain Knowlegde}    References]]
+[vset how-to    [sectref {How-To Guides - Practical Work - To Solve Problems}  {How-To Guides}]]
+[vset tu        [sectref {Tutorials - Practical Study - To Learn}               Tutorials]]
+[vset expla     [sectref {Explanations - Theoretical Knowledge - To Understand} Explanations]]
+[example_begin]
+            | Study           | Work
+----------- + --------------- + -----------------
+Practical   | [vset tu]       | [vset how-to]
+            | (Learning)      | (Problem solving)
+----------- + --------------- + -----------------
+Theoretical | [vset expla]    | [vset reference]
+            | (Understanding) | (Knowledge)
+[example_end]
diff --git a/src/vfs/critcl.vfs/doc/include/rcache.inc b/src/vfs/critcl.vfs/doc/include/rcache.inc
new file mode 100644
index 00000000..58b66658
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/rcache.inc
@@ -0,0 +1,31 @@
+
+The compilation of C code is time-consuming [package critcl] not only
+defers it as much as possible, as described in section
+[sectref {Runtime Behaviour}], but also caches the results.
+
+[para] This means that on the first use of a [file .critcl] file
+[file FOO.tcl] the resulting object file and shared library are saved
+into the cache, and on future uses of the same file reused,
+i.e. loaded directly without requiring compilation, provided that the
+contents of [file FOO.tcl] did not change.
+
+[para] The change detection is based MD5 hashes. A single hash is
+computed for each [file .critcl] file, based on hashes for all C code
+fragments and configuration options, i.e. everything which affects the
+resulting binary.
+
+[para] As long as the input file doesn't change as per the hash a
+previously built shared library found in the cache is reused,
+bypassing the compilation and link stages.
+
+[para] The command to manage the cache are found in section
+[sectref {Result Cache Management}].
+
+Note however that they are useful only to tools based on the package,
+like the [manpage {CriTcl Application}]. Package writers have no need
+of them.
+
+[para] As a last note, the default directory for the cache is chosen
+based on the chosen build target. This means that the cache can be put
+on a shared (network) filesystem without having to fear interference
+between machines of different architectures.
diff --git a/src/vfs/critcl.vfs/doc/include/reference_docs.inc b/src/vfs/critcl.vfs/doc/include/reference_docs.inc
new file mode 100644
index 00000000..ccacd546
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/reference_docs.inc
@@ -0,0 +1,13 @@
+[enum] [term {CriTcl Application Reference}]
+[enum] [term {CriTcl Package Reference}]
+[enum] [term {CriTcl cproc Type Reference}]
+[enum] [term {CriTcl - Utilities}]
+[enum] [term {CriTcl - C-level Utilities}]
+[enum] [term {CriTcl - C-level Callback Utilities}]
+[enum] [term {CriTcl - Wrap Support - String/Integer mapping}]
+[enum] [term {CriTcl - Wrap Support - Bitset en- and decoding}]
+[enum] [term {CriTcl - Wrap Support - Enum en- and decoding}]
+[enum] [term {CriTcl - Code Gen - Constant string pools}]
+[enum] [term {CriTcl - Code Gen - Tcl Interp Associations}]
+[enum] [term {CriTcl - Code Gen - C Classes}]
+[enum] [term {CriTcl Application Package Reference}]
diff --git a/src/vfs/critcl.vfs/doc/include/references.inc b/src/vfs/critcl.vfs/doc/include/references.inc
new file mode 100644
index 00000000..17e706c1
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/references.inc
@@ -0,0 +1,26 @@
+[comment {--- Standard links in the documentation ---}]
+
+[vset jcw               [term {Jean-Claude Wippler}]] [comment {todo: link - github}]
+[vset project_home      [uri http://andreas-kupries.github.io/critcl]]
+[vset project_issues    [uri https://github.com/andreas-kupries/critcl/issues]]
+[vset git_home          [uri http://www.git-scm.com {Git SCM}]]
+[vset git_binaries      [uri https://git-scm.com/downloads {download page}]]
+[vset tcl_home          [uri http://core.tcl-lang.org/tcl Tcl]]
+[vset tk_home           [uri http://core.tcl-lang.org/tk  Tk]]
+[vset teapot            [uri http://teapot.activestate.com]]
+[vset tcllib_home       [uri http://core.tcl-lang.org/tcllib Tclib]]
+[vset tklib_home        [uri http://core.tcl-lang.org/tklib  Tklib]]
+[vset kettle_home       [uri https://chiselapp.com/user/andreas_kupries/repository/Kettle/index Kettle]]
+[vset activetcl         [uri http://www.activestate.com/activetcl]]
+[vset activestate       [uri http://www.activestate.com ActiveState's]]
+[vset quad		[uri https://documentation.divio.com/ Quadrants]]
+
+[vset yum		[uri https://access.redhat.com/solutions/9934		yum]]
+[vset apt-get		[uri https://help.ubuntu.com/community/AptGet/Howto	apt-get]]
+[vset zypper		[uri https://en.opensuse.org/Portal:Zypper		zypper]]
+[vset mingw		[uri https://www.mingw-w64.org				MinGW]]
+[vset cygwin		[uri https://www.cygwin.com/				CygWin]]
+[vset wsl		[uri https://docs.microsoft.com/en-us/windows/wsl/faq	WSL]]
+[vset git4win		[uri https://gitforwindows.org				{Git For Windows}]]
+[vset tkdiff		[uri https://tkdiff.sourceforge.io                      TkDiff]]
+[vset eskil		[uri http://eskil.tcl.tk                                Eskil]]
diff --git a/src/vfs/critcl.vfs/doc/include/rq_cc.inc b/src/vfs/critcl.vfs/doc/include/rq_cc.inc
new file mode 100644
index 00000000..68a79fe6
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/rq_cc.inc
@@ -0,0 +1,27 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+While [vset critcl] requires a working C compiler to both install itself, and to process
+[vset critcl]-based packages installing such is very much out of scope for this document.
+
+[para] Please follow the instructions for the platform and system [vset critcl] is to be
+installed on.
+
+[para] The important pieces of information are this:
+
+[list_begin enumerated]
+
+[enum] The path to the directory containing the C compiler binary has to be listed in the
+       environment variable [var PATH], for [vset critcl] to find it.
+
+[enum] On Windows(tm) the environment variable [var LIB] has to be present and contain the
+       paths of the directories holding Microsoft's libraries. The standard [vset critcl]
+       configuration for this platform searches these paths to fine-tune its settings
+       based on available libraries and compiler version.
+
+[list_end]
+
+[para] Links of interest:
+
+[list_begin definitions]
+[def [uri http://www.tldp.org/HOWTO/HOWTO-INDEX/programming.html]]
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/rq_cline.inc b/src/vfs/critcl.vfs/doc/include/rq_cline.inc
new file mode 100644
index 00000000..05ad0964
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/rq_cline.inc
@@ -0,0 +1,6 @@
+
+[para] This facility requires the use of a tclsh that provides
+[cmd {info frame}].  Otherwise, no [term #line] directives are emitted. The
+command is supported by Tcl 8.5 and higher. It is also supported by
+Tcl 8.4 provided that it was compiled with the define
+[option -DTCL_TIP280]. An example of such is ActiveState's ActiveTcl.
diff --git a/src/vfs/critcl.vfs/doc/include/rq_tcl.inc b/src/vfs/critcl.vfs/doc/include/rq_tcl.inc
new file mode 100644
index 00000000..ca186f37
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/rq_tcl.inc
@@ -0,0 +1,21 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[para] That a working installation of [vset critcl] will require a working installation of
+[vset tcl_home] should be obvious.
+
+[para] Installing Tcl however is out of scope here, same as for installing a working C
+compiler.
+
+[para] There are too many options, starting from
+[uri http://core.tcl-lang.org/tcl {building it from scratch}], installing what is provided
+by the platform's package manager ([vset zypper], [vset yum], [vset apt-get], and more),
+to using some vendor's [uri https://core.tcl-lang.org/dist.html distribution].
+
+[para] A single piece of advice however.
+
+[para] While [vset critcl] currently supports running on Tcl 8.4 and higher, and the
+creation of packages for the same, the last release for this version was in 2013 (9 years
+ago at the time of writing). Similarly, the last release for Tcl 8.5 was in 2016 (6 years
+ago). Both are official end of life.
+
+[para] Given this I recommend to install and use Tcl 8.6.
diff --git a/src/vfs/critcl.vfs/doc/include/rq_tcllib.inc b/src/vfs/critcl.vfs/doc/include/rq_tcllib.inc
new file mode 100644
index 00000000..edfa996b
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/rq_tcllib.inc
@@ -0,0 +1,30 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+The implementation of [vset critcl] uses and depends on 
+
+[list_begin enumerated]
+[enum] [package cmdline]
+[list_end]
+
+[para] Depending on how Tcl was installed this package may be available already without
+action, or not.
+
+Invoke the command
+
+[example {
+    echo 'puts [package require cmdline]' | tclsh
+}]
+
+to check if the package is present or not. If it is present then its version number will
+be printed, else the error message [const {can't find package cmdline}] or similar.
+
+[para] If it is not present install the package as per the instructions for the chosen Tcl
+installation.
+
+[para] [strong Note], the package [package cmdline] may not exist as its own installable
+package. In such a case check if the chosen Tcl installation provides a [package tcllib]
+package and install that. This should install all the packages in the Tcllib bundle,
+including [package cmdline].
+
+[para] As a last fallback, go to [vset tcllib_home] and follow the instructions to install
+the bundle from scratch.
diff --git a/src/vfs/critcl.vfs/doc/include/runtime.inc b/src/vfs/critcl.vfs/doc/include/runtime.inc
new file mode 100644
index 00000000..1f94234b
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/runtime.inc
@@ -0,0 +1,25 @@
+
+The default behaviour of critcl, the package is to defer the
+compilation, linking, and loading of any C code as much as possible,
+given that this is an expensive operation, mainly in the time
+required.
+
+In other words, the C code embedded into a [file .critcl] file is
+built only when the first C command or procedure it provides is
+invoked.
+
+This part of the system uses standard functionality built into the Tcl
+core, i.e. the [var auto_index] variable to map from commands to
+scripts providing them and the [cmd unknown] command using this
+information when the command is needed.
+
+[para] A [emph limitation] of this behaviour is that it is not
+possible to just use [cmd {info commands}] check for the existence of
+a critcl defined command. It is also necessary to search in the
+[var auto_index] array, in case it has not been build yet.
+
+[para] This behaviour can be changed by using the control command
+[cmd critcl::load]. When invoked, the building, including loading of
+the result, is forced. After this command has been invoked for a
+[file .critcl] file further definition of C code in this file is not
+allowed any longer.
diff --git a/src/vfs/critcl.vfs/doc/include/skip.inc b/src/vfs/critcl.vfs/doc/include/skip.inc
new file mode 100644
index 00000000..45620935
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/skip.inc
@@ -0,0 +1,6 @@
+
+The audience of this section are developers wishing to understand
+and possibly modify the internals of critcl package and application.
+Package writers can skip this section.
+
+[para]
diff --git a/src/vfs/critcl.vfs/doc/include/smallexampleref.inc b/src/vfs/critcl.vfs/doc/include/smallexampleref.inc
new file mode 100644
index 00000000..e10f968d
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/smallexampleref.inc
@@ -0,0 +1,6 @@
+
+[para] Lots of smaller examples can be found in the document
+[manpage {Using CriTcl}], an introduction to CriTcl by way of a of
+examples. These focus more on specific critcl commands than the
+overall picture shown by the large examples mentioned in the previous
+paragraph.
diff --git a/src/vfs/critcl.vfs/doc/include/stubs.inc b/src/vfs/critcl.vfs/doc/include/stubs.inc
new file mode 100644
index 00000000..459da1ac
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/stubs.inc
@@ -0,0 +1,256 @@
+This section is for developers of extensions not based on critcl, yet
+also wishing to interface with stubs as they are understood and used
+by critcl, either by exporting their own stubs table to a
+critcl-based extension, or importing a stubs table of a critcl-based
+extension into their own.
+
+[para] To this end we describe the stubs table information of a
+package [package foo].
+
+[list_begin enumerated]
+[enum] Note that the differences in the capitalization of "foo",
+"Foo", "FOO", etc. below demonstrate how to capitalize the actual
+package name in each context.
+
+[enum] All relevant files must be available in a sub-directory
+[file foo] which can be found on the include search paths.
+
+[enum] The above directory may contain a file [file foo.decls]. If
+	present it is assumed to contain the external representation
+	of the stubs table the headers mentioned in the following
+	items are based on.
+[para] critcl is able to use such a file to give the importing package
+	programmatic access to the imported API, for automatic code
+	generation and the like.
+
+[enum] The above directory must contain a header file
+[file fooDecls.h]. This file [emph declares] the exported API.
+It is used by both exporting and importing packages. It is usually
+generated and must contain (in the order specified):
+
+[list_begin enumerated]
+[enum] the declarations of the exported, i.e. public, functions of
+	[package foo],
+
+[enum] the declaration of structure "FooStubs" for the stub table,
+
+[enum] the C preprocessor macros which route the invocations of the
+	public functions through the stubs table.
+[para] These macros must be defined if, and only if, the C preprocessor
+	macro USE_FOO_STUBS is defined. Package [package foo] does not
+	define this macro, as it is allowed to use the exported
+	functions directly. All importing packages however must define
+	this macro, to ensure that they do [emph not] use any of the
+	exported functions directly, but only through the stubs table.
+
+[enum] If the exported functions need additional types for their proper
+	declaration then these types should be put into a separate
+	header file (of arbitrary name) and [file fooDecls.h] should
+	contain an #include directive to this header at the top.
+[list_end]
+
+[para] A very reduced, yet also complete example, from a package for
+low-level random number generator functions can be found at the end of
+this section.
+
+[enum] The above directory must contain a header file
+[file fooStubLib.h]. This file [emph defines] everything needed to use
+the API of [package foo]. Consequently it is used only by importing
+packages. It is usually generated and must contain (in the order
+specified):
+
+[list_begin enumerated]
+[enum] An #include directive for [file tcl.h], with USE_TCL_STUBS
+	surely defined.
+
+[enum] An #include directive for [file fooDecls.h], with USE_FOO_STUBS
+	surely defined.
+
+[enum] A [emph definition] of the stubs table variable, i.e.
+	[example {const FooStubs* fooStubsPtr;}]
+
+[enum] A [emph definition] of the stubs initializer function, like
+	[example {char *
+Foo_InitStubs(Tcl_Interp *interp, CONST char *version, int exact)
+{
+    /*
+     * Boiler plate C code initalizing the stubs table variable,
+     * i.e. "fooStubsPtr".
+     */
+
+    CONST char *actualVersion;
+
+    actualVersion = Tcl_PkgRequireEx(interp, "foo", version,
+				     exact, (ClientData *) &fooStubsPtr);
+
+    if (!actualVersion) {
+	return NULL;
+    }
+
+    if (!fooStubsPtr) {
+	Tcl_SetResult(interp,
+		      "This implementation of Foo does not support stubs",
+		      TCL_STATIC);
+	return NULL;
+    }
+
+    return (char*) actualVersion;
+}}]
+[list_end]
+
+This header file must be included by an importing package
+[emph {exactly once}], so that it contains only one definition of both
+stubs table and stubs initializer function.
+
+[para] The importing package's initialization function must further
+contain a statement like
+[example {if (!Foo_InitStubs (ip, "1", 0)) {
+    return TCL_ERROR;
+}}]
+which invokes [package foo]'s stubs initializer function to set the
+local stub table up.
+
+[para] For a complete example of such a header file see below, at the
+end of this section.
+
+[enum] The last item above, about [file fooStubLib.h] [emph differs]
+	from the regular stub stable system used by Tcl. The regular
+	system assumes that a static library [file libfoostub.a] was
+	installed by package [package foo], and links it.
+
+[para] IMVHO critcl's approach is simpler, using [emph only] header
+	files found in a single location, vs. header files and static
+	library found in multiple, different locations.
+
+[para] A second simplification is that we avoid having to extend
+	critcl's compiler backend with settings for the creation of
+	static libraries.
+[list_end]
+
+
+Below is a complete set of example header files, reduced, yet still
+complete, from a package for low-level random number generator
+functions:
+
+[list_begin definitions]
+[def [file rngDecls.h]:]
+[example {
+#ifndef rng_DECLS_H
+#define rng_DECLS_H
+
+#include <tcl.h>
+
+/*
+ * Exported function declarations:
+ */
+
+/* 0 */
+EXTERN void rng_bernoulli(double p, int*v);
+
+typedef struct RngStubs {
+    int magic;
+    const struct RngStubHooks *hooks;
+
+    void (*rng_bernoulli) (double p, int*v); /* 0 */
+} RngStubs;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern const RngStubs *rngStubsPtr;
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_RNG_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+#define rng_bernoulli \
+	(rngStubsPtr->rng_bernoulli) /* 0 */
+
+#endif /* defined(USE_RNG_STUBS) */
+#endif /* rng_DECLS_H */
+
+}]
+
+[def [file rngStubLib.h]:]
+[example {
+/*
+ * rngStubLib.c --
+ *
+ * Stub object that will be statically linked into extensions that wish
+ * to access rng.
+ */
+
+#ifndef USE_TCL_STUBS
+#define USE_TCL_STUBS
+#endif
+#undef  USE_TCL_STUB_PROCS
+
+#include <tcl.h>
+
+#ifndef USE_RNG_STUBS
+#define USE_RNG_STUBS
+#endif
+#undef  USE_RNG_STUB_PROCS
+
+#include "rngDecls.h"
+
+/*
+ * Ensure that Rng_InitStubs is built as an exported symbol.  The other stub
+ * functions should be built as non-exported symbols.
+ */
+
+#undef  TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
+
+const RngStubs* rngStubsPtr;
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Rng_InitStubs --
+ *
+ * Checks that the correct version of Rng is loaded and that it
+ * supports stubs. It then initialises the stub table pointers.
+ *
+ * Results:
+ *  The actual version of Rng that satisfies the request, or
+ *  NULL to indicate that an error occurred.
+ *
+ * Side effects:
+ *  Sets the stub table pointers.
+ *
+ *----------------------------------------------------------------------
+ */
+
+#ifdef Rng_InitStubs
+#undef Rng_InitStubs
+#endif
+
+char *
+Rng_InitStubs(Tcl_Interp *interp, CONST char *version, int exact)
+{
+    CONST char *actualVersion;
+
+    actualVersion = Tcl_PkgRequireEx(interp, "rng", version,
+				     exact, (ClientData *) &rngStubsPtr);
+    if (!actualVersion) {
+	return NULL;
+    }
+
+    if (!rngStubsPtr) {
+	Tcl_SetResult(interp,
+		      "This implementation of Rng does not support stubs",
+		      TCL_STATIC);
+	return NULL;
+    }
+
+    return (char*) actualVersion;
+}
+}]
+[list_end]
+
diff --git a/src/vfs/critcl.vfs/doc/include/use/args.inc b/src/vfs/critcl.vfs/doc/include/use/args.inc
new file mode 100644
index 00000000..2498b81c
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/args.inc
@@ -0,0 +1,30 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+A function taking neither arguments nor returning results is not very useful.
+
+[list_begin enumerated]
+
+[enum] We are now extending the command to take an argument.
+
+[enum][vset base][example {
+    critcl::cproc hello {double x} void {
+	/* double x; */
+	printf("hello world, we have %f\n", x);
+    }
+}][vset rebuild]
+
+[enum] When testing the package again, entering the simple [cmd hello] will fail.
+
+[para] The changed command is now expecting an argument, and we gave it none.
+
+[para] Retry by entering [example {hello 5}] instead.
+       Now the command behaves as expected and prints the provided value.
+
+[para] Further try and enter [example {hello world}]
+       This will fail again.
+       The command expected a real number and we gave it something decidedly not so.
+
+[para] These checks (argument count, argument type) are implemented in the translation
+layer [vset critcl] generates for the C function. The function body is never invoked.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/args_binary.inc b/src/vfs/critcl.vfs/doc/include/use/args_binary.inc
new file mode 100644
index 00000000..6ddc7797
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/args_binary.inc
@@ -0,0 +1,21 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum][vset base][example {
+    critcl::cproc hello {bytes x} void {
+        /* critcl_bytes x (.s, .len, .o); */
+        printf("hello world, with %d bytes \n data: ", x.len);
+        for (i = 0; i < x.len; i++) {
+            printf(" %02x", x.s[i]);
+            if (i % 16 == 15) printf ("\ndata: ");
+        }
+        if (i % 16 != 0) printf ("\n");
+    }
+}][vset rebuild]
+
+[enum] To deal with strings holding binary data use the type [type bytes]. It ensures that
+the function sees the proper binary data, and not how Tcl is encoding it internally, as
+the string types would.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/args_check.inc b/src/vfs/critcl.vfs/doc/include/use/args_check.inc
new file mode 100644
index 00000000..1b3f791c
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/args_check.inc
@@ -0,0 +1,103 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum][vset ebase] Replace the entire [cmd compress] function with [example {
+    critcl::argtype zstd_compression_level {
+        /* argtype: `int` */
+        if (Tcl_GetIntFromObj (interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+        /* additional validation */    
+        int max = ZSTD_maxCLevel();
+        if ((@A < 1) || (@A > max)) {
+            Tcl_SetObjResult (interp,
+                Tcl_ObjPrintf ("zstd compression level must be integer between 1 and %d", max));
+            return TCL_ERROR;
+        }
+        /* @@: current objv[] element
+        ** @A: name of argument variable for transfer to C function
+        ** interp: predefined variable, access to current interp - error messages, etc.
+        */
+    } int int ;# C types of transfer variable and function argument.
+
+    critcl::cproc compress {
+        Tcl_Interp*            ip
+        bytes                  data
+        zstd_compression_level {level ZSTD_CLEVEL_DEFAULT}
+    } object0 {
+        /* critcl_bytes data; (.s, .len, .o) */
+        /* int level; validated to be in range 1...ZSTD_maxCLevel() */
+
+        Tcl_Obj* error_message;
+
+        size_t dest_sz  = ZSTD_compressBound (data.len);
+        void*  dest_buf = Tcl_Alloc(dest_sz);
+
+        if (!dest_buf) {
+            error_message = Tcl_NewStringObj ("can't allocate memory to compress data", -1);
+            goto err;
+        }
+
+        size_t compressed_size = ZSTD_compress (dest_buf, dest_sz,
+                                                data.s,   data.len,
+                                                level);
+        if (ZSTD_isError (compressed_size)) {
+            Tcl_Free(dest_buf);
+            error_message = Tcl_ObjPrintf ("zstd encoding error: %s",
+                                           ZSTD_getErrorName (compressed_size));
+            goto err;
+        }
+
+        Tcl_Obj* compressed = Tcl_NewByteArrayObj (dest_buf, compressed_size);
+        Tcl_Free (dest_buf);
+
+        return compressed;
+    err:
+        Tcl_SetObjResult (ip, error_message);
+        return 0;
+    }
+}][vset rebuild]
+
+[para] In the original example the [arg level] argument of the function was validated in
+the function itself.
+
+This may detract from the funtionality of interest itself, especially if there are lots of
+arguments requiring validation.
+
+If the same kind of argument is used in multiple places this causes code duplication in
+the functions as well.
+
+[para] Use a custom argument type as defined by the modification to move this kind of
+validation out of the function, and enhance readability.
+
+[para] Code duplication however is only partially adressed.
+
+While there is no duplication in the visible definitions the C code of the new argument
+type is replicated for each use of the type.
+
+[enum] Now replace the [cmd argtype] definition with
+[example {
+    critcl::code {
+        int GetCompressionLevel (Tcl_Interp* interp, Tcl_Obj* obj, int* level)
+        {
+            if (Tcl_GetIntFromObj (interp, obj, level) != TCL_OK) return TCL_ERROR;
+
+            int max = ZSTD_maxCLevel();
+            if ((*level < 1) || (*level > max)) {
+                Tcl_SetObjResult (interp,
+                    Tcl_ObjPrintf ("zstd compression level must be integer between 1 and %d", max));
+                return TCL_ERROR;
+            }
+            return TCL_OK;
+        }
+    }
+
+    critcl::argtype zstd_compression_level {
+        if (GetCompressionLevel (@@, &@A) != TCL_OK) return TCL_ERROR;
+    } int int
+}][vset rebuild]
+
+[para] Now only the calls to the new validation function are replicated.
+
+The function itself exists only once.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/args_default.inc b/src/vfs/critcl.vfs/doc/include/use/args_default.inc
new file mode 100644
index 00000000..ab3449a2
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/args_default.inc
@@ -0,0 +1,39 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Reread the example of the main section. Note specifically the line [example {
+    int {level ZSTD_CLEVEL_DEFAULT}
+}]
+
+[enum] This line demonstrates that [cmd critcl::cproc] arguments allowed to have default
+values, in the same vein as [cmd proc] arguments, and using the same syntax.
+
+[enum] [emph Attention] Default values have to be legal C rvalues and match the C type of
+the argument.
+
+[para] They are literally pasted into the generated C code.
+
+[para] They bypass any argument validation done in the generated translation layer. This
+means that it is possible to use a value an invoker of the command cannot use from Tcl.
+
+[enum] This kind of in-band signaling of a default versus a regular argument is however
+not necessary.
+
+[para] Look at [example {
+    critcl::cproc default_or_not {int {x 0}} void {
+	if !has_x {
+	    printf("called with default\n");
+	    return
+	}
+	printf("called with %d\n", x);
+    }
+}]
+
+[para] Any argument [arg x] with a default causes [vset critcl] to create a hidden
+argument [arg has_x], of type int (boolean).
+
+This argument is set to [const 1] when [arg x] was filled from defaults, and [const 0]
+else.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/args_list.inc b/src/vfs/critcl.vfs/doc/include/use/args_list.inc
new file mode 100644
index 00000000..0719763a
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/args_list.inc
@@ -0,0 +1,38 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+Even as a string-oriented language Tcl is capable of handling more complex structures. The first of
+it, with Tcl since the beginning are [term lists]. Sets of values indexed by a numeric value.
+
+[para] In C parlance, [term arrays].
+
+[list_begin enumerated]
+
+[enum] We are now extending the command with a [type list] argument.
+[enum][vset base][example {
+    critcl::cproc hello {list x} void {
+	/* critcl_list x (.o, .v, .c); */
+	printf("hello world, %d elements in (%s)\n", x.c, Tcl_GetString (x.o));
+    }
+}][vset rebuild]
+
+[enum] Testing [cmd hello] with any kind of list argument it will print basic information about it.
+
+[enum] Of note here is that the command argument [var x] is a structure.
+
+[enum] The example uses only two of the three fields, the pointer to the original [type Tcl_Obj*]
+holding the list ([var .o]), and the length of the list ([var .c]) in elements.
+
+[para] The field [var .v], not used above, is the C array holding the [type Tcl_Obj*] pointers to
+the list elements.
+
+[enum] [emph Attention] The pointers [var .o] and [var .v] refer into data structures
+[emph internal] to and managed by the Tcl interpreter.
+
+Changing them is highly likely to cause subtle and difficult to track down bugs.
+
+Any and all complex arguments must be treated as [term Read-Only]. Never modify them.
+
+[enum] As a last note, this argument type does not place any constraints on the size of the list, or
+on the type of the elements.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/args_list_constrained.inc b/src/vfs/critcl.vfs/doc/include/use/args_list_constrained.inc
new file mode 100644
index 00000000..b191a8d6
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/args_list_constrained.inc
@@ -0,0 +1,33 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+As mentioned at the end of section [sectref {List Arguments}] the basic [type list] type places no
+constraints on the size of the list, nor on the type of the elements.
+
+[para] Both kind of constraints can be done however, alone or together.
+
+[list_begin enumerated]
+
+[enum] We are now extending the command with a length-limited list.
+[enum][vset base][example {
+    critcl::cproc hello {[5] x} void {
+	/* critcl_list x (.o, .v, .c); */
+	printf("hello world, %d elements in (%s)\n", x.c, Tcl_GetString (x.o));
+    }
+}][vset rebuild]
+
+[enum] Testing the new command will show that only lists holding exactly [const 5] elements will be
+accepted.
+
+[enum] To accept lists of any length use [const {[]}] or [const {[*]}]. Both forms are actually
+aliases of the base type, i.e. [type list].
+
+[enum] To constrain just the type of elements, for example to type [type int], use [example {int[]}]
+or [example {[]int}]
+
+[enum] To combine both type and length constraints use the forms [example {int[5]}] or
+[example {[5]int}]
+
+[enum] The last, most C-like forms of these contraints place the list indicator syntax on the
+argument instead of the type. I.e [example {int a[]}] or [example {int a[5]}]
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/args_obj.inc b/src/vfs/critcl.vfs/doc/include/use/args_obj.inc
new file mode 100644
index 00000000..c727c7ac
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/args_obj.inc
@@ -0,0 +1,48 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+When the set of predefined argument types is not enough the oldest way of handling the
+situation is falling back to the structures used by Tcl to manage values, i.e.
+[type Tcl_Obj*].
+
+[list_begin enumerated]
+
+[enum][vset base][example {
+    critcl::cproc hello {object x} void {
+	/* Tcl_Obj* x */
+	int len;
+	char* str = Tcl_GetStringFromObj (x, &len);
+	printf("hello world, from %s (%d bytes)\n", str, len);
+    }
+}][vset rebuild]
+
+[enum] Having direct access to the raw [type Tcl_Obj*] value all functions of the public
+Tcl API for working with Tcl values become usable. The downside of that is that all the
+considerations for handling them apply as well.
+
+[para] In other words, the C code becomes responsible for handling the reference counts
+correctly, for duplicating shared [type Tcl_Obj*] structures before modifying them, etc.
+
+[para] One thing the C code is allowed to do without restriction is to [term shimmer] the
+internal representation of the value as needed, through the associated Tcl API
+functions. For example [fun Tcl_GetWideIntFromObj] and the like.
+
+It actually has to be allowed to do so, as the type checking done as part of such
+conversions is now the responsibility of the C code as well.
+
+[para] For the predefined types this is all hidden in the translation layer generated by
+[vset critcl].
+
+[para] If more than one command has to perform the same kind of checking and/or conversion
+it is recommended to move the core of the code into proper C functions for proper sharing
+among the commands.
+
+[enum] This is best done by defining a custom argument type using [vset critcl] commands.
+
+This extends the translation layer [vset critcl] is able to generate.
+
+The necessary conversions, type checks, etc. are then again hidden from the bulk of the
+application C code.
+
+[para] We will come back to this.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/args_range.inc b/src/vfs/critcl.vfs/doc/include/use/args_range.inc
new file mode 100644
index 00000000..af689d51
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/args_range.inc
@@ -0,0 +1,22 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum][vset base][example {
+    critcl::cproc hello {{double > 5 < 22} x} void {
+	/* double x, range 6-21; */
+	printf("hello world, we have %f\n", x);
+    }
+}][vset rebuild]
+
+[enum] When dealing with simple arguments whose range of legal values is limited to a single
+continuous interval extend the base type with the necessary relations ([const >], [const >=],
+[const <], and [const <=]) and limiting values.
+
+[para][strong Note] that the limiting values have to be proper constant numbers acceptable by the
+base type. Symbolic values are not accepted.
+
+[para] Here the argument [arg x] of the changed function will reject all values outside of the
+interval 6 to 21.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/args_str.inc b/src/vfs/critcl.vfs/doc/include/use/args_str.inc
new file mode 100644
index 00000000..2c441e02
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/args_str.inc
@@ -0,0 +1,46 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+Tcl prides itself on the fact that [term {Everything Is A String}].
+
+So how are string values passed into C functions ?
+
+[list_begin enumerated]
+
+[enum] We are now extending the command with a string argument.
+[enum][vset base][example {
+    critcl::cproc hello {pstring x} void {
+	/* critcl_pstring x (.s, .len, .o); */
+	printf("hello world, from %s (%d bytes)\n", x.s, x.len);
+    }
+}][vset rebuild]
+
+[enum] Testing [cmd hello] with any kind of argument the information is printed.
+
+[enum] Of note here is that the command argument [var x] is a structure.
+
+[enum] The example uses only two of the three fields, the pointer to the string data
+([var .s]), and the length of the string ([var .len]). In bytes, [strong not] in
+characters, because Tcl's internal representation of strings uses a modified UTF-8
+encoding. A character consists of between 1 and [const TCL_UTF_MAX] bytes.
+
+[enum] [emph Attention] The pointers ([var .s]) refer into data structures [emph internal]
+to and managed by the Tcl interpreter.
+
+Changing them is highly likely to cause subtle and difficult to track down bugs.
+
+Any and all complex arguments must be treated as [term Read-Only]. Never modify them.
+
+[enum] Use the simpler type [type char*] if and only if the length of the string is not
+relevant to the command, i.e. not computed, or not used by any of the functions called
+from the body of the command.
+
+Its value is essentially just the [var .s] field of [type pstring]'s structure.
+
+This then looks like [example {
+    critcl::cproc hello {char* x} void {
+	/* char* x; */
+	printf("hello world, from %s\n", x);
+    }
+}]
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/args_structure.inc b/src/vfs/critcl.vfs/doc/include/use/args_structure.inc
new file mode 100644
index 00000000..e772f0e4
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/args_structure.inc
@@ -0,0 +1,79 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] For all that this is a part of how to
+[sectref {Using External Libraries} {Use External Libraries}], for the demonstratation
+only the basics are needed.
+
+[enum][vset base][example {
+    critcl::ccode {
+	typedef struct vec2 {
+	    double x;
+	    double y;
+	} vec2;
+
+	typedef vec2* vec2ptr;
+
+	int
+	GetVecFromObj (Tcl_Interp* interp, Tcl_Obj* obj, vec2ptr* vec)
+	{
+	    int len;
+	    if (Tcl_ListObjLength (interp, obj, &len) != TCL_OK) return TCL_ERROR;
+	    if (len != 2) {
+		Tcl_SetObjResult (interp, Tcl_ObjPrintf ("Expected 2 elements, got %d", len));
+		return TCL_ERROR;
+	    }
+
+	    Tcl_Obj* lv[2];
+	    if (Tcl_ListObjGetElements (interp, obj, &lv) != TCL_OK) return TCL_ERROR;
+
+	    double x, y;
+	    if (Tcl_GetDoubleFromObj (interp, lv[0], &x) != TCL_OK) return TCL_ERROR;
+	    if (Tcl_GetDoubleFromObj (interp, lv[1], &y) != TCL_OK) return TCL_ERROR;
+
+	    *vec = Tcl_Alloc (sizeof (vec2));
+	    (*vec)->x = x;
+	    (*vec)->y = y;
+	    return TCL_OK;
+	}
+    }
+
+    critcl::argtype vec2 {
+	if (GetVecFromObj (interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    } vec2ptr vec2ptr
+
+    critcl::argtyperelease vec2 {
+	/* @A : C variable holding the data to release */
+	Tcl_Free ((char*) @A);
+    }
+
+    critcl::cproc norm {vec2 vector} double {
+	double norm = hypot (vector->x, vector->y);
+	return norm;
+    }
+}][vset rebuild]
+
+[enum] The structure to pass as argument is a 2-dimensional vector. It is actually passed
+in as a pointer to a [type vec2] structure.
+
+This pointer is created by the [fun GetVecFromObj] function. It allocates and fills the
+structure from the Tcl value, which has to be a list of 2 doubles. The bulk of the code in
+[fun GetVecFromObj] is for verifying this and extracting the doubles.
+
+[enum] The [cmd argtyperelease] code releases the pointer when the C function returns. In
+other words, the pointer to the structure is owned by the translation layer and exists
+only while the function is active.
+
+[enum] While working this code has two disadvantages.
+
+First there is memory churn. Each call of [cmd norm] causes the creation and release of a
+temporary [type vec2] structure for the argument.
+
+Second is the need to always extract the data from the [type Tcl_Obj*] value.
+
+[para] Both can be done better.
+
+[para] We will come back to this after explaining how to return structures to Tcl.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/build_help.inc b/src/vfs/critcl.vfs/doc/include/use/build_help.inc
new file mode 100644
index 00000000..f3fc090c
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/build_help.inc
@@ -0,0 +1,9 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Invoke the command [example {
+    critcl -help
+}] in a terminal to get help about the [syscmd critcl] application.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/build_install.inc b/src/vfs/critcl.vfs/doc/include/use/build_install.inc
new file mode 100644
index 00000000..154ee746
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/build_install.inc
@@ -0,0 +1,32 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Starting from the [sectref Basics].
+
+[enum] Use an interactive [syscmd tclsh] seesion to determine the value of
+[cmd {info library}].
+
+[para] For the purpose of this HowTo assume that this path is
+[file /home/aku/opt/ActiveTcl/lib/tcl8.6]
+
+[enum] Invoke the critcl application in a terminal, using [example {
+
+    critcl -libdir /home/aku/opt/ActiveTcl/lib/tcl8.6 -pkg example.tcl
+
+}]
+
+[enum] The package is now build and installed into the chosen directory.
+
+[example {
+   % find /home/aku/opt/ActiveTcl/lib/tcl8.6/example/
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/pkgIndex.tcl
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/critcl-rt.tcl
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/license.terms
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/linux-x86_64
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/linux-x86_64/example.so
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/teapot.txt
+}] 
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/build_package.inc b/src/vfs/critcl.vfs/doc/include/use/build_package.inc
new file mode 100644
index 00000000..a65a7e34
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/build_package.inc
@@ -0,0 +1,7 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Start at section [sectref Basics].
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/build_package_debug.inc b/src/vfs/critcl.vfs/doc/include/use/build_package_debug.inc
new file mode 100644
index 00000000..a65a7e34
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/build_package_debug.inc
@@ -0,0 +1,7 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Start at section [sectref Basics].
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/build_targets.inc b/src/vfs/critcl.vfs/doc/include/use/build_targets.inc
new file mode 100644
index 00000000..610a549e
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/build_targets.inc
@@ -0,0 +1,17 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Invoke the application as [example {
+    critcl -show
+}] in a terminal to get the detailed configuration of the target for the current platform.
+
+[enum] Invoke the application as [example {
+    critcl -show -target NAME
+}] in a terminal to get the detailed configuration of the named target.
+
+[enum] Invoke the application as [example {
+    critcl -targets
+}] in a terminal to get a list of the available targets.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/cconst.inc b/src/vfs/critcl.vfs/doc/include/use/cconst.inc
new file mode 100644
index 00000000..0c9d88e3
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/cconst.inc
@@ -0,0 +1,34 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Starting from the end of the [sectref {Custom Argument Validation} validation] section.
+Edit the file [file example.tcl].
+
+Add the code below, just before the [cmd compress] command.
+
+[example {
+    critcl::cconst version   char* ZSTD_VERSION_STRING
+    critcl::cconst min-level int   1
+    critcl::cconst max-level int   ZSTD_maxCLevel()
+}][vset rebuild]
+
+[enum] These declarations create three additional commands, each returning the specified
+value. A fixed string, an integer, and a function call returning an integer.
+
+[enum] [emph Attention] The values have to be legal C rvalues and match the C type of the
+result. They are literally pasted into the generated C code.
+
+[enum] When using [cmd critcl::cconst] [vset critcl] is aware that the result of the
+function does not depend on any parameters and is computed in a single C expression.
+
+[para] This enables it do to away with the internal helper function it would need and
+generate if [cmd critcl::cproc] had been used instead.
+
+For example [example {
+    critcl::cproc version {} char* {
+	return ZSTD_VERSION_STRING;
+    }
+}]
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/csources.inc b/src/vfs/critcl.vfs/doc/include/use/csources.inc
new file mode 100644
index 00000000..28c15356
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/csources.inc
@@ -0,0 +1,53 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Starting from the end of the [sectref {Custom Argument Validation} previous] section.
+       Edit the file [file example.tcl].
+
+[enum] Save the contents of the [cmd critcl::ccode] block into a file [file example.c] and
+then replace the entire block with
+
+[example {
+    critcl::csources example.c
+
+    critcl::ccode {
+	extern int GetCompressionLevel (Tcl_Interp* interp, Tcl_Obj* obj, int* level);
+    }
+}]
+
+[para] When mixing C and Tcl code the different kind of indentation rules for these
+languages may come into strong conflict. Further, very large blocks of C code may reduce
+overall readability.
+
+[enum] The examples fixes this by moving the code block into a local C file and then
+registering this file with [vset critcl].
+
+When building the package [vset critcl] arranges to build all such registered C files as
+well.
+
+[enum] [emph Attention]. The C code is now in a separate compilation unit.
+
+The example declares the exported function so that the [cmd cproc]s are again able to see
+and use it.
+
+[enum] Now go a step further. Save the declaration into a file [file example.h], and then
+use [example {
+    critcl::include example.h
+}] to import it. Note that this is just a shorthand for [example { critcl::ccode {
+	#include "example.h"
+    }
+}]
+
+[enum] As an alternative solution, start from the beginning of the section and move the
+entire original [cmd critcl::ccode] block into a file [file example-check.tcl].
+
+[para] Then replace it with [example {
+    critcl::source example-check.tcl
+}] to import it into the main code again.
+
+[para] [emph Attention] Tcl's builtin command [cmd source] is [emph {not suitable}] for
+importing the separate file due to how [vset critcl] uses the information from
+[cmd {info script}] to key various internal datastructures.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/csources_ii.inc b/src/vfs/critcl.vfs/doc/include/use/csources_ii.inc
new file mode 100644
index 00000000..27ab23c1
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/csources_ii.inc
@@ -0,0 +1,16 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] See and reread the [sectref {Using External Libraries} {basic wrapper package}] for
+the introduction of the commands referenced below.
+
+[enum] Use the command [cmd critcl::ccode] to write C code residing outside of [cmd cproc]
+bodies.
+
+[enum] Or, alternatively, place the C code into one or more [file .c] files and use the
+command [cmd critcl::csources] to register them with [vset critcl] for compilation.
+
+[enum] This topic is also treated in section [sectref {Separating Local C Sources}].
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/debugging.inc b/src/vfs/critcl.vfs/doc/include/use/debugging.inc
new file mode 100644
index 00000000..724039bd
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/debugging.inc
@@ -0,0 +1,16 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] See and reread the [sectref Basics {basic package}] for the introduction of the
+commands referenced below.
+
+[enum] Use the command [cmd critcl::debug] to activate various features supporting debugging.
+
+[para][example {
+    critcl::debug memory  ;# Activate Tcl memory debugging (-DTCL_MEM_DEBUG)
+    critcl::debug symbols ;# Activate building and linking with debugger symbols (-g)
+    critcl::debug all     ;# Shorthand for both `memory` and `symbols`.
+}]
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/env_query.inc b/src/vfs/critcl.vfs/doc/include/use/env_query.inc
new file mode 100644
index 00000000..c5b82a98
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/env_query.inc
@@ -0,0 +1,26 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Use the command [cmd critcl::check] to immediately check if a piece of C code can
+compiled successfully as a means of querying the compiler configuration itself.
+
+[para][example {
+    if {[critcl::check {
+        #include <FOO.h>
+    }]} {
+        Do stuff with FOO.h present.
+    } else {
+        Do stuff without FOO.h
+    }
+}]
+
+[para] All header and library paths which were registered with [vset critcl] before using
+[cmd critcl::check] take part in the attempted compilation.
+
+[para] Use the package [package critcl::util] and various convenience commands it
+provides.
+
+[enum] Use the full [term {Power of Tcl (tm)}] itself.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/errors.inc b/src/vfs/critcl.vfs/doc/include/use/errors.inc
new file mode 100644
index 00000000..3404f10e
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/errors.inc
@@ -0,0 +1,37 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum][vset base][example {
+    critcl::cproc sqrt {
+	Tcl_Interp* interp
+	double      x
+    } object0 {
+	if (x < 0) {
+	    Tcl_SetObjResult (interp, Tcl_ObjPrintf ("Expected double >=0, but got \"%d\"", x));
+	    Tcl_SetErrorCode (interp, "EXAMPLE", "BAD", "DOMAIN", NULL);
+	    return NULL;
+	}
+	return Tcl_NewDoubleObj(sqrt(x));
+    }
+}][vset rebuild]
+
+[enum] In standard C-based packages commands signal errors by returning [const TCL_ERROR],
+placing the error message as the interpreter result, and maybe providing an error code via
+[fun Tcl_SetErrorCode].
+
+[enum] When using [cmd critcl::cproc] this is limited and hidden.
+
+[enum] The simple and string types for results do not allow failure. The value is returned
+to the translation layer, converted into the interpreter result and then reported as
+success ([const TCL_OK]).
+
+[enum] The object types on the other hand do allow for failure.
+
+Return a [const NULL] value to signal failure to the translation layer, which then reports
+this to the interpreter via the standard [const TCL_ERROR].
+
+[enum] [emph Attention] Setting the desired error message and code into the interpreter is
+still the responsibility of the function body.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/external_bitmap.inc b/src/vfs/critcl.vfs/doc/include/use/external_bitmap.inc
new file mode 100644
index 00000000..a8aca2d1
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/external_bitmap.inc
@@ -0,0 +1,76 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+This section demonstrates how to convert from any kind of bit-mapped flags provided by an
+external library to lists of Tcl strings, and the converse.
+
+[list_begin enumerated]
+
+[enum] For all that this is a part of how to
+[sectref {Using External Libraries} {Use External Libraries}], for the demonstratation
+only the basics are needed.
+
+[enum][vset base][example {
+    # http://man7.org/linux/man-pages/man7/inotify.7.html
+    
+    package require critcl::bitmap
+
+    # critcl::cheaders - n/a, header is in system directories
+    critcl::include sys/inotify.h
+    
+    critcl::bitmap::def tcl_inotify_events {
+	accessed       IN_ACCESS
+	all            IN_ALL_EVENTS
+	attribute      IN_ATTRIB
+	closed         IN_CLOSE
+	closed-nowrite IN_CLOSE_NOWRITE
+	closed-write   IN_CLOSE_WRITE
+	created        IN_CREATE
+	deleted        IN_DELETE
+	deleted-self   IN_DELETE_SELF
+	dir-only       IN_ONLYDIR
+	dont-follow    IN_DONT_FOLLOW
+	modified       IN_MODIFY
+	move           IN_MOVE
+	moved-from     IN_MOVED_FROM
+	moved-self     IN_MOVE_SELF
+	moved-to       IN_MOVED_TO
+	oneshot        IN_ONESHOT
+	open           IN_OPEN
+	overflow       IN_Q_OVERFLOW
+	unmount        IN_UNMOUNT
+    } {
+	all closed move oneshot
+    }
+    
+    # encode: flag set to int
+    critcl::cproc encode {tcl_inotify_events e} int {
+	return e;
+    }
+
+    # decode: int to flag set
+    critcl::cproc decode {int e} tcl_inotify_events {
+	return e;
+    }
+
+}][vset rebuild]
+
+[enum] The map converts between lists of the Tcl level strings listed on the left side to
+the bit-union of the C values on the right side, and the reverse.
+
+[para] It is noted that the four strings [const all], [const closed], [const move], and
+[const oneshot] cannot be converted from C flags to list of strings, only from list to
+bits.
+
+[enum] It automatically generates [cmd critcl::argtype] and [cmd critcl::resulttype]
+definitions.
+
+[enum] [emph Attention] Like the default values for [cmd cproc] arguments, and the results
+for [cmd cconst] definitions the values on the right side have to be proper C
+rvalues. They have to match C type [type int].
+
+[para] In other words, it is perfectly ok to use the symbolic names provided by the header
+file of the external library. As shown.
+
+[list_end]
+
+[para] Packages: [term critcl::bitmap]
diff --git a/src/vfs/critcl.vfs/doc/include/use/external_enum.inc b/src/vfs/critcl.vfs/doc/include/use/external_enum.inc
new file mode 100644
index 00000000..0201b121
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/external_enum.inc
@@ -0,0 +1,57 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+This section demonstrates how to convert from any kind of enumeration provided by an
+external library to Tcl strings, and the converse.
+
+[list_begin enumerated]
+
+[enum] For all that this is a part of how to
+[sectref {Using External Libraries} {Use External Libraries}], for the demonstratation
+only the basics are needed.
+
+[enum][vset base][example {
+    package require critcl::emap
+
+    # no header included due to use of literal ints instead of symbolic names
+
+    critcl::emap::def yaml_sequence_style_t {
+	any   0
+	block 1
+	flow  2
+    }
+
+    # encode: style to int
+    critcl::cproc encode {yaml_sequence_style_t style} int {
+	return style;
+    }
+
+    # decode: int to style
+    critcl::cproc decode {int style} yaml_sequence_style_t {
+	return style;
+    }
+}][vset rebuild]
+
+[enum] The map converts between the Tcl level strings listed on the left side to the C
+values on the right side, and the reverse.
+
+[enum] It automatically generates [cmd critcl::argtype] and [cmd critcl::resulttype]
+definitions.
+
+[enum] [emph Attention] Like the default values for [cmd cproc] arguments, and the results
+for [cmd cconst] definitions the values on the right side have to be proper C
+rvalues. They have to match C type [type int].
+
+[para] In other words, it is perfectly ok to use the symbolic names provided by the header
+file of the external library.
+
+[para] [emph Attention] This however comes at a loss in efficiency. As [vset critcl] then
+has no insight into the covered range of ints, gaps, etc. it has to perform a linear
+search when mapping from C to Tcl. When it knows the exact integer values it can use a
+table lookup instead.
+
+[para] [emph Attention] It also falls back to a search if a lookup table would contain more
+than 50 entries.
+
+[list_end]
+
+[para] Packages: [term critcl::emap]
diff --git a/src/vfs/critcl.vfs/doc/include/use/external_struct.inc b/src/vfs/critcl.vfs/doc/include/use/external_struct.inc
new file mode 100644
index 00000000..489e941d
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/external_struct.inc
@@ -0,0 +1,19 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Handle structures provided by external libraries using either
+[sectref {Structure Types}] or [sectref {Large Structures}] as template.
+
+[enum] [emph Attention]. The choice is with the developer.
+
+[para] This is true even if the external structure is not reference counted by itself.
+
+[para] To reference count a structure [type S] without such simply wrap [type S] into a
+local structure which provides the reference count and has a field for [type S] (pointer
+or value).
+
+[enum] [emph Attention] Opaque external types, i.e. pointers to structures with hidden
+fields, can also be handled by the given templates.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/first.inc b/src/vfs/critcl.vfs/doc/include/use/first.inc
new file mode 100644
index 00000000..12acf955
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/first.inc
@@ -0,0 +1,82 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+To create a minimal working package
+
+[list_begin enumerated]
+
+[enum] Choose a directory to develop in and make it the working directory. This should
+not be a checkout of [vset critcl] itself.
+
+[enum] Save the following example to a file. In the following it is assumed that the file
+was named [file example.tcl].
+
+[example_begin]
+[include first_pkg.inc]
+[example_end]
+
+[enum] Invoke the command [example { critcl -keep -debug all -pkg example.tcl }]
+
+[para] This compiles the example and installs it into a [file lib/] sub directory of the
+working directory, generating output similar to
+
+[example {
+    Config:   linux-x86_64-gcc
+    Build:    linux-x86_64-gcc
+    Target:   linux-x86_64
+    Source:   example.tcl  (provide critcl-example 1) Building ...
+    Library:  example.so
+     (tclStubsPtr     =>  const TclStubs *tclStubsPtr;)
+     (tclPlatStubsPtr =>  const TclPlatStubs *tclPlatStubsPtr;)
+    Package:  lib/example
+    Files left in /home/aku/.critcl/pkg2567272.1644845439   
+}]
+
+during operation.
+
+[para] The [option -keep] option suppressed the cleanup of the generated C files, object
+files, compiler log, etc. normally done at the end of building.
+
+[example {
+% ls -l /home/aku/.critcl/pkg2567272.1644845439
+total 36
+-rw-r--r-- 1 aku aku  1260 Feb 14 18:30 v3118_00000000000000000000000000000004.c
+-rw-r--r-- 1 aku aku  2096 Feb 14 18:30 v3118_00000000000000000000000000000004_pic.o
+-rw-r--r-- 1 aku aku  1728 Feb 14 18:30 v3118_00000000000000000000000000000009.c
+-rw-r--r-- 1 aku aku  2448 Feb 14 18:30 v3118_00000000000000000000000000000009_pic.o
+-rwxr-xr-x 1 aku aku 14424 Feb 14 18:30 v3118_00000000000000000000000000000009.so
+-rw-r--r-- 1 aku aku  1725 Feb 14 18:30 v3118.log
+}]
+
+This enables inspection of the generated C code.
+
+Simply drop the option from the command if that is not desired.
+
+[para] The option [option -debug], with argument [const all] activated Tcl's memory
+debugging and caused the generation of the symbol tables needed by [syscmd gdb] or any
+other debugger. The alternate arguments [const memory] and [const symbols] activate just
+one of the these.
+
+[enum] Now invoke an interactive [syscmd tclsh] and enter the commands:
+[list_begin itemized]
+[item] [emph {lappend auto_path lib}]
+[item] [emph {package require critcl-example}]
+[item] [emph {info loaded}]
+[item] [emph hello]
+[item] [emph exit]
+[list_end]
+
+I.e. extend [syscmd tclsh]'s package search path to include the location of the new
+package, load the package, verify that the associated shared library is present, invoke
+the package command, and stop the session.
+
+[para] When the package command is invoked the terminal will show [const {hello world}],
+followed by the prompt.
+
+[list_end]
+
+[para] Commands: [term critcl::compiling], [term critcl::cproc],
+[term critcl::description], [term critcl::license], [term critcl::load],
+[term critcl::msg], [term critcl::subject], [term critcl::summary], [term critcl::tcl].
+
+[para] Make a copy of [file example.tcl] before going through the sub-sections. Keep it as
+a save point to return to from the editing done in the sub-section.
diff --git a/src/vfs/critcl.vfs/doc/include/use/first_pkg.inc b/src/vfs/critcl.vfs/doc/include/use/first_pkg.inc
new file mode 100644
index 00000000..0e02188c
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/first_pkg.inc
@@ -0,0 +1,48 @@
+# -*- tcl -*-
+# Critcl support, absolutely necessary.
+package require critcl
+
+# Bail out early if the compile environment is not suitable.
+if {![lb]critcl::compiling[rb]} {
+    error "Unable to build project, no proper compiler found."
+}
+
+# Information for the teapot.txt meta data file put into a generated package.
+# Free form strings.
+critcl::license {Andreas Kupries} {Under a BSD license}
+
+critcl::summary {The first CriTcl-based package}
+
+critcl::description {
+    This package is the first example of a CriTcl-based package. It contains all the
+    necessary and conventionally useful pieces.
+}
+
+critcl::subject example {critcl package}
+critcl::subject {basic critcl}
+
+# Minimal Tcl version the package should load into.
+critcl::tcl 8.6
+
+# Use to activate Tcl memory debugging
+#critcl::debug memory
+# Use to activate building and linking with symbols (for gdb, etc.)
+#critcl::debug symbols
+
+# ## #### ######### ################ #########################
+## A hello world, directly printed to stdout. Bypasses Tcl's channel system.
+
+critcl::cproc hello {} void {
+    printf("hello world\n");
+}
+
+# ## #### ######### ################ #########################
+
+# Forcing compilation, link, and loading now.
+critcl::msg -nonewline { Building ...}
+if {![lb]critcl::load[rb]} {
+    error "Building and loading the project failed."
+}
+
+# Name and version the package. Just like for every kind of Tcl package.
+package provide critcl-example 1
diff --git a/src/vfs/critcl.vfs/doc/include/use/first_pkg.tcl b/src/vfs/critcl.vfs/doc/include/use/first_pkg.tcl
new file mode 100644
index 00000000..49dc6546
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/first_pkg.tcl
@@ -0,0 +1,43 @@
+# -*- tcl -*-
+# Critcl support, absolutely necessary.
+package require critcl
+
+# Bail out early if the compile environment is not suitable.
+if {![critcl::compiling]} {
+    error "Unable to build project, no proper compiler found."
+}
+
+# Information for the teapot.txt meta data file put into a generated package.
+# Free form strings.
+critcl::license {Andreas Kupries} {Under a BSD license}
+
+critcl::summary {The first CriTcl-based package}
+
+critcl::description {
+    This package is the first example of a CriTcl-based package. It contains all the
+    necessary and conventionally useful pieces.
+}
+
+critcl::subject example {critcl package}
+critcl::subject {basic critcl}
+
+# Minimal Tcl version the package should load into.
+critcl::tcl 8.6
+
+# ## #### ######### ################ #########################
+## A hello world, directly printed to stdout. Bypasses Tcl's channel system.
+
+critcl::cproc hello {} void {
+    printf("hello world\n");
+}
+
+# ## #### ######### ################ #########################
+
+# Forcing compilation, link, and loading now.
+critcl::msg -nonewline { Building ...}
+if {![critcl::load]} {
+    error "Building and loading the project failed."
+}
+
+# Name and version the package. Just like for every kind of Tcl package.
+package provide critcl-example 1
diff --git a/src/vfs/critcl.vfs/doc/include/use/flags.inc b/src/vfs/critcl.vfs/doc/include/use/flags.inc
new file mode 100644
index 00000000..f7a35599
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/flags.inc
@@ -0,0 +1,27 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] See and reread the [sectref {Using External Libraries} {basic wrapper package}] for
+the introduction of the commands referenced below.
+
+[enum] Use the command [cmd critcl::cflags] to provide additional, non-standard flags to
+the compiler.
+
+[para][example {
+    critcl::cflags -DBYTE_ORDER=bigendian
+}]
+
+[enum] Use the command [cmd critcl::ldflags] to provide additional, non-standard flags to
+the linker.
+
+[para][example {
+    critcl::ldflags -
+}]
+
+[enum] Not answered in the above is how to determine such flags if they are not fixed
+across machines or platforms.
+
+[para] This is addressed by the next section.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/interp.inc b/src/vfs/critcl.vfs/doc/include/use/interp.inc
new file mode 100644
index 00000000..ef9098b9
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/interp.inc
@@ -0,0 +1,30 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Reread the example in the [sectref {Errors And Messages} previous] section.
+
+[enum] Note the type [type Tcl_Interp*] used for the first argument.
+
+[enum] This type is special.
+
+[enum] An argument of this type has to be the first argument of a function.
+
+[enum] Using it tells [vset critcl] that the function needs access to the Tcl interpreter
+calling it. It then arranges for that to happen in the generated C code.
+
+[para] Using functions from Tcl's public C API taking an interpreter argument in the
+function body is a situation where this is needed.
+
+[enum] [emph {This special argument is not visible at the script level}].
+
+[enum] [emph {This special argument is not an argument of the Tcl command for the function}].
+
+[enum] In our example the [cmd sqrt] command is called with a single argument.
+
+[enum] The name of the argument can be freely chosen. It is the type which is important
+and triggers the special behaviour.
+
+My prefered names are [var ip] and [var interp].
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/locations.inc b/src/vfs/critcl.vfs/doc/include/use/locations.inc
new file mode 100644
index 00000000..edaa5b63
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/locations.inc
@@ -0,0 +1,61 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] See and reread the [sectref {Using External Libraries} {basic wrapper package}] for
+the introduction of the commands referenced below.
+
+[enum] [emph Attention] Relative paths will be resolved relative to the location of the
+[file .tcl] file containing the [vset critcl] commands.
+
+[enum] Use the command [cmd critcl::cheaders] to tell [vset critcl] about non-standard
+locations for header files.
+
+[para] Multiple arguments are allowed, and multiple calls as well. The information
+accumulates.
+
+[para] Arguments of the form [file -Idirectory] register the directory directly.
+
+[para] For arguments of the form [file path] the directory holding the path is
+registered. In other words, it is assumed to be the full path of a header [emph file], and
+not a directory.
+
+[para][example {
+    critcl::cheaders -I/usr/local/include
+    critcl::cheaders local/types.h
+    critcl::cheaders other-support/*.h
+}]
+
+[enum] Use the command [cmd critcl::include] to actually use a specific header file.
+
+[enum] Use the command [cmd critcl::clibraries] to tell [vset critcl] about non-standard
+locations for shared libaries, and about shared libaries to link to
+
+[para] Multiple arguments are allowed, and multiple calls as well. The information
+accumulates.
+
+[para] Arguments of the form [file -Ldirectory] register a directory.
+
+[para] Arguments of the form [file -lname] register a shared libary to link to by
+name. The library will be looked for in both standard and registered directories.
+
+[para] Arguments of the form [file -path] register a shared libary to link to by full
+path.
+
+[para][example {
+    critcl::clibraries -L/usr/lib/x86_64-linux-gnu
+    critcl::clibraries -lzstd
+    critcl::clibraries /usr/lib/x86_64-linux-gnu/libzstd.so
+}]
+
+[enum] On Mac OS X use the command [cmd critcl::framework] to name the frameworks to use
+in the package.
+
+[para] [emph Attention] Using the command on other platforms is ok, and will be ignored.
+
+[enum] Not answered in the above is how to find the necessary paths if they are not fixed
+across machines or platforms.
+
+[para] We will come back to this.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/meta.inc b/src/vfs/critcl.vfs/doc/include/use/meta.inc
new file mode 100644
index 00000000..bf319929
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/meta.inc
@@ -0,0 +1,34 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] See and reread the [sectref Basics {basic package}] for the introduction of the
+commands referenced below.
+
+[enum] Use the command [cmd critcl::license] to set the package license.
+
+[para] Use the same command to set the package author.
+
+[para] Both arguments are free form text.
+
+[enum] Use the command [cmd critcl::summary] to set a short package description.
+
+[enum] Use the command [cmd critcl::description] to set a longer package description.
+
+[para] The arguments of both commands are free form text.
+
+[enum] Use the command [cmd critcl::subject] to set one or more keywords.
+
+[para] [emph Attention] Contrary to the other commands the arguments accumulate.
+
+[enum] All the commands are optional.
+
+[enum] Their information is not placed into the generated C code.
+
+[enum] In [term {package mode}] the information is placed into the file [file teapot.txt]
+of the generated package.
+
+[enum] This file serves as integration point for [term Teapot], the package system of
+[term ActiveTcl].
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/objtype_large.inc b/src/vfs/critcl.vfs/doc/include/use/objtype_large.inc
new file mode 100644
index 00000000..332c71e2
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/objtype_large.inc
@@ -0,0 +1,196 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Starting from the end of the previous section.
+
+[enum] Edit the file [file example.tcl].
+
+[enum] Describing each individual change is too complex. The following is easier.
+
+[enum] Save the file, then replace the entire functionality with the following.
+
+[enum] After that use a [syscmd diff] of your choice to compare the files and see the
+critical changes.
+
+[example {
+    critcl::ccode {
+	typedef struct vec2 {
+	    unsigned int rc;
+	    double x;
+	    double y;
+	} vec2;
+
+	typedef vec2* vec2ptr;
+
+	/* -- Core vector structure management -- */
+
+	static vec2ptr Vec2New (double x, double y) {
+	    vec2ptr vec = Tcl_Alloc (sizeof (vec2));
+	    vec->rc = 0;
+	    vec->x = x;
+	    vec->y = y;
+	    return vec;
+	}
+
+	static vec2ptr Vec2Copy (vec2ptr src) {
+	    scr->rc ++;
+	    return src;
+	}
+
+	static void Vec2Release (vec2ptr vec) {
+	    if (vec->rc > 1) {
+		vec->rc --;
+		return;
+	    }
+	    
+	    Tcl_Free ((char*) vec);
+	}
+
+	/* -- Vector obj type -- */
+
+	static void Vec2Free     (Tcl_Obj* obj);
+	static void Vec2StringOf (Tcl_Obj* obj);
+	static void Vec2Dup      (Tcl_Obj* obj, Tcl_Obj* dst);
+	static int  Vec2FromAny  (Tcl_Interp* interp, Tcl_Obj* obj);
+
+	Tcl_ObjType vec2_objtype = {
+	    "vec2",
+	    Vec2Free,
+	    Vec2Dup,
+	    Vec2StringOf,
+	    Vec2FromAny
+	};
+
+	static void Vec2Free (Tcl_Obj* obj) {
+	    Vec2Release ((vec2ptr) obj->internalRep.otherValuePtr);
+	}
+
+	static void Vec2Dup (Tcl_Obj* obj, Tcl_Obj* dst) {
+	    vec2ptr vec = (vec2ptr) obj->internalRep.otherValuePtr;
+
+	    dst->internalRep.otherValuePtr = Vec2Copy (vec);
+	    dst->typePtr                   = &vec2_objtype;
+	}
+
+	static void Vec2StringOf (Tcl_Obj* obj) {
+	    vec2ptr vec = (vec2ptr) obj->internalRep.otherValuePtr;
+
+	    /* Serialize vector data to string (list of two doubles) */
+	    Tcl_DString      ds;
+	    Tcl_DStringInit (&ds);
+
+	    char buf [TCL_DOUBLE_SPACE];
+
+	    Tcl_PrintDouble (0, vec->x, buf); Tcl_DStringAppendElement (&ds, buf);
+	    Tcl_PrintDouble (0, vec->y, buf); Tcl_DStringAppendElement (&ds, buf);
+
+	    int length = Tcl_DStringLength (ds);
+
+	    /* Set string representation */
+	    obj->length = length;
+	    obj->bytes  = Tcl_Alloc(length+1);
+	    memcpy (obj->bytes, Tcl_DStringValue (ds), length);
+	    obj->bytes[length] = '\0';
+	    /*
+	    ** : package require critcl::cutil ;# get C utilities
+	    ** : critcl::cutil::alloc          ;# Activate allocation utilities
+	    ** : (Internally cheaders, include)
+	    ** : Then all of the above can be written as STREP_DS (obj, ds);
+	    ** : STREP_DS = STRing REP from DString
+	    */
+
+	    Tcl_DStringFree (&ds);
+	}
+
+	static int Vec2FromAny (Tcl_Interp* interp, Tcl_Obj* obj) {
+	    /* Change internal rep of obj to vector structure.
+	    ** A Tcl list of 2 doubles is used as intermediary int rep.
+	    */
+
+	    int len;
+	    if (Tcl_ListObjLength (interp, obj, &len) != TCL_OK) return TCL_ERROR;
+	    if (len != 2) {
+		Tcl_SetObjResult (interp, Tcl_ObjPrintf ("Expected 2 elements, got %d", len));
+		return TCL_ERROR;
+	    }
+
+	    Tcl_Obj* lv[2];
+	    if (Tcl_ListObjGetElements (interp, obj, &lv) != TCL_OK) return TCL_ERROR;
+
+	    double x, y;
+	    if (Tcl_GetDoubleFromObj (interp, lv[0], &x) != TCL_OK) return TCL_ERROR;
+	    if (Tcl_GetDoubleFromObj (interp, lv[1], &y) != TCL_OK) return TCL_ERROR;
+
+	    obj->internalRep.otherValuePtr = (void*) Vec2New (x, y);
+	    obj->typePtr                   = &vec2_objtype;
+
+	    return TCL_OK;
+	}
+
+	/* (un)packing structures from/into Tcl values -- */
+
+	int GetVecFromObj (Tcl_Interp* interp, Tcl_Obj* obj, vec2ptr* vec)
+	{
+	    if (obj->typePtr != &vec2_objtype) {
+		if (VecFromAny (interp, obj) != TCL_OK) return TCL_ERROR;
+	    }
+
+	    *vec = (vec2ptr) obj->internalRep.otherValuePtr;
+	    return TCL_OK;
+	}
+
+	Tcl_Obj* NewVecObj (vec2ptr vec) {
+	    Tcl_Obj* obj = Tcl_NewObj ();
+
+	    Tcl_InvalidateStringRep (obj);
+
+	    obj->internalRep.otherValuePtr = Vec2Copy (vec);
+	    obj->typePtr                   = &vec2_objtype;
+
+	    return obj;
+	}
+    }
+
+    critcl::argtype vec2 {
+	if (GetVecFromObj (interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    } vec2ptr vec2ptr
+
+    critcl::resulttype vec2 {
+	/* rv: result value of function, interp: current Tcl interpreter */
+	Tcl_SetObjResult (interp, NewVecObj (rv));
+	return TCL_OK;
+    } vec2ptr
+
+    critcl::cproc norm {vec2 vector} double {
+	double norm = hypot (vector->x, vector->y);
+	return norm;
+    }
+
+    critcl::cproc add {vec2 a vec2 b} vec2 {
+	return Vec2New (a->x + b->x, a->y + b->y);
+    }
+}]
+
+[enum] The [type vec2] structure is now reference counted.
+
+[enum] The core management functions, i.e. [fun Vec2New], [fun Vec2Copy], and
+[fun Vec2Release] are changed to maintain that reference count.
+
+Starting at [const 0] on creation, copies increment, and releases decrement.
+
+A structure is actually only freed when its reference count falls to [const 0] or below.
+
+[enum] [type vec2] results are changed to pointers, easily passed back through the stack.
+
+The modified translation layer just wraps it into a [type Tcl_Obj*] value.
+
+[enum] [emph Attention]. Duplicating such a [type Tcl_Obj*] does not duplicate the
+referenced [type vec2] structure anymore, just adds a reference.
+
+[enum] Regarding [syscmd diff] commands, I know of two graphical diffs for Tcl/Tk,
+[vset tkdiff], and [vset eskil].
+
+[list_end]
+
+[para] Packages: [term critcl::cutil]
diff --git a/src/vfs/critcl.vfs/doc/include/use/objtype_structure.inc b/src/vfs/critcl.vfs/doc/include/use/objtype_structure.inc
new file mode 100644
index 00000000..6e6c29c8
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/objtype_structure.inc
@@ -0,0 +1,198 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Starting from the end of the previous section.
+
+[enum] Edit the file [file example.tcl].
+
+[enum] Remove the entire functionality (type definitions, related C code, and cprocs).
+
+Replace it with [example {
+    critcl::ccode {
+	typedef struct vec2 {
+	    double x;
+	    double y;
+	} vec2;
+
+	typedef vec2* vec2ptr;
+
+	/* -- Core vector structure management -- */
+
+	static vec2ptr Vec2New (double x, double y) {
+	    vec2ptr vec = Tcl_Alloc (sizeof (vec2));
+	    vec->x = x;
+	    vec->y = y;
+	    return vec;
+	}
+
+	static vec2ptr Vec2Copy (vec2ptr src) {
+	    vec2ptr vec = Tcl_Alloc (sizeof (vec2));
+	    *vec = *src
+	    return vec;
+	}
+
+	static void Vec2Release (vec2ptr vec) {
+	    Tcl_Free ((char*) vec);
+	}
+
+	/* -- Tcl value type for vec2 -- Tcl_ObjType -- */
+
+	static void Vec2Free     (Tcl_Obj* obj);
+	static void Vec2StringOf (Tcl_Obj* obj);
+	static void Vec2Dup      (Tcl_Obj* obj, Tcl_Obj* dst);
+	static int  Vec2FromAny  (Tcl_Interp* interp, Tcl_Obj* obj);
+
+	Tcl_ObjType vec2_objtype = {
+	    "vec2",
+	    Vec2Free,
+	    Vec2Dup,
+	    Vec2StringOf,
+	    Vec2FromAny
+	};
+
+	static void Vec2Free (Tcl_Obj* obj) {
+	    Vec2Release ((vec2ptr) obj->internalRep.otherValuePtr);
+	}
+
+	static void Vec2Dup (Tcl_Obj* obj, Tcl_Obj* dst) {
+	    vec2ptr vec = (vec2ptr) obj->internalRep.otherValuePtr;
+
+	    dst->internalRep.otherValuePtr = Vec2Copy (vec);
+	    dst->typePtr                   = &vec2_objtype;
+	}
+
+	static void Vec2StringOf (Tcl_Obj* obj) {
+	    vec2ptr vec = (vec2ptr) obj->internalRep.otherValuePtr;
+
+	    /* Serialize vector data to string (list of two doubles) */
+	    Tcl_DString      ds;
+	    Tcl_DStringInit (&ds);
+
+	    char buf [TCL_DOUBLE_SPACE];
+
+	    Tcl_PrintDouble (0, vec->x, buf); Tcl_DStringAppendElement (&ds, buf);
+	    Tcl_PrintDouble (0, vec->y, buf); Tcl_DStringAppendElement (&ds, buf);
+
+	    int length = Tcl_DStringLength (ds);
+
+	    /* Set string representation */
+	    obj->length = length;
+	    obj->bytes  = Tcl_Alloc(length+1);
+	    memcpy (obj->bytes, Tcl_DStringValue (ds), length);
+	    obj->bytes[length] = '\0';
+	    /*
+	    ** : package require critcl::cutil ;# get C utilities
+	    ** : critcl::cutil::alloc          ;# Activate allocation utilities
+	    ** : (Internally cheaders, include)
+	    ** : Then all of the above can be written as STREP_DS (obj, ds);
+	    ** : STREP_DS = STRing REP from DString
+	    */
+
+	    Tcl_DStringFree (&ds);
+	}
+
+	static int Vec2FromAny (Tcl_Interp* interp, Tcl_Obj* obj) {
+	    /* Change intrep of obj to vec2 structure.
+	    ** A Tcl list of 2 doubles is used as an intermediary intrep.
+	    */
+
+	    int len;
+	    if (Tcl_ListObjLength (interp, obj, &len) != TCL_OK) return TCL_ERROR;
+	    if (len != 2) {
+		Tcl_SetObjResult (interp, Tcl_ObjPrintf ("Expected 2 elements, got %d", len));
+		return TCL_ERROR;
+	    }
+
+	    Tcl_Obj* lv[2];
+	    if (Tcl_ListObjGetElements (interp, obj, &lv) != TCL_OK) return TCL_ERROR;
+
+	    double x, y;
+	    if (Tcl_GetDoubleFromObj (interp, lv[0], &x) != TCL_OK) return TCL_ERROR;
+	    if (Tcl_GetDoubleFromObj (interp, lv[1], &y) != TCL_OK) return TCL_ERROR;
+
+	    obj->internalRep.otherValuePtr = (void*) Vec2New (x, y);
+	    obj->typePtr                   = &vec2_objtype;
+
+	    return TCL_OK;
+	}
+
+	/* -- (un)packing structures from/into Tcl values -- */
+
+	int GetVecFromObj (Tcl_Interp* interp, Tcl_Obj* obj, vec2ptr* vec)
+	{
+	    if (obj->typePtr != &vec2_objtype) {
+		if (Vec2FromAny (interp, obj) != TCL_OK) return TCL_ERROR;
+	    }
+
+	    *vec = (vec2ptr) obj->internalRep.otherValuePtr;
+	    return TCL_OK;
+	}
+
+	Tcl_Obj* NewVecObj (vec2ptr vec) {
+	    Tcl_Obj* obj = Tcl_NewObj ();
+
+	    Tcl_InvalidateStringRep (obj);
+
+	    obj->internalRep.otherValuePtr = Vec2Copy (vec);
+	    obj->typePtr                   = &vec2_objtype;
+
+	    return obj;
+	}
+    }
+
+    critcl::argtype vec2 {
+	if (GetVecFromObj (interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    } vec2ptr vec2ptr
+
+    critcl::resulttype vec2 {
+	/* rv: result value of function, interp: current Tcl interpreter */
+	Tcl_SetObjResult (interp, NewVecObj (&rv));
+	return TCL_OK;
+    } vec2
+
+    critcl::cproc norm {vec2 vector} double {
+	double norm = hypot (vector->x, vector->y);
+	return norm;
+    }
+
+    critcl::cproc add {vec2 a vec2 b} vec2 {
+	vec2 z;
+
+	z.x = a->x + b->x;
+	z.y = a->y + b->y;
+
+	return z;
+    }
+}][vset rebuild]
+
+[enum] This implements a new [type Tcl_ObjType] to handle [type vec2] structures. With it
+[type vec2] structures are become usable as internal representation ([term intrep] of
+[type Tcl_Obj*] values.
+
+[para] The two functions [fun NewVecObj] and [fun GetVecFromObj] pack and unpack the
+structures from and into [type Tcl_Obj*] values.
+
+The latter performs the complex deserialization into a structure if and only if needed,
+i.e. when the [type TclObj*] value has no intrep, or the intrep for a different type.
+
+This process of changing the intrep of a Tcl value is called [term shimmering].
+
+[para] Intreps cache the interpretation of [type Tcl_Obj*] values as a specific kind of
+type. Here [type vec2]. This reduces conversion effort and memory churn, as intreps are
+kept by the Tcl interpreter as long as possible and needed.
+
+[enum] The arguments of [cmd norm] and [cmd add] are now converted once on entry, if not
+yet in the proper type, or not at all, if so.
+
+[enum] [emph Attention]. This example has the issue of passing result structures by value
+through the stack, and then packing a copy into a [type Tcl_Obj*] value.
+
+While this is no trouble for structures as small as [type vec2] larger structures may pose
+a problem.
+
+[para] We will address this in the next section.
+
+[list_end]
+
+[para] Packages: [term critcl::cutil]
diff --git a/src/vfs/critcl.vfs/doc/include/use/results.inc b/src/vfs/critcl.vfs/doc/include/use/results.inc
new file mode 100644
index 00000000..5b7288ba
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/results.inc
@@ -0,0 +1,30 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+A function taking neither arguments nor returning results is not very useful.
+
+[list_begin enumerated]
+
+[enum] We are now extending the command to return a result.
+
+[enum][vset base][example {
+    critcl::cproc twice {double x} double {
+	return 2*x;
+    }
+}][vset rebuild]
+
+[enum] Note that the name of the command changed. Goodbye [cmd hello], hello [cmd twice].
+
+[enum] Invoke [example { twice 4 }] and the [syscmd tclsh] will print the result [const 8]
+in the terminal.
+
+[list_end]
+
+[para] An important limitation of the commands implemented so far is that they cannot
+fail. The types used so far ([type void], [type double]) and related scalar types can
+return only a value of the specified type, and nothing else. They have no ability to
+signal an error to the Tcl script.
+
+[para] We will come back to this after knowing a bit more about the more complex argument
+and result types.
+
+[para] Of interest to the eager reader: [term {CriTcl cproc Type Reference}]
diff --git a/src/vfs/critcl.vfs/doc/include/use/results_const_binary.inc b/src/vfs/critcl.vfs/doc/include/use/results_const_binary.inc
new file mode 100644
index 00000000..4e07b2c4
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/results_const_binary.inc
@@ -0,0 +1,18 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Use the command [cmd critcl::cdata] to create a command taking no arguments and
+returning a constant ByteArray value.
+
+[para] [example {
+    # P5 3 3 255 \n ...
+    critcl::cdata cross3x3pgm {
+	80 52 32 51 32 51 32 50 53 53 10
+	0   255 0
+	255 255 255
+	0   255 0
+    }
+}]
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/results_obj.inc b/src/vfs/critcl.vfs/doc/include/use/results_obj.inc
new file mode 100644
index 00000000..6cff7c77
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/results_obj.inc
@@ -0,0 +1,63 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+When the set of predefined result types is not enough the oldest way of handling the
+situation is falling back to the structures used by Tcl to manage values, i.e.
+[type Tcl_Obj*].
+
+[para] Two builtin types are provided for this, to handle different reference counting
+requirements.
+
+[list_begin enumerated]
+
+[enum][vset base][example {
+    critcl::cproc twice {double x} object0 {
+	return Tcl_NewDoubleObj(2*x);
+    }
+}][vset rebuild]
+
+[enum] With [type object0] the translation layer assumes that the returned [type Tcl_Obj*]
+value has a reference count of [const 0]. I.e. a value which is unowned and unshared.
+
+[para] This value is passed directly to Tcl for its use, without any changes. Tcl
+increments the reference count and thus takes ownership. The value is still unshared.
+
+[para] It would be extremely detrimental if the translation layer had decremented the
+reference count before passing the value. This action would release the memory and then
+leave Tcl with a dangling pointer and the associated memory corruption bug to come.
+
+[enum] The situation changes when the C code returns a [type Tcl_Obj*] value with a
+reference count greater than [const 0]. I.e. at least owned (by the C code), and possibly
+even shared.
+
+There are some object constructors and/or mutators in the public Tcl API which do that,
+although I do not recall their names. The example below simulates this situation by
+explicitly incrementing the reference count before returning the value.
+
+[enum] In this case use the type [type object] (without the trailing [const 0]).
+
+[enum] Edit the file [file example.tcl] and replace the definition of [cmd twice] with
+
+[example {
+    critcl::cproc twice {double x} object {
+	Tcl_Obj* result = Tcl_NewDoubleObj(2*x);
+	Tcl_IncrRefCount (result);
+	return result;
+    }
+}][vset rebuild]
+
+[enum] After handing the value to Tcl, with the associated incremented reference count,
+the translation layer decrements the reference count, invalidating the C code's ownership
+and leaving the final reference count the same.
+
+[para] Note, the order matters. If the value has only one reference then decrementing it
+before Tcl increments it would again release the value, and again leave Tcl with a
+dangling pointer.
+
+[para] Also, not decrementing the reference count at all causes the inverse problem to the
+memory corruption issues of before, memory leaks.
+
+[enum] [strong Note] that both types transfer ownership of the value. Their difference is
+just in the reference count of the value coming out of the function, and the (non-)actions
+having to be (not) taken to effect said transfer without causing memory issues.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/results_str.inc b/src/vfs/critcl.vfs/doc/include/use/results_str.inc
new file mode 100644
index 00000000..2d841e5e
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/results_str.inc
@@ -0,0 +1,53 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+Tcl prides itself on the fact that [term {Everything Is A String}].
+
+So how are string values returned from C functions ?
+
+[list_begin enumerated]
+
+[enum] We are now giving the command a string result.
+
+[enum][vset base][example {
+    critcl::cproc twice {double x} char* {
+	char buf [lb]40[rb];
+	sprintf(buf, "%f", 2*x);
+	return buf;
+    }
+}][vset rebuild]
+
+[enum] Note that the name of the command changed. Goodbye [cmd hello], hello [cmd twice].
+
+[enum] Invoke [example { twice 4 }] and the [syscmd tclsh] will print the result [const 8]
+in the terminal.
+
+[enum] [emph Attention]. To the translation layer the string pointer is owned by the C
+code. A copy is made to become the result seen by Tcl.
+
+[para] While the C code is certainly allowed to allocate the string on the heap if it so
+wishes, this comes with the responsibility to free the string as well. Abrogation of that
+responsibility will cause memory leaks.
+
+[para] The type [type char*] is recommended to be used with static string buffers, string
+constants and the like.
+
+[enum] Conversely, to return heap-allocated strings it is recommended to use the type
+[type string] instead.
+
+[para] Replace the definition of [cmd twice] with
+
+[example_begin]
+critcl::cproc twice {double x} string {
+    char* buf = Tcl_Alloc (40);
+    sprintf(buf, "%f", 2*x);
+    return buf;
+}
+[example_end]
+
+[para] Now the translation layer takes ownership of the string from the C code and
+transfers that ownership to the Tcl interpreter. This means that the string will be
+released when the Tcl interpreter is done with it. The C code has no say in the lifecycle
+of the string any longer, and having the C code releasing the string [strong will] cause
+issues. Dangling pointers and associated memory corruption and crashes.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/results_structure.inc b/src/vfs/critcl.vfs/doc/include/use/results_structure.inc
new file mode 100644
index 00000000..73d7de52
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/results_structure.inc
@@ -0,0 +1,48 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] Starting from the end of the [sectref {Structure Arguments} previous] section.
+
+[enum] Edit the file [file example.tcl] and add the following code, just after the
+definition of the [cmd norm] command.
+
+[example {
+    critcl::resulttype vec2 {
+	/* rv: result value of function, interp: current Tcl interpreter */
+	if (rv == NULL) return TCL_ERROR;
+	Tcl_Obj* lv[2];
+	lv[0] = Tcl_NewDoubleObj (rv->x);
+	lv[1] = Tcl_NewDoubleObj (rv->y);
+	Tcl_SetObjResult (interp, Tcl_NewListObj (2, lv));
+	Tcl_Free (rv);
+	return TCL_OK;
+    } vec2ptr ;# C result type
+
+    critcl::cproc add {vec2 a vec2 b} vec2 {
+	vec2ptr z = Tcl_Alloc (sizeof (vec2));
+
+	z->x = a->x + b->x;
+	z->y = a->y + b->y;
+
+	return z;
+    }
+}][vset rebuild]
+
+[enum] The new command [cmd add] takes two vectors and return the element-wise sum of both
+as a new vector.
+
+[enum] The function allocates and initializes a structure and hands it over to the
+translation layer. Which in turn constructs a Tcl list of 2 doubles from it, sets that as
+the command's result and at last discards the allocated structure again.
+
+[enum] While working this code has two disadvantages.
+
+First there is memory churn. Each call of [cmd add] causes the creation and release of
+three temporary [type vec2] structures. One per argument, and one for the result.
+
+Second is the need to always construct a complex [type Tcl_Obj*] value from the structure.
+
+[para] Both can be done better. This is explained in the next section.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/runtime.inc b/src/vfs/critcl.vfs/doc/include/use/runtime.inc
new file mode 100644
index 00000000..192e6fcd
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/runtime.inc
@@ -0,0 +1,18 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum] See and reread the [sectref Basics {basic package}] for the introduction of the
+commands referenced below.
+
+[enum] Use the command [cmd critcl::tcl] to tell [vset critcl] the minimal version of Tcl
+the package is to be used with.
+
+[para] This determines which Tcl headers all files are compiled against, and what version
+of the public Tcl API is available to the C code.
+
+[para] Currently [const 8.4], [const 8.5] and [const 8.6] are supported.
+
+[para] If not specified [const 8.4] is assumed.
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/use/second.inc b/src/vfs/critcl.vfs/doc/include/use/second.inc
new file mode 100644
index 00000000..bff34e48
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/second.inc
@@ -0,0 +1,35 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+To create a minimal package wrapping an external library
+
+[list_begin enumerated]
+
+[enum] Choose a directory to develop in and make it the working directory.
+
+This should not be a checkout of [vset critcl] itself.
+
+[enum] Save the following example to a file. In the following it is assumed that the file
+was named [file example.tcl].
+
+[example_begin]
+[include second_pkg.inc]
+[example_end]
+
+[enum] Build the package. See the [sectref {The First Package - Basics} Basics], if necessary.
+
+[enum] Load the package and invoke the commands.
+
+[para] [emph Attention]. The commands take and return binary data.
+
+This may look very bad in the terminal.
+
+[enum] To test the commands enter
+[example {
+    set a [compress {hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhello wwwwwwwworld}]
+
+    decompress $a
+}] in the interactive [syscmd tclsh]
+
+[list_end]
+
+[para] New commands: [term critcl::cheaders], [term critcl::clibraries], [term critcl::include].
diff --git a/src/vfs/critcl.vfs/doc/include/use/second_pkg.inc b/src/vfs/critcl.vfs/doc/include/use/second_pkg.inc
new file mode 100644
index 00000000..2cf2cdc9
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/second_pkg.inc
@@ -0,0 +1,127 @@
+# -*- tcl -*-
+# Critcl support, absolutely necessary.
+package require critcl
+
+# Bail out early if the compile environment is not suitable.
+if {![lb]critcl::compiling[rb]} {
+    error "Unable to build project, no proper compiler found."
+}
+
+# Information for the teapot.txt meta data file put into a generated package.
+# Free form strings.
+critcl::license {Andreas Kupries} {Under a BSD license}
+
+critcl::summary {The second CriTcl-based package}
+
+critcl::description {
+    This package is the second example of a CriTcl-based package. It contains all the
+    necessary and conventionally useful pieces for wrapping an external library.
+}
+
+critcl::subject {external library usage} example {critcl package}
+critcl::subject {wrapping external library}
+
+# Minimal Tcl version the package should load into.
+critcl::tcl 8.6
+
+# Locations for headers and shared library of the library to wrap.
+# Required only for non-standard locations, i.e. where CC is not searching by default.
+critcl::cheaders   -I/usr/include
+critcl::clibraries -L/usr/lib/x86_64-linux-gnu
+critcl::clibraries -lzstd
+
+# Import library API, i.e. headers.
+critcl::include zstd.h
+
+# ## #### ######### ################ #########################
+## (De)compression using Zstd
+## Data to (de)compress is passed in and returned as Tcl byte arrays.
+
+critcl::cproc compress {
+    Tcl_Interp* ip
+    bytes       data
+    int         {level ZSTD_CLEVEL_DEFAULT}
+} object0 {
+    /* critcl_bytes data; (.s, .len, .o) */
+    Tcl_Obj* error_message;
+
+    int max = ZSTD_maxCLevel();
+    if ((level < 1) || (level > max)) {
+	error_message = Tcl_ObjPrintf ("level must be integer between 1 and %d", max);
+	goto err;
+    }
+
+    size_t dest_sz  = ZSTD_compressBound (data.len);
+    void*  dest_buf = Tcl_Alloc(dest_sz);
+
+    if (!dest_buf) {
+	error_message = Tcl_NewStringObj ("can't allocate memory to compress data", -1);
+	goto err;
+    }
+
+    size_t compressed_size = ZSTD_compress (dest_buf, dest_sz,
+					    data.s,   data.len,
+					    level);
+    if (ZSTD_isError (compressed_size)) {
+	Tcl_Free(dest_buf);
+	error_message = Tcl_ObjPrintf ("zstd encoding error: %s",
+				       ZSTD_getErrorName (compressed_size));
+	goto err;
+    }
+
+    Tcl_Obj* compressed = Tcl_NewByteArrayObj (dest_buf, compressed_size);
+    Tcl_Free (dest_buf);
+
+    return compressed;
+  err:
+    Tcl_SetObjResult (ip, error_message);
+    return 0;
+}
+
+critcl::cproc decompress {
+    Tcl_Interp*  ip
+    bytes        data
+} object0 {
+    Tcl_Obj* error_message;
+
+    size_t dest_sz = ZSTD_getDecompressedSize (data.s, data.len);
+    if (dest_sz == 0) {
+        error_message = Tcl_NewStringObj("invalid data", -1);
+	goto err;
+    }
+
+    void* dest_buf = Tcl_Alloc (dest_sz);
+    if (!dest_buf) {
+	error_message = Tcl_NewStringObj("failed to allocate decompression buffer", -1);
+	goto err;
+    }
+
+    size_t decompressed_size = ZSTD_decompress (dest_buf, dest_sz,
+						data.s,   data.len);
+    if (decompressed_size != dest_sz) {
+	Tcl_Free (dest_buf);
+        error_message = Tcl_ObjPrintf("zstd decoding error: %s",
+				      ZSTD_getErrorName (decompressed_size));
+	goto err;
+    }
+
+    Tcl_Obj* decompressed = Tcl_NewByteArrayObj (dest_buf, dest_sz);
+    Tcl_Free (dest_buf);
+
+    return decompressed;
+
+  err:
+    Tcl_SetObjResult (ip, error_message);
+    return 0;
+}
+
+# ## #### ######### ################ #########################
+
+# Forcing compilation, link, and loading now.
+critcl::msg -nonewline { Building ...}
+if {![lb]critcl::load[rb]} {
+    error "Building and loading the project failed."
+}
+
+# Name and version the package. Just like for every kind of Tcl package.
+package provide critcl-example 1
diff --git a/src/vfs/critcl.vfs/doc/include/use/second_pkg.tcl b/src/vfs/critcl.vfs/doc/include/use/second_pkg.tcl
new file mode 100644
index 00000000..4f263886
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/second_pkg.tcl
@@ -0,0 +1,131 @@
+# -*- tcl -*-
+# Critcl support, absolutely necessary.
+package require critcl
+
+# Bail out early if the compile environment is not suitable.
+if {![critcl::compiling]} {
+    error "Unable to build project, no proper compiler found."
+}
+
+# Information for the teapot.txt meta data file put into a generated package.
+# Free form strings.
+critcl::license {Andreas Kupries} {Under a BSD license}
+
+critcl::summary {The second CriTcl-based package}
+
+critcl::description {
+    This package is the second example of a CriTcl-based package. It contains all the
+    necessary and conventionally useful pieces for wrapping an external library.
+}
+
+critcl::subject {external library usage} example {critcl package}
+critcl::subject {wrapping external library}
+
+# Minimal Tcl version the package should load into.
+critcl::tcl 8.6
+
+# Locations for headers and shared library of the library to wrap.
+# Required only for non-standard locations, i.e. where CC is not searching by default.
+critcl::cheaders   -I/usr/include
+critcl::clibraries -L/usr/lib/x86_64-linux-gnu
+critcl::clibraries -lzstd
+
+# Provide non-standard compiler and linker flags
+#critcl::cflags -Dsome_define
+#critcl::ldflags
+
+# Import library API
+critcl::include zstd.h
+
+# ## #### ######### ################ #########################
+## (De)compression using Zstd
+## Data to (de)compress is passed in and returned as Tcl byte arrays.
+
+critcl::cproc compress {
+    Tcl_Interp* ip
+    bytes       data
+    int         {level ZSTD_CLEVEL_DEFAULT}
+} object0 {
+    /* critcl_bytes data; (.s, .len, .o) */
+    Tcl_Obj* error_message;
+
+    int max = ZSTD_maxCLevel();
+    if ((level < 1) || (level > max)) {
+	error_message = Tcl_ObjPrintf ("level must be integer between 1 and %d", max);
+	goto err;
+    }
+
+    size_t dest_sz  = ZSTD_compressBound (data.len);
+    void*  dest_buf = Tcl_Alloc(dest_sz);
+
+    if (!dest_buf) {
+	error_message = Tcl_NewStringObj ("can't allocate memory to compress data", -1);
+	goto err;
+    }
+
+    size_t compressed_size = ZSTD_compress (dest_buf, dest_sz,
+					    data.s,   data.len,
+					    level);
+    if (ZSTD_isError (compressed_size)) {
+	Tcl_Free(dest_buf);
+	error_message = Tcl_ObjPrintf ("zstd encoding error: %s",
+				       ZSTD_getErrorName (compressed_size));
+	goto err;
+    }
+
+    Tcl_Obj* compressed = Tcl_NewByteArrayObj (dest_buf, compressed_size);
+    Tcl_Free (dest_buf);
+
+    return compressed;
+  err:
+    Tcl_SetObjResult (ip, error_message);
+    return 0;
+}
+
+critcl::cproc decompress {
+    Tcl_Interp*  ip
+    bytes        data
+} object0 {
+    Tcl_Obj* error_message;
+
+    size_t dest_sz = ZSTD_getDecompressedSize (data.s, data.len);
+    if (dest_sz == 0) {
+        error_message = Tcl_NewStringObj("invalid data", -1);
+	goto err;
+    }
+
+    void* dest_buf = Tcl_Alloc (dest_sz);
+    if (!dest_buf) {
+	error_message = Tcl_NewStringObj("failed to allocate decompression buffer", -1);
+	goto err;
+    }
+
+    size_t decompressed_size = ZSTD_decompress (dest_buf, dest_sz,
+						data.s,   data.len);
+    if (decompressed_size != dest_sz) {
+	Tcl_Free (dest_buf);
+        error_message = Tcl_ObjPrintf("zstd decoding error: %s",
+				      ZSTD_getErrorName (decompressed_size));
+	goto err;
+    }
+
+    Tcl_Obj* decompressed = Tcl_NewByteArrayObj (dest_buf, dest_sz);
+    Tcl_Free (dest_buf);
+
+    return decompressed;
+
+  err:
+    Tcl_SetObjResult (ip, error_message);
+    return 0;
+}
+
+# ## #### ######### ################ #########################
+
+# Forcing compilation, link, and loading now.
+critcl::msg -nonewline { Building ...}
+if {![critcl::load]} {
+    error "Building and loading the project failed."
+}
+
+# Name and version the package. Just like for every kind of Tcl package.
+package provide critcl-example 1
diff --git a/src/vfs/critcl.vfs/doc/include/use/tcl_sources.inc b/src/vfs/critcl.vfs/doc/include/use/tcl_sources.inc
new file mode 100644
index 00000000..109ef249
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/tcl_sources.inc
@@ -0,0 +1,45 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[list_begin enumerated]
+
+[enum][vset base][example {
+    critcl::cproc greetings::hello {} void {
+	printf("hello world\n");
+    }
+
+    critcl::cproc greetings::hi {} void {
+	printf("hi you\n");
+    }
+}][vset rebuild]
+
+[enum] The command [cmd hello] is now available as [cmd greetings::hello], and a second
+command [cmd greetings::hi] was added.
+
+[enum] Tcl has automatically created the namespace [namespace greetings].
+
+[enum] Create a file [file example-policy.tcl] and enter [example {
+    namespace eval greetings {
+	namespace export hello hi
+	namespace ensemble create
+    }
+}] into it.
+
+[enum] Edit [file example.tcl]. Add the code [example {
+    critcl::tsources example-policy.tcl
+}][vset rebuild]
+
+[enum] The added Tcl code makes [namespace greetings] available as an [term ensemble]
+command.
+
+[para] The commands in the namespace have been registered as methods of the ensemble.
+
+[para] They can now be invoked as [example {
+    greetings hello
+    greetings hi
+}]
+
+[enum] The Tcl builtin command [cmd string] is an ensemble as well, as is [cmd clock].
+
+[list_end]
+
+[para] New commands: [term critcl::tsources]
diff --git a/src/vfs/critcl.vfs/doc/include/use/template.inc b/src/vfs/critcl.vfs/doc/include/use/template.inc
new file mode 100644
index 00000000..45cce8b9
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/use/template.inc
@@ -0,0 +1,13 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+[const {_ _ __ ___ _____ TODO _____ ___ __ _ _}]
+
+[list_begin enumerated]
+
+[enum]
+[example_begin]
+[example_end]
+
+[enum]
+
+[list_end]
diff --git a/src/vfs/critcl.vfs/doc/include/welcome.inc b/src/vfs/critcl.vfs/doc/include/welcome.inc
new file mode 100644
index 00000000..dc8133af
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/include/welcome.inc
@@ -0,0 +1,4 @@
+[comment {-*- mode: tcl ; fill-column: 90 -*-}]
+
+Be welcome to the [vset ctlong] (short: [vset critcl]), a system for embedding and using C
+code from within [vset tcl_home] scripts.
diff --git a/src/vfs/critcl.vfs/doc/pkg_version.inc b/src/vfs/critcl.vfs/doc/pkg_version.inc
new file mode 100644
index 00000000..221c6a97
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/pkg_version.inc
@@ -0,0 +1 @@
+[vset VERSION 3.2.1]
diff --git a/src/vfs/critcl.vfs/doc/version.inc b/src/vfs/critcl.vfs/doc/version.inc
new file mode 100644
index 00000000..221c6a97
--- /dev/null
+++ b/src/vfs/critcl.vfs/doc/version.inc
@@ -0,0 +1 @@
+[vset VERSION 3.2.1]
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl.n b/src/vfs/critcl.vfs/embedded/man/files/critcl.n
new file mode 100644
index 00000000..860eedc5
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl.n
@@ -0,0 +1,406 @@
+'\"
+'\" Generated from file 'critcl\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) Jean-Claude Wippler
+'\" Copyright (c) Steve Landers
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl" n 3\&.2\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl \- Introduction To CriTcl
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+Adding C code to \fITcl\fR [http://core\&.tcl-lang\&.org/tcl]/\fITk\fR [http://core\&.tcl-lang\&.org/tk] has never been easier\&.
+.PP
+Improve performance by rewriting the performance bottlenecks in C\&.
+.PP
+Import the functionality of shared libraries into Tcl scripts\&.
+.PP
+.SH "HISTORY & MOTIVATION"
+.PP
+\fICriTcl\fR started life as an experiment by \fIJean-Claude Wippler\fR and was a self-contained
+Tcl package to build C code into a Tcl/Tk extension on the fly\&. It was somewhat inspired
+by Brian Ingerson's \fIInline\fR for \fIPerl\fR, but is considerably more lightweight\&.
+.PP
+It is for the last 5% to 10% when pure Tcl, which does go a long way, is not
+sufficient anymore\&. I\&.e\&. for
+.IP [1]
+when the last bits of performance are needed,
+.IP [2]
+access to 3rd party libraries,
+.IP [3]
+hiding critical pieces of your library or application, and
+.IP [4]
+simply needing features provided only by C\&.
+.PP
+.SH OVERVIEW
+To make the reader's topics of interest easy to find this documentation is roughly
+organized by \fIQuadrants\fR [https://documentation\&.divio\&.com/], i\&.e\&.
+.CS
+
+
+            | Study           | Work
+----------- + --------------- + -----------------
+Practical   | \fBTutorials\fR       | \fBHow-To Guides\fR
+            | (Learning)      | (Problem solving)
+----------- + --------------- + -----------------
+Theoretical | \fBExplanations\fR    | \fBReferences\fR
+            | (Understanding) | (Knowledge)
+
+.CE
+\fINote\fR: At this point in time the documentation consists mainly of references, and
+a few how-to guides\&. Tutorials and Explanations are in need of expansion, this is planned\&.
+.SH "KNOWN USERS"
+.IP \(bu
+\fIAnKH\fR [https://core\&.tcl-lang\&.org/akupries/ankh]
+.IP \(bu
+\fITclYAML\fR [https://core\&.tcl\&.tk/akupries/tclyaml]
+.IP \(bu
+\fILinenoise\fR [https://github\&.com/andreas-kupries/tcl-linenoise]
+.IP \(bu
+\fIKineTcl\fR [https://core\&.tcl\&.tk/akupries/kinetcl]
+.IP \(bu
+\fIInotify\fR [https://chiselapp\&.com/user/andreas_kupries/repository/inotify]
+.IP \(bu
+\fITclMarpa\fR [https://core\&.tcl\&.tk/akupries/marpa]
+.IP \(bu
+\fICRIMP\fR [https://core\&.tcl\&.tk/akupries/crimp]
+.PP
+.SH "TUTORIALS - PRACTICAL STUDY - TO LEARN"
+This section is currently empty\&.
+.SH "EXPLANATIONS - THEORETICAL KNOWLEDGE - TO UNDERSTAND"
+This section is currently empty\&.
+.SH "HOW-TO GUIDES - PRACTICAL WORK - TO SOLVE PROBLEMS"
+.IP [1]
+\fIHow To Get The CriTcl Sources\fR\&.
+.IP [2]
+\fIHow To Install CriTcl\fR\&.
+.IP [3]
+\fIHow To Use CriTcl\fR - A light introduction through examples\&.
+.IP [4]
+\fINEW\fR: \fIHow To Adapt Critcl Packages for Tcl 9\fR\&.
+.PP
+.SH "REFERENCES - THEORETICAL WORK - TO GAIN KNOWLEGDE"
+.IP [1]
+\fIThe CriTcl License\fR
+.IP [2]
+\fICriTcl Releases & Changes\fR
+.IP [3]
+\fICriTcl Application Reference\fR
+.IP [4]
+\fICriTcl Package Reference\fR
+.IP [5]
+\fICriTcl cproc Type Reference\fR
+.IP [6]
+\fICriTcl - Utilities\fR
+.IP [7]
+\fICriTcl - C-level Utilities\fR
+.IP [8]
+\fICriTcl - C-level Callback Utilities\fR
+.IP [9]
+\fICriTcl - Wrap Support - String/Integer mapping\fR
+.IP [10]
+\fICriTcl - Wrap Support - Bitset en- and decoding\fR
+.IP [11]
+\fICriTcl - Wrap Support - Enum en- and decoding\fR
+.IP [12]
+\fICriTcl - Code Gen - Constant string pools\fR
+.IP [13]
+\fICriTcl - Code Gen - Tcl Interp Associations\fR
+.IP [14]
+\fICriTcl - Code Gen - C Classes\fR
+.IP [15]
+\fICriTcl Application Package Reference\fR
+.IP [16]
+\fIGuide To The CriTcl Internals\fR
+.PP
+.SH AUTHORS
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report them at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR\&.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR as well\&.
+.SH KEYWORDS
+C code, Embedded C Code, calling C code from Tcl, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) Jean-Claude Wippler
+Copyright (c) Steve Landers
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_application.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_application.n
new file mode 100644
index 00000000..605b187a
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_application.n
@@ -0,0 +1,698 @@
+'\"
+'\" Generated from file 'critcl_application\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) Jean-Claude Wippler
+'\" Copyright (c) Steve Landers
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl_application" n 3\&.2\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl_application \- CriTcl Application Reference
+.SH SYNOPSIS
+\fBcritcl\fR ?\fIoption\fR\&.\&.\&.? ?\fIfile\fR\&.\&.\&.?
+.sp
+.BE
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This document is the reference manpage for the \fBcritcl\fR command\&.
+Its intended audience are people having to build packages using
+\fBcritcl\fR for deployment\&. Writers of packages with embedded C
+code can ignore this document\&.
+If you are in need of an overview of the whole system instead, please
+go and read the \fIIntroduction To CriTcl\fR\&.
+.PP
+This application resides in the Application Layer of CriTcl\&.
+.PP
+.PS
+.nf
+*================*
+|Applications    |
+| critcl         |
+| critcl::app    |
+*================*
+
++----------------+
+|Core Packages   |
+| critcl         |
+| critcl::util   |
++----------------+
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  \&.\&.\&.           |
++----------------+
+
+.fi
+.PE
+.PP
+\&.
+The application supports the following general command line:
+.TP
+\fBcritcl\fR ?\fIoption\fR\&.\&.\&.? ?\fIfile\fR\&.\&.\&.?
+The exact set of options supported, their meaning, and interaction is
+detailed in section \fBApplication Options\fR below\&.
+For a larger set of examples please see section "Building CriTcl Packages"
+in the document about \fIUsing CriTcl\fR\&.
+.PP
+.SH "APPLICATION OPTIONS"
+The following options are understood:
+.TP
+\fB-v\fR
+.TP
+\fB--version\fR
+Print the version to \fBstdout\fR and exit\&.
+.TP
+\fB-I\fR path
+Arranges for the compiler to search \fIpath\fR for headers\&.
+Uses of this option are cumulative\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-L\fR path
+Arranges for the linker to search \fIpath\fR\&.
+Uses of this option are cumulative\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-cache\fR path
+Sets \fIpath\fR as the directory to use as the result cache\&. The default is
+"\fI~/\&.critcl/<platform>\fR", or "\fI~/\&.critcl/<pid>\&.<epoch>\fR" when generating
+a package\&.  See option \fB-pkg\fR, below\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-clean\fR
+Arranges for all files and directories in the result cache to be deleted before
+compilation begins\&.
+.sp
+Ignored when generating a package because this mode starts out with a
+unique and empty result cache\&.  See option \fB-pkg\fR, below\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-config\fR path
+Provides a custom configuration file\&.  By default a configuration included in
+the system core is used\&.
+When specified multiple times the last value is used\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-debug\fR mode
+Activates one of the following debugging modes:
+.RS
+.TP
+\fBmemory\fR
+Track and report memory allocations made by the Tcl core\&.
+.TP
+\fBsymbols\fR
+Compile all "\fI\&.c\fR" files with debugging symbols\&.
+.TP
+\fBall\fR
+Both \fBmemory\fR and \fBsymbols\fR\&.
+.RE
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+Uses of this option are cumulative\&.
+.TP
+\fB-disable\fR name
+Sets the value of the custom build configuration option
+\fIname\fR to \fBfalse\fR\&. It is equivalent to "-with-\fIname\fR 0"\&.
+.PP
+Validated only if one of the input files for the \fICriTcl script\fR
+actually defines and uses a custom build configuration option with that
+\fIname\fR\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-enable\fR name
+Sets the value of the custom build configuration option
+\fIname\fR to \fBtrue\fR\&. It is equivalent to "-with-\fIname\fR 1"\&.
+.PP
+Validated only if one of the input files for the \fICriTcl script\fR
+actually defines and uses a custom build configuration option with that
+\fIname\fR\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-force\fR
+Forces compilation even if a shared library for the file already exists\&.
+Unlike cleaning the cache, this is lazy in the destruction of files and only
+affects relevant files\&.
+.sp
+Ignored when generating a package (see option \fB-pkg\fR, below),
+which starts out with a unique and empty result cache\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-help\fR
+Prints a short description of command line syntax and options and then exits
+the application\&.
+.TP
+\fB-keep\fR
+Causes the system to cache compiled "\fI\&.c\fR" files\&.
+Also prevents the deletion of the unique result cache used by the run when
+generating a package (see option \fB-pkg\fR below),
+Intended for debugging of \fBcritcl\fR itself, where it may be necessary to
+inspect the generated C code\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-libdir\fR directory
+Adds \fIdirectory\fR to the list of directories the linker searches for
+libraries in (like \fB-L\fR)\&.  With \fB-pkg\fR, generated packages are
+saved in \fIdirectory\fR\&.
+When specified multiple times the last value is used\&.
+The default is "\fIlib\fR", resolved relative to the current working directory\&.
+.TP
+\fB-includedir\fR directory
+Adds \fIdirectory\fR to the list of directories the compiler searches for
+headers in\&. With \fB-pkg\fR, generated header files are saved in
+\fIdirectory\fR\&.
+Uses of this option are cumulative\&.
+The last value is used as the destination for generated header files\&.
+The default is the relative directory "\fIinclude\fR", resolved relative to the
+current working directory\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-pkg\fR
+Generates a package from the \fICriTcl script\fR files\&.  Input files are
+processed first as usual, but are then bundled into a single library, with
+additional generated files to form the library into a standard Tcl package\&.
+.sp
+generation\&. If both options, i\&.e\&. \fB-pkg\fR and \fB-tea\fR are
+specified the last one specified wins\&.
+.sp
+Options \fB-clean\fR and \fB-force\fR are ignored\&. \fB-libdir\fR is
+relevant in both this and \fB-tea\fR mode\&.
+.sp
+The basename of the first file is the name of the package to generate\&. If
+its file extension indicates a shared library ("\fI\&.so\fR", "\fI\&.sl\fR",
+"\fI\&.dylib\fR", and "\fI\&.dll\fR") it is also removed from the set of input
+files\&. Each \fICriTcl script\fR file is kept as part of the input\&. A single
+file without a suffix is assumed to be a \fICriTcl script\fR\&. A file without
+a suffix, but other input files following is treated like the name of a
+shared library proper, and removed from the set of input files\&.
+.sp
+Examples:
+.CS
+
+
+	\&.\&.\&. -pkg \&.\&.\&. foo
+
+	=> Package name is: foo
+	=> Input file is:   foo\&.tcl
+
+.CE
+.CS
+
+
+	\&.\&.\&. -pkg \&.\&.\&. foo bar\&.tcl
+
+	=> Package name is: foo
+	=> Input file is:   bar\&.tcl
+
+.CE
+.CS
+
+
+	\&.\&.\&. -pkg \&.\&.\&. foo\&.tcl
+
+	=> Package name is: foo
+	=> Input file is:   foo\&.tcl
+
+.CE
+.CS
+
+
+	\&.\&.\&. -pkg \&.\&.\&. foo\&.so bar\&.tcl
+
+	=> Package name is: foo
+	=> Input file is:   bar\&.tcl
+
+.CE
+.TP
+\fB-show\fR
+Prints the configuration of the chosen target to \fBstdout\fR and then exits\&.
+Set \fB-target\fR, below\&.
+.TP
+\fB-showall\fR
+Prints the whole chosen configuration file to \fBstdout\fR and then exits\&.
+See \fB-config\fR, above\&.
+.TP
+\fB-target\fR name
+Overrides the default choice of build target\&.
+Only the last occurrence of this option is used\&.
+The named target must exist in the chosen configuration file\&.
+Use \fB-targets\fR (see below) to get a list of the
+acceptable targets\&.
+Use \fB-config\fR to select the configuration file\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-targets\fR
+Prints the list of all known targets from the chosen configuration file to
+\fBstdout\fR and then exits\&.
+Use \fB-config\fR to select the configuration file\&.
+.TP
+\fB-tea\fR
+Like \fB-pkg\fR, except no binaries are generated\&. Creates a directory
+hierarchy containing the \fICriTcl script\fR, its companion files, and a
+TEA-conformant build system with most of the needed support code, including
+copies of the critcl packages\&.
+.sp
+If both \fB-pkg\fR and \fB-tea\fR are specified the last occurrence wins\&.
+.sp
+\fB-I\fR, \fB-L\fR, \fB-clean\fR,
+\fB-force\fR, \fB-cache\fR, \fB-includedir\fR, \fB-enable\fR,
+\fB-disable\fR, and \fB-with-\fBFOO\fR\fR are
+ignored\&. In contrast, the option \fB-libdir\fR is relevant in both
+this and \fB-pkg\fR mode\&.
+.sp
+The basename of the first file is the name of the package to generate\&. If
+its file extension indicates a shared library ("\fI\&.so\fR", "\fI\&.sl\fR",
+"\fI\&.dylib\fR", and "\fI\&.dll\fR") it is also removed from the set of input
+files\&. Each \fICriTcl script\fR file is kept as part of the input\&. A single
+file without a suffix is assumed to be a \fICriTcl script\fR\&. A file without
+a suffix, but other input files following is treated like the name of a
+shared library proper, and removed from the set of input files\&.
+.sp
+Examples:
+.CS
+
+
+	\&.\&.\&. -tea \&.\&.\&. foo
+
+	=> Package name is: foo
+	=> Input file is:   foo\&.tcl
+
+.CE
+.CS
+
+
+	\&.\&.\&. -tea \&.\&.\&. foo bar\&.tcl
+
+	=> Package name is: foo
+	=> Input file is:   bar\&.tcl
+
+.CE
+.CS
+
+
+	\&.\&.\&. -tea \&.\&.\&. foo\&.tcl
+
+	=> Package name is: foo
+	=> Input file is:   foo\&.tcl
+
+.CE
+.CS
+
+
+	\&.\&.\&. -tea \&.\&.\&. foo\&.so bar\&.tcl
+
+	=> Package name is: foo
+	=> Input file is:   bar\&.tcl
+
+.CE
+.TP
+\fB-with-\fBname\fR\fR value
+This option sets the value of the custom build configuration option
+\fIname\fR to \fIvalue\fR\&.
+.sp
+The information is validated only if one of the "\fI\&.critcl\fR"
+input files actually defines and uses a custom build configuration
+option with that \fIname\fR\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.PP
+.SH "PACKAGE STRUCTURE"
+Packages generated by critcl have the following basic structure:
+.CS
+
+
+<TOP>
++- pkgIndex\&.tcl
++- critcl-rt\&.tcl
++- license\&.terms (optional)
+|
++- tcl (optional)
+|  +- <tsources files>
+|
++- <platform>
+   +- <shared library>
+
+.CE
+.PP
+\fINotes\fR
+.IP [1]
+The file "\fIpkgIndex\&.tcl\fR" is the standard package index file
+expected by Tcl's package management\&. It is sourced during a search
+for packages, and declares the package to Tcl with its files, and how
+to handle them\&.
+.IP [2]
+The file "\fIcritcl-rt\&.tcl\fR" is a helper file containing the
+common code used by "\fIpkgIndex\&.tcl\fR" to perform its tasks\&.
+.IP [3]
+The file "\fIlicense\&.terms\fR" is optional and appears only if
+the "\fI\&.critcl\fR" file the package is generated from used the command
+\fBcritcl::license\fR to declare package author and license\&.
+.IP [4]
+All files declared with the command \fBcritcl::tsources\fR are
+put into the sub-directory "\fItcl\fR"\&.
+.IP [5]
+The shared library generated by critcl is put into a
+platform-specific sub-directory\&.
+.PP
+.PP
+The whole structure, and especially the last point, enable us
+to later merge the results (for the same package, and version) for
+multiple target platforms into a single directory structure without
+conflict, by simply copying the top directories over each other\&. The
+only files which can conflict are in the <TOP> and "\fItcl\fR"
+directories, and for these we know that they are identical across
+targets\&. The result of such a merge would look like:
+.CS
+
+
+<TOP>
++- pkgIndex\&.tcl
++- critcl-rt\&.tcl
++- license\&.terms (optional)
+|
++- tcl (optional)
+|  +- <tsources files>
+|
++- <platform1>
+|  +- <shared library1>
++- <platform2>
+|  +- <shared library2>
+\&.\&.\&.
++- <platformN>
+   +- <shared libraryN>
+
+.CE
+.SH AUTHORS
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report them at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR\&.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR as well\&.
+.SH KEYWORDS
+C code, Embedded C Code, calling C code from Tcl, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) Jean-Claude Wippler
+Copyright (c) Steve Landers
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_application_package.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_application_package.n
new file mode 100644
index 00000000..56a70f6b
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_application_package.n
@@ -0,0 +1,751 @@
+'\"
+'\" Generated from file 'critcl_application_package\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) Jean-Claude Wippler
+'\" Copyright (c) Steve Landers
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl_application_package" n 3\&.2\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl_application_package \- CriTcl Application Package Reference
+.SH SYNOPSIS
+package require \fBTcl  8\&.6\fR
+.sp
+package require \fBcritcl::app  ?3\&.2\&.1?\fR
+.sp
+package require \fBcritcl  ?3\&.2\&.1?\fR
+.sp
+package require \fBplatform  ?1\&.0\&.2?\fR
+.sp
+package require \fBcmdline \fR
+.sp
+\fB::critcl::app::main\fR \fIcommandline\fR
+.sp
+.BE
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This document is the reference manpage for the \fBcritcl::app\fR
+package\&. Its intended audience are developers working on critcl's
+internals\&.
+These commands are not needed to simply write a \fICriTcl script\fR\&.
+If you are in need of an overview of the whole system instead, please
+go and read the \fIIntroduction To CriTcl\fR\&.
+.PP
+This package resides in the Application Layer of CriTcl\&.
+.PP
+.PS
+.nf
+*================*
+|Applications    |
+| critcl         |
+| critcl::app    |
+*================*
+
++----------------+
+|Core Packages   |
+| critcl         |
+| critcl::util   |
++----------------+
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  \&.\&.\&.           |
++----------------+
+
+.fi
+.PE
+.PP
+,
+implementing the functionality of the \fICriTcl Application\fR,
+and through this, the mode \fBgenerate package\fR\&.
+The actual application is (only) a shim wrapping around this
+package\&. It itself is build on top of the core package
+\fBcritcl\fR\&.
+.SH API
+The package exports a single command
+.TP
+\fB::critcl::app::main\fR \fIcommandline\fR
+The \fIcommandline\fR is a list of zero or more options followed by zero or
+more \fICriTcl script\fR files\&.  By default, the \fICriTcl script\fR files
+are build and the results cached\&.   This cuts down on the time needed to
+load the package\&.  The last occurrence of \fB-pkg\fR and \fB-tea\fR, if
+provided, selects the corresponding alternative mode of operations\&.
+For a larger set of examples please see section "Building CriTcl Packages"
+in the document about \fIUsing CriTcl\fR\&.
+.PP
+The options are:
+.SH OPTIONS
+The following options are understood:
+.TP
+\fB-v\fR
+.TP
+\fB--version\fR
+Print the version to \fBstdout\fR and exit\&.
+.TP
+\fB-I\fR path
+Arranges for the compiler to search \fIpath\fR for headers\&.
+Uses of this option are cumulative\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-L\fR path
+Arranges for the linker to search \fIpath\fR\&.
+Uses of this option are cumulative\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-cache\fR path
+Sets \fIpath\fR as the directory to use as the result cache\&. The default is
+"\fI~/\&.critcl/<platform>\fR", or "\fI~/\&.critcl/<pid>\&.<epoch>\fR" when generating
+a package\&.  See option \fB-pkg\fR, below\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-clean\fR
+Arranges for all files and directories in the result cache to be deleted before
+compilation begins\&.
+.sp
+Ignored when generating a package because this mode starts out with a
+unique and empty result cache\&.  See option \fB-pkg\fR, below\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-config\fR path
+Provides a custom configuration file\&.  By default a configuration included in
+the system core is used\&.
+When specified multiple times the last value is used\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-debug\fR mode
+Activates one of the following debugging modes:
+.RS
+.TP
+\fBmemory\fR
+Track and report memory allocations made by the Tcl core\&.
+.TP
+\fBsymbols\fR
+Compile all "\fI\&.c\fR" files with debugging symbols\&.
+.TP
+\fBall\fR
+Both \fBmemory\fR and \fBsymbols\fR\&.
+.RE
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+Uses of this option are cumulative\&.
+.TP
+\fB-disable\fR name
+Sets the value of the custom build configuration option
+\fIname\fR to \fBfalse\fR\&. It is equivalent to "-with-\fIname\fR 0"\&.
+.PP
+Validated only if one of the input files for the \fICriTcl script\fR
+actually defines and uses a custom build configuration option with that
+\fIname\fR\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-enable\fR name
+Sets the value of the custom build configuration option
+\fIname\fR to \fBtrue\fR\&. It is equivalent to "-with-\fIname\fR 1"\&.
+.PP
+Validated only if one of the input files for the \fICriTcl script\fR
+actually defines and uses a custom build configuration option with that
+\fIname\fR\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-force\fR
+Forces compilation even if a shared library for the file already exists\&.
+Unlike cleaning the cache, this is lazy in the destruction of files and only
+affects relevant files\&.
+.sp
+Ignored when generating a package (see option \fB-pkg\fR, below),
+which starts out with a unique and empty result cache\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-help\fR
+Prints a short description of command line syntax and options and then exits
+the application\&.
+.TP
+\fB-keep\fR
+Causes the system to cache compiled "\fI\&.c\fR" files\&.
+Also prevents the deletion of the unique result cache used by the run when
+generating a package (see option \fB-pkg\fR below),
+Intended for debugging of \fBcritcl\fR itself, where it may be necessary to
+inspect the generated C code\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-libdir\fR directory
+Adds \fIdirectory\fR to the list of directories the linker searches for
+libraries in (like \fB-L\fR)\&.  With \fB-pkg\fR, generated packages are
+saved in \fIdirectory\fR\&.
+When specified multiple times the last value is used\&.
+The default is "\fIlib\fR", resolved relative to the current working directory\&.
+.TP
+\fB-includedir\fR directory
+Adds \fIdirectory\fR to the list of directories the compiler searches for
+headers in\&. With \fB-pkg\fR, generated header files are saved in
+\fIdirectory\fR\&.
+Uses of this option are cumulative\&.
+The last value is used as the destination for generated header files\&.
+The default is the relative directory "\fIinclude\fR", resolved relative to the
+current working directory\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-pkg\fR
+Generates a package from the \fICriTcl script\fR files\&.  Input files are
+processed first as usual, but are then bundled into a single library, with
+additional generated files to form the library into a standard Tcl package\&.
+.sp
+generation\&. If both options, i\&.e\&. \fB-pkg\fR and \fB-tea\fR are
+specified the last one specified wins\&.
+.sp
+Options \fB-clean\fR and \fB-force\fR are ignored\&. \fB-libdir\fR is
+relevant in both this and \fB-tea\fR mode\&.
+.sp
+The basename of the first file is the name of the package to generate\&. If
+its file extension indicates a shared library ("\fI\&.so\fR", "\fI\&.sl\fR",
+"\fI\&.dylib\fR", and "\fI\&.dll\fR") it is also removed from the set of input
+files\&. Each \fICriTcl script\fR file is kept as part of the input\&. A single
+file without a suffix is assumed to be a \fICriTcl script\fR\&. A file without
+a suffix, but other input files following is treated like the name of a
+shared library proper, and removed from the set of input files\&.
+.sp
+Examples:
+.CS
+
+
+	\&.\&.\&. -pkg \&.\&.\&. foo
+
+	=> Package name is: foo
+	=> Input file is:   foo\&.tcl
+
+.CE
+.CS
+
+
+	\&.\&.\&. -pkg \&.\&.\&. foo bar\&.tcl
+
+	=> Package name is: foo
+	=> Input file is:   bar\&.tcl
+
+.CE
+.CS
+
+
+	\&.\&.\&. -pkg \&.\&.\&. foo\&.tcl
+
+	=> Package name is: foo
+	=> Input file is:   foo\&.tcl
+
+.CE
+.CS
+
+
+	\&.\&.\&. -pkg \&.\&.\&. foo\&.so bar\&.tcl
+
+	=> Package name is: foo
+	=> Input file is:   bar\&.tcl
+
+.CE
+.TP
+\fB-show\fR
+Prints the configuration of the chosen target to \fBstdout\fR and then exits\&.
+Set \fB-target\fR, below\&.
+.TP
+\fB-showall\fR
+Prints the whole chosen configuration file to \fBstdout\fR and then exits\&.
+See \fB-config\fR, above\&.
+.TP
+\fB-target\fR name
+Overrides the default choice of build target\&.
+Only the last occurrence of this option is used\&.
+The named target must exist in the chosen configuration file\&.
+Use \fB-targets\fR (see below) to get a list of the
+acceptable targets\&.
+Use \fB-config\fR to select the configuration file\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.TP
+\fB-targets\fR
+Prints the list of all known targets from the chosen configuration file to
+\fBstdout\fR and then exits\&.
+Use \fB-config\fR to select the configuration file\&.
+.TP
+\fB-tea\fR
+Like \fB-pkg\fR, except no binaries are generated\&. Creates a directory
+hierarchy containing the \fICriTcl script\fR, its companion files, and a
+TEA-conformant build system with most of the needed support code, including
+copies of the critcl packages\&.
+.sp
+If both \fB-pkg\fR and \fB-tea\fR are specified the last occurrence wins\&.
+.sp
+\fB-I\fR, \fB-L\fR, \fB-clean\fR,
+\fB-force\fR, \fB-cache\fR, \fB-includedir\fR, \fB-enable\fR,
+\fB-disable\fR, and \fB-with-\fBFOO\fR\fR are
+ignored\&. In contrast, the option \fB-libdir\fR is relevant in both
+this and \fB-pkg\fR mode\&.
+.sp
+The basename of the first file is the name of the package to generate\&. If
+its file extension indicates a shared library ("\fI\&.so\fR", "\fI\&.sl\fR",
+"\fI\&.dylib\fR", and "\fI\&.dll\fR") it is also removed from the set of input
+files\&. Each \fICriTcl script\fR file is kept as part of the input\&. A single
+file without a suffix is assumed to be a \fICriTcl script\fR\&. A file without
+a suffix, but other input files following is treated like the name of a
+shared library proper, and removed from the set of input files\&.
+.sp
+Examples:
+.CS
+
+
+	\&.\&.\&. -tea \&.\&.\&. foo
+
+	=> Package name is: foo
+	=> Input file is:   foo\&.tcl
+
+.CE
+.CS
+
+
+	\&.\&.\&. -tea \&.\&.\&. foo bar\&.tcl
+
+	=> Package name is: foo
+	=> Input file is:   bar\&.tcl
+
+.CE
+.CS
+
+
+	\&.\&.\&. -tea \&.\&.\&. foo\&.tcl
+
+	=> Package name is: foo
+	=> Input file is:   foo\&.tcl
+
+.CE
+.CS
+
+
+	\&.\&.\&. -tea \&.\&.\&. foo\&.so bar\&.tcl
+
+	=> Package name is: foo
+	=> Input file is:   bar\&.tcl
+
+.CE
+.TP
+\fB-with-\fBname\fR\fR value
+This option sets the value of the custom build configuration option
+\fIname\fR to \fIvalue\fR\&.
+.sp
+The information is validated only if one of the "\fI\&.critcl\fR"
+input files actually defines and uses a custom build configuration
+option with that \fIname\fR\&.
+.PP
+Ignored when generating a TEA package
+(see option \fB-tea\fR below)\&.
+.PP
+.SH "MODES OF OPERATION/USE"
+CriTcl can be used in three different modes of operation, called
+.IP [1]
+\fICompile & Run\fR, and
+.IP [2]
+\fIGenerate Package\fR
+.IP [3]
+\fIGenerate TEA Package\fR
+.PP
+\fICompile & Run\fR was the original mode and is the default for
+\fIcritcl_pkg\fR\&.  Collects the C fragments from the
+\fICriTcl script\fR, builds them as needed, and caches the results to
+improve load times later\&.
+.PP
+The second mode, \fIGenerate Package\fR, was introduced to enable
+the creation of (prebuilt) deliverable packages which do not depend on
+the existence of a build system, i\&.e\&. C compiler, on the target
+machine\&.
+This was originally done through the experimental \fBCritbind\fR tool,
+and is now handled by the \fICriTcl Application\fR, also named
+\fBcritcl\fR\&.
+.PP
+Newly introduced with CriTcl version 3 is
+\fIGenerate TEA Package\fR\&. This mode constructs a directory
+hierarchy from the package which can later be built like a regular TEA
+package, i\&.e\&. using
+.CS
+
+
+	\&.\&.\&./configure --prefix \&.\&.\&.
+	make all isntall
+
+.CE
+.SH "PACKAGE STRUCTURE"
+Packages generated by critcl have the following basic structure:
+.CS
+
+
+<TOP>
++- pkgIndex\&.tcl
++- critcl-rt\&.tcl
++- license\&.terms (optional)
+|
++- tcl (optional)
+|  +- <tsources files>
+|
++- <platform>
+   +- <shared library>
+
+.CE
+.PP
+\fINotes\fR
+.IP [1]
+The file "\fIpkgIndex\&.tcl\fR" is the standard package index file
+expected by Tcl's package management\&. It is sourced during a search
+for packages, and declares the package to Tcl with its files, and how
+to handle them\&.
+.IP [2]
+The file "\fIcritcl-rt\&.tcl\fR" is a helper file containing the
+common code used by "\fIpkgIndex\&.tcl\fR" to perform its tasks\&.
+.IP [3]
+The file "\fIlicense\&.terms\fR" is optional and appears only if
+the "\fI\&.critcl\fR" file the package is generated from used the command
+\fBcritcl::license\fR to declare package author and license\&.
+.IP [4]
+All files declared with the command \fBcritcl::tsources\fR are
+put into the sub-directory "\fItcl\fR"\&.
+.IP [5]
+The shared library generated by critcl is put into a
+platform-specific sub-directory\&.
+.PP
+.PP
+The whole structure, and especially the last point, enable us
+to later merge the results (for the same package, and version) for
+multiple target platforms into a single directory structure without
+conflict, by simply copying the top directories over each other\&. The
+only files which can conflict are in the <TOP> and "\fItcl\fR"
+directories, and for these we know that they are identical across
+targets\&. The result of such a merge would look like:
+.CS
+
+
+<TOP>
++- pkgIndex\&.tcl
++- critcl-rt\&.tcl
++- license\&.terms (optional)
+|
++- tcl (optional)
+|  +- <tsources files>
+|
++- <platform1>
+|  +- <shared library1>
++- <platform2>
+|  +- <shared library2>
+\&.\&.\&.
++- <platformN>
+   +- <shared libraryN>
+
+.CE
+.SH AUTHORS
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report them at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR\&.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR as well\&.
+.SH KEYWORDS
+C code, Embedded C Code, calling C code from Tcl, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) Jean-Claude Wippler
+Copyright (c) Steve Landers
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_bitmap.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_bitmap.n
new file mode 100644
index 00000000..ad77d852
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_bitmap.n
@@ -0,0 +1,469 @@
+'\"
+'\" Generated from file 'critcl_bitmap\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl::bitmap" n 1\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl::bitmap \- CriTcl - Wrap Support - Bitset en- and decoding
+.SH SYNOPSIS
+package require \fBTcl  8\&.6\fR
+.sp
+package require \fBcritcl  ?3\&.2?\fR
+.sp
+package require \fBcritcl::bitmap  ?1\&.1?\fR
+.sp
+\fB::critcl::bitmap::def\fR \fIname\fR \fIdefinition\fR ?\fIexclusions\fR?
+.sp
+.BE
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This document is the reference manpage for the
+\fBcritcl::bitmap\fR package\&. This package provides convenience
+commands for advanced functionality built on top of both critcl core
+and package \fBcritcl::iassoc\fR\&.
+.PP
+C level libraries often use bit-sets to encode many flags into a
+single value\&. Tcl bindings to such libraries now have the task of
+converting a Tcl representation of such flags (like a list of strings)
+into such bit-sets, and back\&.
+\fINote\fR here that the C-level information has to be something which
+already exists\&. The package does \fInot\fR create these values\&. This is
+in contrast to the package \fBcritcl::enum\fR which creates an
+enumeration based on the specified symbolic names\&.
+.PP
+This package was written to make the declaration and management
+of such bit-sets and their associated conversions functions easy,
+hiding all attendant complexity from the user\&.
+.PP
+Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code\&.
+.PP
+This package resides in the Core Package Layer of CriTcl\&.
+.PP
+.PS
+.nf
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
+*================*
+|Core Packages   |
+| critcl         |
+| critcl::util   |
+*================*
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  \&.\&.\&.           |
++----------------+
+
+.fi
+.PE
+.PP
+.SH API
+.TP
+\fB::critcl::bitmap::def\fR \fIname\fR \fIdefinition\fR ?\fIexclusions\fR?
+This command defines two C functions for the conversion of the
+\fIname\fRd bit-set into Tcl lists, and vice versa\&.
+The underlying mapping tables are automatically initialized on first
+access, and finalized on interpreter destruction\&.
+.sp
+The \fIdefinition\fR dictionary provides the mapping from the
+Tcl-level symbolic names of the flags to their C expressions (often
+the name of the macro specifying the actual value)\&.
+\fINote\fR here that the C-level information has to be something which
+already exists\&. The package does \fInot\fR create these values\&. This is
+in contrast to the package \fBcritcl::enum\fR which creates an
+enumeration based on the specified symbolic names\&.
+.sp
+The optional \fIexlusion\fR list is for the flags/bit-sets for
+which conversion from bit-set to flag, i\&.e\&. decoding makes no
+sense\&. One case for such, for example, are flags representing a
+combination of other flags\&.
+.sp
+The package generates multiple things (declarations and
+definitions) with names derived from \fIname\fR, which has to be a
+proper C identifier\&.
+.RS
+.TP
+\fIname\fR_encode
+The function for encoding a Tcl list of strings into the equivalent
+bit-set\&.
+Its signature is
+.sp
+.CS
+
+
+int \fIname\fR_encode (Tcl_Interp* interp, Tcl_Obj* flags, int* result);
+
+.CE
+.sp
+The return value of the function is a Tcl error code,
+i\&.e\&. \fBTCL_OK\fR, \fBTCL_ERROR\fR, etc\&.
+.TP
+\fIname\fR_decode
+The function for decoding a bit-set into the equivalent Tcl list of
+strings\&.
+Its signature is
+.sp
+.CS
+
+
+Tcl_Obj* \fIname\fR_decode (Tcl_Interp* interp, int flags);
+
+.CE
+.TP
+\fIname\fR\&.h
+A header file containing the declarations for the two conversion
+functions, for use by other parts of the system, if necessary\&.
+.sp
+The generated file is stored in a place where it will not
+interfere with the overall system outside of the package, yet also be
+available for easy inclusion by package files (\fBcsources\fR)\&.
+.TP
+\fIname\fR
+The name of a critcl argument type encapsulating the encoder function
+for use by \fBcritcl::cproc\fR\&.
+.TP
+\fIname\fR
+The name of a critcl result type encapsulating the decoder function
+for use by \fBcritcl::cproc\fR\&.
+.RE
+.PP
+.SH EXAMPLE
+The example shown below is the specification of the event flags pulled
+from the draft work on a Tcl binding to Linux's inotify APIs\&.
+.CS
+
+
+package require Tcl 8\&.6
+package require critcl 3\&.2
+
+critcl::buildrequirement {
+    package require critcl::bitmap
+}
+
+critcl::bitmap::def tcl_inotify_events {
+    accessed       IN_ACCESS
+    all            IN_ALL_EVENTS
+    attribute      IN_ATTRIB
+    closed         IN_CLOSE
+    closed-nowrite IN_CLOSE_NOWRITE
+    closed-write   IN_CLOSE_WRITE
+    created        IN_CREATE
+    deleted        IN_DELETE
+    deleted-self   IN_DELETE_SELF
+    dir-only       IN_ONLYDIR
+    dont-follow    IN_DONT_FOLLOW
+    modified       IN_MODIFY
+    move           IN_MOVE
+    moved-from     IN_MOVED_FROM
+    moved-self     IN_MOVE_SELF
+    moved-to       IN_MOVED_TO
+    oneshot        IN_ONESHOT
+    open           IN_OPEN
+    overflow       IN_Q_OVERFLOW
+    unmount        IN_UNMOUNT
+} {
+    all closed move oneshot
+}
+
+# Declarations:          tcl_inotify_events\&.h
+# Encoder:      int      tcl_inotify_events_encode (Tcl_Interp* interp, Tcl_Obj* flags, int* result);
+# Decoder:      Tcl_Obj* tcl_inotify_events_decode (Tcl_Interp* interp, int flags);
+# crit arg-type          tcl_inotify_events
+# crit res-type          tcl_inotify_events
+
+.CE
+.SH AUTHORS
+Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report such at \fIhttps://github\&.com/andreas-kupries/critcl\fR\&.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation\&.
+.SH KEYWORDS
+C code, Embedded C Code, Tcl Interp Association, bitmask, bitset, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, flags, generate package, linker, on demand compilation, on-the-fly compilation, singleton
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_build.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_build.n
new file mode 100644
index 00000000..4d47bfa1
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_build.n
@@ -0,0 +1,310 @@
+'\"
+'\" Generated from file 'critcl_build\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) Jean-Claude Wippler
+'\" Copyright (c) Steve Landers
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl_build_tool" n 3\&.2\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl_build_tool \- CriTcl build\&.tcl Tool Reference
+.SH DESCRIPTION
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+The script "\fIbuild\&.tcl\fR" found in the top directory of the \fICriTcl\fR sources is the
+main tool of use to a developer or maintainer of \fICriTcl\fR itself\&.
+.PP
+Invoking it a via
+.CS
+
+\&./build\&.tcl help
+.CE
+provides the online help for this
+tool, explaining the operations available, and their arguments\&.
+.SH AUTHORS
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report them at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR\&.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR as well\&.
+.SH KEYWORDS
+C code, Embedded C Code, calling C code from Tcl, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) Jean-Claude Wippler
+Copyright (c) Steve Landers
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_callback.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_callback.n
new file mode 100644
index 00000000..ba422cb5
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_callback.n
@@ -0,0 +1,474 @@
+'\"
+'\" Generated from file 'critcl_callback\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl::callback" n 1\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl::callback \- CriTcl - C-level Callback Utilities
+.SH SYNOPSIS
+package require \fBTcl  8\&.6\fR
+.sp
+package require \fBcritcl  ?3\&.2?\fR
+.sp
+package require \fBcritcl::callback  ?1\&.1?\fR
+.sp
+\fBcritcl_callback_p\fR \fBcritcl_callback_new\fR \fIinterp\fR \fIobjc\fR \fIobjv\fR \fInargs\fR
+.sp
+\fBvoid\fR \fBcritcl_callback_extend\fR \fIcallback\fR \fIargument\fR
+.sp
+\fBvoid\fR \fBcritcl_callback_destroy\fR \fIcallback\fR
+.sp
+\fBint\fR \fBcritcl_callback_invoke\fR \fIcallback\fR \fIobjc\fR \fIobjv\fR
+.sp
+.BE
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This document is the reference manpage for the
+\fBcritcl::callback\fR package\&.
+This package provides, via a stubs API table, data structures and
+functions to manage callbacks from C to Tcl\&. The package has no
+Tcl-level facilities\&.
+Its intended audience are mainly developers wishing to write Tcl
+packages with embedded C code who have to invoke user-specified
+command (prefixes) in Tcl\&.
+.PP
+This package resides in the Support Package Layer of CriTcl\&.
+.PP
+.PS
+.nf
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
++----------------+
+|Core Packages   |
+| critcl         |
+| critcl::util   |
++----------------+
+
+*================*
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  \&.\&.\&.           |
+*================*
+
+.fi
+.PE
+.PP
+.SH API
+The package API consist of one opaque data structure
+(\fBcritcl_callback_p\fR) and four functions operating on the same\&.
+These functions are
+.TP
+\fBcritcl_callback_p\fR \fBcritcl_callback_new\fR \fIinterp\fR \fIobjc\fR \fIobjv\fR \fInargs\fR
+This function creates a new callback (manager) and returns it as its result\&.
+.sp
+The callback is initialized with the Tcl_Interp* \fIinterp\fR
+specifying where to run the callback, the fixed part of the command to
+run in standard \fIobjc\fR/\fIobjv\fR notation, plus the number of
+free arguments to expect after the fixed part\&.
+.sp
+The fixed part is the essentially the command prefix of the callback\&.
+.sp
+All \fBTcl_Obj*\fR elements of \fIobjv\fR are protected against early
+release by incrementing their reference counts\&. The callback
+effectively takes ownership of these objects\&.
+.TP
+\fBvoid\fR \fBcritcl_callback_extend\fR \fIcallback\fR \fIargument\fR
+This function takes a \fIcallback\fR of type \fBcritcl_callback_p\fR
+and extends its fixed part with the \fIargument\fR, taking the first
+free slot for arguments to do so\&.
+This means that after the application of this function the specified
+callback has one free argument less\&.
+.sp
+With assertions active attempting to extend beyond the number of free
+arguments will cause a panic\&. Without assertions active expect a crash
+at some point\&.
+.sp
+This allows the user to extend the fixed part of the callback with
+semi-fixed elements, like method names (See \fBMultiple methods\fR)\&.
+.sp
+The \fIargument\fR is protected against early release by incrementing
+its reference count\&. The callback effectively takes ownership of this
+object\&.
+.TP
+\fBvoid\fR \fBcritcl_callback_destroy\fR \fIcallback\fR
+This function takes a \fIcallback\fR of type \fBcritcl_callback_p\fR
+and releases all memory associated with it\&.
+After application of this function the callback cannot be used anymore\&.
+.sp
+All fixed elements of the callback (owned by it) are released by
+decrementing their reference counts\&.
+.TP
+\fBint\fR \fBcritcl_callback_invoke\fR \fIcallback\fR \fIobjc\fR \fIobjv\fR
+This function invokes the callback in the Tcl interpreter specified at
+the time of construction, in the global level and namespace, with the
+free arguments filled by the \fBTcl_Obj*\fR objects specified via
+\fIobjc\fR/\fIobjv\fR\&.
+.sp
+It returns the Tcl status of the invoked command as its result\&.
+Any further results or error messages will be found in the result area
+of the Tcl interpreter in question\&. The exact nature of such is
+dependent on the callback itself\&.
+.sp
+With assertions active attempting to use more arguments than available
+will cause a panic\&. Without assertions active expect a crash at some
+point\&.
+.sp
+While the callback is running all \fBTcl_Obj*\fR elements of the
+command, fixed and arguments, are protected against early release by
+temporarily incrementing their reference counts\&.
+.PP
+.SH EXAMPLES
+.SS "SIMPLE CALLBACK"
+The example here shows the important parts of using the functions of
+this package for a simple callback which is invoked with a single
+argument, some kind of data to hand to the Tcl level\&.
+.CS
+
+
+    // Create the callback with interpreter and command prefix in
+    // oc/ov, plus space for the argument
+    critcl_callback_p cb = critcl_callback_new (interp, oc, ov, 1);
+
+    // Invoke the callback somewhere in the C package using this one,
+    // with Tcl_Obj* data holding the information to pass up\&.
+    critcl_callback_invoke (cb, 1, &data);
+
+    // At the end of the lifetime, release the callback\&.
+    critcl_callback_destroy (cb);
+
+.CE
+Note that the functions of this package are designed for the case
+where the created callback (\fBcb\fR above) is kept around for a
+long time, and many different invokations\&.
+.PP
+Using the sequence above as is, creating and destroying the callback
+each time it is invoked will yield very poor performance and lots of
+undesirable memory churn\&.
+.SS "MULTIPLE METHODS"
+While we can use the methodology of the previous section when a single
+(Tcl-level) callback is invoked from different places in C, with
+different methods, simply having another argument slot and filling it
+an invokation time with the method object, a second methodology is
+open to us due to \fBcritcl_callback_extend\fR\&.
+.CS
+
+
+
+    // Create one callback manager per different method the callback
+    // will be used with\&. Fill the first of the two declared arguments
+    // with the different methods\&.
+    critcl_callback_p cb_a = critcl_callback_new (interp, oc, ov, 2);
+    critcl_callback_p cb_b = critcl_callback_new (interp, oc, ov, 2);
+
+    critcl_callback_extend (cb_a, Tcl_NewStringObj ("method1", -1));
+    critcl_callback_extend (cb_b, Tcl_NewStringObj ("method2", -1));
+
+    // After the extension we have one free argument left, for use in
+    // the invokations\&.
+
+    critcl_callback_invoke (cb_a, 1, &dataX);
+
+    critcl_callback_invoke (cb_b, 1, &dataY);
+
+
+    // At the end release both managers again
+    critcl_callback_destroy (cb_a);
+    critcl_callback_destroy (cb_b);
+
+.CE
+The nice thing here is that the method objects are allocated only once
+and automatically shared by all the calls\&. No memory churn to
+repeatedly allocate the same string objects over and over again\&.
+.SH AUTHORS
+Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report such at \fIhttps://github\&.com/andreas-kupries/critcl\fR\&.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation\&.
+.SH KEYWORDS
+C code, Embedded C Code, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_changes.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_changes.n
new file mode 100644
index 00000000..f8cefb6c
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_changes.n
@@ -0,0 +1,1432 @@
+'\"
+'\" Generated from file 'critcl_changes\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) Jean-Claude Wippler
+'\" Copyright (c) Steve Landers
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl_changes" n 3\&.2\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl_changes \- CriTcl Releases & Changes
+.SH DESCRIPTION
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+Adding C code to \fITcl\fR [http://core\&.tcl-lang\&.org/tcl]/\fITk\fR [http://core\&.tcl-lang\&.org/tk] has never been easier\&.
+.PP
+Improve performance by rewriting the performance bottlenecks in C\&.
+.PP
+Import the functionality of shared libraries into Tcl scripts\&.
+See the changes done in each release of \fICriTcl\fR, from the latest at the top to the
+beginning of the project\&.
+.PP
+The latest changes are found at the top\&.
+.SH "CHANGES FOR VERSION 3\&.2\&.1 (TO COME)"
+.IP [1]
+As announced with 3\&.2:
+.RS
+.IP [1]
+Removed support for Tcl 8\&.4 and 8\&.5\&.
+.IP [2]
+Removed support for the argument types
+\fBint*\fR,
+\fBfloat*\fR,
+\fBdouble*\fR,
+\fBbytearray\fR,
+\fBrawchar\fR, and
+\fBrawchar*\fR\&.
+.RE
+.IP [2]
+Modified packages to accept operation under Tcl 9\&.
+Bumped package versions appropriately\&.
+Bumped copyrights\&.
+.sp
+The \fIHow To Adapt Critcl Packages for Tcl 9\fR
+contains the details relevant to writers of \fICriTcl\fR-based packages\&.
+.IP [3]
+Set different minimum Tcl requirements for the 8\&.x and 9\&.x series\&.
+.sp
+If no minimum is declared the minimum depends on the Tcl version
+used to run the critcl package or application\&.
+.sp
+When running under Tcl 9 the default minimum is version \fB9\fR\&.
+For anything else the new default minimum is \fB8\&.6\fR\&.
+.sp
+\fIReminder\fR: Support for Tcl 8\&.4 and 8\&.5 was removed\&.
+.IP [4]
+Made "\fI~\fR"-handling portable across the 8\&.x and 9 boundary
+(via \fBHOME\fR environment variable)\&.
+.IP [5]
+Bumped embedded \fBtclconfig\fR to version 2\&.67\&. Patch supplied by Paul Obermeier\&.
+.IP [6]
+\fIBug Fix\fR \fI#127\fR [https://github\&.com/andreas-kupries/critcl/issues/127]
+.IP [7]
+\fIBug Fix\fR \fI#128\fR [https://github\&.com/andreas-kupries/critcl/issues/128]
+.IP [8]
+\fIBug Fix\fR \fI#129\fR [https://github\&.com/andreas-kupries/critcl/issues/129]
+Fixed various typos in the documentation\&.
+.IP [9]
+Reworked internals of \fBcritcl::cutil\fR's tracer to support operation in a
+multi-threaded environment\&. This new mode is also default\&. The old single-threaded
+mode can be (re)activated by defining \fBCRITCL_TRACE_NOTHREADS\fR\&.
+.sp
+Package bumped to version 0\&.4\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.2"
+.IP [1]
+\fIBREAKING\fR \fICriTcl\fR now requires Tcl 8\&.6 to be run\&.
+.sp
+It also generates Tcl 8\&.6 extensions by default\&.
+.sp
+It is still possible to generates extensions for Tcl 8\&.4 and 8\&.5,
+properly setting it via \fBcritcl::tcl\fR\&.
+.sp
+\fIATTENTION\fR It is planned to completely remove 8\&.4 and 8\&.5
+support with \fICriTcl\fR 3\&.3\&.
+No date has been set for that release yet\&.
+.sp
+All utility packages have their versions and requirements bumped accordingly as
+well\&.
+.IP [2]
+\fIBREAKING\fR \fIBug Fix\fR
+Issue \fI#115\fR [https://github\&.com/andreas-kupries/critcl/issues/115]\&.
+.sp
+Distributions using \fBbuild\&.tcl\fR for installation of critcl in their
+packaging scripts have to be updated to the changed command signature of
+\fBbuild\&.tcl\fR install, etc\&. See the details below\&.
+.sp
+Redone the argument handling for \fBinstall\fR, \fBuninstall\fR, and
+\fBtargets\fR\&. The destination argument is gone\&.  All commands now take options
+similar to what is known from GNU \fBconfigure\fR, i\&.e\&.
+.RS
+.TP
+\fB--prefix\fR path
+.TP
+\fB--exec-prefix\fR path
+.TP
+\fB--bin-dir\fR path
+.TP
+\fB--lib-dir\fR path
+.TP
+\fB--include-dir\fR path
+.RE
+.sp
+They now also respect the environment variable \fBDESTDIR\fR, and the associated
+option \fB--dest-dir\fR\&.
+.sp
+The \fB--prefix\fR defaults to the topdir from the bin directory holding the
+\fBtclsh\fR running \fBbuild\&.tcl\fR\&.  As Tcl command:
+.CS
+
+
+    file dirname [file dirname [info nameofexecutable]]
+
+.CE
+.sp
+Added a command \fBdirs\fR doing the same argument handling, for debugging\&.
+.IP [3]
+Removed the irrelevant packages \fBautoscroll\fR, \fBcmdline\fR,
+\fBdict84\fR, \fBlassign84\fR, \fBlmap84\fR, \fBsnit\fR,
+\fBsnitbutton\fR, and \fBwikit\fR\&.
+.IP [4]
+\fIDocumentation Redo\fR Issue
+\fI#116\fR [https://github\&.com/andreas-kupries/critcl/issues/116]\&.
+Reworked the documentation to use the system of 4 quadrants\&.
+Reworked the introduction (How To Use Critcl) to be strongly
+based on a series of examples\&.
+.IP [5]
+\fIBug Fix\fR Issue
+\fI#125\fR [https://github\&.com/andreas-kupries/critcl/issues/125]\&.
+Added missing method \fBcreate\fR in object creation example
+of installer documentation\&.
+.IP [6]
+\fIFeature\fR\&. Extended \fBcproc\fR argument type processing\&. Now able to
+auto-create restricted scalar types\&. I\&.e\&. types derived from \fIint\fR, etc\&. and
+limited in the range of allowed values\&.
+.sp
+Further able to auto-create restricted list types, i\&.e\&. types derived from
+\fIlist\fR and either limited in length, or in the type of the elements, or both\&.
+.IP [7]
+\fIBug Fix / Enhancement\fR Issue
+\fI#118\fR [https://github\&.com/andreas-kupries/critcl/issues/118]\&.  Modified
+\fBcritcl::cproc\fR to accept C syntax for arguments, i\&.e\&.  Trailing comma on
+argument names, leading comma on type names, and lone comma characters\&.
+.IP [8]
+\fIPerformance Fix\fR for \fIcompile & run\fR mode\&.
+Issue \fI#112\fR [https://github\&.com/andreas-kupries/critcl/issues/112]\&.
+.sp
+Moved the command activating more precise code location tracking out of package
+\fBcritcl\fR into package \fBcritcl::app\fR\&.
+.sp
+Because generating packages ahead of time can bear the performance penalty invoked
+by this \fIglobal\fR setting\&.
+.sp
+Arbitrary libraries and applications using critcl dynamically
+(\fIcompile & run\fR) on the other hand likely cannot, and should not\&.
+.IP [9]
+\fIFix\fR
+Issue \fI#109\fR [https://github\&.com/andreas-kupries/critcl/issues/109]\&.
+Ignore \fBclang\fR suffices when computing the target identifier from a
+configuration identifier\&.
+.IP [10]
+\fIFeature\fR\&. Bumped package \fBcritcl::cutil\fR to version 0\&.2\&.1\&.
+Simplified the implementation of macro \fBASSERT\fR by taking the underlying
+\fBTcl_Panic\fR's printf ability into account and added a new macro \fBASSERT_VA\fR
+exporting the same ability to the user\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.18\&.1"
+.IP [1]
+\fIAttention\fR: While the overall version (of the bundle)
+moves to 3\&.1\&.18\&.1 the versions of packages \fBcritcl\fR and
+\fBcritcl::app\fR are \fIunchanged\fR\&.
+.IP [2]
+\fIBugfix\fR Generally removed a number of 8\&.5-isms which
+slipped into 3\&.1\&.18, breaking ability to use it with Tcl 8\&.4\&.
+.IP [3]
+\fIBugfix\fR Corrected broken \fIbuild\&.tcl uninstall\fR\&.
+.IP [4]
+\fIBugfix\fR Package \fBcritcl::class\fR bumped to
+version 1\&.1\&.1\&. Fixed partial template substitution breaking
+compilation of the generated code\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.18"
+.IP [1]
+Feature (Developer support)\&. Merged pull request #96 from
+sebres/main-direct-invoke\&. Enables direct invokation of the
+"\fImain\&.tcl\fR" file for starkits from within a dev checkout,
+i\&.e\&. outside of a starkit, or starpack\&.
+.IP [2]
+Feature\&. Added channel types to the set of builtin argument and
+result types\&. The argument types are for simple channel access,
+access requiring unshared channels, and taking the channel
+fully into the C level, away from Tcl\&. The result type comes in
+variants for newly created channels, known channels, and to
+return taken channels back to Tcl\&. The first will register the
+returned value in the interpreter, the second assumes that it
+already is\&.
+.IP [3]
+Bugfix\&. Issue #96\&. Reworked the documentation around the
+argument type \fBTcl_Interp*\fR to make its special status
+more visible, explain uses, and call it out from result types
+where its use will be necessary or at least useful\&.
+.IP [4]
+Feature\&. Package \fBcritcl::class\fR bumped to version 1\&.1\&.
+Extended with the ability to create a C API for classes, and
+the ability to disable the generation of the Tcl API\&.
+.IP [5]
+Bugfix\&. Merged pull request #99 from pooryorick/master\&. Fixes
+to the target directory calculations done by the install code\&.
+.IP [6]
+Merged pull request #94 from andreas-kupries/documentation\&.
+A larger documentation cleanup\&. The main work was done by
+pooryorick, followed by tweaks done by myself\&.
+.IP [7]
+Extended the test suite with lots of cases based on the
+examples for the various generator packages\&. IOW the new test
+cases replicate/encapsulate the examples and demonstrate that
+the packages used by the examples generate working code\&.
+.IP [8]
+Bugfix\&. Issue #95\&. Changed the field \fBcritcl_bytes\&.s\fR to
+\fBunsigned char*\fR to match Tcl's type\&. Further constified
+the field to make clear that read-only usage is the common case
+for it\&.
+.IP [9]
+Bugfix/Feature\&. Package \fBcritcl::cutil\fR bumped to
+version 0\&.2\&.  Fixed missing inclusion of header "\fIstring\&.h\fR"
+in "\fIcritcl_alloc\&.h\fR", needed for \fBmemcpy\fR in macro
+\fBSTREP\fR\&.  Added macros \fBALLOC_PLUS\fR and \fBSTRDUP\fR\&.
+Moved documentation of \fBSTREP\&.\&.\&.\fR macros into proper place
+(alloc section, not assert)\&.
+.IP [10]
+Merged pull request #83 from apnadkarni/vc-fixes\&.
+Removed deprecated -Gs for MSVC builds, and other Windows fixups\&.
+.IP [11]
+Feature\&. Package \fBcritcl::iassoc\fR bumped to version 1\&.1\&.
+Refactored internals to generate an include header for use by \&.c files\&.
+This now matches what other generator packages do\&.
+The template file is inlined and removed\&.
+.IP [12]
+Merged pull request #82 from gahr/home-symlink
+Modified tests to handle possibility of $HOME a symlink\&.
+.IP [13]
+Merged pull request #81 from gahr/test-not-installed
+Modified test support to find uninstalled critcl packages when
+running tests\&. Handles all but critcl::md5\&.
+.IP [14]
+Merged pull request #85 from snoe925/issue-84
+to fix Issue #84 breaking installation on OSX\&.
+.IP [15]
+Merged pull request #87 from apnadkarni/tea-fixes to fix Issue
+#86, broken -tea option, generating an incomplete package\&.
+.IP [16]
+Feature\&. New package \fBcritcl::callback\fR providing
+C-level functions and data structures to manage callbacks from
+C to Tcl\&.
+.IP [17]
+Feature\&. Package \fBcritcl::literals\fR bumped to version
+1\&.3\&.  Added mode \fB+list\fR enabling the conversion of
+multiple literals into a list of their strings\&.
+.IP [18]
+Feature\&. Package \fBcritcl::enum\fR bumped to version 1\&.1\&.
+Added basic mode handling, supporting \fBtcl\fR (default) and
+\fB+list\fR (extension enabling the conversion of multiple
+enum values into a list of their strings)\&.
+.IP [19]
+Feature\&. Package \fBcritcl::emap\fR bumped to version 1\&.2\&.
+Extended existing mode handling with \fB+list\fR extension
+enabling the conversion of multiple emap values into a list of
+their strings\&.
+.IP [20]
+Feature\&. Extended the set of available types by applying a few
+range restrictions to the scalar types (\fIint\fR,
+\fIlong\fR, \fIwideint\fR, \fIdouble\fR, \fIfloat\fR)\&.
+.sp
+Example: \fIint > 0\fR is now a viable type name\&.
+.sp
+This is actually more limited than the description might
+let you believe\&.
+.sp
+See the package reference for the details\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.17"
+.IP [1]
+Extension: Allow duplicate arg- and result-type definitions if
+they are fully identical\&.
+.IP [2]
+Bugfix\&. The application mishandled the possibility of
+identical-named \fBcritcl::tsource\fRs\&. Possible because
+\fBcritcl::tsource\fRs can be in subdirectories, a structure
+which is \fInot\fR retained in the assembled package, causing
+such files to overwrite each other and at least one lost\&. Fixed
+by adding a serial number to the file names in the assembled
+package\&.
+.IP [3]
+Bugfix in the static scanner which made it loose requirement
+information\&. Further added code to generally cleanup results at
+the end (removal of duplicates, mainly)\&.
+.IP [4]
+Bugfix: Fixed issue #76\&.
+Support installation directories which are not in the \fBauto_path\fR\&.
+Without the patch the installed \fBcritcl\fR will not find its
+own packages and fail\&. Thank you to
+\fISimon Bachmann\fR [https://github\&.com/lupylucke] for the
+report and patch, and then his patience with me to getting to
+actually apply it\&.
+.IP [5]
+Bugfix: Fixed issue #75\&.
+Extended \fBcritcl::include\fR to now take multiple paths\&.
+.IP [6]
+Added new compatibility package \fBlmap84\fR\&.
+.IP [7]
+Fixed typos in various documentation files\&.
+.IP [8]
+Fixed bug introduced by commit 86f415dd30 (3\&.1\&.16 release)\&. The
+separation of \fBcritcl::ccode\fR into user and work layers
+means that location retrieval has to go one more level up to
+find the user location\&.
+.IP [9]
+New supporting package \fBcritcl::cutil\fR\&. Provides common
+C level facilities useful to packages (assertions, tracing,
+memory allocation shorthands)\&.
+.IP [10]
+Modified package \fBcritcl\fR to make use of the new
+tracing facilities to provide tracing of arguments and results
+for \fBcritcl::ccommand\fR and \fBcritcl::cproc\fR invokations\&.
+.IP [11]
+Modified packages \fBcritcl\fR and \fBcritcl::class\fR
+to provide better function names for (class) method tracing\&.
+Bumped package \fBcritcl::class\fR to version 1\&.0\&.7\&.
+.IP [12]
+Extended the support package \fBcritcl::literals\fR with
+limited configurability\&. It is now able to generate code for
+C-level access to the pool without Tcl types (Mode \fBc\fR)\&.
+The previously existing functionality is accesssible under mode
+\fBtcl\fR, which also is the default\&. Both modes can be used
+together\&.
+.IP [13]
+Extended the support package \fBcritcl::emap\fR with
+limited configurability\&. It is now able to generate code for
+C-level access to the mapping without Tcl types
+(Mode \fBc\fR)\&. The previously existing functionality is
+accessible under mode \fBtcl\fR, which also is the
+default\&. Both modes can be used together\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.16"
+.IP [1]
+New feature\&. Extended \fBcritcl::cproc\fR's argument handling
+to allow arbitrary mixing of required and optional arguments\&.
+.IP [2]
+New feature\&.
+\fIPotential Incompatibility\fR\&.
+.sp
+Extended \fBcritcl::cproc\fR's argument handling to treat an
+argument \fBargs\fR as variadic if it is the last argument of
+the procedure\&.
+.IP [3]
+New feature\&. Added two introspection commands,
+\fBcritcl::has-argtype\fR and \fBcritcl::has-resulttype\fR\&.
+These enable a user to test if a specific (named) type
+conversion is implemented or not\&.
+.IP [4]
+Added new result type \fBTcl_Obj*0\fR, with alias
+\fBobject0\fR\&. The difference to \fBTcl_Obj*\fR is in
+the reference counting\&.
+.IP [5]
+Extended the command \fBcritcl::argtypesupport\fR with new
+optional argument through which to explicitly specify the
+identifier for guarding against multiple definitions\&.
+.IP [6]
+Bugfix: Fixed problem with the implementation of issue #54 (See
+3\&.1\&.14)\&. Always create the secondary log file\&. Otherwise
+end-of-log handling may break, unconditionally assuming its
+existence\&.
+.IP [7]
+Bugfix: Fixed problem with the internal change to the hook
+\fBHandleDeclAfterBuild\fR\&. Corrected the forgotten
+\fBcritcl::cconst\fR\&.
+.IP [8]
+Debugging aid: Added comment holding the name of the result
+type when emitting result conversions\&.
+.IP [9]
+Bugfix: Fixed issue #60\&. Unbundled the package directories
+containing multiple packages\&. All directories under "\fIlib/\fR"
+now contain exactly one package\&.
+.IP [10]
+Bugfix: Fixed issue #62, a few \fBdict exists\fR commands
+operating on a fixed string instead of a variable\&.
+.IP [11]
+Bugfix: Fixed issue #56\&. Release builders are reminded to run
+the tests\&.
+.IP [12]
+Bugfix: Fixed issue #55\&. For FreeBSD critcl's platform package
+now identifies the Kernel ABI version\&. Initialization of the
+cache directory now also uses \fBplatform::identify\fR for the
+default path, instead of \fBplatform::generic\fR\&.
+.IP [13]
+Bugfix: Fixed issue #58\&. Simplified the setup and use of
+md5\&. CriTcl now makes use of its own package for md5, using
+itself to built it\&. There is no chicken/egg problem with this
+as the \fB-pkg\fR mode used for this does not use md5\&. That
+is limited to mode \fIcompile & run\fR\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.15"
+.IP [1]
+Fixed version number bogosity with \fB3\&.1\&.14\fR\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.14"
+.IP [1]
+Fixed issue #36\&. Added message to target \fBall\fR of the
+Makefile generated for TEA mode\&. Additionally tweaked other
+parts of the output to be less noisy\&.
+.IP [2]
+Accepted request implied in issue #54\&. Unconditionally save
+the compiler/linker build log into key \fBlog\fR of the
+dictionary returned by \fBcresults\fR, and save a copy of only
+the execution output in the new key \fBexl\fR ("execution
+log")\&.
+.IP [3]
+Fixed issue #53\&. Clarified the documentation of commands
+\fBcritcl::load\fR and \fBcritcl::failed\fR with regard
+to their results and the throwing of errors (does not happen)\&.
+.IP [4]
+Fixed issue #48\&. Modified mode "compile & run" to allow new
+declarations in a file, after it was build, instead of
+erroring out\&. The new decls are build when needed\&. Mode
+"precompile" is unchanged and will continue to trap the
+situation\&.
+.IP [5]
+Fixed issue #52\&. Updated the local Tcl/Tk headers to
+8\&.4\&.20, 8\&.5\&.13, and 8\&.6\&.4\&.
+.IP [6]
+Fixed issue #45\&. New feature command \fBcritcl::cconst\fR\&.
+.IP [7]
+\fBcritcl::util\fR: New command \fBlocate\fR to find a
+file across a set of paths, and report an error when not
+found\&. This is for use in autoconf-like header-searches and
+similar configuration tests\&.
+.IP [8]
+Modified 'AbortWhenCalledAfterBuild' to dump the entire stack
+(info frame!)\&. This should make it easier to determine the
+location of the troubling declaration\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.13"
+.IP [1]
+Merged PR #43\&. Fixed bug loading adjunct Tcl sources\&.
+.IP [2]
+Fixes in documentation and generated code of package
+"critcl::enum"\&. Bumped to version 1\&.0\&.1\&.
+.IP [3]
+Fixes in documentation of package "critcl::bitmap"\&.
+.IP [4]
+New package "critcl::emap"\&. In essence a variant or cross of
+"critcl::bitmap" with behaviour like "critcl::enum"\&.
+.IP [5]
+Merged PR #49\&. Fixed documentation typo\&.
+.IP [6]
+Merged PR #46\&. Fixed documentation typo\&.
+.IP [7]
+Merged PR #47\&. Fixes to test results to match the accumulated
+code changes\&. Also made portable across Tcl versions (varying
+error syntax)\&.
+.IP [8]
+New predefined argument- and result-type "wideint" mapping to
+Tcl_WideInt\&.
+.IP [9]
+New predefined argument-type "bytes" mapping to tuple of
+byte-array data and length\&. Note: The existing "bytearray"
+type (and its aliases) was left untouched, to keep backward
+compatibility\&.
+.IP [10]
+Modified the internal interface between the Tcl shim and C
+function underneath "critcl::cproc" with respect to the
+handling of optional arguments\&.
+An optional argument "X" now induces the use of two C
+arguments, "X" and "has_X"\&.  The new argument "has_X" is of
+boolean (int) type\&. It is set to true when X is set, and set
+to false when X has the default value\&. C code which cares
+about knowing if the argument is default or not is now able to
+check that quickly, without having to code the default value
+inside\&.
+NOTE: This change is visible in the output of the advanced
+commands "argcnames", "argcsignature", "argvardecls",
+and "argconversion"\&.
+.IP [11]
+Fixed issue #50 and documented the availability of variable
+"interp" (type Tcl_Interp*) within "critcl::cinit" C code
+fragments\&.
+Note that while the old, undocumented name of the variable,
+"ip", is still usable, it is deprecated\&. It will be fully
+removed in two releases, i\&.e\&. for release 3\&.1\&.15\&.
+The variable name was changed to be consistent with other code
+environments\&.
+.IP [12]
+Fixed issue #51\&. Disabled the generation of #line directives
+for "critcl::config lines 0" coming from template files, or
+code generated with them before the final value of this
+setting was known\&.
+.IP [13]
+Fixed issue with handling of namespaced package names in
+"critcl::iassoc"\&. Equivalent to a bug in "critcl::class" fixed
+for critcl 3\&.1\&.1, critcl::class 1\&.0\&.1\&.
+Note: "literals", "enum", "emap", and "bitmap" do not require
+a fix as they are all built on top of "iassoc"\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.12"
+.IP [1]
+Fixed issue 42\&. Clear ::errorInfo immediately after startup to
+prevent leakage of irrelevant (caught) errors into our script
+and confusing the usage code\&.
+.IP [2]
+Fixed issue 40\&. Keep the order of libraries, and allow
+duplicates\&. Both are things which are occasionally required for
+proper linking\&.
+.IP [3]
+Extended the utility package \fBcritcl::literals\fR to
+declare a cproc result-type for a pool\&.
+.sp
+Further fixed the generated header to handle multiple inclusion\&.
+.sp
+Bumped version to 1\&.1\&.
+.IP [4]
+Fixed issue with utility package \fBcritcl::bitmap\fR\&.
+.sp
+Fixed the generated header to handle multiple inclusion\&.
+.sp
+Bumped version to 1\&.0\&.1\&.
+.IP [5]
+Created new utility package \fBcritcl::enum\fR for the
+quick and easy setup and use of mappings between C values
+and Tcl strings\&.
+Built on top of \fBcritcl::literals\fR\&.
+.IP [6]
+Added examples demonstrating the use of the utility packages
+\fBcritcl::literals\fR,
+\fBcritcl::bitmap\fR, and
+\fBcritcl::enum\fR
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.11"
+.IP [1]
+Fixed issue #37, via pull request #38, with thanks to
+Jos DeCoster\&. Information was stored into the v::delproc
+and v::clientdata arrays using a different key than when
+retrieving the same information, thus failing the latter\&.
+.IP [2]
+New convenience command \fBcritcl::include\fR for easy
+inclusion of headers and other C files\&.
+.IP [3]
+New command \fBcritcl::make\fR to generate a local header of
+other C files for use by other parts of a package through
+inclusion\&.
+.IP [4]
+New utility package \fBcritcl::literals\fR for quick and
+easy setup of and access to pools of fixed Tcl_Obj* strings\&.
+Built on top of \fBcritcl::iassoc\fR\&.
+.IP [5]
+New utility package \fBcritcl::bitmap\fR for quick and easy
+setup and use of mappings between C bitsets and Tcl lists whose
+string elements represent that set\&.
+Built on top of \fBcritcl::iassoc\fR\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.10"
+.IP [1]
+Fixed code version numbering forgotten with 3\&.1\&.9\&.
+.IP [2]
+Fixed issue #35\&. In package mode (-pkg) the object cache
+directory is unique to the process, thus we do not need
+content-hashing to generate unique file names\&. A simple
+counter is sufficient and much faster\&.
+.sp
+Note that mode "compile & run" is not as blessed and still
+uses content-hasing with md5 to ensure unique file names
+in its per-user object cache\&.
+.IP [3]
+Fixed issue where the \fBccommand\fR forgot to use its body as
+input for the UUID generation\&. Thus ignoring changes to it in
+mode compile & run, and not rebuilding a library for changed
+sources\&. Bug and fix reported by Peter Spjuth\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.9"
+.IP [1]
+Fixed issue #27\&. Added missing platform definitions for
+various alternate linux and OS X targets\&.
+.IP [2]
+Fixed issue #28\&. Added missing -mXX flags for linking at the
+linux-{32,64}-* targets\&.
+.IP [3]
+Fixed issue #29\&. Replaced the use of raw "cheaders"
+information in the processing of "cdefines" with the proper
+include directives derived from it\&.
+.IP [4]
+Fixed the issue behind rejected pull request #30 by Andrew
+Shadura\&. Dynamically extract the stubs variable declarations
+from the Tcl header files and generate matching variable
+definitions for use in the package code\&. The generated code
+will now be always consistent with the headers, even when
+critcl's own copy of them is replaced by system headers\&.
+.IP [5]
+Fixed issue #31\&. Accepted patch by Andrew Shadura, with
+changes (comments), for easier integration of critcl with
+OS package systems, replacing critcl's copies of Tcl headers
+with their own\&.
+.IP [6]
+Fixed issue #32\&. Merged pull request by Andrew Shadura\&.
+Various typos in documentation and comments\&.
+.IP [7]
+Fixed issue #34\&. Handle files starting with a dot better\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.8"
+.IP [1]
+Fixed issue with package indices generated for Tcl 8\&.4\&.
+Join the list of commands with semi-colon, not newline\&.
+.IP [2]
+Fixed issue #26 which brought up use-cases I had forgotten to
+consider while fixing bug #21 (see critcl 3\&.1\&.6)\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.7"
+.IP [1]
+Fixed issue #24\&. Extract and unconditionally display compiler
+warnings found in the build log\&. Prevents users from missing
+warnings which, while not causing the build to fail, may
+still indicate problems\&.
+.IP [2]
+New feature\&. Output hook\&. All non-messaging user output is now
+routed through the command \fBcritcl::print\fR, and users are
+allowed to override it when using the critcl application-as-package\&.
+.IP [3]
+New feature, by Ashok P\&. Nadkarni\&. Platform configurations can
+inherit values from configurations defined before them\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.6"
+.IP [1]
+Fixed issue #21\&. While the multi-definition of the stub-table
+pointer variables was ok with for all the C linkers seen so far
+C++ linkers did not like this at all\&. Reworked the code to
+ensure that this set of variables is generated only once, in
+the wrapper around all the pieces to assemble\&.
+.IP [2]
+Fixed issue #22, the handling of the command identifier
+arguments of \fBcritcl::ccommand\fR, \fBcritcl::cproc\fR, and
+\fBcritcl::cdata\fR\&. We now properly allow any Tcl identifier
+and generate proper internal C identifiers from them\&.
+.sp
+As part of this the signature of command \fBcritcl::name2c\fR
+changed\&. The command now delivers a list of four values instead
+of three\&. The new value was added at the end\&.
+.sp
+Further adapted the implementation of package
+\fBcritcl::class\fR, a user of \fBcritcl::name2c\fR\&.
+This package is now at version 1\&.0\&.6 and requires critcl 3\&.1\&.6
+.sp
+Lastly fixed the mis-handling of option \fB-cname\fR in
+\fBcritcl::ccommand\fR, and \fBcritcl::cproc\fR\&.
+.IP [3]
+Fixed issue #23\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.5"
+.IP [1]
+Fixed issue #19\&. Made the regular expression extracting the
+MSVC version number more general to make it work on german
+language systems\&. This may have to be revisited in the future,
+for other Windows locales\&.
+.IP [2]
+Fixed issue #20\&. Made option -tea work on windows, at least in
+a unix emulation environment like msys/mingw\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.4"
+.IP [1]
+Bugfix in package \fBcritcl::class\fR\&. Generate a dummy
+field in the class structure if the class has no class
+variables\&. Without this change the structure would be empty,
+and a number of compilers are not able to handle such a type\&.
+.IP [2]
+Fixed a typo which broke the win64 configuration\&.
+.IP [3]
+Fixed issue #16, a typo in the documentation of command
+\fBcritcl::class\fR\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.3"
+.IP [1]
+Enhancement\&. In detail:
+.IP [2]
+Added new argument type "pstring", for "Pascal String", a
+counted string, i\&.e\&. a combination of string pointer and string
+length\&.
+.IP [3]
+Added new methods \fBcritcl::argtypesupport\fR and
+\fB::critcl::argsupport\fR to define and use additional
+supporting code for an argument type, here used by "pstring"
+above to define the necessary structure\&.
+.IP [4]
+Semi-bugfixes in the packages \fBcritcl::class\fR and
+\fBcritcl::iassoc\fR\&. Pragmas for the AS meta data scanner
+to ensure that the template files are made part of the package\&.
+Versions bumped to 1\&.0\&.4 and 1\&.0\&.1 respectively\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.2"
+.IP [1]
+Enhancement\&. In detail:
+.IP [2]
+Extended \fBcritcl::cproc\fR to be able to handle optional
+arguments, in a limited way\&. This is automatically available to
+\fBcritcl::class\fR cproc-based methods as well\&.
+.IP [3]
+Bugfix in \fBlassign\fR emulation for Tcl 8\&.4\&.  Properly set
+unused variables to the empty string\&.  Bumped version of
+emulation package \fBlassign84\fR to 1\&.0\&.1\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1\&.1"
+.IP [1]
+Bugfixes all around\&. In detail:
+.IP [2]
+Fixed the generation of wrong#args errors for
+\fBcritcl::cproc\fR and derived code (\fBcritcl::class\fR
+cproc-based methods)\&. Use NULL if there are no arguments, and
+take the offset into account\&.
+.IP [3]
+Fixed the handling of package names by
+\fBcritcl::class\fR\&. Forgot that they may contain namespace
+separators\&. Bumped to version 1\&.0\&.1\&.
+.IP [4]
+Extended a \fBcritcl::class\fR generated error message in
+instance creation for clarity\&. Bumped to version 1\&.0\&.2\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.1"
+.IP [1]
+Added a new higher-level package \fBcritcl::iassoc\fR\&.
+.sp
+This package simplifies the creation of code associating data
+with an interpreter via Tcl's \fBTcl_(Get|Set)AssocData()\fR APIs\&. The
+user can concentrate on his data while all the necessary boilerplate
+C code to support this is generated by the package\&.
+.sp
+This package uses several of the new features which were added
+to the core \fBcritcl\fR package, see below\&.
+.IP [2]
+Added the higher-level package \fBcritcl::class\fR\&.
+.sp
+This package simplifies the creation of C level objects with
+class and instance commands\&. The user can write a class definition
+with class- and instance-variables and -methods similar to a TclOO
+class, with all the necessary boilerplate C code to support this
+generated by the package\&.
+.sp
+This package uses several of the new features which were added
+to the core \fBcritcl\fR package, see below\&.
+.IP [3]
+Extended the API for handling TEApot metadata\&. Added the
+command \fBcritcl::meta?\fR to query the stored information\&. Main use
+currently envisioned is retrieval of the current package's name by
+utility commands, for use in constructed names\&. This particular
+information is always available due to the static scan of the package
+file on execution of the first critcl command\&.
+.sp
+The new packages \fBcritcl::iassoc\fR and
+\fBcritcl::class\fR (see above) are users of this command\&.
+.IP [4]
+Extended the API with a command, \fBcritcl::name2c\fR, exposing
+the process of converting a Tcl name into base name, namespace, and C
+namespace\&. This enables higher-level code generators to generate the same
+type of C identifiers as \fBcritcl\fR itself\&.
+.sp
+The new package \fBcritcl::class\fR (see above) is a user
+of this command\&.
+.IP [5]
+Extended the API with a command, \fBcritcl::source\fR,
+executing critcl commands found in a separate file in the context of
+the current file\&. This enables easier management of larger bodies of
+code as it allows the user to split such up into easier to digest
+smaller chunks without causing the generation of multiple packages\&.
+.IP [6]
+Related to the previous item, extended the API with commands to
+divert collection of generated C code into memory\&. This makes it
+easier to use the commands for embedded C code in higher-level code
+generators\&.
+.sp
+See the section \fBAdvanced: Diversions\fR for details of
+the provided commands\&.
+.sp
+The new package \fBcritcl::class\fR (see above) is a user
+of these facilities\&.
+.IP [7]
+Extended the API with commands helping developers with the
+generation of proper C \fI#line\fR directives\&. This allows
+higher-level code generators to generate and insert their own
+directives, ensuring that compile errors in their code are properly
+attributed\&.
+.sp
+See the section \fBAdvanced: Location management\fR for
+details of the provided commands\&.
+.sp
+The new packages \fBcritcl::iassoc\fR and
+\fBcritcl::class\fR (see above) are users of these facilities\&.
+.IP [8]
+Extended the API with commands giving users the ability to
+define custom argument and result types for \fB::critcl::cproc\fR\&.
+.sp
+See the section \fBCriTcl cproc Type Reference\fR for
+details of the provided commands\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.0\&.7"
+.IP [1]
+Fixed the code generated by \fBcritcl::c++command\fR\&.
+The emitted code handed a non-static string table to
+\fBTcl_GetIndexFromObj\fR, in violation of the contract, which
+requires the table to have a fixed address\&. This was a memory
+smash waiting to happen\&. Thanks to Brian Griffin for alrerting
+us to the general problem\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.0\&.6"
+.IP [1]
+Fixed github issue 10\&. The critcl application now delivers a
+proper exit code (1) on build failure, instead of always
+indicating success (status 0)\&.
+.IP [2]
+Fixed github issue 13\&. Handling of bufferoverflowU\&.lib for
+release builds was inconsistent with handling for debug
+builds\&. It is now identically handled (conditional) by
+both cases\&.
+.IP [3]
+Documentation cleanup, mainly in the installation guide, and
+the README\&.md shown by github
+.PP
+.SH "CHANGES FOR VERSION 3\&.0\&.5"
+.IP [1]
+Fixed bug in the new code for #line pragmas triggered when
+specifying C code without leading whitespace\&.
+.IP [2]
+Extended the documentation to have manpages for the license,
+source retrieval, installer, and developer's guides\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.0\&.4"
+.IP [1]
+Fixed generation of the package's initname when the incoming
+code is read from stdin and has no proper path\&.
+.IP [2]
+Fixed github issue 11\&. Now using /LIBPATH instead of -L
+on Windows (libinclude configuration setting)\&.
+.IP [3]
+Extended critcl to handle -l:path format of -l options\&.
+GNU ld 2\&.22+ handles this by searching for the path as
+is\&. Good when specifying static libraries, as plain -l looks
+for shared libraries in preference over static\&. critcl handles
+it now, as older GNU ld's do not understand it, nor the
+various vendor-specific linkers\&.
+.IP [4]
+Fixed github issue #12\&. CriTcl now determines the version of
+MSVC in use and uses it to switch between various link debug
+options\&. Simplified the handling of bufferoverflowU\&.lib also,
+making use of the same mechanism and collapsing the two
+configurations sections we had back into one\&.
+.IP [5]
+Reworked the insertion of #line pragmas into the generated C
+code to avoid limitations on the line number argument imposed
+by various compilers, and be more accurate\&.
+.IP [6]
+Modified argument processing\&. Option -libdir now also
+implies -L for its argument\&.
+.IP [7]
+Extended handling of option -show (\fBcritcl::showconfig\fR)
+to list the path of the configuration file the data is coming
+from\&. Good for debugging configuration processing\&.
+.IP [8]
+Extended the build script with targets to regenerate the
+embedded documentation, and diagrams, and to generate a
+release\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.0\&.3"
+.IP [1]
+Fixed github issues 5 and 8, for the example build\&.tcl
+scripts\&. Working around a missing variable ::errorInfo\&. It should
+always be present, however there seem to be revisions of Tcl around
+which violate this assumption\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.0\&.2"
+.IP [1]
+Fixed issue in compile-and-run mode where commands put into the
+auto_index are not found by Tcl's [unknown] command\&.
+.IP [2]
+Fixed an array key mismatch breaking usage of client data and
+delete function for procedure\&. Reported by Jos DeCoster, with patch\&.
+.IP [3]
+Implemented a command line option \fB-L\fR, an equivalent of
+option \fB-I\fR, just for library search paths\&.
+.IP [4]
+Fixed github issues 5 and 8\&. Working around a missing variable
+::errorInfo\&. It should always be present, however there seem to be
+revisions of Tcl around which violate this assumption\&.
+.PP
+.SH "CHANGES FOR VERSION 3\&.0\&.1"
+.IP [1]
+Bugfixes all around\&. In detail:
+.IP [2]
+Fixed recording of Tcl version requirements\&. Keep package name
+and version together, unbreaking generated meta data and generated
+package load command\&.
+.IP [3]
+Fixed the build scripts: When installing, or wrapping for TEA,
+generate any missing directories
+.IP [4]
+Modified the build scripts to properly exit the application
+when the window of their GUI is closed through the (X) button\&.
+.IP [5]
+Removed an 8\&.5-ism (open wb) which had slipped into the main
+build script\&.
+.IP [6]
+Modified the example build scripts to separate the output for
+the different examples (and packages) by adding empty lines\&.
+.IP [7]
+stack::c example bugfix: Include API declarations for use in
+the companion files\&.
+.IP [8]
+Extended the documentation: Noted the need for a working
+installation of a C compiler\&.
+.IP [9]
+Extended the Windows target definitions and code to handle the
+manifest files used by modern MS development environments\&. Note that
+this code handles both possibilities, environment using manifests, and
+(old(er)) environments without\&.
+.IP [10]
+Extended the Windows 64bit target definitions and code to
+auto-detect the need for the helper library "bufferoverflowU\&.lib" and
+reconfigure the compile and link commands appropriately\&. We assume
+that the library must be linked when present\&. This should be no harm
+if the library is present, yet not needed\&. Just superfluous\&. We search
+for the library in the paths specified by the environment variable
+LIB\&.
+.PP
+.SH "CHANGES FOR VERSION 3"
+.IP [1]
+The command \fBcritcl::platform\fR was deprecated in version
+2\&.1, superceded by \fBcritcl::targetplatform\fR, yet kept for
+compatibility\&. Now it has been removed\&.
+.IP [2]
+The command \fBcritcl::compiled\fR was kept with in version 2\&.1
+with semantics in contradiction to its, for compatibility\&. This
+contradiction has been removed, changing the visible semantics of the
+command to be in line with its name\&.
+.IP [3]
+The change to version 3 became necessary because of the two
+incompatible visible changes above\&.
+.IP [4]
+Extended the application package with code handling a new
+option \fB-tea\fR\&. Specifying this option invokes a special mode
+where critcl generates a TEA package, i\&.e\&. wraps the input into a
+directory hierarchy and support files which provide it TEA-lookalike
+buildsystem\&.
+.sp
+This new option, and \fB-pkg\fR, exclude each other\&. If
+both are specified the last used option takes precedence\&.
+.sp
+The generated package directory hierarchy is mostly
+self-contained, but not fully\&. It requires not only a working
+installation of Tcl, but also working installations of the packages
+\fBmd5\fR and \fBcmdline\fR\&. Both of these are provided by the
+\fBTcllib\fR bundle\&. Not required, but recommended to have
+installed are any of the packages which can accelerate md5's
+operation, i\&.e\&. \fBcryptkit\fR, \fBtcllibc\fR, or
+\fBTrf\fR\&.
+.IP [5]
+Extended the critcl package with a new command
+\fBcritcl::scan\fR taking the path to a "\fI\&.critcl\fR" file,
+statically scanning it, and returning license, version, a list of its
+companion files, list of imported APIs, and list of
+developer-specified custom configuration options\&. This data is the
+foundation for the TEA wrapping described above\&.
+.sp
+Note that this is a \fIstatic\fR scan\&. While the other build
+modes can (must) execute the "\fI\&.critcl\fR" file and make
+platform-specific decisions regarding the assembled C code, companion
+files, etc\&. the TEA wrap mode is not in a position to make
+platform-specific decisions\&. It has to wrap everything which might
+conceivably be needed when actually building\&. Hence the static scan\&.
+This has however its own set of problems, namely the inability to
+figure out any dynamic construction of companion file paths, at least
+on its own\&. Thus:
+.IP [6]
+Extended the API used by critcl-based packages with the command
+\fBcritcl::owns\fR\&. While this command is ignored by the regular build
+modes the static scanner described above takes its arguments as the
+names of companion files which have to be wrapped into the TEA package
+and could not be figured by the scanner otherwise, like because of
+dynamic paths to \fBcritcl::tsources\fR, \fBcritcl::csources\fR,
+getting sourced directly, or simply being adjunct datafiles\&.
+.IP [7]
+Extended the API used by critcl-based packages with the command
+\fBcritcl::api\fR for the management of stubs tables, be it their use,
+and/or declaration and export\&.
+.sp
+Please see section \fIStubs Table Management\fR of the
+\fBcritcl\fR package documentation for details\&.
+.IP [8]
+Extended the API used by critcl-based packages with the command
+\fBcritcl::userconfig\fR for the management of developer-specified
+custom configuration options, be it their use and/or declaration\&.
+.sp
+Please see section \fICustom Build Configuration\fR of the
+\fBcritcl\fR package documentation for details\&.
+.IP [9]
+Extended the API used by critcl-based packages with the
+commands \fBcritcl::description\fR, \fBcritcl::summary\fR,
+\fBcritcl::subject\fR, \fBcritcl::meta\fR, and
+\fBcritcl::buildrequirement\fR for the declaration of TEApot meta data
+for/about the package\&.
+.sp
+Please see section \fIPackage Meta Data\fR of the
+\fBcritcl\fR package documentation for details\&.
+.PP
+.SH "CHANGES FOR VERSION 2\&.1"
+.IP [1]
+Fixed bug where \fBcritcl::tsources\fR interpreted relative
+paths as relative to the current working directory instead of
+relative to the "\fI\&.critcl\fR" file using the command, as all other
+commands of this type do\&.
+.IP [2]
+Fixed internals, preventing information collected for multiple
+"\fI\&.critcl\fR" files to leak between them\&. Notably, \fBcritcl::tk\fR
+is not a global configuration option anymore\&.
+.IP [3]
+Fixed the command \fBcritcl::license\fR to be a null-operation
+in mode "compile & run", instead of throwing an error\&.
+.IP [4]
+Fixed the critcl application's interference with the "compile &
+run" result cache in \fB-pkg\fR mode by having it use a wholly
+separate (and by default transient) directory for that mode\&.
+.IP [5]
+Fixed bug where changes to a "\fI\&.critcl\fR" file did not result
+in a rebuild for mode "compile & run"\&. All relevant API commands now
+ensure UUID changes\&.
+.IP [6]
+Fixed bug in the backend handling of \fBcritcl::debug\fR where
+the companion c-sources of a "\fI\&.critcl\fR" file were not compiled
+with debug options, although the "\fI\&.critcl\fR" file was\&.
+.IP [7]
+Fixed bug in \fBcritcl::debug\fR which prevented recognition of
+mode "all" when it was not the first argument to the command\&.
+.IP [8]
+Fixed bug in "\fIpreload\&.c\fR" preventing its compilation on
+non-windows platforms\&.
+.IP [9]
+Fixed long-standing bug in the handling of namespace qualifiers
+in the command name argument of \fBcritcl::cproc\fR and
+\fBcritcl::ccommand\fR\&. It is now possible to specify a fully
+qualified command name without issues\&.
+.IP [10]
+Extended/reworked \fBcritcl::tsources\fR to be the canonical
+way of declaring "\fI\&.tcl\fR" companion files even for mode "compile &
+run"\&.
+.IP [11]
+Extended/reworked \fBcritcl::tsources\fR to allow the use of a
+"\fI\&.critcl\fR" file as its own Tcl companion file\&.
+.IP [12]
+Extended \fBcritcl::framework\fR to internally check for OS X
+build target, and to ignore the declaration if its not\&.
+.IP [13]
+Extended \fBcritcl::failed\fR to be callable more than once in
+a "\fI\&.critcl\fR" file\&. The first call forces the build, if it was not
+done already, to get the result\&. Further calls return the cached
+result of the first call\&.
+.IP [14]
+Extended the handling of environment variable CC in the code
+determining the compiler to use to deal with (i\&.e\&. remove) paths to
+the compiler, compiler file extensions, and compiler options specified
+after the compiler itself, leaving only the bare name of the compiler\&.
+.IP [15]
+Extended the code handling the search for preloaded libraries
+to print the paths it searched, making debugging of a search failure
+easier\&.
+.IP [16]
+A new command \fBcritcl::tcl\fR can be used to declare the
+version of Tcl minimally needed to build and run the "\fI\&.critcl\fR"
+file and package\&. Defaults to 8\&.4 if not declared\&. Extended critcl to
+have the stubs and headers for all of Tcl 8\&.4, 8\&.5, and 8\&.6\&.
+.IP [17]
+A new command \fBcritcl::load\fR forces the build and load of a
+"\fI\&.critcl\fR" file\&. This is the official way for overriding critcl's
+default lazy-build-&-load-on-demand scheme for mode "compile & run"\&.
+.sp
+\fINote\fR that after using \fBcritcl::load\fR /
+\fBcritcl::failed\fR in a "\fI\&.critcl\fR" file it is not possible to
+use critcl commands in that file anymore\&. Doing so will throw an
+error\&.
+.IP [18]
+Extended the generation of '#line' pragmas to use
+\fBinfo frame\fR (if available) to provide the C compiler with exact
+line numbers into the "\fI\&.critcl\fR" file for the reporting of
+warnings and errors\&.
+.IP [19]
+Extended \fBcritcl::check\fR with logging to help with
+debugging build-time checks of the environment, plus an additional
+optional argument to provide labeling\&.
+.IP [20]
+Added a new command \fBcritcl::checklink\fR which not only
+tries to check the environment via compiling the code, but also
+its linkability\&.
+.IP [21]
+Added a new command \fBcritcl::msg\fR for messaging, like
+command \fBcritcl::error\fR is for error reporting\&. Likewise this is a
+hook a user of the package is allowed to override\&. The default
+implementation, used by mode \fIcompile & run\fR does nothing\&. The
+implementation for mode \fIgenerate package\fR prints the message
+to stdout\&.
+.sp
+Envisioned use is for the reporting of results determined by
+\fBcritcl::check\fR and \fBcritcl::checklink\fR during building, to
+help with debugging when something goes wrong with a check\&.
+.IP [22]
+Exposed the argument processing internals of \fBcritcl::proc\fR
+for use by advanced users\&. The new commands are
+.RS
+.IP [1]
+\fBcritcl::argnames\fR
+.IP [2]
+\fBcritcl::argcnames\fR
+.IP [3]
+\fBcritcl::argcsignature\fR
+.IP [4]
+\fBcritcl::argvardecls\fR
+.IP [5]
+\fBcritcl::argconversion\fR
+.RE
+.IP
+Please see section \fIAdvanced Embedded C Code\fR of the
+\fBcritcl\fR package documentation for details\&.
+.IP [23]
+Extended the critcl package to intercept \fBpackage
+provide\fR and record the file -> package name mapping\&. Plus other
+internal changes now allow the use of namespaced package names while
+still using proper path names and init function\&.
+.IP [24]
+Dropped the unused commands \fBcritcl::optimize\fR and
+\fBcritcl::include\fR\&.
+.IP [25]
+Dropped \fB-lib\fR mode from the critcl application\&.
+.IP [26]
+Dropped remnants of support for Tcl 8\&.3 and before\&.
+.PP
+.SH AUTHORS
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report them at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR\&.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR as well\&.
+.SH KEYWORDS
+C code, Embedded C Code, calling C code from Tcl, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) Jean-Claude Wippler
+Copyright (c) Steve Landers
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_class.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_class.n
new file mode 100644
index 00000000..882b0bfe
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_class.n
@@ -0,0 +1,978 @@
+'\"
+'\" Generated from file 'critcl_class\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl::class" n 1\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl::class \- CriTcl - Code Gen - C Classes
+.SH SYNOPSIS
+package require \fBTcl  8\&.6\fR
+.sp
+package require \fBcritcl  ?3\&.2?\fR
+.sp
+package require \fBcritcl::class  ?1\&.1?\fR
+.sp
+\fB::critcl::class::define\fR \fIname\fR \fIscript\fR
+.sp
+\fBinclude\fR \fIpath\fR
+.sp
+\fBsupport\fR \fIcode\fR
+.sp
+\fBtype\fR \fIname\fR
+.sp
+\fBclassconstructor\fR \fIbody\fR
+.sp
+\fBclassdestructor\fR \fIbody\fR
+.sp
+\fBconstructor\fR \fIbody\fR ?\fIpostbody\fR?
+.sp
+\fBdestructor\fR \fIbody\fR
+.sp
+\fBclassvariable\fR \fIctype\fR \fIname\fR ?\fIcomment\fR? ?\fIconstructor\fR? ?\fIdestructor\fR?
+.sp
+\fBclassmethod\fR \fIname\fR \fBcommand\fR \fIarguments\fR \fIbody\fR
+.sp
+\fBclassmethod\fR \fIname\fR \fBproc\fR \fIarguments\fR \fIresulttype\fR \fIbody\fR
+.sp
+\fBclassmethod\fR \fIname\fR \fBas\fR \fIfunname\fR ?\fIarg\fR\&.\&.\&.?
+.sp
+\fBinsvariable\fR \fIctype\fR \fIname\fR ?\fIcomment\fR? ?\fIconstructor\fR? ?\fIdestructor\fR?
+.sp
+\fBmethod\fR \fIname\fR \fBcommand\fR \fIarguments\fR \fIbody\fR
+.sp
+\fBmethod\fR \fIname\fR \fBproc\fR \fIarguments\fR \fIresulttype\fR \fIbody\fR
+.sp
+\fBmethod\fR \fIname\fR \fBas\fR \fIfunname\fR ?\fIarg\fR\&.\&.\&.?
+.sp
+\fBmethod_introspection\fR
+.sp
+.BE
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This document is the reference manpage for the \fBcritcl::class\fR
+package\&. This package provides convenience commands for advanced
+functionality built on top of the core\&.
+.PP
+With it a user wishing to create a C level object with class
+and instance commands can concentrate on specifying the class- and
+instance-variables and -methods in a manner similar to a TclOO class,
+while all the necessary boilerplate around it is managed by this
+package\&.
+.PP
+Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code\&.
+.PP
+This package resides in the Core Package Layer of CriTcl\&.
+.PP
+.PS
+.nf
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
+*================*
+|Core Packages   |
+| critcl         |
+| critcl::util   |
+*================*
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  \&.\&.\&.           |
++----------------+
+
+.fi
+.PE
+.PP
+.SH API
+.TP
+\fB::critcl::class::define\fR \fIname\fR \fIscript\fR
+This is the main command to define a new class \fIname\fR, where
+\fIname\fR is the name of the Tcl command representing the class,
+i\&.e\&. the \fIclass command\fR\&. The \fIscript\fR provides the
+specification of the class, i\&.e\&. information about included headers,
+class- and instance variables, class- and instance-methods, etc\&.
+See the section \fBClass Specification API\fR below for the
+detailed list of the available commands and their semantics\&.
+.PP
+.SH "CLASS SPECIFICATION API"
+Here we documents all class specification commands available inside of
+the class definition script argument of \fB::critcl::class::define\fR\&.
+.SS "GENERAL CONFIGURATION"
+.TP
+\fBinclude\fR \fIpath\fR
+This command specifies the path of a header file to include within the
+code generated for the class\&. This is separate from the \fBsupport\fR
+because the generated include directives will be put at the very
+beginning of the generated code\&. This is done to allow the use of the
+imported declarations within the instance type, and elsewhere\&.
+.sp
+Calls to this command are cumulative\&.
+It is of course possible to not use this command at all, for classes
+not making use of external definitions\&.
+.sp
+The result is the empty string\&.
+.TP
+\fBsupport\fR \fIcode\fR
+This command specifies supporting C code, i\&.e\&. any definitions (types,
+functions, etc\&.) needed by the \fIwhole\fR class and not fitting into
+class- and instance-methods\&. The code is embedded at global level,
+outside of any function or other definition\&.
+.sp
+Calls to this command are cumulative\&.
+It is of course possible to not use this command at all, for classes
+not requiring supporting code\&.
+.sp
+The result of the command is the empty string\&.
+.TP
+\fBtype\fR \fIname\fR
+This command specifies the name of an external C type to be used as
+the type of the instance structure\&.
+.sp
+Initialization and release of the structure with the given type
+are the responsibility of the user, through \fBconstructor\fR and
+\fBdestructor\fR code fragments\&.
+.sp
+\fIAttention:\fR Using this command precludes the use of
+regular class- and instance variables\&. It further precludes the use of
+\fBmethod-introspection\fR as well, as this make use of generated
+instance-variables\&.
+.sp
+If class- and/or instance-variable have to be used in
+conjunction with an external C type, simply create and use a class- or
+instance-variable with that type\&.
+.sp
+The result of the command is the empty string\&.
+.PP
+.SS "CLASS LIFETIME MANAGEMENT"
+.TP
+\fBclassconstructor\fR \fIbody\fR
+This command specifies a C code block surrounding the initialization
+of the class variables, i\&.e\&. the fields of the class structure\&.
+\fINote\fR that allocation and release of the class structure itself
+is done by the system andf not the responsibility of the user\&.
+.sp
+For the initialization (and release) of a class variable it is
+recommended to use the \fIconstructor\fR and \fIdestructor\fR
+arguments of the variable's definition (See command
+\fBclassvariable\fR) for this instead of using a separate
+\fBclassconstructor\fR\&.
+.sp
+This is an optional command\&. Using it more than once is allowed
+too and each use will add another C code fragment to use during
+construction\&. I\&.e\&. multiple calls aggregate\&.
+.sp
+The C code blocks of multiple calls (including the constructors
+of classvariable definitions) are executed in order of specification\&.
+.sp
+The result of the command is the empty string\&.
+.sp
+The C code in \fIbody\fR has access to the following
+environment:
+.RS
+.TP
+\fBinterp\fR
+Pointer to the Tcl interpreter (Tcl_Interp*) the
+class structure will be associated with\&. It enables the generation
+of a Tcl error message should construction fail\&.
+.TP
+\fBclass\fR
+Pointer to the class structure to initialize\&.
+.TP
+error
+A C code label the constructor can jump to should it have
+to signal a construction failure\&. It is the responsibility of the
+constructor to release any variables already initialized before
+jumping to this label\&. This also why the 'execution in order of
+specification' is documented and can be relied on\&. It gives us the
+knowledge which other constructors have already been run and
+initialized what other fields\&.
+.RE
+.TP
+\fBclassdestructor\fR \fIbody\fR
+This command specifies a C code block surrounding the release of the
+class variables, i\&.e\&. the fields of the class structure\&.
+\fINote\fR that allocation and release of the class structure itself
+is done by the system and not the responsibility of the user\&.
+.sp
+For the initialization (and release) of a class variable it is
+recommended to use the \fIconstructor\fR and \fIdestructor\fR
+arguments of the variable's definition (See command
+\fBclassvariable\fR) for this instead of using a separate
+\fBclassconstructor\fR\&.
+.sp
+This is an optional command\&. Using it more than once is allowed
+too and each use will add another C code fragment to use during
+construction\&. I\&.e\&. multiple calls aggregate\&.
+.sp
+The C code blocks of multiple calls (including the constructors
+of class variable definitions) are executed in order of specification\&.
+.sp
+The result of the command is the empty string\&.
+.sp
+The C code in \fIbody\fR has access to the same
+environment as the class constructor code blocks\&.
+.PP
+.SS "INSTANCE LIFETIME MANAGEMENT"
+.TP
+\fBconstructor\fR \fIbody\fR ?\fIpostbody\fR?
+This command specifies a C code block surrounding the initialization
+of the instance variables, i\&.e\&. the fields of the instance structure\&.
+\fINote\fR that allocation and release of the instance structure
+itself is done by the system and not the responsibility of the user\&.
+\fIOn the other hand\fR, if an external \fBtype\fR was specified
+for the instance structure, then instance variables are not possible,
+and the system has no knowledge of the type's structure\&. In that case
+it is the responsibility of the \fIbody\fR to allocate and free the
+structure itself too\&.
+.sp
+For the initialization (and release) of an instance variable it
+is recommended to use the \fIconstructor\fR and \fIdestructor\fR
+arguments of the variable's definition (See command \fBinsvariable\fR)
+for this instead of using a separate \fBconstructor\fR\&.
+.sp
+This is an optional command\&. Using it more than once is allowed
+too and each use will add another C code fragment to use during
+construction\&. I\&.e\&. multiple calls aggregate\&.
+.sp
+The C code blocks of multiple calls (including the constructors
+of instance variable definitions) are executed in order of specification\&.
+.sp
+The result of the command is the empty string\&.
+.sp
+The C code in \fIbody\fR has access to the following
+environment:
+.RS
+.TP
+\fBinterp\fR
+Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure will be associated with\&. It enables the generation
+of a Tcl error message should construction fail\&.
+.TP
+\fBinstance\fR
+Pointer to the instance structure to initialize\&.
+.TP
+error
+A C code label the constructor can jump to should it have
+to signal a construction failure\&. It is the responsibility of the
+constructor to release any variables already initialized before
+jumping to this label\&. This also why the 'execution in order of
+specification' is documented and can be relied on\&. It gives us the
+knowledge which other constructors have already been run and
+initialized what other fields\&.
+.RE
+.sp
+The C code in \fIpostbody\fR is responsible for construction
+actions to be done after the primary construction was done and the
+Tcl-level instance command was successfully created\&. It has access to
+a slightly different environment:
+.RS
+.TP
+\fBinterp\fR
+Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure will be associated with\&. It enables the generation
+of a Tcl error message should construction fail\&.
+.TP
+\fBinstance\fR
+Pointer to the instance structure to initialize\&.
+.TP
+\fBcmd\fR
+The Tcl_Command token of the Tcl-level instance
+command\&.
+.TP
+\fBfqn\fR
+The fully qualified name of the instance command,
+stored in a Tcl_Obj*\&.
+.RE
+.TP
+\fBdestructor\fR \fIbody\fR
+This command specifies a C code block surrounding the release of the
+instance variables, i\&.e\&. the fields of the instance structure\&.
+\fINote\fR that allocation and release of the instance structure
+itself is done by the system and not the responsibility of the user\&.
+\fIOn the other hand\fR, if an external \fBtype\fR was specified
+for the instance structure, then instance variables are not possible,
+and the system has no knowledge of the type's structure\&. In that case
+it is the responsibility of the \fIbody\fR to allocate and free the
+structure itself too\&.
+.sp
+For the initialization (and release) of an instance variable it
+is recommended to use the \fIconstructor\fR and \fIdestructor\fR
+arguments of the variable's definition (See command \fBinsvariable\fR)
+for this instead of using a separate \fBconstructor\fR\&.
+.sp
+This is an optional command\&. Using it more than once is allowed
+too and each use will add another C code fragment to use during
+construction\&. I\&.e\&. multiple calls aggregate\&.
+.sp
+The C code blocks of multiple calls (including the constructors
+of instance variable definitions) are executed in order of specification\&.
+.sp
+The result of the command is the empty string\&.
+.sp
+The C code in \fIbody\fR has access to the following
+environment:
+.RS
+.TP
+\fBinstance\fR
+Pointer to the instance structure to release\&.
+.RE
+.PP
+.SS "CLASS VARIABLES AND METHODS"
+.TP
+\fBclassvariable\fR \fIctype\fR \fIname\fR ?\fIcomment\fR? ?\fIconstructor\fR? ?\fIdestructor\fR?
+This command specifies a field in the class structure of the class\&.
+Multiple fields can be specified, and are saved in the order
+specified\&.
+.sp
+\fIAttention:\fR Specification of a class variable precludes
+the use of an external C \fBtype\fR for the instance structure\&.
+.sp
+\fIAttention:\fR Specification of a class variable
+automatically causes the definition of an instance variable named
+\fBclass\fR, pointing to the class structure\&.
+.sp
+Beyond the basic \fIname\fR and C type of the new variable the
+definition may also contain a \fIcomment\fR describing it, and C code
+blocks to initialize and release the variable\&.
+These are effectively local forms of the commands
+\fBclassconstructor\fR and \fBclassdestructor\fR\&. Please read their
+descriptions for details regarding the C environment available to the
+code\&.
+.sp
+The comment, if specified will be embedded into the generated C
+code for easier cross-referencing from generated "\fI\&.c\fR" file to
+class specification\&.
+.TP
+\fBclassmethod\fR \fIname\fR \fBcommand\fR \fIarguments\fR \fIbody\fR
+This command specifies a class method and the C code block
+implementing its functionality\&. This is the first of three forms\&. The
+method is specified like a \fBcritcl::ccommand\fR, with a fixed set of
+C-level arguments\&. The \fIbody\fR has to perform everything
+(i\&.e\&. argument extraction, checking, result return, and of course the
+actual functionality) by itself\&.
+.sp
+For this the \fIbody\fR has access to
+.RS
+.TP
+\fBclass\fR
+Pointer to the class structure\&.
+.TP
+\fBinterp\fR
+Pointer to the Tcl interpreter (Tcl_Interp*) the
+class structure is associated with
+.TP
+\fBobjc\fR
+The number of method arguments\&.
+.TP
+\fBobjv\fR
+The method arguments, as C array of Tcl_Obj pointers\&.
+.RE
+.IP
+The \fIarguments\fR of the definition are only a human readable form
+of the method arguments and syntax and are not used in the C code,
+except as comments put into the generated code\&. Again, it is the
+responsibility of the \fIbody\fR to check the number of arguments,
+extract them, check their types, etc\&.
+.TP
+\fBclassmethod\fR \fIname\fR \fBproc\fR \fIarguments\fR \fIresulttype\fR \fIbody\fR
+This command specifies a class method and the C code block
+implementing its functionality\&.  This is the second of three forms\&. The
+method is specified like a \fBcritcl::cproc\fR\&.
+Contrary to the first variant here the \fIarguments\fR are computer
+readable, expected to be in the same format as the \fIarguments\fR of
+\fBcritcl::cproc\fR\&. The same is true for the \fIresulttype\fR\&.
+The system automatically generates a wrapper doing argument checking
+and conversion, and result conversion, like for \fBcritcl::cproc\fR\&.
+.sp
+The \fIbody\fR has access to
+.RS
+.TP
+\fBclass\fR
+Pointer to the class structure\&.
+.TP
+\fBinterp\fR
+Pointer to the Tcl interpreter (Tcl_Interp*) the
+class structure is associated with
+.TP
+\&.\&.\&.
+All \fIarguments\fR under their specified names and C types
+as per their definition\&.
+.RE
+.TP
+\fBclassmethod\fR \fIname\fR \fBas\fR \fIfunname\fR ?\fIarg\fR\&.\&.\&.?
+This command specifies a class method and the C code block
+implementing its functionality\&. This is the third and last of three
+forms\&.
+.sp
+The class method is implemented by the external function
+\fIfunname\fR, i\&.e\&. a function which is declared outside of the class
+code itself, or in a \fBsupport\fR block\&.
+.sp
+It is assumed that the first four arguments of that function
+represent the parameters
+.RS
+.TP
+\fBclass\fR
+Pointer to the class structure\&.
+.TP
+\fBinterp\fR
+Pointer to the Tcl interpreter (Tcl_Interp*) the
+class structure is associated with
+.TP
+\fBobjc\fR
+The number of method arguments\&.
+.TP
+\fBobjv\fR
+The method arguments, as C array of Tcl_Obj pointers\&.
+.RE
+.IP
+Any additional arguments specified will be added after these and are
+passed into the C code as is, i\&.e\&. are considered to be C expressions\&.
+.PP
+.SS "INSTANCE VARIABLES AND METHODS"
+.TP
+\fBinsvariable\fR \fIctype\fR \fIname\fR ?\fIcomment\fR? ?\fIconstructor\fR? ?\fIdestructor\fR?
+This command specifies a field in the instance structure of the class\&.
+Multiple fields can be specified, and are saved in the order
+specified\&.
+.sp
+\fIAttention:\fR Specification of an instance variable
+precludes the use of an external C \fBtype\fR for the instance
+structure\&.
+.sp
+\fIAttention:\fR Specification of an instance variable
+automatically causes the definition of an instance variable of type
+\fBTcl_Command\fR, and named \fBcmd\fR, holding the token of the
+instance command, and the definition of an instance method named
+\fBdestroy\fR\&. This implicit instance variable is managed by the
+system\&.
+.sp
+Beyond the basic \fIname\fR and C type of the new variable the
+definition may also contain a \fIcomment\fR describing it, and C code
+blocks to initialize and release the variable\&.
+These are effectively local forms of the commands \fBconstructor\fR
+and \fBdestructor\fR\&. Please read their descriptions for details
+regarding the C environment available to the code\&.
+.sp
+The comment, if specified will be embedded into the generated C
+code for easier cross-referencing from generated "\fI\&.c\fR" file to
+class specification\&.
+.TP
+\fBmethod\fR \fIname\fR \fBcommand\fR \fIarguments\fR \fIbody\fR
+This command specifies an instance method and the C code block
+implementing its functionality\&. This is the first of three forms\&. The
+method is specified like a \fBcritcl::ccommand\fR, with a fixed set of
+C-level arguments\&. The \fIbody\fR has to perform everything
+(i\&.e\&. argument extraction, checking, result return, and of course the
+actual functionality) by itself\&.
+.sp
+For this the \fIbody\fR has access to
+.RS
+.TP
+\fBinstance\fR
+Pointer to the instance structure\&.
+.TP
+\fBinterp\fR
+Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure is associated with
+.TP
+\fBobjc\fR
+The number of method arguments\&.
+.TP
+\fBobjv\fR
+The method arguments, as C array of Tcl_Obj pointers\&.
+.RE
+.IP
+The \fIarguments\fR of the definition are only a human readable form
+of the method arguments and syntax and are not used in the C code,
+except as comments put into the generated code\&. Again, it is the
+responsibility of the \fIbody\fR to check the number of arguments,
+extract them, check their types, etc\&.
+.TP
+\fBmethod\fR \fIname\fR \fBproc\fR \fIarguments\fR \fIresulttype\fR \fIbody\fR
+This command specifies an instance method and the C code block
+implementing its functionality\&.  This is the second of three
+forms\&. The method is specified like a \fBcritcl::cproc\fR\&.
+Contrary to the first variant here the \fIarguments\fR are computer
+readable, expected to be in the same format as the \fIarguments\fR of
+\fBcritcl::cproc\fR\&. The same is true for the \fIresulttype\fR\&.
+The system automatically generates a wrapper doing argument checking
+and conversion, and result conversion, like for \fBcritcl::cproc\fR\&.
+.sp
+The \fIbody\fR has access to
+.RS
+.TP
+\fBinstance\fR
+Pointer to the instance structure\&.
+.TP
+\fBinterp\fR
+Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure is associated with
+.TP
+\&.\&.\&.
+All \fIarguments\fR under their specified names and C types
+as per their definition\&.
+.RE
+.TP
+\fBmethod\fR \fIname\fR \fBas\fR \fIfunname\fR ?\fIarg\fR\&.\&.\&.?
+This command specifies an instance method and the C code block
+implementing its functionality\&. This is the third and last of three
+forms\&.
+.sp
+The instance method is implemented by the external function
+\fIfunname\fR, i\&.e\&. a function which is declared outside of the instance
+code itself, or in a \fBsupport\fR block\&.
+.sp
+It is assumed that the first four arguments of that function
+represent the parameters
+.RS
+.TP
+\fBinstance\fR
+Pointer to the instance structure\&.
+.TP
+\fBinterp\fR
+Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure is associated with
+.TP
+\fBobjc\fR
+The number of method arguments\&.
+.TP
+\fBobjv\fR
+The method arguments, as C array of Tcl_Obj pointers\&.
+.RE
+.IP
+Any additional arguments specified will be added after these and are
+passed into the C code as is, i\&.e\&. are considered to be C expressions\&.
+.TP
+\fBmethod_introspection\fR
+This command generates one class- and one instance-method both of
+which will return a list of the instance methods of the class, and
+supporting structures, like the function to compute the information,
+and a class variable caching it\&.
+.sp
+The two methods and the class variable are all named
+\fBmethods\fR\&.
+.PP
+.SS "CONTEXT DEPENDENT INTERACTIONS"
+This section documents the various interactions between the
+specification commands\&. While these are are all documented with the
+individual commands here they are pulled together to see at a glance\&.
+.IP [1]
+If you are using the command \fBtype\fR to specify an external
+C type to use for the instance structure you are subject to
+the following constraints and rules:
+.RS
+.IP [1]
+You cannot define your own instance variables\&.
+.IP [2]
+You cannot define your own class variables\&.
+.IP [3]
+You cannot use \fBmethod_introspection\fR\&.
+.IP [4]
+You have to allocate and release the instance structure on your
+own, through \fBconstructor\fR and \fBdestructor\fR code blocks\&.
+.RE
+.IP [2]
+If you declare class variables you are subject to the
+following constraints and rules:
+.RS
+.IP [1]
+You cannot use \fBtype\fR\&.
+.IP [2]
+The system generates an instance variable \fBclass\fR for
+you, which points from instance to class structure\&. This makes
+you also subject to the rules below, for instance variables\&.
+.RE
+.IP [3]
+If you declare instance variables (possibly automatic, see
+above) you are subject to following constraints and rules:
+.RS
+.IP [1]
+You cannot use \fBtype\fR\&.
+.IP [2]
+The system generates and manages an instance variable
+\fBcmd\fR for you, which holds the Tcl_Command token
+of the instance command\&.
+.IP [3]
+The system generates an instance method \fBdestroy\fR for
+you\&.
+.IP [4]
+The system manages allocation and release of the instance
+structure for you\&. You have to care only about the instance
+variables themselves\&.
+.RE
+.PP
+.SH EXAMPLE
+The example shown below is the specification of queue data structure,
+with most of the method implementations and support code omitted to
+keep the size down\&.
+.PP
+The full implementation can be found in the directory
+"\fIexamples/queue\fR" of the critcl source distribution/repository\&.
+.CS
+
+
+package require Tcl 8\&.6
+package require critcl 3\&.2
+
+critcl::buildrequirement {
+    package require critcl::class ; # DSL, easy spec of Tcl class/object commands\&.
+}
+
+critcl::cheaders util\&.h
+
+critcl::class::define ::queuec {
+    include util\&.h
+
+    insvariable Tcl_Obj* unget {
+	List object unget elements
+    } {
+	instance->unget = Tcl_NewListObj (0,NULL);
+	Tcl_IncrRefCount (instance->unget);
+    } {
+	Tcl_DecrRefCount (instance->unget);
+    }
+
+    insvariable Tcl_Obj* queue {
+	List object holding the main queue
+    } {
+	instance->queue = Tcl_NewListObj (0,NULL);
+	Tcl_IncrRefCount (instance->queue);
+    } {
+	Tcl_DecrRefCount (instance->queue);
+    }
+
+    insvariable Tcl_Obj* append {
+	List object holding new elements
+    } {
+	instance->append = Tcl_NewListObj (0,NULL);
+	Tcl_IncrRefCount (instance->append);
+    } {
+	Tcl_DecrRefCount (instance->append);
+    }
+
+    insvariable int at {
+	Index of next element to return from the main queue
+    } {
+	instance->at = 0;
+    }
+
+    support {\&.\&.\&. queue_peekget, queue_size, etc\&.}
+
+    method clear {} {\&.\&.\&.}
+    method destroy {\&.\&.\&.}
+
+    method get  as queue_peekget 1
+    method peek as queue_peekget 0
+
+    method put {item \&.\&.\&.}
+
+    method size {} {
+	if ((objc != 2)) {
+	    Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	    return TCL_ERROR;
+	}
+
+	Tcl_SetObjResult (interp, Tcl_NewIntObj (queue_size (instance, NULL, NULL, NULL)));
+	return TCL_OK;
+    }
+
+    method unget {item} {\&.\&.\&.}
+}
+
+package provide queuec 1
+
+.CE
+.SH AUTHORS
+Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report such at \fIhttps://github\&.com/andreas-kupries/critcl\fR\&.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation\&.
+.SH KEYWORDS
+C class, C code, C instance, C object, Embedded C Code, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_cproc.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_cproc.n
new file mode 100644
index 00000000..6f98a9df
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_cproc.n
@@ -0,0 +1,1475 @@
+'\"
+'\" Generated from file 'critcl_cproc\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) Jean-Claude Wippler
+'\" Copyright (c) Steve Landers
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl_cproc_types" n 3\&.2\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl_cproc_types \- CriTcl cproc Type Reference
+.SH SYNOPSIS
+package require \fBTcl  8\&.6\fR
+.sp
+package require \fBcritcl  ?3\&.2\&.1?\fR
+.sp
+\fB::critcl::has-resulttype\fR \fIname\fR
+.sp
+\fB::critcl::resulttype\fR \fIname\fR \fIbody\fR ?\fIctype\fR?
+.sp
+\fB::critcl::resulttype\fR \fIname\fR \fB=\fR \fIorigname\fR
+.sp
+\fB::critcl::has-argtype\fR \fIname\fR
+.sp
+\fB::critcl::argtype\fR \fIname\fR \fIbody\fR ?\fIctype\fR? ?\fIctypefun\fR?
+.sp
+\fB::critcl::argtype\fR \fIname\fR \fB=\fR \fIorigname\fR
+.sp
+\fB::critcl::argtypesupport\fR \fIname\fR \fIcode\fR ?\fIguard\fR?
+.sp
+\fB::critcl::argtyperelease\fR \fIname\fR \fIcode\fR
+.sp
+.BE
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This document is a breakout of the descriptions for the predefined argument- and result-types usable
+with the \fBcritcl::cproc\fR command, as detailed in the reference manpage for the \fBcritcl\fR
+package, plus the information on how to extend the predefined set with custom types\&. The breakout
+was made to make this information easier to find (toplevel document vs\&. having to search the large
+main reference)\&.
+.PP
+Its intended audience are developers wishing to write Tcl packages with embedded C code\&.
+.SH "STANDARD ARGUMENT TYPES"
+Before going into the details first a quick overview:
+.CS
+
+
+CriTcl type      | C type         | Tcl type  | Notes
+---------------- | -------------- | --------- | ------------------------------
+Tcl_Interp*      | Tcl_Interp*    | n/a       | \fISpecial\fR, only first
+---------------- | -------------- | --------- | ------------------------------
+Tcl_Obj*         | Tcl_Obj*       | Any       | \fIRead-only\fR
+object           |                |           | Alias of \fBTcl_Obj*\fR above
+list             | critcl_list    | List      | \fIRead-only\fR
+[], [*]          |                |           | Alias of \fBlist\fR above
+---------------- | -------------- | --------- | ------------------------------
+[N]              |                |           | Restricted \fBlist\fR-types\&.
+type[], type[N]  |                |           | Length-limited ([\&.\&.]), expected
+[]type, [N]type  |                |           | element type, or both\&.
+                 |                |           |
+                 |                |           | Element types can be all known argument
+                 |                |           | types, except for any kind of list\&.
+                 |                |           | IOW multi-dimensional lists are not
+                 |                |           | supported\&.
+---------------- | -------------- | --------- | ------------------------------
+char*            | const char*    | Any       | \fIRead-only\fR, \fIstring rep\fR
+pstring          | critcl_pstring | Any       | \fIRead-only\fR
+bytes            | critcl_bytes   | ByteArray | \fIRead-only\fR
+---------------- | -------------- | --------- | ------------------------------
+int              | int            | Int       |
+long             | long           | Long      |
+wideint          | Tcl_WideInt    | WideInt   |
+double           | double         | Double    |
+float            | float          | Double    |
+---------------- | -------------- | --------- | ------------------------------
+X > N            |                |           | For X in \fBint\fR \&.\&.\&. \fBfloat\fR above\&.
+X >= N           |                |           | The C types are as per the base type X\&.
+X < N            |                |           | N, A, B are expected to be constant integer
+X <= N           |                |           | numbers for types \fBint\fR, \fBlong\fR,
+X > A < B        |                |           | and \fBwideint\fR\&. For types \fBdouble\fR
+etc\&.             |                |           | and \fBfloat\fR the N, A, and B can be floating
+                 |                |           | point numbers\&. Multiple restrictions are
+                 |                |           | fused as much as possible to yield at most
+                 |                |           | both upper and lower limits\&.
+---------------- | -------------- | --------- | ------------------------------
+boolean          | int            | Boolean   |
+bool             |                |           | Alias of \fBboolean\fR above
+---------------- | -------------- | --------- | ------------------------------
+channel          | Tcl_Channel    | String    | Assumed to be registered
+unshared-channel | Tcl_Channel    | String    | As above, limited to current interpreter
+take-channel     | Tcl_Channel    | String    | As above, C code takes ownership
+
+.CE
+And now the details:
+.TP
+Tcl_Interp*
+\fIAttention\fR: This is a \fIspecial\fR argument type\&. It can
+\fIonly\fR be used by the \fIfirst\fR argument of a function\&.
+Any other argument using it will cause critcl to throw an error\&.
+.sp
+When used, the argument will contain a reference to the current
+interpreter that the function body may use\&. Furthermore the argument
+will \fInot\fR be an argument of the Tcl command for the function\&.
+.sp
+This is useful when the function has to do more than simply
+returning a value\&. Examples would be setting up error messages on
+failure, or querying the interpreter for variables and other data\&.
+.TP
+Tcl_Obj*
+.TP
+object
+The function takes an argument of type \fBTcl_Obj*\fR\&.
+No argument checking is done\&.
+The Tcl level word is passed to the argument as-is\&.
+Note that this value must be treated as \fIread-only\fR (except for
+hidden changes to its intrep, i\&.e\&. \fIshimmering\fR)\&.
+.TP
+pstring
+The function takes an argument of type \fBcritcl_pstring\fR
+containing the original \fBTcl_Obj*\fR reference of the Tcl argument,
+plus the length of the string and a pointer to the character array\&.
+.CS
+
+
+typedef struct critcl_pstring {
+    Tcl_Obj*    o;
+    const char* s;
+    int         len;
+} critcl_pstring;
+
+.CE
+.IP
+Note the \fIconst\fR\&. The string is \fIread-only\fR\&. Any
+modification can have arbitrary effects, from pulling out the rug
+under the script because of string value and internal representation
+not matching anymore, up to crashes anytime later\&.
+.TP
+list
+.TP
+[]
+.TP
+[*]
+The function takes an argument of type \fBcritcl_list\fR containing the original \fBTcl_Obj*\fR
+reference of the Tcl argument, plus the length of the Tcl list and a pointer to the array of the
+list elements\&.
+.CS
+
+
+typedef struct critcl_list {
+    Tcl_Obj*        o;
+    Tcl_Obj* const* v;
+    int             c;
+} critcl_list;
+
+.CE
+.IP
+The Tcl argument must be convertible to \fBList\fR, an error is thrown otherwise\&.
+.sp
+Note the \fIconst\fR\&. The list is \fIread-only\fR\&.  Any modification can have arbitrary
+effects, from pulling out the rug under the script because of string value and internal
+representation not matching anymore, up to crashes anytime later\&.
+.sp
+Further note that the system understands a number of more complex syntactical forms which all
+translate into forms of lists under the hood, as described by the following points\&.
+.TP
+[N]
+A \fIlist\fR type with additional checks limiting the length to \fBN\fR, an integer
+number greater than zero\&.
+.TP
+[]type
+.TP
+type[]
+A \fIlist\fR type whose elements all have to be convertible for \fItype\fR\&. All known
+types, including user-defined, are allowed, except for \fBlist\fR and derivates\&. In other
+words, multi-dimensional lists are not supported\&.
+.sp
+The function will take a structure argument of the general form
+.CS
+
+
+typedef struct critcl_list_\&.\&.\&. {
+    Tcl_Obj* o;
+    int      c;
+    (Ctype)* v;
+} critcl_list_\&.\&.\&.;
+
+.CE
+.IP
+where \fB(Ctype)\fR represents the C type for values of type \fBtype\fR\&.
+.TP
+[N]type
+.TP
+type[N]
+These are \fBlist\fR types combining the elements of
+.CS
+
+[N]
+.CE
+.IP and
+.CS
+
+[]type
+.CE
+.IP\&.
+.sp
+As an example, the specification of
+.CS
+
+int[3] a
+.CE
+.IP describes argument \fIa\fR
+as a list of exactly 3 elements, all of which have to be of type \fBint\fR\&.
+.sp
+Note that this example can also be written in the more C-like form of
+.CS
+
+int a[3]
+.CE
+.IP\&. The system will translate this internally to the first shown form\&.
+.TP
+bytes
+This is the \fInew\fR and usable \fBByteArray\fR type\&.
+.sp
+The function takes an argument of type \fBcritcl_bytes\fR
+containing the original \fBTcl_Obj*\fR reference of the Tcl argument,
+plus the length of the byte array and a pointer to the byte data\&.
+.CS
+
+
+typedef struct critcl_bytes {
+    Tcl_Obj*             o;
+    const unsigned char* s;
+    int                len;
+} critcl_list;
+
+.CE
+.IP
+The Tcl argument must be convertible to \fBByteArray\fR, an error is
+thrown otherwise\&.
+.sp
+Note the \fIconst\fR\&. The bytes are \fIread-only\fR\&.  Any
+modification can have arbitrary effects, from pulling out the rug
+under the script because of string value and internal representation
+not matching anymore, up to crashes anytime later\&.
+.TP
+char*
+The function takes an argument of type \fBconst char*\fR\&.
+The string representation of the Tcl argument is passed in\&.
+.sp
+Note the \fIconst\fR\&. The string is \fIread-only\fR\&. Any
+modification can have arbitrary effects, from pulling out the rug
+under the script because of string value and internal representation
+not matching anymore, up to crashes anytime later\&.
+.TP
+double
+The function takes an argument of type \fBdouble\fR\&.
+The Tcl argument must be convertible to \fBDouble\fR, an error is thrown otherwise\&.
+.TP
+double > N
+.TP
+double >= N
+.TP
+double < N
+.TP
+double <= N
+These are variants of \fIdouble\fR above, restricting the argument value to the shown relation\&.
+An error is thrown for Tcl arguments outside of the specified range\&.
+.sp
+The limiter \fIN\fR has to be a constant floating point value\&.
+.sp
+It is possible to use multiple limiters\&.
+For example \fIdouble > A > B <= C\fR\&.
+The system will fuse them to a single upper/lower limit (or both)\&.
+.sp
+The system will reject limits describing an empty range of values, or a range containing only
+a single value\&.
+.TP
+float
+The function takes an argument of type \fBfloat\fR\&.
+The Tcl argument must be convertible to \fBDouble\fR, an error is thrown otherwise\&.
+.TP
+float > N
+.TP
+float >= N
+.TP
+float < N
+.TP
+float <= N
+These are variants of \fIfloat\fR above, restricting the argument value to the shown relation\&.
+An error is thrown for Tcl arguments outside of the specified range\&.
+.sp
+The limiter \fIN\fR has to be a constant floating point value\&.
+.sp
+It is possible to use multiple limiters\&.
+For example \fIfloat > A > B <= C\fR\&.
+The system will fuse them to a single upper/lower limit (or both)\&.
+.sp
+The system will reject limits describing an empty range of values, or a range containing only
+a single value\&.
+.TP
+boolean
+.TP
+bool
+The function takes an argument of type \fBint\fR\&.
+The Tcl argument must be convertible to \fBBoolean\fR, an error is
+thrown otherwise\&.
+.TP
+channel
+The function takes an argument of type \fBTcl_Channel\fR\&.
+The Tcl argument must be convertible to type \fBChannel\fR, an error
+is thrown otherwise\&.
+The channel is further assumed to be \fIalready registered\fR
+with the interpreter\&.
+.TP
+unshared-channel
+This type is an extension of \fBchannel\fR above\&.
+All of the information above applies\&.
+.sp
+Beyond that the channel must not be shared by multiple
+interpreters, an error is thrown otherwise\&.
+.TP
+take-channel
+This type is an extension of \fBunshared-channel\fR above\&.
+All of the information above applies\&.
+.sp
+Beyond that the code removes the channel from the current
+interpreter without closing it, and disables all pre-existing event
+handling for it\&.
+.sp
+With this the function takes full ownership of the channel in
+question, taking it away from the interpreter invoking it\&. It is then
+responsible for the lifecycle of the channel, up to and including
+closing it\&.
+.sp
+Should the system the function is a part of wish to return
+control of the channel back to the interpeter it then has to use the
+result type \fBreturn-channel\fR\&. This will undo the registration
+changes made by this argument type\&.
+\fINote\fR however that the removal of pre-existing event handling
+done here cannot be undone\&.
+.sp
+\fIAttention\fR Removal from the interpreter without closing
+the channel is effected by incrementing the channel's reference count
+without providing an interpreter, before decrementing the same for the
+current interpreter\&. This leaves the overall reference count intact
+without causing Tcl to close it when it is removed from the
+interpreter structures\&. At this point the channel is effectively a
+globally-owned part of the system not associated with any interpreter\&.
+.sp
+The complementary result type then runs this sequence in
+reverse\&. And if the channel is never returned to Tcl either the
+function or the system it is a part of have to unregister the global
+reference when they are done with it\&.
+.TP
+int
+The function takes an argument of type \fBint\fR\&.
+The Tcl argument must be convertible to \fBInt\fR, an error is thrown otherwise\&.
+.TP
+int > N
+.TP
+int >= N
+.TP
+int < N
+.TP
+int <= N
+These are variants of \fIint\fR above, restricting the argument value to the shown
+relation\&.
+An error is thrown for Tcl arguments outside of the specified range\&.
+.sp
+The limiter \fIN\fR has to be a constant integer value\&.
+.sp
+It is possible to use multiple limiters\&.
+For example \fIint > A > B <= C\fR\&.
+The system will fuse them to a single upper/lower limit (or both)\&.
+.sp
+The system will reject limits describing an empty range of values, or a range
+containing only a single value\&.
+.TP
+long
+The function takes an argument of type \fBlong int\fR\&.
+The Tcl argument must be convertible to \fBLong\fR, an error is thrown otherwise\&.
+.TP
+long > N
+.TP
+long >= N
+.TP
+long < N
+.TP
+long <= N
+These are variants of \fIlong\fR above, restricting the argument value to the shown
+relation\&.
+An error is thrown for Tcl arguments outside of the specified range\&.
+.sp
+The limiter \fIN\fR has to be a constant integer value\&.
+.sp
+It is possible to use multiple limiters\&.
+For example \fIlong > A > B <= C\fR\&.
+The system will fuse them to a single upper/lower limit (or both)\&.
+.sp
+The system will reject limits describing an empty range of values, or a range
+containing only a single value\&.
+.TP
+wideint
+The function takes an argument of type \fBTcl_WideInt\fR\&.
+The Tcl argument must be convertible to \fBWideInt\fR, an error is thrown otherwise\&.
+.TP
+wideint > N
+.TP
+wideint >= N
+.TP
+wideint < N
+.TP
+wideint <= N
+These are variants of \fIwideint\fR above, restricting the argument value to the shown
+relation\&.
+An error is thrown for Tcl arguments outside of the specified range\&.
+.sp
+The limiter \fIN\fR has to be a constant integer value\&.
+.sp
+It is possible to use multiple limiters\&.
+For example \fIwideint > A > B <= C\fR\&.
+The system will fuse them to a single upper/lower limit (or both)\&.
+.sp
+The system will reject limits describing an empty range of values, or a range
+containing only a single value\&.
+.TP
+void*
+.PP
+.SH "STANDARD RESULT TYPES"
+Before going into the details first a quick overview:
+.CS
+
+
+CriTcl type    | C type         | Tcl type  | Notes
+-------------- | -------------- | --------- | ------------------------------
+void           | n/a            | n/a       | Always OK\&. Body sets result
+ok             | int            | n/a       | Result code\&. Body sets result
+-------------- | -------------- | --------- | ------------------------------
+int            | int            | Int       |
+boolean        |                |           | Alias of \fBint\fR above
+bool           |                |           | Alias of \fBint\fR above
+long           | long           | Long      |
+wideint        | Tcl_WideInt    | WideInt   |
+double         | double         | Double    |
+float          | float          | Double    |
+-------------- | -------------- | --------- | ------------------------------
+char*          | char*          | String    | \fIMakes a copy\fR
+vstring        |                |           | Alias of \fBchar*\fR above
+const char*    | const char*    |           | Behavior of \fBchar*\fR above
+-------------- | -------------- | --------- | ------------------------------
+string         |                | String    | Freeable string set directly
+               |                |           | \fINo copy is made\fR
+dstring        |                |           | Alias of \fBstring\fR above
+-------------- | -------------- | --------- | ------------------------------
+               |                |           | For all below: Null is ERROR
+               |                |           | Body has to set any message
+Tcl_Obj*       | Tcl_Obj*       | Any       | \fIrefcount --\fR
+object         |                |           | Alias of \fBTcl_Obj*\fR above
+Tcl_Obj*0      |                | Any       | \fIrefcount unchanged\fR
+object0        |                |           | Alias of \fBTcl_Obj*0\fR above
+-------------- | -------------- | --------- | ------------------------------
+known-channel  | Tcl_Channel    | String    | Assumes to already be registered
+new-channel    | Tcl_Channel    | String    | New channel, will be registered
+return-channel | Tcl_Channel    | String    | Inversion of take-channel
+
+.CE
+And now the details:
+.TP
+Tcl_Obj*
+.TP
+object
+If the returned \fBTcl_Obj*\fR is \fBNULL\fR, the Tcl return code
+is \fBTCL_ERROR\fR and the function should \fIset an error mesage\fR [https://www\&.tcl-lang\&.org/man/tcl/TclLib/SetResult\&.htm]
+as the interpreter result\&.  Otherwise, the returned \fBTcl_Obj*\fR is
+set as the interpreter result\&.
+.sp
+Note that setting an error message requires the function body
+to have access to the interpreter the function is running in\&. See the
+argument type \fBTcl_Interp*\fR for the details on how to make that
+happen\&.
+.sp
+Note further that the returned \fBTcl_Obj*\fR should have a
+reference count greater than \fB0\fR\&. This is because the converter
+decrements the reference count to release possession after setting the
+interpreter result\&. It assumes that the function incremented the
+reference count of the returned \fBTcl_Obj*\fR\&.
+If a \fBTcl_Obj*\fR with a reference count of \fB0\fR were
+returned, the reference count would become \fB1\fR when set as the
+interpreter result, and immediately thereafter be decremented to
+\fB0\fR again, causing the memory to be freed\&.  The system is then
+likely to crash at some point after the return due to reuse of the
+freed memory\&.
+.TP
+Tcl_Obj*0
+.TP
+object0
+Like \fBTcl_Obj*\fR except that this conversion assumes that the
+returned value has a reference count of \fB0\fR and
+\fIdoes not\fR decrement it\&. Returning a value whose reference
+count is greater than \fB0\fR is therefore likely to cause a memory
+leak\&.
+.sp
+Note that setting an error message requires the function body
+to have access to the interpreter the function is running in\&. See the
+argument type \fBTcl_Interp*\fR for the details on how to make that
+happen\&.
+.TP
+new-channel
+A \fBString\fR Tcl_Obj holding the name of the returned
+\fBTcl_Channel\fR is set as the interpreter result\&.
+The channel is further assumed to be \fInew\fR, and therefore
+registered with the interpreter to make it known\&.
+.TP
+known-channel
+A \fBString\fR Tcl_Obj holding the name of the returned
+\fBTcl_Channel\fR is set as the interpreter result\&.
+The channel is further assumed to be \fIalready registered\fR
+with the interpreter\&.
+.TP
+return-channel
+This type is a variant of \fBnew-channel\fR above\&.
+It varies slightly from it in the registration sequence to be properly
+complementary to the argument type \fBtake-channel\fR\&.
+A \fBString\fR Tcl_Obj holding the name of the returned
+\fBTcl_Channel\fR is set as the interpreter result\&.
+The channel is further assumed to be \fInew\fR, and therefore
+registered with the interpreter to make it known\&.
+.TP
+char*
+.TP
+vstring
+A \fBString\fR Tcl_Obj holding a \fIcopy\fR of the returned
+\fBchar*\fR is set as the interpreter result\&. If the value is
+allocated then the function itself and the extension it is a part of
+are responsible for releasing the memory when the data is not in use
+any longer\&.
+.TP
+const char*
+Like \fBchar*\fR above, except that the returned string is
+\fBconst\fR-qualified\&.
+.TP
+string
+.TP
+dstring
+The returned \fBchar*\fR is directly set as the interpreter result
+\fIwithout making a copy\fR\&.  Therefore it must be dynamically
+allocated via \fBTcl_Alloc\fR\&. Release happens automatically when the
+Interpreter finds that the value is not required any longer\&.
+.TP
+double
+.TP
+float
+The returned \fBdouble\fR or \fBfloat\fR is converted to a \fBDouble\fR
+Tcl_Obj and set as the interpreter result\&.
+.TP
+boolean
+.TP
+bool
+The returned \fBint\fR value is converted to an \fBInt\fR Tcl_Obj and set as
+the interpreter result\&.
+.TP
+int
+The returned \fBint\fR value is converted to an \fBInt\fR Tcl_Obj and set as
+the interpreter result\&.
+.TP
+long
+The returned \fBlong int\fR value is converted to a \fBLong\fR Tcl_Obj and
+set as the interpreter result\&.
+.TP
+wideint
+The returned \fBTcl_WideInt\fR value is converted to a \fBWideInt\fR Tcl_Obj
+and set as the interpreter result\&.
+.TP
+ok
+The returned \fBint\fR value becomes the Tcl return code\&.
+The interpreter result is left untouched and can be set by the
+function if desired\&. Note that doing this requires the function body
+to have access to the interpreter the function is running in\&. See the
+argument type \fBTcl_Interp*\fR for the details on how to make that
+happen\&.
+.TP
+void
+The function does not return a value\&.
+The interpreter result is left untouched and can be set by the function if
+desired\&.
+.PP
+.SH "ADVANCED: ADDING TYPES"
+While the \fBcritcl::cproc\fR command understands the most common C
+types (as per the previous 2 sections), sometimes this is not enough\&.
+.PP
+To get around this limitation the commands in this section
+enable users of \fBcritcl\fR to extend the set of argument and
+result types understood by \fBcritcl::cproc\fR\&. In other words, they
+allow them to define their own, custom, types\&.
+.TP
+\fB::critcl::has-resulttype\fR \fIname\fR
+This command tests if the named result-type is known or not\&.
+It returns a boolean value, \fBtrue\fR if the type is known and
+\fBfalse\fR otherwise\&.
+.TP
+\fB::critcl::resulttype\fR \fIname\fR \fIbody\fR ?\fIctype\fR?
+This command defines the result type \fIname\fR, and associates it
+with the C code doing the conversion (\fIbody\fR) from C to Tcl\&.
+The C return type of the associated function, also the C type of the
+result variable, is \fIctype\fR\&. This type defaults to \fIname\fR if
+it is not specified\&.
+.sp
+If \fIname\fR is already declared an error is thrown\&.
+\fIAttention!\fR The standard result type \fBvoid\fR is special as
+it has no accompanying result variable\&. This cannot be expressed
+by this extension command\&.
+.sp
+The \fIbody\fR's responsibility is the conversion of the
+functions result into a Tcl result and a Tcl status\&. The first has to
+be set into the interpreter we are in, and the second has to be
+returned\&.
+.sp
+The C code of \fIbody\fR is guaranteed to be called last in the
+wrapper around the actual implementation of the \fBcproc\fR in
+question and has access to the following environment:
+.RS
+.TP
+\fBinterp\fR
+A Tcl_Interp* typed C variable referencing the
+interpreter the result has to be stored into\&.
+.TP
+\fBrv\fR
+The C variable holding the result to convert, of type
+\fIctype\fR\&.
+.RE
+.IP
+As examples here are the definitions of two standard result types:
+.CS
+
+
+    resulttype int {
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return TCL_OK;
+    }
+
+    resulttype ok {
+	/* interp result must be set by cproc body */
+	return rv;
+    } int
+
+.CE
+.TP
+\fB::critcl::resulttype\fR \fIname\fR \fB=\fR \fIorigname\fR
+This form of the \fBresulttype\fR command declares \fIname\fR as an
+alias of result type \fIorigname\fR, which has to be defined
+already\&. If this is not the case an error is thrown\&.
+.TP
+\fB::critcl::has-argtype\fR \fIname\fR
+This command tests if the named argument-type is known or not\&.
+It returns a boolean value, \fBtrue\fR if the type is known and
+\fBfalse\fR otherwise\&.
+.TP
+\fB::critcl::argtype\fR \fIname\fR \fIbody\fR ?\fIctype\fR? ?\fIctypefun\fR?
+This command defines the argument type \fIname\fR, and associates it
+with the C code doing the conversion (\fIbody\fR) from Tcl to C\&.
+\fIctype\fR is the C type of the variable to hold the conversion result
+and \fIctypefun\fR is the type of the function argument itself\&.
+Both types default to \fIname\fR if they are the empty string or are not
+provided\&.
+.sp
+If \fIname\fR is already declared an error is thrown\&.
+.sp
+\fIbody\fR is a C code fragment that converts a Tcl_Obj* into a
+C value which is stored in a helper variable in the underlying function\&.
+.sp
+\fIbody\fR is called inside its own code block to isolate local
+variables, and the following items are in scope:
+.RS
+.TP
+\fBinterp\fR
+A variable of type \fBTcl_Interp*\fR which is the
+interpreter the code is running in\&.
+.TP
+\fB@@\fR
+A placeholder for an expression that evaluates to the
+\fBTcl_Obj*\fR to convert\&.
+.TP
+\fB@A\fR
+A placeholder for the name of the variable to store the
+converted argument into\&.
+.RE
+.IP
+As examples, here are the definitions of two standard argument types:
+.CS
+
+
+    argtype int {
+	if (Tcl_GetIntFromObj(interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    }
+
+    argtype float {
+	double t;
+	if (Tcl_GetDoubleFromObj(interp, @@, &t) != TCL_OK) return TCL_ERROR;
+	@A = (float) t;
+    }
+
+.CE
+.TP
+\fB::critcl::argtype\fR \fIname\fR \fB=\fR \fIorigname\fR
+This form of the \fBargtype\fR command declares \fIname\fR as an alias
+of argument type \fIorigname\fR, which has to be defined already\&. If
+this is not the case an error is thrown\&.
+.TP
+\fB::critcl::argtypesupport\fR \fIname\fR \fIcode\fR ?\fIguard\fR?
+This command defines a C code fragment for the already defined
+argument type \fIname\fR which is inserted before all functions
+using that type\&. Its purpose is the definition of any supporting C
+types needed by the argument type\&.
+If the type is used by many functions the system ensures that only the
+first of the multiple insertions of the code fragment is active, and
+the others disabled\&.
+The guard identifier is normally derived from \fIname\fR, but can also
+be set explicitly, via \fIguard\fR\&. This latter allows different
+custom types to share a common support structure without having to
+perform their own guarding\&.
+.TP
+\fB::critcl::argtyperelease\fR \fIname\fR \fIcode\fR
+This command defines a C code fragment for the already defined
+argument type \fIname\fR which is inserted whenever the worker
+function of a \fBcritcl::cproc\fR returns to the shim\&. It is the
+responsibility of this fragment to unconditionally release any
+resources the \fBcritcl::argtype\fR conversion code allocated\&.
+An example of this are the \fIvariadic\fR types for the support of
+the special, variadic \fIargs\fR argument to \fBcritcl::cproc\fR's\&.
+They allocate a C array for the collected arguments which has to be
+released when the worker returns\&. This command defines the C code
+for doing that\&.
+.PP
+.SH EXAMPLES
+The examples shown here have been drawn from the section "Embedding C" in the document about
+\fIUsing CriTcl\fR\&. Please see that document for many more examples\&.
+.SS "A SIMPLE PROCEDURE"
+Starting simple, let us assume that the Tcl code in question is
+something like
+.CS
+
+
+    proc math {x y z} {
+        return [expr {(sin($x)*rand())/$y**log($z)}]
+    }
+
+.CE
+with the expression pretending to be something very complex and
+slow\&. Converting this to C we get:
+.CS
+
+
+    critcl::cproc math {double x double y double z} double {
+        double up   = rand () * sin (x);
+        double down = pow(y, log (z));
+        return up/down;
+    }
+
+.CE
+Notable about this translation:
+.IP [1]
+All the arguments got type information added to them, here
+"double"\&.  Like in C the type precedes the argument name\&. Other
+than that it is pretty much a Tcl dictionary, with keys and
+values swapped\&.
+.IP [2]
+We now also have to declare the type of the result, here
+"double", again\&.
+.IP [3]
+The reference manpage lists all the legal C types supported as
+arguments and results\&.
+.PP
+.PP
+While the above example was based on type \fBdouble\fR for
+both arguments and result we have a number of additional types in the
+same category, i\&.e\&. simple types\&. These are:
+.CS
+
+
+CriTcl type | C type         | Tcl type  | Notes
+----------- | -------------- | --------- | ------------------------------
+bool        |                |           | Alias of \fBboolean\fR below
+boolean     | int            | Boolean   |
+double      | double         | Double    |
+float       | float          | Double    |
+int         | int            | Int       |
+long        | long           | Long      |
+wideint     | Tcl_WideInt    | WideInt   |
+
+.CE
+.PP
+A slightly advanced form of these simple types are a limited
+set of constraints on the argument value\&. Note that \fBbool\fR and
+alias do not support this\&.
+.CS
+
+
+    critcl::cproc sqrt {{double >= 0} x} double {
+        return sqrt(x);
+    }
+
+.CE
+.PP
+In the example above CriTcl's argument handling will reject
+calling the command with a negative number, without ever invoking the
+C code\&.
+.PP
+These constraints are called \fIlimited\fR because only
+\fB0\fR and \fB1\fR can be used as the borders, although all the
+operators \fB<\fR, \fB<=\fR, \fB>\fR, and \fB>=\fR are
+possible\&. It is also not possible to combine restrictions\&.
+.SS "MORE BUILTIN TYPES: STRINGS"
+.PP
+Given that "Everything is a String" is a slogan of Tcl the ability of \fBcproc\fRs
+to receive strings as arguments, and return them as results is quite important\&.
+.PP
+We actually have a variety of builtin string types, all alike, yet different\&.
+.PP
+For arguments we have:
+.CS
+
+
+CriTcl type | C type         | Tcl type  | Notes
+----------- | -------------- | --------- | ------------------------------
+char*       | const char*    | Any       | \fIRead-only\fR, \fIstring rep\fR
+pstring     | critcl_pstring | Any       | \fIRead-only\fR
+bytes       | critcl_bytes   | ByteArray | \fIRead-only\fR
+
+.CE
+In C
+.CS
+
+
+    critcl::cproc takeStrings {
+        char*   cstring
+	pstring pstring
+	bytes   barray
+    } void {
+        printf ("len %d = %s\\n", strlen(cstring), cstring);
+	printf ("len %d = %s\\n", pstring\&.len, pstring\&.s);
+	printf ("len %d = %s\\n", barray\&.len, barray\&.s);
+        return; // void result, no result
+    }
+
+.CE
+Notable about the above:
+.IP [1]
+The \fBcstring\fR is a plain \fBconst char*\fR\&. It \fIpoints directly\fR
+into the \fBTcl_Obj*\fR holding the argument in the script\&.
+.IP [2]
+The \fBpstring\fR is a slight extension to that\&. The value is actually a structure
+containing the string pointer like \fBcstring\fR (field \fB\&.s\fR), the length of the
+string (field \fB\&.len\fR), and a pointer to the \fBTcl_Obj*\fR these came from\&.
+.IP [3]
+The last, \fBbarray\fR is like \fBpstring\fR, however it has ensured that the
+\fBTcl_Obj*\fR is a Tcl ByteArray, i\&.e\&. binary data\&.
+.PP
+.PP
+Treat all of them as \fIRead Only\fR\&. Do not modify ever\&.
+.PP
+On the other side, string results, we have:
+.CS
+
+
+CriTcl type   | C type         | Tcl type  | Notes
+------------- | -------------- | --------- | ------------------------------
+char*         | char*          | String    | \fIMakes a copy\fR
+vstring       |                |           | Alias of \fBchar*\fR above
+const char*   | const char*    |           | Behavior of \fBchar*\fR above
+------------- | -------------- | --------- | ------------------------------
+string        | char*          | String    | Freeable string set directly
+              |                |           | \fINo copy is made\fR
+dstring       |                |           | Alias of \fBstring\fR above
+
+.CE
+.CS
+
+
+    critcl::cproc returnCString {} char* {
+        return "a string";
+    }
+    critcl::cproc returnString {} string {
+        char* str = Tcl_Alloc (200);
+	sprintf (str, "hello world");
+        return str;
+    }
+
+.CE
+Notable about the above:
+.IP [1]
+The type \fBchar*\fR is best used for static strings, or strings in some kind
+fixed buffer\&.
+.sp
+CriTcl's translation layer makes a copy of it for the result of the command\&. While
+it is possible to return heap-allocated strings it is the C code who is responsible for
+freeing such at some point\&. If that is not done they will leak\&.
+.IP [2]
+The type \fBstring\fR on the other hand is exactly for returning strings allocated
+with \fBTcl_Alloc\fR and associates\&.
+.sp
+For these the translation layer makes no copy at all, and sets them directly as the
+result of the command\&. A \fIvery important effect\fR of this is that the ownership of
+the string pointer moves from the function to Tcl\&.
+.sp
+\fITcl\fR will release the allocated memory when it does not need it any
+longer\&. The C code has no say in that\&.
+.PP
+.SS "CUSTOM TYPES, INTRODUCTION"
+When writing bindings to external libraries \fBcritcl::cproc\fR is
+usually the most convenient way of writing the lower layers\&. This is
+however hampered by the fact that critcl on its own only supports a
+few standard (arguably the most import) standard types, whereas the
+functions we wish to bind most certainly will use much more, specific
+to the library's function\&.
+.PP
+The critcl commands \fBargtype\fR, \fBresulttype\fR and their
+adjuncts are provided to help here, by allowing a developer to extend
+critcl's type system with custom conversions\&.
+.PP
+This and the three following sections will demonstrate this,
+from trivial to complex\&.
+.PP
+The most trivial use is to create types which are aliases of
+existing types, standard or other\&. As an alias it simply copies and
+uses the conversion code from the referenced types\&.
+.PP
+Our example is pulled from an incomplete project of mine, a
+binding to \fIJeffrey Kegler\fR's \fIlibmarpa\fR library managing
+Earley parsers\&. Several custom types simply reflect the typedef's done
+by the library, to make the \fBcritcl::cproc\fRs as self-documenting
+as the underlying library functions themselves\&.
+.CS
+
+
+    critcl::argtype Marpa_Symbol_ID     = int
+    critcl::argtype Marpa_Rule_ID       = int
+    critcl::argtype Marpa_Rule_Int      = int
+    critcl::argtype Marpa_Rank          = int
+    critcl::argtype Marpa_Earleme       = int
+    critcl::argtype Marpa_Earley_Set_ID = int
+
+    \&.\&.\&.
+
+    method sym-rank: proc {
+        Marpa_Symbol_ID sym
+        Marpa_Rank      rank
+    } Marpa_Rank {
+        return marpa_g_symbol_rank_set (instance->grammar, sym, rank);
+    }
+
+    \&.\&.\&.
+
+.CE
+.SS "CUSTOM TYPES, SEMI-TRIVIAL"
+A more involved custom argument type would be to map from Tcl strings
+to some internal representation, like an integer code\&.
+.PP
+The first example is taken from the \fBtclyaml\fR package,
+a binding to the \fBlibyaml\fR library\&. In a few places we have to
+map readable names for block styles, scalar styles, etc\&. to the
+internal enumeration\&.
+.CS
+
+
+    critcl::argtype yaml_sequence_style_t {
+        if (!encode_sequence_style (interp, @@, &@A)) return TCL_ERROR;
+    }
+
+    \&.\&.\&.
+
+    critcl::ccode {
+        static const char* ty_block_style_names [] = {
+            "any", "block", "flow", NULL
+        };
+
+        static int
+        encode_sequence_style (Tcl_Interp* interp, Tcl_Obj* style,
+                               yaml_sequence_style_t* estyle)
+        {
+            int value;
+            if (Tcl_GetIndexFromObj (interp, style, ty_block_style_names,
+                                     "sequence style", 0, &value) != TCL_OK) {
+                return 0;
+            }
+            *estyle = value;
+            return 1;
+        }
+    }
+
+    \&.\&.\&.
+
+    method sequence_start proc {
+        pstring anchor
+        pstring tag
+        int implicit
+        yaml_sequence_style_t style
+    } ok {
+        /* Syntax: <instance> seq_start <anchor> <tag> <implicit> <style> */
+        \&.\&.\&.
+    }
+
+    \&.\&.\&.
+
+.CE
+It should be noted that this code precedes the advent of the
+supporting generator package \fBcritcl::emap\fR\&. using the
+generator the definition of the mapping becomes much simpler:
+.CS
+
+
+    critcl::emap::def yaml_sequence_style_t {
+        any   0
+        block 1
+        flow  2
+    }
+
+.CE
+Note that the generator will not only provide the conversions, but
+also define the argument and result types needed for their use by
+\fBcritcl::cproc\fR\&.
+Another example of such a semi-trivial argument type can be found in
+the \fBCRIMP\fR package, which defines a \fBTcl_ObjType\fR for
+\fIimage\fR values\&. This not only provides a basic argument type for
+any image, but also derived types which check that the image has a
+specific format\&. Here we see for the first time non-integer arguments,
+and the need to define the C types used for variables holding the C
+level value, and the type of function parameters (Due to C promotion
+rules we may need different types)\&.
+.CS
+
+
+    critcl::argtype image {
+        if (crimp_get_image_from_obj (interp, @@, &@A) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    } crimp_image* crimp_image*
+
+    \&.\&.\&.
+
+        set map [list <<type>> $type]
+        critcl::argtype image_$type [string map $map {
+            if (crimp_get_image_from_obj (interp, @@, &@A) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            if (@A->itype != crimp_imagetype_find ("crimp::image::<<type>>")) {
+                Tcl_SetObjResult (interp,
+                                  Tcl_NewStringObj ("expected image type <<type>>",
+                                                    -1));
+                return TCL_ERROR;
+            }
+        }] crimp_image* crimp_image*
+
+    \&.\&.\&.
+
+.CE
+.SS "CUSTOM TYPES, SUPPORT STRUCTURES"
+The adjunct command \fBcritcl::argtypesupport\fR is for when the
+conversion needs additional definitions, for example a helper
+structure\&.
+.PP
+An example of this can be found among the standard types of
+critcl itself, the \fBpstring\fR type\&. This type provides the C
+function with not only the string pointer, but also the string length,
+and the \fBTcl_Obj*\fR this data came from\&. As \fBcritcl::cproc\fR's
+calling conventions allow us only one argument for the data of the
+parameter a structure is needed to convey these three pieces of
+information\&.
+.PP
+Thus the argument type is defined as
+.CS
+
+
+    critcl::argtype pstring {
+        @A\&.s = Tcl_GetStringFromObj(@@, &(@A\&.len));
+        @A\&.o = @@;
+    } critcl_pstring critcl_pstring
+
+    critcl::argtypesupport pstring {
+        typedef struct critcl_pstring {
+            Tcl_Obj*    o;
+            const char* s;
+            int         len;
+        } critcl_pstring;
+    }
+
+.CE
+.PP
+In the case of such a structure being large we may wish to
+allocate it on the heap instead of having it taking space on the
+stack\&. If we do that we need another adjunct command,
+\fBcritcl::argtyperelease\fR\&. This command specifies the code required
+to release dynamically allocated resources when the worker function
+returns, before the shim returns to the caller in Tcl\&.
+To keep things simple our example is synthetic, a modification of
+\fBpstring\fR above, to demonstrate the technique\&. An actual, but
+more complex example is the code to support the variadic \fIargs\fR
+argument of \fBcritcl::cproc\fR\&.
+.CS
+
+
+    critcl::argtype pstring {
+        @A = (critcl_pstring*) ckalloc(sizeof(critcl_pstring));
+        @A->s = Tcl_GetStringFromObj(@@, &(@A->len));
+        @A->o = @@;
+    } critcl_pstring* critcl_pstring*
+
+    critcl::argtypesupport pstring {
+        typedef struct critcl_pstring {
+            Tcl_Obj*    o;
+            const char* s;
+            int         len;
+        } critcl_pstring;
+    }
+
+    critcl::argtyperelease pstring {
+        ckfree ((char*)) @A);
+    }
+
+.CE
+Note, the above example shows only the most simple case of an
+allocated argument, with a conversion that cannot fail (namely, string
+retrieval)\&. If the conversion can fail then either the allocation has
+to be defered to happen only on successful conversion, or the
+conversion code has to release the allocated memory itself in the
+failure path, because it will never reach the code defined via
+\fBcritcl::argtyperelease\fR in that case\&.
+.SS "CUSTOM TYPES, RESULTS"
+All of the previous sections dealt with argument conversions,
+i\&.e\&. going from Tcl into C\&.
+Custom result types are for the reverse direction, from C to Tcl\&.
+This is usually easier, as most of the time errors should not be
+possible\&. Supporting structures, or allocating them on the heap are
+not really required and therefore not supported\&.
+.PP
+The example of a result type shown below was pulled from
+\fBKineTcl\fR\&. It is a variant of the builtin result type
+\fBTcl_Obj*\fR, aka \fBobject\fR\&. The builtin conversion assumes
+that the object returned by the function has a refcount of 1 (or
+higher), with the function having held the reference, and releases
+that reference after placing the value into the interp result\&. The
+conversion below on the other hand assumes that the value has a
+refcount of 0 and thus that decrementing it is forbidden, lest it be
+released much to early, and crashing the system\&.
+.CS
+
+
+    critcl::resulttype KTcl_Obj* {
+        if (rv == NULL) { return TCL_ERROR; }
+        Tcl_SetObjResult(interp, rv);
+        /* No refcount adjustment */
+        return TCL_OK;
+    } Tcl_Obj*
+
+.CE
+This type of definition is also found in \fBMarpa\fR and recent
+hacking hacking on \fBCRIMP\fR introduced it there as well\&. Which
+is why this definition became a builtin type starting with version
+3\&.1\&.16, under the names \fBTcl_Obj*0\fR and \fBobject0\fR\&.
+.PP
+Going back to errors and their handling, of course, if a
+function we are wrapping signals them in-band, then the conversion of
+such results has to deal with that\&. This happens for example in
+\fBKineTcl\fR, where we find
+.CS
+
+
+    critcl::resulttype XnStatus {
+        if (rv != XN_STATUS_OK) {
+            Tcl_AppendResult (interp, xnGetStatusString (rv), NULL);
+            return TCL_ERROR;
+        }
+        return TCL_OK;
+    }
+
+    critcl::resulttype XnDepthPixel {
+        if (rv == ((XnDepthPixel) -1)) {
+            Tcl_AppendResult (interp,
+                              "Inheritance error: Not a depth generator",
+                              NULL);
+            return TCL_ERROR;
+        }
+        Tcl_SetObjResult (interp, Tcl_NewIntObj (rv));
+        return TCL_OK;
+    }
+
+.CE
+.SH AUTHORS
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report them at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR\&.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR as well\&.
+.SH KEYWORDS
+C code, Embedded C Code, calling C code from Tcl, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) Jean-Claude Wippler
+Copyright (c) Steve Landers
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_cutil.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_cutil.n
new file mode 100644
index 00000000..cd7c5dd0
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_cutil.n
@@ -0,0 +1,764 @@
+'\"
+'\" Generated from file 'critcl_cutil\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl::cutil" n 0\&.3 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl::cutil \- CriTcl - C-level Utilities
+.SH SYNOPSIS
+package require \fBTcl  8\&.6\fR
+.sp
+package require \fBcritcl  ?3\&.2?\fR
+.sp
+package require \fBcritcl::cutil  ?0\&.3?\fR
+.sp
+\fB::critcl::cutil::alloc\fR
+.sp
+\fB::critcl::cutil::assertions\fR ?\fIenable\fR?
+.sp
+\fB::critcl::cutil::tracer\fR ?\fIenable\fR?
+.sp
+\fBtype* ALLOC (type)\fR
+.sp
+\fBtype* ALLOC_PLUS (type, int n)\fR
+.sp
+\fBtype* NALLOC (type, int n)\fR
+.sp
+\fBtype* REALLOC (type* var, type, int n)\fR
+.sp
+\fBvoid FREE (type* var)\fR
+.sp
+\fBvoid STREP (Tcl_Obj* o, char* s, int len)\fR
+.sp
+\fBvoid STREP_DS (Tcl_Obj* o, Tcl_DString* ds)\fR
+.sp
+\fBvoid STRDUP (varname, char* str)\fR
+.sp
+\fBvoid ASSERT (expression, char* message\fR
+.sp
+\fBvoid ASSERT_BOUNDS (int index, int size)\fR
+.sp
+\fBvoid STOPAFTER(n)\fR
+.sp
+\fBTRACE_ON\fR
+.sp
+\fBTRACE_OFF\fR
+.sp
+\fBTRACE_TAG_ON  (identifier)\fR
+.sp
+\fBTRACE_TAG_OFF (identifier)\fR
+.sp
+\fBvoid TRACE_FUNC\fR
+.sp
+\fBvoid TRACE_TAG_FUNC (tag)\fR
+.sp
+\fBvoid TRACE_FUNC_VOID\fR
+.sp
+\fBvoid TRACE_TAG_FUNC_VOID (tag)\fR
+.sp
+\fBvoid TRACE_RETURN_VOID\fR
+.sp
+\fBvoid TRACE_TAG_RETURN_VOID (tag)\fR
+.sp
+\fBany TRACE_RETURN     (     char* format, any x)\fR
+.sp
+\fBany TRACE_TAG_RETURN (tag, char* format, any x)\fR
+.sp
+\fBvoid TRACE     (     char* format, \&.\&.\&.)\fR
+.sp
+\fBvoid TRACE_TAG (tag, char* format, \&.\&.\&.)\fR
+.sp
+\fBvoid TRACE_HEADER (int indent)\fR
+.sp
+\fBvoid TRACE_TAG_HEADER (tag, int indent)\fR
+.sp
+\fBvoid TRACE_CLOSER\fR
+.sp
+\fBvoid TRACE_TAG_CLOSER (tag)\fR
+.sp
+\fBvoid TRACE_ADD          (const char* format, \&.\&.\&.)\fR
+.sp
+\fBvoid TRACE_TAG_ADD (tag, const char* format, \&.\&.\&.)\fR
+.sp
+\fBvoid TRACE_PUSH_SCOPE (const char* name)\fR
+.sp
+\fBvoid TRACE_PUSH_FUNC\fR
+.sp
+\fBvoid TRACE_PUSH_POP\fR
+.sp
+\fBTRACE_TAG_VAR (tag)\fR
+.sp
+\fBTRACE_RUN (code);\fR
+.sp
+\fBTRACE_DO (code);\fR
+.sp
+\fBTRACE_TAG_DO (tag, code);\fR
+.sp
+.BE
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This document is the reference manpage for the \fBcritcl::cutil\fR
+package\&. This package encapsulates a number of C-level utilites for
+easier writing of memory allocations, assertions, and narrative tracing
+and provides convenience commands to make these utilities accessible
+to critcl projects\&.
+Its intended audience are mainly developers wishing to write Tcl
+packages with embedded C code\&.
+.PP
+This package resides in the Core Package Layer of CriTcl\&.
+.PP
+.PS
+.nf
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
+*================*
+|Core Packages   |
+| critcl         |
+| critcl::util   |
+*================*
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  \&.\&.\&.           |
++----------------+
+
+.fi
+.PE
+.PP
+The reason for this is that the main \fBcritcl\fR package makes
+use of the facilities for narrative tracing when
+\fBcritcl::config trace\fR is set, to instrument commands and
+procedures\&.
+.SH API
+.TP
+\fB::critcl::cutil::alloc\fR
+This command provides a number C-preprocessor macros which make the
+writing of memory allocations for structures and arrays of structures
+easier\&.
+.sp
+When run the header file "\fIcritcl_alloc\&.h\fR" is directly made
+available to the "\fI\&.critcl\fR" file containing the command, and
+becomes available for use in \fB#include\fR directives of companion
+C code declared via \fBcritcl::csources\fR\&.
+.sp
+The macros definitions and their signatures are:
+.CS
+
+
+    type* ALLOC (type)
+    type* ALLOC_PLUS (type, int n)
+    type* NALLOC (type, int n)
+    type* REALLOC (type* var, type, int n)
+    void  FREE (type* var)
+
+    void STREP    (Tcl_Obj* o, char* s, int len);
+    void STREP_DS (Tcl_Obj* o, Tcl_DString* ds);
+    void STRDUP   (varname, char* str);
+
+.CE
+.sp
+The details of the semantics are explained in section
+\fBAllocation\fR\&.
+.sp
+The result of the command is an empty string\&.
+.TP
+\fB::critcl::cutil::assertions\fR ?\fIenable\fR?
+This command provides a number C-preprocessor macros for the writing
+of assertions in C code\&.
+.sp
+When invoked the header file "\fIcritcl_assert\&.h\fR" is directly
+made available to the "\fI\&.critcl\fR" file containing the command, and
+becomes available for use in \fB#include\fR directives of companion
+C code declared via \fBcritcl::csources\fR\&.
+.sp
+The macro definitions and their signatures are
+.CS
+
+
+    void ASSERT (expression, char* message);
+    void ASSERT_BOUNDS (int index, int size);
+
+    void STOPAFTER (int n);
+
+.CE
+.sp
+Note that these definitions are conditional on the existence of
+the macro \fBCRITCL_ASSERT\fR\&.
+Without a \fBcritcl::cflags -DCRITCL_ASSERT\fR all assertions in the
+C code are quiescent and not compiled into the object file\&. In other
+words, assertions can be (de)activated at will during build time, as
+needed by the user\&.
+.sp
+For convenience this is controlled by \fIenable\fR\&. By default
+(\fBfalse\fR) the facility available, but not active\&.
+Using \fBtrue\fR not only makes it available, but activates it as
+well\&.
+.sp
+The details of the semantics are explained in section
+\fBAssertions\fR\&.
+.sp
+The result of the command is an empty string\&.
+.TP
+\fB::critcl::cutil::tracer\fR ?\fIenable\fR?
+This command provides a number C-preprocessor macros for tracing
+C-level internals\&.
+.sp
+When invoked the header file "\fIcritcl_trace\&.h\fR" is directly
+made available to the "\fI\&.critcl\fR" file containing the command, and
+becomes available for use in \fB#include\fR directives of companion
+C code declared via \fBcritcl::csources\fR\&. Furthermore the "\fI\&.c\fR"
+file containing the runtime support is added to the set of C companion
+files
+.sp
+The macro definitions and their signatures are
+.CS
+
+
+    /* (de)activation of named logical streams\&.
+     * These are declarators, not statements\&.
+     */
+
+    TRACE_ON;
+    TRACE_OFF;
+    TRACE_TAG_ON  (tag_identifier);
+    TRACE_TAG_OFF (tag_identifier);
+
+    /*
+     * Higher level trace statements (convenience commands)
+     */
+
+    void TRACE_FUNC   (const char* format, \&.\&.\&.);
+    void TRACE_FUNC_VOID;
+    any  TRACE_RETURN (const char* format, any x);
+    void TRACE_RETURN_VOID;
+    void TRACE (const char* format, \&.\&.\&.);
+
+    /*
+     * Low-level trace statements the higher level ones above
+     * are composed from\&. Scope management and output management\&.
+     */
+
+    void TRACE_PUSH_SCOPE (const char* scope);
+    void TRACE_PUSH_FUNC;
+    void TRACE_POP;
+
+    void TRACE_HEADER (int indent);
+    void TRACE_ADD (const char* format, \&.\&.\&.);
+    void TRACE_CLOSER;
+
+    /*
+     * Convert tag to the underlying status variable\&.
+     */
+
+    TRACE_TAG_VAR (tag)
+
+    /*
+     * Conditional use of arbitrary code\&.
+     */
+
+    TRACE_RUN (code);
+    TRACE_DO (code);
+    TRACE_TAG_DO (code);
+
+.CE
+.sp
+Note that these definitions are conditional on the existence of
+the macro \fBCRITCL_TRACER\fR\&.
+Without a \fBcritcl::cflags -DCRITCL_TRACER\fR all trace
+functionality in the C code is quiescent and not compiled into the
+object file\&. In other words, tracing can be (de)activated at will
+during build time, as needed by the user\&.
+.sp
+For convenience this is controlled by \fIenable\fR\&. By default
+(\fBfalse\fR) the facility available, but not active\&.
+Using \fBtrue\fR not only makes it available, but activates it as
+well\&.
+Further note that the command \fBcritcl::config\fR now accepts a
+boolean option \fBtrace\fR\&. Setting it activates enter/exit tracing
+in all commands based on \fBcritcl::cproc\fR, with proper printing of
+arguments and results\&. This implicitly activates the tracing facility
+in general\&.
+.sp
+The details of the semantics are explained in section
+\fBTracing\fR
+.sp
+The result of the command is an empty string\&.
+.PP
+.SH ALLOCATION
+.TP
+\fBtype* ALLOC (type)\fR
+This macro allocates a single element of the given \fItype\fR and
+returns a pointer to that memory\&.
+.TP
+\fBtype* ALLOC_PLUS (type, int n)\fR
+This macro allocates a single element of the given \fItype\fR, plus an
+additional \fIn\fR bytes after the structure and returns a pointer to
+that memory\&.
+.sp
+This is for variable-sized structures of\&. An example of such
+could be a generic list element structure which stores management
+information in the structure itself, and the value/payload immediately
+after, in the same memory block\&.
+.TP
+\fBtype* NALLOC (type, int n)\fR
+This macro allocates \fIn\fR elements of the given \fItype\fR and
+returns a pointer to that memory\&.
+.TP
+\fBtype* REALLOC (type* var, type, int n)\fR
+This macro expands or shrinks the memory associated with the C
+variable \fIvar\fR of type \fItype\fR to hold \fIn\fR elements of the
+type\&. It returns a pointer to that memory\&.
+Remember, a reallocation may move the data to a new location in memory
+to satisfy the request\&. Returning a pointer instead of immediately
+assigning it to the \fIvar\fR allows the user to validate the new
+pointer before trying to use it\&.
+.TP
+\fBvoid FREE (type* var)\fR
+This macro releases the memory referenced by the pointer variable
+\fIvar\fR\&.
+.TP
+\fBvoid STREP (Tcl_Obj* o, char* s, int len)\fR
+This macro properly sets the string representation of the Tcl object
+\fIo\fR to a copy of the string \fIs\fR, expected to be of length
+\fIlen\fR\&.
+.TP
+\fBvoid STREP_DS (Tcl_Obj* o, Tcl_DString* ds)\fR
+This macro properly sets the string representation of the Tcl object
+\fIo\fR to a copy of the string held by the \fBDString\fR \fIds\fR\&.
+.TP
+\fBvoid STRDUP (varname, char* str)\fR
+This macro duplicates the string \fIstr\fR into the heap and stores
+the result into the named \fBchar*\fR variable \fIvar\fR\&.
+.PP
+.SH ASSERTIONS
+.TP
+\fBvoid ASSERT (expression, char* message\fR
+This macro tests the \fIexpression\fR and panics if it does not hold\&.
+The specified \fImessage\fR is used as part of the panic\&.
+The \fImessage\fR has to be a static string, it cannot be a variable\&.
+.TP
+\fBvoid ASSERT_BOUNDS (int index, int size)\fR
+This macro ensures that the \fIindex\fR is in the
+range \fB0\fR to \fBsize-1\fR\&.
+.TP
+\fBvoid STOPAFTER(n)\fR
+This macro throws a panic after it is called \fIn\fR times\&.
+Note, each separate instance of the macro has its own counter\&.
+.PP
+.SH TRACING
+All output is printed to \fBstdout\fR\&.
+.TP
+\fBTRACE_ON\fR
+.TP
+\fBTRACE_OFF\fR
+.TP
+\fBTRACE_TAG_ON  (identifier)\fR
+.TP
+\fBTRACE_TAG_OFF (identifier)\fR
+These "commands" are actually declarators, for use outside of
+functions\&. They (de)activate specific logical streams, named either
+explicitly by the user, or implicitly, refering to the current file\&.
+.sp
+For example:
+.sp
+.CS
+
+
+    TRACE_TAG_ON (lexer_in);
+
+.CE
+.sp
+All high- and low-level trace commands producing output have
+the controlling tag as an implicit argument\&. The scope management
+commands do not take tags\&.
+.TP
+\fBvoid TRACE_FUNC\fR
+.TP
+\fBvoid TRACE_TAG_FUNC (tag)\fR
+.TP
+\fBvoid TRACE_FUNC_VOID\fR
+.TP
+\fBvoid TRACE_TAG_FUNC_VOID (tag)\fR
+Use these macros at the beginning of a C function to record entry into
+it\&. The name of the entered function is an implicit argument
+(\fB__func__\fR), forcing users to have a C99 compiler\&.\&.
+.sp
+The tracer's runtime maintains a stack of active functions and
+expects that function return is signaled by either \fBTRACE_RETURN\fR,
+\fBTRACE_RETURN_VOID\fR, or the equivalent forms taking a tag\&.
+.TP
+\fBvoid TRACE_RETURN_VOID\fR
+.TP
+\fBvoid TRACE_TAG_RETURN_VOID (tag)\fR
+Use these macros instead of
+.CS
+
+return
+.CE
+.IP to return from a void
+function\&. Beyond returning from the function this also signals the
+same to the tracer's runtime, popping the last entered function from
+its stack of active functions\&.
+.TP
+\fBany TRACE_RETURN     (     char* format, any x)\fR
+.TP
+\fBany TRACE_TAG_RETURN (tag, char* format, any x)\fR
+Use this macro instead of
+.CS
+
+return x
+.CE
+.IP to return from a
+non-void function\&.
+Beyond returning from the function with value \fIx\fR this also
+signals the same to the tracer's runtime, popping the last entered
+function from its stack of active functions\&.
+The \fIformat\fR is expected to be a proper formatting string for
+\fBprintf\fR and analogues, able to stringify \fIx\fR\&.
+.TP
+\fBvoid TRACE     (     char* format, \&.\&.\&.)\fR
+.TP
+\fBvoid TRACE_TAG (tag, char* format, \&.\&.\&.)\fR
+This macro is the trace facilities' equivalent of \fBprintf\fR,
+printing arbitrary data under the control of the \fIformat\fR\&.
+.sp
+The printed text is closed with a newline, and indented as per
+the stack of active functions\&.
+.TP
+\fBvoid TRACE_HEADER (int indent)\fR
+.TP
+\fBvoid TRACE_TAG_HEADER (tag, int indent)\fR
+This is the low-level macro which prints the beginning of a trace
+line\&. This prefix consists of physical location (file name and line
+number), if available, indentation as per the stack of active scopes
+(if activated), and the name of the active scope\&.
+.TP
+\fBvoid TRACE_CLOSER\fR
+.TP
+\fBvoid TRACE_TAG_CLOSER (tag)\fR
+This is the low-level macro which prints the end of a trace
+line\&.
+.TP
+\fBvoid TRACE_ADD          (const char* format, \&.\&.\&.)\fR
+.TP
+\fBvoid TRACE_TAG_ADD (tag, const char* format, \&.\&.\&.)\fR
+This is the low-level macro which adds formatted data to the line\&.
+.TP
+\fBvoid TRACE_PUSH_SCOPE (const char* name)\fR
+.TP
+\fBvoid TRACE_PUSH_FUNC\fR
+.TP
+\fBvoid TRACE_PUSH_POP\fR
+These are the low-level macros for scope management\&. The first two
+forms push a new scope on the stack of active scopes, and the last
+forms pops the last scope pushed\&.
+.TP
+\fBTRACE_TAG_VAR (tag)\fR
+Helper macro converting from a tag identifier to the name of the
+underlying status variable\&.
+.TP
+\fBTRACE_RUN (code);\fR
+Conditionally insert the \fIcode\fR at compile time when the tracing
+facility is activated\&.
+.TP
+\fBTRACE_DO (code);\fR
+.TP
+\fBTRACE_TAG_DO (tag, code);\fR
+Insert the \fIcode\fR at compile time when the tracing facility is
+activated, and execute the same when either the implicit tag for the
+file or the user-specified tag is active\&.
+.PP
+.SH AUTHORS
+Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report such at \fIhttps://github\&.com/andreas-kupries/critcl\fR\&.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation\&.
+.SH KEYWORDS
+C code, Embedded C Code, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_devguide.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_devguide.n
new file mode 100644
index 00000000..ee0be4f3
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_devguide.n
@@ -0,0 +1,585 @@
+'\"
+'\" Generated from file 'critcl_devguide\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) Jean-Claude Wippler
+'\" Copyright (c) Steve Landers
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl_devguide" n 3\&.2\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl_devguide \- Guide To The CriTcl Internals
+.SH DESCRIPTION
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.SH AUDIENCE
+.PP
+This document is a guide for developers working on CriTcl, i\&.e\&. maintainers fixing
+bugs, extending the package's functionality, etc\&.
+.PP
+Please read
+.IP [1]
+\fICriTcl - License\fR,
+.IP [2]
+\fICriTcl - How To Get The Sources\fR, and
+.IP [3]
+\fICriTcl - The Installer's Guide\fR
+.PP
+first, if that was not done already\&.
+.PP
+Here we assume that the sources are already available in a directory of the readers
+choice, and that the reader not only know how to build and install them, but also has all
+the necessary requisites to actually do so\&. The guide to the sources in particular also
+explains which source code management system is used, where to find it, how to set it up,
+etc\&.
+.SH "PLAYING WITH CRITCL"
+.PP
+\fINote\fR that the sources of CriTcl, should the reader have gotten them, also
+contain several examples show-casing various aspects of the system\&. These demonstration
+packages can all be found in the sub-directory "\fIexamples/\fR" of the sources\&.
+.PP
+Lots of smaller examples can be found in the document
+\fIUsing CriTcl\fR, an introduction to CriTcl by way of a of
+examples\&. These focus more on specific critcl commands than the
+overall picture shown by the large examples mentioned in the previous
+paragraph\&.
+.SH "DEVELOPING FOR CRITCL"
+.SS "ARCHITECTURE & CONCEPTS"
+The system consists of two main layers, as seen in the figure below,
+plus a support layer containing general packages the system uses during
+operation\&.
+.PP
+.PS
+.nf
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
++----------------+
+|Core Packages   |
+| critcl         |
+| critcl::util   |
++----------------+
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  \&.\&.\&.           |
++----------------+
+
+.fi
+.PE
+.PP
+.IP [1]
+At the top we have an application built on top of the core packages,
+providing command line access to the second and third usage modes,
+i\&.e\&. \fIGenerate Package\fR and \fIGenerate TEA Package\fR\&.
+.RS
+.TP
+\fBcritcl\fR
+.TP
+\fBcritcl::app\fR
+.RE
+.IP [2]
+Below that is the core package providing the essential functionality
+of the system, plus various utility packages which make common tasks
+more convenient\&.
+.RS
+.TP
+\fBcritcl\fR
+.TP
+\fBcritcl::util\fR
+.RE
+.IP [3]
+Lastly a layer of supporting packages, mostly external to critcl\&.
+.RS
+.TP
+\fBmd5\fR
+For this pure-Tcl package to be fast users should get one of several
+possible accelerator packages:
+.RS
+.IP [1]
+\fBtcllibc\fR
+.IP [2]
+\fBTrf\fR
+.IP [3]
+\fBmd5c\fR
+.RE
+.TP
+\fBcmdline\fR
+.TP
+\fBplatform\fR
+.TP
+\fBstubs::container\fR
+.TP
+\fBstubs::reader\fR
+.TP
+\fBstubs::writer\fR
+.TP
+\fBstubs::gen\fR
+.TP
+\fBstubs::gen::init\fR
+.TP
+\fBstubs::gen::header\fR
+.TP
+\fBstubs::gen::decl\fR
+.TP
+\fBstubs::gen::macro\fR
+.TP
+\fBstubs::gen::slot\fR
+.TP
+\fBstubs::gen::lib\fR
+.RE
+.PP
+.SS REQUIREMENTS
+To develop for critcl the following packages and applications must be available in the
+environment\&. These are all used by the \fBbuild\&.tcl\fR helper application\&.
+.TP
+\fBdtplite\fR
+A Tcl application provided by Tcllib, for the validation and conversion of
+\fIdoctools\fR-formatted text\&.
+.TP
+\fBdia\fR
+A Tcl application provided by Tklib, for the validation and conversion
+of \fBdiagram\fR-formatted figures into raster images\&.
+.sp
+Do not confuse this with the Gnome \fBdia\fR application, which is a graphical
+editor for figures and diagrams, and completely unrelated\&.
+.TP
+\fBfileutil\fR
+A Tcl package provided by Tcllib, providing file system utilities\&.
+.TP
+\fBvfs::mk4\fR, \fBvfs\fR
+Tcl packages written in C providing access to Tcl's VFS facilities, required for the
+generation of critcl starkits and starpacks\&.
+.PP
+.SS "DIRECTORY STRUCTURE"
+.TP
+Helpers
+.RS
+.TP
+"\fIbuild\&.tcl\fR"
+This helper application provides various operations needed by a developer for critcl, like
+regenerating the documentation, the figures, building and installing critcl, etc\&.
+.sp
+Running the command like
+.CS
+
+
+	\&./build\&.tcl help
+
+.CE
+.IP
+will provide more details about the available operations and their arguments\&.
+.RE
+.TP
+Documentation
+.RS
+.TP
+"\fIdoc/\fR"
+This directory contains the documentation sources, for both the text, and the figures\&.
+The texts are written in \fIdoctools\fR format, whereas the figures are written for
+tklib's \fBdia\fR(gram) package and application\&.
+.TP
+"\fIembedded/\fR"
+This directory contains the documentation converted to regular manpages (nroff) and HTML\&.
+It is called embedded because these files, while derived, are part of the git repository,
+i\&.e\&. embedded into it\&. This enables us to place these files where they are visible when
+serving the prject's web interface\&.
+.RE
+.TP
+Testsuite
+.RS
+.TP
+"\fItest/all\&.tcl\fR"
+.TP
+"\fItest/testutilities\&.tcl\fR"
+.TP
+"\fItest/*\&.test\fR"
+These files are a standard testsuite based on Tcl's \fBtcltest\fR package, with some
+utility code snarfed from \fBTcllib\fR\&.
+.sp
+This currently tests only some of the \fBstubs::*\fR packages\&.
+.TP
+"\fItest/*\&.tcl\fR"
+These files (except for "\fIall\&.tcl\fR" and "\fItestutilities\&.tcl\fR") are example files
+(Tcl with embedded C) which can be run through critcl for testing\&.
+.sp
+\fITODO\fR for a maintainers: These should be converted into a proper test suite\&.
+.RE
+.TP
+Package Code, General structure
+.RS
+.RE
+.TP
+Package Code, Per Package
+.RS
+.TP
+\fBcritcl\fR
+.RS
+.TP
+"\fIlib/critcl/critcl\&.tcl\fR"
+The Tcl code implementing the package\&.
+.TP
+"\fIlib/critcl/Config\fR"
+The configuration file for the standard targets and their settings\&.
+.TP
+"\fIlib/critcl/critcl_c/\fR"
+Various C code snippets used by the package\&.
+This directory also contains the copies of the Tcl header files used to compile the
+assembled C code, for the major brnaches of Tcl, i\&.e\&. 8\&.4, 8\&.5, and 8\&.6\&.
+.RE
+.TP
+\fBcritcl::util\fR
+.RS
+.TP
+"\fIlib/critcl-util/util\&.tcl\fR"
+The Tcl code implementing the package\&.
+.RE
+.TP
+\fBcritcl::app\fR
+.RS
+.TP
+"\fIlib/app-critcl/critcl\&.tcl\fR"
+The Tcl code implementing the package\&.
+.RE
+.TP
+\fBcritcl::iassoc\fR
+.RS
+.TP
+"\fIlib/critcl-iassoc/iassoc\&.tcl\fR"
+The Tcl code implementing the package\&.
+.TP
+"\fIlib/critcl-iassoc/iassoc\&.h\fR"
+C code template used by the package\&.
+.RE
+.TP
+\fBcritcl::class\fR
+.RS
+.TP
+"\fIlib/critcl-class/class\&.tcl\fR"
+The Tcl code implementing the package\&.
+.TP
+"\fIlib/critcl-class/class\&.h\fR"
+C code template used by the package\&.
+.RE
+.TP
+\fBstubs::*\fR
+.RS
+.TP
+"\fIlib/stubs/*\fR"
+A set of non-public (still) packages which provide read and write access to and represent
+Tcl stubs tables\&. These were created by taking the "\fIgenStubs\&.tcl\fR" helper application
+coming with the Tcl core sources apart along its internal logical lines\&.
+.RE
+.TP
+\fBcritclf\fR
+.RS
+.TP
+"\fIlib/critclf/\fR"
+Arjen Markus' work on a critcl/Fortran\&. The code is outdated and has not been adapted to
+the changes in critcl version 3 yet\&.
+.RE
+.TP
+\fBmd5\fR
+.TP
+\fBmd5c\fR
+.TP
+\fBplatform\fR
+These are all external packages whose code has been inlined in the repository for easier
+development (less dependencies to pull), and quicker deployment from the repository
+(generation of starkit and -pack)\&.
+.sp
+\fITODO\fR for maintainers: These should all be checked against their origin for
+updates and changes since they were inlined\&.
+.RE
+.PP
+.SH AUTHORS
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report them at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR\&.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR as well\&.
+.SH KEYWORDS
+C code, Embedded C Code, calling C code from Tcl, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) Jean-Claude Wippler
+Copyright (c) Steve Landers
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_emap.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_emap.n
new file mode 100644
index 00000000..011814f7
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_emap.n
@@ -0,0 +1,496 @@
+'\"
+'\" Generated from file 'critcl_emap\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl::emap" n 1\&.3 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl::emap \- CriTcl - Wrap Support - Enum en- and decoding
+.SH SYNOPSIS
+package require \fBTcl  8\&.6\fR
+.sp
+package require \fBcritcl  ?3\&.2?\fR
+.sp
+package require \fBcritcl::emap  ?1\&.3?\fR
+.sp
+\fB::critcl::emap::def\fR \fIname\fR \fIdefinition\fR ?\fB-nocase\fR? ?\fB-mode\fR \fImode\fR?
+.sp
+.BE
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This document is the reference manpage for the
+\fBcritcl::emap\fR package\&. This package provides convenience
+commands for advanced functionality built on top of both critcl core
+and package \fBcritcl::iassoc\fR\&.
+.PP
+C level libraries often use enumerations or integer values to encode
+information, like the state of a system\&. Tcl bindings to such libraries now
+have the task of converting a Tcl representation, i\&.e\&. a string into such
+state, and back\&.
+\fINote\fR here that the C-level information has to be something which
+already exists\&. The package does \fInot\fR create these values\&. This is
+in contrast to the package \fBcritcl::enum\fR which creates an
+enumeration based on the specified symbolic names\&.
+.PP
+This package was written to make the declaration and management
+of such enumerations and their associated conversions functions easy,
+hiding all attendant complexity from the user\&.
+.PP
+Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code\&.
+.PP
+This package resides in the Core Package Layer of CriTcl\&.
+.PP
+.PS
+.nf
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
+*================*
+|Core Packages   |
+| critcl         |
+| critcl::util   |
+*================*
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  \&.\&.\&.           |
++----------------+
+
+.fi
+.PE
+.PP
+.SH API
+.TP
+\fB::critcl::emap::def\fR \fIname\fR \fIdefinition\fR ?\fB-nocase\fR? ?\fB-mode\fR \fImode\fR?
+This command defines C functions for the conversion of the \fIname\fRd
+state code into a Tcl string, and vice versa\&.
+The underlying mapping tables are automatically initialized on first
+access (if not fully constant), and finalized on interpreter
+destruction\&.
+.sp
+The \fIdefinition\fR dictionary provides the mapping from the
+Tcl-level symbolic names of the state to their C expressions (often
+the name of the macro specifying the actual value)\&.
+\fINote\fR here that the C-level information has to be something which
+already exists\&. The package does \fInot\fR create these values\&. This is
+in contrast to the package \fBcritcl::enum\fR which creates an
+enumeration based on the specified symbolic names\&.
+.sp
+Further note that multiple strings can be mapped to the same C
+expression\&. When converting to Tcl the first string for the mapping is
+returned\&. An important thing to know: If all C expressions are
+recognizable as integer numbers and their covered range is not too
+large (at most 50) the package will generate code using direct and
+fast mapping tables instead of using a linear search\&.
+.sp
+If the option \fB-nocase\fR is specified then the encoder
+will match strings case-insensitively, and the decoder will always
+return a lower-case string, regardless of the string's case in the
+\fIdefinition\fR\&.
+.sp
+If the option \fB-mode\fR is specified its contents will
+interpreted as a list of access modes to support\&.  The two allowed
+modes are \fBc\fR and \fBtcl\fR\&. Both modes can be used
+together\&. The default mode is \fBtcl\fR\&.
+.sp
+The package generates multiple things (declarations and
+definitions) with names derived from \fIname\fR, which has to be a
+proper C identifier\&. Some of the things are generated conditional on
+the chosen \fImode\fRs\&.
+.RS
+.TP
+\fIname\fR_encode
+The \fBtcl\fR-mode function for encoding a Tcl string into the
+equivalent state code\&.
+Its signature is
+.sp
+.CS
+
+
+int \fIname\fR_encode (Tcl_Interp* interp, Tcl_Obj* state, int* result);
+
+.CE
+.sp
+The return value of the function is a Tcl error code,
+i\&.e\&. \fBTCL_OK\fR, \fBTCL_ERROR\fR, etc\&.
+.TP
+\fIname\fR_encode_cstr
+The \fBc\fR-mode function for encoding a C string into the
+equivalent state code\&.
+Its signature is
+.sp
+.CS
+
+
+int \fIname\fR_encode_cstr (const char* state);
+
+.CE
+.sp
+The return value of the function is the encoded state, or -1 if
+the argument is not a vlaid state\&.
+.TP
+\fIname\fR_decode
+The \fBtcl\fR-mode function for decoding a state code into the
+equivalent Tcl string\&.
+Its signature is
+.sp
+.CS
+
+
+Tcl_Obj* \fIname\fR_decode (Tcl_Interp* interp, int state);
+
+.CE
+.TP
+\fIname\fR_decode_cstr
+The \fBc\fR-mode function for decoding a state code into the
+equivalent C string\&.
+Its signature is
+.sp
+.CS
+
+
+const char* \fIname\fR_decode_cstr (int state);
+
+.CE
+.sp
+The return value of the function is the C string for the state,
+or \fBNULL\fR if the \fIstate\fR argument does not contain a valid
+state value\&.
+.TP
+\fIname\fR\&.h
+A header file containing the declarations for the conversion
+functions, for use by other parts of the system, if necessary\&.
+.sp
+The generated file is stored in a place where it will not
+interfere with the overall system outside of the package, yet also be
+available for easy inclusion by package files (\fBcsources\fR)\&.
+.TP
+\fIname\fR
+For mode \fBtcl\fR the command registers a new argument-type for
+\fBcritcl::cproc\fR with critcl, encapsulating the encoder function\&.
+.TP
+\fIname\fR
+For mode \fBtcl\fR the command registers a new result-type for
+\fBcritcl::cproc\fR with critcl, encapsulating the decoder function\&.
+.RE
+.PP
+.SH EXAMPLE
+The example shown below is the specification for the possible modes of
+entry (normal, no feedback, stars) used by the Tcl binding to the
+linenoise library\&.
+.CS
+
+
+package require Tcl 8\&.6
+package require critcl 3\&.2
+
+critcl::buildrequirement {
+    package require critcl::emap
+}
+
+critcl::emap::def hiddenmode {
+            no  0 n 0 off 0 false 0 0 0
+    all   1 yes 1 y 1 on  1 true  1 1 1
+    stars 2
+} -nocase
+
+# Declarations: hiddenmode\&.h
+# Encoder:      int      hiddenmode_encode (Tcl_Interp* interp, Tcl_Obj* state, int* result);
+# Decoder:      Tcl_Obj* hiddenmode_decode (Tcl_Interp* interp, int state);
+# ResultType:   hiddenmode
+# ArgumentType: hiddenmode
+
+.CE
+.SH AUTHORS
+Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report such at \fIhttps://github\&.com/andreas-kupries/critcl\fR\&.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation\&.
+.SH KEYWORDS
+C code, Embedded C Code, Tcl Interp Association, bitmask, bitset, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, flags, generate package, linker, on demand compilation, on-the-fly compilation, singleton
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_enum.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_enum.n
new file mode 100644
index 00000000..2b25dccc
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_enum.n
@@ -0,0 +1,481 @@
+'\"
+'\" Generated from file 'critcl_enum\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl::enum" n 1\&.2 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl::enum \- CriTcl - Wrap Support - String/Integer mapping
+.SH SYNOPSIS
+package require \fBTcl  8\&.6\fR
+.sp
+package require \fBcritcl  ?3\&.2?\fR
+.sp
+package require \fBcritcl::enum  ?1\&.2?\fR
+.sp
+\fB::critcl::enum::def\fR \fIname\fR \fIdefinition\fR ?\fImode\fR?
+.sp
+.BE
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This document is the reference manpage for the
+\fBcritcl::enum\fR package\&. This package provides convenience
+commands for advanced functionality built on top of both critcl core
+and package \fBcritcl::literals\fR\&.
+.PP
+It is an extended form of string pool which not only converts
+integer values into Tcl-level strings, but also handles the reverse
+direction, converting from strings to the associated integer values\&.
+.PP
+It essentially provides a bi-directional mapping between a C
+enumeration type and a set of strings, one per enumeration value\&.
+\fINote\fR that the C enumeration in question is created by the
+definition\&. It is not possible to use the symbols of an existing
+enumeration type\&.
+.PP
+This package was written to make the declaration and management
+of such mappings easy\&. It uses a string pool for one of the directions,
+using its ability to return shared literals and conserve memory\&.
+.PP
+Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code\&.
+.PP
+This package resides in the Core Package Layer of CriTcl\&.
+.PP
+.PS
+.nf
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
+*================*
+|Core Packages   |
+| critcl         |
+| critcl::util   |
+*================*
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  \&.\&.\&.           |
++----------------+
+
+.fi
+.PE
+.PP
+.SH API
+.TP
+\fB::critcl::enum::def\fR \fIname\fR \fIdefinition\fR ?\fImode\fR?
+This command defines two C functions for the conversion between
+C values and Tcl_Obj'ects, with named derived from \fIname\fR\&.
+.sp
+The \fIdefinition\fR dictionary provides the mapping from the
+specified C-level symbolic names to the strings themselves\&.
+.sp
+The \fImode\fR-list configures the output somewhat\&.
+The two allowed modes are \fB+list\fR and \fBtcl\fR\&.
+All modes can be used together\&.
+The default mode is \fBtcl\fR\&.
+Using mode \fB+list\fR implies \fBtcl\fR as well\&.
+.sp
+For mode \fBtcl\fR the new function has two arguments, a
+\fBTcl_Interp*\fR pointer refering to the interpreter holding the
+string pool, and a code of type "\fIname\fR_pool_names" (see below),
+the symbolic name of the string to return\&. The result of the function
+is a \fBTcl_Obj*\fR pointer to the requested string constant\&.
+.sp
+For mode \fB+list\fR all of \fBtcl\fR applies, plus an
+additional function is generated which takes three arguments, in
+order: a \fBTcl_Interp*\fR pointer refering to the interpreter
+holding the string pool, an \fBint\fR holding the size of the last
+argument, and an array of type "\fIname\fR_pool_names" holding the
+codes (see below), the symbolic names of the strings to return\&. The
+result of the function is a \fBTcl_Obj*\fR pointer to a Tcl list
+holding the requested string constants\&.
+.sp
+The underlying string pool is automatically initialized on
+first access, and finalized on interpreter destruction\&.
+.sp
+The package generates multiple things (declarations and
+definitions) with names derived from \fIname\fR, which has to be a
+proper C identifier\&.
+.RS
+.TP
+\fIname\fR_pool_names
+The C enumeration type containing the specified symbolic names\&.
+.TP
+\fIname\fR_ToObj
+The function converting from integer value to Tcl string\&.
+Its signature is
+.sp
+.CS
+
+
+Tcl_Obj* \fIname\fR_ToObj (Tcl_Interp* interp, \fIname\fR_names literal);
+
+.CE
+.TP
+\fIname\fR_ToObjList
+The mode \fB+list\fR function converting from integer array to Tcl
+list of strings\&.
+Its signature is
+.sp
+.CS
+
+
+Tcl_Obj* \fIname\fR_ToObjList (Tcl_Interp* interp, int c, \fIname\fR_names* literal);
+
+.CE
+.TP
+\fIname\fR_GetFromObj
+The function converting from Tcl string to integer value\&.
+Its signature is
+.sp
+.CS
+
+
+int \fIname\fR_GetFromObj (Tcl_Interp* interp, Tcl_Obj* obj, int flags, int* literal);
+
+.CE
+.IP
+The \fIflags\fR are like for \fBTcl_GetIndexFromObj\fR\&.
+.TP
+\fIname\fR\&.h
+A header file containing the declarations for the converter functions,
+for use by other parts of the system, if necessary\&.
+.sp
+The generated file is stored in a place where it will not
+interfere with the overall system outside of the package, yet also be
+available for easy inclusion by package files (\fBcsources\fR)\&.
+.TP
+\fIname\fR
+At the level of critcl itself the command registers a new result-type
+for \fBcritcl::cproc\fR, which takes an integer result from the function
+and converts it to the equivalent string in the pool for the script\&.
+.TP
+\fIname\fR
+At the level of critcl itself the command registers a new argument-type
+for \fBcritcl::cproc\fR, which takes a Tcl string and converts it to the
+equivalent integer for delivery to the function\&.
+.RE
+.PP
+.SH EXAMPLE
+The example shown below is the specification for a set of actions, methods,
+and the like, a function may take as argument\&.
+.CS
+
+
+package require Tcl 8\&.6
+package require critcl 3\&.2
+
+critcl::buildrequirement {
+    package require critcl::enum
+}
+
+critcl::enum::def action {
+    w_create	"create"
+    w_directory	"directory"
+    w_events	"events"
+    w_file	"file"
+    w_handler	"handler"
+    w_remove	"remove"
+}
+
+# Declarations: action\&.h
+# Type:         action_names
+# Accessor:     Tcl_Obj* action_ToObj (Tcl_Interp* interp, int literal);
+# Accessor:     int action_GetFromObj (Tcl_Interp* interp, Tcl_Obj* o, int flags, int* literal);
+# ResultType:   action
+# ArgType:      action
+
+.CE
+.SH AUTHORS
+Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report such at \fIhttps://github\&.com/andreas-kupries/critcl\fR\&.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation\&.
+.SH KEYWORDS
+C code, Embedded C Code, Tcl Interp Association, code generator, compile & run, compiler, conversion, dynamic code generation, dynamic compilation, generate package, int to string mapping, linker, literal pool, on demand compilation, on-the-fly compilation, singleton, string pool, string to int mapping
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_howto_install.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_howto_install.n
new file mode 100644
index 00000000..a02f3944
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_howto_install.n
@@ -0,0 +1,544 @@
+'\"
+'\" Generated from file 'critcl_howto_install\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) Jean-Claude Wippler
+'\" Copyright (c) Steve Landers
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl_howto_install" n 3\&.2\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl_howto_install \- How To Install CriTcl
+.SH DESCRIPTION
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+\fICriTcl\fR is installed in four major steps:
+.IP [1]
+\fBInstall The Requisites\fR
+.IP [2]
+Follow the instructions on \fIHow To Get The CriTcl Sources\fR
+.IP [3]
+\fBInstall The CriTcl Packages\fR
+.IP [4]
+\fBTest The Installation\fR
+.PP
+It is now possible to follow the instructions on \fIHow To Use CriTcl\fR\&.
+.SH "INSTALL THE REQUISITES"
+This major step breaks down into three minor steps:
+.IP [1]
+\fBInstall A Working C Compiler\fR and development environment\&.
+.IP [2]
+\fBInstall A Working Tcl Shell\fR
+.IP [3]
+\fBInstall Supporting Tcl Packages\fR
+.PP
+.SS "INSTALL A WORKING C COMPILER"
+While \fICriTcl\fR requires a working C compiler to both install itself, and to process
+\fICriTcl\fR-based packages installing such is very much out of scope for this document\&.
+.PP
+Please follow the instructions for the platform and system \fICriTcl\fR is to be
+installed on\&.
+.PP
+The important pieces of information are this:
+.IP [1]
+The path to the directory containing the C compiler binary has to be listed in the
+environment variable \fBPATH\fR, for \fICriTcl\fR to find it\&.
+.IP [2]
+On Windows(tm) the environment variable \fBLIB\fR has to be present and contain the
+paths of the directories holding Microsoft's libraries\&. The standard \fICriTcl\fR
+configuration for this platform searches these paths to fine-tune its settings
+based on available libraries and compiler version\&.
+.PP
+.PP
+Links of interest:
+.TP
+\fIhttp://www\&.tldp\&.org/HOWTO/HOWTO-INDEX/programming\&.html\fR
+.PP
+.SS "INSTALL A WORKING TCL SHELL"
+.PP
+That a working installation of \fICriTcl\fR will require a working installation of
+\fITcl\fR [http://core\&.tcl-lang\&.org/tcl] should be obvious\&.
+.PP
+Installing Tcl however is out of scope here, same as for installing a working C
+compiler\&.
+.PP
+There are too many options, starting from
+\fIbuilding it from scratch\fR [http://core\&.tcl-lang\&.org/tcl], installing what is provided
+by the platform's package manager (\fIzypper\fR [https://en\&.opensuse\&.org/Portal:Zypper], \fIyum\fR [https://access\&.redhat\&.com/solutions/9934], \fIapt-get\fR [https://help\&.ubuntu\&.com/community/AptGet/Howto], and more),
+to using some vendor's \fIdistribution\fR [https://core\&.tcl-lang\&.org/dist\&.html]\&.
+.PP
+A single piece of advice however\&.
+.PP
+While \fICriTcl\fR currently supports running on Tcl 8\&.4 and higher, and the
+creation of packages for the same, the last release for this version was in 2013 (9 years
+ago at the time of writing)\&. Similarly, the last release for Tcl 8\&.5 was in 2016 (6 years
+ago)\&. Both are official end of life\&.
+.PP
+Given this I recommend to install and use Tcl 8\&.6\&.
+.SS "INSTALL SUPPORTING TCL PACKAGES"
+The implementation of \fICriTcl\fR uses and depends on
+.IP [1]
+\fBcmdline\fR
+.PP
+.PP
+Depending on how Tcl was installed this package may be available already without
+action, or not\&.
+Invoke the command
+.CS
+
+
+    echo 'puts [package require cmdline]' | tclsh
+
+.CE
+to check if the package is present or not\&. If it is present then its version number will
+be printed, else the error message \fBcan't find package cmdline\fR or similar\&.
+.PP
+If it is not present install the package as per the instructions for the chosen Tcl
+installation\&.
+.PP
+\fINote\fR, the package \fBcmdline\fR may not exist as its own installable
+package\&. In such a case check if the chosen Tcl installation provides a \fBtcllib\fR
+package and install that\&. This should install all the packages in the Tcllib bundle,
+including \fBcmdline\fR\&.
+.PP
+As a last fallback, go to \fITclib\fR [http://core\&.tcl-lang\&.org/tcllib] and follow the instructions to install
+the bundle from scratch\&.
+.SH "INSTALL THE CRITCL PACKAGES"
+Note that this step has different instructions dependent on the platform \fICriTcl\fR is
+to be installed on\&. In other words, only one of the sub sections applies, the other can be
+ignored\&.
+.SS "INSTALL ON UNIX"
+This section offers instructions for installing \fICriTcl\fR on various kinds of Unix and
+Unix-related systems, i\&.e\&. \fILinux\fR, the various \fIBSD\fRs, etc\&. It especially
+covers \fIMac OS X\fR as well\&.
+.PP
+Use the instructions in section \fBInstall On Windows\fR when installing on a
+Windows platform and not using a unix-like environment as provided by tools like
+\fIMinGW\fR [https://www\&.mingw-w64\&.org], \fICygWin\fR [https://www\&.cygwin\&.com/], \fIGit For Windows\fR [https://gitforwindows\&.org], \fIWSL\fR [https://docs\&.microsoft\&.com/en-us/windows/wsl/faq], etc\&.
+.IP [1]
+Change the working directory to the top level directory of the \fICriTcl\fR
+checkout obtained by following the instructions of \fIHow To Get The CriTcl Sources\fR\&.
+.IP [2]
+Verify that the file "\fIbuild\&.tcl\fR" is marked executable\&. Make it executable if
+it is not\&.
+.IP [3]
+Invoke
+.CS
+
+ \&./build\&.tcl install
+.CE
+.IP to perform the installation\&.
+.sp
+\fIAttention\fR This command uses default locations for the placement of the
+\fBcritcl\fR application, the various packages, and header files\&.
+.IP [4]
+Invoke
+.CS
+
+ \&./build\&.tcl dirs
+.CE
+.IP to see the chosens paths before actually
+performing the installation\&.
+.IP [5]
+Use the options listed below to change the paths used for installation as desired\&. This is
+the same method as with \fBconfigure\fR based packages\&.
+.RS
+.TP
+\fB--prefix\fR \fIpath\fR
+Base path for non-package files\&.
+.TP
+\fB--include-dir\fR \fIpath\fR
+Destination path for header files\&.
+.TP
+\fB--exec-prefix\fR \fIpath\fR
+Base path for applications and packages\&.
+.TP
+\fB--bin-dir\fR \fIpath\fR
+Destination path for applications\&.
+.TP
+\fB--lib-dir\fR \fIpath\fR
+Destination path for packages\&.
+.RE
+.IP
+These options are especially necessary in all environments not using the semi-standard
+"\fIbin\fR", "\fIlib\fR", "\fIinclude\fR" locations from \fBconfigure\fR\&.
+.sp
+As an example of such environments, Ubuntu (and possibly Debian) expect Tcl
+packages to be installed into the "\fI/usr/share/tcltk\fR" directory, therefore requiring
+the use of
+.CS
+
+--lib-dir /usr/share/tcltk
+.CE
+.IP for proper installation\&.
+.PP
+.PP
+\fINote\fR that this guide neither covers the details of the \fBinstall\fR
+method, nor does it cover any of the other methods available through the \fBbuild\&.tcl\fR
+tool of \fICriTcl\fR\&.
+These can be found in the \fICriTcl build\&.tcl Tool Reference\fR\&.
+.SS "INSTALL ON WINDOWS"
+This section offers instructions for installing \fICriTcl\fR on a Windows (tm) host\&.
+\fINote\fR that environments as provided by tools like \fIMinGW\fR [https://www\&.mingw-w64\&.org], \fICygWin\fR [https://www\&.cygwin\&.com/],
+\fIGit For Windows\fR [https://gitforwindows\&.org], \fIWSL\fR [https://docs\&.microsoft\&.com/en-us/windows/wsl/faq], etc\&. are classed as Unix-like, and the instructions in section
+\fBInstall On Unix\fR apply\&.
+.IP [1]
+In a DOS box, change the working directory to the top level directory of the
+\fICriTcl\fR checkout obtained by following the instructions of
+\fIHow To Get The CriTcl Sources\fR\&.
+.IP [2]
+In the same DOS box, invoke
+.CS
+
+ tclsh\&.exe \&./build\&.tcl install
+.CE
+.IP to perform
+the installation\&.
+.sp
+\fIAttention\fR This command uses default locations for the placement of the
+\fBcritcl\fR application, the various packages, and header files\&.
+.IP [3]
+Invoke
+.CS
+
+ tclsh\&.exe \&./build\&.tcl dirs
+.CE
+.IP to see the chosens paths before
+actually performing the installation\&.
+.IP [4]
+Use the options listed below to change the paths used for installation as desired\&. This is
+the same method as with \fBconfigure\fR based packages\&.
+.RS
+.TP
+\fB--prefix\fR \fIpath\fR
+Base path for non-package files\&.
+.TP
+\fB--include-dir\fR \fIpath\fR
+Destination path for header files\&.
+.TP
+\fB--exec-prefix\fR \fIpath\fR
+Base path for applications and packages\&.
+.TP
+\fB--bin-dir\fR \fIpath\fR
+Destination path for applications\&.
+.TP
+\fB--lib-dir\fR \fIpath\fR
+Destination path for packages\&.
+.RE
+.PP
+.PP
+\fIAttention!\fR The current installer does not put an extension on the
+\fBcritcl\fR application\&. This forces users to either explicitly choose the
+\fBtclsh\fR to run the application, or manually rename the installed file to
+"\fIcritcl\&.tcl\fR"\&. The latter assumes that an association for "\fI\&.tcl\fR" is available, to
+either \fBtclsh\fR, or \fBwish\fR\&.
+.PP
+\fINote\fR that this guide neither covers the details of the \fBinstall\fR
+method, nor does it cover any of the other methods available through the \fBbuild\&.tcl\fR
+tool of \fICriTcl\fR\&.
+These can be found in the \fICriTcl build\&.tcl Tool Reference\fR\&.
+.SH "TEST THE INSTALLATION"
+Installing \fICriTcl\fR contains an implicit test of its functionality\&.
+.PP
+One of its operation modes uses the MD5 hash internally to generate unique ids for
+sources, as a means of detecting changes\&. To make generation of such hashes fast a
+\fICriTcl\fR-based package for MD5 is installed as part of the main installation process\&.
+.PP
+In other words, after installing the core packages of \fICriTcl\fR this partial
+installation is used to build the rest\&.
+.PP
+This is possible because building a package from \fICriTcl\fR-based sources is the
+operation mode not using MD5, therefore there is no circular dependency\&.
+.PP
+For our purposes this however is also a self-test of the system, verifying that the
+core of \fICriTcl\fR works, as well as the C compiler\&.
+.PP
+For additional testing simply move on to section \fBThe First Package\fR of
+the guide on \fIHow To Use CriTcl\fR\&.
+.SH AUTHORS
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report them at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR\&.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR as well\&.
+.SH KEYWORDS
+C code, Embedded C Code, calling C code from Tcl, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) Jean-Claude Wippler
+Copyright (c) Steve Landers
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_howto_sources.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_howto_sources.n
new file mode 100644
index 00000000..54ce8694
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_howto_sources.n
@@ -0,0 +1,331 @@
+'\"
+'\" Generated from file 'critcl_howto_sources\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) Jean-Claude Wippler
+'\" Copyright (c) Steve Landers
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl_howto_sources" n 3\&.2\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl_howto_sources \- How To Get The CriTcl Sources
+.SH DESCRIPTION
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+The sources for \fICriTcl\fR are retrieved in two easy steps:
+.IP [1]
+\fBInstall the Git Source Code Manager\fR
+.IP [2]
+\fBRetrieve The Sources\fR
+.PP
+It is now possible to follow the instructions on \fIHow To Install CriTcl\fR\&.
+.SH "INSTALL THE GIT SOURCE CODE MANAGER"
+\fICriTcl\fR's sources are managed by the popular \fIGit SCM\fR [http://www\&.git-scm\&.com]\&.
+.PP
+Binaries of clients for popular platforms can be found at the \fIdownload page\fR [https://git-scm\&.com/downloads]\&.
+.PP
+See also if your operating system's package manager provides clients and associated
+tools for installation\&. If so, follow the instructions for the installation of such
+packages on your system\&.
+.SH "RETRIEVE THE SOURCES"
+.IP [1]
+Choose a directory for the sources, and make it the working directory\&.
+.IP [2]
+Invoke the command
+.CS
+
+
+git clone \fIhttp://andreas-kupries\&.github\&.io/critcl\fR
+
+.CE
+.IP [3]
+The working directory now contains a sub-directory "\fIcritcl\fR" holding the
+sources of \fICriTcl\fR\&.
+.PP
+.SH AUTHORS
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report them at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR\&.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR as well\&.
+.SH KEYWORDS
+C code, Embedded C Code, calling C code from Tcl, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) Jean-Claude Wippler
+Copyright (c) Steve Landers
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_howto_use.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_howto_use.n
new file mode 100644
index 00000000..6424bd40
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_howto_use.n
@@ -0,0 +1,2413 @@
+'\"
+'\" Generated from file 'critcl_howto_use\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) Jean-Claude Wippler
+'\" Copyright (c) Steve Landers
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl_howto_use" n 3\&.2\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl_howto_use \- How To Use CriTcl
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This document assumes the presence of a working \fICriTcl\fR installation\&.
+.PP
+If that is missing follow the instructions on \fIHow To Install CriTcl\fR\&.
+.SH BASICS
+To create a minimal working package
+.IP [1]
+Choose a directory to develop in and make it the working directory\&. This should
+not be a checkout of \fICriTcl\fR itself\&.
+.IP [2]
+Save the following example to a file\&. In the following it is assumed that the file
+was named "\fIexample\&.tcl\fR"\&.
+.CS
+
+
+# -*- tcl -*-
+# Critcl support, absolutely necessary\&.
+package require critcl
+
+# Bail out early if the compile environment is not suitable\&.
+if {![critcl::compiling]} {
+    error "Unable to build project, no proper compiler found\&."
+}
+
+# Information for the teapot\&.txt meta data file put into a generated package\&.
+# Free form strings\&.
+critcl::license {Andreas Kupries} {Under a BSD license}
+
+critcl::summary {The first CriTcl-based package}
+
+critcl::description {
+    This package is the first example of a CriTcl-based package\&. It contains all the
+    necessary and conventionally useful pieces\&.
+}
+
+critcl::subject example {critcl package}
+critcl::subject {basic critcl}
+
+# Minimal Tcl version the package should load into\&.
+critcl::tcl 8\&.6
+
+# Use to activate Tcl memory debugging
+#critcl::debug memory
+# Use to activate building and linking with symbols (for gdb, etc\&.)
+#critcl::debug symbols
+
+# ## #### ######### ################ #########################
+## A hello world, directly printed to stdout\&. Bypasses Tcl's channel system\&.
+
+critcl::cproc hello {} void {
+    printf("hello world\\n");
+}
+
+# ## #### ######### ################ #########################
+
+# Forcing compilation, link, and loading now\&.
+critcl::msg -nonewline { Building \&.\&.\&.}
+if {![critcl::load]} {
+    error "Building and loading the project failed\&."
+}
+
+# Name and version the package\&. Just like for every kind of Tcl package\&.
+package provide critcl-example 1
+
+
+.CE
+.IP [3]
+Invoke the command
+.CS
+
+ critcl -keep -debug all -pkg example\&.tcl
+.CE
+.sp
+This compiles the example and installs it into a "\fIlib/\fR" sub directory of the
+working directory, generating output similar to
+.CS
+
+
+    Config:   linux-x86_64-gcc
+    Build:    linux-x86_64-gcc
+    Target:   linux-x86_64
+    Source:   example\&.tcl  (provide critcl-example 1) Building \&.\&.\&.
+    Library:  example\&.so
+     (tclStubsPtr     =>  const TclStubs *tclStubsPtr;)
+     (tclPlatStubsPtr =>  const TclPlatStubs *tclPlatStubsPtr;)
+    Package:  lib/example
+    Files left in /home/aku/\&.critcl/pkg2567272\&.1644845439
+
+.CE
+.IP
+during operation\&.
+.sp
+The \fB-keep\fR option suppressed the cleanup of the generated C files, object
+files, compiler log, etc\&. normally done at the end of building\&.
+.CS
+
+
+% ls -l /home/aku/\&.critcl/pkg2567272\&.1644845439
+total 36
+-rw-r--r-- 1 aku aku  1260 Feb 14 18:30 v3118_00000000000000000000000000000004\&.c
+-rw-r--r-- 1 aku aku  2096 Feb 14 18:30 v3118_00000000000000000000000000000004_pic\&.o
+-rw-r--r-- 1 aku aku  1728 Feb 14 18:30 v3118_00000000000000000000000000000009\&.c
+-rw-r--r-- 1 aku aku  2448 Feb 14 18:30 v3118_00000000000000000000000000000009_pic\&.o
+-rwxr-xr-x 1 aku aku 14424 Feb 14 18:30 v3118_00000000000000000000000000000009\&.so
+-rw-r--r-- 1 aku aku  1725 Feb 14 18:30 v3118\&.log
+
+.CE
+.IP
+This enables inspection of the generated C code\&.
+Simply drop the option from the command if that is not desired\&.
+.sp
+The option \fB-debug\fR, with argument \fBall\fR activated Tcl's memory
+debugging and caused the generation of the symbol tables needed by \fBgdb\fR or any
+other debugger\&. The alternate arguments \fBmemory\fR and \fBsymbols\fR activate just
+one of the these\&.
+.IP [4]
+Now invoke an interactive \fBtclsh\fR and enter the commands:
+.RS
+.IP \(bu
+\fIlappend auto_path lib\fR
+.IP \(bu
+\fIpackage require critcl-example\fR
+.IP \(bu
+\fIinfo loaded\fR
+.IP \(bu
+\fIhello\fR
+.IP \(bu
+\fIexit\fR
+.RE
+.IP
+I\&.e\&. extend \fBtclsh\fR's package search path to include the location of the new
+package, load the package, verify that the associated shared library is present, invoke
+the package command, and stop the session\&.
+.sp
+When the package command is invoked the terminal will show \fBhello world\fR,
+followed by the prompt\&.
+.PP
+.PP
+Commands: \fIcritcl::compiling\fR, \fIcritcl::cproc\fR,
+\fIcritcl::description\fR, \fIcritcl::license\fR, \fIcritcl::load\fR,
+\fIcritcl::msg\fR, \fIcritcl::subject\fR, \fIcritcl::summary\fR, \fIcritcl::tcl\fR\&.
+.PP
+Make a copy of "\fIexample\&.tcl\fR" before going through the sub-sections\&. Keep it as
+a save point to return to from the editing done in the sub-section\&.
+.SS "SIMPLE ARGUMENTS"
+A function taking neither arguments nor returning results is not very useful\&.
+.IP [1]
+We are now extending the command to take an argument\&.
+.IP [2]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    critcl::cproc hello {double x} void {
+	/* double x; */
+	printf("hello world, we have %f\\n", x);
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [3]
+When testing the package again, entering the simple \fBhello\fR will fail\&.
+.sp
+The changed command is now expecting an argument, and we gave it none\&.
+.sp
+Retry by entering
+.CS
+
+hello 5
+.CE
+.IP instead\&.
+Now the command behaves as expected and prints the provided value\&.
+.sp
+Further try and enter
+.CS
+
+hello world
+.CE
+.IP
+This will fail again\&.
+The command expected a real number and we gave it something decidedly not so\&.
+.sp
+These checks (argument count, argument type) are implemented in the translation
+layer \fICriTcl\fR generates for the C function\&. The function body is never invoked\&.
+.PP
+.SS "SIMPLE RESULTS"
+A function taking neither arguments nor returning results is not very useful\&.
+.IP [1]
+We are now extending the command to return a result\&.
+.IP [2]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    critcl::cproc twice {double x} double {
+	return 2*x;
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [3]
+Note that the name of the command changed\&. Goodbye \fBhello\fR, hello \fBtwice\fR\&.
+.IP [4]
+Invoke
+.CS
+
+ twice 4
+.CE
+.IP and the \fBtclsh\fR will print the result \fB8\fR
+in the terminal\&.
+.PP
+.PP
+An important limitation of the commands implemented so far is that they cannot
+fail\&. The types used so far (\fBvoid\fR, \fBdouble\fR) and related scalar types can
+return only a value of the specified type, and nothing else\&. They have no ability to
+signal an error to the Tcl script\&.
+.PP
+We will come back to this after knowing a bit more about the more complex argument
+and result types\&.
+.PP
+Of interest to the eager reader: \fICriTcl cproc Type Reference\fR
+.SS "RANGE-LIMITED SIMPLE ARGUMENTS"
+.IP [1]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    critcl::cproc hello {{double > 5 < 22} x} void {
+	/* double x, range 6-21; */
+	printf("hello world, we have %f\\n", x);
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [2]
+When dealing with simple arguments whose range of legal values is limited to a single
+continuous interval extend the base type with the necessary relations (\fB>\fR, \fB>=\fR,
+\fB<\fR, and \fB<=\fR) and limiting values\&.
+.sp
+\fINote\fR that the limiting values have to be proper constant numbers acceptable by the
+base type\&. Symbolic values are not accepted\&.
+.sp
+Here the argument \fIx\fR of the changed function will reject all values outside of the
+interval 6 to 21\&.
+.PP
+.SS "STRING ARGUMENTS"
+Tcl prides itself on the fact that \fIEverything Is A String\fR\&.
+So how are string values passed into C functions ?
+.IP [1]
+We are now extending the command with a string argument\&.
+.IP [2]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    critcl::cproc hello {pstring x} void {
+	/* critcl_pstring x (\&.s, \&.len, \&.o); */
+	printf("hello world, from %s (%d bytes)\\n", x\&.s, x\&.len);
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [3]
+Testing \fBhello\fR with any kind of argument the information is printed\&.
+.IP [4]
+Of note here is that the command argument \fBx\fR is a structure\&.
+.IP [5]
+The example uses only two of the three fields, the pointer to the string data
+(\fB\&.s\fR), and the length of the string (\fB\&.len\fR)\&. In bytes, \fInot\fR in
+characters, because Tcl's internal representation of strings uses a modified UTF-8
+encoding\&. A character consists of between 1 and \fBTCL_UTF_MAX\fR bytes\&.
+.IP [6]
+\fIAttention\fR The pointers (\fB\&.s\fR) refer into data structures \fIinternal\fR
+to and managed by the Tcl interpreter\&.
+Changing them is highly likely to cause subtle and difficult to track down bugs\&.
+Any and all complex arguments must be treated as \fIRead-Only\fR\&. Never modify them\&.
+.IP [7]
+Use the simpler type \fBchar*\fR if and only if the length of the string is not
+relevant to the command, i\&.e\&. not computed, or not used by any of the functions called
+from the body of the command\&.
+Its value is essentially just the \fB\&.s\fR field of \fBpstring\fR's structure\&.
+This then looks like
+.CS
+
+
+    critcl::cproc hello {char* x} void {
+	/* char* x; */
+	printf("hello world, from %s\\n", x);
+    }
+
+.CE
+.PP
+.SS "STRING RESULTS"
+Tcl prides itself on the fact that \fIEverything Is A String\fR\&.
+So how are string values returned from C functions ?
+.IP [1]
+We are now giving the command a string result\&.
+.IP [2]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    critcl::cproc twice {double x} char* {
+	char buf [lb]40[rb];
+	sprintf(buf, "%f", 2*x);
+	return buf;
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [3]
+Note that the name of the command changed\&. Goodbye \fBhello\fR, hello \fBtwice\fR\&.
+.IP [4]
+Invoke
+.CS
+
+ twice 4
+.CE
+.IP and the \fBtclsh\fR will print the result \fB8\fR
+in the terminal\&.
+.IP [5]
+\fIAttention\fR\&. To the translation layer the string pointer is owned by the C
+code\&. A copy is made to become the result seen by Tcl\&.
+.sp
+While the C code is certainly allowed to allocate the string on the heap if it so
+wishes, this comes with the responsibility to free the string as well\&. Abrogation of that
+responsibility will cause memory leaks\&.
+.sp
+The type \fBchar*\fR is recommended to be used with static string buffers, string
+constants and the like\&.
+.IP [6]
+Conversely, to return heap-allocated strings it is recommended to use the type
+\fBstring\fR instead\&.
+.sp
+Replace the definition of \fBtwice\fR with
+.CS
+
+
+critcl::cproc twice {double x} string {
+    char* buf = Tcl_Alloc (40);
+    sprintf(buf, "%f", 2*x);
+    return buf;
+}
+
+.CE
+.sp
+Now the translation layer takes ownership of the string from the C code and
+transfers that ownership to the Tcl interpreter\&. This means that the string will be
+released when the Tcl interpreter is done with it\&. The C code has no say in the lifecycle
+of the string any longer, and having the C code releasing the string \fIwill\fR cause
+issues\&. Dangling pointers and associated memory corruption and crashes\&.
+.PP
+.SS "LIST ARGUMENTS"
+Even as a string-oriented language Tcl is capable of handling more complex structures\&. The first of
+it, with Tcl since the beginning are \fIlists\fR\&. Sets of values indexed by a numeric value\&.
+.PP
+In C parlance, \fIarrays\fR\&.
+.IP [1]
+We are now extending the command with a \fBlist\fR argument\&.
+.IP [2]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    critcl::cproc hello {list x} void {
+	/* critcl_list x (\&.o, \&.v, \&.c); */
+	printf("hello world, %d elements in (%s)\\n", x\&.c, Tcl_GetString (x\&.o));
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [3]
+Testing \fBhello\fR with any kind of list argument it will print basic information about it\&.
+.IP [4]
+Of note here is that the command argument \fBx\fR is a structure\&.
+.IP [5]
+The example uses only two of the three fields, the pointer to the original \fBTcl_Obj*\fR
+holding the list (\fB\&.o\fR), and the length of the list (\fB\&.c\fR) in elements\&.
+.sp
+The field \fB\&.v\fR, not used above, is the C array holding the \fBTcl_Obj*\fR pointers to
+the list elements\&.
+.IP [6]
+\fIAttention\fR The pointers \fB\&.o\fR and \fB\&.v\fR refer into data structures
+\fIinternal\fR to and managed by the Tcl interpreter\&.
+Changing them is highly likely to cause subtle and difficult to track down bugs\&.
+Any and all complex arguments must be treated as \fIRead-Only\fR\&. Never modify them\&.
+.IP [7]
+As a last note, this argument type does not place any constraints on the size of the list, or
+on the type of the elements\&.
+.PP
+.SS "CONSTRAINED LIST ARGUMENTS"
+As mentioned at the end of section \fBList Arguments\fR the basic \fBlist\fR type places no
+constraints on the size of the list, nor on the type of the elements\&.
+.PP
+Both kind of constraints can be done however, alone or together\&.
+.IP [1]
+We are now extending the command with a length-limited list\&.
+.IP [2]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    critcl::cproc hello {[5] x} void {
+	/* critcl_list x (\&.o, \&.v, \&.c); */
+	printf("hello world, %d elements in (%s)\\n", x\&.c, Tcl_GetString (x\&.o));
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [3]
+Testing the new command will show that only lists holding exactly \fB5\fR elements will be
+accepted\&.
+.IP [4]
+To accept lists of any length use \fB[]\fR or \fB[*]\fR\&. Both forms are actually
+aliases of the base type, i\&.e\&. \fBlist\fR\&.
+.IP [5]
+To constrain just the type of elements, for example to type \fBint\fR, use
+.CS
+
+int[]
+.CE
+.IP
+or
+.CS
+
+[]int
+.CE
+.IP [6]
+To combine both type and length constraints use the forms
+.CS
+
+int[5]
+.CE
+.IP or
+.CS
+
+[5]int
+.CE
+.IP [7]
+The last, most C-like forms of these contraints place the list indicator syntax on the
+argument instead of the type\&. I\&.e
+.CS
+
+int a[]
+.CE
+.IP or
+.CS
+
+int a[5]
+.CE
+.PP
+.SS "RAW TCL_OBJ* ARGUMENTS"
+When the set of predefined argument types is not enough the oldest way of handling the
+situation is falling back to the structures used by Tcl to manage values, i\&.e\&.
+\fBTcl_Obj*\fR\&.
+.IP [1]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    critcl::cproc hello {object x} void {
+	/* Tcl_Obj* x */
+	int len;
+	char* str = Tcl_GetStringFromObj (x, &len);
+	printf("hello world, from %s (%d bytes)\\n", str, len);
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [2]
+Having direct access to the raw \fBTcl_Obj*\fR value all functions of the public
+Tcl API for working with Tcl values become usable\&. The downside of that is that all the
+considerations for handling them apply as well\&.
+.sp
+In other words, the C code becomes responsible for handling the reference counts
+correctly, for duplicating shared \fBTcl_Obj*\fR structures before modifying them, etc\&.
+.sp
+One thing the C code is allowed to do without restriction is to \fIshimmer\fR the
+internal representation of the value as needed, through the associated Tcl API
+functions\&. For example \fBTcl_GetWideIntFromObj\fR and the like\&.
+It actually has to be allowed to do so, as the type checking done as part of such
+conversions is now the responsibility of the C code as well\&.
+.sp
+For the predefined types this is all hidden in the translation layer generated by
+\fICriTcl\fR\&.
+.sp
+If more than one command has to perform the same kind of checking and/or conversion
+it is recommended to move the core of the code into proper C functions for proper sharing
+among the commands\&.
+.IP [3]
+This is best done by defining a custom argument type using \fICriTcl\fR commands\&.
+This extends the translation layer \fICriTcl\fR is able to generate\&.
+The necessary conversions, type checks, etc\&. are then again hidden from the bulk of the
+application C code\&.
+.sp
+We will come back to this\&.
+.PP
+.SS "RAW TCL_OBJ* RESULTS"
+When the set of predefined result types is not enough the oldest way of handling the
+situation is falling back to the structures used by Tcl to manage values, i\&.e\&.
+\fBTcl_Obj*\fR\&.
+.PP
+Two builtin types are provided for this, to handle different reference counting
+requirements\&.
+.IP [1]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    critcl::cproc twice {double x} object0 {
+	return Tcl_NewDoubleObj(2*x);
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [2]
+With \fBobject0\fR the translation layer assumes that the returned \fBTcl_Obj*\fR
+value has a reference count of \fB0\fR\&. I\&.e\&. a value which is unowned and unshared\&.
+.sp
+This value is passed directly to Tcl for its use, without any changes\&. Tcl
+increments the reference count and thus takes ownership\&. The value is still unshared\&.
+.sp
+It would be extremely detrimental if the translation layer had decremented the
+reference count before passing the value\&. This action would release the memory and then
+leave Tcl with a dangling pointer and the associated memory corruption bug to come\&.
+.IP [3]
+The situation changes when the C code returns a \fBTcl_Obj*\fR value with a
+reference count greater than \fB0\fR\&. I\&.e\&. at least owned (by the C code), and possibly
+even shared\&.
+There are some object constructors and/or mutators in the public Tcl API which do that,
+although I do not recall their names\&. The example below simulates this situation by
+explicitly incrementing the reference count before returning the value\&.
+.IP [4]
+In this case use the type \fBobject\fR (without the trailing \fB0\fR)\&.
+.IP [5]
+Edit the file "\fIexample\&.tcl\fR" and replace the definition of \fBtwice\fR with
+.CS
+
+
+    critcl::cproc twice {double x} object {
+	Tcl_Obj* result = Tcl_NewDoubleObj(2*x);
+	Tcl_IncrRefCount (result);
+	return result;
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [6]
+After handing the value to Tcl, with the associated incremented reference count,
+the translation layer decrements the reference count, invalidating the C code's ownership
+and leaving the final reference count the same\&.
+.sp
+Note, the order matters\&. If the value has only one reference then decrementing it
+before Tcl increments it would again release the value, and again leave Tcl with a
+dangling pointer\&.
+.sp
+Also, not decrementing the reference count at all causes the inverse problem to the
+memory corruption issues of before, memory leaks\&.
+.IP [7]
+\fINote\fR that both types transfer ownership of the value\&. Their difference is
+just in the reference count of the value coming out of the function, and the (non-)actions
+having to be (not) taken to effect said transfer without causing memory issues\&.
+.PP
+.SS "ERRORS & MESSAGES"
+.IP [1]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    critcl::cproc sqrt {
+	Tcl_Interp* interp
+	double      x
+    } object0 {
+	if (x < 0) {
+	    Tcl_SetObjResult (interp, Tcl_ObjPrintf ("Expected double >=0, but got \\"%d\\"", x));
+	    Tcl_SetErrorCode (interp, "EXAMPLE", "BAD", "DOMAIN", NULL);
+	    return NULL;
+	}
+	return Tcl_NewDoubleObj(sqrt(x));
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [2]
+In standard C-based packages commands signal errors by returning \fBTCL_ERROR\fR,
+placing the error message as the interpreter result, and maybe providing an error code via
+\fBTcl_SetErrorCode\fR\&.
+.IP [3]
+When using \fBcritcl::cproc\fR this is limited and hidden\&.
+.IP [4]
+The simple and string types for results do not allow failure\&. The value is returned
+to the translation layer, converted into the interpreter result and then reported as
+success (\fBTCL_OK\fR)\&.
+.IP [5]
+The object types on the other hand do allow for failure\&.
+Return a \fBNULL\fR value to signal failure to the translation layer, which then reports
+this to the interpreter via the standard \fBTCL_ERROR\fR\&.
+.IP [6]
+\fIAttention\fR Setting the desired error message and code into the interpreter is
+still the responsibility of the function body\&.
+.PP
+.SS "TCL_INTERP* ACCESS"
+.IP [1]
+Reread the example in the \fBprevious\fR section\&.
+.IP [2]
+Note the type \fBTcl_Interp*\fR used for the first argument\&.
+.IP [3]
+This type is special\&.
+.IP [4]
+An argument of this type has to be the first argument of a function\&.
+.IP [5]
+Using it tells \fICriTcl\fR that the function needs access to the Tcl interpreter
+calling it\&. It then arranges for that to happen in the generated C code\&.
+.sp
+Using functions from Tcl's public C API taking an interpreter argument in the
+function body is a situation where this is needed\&.
+.IP [6]
+\fIThis special argument is not visible at the script level\fR\&.
+.IP [7]
+\fIThis special argument is not an argument of the Tcl command for the function\fR\&.
+.IP [8]
+In our example the \fBsqrt\fR command is called with a single argument\&.
+.IP [9]
+The name of the argument can be freely chosen\&. It is the type which is important
+and triggers the special behaviour\&.
+My prefered names are \fBip\fR and \fBinterp\fR\&.
+.PP
+.SS "BINARY DATA ARGUMENTS"
+.IP [1]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    critcl::cproc hello {bytes x} void {
+        /* critcl_bytes x (\&.s, \&.len, \&.o); */
+        printf("hello world, with %d bytes \\n data: ", x\&.len);
+        for (i = 0; i < x\&.len; i++) {
+            printf(" %02x", x\&.s[i]);
+            if (i % 16 == 15) printf ("\\ndata: ");
+        }
+        if (i % 16 != 0) printf ("\\n");
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [2]
+To deal with strings holding binary data use the type \fBbytes\fR\&. It ensures that
+the function sees the proper binary data, and not how Tcl is encoding it internally, as
+the string types would\&.
+.PP
+.SS "CONSTANT BINARY DATA RESULTS"
+.IP [1]
+Use the command \fBcritcl::cdata\fR to create a command taking no arguments and
+returning a constant ByteArray value\&.
+.sp
+.CS
+
+
+    # P5 3 3 255 \\n \&.\&.\&.
+    critcl::cdata cross3x3pgm {
+	80 52 32 51 32 51 32 50 53 53 10
+	0   255 0
+	255 255 255
+	0   255 0
+    }
+
+.CE
+.PP
+.SS "TCL RUNTIME VERSION"
+.IP [1]
+See and reread the \fBbasic package\fR for the introduction of the
+commands referenced below\&.
+.IP [2]
+Use the command \fBcritcl::tcl\fR to tell \fICriTcl\fR the minimal version of Tcl
+the package is to be used with\&.
+.sp
+This determines which Tcl headers all files are compiled against, and what version
+of the public Tcl API is available to the C code\&.
+.sp
+Currently \fB8\&.4\fR, \fB8\&.5\fR and \fB8\&.6\fR are supported\&.
+.sp
+If not specified \fB8\&.4\fR is assumed\&.
+.PP
+.SS "ADDITIONAL TCL CODE"
+.IP [1]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    critcl::cproc greetings::hello {} void {
+	printf("hello world\\n");
+    }
+
+    critcl::cproc greetings::hi {} void {
+	printf("hi you\\n");
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [2]
+The command \fBhello\fR is now available as \fBgreetings::hello\fR, and a second
+command \fBgreetings::hi\fR was added\&.
+.IP [3]
+Tcl has automatically created the namespace \fBgreetings\fR\&.
+.IP [4]
+Create a file "\fIexample-policy\&.tcl\fR" and enter
+.CS
+
+
+    namespace eval greetings {
+	namespace export hello hi
+	namespace ensemble create
+    }
+
+.CE
+.IP into it\&.
+.IP [5]
+Edit "\fIexample\&.tcl\fR"\&. Add the code
+.CS
+
+
+    critcl::tsources example-policy\&.tcl
+
+.CE
+.IP and rebuild the package\&.
+.IP [6]
+The added Tcl code makes \fBgreetings\fR available as an \fIensemble\fR
+command\&.
+.sp
+The commands in the namespace have been registered as methods of the ensemble\&.
+.sp
+They can now be invoked as
+.CS
+
+
+    greetings hello
+    greetings hi
+
+.CE
+.IP [7]
+The Tcl builtin command \fBstring\fR is an ensemble as well, as is \fBclock\fR\&.
+.PP
+.PP
+New commands: \fIcritcl::tsources\fR
+.SS "DEBUGGING SUPPORT"
+.IP [1]
+See and reread the \fBbasic package\fR for the introduction of the
+commands referenced below\&.
+.IP [2]
+Use the command \fBcritcl::debug\fR to activate various features supporting debugging\&.
+.sp
+.CS
+
+
+    critcl::debug memory  ;# Activate Tcl memory debugging (-DTCL_MEM_DEBUG)
+    critcl::debug symbols ;# Activate building and linking with debugger symbols (-g)
+    critcl::debug all     ;# Shorthand for both `memory` and `symbols`\&.
+
+.CE
+.PP
+.SS "INSTALL THE PACKAGE"
+.IP [1]
+Starting from the \fBBasics\fR\&.
+.IP [2]
+Use an interactive \fBtclsh\fR seesion to determine the value of
+\fBinfo library\fR\&.
+.sp
+For the purpose of this HowTo assume that this path is
+"\fI/home/aku/opt/ActiveTcl/lib/tcl8\&.6\fR"
+.IP [3]
+Invoke the critcl application in a terminal, using
+.CS
+
+
+
+    critcl -libdir /home/aku/opt/ActiveTcl/lib/tcl8\&.6 -pkg example\&.tcl
+
+
+.CE
+.IP [4]
+The package is now build and installed into the chosen directory\&.
+.CS
+
+
+   % find /home/aku/opt/ActiveTcl/lib/tcl8\&.6/example/
+    /home/aku/opt/ActiveTcl/lib/tcl8\&.6/example/
+    /home/aku/opt/ActiveTcl/lib/tcl8\&.6/example/pkgIndex\&.tcl
+    /home/aku/opt/ActiveTcl/lib/tcl8\&.6/example/critcl-rt\&.tcl
+    /home/aku/opt/ActiveTcl/lib/tcl8\&.6/example/license\&.terms
+    /home/aku/opt/ActiveTcl/lib/tcl8\&.6/example/linux-x86_64
+    /home/aku/opt/ActiveTcl/lib/tcl8\&.6/example/linux-x86_64/example\&.so
+    /home/aku/opt/ActiveTcl/lib/tcl8\&.6/example/teapot\&.txt
+
+.CE
+.PP
+.SH "USING EXTERNAL LIBRARIES"
+To create a minimal package wrapping an external library
+.IP [1]
+Choose a directory to develop in and make it the working directory\&.
+This should not be a checkout of \fICriTcl\fR itself\&.
+.IP [2]
+Save the following example to a file\&. In the following it is assumed that the file
+was named "\fIexample\&.tcl\fR"\&.
+.CS
+
+
+# -*- tcl -*-
+# Critcl support, absolutely necessary\&.
+package require critcl
+
+# Bail out early if the compile environment is not suitable\&.
+if {![critcl::compiling]} {
+    error "Unable to build project, no proper compiler found\&."
+}
+
+# Information for the teapot\&.txt meta data file put into a generated package\&.
+# Free form strings\&.
+critcl::license {Andreas Kupries} {Under a BSD license}
+
+critcl::summary {The second CriTcl-based package}
+
+critcl::description {
+    This package is the second example of a CriTcl-based package\&. It contains all the
+    necessary and conventionally useful pieces for wrapping an external library\&.
+}
+
+critcl::subject {external library usage} example {critcl package}
+critcl::subject {wrapping external library}
+
+# Minimal Tcl version the package should load into\&.
+critcl::tcl 8\&.6
+
+# Locations for headers and shared library of the library to wrap\&.
+# Required only for non-standard locations, i\&.e\&. where CC is not searching by default\&.
+critcl::cheaders   -I/usr/include
+critcl::clibraries -L/usr/lib/x86_64-linux-gnu
+critcl::clibraries -lzstd
+
+# Import library API, i\&.e\&. headers\&.
+critcl::include zstd\&.h
+
+# ## #### ######### ################ #########################
+## (De)compression using Zstd
+## Data to (de)compress is passed in and returned as Tcl byte arrays\&.
+
+critcl::cproc compress {
+    Tcl_Interp* ip
+    bytes       data
+    int         {level ZSTD_CLEVEL_DEFAULT}
+} object0 {
+    /* critcl_bytes data; (\&.s, \&.len, \&.o) */
+    Tcl_Obj* error_message;
+
+    int max = ZSTD_maxCLevel();
+    if ((level < 1) || (level > max)) {
+	error_message = Tcl_ObjPrintf ("level must be integer between 1 and %d", max);
+	goto err;
+    }
+
+    size_t dest_sz  = ZSTD_compressBound (data\&.len);
+    void*  dest_buf = Tcl_Alloc(dest_sz);
+
+    if (!dest_buf) {
+	error_message = Tcl_NewStringObj ("can't allocate memory to compress data", -1);
+	goto err;
+    }
+
+    size_t compressed_size = ZSTD_compress (dest_buf, dest_sz,
+					    data\&.s,   data\&.len,
+					    level);
+    if (ZSTD_isError (compressed_size)) {
+	Tcl_Free(dest_buf);
+	error_message = Tcl_ObjPrintf ("zstd encoding error: %s",
+				       ZSTD_getErrorName (compressed_size));
+	goto err;
+    }
+
+    Tcl_Obj* compressed = Tcl_NewByteArrayObj (dest_buf, compressed_size);
+    Tcl_Free (dest_buf);
+
+    return compressed;
+  err:
+    Tcl_SetObjResult (ip, error_message);
+    return 0;
+}
+
+critcl::cproc decompress {
+    Tcl_Interp*  ip
+    bytes        data
+} object0 {
+    Tcl_Obj* error_message;
+
+    size_t dest_sz = ZSTD_getDecompressedSize (data\&.s, data\&.len);
+    if (dest_sz == 0) {
+        error_message = Tcl_NewStringObj("invalid data", -1);
+	goto err;
+    }
+
+    void* dest_buf = Tcl_Alloc (dest_sz);
+    if (!dest_buf) {
+	error_message = Tcl_NewStringObj("failed to allocate decompression buffer", -1);
+	goto err;
+    }
+
+    size_t decompressed_size = ZSTD_decompress (dest_buf, dest_sz,
+						data\&.s,   data\&.len);
+    if (decompressed_size != dest_sz) {
+	Tcl_Free (dest_buf);
+        error_message = Tcl_ObjPrintf("zstd decoding error: %s",
+				      ZSTD_getErrorName (decompressed_size));
+	goto err;
+    }
+
+    Tcl_Obj* decompressed = Tcl_NewByteArrayObj (dest_buf, dest_sz);
+    Tcl_Free (dest_buf);
+
+    return decompressed;
+
+  err:
+    Tcl_SetObjResult (ip, error_message);
+    return 0;
+}
+
+# ## #### ######### ################ #########################
+
+# Forcing compilation, link, and loading now\&.
+critcl::msg -nonewline { Building \&.\&.\&.}
+if {![critcl::load]} {
+    error "Building and loading the project failed\&."
+}
+
+# Name and version the package\&. Just like for every kind of Tcl package\&.
+package provide critcl-example 1
+
+
+.CE
+.IP [3]
+Build the package\&. See the \fBBasics\fR, if necessary\&.
+.IP [4]
+Load the package and invoke the commands\&.
+.sp
+\fIAttention\fR\&. The commands take and return binary data\&.
+This may look very bad in the terminal\&.
+.IP [5]
+To test the commands enter
+.CS
+
+
+    set a [compress {hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhello wwwwwwwworld}]
+
+    decompress $a
+
+.CE
+.IP in the interactive \fBtclsh\fR
+.PP
+.PP
+New commands: \fIcritcl::cheaders\fR, \fIcritcl::clibraries\fR, \fIcritcl::include\fR\&.
+.SS "DEFAULT VALUES FOR ARGUMENTS"
+.IP [1]
+Reread the example of the main section\&. Note specifically the line
+.CS
+
+
+    int {level ZSTD_CLEVEL_DEFAULT}
+
+.CE
+.IP [2]
+This line demonstrates that \fBcritcl::cproc\fR arguments allowed to have default
+values, in the same vein as \fBproc\fR arguments, and using the same syntax\&.
+.IP [3]
+\fIAttention\fR Default values have to be legal C rvalues and match the C type of
+the argument\&.
+.sp
+They are literally pasted into the generated C code\&.
+.sp
+They bypass any argument validation done in the generated translation layer\&. This
+means that it is possible to use a value an invoker of the command cannot use from Tcl\&.
+.IP [4]
+This kind of in-band signaling of a default versus a regular argument is however
+not necessary\&.
+.sp
+Look at
+.CS
+
+
+    critcl::cproc default_or_not {int {x 0}} void {
+	if !has_x {
+	    printf("called with default\\n");
+	    return
+	}
+	printf("called with %d\\n", x);
+    }
+
+.CE
+.sp
+Any argument \fIx\fR with a default causes \fICriTcl\fR to create a hidden
+argument \fIhas_x\fR, of type int (boolean)\&.
+This argument is set to \fB1\fR when \fIx\fR was filled from defaults, and \fB0\fR
+else\&.
+.PP
+.SS "CUSTOM ARGUMENT VALIDATION"
+.IP [1]
+Starting from the \fBbase wrapper\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.  Replace the entire \fBcompress\fR function with
+.CS
+
+
+    critcl::argtype zstd_compression_level {
+        /* argtype: `int` */
+        if (Tcl_GetIntFromObj (interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+        /* additional validation */
+        int max = ZSTD_maxCLevel();
+        if ((@A < 1) || (@A > max)) {
+            Tcl_SetObjResult (interp,
+                Tcl_ObjPrintf ("zstd compression level must be integer between 1 and %d", max));
+            return TCL_ERROR;
+        }
+        /* @@: current objv[] element
+        ** @A: name of argument variable for transfer to C function
+        ** interp: predefined variable, access to current interp - error messages, etc\&.
+        */
+    } int int ;# C types of transfer variable and function argument\&.
+
+    critcl::cproc compress {
+        Tcl_Interp*            ip
+        bytes                  data
+        zstd_compression_level {level ZSTD_CLEVEL_DEFAULT}
+    } object0 {
+        /* critcl_bytes data; (\&.s, \&.len, \&.o) */
+        /* int level; validated to be in range 1\&.\&.\&.ZSTD_maxCLevel() */
+
+        Tcl_Obj* error_message;
+
+        size_t dest_sz  = ZSTD_compressBound (data\&.len);
+        void*  dest_buf = Tcl_Alloc(dest_sz);
+
+        if (!dest_buf) {
+            error_message = Tcl_NewStringObj ("can't allocate memory to compress data", -1);
+            goto err;
+        }
+
+        size_t compressed_size = ZSTD_compress (dest_buf, dest_sz,
+                                                data\&.s,   data\&.len,
+                                                level);
+        if (ZSTD_isError (compressed_size)) {
+            Tcl_Free(dest_buf);
+            error_message = Tcl_ObjPrintf ("zstd encoding error: %s",
+                                           ZSTD_getErrorName (compressed_size));
+            goto err;
+        }
+
+        Tcl_Obj* compressed = Tcl_NewByteArrayObj (dest_buf, compressed_size);
+        Tcl_Free (dest_buf);
+
+        return compressed;
+    err:
+        Tcl_SetObjResult (ip, error_message);
+        return 0;
+    }
+
+.CE
+.IP and rebuild the package\&.
+.sp
+In the original example the \fIlevel\fR argument of the function was validated in
+the function itself\&.
+This may detract from the funtionality of interest itself, especially if there are lots of
+arguments requiring validation\&.
+If the same kind of argument is used in multiple places this causes code duplication in
+the functions as well\&.
+.sp
+Use a custom argument type as defined by the modification to move this kind of
+validation out of the function, and enhance readability\&.
+.sp
+Code duplication however is only partially adressed\&.
+While there is no duplication in the visible definitions the C code of the new argument
+type is replicated for each use of the type\&.
+.IP [2]
+Now replace the \fBargtype\fR definition with
+.CS
+
+
+    critcl::code {
+        int GetCompressionLevel (Tcl_Interp* interp, Tcl_Obj* obj, int* level)
+        {
+            if (Tcl_GetIntFromObj (interp, obj, level) != TCL_OK) return TCL_ERROR;
+
+            int max = ZSTD_maxCLevel();
+            if ((*level < 1) || (*level > max)) {
+                Tcl_SetObjResult (interp,
+                    Tcl_ObjPrintf ("zstd compression level must be integer between 1 and %d", max));
+                return TCL_ERROR;
+            }
+            return TCL_OK;
+        }
+    }
+
+    critcl::argtype zstd_compression_level {
+        if (GetCompressionLevel (@@, &@A) != TCL_OK) return TCL_ERROR;
+    } int int
+
+.CE
+.IP and rebuild the package\&.
+.sp
+Now only the calls to the new validation function are replicated\&.
+The function itself exists only once\&.
+.PP
+.SS "SEPARATING LOCAL C SOURCES"
+.IP [1]
+Starting from the end of the \fBprevious\fR section\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+.IP [2]
+Save the contents of the \fBcritcl::ccode\fR block into a file "\fIexample\&.c\fR" and
+then replace the entire block with
+.CS
+
+
+    critcl::csources example\&.c
+
+    critcl::ccode {
+	extern int GetCompressionLevel (Tcl_Interp* interp, Tcl_Obj* obj, int* level);
+    }
+
+.CE
+.sp
+When mixing C and Tcl code the different kind of indentation rules for these
+languages may come into strong conflict\&. Further, very large blocks of C code may reduce
+overall readability\&.
+.IP [3]
+The examples fixes this by moving the code block into a local C file and then
+registering this file with \fICriTcl\fR\&.
+When building the package \fICriTcl\fR arranges to build all such registered C files as
+well\&.
+.IP [4]
+\fIAttention\fR\&. The C code is now in a separate compilation unit\&.
+The example declares the exported function so that the \fBcproc\fRs are again able to see
+and use it\&.
+.IP [5]
+Now go a step further\&. Save the declaration into a file "\fIexample\&.h\fR", and then
+use
+.CS
+
+
+    critcl::include example\&.h
+
+.CE
+.IP to import it\&. Note that this is just a shorthand for
+.CS
+
+ critcl::ccode {
+	#include "example\&.h"
+    }
+
+.CE
+.IP [6]
+As an alternative solution, start from the beginning of the section and move the
+entire original \fBcritcl::ccode\fR block into a file "\fIexample-check\&.tcl\fR"\&.
+.sp
+Then replace it with
+.CS
+
+
+    critcl::source example-check\&.tcl
+
+.CE
+.IP to import it into the main code again\&.
+.sp
+\fIAttention\fR Tcl's builtin command \fBsource\fR is \fInot suitable\fR for
+importing the separate file due to how \fICriTcl\fR uses the information from
+\fBinfo script\fR to key various internal datastructures\&.
+.PP
+.SS "VERY SIMPLE RESULTS"
+.IP [1]
+Starting from the end of the \fBvalidation\fR section\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Add the code below, just before the \fBcompress\fR command\&.
+.CS
+
+
+    critcl::cconst version   char* ZSTD_VERSION_STRING
+    critcl::cconst min-level int   1
+    critcl::cconst max-level int   ZSTD_maxCLevel()
+
+.CE
+.IP and rebuild the package\&.
+.IP [2]
+These declarations create three additional commands, each returning the specified
+value\&. A fixed string, an integer, and a function call returning an integer\&.
+.IP [3]
+\fIAttention\fR The values have to be legal C rvalues and match the C type of the
+result\&. They are literally pasted into the generated C code\&.
+.IP [4]
+When using \fBcritcl::cconst\fR \fICriTcl\fR is aware that the result of the
+function does not depend on any parameters and is computed in a single C expression\&.
+.sp
+This enables it do to away with the internal helper function it would need and
+generate if \fBcritcl::cproc\fR had been used instead\&.
+For example
+.CS
+
+
+    critcl::cproc version {} char* {
+	return ZSTD_VERSION_STRING;
+    }
+
+.CE
+.PP
+.SS "STRUCTURE ARGUMENTS"
+.IP [1]
+For all that this is a part of how to
+\fBUse External Libraries\fR, for the demonstratation
+only the basics are needed\&.
+.IP [2]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    critcl::ccode {
+	typedef struct vec2 {
+	    double x;
+	    double y;
+	} vec2;
+
+	typedef vec2* vec2ptr;
+
+	int
+	GetVecFromObj (Tcl_Interp* interp, Tcl_Obj* obj, vec2ptr* vec)
+	{
+	    int len;
+	    if (Tcl_ListObjLength (interp, obj, &len) != TCL_OK) return TCL_ERROR;
+	    if (len != 2) {
+		Tcl_SetObjResult (interp, Tcl_ObjPrintf ("Expected 2 elements, got %d", len));
+		return TCL_ERROR;
+	    }
+
+	    Tcl_Obj* lv[2];
+	    if (Tcl_ListObjGetElements (interp, obj, &lv) != TCL_OK) return TCL_ERROR;
+
+	    double x, y;
+	    if (Tcl_GetDoubleFromObj (interp, lv[0], &x) != TCL_OK) return TCL_ERROR;
+	    if (Tcl_GetDoubleFromObj (interp, lv[1], &y) != TCL_OK) return TCL_ERROR;
+
+	    *vec = Tcl_Alloc (sizeof (vec2));
+	    (*vec)->x = x;
+	    (*vec)->y = y;
+	    return TCL_OK;
+	}
+    }
+
+    critcl::argtype vec2 {
+	if (GetVecFromObj (interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    } vec2ptr vec2ptr
+
+    critcl::argtyperelease vec2 {
+	/* @A : C variable holding the data to release */
+	Tcl_Free ((char*) @A);
+    }
+
+    critcl::cproc norm {vec2 vector} double {
+	double norm = hypot (vector->x, vector->y);
+	return norm;
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [3]
+The structure to pass as argument is a 2-dimensional vector\&. It is actually passed
+in as a pointer to a \fBvec2\fR structure\&.
+This pointer is created by the \fBGetVecFromObj\fR function\&. It allocates and fills the
+structure from the Tcl value, which has to be a list of 2 doubles\&. The bulk of the code in
+\fBGetVecFromObj\fR is for verifying this and extracting the doubles\&.
+.IP [4]
+The \fBargtyperelease\fR code releases the pointer when the C function returns\&. In
+other words, the pointer to the structure is owned by the translation layer and exists
+only while the function is active\&.
+.IP [5]
+While working this code has two disadvantages\&.
+First there is memory churn\&. Each call of \fBnorm\fR causes the creation and release of a
+temporary \fBvec2\fR structure for the argument\&.
+Second is the need to always extract the data from the \fBTcl_Obj*\fR value\&.
+.sp
+Both can be done better\&.
+.sp
+We will come back to this after explaining how to return structures to Tcl\&.
+.PP
+.SS "STRUCTURE RESULTS"
+.IP [1]
+Starting from the end of the \fBprevious\fR section\&.
+.IP [2]
+Edit the file "\fIexample\&.tcl\fR" and add the following code, just after the
+definition of the \fBnorm\fR command\&.
+.CS
+
+
+    critcl::resulttype vec2 {
+	/* rv: result value of function, interp: current Tcl interpreter */
+	if (rv == NULL) return TCL_ERROR;
+	Tcl_Obj* lv[2];
+	lv[0] = Tcl_NewDoubleObj (rv->x);
+	lv[1] = Tcl_NewDoubleObj (rv->y);
+	Tcl_SetObjResult (interp, Tcl_NewListObj (2, lv));
+	Tcl_Free (rv);
+	return TCL_OK;
+    } vec2ptr ;# C result type
+
+    critcl::cproc add {vec2 a vec2 b} vec2 {
+	vec2ptr z = Tcl_Alloc (sizeof (vec2));
+
+	z->x = a->x + b->x;
+	z->y = a->y + b->y;
+
+	return z;
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [3]
+The new command \fBadd\fR takes two vectors and return the element-wise sum of both
+as a new vector\&.
+.IP [4]
+The function allocates and initializes a structure and hands it over to the
+translation layer\&. Which in turn constructs a Tcl list of 2 doubles from it, sets that as
+the command's result and at last discards the allocated structure again\&.
+.IP [5]
+While working this code has two disadvantages\&.
+First there is memory churn\&. Each call of \fBadd\fR causes the creation and release of
+three temporary \fBvec2\fR structures\&. One per argument, and one for the result\&.
+Second is the need to always construct a complex \fBTcl_Obj*\fR value from the structure\&.
+.sp
+Both can be done better\&. This is explained in the next section\&.
+.PP
+.SS "STRUCTURE TYPES"
+.IP [1]
+Starting from the end of the previous section\&.
+.IP [2]
+Edit the file "\fIexample\&.tcl\fR"\&.
+.IP [3]
+Remove the entire functionality (type definitions, related C code, and cprocs)\&.
+Replace it with
+.CS
+
+
+    critcl::ccode {
+	typedef struct vec2 {
+	    double x;
+	    double y;
+	} vec2;
+
+	typedef vec2* vec2ptr;
+
+	/* -- Core vector structure management -- */
+
+	static vec2ptr Vec2New (double x, double y) {
+	    vec2ptr vec = Tcl_Alloc (sizeof (vec2));
+	    vec->x = x;
+	    vec->y = y;
+	    return vec;
+	}
+
+	static vec2ptr Vec2Copy (vec2ptr src) {
+	    vec2ptr vec = Tcl_Alloc (sizeof (vec2));
+	    *vec = *src
+	    return vec;
+	}
+
+	static void Vec2Release (vec2ptr vec) {
+	    Tcl_Free ((char*) vec);
+	}
+
+	/* -- Tcl value type for vec2 -- Tcl_ObjType -- */
+
+	static void Vec2Free     (Tcl_Obj* obj);
+	static void Vec2StringOf (Tcl_Obj* obj);
+	static void Vec2Dup      (Tcl_Obj* obj, Tcl_Obj* dst);
+	static int  Vec2FromAny  (Tcl_Interp* interp, Tcl_Obj* obj);
+
+	Tcl_ObjType vec2_objtype = {
+	    "vec2",
+	    Vec2Free,
+	    Vec2Dup,
+	    Vec2StringOf,
+	    Vec2FromAny
+	};
+
+	static void Vec2Free (Tcl_Obj* obj) {
+	    Vec2Release ((vec2ptr) obj->internalRep\&.otherValuePtr);
+	}
+
+	static void Vec2Dup (Tcl_Obj* obj, Tcl_Obj* dst) {
+	    vec2ptr vec = (vec2ptr) obj->internalRep\&.otherValuePtr;
+
+	    dst->internalRep\&.otherValuePtr = Vec2Copy (vec);
+	    dst->typePtr                   = &vec2_objtype;
+	}
+
+	static void Vec2StringOf (Tcl_Obj* obj) {
+	    vec2ptr vec = (vec2ptr) obj->internalRep\&.otherValuePtr;
+
+	    /* Serialize vector data to string (list of two doubles) */
+	    Tcl_DString      ds;
+	    Tcl_DStringInit (&ds);
+
+	    char buf [TCL_DOUBLE_SPACE];
+
+	    Tcl_PrintDouble (0, vec->x, buf); Tcl_DStringAppendElement (&ds, buf);
+	    Tcl_PrintDouble (0, vec->y, buf); Tcl_DStringAppendElement (&ds, buf);
+
+	    int length = Tcl_DStringLength (ds);
+
+	    /* Set string representation */
+	    obj->length = length;
+	    obj->bytes  = Tcl_Alloc(length+1);
+	    memcpy (obj->bytes, Tcl_DStringValue (ds), length);
+	    obj->bytes[length] = '\\0';
+	    /*
+	    ** : package require critcl::cutil ;# get C utilities
+	    ** : critcl::cutil::alloc          ;# Activate allocation utilities
+	    ** : (Internally cheaders, include)
+	    ** : Then all of the above can be written as STREP_DS (obj, ds);
+	    ** : STREP_DS = STRing REP from DString
+	    */
+
+	    Tcl_DStringFree (&ds);
+	}
+
+	static int Vec2FromAny (Tcl_Interp* interp, Tcl_Obj* obj) {
+	    /* Change intrep of obj to vec2 structure\&.
+	    ** A Tcl list of 2 doubles is used as an intermediary intrep\&.
+	    */
+
+	    int len;
+	    if (Tcl_ListObjLength (interp, obj, &len) != TCL_OK) return TCL_ERROR;
+	    if (len != 2) {
+		Tcl_SetObjResult (interp, Tcl_ObjPrintf ("Expected 2 elements, got %d", len));
+		return TCL_ERROR;
+	    }
+
+	    Tcl_Obj* lv[2];
+	    if (Tcl_ListObjGetElements (interp, obj, &lv) != TCL_OK) return TCL_ERROR;
+
+	    double x, y;
+	    if (Tcl_GetDoubleFromObj (interp, lv[0], &x) != TCL_OK) return TCL_ERROR;
+	    if (Tcl_GetDoubleFromObj (interp, lv[1], &y) != TCL_OK) return TCL_ERROR;
+
+	    obj->internalRep\&.otherValuePtr = (void*) Vec2New (x, y);
+	    obj->typePtr                   = &vec2_objtype;
+
+	    return TCL_OK;
+	}
+
+	/* -- (un)packing structures from/into Tcl values -- */
+
+	int GetVecFromObj (Tcl_Interp* interp, Tcl_Obj* obj, vec2ptr* vec)
+	{
+	    if (obj->typePtr != &vec2_objtype) {
+		if (Vec2FromAny (interp, obj) != TCL_OK) return TCL_ERROR;
+	    }
+
+	    *vec = (vec2ptr) obj->internalRep\&.otherValuePtr;
+	    return TCL_OK;
+	}
+
+	Tcl_Obj* NewVecObj (vec2ptr vec) {
+	    Tcl_Obj* obj = Tcl_NewObj ();
+
+	    Tcl_InvalidateStringRep (obj);
+
+	    obj->internalRep\&.otherValuePtr = Vec2Copy (vec);
+	    obj->typePtr                   = &vec2_objtype;
+
+	    return obj;
+	}
+    }
+
+    critcl::argtype vec2 {
+	if (GetVecFromObj (interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    } vec2ptr vec2ptr
+
+    critcl::resulttype vec2 {
+	/* rv: result value of function, interp: current Tcl interpreter */
+	Tcl_SetObjResult (interp, NewVecObj (&rv));
+	return TCL_OK;
+    } vec2
+
+    critcl::cproc norm {vec2 vector} double {
+	double norm = hypot (vector->x, vector->y);
+	return norm;
+    }
+
+    critcl::cproc add {vec2 a vec2 b} vec2 {
+	vec2 z;
+
+	z\&.x = a->x + b->x;
+	z\&.y = a->y + b->y;
+
+	return z;
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [4]
+This implements a new \fBTcl_ObjType\fR to handle \fBvec2\fR structures\&. With it
+\fBvec2\fR structures are become usable as internal representation (\fIintrep\fR of
+\fBTcl_Obj*\fR values\&.
+.sp
+The two functions \fBNewVecObj\fR and \fBGetVecFromObj\fR pack and unpack the
+structures from and into \fBTcl_Obj*\fR values\&.
+The latter performs the complex deserialization into a structure if and only if needed,
+i\&.e\&. when the \fBTclObj*\fR value has no intrep, or the intrep for a different type\&.
+This process of changing the intrep of a Tcl value is called \fIshimmering\fR\&.
+.sp
+Intreps cache the interpretation of \fBTcl_Obj*\fR values as a specific kind of
+type\&. Here \fBvec2\fR\&. This reduces conversion effort and memory churn, as intreps are
+kept by the Tcl interpreter as long as possible and needed\&.
+.IP [5]
+The arguments of \fBnorm\fR and \fBadd\fR are now converted once on entry, if not
+yet in the proper type, or not at all, if so\&.
+.IP [6]
+\fIAttention\fR\&. This example has the issue of passing result structures by value
+through the stack, and then packing a copy into a \fBTcl_Obj*\fR value\&.
+While this is no trouble for structures as small as \fBvec2\fR larger structures may pose
+a problem\&.
+.sp
+We will address this in the next section\&.
+.PP
+.PP
+Packages: \fIcritcl::cutil\fR
+.SS "LARGE STRUCTURES"
+.IP [1]
+Starting from the end of the previous section\&.
+.IP [2]
+Edit the file "\fIexample\&.tcl\fR"\&.
+.IP [3]
+Describing each individual change is too complex\&. The following is easier\&.
+.IP [4]
+Save the file, then replace the entire functionality with the following\&.
+.IP [5]
+After that use a \fBdiff\fR of your choice to compare the files and see the
+critical changes\&.
+.CS
+
+
+    critcl::ccode {
+	typedef struct vec2 {
+	    unsigned int rc;
+	    double x;
+	    double y;
+	} vec2;
+
+	typedef vec2* vec2ptr;
+
+	/* -- Core vector structure management -- */
+
+	static vec2ptr Vec2New (double x, double y) {
+	    vec2ptr vec = Tcl_Alloc (sizeof (vec2));
+	    vec->rc = 0;
+	    vec->x = x;
+	    vec->y = y;
+	    return vec;
+	}
+
+	static vec2ptr Vec2Copy (vec2ptr src) {
+	    scr->rc ++;
+	    return src;
+	}
+
+	static void Vec2Release (vec2ptr vec) {
+	    if (vec->rc > 1) {
+		vec->rc --;
+		return;
+	    }
+
+	    Tcl_Free ((char*) vec);
+	}
+
+	/* -- Vector obj type -- */
+
+	static void Vec2Free     (Tcl_Obj* obj);
+	static void Vec2StringOf (Tcl_Obj* obj);
+	static void Vec2Dup      (Tcl_Obj* obj, Tcl_Obj* dst);
+	static int  Vec2FromAny  (Tcl_Interp* interp, Tcl_Obj* obj);
+
+	Tcl_ObjType vec2_objtype = {
+	    "vec2",
+	    Vec2Free,
+	    Vec2Dup,
+	    Vec2StringOf,
+	    Vec2FromAny
+	};
+
+	static void Vec2Free (Tcl_Obj* obj) {
+	    Vec2Release ((vec2ptr) obj->internalRep\&.otherValuePtr);
+	}
+
+	static void Vec2Dup (Tcl_Obj* obj, Tcl_Obj* dst) {
+	    vec2ptr vec = (vec2ptr) obj->internalRep\&.otherValuePtr;
+
+	    dst->internalRep\&.otherValuePtr = Vec2Copy (vec);
+	    dst->typePtr                   = &vec2_objtype;
+	}
+
+	static void Vec2StringOf (Tcl_Obj* obj) {
+	    vec2ptr vec = (vec2ptr) obj->internalRep\&.otherValuePtr;
+
+	    /* Serialize vector data to string (list of two doubles) */
+	    Tcl_DString      ds;
+	    Tcl_DStringInit (&ds);
+
+	    char buf [TCL_DOUBLE_SPACE];
+
+	    Tcl_PrintDouble (0, vec->x, buf); Tcl_DStringAppendElement (&ds, buf);
+	    Tcl_PrintDouble (0, vec->y, buf); Tcl_DStringAppendElement (&ds, buf);
+
+	    int length = Tcl_DStringLength (ds);
+
+	    /* Set string representation */
+	    obj->length = length;
+	    obj->bytes  = Tcl_Alloc(length+1);
+	    memcpy (obj->bytes, Tcl_DStringValue (ds), length);
+	    obj->bytes[length] = '\\0';
+	    /*
+	    ** : package require critcl::cutil ;# get C utilities
+	    ** : critcl::cutil::alloc          ;# Activate allocation utilities
+	    ** : (Internally cheaders, include)
+	    ** : Then all of the above can be written as STREP_DS (obj, ds);
+	    ** : STREP_DS = STRing REP from DString
+	    */
+
+	    Tcl_DStringFree (&ds);
+	}
+
+	static int Vec2FromAny (Tcl_Interp* interp, Tcl_Obj* obj) {
+	    /* Change internal rep of obj to vector structure\&.
+	    ** A Tcl list of 2 doubles is used as intermediary int rep\&.
+	    */
+
+	    int len;
+	    if (Tcl_ListObjLength (interp, obj, &len) != TCL_OK) return TCL_ERROR;
+	    if (len != 2) {
+		Tcl_SetObjResult (interp, Tcl_ObjPrintf ("Expected 2 elements, got %d", len));
+		return TCL_ERROR;
+	    }
+
+	    Tcl_Obj* lv[2];
+	    if (Tcl_ListObjGetElements (interp, obj, &lv) != TCL_OK) return TCL_ERROR;
+
+	    double x, y;
+	    if (Tcl_GetDoubleFromObj (interp, lv[0], &x) != TCL_OK) return TCL_ERROR;
+	    if (Tcl_GetDoubleFromObj (interp, lv[1], &y) != TCL_OK) return TCL_ERROR;
+
+	    obj->internalRep\&.otherValuePtr = (void*) Vec2New (x, y);
+	    obj->typePtr                   = &vec2_objtype;
+
+	    return TCL_OK;
+	}
+
+	/* (un)packing structures from/into Tcl values -- */
+
+	int GetVecFromObj (Tcl_Interp* interp, Tcl_Obj* obj, vec2ptr* vec)
+	{
+	    if (obj->typePtr != &vec2_objtype) {
+		if (VecFromAny (interp, obj) != TCL_OK) return TCL_ERROR;
+	    }
+
+	    *vec = (vec2ptr) obj->internalRep\&.otherValuePtr;
+	    return TCL_OK;
+	}
+
+	Tcl_Obj* NewVecObj (vec2ptr vec) {
+	    Tcl_Obj* obj = Tcl_NewObj ();
+
+	    Tcl_InvalidateStringRep (obj);
+
+	    obj->internalRep\&.otherValuePtr = Vec2Copy (vec);
+	    obj->typePtr                   = &vec2_objtype;
+
+	    return obj;
+	}
+    }
+
+    critcl::argtype vec2 {
+	if (GetVecFromObj (interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    } vec2ptr vec2ptr
+
+    critcl::resulttype vec2 {
+	/* rv: result value of function, interp: current Tcl interpreter */
+	Tcl_SetObjResult (interp, NewVecObj (rv));
+	return TCL_OK;
+    } vec2ptr
+
+    critcl::cproc norm {vec2 vector} double {
+	double norm = hypot (vector->x, vector->y);
+	return norm;
+    }
+
+    critcl::cproc add {vec2 a vec2 b} vec2 {
+	return Vec2New (a->x + b->x, a->y + b->y);
+    }
+
+.CE
+.IP [6]
+The \fBvec2\fR structure is now reference counted\&.
+.IP [7]
+The core management functions, i\&.e\&. \fBVec2New\fR, \fBVec2Copy\fR, and
+\fBVec2Release\fR are changed to maintain that reference count\&.
+Starting at \fB0\fR on creation, copies increment, and releases decrement\&.
+A structure is actually only freed when its reference count falls to \fB0\fR or below\&.
+.IP [8]
+\fBvec2\fR results are changed to pointers, easily passed back through the stack\&.
+The modified translation layer just wraps it into a \fBTcl_Obj*\fR value\&.
+.IP [9]
+\fIAttention\fR\&. Duplicating such a \fBTcl_Obj*\fR does not duplicate the
+referenced \fBvec2\fR structure anymore, just adds a reference\&.
+.IP [10]
+Regarding \fBdiff\fR commands, I know of two graphical diffs for Tcl/Tk,
+\fITkDiff\fR [https://tkdiff\&.sourceforge\&.io], and \fIEskil\fR [http://eskil\&.tcl\&.tk]\&.
+.PP
+.PP
+Packages: \fIcritcl::cutil\fR
+.SS "EXTERNAL STRUCTURES"
+.IP [1]
+Handle structures provided by external libraries using either
+\fBStructure Types\fR or \fBLarge Structures\fR as template\&.
+.IP [2]
+\fIAttention\fR\&. The choice is with the developer\&.
+.sp
+This is true even if the external structure is not reference counted by itself\&.
+.sp
+To reference count a structure \fBS\fR without such simply wrap \fBS\fR into a
+local structure which provides the reference count and has a field for \fBS\fR (pointer
+or value)\&.
+.IP [3]
+\fIAttention\fR Opaque external types, i\&.e\&. pointers to structures with hidden
+fields, can also be handled by the given templates\&.
+.PP
+.SS "EXTERNAL ENUMERATIONS"
+This section demonstrates how to convert from any kind of enumeration provided by an
+external library to Tcl strings, and the converse\&.
+.IP [1]
+For all that this is a part of how to
+\fBUse External Libraries\fR, for the demonstratation
+only the basics are needed\&.
+.IP [2]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    package require critcl::emap
+
+    # no header included due to use of literal ints instead of symbolic names
+
+    critcl::emap::def yaml_sequence_style_t {
+	any   0
+	block 1
+	flow  2
+    }
+
+    # encode: style to int
+    critcl::cproc encode {yaml_sequence_style_t style} int {
+	return style;
+    }
+
+    # decode: int to style
+    critcl::cproc decode {int style} yaml_sequence_style_t {
+	return style;
+    }
+
+.CE
+.IP and rebuild the package\&.
+.IP [3]
+The map converts between the Tcl level strings listed on the left side to the C
+values on the right side, and the reverse\&.
+.IP [4]
+It automatically generates \fBcritcl::argtype\fR and \fBcritcl::resulttype\fR
+definitions\&.
+.IP [5]
+\fIAttention\fR Like the default values for \fBcproc\fR arguments, and the results
+for \fBcconst\fR definitions the values on the right side have to be proper C
+rvalues\&. They have to match C type \fBint\fR\&.
+.sp
+In other words, it is perfectly ok to use the symbolic names provided by the header
+file of the external library\&.
+.sp
+\fIAttention\fR This however comes at a loss in efficiency\&. As \fICriTcl\fR then
+has no insight into the covered range of ints, gaps, etc\&. it has to perform a linear
+search when mapping from C to Tcl\&. When it knows the exact integer values it can use a
+table lookup instead\&.
+.sp
+\fIAttention\fR It also falls back to a search if a lookup table would contain more
+than 50 entries\&.
+.PP
+.PP
+Packages: \fIcritcl::emap\fR
+.SS "EXTERNAL BITSETS/BITMAPS/FLAGS"
+This section demonstrates how to convert from any kind of bit-mapped flags provided by an
+external library to lists of Tcl strings, and the converse\&.
+.IP [1]
+For all that this is a part of how to
+\fBUse External Libraries\fR, for the demonstratation
+only the basics are needed\&.
+.IP [2]
+Starting from the \fBBasics\fR\&.
+Edit the file "\fIexample\&.tcl\fR"\&.
+Remove the definition of \fBhello\fR\&. Replace it with
+.CS
+
+
+    # http://man7\&.org/linux/man-pages/man7/inotify\&.7\&.html
+
+    package require critcl::bitmap
+
+    # critcl::cheaders - n/a, header is in system directories
+    critcl::include sys/inotify\&.h
+
+    critcl::bitmap::def tcl_inotify_events {
+	accessed       IN_ACCESS
+	all            IN_ALL_EVENTS
+	attribute      IN_ATTRIB
+	closed         IN_CLOSE
+	closed-nowrite IN_CLOSE_NOWRITE
+	closed-write   IN_CLOSE_WRITE
+	created        IN_CREATE
+	deleted        IN_DELETE
+	deleted-self   IN_DELETE_SELF
+	dir-only       IN_ONLYDIR
+	dont-follow    IN_DONT_FOLLOW
+	modified       IN_MODIFY
+	move           IN_MOVE
+	moved-from     IN_MOVED_FROM
+	moved-self     IN_MOVE_SELF
+	moved-to       IN_MOVED_TO
+	oneshot        IN_ONESHOT
+	open           IN_OPEN
+	overflow       IN_Q_OVERFLOW
+	unmount        IN_UNMOUNT
+    } {
+	all closed move oneshot
+    }
+
+    # encode: flag set to int
+    critcl::cproc encode {tcl_inotify_events e} int {
+	return e;
+    }
+
+    # decode: int to flag set
+    critcl::cproc decode {int e} tcl_inotify_events {
+	return e;
+    }
+
+
+.CE
+.IP and rebuild the package\&.
+.IP [3]
+The map converts between lists of the Tcl level strings listed on the left side to
+the bit-union of the C values on the right side, and the reverse\&.
+.sp
+It is noted that the four strings \fBall\fR, \fBclosed\fR, \fBmove\fR, and
+\fBoneshot\fR cannot be converted from C flags to list of strings, only from list to
+bits\&.
+.IP [4]
+It automatically generates \fBcritcl::argtype\fR and \fBcritcl::resulttype\fR
+definitions\&.
+.IP [5]
+\fIAttention\fR Like the default values for \fBcproc\fR arguments, and the results
+for \fBcconst\fR definitions the values on the right side have to be proper C
+rvalues\&. They have to match C type \fBint\fR\&.
+.sp
+In other words, it is perfectly ok to use the symbolic names provided by the header
+file of the external library\&. As shown\&.
+.PP
+.PP
+Packages: \fIcritcl::bitmap\fR
+.SS "NON-STANDARD HEADER/LIBRARY LOCATIONS"
+.IP [1]
+See and reread the \fBbasic wrapper package\fR for
+the introduction of the commands referenced below\&.
+.IP [2]
+\fIAttention\fR Relative paths will be resolved relative to the location of the
+"\fI\&.tcl\fR" file containing the \fICriTcl\fR commands\&.
+.IP [3]
+Use the command \fBcritcl::cheaders\fR to tell \fICriTcl\fR about non-standard
+locations for header files\&.
+.sp
+Multiple arguments are allowed, and multiple calls as well\&. The information
+accumulates\&.
+.sp
+Arguments of the form "\fI-Idirectory\fR" register the directory directly\&.
+.sp
+For arguments of the form "\fIpath\fR" the directory holding the path is
+registered\&. In other words, it is assumed to be the full path of a header \fIfile\fR, and
+not a directory\&.
+.sp
+.CS
+
+
+    critcl::cheaders -I/usr/local/include
+    critcl::cheaders local/types\&.h
+    critcl::cheaders other-support/*\&.h
+
+.CE
+.IP [4]
+Use the command \fBcritcl::include\fR to actually use a specific header file\&.
+.IP [5]
+Use the command \fBcritcl::clibraries\fR to tell \fICriTcl\fR about non-standard
+locations for shared libaries, and about shared libaries to link to
+.sp
+Multiple arguments are allowed, and multiple calls as well\&. The information
+accumulates\&.
+.sp
+Arguments of the form "\fI-Ldirectory\fR" register a directory\&.
+.sp
+Arguments of the form "\fI-lname\fR" register a shared libary to link to by
+name\&. The library will be looked for in both standard and registered directories\&.
+.sp
+Arguments of the form "\fI-path\fR" register a shared libary to link to by full
+path\&.
+.sp
+.CS
+
+
+    critcl::clibraries -L/usr/lib/x86_64-linux-gnu
+    critcl::clibraries -lzstd
+    critcl::clibraries /usr/lib/x86_64-linux-gnu/libzstd\&.so
+
+.CE
+.IP [6]
+On Mac OS X use the command \fBcritcl::framework\fR to name the frameworks to use
+in the package\&.
+.sp
+\fIAttention\fR Using the command on other platforms is ok, and will be ignored\&.
+.IP [7]
+Not answered in the above is how to find the necessary paths if they are not fixed
+across machines or platforms\&.
+.sp
+We will come back to this\&.
+.PP
+.SS "NON-STANDARD COMPILE/LINK CONFIGURATION"
+.IP [1]
+See and reread the \fBbasic wrapper package\fR for
+the introduction of the commands referenced below\&.
+.IP [2]
+Use the command \fBcritcl::cflags\fR to provide additional, non-standard flags to
+the compiler\&.
+.sp
+.CS
+
+
+    critcl::cflags -DBYTE_ORDER=bigendian
+
+.CE
+.IP [3]
+Use the command \fBcritcl::ldflags\fR to provide additional, non-standard flags to
+the linker\&.
+.sp
+.CS
+
+
+    critcl::ldflags -
+
+.CE
+.IP [4]
+Not answered in the above is how to determine such flags if they are not fixed
+across machines or platforms\&.
+.sp
+This is addressed by the next section\&.
+.PP
+.SS "QUERYING THE COMPILATION ENVIRONMENT"
+.IP [1]
+Use the command \fBcritcl::check\fR to immediately check if a piece of C code can
+compiled successfully as a means of querying the compiler configuration itself\&.
+.sp
+.CS
+
+
+    if {[critcl::check {
+        #include <FOO\&.h>
+    }]} {
+        Do stuff with FOO\&.h present\&.
+    } else {
+        Do stuff without FOO\&.h
+    }
+
+.CE
+.sp
+All header and library paths which were registered with \fICriTcl\fR before using
+\fBcritcl::check\fR take part in the attempted compilation\&.
+.sp
+Use the package \fBcritcl::util\fR and various convenience commands it
+provides\&.
+.IP [2]
+Use the full \fIPower of Tcl (tm)\fR itself\&.
+.PP
+.SS "SHARED C CODE"
+.IP [1]
+See and reread the \fBbasic wrapper package\fR for
+the introduction of the commands referenced below\&.
+.IP [2]
+Use the command \fBcritcl::ccode\fR to write C code residing outside of \fBcproc\fR
+bodies\&.
+.IP [3]
+Or, alternatively, place the C code into one or more "\fI\&.c\fR" files and use the
+command \fBcritcl::csources\fR to register them with \fICriTcl\fR for compilation\&.
+.IP [4]
+This topic is also treated in section \fBSeparating Local C Sources\fR\&.
+.PP
+.SH VARIOUS
+.SS "AUTHOR, LICENSE, DESCRIPTION, KEYWORDS"
+.IP [1]
+See and reread the \fBbasic package\fR for the introduction of the
+commands referenced below\&.
+.IP [2]
+Use the command \fBcritcl::license\fR to set the package license\&.
+.sp
+Use the same command to set the package author\&.
+.sp
+Both arguments are free form text\&.
+.IP [3]
+Use the command \fBcritcl::summary\fR to set a short package description\&.
+.IP [4]
+Use the command \fBcritcl::description\fR to set a longer package description\&.
+.sp
+The arguments of both commands are free form text\&.
+.IP [5]
+Use the command \fBcritcl::subject\fR to set one or more keywords\&.
+.sp
+\fIAttention\fR Contrary to the other commands the arguments accumulate\&.
+.IP [6]
+All the commands are optional\&.
+.IP [7]
+Their information is not placed into the generated C code\&.
+.IP [8]
+In \fIpackage mode\fR the information is placed into the file "\fIteapot\&.txt\fR"
+of the generated package\&.
+.IP [9]
+This file serves as integration point for \fITeapot\fR, the package system of
+\fIActiveTcl\fR\&.
+.PP
+.SS "GET CRITCL APPLICATION HELP"
+.IP [1]
+Invoke the command
+.CS
+
+
+    critcl -help
+
+.CE
+.IP in a terminal to get help about the \fBcritcl\fR application\&.
+.PP
+.SS "SUPPORTED TARGETS & CONFIGURATIONS"
+.IP [1]
+Invoke the application as
+.CS
+
+
+    critcl -show
+
+.CE
+.IP in a terminal to get the detailed configuration of the target for the current platform\&.
+.IP [2]
+Invoke the application as
+.CS
+
+
+    critcl -show -target NAME
+
+.CE
+.IP in a terminal to get the detailed configuration of the named target\&.
+.IP [3]
+Invoke the application as
+.CS
+
+
+    critcl -targets
+
+.CE
+.IP in a terminal to get a list of the available targets\&.
+.PP
+.SS "BUILDING A PACKAGE"
+.IP [1]
+Start at section \fBBasics\fR\&.
+.PP
+.SS "BUILDING A PACKAGE FOR DEBUGGING"
+.IP [1]
+Start at section \fBBasics\fR\&.
+.PP
+.SH AUTHORS
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report them at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR\&.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR as well\&.
+.SH KEYWORDS
+C code, Embedded C Code, calling C code from Tcl, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) Jean-Claude Wippler
+Copyright (c) Steve Landers
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_iassoc.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_iassoc.n
new file mode 100644
index 00000000..7490fad6
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_iassoc.n
@@ -0,0 +1,444 @@
+'\"
+'\" Generated from file 'critcl_iassoc\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl::iassoc" n 1\&.2 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl::iassoc \- CriTcl - Code Gen - Tcl Interp Associations
+.SH SYNOPSIS
+package require \fBTcl  8\&.6\fR
+.sp
+package require \fBcritcl  ?3\&.2?\fR
+.sp
+package require \fBcritcl::iassoc  ?1\&.2?\fR
+.sp
+\fB::critcl::iassoc::def\fR \fIname\fR \fIarguments\fR \fIstruct\fR \fIconstructor\fR \fIdestructor\fR
+.sp
+.BE
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This document is the reference manpage for the \fBcritcl::iassoc\fR
+package\&. This package provides convenience commands for advanced
+functionality built on top of the critcl core\&.
+.PP
+With it a user wishing to associate some data with a Tcl
+interpreter via Tcl's \fBTcl_(Get|Set)AssocData()\fR APIs can now
+concentrate on the data itself, while all the necessary boilerplate
+around it is managed by this package\&.
+.PP
+Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code\&.
+.PP
+This package resides in the Core Package Layer of CriTcl\&.
+.PP
+.PS
+.nf
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
+*================*
+|Core Packages   |
+| critcl         |
+| critcl::util   |
+*================*
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  \&.\&.\&.           |
++----------------+
+
+.fi
+.PE
+.PP
+.SH API
+.TP
+\fB::critcl::iassoc::def\fR \fIname\fR \fIarguments\fR \fIstruct\fR \fIconstructor\fR \fIdestructor\fR
+This command defines a C function with the given \fIname\fR which
+provides access to a structure associated with a Tcl interpreter\&.
+.sp
+The C code code fragment \fIstruct\fR defines the elements of
+said structure, whereas the fragments \fIconstructor\fR and
+\fIdestructor\fR are C code blocks executed to initialize and release
+any dynamically allocated parts of this structure, when needed\&. Note
+that the structure itself is managed by the system\&.
+.sp
+The new function takes a \fBTcl_Interp*\fR pointer refering
+to the interpreter whose structure we wish to obtain as the first
+argument, plus the specified \fIarguments\fR and returns a pointer to
+the associated structure, of type "\fIname\fR_data" (see below)\&.
+.sp
+The \fIarguments\fR are a dictionary-like list of C types and
+identifiers specifying additional arguments for the accessor function,
+and, indirectly, the \fIconstructor\fR C code block\&. This is useful
+for the supplication of initialization values, or the return of more
+complex error information in case of a construction failure\&.
+.sp
+The C types associated with the structure are derived from
+\fIname\fR, with "\fIname\fR_data__" the type of the structure itself,
+and "\fIname\fR_data" representing a pointer to the structure\&.
+The C code blocks can rely on the following C environments:
+.RS
+.TP
+\fIconstructor\fR
+.RS
+.TP
+\fBdata\fR
+Pointer to the structure (type: \fIname\fR_data) to
+initialize\&.
+.TP
+\fBinterp\fR
+Pointer to the Tcl interpreter (type: Tcl_Interp*)
+the new structure will be associated with\&.
+.TP
+error
+A C code label the constructor can jump to should it have
+to signal a construction failure\&. It is the responsibility of the
+constructor to release any fields already initialized before jumping
+to this label\&.
+.TP
+\&.\&.\&.
+The names of the constructor arguments specified with
+\fIarguments\fR\&.
+.RE
+.TP
+\fIdestructor\fR
+.RS
+.TP
+\fBdata\fR
+Pointer to the structure being released\&.
+.TP
+\fBinterp\fR
+Pointer to the Tcl interpreter the structure
+belonged to\&.
+.RE
+.RE
+.PP
+.SH EXAMPLE
+The example shown below is the specification of a simple interpreter-associated
+counter\&. The full example, with meta data and other incidentals, can be found
+in the directory "\fIexamples/queue\fR" of the critcl source
+distribution/repository\&.
+.CS
+
+
+package require Tcl 8\&.6
+package require critcl 3\&.2
+
+critcl::buildrequirement {
+    package require critcl::iassoc
+}
+
+critcl::iassoc::def icounter {} {
+    int counter; /* The counter variable */
+} {
+    data->counter = 0;
+} {
+    /* Nothing to release */
+}
+
+critcl::ccode {
+    \&.\&.\&. function (\&.\&.\&.)
+    {
+         /* Access to the data \&.\&.\&. */
+         icounter_data D = icounter (interp /* \&.\&.\&. any declared arguments, here, none */);
+	 \&.\&.\&. D->counter \&.\&.\&.
+    }
+}
+# or, of course, 'cproc's, 'ccommand's etc\&.
+
+package provide icounter 1
+
+.CE
+.SH AUTHORS
+Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report such at \fIhttps://github\&.com/andreas-kupries/critcl\fR\&.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation\&.
+.SH KEYWORDS
+C code, Embedded C Code, Tcl Interp Association, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation, singleton
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_license.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_license.n
new file mode 100644
index 00000000..54b22602
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_license.n
@@ -0,0 +1,336 @@
+'\"
+'\" Generated from file 'critcl_license\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) Jean-Claude Wippler
+'\" Copyright (c) Steve Landers
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl_license" n 1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl_license \- The CriTcl License
+.SH DESCRIPTION
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+All packages are under the BSD license\&.
+.SH LICENSE
+.PP
+This software is copyrighted by Andreas Kupries and other parties\&.  The following
+terms apply to all files associated with the software unless explicitly disclaimed in
+individual files\&.
+.PP
+The authors hereby grant permission to use, copy, modify, distribute, and license
+this software and its documentation for any purpose, provided that existing copyright
+notices are retained in all copies and that this notice is included verbatim in any
+distributions\&. No written agreement, license, or royalty fee is required for any of the
+authorized uses\&.  Modifications to this software may be copyrighted by their authors and
+need not follow the licensing terms described here, provided that the new terms are
+clearly indicated on the first page of each file where they apply\&.
+.PP
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS
+SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\&.
+.PP
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE, AND NON-INFRINGEMENT\&.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND THE
+AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
+ENHANCEMENTS, OR MODIFICATIONS\&.
+.PP
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U\&.S\&. government, the Government shall have only "Restricted Rights" in the software and
+related documentation as defined in the Federal Acquisition Regulations (FARs) in Clause
+52\&.227\&.19 (c) (2)\&.  If you are acquiring the software on behalf of the Department of
+Defense, the software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause 252\&.227-7014 (b) (3)
+of DFARs\&.  Notwithstanding the foregoing, the authors grant the U\&.S\&. Government and others
+acting in its behalf permission to use and distribute the software in accordance with the
+terms specified in this license\&.
+.SH AUTHORS
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report them at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR\&.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR as well\&.
+.SH KEYWORDS
+C code, Embedded C Code, calling C code from Tcl, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) Jean-Claude Wippler
+Copyright (c) Steve Landers
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_literals.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_literals.n
new file mode 100644
index 00000000..6baec509
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_literals.n
@@ -0,0 +1,478 @@
+'\"
+'\" Generated from file 'critcl_literals\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl::literals" n 1\&.4 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl::literals \- CriTcl - Code Gen - Constant string pools
+.SH SYNOPSIS
+package require \fBTcl  8\&.6\fR
+.sp
+package require \fBcritcl  ?3\&.2?\fR
+.sp
+package require \fBcritcl::literals  ?1\&.4?\fR
+.sp
+\fB::critcl::literals::def\fR \fIname\fR \fIdefinition\fR ?\fImode\fR?
+.sp
+.BE
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This document is the reference manpage for the
+\fBcritcl::literals\fR package\&. This package provides convenience
+commands for advanced functionality built on top of both critcl core
+and package \fBcritcl::iassoc\fR\&.
+.PP
+Many packages will have a fixed set of string constants
+occuring in one or places\&. Most of them will be coded to create a new
+string \fBTcl_Obj*\fR from a C \fBchar*\fR every time the constant
+is needed, as this is easy to to, despite the inherent waste of
+memory\&.
+.PP
+This package was written to make declaration and management of
+string pools which do not waste memory as easy as the wasteful
+solution, hiding all attendant complexity from the user\&.
+.PP
+Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code\&.
+.PP
+This package resides in the Core Package Layer of CriTcl\&.
+.PP
+.PS
+.nf
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
+*================*
+|Core Packages   |
+| critcl         |
+| critcl::util   |
+*================*
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  \&.\&.\&.           |
++----------------+
+
+.fi
+.PE
+.PP
+.SH API
+.TP
+\fB::critcl::literals::def\fR \fIname\fR \fIdefinition\fR ?\fImode\fR?
+This command defines a C function with the given \fIname\fR which
+provides access to a pool of constant strings with a Tcl interpreter\&.
+.sp
+The \fIdefinition\fR dictionary provides the mapping from the
+C-level symbolic names to the string themselves\&.
+.sp
+The \fImode\fR-list configures the output somewhat\&.
+The three allowed modes are \fBc\fR, \fB+list\fR and \fBtcl\fR\&.
+All modes can be used together\&.
+The default mode is \fBtcl\fR\&.
+Using mode \fB+list\fR implies \fBtcl\fR as well\&.
+.sp
+For mode \fBtcl\fR the new function has two arguments, a
+\fBTcl_Interp*\fR pointer refering to the interpreter holding the
+string pool, and a code of type "\fIname\fR_names" (see below), the
+symbolic name of the literal to return\&. The result of the function is
+a \fBTcl_Obj*\fR pointer to the requested string constant\&.
+.sp
+For mode \fBc\fR the new function has one argument, a code of
+type "\fIname\fR_names" (see below), the symbolic name of the literal
+to return\&. The result of the function is a \fBconst char*\fR
+pointer to the requested string constant\&.
+.sp
+For mode \fB+list\fR all of \fBtcl\fR applies, plus an
+additional function is generated which takes three arguments, in
+order, a \fBTcl_Interp*\fR pointer refering to the interpreter
+holding the string pool, an \fBint\fR holding the size of the last
+argument, and an array of type "\fIname\fR_names" holding the codes
+(see below), the symbolic names of the literals to return\&. The result
+of the function is a \fBTcl_Obj*\fR pointer to a Tcl list holding the
+requested string constants\&.
+.sp
+The underlying string pool is automatically initialized on
+first access, and finalized on interpreter destruction\&.
+.sp
+The package generates multiple things (declarations and
+definitions) with names derived from \fIname\fR, which has to be a
+proper C identifier\&.
+.RS
+.TP
+\fIname\fR
+The mode \fBtcl\fR function providing access to the string pool\&.
+Its signature is
+.sp
+.CS
+
+
+Tcl_Obj* \fIname\fR (Tcl_Interp* interp, \fIname\fR_names literal);
+
+.CE
+.TP
+\fIname\fR_list
+The mode \fB+list\fR function providing multi-access to the string pool\&.
+Its signature is
+.sp
+.CS
+
+
+Tcl_Obj* \fIname\fR_list (Tcl_Interp* interp, int c, \fIname\fR_names* literal);
+
+.CE
+.TP
+\fIname\fR_cstr
+The mode \fBc\fR function providing access to the string pool\&.
+Its signature is
+.sp
+.CS
+
+
+const char* \fIname\fR_cstr (\fIname\fR_names literal);
+
+.CE
+.TP
+\fIname\fR_names
+A C enumeration type containing the symbolic names of the strings
+provided by the pool\&.
+.TP
+\fIname\fR\&.h
+A header file containing the declarations for the accessor functions
+and the enumeration type, for use by other parts of the system, if
+necessary\&.
+.sp
+The generated file is stored in a place where it will not
+interfere with the overall system outside of the package, yet also be
+available for easy inclusion by package files (\fBcsources\fR)\&.
+.TP
+\fIname\fR
+\fINew in version 1\&.1\fR:
+For mode \fBtcl\fR the command registers a new result-type for
+\fBcritcl::cproc\fR with critcl, which takes an integer result from
+the function and converts it to the equivalent string in the pool for
+the script\&.
+.RE
+.PP
+.SH EXAMPLE
+The example shown below is the specification of the string pool pulled
+from the draft work on a Tcl binding to Linux's inotify APIs\&.
+.CS
+
+
+package require Tcl 8\&.6
+package require critcl 3\&.2
+
+critcl::buildrequirement {
+    package require critcl::literals
+}
+
+critcl::literals::def tcl_inotify_strings {
+    w_create	"create"
+    w_directory	"directory"
+    w_events	"events"
+    w_file	"file"
+    w_handler	"handler"
+    w_remove	"remove"
+} {c tcl}
+
+# Declarations: tcl_inotify_strings\&.h
+# Type:         tcl_inotify_strings_names
+# Accessor:     Tcl_Obj*    tcl_inotify_strings      (Tcl_Interp*               interp,
+#                                                     tcl_inotify_strings_names literal);
+# Accessor:     const char* tcl_inotify_strings_cstr (tcl_inotify_strings_names literal);
+# ResultType:   tcl_inotify_strings
+
+.CE
+.SH AUTHORS
+Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report such at \fIhttps://github\&.com/andreas-kupries/critcl\fR\&.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation\&.
+.SH KEYWORDS
+C code, Embedded C Code, Tcl Interp Association, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, literal pool, on demand compilation, on-the-fly compilation, singleton, string pool
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_package.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_package.n
new file mode 100644
index 00000000..39f021a7
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_package.n
@@ -0,0 +1,2433 @@
+'\"
+'\" Generated from file 'critcl_package\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) Jean-Claude Wippler
+'\" Copyright (c) Steve Landers
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl_package" n 3\&.2\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl_package \- CriTcl Package Reference
+.SH SYNOPSIS
+package require \fBTcl  8\&.6\fR
+.sp
+package require \fBcritcl  ?3\&.2\&.1?\fR
+.sp
+package require \fBplatform  ?1\&.0\&.2?\fR
+.sp
+package require \fBmd5  ?2?\fR
+.sp
+\fB::critcl::ccode\fR \fIfragment\fR
+.sp
+\fB::critcl::ccommand\fR \fItclname\fR \fIcname\fR
+.sp
+\fB::critcl::ccommand\fR \fItclname\fR \fIarguments\fR \fIbody\fR ?\fIoption\fR \fIvalue\fR\&.\&.\&.?
+.sp
+\fB::critcl::cdata\fR \fItclname\fR \fIdata\fR
+.sp
+\fB::critcl::cconst\fR \fItclname\fR \fIresulttype\fR \fIvalue\fR
+.sp
+\fB::critcl::cdefines\fR \fIlist of glob patterns\fR ?\fInamespace\fR?
+.sp
+\fB::critcl::cproc\fR \fIname\fR \fIarguments\fR \fIresulttype\fR \fIbody\fR ?\fIoption\fR \fIvalue\fR\&.\&.\&.?
+.sp
+\fB::critcl::cproc\fR \fIname\fR \fIarguments\fR \fIresulttype\fR
+.sp
+\fB::critcl::cinit\fR \fItext\fR \fIexternals\fR
+.sp
+\fB::critcl::include\fR \fIpath\fR
+.sp
+\fB::critcl::api\fR \fBimport\fR \fIname\fR \fIversion\fR
+.sp
+\fB::critcl::api\fR \fBfunction\fR \fIresulttype\fR \fIname\fR \fIarguments\fR
+.sp
+\fB::critcl::api\fR \fBheader\fR ?\fIglob pattern\fR\&.\&.\&.?
+.sp
+\fB::critcl::api\fR \fBextheader\fR ?\fIfile\fR\&.\&.\&.?
+.sp
+\fB::critcl::license\fR \fIauthor\fR ?\fItext\fR\&.\&.\&.?
+.sp
+\fB::critcl::summary\fR \fItext\fR
+.sp
+\fB::critcl::description\fR \fItext\fR
+.sp
+\fB::critcl::subject\fR ?\fIkey\fR\&.\&.\&.?
+.sp
+\fB::critcl::meta\fR \fIkey\fR ?\fIword\fR\&.\&.\&.?
+.sp
+\fB::critcl::meta?\fR \fIkey\fR
+.sp
+\fB::critcl::buildrequirement\fR \fIscript\fR
+.sp
+\fB::critcl::cheaders\fR ?\fIarg\fR\&.\&.\&.?
+.sp
+\fB::critcl::csources\fR ?\fIglob pattern\fR\&.\&.\&.?
+.sp
+\fB::critcl::clibraries\fR ?\fIglob pattern\fR\&.\&.\&.?
+.sp
+\fB::critcl::source\fR \fIglob pattern\fR
+.sp
+\fB::critcl::tsources\fR \fIglob pattern\fR\&.\&.\&.
+.sp
+\fB::critcl::owns\fR \fIglob pattern\fR\&.\&.\&.
+.sp
+\fB::critcl::cflags\fR ?\fIarg\fR\&.\&.\&.?
+.sp
+\fB::critcl::ldflags\fR ?\fIarg\fR\&.\&.\&.?
+.sp
+\fB::critcl::framework\fR ?\fIarg\fR\&.\&.\&.?
+.sp
+\fB::critcl::tcl\fR \fIversion\fR
+.sp
+\fB::critcl::tk\fR
+.sp
+\fB::critcl::preload\fR \fIlib\fR\&.\&.\&.
+.sp
+\fB::critcl::debug\fR \fIarea\fR\&.\&.\&.
+.sp
+\fB::critcl::check\fR ?\fIlabel\fR? \fItext\fR
+.sp
+\fB::critcl::checklink\fR ?\fIlabel\fR? \fItext\fR
+.sp
+\fB::critcl::msg\fR ?\fB-nonewline\fR? \fImsg\fR
+.sp
+\fB::critcl::print\fR ?\fB-nonewline\fR? ?\fIchan\fR? \fImsg\fR
+.sp
+\fB::critcl::compiled\fR
+.sp
+\fB::critcl::compiling\fR
+.sp
+\fB::critcl::done\fR
+.sp
+\fB::critcl::failed\fR
+.sp
+\fB::critcl::load\fR
+.sp
+\fB::critcl::config\fR \fIoption\fR ?\fIval\fR?
+.sp
+\fB::critcl::cache\fR ?path?
+.sp
+\fB::critcl::clean_cache\fR ?\fIpattern\fR\&.\&.\&.?
+.sp
+\fB::critcl::readconfig\fR \fIpath\fR
+.sp
+\fB::critcl::showconfig\fR ?\fIchan\fR?
+.sp
+\fB::critcl::showallconfig\fR ?\fIchan\fR?
+.sp
+\fB::critcl::chooseconfig\fR \fItarget\fR ?\fInomatcherr\fR?
+.sp
+\fB::critcl::setconfig\fR \fItarget\fR
+.sp
+\fB::critcl::actualtarget\fR
+.sp
+\fB::critcl::buildforpackage\fR ?\fIflag\fR?
+.sp
+\fB::critcl::cnothingtodo\fR \fIfile\fR
+.sp
+\fB::critcl::cresults\fR ?\fIfile\fR?
+.sp
+\fB::critcl::crosscheck\fR
+.sp
+\fB::critcl::error\fR \fImsg\fR
+.sp
+\fB::critcl::knowntargets\fR
+.sp
+\fB::critcl::sharedlibext\fR
+.sp
+\fB::critcl::targetconfig\fR
+.sp
+\fB::critcl::buildplatform\fR
+.sp
+\fB::critcl::targetplatform\fR
+.sp
+\fB::critcl::cobjects\fR ?\fIglob pattern\fR\&.\&.\&.?
+.sp
+\fB::critcl::scan\fR \fIpath\fR
+.sp
+\fB::critcl::name2c\fR \fIname\fR
+.sp
+\fB::critcl::argnames\fR \fIarguments\fR
+.sp
+\fB::critcl::argcnames\fR \fIarguments\fR
+.sp
+\fB::critcl::argcsignature\fR \fIarguments\fR
+.sp
+\fB::critcl::argvardecls\fR \fIarguments\fR
+.sp
+\fB::critcl::argconversion\fR \fIarguments\fR ?\fIn\fR?
+.sp
+\fB::critcl::argoptional\fR \fIarguments\fR
+.sp
+\fB::critcl::argdefaults\fR \fIarguments\fR
+.sp
+\fB::critcl::argsupport\fR \fIarguments\fR
+.sp
+\fB::critcl::userconfig\fR \fBdefine\fR \fIname\fR \fIdescription\fR \fItype\fR ?\fIdefault\fR?
+.sp
+\fB::critcl::userconfig\fR \fBquery\fR \fIname\fR
+.sp
+\fB::critcl::userconfig\fR \fBset\fR \fIname\fR \fIvalue\fR
+.sp
+\fB::critcl::at::caller\fR
+.sp
+\fB::critcl::at::caller\fR \fIoffset\fR
+.sp
+\fB::critcl::at::caller\fR \fIoffset\fR \fIlevel\fR
+.sp
+\fB::critcl::at::here\fR
+.sp
+\fB::critcl::at::get*\fR
+.sp
+\fB::critcl::at::get\fR
+.sp
+\fB::critcl::at::=\fR \fIfile\fR \fIline\fR
+.sp
+\fB::critcl::at::incr\fR \fIn\fR\&.\&.\&.
+.sp
+\fB::critcl::at::incrt\fR \fIstr\fR\&.\&.\&.
+.sp
+\fB::critcl::at::caller!\fR
+.sp
+\fB::critcl::at::caller!\fR \fIoffset\fR
+.sp
+\fB::critcl::at::caller!\fR \fIoffset\fR \fIlevel\fR
+.sp
+\fB::critcl::at::here!\fR
+.sp
+\fB::critcl::collect_begin\fR
+.sp
+\fB::critcl::collect_end\fR
+.sp
+\fB::critcl::collect\fR \fIscript\fR
+.sp
+\fB::critcl::make\fR \fIpath\fR \fIcontents\fR
+.sp
+\fB::preload\fR \fIlibrary\fR
+.sp
+.BE
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+The \fBcritcl\fR package is the core of the system\&.  For an overview of the
+complete system, see \fIIntroduction To CriTcl\fR\&.  For the usage of the
+standalone \fBcritcl\fR program, see \fICriTcl Application\fR\&.
+This core package maybe be used to embed C code into Tcl scripts\&.  It also
+provides access to the internals that other parts of the core use and which
+are of interest to those wishing to understand the internal workings of the
+core and of the API it provides to the \fICriTcl Application\fR\&.  These
+advanced sections are marked as such so that those simply wishing to use the
+package can skip them\&.
+.PP
+This package resides in the Core Package Layer of CriTcl\&.
+.PP
+.PS
+.nf
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
+*================*
+|Core Packages   |
+| critcl         |
+| critcl::util   |
+*================*
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  \&.\&.\&.           |
++----------------+
+
+.fi
+.PE
+.PP
+.SH API
+A short note ahead of the documentation: Instead of repeatedly talking
+about
+"a Tcl script with embbedded C code", or
+"a Tcl script containing CriTcl commands",
+we call such a script a \fICriTcl script\fR\&.  A file containing a
+\fICriTcl script\fR usually has the extension \fB\&.tcl\fR or \fB\&.critcl\fR\&.
+.SS "EMBEDDED C CODE"
+The following commands append C code fragments to the current module\&.  Fragments
+appear in the module in the order they are appended, so the earlier fragments
+(variables, functions, macros, etc\&.) are visible to later fragments\&.
+.TP
+\fB::critcl::ccode\fR \fIfragment\fR
+Appends the C code in \fIfragment\fR to the current module and returns the
+empty string\&.
+See \fBRuntime Behaviour\fR\&.
+.TP
+\fB::critcl::ccommand\fR \fItclname\fR \fIcname\fR
+As documented below, except that \fIcname\fR is the name of a C function
+that already exists\&.
+.TP
+\fB::critcl::ccommand\fR \fItclname\fR \fIarguments\fR \fIbody\fR ?\fIoption\fR \fIvalue\fR\&.\&.\&.?
+Appends the code to create a Tcl command named \fItclname\fR and a
+corresponding C function whose body is \fIbody\fR and which behaves as
+documented for Tcl's own
+\fITcl_CreateObjCommand\fR [https://www\&.tcl-lang\&.org/man/tcl/TclLib/CrtObjCmd\&.htm]\&.
+.sp
+\fIaguments\fR is a list of zero to four names for the standard arguments
+\fBclientdata\fR, \fBinterp\fR, \fBobjc\fR, and \fBobjv\fR\&.  The
+standard default names are used in place of any missing names\&.
+This is a more low-level way than \fBcritcl::cproc\fR to define a command, as
+processing of the items in \fBobjv\fR is left to the author, affording
+complete control over the handling of the arguments to the command\&.
+See section \fBRuntime Behaviour\fR\&.
+.sp
+Returns the empty string\&.
+.sp
+Each \fIoption\fR may be one of:
+.RS
+.TP
+\fB-clientdata\fR \fIc-expression\fR
+Provides the client data for the new command\&.  \fBNULL\fR by default\&.
+.TP
+\fB-delproc\fR \fIc-expression\fR
+Provides a function pointer of type \fITcl_CmdDeleteProc\fR [https://www\&.tcl-lang\&.org/man/tcl/TclLib/CrtObjCmd\&.htm] as the deletion function for the new command\&.  \fBNULL\fR by default\&.
+.TP
+\fB-cname\fR \fIboolean\fR
+If \fBfalse\fR (the default), a name for the corresponding C function is
+automatically derived from the fully-qualified \fItclname\fR\&.  Otherwise, name
+of the C function is the last component of \fItclname\fR\&.
+.RE
+.TP
+\fB::critcl::cdata\fR \fItclname\fR \fIdata\fR
+Appends the code to create a new Tcl command named \fItclname\fR which returns
+\fIdata\fR as a \fBByteArray\fR result\&.
+.sp
+Returns the empty string\&.
+.TP
+\fB::critcl::cconst\fR \fItclname\fR \fIresulttype\fR \fIvalue\fR
+Appends the code to create a new Tcl command named \fItclname\fR which returns
+the constant \fIvalue\fR having the Tcl type \fIresulttype\fR\&.  \fIvalue\fR can
+be a C macro or a function \fIcall\fR (including the parentheses) to any
+visible C function that does not take arguments\&.
+Unlike \fBcritcl::cdata\fR, \fIresulttype\fR can be any type known to
+\fBcritcl::cproc\fR\&.
+Its semantics are equivalent to:
+.CS
+
+
+    cproc $tclname {} $resulttype "return $value ;"
+
+.CE
+.sp
+This is more efficient than \fBcritcl::cproc\fR since there is no
+C function generated\&.
+.sp
+Returns the empty string\&.
+.TP
+\fB::critcl::cdefines\fR \fIlist of glob patterns\fR ?\fInamespace\fR?
+Arranges for \fIC enum\fR and \fI#define\fR values that match one of the
+patterns in \fIglob patterns\fR to be created in the namespace
+\fInamespace\fR, each variable having the same as the corresponding C item\&.
+The default namespace is the global namespace\&.  A pattern that matches nothing
+is ignored\&.
+.sp
+The Tcl variables are created when the module is compiled, using the
+preprocessor in order to properly find all matching C definitions\&.
+.sp
+Produces no C code\&.  The desired C definitions must already exist\&.
+.TP
+\fB::critcl::cproc\fR \fIname\fR \fIarguments\fR \fIresulttype\fR \fIbody\fR ?\fIoption\fR \fIvalue\fR\&.\&.\&.?
+Appends a function having \fIbody\fR as its body, another shim function to
+perform the needed conversions, and the code to create a corresponding Tcl
+command named \fItclname\fR\&.  Unlike \fBcritcl::ccommand\fR the arguments and
+result are typed, and CriTcl generates the code to convert between Tcl_Obj
+values and C data types\&.
+See also \fBRuntime Behaviour\fR\&.
+.sp
+Returns the empty string\&.
+.sp
+.RS
+.TP
+string \fIoption\fR
+Each may be one of:
+.RS
+.TP
+\fB-cname\fR \fIboolean\fR
+If \fBfalse\fR (the default), a name for the corresponding C function is
+automatically derived from the fully-qualified \fItclname\fR\&.  Otherwise, name
+of the C function is the last component of \fItclname\fR\&.
+.TP
+\fB-pass-cdata\fR \fIboolean\fR
+If \fBfalse\fR (the default), the shim function performing the conversion to
+and from Tcl level does not pass the ClientData as the first argument to
+the function\&.
+.TP
+\fB-arg-offset\fR \fIint\fR
+A non-negative integer, \fB0\fR by default, indicating the number of hidden
+arguments preceding the actual procedure arguments\&.  Used by higher-order code
+generators where there are prefix arguments which are not directly seen by the
+function but which influence argument counting and extraction\&.
+.RE
+.TP
+string \fIresulttype\fR
+May be a predefined or a custom type\&.
+See \fICriTcl cproc Type Reference\fR for the full list of predefined types and how to
+extend them\&.
+Unless otherwise noted, the Tcl return code is always \fBTCL_OK\fR\&.
+.TP
+list \fIarguments\fR
+Is a multi-dictionary where each key is an
+argument type and its value is the argument name\&.
+For example:
+.CS
+
+ int x int y
+.CE
+.sp
+Each argument name must be a valid C identifier\&.
+.sp
+If the name is a list containing two items, the first item is the name
+and the second item is the default value\&.  A limited form of variadic arguments
+can be accomplished using such default values\&.
+For example:
+.CS
+
+ int {x 1}
+.CE
+.IP
+Here \fIx\fR is an optional argument of type \fBint\fR with a default
+value of \fB1\fR\&.
+.sp
+Argument conversion is completely bypassed when the argument is not
+provided, so a custom converter doing validation does not get the chance to
+validate the default value\&.  In this case, the value should be checked in the
+body of the function\&.
+.sp
+Each argument type may be a predefined or custom type\&.
+See \fICriTcl cproc Type Reference\fR for the full list of predefined types and how to
+extend them\&.
+.RE
+.TP
+\fB::critcl::cproc\fR \fIname\fR \fIarguments\fR \fIresulttype\fR
+As documented below, but used when the C function named \fIname\fR already
+exists\&.
+.TP
+\fB::critcl::cinit\fR \fItext\fR \fIexternals\fR
+Appends the C code in \fItext\fR and \fIexternals\fR, but only after all the
+other fragments appended by the previously-listed commands regardless of their
+placement in the \fICriTcl script\fR relative to this command\&.  Thus, all
+their content is visible\&.  See also \fBRuntime Behaviour\fR\&.
+.sp
+The C code in \fItext\fR is placed into the body of the initialization
+function of the shared library backing the \fICriTcl script\fR, and is
+executed when this library is loaded into the interpreter\&.  It has access to
+the variable \fBTcl_Interp* interp\fR referencing the Tcl interpreter currently
+being initialized\&.
+.sp
+\fIexternals\fR is placed outside and just before the initialization
+function, making it a good place for any external symbols required by
+initialization function, but which should not be accessible by any other parts
+of the C code\&.
+.sp
+Calls to this command are cumulative\&.
+.sp
+Returns the empty string\&.
+.TP
+\fB::critcl::include\fR \fIpath\fR
+This command is a convenient shorthand for
+.CS
+
+
+critcl::code {
+  #include <${path}>
+}
+
+.CE
+.PP
+.SS "STUBS TABLE MANAGEMENT"
+CriTcl versions 3 and later provide \fBcritcl::api\fR to create and manipulate
+stubs tables, Tcl's dynamic linking mechanism handling the resolution of
+symbols between C extensions\&.
+See \fIhttp://wiki\&.tcl-lang\&.org/285\fR
+for an introduction, and section \fBStubs Tables\fR
+for the details of CriTcl's particular variant\&.
+.PP
+Importing stubs tables, i\&.e\&. APIs, from another extension:
+.TP
+\fB::critcl::api\fR \fBimport\fR \fIname\fR \fIversion\fR
+Adds the following include directives into the \fICriTcl script\fR
+\fIand\fR each of its companion "\fI\&.c\fR" files:
+.RS
+.IP [1]
+#include <\fBname\fR/\fBname\fRDecls\&.h>
+.IP [2]
+#include <\fBname\fR/\fBname\fRStubLib\&.h>
+.RE
+.IP
+Returns an error if "\fI\fBname\fR\fR" isn't in the search path for the
+compiler\&.  See \fBcritcl::cheaders\fR and the critcl application's \fB-I\fR
+and \fB-includedir\fR options\&.
+.sp
+\fIImportant:\fR If \fBname\fR is a fully-qualified name in a
+non-global namespace, e\&.g\&.
+"c::stack", the namespace separators "::" are converted into underscores
+("_") in path names, C code, etc\&.
+.sp
+\fBname\fR/\fBname\fRDecls\&.h contains the stubs table type declarations,
+mapping macros, etc\&., and may include package-specific headers\&.  See
+\fBcritcl::api header\fR, below\&.  An \fI#include\fR directive is added at
+the beginning of the generated code for \fICriTcl script\fR and at the
+beginning of each of its companion "\fI\&.c\fR" files\&.
+.sp
+\fBname\fR/\fBname\fRStubLib\&.h contains the stubs table variable
+definition and the function to initialize it\&.  An \fI#include\fR directive
+for it is added to the initialization code for the \fICriTcl script\fR ,
+along with a call to the initializer function\&.
+.sp
+If "\fI\fBname\fR/\fBname\fR\&.decls\fR" accompanies
+\fBname\fR/\fBname\fRDecls\&.h, it should contain the external representation of
+the stubs table used to generate the headers\&. The file is read and the internal
+representation of the stubs table returned for use by the importing package\&.
+Otherwise, the empy string is returned\&.
+.sp
+One possible use would be the automatic generation of C code
+calling on the functions listed in the imported API\&.
+.sp
+When generating a TEA package the names of the imported APIs
+are used to declare \fBconfigure\fR options with which the user can
+declare a non-standard directory for the headers of the API\&. Any API
+\fBname\fR is translated into a single configure option
+\fB--with-\fBname\fR-include\fR\&.
+.PP
+.PP
+Declaration and export of a stubs table, i\&.e\&. API, for
+the \fICriTcl script\fR:
+.TP
+\fB::critcl::api\fR \fBfunction\fR \fIresulttype\fR \fIname\fR \fIarguments\fR
+Adds to the public API of the \fICriTcl script\fR the signature
+for the function named \fIname\fR and having the signature specified by
+\fIarguments\fR and \fIresulttype\fR\&.  Code is generated for a "\fI\&.decls\fR"
+file, the corresponding public headers, and a stubs table usable by
+\fBcritcl::api import\fR\&.
+.sp
+\fIarguments\fR is a multidict where each key is an argument type and its
+value is the argument name, and \fIresulttype\fR is a C type\&.
+.TP
+\fB::critcl::api\fR \fBheader\fR ?\fIglob pattern\fR\&.\&.\&.?
+Each file matching a \fIglob pattern\fR is copied into the directory
+containing the generated headers, and an \fI#include\fR directive for it is
+added to "\fIDecls\&.h\fR" for the \fICriTcl script\fR\&.
+Returns an error if a \fIglob pattern\fR matches nothing\&.
+.sp
+A pattern for a relative path is resolved relative to the directory
+containing the \fICriTcl script\fR\&.
+.TP
+\fB::critcl::api\fR \fBextheader\fR ?\fIfile\fR\&.\&.\&.?
+Like \fB::critcl::api header\fR, but each \fIfile\fR should exist in the
+external development environment\&.  An \fI#include\fR directive is added to
+"\fI\fBfoo\fRDecls\&.h\fR", but \fIfile\fR is not copied to the package header
+directory\&. \fIfile\fR is not a glob pattern as CriTcl has no context,
+i\&.e directory, in which to expand such patterns\&.
+.PP
+As with the headers for an imported API, an \fI#include\fR directive is
+added to the generated code for the \fICriTcl script\fR and to
+each companion "\fI\&.c\fR" file\&.
+.PP
+In "compile & run" mode the generated header files and any companion
+headers are placed in the \fBResult Cache\fR subdirectory for the
+\fICriTcl script\fR\&. This directory is added to the include search path of
+any other package importing this API and and building in mode "compile & run"\&.
+.PP
+In "generate package" mode \fB-includedir\fR specifies the
+subdirectory in the package to place the generated headers in\&. This
+directory is added to the search paths for header files, ensuring that a
+package importing an API finds it if the package exporting that API used the
+same setting for \fB-includedir\fR\&.
+.PP
+In "generate TEA" mode the static scanner recognizes
+\fBcritcl::api header\fR as a source of companion files\&.
+It also uses data from calls to \fBcritcl::api import\fR to
+add support for \fB--with-\fBfoo\fR-include\fR options into the
+generated "\fIconfigure(\&.in)\fR" so that a user may specify custom
+locations for the headers of any imported API\&.
+.SS "PACKAGE META DATA"
+CriTcl versions 3 and later can create TEApot meta-data to be placed into
+"\fIteapot\&.txt\fR" in a format suitable for use by the
+\fITEApot tools\fR [http://docs\&.activestate\&.com/activetcl/8\&.5/tpm/toc\&.html]\&.
+.PP
+In version 2, some meta data support was already present through
+\fB::critcl::license\fR, but this was only used to generate "\fIlicense\&.txt\fR"\&.
+.TP
+\fB::critcl::license\fR \fIauthor\fR ?\fItext\fR\&.\&.\&.?
+Ignored in "compile & run" mode\&.
+.sp
+In "generate package" mode provides information about the author of the
+package and the license for the package\&.
+.sp
+\fItext\fR arguments are concatenated to form the text of the license, which is
+written to "\fIlicense\&.terms\fR" in the same directory as "\fIpkgIndex\&.tcl\fR"\&.
+If no \fItext\fR is provided the license is read from "\fIlicense\&.terms\fR"
+in the same directory as the \fICriTcl script\fR\&.
+.sp
+This information takes precedence over any information specified through
+the generic API \fB::critcl::meta\fR\&.  It is additionally placed
+into the meta data file "\fIteapot\&.txt\fR" under the keys \fIas::author\fR and
+\fIlicense\fR\&.
+.TP
+\fB::critcl::summary\fR \fItext\fR
+Ignored in "compile & run" mode\&.
+.sp
+In "generate package" mode places a short, preferably one-line description of
+the package into the meta data file "\fIteapot\&.txt\fR" under the key
+\fIsummary\fR\&.  This information takes precedence over information specified
+through the generic API \fB::critcl::meta\fR\&.
+.TP
+\fB::critcl::description\fR \fItext\fR
+Ignored in "compile & run" mode\&.
+.sp
+In "generate package" mode places a longer description of the package into the
+meta data file "\fIteapot\&.txt\fR", under the key \fIdescription\fR\&.  The data
+specified by this command takes precedence over any information specified
+through the generic API \fB::critcl::meta\fR\&.
+.TP
+\fB::critcl::subject\fR ?\fIkey\fR\&.\&.\&.?
+Ignored in "compile & run" mode\&.
+.sp
+In "generate package" mode places each \fIkey\fR into the meta data file
+"\fIteapot\&.txt\fR", under the key \fIsubject\fR\&.  This information takes
+precedence over any information specified through the generic API
+\fB::critcl::meta\fR\&.
+.sp
+Calls to this command are cumulative\&.
+.TP
+\fB::critcl::meta\fR \fIkey\fR ?\fIword\fR\&.\&.\&.?
+Provides arbitrary meta data outside of the following reserved keys:
+\fIas::author\fR,
+\fIas::build::date\fR,
+\fIdescription\fR,
+\fIlicense\fR,
+\fIname\fR,
+\fIplatform\fR,
+\fIrequire\fR
+\fIsubject\fR,
+\fIsummary\fR, and
+\fIversion\fR,
+Its behaviour is like \fB::critcl::subject\fR in that it treats all
+keys as list of words, with each call providing one or more words for
+the key, and multiple calls extending the data for an existing key, if
+not reserved\&.
+.sp
+While it is possible to declare information for one of the
+reserved keys with this command such data is ignored when the final
+meta data is assembled and written\&.
+.sp
+Use the commands
+\fB::critcl::license\fR,
+\fB::critcl::summary\fR,
+\fB::critcl::description\fR
+\fB::critcl::subject\fR,
+\fBpackage require\fR, and
+\fBpackage provide\fR
+to declare data for the reserved keys\&.
+.sp
+The information for the reserved keys
+\fIas::build::date\fR and
+\fIplatform\fR
+is automatically generated by \fBcritcl\fR itself\&.
+.TP
+\fB::critcl::meta?\fR \fIkey\fR
+Returns the value in the metadata associated with \fIkey\fR\&.
+.sp
+Used primarily to retrieve the name of the package
+from within utility packages having to adapt C code templates to their
+environment\&. For example, \fBcritcl::class\fR uses does this\&.
+.TP
+\fB::critcl::buildrequirement\fR \fIscript\fR
+Provides control over the capturing of dependencies declared via
+\fBpackage require\fR\&. \fIscript\fR is evaluated and any dependencies
+declared within are ignored, i\&.e\&. not recorded in the meta data\&.
+.PP
+.SS "CONTROL & INTERFACE"
+These commands control the details of compilation and linking a
+\fICriTcl script\fR\&.  The information is used only to compile/link the
+object for the \fICriTcl script\fR\&.  For example, information for
+"\fIFOO\&.tcl\fR" is kept separate from information for "\fIBAR\&.tcl\fR"\&.
+.TP
+\fB::critcl::cheaders\fR ?\fIarg\fR\&.\&.\&.?
+Provides additional header locations\&.
+.sp
+Each argument is a glob pattern\&.  If an argument begins with \fB-\fR
+it is an argument to the compiler\&.  Otherwise the parent directory of each
+matching path is a directory to be searched for header files\&.  Returns an
+error if a pattern matches no files\&.
+A pattern for a relative path is resolved relative to the directory
+containing the \fICriTcl script\fR\&.
+.sp
+\fB#include\fR lines are not automatically generated for matching
+header files\&.  Use \fBcritcl::include\fR or \fBcritcl::ccode\fR as necessary to
+add them\&.
+.sp
+Calls to this command are cumulative\&.
+.TP
+\fB::critcl::csources\fR ?\fIglob pattern\fR\&.\&.\&.?
+Matching paths become inputs to the compilation of the current object
+along with the sources for the current \fICriTcl script\fR\&.  Returns an
+error if no paths match a pattern\&.
+A pattern for a relative path is resolved relative to the directory
+containing the \fICriTcl script\fR\&.
+.sp
+Calls to this command are cumulative\&.
+.TP
+\fB::critcl::clibraries\fR ?\fIglob pattern\fR\&.\&.\&.?
+provides the link step with additional libraries and library locations\&.
+A \fIglob pattern\fR that begins with \fB-\fR is added as an argument to
+the linker\&.  Otherwise matching files are linked into the shared library\&.
+Returns an error if no paths match a pattern\&.
+A pattern for a relative path is resolved relative to the directory
+containing the \fICriTcl script\fR\&.
+.sp
+Calls to this command are cumulative\&.
+.TP
+\fB::critcl::source\fR \fIglob pattern\fR
+Evaluates as scripts the files matching each \fIglob pattern\fR\&.  Returns an
+error if there are no matching files\&.
+A pattern for a relative path is resolved relative to the directory
+containing the \fICriTcl script\fR\&.
+.TP
+\fB::critcl::tsources\fR \fIglob pattern\fR\&.\&.\&.
+Provides the information about additional Tcl script files to source when the
+shared library is loaded\&.
+.sp
+Matching paths are made available to the generated shared library when
+it is loaded for the current \fICriTcl script\fR\&.  Returns an error if a
+pattern matches no files\&.
+A pattern for a relative path is resolved relative to the directory
+containing the \fICriTcl script\fR\&.
+.sp
+Calls to this command are cumulative\&.
+.sp
+After the shared library has been loaded, the declared files are sourced
+in the same order that they were provided as arguments\&.
+.TP
+\fB::critcl::owns\fR \fIglob pattern\fR\&.\&.\&.
+Ignored in "compile and run" and "generate package" modes\&.
+In "generate TEA" mode each file matching a \fIglob pattern\fR is a file to
+be included in the TEA extension but that could not be ascertained as such from
+previous commands like \fBcritcl::csources\fR and \fBcritcl::tsources\fR,
+either because of they were specified dynamically or because they were directly
+sourced\&.
+.TP
+\fB::critcl::cflags\fR ?\fIarg\fR\&.\&.\&.?
+.sp
+Each \fIarg\fR is an argument to the compiler\&.
+.sp
+Calls to this command are cumulative\&.
+.TP
+\fB::critcl::ldflags\fR ?\fIarg\fR\&.\&.\&.?
+.sp
+Each \fIarg\fR is an argument to the linker\&.
+.sp
+Calls to this command are cumulative\&.
+.TP
+\fB::critcl::framework\fR ?\fIarg\fR\&.\&.\&.?
+Each \fIarg\fR is the name of a framework to link on MacOS X\&.  This command is
+ignored if OS X is not the target so that frameworks can be specified
+unconditionally\&.
+.sp
+Calls to this command are cumulative\&.
+.TP
+\fB::critcl::tcl\fR \fIversion\fR
+Specifies the minimum version of the Tcl runtime
+to compile and link the package for\&.  The default is \fB8\&.4\fR\&.
+.TP
+\fB::critcl::tk\fR
+Arranges to include the Tk headers and link to the Tk stubs\&.
+.TP
+\fB::critcl::preload\fR \fIlib\fR\&.\&.\&.
+Arranges for the external shared library \fIlib\fR to be loaded
+before the shared library for the \fICriTcl script\fR is loaded\&.
+.sp
+Calls to this command are cumulative\&.
+.sp
+Each library \fIFOO\fR is searched for in the directories listed below, in the order
+listed\&.  The search stops at the first existing path\&.
+Additional notes:
+.RS
+.IP \(bu
+\fBplatform\fR is the placeholder for the target platform of the package\&.
+.IP \(bu
+The extension "\fI\&.so\fR" is the placeholder for whatever actual extension is used by the target platform for its shared libraries\&.
+.IP \(bu
+The search is relative to the current working directory\&.
+.RE
+.IP
+And now the paths, depending on the exact form of the library name:
+.RS
+.TP
+FOO
+.RS
+.IP [1]
+FOO\&.so
+.IP [2]
+FOO/FOO\&.so
+.IP [3]
+FOO/\fBplatform\fR/FOO\&.so
+.RE
+.TP
+PATH/FOO
+The exact set searched depends on the existence of
+directory "\fIPATH/FOO\fR"\&. If it exists, critcl searches
+.RS
+.IP [1]
+FOO\&.so
+.IP [2]
+PATH/FOO/FOO\&.so
+.IP [3]
+PATH/FOO/\fBplatform\fR/FOO\&.so
+.RE
+.IP
+Otherwise it searches
+.RS
+.IP [1]
+FOO\&.so
+.IP [2]
+PATH/FOO\&.so
+.IP [3]
+PATH/\fBplatform\fR/FOO\&.so
+.RE
+.IP
+instead\&.
+.TP
+/PATH/FOO
+Even when specifying FOO with an absolute path the first path searched
+is relative to the current working directory\&.
+.RS
+.IP [1]
+FOO\&.so
+.IP [2]
+/PATH/FOO\&.so
+.IP [3]
+/PATH/\fBplatform\fR/FOO\&.so
+.RE
+.RE
+.IP
+For developers who want to understand or modify the internals of the
+\fBcritcl\fR package, \fBPreloading functionality\fR explains how
+preloading is implemented\&.
+.TP
+\fB::critcl::debug\fR \fIarea\fR\&.\&.\&.
+Specifies what debugging features to activate\&. Internally each area is translated into
+area-specific flags for the compiler which are then handed over to
+\fBcritcl::cflags\fR\&.
+.RS
+.TP
+\fBmemory\fR
+Specifies Tcl memory debugging\&.
+.TP
+\fBsymbols\fR
+Specifies compilation and linking with debugging symbols for use by a debugger
+or other tool\&.
+.TP
+\fBall\fR
+Specifies all available debugging\&.
+.RE
+.PP
+.SS INTROSPECTION
+The following commands control compilation and linking\&.
+.TP
+\fB::critcl::check\fR ?\fIlabel\fR? \fItext\fR
+Returns a \fBtrue\fR if the C code in \fItext\fR compiles sucessfully, and
+\fBfalse\fR otherwise\&.  Used to check for availability of features in the
+build environment\&.
+If provided, \fIlabel\fR is used to uniquely mark the results in the generated
+log\&.
+.TP
+\fB::critcl::checklink\fR ?\fIlabel\fR? \fItext\fR
+Like \fBcritcl::check\fR but also links the compiled objects, returning
+\fBtrue\fR if the link is successful and \fBfalse\fR otherwise\&.
+If specified, \fIlabel\fR is used to uniquely mark the results in the generated
+log\&.
+.TP
+\fB::critcl::msg\fR ?\fB-nonewline\fR? \fImsg\fR
+Scripts using \fBcritcl::check\fR and \fBcritcl::checklink\fR can use this
+command to report results\&.  Does nothing in \fIcompile & run\fR mode\&.  Tools
+like the \fICriTcl Aplication\fR may redefine this command to implement
+their own message reporting\&. For example, \fBcritcl::app\fR and any
+packages built on it print messages to \fIstdout\fR\&.
+.TP
+\fB::critcl::print\fR ?\fB-nonewline\fR? ?\fIchan\fR? \fImsg\fR
+Used by the CriTcl internals to report activity\&.  By default, effectively the
+same thing as \fB::puts\fR\&.  Tools directly using either the CriTcl package or
+the CriTcl application package may redefine this procedure to implement their
+own output functionality\&.
+.sp
+For example, the newest revisions of
+\fIKettle\fR [https://chiselapp\&.com/user/andreas_kupries/repository/Kettle/index]
+use this to highlight build warnings\&.
+.TP
+\fB::critcl::compiled\fR
+Returns \fBtrue\fR if the current \fICriTcl script\fR is already compiled
+and \fBfalse\fR otherwise\&.
+.sp
+Enables a \fICriTcl script\fR used as its own Tcl companion file (see
+\fBcritcl::tsources\fR) to distinguish between being sourced for compilation in
+\fIcompile & run\fR mode and being sourced from either the result of
+\fIgenerate package\fR mode or during the load phase of
+\fIcompile & run\fR mode\&.
+The result is \fBfalse\fR in the first case and \fBtrue\fR in the later two
+cases\&.
+.TP
+\fB::critcl::compiling\fR
+Returns \fBtrue\fR if a working C compiler is available and \fBfalse\fR
+otherwise\&.
+.TP
+\fB::critcl::done\fR
+Returns \fBtrue\fR when \fICriTcl script\fR has been built and
+\fBfalse\fR otherwise\&.  Only useful from within a \fICriTcl script\fR\&.
+Enables the Tcl parts of a \fICriTcl script\fR to distinguish between
+\fIprebuilt package\fR mode and \fIcompile & run\fR mode\&.
+.sp
+See also \fBModes Of Operation/Use\fR\&.
+.TP
+\fB::critcl::failed\fR
+Returns \fBtrue\fR if the \fICriTcl script\fR could not be built, and
+\fBfalse\fR otherwise\&.  Forces the building of the package if it hasn't
+already been done, but not its loading\&.  Thus, a \fICriTcl script\fR can
+check itself for availability of the compiled components\&.  Only useful from
+within a \fICriTcl script\fR\&.
+.TP
+\fB::critcl::load\fR
+Like \fBcritcl::failed\fR except that it also forces the loading of the
+generated shared library, and that it returns \fBtrue\fR on success and
+\fBfalse\fR on failure\&.  Thus, a \fICriTcl script\fR can check itself for
+availability of the compiled components\&.  Only useful from within a
+\fICriTcl script\fR\&.
+.PP
+.SS "BUILD MANAGEMENT"
+The following command manages global settings, i\&.e\&. configuration options which
+are independent of any \fICriTcl script\fR\&.
+.PP
+This command should not be needed to write a \fICriTcl script\fR\&. It is
+a management command which is only useful to the \fICriTcl Application\fR
+or similar tools\&.
+.TP
+\fB::critcl::config\fR \fIoption\fR ?\fIval\fR?
+Sets and returns the following global configuration options:
+.RS
+.TP
+\fBforce\fR bool
+When \fBfalse\fR (the default), the C files are not built if there is a
+cached shared library\&.
+.TP
+\fBlines\fR bool
+When \fBtrue\fR (the default), #line directives are embedded into the
+generated C code\&.
+.sp
+This facility requires the use of a tclsh that provides
+\fBinfo frame\fR\&.  Otherwise, no \fI#line\fR directives are emitted\&. The
+command is supported by Tcl 8\&.5 and higher\&. It is also supported by
+Tcl 8\&.4 provided that it was compiled with the define
+\fB-DTCL_TIP280\fR\&. An example of such is ActiveState's ActiveTcl\&.
+.sp
+Developers of higher-level packages generating their own C
+code, either directly or indirectly through critcl, should
+also read section \fBAdvanced: Location management\fR to see how
+critcl helps them in generating their directives\&.
+Examples of such packages come with critcl itself\&. See
+\fBcritcl::iassoc\fR and \fBcritcl::class\fR\&.
+.TP
+\fBtrace\fR bool
+When \fBfalse\fR (the default), no code tracing the entry and exit of
+CriTcl-backed commands in the \fICriTcl script\fR is inserted\&.  Insertion of
+such code implicitly activates the tracing facility in general\&.  See
+\fBcritcl::cutil\fR\&.
+.TP
+\fBI\fR path
+A single global include path to use for all files\&. Not set by default\&.
+.TP
+\fBcombine\fR enum
+.RS
+.TP
+\fBdynamic\fR (the default)
+Object files have the suffix \fB_pic\fR\&.
+.TP
+\fBstatic\fR
+Object files have the suffix \fB_stub\fR\&.
+.TP
+\fBstandalone\fR
+Object files have no suffix, and the generated C files are compiled
+without using Tcl/Tk stubs\&. The result are object files usable for
+static linking into a \fIbig shell\fR\&.
+.RE
+.TP
+\fBlanguage\fR string
+.TP
+\fBkeepsrc\fR bool
+When \fBfalse\fR (the default), the generated "\fI\&.c\fR"
+files are deleted after the "\fI\&.o\fR" files have been built\&.
+.TP
+\fBoutdir\fR directory
+The directory where to place a generated shared library\&. By default, it is
+placed into the \fBResult Cache\fR\&.
+.RE
+.PP
+.SS "RESULT CACHE MANAGEMENT"
+The following commands control the \fBResult Cache\fR\&.
+These commands are not needed to simply write a \fICriTcl script\fR\&.
+.TP
+\fB::critcl::cache\fR ?path?
+Sets and returns the path to the directory for the package's result cache\&.
+.sp
+The default location is
+"\fI~/\&.critcl/[platform::generic]\fR" and usually does not
+require any changes\&.
+.TP
+\fB::critcl::clean_cache\fR ?\fIpattern\fR\&.\&.\&.?
+Cleans the result cache, i\&.e\&. removes any and all files
+and directories in it\&. If one or more patterns are specified then only
+the files and directories matching them are removed\&.
+.PP
+.SS "BUILD CONFIGURATION"
+The following commands manage the build configuration, i\&.e\&. the per-platform
+information about compilers, linkers, and their commandline options\&.
+These commands are not needed to simply write a \fICriTcl script\fR\&.
+.TP
+\fB::critcl::readconfig\fR \fIpath\fR
+Reads the build configuration file at \fIpath\fR and configures the package
+using the information for the target platform\&.
+.TP
+\fB::critcl::showconfig\fR ?\fIchan\fR?
+Converts the active build configuration into a human-readable string and
+returns it, or if \fIchan\fR is provided prints the result to that channel\&.
+.TP
+\fB::critcl::showallconfig\fR ?\fIchan\fR?
+Converts the set of all known build configurations from the currently active
+build configuration file last set with \fBcritcl::readconfig\fR into a string
+and returns it, or if \fIchan\fR is provided, prints it to that channel\&.
+.TP
+\fB::critcl::chooseconfig\fR \fItarget\fR ?\fInomatcherr\fR?
+Matches \fItarget\fR against all known targets, returning a list containing
+all the matching ones\&. This search is first done on an exact basis, and then
+via glob matching\&. If no known target matches the argument the default is to
+return an empty list\&. However, if the boolean \fInomatcherr\fR is specified and
+set an error is thrown using \fBcritcl::error\fR instead\&.
+.TP
+\fB::critcl::setconfig\fR \fItarget\fR
+Configures the package to use the settings of \fItarget\fR\&.
+.PP
+.SS "TOOL API"
+The following commands provide tools like
+\fICriTcl Application\fR or similar with
+deeper access to the package's internals\&.
+These commands are not needed to simply write a \fICriTcl script\fR\&.
+.TP
+\fB::critcl::actualtarget\fR
+Returns the platform identifier for the target platform, i\&.e\&. the platform to
+build for\&. Unlike \fB::critcl::targetplatform\fR this is the true target, with
+any cross-compilation information resolved\&.
+.TP
+\fB::critcl::buildforpackage\fR ?\fIflag\fR?
+Signals whether the next file is to be built for inclusion into a package\&. If
+not specified the \fIflag\fR defaults to \fBtrue\fR, i\&.e\&. building for a
+package\&. This disables a number of things in the backend, namely the linking of
+that file into a shared library and the loading of that library\&. It is expected
+that the build results are later wrapped into a larger collection\&.
+.TP
+\fB::critcl::cnothingtodo\fR \fIfile\fR
+Checks whether there is anything to build for \fIfile\fR\&.
+.TP
+\fB::critcl::cresults\fR ?\fIfile\fR?
+Returns information about building \fIfile\fR, or \fBinfo script\fR If
+\fIfile\fR is not provided\&.
+The result in question is a dictionary containing the following items:
+.RS
+.TP
+\fBclibraries\fR
+A list of external shared libraries and/or directories needed to link
+\fIfile\fR\&.
+.TP
+\fBldflags\fR
+A list of linker flags needed to link \fIfile\fR\&.
+.TP
+\fBlicense\fR
+The text of the license for the package \fIfile\fR is located in\&.
+.TP
+\fBmintcl\fR
+The minimum version of Tcl required by the package \fIfile\fR
+is in to run successfully\&. A proper Tcl version number\&.
+.TP
+\fBobjects\fR
+A list of object files to link into \fIfile\fR\&.
+.TP
+\fBpreload\fR
+A list of libraries to be preloaded in order to sucessfully load and use
+\fIfile\fR\&.
+.TP
+\fBtk\fR
+\fBtrue\fR if \fIfile\fR requires Tk and \fBfalse\fR otherwise\&.
+.TP
+\fBtsources\fR
+A list of companion "\fI\&.tcl\fR" files to source in order to load and use the
+\fICriTcl script\fR \fIfile\fR\&.
+.TP
+\fBlog\fR
+The full build log generated by the compiler/linker, including command
+line data from critcl, and other things\&.
+.TP
+\fBexl\fR
+The raw build log generated by the compiler/linker\&. Contains the output
+generated by the invoked applications\&.
+.RE
+.TP
+\fB::critcl::crosscheck\fR
+Determines whether the package is configured for cross-compilation and prints a
+message to the standard error channel if so\&.
+.TP
+\fB::critcl::error\fR \fImsg\fR
+Used to report internal errors\&. The default implementation simply returns the
+error\&.  Tools like the \fICriTcl Application\fR are allowed to redefine
+this procedure to perform their own way of error reporting\&. There is
+one constraint they are not allowed to change: The procedure must
+\fInot return\fR to the caller\&.
+.TP
+\fB::critcl::knowntargets\fR
+Returns a list of the identifiers of all targets
+found during the last invocation of \fBcritcl::readconfig\fR\&.
+.TP
+\fB::critcl::sharedlibext\fR
+Returns the file extension for shared libraries on the target platform\&.
+.TP
+\fB::critcl::targetconfig\fR
+Returns the identifier of the target to build for, as specified by either the
+user or the system\&.
+.TP
+\fB::critcl::buildplatform\fR
+Returns the identifier of the build platform, i\&.e\&. where the package is running
+on\&.
+.TP
+\fB::critcl::targetplatform\fR
+Returns the identifier of the target platform,
+i\&.e\&. the platform to compile for\&. In contrast to
+\fB::critcl::actualtarget\fR this may be the name of a
+cross-compilation target\&.
+.TP
+\fB::critcl::cobjects\fR ?\fIglob pattern\fR\&.\&.\&.?
+Like \fB::critcl::clibraries\fR, but instead of matching libraries, each
+\fIglob pattern\fR matches object files to be linked into the
+shared object (at compile time, not runtime)\&. If a \fIglob pattern\fR matches
+nothing an error is returned\&.
+Not listed in \fBControl & Interface\fR because it is of no use to
+package writers\&. Only tools like the \fICriTcl Application\fR need it\&.
+.sp
+A pattern for a relative path is resolved relative to the directory
+containing the \fICriTcl script\fR\&.
+.sp
+Calls to this command are cumulative\&.
+.TP
+\fB::critcl::scan\fR \fIpath\fR
+The main entry point to CriTcl's static code scanner\&.  Used by tools to
+implement processing modes like the assembly of a directory hierarchy
+containing a TEA-lookalike buildystem, etc\&.
+.sp
+Scans \fIpath\fR and returns a dictionary containing the following items:
+.RS
+.TP
+version
+Package version\&.
+.TP
+org
+Author(ing organization)\&.
+.TP
+files
+List of the companion files, relative to the directory of the input
+file\&.
+.RE
+.TP
+\fB::critcl::name2c\fR \fIname\fR
+Given the Tcl-level identifier \fIname\fR, returns a list containing the
+following details of its conversion to C:
+.RS
+.IP \(bu
+Tcl namespace prefix
+.IP \(bu
+C namespace prefix
+.IP \(bu
+Tcl base name
+.IP \(bu
+C base name
+.RE
+.sp
+For use by utilities that provide Tcl commands without going through
+standard commands like \fBcritcl::ccommand\fR or \fBcritcl::cproc\fR\&.
+\fBcritcl::class\fR does this\&.
+.PP
+.SS "ADVANCED: EMBEDDED C CODE"
+For advanced use, the following commands used by \fBcritcl::cproc\fR itself are
+exposed\&.
+.TP
+\fB::critcl::argnames\fR \fIarguments\fR
+Given an argument declaration as documented for \fBcritcl::cproc\fR, returns a list of the corresponding user-visible names\&.
+.TP
+\fB::critcl::argcnames\fR \fIarguments\fR
+Given an argument declaration as documented for \fBcritcl::cproc\fR, returns a list of the corresponding C variable names for the
+user-visible names\&. The names returned here match the names used in the
+declarations and code returned by \fB::critcl::argvardecls\fR and
+\fB::critcl::argconversion\fR\&.
+.TP
+\fB::critcl::argcsignature\fR \fIarguments\fR
+Given an argument declaration as documented for \fBcritcl::cproc\fR, returns a list of the corresponding C parameter declarations\&.
+.TP
+\fB::critcl::argvardecls\fR \fIarguments\fR
+Given an argument declaration as documented for \fBcritcl::cproc\fR, returns a list of the corresponding C variable declarations\&.
+The names used in these declarations match the names returned by
+\fB::critcl::argcnames\fR\&.
+.TP
+\fB::critcl::argconversion\fR \fIarguments\fR ?\fIn\fR?
+Given an argument declaration as documented for \fBcritcl::cproc\fR, returns a list of C code fragments converting the user visible
+arguments found in the declaration from Tcl_Obj* to C types\&. The names used in
+these statements match the names returned by \fB::critcl::argcnames\fR\&.
+.sp
+The generated code assumes that the procedure arguments start
+at index \fIn\fR of the \fBobjv\fR array\&.  The default is \fB1\fR\&.
+.TP
+\fB::critcl::argoptional\fR \fIarguments\fR
+Given an argument declaration as documented for \fBcritcl::cproc\fR, returns a list of boolean values indicating which arguments
+are optional (\fBtrue\fR), and which are not (\fBfalse\fR)\&.
+.TP
+\fB::critcl::argdefaults\fR \fIarguments\fR
+Given an argument declaration as documented for \fBcritcl::cproc\fR, returns a list containing the default values for all optional
+arguments\&.
+.TP
+\fB::critcl::argsupport\fR \fIarguments\fR
+Given an argument declaration as documented for \fBcritcl::cproc\fR, returns a list of C code fragments needed to define the
+necessary supporting types\&.
+.PP
+.SS "CUSTOM BUILD CONFIGURATION"
+This package provides one command for the management of
+package-specific, i\&.e\&. developer-specified custom build configuration
+options\&.
+.TP
+\fB::critcl::userconfig\fR \fBdefine\fR \fIname\fR \fIdescription\fR \fItype\fR ?\fIdefault\fR?
+This command defines custom build configuration option, with
+\fIdescription\fR, \fItype\fR and optional \fIdefault\fR value\&.
+.sp
+The type can be either \fBbool\fR, or a list of values\&.
+.RS
+.IP [1]
+For \fBbool\fR the default value, if specified, must be a
+boolean\&. If it is not specified it defaults to \fBtrue\fR\&.
+.IP [2]
+For a list of values the default value, if specified, must be a
+value found in this list\&. If it is not specified it defaults to the
+first value of the list\&.
+.RE
+.sp
+The \fIdescription\fR serves as in-code documentation of the
+meaning of the option and is otherwise ignored\&. When generating a TEA
+wrapper the description is used for the \fBconfigure\fR option
+derived from the option declared by the command\&.
+.sp
+A boolean option \fBFOO\fR are translated into a pair of
+configure options, \fB--enable-\fBFOO\fR\fR and
+\fB--disable-\fBFOO\fR\fR, whereas an option whose \fItype\fR is a
+list of values is translated into a single configure option
+\fB--with-\fBFOO\fR\fR\&.
+.TP
+\fB::critcl::userconfig\fR \fBquery\fR \fIname\fR
+This command queries the database of custom build configuration option
+for the current "\fI\&.critcl\fR" file and returns the chosen value\&.
+This may be the default if no value was set via
+\fB::critcl::userconfig set\fR\&.
+.sp
+It is at this point that definitions and set values are brought
+together, with the latter validated against the definition\&.
+.TP
+\fB::critcl::userconfig\fR \fBset\fR \fIname\fR \fIvalue\fR
+This command is for use by a tool, like the \fBcritcl\fR application,
+to specify values for custom build configuration options\&.
+.sp
+At the time this command is used only the association between
+option name and value is recorded, and nothing else is done\&. This
+behaviour is necessary as the system may not know if an option of the
+specified name exists when the command is invoked, nor its type\&.
+.sp
+Any and all validation is defered to when the value of an
+option is asked for via \fB::critcl::userconfig query\fR\&.
+.sp
+This means that it is possible to set values for any option we
+like, and the value will take effect only if such an option is both
+defined and used later on\&.
+.PP
+.SS "ADVANCED: LOCATION MANAGEMENT"
+First a small introduction for whose asking themselves
+\'what is location management' ?
+.PP
+By default critcl embeds \fI#line\fR directives into the
+generated C code so that any errors, warnings and notes found by the C
+compiler during compilation will refer to the "\fI\&.critcl\fR" file the
+faulty code comes from, instead of the generated "\fI\&.c\fR" file\&.
+.PP
+This facility requires the use of a tclsh that provides
+\fBinfo frame\fR\&.  Otherwise, no \fI#line\fR directives are emitted\&. The
+command is supported by Tcl 8\&.5 and higher\&. It is also supported by
+Tcl 8\&.4 provided that it was compiled with the define
+\fB-DTCL_TIP280\fR\&. An example of such is ActiveState's ActiveTcl\&.
+.PP
+Most users will not care about this feature beyond simply
+wanting it to work and getting proper code references when reading
+compiler output\&.
+.PP
+Developers of higher-level packages generating their own C code
+however should care about this, to ensure that their generated code
+contains proper references as well\&. Especially as this is key to
+separating bugs concerning code generated by the package itself and
+bug in the user's code going into the package, if any\&.
+.PP
+Examples of such packages come with critcl itself, see the
+implementation of packages \fBcritcl::iassoc\fR and
+\fBcritcl::class\fR\&.
+.PP
+To help such developers eight commands are provided to manage
+such \fIlocation\fR information\&. These are listed below\&.
+.PP
+A main concept is that they all operate on a single
+\fIstored location\fR, setting, returning and clearing it\&.
+Note that this location information is completely independent of the
+generation of \fI#line\fR directives within critcl itself\&.
+.TP
+\fB::critcl::at::caller\fR
+This command stores the location of the caller of the current
+procedure as a tuple of file name and linenumber\&. Any previously
+stored location is overwritten\&.
+The result of the command is the empty string\&.
+.TP
+\fB::critcl::at::caller\fR \fIoffset\fR
+As above, the stored line number is modified by the specified
+offset\&. In essence an implicit call of \fBcritcl::at::incr\fR\&.
+.TP
+\fB::critcl::at::caller\fR \fIoffset\fR \fIlevel\fR
+As above, but the level the location information is taken from is
+modified as well\&. Level \fB0\fR is the caller, \fB-1\fR its
+caller, etc\&.
+.TP
+\fB::critcl::at::here\fR
+This command stores the current location in the current procedure as a
+tuple of file name and linenumber\&. Any previously stored location is
+overwritten\&.
+The result of the command is the empty string\&.
+.sp
+In terms of \fB::critcl::at::caller\fR this is equivalent to
+.CS
+
+
+	critcl::at::caller 0 1
+
+.CE
+.TP
+\fB::critcl::at::get*\fR
+This command takes the stored location and returns a formatted
+\fI#line\fR directive ready for embedding into some C code\&. The
+stored location is left untouched\&.
+Note that the directive contains its own closing newline\&.
+.sp
+For proper nesting and use it is recommended that such
+directives are always added to the beginning of a code fragment\&. This
+way, should deeper layers add their own directives these will come
+before ours and thus be inactive\&. End result is that the outermost
+layer generating a directive will 'win', i\&.e\&. have its directive
+used\&. As it should be\&.
+.TP
+\fB::critcl::at::get\fR
+This command is like the above, except that it also clears the stored
+location\&.
+.TP
+\fB::critcl::at::=\fR \fIfile\fR \fIline\fR
+This command allows the caller to set the stored location to anything
+they want, outside of critcl's control\&.
+The result of the command is the empty string\&.
+.TP
+\fB::critcl::at::incr\fR \fIn\fR\&.\&.\&.
+.TP
+\fB::critcl::at::incrt\fR \fIstr\fR\&.\&.\&.
+These commands allow the user to modify the line number of the stored
+location, changing it incrementally\&. The increment is specified as
+either a series of integer numbers (\fBincr\fR), or a series of
+strings to consider (\fBincrt\fR)\&. In case of the latter the delta is
+the number of lines endings found in the strings\&.
+.TP
+\fB::critcl::at::caller!\fR
+.TP
+\fB::critcl::at::caller!\fR \fIoffset\fR
+.TP
+\fB::critcl::at::caller!\fR \fIoffset\fR \fIlevel\fR
+.TP
+\fB::critcl::at::here!\fR
+These are convenience commands combining \fBcaller\fR and \fBhere\fR
+with \fBget\fR\&. I\&.e\&. they store the location and immediately return it
+formatted as proper \fI#line\fR directive\&. Also note that after their
+use the stored location is cleared\&.
+.PP
+.SS "ADVANCED: DIVERSIONS"
+Diversions are for higher-level packages generating their own C code,
+to make their use of critcl's commands generating
+\fBEmbedded C Code\fR easier\&.
+.PP
+These commands normally generate all of their C code for the
+current "\fI\&.critcl\fR" file, which may not be what is wanted by a
+higher-level package\&.
+.PP
+With a diversion the generator output can be redirected into
+memory and from there on then handled and processed as the caller
+desires before it is committed to an actual "\fI\&.c\fR" file\&.
+.PP
+An example of such a package comes with critcl itself, see the
+implementation of package \fBcritcl::class\fR\&.
+.PP
+To help such developers three commands are provided to manage
+diversions and the collection of C code in memory\&. These are:
+.TP
+\fB::critcl::collect_begin\fR
+This command starts the diversion of C code collection into memory\&.
+.sp
+The result of the command is the empty string\&.
+.sp
+Multiple calls are allowed, with each call opening a new
+nesting level of diversion\&.
+.TP
+\fB::critcl::collect_end\fR
+This command end the diversion of C code collection into memory and
+returns the collected C code\&.
+.sp
+If multiple levels of diversion are open the call only closes
+and returns the data from the last level\&.
+.sp
+The command will throw an error if no diversion is active,
+indicating a mismatch in the pairing of \fBcollect_begin\fR and
+\fBcollect_end\fR\&.
+.TP
+\fB::critcl::collect\fR \fIscript\fR
+This is a convenience command which runs the \fIscript\fR under
+diversion and returns the collected C code, ensuring the correct
+pairing of \fBcollect_begin\fR and \fBcollect_end\fR\&.
+.PP
+.SS "ADVANCED: FILE GENERATION"
+While file generation is related to the diversions explained in the
+previous section they are not the same\&.
+Even so, like diversions this feature is for higher-level packages
+generating their own C code\&.
+.PP
+Three examples of utility packages using this facility comes
+with critcl itself\&.
+See the implementations of packages \fBcritcl::literals\fR,
+\fBcritcl::bitmap\fR, and \fBcritcl::enum\fR\&.
+.PP
+When splitting a package implementation into pieces it is often
+sensible to have a number of pure C companion files containing
+low-level code, yet these files may require information about the code
+in the main "\fI\&.critcl\fR" file\&. Such declarations are normally not
+exportable and using the stub table support does not make sense, as
+this is completely internal to the package\&.
+.PP
+With the file generation command below the main "\fI\&.critcl\fR"
+file can generate any number of header files for the C companions to
+pick up\&.
+.TP
+\fB::critcl::make\fR \fIpath\fR \fIcontents\fR
+This command creates the file \fIpath\fR in a location where the C
+companion files of the package are able to pick it up by simple
+inclusion of \fIpath\fR during their compilation, without interfering
+with the outer system at all\&.
+.sp
+The generated file will contain the specified \fIcontents\fR\&.
+.PP
+.SH CONCEPTS
+.SS "MODES OF OPERATION/USE"
+CriTcl can be used in three different modes of operation, called
+.IP [1]
+\fICompile & Run\fR, and
+.IP [2]
+\fIGenerate Package\fR
+.IP [3]
+\fIGenerate TEA Package\fR
+.PP
+\fICompile & Run\fR was the original mode and is the default for
+\fIcritcl_pkg\fR\&.  Collects the C fragments from the
+\fICriTcl script\fR, builds them as needed, and caches the results to
+improve load times later\&.
+.PP
+The second mode, \fIGenerate Package\fR, was introduced to enable
+the creation of (prebuilt) deliverable packages which do not depend on
+the existence of a build system, i\&.e\&. C compiler, on the target
+machine\&.
+This was originally done through the experimental \fBCritbind\fR tool,
+and is now handled by the \fICriTcl Application\fR, also named
+\fBcritcl\fR\&.
+.PP
+Newly introduced with CriTcl version 3 is
+\fIGenerate TEA Package\fR\&. This mode constructs a directory
+hierarchy from the package which can later be built like a regular TEA
+package, i\&.e\&. using
+.CS
+
+
+	\&.\&.\&./configure --prefix \&.\&.\&.
+	make all isntall
+
+.CE
+.PP
+Regarding the caching of results please read the section about
+the \fBResult Cache\fR fore more details\&.
+.SS "RUNTIME BEHAVIOUR"
+The default behaviour of critcl, the package is to defer the
+compilation, linking, and loading of any C code as much as possible,
+given that this is an expensive operation, mainly in the time
+required\&.
+In other words, the C code embedded into a "\fI\&.critcl\fR" file is
+built only when the first C command or procedure it provides is
+invoked\&.
+This part of the system uses standard functionality built into the Tcl
+core, i\&.e\&. the \fBauto_index\fR variable to map from commands to
+scripts providing them and the \fBunknown\fR command using this
+information when the command is needed\&.
+.PP
+A \fIlimitation\fR of this behaviour is that it is not
+possible to just use \fBinfo commands\fR check for the existence of
+a critcl defined command\&. It is also necessary to search in the
+\fBauto_index\fR array, in case it has not been build yet\&.
+.PP
+This behaviour can be changed by using the control command
+\fBcritcl::load\fR\&. When invoked, the building, including loading of
+the result, is forced\&. After this command has been invoked for a
+"\fI\&.critcl\fR" file further definition of C code in this file is not
+allowed any longer\&.
+.SS "FILE MAPPING"
+Each "\fI\&.critcl\fR" file is backed by a single private "\fI\&.c\fR" file
+containing that code, plus the boilerplate necessary for its
+compilation and linking as a single shared library\&.
+.PP
+The \fBEmbedded C Code\fR
+fragments appear in that file in the exact same order they were
+defined in the "\fI\&.critcl\fR" file, with one exception\&. The C code
+provided via \fBcritcl::cinit\fR is put after all other fragments\&.
+In other words all fragments have access to the symbols defined by
+earlier fragments, and the \fBcritcl::cinit\fR fragment has access to
+all, regardless of its placement in the "\fI\&.critcl\fR" file\&.
+.PP
+Note: A \fIlimitation\fR of the current system is the near
+impossibility of C level access between different critcl-based
+packages\&. The issue is not the necessity of writing and sharing the
+proper \fBextern\fR statements, but that the management (export and
+import) of package-specific stubs-tables is not supported\&. This means
+that dependent parts have to be forcibly loaded before their user,
+with all that entails\&. See section \fBRuntime Behaviour\fR for
+the relevant critcl limitation, and remember that many older platforms
+do not support the necessary resolution of symbols, the reason why
+stubs were invented for Tcl in the first place\&.
+.SS "RESULT CACHE"
+The compilation of C code is time-consuming \fBcritcl\fR not only
+defers it as much as possible, as described in section
+\fBRuntime Behaviour\fR, but also caches the results\&.
+.PP
+This means that on the first use of a "\fI\&.critcl\fR" file
+"\fIFOO\&.tcl\fR" the resulting object file and shared library are saved
+into the cache, and on future uses of the same file reused,
+i\&.e\&. loaded directly without requiring compilation, provided that the
+contents of "\fIFOO\&.tcl\fR" did not change\&.
+.PP
+The change detection is based MD5 hashes\&. A single hash is
+computed for each "\fI\&.critcl\fR" file, based on hashes for all C code
+fragments and configuration options, i\&.e\&. everything which affects the
+resulting binary\&.
+.PP
+As long as the input file doesn't change as per the hash a
+previously built shared library found in the cache is reused,
+bypassing the compilation and link stages\&.
+.PP
+The command to manage the cache are found in section
+\fBResult Cache Management\fR\&.
+Note however that they are useful only to tools based on the package,
+like the \fICriTcl Application\fR\&. Package writers have no need
+of them\&.
+.PP
+As a last note, the default directory for the cache is chosen
+based on the chosen build target\&. This means that the cache can be put
+on a shared (network) filesystem without having to fear interference
+between machines of different architectures\&.
+.SS "PRELOADING FUNCTIONALITY"
+The audience of this section are developers wishing to understand
+and possibly modify the internals of critcl package and application\&.
+Package writers can skip this section\&.
+.PP
+It explains how the preloading of external libraries is realized\&.
+.PP
+Whenever a package declares libraries for preloading critcl will build
+a supporting shared library providing a Tcl package named "preload"\&.
+This package is not distributed separately, but as part of the package
+requiring the preload functionality\&.
+This support package exports a single Tcl command
+.TP
+\fB::preload\fR \fIlibrary\fR
+which is invoked once per libraries to preload, with the absolute path
+of that \fIlibrary\fR\&. The command then loads the \fIlibrary\fR\&.
+.sp
+On windows the command will further use the Tcl command
+\fB::critcl::runtime::precopy\fR to copy the \fIlibrary\fR to the
+disk, should its path be in a virtual filesystem which doesn't
+directly support the loading of a shared library from it\&.
+.PP
+The command \fB::critcl::runtime::precopy\fR is provided by the file
+"\fIcritcl-rt\&.tcl\fR" in the generated package, as is the command
+\fB::critcl::runtime::loadlib\fR which generates the
+\fIifneeded script\fR expected by Tcl's package management\&. This
+generated ifneeded script contains the invocations of \fB::preload\fR\&.
+.PP
+The C code for the supporting library is found in the file
+"\fIcritcl_c/preload\&.c\fR", which is part of the \fBcritcl\fR
+package\&.
+.PP
+The Tcl code for the supporting runtime "\fIcritcl-rt\&.tcl\fR" is found
+in the file "\fIruntime\&.tcl\fR", which is part of the
+\fBcritcl::app\fR package\&.
+.SS "CONFIGURATION INTERNALS"
+The audience of this section are developers wishing to understand
+and possibly modify the internals of critcl package and application\&.
+Package writers can skip this section\&.
+.PP
+It explains the syntax of configuration files and the configuration
+keys used by \fBcritcl\fR to configure its build backend, i\&.e\&. how
+this part of the system accesses compiler, linker, etc\&.
+.PP
+It is recommended to open the file containing the standard
+configurations ("\fIpath/to/critcl/Config\fR") in the editor of your
+choice when reading this section of the documentation, using it as an
+extended set of examples going beyond the simple defaults shown here\&.
+.PP
+First, the keys and the meaning of their values, plus examples drawn
+from the standard configurations distributed with the package\&.
+Note that when writing a custom configuration it is not necessary to
+specify all the keys listed below, but only those whose default values
+are wrong or insufficient for the platform in question\&.
+.TP
+version
+The command to print the compiler version number\&.
+Defaults to
+.CS
+
+ gcc -v
+.CE
+.TP
+compile
+The command to compile a single C source file to an object file\&.
+Defaults to
+.CS
+
+ gcc -c -fPIC
+.CE
+.TP
+debug_memory
+The list of flags for the compiler to enable memory debugging in
+Tcl\&.
+Defaults to
+.CS
+
+ -DTCL_MEM_DEBUG
+.CE
+.TP
+debug_symbols
+The list of flags for the compiler to add symbols to the object files
+and the resulting library\&.
+Defaults to
+.CS
+
+ -g
+.CE
+.TP
+include
+The compiler flag to add an include directory\&.
+Defaults to
+.CS
+
+ -I
+.CE
+.TP
+tclstubs
+The compiler flag to set USE_TCL_STUBS\&.
+Defaults to
+.CS
+
+ -DUSE_TCL_STUBS
+.CE
+.TP
+tkstubs
+The compiler flag to set USE_TK_STUBS\&.
+Defaults to
+.CS
+
+ -DUSE_TK_STUBS
+.CE
+.TP
+threadflags
+The list of compiler flags to enable a threaded build\&.
+Defaults to
+.CS
+
+
+    -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1
+    -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1
+    -DTCL_THREADS=1
+
+.CE
+.IP\&.
+.TP
+noassert
+The compiler flag to turn off assertions in Tcl code\&.
+Defaults to
+.CS
+
+ -DNDEBUG
+.CE
+.TP
+optimize
+The compiler flag to specify optimization level\&.
+Defaults to
+.CS
+
+ -O2
+.CE
+.TP
+output
+The compiler flags to set the output file of a compilation\&.
+Defaults to
+.CS
+
+ -o [list $outfile]
+.CE
+.sp
+\fINOTE\fR the use of Tcl commands and variables here\&.  At the
+time \fBcritcl\fR uses the value of this key the value of the
+referenced variable is substituted into it\&. The named variable is the
+only variable whose value is defined for this substitution\&.
+.TP
+object
+The file extension for object files on the platform\&.
+Defaults to
+.CS
+
+ \&.o
+.CE
+.TP
+preproc_define
+The command to preprocess a C source file without compiling it, but
+leaving #define's in the output\&. Defaults to
+.CS
+
+ gcc -E -dM
+.CE
+.TP
+preproc_enum
+See \fBpreproc_define\fR, except that #define's are not left in the
+output\&. Defaults to
+.CS
+
+ gcc -E
+.CE
+.TP
+link
+The command to link one or more object files and create a shared
+library\&. Defaults to
+.CS
+
+ gcc -shared
+.CE
+.TP
+link_preload
+The list of linker flags to use when dependent libraries are
+pre-loaded\&. Defaults to
+.CS
+
+ --unresolved-symbols=ignore-in-shared-libs
+.CE
+.TP
+strip
+The flag to tell the linker to strip symbols from the shared library\&.
+Defaults to
+.CS
+
+ -Wl,-s
+.CE
+.TP
+ldoutput
+Like \fBoutput\fR, but for the linker\&.
+Defaults to the value of \fBoutput\fR\&.
+.TP
+link_debug
+The list of linker flags needed to build a shared library with
+symbols\&. Defaults to the empty string\&.
+One platform requiring this are all variants of Windows, which uses
+.CS
+
+ -debug:full -debugtype:cv
+.CE
+.TP
+link_release
+The list of linker flags needed to build a shared library without
+symbols, i\&.e\&. a regular build\&. Defaults to the empty string\&.
+One platform requiring this are all variants of Windows, which uses
+.CS
+
+ -release -opt:ref -opt:icf,3 -ws:aggressive
+.CE
+.TP
+sharedlibext
+The file extension for shared library files on the platform\&.
+Defaults to
+.CS
+
+ [info sharedlibextension]
+.CE
+.TP
+platform
+The identifier of the platform used in generated packages\&.
+Defaults to
+.CS
+
+ [platform::generic]
+.CE
+.TP
+target
+The presence of this key marks the configuration as a
+cross-compilation target and the value is the actual platform
+identifier of the target\&.  No default\&.
+.PP
+.PP
+The syntax expected from configuration files is governed by the rules below\&.
+Again, it is recommended to open the file containing the standard
+configurations ("\fIpath/to/critcl/Config\fR") in the editor of your
+choice when reading this section of the documentation, using it as an
+extended set of examples for the syntax>
+.IP [1]
+Each logical line of the configuration file consists of one or
+more physical lines\&. In case of the latter the physical lines have to
+follow each other and all but the first must be marked by a trailing
+backslash\&. This is the same marker for \fIcontinuation lines\fR as
+used by Tcl itself\&.
+.IP [2]
+A (logical) line starting with the character "#" (modulo
+whitespace) is a comment which runs until the end of the line, and is
+otherwise ignored\&.
+.IP [3]
+A (logical) line starting with the word "if" (modulo
+whitespace) is interpreted as Tcl's \fBif\fR command and executed as
+such\&. I\&.e\&. this command has to follow Tcl's syntax for the command,
+which may stretch across multiple logical lines\&. The command will be
+run in a save interpreter\&.
+.IP [4]
+A (logical) line starting with the word "set" (modulo
+whitespace) is interpreted as Tcl's \fBset\fR command and executed as
+such\&. I\&.e\&. this command has to follow Tcl's syntax for the command,
+which may stretch across multiple logical lines\&. The command will be
+run in a save interpreter\&.
+.IP [5]
+A line of the form "\fIplatform\fR \fBvariable\fR \fIvalue\fR"
+defines a platform specific configuration variable and value\&.
+The \fBvariable\fR has to be the name of one of the configuration keys
+listed earlier in this section, and the \fIplatform\fR string
+identifies the platform the setting is for\&. All settings with the same
+identification string form the \fIconfiguration block\fR for this
+platform\&.
+.IP [6]
+A line of the special form
+"\fIplatform\fR \fBwhen\fR \fIexpression\fR"
+marks the \fIplatform\fR and all the settings in its
+\fIconfiguration block\fR as conditional on the \fIexpression\fR\&.
+.sp
+If the build platform is not a prefix of \fIplatform\fR,
+nor vice versa the whole block is ignored\&.
+Otherwise the \fIexpression\fR is evaluated via \fBexpr\fR, in the
+same safe interpreter used to run any \fBset\fR and \fBif\fR commands
+found in the configuration file (see above)\&.
+.sp
+If the expression evaluates to \fBtrue\fR this configuration block
+is considered to be the build platform fo the host and chosen as the
+default configuration\&.
+An large example of of this feature is the handling of OS X found in
+the standard configuration file, where it selects the architectures to
+build based on the version of the operating system, the available SDK,
+etc\&. I\&.e\&. it chooses whether the output is universal or not, and
+whether it is old-style (ix86 + ppc) versus new-style (ix86 32+64) of
+universality\&.
+.IP [7]
+A line of the special form
+"\fIplatform\fR \fBcopy\fR \fIsourceplatform\fR"
+copies the configuration variables and values currently defined in the
+\fIconfiguration block\fR for \fIsourceplatform\fR to that of
+\fIplatform\fR, overwriting existing values, and creating missing
+ones\&. Variables of \fIplatform\fR not defined by by \fIsourceplatform\fR
+are not touched\&.
+.sp
+The copied values can be overridden later in the configuration
+file\&. Multiple \fBcopy\fR lines may exist for a platform and be
+intermixed with normal configuration definitions\&. Only the last definition of a
+variable is used\&.
+.IP [8]
+At last, a line of the form "\fBvariable\fR \fIvalue\fR"
+defines a default configuration variable and value\&.
+.PP
+.SS "STUBS TABLES"		This section is for developers of extensions not based on critcl, yet
+also wishing to interface with stubs as they are understood and used
+by critcl, either by exporting their own stubs table to a
+critcl-based extension, or importing a stubs table of a critcl-based
+extension into their own\&.
+.PP
+To this end we describe the stubs table information of a
+package \fBfoo\fR\&.
+.IP [1]
+Note that the differences in the capitalization of "foo",
+"Foo", "FOO", etc\&. below demonstrate how to capitalize the actual
+package name in each context\&.
+.IP [2]
+All relevant files must be available in a sub-directory
+"\fIfoo\fR" which can be found on the include search paths\&.
+.IP [3]
+The above directory may contain a file "\fIfoo\&.decls\fR"\&. If
+present it is assumed to contain the external representation
+of the stubs table the headers mentioned in the following
+items are based on\&.
+.sp
+critcl is able to use such a file to give the importing package
+programmatic access to the imported API, for automatic code
+generation and the like\&.
+.IP [4]
+The above directory must contain a header file
+"\fIfooDecls\&.h\fR"\&. This file \fIdeclares\fR the exported API\&.
+It is used by both exporting and importing packages\&. It is usually
+generated and must contain (in the order specified):
+.RS
+.IP [1]
+the declarations of the exported, i\&.e\&. public, functions of
+\fBfoo\fR,
+.IP [2]
+the declaration of structure "FooStubs" for the stub table,
+.IP [3]
+the C preprocessor macros which route the invocations of the
+public functions through the stubs table\&.
+.sp
+These macros must be defined if, and only if, the C preprocessor
+macro USE_FOO_STUBS is defined\&. Package \fBfoo\fR does not
+define this macro, as it is allowed to use the exported
+functions directly\&. All importing packages however must define
+this macro, to ensure that they do \fInot\fR use any of the
+exported functions directly, but only through the stubs table\&.
+.IP [4]
+If the exported functions need additional types for their proper
+declaration then these types should be put into a separate
+header file (of arbitrary name) and "\fIfooDecls\&.h\fR" should
+contain an #include directive to this header at the top\&.
+.RE
+.sp
+A very reduced, yet also complete example, from a package for
+low-level random number generator functions can be found at the end of
+this section\&.
+.IP [5]
+The above directory must contain a header file
+"\fIfooStubLib\&.h\fR"\&. This file \fIdefines\fR everything needed to use
+the API of \fBfoo\fR\&. Consequently it is used only by importing
+packages\&. It is usually generated and must contain (in the order
+specified):
+.RS
+.IP [1]
+An #include directive for "\fItcl\&.h\fR", with USE_TCL_STUBS
+surely defined\&.
+.IP [2]
+An #include directive for "\fIfooDecls\&.h\fR", with USE_FOO_STUBS
+surely defined\&.
+.IP [3]
+A \fIdefinition\fR of the stubs table variable, i\&.e\&.
+.CS
+
+const FooStubs* fooStubsPtr;
+.CE
+.IP [4]
+A \fIdefinition\fR of the stubs initializer function, like
+.CS
+
+char *
+Foo_InitStubs(Tcl_Interp *interp, CONST char *version, int exact)
+{
+    /*
+     * Boiler plate C code initalizing the stubs table variable,
+     * i\&.e\&. "fooStubsPtr"\&.
+     */
+
+    CONST char *actualVersion;
+
+    actualVersion = Tcl_PkgRequireEx(interp, "foo", version,
+				     exact, (ClientData *) &fooStubsPtr);
+
+    if (!actualVersion) {
+	return NULL;
+    }
+
+    if (!fooStubsPtr) {
+	Tcl_SetResult(interp,
+		      "This implementation of Foo does not support stubs",
+		      TCL_STATIC);
+	return NULL;
+    }
+
+    return (char*) actualVersion;
+}
+.CE
+.RE
+.IP
+This header file must be included by an importing package
+\fIexactly once\fR, so that it contains only one definition of both
+stubs table and stubs initializer function\&.
+.sp
+The importing package's initialization function must further
+contain a statement like
+.CS
+
+if (!Foo_InitStubs (ip, "1", 0)) {
+    return TCL_ERROR;
+}
+.CE
+.IP
+which invokes \fBfoo\fR's stubs initializer function to set the
+local stub table up\&.
+.sp
+For a complete example of such a header file see below, at the
+end of this section\&.
+.IP [6]
+The last item above, about "\fIfooStubLib\&.h\fR" \fIdiffers\fR
+from the regular stub stable system used by Tcl\&. The regular
+system assumes that a static library "\fIlibfoostub\&.a\fR" was
+installed by package \fBfoo\fR, and links it\&.
+.sp
+IMVHO critcl's approach is simpler, using \fIonly\fR header
+files found in a single location, vs\&. header files and static
+library found in multiple, different locations\&.
+.sp
+A second simplification is that we avoid having to extend
+critcl's compiler backend with settings for the creation of
+static libraries\&.
+.PP
+Below is a complete set of example header files, reduced, yet still
+complete, from a package for low-level random number generator
+functions:
+.TP
+"\fIrngDecls\&.h\fR":
+.CS
+
+
+#ifndef rng_DECLS_H
+#define rng_DECLS_H
+
+#include <tcl\&.h>
+
+/*
+ * Exported function declarations:
+ */
+
+/* 0 */
+EXTERN void rng_bernoulli(double p, int*v);
+
+typedef struct RngStubs {
+    int magic;
+    const struct RngStubHooks *hooks;
+
+    void (*rng_bernoulli) (double p, int*v); /* 0 */
+} RngStubs;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern const RngStubs *rngStubsPtr;
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_RNG_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+#define rng_bernoulli  (rngStubsPtr->rng_bernoulli) /* 0 */
+
+#endif /* defined(USE_RNG_STUBS) */
+#endif /* rng_DECLS_H */
+
+
+.CE
+.TP
+"\fIrngStubLib\&.h\fR":
+.CS
+
+
+/*
+ * rngStubLib\&.c --
+ *
+ * Stub object that will be statically linked into extensions that wish
+ * to access rng\&.
+ */
+
+#ifndef USE_TCL_STUBS
+#define USE_TCL_STUBS
+#endif
+#undef  USE_TCL_STUB_PROCS
+
+#include <tcl\&.h>
+
+#ifndef USE_RNG_STUBS
+#define USE_RNG_STUBS
+#endif
+#undef  USE_RNG_STUB_PROCS
+
+#include "rngDecls\&.h"
+
+/*
+ * Ensure that Rng_InitStubs is built as an exported symbol\&.  The other stub
+ * functions should be built as non-exported symbols\&.
+ */
+
+#undef  TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
+
+const RngStubs* rngStubsPtr;
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Rng_InitStubs --
+ *
+ * Checks that the correct version of Rng is loaded and that it
+ * supports stubs\&. It then initialises the stub table pointers\&.
+ *
+ * Results:
+ *  The actual version of Rng that satisfies the request, or
+ *  NULL to indicate that an error occurred\&.
+ *
+ * Side effects:
+ *  Sets the stub table pointers\&.
+ *
+ *----------------------------------------------------------------------
+ */
+
+#ifdef Rng_InitStubs
+#undef Rng_InitStubs
+#endif
+
+char *
+Rng_InitStubs(Tcl_Interp *interp, CONST char *version, int exact)
+{
+    CONST char *actualVersion;
+
+    actualVersion = Tcl_PkgRequireEx(interp, "rng", version,
+				     exact, (ClientData *) &rngStubsPtr);
+    if (!actualVersion) {
+	return NULL;
+    }
+
+    if (!rngStubsPtr) {
+	Tcl_SetResult(interp,
+		      "This implementation of Rng does not support stubs",
+		      TCL_STATIC);
+	return NULL;
+    }
+
+    return (char*) actualVersion;
+}
+
+.CE
+.PP
+.SH EXAMPLES
+See section "Embedding C" in \fIUsing CriTcl\fR\&.
+.SH AUTHORS
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report them at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR\&.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR as well\&.
+.SH KEYWORDS
+C code, Embedded C Code, calling C code from Tcl, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) Jean-Claude Wippler
+Copyright (c) Steve Landers
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_tcl9.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_tcl9.n
new file mode 100644
index 00000000..39f0312d
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_tcl9.n
@@ -0,0 +1,476 @@
+'\"
+'\" Generated from file 'critcl_tcl9\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) Jean-Claude Wippler
+'\" Copyright (c) Steve Landers
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl_tcl9" n 3\&.2\&.1 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl_tcl9 \- How To Adapt Critcl Packages for Tcl 9
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This guide contains notes and actions to take by writers of \fICriTcl\fR-based
+packages to make their code workable for both Tcl 8\&.6 and 9\&.
+.IP [1]
+Generally, if there is no interest in moving to Tcl 9, i\&.e\&. Tcl 8\&.[456]
+are the only supported runtimes, then just keep using \fICriTcl\fR \fB3\&.2\fR\&.
+.sp
+The remainder of this document can be ignored\&.
+.IP [2]
+Use \fICriTcl\fR version 3\&.2\&.1 \fIif, and only if\fR
+Tcl 9 support is wanted\&.
+.sp
+With some work this will then also provide backward compatibility with Tcl 8\&.6\&.
+.IP [3]
+Header "\fItcl\&.h\fR"
+.sp
+Replace any inclusion of Tcl's public "\fItcl\&.h\fR" header file in the package's
+C code with the inclusion of \fICriTcl\fR's new header file "\fItclpre9compat\&.h\fR"\&.
+.sp
+This includes "\fItcl\&.h\fR" and further provides a set of compatibility definitions
+which make supporting both Tcl 8\&.6 and Tcl 9 in a single code base easier\&.
+.sp
+The following notes assume that this compatibility layer is in place\&.
+.IP [4]
+\fBcritcl::tcl\fR
+.sp
+Before \fICriTcl\fR 3\&.2\&.1 a single default (\fB8\&.4\fR) was used for
+the minimum Tcl version, to be overriden by an explicit \fBcritcl::tcl\fR in the
+package code\&.
+.sp
+Now the default is dynamic, based on the \fIruntime\fR version, i\&.e\&.
+\fBpackage provide Tcl\fR, \fICriTcl\fR is run with/on\&.
+.sp
+When running on Tcl 9 the new default is version \fB9\fR, and \fB8\&.6\fR else\&.
+\fINote\fR how this other default was bumped up from \fB8\&.4\fR\&.
+.sp
+As a consequence it is possible to
+.RS
+.IP [1]
+Support just Tcl 8\&.4+, 8\&.5+, by having an explicit \fBcritcl::tcl 8\&.x\fR in
+the package code\&.
+.sp
+\fIRemember however\fR, it is better to simply stick with
+\fICriTcl\fR \fB3\&.2\fR for this\&.
+.IP [2]
+Support just Tcl 9 by having an explicit \fBcritcl::tcl 9\fR in the package code\&.
+.IP [3]
+Support both Tcl 8\&.6 and Tcl 9 (but not 8\&.4/8\&.5) by leaving \fBcritcl::tcl\fR out of the code
+and using the proper \fBtclsh\fR version to run \fICriTcl\fR with\&.
+.RE
+.IP [5]
+Code checking
+.sp
+\fICriTcl\fR 3\&.2\&.1 comes with a very basic set of code checks pointing
+out places where compatibility might or will be an issue\&.
+.sp
+The implementation checks all inlined C code declared by \fBcritcl::ccode\fR,
+\fBcritcl::ccommand\fR, \fBcritcl::cproc\fR (and related/derived commands), as well
+as the C companion files declared with \fBcritcl::csources\fR\&.
+.sp
+It is very basic because it simply greps the code line by line for a number
+of patterns and reports on their presence\&. The C code is not fully parsed\&.
+The check can and will report pattern found in C code comments, for example\&.
+.sp
+The main patterns deal with functions affected by the change to \fBTcl_Size\fR,
+the removal of old-style interpreter state handling, and command creation\&.
+.sp
+A warning message is printed for all detections\&.
+.sp
+This is disabled for the \fBTcl_Size\fR-related pattern if the line also matches
+the pattern \fB*OK tcl9*\fR\&.
+.sp
+In this way all places in the code already handled can be marked and excluded
+from the warnings\&.
+.RS
+.IP [1]
+Interpreter State handling
+.sp
+Tcl 9 removed the type \fBTcl_SavedResult\fR and its associated functions
+\fBTcl_SaveResult\fR, \fBTcl_RestoreResult\fR, and \fBTcl_DiscardResult\fR\&.
+.sp
+When a package uses this type and the related functions a rewrite is necessary\&.
+.sp
+With Tcl 9 use of type \fBTcl_InterpState\fR and its functions
+\fBTcl_SaveInterpState\fR, \fBTcl_RestoreInterpState\fR, and
+\fBTcl_DiscardInterpState\fR is now required\&.
+.sp
+As these were introduced with Tcl 8\&.5 the rewrite gives us compatibility with
+Tcl 8\&.6 for free\&.
+.IP [2]
+\fBTcl_Size\fR
+.sp
+One of the main changes introduced with Tcl 9 is the breaking of the 2G barrier
+for the number of bytes in a string, elements in a list, etc\&.
+In a lot of interfaces \fBint\fR was replaced with \fBTcl_Size\fR, which is
+effectively \fBptrdiff_t\fR behind the scenes\&.
+.sp
+The "\fItclpre9compat\&.h\fR" header mentioned above provides a suitable definition
+of \fBTcl_Size\fR for \fB8\&.6\fR, i\&.e\&. maps it to \fBint\fR\&.
+This enables the package code to use \fBTcl_Size\fR everywhere and still have it
+work for both Tcl 8\&.6 and 9\&.
+.sp
+It is of course necessary to rewrite the package code to use \fBTcl_Size\fR\&.
+.sp
+The checker reports all lines in the C code using a function whose signature
+was changed to use \fBTcl_Size\fR over \fBint\fR\&.
+.sp
+Note that it is necessary to manually check the package code for places where
+a \fB%d\fR text formatting specification should be replaced with
+\fBTCL_SIZE_FMT\fR\&.
+.sp
+I\&.e\&. all places where \fBTcl_Size\fR values are formatted with \fBprintf\fR-style
+functions a formatting string
+.CS
+
+"\&.\&.\&. %d \&.\&.\&."
+.CE
+.IP has to be replaced with
+.CS
+
+"\&.\&.\&. " TCL_SIZE_FMT " \&.\&.\&."
+.CE
+.sp
+The macro \fBTCL_SIZE_FMT\fR is defined by Critcl's compatibility layer, as an
+extension of the \fBTCL_SIZE_MODIFIER\fR macro which only contains the
+formatting modifier to insert into a plain \fB%d\fR to handle \fBTcl_Size\fR
+values\&.
+.sp
+\fINote\fR how the original formatting string is split into multiple strings\&.
+The C compiler will fuse these back together into a single string\&.
+.IP [3]
+Command creation\&.
+.sp
+This is technically a part of the \fBTcl_Size\fR changes\&.
+.sp
+All places using \fBTcl_CreateObjCommand\fR have to be rewritten to use
+\fBTcl_CreateObjCommand2\fR instead, and the registered command functions
+to use \fBTcl_Size\fR for their \fIobjc\fR argument\&.
+.sp
+The "\fItclpre9compat\&.h\fR" header maps this back to the old function
+when compilation is done against Tcl 8\&.6\&.
+.sp
+\fICriTcl\fR does this itself for the commands created via \fBcritcl::ccommand\fR,
+\fBcritcl::cproc\fR, and derived places (\fBcritcl::class\fR)\&.
+.IP [4]
+TIP 494\&. This TIP adds three semantic constants wrapping \fB-1\fR to Tcl 9 to
+make the meaning of code clearer\&. As part of this it also casts the constant to the
+proper type\&. They are:
+.RS
+.IP \(bu
+\fBTCL_IO_FAILURE\fR
+.IP \(bu
+\fBTCL_AUTO_LENGTH\fR
+.IP \(bu
+\fBTCL_INDEX_NONE\fR
+.RE
+.sp
+Critcl's compatibility layer provides the same constants to Tcl 8\&.6\&.
+.sp
+Critcl's new checker highlights places where \fBTCL_AUTO_LENGTH\fR is suitable\&.
+.sp
+Doing this for the other two constants looks to require deeper and proper parsing
+of C code, which the checker does not do\&.
+.RE
+.PP
+.SH "ADDITIONAL REFERENCES"
+.IP [1]
+\fIhttps://wiki\&.tcl-lang\&.org/page/Porting+extensions+to+Tcl+9\fR
+.IP [2]
+\fIhttps://wiki\&.tcl-lang\&.org/page/Tcl+9+functions+using+Tcl%5FSize\fR
+.IP [3]
+\fIhttps://core\&.tcl-lang\&.org/tcl/wiki?name=Migrating%20scripts%20to%20Tcl%209\fR
+.IP [4]
+\fIhttps://core\&.tcl-lang\&.org/tcl/wiki?name=Migrating%20C%20extensions%20to%20Tcl%209\fR
+.PP
+.SH AUTHORS
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report them at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR\&.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at \fIhttps://github\&.com/andreas-kupries/critcl/issues\fR as well\&.
+.SH KEYWORDS
+C code, Embedded C Code, calling C code from Tcl, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) Jean-Claude Wippler
+Copyright (c) Steve Landers
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/files/critcl_util.n b/src/vfs/critcl.vfs/embedded/man/files/critcl_util.n
new file mode 100644
index 00000000..4dd2e608
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/files/critcl_util.n
@@ -0,0 +1,389 @@
+'\"
+'\" Generated from file 'critcl_util\&.man' by tcllib/doctools with format 'nroff'
+'\" Copyright (c) 2011-2024 Andreas Kupries
+'\"
+.TH "critcl::util" n 1\&.2 doc "C Runtime In Tcl (CriTcl)"
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH NAME
+critcl::util \- CriTcl - Utilities
+.SH SYNOPSIS
+package require \fBTcl  8\&.6\fR
+.sp
+package require \fBcritcl  ?3\&.2?\fR
+.sp
+package require \fBcritcl::util  ?1\&.2?\fR
+.sp
+\fB::critcl::util::checkfun\fR \fIname\fR ?\fIlabel\fR?
+.sp
+\fB::critcl::util::def\fR \fIpath\fR \fIdefine\fR ?\fIvalue\fR?
+.sp
+\fB::critcl::util::undef\fR \fIpath\fR \fIdefine\fR
+.sp
+\fB::critcl::util::locate\fR \fIlabel\fR \fIpaths\fR ?\fIcmd\fR?
+.sp
+.BE
+.SH DESCRIPTION
+.PP
+Be welcome to the \fIC Runtime In Tcl\fR (short: \fICriTcl\fR), a system for embedding and using C
+code from within \fITcl\fR [http://core\&.tcl-lang\&.org/tcl] scripts\&.
+.PP
+This document is the reference manpage for the \fBcritcl::util\fR
+package\&. This package provides convenience commands for advanced
+functionality built on top of the core\&.
+Its intended audience are mainly developers wishing to write Tcl
+packages with embedded C code\&.
+.PP
+This package resides in the Core Package Layer of CriTcl\&.
+.PP
+.PS
+.nf
++----------------+
+|Applications    |
+| critcl         |
+| critcl::app    |
++----------------+
+
+*================*
+|Core Packages   |
+| critcl         |
+| critcl::util   |
+*================*
+
++----------------+
+|Support Packages|
+| stubs::*       |
+| md5, platform  |
+|  \&.\&.\&.           |
++----------------+
+
+.fi
+.PE
+.PP
+.SH API
+.TP
+\fB::critcl::util::checkfun\fR \fIname\fR ?\fIlabel\fR?
+This command checks the build-time environment for the existence of
+the C function \fIname\fR\&.
+It returns \fBtrue\fR on success, and \fBfalse\fR otherwise\&.
+.TP
+\fB::critcl::util::def\fR \fIpath\fR \fIdefine\fR ?\fIvalue\fR?
+This command extends the specified configuration file \fIpath\fR with a
+\fB#define\fR directive for the named \fIdefine\fR\&. If the \fIvalue\fR
+is not specified it will default to \fB1\fR\&.
+.sp
+The result of the command is an empty string\&.
+.sp
+Note that the configuration file is maintained in the \fBcritcl::cache\fR
+directory\&.
+.TP
+\fB::critcl::util::undef\fR \fIpath\fR \fIdefine\fR
+This command extends the specified configuration file \fIpath\fR with an
+\fB#undef\fR directive for the named \fIdefine\fR\&.
+.sp
+The result of the command is an empty string\&.
+.sp
+Note that the configuration file is maintained in the \fBcritcl::cache\fR
+directory\&.
+.TP
+\fB::critcl::util::locate\fR \fIlabel\fR \fIpaths\fR ?\fIcmd\fR?
+This command checks the build-time environment for the existence of a file
+in a set of possible \fIpaths\fR\&.
+.sp
+If the option \fIcmd\fR prefix is specified it will be called with
+the full path of a found file as its only argument to perform further checks\&.
+A return value of \fBfalse\fR will reject the path and continue the search\&.
+.sp
+The return value of the command is the found path, as listed in
+\fIpaths\fR\&. As a side effect the command will also print the found path,
+prefixed with the \fIlabel\fR, using \fBcritcl::msg\fR\&.
+.sp
+Failure to find the path is reported via \fBcritcl::error\fR, and a
+possible empty string as the result, if \fBcritcl::error\fR does not
+terminate execution\&.
+A relative path is resolved relative to the directory
+containing the \fICriTcl script\fR\&.
+.PP
+.SH AUTHORS
+Andreas Kupries
+.SH "BUGS, IDEAS, FEEDBACK"
+This document, and the package it describes, will undoubtedly contain
+bugs and other problems\&.
+Please report such at \fIhttps://github\&.com/andreas-kupries/critcl\fR\&.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation\&.
+.SH KEYWORDS
+C code, Embedded C Code, code generator, compile & run, compiler, dynamic code generation, dynamic compilation, generate package, linker, on demand compilation, on-the-fly compilation
+.SH CATEGORY
+Glueing/Embedded C code
+.SH COPYRIGHT
+.nf
+Copyright (c) 2011-2024 Andreas Kupries
+
+.fi
diff --git a/src/vfs/critcl.vfs/embedded/man/index.n b/src/vfs/critcl.vfs/embedded/man/index.n
new file mode 100644
index 00000000..c84e56ac
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/index.n
@@ -0,0 +1,1193 @@
+'\"
+'\" Generated by tcllib/doctools/idx with format 'nroff'
+.TH "Keyword Index" n
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH INDEX
+doc
+.RS
+C class
+.RS
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.RE
+C code
+.RS
+.TP
+\fBfiles/critcl\&.n\fR
+critcl
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_callback\&.n\fR
+critcl::callback
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.TP
+\fBfiles/critcl_cutil\&.n\fR
+critcl::cutil
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_iassoc\&.n\fR
+critcl::iassoc
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.TP
+\fBfiles/critcl_util\&.n\fR
+critcl::util
+.TP
+\fBfiles/critcl_application\&.n\fR
+critcl_application
+.TP
+\fBfiles/critcl_application_package\&.n\fR
+critcl_application_package
+.TP
+\fBfiles/critcl_build\&.n\fR
+critcl_build_tool
+.TP
+\fBfiles/critcl_changes\&.n\fR
+critcl_changes
+.TP
+\fBfiles/critcl_cproc\&.n\fR
+critcl_cproc_types
+.TP
+\fBfiles/critcl_devguide\&.n\fR
+critcl_devguide
+.TP
+\fBfiles/critcl_howto_install\&.n\fR
+critcl_howto_install
+.TP
+\fBfiles/critcl_howto_sources\&.n\fR
+critcl_howto_sources
+.TP
+\fBfiles/critcl_howto_use\&.n\fR
+critcl_howto_use
+.TP
+\fBfiles/critcl_license\&.n\fR
+critcl_license
+.TP
+\fBfiles/critcl_package\&.n\fR
+critcl_package
+.TP
+\fBfiles/critcl_tcl9\&.n\fR
+critcl_tcl9
+.RE
+C instance
+.RS
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.RE
+C object
+.RS
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.RE
+Embedded C Code
+.RS
+.TP
+\fBfiles/critcl\&.n\fR
+critcl
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_callback\&.n\fR
+critcl::callback
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.TP
+\fBfiles/critcl_cutil\&.n\fR
+critcl::cutil
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_iassoc\&.n\fR
+critcl::iassoc
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.TP
+\fBfiles/critcl_util\&.n\fR
+critcl::util
+.TP
+\fBfiles/critcl_application\&.n\fR
+critcl_application
+.TP
+\fBfiles/critcl_application_package\&.n\fR
+critcl_application_package
+.TP
+\fBfiles/critcl_build\&.n\fR
+critcl_build_tool
+.TP
+\fBfiles/critcl_changes\&.n\fR
+critcl_changes
+.TP
+\fBfiles/critcl_cproc\&.n\fR
+critcl_cproc_types
+.TP
+\fBfiles/critcl_devguide\&.n\fR
+critcl_devguide
+.TP
+\fBfiles/critcl_howto_install\&.n\fR
+critcl_howto_install
+.TP
+\fBfiles/critcl_howto_sources\&.n\fR
+critcl_howto_sources
+.TP
+\fBfiles/critcl_howto_use\&.n\fR
+critcl_howto_use
+.TP
+\fBfiles/critcl_license\&.n\fR
+critcl_license
+.TP
+\fBfiles/critcl_package\&.n\fR
+critcl_package
+.TP
+\fBfiles/critcl_tcl9\&.n\fR
+critcl_tcl9
+.RE
+Tcl Interp Association
+.RS
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_iassoc\&.n\fR
+critcl::iassoc
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.RE
+bitmask
+.RS
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.RE
+bitset
+.RS
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.RE
+calling C code from Tcl
+.RS
+.TP
+\fBfiles/critcl\&.n\fR
+critcl
+.TP
+\fBfiles/critcl_application\&.n\fR
+critcl_application
+.TP
+\fBfiles/critcl_application_package\&.n\fR
+critcl_application_package
+.TP
+\fBfiles/critcl_build\&.n\fR
+critcl_build_tool
+.TP
+\fBfiles/critcl_changes\&.n\fR
+critcl_changes
+.TP
+\fBfiles/critcl_cproc\&.n\fR
+critcl_cproc_types
+.TP
+\fBfiles/critcl_devguide\&.n\fR
+critcl_devguide
+.TP
+\fBfiles/critcl_howto_install\&.n\fR
+critcl_howto_install
+.TP
+\fBfiles/critcl_howto_sources\&.n\fR
+critcl_howto_sources
+.TP
+\fBfiles/critcl_howto_use\&.n\fR
+critcl_howto_use
+.TP
+\fBfiles/critcl_license\&.n\fR
+critcl_license
+.TP
+\fBfiles/critcl_package\&.n\fR
+critcl_package
+.TP
+\fBfiles/critcl_tcl9\&.n\fR
+critcl_tcl9
+.RE
+code generator
+.RS
+.TP
+\fBfiles/critcl\&.n\fR
+critcl
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_callback\&.n\fR
+critcl::callback
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.TP
+\fBfiles/critcl_cutil\&.n\fR
+critcl::cutil
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_iassoc\&.n\fR
+critcl::iassoc
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.TP
+\fBfiles/critcl_util\&.n\fR
+critcl::util
+.TP
+\fBfiles/critcl_application\&.n\fR
+critcl_application
+.TP
+\fBfiles/critcl_application_package\&.n\fR
+critcl_application_package
+.TP
+\fBfiles/critcl_build\&.n\fR
+critcl_build_tool
+.TP
+\fBfiles/critcl_changes\&.n\fR
+critcl_changes
+.TP
+\fBfiles/critcl_cproc\&.n\fR
+critcl_cproc_types
+.TP
+\fBfiles/critcl_devguide\&.n\fR
+critcl_devguide
+.TP
+\fBfiles/critcl_howto_install\&.n\fR
+critcl_howto_install
+.TP
+\fBfiles/critcl_howto_sources\&.n\fR
+critcl_howto_sources
+.TP
+\fBfiles/critcl_howto_use\&.n\fR
+critcl_howto_use
+.TP
+\fBfiles/critcl_license\&.n\fR
+critcl_license
+.TP
+\fBfiles/critcl_package\&.n\fR
+critcl_package
+.TP
+\fBfiles/critcl_tcl9\&.n\fR
+critcl_tcl9
+.RE
+compile & run
+.RS
+.TP
+\fBfiles/critcl\&.n\fR
+critcl
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_callback\&.n\fR
+critcl::callback
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.TP
+\fBfiles/critcl_cutil\&.n\fR
+critcl::cutil
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_iassoc\&.n\fR
+critcl::iassoc
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.TP
+\fBfiles/critcl_util\&.n\fR
+critcl::util
+.TP
+\fBfiles/critcl_application\&.n\fR
+critcl_application
+.TP
+\fBfiles/critcl_application_package\&.n\fR
+critcl_application_package
+.TP
+\fBfiles/critcl_build\&.n\fR
+critcl_build_tool
+.TP
+\fBfiles/critcl_changes\&.n\fR
+critcl_changes
+.TP
+\fBfiles/critcl_cproc\&.n\fR
+critcl_cproc_types
+.TP
+\fBfiles/critcl_devguide\&.n\fR
+critcl_devguide
+.TP
+\fBfiles/critcl_howto_install\&.n\fR
+critcl_howto_install
+.TP
+\fBfiles/critcl_howto_sources\&.n\fR
+critcl_howto_sources
+.TP
+\fBfiles/critcl_howto_use\&.n\fR
+critcl_howto_use
+.TP
+\fBfiles/critcl_license\&.n\fR
+critcl_license
+.TP
+\fBfiles/critcl_package\&.n\fR
+critcl_package
+.TP
+\fBfiles/critcl_tcl9\&.n\fR
+critcl_tcl9
+.RE
+compiler
+.RS
+.TP
+\fBfiles/critcl\&.n\fR
+critcl
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_callback\&.n\fR
+critcl::callback
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.TP
+\fBfiles/critcl_cutil\&.n\fR
+critcl::cutil
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_iassoc\&.n\fR
+critcl::iassoc
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.TP
+\fBfiles/critcl_util\&.n\fR
+critcl::util
+.TP
+\fBfiles/critcl_application\&.n\fR
+critcl_application
+.TP
+\fBfiles/critcl_application_package\&.n\fR
+critcl_application_package
+.TP
+\fBfiles/critcl_build\&.n\fR
+critcl_build_tool
+.TP
+\fBfiles/critcl_changes\&.n\fR
+critcl_changes
+.TP
+\fBfiles/critcl_cproc\&.n\fR
+critcl_cproc_types
+.TP
+\fBfiles/critcl_devguide\&.n\fR
+critcl_devguide
+.TP
+\fBfiles/critcl_howto_install\&.n\fR
+critcl_howto_install
+.TP
+\fBfiles/critcl_howto_sources\&.n\fR
+critcl_howto_sources
+.TP
+\fBfiles/critcl_howto_use\&.n\fR
+critcl_howto_use
+.TP
+\fBfiles/critcl_license\&.n\fR
+critcl_license
+.TP
+\fBfiles/critcl_package\&.n\fR
+critcl_package
+.TP
+\fBfiles/critcl_tcl9\&.n\fR
+critcl_tcl9
+.RE
+conversion
+.RS
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.RE
+dynamic code generation
+.RS
+.TP
+\fBfiles/critcl\&.n\fR
+critcl
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_callback\&.n\fR
+critcl::callback
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.TP
+\fBfiles/critcl_cutil\&.n\fR
+critcl::cutil
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_iassoc\&.n\fR
+critcl::iassoc
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.TP
+\fBfiles/critcl_util\&.n\fR
+critcl::util
+.TP
+\fBfiles/critcl_application\&.n\fR
+critcl_application
+.TP
+\fBfiles/critcl_application_package\&.n\fR
+critcl_application_package
+.TP
+\fBfiles/critcl_build\&.n\fR
+critcl_build_tool
+.TP
+\fBfiles/critcl_changes\&.n\fR
+critcl_changes
+.TP
+\fBfiles/critcl_cproc\&.n\fR
+critcl_cproc_types
+.TP
+\fBfiles/critcl_devguide\&.n\fR
+critcl_devguide
+.TP
+\fBfiles/critcl_howto_install\&.n\fR
+critcl_howto_install
+.TP
+\fBfiles/critcl_howto_sources\&.n\fR
+critcl_howto_sources
+.TP
+\fBfiles/critcl_howto_use\&.n\fR
+critcl_howto_use
+.TP
+\fBfiles/critcl_license\&.n\fR
+critcl_license
+.TP
+\fBfiles/critcl_package\&.n\fR
+critcl_package
+.TP
+\fBfiles/critcl_tcl9\&.n\fR
+critcl_tcl9
+.RE
+dynamic compilation
+.RS
+.TP
+\fBfiles/critcl\&.n\fR
+critcl
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_callback\&.n\fR
+critcl::callback
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.TP
+\fBfiles/critcl_cutil\&.n\fR
+critcl::cutil
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_iassoc\&.n\fR
+critcl::iassoc
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.TP
+\fBfiles/critcl_util\&.n\fR
+critcl::util
+.TP
+\fBfiles/critcl_application\&.n\fR
+critcl_application
+.TP
+\fBfiles/critcl_application_package\&.n\fR
+critcl_application_package
+.TP
+\fBfiles/critcl_build\&.n\fR
+critcl_build_tool
+.TP
+\fBfiles/critcl_changes\&.n\fR
+critcl_changes
+.TP
+\fBfiles/critcl_cproc\&.n\fR
+critcl_cproc_types
+.TP
+\fBfiles/critcl_devguide\&.n\fR
+critcl_devguide
+.TP
+\fBfiles/critcl_howto_install\&.n\fR
+critcl_howto_install
+.TP
+\fBfiles/critcl_howto_sources\&.n\fR
+critcl_howto_sources
+.TP
+\fBfiles/critcl_howto_use\&.n\fR
+critcl_howto_use
+.TP
+\fBfiles/critcl_license\&.n\fR
+critcl_license
+.TP
+\fBfiles/critcl_package\&.n\fR
+critcl_package
+.TP
+\fBfiles/critcl_tcl9\&.n\fR
+critcl_tcl9
+.RE
+flags
+.RS
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.RE
+generate package
+.RS
+.TP
+\fBfiles/critcl\&.n\fR
+critcl
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_callback\&.n\fR
+critcl::callback
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.TP
+\fBfiles/critcl_cutil\&.n\fR
+critcl::cutil
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_iassoc\&.n\fR
+critcl::iassoc
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.TP
+\fBfiles/critcl_util\&.n\fR
+critcl::util
+.TP
+\fBfiles/critcl_application\&.n\fR
+critcl_application
+.TP
+\fBfiles/critcl_application_package\&.n\fR
+critcl_application_package
+.TP
+\fBfiles/critcl_build\&.n\fR
+critcl_build_tool
+.TP
+\fBfiles/critcl_changes\&.n\fR
+critcl_changes
+.TP
+\fBfiles/critcl_cproc\&.n\fR
+critcl_cproc_types
+.TP
+\fBfiles/critcl_devguide\&.n\fR
+critcl_devguide
+.TP
+\fBfiles/critcl_howto_install\&.n\fR
+critcl_howto_install
+.TP
+\fBfiles/critcl_howto_sources\&.n\fR
+critcl_howto_sources
+.TP
+\fBfiles/critcl_howto_use\&.n\fR
+critcl_howto_use
+.TP
+\fBfiles/critcl_license\&.n\fR
+critcl_license
+.TP
+\fBfiles/critcl_package\&.n\fR
+critcl_package
+.TP
+\fBfiles/critcl_tcl9\&.n\fR
+critcl_tcl9
+.RE
+int to string mapping
+.RS
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.RE
+linker
+.RS
+.TP
+\fBfiles/critcl\&.n\fR
+critcl
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_callback\&.n\fR
+critcl::callback
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.TP
+\fBfiles/critcl_cutil\&.n\fR
+critcl::cutil
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_iassoc\&.n\fR
+critcl::iassoc
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.TP
+\fBfiles/critcl_util\&.n\fR
+critcl::util
+.TP
+\fBfiles/critcl_application\&.n\fR
+critcl_application
+.TP
+\fBfiles/critcl_application_package\&.n\fR
+critcl_application_package
+.TP
+\fBfiles/critcl_build\&.n\fR
+critcl_build_tool
+.TP
+\fBfiles/critcl_changes\&.n\fR
+critcl_changes
+.TP
+\fBfiles/critcl_cproc\&.n\fR
+critcl_cproc_types
+.TP
+\fBfiles/critcl_devguide\&.n\fR
+critcl_devguide
+.TP
+\fBfiles/critcl_howto_install\&.n\fR
+critcl_howto_install
+.TP
+\fBfiles/critcl_howto_sources\&.n\fR
+critcl_howto_sources
+.TP
+\fBfiles/critcl_howto_use\&.n\fR
+critcl_howto_use
+.TP
+\fBfiles/critcl_license\&.n\fR
+critcl_license
+.TP
+\fBfiles/critcl_package\&.n\fR
+critcl_package
+.TP
+\fBfiles/critcl_tcl9\&.n\fR
+critcl_tcl9
+.RE
+literal pool
+.RS
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.RE
+on demand compilation
+.RS
+.TP
+\fBfiles/critcl\&.n\fR
+critcl
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_callback\&.n\fR
+critcl::callback
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.TP
+\fBfiles/critcl_cutil\&.n\fR
+critcl::cutil
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_iassoc\&.n\fR
+critcl::iassoc
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.TP
+\fBfiles/critcl_util\&.n\fR
+critcl::util
+.TP
+\fBfiles/critcl_application\&.n\fR
+critcl_application
+.TP
+\fBfiles/critcl_application_package\&.n\fR
+critcl_application_package
+.TP
+\fBfiles/critcl_build\&.n\fR
+critcl_build_tool
+.TP
+\fBfiles/critcl_changes\&.n\fR
+critcl_changes
+.TP
+\fBfiles/critcl_cproc\&.n\fR
+critcl_cproc_types
+.TP
+\fBfiles/critcl_devguide\&.n\fR
+critcl_devguide
+.TP
+\fBfiles/critcl_howto_install\&.n\fR
+critcl_howto_install
+.TP
+\fBfiles/critcl_howto_sources\&.n\fR
+critcl_howto_sources
+.TP
+\fBfiles/critcl_howto_use\&.n\fR
+critcl_howto_use
+.TP
+\fBfiles/critcl_license\&.n\fR
+critcl_license
+.TP
+\fBfiles/critcl_package\&.n\fR
+critcl_package
+.TP
+\fBfiles/critcl_tcl9\&.n\fR
+critcl_tcl9
+.RE
+on-the-fly compilation
+.RS
+.TP
+\fBfiles/critcl\&.n\fR
+critcl
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_callback\&.n\fR
+critcl::callback
+.TP
+\fBfiles/critcl_class\&.n\fR
+critcl::class
+.TP
+\fBfiles/critcl_cutil\&.n\fR
+critcl::cutil
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_iassoc\&.n\fR
+critcl::iassoc
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.TP
+\fBfiles/critcl_util\&.n\fR
+critcl::util
+.TP
+\fBfiles/critcl_application\&.n\fR
+critcl_application
+.TP
+\fBfiles/critcl_application_package\&.n\fR
+critcl_application_package
+.TP
+\fBfiles/critcl_build\&.n\fR
+critcl_build_tool
+.TP
+\fBfiles/critcl_changes\&.n\fR
+critcl_changes
+.TP
+\fBfiles/critcl_cproc\&.n\fR
+critcl_cproc_types
+.TP
+\fBfiles/critcl_devguide\&.n\fR
+critcl_devguide
+.TP
+\fBfiles/critcl_howto_install\&.n\fR
+critcl_howto_install
+.TP
+\fBfiles/critcl_howto_sources\&.n\fR
+critcl_howto_sources
+.TP
+\fBfiles/critcl_howto_use\&.n\fR
+critcl_howto_use
+.TP
+\fBfiles/critcl_license\&.n\fR
+critcl_license
+.TP
+\fBfiles/critcl_package\&.n\fR
+critcl_package
+.TP
+\fBfiles/critcl_tcl9\&.n\fR
+critcl_tcl9
+.RE
+singleton
+.RS
+.TP
+\fBfiles/critcl_bitmap\&.n\fR
+critcl::bitmap
+.TP
+\fBfiles/critcl_emap\&.n\fR
+critcl::emap
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_iassoc\&.n\fR
+critcl::iassoc
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.RE
+string pool
+.RS
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.TP
+\fBfiles/critcl_literals\&.n\fR
+critcl::literals
+.RE
+string to int mapping
+.RS
+.TP
+\fBfiles/critcl_enum\&.n\fR
+critcl::enum
+.RE
+.RE
diff --git a/src/vfs/critcl.vfs/embedded/man/toc.n b/src/vfs/critcl.vfs/embedded/man/toc.n
new file mode 100644
index 00000000..5f784b45
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/man/toc.n
@@ -0,0 +1,340 @@
+'\"
+'\" Generated by tcllib/doctools/toc with format 'nroff'
+.TH "Table Of Contents" n
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
+.BS
+.SH CONTENTS
+doc
+.RS
+.TP
+\fBcritcl\fR
+\fIfiles/critcl\&.n\fR: Introduction To CriTcl
+.TP
+\fBcritcl::bitmap\fR
+\fIfiles/critcl_bitmap\&.n\fR: CriTcl - Wrap Support - Bitset en- and decoding
+.TP
+\fBcritcl::callback\fR
+\fIfiles/critcl_callback\&.n\fR: CriTcl - C-level Callback Utilities
+.TP
+\fBcritcl::class\fR
+\fIfiles/critcl_class\&.n\fR: CriTcl - Code Gen - C Classes
+.TP
+\fBcritcl::cutil\fR
+\fIfiles/critcl_cutil\&.n\fR: CriTcl - C-level Utilities
+.TP
+\fBcritcl::emap\fR
+\fIfiles/critcl_emap\&.n\fR: CriTcl - Wrap Support - Enum en- and decoding
+.TP
+\fBcritcl::enum\fR
+\fIfiles/critcl_enum\&.n\fR: CriTcl - Wrap Support - String/Integer mapping
+.TP
+\fBcritcl::iassoc\fR
+\fIfiles/critcl_iassoc\&.n\fR: CriTcl - Code Gen - Tcl Interp Associations
+.TP
+\fBcritcl::literals\fR
+\fIfiles/critcl_literals\&.n\fR: CriTcl - Code Gen - Constant string pools
+.TP
+\fBcritcl::util\fR
+\fIfiles/critcl_util\&.n\fR: CriTcl - Utilities
+.TP
+\fBcritcl_application\fR
+\fIfiles/critcl_application\&.n\fR: CriTcl Application Reference
+.TP
+\fBcritcl_application_package\fR
+\fIfiles/critcl_application_package\&.n\fR: CriTcl Application Package Reference
+.TP
+\fBcritcl_build_tool\fR
+\fIfiles/critcl_build\&.n\fR: CriTcl build\&.tcl Tool Reference
+.TP
+\fBcritcl_changes\fR
+\fIfiles/critcl_changes\&.n\fR: CriTcl Releases & Changes
+.TP
+\fBcritcl_cproc_types\fR
+\fIfiles/critcl_cproc\&.n\fR: CriTcl cproc Type Reference
+.TP
+\fBcritcl_devguide\fR
+\fIfiles/critcl_devguide\&.n\fR: Guide To The CriTcl Internals
+.TP
+\fBcritcl_howto_install\fR
+\fIfiles/critcl_howto_install\&.n\fR: How To Install CriTcl
+.TP
+\fBcritcl_howto_sources\fR
+\fIfiles/critcl_howto_sources\&.n\fR: How To Get The CriTcl Sources
+.TP
+\fBcritcl_howto_use\fR
+\fIfiles/critcl_howto_use\&.n\fR: How To Use CriTcl
+.TP
+\fBcritcl_license\fR
+\fIfiles/critcl_license\&.n\fR: The CriTcl License
+.TP
+\fBcritcl_package\fR
+\fIfiles/critcl_package\&.n\fR: CriTcl Package Reference
+.TP
+\fBcritcl_tcl9\fR
+\fIfiles/critcl_tcl9\&.n\fR: How To Adapt Critcl Packages for Tcl 9
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl.md b/src/vfs/critcl.vfs/embedded/md/files/critcl.md
new file mode 100644
index 00000000..fd7b8b32
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl.md
@@ -0,0 +1,200 @@
+
+[//000000001]: # (critcl \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; Jean\-Claude Wippler)
+[//000000004]: # (Copyright &copy; Steve Landers)
+[//000000005]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000006]: # (critcl\(n\) 3\.2\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl \- Introduction To CriTcl
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Description](#section1)
+
+  - [History & Motivation](#section2)
+
+  - [Overview](#section3)
+
+  - [Known Users](#section4)
+
+  - [Tutorials \- Practical Study \- To Learn](#section5)
+
+  - [Explanations \- Theoretical Knowledge \- To Understand](#section6)
+
+  - [How\-To Guides \- Practical Work \- To Solve Problems](#section7)
+
+  - [References \- Theoretical Work \- To Gain Knowlegde](#section8)
+
+  - [Authors](#section9)
+
+  - [Bugs, Ideas, Feedback](#section10)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *CriTcl*\), a system for
+embedding and using C code from within [Tcl](http://core\.tcl\-lang\.org/tcl)
+scripts\.
+
+Adding C code to
+[Tcl](http://core\.tcl\-lang\.org/tcl)/[Tk](http://core\.tcl\-lang\.org/tk)
+has never been easier\.
+
+Improve performance by rewriting the performance bottlenecks in C\.
+
+Import the functionality of shared libraries into Tcl scripts\.
+
+# <a name='section2'></a>History & Motivation
+
+*CriTcl* started life as an experiment by *Jean\-Claude Wippler* and was a
+self\-contained Tcl package to build C code into a Tcl/Tk extension on the fly\.
+It was somewhat inspired by Brian Ingerson's *Inline* for *Perl*, but is
+considerably more lightweight\.
+
+It is for the last 5% to 10% when pure Tcl, which does go a long way, is not
+sufficient anymore\. I\.e\. for
+
+  1. when the last bits of performance are needed,
+
+  1. access to 3rd party libraries,
+
+  1. hiding critical pieces of your library or application, and
+
+  1. simply needing features provided only by C\.
+
+# <a name='section3'></a>Overview
+
+To make the reader's topics of interest easy to find this documentation is
+roughly organized by [Quadrants](https://documentation\.divio\.com/), i\.e\.
+
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124; Study           &#124; Work  
+> \-\-\-\-\-\-\-\-\-\-\- \+ \-\-\-\-\-\-\-\-\-\-\-\-\-\-\- \+ \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> Practical   &#124; [Tutorials](#section5)       &#124; [How\-To Guides](#section7)  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124; \(Learning\)      &#124; \(Problem solving\)  
+> \-\-\-\-\-\-\-\-\-\-\- \+ \-\-\-\-\-\-\-\-\-\-\-\-\-\-\- \+ \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> Theoretical &#124; [Explanations](#section6)    &#124; [References](#section8)  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124; \(Understanding\) &#124; \(Knowledge\)
+
+*Note*: At this point in time the documentation consists mainly of references,
+and a few how\-to guides\. Tutorials and Explanations are in need of expansion,
+this is planned\.
+
+# <a name='section4'></a>Known Users
+
+  - [AnKH](https://core\.tcl\-lang\.org/akupries/ankh)
+
+  - [TclYAML](https://core\.tcl\.tk/akupries/tclyaml)
+
+  - [Linenoise](https://github\.com/andreas\-kupries/tcl\-linenoise)
+
+  - [KineTcl](https://core\.tcl\.tk/akupries/kinetcl)
+
+  - [Inotify](https://chiselapp\.com/user/andreas\_kupries/repository/inotify)
+
+  - [TclMarpa](https://core\.tcl\.tk/akupries/marpa)
+
+  - [CRIMP](https://core\.tcl\.tk/akupries/crimp)
+
+# <a name='section5'></a>Tutorials \- Practical Study \- To Learn
+
+This section is currently empty\.
+
+# <a name='section6'></a>Explanations \- Theoretical Knowledge \- To Understand
+
+This section is currently empty\.
+
+# <a name='section7'></a>How\-To Guides \- Practical Work \- To Solve Problems
+
+  1. *[How To Get The CriTcl Sources](critcl\_howto\_sources\.md)*\.
+
+  1. *[How To Install CriTcl](critcl\_howto\_install\.md)*\.
+
+  1. *[How To Use CriTcl](critcl\_howto\_use\.md)* \- A light introduction
+     through examples\.
+
+  1. *NEW*: *[How To Adapt Critcl Packages for Tcl 9](critcl\_tcl9\.md)*\.
+
+# <a name='section8'></a>References \- Theoretical Work \- To Gain Knowlegde
+
+  1. *[The CriTcl License](critcl\_license\.md)*
+
+  1. *[CriTcl Releases & Changes](critcl\_changes\.md)*
+
+  1. *[CriTcl Application Reference](critcl\_application\.md)*
+
+  1. *[CriTcl Package Reference](critcl\_package\.md)*
+
+  1. *[CriTcl cproc Type Reference](critcl\_cproc\.md)*
+
+  1. *[CriTcl \- Utilities](critcl\_util\.md)*
+
+  1. *[CriTcl \- C\-level Utilities](critcl\_cutil\.md)*
+
+  1. *[CriTcl \- C\-level Callback Utilities](critcl\_callback\.md)*
+
+  1. *[CriTcl \- Wrap Support \- String/Integer mapping](critcl\_enum\.md)*
+
+  1. *[CriTcl \- Wrap Support \- Bitset en\- and decoding](critcl\_bitmap\.md)*
+
+  1. *[CriTcl \- Wrap Support \- Enum en\- and decoding](critcl\_emap\.md)*
+
+  1. *[CriTcl \- Code Gen \- Constant string pools](critcl\_literals\.md)*
+
+  1. *[CriTcl \- Code Gen \- Tcl Interp Associations](critcl\_iassoc\.md)*
+
+  1. *[CriTcl \- Code Gen \- C Classes](critcl\_class\.md)*
+
+  1. *[CriTcl Application Package
+     Reference](critcl\_application\_package\.md)*
+
+  1. *[Guide To The CriTcl Internals](critcl\_devguide\.md)*
+
+# <a name='section9'></a>Authors
+
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+# <a name='section10'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report them at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)\.
+Ideas for enhancements you may have for either package, application, and/or the
+documentation are also very welcome and should be reported at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)
+as well\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [calling C code from
+Tcl](\.\./index\.md\#calling\_c\_code\_from\_tcl), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; Jean\-Claude Wippler  
+Copyright &copy; Steve Landers  
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_application.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_application.md
new file mode 100644
index 00000000..c92c4d71
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_application.md
@@ -0,0 +1,400 @@
+
+[//000000001]: # (critcl\_application \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_application\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; Jean\-Claude Wippler)
+[//000000004]: # (Copyright &copy; Steve Landers)
+[//000000005]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000006]: # (critcl\_application\(n\) 3\.2\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl\_application \- CriTcl Application Reference
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Synopsis](#synopsis)
+
+  - [Description](#section1)
+
+  - [Application Options](#section2)
+
+  - [Package Structure](#section3)
+
+  - [Authors](#section4)
+
+  - [Bugs, Ideas, Feedback](#section5)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='synopsis'></a>SYNOPSIS
+
+[__[critcl](critcl\.md)__ ?*option*\.\.\.? ?*file*\.\.\.?](#1)  
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This document is the reference manpage for the __[critcl](critcl\.md)__
+command\. Its intended audience are people having to build packages using
+__[critcl](critcl\.md)__ for deployment\. Writers of packages with
+embedded C code can ignore this document\. If you are in need of an overview of
+the whole system instead, please go and read the *[Introduction To
+CriTcl](critcl\.md)*\.
+
+This application resides in the Application Layer of CriTcl\.
+
+![](\.\./image/arch\_application\.png)\. The application supports the following
+general command line:
+
+  - <a name='1'></a>__[critcl](critcl\.md)__ ?*option*\.\.\.? ?*file*\.\.\.?
+
+    The exact set of options supported, their meaning, and interaction is
+    detailed in section [Application Options](#section2) below\. For a
+    larger set of examples please see section "Building CriTcl Packages" in the
+    document about *Using CriTcl*\.
+
+# <a name='section2'></a>Application Options
+
+The following options are understood:
+
+  - __\-v__
+
+  - __\-\-version__
+
+    Print the version to __stdout__ and exit\.
+
+  - __\-I__ path
+
+    Arranges for the compiler to search *path* for headers\. Uses of this
+    option are cumulative\. Ignored when generating a TEA package \(see option
+    __\-tea__ below\)\.
+
+  - __\-L__ path
+
+    Arranges for the linker to search *path*\. Uses of this option are
+    cumulative\. Ignored when generating a TEA package \(see option __\-tea__
+    below\)\.
+
+  - __\-cache__ path
+
+    Sets *path* as the directory to use as the result cache\. The default is
+    "~/\.critcl/<platform>", or "~/\.critcl/<pid>\.<epoch>" when generating a
+    package\. See option __\-pkg__, below\. Ignored when generating a TEA
+    package \(see option __\-tea__ below\)\.
+
+  - __\-clean__
+
+    Arranges for all files and directories in the result cache to be deleted
+    before compilation begins\.
+
+    Ignored when generating a package because this mode starts out with a unique
+    and empty result cache\. See option __\-pkg__, below\. Ignored when
+    generating a TEA package \(see option __\-tea__ below\)\.
+
+  - __\-config__ path
+
+    Provides a custom configuration file\. By default a configuration included in
+    the system core is used\. When specified multiple times the last value is
+    used\. Ignored when generating a TEA package \(see option __\-tea__ below\)\.
+
+  - __\-debug__ mode
+
+    Activates one of the following debugging modes:
+
+      * __memory__
+
+        Track and report memory allocations made by the Tcl core\.
+
+      * __symbols__
+
+        Compile all "\.c" files with debugging symbols\.
+
+      * __all__
+
+        Both __memory__ and __symbols__\.
+
+    Ignored when generating a TEA package \(see option __\-tea__ below\)\. Uses
+    of this option are cumulative\.
+
+  - __\-disable__ name
+
+    Sets the value of the custom build configuration option *name* to
+    __false__\. It is equivalent to "\-with\-*name* 0"\. Validated only if one
+    of the input files for the *CriTcl script* actually defines and uses a
+    custom build configuration option with that *name*\. Ignored when
+    generating a TEA package \(see option __\-tea__ below\)\.
+
+  - __\-enable__ name
+
+    Sets the value of the custom build configuration option *name* to
+    __true__\. It is equivalent to "\-with\-*name* 1"\. Validated only if one
+    of the input files for the *CriTcl script* actually defines and uses a
+    custom build configuration option with that *name*\. Ignored when
+    generating a TEA package \(see option __\-tea__ below\)\.
+
+  - __\-force__
+
+    Forces compilation even if a shared library for the file already exists\.
+    Unlike cleaning the cache, this is lazy in the destruction of files and only
+    affects relevant files\.
+
+    Ignored when generating a package \(see option __\-pkg__, below\), which
+    starts out with a unique and empty result cache\. Ignored when generating a
+    TEA package \(see option __\-tea__ below\)\.
+
+  - __\-help__
+
+    Prints a short description of command line syntax and options and then exits
+    the application\.
+
+  - __\-keep__
+
+    Causes the system to cache compiled "\.c" files\. Also prevents the deletion
+    of the unique result cache used by the run when generating a package \(see
+    option __\-pkg__ below\), Intended for debugging of
+    __[critcl](critcl\.md)__ itself, where it may be necessary to inspect
+    the generated C code\. Ignored when generating a TEA package \(see option
+    __\-tea__ below\)\.
+
+  - __\-libdir__ directory
+
+    Adds *directory* to the list of directories the linker searches for
+    libraries in \(like __\-L__\)\. With __\-pkg__, generated packages are
+    saved in *directory*\. When specified multiple times the last value is
+    used\. The default is "lib", resolved relative to the current working
+    directory\.
+
+  - __\-includedir__ directory
+
+    Adds *directory* to the list of directories the compiler searches for
+    headers in\. With __\-pkg__, generated header files are saved in
+    *directory*\. Uses of this option are cumulative\. The last value is used as
+    the destination for generated header files\. The default is the relative
+    directory "include", resolved relative to the current working directory\.
+    Ignored when generating a TEA package \(see option __\-tea__ below\)\.
+
+  - __\-pkg__
+
+    Generates a package from the *CriTcl script* files\. Input files are
+    processed first as usual, but are then bundled into a single library, with
+    additional generated files to form the library into a standard Tcl package\.
+
+    generation\. If both options, i\.e\. __\-pkg__ and __\-tea__ are
+    specified the last one specified wins\.
+
+    Options __\-clean__ and __\-force__ are ignored\. __\-libdir__ is
+    relevant in both this and __\-tea__ mode\.
+
+    The basename of the first file is the name of the package to generate\. If
+    its file extension indicates a shared library \("\.so", "\.sl", "\.dylib", and
+    "\.dll"\) it is also removed from the set of input files\. Each *CriTcl
+    script* file is kept as part of the input\. A single file without a suffix
+    is assumed to be a *CriTcl script*\. A file without a suffix, but other
+    input files following is treated like the name of a shared library proper,
+    and removed from the set of input files\.
+
+    Examples:
+
+        ... -pkg ... foo
+
+        => Package name is: foo
+        => Input file is:   foo.tcl
+
+        ... -pkg ... foo bar.tcl
+
+        => Package name is: foo
+        => Input file is:   bar.tcl
+
+        ... -pkg ... foo.tcl
+
+        => Package name is: foo
+        => Input file is:   foo.tcl
+
+        ... -pkg ... foo.so bar.tcl
+
+        => Package name is: foo
+        => Input file is:   bar.tcl
+
+  - __\-show__
+
+    Prints the configuration of the chosen target to __stdout__ and then
+    exits\. Set __\-target__, below\.
+
+  - __\-showall__
+
+    Prints the whole chosen configuration file to __stdout__ and then exits\.
+    See __\-config__, above\.
+
+  - __\-target__ name
+
+    Overrides the default choice of build target\. Only the last occurrence of
+    this option is used\. The named target must exist in the chosen configuration
+    file\. Use __\-targets__ \(see below\) to get a list of the acceptable
+    targets\. Use __\-config__ to select the configuration file\. Ignored when
+    generating a TEA package \(see option __\-tea__ below\)\.
+
+  - __\-targets__
+
+    Prints the list of all known targets from the chosen configuration file to
+    __stdout__ and then exits\. Use __\-config__ to select the
+    configuration file\.
+
+  - __\-tea__
+
+    Like __\-pkg__, except no binaries are generated\. Creates a directory
+    hierarchy containing the *CriTcl script*, its companion files, and a
+    TEA\-conformant build system with most of the needed support code, including
+    copies of the critcl packages\.
+
+    If both __\-pkg__ and __\-tea__ are specified the last occurrence
+    wins\.
+
+    __\-I__, __\-L__, __\-clean__, __\-force__, __\-cache__,
+    __\-includedir__, __\-enable__, __\-disable__, and
+    __\-with\-__FOO____ are ignored\. In contrast, the option
+    __\-libdir__ is relevant in both this and __\-pkg__ mode\.
+
+    The basename of the first file is the name of the package to generate\. If
+    its file extension indicates a shared library \("\.so", "\.sl", "\.dylib", and
+    "\.dll"\) it is also removed from the set of input files\. Each *CriTcl
+    script* file is kept as part of the input\. A single file without a suffix
+    is assumed to be a *CriTcl script*\. A file without a suffix, but other
+    input files following is treated like the name of a shared library proper,
+    and removed from the set of input files\.
+
+    Examples:
+
+        ... -tea ... foo
+
+        => Package name is: foo
+        => Input file is:   foo.tcl
+
+        ... -tea ... foo bar.tcl
+
+        => Package name is: foo
+        => Input file is:   bar.tcl
+
+        ... -tea ... foo.tcl
+
+        => Package name is: foo
+        => Input file is:   foo.tcl
+
+        ... -tea ... foo.so bar.tcl
+
+        => Package name is: foo
+        => Input file is:   bar.tcl
+
+  - __\-with\-__name____ value
+
+    This option sets the value of the custom build configuration option *name*
+    to *value*\.
+
+    The information is validated only if one of the "\.critcl" input files
+    actually defines and uses a custom build configuration option with that
+    *name*\. Ignored when generating a TEA package \(see option __\-tea__
+    below\)\.
+
+# <a name='section3'></a>Package Structure
+
+Packages generated by critcl have the following basic structure:
+
+    <TOP>
+    +- pkgIndex.tcl
+    +- critcl-rt.tcl
+    +- license.terms (optional)
+    |
+    +- tcl (optional)
+    |  +- <tsources files>
+    |
+    +- <platform>
+       +- <shared library>
+
+*Notes*
+
+  1. The file "pkgIndex\.tcl" is the standard package index file expected by
+     Tcl's package management\. It is sourced during a search for packages, and
+     declares the package to Tcl with its files, and how to handle them\.
+
+  1. The file "critcl\-rt\.tcl" is a helper file containing the common code used
+     by "pkgIndex\.tcl" to perform its tasks\.
+
+  1. The file "license\.terms" is optional and appears only if the "\.critcl" file
+     the package is generated from used the command __critcl::license__ to
+     declare package author and license\.
+
+  1. All files declared with the command __critcl::tsources__ are put into
+     the sub\-directory "tcl"\.
+
+  1. The shared library generated by critcl is put into a platform\-specific
+     sub\-directory\.
+
+The whole structure, and especially the last point, enable us to later merge the
+results \(for the same package, and version\) for multiple target platforms into a
+single directory structure without conflict, by simply copying the top
+directories over each other\. The only files which can conflict are in the <TOP>
+and "tcl" directories, and for these we know that they are identical across
+targets\. The result of such a merge would look like:
+
+    <TOP>
+    +- pkgIndex.tcl
+    +- critcl-rt.tcl
+    +- license.terms (optional)
+    |
+    +- tcl (optional)
+    |  +- <tsources files>
+    |
+    +- <platform1>
+    |  +- <shared library1>
+    +- <platform2>
+    |  +- <shared library2>
+    ...
+    +- <platformN>
+       +- <shared libraryN>
+
+# <a name='section4'></a>Authors
+
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+# <a name='section5'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report them at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)\.
+Ideas for enhancements you may have for either package, application, and/or the
+documentation are also very welcome and should be reported at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)
+as well\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [calling C code from
+Tcl](\.\./index\.md\#calling\_c\_code\_from\_tcl), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; Jean\-Claude Wippler  
+Copyright &copy; Steve Landers  
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_application_package.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_application_package.md
new file mode 100644
index 00000000..7898dbc6
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_application_package.md
@@ -0,0 +1,450 @@
+
+[//000000001]: # (critcl\_application\_package \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_application\_package\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; Jean\-Claude Wippler)
+[//000000004]: # (Copyright &copy; Steve Landers)
+[//000000005]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000006]: # (critcl\_application\_package\(n\) 3\.2\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl\_application\_package \- CriTcl Application Package Reference
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Synopsis](#synopsis)
+
+  - [Description](#section1)
+
+  - [API](#section2)
+
+  - [Options](#section3)
+
+  - [Modes Of Operation/Use](#section4)
+
+  - [Package Structure](#section5)
+
+  - [Authors](#section6)
+
+  - [Bugs, Ideas, Feedback](#section7)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='synopsis'></a>SYNOPSIS
+
+package require Tcl 8\.6  
+package require critcl::app ?3\.2\.1?  
+package require critcl ?3\.2\.1?  
+package require platform ?1\.0\.2?  
+package require cmdline  
+
+[__::critcl::app::main__ *commandline*](#1)  
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This document is the reference manpage for the __critcl::app__ package\. Its
+intended audience are developers working on critcl's internals\. These commands
+are not needed to simply write a *CriTcl script*\. If you are in need of an
+overview of the whole system instead, please go and read the *[Introduction To
+CriTcl](critcl\.md)*\.
+
+This package resides in the Application Layer of CriTcl\.
+
+![](\.\./image/arch\_application\.png), implementing the functionality of the
+*CriTcl Application*, and through this, the mode [generate
+package](#section4)\. The actual application is \(only\) a shim wrapping around
+this package\. It itself is build on top of the core package
+__[critcl](critcl\.md)__\.
+
+# <a name='section2'></a>API
+
+The package exports a single command
+
+  - <a name='1'></a>__::critcl::app::main__ *commandline*
+
+    The *commandline* is a list of zero or more options followed by zero or
+    more *CriTcl script* files\. By default, the *CriTcl script* files are
+    build and the results cached\. This cuts down on the time needed to load the
+    package\. The last occurrence of __\-pkg__ and __\-tea__, if provided,
+    selects the corresponding alternative mode of operations\. For a larger set
+    of examples please see section "Building CriTcl Packages" in the document
+    about *Using CriTcl*\.
+
+The options are:
+
+# <a name='section3'></a>Options
+
+The following options are understood:
+
+  - __\-v__
+
+  - __\-\-version__
+
+    Print the version to __stdout__ and exit\.
+
+  - __\-I__ path
+
+    Arranges for the compiler to search *path* for headers\. Uses of this
+    option are cumulative\. Ignored when generating a TEA package \(see option
+    __\-tea__ below\)\.
+
+  - __\-L__ path
+
+    Arranges for the linker to search *path*\. Uses of this option are
+    cumulative\. Ignored when generating a TEA package \(see option __\-tea__
+    below\)\.
+
+  - __\-cache__ path
+
+    Sets *path* as the directory to use as the result cache\. The default is
+    "~/\.critcl/<platform>", or "~/\.critcl/<pid>\.<epoch>" when generating a
+    package\. See option __\-pkg__, below\. Ignored when generating a TEA
+    package \(see option __\-tea__ below\)\.
+
+  - __\-clean__
+
+    Arranges for all files and directories in the result cache to be deleted
+    before compilation begins\.
+
+    Ignored when generating a package because this mode starts out with a unique
+    and empty result cache\. See option __\-pkg__, below\. Ignored when
+    generating a TEA package \(see option __\-tea__ below\)\.
+
+  - __\-config__ path
+
+    Provides a custom configuration file\. By default a configuration included in
+    the system core is used\. When specified multiple times the last value is
+    used\. Ignored when generating a TEA package \(see option __\-tea__ below\)\.
+
+  - __\-debug__ mode
+
+    Activates one of the following debugging modes:
+
+      * __memory__
+
+        Track and report memory allocations made by the Tcl core\.
+
+      * __symbols__
+
+        Compile all "\.c" files with debugging symbols\.
+
+      * __all__
+
+        Both __memory__ and __symbols__\.
+
+    Ignored when generating a TEA package \(see option __\-tea__ below\)\. Uses
+    of this option are cumulative\.
+
+  - __\-disable__ name
+
+    Sets the value of the custom build configuration option *name* to
+    __false__\. It is equivalent to "\-with\-*name* 0"\. Validated only if one
+    of the input files for the *CriTcl script* actually defines and uses a
+    custom build configuration option with that *name*\. Ignored when
+    generating a TEA package \(see option __\-tea__ below\)\.
+
+  - __\-enable__ name
+
+    Sets the value of the custom build configuration option *name* to
+    __true__\. It is equivalent to "\-with\-*name* 1"\. Validated only if one
+    of the input files for the *CriTcl script* actually defines and uses a
+    custom build configuration option with that *name*\. Ignored when
+    generating a TEA package \(see option __\-tea__ below\)\.
+
+  - __\-force__
+
+    Forces compilation even if a shared library for the file already exists\.
+    Unlike cleaning the cache, this is lazy in the destruction of files and only
+    affects relevant files\.
+
+    Ignored when generating a package \(see option __\-pkg__, below\), which
+    starts out with a unique and empty result cache\. Ignored when generating a
+    TEA package \(see option __\-tea__ below\)\.
+
+  - __\-help__
+
+    Prints a short description of command line syntax and options and then exits
+    the application\.
+
+  - __\-keep__
+
+    Causes the system to cache compiled "\.c" files\. Also prevents the deletion
+    of the unique result cache used by the run when generating a package \(see
+    option __\-pkg__ below\), Intended for debugging of
+    __[critcl](critcl\.md)__ itself, where it may be necessary to inspect
+    the generated C code\. Ignored when generating a TEA package \(see option
+    __\-tea__ below\)\.
+
+  - __\-libdir__ directory
+
+    Adds *directory* to the list of directories the linker searches for
+    libraries in \(like __\-L__\)\. With __\-pkg__, generated packages are
+    saved in *directory*\. When specified multiple times the last value is
+    used\. The default is "lib", resolved relative to the current working
+    directory\.
+
+  - __\-includedir__ directory
+
+    Adds *directory* to the list of directories the compiler searches for
+    headers in\. With __\-pkg__, generated header files are saved in
+    *directory*\. Uses of this option are cumulative\. The last value is used as
+    the destination for generated header files\. The default is the relative
+    directory "include", resolved relative to the current working directory\.
+    Ignored when generating a TEA package \(see option __\-tea__ below\)\.
+
+  - __\-pkg__
+
+    Generates a package from the *CriTcl script* files\. Input files are
+    processed first as usual, but are then bundled into a single library, with
+    additional generated files to form the library into a standard Tcl package\.
+
+    generation\. If both options, i\.e\. __\-pkg__ and __\-tea__ are
+    specified the last one specified wins\.
+
+    Options __\-clean__ and __\-force__ are ignored\. __\-libdir__ is
+    relevant in both this and __\-tea__ mode\.
+
+    The basename of the first file is the name of the package to generate\. If
+    its file extension indicates a shared library \("\.so", "\.sl", "\.dylib", and
+    "\.dll"\) it is also removed from the set of input files\. Each *CriTcl
+    script* file is kept as part of the input\. A single file without a suffix
+    is assumed to be a *CriTcl script*\. A file without a suffix, but other
+    input files following is treated like the name of a shared library proper,
+    and removed from the set of input files\.
+
+    Examples:
+
+        ... -pkg ... foo
+
+        => Package name is: foo
+        => Input file is:   foo.tcl
+
+        ... -pkg ... foo bar.tcl
+
+        => Package name is: foo
+        => Input file is:   bar.tcl
+
+        ... -pkg ... foo.tcl
+
+        => Package name is: foo
+        => Input file is:   foo.tcl
+
+        ... -pkg ... foo.so bar.tcl
+
+        => Package name is: foo
+        => Input file is:   bar.tcl
+
+  - __\-show__
+
+    Prints the configuration of the chosen target to __stdout__ and then
+    exits\. Set __\-target__, below\.
+
+  - __\-showall__
+
+    Prints the whole chosen configuration file to __stdout__ and then exits\.
+    See __\-config__, above\.
+
+  - __\-target__ name
+
+    Overrides the default choice of build target\. Only the last occurrence of
+    this option is used\. The named target must exist in the chosen configuration
+    file\. Use __\-targets__ \(see below\) to get a list of the acceptable
+    targets\. Use __\-config__ to select the configuration file\. Ignored when
+    generating a TEA package \(see option __\-tea__ below\)\.
+
+  - __\-targets__
+
+    Prints the list of all known targets from the chosen configuration file to
+    __stdout__ and then exits\. Use __\-config__ to select the
+    configuration file\.
+
+  - __\-tea__
+
+    Like __\-pkg__, except no binaries are generated\. Creates a directory
+    hierarchy containing the *CriTcl script*, its companion files, and a
+    TEA\-conformant build system with most of the needed support code, including
+    copies of the critcl packages\.
+
+    If both __\-pkg__ and __\-tea__ are specified the last occurrence
+    wins\.
+
+    __\-I__, __\-L__, __\-clean__, __\-force__, __\-cache__,
+    __\-includedir__, __\-enable__, __\-disable__, and
+    __\-with\-__FOO____ are ignored\. In contrast, the option
+    __\-libdir__ is relevant in both this and __\-pkg__ mode\.
+
+    The basename of the first file is the name of the package to generate\. If
+    its file extension indicates a shared library \("\.so", "\.sl", "\.dylib", and
+    "\.dll"\) it is also removed from the set of input files\. Each *CriTcl
+    script* file is kept as part of the input\. A single file without a suffix
+    is assumed to be a *CriTcl script*\. A file without a suffix, but other
+    input files following is treated like the name of a shared library proper,
+    and removed from the set of input files\.
+
+    Examples:
+
+        ... -tea ... foo
+
+        => Package name is: foo
+        => Input file is:   foo.tcl
+
+        ... -tea ... foo bar.tcl
+
+        => Package name is: foo
+        => Input file is:   bar.tcl
+
+        ... -tea ... foo.tcl
+
+        => Package name is: foo
+        => Input file is:   foo.tcl
+
+        ... -tea ... foo.so bar.tcl
+
+        => Package name is: foo
+        => Input file is:   bar.tcl
+
+  - __\-with\-__name____ value
+
+    This option sets the value of the custom build configuration option *name*
+    to *value*\.
+
+    The information is validated only if one of the "\.critcl" input files
+    actually defines and uses a custom build configuration option with that
+    *name*\. Ignored when generating a TEA package \(see option __\-tea__
+    below\)\.
+
+# <a name='section4'></a>Modes Of Operation/Use
+
+CriTcl can be used in three different modes of operation, called
+
+  1. *[Compile & Run](\.\./index\.md\#compile\_run)*, and
+
+  1. *[Generate Package](\.\./index\.md\#generate\_package)*
+
+  1. *Generate TEA Package*
+
+*[Compile & Run](\.\./index\.md\#compile\_run)* was the original mode and is
+the default for *critcl\_pkg*\. Collects the C fragments from the *CriTcl
+script*, builds them as needed, and caches the results to improve load times
+later\.
+
+The second mode, *[Generate Package](\.\./index\.md\#generate\_package)*, was
+introduced to enable the creation of \(prebuilt\) deliverable packages which do
+not depend on the existence of a build system, i\.e\. C compiler, on the target
+machine\. This was originally done through the experimental __Critbind__
+tool, and is now handled by the *CriTcl Application*, also named
+__[critcl](critcl\.md)__\.
+
+Newly introduced with CriTcl version 3 is *Generate TEA Package*\. This mode
+constructs a directory hierarchy from the package which can later be built like
+a regular TEA package, i\.e\. using
+
+    .../configure --prefix ...
+    make all isntall
+
+# <a name='section5'></a>Package Structure
+
+Packages generated by critcl have the following basic structure:
+
+    <TOP>
+    +- pkgIndex.tcl
+    +- critcl-rt.tcl
+    +- license.terms (optional)
+    |
+    +- tcl (optional)
+    |  +- <tsources files>
+    |
+    +- <platform>
+       +- <shared library>
+
+*Notes*
+
+  1. The file "pkgIndex\.tcl" is the standard package index file expected by
+     Tcl's package management\. It is sourced during a search for packages, and
+     declares the package to Tcl with its files, and how to handle them\.
+
+  1. The file "critcl\-rt\.tcl" is a helper file containing the common code used
+     by "pkgIndex\.tcl" to perform its tasks\.
+
+  1. The file "license\.terms" is optional and appears only if the "\.critcl" file
+     the package is generated from used the command __critcl::license__ to
+     declare package author and license\.
+
+  1. All files declared with the command __critcl::tsources__ are put into
+     the sub\-directory "tcl"\.
+
+  1. The shared library generated by critcl is put into a platform\-specific
+     sub\-directory\.
+
+The whole structure, and especially the last point, enable us to later merge the
+results \(for the same package, and version\) for multiple target platforms into a
+single directory structure without conflict, by simply copying the top
+directories over each other\. The only files which can conflict are in the <TOP>
+and "tcl" directories, and for these we know that they are identical across
+targets\. The result of such a merge would look like:
+
+    <TOP>
+    +- pkgIndex.tcl
+    +- critcl-rt.tcl
+    +- license.terms (optional)
+    |
+    +- tcl (optional)
+    |  +- <tsources files>
+    |
+    +- <platform1>
+    |  +- <shared library1>
+    +- <platform2>
+    |  +- <shared library2>
+    ...
+    +- <platformN>
+       +- <shared libraryN>
+
+# <a name='section6'></a>Authors
+
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+# <a name='section7'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report them at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)\.
+Ideas for enhancements you may have for either package, application, and/or the
+documentation are also very welcome and should be reported at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)
+as well\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [calling C code from
+Tcl](\.\./index\.md\#calling\_c\_code\_from\_tcl), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; Jean\-Claude Wippler  
+Copyright &copy; Steve Landers  
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_bitmap.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_bitmap.md
new file mode 100644
index 00000000..5684c893
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_bitmap.md
@@ -0,0 +1,211 @@
+
+[//000000001]: # (critcl::bitmap \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_bitmap\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000004]: # (critcl::bitmap\(n\) 1\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl::bitmap \- CriTcl \- Wrap Support \- Bitset en\- and decoding
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Synopsis](#synopsis)
+
+  - [Description](#section1)
+
+  - [API](#section2)
+
+  - [Example](#section3)
+
+  - [Authors](#section4)
+
+  - [Bugs, Ideas, Feedback](#section5)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='synopsis'></a>SYNOPSIS
+
+package require Tcl 8\.6  
+package require critcl ?3\.2?  
+package require critcl::bitmap ?1\.1?  
+
+[__::critcl::bitmap::def__ *name* *definition* ?*exclusions*?](#1)  
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This document is the reference manpage for the __critcl::bitmap__ package\.
+This package provides convenience commands for advanced functionality built on
+top of both critcl core and package
+__[critcl::iassoc](critcl\_iassoc\.md)__\.
+
+C level libraries often use bit\-sets to encode many flags into a single value\.
+Tcl bindings to such libraries now have the task of converting a Tcl
+representation of such flags \(like a list of strings\) into such bit\-sets, and
+back\. *Note* here that the C\-level information has to be something which
+already exists\. The package does *not* create these values\. This is in
+contrast to the package __[critcl::enum](critcl\_enum\.md)__ which creates
+an enumeration based on the specified symbolic names\.
+
+This package was written to make the declaration and management of such bit\-sets
+and their associated conversions functions easy, hiding all attendant complexity
+from the user\.
+
+Its intended audience are mainly developers wishing to write Tcl packages with
+embedded C code\.
+
+This package resides in the Core Package Layer of CriTcl\.
+
+![](\.\./image/arch\_core\.png)
+
+# <a name='section2'></a>API
+
+  - <a name='1'></a>__::critcl::bitmap::def__ *name* *definition* ?*exclusions*?
+
+    This command defines two C functions for the conversion of the *name*d
+    bit\-set into Tcl lists, and vice versa\. The underlying mapping tables are
+    automatically initialized on first access, and finalized on interpreter
+    destruction\.
+
+    The *definition* dictionary provides the mapping from the Tcl\-level
+    symbolic names of the flags to their C expressions \(often the name of the
+    macro specifying the actual value\)\. *Note* here that the C\-level
+    information has to be something which already exists\. The package does
+    *not* create these values\. This is in contrast to the package
+    __[critcl::enum](critcl\_enum\.md)__ which creates an enumeration
+    based on the specified symbolic names\.
+
+    The optional *exlusion* list is for the flags/bit\-sets for which
+    conversion from bit\-set to flag, i\.e\. decoding makes no sense\. One case for
+    such, for example, are flags representing a combination of other flags\.
+
+    The package generates multiple things \(declarations and definitions\) with
+    names derived from *name*, which has to be a proper C identifier\.
+
+      * *name*\_encode
+
+        The function for encoding a Tcl list of strings into the equivalent
+        bit\-set\. Its signature is
+
+        > int *name*\_encode \(Tcl\_Interp\* interp, Tcl\_Obj\* flags, int\* result\);
+
+        The return value of the function is a Tcl error code, i\.e\.
+        __TCL\_OK__, __TCL\_ERROR__, etc\.
+
+      * *name*\_decode
+
+        The function for decoding a bit\-set into the equivalent Tcl list of
+        strings\. Its signature is
+
+        > Tcl\_Obj\* *name*\_decode \(Tcl\_Interp\* interp, int flags\);
+
+      * *name*\.h
+
+        A header file containing the declarations for the two conversion
+        functions, for use by other parts of the system, if necessary\.
+
+        The generated file is stored in a place where it will not interfere with
+        the overall system outside of the package, yet also be available for
+        easy inclusion by package files \(__csources__\)\.
+
+      * *name*
+
+        The name of a critcl argument type encapsulating the encoder function
+        for use by __critcl::cproc__\.
+
+      * *name*
+
+        The name of a critcl result type encapsulating the decoder function for
+        use by __critcl::cproc__\.
+
+# <a name='section3'></a>Example
+
+The example shown below is the specification of the event flags pulled from the
+draft work on a Tcl binding to Linux's inotify APIs\.
+
+    package require Tcl 8.6
+    package require critcl 3.2
+
+    critcl::buildrequirement {
+        package require critcl::bitmap
+    }
+
+    critcl::bitmap::def tcl_inotify_events {
+        accessed       IN_ACCESS
+        all            IN_ALL_EVENTS
+        attribute      IN_ATTRIB
+        closed         IN_CLOSE
+        closed-nowrite IN_CLOSE_NOWRITE
+        closed-write   IN_CLOSE_WRITE
+        created        IN_CREATE
+        deleted        IN_DELETE
+        deleted-self   IN_DELETE_SELF
+        dir-only       IN_ONLYDIR
+        dont-follow    IN_DONT_FOLLOW
+        modified       IN_MODIFY
+        move           IN_MOVE
+        moved-from     IN_MOVED_FROM
+        moved-self     IN_MOVE_SELF
+        moved-to       IN_MOVED_TO
+        oneshot        IN_ONESHOT
+        open           IN_OPEN
+        overflow       IN_Q_OVERFLOW
+        unmount        IN_UNMOUNT
+    } {
+        all closed move oneshot
+    }
+
+    # Declarations:          tcl_inotify_events.h
+    # Encoder:      int      tcl_inotify_events_encode (Tcl_Interp* interp, Tcl_Obj* flags, int* result);
+    # Decoder:      Tcl_Obj* tcl_inotify_events_decode (Tcl_Interp* interp, int flags);
+    # crit arg-type          tcl_inotify_events
+    # crit res-type          tcl_inotify_events
+
+# <a name='section4'></a>Authors
+
+Andreas Kupries
+
+# <a name='section5'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report such at
+[https://github\.com/andreas\-kupries/critcl](https://github\.com/andreas\-kupries/critcl)\.
+Please also report any ideas for enhancements you may have for either package
+and/or documentation\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [Tcl Interp
+Association](\.\./index\.md\#tcl\_interp\_association),
+[bitmask](\.\./index\.md\#bitmask), [bitset](\.\./index\.md\#bitset), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation),
+[flags](\.\./index\.md\#flags), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation),
+[singleton](\.\./index\.md\#singleton)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_build.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_build.md
new file mode 100644
index 00000000..f67687e7
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_build.md
@@ -0,0 +1,82 @@
+
+[//000000001]: # (critcl\_build\_tool \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_build\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; Jean\-Claude Wippler)
+[//000000004]: # (Copyright &copy; Steve Landers)
+[//000000005]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000006]: # (critcl\_build\_tool\(n\) 3\.2\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl\_build\_tool \- CriTcl build\.tcl Tool Reference
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Description](#section1)
+
+  - [Authors](#section2)
+
+  - [Bugs, Ideas, Feedback](#section3)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\. The script "build\.tcl" found in
+the top directory of the *[CriTcl](critcl\.md)* sources is the main tool of
+use to a developer or maintainer of *[CriTcl](critcl\.md)* itself\.
+
+Invoking it a via
+
+    ./build.tcl help
+
+provides the online help for this tool, explaining the operations available, and
+their arguments\.
+
+# <a name='section2'></a>Authors
+
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+# <a name='section3'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report them at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)\.
+Ideas for enhancements you may have for either package, application, and/or the
+documentation are also very welcome and should be reported at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)
+as well\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [calling C code from
+Tcl](\.\./index\.md\#calling\_c\_code\_from\_tcl), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; Jean\-Claude Wippler  
+Copyright &copy; Steve Landers  
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_callback.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_callback.md
new file mode 100644
index 00000000..a9cf8e82
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_callback.md
@@ -0,0 +1,223 @@
+
+[//000000001]: # (critcl::callback \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_callback\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000004]: # (critcl::callback\(n\) 1\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl::callback \- CriTcl \- C\-level Callback Utilities
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Synopsis](#synopsis)
+
+  - [Description](#section1)
+
+  - [API](#section2)
+
+  - [Examples](#section3)
+
+      - [Simple callback](#subsection1)
+
+      - [Multiple methods](#subsection2)
+
+  - [Authors](#section4)
+
+  - [Bugs, Ideas, Feedback](#section5)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='synopsis'></a>SYNOPSIS
+
+package require Tcl 8\.6  
+package require critcl ?3\.2?  
+package require critcl::callback ?1\.1?  
+
+[__critcl\_callback\_p__ __critcl\_callback\_new__ *interp* *objc* *objv* *nargs*](#1)  
+[__void__ __critcl\_callback\_extend__ *callback* *argument*](#2)  
+[__void__ __critcl\_callback\_destroy__ *callback*](#3)  
+[__int__ __critcl\_callback\_invoke__ *callback* *objc* *objv*](#4)  
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This document is the reference manpage for the __critcl::callback__ package\.
+This package provides, via a stubs API table, data structures and functions to
+manage callbacks from C to Tcl\. The package has no Tcl\-level facilities\. Its
+intended audience are mainly developers wishing to write Tcl packages with
+embedded C code who have to invoke user\-specified command \(prefixes\) in Tcl\.
+
+This package resides in the Support Package Layer of CriTcl\.
+
+![](\.\./image/arch\_support\.png)
+
+# <a name='section2'></a>API
+
+The package API consist of one opaque data structure \(__critcl\_callback\_p__\)
+and four functions operating on the same\. These functions are
+
+  - <a name='1'></a>__critcl\_callback\_p__ __critcl\_callback\_new__ *interp* *objc* *objv* *nargs*
+
+    This function creates a new callback \(manager\) and returns it as its result\.
+
+    The callback is initialized with the Tcl\_Interp\* *interp* specifying where
+    to run the callback, the fixed part of the command to run in standard
+    *objc*/*objv* notation, plus the number of free arguments to expect
+    after the fixed part\.
+
+    The fixed part is the essentially the command prefix of the callback\.
+
+    All __Tcl\_Obj\*__ elements of *objv* are protected against early
+    release by incrementing their reference counts\. The callback effectively
+    takes ownership of these objects\.
+
+  - <a name='2'></a>__void__ __critcl\_callback\_extend__ *callback* *argument*
+
+    This function takes a *callback* of type __critcl\_callback\_p__ and
+    extends its fixed part with the *argument*, taking the first free slot for
+    arguments to do so\. This means that after the application of this function
+    the specified callback has one free argument less\.
+
+    With assertions active attempting to extend beyond the number of free
+    arguments will cause a panic\. Without assertions active expect a crash at
+    some point\.
+
+    This allows the user to extend the fixed part of the callback with
+    semi\-fixed elements, like method names \(See [Multiple
+    methods](#subsection2)\)\.
+
+    The *argument* is protected against early release by incrementing its
+    reference count\. The callback effectively takes ownership of this object\.
+
+  - <a name='3'></a>__void__ __critcl\_callback\_destroy__ *callback*
+
+    This function takes a *callback* of type __critcl\_callback\_p__ and
+    releases all memory associated with it\. After application of this function
+    the callback cannot be used anymore\.
+
+    All fixed elements of the callback \(owned by it\) are released by
+    decrementing their reference counts\.
+
+  - <a name='4'></a>__int__ __critcl\_callback\_invoke__ *callback* *objc* *objv*
+
+    This function invokes the callback in the Tcl interpreter specified at the
+    time of construction, in the global level and namespace, with the free
+    arguments filled by the __Tcl\_Obj\*__ objects specified via
+    *objc*/*objv*\.
+
+    It returns the Tcl status of the invoked command as its result\. Any further
+    results or error messages will be found in the result area of the Tcl
+    interpreter in question\. The exact nature of such is dependent on the
+    callback itself\.
+
+    With assertions active attempting to use more arguments than available will
+    cause a panic\. Without assertions active expect a crash at some point\.
+
+    While the callback is running all __Tcl\_Obj\*__ elements of the command,
+    fixed and arguments, are protected against early release by temporarily
+    incrementing their reference counts\.
+
+# <a name='section3'></a>Examples
+
+## <a name='subsection1'></a>Simple callback
+
+The example here shows the important parts of using the functions of this
+package for a simple callback which is invoked with a single argument, some kind
+of data to hand to the Tcl level\.
+
+    // Create the callback with interpreter and command prefix in
+    // oc/ov, plus space for the argument
+    critcl_callback_p cb = critcl_callback_new (interp, oc, ov, 1);
+
+    // Invoke the callback somewhere in the C package using this one,
+    // with Tcl_Obj* data holding the information to pass up.
+    critcl_callback_invoke (cb, 1, &data);
+
+    // At the end of the lifetime, release the callback.
+    critcl_callback_destroy (cb);
+
+Note that the functions of this package are designed for the case where the
+created callback \(__cb__ above\) is kept around for a long time, and many
+different invokations\.
+
+Using the sequence above as is, creating and destroying the callback each time
+it is invoked will yield very poor performance and lots of undesirable memory
+churn\.
+
+## <a name='subsection2'></a>Multiple methods
+
+While we can use the methodology of the previous section when a single
+\(Tcl\-level\) callback is invoked from different places in C, with different
+methods, simply having another argument slot and filling it an invokation time
+with the method object, a second methodology is open to us due to
+__critcl\_callback\_extend__\.
+
+    // Create one callback manager per different method the callback
+    // will be used with. Fill the first of the two declared arguments
+    // with the different methods.
+    critcl_callback_p cb_a = critcl_callback_new (interp, oc, ov, 2);
+    critcl_callback_p cb_b = critcl_callback_new (interp, oc, ov, 2);
+
+    critcl_callback_extend (cb_a, Tcl_NewStringObj ("method1", -1));
+    critcl_callback_extend (cb_b, Tcl_NewStringObj ("method2", -1));
+
+    // After the extension we have one free argument left, for use in
+    // the invokations.
+
+    critcl_callback_invoke (cb_a, 1, &dataX);
+
+    critcl_callback_invoke (cb_b, 1, &dataY);
+
+
+    // At the end release both managers again
+    critcl_callback_destroy (cb_a);
+    critcl_callback_destroy (cb_b);
+
+The nice thing here is that the method objects are allocated only once and
+automatically shared by all the calls\. No memory churn to repeatedly allocate
+the same string objects over and over again\.
+
+# <a name='section4'></a>Authors
+
+Andreas Kupries
+
+# <a name='section5'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report such at
+[https://github\.com/andreas\-kupries/critcl](https://github\.com/andreas\-kupries/critcl)\.
+Please also report any ideas for enhancements you may have for either package
+and/or documentation\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_changes.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_changes.md
new file mode 100644
index 00000000..17a54e45
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_changes.md
@@ -0,0 +1,1210 @@
+
+[//000000001]: # (critcl\_changes \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_changes\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; Jean\-Claude Wippler)
+[//000000004]: # (Copyright &copy; Steve Landers)
+[//000000005]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000006]: # (critcl\_changes\(n\) 3\.2\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl\_changes \- CriTcl Releases & Changes
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Description](#section1)
+
+  - [Changes for version 3\.2\.1 \(to come\)](#section2)
+
+  - [Changes for version 3\.2](#section3)
+
+  - [Changes for version 3\.1\.18\.1](#section4)
+
+  - [Changes for version 3\.1\.18](#section5)
+
+  - [Changes for version 3\.1\.17](#section6)
+
+  - [Changes for version 3\.1\.16](#section7)
+
+  - [Changes for version 3\.1\.15](#section8)
+
+  - [Changes for version 3\.1\.14](#section9)
+
+  - [Changes for version 3\.1\.13](#section10)
+
+  - [Changes for version 3\.1\.12](#section11)
+
+  - [Changes for version 3\.1\.11](#section12)
+
+  - [Changes for version 3\.1\.10](#section13)
+
+  - [Changes for version 3\.1\.9](#section14)
+
+  - [Changes for version 3\.1\.8](#section15)
+
+  - [Changes for version 3\.1\.7](#section16)
+
+  - [Changes for version 3\.1\.6](#section17)
+
+  - [Changes for version 3\.1\.5](#section18)
+
+  - [Changes for version 3\.1\.4](#section19)
+
+  - [Changes for version 3\.1\.3](#section20)
+
+  - [Changes for version 3\.1\.2](#section21)
+
+  - [Changes for version 3\.1\.1](#section22)
+
+  - [Changes for version 3\.1](#section23)
+
+  - [Changes for version 3\.0\.7](#section24)
+
+  - [Changes for version 3\.0\.6](#section25)
+
+  - [Changes for version 3\.0\.5](#section26)
+
+  - [Changes for version 3\.0\.4](#section27)
+
+  - [Changes for version 3\.0\.3](#section28)
+
+  - [Changes for version 3\.0\.2](#section29)
+
+  - [Changes for version 3\.0\.1](#section30)
+
+  - [Changes for version 3](#section31)
+
+  - [Changes for version 2\.1](#section32)
+
+  - [Authors](#section33)
+
+  - [Bugs, Ideas, Feedback](#section34)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+Adding C code to
+[Tcl](http://core\.tcl\-lang\.org/tcl)/[Tk](http://core\.tcl\-lang\.org/tk)
+has never been easier\.
+
+Improve performance by rewriting the performance bottlenecks in C\.
+
+Import the functionality of shared libraries into Tcl scripts\. See the changes
+done in each release of *[CriTcl](critcl\.md)*, from the latest at the top
+to the beginning of the project\.
+
+The latest changes are found at the top\.
+
+# <a name='section2'></a>Changes for version 3\.2\.1 \(to come\)
+
+  1. As announced with 3\.2:
+
+       1) Removed support for Tcl 8\.4 and 8\.5\.
+
+       1) Removed support for the argument types __int\*__, __float\*__,
+          __double\*__, __bytearray__, __rawchar__, and
+          __rawchar\*__\.
+
+  1. Modified packages to accept operation under Tcl 9\. Bumped package versions
+     appropriately\. Bumped copyrights\.
+
+     The *[How To Adapt Critcl Packages for Tcl 9](critcl\_tcl9\.md)*
+     contains the details relevant to writers of
+     *[CriTcl](critcl\.md)*\-based packages\.
+
+  1. Set different minimum Tcl requirements for the 8\.x and 9\.x series\.
+
+     If no minimum is declared the minimum depends on the Tcl version used to
+     run the critcl package or application\.
+
+     When running under Tcl 9 the default minimum is version __9__\. For
+     anything else the new default minimum is __8\.6__\.
+
+     *Reminder*: Support for Tcl 8\.4 and 8\.5 was removed\.
+
+  1. Made "~"\-handling portable across the 8\.x and 9 boundary \(via __HOME__
+     environment variable\)\.
+
+  1. Bumped embedded __tclconfig__ to version 2\.67\. Patch supplied by Paul
+     Obermeier\.
+
+  1. *Bug Fix*
+     [\#127](https://github\.com/andreas\-kupries/critcl/issues/127)
+
+  1. *Bug Fix*
+     [\#128](https://github\.com/andreas\-kupries/critcl/issues/128)
+
+  1. *Bug Fix*
+     [\#129](https://github\.com/andreas\-kupries/critcl/issues/129) Fixed
+     various typos in the documentation\.
+
+  1. Reworked internals of __[critcl::cutil](critcl\_cutil\.md)__'s tracer
+     to support operation in a multi\-threaded environment\. This new mode is also
+     default\. The old single\-threaded mode can be \(re\)activated by defining
+     __CRITCL\_TRACE\_NOTHREADS__\.
+
+     Package bumped to version 0\.4\.
+
+# <a name='section3'></a>Changes for version 3\.2
+
+  1. *BREAKING* *[CriTcl](critcl\.md)* now requires Tcl 8\.6 to be run\.
+
+     It also generates Tcl 8\.6 extensions by default\.
+
+     It is still possible to generates extensions for Tcl 8\.4 and 8\.5, properly
+     setting it via __critcl::tcl__\.
+
+     *ATTENTION* It is planned to completely remove 8\.4 and 8\.5 support with
+     *[CriTcl](critcl\.md)* 3\.3\. No date has been set for that release yet\.
+
+     All utility packages have their versions and requirements bumped
+     accordingly as well\.
+
+  1. *BREAKING* *Bug Fix* Issue
+     [\#115](https://github\.com/andreas\-kupries/critcl/issues/115)\.
+
+     Distributions using __build\.tcl__ for installation of critcl in their
+     packaging scripts have to be updated to the changed command signature of
+     __build\.tcl__ install, etc\. See the details below\.
+
+     Redone the argument handling for __install__, __uninstall__, and
+     __targets__\. The destination argument is gone\. All commands now take
+     options similar to what is known from GNU __configure__, i\.e\.
+
+       - __\-\-prefix__ path
+
+       - __\-\-exec\-prefix__ path
+
+       - __\-\-bin\-dir__ path
+
+       - __\-\-lib\-dir__ path
+
+       - __\-\-include\-dir__ path
+
+     They now also respect the environment variable __DESTDIR__, and the
+     associated option __\-\-dest\-dir__\.
+
+     The __\-\-prefix__ defaults to the topdir from the bin directory holding
+     the __tclsh__ running __build\.tcl__\. As Tcl command:
+
+         file dirname [file dirname [info nameofexecutable]]
+
+     Added a command __dirs__ doing the same argument handling, for
+     debugging\.
+
+  1. Removed the irrelevant packages __autoscroll__, __cmdline__,
+     __dict84__, __lassign84__, __lmap84__, __snit__,
+     __snitbutton__, and __wikit__\.
+
+  1. *Documentation Redo* Issue
+     [\#116](https://github\.com/andreas\-kupries/critcl/issues/116)\. Reworked
+     the documentation to use the system of 4 quadrants\. Reworked the
+     introduction \(How To Use Critcl\) to be strongly based on a series of
+     examples\.
+
+  1. *Bug Fix* Issue
+     [\#125](https://github\.com/andreas\-kupries/critcl/issues/125)\. Added
+     missing method __create__ in object creation example of installer
+     documentation\.
+
+  1. *Feature*\. Extended __cproc__ argument type processing\. Now able to
+     auto\-create restricted scalar types\. I\.e\. types derived from *int*, etc\.
+     and limited in the range of allowed values\.
+
+     Further able to auto\-create restricted list types, i\.e\. types derived from
+     *list* and either limited in length, or in the type of the elements, or
+     both\.
+
+  1. *Bug Fix / Enhancement* Issue
+     [\#118](https://github\.com/andreas\-kupries/critcl/issues/118)\. Modified
+     __critcl::cproc__ to accept C syntax for arguments, i\.e\. Trailing comma
+     on argument names, leading comma on type names, and lone comma characters\.
+
+  1. *Performance Fix* for *[compile & run](\.\./index\.md\#compile\_run)*
+     mode\. Issue
+     [\#112](https://github\.com/andreas\-kupries/critcl/issues/112)\.
+
+     Moved the command activating more precise code location tracking out of
+     package __[critcl](critcl\.md)__ into package __critcl::app__\.
+
+     Because generating packages ahead of time can bear the performance penalty
+     invoked by this *global* setting\.
+
+     Arbitrary libraries and applications using critcl dynamically \(*[compile
+     & run](\.\./index\.md\#compile\_run)*\) on the other hand likely cannot, and
+     should not\.
+
+  1. *Fix* Issue
+     [\#109](https://github\.com/andreas\-kupries/critcl/issues/109)\. Ignore
+     __clang__ suffices when computing the target identifier from a
+     configuration identifier\.
+
+  1. *Feature*\. Bumped package __[critcl::cutil](critcl\_cutil\.md)__ to
+     version 0\.2\.1\. Simplified the implementation of macro __ASSERT__ by
+     taking the underlying __Tcl\_Panic__'s printf ability into account and
+     added a new macro __ASSERT\_VA__ exporting the same ability to the user\.
+
+# <a name='section4'></a>Changes for version 3\.1\.18\.1
+
+  1. *Attention*: While the overall version \(of the bundle\) moves to 3\.1\.18\.1
+     the versions of packages __[critcl](critcl\.md)__ and
+     __critcl::app__ are *unchanged*\.
+
+  1. *Bugfix* Generally removed a number of 8\.5\-isms which slipped into
+     3\.1\.18, breaking ability to use it with Tcl 8\.4\.
+
+  1. *Bugfix* Corrected broken *build\.tcl uninstall*\.
+
+  1. *Bugfix* Package __[critcl::class](critcl\_class\.md)__ bumped to
+     version 1\.1\.1\. Fixed partial template substitution breaking compilation of
+     the generated code\.
+
+# <a name='section5'></a>Changes for version 3\.1\.18
+
+  1. Feature \(Developer support\)\. Merged pull request \#96 from
+     sebres/main\-direct\-invoke\. Enables direct invokation of the "main\.tcl" file
+     for starkits from within a dev checkout, i\.e\. outside of a starkit, or
+     starpack\.
+
+  1. Feature\. Added channel types to the set of builtin argument and result
+     types\. The argument types are for simple channel access, access requiring
+     unshared channels, and taking the channel fully into the C level, away from
+     Tcl\. The result type comes in variants for newly created channels, known
+     channels, and to return taken channels back to Tcl\. The first will register
+     the returned value in the interpreter, the second assumes that it already
+     is\.
+
+  1. Bugfix\. Issue \#96\. Reworked the documentation around the argument type
+     __Tcl\_Interp\*__ to make its special status more visible, explain uses,
+     and call it out from result types where its use will be necessary or at
+     least useful\.
+
+  1. Feature\. Package __[critcl::class](critcl\_class\.md)__ bumped to
+     version 1\.1\. Extended with the ability to create a C API for classes, and
+     the ability to disable the generation of the Tcl API\.
+
+  1. Bugfix\. Merged pull request \#99 from pooryorick/master\. Fixes to the target
+     directory calculations done by the install code\.
+
+  1. Merged pull request \#94 from andreas\-kupries/documentation\. A larger
+     documentation cleanup\. The main work was done by pooryorick, followed by
+     tweaks done by myself\.
+
+  1. Extended the test suite with lots of cases based on the examples for the
+     various generator packages\. IOW the new test cases replicate/encapsulate
+     the examples and demonstrate that the packages used by the examples
+     generate working code\.
+
+  1. Bugfix\. Issue \#95\. Changed the field __critcl\_bytes\.s__ to __unsigned
+     char\*__ to match Tcl's type\. Further constified the field to make clear
+     that read\-only usage is the common case for it\.
+
+  1. Bugfix/Feature\. Package __[critcl::cutil](critcl\_cutil\.md)__ bumped
+     to version 0\.2\. Fixed missing inclusion of header "string\.h" in
+     "critcl\_alloc\.h", needed for __memcpy__ in macro __STREP__\. Added
+     macros __ALLOC\_PLUS__ and __STRDUP__\. Moved documentation of
+     __STREP\.\.\.__ macros into proper place \(alloc section, not assert\)\.
+
+  1. Merged pull request \#83 from apnadkarni/vc\-fixes\. Removed deprecated \-Gs
+     for MSVC builds, and other Windows fixups\.
+
+  1. Feature\. Package __[critcl::iassoc](critcl\_iassoc\.md)__ bumped to
+     version 1\.1\. Refactored internals to generate an include header for use by
+     \.c files\. This now matches what other generator packages do\. The template
+     file is inlined and removed\.
+
+  1. Merged pull request \#82 from gahr/home\-symlink Modified tests to handle
+     possibility of $HOME a symlink\.
+
+  1. Merged pull request \#81 from gahr/test\-not\-installed Modified test support
+     to find uninstalled critcl packages when running tests\. Handles all but
+     critcl::md5\.
+
+  1. Merged pull request \#85 from snoe925/issue\-84 to fix Issue \#84 breaking
+     installation on OSX\.
+
+  1. Merged pull request \#87 from apnadkarni/tea\-fixes to fix Issue \#86, broken
+     \-tea option, generating an incomplete package\.
+
+  1. Feature\. New package __[critcl::callback](critcl\_callback\.md)__
+     providing C\-level functions and data structures to manage callbacks from C
+     to Tcl\.
+
+  1. Feature\. Package __[critcl::literals](critcl\_literals\.md)__ bumped
+     to version 1\.3\. Added mode __\+list__ enabling the conversion of
+     multiple literals into a list of their strings\.
+
+  1. Feature\. Package __[critcl::enum](critcl\_enum\.md)__ bumped to
+     version 1\.1\. Added basic mode handling, supporting __tcl__ \(default\)
+     and __\+list__ \(extension enabling the conversion of multiple enum
+     values into a list of their strings\)\.
+
+  1. Feature\. Package __[critcl::emap](critcl\_emap\.md)__ bumped to
+     version 1\.2\. Extended existing mode handling with __\+list__ extension
+     enabling the conversion of multiple emap values into a list of their
+     strings\.
+
+  1. Feature\. Extended the set of available types by applying a few range
+     restrictions to the scalar types \(*int*, *long*, *wideint*,
+     *double*, *float*\)\.
+
+     Example: *int > 0* is now a viable type name\.
+
+     This is actually more limited than the description might let you believe\.
+
+     See the package reference for the details\.
+
+# <a name='section6'></a>Changes for version 3\.1\.17
+
+  1. Extension: Allow duplicate arg\- and result\-type definitions if they are
+     fully identical\.
+
+  1. Bugfix\. The application mishandled the possibility of identical\-named
+     __critcl::tsource__s\. Possible because __critcl::tsource__s can be
+     in subdirectories, a structure which is *not* retained in the assembled
+     package, causing such files to overwrite each other and at least one lost\.
+     Fixed by adding a serial number to the file names in the assembled package\.
+
+  1. Bugfix in the static scanner which made it loose requirement information\.
+     Further added code to generally cleanup results at the end \(removal of
+     duplicates, mainly\)\.
+
+  1. Bugfix: Fixed issue \#76\. Support installation directories which are not in
+     the __auto\_path__\. Without the patch the installed
+     __[critcl](critcl\.md)__ will not find its own packages and fail\.
+     Thank you to [Simon Bachmann](https://github\.com/lupylucke) for the
+     report and patch, and then his patience with me to getting to actually
+     apply it\.
+
+  1. Bugfix: Fixed issue \#75\. Extended __critcl::include__ to now take
+     multiple paths\.
+
+  1. Added new compatibility package __lmap84__\.
+
+  1. Fixed typos in various documentation files\.
+
+  1. Fixed bug introduced by commit 86f415dd30 \(3\.1\.16 release\)\. The separation
+     of __critcl::ccode__ into user and work layers means that location
+     retrieval has to go one more level up to find the user location\.
+
+  1. New supporting package __[critcl::cutil](critcl\_cutil\.md)__\.
+     Provides common C level facilities useful to packages \(assertions, tracing,
+     memory allocation shorthands\)\.
+
+  1. Modified package __[critcl](critcl\.md)__ to make use of the new
+     tracing facilities to provide tracing of arguments and results for
+     __critcl::ccommand__ and __critcl::cproc__ invokations\.
+
+  1. Modified packages __[critcl](critcl\.md)__ and
+     __[critcl::class](critcl\_class\.md)__ to provide better function
+     names for \(class\) method tracing\. Bumped package
+     __[critcl::class](critcl\_class\.md)__ to version 1\.0\.7\.
+
+  1. Extended the support package
+     __[critcl::literals](critcl\_literals\.md)__ with limited
+     configurability\. It is now able to generate code for C\-level access to the
+     pool without Tcl types \(Mode __c__\)\. The previously existing
+     functionality is accesssible under mode __tcl__, which also is the
+     default\. Both modes can be used together\.
+
+  1. Extended the support package __[critcl::emap](critcl\_emap\.md)__
+     with limited configurability\. It is now able to generate code for C\-level
+     access to the mapping without Tcl types \(Mode __c__\)\. The previously
+     existing functionality is accessible under mode __tcl__, which also is
+     the default\. Both modes can be used together\.
+
+# <a name='section7'></a>Changes for version 3\.1\.16
+
+  1. New feature\. Extended __critcl::cproc__'s argument handling to allow
+     arbitrary mixing of required and optional arguments\.
+
+  1. New feature\. *Potential Incompatibility*\.
+
+     Extended __critcl::cproc__'s argument handling to treat an argument
+     __args__ as variadic if it is the last argument of the procedure\.
+
+  1. New feature\. Added two introspection commands, __critcl::has\-argtype__
+     and __critcl::has\-resulttype__\. These enable a user to test if a
+     specific \(named\) type conversion is implemented or not\.
+
+  1. Added new result type __Tcl\_Obj\*0__, with alias __object0__\. The
+     difference to __Tcl\_Obj\*__ is in the reference counting\.
+
+  1. Extended the command __critcl::argtypesupport__ with new optional
+     argument through which to explicitly specify the identifier for guarding
+     against multiple definitions\.
+
+  1. Bugfix: Fixed problem with the implementation of issue \#54 \(See 3\.1\.14\)\.
+     Always create the secondary log file\. Otherwise end\-of\-log handling may
+     break, unconditionally assuming its existence\.
+
+  1. Bugfix: Fixed problem with the internal change to the hook
+     __HandleDeclAfterBuild__\. Corrected the forgotten
+     __critcl::cconst__\.
+
+  1. Debugging aid: Added comment holding the name of the result type when
+     emitting result conversions\.
+
+  1. Bugfix: Fixed issue \#60\. Unbundled the package directories containing
+     multiple packages\. All directories under "lib/" now contain exactly one
+     package\.
+
+  1. Bugfix: Fixed issue \#62, a few __dict exists__ commands operating on a
+     fixed string instead of a variable\.
+
+  1. Bugfix: Fixed issue \#56\. Release builders are reminded to run the tests\.
+
+  1. Bugfix: Fixed issue \#55\. For FreeBSD critcl's platform package now
+     identifies the Kernel ABI version\. Initialization of the cache directory
+     now also uses __platform::identify__ for the default path, instead of
+     __platform::generic__\.
+
+  1. Bugfix: Fixed issue \#58\. Simplified the setup and use of md5\. CriTcl now
+     makes use of its own package for md5, using itself to built it\. There is no
+     chicken/egg problem with this as the __\-pkg__ mode used for this does
+     not use md5\. That is limited to mode *[compile &
+     run](\.\./index\.md\#compile\_run)*\.
+
+# <a name='section8'></a>Changes for version 3\.1\.15
+
+  1. Fixed version number bogosity with __3\.1\.14__\.
+
+# <a name='section9'></a>Changes for version 3\.1\.14
+
+  1. Fixed issue \#36\. Added message to target __all__ of the Makefile
+     generated for TEA mode\. Additionally tweaked other parts of the output to
+     be less noisy\.
+
+  1. Accepted request implied in issue \#54\. Unconditionally save the
+     compiler/linker build log into key __log__ of the dictionary returned
+     by __cresults__, and save a copy of only the execution output in the
+     new key __exl__ \("execution log"\)\.
+
+  1. Fixed issue \#53\. Clarified the documentation of commands
+     __critcl::load__ and __critcl::failed__ with regard to their
+     results and the throwing of errors \(does not happen\)\.
+
+  1. Fixed issue \#48\. Modified mode "compile & run" to allow new declarations in
+     a file, after it was build, instead of erroring out\. The new decls are
+     build when needed\. Mode "precompile" is unchanged and will continue to trap
+     the situation\.
+
+  1. Fixed issue \#52\. Updated the local Tcl/Tk headers to 8\.4\.20, 8\.5\.13, and
+     8\.6\.4\.
+
+  1. Fixed issue \#45\. New feature command __critcl::cconst__\.
+
+  1. __[critcl::util](critcl\_util\.md)__: New command __locate__ to
+     find a file across a set of paths, and report an error when not found\. This
+     is for use in autoconf\-like header\-searches and similar configuration
+     tests\.
+
+  1. Modified 'AbortWhenCalledAfterBuild' to dump the entire stack \(info
+     frame\!\)\. This should make it easier to determine the location of the
+     troubling declaration\.
+
+# <a name='section10'></a>Changes for version 3\.1\.13
+
+  1. Merged PR \#43\. Fixed bug loading adjunct Tcl sources\.
+
+  1. Fixes in documentation and generated code of package "critcl::enum"\. Bumped
+     to version 1\.0\.1\.
+
+  1. Fixes in documentation of package "critcl::bitmap"\.
+
+  1. New package "critcl::emap"\. In essence a variant or cross of
+     "critcl::bitmap" with behaviour like "critcl::enum"\.
+
+  1. Merged PR \#49\. Fixed documentation typo\.
+
+  1. Merged PR \#46\. Fixed documentation typo\.
+
+  1. Merged PR \#47\. Fixes to test results to match the accumulated code changes\.
+     Also made portable across Tcl versions \(varying error syntax\)\.
+
+  1. New predefined argument\- and result\-type "wideint" mapping to Tcl\_WideInt\.
+
+  1. New predefined argument\-type "bytes" mapping to tuple of byte\-array data
+     and length\. Note: The existing "bytearray" type \(and its aliases\) was left
+     untouched, to keep backward compatibility\.
+
+  1. Modified the internal interface between the Tcl shim and C function
+     underneath "critcl::cproc" with respect to the handling of optional
+     arguments\. An optional argument "X" now induces the use of two C arguments,
+     "X" and "has\_X"\. The new argument "has\_X" is of boolean \(int\) type\. It is
+     set to true when X is set, and set to false when X has the default value\. C
+     code which cares about knowing if the argument is default or not is now
+     able to check that quickly, without having to code the default value
+     inside\. NOTE: This change is visible in the output of the advanced commands
+     "argcnames", "argcsignature", "argvardecls", and "argconversion"\.
+
+  1. Fixed issue \#50 and documented the availability of variable "interp" \(type
+     Tcl\_Interp\*\) within "critcl::cinit" C code fragments\. Note that while the
+     old, undocumented name of the variable, "ip", is still usable, it is
+     deprecated\. It will be fully removed in two releases, i\.e\. for release
+     3\.1\.15\. The variable name was changed to be consistent with other code
+     environments\.
+
+  1. Fixed issue \#51\. Disabled the generation of \#line directives for
+     "critcl::config lines 0" coming from template files, or code generated with
+     them before the final value of this setting was known\.
+
+  1. Fixed issue with handling of namespaced package names in "critcl::iassoc"\.
+     Equivalent to a bug in "critcl::class" fixed for critcl 3\.1\.1,
+     critcl::class 1\.0\.1\. Note: "literals", "enum", "emap", and "bitmap" do not
+     require a fix as they are all built on top of "iassoc"\.
+
+# <a name='section11'></a>Changes for version 3\.1\.12
+
+  1. Fixed issue 42\. Clear ::errorInfo immediately after startup to prevent
+     leakage of irrelevant \(caught\) errors into our script and confusing the
+     usage code\.
+
+  1. Fixed issue 40\. Keep the order of libraries, and allow duplicates\. Both are
+     things which are occasionally required for proper linking\.
+
+  1. Extended the utility package
+     __[critcl::literals](critcl\_literals\.md)__ to declare a cproc
+     result\-type for a pool\.
+
+     Further fixed the generated header to handle multiple inclusion\.
+
+     Bumped version to 1\.1\.
+
+  1. Fixed issue with utility package
+     __[critcl::bitmap](critcl\_bitmap\.md)__\.
+
+     Fixed the generated header to handle multiple inclusion\.
+
+     Bumped version to 1\.0\.1\.
+
+  1. Created new utility package __[critcl::enum](critcl\_enum\.md)__ for
+     the quick and easy setup and use of mappings between C values and Tcl
+     strings\. Built on top of
+     __[critcl::literals](critcl\_literals\.md)__\.
+
+  1. Added examples demonstrating the use of the utility packages
+     __[critcl::literals](critcl\_literals\.md)__,
+     __[critcl::bitmap](critcl\_bitmap\.md)__, and
+     __[critcl::enum](critcl\_enum\.md)__
+
+# <a name='section12'></a>Changes for version 3\.1\.11
+
+  1. Fixed issue \#37, via pull request \#38, with thanks to Jos DeCoster\.
+     Information was stored into the v::delproc and v::clientdata arrays using a
+     different key than when retrieving the same information, thus failing the
+     latter\.
+
+  1. New convenience command __critcl::include__ for easy inclusion of
+     headers and other C files\.
+
+  1. New command __critcl::make__ to generate a local header of other C
+     files for use by other parts of a package through inclusion\.
+
+  1. New utility package __[critcl::literals](critcl\_literals\.md)__ for
+     quick and easy setup of and access to pools of fixed Tcl\_Obj\* strings\.
+     Built on top of __[critcl::iassoc](critcl\_iassoc\.md)__\.
+
+  1. New utility package __[critcl::bitmap](critcl\_bitmap\.md)__ for
+     quick and easy setup and use of mappings between C bitsets and Tcl lists
+     whose string elements represent that set\. Built on top of
+     __[critcl::iassoc](critcl\_iassoc\.md)__\.
+
+# <a name='section13'></a>Changes for version 3\.1\.10
+
+  1. Fixed code version numbering forgotten with 3\.1\.9\.
+
+  1. Fixed issue \#35\. In package mode \(\-pkg\) the object cache directory is
+     unique to the process, thus we do not need content\-hashing to generate
+     unique file names\. A simple counter is sufficient and much faster\.
+
+     Note that mode "compile & run" is not as blessed and still uses
+     content\-hasing with md5 to ensure unique file names in its per\-user object
+     cache\.
+
+  1. Fixed issue where the __ccommand__ forgot to use its body as input for
+     the UUID generation\. Thus ignoring changes to it in mode compile & run, and
+     not rebuilding a library for changed sources\. Bug and fix reported by Peter
+     Spjuth\.
+
+# <a name='section14'></a>Changes for version 3\.1\.9
+
+  1. Fixed issue \#27\. Added missing platform definitions for various alternate
+     linux and OS X targets\.
+
+  1. Fixed issue \#28\. Added missing \-mXX flags for linking at the
+     linux\-\{32,64\}\-\* targets\.
+
+  1. Fixed issue \#29\. Replaced the use of raw "cheaders" information in the
+     processing of "cdefines" with the proper include directives derived from
+     it\.
+
+  1. Fixed the issue behind rejected pull request \#30 by Andrew Shadura\.
+     Dynamically extract the stubs variable declarations from the Tcl header
+     files and generate matching variable definitions for use in the package
+     code\. The generated code will now be always consistent with the headers,
+     even when critcl's own copy of them is replaced by system headers\.
+
+  1. Fixed issue \#31\. Accepted patch by Andrew Shadura, with changes \(comments\),
+     for easier integration of critcl with OS package systems, replacing
+     critcl's copies of Tcl headers with their own\.
+
+  1. Fixed issue \#32\. Merged pull request by Andrew Shadura\. Various typos in
+     documentation and comments\.
+
+  1. Fixed issue \#34\. Handle files starting with a dot better\.
+
+# <a name='section15'></a>Changes for version 3\.1\.8
+
+  1. Fixed issue with package indices generated for Tcl 8\.4\. Join the list of
+     commands with semi\-colon, not newline\.
+
+  1. Fixed issue \#26 which brought up use\-cases I had forgotten to consider
+     while fixing bug \#21 \(see critcl 3\.1\.6\)\.
+
+# <a name='section16'></a>Changes for version 3\.1\.7
+
+  1. Fixed issue \#24\. Extract and unconditionally display compiler warnings
+     found in the build log\. Prevents users from missing warnings which, while
+     not causing the build to fail, may still indicate problems\.
+
+  1. New feature\. Output hook\. All non\-messaging user output is now routed
+     through the command __critcl::print__, and users are allowed to
+     override it when using the critcl application\-as\-package\.
+
+  1. New feature, by Ashok P\. Nadkarni\. Platform configurations can inherit
+     values from configurations defined before them\.
+
+# <a name='section17'></a>Changes for version 3\.1\.6
+
+  1. Fixed issue \#21\. While the multi\-definition of the stub\-table pointer
+     variables was ok with for all the C linkers seen so far C\+\+ linkers did not
+     like this at all\. Reworked the code to ensure that this set of variables is
+     generated only once, in the wrapper around all the pieces to assemble\.
+
+  1. Fixed issue \#22, the handling of the command identifier arguments of
+     __critcl::ccommand__, __critcl::cproc__, and __critcl::cdata__\.
+     We now properly allow any Tcl identifier and generate proper internal C
+     identifiers from them\.
+
+     As part of this the signature of command __critcl::name2c__ changed\.
+     The command now delivers a list of four values instead of three\. The new
+     value was added at the end\.
+
+     Further adapted the implementation of package
+     __[critcl::class](critcl\_class\.md)__, a user of
+     __critcl::name2c__\. This package is now at version 1\.0\.6 and requires
+     critcl 3\.1\.6
+
+     Lastly fixed the mis\-handling of option __\-cname__ in
+     __critcl::ccommand__, and __critcl::cproc__\.
+
+  1. Fixed issue \#23\.
+
+# <a name='section18'></a>Changes for version 3\.1\.5
+
+  1. Fixed issue \#19\. Made the regular expression extracting the MSVC version
+     number more general to make it work on german language systems\. This may
+     have to be revisited in the future, for other Windows locales\.
+
+  1. Fixed issue \#20\. Made option \-tea work on windows, at least in a unix
+     emulation environment like msys/mingw\.
+
+# <a name='section19'></a>Changes for version 3\.1\.4
+
+  1. Bugfix in package __[critcl::class](critcl\_class\.md)__\. Generate a
+     dummy field in the class structure if the class has no class variables\.
+     Without this change the structure would be empty, and a number of compilers
+     are not able to handle such a type\.
+
+  1. Fixed a typo which broke the win64 configuration\.
+
+  1. Fixed issue \#16, a typo in the documentation of command
+     __[critcl::class](critcl\_class\.md)__\.
+
+# <a name='section20'></a>Changes for version 3\.1\.3
+
+  1. Enhancement\. In detail:
+
+  1. Added new argument type "pstring", for "Pascal String", a counted string,
+     i\.e\. a combination of string pointer and string length\.
+
+  1. Added new methods __critcl::argtypesupport__ and
+     __::critcl::argsupport__ to define and use additional supporting code
+     for an argument type, here used by "pstring" above to define the necessary
+     structure\.
+
+  1. Semi\-bugfixes in the packages __[critcl::class](critcl\_class\.md)__
+     and __[critcl::iassoc](critcl\_iassoc\.md)__\. Pragmas for the AS meta
+     data scanner to ensure that the template files are made part of the
+     package\. Versions bumped to 1\.0\.4 and 1\.0\.1 respectively\.
+
+# <a name='section21'></a>Changes for version 3\.1\.2
+
+  1. Enhancement\. In detail:
+
+  1. Extended __critcl::cproc__ to be able to handle optional arguments, in
+     a limited way\. This is automatically available to
+     __[critcl::class](critcl\_class\.md)__ cproc\-based methods as well\.
+
+  1. Bugfix in __lassign__ emulation for Tcl 8\.4\. Properly set unused
+     variables to the empty string\. Bumped version of emulation package
+     __lassign84__ to 1\.0\.1\.
+
+# <a name='section22'></a>Changes for version 3\.1\.1
+
+  1. Bugfixes all around\. In detail:
+
+  1. Fixed the generation of wrong\#args errors for __critcl::cproc__ and
+     derived code \(__[critcl::class](critcl\_class\.md)__ cproc\-based
+     methods\)\. Use NULL if there are no arguments, and take the offset into
+     account\.
+
+  1. Fixed the handling of package names by
+     __[critcl::class](critcl\_class\.md)__\. Forgot that they may contain
+     namespace separators\. Bumped to version 1\.0\.1\.
+
+  1. Extended a __[critcl::class](critcl\_class\.md)__ generated error
+     message in instance creation for clarity\. Bumped to version 1\.0\.2\.
+
+# <a name='section23'></a>Changes for version 3\.1
+
+  1. Added a new higher\-level package
+     __[critcl::iassoc](critcl\_iassoc\.md)__\.
+
+     This package simplifies the creation of code associating data with an
+     interpreter via Tcl's __Tcl\_\(Get&#124;Set\)AssocData\(\)__ APIs\. The user can
+     concentrate on his data while all the necessary boilerplate C code to
+     support this is generated by the package\.
+
+     This package uses several of the new features which were added to the core
+     __[critcl](critcl\.md)__ package, see below\.
+
+  1. Added the higher\-level package
+     __[critcl::class](critcl\_class\.md)__\.
+
+     This package simplifies the creation of C level objects with class and
+     instance commands\. The user can write a class definition with class\- and
+     instance\-variables and \-methods similar to a TclOO class, with all the
+     necessary boilerplate C code to support this generated by the package\.
+
+     This package uses several of the new features which were added to the core
+     __[critcl](critcl\.md)__ package, see below\.
+
+  1. Extended the API for handling TEApot metadata\. Added the command
+     __critcl::meta?__ to query the stored information\. Main use currently
+     envisioned is retrieval of the current package's name by utility commands,
+     for use in constructed names\. This particular information is always
+     available due to the static scan of the package file on execution of the
+     first critcl command\.
+
+     The new packages __[critcl::iassoc](critcl\_iassoc\.md)__ and
+     __[critcl::class](critcl\_class\.md)__ \(see above\) are users of this
+     command\.
+
+  1. Extended the API with a command, __critcl::name2c__, exposing the
+     process of converting a Tcl name into base name, namespace, and C
+     namespace\. This enables higher\-level code generators to generate the same
+     type of C identifiers as __[critcl](critcl\.md)__ itself\.
+
+     The new package __[critcl::class](critcl\_class\.md)__ \(see above\) is
+     a user of this command\.
+
+  1. Extended the API with a command, __critcl::source__, executing critcl
+     commands found in a separate file in the context of the current file\. This
+     enables easier management of larger bodies of code as it allows the user to
+     split such up into easier to digest smaller chunks without causing the
+     generation of multiple packages\.
+
+  1. Related to the previous item, extended the API with commands to divert
+     collection of generated C code into memory\. This makes it easier to use the
+     commands for embedded C code in higher\-level code generators\.
+
+     See the section __Advanced: Diversions__ for details of the provided
+     commands\.
+
+     The new package __[critcl::class](critcl\_class\.md)__ \(see above\) is
+     a user of these facilities\.
+
+  1. Extended the API with commands helping developers with the generation of
+     proper C *\#line* directives\. This allows higher\-level code generators to
+     generate and insert their own directives, ensuring that compile errors in
+     their code are properly attributed\.
+
+     See the section __Advanced: Location management__ for details of the
+     provided commands\.
+
+     The new packages __[critcl::iassoc](critcl\_iassoc\.md)__ and
+     __[critcl::class](critcl\_class\.md)__ \(see above\) are users of these
+     facilities\.
+
+  1. Extended the API with commands giving users the ability to define custom
+     argument and result types for __::critcl::cproc__\.
+
+     See the section __CriTcl cproc Type Reference__ for details of the
+     provided commands\.
+
+# <a name='section24'></a>Changes for version 3\.0\.7
+
+  1. Fixed the code generated by __critcl::c\+\+command__\. The emitted code
+     handed a non\-static string table to __Tcl\_GetIndexFromObj__, in
+     violation of the contract, which requires the table to have a fixed
+     address\. This was a memory smash waiting to happen\. Thanks to Brian Griffin
+     for alrerting us to the general problem\.
+
+# <a name='section25'></a>Changes for version 3\.0\.6
+
+  1. Fixed github issue 10\. The critcl application now delivers a proper exit
+     code \(1\) on build failure, instead of always indicating success \(status 0\)\.
+
+  1. Fixed github issue 13\. Handling of bufferoverflowU\.lib for release builds
+     was inconsistent with handling for debug builds\. It is now identically
+     handled \(conditional\) by both cases\.
+
+  1. Documentation cleanup, mainly in the installation guide, and the README\.md
+     shown by github
+
+# <a name='section26'></a>Changes for version 3\.0\.5
+
+  1. Fixed bug in the new code for \#line pragmas triggered when specifying C
+     code without leading whitespace\.
+
+  1. Extended the documentation to have manpages for the license, source
+     retrieval, installer, and developer's guides\.
+
+# <a name='section27'></a>Changes for version 3\.0\.4
+
+  1. Fixed generation of the package's initname when the incoming code is read
+     from stdin and has no proper path\.
+
+  1. Fixed github issue 11\. Now using /LIBPATH instead of \-L on Windows
+     \(libinclude configuration setting\)\.
+
+  1. Extended critcl to handle \-l:path format of \-l options\. GNU ld 2\.22\+
+     handles this by searching for the path as is\. Good when specifying static
+     libraries, as plain \-l looks for shared libraries in preference over
+     static\. critcl handles it now, as older GNU ld's do not understand it, nor
+     the various vendor\-specific linkers\.
+
+  1. Fixed github issue \#12\. CriTcl now determines the version of MSVC in use
+     and uses it to switch between various link debug options\. Simplified the
+     handling of bufferoverflowU\.lib also, making use of the same mechanism and
+     collapsing the two configurations sections we had back into one\.
+
+  1. Reworked the insertion of \#line pragmas into the generated C code to avoid
+     limitations on the line number argument imposed by various compilers, and
+     be more accurate\.
+
+  1. Modified argument processing\. Option \-libdir now also implies \-L for its
+     argument\.
+
+  1. Extended handling of option \-show \(__critcl::showconfig__\) to list the
+     path of the configuration file the data is coming from\. Good for debugging
+     configuration processing\.
+
+  1. Extended the build script with targets to regenerate the embedded
+     documentation, and diagrams, and to generate a release\.
+
+# <a name='section28'></a>Changes for version 3\.0\.3
+
+  1. Fixed github issues 5 and 8, for the example build\.tcl scripts\. Working
+     around a missing variable ::errorInfo\. It should always be present, however
+     there seem to be revisions of Tcl around which violate this assumption\.
+
+# <a name='section29'></a>Changes for version 3\.0\.2
+
+  1. Fixed issue in compile\-and\-run mode where commands put into the auto\_index
+     are not found by Tcl's \[unknown\] command\.
+
+  1. Fixed an array key mismatch breaking usage of client data and delete
+     function for procedure\. Reported by Jos DeCoster, with patch\.
+
+  1. Implemented a command line option __\-L__, an equivalent of option
+     __\-I__, just for library search paths\.
+
+  1. Fixed github issues 5 and 8\. Working around a missing variable ::errorInfo\.
+     It should always be present, however there seem to be revisions of Tcl
+     around which violate this assumption\.
+
+# <a name='section30'></a>Changes for version 3\.0\.1
+
+  1. Bugfixes all around\. In detail:
+
+  1. Fixed recording of Tcl version requirements\. Keep package name and version
+     together, unbreaking generated meta data and generated package load
+     command\.
+
+  1. Fixed the build scripts: When installing, or wrapping for TEA, generate any
+     missing directories
+
+  1. Modified the build scripts to properly exit the application when the window
+     of their GUI is closed through the \(X\) button\.
+
+  1. Removed an 8\.5\-ism \(open wb\) which had slipped into the main build script\.
+
+  1. Modified the example build scripts to separate the output for the different
+     examples \(and packages\) by adding empty lines\.
+
+  1. stack::c example bugfix: Include API declarations for use in the companion
+     files\.
+
+  1. Extended the documentation: Noted the need for a working installation of a
+     C compiler\.
+
+  1. Extended the Windows target definitions and code to handle the manifest
+     files used by modern MS development environments\. Note that this code
+     handles both possibilities, environment using manifests, and \(old\(er\)\)
+     environments without\.
+
+  1. Extended the Windows 64bit target definitions and code to auto\-detect the
+     need for the helper library "bufferoverflowU\.lib" and reconfigure the
+     compile and link commands appropriately\. We assume that the library must be
+     linked when present\. This should be no harm if the library is present, yet
+     not needed\. Just superfluous\. We search for the library in the paths
+     specified by the environment variable LIB\.
+
+# <a name='section31'></a>Changes for version 3
+
+  1. The command __critcl::platform__ was deprecated in version 2\.1,
+     superceded by __critcl::targetplatform__, yet kept for compatibility\.
+     Now it has been removed\.
+
+  1. The command __critcl::compiled__ was kept with in version 2\.1 with
+     semantics in contradiction to its, for compatibility\. This contradiction
+     has been removed, changing the visible semantics of the command to be in
+     line with its name\.
+
+  1. The change to version 3 became necessary because of the two incompatible
+     visible changes above\.
+
+  1. Extended the application package with code handling a new option
+     __\-tea__\. Specifying this option invokes a special mode where critcl
+     generates a TEA package, i\.e\. wraps the input into a directory hierarchy
+     and support files which provide it TEA\-lookalike buildsystem\.
+
+     This new option, and __\-pkg__, exclude each other\. If both are
+     specified the last used option takes precedence\.
+
+     The generated package directory hierarchy is mostly self\-contained, but not
+     fully\. It requires not only a working installation of Tcl, but also working
+     installations of the packages __md5__ and __cmdline__\. Both of
+     these are provided by the __Tcllib__ bundle\. Not required, but
+     recommended to have installed are any of the packages which can accelerate
+     md5's operation, i\.e\. __cryptkit__, __tcllibc__, or __Trf__\.
+
+  1. Extended the critcl package with a new command __critcl::scan__ taking
+     the path to a "\.critcl" file, statically scanning it, and returning
+     license, version, a list of its companion files, list of imported APIs, and
+     list of developer\-specified custom configuration options\. This data is the
+     foundation for the TEA wrapping described above\.
+
+     Note that this is a *static* scan\. While the other build modes can \(must\)
+     execute the "\.critcl" file and make platform\-specific decisions regarding
+     the assembled C code, companion files, etc\. the TEA wrap mode is not in a
+     position to make platform\-specific decisions\. It has to wrap everything
+     which might conceivably be needed when actually building\. Hence the static
+     scan\. This has however its own set of problems, namely the inability to
+     figure out any dynamic construction of companion file paths, at least on
+     its own\. Thus:
+
+  1. Extended the API used by critcl\-based packages with the command
+     __critcl::owns__\. While this command is ignored by the regular build
+     modes the static scanner described above takes its arguments as the names
+     of companion files which have to be wrapped into the TEA package and could
+     not be figured by the scanner otherwise, like because of dynamic paths to
+     __critcl::tsources__, __critcl::csources__, getting sourced
+     directly, or simply being adjunct datafiles\.
+
+  1. Extended the API used by critcl\-based packages with the command
+     __critcl::api__ for the management of stubs tables, be it their use,
+     and/or declaration and export\.
+
+     Please see section *Stubs Table Management* of the
+     __[critcl](critcl\.md)__ package documentation for details\.
+
+  1. Extended the API used by critcl\-based packages with the command
+     __critcl::userconfig__ for the management of developer\-specified custom
+     configuration options, be it their use and/or declaration\.
+
+     Please see section *Custom Build Configuration* of the
+     __[critcl](critcl\.md)__ package documentation for details\.
+
+  1. Extended the API used by critcl\-based packages with the commands
+     __critcl::description__, __critcl::summary__,
+     __critcl::subject__, __critcl::meta__, and
+     __critcl::buildrequirement__ for the declaration of TEApot meta data
+     for/about the package\.
+
+     Please see section *Package Meta Data* of the
+     __[critcl](critcl\.md)__ package documentation for details\.
+
+# <a name='section32'></a>Changes for version 2\.1
+
+  1. Fixed bug where __critcl::tsources__ interpreted relative paths as
+     relative to the current working directory instead of relative to the
+     "\.critcl" file using the command, as all other commands of this type do\.
+
+  1. Fixed internals, preventing information collected for multiple "\.critcl"
+     files to leak between them\. Notably, __critcl::tk__ is not a global
+     configuration option anymore\.
+
+  1. Fixed the command __critcl::license__ to be a null\-operation in mode
+     "compile & run", instead of throwing an error\.
+
+  1. Fixed the critcl application's interference with the "compile & run" result
+     cache in __\-pkg__ mode by having it use a wholly separate \(and by
+     default transient\) directory for that mode\.
+
+  1. Fixed bug where changes to a "\.critcl" file did not result in a rebuild for
+     mode "compile & run"\. All relevant API commands now ensure UUID changes\.
+
+  1. Fixed bug in the backend handling of __critcl::debug__ where the
+     companion c\-sources of a "\.critcl" file were not compiled with debug
+     options, although the "\.critcl" file was\.
+
+  1. Fixed bug in __critcl::debug__ which prevented recognition of mode
+     "all" when it was not the first argument to the command\.
+
+  1. Fixed bug in "preload\.c" preventing its compilation on non\-windows
+     platforms\.
+
+  1. Fixed long\-standing bug in the handling of namespace qualifiers in the
+     command name argument of __critcl::cproc__ and
+     __critcl::ccommand__\. It is now possible to specify a fully qualified
+     command name without issues\.
+
+  1. Extended/reworked __critcl::tsources__ to be the canonical way of
+     declaring "\.tcl" companion files even for mode "compile & run"\.
+
+  1. Extended/reworked __critcl::tsources__ to allow the use of a "\.critcl"
+     file as its own Tcl companion file\.
+
+  1. Extended __critcl::framework__ to internally check for OS X build
+     target, and to ignore the declaration if its not\.
+
+  1. Extended __critcl::failed__ to be callable more than once in a
+     "\.critcl" file\. The first call forces the build, if it was not done
+     already, to get the result\. Further calls return the cached result of the
+     first call\.
+
+  1. Extended the handling of environment variable CC in the code determining
+     the compiler to use to deal with \(i\.e\. remove\) paths to the compiler,
+     compiler file extensions, and compiler options specified after the compiler
+     itself, leaving only the bare name of the compiler\.
+
+  1. Extended the code handling the search for preloaded libraries to print the
+     paths it searched, making debugging of a search failure easier\.
+
+  1. A new command __critcl::tcl__ can be used to declare the version of Tcl
+     minimally needed to build and run the "\.critcl" file and package\. Defaults
+     to 8\.4 if not declared\. Extended critcl to have the stubs and headers for
+     all of Tcl 8\.4, 8\.5, and 8\.6\.
+
+  1. A new command __critcl::load__ forces the build and load of a "\.critcl"
+     file\. This is the official way for overriding critcl's default
+     lazy\-build\-&\-load\-on\-demand scheme for mode "compile & run"\.
+
+     *Note* that after using __critcl::load__ / __critcl::failed__ in
+     a "\.critcl" file it is not possible to use critcl commands in that file
+     anymore\. Doing so will throw an error\.
+
+  1. Extended the generation of '\#line' pragmas to use __info frame__ \(if
+     available\) to provide the C compiler with exact line numbers into the
+     "\.critcl" file for the reporting of warnings and errors\.
+
+  1. Extended __critcl::check__ with logging to help with debugging
+     build\-time checks of the environment, plus an additional optional argument
+     to provide labeling\.
+
+  1. Added a new command __critcl::checklink__ which not only tries to check
+     the environment via compiling the code, but also its linkability\.
+
+  1. Added a new command __critcl::msg__ for messaging, like command
+     __critcl::error__ is for error reporting\. Likewise this is a hook a
+     user of the package is allowed to override\. The default implementation,
+     used by mode *[compile & run](\.\./index\.md\#compile\_run)* does nothing\.
+     The implementation for mode *[generate
+     package](\.\./index\.md\#generate\_package)* prints the message to stdout\.
+
+     Envisioned use is for the reporting of results determined by
+     __critcl::check__ and __critcl::checklink__ during building, to
+     help with debugging when something goes wrong with a check\.
+
+  1. Exposed the argument processing internals of __critcl::proc__ for use
+     by advanced users\. The new commands are
+
+       1) __critcl::argnames__
+
+       1) __critcl::argcnames__
+
+       1) __critcl::argcsignature__
+
+       1) __critcl::argvardecls__
+
+       1) __critcl::argconversion__
+
+     Please see section *Advanced Embedded C Code* of the
+     __[critcl](critcl\.md)__ package documentation for details\.
+
+  1. Extended the critcl package to intercept __package__ __provide__
+     and record the file \-> package name mapping\. Plus other internal changes
+     now allow the use of namespaced package names while still using proper path
+     names and init function\.
+
+  1. Dropped the unused commands __critcl::optimize__ and
+     __critcl::include__\.
+
+  1. Dropped __\-lib__ mode from the critcl application\.
+
+  1. Dropped remnants of support for Tcl 8\.3 and before\.
+
+# <a name='section33'></a>Authors
+
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+# <a name='section34'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report them at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)\.
+Ideas for enhancements you may have for either package, application, and/or the
+documentation are also very welcome and should be reported at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)
+as well\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [calling C code from
+Tcl](\.\./index\.md\#calling\_c\_code\_from\_tcl), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; Jean\-Claude Wippler  
+Copyright &copy; Steve Landers  
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_class.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_class.md
new file mode 100644
index 00000000..c98d7e66
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_class.md
@@ -0,0 +1,722 @@
+
+[//000000001]: # (critcl::class \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_class\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000004]: # (critcl::class\(n\) 1\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl::class \- CriTcl \- Code Gen \- C Classes
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Synopsis](#synopsis)
+
+  - [Description](#section1)
+
+  - [API](#section2)
+
+  - [Class Specification API](#section3)
+
+      - [General configuration](#subsection1)
+
+      - [Class lifetime management](#subsection2)
+
+      - [Instance lifetime management](#subsection3)
+
+      - [Class variables and methods](#subsection4)
+
+      - [Instance variables and methods](#subsection5)
+
+      - [Context dependent interactions](#subsection6)
+
+  - [Example](#section4)
+
+  - [Authors](#section5)
+
+  - [Bugs, Ideas, Feedback](#section6)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='synopsis'></a>SYNOPSIS
+
+package require Tcl 8\.6  
+package require critcl ?3\.2?  
+package require critcl::class ?1\.1?  
+
+[__::critcl::class::define__ *name* *script*](#1)  
+[__include__ *path*](#2)  
+[__support__ *code*](#3)  
+[__type__ *name*](#4)  
+[__classconstructor__ *body*](#5)  
+[__classdestructor__ *body*](#6)  
+[__constructor__ *body* ?*postbody*?](#7)  
+[__destructor__ *body*](#8)  
+[__classvariable__ *ctype* *name* ?*comment*? ?*constructor*? ?*destructor*?](#9)  
+[__classmethod__ *name* __command__ *arguments* *body*](#10)  
+[__classmethod__ *name* __proc__ *arguments* *resulttype* *body*](#11)  
+[__classmethod__ *name* __as__ *funname* ?*arg*\.\.\.?](#12)  
+[__insvariable__ *ctype* *name* ?*comment*? ?*constructor*? ?*destructor*?](#13)  
+[__method__ *name* __command__ *arguments* *body*](#14)  
+[__method__ *name* __proc__ *arguments* *resulttype* *body*](#15)  
+[__method__ *name* __as__ *funname* ?*arg*\.\.\.?](#16)  
+[__method\_introspection__](#17)  
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This document is the reference manpage for the __critcl::class__ package\.
+This package provides convenience commands for advanced functionality built on
+top of the core\.
+
+With it a user wishing to create a C level object with class and instance
+commands can concentrate on specifying the class\- and instance\-variables and
+\-methods in a manner similar to a TclOO class, while all the necessary
+boilerplate around it is managed by this package\.
+
+Its intended audience are mainly developers wishing to write Tcl packages with
+embedded C code\.
+
+This package resides in the Core Package Layer of CriTcl\.
+
+![](\.\./image/arch\_core\.png)
+
+# <a name='section2'></a>API
+
+  - <a name='1'></a>__::critcl::class::define__ *name* *script*
+
+    This is the main command to define a new class *name*, where *name* is
+    the name of the Tcl command representing the class, i\.e\. the *class
+    command*\. The *script* provides the specification of the class, i\.e\.
+    information about included headers, class\- and instance variables, class\-
+    and instance\-methods, etc\. See the section [Class Specification
+    API](#section3) below for the detailed list of the available commands
+    and their semantics\.
+
+# <a name='section3'></a>Class Specification API
+
+Here we documents all class specification commands available inside of the class
+definition script argument of __::critcl::class::define__\.
+
+## <a name='subsection1'></a>General configuration
+
+  - <a name='2'></a>__include__ *path*
+
+    This command specifies the path of a header file to include within the code
+    generated for the class\. This is separate from the __support__ because
+    the generated include directives will be put at the very beginning of the
+    generated code\. This is done to allow the use of the imported declarations
+    within the instance type, and elsewhere\.
+
+    Calls to this command are cumulative\. It is of course possible to not use
+    this command at all, for classes not making use of external definitions\.
+
+    The result is the empty string\.
+
+  - <a name='3'></a>__support__ *code*
+
+    This command specifies supporting C code, i\.e\. any definitions \(types,
+    functions, etc\.\) needed by the *whole* class and not fitting into class\-
+    and instance\-methods\. The code is embedded at global level, outside of any
+    function or other definition\.
+
+    Calls to this command are cumulative\. It is of course possible to not use
+    this command at all, for classes not requiring supporting code\.
+
+    The result of the command is the empty string\.
+
+  - <a name='4'></a>__type__ *name*
+
+    This command specifies the name of an external C type to be used as the type
+    of the instance structure\.
+
+    Initialization and release of the structure with the given type are the
+    responsibility of the user, through __constructor__ and
+    __destructor__ code fragments\.
+
+    *Attention:* Using this command precludes the use of regular class\- and
+    instance variables\. It further precludes the use of
+    __method\-introspection__ as well, as this make use of generated
+    instance\-variables\.
+
+    If class\- and/or instance\-variable have to be used in conjunction with an
+    external C type, simply create and use a class\- or instance\-variable with
+    that type\.
+
+    The result of the command is the empty string\.
+
+## <a name='subsection2'></a>Class lifetime management
+
+  - <a name='5'></a>__classconstructor__ *body*
+
+    This command specifies a C code block surrounding the initialization of the
+    class variables, i\.e\. the fields of the class structure\. *Note* that
+    allocation and release of the class structure itself is done by the system
+    andf not the responsibility of the user\.
+
+    For the initialization \(and release\) of a class variable it is recommended
+    to use the *constructor* and *destructor* arguments of the variable's
+    definition \(See command __classvariable__\) for this instead of using a
+    separate __classconstructor__\.
+
+    This is an optional command\. Using it more than once is allowed too and each
+    use will add another C code fragment to use during construction\. I\.e\.
+    multiple calls aggregate\.
+
+    The C code blocks of multiple calls \(including the constructors of
+    classvariable definitions\) are executed in order of specification\.
+
+    The result of the command is the empty string\.
+
+    The C code in *body* has access to the following environment:
+
+      * __interp__
+
+        Pointer to the Tcl interpreter \(Tcl\_Interp\*\) the class structure will be
+        associated with\. It enables the generation of a Tcl error message should
+        construction fail\.
+
+      * __class__
+
+        Pointer to the class structure to initialize\.
+
+      * error
+
+        A C code label the constructor can jump to should it have to signal a
+        construction failure\. It is the responsibility of the constructor to
+        release any variables already initialized before jumping to this label\.
+        This also why the 'execution in order of specification' is documented
+        and can be relied on\. It gives us the knowledge which other constructors
+        have already been run and initialized what other fields\.
+
+  - <a name='6'></a>__classdestructor__ *body*
+
+    This command specifies a C code block surrounding the release of the class
+    variables, i\.e\. the fields of the class structure\. *Note* that allocation
+    and release of the class structure itself is done by the system and not the
+    responsibility of the user\.
+
+    For the initialization \(and release\) of a class variable it is recommended
+    to use the *constructor* and *destructor* arguments of the variable's
+    definition \(See command __classvariable__\) for this instead of using a
+    separate __classconstructor__\.
+
+    This is an optional command\. Using it more than once is allowed too and each
+    use will add another C code fragment to use during construction\. I\.e\.
+    multiple calls aggregate\.
+
+    The C code blocks of multiple calls \(including the constructors of class
+    variable definitions\) are executed in order of specification\.
+
+    The result of the command is the empty string\.
+
+    The C code in *body* has access to the same environment as the class
+    constructor code blocks\.
+
+## <a name='subsection3'></a>Instance lifetime management
+
+  - <a name='7'></a>__constructor__ *body* ?*postbody*?
+
+    This command specifies a C code block surrounding the initialization of the
+    instance variables, i\.e\. the fields of the instance structure\. *Note* that
+    allocation and release of the instance structure itself is done by the
+    system and not the responsibility of the user\. *On the other hand*, if an
+    external __type__ was specified for the instance structure, then
+    instance variables are not possible, and the system has no knowledge of the
+    type's structure\. In that case it is the responsibility of the *body* to
+    allocate and free the structure itself too\.
+
+    For the initialization \(and release\) of an instance variable it is
+    recommended to use the *constructor* and *destructor* arguments of the
+    variable's definition \(See command __insvariable__\) for this instead of
+    using a separate __constructor__\.
+
+    This is an optional command\. Using it more than once is allowed too and each
+    use will add another C code fragment to use during construction\. I\.e\.
+    multiple calls aggregate\.
+
+    The C code blocks of multiple calls \(including the constructors of instance
+    variable definitions\) are executed in order of specification\.
+
+    The result of the command is the empty string\.
+
+    The C code in *body* has access to the following environment:
+
+      * __interp__
+
+        Pointer to the Tcl interpreter \(Tcl\_Interp\*\) the instance structure will
+        be associated with\. It enables the generation of a Tcl error message
+        should construction fail\.
+
+      * __instance__
+
+        Pointer to the instance structure to initialize\.
+
+      * error
+
+        A C code label the constructor can jump to should it have to signal a
+        construction failure\. It is the responsibility of the constructor to
+        release any variables already initialized before jumping to this label\.
+        This also why the 'execution in order of specification' is documented
+        and can be relied on\. It gives us the knowledge which other constructors
+        have already been run and initialized what other fields\.
+
+    The C code in *postbody* is responsible for construction actions to be
+    done after the primary construction was done and the Tcl\-level instance
+    command was successfully created\. It has access to a slightly different
+    environment:
+
+      * __interp__
+
+        Pointer to the Tcl interpreter \(Tcl\_Interp\*\) the instance structure will
+        be associated with\. It enables the generation of a Tcl error message
+        should construction fail\.
+
+      * __instance__
+
+        Pointer to the instance structure to initialize\.
+
+      * __cmd__
+
+        The Tcl\_Command token of the Tcl\-level instance command\.
+
+      * __fqn__
+
+        The fully qualified name of the instance command, stored in a Tcl\_Obj\*\.
+
+  - <a name='8'></a>__destructor__ *body*
+
+    This command specifies a C code block surrounding the release of the
+    instance variables, i\.e\. the fields of the instance structure\. *Note* that
+    allocation and release of the instance structure itself is done by the
+    system and not the responsibility of the user\. *On the other hand*, if an
+    external __type__ was specified for the instance structure, then
+    instance variables are not possible, and the system has no knowledge of the
+    type's structure\. In that case it is the responsibility of the *body* to
+    allocate and free the structure itself too\.
+
+    For the initialization \(and release\) of an instance variable it is
+    recommended to use the *constructor* and *destructor* arguments of the
+    variable's definition \(See command __insvariable__\) for this instead of
+    using a separate __constructor__\.
+
+    This is an optional command\. Using it more than once is allowed too and each
+    use will add another C code fragment to use during construction\. I\.e\.
+    multiple calls aggregate\.
+
+    The C code blocks of multiple calls \(including the constructors of instance
+    variable definitions\) are executed in order of specification\.
+
+    The result of the command is the empty string\.
+
+    The C code in *body* has access to the following environment:
+
+      * __instance__
+
+        Pointer to the instance structure to release\.
+
+## <a name='subsection4'></a>Class variables and methods
+
+  - <a name='9'></a>__classvariable__ *ctype* *name* ?*comment*? ?*constructor*? ?*destructor*?
+
+    This command specifies a field in the class structure of the class\. Multiple
+    fields can be specified, and are saved in the order specified\.
+
+    *Attention:* Specification of a class variable precludes the use of an
+    external C __type__ for the instance structure\.
+
+    *Attention:* Specification of a class variable automatically causes the
+    definition of an instance variable named __class__, pointing to the
+    class structure\.
+
+    Beyond the basic *name* and C type of the new variable the definition may
+    also contain a *comment* describing it, and C code blocks to initialize
+    and release the variable\. These are effectively local forms of the commands
+    __classconstructor__ and __classdestructor__\. Please read their
+    descriptions for details regarding the C environment available to the code\.
+
+    The comment, if specified will be embedded into the generated C code for
+    easier cross\-referencing from generated "\.c" file to class specification\.
+
+  - <a name='10'></a>__classmethod__ *name* __command__ *arguments* *body*
+
+    This command specifies a class method and the C code block implementing its
+    functionality\. This is the first of three forms\. The method is specified
+    like a __critcl::ccommand__, with a fixed set of C\-level arguments\. The
+    *body* has to perform everything \(i\.e\. argument extraction, checking,
+    result return, and of course the actual functionality\) by itself\.
+
+    For this the *body* has access to
+
+      * __class__
+
+        Pointer to the class structure\.
+
+      * __interp__
+
+        Pointer to the Tcl interpreter \(Tcl\_Interp\*\) the class structure is
+        associated with
+
+      * __objc__
+
+        The number of method arguments\.
+
+      * __objv__
+
+        The method arguments, as C array of Tcl\_Obj pointers\.
+
+    The *arguments* of the definition are only a human readable form of the
+    method arguments and syntax and are not used in the C code, except as
+    comments put into the generated code\. Again, it is the responsibility of the
+    *body* to check the number of arguments, extract them, check their types,
+    etc\.
+
+  - <a name='11'></a>__classmethod__ *name* __proc__ *arguments* *resulttype* *body*
+
+    This command specifies a class method and the C code block implementing its
+    functionality\. This is the second of three forms\. The method is specified
+    like a __critcl::cproc__\. Contrary to the first variant here the
+    *arguments* are computer readable, expected to be in the same format as
+    the *arguments* of __critcl::cproc__\. The same is true for the
+    *resulttype*\. The system automatically generates a wrapper doing argument
+    checking and conversion, and result conversion, like for
+    __critcl::cproc__\.
+
+    The *body* has access to
+
+      * __class__
+
+        Pointer to the class structure\.
+
+      * __interp__
+
+        Pointer to the Tcl interpreter \(Tcl\_Interp\*\) the class structure is
+        associated with
+
+      * \.\.\.
+
+        All *arguments* under their specified names and C types as per their
+        definition\.
+
+  - <a name='12'></a>__classmethod__ *name* __as__ *funname* ?*arg*\.\.\.?
+
+    This command specifies a class method and the C code block implementing its
+    functionality\. This is the third and last of three forms\.
+
+    The class method is implemented by the external function *funname*, i\.e\. a
+    function which is declared outside of the class code itself, or in a
+    __support__ block\.
+
+    It is assumed that the first four arguments of that function represent the
+    parameters
+
+      * __class__
+
+        Pointer to the class structure\.
+
+      * __interp__
+
+        Pointer to the Tcl interpreter \(Tcl\_Interp\*\) the class structure is
+        associated with
+
+      * __objc__
+
+        The number of method arguments\.
+
+      * __objv__
+
+        The method arguments, as C array of Tcl\_Obj pointers\.
+
+    Any additional arguments specified will be added after these and are passed
+    into the C code as is, i\.e\. are considered to be C expressions\.
+
+## <a name='subsection5'></a>Instance variables and methods
+
+  - <a name='13'></a>__insvariable__ *ctype* *name* ?*comment*? ?*constructor*? ?*destructor*?
+
+    This command specifies a field in the instance structure of the class\.
+    Multiple fields can be specified, and are saved in the order specified\.
+
+    *Attention:* Specification of an instance variable precludes the use of an
+    external C __type__ for the instance structure\.
+
+    *Attention:* Specification of an instance variable automatically causes
+    the definition of an instance variable of type __Tcl\_Command__, and
+    named __cmd__, holding the token of the instance command, and the
+    definition of an instance method named __destroy__\. This implicit
+    instance variable is managed by the system\.
+
+    Beyond the basic *name* and C type of the new variable the definition may
+    also contain a *comment* describing it, and C code blocks to initialize
+    and release the variable\. These are effectively local forms of the commands
+    __constructor__ and __destructor__\. Please read their descriptions
+    for details regarding the C environment available to the code\.
+
+    The comment, if specified will be embedded into the generated C code for
+    easier cross\-referencing from generated "\.c" file to class specification\.
+
+  - <a name='14'></a>__method__ *name* __command__ *arguments* *body*
+
+    This command specifies an instance method and the C code block implementing
+    its functionality\. This is the first of three forms\. The method is specified
+    like a __critcl::ccommand__, with a fixed set of C\-level arguments\. The
+    *body* has to perform everything \(i\.e\. argument extraction, checking,
+    result return, and of course the actual functionality\) by itself\.
+
+    For this the *body* has access to
+
+      * __instance__
+
+        Pointer to the instance structure\.
+
+      * __interp__
+
+        Pointer to the Tcl interpreter \(Tcl\_Interp\*\) the instance structure is
+        associated with
+
+      * __objc__
+
+        The number of method arguments\.
+
+      * __objv__
+
+        The method arguments, as C array of Tcl\_Obj pointers\.
+
+    The *arguments* of the definition are only a human readable form of the
+    method arguments and syntax and are not used in the C code, except as
+    comments put into the generated code\. Again, it is the responsibility of the
+    *body* to check the number of arguments, extract them, check their types,
+    etc\.
+
+  - <a name='15'></a>__method__ *name* __proc__ *arguments* *resulttype* *body*
+
+    This command specifies an instance method and the C code block implementing
+    its functionality\. This is the second of three forms\. The method is
+    specified like a __critcl::cproc__\. Contrary to the first variant here
+    the *arguments* are computer readable, expected to be in the same format
+    as the *arguments* of __critcl::cproc__\. The same is true for the
+    *resulttype*\. The system automatically generates a wrapper doing argument
+    checking and conversion, and result conversion, like for
+    __critcl::cproc__\.
+
+    The *body* has access to
+
+      * __instance__
+
+        Pointer to the instance structure\.
+
+      * __interp__
+
+        Pointer to the Tcl interpreter \(Tcl\_Interp\*\) the instance structure is
+        associated with
+
+      * \.\.\.
+
+        All *arguments* under their specified names and C types as per their
+        definition\.
+
+  - <a name='16'></a>__method__ *name* __as__ *funname* ?*arg*\.\.\.?
+
+    This command specifies an instance method and the C code block implementing
+    its functionality\. This is the third and last of three forms\.
+
+    The instance method is implemented by the external function *funname*,
+    i\.e\. a function which is declared outside of the instance code itself, or in
+    a __support__ block\.
+
+    It is assumed that the first four arguments of that function represent the
+    parameters
+
+      * __instance__
+
+        Pointer to the instance structure\.
+
+      * __interp__
+
+        Pointer to the Tcl interpreter \(Tcl\_Interp\*\) the instance structure is
+        associated with
+
+      * __objc__
+
+        The number of method arguments\.
+
+      * __objv__
+
+        The method arguments, as C array of Tcl\_Obj pointers\.
+
+    Any additional arguments specified will be added after these and are passed
+    into the C code as is, i\.e\. are considered to be C expressions\.
+
+  - <a name='17'></a>__method\_introspection__
+
+    This command generates one class\- and one instance\-method both of which will
+    return a list of the instance methods of the class, and supporting
+    structures, like the function to compute the information, and a class
+    variable caching it\.
+
+    The two methods and the class variable are all named __methods__\.
+
+## <a name='subsection6'></a>Context dependent interactions
+
+This section documents the various interactions between the specification
+commands\. While these are are all documented with the individual commands here
+they are pulled together to see at a glance\.
+
+  1. If you are using the command __type__ to specify an external C type to
+     use for the instance structure you are subject to the following constraints
+     and rules:
+
+       1) You cannot define your own instance variables\.
+
+       1) You cannot define your own class variables\.
+
+       1) You cannot use __method\_introspection__\.
+
+       1) You have to allocate and release the instance structure on your own,
+          through __constructor__ and __destructor__ code blocks\.
+
+  1. If you declare class variables you are subject to the following constraints
+     and rules:
+
+       1) You cannot use __type__\.
+
+       1) The system generates an instance variable __class__ for you, which
+          points from instance to class structure\. This makes you also subject
+          to the rules below, for instance variables\.
+
+  1. If you declare instance variables \(possibly automatic, see above\) you are
+     subject to following constraints and rules:
+
+       1) You cannot use __type__\.
+
+       1) The system generates and manages an instance variable __cmd__ for
+          you, which holds the Tcl\_Command token of the instance command\.
+
+       1) The system generates an instance method __destroy__ for you\.
+
+       1) The system manages allocation and release of the instance structure
+          for you\. You have to care only about the instance variables
+          themselves\.
+
+# <a name='section4'></a>Example
+
+The example shown below is the specification of queue data structure, with most
+of the method implementations and support code omitted to keep the size down\.
+
+The full implementation can be found in the directory "examples/queue" of the
+critcl source distribution/repository\.
+
+    package require Tcl 8.6
+    package require critcl 3.2
+
+    critcl::buildrequirement {
+        package require critcl::class ; # DSL, easy spec of Tcl class/object commands.
+    }
+
+    critcl::cheaders util.h
+
+    critcl::class::define ::queuec {
+        include util.h
+
+        insvariable Tcl_Obj* unget {
+    	List object unget elements
+        } {
+    	instance->unget = Tcl_NewListObj (0,NULL);
+    	Tcl_IncrRefCount (instance->unget);
+        } {
+    	Tcl_DecrRefCount (instance->unget);
+        }
+
+        insvariable Tcl_Obj* queue {
+    	List object holding the main queue
+        } {
+    	instance->queue = Tcl_NewListObj (0,NULL);
+    	Tcl_IncrRefCount (instance->queue);
+        } {
+    	Tcl_DecrRefCount (instance->queue);
+        }
+
+        insvariable Tcl_Obj* append {
+    	List object holding new elements
+        } {
+    	instance->append = Tcl_NewListObj (0,NULL);
+    	Tcl_IncrRefCount (instance->append);
+        } {
+    	Tcl_DecrRefCount (instance->append);
+        }
+
+        insvariable int at {
+    	Index of next element to return from the main queue
+        } {
+    	instance->at = 0;
+        }
+
+        support {... queue_peekget, queue_size, etc.}
+
+        method clear {} {...}
+        method destroy {...}
+
+        method get  as queue_peekget 1
+        method peek as queue_peekget 0
+
+        method put {item ...}
+
+        method size {} {
+    	if ((objc != 2)) {
+    	    Tcl_WrongNumArgs (interp, 2, objv, NULL);
+    	    return TCL_ERROR;
+    	}
+
+    	Tcl_SetObjResult (interp, Tcl_NewIntObj (queue_size (instance, NULL, NULL, NULL)));
+    	return TCL_OK;
+        }
+
+        method unget {item} {...}
+    }
+
+    package provide queuec 1
+
+# <a name='section5'></a>Authors
+
+Andreas Kupries
+
+# <a name='section6'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report such at
+[https://github\.com/andreas\-kupries/critcl](https://github\.com/andreas\-kupries/critcl)\.
+Please also report any ideas for enhancements you may have for either package
+and/or documentation\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C class](\.\./index\.md\#c\_class), [C code](\.\./index\.md\#c\_code), [C
+instance](\.\./index\.md\#c\_instance), [C object](\.\./index\.md\#c\_object),
+[Embedded C Code](\.\./index\.md\#embedded\_c\_code), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_cproc.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_cproc.md
new file mode 100644
index 00000000..0955e614
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_cproc.md
@@ -0,0 +1,1197 @@
+
+[//000000001]: # (critcl\_cproc\_types \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_cproc\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; Jean\-Claude Wippler)
+[//000000004]: # (Copyright &copy; Steve Landers)
+[//000000005]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000006]: # (critcl\_cproc\_types\(n\) 3\.2\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl\_cproc\_types \- CriTcl cproc Type Reference
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Synopsis](#synopsis)
+
+  - [Description](#section1)
+
+  - [Standard argument types](#section2)
+
+  - [Standard result types](#section3)
+
+  - [Advanced: Adding types](#section4)
+
+  - [Examples](#section5)
+
+      - [A Simple Procedure](#subsection1)
+
+      - [More Builtin Types: Strings](#subsection2)
+
+      - [Custom Types, Introduction](#subsection3)
+
+      - [Custom Types, Semi\-trivial](#subsection4)
+
+      - [Custom Types, Support structures](#subsection5)
+
+      - [Custom Types, Results](#subsection6)
+
+  - [Authors](#section6)
+
+  - [Bugs, Ideas, Feedback](#section7)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='synopsis'></a>SYNOPSIS
+
+package require Tcl 8\.6  
+package require critcl ?3\.2\.1?  
+
+[__::critcl::has\-resulttype__ *name*](#1)  
+[__::critcl::resulttype__ *name* *body* ?*ctype*?](#2)  
+[__::critcl::resulttype__ *name* __=__ *origname*](#3)  
+[__::critcl::has\-argtype__ *name*](#4)  
+[__::critcl::argtype__ *name* *body* ?*ctype*? ?*ctypefun*?](#5)  
+[__::critcl::argtype__ *name* __=__ *origname*](#6)  
+[__::critcl::argtypesupport__ *name* *code* ?*guard*?](#7)  
+[__::critcl::argtyperelease__ *name* *code*](#8)  
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This document is a breakout of the descriptions for the predefined argument\- and
+result\-types usable with the __critcl::cproc__ command, as detailed in the
+reference manpage for the __[critcl](critcl\.md)__ package, plus the
+information on how to extend the predefined set with custom types\. The breakout
+was made to make this information easier to find \(toplevel document vs\. having
+to search the large main reference\)\.
+
+Its intended audience are developers wishing to write Tcl packages with embedded
+C code\.
+
+# <a name='section2'></a>Standard argument types
+
+Before going into the details first a quick overview:
+
+> CriTcl type      &#124; C type         &#124; Tcl type  &#124; Notes  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> Tcl\_Interp\*      &#124; Tcl\_Interp\*    &#124; n/a       &#124; *Special*, only first  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> Tcl\_Obj\*         &#124; Tcl\_Obj\*       &#124; Any       &#124; *Read\-only*  
+> object           &#124;                &#124;           &#124; Alias of __Tcl\_Obj\*__ above  
+> list             &#124; critcl\_list    &#124; List      &#124; *Read\-only*  
+> \[\], \[\*\]          &#124;                &#124;           &#124; Alias of __list__ above  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> \[N\]              &#124;                &#124;           &#124; Restricted __list__\-types\.  
+> type\[\], type\[N\]  &#124;                &#124;           &#124; Length\-limited \(\[\.\.\]\), expected  
+> \[\]type, \[N\]type  &#124;                &#124;           &#124; element type, or both\.  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124;                &#124;           &#124;  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124;                &#124;           &#124; Element types can be all known argument  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124;                &#124;           &#124; types, except for any kind of list\.  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124;                &#124;           &#124; IOW multi\-dimensional lists are not  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124;                &#124;           &#124; supported\.  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> char\*            &#124; const char\*    &#124; Any       &#124; *Read\-only*, *string rep*  
+> pstring          &#124; critcl\_pstring &#124; Any       &#124; *Read\-only*  
+> bytes            &#124; critcl\_bytes   &#124; ByteArray &#124; *Read\-only*  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> int              &#124; int            &#124; Int       &#124;  
+> long             &#124; long           &#124; Long      &#124;  
+> wideint          &#124; Tcl\_WideInt    &#124; WideInt   &#124;  
+> double           &#124; double         &#124; Double    &#124;  
+> float            &#124; float          &#124; Double    &#124;  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> X > N            &#124;                &#124;           &#124; For X in __int__ \.\.\. __float__ above\.  
+> X >= N           &#124;                &#124;           &#124; The C types are as per the base type X\.  
+> X < N            &#124;                &#124;           &#124; N, A, B are expected to be constant integer  
+> X <= N           &#124;                &#124;           &#124; numbers for types __int__, __long__,  
+> X > A < B        &#124;                &#124;           &#124; and __wideint__\. For types __double__  
+> etc\.             &#124;                &#124;           &#124; and __float__ the N, A, and B can be floating  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124;                &#124;           &#124; point numbers\. Multiple restrictions are  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124;                &#124;           &#124; fused as much as possible to yield at most  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124;                &#124;           &#124; both upper and lower limits\.  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> boolean          &#124; int            &#124; Boolean   &#124;  
+> bool             &#124;                &#124;           &#124; Alias of __boolean__ above  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> channel          &#124; Tcl\_Channel    &#124; String    &#124; Assumed to be registered  
+> unshared\-channel &#124; Tcl\_Channel    &#124; String    &#124; As above, limited to current interpreter  
+> take\-channel     &#124; Tcl\_Channel    &#124; String    &#124; As above, C code takes ownership
+
+And now the details:
+
+  - Tcl\_Interp\*
+
+    *Attention*: This is a *special* argument type\. It can *only* be used
+    by the *first* argument of a function\. Any other argument using it will
+    cause critcl to throw an error\.
+
+    When used, the argument will contain a reference to the current interpreter
+    that the function body may use\. Furthermore the argument will *not* be an
+    argument of the Tcl command for the function\.
+
+    This is useful when the function has to do more than simply returning a
+    value\. Examples would be setting up error messages on failure, or querying
+    the interpreter for variables and other data\.
+
+  - Tcl\_Obj\*
+
+  - object
+
+    The function takes an argument of type __Tcl\_Obj\*__\. No argument
+    checking is done\. The Tcl level word is passed to the argument as\-is\. Note
+    that this value must be treated as *read\-only* \(except for hidden changes
+    to its intrep, i\.e\. *shimmering*\)\.
+
+  - pstring
+
+    The function takes an argument of type __critcl\_pstring__ containing the
+    original __Tcl\_Obj\*__ reference of the Tcl argument, plus the length of
+    the string and a pointer to the character array\.
+
+        typedef struct critcl_pstring {
+            Tcl_Obj*    o;
+            const char* s;
+            int         len;
+        } critcl_pstring;
+
+    Note the *const*\. The string is *read\-only*\. Any modification can have
+    arbitrary effects, from pulling out the rug under the script because of
+    string value and internal representation not matching anymore, up to crashes
+    anytime later\.
+
+  - list
+
+  - \[\]
+
+  - \[\*\]
+
+    The function takes an argument of type __critcl\_list__ containing the
+    original __Tcl\_Obj\*__ reference of the Tcl argument, plus the length of
+    the Tcl list and a pointer to the array of the list elements\.
+
+        typedef struct critcl_list {
+            Tcl_Obj*        o;
+            Tcl_Obj* const* v;
+            int             c;
+        } critcl_list;
+
+    The Tcl argument must be convertible to __List__, an error is thrown
+    otherwise\.
+
+    Note the *const*\. The list is *read\-only*\. Any modification can have
+    arbitrary effects, from pulling out the rug under the script because of
+    string value and internal representation not matching anymore, up to crashes
+    anytime later\.
+
+    Further note that the system understands a number of more complex
+    syntactical forms which all translate into forms of lists under the hood, as
+    described by the following points\.
+
+  - \[N\]
+
+    A *list* type with additional checks limiting the length to __N__, an
+    integer number greater than zero\.
+
+  - \[\]type
+
+  - type\[\]
+
+    A *list* type whose elements all have to be convertible for *type*\. All
+    known types, including user\-defined, are allowed, except for __list__
+    and derivates\. In other words, multi\-dimensional lists are not supported\.
+
+    The function will take a structure argument of the general form
+
+        typedef struct critcl_list_... {
+            Tcl_Obj* o;
+            int      c;
+            (Ctype)* v;
+        } critcl_list_...;
+
+    where __\(Ctype\)__ represents the C type for values of type __type__\.
+
+  - \[N\]type
+
+  - type\[N\]
+
+    These are __list__ types combining the elements of
+
+        [N]
+
+    and
+
+        []type
+
+    \.
+
+    As an example, the specification of
+
+        int[3] a
+
+    describes argument *a* as a list of exactly 3 elements, all of which have
+    to be of type __int__\.
+
+    Note that this example can also be written in the more C\-like form of
+
+        int a[3]
+
+    \. The system will translate this internally to the first shown form\.
+
+  - bytes
+
+    This is the *new* and usable __ByteArray__ type\.
+
+    The function takes an argument of type __critcl\_bytes__ containing the
+    original __Tcl\_Obj\*__ reference of the Tcl argument, plus the length of
+    the byte array and a pointer to the byte data\.
+
+        typedef struct critcl_bytes {
+            Tcl_Obj*             o;
+            const unsigned char* s;
+            int                len;
+        } critcl_list;
+
+    The Tcl argument must be convertible to __ByteArray__, an error is
+    thrown otherwise\.
+
+    Note the *const*\. The bytes are *read\-only*\. Any modification can have
+    arbitrary effects, from pulling out the rug under the script because of
+    string value and internal representation not matching anymore, up to crashes
+    anytime later\.
+
+  - char\*
+
+    The function takes an argument of type __const char\*__\. The string
+    representation of the Tcl argument is passed in\.
+
+    Note the *const*\. The string is *read\-only*\. Any modification can have
+    arbitrary effects, from pulling out the rug under the script because of
+    string value and internal representation not matching anymore, up to crashes
+    anytime later\.
+
+  - double
+
+    The function takes an argument of type __double__\. The Tcl argument must
+    be convertible to __Double__, an error is thrown otherwise\.
+
+  - double > N
+
+  - double >= N
+
+  - double < N
+
+  - double <= N
+
+    These are variants of *double* above, restricting the argument value to
+    the shown relation\. An error is thrown for Tcl arguments outside of the
+    specified range\.
+
+    The limiter *N* has to be a constant floating point value\.
+
+    It is possible to use multiple limiters\. For example *double > A > B <=
+    C*\. The system will fuse them to a single upper/lower limit \(or both\)\.
+
+    The system will reject limits describing an empty range of values, or a
+    range containing only a single value\.
+
+  - float
+
+    The function takes an argument of type __float__\. The Tcl argument must
+    be convertible to __Double__, an error is thrown otherwise\.
+
+  - float > N
+
+  - float >= N
+
+  - float < N
+
+  - float <= N
+
+    These are variants of *float* above, restricting the argument value to the
+    shown relation\. An error is thrown for Tcl arguments outside of the
+    specified range\.
+
+    The limiter *N* has to be a constant floating point value\.
+
+    It is possible to use multiple limiters\. For example *float > A > B <= C*\.
+    The system will fuse them to a single upper/lower limit \(or both\)\.
+
+    The system will reject limits describing an empty range of values, or a
+    range containing only a single value\.
+
+  - boolean
+
+  - bool
+
+    The function takes an argument of type __int__\. The Tcl argument must be
+    convertible to __Boolean__, an error is thrown otherwise\.
+
+  - channel
+
+    The function takes an argument of type __Tcl\_Channel__\. The Tcl argument
+    must be convertible to type __Channel__, an error is thrown otherwise\.
+    The channel is further assumed to be *already registered* with the
+    interpreter\.
+
+  - unshared\-channel
+
+    This type is an extension of __channel__ above\. All of the information
+    above applies\.
+
+    Beyond that the channel must not be shared by multiple interpreters, an
+    error is thrown otherwise\.
+
+  - take\-channel
+
+    This type is an extension of __unshared\-channel__ above\. All of the
+    information above applies\.
+
+    Beyond that the code removes the channel from the current interpreter
+    without closing it, and disables all pre\-existing event handling for it\.
+
+    With this the function takes full ownership of the channel in question,
+    taking it away from the interpreter invoking it\. It is then responsible for
+    the lifecycle of the channel, up to and including closing it\.
+
+    Should the system the function is a part of wish to return control of the
+    channel back to the interpeter it then has to use the result type
+    __return\-channel__\. This will undo the registration changes made by this
+    argument type\. *Note* however that the removal of pre\-existing event
+    handling done here cannot be undone\.
+
+    *Attention* Removal from the interpreter without closing the channel is
+    effected by incrementing the channel's reference count without providing an
+    interpreter, before decrementing the same for the current interpreter\. This
+    leaves the overall reference count intact without causing Tcl to close it
+    when it is removed from the interpreter structures\. At this point the
+    channel is effectively a globally\-owned part of the system not associated
+    with any interpreter\.
+
+    The complementary result type then runs this sequence in reverse\. And if the
+    channel is never returned to Tcl either the function or the system it is a
+    part of have to unregister the global reference when they are done with it\.
+
+  - int
+
+    The function takes an argument of type __int__\. The Tcl argument must be
+    convertible to __Int__, an error is thrown otherwise\.
+
+  - int > N
+
+  - int >= N
+
+  - int < N
+
+  - int <= N
+
+    These are variants of *int* above, restricting the argument value to the
+    shown relation\. An error is thrown for Tcl arguments outside of the
+    specified range\.
+
+    The limiter *N* has to be a constant integer value\.
+
+    It is possible to use multiple limiters\. For example *int > A > B <= C*\.
+    The system will fuse them to a single upper/lower limit \(or both\)\.
+
+    The system will reject limits describing an empty range of values, or a
+    range containing only a single value\.
+
+  - long
+
+    The function takes an argument of type __long int__\. The Tcl argument
+    must be convertible to __Long__, an error is thrown otherwise\.
+
+  - long > N
+
+  - long >= N
+
+  - long < N
+
+  - long <= N
+
+    These are variants of *long* above, restricting the argument value to the
+    shown relation\. An error is thrown for Tcl arguments outside of the
+    specified range\.
+
+    The limiter *N* has to be a constant integer value\.
+
+    It is possible to use multiple limiters\. For example *long > A > B <= C*\.
+    The system will fuse them to a single upper/lower limit \(or both\)\.
+
+    The system will reject limits describing an empty range of values, or a
+    range containing only a single value\.
+
+  - wideint
+
+    The function takes an argument of type __Tcl\_WideInt__\. The Tcl argument
+    must be convertible to __WideInt__, an error is thrown otherwise\.
+
+  - wideint > N
+
+  - wideint >= N
+
+  - wideint < N
+
+  - wideint <= N
+
+    These are variants of *wideint* above, restricting the argument value to
+    the shown relation\. An error is thrown for Tcl arguments outside of the
+    specified range\.
+
+    The limiter *N* has to be a constant integer value\.
+
+    It is possible to use multiple limiters\. For example *wideint > A > B <=
+    C*\. The system will fuse them to a single upper/lower limit \(or both\)\.
+
+    The system will reject limits describing an empty range of values, or a
+    range containing only a single value\.
+
+  - void\*
+
+# <a name='section3'></a>Standard result types
+
+Before going into the details first a quick overview:
+
+> CriTcl type    &#124; C type         &#124; Tcl type  &#124; Notes  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> void           &#124; n/a            &#124; n/a       &#124; Always OK\. Body sets result  
+> ok             &#124; int            &#124; n/a       &#124; Result code\. Body sets result  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> int            &#124; int            &#124; Int       &#124;  
+> boolean        &#124;                &#124;           &#124; Alias of __int__ above  
+> bool           &#124;                &#124;           &#124; Alias of __int__ above  
+> long           &#124; long           &#124; Long      &#124;  
+> wideint        &#124; Tcl\_WideInt    &#124; WideInt   &#124;  
+> double         &#124; double         &#124; Double    &#124;  
+> float          &#124; float          &#124; Double    &#124;  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> char\*          &#124; char\*          &#124; String    &#124; *Makes a copy*  
+> vstring        &#124;                &#124;           &#124; Alias of __char\*__ above  
+> const char\*    &#124; const char\*    &#124;           &#124; Behavior of __char\*__ above  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> string         &#124;                &#124; String    &#124; Freeable string set directly  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124;                &#124;           &#124; *No copy is made*  
+> dstring        &#124;                &#124;           &#124; Alias of __string__ above  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124;                &#124;           &#124; For all below: Null is ERROR  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124;                &#124;           &#124; Body has to set any message  
+> Tcl\_Obj\*       &#124; Tcl\_Obj\*       &#124; Any       &#124; *refcount \-\-*  
+> object         &#124;                &#124;           &#124; Alias of __Tcl\_Obj\*__ above  
+> Tcl\_Obj\*0      &#124;                &#124; Any       &#124; *refcount unchanged*  
+> object0        &#124;                &#124;           &#124; Alias of __Tcl\_Obj\*0__ above  
+> \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> known\-channel  &#124; Tcl\_Channel    &#124; String    &#124; Assumes to already be registered  
+> new\-channel    &#124; Tcl\_Channel    &#124; String    &#124; New channel, will be registered  
+> return\-channel &#124; Tcl\_Channel    &#124; String    &#124; Inversion of take\-channel
+
+And now the details:
+
+  - Tcl\_Obj\*
+
+  - object
+
+    If the returned __Tcl\_Obj\*__ is __NULL__, the Tcl return code is
+    __TCL\_ERROR__ and the function should [set an error
+    mesage](https://www\.tcl\-lang\.org/man/tcl/TclLib/SetResult\.htm) as the
+    interpreter result\. Otherwise, the returned __Tcl\_Obj\*__ is set as the
+    interpreter result\.
+
+    Note that setting an error message requires the function body to have access
+    to the interpreter the function is running in\. See the argument type
+    __Tcl\_Interp\*__ for the details on how to make that happen\.
+
+    Note further that the returned __Tcl\_Obj\*__ should have a reference
+    count greater than __0__\. This is because the converter decrements the
+    reference count to release possession after setting the interpreter result\.
+    It assumes that the function incremented the reference count of the returned
+    __Tcl\_Obj\*__\. If a __Tcl\_Obj\*__ with a reference count of __0__
+    were returned, the reference count would become __1__ when set as the
+    interpreter result, and immediately thereafter be decremented to __0__
+    again, causing the memory to be freed\. The system is then likely to crash at
+    some point after the return due to reuse of the freed memory\.
+
+  - Tcl\_Obj\*0
+
+  - object0
+
+    Like __Tcl\_Obj\*__ except that this conversion assumes that the returned
+    value has a reference count of __0__ and *does not* decrement it\.
+    Returning a value whose reference count is greater than __0__ is
+    therefore likely to cause a memory leak\.
+
+    Note that setting an error message requires the function body to have access
+    to the interpreter the function is running in\. See the argument type
+    __Tcl\_Interp\*__ for the details on how to make that happen\.
+
+  - new\-channel
+
+    A __String__ Tcl\_Obj holding the name of the returned
+    __Tcl\_Channel__ is set as the interpreter result\. The channel is further
+    assumed to be *new*, and therefore registered with the interpreter to make
+    it known\.
+
+  - known\-channel
+
+    A __String__ Tcl\_Obj holding the name of the returned
+    __Tcl\_Channel__ is set as the interpreter result\. The channel is further
+    assumed to be *already registered* with the interpreter\.
+
+  - return\-channel
+
+    This type is a variant of __new\-channel__ above\. It varies slightly from
+    it in the registration sequence to be properly complementary to the argument
+    type __take\-channel__\. A __String__ Tcl\_Obj holding the name of the
+    returned __Tcl\_Channel__ is set as the interpreter result\. The channel
+    is further assumed to be *new*, and therefore registered with the
+    interpreter to make it known\.
+
+  - char\*
+
+  - vstring
+
+    A __String__ Tcl\_Obj holding a *copy* of the returned __char\*__ is
+    set as the interpreter result\. If the value is allocated then the function
+    itself and the extension it is a part of are responsible for releasing the
+    memory when the data is not in use any longer\.
+
+  - const char\*
+
+    Like __char\*__ above, except that the returned string is
+    __const__\-qualified\.
+
+  - string
+
+  - dstring
+
+    The returned __char\*__ is directly set as the interpreter result
+    *without making a copy*\. Therefore it must be dynamically allocated via
+    __Tcl\_Alloc__\. Release happens automatically when the Interpreter finds
+    that the value is not required any longer\.
+
+  - double
+
+  - float
+
+    The returned __double__ or __float__ is converted to a
+    __Double__ Tcl\_Obj and set as the interpreter result\.
+
+  - boolean
+
+  - bool
+
+    The returned __int__ value is converted to an __Int__ Tcl\_Obj and
+    set as the interpreter result\.
+
+  - int
+
+    The returned __int__ value is converted to an __Int__ Tcl\_Obj and
+    set as the interpreter result\.
+
+  - long
+
+    The returned __long int__ value is converted to a __Long__ Tcl\_Obj
+    and set as the interpreter result\.
+
+  - wideint
+
+    The returned __Tcl\_WideInt__ value is converted to a __WideInt__
+    Tcl\_Obj and set as the interpreter result\.
+
+  - ok
+
+    The returned __int__ value becomes the Tcl return code\. The interpreter
+    result is left untouched and can be set by the function if desired\. Note
+    that doing this requires the function body to have access to the interpreter
+    the function is running in\. See the argument type __Tcl\_Interp\*__ for
+    the details on how to make that happen\.
+
+  - void
+
+    The function does not return a value\. The interpreter result is left
+    untouched and can be set by the function if desired\.
+
+# <a name='section4'></a>Advanced: Adding types
+
+While the __critcl::cproc__ command understands the most common C types \(as
+per the previous 2 sections\), sometimes this is not enough\.
+
+To get around this limitation the commands in this section enable users of
+__[critcl](critcl\.md)__ to extend the set of argument and result types
+understood by __critcl::cproc__\. In other words, they allow them to define
+their own, custom, types\.
+
+  - <a name='1'></a>__::critcl::has\-resulttype__ *name*
+
+    This command tests if the named result\-type is known or not\. It returns a
+    boolean value, __true__ if the type is known and __false__
+    otherwise\.
+
+  - <a name='2'></a>__::critcl::resulttype__ *name* *body* ?*ctype*?
+
+    This command defines the result type *name*, and associates it with the C
+    code doing the conversion \(*body*\) from C to Tcl\. The C return type of the
+    associated function, also the C type of the result variable, is *ctype*\.
+    This type defaults to *name* if it is not specified\.
+
+    If *name* is already declared an error is thrown\. *Attention\!* The
+    standard result type __void__ is special as it has no accompanying
+    result variable\. This cannot be expressed by this extension command\.
+
+    The *body*'s responsibility is the conversion of the functions result into
+    a Tcl result and a Tcl status\. The first has to be set into the interpreter
+    we are in, and the second has to be returned\.
+
+    The C code of *body* is guaranteed to be called last in the wrapper around
+    the actual implementation of the __cproc__ in question and has access to
+    the following environment:
+
+      * __interp__
+
+        A Tcl\_Interp\* typed C variable referencing the interpreter the result
+        has to be stored into\.
+
+      * __rv__
+
+        The C variable holding the result to convert, of type *ctype*\.
+
+    As examples here are the definitions of two standard result types:
+
+            resulttype int {
+        	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+        	return TCL_OK;
+            }
+
+            resulttype ok {
+        	/* interp result must be set by cproc body */
+        	return rv;
+            } int
+
+  - <a name='3'></a>__::critcl::resulttype__ *name* __=__ *origname*
+
+    This form of the __resulttype__ command declares *name* as an alias of
+    result type *origname*, which has to be defined already\. If this is not
+    the case an error is thrown\.
+
+  - <a name='4'></a>__::critcl::has\-argtype__ *name*
+
+    This command tests if the named argument\-type is known or not\. It returns a
+    boolean value, __true__ if the type is known and __false__
+    otherwise\.
+
+  - <a name='5'></a>__::critcl::argtype__ *name* *body* ?*ctype*? ?*ctypefun*?
+
+    This command defines the argument type *name*, and associates it with the
+    C code doing the conversion \(*body*\) from Tcl to C\. *ctype* is the C
+    type of the variable to hold the conversion result and *ctypefun* is the
+    type of the function argument itself\. Both types default to *name* if they
+    are the empty string or are not provided\.
+
+    If *name* is already declared an error is thrown\.
+
+    *body* is a C code fragment that converts a Tcl\_Obj\* into a C value which
+    is stored in a helper variable in the underlying function\.
+
+    *body* is called inside its own code block to isolate local variables, and
+    the following items are in scope:
+
+      * __interp__
+
+        A variable of type __Tcl\_Interp\*__ which is the interpreter the code
+        is running in\.
+
+      * __@@__
+
+        A placeholder for an expression that evaluates to the __Tcl\_Obj\*__
+        to convert\.
+
+      * __@A__
+
+        A placeholder for the name of the variable to store the converted
+        argument into\.
+
+    As examples, here are the definitions of two standard argument types:
+
+            argtype int {
+        	if (Tcl_GetIntFromObj(interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+            }
+
+            argtype float {
+        	double t;
+        	if (Tcl_GetDoubleFromObj(interp, @@, &t) != TCL_OK) return TCL_ERROR;
+        	@A = (float) t;
+            }
+
+  - <a name='6'></a>__::critcl::argtype__ *name* __=__ *origname*
+
+    This form of the __argtype__ command declares *name* as an alias of
+    argument type *origname*, which has to be defined already\. If this is not
+    the case an error is thrown\.
+
+  - <a name='7'></a>__::critcl::argtypesupport__ *name* *code* ?*guard*?
+
+    This command defines a C code fragment for the already defined argument type
+    *name* which is inserted before all functions using that type\. Its purpose
+    is the definition of any supporting C types needed by the argument type\. If
+    the type is used by many functions the system ensures that only the first of
+    the multiple insertions of the code fragment is active, and the others
+    disabled\. The guard identifier is normally derived from *name*, but can
+    also be set explicitly, via *guard*\. This latter allows different custom
+    types to share a common support structure without having to perform their
+    own guarding\.
+
+  - <a name='8'></a>__::critcl::argtyperelease__ *name* *code*
+
+    This command defines a C code fragment for the already defined argument type
+    *name* which is inserted whenever the worker function of a
+    __critcl::cproc__ returns to the shim\. It is the responsibility of this
+    fragment to unconditionally release any resources the
+    __critcl::argtype__ conversion code allocated\. An example of this are
+    the *variadic* types for the support of the special, variadic *args*
+    argument to __critcl::cproc__'s\. They allocate a C array for the
+    collected arguments which has to be released when the worker returns\. This
+    command defines the C code for doing that\.
+
+# <a name='section5'></a>Examples
+
+The examples shown here have been drawn from the section "Embedding C" in the
+document about *Using CriTcl*\. Please see that document for many more
+examples\.
+
+## <a name='subsection1'></a>A Simple Procedure
+
+Starting simple, let us assume that the Tcl code in question is something like
+
+    proc math {x y z} {
+        return [expr {(sin($x)*rand())/$y**log($z)}]
+    }
+
+with the expression pretending to be something very complex and slow\. Converting
+this to C we get:
+
+    critcl::cproc math {double x double y double z} double {
+        double up   = rand () * sin (x);
+        double down = pow(y, log (z));
+        return up/down;
+    }
+
+Notable about this translation:
+
+  1. All the arguments got type information added to them, here "double"\. Like
+     in C the type precedes the argument name\. Other than that it is pretty much
+     a Tcl dictionary, with keys and values swapped\.
+
+  1. We now also have to declare the type of the result, here "double", again\.
+
+  1. The reference manpage lists all the legal C types supported as arguments
+     and results\.
+
+While the above example was based on type __double__ for both arguments and
+result we have a number of additional types in the same category, i\.e\. simple
+types\. These are:
+
+> CriTcl type &#124; C type         &#124; Tcl type  &#124; Notes  
+> \-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> bool        &#124;                &#124;           &#124; Alias of __boolean__ below  
+> boolean     &#124; int            &#124; Boolean   &#124;  
+> double      &#124; double         &#124; Double    &#124;  
+> float       &#124; float          &#124; Double    &#124;  
+> int         &#124; int            &#124; Int       &#124;  
+> long        &#124; long           &#124; Long      &#124;  
+> wideint     &#124; Tcl\_WideInt    &#124; WideInt   &#124;
+
+A slightly advanced form of these simple types are a limited set of constraints
+on the argument value\. Note that __bool__ and alias do not support this\.
+
+    critcl::cproc sqrt {{double >= 0} x} double {
+        return sqrt(x);
+    }
+
+In the example above CriTcl's argument handling will reject calling the command
+with a negative number, without ever invoking the C code\.
+
+These constraints are called *limited* because only __0__ and __1__
+can be used as the borders, although all the operators __<__, __<=__,
+__>__, and __>=__ are possible\. It is also not possible to combine
+restrictions\.
+
+## <a name='subsection2'></a>More Builtin Types: Strings
+
+Given that "Everything is a String" is a slogan of Tcl the ability of
+__cproc__s to receive strings as arguments, and return them as results is
+quite important\.
+
+We actually have a variety of builtin string types, all alike, yet different\.
+
+For arguments we have:
+
+> CriTcl type &#124; C type         &#124; Tcl type  &#124; Notes  
+> \-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> char\*       &#124; const char\*    &#124; Any       &#124; *Read\-only*, *string rep*  
+> pstring     &#124; critcl\_pstring &#124; Any       &#124; *Read\-only*  
+> bytes       &#124; critcl\_bytes   &#124; ByteArray &#124; *Read\-only*
+
+In C
+
+        critcl::cproc takeStrings {
+            char*   cstring
+    	pstring pstring
+    	bytes   barray
+        } void {
+            printf ("len %d = %s\n", strlen(cstring), cstring);
+    	printf ("len %d = %s\n", pstring.len, pstring.s);
+    	printf ("len %d = %s\n", barray.len, barray.s);
+            return; // void result, no result
+        }
+
+Notable about the above:
+
+  1. The __cstring__ is a plain __const char\*__\. It *points directly*
+     into the __Tcl\_Obj\*__ holding the argument in the script\.
+
+  1. The __pstring__ is a slight extension to that\. The value is actually a
+     structure containing the string pointer like __cstring__ \(field
+     __\.s__\), the length of the string \(field __\.len__\), and a pointer
+     to the __Tcl\_Obj\*__ these came from\.
+
+  1. The last, __barray__ is like __pstring__, however it has ensured
+     that the __Tcl\_Obj\*__ is a Tcl ByteArray, i\.e\. binary data\.
+
+Treat all of them as *Read Only*\. Do not modify ever\.
+
+On the other side, string results, we have:
+
+> CriTcl type   &#124; C type         &#124; Tcl type  &#124; Notes  
+> \-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> char\*         &#124; char\*          &#124; String    &#124; *Makes a copy*  
+> vstring       &#124;                &#124;           &#124; Alias of __char\*__ above  
+> const char\*   &#124; const char\*    &#124;           &#124; Behavior of __char\*__ above  
+> \-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\- &#124; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  
+> string        &#124; char\*          &#124; String    &#124; Freeable string set directly  
+> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#124;                &#124;           &#124; *No copy is made*  
+> dstring       &#124;                &#124;           &#124; Alias of __string__ above
+
+        critcl::cproc returnCString {} char* {
+            return "a string";
+        }
+        critcl::cproc returnString {} string {
+            char* str = Tcl_Alloc (200);
+    	sprintf (str, "hello world");
+            return str;
+        }
+
+Notable about the above:
+
+  1. The type __char\*__ is best used for static strings, or strings in some
+     kind fixed buffer\.
+
+     CriTcl's translation layer makes a copy of it for the result of the
+     command\. While it is possible to return heap\-allocated strings it is the C
+     code who is responsible for freeing such at some point\. If that is not done
+     they will leak\.
+
+  1. The type __string__ on the other hand is exactly for returning strings
+     allocated with __Tcl\_Alloc__ and associates\.
+
+     For these the translation layer makes no copy at all, and sets them
+     directly as the result of the command\. A *very important effect* of this
+     is that the ownership of the string pointer moves from the function to Tcl\.
+
+     *Tcl* will release the allocated memory when it does not need it any
+     longer\. The C code has no say in that\.
+
+## <a name='subsection3'></a>Custom Types, Introduction
+
+When writing bindings to external libraries __critcl::cproc__ is usually the
+most convenient way of writing the lower layers\. This is however hampered by the
+fact that critcl on its own only supports a few standard \(arguably the most
+import\) standard types, whereas the functions we wish to bind most certainly
+will use much more, specific to the library's function\.
+
+The critcl commands __argtype__, __resulttype__ and their adjuncts are
+provided to help here, by allowing a developer to extend critcl's type system
+with custom conversions\.
+
+This and the three following sections will demonstrate this, from trivial to
+complex\.
+
+The most trivial use is to create types which are aliases of existing types,
+standard or other\. As an alias it simply copies and uses the conversion code
+from the referenced types\.
+
+Our example is pulled from an incomplete project of mine, a binding to *Jeffrey
+Kegler*'s *libmarpa* library managing Earley parsers\. Several custom types
+simply reflect the typedef's done by the library, to make the
+__critcl::cproc__s as self\-documenting as the underlying library functions
+themselves\.
+
+    critcl::argtype Marpa_Symbol_ID     = int
+    critcl::argtype Marpa_Rule_ID       = int
+    critcl::argtype Marpa_Rule_Int      = int
+    critcl::argtype Marpa_Rank          = int
+    critcl::argtype Marpa_Earleme       = int
+    critcl::argtype Marpa_Earley_Set_ID = int
+
+    ...
+
+    method sym-rank: proc {
+        Marpa_Symbol_ID sym
+        Marpa_Rank      rank
+    } Marpa_Rank {
+        return marpa_g_symbol_rank_set (instance->grammar, sym, rank);
+    }
+
+    ...
+
+## <a name='subsection4'></a>Custom Types, Semi\-trivial
+
+A more involved custom argument type would be to map from Tcl strings to some
+internal representation, like an integer code\.
+
+The first example is taken from the __tclyaml__ package, a binding to the
+__libyaml__ library\. In a few places we have to map readable names for block
+styles, scalar styles, etc\. to the internal enumeration\.
+
+    critcl::argtype yaml_sequence_style_t {
+        if (!encode_sequence_style (interp, @@, &@A)) return TCL_ERROR;
+    }
+
+    ...
+
+    critcl::ccode {
+        static const char* ty_block_style_names [] = {
+            "any", "block", "flow", NULL
+        };
+
+        static int
+        encode_sequence_style (Tcl_Interp* interp, Tcl_Obj* style,
+                               yaml_sequence_style_t* estyle)
+        {
+            int value;
+            if (Tcl_GetIndexFromObj (interp, style, ty_block_style_names,
+                                     "sequence style", 0, &value) != TCL_OK) {
+                return 0;
+            }
+            *estyle = value;
+            return 1;
+        }
+    }
+
+    ...
+
+    method sequence_start proc {
+        pstring anchor
+        pstring tag
+        int implicit
+        yaml_sequence_style_t style
+    } ok {
+        /* Syntax: <instance> seq_start <anchor> <tag> <implicit> <style> */
+        ...
+    }
+
+    ...
+
+It should be noted that this code precedes the advent of the supporting
+generator package __[critcl::emap](critcl\_emap\.md)__\. using the
+generator the definition of the mapping becomes much simpler:
+
+    critcl::emap::def yaml_sequence_style_t {
+        any   0
+        block 1
+        flow  2
+    }
+
+Note that the generator will not only provide the conversions, but also define
+the argument and result types needed for their use by __critcl::cproc__\.
+Another example of such a semi\-trivial argument type can be found in the
+__CRIMP__ package, which defines a __Tcl\_ObjType__ for *image* values\.
+This not only provides a basic argument type for any image, but also derived
+types which check that the image has a specific format\. Here we see for the
+first time non\-integer arguments, and the need to define the C types used for
+variables holding the C level value, and the type of function parameters \(Due to
+C promotion rules we may need different types\)\.
+
+    critcl::argtype image {
+        if (crimp_get_image_from_obj (interp, @@, &@A) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    } crimp_image* crimp_image*
+
+    ...
+
+        set map [list <<type>> $type]
+        critcl::argtype image_$type [string map $map {
+            if (crimp_get_image_from_obj (interp, @@, &@A) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            if (@A->itype != crimp_imagetype_find ("crimp::image::<<type>>")) {
+                Tcl_SetObjResult (interp,
+                                  Tcl_NewStringObj ("expected image type <<type>>",
+                                                    -1));
+                return TCL_ERROR;
+            }
+        }] crimp_image* crimp_image*
+
+    ...
+
+## <a name='subsection5'></a>Custom Types, Support structures
+
+The adjunct command __critcl::argtypesupport__ is for when the conversion
+needs additional definitions, for example a helper structure\.
+
+An example of this can be found among the standard types of critcl itself, the
+__pstring__ type\. This type provides the C function with not only the string
+pointer, but also the string length, and the __Tcl\_Obj\*__ this data came
+from\. As __critcl::cproc__'s calling conventions allow us only one argument
+for the data of the parameter a structure is needed to convey these three pieces
+of information\.
+
+Thus the argument type is defined as
+
+    critcl::argtype pstring {
+        @A.s = Tcl_GetStringFromObj(@@, &(@A.len));
+        @A.o = @@;
+    } critcl_pstring critcl_pstring
+
+    critcl::argtypesupport pstring {
+        typedef struct critcl_pstring {
+            Tcl_Obj*    o;
+            const char* s;
+            int         len;
+        } critcl_pstring;
+    }
+
+In the case of such a structure being large we may wish to allocate it on the
+heap instead of having it taking space on the stack\. If we do that we need
+another adjunct command, __critcl::argtyperelease__\. This command specifies
+the code required to release dynamically allocated resources when the worker
+function returns, before the shim returns to the caller in Tcl\. To keep things
+simple our example is synthetic, a modification of __pstring__ above, to
+demonstrate the technique\. An actual, but more complex example is the code to
+support the variadic *args* argument of __critcl::cproc__\.
+
+    critcl::argtype pstring {
+        @A = (critcl_pstring*) ckalloc(sizeof(critcl_pstring));
+        @A->s = Tcl_GetStringFromObj(@@, &(@A->len));
+        @A->o = @@;
+    } critcl_pstring* critcl_pstring*
+
+    critcl::argtypesupport pstring {
+        typedef struct critcl_pstring {
+            Tcl_Obj*    o;
+            const char* s;
+            int         len;
+        } critcl_pstring;
+    }
+
+    critcl::argtyperelease pstring {
+        ckfree ((char*)) @A);
+    }
+
+Note, the above example shows only the most simple case of an allocated
+argument, with a conversion that cannot fail \(namely, string retrieval\)\. If the
+conversion can fail then either the allocation has to be defered to happen only
+on successful conversion, or the conversion code has to release the allocated
+memory itself in the failure path, because it will never reach the code defined
+via __critcl::argtyperelease__ in that case\.
+
+## <a name='subsection6'></a>Custom Types, Results
+
+All of the previous sections dealt with argument conversions, i\.e\. going from
+Tcl into C\. Custom result types are for the reverse direction, from C to Tcl\.
+This is usually easier, as most of the time errors should not be possible\.
+Supporting structures, or allocating them on the heap are not really required
+and therefore not supported\.
+
+The example of a result type shown below was pulled from __KineTcl__\. It is
+a variant of the builtin result type __Tcl\_Obj\*__, aka __object__\. The
+builtin conversion assumes that the object returned by the function has a
+refcount of 1 \(or higher\), with the function having held the reference, and
+releases that reference after placing the value into the interp result\. The
+conversion below on the other hand assumes that the value has a refcount of 0
+and thus that decrementing it is forbidden, lest it be released much to early,
+and crashing the system\.
+
+    critcl::resulttype KTcl_Obj* {
+        if (rv == NULL) { return TCL_ERROR; }
+        Tcl_SetObjResult(interp, rv);
+        /* No refcount adjustment */
+        return TCL_OK;
+    } Tcl_Obj*
+
+This type of definition is also found in __Marpa__ and recent hacking
+hacking on __CRIMP__ introduced it there as well\. Which is why this
+definition became a builtin type starting with version 3\.1\.16, under the names
+__Tcl\_Obj\*0__ and __object0__\.
+
+Going back to errors and their handling, of course, if a function we are
+wrapping signals them in\-band, then the conversion of such results has to deal
+with that\. This happens for example in __KineTcl__, where we find
+
+    critcl::resulttype XnStatus {
+        if (rv != XN_STATUS_OK) {
+            Tcl_AppendResult (interp, xnGetStatusString (rv), NULL);
+            return TCL_ERROR;
+        }
+        return TCL_OK;
+    }
+
+    critcl::resulttype XnDepthPixel {
+        if (rv == ((XnDepthPixel) -1)) {
+            Tcl_AppendResult (interp,
+                              "Inheritance error: Not a depth generator",
+                              NULL);
+            return TCL_ERROR;
+        }
+        Tcl_SetObjResult (interp, Tcl_NewIntObj (rv));
+        return TCL_OK;
+    }
+
+# <a name='section6'></a>Authors
+
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+# <a name='section7'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report them at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)\.
+Ideas for enhancements you may have for either package, application, and/or the
+documentation are also very welcome and should be reported at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)
+as well\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [calling C code from
+Tcl](\.\./index\.md\#calling\_c\_code\_from\_tcl), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; Jean\-Claude Wippler  
+Copyright &copy; Steve Landers  
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_cutil.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_cutil.md
new file mode 100644
index 00000000..63cc37e4
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_cutil.md
@@ -0,0 +1,470 @@
+
+[//000000001]: # (critcl::cutil \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_cutil\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000004]: # (critcl::cutil\(n\) 0\.3 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl::cutil \- CriTcl \- C\-level Utilities
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Synopsis](#synopsis)
+
+  - [Description](#section1)
+
+  - [API](#section2)
+
+  - [Allocation](#section3)
+
+  - [Assertions](#section4)
+
+  - [Tracing](#section5)
+
+  - [Authors](#section6)
+
+  - [Bugs, Ideas, Feedback](#section7)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='synopsis'></a>SYNOPSIS
+
+package require Tcl 8\.6  
+package require critcl ?3\.2?  
+package require critcl::cutil ?0\.3?  
+
+[__::critcl::cutil::alloc__](#1)  
+[__::critcl::cutil::assertions__ ?*enable*?](#2)  
+[__::critcl::cutil::tracer__ ?*enable*?](#3)  
+[__type\* ALLOC \(type\)__](#4)  
+[__type\* ALLOC\_PLUS \(type, int n\)__](#5)  
+[__type\* NALLOC \(type, int n\)__](#6)  
+[__type\* REALLOC \(type\* var, type, int n\)__](#7)  
+[__void FREE \(type\* var\)__](#8)  
+[__void STREP \(Tcl\_Obj\* o, char\* s, int len\)__](#9)  
+[__void STREP\_DS \(Tcl\_Obj\* o, Tcl\_DString\* ds\)__](#10)  
+[__void STRDUP \(varname, char\* str\)__](#11)  
+[__void ASSERT \(expression, char\* message__](#12)  
+[__void ASSERT\_BOUNDS \(int index, int size\)__](#13)  
+[__void STOPAFTER\(n\)__](#14)  
+[__TRACE\_ON__](#15)  
+[__TRACE\_OFF__](#16)  
+[__TRACE\_TAG\_ON  \(identifier\)__](#17)  
+[__TRACE\_TAG\_OFF \(identifier\)__](#18)  
+[__void TRACE\_FUNC__](#19)  
+[__void TRACE\_TAG\_FUNC \(tag\)__](#20)  
+[__void TRACE\_FUNC\_VOID__](#21)  
+[__void TRACE\_TAG\_FUNC\_VOID \(tag\)__](#22)  
+[__void TRACE\_RETURN\_VOID__](#23)  
+[__void TRACE\_TAG\_RETURN\_VOID \(tag\)__](#24)  
+[__any TRACE\_RETURN     \(     char\* format, any x\)__](#25)  
+[__any TRACE\_TAG\_RETURN \(tag, char\* format, any x\)__](#26)  
+[__void TRACE     \(     char\* format, \.\.\.\)__](#27)  
+[__void TRACE\_TAG \(tag, char\* format, \.\.\.\)__](#28)  
+[__void TRACE\_HEADER \(int indent\)__](#29)  
+[__void TRACE\_TAG\_HEADER \(tag, int indent\)__](#30)  
+[__void TRACE\_CLOSER__](#31)  
+[__void TRACE\_TAG\_CLOSER \(tag\)__](#32)  
+[__void TRACE\_ADD          \(const char\* format, \.\.\.\)__](#33)  
+[__void TRACE\_TAG\_ADD \(tag, const char\* format, \.\.\.\)__](#34)  
+[__void TRACE\_PUSH\_SCOPE \(const char\* name\)__](#35)  
+[__void TRACE\_PUSH\_FUNC__](#36)  
+[__void TRACE\_PUSH\_POP__](#37)  
+[__TRACE\_TAG\_VAR \(tag\)__](#38)  
+[__TRACE\_RUN \(code\);__](#39)  
+[__TRACE\_DO \(code\);__](#40)  
+[__TRACE\_TAG\_DO \(tag, code\);__](#41)  
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This document is the reference manpage for the __critcl::cutil__ package\.
+This package encapsulates a number of C\-level utilites for easier writing of
+memory allocations, assertions, and narrative tracing and provides convenience
+commands to make these utilities accessible to critcl projects\. Its intended
+audience are mainly developers wishing to write Tcl packages with embedded C
+code\.
+
+This package resides in the Core Package Layer of CriTcl\.
+
+![](\.\./image/arch\_core\.png) The reason for this is that the main
+__[critcl](critcl\.md)__ package makes use of the facilities for
+narrative tracing when __critcl::config trace__ is set, to instrument
+commands and procedures\.
+
+# <a name='section2'></a>API
+
+  - <a name='1'></a>__::critcl::cutil::alloc__
+
+    This command provides a number C\-preprocessor macros which make the writing
+    of memory allocations for structures and arrays of structures easier\.
+
+    When run the header file "critcl\_alloc\.h" is directly made available to the
+    "\.critcl" file containing the command, and becomes available for use in
+    __\#include__ directives of companion C code declared via
+    __critcl::csources__\.
+
+    The macros definitions and their signatures are:
+
+        type* ALLOC (type)
+        type* ALLOC_PLUS (type, int n)
+        type* NALLOC (type, int n)
+        type* REALLOC (type* var, type, int n)
+        void  FREE (type* var)
+
+        void STREP    (Tcl_Obj* o, char* s, int len);
+        void STREP_DS (Tcl_Obj* o, Tcl_DString* ds);
+        void STRDUP   (varname, char* str);
+
+    The details of the semantics are explained in section
+    [Allocation](#section3)\.
+
+    The result of the command is an empty string\.
+
+  - <a name='2'></a>__::critcl::cutil::assertions__ ?*enable*?
+
+    This command provides a number C\-preprocessor macros for the writing of
+    assertions in C code\.
+
+    When invoked the header file "critcl\_assert\.h" is directly made available to
+    the "\.critcl" file containing the command, and becomes available for use in
+    __\#include__ directives of companion C code declared via
+    __critcl::csources__\.
+
+    The macro definitions and their signatures are
+
+        void ASSERT (expression, char* message);
+        void ASSERT_BOUNDS (int index, int size);
+
+        void STOPAFTER (int n);
+
+    Note that these definitions are conditional on the existence of the macro
+    __CRITCL\_ASSERT__\. Without a __critcl::cflags \-DCRITCL\_ASSERT__ all
+    assertions in the C code are quiescent and not compiled into the object
+    file\. In other words, assertions can be \(de\)activated at will during build
+    time, as needed by the user\.
+
+    For convenience this is controlled by *enable*\. By default \(__false__\)
+    the facility available, but not active\. Using __true__ not only makes it
+    available, but activates it as well\.
+
+    The details of the semantics are explained in section
+    [Assertions](#section4)\.
+
+    The result of the command is an empty string\.
+
+  - <a name='3'></a>__::critcl::cutil::tracer__ ?*enable*?
+
+    This command provides a number C\-preprocessor macros for tracing C\-level
+    internals\.
+
+    When invoked the header file "critcl\_trace\.h" is directly made available to
+    the "\.critcl" file containing the command, and becomes available for use in
+    __\#include__ directives of companion C code declared via
+    __critcl::csources__\. Furthermore the "\.c" file containing the runtime
+    support is added to the set of C companion files
+
+    The macro definitions and their signatures are
+
+        /* (de)activation of named logical streams.
+         * These are declarators, not statements.
+         */
+
+        TRACE_ON;
+        TRACE_OFF;
+        TRACE_TAG_ON  (tag_identifier);
+        TRACE_TAG_OFF (tag_identifier);
+
+        /*
+         * Higher level trace statements (convenience commands)
+         */
+
+        void TRACE_FUNC   (const char* format, ...);
+        void TRACE_FUNC_VOID;
+        any  TRACE_RETURN (const char* format, any x);
+        void TRACE_RETURN_VOID;
+        void TRACE (const char* format, ...);
+
+        /*
+         * Low-level trace statements the higher level ones above
+         * are composed from. Scope management and output management.
+         */
+
+        void TRACE_PUSH_SCOPE (const char* scope);
+        void TRACE_PUSH_FUNC;
+        void TRACE_POP;
+
+        void TRACE_HEADER (int indent);
+        void TRACE_ADD (const char* format, ...);
+        void TRACE_CLOSER;
+
+        /*
+         * Convert tag to the underlying status variable.
+         */
+
+        TRACE_TAG_VAR (tag)
+
+        /*
+         * Conditional use of arbitrary code.
+         */
+
+        TRACE_RUN (code);
+        TRACE_DO (code);
+        TRACE_TAG_DO (code);
+
+    Note that these definitions are conditional on the existence of the macro
+    __CRITCL\_TRACER__\. Without a __critcl::cflags \-DCRITCL\_TRACER__ all
+    trace functionality in the C code is quiescent and not compiled into the
+    object file\. In other words, tracing can be \(de\)activated at will during
+    build time, as needed by the user\.
+
+    For convenience this is controlled by *enable*\. By default \(__false__\)
+    the facility available, but not active\. Using __true__ not only makes it
+    available, but activates it as well\. Further note that the command
+    __critcl::config__ now accepts a boolean option __trace__\. Setting
+    it activates enter/exit tracing in all commands based on
+    __critcl::cproc__, with proper printing of arguments and results\. This
+    implicitly activates the tracing facility in general\.
+
+    The details of the semantics are explained in section
+    [Tracing](#section5)
+
+    The result of the command is an empty string\.
+
+# <a name='section3'></a>Allocation
+
+  - <a name='4'></a>__type\* ALLOC \(type\)__
+
+    This macro allocates a single element of the given *type* and returns a
+    pointer to that memory\.
+
+  - <a name='5'></a>__type\* ALLOC\_PLUS \(type, int n\)__
+
+    This macro allocates a single element of the given *type*, plus an
+    additional *n* bytes after the structure and returns a pointer to that
+    memory\.
+
+    This is for variable\-sized structures of\. An example of such could be a
+    generic list element structure which stores management information in the
+    structure itself, and the value/payload immediately after, in the same
+    memory block\.
+
+  - <a name='6'></a>__type\* NALLOC \(type, int n\)__
+
+    This macro allocates *n* elements of the given *type* and returns a
+    pointer to that memory\.
+
+  - <a name='7'></a>__type\* REALLOC \(type\* var, type, int n\)__
+
+    This macro expands or shrinks the memory associated with the C variable
+    *var* of type *type* to hold *n* elements of the type\. It returns a
+    pointer to that memory\. Remember, a reallocation may move the data to a new
+    location in memory to satisfy the request\. Returning a pointer instead of
+    immediately assigning it to the *var* allows the user to validate the new
+    pointer before trying to use it\.
+
+  - <a name='8'></a>__void FREE \(type\* var\)__
+
+    This macro releases the memory referenced by the pointer variable *var*\.
+
+  - <a name='9'></a>__void STREP \(Tcl\_Obj\* o, char\* s, int len\)__
+
+    This macro properly sets the string representation of the Tcl object *o*
+    to a copy of the string *s*, expected to be of length *len*\.
+
+  - <a name='10'></a>__void STREP\_DS \(Tcl\_Obj\* o, Tcl\_DString\* ds\)__
+
+    This macro properly sets the string representation of the Tcl object *o*
+    to a copy of the string held by the __DString__ *ds*\.
+
+  - <a name='11'></a>__void STRDUP \(varname, char\* str\)__
+
+    This macro duplicates the string *str* into the heap and stores the result
+    into the named __char\*__ variable *var*\.
+
+# <a name='section4'></a>Assertions
+
+  - <a name='12'></a>__void ASSERT \(expression, char\* message__
+
+    This macro tests the *expression* and panics if it does not hold\. The
+    specified *message* is used as part of the panic\. The *message* has to
+    be a static string, it cannot be a variable\.
+
+  - <a name='13'></a>__void ASSERT\_BOUNDS \(int index, int size\)__
+
+    This macro ensures that the *index* is in the range __0__ to
+    __size\-1__\.
+
+  - <a name='14'></a>__void STOPAFTER\(n\)__
+
+    This macro throws a panic after it is called *n* times\. Note, each
+    separate instance of the macro has its own counter\.
+
+# <a name='section5'></a>Tracing
+
+All output is printed to __stdout__\.
+
+  - <a name='15'></a>__TRACE\_ON__
+
+  - <a name='16'></a>__TRACE\_OFF__
+
+  - <a name='17'></a>__TRACE\_TAG\_ON  \(identifier\)__
+
+  - <a name='18'></a>__TRACE\_TAG\_OFF \(identifier\)__
+
+    These "commands" are actually declarators, for use outside of functions\.
+    They \(de\)activate specific logical streams, named either explicitly by the
+    user, or implicitly, refering to the current file\.
+
+    For example:
+
+        TRACE_TAG_ON (lexer_in);
+
+    All high\- and low\-level trace commands producing output have the controlling
+    tag as an implicit argument\. The scope management commands do not take tags\.
+
+  - <a name='19'></a>__void TRACE\_FUNC__
+
+  - <a name='20'></a>__void TRACE\_TAG\_FUNC \(tag\)__
+
+  - <a name='21'></a>__void TRACE\_FUNC\_VOID__
+
+  - <a name='22'></a>__void TRACE\_TAG\_FUNC\_VOID \(tag\)__
+
+    Use these macros at the beginning of a C function to record entry into it\.
+    The name of the entered function is an implicit argument \(__\_\_func\_\___\),
+    forcing users to have a C99 compiler\.\.
+
+    The tracer's runtime maintains a stack of active functions and expects that
+    function return is signaled by either __TRACE\_RETURN__,
+    __TRACE\_RETURN\_VOID__, or the equivalent forms taking a tag\.
+
+  - <a name='23'></a>__void TRACE\_RETURN\_VOID__
+
+  - <a name='24'></a>__void TRACE\_TAG\_RETURN\_VOID \(tag\)__
+
+    Use these macros instead of
+
+        return
+
+    to return from a void function\. Beyond returning from the function this also
+    signals the same to the tracer's runtime, popping the last entered function
+    from its stack of active functions\.
+
+  - <a name='25'></a>__any TRACE\_RETURN     \(     char\* format, any x\)__
+
+  - <a name='26'></a>__any TRACE\_TAG\_RETURN \(tag, char\* format, any x\)__
+
+    Use this macro instead of
+
+        return x
+
+    to return from a non\-void function\. Beyond returning from the function with
+    value *x* this also signals the same to the tracer's runtime, popping the
+    last entered function from its stack of active functions\. The *format* is
+    expected to be a proper formatting string for __printf__ and analogues,
+    able to stringify *x*\.
+
+  - <a name='27'></a>__void TRACE     \(     char\* format, \.\.\.\)__
+
+  - <a name='28'></a>__void TRACE\_TAG \(tag, char\* format, \.\.\.\)__
+
+    This macro is the trace facilities' equivalent of __printf__, printing
+    arbitrary data under the control of the *format*\.
+
+    The printed text is closed with a newline, and indented as per the stack of
+    active functions\.
+
+  - <a name='29'></a>__void TRACE\_HEADER \(int indent\)__
+
+  - <a name='30'></a>__void TRACE\_TAG\_HEADER \(tag, int indent\)__
+
+    This is the low\-level macro which prints the beginning of a trace line\. This
+    prefix consists of physical location \(file name and line number\), if
+    available, indentation as per the stack of active scopes \(if activated\), and
+    the name of the active scope\.
+
+  - <a name='31'></a>__void TRACE\_CLOSER__
+
+  - <a name='32'></a>__void TRACE\_TAG\_CLOSER \(tag\)__
+
+    This is the low\-level macro which prints the end of a trace line\.
+
+  - <a name='33'></a>__void TRACE\_ADD          \(const char\* format, \.\.\.\)__
+
+  - <a name='34'></a>__void TRACE\_TAG\_ADD \(tag, const char\* format, \.\.\.\)__
+
+    This is the low\-level macro which adds formatted data to the line\.
+
+  - <a name='35'></a>__void TRACE\_PUSH\_SCOPE \(const char\* name\)__
+
+  - <a name='36'></a>__void TRACE\_PUSH\_FUNC__
+
+  - <a name='37'></a>__void TRACE\_PUSH\_POP__
+
+    These are the low\-level macros for scope management\. The first two forms
+    push a new scope on the stack of active scopes, and the last forms pops the
+    last scope pushed\.
+
+  - <a name='38'></a>__TRACE\_TAG\_VAR \(tag\)__
+
+    Helper macro converting from a tag identifier to the name of the underlying
+    status variable\.
+
+  - <a name='39'></a>__TRACE\_RUN \(code\);__
+
+    Conditionally insert the *code* at compile time when the tracing facility
+    is activated\.
+
+  - <a name='40'></a>__TRACE\_DO \(code\);__
+
+  - <a name='41'></a>__TRACE\_TAG\_DO \(tag, code\);__
+
+    Insert the *code* at compile time when the tracing facility is activated,
+    and execute the same when either the implicit tag for the file or the
+    user\-specified tag is active\.
+
+# <a name='section6'></a>Authors
+
+Andreas Kupries
+
+# <a name='section7'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report such at
+[https://github\.com/andreas\-kupries/critcl](https://github\.com/andreas\-kupries/critcl)\.
+Please also report any ideas for enhancements you may have for either package
+and/or documentation\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_devguide.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_devguide.md
new file mode 100644
index 00000000..b3dd7324
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_devguide.md
@@ -0,0 +1,347 @@
+
+[//000000001]: # (critcl\_devguide \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_devguide\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; Jean\-Claude Wippler)
+[//000000004]: # (Copyright &copy; Steve Landers)
+[//000000005]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000006]: # (critcl\_devguide\(n\) 3\.2\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl\_devguide \- Guide To The CriTcl Internals
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Description](#section1)
+
+  - [Audience](#section2)
+
+  - [Playing with CriTcl](#section3)
+
+  - [Developing for CriTcl](#section4)
+
+      - [Architecture & Concepts](#subsection1)
+
+      - [Requirements](#subsection2)
+
+      - [Directory structure](#subsection3)
+
+  - [Authors](#section5)
+
+  - [Bugs, Ideas, Feedback](#section6)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+# <a name='section2'></a>Audience
+
+This document is a guide for developers working on CriTcl, i\.e\. maintainers
+fixing bugs, extending the package's functionality, etc\.
+
+Please read
+
+  1. *CriTcl \- License*,
+
+  1. *CriTcl \- How To Get The Sources*, and
+
+  1. *CriTcl \- The Installer's Guide*
+
+first, if that was not done already\.
+
+Here we assume that the sources are already available in a directory of the
+readers choice, and that the reader not only know how to build and install them,
+but also has all the necessary requisites to actually do so\. The guide to the
+sources in particular also explains which source code management system is used,
+where to find it, how to set it up, etc\.
+
+# <a name='section3'></a>Playing with CriTcl
+
+*Note* that the sources of CriTcl, should the reader have gotten them, also
+contain several examples show\-casing various aspects of the system\. These
+demonstration packages can all be found in the sub\-directory "examples/" of the
+sources\.
+
+Lots of smaller examples can be found in the document *Using CriTcl*, an
+introduction to CriTcl by way of a of examples\. These focus more on specific
+critcl commands than the overall picture shown by the large examples mentioned
+in the previous paragraph\.
+
+# <a name='section4'></a>Developing for CriTcl
+
+## <a name='subsection1'></a>Architecture & Concepts
+
+The system consists of two main layers, as seen in the figure below, plus a
+support layer containing general packages the system uses during operation\.
+
+![](\.\./image/architecture\.png)
+
+  1. At the top we have an application built on top of the core packages,
+     providing command line access to the second and third usage modes, i\.e\.
+     *[Generate Package](\.\./index\.md\#generate\_package)* and *Generate TEA
+     Package*\.
+
+       - __[critcl](critcl\.md)__
+
+       - __critcl::app__
+
+  1. Below that is the core package providing the essential functionality of the
+     system, plus various utility packages which make common tasks more
+     convenient\.
+
+       - __[critcl](critcl\.md)__
+
+       - __[critcl::util](critcl\_util\.md)__
+
+  1. Lastly a layer of supporting packages, mostly external to critcl\.
+
+       - __md5__
+
+         For this pure\-Tcl package to be fast users should get one of several
+         possible accelerator packages:
+
+           1) __tcllibc__
+
+           1) __Trf__
+
+           1) __md5c__
+
+       - __cmdline__
+
+       - __platform__
+
+       - __stubs::container__
+
+       - __stubs::reader__
+
+       - __stubs::writer__
+
+       - __stubs::gen__
+
+       - __stubs::gen::init__
+
+       - __stubs::gen::header__
+
+       - __stubs::gen::decl__
+
+       - __stubs::gen::macro__
+
+       - __stubs::gen::slot__
+
+       - __stubs::gen::lib__
+
+## <a name='subsection2'></a>Requirements
+
+To develop for critcl the following packages and applications must be available
+in the environment\. These are all used by the __build\.tcl__ helper
+application\.
+
+  - __dtplite__
+
+    A Tcl application provided by Tcllib, for the validation and conversion of
+    *doctools*\-formatted text\.
+
+  - __dia__
+
+    A Tcl application provided by Tklib, for the validation and conversion of
+    __diagram__\-formatted figures into raster images\.
+
+    Do not confuse this with the Gnome __dia__ application, which is a
+    graphical editor for figures and diagrams, and completely unrelated\.
+
+  - __fileutil__
+
+    A Tcl package provided by Tcllib, providing file system utilities\.
+
+  - __vfs::mk4__, __vfs__
+
+    Tcl packages written in C providing access to Tcl's VFS facilities, required
+    for the generation of critcl starkits and starpacks\.
+
+## <a name='subsection3'></a>Directory structure
+
+  - Helpers
+
+      * "build\.tcl"
+
+        This helper application provides various operations needed by a
+        developer for critcl, like regenerating the documentation, the figures,
+        building and installing critcl, etc\.
+
+        Running the command like
+
+            ./build.tcl help
+
+        will provide more details about the available operations and their
+        arguments\.
+
+  - Documentation
+
+      * "doc/"
+
+        This directory contains the documentation sources, for both the text,
+        and the figures\. The texts are written in *doctools* format, whereas
+        the figures are written for tklib's __dia__\(gram\) package and
+        application\.
+
+      * "embedded/"
+
+        This directory contains the documentation converted to regular manpages
+        \(nroff\) and HTML\. It is called embedded because these files, while
+        derived, are part of the git repository, i\.e\. embedded into it\. This
+        enables us to place these files where they are visible when serving the
+        prject's web interface\.
+
+  - Testsuite
+
+      * "test/all\.tcl"
+
+      * "test/testutilities\.tcl"
+
+      * "test/\*\.test"
+
+        These files are a standard testsuite based on Tcl's __tcltest__
+        package, with some utility code snarfed from __Tcllib__\.
+
+        This currently tests only some of the __stubs::\*__ packages\.
+
+      * "test/\*\.tcl"
+
+        These files \(except for "all\.tcl" and "testutilities\.tcl"\) are example
+        files \(Tcl with embedded C\) which can be run through critcl for testing\.
+
+        *TODO* for a maintainers: These should be converted into a proper test
+        suite\.
+
+  - Package Code, General structure
+
+  - Package Code, Per Package
+
+      * __[critcl](critcl\.md)__
+
+          + "lib/critcl/critcl\.tcl"
+
+            The Tcl code implementing the package\.
+
+          + "lib/critcl/Config"
+
+            The configuration file for the standard targets and their settings\.
+
+          + "lib/critcl/critcl\_c/"
+
+            Various C code snippets used by the package\. This directory also
+            contains the copies of the Tcl header files used to compile the
+            assembled C code, for the major brnaches of Tcl, i\.e\. 8\.4, 8\.5, and
+            8\.6\.
+
+      * __[critcl::util](critcl\_util\.md)__
+
+          + "lib/critcl\-util/util\.tcl"
+
+            The Tcl code implementing the package\.
+
+      * __critcl::app__
+
+          + "lib/app\-critcl/critcl\.tcl"
+
+            The Tcl code implementing the package\.
+
+      * __[critcl::iassoc](critcl\_iassoc\.md)__
+
+          + "lib/critcl\-iassoc/iassoc\.tcl"
+
+            The Tcl code implementing the package\.
+
+          + "lib/critcl\-iassoc/iassoc\.h"
+
+            C code template used by the package\.
+
+      * __[critcl::class](critcl\_class\.md)__
+
+          + "lib/critcl\-class/class\.tcl"
+
+            The Tcl code implementing the package\.
+
+          + "lib/critcl\-class/class\.h"
+
+            C code template used by the package\.
+
+      * __stubs::\*__
+
+          + "lib/stubs/\*"
+
+            A set of non\-public \(still\) packages which provide read and write
+            access to and represent Tcl stubs tables\. These were created by
+            taking the "genStubs\.tcl" helper application coming with the Tcl
+            core sources apart along its internal logical lines\.
+
+      * __critclf__
+
+          + "lib/critclf/"
+
+            Arjen Markus' work on a critcl/Fortran\. The code is outdated and has
+            not been adapted to the changes in critcl version 3 yet\.
+
+      * __md5__
+
+      * __md5c__
+
+      * __platform__
+
+        These are all external packages whose code has been inlined in the
+        repository for easier development \(less dependencies to pull\), and
+        quicker deployment from the repository \(generation of starkit and
+        \-pack\)\.
+
+        *TODO* for maintainers: These should all be checked against their
+        origin for updates and changes since they were inlined\.
+
+# <a name='section5'></a>Authors
+
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+# <a name='section6'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report them at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)\.
+Ideas for enhancements you may have for either package, application, and/or the
+documentation are also very welcome and should be reported at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)
+as well\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [calling C code from
+Tcl](\.\./index\.md\#calling\_c\_code\_from\_tcl), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; Jean\-Claude Wippler  
+Copyright &copy; Steve Landers  
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_emap.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_emap.md
new file mode 100644
index 00000000..31f52371
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_emap.md
@@ -0,0 +1,226 @@
+
+[//000000001]: # (critcl::emap \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_emap\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000004]: # (critcl::emap\(n\) 1\.3 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl::emap \- CriTcl \- Wrap Support \- Enum en\- and decoding
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Synopsis](#synopsis)
+
+  - [Description](#section1)
+
+  - [API](#section2)
+
+  - [Example](#section3)
+
+  - [Authors](#section4)
+
+  - [Bugs, Ideas, Feedback](#section5)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='synopsis'></a>SYNOPSIS
+
+package require Tcl 8\.6  
+package require critcl ?3\.2?  
+package require critcl::emap ?1\.3?  
+
+[__::critcl::emap::def__ *name* *definition* ?__\-nocase__? ?__\-mode__ *mode*?](#1)  
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This document is the reference manpage for the __critcl::emap__ package\.
+This package provides convenience commands for advanced functionality built on
+top of both critcl core and package
+__[critcl::iassoc](critcl\_iassoc\.md)__\.
+
+C level libraries often use enumerations or integer values to encode
+information, like the state of a system\. Tcl bindings to such libraries now have
+the task of converting a Tcl representation, i\.e\. a string into such state, and
+back\. *Note* here that the C\-level information has to be something which
+already exists\. The package does *not* create these values\. This is in
+contrast to the package __[critcl::enum](critcl\_enum\.md)__ which creates
+an enumeration based on the specified symbolic names\.
+
+This package was written to make the declaration and management of such
+enumerations and their associated conversions functions easy, hiding all
+attendant complexity from the user\.
+
+Its intended audience are mainly developers wishing to write Tcl packages with
+embedded C code\.
+
+This package resides in the Core Package Layer of CriTcl\.
+
+![](\.\./image/arch\_core\.png)
+
+# <a name='section2'></a>API
+
+  - <a name='1'></a>__::critcl::emap::def__ *name* *definition* ?__\-nocase__? ?__\-mode__ *mode*?
+
+    This command defines C functions for the conversion of the *name*d state
+    code into a Tcl string, and vice versa\. The underlying mapping tables are
+    automatically initialized on first access \(if not fully constant\), and
+    finalized on interpreter destruction\.
+
+    The *definition* dictionary provides the mapping from the Tcl\-level
+    symbolic names of the state to their C expressions \(often the name of the
+    macro specifying the actual value\)\. *Note* here that the C\-level
+    information has to be something which already exists\. The package does
+    *not* create these values\. This is in contrast to the package
+    __[critcl::enum](critcl\_enum\.md)__ which creates an enumeration
+    based on the specified symbolic names\.
+
+    Further note that multiple strings can be mapped to the same C expression\.
+    When converting to Tcl the first string for the mapping is returned\. An
+    important thing to know: If all C expressions are recognizable as integer
+    numbers and their covered range is not too large \(at most 50\) the package
+    will generate code using direct and fast mapping tables instead of using a
+    linear search\.
+
+    If the option __\-nocase__ is specified then the encoder will match
+    strings case\-insensitively, and the decoder will always return a lower\-case
+    string, regardless of the string's case in the *definition*\.
+
+    If the option __\-mode__ is specified its contents will interpreted as a
+    list of access modes to support\. The two allowed modes are __c__ and
+    __tcl__\. Both modes can be used together\. The default mode is
+    __tcl__\.
+
+    The package generates multiple things \(declarations and definitions\) with
+    names derived from *name*, which has to be a proper C identifier\. Some of
+    the things are generated conditional on the chosen *mode*s\.
+
+      * *name*\_encode
+
+        The __tcl__\-mode function for encoding a Tcl string into the
+        equivalent state code\. Its signature is
+
+        > int *name*\_encode \(Tcl\_Interp\* interp, Tcl\_Obj\* state, int\* result\);
+
+        The return value of the function is a Tcl error code, i\.e\.
+        __TCL\_OK__, __TCL\_ERROR__, etc\.
+
+      * *name*\_encode\_cstr
+
+        The __c__\-mode function for encoding a C string into the equivalent
+        state code\. Its signature is
+
+        > int *name*\_encode\_cstr \(const char\* state\);
+
+        The return value of the function is the encoded state, or \-1 if the
+        argument is not a vlaid state\.
+
+      * *name*\_decode
+
+        The __tcl__\-mode function for decoding a state code into the
+        equivalent Tcl string\. Its signature is
+
+        > Tcl\_Obj\* *name*\_decode \(Tcl\_Interp\* interp, int state\);
+
+      * *name*\_decode\_cstr
+
+        The __c__\-mode function for decoding a state code into the
+        equivalent C string\. Its signature is
+
+        > const char\* *name*\_decode\_cstr \(int state\);
+
+        The return value of the function is the C string for the state, or
+        __NULL__ if the *state* argument does not contain a valid state
+        value\.
+
+      * *name*\.h
+
+        A header file containing the declarations for the conversion functions,
+        for use by other parts of the system, if necessary\.
+
+        The generated file is stored in a place where it will not interfere with
+        the overall system outside of the package, yet also be available for
+        easy inclusion by package files \(__csources__\)\.
+
+      * *name*
+
+        For mode __tcl__ the command registers a new argument\-type for
+        __critcl::cproc__ with critcl, encapsulating the encoder function\.
+
+      * *name*
+
+        For mode __tcl__ the command registers a new result\-type for
+        __critcl::cproc__ with critcl, encapsulating the decoder function\.
+
+# <a name='section3'></a>Example
+
+The example shown below is the specification for the possible modes of entry
+\(normal, no feedback, stars\) used by the Tcl binding to the linenoise library\.
+
+    package require Tcl 8.6
+    package require critcl 3.2
+
+    critcl::buildrequirement {
+        package require critcl::emap
+    }
+
+    critcl::emap::def hiddenmode {
+                no  0 n 0 off 0 false 0 0 0
+        all   1 yes 1 y 1 on  1 true  1 1 1
+        stars 2
+    } -nocase
+
+    # Declarations: hiddenmode.h
+    # Encoder:      int      hiddenmode_encode (Tcl_Interp* interp, Tcl_Obj* state, int* result);
+    # Decoder:      Tcl_Obj* hiddenmode_decode (Tcl_Interp* interp, int state);
+    # ResultType:   hiddenmode
+    # ArgumentType: hiddenmode
+
+# <a name='section4'></a>Authors
+
+Andreas Kupries
+
+# <a name='section5'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report such at
+[https://github\.com/andreas\-kupries/critcl](https://github\.com/andreas\-kupries/critcl)\.
+Please also report any ideas for enhancements you may have for either package
+and/or documentation\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [Tcl Interp
+Association](\.\./index\.md\#tcl\_interp\_association),
+[bitmask](\.\./index\.md\#bitmask), [bitset](\.\./index\.md\#bitset), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation),
+[flags](\.\./index\.md\#flags), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation),
+[singleton](\.\./index\.md\#singleton)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_enum.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_enum.md
new file mode 100644
index 00000000..ee549710
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_enum.md
@@ -0,0 +1,223 @@
+
+[//000000001]: # (critcl::enum \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_enum\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000004]: # (critcl::enum\(n\) 1\.2 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl::enum \- CriTcl \- Wrap Support \- String/Integer mapping
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Synopsis](#synopsis)
+
+  - [Description](#section1)
+
+  - [API](#section2)
+
+  - [Example](#section3)
+
+  - [Authors](#section4)
+
+  - [Bugs, Ideas, Feedback](#section5)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='synopsis'></a>SYNOPSIS
+
+package require Tcl 8\.6  
+package require critcl ?3\.2?  
+package require critcl::enum ?1\.2?  
+
+[__::critcl::enum::def__ *name* *definition* ?*mode*?](#1)  
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This document is the reference manpage for the __critcl::enum__ package\.
+This package provides convenience commands for advanced functionality built on
+top of both critcl core and package
+__[critcl::literals](critcl\_literals\.md)__\.
+
+It is an extended form of string pool which not only converts integer values
+into Tcl\-level strings, but also handles the reverse direction, converting from
+strings to the associated integer values\.
+
+It essentially provides a bi\-directional mapping between a C enumeration type
+and a set of strings, one per enumeration value\. *Note* that the C enumeration
+in question is created by the definition\. It is not possible to use the symbols
+of an existing enumeration type\.
+
+This package was written to make the declaration and management of such mappings
+easy\. It uses a string pool for one of the directions, using its ability to
+return shared literals and conserve memory\.
+
+Its intended audience are mainly developers wishing to write Tcl packages with
+embedded C code\.
+
+This package resides in the Core Package Layer of CriTcl\.
+
+![](\.\./image/arch\_core\.png)
+
+# <a name='section2'></a>API
+
+  - <a name='1'></a>__::critcl::enum::def__ *name* *definition* ?*mode*?
+
+    This command defines two C functions for the conversion between C values and
+    Tcl\_Obj'ects, with named derived from *name*\.
+
+    The *definition* dictionary provides the mapping from the specified
+    C\-level symbolic names to the strings themselves\.
+
+    The *mode*\-list configures the output somewhat\. The two allowed modes are
+    __\+list__ and __tcl__\. All modes can be used together\. The default
+    mode is __tcl__\. Using mode __\+list__ implies __tcl__ as well\.
+
+    For mode __tcl__ the new function has two arguments, a
+    __Tcl\_Interp\*__ pointer refering to the interpreter holding the string
+    pool, and a code of type "*name*\_pool\_names" \(see below\), the symbolic
+    name of the string to return\. The result of the function is a
+    __Tcl\_Obj\*__ pointer to the requested string constant\.
+
+    For mode __\+list__ all of __tcl__ applies, plus an additional
+    function is generated which takes three arguments, in order: a
+    __Tcl\_Interp\*__ pointer refering to the interpreter holding the string
+    pool, an __int__ holding the size of the last argument, and an array of
+    type "*name*\_pool\_names" holding the codes \(see below\), the symbolic names
+    of the strings to return\. The result of the function is a __Tcl\_Obj\*__
+    pointer to a Tcl list holding the requested string constants\.
+
+    The underlying string pool is automatically initialized on first access, and
+    finalized on interpreter destruction\.
+
+    The package generates multiple things \(declarations and definitions\) with
+    names derived from *name*, which has to be a proper C identifier\.
+
+      * *name*\_pool\_names
+
+        The C enumeration type containing the specified symbolic names\.
+
+      * *name*\_ToObj
+
+        The function converting from integer value to Tcl string\. Its signature
+        is
+
+        > Tcl\_Obj\* *name*\_ToObj \(Tcl\_Interp\* interp, *name*\_names literal\);
+
+      * *name*\_ToObjList
+
+        The mode __\+list__ function converting from integer array to Tcl
+        list of strings\. Its signature is
+
+        > Tcl\_Obj\* *name*\_ToObjList \(Tcl\_Interp\* interp, int c, *name*\_names\* literal\);
+
+      * *name*\_GetFromObj
+
+        The function converting from Tcl string to integer value\. Its signature
+        is
+
+        > int *name*\_GetFromObj \(Tcl\_Interp\* interp, Tcl\_Obj\* obj, int flags, int\* literal\);
+
+        The *flags* are like for __Tcl\_GetIndexFromObj__\.
+
+      * *name*\.h
+
+        A header file containing the declarations for the converter functions,
+        for use by other parts of the system, if necessary\.
+
+        The generated file is stored in a place where it will not interfere with
+        the overall system outside of the package, yet also be available for
+        easy inclusion by package files \(__csources__\)\.
+
+      * *name*
+
+        At the level of critcl itself the command registers a new result\-type
+        for __critcl::cproc__, which takes an integer result from the
+        function and converts it to the equivalent string in the pool for the
+        script\.
+
+      * *name*
+
+        At the level of critcl itself the command registers a new argument\-type
+        for __critcl::cproc__, which takes a Tcl string and converts it to
+        the equivalent integer for delivery to the function\.
+
+# <a name='section3'></a>Example
+
+The example shown below is the specification for a set of actions, methods, and
+the like, a function may take as argument\.
+
+    package require Tcl 8.6
+    package require critcl 3.2
+
+    critcl::buildrequirement {
+        package require critcl::enum
+    }
+
+    critcl::enum::def action {
+        w_create	"create"
+        w_directory	"directory"
+        w_events	"events"
+        w_file	"file"
+        w_handler	"handler"
+        w_remove	"remove"
+    }
+
+    # Declarations: action.h
+    # Type:         action_names
+    # Accessor:     Tcl_Obj* action_ToObj (Tcl_Interp* interp, int literal);
+    # Accessor:     int action_GetFromObj (Tcl_Interp* interp, Tcl_Obj* o, int flags, int* literal);
+    # ResultType:   action
+    # ArgType:      action
+
+# <a name='section4'></a>Authors
+
+Andreas Kupries
+
+# <a name='section5'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report such at
+[https://github\.com/andreas\-kupries/critcl](https://github\.com/andreas\-kupries/critcl)\.
+Please also report any ideas for enhancements you may have for either package
+and/or documentation\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [Tcl Interp
+Association](\.\./index\.md\#tcl\_interp\_association), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[conversion](\.\./index\.md\#conversion), [dynamic code
+generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [int to string
+mapping](\.\./index\.md\#int\_to\_string\_mapping),
+[linker](\.\./index\.md\#linker), [literal pool](\.\./index\.md\#literal\_pool),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation),
+[singleton](\.\./index\.md\#singleton), [string
+pool](\.\./index\.md\#string\_pool), [string to int
+mapping](\.\./index\.md\#string\_to\_int\_mapping)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_howto_install.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_howto_install.md
new file mode 100644
index 00000000..a027c637
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_howto_install.md
@@ -0,0 +1,359 @@
+
+[//000000001]: # (critcl\_howto\_install \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_howto\_install\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; Jean\-Claude Wippler)
+[//000000004]: # (Copyright &copy; Steve Landers)
+[//000000005]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000006]: # (critcl\_howto\_install\(n\) 3\.2\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl\_howto\_install \- How To Install CriTcl
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Description](#section1)
+
+  - [Install The Requisites](#section2)
+
+      - [Install A Working C Compiler](#subsection1)
+
+      - [Install A Working Tcl Shell](#subsection2)
+
+      - [Install Supporting Tcl Packages](#subsection3)
+
+  - [Install The CriTcl Packages](#section3)
+
+      - [Install On Unix](#subsection4)
+
+      - [Install On Windows](#subsection5)
+
+  - [Test The Installation](#section4)
+
+  - [Authors](#section5)
+
+  - [Bugs, Ideas, Feedback](#section6)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+*[CriTcl](critcl\.md)* is installed in four major steps:
+
+  1. [Install The Requisites](#section2)
+
+  1. Follow the instructions on *[How To Get The CriTcl
+     Sources](critcl\_howto\_sources\.md)*
+
+  1. [Install The CriTcl Packages](#section3)
+
+  1. [Test The Installation](#section4)
+
+It is now possible to follow the instructions on *[How To Use
+CriTcl](critcl\_howto\_use\.md)*\.
+
+# <a name='section2'></a>Install The Requisites
+
+This major step breaks down into three minor steps:
+
+  1. [Install A Working C Compiler](#subsection1) and development
+     environment\.
+
+  1. [Install A Working Tcl Shell](#subsection2)
+
+  1. [Install Supporting Tcl Packages](#subsection3)
+
+## <a name='subsection1'></a>Install A Working C Compiler
+
+While *[CriTcl](critcl\.md)* requires a working C compiler to both install
+itself, and to process *[CriTcl](critcl\.md)*\-based packages installing
+such is very much out of scope for this document\.
+
+Please follow the instructions for the platform and system
+*[CriTcl](critcl\.md)* is to be installed on\.
+
+The important pieces of information are this:
+
+  1. The path to the directory containing the C compiler binary has to be listed
+     in the environment variable __PATH__, for *[CriTcl](critcl\.md)*
+     to find it\.
+
+  1. On Windows\(tm\) the environment variable __LIB__ has to be present and
+     contain the paths of the directories holding Microsoft's libraries\. The
+     standard *[CriTcl](critcl\.md)* configuration for this platform
+     searches these paths to fine\-tune its settings based on available libraries
+     and compiler version\.
+
+Links of interest:
+
+  - [http://www\.tldp\.org/HOWTO/HOWTO\-INDEX/programming\.html](http://www\.tldp\.org/HOWTO/HOWTO\-INDEX/programming\.html)
+
+## <a name='subsection2'></a>Install A Working Tcl Shell
+
+That a working installation of *[CriTcl](critcl\.md)* will require a
+working installation of [Tcl](http://core\.tcl\-lang\.org/tcl) should be
+obvious\.
+
+Installing Tcl however is out of scope here, same as for installing a working C
+compiler\.
+
+There are too many options, starting from [building it from
+scratch](http://core\.tcl\-lang\.org/tcl), installing what is provided by the
+platform's package manager \([zypper](https://en\.opensuse\.org/Portal:Zypper),
+[yum](https://access\.redhat\.com/solutions/9934),
+[apt\-get](https://help\.ubuntu\.com/community/AptGet/Howto), and more\), to
+using some vendor's [distribution](https://core\.tcl\-lang\.org/dist\.html)\.
+
+A single piece of advice however\.
+
+While *[CriTcl](critcl\.md)* currently supports running on Tcl 8\.4 and
+higher, and the creation of packages for the same, the last release for this
+version was in 2013 \(9 years ago at the time of writing\)\. Similarly, the last
+release for Tcl 8\.5 was in 2016 \(6 years ago\)\. Both are official end of life\.
+
+Given this I recommend to install and use Tcl 8\.6\.
+
+## <a name='subsection3'></a>Install Supporting Tcl Packages
+
+The implementation of *[CriTcl](critcl\.md)* uses and depends on
+
+  1. __cmdline__
+
+Depending on how Tcl was installed this package may be available already without
+action, or not\. Invoke the command
+
+    echo 'puts [package require cmdline]' | tclsh
+
+to check if the package is present or not\. If it is present then its version
+number will be printed, else the error message __can't find package
+cmdline__ or similar\.
+
+If it is not present install the package as per the instructions for the chosen
+Tcl installation\.
+
+*Note*, the package __cmdline__ may not exist as its own installable
+package\. In such a case check if the chosen Tcl installation provides a
+__tcllib__ package and install that\. This should install all the packages in
+the Tcllib bundle, including __cmdline__\.
+
+As a last fallback, go to [Tclib](http://core\.tcl\-lang\.org/tcllib) and
+follow the instructions to install the bundle from scratch\.
+
+# <a name='section3'></a>Install The CriTcl Packages
+
+Note that this step has different instructions dependent on the platform
+*[CriTcl](critcl\.md)* is to be installed on\. In other words, only one of
+the sub sections applies, the other can be ignored\.
+
+## <a name='subsection4'></a>Install On Unix
+
+This section offers instructions for installing *[CriTcl](critcl\.md)* on
+various kinds of Unix and Unix\-related systems, i\.e\. *Linux*, the various
+*BSD*s, etc\. It especially covers *Mac OS X* as well\.
+
+Use the instructions in section [Install On Windows](#subsection5) when
+installing on a Windows platform and not using a unix\-like environment as
+provided by tools like [MinGW](https://www\.mingw\-w64\.org),
+[CygWin](https://www\.cygwin\.com/), [Git For
+Windows](https://gitforwindows\.org),
+[WSL](https://docs\.microsoft\.com/en\-us/windows/wsl/faq), etc\.
+
+  1. Change the working directory to the top level directory of the
+     *[CriTcl](critcl\.md)* checkout obtained by following the instructions
+     of *[How To Get The CriTcl Sources](critcl\_howto\_sources\.md)*\.
+
+  1. Verify that the file "build\.tcl" is marked executable\. Make it executable
+     if it is not\.
+
+  1. Invoke
+
+    ./build.tcl install
+
+     to perform the installation\.
+
+     *Attention* This command uses default locations for the placement of the
+     __[critcl](critcl\.md)__ application, the various packages, and
+     header files\.
+
+  1. Invoke
+
+    ./build.tcl dirs
+
+     to see the chosens paths before actually performing the installation\.
+
+  1. Use the options listed below to change the paths used for installation as
+     desired\. This is the same method as with __configure__ based packages\.
+
+       - __\-\-prefix__ *path*
+
+         Base path for non\-package files\.
+
+       - __\-\-include\-dir__ *path*
+
+         Destination path for header files\.
+
+       - __\-\-exec\-prefix__ *path*
+
+         Base path for applications and packages\.
+
+       - __\-\-bin\-dir__ *path*
+
+         Destination path for applications\.
+
+       - __\-\-lib\-dir__ *path*
+
+         Destination path for packages\.
+
+     These options are especially necessary in all environments not using the
+     semi\-standard "bin", "lib", "include" locations from __configure__\.
+
+     As an example of such environments, Ubuntu \(and possibly Debian\) expect Tcl
+     packages to be installed into the "/usr/share/tcltk" directory, therefore
+     requiring the use of
+
+    --lib-dir /usr/share/tcltk
+
+     for proper installation\.
+
+*Note* that this guide neither covers the details of the __install__
+method, nor does it cover any of the other methods available through the
+__build\.tcl__ tool of *[CriTcl](critcl\.md)*\. These can be found in the
+*[CriTcl build\.tcl Tool Reference](critcl\_build\.md)*\.
+
+## <a name='subsection5'></a>Install On Windows
+
+This section offers instructions for installing *[CriTcl](critcl\.md)* on a
+Windows \(tm\) host\. *Note* that environments as provided by tools like
+[MinGW](https://www\.mingw\-w64\.org), [CygWin](https://www\.cygwin\.com/),
+[Git For Windows](https://gitforwindows\.org),
+[WSL](https://docs\.microsoft\.com/en\-us/windows/wsl/faq), etc\. are classed as
+Unix\-like, and the instructions in section [Install On Unix](#subsection4)
+apply\.
+
+  1. In a DOS box, change the working directory to the top level directory of
+     the *[CriTcl](critcl\.md)* checkout obtained by following the
+     instructions of *[How To Get The CriTcl
+     Sources](critcl\_howto\_sources\.md)*\.
+
+  1. In the same DOS box, invoke
+
+    tclsh.exe ./build.tcl install
+
+     to perform the installation\.
+
+     *Attention* This command uses default locations for the placement of the
+     __[critcl](critcl\.md)__ application, the various packages, and
+     header files\.
+
+  1. Invoke
+
+    tclsh.exe ./build.tcl dirs
+
+     to see the chosens paths before actually performing the installation\.
+
+  1. Use the options listed below to change the paths used for installation as
+     desired\. This is the same method as with __configure__ based packages\.
+
+       - __\-\-prefix__ *path*
+
+         Base path for non\-package files\.
+
+       - __\-\-include\-dir__ *path*
+
+         Destination path for header files\.
+
+       - __\-\-exec\-prefix__ *path*
+
+         Base path for applications and packages\.
+
+       - __\-\-bin\-dir__ *path*
+
+         Destination path for applications\.
+
+       - __\-\-lib\-dir__ *path*
+
+         Destination path for packages\.
+
+*Attention\!* The current installer does not put an extension on the
+__[critcl](critcl\.md)__ application\. This forces users to either
+explicitly choose the __tclsh__ to run the application, or manually rename
+the installed file to "critcl\.tcl"\. The latter assumes that an association for
+"\.tcl" is available, to either __tclsh__, or __wish__\.
+
+*Note* that this guide neither covers the details of the __install__
+method, nor does it cover any of the other methods available through the
+__build\.tcl__ tool of *[CriTcl](critcl\.md)*\. These can be found in the
+*[CriTcl build\.tcl Tool Reference](critcl\_build\.md)*\.
+
+# <a name='section4'></a>Test The Installation
+
+Installing *[CriTcl](critcl\.md)* contains an implicit test of its
+functionality\.
+
+One of its operation modes uses the MD5 hash internally to generate unique ids
+for sources, as a means of detecting changes\. To make generation of such hashes
+fast a *[CriTcl](critcl\.md)*\-based package for MD5 is installed as part of
+the main installation process\.
+
+In other words, after installing the core packages of
+*[CriTcl](critcl\.md)* this partial installation is used to build the rest\.
+
+This is possible because building a package from
+*[CriTcl](critcl\.md)*\-based sources is the operation mode not using MD5,
+therefore there is no circular dependency\.
+
+For our purposes this however is also a self\-test of the system, verifying that
+the core of *[CriTcl](critcl\.md)* works, as well as the C compiler\.
+
+For additional testing simply move on to section __The First Package__ of
+the guide on *[How To Use CriTcl](critcl\_howto\_use\.md)*\.
+
+# <a name='section5'></a>Authors
+
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+# <a name='section6'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report them at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)\.
+Ideas for enhancements you may have for either package, application, and/or the
+documentation are also very welcome and should be reported at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)
+as well\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [calling C code from
+Tcl](\.\./index\.md\#calling\_c\_code\_from\_tcl), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; Jean\-Claude Wippler  
+Copyright &copy; Steve Landers  
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_howto_sources.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_howto_sources.md
new file mode 100644
index 00000000..19589177
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_howto_sources.md
@@ -0,0 +1,109 @@
+
+[//000000001]: # (critcl\_howto\_sources \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_howto\_sources\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; Jean\-Claude Wippler)
+[//000000004]: # (Copyright &copy; Steve Landers)
+[//000000005]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000006]: # (critcl\_howto\_sources\(n\) 3\.2\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl\_howto\_sources \- How To Get The CriTcl Sources
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Description](#section1)
+
+  - [Install the Git Source Code Manager](#section2)
+
+  - [Retrieve The Sources](#section3)
+
+  - [Authors](#section4)
+
+  - [Bugs, Ideas, Feedback](#section5)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+The sources for *[CriTcl](critcl\.md)* are retrieved in two easy steps:
+
+  1. [Install the Git Source Code Manager](#section2)
+
+  1. [Retrieve The Sources](#section3)
+
+It is now possible to follow the instructions on *[How To Install
+CriTcl](critcl\_howto\_install\.md)*\.
+
+# <a name='section2'></a>Install the Git Source Code Manager
+
+*[CriTcl](critcl\.md)*'s sources are managed by the popular [Git
+SCM](http://www\.git\-scm\.com)\.
+
+Binaries of clients for popular platforms can be found at the [download
+page](https://git\-scm\.com/downloads)\.
+
+See also if your operating system's package manager provides clients and
+associated tools for installation\. If so, follow the instructions for the
+installation of such packages on your system\.
+
+# <a name='section3'></a>Retrieve The Sources
+
+  1. Choose a directory for the sources, and make it the working directory\.
+
+  1. Invoke the command
+
+     > git clone [http://andreas\-kupries\.github\.io/critcl](http://andreas\-kupries\.github\.io/critcl)
+
+  1. The working directory now contains a sub\-directory "critcl" holding the
+     sources of *[CriTcl](critcl\.md)*\.
+
+# <a name='section4'></a>Authors
+
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+# <a name='section5'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report them at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)\.
+Ideas for enhancements you may have for either package, application, and/or the
+documentation are also very welcome and should be reported at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)
+as well\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [calling C code from
+Tcl](\.\./index\.md\#calling\_c\_code\_from\_tcl), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; Jean\-Claude Wippler  
+Copyright &copy; Steve Landers  
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_howto_use.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_howto_use.md
new file mode 100644
index 00000000..d5e63a5a
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_howto_use.md
@@ -0,0 +1,2104 @@
+
+[//000000001]: # (critcl\_howto\_use \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_howto\_use\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; Jean\-Claude Wippler)
+[//000000004]: # (Copyright &copy; Steve Landers)
+[//000000005]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000006]: # (critcl\_howto\_use\(n\) 3\.2\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl\_howto\_use \- How To Use CriTcl
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Description](#section1)
+
+  - [Basics](#section2)
+
+      - [Simple Arguments](#subsection1)
+
+      - [Simple Results](#subsection2)
+
+      - [Range\-limited Simple Arguments](#subsection3)
+
+      - [String Arguments](#subsection4)
+
+      - [String Results](#subsection5)
+
+      - [List Arguments](#subsection6)
+
+      - [Constrained List Arguments](#subsection7)
+
+      - [Raw Tcl\_Obj\* Arguments](#subsection8)
+
+      - [Raw Tcl\_Obj\* Results](#subsection9)
+
+      - [Errors & Messages](#subsection10)
+
+      - [Tcl\_Interp\* Access](#subsection11)
+
+      - [Binary Data Arguments](#subsection12)
+
+      - [Constant Binary Data Results](#subsection13)
+
+      - [Tcl Runtime Version](#subsection14)
+
+      - [Additional Tcl Code](#subsection15)
+
+      - [Debugging Support](#subsection16)
+
+      - [Install The Package](#subsection17)
+
+  - [Using External Libraries](#section3)
+
+      - [Default Values For Arguments](#subsection18)
+
+      - [Custom Argument Validation](#subsection19)
+
+      - [Separating Local C Sources](#subsection20)
+
+      - [Very Simple Results](#subsection21)
+
+      - [Structure Arguments](#subsection22)
+
+      - [Structure Results](#subsection23)
+
+      - [Structure Types](#subsection24)
+
+      - [Large Structures](#subsection25)
+
+      - [External Structures](#subsection26)
+
+      - [External Enumerations](#subsection27)
+
+      - [External Bitsets/Bitmaps/Flags](#subsection28)
+
+      - [Non\-standard header/library locations](#subsection29)
+
+      - [Non\-standard compile/link configuration](#subsection30)
+
+      - [Querying the compilation environment](#subsection31)
+
+      - [Shared C Code](#subsection32)
+
+  - [Various](#section4)
+
+      - [Author, License, Description, Keywords](#subsection33)
+
+      - [Get Critcl Application Help](#subsection34)
+
+      - [Supported Targets & Configurations](#subsection35)
+
+      - [Building A Package](#subsection36)
+
+      - [Building A Package For Debugging](#subsection37)
+
+  - [Authors](#section5)
+
+  - [Bugs, Ideas, Feedback](#section6)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This document assumes the presence of a working *[CriTcl](critcl\.md)*
+installation\.
+
+If that is missing follow the instructions on *[How To Install
+CriTcl](critcl\_howto\_install\.md)*\.
+
+# <a name='section2'></a>Basics
+
+To create a minimal working package
+
+  1. Choose a directory to develop in and make it the working directory\. This
+     should not be a checkout of *[CriTcl](critcl\.md)* itself\.
+
+  1. Save the following example to a file\. In the following it is assumed that
+     the file was named "example\.tcl"\.
+
+         # -*- tcl -*-
+         # Critcl support, absolutely necessary.
+         package require critcl
+
+         # Bail out early if the compile environment is not suitable.
+         if {![critcl::compiling]} {
+             error "Unable to build project, no proper compiler found."
+         }
+
+         # Information for the teapot.txt meta data file put into a generated package.
+         # Free form strings.
+         critcl::license {Andreas Kupries} {Under a BSD license}
+
+         critcl::summary {The first CriTcl-based package}
+
+         critcl::description {
+             This package is the first example of a CriTcl-based package. It contains all the
+             necessary and conventionally useful pieces.
+         }
+
+         critcl::subject example {critcl package}
+         critcl::subject {basic critcl}
+
+         # Minimal Tcl version the package should load into.
+         critcl::tcl 8.6
+
+         # Use to activate Tcl memory debugging
+         #critcl::debug memory
+         # Use to activate building and linking with symbols (for gdb, etc.)
+         #critcl::debug symbols
+
+         # ## #### ######### ################ #########################
+         ## A hello world, directly printed to stdout. Bypasses Tcl's channel system.
+
+         critcl::cproc hello {} void {
+             printf("hello world\n");
+         }
+
+         # ## #### ######### ################ #########################
+
+         # Forcing compilation, link, and loading now.
+         critcl::msg -nonewline { Building ...}
+         if {![critcl::load]} {
+             error "Building and loading the project failed."
+         }
+
+         # Name and version the package. Just like for every kind of Tcl package.
+         package provide critcl-example 1
+
+  1. Invoke the command
+
+         critcl -keep -debug all -pkg example.tcl
+
+     This compiles the example and installs it into a "lib/" sub directory of
+     the working directory, generating output similar to
+
+         Config:   linux-x86_64-gcc
+         Build:    linux-x86_64-gcc
+         Target:   linux-x86_64
+         Source:   example.tcl  (provide critcl-example 1) Building ...
+         Library:  example.so
+          (tclStubsPtr     =>  const TclStubs *tclStubsPtr;)
+          (tclPlatStubsPtr =>  const TclPlatStubs *tclPlatStubsPtr;)
+         Package:  lib/example
+         Files left in /home/aku/.critcl/pkg2567272.1644845439
+
+     during operation\.
+
+     The __\-keep__ option suppressed the cleanup of the generated C files,
+     object files, compiler log, etc\. normally done at the end of building\.
+
+         % ls -l /home/aku/.critcl/pkg2567272.1644845439
+         total 36
+         -rw-r--r-- 1 aku aku  1260 Feb 14 18:30 v3118_00000000000000000000000000000004.c
+         -rw-r--r-- 1 aku aku  2096 Feb 14 18:30 v3118_00000000000000000000000000000004_pic.o
+         -rw-r--r-- 1 aku aku  1728 Feb 14 18:30 v3118_00000000000000000000000000000009.c
+         -rw-r--r-- 1 aku aku  2448 Feb 14 18:30 v3118_00000000000000000000000000000009_pic.o
+         -rwxr-xr-x 1 aku aku 14424 Feb 14 18:30 v3118_00000000000000000000000000000009.so
+         -rw-r--r-- 1 aku aku  1725 Feb 14 18:30 v3118.log
+
+     This enables inspection of the generated C code\. Simply drop the option
+     from the command if that is not desired\.
+
+     The option __\-debug__, with argument __all__ activated Tcl's memory
+     debugging and caused the generation of the symbol tables needed by
+     __gdb__ or any other debugger\. The alternate arguments __memory__
+     and __symbols__ activate just one of the these\.
+
+  1. Now invoke an interactive __tclsh__ and enter the commands:
+
+       - *lappend auto\_path lib*
+
+       - *package require critcl\-example*
+
+       - *info loaded*
+
+       - *hello*
+
+       - *exit*
+
+     I\.e\. extend __tclsh__'s package search path to include the location of
+     the new package, load the package, verify that the associated shared
+     library is present, invoke the package command, and stop the session\.
+
+     When the package command is invoked the terminal will show __hello
+     world__, followed by the prompt\.
+
+Commands: *critcl::compiling*, *critcl::cproc*, *critcl::description*,
+*critcl::license*, *critcl::load*, *critcl::msg*, *critcl::subject*,
+*critcl::summary*, *critcl::tcl*\.
+
+Make a copy of "example\.tcl" before going through the sub\-sections\. Keep it as a
+save point to return to from the editing done in the sub\-section\.
+
+## <a name='subsection1'></a>Simple Arguments
+
+A function taking neither arguments nor returning results is not very useful\.
+
+  1. We are now extending the command to take an argument\.
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc hello \{double x\} void \{  
+     > &nbsp;/\* double x; \*/  
+     > &nbsp;printf\("hello world, we have %f\\n", x\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. When testing the package again, entering the simple __hello__ will
+     fail\.
+
+     The changed command is now expecting an argument, and we gave it none\.
+
+     Retry by entering
+
+         hello 5
+
+     instead\. Now the command behaves as expected and prints the provided value\.
+
+     Further try and enter
+
+         hello world
+
+     This will fail again\. The command expected a real number and we gave it
+     something decidedly not so\.
+
+     These checks \(argument count, argument type\) are implemented in the
+     translation layer *[CriTcl](critcl\.md)* generates for the C function\.
+     The function body is never invoked\.
+
+## <a name='subsection2'></a>Simple Results
+
+A function taking neither arguments nor returning results is not very useful\.
+
+  1. We are now extending the command to return a result\.
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc twice \{double x\} double \{  
+     > &nbsp;return 2\*x;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. Note that the name of the command changed\. Goodbye __hello__, hello
+     __twice__\.
+
+  1. Invoke
+
+         twice 4
+
+     and the __tclsh__ will print the result __8__ in the terminal\.
+
+An important limitation of the commands implemented so far is that they cannot
+fail\. The types used so far \(__void__, __double__\) and related scalar
+types can return only a value of the specified type, and nothing else\. They have
+no ability to signal an error to the Tcl script\.
+
+We will come back to this after knowing a bit more about the more complex
+argument and result types\.
+
+Of interest to the eager reader: *[CriTcl cproc Type
+Reference](critcl\_cproc\.md)*
+
+## <a name='subsection3'></a>Range\-limited Simple Arguments
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc hello \{\{double > 5 < 22\} x\} void \{  
+     > &nbsp;/\* double x, range 6\-21; \*/  
+     > &nbsp;printf\("hello world, we have %f\\n", x\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. When dealing with simple arguments whose range of legal values is limited
+     to a single continuous interval extend the base type with the necessary
+     relations \(__>__, __>=__, __<__, and __<=__\) and limiting
+     values\.
+
+     *Note* that the limiting values have to be proper constant numbers
+     acceptable by the base type\. Symbolic values are not accepted\.
+
+     Here the argument *x* of the changed function will reject all values
+     outside of the interval 6 to 21\.
+
+## <a name='subsection4'></a>String Arguments
+
+Tcl prides itself on the fact that *Everything Is A String*\. So how are string
+values passed into C functions ?
+
+  1. We are now extending the command with a string argument\.
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc hello \{pstring x\} void \{  
+     > &nbsp;/\* critcl\_pstring x \(\.s, \.len, \.o\); \*/  
+     > &nbsp;printf\("hello world, from %s \(%d bytes\)\\n", x\.s, x\.len\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. Testing __hello__ with any kind of argument the information is printed\.
+
+  1. Of note here is that the command argument __x__ is a structure\.
+
+  1. The example uses only two of the three fields, the pointer to the string
+     data \(__\.s__\), and the length of the string \(__\.len__\)\. In bytes,
+     *not* in characters, because Tcl's internal representation of strings
+     uses a modified UTF\-8 encoding\. A character consists of between 1 and
+     __TCL\_UTF\_MAX__ bytes\.
+
+  1. *Attention* The pointers \(__\.s__\) refer into data structures
+     *internal* to and managed by the Tcl interpreter\. Changing them is highly
+     likely to cause subtle and difficult to track down bugs\. Any and all
+     complex arguments must be treated as *Read\-Only*\. Never modify them\.
+
+  1. Use the simpler type __char\*__ if and only if the length of the string
+     is not relevant to the command, i\.e\. not computed, or not used by any of
+     the functions called from the body of the command\. Its value is essentially
+     just the __\.s__ field of __pstring__'s structure\. This then looks
+     like
+
+             critcl::cproc hello {char* x} void {
+         	/* char* x; */
+         	printf("hello world, from %s\n", x);
+             }
+
+## <a name='subsection5'></a>String Results
+
+Tcl prides itself on the fact that *Everything Is A String*\. So how are string
+values returned from C functions ?
+
+  1. We are now giving the command a string result\.
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc twice \{double x\} char\* \{  
+     > &nbsp;char buf \[lb\]40\[rb\];  
+     > &nbsp;sprintf\(buf, "%f", 2\*x\);  
+     > &nbsp;return buf;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. Note that the name of the command changed\. Goodbye __hello__, hello
+     __twice__\.
+
+  1. Invoke
+
+         twice 4
+
+     and the __tclsh__ will print the result __8__ in the terminal\.
+
+  1. *Attention*\. To the translation layer the string pointer is owned by the
+     C code\. A copy is made to become the result seen by Tcl\.
+
+     While the C code is certainly allowed to allocate the string on the heap if
+     it so wishes, this comes with the responsibility to free the string as
+     well\. Abrogation of that responsibility will cause memory leaks\.
+
+     The type __char\*__ is recommended to be used with static string
+     buffers, string constants and the like\.
+
+  1. Conversely, to return heap\-allocated strings it is recommended to use the
+     type __string__ instead\.
+
+     Replace the definition of __twice__ with
+
+         critcl::cproc twice {double x} string {
+             char* buf = Tcl_Alloc (40);
+             sprintf(buf, "%f", 2*x);
+             return buf;
+         }
+
+     Now the translation layer takes ownership of the string from the C code and
+     transfers that ownership to the Tcl interpreter\. This means that the string
+     will be released when the Tcl interpreter is done with it\. The C code has
+     no say in the lifecycle of the string any longer, and having the C code
+     releasing the string *will* cause issues\. Dangling pointers and
+     associated memory corruption and crashes\.
+
+## <a name='subsection6'></a>List Arguments
+
+Even as a string\-oriented language Tcl is capable of handling more complex
+structures\. The first of it, with Tcl since the beginning are *lists*\. Sets of
+values indexed by a numeric value\.
+
+In C parlance, *arrays*\.
+
+  1. We are now extending the command with a __list__ argument\.
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc hello \{list x\} void \{  
+     > &nbsp;/\* critcl\_list x \(\.o, \.v, \.c\); \*/  
+     > &nbsp;printf\("hello world, %d elements in \(%s\)\\n", x\.c, Tcl\_GetString \(x\.o\)\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. Testing __hello__ with any kind of list argument it will print basic
+     information about it\.
+
+  1. Of note here is that the command argument __x__ is a structure\.
+
+  1. The example uses only two of the three fields, the pointer to the original
+     __Tcl\_Obj\*__ holding the list \(__\.o__\), and the length of the list
+     \(__\.c__\) in elements\.
+
+     The field __\.v__, not used above, is the C array holding the
+     __Tcl\_Obj\*__ pointers to the list elements\.
+
+  1. *Attention* The pointers __\.o__ and __\.v__ refer into data
+     structures *internal* to and managed by the Tcl interpreter\. Changing
+     them is highly likely to cause subtle and difficult to track down bugs\. Any
+     and all complex arguments must be treated as *Read\-Only*\. Never modify
+     them\.
+
+  1. As a last note, this argument type does not place any constraints on the
+     size of the list, or on the type of the elements\.
+
+## <a name='subsection7'></a>Constrained List Arguments
+
+As mentioned at the end of section [List Arguments](#subsection6) the basic
+__list__ type places no constraints on the size of the list, nor on the type
+of the elements\.
+
+Both kind of constraints can be done however, alone or together\.
+
+  1. We are now extending the command with a length\-limited list\.
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc hello \{\[5\] x\} void \{  
+     > &nbsp;/\* critcl\_list x \(\.o, \.v, \.c\); \*/  
+     > &nbsp;printf\("hello world, %d elements in \(%s\)\\n", x\.c, Tcl\_GetString \(x\.o\)\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. Testing the new command will show that only lists holding exactly __5__
+     elements will be accepted\.
+
+  1. To accept lists of any length use __\[\]__ or __\[\*\]__\. Both forms are
+     actually aliases of the base type, i\.e\. __list__\.
+
+  1. To constrain just the type of elements, for example to type __int__,
+     use
+
+         int[]
+
+     or
+
+         []int
+
+  1. To combine both type and length constraints use the forms
+
+         int[5]
+
+     or
+
+         [5]int
+
+  1. The last, most C\-like forms of these contraints place the list indicator
+     syntax on the argument instead of the type\. I\.e
+
+         int a[]
+
+     or
+
+         int a[5]
+
+## <a name='subsection8'></a>Raw Tcl\_Obj\* Arguments
+
+When the set of predefined argument types is not enough the oldest way of
+handling the situation is falling back to the structures used by Tcl to manage
+values, i\.e\. __Tcl\_Obj\*__\.
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc hello \{object x\} void \{  
+     > &nbsp;/\* Tcl\_Obj\* x \*/  
+     > &nbsp;int len;  
+     > &nbsp;char\* str = Tcl\_GetStringFromObj \(x, &len\);  
+     > &nbsp;printf\("hello world, from %s \(%d bytes\)\\n", str, len\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. Having direct access to the raw __Tcl\_Obj\*__ value all functions of the
+     public Tcl API for working with Tcl values become usable\. The downside of
+     that is that all the considerations for handling them apply as well\.
+
+     In other words, the C code becomes responsible for handling the reference
+     counts correctly, for duplicating shared __Tcl\_Obj\*__ structures before
+     modifying them, etc\.
+
+     One thing the C code is allowed to do without restriction is to *shimmer*
+     the internal representation of the value as needed, through the associated
+     Tcl API functions\. For example __Tcl\_GetWideIntFromObj__ and the like\.
+     It actually has to be allowed to do so, as the type checking done as part
+     of such conversions is now the responsibility of the C code as well\.
+
+     For the predefined types this is all hidden in the translation layer
+     generated by *[CriTcl](critcl\.md)*\.
+
+     If more than one command has to perform the same kind of checking and/or
+     conversion it is recommended to move the core of the code into proper C
+     functions for proper sharing among the commands\.
+
+  1. This is best done by defining a custom argument type using
+     *[CriTcl](critcl\.md)* commands\. This extends the translation layer
+     *[CriTcl](critcl\.md)* is able to generate\. The necessary conversions,
+     type checks, etc\. are then again hidden from the bulk of the application C
+     code\.
+
+     We will come back to this\.
+
+## <a name='subsection9'></a>Raw Tcl\_Obj\* Results
+
+When the set of predefined result types is not enough the oldest way of handling
+the situation is falling back to the structures used by Tcl to manage values,
+i\.e\. __Tcl\_Obj\*__\.
+
+Two builtin types are provided for this, to handle different reference counting
+requirements\.
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc twice \{double x\} object0 \{  
+     > &nbsp;return Tcl\_NewDoubleObj\(2\*x\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. With __object0__ the translation layer assumes that the returned
+     __Tcl\_Obj\*__ value has a reference count of __0__\. I\.e\. a value
+     which is unowned and unshared\.
+
+     This value is passed directly to Tcl for its use, without any changes\. Tcl
+     increments the reference count and thus takes ownership\. The value is still
+     unshared\.
+
+     It would be extremely detrimental if the translation layer had decremented
+     the reference count before passing the value\. This action would release the
+     memory and then leave Tcl with a dangling pointer and the associated memory
+     corruption bug to come\.
+
+  1. The situation changes when the C code returns a __Tcl\_Obj\*__ value with
+     a reference count greater than __0__\. I\.e\. at least owned \(by the C
+     code\), and possibly even shared\. There are some object constructors and/or
+     mutators in the public Tcl API which do that, although I do not recall
+     their names\. The example below simulates this situation by explicitly
+     incrementing the reference count before returning the value\.
+
+  1. In this case use the type __object__ \(without the trailing __0__\)\.
+
+  1. Edit the file "example\.tcl" and replace the definition of __twice__
+     with
+
+             critcl::cproc twice {double x} object {
+         	Tcl_Obj* result = Tcl_NewDoubleObj(2*x);
+         	Tcl_IncrRefCount (result);
+         	return result;
+             }
+
+     and rebuild the package\.
+
+  1. After handing the value to Tcl, with the associated incremented reference
+     count, the translation layer decrements the reference count, invalidating
+     the C code's ownership and leaving the final reference count the same\.
+
+     Note, the order matters\. If the value has only one reference then
+     decrementing it before Tcl increments it would again release the value, and
+     again leave Tcl with a dangling pointer\.
+
+     Also, not decrementing the reference count at all causes the inverse
+     problem to the memory corruption issues of before, memory leaks\.
+
+  1. *Note* that both types transfer ownership of the value\. Their difference
+     is just in the reference count of the value coming out of the function, and
+     the \(non\-\)actions having to be \(not\) taken to effect said transfer without
+     causing memory issues\.
+
+## <a name='subsection10'></a>Errors & Messages
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc sqrt \{  
+     > &nbsp;Tcl\_Interp\* interp  
+     > &nbsp;double      x  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\} object0 \{  
+     > &nbsp;if \(x < 0\) \{  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tcl\_SetObjResult \(interp, Tcl\_ObjPrintf \("Expected double >=0, but got \\"%d\\"", x\)\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tcl\_SetErrorCode \(interp, "EXAMPLE", "BAD", "DOMAIN", NULL\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return NULL;  
+     > &nbsp;\}  
+     > &nbsp;return Tcl\_NewDoubleObj\(sqrt\(x\)\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. In standard C\-based packages commands signal errors by returning
+     __TCL\_ERROR__, placing the error message as the interpreter result, and
+     maybe providing an error code via __Tcl\_SetErrorCode__\.
+
+  1. When using __critcl::cproc__ this is limited and hidden\.
+
+  1. The simple and string types for results do not allow failure\. The value is
+     returned to the translation layer, converted into the interpreter result
+     and then reported as success \(__TCL\_OK__\)\.
+
+  1. The object types on the other hand do allow for failure\. Return a
+     __NULL__ value to signal failure to the translation layer, which then
+     reports this to the interpreter via the standard __TCL\_ERROR__\.
+
+  1. *Attention* Setting the desired error message and code into the
+     interpreter is still the responsibility of the function body\.
+
+## <a name='subsection11'></a>Tcl\_Interp\* Access
+
+  1. Reread the example in the __previous__ section\.
+
+  1. Note the type __Tcl\_Interp\*__ used for the first argument\.
+
+  1. This type is special\.
+
+  1. An argument of this type has to be the first argument of a function\.
+
+  1. Using it tells *[CriTcl](critcl\.md)* that the function needs access
+     to the Tcl interpreter calling it\. It then arranges for that to happen in
+     the generated C code\.
+
+     Using functions from Tcl's public C API taking an interpreter argument in
+     the function body is a situation where this is needed\.
+
+  1. *This special argument is not visible at the script level*\.
+
+  1. *This special argument is not an argument of the Tcl command for the
+     function*\.
+
+  1. In our example the __sqrt__ command is called with a single argument\.
+
+  1. The name of the argument can be freely chosen\. It is the type which is
+     important and triggers the special behaviour\. My prefered names are
+     __ip__ and __interp__\.
+
+## <a name='subsection12'></a>Binary Data Arguments
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc hello \{bytes x\} void \{  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/\* critcl\_bytes x \(\.s, \.len, \.o\); \*/  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;printf\("hello world, with %d bytes \\n data: ", x\.len\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for \(i = 0; i < x\.len; i\+\+\) \{  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;printf\(" %02x", x\.s\[i\]\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if \(i % 16 == 15\) printf \("\\ndata: "\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\}  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if \(i % 16 \!= 0\) printf \("\\n"\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. To deal with strings holding binary data use the type __bytes__\. It
+     ensures that the function sees the proper binary data, and not how Tcl is
+     encoding it internally, as the string types would\.
+
+## <a name='subsection13'></a>Constant Binary Data Results
+
+  1. Use the command __critcl::cdata__ to create a command taking no
+     arguments and returning a constant ByteArray value\.
+
+             # P5 3 3 255 \n ...
+             critcl::cdata cross3x3pgm {
+         	80 52 32 51 32 51 32 50 53 53 10
+         	0   255 0
+         	255 255 255
+         	0   255 0
+             }
+
+## <a name='subsection14'></a>Tcl Runtime Version
+
+  1. See and reread the [basic package](#section2) for the introduction of
+     the commands referenced below\.
+
+  1. Use the command __critcl::tcl__ to tell *[CriTcl](critcl\.md)* the
+     minimal version of Tcl the package is to be used with\.
+
+     This determines which Tcl headers all files are compiled against, and what
+     version of the public Tcl API is available to the C code\.
+
+     Currently __8\.4__, __8\.5__ and __8\.6__ are supported\.
+
+     If not specified __8\.4__ is assumed\.
+
+## <a name='subsection15'></a>Additional Tcl Code
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc greetings::hello \{\} void \{  
+     > &nbsp;printf\("hello world\\n"\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}  
+     >   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc greetings::hi \{\} void \{  
+     > &nbsp;printf\("hi you\\n"\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. The command __hello__ is now available as __greetings::hello__, and
+     a second command __greetings::hi__ was added\.
+
+  1. Tcl has automatically created the namespace __greetings__\.
+
+  1. Create a file "example\-policy\.tcl" and enter
+
+             namespace eval greetings {
+         	namespace export hello hi
+         	namespace ensemble create
+             }
+
+     into it\.
+
+  1. Edit "example\.tcl"\. Add the code
+
+         critcl::tsources example-policy.tcl
+
+     and rebuild the package\.
+
+  1. The added Tcl code makes __greetings__ available as an *ensemble*
+     command\.
+
+     The commands in the namespace have been registered as methods of the
+     ensemble\.
+
+     They can now be invoked as
+
+         greetings hello
+         greetings hi
+
+  1. The Tcl builtin command __string__ is an ensemble as well, as is
+     __clock__\.
+
+New commands: *critcl::tsources*
+
+## <a name='subsection16'></a>Debugging Support
+
+  1. See and reread the [basic package](#section2) for the introduction of
+     the commands referenced below\.
+
+  1. Use the command __critcl::debug__ to activate various features
+     supporting debugging\.
+
+         critcl::debug memory  ;# Activate Tcl memory debugging (-DTCL_MEM_DEBUG)
+         critcl::debug symbols ;# Activate building and linking with debugger symbols (-g)
+         critcl::debug all     ;# Shorthand for both `memory` and `symbols`.
+
+## <a name='subsection17'></a>Install The Package
+
+  1. Starting from the [Basics](#section2)\.
+
+  1. Use an interactive __tclsh__ seesion to determine the value of __info
+     library__\.
+
+     For the purpose of this HowTo assume that this path is
+     "/home/aku/opt/ActiveTcl/lib/tcl8\.6"
+
+  1. Invoke the critcl application in a terminal, using
+
+         critcl -libdir /home/aku/opt/ActiveTcl/lib/tcl8.6 -pkg example.tcl
+
+  1. The package is now build and installed into the chosen directory\.
+
+         % find /home/aku/opt/ActiveTcl/lib/tcl8.6/example/
+          /home/aku/opt/ActiveTcl/lib/tcl8.6/example/
+          /home/aku/opt/ActiveTcl/lib/tcl8.6/example/pkgIndex.tcl
+          /home/aku/opt/ActiveTcl/lib/tcl8.6/example/critcl-rt.tcl
+          /home/aku/opt/ActiveTcl/lib/tcl8.6/example/license.terms
+          /home/aku/opt/ActiveTcl/lib/tcl8.6/example/linux-x86_64
+          /home/aku/opt/ActiveTcl/lib/tcl8.6/example/linux-x86_64/example.so
+          /home/aku/opt/ActiveTcl/lib/tcl8.6/example/teapot.txt
+
+# <a name='section3'></a>Using External Libraries
+
+To create a minimal package wrapping an external library
+
+  1. Choose a directory to develop in and make it the working directory\. This
+     should not be a checkout of *[CriTcl](critcl\.md)* itself\.
+
+  1. Save the following example to a file\. In the following it is assumed that
+     the file was named "example\.tcl"\.
+
+         # -*- tcl -*-
+         # Critcl support, absolutely necessary.
+         package require critcl
+
+         # Bail out early if the compile environment is not suitable.
+         if {![critcl::compiling]} {
+             error "Unable to build project, no proper compiler found."
+         }
+
+         # Information for the teapot.txt meta data file put into a generated package.
+         # Free form strings.
+         critcl::license {Andreas Kupries} {Under a BSD license}
+
+         critcl::summary {The second CriTcl-based package}
+
+         critcl::description {
+             This package is the second example of a CriTcl-based package. It contains all the
+             necessary and conventionally useful pieces for wrapping an external library.
+         }
+
+         critcl::subject {external library usage} example {critcl package}
+         critcl::subject {wrapping external library}
+
+         # Minimal Tcl version the package should load into.
+         critcl::tcl 8.6
+
+         # Locations for headers and shared library of the library to wrap.
+         # Required only for non-standard locations, i.e. where CC is not searching by default.
+         critcl::cheaders   -I/usr/include
+         critcl::clibraries -L/usr/lib/x86_64-linux-gnu
+         critcl::clibraries -lzstd
+
+         # Import library API, i.e. headers.
+         critcl::include zstd.h
+
+         # ## #### ######### ################ #########################
+         ## (De)compression using Zstd
+         ## Data to (de)compress is passed in and returned as Tcl byte arrays.
+
+         critcl::cproc compress {
+             Tcl_Interp* ip
+             bytes       data
+             int         {level ZSTD_CLEVEL_DEFAULT}
+         } object0 {
+             /* critcl_bytes data; (.s, .len, .o) */
+             Tcl_Obj* error_message;
+
+             int max = ZSTD_maxCLevel();
+             if ((level < 1) || (level > max)) {
+         	error_message = Tcl_ObjPrintf ("level must be integer between 1 and %d", max);
+         	goto err;
+             }
+
+             size_t dest_sz  = ZSTD_compressBound (data.len);
+             void*  dest_buf = Tcl_Alloc(dest_sz);
+
+             if (!dest_buf) {
+         	error_message = Tcl_NewStringObj ("can't allocate memory to compress data", -1);
+         	goto err;
+             }
+
+             size_t compressed_size = ZSTD_compress (dest_buf, dest_sz,
+         					    data.s,   data.len,
+         					    level);
+             if (ZSTD_isError (compressed_size)) {
+         	Tcl_Free(dest_buf);
+         	error_message = Tcl_ObjPrintf ("zstd encoding error: %s",
+         				       ZSTD_getErrorName (compressed_size));
+         	goto err;
+             }
+
+             Tcl_Obj* compressed = Tcl_NewByteArrayObj (dest_buf, compressed_size);
+             Tcl_Free (dest_buf);
+
+             return compressed;
+           err:
+             Tcl_SetObjResult (ip, error_message);
+             return 0;
+         }
+
+         critcl::cproc decompress {
+             Tcl_Interp*  ip
+             bytes        data
+         } object0 {
+             Tcl_Obj* error_message;
+
+             size_t dest_sz = ZSTD_getDecompressedSize (data.s, data.len);
+             if (dest_sz == 0) {
+                 error_message = Tcl_NewStringObj("invalid data", -1);
+         	goto err;
+             }
+
+             void* dest_buf = Tcl_Alloc (dest_sz);
+             if (!dest_buf) {
+         	error_message = Tcl_NewStringObj("failed to allocate decompression buffer", -1);
+         	goto err;
+             }
+
+             size_t decompressed_size = ZSTD_decompress (dest_buf, dest_sz,
+         						data.s,   data.len);
+             if (decompressed_size != dest_sz) {
+         	Tcl_Free (dest_buf);
+                 error_message = Tcl_ObjPrintf("zstd decoding error: %s",
+         				      ZSTD_getErrorName (decompressed_size));
+         	goto err;
+             }
+
+             Tcl_Obj* decompressed = Tcl_NewByteArrayObj (dest_buf, dest_sz);
+             Tcl_Free (dest_buf);
+
+             return decompressed;
+
+           err:
+             Tcl_SetObjResult (ip, error_message);
+             return 0;
+         }
+
+         # ## #### ######### ################ #########################
+
+         # Forcing compilation, link, and loading now.
+         critcl::msg -nonewline { Building ...}
+         if {![critcl::load]} {
+             error "Building and loading the project failed."
+         }
+
+         # Name and version the package. Just like for every kind of Tcl package.
+         package provide critcl-example 1
+
+  1. Build the package\. See the __Basics__, if necessary\.
+
+  1. Load the package and invoke the commands\.
+
+     *Attention*\. The commands take and return binary data\. This may look very
+     bad in the terminal\.
+
+  1. To test the commands enter
+
+         set a [compress {hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhello wwwwwwwworld}]
+
+         decompress $a
+
+     in the interactive __tclsh__
+
+New commands: *critcl::cheaders*, *critcl::clibraries*, *critcl::include*\.
+
+## <a name='subsection18'></a>Default Values For Arguments
+
+  1. Reread the example of the main section\. Note specifically the line
+
+         int {level ZSTD_CLEVEL_DEFAULT}
+
+  1. This line demonstrates that __critcl::cproc__ arguments allowed to have
+     default values, in the same vein as __proc__ arguments, and using the
+     same syntax\.
+
+  1. *Attention* Default values have to be legal C rvalues and match the C
+     type of the argument\.
+
+     They are literally pasted into the generated C code\.
+
+     They bypass any argument validation done in the generated translation
+     layer\. This means that it is possible to use a value an invoker of the
+     command cannot use from Tcl\.
+
+  1. This kind of in\-band signaling of a default versus a regular argument is
+     however not necessary\.
+
+     Look at
+
+             critcl::cproc default_or_not {int {x 0}} void {
+         	if !has_x {
+         	    printf("called with default\n");
+         	    return
+         	}
+         	printf("called with %d\n", x);
+             }
+
+     Any argument *x* with a default causes *[CriTcl](critcl\.md)* to
+     create a hidden argument *has\_x*, of type int \(boolean\)\. This argument is
+     set to __1__ when *x* was filled from defaults, and __0__ else\.
+
+## <a name='subsection19'></a>Custom Argument Validation
+
+  1. Starting from the [base wrapper](#section3)\. Edit the file
+     "example\.tcl"\. Replace the entire __compress__ function with
+
+         critcl::argtype zstd_compression_level {
+             /* argtype: `int` */
+             if (Tcl_GetIntFromObj (interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+             /* additional validation */
+             int max = ZSTD_maxCLevel();
+             if ((@A < 1) || (@A > max)) {
+                 Tcl_SetObjResult (interp,
+                     Tcl_ObjPrintf ("zstd compression level must be integer between 1 and %d", max));
+                 return TCL_ERROR;
+             }
+             /* @@: current objv[] element
+             ** @A: name of argument variable for transfer to C function
+             ** interp: predefined variable, access to current interp - error messages, etc.
+             */
+         } int int ;# C types of transfer variable and function argument.
+
+         critcl::cproc compress {
+             Tcl_Interp*            ip
+             bytes                  data
+             zstd_compression_level {level ZSTD_CLEVEL_DEFAULT}
+         } object0 {
+             /* critcl_bytes data; (.s, .len, .o) */
+             /* int level; validated to be in range 1...ZSTD_maxCLevel() */
+
+             Tcl_Obj* error_message;
+
+             size_t dest_sz  = ZSTD_compressBound (data.len);
+             void*  dest_buf = Tcl_Alloc(dest_sz);
+
+             if (!dest_buf) {
+                 error_message = Tcl_NewStringObj ("can't allocate memory to compress data", -1);
+                 goto err;
+             }
+
+             size_t compressed_size = ZSTD_compress (dest_buf, dest_sz,
+                                                     data.s,   data.len,
+                                                     level);
+             if (ZSTD_isError (compressed_size)) {
+                 Tcl_Free(dest_buf);
+                 error_message = Tcl_ObjPrintf ("zstd encoding error: %s",
+                                                ZSTD_getErrorName (compressed_size));
+                 goto err;
+             }
+
+             Tcl_Obj* compressed = Tcl_NewByteArrayObj (dest_buf, compressed_size);
+             Tcl_Free (dest_buf);
+
+             return compressed;
+         err:
+             Tcl_SetObjResult (ip, error_message);
+             return 0;
+         }
+
+     and rebuild the package\.
+
+     In the original example the *level* argument of the function was
+     validated in the function itself\. This may detract from the funtionality of
+     interest itself, especially if there are lots of arguments requiring
+     validation\. If the same kind of argument is used in multiple places this
+     causes code duplication in the functions as well\.
+
+     Use a custom argument type as defined by the modification to move this kind
+     of validation out of the function, and enhance readability\.
+
+     Code duplication however is only partially adressed\. While there is no
+     duplication in the visible definitions the C code of the new argument type
+     is replicated for each use of the type\.
+
+  1. Now replace the __argtype__ definition with
+
+         critcl::code {
+             int GetCompressionLevel (Tcl_Interp* interp, Tcl_Obj* obj, int* level)
+             {
+                 if (Tcl_GetIntFromObj (interp, obj, level) != TCL_OK) return TCL_ERROR;
+
+                 int max = ZSTD_maxCLevel();
+                 if ((*level < 1) || (*level > max)) {
+                     Tcl_SetObjResult (interp,
+                         Tcl_ObjPrintf ("zstd compression level must be integer between 1 and %d", max));
+                     return TCL_ERROR;
+                 }
+                 return TCL_OK;
+             }
+         }
+
+         critcl::argtype zstd_compression_level {
+             if (GetCompressionLevel (@@, &@A) != TCL_OK) return TCL_ERROR;
+         } int int
+
+     and rebuild the package\.
+
+     Now only the calls to the new validation function are replicated\. The
+     function itself exists only once\.
+
+## <a name='subsection20'></a>Separating Local C Sources
+
+  1. Starting from the end of the [previous](#subsection19) section\. Edit
+     the file "example\.tcl"\.
+
+  1. Save the contents of the __critcl::ccode__ block into a file
+     "example\.c" and then replace the entire block with
+
+             critcl::csources example.c
+
+             critcl::ccode {
+         	extern int GetCompressionLevel (Tcl_Interp* interp, Tcl_Obj* obj, int* level);
+             }
+
+     When mixing C and Tcl code the different kind of indentation rules for
+     these languages may come into strong conflict\. Further, very large blocks
+     of C code may reduce overall readability\.
+
+  1. The examples fixes this by moving the code block into a local C file and
+     then registering this file with *[CriTcl](critcl\.md)*\. When building
+     the package *[CriTcl](critcl\.md)* arranges to build all such
+     registered C files as well\.
+
+  1. *Attention*\. The C code is now in a separate compilation unit\. The
+     example declares the exported function so that the __cproc__s are again
+     able to see and use it\.
+
+  1. Now go a step further\. Save the declaration into a file "example\.h", and
+     then use
+
+         critcl::include example.h
+
+     to import it\. Note that this is just a shorthand for
+
+          critcl::ccode {
+         	#include "example.h"
+             }
+
+  1. As an alternative solution, start from the beginning of the section and
+     move the entire original __critcl::ccode__ block into a file
+     "example\-check\.tcl"\.
+
+     Then replace it with
+
+         critcl::source example-check.tcl
+
+     to import it into the main code again\.
+
+     *Attention* Tcl's builtin command __source__ is *not suitable* for
+     importing the separate file due to how *[CriTcl](critcl\.md)* uses the
+     information from __info script__ to key various internal
+     datastructures\.
+
+## <a name='subsection21'></a>Very Simple Results
+
+  1. Starting from the end of the [validation](#subsection19) section\. Edit
+     the file "example\.tcl"\. Add the code below, just before the
+     __compress__ command\.
+
+         critcl::cconst version   char* ZSTD_VERSION_STRING
+         critcl::cconst min-level int   1
+         critcl::cconst max-level int   ZSTD_maxCLevel()
+
+     and rebuild the package\.
+
+  1. These declarations create three additional commands, each returning the
+     specified value\. A fixed string, an integer, and a function call returning
+     an integer\.
+
+  1. *Attention* The values have to be legal C rvalues and match the C type of
+     the result\. They are literally pasted into the generated C code\.
+
+  1. When using __critcl::cconst__ *[CriTcl](critcl\.md)* is aware that
+     the result of the function does not depend on any parameters and is
+     computed in a single C expression\.
+
+     This enables it do to away with the internal helper function it would need
+     and generate if __critcl::cproc__ had been used instead\. For example
+
+             critcl::cproc version {} char* {
+         	return ZSTD_VERSION_STRING;
+             }
+
+## <a name='subsection22'></a>Structure Arguments
+
+  1. For all that this is a part of how to [Use External
+     Libraries](#section3), for the demonstratation only the basics are
+     needed\.
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::ccode \{  
+     > &nbsp;typedef struct vec2 \{  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;double x;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;double y;  
+     > &nbsp;\} vec2;  
+     >   
+     > &nbsp;typedef vec2\* vec2ptr;  
+     >   
+     > &nbsp;int  
+     > &nbsp;GetVecFromObj \(Tcl\_Interp\* interp, Tcl\_Obj\* obj, vec2ptr\* vec\)  
+     > &nbsp;\{  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;int len;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if \(Tcl\_ListObjLength \(interp, obj, &len\) \!= TCL\_OK\) return TCL\_ERROR;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if \(len \!= 2\) \{  
+     > &nbsp;&nbsp;Tcl\_SetObjResult \(interp, Tcl\_ObjPrintf \("Expected 2 elements, got %d", len\)\);  
+     > &nbsp;&nbsp;return TCL\_ERROR;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\}  
+     >   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tcl\_Obj\* lv\[2\];  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if \(Tcl\_ListObjGetElements \(interp, obj, &lv\) \!= TCL\_OK\) return TCL\_ERROR;  
+     >   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;double x, y;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if \(Tcl\_GetDoubleFromObj \(interp, lv\[0\], &x\) \!= TCL\_OK\) return TCL\_ERROR;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if \(Tcl\_GetDoubleFromObj \(interp, lv\[1\], &y\) \!= TCL\_OK\) return TCL\_ERROR;  
+     >   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\*vec = Tcl\_Alloc \(sizeof \(vec2\)\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\(\*vec\)\->x = x;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\(\*vec\)\->y = y;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return TCL\_OK;  
+     > &nbsp;\}  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}  
+     >   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::argtype vec2 \{  
+     > &nbsp;if \(GetVecFromObj \(interp, @@, &@A\) \!= TCL\_OK\) return TCL\_ERROR;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\} vec2ptr vec2ptr  
+     >   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::argtyperelease vec2 \{  
+     > &nbsp;/\* @A : C variable holding the data to release \*/  
+     > &nbsp;Tcl\_Free \(\(char\*\) @A\);  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}  
+     >   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc norm \{vec2 vector\} double \{  
+     > &nbsp;double norm = hypot \(vector\->x, vector\->y\);  
+     > &nbsp;return norm;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. The structure to pass as argument is a 2\-dimensional vector\. It is actually
+     passed in as a pointer to a __vec2__ structure\. This pointer is created
+     by the __GetVecFromObj__ function\. It allocates and fills the structure
+     from the Tcl value, which has to be a list of 2 doubles\. The bulk of the
+     code in __GetVecFromObj__ is for verifying this and extracting the
+     doubles\.
+
+  1. The __argtyperelease__ code releases the pointer when the C function
+     returns\. In other words, the pointer to the structure is owned by the
+     translation layer and exists only while the function is active\.
+
+  1. While working this code has two disadvantages\. First there is memory churn\.
+     Each call of __norm__ causes the creation and release of a temporary
+     __vec2__ structure for the argument\. Second is the need to always
+     extract the data from the __Tcl\_Obj\*__ value\.
+
+     Both can be done better\.
+
+     We will come back to this after explaining how to return structures to Tcl\.
+
+## <a name='subsection23'></a>Structure Results
+
+  1. Starting from the end of the [previous](#subsection22) section\.
+
+  1. Edit the file "example\.tcl" and add the following code, just after the
+     definition of the __norm__ command\.
+
+             critcl::resulttype vec2 {
+         	/* rv: result value of function, interp: current Tcl interpreter */
+         	if (rv == NULL) return TCL_ERROR;
+         	Tcl_Obj* lv[2];
+         	lv[0] = Tcl_NewDoubleObj (rv->x);
+         	lv[1] = Tcl_NewDoubleObj (rv->y);
+         	Tcl_SetObjResult (interp, Tcl_NewListObj (2, lv));
+         	Tcl_Free (rv);
+         	return TCL_OK;
+             } vec2ptr ;# C result type
+
+             critcl::cproc add {vec2 a vec2 b} vec2 {
+         	vec2ptr z = Tcl_Alloc (sizeof (vec2));
+
+         	z->x = a->x + b->x;
+         	z->y = a->y + b->y;
+
+         	return z;
+             }
+
+     and rebuild the package\.
+
+  1. The new command __add__ takes two vectors and return the element\-wise
+     sum of both as a new vector\.
+
+  1. The function allocates and initializes a structure and hands it over to the
+     translation layer\. Which in turn constructs a Tcl list of 2 doubles from
+     it, sets that as the command's result and at last discards the allocated
+     structure again\.
+
+  1. While working this code has two disadvantages\. First there is memory churn\.
+     Each call of __add__ causes the creation and release of three temporary
+     __vec2__ structures\. One per argument, and one for the result\. Second
+     is the need to always construct a complex __Tcl\_Obj\*__ value from the
+     structure\.
+
+     Both can be done better\. This is explained in the next section\.
+
+## <a name='subsection24'></a>Structure Types
+
+  1. Starting from the end of the previous section\.
+
+  1. Edit the file "example\.tcl"\.
+
+  1. Remove the entire functionality \(type definitions, related C code, and
+     cprocs\)\. Replace it with
+
+             critcl::ccode {
+         	typedef struct vec2 {
+         	    double x;
+         	    double y;
+         	} vec2;
+
+         	typedef vec2* vec2ptr;
+
+         	/* -- Core vector structure management -- */
+
+         	static vec2ptr Vec2New (double x, double y) {
+         	    vec2ptr vec = Tcl_Alloc (sizeof (vec2));
+         	    vec->x = x;
+         	    vec->y = y;
+         	    return vec;
+         	}
+
+         	static vec2ptr Vec2Copy (vec2ptr src) {
+         	    vec2ptr vec = Tcl_Alloc (sizeof (vec2));
+         	    *vec = *src
+         	    return vec;
+         	}
+
+         	static void Vec2Release (vec2ptr vec) {
+         	    Tcl_Free ((char*) vec);
+         	}
+
+         	/* -- Tcl value type for vec2 -- Tcl_ObjType -- */
+
+         	static void Vec2Free     (Tcl_Obj* obj);
+         	static void Vec2StringOf (Tcl_Obj* obj);
+         	static void Vec2Dup      (Tcl_Obj* obj, Tcl_Obj* dst);
+         	static int  Vec2FromAny  (Tcl_Interp* interp, Tcl_Obj* obj);
+
+         	Tcl_ObjType vec2_objtype = {
+         	    "vec2",
+         	    Vec2Free,
+         	    Vec2Dup,
+         	    Vec2StringOf,
+         	    Vec2FromAny
+         	};
+
+         	static void Vec2Free (Tcl_Obj* obj) {
+         	    Vec2Release ((vec2ptr) obj->internalRep.otherValuePtr);
+         	}
+
+         	static void Vec2Dup (Tcl_Obj* obj, Tcl_Obj* dst) {
+         	    vec2ptr vec = (vec2ptr) obj->internalRep.otherValuePtr;
+
+         	    dst->internalRep.otherValuePtr = Vec2Copy (vec);
+         	    dst->typePtr                   = &vec2_objtype;
+         	}
+
+         	static void Vec2StringOf (Tcl_Obj* obj) {
+         	    vec2ptr vec = (vec2ptr) obj->internalRep.otherValuePtr;
+
+         	    /* Serialize vector data to string (list of two doubles) */
+         	    Tcl_DString      ds;
+         	    Tcl_DStringInit (&ds);
+
+         	    char buf [TCL_DOUBLE_SPACE];
+
+         	    Tcl_PrintDouble (0, vec->x, buf); Tcl_DStringAppendElement (&ds, buf);
+         	    Tcl_PrintDouble (0, vec->y, buf); Tcl_DStringAppendElement (&ds, buf);
+
+         	    int length = Tcl_DStringLength (ds);
+
+         	    /* Set string representation */
+         	    obj->length = length;
+         	    obj->bytes  = Tcl_Alloc(length+1);
+         	    memcpy (obj->bytes, Tcl_DStringValue (ds), length);
+         	    obj->bytes[length] = '\0';
+         	    /*
+         	    ** : package require critcl::cutil ;# get C utilities
+         	    ** : critcl::cutil::alloc          ;# Activate allocation utilities
+         	    ** : (Internally cheaders, include)
+         	    ** : Then all of the above can be written as STREP_DS (obj, ds);
+         	    ** : STREP_DS = STRing REP from DString
+         	    */
+
+         	    Tcl_DStringFree (&ds);
+         	}
+
+         	static int Vec2FromAny (Tcl_Interp* interp, Tcl_Obj* obj) {
+         	    /* Change intrep of obj to vec2 structure.
+         	    ** A Tcl list of 2 doubles is used as an intermediary intrep.
+         	    */
+
+         	    int len;
+         	    if (Tcl_ListObjLength (interp, obj, &len) != TCL_OK) return TCL_ERROR;
+         	    if (len != 2) {
+         		Tcl_SetObjResult (interp, Tcl_ObjPrintf ("Expected 2 elements, got %d", len));
+         		return TCL_ERROR;
+         	    }
+
+         	    Tcl_Obj* lv[2];
+         	    if (Tcl_ListObjGetElements (interp, obj, &lv) != TCL_OK) return TCL_ERROR;
+
+         	    double x, y;
+         	    if (Tcl_GetDoubleFromObj (interp, lv[0], &x) != TCL_OK) return TCL_ERROR;
+         	    if (Tcl_GetDoubleFromObj (interp, lv[1], &y) != TCL_OK) return TCL_ERROR;
+
+         	    obj->internalRep.otherValuePtr = (void*) Vec2New (x, y);
+         	    obj->typePtr                   = &vec2_objtype;
+
+         	    return TCL_OK;
+         	}
+
+         	/* -- (un)packing structures from/into Tcl values -- */
+
+         	int GetVecFromObj (Tcl_Interp* interp, Tcl_Obj* obj, vec2ptr* vec)
+         	{
+         	    if (obj->typePtr != &vec2_objtype) {
+         		if (Vec2FromAny (interp, obj) != TCL_OK) return TCL_ERROR;
+         	    }
+
+         	    *vec = (vec2ptr) obj->internalRep.otherValuePtr;
+         	    return TCL_OK;
+         	}
+
+         	Tcl_Obj* NewVecObj (vec2ptr vec) {
+         	    Tcl_Obj* obj = Tcl_NewObj ();
+
+         	    Tcl_InvalidateStringRep (obj);
+
+         	    obj->internalRep.otherValuePtr = Vec2Copy (vec);
+         	    obj->typePtr                   = &vec2_objtype;
+
+         	    return obj;
+         	}
+             }
+
+             critcl::argtype vec2 {
+         	if (GetVecFromObj (interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+             } vec2ptr vec2ptr
+
+             critcl::resulttype vec2 {
+         	/* rv: result value of function, interp: current Tcl interpreter */
+         	Tcl_SetObjResult (interp, NewVecObj (&rv));
+         	return TCL_OK;
+             } vec2
+
+             critcl::cproc norm {vec2 vector} double {
+         	double norm = hypot (vector->x, vector->y);
+         	return norm;
+             }
+
+             critcl::cproc add {vec2 a vec2 b} vec2 {
+         	vec2 z;
+
+         	z.x = a->x + b->x;
+         	z.y = a->y + b->y;
+
+         	return z;
+             }
+
+     and rebuild the package\.
+
+  1. This implements a new __Tcl\_ObjType__ to handle __vec2__
+     structures\. With it __vec2__ structures are become usable as internal
+     representation \(*intrep* of __Tcl\_Obj\*__ values\.
+
+     The two functions __NewVecObj__ and __GetVecFromObj__ pack and
+     unpack the structures from and into __Tcl\_Obj\*__ values\. The latter
+     performs the complex deserialization into a structure if and only if
+     needed, i\.e\. when the __TclObj\*__ value has no intrep, or the intrep
+     for a different type\. This process of changing the intrep of a Tcl value is
+     called *shimmering*\.
+
+     Intreps cache the interpretation of __Tcl\_Obj\*__ values as a specific
+     kind of type\. Here __vec2__\. This reduces conversion effort and memory
+     churn, as intreps are kept by the Tcl interpreter as long as possible and
+     needed\.
+
+  1. The arguments of __norm__ and __add__ are now converted once on
+     entry, if not yet in the proper type, or not at all, if so\.
+
+  1. *Attention*\. This example has the issue of passing result structures by
+     value through the stack, and then packing a copy into a __Tcl\_Obj\*__
+     value\. While this is no trouble for structures as small as __vec2__
+     larger structures may pose a problem\.
+
+     We will address this in the next section\.
+
+Packages: *[critcl::cutil](critcl\_cutil\.md)*
+
+## <a name='subsection25'></a>Large Structures
+
+  1. Starting from the end of the previous section\.
+
+  1. Edit the file "example\.tcl"\.
+
+  1. Describing each individual change is too complex\. The following is easier\.
+
+  1. Save the file, then replace the entire functionality with the following\.
+
+  1. After that use a __diff__ of your choice to compare the files and see
+     the critical changes\.
+
+             critcl::ccode {
+         	typedef struct vec2 {
+         	    unsigned int rc;
+         	    double x;
+         	    double y;
+         	} vec2;
+
+         	typedef vec2* vec2ptr;
+
+         	/* -- Core vector structure management -- */
+
+         	static vec2ptr Vec2New (double x, double y) {
+         	    vec2ptr vec = Tcl_Alloc (sizeof (vec2));
+         	    vec->rc = 0;
+         	    vec->x = x;
+         	    vec->y = y;
+         	    return vec;
+         	}
+
+         	static vec2ptr Vec2Copy (vec2ptr src) {
+         	    scr->rc ++;
+         	    return src;
+         	}
+
+         	static void Vec2Release (vec2ptr vec) {
+         	    if (vec->rc > 1) {
+         		vec->rc --;
+         		return;
+         	    }
+
+         	    Tcl_Free ((char*) vec);
+         	}
+
+         	/* -- Vector obj type -- */
+
+         	static void Vec2Free     (Tcl_Obj* obj);
+         	static void Vec2StringOf (Tcl_Obj* obj);
+         	static void Vec2Dup      (Tcl_Obj* obj, Tcl_Obj* dst);
+         	static int  Vec2FromAny  (Tcl_Interp* interp, Tcl_Obj* obj);
+
+         	Tcl_ObjType vec2_objtype = {
+         	    "vec2",
+         	    Vec2Free,
+         	    Vec2Dup,
+         	    Vec2StringOf,
+         	    Vec2FromAny
+         	};
+
+         	static void Vec2Free (Tcl_Obj* obj) {
+         	    Vec2Release ((vec2ptr) obj->internalRep.otherValuePtr);
+         	}
+
+         	static void Vec2Dup (Tcl_Obj* obj, Tcl_Obj* dst) {
+         	    vec2ptr vec = (vec2ptr) obj->internalRep.otherValuePtr;
+
+         	    dst->internalRep.otherValuePtr = Vec2Copy (vec);
+         	    dst->typePtr                   = &vec2_objtype;
+         	}
+
+         	static void Vec2StringOf (Tcl_Obj* obj) {
+         	    vec2ptr vec = (vec2ptr) obj->internalRep.otherValuePtr;
+
+         	    /* Serialize vector data to string (list of two doubles) */
+         	    Tcl_DString      ds;
+         	    Tcl_DStringInit (&ds);
+
+         	    char buf [TCL_DOUBLE_SPACE];
+
+         	    Tcl_PrintDouble (0, vec->x, buf); Tcl_DStringAppendElement (&ds, buf);
+         	    Tcl_PrintDouble (0, vec->y, buf); Tcl_DStringAppendElement (&ds, buf);
+
+         	    int length = Tcl_DStringLength (ds);
+
+         	    /* Set string representation */
+         	    obj->length = length;
+         	    obj->bytes  = Tcl_Alloc(length+1);
+         	    memcpy (obj->bytes, Tcl_DStringValue (ds), length);
+         	    obj->bytes[length] = '\0';
+         	    /*
+         	    ** : package require critcl::cutil ;# get C utilities
+         	    ** : critcl::cutil::alloc          ;# Activate allocation utilities
+         	    ** : (Internally cheaders, include)
+         	    ** : Then all of the above can be written as STREP_DS (obj, ds);
+         	    ** : STREP_DS = STRing REP from DString
+         	    */
+
+         	    Tcl_DStringFree (&ds);
+         	}
+
+         	static int Vec2FromAny (Tcl_Interp* interp, Tcl_Obj* obj) {
+         	    /* Change internal rep of obj to vector structure.
+         	    ** A Tcl list of 2 doubles is used as intermediary int rep.
+         	    */
+
+         	    int len;
+         	    if (Tcl_ListObjLength (interp, obj, &len) != TCL_OK) return TCL_ERROR;
+         	    if (len != 2) {
+         		Tcl_SetObjResult (interp, Tcl_ObjPrintf ("Expected 2 elements, got %d", len));
+         		return TCL_ERROR;
+         	    }
+
+         	    Tcl_Obj* lv[2];
+         	    if (Tcl_ListObjGetElements (interp, obj, &lv) != TCL_OK) return TCL_ERROR;
+
+         	    double x, y;
+         	    if (Tcl_GetDoubleFromObj (interp, lv[0], &x) != TCL_OK) return TCL_ERROR;
+         	    if (Tcl_GetDoubleFromObj (interp, lv[1], &y) != TCL_OK) return TCL_ERROR;
+
+         	    obj->internalRep.otherValuePtr = (void*) Vec2New (x, y);
+         	    obj->typePtr                   = &vec2_objtype;
+
+         	    return TCL_OK;
+         	}
+
+         	/* (un)packing structures from/into Tcl values -- */
+
+         	int GetVecFromObj (Tcl_Interp* interp, Tcl_Obj* obj, vec2ptr* vec)
+         	{
+         	    if (obj->typePtr != &vec2_objtype) {
+         		if (VecFromAny (interp, obj) != TCL_OK) return TCL_ERROR;
+         	    }
+
+         	    *vec = (vec2ptr) obj->internalRep.otherValuePtr;
+         	    return TCL_OK;
+         	}
+
+         	Tcl_Obj* NewVecObj (vec2ptr vec) {
+         	    Tcl_Obj* obj = Tcl_NewObj ();
+
+         	    Tcl_InvalidateStringRep (obj);
+
+         	    obj->internalRep.otherValuePtr = Vec2Copy (vec);
+         	    obj->typePtr                   = &vec2_objtype;
+
+         	    return obj;
+         	}
+             }
+
+             critcl::argtype vec2 {
+         	if (GetVecFromObj (interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+             } vec2ptr vec2ptr
+
+             critcl::resulttype vec2 {
+         	/* rv: result value of function, interp: current Tcl interpreter */
+         	Tcl_SetObjResult (interp, NewVecObj (rv));
+         	return TCL_OK;
+             } vec2ptr
+
+             critcl::cproc norm {vec2 vector} double {
+         	double norm = hypot (vector->x, vector->y);
+         	return norm;
+             }
+
+             critcl::cproc add {vec2 a vec2 b} vec2 {
+         	return Vec2New (a->x + b->x, a->y + b->y);
+             }
+
+  1. The __vec2__ structure is now reference counted\.
+
+  1. The core management functions, i\.e\. __Vec2New__, __Vec2Copy__, and
+     __Vec2Release__ are changed to maintain that reference count\. Starting
+     at __0__ on creation, copies increment, and releases decrement\. A
+     structure is actually only freed when its reference count falls to
+     __0__ or below\.
+
+  1. __vec2__ results are changed to pointers, easily passed back through
+     the stack\. The modified translation layer just wraps it into a
+     __Tcl\_Obj\*__ value\.
+
+  1. *Attention*\. Duplicating such a __Tcl\_Obj\*__ does not duplicate the
+     referenced __vec2__ structure anymore, just adds a reference\.
+
+  1. Regarding __diff__ commands, I know of two graphical diffs for Tcl/Tk,
+     [TkDiff](https://tkdiff\.sourceforge\.io), and
+     [Eskil](http://eskil\.tcl\.tk)\.
+
+Packages: *[critcl::cutil](critcl\_cutil\.md)*
+
+## <a name='subsection26'></a>External Structures
+
+  1. Handle structures provided by external libraries using either [Structure
+     Types](#subsection24) or [Large Structures](#subsection25) as
+     template\.
+
+  1. *Attention*\. The choice is with the developer\.
+
+     This is true even if the external structure is not reference counted by
+     itself\.
+
+     To reference count a structure __S__ without such simply wrap __S__
+     into a local structure which provides the reference count and has a field
+     for __S__ \(pointer or value\)\.
+
+  1. *Attention* Opaque external types, i\.e\. pointers to structures with
+     hidden fields, can also be handled by the given templates\.
+
+## <a name='subsection27'></a>External Enumerations
+
+This section demonstrates how to convert from any kind of enumeration provided
+by an external library to Tcl strings, and the converse\.
+
+  1. For all that this is a part of how to [Use External
+     Libraries](#section3), for the demonstratation only the basics are
+     needed\.
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;package require critcl::emap  
+     >   
+     > &nbsp;&nbsp;&nbsp;&nbsp;\# no header included due to use of literal ints instead of symbolic names  
+     >   
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::emap::def yaml\_sequence\_style\_t \{  
+     > &nbsp;any   0  
+     > &nbsp;block 1  
+     > &nbsp;flow  2  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}  
+     >   
+     > &nbsp;&nbsp;&nbsp;&nbsp;\# encode: style to int  
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc encode \{yaml\_sequence\_style\_t style\} int \{  
+     > &nbsp;return style;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}  
+     >   
+     > &nbsp;&nbsp;&nbsp;&nbsp;\# decode: int to style  
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc decode \{int style\} yaml\_sequence\_style\_t \{  
+     > &nbsp;return style;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. The map converts between the Tcl level strings listed on the left side to
+     the C values on the right side, and the reverse\.
+
+  1. It automatically generates __critcl::argtype__ and
+     __critcl::resulttype__ definitions\.
+
+  1. *Attention* Like the default values for __cproc__ arguments, and the
+     results for __cconst__ definitions the values on the right side have to
+     be proper C rvalues\. They have to match C type __int__\.
+
+     In other words, it is perfectly ok to use the symbolic names provided by
+     the header file of the external library\.
+
+     *Attention* This however comes at a loss in efficiency\. As
+     *[CriTcl](critcl\.md)* then has no insight into the covered range of
+     ints, gaps, etc\. it has to perform a linear search when mapping from C to
+     Tcl\. When it knows the exact integer values it can use a table lookup
+     instead\.
+
+     *Attention* It also falls back to a search if a lookup table would
+     contain more than 50 entries\.
+
+Packages: *[critcl::emap](critcl\_emap\.md)*
+
+## <a name='subsection28'></a>External Bitsets/Bitmaps/Flags
+
+This section demonstrates how to convert from any kind of bit\-mapped flags
+provided by an external library to lists of Tcl strings, and the converse\.
+
+  1. For all that this is a part of how to [Use External
+     Libraries](#section3), for the demonstratation only the basics are
+     needed\.
+
+  1. > &nbsp;Starting from the [Basics](#section2)\.   
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Edit the file "example\.tcl"\.  
+     > &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remove the definition of __hello__\. Replace it with   
+     > &nbsp;&nbsp;&nbsp;&nbsp;\# http://man7\.org/linux/man\-pages/man7/inotify\.7\.html  
+     > &nbsp;&nbsp;&nbsp;&nbsp;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;package require critcl::bitmap  
+     >   
+     > &nbsp;&nbsp;&nbsp;&nbsp;\# critcl::cheaders \- n/a, header is in system directories  
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::include sys/inotify\.h  
+     > &nbsp;&nbsp;&nbsp;&nbsp;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::bitmap::def tcl\_inotify\_events \{  
+     > &nbsp;accessed       IN\_ACCESS  
+     > &nbsp;all            IN\_ALL\_EVENTS  
+     > &nbsp;attribute      IN\_ATTRIB  
+     > &nbsp;closed         IN\_CLOSE  
+     > &nbsp;closed\-nowrite IN\_CLOSE\_NOWRITE  
+     > &nbsp;closed\-write   IN\_CLOSE\_WRITE  
+     > &nbsp;created        IN\_CREATE  
+     > &nbsp;deleted        IN\_DELETE  
+     > &nbsp;deleted\-self   IN\_DELETE\_SELF  
+     > &nbsp;dir\-only       IN\_ONLYDIR  
+     > &nbsp;dont\-follow    IN\_DONT\_FOLLOW  
+     > &nbsp;modified       IN\_MODIFY  
+     > &nbsp;move           IN\_MOVE  
+     > &nbsp;moved\-from     IN\_MOVED\_FROM  
+     > &nbsp;moved\-self     IN\_MOVE\_SELF  
+     > &nbsp;moved\-to       IN\_MOVED\_TO  
+     > &nbsp;oneshot        IN\_ONESHOT  
+     > &nbsp;open           IN\_OPEN  
+     > &nbsp;overflow       IN\_Q\_OVERFLOW  
+     > &nbsp;unmount        IN\_UNMOUNT  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\} \{  
+     > &nbsp;all closed move oneshot  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}  
+     > &nbsp;&nbsp;&nbsp;&nbsp;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\# encode: flag set to int  
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc encode \{tcl\_inotify\_events e\} int \{  
+     > &nbsp;return e;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}  
+     >   
+     > &nbsp;&nbsp;&nbsp;&nbsp;\# decode: int to flag set  
+     > &nbsp;&nbsp;&nbsp;&nbsp;critcl::cproc decode \{int e\} tcl\_inotify\_events \{  
+     > &nbsp;return e;  
+     > &nbsp;&nbsp;&nbsp;&nbsp;\}
+
+     and rebuild the package\.
+
+  1. The map converts between lists of the Tcl level strings listed on the left
+     side to the bit\-union of the C values on the right side, and the reverse\.
+
+     It is noted that the four strings __all__, __closed__,
+     __move__, and __oneshot__ cannot be converted from C flags to list
+     of strings, only from list to bits\.
+
+  1. It automatically generates __critcl::argtype__ and
+     __critcl::resulttype__ definitions\.
+
+  1. *Attention* Like the default values for __cproc__ arguments, and the
+     results for __cconst__ definitions the values on the right side have to
+     be proper C rvalues\. They have to match C type __int__\.
+
+     In other words, it is perfectly ok to use the symbolic names provided by
+     the header file of the external library\. As shown\.
+
+Packages: *[critcl::bitmap](critcl\_bitmap\.md)*
+
+## <a name='subsection29'></a>Non\-standard header/library locations
+
+  1. See and reread the [basic wrapper package](#section3) for the
+     introduction of the commands referenced below\.
+
+  1. *Attention* Relative paths will be resolved relative to the location of
+     the "\.tcl" file containing the *[CriTcl](critcl\.md)* commands\.
+
+  1. Use the command __critcl::cheaders__ to tell
+     *[CriTcl](critcl\.md)* about non\-standard locations for header files\.
+
+     Multiple arguments are allowed, and multiple calls as well\. The information
+     accumulates\.
+
+     Arguments of the form "\-Idirectory" register the directory directly\.
+
+     For arguments of the form "path" the directory holding the path is
+     registered\. In other words, it is assumed to be the full path of a header
+     *file*, and not a directory\.
+
+         critcl::cheaders -I/usr/local/include
+         critcl::cheaders local/types.h
+         critcl::cheaders other-support/*.h
+
+  1. Use the command __critcl::include__ to actually use a specific header
+     file\.
+
+  1. Use the command __critcl::clibraries__ to tell
+     *[CriTcl](critcl\.md)* about non\-standard locations for shared
+     libaries, and about shared libaries to link to
+
+     Multiple arguments are allowed, and multiple calls as well\. The information
+     accumulates\.
+
+     Arguments of the form "\-Ldirectory" register a directory\.
+
+     Arguments of the form "\-lname" register a shared libary to link to by name\.
+     The library will be looked for in both standard and registered directories\.
+
+     Arguments of the form "\-path" register a shared libary to link to by full
+     path\.
+
+         critcl::clibraries -L/usr/lib/x86_64-linux-gnu
+         critcl::clibraries -lzstd
+         critcl::clibraries /usr/lib/x86_64-linux-gnu/libzstd.so
+
+  1. On Mac OS X use the command __critcl::framework__ to name the
+     frameworks to use in the package\.
+
+     *Attention* Using the command on other platforms is ok, and will be
+     ignored\.
+
+  1. Not answered in the above is how to find the necessary paths if they are
+     not fixed across machines or platforms\.
+
+     We will come back to this\.
+
+## <a name='subsection30'></a>Non\-standard compile/link configuration
+
+  1. See and reread the [basic wrapper package](#section3) for the
+     introduction of the commands referenced below\.
+
+  1. Use the command __critcl::cflags__ to provide additional, non\-standard
+     flags to the compiler\.
+
+         critcl::cflags -DBYTE_ORDER=bigendian
+
+  1. Use the command __critcl::ldflags__ to provide additional, non\-standard
+     flags to the linker\.
+
+         critcl::ldflags -
+
+  1. Not answered in the above is how to determine such flags if they are not
+     fixed across machines or platforms\.
+
+     This is addressed by the next section\.
+
+## <a name='subsection31'></a>Querying the compilation environment
+
+  1. Use the command __critcl::check__ to immediately check if a piece of C
+     code can compiled successfully as a means of querying the compiler
+     configuration itself\.
+
+         if {[critcl::check {
+             #include <FOO.h>
+         }]} {
+             Do stuff with FOO.h present.
+         } else {
+             Do stuff without FOO.h
+         }
+
+     All header and library paths which were registered with
+     *[CriTcl](critcl\.md)* before using __critcl::check__ take part in
+     the attempted compilation\.
+
+     Use the package __[critcl::util](critcl\_util\.md)__ and various
+     convenience commands it provides\.
+
+  1. Use the full *Power of Tcl \(tm\)* itself\.
+
+## <a name='subsection32'></a>Shared C Code
+
+  1. See and reread the [basic wrapper package](#section3) for the
+     introduction of the commands referenced below\.
+
+  1. Use the command __critcl::ccode__ to write C code residing outside of
+     __cproc__ bodies\.
+
+  1. Or, alternatively, place the C code into one or more "\.c" files and use the
+     command __critcl::csources__ to register them with
+     *[CriTcl](critcl\.md)* for compilation\.
+
+  1. This topic is also treated in section [Separating Local C
+     Sources](#subsection20)\.
+
+# <a name='section4'></a>Various
+
+## <a name='subsection33'></a>Author, License, Description, Keywords
+
+  1. See and reread the [basic package](#section2) for the introduction of
+     the commands referenced below\.
+
+  1. Use the command __critcl::license__ to set the package license\.
+
+     Use the same command to set the package author\.
+
+     Both arguments are free form text\.
+
+  1. Use the command __critcl::summary__ to set a short package description\.
+
+  1. Use the command __critcl::description__ to set a longer package
+     description\.
+
+     The arguments of both commands are free form text\.
+
+  1. Use the command __critcl::subject__ to set one or more keywords\.
+
+     *Attention* Contrary to the other commands the arguments accumulate\.
+
+  1. All the commands are optional\.
+
+  1. Their information is not placed into the generated C code\.
+
+  1. In *package mode* the information is placed into the file "teapot\.txt" of
+     the generated package\.
+
+  1. This file serves as integration point for *Teapot*, the package system of
+     *ActiveTcl*\.
+
+## <a name='subsection34'></a>Get Critcl Application Help
+
+  1. Invoke the command
+
+         critcl -help
+
+     in a terminal to get help about the __[critcl](critcl\.md)__
+     application\.
+
+## <a name='subsection35'></a>Supported Targets & Configurations
+
+  1. Invoke the application as
+
+         critcl -show
+
+     in a terminal to get the detailed configuration of the target for the
+     current platform\.
+
+  1. Invoke the application as
+
+         critcl -show -target NAME
+
+     in a terminal to get the detailed configuration of the named target\.
+
+  1. Invoke the application as
+
+         critcl -targets
+
+     in a terminal to get a list of the available targets\.
+
+## <a name='subsection36'></a>Building A Package
+
+  1. Start at section [Basics](#section2)\.
+
+## <a name='subsection37'></a>Building A Package For Debugging
+
+  1. Start at section [Basics](#section2)\.
+
+# <a name='section5'></a>Authors
+
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+# <a name='section6'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report them at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)\.
+Ideas for enhancements you may have for either package, application, and/or the
+documentation are also very welcome and should be reported at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)
+as well\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [calling C code from
+Tcl](\.\./index\.md\#calling\_c\_code\_from\_tcl), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; Jean\-Claude Wippler  
+Copyright &copy; Steve Landers  
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_iassoc.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_iassoc.md
new file mode 100644
index 00000000..a18e3ba4
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_iassoc.md
@@ -0,0 +1,191 @@
+
+[//000000001]: # (critcl::iassoc \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_iassoc\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000004]: # (critcl::iassoc\(n\) 1\.2 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl::iassoc \- CriTcl \- Code Gen \- Tcl Interp Associations
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Synopsis](#synopsis)
+
+  - [Description](#section1)
+
+  - [API](#section2)
+
+  - [Example](#section3)
+
+  - [Authors](#section4)
+
+  - [Bugs, Ideas, Feedback](#section5)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='synopsis'></a>SYNOPSIS
+
+package require Tcl 8\.6  
+package require critcl ?3\.2?  
+package require critcl::iassoc ?1\.2?  
+
+[__::critcl::iassoc::def__ *name* *arguments* *struct* *constructor* *destructor*](#1)  
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This document is the reference manpage for the __critcl::iassoc__ package\.
+This package provides convenience commands for advanced functionality built on
+top of the critcl core\.
+
+With it a user wishing to associate some data with a Tcl interpreter via Tcl's
+__Tcl\_\(Get&#124;Set\)AssocData\(\)__ APIs can now concentrate on the data itself,
+while all the necessary boilerplate around it is managed by this package\.
+
+Its intended audience are mainly developers wishing to write Tcl packages with
+embedded C code\.
+
+This package resides in the Core Package Layer of CriTcl\.
+
+![](\.\./image/arch\_core\.png)
+
+# <a name='section2'></a>API
+
+  - <a name='1'></a>__::critcl::iassoc::def__ *name* *arguments* *struct* *constructor* *destructor*
+
+    This command defines a C function with the given *name* which provides
+    access to a structure associated with a Tcl interpreter\.
+
+    The C code code fragment *struct* defines the elements of said structure,
+    whereas the fragments *constructor* and *destructor* are C code blocks
+    executed to initialize and release any dynamically allocated parts of this
+    structure, when needed\. Note that the structure itself is managed by the
+    system\.
+
+    The new function takes a __Tcl\_Interp\*__ pointer refering to the
+    interpreter whose structure we wish to obtain as the first argument, plus
+    the specified *arguments* and returns a pointer to the associated
+    structure, of type "*name*\_data" \(see below\)\.
+
+    The *arguments* are a dictionary\-like list of C types and identifiers
+    specifying additional arguments for the accessor function, and, indirectly,
+    the *constructor* C code block\. This is useful for the supplication of
+    initialization values, or the return of more complex error information in
+    case of a construction failure\.
+
+    The C types associated with the structure are derived from *name*, with
+    "*name*\_data\_\_" the type of the structure itself, and "*name*\_data"
+    representing a pointer to the structure\. The C code blocks can rely on the
+    following C environments:
+
+      * *constructor*
+
+          + __data__
+
+            Pointer to the structure \(type: *name*\_data\) to initialize\.
+
+          + __interp__
+
+            Pointer to the Tcl interpreter \(type: Tcl\_Interp\*\) the new structure
+            will be associated with\.
+
+          + error
+
+            A C code label the constructor can jump to should it have to signal
+            a construction failure\. It is the responsibility of the constructor
+            to release any fields already initialized before jumping to this
+            label\.
+
+          + \.\.\.
+
+            The names of the constructor arguments specified with *arguments*\.
+
+      * *destructor*
+
+          + __data__
+
+            Pointer to the structure being released\.
+
+          + __interp__
+
+            Pointer to the Tcl interpreter the structure belonged to\.
+
+# <a name='section3'></a>Example
+
+The example shown below is the specification of a simple interpreter\-associated
+counter\. The full example, with meta data and other incidentals, can be found in
+the directory "examples/queue" of the critcl source distribution/repository\.
+
+    package require Tcl 8.6
+    package require critcl 3.2
+
+    critcl::buildrequirement {
+        package require critcl::iassoc
+    }
+
+    critcl::iassoc::def icounter {} {
+        int counter; /* The counter variable */
+    } {
+        data->counter = 0;
+    } {
+        /* Nothing to release */
+    }
+
+    critcl::ccode {
+        ... function (...)
+        {
+             /* Access to the data ... */
+             icounter_data D = icounter (interp /* ... any declared arguments, here, none */);
+    	 ... D->counter ...
+        }
+    }
+    # or, of course, 'cproc's, 'ccommand's etc.
+
+    package provide icounter 1
+
+# <a name='section4'></a>Authors
+
+Andreas Kupries
+
+# <a name='section5'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report such at
+[https://github\.com/andreas\-kupries/critcl](https://github\.com/andreas\-kupries/critcl)\.
+Please also report any ideas for enhancements you may have for either package
+and/or documentation\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [Tcl Interp
+Association](\.\./index\.md\#tcl\_interp\_association), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation),
+[singleton](\.\./index\.md\#singleton)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_license.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_license.md
new file mode 100644
index 00000000..7eceefbd
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_license.md
@@ -0,0 +1,114 @@
+
+[//000000001]: # (critcl\_license \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_license\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; Jean\-Claude Wippler)
+[//000000004]: # (Copyright &copy; Steve Landers)
+[//000000005]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000006]: # (critcl\_license\(n\) 1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl\_license \- The CriTcl License
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Description](#section1)
+
+  - [License](#section2)
+
+  - [Authors](#section3)
+
+  - [Bugs, Ideas, Feedback](#section4)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+All packages are under the BSD license\.
+
+# <a name='section2'></a>License
+
+This software is copyrighted by Andreas Kupries and other parties\. The following
+terms apply to all files associated with the software unless explicitly
+disclaimed in individual files\.
+
+The authors hereby grant permission to use, copy, modify, distribute, and
+license this software and its documentation for any purpose, provided that
+existing copyright notices are retained in all copies and that this notice is
+included verbatim in any distributions\. No written agreement, license, or
+royalty fee is required for any of the authorized uses\. Modifications to this
+software may be copyrighted by their authors and need not follow the licensing
+terms described here, provided that the new terms are clearly indicated on the
+first page of each file where they apply\.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE
+OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF, EVEN IF THE
+AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, AND NON\-INFRINGEMENT\. THIS SOFTWARE IS PROVIDED ON AN "AS
+IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
+MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS\.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the U\.S\.
+government, the Government shall have only "Restricted Rights" in the software
+and related documentation as defined in the Federal Acquisition Regulations
+\(FARs\) in Clause 52\.227\.19 \(c\) \(2\)\. If you are acquiring the software on behalf
+of the Department of Defense, the software shall be classified as "Commercial
+Computer Software" and the Government shall have only "Restricted Rights" as
+defined in Clause 252\.227\-7014 \(b\) \(3\) of DFARs\. Notwithstanding the foregoing,
+the authors grant the U\.S\. Government and others acting in its behalf permission
+to use and distribute the software in accordance with the terms specified in
+this license\.
+
+# <a name='section3'></a>Authors
+
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+# <a name='section4'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report them at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)\.
+Ideas for enhancements you may have for either package, application, and/or the
+documentation are also very welcome and should be reported at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)
+as well\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [calling C code from
+Tcl](\.\./index\.md\#calling\_c\_code\_from\_tcl), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; Jean\-Claude Wippler  
+Copyright &copy; Steve Landers  
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_literals.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_literals.md
new file mode 100644
index 00000000..6cf3a6fa
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_literals.md
@@ -0,0 +1,216 @@
+
+[//000000001]: # (critcl::literals \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_literals\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000004]: # (critcl::literals\(n\) 1\.4 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl::literals \- CriTcl \- Code Gen \- Constant string pools
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Synopsis](#synopsis)
+
+  - [Description](#section1)
+
+  - [API](#section2)
+
+  - [Example](#section3)
+
+  - [Authors](#section4)
+
+  - [Bugs, Ideas, Feedback](#section5)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='synopsis'></a>SYNOPSIS
+
+package require Tcl 8\.6  
+package require critcl ?3\.2?  
+package require critcl::literals ?1\.4?  
+
+[__::critcl::literals::def__ *name* *definition* ?*mode*?](#1)  
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This document is the reference manpage for the __critcl::literals__ package\.
+This package provides convenience commands for advanced functionality built on
+top of both critcl core and package
+__[critcl::iassoc](critcl\_iassoc\.md)__\.
+
+Many packages will have a fixed set of string constants occuring in one or
+places\. Most of them will be coded to create a new string __Tcl\_Obj\*__ from
+a C __char\*__ every time the constant is needed, as this is easy to to,
+despite the inherent waste of memory\.
+
+This package was written to make declaration and management of string pools
+which do not waste memory as easy as the wasteful solution, hiding all attendant
+complexity from the user\.
+
+Its intended audience are mainly developers wishing to write Tcl packages with
+embedded C code\.
+
+This package resides in the Core Package Layer of CriTcl\.
+
+![](\.\./image/arch\_core\.png)
+
+# <a name='section2'></a>API
+
+  - <a name='1'></a>__::critcl::literals::def__ *name* *definition* ?*mode*?
+
+    This command defines a C function with the given *name* which provides
+    access to a pool of constant strings with a Tcl interpreter\.
+
+    The *definition* dictionary provides the mapping from the C\-level symbolic
+    names to the string themselves\.
+
+    The *mode*\-list configures the output somewhat\. The three allowed modes
+    are __c__, __\+list__ and __tcl__\. All modes can be used
+    together\. The default mode is __tcl__\. Using mode __\+list__ implies
+    __tcl__ as well\.
+
+    For mode __tcl__ the new function has two arguments, a
+    __Tcl\_Interp\*__ pointer refering to the interpreter holding the string
+    pool, and a code of type "*name*\_names" \(see below\), the symbolic name of
+    the literal to return\. The result of the function is a __Tcl\_Obj\*__
+    pointer to the requested string constant\.
+
+    For mode __c__ the new function has one argument, a code of type
+    "*name*\_names" \(see below\), the symbolic name of the literal to return\.
+    The result of the function is a __const char\*__ pointer to the requested
+    string constant\.
+
+    For mode __\+list__ all of __tcl__ applies, plus an additional
+    function is generated which takes three arguments, in order, a
+    __Tcl\_Interp\*__ pointer refering to the interpreter holding the string
+    pool, an __int__ holding the size of the last argument, and an array of
+    type "*name*\_names" holding the codes \(see below\), the symbolic names of
+    the literals to return\. The result of the function is a __Tcl\_Obj\*__
+    pointer to a Tcl list holding the requested string constants\.
+
+    The underlying string pool is automatically initialized on first access, and
+    finalized on interpreter destruction\.
+
+    The package generates multiple things \(declarations and definitions\) with
+    names derived from *name*, which has to be a proper C identifier\.
+
+      * *name*
+
+        The mode __tcl__ function providing access to the string pool\. Its
+        signature is
+
+        > Tcl\_Obj\* *name* \(Tcl\_Interp\* interp, *name*\_names literal\);
+
+      * *name*\_list
+
+        The mode __\+list__ function providing multi\-access to the string
+        pool\. Its signature is
+
+        > Tcl\_Obj\* *name*\_list \(Tcl\_Interp\* interp, int c, *name*\_names\* literal\);
+
+      * *name*\_cstr
+
+        The mode __c__ function providing access to the string pool\. Its
+        signature is
+
+        > const char\* *name*\_cstr \(*name*\_names literal\);
+
+      * *name*\_names
+
+        A C enumeration type containing the symbolic names of the strings
+        provided by the pool\.
+
+      * *name*\.h
+
+        A header file containing the declarations for the accessor functions and
+        the enumeration type, for use by other parts of the system, if
+        necessary\.
+
+        The generated file is stored in a place where it will not interfere with
+        the overall system outside of the package, yet also be available for
+        easy inclusion by package files \(__csources__\)\.
+
+      * *name*
+
+        *New in version 1\.1*: For mode __tcl__ the command registers a new
+        result\-type for __critcl::cproc__ with critcl, which takes an
+        integer result from the function and converts it to the equivalent
+        string in the pool for the script\.
+
+# <a name='section3'></a>Example
+
+The example shown below is the specification of the string pool pulled from the
+draft work on a Tcl binding to Linux's inotify APIs\.
+
+    package require Tcl 8.6
+    package require critcl 3.2
+
+    critcl::buildrequirement {
+        package require critcl::literals
+    }
+
+    critcl::literals::def tcl_inotify_strings {
+        w_create	"create"
+        w_directory	"directory"
+        w_events	"events"
+        w_file	"file"
+        w_handler	"handler"
+        w_remove	"remove"
+    } {c tcl}
+
+    # Declarations: tcl_inotify_strings.h
+    # Type:         tcl_inotify_strings_names
+    # Accessor:     Tcl_Obj*    tcl_inotify_strings      (Tcl_Interp*               interp,
+    #                                                     tcl_inotify_strings_names literal);
+    # Accessor:     const char* tcl_inotify_strings_cstr (tcl_inotify_strings_names literal);
+    # ResultType:   tcl_inotify_strings
+
+# <a name='section4'></a>Authors
+
+Andreas Kupries
+
+# <a name='section5'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report such at
+[https://github\.com/andreas\-kupries/critcl](https://github\.com/andreas\-kupries/critcl)\.
+Please also report any ideas for enhancements you may have for either package
+and/or documentation\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [Tcl Interp
+Association](\.\./index\.md\#tcl\_interp\_association), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[literal pool](\.\./index\.md\#literal\_pool), [on demand
+compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation),
+[singleton](\.\./index\.md\#singleton), [string
+pool](\.\./index\.md\#string\_pool)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_package.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_package.md
new file mode 100644
index 00000000..696c9bf8
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_package.md
@@ -0,0 +1,2113 @@
+
+[//000000001]: # (critcl\_package \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_package\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; Jean\-Claude Wippler)
+[//000000004]: # (Copyright &copy; Steve Landers)
+[//000000005]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000006]: # (critcl\_package\(n\) 3\.2\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl\_package \- CriTcl Package Reference
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Synopsis](#synopsis)
+
+  - [Description](#section1)
+
+  - [API](#section2)
+
+      - [Embedded C Code](#subsection1)
+
+      - [Stubs Table Management](#subsection2)
+
+      - [Package Meta Data](#subsection3)
+
+      - [Control & Interface](#subsection4)
+
+      - [Introspection](#subsection5)
+
+      - [Build Management](#subsection6)
+
+      - [Result Cache Management](#subsection7)
+
+      - [Build Configuration](#subsection8)
+
+      - [Tool API](#subsection9)
+
+      - [Advanced: Embedded C Code](#subsection10)
+
+      - [Custom Build Configuration](#subsection11)
+
+      - [Advanced: Location management](#subsection12)
+
+      - [Advanced: Diversions](#subsection13)
+
+      - [Advanced: File Generation](#subsection14)
+
+  - [Concepts](#section3)
+
+      - [Modes Of Operation/Use](#subsection15)
+
+      - [Runtime Behaviour](#subsection16)
+
+      - [File Mapping](#subsection17)
+
+      - [Result Cache](#subsection18)
+
+      - [Preloading functionality](#subsection19)
+
+      - [Configuration Internals](#subsection20)
+
+      - [Stubs Tables](#subsection21)
+
+  - [Examples](#section4)
+
+  - [Authors](#section5)
+
+  - [Bugs, Ideas, Feedback](#section6)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='synopsis'></a>SYNOPSIS
+
+package require Tcl 8\.6  
+package require critcl ?3\.2\.1?  
+package require platform ?1\.0\.2?  
+package require md5 ?2?  
+
+[__::critcl::ccode__ *fragment*](#1)  
+[__::critcl::ccommand__ *tclname* *cname*](#2)  
+[__::critcl::ccommand__ *tclname* *arguments* *body* ?*option* *value*\.\.\.?](#3)  
+[__::critcl::cdata__ *tclname* *data*](#4)  
+[__::critcl::cconst__ *tclname* *resulttype* *value*](#5)  
+[__::critcl::cdefines__ *list of glob patterns* ?*namespace*?](#6)  
+[__::critcl::cproc__ *name* *arguments* *resulttype* *body* ?*option* *value*\.\.\.?](#7)  
+[__::critcl::cproc__ *name* *arguments* *resulttype*](#8)  
+[__::critcl::cinit__ *text* *externals*](#9)  
+[__::critcl::include__ *path*](#10)  
+[__::critcl::api__ __import__ *name* *version*](#11)  
+[__::critcl::api__ __function__ *resulttype* *name* *arguments*](#12)  
+[__::critcl::api__ __header__ ?*glob pattern*\.\.\.?](#13)  
+[__::critcl::api__ __extheader__ ?*file*\.\.\.?](#14)  
+[__::critcl::license__ *author* ?*text*\.\.\.?](#15)  
+[__::critcl::summary__ *text*](#16)  
+[__::critcl::description__ *text*](#17)  
+[__::critcl::subject__ ?*key*\.\.\.?](#18)  
+[__::critcl::meta__ *key* ?*word*\.\.\.?](#19)  
+[__::critcl::meta?__ *key*](#20)  
+[__::critcl::buildrequirement__ *script*](#21)  
+[__::critcl::cheaders__ ?*arg*\.\.\.?](#22)  
+[__::critcl::csources__ ?*glob pattern*\.\.\.?](#23)  
+[__::critcl::clibraries__ ?*glob pattern*\.\.\.?](#24)  
+[__::critcl::source__ *glob pattern*](#25)  
+[__::critcl::tsources__ *glob pattern*\.\.\.](#26)  
+[__::critcl::owns__ *glob pattern*\.\.\.](#27)  
+[__::critcl::cflags__ ?*arg*\.\.\.?](#28)  
+[__::critcl::ldflags__ ?*arg*\.\.\.?](#29)  
+[__::critcl::framework__ ?*arg*\.\.\.?](#30)  
+[__::critcl::tcl__ *version*](#31)  
+[__::critcl::tk__](#32)  
+[__::critcl::preload__ *lib*\.\.\.](#33)  
+[__::critcl::debug__ *area*\.\.\.](#34)  
+[__::critcl::check__ ?*label*? *text*](#35)  
+[__::critcl::checklink__ ?*label*? *text*](#36)  
+[__::critcl::msg__ ?__\-nonewline__? *msg*](#37)  
+[__::critcl::print__ ?__\-nonewline__? ?*chan*? *msg*](#38)  
+[__::critcl::compiled__](#39)  
+[__::critcl::compiling__](#40)  
+[__::critcl::done__](#41)  
+[__::critcl::failed__](#42)  
+[__::critcl::load__](#43)  
+[__::critcl::config__ *option* ?*val*?](#44)  
+[__::critcl::cache__ ?path?](#45)  
+[__::critcl::clean\_cache__ ?*pattern*\.\.\.?](#46)  
+[__::critcl::readconfig__ *path*](#47)  
+[__::critcl::showconfig__ ?*chan*?](#48)  
+[__::critcl::showallconfig__ ?*chan*?](#49)  
+[__::critcl::chooseconfig__ *target* ?*nomatcherr*?](#50)  
+[__::critcl::setconfig__ *target*](#51)  
+[__::critcl::actualtarget__](#52)  
+[__::critcl::buildforpackage__ ?*flag*?](#53)  
+[__::critcl::cnothingtodo__ *file*](#54)  
+[__::critcl::cresults__ ?*file*?](#55)  
+[__::critcl::crosscheck__](#56)  
+[__::critcl::error__ *msg*](#57)  
+[__::critcl::knowntargets__](#58)  
+[__::critcl::sharedlibext__](#59)  
+[__::critcl::targetconfig__](#60)  
+[__::critcl::buildplatform__](#61)  
+[__::critcl::targetplatform__](#62)  
+[__::critcl::cobjects__ ?*glob pattern*\.\.\.?](#63)  
+[__::critcl::scan__ *path*](#64)  
+[__::critcl::name2c__ *name*](#65)  
+[__::critcl::argnames__ *arguments*](#66)  
+[__::critcl::argcnames__ *arguments*](#67)  
+[__::critcl::argcsignature__ *arguments*](#68)  
+[__::critcl::argvardecls__ *arguments*](#69)  
+[__::critcl::argconversion__ *arguments* ?*n*?](#70)  
+[__::critcl::argoptional__ *arguments*](#71)  
+[__::critcl::argdefaults__ *arguments*](#72)  
+[__::critcl::argsupport__ *arguments*](#73)  
+[__::critcl::userconfig__ __define__ *name* *description* *type* ?*default*?](#74)  
+[__::critcl::userconfig__ __query__ *name*](#75)  
+[__::critcl::userconfig__ __set__ *name* *value*](#76)  
+[__::critcl::at::caller__](#77)  
+[__::critcl::at::caller__ *offset*](#78)  
+[__::critcl::at::caller__ *offset* *level*](#79)  
+[__::critcl::at::here__](#80)  
+[__::critcl::at::get\*__](#81)  
+[__::critcl::at::get__](#82)  
+[__::critcl::at::=__ *file* *line*](#83)  
+[__::critcl::at::incr__ *n*\.\.\.](#84)  
+[__::critcl::at::incrt__ *str*\.\.\.](#85)  
+[__::critcl::at::caller\!__](#86)  
+[__::critcl::at::caller\!__ *offset*](#87)  
+[__::critcl::at::caller\!__ *offset* *level*](#88)  
+[__::critcl::at::here\!__](#89)  
+[__::critcl::collect\_begin__](#90)  
+[__::critcl::collect\_end__](#91)  
+[__::critcl::collect__ *script*](#92)  
+[__::critcl::make__ *path* *contents*](#93)  
+[__::preload__ *library*](#94)  
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+The __[critcl](critcl\.md)__ package is the core of the system\. For an
+overview of the complete system, see *[Introduction To
+CriTcl](critcl\.md)*\. For the usage of the standalone
+__[critcl](critcl\.md)__ program, see *CriTcl Application*\. This core
+package maybe be used to embed C code into Tcl scripts\. It also provides access
+to the internals that other parts of the core use and which are of interest to
+those wishing to understand the internal workings of the core and of the API it
+provides to the *CriTcl Application*\. These advanced sections are marked as
+such so that those simply wishing to use the package can skip them\.
+
+This package resides in the Core Package Layer of CriTcl\.
+
+![](\.\./image/arch\_core\.png)
+
+# <a name='section2'></a>API
+
+A short note ahead of the documentation: Instead of repeatedly talking about "a
+Tcl script with embbedded C code", or "a Tcl script containing CriTcl commands",
+we call such a script a *CriTcl script*\. A file containing a *CriTcl script*
+usually has the extension __\.tcl__ or __\.critcl__\.
+
+## <a name='subsection1'></a>Embedded C Code
+
+The following commands append C code fragments to the current module\. Fragments
+appear in the module in the order they are appended, so the earlier fragments
+\(variables, functions, macros, etc\.\) are visible to later fragments\.
+
+  - <a name='1'></a>__::critcl::ccode__ *fragment*
+
+    Appends the C code in *fragment* to the current module and returns the
+    empty string\. See [Runtime Behaviour](#subsection16)\.
+
+  - <a name='2'></a>__::critcl::ccommand__ *tclname* *cname*
+
+    As documented below, except that *cname* is the name of a C function that
+    already exists\.
+
+  - <a name='3'></a>__::critcl::ccommand__ *tclname* *arguments* *body* ?*option* *value*\.\.\.?
+
+    Appends the code to create a Tcl command named *tclname* and a
+    corresponding C function whose body is *body* and which behaves as
+    documented for Tcl's own
+    [Tcl\_CreateObjCommand](https://www\.tcl\-lang\.org/man/tcl/TclLib/CrtObjCmd\.htm)\.
+
+    *aguments* is a list of zero to four names for the standard arguments
+    __clientdata__, __interp__, __objc__, and __objv__\. The
+    standard default names are used in place of any missing names\. This is a
+    more low\-level way than __critcl::cproc__ to define a command, as
+    processing of the items in __objv__ is left to the author, affording
+    complete control over the handling of the arguments to the command\. See
+    section [Runtime Behaviour](#subsection16)\.
+
+    Returns the empty string\.
+
+    Each *option* may be one of:
+
+      * __\-clientdata__ *c\-expression*
+
+        Provides the client data for the new command\. __NULL__ by default\.
+
+      * __\-delproc__ *c\-expression*
+
+        Provides a function pointer of type
+        [Tcl\_CmdDeleteProc](https://www\.tcl\-lang\.org/man/tcl/TclLib/CrtObjCmd\.htm)
+        as the deletion function for the new command\. __NULL__ by default\.
+
+      * __\-cname__ *boolean*
+
+        If __false__ \(the default\), a name for the corresponding C function
+        is automatically derived from the fully\-qualified *tclname*\.
+        Otherwise, name of the C function is the last component of *tclname*\.
+
+  - <a name='4'></a>__::critcl::cdata__ *tclname* *data*
+
+    Appends the code to create a new Tcl command named *tclname* which returns
+    *data* as a __ByteArray__ result\.
+
+    Returns the empty string\.
+
+  - <a name='5'></a>__::critcl::cconst__ *tclname* *resulttype* *value*
+
+    Appends the code to create a new Tcl command named *tclname* which returns
+    the constant *value* having the Tcl type *resulttype*\. *value* can be
+    a C macro or a function *call* \(including the parentheses\) to any visible
+    C function that does not take arguments\. Unlike __critcl::cdata__,
+    *resulttype* can be any type known to __critcl::cproc__\. Its semantics
+    are equivalent to:
+
+        cproc $tclname {} $resulttype "return $value ;"
+
+    This is more efficient than __critcl::cproc__ since there is no C
+    function generated\.
+
+    Returns the empty string\.
+
+  - <a name='6'></a>__::critcl::cdefines__ *list of glob patterns* ?*namespace*?
+
+    Arranges for *C enum* and *\#define* values that match one of the
+    patterns in *glob patterns* to be created in the namespace *namespace*,
+    each variable having the same as the corresponding C item\. The default
+    namespace is the global namespace\. A pattern that matches nothing is
+    ignored\.
+
+    The Tcl variables are created when the module is compiled, using the
+    preprocessor in order to properly find all matching C definitions\.
+
+    Produces no C code\. The desired C definitions must already exist\.
+
+  - <a name='7'></a>__::critcl::cproc__ *name* *arguments* *resulttype* *body* ?*option* *value*\.\.\.?
+
+    Appends a function having *body* as its body, another shim function to
+    perform the needed conversions, and the code to create a corresponding Tcl
+    command named *tclname*\. Unlike __critcl::ccommand__ the arguments and
+    result are typed, and CriTcl generates the code to convert between Tcl\_Obj
+    values and C data types\. See also [Runtime Behaviour](#subsection16)\.
+
+    Returns the empty string\.
+
+      * string *option*
+
+        Each may be one of:
+
+          + __\-cname__ *boolean*
+
+            If __false__ \(the default\), a name for the corresponding C
+            function is automatically derived from the fully\-qualified
+            *tclname*\. Otherwise, name of the C function is the last component
+            of *tclname*\.
+
+          + __\-pass\-cdata__ *boolean*
+
+            If __false__ \(the default\), the shim function performing the
+            conversion to and from Tcl level does not pass the ClientData as the
+            first argument to the function\.
+
+          + __\-arg\-offset__ *int*
+
+            A non\-negative integer, __0__ by default, indicating the number
+            of hidden arguments preceding the actual procedure arguments\. Used
+            by higher\-order code generators where there are prefix arguments
+            which are not directly seen by the function but which influence
+            argument counting and extraction\.
+
+      * string *resulttype*
+
+        May be a predefined or a custom type\. See *[CriTcl cproc Type
+        Reference](critcl\_cproc\.md)* for the full list of predefined types
+        and how to extend them\. Unless otherwise noted, the Tcl return code is
+        always __TCL\_OK__\.
+
+      * list *arguments*
+
+        Is a multi\-dictionary where each key is an argument type and its value
+        is the argument name\. For example:
+
+            int x int y
+
+        Each argument name must be a valid C identifier\.
+
+        If the name is a list containing two items, the first item is the name
+        and the second item is the default value\. A limited form of variadic
+        arguments can be accomplished using such default values\. For example:
+
+            int {x 1}
+
+        Here *x* is an optional argument of type __int__ with a default
+        value of __1__\.
+
+        Argument conversion is completely bypassed when the argument is not
+        provided, so a custom converter doing validation does not get the chance
+        to validate the default value\. In this case, the value should be checked
+        in the body of the function\.
+
+        Each argument type may be a predefined or custom type\. See *[CriTcl
+        cproc Type Reference](critcl\_cproc\.md)* for the full list of
+        predefined types and how to extend them\.
+
+  - <a name='8'></a>__::critcl::cproc__ *name* *arguments* *resulttype*
+
+    As documented below, but used when the C function named *name* already
+    exists\.
+
+  - <a name='9'></a>__::critcl::cinit__ *text* *externals*
+
+    Appends the C code in *text* and *externals*, but only after all the
+    other fragments appended by the previously\-listed commands regardless of
+    their placement in the *CriTcl script* relative to this command\. Thus, all
+    their content is visible\. See also [Runtime Behaviour](#subsection16)\.
+
+    The C code in *text* is placed into the body of the initialization
+    function of the shared library backing the *CriTcl script*, and is
+    executed when this library is loaded into the interpreter\. It has access to
+    the variable __Tcl\_Interp\* interp__ referencing the Tcl interpreter
+    currently being initialized\.
+
+    *externals* is placed outside and just before the initialization function,
+    making it a good place for any external symbols required by initialization
+    function, but which should not be accessible by any other parts of the C
+    code\.
+
+    Calls to this command are cumulative\.
+
+    Returns the empty string\.
+
+  - <a name='10'></a>__::critcl::include__ *path*
+
+    This command is a convenient shorthand for
+
+        critcl::code {
+          #include <${path}>
+        }
+
+## <a name='subsection2'></a>Stubs Table Management
+
+CriTcl versions 3 and later provide __critcl::api__ to create and manipulate
+stubs tables, Tcl's dynamic linking mechanism handling the resolution of symbols
+between C extensions\. See
+[http://wiki\.tcl\-lang\.org/285](http://wiki\.tcl\-lang\.org/285) for an
+introduction, and section [Stubs Tables](#subsection21) for the details of
+CriTcl's particular variant\.
+
+Importing stubs tables, i\.e\. APIs, from another extension:
+
+  - <a name='11'></a>__::critcl::api__ __import__ *name* *version*
+
+    Adds the following include directives into the *CriTcl script* *and*
+    each of its companion "\.c" files:
+
+      1. \#include <__name__/__name__Decls\.h>
+
+      1. \#include <__name__/__name__StubLib\.h>
+
+    Returns an error if "__name__" isn't in the search path for the
+    compiler\. See __critcl::cheaders__ and the critcl application's
+    __\-I__ and __\-includedir__ options\.
+
+    *Important:* If __name__ is a fully\-qualified name in a non\-global
+    namespace, e\.g\. "c::stack", the namespace separators "::" are converted into
+    underscores \("\_"\) in path names, C code, etc\.
+
+    __name__/__name__Decls\.h contains the stubs table type declarations,
+    mapping macros, etc\., and may include package\-specific headers\. See
+    __critcl::api header__, below\. An *\#include* directive is added at the
+    beginning of the generated code for *CriTcl script* and at the beginning
+    of each of its companion "\.c" files\.
+
+    __name__/__name__StubLib\.h contains the stubs table variable
+    definition and the function to initialize it\. An *\#include* directive for
+    it is added to the initialization code for the *CriTcl script* , along
+    with a call to the initializer function\.
+
+    If "__name__/__name__\.decls" accompanies
+    __name__/__name__Decls\.h, it should contain the external
+    representation of the stubs table used to generate the headers\. The file is
+    read and the internal representation of the stubs table returned for use by
+    the importing package\. Otherwise, the empy string is returned\.
+
+    One possible use would be the automatic generation of C code calling on the
+    functions listed in the imported API\.
+
+    When generating a TEA package the names of the imported APIs are used to
+    declare __configure__ options with which the user can declare a
+    non\-standard directory for the headers of the API\. Any API __name__ is
+    translated into a single configure option
+    __\-\-with\-__name__\-include__\.
+
+Declaration and export of a stubs table, i\.e\. API, for the *CriTcl script*:
+
+  - <a name='12'></a>__::critcl::api__ __function__ *resulttype* *name* *arguments*
+
+    Adds to the public API of the *CriTcl script* the signature for the
+    function named *name* and having the signature specified by *arguments*
+    and *resulttype*\. Code is generated for a "\.decls" file, the corresponding
+    public headers, and a stubs table usable by __critcl::api import__\.
+
+    *arguments* is a multidict where each key is an argument type and its
+    value is the argument name, and *resulttype* is a C type\.
+
+  - <a name='13'></a>__::critcl::api__ __header__ ?*glob pattern*\.\.\.?
+
+    Each file matching a *glob pattern* is copied into the directory
+    containing the generated headers, and an *\#include* directive for it is
+    added to "Decls\.h" for the *CriTcl script*\. Returns an error if a *glob
+    pattern* matches nothing\.
+
+    A pattern for a relative path is resolved relative to the directory
+    containing the *CriTcl script*\.
+
+  - <a name='14'></a>__::critcl::api__ __extheader__ ?*file*\.\.\.?
+
+    Like __::critcl::api header__, but each *file* should exist in the
+    external development environment\. An *\#include* directive is added to
+    "__foo__Decls\.h", but *file* is not copied to the package header
+    directory\. *file* is not a glob pattern as CriTcl has no context, i\.e
+    directory, in which to expand such patterns\.
+
+As with the headers for an imported API, an *\#include* directive is added to
+the generated code for the *CriTcl script* and to each companion "\.c" file\.
+
+In "compile & run" mode the generated header files and any companion headers are
+placed in the [Result Cache](#subsection18) subdirectory for the *CriTcl
+script*\. This directory is added to the include search path of any other
+package importing this API and and building in mode "compile & run"\.
+
+In "generate package" mode __\-includedir__ specifies the subdirectory in the
+package to place the generated headers in\. This directory is added to the search
+paths for header files, ensuring that a package importing an API finds it if the
+package exporting that API used the same setting for __\-includedir__\.
+
+In "generate TEA" mode the static scanner recognizes __critcl::api header__
+as a source of companion files\. It also uses data from calls to __critcl::api
+import__ to add support for __\-\-with\-__foo__\-include__ options into
+the generated "configure\(\.in\)" so that a user may specify custom locations for
+the headers of any imported API\.
+
+## <a name='subsection3'></a>Package Meta Data
+
+CriTcl versions 3 and later can create TEApot meta\-data to be placed into
+"teapot\.txt" in a format suitable for use by the [TEApot
+tools](http://docs\.activestate\.com/activetcl/8\.5/tpm/toc\.html)\.
+
+In version 2, some meta data support was already present through
+__::critcl::license__, but this was only used to generate "license\.txt"\.
+
+  - <a name='15'></a>__::critcl::license__ *author* ?*text*\.\.\.?
+
+    Ignored in "compile & run" mode\.
+
+    In "generate package" mode provides information about the author of the
+    package and the license for the package\.
+
+    *text* arguments are concatenated to form the text of the license, which
+    is written to "license\.terms" in the same directory as "pkgIndex\.tcl"\. If no
+    *text* is provided the license is read from "license\.terms" in the same
+    directory as the *CriTcl script*\.
+
+    This information takes precedence over any information specified through the
+    generic API __::critcl::meta__\. It is additionally placed into the meta
+    data file "teapot\.txt" under the keys *as::author* and *license*\.
+
+  - <a name='16'></a>__::critcl::summary__ *text*
+
+    Ignored in "compile & run" mode\.
+
+    In "generate package" mode places a short, preferably one\-line description
+    of the package into the meta data file "teapot\.txt" under the key
+    *summary*\. This information takes precedence over information specified
+    through the generic API __::critcl::meta__\.
+
+  - <a name='17'></a>__::critcl::description__ *text*
+
+    Ignored in "compile & run" mode\.
+
+    In "generate package" mode places a longer description of the package into
+    the meta data file "teapot\.txt", under the key *description*\. The data
+    specified by this command takes precedence over any information specified
+    through the generic API __::critcl::meta__\.
+
+  - <a name='18'></a>__::critcl::subject__ ?*key*\.\.\.?
+
+    Ignored in "compile & run" mode\.
+
+    In "generate package" mode places each *key* into the meta data file
+    "teapot\.txt", under the key *subject*\. This information takes precedence
+    over any information specified through the generic API
+    __::critcl::meta__\.
+
+    Calls to this command are cumulative\.
+
+  - <a name='19'></a>__::critcl::meta__ *key* ?*word*\.\.\.?
+
+    Provides arbitrary meta data outside of the following reserved keys:
+    *as::author*, *as::build::date*, *description*, *license*, *name*,
+    *platform*, *require* *subject*, *summary*, and *version*, Its
+    behaviour is like __::critcl::subject__ in that it treats all keys as
+    list of words, with each call providing one or more words for the key, and
+    multiple calls extending the data for an existing key, if not reserved\.
+
+    While it is possible to declare information for one of the reserved keys
+    with this command such data is ignored when the final meta data is assembled
+    and written\.
+
+    Use the commands __::critcl::license__, __::critcl::summary__,
+    __::critcl::description__ __::critcl::subject__, __package
+    require__, and __package provide__ to declare data for the reserved
+    keys\.
+
+    The information for the reserved keys *as::build::date* and *platform*
+    is automatically generated by __[critcl](critcl\.md)__ itself\.
+
+  - <a name='20'></a>__::critcl::meta?__ *key*
+
+    Returns the value in the metadata associated with *key*\.
+
+    Used primarily to retrieve the name of the package from within utility
+    packages having to adapt C code templates to their environment\. For example,
+    __[critcl::class](critcl\_class\.md)__ uses does this\.
+
+  - <a name='21'></a>__::critcl::buildrequirement__ *script*
+
+    Provides control over the capturing of dependencies declared via __package
+    require__\. *script* is evaluated and any dependencies declared within
+    are ignored, i\.e\. not recorded in the meta data\.
+
+## <a name='subsection4'></a>Control & Interface
+
+These commands control the details of compilation and linking a *CriTcl
+script*\. The information is used only to compile/link the object for the
+*CriTcl script*\. For example, information for "FOO\.tcl" is kept separate from
+information for "BAR\.tcl"\.
+
+  - <a name='22'></a>__::critcl::cheaders__ ?*arg*\.\.\.?
+
+    Provides additional header locations\.
+
+    Each argument is a glob pattern\. If an argument begins with __\-__ it is
+    an argument to the compiler\. Otherwise the parent directory of each matching
+    path is a directory to be searched for header files\. Returns an error if a
+    pattern matches no files\. A pattern for a relative path is resolved relative
+    to the directory containing the *CriTcl script*\.
+
+    __\#include__ lines are not automatically generated for matching header
+    files\. Use __critcl::include__ or __critcl::ccode__ as necessary to
+    add them\.
+
+    Calls to this command are cumulative\.
+
+  - <a name='23'></a>__::critcl::csources__ ?*glob pattern*\.\.\.?
+
+    Matching paths become inputs to the compilation of the current object along
+    with the sources for the current *CriTcl script*\. Returns an error if no
+    paths match a pattern\. A pattern for a relative path is resolved relative to
+    the directory containing the *CriTcl script*\.
+
+    Calls to this command are cumulative\.
+
+  - <a name='24'></a>__::critcl::clibraries__ ?*glob pattern*\.\.\.?
+
+    provides the link step with additional libraries and library locations\. A
+    *glob pattern* that begins with __\-__ is added as an argument to the
+    linker\. Otherwise matching files are linked into the shared library\. Returns
+    an error if no paths match a pattern\. A pattern for a relative path is
+    resolved relative to the directory containing the *CriTcl script*\.
+
+    Calls to this command are cumulative\.
+
+  - <a name='25'></a>__::critcl::source__ *glob pattern*
+
+    Evaluates as scripts the files matching each *glob pattern*\. Returns an
+    error if there are no matching files\. A pattern for a relative path is
+    resolved relative to the directory containing the *CriTcl script*\.
+
+  - <a name='26'></a>__::critcl::tsources__ *glob pattern*\.\.\.
+
+    Provides the information about additional Tcl script files to source when
+    the shared library is loaded\.
+
+    Matching paths are made available to the generated shared library when it is
+    loaded for the current *CriTcl script*\. Returns an error if a pattern
+    matches no files\. A pattern for a relative path is resolved relative to the
+    directory containing the *CriTcl script*\.
+
+    Calls to this command are cumulative\.
+
+    After the shared library has been loaded, the declared files are sourced in
+    the same order that they were provided as arguments\.
+
+  - <a name='27'></a>__::critcl::owns__ *glob pattern*\.\.\.
+
+    Ignored in "compile and run" and "generate package" modes\. In "generate TEA"
+    mode each file matching a *glob pattern* is a file to be included in the
+    TEA extension but that could not be ascertained as such from previous
+    commands like __critcl::csources__ and __critcl::tsources__, either
+    because of they were specified dynamically or because they were directly
+    sourced\.
+
+  - <a name='28'></a>__::critcl::cflags__ ?*arg*\.\.\.?
+
+    Each *arg* is an argument to the compiler\.
+
+    Calls to this command are cumulative\.
+
+  - <a name='29'></a>__::critcl::ldflags__ ?*arg*\.\.\.?
+
+    Each *arg* is an argument to the linker\.
+
+    Calls to this command are cumulative\.
+
+  - <a name='30'></a>__::critcl::framework__ ?*arg*\.\.\.?
+
+    Each *arg* is the name of a framework to link on MacOS X\. This command is
+    ignored if OS X is not the target so that frameworks can be specified
+    unconditionally\.
+
+    Calls to this command are cumulative\.
+
+  - <a name='31'></a>__::critcl::tcl__ *version*
+
+    Specifies the minimum version of the Tcl runtime to compile and link the
+    package for\. The default is __8\.4__\.
+
+  - <a name='32'></a>__::critcl::tk__
+
+    Arranges to include the Tk headers and link to the Tk stubs\.
+
+  - <a name='33'></a>__::critcl::preload__ *lib*\.\.\.
+
+    Arranges for the external shared library *lib* to be loaded before the
+    shared library for the *CriTcl script* is loaded\.
+
+    Calls to this command are cumulative\.
+
+    Each library *FOO* is searched for in the directories listed below, in the
+    order listed\. The search stops at the first existing path\. Additional notes:
+
+      * __platform__ is the placeholder for the target platform of the
+        package\.
+
+      * The extension "\.so" is the placeholder for whatever actual extension is
+        used by the target platform for its shared libraries\.
+
+      * The search is relative to the current working directory\.
+
+    And now the paths, depending on the exact form of the library name:
+
+      * FOO
+
+          1. FOO\.so
+
+          1. FOO/FOO\.so
+
+          1. FOO/__platform__/FOO\.so
+
+      * PATH/FOO
+
+        The exact set searched depends on the existence of directory "PATH/FOO"\.
+        If it exists, critcl searches
+
+          1. FOO\.so
+
+          1. PATH/FOO/FOO\.so
+
+          1. PATH/FOO/__platform__/FOO\.so
+
+        Otherwise it searches
+
+          1. FOO\.so
+
+          1. PATH/FOO\.so
+
+          1. PATH/__platform__/FOO\.so
+
+        instead\.
+
+      * /PATH/FOO
+
+        Even when specifying FOO with an absolute path the first path searched
+        is relative to the current working directory\.
+
+          1. FOO\.so
+
+          1. /PATH/FOO\.so
+
+          1. /PATH/__platform__/FOO\.so
+
+    For developers who want to understand or modify the internals of the
+    __[critcl](critcl\.md)__ package, [Preloading
+    functionality](#subsection19) explains how preloading is implemented\.
+
+  - <a name='34'></a>__::critcl::debug__ *area*\.\.\.
+
+    Specifies what debugging features to activate\. Internally each area is
+    translated into area\-specific flags for the compiler which are then handed
+    over to __critcl::cflags__\.
+
+      * __memory__
+
+        Specifies Tcl memory debugging\.
+
+      * __symbols__
+
+        Specifies compilation and linking with debugging symbols for use by a
+        debugger or other tool\.
+
+      * __all__
+
+        Specifies all available debugging\.
+
+## <a name='subsection5'></a>Introspection
+
+The following commands control compilation and linking\.
+
+  - <a name='35'></a>__::critcl::check__ ?*label*? *text*
+
+    Returns a __true__ if the C code in *text* compiles sucessfully, and
+    __false__ otherwise\. Used to check for availability of features in the
+    build environment\. If provided, *label* is used to uniquely mark the
+    results in the generated log\.
+
+  - <a name='36'></a>__::critcl::checklink__ ?*label*? *text*
+
+    Like __critcl::check__ but also links the compiled objects, returning
+    __true__ if the link is successful and __false__ otherwise\. If
+    specified, *label* is used to uniquely mark the results in the generated
+    log\.
+
+  - <a name='37'></a>__::critcl::msg__ ?__\-nonewline__? *msg*
+
+    Scripts using __critcl::check__ and __critcl::checklink__ can use
+    this command to report results\. Does nothing in *[compile &
+    run](\.\./index\.md\#compile\_run)* mode\. Tools like the *CriTcl
+    Aplication* may redefine this command to implement their own message
+    reporting\. For example, __critcl::app__ and any packages built on it
+    print messages to *stdout*\.
+
+  - <a name='38'></a>__::critcl::print__ ?__\-nonewline__? ?*chan*? *msg*
+
+    Used by the CriTcl internals to report activity\. By default, effectively the
+    same thing as __::puts__\. Tools directly using either the CriTcl package
+    or the CriTcl application package may redefine this procedure to implement
+    their own output functionality\.
+
+    For example, the newest revisions of
+    [Kettle](https://chiselapp\.com/user/andreas\_kupries/repository/Kettle/index)
+    use this to highlight build warnings\.
+
+  - <a name='39'></a>__::critcl::compiled__
+
+    Returns __true__ if the current *CriTcl script* is already compiled
+    and __false__ otherwise\.
+
+    Enables a *CriTcl script* used as its own Tcl companion file \(see
+    __critcl::tsources__\) to distinguish between being sourced for
+    compilation in *[compile & run](\.\./index\.md\#compile\_run)* mode and
+    being sourced from either the result of *[generate
+    package](\.\./index\.md\#generate\_package)* mode or during the load phase of
+    *[compile & run](\.\./index\.md\#compile\_run)* mode\. The result is
+    __false__ in the first case and __true__ in the later two cases\.
+
+  - <a name='40'></a>__::critcl::compiling__
+
+    Returns __true__ if a working C compiler is available and __false__
+    otherwise\.
+
+  - <a name='41'></a>__::critcl::done__
+
+    Returns __true__ when *CriTcl script* has been built and __false__
+    otherwise\. Only useful from within a *CriTcl script*\. Enables the Tcl
+    parts of a *CriTcl script* to distinguish between *prebuilt package*
+    mode and *[compile & run](\.\./index\.md\#compile\_run)* mode\.
+
+    See also [Modes Of Operation/Use](#subsection15)\.
+
+  - <a name='42'></a>__::critcl::failed__
+
+    Returns __true__ if the *CriTcl script* could not be built, and
+    __false__ otherwise\. Forces the building of the package if it hasn't
+    already been done, but not its loading\. Thus, a *CriTcl script* can check
+    itself for availability of the compiled components\. Only useful from within
+    a *CriTcl script*\.
+
+  - <a name='43'></a>__::critcl::load__
+
+    Like __critcl::failed__ except that it also forces the loading of the
+    generated shared library, and that it returns __true__ on success and
+    __false__ on failure\. Thus, a *CriTcl script* can check itself for
+    availability of the compiled components\. Only useful from within a *CriTcl
+    script*\.
+
+## <a name='subsection6'></a>Build Management
+
+The following command manages global settings, i\.e\. configuration options which
+are independent of any *CriTcl script*\.
+
+This command should not be needed to write a *CriTcl script*\. It is a
+management command which is only useful to the *CriTcl Application* or similar
+tools\.
+
+  - <a name='44'></a>__::critcl::config__ *option* ?*val*?
+
+    Sets and returns the following global configuration options:
+
+      * __force__ bool
+
+        When __false__ \(the default\), the C files are not built if there is
+        a cached shared library\.
+
+      * __lines__ bool
+
+        When __true__ \(the default\), \#line directives are embedded into the
+        generated C code\.
+
+        This facility requires the use of a tclsh that provides __info
+        frame__\. Otherwise, no *\#line* directives are emitted\. The command
+        is supported by Tcl 8\.5 and higher\. It is also supported by Tcl 8\.4
+        provided that it was compiled with the define __\-DTCL\_TIP280__\. An
+        example of such is ActiveState's ActiveTcl\.
+
+        Developers of higher\-level packages generating their own C code, either
+        directly or indirectly through critcl, should also read section
+        [Advanced: Location management](#subsection12) to see how critcl
+        helps them in generating their directives\. Examples of such packages
+        come with critcl itself\. See
+        __[critcl::iassoc](critcl\_iassoc\.md)__ and
+        __[critcl::class](critcl\_class\.md)__\.
+
+      * __trace__ bool
+
+        When __false__ \(the default\), no code tracing the entry and exit of
+        CriTcl\-backed commands in the *CriTcl script* is inserted\. Insertion
+        of such code implicitly activates the tracing facility in general\. See
+        __[critcl::cutil](critcl\_cutil\.md)__\.
+
+      * __I__ path
+
+        A single global include path to use for all files\. Not set by default\.
+
+      * __combine__ enum
+
+          + __dynamic__ \(the default\)
+
+            Object files have the suffix __\_pic__\.
+
+          + __static__
+
+            Object files have the suffix __\_stub__\.
+
+          + __standalone__
+
+            Object files have no suffix, and the generated C files are compiled
+            without using Tcl/Tk stubs\. The result are object files usable for
+            static linking into a *big shell*\.
+
+      * __language__ string
+
+      * __keepsrc__ bool
+
+        When __false__ \(the default\), the generated "\.c" files are deleted
+        after the "\.o" files have been built\.
+
+      * __outdir__ directory
+
+        The directory where to place a generated shared library\. By default, it
+        is placed into the [Result Cache](#subsection18)\.
+
+## <a name='subsection7'></a>Result Cache Management
+
+The following commands control the [Result Cache](#subsection18)\. These
+commands are not needed to simply write a *CriTcl script*\.
+
+  - <a name='45'></a>__::critcl::cache__ ?path?
+
+    Sets and returns the path to the directory for the package's result cache\.
+
+    The default location is "~/\.critcl/\[platform::generic\]" and usually does not
+    require any changes\.
+
+  - <a name='46'></a>__::critcl::clean\_cache__ ?*pattern*\.\.\.?
+
+    Cleans the result cache, i\.e\. removes any and all files and directories in
+    it\. If one or more patterns are specified then only the files and
+    directories matching them are removed\.
+
+## <a name='subsection8'></a>Build Configuration
+
+The following commands manage the build configuration, i\.e\. the per\-platform
+information about compilers, linkers, and their commandline options\. These
+commands are not needed to simply write a *CriTcl script*\.
+
+  - <a name='47'></a>__::critcl::readconfig__ *path*
+
+    Reads the build configuration file at *path* and configures the package
+    using the information for the target platform\.
+
+  - <a name='48'></a>__::critcl::showconfig__ ?*chan*?
+
+    Converts the active build configuration into a human\-readable string and
+    returns it, or if *chan* is provided prints the result to that channel\.
+
+  - <a name='49'></a>__::critcl::showallconfig__ ?*chan*?
+
+    Converts the set of all known build configurations from the currently active
+    build configuration file last set with __critcl::readconfig__ into a
+    string and returns it, or if *chan* is provided, prints it to that
+    channel\.
+
+  - <a name='50'></a>__::critcl::chooseconfig__ *target* ?*nomatcherr*?
+
+    Matches *target* against all known targets, returning a list containing
+    all the matching ones\. This search is first done on an exact basis, and then
+    via glob matching\. If no known target matches the argument the default is to
+    return an empty list\. However, if the boolean *nomatcherr* is specified
+    and set an error is thrown using __critcl::error__ instead\.
+
+  - <a name='51'></a>__::critcl::setconfig__ *target*
+
+    Configures the package to use the settings of *target*\.
+
+## <a name='subsection9'></a>Tool API
+
+The following commands provide tools like *CriTcl Application* or similar with
+deeper access to the package's internals\. These commands are not needed to
+simply write a *CriTcl script*\.
+
+  - <a name='52'></a>__::critcl::actualtarget__
+
+    Returns the platform identifier for the target platform, i\.e\. the platform
+    to build for\. Unlike __::critcl::targetplatform__ this is the true
+    target, with any cross\-compilation information resolved\.
+
+  - <a name='53'></a>__::critcl::buildforpackage__ ?*flag*?
+
+    Signals whether the next file is to be built for inclusion into a package\.
+    If not specified the *flag* defaults to __true__, i\.e\. building for a
+    package\. This disables a number of things in the backend, namely the linking
+    of that file into a shared library and the loading of that library\. It is
+    expected that the build results are later wrapped into a larger collection\.
+
+  - <a name='54'></a>__::critcl::cnothingtodo__ *file*
+
+    Checks whether there is anything to build for *file*\.
+
+  - <a name='55'></a>__::critcl::cresults__ ?*file*?
+
+    Returns information about building *file*, or __info script__ If
+    *file* is not provided\. The result in question is a dictionary containing
+    the following items:
+
+      * __clibraries__
+
+        A list of external shared libraries and/or directories needed to link
+        *file*\.
+
+      * __ldflags__
+
+        A list of linker flags needed to link *file*\.
+
+      * __license__
+
+        The text of the license for the package *file* is located in\.
+
+      * __mintcl__
+
+        The minimum version of Tcl required by the package *file* is in to run
+        successfully\. A proper Tcl version number\.
+
+      * __objects__
+
+        A list of object files to link into *file*\.
+
+      * __preload__
+
+        A list of libraries to be preloaded in order to sucessfully load and use
+        *file*\.
+
+      * __tk__
+
+        __true__ if *file* requires Tk and __false__ otherwise\.
+
+      * __tsources__
+
+        A list of companion "\.tcl" files to source in order to load and use the
+        *CriTcl script* *file*\.
+
+      * __log__
+
+        The full build log generated by the compiler/linker, including command
+        line data from critcl, and other things\.
+
+      * __exl__
+
+        The raw build log generated by the compiler/linker\. Contains the output
+        generated by the invoked applications\.
+
+  - <a name='56'></a>__::critcl::crosscheck__
+
+    Determines whether the package is configured for cross\-compilation and
+    prints a message to the standard error channel if so\.
+
+  - <a name='57'></a>__::critcl::error__ *msg*
+
+    Used to report internal errors\. The default implementation simply returns
+    the error\. Tools like the *CriTcl Application* are allowed to redefine
+    this procedure to perform their own way of error reporting\. There is one
+    constraint they are not allowed to change: The procedure must *not return*
+    to the caller\.
+
+  - <a name='58'></a>__::critcl::knowntargets__
+
+    Returns a list of the identifiers of all targets found during the last
+    invocation of __critcl::readconfig__\.
+
+  - <a name='59'></a>__::critcl::sharedlibext__
+
+    Returns the file extension for shared libraries on the target platform\.
+
+  - <a name='60'></a>__::critcl::targetconfig__
+
+    Returns the identifier of the target to build for, as specified by either
+    the user or the system\.
+
+  - <a name='61'></a>__::critcl::buildplatform__
+
+    Returns the identifier of the build platform, i\.e\. where the package is
+    running on\.
+
+  - <a name='62'></a>__::critcl::targetplatform__
+
+    Returns the identifier of the target platform, i\.e\. the platform to compile
+    for\. In contrast to __::critcl::actualtarget__ this may be the name of a
+    cross\-compilation target\.
+
+  - <a name='63'></a>__::critcl::cobjects__ ?*glob pattern*\.\.\.?
+
+    Like __::critcl::clibraries__, but instead of matching libraries, each
+    *glob pattern* matches object files to be linked into the shared object
+    \(at compile time, not runtime\)\. If a *glob pattern* matches nothing an
+    error is returned\. Not listed in [Control & Interface](#subsection4)
+    because it is of no use to package writers\. Only tools like the *CriTcl
+    Application* need it\.
+
+    A pattern for a relative path is resolved relative to the directory
+    containing the *CriTcl script*\.
+
+    Calls to this command are cumulative\.
+
+  - <a name='64'></a>__::critcl::scan__ *path*
+
+    The main entry point to CriTcl's static code scanner\. Used by tools to
+    implement processing modes like the assembly of a directory hierarchy
+    containing a TEA\-lookalike buildystem, etc\.
+
+    Scans *path* and returns a dictionary containing the following items:
+
+      * version
+
+        Package version\.
+
+      * org
+
+        Author\(ing organization\)\.
+
+      * files
+
+        List of the companion files, relative to the directory of the input
+        file\.
+
+  - <a name='65'></a>__::critcl::name2c__ *name*
+
+    Given the Tcl\-level identifier *name*, returns a list containing the
+    following details of its conversion to C:
+
+      * Tcl namespace prefix
+
+      * C namespace prefix
+
+      * Tcl base name
+
+      * C base name
+
+    For use by utilities that provide Tcl commands without going through
+    standard commands like __critcl::ccommand__ or __critcl::cproc__\.
+    __[critcl::class](critcl\_class\.md)__ does this\.
+
+## <a name='subsection10'></a>Advanced: Embedded C Code
+
+For advanced use, the following commands used by __critcl::cproc__ itself
+are exposed\.
+
+  - <a name='66'></a>__::critcl::argnames__ *arguments*
+
+    Given an argument declaration as documented for __critcl::cproc__,
+    returns a list of the corresponding user\-visible names\.
+
+  - <a name='67'></a>__::critcl::argcnames__ *arguments*
+
+    Given an argument declaration as documented for __critcl::cproc__,
+    returns a list of the corresponding C variable names for the user\-visible
+    names\. The names returned here match the names used in the declarations and
+    code returned by __::critcl::argvardecls__ and
+    __::critcl::argconversion__\.
+
+  - <a name='68'></a>__::critcl::argcsignature__ *arguments*
+
+    Given an argument declaration as documented for __critcl::cproc__,
+    returns a list of the corresponding C parameter declarations\.
+
+  - <a name='69'></a>__::critcl::argvardecls__ *arguments*
+
+    Given an argument declaration as documented for __critcl::cproc__,
+    returns a list of the corresponding C variable declarations\. The names used
+    in these declarations match the names returned by
+    __::critcl::argcnames__\.
+
+  - <a name='70'></a>__::critcl::argconversion__ *arguments* ?*n*?
+
+    Given an argument declaration as documented for __critcl::cproc__,
+    returns a list of C code fragments converting the user visible arguments
+    found in the declaration from Tcl\_Obj\* to C types\. The names used in these
+    statements match the names returned by __::critcl::argcnames__\.
+
+    The generated code assumes that the procedure arguments start at index *n*
+    of the __objv__ array\. The default is __1__\.
+
+  - <a name='71'></a>__::critcl::argoptional__ *arguments*
+
+    Given an argument declaration as documented for __critcl::cproc__,
+    returns a list of boolean values indicating which arguments are optional
+    \(__true__\), and which are not \(__false__\)\.
+
+  - <a name='72'></a>__::critcl::argdefaults__ *arguments*
+
+    Given an argument declaration as documented for __critcl::cproc__,
+    returns a list containing the default values for all optional arguments\.
+
+  - <a name='73'></a>__::critcl::argsupport__ *arguments*
+
+    Given an argument declaration as documented for __critcl::cproc__,
+    returns a list of C code fragments needed to define the necessary supporting
+    types\.
+
+## <a name='subsection11'></a>Custom Build Configuration
+
+This package provides one command for the management of package\-specific, i\.e\.
+developer\-specified custom build configuration options\.
+
+  - <a name='74'></a>__::critcl::userconfig__ __define__ *name* *description* *type* ?*default*?
+
+    This command defines custom build configuration option, with
+    *description*, *type* and optional *default* value\.
+
+    The type can be either __bool__, or a list of values\.
+
+      1. For __bool__ the default value, if specified, must be a boolean\. If
+         it is not specified it defaults to __true__\.
+
+      1. For a list of values the default value, if specified, must be a value
+         found in this list\. If it is not specified it defaults to the first
+         value of the list\.
+
+    The *description* serves as in\-code documentation of the meaning of the
+    option and is otherwise ignored\. When generating a TEA wrapper the
+    description is used for the __configure__ option derived from the option
+    declared by the command\.
+
+    A boolean option __FOO__ are translated into a pair of configure
+    options, __\-\-enable\-__FOO____ and __\-\-disable\-__FOO____,
+    whereas an option whose *type* is a list of values is translated into a
+    single configure option __\-\-with\-__FOO____\.
+
+  - <a name='75'></a>__::critcl::userconfig__ __query__ *name*
+
+    This command queries the database of custom build configuration option for
+    the current "\.critcl" file and returns the chosen value\. This may be the
+    default if no value was set via __::critcl::userconfig set__\.
+
+    It is at this point that definitions and set values are brought together,
+    with the latter validated against the definition\.
+
+  - <a name='76'></a>__::critcl::userconfig__ __set__ *name* *value*
+
+    This command is for use by a tool, like the __[critcl](critcl\.md)__
+    application, to specify values for custom build configuration options\.
+
+    At the time this command is used only the association between option name
+    and value is recorded, and nothing else is done\. This behaviour is necessary
+    as the system may not know if an option of the specified name exists when
+    the command is invoked, nor its type\.
+
+    Any and all validation is defered to when the value of an option is asked
+    for via __::critcl::userconfig query__\.
+
+    This means that it is possible to set values for any option we like, and the
+    value will take effect only if such an option is both defined and used later
+    on\.
+
+## <a name='subsection12'></a>Advanced: Location management
+
+First a small introduction for whose asking themselves 'what is location
+management' ?
+
+By default critcl embeds *\#line* directives into the generated C code so that
+any errors, warnings and notes found by the C compiler during compilation will
+refer to the "\.critcl" file the faulty code comes from, instead of the generated
+"\.c" file\.
+
+This facility requires the use of a tclsh that provides __info frame__\.
+Otherwise, no *\#line* directives are emitted\. The command is supported by Tcl
+8\.5 and higher\. It is also supported by Tcl 8\.4 provided that it was compiled
+with the define __\-DTCL\_TIP280__\. An example of such is ActiveState's
+ActiveTcl\.
+
+Most users will not care about this feature beyond simply wanting it to work and
+getting proper code references when reading compiler output\.
+
+Developers of higher\-level packages generating their own C code however should
+care about this, to ensure that their generated code contains proper references
+as well\. Especially as this is key to separating bugs concerning code generated
+by the package itself and bug in the user's code going into the package, if any\.
+
+Examples of such packages come with critcl itself, see the implementation of
+packages __[critcl::iassoc](critcl\_iassoc\.md)__ and
+__[critcl::class](critcl\_class\.md)__\.
+
+To help such developers eight commands are provided to manage such *location*
+information\. These are listed below\.
+
+A main concept is that they all operate on a single *stored location*,
+setting, returning and clearing it\. Note that this location information is
+completely independent of the generation of *\#line* directives within critcl
+itself\.
+
+  - <a name='77'></a>__::critcl::at::caller__
+
+    This command stores the location of the caller of the current procedure as a
+    tuple of file name and linenumber\. Any previously stored location is
+    overwritten\. The result of the command is the empty string\.
+
+  - <a name='78'></a>__::critcl::at::caller__ *offset*
+
+    As above, the stored line number is modified by the specified offset\. In
+    essence an implicit call of __critcl::at::incr__\.
+
+  - <a name='79'></a>__::critcl::at::caller__ *offset* *level*
+
+    As above, but the level the location information is taken from is modified
+    as well\. Level __0__ is the caller, __\-1__ its caller, etc\.
+
+  - <a name='80'></a>__::critcl::at::here__
+
+    This command stores the current location in the current procedure as a tuple
+    of file name and linenumber\. Any previously stored location is overwritten\.
+    The result of the command is the empty string\.
+
+    In terms of __::critcl::at::caller__ this is equivalent to
+
+        critcl::at::caller 0 1
+
+  - <a name='81'></a>__::critcl::at::get\*__
+
+    This command takes the stored location and returns a formatted *\#line*
+    directive ready for embedding into some C code\. The stored location is left
+    untouched\. Note that the directive contains its own closing newline\.
+
+    For proper nesting and use it is recommended that such directives are always
+    added to the beginning of a code fragment\. This way, should deeper layers
+    add their own directives these will come before ours and thus be inactive\.
+    End result is that the outermost layer generating a directive will 'win',
+    i\.e\. have its directive used\. As it should be\.
+
+  - <a name='82'></a>__::critcl::at::get__
+
+    This command is like the above, except that it also clears the stored
+    location\.
+
+  - <a name='83'></a>__::critcl::at::=__ *file* *line*
+
+    This command allows the caller to set the stored location to anything they
+    want, outside of critcl's control\. The result of the command is the empty
+    string\.
+
+  - <a name='84'></a>__::critcl::at::incr__ *n*\.\.\.
+
+  - <a name='85'></a>__::critcl::at::incrt__ *str*\.\.\.
+
+    These commands allow the user to modify the line number of the stored
+    location, changing it incrementally\. The increment is specified as either a
+    series of integer numbers \(__incr__\), or a series of strings to consider
+    \(__incrt__\)\. In case of the latter the delta is the number of lines
+    endings found in the strings\.
+
+  - <a name='86'></a>__::critcl::at::caller\!__
+
+  - <a name='87'></a>__::critcl::at::caller\!__ *offset*
+
+  - <a name='88'></a>__::critcl::at::caller\!__ *offset* *level*
+
+  - <a name='89'></a>__::critcl::at::here\!__
+
+    These are convenience commands combining __caller__ and __here__
+    with __get__\. I\.e\. they store the location and immediately return it
+    formatted as proper *\#line* directive\. Also note that after their use the
+    stored location is cleared\.
+
+## <a name='subsection13'></a>Advanced: Diversions
+
+Diversions are for higher\-level packages generating their own C code, to make
+their use of critcl's commands generating [Embedded C Code](#subsection1)
+easier\.
+
+These commands normally generate all of their C code for the current "\.critcl"
+file, which may not be what is wanted by a higher\-level package\.
+
+With a diversion the generator output can be redirected into memory and from
+there on then handled and processed as the caller desires before it is committed
+to an actual "\.c" file\.
+
+An example of such a package comes with critcl itself, see the implementation of
+package __[critcl::class](critcl\_class\.md)__\.
+
+To help such developers three commands are provided to manage diversions and the
+collection of C code in memory\. These are:
+
+  - <a name='90'></a>__::critcl::collect\_begin__
+
+    This command starts the diversion of C code collection into memory\.
+
+    The result of the command is the empty string\.
+
+    Multiple calls are allowed, with each call opening a new nesting level of
+    diversion\.
+
+  - <a name='91'></a>__::critcl::collect\_end__
+
+    This command end the diversion of C code collection into memory and returns
+    the collected C code\.
+
+    If multiple levels of diversion are open the call only closes and returns
+    the data from the last level\.
+
+    The command will throw an error if no diversion is active, indicating a
+    mismatch in the pairing of __collect\_begin__ and __collect\_end__\.
+
+  - <a name='92'></a>__::critcl::collect__ *script*
+
+    This is a convenience command which runs the *script* under diversion and
+    returns the collected C code, ensuring the correct pairing of
+    __collect\_begin__ and __collect\_end__\.
+
+## <a name='subsection14'></a>Advanced: File Generation
+
+While file generation is related to the diversions explained in the previous
+section they are not the same\. Even so, like diversions this feature is for
+higher\-level packages generating their own C code\.
+
+Three examples of utility packages using this facility comes with critcl itself\.
+See the implementations of packages
+__[critcl::literals](critcl\_literals\.md)__,
+__[critcl::bitmap](critcl\_bitmap\.md)__, and
+__[critcl::enum](critcl\_enum\.md)__\.
+
+When splitting a package implementation into pieces it is often sensible to have
+a number of pure C companion files containing low\-level code, yet these files
+may require information about the code in the main "\.critcl" file\. Such
+declarations are normally not exportable and using the stub table support does
+not make sense, as this is completely internal to the package\.
+
+With the file generation command below the main "\.critcl" file can generate any
+number of header files for the C companions to pick up\.
+
+  - <a name='93'></a>__::critcl::make__ *path* *contents*
+
+    This command creates the file *path* in a location where the C companion
+    files of the package are able to pick it up by simple inclusion of *path*
+    during their compilation, without interfering with the outer system at all\.
+
+    The generated file will contain the specified *contents*\.
+
+# <a name='section3'></a>Concepts
+
+## <a name='subsection15'></a>Modes Of Operation/Use
+
+CriTcl can be used in three different modes of operation, called
+
+  1. *[Compile & Run](\.\./index\.md\#compile\_run)*, and
+
+  1. *[Generate Package](\.\./index\.md\#generate\_package)*
+
+  1. *Generate TEA Package*
+
+*[Compile & Run](\.\./index\.md\#compile\_run)* was the original mode and is
+the default for *critcl\_pkg*\. Collects the C fragments from the *CriTcl
+script*, builds them as needed, and caches the results to improve load times
+later\.
+
+The second mode, *[Generate Package](\.\./index\.md\#generate\_package)*, was
+introduced to enable the creation of \(prebuilt\) deliverable packages which do
+not depend on the existence of a build system, i\.e\. C compiler, on the target
+machine\. This was originally done through the experimental __Critbind__
+tool, and is now handled by the *CriTcl Application*, also named
+__[critcl](critcl\.md)__\.
+
+Newly introduced with CriTcl version 3 is *Generate TEA Package*\. This mode
+constructs a directory hierarchy from the package which can later be built like
+a regular TEA package, i\.e\. using
+
+    .../configure --prefix ...
+    make all isntall
+
+Regarding the caching of results please read the section about the [Result
+Cache](#subsection18) fore more details\.
+
+## <a name='subsection16'></a>Runtime Behaviour
+
+The default behaviour of critcl, the package is to defer the compilation,
+linking, and loading of any C code as much as possible, given that this is an
+expensive operation, mainly in the time required\. In other words, the C code
+embedded into a "\.critcl" file is built only when the first C command or
+procedure it provides is invoked\. This part of the system uses standard
+functionality built into the Tcl core, i\.e\. the __auto\_index__ variable to
+map from commands to scripts providing them and the __unknown__ command
+using this information when the command is needed\.
+
+A *limitation* of this behaviour is that it is not possible to just use
+__info commands__ check for the existence of a critcl defined command\. It is
+also necessary to search in the __auto\_index__ array, in case it has not
+been build yet\.
+
+This behaviour can be changed by using the control command __critcl::load__\.
+When invoked, the building, including loading of the result, is forced\. After
+this command has been invoked for a "\.critcl" file further definition of C code
+in this file is not allowed any longer\.
+
+## <a name='subsection17'></a>File Mapping
+
+Each "\.critcl" file is backed by a single private "\.c" file containing that
+code, plus the boilerplate necessary for its compilation and linking as a single
+shared library\.
+
+The [Embedded C Code](#subsection10) fragments appear in that file in the
+exact same order they were defined in the "\.critcl" file, with one exception\.
+The C code provided via __critcl::cinit__ is put after all other fragments\.
+In other words all fragments have access to the symbols defined by earlier
+fragments, and the __critcl::cinit__ fragment has access to all, regardless
+of its placement in the "\.critcl" file\.
+
+Note: A *limitation* of the current system is the near impossibility of C
+level access between different critcl\-based packages\. The issue is not the
+necessity of writing and sharing the proper __extern__ statements, but that
+the management \(export and import\) of package\-specific stubs\-tables is not
+supported\. This means that dependent parts have to be forcibly loaded before
+their user, with all that entails\. See section [Runtime
+Behaviour](#subsection16) for the relevant critcl limitation, and remember
+that many older platforms do not support the necessary resolution of symbols,
+the reason why stubs were invented for Tcl in the first place\.
+
+## <a name='subsection18'></a>Result Cache
+
+The compilation of C code is time\-consuming __[critcl](critcl\.md)__ not
+only defers it as much as possible, as described in section [Runtime
+Behaviour](#subsection16), but also caches the results\.
+
+This means that on the first use of a "\.critcl" file "FOO\.tcl" the resulting
+object file and shared library are saved into the cache, and on future uses of
+the same file reused, i\.e\. loaded directly without requiring compilation,
+provided that the contents of "FOO\.tcl" did not change\.
+
+The change detection is based MD5 hashes\. A single hash is computed for each
+"\.critcl" file, based on hashes for all C code fragments and configuration
+options, i\.e\. everything which affects the resulting binary\.
+
+As long as the input file doesn't change as per the hash a previously built
+shared library found in the cache is reused, bypassing the compilation and link
+stages\.
+
+The command to manage the cache are found in section [Result Cache
+Management](#subsection7)\. Note however that they are useful only to tools
+based on the package, like the *CriTcl Application*\. Package writers have no
+need of them\.
+
+As a last note, the default directory for the cache is chosen based on the
+chosen build target\. This means that the cache can be put on a shared \(network\)
+filesystem without having to fear interference between machines of different
+architectures\.
+
+## <a name='subsection19'></a>Preloading functionality
+
+The audience of this section are developers wishing to understand and possibly
+modify the internals of critcl package and application\. Package writers can skip
+this section\.
+
+It explains how the preloading of external libraries is realized\.
+
+Whenever a package declares libraries for preloading critcl will build a
+supporting shared library providing a Tcl package named "preload"\. This package
+is not distributed separately, but as part of the package requiring the preload
+functionality\. This support package exports a single Tcl command
+
+  - <a name='94'></a>__::preload__ *library*
+
+    which is invoked once per libraries to preload, with the absolute path of
+    that *library*\. The command then loads the *library*\.
+
+    On windows the command will further use the Tcl command
+    __::critcl::runtime::precopy__ to copy the *library* to the disk,
+    should its path be in a virtual filesystem which doesn't directly support
+    the loading of a shared library from it\.
+
+The command __::critcl::runtime::precopy__ is provided by the file
+"critcl\-rt\.tcl" in the generated package, as is the command
+__::critcl::runtime::loadlib__ which generates the *ifneeded script*
+expected by Tcl's package management\. This generated ifneeded script contains
+the invocations of __::preload__\.
+
+The C code for the supporting library is found in the file "critcl\_c/preload\.c",
+which is part of the __[critcl](critcl\.md)__ package\.
+
+The Tcl code for the supporting runtime "critcl\-rt\.tcl" is found in the file
+"runtime\.tcl", which is part of the __critcl::app__ package\.
+
+## <a name='subsection20'></a>Configuration Internals
+
+The audience of this section are developers wishing to understand and possibly
+modify the internals of critcl package and application\. Package writers can skip
+this section\.
+
+It explains the syntax of configuration files and the configuration keys used by
+__[critcl](critcl\.md)__ to configure its build backend, i\.e\. how this
+part of the system accesses compiler, linker, etc\.
+
+It is recommended to open the file containing the standard configurations
+\("path/to/critcl/Config"\) in the editor of your choice when reading this section
+of the documentation, using it as an extended set of examples going beyond the
+simple defaults shown here\.
+
+First, the keys and the meaning of their values, plus examples drawn from the
+standard configurations distributed with the package\. Note that when writing a
+custom configuration it is not necessary to specify all the keys listed below,
+but only those whose default values are wrong or insufficient for the platform
+in question\.
+
+  - version
+
+    The command to print the compiler version number\. Defaults to
+
+    gcc -v
+
+  - compile
+
+    The command to compile a single C source file to an object file\. Defaults to
+
+    gcc -c -fPIC
+
+  - debug\_memory
+
+    The list of flags for the compiler to enable memory debugging in Tcl\.
+    Defaults to
+
+    -DTCL_MEM_DEBUG
+
+  - debug\_symbols
+
+    The list of flags for the compiler to add symbols to the object files and
+    the resulting library\. Defaults to
+
+    -g
+
+  - include
+
+    The compiler flag to add an include directory\. Defaults to
+
+    -I
+
+  - tclstubs
+
+    The compiler flag to set USE\_TCL\_STUBS\. Defaults to
+
+    -DUSE_TCL_STUBS
+
+  - tkstubs
+
+    The compiler flag to set USE\_TK\_STUBS\. Defaults to
+
+    -DUSE_TK_STUBS
+
+  - threadflags
+
+    The list of compiler flags to enable a threaded build\. Defaults to
+
+    -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1
+    -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1
+    -DTCL_THREADS=1
+
+    \.
+
+  - noassert
+
+    The compiler flag to turn off assertions in Tcl code\. Defaults to
+
+    -DNDEBUG
+
+  - optimize
+
+    The compiler flag to specify optimization level\. Defaults to
+
+    -O2
+
+  - output
+
+    The compiler flags to set the output file of a compilation\. Defaults to
+
+    -o [list $outfile]
+
+    *NOTE* the use of Tcl commands and variables here\. At the time
+    __[critcl](critcl\.md)__ uses the value of this key the value of the
+    referenced variable is substituted into it\. The named variable is the only
+    variable whose value is defined for this substitution\.
+
+  - object
+
+    The file extension for object files on the platform\. Defaults to
+
+    .o
+
+  - preproc\_define
+
+    The command to preprocess a C source file without compiling it, but leaving
+    \#define's in the output\. Defaults to
+
+    gcc -E -dM
+
+  - preproc\_enum
+
+    See __preproc\_define__, except that \#define's are not left in the
+    output\. Defaults to
+
+    gcc -E
+
+  - link
+
+    The command to link one or more object files and create a shared library\.
+    Defaults to
+
+    gcc -shared
+
+  - link\_preload
+
+    The list of linker flags to use when dependent libraries are pre\-loaded\.
+    Defaults to
+
+    --unresolved-symbols=ignore-in-shared-libs
+
+  - strip
+
+    The flag to tell the linker to strip symbols from the shared library\.
+    Defaults to
+
+    -Wl,-s
+
+  - ldoutput
+
+    Like __output__, but for the linker\. Defaults to the value of
+    __output__\.
+
+  - link\_debug
+
+    The list of linker flags needed to build a shared library with symbols\.
+    Defaults to the empty string\. One platform requiring this are all variants
+    of Windows, which uses
+
+    -debug:full -debugtype:cv
+
+  - link\_release
+
+    The list of linker flags needed to build a shared library without symbols,
+    i\.e\. a regular build\. Defaults to the empty string\. One platform requiring
+    this are all variants of Windows, which uses
+
+    -release -opt:ref -opt:icf,3 -ws:aggressive
+
+  - sharedlibext
+
+    The file extension for shared library files on the platform\. Defaults to
+
+    [info sharedlibextension]
+
+  - platform
+
+    The identifier of the platform used in generated packages\. Defaults to
+
+    [platform::generic]
+
+  - target
+
+    The presence of this key marks the configuration as a cross\-compilation
+    target and the value is the actual platform identifier of the target\. No
+    default\.
+
+The syntax expected from configuration files is governed by the rules below\.
+Again, it is recommended to open the file containing the standard configurations
+\("path/to/critcl/Config"\) in the editor of your choice when reading this section
+of the documentation, using it as an extended set of examples for the syntax>
+
+  1. Each logical line of the configuration file consists of one or more
+     physical lines\. In case of the latter the physical lines have to follow
+     each other and all but the first must be marked by a trailing backslash\.
+     This is the same marker for *continuation lines* as used by Tcl itself\.
+
+  1. A \(logical\) line starting with the character "\#" \(modulo whitespace\) is a
+     comment which runs until the end of the line, and is otherwise ignored\.
+
+  1. A \(logical\) line starting with the word "if" \(modulo whitespace\) is
+     interpreted as Tcl's __if__ command and executed as such\. I\.e\. this
+     command has to follow Tcl's syntax for the command, which may stretch
+     across multiple logical lines\. The command will be run in a save
+     interpreter\.
+
+  1. A \(logical\) line starting with the word "set" \(modulo whitespace\) is
+     interpreted as Tcl's __set__ command and executed as such\. I\.e\. this
+     command has to follow Tcl's syntax for the command, which may stretch
+     across multiple logical lines\. The command will be run in a save
+     interpreter\.
+
+  1. A line of the form "*platform* __variable__ *value*" defines a
+     platform specific configuration variable and value\. The __variable__
+     has to be the name of one of the configuration keys listed earlier in this
+     section, and the *platform* string identifies the platform the setting is
+     for\. All settings with the same identification string form the
+     *configuration block* for this platform\.
+
+  1. A line of the special form "*platform* __when__ *expression*" marks
+     the *platform* and all the settings in its *configuration block* as
+     conditional on the *expression*\.
+
+     If the build platform is not a prefix of *platform*, nor vice versa the
+     whole block is ignored\. Otherwise the *expression* is evaluated via
+     __expr__, in the same safe interpreter used to run any __set__ and
+     __if__ commands found in the configuration file \(see above\)\.
+
+     If the expression evaluates to __true__ this configuration block is
+     considered to be the build platform fo the host and chosen as the default
+     configuration\. An large example of of this feature is the handling of OS X
+     found in the standard configuration file, where it selects the
+     architectures to build based on the version of the operating system, the
+     available SDK, etc\. I\.e\. it chooses whether the output is universal or not,
+     and whether it is old\-style \(ix86 \+ ppc\) versus new\-style \(ix86 32\+64\) of
+     universality\.
+
+  1. A line of the special form "*platform* __copy__ *sourceplatform*"
+     copies the configuration variables and values currently defined in the
+     *configuration block* for *sourceplatform* to that of *platform*,
+     overwriting existing values, and creating missing ones\. Variables of
+     *platform* not defined by by *sourceplatform* are not touched\.
+
+     The copied values can be overridden later in the configuration file\.
+     Multiple __copy__ lines may exist for a platform and be intermixed with
+     normal configuration definitions\. Only the last definition of a variable is
+     used\.
+
+  1. At last, a line of the form "__variable__ *value*" defines a default
+     configuration variable and value\.
+
+## <a name='subsection21'></a>Stubs Tables
+
+This section is for developers of extensions not based on critcl, yet also
+wishing to interface with stubs as they are understood and used by critcl,
+either by exporting their own stubs table to a critcl\-based extension, or
+importing a stubs table of a critcl\-based extension into their own\.
+
+To this end we describe the stubs table information of a package __foo__\.
+
+  1. Note that the differences in the capitalization of "foo", "Foo", "FOO",
+     etc\. below demonstrate how to capitalize the actual package name in each
+     context\.
+
+  1. All relevant files must be available in a sub\-directory "foo" which can be
+     found on the include search paths\.
+
+  1. The above directory may contain a file "foo\.decls"\. If present it is
+     assumed to contain the external representation of the stubs table the
+     headers mentioned in the following items are based on\.
+
+     critcl is able to use such a file to give the importing package
+     programmatic access to the imported API, for automatic code generation and
+     the like\.
+
+  1. The above directory must contain a header file "fooDecls\.h"\. This file
+     *declares* the exported API\. It is used by both exporting and importing
+     packages\. It is usually generated and must contain \(in the order
+     specified\):
+
+       1) the declarations of the exported, i\.e\. public, functions of
+          __foo__,
+
+       1) the declaration of structure "FooStubs" for the stub table,
+
+       1) the C preprocessor macros which route the invocations of the public
+          functions through the stubs table\.
+
+          These macros must be defined if, and only if, the C preprocessor macro
+          USE\_FOO\_STUBS is defined\. Package __foo__ does not define this
+          macro, as it is allowed to use the exported functions directly\. All
+          importing packages however must define this macro, to ensure that they
+          do *not* use any of the exported functions directly, but only
+          through the stubs table\.
+
+       1) If the exported functions need additional types for their proper
+          declaration then these types should be put into a separate header file
+          \(of arbitrary name\) and "fooDecls\.h" should contain an \#include
+          directive to this header at the top\.
+
+     A very reduced, yet also complete example, from a package for low\-level
+     random number generator functions can be found at the end of this section\.
+
+  1. The above directory must contain a header file "fooStubLib\.h"\. This file
+     *defines* everything needed to use the API of __foo__\. Consequently
+     it is used only by importing packages\. It is usually generated and must
+     contain \(in the order specified\):
+
+       1) An \#include directive for "tcl\.h", with USE\_TCL\_STUBS surely defined\.
+
+       1) An \#include directive for "fooDecls\.h", with USE\_FOO\_STUBS surely
+          defined\.
+
+       1) A *definition* of the stubs table variable, i\.e\.
+
+    const FooStubs* fooStubsPtr;
+
+       1) A *definition* of the stubs initializer function, like
+
+    char *
+    Foo_InitStubs(Tcl_Interp *interp, CONST char *version, int exact)
+    {
+        /*
+         * Boiler plate C code initalizing the stubs table variable,
+         * i.e. "fooStubsPtr".
+         */
+
+        CONST char *actualVersion;
+
+        actualVersion = Tcl_PkgRequireEx(interp, "foo", version,
+    				     exact, (ClientData *) &fooStubsPtr);
+
+        if (!actualVersion) {
+    	return NULL;
+        }
+
+        if (!fooStubsPtr) {
+    	Tcl_SetResult(interp,
+    		      "This implementation of Foo does not support stubs",
+    		      TCL_STATIC);
+    	return NULL;
+        }
+
+        return (char*) actualVersion;
+    }
+
+     This header file must be included by an importing package *exactly once*,
+     so that it contains only one definition of both stubs table and stubs
+     initializer function\.
+
+     The importing package's initialization function must further contain a
+     statement like
+
+    if (!Foo_InitStubs (ip, "1", 0)) {
+        return TCL_ERROR;
+    }
+
+     which invokes __foo__'s stubs initializer function to set the local
+     stub table up\.
+
+     For a complete example of such a header file see below, at the end of this
+     section\.
+
+  1. The last item above, about "fooStubLib\.h" *differs* from the regular stub
+     stable system used by Tcl\. The regular system assumes that a static library
+     "libfoostub\.a" was installed by package __foo__, and links it\.
+
+     IMVHO critcl's approach is simpler, using *only* header files found in a
+     single location, vs\. header files and static library found in multiple,
+     different locations\.
+
+     A second simplification is that we avoid having to extend critcl's compiler
+     backend with settings for the creation of static libraries\.
+
+Below is a complete set of example header files, reduced, yet still complete,
+from a package for low\-level random number generator functions:
+
+  - "rngDecls\.h":
+
+    #ifndef rng_DECLS_H
+    #define rng_DECLS_H
+
+    #include <tcl.h>
+
+    /*
+     * Exported function declarations:
+     */
+
+    /* 0 */
+    EXTERN void rng_bernoulli(double p, int*v);
+
+    typedef struct RngStubs {
+        int magic;
+        const struct RngStubHooks *hooks;
+
+        void (*rng_bernoulli) (double p, int*v); /* 0 */
+    } RngStubs;
+
+    #ifdef __cplusplus
+    extern "C" {
+    #endif
+    extern const RngStubs *rngStubsPtr;
+    #ifdef __cplusplus
+    }
+    #endif
+
+    #if defined(USE_RNG_STUBS)
+
+    /*
+     * Inline function declarations:
+     */
+
+    #define rng_bernoulli  (rngStubsPtr->rng_bernoulli) /* 0 */
+
+    #endif /* defined(USE_RNG_STUBS) */
+    #endif /* rng_DECLS_H */
+
+  - "rngStubLib\.h":
+
+    /*
+     * rngStubLib.c --
+     *
+     * Stub object that will be statically linked into extensions that wish
+     * to access rng.
+     */
+
+    #ifndef USE_TCL_STUBS
+    #define USE_TCL_STUBS
+    #endif
+    #undef  USE_TCL_STUB_PROCS
+
+    #include <tcl.h>
+
+    #ifndef USE_RNG_STUBS
+    #define USE_RNG_STUBS
+    #endif
+    #undef  USE_RNG_STUB_PROCS
+
+    #include "rngDecls.h"
+
+    /*
+     * Ensure that Rng_InitStubs is built as an exported symbol.  The other stub
+     * functions should be built as non-exported symbols.
+     */
+
+    #undef  TCL_STORAGE_CLASS
+    #define TCL_STORAGE_CLASS DLLEXPORT
+
+    const RngStubs* rngStubsPtr;
+
+    /*
+     *----------------------------------------------------------------------
+     *
+     * Rng_InitStubs --
+     *
+     * Checks that the correct version of Rng is loaded and that it
+     * supports stubs. It then initialises the stub table pointers.
+     *
+     * Results:
+     *  The actual version of Rng that satisfies the request, or
+     *  NULL to indicate that an error occurred.
+     *
+     * Side effects:
+     *  Sets the stub table pointers.
+     *
+     *----------------------------------------------------------------------
+     */
+
+    #ifdef Rng_InitStubs
+    #undef Rng_InitStubs
+    #endif
+
+    char *
+    Rng_InitStubs(Tcl_Interp *interp, CONST char *version, int exact)
+    {
+        CONST char *actualVersion;
+
+        actualVersion = Tcl_PkgRequireEx(interp, "rng", version,
+    				     exact, (ClientData *) &rngStubsPtr);
+        if (!actualVersion) {
+    	return NULL;
+        }
+
+        if (!rngStubsPtr) {
+    	Tcl_SetResult(interp,
+    		      "This implementation of Rng does not support stubs",
+    		      TCL_STATIC);
+    	return NULL;
+        }
+
+        return (char*) actualVersion;
+    }
+
+# <a name='section4'></a>Examples
+
+See section "Embedding C" in *Using CriTcl*\.
+
+# <a name='section5'></a>Authors
+
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+# <a name='section6'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report them at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)\.
+Ideas for enhancements you may have for either package, application, and/or the
+documentation are also very welcome and should be reported at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)
+as well\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [calling C code from
+Tcl](\.\./index\.md\#calling\_c\_code\_from\_tcl), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; Jean\-Claude Wippler  
+Copyright &copy; Steve Landers  
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_tcl9.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_tcl9.md
new file mode 100644
index 00000000..c7da38f6
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_tcl9.md
@@ -0,0 +1,257 @@
+
+[//000000001]: # (critcl\_tcl9 \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_tcl9\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; Jean\-Claude Wippler)
+[//000000004]: # (Copyright &copy; Steve Landers)
+[//000000005]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000006]: # (critcl\_tcl9\(n\) 3\.2\.1 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl\_tcl9 \- How To Adapt Critcl Packages for Tcl 9
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Description](#section1)
+
+  - [Additional References](#section2)
+
+  - [Authors](#section3)
+
+  - [Bugs, Ideas, Feedback](#section4)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This guide contains notes and actions to take by writers of
+*[CriTcl](critcl\.md)*\-based packages to make their code workable for both
+Tcl 8\.6 and 9\.
+
+  1. Generally, if there is no interest in moving to Tcl 9, i\.e\. Tcl 8\.\[456\] are
+     the only supported runtimes, then just keep using
+     *[CriTcl](critcl\.md)* __3\.2__\.
+
+     The remainder of this document can be ignored\.
+
+  1. Use *[CriTcl](critcl\.md)* version 3\.2\.1 *if, and only if* Tcl 9
+     support is wanted\.
+
+     With some work this will then also provide backward compatibility with Tcl
+     8\.6\.
+
+  1. Header "tcl\.h"
+
+     Replace any inclusion of Tcl's public "tcl\.h" header file in the package's
+     C code with the inclusion of *[CriTcl](critcl\.md)*'s new header file
+     "tclpre9compat\.h"\.
+
+     This includes "tcl\.h" and further provides a set of compatibility
+     definitions which make supporting both Tcl 8\.6 and Tcl 9 in a single code
+     base easier\.
+
+     The following notes assume that this compatibility layer is in place\.
+
+  1. __critcl::tcl__
+
+     Before *[CriTcl](critcl\.md)* 3\.2\.1 a single default \(__8\.4__\) was
+     used for the minimum Tcl version, to be overriden by an explicit
+     __critcl::tcl__ in the package code\.
+
+     Now the default is dynamic, based on the *runtime* version, i\.e\.
+     __package provide Tcl__, *[CriTcl](critcl\.md)* is run with/on\.
+
+     When running on Tcl 9 the new default is version __9__, and __8\.6__
+     else\. *Note* how this other default was bumped up from __8\.4__\.
+
+     As a consequence it is possible to
+
+       1) Support just Tcl 8\.4\+, 8\.5\+, by having an explicit __critcl::tcl
+          8\.x__ in the package code\.
+
+          *Remember however*, it is better to simply stick with
+          *[CriTcl](critcl\.md)* __3\.2__ for this\.
+
+       1) Support just Tcl 9 by having an explicit __critcl::tcl 9__ in the
+          package code\.
+
+       1) Support both Tcl 8\.6 and Tcl 9 \(but not 8\.4/8\.5\) by leaving
+          __critcl::tcl__ out of the code and using the proper __tclsh__
+          version to run *[CriTcl](critcl\.md)* with\.
+
+  1. Code checking
+
+     *[CriTcl](critcl\.md)* 3\.2\.1 comes with a very basic set of code
+     checks pointing out places where compatibility might or will be an issue\.
+
+     The implementation checks all inlined C code declared by
+     __critcl::ccode__, __critcl::ccommand__, __critcl::cproc__ \(and
+     related/derived commands\), as well as the C companion files declared with
+     __critcl::csources__\.
+
+     It is very basic because it simply greps the code line by line for a number
+     of patterns and reports on their presence\. The C code is not fully parsed\.
+     The check can and will report pattern found in C code comments, for
+     example\.
+
+     The main patterns deal with functions affected by the change to
+     __Tcl\_Size__, the removal of old\-style interpreter state handling, and
+     command creation\.
+
+     A warning message is printed for all detections\.
+
+     This is disabled for the __Tcl\_Size__\-related pattern if the line also
+     matches the pattern __\*OK tcl9\*__\.
+
+     In this way all places in the code already handled can be marked and
+     excluded from the warnings\.
+
+       1) Interpreter State handling
+
+          Tcl 9 removed the type __Tcl\_SavedResult__ and its associated
+          functions __Tcl\_SaveResult__, __Tcl\_RestoreResult__, and
+          __Tcl\_DiscardResult__\.
+
+          When a package uses this type and the related functions a rewrite is
+          necessary\.
+
+          With Tcl 9 use of type __Tcl\_InterpState__ and its functions
+          __Tcl\_SaveInterpState__, __Tcl\_RestoreInterpState__, and
+          __Tcl\_DiscardInterpState__ is now required\.
+
+          As these were introduced with Tcl 8\.5 the rewrite gives us
+          compatibility with Tcl 8\.6 for free\.
+
+       1) __Tcl\_Size__
+
+          One of the main changes introduced with Tcl 9 is the breaking of the
+          2G barrier for the number of bytes in a string, elements in a list,
+          etc\. In a lot of interfaces __int__ was replaced with
+          __Tcl\_Size__, which is effectively __ptrdiff\_t__ behind the
+          scenes\.
+
+          The "tclpre9compat\.h" header mentioned above provides a suitable
+          definition of __Tcl\_Size__ for __8\.6__, i\.e\. maps it to
+          __int__\. This enables the package code to use __Tcl\_Size__
+          everywhere and still have it work for both Tcl 8\.6 and 9\.
+
+          It is of course necessary to rewrite the package code to use
+          __Tcl\_Size__\.
+
+          The checker reports all lines in the C code using a function whose
+          signature was changed to use __Tcl\_Size__ over __int__\.
+
+          Note that it is necessary to manually check the package code for
+          places where a __%d__ text formatting specification should be
+          replaced with __TCL\_SIZE\_FMT__\.
+
+          I\.e\. all places where __Tcl\_Size__ values are formatted with
+          __printf__\-style functions a formatting string
+
+              "... %d ..."
+
+          has to be replaced with
+
+              "... " TCL_SIZE_FMT " ..."
+
+          The macro __TCL\_SIZE\_FMT__ is defined by Critcl's compatibility
+          layer, as an extension of the __TCL\_SIZE\_MODIFIER__ macro which
+          only contains the formatting modifier to insert into a plain
+          __%d__ to handle __Tcl\_Size__ values\.
+
+          *Note* how the original formatting string is split into multiple
+          strings\. The C compiler will fuse these back together into a single
+          string\.
+
+       1) Command creation\.
+
+          This is technically a part of the __Tcl\_Size__ changes\.
+
+          All places using __Tcl\_CreateObjCommand__ have to be rewritten to
+          use __Tcl\_CreateObjCommand2__ instead, and the registered command
+          functions to use __Tcl\_Size__ for their *objc* argument\.
+
+          The "tclpre9compat\.h" header maps this back to the old function when
+          compilation is done against Tcl 8\.6\.
+
+          *[CriTcl](critcl\.md)* does this itself for the commands created
+          via __critcl::ccommand__, __critcl::cproc__, and derived
+          places \(__[critcl::class](critcl\_class\.md)__\)\.
+
+       1) TIP 494\. This TIP adds three semantic constants wrapping __\-1__ to
+          Tcl 9 to make the meaning of code clearer\. As part of this it also
+          casts the constant to the proper type\. They are:
+
+            - __TCL\_IO\_FAILURE__
+
+            - __TCL\_AUTO\_LENGTH__
+
+            - __TCL\_INDEX\_NONE__
+
+          Critcl's compatibility layer provides the same constants to Tcl 8\.6\.
+
+          Critcl's new checker highlights places where __TCL\_AUTO\_LENGTH__
+          is suitable\.
+
+          Doing this for the other two constants looks to require deeper and
+          proper parsing of C code, which the checker does not do\.
+
+# <a name='section2'></a>Additional References
+
+  1. [https://wiki\.tcl\-lang\.org/page/Porting\+extensions\+to\+Tcl\+9](https://wiki\.tcl\-lang\.org/page/Porting\+extensions\+to\+Tcl\+9)
+
+  1. [https://wiki\.tcl\-lang\.org/page/Tcl\+9\+functions\+using\+Tcl%5FSize](https://wiki\.tcl\-lang\.org/page/Tcl\+9\+functions\+using\+Tcl%5FSize)
+
+  1. [https://core\.tcl\-lang\.org/tcl/wiki?name=Migrating%20scripts%20to%20Tcl%209](https://core\.tcl\-lang\.org/tcl/wiki?name=Migrating%20scripts%20to%20Tcl%209)
+
+  1. [https://core\.tcl\-lang\.org/tcl/wiki?name=Migrating%20C%20extensions%20to%20Tcl%209](https://core\.tcl\-lang\.org/tcl/wiki?name=Migrating%20C%20extensions%20to%20Tcl%209)
+
+# <a name='section3'></a>Authors
+
+Jean Claude Wippler, Steve Landers, Andreas Kupries
+
+# <a name='section4'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report them at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)\.
+Ideas for enhancements you may have for either package, application, and/or the
+documentation are also very welcome and should be reported at
+[https://github\.com/andreas\-kupries/critcl/issues](https://github\.com/andreas\-kupries/critcl/issues)
+as well\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [calling C code from
+Tcl](\.\./index\.md\#calling\_c\_code\_from\_tcl), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; Jean\-Claude Wippler  
+Copyright &copy; Steve Landers  
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/files/critcl_util.md b/src/vfs/critcl.vfs/embedded/md/files/critcl_util.md
new file mode 100644
index 00000000..c392d4f0
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/files/critcl_util.md
@@ -0,0 +1,137 @@
+
+[//000000001]: # (critcl::util \- C Runtime In Tcl \(CriTcl\))
+[//000000002]: # (Generated from file 'critcl\_util\.man' by tcllib/doctools with format 'markdown')
+[//000000003]: # (Copyright &copy; 2011\-2024 Andreas Kupries)
+[//000000004]: # (critcl::util\(n\) 1\.2 doc "C Runtime In Tcl \(CriTcl\)")
+
+<hr> [ <a href="../toc.md">Table Of Contents</a> &#124; <a
+href="../index.md">Keyword Index</a> ] <hr>
+
+# NAME
+
+critcl::util \- CriTcl \- Utilities
+
+# <a name='toc'></a>Table Of Contents
+
+  - [Table Of Contents](#toc)
+
+  - [Synopsis](#synopsis)
+
+  - [Description](#section1)
+
+  - [API](#section2)
+
+  - [Authors](#section3)
+
+  - [Bugs, Ideas, Feedback](#section4)
+
+  - [Keywords](#keywords)
+
+  - [Category](#category)
+
+  - [Copyright](#copyright)
+
+# <a name='synopsis'></a>SYNOPSIS
+
+package require Tcl 8\.6  
+package require critcl ?3\.2?  
+package require critcl::util ?1\.2?  
+
+[__::critcl::util::checkfun__ *name* ?*label*?](#1)  
+[__::critcl::util::def__ *path* *define* ?*value*?](#2)  
+[__::critcl::util::undef__ *path* *define*](#3)  
+[__::critcl::util::locate__ *label* *paths* ?*cmd*?](#4)  
+
+# <a name='description'></a>DESCRIPTION
+
+Be welcome to the *C Runtime In Tcl* \(short: *[CriTcl](critcl\.md)*\), a
+system for embedding and using C code from within
+[Tcl](http://core\.tcl\-lang\.org/tcl) scripts\.
+
+This document is the reference manpage for the __critcl::util__ package\.
+This package provides convenience commands for advanced functionality built on
+top of the core\. Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code\.
+
+This package resides in the Core Package Layer of CriTcl\.
+
+![](\.\./image/arch\_core\.png)
+
+# <a name='section2'></a>API
+
+  - <a name='1'></a>__::critcl::util::checkfun__ *name* ?*label*?
+
+    This command checks the build\-time environment for the existence of the C
+    function *name*\. It returns __true__ on success, and __false__
+    otherwise\.
+
+  - <a name='2'></a>__::critcl::util::def__ *path* *define* ?*value*?
+
+    This command extends the specified configuration file *path* with a
+    __\#define__ directive for the named *define*\. If the *value* is not
+    specified it will default to __1__\.
+
+    The result of the command is an empty string\.
+
+    Note that the configuration file is maintained in the __critcl::cache__
+    directory\.
+
+  - <a name='3'></a>__::critcl::util::undef__ *path* *define*
+
+    This command extends the specified configuration file *path* with an
+    __\#undef__ directive for the named *define*\.
+
+    The result of the command is an empty string\.
+
+    Note that the configuration file is maintained in the __critcl::cache__
+    directory\.
+
+  - <a name='4'></a>__::critcl::util::locate__ *label* *paths* ?*cmd*?
+
+    This command checks the build\-time environment for the existence of a file
+    in a set of possible *paths*\.
+
+    If the option *cmd* prefix is specified it will be called with the full
+    path of a found file as its only argument to perform further checks\. A
+    return value of __false__ will reject the path and continue the search\.
+
+    The return value of the command is the found path, as listed in *paths*\.
+    As a side effect the command will also print the found path, prefixed with
+    the *label*, using __critcl::msg__\.
+
+    Failure to find the path is reported via __critcl::error__, and a
+    possible empty string as the result, if __critcl::error__ does not
+    terminate execution\. A relative path is resolved relative to the directory
+    containing the *CriTcl script*\.
+
+# <a name='section3'></a>Authors
+
+Andreas Kupries
+
+# <a name='section4'></a>Bugs, Ideas, Feedback
+
+This document, and the package it describes, will undoubtedly contain bugs and
+other problems\. Please report such at
+[https://github\.com/andreas\-kupries/critcl](https://github\.com/andreas\-kupries/critcl)\.
+Please also report any ideas for enhancements you may have for either package
+and/or documentation\.
+
+# <a name='keywords'></a>KEYWORDS
+
+[C code](\.\./index\.md\#c\_code), [Embedded C
+Code](\.\./index\.md\#embedded\_c\_code), [code
+generator](\.\./index\.md\#code\_generator), [compile &
+run](\.\./index\.md\#compile\_run), [compiler](\.\./index\.md\#compiler),
+[dynamic code generation](\.\./index\.md\#dynamic\_code\_generation), [dynamic
+compilation](\.\./index\.md\#dynamic\_compilation), [generate
+package](\.\./index\.md\#generate\_package), [linker](\.\./index\.md\#linker),
+[on demand compilation](\.\./index\.md\#on\_demand\_compilation), [on\-the\-fly
+compilation](\.\./index\.md\#on\_the\_fly\_compilation)
+
+# <a name='category'></a>CATEGORY
+
+Glueing/Embedded C code
+
+# <a name='copyright'></a>COPYRIGHT
+
+Copyright &copy; 2011\-2024 Andreas Kupries
diff --git a/src/vfs/critcl.vfs/embedded/md/image/arch_application.png b/src/vfs/critcl.vfs/embedded/md/image/arch_application.png
new file mode 100644
index 00000000..2f732c83
Binary files /dev/null and b/src/vfs/critcl.vfs/embedded/md/image/arch_application.png differ
diff --git a/src/vfs/critcl.vfs/embedded/md/image/arch_core.png b/src/vfs/critcl.vfs/embedded/md/image/arch_core.png
new file mode 100644
index 00000000..4ae56a7d
Binary files /dev/null and b/src/vfs/critcl.vfs/embedded/md/image/arch_core.png differ
diff --git a/src/vfs/critcl.vfs/embedded/md/image/arch_support.png b/src/vfs/critcl.vfs/embedded/md/image/arch_support.png
new file mode 100644
index 00000000..bee761f2
Binary files /dev/null and b/src/vfs/critcl.vfs/embedded/md/image/arch_support.png differ
diff --git a/src/vfs/critcl.vfs/embedded/md/image/architecture.png b/src/vfs/critcl.vfs/embedded/md/image/architecture.png
new file mode 100644
index 00000000..dacfeb47
Binary files /dev/null and b/src/vfs/critcl.vfs/embedded/md/image/architecture.png differ
diff --git a/src/vfs/critcl.vfs/embedded/md/index.md b/src/vfs/critcl.vfs/embedded/md/index.md
new file mode 100644
index 00000000..8d3632c2
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/index.md
@@ -0,0 +1,100 @@
+
+[//000000001]: # (Index generated by tcllib/doctools/idx with format 'markdown')
+
+# Keyword Index \-\- doc
+
+----
+
+[B](#cB) &#183; [C](#cC) &#183; [D](#cD) &#183; [E](#cE) &#183; [F](#cF) &#183; [G](#cG) &#183; [I](#cI) &#183; [L](#cL) &#183; [O](#cO) &#183; [S](#cS) &#183; [T](#cT)
+
+----
+
+#### <a name='cB'></a>Keywords: B
+
+|||
+|---|---|
+|<a name='bitmask'></a>bitmask|[critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::emap](files/critcl\_emap\.md)|
+|<a name='bitset'></a>bitset|[critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::emap](files/critcl\_emap\.md)|
+
+
+#### <a name='cC'></a>Keywords: C
+
+|||
+|---|---|
+|<a name='c\_class'></a>C class|[critcl::class](files/critcl\_class\.md)|
+|<a name='c\_code'></a>C code|[critcl](files/critcl\.md) &#183; [critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::callback](files/critcl\_callback\.md) &#183; [critcl::class](files/critcl\_class\.md) &#183; [critcl::cutil](files/critcl\_cutil\.md) &#183; [critcl::emap](files/critcl\_emap\.md) &#183; [critcl::enum](files/critcl\_enum\.md) &#183; [critcl::iassoc](files/critcl\_iassoc\.md) &#183; [critcl::literals](files/critcl\_literals\.md) &#183; [critcl::util](files/critcl\_util\.md) &#183; [critcl\_application](files/critcl\_application\.md) &#183; [critcl\_application\_package](files/critcl\_application\_package\.md) &#183; [critcl\_build\_tool](files/critcl\_build\.md) &#183; [critcl\_changes](files/critcl\_changes\.md) &#183; [critcl\_cproc\_types](files/critcl\_cproc\.md) &#183; [critcl\_devguide](files/critcl\_devguide\.md) &#183; [critcl\_howto\_install](files/critcl\_howto\_install\.md) &#183; [critcl\_howto\_sources](files/critcl\_howto\_sources\.md) &#183; [critcl\_howto\_use](files/critcl\_howto\_use\.md) &#183; [critcl\_license](files/critcl\_license\.md) &#183; [critcl\_package](files/critcl\_package\.md) &#183; [critcl\_tcl9](files/critcl\_tcl9\.md)|
+|<a name='c\_instance'></a>C instance|[critcl::class](files/critcl\_class\.md)|
+|<a name='c\_object'></a>C object|[critcl::class](files/critcl\_class\.md)|
+|<a name='calling\_c\_code\_from\_tcl'></a>calling C code from Tcl|[critcl](files/critcl\.md) &#183; [critcl\_application](files/critcl\_application\.md) &#183; [critcl\_application\_package](files/critcl\_application\_package\.md) &#183; [critcl\_build\_tool](files/critcl\_build\.md) &#183; [critcl\_changes](files/critcl\_changes\.md) &#183; [critcl\_cproc\_types](files/critcl\_cproc\.md) &#183; [critcl\_devguide](files/critcl\_devguide\.md) &#183; [critcl\_howto\_install](files/critcl\_howto\_install\.md) &#183; [critcl\_howto\_sources](files/critcl\_howto\_sources\.md) &#183; [critcl\_howto\_use](files/critcl\_howto\_use\.md) &#183; [critcl\_license](files/critcl\_license\.md) &#183; [critcl\_package](files/critcl\_package\.md) &#183; [critcl\_tcl9](files/critcl\_tcl9\.md)|
+|<a name='code\_generator'></a>code generator|[critcl](files/critcl\.md) &#183; [critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::callback](files/critcl\_callback\.md) &#183; [critcl::class](files/critcl\_class\.md) &#183; [critcl::cutil](files/critcl\_cutil\.md) &#183; [critcl::emap](files/critcl\_emap\.md) &#183; [critcl::enum](files/critcl\_enum\.md) &#183; [critcl::iassoc](files/critcl\_iassoc\.md) &#183; [critcl::literals](files/critcl\_literals\.md) &#183; [critcl::util](files/critcl\_util\.md) &#183; [critcl\_application](files/critcl\_application\.md) &#183; [critcl\_application\_package](files/critcl\_application\_package\.md) &#183; [critcl\_build\_tool](files/critcl\_build\.md) &#183; [critcl\_changes](files/critcl\_changes\.md) &#183; [critcl\_cproc\_types](files/critcl\_cproc\.md) &#183; [critcl\_devguide](files/critcl\_devguide\.md) &#183; [critcl\_howto\_install](files/critcl\_howto\_install\.md) &#183; [critcl\_howto\_sources](files/critcl\_howto\_sources\.md) &#183; [critcl\_howto\_use](files/critcl\_howto\_use\.md) &#183; [critcl\_license](files/critcl\_license\.md) &#183; [critcl\_package](files/critcl\_package\.md) &#183; [critcl\_tcl9](files/critcl\_tcl9\.md)|
+|<a name='compile\_run'></a>compile & run|[critcl](files/critcl\.md) &#183; [critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::callback](files/critcl\_callback\.md) &#183; [critcl::class](files/critcl\_class\.md) &#183; [critcl::cutil](files/critcl\_cutil\.md) &#183; [critcl::emap](files/critcl\_emap\.md) &#183; [critcl::enum](files/critcl\_enum\.md) &#183; [critcl::iassoc](files/critcl\_iassoc\.md) &#183; [critcl::literals](files/critcl\_literals\.md) &#183; [critcl::util](files/critcl\_util\.md) &#183; [critcl\_application](files/critcl\_application\.md) &#183; [critcl\_application\_package](files/critcl\_application\_package\.md) &#183; [critcl\_build\_tool](files/critcl\_build\.md) &#183; [critcl\_changes](files/critcl\_changes\.md) &#183; [critcl\_cproc\_types](files/critcl\_cproc\.md) &#183; [critcl\_devguide](files/critcl\_devguide\.md) &#183; [critcl\_howto\_install](files/critcl\_howto\_install\.md) &#183; [critcl\_howto\_sources](files/critcl\_howto\_sources\.md) &#183; [critcl\_howto\_use](files/critcl\_howto\_use\.md) &#183; [critcl\_license](files/critcl\_license\.md) &#183; [critcl\_package](files/critcl\_package\.md) &#183; [critcl\_tcl9](files/critcl\_tcl9\.md)|
+|<a name='compiler'></a>compiler|[critcl](files/critcl\.md) &#183; [critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::callback](files/critcl\_callback\.md) &#183; [critcl::class](files/critcl\_class\.md) &#183; [critcl::cutil](files/critcl\_cutil\.md) &#183; [critcl::emap](files/critcl\_emap\.md) &#183; [critcl::enum](files/critcl\_enum\.md) &#183; [critcl::iassoc](files/critcl\_iassoc\.md) &#183; [critcl::literals](files/critcl\_literals\.md) &#183; [critcl::util](files/critcl\_util\.md) &#183; [critcl\_application](files/critcl\_application\.md) &#183; [critcl\_application\_package](files/critcl\_application\_package\.md) &#183; [critcl\_build\_tool](files/critcl\_build\.md) &#183; [critcl\_changes](files/critcl\_changes\.md) &#183; [critcl\_cproc\_types](files/critcl\_cproc\.md) &#183; [critcl\_devguide](files/critcl\_devguide\.md) &#183; [critcl\_howto\_install](files/critcl\_howto\_install\.md) &#183; [critcl\_howto\_sources](files/critcl\_howto\_sources\.md) &#183; [critcl\_howto\_use](files/critcl\_howto\_use\.md) &#183; [critcl\_license](files/critcl\_license\.md) &#183; [critcl\_package](files/critcl\_package\.md) &#183; [critcl\_tcl9](files/critcl\_tcl9\.md)|
+|<a name='conversion'></a>conversion|[critcl::enum](files/critcl\_enum\.md)|
+
+
+#### <a name='cD'></a>Keywords: D
+
+|||
+|---|---|
+|<a name='dynamic\_code\_generation'></a>dynamic code generation|[critcl](files/critcl\.md) &#183; [critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::callback](files/critcl\_callback\.md) &#183; [critcl::class](files/critcl\_class\.md) &#183; [critcl::cutil](files/critcl\_cutil\.md) &#183; [critcl::emap](files/critcl\_emap\.md) &#183; [critcl::enum](files/critcl\_enum\.md) &#183; [critcl::iassoc](files/critcl\_iassoc\.md) &#183; [critcl::literals](files/critcl\_literals\.md) &#183; [critcl::util](files/critcl\_util\.md) &#183; [critcl\_application](files/critcl\_application\.md) &#183; [critcl\_application\_package](files/critcl\_application\_package\.md) &#183; [critcl\_build\_tool](files/critcl\_build\.md) &#183; [critcl\_changes](files/critcl\_changes\.md) &#183; [critcl\_cproc\_types](files/critcl\_cproc\.md) &#183; [critcl\_devguide](files/critcl\_devguide\.md) &#183; [critcl\_howto\_install](files/critcl\_howto\_install\.md) &#183; [critcl\_howto\_sources](files/critcl\_howto\_sources\.md) &#183; [critcl\_howto\_use](files/critcl\_howto\_use\.md) &#183; [critcl\_license](files/critcl\_license\.md) &#183; [critcl\_package](files/critcl\_package\.md) &#183; [critcl\_tcl9](files/critcl\_tcl9\.md)|
+|<a name='dynamic\_compilation'></a>dynamic compilation|[critcl](files/critcl\.md) &#183; [critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::callback](files/critcl\_callback\.md) &#183; [critcl::class](files/critcl\_class\.md) &#183; [critcl::cutil](files/critcl\_cutil\.md) &#183; [critcl::emap](files/critcl\_emap\.md) &#183; [critcl::enum](files/critcl\_enum\.md) &#183; [critcl::iassoc](files/critcl\_iassoc\.md) &#183; [critcl::literals](files/critcl\_literals\.md) &#183; [critcl::util](files/critcl\_util\.md) &#183; [critcl\_application](files/critcl\_application\.md) &#183; [critcl\_application\_package](files/critcl\_application\_package\.md) &#183; [critcl\_build\_tool](files/critcl\_build\.md) &#183; [critcl\_changes](files/critcl\_changes\.md) &#183; [critcl\_cproc\_types](files/critcl\_cproc\.md) &#183; [critcl\_devguide](files/critcl\_devguide\.md) &#183; [critcl\_howto\_install](files/critcl\_howto\_install\.md) &#183; [critcl\_howto\_sources](files/critcl\_howto\_sources\.md) &#183; [critcl\_howto\_use](files/critcl\_howto\_use\.md) &#183; [critcl\_license](files/critcl\_license\.md) &#183; [critcl\_package](files/critcl\_package\.md) &#183; [critcl\_tcl9](files/critcl\_tcl9\.md)|
+
+
+#### <a name='cE'></a>Keywords: E
+
+|||
+|---|---|
+|<a name='embedded\_c\_code'></a>Embedded C Code|[critcl](files/critcl\.md) &#183; [critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::callback](files/critcl\_callback\.md) &#183; [critcl::class](files/critcl\_class\.md) &#183; [critcl::cutil](files/critcl\_cutil\.md) &#183; [critcl::emap](files/critcl\_emap\.md) &#183; [critcl::enum](files/critcl\_enum\.md) &#183; [critcl::iassoc](files/critcl\_iassoc\.md) &#183; [critcl::literals](files/critcl\_literals\.md) &#183; [critcl::util](files/critcl\_util\.md) &#183; [critcl\_application](files/critcl\_application\.md) &#183; [critcl\_application\_package](files/critcl\_application\_package\.md) &#183; [critcl\_build\_tool](files/critcl\_build\.md) &#183; [critcl\_changes](files/critcl\_changes\.md) &#183; [critcl\_cproc\_types](files/critcl\_cproc\.md) &#183; [critcl\_devguide](files/critcl\_devguide\.md) &#183; [critcl\_howto\_install](files/critcl\_howto\_install\.md) &#183; [critcl\_howto\_sources](files/critcl\_howto\_sources\.md) &#183; [critcl\_howto\_use](files/critcl\_howto\_use\.md) &#183; [critcl\_license](files/critcl\_license\.md) &#183; [critcl\_package](files/critcl\_package\.md) &#183; [critcl\_tcl9](files/critcl\_tcl9\.md)|
+
+
+#### <a name='cF'></a>Keywords: F
+
+|||
+|---|---|
+|<a name='flags'></a>flags|[critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::emap](files/critcl\_emap\.md)|
+
+
+#### <a name='cG'></a>Keywords: G
+
+|||
+|---|---|
+|<a name='generate\_package'></a>generate package|[critcl](files/critcl\.md) &#183; [critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::callback](files/critcl\_callback\.md) &#183; [critcl::class](files/critcl\_class\.md) &#183; [critcl::cutil](files/critcl\_cutil\.md) &#183; [critcl::emap](files/critcl\_emap\.md) &#183; [critcl::enum](files/critcl\_enum\.md) &#183; [critcl::iassoc](files/critcl\_iassoc\.md) &#183; [critcl::literals](files/critcl\_literals\.md) &#183; [critcl::util](files/critcl\_util\.md) &#183; [critcl\_application](files/critcl\_application\.md) &#183; [critcl\_application\_package](files/critcl\_application\_package\.md) &#183; [critcl\_build\_tool](files/critcl\_build\.md) &#183; [critcl\_changes](files/critcl\_changes\.md) &#183; [critcl\_cproc\_types](files/critcl\_cproc\.md) &#183; [critcl\_devguide](files/critcl\_devguide\.md) &#183; [critcl\_howto\_install](files/critcl\_howto\_install\.md) &#183; [critcl\_howto\_sources](files/critcl\_howto\_sources\.md) &#183; [critcl\_howto\_use](files/critcl\_howto\_use\.md) &#183; [critcl\_license](files/critcl\_license\.md) &#183; [critcl\_package](files/critcl\_package\.md) &#183; [critcl\_tcl9](files/critcl\_tcl9\.md)|
+
+
+#### <a name='cI'></a>Keywords: I
+
+|||
+|---|---|
+|<a name='int\_to\_string\_mapping'></a>int to string mapping|[critcl::enum](files/critcl\_enum\.md)|
+
+
+#### <a name='cL'></a>Keywords: L
+
+|||
+|---|---|
+|<a name='linker'></a>linker|[critcl](files/critcl\.md) &#183; [critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::callback](files/critcl\_callback\.md) &#183; [critcl::class](files/critcl\_class\.md) &#183; [critcl::cutil](files/critcl\_cutil\.md) &#183; [critcl::emap](files/critcl\_emap\.md) &#183; [critcl::enum](files/critcl\_enum\.md) &#183; [critcl::iassoc](files/critcl\_iassoc\.md) &#183; [critcl::literals](files/critcl\_literals\.md) &#183; [critcl::util](files/critcl\_util\.md) &#183; [critcl\_application](files/critcl\_application\.md) &#183; [critcl\_application\_package](files/critcl\_application\_package\.md) &#183; [critcl\_build\_tool](files/critcl\_build\.md) &#183; [critcl\_changes](files/critcl\_changes\.md) &#183; [critcl\_cproc\_types](files/critcl\_cproc\.md) &#183; [critcl\_devguide](files/critcl\_devguide\.md) &#183; [critcl\_howto\_install](files/critcl\_howto\_install\.md) &#183; [critcl\_howto\_sources](files/critcl\_howto\_sources\.md) &#183; [critcl\_howto\_use](files/critcl\_howto\_use\.md) &#183; [critcl\_license](files/critcl\_license\.md) &#183; [critcl\_package](files/critcl\_package\.md) &#183; [critcl\_tcl9](files/critcl\_tcl9\.md)|
+|<a name='literal\_pool'></a>literal pool|[critcl::enum](files/critcl\_enum\.md) &#183; [critcl::literals](files/critcl\_literals\.md)|
+
+
+#### <a name='cO'></a>Keywords: O
+
+|||
+|---|---|
+|<a name='on\_demand\_compilation'></a>on demand compilation|[critcl](files/critcl\.md) &#183; [critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::callback](files/critcl\_callback\.md) &#183; [critcl::class](files/critcl\_class\.md) &#183; [critcl::cutil](files/critcl\_cutil\.md) &#183; [critcl::emap](files/critcl\_emap\.md) &#183; [critcl::enum](files/critcl\_enum\.md) &#183; [critcl::iassoc](files/critcl\_iassoc\.md) &#183; [critcl::literals](files/critcl\_literals\.md) &#183; [critcl::util](files/critcl\_util\.md) &#183; [critcl\_application](files/critcl\_application\.md) &#183; [critcl\_application\_package](files/critcl\_application\_package\.md) &#183; [critcl\_build\_tool](files/critcl\_build\.md) &#183; [critcl\_changes](files/critcl\_changes\.md) &#183; [critcl\_cproc\_types](files/critcl\_cproc\.md) &#183; [critcl\_devguide](files/critcl\_devguide\.md) &#183; [critcl\_howto\_install](files/critcl\_howto\_install\.md) &#183; [critcl\_howto\_sources](files/critcl\_howto\_sources\.md) &#183; [critcl\_howto\_use](files/critcl\_howto\_use\.md) &#183; [critcl\_license](files/critcl\_license\.md) &#183; [critcl\_package](files/critcl\_package\.md) &#183; [critcl\_tcl9](files/critcl\_tcl9\.md)|
+|<a name='on\_the\_fly\_compilation'></a>on\-the\-fly compilation|[critcl](files/critcl\.md) &#183; [critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::callback](files/critcl\_callback\.md) &#183; [critcl::class](files/critcl\_class\.md) &#183; [critcl::cutil](files/critcl\_cutil\.md) &#183; [critcl::emap](files/critcl\_emap\.md) &#183; [critcl::enum](files/critcl\_enum\.md) &#183; [critcl::iassoc](files/critcl\_iassoc\.md) &#183; [critcl::literals](files/critcl\_literals\.md) &#183; [critcl::util](files/critcl\_util\.md) &#183; [critcl\_application](files/critcl\_application\.md) &#183; [critcl\_application\_package](files/critcl\_application\_package\.md) &#183; [critcl\_build\_tool](files/critcl\_build\.md) &#183; [critcl\_changes](files/critcl\_changes\.md) &#183; [critcl\_cproc\_types](files/critcl\_cproc\.md) &#183; [critcl\_devguide](files/critcl\_devguide\.md) &#183; [critcl\_howto\_install](files/critcl\_howto\_install\.md) &#183; [critcl\_howto\_sources](files/critcl\_howto\_sources\.md) &#183; [critcl\_howto\_use](files/critcl\_howto\_use\.md) &#183; [critcl\_license](files/critcl\_license\.md) &#183; [critcl\_package](files/critcl\_package\.md) &#183; [critcl\_tcl9](files/critcl\_tcl9\.md)|
+
+
+#### <a name='cS'></a>Keywords: S
+
+|||
+|---|---|
+|<a name='singleton'></a>singleton|[critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::emap](files/critcl\_emap\.md) &#183; [critcl::enum](files/critcl\_enum\.md) &#183; [critcl::iassoc](files/critcl\_iassoc\.md) &#183; [critcl::literals](files/critcl\_literals\.md)|
+|<a name='string\_pool'></a>string pool|[critcl::enum](files/critcl\_enum\.md) &#183; [critcl::literals](files/critcl\_literals\.md)|
+|<a name='string\_to\_int\_mapping'></a>string to int mapping|[critcl::enum](files/critcl\_enum\.md)|
+
+
+#### <a name='cT'></a>Keywords: T
+
+|||
+|---|---|
+|<a name='tcl\_interp\_association'></a>Tcl Interp Association|[critcl::bitmap](files/critcl\_bitmap\.md) &#183; [critcl::emap](files/critcl\_emap\.md) &#183; [critcl::enum](files/critcl\_enum\.md) &#183; [critcl::iassoc](files/critcl\_iassoc\.md) &#183; [critcl::literals](files/critcl\_literals\.md)|
diff --git a/src/vfs/critcl.vfs/embedded/md/toc.md b/src/vfs/critcl.vfs/embedded/md/toc.md
new file mode 100644
index 00000000..5be6c5ba
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/md/toc.md
@@ -0,0 +1,48 @@
+
+[//000000001]: # (Table of contents generated by tcllib/doctools/toc with format 'markdown')
+
+# Table Of Contents \-\- doc
+
+  - [critcl](files/critcl\.md) Introduction To CriTcl
+
+  - [critcl::bitmap](files/critcl\_bitmap\.md) CriTcl \- Wrap Support \- Bitset en\- and decoding
+
+  - [critcl::callback](files/critcl\_callback\.md) CriTcl \- C\-level Callback Utilities
+
+  - [critcl::class](files/critcl\_class\.md) CriTcl \- Code Gen \- C Classes
+
+  - [critcl::cutil](files/critcl\_cutil\.md) CriTcl \- C\-level Utilities
+
+  - [critcl::emap](files/critcl\_emap\.md) CriTcl \- Wrap Support \- Enum en\- and decoding
+
+  - [critcl::enum](files/critcl\_enum\.md) CriTcl \- Wrap Support \- String/Integer mapping
+
+  - [critcl::iassoc](files/critcl\_iassoc\.md) CriTcl \- Code Gen \- Tcl Interp Associations
+
+  - [critcl::literals](files/critcl\_literals\.md) CriTcl \- Code Gen \- Constant string pools
+
+  - [critcl::util](files/critcl\_util\.md) CriTcl \- Utilities
+
+  - [critcl\_application](files/critcl\_application\.md) CriTcl Application Reference
+
+  - [critcl\_application\_package](files/critcl\_application\_package\.md) CriTcl Application Package Reference
+
+  - [critcl\_build\_tool](files/critcl\_build\.md) CriTcl build\.tcl Tool Reference
+
+  - [critcl\_changes](files/critcl\_changes\.md) CriTcl Releases & Changes
+
+  - [critcl\_cproc\_types](files/critcl\_cproc\.md) CriTcl cproc Type Reference
+
+  - [critcl\_devguide](files/critcl\_devguide\.md) Guide To The CriTcl Internals
+
+  - [critcl\_howto\_install](files/critcl\_howto\_install\.md) How To Install CriTcl
+
+  - [critcl\_howto\_sources](files/critcl\_howto\_sources\.md) How To Get The CriTcl Sources
+
+  - [critcl\_howto\_use](files/critcl\_howto\_use\.md) How To Use CriTcl
+
+  - [critcl\_license](files/critcl\_license\.md) The CriTcl License
+
+  - [critcl\_package](files/critcl\_package\.md) CriTcl Package Reference
+
+  - [critcl\_tcl9](files/critcl\_tcl9\.md) How To Adapt Critcl Packages for Tcl 9
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl.html b/src/vfs/critcl.vfs/embedded/www/files/critcl.html
new file mode 100644
index 00000000..539d8851
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl.html
@@ -0,0 +1,229 @@
+<!DOCTYPE html><html><head>
+<title>critcl - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; Jean-Claude Wippler   -- Copyright &amp;copy; Steve Landers   -- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl(n) 3.2.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl - Introduction To CriTcl</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">History &amp; Motivation</a></li>
+<li class="doctools_section"><a href="#section3">Overview</a></li>
+<li class="doctools_section"><a href="#section4">Known Users</a></li>
+<li class="doctools_section"><a href="#section5">Tutorials - Practical Study - To Learn</a></li>
+<li class="doctools_section"><a href="#section6">Explanations - Theoretical Knowledge - To Understand</a></li>
+<li class="doctools_section"><a href="#section7">How-To Guides - Practical Work - To Solve Problems</a></li>
+<li class="doctools_section"><a href="#section8">References - Theoretical Work - To Gain Knowlegde</a></li>
+<li class="doctools_section"><a href="#section9">Authors</a></li>
+<li class="doctools_section"><a href="#section10">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term">CriTcl</i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>Adding C code to <a href="http://core.tcl-lang.org/tcl">Tcl</a>/<a href="http://core.tcl-lang.org/tk">Tk</a> has never been easier.</p>
+<p>Improve performance by rewriting the performance bottlenecks in C.</p>
+<p>Import the functionality of shared libraries into Tcl scripts.</p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">History &amp; Motivation</a></h2>
+<p><i class="term">CriTcl</i> started life as an experiment by <i class="term">Jean-Claude Wippler</i> and was a self-contained
+Tcl package to build C code into a Tcl/Tk extension on the fly. It was somewhat inspired
+by Brian Ingerson's <i class="term">Inline</i> for <i class="term">Perl</i>, but is considerably more lightweight.</p>
+<p>It is for the last 5% to 10% when pure Tcl, which does go a long way, is not
+sufficient anymore. I.e. for</p>
+<ol class="doctools_enumerated">
+<li><p>when the last bits of performance are needed,</p></li>
+<li><p>access to 3rd party libraries,</p></li>
+<li><p>hiding critical pieces of your library or application, and</p></li>
+<li><p>simply needing features provided only by C.</p></li>
+</ol>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Overview</a></h2>
+<p>To make the reader's topics of interest easy to find this documentation is roughly
+organized by <a href="https://documentation.divio.com/">Quadrants</a>, i.e.</p>
+<pre class="doctools_example">
+            | Study           | Work
+----------- + --------------- + -----------------
+Practical   | <span class="sectref"><a href="#section5">Tutorials</a></span>       | <span class="sectref"><a href="#section7">How-To Guides</a></span>
+            | (Learning)      | (Problem solving)
+----------- + --------------- + -----------------
+Theoretical | <span class="sectref"><a href="#section6">Explanations</a></span>    | <span class="sectref"><a href="#section8">References</a></span>
+            | (Understanding) | (Knowledge)
+</pre>
+<p><em>Note</em>: At this point in time the documentation consists mainly of references, and
+a few how-to guides. Tutorials and Explanations are in need of expansion, this is planned.</p>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Known Users</a></h2>
+<ul class="doctools_itemized">
+<li><p><a href="https://core.tcl-lang.org/akupries/ankh">AnKH</a></p></li>
+<li><p><a href="https://core.tcl.tk/akupries/tclyaml">TclYAML</a></p></li>
+<li><p><a href="https://github.com/andreas-kupries/tcl-linenoise">Linenoise</a></p></li>
+<li><p><a href="https://core.tcl.tk/akupries/kinetcl">KineTcl</a></p></li>
+<li><p><a href="https://chiselapp.com/user/andreas_kupries/repository/inotify">Inotify</a></p></li>
+<li><p><a href="https://core.tcl.tk/akupries/marpa">TclMarpa</a></p></li>
+<li><p><a href="https://core.tcl.tk/akupries/crimp">CRIMP</a></p></li>
+</ul>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Tutorials - Practical Study - To Learn</a></h2>
+<p>This section is currently empty.</p>
+</div>
+<div id="section6" class="doctools_section"><h2><a name="section6">Explanations - Theoretical Knowledge - To Understand</a></h2>
+<p>This section is currently empty.</p>
+</div>
+<div id="section7" class="doctools_section"><h2><a name="section7">How-To Guides - Practical Work - To Solve Problems</a></h2>
+<ol class="doctools_enumerated">
+<li><p><i class="term"><a href="critcl_howto_sources.html">How To Get The CriTcl Sources</a></i>.</p></li>
+<li><p><i class="term"><a href="critcl_howto_install.html">How To Install CriTcl</a></i>.</p></li>
+<li><p><i class="term"><a href="critcl_howto_use.html">How To Use CriTcl</a></i> - A light introduction through examples.</p></li>
+<li><p><em>NEW</em>: <i class="term"><a href="critcl_tcl9.html">How To Adapt Critcl Packages for Tcl 9</a></i>.</p></li>
+</ol>
+</div>
+<div id="section8" class="doctools_section"><h2><a name="section8">References - Theoretical Work - To Gain Knowlegde</a></h2>
+<ol class="doctools_enumerated">
+<li><p><i class="term"><a href="critcl_license.html">The CriTcl License</a></i></p></li>
+<li><p><i class="term"><a href="critcl_changes.html">CriTcl Releases &amp; Changes</a></i></p></li>
+<li><p><i class="term"><a href="critcl_application.html">CriTcl Application Reference</a></i></p></li>
+<li><p><i class="term"><a href="critcl_package.html">CriTcl Package Reference</a></i></p></li>
+<li><p><i class="term"><a href="critcl_cproc.html">CriTcl cproc Type Reference</a></i></p></li>
+<li><p><i class="term"><a href="critcl_util.html">CriTcl - Utilities</a></i></p></li>
+<li><p><i class="term"><a href="critcl_cutil.html">CriTcl - C-level Utilities</a></i></p></li>
+<li><p><i class="term"><a href="critcl_callback.html">CriTcl - C-level Callback Utilities</a></i></p></li>
+<li><p><i class="term"><a href="critcl_enum.html">CriTcl - Wrap Support - String/Integer mapping</a></i></p></li>
+<li><p><i class="term"><a href="critcl_bitmap.html">CriTcl - Wrap Support - Bitset en- and decoding</a></i></p></li>
+<li><p><i class="term"><a href="critcl_emap.html">CriTcl - Wrap Support - Enum en- and decoding</a></i></p></li>
+<li><p><i class="term"><a href="critcl_literals.html">CriTcl - Code Gen - Constant string pools</a></i></p></li>
+<li><p><i class="term"><a href="critcl_iassoc.html">CriTcl - Code Gen - Tcl Interp Associations</a></i></p></li>
+<li><p><i class="term"><a href="critcl_class.html">CriTcl - Code Gen - C Classes</a></i></p></li>
+<li><p><i class="term"><a href="critcl_application_package.html">CriTcl Application Package Reference</a></i></p></li>
+<li><p><i class="term"><a href="critcl_devguide.html">Guide To The CriTcl Internals</a></i></p></li>
+</ol>
+</div>
+<div id="section9" class="doctools_section"><h2><a name="section9">Authors</a></h2>
+<p>Jean Claude Wippler, Steve Landers, Andreas Kupries</p>
+</div>
+<div id="section10" class="doctools_section"><h2><a name="section10">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report them at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a>.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a> as well.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#calling_c_code_from_tcl">calling C code from Tcl</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; Jean-Claude Wippler<br>
+Copyright &copy; Steve Landers<br>
+Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_application.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_application.html
new file mode 100644
index 00000000..aaa28e1a
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_application.html
@@ -0,0 +1,434 @@
+<!DOCTYPE html><html><head>
+<title>critcl_application - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_application.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; Jean-Claude Wippler   -- Copyright &amp;copy; Steve Landers   -- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl_application.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl_application(n) 3.2.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl_application - CriTcl Application Reference</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#synopsis">Synopsis</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">Application Options</a></li>
+<li class="doctools_section"><a href="#section3">Package Structure</a></li>
+<li class="doctools_section"><a href="#section4">Authors</a></li>
+<li class="doctools_section"><a href="#section5">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="synopsis" class="doctools_section"><h2><a name="synopsis">Synopsis</a></h2>
+<div class="doctools_synopsis">
+<ul class="doctools_syntax">
+<li><a href="#1"><b class="cmd"><a href="critcl.html">critcl</a></b> <span class="opt">?<i class="arg">option</i>...?</span> <span class="opt">?<i class="arg">file</i>...?</span></a></li>
+</ul>
+</div>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This document is the reference manpage for the <b class="cmd"><a href="critcl.html">critcl</a></b> command.
+Its intended audience are people having to build packages using
+<b class="package"><a href="critcl.html">critcl</a></b> for deployment. Writers of packages with embedded C
+code can ignore this document.
+	If you are in need of an overview of the whole system instead, please
+	go and read the <i class="term"><a href="critcl.html">Introduction To CriTcl</a></i>.</p>
+<p>This application resides in the Application Layer of CriTcl.</p>
+<p><img alt="arch_application" src="../image/arch_application.png"></p>
+<p>.
+The application supports the following general command line:</p>
+<dl class="doctools_definitions">
+<dt><a name="1"><b class="cmd"><a href="critcl.html">critcl</a></b> <span class="opt">?<i class="arg">option</i>...?</span> <span class="opt">?<i class="arg">file</i>...?</span></a></dt>
+<dd><p>The exact set of options supported, their meaning, and interaction is
+detailed in section <span class="sectref"><a href="#section2">Application Options</a></span> below.
+For a larger set of examples please see section &quot;Building CriTcl Packages&quot;
+in the document about <i class="term">Using CriTcl</i>.</p></dd>
+</dl>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">Application Options</a></h2>
+<p>The following options are understood:</p>
+<dl class="doctools_options">
+<dt><b class="option">-v</b></dt>
+<dd></dd>
+<dt><b class="option">--version</b></dt>
+<dd><p>Print the version to <b class="const">stdout</b> and exit.</p></dd>
+<dt><b class="option">-I</b> path</dt>
+<dd><p>Arranges for the compiler to search <i class="arg">path</i> for headers.
+Uses of this option are cumulative.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-L</b> path</dt>
+<dd><p>Arranges for the linker to search <i class="arg">path</i>.
+Uses of this option are cumulative.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-cache</b> path</dt>
+<dd><p>Sets <i class="arg">path</i> as the directory to use as the result cache. The default is
+&quot;<b class="file">~/.critcl/&lt;platform&gt;</b>&quot;, or &quot;<b class="file">~/.critcl/&lt;pid&gt;.&lt;epoch&gt;</b>&quot; when generating
+a package.  See option <b class="option">-pkg</b>, below.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-clean</b></dt>
+<dd><p>Arranges for all files and directories in the result cache to be deleted before
+compilation begins.</p>
+<p>Ignored when generating a package because this mode starts out with a
+unique and empty result cache.  See option <b class="option">-pkg</b>, below.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-config</b> path</dt>
+<dd><p>Provides a custom configuration file.  By default a configuration included in
+the system core is used.
+When specified multiple times the last value is used.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-debug</b> mode</dt>
+<dd><p>Activates one of the following debugging modes:</p>
+<dl class="doctools_definitions">
+<dt><b class="const">memory</b></dt>
+<dd><p>Track and report memory allocations made by the Tcl core.</p></dd>
+<dt><b class="const">symbols</b></dt>
+<dd><p>Compile all &quot;<b class="file">.c</b>&quot; files with debugging symbols.</p></dd>
+<dt><b class="const">all</b></dt>
+<dd><p>Both <b class="const">memory</b> and <b class="const">symbols</b>.</p></dd>
+</dl>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).
+Uses of this option are cumulative.</p></dd>
+<dt><b class="option">-disable</b> name</dt>
+<dd><p>Sets the value of the custom build configuration option
+<i class="arg">name</i> to <b class="const">false</b>. It is equivalent to &quot;-with-<i class="arg">name</i> 0&quot;.</p>
+<p>Validated only if one of the input files for the <i class="term">CriTcl script</i>
+actually defines and uses a custom build configuration option with that
+<i class="arg">name</i>.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-enable</b> name</dt>
+<dd><p>Sets the value of the custom build configuration option
+<i class="arg">name</i> to <b class="const">true</b>. It is equivalent to &quot;-with-<i class="arg">name</i> 1&quot;.</p>
+<p>Validated only if one of the input files for the <i class="term">CriTcl script</i>
+actually defines and uses a custom build configuration option with that
+<i class="arg">name</i>.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-force</b></dt>
+<dd><p>Forces compilation even if a shared library for the file already exists.
+Unlike cleaning the cache, this is lazy in the destruction of files and only
+affects relevant files.</p>
+<p>Ignored when generating a package (see option <b class="option">-pkg</b>, below),
+which starts out with a unique and empty result cache.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-help</b></dt>
+<dd><p>Prints a short description of command line syntax and options and then exits
+the application.</p></dd>
+<dt><b class="option">-keep</b></dt>
+<dd><p>Causes the system to cache compiled &quot;<b class="file">.c</b>&quot; files.
+Also prevents the deletion of the unique result cache used by the run when
+generating a package (see option <b class="option">-pkg</b> below),
+Intended for debugging of <b class="cmd"><a href="critcl.html">critcl</a></b> itself, where it may be necessary to
+inspect the generated C code.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-libdir</b> directory</dt>
+<dd><p>Adds <i class="arg">directory</i> to the list of directories the linker searches for
+libraries in (like <b class="option">-L</b>).  With <b class="option">-pkg</b>, generated packages are
+saved in <i class="arg">directory</i>.
+When specified multiple times the last value is used.
+The default is &quot;<b class="file">lib</b>&quot;, resolved relative to the current working directory.</p></dd>
+<dt><b class="option">-includedir</b> directory</dt>
+<dd><p>Adds <i class="arg">directory</i> to the list of directories the compiler searches for
+headers in. With <b class="option">-pkg</b>, generated header files are saved in
+<i class="arg">directory</i>.
+Uses of this option are cumulative.
+The last value is used as the destination for generated header files.
+The default is the relative directory &quot;<b class="file">include</b>&quot;, resolved relative to the
+current working directory.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-pkg</b></dt>
+<dd><p>Generates a package from the <i class="term">CriTcl script</i> files.  Input files are
+processed first as usual, but are then bundled into a single library, with
+additional generated files to form the library into a standard Tcl package.</p>
+<p>generation. If both options, i.e. <b class="option">-pkg</b> and <b class="option">-tea</b> are
+specified the last one specified wins.</p>
+<p>Options <b class="option">-clean</b> and <b class="option">-force</b> are ignored. <b class="option">-libdir</b> is
+relevant in both this and <b class="option">-tea</b> mode.</p>
+<p>The basename of the first file is the name of the package to generate. If
+its file extension indicates a shared library (&quot;<b class="file">.so</b>&quot;, &quot;<b class="file">.sl</b>&quot;,
+&quot;<b class="file">.dylib</b>&quot;, and &quot;<b class="file">.dll</b>&quot;) it is also removed from the set of input
+files. Each <i class="term">CriTcl script</i> file is kept as part of the input. A single
+file without a suffix is assumed to be a <i class="term">CriTcl script</i>. A file without
+a suffix, but other input files following is treated like the name of a
+shared library proper, and removed from the set of input files.</p>
+<p>Examples:</p>
+<pre class="doctools_example">
+	... -pkg ... foo
+	=&gt; Package name is: foo
+	=&gt; Input file is:   foo.tcl
+</pre>
+<pre class="doctools_example">
+	... -pkg ... foo bar.tcl
+	=&gt; Package name is: foo
+	=&gt; Input file is:   bar.tcl
+</pre>
+<pre class="doctools_example">
+	... -pkg ... foo.tcl
+	=&gt; Package name is: foo
+	=&gt; Input file is:   foo.tcl
+</pre>
+<pre class="doctools_example">
+	... -pkg ... foo.so bar.tcl
+	=&gt; Package name is: foo
+	=&gt; Input file is:   bar.tcl
+</pre>
+</dd>
+<dt><b class="option">-show</b></dt>
+<dd><p>Prints the configuration of the chosen target to <b class="const">stdout</b> and then exits.
+Set <b class="option">-target</b>, below.</p></dd>
+<dt><b class="option">-showall</b></dt>
+<dd><p>Prints the whole chosen configuration file to <b class="const">stdout</b> and then exits.
+See <b class="option">-config</b>, above.</p></dd>
+<dt><b class="option">-target</b> name</dt>
+<dd><p>Overrides the default choice of build target.
+Only the last occurrence of this option is used.
+The named target must exist in the chosen configuration file.
+Use <b class="option">-targets</b> (see below) to get a list of the
+acceptable targets.
+Use <b class="option">-config</b> to select the configuration file.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-targets</b></dt>
+<dd><p>Prints the list of all known targets from the chosen configuration file to
+<b class="const">stdout</b> and then exits.
+Use <b class="option">-config</b> to select the configuration file.</p></dd>
+<dt><b class="option">-tea</b></dt>
+<dd><p>Like <b class="option">-pkg</b>, except no binaries are generated. Creates a directory
+hierarchy containing the <i class="term">CriTcl script</i>, its companion files, and a
+TEA-conformant build system with most of the needed support code, including
+copies of the critcl packages.</p>
+<p>If both <b class="option">-pkg</b> and <b class="option">-tea</b> are specified the last occurrence wins.</p>
+<p><b class="option">-I</b>, <b class="option">-L</b>, <b class="option">-clean</b>,
+<b class="option">-force</b>, <b class="option">-cache</b>, <b class="option">-includedir</b>, <b class="option">-enable</b>,
+<b class="option">-disable</b>, and <b class="option">-with-<b class="variable">FOO</b></b> are
+ignored. In contrast, the option <b class="option">-libdir</b> is relevant in both
+this and <b class="option">-pkg</b> mode.</p>
+<p>The basename of the first file is the name of the package to generate. If
+its file extension indicates a shared library (&quot;<b class="file">.so</b>&quot;, &quot;<b class="file">.sl</b>&quot;,
+&quot;<b class="file">.dylib</b>&quot;, and &quot;<b class="file">.dll</b>&quot;) it is also removed from the set of input
+files. Each <i class="term">CriTcl script</i> file is kept as part of the input. A single
+file without a suffix is assumed to be a <i class="term">CriTcl script</i>. A file without
+a suffix, but other input files following is treated like the name of a
+shared library proper, and removed from the set of input files.</p>
+<p>Examples:</p>
+<pre class="doctools_example">
+	... -tea ... foo
+	=&gt; Package name is: foo
+	=&gt; Input file is:   foo.tcl
+</pre>
+<pre class="doctools_example">
+	... -tea ... foo bar.tcl
+	=&gt; Package name is: foo
+	=&gt; Input file is:   bar.tcl
+</pre>
+<pre class="doctools_example">
+	... -tea ... foo.tcl
+	=&gt; Package name is: foo
+	=&gt; Input file is:   foo.tcl
+</pre>
+<pre class="doctools_example">
+	... -tea ... foo.so bar.tcl
+	=&gt; Package name is: foo
+	=&gt; Input file is:   bar.tcl
+</pre>
+</dd>
+<dt><b class="option">-with-<b class="variable">name</b></b> value</dt>
+<dd><p>This option sets the value of the custom build configuration option
+<i class="arg">name</i> to <i class="arg">value</i>.</p>
+<p>The information is validated only if one of the &quot;<b class="file">.critcl</b>&quot;
+input files actually defines and uses a custom build configuration
+option with that <i class="arg">name</i>.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+</dl>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Package Structure</a></h2>
+<p>Packages generated by critcl have the following basic structure:</p>
+<pre class="doctools_example">
+&lt;TOP&gt;
++- pkgIndex.tcl
++- critcl-rt.tcl
++- license.terms (optional)
+|
++- tcl (optional)
+|  +- &lt;tsources files&gt;
+|
++- &lt;platform&gt;
+   +- &lt;shared library&gt;
+</pre>
+<p><em>Notes</em></p>
+<ol class="doctools_enumerated">
+<li><p>The file &quot;<b class="file">pkgIndex.tcl</b>&quot; is the standard package index file
+expected by Tcl's package management. It is sourced during a search
+for packages, and declares the package to Tcl with its files, and how
+to handle them.</p></li>
+<li><p>The file &quot;<b class="file">critcl-rt.tcl</b>&quot; is a helper file containing the
+common code used by &quot;<b class="file">pkgIndex.tcl</b>&quot; to perform its tasks.</p></li>
+<li><p>The file &quot;<b class="file">license.terms</b>&quot; is optional and appears only if
+the &quot;<b class="file">.critcl</b>&quot; file the package is generated from used the command
+<b class="cmd">critcl::license</b> to declare package author and license.</p></li>
+<li><p>All files declared with the command <b class="cmd">critcl::tsources</b> are
+put into the sub-directory &quot;<b class="file">tcl</b>&quot;.</p></li>
+<li><p>The shared library generated by critcl is put into a
+platform-specific sub-directory.</p></li>
+</ol>
+<p>The whole structure, and especially the last point, enable us
+to later merge the results (for the same package, and version) for
+multiple target platforms into a single directory structure without
+conflict, by simply copying the top directories over each other. The
+only files which can conflict are in the &lt;TOP&gt; and &quot;<b class="file">tcl</b>&quot;
+directories, and for these we know that they are identical across
+targets. The result of such a merge would look like:</p>
+<pre class="doctools_example">
+&lt;TOP&gt;
++- pkgIndex.tcl
++- critcl-rt.tcl
++- license.terms (optional)
+|
++- tcl (optional)
+|  +- &lt;tsources files&gt;
+|
++- &lt;platform1&gt;
+|  +- &lt;shared library1&gt;
++- &lt;platform2&gt;
+|  +- &lt;shared library2&gt;
+...
++- &lt;platformN&gt;
+   +- &lt;shared libraryN&gt;
+</pre>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Authors</a></h2>
+<p>Jean Claude Wippler, Steve Landers, Andreas Kupries</p>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report them at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a>.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a> as well.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#calling_c_code_from_tcl">calling C code from Tcl</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; Jean-Claude Wippler<br>
+Copyright &copy; Steve Landers<br>
+Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_application_package.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_application_package.html
new file mode 100644
index 00000000..550ad3ab
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_application_package.html
@@ -0,0 +1,481 @@
+<!DOCTYPE html><html><head>
+<title>critcl_application_package - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_application_package.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; Jean-Claude Wippler   -- Copyright &amp;copy; Steve Landers   -- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl_application_package.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl_application_package(n) 3.2.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl_application_package - CriTcl Application Package Reference</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#synopsis">Synopsis</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">API</a></li>
+<li class="doctools_section"><a href="#section3">Options</a></li>
+<li class="doctools_section"><a href="#section4">Modes Of Operation/Use</a></li>
+<li class="doctools_section"><a href="#section5">Package Structure</a></li>
+<li class="doctools_section"><a href="#section6">Authors</a></li>
+<li class="doctools_section"><a href="#section7">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="synopsis" class="doctools_section"><h2><a name="synopsis">Synopsis</a></h2>
+<div class="doctools_synopsis">
+<ul class="doctools_requirements">
+<li>package require <b class="pkgname">Tcl 8.6</b></li>
+<li>package require <b class="pkgname">critcl::app <span class="opt">?3.2.1?</span></b></li>
+<li>package require <b class="pkgname">critcl <span class="opt">?3.2.1?</span></b></li>
+<li>package require <b class="pkgname">platform <span class="opt">?1.0.2?</span></b></li>
+<li>package require <b class="pkgname">cmdline</b></li>
+</ul>
+<ul class="doctools_syntax">
+<li><a href="#1"><b class="cmd">::critcl::app::main</b> <i class="arg">commandline</i></a></li>
+</ul>
+</div>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This document is the reference manpage for the <b class="package">critcl::app</b>
+package. Its intended audience are developers working on critcl's
+internals.  
+These commands are not needed to simply write a <i class="term">CriTcl script</i>.
+	If you are in need of an overview of the whole system instead, please
+	go and read the <i class="term"><a href="critcl.html">Introduction To CriTcl</a></i>.</p>
+<p>This package resides in the Application Layer of CriTcl.</p>
+<p><img alt="arch_application" src="../image/arch_application.png"></p>
+<p>,
+implementing the functionality of the <i class="term">CriTcl Application</i>,
+and through this, the mode <span class="sectref"><a href="#section4">generate package</a></span>.
+The actual application is (only) a shim wrapping around this
+package. It itself is build on top of the core package
+<b class="package"><a href="critcl.html">critcl</a></b>.</p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">API</a></h2>
+<p>The package exports a single command</p>
+<dl class="doctools_definitions">
+<dt><a name="1"><b class="cmd">::critcl::app::main</b> <i class="arg">commandline</i></a></dt>
+<dd><p>The <i class="arg">commandline</i> is a list of zero or more options followed by zero or
+more <i class="term">CriTcl script</i> files.  By default, the <i class="term">CriTcl script</i> files
+are build and the results cached.   This cuts down on the time needed to
+load the package.  The last occurrence of <b class="option">-pkg</b> and <b class="option">-tea</b>, if
+provided, selects the corresponding alternative mode of operations.
+For a larger set of examples please see section &quot;Building CriTcl Packages&quot;
+in the document about <i class="term">Using CriTcl</i>.</p></dd>
+</dl>
+<p>The options are:</p>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Options</a></h2>
+<p>The following options are understood:</p>
+<dl class="doctools_options">
+<dt><b class="option">-v</b></dt>
+<dd></dd>
+<dt><b class="option">--version</b></dt>
+<dd><p>Print the version to <b class="const">stdout</b> and exit.</p></dd>
+<dt><b class="option">-I</b> path</dt>
+<dd><p>Arranges for the compiler to search <i class="arg">path</i> for headers.
+Uses of this option are cumulative.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-L</b> path</dt>
+<dd><p>Arranges for the linker to search <i class="arg">path</i>.
+Uses of this option are cumulative.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-cache</b> path</dt>
+<dd><p>Sets <i class="arg">path</i> as the directory to use as the result cache. The default is
+&quot;<b class="file">~/.critcl/&lt;platform&gt;</b>&quot;, or &quot;<b class="file">~/.critcl/&lt;pid&gt;.&lt;epoch&gt;</b>&quot; when generating
+a package.  See option <b class="option">-pkg</b>, below.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-clean</b></dt>
+<dd><p>Arranges for all files and directories in the result cache to be deleted before
+compilation begins.</p>
+<p>Ignored when generating a package because this mode starts out with a
+unique and empty result cache.  See option <b class="option">-pkg</b>, below.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-config</b> path</dt>
+<dd><p>Provides a custom configuration file.  By default a configuration included in
+the system core is used.
+When specified multiple times the last value is used.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-debug</b> mode</dt>
+<dd><p>Activates one of the following debugging modes:</p>
+<dl class="doctools_definitions">
+<dt><b class="const">memory</b></dt>
+<dd><p>Track and report memory allocations made by the Tcl core.</p></dd>
+<dt><b class="const">symbols</b></dt>
+<dd><p>Compile all &quot;<b class="file">.c</b>&quot; files with debugging symbols.</p></dd>
+<dt><b class="const">all</b></dt>
+<dd><p>Both <b class="const">memory</b> and <b class="const">symbols</b>.</p></dd>
+</dl>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).
+Uses of this option are cumulative.</p></dd>
+<dt><b class="option">-disable</b> name</dt>
+<dd><p>Sets the value of the custom build configuration option
+<i class="arg">name</i> to <b class="const">false</b>. It is equivalent to &quot;-with-<i class="arg">name</i> 0&quot;.</p>
+<p>Validated only if one of the input files for the <i class="term">CriTcl script</i>
+actually defines and uses a custom build configuration option with that
+<i class="arg">name</i>.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-enable</b> name</dt>
+<dd><p>Sets the value of the custom build configuration option
+<i class="arg">name</i> to <b class="const">true</b>. It is equivalent to &quot;-with-<i class="arg">name</i> 1&quot;.</p>
+<p>Validated only if one of the input files for the <i class="term">CriTcl script</i>
+actually defines and uses a custom build configuration option with that
+<i class="arg">name</i>.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-force</b></dt>
+<dd><p>Forces compilation even if a shared library for the file already exists.
+Unlike cleaning the cache, this is lazy in the destruction of files and only
+affects relevant files.</p>
+<p>Ignored when generating a package (see option <b class="option">-pkg</b>, below),
+which starts out with a unique and empty result cache.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-help</b></dt>
+<dd><p>Prints a short description of command line syntax and options and then exits
+the application.</p></dd>
+<dt><b class="option">-keep</b></dt>
+<dd><p>Causes the system to cache compiled &quot;<b class="file">.c</b>&quot; files.
+Also prevents the deletion of the unique result cache used by the run when
+generating a package (see option <b class="option">-pkg</b> below),
+Intended for debugging of <b class="cmd"><a href="critcl.html">critcl</a></b> itself, where it may be necessary to
+inspect the generated C code.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-libdir</b> directory</dt>
+<dd><p>Adds <i class="arg">directory</i> to the list of directories the linker searches for
+libraries in (like <b class="option">-L</b>).  With <b class="option">-pkg</b>, generated packages are
+saved in <i class="arg">directory</i>.
+When specified multiple times the last value is used.
+The default is &quot;<b class="file">lib</b>&quot;, resolved relative to the current working directory.</p></dd>
+<dt><b class="option">-includedir</b> directory</dt>
+<dd><p>Adds <i class="arg">directory</i> to the list of directories the compiler searches for
+headers in. With <b class="option">-pkg</b>, generated header files are saved in
+<i class="arg">directory</i>.
+Uses of this option are cumulative.
+The last value is used as the destination for generated header files.
+The default is the relative directory &quot;<b class="file">include</b>&quot;, resolved relative to the
+current working directory.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-pkg</b></dt>
+<dd><p>Generates a package from the <i class="term">CriTcl script</i> files.  Input files are
+processed first as usual, but are then bundled into a single library, with
+additional generated files to form the library into a standard Tcl package.</p>
+<p>generation. If both options, i.e. <b class="option">-pkg</b> and <b class="option">-tea</b> are
+specified the last one specified wins.</p>
+<p>Options <b class="option">-clean</b> and <b class="option">-force</b> are ignored. <b class="option">-libdir</b> is
+relevant in both this and <b class="option">-tea</b> mode.</p>
+<p>The basename of the first file is the name of the package to generate. If
+its file extension indicates a shared library (&quot;<b class="file">.so</b>&quot;, &quot;<b class="file">.sl</b>&quot;,
+&quot;<b class="file">.dylib</b>&quot;, and &quot;<b class="file">.dll</b>&quot;) it is also removed from the set of input
+files. Each <i class="term">CriTcl script</i> file is kept as part of the input. A single
+file without a suffix is assumed to be a <i class="term">CriTcl script</i>. A file without
+a suffix, but other input files following is treated like the name of a
+shared library proper, and removed from the set of input files.</p>
+<p>Examples:</p>
+<pre class="doctools_example">
+	... -pkg ... foo
+	=&gt; Package name is: foo
+	=&gt; Input file is:   foo.tcl
+</pre>
+<pre class="doctools_example">
+	... -pkg ... foo bar.tcl
+	=&gt; Package name is: foo
+	=&gt; Input file is:   bar.tcl
+</pre>
+<pre class="doctools_example">
+	... -pkg ... foo.tcl
+	=&gt; Package name is: foo
+	=&gt; Input file is:   foo.tcl
+</pre>
+<pre class="doctools_example">
+	... -pkg ... foo.so bar.tcl
+	=&gt; Package name is: foo
+	=&gt; Input file is:   bar.tcl
+</pre>
+</dd>
+<dt><b class="option">-show</b></dt>
+<dd><p>Prints the configuration of the chosen target to <b class="const">stdout</b> and then exits.
+Set <b class="option">-target</b>, below.</p></dd>
+<dt><b class="option">-showall</b></dt>
+<dd><p>Prints the whole chosen configuration file to <b class="const">stdout</b> and then exits.
+See <b class="option">-config</b>, above.</p></dd>
+<dt><b class="option">-target</b> name</dt>
+<dd><p>Overrides the default choice of build target.
+Only the last occurrence of this option is used.
+The named target must exist in the chosen configuration file.
+Use <b class="option">-targets</b> (see below) to get a list of the
+acceptable targets.
+Use <b class="option">-config</b> to select the configuration file.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+<dt><b class="option">-targets</b></dt>
+<dd><p>Prints the list of all known targets from the chosen configuration file to
+<b class="const">stdout</b> and then exits.
+Use <b class="option">-config</b> to select the configuration file.</p></dd>
+<dt><b class="option">-tea</b></dt>
+<dd><p>Like <b class="option">-pkg</b>, except no binaries are generated. Creates a directory
+hierarchy containing the <i class="term">CriTcl script</i>, its companion files, and a
+TEA-conformant build system with most of the needed support code, including
+copies of the critcl packages.</p>
+<p>If both <b class="option">-pkg</b> and <b class="option">-tea</b> are specified the last occurrence wins.</p>
+<p><b class="option">-I</b>, <b class="option">-L</b>, <b class="option">-clean</b>,
+<b class="option">-force</b>, <b class="option">-cache</b>, <b class="option">-includedir</b>, <b class="option">-enable</b>,
+<b class="option">-disable</b>, and <b class="option">-with-<b class="variable">FOO</b></b> are
+ignored. In contrast, the option <b class="option">-libdir</b> is relevant in both
+this and <b class="option">-pkg</b> mode.</p>
+<p>The basename of the first file is the name of the package to generate. If
+its file extension indicates a shared library (&quot;<b class="file">.so</b>&quot;, &quot;<b class="file">.sl</b>&quot;,
+&quot;<b class="file">.dylib</b>&quot;, and &quot;<b class="file">.dll</b>&quot;) it is also removed from the set of input
+files. Each <i class="term">CriTcl script</i> file is kept as part of the input. A single
+file without a suffix is assumed to be a <i class="term">CriTcl script</i>. A file without
+a suffix, but other input files following is treated like the name of a
+shared library proper, and removed from the set of input files.</p>
+<p>Examples:</p>
+<pre class="doctools_example">
+	... -tea ... foo
+	=&gt; Package name is: foo
+	=&gt; Input file is:   foo.tcl
+</pre>
+<pre class="doctools_example">
+	... -tea ... foo bar.tcl
+	=&gt; Package name is: foo
+	=&gt; Input file is:   bar.tcl
+</pre>
+<pre class="doctools_example">
+	... -tea ... foo.tcl
+	=&gt; Package name is: foo
+	=&gt; Input file is:   foo.tcl
+</pre>
+<pre class="doctools_example">
+	... -tea ... foo.so bar.tcl
+	=&gt; Package name is: foo
+	=&gt; Input file is:   bar.tcl
+</pre>
+</dd>
+<dt><b class="option">-with-<b class="variable">name</b></b> value</dt>
+<dd><p>This option sets the value of the custom build configuration option
+<i class="arg">name</i> to <i class="arg">value</i>.</p>
+<p>The information is validated only if one of the &quot;<b class="file">.critcl</b>&quot;
+input files actually defines and uses a custom build configuration
+option with that <i class="arg">name</i>.</p>
+<p>Ignored when generating a TEA package
+(see option <b class="option">-tea</b> below).</p></dd>
+</dl>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Modes Of Operation/Use</a></h2>
+<p>CriTcl can be used in three different modes of operation, called</p>
+<ol class="doctools_enumerated">
+<li><p><i class="term"><a href="../index.html#compile_run">Compile &amp; Run</a></i>, and</p></li>
+<li><p><i class="term"><a href="../index.html#generate_package">Generate Package</a></i></p></li>
+<li><p><i class="term">Generate TEA Package</i></p></li>
+</ol>
+<p><i class="term"><a href="../index.html#compile_run">Compile &amp; Run</a></i> was the original mode and is the default for
+<i class="term">critcl_pkg</i>.  Collects the C fragments from the
+<i class="term">CriTcl script</i>, builds them as needed, and caches the results to
+improve load times later.</p>
+<p>The second mode, <i class="term"><a href="../index.html#generate_package">Generate Package</a></i>, was introduced to enable
+the creation of (prebuilt) deliverable packages which do not depend on
+the existence of a build system, i.e. C compiler, on the target
+machine.
+This was originally done through the experimental <b class="cmd">Critbind</b> tool,
+and is now handled by the <i class="term">CriTcl Application</i>, also named
+<b class="cmd"><a href="critcl.html">critcl</a></b>.</p>
+<p>Newly introduced with CriTcl version 3 is
+<i class="term">Generate TEA Package</i>. This mode constructs a directory
+hierarchy from the package which can later be built like a regular TEA
+package, i.e. using</p>
+<pre class="doctools_example">
+	.../configure --prefix ...
+	make all isntall
+</pre>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Package Structure</a></h2>
+<p>Packages generated by critcl have the following basic structure:</p>
+<pre class="doctools_example">
+&lt;TOP&gt;
++- pkgIndex.tcl
++- critcl-rt.tcl
++- license.terms (optional)
+|
++- tcl (optional)
+|  +- &lt;tsources files&gt;
+|
++- &lt;platform&gt;
+   +- &lt;shared library&gt;
+</pre>
+<p><em>Notes</em></p>
+<ol class="doctools_enumerated">
+<li><p>The file &quot;<b class="file">pkgIndex.tcl</b>&quot; is the standard package index file
+expected by Tcl's package management. It is sourced during a search
+for packages, and declares the package to Tcl with its files, and how
+to handle them.</p></li>
+<li><p>The file &quot;<b class="file">critcl-rt.tcl</b>&quot; is a helper file containing the
+common code used by &quot;<b class="file">pkgIndex.tcl</b>&quot; to perform its tasks.</p></li>
+<li><p>The file &quot;<b class="file">license.terms</b>&quot; is optional and appears only if
+the &quot;<b class="file">.critcl</b>&quot; file the package is generated from used the command
+<b class="cmd">critcl::license</b> to declare package author and license.</p></li>
+<li><p>All files declared with the command <b class="cmd">critcl::tsources</b> are
+put into the sub-directory &quot;<b class="file">tcl</b>&quot;.</p></li>
+<li><p>The shared library generated by critcl is put into a
+platform-specific sub-directory.</p></li>
+</ol>
+<p>The whole structure, and especially the last point, enable us
+to later merge the results (for the same package, and version) for
+multiple target platforms into a single directory structure without
+conflict, by simply copying the top directories over each other. The
+only files which can conflict are in the &lt;TOP&gt; and &quot;<b class="file">tcl</b>&quot;
+directories, and for these we know that they are identical across
+targets. The result of such a merge would look like:</p>
+<pre class="doctools_example">
+&lt;TOP&gt;
++- pkgIndex.tcl
++- critcl-rt.tcl
++- license.terms (optional)
+|
++- tcl (optional)
+|  +- &lt;tsources files&gt;
+|
++- &lt;platform1&gt;
+|  +- &lt;shared library1&gt;
++- &lt;platform2&gt;
+|  +- &lt;shared library2&gt;
+...
++- &lt;platformN&gt;
+   +- &lt;shared libraryN&gt;
+</pre>
+</div>
+<div id="section6" class="doctools_section"><h2><a name="section6">Authors</a></h2>
+<p>Jean Claude Wippler, Steve Landers, Andreas Kupries</p>
+</div>
+<div id="section7" class="doctools_section"><h2><a name="section7">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report them at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a>.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a> as well.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#calling_c_code_from_tcl">calling C code from Tcl</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; Jean-Claude Wippler<br>
+Copyright &copy; Steve Landers<br>
+Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_bitmap.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_bitmap.html
new file mode 100644
index 00000000..83e52a8d
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_bitmap.html
@@ -0,0 +1,271 @@
+<!DOCTYPE html><html><head>
+<title>critcl::bitmap - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_bitmap.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl::bitmap.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl::bitmap(n) 1.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl::bitmap - CriTcl - Wrap Support - Bitset en- and decoding</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#synopsis">Synopsis</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">API</a></li>
+<li class="doctools_section"><a href="#section3">Example</a></li>
+<li class="doctools_section"><a href="#section4">Authors</a></li>
+<li class="doctools_section"><a href="#section5">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="synopsis" class="doctools_section"><h2><a name="synopsis">Synopsis</a></h2>
+<div class="doctools_synopsis">
+<ul class="doctools_requirements">
+<li>package require <b class="pkgname">Tcl 8.6</b></li>
+<li>package require <b class="pkgname">critcl <span class="opt">?3.2?</span></b></li>
+<li>package require <b class="pkgname">critcl::bitmap <span class="opt">?1.1?</span></b></li>
+</ul>
+<ul class="doctools_syntax">
+<li><a href="#1"><b class="cmd">::critcl::bitmap::def</b> <i class="arg">name</i> <i class="arg">definition</i> <span class="opt">?<i class="arg">exclusions</i>?</span></a></li>
+</ul>
+</div>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This document is the reference manpage for the
+<b class="package">critcl::bitmap</b> package. This package provides convenience
+commands for advanced functionality built on top of both critcl core
+and package <b class="package"><a href="critcl_iassoc.html">critcl::iassoc</a></b>.</p>
+<p>C level libraries often use bit-sets to encode many flags into a
+single value. Tcl bindings to such libraries now have the task of
+converting a Tcl representation of such flags (like a list of strings)
+into such bit-sets, and back.
+<em>Note</em> here that the C-level information has to be something which
+already exists. The package does <em>not</em> create these values. This is
+in contrast to the package <b class="package"><a href="critcl_enum.html">critcl::enum</a></b> which creates an
+enumeration based on the specified symbolic names.</p>
+<p>This package was written to make the declaration and management
+of such bit-sets and their associated conversions functions easy,
+hiding all attendant complexity from the user.</p>
+<p>Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code.</p>
+<p>This package resides in the Core Package Layer of CriTcl.</p>
+<p><img alt="arch_core" src="../image/arch_core.png"></p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">API</a></h2>
+<dl class="doctools_definitions">
+<dt><a name="1"><b class="cmd">::critcl::bitmap::def</b> <i class="arg">name</i> <i class="arg">definition</i> <span class="opt">?<i class="arg">exclusions</i>?</span></a></dt>
+<dd><p>This command defines two C functions for the conversion of the
+<i class="arg">name</i>d bit-set into Tcl lists, and vice versa.
+The underlying mapping tables are automatically initialized on first
+access, and finalized on interpreter destruction.</p>
+<p>The <i class="arg">definition</i> dictionary provides the mapping from the
+Tcl-level symbolic names of the flags to their C expressions (often
+the name of the macro specifying the actual value).
+<em>Note</em> here that the C-level information has to be something which
+already exists. The package does <em>not</em> create these values. This is
+in contrast to the package <b class="package"><a href="critcl_enum.html">critcl::enum</a></b> which creates an
+enumeration based on the specified symbolic names.</p>
+<p>The optional <i class="arg">exlusion</i> list is for the flags/bit-sets for
+which conversion from bit-set to flag, i.e. decoding makes no
+sense. One case for such, for example, are flags representing a
+combination of other flags.</p>
+<p>The package generates multiple things (declarations and
+definitions) with names derived from <i class="arg">name</i>, which has to be a
+proper C identifier.</p>
+<dl class="doctools_definitions">
+<dt><i class="arg">name</i>_encode</dt>
+<dd><p>The function for encoding a Tcl list of strings into the equivalent
+bit-set.
+Its signature is</p>
+<pre class="doctools_example">
+int <i class="arg">name</i>_encode (Tcl_Interp* interp, Tcl_Obj* flags, int* result);
+</pre>
+<p>The return value of the function is a Tcl error code,
+i.e. <b class="const">TCL_OK</b>, <b class="const">TCL_ERROR</b>, etc.</p></dd>
+<dt><i class="arg">name</i>_decode</dt>
+<dd><p>The function for decoding a bit-set into the equivalent Tcl list of
+strings.
+Its signature is</p>
+<pre class="doctools_example">
+Tcl_Obj* <i class="arg">name</i>_decode (Tcl_Interp* interp, int flags);
+</pre>
+</dd>
+<dt><i class="arg">name</i>.h</dt>
+<dd><p>A header file containing the declarations for the two conversion
+functions, for use by other parts of the system, if necessary.</p>
+<p>The generated file is stored in a place where it will not
+interfere with the overall system outside of the package, yet also be
+available for easy inclusion by package files (<b class="cmd">csources</b>).</p></dd>
+<dt><i class="arg">name</i></dt>
+<dd><p>The name of a critcl argument type encapsulating the encoder function
+for use by <b class="cmd">critcl::cproc</b>.</p></dd>
+<dt><i class="arg">name</i></dt>
+<dd><p>The name of a critcl result type encapsulating the decoder function
+for use by <b class="cmd">critcl::cproc</b>.</p></dd>
+</dl></dd>
+</dl>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Example</a></h2>
+<p>The example shown below is the specification of the event flags pulled
+from the draft work on a Tcl binding to Linux's inotify APIs.</p>
+<pre class="doctools_example">
+package require Tcl 8.6
+package require critcl 3.2
+critcl::buildrequirement {
+    package require critcl::bitmap
+}
+critcl::bitmap::def tcl_inotify_events {
+    accessed       IN_ACCESS
+    all            IN_ALL_EVENTS
+    attribute      IN_ATTRIB
+    closed         IN_CLOSE
+    closed-nowrite IN_CLOSE_NOWRITE
+    closed-write   IN_CLOSE_WRITE
+    created        IN_CREATE
+    deleted        IN_DELETE
+    deleted-self   IN_DELETE_SELF
+    dir-only       IN_ONLYDIR
+    dont-follow    IN_DONT_FOLLOW
+    modified       IN_MODIFY
+    move           IN_MOVE
+    moved-from     IN_MOVED_FROM
+    moved-self     IN_MOVE_SELF
+    moved-to       IN_MOVED_TO
+    oneshot        IN_ONESHOT
+    open           IN_OPEN
+    overflow       IN_Q_OVERFLOW
+    unmount        IN_UNMOUNT
+} {
+    all closed move oneshot
+}
+# Declarations:          tcl_inotify_events.h
+# Encoder:      int      tcl_inotify_events_encode (Tcl_Interp* interp, Tcl_Obj* flags, int* result);
+# Decoder:      Tcl_Obj* tcl_inotify_events_decode (Tcl_Interp* interp, int flags);
+# crit arg-type          tcl_inotify_events
+# crit res-type          tcl_inotify_events
+</pre>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Authors</a></h2>
+<p>Andreas Kupries</p>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report such at <a href="https://github.com/andreas-kupries/critcl">https://github.com/andreas-kupries/critcl</a>.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#tcl_interp_association">Tcl Interp Association</a>, <a href="../index.html#bitmask">bitmask</a>, <a href="../index.html#bitset">bitset</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#flags">flags</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a>, <a href="../index.html#singleton">singleton</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_build.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_build.html
new file mode 100644
index 00000000..aff87975
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_build.html
@@ -0,0 +1,152 @@
+<!DOCTYPE html><html><head>
+<title>critcl_build_tool - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_build.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; Jean-Claude Wippler   -- Copyright &amp;copy; Steve Landers   -- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl_build_tool.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl_build_tool(n) 3.2.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl_build_tool - CriTcl build.tcl Tool Reference</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">Authors</a></li>
+<li class="doctools_section"><a href="#section3">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.
+The script &quot;<b class="file">build.tcl</b>&quot; found in the top directory of the <i class="term"><a href="critcl.html">CriTcl</a></i> sources is the
+main tool of use to a developer or maintainer of <i class="term"><a href="critcl.html">CriTcl</a></i> itself.</p>
+<p>Invoking it a via</p>
+<pre class="doctools_example">./build.tcl help</pre>
+<p>provides the online help for this
+tool, explaining the operations available, and their arguments.</p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">Authors</a></h2>
+<p>Jean Claude Wippler, Steve Landers, Andreas Kupries</p>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report them at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a>.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a> as well.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#calling_c_code_from_tcl">calling C code from Tcl</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; Jean-Claude Wippler<br>
+Copyright &copy; Steve Landers<br>
+Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_callback.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_callback.html
new file mode 100644
index 00000000..733e8956
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_callback.html
@@ -0,0 +1,277 @@
+<!DOCTYPE html><html><head>
+<title>critcl::callback - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_callback.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl::callback.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl::callback(n) 1.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl::callback - CriTcl - C-level Callback Utilities</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#synopsis">Synopsis</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">API</a></li>
+<li class="doctools_section"><a href="#section3">Examples</a>
+<ul>
+<li class="doctools_subsection"><a href="#subsection1">Simple callback</a></li>
+<li class="doctools_subsection"><a href="#subsection2">Multiple methods</a></li>
+</ul>
+</li>
+<li class="doctools_section"><a href="#section4">Authors</a></li>
+<li class="doctools_section"><a href="#section5">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="synopsis" class="doctools_section"><h2><a name="synopsis">Synopsis</a></h2>
+<div class="doctools_synopsis">
+<ul class="doctools_requirements">
+<li>package require <b class="pkgname">Tcl 8.6</b></li>
+<li>package require <b class="pkgname">critcl <span class="opt">?3.2?</span></b></li>
+<li>package require <b class="pkgname">critcl::callback <span class="opt">?1.1?</span></b></li>
+</ul>
+<ul class="doctools_syntax">
+<li><a href="#1"><b class="type">critcl_callback_p</b> <b class="function">critcl_callback_new</b> <i class="arg">interp</i> <i class="arg">objc</i> <i class="arg">objv</i> <i class="arg">nargs</i></a></li>
+<li><a href="#2"><b class="type">void</b> <b class="function">critcl_callback_extend</b> <i class="arg">callback</i> <i class="arg">argument</i></a></li>
+<li><a href="#3"><b class="type">void</b> <b class="function">critcl_callback_destroy</b> <i class="arg">callback</i></a></li>
+<li><a href="#4"><b class="type">int</b> <b class="function">critcl_callback_invoke</b> <i class="arg">callback</i> <i class="arg">objc</i> <i class="arg">objv</i></a></li>
+</ul>
+</div>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This document is the reference manpage for the
+<b class="package">critcl::callback</b> package.
+This package provides, via a stubs API table, data structures and
+functions to manage callbacks from C to Tcl. The package has no
+Tcl-level facilities.
+Its intended audience are mainly developers wishing to write Tcl
+packages with embedded C code who have to invoke user-specified
+command (prefixes) in Tcl.</p>
+<p>This package resides in the Support Package Layer of CriTcl.</p>
+<p><img alt="arch_support" src="../image/arch_support.png"></p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">API</a></h2>
+<p>The package API consist of one opaque data structure
+(<b class="type">critcl_callback_p</b>) and four functions operating on the same.
+These functions are</p>
+<dl class="doctools_definitions">
+<dt><a name="1"><b class="type">critcl_callback_p</b> <b class="function">critcl_callback_new</b> <i class="arg">interp</i> <i class="arg">objc</i> <i class="arg">objv</i> <i class="arg">nargs</i></a></dt>
+<dd><p>This function creates a new callback (manager) and returns it as its result.</p>
+<p>The callback is initialized with the Tcl_Interp* <i class="arg">interp</i>
+specifying where to run the callback, the fixed part of the command to
+run in standard <i class="arg">objc</i>/<i class="arg">objv</i> notation, plus the number of
+free arguments to expect after the fixed part.</p>
+<p>The fixed part is the essentially the command prefix of the callback.</p>
+<p>All <b class="type">Tcl_Obj*</b> elements of <i class="arg">objv</i> are protected against early
+release by incrementing their reference counts. The callback
+effectively takes ownership of these objects.</p></dd>
+<dt><a name="2"><b class="type">void</b> <b class="function">critcl_callback_extend</b> <i class="arg">callback</i> <i class="arg">argument</i></a></dt>
+<dd><p>This function takes a <i class="arg">callback</i> of type <b class="type">critcl_callback_p</b>
+and extends its fixed part with the <i class="arg">argument</i>, taking the first
+free slot for arguments to do so.
+This means that after the application of this function the specified
+callback has one free argument less.</p>
+<p>With assertions active attempting to extend beyond the number of free
+arguments will cause a panic. Without assertions active expect a crash
+at some point.</p>
+<p>This allows the user to extend the fixed part of the callback with
+semi-fixed elements, like method names (See <span class="sectref"><a href="#subsection2">Multiple methods</a></span>).</p>
+<p>The <i class="arg">argument</i> is protected against early release by incrementing
+its reference count. The callback effectively takes ownership of this
+object.</p></dd>
+<dt><a name="3"><b class="type">void</b> <b class="function">critcl_callback_destroy</b> <i class="arg">callback</i></a></dt>
+<dd><p>This function takes a <i class="arg">callback</i> of type <b class="type">critcl_callback_p</b>
+and releases all memory associated with it.
+After application of this function the callback cannot be used anymore.</p>
+<p>All fixed elements of the callback (owned by it) are released by
+decrementing their reference counts.</p></dd>
+<dt><a name="4"><b class="type">int</b> <b class="function">critcl_callback_invoke</b> <i class="arg">callback</i> <i class="arg">objc</i> <i class="arg">objv</i></a></dt>
+<dd><p>This function invokes the callback in the Tcl interpreter specified at
+the time of construction, in the global level and namespace, with the
+free arguments filled by the <b class="type">Tcl_Obj*</b> objects specified via
+<i class="arg">objc</i>/<i class="arg">objv</i>.</p>
+<p>It returns the Tcl status of the invoked command as its result.
+Any further results or error messages will be found in the result area
+of the Tcl interpreter in question. The exact nature of such is
+dependent on the callback itself.</p>
+<p>With assertions active attempting to use more arguments than available
+will cause a panic. Without assertions active expect a crash at some
+point.</p>
+<p>While the callback is running all <b class="type">Tcl_Obj*</b> elements of the
+command, fixed and arguments, are protected against early release by
+temporarily incrementing their reference counts.</p></dd>
+</dl>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Examples</a></h2>
+<div id="subsection1" class="doctools_subsection"><h3><a name="subsection1">Simple callback</a></h3>
+<p>The example here shows the important parts of using the functions of
+this package for a simple callback which is invoked with a single
+argument, some kind of data to hand to the Tcl level.</p>
+<pre class="doctools_example">
+    // Create the callback with interpreter and command prefix in
+    // oc/ov, plus space for the argument
+    critcl_callback_p cb = critcl_callback_new (interp, oc, ov, 1);
+    // Invoke the callback somewhere in the C package using this one,
+    // with Tcl_Obj* data holding the information to pass up.
+    critcl_callback_invoke (cb, 1, &amp;data);
+    // At the end of the lifetime, release the callback.
+    critcl_callback_destroy (cb);
+</pre>
+<p>Note that the functions of this package are designed for the case
+where the created callback (<b class="const">cb</b> above) is kept around for a
+long time, and many different invokations.</p>
+<p>Using the sequence above as is, creating and destroying the callback
+each time it is invoked will yield very poor performance and lots of
+undesirable memory churn.</p>
+</div>
+<div id="subsection2" class="doctools_subsection"><h3><a name="subsection2">Multiple methods</a></h3>
+<p>While we can use the methodology of the previous section when a single
+(Tcl-level) callback is invoked from different places in C, with
+different methods, simply having another argument slot and filling it
+an invokation time with the method object, a second methodology is
+open to us due to <b class="function">critcl_callback_extend</b>.</p>
+<pre class="doctools_example">
+    // Create one callback manager per different method the callback
+    // will be used with. Fill the first of the two declared arguments
+    // with the different methods.
+    critcl_callback_p cb_a = critcl_callback_new (interp, oc, ov, 2);
+    critcl_callback_p cb_b = critcl_callback_new (interp, oc, ov, 2);
+    critcl_callback_extend (cb_a, Tcl_NewStringObj (&quot;method1&quot;, -1));
+    critcl_callback_extend (cb_b, Tcl_NewStringObj (&quot;method2&quot;, -1));
+    // After the extension we have one free argument left, for use in
+    // the invokations.
+    critcl_callback_invoke (cb_a, 1, &amp;dataX);
+    critcl_callback_invoke (cb_b, 1, &amp;dataY);
+    // At the end release both managers again
+    critcl_callback_destroy (cb_a);
+    critcl_callback_destroy (cb_b);
+</pre>
+<p>The nice thing here is that the method objects are allocated only once
+and automatically shared by all the calls. No memory churn to
+repeatedly allocate the same string objects over and over again.</p>
+</div>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Authors</a></h2>
+<p>Andreas Kupries</p>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report such at <a href="https://github.com/andreas-kupries/critcl">https://github.com/andreas-kupries/critcl</a>.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_changes.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_changes.html
new file mode 100644
index 00000000..5ad2909f
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_changes.html
@@ -0,0 +1,1100 @@
+<!DOCTYPE html><html><head>
+<title>critcl_changes - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_changes.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; Jean-Claude Wippler   -- Copyright &amp;copy; Steve Landers   -- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl_changes.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl_changes(n) 3.2.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl_changes - CriTcl Releases &amp; Changes</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">Changes for version 3.2.1 (to come)</a></li>
+<li class="doctools_section"><a href="#section3">Changes for version 3.2</a></li>
+<li class="doctools_section"><a href="#section4">Changes for version 3.1.18.1</a></li>
+<li class="doctools_section"><a href="#section5">Changes for version 3.1.18</a></li>
+<li class="doctools_section"><a href="#section6">Changes for version 3.1.17</a></li>
+<li class="doctools_section"><a href="#section7">Changes for version 3.1.16</a></li>
+<li class="doctools_section"><a href="#section8">Changes for version 3.1.15</a></li>
+<li class="doctools_section"><a href="#section9">Changes for version 3.1.14</a></li>
+<li class="doctools_section"><a href="#section10">Changes for version 3.1.13</a></li>
+<li class="doctools_section"><a href="#section11">Changes for version 3.1.12</a></li>
+<li class="doctools_section"><a href="#section12">Changes for version 3.1.11</a></li>
+<li class="doctools_section"><a href="#section13">Changes for version 3.1.10</a></li>
+<li class="doctools_section"><a href="#section14">Changes for version 3.1.9</a></li>
+<li class="doctools_section"><a href="#section15">Changes for version 3.1.8</a></li>
+<li class="doctools_section"><a href="#section16">Changes for version 3.1.7</a></li>
+<li class="doctools_section"><a href="#section17">Changes for version 3.1.6</a></li>
+<li class="doctools_section"><a href="#section18">Changes for version 3.1.5</a></li>
+<li class="doctools_section"><a href="#section19">Changes for version 3.1.4</a></li>
+<li class="doctools_section"><a href="#section20">Changes for version 3.1.3</a></li>
+<li class="doctools_section"><a href="#section21">Changes for version 3.1.2</a></li>
+<li class="doctools_section"><a href="#section22">Changes for version 3.1.1</a></li>
+<li class="doctools_section"><a href="#section23">Changes for version 3.1</a></li>
+<li class="doctools_section"><a href="#section24">Changes for version 3.0.7</a></li>
+<li class="doctools_section"><a href="#section25">Changes for version 3.0.6</a></li>
+<li class="doctools_section"><a href="#section26">Changes for version 3.0.5</a></li>
+<li class="doctools_section"><a href="#section27">Changes for version 3.0.4</a></li>
+<li class="doctools_section"><a href="#section28">Changes for version 3.0.3</a></li>
+<li class="doctools_section"><a href="#section29">Changes for version 3.0.2</a></li>
+<li class="doctools_section"><a href="#section30">Changes for version 3.0.1</a></li>
+<li class="doctools_section"><a href="#section31">Changes for version 3</a></li>
+<li class="doctools_section"><a href="#section32">Changes for version 2.1</a></li>
+<li class="doctools_section"><a href="#section33">Authors</a></li>
+<li class="doctools_section"><a href="#section34">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>Adding C code to <a href="http://core.tcl-lang.org/tcl">Tcl</a>/<a href="http://core.tcl-lang.org/tk">Tk</a> has never been easier.</p>
+<p>Improve performance by rewriting the performance bottlenecks in C.</p>
+<p>Import the functionality of shared libraries into Tcl scripts.
+See the changes done in each release of <i class="term"><a href="critcl.html">CriTcl</a></i>, from the latest at the top to the
+beginning of the project.</p>
+<p>The latest changes are found at the top.</p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">Changes for version 3.2.1 (to come)</a></h2>
+<ol class="doctools_enumerated">
+<li><p>As announced with 3.2:</p>
+<ol class="doctools_enumerated">
+<li><p>Removed support for Tcl 8.4 and 8.5.</p></li>
+<li><p>Removed support for the argument types
+       <b class="type">int*</b>,
+       <b class="type">float*</b>,
+       <b class="type">double*</b>,
+       <b class="type">bytearray</b>,
+       <b class="type">rawchar</b>, and
+       <b class="type">rawchar*</b>.</p></li>
+</ol>
+</li>
+<li><p>Modified packages to accept operation under Tcl 9.
+       Bumped package versions appropriately.
+       Bumped copyrights.</p>
+<p>The <i class="term"><a href="critcl_tcl9.html">How To Adapt Critcl Packages for Tcl 9</a></i>
+       contains the details relevant to writers of <i class="term"><a href="critcl.html">CriTcl</a></i>-based packages.</p></li>
+<li><p>Set different minimum Tcl requirements for the 8.x and 9.x series.</p>
+<p>If no minimum is declared the minimum depends on the Tcl version
+       used to run the critcl package or application.</p>
+<p>When running under Tcl 9 the default minimum is version <b class="const">9</b>.
+       For anything else the new default minimum is <b class="const">8.6</b>.</p>
+<p><em>Reminder</em>: Support for Tcl 8.4 and 8.5 was removed.</p></li>
+<li><p>Made &quot;<b class="file">~</b>&quot;-handling portable across the 8.x and 9 boundary
+       (via <b class="const">HOME</b> environment variable).</p></li>
+<li><p>Bumped embedded <b class="package">tclconfig</b> to version 2.67. Patch supplied by Paul Obermeier.</p></li>
+<li><p><em>Bug Fix</em> <a href="https://github.com/andreas-kupries/critcl/issues/127">#127</a></p></li>
+<li><p><em>Bug Fix</em> <a href="https://github.com/andreas-kupries/critcl/issues/128">#128</a></p></li>
+<li><p><em>Bug Fix</em> <a href="https://github.com/andreas-kupries/critcl/issues/129">#129</a>
+Fixed various typos in the documentation.</p></li>
+<li><p>Reworked internals of <b class="package"><a href="critcl_cutil.html">critcl::cutil</a></b>'s tracer to support operation in a
+       multi-threaded environment. This new mode is also default. The old single-threaded
+       mode can be (re)activated by defining <b class="const">CRITCL_TRACE_NOTHREADS</b>.</p>
+<p>Package bumped to version 0.4.</p></li>
+</ol>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Changes for version 3.2</a></h2>
+<ol class="doctools_enumerated">
+<li><p><em>BREAKING</em> <i class="term"><a href="critcl.html">CriTcl</a></i> now requires Tcl 8.6 to be run.</p>
+<p>It also generates Tcl 8.6 extensions by default.</p>
+<p>It is still possible to generates extensions for Tcl 8.4 and 8.5,
+       properly setting it via <b class="cmd">critcl::tcl</b>.</p>
+<p><em>ATTENTION</em> It is planned to completely remove 8.4 and 8.5
+       support with <i class="term"><a href="critcl.html">CriTcl</a></i> 3.3.
+       No date has been set for that release yet.</p>
+<p>All utility packages have their versions and requirements bumped accordingly as
+       well.</p></li>
+<li><p><em>BREAKING</em> <em>Bug Fix</em>
+       Issue <a href="https://github.com/andreas-kupries/critcl/issues/115">#115</a>.</p>
+<p>Distributions using <b class="syscmd">build.tcl</b> for installation of critcl in their
+       packaging scripts have to be updated to the changed command signature of
+       <b class="syscmd">build.tcl</b> install, etc. See the details below.</p>
+<p>Redone the argument handling for <b class="method">install</b>, <b class="method">uninstall</b>, and
+       <b class="method">targets</b>. The destination argument is gone.  All commands now take options
+       similar to what is known from GNU <b class="syscmd">configure</b>, i.e.</p>
+<dl class="doctools_options">
+<dt><b class="option">--prefix</b> path</dt>
+<dd></dd>
+<dt><b class="option">--exec-prefix</b> path</dt>
+<dd></dd>
+<dt><b class="option">--bin-dir</b> path</dt>
+<dd></dd>
+<dt><b class="option">--lib-dir</b> path</dt>
+<dd></dd>
+<dt><b class="option">--include-dir</b> path</dt>
+<dd></dd>
+</dl>
+<p>They now also respect the environment variable <b class="variable">DESTDIR</b>, and the associated
+       option <b class="option">--dest-dir</b>.</p>
+<p>The <b class="option">--prefix</b> defaults to the topdir from the bin directory holding the
+       <b class="syscmd">tclsh</b> running <b class="syscmd">build.tcl</b>.  As Tcl command:</p>
+<pre class="doctools_example">
+    file dirname [file dirname [info nameofexecutable]]
+</pre>
+<p>Added a command <b class="method">dirs</b> doing the same argument handling, for debugging.</p></li>
+<li><p>Removed the irrelevant packages <b class="package">autoscroll</b>, <b class="package">cmdline</b>,
+       <b class="package">dict84</b>, <b class="package">lassign84</b>, <b class="package">lmap84</b>, <b class="package">snit</b>,
+       <b class="package">snitbutton</b>, and <b class="package">wikit</b>.</p></li>
+<li><p><em>Documentation Redo</em> Issue
+       <a href="https://github.com/andreas-kupries/critcl/issues/116">#116</a>.
+       Reworked the documentation to use the system of 4 quadrants.
+       Reworked the introduction (How To Use Critcl) to be strongly
+       based on a series of examples.</p></li>
+<li><p><em>Bug Fix</em> Issue
+       <a href="https://github.com/andreas-kupries/critcl/issues/125">#125</a>.
+       Added missing method <b class="method">create</b> in object creation example
+       of installer documentation.</p></li>
+<li><p><em>Feature</em>. Extended <b class="cmd">cproc</b> argument type processing. Now able to
+       auto-create restricted scalar types. I.e. types derived from <i class="term">int</i>, etc. and
+       limited in the range of allowed values.</p>
+<p>Further able to auto-create restricted list types, i.e. types derived from
+       <i class="term">list</i> and either limited in length, or in the type of the elements, or both.</p></li>
+<li><p><em>Bug Fix / Enhancement</em> Issue
+       <a href="https://github.com/andreas-kupries/critcl/issues/118">#118</a>.  Modified
+       <b class="cmd">critcl::cproc</b> to accept C syntax for arguments, i.e.  Trailing comma on
+       argument names, leading comma on type names, and lone comma characters.</p></li>
+<li><p><em>Performance Fix</em> for <i class="term"><a href="../index.html#compile_run">compile &amp; run</a></i> mode.
+       Issue <a href="https://github.com/andreas-kupries/critcl/issues/112">#112</a>.</p>
+<p>Moved the command activating more precise code location tracking out of package
+       <b class="package"><a href="critcl.html">critcl</a></b> into package <b class="package">critcl::app</b>.</p>
+<p>Because generating packages ahead of time can bear the performance penalty invoked
+       by this <em>global</em> setting.</p>
+<p>Arbitrary libraries and applications using critcl dynamically
+       (<i class="term"><a href="../index.html#compile_run">compile &amp; run</a></i>) on the other hand likely cannot, and should not.</p></li>
+<li><p><em>Fix</em>
+       Issue <a href="https://github.com/andreas-kupries/critcl/issues/109">#109</a>.
+       Ignore <b class="syscmd">clang</b> suffices when computing the target identifier from a
+       configuration identifier.</p></li>
+<li><p><em>Feature</em>. Bumped package <b class="package"><a href="critcl_cutil.html">critcl::cutil</a></b> to version 0.2.1.
+       Simplified the implementation of macro <b class="cmd">ASSERT</b> by taking the underlying
+       <b class="function">Tcl_Panic</b>'s printf ability into account and added a new macro <b class="cmd">ASSERT_VA</b>
+       exporting the same ability to the user.</p></li>
+</ol>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Changes for version 3.1.18.1</a></h2>
+<ol class="doctools_enumerated">
+<li><p><em>Attention</em>: While the overall version (of the bundle)
+       moves to 3.1.18.1 the versions of packages <b class="package"><a href="critcl.html">critcl</a></b> and
+       <b class="package">critcl::app</b> are <em>unchanged</em>.</p></li>
+<li><p><em>Bugfix</em> Generally removed a number of 8.5-isms which
+       slipped into 3.1.18, breaking ability to use it with Tcl 8.4.</p></li>
+<li><p><em>Bugfix</em> Corrected broken <em>build.tcl uninstall</em>.</p></li>
+<li><p><em>Bugfix</em> Package <b class="package"><a href="critcl_class.html">critcl::class</a></b> bumped to
+       version 1.1.1. Fixed partial template substitution breaking
+       compilation of the generated code.</p></li>
+</ol>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Changes for version 3.1.18</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Feature (Developer support). Merged pull request #96 from
+       sebres/main-direct-invoke. Enables direct invokation of the
+       &quot;<b class="file">main.tcl</b>&quot; file for starkits from within a dev checkout,
+       i.e. outside of a starkit, or starpack.</p></li>
+<li><p>Feature. Added channel types to the set of builtin argument and
+       result types. The argument types are for simple channel access,
+       access requiring unshared channels, and taking the channel
+       fully into the C level, away from Tcl. The result type comes in
+       variants for newly created channels, known channels, and to
+       return taken channels back to Tcl. The first will register the
+       returned value in the interpreter, the second assumes that it
+       already is.</p></li>
+<li><p>Bugfix. Issue #96. Reworked the documentation around the
+       argument type <b class="type">Tcl_Interp*</b> to make its special status
+       more visible, explain uses, and call it out from result types
+       where its use will be necessary or at least useful.</p></li>
+<li><p>Feature. Package <b class="package"><a href="critcl_class.html">critcl::class</a></b> bumped to version 1.1.
+       Extended with the ability to create a C API for classes, and
+       the ability to disable the generation of the Tcl API.</p></li>
+<li><p>Bugfix. Merged pull request #99 from pooryorick/master. Fixes
+       to the target directory calculations done by the install code.</p></li>
+<li><p>Merged pull request #94 from andreas-kupries/documentation.
+       A larger documentation cleanup. The main work was done by
+       pooryorick, followed by tweaks done by myself.</p></li>
+<li><p>Extended the test suite with lots of cases based on the
+       examples for the various generator packages. IOW the new test
+       cases replicate/encapsulate the examples and demonstrate that
+       the packages used by the examples generate working code.</p></li>
+<li><p>Bugfix. Issue #95. Changed the field <b class="const">critcl_bytes.s</b> to
+       <b class="type">unsigned char*</b> to match Tcl's type. Further constified
+       the field to make clear that read-only usage is the common case
+       for it.</p></li>
+<li><p>Bugfix/Feature. Package <b class="package"><a href="critcl_cutil.html">critcl::cutil</a></b> bumped to
+       version 0.2.  Fixed missing inclusion of header &quot;<b class="file">string.h</b>&quot;
+       in &quot;<b class="file">critcl_alloc.h</b>&quot;, needed for <b class="function">memcpy</b> in macro
+       <b class="function">STREP</b>.  Added macros <b class="function">ALLOC_PLUS</b> and <b class="function">STRDUP</b>.
+       Moved documentation of <b class="function">STREP...</b> macros into proper place
+       (alloc section, not assert).</p></li>
+<li><p>Merged pull request #83 from apnadkarni/vc-fixes.
+       Removed deprecated -Gs for MSVC builds, and other Windows fixups.</p></li>
+<li><p>Feature. Package <b class="package"><a href="critcl_iassoc.html">critcl::iassoc</a></b> bumped to version 1.1.
+       Refactored internals to generate an include header for use by .c files.
+       This now matches what other generator packages do.
+       The template file is inlined and removed.</p></li>
+<li><p>Merged pull request #82 from gahr/home-symlink
+       Modified tests to handle possibility of $HOME a symlink.</p></li>
+<li><p>Merged pull request #81 from gahr/test-not-installed
+       Modified test support to find uninstalled critcl packages when
+       running tests. Handles all but critcl::md5.</p></li>
+<li><p>Merged pull request #85 from snoe925/issue-84
+       to fix Issue #84 breaking installation on OSX.</p></li>
+<li><p>Merged pull request #87 from apnadkarni/tea-fixes to fix Issue
+       #86, broken -tea option, generating an incomplete package.</p></li>
+<li><p>Feature. New package <b class="package"><a href="critcl_callback.html">critcl::callback</a></b> providing
+       C-level functions and data structures to manage callbacks from
+       C to Tcl.</p></li>
+<li><p>Feature. Package <b class="package"><a href="critcl_literals.html">critcl::literals</a></b> bumped to version
+       1.3.  Added mode <b class="const">+list</b> enabling the conversion of
+       multiple literals into a list of their strings.</p></li>
+<li><p>Feature. Package <b class="package"><a href="critcl_enum.html">critcl::enum</a></b> bumped to version 1.1.
+       Added basic mode handling, supporting <b class="const">tcl</b> (default) and
+       <b class="const">+list</b> (extension enabling the conversion of multiple
+       enum values into a list of their strings).</p></li>
+<li><p>Feature. Package <b class="package"><a href="critcl_emap.html">critcl::emap</a></b> bumped to version 1.2.
+       Extended existing mode handling with <b class="const">+list</b> extension
+       enabling the conversion of multiple emap values into a list of
+       their strings.</p></li>
+<li><p>Feature. Extended the set of available types by applying a few
+       range restrictions to the scalar types (<i class="term">int</i>,
+       <i class="term">long</i>, <i class="term">wideint</i>, <i class="term">double</i>, <i class="term">float</i>).</p>
+<p>Example: <i class="term">int &gt; 0</i> is now a viable type name.</p>
+<p>This is actually more limited than the description might
+       let you believe.</p>
+<p>See the package reference for the details.</p></li>
+</ol>
+</div>
+<div id="section6" class="doctools_section"><h2><a name="section6">Changes for version 3.1.17</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Extension: Allow duplicate arg- and result-type definitions if
+       they are fully identical.</p></li>
+<li><p>Bugfix. The application mishandled the possibility of
+       identical-named <b class="cmd">critcl::tsource</b>s. Possible because
+       <b class="cmd">critcl::tsource</b>s can be in subdirectories, a structure
+       which is <em>not</em> retained in the assembled package, causing
+       such files to overwrite each other and at least one lost. Fixed
+       by adding a serial number to the file names in the assembled
+       package.</p></li>
+<li><p>Bugfix in the static scanner which made it loose requirement
+       information. Further added code to generally cleanup results at
+       the end (removal of duplicates, mainly).</p></li>
+<li><p>Bugfix: Fixed issue #76.
+       Support installation directories which are not in the <b class="variable">auto_path</b>.
+       Without the patch the installed <b class="cmd"><a href="critcl.html">critcl</a></b> will not find its
+       own packages and fail. Thank you to
+       <a href="https://github.com/lupylucke">Simon Bachmann</a> for the
+       report and patch, and then his patience with me to getting to
+       actually apply it.</p></li>
+<li><p>Bugfix: Fixed issue #75.
+       Extended <b class="cmd">critcl::include</b> to now take multiple paths.</p></li>
+<li><p>Added new compatibility package <b class="package">lmap84</b>.</p></li>
+<li><p>Fixed typos in various documentation files.</p></li>
+<li><p>Fixed bug introduced by commit 86f415dd30 (3.1.16 release). The
+       separation of <b class="cmd">critcl::ccode</b> into user and work layers
+       means that location retrieval has to go one more level up to
+       find the user location.</p></li>
+<li><p>New supporting package <b class="package"><a href="critcl_cutil.html">critcl::cutil</a></b>. Provides common
+       C level facilities useful to packages (assertions, tracing,
+       memory allocation shorthands).</p></li>
+<li><p>Modified package <b class="package"><a href="critcl.html">critcl</a></b> to make use of the new
+       tracing facilities to provide tracing of arguments and results
+       for <b class="cmd">critcl::ccommand</b> and <b class="cmd">critcl::cproc</b> invokations.</p></li>
+<li><p>Modified packages <b class="package"><a href="critcl.html">critcl</a></b> and <b class="package"><a href="critcl_class.html">critcl::class</a></b>
+       to provide better function names for (class) method tracing.
+       Bumped package <b class="package"><a href="critcl_class.html">critcl::class</a></b> to version 1.0.7.</p></li>
+<li><p>Extended the support package <b class="package"><a href="critcl_literals.html">critcl::literals</a></b> with
+       limited configurability. It is now able to generate code for
+       C-level access to the pool without Tcl types (Mode <b class="const">c</b>).
+       The previously existing functionality is accesssible under mode
+       <b class="const">tcl</b>, which also is the default. Both modes can be used
+       together.</p></li>
+<li><p>Extended the support package <b class="package"><a href="critcl_emap.html">critcl::emap</a></b> with
+       limited configurability. It is now able to generate code for
+       C-level access to the mapping without Tcl types
+       (Mode <b class="const">c</b>). The previously existing functionality is
+       accessible under mode <b class="const">tcl</b>, which also is the
+       default. Both modes can be used together.</p></li>
+</ol>
+</div>
+<div id="section7" class="doctools_section"><h2><a name="section7">Changes for version 3.1.16</a></h2>
+<ol class="doctools_enumerated">
+<li><p>New feature. Extended <b class="cmd">critcl::cproc</b>'s argument handling
+       to allow arbitrary mixing of required and optional arguments.</p></li>
+<li><p>New feature.
+       <em>Potential Incompatibility</em>.</p>
+<p>Extended <b class="cmd">critcl::cproc</b>'s argument handling to treat an
+       argument <b class="const">args</b> as variadic if it is the last argument of
+       the procedure.</p></li>
+<li><p>New feature. Added two introspection commands,
+       <b class="cmd">critcl::has-argtype</b> and <b class="cmd">critcl::has-resulttype</b>.
+       These enable a user to test if a specific (named) type
+       conversion is implemented or not.</p></li>
+<li><p>Added new result type <b class="const">Tcl_Obj*0</b>, with alias
+       <b class="const">object0</b>. The difference to <b class="const">Tcl_Obj*</b> is in
+       the reference counting.</p></li>
+<li><p>Extended the command <b class="cmd">critcl::argtypesupport</b> with new
+       optional argument through which to explicitly specify the
+       identifier for guarding against multiple definitions.</p></li>
+<li><p>Bugfix: Fixed problem with the implementation of issue #54 (See
+       3.1.14). Always create the secondary log file. Otherwise
+       end-of-log handling may break, unconditionally assuming its
+       existence.</p></li>
+<li><p>Bugfix: Fixed problem with the internal change to the hook
+       <b class="const">HandleDeclAfterBuild</b>. Corrected the forgotten
+       <b class="cmd">critcl::cconst</b>.</p></li>
+<li><p>Debugging aid: Added comment holding the name of the result
+       type when emitting result conversions.</p></li>
+<li><p>Bugfix: Fixed issue #60. Unbundled the package directories
+       containing multiple packages. All directories under &quot;<b class="file">lib/</b>&quot;
+       now contain exactly one package.</p></li>
+<li><p>Bugfix: Fixed issue #62, a few <b class="cmd">dict exists</b> commands
+       operating on a fixed string instead of a variable.</p></li>
+<li><p>Bugfix: Fixed issue #56. Release builders are reminded to run
+       the tests.</p></li>
+<li><p>Bugfix: Fixed issue #55. For FreeBSD critcl's platform package
+       now identifies the Kernel ABI version. Initialization of the
+       cache directory now also uses <b class="cmd">platform::identify</b> for the
+       default path, instead of <b class="cmd">platform::generic</b>.</p></li>
+<li><p>Bugfix: Fixed issue #58. Simplified the setup and use of
+       md5. CriTcl now makes use of its own package for md5, using
+       itself to built it. There is no chicken/egg problem with this
+       as the <b class="option">-pkg</b> mode used for this does not use md5. That
+       is limited to mode <i class="term"><a href="../index.html#compile_run">compile &amp; run</a></i>.</p></li>
+</ol>
+</div>
+<div id="section8" class="doctools_section"><h2><a name="section8">Changes for version 3.1.15</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed version number bogosity with <b class="const">3.1.14</b>.</p></li>
+</ol>
+</div>
+<div id="section9" class="doctools_section"><h2><a name="section9">Changes for version 3.1.14</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed issue #36. Added message to target <b class="const">all</b> of the
+        Makefile generated for TEA mode. Additionally tweaked other
+        parts of the output to be less noisy.</p></li>
+<li><p>Accepted request implied in issue #54. Unconditionally save
+        the compiler/linker build log into key <b class="const">log</b> of the
+        dictionary returned by <b class="cmd">cresults</b>, and save a copy of only
+        the execution output in the new key <b class="const">exl</b> (&quot;execution
+        log&quot;).</p></li>
+<li><p>Fixed issue #53. Clarified the documentation of commands
+        <b class="cmd">critcl::load</b> and <b class="cmd">critcl::failed</b> with regard
+        to their results and the throwing of errors (does not happen).</p></li>
+<li><p>Fixed issue #48. Modified mode &quot;compile &amp; run&quot; to allow new
+        declarations in a file, after it was build, instead of
+        erroring out. The new decls are build when needed. Mode
+        &quot;precompile&quot; is unchanged and will continue to trap the
+        situation.</p></li>
+<li><p>Fixed issue #52. Updated the local Tcl/Tk headers to
+        8.4.20, 8.5.13, and 8.6.4.</p></li>
+<li><p>Fixed issue #45. New feature command <b class="cmd">critcl::cconst</b>.</p></li>
+<li><p><b class="package"><a href="critcl_util.html">critcl::util</a></b>: New command <b class="cmd">locate</b> to find a
+        file across a set of paths, and report an error when not
+        found. This is for use in autoconf-like header-searches and
+        similar configuration tests.</p></li>
+<li><p>Modified 'AbortWhenCalledAfterBuild' to dump the entire stack
+        (info frame!). This should make it easier to determine the
+        location of the troubling declaration.</p></li>
+</ol>
+</div>
+<div id="section10" class="doctools_section"><h2><a name="section10">Changes for version 3.1.13</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Merged PR #43. Fixed bug loading adjunct Tcl sources.</p></li>
+<li><p>Fixes in documentation and generated code of package
+	&quot;critcl::enum&quot;. Bumped to version 1.0.1.</p></li>
+<li><p>Fixes in documentation of package &quot;critcl::bitmap&quot;.</p></li>
+<li><p>New package &quot;critcl::emap&quot;. In essence a variant or cross of
+	&quot;critcl::bitmap&quot; with behaviour like &quot;critcl::enum&quot;.</p></li>
+<li><p>Merged PR #49. Fixed documentation typo.</p></li>
+<li><p>Merged PR #46. Fixed documentation typo.</p></li>
+<li><p>Merged PR #47. Fixes to test results to match the accumulated
+	code changes. Also made portable across Tcl versions (varying
+	error syntax).</p></li>
+<li><p>New predefined argument- and result-type &quot;wideint&quot; mapping to
+	Tcl_WideInt.</p></li>
+<li><p>New predefined argument-type &quot;bytes&quot; mapping to tuple of
+	byte-array data and length. Note: The existing &quot;bytearray&quot;
+	type (and its aliases) was left untouched, to keep backward
+	compatibility.</p></li>
+<li><p>Modified the internal interface between the Tcl shim and C
+	function underneath &quot;critcl::cproc&quot; with respect to the
+	handling of optional arguments.
+	An optional argument &quot;X&quot; now induces the use of two C
+    	arguments, &quot;X&quot; and &quot;has_X&quot;.  The new argument &quot;has_X&quot; is of
+    	boolean (int) type. It is set to true when X is set, and set
+    	to false when X has the default value. C code which cares
+    	about knowing if the argument is default or not is now able to
+    	check that quickly, without having to code the default value
+    	inside.
+	NOTE: This change is visible in the output of the advanced
+    	      commands &quot;argcnames&quot;, &quot;argcsignature&quot;, &quot;argvardecls&quot;,
+    	      and &quot;argconversion&quot;.</p></li>
+<li><p>Fixed issue #50 and documented the availability of variable
+	&quot;interp&quot; (type Tcl_Interp*) within &quot;critcl::cinit&quot; C code
+	fragments.
+	Note that while the old, undocumented name of the variable,
+	&quot;ip&quot;, is still usable, it is deprecated. It will be fully
+	removed in two releases, i.e. for release 3.1.15.
+	The variable name was changed to be consistent with other code
+	environments.</p></li>
+<li><p>Fixed issue #51. Disabled the generation of #line directives
+	for &quot;critcl::config lines 0&quot; coming from template files, or
+	code generated with them before the final value of this
+	setting was known.</p></li>
+<li><p>Fixed issue with handling of namespaced package names in
+	&quot;critcl::iassoc&quot;. Equivalent to a bug in &quot;critcl::class&quot; fixed
+	for critcl 3.1.1, critcl::class 1.0.1.
+	Note: &quot;literals&quot;, &quot;enum&quot;, &quot;emap&quot;, and &quot;bitmap&quot; do not require
+	a fix as they are all built on top of &quot;iassoc&quot;.</p></li>
+</ol>
+</div>
+<div id="section11" class="doctools_section"><h2><a name="section11">Changes for version 3.1.12</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed issue 42. Clear ::errorInfo immediately after startup to
+       prevent leakage of irrelevant (caught) errors into our script
+       and confusing the usage code.</p></li>
+<li><p>Fixed issue 40. Keep the order of libraries, and allow
+       duplicates. Both are things which are occasionally required for
+       proper linking.</p></li>
+<li><p>Extended the utility package <b class="package"><a href="critcl_literals.html">critcl::literals</a></b> to
+       declare a cproc result-type for a pool.</p>
+<p>Further fixed the generated header to handle multiple inclusion.</p>
+<p>Bumped version to 1.1.</p></li>
+<li><p>Fixed issue with utility package <b class="package"><a href="critcl_bitmap.html">critcl::bitmap</a></b>.</p>
+<p>Fixed the generated header to handle multiple inclusion.</p>
+<p>Bumped version to 1.0.1.</p></li>
+<li><p>Created new utility package <b class="package"><a href="critcl_enum.html">critcl::enum</a></b> for the
+       quick and easy setup and use of mappings between C values
+       and Tcl strings.
+       Built on top of <b class="package"><a href="critcl_literals.html">critcl::literals</a></b>.</p></li>
+<li><p>Added examples demonstrating the use of the utility packages
+	<b class="package"><a href="critcl_literals.html">critcl::literals</a></b>,
+	<b class="package"><a href="critcl_bitmap.html">critcl::bitmap</a></b>, and
+	<b class="package"><a href="critcl_enum.html">critcl::enum</a></b></p></li>
+</ol>
+</div>
+<div id="section12" class="doctools_section"><h2><a name="section12">Changes for version 3.1.11</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed issue #37, via pull request #38, with thanks to
+       Jos DeCoster. Information was stored into the v::delproc
+       and v::clientdata arrays using a different key than when
+       retrieving the same information, thus failing the latter.</p></li>
+<li><p>New convenience command <b class="cmd">critcl::include</b> for easy
+       inclusion of headers and other C files.</p></li>
+<li><p>New command <b class="cmd">critcl::make</b> to generate a local header of
+       other C files for use by other parts of a package through
+       inclusion.</p></li>
+<li><p>New utility package <b class="package"><a href="critcl_literals.html">critcl::literals</a></b> for quick and
+       easy setup of and access to pools of fixed Tcl_Obj* strings.
+       Built on top of <b class="package"><a href="critcl_iassoc.html">critcl::iassoc</a></b>.</p></li>
+<li><p>New utility package <b class="package"><a href="critcl_bitmap.html">critcl::bitmap</a></b> for quick and easy
+       setup and use of mappings between C bitsets and Tcl lists whose
+       string elements represent that set.
+       Built on top of <b class="package"><a href="critcl_iassoc.html">critcl::iassoc</a></b>.</p></li>
+</ol>
+</div>
+<div id="section13" class="doctools_section"><h2><a name="section13">Changes for version 3.1.10</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed code version numbering forgotten with 3.1.9.</p></li>
+<li><p>Fixed issue #35. In package mode (-pkg) the object cache
+	directory is unique to the process, thus we do not need
+	content-hashing to generate unique file names. A simple
+	counter is sufficient and much faster.</p>
+<p>Note that mode &quot;compile &amp; run&quot; is not as blessed and still
+	uses content-hasing with md5 to ensure unique file names
+	in its per-user object cache.</p></li>
+<li><p>Fixed issue where the <b class="cmd">ccommand</b> forgot to use its body as
+	input for the UUID generation. Thus ignoring changes to it in
+	mode compile &amp; run, and not rebuilding a library for changed
+	sources. Bug and fix reported by Peter Spjuth.</p></li>
+</ol>
+</div>
+<div id="section14" class="doctools_section"><h2><a name="section14">Changes for version 3.1.9</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed issue #27. Added missing platform definitions for
+	various alternate linux and OS X targets.</p></li>
+<li><p>Fixed issue #28. Added missing -mXX flags for linking at the
+	linux-{32,64}-* targets.</p></li>
+<li><p>Fixed issue #29. Replaced the use of raw &quot;cheaders&quot;
+	information in the processing of &quot;cdefines&quot; with the proper
+	include directives derived from it.</p></li>
+<li><p>Fixed the issue behind rejected pull request #30 by Andrew
+	Shadura. Dynamically extract the stubs variable declarations
+	from the Tcl header files and generate matching variable
+	definitions for use in the package code. The generated code
+	will now be always consistent with the headers, even when
+	critcl's own copy of them is replaced by system headers.</p></li>
+<li><p>Fixed issue #31. Accepted patch by Andrew Shadura, with
+	changes (comments), for easier integration of critcl with
+	OS package systems, replacing critcl's copies of Tcl headers
+	with their own.</p></li>
+<li><p>Fixed issue #32. Merged pull request by Andrew Shadura.
+	Various typos in documentation and comments.</p></li>
+<li><p>Fixed issue #34. Handle files starting with a dot better.</p></li>
+</ol>
+</div>
+<div id="section15" class="doctools_section"><h2><a name="section15">Changes for version 3.1.8</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed issue with package indices generated for Tcl 8.4.
+	Join the list of commands with semi-colon, not newline.</p></li>
+<li><p>Fixed issue #26 which brought up use-cases I had forgotten to
+	consider while fixing bug #21 (see critcl 3.1.6).</p></li>
+</ol>
+</div>
+<div id="section16" class="doctools_section"><h2><a name="section16">Changes for version 3.1.7</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed issue #24. Extract and unconditionally display compiler
+	warnings found in the build log. Prevents users from missing
+	warnings which, while not causing the build to fail, may
+	still indicate problems.</p></li>
+<li><p>New feature. Output hook. All non-messaging user output is now
+	routed through the command <b class="cmd">critcl::print</b>, and users are
+	allowed to override it when using the critcl application-as-package.</p></li>
+<li><p>New feature, by Ashok P. Nadkarni. Platform configurations can
+	inherit values from configurations defined before them.</p></li>
+</ol>
+</div>
+<div id="section17" class="doctools_section"><h2><a name="section17">Changes for version 3.1.6</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed issue #21. While the multi-definition of the stub-table
+       pointer variables was ok with for all the C linkers seen so far
+       C++ linkers did not like this at all. Reworked the code to
+       ensure that this set of variables is generated only once, in
+       the wrapper around all the pieces to assemble.</p></li>
+<li><p>Fixed issue #22, the handling of the command identifier
+       arguments of <b class="cmd">critcl::ccommand</b>, <b class="cmd">critcl::cproc</b>, and
+       <b class="cmd">critcl::cdata</b>. We now properly allow any Tcl identifier
+       and generate proper internal C identifiers from them.</p>
+<p>As part of this the signature of command <b class="cmd">critcl::name2c</b>
+       changed. The command now delivers a list of four values instead
+       of three. The new value was added at the end.</p>
+<p>Further adapted the implementation of package
+       <b class="package"><a href="critcl_class.html">critcl::class</a></b>, a user of <b class="cmd">critcl::name2c</b>.
+       This package is now at version 1.0.6 and requires critcl 3.1.6</p>
+<p>Lastly fixed the mis-handling of option <b class="option">-cname</b> in
+       <b class="cmd">critcl::ccommand</b>, and <b class="cmd">critcl::cproc</b>.</p></li>
+<li><p>Fixed issue #23.</p></li>
+</ol>
+</div>
+<div id="section18" class="doctools_section"><h2><a name="section18">Changes for version 3.1.5</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed issue #19. Made the regular expression extracting the
+       MSVC version number more general to make it work on german
+       language systems. This may have to be revisited in the future,
+       for other Windows locales.</p></li>
+<li><p>Fixed issue #20. Made option -tea work on windows, at least in
+       a unix emulation environment like msys/mingw.</p></li>
+</ol>
+</div>
+<div id="section19" class="doctools_section"><h2><a name="section19">Changes for version 3.1.4</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Bugfix in package <b class="package"><a href="critcl_class.html">critcl::class</a></b>. Generate a dummy
+       field in the class structure if the class has no class
+       variables. Without this change the structure would be empty,
+       and a number of compilers are not able to handle such a type.</p></li>
+<li><p>Fixed a typo which broke the win64 configuration.</p></li>
+<li><p>Fixed issue #16, a typo in the documentation of command
+       <b class="cmd"><a href="critcl_class.html">critcl::class</a></b>.</p></li>
+</ol>
+</div>
+<div id="section20" class="doctools_section"><h2><a name="section20">Changes for version 3.1.3</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Enhancement. In detail:</p></li>
+<li><p>Added new argument type &quot;pstring&quot;, for &quot;Pascal String&quot;, a
+       counted string, i.e. a combination of string pointer and string
+       length.</p></li>
+<li><p>Added new methods <b class="cmd">critcl::argtypesupport</b> and
+       <b class="cmd">::critcl::argsupport</b> to define and use additional
+       supporting code for an argument type, here used by &quot;pstring&quot;
+       above to define the necessary structure.</p></li>
+<li><p>Semi-bugfixes in the packages <b class="package"><a href="critcl_class.html">critcl::class</a></b> and
+       <b class="package"><a href="critcl_iassoc.html">critcl::iassoc</a></b>. Pragmas for the AS meta data scanner
+       to ensure that the template files are made part of the package.
+       Versions bumped to 1.0.4 and 1.0.1 respectively.</p></li>
+</ol>
+</div>
+<div id="section21" class="doctools_section"><h2><a name="section21">Changes for version 3.1.2</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Enhancement. In detail:</p></li>
+<li><p>Extended <b class="cmd">critcl::cproc</b> to be able to handle optional
+       arguments, in a limited way. This is automatically available to
+       <b class="package"><a href="critcl_class.html">critcl::class</a></b> cproc-based methods as well.</p></li>
+<li><p>Bugfix in <b class="cmd">lassign</b> emulation for Tcl 8.4.  Properly set
+       unused variables to the empty string.  Bumped version of
+       emulation package <b class="package">lassign84</b> to 1.0.1.</p></li>
+</ol>
+</div>
+<div id="section22" class="doctools_section"><h2><a name="section22">Changes for version 3.1.1</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Bugfixes all around. In detail:</p></li>
+<li><p>Fixed the generation of wrong#args errors for
+<b class="cmd">critcl::cproc</b> and derived code (<b class="package"><a href="critcl_class.html">critcl::class</a></b>
+cproc-based methods). Use NULL if there are no arguments, and
+take the offset into account.</p></li>
+<li><p>Fixed the handling of package names by
+<b class="package"><a href="critcl_class.html">critcl::class</a></b>. Forgot that they may contain namespace
+separators. Bumped to version 1.0.1.</p></li>
+<li><p>Extended a <b class="package"><a href="critcl_class.html">critcl::class</a></b> generated error message in
+instance creation for clarity. Bumped to version 1.0.2.</p></li>
+</ol>
+</div>
+<div id="section23" class="doctools_section"><h2><a name="section23">Changes for version 3.1</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Added a new higher-level package <b class="package"><a href="critcl_iassoc.html">critcl::iassoc</a></b>.</p>
+<p>This package simplifies the creation of code associating data
+with an interpreter via Tcl's <b class="function">Tcl_(Get|Set)AssocData()</b> APIs. The
+user can concentrate on his data while all the necessary boilerplate
+C code to support this is generated by the package.</p>
+<p>This package uses several of the new features which were added
+to the core <b class="package"><a href="critcl.html">critcl</a></b> package, see below.</p></li>
+<li><p>Added the higher-level package <b class="package"><a href="critcl_class.html">critcl::class</a></b>.</p>
+<p>This package simplifies the creation of C level objects with
+class and instance commands. The user can write a class definition
+with class- and instance-variables and -methods similar to a TclOO
+class, with all the necessary boilerplate C code to support this
+generated by the package.</p>
+<p>This package uses several of the new features which were added
+to the core <b class="package"><a href="critcl.html">critcl</a></b> package, see below.</p></li>
+<li><p>Extended the API for handling TEApot metadata. Added the
+command <b class="cmd">critcl::meta?</b> to query the stored information. Main use
+currently envisioned is retrieval of the current package's name by
+utility commands, for use in constructed names. This particular
+information is always available due to the static scan of the package
+file on execution of the first critcl command.</p>
+<p>The new packages <b class="package"><a href="critcl_iassoc.html">critcl::iassoc</a></b> and
+<b class="package"><a href="critcl_class.html">critcl::class</a></b> (see above) are users of this command.</p></li>
+<li><p>Extended the API with a command, <b class="cmd">critcl::name2c</b>, exposing
+the process of converting a Tcl name into base name, namespace, and C
+namespace. This enables higher-level code generators to generate the same
+type of C identifiers as <b class="package"><a href="critcl.html">critcl</a></b> itself.</p>
+<p>The new package <b class="package"><a href="critcl_class.html">critcl::class</a></b> (see above) is a user
+of this command.</p></li>
+<li><p>Extended the API with a command, <b class="cmd">critcl::source</b>,
+executing critcl commands found in a separate file in the context of
+the current file. This enables easier management of larger bodies of
+code as it allows the user to split such up into easier to digest
+smaller chunks without causing the generation of multiple packages.</p></li>
+<li><p>Related to the previous item, extended the API with commands to
+divert collection of generated C code into memory. This makes it
+easier to use the commands for embedded C code in higher-level code
+generators.</p>
+<p>See the section <b class="sectref">Advanced: Diversions</b> for details of
+the provided commands.</p>
+<p>The new package <b class="package"><a href="critcl_class.html">critcl::class</a></b> (see above) is a user
+of these facilities.</p></li>
+<li><p>Extended the API with commands helping developers with the
+generation of proper C <i class="term">#line</i> directives. This allows
+higher-level code generators to generate and insert their own
+directives, ensuring that compile errors in their code are properly
+attributed.</p>
+<p>See the section <b class="sectref">Advanced: Location management</b> for
+details of the provided commands.</p>
+<p>The new packages <b class="package"><a href="critcl_iassoc.html">critcl::iassoc</a></b> and
+<b class="package"><a href="critcl_class.html">critcl::class</a></b> (see above) are users of these facilities.</p></li>
+<li><p>Extended the API with commands giving users the ability to
+define custom argument and result types for <b class="cmd">::critcl::cproc</b>.</p>
+<p>See the section <b class="sectref">CriTcl cproc Type Reference</b> for
+details of the provided commands.</p></li>
+</ol>
+</div>
+<div id="section24" class="doctools_section"><h2><a name="section24">Changes for version 3.0.7</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed the code generated by <b class="cmd">critcl::c++command</b>.
+        The emitted code handed a non-static string table to
+	<b class="function">Tcl_GetIndexFromObj</b>, in violation of the contract, which
+	requires the table to have a fixed address. This was a memory
+	smash waiting to happen. Thanks to Brian Griffin for alrerting
+	us to the general problem.</p></li>
+</ol>
+</div>
+<div id="section25" class="doctools_section"><h2><a name="section25">Changes for version 3.0.6</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed github issue 10. The critcl application now delivers a
+	proper exit code (1) on build failure, instead of always
+	indicating success (status 0).</p></li>
+<li><p>Fixed github issue 13. Handling of bufferoverflowU.lib for
+	release builds was inconsistent with handling for debug
+	builds. It is now identically handled (conditional) by
+	both cases.</p></li>
+<li><p>Documentation cleanup, mainly in the installation guide, and
+	the README.md shown by github</p></li>
+</ol>
+</div>
+<div id="section26" class="doctools_section"><h2><a name="section26">Changes for version 3.0.5</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed bug in the new code for #line pragmas triggered when
+	specifying C code without leading whitespace.</p></li>
+<li><p>Extended the documentation to have manpages for the license,
+	source retrieval, installer, and developer's guides.</p></li>
+</ol>
+</div>
+<div id="section27" class="doctools_section"><h2><a name="section27">Changes for version 3.0.4</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed generation of the package's initname when the incoming
+	code is read from stdin and has no proper path.</p></li>
+<li><p>Fixed github issue 11. Now using /LIBPATH instead of -L
+	on Windows (libinclude configuration setting).</p></li>
+<li><p>Extended critcl to handle -l:path format of -l options.
+	GNU ld 2.22+ handles this by searching for the path as
+	is. Good when specifying static libraries, as plain -l looks
+	for shared libraries in preference over static. critcl handles
+	it now, as older GNU ld's do not understand it, nor the
+	various vendor-specific linkers.</p></li>
+<li><p>Fixed github issue #12. CriTcl now determines the version of
+	MSVC in use and uses it to switch between various link debug
+	options. Simplified the handling of bufferoverflowU.lib also,
+	making use of the same mechanism and collapsing the two
+	configurations sections we had back into one.</p></li>
+<li><p>Reworked the insertion of #line pragmas into the generated C
+	code to avoid limitations on the line number argument imposed
+	by various compilers, and be more accurate.</p></li>
+<li><p>Modified argument processing. Option -libdir now also
+	implies -L for its argument.</p></li>
+<li><p>Extended handling of option -show (<b class="cmd">critcl::showconfig</b>)
+	to list the path of the configuration file the data is coming
+	from. Good for debugging configuration processing.</p></li>
+<li><p>Extended the build script with targets to regenerate the
+	embedded documentation, and diagrams, and to generate a
+	release.</p></li>
+</ol>
+</div>
+<div id="section28" class="doctools_section"><h2><a name="section28">Changes for version 3.0.3</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed github issues 5 and 8, for the example build.tcl
+scripts. Working around a missing variable ::errorInfo. It should
+always be present, however there seem to be revisions of Tcl around
+which violate this assumption.</p></li>
+</ol>
+</div>
+<div id="section29" class="doctools_section"><h2><a name="section29">Changes for version 3.0.2</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed issue in compile-and-run mode where commands put into the
+auto_index are not found by Tcl's [unknown] command.</p></li>
+<li><p>Fixed an array key mismatch breaking usage of client data and
+delete function for procedure. Reported by Jos DeCoster, with patch.</p></li>
+<li><p>Implemented a command line option <b class="option">-L</b>, an equivalent of
+option <b class="option">-I</b>, just for library search paths.</p></li>
+<li><p>Fixed github issues 5 and 8. Working around a missing variable
+::errorInfo. It should always be present, however there seem to be
+revisions of Tcl around which violate this assumption.</p></li>
+</ol>
+</div>
+<div id="section30" class="doctools_section"><h2><a name="section30">Changes for version 3.0.1</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Bugfixes all around. In detail:</p></li>
+<li><p>Fixed recording of Tcl version requirements. Keep package name
+and version together, unbreaking generated meta data and generated
+package load command.</p></li>
+<li><p>Fixed the build scripts: When installing, or wrapping for TEA,
+generate any missing directories</p></li>
+<li><p>Modified the build scripts to properly exit the application
+when the window of their GUI is closed through the (X) button.</p></li>
+<li><p>Removed an 8.5-ism (open wb) which had slipped into the main
+build script.</p></li>
+<li><p>Modified the example build scripts to separate the output for
+the different examples (and packages) by adding empty lines.</p></li>
+<li><p>stack::c example bugfix: Include API declarations for use in
+the companion files.</p></li>
+<li><p>Extended the documentation: Noted the need for a working
+installation of a C compiler.</p></li>
+<li><p>Extended the Windows target definitions and code to handle the
+manifest files used by modern MS development environments. Note that
+this code handles both possibilities, environment using manifests, and
+(old(er)) environments without.</p></li>
+<li><p>Extended the Windows 64bit target definitions and code to
+auto-detect the need for the helper library &quot;bufferoverflowU.lib&quot; and
+reconfigure the compile and link commands appropriately. We assume
+that the library must be linked when present. This should be no harm
+if the library is present, yet not needed. Just superfluous. We search
+for the library in the paths specified by the environment variable
+LIB.</p></li>
+</ol>
+</div>
+<div id="section31" class="doctools_section"><h2><a name="section31">Changes for version 3</a></h2>
+<ol class="doctools_enumerated">
+<li><p>The command <b class="cmd">critcl::platform</b> was deprecated in version
+2.1, superceded by <b class="cmd">critcl::targetplatform</b>, yet kept for
+compatibility. Now it has been removed.</p></li>
+<li><p>The command <b class="cmd">critcl::compiled</b> was kept with in version 2.1
+with semantics in contradiction to its, for compatibility. This
+contradiction has been removed, changing the visible semantics of the
+command to be in line with its name.</p></li>
+<li><p>The change to version 3 became necessary because of the two
+incompatible visible changes above.</p></li>
+<li><p>Extended the application package with code handling a new
+option <b class="option">-tea</b>. Specifying this option invokes a special mode
+where critcl generates a TEA package, i.e. wraps the input into a
+directory hierarchy and support files which provide it TEA-lookalike
+buildsystem.</p>
+<p>This new option, and <b class="option">-pkg</b>, exclude each other. If
+both are specified the last used option takes precedence.</p>
+<p>The generated package directory hierarchy is mostly
+self-contained, but not fully. It requires not only a working
+installation of Tcl, but also working installations of the packages
+<b class="package">md5</b> and <b class="package">cmdline</b>. Both of these are provided by the
+<b class="package">Tcllib</b> bundle. Not required, but recommended to have
+installed are any of the packages which can accelerate md5's
+operation, i.e. <b class="package">cryptkit</b>, <b class="package">tcllibc</b>, or
+<b class="package">Trf</b>.</p></li>
+<li><p>Extended the critcl package with a new command
+<b class="cmd">critcl::scan</b> taking the path to a &quot;<b class="file">.critcl</b>&quot; file,
+statically scanning it, and returning license, version, a list of its
+companion files, list of imported APIs, and list of
+developer-specified custom configuration options. This data is the
+foundation for the TEA wrapping described above.</p>
+<p>Note that this is a <em>static</em> scan. While the other build
+modes can (must) execute the &quot;<b class="file">.critcl</b>&quot; file and make
+platform-specific decisions regarding the assembled C code, companion
+files, etc. the TEA wrap mode is not in a position to make
+platform-specific decisions. It has to wrap everything which might
+conceivably be needed when actually building. Hence the static scan.
+This has however its own set of problems, namely the inability to
+figure out any dynamic construction of companion file paths, at least
+on its own. Thus:</p></li>
+<li><p>Extended the API used by critcl-based packages with the command
+<b class="cmd">critcl::owns</b>. While this command is ignored by the regular build
+modes the static scanner described above takes its arguments as the
+names of companion files which have to be wrapped into the TEA package
+and could not be figured by the scanner otherwise, like because of
+dynamic paths to <b class="cmd">critcl::tsources</b>, <b class="cmd">critcl::csources</b>,
+getting sourced directly, or simply being adjunct datafiles.</p></li>
+<li><p>Extended the API used by critcl-based packages with the command
+<b class="cmd">critcl::api</b> for the management of stubs tables, be it their use,
+and/or declaration and export.</p>
+<p>Please see section <em>Stubs Table Management</em> of the
+<b class="package"><a href="critcl.html">critcl</a></b> package documentation for details.</p></li>
+<li><p>Extended the API used by critcl-based packages with the command
+<b class="cmd">critcl::userconfig</b> for the management of developer-specified
+custom configuration options, be it their use and/or declaration.</p>
+<p>Please see section <em>Custom Build Configuration</em> of the
+<b class="package"><a href="critcl.html">critcl</a></b> package documentation for details.</p></li>
+<li><p>Extended the API used by critcl-based packages with the
+commands <b class="cmd">critcl::description</b>, <b class="cmd">critcl::summary</b>,
+<b class="cmd">critcl::subject</b>, <b class="cmd">critcl::meta</b>, and
+<b class="cmd">critcl::buildrequirement</b> for the declaration of TEApot meta data
+for/about the package.</p>
+<p>Please see section <em>Package Meta Data</em> of the
+<b class="package"><a href="critcl.html">critcl</a></b> package documentation for details.</p></li>
+</ol>
+</div>
+<div id="section32" class="doctools_section"><h2><a name="section32">Changes for version 2.1</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Fixed bug where <b class="cmd">critcl::tsources</b> interpreted relative
+paths as relative to the current working directory instead of
+relative to the &quot;<b class="file">.critcl</b>&quot; file using the command, as all other
+commands of this type do.</p></li>
+<li><p>Fixed internals, preventing information collected for multiple
+&quot;<b class="file">.critcl</b>&quot; files to leak between them. Notably, <b class="cmd">critcl::tk</b>
+is not a global configuration option anymore.</p></li>
+<li><p>Fixed the command <b class="cmd">critcl::license</b> to be a null-operation
+in mode &quot;compile &amp; run&quot;, instead of throwing an error.</p></li>
+<li><p>Fixed the critcl application's interference with the &quot;compile &amp;
+run&quot; result cache in <b class="option">-pkg</b> mode by having it use a wholly
+separate (and by default transient) directory for that mode.</p></li>
+<li><p>Fixed bug where changes to a &quot;<b class="file">.critcl</b>&quot; file did not result
+in a rebuild for mode &quot;compile &amp; run&quot;. All relevant API commands now
+ensure UUID changes.</p></li>
+<li><p>Fixed bug in the backend handling of <b class="cmd">critcl::debug</b> where
+the companion c-sources of a &quot;<b class="file">.critcl</b>&quot; file were not compiled
+with debug options, although the &quot;<b class="file">.critcl</b>&quot; file was.</p></li>
+<li><p>Fixed bug in <b class="cmd">critcl::debug</b> which prevented recognition of
+mode &quot;all&quot; when it was not the first argument to the command.</p></li>
+<li><p>Fixed bug in &quot;<b class="file">preload.c</b>&quot; preventing its compilation on
+non-windows platforms.</p></li>
+<li><p>Fixed long-standing bug in the handling of namespace qualifiers
+in the command name argument of <b class="cmd">critcl::cproc</b> and
+<b class="cmd">critcl::ccommand</b>. It is now possible to specify a fully
+qualified command name without issues.</p></li>
+<li><p>Extended/reworked <b class="cmd">critcl::tsources</b> to be the canonical
+way of declaring &quot;<b class="file">.tcl</b>&quot; companion files even for mode &quot;compile &amp;
+run&quot;.</p></li>
+<li><p>Extended/reworked <b class="cmd">critcl::tsources</b> to allow the use of a
+&quot;<b class="file">.critcl</b>&quot; file as its own Tcl companion file.</p></li>
+<li><p>Extended <b class="cmd">critcl::framework</b> to internally check for OS X
+build target, and to ignore the declaration if its not.</p></li>
+<li><p>Extended <b class="cmd">critcl::failed</b> to be callable more than once in
+a &quot;<b class="file">.critcl</b>&quot; file. The first call forces the build, if it was not
+done already, to get the result. Further calls return the cached
+result of the first call.</p></li>
+<li><p>Extended the handling of environment variable CC in the code
+determining the compiler to use to deal with (i.e. remove) paths to
+the compiler, compiler file extensions, and compiler options specified
+after the compiler itself, leaving only the bare name of the compiler.</p></li>
+<li><p>Extended the code handling the search for preloaded libraries
+to print the paths it searched, making debugging of a search failure
+easier.</p></li>
+<li><p>A new command <b class="cmd">critcl::tcl</b> can be used to declare the
+version of Tcl minimally needed to build and run the &quot;<b class="file">.critcl</b>&quot;
+file and package. Defaults to 8.4 if not declared. Extended critcl to
+have the stubs and headers for all of Tcl 8.4, 8.5, and 8.6.</p></li>
+<li><p>A new command <b class="cmd">critcl::load</b> forces the build and load of a
+&quot;<b class="file">.critcl</b>&quot; file. This is the official way for overriding critcl's
+default lazy-build-&amp;-load-on-demand scheme for mode &quot;compile &amp; run&quot;.</p>
+<p><em>Note</em> that after using <b class="cmd">critcl::load</b> /
+<b class="cmd">critcl::failed</b> in a &quot;<b class="file">.critcl</b>&quot; file it is not possible to
+use critcl commands in that file anymore. Doing so will throw an
+error.</p></li>
+<li><p>Extended the generation of '#line' pragmas to use
+<b class="cmd">info frame</b> (if available) to provide the C compiler with exact
+line numbers into the &quot;<b class="file">.critcl</b>&quot; file for the reporting of
+warnings and errors.</p></li>
+<li><p>Extended <b class="cmd">critcl::check</b> with logging to help with
+debugging build-time checks of the environment, plus an additional
+optional argument to provide labeling.</p></li>
+<li><p>Added a new command <b class="cmd">critcl::checklink</b> which not only
+tries to check the environment via compiling the code, but also
+its linkability.</p></li>
+<li><p>Added a new command <b class="cmd">critcl::msg</b> for messaging, like
+command <b class="cmd">critcl::error</b> is for error reporting. Likewise this is a
+hook a user of the package is allowed to override. The default
+implementation, used by mode <i class="term"><a href="../index.html#compile_run">compile &amp; run</a></i> does nothing. The
+implementation for mode <i class="term"><a href="../index.html#generate_package">generate package</a></i> prints the message
+to stdout.</p>
+<p>Envisioned use is for the reporting of results determined by
+<b class="cmd">critcl::check</b> and <b class="cmd">critcl::checklink</b> during building, to
+help with debugging when something goes wrong with a check.</p></li>
+<li><p>Exposed the argument processing internals of <b class="cmd">critcl::proc</b>
+for use by advanced users. The new commands are</p>
+<ol class="doctools_enumerated">
+<li><p><b class="cmd">critcl::argnames</b></p></li>
+<li><p><b class="cmd">critcl::argcnames</b></p></li>
+<li><p><b class="cmd">critcl::argcsignature</b></p></li>
+<li><p><b class="cmd">critcl::argvardecls</b></p></li>
+<li><p><b class="cmd">critcl::argconversion</b></p></li>
+</ol>
+<p>Please see section <em>Advanced Embedded C Code</em> of the
+<b class="package"><a href="critcl.html">critcl</a></b> package documentation for details.</p></li>
+<li><p>Extended the critcl package to intercept <b class="cmd">package
+provide</b> and record the file -&gt; package name mapping. Plus other
+internal changes now allow the use of namespaced package names while
+still using proper path names and init function.</p></li>
+<li><p>Dropped the unused commands <b class="cmd">critcl::optimize</b> and
+<b class="cmd">critcl::include</b>.</p></li>
+<li><p>Dropped <b class="option">-lib</b> mode from the critcl application.</p></li>
+<li><p>Dropped remnants of support for Tcl 8.3 and before.</p></li>
+</ol>
+</div>
+<div id="section33" class="doctools_section"><h2><a name="section33">Authors</a></h2>
+<p>Jean Claude Wippler, Steve Landers, Andreas Kupries</p>
+</div>
+<div id="section34" class="doctools_section"><h2><a name="section34">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report them at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a>.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a> as well.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#calling_c_code_from_tcl">calling C code from Tcl</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; Jean-Claude Wippler<br>
+Copyright &copy; Steve Landers<br>
+Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_class.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_class.html
new file mode 100644
index 00000000..52cb5ffd
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_class.html
@@ -0,0 +1,683 @@
+<!DOCTYPE html><html><head>
+<title>critcl::class - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_class.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl::class.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl::class(n) 1.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl::class - CriTcl - Code Gen - C Classes</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#synopsis">Synopsis</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">API</a></li>
+<li class="doctools_section"><a href="#section3">Class Specification API</a>
+<ul>
+<li class="doctools_subsection"><a href="#subsection1">General configuration</a></li>
+<li class="doctools_subsection"><a href="#subsection2">Class lifetime management</a></li>
+<li class="doctools_subsection"><a href="#subsection3">Instance lifetime management</a></li>
+<li class="doctools_subsection"><a href="#subsection4">Class variables and methods</a></li>
+<li class="doctools_subsection"><a href="#subsection5">Instance variables and methods</a></li>
+<li class="doctools_subsection"><a href="#subsection6">Context dependent interactions</a></li>
+</ul>
+</li>
+<li class="doctools_section"><a href="#section4">Example</a></li>
+<li class="doctools_section"><a href="#section5">Authors</a></li>
+<li class="doctools_section"><a href="#section6">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="synopsis" class="doctools_section"><h2><a name="synopsis">Synopsis</a></h2>
+<div class="doctools_synopsis">
+<ul class="doctools_requirements">
+<li>package require <b class="pkgname">Tcl 8.6</b></li>
+<li>package require <b class="pkgname">critcl <span class="opt">?3.2?</span></b></li>
+<li>package require <b class="pkgname">critcl::class <span class="opt">?1.1?</span></b></li>
+</ul>
+<ul class="doctools_syntax">
+<li><a href="#1"><b class="cmd">::critcl::class::define</b> <i class="arg">name</i> <i class="arg">script</i></a></li>
+<li><a href="#2"><b class="cmd">include</b> <i class="arg">path</i></a></li>
+<li><a href="#3"><b class="cmd">support</b> <i class="arg">code</i></a></li>
+<li><a href="#4"><b class="cmd">type</b> <i class="arg">name</i></a></li>
+<li><a href="#5"><b class="cmd">classconstructor</b> <i class="arg">body</i></a></li>
+<li><a href="#6"><b class="cmd">classdestructor</b> <i class="arg">body</i></a></li>
+<li><a href="#7"><b class="cmd">constructor</b> <i class="arg">body</i> <span class="opt">?<i class="arg">postbody</i>?</span></a></li>
+<li><a href="#8"><b class="cmd">destructor</b> <i class="arg">body</i></a></li>
+<li><a href="#9"><b class="cmd">classvariable</b> <i class="arg">ctype</i> <i class="arg">name</i> <span class="opt">?<i class="arg">comment</i>?</span> <span class="opt">?<i class="arg">constructor</i>?</span> <span class="opt">?<i class="arg">destructor</i>?</span></a></li>
+<li><a href="#10"><b class="cmd">classmethod</b> <i class="arg">name</i> <b class="method">command</b> <i class="arg">arguments</i> <i class="arg">body</i></a></li>
+<li><a href="#11"><b class="cmd">classmethod</b> <i class="arg">name</i> <b class="method">proc</b> <i class="arg">arguments</i> <i class="arg">resulttype</i> <i class="arg">body</i></a></li>
+<li><a href="#12"><b class="cmd">classmethod</b> <i class="arg">name</i> <b class="method">as</b> <i class="arg">funname</i> <span class="opt">?<i class="arg">arg</i>...?</span></a></li>
+<li><a href="#13"><b class="cmd">insvariable</b> <i class="arg">ctype</i> <i class="arg">name</i> <span class="opt">?<i class="arg">comment</i>?</span> <span class="opt">?<i class="arg">constructor</i>?</span> <span class="opt">?<i class="arg">destructor</i>?</span></a></li>
+<li><a href="#14"><b class="cmd">method</b> <i class="arg">name</i> <b class="method">command</b> <i class="arg">arguments</i> <i class="arg">body</i></a></li>
+<li><a href="#15"><b class="cmd">method</b> <i class="arg">name</i> <b class="method">proc</b> <i class="arg">arguments</i> <i class="arg">resulttype</i> <i class="arg">body</i></a></li>
+<li><a href="#16"><b class="cmd">method</b> <i class="arg">name</i> <b class="method">as</b> <i class="arg">funname</i> <span class="opt">?<i class="arg">arg</i>...?</span></a></li>
+<li><a href="#17"><b class="cmd">method_introspection</b></a></li>
+</ul>
+</div>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This document is the reference manpage for the <b class="package">critcl::class</b>
+package. This package provides convenience commands for advanced
+functionality built on top of the core.</p>
+<p>With it a user wishing to create a C level object with class
+and instance commands can concentrate on specifying the class- and
+instance-variables and -methods in a manner similar to a TclOO class,
+while all the necessary boilerplate around it is managed by this
+package.</p>
+<p>Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code.</p>
+<p>This package resides in the Core Package Layer of CriTcl.</p>
+<p><img alt="arch_core" src="../image/arch_core.png"></p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">API</a></h2>
+<dl class="doctools_definitions">
+<dt><a name="1"><b class="cmd">::critcl::class::define</b> <i class="arg">name</i> <i class="arg">script</i></a></dt>
+<dd><p>This is the main command to define a new class <i class="arg">name</i>, where
+<i class="arg">name</i> is the name of the Tcl command representing the class,
+i.e. the <i class="term">class command</i>. The <i class="arg">script</i> provides the
+specification of the class, i.e. information about included headers,
+class- and instance variables, class- and instance-methods, etc.
+See the section <span class="sectref"><a href="#section3">Class Specification API</a></span> below for the
+detailed list of the available commands and their semantics.</p></dd>
+</dl>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Class Specification API</a></h2>
+<p>Here we documents all class specification commands available inside of
+the class definition script argument of <b class="cmd">::critcl::class::define</b>.</p>
+<div id="subsection1" class="doctools_subsection"><h3><a name="subsection1">General configuration</a></h3>
+<dl class="doctools_definitions">
+<dt><a name="2"><b class="cmd">include</b> <i class="arg">path</i></a></dt>
+<dd><p>This command specifies the path of a header file to include within the
+code generated for the class. This is separate from the <b class="cmd">support</b>
+because the generated include directives will be put at the very
+beginning of the generated code. This is done to allow the use of the
+imported declarations within the instance type, and elsewhere.</p>
+<p>Calls to this command are cumulative.
+It is of course possible to not use this command at all, for classes
+not making use of external definitions.</p>
+<p>The result is the empty string.</p></dd>
+<dt><a name="3"><b class="cmd">support</b> <i class="arg">code</i></a></dt>
+<dd><p>This command specifies supporting C code, i.e. any definitions (types,
+functions, etc.) needed by the <em>whole</em> class and not fitting into
+class- and instance-methods. The code is embedded at global level,
+outside of any function or other definition.</p>
+<p>Calls to this command are cumulative.
+It is of course possible to not use this command at all, for classes
+not requiring supporting code.</p>
+<p>The result of the command is the empty string.</p></dd>
+<dt><a name="4"><b class="cmd">type</b> <i class="arg">name</i></a></dt>
+<dd><p>This command specifies the name of an external C type to be used as
+the type of the instance structure.</p>
+<p>Initialization and release of the structure with the given type
+are the responsibility of the user, through <b class="cmd">constructor</b> and
+<b class="cmd">destructor</b> code fragments.</p>
+<p><em>Attention:</em> Using this command precludes the use of
+regular class- and instance variables. It further precludes the use of
+<b class="cmd">method-introspection</b> as well, as this make use of generated
+instance-variables.</p>
+<p>If class- and/or instance-variable have to be used in
+conjunction with an external C type, simply create and use a class- or
+instance-variable with that type.</p>
+<p>The result of the command is the empty string.</p></dd>
+</dl>
+</div>
+<div id="subsection2" class="doctools_subsection"><h3><a name="subsection2">Class lifetime management</a></h3>
+<dl class="doctools_definitions">
+<dt><a name="5"><b class="cmd">classconstructor</b> <i class="arg">body</i></a></dt>
+<dd><p>This command specifies a C code block surrounding the initialization
+of the class variables, i.e. the fields of the class structure.
+<em>Note</em> that allocation and release of the class structure itself
+is done by the system andf not the responsibility of the user.</p>
+<p>For the initialization (and release) of a class variable it is
+recommended to use the <i class="arg">constructor</i> and <i class="arg">destructor</i>
+arguments of the variable's definition (See command
+<b class="cmd">classvariable</b>) for this instead of using a separate
+<b class="cmd">classconstructor</b>.</p>
+<p>This is an optional command. Using it more than once is allowed
+too and each use will add another C code fragment to use during
+construction. I.e. multiple calls aggregate.</p>
+<p>The C code blocks of multiple calls (including the constructors
+of classvariable definitions) are executed in order of specification.</p>
+<p>The result of the command is the empty string.</p>
+<p>The C code in <i class="arg">body</i> has access to the following
+environment:</p>
+<dl class="doctools_definitions">
+<dt><b class="variable">interp</b></dt>
+<dd><p>Pointer to the Tcl interpreter (Tcl_Interp*) the
+class structure will be associated with. It enables the generation
+of a Tcl error message should construction fail.</p></dd>
+<dt><b class="variable">class</b></dt>
+<dd><p>Pointer to the class structure to initialize.</p></dd>
+<dt>error</dt>
+<dd><p>A C code label the constructor can jump to should it have
+to signal a construction failure. It is the responsibility of the
+constructor to release any variables already initialized before
+jumping to this label. This also why the 'execution in order of
+specification' is documented and can be relied on. It gives us the
+knowledge which other constructors have already been run and
+initialized what other fields.</p></dd>
+</dl></dd>
+<dt><a name="6"><b class="cmd">classdestructor</b> <i class="arg">body</i></a></dt>
+<dd><p>This command specifies a C code block surrounding the release of the
+class variables, i.e. the fields of the class structure.
+<em>Note</em> that allocation and release of the class structure itself
+is done by the system and not the responsibility of the user.</p>
+<p>For the initialization (and release) of a class variable it is
+recommended to use the <i class="arg">constructor</i> and <i class="arg">destructor</i>
+arguments of the variable's definition (See command
+<b class="cmd">classvariable</b>) for this instead of using a separate
+<b class="cmd">classconstructor</b>.</p>
+<p>This is an optional command. Using it more than once is allowed
+too and each use will add another C code fragment to use during
+construction. I.e. multiple calls aggregate.</p>
+<p>The C code blocks of multiple calls (including the constructors
+of class variable definitions) are executed in order of specification.</p>
+<p>The result of the command is the empty string.</p>
+<p>The C code in <i class="arg">body</i> has access to the same
+environment as the class constructor code blocks.</p></dd>
+</dl>
+</div>
+<div id="subsection3" class="doctools_subsection"><h3><a name="subsection3">Instance lifetime management</a></h3>
+<dl class="doctools_definitions">
+<dt><a name="7"><b class="cmd">constructor</b> <i class="arg">body</i> <span class="opt">?<i class="arg">postbody</i>?</span></a></dt>
+<dd><p>This command specifies a C code block surrounding the initialization
+of the instance variables, i.e. the fields of the instance structure.
+<em>Note</em> that allocation and release of the instance structure
+itself is done by the system and not the responsibility of the user.
+<em>On the other hand</em>, if an external <b class="cmd">type</b> was specified
+for the instance structure, then instance variables are not possible,
+and the system has no knowledge of the type's structure. In that case
+it is the responsibility of the <i class="arg">body</i> to allocate and free the
+structure itself too.</p>
+<p>For the initialization (and release) of an instance variable it
+is recommended to use the <i class="arg">constructor</i> and <i class="arg">destructor</i>
+arguments of the variable's definition (See command <b class="cmd">insvariable</b>)
+for this instead of using a separate <b class="cmd">constructor</b>.</p>
+<p>This is an optional command. Using it more than once is allowed
+too and each use will add another C code fragment to use during
+construction. I.e. multiple calls aggregate.</p>
+<p>The C code blocks of multiple calls (including the constructors
+of instance variable definitions) are executed in order of specification.</p>
+<p>The result of the command is the empty string.</p>
+<p>The C code in <i class="arg">body</i> has access to the following
+environment:</p>
+<dl class="doctools_definitions">
+<dt><b class="variable">interp</b></dt>
+<dd><p>Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure will be associated with. It enables the generation
+of a Tcl error message should construction fail.</p></dd>
+<dt><b class="variable">instance</b></dt>
+<dd><p>Pointer to the instance structure to initialize.</p></dd>
+<dt>error</dt>
+<dd><p>A C code label the constructor can jump to should it have
+to signal a construction failure. It is the responsibility of the
+constructor to release any variables already initialized before
+jumping to this label. This also why the 'execution in order of
+specification' is documented and can be relied on. It gives us the
+knowledge which other constructors have already been run and
+initialized what other fields.</p></dd>
+</dl>
+<p>The C code in <i class="arg">postbody</i> is responsible for construction
+actions to be done after the primary construction was done and the
+Tcl-level instance command was successfully created. It has access to
+a slightly different environment:</p>
+<dl class="doctools_definitions">
+<dt><b class="variable">interp</b></dt>
+<dd><p>Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure will be associated with. It enables the generation
+of a Tcl error message should construction fail.</p></dd>
+<dt><b class="variable">instance</b></dt>
+<dd><p>Pointer to the instance structure to initialize.</p></dd>
+<dt><b class="variable">cmd</b></dt>
+<dd><p>The Tcl_Command token of the Tcl-level instance
+command.</p></dd>
+<dt><b class="variable">fqn</b></dt>
+<dd><p>The fully qualified name of the instance command,
+stored in a Tcl_Obj*.</p></dd>
+</dl></dd>
+<dt><a name="8"><b class="cmd">destructor</b> <i class="arg">body</i></a></dt>
+<dd><p>This command specifies a C code block surrounding the release of the
+instance variables, i.e. the fields of the instance structure.
+<em>Note</em> that allocation and release of the instance structure
+itself is done by the system and not the responsibility of the user.
+<em>On the other hand</em>, if an external <b class="cmd">type</b> was specified
+for the instance structure, then instance variables are not possible,
+and the system has no knowledge of the type's structure. In that case
+it is the responsibility of the <i class="arg">body</i> to allocate and free the
+structure itself too.</p>
+<p>For the initialization (and release) of an instance variable it
+is recommended to use the <i class="arg">constructor</i> and <i class="arg">destructor</i>
+arguments of the variable's definition (See command <b class="cmd">insvariable</b>)
+for this instead of using a separate <b class="cmd">constructor</b>.</p>
+<p>This is an optional command. Using it more than once is allowed
+too and each use will add another C code fragment to use during
+construction. I.e. multiple calls aggregate.</p>
+<p>The C code blocks of multiple calls (including the constructors
+of instance variable definitions) are executed in order of specification.</p>
+<p>The result of the command is the empty string.</p>
+<p>The C code in <i class="arg">body</i> has access to the following
+environment:</p>
+<dl class="doctools_definitions">
+<dt><b class="variable">instance</b></dt>
+<dd><p>Pointer to the instance structure to release.</p></dd>
+</dl></dd>
+</dl>
+</div>
+<div id="subsection4" class="doctools_subsection"><h3><a name="subsection4">Class variables and methods</a></h3>
+<dl class="doctools_definitions">
+<dt><a name="9"><b class="cmd">classvariable</b> <i class="arg">ctype</i> <i class="arg">name</i> <span class="opt">?<i class="arg">comment</i>?</span> <span class="opt">?<i class="arg">constructor</i>?</span> <span class="opt">?<i class="arg">destructor</i>?</span></a></dt>
+<dd><p>This command specifies a field in the class structure of the class.
+Multiple fields can be specified, and are saved in the order
+specified.</p>
+<p><em>Attention:</em> Specification of a class variable precludes
+the use of an external C <b class="cmd">type</b> for the instance structure.</p>
+<p><em>Attention:</em> Specification of a class variable
+automatically causes the definition of an instance variable named
+<b class="const">class</b>, pointing to the class structure.</p>
+<p>Beyond the basic <i class="arg">name</i> and C type of the new variable the
+definition may also contain a <i class="arg">comment</i> describing it, and C code
+blocks to initialize and release the variable.
+These are effectively local forms of the commands
+<b class="cmd">classconstructor</b> and <b class="cmd">classdestructor</b>. Please read their
+descriptions for details regarding the C environment available to the
+code.</p>
+<p>The comment, if specified will be embedded into the generated C
+code for easier cross-referencing from generated &quot;<b class="file">.c</b>&quot; file to
+class specification.</p></dd>
+<dt><a name="10"><b class="cmd">classmethod</b> <i class="arg">name</i> <b class="method">command</b> <i class="arg">arguments</i> <i class="arg">body</i></a></dt>
+<dd><p>This command specifies a class method and the C code block
+implementing its functionality. This is the first of three forms. The
+method is specified like a <b class="cmd">critcl::ccommand</b>, with a fixed set of
+C-level arguments. The <i class="arg">body</i> has to perform everything
+(i.e. argument extraction, checking, result return, and of course the
+actual functionality) by itself.</p>
+<p>For this the <i class="arg">body</i> has access to</p>
+<dl class="doctools_definitions">
+<dt><b class="variable">class</b></dt>
+<dd><p>Pointer to the class structure.</p></dd>
+<dt><b class="variable">interp</b></dt>
+<dd><p>Pointer to the Tcl interpreter (Tcl_Interp*) the
+class structure is associated with</p></dd>
+<dt><b class="variable">objc</b></dt>
+<dd><p>The number of method arguments.</p></dd>
+<dt><b class="variable">objv</b></dt>
+<dd><p>The method arguments, as C array of Tcl_Obj pointers.</p></dd>
+</dl>
+<p>The <i class="arg">arguments</i> of the definition are only a human readable form
+of the method arguments and syntax and are not used in the C code,
+except as comments put into the generated code. Again, it is the
+responsibility of the <i class="arg">body</i> to check the number of arguments,
+extract them, check their types, etc.</p></dd>
+<dt><a name="11"><b class="cmd">classmethod</b> <i class="arg">name</i> <b class="method">proc</b> <i class="arg">arguments</i> <i class="arg">resulttype</i> <i class="arg">body</i></a></dt>
+<dd><p>This command specifies a class method and the C code block
+implementing its functionality.  This is the second of three forms. The
+method is specified like a <b class="cmd">critcl::cproc</b>.
+Contrary to the first variant here the <i class="arg">arguments</i> are computer
+readable, expected to be in the same format as the <i class="arg">arguments</i> of
+<b class="cmd">critcl::cproc</b>. The same is true for the <i class="arg">resulttype</i>.
+The system automatically generates a wrapper doing argument checking
+and conversion, and result conversion, like for <b class="cmd">critcl::cproc</b>.</p>
+<p>The <i class="arg">body</i> has access to</p>
+<dl class="doctools_definitions">
+<dt><b class="variable">class</b></dt>
+<dd><p>Pointer to the class structure.</p></dd>
+<dt><b class="variable">interp</b></dt>
+<dd><p>Pointer to the Tcl interpreter (Tcl_Interp*) the
+class structure is associated with</p></dd>
+<dt>...</dt>
+<dd><p>All <i class="arg">arguments</i> under their specified names and C types
+as per their definition.</p></dd>
+</dl></dd>
+<dt><a name="12"><b class="cmd">classmethod</b> <i class="arg">name</i> <b class="method">as</b> <i class="arg">funname</i> <span class="opt">?<i class="arg">arg</i>...?</span></a></dt>
+<dd><p>This command specifies a class method and the C code block
+implementing its functionality. This is the third and last of three
+forms.</p>
+<p>The class method is implemented by the external function
+<i class="arg">funname</i>, i.e. a function which is declared outside of the class
+code itself, or in a <b class="cmd">support</b> block.</p>
+<p>It is assumed that the first four arguments of that function
+represent the parameters</p>
+<dl class="doctools_definitions">
+<dt><b class="variable">class</b></dt>
+<dd><p>Pointer to the class structure.</p></dd>
+<dt><b class="variable">interp</b></dt>
+<dd><p>Pointer to the Tcl interpreter (Tcl_Interp*) the
+class structure is associated with</p></dd>
+<dt><b class="variable">objc</b></dt>
+<dd><p>The number of method arguments.</p></dd>
+<dt><b class="variable">objv</b></dt>
+<dd><p>The method arguments, as C array of Tcl_Obj pointers.</p></dd>
+</dl>
+<p>Any additional arguments specified will be added after these and are
+passed into the C code as is, i.e. are considered to be C expressions.</p></dd>
+</dl>
+</div>
+<div id="subsection5" class="doctools_subsection"><h3><a name="subsection5">Instance variables and methods</a></h3>
+<dl class="doctools_definitions">
+<dt><a name="13"><b class="cmd">insvariable</b> <i class="arg">ctype</i> <i class="arg">name</i> <span class="opt">?<i class="arg">comment</i>?</span> <span class="opt">?<i class="arg">constructor</i>?</span> <span class="opt">?<i class="arg">destructor</i>?</span></a></dt>
+<dd><p>This command specifies a field in the instance structure of the class.
+Multiple fields can be specified, and are saved in the order
+specified.</p>
+<p><em>Attention:</em> Specification of an instance variable
+precludes the use of an external C <b class="cmd">type</b> for the instance
+structure.</p>
+<p><em>Attention:</em> Specification of an instance variable
+automatically causes the definition of an instance variable of type
+<b class="const">Tcl_Command</b>, and named <b class="const">cmd</b>, holding the token of the
+instance command, and the definition of an instance method named
+<b class="const">destroy</b>. This implicit instance variable is managed by the
+system.</p>
+<p>Beyond the basic <i class="arg">name</i> and C type of the new variable the
+definition may also contain a <i class="arg">comment</i> describing it, and C code
+blocks to initialize and release the variable.
+These are effectively local forms of the commands <b class="cmd">constructor</b>
+and <b class="cmd">destructor</b>. Please read their descriptions for details
+regarding the C environment available to the code.</p>
+<p>The comment, if specified will be embedded into the generated C
+code for easier cross-referencing from generated &quot;<b class="file">.c</b>&quot; file to
+class specification.</p></dd>
+<dt><a name="14"><b class="cmd">method</b> <i class="arg">name</i> <b class="method">command</b> <i class="arg">arguments</i> <i class="arg">body</i></a></dt>
+<dd><p>This command specifies an instance method and the C code block
+implementing its functionality. This is the first of three forms. The
+method is specified like a <b class="cmd">critcl::ccommand</b>, with a fixed set of
+C-level arguments. The <i class="arg">body</i> has to perform everything
+(i.e. argument extraction, checking, result return, and of course the
+actual functionality) by itself.</p>
+<p>For this the <i class="arg">body</i> has access to</p>
+<dl class="doctools_definitions">
+<dt><b class="variable">instance</b></dt>
+<dd><p>Pointer to the instance structure.</p></dd>
+<dt><b class="variable">interp</b></dt>
+<dd><p>Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure is associated with</p></dd>
+<dt><b class="variable">objc</b></dt>
+<dd><p>The number of method arguments.</p></dd>
+<dt><b class="variable">objv</b></dt>
+<dd><p>The method arguments, as C array of Tcl_Obj pointers.</p></dd>
+</dl>
+<p>The <i class="arg">arguments</i> of the definition are only a human readable form
+of the method arguments and syntax and are not used in the C code,
+except as comments put into the generated code. Again, it is the
+responsibility of the <i class="arg">body</i> to check the number of arguments,
+extract them, check their types, etc.</p></dd>
+<dt><a name="15"><b class="cmd">method</b> <i class="arg">name</i> <b class="method">proc</b> <i class="arg">arguments</i> <i class="arg">resulttype</i> <i class="arg">body</i></a></dt>
+<dd><p>This command specifies an instance method and the C code block
+implementing its functionality.  This is the second of three
+forms. The method is specified like a <b class="cmd">critcl::cproc</b>.
+Contrary to the first variant here the <i class="arg">arguments</i> are computer
+readable, expected to be in the same format as the <i class="arg">arguments</i> of
+<b class="cmd">critcl::cproc</b>. The same is true for the <i class="arg">resulttype</i>.
+The system automatically generates a wrapper doing argument checking
+and conversion, and result conversion, like for <b class="cmd">critcl::cproc</b>.</p>
+<p>The <i class="arg">body</i> has access to</p>
+<dl class="doctools_definitions">
+<dt><b class="variable">instance</b></dt>
+<dd><p>Pointer to the instance structure.</p></dd>
+<dt><b class="variable">interp</b></dt>
+<dd><p>Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure is associated with</p></dd>
+<dt>...</dt>
+<dd><p>All <i class="arg">arguments</i> under their specified names and C types
+as per their definition.</p></dd>
+</dl></dd>
+<dt><a name="16"><b class="cmd">method</b> <i class="arg">name</i> <b class="method">as</b> <i class="arg">funname</i> <span class="opt">?<i class="arg">arg</i>...?</span></a></dt>
+<dd><p>This command specifies an instance method and the C code block
+implementing its functionality. This is the third and last of three
+forms.</p>
+<p>The instance method is implemented by the external function
+<i class="arg">funname</i>, i.e. a function which is declared outside of the instance
+code itself, or in a <b class="cmd">support</b> block.</p>
+<p>It is assumed that the first four arguments of that function
+represent the parameters</p>
+<dl class="doctools_definitions">
+<dt><b class="variable">instance</b></dt>
+<dd><p>Pointer to the instance structure.</p></dd>
+<dt><b class="variable">interp</b></dt>
+<dd><p>Pointer to the Tcl interpreter (Tcl_Interp*) the
+instance structure is associated with</p></dd>
+<dt><b class="variable">objc</b></dt>
+<dd><p>The number of method arguments.</p></dd>
+<dt><b class="variable">objv</b></dt>
+<dd><p>The method arguments, as C array of Tcl_Obj pointers.</p></dd>
+</dl>
+<p>Any additional arguments specified will be added after these and are
+passed into the C code as is, i.e. are considered to be C expressions.</p></dd>
+<dt><a name="17"><b class="cmd">method_introspection</b></a></dt>
+<dd><p>This command generates one class- and one instance-method both of
+which will return a list of the instance methods of the class, and
+supporting structures, like the function to compute the information,
+and a class variable caching it.</p>
+<p>The two methods and the class variable are all named
+<b class="const">methods</b>.</p></dd>
+</dl>
+</div>
+<div id="subsection6" class="doctools_subsection"><h3><a name="subsection6">Context dependent interactions</a></h3>
+<p>This section documents the various interactions between the
+specification commands. While these are are all documented with the
+individual commands here they are pulled together to see at a glance.</p>
+<ol class="doctools_enumerated">
+<li><p>If you are using the command <b class="cmd">type</b> to specify an external
+	C type to use for the instance structure you are subject to
+	the following constraints and rules:</p>
+<ol class="doctools_enumerated">
+<li><p>You cannot define your own instance variables.</p></li>
+<li><p>You cannot define your own class variables.</p></li>
+<li><p>You cannot use <b class="cmd">method_introspection</b>.</p></li>
+<li><p>You have to allocate and release the instance structure on your
+	own, through <b class="cmd">constructor</b> and <b class="cmd">destructor</b> code blocks.</p></li>
+</ol>
+</li>
+<li><p>If you declare class variables you are subject to the
+	following constraints and rules:</p>
+<ol class="doctools_enumerated">
+<li><p>You cannot use <b class="cmd">type</b>.</p></li>
+<li><p>The system generates an instance variable <b class="const">class</b> for
+	you, which points from instance to class structure. This makes
+	you also subject to the rules below, for instance variables.</p></li>
+</ol>
+</li>
+<li><p>If you declare instance variables (possibly automatic, see
+	above) you are subject to following constraints and rules:</p>
+<ol class="doctools_enumerated">
+<li><p>You cannot use <b class="cmd">type</b>.</p></li>
+<li><p>The system generates and manages an instance variable
+	<b class="const">cmd</b> for you, which holds the Tcl_Command token
+	of the instance command.</p></li>
+<li><p>The system generates an instance method <b class="const">destroy</b> for
+	you.</p></li>
+<li><p>The system manages allocation and release of the instance
+	structure for you. You have to care only about the instance
+	variables themselves.</p></li>
+</ol>
+</li>
+</ol>
+</div>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Example</a></h2>
+<p>The example shown below is the specification of queue data structure,
+with most of the method implementations and support code omitted to
+keep the size down.</p>
+<p>The full implementation can be found in the directory
+&quot;<b class="file">examples/queue</b>&quot; of the critcl source distribution/repository.</p>
+<pre class="doctools_example">
+package require Tcl 8.6
+package require critcl 3.2
+critcl::buildrequirement {
+    package require critcl::class ; # DSL, easy spec of Tcl class/object commands.
+}
+critcl::cheaders util.h
+critcl::class::define ::queuec {
+    include util.h
+    insvariable Tcl_Obj* unget {
+	List object unget elements
+    } {
+	instance-&gt;unget = Tcl_NewListObj (0,NULL);
+	Tcl_IncrRefCount (instance-&gt;unget);
+    } {
+	Tcl_DecrRefCount (instance-&gt;unget);
+    }
+    insvariable Tcl_Obj* queue {
+	List object holding the main queue
+    } {
+	instance-&gt;queue = Tcl_NewListObj (0,NULL);
+	Tcl_IncrRefCount (instance-&gt;queue);
+    } {
+	Tcl_DecrRefCount (instance-&gt;queue);
+    }
+    insvariable Tcl_Obj* append {
+	List object holding new elements
+    } {
+	instance-&gt;append = Tcl_NewListObj (0,NULL);
+	Tcl_IncrRefCount (instance-&gt;append);
+    } {
+	Tcl_DecrRefCount (instance-&gt;append);
+    }
+    insvariable int at {
+	Index of next element to return from the main queue
+    } {
+	instance-&gt;at = 0;
+    }
+    support {... queue_peekget, queue_size, etc.}
+    method clear {} {...}
+    method destroy {...}
+    method get  as queue_peekget 1
+    method peek as queue_peekget 0
+    method put {item ...}
+    method size {} {
+	if ((objc != 2)) {
+	    Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	    return TCL_ERROR;
+	}
+	Tcl_SetObjResult (interp, Tcl_NewIntObj (queue_size (instance, NULL, NULL, NULL)));
+	return TCL_OK;
+    }
+    method unget {item} {...}
+}
+package provide queuec 1
+</pre>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Authors</a></h2>
+<p>Andreas Kupries</p>
+</div>
+<div id="section6" class="doctools_section"><h2><a name="section6">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report such at <a href="https://github.com/andreas-kupries/critcl">https://github.com/andreas-kupries/critcl</a>.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_class">C class</a>, <a href="../index.html#c_code">C code</a>, <a href="../index.html#c_instance">C instance</a>, <a href="../index.html#c_object">C object</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_cproc.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_cproc.html
new file mode 100644
index 00000000..f0045a0a
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_cproc.html
@@ -0,0 +1,1116 @@
+<!DOCTYPE html><html><head>
+<title>critcl_cproc_types - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_cproc.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; Jean-Claude Wippler   -- Copyright &amp;copy; Steve Landers   -- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl_cproc_types.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl_cproc_types(n) 3.2.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl_cproc_types - CriTcl cproc Type Reference</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#synopsis">Synopsis</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">Standard argument types</a></li>
+<li class="doctools_section"><a href="#section3">Standard result types</a></li>
+<li class="doctools_section"><a href="#section4">Advanced: Adding types</a></li>
+<li class="doctools_section"><a href="#section5">Examples</a>
+<ul>
+<li class="doctools_subsection"><a href="#subsection1">A Simple Procedure</a></li>
+<li class="doctools_subsection"><a href="#subsection2">More Builtin Types: Strings</a></li>
+<li class="doctools_subsection"><a href="#subsection3">Custom Types, Introduction</a></li>
+<li class="doctools_subsection"><a href="#subsection4">Custom Types, Semi-trivial</a></li>
+<li class="doctools_subsection"><a href="#subsection5">Custom Types, Support structures</a></li>
+<li class="doctools_subsection"><a href="#subsection6">Custom Types, Results</a></li>
+</ul>
+</li>
+<li class="doctools_section"><a href="#section6">Authors</a></li>
+<li class="doctools_section"><a href="#section7">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="synopsis" class="doctools_section"><h2><a name="synopsis">Synopsis</a></h2>
+<div class="doctools_synopsis">
+<ul class="doctools_requirements">
+<li>package require <b class="pkgname">Tcl 8.6</b></li>
+<li>package require <b class="pkgname">critcl <span class="opt">?3.2.1?</span></b></li>
+</ul>
+<ul class="doctools_syntax">
+<li><a href="#1"><b class="cmd">::critcl::has-resulttype</b> <i class="arg">name</i></a></li>
+<li><a href="#2"><b class="cmd">::critcl::resulttype</b> <i class="arg">name</i> <i class="arg">body</i> <span class="opt">?<i class="arg">ctype</i>?</span></a></li>
+<li><a href="#3"><b class="cmd">::critcl::resulttype</b> <i class="arg">name</i> <b class="method">=</b> <i class="arg">origname</i></a></li>
+<li><a href="#4"><b class="cmd">::critcl::has-argtype</b> <i class="arg">name</i></a></li>
+<li><a href="#5"><b class="cmd">::critcl::argtype</b> <i class="arg">name</i> <i class="arg">body</i> <span class="opt">?<i class="arg">ctype</i>?</span> <span class="opt">?<i class="arg">ctypefun</i>?</span></a></li>
+<li><a href="#6"><b class="cmd">::critcl::argtype</b> <i class="arg">name</i> <b class="method">=</b> <i class="arg">origname</i></a></li>
+<li><a href="#7"><b class="cmd">::critcl::argtypesupport</b> <i class="arg">name</i> <i class="arg">code</i> <span class="opt">?<i class="arg">guard</i>?</span></a></li>
+<li><a href="#8"><b class="cmd">::critcl::argtyperelease</b> <i class="arg">name</i> <i class="arg">code</i></a></li>
+</ul>
+</div>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This document is a breakout of the descriptions for the predefined argument- and result-types usable
+with the <b class="cmd">critcl::cproc</b> command, as detailed in the reference manpage for the <b class="package"><a href="critcl.html">critcl</a></b>
+package, plus the information on how to extend the predefined set with custom types. The breakout
+was made to make this information easier to find (toplevel document vs. having to search the large
+main reference).</p>
+<p>Its intended audience are developers wishing to write Tcl packages with embedded C code.</p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">Standard argument types</a></h2>
+<p>Before going into the details first a quick overview:</p>
+<pre class="doctools_example">
+CriTcl type      | C type         | Tcl type  | Notes
+---------------- | -------------- | --------- | ------------------------------
+Tcl_Interp*      | Tcl_Interp*    | n/a       | <em>Special</em>, only first
+---------------- | -------------- | --------- | ------------------------------
+Tcl_Obj*         | Tcl_Obj*       | Any       | <em>Read-only</em>
+object           |                |           | Alias of <b class="type">Tcl_Obj*</b> above
+list             | critcl_list    | List      | <em>Read-only</em>
+[], [*]          |                |           | Alias of <b class="type">list</b> above
+---------------- | -------------- | --------- | ------------------------------
+[N]              |                |           | Restricted <b class="type">list</b>-types.
+type[], type[N]  |                |           | Length-limited ([..]), expected
+[]type, [N]type  |                |           | element type, or both.
+                 |                |           |
+                 |                |           | Element types can be all known argument
+                 |                |           | types, except for any kind of list.
+                 |                |           | IOW multi-dimensional lists are not
+                 |                |           | supported.
+---------------- | -------------- | --------- | ------------------------------
+char*            | const char*    | Any       | <em>Read-only</em>, <em>string rep</em>
+pstring          | critcl_pstring | Any       | <em>Read-only</em>
+bytes            | critcl_bytes   | ByteArray | <em>Read-only</em>
+---------------- | -------------- | --------- | ------------------------------
+int              | int            | Int       |
+long             | long           | Long      |
+wideint          | Tcl_WideInt    | WideInt   |
+double           | double         | Double    |
+float            | float          | Double    |
+---------------- | -------------- | --------- | ------------------------------
+X &gt; N            |                |           | For X in <b class="type">int</b> ... <b class="type">float</b> above.
+X &gt;= N           |                |           | The C types are as per the base type X.
+X &lt; N            |                |           | N, A, B are expected to be constant integer
+X &lt;= N           |                |           | numbers for types <b class="type">int</b>, <b class="type">long</b>,
+X &gt; A &lt; B        |                |           | and <b class="type">wideint</b>. For types <b class="type">double</b>
+etc.             |                |           | and <b class="type">float</b> the N, A, and B can be floating
+                 |                |           | point numbers. Multiple restrictions are
+                 |                |           | fused as much as possible to yield at most
+                 |                |           | both upper and lower limits.
+---------------- | -------------- | --------- | ------------------------------
+boolean          | int            | Boolean   |
+bool             |                |           | Alias of <b class="type">boolean</b> above
+---------------- | -------------- | --------- | ------------------------------
+channel          | Tcl_Channel    | String    | Assumed to be registered
+unshared-channel | Tcl_Channel    | String    | As above, limited to current interpreter
+take-channel     | Tcl_Channel    | String    | As above, C code takes ownership
+</pre>
+<p>And now the details:</p>
+<dl class="doctools_definitions">
+<dt>Tcl_Interp*</dt>
+<dd><p><em>Attention</em>: This is a <em>special</em> argument type. It can
+<em>only</em> be used by the <em>first</em> argument of a function.
+Any other argument using it will cause critcl to throw an error.</p>
+<p>When used, the argument will contain a reference to the current
+interpreter that the function body may use. Furthermore the argument
+will <em>not</em> be an argument of the Tcl command for the function.</p>
+<p>This is useful when the function has to do more than simply
+returning a value. Examples would be setting up error messages on
+failure, or querying the interpreter for variables and other data.</p></dd>
+<dt>Tcl_Obj*</dt>
+<dd></dd>
+<dt>object</dt>
+<dd><p>The function takes an argument of type <b class="type">Tcl_Obj*</b>.
+No argument checking is done.
+The Tcl level word is passed to the argument as-is.
+Note that this value must be treated as <em>read-only</em> (except for
+hidden changes to its intrep, i.e. <i class="term">shimmering</i>).</p></dd>
+<dt>pstring</dt>
+<dd><p>The function takes an argument of type <b class="type">critcl_pstring</b>
+containing the original <b class="type">Tcl_Obj*</b> reference of the Tcl argument,
+plus the length of the string and a pointer to the character array.</p>
+<pre class="doctools_example">
+typedef struct critcl_pstring {
+    Tcl_Obj*    o;
+    const char* s;
+    int         len;
+} critcl_pstring;
+</pre>
+<p>Note the <em>const</em>. The string is <em>read-only</em>. Any
+modification can have arbitrary effects, from pulling out the rug
+under the script because of string value and internal representation
+not matching anymore, up to crashes anytime later.</p></dd>
+<dt>list</dt>
+<dd></dd>
+<dt>[]</dt>
+<dd></dd>
+<dt>[*]</dt>
+<dd><p>The function takes an argument of type <b class="type">critcl_list</b> containing the original <b class="type">Tcl_Obj*</b>
+reference of the Tcl argument, plus the length of the Tcl list and a pointer to the array of the
+list elements.</p>
+<pre class="doctools_example">
+typedef struct critcl_list {
+    Tcl_Obj*        o;
+    Tcl_Obj* const* v;
+    int             c;
+} critcl_list;
+</pre>
+<p>The Tcl argument must be convertible to <b class="type">List</b>, an error is thrown otherwise.</p>
+<p>Note the <em>const</em>. The list is <em>read-only</em>.  Any modification can have arbitrary
+effects, from pulling out the rug under the script because of string value and internal
+representation not matching anymore, up to crashes anytime later.</p>
+<p>Further note that the system understands a number of more complex syntactical forms which all
+translate into forms of lists under the hood, as described by the following points.</p></dd>
+<dt>[N]</dt>
+<dd><p>A <i class="term">list</i> type with additional checks limiting the length to <b class="const">N</b>, an integer
+number greater than zero.</p></dd>
+<dt>[]type</dt>
+<dd></dd>
+<dt>type[]</dt>
+<dd><p>A <i class="term">list</i> type whose elements all have to be convertible for <i class="term">type</i>. All known
+types, including user-defined, are allowed, except for <b class="type">list</b> and derivates. In other
+words, multi-dimensional lists are not supported.</p>
+<p>The function will take a structure argument of the general form</p>
+<pre class="doctools_example">
+typedef struct critcl_list_... {
+    Tcl_Obj* o;
+    int      c;
+    (Ctype)* v;
+} critcl_list_...;
+</pre>
+<p>where <b class="const">(Ctype)</b> represents the C type for values of type <b class="type">type</b>.</p></dd>
+<dt>[N]type</dt>
+<dd></dd>
+<dt>type[N]</dt>
+<dd><p>These are <b class="type">list</b> types combining the elements of</p>
+<pre class="doctools_example">[N]</pre>
+<p>and</p>
+<pre class="doctools_example">[]type</pre>
+<p>.</p>
+<p>As an example, the specification of</p>
+<pre class="doctools_example">int[3] a</pre>
+<p>describes argument <i class="arg">a</i>
+as a list of exactly 3 elements, all of which have to be of type <b class="type">int</b>.</p>
+<p>Note that this example can also be written in the more C-like form of</p>
+<pre class="doctools_example">int a[3]</pre>
+<p>. The system will translate this internally to the first shown form.</p></dd>
+<dt>bytes</dt>
+<dd><p>This is the <em>new</em> and usable <b class="type">ByteArray</b> type.</p>
+<p>The function takes an argument of type <b class="type">critcl_bytes</b>
+containing the original <b class="type">Tcl_Obj*</b> reference of the Tcl argument,
+plus the length of the byte array and a pointer to the byte data.</p>
+<pre class="doctools_example">
+typedef struct critcl_bytes {
+    Tcl_Obj*             o;
+    const unsigned char* s;
+    int                len;
+} critcl_list;
+</pre>
+<p>The Tcl argument must be convertible to <b class="type">ByteArray</b>, an error is
+thrown otherwise.</p>
+<p>Note the <em>const</em>. The bytes are <em>read-only</em>.  Any
+modification can have arbitrary effects, from pulling out the rug
+under the script because of string value and internal representation
+not matching anymore, up to crashes anytime later.</p></dd>
+<dt>char*</dt>
+<dd><p>The function takes an argument of type <b class="type">const char*</b>.
+The string representation of the Tcl argument is passed in.</p>
+<p>Note the <em>const</em>. The string is <em>read-only</em>. Any
+modification can have arbitrary effects, from pulling out the rug
+under the script because of string value and internal representation
+not matching anymore, up to crashes anytime later.</p></dd>
+<dt>double</dt>
+<dd><p>The function takes an argument of type <b class="type">double</b>.
+The Tcl argument must be convertible to <b class="type">Double</b>, an error is thrown otherwise.</p></dd>
+<dt>double &gt; N</dt>
+<dd></dd>
+<dt>double &gt;= N</dt>
+<dd></dd>
+<dt>double &lt; N</dt>
+<dd></dd>
+<dt>double &lt;= N</dt>
+<dd><p>These are variants of <i class="term">double</i> above, restricting the argument value to the shown relation.
+An error is thrown for Tcl arguments outside of the specified range.</p>
+<p>The limiter <i class="arg">N</i> has to be a constant floating point value.</p>
+<p>It is possible to use multiple limiters.
+For example <i class="term">double &gt; A &gt; B &lt;= C</i>.
+The system will fuse them to a single upper/lower limit (or both).</p>
+<p>The system will reject limits describing an empty range of values, or a range containing only
+a single value.</p></dd>
+<dt>float</dt>
+<dd><p>The function takes an argument of type <b class="type">float</b>.
+The Tcl argument must be convertible to <b class="type">Double</b>, an error is thrown otherwise.</p></dd>
+<dt>float &gt; N</dt>
+<dd></dd>
+<dt>float &gt;= N</dt>
+<dd></dd>
+<dt>float &lt; N</dt>
+<dd></dd>
+<dt>float &lt;= N</dt>
+<dd><p>These are variants of <i class="term">float</i> above, restricting the argument value to the shown relation.
+An error is thrown for Tcl arguments outside of the specified range.</p>
+<p>The limiter <i class="arg">N</i> has to be a constant floating point value.</p>
+<p>It is possible to use multiple limiters.
+For example <i class="term">float &gt; A &gt; B &lt;= C</i>.
+The system will fuse them to a single upper/lower limit (or both).</p>
+<p>The system will reject limits describing an empty range of values, or a range containing only
+a single value.</p></dd>
+<dt>boolean</dt>
+<dd></dd>
+<dt>bool</dt>
+<dd><p>The function takes an argument of type <b class="type">int</b>.
+The Tcl argument must be convertible to <b class="type">Boolean</b>, an error is
+thrown otherwise.</p></dd>
+<dt>channel</dt>
+<dd><p>The function takes an argument of type <b class="type">Tcl_Channel</b>.
+The Tcl argument must be convertible to type <b class="type">Channel</b>, an error
+is thrown otherwise.
+The channel is further assumed to be <em>already registered</em>
+with the interpreter.</p></dd>
+<dt>unshared-channel</dt>
+<dd><p>This type is an extension of <b class="type">channel</b> above.
+All of the information above applies.</p>
+<p>Beyond that the channel must not be shared by multiple
+interpreters, an error is thrown otherwise.</p></dd>
+<dt>take-channel</dt>
+<dd><p>This type is an extension of <b class="type">unshared-channel</b> above.
+All of the information above applies.</p>
+<p>Beyond that the code removes the channel from the current
+interpreter without closing it, and disables all pre-existing event
+handling for it.</p>
+<p>With this the function takes full ownership of the channel in
+question, taking it away from the interpreter invoking it. It is then
+responsible for the lifecycle of the channel, up to and including
+closing it.</p>
+<p>Should the system the function is a part of wish to return
+control of the channel back to the interpeter it then has to use the
+result type <b class="type">return-channel</b>. This will undo the registration
+changes made by this argument type.
+<em>Note</em> however that the removal of pre-existing event handling
+done here cannot be undone.</p>
+<p><em>Attention</em> Removal from the interpreter without closing
+the channel is effected by incrementing the channel's reference count
+without providing an interpreter, before decrementing the same for the
+current interpreter. This leaves the overall reference count intact
+without causing Tcl to close it when it is removed from the
+interpreter structures. At this point the channel is effectively a
+globally-owned part of the system not associated with any interpreter.</p>
+<p>The complementary result type then runs this sequence in
+reverse. And if the channel is never returned to Tcl either the
+function or the system it is a part of have to unregister the global
+reference when they are done with it.</p></dd>
+<dt>int</dt>
+<dd><p>The function takes an argument of type <b class="type">int</b>.
+The Tcl argument must be convertible to <b class="type">Int</b>, an error is thrown otherwise.</p></dd>
+<dt>int &gt; N</dt>
+<dd></dd>
+<dt>int &gt;= N</dt>
+<dd></dd>
+<dt>int &lt; N</dt>
+<dd></dd>
+<dt>int &lt;= N</dt>
+<dd><p>These are variants of <i class="term">int</i> above, restricting the argument value to the shown
+relation.
+An error is thrown for Tcl arguments outside of the specified range.</p>
+<p>The limiter <i class="arg">N</i> has to be a constant integer value.</p>
+<p>It is possible to use multiple limiters.
+For example <i class="term">int &gt; A &gt; B &lt;= C</i>.
+The system will fuse them to a single upper/lower limit (or both).</p>
+<p>The system will reject limits describing an empty range of values, or a range
+containing only a single value.</p></dd>
+<dt>long</dt>
+<dd><p>The function takes an argument of type <b class="type">long int</b>.
+The Tcl argument must be convertible to <b class="type">Long</b>, an error is thrown otherwise.</p></dd>
+<dt>long &gt; N</dt>
+<dd></dd>
+<dt>long &gt;= N</dt>
+<dd></dd>
+<dt>long &lt; N</dt>
+<dd></dd>
+<dt>long &lt;= N</dt>
+<dd><p>These are variants of <i class="term">long</i> above, restricting the argument value to the shown
+relation.
+An error is thrown for Tcl arguments outside of the specified range.</p>
+<p>The limiter <i class="arg">N</i> has to be a constant integer value.</p>
+<p>It is possible to use multiple limiters.
+For example <i class="term">long &gt; A &gt; B &lt;= C</i>.
+The system will fuse them to a single upper/lower limit (or both).</p>
+<p>The system will reject limits describing an empty range of values, or a range
+containing only a single value.</p></dd>
+<dt>wideint</dt>
+<dd><p>The function takes an argument of type <b class="type">Tcl_WideInt</b>.
+The Tcl argument must be convertible to <b class="type">WideInt</b>, an error is thrown otherwise.</p></dd>
+<dt>wideint &gt; N</dt>
+<dd></dd>
+<dt>wideint &gt;= N</dt>
+<dd></dd>
+<dt>wideint &lt; N</dt>
+<dd></dd>
+<dt>wideint &lt;= N</dt>
+<dd><p>These are variants of <i class="term">wideint</i> above, restricting the argument value to the shown
+relation.
+An error is thrown for Tcl arguments outside of the specified range.</p>
+<p>The limiter <i class="arg">N</i> has to be a constant integer value.</p>
+<p>It is possible to use multiple limiters.
+For example <i class="term">wideint &gt; A &gt; B &lt;= C</i>.
+The system will fuse them to a single upper/lower limit (or both).</p>
+<p>The system will reject limits describing an empty range of values, or a range
+containing only a single value.</p></dd>
+<dt>void*</dt>
+<dd></dd>
+</dl>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Standard result types</a></h2>
+<p>Before going into the details first a quick overview:</p>
+<pre class="doctools_example">
+CriTcl type    | C type         | Tcl type  | Notes
+-------------- | -------------- | --------- | ------------------------------
+void           | n/a            | n/a       | Always OK. Body sets result
+ok             | int            | n/a       | Result code. Body sets result
+-------------- | -------------- | --------- | ------------------------------
+int            | int            | Int       |
+boolean        |                |           | Alias of <b class="type">int</b> above
+bool           |                |           | Alias of <b class="type">int</b> above
+long           | long           | Long      |
+wideint        | Tcl_WideInt    | WideInt   |
+double         | double         | Double    |
+float          | float          | Double    |
+-------------- | -------------- | --------- | ------------------------------
+char*          | char*          | String    | <em>Makes a copy</em>
+vstring        |                |           | Alias of <b class="type">char*</b> above
+const char*    | const char*    |           | Behavior of <b class="type">char*</b> above
+-------------- | -------------- | --------- | ------------------------------
+string         |                | String    | Freeable string set directly
+               |                |           | <em>No copy is made</em>
+dstring        |                |           | Alias of <b class="type">string</b> above
+-------------- | -------------- | --------- | ------------------------------
+               |                |           | For all below: Null is ERROR
+               |                |           | Body has to set any message
+Tcl_Obj*       | Tcl_Obj*       | Any       | <em>refcount --</em>
+object         |                |           | Alias of <b class="type">Tcl_Obj*</b> above
+Tcl_Obj*0      |                | Any       | <em>refcount unchanged</em>
+object0        |                |           | Alias of <b class="type">Tcl_Obj*0</b> above
+-------------- | -------------- | --------- | ------------------------------
+known-channel  | Tcl_Channel    | String    | Assumes to already be registered
+new-channel    | Tcl_Channel    | String    | New channel, will be registered
+return-channel | Tcl_Channel    | String    | Inversion of take-channel
+</pre>
+<p>And now the details:</p>
+<dl class="doctools_definitions">
+<dt>Tcl_Obj*</dt>
+<dd></dd>
+<dt>object</dt>
+<dd><p>If the returned <b class="type">Tcl_Obj*</b> is <b class="const">NULL</b>, the Tcl return code
+is <b class="const">TCL_ERROR</b> and the function should <a href="https://www.tcl-lang.org/man/tcl/TclLib/SetResult.htm">set an error mesage</a>
+as the interpreter result.  Otherwise, the returned <b class="type">Tcl_Obj*</b> is
+set as the interpreter result.</p>
+<p>Note that setting an error message requires the function body
+to have access to the interpreter the function is running in. See the
+argument type <b class="type">Tcl_Interp*</b> for the details on how to make that
+happen.</p>
+<p>Note further that the returned <b class="type">Tcl_Obj*</b> should have a
+reference count greater than <b class="const">0</b>. This is because the converter
+decrements the reference count to release possession after setting the
+interpreter result. It assumes that the function incremented the
+reference count of the returned <b class="type">Tcl_Obj*</b>.
+If a <b class="type">Tcl_Obj*</b> with a reference count of <b class="const">0</b> were
+returned, the reference count would become <b class="const">1</b> when set as the
+interpreter result, and immediately thereafter be decremented to
+<b class="const">0</b> again, causing the memory to be freed.  The system is then
+likely to crash at some point after the return due to reuse of the
+freed memory.</p></dd>
+<dt>Tcl_Obj*0</dt>
+<dd></dd>
+<dt>object0</dt>
+<dd><p>Like <b class="const">Tcl_Obj*</b> except that this conversion assumes that the
+returned value has a reference count of <b class="const">0</b> and
+<em>does not</em> decrement it. Returning a value whose reference
+count is greater than <b class="const">0</b> is therefore likely to cause a memory
+leak.</p>
+<p>Note that setting an error message requires the function body
+to have access to the interpreter the function is running in. See the
+argument type <b class="type">Tcl_Interp*</b> for the details on how to make that
+happen.</p></dd>
+<dt>new-channel</dt>
+<dd><p>A <b class="type">String</b> Tcl_Obj holding the name of the returned
+<b class="type">Tcl_Channel</b> is set as the interpreter result.
+The channel is further assumed to be <em>new</em>, and therefore
+registered with the interpreter to make it known.</p></dd>
+<dt>known-channel</dt>
+<dd><p>A <b class="type">String</b> Tcl_Obj holding the name of the returned
+<b class="type">Tcl_Channel</b> is set as the interpreter result.
+The channel is further assumed to be <em>already registered</em>
+with the interpreter.</p></dd>
+<dt>return-channel</dt>
+<dd><p>This type is a variant of <b class="type">new-channel</b> above.
+It varies slightly from it in the registration sequence to be properly
+complementary to the argument type <b class="type">take-channel</b>.
+A <b class="type">String</b> Tcl_Obj holding the name of the returned
+<b class="type">Tcl_Channel</b> is set as the interpreter result.
+The channel is further assumed to be <em>new</em>, and therefore
+registered with the interpreter to make it known.</p></dd>
+<dt>char*</dt>
+<dd></dd>
+<dt>vstring</dt>
+<dd><p>A <b class="type">String</b> Tcl_Obj holding a <em>copy</em> of the returned
+<b class="type">char*</b> is set as the interpreter result. If the value is
+allocated then the function itself and the extension it is a part of
+are responsible for releasing the memory when the data is not in use
+any longer.</p></dd>
+<dt>const char*</dt>
+<dd><p>Like <b class="const">char*</b> above, except that the returned string is
+<b class="const">const</b>-qualified.</p></dd>
+<dt>string</dt>
+<dd></dd>
+<dt>dstring</dt>
+<dd><p>The returned <b class="type">char*</b> is directly set as the interpreter result
+<em>without making a copy</em>.  Therefore it must be dynamically
+allocated via <b class="function">Tcl_Alloc</b>. Release happens automatically when the
+Interpreter finds that the value is not required any longer.</p></dd>
+<dt>double</dt>
+<dd></dd>
+<dt>float</dt>
+<dd><p>The returned <b class="type">double</b> or <b class="type">float</b> is converted to a <b class="type">Double</b>
+Tcl_Obj and set as the interpreter result.</p></dd>
+<dt>boolean</dt>
+<dd></dd>
+<dt>bool</dt>
+<dd><p>The returned <b class="type">int</b> value is converted to an <b class="type">Int</b> Tcl_Obj and set as
+the interpreter result.</p></dd>
+<dt>int</dt>
+<dd><p>The returned <b class="type">int</b> value is converted to an <b class="type">Int</b> Tcl_Obj and set as
+the interpreter result.</p></dd>
+<dt>long</dt>
+<dd><p>The returned <b class="type">long int</b> value is converted to a <b class="type">Long</b> Tcl_Obj and
+set as the interpreter result.</p></dd>
+<dt>wideint</dt>
+<dd><p>The returned <b class="type">Tcl_WideInt</b> value is converted to a <b class="type">WideInt</b> Tcl_Obj
+and set as the interpreter result.</p></dd>
+<dt>ok</dt>
+<dd><p>The returned <b class="type">int</b> value becomes the Tcl return code.
+The interpreter result is left untouched and can be set by the
+function if desired. Note that doing this requires the function body
+to have access to the interpreter the function is running in. See the
+argument type <b class="type">Tcl_Interp*</b> for the details on how to make that
+happen.</p></dd>
+<dt>void</dt>
+<dd><p>The function does not return a value.
+The interpreter result is left untouched and can be set by the function if
+desired.</p></dd>
+</dl>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Advanced: Adding types</a></h2>
+<p>While the <b class="cmd">critcl::cproc</b> command understands the most common C
+types (as per the previous 2 sections), sometimes this is not enough.</p>
+<p>To get around this limitation the commands in this section
+enable users of <b class="package"><a href="critcl.html">critcl</a></b> to extend the set of argument and
+result types understood by <b class="cmd">critcl::cproc</b>. In other words, they
+allow them to define their own, custom, types.</p>
+<dl class="doctools_definitions">
+<dt><a name="1"><b class="cmd">::critcl::has-resulttype</b> <i class="arg">name</i></a></dt>
+<dd><p>This command tests if the named result-type is known or not.
+It returns a boolean value, <b class="const">true</b> if the type is known and
+<b class="const">false</b> otherwise.</p></dd>
+<dt><a name="2"><b class="cmd">::critcl::resulttype</b> <i class="arg">name</i> <i class="arg">body</i> <span class="opt">?<i class="arg">ctype</i>?</span></a></dt>
+<dd><p>This command defines the result type <i class="arg">name</i>, and associates it
+with the C code doing the conversion (<i class="arg">body</i>) from C to Tcl.
+The C return type of the associated function, also the C type of the
+result variable, is <i class="arg">ctype</i>. This type defaults to <i class="arg">name</i> if
+it is not specified.</p>
+<p>If <i class="arg">name</i> is already declared an error is thrown.
+<em>Attention!</em> The standard result type <b class="const">void</b> is special as
+it has no accompanying result variable. This cannot be expressed
+by this extension command.</p>
+<p>The <i class="arg">body</i>'s responsibility is the conversion of the
+functions result into a Tcl result and a Tcl status. The first has to
+be set into the interpreter we are in, and the second has to be
+returned.</p>
+<p>The C code of <i class="arg">body</i> is guaranteed to be called last in the
+wrapper around the actual implementation of the <b class="cmd">cproc</b> in
+question and has access to the following environment:</p>
+<dl class="doctools_definitions">
+<dt><b class="variable">interp</b></dt>
+<dd><p>A Tcl_Interp* typed C variable referencing the
+                   interpreter the result has to be stored into.</p></dd>
+<dt><b class="variable">rv</b></dt>
+<dd><p>The C variable holding the result to convert, of type
+               <i class="arg">ctype</i>.</p></dd>
+</dl>
+<p>As examples here are the definitions of two standard result types:</p>
+<pre class="doctools_example">
+    resulttype int {
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return TCL_OK;
+    }
+    resulttype ok {
+	/* interp result must be set by cproc body */
+	return rv;
+    } int
+</pre>
+</dd>
+<dt><a name="3"><b class="cmd">::critcl::resulttype</b> <i class="arg">name</i> <b class="method">=</b> <i class="arg">origname</i></a></dt>
+<dd><p>This form of the <b class="cmd">resulttype</b> command declares <i class="arg">name</i> as an
+alias of result type <i class="arg">origname</i>, which has to be defined
+already. If this is not the case an error is thrown.</p></dd>
+<dt><a name="4"><b class="cmd">::critcl::has-argtype</b> <i class="arg">name</i></a></dt>
+<dd><p>This command tests if the named argument-type is known or not.
+It returns a boolean value, <b class="const">true</b> if the type is known and
+<b class="const">false</b> otherwise.</p></dd>
+<dt><a name="5"><b class="cmd">::critcl::argtype</b> <i class="arg">name</i> <i class="arg">body</i> <span class="opt">?<i class="arg">ctype</i>?</span> <span class="opt">?<i class="arg">ctypefun</i>?</span></a></dt>
+<dd><p>This command defines the argument type <i class="arg">name</i>, and associates it
+with the C code doing the conversion (<i class="arg">body</i>) from Tcl to C.
+<i class="arg">ctype</i> is the C type of the variable to hold the conversion result
+and <i class="arg">ctypefun</i> is the type of the function argument itself.
+Both types default to <i class="arg">name</i> if they are the empty string or are not
+provided.</p>
+<p>If <i class="arg">name</i> is already declared an error is thrown.</p>
+<p><i class="arg">body</i> is a C code fragment that converts a Tcl_Obj* into a
+C value which is stored in a helper variable in the underlying function.</p>
+<p><i class="arg">body</i> is called inside its own code block to isolate local
+variables, and the following items are in scope:</p>
+<dl class="doctools_definitions">
+<dt><b class="variable">interp</b></dt>
+<dd><p>A variable of type <b class="const">Tcl_Interp*</b> which is the
+                   interpreter the code is running in.</p></dd>
+<dt><b class="const">@@</b></dt>
+<dd><p>A placeholder for an expression that evaluates to the
+                 <b class="const">Tcl_Obj*</b> to convert.</p></dd>
+<dt><b class="const">@A</b></dt>
+<dd><p>A placeholder for the name of the variable to store the
+     	    	 converted argument into.</p></dd>
+</dl>
+<p>As examples, here are the definitions of two standard argument types:</p>
+<pre class="doctools_example">
+    argtype int {
+	if (Tcl_GetIntFromObj(interp, @@, &amp;@A) != TCL_OK) return TCL_ERROR;
+    }
+    argtype float {
+	double t;
+	if (Tcl_GetDoubleFromObj(interp, @@, &amp;t) != TCL_OK) return TCL_ERROR;
+	@A = (float) t;
+    }
+</pre>
+</dd>
+<dt><a name="6"><b class="cmd">::critcl::argtype</b> <i class="arg">name</i> <b class="method">=</b> <i class="arg">origname</i></a></dt>
+<dd><p>This form of the <b class="cmd">argtype</b> command declares <i class="arg">name</i> as an alias
+of argument type <i class="arg">origname</i>, which has to be defined already. If
+this is not the case an error is thrown.</p></dd>
+<dt><a name="7"><b class="cmd">::critcl::argtypesupport</b> <i class="arg">name</i> <i class="arg">code</i> <span class="opt">?<i class="arg">guard</i>?</span></a></dt>
+<dd><p>This command defines a C code fragment for the already defined
+argument type <i class="arg">name</i> which is inserted before all functions
+using that type. Its purpose is the definition of any supporting C
+types needed by the argument type.
+If the type is used by many functions the system ensures that only the
+first of the multiple insertions of the code fragment is active, and
+the others disabled.
+The guard identifier is normally derived from <i class="arg">name</i>, but can also
+be set explicitly, via <i class="arg">guard</i>. This latter allows different
+custom types to share a common support structure without having to
+perform their own guarding.</p></dd>
+<dt><a name="8"><b class="cmd">::critcl::argtyperelease</b> <i class="arg">name</i> <i class="arg">code</i></a></dt>
+<dd><p>This command defines a C code fragment for the already defined
+argument type <i class="arg">name</i> which is inserted whenever the worker
+function of a <b class="cmd">critcl::cproc</b> returns to the shim. It is the
+responsibility of this fragment to unconditionally release any
+resources the <b class="cmd">critcl::argtype</b> conversion code allocated.
+An example of this are the <em>variadic</em> types for the support of
+the special, variadic <i class="arg">args</i> argument to <b class="cmd">critcl::cproc</b>'s.
+They allocate a C array for the collected arguments which has to be
+released when the worker returns. This command defines the C code
+for doing that.</p></dd>
+</dl>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Examples</a></h2>
+<p>The examples shown here have been drawn from the section &quot;Embedding C&quot; in the document about
+<i class="term">Using CriTcl</i>. Please see that document for many more examples.</p>
+<div id="subsection1" class="doctools_subsection"><h3><a name="subsection1">A Simple Procedure</a></h3>
+<p>Starting simple, let us assume that the Tcl code in question is
+something like</p>
+<pre class="doctools_example">
+    proc math {x y z} {
+        return [expr {(sin($x)*rand())/$y**log($z)}]
+    }
+</pre>
+<p>with the expression pretending to be something very complex and
+slow. Converting this to C we get:</p>
+<pre class="doctools_example">
+    critcl::cproc math {double x double y double z} double {
+        double up   = rand () * sin (x);
+        double down = pow(y, log (z));
+        return up/down;
+    }
+</pre>
+<p>Notable about this translation:</p>
+<ol class="doctools_enumerated">
+<li><p>All the arguments got type information added to them, here
+       &quot;double&quot;.  Like in C the type precedes the argument name. Other
+       than that it is pretty much a Tcl dictionary, with keys and
+       values swapped.</p></li>
+<li><p>We now also have to declare the type of the result, here
+       &quot;double&quot;, again.</p></li>
+<li><p>The reference manpage lists all the legal C types supported as
+       arguments and results.</p></li>
+</ol>
+<p>While the above example was based on type <b class="type">double</b> for
+both arguments and result we have a number of additional types in the
+same category, i.e. simple types. These are:</p>
+<pre class="doctools_example">
+CriTcl type | C type         | Tcl type  | Notes
+----------- | -------------- | --------- | ------------------------------
+bool        |                |           | Alias of <b class="type">boolean</b> below
+boolean     | int            | Boolean   |
+double      | double         | Double    |
+float       | float          | Double    |
+int         | int            | Int       |
+long        | long           | Long      |
+wideint     | Tcl_WideInt    | WideInt   |
+</pre>
+<p>A slightly advanced form of these simple types are a limited
+set of constraints on the argument value. Note that <b class="type">bool</b> and
+alias do not support this.</p>
+<pre class="doctools_example">
+    critcl::cproc sqrt {{double &gt;= 0} x} double {
+        return sqrt(x);
+    }
+</pre>
+<p>In the example above CriTcl's argument handling will reject
+calling the command with a negative number, without ever invoking the
+C code.</p>
+<p>These constraints are called <em>limited</em> because only
+<b class="const">0</b> and <b class="const">1</b> can be used as the borders, although all the
+operators <b class="const">&lt;</b>, <b class="const">&lt;=</b>, <b class="const">&gt;</b>, and <b class="const">&gt;=</b> are
+possible. It is also not possible to combine restrictions.</p>
+</div>
+<div id="subsection2" class="doctools_subsection"><h3><a name="subsection2">More Builtin Types: Strings</a></h3>
+<p>Given that &quot;Everything is a String&quot; is a slogan of Tcl the ability of <b class="cmd">cproc</b>s
+to receive strings as arguments, and return them as results is quite important.</p>
+<p>We actually have a variety of builtin string types, all alike, yet different.</p>
+<p>For arguments we have:</p>
+<pre class="doctools_example">
+CriTcl type | C type         | Tcl type  | Notes
+----------- | -------------- | --------- | ------------------------------
+char*       | const char*    | Any       | <em>Read-only</em>, <em>string rep</em>
+pstring     | critcl_pstring | Any       | <em>Read-only</em>
+bytes       | critcl_bytes   | ByteArray | <em>Read-only</em>
+</pre>
+<p>In C</p>
+<pre class="doctools_example">
+    critcl::cproc takeStrings {
+        char*   cstring
+	pstring pstring
+	bytes   barray
+    } void {
+        printf (&quot;len %d = %s\n&quot;, strlen(cstring), cstring);
+	printf (&quot;len %d = %s\n&quot;, pstring.len, pstring.s);
+	printf (&quot;len %d = %s\n&quot;, barray.len, barray.s);
+        return; // void result, no result
+    }
+</pre>
+<p>Notable about the above:</p>
+<ol class="doctools_enumerated">
+<li><p>The <b class="variable">cstring</b> is a plain <b class="type">const char*</b>. It <em>points directly</em>
+into the <b class="type">Tcl_Obj*</b> holding the argument in the script.</p></li>
+<li><p>The <b class="variable">pstring</b> is a slight extension to that. The value is actually a structure
+containing the string pointer like <b class="variable">cstring</b> (field <b class="const">.s</b>), the length of the
+string (field <b class="const">.len</b>), and a pointer to the <b class="type">Tcl_Obj*</b> these came from.</p></li>
+<li><p>The last, <b class="variable">barray</b> is like <b class="variable">pstring</b>, however it has ensured that the
+<b class="type">Tcl_Obj*</b> is a Tcl ByteArray, i.e. binary data.</p></li>
+</ol>
+<p>Treat all of them as <em>Read Only</em>. Do not modify ever.</p>
+<p>On the other side, string results, we have:</p>
+<pre class="doctools_example">
+CriTcl type   | C type         | Tcl type  | Notes
+------------- | -------------- | --------- | ------------------------------
+char*         | char*          | String    | <em>Makes a copy</em>
+vstring       |                |           | Alias of <b class="type">char*</b> above
+const char*   | const char*    |           | Behavior of <b class="type">char*</b> above
+------------- | -------------- | --------- | ------------------------------
+string        | char*          | String    | Freeable string set directly
+              |                |           | <em>No copy is made</em>
+dstring       |                |           | Alias of <b class="type">string</b> above
+</pre>
+<pre class="doctools_example">
+    critcl::cproc returnCString {} char* {
+        return &quot;a string&quot;;
+    }
+    critcl::cproc returnString {} string {
+        char* str = Tcl_Alloc (200);
+	sprintf (str, &quot;hello world&quot;);
+        return str; 
+    }
+</pre>
+<p>Notable about the above:</p>
+<ol class="doctools_enumerated">
+<li><p>The type <b class="type">char*</b> is best used for static strings, or strings in some kind
+fixed buffer.</p>
+<p>CriTcl's translation layer makes a copy of it for the result of the command. While
+it is possible to return heap-allocated strings it is the C code who is responsible for
+freeing such at some point. If that is not done they will leak.</p></li>
+<li><p>The type <b class="type">string</b> on the other hand is exactly for returning strings allocated
+with <b class="function">Tcl_Alloc</b> and associates.</p>
+<p>For these the translation layer makes no copy at all, and sets them directly as the
+result of the command. A <em>very important effect</em> of this is that the ownership of
+the string pointer moves from the function to Tcl.</p>
+<p><em>Tcl</em> will release the allocated memory when it does not need it any
+longer. The C code has no say in that.</p></li>
+</ol>
+</div>
+<div id="subsection3" class="doctools_subsection"><h3><a name="subsection3">Custom Types, Introduction</a></h3>
+<p>When writing bindings to external libraries <b class="cmd">critcl::cproc</b> is
+usually the most convenient way of writing the lower layers. This is
+however hampered by the fact that critcl on its own only supports a
+few standard (arguably the most import) standard types, whereas the
+functions we wish to bind most certainly will use much more, specific
+to the library's function.</p>
+<p>The critcl commands <b class="cmd">argtype</b>, <b class="cmd">resulttype</b> and their
+adjuncts are provided to help here, by allowing a developer to extend
+critcl's type system with custom conversions.</p>
+<p>This and the three following sections will demonstrate this,
+from trivial to complex.</p>
+<p>The most trivial use is to create types which are aliases of
+existing types, standard or other. As an alias it simply copies and
+uses the conversion code from the referenced types.</p>
+<p>Our example is pulled from an incomplete project of mine, a
+binding to <i class="term">Jeffrey Kegler</i>'s <i class="term">libmarpa</i> library managing
+Earley parsers. Several custom types simply reflect the typedef's done
+by the library, to make the <b class="cmd">critcl::cproc</b>s as self-documenting
+as the underlying library functions themselves.</p>
+<pre class="doctools_example">
+    critcl::argtype Marpa_Symbol_ID     = int
+    critcl::argtype Marpa_Rule_ID       = int
+    critcl::argtype Marpa_Rule_Int      = int
+    critcl::argtype Marpa_Rank          = int
+    critcl::argtype Marpa_Earleme       = int
+    critcl::argtype Marpa_Earley_Set_ID = int
+    ...
+    method sym-rank: proc {
+        Marpa_Symbol_ID sym
+        Marpa_Rank      rank
+    } Marpa_Rank {
+        return marpa_g_symbol_rank_set (instance-&gt;grammar, sym, rank);
+    }
+    ...
+</pre>
+</div>
+<div id="subsection4" class="doctools_subsection"><h3><a name="subsection4">Custom Types, Semi-trivial</a></h3>
+<p>A more involved custom argument type would be to map from Tcl strings
+to some internal representation, like an integer code.</p>
+<p>The first example is taken from the <b class="package">tclyaml</b> package,
+a binding to the <b class="package">libyaml</b> library. In a few places we have to
+map readable names for block styles, scalar styles, etc. to the
+internal enumeration.</p>
+<pre class="doctools_example">
+    critcl::argtype yaml_sequence_style_t {
+        if (!encode_sequence_style (interp, @@, &amp;@A)) return TCL_ERROR;
+    }
+    ...
+    critcl::ccode {
+        static const char* ty_block_style_names [] = {
+            &quot;any&quot;, &quot;block&quot;, &quot;flow&quot;, NULL
+        };
+        static int
+        encode_sequence_style (Tcl_Interp* interp, Tcl_Obj* style,
+                               yaml_sequence_style_t* estyle)
+        {
+            int value;
+            if (Tcl_GetIndexFromObj (interp, style, ty_block_style_names,
+                                     &quot;sequence style&quot;, 0, &amp;value) != TCL_OK) {
+                return 0;
+            }
+            *estyle = value;
+            return 1;
+        }
+    }
+    ...
+    method sequence_start proc {
+        pstring anchor
+        pstring tag
+        int implicit
+        yaml_sequence_style_t style
+    } ok {
+        /* Syntax: &lt;instance&gt; seq_start &lt;anchor&gt; &lt;tag&gt; &lt;implicit&gt; &lt;style&gt; */
+        ...
+    }
+    ...
+</pre>
+<p>It should be noted that this code precedes the advent of the
+supporting generator package <b class="package"><a href="critcl_emap.html">critcl::emap</a></b>. using the
+generator the definition of the mapping becomes much simpler:</p>
+<pre class="doctools_example">
+    critcl::emap::def yaml_sequence_style_t {
+        any   0
+        block 1
+        flow  2
+    }
+</pre>
+<p>Note that the generator will not only provide the conversions, but
+also define the argument and result types needed for their use by
+<b class="cmd">critcl::cproc</b>.
+Another example of such a semi-trivial argument type can be found in
+the <b class="package">CRIMP</b> package, which defines a <b class="type">Tcl_ObjType</b> for
+<i class="term">image</i> values. This not only provides a basic argument type for
+any image, but also derived types which check that the image has a
+specific format. Here we see for the first time non-integer arguments,
+and the need to define the C types used for variables holding the C
+level value, and the type of function parameters (Due to C promotion
+rules we may need different types).</p>
+<pre class="doctools_example">
+    critcl::argtype image {
+        if (crimp_get_image_from_obj (interp, @@, &amp;@A) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    } crimp_image* crimp_image*
+    ...
+        set map [list &lt;&lt;type&gt;&gt; $type]
+        critcl::argtype image_$type [string map $map {
+            if (crimp_get_image_from_obj (interp, @@, &amp;@A) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            if (@A-&gt;itype != crimp_imagetype_find (&quot;crimp::image::&lt;&lt;type&gt;&gt;&quot;)) {
+                Tcl_SetObjResult (interp,
+                                  Tcl_NewStringObj (&quot;expected image type &lt;&lt;type&gt;&gt;&quot;,
+                                                    -1));
+                return TCL_ERROR;
+            }
+        }] crimp_image* crimp_image*
+    ...
+</pre>
+</div>
+<div id="subsection5" class="doctools_subsection"><h3><a name="subsection5">Custom Types, Support structures</a></h3>
+<p>The adjunct command <b class="cmd">critcl::argtypesupport</b> is for when the
+conversion needs additional definitions, for example a helper
+structure.</p>
+<p>An example of this can be found among the standard types of
+critcl itself, the <b class="type">pstring</b> type. This type provides the C
+function with not only the string pointer, but also the string length,
+and the <b class="type">Tcl_Obj*</b> this data came from. As <b class="cmd">critcl::cproc</b>'s
+calling conventions allow us only one argument for the data of the
+parameter a structure is needed to convey these three pieces of
+information.</p>
+<p>Thus the argument type is defined as</p>
+<pre class="doctools_example">
+    critcl::argtype pstring {
+        @A.s = Tcl_GetStringFromObj(@@, &amp;(@A.len));
+        @A.o = @@;
+    } critcl_pstring critcl_pstring
+    critcl::argtypesupport pstring {
+        typedef struct critcl_pstring {
+            Tcl_Obj*    o;
+            const char* s;
+            int         len;
+        } critcl_pstring;
+    }
+</pre>
+<p>In the case of such a structure being large we may wish to
+allocate it on the heap instead of having it taking space on the
+stack. If we do that we need another adjunct command,
+<b class="cmd">critcl::argtyperelease</b>. This command specifies the code required
+to release dynamically allocated resources when the worker function
+returns, before the shim returns to the caller in Tcl.
+To keep things simple our example is synthetic, a modification of
+<b class="const">pstring</b> above, to demonstrate the technique. An actual, but
+more complex example is the code to support the variadic <i class="arg">args</i>
+argument of <b class="cmd">critcl::cproc</b>.</p>
+<pre class="doctools_example">
+    critcl::argtype pstring {
+        @A = (critcl_pstring*) ckalloc(sizeof(critcl_pstring));
+        @A-&gt;s = Tcl_GetStringFromObj(@@, &amp;(@A-&gt;len));
+        @A-&gt;o = @@;
+    } critcl_pstring* critcl_pstring*
+    critcl::argtypesupport pstring {
+        typedef struct critcl_pstring {
+            Tcl_Obj*    o;
+            const char* s;
+            int         len;
+        } critcl_pstring;
+    }
+    critcl::argtyperelease pstring {
+        ckfree ((char*)) @A);
+    }
+</pre>
+<p>Note, the above example shows only the most simple case of an
+allocated argument, with a conversion that cannot fail (namely, string
+retrieval). If the conversion can fail then either the allocation has
+to be defered to happen only on successful conversion, or the
+conversion code has to release the allocated memory itself in the
+failure path, because it will never reach the code defined via
+<b class="cmd">critcl::argtyperelease</b> in that case.</p>
+</div>
+<div id="subsection6" class="doctools_subsection"><h3><a name="subsection6">Custom Types, Results</a></h3>
+<p>All of the previous sections dealt with argument conversions,
+i.e. going from Tcl into C.
+Custom result types are for the reverse direction, from C to Tcl.
+This is usually easier, as most of the time errors should not be
+possible. Supporting structures, or allocating them on the heap are
+not really required and therefore not supported.</p>
+<p>The example of a result type shown below was pulled from
+<b class="package">KineTcl</b>. It is a variant of the builtin result type
+<b class="type">Tcl_Obj*</b>, aka <b class="type">object</b>. The builtin conversion assumes
+that the object returned by the function has a refcount of 1 (or
+higher), with the function having held the reference, and releases
+that reference after placing the value into the interp result. The
+conversion below on the other hand assumes that the value has a
+refcount of 0 and thus that decrementing it is forbidden, lest it be
+released much to early, and crashing the system.</p>
+<pre class="doctools_example">
+    critcl::resulttype KTcl_Obj* {
+        if (rv == NULL) { return TCL_ERROR; }
+        Tcl_SetObjResult(interp, rv);
+        /* No refcount adjustment */
+        return TCL_OK;
+    } Tcl_Obj*
+</pre>
+<p>This type of definition is also found in <b class="package">Marpa</b> and recent
+hacking hacking on <b class="package">CRIMP</b> introduced it there as well. Which
+is why this definition became a builtin type starting with version
+3.1.16, under the names <b class="type">Tcl_Obj*0</b> and <b class="type">object0</b>.</p>
+<p>Going back to errors and their handling, of course, if a
+function we are wrapping signals them in-band, then the conversion of
+such results has to deal with that. This happens for example in
+<b class="package">KineTcl</b>, where we find</p>
+<pre class="doctools_example">
+    critcl::resulttype XnStatus {
+        if (rv != XN_STATUS_OK) {
+            Tcl_AppendResult (interp, xnGetStatusString (rv), NULL);
+            return TCL_ERROR;
+        }
+        return TCL_OK;
+    }
+    critcl::resulttype XnDepthPixel {
+        if (rv == ((XnDepthPixel) -1)) {
+            Tcl_AppendResult (interp,
+                              &quot;Inheritance error: Not a depth generator&quot;,
+                              NULL);
+            return TCL_ERROR;
+        }
+        Tcl_SetObjResult (interp, Tcl_NewIntObj (rv));
+        return TCL_OK;
+    }
+</pre>
+</div>
+</div>
+<div id="section6" class="doctools_section"><h2><a name="section6">Authors</a></h2>
+<p>Jean Claude Wippler, Steve Landers, Andreas Kupries</p>
+</div>
+<div id="section7" class="doctools_section"><h2><a name="section7">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report them at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a>.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a> as well.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#calling_c_code_from_tcl">calling C code from Tcl</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; Jean-Claude Wippler<br>
+Copyright &copy; Steve Landers<br>
+Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_cutil.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_cutil.html
new file mode 100644
index 00000000..65214a38
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_cutil.html
@@ -0,0 +1,482 @@
+<!DOCTYPE html><html><head>
+<title>critcl::cutil - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_cutil.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl::cutil.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl::cutil(n) 0.3 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl::cutil - CriTcl - C-level Utilities</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#synopsis">Synopsis</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">API</a></li>
+<li class="doctools_section"><a href="#section3">Allocation</a></li>
+<li class="doctools_section"><a href="#section4">Assertions</a></li>
+<li class="doctools_section"><a href="#section5">Tracing</a></li>
+<li class="doctools_section"><a href="#section6">Authors</a></li>
+<li class="doctools_section"><a href="#section7">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="synopsis" class="doctools_section"><h2><a name="synopsis">Synopsis</a></h2>
+<div class="doctools_synopsis">
+<ul class="doctools_requirements">
+<li>package require <b class="pkgname">Tcl 8.6</b></li>
+<li>package require <b class="pkgname">critcl <span class="opt">?3.2?</span></b></li>
+<li>package require <b class="pkgname">critcl::cutil <span class="opt">?0.3?</span></b></li>
+</ul>
+<ul class="doctools_syntax">
+<li><a href="#1"><b class="cmd">::critcl::cutil::alloc</b></a></li>
+<li><a href="#2"><b class="cmd">::critcl::cutil::assertions</b> <span class="opt">?<i class="arg">enable</i>?</span></a></li>
+<li><a href="#3"><b class="cmd">::critcl::cutil::tracer</b> <span class="opt">?<i class="arg">enable</i>?</span></a></li>
+<li><a href="#4"><b class="cmd">type* ALLOC (type)</b></a></li>
+<li><a href="#5"><b class="cmd">type* ALLOC_PLUS (type, int n)</b></a></li>
+<li><a href="#6"><b class="cmd">type* NALLOC (type, int n)</b></a></li>
+<li><a href="#7"><b class="cmd">type* REALLOC (type* var, type, int n)</b></a></li>
+<li><a href="#8"><b class="cmd">void FREE (type* var)</b></a></li>
+<li><a href="#9"><b class="cmd">void STREP (Tcl_Obj* o, char* s, int len)</b></a></li>
+<li><a href="#10"><b class="cmd">void STREP_DS (Tcl_Obj* o, Tcl_DString* ds)</b></a></li>
+<li><a href="#11"><b class="cmd">void STRDUP (varname, char* str)</b></a></li>
+<li><a href="#12"><b class="cmd">void ASSERT (expression, char* message</b></a></li>
+<li><a href="#13"><b class="cmd">void ASSERT_BOUNDS (int index, int size)</b></a></li>
+<li><a href="#14"><b class="cmd">void STOPAFTER(n)</b></a></li>
+<li><a href="#15"><b class="cmd">TRACE_ON</b></a></li>
+<li><a href="#16"><b class="cmd">TRACE_OFF</b></a></li>
+<li><a href="#17"><b class="cmd">TRACE_TAG_ON  (identifier)</b></a></li>
+<li><a href="#18"><b class="cmd">TRACE_TAG_OFF (identifier)</b></a></li>
+<li><a href="#19"><b class="cmd">void TRACE_FUNC</b></a></li>
+<li><a href="#20"><b class="cmd">void TRACE_TAG_FUNC (tag)</b></a></li>
+<li><a href="#21"><b class="cmd">void TRACE_FUNC_VOID</b></a></li>
+<li><a href="#22"><b class="cmd">void TRACE_TAG_FUNC_VOID (tag)</b></a></li>
+<li><a href="#23"><b class="cmd">void TRACE_RETURN_VOID</b></a></li>
+<li><a href="#24"><b class="cmd">void TRACE_TAG_RETURN_VOID (tag)</b></a></li>
+<li><a href="#25"><b class="cmd">any TRACE_RETURN     (     char* format, any x)</b></a></li>
+<li><a href="#26"><b class="cmd">any TRACE_TAG_RETURN (tag, char* format, any x)</b></a></li>
+<li><a href="#27"><b class="cmd">void TRACE     (     char* format, ...)</b></a></li>
+<li><a href="#28"><b class="cmd">void TRACE_TAG (tag, char* format, ...)</b></a></li>
+<li><a href="#29"><b class="cmd">void TRACE_HEADER (int indent)</b></a></li>
+<li><a href="#30"><b class="cmd">void TRACE_TAG_HEADER (tag, int indent)</b></a></li>
+<li><a href="#31"><b class="cmd">void TRACE_CLOSER</b></a></li>
+<li><a href="#32"><b class="cmd">void TRACE_TAG_CLOSER (tag)</b></a></li>
+<li><a href="#33"><b class="cmd">void TRACE_ADD          (const char* format, ...)</b></a></li>
+<li><a href="#34"><b class="cmd">void TRACE_TAG_ADD (tag, const char* format, ...)</b></a></li>
+<li><a href="#35"><b class="cmd">void TRACE_PUSH_SCOPE (const char* name)</b></a></li>
+<li><a href="#36"><b class="cmd">void TRACE_PUSH_FUNC</b></a></li>
+<li><a href="#37"><b class="cmd">void TRACE_PUSH_POP</b></a></li>
+<li><a href="#38"><b class="cmd">TRACE_TAG_VAR (tag)</b></a></li>
+<li><a href="#39"><b class="cmd">TRACE_RUN (code);</b></a></li>
+<li><a href="#40"><b class="cmd">TRACE_DO (code);</b></a></li>
+<li><a href="#41"><b class="cmd">TRACE_TAG_DO (tag, code);</b></a></li>
+</ul>
+</div>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This document is the reference manpage for the <b class="package">critcl::cutil</b>
+package. This package encapsulates a number of C-level utilites for
+easier writing of memory allocations, assertions, and narrative tracing
+and provides convenience commands to make these utilities accessible
+to critcl projects.
+Its intended audience are mainly developers wishing to write Tcl
+packages with embedded C code.</p>
+<p>This package resides in the Core Package Layer of CriTcl.</p>
+<p><img alt="arch_core" src="../image/arch_core.png"></p>
+<p>The reason for this is that the main <b class="package"><a href="critcl.html">critcl</a></b> package makes
+use of the facilities for narrative tracing when
+<b class="cmd">critcl::config trace</b> is set, to instrument commands and
+procedures.</p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">API</a></h2>
+<dl class="doctools_definitions">
+<dt><a name="1"><b class="cmd">::critcl::cutil::alloc</b></a></dt>
+<dd><p>This command provides a number C-preprocessor macros which make the
+writing of memory allocations for structures and arrays of structures
+easier.</p>
+<p>When run the header file &quot;<b class="file">critcl_alloc.h</b>&quot; is directly made
+available to the &quot;<b class="file">.critcl</b>&quot; file containing the command, and
+becomes available for use in <b class="cmd">#include</b> directives of companion
+C code declared via <b class="cmd">critcl::csources</b>.</p>
+<p>The macros definitions and their signatures are:</p>
+<pre class="doctools_example">
+    type* ALLOC (type)
+    type* ALLOC_PLUS (type, int n)
+    type* NALLOC (type, int n)
+    type* REALLOC (type* var, type, int n)
+    void  FREE (type* var)
+    void STREP    (Tcl_Obj* o, char* s, int len);
+    void STREP_DS (Tcl_Obj* o, Tcl_DString* ds);
+    void STRDUP   (varname, char* str);
+</pre>
+<p>The details of the semantics are explained in section
+<span class="sectref"><a href="#section3">Allocation</a></span>.</p>
+<p>The result of the command is an empty string.</p></dd>
+<dt><a name="2"><b class="cmd">::critcl::cutil::assertions</b> <span class="opt">?<i class="arg">enable</i>?</span></a></dt>
+<dd><p>This command provides a number C-preprocessor macros for the writing
+of assertions in C code.</p>
+<p>When invoked the header file &quot;<b class="file">critcl_assert.h</b>&quot; is directly
+made available to the &quot;<b class="file">.critcl</b>&quot; file containing the command, and
+becomes available for use in <b class="cmd">#include</b> directives of companion
+C code declared via <b class="cmd">critcl::csources</b>.</p>
+<p>The macro definitions and their signatures are</p>
+<pre class="doctools_example">
+    void ASSERT (expression, char* message);
+    void ASSERT_BOUNDS (int index, int size);
+    void STOPAFTER (int n);
+</pre>
+<p>Note that these definitions are conditional on the existence of
+the macro <b class="const">CRITCL_ASSERT</b>. 
+Without a <b class="cmd">critcl::cflags -DCRITCL_ASSERT</b> all assertions in the
+C code are quiescent and not compiled into the object file. In other
+words, assertions can be (de)activated at will during build time, as
+needed by the user.</p>
+<p>For convenience this is controlled by <i class="arg">enable</i>. By default
+(<b class="const">false</b>) the facility available, but not active.
+Using <b class="const">true</b> not only makes it available, but activates it as
+well.</p>
+<p>The details of the semantics are explained in section
+<span class="sectref"><a href="#section4">Assertions</a></span>.</p>
+<p>The result of the command is an empty string.</p></dd>
+<dt><a name="3"><b class="cmd">::critcl::cutil::tracer</b> <span class="opt">?<i class="arg">enable</i>?</span></a></dt>
+<dd><p>This command provides a number C-preprocessor macros for tracing
+C-level internals.</p>
+<p>When invoked the header file &quot;<b class="file">critcl_trace.h</b>&quot; is directly
+made available to the &quot;<b class="file">.critcl</b>&quot; file containing the command, and
+becomes available for use in <b class="cmd">#include</b> directives of companion
+C code declared via <b class="cmd">critcl::csources</b>. Furthermore the &quot;<b class="file">.c</b>&quot;
+file containing the runtime support is added to the set of C companion
+files</p>
+<p>The macro definitions and their signatures are</p>
+<pre class="doctools_example">
+    /* (de)activation of named logical streams.
+     * These are declarators, not statements.
+     */
+    TRACE_ON;
+    TRACE_OFF;
+    TRACE_TAG_ON  (tag_identifier);
+    TRACE_TAG_OFF (tag_identifier);
+    /*
+     * Higher level trace statements (convenience commands)
+     */
+    void TRACE_FUNC   (const char* format, ...);
+    void TRACE_FUNC_VOID;
+    any  TRACE_RETURN (const char* format, any x);
+    void TRACE_RETURN_VOID;
+    void TRACE (const char* format, ...);
+    /*
+     * Low-level trace statements the higher level ones above
+     * are composed from. Scope management and output management.
+     */
+    void TRACE_PUSH_SCOPE (const char* scope);
+    void TRACE_PUSH_FUNC;
+    void TRACE_POP;
+    void TRACE_HEADER (int indent);
+    void TRACE_ADD (const char* format, ...);
+    void TRACE_CLOSER;
+    /*
+     * Convert tag to the underlying status variable.
+     */
+    TRACE_TAG_VAR (tag)
+    /*
+     * Conditional use of arbitrary code.
+     */
+    TRACE_RUN (code);
+    TRACE_DO (code);
+    TRACE_TAG_DO (code);
+</pre>
+<p>Note that these definitions are conditional on the existence of
+the macro <b class="const">CRITCL_TRACER</b>. 
+Without a <b class="cmd">critcl::cflags -DCRITCL_TRACER</b> all trace
+functionality in the C code is quiescent and not compiled into the
+object file. In other words, tracing can be (de)activated at will
+during build time, as needed by the user.</p>
+<p>For convenience this is controlled by <i class="arg">enable</i>. By default
+(<b class="const">false</b>) the facility available, but not active.
+Using <b class="const">true</b> not only makes it available, but activates it as
+well.
+Further note that the command <b class="cmd">critcl::config</b> now accepts a
+boolean option <b class="const">trace</b>. Setting it activates enter/exit tracing
+in all commands based on <b class="cmd">critcl::cproc</b>, with proper printing of
+arguments and results. This implicitly activates the tracing facility
+in general.</p>
+<p>The details of the semantics are explained in section
+<span class="sectref"><a href="#section5">Tracing</a></span></p>
+<p>The result of the command is an empty string.</p></dd>
+</dl>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Allocation</a></h2>
+<dl class="doctools_definitions">
+<dt><a name="4"><b class="cmd">type* ALLOC (type)</b></a></dt>
+<dd><p>This macro allocates a single element of the given <i class="arg">type</i> and
+returns a pointer to that memory.</p></dd>
+<dt><a name="5"><b class="cmd">type* ALLOC_PLUS (type, int n)</b></a></dt>
+<dd><p>This macro allocates a single element of the given <i class="arg">type</i>, plus an
+additional <i class="arg">n</i> bytes after the structure and returns a pointer to
+that memory.</p>
+<p>This is for variable-sized structures of. An example of such
+could be a generic list element structure which stores management
+information in the structure itself, and the value/payload immediately
+after, in the same memory block.</p></dd>
+<dt><a name="6"><b class="cmd">type* NALLOC (type, int n)</b></a></dt>
+<dd><p>This macro allocates <i class="arg">n</i> elements of the given <i class="arg">type</i> and
+returns a pointer to that memory.</p></dd>
+<dt><a name="7"><b class="cmd">type* REALLOC (type* var, type, int n)</b></a></dt>
+<dd><p>This macro expands or shrinks the memory associated with the C
+variable <i class="arg">var</i> of type <i class="arg">type</i> to hold <i class="arg">n</i> elements of the
+type. It returns a pointer to that memory.
+Remember, a reallocation may move the data to a new location in memory
+to satisfy the request. Returning a pointer instead of immediately
+assigning it to the <i class="arg">var</i> allows the user to validate the new
+pointer before trying to use it.</p></dd>
+<dt><a name="8"><b class="cmd">void FREE (type* var)</b></a></dt>
+<dd><p>This macro releases the memory referenced by the pointer variable
+<i class="arg">var</i>.</p></dd>
+<dt><a name="9"><b class="cmd">void STREP (Tcl_Obj* o, char* s, int len)</b></a></dt>
+<dd><p>This macro properly sets the string representation of the Tcl object
+<i class="arg">o</i> to a copy of the string <i class="arg">s</i>, expected to be of length
+<i class="arg">len</i>.</p></dd>
+<dt><a name="10"><b class="cmd">void STREP_DS (Tcl_Obj* o, Tcl_DString* ds)</b></a></dt>
+<dd><p>This macro properly sets the string representation of the Tcl object
+<i class="arg">o</i> to a copy of the string held by the <b class="type">DString</b> <i class="arg">ds</i>.</p></dd>
+<dt><a name="11"><b class="cmd">void STRDUP (varname, char* str)</b></a></dt>
+<dd><p>This macro duplicates the string <i class="arg">str</i> into the heap and stores
+the result into the named <b class="type">char*</b> variable <i class="arg">var</i>.</p></dd>
+</dl>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Assertions</a></h2>
+<dl class="doctools_definitions">
+<dt><a name="12"><b class="cmd">void ASSERT (expression, char* message</b></a></dt>
+<dd><p>This macro tests the <i class="arg">expression</i> and panics if it does not hold.
+The specified <i class="arg">message</i> is used as part of the panic.
+The <i class="arg">message</i> has to be a static string, it cannot be a variable.</p></dd>
+<dt><a name="13"><b class="cmd">void ASSERT_BOUNDS (int index, int size)</b></a></dt>
+<dd><p>This macro ensures that the <i class="arg">index</i> is in the
+range <b class="const">0</b> to <b class="const">size-1</b>.</p></dd>
+<dt><a name="14"><b class="cmd">void STOPAFTER(n)</b></a></dt>
+<dd><p>This macro throws a panic after it is called <i class="arg">n</i> times.
+Note, each separate instance of the macro has its own counter.</p></dd>
+</dl>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Tracing</a></h2>
+<p>All output is printed to <b class="const">stdout</b>.</p>
+<dl class="doctools_definitions">
+<dt><a name="15"><b class="cmd">TRACE_ON</b></a></dt>
+<dd></dd>
+<dt><a name="16"><b class="cmd">TRACE_OFF</b></a></dt>
+<dd></dd>
+<dt><a name="17"><b class="cmd">TRACE_TAG_ON  (identifier)</b></a></dt>
+<dd></dd>
+<dt><a name="18"><b class="cmd">TRACE_TAG_OFF (identifier)</b></a></dt>
+<dd><p>These &quot;commands&quot; are actually declarators, for use outside of
+functions. They (de)activate specific logical streams, named either
+explicitly by the user, or implicitly, refering to the current file.</p>
+<p>For example:</p>
+<pre class="doctools_example">
+    TRACE_TAG_ON (lexer_in);
+</pre>
+<p>All high- and low-level trace commands producing output have
+the controlling tag as an implicit argument. The scope management
+commands do not take tags.</p></dd>
+<dt><a name="19"><b class="cmd">void TRACE_FUNC</b></a></dt>
+<dd></dd>
+<dt><a name="20"><b class="cmd">void TRACE_TAG_FUNC (tag)</b></a></dt>
+<dd></dd>
+<dt><a name="21"><b class="cmd">void TRACE_FUNC_VOID</b></a></dt>
+<dd></dd>
+<dt><a name="22"><b class="cmd">void TRACE_TAG_FUNC_VOID (tag)</b></a></dt>
+<dd><p>Use these macros at the beginning of a C function to record entry into
+it. The name of the entered function is an implicit argument
+(<b class="variable">__func__</b>), forcing users to have a C99 compiler..</p>
+<p>The tracer's runtime maintains a stack of active functions and
+expects that function return is signaled by either <b class="function">TRACE_RETURN</b>,
+<b class="function">TRACE_RETURN_VOID</b>, or the equivalent forms taking a tag.</p></dd>
+<dt><a name="23"><b class="cmd">void TRACE_RETURN_VOID</b></a></dt>
+<dd></dd>
+<dt><a name="24"><b class="cmd">void TRACE_TAG_RETURN_VOID (tag)</b></a></dt>
+<dd><p>Use these macros instead of</p>
+<pre class="doctools_example">return</pre>
+<p>to return from a void
+function. Beyond returning from the function this also signals the
+same to the tracer's runtime, popping the last entered function from
+its stack of active functions.</p></dd>
+<dt><a name="25"><b class="cmd">any TRACE_RETURN     (     char* format, any x)</b></a></dt>
+<dd></dd>
+<dt><a name="26"><b class="cmd">any TRACE_TAG_RETURN (tag, char* format, any x)</b></a></dt>
+<dd><p>Use this macro instead of</p>
+<pre class="doctools_example">return x</pre>
+<p>to return from a
+non-void function.
+Beyond returning from the function with value <i class="arg">x</i> this also
+signals the same to the tracer's runtime, popping the last entered
+function from its stack of active functions.
+The <i class="arg">format</i> is expected to be a proper formatting string for
+<b class="function">printf</b> and analogues, able to stringify <i class="arg">x</i>.</p></dd>
+<dt><a name="27"><b class="cmd">void TRACE     (     char* format, ...)</b></a></dt>
+<dd></dd>
+<dt><a name="28"><b class="cmd">void TRACE_TAG (tag, char* format, ...)</b></a></dt>
+<dd><p>This macro is the trace facilities' equivalent of <b class="function">printf</b>,
+printing arbitrary data under the control of the <i class="arg">format</i>.</p>
+<p>The printed text is closed with a newline, and indented as per
+the stack of active functions.</p></dd>
+<dt><a name="29"><b class="cmd">void TRACE_HEADER (int indent)</b></a></dt>
+<dd></dd>
+<dt><a name="30"><b class="cmd">void TRACE_TAG_HEADER (tag, int indent)</b></a></dt>
+<dd><p>This is the low-level macro which prints the beginning of a trace
+line. This prefix consists of physical location (file name and line
+number), if available, indentation as per the stack of active scopes
+(if activated), and the name of the active scope.</p></dd>
+<dt><a name="31"><b class="cmd">void TRACE_CLOSER</b></a></dt>
+<dd></dd>
+<dt><a name="32"><b class="cmd">void TRACE_TAG_CLOSER (tag)</b></a></dt>
+<dd><p>This is the low-level macro which prints the end of a trace
+line.</p></dd>
+<dt><a name="33"><b class="cmd">void TRACE_ADD          (const char* format, ...)</b></a></dt>
+<dd></dd>
+<dt><a name="34"><b class="cmd">void TRACE_TAG_ADD (tag, const char* format, ...)</b></a></dt>
+<dd><p>This is the low-level macro which adds formatted data to the line.</p></dd>
+<dt><a name="35"><b class="cmd">void TRACE_PUSH_SCOPE (const char* name)</b></a></dt>
+<dd></dd>
+<dt><a name="36"><b class="cmd">void TRACE_PUSH_FUNC</b></a></dt>
+<dd></dd>
+<dt><a name="37"><b class="cmd">void TRACE_PUSH_POP</b></a></dt>
+<dd><p>These are the low-level macros for scope management. The first two
+forms push a new scope on the stack of active scopes, and the last
+forms pops the last scope pushed.</p></dd>
+<dt><a name="38"><b class="cmd">TRACE_TAG_VAR (tag)</b></a></dt>
+<dd><p>Helper macro converting from a tag identifier to the name of the
+underlying status variable.</p></dd>
+<dt><a name="39"><b class="cmd">TRACE_RUN (code);</b></a></dt>
+<dd><p>Conditionally insert the <i class="arg">code</i> at compile time when the tracing
+facility is activated.</p></dd>
+<dt><a name="40"><b class="cmd">TRACE_DO (code);</b></a></dt>
+<dd></dd>
+<dt><a name="41"><b class="cmd">TRACE_TAG_DO (tag, code);</b></a></dt>
+<dd><p>Insert the <i class="arg">code</i> at compile time when the tracing facility is
+activated, and execute the same when either the implicit tag for the
+file or the user-specified tag is active.</p></dd>
+</dl>
+</div>
+<div id="section6" class="doctools_section"><h2><a name="section6">Authors</a></h2>
+<p>Andreas Kupries</p>
+</div>
+<div id="section7" class="doctools_section"><h2><a name="section7">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report such at <a href="https://github.com/andreas-kupries/critcl">https://github.com/andreas-kupries/critcl</a>.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_devguide.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_devguide.html
new file mode 100644
index 00000000..8f69ac4f
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_devguide.html
@@ -0,0 +1,372 @@
+<!DOCTYPE html><html><head>
+<title>critcl_devguide - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_devguide.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; Jean-Claude Wippler   -- Copyright &amp;copy; Steve Landers   -- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl_devguide.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl_devguide(n) 3.2.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl_devguide - Guide To The CriTcl Internals</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">Audience</a></li>
+<li class="doctools_section"><a href="#section3">Playing with CriTcl</a></li>
+<li class="doctools_section"><a href="#section4">Developing for CriTcl</a>
+<ul>
+<li class="doctools_subsection"><a href="#subsection1">Architecture &amp; Concepts</a></li>
+<li class="doctools_subsection"><a href="#subsection2">Requirements</a></li>
+<li class="doctools_subsection"><a href="#subsection3">Directory structure</a></li>
+</ul>
+</li>
+<li class="doctools_section"><a href="#section5">Authors</a></li>
+<li class="doctools_section"><a href="#section6">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">Audience</a></h2>
+<p>This document is a guide for developers working on CriTcl, i.e. maintainers fixing
+bugs, extending the package's functionality, etc.</p>
+<p>Please read</p>
+<ol class="doctools_enumerated">
+<li><p><i class="term">CriTcl - License</i>,</p></li>
+<li><p><i class="term">CriTcl - How To Get The Sources</i>, and</p></li>
+<li><p><i class="term">CriTcl - The Installer's Guide</i></p></li>
+</ol>
+<p>first, if that was not done already.</p>
+<p>Here we assume that the sources are already available in a directory of the readers
+choice, and that the reader not only know how to build and install them, but also has all
+the necessary requisites to actually do so. The guide to the sources in particular also
+explains which source code management system is used, where to find it, how to set it up,
+etc.</p>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Playing with CriTcl</a></h2>
+<p><em>Note</em> that the sources of CriTcl, should the reader have gotten them, also
+contain several examples show-casing various aspects of the system. These demonstration
+packages can all be found in the sub-directory &quot;<b class="file">examples/</b>&quot; of the sources.</p>
+<p>Lots of smaller examples can be found in the document
+<i class="term">Using CriTcl</i>, an introduction to CriTcl by way of a of
+examples. These focus more on specific critcl commands than the
+overall picture shown by the large examples mentioned in the previous
+paragraph.</p>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Developing for CriTcl</a></h2>
+<div id="subsection1" class="doctools_subsection"><h3><a name="subsection1">Architecture &amp; Concepts</a></h3>
+<p>The system consists of two main layers, as seen in the figure below,
+plus a support layer containing general packages the system uses during
+operation.</p>
+<p><img alt="architecture" src="../image/architecture.png"></p>
+<ol class="doctools_enumerated">
+<li><p>At the top we have an application built on top of the core packages,
+providing command line access to the second and third usage modes,
+i.e. <i class="term"><a href="../index.html#generate_package">Generate Package</a></i> and <i class="term">Generate TEA Package</i>.</p>
+<dl class="doctools_definitions">
+<dt><b class="syscmd"><a href="critcl.html">critcl</a></b></dt>
+<dd></dd>
+<dt><b class="package">critcl::app</b></dt>
+<dd></dd>
+</dl>
+</li>
+<li><p>Below that is the core package providing the essential functionality
+of the system, plus various utility packages which make common tasks
+more convenient.</p>
+<dl class="doctools_definitions">
+<dt><b class="package"><a href="critcl.html">critcl</a></b></dt>
+<dd></dd>
+<dt><b class="package"><a href="critcl_util.html">critcl::util</a></b></dt>
+<dd></dd>
+</dl>
+</li>
+<li><p>Lastly a layer of supporting packages, mostly external to critcl.</p>
+<dl class="doctools_definitions">
+<dt><b class="package">md5</b></dt>
+<dd><p>For this pure-Tcl package to be fast users should get one of several
+possible accelerator packages:</p>
+<ol class="doctools_enumerated">
+<li><p><b class="package">tcllibc</b></p></li>
+<li><p><b class="package">Trf</b></p></li>
+<li><p><b class="package">md5c</b></p></li>
+</ol></dd>
+<dt><b class="package">cmdline</b></dt>
+<dd></dd>
+<dt><b class="package">platform</b></dt>
+<dd></dd>
+<dt><b class="package">stubs::container</b></dt>
+<dd></dd>
+<dt><b class="package">stubs::reader</b></dt>
+<dd></dd>
+<dt><b class="package">stubs::writer</b></dt>
+<dd></dd>
+<dt><b class="package">stubs::gen</b></dt>
+<dd></dd>
+<dt><b class="package">stubs::gen::init</b></dt>
+<dd></dd>
+<dt><b class="package">stubs::gen::header</b></dt>
+<dd></dd>
+<dt><b class="package">stubs::gen::decl</b></dt>
+<dd></dd>
+<dt><b class="package">stubs::gen::macro</b></dt>
+<dd></dd>
+<dt><b class="package">stubs::gen::slot</b></dt>
+<dd></dd>
+<dt><b class="package">stubs::gen::lib</b></dt>
+<dd></dd>
+</dl>
+</li>
+</ol>
+</div>
+<div id="subsection2" class="doctools_subsection"><h3><a name="subsection2">Requirements</a></h3>
+<p>To develop for critcl the following packages and applications must be available in the
+environment. These are all used by the <b class="cmd">build.tcl</b> helper application.</p>
+<dl class="doctools_definitions">
+<dt><b class="syscmd">dtplite</b></dt>
+<dd><p>A Tcl application provided by Tcllib, for the validation and conversion of
+<i class="term">doctools</i>-formatted text.</p></dd>
+<dt><b class="syscmd">dia</b></dt>
+<dd><p>A Tcl application provided by Tklib, for the validation and conversion
+of <b class="package">diagram</b>-formatted figures into raster images.</p>
+<p>Do not confuse this with the Gnome <b class="syscmd">dia</b> application, which is a graphical
+editor for figures and diagrams, and completely unrelated.</p></dd>
+<dt><b class="package">fileutil</b></dt>
+<dd><p>A Tcl package provided by Tcllib, providing file system utilities.</p></dd>
+<dt><b class="package">vfs::mk4</b>, <b class="package">vfs</b></dt>
+<dd><p>Tcl packages written in C providing access to Tcl's VFS facilities, required for the
+generation of critcl starkits and starpacks.</p></dd>
+</dl>
+</div>
+<div id="subsection3" class="doctools_subsection"><h3><a name="subsection3">Directory structure</a></h3>
+<dl class="doctools_definitions">
+<dt>Helpers</dt>
+<dd><dl class="doctools_definitions">
+<dt>&quot;<b class="file">build.tcl</b>&quot;</dt>
+<dd><p>This helper application provides various operations needed by a developer for critcl, like
+regenerating the documentation, the figures, building and installing critcl, etc.</p>
+<p>Running the command like</p>
+<pre class="doctools_example">
+	./build.tcl help
+</pre>
+<p>will provide more details about the available operations and their arguments.</p></dd>
+</dl></dd>
+<dt>Documentation</dt>
+<dd><dl class="doctools_definitions">
+<dt>&quot;<b class="file">doc/</b>&quot;</dt>
+<dd><p>This directory contains the documentation sources, for both the text, and the figures.
+The texts are written in <i class="term">doctools</i> format, whereas the figures are written for
+tklib's <b class="package">dia</b>(gram) package and application.</p></dd>
+<dt>&quot;<b class="file">embedded/</b>&quot;</dt>
+<dd><p>This directory contains the documentation converted to regular manpages (nroff) and HTML.
+It is called embedded because these files, while derived, are part of the git repository,
+i.e. embedded into it. This enables us to place these files where they are visible when
+serving the prject's web interface.</p></dd>
+</dl></dd>
+<dt>Testsuite</dt>
+<dd><dl class="doctools_definitions">
+<dt>&quot;<b class="file">test/all.tcl</b>&quot;</dt>
+<dd></dd>
+<dt>&quot;<b class="file">test/testutilities.tcl</b>&quot;</dt>
+<dd></dd>
+<dt>&quot;<b class="file">test/*.test</b>&quot;</dt>
+<dd><p>These files are a standard testsuite based on Tcl's <b class="package">tcltest</b> package, with some
+utility code snarfed from <b class="package">Tcllib</b>.</p>
+<p>This currently tests only some of the <b class="package">stubs::*</b> packages.</p></dd>
+<dt>&quot;<b class="file">test/*.tcl</b>&quot;</dt>
+<dd><p>These files (except for &quot;<b class="file">all.tcl</b>&quot; and &quot;<b class="file">testutilities.tcl</b>&quot;) are example files
+(Tcl with embedded C) which can be run through critcl for testing.</p>
+<p><em>TODO</em> for a maintainers: These should be converted into a proper test suite.</p></dd>
+</dl></dd>
+<dt>Package Code, General structure</dt>
+<dd><dl class="doctools_definitions">
+</dl></dd>
+<dt>Package Code, Per Package</dt>
+<dd><dl class="doctools_definitions">
+<dt><b class="package"><a href="critcl.html">critcl</a></b></dt>
+<dd><dl class="doctools_definitions">
+<dt>&quot;<b class="file">lib/critcl/critcl.tcl</b>&quot;</dt>
+<dd><p>The Tcl code implementing the package.</p></dd>
+<dt>&quot;<b class="file">lib/critcl/Config</b>&quot;</dt>
+<dd><p>The configuration file for the standard targets and their settings.</p></dd>
+<dt>&quot;<b class="file">lib/critcl/critcl_c/</b>&quot;</dt>
+<dd><p>Various C code snippets used by the package.
+This directory also contains the copies of the Tcl header files used to compile the
+assembled C code, for the major brnaches of Tcl, i.e. 8.4, 8.5, and 8.6.</p></dd>
+</dl></dd>
+<dt><b class="package"><a href="critcl_util.html">critcl::util</a></b></dt>
+<dd><dl class="doctools_definitions">
+<dt>&quot;<b class="file">lib/critcl-util/util.tcl</b>&quot;</dt>
+<dd><p>The Tcl code implementing the package.</p></dd>
+</dl></dd>
+<dt><b class="package">critcl::app</b></dt>
+<dd><dl class="doctools_definitions">
+<dt>&quot;<b class="file">lib/app-critcl/critcl.tcl</b>&quot;</dt>
+<dd><p>The Tcl code implementing the package.</p></dd>
+</dl></dd>
+<dt><b class="package"><a href="critcl_iassoc.html">critcl::iassoc</a></b></dt>
+<dd><dl class="doctools_definitions">
+<dt>&quot;<b class="file">lib/critcl-iassoc/iassoc.tcl</b>&quot;</dt>
+<dd><p>The Tcl code implementing the package.</p></dd>
+<dt>&quot;<b class="file">lib/critcl-iassoc/iassoc.h</b>&quot;</dt>
+<dd><p>C code template used by the package.</p></dd>
+</dl></dd>
+<dt><b class="package"><a href="critcl_class.html">critcl::class</a></b></dt>
+<dd><dl class="doctools_definitions">
+<dt>&quot;<b class="file">lib/critcl-class/class.tcl</b>&quot;</dt>
+<dd><p>The Tcl code implementing the package.</p></dd>
+<dt>&quot;<b class="file">lib/critcl-class/class.h</b>&quot;</dt>
+<dd><p>C code template used by the package.</p></dd>
+</dl></dd>
+<dt><b class="package">stubs::*</b></dt>
+<dd><dl class="doctools_definitions">
+<dt>&quot;<b class="file">lib/stubs/*</b>&quot;</dt>
+<dd><p>A set of non-public (still) packages which provide read and write access to and represent
+Tcl stubs tables. These were created by taking the &quot;<b class="file">genStubs.tcl</b>&quot; helper application
+coming with the Tcl core sources apart along its internal logical lines.</p></dd>
+</dl></dd>
+<dt><b class="package">critclf</b></dt>
+<dd><dl class="doctools_definitions">
+<dt>&quot;<b class="file">lib/critclf/</b>&quot;</dt>
+<dd><p>Arjen Markus' work on a critcl/Fortran. The code is outdated and has not been adapted to
+the changes in critcl version 3 yet.</p></dd>
+</dl></dd>
+<dt><b class="package">md5</b></dt>
+<dd></dd>
+<dt><b class="package">md5c</b></dt>
+<dd></dd>
+<dt><b class="package">platform</b></dt>
+<dd><p>These are all external packages whose code has been inlined in the repository for easier
+development (less dependencies to pull), and quicker deployment from the repository
+(generation of starkit and -pack).</p>
+<p><em>TODO</em> for maintainers: These should all be checked against their origin for
+updates and changes since they were inlined.</p></dd>
+</dl></dd>
+</dl>
+</div>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Authors</a></h2>
+<p>Jean Claude Wippler, Steve Landers, Andreas Kupries</p>
+</div>
+<div id="section6" class="doctools_section"><h2><a name="section6">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report them at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a>.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a> as well.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#calling_c_code_from_tcl">calling C code from Tcl</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; Jean-Claude Wippler<br>
+Copyright &copy; Steve Landers<br>
+Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_emap.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_emap.html
new file mode 100644
index 00000000..3aefed4a
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_emap.html
@@ -0,0 +1,284 @@
+<!DOCTYPE html><html><head>
+<title>critcl::emap - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_emap.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl::emap.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl::emap(n) 1.3 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl::emap - CriTcl - Wrap Support - Enum en- and decoding</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#synopsis">Synopsis</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">API</a></li>
+<li class="doctools_section"><a href="#section3">Example</a></li>
+<li class="doctools_section"><a href="#section4">Authors</a></li>
+<li class="doctools_section"><a href="#section5">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="synopsis" class="doctools_section"><h2><a name="synopsis">Synopsis</a></h2>
+<div class="doctools_synopsis">
+<ul class="doctools_requirements">
+<li>package require <b class="pkgname">Tcl 8.6</b></li>
+<li>package require <b class="pkgname">critcl <span class="opt">?3.2?</span></b></li>
+<li>package require <b class="pkgname">critcl::emap <span class="opt">?1.3?</span></b></li>
+</ul>
+<ul class="doctools_syntax">
+<li><a href="#1"><b class="cmd">::critcl::emap::def</b> <i class="arg">name</i> <i class="arg">definition</i> <span class="opt">?<b class="option">-nocase</b>?</span> <span class="opt">?<b class="option">-mode</b> <i class="arg">mode</i>?</span></a></li>
+</ul>
+</div>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This document is the reference manpage for the
+<b class="package">critcl::emap</b> package. This package provides convenience
+commands for advanced functionality built on top of both critcl core
+and package <b class="package"><a href="critcl_iassoc.html">critcl::iassoc</a></b>.</p>
+<p>C level libraries often use enumerations or integer values to encode
+information, like the state of a system. Tcl bindings to such libraries now
+have the task of converting a Tcl representation, i.e. a string into such
+state, and back.
+<em>Note</em> here that the C-level information has to be something which
+already exists. The package does <em>not</em> create these values. This is
+in contrast to the package <b class="package"><a href="critcl_enum.html">critcl::enum</a></b> which creates an
+enumeration based on the specified symbolic names.</p>
+<p>This package was written to make the declaration and management
+of such enumerations and their associated conversions functions easy,
+hiding all attendant complexity from the user.</p>
+<p>Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code.</p>
+<p>This package resides in the Core Package Layer of CriTcl.</p>
+<p><img alt="arch_core" src="../image/arch_core.png"></p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">API</a></h2>
+<dl class="doctools_definitions">
+<dt><a name="1"><b class="cmd">::critcl::emap::def</b> <i class="arg">name</i> <i class="arg">definition</i> <span class="opt">?<b class="option">-nocase</b>?</span> <span class="opt">?<b class="option">-mode</b> <i class="arg">mode</i>?</span></a></dt>
+<dd><p>This command defines C functions for the conversion of the <i class="arg">name</i>d
+state code into a Tcl string, and vice versa.
+The underlying mapping tables are automatically initialized on first
+access (if not fully constant), and finalized on interpreter
+destruction.</p>
+<p>The <i class="arg">definition</i> dictionary provides the mapping from the
+Tcl-level symbolic names of the state to their C expressions (often
+the name of the macro specifying the actual value).
+<em>Note</em> here that the C-level information has to be something which
+already exists. The package does <em>not</em> create these values. This is
+in contrast to the package <b class="package"><a href="critcl_enum.html">critcl::enum</a></b> which creates an
+enumeration based on the specified symbolic names.</p>
+<p>Further note that multiple strings can be mapped to the same C
+expression. When converting to Tcl the first string for the mapping is
+returned. An important thing to know: If all C expressions are
+recognizable as integer numbers and their covered range is not too
+large (at most 50) the package will generate code using direct and
+fast mapping tables instead of using a linear search.</p>
+<p>If the option <b class="option">-nocase</b> is specified then the encoder
+will match strings case-insensitively, and the decoder will always
+return a lower-case string, regardless of the string's case in the
+<i class="arg">definition</i>.</p>
+<p>If the option <b class="option">-mode</b> is specified its contents will
+interpreted as a list of access modes to support.  The two allowed
+modes are <b class="const">c</b> and <b class="const">tcl</b>. Both modes can be used
+together. The default mode is <b class="const">tcl</b>.</p>
+<p>The package generates multiple things (declarations and
+definitions) with names derived from <i class="arg">name</i>, which has to be a
+proper C identifier. Some of the things are generated conditional on
+the chosen <i class="arg">mode</i>s.</p>
+<dl class="doctools_definitions">
+<dt><i class="arg">name</i>_encode</dt>
+<dd><p>The <b class="const">tcl</b>-mode function for encoding a Tcl string into the
+equivalent state code.
+Its signature is</p>
+<pre class="doctools_example">
+int <i class="arg">name</i>_encode (Tcl_Interp* interp, Tcl_Obj* state, int* result);
+</pre>
+<p>The return value of the function is a Tcl error code,
+i.e. <b class="const">TCL_OK</b>, <b class="const">TCL_ERROR</b>, etc.</p></dd>
+<dt><i class="arg">name</i>_encode_cstr</dt>
+<dd><p>The <b class="const">c</b>-mode function for encoding a C string into the
+equivalent state code.
+Its signature is</p>
+<pre class="doctools_example">
+int <i class="arg">name</i>_encode_cstr (const char* state);
+</pre>
+<p>The return value of the function is the encoded state, or -1 if
+the argument is not a vlaid state.</p></dd>
+<dt><i class="arg">name</i>_decode</dt>
+<dd><p>The <b class="const">tcl</b>-mode function for decoding a state code into the
+equivalent Tcl string.
+Its signature is</p>
+<pre class="doctools_example">
+Tcl_Obj* <i class="arg">name</i>_decode (Tcl_Interp* interp, int state);
+</pre>
+</dd>
+<dt><i class="arg">name</i>_decode_cstr</dt>
+<dd><p>The <b class="const">c</b>-mode function for decoding a state code into the
+equivalent C string.
+Its signature is</p>
+<pre class="doctools_example">
+const char* <i class="arg">name</i>_decode_cstr (int state);
+</pre>
+<p>The return value of the function is the C string for the state,
+or <b class="const">NULL</b> if the <i class="arg">state</i> argument does not contain a valid
+state value.</p></dd>
+<dt><i class="arg">name</i>.h</dt>
+<dd><p>A header file containing the declarations for the conversion
+functions, for use by other parts of the system, if necessary.</p>
+<p>The generated file is stored in a place where it will not
+interfere with the overall system outside of the package, yet also be
+available for easy inclusion by package files (<b class="cmd">csources</b>).</p></dd>
+<dt><i class="arg">name</i></dt>
+<dd><p>For mode <b class="const">tcl</b> the command registers a new argument-type for
+<b class="cmd">critcl::cproc</b> with critcl, encapsulating the encoder function.</p></dd>
+<dt><i class="arg">name</i></dt>
+<dd><p>For mode <b class="const">tcl</b> the command registers a new result-type for
+<b class="cmd">critcl::cproc</b> with critcl, encapsulating the decoder function.</p></dd>
+</dl></dd>
+</dl>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Example</a></h2>
+<p>The example shown below is the specification for the possible modes of
+entry (normal, no feedback, stars) used by the Tcl binding to the
+linenoise library.</p>
+<pre class="doctools_example">
+package require Tcl 8.6
+package require critcl 3.2
+critcl::buildrequirement {
+    package require critcl::emap
+}
+critcl::emap::def hiddenmode {
+            no  0 n 0 off 0 false 0 0 0
+    all   1 yes 1 y 1 on  1 true  1 1 1
+    stars 2
+} -nocase
+# Declarations: hiddenmode.h
+# Encoder:      int      hiddenmode_encode (Tcl_Interp* interp, Tcl_Obj* state, int* result);
+# Decoder:      Tcl_Obj* hiddenmode_decode (Tcl_Interp* interp, int state);
+# ResultType:   hiddenmode
+# ArgumentType: hiddenmode
+</pre>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Authors</a></h2>
+<p>Andreas Kupries</p>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report such at <a href="https://github.com/andreas-kupries/critcl">https://github.com/andreas-kupries/critcl</a>.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#tcl_interp_association">Tcl Interp Association</a>, <a href="../index.html#bitmask">bitmask</a>, <a href="../index.html#bitset">bitset</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#flags">flags</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a>, <a href="../index.html#singleton">singleton</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_enum.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_enum.html
new file mode 100644
index 00000000..8c872f72
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_enum.html
@@ -0,0 +1,274 @@
+<!DOCTYPE html><html><head>
+<title>critcl::enum - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_enum.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl::enum.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl::enum(n) 1.2 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl::enum - CriTcl - Wrap Support - String/Integer mapping</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#synopsis">Synopsis</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">API</a></li>
+<li class="doctools_section"><a href="#section3">Example</a></li>
+<li class="doctools_section"><a href="#section4">Authors</a></li>
+<li class="doctools_section"><a href="#section5">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="synopsis" class="doctools_section"><h2><a name="synopsis">Synopsis</a></h2>
+<div class="doctools_synopsis">
+<ul class="doctools_requirements">
+<li>package require <b class="pkgname">Tcl 8.6</b></li>
+<li>package require <b class="pkgname">critcl <span class="opt">?3.2?</span></b></li>
+<li>package require <b class="pkgname">critcl::enum <span class="opt">?1.2?</span></b></li>
+</ul>
+<ul class="doctools_syntax">
+<li><a href="#1"><b class="cmd">::critcl::enum::def</b> <i class="arg">name</i> <i class="arg">definition</i> <span class="opt">?<i class="arg">mode</i>?</span></a></li>
+</ul>
+</div>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This document is the reference manpage for the
+<b class="package">critcl::enum</b> package. This package provides convenience
+commands for advanced functionality built on top of both critcl core
+and package <b class="package"><a href="critcl_literals.html">critcl::literals</a></b>.</p>
+<p>It is an extended form of string pool which not only converts
+integer values into Tcl-level strings, but also handles the reverse
+direction, converting from strings to the associated integer values.</p>
+<p>It essentially provides a bi-directional mapping between a C
+enumeration type and a set of strings, one per enumeration value.
+<em>Note</em> that the C enumeration in question is created by the
+definition. It is not possible to use the symbols of an existing
+enumeration type.</p>
+<p>This package was written to make the declaration and management
+of such mappings easy. It uses a string pool for one of the directions,
+using its ability to return shared literals and conserve memory.</p>
+<p>Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code.</p>
+<p>This package resides in the Core Package Layer of CriTcl.</p>
+<p><img alt="arch_core" src="../image/arch_core.png"></p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">API</a></h2>
+<dl class="doctools_definitions">
+<dt><a name="1"><b class="cmd">::critcl::enum::def</b> <i class="arg">name</i> <i class="arg">definition</i> <span class="opt">?<i class="arg">mode</i>?</span></a></dt>
+<dd><p>This command defines two C functions for the conversion between
+C values and Tcl_Obj'ects, with named derived from <i class="arg">name</i>.</p>
+<p>The <i class="arg">definition</i> dictionary provides the mapping from the
+specified C-level symbolic names to the strings themselves.</p>
+<p>The <i class="arg">mode</i>-list configures the output somewhat.
+The two allowed modes are <b class="const">+list</b> and <b class="const">tcl</b>.
+All modes can be used together.
+The default mode is <b class="const">tcl</b>.
+Using mode <b class="const">+list</b> implies <b class="const">tcl</b> as well.</p>
+<p>For mode <b class="const">tcl</b> the new function has two arguments, a
+<b class="type">Tcl_Interp*</b> pointer refering to the interpreter holding the
+string pool, and a code of type &quot;<i class="arg">name</i>_pool_names&quot; (see below),
+the symbolic name of the string to return. The result of the function
+is a <b class="type">Tcl_Obj*</b> pointer to the requested string constant.</p>
+<p>For mode <b class="const">+list</b> all of <b class="const">tcl</b> applies, plus an
+additional function is generated which takes three arguments, in
+order: a <b class="type">Tcl_Interp*</b> pointer refering to the interpreter
+holding the string pool, an <b class="type">int</b> holding the size of the last
+argument, and an array of type &quot;<i class="arg">name</i>_pool_names&quot; holding the
+codes (see below), the symbolic names of the strings to return. The
+result of the function is a <b class="type">Tcl_Obj*</b> pointer to a Tcl list
+holding the requested string constants.</p>
+<p>The underlying string pool is automatically initialized on
+first access, and finalized on interpreter destruction.</p>
+<p>The package generates multiple things (declarations and
+definitions) with names derived from <i class="arg">name</i>, which has to be a
+proper C identifier.</p>
+<dl class="doctools_definitions">
+<dt><i class="arg">name</i>_pool_names</dt>
+<dd><p>The C enumeration type containing the specified symbolic names.</p></dd>
+<dt><i class="arg">name</i>_ToObj</dt>
+<dd><p>The function converting from integer value to Tcl string.
+Its signature is</p>
+<pre class="doctools_example">
+Tcl_Obj* <i class="arg">name</i>_ToObj (Tcl_Interp* interp, <i class="arg">name</i>_names literal);
+</pre>
+</dd>
+<dt><i class="arg">name</i>_ToObjList</dt>
+<dd><p>The mode <b class="const">+list</b> function converting from integer array to Tcl
+list of strings.
+Its signature is</p>
+<pre class="doctools_example">
+Tcl_Obj* <i class="arg">name</i>_ToObjList (Tcl_Interp* interp, int c, <i class="arg">name</i>_names* literal);
+</pre>
+</dd>
+<dt><i class="arg">name</i>_GetFromObj</dt>
+<dd><p>The function converting from Tcl string to integer value.
+Its signature is</p>
+<pre class="doctools_example">
+int <i class="arg">name</i>_GetFromObj (Tcl_Interp* interp, Tcl_Obj* obj, int flags, int* literal);
+</pre>
+<p>The <i class="arg">flags</i> are like for <b class="function">Tcl_GetIndexFromObj</b>.</p></dd>
+<dt><i class="arg">name</i>.h</dt>
+<dd><p>A header file containing the declarations for the converter functions,
+for use by other parts of the system, if necessary.</p>
+<p>The generated file is stored in a place where it will not
+interfere with the overall system outside of the package, yet also be
+available for easy inclusion by package files (<b class="cmd">csources</b>).</p></dd>
+<dt><i class="arg">name</i></dt>
+<dd><p>At the level of critcl itself the command registers a new result-type
+for <b class="cmd">critcl::cproc</b>, which takes an integer result from the function
+and converts it to the equivalent string in the pool for the script.</p></dd>
+<dt><i class="arg">name</i></dt>
+<dd><p>At the level of critcl itself the command registers a new argument-type
+for <b class="cmd">critcl::cproc</b>, which takes a Tcl string and converts it to the
+equivalent integer for delivery to the function.</p></dd>
+</dl></dd>
+</dl>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Example</a></h2>
+<p>The example shown below is the specification for a set of actions, methods,
+and the like, a function may take as argument.</p>
+<pre class="doctools_example">
+package require Tcl 8.6
+package require critcl 3.2
+critcl::buildrequirement {
+    package require critcl::enum
+}
+critcl::enum::def action {
+    w_create	&quot;create&quot;
+    w_directory	&quot;directory&quot;
+    w_events	&quot;events&quot;
+    w_file	&quot;file&quot;
+    w_handler	&quot;handler&quot;
+    w_remove	&quot;remove&quot;
+}
+# Declarations: action.h
+# Type:         action_names
+# Accessor:     Tcl_Obj* action_ToObj (Tcl_Interp* interp, int literal);
+# Accessor:     int action_GetFromObj (Tcl_Interp* interp, Tcl_Obj* o, int flags, int* literal);
+# ResultType:   action
+# ArgType:      action
+</pre>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Authors</a></h2>
+<p>Andreas Kupries</p>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report such at <a href="https://github.com/andreas-kupries/critcl">https://github.com/andreas-kupries/critcl</a>.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#tcl_interp_association">Tcl Interp Association</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#conversion">conversion</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#int_to_string_mapping">int to string mapping</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#literal_pool">literal pool</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a>, <a href="../index.html#singleton">singleton</a>, <a href="../index.html#string_pool">string pool</a>, <a href="../index.html#string_to_int_mapping">string to int mapping</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_howto_install.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_howto_install.html
new file mode 100644
index 00000000..2e0a4833
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_howto_install.html
@@ -0,0 +1,346 @@
+<!DOCTYPE html><html><head>
+<title>critcl_howto_install - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_howto_install.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; Jean-Claude Wippler   -- Copyright &amp;copy; Steve Landers   -- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl_howto_install.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl_howto_install(n) 3.2.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl_howto_install - How To Install CriTcl</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">Install The Requisites</a>
+<ul>
+<li class="doctools_subsection"><a href="#subsection1">Install A Working C Compiler</a></li>
+<li class="doctools_subsection"><a href="#subsection2">Install A Working Tcl Shell</a></li>
+<li class="doctools_subsection"><a href="#subsection3">Install Supporting Tcl Packages</a></li>
+</ul>
+</li>
+<li class="doctools_section"><a href="#section3">Install The CriTcl Packages</a>
+<ul>
+<li class="doctools_subsection"><a href="#subsection4">Install On Unix</a></li>
+<li class="doctools_subsection"><a href="#subsection5">Install On Windows</a></li>
+</ul>
+</li>
+<li class="doctools_section"><a href="#section4">Test The Installation</a></li>
+<li class="doctools_section"><a href="#section5">Authors</a></li>
+<li class="doctools_section"><a href="#section6">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p><i class="term"><a href="critcl.html">CriTcl</a></i> is installed in four major steps:</p>
+<ol class="doctools_enumerated">
+<li><p><span class="sectref"><a href="#section2">Install The Requisites</a></span></p></li>
+<li><p>Follow the instructions on <i class="term"><a href="critcl_howto_sources.html">How To Get The CriTcl Sources</a></i></p></li>
+<li><p><span class="sectref"><a href="#section3">Install The CriTcl Packages</a></span></p></li>
+<li><p><span class="sectref"><a href="#section4">Test The Installation</a></span></p></li>
+</ol>
+<p>It is now possible to follow the instructions on <i class="term"><a href="critcl_howto_use.html">How To Use CriTcl</a></i>.</p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">Install The Requisites</a></h2>
+<p>This major step breaks down into three minor steps:</p>
+<ol class="doctools_enumerated">
+<li><p><span class="sectref"><a href="#subsection1">Install A Working C Compiler</a></span> and development environment.</p></li>
+<li><p><span class="sectref"><a href="#subsection2">Install A Working Tcl Shell</a></span></p></li>
+<li><p><span class="sectref"><a href="#subsection3">Install Supporting Tcl Packages</a></span></p></li>
+</ol>
+<div id="subsection1" class="doctools_subsection"><h3><a name="subsection1">Install A Working C Compiler</a></h3>
+<p>While <i class="term"><a href="critcl.html">CriTcl</a></i> requires a working C compiler to both install itself, and to process
+<i class="term"><a href="critcl.html">CriTcl</a></i>-based packages installing such is very much out of scope for this document.</p>
+<p>Please follow the instructions for the platform and system <i class="term"><a href="critcl.html">CriTcl</a></i> is to be
+installed on.</p>
+<p>The important pieces of information are this:</p>
+<ol class="doctools_enumerated">
+<li><p>The path to the directory containing the C compiler binary has to be listed in the
+       environment variable <b class="variable">PATH</b>, for <i class="term"><a href="critcl.html">CriTcl</a></i> to find it.</p></li>
+<li><p>On Windows(tm) the environment variable <b class="variable">LIB</b> has to be present and contain the
+       paths of the directories holding Microsoft's libraries. The standard <i class="term"><a href="critcl.html">CriTcl</a></i>
+       configuration for this platform searches these paths to fine-tune its settings
+       based on available libraries and compiler version.</p></li>
+</ol>
+<p>Links of interest:</p>
+<dl class="doctools_definitions">
+<dt><a href="http://www.tldp.org/HOWTO/HOWTO-INDEX/programming.html">http://www.tldp.org/HOWTO/HOWTO-INDEX/programming.html</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div id="subsection2" class="doctools_subsection"><h3><a name="subsection2">Install A Working Tcl Shell</a></h3>
+<p>That a working installation of <i class="term"><a href="critcl.html">CriTcl</a></i> will require a working installation of
+<a href="http://core.tcl-lang.org/tcl">Tcl</a> should be obvious.</p>
+<p>Installing Tcl however is out of scope here, same as for installing a working C
+compiler.</p>
+<p>There are too many options, starting from
+<a href="http://core.tcl-lang.org/tcl">building it from scratch</a>, installing what is provided
+by the platform's package manager (<a href="https://en.opensuse.org/Portal:Zypper">zypper</a>, <a href="https://access.redhat.com/solutions/9934">yum</a>, <a href="https://help.ubuntu.com/community/AptGet/Howto">apt-get</a>, and more),
+to using some vendor's <a href="https://core.tcl-lang.org/dist.html">distribution</a>.</p>
+<p>A single piece of advice however.</p>
+<p>While <i class="term"><a href="critcl.html">CriTcl</a></i> currently supports running on Tcl 8.4 and higher, and the
+creation of packages for the same, the last release for this version was in 2013 (9 years
+ago at the time of writing). Similarly, the last release for Tcl 8.5 was in 2016 (6 years
+ago). Both are official end of life.</p>
+<p>Given this I recommend to install and use Tcl 8.6.</p>
+</div>
+<div id="subsection3" class="doctools_subsection"><h3><a name="subsection3">Install Supporting Tcl Packages</a></h3>
+<p>The implementation of <i class="term"><a href="critcl.html">CriTcl</a></i> uses and depends on</p>
+<ol class="doctools_enumerated">
+<li><p><b class="package">cmdline</b></p></li>
+</ol>
+<p>Depending on how Tcl was installed this package may be available already without
+action, or not.
+Invoke the command</p>
+<pre class="doctools_example">
+    echo 'puts [package require cmdline]' | tclsh
+</pre>
+<p>to check if the package is present or not. If it is present then its version number will
+be printed, else the error message <b class="const">can't find package cmdline</b> or similar.</p>
+<p>If it is not present install the package as per the instructions for the chosen Tcl
+installation.</p>
+<p><em>Note</em>, the package <b class="package">cmdline</b> may not exist as its own installable
+package. In such a case check if the chosen Tcl installation provides a <b class="package">tcllib</b>
+package and install that. This should install all the packages in the Tcllib bundle,
+including <b class="package">cmdline</b>.</p>
+<p>As a last fallback, go to <a href="http://core.tcl-lang.org/tcllib">Tclib</a> and follow the instructions to install
+the bundle from scratch.</p>
+</div>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Install The CriTcl Packages</a></h2>
+<p>Note that this step has different instructions dependent on the platform <i class="term"><a href="critcl.html">CriTcl</a></i> is
+to be installed on. In other words, only one of the sub sections applies, the other can be
+ignored.</p>
+<div id="subsection4" class="doctools_subsection"><h3><a name="subsection4">Install On Unix</a></h3>
+<p>This section offers instructions for installing <i class="term"><a href="critcl.html">CriTcl</a></i> on various kinds of Unix and
+Unix-related systems, i.e. <i class="term">Linux</i>, the various <i class="term">BSD</i>s, etc. It especially
+covers <i class="term">Mac OS X</i> as well.</p>
+<p>Use the instructions in section <span class="sectref"><a href="#subsection5">Install On Windows</a></span> when installing on a
+Windows platform and not using a unix-like environment as provided by tools like
+<a href="https://www.mingw-w64.org">MinGW</a>, <a href="https://www.cygwin.com/">CygWin</a>, <a href="https://gitforwindows.org">Git For Windows</a>, <a href="https://docs.microsoft.com/en-us/windows/wsl/faq">WSL</a>, etc.</p>
+<ol class="doctools_enumerated">
+<li><p>Change the working directory to the top level directory of the <i class="term"><a href="critcl.html">CriTcl</a></i>
+checkout obtained by following the instructions of <i class="term"><a href="critcl_howto_sources.html">How To Get The CriTcl Sources</a></i>.</p></li>
+<li><p>Verify that the file &quot;<b class="file">build.tcl</b>&quot; is marked executable. Make it executable if
+it is not.</p></li>
+<li><p>Invoke</p>
+<pre class="doctools_example"> ./build.tcl install </pre>
+<p>to perform the installation.</p>
+<p><em>Attention</em> This command uses default locations for the placement of the
+<b class="cmd"><a href="critcl.html">critcl</a></b> application, the various packages, and header files.</p></li>
+<li><p>Invoke</p>
+<pre class="doctools_example"> ./build.tcl dirs </pre>
+<p>to see the chosens paths before actually
+performing the installation.</p></li>
+<li><p>Use the options listed below to change the paths used for installation as desired. This is
+the same method as with <b class="cmd">configure</b> based packages.</p>
+<dl class="doctools_options">
+<dt><b class="option">--prefix</b> <i class="arg">path</i></dt>
+<dd><p>Base path for non-package files.</p></dd>
+<dt><b class="option">--include-dir</b> <i class="arg">path</i></dt>
+<dd><p>Destination path for header files.</p></dd>
+<dt><b class="option">--exec-prefix</b> <i class="arg">path</i></dt>
+<dd><p>Base path for applications and packages.</p></dd>
+<dt><b class="option">--bin-dir</b> <i class="arg">path</i></dt>
+<dd><p>Destination path for applications.</p></dd>
+<dt><b class="option">--lib-dir</b> <i class="arg">path</i></dt>
+<dd><p>Destination path for packages.</p></dd>
+</dl>
+<p>These options are especially necessary in all environments not using the semi-standard
+&quot;<b class="file">bin</b>&quot;, &quot;<b class="file">lib</b>&quot;, &quot;<b class="file">include</b>&quot; locations from <b class="syscmd">configure</b>.</p>
+<p>As an example of such environments, Ubuntu (and possibly Debian) expect Tcl
+packages to be installed into the &quot;<b class="file">/usr/share/tcltk</b>&quot; directory, therefore requiring
+the use of</p>
+<pre class="doctools_example">--lib-dir /usr/share/tcltk</pre>
+<p>for proper installation.</p></li>
+</ol>
+<p><em>Note</em> that this guide neither covers the details of the <b class="method">install</b>
+method, nor does it cover any of the other methods available through the <b class="cmd">build.tcl</b>
+tool of <i class="term"><a href="critcl.html">CriTcl</a></i>.
+These can be found in the <i class="term"><a href="critcl_build.html">CriTcl build.tcl Tool Reference</a></i>.</p>
+</div>
+<div id="subsection5" class="doctools_subsection"><h3><a name="subsection5">Install On Windows</a></h3>
+<p>This section offers instructions for installing <i class="term"><a href="critcl.html">CriTcl</a></i> on a Windows (tm) host.
+<em>Note</em> that environments as provided by tools like <a href="https://www.mingw-w64.org">MinGW</a>, <a href="https://www.cygwin.com/">CygWin</a>,
+<a href="https://gitforwindows.org">Git For Windows</a>, <a href="https://docs.microsoft.com/en-us/windows/wsl/faq">WSL</a>, etc. are classed as Unix-like, and the instructions in section
+<span class="sectref"><a href="#subsection4">Install On Unix</a></span> apply.</p>
+<ol class="doctools_enumerated">
+<li><p>In a DOS box, change the working directory to the top level directory of the
+<i class="term"><a href="critcl.html">CriTcl</a></i> checkout obtained by following the instructions of
+<i class="term"><a href="critcl_howto_sources.html">How To Get The CriTcl Sources</a></i>.</p></li>
+<li><p>In the same DOS box, invoke</p>
+<pre class="doctools_example"> tclsh.exe ./build.tcl install </pre>
+<p>to perform
+the installation.</p>
+<p><em>Attention</em> This command uses default locations for the placement of the
+<b class="cmd"><a href="critcl.html">critcl</a></b> application, the various packages, and header files.</p></li>
+<li><p>Invoke</p>
+<pre class="doctools_example"> tclsh.exe ./build.tcl dirs </pre>
+<p>to see the chosens paths before
+actually performing the installation.</p></li>
+<li><p>Use the options listed below to change the paths used for installation as desired. This is
+the same method as with <b class="cmd">configure</b> based packages.</p>
+<dl class="doctools_options">
+<dt><b class="option">--prefix</b> <i class="arg">path</i></dt>
+<dd><p>Base path for non-package files.</p></dd>
+<dt><b class="option">--include-dir</b> <i class="arg">path</i></dt>
+<dd><p>Destination path for header files.</p></dd>
+<dt><b class="option">--exec-prefix</b> <i class="arg">path</i></dt>
+<dd><p>Base path for applications and packages.</p></dd>
+<dt><b class="option">--bin-dir</b> <i class="arg">path</i></dt>
+<dd><p>Destination path for applications.</p></dd>
+<dt><b class="option">--lib-dir</b> <i class="arg">path</i></dt>
+<dd><p>Destination path for packages.</p></dd>
+</dl>
+</li>
+</ol>
+<p><em>Attention!</em> The current installer does not put an extension on the
+<b class="syscmd"><a href="critcl.html">critcl</a></b> application. This forces users to either explicitly choose the
+<b class="syscmd">tclsh</b> to run the application, or manually rename the installed file to
+&quot;<b class="file">critcl.tcl</b>&quot;. The latter assumes that an association for &quot;<b class="file">.tcl</b>&quot; is available, to
+either <b class="syscmd">tclsh</b>, or <b class="syscmd">wish</b>.</p>
+<p><em>Note</em> that this guide neither covers the details of the <b class="method">install</b>
+method, nor does it cover any of the other methods available through the <b class="cmd">build.tcl</b>
+tool of <i class="term"><a href="critcl.html">CriTcl</a></i>.
+These can be found in the <i class="term"><a href="critcl_build.html">CriTcl build.tcl Tool Reference</a></i>.</p>
+</div>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Test The Installation</a></h2>
+<p>Installing <i class="term"><a href="critcl.html">CriTcl</a></i> contains an implicit test of its functionality.</p>
+<p>One of its operation modes uses the MD5 hash internally to generate unique ids for
+sources, as a means of detecting changes. To make generation of such hashes fast a
+<i class="term"><a href="critcl.html">CriTcl</a></i>-based package for MD5 is installed as part of the main installation process.</p>
+<p>In other words, after installing the core packages of <i class="term"><a href="critcl.html">CriTcl</a></i> this partial
+installation is used to build the rest.</p>
+<p>This is possible because building a package from <i class="term"><a href="critcl.html">CriTcl</a></i>-based sources is the
+operation mode not using MD5, therefore there is no circular dependency.</p>
+<p>For our purposes this however is also a self-test of the system, verifying that the
+core of <i class="term"><a href="critcl.html">CriTcl</a></i> works, as well as the C compiler.</p>
+<p>For additional testing simply move on to section <b class="sectref">The First Package</b> of
+the guide on <i class="term"><a href="critcl_howto_use.html">How To Use CriTcl</a></i>.</p>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Authors</a></h2>
+<p>Jean Claude Wippler, Steve Landers, Andreas Kupries</p>
+</div>
+<div id="section6" class="doctools_section"><h2><a name="section6">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report them at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a>.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a> as well.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#calling_c_code_from_tcl">calling C code from Tcl</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; Jean-Claude Wippler<br>
+Copyright &copy; Steve Landers<br>
+Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_howto_sources.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_howto_sources.html
new file mode 100644
index 00000000..f35fa793
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_howto_sources.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html><html><head>
+<title>critcl_howto_sources - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_howto_sources.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; Jean-Claude Wippler   -- Copyright &amp;copy; Steve Landers   -- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl_howto_sources.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl_howto_sources(n) 3.2.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl_howto_sources - How To Get The CriTcl Sources</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">Install the Git Source Code Manager</a></li>
+<li class="doctools_section"><a href="#section3">Retrieve The Sources</a></li>
+<li class="doctools_section"><a href="#section4">Authors</a></li>
+<li class="doctools_section"><a href="#section5">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>The sources for <i class="term"><a href="critcl.html">CriTcl</a></i> are retrieved in two easy steps:</p>
+<ol class="doctools_enumerated">
+<li><p><span class="sectref"><a href="#section2">Install the Git Source Code Manager</a></span></p></li>
+<li><p><span class="sectref"><a href="#section3">Retrieve The Sources</a></span></p></li>
+</ol>
+<p>It is now possible to follow the instructions on <i class="term"><a href="critcl_howto_install.html">How To Install CriTcl</a></i>.</p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">Install the Git Source Code Manager</a></h2>
+<p><i class="term"><a href="critcl.html">CriTcl</a></i>'s sources are managed by the popular <a href="http://www.git-scm.com">Git SCM</a>.</p>
+<p>Binaries of clients for popular platforms can be found at the <a href="https://git-scm.com/downloads">download page</a>.</p>
+<p>See also if your operating system's package manager provides clients and associated
+tools for installation. If so, follow the instructions for the installation of such
+packages on your system.</p>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Retrieve The Sources</a></h2>
+<ol class="doctools_enumerated">
+<li><p>Choose a directory for the sources, and make it the working directory.</p></li>
+<li><p>Invoke the command</p>
+<pre class="doctools_example">
+git clone <a href="http://andreas-kupries.github.io/critcl">http://andreas-kupries.github.io/critcl</a>
+</pre>
+</li>
+<li><p>The working directory now contains a sub-directory &quot;<b class="file">critcl</b>&quot; holding the
+sources of <i class="term"><a href="critcl.html">CriTcl</a></i>.</p></li>
+</ol>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Authors</a></h2>
+<p>Jean Claude Wippler, Steve Landers, Andreas Kupries</p>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report them at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a>.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a> as well.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#calling_c_code_from_tcl">calling C code from Tcl</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; Jean-Claude Wippler<br>
+Copyright &copy; Steve Landers<br>
+Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_howto_use.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_howto_use.html
new file mode 100644
index 00000000..69985143
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_howto_use.html
@@ -0,0 +1,1791 @@
+<!DOCTYPE html><html><head>
+<title>critcl_howto_use - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_howto_use.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; Jean-Claude Wippler   -- Copyright &amp;copy; Steve Landers   -- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl_howto_use.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl_howto_use(n) 3.2.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl_howto_use - How To Use CriTcl</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">Basics</a>
+<ul>
+<li class="doctools_subsection"><a href="#subsection1">Simple Arguments</a></li>
+<li class="doctools_subsection"><a href="#subsection2">Simple Results</a></li>
+<li class="doctools_subsection"><a href="#subsection3">Range-limited Simple Arguments</a></li>
+<li class="doctools_subsection"><a href="#subsection4">String Arguments</a></li>
+<li class="doctools_subsection"><a href="#subsection5">String Results</a></li>
+<li class="doctools_subsection"><a href="#subsection6">List Arguments</a></li>
+<li class="doctools_subsection"><a href="#subsection7">Constrained List Arguments</a></li>
+<li class="doctools_subsection"><a href="#subsection8">Raw Tcl_Obj* Arguments</a></li>
+<li class="doctools_subsection"><a href="#subsection9">Raw Tcl_Obj* Results</a></li>
+<li class="doctools_subsection"><a href="#subsection10">Errors &amp; Messages</a></li>
+<li class="doctools_subsection"><a href="#subsection11">Tcl_Interp* Access</a></li>
+<li class="doctools_subsection"><a href="#subsection12">Binary Data Arguments</a></li>
+<li class="doctools_subsection"><a href="#subsection13">Constant Binary Data Results</a></li>
+<li class="doctools_subsection"><a href="#subsection14">Tcl Runtime Version</a></li>
+<li class="doctools_subsection"><a href="#subsection15">Additional Tcl Code</a></li>
+<li class="doctools_subsection"><a href="#subsection16">Debugging Support</a></li>
+<li class="doctools_subsection"><a href="#subsection17">Install The Package</a></li>
+</ul>
+</li>
+<li class="doctools_section"><a href="#section3">Using External Libraries</a>
+<ul>
+<li class="doctools_subsection"><a href="#subsection18">Default Values For Arguments</a></li>
+<li class="doctools_subsection"><a href="#subsection19">Custom Argument Validation</a></li>
+<li class="doctools_subsection"><a href="#subsection20">Separating Local C Sources</a></li>
+<li class="doctools_subsection"><a href="#subsection21">Very Simple Results</a></li>
+<li class="doctools_subsection"><a href="#subsection22">Structure Arguments</a></li>
+<li class="doctools_subsection"><a href="#subsection23">Structure Results</a></li>
+<li class="doctools_subsection"><a href="#subsection24">Structure Types</a></li>
+<li class="doctools_subsection"><a href="#subsection25">Large Structures</a></li>
+<li class="doctools_subsection"><a href="#subsection26">External Structures</a></li>
+<li class="doctools_subsection"><a href="#subsection27">External Enumerations</a></li>
+<li class="doctools_subsection"><a href="#subsection28">External Bitsets/Bitmaps/Flags</a></li>
+<li class="doctools_subsection"><a href="#subsection29">Non-standard header/library locations</a></li>
+<li class="doctools_subsection"><a href="#subsection30">Non-standard compile/link configuration</a></li>
+<li class="doctools_subsection"><a href="#subsection31">Querying the compilation environment</a></li>
+<li class="doctools_subsection"><a href="#subsection32">Shared C Code</a></li>
+</ul>
+</li>
+<li class="doctools_section"><a href="#section4">Various</a>
+<ul>
+<li class="doctools_subsection"><a href="#subsection33">Author, License, Description, Keywords</a></li>
+<li class="doctools_subsection"><a href="#subsection34">Get Critcl Application Help</a></li>
+<li class="doctools_subsection"><a href="#subsection35">Supported Targets &amp; Configurations</a></li>
+<li class="doctools_subsection"><a href="#subsection36">Building A Package</a></li>
+<li class="doctools_subsection"><a href="#subsection37">Building A Package For Debugging</a></li>
+</ul>
+</li>
+<li class="doctools_section"><a href="#section5">Authors</a></li>
+<li class="doctools_section"><a href="#section6">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This document assumes the presence of a working <i class="term"><a href="critcl.html">CriTcl</a></i> installation.</p>
+<p>If that is missing follow the instructions on <i class="term"><a href="critcl_howto_install.html">How To Install CriTcl</a></i>.</p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">Basics</a></h2>
+<p>To create a minimal working package</p>
+<ol class="doctools_enumerated">
+<li><p>Choose a directory to develop in and make it the working directory. This should
+not be a checkout of <i class="term"><a href="critcl.html">CriTcl</a></i> itself.</p></li>
+<li><p>Save the following example to a file. In the following it is assumed that the file
+was named &quot;<b class="file">example.tcl</b>&quot;.</p>
+<pre class="doctools_example">
+# -*- tcl -*-
+# Critcl support, absolutely necessary.
+package require critcl
+# Bail out early if the compile environment is not suitable.
+if {![critcl::compiling]} {
+    error &quot;Unable to build project, no proper compiler found.&quot;
+}
+# Information for the teapot.txt meta data file put into a generated package.
+# Free form strings.
+critcl::license {Andreas Kupries} {Under a BSD license}
+critcl::summary {The first CriTcl-based package}
+critcl::description {
+    This package is the first example of a CriTcl-based package. It contains all the
+    necessary and conventionally useful pieces.
+}
+critcl::subject example {critcl package}
+critcl::subject {basic critcl}
+# Minimal Tcl version the package should load into.
+critcl::tcl 8.6
+# Use to activate Tcl memory debugging
+#critcl::debug memory
+# Use to activate building and linking with symbols (for gdb, etc.)
+#critcl::debug symbols
+# ## #### ######### ################ #########################
+## A hello world, directly printed to stdout. Bypasses Tcl's channel system.
+critcl::cproc hello {} void {
+    printf(&quot;hello world\n&quot;);
+}
+# ## #### ######### ################ #########################
+# Forcing compilation, link, and loading now.
+critcl::msg -nonewline { Building ...}
+if {![critcl::load]} {
+    error &quot;Building and loading the project failed.&quot;
+}
+# Name and version the package. Just like for every kind of Tcl package.
+package provide critcl-example 1
+</pre>
+</li>
+<li><p>Invoke the command</p>
+<pre class="doctools_example"> critcl -keep -debug all -pkg example.tcl </pre>
+<p>This compiles the example and installs it into a &quot;<b class="file">lib/</b>&quot; sub directory of the
+working directory, generating output similar to</p>
+<pre class="doctools_example">
+    Config:   linux-x86_64-gcc
+    Build:    linux-x86_64-gcc
+    Target:   linux-x86_64
+    Source:   example.tcl  (provide critcl-example 1) Building ...
+    Library:  example.so
+     (tclStubsPtr     =&gt;  const TclStubs *tclStubsPtr;)
+     (tclPlatStubsPtr =&gt;  const TclPlatStubs *tclPlatStubsPtr;)
+    Package:  lib/example
+    Files left in /home/aku/.critcl/pkg2567272.1644845439   
+</pre>
+<p>during operation.</p>
+<p>The <b class="option">-keep</b> option suppressed the cleanup of the generated C files, object
+files, compiler log, etc. normally done at the end of building.</p>
+<pre class="doctools_example">
+% ls -l /home/aku/.critcl/pkg2567272.1644845439
+total 36
+-rw-r--r-- 1 aku aku  1260 Feb 14 18:30 v3118_00000000000000000000000000000004.c
+-rw-r--r-- 1 aku aku  2096 Feb 14 18:30 v3118_00000000000000000000000000000004_pic.o
+-rw-r--r-- 1 aku aku  1728 Feb 14 18:30 v3118_00000000000000000000000000000009.c
+-rw-r--r-- 1 aku aku  2448 Feb 14 18:30 v3118_00000000000000000000000000000009_pic.o
+-rwxr-xr-x 1 aku aku 14424 Feb 14 18:30 v3118_00000000000000000000000000000009.so
+-rw-r--r-- 1 aku aku  1725 Feb 14 18:30 v3118.log
+</pre>
+<p>This enables inspection of the generated C code.
+Simply drop the option from the command if that is not desired.</p>
+<p>The option <b class="option">-debug</b>, with argument <b class="const">all</b> activated Tcl's memory
+debugging and caused the generation of the symbol tables needed by <b class="syscmd">gdb</b> or any
+other debugger. The alternate arguments <b class="const">memory</b> and <b class="const">symbols</b> activate just
+one of the these.</p></li>
+<li><p>Now invoke an interactive <b class="syscmd">tclsh</b> and enter the commands:</p>
+<ul class="doctools_itemized">
+<li><p><em>lappend auto_path lib</em></p></li>
+<li><p><em>package require critcl-example</em></p></li>
+<li><p><em>info loaded</em></p></li>
+<li><p><em>hello</em></p></li>
+<li><p><em>exit</em></p></li>
+</ul>
+<p>I.e. extend <b class="syscmd">tclsh</b>'s package search path to include the location of the new
+package, load the package, verify that the associated shared library is present, invoke
+the package command, and stop the session.</p>
+<p>When the package command is invoked the terminal will show <b class="const">hello world</b>,
+followed by the prompt.</p></li>
+</ol>
+<p>Commands: <i class="term">critcl::compiling</i>, <i class="term">critcl::cproc</i>,
+<i class="term">critcl::description</i>, <i class="term">critcl::license</i>, <i class="term">critcl::load</i>,
+<i class="term">critcl::msg</i>, <i class="term">critcl::subject</i>, <i class="term">critcl::summary</i>, <i class="term">critcl::tcl</i>.</p>
+<p>Make a copy of &quot;<b class="file">example.tcl</b>&quot; before going through the sub-sections. Keep it as
+a save point to return to from the editing done in the sub-section.</p>
+<div id="subsection1" class="doctools_subsection"><h3><a name="subsection1">Simple Arguments</a></h3>
+<p>A function taking neither arguments nor returning results is not very useful.</p>
+<ol class="doctools_enumerated">
+<li><p>We are now extending the command to take an argument.</p></li>
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    critcl::cproc hello {double x} void {
+	/* double x; */
+	printf(&quot;hello world, we have %f\n&quot;, x);
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>When testing the package again, entering the simple <b class="cmd">hello</b> will fail.</p>
+<p>The changed command is now expecting an argument, and we gave it none.</p>
+<p>Retry by entering</p>
+<pre class="doctools_example">hello 5</pre>
+<p>instead.
+       Now the command behaves as expected and prints the provided value.</p>
+<p>Further try and enter</p>
+<pre class="doctools_example">hello world</pre>
+<p>This will fail again.
+       The command expected a real number and we gave it something decidedly not so.</p>
+<p>These checks (argument count, argument type) are implemented in the translation
+layer <i class="term"><a href="critcl.html">CriTcl</a></i> generates for the C function. The function body is never invoked.</p></li>
+</ol>
+</div>
+<div id="subsection2" class="doctools_subsection"><h3><a name="subsection2">Simple Results</a></h3>
+<p>A function taking neither arguments nor returning results is not very useful.</p>
+<ol class="doctools_enumerated">
+<li><p>We are now extending the command to return a result.</p></li>
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    critcl::cproc twice {double x} double {
+	return 2*x;
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>Note that the name of the command changed. Goodbye <b class="cmd">hello</b>, hello <b class="cmd">twice</b>.</p></li>
+<li><p>Invoke</p>
+<pre class="doctools_example"> twice 4 </pre>
+<p>and the <b class="syscmd">tclsh</b> will print the result <b class="const">8</b>
+in the terminal.</p></li>
+</ol>
+<p>An important limitation of the commands implemented so far is that they cannot
+fail. The types used so far (<b class="type">void</b>, <b class="type">double</b>) and related scalar types can
+return only a value of the specified type, and nothing else. They have no ability to
+signal an error to the Tcl script.</p>
+<p>We will come back to this after knowing a bit more about the more complex argument
+and result types.</p>
+<p>Of interest to the eager reader: <i class="term"><a href="critcl_cproc.html">CriTcl cproc Type Reference</a></i></p>
+</div>
+<div id="subsection3" class="doctools_subsection"><h3><a name="subsection3">Range-limited Simple Arguments</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    critcl::cproc hello {{double &gt; 5 &lt; 22} x} void {
+	/* double x, range 6-21; */
+	printf(&quot;hello world, we have %f\n&quot;, x);
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>When dealing with simple arguments whose range of legal values is limited to a single
+continuous interval extend the base type with the necessary relations (<b class="const">&gt;</b>, <b class="const">&gt;=</b>,
+<b class="const">&lt;</b>, and <b class="const">&lt;=</b>) and limiting values.</p>
+<p><em>Note</em> that the limiting values have to be proper constant numbers acceptable by the
+base type. Symbolic values are not accepted.</p>
+<p>Here the argument <i class="arg">x</i> of the changed function will reject all values outside of the
+interval 6 to 21.</p></li>
+</ol>
+</div>
+<div id="subsection4" class="doctools_subsection"><h3><a name="subsection4">String Arguments</a></h3>
+<p>Tcl prides itself on the fact that <i class="term">Everything Is A String</i>.
+So how are string values passed into C functions ?</p>
+<ol class="doctools_enumerated">
+<li><p>We are now extending the command with a string argument.</p></li>
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    critcl::cproc hello {pstring x} void {
+	/* critcl_pstring x (.s, .len, .o); */
+	printf(&quot;hello world, from %s (%d bytes)\n&quot;, x.s, x.len);
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>Testing <b class="cmd">hello</b> with any kind of argument the information is printed.</p></li>
+<li><p>Of note here is that the command argument <b class="variable">x</b> is a structure.</p></li>
+<li><p>The example uses only two of the three fields, the pointer to the string data
+(<b class="variable">.s</b>), and the length of the string (<b class="variable">.len</b>). In bytes, <em>not</em> in
+characters, because Tcl's internal representation of strings uses a modified UTF-8
+encoding. A character consists of between 1 and <b class="const">TCL_UTF_MAX</b> bytes.</p></li>
+<li><p><em>Attention</em> The pointers (<b class="variable">.s</b>) refer into data structures <em>internal</em>
+to and managed by the Tcl interpreter.
+Changing them is highly likely to cause subtle and difficult to track down bugs.
+Any and all complex arguments must be treated as <i class="term">Read-Only</i>. Never modify them.</p></li>
+<li><p>Use the simpler type <b class="type">char*</b> if and only if the length of the string is not
+relevant to the command, i.e. not computed, or not used by any of the functions called
+from the body of the command.
+Its value is essentially just the <b class="variable">.s</b> field of <b class="type">pstring</b>'s structure.
+This then looks like</p>
+<pre class="doctools_example">
+    critcl::cproc hello {char* x} void {
+	/* char* x; */
+	printf(&quot;hello world, from %s\n&quot;, x);
+    }
+</pre>
+</li>
+</ol>
+</div>
+<div id="subsection5" class="doctools_subsection"><h3><a name="subsection5">String Results</a></h3>
+<p>Tcl prides itself on the fact that <i class="term">Everything Is A String</i>.
+So how are string values returned from C functions ?</p>
+<ol class="doctools_enumerated">
+<li><p>We are now giving the command a string result.</p></li>
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    critcl::cproc twice {double x} char* {
+	char buf [lb]40[rb];
+	sprintf(buf, &quot;%f&quot;, 2*x);
+	return buf;
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>Note that the name of the command changed. Goodbye <b class="cmd">hello</b>, hello <b class="cmd">twice</b>.</p></li>
+<li><p>Invoke</p>
+<pre class="doctools_example"> twice 4 </pre>
+<p>and the <b class="syscmd">tclsh</b> will print the result <b class="const">8</b>
+in the terminal.</p></li>
+<li><p><em>Attention</em>. To the translation layer the string pointer is owned by the C
+code. A copy is made to become the result seen by Tcl.</p>
+<p>While the C code is certainly allowed to allocate the string on the heap if it so
+wishes, this comes with the responsibility to free the string as well. Abrogation of that
+responsibility will cause memory leaks.</p>
+<p>The type <b class="type">char*</b> is recommended to be used with static string buffers, string
+constants and the like.</p></li>
+<li><p>Conversely, to return heap-allocated strings it is recommended to use the type
+<b class="type">string</b> instead.</p>
+<p>Replace the definition of <b class="cmd">twice</b> with</p>
+<pre class="doctools_example">
+critcl::cproc twice {double x} string {
+    char* buf = Tcl_Alloc (40);
+    sprintf(buf, &quot;%f&quot;, 2*x);
+    return buf;
+}
+</pre>
+<p>Now the translation layer takes ownership of the string from the C code and
+transfers that ownership to the Tcl interpreter. This means that the string will be
+released when the Tcl interpreter is done with it. The C code has no say in the lifecycle
+of the string any longer, and having the C code releasing the string <em>will</em> cause
+issues. Dangling pointers and associated memory corruption and crashes.</p></li>
+</ol>
+</div>
+<div id="subsection6" class="doctools_subsection"><h3><a name="subsection6">List Arguments</a></h3>
+<p>Even as a string-oriented language Tcl is capable of handling more complex structures. The first of
+it, with Tcl since the beginning are <i class="term">lists</i>. Sets of values indexed by a numeric value.</p>
+<p>In C parlance, <i class="term">arrays</i>.</p>
+<ol class="doctools_enumerated">
+<li><p>We are now extending the command with a <b class="type">list</b> argument.</p></li>
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    critcl::cproc hello {list x} void {
+	/* critcl_list x (.o, .v, .c); */
+	printf(&quot;hello world, %d elements in (%s)\n&quot;, x.c, Tcl_GetString (x.o));
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>Testing <b class="cmd">hello</b> with any kind of list argument it will print basic information about it.</p></li>
+<li><p>Of note here is that the command argument <b class="variable">x</b> is a structure.</p></li>
+<li><p>The example uses only two of the three fields, the pointer to the original <b class="type">Tcl_Obj*</b>
+holding the list (<b class="variable">.o</b>), and the length of the list (<b class="variable">.c</b>) in elements.</p>
+<p>The field <b class="variable">.v</b>, not used above, is the C array holding the <b class="type">Tcl_Obj*</b> pointers to
+the list elements.</p></li>
+<li><p><em>Attention</em> The pointers <b class="variable">.o</b> and <b class="variable">.v</b> refer into data structures
+<em>internal</em> to and managed by the Tcl interpreter.
+Changing them is highly likely to cause subtle and difficult to track down bugs.
+Any and all complex arguments must be treated as <i class="term">Read-Only</i>. Never modify them.</p></li>
+<li><p>As a last note, this argument type does not place any constraints on the size of the list, or
+on the type of the elements.</p></li>
+</ol>
+</div>
+<div id="subsection7" class="doctools_subsection"><h3><a name="subsection7">Constrained List Arguments</a></h3>
+<p>As mentioned at the end of section <span class="sectref"><a href="#subsection6">List Arguments</a></span> the basic <b class="type">list</b> type places no
+constraints on the size of the list, nor on the type of the elements.</p>
+<p>Both kind of constraints can be done however, alone or together.</p>
+<ol class="doctools_enumerated">
+<li><p>We are now extending the command with a length-limited list.</p></li>
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    critcl::cproc hello {[5] x} void {
+	/* critcl_list x (.o, .v, .c); */
+	printf(&quot;hello world, %d elements in (%s)\n&quot;, x.c, Tcl_GetString (x.o));
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>Testing the new command will show that only lists holding exactly <b class="const">5</b> elements will be
+accepted.</p></li>
+<li><p>To accept lists of any length use <b class="const">[]</b> or <b class="const">[*]</b>. Both forms are actually
+aliases of the base type, i.e. <b class="type">list</b>.</p></li>
+<li><p>To constrain just the type of elements, for example to type <b class="type">int</b>, use</p>
+<pre class="doctools_example">int[]</pre>
+<p>or</p>
+<pre class="doctools_example">[]int</pre>
+</li>
+<li><p>To combine both type and length constraints use the forms</p>
+<pre class="doctools_example">int[5]</pre>
+<p>or</p>
+<pre class="doctools_example">[5]int</pre>
+</li>
+<li><p>The last, most C-like forms of these contraints place the list indicator syntax on the
+argument instead of the type. I.e</p>
+<pre class="doctools_example">int a[]</pre>
+<p>or</p>
+<pre class="doctools_example">int a[5]</pre>
+</li>
+</ol>
+</div>
+<div id="subsection8" class="doctools_subsection"><h3><a name="subsection8">Raw Tcl_Obj* Arguments</a></h3>
+<p>When the set of predefined argument types is not enough the oldest way of handling the
+situation is falling back to the structures used by Tcl to manage values, i.e.
+<b class="type">Tcl_Obj*</b>.</p>
+<ol class="doctools_enumerated">
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    critcl::cproc hello {object x} void {
+	/* Tcl_Obj* x */
+	int len;
+	char* str = Tcl_GetStringFromObj (x, &amp;len);
+	printf(&quot;hello world, from %s (%d bytes)\n&quot;, str, len);
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>Having direct access to the raw <b class="type">Tcl_Obj*</b> value all functions of the public
+Tcl API for working with Tcl values become usable. The downside of that is that all the
+considerations for handling them apply as well.</p>
+<p>In other words, the C code becomes responsible for handling the reference counts
+correctly, for duplicating shared <b class="type">Tcl_Obj*</b> structures before modifying them, etc.</p>
+<p>One thing the C code is allowed to do without restriction is to <i class="term">shimmer</i> the
+internal representation of the value as needed, through the associated Tcl API
+functions. For example <b class="function">Tcl_GetWideIntFromObj</b> and the like.
+It actually has to be allowed to do so, as the type checking done as part of such
+conversions is now the responsibility of the C code as well.</p>
+<p>For the predefined types this is all hidden in the translation layer generated by
+<i class="term"><a href="critcl.html">CriTcl</a></i>.</p>
+<p>If more than one command has to perform the same kind of checking and/or conversion
+it is recommended to move the core of the code into proper C functions for proper sharing
+among the commands.</p></li>
+<li><p>This is best done by defining a custom argument type using <i class="term"><a href="critcl.html">CriTcl</a></i> commands.
+This extends the translation layer <i class="term"><a href="critcl.html">CriTcl</a></i> is able to generate.
+The necessary conversions, type checks, etc. are then again hidden from the bulk of the
+application C code.</p>
+<p>We will come back to this.</p></li>
+</ol>
+</div>
+<div id="subsection9" class="doctools_subsection"><h3><a name="subsection9">Raw Tcl_Obj* Results</a></h3>
+<p>When the set of predefined result types is not enough the oldest way of handling the
+situation is falling back to the structures used by Tcl to manage values, i.e.
+<b class="type">Tcl_Obj*</b>.</p>
+<p>Two builtin types are provided for this, to handle different reference counting
+requirements.</p>
+<ol class="doctools_enumerated">
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    critcl::cproc twice {double x} object0 {
+	return Tcl_NewDoubleObj(2*x);
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>With <b class="type">object0</b> the translation layer assumes that the returned <b class="type">Tcl_Obj*</b>
+value has a reference count of <b class="const">0</b>. I.e. a value which is unowned and unshared.</p>
+<p>This value is passed directly to Tcl for its use, without any changes. Tcl
+increments the reference count and thus takes ownership. The value is still unshared.</p>
+<p>It would be extremely detrimental if the translation layer had decremented the
+reference count before passing the value. This action would release the memory and then
+leave Tcl with a dangling pointer and the associated memory corruption bug to come.</p></li>
+<li><p>The situation changes when the C code returns a <b class="type">Tcl_Obj*</b> value with a
+reference count greater than <b class="const">0</b>. I.e. at least owned (by the C code), and possibly
+even shared.
+There are some object constructors and/or mutators in the public Tcl API which do that,
+although I do not recall their names. The example below simulates this situation by
+explicitly incrementing the reference count before returning the value.</p></li>
+<li><p>In this case use the type <b class="type">object</b> (without the trailing <b class="const">0</b>).</p></li>
+<li><p>Edit the file &quot;<b class="file">example.tcl</b>&quot; and replace the definition of <b class="cmd">twice</b> with</p>
+<pre class="doctools_example">
+    critcl::cproc twice {double x} object {
+	Tcl_Obj* result = Tcl_NewDoubleObj(2*x);
+	Tcl_IncrRefCount (result);
+	return result;
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>After handing the value to Tcl, with the associated incremented reference count,
+the translation layer decrements the reference count, invalidating the C code's ownership
+and leaving the final reference count the same.</p>
+<p>Note, the order matters. If the value has only one reference then decrementing it
+before Tcl increments it would again release the value, and again leave Tcl with a
+dangling pointer.</p>
+<p>Also, not decrementing the reference count at all causes the inverse problem to the
+memory corruption issues of before, memory leaks.</p></li>
+<li><p><em>Note</em> that both types transfer ownership of the value. Their difference is
+just in the reference count of the value coming out of the function, and the (non-)actions
+having to be (not) taken to effect said transfer without causing memory issues.</p></li>
+</ol>
+</div>
+<div id="subsection10" class="doctools_subsection"><h3><a name="subsection10">Errors &amp; Messages</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    critcl::cproc sqrt {
+	Tcl_Interp* interp
+	double      x
+    } object0 {
+	if (x &lt; 0) {
+	    Tcl_SetObjResult (interp, Tcl_ObjPrintf (&quot;Expected double &gt;=0, but got \&quot;%d\&quot;&quot;, x));
+	    Tcl_SetErrorCode (interp, &quot;EXAMPLE&quot;, &quot;BAD&quot;, &quot;DOMAIN&quot;, NULL);
+	    return NULL;
+	}
+	return Tcl_NewDoubleObj(sqrt(x));
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>In standard C-based packages commands signal errors by returning <b class="const">TCL_ERROR</b>,
+placing the error message as the interpreter result, and maybe providing an error code via
+<b class="function">Tcl_SetErrorCode</b>.</p></li>
+<li><p>When using <b class="cmd">critcl::cproc</b> this is limited and hidden.</p></li>
+<li><p>The simple and string types for results do not allow failure. The value is returned
+to the translation layer, converted into the interpreter result and then reported as
+success (<b class="const">TCL_OK</b>).</p></li>
+<li><p>The object types on the other hand do allow for failure.
+Return a <b class="const">NULL</b> value to signal failure to the translation layer, which then reports
+this to the interpreter via the standard <b class="const">TCL_ERROR</b>.</p></li>
+<li><p><em>Attention</em> Setting the desired error message and code into the interpreter is
+still the responsibility of the function body.</p></li>
+</ol>
+</div>
+<div id="subsection11" class="doctools_subsection"><h3><a name="subsection11">Tcl_Interp* Access</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Reread the example in the <b class="sectref">previous</b> section.</p></li>
+<li><p>Note the type <b class="type">Tcl_Interp*</b> used for the first argument.</p></li>
+<li><p>This type is special.</p></li>
+<li><p>An argument of this type has to be the first argument of a function.</p></li>
+<li><p>Using it tells <i class="term"><a href="critcl.html">CriTcl</a></i> that the function needs access to the Tcl interpreter
+calling it. It then arranges for that to happen in the generated C code.</p>
+<p>Using functions from Tcl's public C API taking an interpreter argument in the
+function body is a situation where this is needed.</p></li>
+<li><p><em>This special argument is not visible at the script level</em>.</p></li>
+<li><p><em>This special argument is not an argument of the Tcl command for the function</em>.</p></li>
+<li><p>In our example the <b class="cmd">sqrt</b> command is called with a single argument.</p></li>
+<li><p>The name of the argument can be freely chosen. It is the type which is important
+and triggers the special behaviour.
+My prefered names are <b class="variable">ip</b> and <b class="variable">interp</b>.</p></li>
+</ol>
+</div>
+<div id="subsection12" class="doctools_subsection"><h3><a name="subsection12">Binary Data Arguments</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    critcl::cproc hello {bytes x} void {
+        /* critcl_bytes x (.s, .len, .o); */
+        printf(&quot;hello world, with %d bytes \n data: &quot;, x.len);
+        for (i = 0; i &lt; x.len; i++) {
+            printf(&quot; %02x&quot;, x.s[i]);
+            if (i % 16 == 15) printf (&quot;\ndata: &quot;);
+        }
+        if (i % 16 != 0) printf (&quot;\n&quot;);
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>To deal with strings holding binary data use the type <b class="type">bytes</b>. It ensures that
+the function sees the proper binary data, and not how Tcl is encoding it internally, as
+the string types would.</p></li>
+</ol>
+</div>
+<div id="subsection13" class="doctools_subsection"><h3><a name="subsection13">Constant Binary Data Results</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Use the command <b class="cmd">critcl::cdata</b> to create a command taking no arguments and
+returning a constant ByteArray value.</p>
+<pre class="doctools_example">
+    # P5 3 3 255 \n ...
+    critcl::cdata cross3x3pgm {
+	80 52 32 51 32 51 32 50 53 53 10
+	0   255 0
+	255 255 255
+	0   255 0
+    }
+</pre>
+</li>
+</ol>
+</div>
+<div id="subsection14" class="doctools_subsection"><h3><a name="subsection14">Tcl Runtime Version</a></h3>
+<ol class="doctools_enumerated">
+<li><p>See and reread the <span class="sectref"><a href="#section2">basic package</a></span> for the introduction of the
+commands referenced below.</p></li>
+<li><p>Use the command <b class="cmd">critcl::tcl</b> to tell <i class="term"><a href="critcl.html">CriTcl</a></i> the minimal version of Tcl
+the package is to be used with.</p>
+<p>This determines which Tcl headers all files are compiled against, and what version
+of the public Tcl API is available to the C code.</p>
+<p>Currently <b class="const">8.4</b>, <b class="const">8.5</b> and <b class="const">8.6</b> are supported.</p>
+<p>If not specified <b class="const">8.4</b> is assumed.</p></li>
+</ol>
+</div>
+<div id="subsection15" class="doctools_subsection"><h3><a name="subsection15">Additional Tcl Code</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    critcl::cproc greetings::hello {} void {
+	printf(&quot;hello world\n&quot;);
+    }
+    critcl::cproc greetings::hi {} void {
+	printf(&quot;hi you\n&quot;);
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>The command <b class="cmd">hello</b> is now available as <b class="cmd">greetings::hello</b>, and a second
+command <b class="cmd">greetings::hi</b> was added.</p></li>
+<li><p>Tcl has automatically created the namespace <b class="namespace">greetings</b>.</p></li>
+<li><p>Create a file &quot;<b class="file">example-policy.tcl</b>&quot; and enter</p>
+<pre class="doctools_example">
+    namespace eval greetings {
+	namespace export hello hi
+	namespace ensemble create
+    }
+</pre>
+<p>into it.</p></li>
+<li><p>Edit &quot;<b class="file">example.tcl</b>&quot;. Add the code</p>
+<pre class="doctools_example">
+    critcl::tsources example-policy.tcl
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>The added Tcl code makes <b class="namespace">greetings</b> available as an <i class="term">ensemble</i>
+command.</p>
+<p>The commands in the namespace have been registered as methods of the ensemble.</p>
+<p>They can now be invoked as</p>
+<pre class="doctools_example">
+    greetings hello
+    greetings hi
+</pre>
+</li>
+<li><p>The Tcl builtin command <b class="cmd">string</b> is an ensemble as well, as is <b class="cmd">clock</b>.</p></li>
+</ol>
+<p>New commands: <i class="term">critcl::tsources</i></p>
+</div>
+<div id="subsection16" class="doctools_subsection"><h3><a name="subsection16">Debugging Support</a></h3>
+<ol class="doctools_enumerated">
+<li><p>See and reread the <span class="sectref"><a href="#section2">basic package</a></span> for the introduction of the
+commands referenced below.</p></li>
+<li><p>Use the command <b class="cmd">critcl::debug</b> to activate various features supporting debugging.</p>
+<pre class="doctools_example">
+    critcl::debug memory  ;# Activate Tcl memory debugging (-DTCL_MEM_DEBUG)
+    critcl::debug symbols ;# Activate building and linking with debugger symbols (-g)
+    critcl::debug all     ;# Shorthand for both `memory` and `symbols`.
+</pre>
+</li>
+</ol>
+</div>
+<div id="subsection17" class="doctools_subsection"><h3><a name="subsection17">Install The Package</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>.</p></li>
+<li><p>Use an interactive <b class="syscmd">tclsh</b> seesion to determine the value of
+<b class="cmd">info library</b>.</p>
+<p>For the purpose of this HowTo assume that this path is
+&quot;<b class="file">/home/aku/opt/ActiveTcl/lib/tcl8.6</b>&quot;</p></li>
+<li><p>Invoke the critcl application in a terminal, using</p>
+<pre class="doctools_example">
+    critcl -libdir /home/aku/opt/ActiveTcl/lib/tcl8.6 -pkg example.tcl
+</pre>
+</li>
+<li><p>The package is now build and installed into the chosen directory.</p>
+<pre class="doctools_example">
+   % find /home/aku/opt/ActiveTcl/lib/tcl8.6/example/
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/pkgIndex.tcl
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/critcl-rt.tcl
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/license.terms
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/linux-x86_64
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/linux-x86_64/example.so
+    /home/aku/opt/ActiveTcl/lib/tcl8.6/example/teapot.txt
+</pre>
+</li>
+</ol>
+</div>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Using External Libraries</a></h2>
+<p>To create a minimal package wrapping an external library</p>
+<ol class="doctools_enumerated">
+<li><p>Choose a directory to develop in and make it the working directory.
+This should not be a checkout of <i class="term"><a href="critcl.html">CriTcl</a></i> itself.</p></li>
+<li><p>Save the following example to a file. In the following it is assumed that the file
+was named &quot;<b class="file">example.tcl</b>&quot;.</p>
+<pre class="doctools_example">
+# -*- tcl -*-
+# Critcl support, absolutely necessary.
+package require critcl
+# Bail out early if the compile environment is not suitable.
+if {![critcl::compiling]} {
+    error &quot;Unable to build project, no proper compiler found.&quot;
+}
+# Information for the teapot.txt meta data file put into a generated package.
+# Free form strings.
+critcl::license {Andreas Kupries} {Under a BSD license}
+critcl::summary {The second CriTcl-based package}
+critcl::description {
+    This package is the second example of a CriTcl-based package. It contains all the
+    necessary and conventionally useful pieces for wrapping an external library.
+}
+critcl::subject {external library usage} example {critcl package}
+critcl::subject {wrapping external library}
+# Minimal Tcl version the package should load into.
+critcl::tcl 8.6
+# Locations for headers and shared library of the library to wrap.
+# Required only for non-standard locations, i.e. where CC is not searching by default.
+critcl::cheaders   -I/usr/include
+critcl::clibraries -L/usr/lib/x86_64-linux-gnu
+critcl::clibraries -lzstd
+# Import library API, i.e. headers.
+critcl::include zstd.h
+# ## #### ######### ################ #########################
+## (De)compression using Zstd
+## Data to (de)compress is passed in and returned as Tcl byte arrays.
+critcl::cproc compress {
+    Tcl_Interp* ip
+    bytes       data
+    int         {level ZSTD_CLEVEL_DEFAULT}
+} object0 {
+    /* critcl_bytes data; (.s, .len, .o) */
+    Tcl_Obj* error_message;
+    int max = ZSTD_maxCLevel();
+    if ((level &lt; 1) || (level &gt; max)) {
+	error_message = Tcl_ObjPrintf (&quot;level must be integer between 1 and %d&quot;, max);
+	goto err;
+    }
+    size_t dest_sz  = ZSTD_compressBound (data.len);
+    void*  dest_buf = Tcl_Alloc(dest_sz);
+    if (!dest_buf) {
+	error_message = Tcl_NewStringObj (&quot;can't allocate memory to compress data&quot;, -1);
+	goto err;
+    }
+    size_t compressed_size = ZSTD_compress (dest_buf, dest_sz,
+					    data.s,   data.len,
+					    level);
+    if (ZSTD_isError (compressed_size)) {
+	Tcl_Free(dest_buf);
+	error_message = Tcl_ObjPrintf (&quot;zstd encoding error: %s&quot;,
+				       ZSTD_getErrorName (compressed_size));
+	goto err;
+    }
+    Tcl_Obj* compressed = Tcl_NewByteArrayObj (dest_buf, compressed_size);
+    Tcl_Free (dest_buf);
+    return compressed;
+  err:
+    Tcl_SetObjResult (ip, error_message);
+    return 0;
+}
+critcl::cproc decompress {
+    Tcl_Interp*  ip
+    bytes        data
+} object0 {
+    Tcl_Obj* error_message;
+    size_t dest_sz = ZSTD_getDecompressedSize (data.s, data.len);
+    if (dest_sz == 0) {
+        error_message = Tcl_NewStringObj(&quot;invalid data&quot;, -1);
+	goto err;
+    }
+    void* dest_buf = Tcl_Alloc (dest_sz);
+    if (!dest_buf) {
+	error_message = Tcl_NewStringObj(&quot;failed to allocate decompression buffer&quot;, -1);
+	goto err;
+    }
+    size_t decompressed_size = ZSTD_decompress (dest_buf, dest_sz,
+						data.s,   data.len);
+    if (decompressed_size != dest_sz) {
+	Tcl_Free (dest_buf);
+        error_message = Tcl_ObjPrintf(&quot;zstd decoding error: %s&quot;,
+				      ZSTD_getErrorName (decompressed_size));
+	goto err;
+    }
+    Tcl_Obj* decompressed = Tcl_NewByteArrayObj (dest_buf, dest_sz);
+    Tcl_Free (dest_buf);
+    return decompressed;
+  err:
+    Tcl_SetObjResult (ip, error_message);
+    return 0;
+}
+# ## #### ######### ################ #########################
+# Forcing compilation, link, and loading now.
+critcl::msg -nonewline { Building ...}
+if {![critcl::load]} {
+    error &quot;Building and loading the project failed.&quot;
+}
+# Name and version the package. Just like for every kind of Tcl package.
+package provide critcl-example 1
+</pre>
+</li>
+<li><p>Build the package. See the <b class="sectref">Basics</b>, if necessary.</p></li>
+<li><p>Load the package and invoke the commands.</p>
+<p><em>Attention</em>. The commands take and return binary data.
+This may look very bad in the terminal.</p></li>
+<li><p>To test the commands enter</p>
+<pre class="doctools_example">
+    set a [compress {hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhello wwwwwwwworld}]
+    decompress $a
+</pre>
+<p>in the interactive <b class="syscmd">tclsh</b></p></li>
+</ol>
+<p>New commands: <i class="term">critcl::cheaders</i>, <i class="term">critcl::clibraries</i>, <i class="term">critcl::include</i>.</p>
+<div id="subsection18" class="doctools_subsection"><h3><a name="subsection18">Default Values For Arguments</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Reread the example of the main section. Note specifically the line</p>
+<pre class="doctools_example">
+    int {level ZSTD_CLEVEL_DEFAULT}
+</pre>
+</li>
+<li><p>This line demonstrates that <b class="cmd">critcl::cproc</b> arguments allowed to have default
+values, in the same vein as <b class="cmd">proc</b> arguments, and using the same syntax.</p></li>
+<li><p><em>Attention</em> Default values have to be legal C rvalues and match the C type of
+the argument.</p>
+<p>They are literally pasted into the generated C code.</p>
+<p>They bypass any argument validation done in the generated translation layer. This
+means that it is possible to use a value an invoker of the command cannot use from Tcl.</p></li>
+<li><p>This kind of in-band signaling of a default versus a regular argument is however
+not necessary.</p>
+<p>Look at</p>
+<pre class="doctools_example">
+    critcl::cproc default_or_not {int {x 0}} void {
+	if !has_x {
+	    printf(&quot;called with default\n&quot;);
+	    return
+	}
+	printf(&quot;called with %d\n&quot;, x);
+    }
+</pre>
+<p>Any argument <i class="arg">x</i> with a default causes <i class="term"><a href="critcl.html">CriTcl</a></i> to create a hidden
+argument <i class="arg">has_x</i>, of type int (boolean).
+This argument is set to <b class="const">1</b> when <i class="arg">x</i> was filled from defaults, and <b class="const">0</b>
+else.</p></li>
+</ol>
+</div>
+<div id="subsection19" class="doctools_subsection"><h3><a name="subsection19">Custom Argument Validation</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Starting from the <span class="sectref"><a href="#section3">base wrapper</a></span>. 
+              Edit the file &quot;<b class="file">example.tcl</b>&quot;.  Replace the entire <b class="cmd">compress</b> function with</p>
+<pre class="doctools_example">
+    critcl::argtype zstd_compression_level {
+        /* argtype: `int` */
+        if (Tcl_GetIntFromObj (interp, @@, &amp;@A) != TCL_OK) return TCL_ERROR;
+        /* additional validation */    
+        int max = ZSTD_maxCLevel();
+        if ((@A &lt; 1) || (@A &gt; max)) {
+            Tcl_SetObjResult (interp,
+                Tcl_ObjPrintf (&quot;zstd compression level must be integer between 1 and %d&quot;, max));
+            return TCL_ERROR;
+        }
+        /* @@: current objv[] element
+        ** @A: name of argument variable for transfer to C function
+        ** interp: predefined variable, access to current interp - error messages, etc.
+        */
+    } int int ;# C types of transfer variable and function argument.
+    critcl::cproc compress {
+        Tcl_Interp*            ip
+        bytes                  data
+        zstd_compression_level {level ZSTD_CLEVEL_DEFAULT}
+    } object0 {
+        /* critcl_bytes data; (.s, .len, .o) */
+        /* int level; validated to be in range 1...ZSTD_maxCLevel() */
+        Tcl_Obj* error_message;
+        size_t dest_sz  = ZSTD_compressBound (data.len);
+        void*  dest_buf = Tcl_Alloc(dest_sz);
+        if (!dest_buf) {
+            error_message = Tcl_NewStringObj (&quot;can't allocate memory to compress data&quot;, -1);
+            goto err;
+        }
+        size_t compressed_size = ZSTD_compress (dest_buf, dest_sz,
+                                                data.s,   data.len,
+                                                level);
+        if (ZSTD_isError (compressed_size)) {
+            Tcl_Free(dest_buf);
+            error_message = Tcl_ObjPrintf (&quot;zstd encoding error: %s&quot;,
+                                           ZSTD_getErrorName (compressed_size));
+            goto err;
+        }
+        Tcl_Obj* compressed = Tcl_NewByteArrayObj (dest_buf, compressed_size);
+        Tcl_Free (dest_buf);
+        return compressed;
+    err:
+        Tcl_SetObjResult (ip, error_message);
+        return 0;
+    }
+</pre>
+<p>and rebuild the package.</p>
+<p>In the original example the <i class="arg">level</i> argument of the function was validated in
+the function itself.
+This may detract from the funtionality of interest itself, especially if there are lots of
+arguments requiring validation.
+If the same kind of argument is used in multiple places this causes code duplication in
+the functions as well.</p>
+<p>Use a custom argument type as defined by the modification to move this kind of
+validation out of the function, and enhance readability.</p>
+<p>Code duplication however is only partially adressed.
+While there is no duplication in the visible definitions the C code of the new argument
+type is replicated for each use of the type.</p></li>
+<li><p>Now replace the <b class="cmd">argtype</b> definition with</p>
+<pre class="doctools_example">
+    critcl::code {
+        int GetCompressionLevel (Tcl_Interp* interp, Tcl_Obj* obj, int* level)
+        {
+            if (Tcl_GetIntFromObj (interp, obj, level) != TCL_OK) return TCL_ERROR;
+            int max = ZSTD_maxCLevel();
+            if ((*level &lt; 1) || (*level &gt; max)) {
+                Tcl_SetObjResult (interp,
+                    Tcl_ObjPrintf (&quot;zstd compression level must be integer between 1 and %d&quot;, max));
+                return TCL_ERROR;
+            }
+            return TCL_OK;
+        }
+    }
+    critcl::argtype zstd_compression_level {
+        if (GetCompressionLevel (@@, &amp;@A) != TCL_OK) return TCL_ERROR;
+    } int int
+</pre>
+<p>and rebuild the package.</p>
+<p>Now only the calls to the new validation function are replicated.
+The function itself exists only once.</p></li>
+</ol>
+</div>
+<div id="subsection20" class="doctools_subsection"><h3><a name="subsection20">Separating Local C Sources</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Starting from the end of the <span class="sectref"><a href="#subsection19">previous</a></span> section.
+       Edit the file &quot;<b class="file">example.tcl</b>&quot;.</p></li>
+<li><p>Save the contents of the <b class="cmd">critcl::ccode</b> block into a file &quot;<b class="file">example.c</b>&quot; and
+then replace the entire block with</p>
+<pre class="doctools_example">
+    critcl::csources example.c
+    critcl::ccode {
+	extern int GetCompressionLevel (Tcl_Interp* interp, Tcl_Obj* obj, int* level);
+    }
+</pre>
+<p>When mixing C and Tcl code the different kind of indentation rules for these
+languages may come into strong conflict. Further, very large blocks of C code may reduce
+overall readability.</p></li>
+<li><p>The examples fixes this by moving the code block into a local C file and then
+registering this file with <i class="term"><a href="critcl.html">CriTcl</a></i>.
+When building the package <i class="term"><a href="critcl.html">CriTcl</a></i> arranges to build all such registered C files as
+well.</p></li>
+<li><p><em>Attention</em>. The C code is now in a separate compilation unit.
+The example declares the exported function so that the <b class="cmd">cproc</b>s are again able to see
+and use it.</p></li>
+<li><p>Now go a step further. Save the declaration into a file &quot;<b class="file">example.h</b>&quot;, and then
+use</p>
+<pre class="doctools_example">
+    critcl::include example.h
+</pre>
+<p>to import it. Note that this is just a shorthand for</p>
+<pre class="doctools_example"> critcl::ccode {
+	#include &quot;example.h&quot;
+    }
+</pre>
+</li>
+<li><p>As an alternative solution, start from the beginning of the section and move the
+entire original <b class="cmd">critcl::ccode</b> block into a file &quot;<b class="file">example-check.tcl</b>&quot;.</p>
+<p>Then replace it with</p>
+<pre class="doctools_example">
+    critcl::source example-check.tcl
+</pre>
+<p>to import it into the main code again.</p>
+<p><em>Attention</em> Tcl's builtin command <b class="cmd">source</b> is <em>not suitable</em> for
+importing the separate file due to how <i class="term"><a href="critcl.html">CriTcl</a></i> uses the information from
+<b class="cmd">info script</b> to key various internal datastructures.</p></li>
+</ol>
+</div>
+<div id="subsection21" class="doctools_subsection"><h3><a name="subsection21">Very Simple Results</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Starting from the end of the <span class="sectref"><a href="#subsection19">validation</a></span> section.
+Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+Add the code below, just before the <b class="cmd">compress</b> command.</p>
+<pre class="doctools_example">
+    critcl::cconst version   char* ZSTD_VERSION_STRING
+    critcl::cconst min-level int   1
+    critcl::cconst max-level int   ZSTD_maxCLevel()
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>These declarations create three additional commands, each returning the specified
+value. A fixed string, an integer, and a function call returning an integer.</p></li>
+<li><p><em>Attention</em> The values have to be legal C rvalues and match the C type of the
+result. They are literally pasted into the generated C code.</p></li>
+<li><p>When using <b class="cmd">critcl::cconst</b> <i class="term"><a href="critcl.html">CriTcl</a></i> is aware that the result of the
+function does not depend on any parameters and is computed in a single C expression.</p>
+<p>This enables it do to away with the internal helper function it would need and
+generate if <b class="cmd">critcl::cproc</b> had been used instead.
+For example</p>
+<pre class="doctools_example">
+    critcl::cproc version {} char* {
+	return ZSTD_VERSION_STRING;
+    }
+</pre>
+</li>
+</ol>
+</div>
+<div id="subsection22" class="doctools_subsection"><h3><a name="subsection22">Structure Arguments</a></h3>
+<ol class="doctools_enumerated">
+<li><p>For all that this is a part of how to
+<span class="sectref"><a href="#section3">Use External Libraries</a></span>, for the demonstratation
+only the basics are needed.</p></li>
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    critcl::ccode {
+	typedef struct vec2 {
+	    double x;
+	    double y;
+	} vec2;
+	typedef vec2* vec2ptr;
+	int
+	GetVecFromObj (Tcl_Interp* interp, Tcl_Obj* obj, vec2ptr* vec)
+	{
+	    int len;
+	    if (Tcl_ListObjLength (interp, obj, &amp;len) != TCL_OK) return TCL_ERROR;
+	    if (len != 2) {
+		Tcl_SetObjResult (interp, Tcl_ObjPrintf (&quot;Expected 2 elements, got %d&quot;, len));
+		return TCL_ERROR;
+	    }
+	    Tcl_Obj* lv[2];
+	    if (Tcl_ListObjGetElements (interp, obj, &amp;lv) != TCL_OK) return TCL_ERROR;
+	    double x, y;
+	    if (Tcl_GetDoubleFromObj (interp, lv[0], &amp;x) != TCL_OK) return TCL_ERROR;
+	    if (Tcl_GetDoubleFromObj (interp, lv[1], &amp;y) != TCL_OK) return TCL_ERROR;
+	    *vec = Tcl_Alloc (sizeof (vec2));
+	    (*vec)-&gt;x = x;
+	    (*vec)-&gt;y = y;
+	    return TCL_OK;
+	}
+    }
+    critcl::argtype vec2 {
+	if (GetVecFromObj (interp, @@, &amp;@A) != TCL_OK) return TCL_ERROR;
+    } vec2ptr vec2ptr
+    critcl::argtyperelease vec2 {
+	/* @A : C variable holding the data to release */
+	Tcl_Free ((char*) @A);
+    }
+    critcl::cproc norm {vec2 vector} double {
+	double norm = hypot (vector-&gt;x, vector-&gt;y);
+	return norm;
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>The structure to pass as argument is a 2-dimensional vector. It is actually passed
+in as a pointer to a <b class="type">vec2</b> structure.
+This pointer is created by the <b class="function">GetVecFromObj</b> function. It allocates and fills the
+structure from the Tcl value, which has to be a list of 2 doubles. The bulk of the code in
+<b class="function">GetVecFromObj</b> is for verifying this and extracting the doubles.</p></li>
+<li><p>The <b class="cmd">argtyperelease</b> code releases the pointer when the C function returns. In
+other words, the pointer to the structure is owned by the translation layer and exists
+only while the function is active.</p></li>
+<li><p>While working this code has two disadvantages.
+First there is memory churn. Each call of <b class="cmd">norm</b> causes the creation and release of a
+temporary <b class="type">vec2</b> structure for the argument.
+Second is the need to always extract the data from the <b class="type">Tcl_Obj*</b> value.</p>
+<p>Both can be done better.</p>
+<p>We will come back to this after explaining how to return structures to Tcl.</p></li>
+</ol>
+</div>
+<div id="subsection23" class="doctools_subsection"><h3><a name="subsection23">Structure Results</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Starting from the end of the <span class="sectref"><a href="#subsection22">previous</a></span> section.</p></li>
+<li><p>Edit the file &quot;<b class="file">example.tcl</b>&quot; and add the following code, just after the
+definition of the <b class="cmd">norm</b> command.</p>
+<pre class="doctools_example">
+    critcl::resulttype vec2 {
+	/* rv: result value of function, interp: current Tcl interpreter */
+	if (rv == NULL) return TCL_ERROR;
+	Tcl_Obj* lv[2];
+	lv[0] = Tcl_NewDoubleObj (rv-&gt;x);
+	lv[1] = Tcl_NewDoubleObj (rv-&gt;y);
+	Tcl_SetObjResult (interp, Tcl_NewListObj (2, lv));
+	Tcl_Free (rv);
+	return TCL_OK;
+    } vec2ptr ;# C result type
+    critcl::cproc add {vec2 a vec2 b} vec2 {
+	vec2ptr z = Tcl_Alloc (sizeof (vec2));
+	z-&gt;x = a-&gt;x + b-&gt;x;
+	z-&gt;y = a-&gt;y + b-&gt;y;
+	return z;
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>The new command <b class="cmd">add</b> takes two vectors and return the element-wise sum of both
+as a new vector.</p></li>
+<li><p>The function allocates and initializes a structure and hands it over to the
+translation layer. Which in turn constructs a Tcl list of 2 doubles from it, sets that as
+the command's result and at last discards the allocated structure again.</p></li>
+<li><p>While working this code has two disadvantages.
+First there is memory churn. Each call of <b class="cmd">add</b> causes the creation and release of
+three temporary <b class="type">vec2</b> structures. One per argument, and one for the result.
+Second is the need to always construct a complex <b class="type">Tcl_Obj*</b> value from the structure.</p>
+<p>Both can be done better. This is explained in the next section.</p></li>
+</ol>
+</div>
+<div id="subsection24" class="doctools_subsection"><h3><a name="subsection24">Structure Types</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Starting from the end of the previous section.</p></li>
+<li><p>Edit the file &quot;<b class="file">example.tcl</b>&quot;.</p></li>
+<li><p>Remove the entire functionality (type definitions, related C code, and cprocs).
+Replace it with</p>
+<pre class="doctools_example">
+    critcl::ccode {
+	typedef struct vec2 {
+	    double x;
+	    double y;
+	} vec2;
+	typedef vec2* vec2ptr;
+	/* -- Core vector structure management -- */
+	static vec2ptr Vec2New (double x, double y) {
+	    vec2ptr vec = Tcl_Alloc (sizeof (vec2));
+	    vec-&gt;x = x;
+	    vec-&gt;y = y;
+	    return vec;
+	}
+	static vec2ptr Vec2Copy (vec2ptr src) {
+	    vec2ptr vec = Tcl_Alloc (sizeof (vec2));
+	    *vec = *src
+	    return vec;
+	}
+	static void Vec2Release (vec2ptr vec) {
+	    Tcl_Free ((char*) vec);
+	}
+	/* -- Tcl value type for vec2 -- Tcl_ObjType -- */
+	static void Vec2Free     (Tcl_Obj* obj);
+	static void Vec2StringOf (Tcl_Obj* obj);
+	static void Vec2Dup      (Tcl_Obj* obj, Tcl_Obj* dst);
+	static int  Vec2FromAny  (Tcl_Interp* interp, Tcl_Obj* obj);
+	Tcl_ObjType vec2_objtype = {
+	    &quot;vec2&quot;,
+	    Vec2Free,
+	    Vec2Dup,
+	    Vec2StringOf,
+	    Vec2FromAny
+	};
+	static void Vec2Free (Tcl_Obj* obj) {
+	    Vec2Release ((vec2ptr) obj-&gt;internalRep.otherValuePtr);
+	}
+	static void Vec2Dup (Tcl_Obj* obj, Tcl_Obj* dst) {
+	    vec2ptr vec = (vec2ptr) obj-&gt;internalRep.otherValuePtr;
+	    dst-&gt;internalRep.otherValuePtr = Vec2Copy (vec);
+	    dst-&gt;typePtr                   = &amp;vec2_objtype;
+	}
+	static void Vec2StringOf (Tcl_Obj* obj) {
+	    vec2ptr vec = (vec2ptr) obj-&gt;internalRep.otherValuePtr;
+	    /* Serialize vector data to string (list of two doubles) */
+	    Tcl_DString      ds;
+	    Tcl_DStringInit (&amp;ds);
+	    char buf [TCL_DOUBLE_SPACE];
+	    Tcl_PrintDouble (0, vec-&gt;x, buf); Tcl_DStringAppendElement (&amp;ds, buf);
+	    Tcl_PrintDouble (0, vec-&gt;y, buf); Tcl_DStringAppendElement (&amp;ds, buf);
+	    int length = Tcl_DStringLength (ds);
+	    /* Set string representation */
+	    obj-&gt;length = length;
+	    obj-&gt;bytes  = Tcl_Alloc(length+1);
+	    memcpy (obj-&gt;bytes, Tcl_DStringValue (ds), length);
+	    obj-&gt;bytes[length] = '\0';
+	    /*
+	    ** : package require critcl::cutil ;# get C utilities
+	    ** : critcl::cutil::alloc          ;# Activate allocation utilities
+	    ** : (Internally cheaders, include)
+	    ** : Then all of the above can be written as STREP_DS (obj, ds);
+	    ** : STREP_DS = STRing REP from DString
+	    */
+	    Tcl_DStringFree (&amp;ds);
+	}
+	static int Vec2FromAny (Tcl_Interp* interp, Tcl_Obj* obj) {
+	    /* Change intrep of obj to vec2 structure.
+	    ** A Tcl list of 2 doubles is used as an intermediary intrep.
+	    */
+	    int len;
+	    if (Tcl_ListObjLength (interp, obj, &amp;len) != TCL_OK) return TCL_ERROR;
+	    if (len != 2) {
+		Tcl_SetObjResult (interp, Tcl_ObjPrintf (&quot;Expected 2 elements, got %d&quot;, len));
+		return TCL_ERROR;
+	    }
+	    Tcl_Obj* lv[2];
+	    if (Tcl_ListObjGetElements (interp, obj, &amp;lv) != TCL_OK) return TCL_ERROR;
+	    double x, y;
+	    if (Tcl_GetDoubleFromObj (interp, lv[0], &amp;x) != TCL_OK) return TCL_ERROR;
+	    if (Tcl_GetDoubleFromObj (interp, lv[1], &amp;y) != TCL_OK) return TCL_ERROR;
+	    obj-&gt;internalRep.otherValuePtr = (void*) Vec2New (x, y);
+	    obj-&gt;typePtr                   = &amp;vec2_objtype;
+	    return TCL_OK;
+	}
+	/* -- (un)packing structures from/into Tcl values -- */
+	int GetVecFromObj (Tcl_Interp* interp, Tcl_Obj* obj, vec2ptr* vec)
+	{
+	    if (obj-&gt;typePtr != &amp;vec2_objtype) {
+		if (Vec2FromAny (interp, obj) != TCL_OK) return TCL_ERROR;
+	    }
+	    *vec = (vec2ptr) obj-&gt;internalRep.otherValuePtr;
+	    return TCL_OK;
+	}
+	Tcl_Obj* NewVecObj (vec2ptr vec) {
+	    Tcl_Obj* obj = Tcl_NewObj ();
+	    Tcl_InvalidateStringRep (obj);
+	    obj-&gt;internalRep.otherValuePtr = Vec2Copy (vec);
+	    obj-&gt;typePtr                   = &amp;vec2_objtype;
+	    return obj;
+	}
+    }
+    critcl::argtype vec2 {
+	if (GetVecFromObj (interp, @@, &amp;@A) != TCL_OK) return TCL_ERROR;
+    } vec2ptr vec2ptr
+    critcl::resulttype vec2 {
+	/* rv: result value of function, interp: current Tcl interpreter */
+	Tcl_SetObjResult (interp, NewVecObj (&amp;rv));
+	return TCL_OK;
+    } vec2
+    critcl::cproc norm {vec2 vector} double {
+	double norm = hypot (vector-&gt;x, vector-&gt;y);
+	return norm;
+    }
+    critcl::cproc add {vec2 a vec2 b} vec2 {
+	vec2 z;
+	z.x = a-&gt;x + b-&gt;x;
+	z.y = a-&gt;y + b-&gt;y;
+	return z;
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>This implements a new <b class="type">Tcl_ObjType</b> to handle <b class="type">vec2</b> structures. With it
+<b class="type">vec2</b> structures are become usable as internal representation (<i class="term">intrep</i> of
+<b class="type">Tcl_Obj*</b> values.</p>
+<p>The two functions <b class="function">NewVecObj</b> and <b class="function">GetVecFromObj</b> pack and unpack the
+structures from and into <b class="type">Tcl_Obj*</b> values.
+The latter performs the complex deserialization into a structure if and only if needed,
+i.e. when the <b class="type">TclObj*</b> value has no intrep, or the intrep for a different type.
+This process of changing the intrep of a Tcl value is called <i class="term">shimmering</i>.</p>
+<p>Intreps cache the interpretation of <b class="type">Tcl_Obj*</b> values as a specific kind of
+type. Here <b class="type">vec2</b>. This reduces conversion effort and memory churn, as intreps are
+kept by the Tcl interpreter as long as possible and needed.</p></li>
+<li><p>The arguments of <b class="cmd">norm</b> and <b class="cmd">add</b> are now converted once on entry, if not
+yet in the proper type, or not at all, if so.</p></li>
+<li><p><em>Attention</em>. This example has the issue of passing result structures by value
+through the stack, and then packing a copy into a <b class="type">Tcl_Obj*</b> value.
+While this is no trouble for structures as small as <b class="type">vec2</b> larger structures may pose
+a problem.</p>
+<p>We will address this in the next section.</p></li>
+</ol>
+<p>Packages: <i class="term"><a href="critcl_cutil.html">critcl::cutil</a></i></p>
+</div>
+<div id="subsection25" class="doctools_subsection"><h3><a name="subsection25">Large Structures</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Starting from the end of the previous section.</p></li>
+<li><p>Edit the file &quot;<b class="file">example.tcl</b>&quot;.</p></li>
+<li><p>Describing each individual change is too complex. The following is easier.</p></li>
+<li><p>Save the file, then replace the entire functionality with the following.</p></li>
+<li><p>After that use a <b class="syscmd">diff</b> of your choice to compare the files and see the
+critical changes.</p>
+<pre class="doctools_example">
+    critcl::ccode {
+	typedef struct vec2 {
+	    unsigned int rc;
+	    double x;
+	    double y;
+	} vec2;
+	typedef vec2* vec2ptr;
+	/* -- Core vector structure management -- */
+	static vec2ptr Vec2New (double x, double y) {
+	    vec2ptr vec = Tcl_Alloc (sizeof (vec2));
+	    vec-&gt;rc = 0;
+	    vec-&gt;x = x;
+	    vec-&gt;y = y;
+	    return vec;
+	}
+	static vec2ptr Vec2Copy (vec2ptr src) {
+	    scr-&gt;rc ++;
+	    return src;
+	}
+	static void Vec2Release (vec2ptr vec) {
+	    if (vec-&gt;rc &gt; 1) {
+		vec-&gt;rc --;
+		return;
+	    }
+	    
+	    Tcl_Free ((char*) vec);
+	}
+	/* -- Vector obj type -- */
+	static void Vec2Free     (Tcl_Obj* obj);
+	static void Vec2StringOf (Tcl_Obj* obj);
+	static void Vec2Dup      (Tcl_Obj* obj, Tcl_Obj* dst);
+	static int  Vec2FromAny  (Tcl_Interp* interp, Tcl_Obj* obj);
+	Tcl_ObjType vec2_objtype = {
+	    &quot;vec2&quot;,
+	    Vec2Free,
+	    Vec2Dup,
+	    Vec2StringOf,
+	    Vec2FromAny
+	};
+	static void Vec2Free (Tcl_Obj* obj) {
+	    Vec2Release ((vec2ptr) obj-&gt;internalRep.otherValuePtr);
+	}
+	static void Vec2Dup (Tcl_Obj* obj, Tcl_Obj* dst) {
+	    vec2ptr vec = (vec2ptr) obj-&gt;internalRep.otherValuePtr;
+	    dst-&gt;internalRep.otherValuePtr = Vec2Copy (vec);
+	    dst-&gt;typePtr                   = &amp;vec2_objtype;
+	}
+	static void Vec2StringOf (Tcl_Obj* obj) {
+	    vec2ptr vec = (vec2ptr) obj-&gt;internalRep.otherValuePtr;
+	    /* Serialize vector data to string (list of two doubles) */
+	    Tcl_DString      ds;
+	    Tcl_DStringInit (&amp;ds);
+	    char buf [TCL_DOUBLE_SPACE];
+	    Tcl_PrintDouble (0, vec-&gt;x, buf); Tcl_DStringAppendElement (&amp;ds, buf);
+	    Tcl_PrintDouble (0, vec-&gt;y, buf); Tcl_DStringAppendElement (&amp;ds, buf);
+	    int length = Tcl_DStringLength (ds);
+	    /* Set string representation */
+	    obj-&gt;length = length;
+	    obj-&gt;bytes  = Tcl_Alloc(length+1);
+	    memcpy (obj-&gt;bytes, Tcl_DStringValue (ds), length);
+	    obj-&gt;bytes[length] = '\0';
+	    /*
+	    ** : package require critcl::cutil ;# get C utilities
+	    ** : critcl::cutil::alloc          ;# Activate allocation utilities
+	    ** : (Internally cheaders, include)
+	    ** : Then all of the above can be written as STREP_DS (obj, ds);
+	    ** : STREP_DS = STRing REP from DString
+	    */
+	    Tcl_DStringFree (&amp;ds);
+	}
+	static int Vec2FromAny (Tcl_Interp* interp, Tcl_Obj* obj) {
+	    /* Change internal rep of obj to vector structure.
+	    ** A Tcl list of 2 doubles is used as intermediary int rep.
+	    */
+	    int len;
+	    if (Tcl_ListObjLength (interp, obj, &amp;len) != TCL_OK) return TCL_ERROR;
+	    if (len != 2) {
+		Tcl_SetObjResult (interp, Tcl_ObjPrintf (&quot;Expected 2 elements, got %d&quot;, len));
+		return TCL_ERROR;
+	    }
+	    Tcl_Obj* lv[2];
+	    if (Tcl_ListObjGetElements (interp, obj, &amp;lv) != TCL_OK) return TCL_ERROR;
+	    double x, y;
+	    if (Tcl_GetDoubleFromObj (interp, lv[0], &amp;x) != TCL_OK) return TCL_ERROR;
+	    if (Tcl_GetDoubleFromObj (interp, lv[1], &amp;y) != TCL_OK) return TCL_ERROR;
+	    obj-&gt;internalRep.otherValuePtr = (void*) Vec2New (x, y);
+	    obj-&gt;typePtr                   = &amp;vec2_objtype;
+	    return TCL_OK;
+	}
+	/* (un)packing structures from/into Tcl values -- */
+	int GetVecFromObj (Tcl_Interp* interp, Tcl_Obj* obj, vec2ptr* vec)
+	{
+	    if (obj-&gt;typePtr != &amp;vec2_objtype) {
+		if (VecFromAny (interp, obj) != TCL_OK) return TCL_ERROR;
+	    }
+	    *vec = (vec2ptr) obj-&gt;internalRep.otherValuePtr;
+	    return TCL_OK;
+	}
+	Tcl_Obj* NewVecObj (vec2ptr vec) {
+	    Tcl_Obj* obj = Tcl_NewObj ();
+	    Tcl_InvalidateStringRep (obj);
+	    obj-&gt;internalRep.otherValuePtr = Vec2Copy (vec);
+	    obj-&gt;typePtr                   = &amp;vec2_objtype;
+	    return obj;
+	}
+    }
+    critcl::argtype vec2 {
+	if (GetVecFromObj (interp, @@, &amp;@A) != TCL_OK) return TCL_ERROR;
+    } vec2ptr vec2ptr
+    critcl::resulttype vec2 {
+	/* rv: result value of function, interp: current Tcl interpreter */
+	Tcl_SetObjResult (interp, NewVecObj (rv));
+	return TCL_OK;
+    } vec2ptr
+    critcl::cproc norm {vec2 vector} double {
+	double norm = hypot (vector-&gt;x, vector-&gt;y);
+	return norm;
+    }
+    critcl::cproc add {vec2 a vec2 b} vec2 {
+	return Vec2New (a-&gt;x + b-&gt;x, a-&gt;y + b-&gt;y);
+    }
+</pre>
+</li>
+<li><p>The <b class="type">vec2</b> structure is now reference counted.</p></li>
+<li><p>The core management functions, i.e. <b class="function">Vec2New</b>, <b class="function">Vec2Copy</b>, and
+<b class="function">Vec2Release</b> are changed to maintain that reference count.
+Starting at <b class="const">0</b> on creation, copies increment, and releases decrement.
+A structure is actually only freed when its reference count falls to <b class="const">0</b> or below.</p></li>
+<li><p><b class="type">vec2</b> results are changed to pointers, easily passed back through the stack.
+The modified translation layer just wraps it into a <b class="type">Tcl_Obj*</b> value.</p></li>
+<li><p><em>Attention</em>. Duplicating such a <b class="type">Tcl_Obj*</b> does not duplicate the
+referenced <b class="type">vec2</b> structure anymore, just adds a reference.</p></li>
+<li><p>Regarding <b class="syscmd">diff</b> commands, I know of two graphical diffs for Tcl/Tk,
+<a href="https://tkdiff.sourceforge.io">TkDiff</a>, and <a href="http://eskil.tcl.tk">Eskil</a>.</p></li>
+</ol>
+<p>Packages: <i class="term"><a href="critcl_cutil.html">critcl::cutil</a></i></p>
+</div>
+<div id="subsection26" class="doctools_subsection"><h3><a name="subsection26">External Structures</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Handle structures provided by external libraries using either
+<span class="sectref"><a href="#subsection24">Structure Types</a></span> or <span class="sectref"><a href="#subsection25">Large Structures</a></span> as template.</p></li>
+<li><p><em>Attention</em>. The choice is with the developer.</p>
+<p>This is true even if the external structure is not reference counted by itself.</p>
+<p>To reference count a structure <b class="type">S</b> without such simply wrap <b class="type">S</b> into a
+local structure which provides the reference count and has a field for <b class="type">S</b> (pointer
+or value).</p></li>
+<li><p><em>Attention</em> Opaque external types, i.e. pointers to structures with hidden
+fields, can also be handled by the given templates.</p></li>
+</ol>
+</div>
+<div id="subsection27" class="doctools_subsection"><h3><a name="subsection27">External Enumerations</a></h3>
+<p>This section demonstrates how to convert from any kind of enumeration provided by an
+external library to Tcl strings, and the converse.</p>
+<ol class="doctools_enumerated">
+<li><p>For all that this is a part of how to
+<span class="sectref"><a href="#section3">Use External Libraries</a></span>, for the demonstratation
+only the basics are needed.</p></li>
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    package require critcl::emap
+    # no header included due to use of literal ints instead of symbolic names
+    critcl::emap::def yaml_sequence_style_t {
+	any   0
+	block 1
+	flow  2
+    }
+    # encode: style to int
+    critcl::cproc encode {yaml_sequence_style_t style} int {
+	return style;
+    }
+    # decode: int to style
+    critcl::cproc decode {int style} yaml_sequence_style_t {
+	return style;
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>The map converts between the Tcl level strings listed on the left side to the C
+values on the right side, and the reverse.</p></li>
+<li><p>It automatically generates <b class="cmd">critcl::argtype</b> and <b class="cmd">critcl::resulttype</b>
+definitions.</p></li>
+<li><p><em>Attention</em> Like the default values for <b class="cmd">cproc</b> arguments, and the results
+for <b class="cmd">cconst</b> definitions the values on the right side have to be proper C
+rvalues. They have to match C type <b class="type">int</b>.</p>
+<p>In other words, it is perfectly ok to use the symbolic names provided by the header
+file of the external library.</p>
+<p><em>Attention</em> This however comes at a loss in efficiency. As <i class="term"><a href="critcl.html">CriTcl</a></i> then
+has no insight into the covered range of ints, gaps, etc. it has to perform a linear
+search when mapping from C to Tcl. When it knows the exact integer values it can use a
+table lookup instead.</p>
+<p><em>Attention</em> It also falls back to a search if a lookup table would contain more
+than 50 entries.</p></li>
+</ol>
+<p>Packages: <i class="term"><a href="critcl_emap.html">critcl::emap</a></i></p>
+</div>
+<div id="subsection28" class="doctools_subsection"><h3><a name="subsection28">External Bitsets/Bitmaps/Flags</a></h3>
+<p>This section demonstrates how to convert from any kind of bit-mapped flags provided by an
+external library to lists of Tcl strings, and the converse.</p>
+<ol class="doctools_enumerated">
+<li><p>For all that this is a part of how to
+<span class="sectref"><a href="#section3">Use External Libraries</a></span>, for the demonstratation
+only the basics are needed.</p></li>
+<li><p>Starting from the <span class="sectref"><a href="#section2">Basics</a></span>. 
+            Edit the file &quot;<b class="file">example.tcl</b>&quot;.
+            Remove the definition of <b class="cmd">hello</b>. Replace it with</p>
+<pre class="doctools_example">
+    # http://man7.org/linux/man-pages/man7/inotify.7.html
+    
+    package require critcl::bitmap
+    # critcl::cheaders - n/a, header is in system directories
+    critcl::include sys/inotify.h
+    
+    critcl::bitmap::def tcl_inotify_events {
+	accessed       IN_ACCESS
+	all            IN_ALL_EVENTS
+	attribute      IN_ATTRIB
+	closed         IN_CLOSE
+	closed-nowrite IN_CLOSE_NOWRITE
+	closed-write   IN_CLOSE_WRITE
+	created        IN_CREATE
+	deleted        IN_DELETE
+	deleted-self   IN_DELETE_SELF
+	dir-only       IN_ONLYDIR
+	dont-follow    IN_DONT_FOLLOW
+	modified       IN_MODIFY
+	move           IN_MOVE
+	moved-from     IN_MOVED_FROM
+	moved-self     IN_MOVE_SELF
+	moved-to       IN_MOVED_TO
+	oneshot        IN_ONESHOT
+	open           IN_OPEN
+	overflow       IN_Q_OVERFLOW
+	unmount        IN_UNMOUNT
+    } {
+	all closed move oneshot
+    }
+    
+    # encode: flag set to int
+    critcl::cproc encode {tcl_inotify_events e} int {
+	return e;
+    }
+    # decode: int to flag set
+    critcl::cproc decode {int e} tcl_inotify_events {
+	return e;
+    }
+</pre>
+<p>and rebuild the package.</p></li>
+<li><p>The map converts between lists of the Tcl level strings listed on the left side to
+the bit-union of the C values on the right side, and the reverse.</p>
+<p>It is noted that the four strings <b class="const">all</b>, <b class="const">closed</b>, <b class="const">move</b>, and
+<b class="const">oneshot</b> cannot be converted from C flags to list of strings, only from list to
+bits.</p></li>
+<li><p>It automatically generates <b class="cmd">critcl::argtype</b> and <b class="cmd">critcl::resulttype</b>
+definitions.</p></li>
+<li><p><em>Attention</em> Like the default values for <b class="cmd">cproc</b> arguments, and the results
+for <b class="cmd">cconst</b> definitions the values on the right side have to be proper C
+rvalues. They have to match C type <b class="type">int</b>.</p>
+<p>In other words, it is perfectly ok to use the symbolic names provided by the header
+file of the external library. As shown.</p></li>
+</ol>
+<p>Packages: <i class="term"><a href="critcl_bitmap.html">critcl::bitmap</a></i></p>
+</div>
+<div id="subsection29" class="doctools_subsection"><h3><a name="subsection29">Non-standard header/library locations</a></h3>
+<ol class="doctools_enumerated">
+<li><p>See and reread the <span class="sectref"><a href="#section3">basic wrapper package</a></span> for
+the introduction of the commands referenced below.</p></li>
+<li><p><em>Attention</em> Relative paths will be resolved relative to the location of the
+&quot;<b class="file">.tcl</b>&quot; file containing the <i class="term"><a href="critcl.html">CriTcl</a></i> commands.</p></li>
+<li><p>Use the command <b class="cmd">critcl::cheaders</b> to tell <i class="term"><a href="critcl.html">CriTcl</a></i> about non-standard
+locations for header files.</p>
+<p>Multiple arguments are allowed, and multiple calls as well. The information
+accumulates.</p>
+<p>Arguments of the form &quot;<b class="file">-Idirectory</b>&quot; register the directory directly.</p>
+<p>For arguments of the form &quot;<b class="file">path</b>&quot; the directory holding the path is
+registered. In other words, it is assumed to be the full path of a header <em>file</em>, and
+not a directory.</p>
+<pre class="doctools_example">
+    critcl::cheaders -I/usr/local/include
+    critcl::cheaders local/types.h
+    critcl::cheaders other-support/*.h
+</pre>
+</li>
+<li><p>Use the command <b class="cmd">critcl::include</b> to actually use a specific header file.</p></li>
+<li><p>Use the command <b class="cmd">critcl::clibraries</b> to tell <i class="term"><a href="critcl.html">CriTcl</a></i> about non-standard
+locations for shared libaries, and about shared libaries to link to</p>
+<p>Multiple arguments are allowed, and multiple calls as well. The information
+accumulates.</p>
+<p>Arguments of the form &quot;<b class="file">-Ldirectory</b>&quot; register a directory.</p>
+<p>Arguments of the form &quot;<b class="file">-lname</b>&quot; register a shared libary to link to by
+name. The library will be looked for in both standard and registered directories.</p>
+<p>Arguments of the form &quot;<b class="file">-path</b>&quot; register a shared libary to link to by full
+path.</p>
+<pre class="doctools_example">
+    critcl::clibraries -L/usr/lib/x86_64-linux-gnu
+    critcl::clibraries -lzstd
+    critcl::clibraries /usr/lib/x86_64-linux-gnu/libzstd.so
+</pre>
+</li>
+<li><p>On Mac OS X use the command <b class="cmd">critcl::framework</b> to name the frameworks to use
+in the package.</p>
+<p><em>Attention</em> Using the command on other platforms is ok, and will be ignored.</p></li>
+<li><p>Not answered in the above is how to find the necessary paths if they are not fixed
+across machines or platforms.</p>
+<p>We will come back to this.</p></li>
+</ol>
+</div>
+<div id="subsection30" class="doctools_subsection"><h3><a name="subsection30">Non-standard compile/link configuration</a></h3>
+<ol class="doctools_enumerated">
+<li><p>See and reread the <span class="sectref"><a href="#section3">basic wrapper package</a></span> for
+the introduction of the commands referenced below.</p></li>
+<li><p>Use the command <b class="cmd">critcl::cflags</b> to provide additional, non-standard flags to
+the compiler.</p>
+<pre class="doctools_example">
+    critcl::cflags -DBYTE_ORDER=bigendian
+</pre>
+</li>
+<li><p>Use the command <b class="cmd">critcl::ldflags</b> to provide additional, non-standard flags to
+the linker.</p>
+<pre class="doctools_example">
+    critcl::ldflags -
+</pre>
+</li>
+<li><p>Not answered in the above is how to determine such flags if they are not fixed
+across machines or platforms.</p>
+<p>This is addressed by the next section.</p></li>
+</ol>
+</div>
+<div id="subsection31" class="doctools_subsection"><h3><a name="subsection31">Querying the compilation environment</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Use the command <b class="cmd">critcl::check</b> to immediately check if a piece of C code can
+compiled successfully as a means of querying the compiler configuration itself.</p>
+<pre class="doctools_example">
+    if {[critcl::check {
+        #include &lt;FOO.h&gt;
+    }]} {
+        Do stuff with FOO.h present.
+    } else {
+        Do stuff without FOO.h
+    }
+</pre>
+<p>All header and library paths which were registered with <i class="term"><a href="critcl.html">CriTcl</a></i> before using
+<b class="cmd">critcl::check</b> take part in the attempted compilation.</p>
+<p>Use the package <b class="package"><a href="critcl_util.html">critcl::util</a></b> and various convenience commands it
+provides.</p></li>
+<li><p>Use the full <i class="term">Power of Tcl (tm)</i> itself.</p></li>
+</ol>
+</div>
+<div id="subsection32" class="doctools_subsection"><h3><a name="subsection32">Shared C Code</a></h3>
+<ol class="doctools_enumerated">
+<li><p>See and reread the <span class="sectref"><a href="#section3">basic wrapper package</a></span> for
+the introduction of the commands referenced below.</p></li>
+<li><p>Use the command <b class="cmd">critcl::ccode</b> to write C code residing outside of <b class="cmd">cproc</b>
+bodies.</p></li>
+<li><p>Or, alternatively, place the C code into one or more &quot;<b class="file">.c</b>&quot; files and use the
+command <b class="cmd">critcl::csources</b> to register them with <i class="term"><a href="critcl.html">CriTcl</a></i> for compilation.</p></li>
+<li><p>This topic is also treated in section <span class="sectref"><a href="#subsection20">Separating Local C Sources</a></span>.</p></li>
+</ol>
+</div>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Various</a></h2>
+<div id="subsection33" class="doctools_subsection"><h3><a name="subsection33">Author, License, Description, Keywords</a></h3>
+<ol class="doctools_enumerated">
+<li><p>See and reread the <span class="sectref"><a href="#section2">basic package</a></span> for the introduction of the
+commands referenced below.</p></li>
+<li><p>Use the command <b class="cmd">critcl::license</b> to set the package license.</p>
+<p>Use the same command to set the package author.</p>
+<p>Both arguments are free form text.</p></li>
+<li><p>Use the command <b class="cmd">critcl::summary</b> to set a short package description.</p></li>
+<li><p>Use the command <b class="cmd">critcl::description</b> to set a longer package description.</p>
+<p>The arguments of both commands are free form text.</p></li>
+<li><p>Use the command <b class="cmd">critcl::subject</b> to set one or more keywords.</p>
+<p><em>Attention</em> Contrary to the other commands the arguments accumulate.</p></li>
+<li><p>All the commands are optional.</p></li>
+<li><p>Their information is not placed into the generated C code.</p></li>
+<li><p>In <i class="term">package mode</i> the information is placed into the file &quot;<b class="file">teapot.txt</b>&quot;
+of the generated package.</p></li>
+<li><p>This file serves as integration point for <i class="term">Teapot</i>, the package system of
+<i class="term">ActiveTcl</i>.</p></li>
+</ol>
+</div>
+<div id="subsection34" class="doctools_subsection"><h3><a name="subsection34">Get Critcl Application Help</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Invoke the command</p>
+<pre class="doctools_example">
+    critcl -help
+</pre>
+<p>in a terminal to get help about the <b class="syscmd"><a href="critcl.html">critcl</a></b> application.</p></li>
+</ol>
+</div>
+<div id="subsection35" class="doctools_subsection"><h3><a name="subsection35">Supported Targets &amp; Configurations</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Invoke the application as</p>
+<pre class="doctools_example">
+    critcl -show
+</pre>
+<p>in a terminal to get the detailed configuration of the target for the current platform.</p></li>
+<li><p>Invoke the application as</p>
+<pre class="doctools_example">
+    critcl -show -target NAME
+</pre>
+<p>in a terminal to get the detailed configuration of the named target.</p></li>
+<li><p>Invoke the application as</p>
+<pre class="doctools_example">
+    critcl -targets
+</pre>
+<p>in a terminal to get a list of the available targets.</p></li>
+</ol>
+</div>
+<div id="subsection36" class="doctools_subsection"><h3><a name="subsection36">Building A Package</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Start at section <span class="sectref"><a href="#section2">Basics</a></span>.</p></li>
+</ol>
+</div>
+<div id="subsection37" class="doctools_subsection"><h3><a name="subsection37">Building A Package For Debugging</a></h3>
+<ol class="doctools_enumerated">
+<li><p>Start at section <span class="sectref"><a href="#section2">Basics</a></span>.</p></li>
+</ol>
+</div>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Authors</a></h2>
+<p>Jean Claude Wippler, Steve Landers, Andreas Kupries</p>
+</div>
+<div id="section6" class="doctools_section"><h2><a name="section6">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report them at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a>.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a> as well.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#calling_c_code_from_tcl">calling C code from Tcl</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; Jean-Claude Wippler<br>
+Copyright &copy; Steve Landers<br>
+Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_iassoc.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_iassoc.html
new file mode 100644
index 00000000..241f83cd
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_iassoc.html
@@ -0,0 +1,251 @@
+<!DOCTYPE html><html><head>
+<title>critcl::iassoc - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_iassoc.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl::iassoc.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl::iassoc(n) 1.2 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl::iassoc - CriTcl - Code Gen - Tcl Interp Associations</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#synopsis">Synopsis</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">API</a></li>
+<li class="doctools_section"><a href="#section3">Example</a></li>
+<li class="doctools_section"><a href="#section4">Authors</a></li>
+<li class="doctools_section"><a href="#section5">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="synopsis" class="doctools_section"><h2><a name="synopsis">Synopsis</a></h2>
+<div class="doctools_synopsis">
+<ul class="doctools_requirements">
+<li>package require <b class="pkgname">Tcl 8.6</b></li>
+<li>package require <b class="pkgname">critcl <span class="opt">?3.2?</span></b></li>
+<li>package require <b class="pkgname">critcl::iassoc <span class="opt">?1.2?</span></b></li>
+</ul>
+<ul class="doctools_syntax">
+<li><a href="#1"><b class="cmd">::critcl::iassoc::def</b> <i class="arg">name</i> <i class="arg">arguments</i> <i class="arg">struct</i> <i class="arg">constructor</i> <i class="arg">destructor</i></a></li>
+</ul>
+</div>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This document is the reference manpage for the <b class="package">critcl::iassoc</b>
+package. This package provides convenience commands for advanced
+functionality built on top of the critcl core.</p>
+<p>With it a user wishing to associate some data with a Tcl
+interpreter via Tcl's <b class="function">Tcl_(Get|Set)AssocData()</b> APIs can now
+concentrate on the data itself, while all the necessary boilerplate
+around it is managed by this package.</p>
+<p>Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code.</p>
+<p>This package resides in the Core Package Layer of CriTcl.</p>
+<p><img alt="arch_core" src="../image/arch_core.png"></p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">API</a></h2>
+<dl class="doctools_definitions">
+<dt><a name="1"><b class="cmd">::critcl::iassoc::def</b> <i class="arg">name</i> <i class="arg">arguments</i> <i class="arg">struct</i> <i class="arg">constructor</i> <i class="arg">destructor</i></a></dt>
+<dd><p>This command defines a C function with the given <i class="arg">name</i> which
+provides access to a structure associated with a Tcl interpreter.</p>
+<p>The C code code fragment <i class="arg">struct</i> defines the elements of
+said structure, whereas the fragments <i class="arg">constructor</i> and
+<i class="arg">destructor</i> are C code blocks executed to initialize and release
+any dynamically allocated parts of this structure, when needed. Note
+that the structure itself is managed by the system.</p>
+<p>The new function takes a <b class="const">Tcl_Interp*</b> pointer refering
+to the interpreter whose structure we wish to obtain as the first
+argument, plus the specified <i class="arg">arguments</i> and returns a pointer to
+the associated structure, of type &quot;<i class="arg">name</i>_data&quot; (see below).</p>
+<p>The <i class="arg">arguments</i> are a dictionary-like list of C types and
+identifiers specifying additional arguments for the accessor function,
+and, indirectly, the <i class="arg">constructor</i> C code block. This is useful
+for the supplication of initialization values, or the return of more
+complex error information in case of a construction failure.</p>
+<p>The C types associated with the structure are derived from
+<i class="arg">name</i>, with &quot;<i class="arg">name</i>_data__&quot; the type of the structure itself,
+and &quot;<i class="arg">name</i>_data&quot; representing a pointer to the structure.
+The C code blocks can rely on the following C environments:</p>
+<dl class="doctools_definitions">
+<dt><i class="arg">constructor</i></dt>
+<dd><dl class="doctools_definitions">
+<dt><b class="variable">data</b></dt>
+<dd><p>Pointer to the structure (type: <i class="arg">name</i>_data) to
+initialize.</p></dd>
+<dt><b class="variable">interp</b></dt>
+<dd><p>Pointer to the Tcl interpreter (type: Tcl_Interp*)
+the new structure will be associated with.</p></dd>
+<dt>error</dt>
+<dd><p>A C code label the constructor can jump to should it have
+to signal a construction failure. It is the responsibility of the
+constructor to release any fields already initialized before jumping
+to this label.</p></dd>
+<dt>...</dt>
+<dd><p>The names of the constructor arguments specified with
+<i class="arg">arguments</i>.</p></dd>
+</dl></dd>
+<dt><i class="arg">destructor</i></dt>
+<dd><dl class="doctools_definitions">
+<dt><b class="variable">data</b></dt>
+<dd><p>Pointer to the structure being released.</p></dd>
+<dt><b class="variable">interp</b></dt>
+<dd><p>Pointer to the Tcl interpreter the structure
+belonged to.</p></dd>
+</dl></dd>
+</dl></dd>
+</dl>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Example</a></h2>
+<p>The example shown below is the specification of a simple interpreter-associated
+counter. The full example, with meta data and other incidentals, can be found
+in the directory &quot;<b class="file">examples/queue</b>&quot; of the critcl source
+distribution/repository.</p>
+<pre class="doctools_example">
+package require Tcl 8.6
+package require critcl 3.2
+critcl::buildrequirement {
+    package require critcl::iassoc
+}
+critcl::iassoc::def icounter {} {
+    int counter; /* The counter variable */
+} {
+    data-&gt;counter = 0;
+} {
+    /* Nothing to release */
+}
+critcl::ccode {
+    ... function (...)
+    {
+         /* Access to the data ... */
+         icounter_data D = icounter (interp /* ... any declared arguments, here, none */);
+	 ... D-&gt;counter ...
+    }
+}
+# or, of course, 'cproc's, 'ccommand's etc.
+package provide icounter 1
+</pre>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Authors</a></h2>
+<p>Andreas Kupries</p>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report such at <a href="https://github.com/andreas-kupries/critcl">https://github.com/andreas-kupries/critcl</a>.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#tcl_interp_association">Tcl Interp Association</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a>, <a href="../index.html#singleton">singleton</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_license.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_license.html
new file mode 100644
index 00000000..e7ba8559
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_license.html
@@ -0,0 +1,178 @@
+<!DOCTYPE html><html><head>
+<title>critcl_license - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_license.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; Jean-Claude Wippler   -- Copyright &amp;copy; Steve Landers   -- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl_license.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl_license(n) 1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl_license - The CriTcl License</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">License</a></li>
+<li class="doctools_section"><a href="#section3">Authors</a></li>
+<li class="doctools_section"><a href="#section4">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>All packages are under the BSD license.</p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">License</a></h2>
+<p>This software is copyrighted by Andreas Kupries and other parties.  The following
+terms apply to all files associated with the software unless explicitly disclaimed in
+individual files.</p>
+<p>The authors hereby grant permission to use, copy, modify, distribute, and license
+this software and its documentation for any purpose, provided that existing copyright
+notices are retained in all copies and that this notice is included verbatim in any
+distributions. No written agreement, license, or royalty fee is required for any of the
+authorized uses.  Modifications to this software may be copyrighted by their authors and
+need not follow the licensing terms described here, provided that the new terms are
+clearly indicated on the first page of each file where they apply.</p>
+<p>IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS
+SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+<p>THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN &quot;AS IS&quot; BASIS, AND THE
+AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
+ENHANCEMENTS, OR MODIFICATIONS.</p>
+<p>GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only &quot;Restricted Rights&quot; in the software and
+related documentation as defined in the Federal Acquisition Regulations (FARs) in Clause
+52.227.19 (c) (2).  If you are acquiring the software on behalf of the Department of
+Defense, the software shall be classified as &quot;Commercial Computer Software&quot; and the
+Government shall have only &quot;Restricted Rights&quot; as defined in Clause 252.227-7014 (b) (3)
+of DFARs.  Notwithstanding the foregoing, the authors grant the U.S. Government and others
+acting in its behalf permission to use and distribute the software in accordance with the
+terms specified in this license.</p>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Authors</a></h2>
+<p>Jean Claude Wippler, Steve Landers, Andreas Kupries</p>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report them at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a>.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a> as well.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#calling_c_code_from_tcl">calling C code from Tcl</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; Jean-Claude Wippler<br>
+Copyright &copy; Steve Landers<br>
+Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_literals.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_literals.html
new file mode 100644
index 00000000..db7aacca
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_literals.html
@@ -0,0 +1,274 @@
+<!DOCTYPE html><html><head>
+<title>critcl::literals - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_literals.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl::literals.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl::literals(n) 1.4 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl::literals - CriTcl - Code Gen - Constant string pools</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#synopsis">Synopsis</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">API</a></li>
+<li class="doctools_section"><a href="#section3">Example</a></li>
+<li class="doctools_section"><a href="#section4">Authors</a></li>
+<li class="doctools_section"><a href="#section5">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="synopsis" class="doctools_section"><h2><a name="synopsis">Synopsis</a></h2>
+<div class="doctools_synopsis">
+<ul class="doctools_requirements">
+<li>package require <b class="pkgname">Tcl 8.6</b></li>
+<li>package require <b class="pkgname">critcl <span class="opt">?3.2?</span></b></li>
+<li>package require <b class="pkgname">critcl::literals <span class="opt">?1.4?</span></b></li>
+</ul>
+<ul class="doctools_syntax">
+<li><a href="#1"><b class="cmd">::critcl::literals::def</b> <i class="arg">name</i> <i class="arg">definition</i> <span class="opt">?<i class="arg">mode</i>?</span></a></li>
+</ul>
+</div>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This document is the reference manpage for the
+<b class="package">critcl::literals</b> package. This package provides convenience
+commands for advanced functionality built on top of both critcl core
+and package <b class="package"><a href="critcl_iassoc.html">critcl::iassoc</a></b>.</p>
+<p>Many packages will have a fixed set of string constants
+occuring in one or places. Most of them will be coded to create a new
+string <b class="type">Tcl_Obj*</b> from a C <b class="type">char*</b> every time the constant
+is needed, as this is easy to to, despite the inherent waste of
+memory.</p>
+<p>This package was written to make declaration and management of
+string pools which do not waste memory as easy as the wasteful
+solution, hiding all attendant complexity from the user.</p>
+<p>Its intended audience are mainly developers wishing to write
+Tcl packages with embedded C code.</p>
+<p>This package resides in the Core Package Layer of CriTcl.</p>
+<p><img alt="arch_core" src="../image/arch_core.png"></p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">API</a></h2>
+<dl class="doctools_definitions">
+<dt><a name="1"><b class="cmd">::critcl::literals::def</b> <i class="arg">name</i> <i class="arg">definition</i> <span class="opt">?<i class="arg">mode</i>?</span></a></dt>
+<dd><p>This command defines a C function with the given <i class="arg">name</i> which
+provides access to a pool of constant strings with a Tcl interpreter.</p>
+<p>The <i class="arg">definition</i> dictionary provides the mapping from the
+C-level symbolic names to the string themselves.</p>
+<p>The <i class="arg">mode</i>-list configures the output somewhat.
+The three allowed modes are <b class="const">c</b>, <b class="const">+list</b> and <b class="const">tcl</b>.
+All modes can be used together.
+The default mode is <b class="const">tcl</b>.
+Using mode <b class="const">+list</b> implies <b class="const">tcl</b> as well.</p>
+<p>For mode <b class="const">tcl</b> the new function has two arguments, a
+<b class="type">Tcl_Interp*</b> pointer refering to the interpreter holding the
+string pool, and a code of type &quot;<i class="arg">name</i>_names&quot; (see below), the
+symbolic name of the literal to return. The result of the function is
+a <b class="type">Tcl_Obj*</b> pointer to the requested string constant.</p>
+<p>For mode <b class="const">c</b> the new function has one argument, a code of
+type &quot;<i class="arg">name</i>_names&quot; (see below), the symbolic name of the literal
+to return. The result of the function is a <b class="type">const char*</b>
+pointer to the requested string constant.</p>
+<p>For mode <b class="const">+list</b> all of <b class="const">tcl</b> applies, plus an
+additional function is generated which takes three arguments, in
+order, a <b class="type">Tcl_Interp*</b> pointer refering to the interpreter
+holding the string pool, an <b class="type">int</b> holding the size of the last
+argument, and an array of type &quot;<i class="arg">name</i>_names&quot; holding the codes
+(see below), the symbolic names of the literals to return. The result
+of the function is a <b class="type">Tcl_Obj*</b> pointer to a Tcl list holding the
+requested string constants.</p>
+<p>The underlying string pool is automatically initialized on
+first access, and finalized on interpreter destruction.</p>
+<p>The package generates multiple things (declarations and
+definitions) with names derived from <i class="arg">name</i>, which has to be a
+proper C identifier.</p>
+<dl class="doctools_definitions">
+<dt><i class="arg">name</i></dt>
+<dd><p>The mode <b class="const">tcl</b> function providing access to the string pool.
+Its signature is</p>
+<pre class="doctools_example">
+Tcl_Obj* <i class="arg">name</i> (Tcl_Interp* interp, <i class="arg">name</i>_names literal);
+</pre>
+</dd>
+<dt><i class="arg">name</i>_list</dt>
+<dd><p>The mode <b class="const">+list</b> function providing multi-access to the string pool.
+Its signature is</p>
+<pre class="doctools_example">
+Tcl_Obj* <i class="arg">name</i>_list (Tcl_Interp* interp, int c, <i class="arg">name</i>_names* literal);
+</pre>
+</dd>
+<dt><i class="arg">name</i>_cstr</dt>
+<dd><p>The mode <b class="const">c</b> function providing access to the string pool.
+Its signature is</p>
+<pre class="doctools_example">
+const char* <i class="arg">name</i>_cstr (<i class="arg">name</i>_names literal);
+</pre>
+</dd>
+<dt><i class="arg">name</i>_names</dt>
+<dd><p>A C enumeration type containing the symbolic names of the strings
+provided by the pool.</p></dd>
+<dt><i class="arg">name</i>.h</dt>
+<dd><p>A header file containing the declarations for the accessor functions
+and the enumeration type, for use by other parts of the system, if
+necessary.</p>
+<p>The generated file is stored in a place where it will not
+interfere with the overall system outside of the package, yet also be
+available for easy inclusion by package files (<b class="cmd">csources</b>).</p></dd>
+<dt><i class="arg">name</i></dt>
+<dd><p><em>New in version 1.1</em>:
+For mode <b class="const">tcl</b> the command registers a new result-type for
+<b class="cmd">critcl::cproc</b> with critcl, which takes an integer result from
+the function and converts it to the equivalent string in the pool for
+the script.</p></dd>
+</dl></dd>
+</dl>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Example</a></h2>
+<p>The example shown below is the specification of the string pool pulled
+from the draft work on a Tcl binding to Linux's inotify APIs.</p>
+<pre class="doctools_example">
+package require Tcl 8.6
+package require critcl 3.2
+critcl::buildrequirement {
+    package require critcl::literals
+}
+critcl::literals::def tcl_inotify_strings {
+    w_create	&quot;create&quot;
+    w_directory	&quot;directory&quot;
+    w_events	&quot;events&quot;
+    w_file	&quot;file&quot;
+    w_handler	&quot;handler&quot;
+    w_remove	&quot;remove&quot;
+} {c tcl}
+# Declarations: tcl_inotify_strings.h
+# Type:         tcl_inotify_strings_names
+# Accessor:     Tcl_Obj*    tcl_inotify_strings      (Tcl_Interp*               interp,
+#                                                     tcl_inotify_strings_names literal);
+# Accessor:     const char* tcl_inotify_strings_cstr (tcl_inotify_strings_names literal);
+# ResultType:   tcl_inotify_strings
+</pre>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Authors</a></h2>
+<p>Andreas Kupries</p>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report such at <a href="https://github.com/andreas-kupries/critcl">https://github.com/andreas-kupries/critcl</a>.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#tcl_interp_association">Tcl Interp Association</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#literal_pool">literal pool</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a>, <a href="../index.html#singleton">singleton</a>, <a href="../index.html#string_pool">string pool</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_package.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_package.html
new file mode 100644
index 00000000..9c72d539
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_package.html
@@ -0,0 +1,1801 @@
+<!DOCTYPE html><html><head>
+<title>critcl_package - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_package.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; Jean-Claude Wippler   -- Copyright &amp;copy; Steve Landers   -- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl_package.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl_package(n) 3.2.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl_package - CriTcl Package Reference</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#synopsis">Synopsis</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">API</a>
+<ul>
+<li class="doctools_subsection"><a href="#subsection1">Embedded C Code</a></li>
+<li class="doctools_subsection"><a href="#subsection2">Stubs Table Management</a></li>
+<li class="doctools_subsection"><a href="#subsection3">Package Meta Data</a></li>
+<li class="doctools_subsection"><a href="#subsection4">Control &amp; Interface</a></li>
+<li class="doctools_subsection"><a href="#subsection5">Introspection</a></li>
+<li class="doctools_subsection"><a href="#subsection6">Build Management</a></li>
+<li class="doctools_subsection"><a href="#subsection7">Result Cache Management</a></li>
+<li class="doctools_subsection"><a href="#subsection8">Build Configuration</a></li>
+<li class="doctools_subsection"><a href="#subsection9">Tool API</a></li>
+<li class="doctools_subsection"><a href="#subsection10">Advanced: Embedded C Code</a></li>
+<li class="doctools_subsection"><a href="#subsection11">Custom Build Configuration</a></li>
+<li class="doctools_subsection"><a href="#subsection12">Advanced: Location management</a></li>
+<li class="doctools_subsection"><a href="#subsection13">Advanced: Diversions</a></li>
+<li class="doctools_subsection"><a href="#subsection14">Advanced: File Generation</a></li>
+</ul>
+</li>
+<li class="doctools_section"><a href="#section3">Concepts</a>
+<ul>
+<li class="doctools_subsection"><a href="#subsection15">Modes Of Operation/Use</a></li>
+<li class="doctools_subsection"><a href="#subsection16">Runtime Behaviour</a></li>
+<li class="doctools_subsection"><a href="#subsection17">File Mapping</a></li>
+<li class="doctools_subsection"><a href="#subsection18">Result Cache</a></li>
+<li class="doctools_subsection"><a href="#subsection19">Preloading functionality</a></li>
+<li class="doctools_subsection"><a href="#subsection20">Configuration Internals</a></li>
+<li class="doctools_subsection"><a href="#subsection21">Stubs Tables</a></li>
+</ul>
+</li>
+<li class="doctools_section"><a href="#section4">Examples</a></li>
+<li class="doctools_section"><a href="#section5">Authors</a></li>
+<li class="doctools_section"><a href="#section6">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="synopsis" class="doctools_section"><h2><a name="synopsis">Synopsis</a></h2>
+<div class="doctools_synopsis">
+<ul class="doctools_requirements">
+<li>package require <b class="pkgname">Tcl 8.6</b></li>
+<li>package require <b class="pkgname">critcl <span class="opt">?3.2.1?</span></b></li>
+<li>package require <b class="pkgname">platform <span class="opt">?1.0.2?</span></b></li>
+<li>package require <b class="pkgname">md5 <span class="opt">?2?</span></b></li>
+</ul>
+<ul class="doctools_syntax">
+<li><a href="#1"><b class="cmd">::critcl::ccode</b> <i class="arg">fragment</i></a></li>
+<li><a href="#2"><b class="cmd">::critcl::ccommand</b> <i class="arg">tclname</i> <i class="arg">cname</i></a></li>
+<li><a href="#3"><b class="cmd">::critcl::ccommand</b> <i class="arg">tclname</i> <i class="arg">arguments</i> <i class="arg">body</i> <span class="opt">?<i class="arg">option</i> <i class="arg">value</i>...?</span></a></li>
+<li><a href="#4"><b class="cmd">::critcl::cdata</b> <i class="arg">tclname</i> <i class="arg">data</i></a></li>
+<li><a href="#5"><b class="cmd">::critcl::cconst</b> <i class="arg">tclname</i> <i class="arg">resulttype</i> <i class="arg">value</i></a></li>
+<li><a href="#6"><b class="cmd">::critcl::cdefines</b> <i class="arg">list of glob patterns</i> <span class="opt">?<i class="arg">namespace</i>?</span></a></li>
+<li><a href="#7"><b class="cmd">::critcl::cproc</b> <i class="arg">name</i> <i class="arg">arguments</i> <i class="arg">resulttype</i> <i class="arg">body</i> <span class="opt">?<i class="arg">option</i> <i class="arg">value</i>...?</span></a></li>
+<li><a href="#8"><b class="cmd">::critcl::cproc</b> <i class="arg">name</i> <i class="arg">arguments</i> <i class="arg">resulttype</i></a></li>
+<li><a href="#9"><b class="cmd">::critcl::cinit</b> <i class="arg">text</i> <i class="arg">externals</i></a></li>
+<li><a href="#10"><b class="cmd">::critcl::include</b> <i class="arg">path</i></a></li>
+<li><a href="#11"><b class="cmd">::critcl::api</b> <b class="method">import</b> <i class="arg">name</i> <i class="arg">version</i></a></li>
+<li><a href="#12"><b class="cmd">::critcl::api</b> <b class="method">function</b> <i class="arg">resulttype</i> <i class="arg">name</i> <i class="arg">arguments</i></a></li>
+<li><a href="#13"><b class="cmd">::critcl::api</b> <b class="method">header</b> <span class="opt">?<i class="arg">glob pattern</i>...?</span></a></li>
+<li><a href="#14"><b class="cmd">::critcl::api</b> <b class="method">extheader</b> <span class="opt">?<i class="arg">file</i>...?</span></a></li>
+<li><a href="#15"><b class="cmd">::critcl::license</b> <i class="arg">author</i> <span class="opt">?<i class="arg">text</i>...?</span></a></li>
+<li><a href="#16"><b class="cmd">::critcl::summary</b> <i class="arg">text</i></a></li>
+<li><a href="#17"><b class="cmd">::critcl::description</b> <i class="arg">text</i></a></li>
+<li><a href="#18"><b class="cmd">::critcl::subject</b> <span class="opt">?<i class="arg">key</i>...?</span></a></li>
+<li><a href="#19"><b class="cmd">::critcl::meta</b> <i class="arg">key</i> <span class="opt">?<i class="arg">word</i>...?</span></a></li>
+<li><a href="#20"><b class="cmd">::critcl::meta?</b> <i class="arg">key</i></a></li>
+<li><a href="#21"><b class="cmd">::critcl::buildrequirement</b> <i class="arg">script</i></a></li>
+<li><a href="#22"><b class="cmd">::critcl::cheaders</b> <span class="opt">?<i class="arg">arg</i>...?</span></a></li>
+<li><a href="#23"><b class="cmd">::critcl::csources</b> <span class="opt">?<i class="arg">glob pattern</i>...?</span></a></li>
+<li><a href="#24"><b class="cmd">::critcl::clibraries</b> <span class="opt">?<i class="arg">glob pattern</i>...?</span></a></li>
+<li><a href="#25"><b class="cmd">::critcl::source</b> <i class="arg">glob pattern</i></a></li>
+<li><a href="#26"><b class="cmd">::critcl::tsources</b> <i class="arg">glob pattern</i>...</a></li>
+<li><a href="#27"><b class="cmd">::critcl::owns</b> <i class="arg">glob pattern</i>...</a></li>
+<li><a href="#28"><b class="cmd">::critcl::cflags</b> <span class="opt">?<i class="arg">arg</i>...?</span></a></li>
+<li><a href="#29"><b class="cmd">::critcl::ldflags</b> <span class="opt">?<i class="arg">arg</i>...?</span></a></li>
+<li><a href="#30"><b class="cmd">::critcl::framework</b> <span class="opt">?<i class="arg">arg</i>...?</span></a></li>
+<li><a href="#31"><b class="cmd">::critcl::tcl</b> <i class="arg">version</i></a></li>
+<li><a href="#32"><b class="cmd">::critcl::tk</b></a></li>
+<li><a href="#33"><b class="cmd">::critcl::preload</b> <i class="arg">lib</i>...</a></li>
+<li><a href="#34"><b class="cmd">::critcl::debug</b> <i class="arg">area</i>...</a></li>
+<li><a href="#35"><b class="cmd">::critcl::check</b> <span class="opt">?<i class="arg">label</i>?</span> <i class="arg">text</i></a></li>
+<li><a href="#36"><b class="cmd">::critcl::checklink</b> <span class="opt">?<i class="arg">label</i>?</span> <i class="arg">text</i></a></li>
+<li><a href="#37"><b class="cmd">::critcl::msg</b> <span class="opt">?<b class="option">-nonewline</b>?</span> <i class="arg">msg</i></a></li>
+<li><a href="#38"><b class="cmd">::critcl::print</b> <span class="opt">?<b class="option">-nonewline</b>?</span> <span class="opt">?<i class="arg">chan</i>?</span> <i class="arg">msg</i></a></li>
+<li><a href="#39"><b class="cmd">::critcl::compiled</b></a></li>
+<li><a href="#40"><b class="cmd">::critcl::compiling</b></a></li>
+<li><a href="#41"><b class="cmd">::critcl::done</b></a></li>
+<li><a href="#42"><b class="cmd">::critcl::failed</b></a></li>
+<li><a href="#43"><b class="cmd">::critcl::load</b></a></li>
+<li><a href="#44"><b class="cmd">::critcl::config</b> <i class="arg">option</i> <span class="opt">?<i class="arg">val</i>?</span></a></li>
+<li><a href="#45"><b class="cmd">::critcl::cache</b> <span class="opt">?path?</span></a></li>
+<li><a href="#46"><b class="cmd">::critcl::clean_cache</b> <span class="opt">?<i class="arg">pattern</i>...?</span></a></li>
+<li><a href="#47"><b class="cmd">::critcl::readconfig</b> <i class="arg">path</i></a></li>
+<li><a href="#48"><b class="cmd">::critcl::showconfig</b> <span class="opt">?<i class="arg">chan</i>?</span></a></li>
+<li><a href="#49"><b class="cmd">::critcl::showallconfig</b> <span class="opt">?<i class="arg">chan</i>?</span></a></li>
+<li><a href="#50"><b class="cmd">::critcl::chooseconfig</b> <i class="arg">target</i> <span class="opt">?<i class="arg">nomatcherr</i>?</span></a></li>
+<li><a href="#51"><b class="cmd">::critcl::setconfig</b> <i class="arg">target</i></a></li>
+<li><a href="#52"><b class="cmd">::critcl::actualtarget</b></a></li>
+<li><a href="#53"><b class="cmd">::critcl::buildforpackage</b> <span class="opt">?<i class="arg">flag</i>?</span></a></li>
+<li><a href="#54"><b class="cmd">::critcl::cnothingtodo</b> <i class="arg">file</i></a></li>
+<li><a href="#55"><b class="cmd">::critcl::cresults</b> <span class="opt">?<i class="arg">file</i>?</span></a></li>
+<li><a href="#56"><b class="cmd">::critcl::crosscheck</b></a></li>
+<li><a href="#57"><b class="cmd">::critcl::error</b> <i class="arg">msg</i></a></li>
+<li><a href="#58"><b class="cmd">::critcl::knowntargets</b></a></li>
+<li><a href="#59"><b class="cmd">::critcl::sharedlibext</b></a></li>
+<li><a href="#60"><b class="cmd">::critcl::targetconfig</b></a></li>
+<li><a href="#61"><b class="cmd">::critcl::buildplatform</b></a></li>
+<li><a href="#62"><b class="cmd">::critcl::targetplatform</b></a></li>
+<li><a href="#63"><b class="cmd">::critcl::cobjects</b> <span class="opt">?<i class="arg">glob pattern</i>...?</span></a></li>
+<li><a href="#64"><b class="cmd">::critcl::scan</b> <i class="arg">path</i></a></li>
+<li><a href="#65"><b class="cmd">::critcl::name2c</b> <i class="arg">name</i></a></li>
+<li><a href="#66"><b class="cmd">::critcl::argnames</b> <i class="arg">arguments</i></a></li>
+<li><a href="#67"><b class="cmd">::critcl::argcnames</b> <i class="arg">arguments</i></a></li>
+<li><a href="#68"><b class="cmd">::critcl::argcsignature</b> <i class="arg">arguments</i></a></li>
+<li><a href="#69"><b class="cmd">::critcl::argvardecls</b> <i class="arg">arguments</i></a></li>
+<li><a href="#70"><b class="cmd">::critcl::argconversion</b> <i class="arg">arguments</i> <span class="opt">?<i class="arg">n</i>?</span></a></li>
+<li><a href="#71"><b class="cmd">::critcl::argoptional</b> <i class="arg">arguments</i></a></li>
+<li><a href="#72"><b class="cmd">::critcl::argdefaults</b> <i class="arg">arguments</i></a></li>
+<li><a href="#73"><b class="cmd">::critcl::argsupport</b> <i class="arg">arguments</i></a></li>
+<li><a href="#74"><b class="cmd">::critcl::userconfig</b> <b class="method">define</b> <i class="arg">name</i> <i class="arg">description</i> <i class="arg">type</i> <span class="opt">?<i class="arg">default</i>?</span></a></li>
+<li><a href="#75"><b class="cmd">::critcl::userconfig</b> <b class="method">query</b> <i class="arg">name</i></a></li>
+<li><a href="#76"><b class="cmd">::critcl::userconfig</b> <b class="method">set</b> <i class="arg">name</i> <i class="arg">value</i></a></li>
+<li><a href="#77"><b class="cmd">::critcl::at::caller</b></a></li>
+<li><a href="#78"><b class="cmd">::critcl::at::caller</b> <i class="arg">offset</i></a></li>
+<li><a href="#79"><b class="cmd">::critcl::at::caller</b> <i class="arg">offset</i> <i class="arg">level</i></a></li>
+<li><a href="#80"><b class="cmd">::critcl::at::here</b></a></li>
+<li><a href="#81"><b class="cmd">::critcl::at::get*</b></a></li>
+<li><a href="#82"><b class="cmd">::critcl::at::get</b></a></li>
+<li><a href="#83"><b class="cmd">::critcl::at::=</b> <i class="arg">file</i> <i class="arg">line</i></a></li>
+<li><a href="#84"><b class="cmd">::critcl::at::incr</b> <i class="arg">n</i>...</a></li>
+<li><a href="#85"><b class="cmd">::critcl::at::incrt</b> <i class="arg">str</i>...</a></li>
+<li><a href="#86"><b class="cmd">::critcl::at::caller!</b></a></li>
+<li><a href="#87"><b class="cmd">::critcl::at::caller!</b> <i class="arg">offset</i></a></li>
+<li><a href="#88"><b class="cmd">::critcl::at::caller!</b> <i class="arg">offset</i> <i class="arg">level</i></a></li>
+<li><a href="#89"><b class="cmd">::critcl::at::here!</b></a></li>
+<li><a href="#90"><b class="cmd">::critcl::collect_begin</b></a></li>
+<li><a href="#91"><b class="cmd">::critcl::collect_end</b></a></li>
+<li><a href="#92"><b class="cmd">::critcl::collect</b> <i class="arg">script</i></a></li>
+<li><a href="#93"><b class="cmd">::critcl::make</b> <i class="arg">path</i> <i class="arg">contents</i></a></li>
+<li><a href="#94"><b class="cmd">::preload</b> <i class="arg">library</i></a></li>
+</ul>
+</div>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>The <b class="package"><a href="critcl.html">critcl</a></b> package is the core of the system.  For an overview of the
+complete system, see <i class="term"><a href="critcl.html">Introduction To CriTcl</a></i>.  For the usage of the
+standalone <b class="cmd"><a href="critcl.html">critcl</a></b> program, see <i class="term">CriTcl Application</i>.
+This core package maybe be used to embed C code into Tcl scripts.  It also
+provides access to the internals that other parts of the core use and which
+are of interest to those wishing to understand the internal workings of the
+core and of the API it provides to the <i class="term">CriTcl Application</i>.  These
+advanced sections are marked as such so that those simply wishing to use the
+package can skip them.</p>
+<p>This package resides in the Core Package Layer of CriTcl.</p>
+<p><img alt="arch_core" src="../image/arch_core.png"></p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">API</a></h2>
+<p>A short note ahead of the documentation: Instead of repeatedly talking
+about
+&quot;a Tcl script with embbedded C code&quot;, or
+&quot;a Tcl script containing CriTcl commands&quot;,
+we call such a script a <i class="term">CriTcl script</i>.  A file containing a
+<i class="term">CriTcl script</i> usually has the extension <b class="const">.tcl</b> or
+<b class="const">.critcl</b>.</p>
+<div id="subsection1" class="doctools_subsection"><h3><a name="subsection1">Embedded C Code</a></h3>
+<p>The following commands append C code fragments to the current module.  Fragments
+appear in the module in the order they are appended, so the earlier fragments
+(variables, functions, macros, etc.) are visible to later fragments.</p>
+<dl class="doctools_definitions">
+<dt><a name="1"><b class="cmd">::critcl::ccode</b> <i class="arg">fragment</i></a></dt>
+<dd><p>Appends the C code in <i class="arg">fragment</i> to the current module and returns the
+empty string.
+See <span class="sectref"><a href="#subsection16">Runtime Behaviour</a></span>.</p></dd>
+<dt><a name="2"><b class="cmd">::critcl::ccommand</b> <i class="arg">tclname</i> <i class="arg">cname</i></a></dt>
+<dd><p>As documented below, except that <i class="arg">cname</i> is the name of a C function
+that already exists.</p></dd>
+<dt><a name="3"><b class="cmd">::critcl::ccommand</b> <i class="arg">tclname</i> <i class="arg">arguments</i> <i class="arg">body</i> <span class="opt">?<i class="arg">option</i> <i class="arg">value</i>...?</span></a></dt>
+<dd><p>Appends the code to create a Tcl command named <i class="arg">tclname</i> and a
+corresponding C function whose body is <i class="arg">body</i> and which behaves as
+documented for Tcl's own
+<a href="https://www.tcl-lang.org/man/tcl/TclLib/CrtObjCmd.htm">Tcl_CreateObjCommand</a>.</p>
+<p><i class="arg">aguments</i> is a list of zero to four names for the standard arguments
+<b class="const">clientdata</b>, <b class="const">interp</b>, <b class="const">objc</b>, and <b class="const">objv</b>.  The
+standard default names are used in place of any missing names.
+This is a more low-level way than <b class="cmd">critcl::cproc</b> to define a command, as
+processing of the items in <b class="const">objv</b> is left to the author, affording
+complete control over the handling of the arguments to the command.
+See section <span class="sectref"><a href="#subsection16">Runtime Behaviour</a></span>.</p>
+<p>Returns the empty string.</p>
+<p>Each <i class="arg">option</i> may be one of:</p>
+<dl class="doctools_options">
+<dt><b class="option">-clientdata</b> <i class="arg">c-expression</i></dt>
+<dd><p>Provides the client data for the new command.  <b class="const">NULL</b> by default.</p></dd>
+<dt><b class="option">-delproc</b> <i class="arg">c-expression</i></dt>
+<dd><p>Provides a function pointer of type <a href="https://www.tcl-lang.org/man/tcl/TclLib/CrtObjCmd.htm">Tcl_CmdDeleteProc</a> as the deletion function for the new command.  <b class="const">NULL</b> by default.</p></dd>
+<dt><b class="option">-cname</b> <i class="arg">boolean</i></dt>
+<dd><p>If <b class="const">false</b> (the default), a name for the corresponding C function is
+automatically derived from the fully-qualified <i class="arg">tclname</i>.  Otherwise, name
+of the C function is the last component of <i class="arg">tclname</i>.</p></dd>
+</dl></dd>
+<dt><a name="4"><b class="cmd">::critcl::cdata</b> <i class="arg">tclname</i> <i class="arg">data</i></a></dt>
+<dd><p>Appends the code to create a new Tcl command named <i class="arg">tclname</i> which returns
+<i class="arg">data</i> as a <b class="const">ByteArray</b> result.</p>
+<p>Returns the empty string.</p></dd>
+<dt><a name="5"><b class="cmd">::critcl::cconst</b> <i class="arg">tclname</i> <i class="arg">resulttype</i> <i class="arg">value</i></a></dt>
+<dd><p>Appends the code to create a new Tcl command named <i class="arg">tclname</i> which returns
+the constant <i class="arg">value</i> having the Tcl type <i class="arg">resulttype</i>.  <i class="arg">value</i> can
+be a C macro or a function <em>call</em> (including the parentheses) to any
+visible C function that does not take arguments.
+Unlike <b class="cmd">critcl::cdata</b>, <i class="arg">resulttype</i> can be any type known to
+<b class="cmd">critcl::cproc</b>.
+Its semantics are equivalent to:</p>
+<pre class="doctools_example">
+    cproc $tclname {} $resulttype &quot;return $value ;&quot;
+</pre>
+<p>This is more efficient than <b class="cmd">critcl::cproc</b> since there is no
+C function generated.</p>
+<p>Returns the empty string.</p></dd>
+<dt><a name="6"><b class="cmd">::critcl::cdefines</b> <i class="arg">list of glob patterns</i> <span class="opt">?<i class="arg">namespace</i>?</span></a></dt>
+<dd><p>Arranges for <i class="term">C enum</i> and <i class="term">#define</i> values that match one of the
+patterns in <i class="term">glob patterns</i> to be created in the namespace
+<i class="arg">namespace</i>, each variable having the same as the corresponding C item.
+The default namespace is the global namespace.  A pattern that matches nothing
+is ignored.</p>
+<p>The Tcl variables are created when the module is compiled, using the
+preprocessor in order to properly find all matching C definitions.</p>
+<p>Produces no C code.  The desired C definitions must already exist.</p></dd>
+<dt><a name="7"><b class="cmd">::critcl::cproc</b> <i class="arg">name</i> <i class="arg">arguments</i> <i class="arg">resulttype</i> <i class="arg">body</i> <span class="opt">?<i class="arg">option</i> <i class="arg">value</i>...?</span></a></dt>
+<dd><p>Appends a function having <i class="arg">body</i> as its body, another shim function to
+perform the needed conversions, and the code to create a corresponding Tcl
+command named <i class="arg">tclname</i>.  Unlike <b class="cmd">critcl::ccommand</b> the arguments and
+result are typed, and CriTcl generates the code to convert between Tcl_Obj
+values and C data types.
+See also <span class="sectref"><a href="#subsection16">Runtime Behaviour</a></span>.</p>
+<p>Returns the empty string.</p>
+<dl class="doctools_arguments">
+<dt>string <i class="arg">option</i></dt>
+<dd><p>Each may be one of:</p>
+<dl class="doctools_options">
+<dt><b class="option">-cname</b> <i class="arg">boolean</i></dt>
+<dd><p>If <b class="const">false</b> (the default), a name for the corresponding C function is
+automatically derived from the fully-qualified <i class="arg">tclname</i>.  Otherwise, name
+of the C function is the last component of <i class="arg">tclname</i>.</p></dd>
+<dt><b class="option">-pass-cdata</b> <i class="arg">boolean</i></dt>
+<dd><p>If <b class="const">false</b> (the default), the shim function performing the conversion to
+and from Tcl level does not pass the ClientData as the first argument to
+the function.</p></dd>
+<dt><b class="option">-arg-offset</b> <i class="arg">int</i></dt>
+<dd><p>A non-negative integer, <b class="const">0</b> by default, indicating the number of hidden
+arguments preceding the actual procedure arguments.  Used by higher-order code
+generators where there are prefix arguments which are not directly seen by the
+function but which influence argument counting and extraction.</p></dd>
+</dl></dd>
+<dt>string <i class="arg">resulttype</i></dt>
+<dd><p>May be a predefined or a custom type.
+See <i class="term"><a href="critcl_cproc.html">CriTcl cproc Type Reference</a></i> for the full list of predefined types and how to
+extend them.
+Unless otherwise noted, the Tcl return code is always <b class="const">TCL_OK</b>.</p></dd>
+<dt>list <i class="arg">arguments</i></dt>
+<dd><p>Is a multi-dictionary where each key is an
+argument type and its value is the argument name.
+For example:</p>
+<pre class="doctools_example"> int x int y </pre>
+<p>Each argument name must be a valid C identifier.</p>
+<p>If the name is a list containing two items, the first item is the name
+and the second item is the default value.  A limited form of variadic arguments
+can be accomplished using such default values.
+For example:</p>
+<pre class="doctools_example"> int {x 1} </pre>
+<p>Here <i class="arg">x</i> is an optional argument of type <b class="type">int</b> with a default
+value of <b class="const">1</b>.</p>
+<p>Argument conversion is completely bypassed when the argument is not
+provided, so a custom converter doing validation does not get the chance to
+validate the default value.  In this case, the value should be checked in the
+body of the function.</p>
+<p>Each argument type may be a predefined or custom type.
+See <i class="term"><a href="critcl_cproc.html">CriTcl cproc Type Reference</a></i> for the full list of predefined types and how to
+extend them.</p></dd>
+</dl></dd>
+<dt><a name="8"><b class="cmd">::critcl::cproc</b> <i class="arg">name</i> <i class="arg">arguments</i> <i class="arg">resulttype</i></a></dt>
+<dd><p>As documented below, but used when the C function named <i class="arg">name</i> already
+exists.</p></dd>
+<dt><a name="9"><b class="cmd">::critcl::cinit</b> <i class="arg">text</i> <i class="arg">externals</i></a></dt>
+<dd><p>Appends the C code in <i class="arg">text</i> and <i class="arg">externals</i>, but only after all the
+other fragments appended by the previously-listed commands regardless of their
+placement in the <i class="term">CriTcl script</i> relative to this command.  Thus, all
+their content is visible.  See also <span class="sectref"><a href="#subsection16">Runtime Behaviour</a></span>.</p>
+<p>The C code in <i class="arg">text</i> is placed into the body of the initialization
+function of the shared library backing the <i class="term">CriTcl script</i>, and is
+executed when this library is loaded into the interpreter.  It has access to
+the variable <b class="variable">Tcl_Interp* interp</b> referencing the Tcl interpreter currently
+being initialized.</p>
+<p><i class="arg">externals</i> is placed outside and just before the initialization
+function, making it a good place for any external symbols required by
+initialization function, but which should not be accessible by any other parts
+of the C code.</p>
+<p>Calls to this command are cumulative.</p>
+<p>Returns the empty string.</p></dd>
+<dt><a name="10"><b class="cmd">::critcl::include</b> <i class="arg">path</i></a></dt>
+<dd><p>This command is a convenient shorthand for</p>
+<pre class="doctools_example">
+critcl::code {
+  #include &lt;${path}&gt;
+}
+</pre>
+</dd>
+</dl>
+</div>
+<div id="subsection2" class="doctools_subsection"><h3><a name="subsection2">Stubs Table Management</a></h3>
+<p>CriTcl versions 3 and later provide <b class="cmd">critcl::api</b> to create and manipulate
+stubs tables, Tcl's dynamic linking mechanism handling the resolution of
+symbols between C extensions.
+See <a href="http://wiki.tcl-lang.org/285">http://wiki.tcl-lang.org/285</a>
+for an introduction, and section <span class="sectref"><a href="#subsection21">Stubs Tables</a></span>
+for the details of CriTcl's particular variant.</p>
+<p>Importing stubs tables, i.e. APIs, from another extension:</p>
+<dl class="doctools_definitions">
+<dt><a name="11"><b class="cmd">::critcl::api</b> <b class="method">import</b> <i class="arg">name</i> <i class="arg">version</i></a></dt>
+<dd><p>Adds the following include directives into the <i class="term">CriTcl script</i>
+<em>and</em> each of its companion &quot;<b class="file">.c</b>&quot; files:</p>
+<ol class="doctools_enumerated">
+<li><p>#include &lt;<b class="variable">name</b>/<b class="variable">name</b>Decls.h&gt;</p></li>
+<li><p>#include &lt;<b class="variable">name</b>/<b class="variable">name</b>StubLib.h&gt;</p></li>
+</ol>
+<p>Returns an error if &quot;<b class="file"><b class="variable">name</b></b>&quot; isn't in the search path for the
+compiler.  See <b class="cmd">critcl::cheaders</b> and the critcl application's <b class="option">-I</b>
+and <b class="option">-includedir</b> options.</p>
+<p><em>Important:</em> If <b class="variable">name</b> is a fully-qualified name in a
+non-global namespace, e.g.
+&quot;c::stack&quot;, the namespace separators &quot;::&quot; are converted into underscores
+(&quot;_&quot;) in path names, C code, etc.</p>
+<p><b class="variable">name</b>/<b class="variable">name</b>Decls.h contains the stubs table type declarations,
+mapping macros, etc., and may include package-specific headers.  See
+<b class="cmd">critcl::api header</b>, below.  An <i class="term">#include</i> directive is added at
+the beginning of the generated code for <i class="term">CriTcl script</i> and at the
+beginning of each of its companion &quot;<b class="file">.c</b>&quot; files.</p>
+<p><b class="variable">name</b>/<b class="variable">name</b>StubLib.h contains the stubs table variable
+definition and the function to initialize it.  An <i class="term">#include</i> directive
+for it is added to the initialization code for the <i class="term">CriTcl script</i> ,
+along with a call to the initializer function.</p>
+<p>If &quot;<b class="file"><b class="variable">name</b>/<b class="variable">name</b>.decls</b>&quot; accompanies
+<b class="variable">name</b>/<b class="variable">name</b>Decls.h, it should contain the external representation of
+the stubs table used to generate the headers. The file is read and the internal
+representation of the stubs table returned for use by the importing package.
+Otherwise, the empy string is returned.</p>
+<p>One possible use would be the automatic generation of C code
+calling on the functions listed in the imported API.</p>
+<p>When generating a TEA package the names of the imported APIs
+are used to declare <b class="syscmd">configure</b> options with which the user can
+declare a non-standard directory for the headers of the API. Any API
+<b class="variable">name</b> is translated into a single configure option
+<b class="option">--with-<b class="variable">name</b>-include</b>.</p></dd>
+</dl>
+<p>Declaration and export of a stubs table, i.e. API, for
+the <i class="term">CriTcl script</i>:</p>
+<dl class="doctools_definitions">
+<dt><a name="12"><b class="cmd">::critcl::api</b> <b class="method">function</b> <i class="arg">resulttype</i> <i class="arg">name</i> <i class="arg">arguments</i></a></dt>
+<dd><p>Adds to the public API of the <i class="term">CriTcl script</i> the signature
+for the function named <i class="arg">name</i> and having the signature specified by
+<i class="arg">arguments</i> and <i class="arg">resulttype</i>.  Code is generated for a &quot;<b class="file">.decls</b>&quot;
+file, the corresponding public headers, and a stubs table usable by
+<b class="cmd">critcl::api import</b>.</p>
+<p><i class="arg">arguments</i> is a multidict where each key is an argument type and its
+value is the argument name, and <i class="arg">resulttype</i> is a C type.</p></dd>
+<dt><a name="13"><b class="cmd">::critcl::api</b> <b class="method">header</b> <span class="opt">?<i class="arg">glob pattern</i>...?</span></a></dt>
+<dd><p>Each file matching a <i class="arg">glob pattern</i> is copied into the directory
+containing the generated headers, and an <i class="term">#include</i> directive for it is
+added to &quot;<b class="file">Decls.h</b>&quot; for the <i class="term">CriTcl script</i>.
+Returns an error if a <i class="arg">glob pattern</i> matches nothing.</p>
+<p>A pattern for a relative path is resolved relative to the directory
+containing the <i class="term">CriTcl script</i>.</p></dd>
+<dt><a name="14"><b class="cmd">::critcl::api</b> <b class="method">extheader</b> <span class="opt">?<i class="arg">file</i>...?</span></a></dt>
+<dd><p>Like <b class="cmd">::critcl::api header</b>, but each <i class="arg">file</i> should exist in the
+external development environment.  An <i class="term">#include</i> directive is added to
+&quot;<b class="file"><b class="variable">foo</b>Decls.h</b>&quot;, but <i class="arg">file</i> is not copied to the package header
+directory. <i class="arg">file</i> is not a glob pattern as CriTcl has no context,
+i.e directory, in which to expand such patterns.</p></dd>
+</dl>
+<p>As with the headers for an imported API, an <i class="term">#include</i> directive is
+added to the generated code for the <i class="term">CriTcl script</i> and to
+each companion &quot;<b class="file">.c</b>&quot; file.</p>
+<p>In &quot;compile &amp; run&quot; mode the generated header files and any companion
+headers are placed in the <span class="sectref"><a href="#subsection18">Result Cache</a></span> subdirectory for the
+<i class="term">CriTcl script</i>. This directory is added to the include search path of
+any other package importing this API and and building in mode &quot;compile &amp; run&quot;.</p>
+<p>In &quot;generate package&quot; mode <b class="option">-includedir</b> specifies the
+subdirectory in the package to place the generated headers in. This
+directory is added to the search paths for header files, ensuring that a
+package importing an API finds it if the package exporting that API used the
+same setting for <b class="option">-includedir</b>.</p>
+<p>In &quot;generate TEA&quot; mode the static scanner recognizes
+<b class="cmd">critcl::api header</b> as a source of companion files.
+It also uses data from calls to <b class="cmd">critcl::api import</b> to
+add support for <b class="option">--with-<b class="variable">foo</b>-include</b> options into the
+generated &quot;<b class="file">configure(.in)</b>&quot; so that a user may specify custom
+locations for the headers of any imported API.</p>
+</div>
+<div id="subsection3" class="doctools_subsection"><h3><a name="subsection3">Package Meta Data</a></h3>
+<p>CriTcl versions 3 and later can create TEApot meta-data to be placed into
+&quot;<b class="file">teapot.txt</b>&quot; in a format suitable for use by the
+<a href="http://docs.activestate.com/activetcl/8.5/tpm/toc.html">TEApot tools</a>.</p>
+<p>In version 2, some meta data support was already present through
+<b class="cmd">::critcl::license</b>, but this was only used to generate &quot;<b class="file">license.txt</b>&quot;.</p>
+<dl class="doctools_definitions">
+<dt><a name="15"><b class="cmd">::critcl::license</b> <i class="arg">author</i> <span class="opt">?<i class="arg">text</i>...?</span></a></dt>
+<dd><p>Ignored in &quot;compile &amp; run&quot; mode.</p>
+<p>In &quot;generate package&quot; mode provides information about the author of the
+package and the license for the package.</p>
+<p><i class="arg">text</i> arguments are concatenated to form the text of the license, which is
+written to &quot;<b class="file">license.terms</b>&quot; in the same directory as &quot;<b class="file">pkgIndex.tcl</b>&quot;.
+If no <i class="arg">text</i> is provided the license is read from &quot;<b class="file">license.terms</b>&quot;
+in the same directory as the <i class="term">CriTcl script</i>.</p>
+<p>This information takes precedence over any information specified through
+the generic API <b class="cmd">::critcl::meta</b>.  It is additionally placed
+into the meta data file &quot;<b class="file">teapot.txt</b>&quot; under the keys <i class="term">as::author</i> and
+<i class="term">license</i>.</p></dd>
+<dt><a name="16"><b class="cmd">::critcl::summary</b> <i class="arg">text</i></a></dt>
+<dd><p>Ignored in &quot;compile &amp; run&quot; mode.</p>
+<p>In &quot;generate package&quot; mode places a short, preferably one-line description of
+the package into the meta data file &quot;<b class="file">teapot.txt</b>&quot; under the key
+<i class="term">summary</i>.  This information takes precedence over information specified
+through the generic API <b class="cmd">::critcl::meta</b>.</p></dd>
+<dt><a name="17"><b class="cmd">::critcl::description</b> <i class="arg">text</i></a></dt>
+<dd><p>Ignored in &quot;compile &amp; run&quot; mode.</p>
+<p>In &quot;generate package&quot; mode places a longer description of the package into the
+meta data file &quot;<b class="file">teapot.txt</b>&quot;, under the key <i class="term">description</i>.  The data
+specified by this command takes precedence over any information specified
+through the generic API <b class="cmd">::critcl::meta</b>.</p></dd>
+<dt><a name="18"><b class="cmd">::critcl::subject</b> <span class="opt">?<i class="arg">key</i>...?</span></a></dt>
+<dd><p>Ignored in &quot;compile &amp; run&quot; mode.</p>
+<p>In &quot;generate package&quot; mode places each <i class="arg">key</i> into the meta data file
+&quot;<b class="file">teapot.txt</b>&quot;, under the key <i class="term">subject</i>.  This information takes
+precedence over any information specified through the generic API
+<b class="cmd">::critcl::meta</b>.</p>
+<p>Calls to this command are cumulative.</p></dd>
+<dt><a name="19"><b class="cmd">::critcl::meta</b> <i class="arg">key</i> <span class="opt">?<i class="arg">word</i>...?</span></a></dt>
+<dd><p>Provides arbitrary meta data outside of the following reserved keys:
+<i class="term">as::author</i>,
+<i class="term">as::build::date</i>,
+<i class="term">description</i>,
+<i class="term">license</i>,
+<i class="term">name</i>,
+<i class="term">platform</i>,
+<i class="term">require</i>
+<i class="term">subject</i>,
+<i class="term">summary</i>, and
+<i class="term">version</i>,
+Its behaviour is like <b class="cmd">::critcl::subject</b> in that it treats all
+keys as list of words, with each call providing one or more words for
+the key, and multiple calls extending the data for an existing key, if
+not reserved.</p>
+<p>While it is possible to declare information for one of the
+reserved keys with this command such data is ignored when the final
+meta data is assembled and written.</p>
+<p>Use the commands
+<b class="cmd">::critcl::license</b>,
+<b class="cmd">::critcl::summary</b>,
+<b class="cmd">::critcl::description</b>
+<b class="cmd">::critcl::subject</b>,
+<b class="cmd">package require</b>, and
+<b class="cmd">package provide</b>
+to declare data for the reserved keys.</p>
+<p>The information for the reserved keys
+<i class="term">as::build::date</i> and
+<i class="term">platform</i>
+is automatically generated by <b class="package"><a href="critcl.html">critcl</a></b> itself.</p></dd>
+<dt><a name="20"><b class="cmd">::critcl::meta?</b> <i class="arg">key</i></a></dt>
+<dd><p>Returns the value in the metadata associated with <i class="arg">key</i>.</p>
+<p>Used primarily to retrieve the name of the package
+from within utility packages having to adapt C code templates to their
+environment. For example, <b class="package"><a href="critcl_class.html">critcl::class</a></b> uses does this.</p></dd>
+<dt><a name="21"><b class="cmd">::critcl::buildrequirement</b> <i class="arg">script</i></a></dt>
+<dd><p>Provides control over the capturing of dependencies declared via
+<b class="cmd">package require</b>. <i class="arg">script</i> is evaluated and any dependencies
+declared within are ignored, i.e. not recorded in the meta data.</p></dd>
+</dl>
+</div>
+<div id="subsection4" class="doctools_subsection"><h3><a name="subsection4">Control &amp; Interface</a></h3>
+<p>These commands control the details of compilation and linking a
+<i class="term">CriTcl script</i>.  The information is used only to compile/link the
+object for the <i class="term">CriTcl script</i>.  For example, information for
+&quot;<b class="file">FOO.tcl</b>&quot; is kept separate from information for &quot;<b class="file">BAR.tcl</b>&quot;.</p>
+<dl class="doctools_definitions">
+<dt><a name="22"><b class="cmd">::critcl::cheaders</b> <span class="opt">?<i class="arg">arg</i>...?</span></a></dt>
+<dd><p>Provides additional header locations.</p>
+<p>Each argument is a glob pattern.  If an argument begins with <b class="const">-</b>
+it is an argument to the compiler.  Otherwise the parent directory of each
+matching path is a directory to be searched for header files.  Returns an
+error if a pattern matches no files.
+A pattern for a relative path is resolved relative to the directory
+containing the <i class="term">CriTcl script</i>.</p>
+<p><b class="const">#include</b> lines are not automatically generated for matching
+header files.  Use <b class="cmd">critcl::include</b> or <b class="cmd">critcl::ccode</b> as necessary to
+add them.</p>
+<p>Calls to this command are cumulative.</p></dd>
+<dt><a name="23"><b class="cmd">::critcl::csources</b> <span class="opt">?<i class="arg">glob pattern</i>...?</span></a></dt>
+<dd><p>Matching paths become inputs to the compilation of the current object
+along with the sources for the current <i class="term">CriTcl script</i>.  Returns an
+error if no paths match a pattern.
+A pattern for a relative path is resolved relative to the directory
+containing the <i class="term">CriTcl script</i>.</p>
+<p>Calls to this command are cumulative.</p></dd>
+<dt><a name="24"><b class="cmd">::critcl::clibraries</b> <span class="opt">?<i class="arg">glob pattern</i>...?</span></a></dt>
+<dd><p>provides the link step with additional libraries and library locations.
+A <i class="arg">glob pattern</i> that begins with <b class="const">-</b> is added as an argument to
+the linker.  Otherwise matching files are linked into the shared library.
+Returns an error if no paths match a pattern.
+A pattern for a relative path is resolved relative to the directory
+containing the <i class="term">CriTcl script</i>.</p>
+<p>Calls to this command are cumulative.</p></dd>
+<dt><a name="25"><b class="cmd">::critcl::source</b> <i class="arg">glob pattern</i></a></dt>
+<dd><p>Evaluates as scripts the files matching each <i class="arg">glob pattern</i>.  Returns an
+error if there are no matching files.
+A pattern for a relative path is resolved relative to the directory
+containing the <i class="term">CriTcl script</i>.</p></dd>
+<dt><a name="26"><b class="cmd">::critcl::tsources</b> <i class="arg">glob pattern</i>...</a></dt>
+<dd><p>Provides the information about additional Tcl script files to source when the
+shared library is loaded.</p>
+<p>Matching paths are made available to the generated shared library when
+it is loaded for the current <i class="term">CriTcl script</i>.  Returns an error if a
+pattern matches no files.
+A pattern for a relative path is resolved relative to the directory
+containing the <i class="term">CriTcl script</i>.</p>
+<p>Calls to this command are cumulative.</p>
+<p>After the shared library has been loaded, the declared files are sourced
+in the same order that they were provided as arguments.</p></dd>
+<dt><a name="27"><b class="cmd">::critcl::owns</b> <i class="arg">glob pattern</i>...</a></dt>
+<dd><p>Ignored in &quot;compile and run&quot; and &quot;generate package&quot; modes.
+In &quot;generate TEA&quot; mode each file matching a <i class="arg">glob pattern</i> is a file to
+be included in the TEA extension but that could not be ascertained as such from
+previous commands like <b class="cmd">critcl::csources</b> and <b class="cmd">critcl::tsources</b>,
+either because of they were specified dynamically or because they were directly
+sourced.</p></dd>
+<dt><a name="28"><b class="cmd">::critcl::cflags</b> <span class="opt">?<i class="arg">arg</i>...?</span></a></dt>
+<dd><p>Each <i class="arg">arg</i> is an argument to the compiler.</p>
+<p>Calls to this command are cumulative.</p></dd>
+<dt><a name="29"><b class="cmd">::critcl::ldflags</b> <span class="opt">?<i class="arg">arg</i>...?</span></a></dt>
+<dd><p>Each <i class="arg">arg</i> is an argument to the linker.</p>
+<p>Calls to this command are cumulative.</p></dd>
+<dt><a name="30"><b class="cmd">::critcl::framework</b> <span class="opt">?<i class="arg">arg</i>...?</span></a></dt>
+<dd><p>Each <i class="arg">arg</i> is the name of a framework to link on MacOS X.  This command is
+ignored if OS X is not the target so that frameworks can be specified
+unconditionally.</p>
+<p>Calls to this command are cumulative.</p></dd>
+<dt><a name="31"><b class="cmd">::critcl::tcl</b> <i class="arg">version</i></a></dt>
+<dd><p>Specifies the minimum version of the Tcl runtime
+to compile and link the package for.  The default is <b class="const">8.4</b>.</p></dd>
+<dt><a name="32"><b class="cmd">::critcl::tk</b></a></dt>
+<dd><p>Arranges to include the Tk headers and link to the Tk stubs.</p></dd>
+<dt><a name="33"><b class="cmd">::critcl::preload</b> <i class="arg">lib</i>...</a></dt>
+<dd><p>Arranges for the external shared library <i class="arg">lib</i> to be loaded
+before the shared library for the <i class="term">CriTcl script</i> is loaded.</p>
+<p>Calls to this command are cumulative.</p>
+<p>Each library <i class="arg">FOO</i> is searched for in the directories listed below, in the order
+listed.  The search stops at the first existing path.
+Additional notes:</p>
+<ul class="doctools_itemized">
+<li><p><b class="variable">platform</b> is the placeholder for the target platform of the package.</p></li>
+<li><p>The extension &quot;<b class="file">.so</b>&quot; is the placeholder for whatever actual extension is used by the target platform for its shared libraries.</p></li>
+<li><p>The search is relative to the current working directory.</p></li>
+</ul>
+<p>And now the paths, depending on the exact form of the library name:</p>
+<dl class="doctools_definitions">
+<dt>FOO</dt>
+<dd><ol class="doctools_enumerated">
+<li><p>FOO.so</p></li>
+<li><p>FOO/FOO.so</p></li>
+<li><p>FOO/<b class="variable">platform</b>/FOO.so</p></li>
+</ol></dd>
+<dt>PATH/FOO</dt>
+<dd><p>The exact set searched depends on the existence of
+directory &quot;<b class="file">PATH/FOO</b>&quot;. If it exists, critcl searches</p>
+<ol class="doctools_enumerated">
+<li><p>FOO.so</p></li>
+<li><p>PATH/FOO/FOO.so</p></li>
+<li><p>PATH/FOO/<b class="variable">platform</b>/FOO.so</p></li>
+</ol>
+<p>Otherwise it searches</p>
+<ol class="doctools_enumerated">
+<li><p>FOO.so</p></li>
+<li><p>PATH/FOO.so</p></li>
+<li><p>PATH/<b class="variable">platform</b>/FOO.so</p></li>
+</ol>
+<p>instead.</p></dd>
+<dt>/PATH/FOO</dt>
+<dd><p>Even when specifying FOO with an absolute path the first path searched
+is relative to the current working directory.</p>
+<ol class="doctools_enumerated">
+<li><p>FOO.so</p></li>
+<li><p>/PATH/FOO.so</p></li>
+<li><p>/PATH/<b class="variable">platform</b>/FOO.so</p></li>
+</ol></dd>
+</dl>
+<p>For developers who want to understand or modify the internals of the
+<b class="package"><a href="critcl.html">critcl</a></b> package, <span class="sectref"><a href="#subsection19">Preloading functionality</a></span> explains how
+preloading is implemented.</p></dd>
+<dt><a name="34"><b class="cmd">::critcl::debug</b> <i class="arg">area</i>...</a></dt>
+<dd><p>Specifies what debugging features to activate. Internally each area is translated into
+area-specific flags for the compiler which are then handed over to
+<b class="cmd">critcl::cflags</b>.</p>
+<dl class="doctools_definitions">
+<dt><b class="const">memory</b></dt>
+<dd><p>Specifies Tcl memory debugging.</p></dd>
+<dt><b class="const">symbols</b></dt>
+<dd><p>Specifies compilation and linking with debugging symbols for use by a debugger
+or other tool.</p></dd>
+<dt><b class="const">all</b></dt>
+<dd><p>Specifies all available debugging.</p></dd>
+</dl></dd>
+</dl>
+</div>
+<div id="subsection5" class="doctools_subsection"><h3><a name="subsection5">Introspection</a></h3>
+<p>The following commands control compilation and linking.</p>
+<dl class="doctools_definitions">
+<dt><a name="35"><b class="cmd">::critcl::check</b> <span class="opt">?<i class="arg">label</i>?</span> <i class="arg">text</i></a></dt>
+<dd><p>Returns a <b class="const">true</b> if the C code in <i class="arg">text</i> compiles sucessfully, and
+<b class="const">false</b> otherwise.  Used to check for availability of features in the
+build environment.
+If provided, <i class="arg">label</i> is used to uniquely mark the results in the generated
+log.</p></dd>
+<dt><a name="36"><b class="cmd">::critcl::checklink</b> <span class="opt">?<i class="arg">label</i>?</span> <i class="arg">text</i></a></dt>
+<dd><p>Like <b class="cmd">critcl::check</b> but also links the compiled objects, returning
+<b class="const">true</b> if the link is successful and <b class="const">false</b> otherwise.
+If specified, <i class="arg">label</i> is used to uniquely mark the results in the generated
+log.</p></dd>
+<dt><a name="37"><b class="cmd">::critcl::msg</b> <span class="opt">?<b class="option">-nonewline</b>?</span> <i class="arg">msg</i></a></dt>
+<dd><p>Scripts using <b class="cmd">critcl::check</b> and <b class="cmd">critcl::checklink</b> can use this
+command to report results.  Does nothing in <i class="term"><a href="../index.html#compile_run">compile &amp; run</a></i> mode.  Tools
+like the <i class="term">CriTcl Aplication</i> may redefine this command to implement
+their own message reporting. For example, <b class="package">critcl::app</b> and any
+packages built on it print messages to <i class="term">stdout</i>.</p></dd>
+<dt><a name="38"><b class="cmd">::critcl::print</b> <span class="opt">?<b class="option">-nonewline</b>?</span> <span class="opt">?<i class="arg">chan</i>?</span> <i class="arg">msg</i></a></dt>
+<dd><p>Used by the CriTcl internals to report activity.  By default, effectively the
+same thing as <b class="cmd">::puts</b>.  Tools directly using either the CriTcl package or
+the CriTcl application package may redefine this procedure to implement their
+own output functionality.</p>
+<p>For example, the newest revisions of
+<a href="https://chiselapp.com/user/andreas_kupries/repository/Kettle/index">Kettle</a>
+use this to highlight build warnings.</p></dd>
+<dt><a name="39"><b class="cmd">::critcl::compiled</b></a></dt>
+<dd><p>Returns <b class="const">true</b> if the current <i class="term">CriTcl script</i> is already compiled
+and <b class="const">false</b> otherwise.</p>
+<p>Enables a <i class="term">CriTcl script</i> used as its own Tcl companion file (see
+<b class="cmd">critcl::tsources</b>) to distinguish between being sourced for compilation in
+<i class="term"><a href="../index.html#compile_run">compile &amp; run</a></i> mode and being sourced from either the result of
+<i class="term"><a href="../index.html#generate_package">generate package</a></i> mode or during the load phase of
+<i class="term"><a href="../index.html#compile_run">compile &amp; run</a></i> mode.
+The result is <b class="const">false</b> in the first case and <b class="const">true</b> in the later two
+cases.</p></dd>
+<dt><a name="40"><b class="cmd">::critcl::compiling</b></a></dt>
+<dd><p>Returns <b class="const">true</b> if a working C compiler is available and <b class="const">false</b>
+otherwise.</p></dd>
+<dt><a name="41"><b class="cmd">::critcl::done</b></a></dt>
+<dd><p>Returns <b class="const">true</b> when <i class="term">CriTcl script</i> has been built and
+<b class="const">false</b> otherwise.  Only useful from within a <i class="term">CriTcl script</i>.
+Enables the Tcl parts of a <i class="term">CriTcl script</i> to distinguish between
+<i class="term">prebuilt package</i> mode and <i class="term"><a href="../index.html#compile_run">compile &amp; run</a></i> mode.</p>
+<p>See also <span class="sectref"><a href="#subsection15">Modes Of Operation/Use</a></span>.</p></dd>
+<dt><a name="42"><b class="cmd">::critcl::failed</b></a></dt>
+<dd><p>Returns <b class="const">true</b> if the <i class="term">CriTcl script</i> could not be built, and
+<b class="const">false</b> otherwise.  Forces the building of the package if it hasn't
+already been done, but not its loading.  Thus, a <i class="term">CriTcl script</i> can
+check itself for availability of the compiled components.  Only useful from
+within a <i class="term">CriTcl script</i>.</p></dd>
+<dt><a name="43"><b class="cmd">::critcl::load</b></a></dt>
+<dd><p>Like <b class="cmd">critcl::failed</b> except that it also forces the loading of the
+generated shared library, and that it returns <b class="const">true</b> on success and
+<b class="const">false</b> on failure.  Thus, a <i class="term">CriTcl script</i> can check itself for
+availability of the compiled components.  Only useful from within a
+<i class="term">CriTcl script</i>.</p></dd>
+</dl>
+</div>
+<div id="subsection6" class="doctools_subsection"><h3><a name="subsection6">Build Management</a></h3>
+<p>The following command manages global settings, i.e. configuration options which
+are independent of any <i class="term">CriTcl script</i>.</p>
+<p>This command should not be needed to write a <i class="term">CriTcl script</i>. It is
+a management command which is only useful to the <i class="term">CriTcl Application</i>
+or similar tools.</p>
+<dl class="doctools_definitions">
+<dt><a name="44"><b class="cmd">::critcl::config</b> <i class="arg">option</i> <span class="opt">?<i class="arg">val</i>?</span></a></dt>
+<dd><p>Sets and returns the following global configuration options:</p>
+<dl class="doctools_options">
+<dt><b class="option">force</b> bool</dt>
+<dd><p>When <b class="const">false</b> (the default), the C files are not built if there is a
+cached shared library.</p></dd>
+<dt><b class="option">lines</b> bool</dt>
+<dd><p>When <b class="const">true</b> (the default), #line directives are embedded into the
+generated C code.</p>
+<p>This facility requires the use of a tclsh that provides
+<b class="cmd">info frame</b>.  Otherwise, no <i class="term">#line</i> directives are emitted. The
+command is supported by Tcl 8.5 and higher. It is also supported by
+Tcl 8.4 provided that it was compiled with the define
+<b class="option">-DTCL_TIP280</b>. An example of such is ActiveState's ActiveTcl.</p>
+<p>Developers of higher-level packages generating their own C
+code, either directly or indirectly through critcl, should
+also read section <span class="sectref"><a href="#subsection12">Advanced: Location management</a></span> to see how
+critcl helps them in generating their directives.
+Examples of such packages come with critcl itself. See
+<b class="package"><a href="critcl_iassoc.html">critcl::iassoc</a></b> and <b class="package"><a href="critcl_class.html">critcl::class</a></b>.</p></dd>
+<dt><b class="option">trace</b> bool</dt>
+<dd><p>When <b class="const">false</b> (the default), no code tracing the entry and exit of
+CriTcl-backed commands in the <i class="term">CriTcl script</i> is inserted.  Insertion of
+such code implicitly activates the tracing facility in general.  See
+<b class="package"><a href="critcl_cutil.html">critcl::cutil</a></b>.</p></dd>
+<dt><b class="option">I</b> path</dt>
+<dd><p>A single global include path to use for all files. Not set by default.</p></dd>
+<dt><b class="option">combine</b> enum</dt>
+<dd><dl class="doctools_definitions">
+<dt><b class="const">dynamic</b> (the default)</dt>
+<dd><p>Object files have the suffix <b class="const">_pic</b>.</p></dd>
+<dt><b class="const">static</b></dt>
+<dd><p>Object files have the suffix <b class="const">_stub</b>.</p></dd>
+<dt><b class="const">standalone</b></dt>
+<dd><p>Object files have no suffix, and the generated C files are compiled
+without using Tcl/Tk stubs. The result are object files usable for
+static linking into a <i class="term">big shell</i>.</p></dd>
+</dl></dd>
+<dt><b class="option">language</b> string</dt>
+<dd></dd>
+<dt><b class="option">keepsrc</b> bool</dt>
+<dd><p>When <b class="const">false</b> (the default), the generated &quot;<b class="file">.c</b>&quot;
+files are deleted after the &quot;<b class="file">.o</b>&quot; files have been built.</p></dd>
+<dt><b class="option">outdir</b> directory</dt>
+<dd><p>The directory where to place a generated shared library. By default, it is
+placed into the <span class="sectref"><a href="#subsection18">Result Cache</a></span>.</p></dd>
+</dl></dd>
+</dl>
+</div>
+<div id="subsection7" class="doctools_subsection"><h3><a name="subsection7">Result Cache Management</a></h3>
+<p>The following commands control the <span class="sectref"><a href="#subsection18">Result Cache</a></span>.
+These commands are not needed to simply write a <i class="term">CriTcl script</i>.</p>
+<dl class="doctools_definitions">
+<dt><a name="45"><b class="cmd">::critcl::cache</b> <span class="opt">?path?</span></a></dt>
+<dd><p>Sets and returns the path to the directory for the package's result cache.</p>
+<p>The default location is
+&quot;<b class="file">~/.critcl/[platform::generic]</b>&quot; and usually does not
+require any changes.</p></dd>
+<dt><a name="46"><b class="cmd">::critcl::clean_cache</b> <span class="opt">?<i class="arg">pattern</i>...?</span></a></dt>
+<dd><p>Cleans the result cache, i.e. removes any and all files
+and directories in it. If one or more patterns are specified then only
+the files and directories matching them are removed.</p></dd>
+</dl>
+</div>
+<div id="subsection8" class="doctools_subsection"><h3><a name="subsection8">Build Configuration</a></h3>
+<p>The following commands manage the build configuration, i.e. the per-platform
+information about compilers, linkers, and their commandline options.
+These commands are not needed to simply write a <i class="term">CriTcl script</i>.</p>
+<dl class="doctools_definitions">
+<dt><a name="47"><b class="cmd">::critcl::readconfig</b> <i class="arg">path</i></a></dt>
+<dd><p>Reads the build configuration file at <i class="arg">path</i> and configures the package
+using the information for the target platform.</p></dd>
+<dt><a name="48"><b class="cmd">::critcl::showconfig</b> <span class="opt">?<i class="arg">chan</i>?</span></a></dt>
+<dd><p>Converts the active build configuration into a human-readable string and
+returns it, or if <i class="arg">chan</i> is provided prints the result to that channel.</p></dd>
+<dt><a name="49"><b class="cmd">::critcl::showallconfig</b> <span class="opt">?<i class="arg">chan</i>?</span></a></dt>
+<dd><p>Converts the set of all known build configurations from the currently active
+build configuration file last set with <b class="cmd">critcl::readconfig</b> into a string
+and returns it, or if <i class="arg">chan</i> is provided, prints it to that channel.</p></dd>
+<dt><a name="50"><b class="cmd">::critcl::chooseconfig</b> <i class="arg">target</i> <span class="opt">?<i class="arg">nomatcherr</i>?</span></a></dt>
+<dd><p>Matches <i class="arg">target</i> against all known targets, returning a list containing
+all the matching ones. This search is first done on an exact basis, and then
+via glob matching. If no known target matches the argument the default is to
+return an empty list. However, if the boolean <i class="arg">nomatcherr</i> is specified and
+set an error is thrown using <b class="cmd">critcl::error</b> instead.</p></dd>
+<dt><a name="51"><b class="cmd">::critcl::setconfig</b> <i class="arg">target</i></a></dt>
+<dd><p>Configures the package to use the settings of <i class="arg">target</i>.</p></dd>
+</dl>
+</div>
+<div id="subsection9" class="doctools_subsection"><h3><a name="subsection9">Tool API</a></h3>
+<p>The following commands provide tools like
+<i class="term">CriTcl Application</i> or similar with
+deeper access to the package's internals.
+These commands are not needed to simply write a <i class="term">CriTcl script</i>.</p>
+<dl class="doctools_definitions">
+<dt><a name="52"><b class="cmd">::critcl::actualtarget</b></a></dt>
+<dd><p>Returns the platform identifier for the target platform, i.e. the platform to
+build for. Unlike <b class="cmd">::critcl::targetplatform</b> this is the true target, with
+any cross-compilation information resolved.</p></dd>
+<dt><a name="53"><b class="cmd">::critcl::buildforpackage</b> <span class="opt">?<i class="arg">flag</i>?</span></a></dt>
+<dd><p>Signals whether the next file is to be built for inclusion into a package. If
+not specified the <i class="arg">flag</i> defaults to <b class="const">true</b>, i.e. building for a
+package. This disables a number of things in the backend, namely the linking of
+that file into a shared library and the loading of that library. It is expected
+that the build results are later wrapped into a larger collection.</p></dd>
+<dt><a name="54"><b class="cmd">::critcl::cnothingtodo</b> <i class="arg">file</i></a></dt>
+<dd><p>Checks whether there is anything to build for <i class="arg">file</i>.</p></dd>
+<dt><a name="55"><b class="cmd">::critcl::cresults</b> <span class="opt">?<i class="arg">file</i>?</span></a></dt>
+<dd><p>Returns information about building <i class="arg">file</i>, or <b class="cmd">info script</b> If
+<i class="arg">file</i> is not provided.
+The result in question is a dictionary containing the following items:</p>
+<dl class="doctools_definitions">
+<dt><b class="const">clibraries</b></dt>
+<dd><p>A list of external shared libraries and/or directories needed to link
+<i class="arg">file</i>.</p></dd>
+<dt><b class="const">ldflags</b></dt>
+<dd><p>A list of linker flags needed to link <i class="arg">file</i>.</p></dd>
+<dt><b class="const">license</b></dt>
+<dd><p>The text of the license for the package <i class="arg">file</i> is located in.</p></dd>
+<dt><b class="const">mintcl</b></dt>
+<dd><p>The minimum version of Tcl required by the package <i class="arg">file</i>
+is in to run successfully. A proper Tcl version number.</p></dd>
+<dt><b class="const">objects</b></dt>
+<dd><p>A list of object files to link into <i class="arg">file</i>.</p></dd>
+<dt><b class="const">preload</b></dt>
+<dd><p>A list of libraries to be preloaded in order to sucessfully load and use
+<i class="arg">file</i>.</p></dd>
+<dt><b class="const">tk</b></dt>
+<dd><p><b class="const">true</b> if <i class="arg">file</i> requires Tk and <b class="const">false</b> otherwise.</p></dd>
+<dt><b class="const">tsources</b></dt>
+<dd><p>A list of companion &quot;<b class="file">.tcl</b>&quot; files to source in order to load and use the
+<i class="term">CriTcl script</i> <i class="arg">file</i>.</p></dd>
+<dt><b class="const">log</b></dt>
+<dd><p>The full build log generated by the compiler/linker, including command
+line data from critcl, and other things.</p></dd>
+<dt><b class="const">exl</b></dt>
+<dd><p>The raw build log generated by the compiler/linker. Contains the output
+generated by the invoked applications.</p></dd>
+</dl></dd>
+<dt><a name="56"><b class="cmd">::critcl::crosscheck</b></a></dt>
+<dd><p>Determines whether the package is configured for cross-compilation and prints a
+message to the standard error channel if so.</p></dd>
+<dt><a name="57"><b class="cmd">::critcl::error</b> <i class="arg">msg</i></a></dt>
+<dd><p>Used to report internal errors. The default implementation simply returns the
+error.  Tools like the <i class="term">CriTcl Application</i> are allowed to redefine
+this procedure to perform their own way of error reporting. There is
+one constraint they are not allowed to change: The procedure must
+<em>not return</em> to the caller.</p></dd>
+<dt><a name="58"><b class="cmd">::critcl::knowntargets</b></a></dt>
+<dd><p>Returns a list of the identifiers of all targets
+found during the last invocation of <b class="cmd">critcl::readconfig</b>.</p></dd>
+<dt><a name="59"><b class="cmd">::critcl::sharedlibext</b></a></dt>
+<dd><p>Returns the file extension for shared libraries on the target platform.</p></dd>
+<dt><a name="60"><b class="cmd">::critcl::targetconfig</b></a></dt>
+<dd><p>Returns the identifier of the target to build for, as specified by either the
+user or the system.</p></dd>
+<dt><a name="61"><b class="cmd">::critcl::buildplatform</b></a></dt>
+<dd><p>Returns the identifier of the build platform, i.e. where the package is running
+on.</p></dd>
+<dt><a name="62"><b class="cmd">::critcl::targetplatform</b></a></dt>
+<dd><p>Returns the identifier of the target platform,
+i.e. the platform to compile for. In contrast to
+<b class="cmd">::critcl::actualtarget</b> this may be the name of a
+cross-compilation target.</p></dd>
+<dt><a name="63"><b class="cmd">::critcl::cobjects</b> <span class="opt">?<i class="arg">glob pattern</i>...?</span></a></dt>
+<dd><p>Like <b class="cmd">::critcl::clibraries</b>, but instead of matching libraries, each
+<i class="arg">glob pattern</i> matches object files to be linked into the
+shared object (at compile time, not runtime). If a <i class="arg">glob pattern</i> matches
+nothing an error is returned.
+Not listed in <span class="sectref"><a href="#subsection4">Control &amp; Interface</a></span> because it is of no use to
+package writers. Only tools like the <i class="term">CriTcl Application</i> need it.</p>
+<p>A pattern for a relative path is resolved relative to the directory
+containing the <i class="term">CriTcl script</i>.</p>
+<p>Calls to this command are cumulative.</p></dd>
+<dt><a name="64"><b class="cmd">::critcl::scan</b> <i class="arg">path</i></a></dt>
+<dd><p>The main entry point to CriTcl's static code scanner.  Used by tools to
+implement processing modes like the assembly of a directory hierarchy
+containing a TEA-lookalike buildystem, etc.</p>
+<p>Scans <i class="arg">path</i> and returns a dictionary containing the following items:</p>
+<dl class="doctools_definitions">
+<dt>version</dt>
+<dd><p>Package version.</p></dd>
+<dt>org</dt>
+<dd><p>Author(ing organization).</p></dd>
+<dt>files</dt>
+<dd><p>List of the companion files, relative to the directory of the input
+file.</p></dd>
+</dl></dd>
+<dt><a name="65"><b class="cmd">::critcl::name2c</b> <i class="arg">name</i></a></dt>
+<dd><p>Given the Tcl-level identifier <i class="arg">name</i>, returns a list containing the
+following details of its conversion to C:</p>
+<ul class="doctools_itemized">
+<li><p>Tcl namespace prefix</p></li>
+<li><p>C namespace prefix</p></li>
+<li><p>Tcl base name</p></li>
+<li><p>C base name</p></li>
+</ul>
+<p>For use by utilities that provide Tcl commands without going through
+standard commands like <b class="cmd">critcl::ccommand</b> or <b class="cmd">critcl::cproc</b>.
+<b class="package"><a href="critcl_class.html">critcl::class</a></b> does this.</p></dd>
+</dl>
+</div>
+<div id="subsection10" class="doctools_subsection"><h3><a name="subsection10">Advanced: Embedded C Code</a></h3>
+<p>For advanced use, the following commands used by <b class="cmd">critcl::cproc</b> itself are
+exposed.</p>
+<dl class="doctools_definitions">
+<dt><a name="66"><b class="cmd">::critcl::argnames</b> <i class="arg">arguments</i></a></dt>
+<dd><p>Given an argument declaration as documented for <b class="cmd">critcl::cproc</b>, returns a list of the corresponding user-visible names.</p></dd>
+<dt><a name="67"><b class="cmd">::critcl::argcnames</b> <i class="arg">arguments</i></a></dt>
+<dd><p>Given an argument declaration as documented for <b class="cmd">critcl::cproc</b>, returns a list of the corresponding C variable names for the
+user-visible names. The names returned here match the names used in the
+declarations and code returned by <b class="cmd">::critcl::argvardecls</b> and
+<b class="cmd">::critcl::argconversion</b>.</p></dd>
+<dt><a name="68"><b class="cmd">::critcl::argcsignature</b> <i class="arg">arguments</i></a></dt>
+<dd><p>Given an argument declaration as documented for <b class="cmd">critcl::cproc</b>, returns a list of the corresponding C parameter declarations.</p></dd>
+<dt><a name="69"><b class="cmd">::critcl::argvardecls</b> <i class="arg">arguments</i></a></dt>
+<dd><p>Given an argument declaration as documented for <b class="cmd">critcl::cproc</b>, returns a list of the corresponding C variable declarations.
+The names used in these declarations match the names returned by
+<b class="cmd">::critcl::argcnames</b>.</p></dd>
+<dt><a name="70"><b class="cmd">::critcl::argconversion</b> <i class="arg">arguments</i> <span class="opt">?<i class="arg">n</i>?</span></a></dt>
+<dd><p>Given an argument declaration as documented for <b class="cmd">critcl::cproc</b>, returns a list of C code fragments converting the user visible
+arguments found in the declaration from Tcl_Obj* to C types. The names used in
+these statements match the names returned by <b class="cmd">::critcl::argcnames</b>.</p>
+<p>The generated code assumes that the procedure arguments start
+at index <i class="arg">n</i> of the <b class="variable">objv</b> array.  The default is <b class="const">1</b>.</p></dd>
+<dt><a name="71"><b class="cmd">::critcl::argoptional</b> <i class="arg">arguments</i></a></dt>
+<dd><p>Given an argument declaration as documented for <b class="cmd">critcl::cproc</b>, returns a list of boolean values indicating which arguments
+are optional (<b class="const">true</b>), and which are not (<b class="const">false</b>).</p></dd>
+<dt><a name="72"><b class="cmd">::critcl::argdefaults</b> <i class="arg">arguments</i></a></dt>
+<dd><p>Given an argument declaration as documented for <b class="cmd">critcl::cproc</b>, returns a list containing the default values for all optional
+arguments.</p></dd>
+<dt><a name="73"><b class="cmd">::critcl::argsupport</b> <i class="arg">arguments</i></a></dt>
+<dd><p>Given an argument declaration as documented for <b class="cmd">critcl::cproc</b>, returns a list of C code fragments needed to define the
+necessary supporting types.</p></dd>
+</dl>
+</div>
+<div id="subsection11" class="doctools_subsection"><h3><a name="subsection11">Custom Build Configuration</a></h3>
+<p>This package provides one command for the management of
+package-specific, i.e. developer-specified custom build configuration
+options.</p>
+<dl class="doctools_definitions">
+<dt><a name="74"><b class="cmd">::critcl::userconfig</b> <b class="method">define</b> <i class="arg">name</i> <i class="arg">description</i> <i class="arg">type</i> <span class="opt">?<i class="arg">default</i>?</span></a></dt>
+<dd><p>This command defines custom build configuration option, with
+<i class="arg">description</i>, <i class="arg">type</i> and optional <i class="arg">default</i> value.</p>
+<p>The type can be either <b class="const">bool</b>, or a list of values.</p>
+<ol class="doctools_enumerated">
+<li><p>For <b class="const">bool</b> the default value, if specified, must be a
+boolean. If it is not specified it defaults to <b class="const">true</b>.</p></li>
+<li><p>For a list of values the default value, if specified, must be a
+value found in this list. If it is not specified it defaults to the
+first value of the list.</p></li>
+</ol>
+<p>The <i class="arg">description</i> serves as in-code documentation of the
+meaning of the option and is otherwise ignored. When generating a TEA
+wrapper the description is used for the <b class="syscmd">configure</b> option
+derived from the option declared by the command.</p>
+<p>A boolean option <b class="variable">FOO</b> are translated into a pair of
+configure options, <b class="option">--enable-<b class="variable">FOO</b></b> and
+<b class="option">--disable-<b class="variable">FOO</b></b>, whereas an option whose <i class="arg">type</i> is a
+list of values is translated into a single configure option
+<b class="option">--with-<b class="variable">FOO</b></b>.</p></dd>
+<dt><a name="75"><b class="cmd">::critcl::userconfig</b> <b class="method">query</b> <i class="arg">name</i></a></dt>
+<dd><p>This command queries the database of custom build configuration option
+for the current &quot;<b class="file">.critcl</b>&quot; file and returns the chosen value.
+This may be the default if no value was set via
+<b class="cmd">::critcl::userconfig set</b>.</p>
+<p>It is at this point that definitions and set values are brought
+together, with the latter validated against the definition.</p></dd>
+<dt><a name="76"><b class="cmd">::critcl::userconfig</b> <b class="method">set</b> <i class="arg">name</i> <i class="arg">value</i></a></dt>
+<dd><p>This command is for use by a tool, like the <b class="syscmd"><a href="critcl.html">critcl</a></b> application,
+to specify values for custom build configuration options.</p>
+<p>At the time this command is used only the association between
+option name and value is recorded, and nothing else is done. This
+behaviour is necessary as the system may not know if an option of the
+specified name exists when the command is invoked, nor its type.</p>
+<p>Any and all validation is defered to when the value of an
+option is asked for via <b class="cmd">::critcl::userconfig query</b>.</p>
+<p>This means that it is possible to set values for any option we
+like, and the value will take effect only if such an option is both
+defined and used later on.</p></dd>
+</dl>
+</div>
+<div id="subsection12" class="doctools_subsection"><h3><a name="subsection12">Advanced: Location management</a></h3>
+<p>First a small introduction for whose asking themselves
+'what is location management' ?</p>
+<p>By default critcl embeds <i class="term">#line</i> directives into the
+generated C code so that any errors, warnings and notes found by the C
+compiler during compilation will refer to the &quot;<b class="file">.critcl</b>&quot; file the
+faulty code comes from, instead of the generated &quot;<b class="file">.c</b>&quot; file.</p>
+<p>This facility requires the use of a tclsh that provides
+<b class="cmd">info frame</b>.  Otherwise, no <i class="term">#line</i> directives are emitted. The
+command is supported by Tcl 8.5 and higher. It is also supported by
+Tcl 8.4 provided that it was compiled with the define
+<b class="option">-DTCL_TIP280</b>. An example of such is ActiveState's ActiveTcl.</p>
+<p>Most users will not care about this feature beyond simply
+wanting it to work and getting proper code references when reading
+compiler output.</p>
+<p>Developers of higher-level packages generating their own C code
+however should care about this, to ensure that their generated code
+contains proper references as well. Especially as this is key to
+separating bugs concerning code generated by the package itself and
+bug in the user's code going into the package, if any.</p>
+<p>Examples of such packages come with critcl itself, see the
+implementation of packages <b class="package"><a href="critcl_iassoc.html">critcl::iassoc</a></b> and
+<b class="package"><a href="critcl_class.html">critcl::class</a></b>.</p>
+<p>To help such developers eight commands are provided to manage
+such <i class="term">location</i> information. These are listed below.</p>
+<p>A main concept is that they all operate on a single
+<i class="term">stored location</i>, setting, returning and clearing it.
+Note that this location information is completely independent of the
+generation of <i class="term">#line</i> directives within critcl itself.</p>
+<dl class="doctools_definitions">
+<dt><a name="77"><b class="cmd">::critcl::at::caller</b></a></dt>
+<dd><p>This command stores the location of the caller of the current
+procedure as a tuple of file name and linenumber. Any previously
+stored location is overwritten.
+The result of the command is the empty string.</p></dd>
+<dt><a name="78"><b class="cmd">::critcl::at::caller</b> <i class="arg">offset</i></a></dt>
+<dd><p>As above, the stored line number is modified by the specified
+offset. In essence an implicit call of <b class="cmd">critcl::at::incr</b>.</p></dd>
+<dt><a name="79"><b class="cmd">::critcl::at::caller</b> <i class="arg">offset</i> <i class="arg">level</i></a></dt>
+<dd><p>As above, but the level the location information is taken from is
+modified as well. Level <b class="const">0</b> is the caller, <b class="const">-1</b> its
+caller, etc.</p></dd>
+<dt><a name="80"><b class="cmd">::critcl::at::here</b></a></dt>
+<dd><p>This command stores the current location in the current procedure as a
+tuple of file name and linenumber. Any previously stored location is
+overwritten.
+The result of the command is the empty string.</p>
+<p>In terms of <b class="cmd">::critcl::at::caller</b> this is equivalent to</p>
+<pre class="doctools_example">
+	critcl::at::caller 0 1
+</pre>
+</dd>
+<dt><a name="81"><b class="cmd">::critcl::at::get*</b></a></dt>
+<dd><p>This command takes the stored location and returns a formatted
+<i class="term">#line</i> directive ready for embedding into some C code. The
+stored location is left untouched.
+Note that the directive contains its own closing newline.</p>
+<p>For proper nesting and use it is recommended that such
+directives are always added to the beginning of a code fragment. This
+way, should deeper layers add their own directives these will come
+before ours and thus be inactive. End result is that the outermost
+layer generating a directive will 'win', i.e. have its directive
+used. As it should be.</p></dd>
+<dt><a name="82"><b class="cmd">::critcl::at::get</b></a></dt>
+<dd><p>This command is like the above, except that it also clears the stored
+location.</p></dd>
+<dt><a name="83"><b class="cmd">::critcl::at::=</b> <i class="arg">file</i> <i class="arg">line</i></a></dt>
+<dd><p>This command allows the caller to set the stored location to anything
+they want, outside of critcl's control.
+The result of the command is the empty string.</p></dd>
+<dt><a name="84"><b class="cmd">::critcl::at::incr</b> <i class="arg">n</i>...</a></dt>
+<dd></dd>
+<dt><a name="85"><b class="cmd">::critcl::at::incrt</b> <i class="arg">str</i>...</a></dt>
+<dd><p>These commands allow the user to modify the line number of the stored
+location, changing it incrementally. The increment is specified as
+either a series of integer numbers (<b class="cmd">incr</b>), or a series of
+strings to consider (<b class="cmd">incrt</b>). In case of the latter the delta is
+the number of lines endings found in the strings.</p></dd>
+<dt><a name="86"><b class="cmd">::critcl::at::caller!</b></a></dt>
+<dd></dd>
+<dt><a name="87"><b class="cmd">::critcl::at::caller!</b> <i class="arg">offset</i></a></dt>
+<dd></dd>
+<dt><a name="88"><b class="cmd">::critcl::at::caller!</b> <i class="arg">offset</i> <i class="arg">level</i></a></dt>
+<dd></dd>
+<dt><a name="89"><b class="cmd">::critcl::at::here!</b></a></dt>
+<dd><p>These are convenience commands combining <b class="cmd">caller</b> and <b class="cmd">here</b>
+with <b class="cmd">get</b>. I.e. they store the location and immediately return it
+formatted as proper <i class="term">#line</i> directive. Also note that after their
+use the stored location is cleared.</p></dd>
+</dl>
+</div>
+<div id="subsection13" class="doctools_subsection"><h3><a name="subsection13">Advanced: Diversions</a></h3>
+<p>Diversions are for higher-level packages generating their own C code,
+to make their use of critcl's commands generating
+<span class="sectref"><a href="#subsection1">Embedded C Code</a></span> easier.</p>
+<p>These commands normally generate all of their C code for the
+current &quot;<b class="file">.critcl</b>&quot; file, which may not be what is wanted by a
+higher-level package.</p>
+<p>With a diversion the generator output can be redirected into
+memory and from there on then handled and processed as the caller
+desires before it is committed to an actual &quot;<b class="file">.c</b>&quot; file.</p>
+<p>An example of such a package comes with critcl itself, see the
+implementation of package <b class="package"><a href="critcl_class.html">critcl::class</a></b>.</p>
+<p>To help such developers three commands are provided to manage
+diversions and the collection of C code in memory. These are:</p>
+<dl class="doctools_definitions">
+<dt><a name="90"><b class="cmd">::critcl::collect_begin</b></a></dt>
+<dd><p>This command starts the diversion of C code collection into memory.</p>
+<p>The result of the command is the empty string.</p>
+<p>Multiple calls are allowed, with each call opening a new
+nesting level of diversion.</p></dd>
+<dt><a name="91"><b class="cmd">::critcl::collect_end</b></a></dt>
+<dd><p>This command end the diversion of C code collection into memory and
+returns the collected C code.</p>
+<p>If multiple levels of diversion are open the call only closes
+and returns the data from the last level.</p>
+<p>The command will throw an error if no diversion is active,
+indicating a mismatch in the pairing of <b class="cmd">collect_begin</b> and
+<b class="cmd">collect_end</b>.</p></dd>
+<dt><a name="92"><b class="cmd">::critcl::collect</b> <i class="arg">script</i></a></dt>
+<dd><p>This is a convenience command which runs the <i class="arg">script</i> under
+diversion and returns the collected C code, ensuring the correct
+pairing of <b class="cmd">collect_begin</b> and <b class="cmd">collect_end</b>.</p></dd>
+</dl>
+</div>
+<div id="subsection14" class="doctools_subsection"><h3><a name="subsection14">Advanced: File Generation</a></h3>
+<p>While file generation is related to the diversions explained in the
+previous section they are not the same.
+Even so, like diversions this feature is for higher-level packages
+generating their own C code.</p>
+<p>Three examples of utility packages using this facility comes
+with critcl itself.
+See the implementations of packages <b class="package"><a href="critcl_literals.html">critcl::literals</a></b>,
+<b class="package"><a href="critcl_bitmap.html">critcl::bitmap</a></b>, and <b class="package"><a href="critcl_enum.html">critcl::enum</a></b>.</p>
+<p>When splitting a package implementation into pieces it is often
+sensible to have a number of pure C companion files containing
+low-level code, yet these files may require information about the code
+in the main &quot;<b class="file">.critcl</b>&quot; file. Such declarations are normally not
+exportable and using the stub table support does not make sense, as
+this is completely internal to the package.</p>
+<p>With the file generation command below the main &quot;<b class="file">.critcl</b>&quot;
+file can generate any number of header files for the C companions to
+pick up.</p>
+<dl class="doctools_definitions">
+<dt><a name="93"><b class="cmd">::critcl::make</b> <i class="arg">path</i> <i class="arg">contents</i></a></dt>
+<dd><p>This command creates the file <i class="arg">path</i> in a location where the C
+companion files of the package are able to pick it up by simple
+inclusion of <i class="arg">path</i> during their compilation, without interfering
+with the outer system at all.</p>
+<p>The generated file will contain the specified <i class="arg">contents</i>.</p></dd>
+</dl>
+</div>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Concepts</a></h2>
+<div id="subsection15" class="doctools_subsection"><h3><a name="subsection15">Modes Of Operation/Use</a></h3>
+<p>CriTcl can be used in three different modes of operation, called</p>
+<ol class="doctools_enumerated">
+<li><p><i class="term"><a href="../index.html#compile_run">Compile &amp; Run</a></i>, and</p></li>
+<li><p><i class="term"><a href="../index.html#generate_package">Generate Package</a></i></p></li>
+<li><p><i class="term">Generate TEA Package</i></p></li>
+</ol>
+<p><i class="term"><a href="../index.html#compile_run">Compile &amp; Run</a></i> was the original mode and is the default for
+<i class="term">critcl_pkg</i>.  Collects the C fragments from the
+<i class="term">CriTcl script</i>, builds them as needed, and caches the results to
+improve load times later.</p>
+<p>The second mode, <i class="term"><a href="../index.html#generate_package">Generate Package</a></i>, was introduced to enable
+the creation of (prebuilt) deliverable packages which do not depend on
+the existence of a build system, i.e. C compiler, on the target
+machine.
+This was originally done through the experimental <b class="cmd">Critbind</b> tool,
+and is now handled by the <i class="term">CriTcl Application</i>, also named
+<b class="cmd"><a href="critcl.html">critcl</a></b>.</p>
+<p>Newly introduced with CriTcl version 3 is
+<i class="term">Generate TEA Package</i>. This mode constructs a directory
+hierarchy from the package which can later be built like a regular TEA
+package, i.e. using</p>
+<pre class="doctools_example">
+	.../configure --prefix ...
+	make all isntall
+</pre>
+<p>Regarding the caching of results please read the section about
+the <span class="sectref"><a href="#subsection18">Result Cache</a></span> fore more details.</p>
+</div>
+<div id="subsection16" class="doctools_subsection"><h3><a name="subsection16">Runtime Behaviour</a></h3>
+<p>The default behaviour of critcl, the package is to defer the
+compilation, linking, and loading of any C code as much as possible,
+given that this is an expensive operation, mainly in the time
+required.
+In other words, the C code embedded into a &quot;<b class="file">.critcl</b>&quot; file is
+built only when the first C command or procedure it provides is
+invoked.
+This part of the system uses standard functionality built into the Tcl
+core, i.e. the <b class="variable">auto_index</b> variable to map from commands to
+scripts providing them and the <b class="cmd">unknown</b> command using this
+information when the command is needed.</p>
+<p>A <em>limitation</em> of this behaviour is that it is not
+possible to just use <b class="cmd">info commands</b> check for the existence of
+a critcl defined command. It is also necessary to search in the
+<b class="variable">auto_index</b> array, in case it has not been build yet.</p>
+<p>This behaviour can be changed by using the control command
+<b class="cmd">critcl::load</b>. When invoked, the building, including loading of
+the result, is forced. After this command has been invoked for a
+&quot;<b class="file">.critcl</b>&quot; file further definition of C code in this file is not
+allowed any longer.</p>
+</div>
+<div id="subsection17" class="doctools_subsection"><h3><a name="subsection17">File Mapping</a></h3>
+<p>Each &quot;<b class="file">.critcl</b>&quot; file is backed by a single private &quot;<b class="file">.c</b>&quot; file
+containing that code, plus the boilerplate necessary for its
+compilation and linking as a single shared library.</p>
+<p>The <span class="sectref"><a href="#subsection10">Embedded C Code</a></span>
+fragments appear in that file in the exact same order they were
+defined in the &quot;<b class="file">.critcl</b>&quot; file, with one exception. The C code
+provided via <b class="cmd">critcl::cinit</b> is put after all other fragments.
+In other words all fragments have access to the symbols defined by
+earlier fragments, and the <b class="cmd">critcl::cinit</b> fragment has access to
+all, regardless of its placement in the &quot;<b class="file">.critcl</b>&quot; file.</p>
+<p>Note: A <em>limitation</em> of the current system is the near
+impossibility of C level access between different critcl-based
+packages. The issue is not the necessity of writing and sharing the
+proper <b class="syscmd">extern</b> statements, but that the management (export and
+import) of package-specific stubs-tables is not supported. This means
+that dependent parts have to be forcibly loaded before their user,
+with all that entails. See section <span class="sectref"><a href="#subsection16">Runtime Behaviour</a></span> for
+the relevant critcl limitation, and remember that many older platforms
+do not support the necessary resolution of symbols, the reason why
+stubs were invented for Tcl in the first place.</p>
+</div>
+<div id="subsection18" class="doctools_subsection"><h3><a name="subsection18">Result Cache</a></h3>
+<p>The compilation of C code is time-consuming <b class="package"><a href="critcl.html">critcl</a></b> not only
+defers it as much as possible, as described in section
+<span class="sectref"><a href="#subsection16">Runtime Behaviour</a></span>, but also caches the results.</p>
+<p>This means that on the first use of a &quot;<b class="file">.critcl</b>&quot; file
+&quot;<b class="file">FOO.tcl</b>&quot; the resulting object file and shared library are saved
+into the cache, and on future uses of the same file reused,
+i.e. loaded directly without requiring compilation, provided that the
+contents of &quot;<b class="file">FOO.tcl</b>&quot; did not change.</p>
+<p>The change detection is based MD5 hashes. A single hash is
+computed for each &quot;<b class="file">.critcl</b>&quot; file, based on hashes for all C code
+fragments and configuration options, i.e. everything which affects the
+resulting binary.</p>
+<p>As long as the input file doesn't change as per the hash a
+previously built shared library found in the cache is reused,
+bypassing the compilation and link stages.</p>
+<p>The command to manage the cache are found in section
+<span class="sectref"><a href="#subsection7">Result Cache Management</a></span>.
+Note however that they are useful only to tools based on the package,
+like the <i class="term">CriTcl Application</i>. Package writers have no need
+of them.</p>
+<p>As a last note, the default directory for the cache is chosen
+based on the chosen build target. This means that the cache can be put
+on a shared (network) filesystem without having to fear interference
+between machines of different architectures.</p>
+</div>
+<div id="subsection19" class="doctools_subsection"><h3><a name="subsection19">Preloading functionality</a></h3>
+<p>The audience of this section are developers wishing to understand
+and possibly modify the internals of critcl package and application.
+Package writers can skip this section.</p>
+<p>It explains how the preloading of external libraries is realized.</p>
+<p>Whenever a package declares libraries for preloading critcl will build
+a supporting shared library providing a Tcl package named &quot;preload&quot;.
+This package is not distributed separately, but as part of the package
+requiring the preload functionality.
+This support package exports a single Tcl command</p>
+<dl class="doctools_definitions">
+<dt><a name="94"><b class="cmd">::preload</b> <i class="arg">library</i></a></dt>
+<dd><p>which is invoked once per libraries to preload, with the absolute path
+of that <i class="arg">library</i>. The command then loads the <i class="arg">library</i>.</p>
+<p>On windows the command will further use the Tcl command
+<b class="cmd">::critcl::runtime::precopy</b> to copy the <i class="arg">library</i> to the
+disk, should its path be in a virtual filesystem which doesn't
+directly support the loading of a shared library from it.</p></dd>
+</dl>
+<p>The command <b class="cmd">::critcl::runtime::precopy</b> is provided by the file
+&quot;<b class="file">critcl-rt.tcl</b>&quot; in the generated package, as is the command
+<b class="cmd">::critcl::runtime::loadlib</b> which generates the
+<i class="term">ifneeded script</i> expected by Tcl's package management. This
+generated ifneeded script contains the invocations of <b class="cmd">::preload</b>.</p>
+<p>The C code for the supporting library is found in the file
+&quot;<b class="file">critcl_c/preload.c</b>&quot;, which is part of the <b class="package"><a href="critcl.html">critcl</a></b>
+package.</p>
+<p>The Tcl code for the supporting runtime &quot;<b class="file">critcl-rt.tcl</b>&quot; is found
+in the file &quot;<b class="file">runtime.tcl</b>&quot;, which is part of the
+<b class="package">critcl::app</b> package.</p>
+</div>
+<div id="subsection20" class="doctools_subsection"><h3><a name="subsection20">Configuration Internals</a></h3>
+<p>The audience of this section are developers wishing to understand
+and possibly modify the internals of critcl package and application.
+Package writers can skip this section.</p>
+<p>It explains the syntax of configuration files and the configuration
+keys used by <b class="package"><a href="critcl.html">critcl</a></b> to configure its build backend, i.e. how
+this part of the system accesses compiler, linker, etc.</p>
+<p>It is recommended to open the file containing the standard
+configurations (&quot;<b class="file">path/to/critcl/Config</b>&quot;) in the editor of your
+choice when reading this section of the documentation, using it as an
+extended set of examples going beyond the simple defaults shown here.</p>
+<p>First, the keys and the meaning of their values, plus examples drawn
+from the standard configurations distributed with the package.
+Note that when writing a custom configuration it is not necessary to
+specify all the keys listed below, but only those whose default values
+are wrong or insufficient for the platform in question.</p>
+<dl class="doctools_definitions">
+<dt>version</dt>
+<dd><p>The command to print the compiler version number.
+Defaults to</p>
+<pre class="doctools_example"> gcc -v </pre>
+</dd>
+<dt>compile</dt>
+<dd><p>The command to compile a single C source file to an object file.
+Defaults to</p>
+<pre class="doctools_example"> gcc -c -fPIC </pre>
+</dd>
+<dt>debug_memory</dt>
+<dd><p>The list of flags for the compiler to enable memory debugging in
+Tcl.
+Defaults to</p>
+<pre class="doctools_example"> -DTCL_MEM_DEBUG </pre>
+</dd>
+<dt>debug_symbols</dt>
+<dd><p>The list of flags for the compiler to add symbols to the object files
+and the resulting library.
+Defaults to</p>
+<pre class="doctools_example"> -g </pre>
+</dd>
+<dt>include</dt>
+<dd><p>The compiler flag to add an include directory.
+Defaults to</p>
+<pre class="doctools_example"> -I </pre>
+</dd>
+<dt>tclstubs</dt>
+<dd><p>The compiler flag to set USE_TCL_STUBS.
+Defaults to</p>
+<pre class="doctools_example"> -DUSE_TCL_STUBS </pre>
+</dd>
+<dt>tkstubs</dt>
+<dd><p>The compiler flag to set USE_TK_STUBS.
+Defaults to</p>
+<pre class="doctools_example"> -DUSE_TK_STUBS </pre>
+</dd>
+<dt>threadflags</dt>
+<dd><p>The list of compiler flags to enable a threaded build.
+Defaults to</p>
+<pre class="doctools_example">
+    -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1
+    -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1
+    -DTCL_THREADS=1
+</pre>
+<p>.</p></dd>
+<dt>noassert</dt>
+<dd><p>The compiler flag to turn off assertions in Tcl code.
+Defaults to</p>
+<pre class="doctools_example"> -DNDEBUG </pre>
+</dd>
+<dt>optimize</dt>
+<dd><p>The compiler flag to specify optimization level.
+Defaults to</p>
+<pre class="doctools_example"> -O2 </pre>
+</dd>
+<dt>output</dt>
+<dd><p>The compiler flags to set the output file of a compilation.
+Defaults to</p>
+<pre class="doctools_example"> -o [list $outfile] </pre>
+<p><em>NOTE</em> the use of Tcl commands and variables here.  At the
+time <b class="package"><a href="critcl.html">critcl</a></b> uses the value of this key the value of the
+referenced variable is substituted into it. The named variable is the
+only variable whose value is defined for this substitution.</p></dd>
+<dt>object</dt>
+<dd><p>The file extension for object files on the platform.
+Defaults to</p>
+<pre class="doctools_example"> .o </pre>
+</dd>
+<dt>preproc_define</dt>
+<dd><p>The command to preprocess a C source file without compiling it, but
+leaving #define's in the output. Defaults to</p>
+<pre class="doctools_example"> gcc -E -dM </pre>
+</dd>
+<dt>preproc_enum</dt>
+<dd><p>See <b class="const">preproc_define</b>, except that #define's are not left in the
+output. Defaults to</p>
+<pre class="doctools_example"> gcc -E </pre>
+</dd>
+<dt>link</dt>
+<dd><p>The command to link one or more object files and create a shared
+library. Defaults to</p>
+<pre class="doctools_example"> gcc -shared </pre>
+</dd>
+<dt>link_preload</dt>
+<dd><p>The list of linker flags to use when dependent libraries are
+pre-loaded. Defaults to</p>
+<pre class="doctools_example"> --unresolved-symbols=ignore-in-shared-libs </pre>
+</dd>
+<dt>strip</dt>
+<dd><p>The flag to tell the linker to strip symbols from the shared library.
+Defaults to</p>
+<pre class="doctools_example"> -Wl,-s </pre>
+</dd>
+<dt>ldoutput</dt>
+<dd><p>Like <b class="const">output</b>, but for the linker.
+Defaults to the value of <b class="const">output</b>.</p></dd>
+<dt>link_debug</dt>
+<dd><p>The list of linker flags needed to build a shared library with
+symbols. Defaults to the empty string.
+One platform requiring this are all variants of Windows, which uses</p>
+<pre class="doctools_example"> -debug:full -debugtype:cv </pre>
+</dd>
+<dt>link_release</dt>
+<dd><p>The list of linker flags needed to build a shared library without
+symbols, i.e. a regular build. Defaults to the empty string.
+One platform requiring this are all variants of Windows, which uses</p>
+<pre class="doctools_example"> -release -opt:ref -opt:icf,3 -ws:aggressive </pre>
+</dd>
+<dt>sharedlibext</dt>
+<dd><p>The file extension for shared library files on the platform.
+Defaults to</p>
+<pre class="doctools_example"> [info sharedlibextension] </pre>
+</dd>
+<dt>platform</dt>
+<dd><p>The identifier of the platform used in generated packages.
+Defaults to</p>
+<pre class="doctools_example"> [platform::generic] </pre>
+</dd>
+<dt>target</dt>
+<dd><p>The presence of this key marks the configuration as a
+cross-compilation target and the value is the actual platform
+identifier of the target.  No default.</p></dd>
+</dl>
+<p>The syntax expected from configuration files is governed by the rules below.
+Again, it is recommended to open the file containing the standard
+configurations (&quot;<b class="file">path/to/critcl/Config</b>&quot;) in the editor of your
+choice when reading this section of the documentation, using it as an
+extended set of examples for the syntax&gt;</p>
+<ol class="doctools_enumerated">
+<li><p>Each logical line of the configuration file consists of one or
+more physical lines. In case of the latter the physical lines have to
+follow each other and all but the first must be marked by a trailing
+backslash. This is the same marker for <i class="term">continuation lines</i> as
+used by Tcl itself.</p></li>
+<li><p>A (logical) line starting with the character &quot;#&quot; (modulo
+whitespace) is a comment which runs until the end of the line, and is
+otherwise ignored.</p></li>
+<li><p>A (logical) line starting with the word &quot;if&quot; (modulo
+whitespace) is interpreted as Tcl's <b class="cmd">if</b> command and executed as
+such. I.e. this command has to follow Tcl's syntax for the command,
+which may stretch across multiple logical lines. The command will be
+run in a save interpreter.</p></li>
+<li><p>A (logical) line starting with the word &quot;set&quot; (modulo
+whitespace) is interpreted as Tcl's <b class="cmd">set</b> command and executed as
+such. I.e. this command has to follow Tcl's syntax for the command,
+which may stretch across multiple logical lines. The command will be
+run in a save interpreter.</p></li>
+<li><p>A line of the form &quot;<i class="arg">platform</i> <b class="variable">variable</b> <i class="arg">value</i>&quot;
+defines a platform specific configuration variable and value.
+The <b class="variable">variable</b> has to be the name of one of the configuration keys
+listed earlier in this section, and the <i class="arg">platform</i> string
+identifies the platform the setting is for. All settings with the same
+identification string form the <i class="term">configuration block</i> for this
+platform.</p></li>
+<li><p>A line of the special form
+&quot;<i class="arg">platform</i> <b class="const">when</b> <i class="arg">expression</i>&quot;
+marks the <i class="arg">platform</i> and all the settings in its
+<i class="term">configuration block</i> as conditional on the <i class="arg">expression</i>.</p>
+<p>If the build platform is not a prefix of <i class="arg">platform</i>,
+nor vice versa the whole block is ignored.
+Otherwise the <i class="arg">expression</i> is evaluated via <b class="cmd">expr</b>, in the
+same safe interpreter used to run any <b class="cmd">set</b> and <b class="cmd">if</b> commands
+found in the configuration file (see above).</p>
+<p>If the expression evaluates to <b class="const">true</b> this configuration block
+is considered to be the build platform fo the host and chosen as the
+default configuration.
+An large example of of this feature is the handling of OS X found in
+the standard configuration file, where it selects the architectures to
+build based on the version of the operating system, the available SDK,
+etc. I.e. it chooses whether the output is universal or not, and
+whether it is old-style (ix86 + ppc) versus new-style (ix86 32+64) of
+universality.</p></li>
+<li><p>A line of the special form
+&quot;<i class="arg">platform</i> <b class="const">copy</b> <i class="arg">sourceplatform</i>&quot;
+copies the configuration variables and values currently defined in the
+<i class="term">configuration block</i> for <i class="arg">sourceplatform</i> to that of
+<i class="arg">platform</i>, overwriting existing values, and creating missing
+ones. Variables of <i class="arg">platform</i> not defined by by <i class="arg">sourceplatform</i>
+are not touched.</p>
+<p>The copied values can be overridden later in the configuration
+file. Multiple <b class="const">copy</b> lines may exist for a platform and be
+intermixed with normal configuration definitions. Only the last definition of a
+variable is used.</p></li>
+<li><p>At last, a line of the form &quot;<b class="variable">variable</b> <i class="arg">value</i>&quot;
+defines a default configuration variable and value.</p></li>
+</ol>
+</div>
+<div id="subsection21" class="doctools_subsection"><h3><a name="subsection21">Stubs Tables</a></h3>
+<p>This section is for developers of extensions not based on critcl, yet
+also wishing to interface with stubs as they are understood and used
+by critcl, either by exporting their own stubs table to a
+critcl-based extension, or importing a stubs table of a critcl-based
+extension into their own.</p>
+<p>To this end we describe the stubs table information of a
+package <b class="package">foo</b>.</p>
+<ol class="doctools_enumerated">
+<li><p>Note that the differences in the capitalization of &quot;foo&quot;,
+&quot;Foo&quot;, &quot;FOO&quot;, etc. below demonstrate how to capitalize the actual
+package name in each context.</p></li>
+<li><p>All relevant files must be available in a sub-directory
+&quot;<b class="file">foo</b>&quot; which can be found on the include search paths.</p></li>
+<li><p>The above directory may contain a file &quot;<b class="file">foo.decls</b>&quot;. If
+	present it is assumed to contain the external representation
+	of the stubs table the headers mentioned in the following
+	items are based on.</p>
+<p>critcl is able to use such a file to give the importing package
+	programmatic access to the imported API, for automatic code
+	generation and the like.</p></li>
+<li><p>The above directory must contain a header file
+&quot;<b class="file">fooDecls.h</b>&quot;. This file <em>declares</em> the exported API.
+It is used by both exporting and importing packages. It is usually
+generated and must contain (in the order specified):</p>
+<ol class="doctools_enumerated">
+<li><p>the declarations of the exported, i.e. public, functions of
+	<b class="package">foo</b>,</p></li>
+<li><p>the declaration of structure &quot;FooStubs&quot; for the stub table,</p></li>
+<li><p>the C preprocessor macros which route the invocations of the
+	public functions through the stubs table.</p>
+<p>These macros must be defined if, and only if, the C preprocessor
+	macro USE_FOO_STUBS is defined. Package <b class="package">foo</b> does not
+	define this macro, as it is allowed to use the exported
+	functions directly. All importing packages however must define
+	this macro, to ensure that they do <em>not</em> use any of the
+	exported functions directly, but only through the stubs table.</p></li>
+<li><p>If the exported functions need additional types for their proper
+	declaration then these types should be put into a separate
+	header file (of arbitrary name) and &quot;<b class="file">fooDecls.h</b>&quot; should
+	contain an #include directive to this header at the top.</p></li>
+</ol>
+<p>A very reduced, yet also complete example, from a package for
+low-level random number generator functions can be found at the end of
+this section.</p></li>
+<li><p>The above directory must contain a header file
+&quot;<b class="file">fooStubLib.h</b>&quot;. This file <em>defines</em> everything needed to use
+the API of <b class="package">foo</b>. Consequently it is used only by importing
+packages. It is usually generated and must contain (in the order
+specified):</p>
+<ol class="doctools_enumerated">
+<li><p>An #include directive for &quot;<b class="file">tcl.h</b>&quot;, with USE_TCL_STUBS
+	surely defined.</p></li>
+<li><p>An #include directive for &quot;<b class="file">fooDecls.h</b>&quot;, with USE_FOO_STUBS
+	surely defined.</p></li>
+<li><p>A <em>definition</em> of the stubs table variable, i.e.</p>
+<pre class="doctools_example">const FooStubs* fooStubsPtr;</pre>
+</li>
+<li><p>A <em>definition</em> of the stubs initializer function, like</p>
+<pre class="doctools_example">char *
+Foo_InitStubs(Tcl_Interp *interp, CONST char *version, int exact)
+{
+    /*
+     * Boiler plate C code initalizing the stubs table variable,
+     * i.e. &quot;fooStubsPtr&quot;.
+     */
+    CONST char *actualVersion;
+    actualVersion = Tcl_PkgRequireEx(interp, &quot;foo&quot;, version,
+				     exact, (ClientData *) &amp;fooStubsPtr);
+    if (!actualVersion) {
+	return NULL;
+    }
+    if (!fooStubsPtr) {
+	Tcl_SetResult(interp,
+		      &quot;This implementation of Foo does not support stubs&quot;,
+		      TCL_STATIC);
+	return NULL;
+    }
+    return (char*) actualVersion;
+}</pre>
+</li>
+</ol>
+<p>This header file must be included by an importing package
+<em>exactly once</em>, so that it contains only one definition of both
+stubs table and stubs initializer function.</p>
+<p>The importing package's initialization function must further
+contain a statement like</p>
+<pre class="doctools_example">if (!Foo_InitStubs (ip, &quot;1&quot;, 0)) {
+    return TCL_ERROR;
+}</pre>
+<p>which invokes <b class="package">foo</b>'s stubs initializer function to set the
+local stub table up.</p>
+<p>For a complete example of such a header file see below, at the
+end of this section.</p></li>
+<li><p>The last item above, about &quot;<b class="file">fooStubLib.h</b>&quot; <em>differs</em>
+	from the regular stub stable system used by Tcl. The regular
+	system assumes that a static library &quot;<b class="file">libfoostub.a</b>&quot; was
+	installed by package <b class="package">foo</b>, and links it.</p>
+<p>IMVHO critcl's approach is simpler, using <em>only</em> header
+	files found in a single location, vs. header files and static
+	library found in multiple, different locations.</p>
+<p>A second simplification is that we avoid having to extend
+	critcl's compiler backend with settings for the creation of
+	static libraries.</p></li>
+</ol>
+<p>Below is a complete set of example header files, reduced, yet still
+complete, from a package for low-level random number generator
+functions:</p>
+<dl class="doctools_definitions">
+<dt>&quot;<b class="file">rngDecls.h</b>&quot;:</dt>
+<dd>
+<pre class="doctools_example">
+#ifndef rng_DECLS_H
+#define rng_DECLS_H
+#include &lt;tcl.h&gt;
+/*
+ * Exported function declarations:
+ */
+/* 0 */
+EXTERN void rng_bernoulli(double p, int*v);
+typedef struct RngStubs {
+    int magic;
+    const struct RngStubHooks *hooks;
+    void (*rng_bernoulli) (double p, int*v); /* 0 */
+} RngStubs;
+#ifdef __cplusplus
+extern &quot;C&quot; {
+#endif
+extern const RngStubs *rngStubsPtr;
+#ifdef __cplusplus
+}
+#endif
+#if defined(USE_RNG_STUBS)
+/*
+ * Inline function declarations:
+ */
+#define rng_bernoulli  (rngStubsPtr-&gt;rng_bernoulli) /* 0 */
+#endif /* defined(USE_RNG_STUBS) */
+#endif /* rng_DECLS_H */
+</pre>
+</dd>
+<dt>&quot;<b class="file">rngStubLib.h</b>&quot;:</dt>
+<dd>
+<pre class="doctools_example">
+/*
+ * rngStubLib.c --
+ *
+ * Stub object that will be statically linked into extensions that wish
+ * to access rng.
+ */
+#ifndef USE_TCL_STUBS
+#define USE_TCL_STUBS
+#endif
+#undef  USE_TCL_STUB_PROCS
+#include &lt;tcl.h&gt;
+#ifndef USE_RNG_STUBS
+#define USE_RNG_STUBS
+#endif
+#undef  USE_RNG_STUB_PROCS
+#include &quot;rngDecls.h&quot;
+/*
+ * Ensure that Rng_InitStubs is built as an exported symbol.  The other stub
+ * functions should be built as non-exported symbols.
+ */
+#undef  TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
+const RngStubs* rngStubsPtr;
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Rng_InitStubs --
+ *
+ * Checks that the correct version of Rng is loaded and that it
+ * supports stubs. It then initialises the stub table pointers.
+ *
+ * Results:
+ *  The actual version of Rng that satisfies the request, or
+ *  NULL to indicate that an error occurred.
+ *
+ * Side effects:
+ *  Sets the stub table pointers.
+ *
+ *----------------------------------------------------------------------
+ */
+#ifdef Rng_InitStubs
+#undef Rng_InitStubs
+#endif
+char *
+Rng_InitStubs(Tcl_Interp *interp, CONST char *version, int exact)
+{
+    CONST char *actualVersion;
+    actualVersion = Tcl_PkgRequireEx(interp, &quot;rng&quot;, version,
+				     exact, (ClientData *) &amp;rngStubsPtr);
+    if (!actualVersion) {
+	return NULL;
+    }
+    if (!rngStubsPtr) {
+	Tcl_SetResult(interp,
+		      &quot;This implementation of Rng does not support stubs&quot;,
+		      TCL_STATIC);
+	return NULL;
+    }
+    return (char*) actualVersion;
+}
+</pre>
+</dd>
+</dl>
+</div>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Examples</a></h2>
+<p>See section &quot;Embedding C&quot; in <i class="term">Using CriTcl</i>.</p>
+</div>
+<div id="section5" class="doctools_section"><h2><a name="section5">Authors</a></h2>
+<p>Jean Claude Wippler, Steve Landers, Andreas Kupries</p>
+</div>
+<div id="section6" class="doctools_section"><h2><a name="section6">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report them at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a>.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a> as well.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#calling_c_code_from_tcl">calling C code from Tcl</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; Jean-Claude Wippler<br>
+Copyright &copy; Steve Landers<br>
+Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_tcl9.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_tcl9.html
new file mode 100644
index 00000000..a59ad776
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_tcl9.html
@@ -0,0 +1,265 @@
+<!DOCTYPE html><html><head>
+<title>critcl_tcl9 - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_tcl9.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; Jean-Claude Wippler   -- Copyright &amp;copy; Steve Landers   -- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl_tcl9.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl_tcl9(n) 3.2.1 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl_tcl9 - How To Adapt Critcl Packages for Tcl 9</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">Additional References</a></li>
+<li class="doctools_section"><a href="#section3">Authors</a></li>
+<li class="doctools_section"><a href="#section4">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This guide contains notes and actions to take by writers of <i class="term"><a href="critcl.html">CriTcl</a></i>-based
+packages to make their code workable for both Tcl 8.6 and 9.</p>
+<ol class="doctools_enumerated">
+<li><p>Generally, if there is no interest in moving to Tcl 9, i.e. Tcl 8.[456]
+       are the only supported runtimes, then just keep using <i class="term"><a href="critcl.html">CriTcl</a></i> <b class="const">3.2</b>.</p>
+<p>The remainder of this document can be ignored.</p></li>
+<li><p>Use <i class="term"><a href="critcl.html">CriTcl</a></i> version 3.2.1 <em>if, and only if</em>
+       Tcl 9 support is wanted.</p>
+<p>With some work this will then also provide backward compatibility with Tcl 8.6.</p></li>
+<li><p>Header &quot;<b class="file">tcl.h</b>&quot;</p>
+<p>Replace any inclusion of Tcl's public &quot;<b class="file">tcl.h</b>&quot; header file in the package's
+       C code with the inclusion of <i class="term"><a href="critcl.html">CriTcl</a></i>'s new header file &quot;<b class="file">tclpre9compat.h</b>&quot;.</p>
+<p>This includes &quot;<b class="file">tcl.h</b>&quot; and further provides a set of compatibility definitions
+       which make supporting both Tcl 8.6 and Tcl 9 in a single code base easier.</p>
+<p>The following notes assume that this compatibility layer is in place.</p></li>
+<li><p><b class="cmd">critcl::tcl</b></p>
+<p>Before <i class="term"><a href="critcl.html">CriTcl</a></i> 3.2.1 a single default (<b class="const">8.4</b>) was used for
+       the minimum Tcl version, to be overriden by an explicit <b class="cmd">critcl::tcl</b> in the
+       package code.</p>
+<p>Now the default is dynamic, based on the <em>runtime</em> version, i.e.
+       <b class="cmd">package provide Tcl</b>, <i class="term"><a href="critcl.html">CriTcl</a></i> is run with/on.</p>
+<p>When running on Tcl 9 the new default is version <b class="const">9</b>, and <b class="const">8.6</b> else.
+       <em>Note</em> how this other default was bumped up from <b class="const">8.4</b>.</p>
+<p>As a consequence it is possible to</p>
+<ol class="doctools_enumerated">
+<li><p>Support just Tcl 8.4+, 8.5+, by having an explicit <b class="cmd">critcl::tcl 8.x</b> in
+       the package code.</p>
+<p><em>Remember however</em>, it is better to simply stick with
+       <i class="term"><a href="critcl.html">CriTcl</a></i> <b class="const">3.2</b> for this.</p></li>
+<li><p>Support just Tcl 9 by having an explicit <b class="cmd">critcl::tcl 9</b> in the package code.</p></li>
+<li><p>Support both Tcl 8.6 and Tcl 9 (but not 8.4/8.5) by leaving <b class="cmd">critcl::tcl</b> out of the code
+       and using the proper <b class="syscmd">tclsh</b> version to run <i class="term"><a href="critcl.html">CriTcl</a></i> with.</p></li>
+</ol>
+</li>
+<li><p>Code checking</p>
+<p><i class="term"><a href="critcl.html">CriTcl</a></i> 3.2.1 comes with a very basic set of code checks pointing
+       out places where compatibility might or will be an issue.</p>
+<p>The implementation checks all inlined C code declared by <b class="cmd">critcl::ccode</b>,
+       <b class="cmd">critcl::ccommand</b>, <b class="cmd">critcl::cproc</b> (and related/derived commands), as well
+       as the C companion files declared with <b class="cmd">critcl::csources</b>.</p>
+<p>It is very basic because it simply greps the code line by line for a number
+       of patterns and reports on their presence. The C code is not fully parsed.
+       The check can and will report pattern found in C code comments, for example.</p>
+<p>The main patterns deal with functions affected by the change to <b class="type">Tcl_Size</b>,
+       the removal of old-style interpreter state handling, and command creation.</p>
+<p>A warning message is printed for all detections.</p>
+<p>This is disabled for the <b class="const">Tcl_Size</b>-related pattern if the line also matches
+       the pattern <b class="const">*OK tcl9*</b>.</p>
+<p>In this way all places in the code already handled can be marked and excluded
+       from the warnings.</p>
+<ol class="doctools_enumerated">
+<li><p>Interpreter State handling</p>
+<p>Tcl 9 removed the type <b class="type">Tcl_SavedResult</b> and its associated functions
+       <b class="function">Tcl_SaveResult</b>, <b class="function">Tcl_RestoreResult</b>, and <b class="function">Tcl_DiscardResult</b>.</p>
+<p>When a package uses this type and the related functions a rewrite is necessary.</p>
+<p>With Tcl 9 use of type <b class="type">Tcl_InterpState</b> and its functions
+       <b class="function">Tcl_SaveInterpState</b>, <b class="function">Tcl_RestoreInterpState</b>, and
+       <b class="function">Tcl_DiscardInterpState</b> is now required.</p>
+<p>As these were introduced with Tcl 8.5 the rewrite gives us compatibility with
+       Tcl 8.6 for free.</p></li>
+<li><p><b class="type">Tcl_Size</b></p>
+<p>One of the main changes introduced with Tcl 9 is the breaking of the 2G barrier
+       for the number of bytes in a string, elements in a list, etc.
+       In a lot of interfaces <b class="type">int</b> was replaced with <b class="type">Tcl_Size</b>, which is
+       effectively <b class="type">ptrdiff_t</b> behind the scenes.</p>
+<p>The &quot;<b class="file">tclpre9compat.h</b>&quot; header mentioned above provides a suitable definition
+       of <b class="type">Tcl_Size</b> for <b class="const">8.6</b>, i.e. maps it to <b class="type">int</b>.
+       This enables the package code to use <b class="type">Tcl_Size</b> everywhere and still have it
+       work for both Tcl 8.6 and 9.</p>
+<p>It is of course necessary to rewrite the package code to use <b class="type">Tcl_Size</b>.</p>
+<p>The checker reports all lines in the C code using a function whose signature
+       was changed to use <b class="type">Tcl_Size</b> over <b class="type">int</b>.</p>
+<p>Note that it is necessary to manually check the package code for places where
+       a <b class="const">%d</b> text formatting specification should be replaced with
+       <b class="const">TCL_SIZE_FMT</b>.</p>
+<p>I.e. all places where <b class="type">Tcl_Size</b> values are formatted with <b class="function">printf</b>-style
+       functions a formatting string</p>
+<pre class="doctools_example">&quot;... %d ...&quot;</pre>
+<p>has to be replaced with</p>
+<pre class="doctools_example">&quot;... &quot; TCL_SIZE_FMT &quot; ...&quot;</pre>
+<p>The macro <b class="cmd">TCL_SIZE_FMT</b> is defined by Critcl's compatibility layer, as an
+       extension of the <b class="cmd">TCL_SIZE_MODIFIER</b> macro which only contains the
+       formatting modifier to insert into a plain <b class="const">%d</b> to handle <b class="type">Tcl_Size</b>
+       values.</p>
+<p><em>Note</em> how the original formatting string is split into multiple strings.
+       The C compiler will fuse these back together into a single string.</p></li>
+<li><p>Command creation.</p>
+<p>This is technically a part of the <b class="type">Tcl_Size</b> changes.</p>
+<p>All places using <b class="function">Tcl_CreateObjCommand</b> have to be rewritten to use
+       <b class="function">Tcl_CreateObjCommand2</b> instead, and the registered command functions
+       to use <b class="type">Tcl_Size</b> for their <i class="arg">objc</i> argument.</p>
+<p>The &quot;<b class="file">tclpre9compat.h</b>&quot; header maps this back to the old function
+       when compilation is done against Tcl 8.6.</p>
+<p><i class="term"><a href="critcl.html">CriTcl</a></i> does this itself for the commands created via <b class="cmd">critcl::ccommand</b>,
+       <b class="cmd">critcl::cproc</b>, and derived places (<b class="package"><a href="critcl_class.html">critcl::class</a></b>).</p></li>
+<li><p>TIP 494. This TIP adds three semantic constants wrapping <b class="const">-1</b> to Tcl 9 to
+       make the meaning of code clearer. As part of this it also casts the constant to the
+       proper type. They are:</p>
+<ul class="doctools_itemized">
+<li><p><b class="const">TCL_IO_FAILURE</b></p></li>
+<li><p><b class="const">TCL_AUTO_LENGTH</b></p></li>
+<li><p><b class="const">TCL_INDEX_NONE</b></p></li>
+</ul>
+<p>Critcl's compatibility layer provides the same constants to Tcl 8.6.</p>
+<p>Critcl's new checker highlights places where <b class="const">TCL_AUTO_LENGTH</b> is suitable.</p>
+<p>Doing this for the other two constants looks to require deeper and proper parsing
+       of C code, which the checker does not do.</p></li>
+</ol>
+</li>
+</ol>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">Additional References</a></h2>
+<ol class="doctools_enumerated">
+<li><p><a href="https://wiki.tcl-lang.org/page/Porting+extensions+to+Tcl+9">https://wiki.tcl-lang.org/page/Porting+extensions+to+Tcl+9</a></p></li>
+<li><p><a href="https://wiki.tcl-lang.org/page/Tcl+9+functions+using+Tcl%5FSize">https://wiki.tcl-lang.org/page/Tcl+9+functions+using+Tcl%5FSize</a></p></li>
+<li><p><a href="https://core.tcl-lang.org/tcl/wiki?name=Migrating%20scripts%20to%20Tcl%209">https://core.tcl-lang.org/tcl/wiki?name=Migrating%20scripts%20to%20Tcl%209</a></p></li>
+<li><p><a href="https://core.tcl-lang.org/tcl/wiki?name=Migrating%20C%20extensions%20to%20Tcl%209">https://core.tcl-lang.org/tcl/wiki?name=Migrating%20C%20extensions%20to%20Tcl%209</a></p></li>
+</ol>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Authors</a></h2>
+<p>Jean Claude Wippler, Steve Landers, Andreas Kupries</p>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report them at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a>.
+Ideas for enhancements you may have for either package, application,
+and/or the documentation are also very welcome and should be reported
+at <a href="https://github.com/andreas-kupries/critcl/issues">https://github.com/andreas-kupries/critcl/issues</a> as well.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#calling_c_code_from_tcl">calling C code from Tcl</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; Jean-Claude Wippler<br>
+Copyright &copy; Steve Landers<br>
+Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/files/critcl_util.html b/src/vfs/critcl.vfs/embedded/www/files/critcl_util.html
new file mode 100644
index 00000000..589c3336
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/files/critcl_util.html
@@ -0,0 +1,202 @@
+<!DOCTYPE html><html><head>
+<title>critcl::util - C Runtime In Tcl (CriTcl)</title>
+<style type="text/css"><!--
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+--></style>
+</head>
+<!-- Generated from file 'critcl_util.man' by tcllib/doctools with format 'html'
+   -->
+<!-- Copyright &amp;copy; 2011-2024 Andreas Kupries
+   -->
+<!-- critcl::util.n
+   -->
+<body><hr> [
+   <a href="../toc.html">Table Of Contents</a>
+&#124; <a href="../index.html">Keyword Index</a>
+ ] <hr>
+<div class="doctools">
+<h1 class="doctools_title">critcl::util(n) 1.2 doc &quot;C Runtime In Tcl (CriTcl)&quot;</h1>
+<div id="name" class="doctools_section"><h2><a name="name">Name</a></h2>
+<p>critcl::util - CriTcl - Utilities</p>
+</div>
+<div id="toc" class="doctools_section"><h2><a name="toc">Table Of Contents</a></h2>
+<ul class="doctools_toc">
+<li class="doctools_section"><a href="#toc">Table Of Contents</a></li>
+<li class="doctools_section"><a href="#synopsis">Synopsis</a></li>
+<li class="doctools_section"><a href="#section1">Description</a></li>
+<li class="doctools_section"><a href="#section2">API</a></li>
+<li class="doctools_section"><a href="#section3">Authors</a></li>
+<li class="doctools_section"><a href="#section4">Bugs, Ideas, Feedback</a></li>
+<li class="doctools_section"><a href="#keywords">Keywords</a></li>
+<li class="doctools_section"><a href="#category">Category</a></li>
+<li class="doctools_section"><a href="#copyright">Copyright</a></li>
+</ul>
+</div>
+<div id="synopsis" class="doctools_section"><h2><a name="synopsis">Synopsis</a></h2>
+<div class="doctools_synopsis">
+<ul class="doctools_requirements">
+<li>package require <b class="pkgname">Tcl 8.6</b></li>
+<li>package require <b class="pkgname">critcl <span class="opt">?3.2?</span></b></li>
+<li>package require <b class="pkgname">critcl::util <span class="opt">?1.2?</span></b></li>
+</ul>
+<ul class="doctools_syntax">
+<li><a href="#1"><b class="cmd">::critcl::util::checkfun</b> <i class="arg">name</i> <span class="opt">?<i class="arg">label</i>?</span></a></li>
+<li><a href="#2"><b class="cmd">::critcl::util::def</b> <i class="arg">path</i> <i class="arg">define</i> <span class="opt">?<i class="arg">value</i>?</span></a></li>
+<li><a href="#3"><b class="cmd">::critcl::util::undef</b> <i class="arg">path</i> <i class="arg">define</i></a></li>
+<li><a href="#4"><b class="cmd">::critcl::util::locate</b> <i class="arg">label</i> <i class="arg">paths</i> <span class="opt">?<i class="arg">cmd</i>?</span></a></li>
+</ul>
+</div>
+</div>
+<div id="section1" class="doctools_section"><h2><a name="section1">Description</a></h2>
+<p>Be welcome to the <i class="term">C Runtime In Tcl</i> (short: <i class="term"><a href="critcl.html">CriTcl</a></i>), a system for embedding and using C
+code from within <a href="http://core.tcl-lang.org/tcl">Tcl</a> scripts.</p>
+<p>This document is the reference manpage for the <b class="package">critcl::util</b>
+package. This package provides convenience commands for advanced
+functionality built on top of the core.
+Its intended audience are mainly developers wishing to write Tcl
+packages with embedded C code.</p>
+<p>This package resides in the Core Package Layer of CriTcl.</p>
+<p><img alt="arch_core" src="../image/arch_core.png"></p>
+</div>
+<div id="section2" class="doctools_section"><h2><a name="section2">API</a></h2>
+<dl class="doctools_definitions">
+<dt><a name="1"><b class="cmd">::critcl::util::checkfun</b> <i class="arg">name</i> <span class="opt">?<i class="arg">label</i>?</span></a></dt>
+<dd><p>This command checks the build-time environment for the existence of
+the C function <i class="arg">name</i>.
+It returns <b class="const">true</b> on success, and <b class="const">false</b> otherwise.</p></dd>
+<dt><a name="2"><b class="cmd">::critcl::util::def</b> <i class="arg">path</i> <i class="arg">define</i> <span class="opt">?<i class="arg">value</i>?</span></a></dt>
+<dd><p>This command extends the specified configuration file <i class="arg">path</i> with a
+<b class="const">#define</b> directive for the named <i class="arg">define</i>. If the <i class="arg">value</i>
+is not specified it will default to <b class="const">1</b>.</p>
+<p>The result of the command is an empty string.</p>
+<p>Note that the configuration file is maintained in the <b class="cmd">critcl::cache</b>
+directory.</p></dd>
+<dt><a name="3"><b class="cmd">::critcl::util::undef</b> <i class="arg">path</i> <i class="arg">define</i></a></dt>
+<dd><p>This command extends the specified configuration file <i class="arg">path</i> with an
+<b class="const">#undef</b> directive for the named <i class="arg">define</i>.</p>
+<p>The result of the command is an empty string.</p>
+<p>Note that the configuration file is maintained in the <b class="cmd">critcl::cache</b>
+directory.</p></dd>
+<dt><a name="4"><b class="cmd">::critcl::util::locate</b> <i class="arg">label</i> <i class="arg">paths</i> <span class="opt">?<i class="arg">cmd</i>?</span></a></dt>
+<dd><p>This command checks the build-time environment for the existence of a file
+in a set of possible <i class="arg">paths</i>.</p>
+<p>If the option <i class="arg">cmd</i> prefix is specified it will be called with
+the full path of a found file as its only argument to perform further checks.
+A return value of <b class="const">false</b> will reject the path and continue the search.</p>
+<p>The return value of the command is the found path, as listed in
+<i class="arg">paths</i>. As a side effect the command will also print the found path,
+prefixed with the <i class="arg">label</i>, using <b class="cmd">critcl::msg</b>.</p>
+<p>Failure to find the path is reported via <b class="cmd">critcl::error</b>, and a
+possible empty string as the result, if <b class="cmd">critcl::error</b> does not
+terminate execution.
+A relative path is resolved relative to the directory
+containing the <i class="term">CriTcl script</i>.</p></dd>
+</dl>
+</div>
+<div id="section3" class="doctools_section"><h2><a name="section3">Authors</a></h2>
+<p>Andreas Kupries</p>
+</div>
+<div id="section4" class="doctools_section"><h2><a name="section4">Bugs, Ideas, Feedback</a></h2>
+<p>This document, and the package it describes, will undoubtedly contain
+bugs and other problems.
+Please report such at <a href="https://github.com/andreas-kupries/critcl">https://github.com/andreas-kupries/critcl</a>.
+Please also report any ideas for enhancements you may have for either
+package and/or documentation.</p>
+</div>
+<div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
+<p><a href="../index.html#c_code">C code</a>, <a href="../index.html#embedded_c_code">Embedded C Code</a>, <a href="../index.html#code_generator">code generator</a>, <a href="../index.html#compile_run">compile &amp; run</a>, <a href="../index.html#compiler">compiler</a>, <a href="../index.html#dynamic_code_generation">dynamic code generation</a>, <a href="../index.html#dynamic_compilation">dynamic compilation</a>, <a href="../index.html#generate_package">generate package</a>, <a href="../index.html#linker">linker</a>, <a href="../index.html#on_demand_compilation">on demand compilation</a>, <a href="../index.html#on_the_fly_compilation">on-the-fly compilation</a></p>
+</div>
+<div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
+<p>Glueing/Embedded C code</p>
+</div>
+<div id="copyright" class="doctools_section"><h2><a name="copyright">Copyright</a></h2>
+<p>Copyright &copy; 2011-2024 Andreas Kupries</p>
+</div>
+</div></body></html>
diff --git a/src/vfs/critcl.vfs/embedded/www/image/arch_application.png b/src/vfs/critcl.vfs/embedded/www/image/arch_application.png
new file mode 100644
index 00000000..2f732c83
Binary files /dev/null and b/src/vfs/critcl.vfs/embedded/www/image/arch_application.png differ
diff --git a/src/vfs/critcl.vfs/embedded/www/image/arch_core.png b/src/vfs/critcl.vfs/embedded/www/image/arch_core.png
new file mode 100644
index 00000000..4ae56a7d
Binary files /dev/null and b/src/vfs/critcl.vfs/embedded/www/image/arch_core.png differ
diff --git a/src/vfs/critcl.vfs/embedded/www/image/arch_support.png b/src/vfs/critcl.vfs/embedded/www/image/arch_support.png
new file mode 100644
index 00000000..bee761f2
Binary files /dev/null and b/src/vfs/critcl.vfs/embedded/www/image/arch_support.png differ
diff --git a/src/vfs/critcl.vfs/embedded/www/image/architecture.png b/src/vfs/critcl.vfs/embedded/www/image/architecture.png
new file mode 100644
index 00000000..dacfeb47
Binary files /dev/null and b/src/vfs/critcl.vfs/embedded/www/image/architecture.png differ
diff --git a/src/vfs/critcl.vfs/embedded/www/index.html b/src/vfs/critcl.vfs/embedded/www/index.html
new file mode 100644
index 00000000..2408ac2b
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/index.html
@@ -0,0 +1,178 @@
+<!DOCTYPE html>
+<html>
+<!-- Generated by tcllib/doctools/idx with format 'html'
+   -->
+<!-- Keyword Index
+   -->
+<head>
+<title> Keyword Index </title>
+</head>
+<body>
+<hr> [
+   <a href="toc.html">Table Of Contents</a>
+ ] <hr>
+<h3> Keyword Index -- doc </h3>
+<hr><div class="#doctools_idxnav">
+<a href="#cB"> B </a> &#183; <a href="#cC"> C </a> &#183; <a href="#cD"> D </a> &#183; <a href="#cE"> E </a> &#183; <a href="#cF"> F </a> &#183; <a href="#cG"> G </a> &#183; <a href="#cI"> I </a> &#183; <a href="#cL"> L </a> &#183; <a href="#cO"> O </a> &#183; <a href="#cS"> S </a> &#183; <a href="#cT"> T </a>
+</div>
+<hr><table class="#doctools_idx" width="100%">
+<tr class="#doctools_idxheader"><th colspan="2">
+<a name="cB">Keywords: B</a>
+</th></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="bitmask"> bitmask </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a>
+</td></tr>
+<tr class="#doctools_idxodd" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="bitset"> bitset </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a>
+</td></tr>
+<tr class="#doctools_idxheader"><th colspan="2">
+<a name="cC">Keywords: C</a>
+</th></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="c_class"> C class </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl_class.html"> critcl::class </a>
+</td></tr>
+<tr class="#doctools_idxodd" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="c_code"> C code </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl.html"> critcl </a> &#183; <a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_callback.html"> critcl::callback </a> &#183; <a href="files/critcl_class.html"> critcl::class </a> &#183; <a href="files/critcl_cutil.html"> critcl::cutil </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a> &#183; <a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_iassoc.html"> critcl::iassoc </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a> &#183; <a href="files/critcl_util.html"> critcl::util </a> &#183; <a href="files/critcl_application.html"> critcl_application </a> &#183; <a href="files/critcl_application_package.html"> critcl_application_package </a> &#183; <a href="files/critcl_build.html"> critcl_build_tool </a> &#183; <a href="files/critcl_changes.html"> critcl_changes </a> &#183; <a href="files/critcl_cproc.html"> critcl_cproc_types </a> &#183; <a href="files/critcl_devguide.html"> critcl_devguide </a> &#183; <a href="files/critcl_howto_install.html"> critcl_howto_install </a> &#183; <a href="files/critcl_howto_sources.html"> critcl_howto_sources </a> &#183; <a href="files/critcl_howto_use.html"> critcl_howto_use </a> &#183; <a href="files/critcl_license.html"> critcl_license </a> &#183; <a href="files/critcl_package.html"> critcl_package </a> &#183; <a href="files/critcl_tcl9.html"> critcl_tcl9 </a>
+</td></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="c_instance"> C instance </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl_class.html"> critcl::class </a>
+</td></tr>
+<tr class="#doctools_idxodd" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="c_object"> C object </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl_class.html"> critcl::class </a>
+</td></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="calling_c_code_from_tcl"> calling C code from Tcl </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl.html"> critcl </a> &#183; <a href="files/critcl_application.html"> critcl_application </a> &#183; <a href="files/critcl_application_package.html"> critcl_application_package </a> &#183; <a href="files/critcl_build.html"> critcl_build_tool </a> &#183; <a href="files/critcl_changes.html"> critcl_changes </a> &#183; <a href="files/critcl_cproc.html"> critcl_cproc_types </a> &#183; <a href="files/critcl_devguide.html"> critcl_devguide </a> &#183; <a href="files/critcl_howto_install.html"> critcl_howto_install </a> &#183; <a href="files/critcl_howto_sources.html"> critcl_howto_sources </a> &#183; <a href="files/critcl_howto_use.html"> critcl_howto_use </a> &#183; <a href="files/critcl_license.html"> critcl_license </a> &#183; <a href="files/critcl_package.html"> critcl_package </a> &#183; <a href="files/critcl_tcl9.html"> critcl_tcl9 </a>
+</td></tr>
+<tr class="#doctools_idxodd" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="code_generator"> code generator </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl.html"> critcl </a> &#183; <a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_callback.html"> critcl::callback </a> &#183; <a href="files/critcl_class.html"> critcl::class </a> &#183; <a href="files/critcl_cutil.html"> critcl::cutil </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a> &#183; <a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_iassoc.html"> critcl::iassoc </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a> &#183; <a href="files/critcl_util.html"> critcl::util </a> &#183; <a href="files/critcl_application.html"> critcl_application </a> &#183; <a href="files/critcl_application_package.html"> critcl_application_package </a> &#183; <a href="files/critcl_build.html"> critcl_build_tool </a> &#183; <a href="files/critcl_changes.html"> critcl_changes </a> &#183; <a href="files/critcl_cproc.html"> critcl_cproc_types </a> &#183; <a href="files/critcl_devguide.html"> critcl_devguide </a> &#183; <a href="files/critcl_howto_install.html"> critcl_howto_install </a> &#183; <a href="files/critcl_howto_sources.html"> critcl_howto_sources </a> &#183; <a href="files/critcl_howto_use.html"> critcl_howto_use </a> &#183; <a href="files/critcl_license.html"> critcl_license </a> &#183; <a href="files/critcl_package.html"> critcl_package </a> &#183; <a href="files/critcl_tcl9.html"> critcl_tcl9 </a>
+</td></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="compile_run"> compile & run </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl.html"> critcl </a> &#183; <a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_callback.html"> critcl::callback </a> &#183; <a href="files/critcl_class.html"> critcl::class </a> &#183; <a href="files/critcl_cutil.html"> critcl::cutil </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a> &#183; <a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_iassoc.html"> critcl::iassoc </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a> &#183; <a href="files/critcl_util.html"> critcl::util </a> &#183; <a href="files/critcl_application.html"> critcl_application </a> &#183; <a href="files/critcl_application_package.html"> critcl_application_package </a> &#183; <a href="files/critcl_build.html"> critcl_build_tool </a> &#183; <a href="files/critcl_changes.html"> critcl_changes </a> &#183; <a href="files/critcl_cproc.html"> critcl_cproc_types </a> &#183; <a href="files/critcl_devguide.html"> critcl_devguide </a> &#183; <a href="files/critcl_howto_install.html"> critcl_howto_install </a> &#183; <a href="files/critcl_howto_sources.html"> critcl_howto_sources </a> &#183; <a href="files/critcl_howto_use.html"> critcl_howto_use </a> &#183; <a href="files/critcl_license.html"> critcl_license </a> &#183; <a href="files/critcl_package.html"> critcl_package </a> &#183; <a href="files/critcl_tcl9.html"> critcl_tcl9 </a>
+</td></tr>
+<tr class="#doctools_idxodd" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="compiler"> compiler </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl.html"> critcl </a> &#183; <a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_callback.html"> critcl::callback </a> &#183; <a href="files/critcl_class.html"> critcl::class </a> &#183; <a href="files/critcl_cutil.html"> critcl::cutil </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a> &#183; <a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_iassoc.html"> critcl::iassoc </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a> &#183; <a href="files/critcl_util.html"> critcl::util </a> &#183; <a href="files/critcl_application.html"> critcl_application </a> &#183; <a href="files/critcl_application_package.html"> critcl_application_package </a> &#183; <a href="files/critcl_build.html"> critcl_build_tool </a> &#183; <a href="files/critcl_changes.html"> critcl_changes </a> &#183; <a href="files/critcl_cproc.html"> critcl_cproc_types </a> &#183; <a href="files/critcl_devguide.html"> critcl_devguide </a> &#183; <a href="files/critcl_howto_install.html"> critcl_howto_install </a> &#183; <a href="files/critcl_howto_sources.html"> critcl_howto_sources </a> &#183; <a href="files/critcl_howto_use.html"> critcl_howto_use </a> &#183; <a href="files/critcl_license.html"> critcl_license </a> &#183; <a href="files/critcl_package.html"> critcl_package </a> &#183; <a href="files/critcl_tcl9.html"> critcl_tcl9 </a>
+</td></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="conversion"> conversion </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl_enum.html"> critcl::enum </a>
+</td></tr>
+<tr class="#doctools_idxheader"><th colspan="2">
+<a name="cD">Keywords: D</a>
+</th></tr>
+<tr class="#doctools_idxodd" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="dynamic_code_generation"> dynamic code generation </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl.html"> critcl </a> &#183; <a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_callback.html"> critcl::callback </a> &#183; <a href="files/critcl_class.html"> critcl::class </a> &#183; <a href="files/critcl_cutil.html"> critcl::cutil </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a> &#183; <a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_iassoc.html"> critcl::iassoc </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a> &#183; <a href="files/critcl_util.html"> critcl::util </a> &#183; <a href="files/critcl_application.html"> critcl_application </a> &#183; <a href="files/critcl_application_package.html"> critcl_application_package </a> &#183; <a href="files/critcl_build.html"> critcl_build_tool </a> &#183; <a href="files/critcl_changes.html"> critcl_changes </a> &#183; <a href="files/critcl_cproc.html"> critcl_cproc_types </a> &#183; <a href="files/critcl_devguide.html"> critcl_devguide </a> &#183; <a href="files/critcl_howto_install.html"> critcl_howto_install </a> &#183; <a href="files/critcl_howto_sources.html"> critcl_howto_sources </a> &#183; <a href="files/critcl_howto_use.html"> critcl_howto_use </a> &#183; <a href="files/critcl_license.html"> critcl_license </a> &#183; <a href="files/critcl_package.html"> critcl_package </a> &#183; <a href="files/critcl_tcl9.html"> critcl_tcl9 </a>
+</td></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="dynamic_compilation"> dynamic compilation </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl.html"> critcl </a> &#183; <a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_callback.html"> critcl::callback </a> &#183; <a href="files/critcl_class.html"> critcl::class </a> &#183; <a href="files/critcl_cutil.html"> critcl::cutil </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a> &#183; <a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_iassoc.html"> critcl::iassoc </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a> &#183; <a href="files/critcl_util.html"> critcl::util </a> &#183; <a href="files/critcl_application.html"> critcl_application </a> &#183; <a href="files/critcl_application_package.html"> critcl_application_package </a> &#183; <a href="files/critcl_build.html"> critcl_build_tool </a> &#183; <a href="files/critcl_changes.html"> critcl_changes </a> &#183; <a href="files/critcl_cproc.html"> critcl_cproc_types </a> &#183; <a href="files/critcl_devguide.html"> critcl_devguide </a> &#183; <a href="files/critcl_howto_install.html"> critcl_howto_install </a> &#183; <a href="files/critcl_howto_sources.html"> critcl_howto_sources </a> &#183; <a href="files/critcl_howto_use.html"> critcl_howto_use </a> &#183; <a href="files/critcl_license.html"> critcl_license </a> &#183; <a href="files/critcl_package.html"> critcl_package </a> &#183; <a href="files/critcl_tcl9.html"> critcl_tcl9 </a>
+</td></tr>
+<tr class="#doctools_idxheader"><th colspan="2">
+<a name="cE">Keywords: E</a>
+</th></tr>
+<tr class="#doctools_idxodd" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="embedded_c_code"> Embedded C Code </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl.html"> critcl </a> &#183; <a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_callback.html"> critcl::callback </a> &#183; <a href="files/critcl_class.html"> critcl::class </a> &#183; <a href="files/critcl_cutil.html"> critcl::cutil </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a> &#183; <a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_iassoc.html"> critcl::iassoc </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a> &#183; <a href="files/critcl_util.html"> critcl::util </a> &#183; <a href="files/critcl_application.html"> critcl_application </a> &#183; <a href="files/critcl_application_package.html"> critcl_application_package </a> &#183; <a href="files/critcl_build.html"> critcl_build_tool </a> &#183; <a href="files/critcl_changes.html"> critcl_changes </a> &#183; <a href="files/critcl_cproc.html"> critcl_cproc_types </a> &#183; <a href="files/critcl_devguide.html"> critcl_devguide </a> &#183; <a href="files/critcl_howto_install.html"> critcl_howto_install </a> &#183; <a href="files/critcl_howto_sources.html"> critcl_howto_sources </a> &#183; <a href="files/critcl_howto_use.html"> critcl_howto_use </a> &#183; <a href="files/critcl_license.html"> critcl_license </a> &#183; <a href="files/critcl_package.html"> critcl_package </a> &#183; <a href="files/critcl_tcl9.html"> critcl_tcl9 </a>
+</td></tr>
+<tr class="#doctools_idxheader"><th colspan="2">
+<a name="cF">Keywords: F</a>
+</th></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="flags"> flags </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a>
+</td></tr>
+<tr class="#doctools_idxheader"><th colspan="2">
+<a name="cG">Keywords: G</a>
+</th></tr>
+<tr class="#doctools_idxodd" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="generate_package"> generate package </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl.html"> critcl </a> &#183; <a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_callback.html"> critcl::callback </a> &#183; <a href="files/critcl_class.html"> critcl::class </a> &#183; <a href="files/critcl_cutil.html"> critcl::cutil </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a> &#183; <a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_iassoc.html"> critcl::iassoc </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a> &#183; <a href="files/critcl_util.html"> critcl::util </a> &#183; <a href="files/critcl_application.html"> critcl_application </a> &#183; <a href="files/critcl_application_package.html"> critcl_application_package </a> &#183; <a href="files/critcl_build.html"> critcl_build_tool </a> &#183; <a href="files/critcl_changes.html"> critcl_changes </a> &#183; <a href="files/critcl_cproc.html"> critcl_cproc_types </a> &#183; <a href="files/critcl_devguide.html"> critcl_devguide </a> &#183; <a href="files/critcl_howto_install.html"> critcl_howto_install </a> &#183; <a href="files/critcl_howto_sources.html"> critcl_howto_sources </a> &#183; <a href="files/critcl_howto_use.html"> critcl_howto_use </a> &#183; <a href="files/critcl_license.html"> critcl_license </a> &#183; <a href="files/critcl_package.html"> critcl_package </a> &#183; <a href="files/critcl_tcl9.html"> critcl_tcl9 </a>
+</td></tr>
+<tr class="#doctools_idxheader"><th colspan="2">
+<a name="cI">Keywords: I</a>
+</th></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="int_to_string_mapping"> int to string mapping </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl_enum.html"> critcl::enum </a>
+</td></tr>
+<tr class="#doctools_idxheader"><th colspan="2">
+<a name="cL">Keywords: L</a>
+</th></tr>
+<tr class="#doctools_idxodd" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="linker"> linker </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl.html"> critcl </a> &#183; <a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_callback.html"> critcl::callback </a> &#183; <a href="files/critcl_class.html"> critcl::class </a> &#183; <a href="files/critcl_cutil.html"> critcl::cutil </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a> &#183; <a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_iassoc.html"> critcl::iassoc </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a> &#183; <a href="files/critcl_util.html"> critcl::util </a> &#183; <a href="files/critcl_application.html"> critcl_application </a> &#183; <a href="files/critcl_application_package.html"> critcl_application_package </a> &#183; <a href="files/critcl_build.html"> critcl_build_tool </a> &#183; <a href="files/critcl_changes.html"> critcl_changes </a> &#183; <a href="files/critcl_cproc.html"> critcl_cproc_types </a> &#183; <a href="files/critcl_devguide.html"> critcl_devguide </a> &#183; <a href="files/critcl_howto_install.html"> critcl_howto_install </a> &#183; <a href="files/critcl_howto_sources.html"> critcl_howto_sources </a> &#183; <a href="files/critcl_howto_use.html"> critcl_howto_use </a> &#183; <a href="files/critcl_license.html"> critcl_license </a> &#183; <a href="files/critcl_package.html"> critcl_package </a> &#183; <a href="files/critcl_tcl9.html"> critcl_tcl9 </a>
+</td></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="literal_pool"> literal pool </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a>
+</td></tr>
+<tr class="#doctools_idxheader"><th colspan="2">
+<a name="cO">Keywords: O</a>
+</th></tr>
+<tr class="#doctools_idxodd" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="on_demand_compilation"> on demand compilation </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl.html"> critcl </a> &#183; <a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_callback.html"> critcl::callback </a> &#183; <a href="files/critcl_class.html"> critcl::class </a> &#183; <a href="files/critcl_cutil.html"> critcl::cutil </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a> &#183; <a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_iassoc.html"> critcl::iassoc </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a> &#183; <a href="files/critcl_util.html"> critcl::util </a> &#183; <a href="files/critcl_application.html"> critcl_application </a> &#183; <a href="files/critcl_application_package.html"> critcl_application_package </a> &#183; <a href="files/critcl_build.html"> critcl_build_tool </a> &#183; <a href="files/critcl_changes.html"> critcl_changes </a> &#183; <a href="files/critcl_cproc.html"> critcl_cproc_types </a> &#183; <a href="files/critcl_devguide.html"> critcl_devguide </a> &#183; <a href="files/critcl_howto_install.html"> critcl_howto_install </a> &#183; <a href="files/critcl_howto_sources.html"> critcl_howto_sources </a> &#183; <a href="files/critcl_howto_use.html"> critcl_howto_use </a> &#183; <a href="files/critcl_license.html"> critcl_license </a> &#183; <a href="files/critcl_package.html"> critcl_package </a> &#183; <a href="files/critcl_tcl9.html"> critcl_tcl9 </a>
+</td></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="on_the_fly_compilation"> on-the-fly compilation </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl.html"> critcl </a> &#183; <a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_callback.html"> critcl::callback </a> &#183; <a href="files/critcl_class.html"> critcl::class </a> &#183; <a href="files/critcl_cutil.html"> critcl::cutil </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a> &#183; <a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_iassoc.html"> critcl::iassoc </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a> &#183; <a href="files/critcl_util.html"> critcl::util </a> &#183; <a href="files/critcl_application.html"> critcl_application </a> &#183; <a href="files/critcl_application_package.html"> critcl_application_package </a> &#183; <a href="files/critcl_build.html"> critcl_build_tool </a> &#183; <a href="files/critcl_changes.html"> critcl_changes </a> &#183; <a href="files/critcl_cproc.html"> critcl_cproc_types </a> &#183; <a href="files/critcl_devguide.html"> critcl_devguide </a> &#183; <a href="files/critcl_howto_install.html"> critcl_howto_install </a> &#183; <a href="files/critcl_howto_sources.html"> critcl_howto_sources </a> &#183; <a href="files/critcl_howto_use.html"> critcl_howto_use </a> &#183; <a href="files/critcl_license.html"> critcl_license </a> &#183; <a href="files/critcl_package.html"> critcl_package </a> &#183; <a href="files/critcl_tcl9.html"> critcl_tcl9 </a>
+</td></tr>
+<tr class="#doctools_idxheader"><th colspan="2">
+<a name="cS">Keywords: S</a>
+</th></tr>
+<tr class="#doctools_idxodd" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="singleton"> singleton </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a> &#183; <a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_iassoc.html"> critcl::iassoc </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a>
+</td></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="string_pool"> string pool </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a>
+</td></tr>
+<tr class="#doctools_idxodd" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="string_to_int_mapping"> string to int mapping </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl_enum.html"> critcl::enum </a>
+</td></tr>
+<tr class="#doctools_idxheader"><th colspan="2">
+<a name="cT">Keywords: T</a>
+</th></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="tcl_interp_association"> Tcl Interp Association </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="files/critcl_bitmap.html"> critcl::bitmap </a> &#183; <a href="files/critcl_emap.html"> critcl::emap </a> &#183; <a href="files/critcl_enum.html"> critcl::enum </a> &#183; <a href="files/critcl_iassoc.html"> critcl::iassoc </a> &#183; <a href="files/critcl_literals.html"> critcl::literals </a>
+</td></tr>
+</table>
+</body></html>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/embedded/www/toc.html b/src/vfs/critcl.vfs/embedded/www/toc.html
new file mode 100644
index 00000000..12fbaf52
--- /dev/null
+++ b/src/vfs/critcl.vfs/embedded/www/toc.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html><html><head>
+<title> Table Of Contents </title>
+</head>
+<!-- Generated by tcllib/doctools/toc with format 'html'
+   -->
+<!-- Table Of Contents
+   -->
+<body>
+<hr> [
+   <a href="index.html">Keyword Index</a>
+ ] <hr>
+<h3>Table Of Contents</h3>
+<hr><dl><dt><h2>doc</h2></dt><dd>
+<table class="#doctools_toc">
+<tr class="#doctools_toceven" >
+<td class="#doctools_tocleft" ><a name='critcl'><a href="files/critcl.html">critcl</a></td>
+<td class="#doctools_tocright">Introduction To CriTcl</td>
+</tr>
+<tr class="#doctools_tocodd"  >
+<td class="#doctools_tocleft" ><a name='critcl_bitmap'><a href="files/critcl_bitmap.html">critcl::bitmap</a></td>
+<td class="#doctools_tocright">CriTcl - Wrap Support - Bitset en- and decoding</td>
+</tr>
+<tr class="#doctools_toceven" >
+<td class="#doctools_tocleft" ><a name='critcl_callback'><a href="files/critcl_callback.html">critcl::callback</a></td>
+<td class="#doctools_tocright">CriTcl - C-level Callback Utilities</td>
+</tr>
+<tr class="#doctools_tocodd"  >
+<td class="#doctools_tocleft" ><a name='critcl_class'><a href="files/critcl_class.html">critcl::class</a></td>
+<td class="#doctools_tocright">CriTcl - Code Gen - C Classes</td>
+</tr>
+<tr class="#doctools_toceven" >
+<td class="#doctools_tocleft" ><a name='critcl_cutil'><a href="files/critcl_cutil.html">critcl::cutil</a></td>
+<td class="#doctools_tocright">CriTcl - C-level Utilities</td>
+</tr>
+<tr class="#doctools_tocodd"  >
+<td class="#doctools_tocleft" ><a name='critcl_emap'><a href="files/critcl_emap.html">critcl::emap</a></td>
+<td class="#doctools_tocright">CriTcl - Wrap Support - Enum en- and decoding</td>
+</tr>
+<tr class="#doctools_toceven" >
+<td class="#doctools_tocleft" ><a name='critcl_enum'><a href="files/critcl_enum.html">critcl::enum</a></td>
+<td class="#doctools_tocright">CriTcl - Wrap Support - String/Integer mapping</td>
+</tr>
+<tr class="#doctools_tocodd"  >
+<td class="#doctools_tocleft" ><a name='critcl_iassoc'><a href="files/critcl_iassoc.html">critcl::iassoc</a></td>
+<td class="#doctools_tocright">CriTcl - Code Gen - Tcl Interp Associations</td>
+</tr>
+<tr class="#doctools_toceven" >
+<td class="#doctools_tocleft" ><a name='critcl_literals'><a href="files/critcl_literals.html">critcl::literals</a></td>
+<td class="#doctools_tocright">CriTcl - Code Gen - Constant string pools</td>
+</tr>
+<tr class="#doctools_tocodd"  >
+<td class="#doctools_tocleft" ><a name='critcl_util'><a href="files/critcl_util.html">critcl::util</a></td>
+<td class="#doctools_tocright">CriTcl - Utilities</td>
+</tr>
+<tr class="#doctools_toceven" >
+<td class="#doctools_tocleft" ><a name='critcl_application'><a href="files/critcl_application.html">critcl_application</a></td>
+<td class="#doctools_tocright">CriTcl Application Reference</td>
+</tr>
+<tr class="#doctools_tocodd"  >
+<td class="#doctools_tocleft" ><a name='critcl_application_package'><a href="files/critcl_application_package.html">critcl_application_package</a></td>
+<td class="#doctools_tocright">CriTcl Application Package Reference</td>
+</tr>
+<tr class="#doctools_toceven" >
+<td class="#doctools_tocleft" ><a name='critcl_build_tool'><a href="files/critcl_build.html">critcl_build_tool</a></td>
+<td class="#doctools_tocright">CriTcl build.tcl Tool Reference</td>
+</tr>
+<tr class="#doctools_tocodd"  >
+<td class="#doctools_tocleft" ><a name='critcl_changes'><a href="files/critcl_changes.html">critcl_changes</a></td>
+<td class="#doctools_tocright">CriTcl Releases &amp; Changes</td>
+</tr>
+<tr class="#doctools_toceven" >
+<td class="#doctools_tocleft" ><a name='critcl_cproc_types'><a href="files/critcl_cproc.html">critcl_cproc_types</a></td>
+<td class="#doctools_tocright">CriTcl cproc Type Reference</td>
+</tr>
+<tr class="#doctools_tocodd"  >
+<td class="#doctools_tocleft" ><a name='critcl_devguide'><a href="files/critcl_devguide.html">critcl_devguide</a></td>
+<td class="#doctools_tocright">Guide To The CriTcl Internals</td>
+</tr>
+<tr class="#doctools_toceven" >
+<td class="#doctools_tocleft" ><a name='critcl_howto_install'><a href="files/critcl_howto_install.html">critcl_howto_install</a></td>
+<td class="#doctools_tocright">How To Install CriTcl</td>
+</tr>
+<tr class="#doctools_tocodd"  >
+<td class="#doctools_tocleft" ><a name='critcl_howto_sources'><a href="files/critcl_howto_sources.html">critcl_howto_sources</a></td>
+<td class="#doctools_tocright">How To Get The CriTcl Sources</td>
+</tr>
+<tr class="#doctools_toceven" >
+<td class="#doctools_tocleft" ><a name='critcl_howto_use'><a href="files/critcl_howto_use.html">critcl_howto_use</a></td>
+<td class="#doctools_tocright">How To Use CriTcl</td>
+</tr>
+<tr class="#doctools_tocodd"  >
+<td class="#doctools_tocleft" ><a name='critcl_license'><a href="files/critcl_license.html">critcl_license</a></td>
+<td class="#doctools_tocright">The CriTcl License</td>
+</tr>
+<tr class="#doctools_toceven" >
+<td class="#doctools_tocleft" ><a name='critcl_package'><a href="files/critcl_package.html">critcl_package</a></td>
+<td class="#doctools_tocright">CriTcl Package Reference</td>
+</tr>
+<tr class="#doctools_tocodd"  >
+<td class="#doctools_tocleft" ><a name='critcl_tcl9'><a href="files/critcl_tcl9.html">critcl_tcl9</a></td>
+<td class="#doctools_tocright">How To Adapt Critcl Packages for Tcl 9</td>
+</tr>
+</table>
+</dd></dl><hr></body></html>
diff --git a/src/vfs/critcl.vfs/examples/argtype/build.tcl b/src/vfs/critcl.vfs/examples/argtype/build.tcl
new file mode 100644
index 00000000..4f20b9da
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/argtype/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {clist}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug build of package.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/argtype/cr.tcl b/src/vfs/critcl.vfs/examples/argtype/cr.tcl
new file mode 100644
index 00000000..1a836479
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/argtype/cr.tcl
@@ -0,0 +1,47 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "here:            [pwd]"
+puts "sourced:         [file normalize ../../lib/critcl/critcl.tcl]"
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/argtype/example.tcl b/src/vfs/critcl.vfs/examples/argtype/example.tcl
new file mode 100644
index 00000000..564142c4
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/argtype/example.tcl
@@ -0,0 +1,4 @@
+package require Tcl 8.6
+
+ex critcl::ArgumentConversion {int > 0}
+ex critcl::ArgumentConversion {double <= 0}
diff --git a/src/vfs/critcl.vfs/examples/argtypes-ingress/build.tcl b/src/vfs/critcl.vfs/examples/argtypes-ingress/build.tcl
new file mode 100644
index 00000000..05c87e96
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/argtypes-ingress/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {variadic}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/argtypes-ingress/cr.tcl b/src/vfs/critcl.vfs/examples/argtypes-ingress/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/argtypes-ingress/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/argtypes-ingress/example.tcl b/src/vfs/critcl.vfs/examples/argtypes-ingress/example.tcl
new file mode 100644
index 00000000..10f28300
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/argtypes-ingress/example.tcl
@@ -0,0 +1,39 @@
+#!/usr/bin/env tclsh
+
+package require Tcl 8.6
+package require ingress
+
+# Main point is checking that all the conversions of all
+# (non-deprecated) builtin argument types generate code which compiles
+# without errors or even warnings.
+#
+# The command names match the type names.
+
+ex boolean   true
+ex int       0
+ex long      0
+ex wideint   0
+
+ex double    0
+ex float     0
+
+ex char*     string	;# const!?
+ex pstring   pstring
+ex bytes     bytearray
+
+ex bytearray bytearray ;# deprecated
+
+ex Tcl_Obj*  an-object
+ex list      {a list}
+
+ex channel   stdout
+
+foreach t {int long wideint double float} {
+    foreach {r v} {
+	{> 0} 1	    {>= 0} 0	    {> 1} 2	    {>= 1} 1
+	{< 0} -1    {<= 0} 0	    {< 1} 0	    {<= 1} 1
+    } {
+	set type "$t $r"
+	ex $type $v
+    }
+}
diff --git a/src/vfs/critcl.vfs/examples/argtypes-ingress/ingress.tcl b/src/vfs/critcl.vfs/examples/argtypes-ingress/ingress.tcl
new file mode 100644
index 00000000..a3f86f83
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/argtypes-ingress/ingress.tcl
@@ -0,0 +1,60 @@
+# ingress.tcl --
+#
+#	A template demonstrating the handling of all (non-deprecated)
+#	argument types to cproc.
+#
+# Copyright (c) 2020,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::config keepsrc 1
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+critcl::summary {Ingress of arguments for cproc}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare various
+    argument types to cproc.
+}
+
+critcl::subject demonstration {cproc argument types}
+#critcl::config lines 0
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+# general types
+foreach type {
+    boolean int long wideint
+    double float
+    char* pstring bytes bytearray
+    Tcl_Obj* list
+    channel
+} {
+    critcl::cproc $type [list $type x] void {}
+    # variadic - triggered by `args` argument name
+    #critcl::cproc variadic-$type [list $type args] void {}
+}
+
+# constrained types
+foreach t {int long wideint double float} {
+    foreach {r v} {
+	{> 0} 1	    {>= 0} 0	    {> 1} 2	    {>= 1} 1
+	{< 0} -1    {<= 0} 0	    {< 1} 0	    {<= 1} 1
+    } {
+	set type "$t $r"
+	critcl::cproc $type [list $type x] void {}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide ingress 1
diff --git a/src/vfs/critcl.vfs/examples/bitmap/bitmap.tcl b/src/vfs/critcl.vfs/examples/bitmap/bitmap.tcl
new file mode 100644
index 00000000..6cf1243b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/bitmap/bitmap.tcl
@@ -0,0 +1,66 @@
+# bitmap.tcl --
+#
+#	A template demonstrating the handling of bitmap conversions.
+#
+# Copyright (c) 2014,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl            8.6
+package require critcl         3.2
+package require critcl::bitmap 1
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Bitmap conversion}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare a bitmap
+    converter and use it in cproc's or ccommand's.
+}
+
+critcl::subject demonstration {bitmap conversion} {encode bitmap} \
+    {decode bitmap} {convert bitmap}
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::bitmap::def demo {
+    global 1
+    exact  2
+    filler 4
+}
+
+critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* flags} int {
+    int mask;
+    demo_encode (ip, flags, &mask);
+    return mask;
+}
+
+critcl::cproc decode {Tcl_Interp* ip int mask} object {
+    Tcl_Obj* res = demo_decode (ip, mask);
+    Tcl_IncrRefCount (res);
+    return res;
+}
+
+# Encode hidden in the argtype.
+critcl::cproc xencode {Tcl_Interp* ip demo flags} int {
+    return flags;
+}
+
+# Decode hidden in the resultype
+critcl::cproc xdecode {Tcl_Interp* ip int mask} demo {
+    return mask;
+}
+
+# encode {exact filler} => 6
+# decode 5              => {global filler}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide bitmap 1
diff --git a/src/vfs/critcl.vfs/examples/bitmap/build.tcl b/src/vfs/critcl.vfs/examples/bitmap/build.tcl
new file mode 100644
index 00000000..d96ffdd2
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/bitmap/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {bitmap}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/bitmap/cr.tcl b/src/vfs/critcl.vfs/examples/bitmap/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/bitmap/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/bitmap/example.tcl b/src/vfs/critcl.vfs/examples/bitmap/example.tcl
new file mode 100644
index 00000000..b9e2a447
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/bitmap/example.tcl
@@ -0,0 +1,6 @@
+#!/usr/bin/env tclsh
+
+ex encode {exact filler}
+ex decode 5
+ex xencode global
+ex xdecode 6
diff --git a/src/vfs/critcl.vfs/examples/build.tcl b/src/vfs/critcl.vfs/examples/build.tcl
new file mode 100644
index 00000000..9666136e
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/build.tcl
@@ -0,0 +1,15 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set selfdir [file dirname [file normalize [info script]]]
+set self    [file tail [info script]]
+
+# Run the build code in the sub-directories, passing any arguments.
+
+puts ""
+foreach b [glob -directory $selfdir */$self] {
+    puts "$b _______________________________________________"
+    eval [linsert $argv 0 exec 2>@ stderr >@ stdout [info nameofexecutable] $b]
+    puts ""
+    puts ""
+}
diff --git a/src/vfs/critcl.vfs/examples/clist/build.tcl b/src/vfs/critcl.vfs/examples/clist/build.tcl
new file mode 100644
index 00000000..4f20b9da
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/clist/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {clist}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug build of package.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/clist/clist.tcl b/src/vfs/critcl.vfs/examples/clist/clist.tcl
new file mode 100644
index 00000000..47a7bb9a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/clist/clist.tcl
@@ -0,0 +1,277 @@
+# clist.tcl --
+#
+#	Set of list processing primitives. A Tcl companion file is then
+#	used to provide structure on top, here, an ensemble command.
+#
+# Copyright (c) 2011,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# Example of using a Tcl companion file to put a layer of structure
+# (and/or policy) on top of a set of C primitives.
+#
+# Here: Export of the primitives as an ensemble.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.6
+package require critcl 3.2
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::tcl 8.6
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Extended list processing command.}
+
+critcl::description {
+    This package implements an ensemble command providing
+    additional list processing functionality, like map, filter,
+    etc.
+}
+
+critcl::subject {list processing} {extended list processing}
+critcl::subject map foldl filter
+critcl::subject {list map} {list foldl} {list filter}
+
+# # ## ### ##### ######## ############# #####################
+## Configuration
+
+critcl::tsources clist_tcl.tcl
+
+# # ## ### ##### ######## ############# #####################
+## Implementation.
+##
+## NOTE: This code is 8.4 based and not NRE ready.
+
+namespace eval ::clist {}
+
+# # ## ### ##### ######## ############# #####################
+
+critcl::cproc ::clist::map {
+    Tcl_Interp* interp
+    Tcl_Obj* cmdprefix
+    Tcl_Obj* list
+} Tcl_Obj* {
+    /* Equivalent to the following Tcl code:
+     * -----------------------------------------------------
+     * set result {}
+     * foreach e $list { lappend result [{*}$cmdprefix $e] }
+     * return $result
+     * -----------------------------------------------------
+     * This is at its core a specialized fold operation.
+     * (initial value {}, operation 'list append')
+     */
+
+    Tcl_Obj** cv;
+    int       cc;
+
+    Tcl_Obj** lv;
+    int       lc;
+
+    Tcl_Obj** cmdv;
+    int       cmdc;
+
+    int k, code;
+    Tcl_Obj*  rlist;
+
+    if (Tcl_ListObjGetElements (interp, cmdprefix, &cc, &cv) != TCL_OK) {
+	return NULL;
+    }
+
+    if (Tcl_ListObjGetElements (interp, list, &lc, &lv) != TCL_OK) {
+	return NULL;
+    }
+
+    cmdc = cc + 1;
+    cmdv = (Tcl_Obj**) ckalloc (sizeof (Tcl_Obj*) * cmdc);
+
+    for (k = 0; k < cc; k++) { cmdv [k] = cv [k]; Tcl_IncrRefCount (cmdv [k]); }
+
+    rlist = Tcl_NewListObj (0, NULL);
+    Tcl_IncrRefCount (rlist);
+
+    for (k=0; k < lc; k++) {
+	cmdv [cc] = lv [k];
+	Tcl_IncrRefCount (cmdv [cc]);
+
+	code = Tcl_EvalObjv (interp, cmdc, cmdv, 0);
+
+	Tcl_DecrRefCount (cmdv [cc]);
+
+	if ((code != TCL_OK) ||
+	    (Tcl_ListObjAppendElement (interp, rlist, Tcl_GetObjResult (interp)) != TCL_OK)) {
+	    goto abort;
+	}
+    }
+
+done:
+    for (k=0; k < cc; k++) { Tcl_DecrRefCount (cmdv [k]); }
+    ckfree ((char*) cmdv);
+    return rlist;
+
+abort:
+    Tcl_DecrRefCount (rlist);
+    rlist = NULL;
+    goto done;
+}
+
+# # ## ### ##### ######## ############# #####################
+
+critcl::cproc ::clist::filter {
+    Tcl_Interp* interp
+    Tcl_Obj* cmdprefix
+    Tcl_Obj* list
+} Tcl_Obj* {
+    /* Equivalent to the following Tcl code:
+     * -----------------------------------------------------
+     * set result {}
+     * foreach e $list {
+     *     if {![{*}$cmdprefix $e]} continue;
+     *     lappend result $e
+     * }
+     * return $result
+     * -----------------------------------------------------
+     * This is at its core a specialized fold operation.
+     * (initial value {}, operation 'conditional list append')
+     */
+
+    Tcl_Obj** cv;
+    int       cc;
+
+    Tcl_Obj** lv;
+    int       lc;
+
+    Tcl_Obj** cmdv;
+    int       cmdc;
+
+    int k, code, keep;
+    Tcl_Obj*  rlist;
+
+    if (Tcl_ListObjGetElements (interp, cmdprefix, &cc, &cv) != TCL_OK) {
+	return NULL;
+    }
+
+    if (Tcl_ListObjGetElements (interp, list, &lc, &lv) != TCL_OK) {
+	return NULL;
+    }
+
+    cmdc = cc + 1;
+    cmdv = (Tcl_Obj**) ckalloc (sizeof (Tcl_Obj*) * cmdc);
+
+    for (k = 0; k < cc; k++) { cmdv [k] = cv [k]; Tcl_IncrRefCount (cmdv [k]); }
+
+    rlist = Tcl_NewListObj (0, NULL);
+    Tcl_IncrRefCount (rlist);
+
+    for (k=0; k < lc; k++) {
+	cmdv [cc] = lv [k];
+	Tcl_IncrRefCount (cmdv [cc]);
+
+	code = Tcl_EvalObjv (interp, cmdc, cmdv, 0);
+
+	Tcl_DecrRefCount (cmdv [cc]);
+
+	if ((code != TCL_OK) ||
+	    (Tcl_GetBooleanFromObj (interp, Tcl_GetObjResult (interp), &keep) != TCL_OK)) {
+	    goto abort;
+	}
+
+	if (keep &&
+	    (Tcl_ListObjAppendElement (interp, rlist, lv[k]) != TCL_OK)) {
+	    goto abort;
+	}
+    }
+
+done:
+    for (k=0; k < cc; k++) { Tcl_DecrRefCount (cmdv [k]); }
+    ckfree ((char*) cmdv);
+    return rlist;
+
+abort:
+    Tcl_DecrRefCount (rlist);
+    rlist = NULL;
+    goto done;
+}
+
+# # ## ### ##### ######## ############# #####################
+
+critcl::cproc ::clist::foldl {
+    Tcl_Interp* interp
+    Tcl_Obj* cmdprefix
+    Tcl_Obj* initial
+    Tcl_Obj* list
+} Tcl_Obj* {
+    /* Equivalent to the following Tcl code:
+     * -----------------------------------------------------
+     * set result $initial
+     * foreach e $list {
+     *     set result [{*}$cmdprefix $result $e]
+     * }
+     * return $result
+     * -----------------------------------------------------
+     */
+
+    Tcl_Obj** cv;
+    int       cc;
+
+    Tcl_Obj** lv;
+    int       lc;
+
+    Tcl_Obj** cmdv;
+    int       cmdc;
+
+    int k, code, keep;
+    Tcl_Obj*  result;
+
+    if (Tcl_ListObjGetElements (interp, cmdprefix, &cc, &cv) != TCL_OK) {
+	return NULL;
+    }
+
+    if (Tcl_ListObjGetElements (interp, list, &lc, &lv) != TCL_OK) {
+	return NULL;
+    }
+
+    cmdc = cc + 2;
+    cmdv = (Tcl_Obj**) ckalloc (sizeof (Tcl_Obj*) * cmdc);
+
+    for (k = 0; k < cc; k++) { cmdv [k] = cv [k]; Tcl_IncrRefCount (cmdv [k]); }
+
+    result = Tcl_DuplicateObj (initial);
+    Tcl_IncrRefCount (result);
+
+    for (k=0; k < lc; k++) {
+	cmdv [cc]   = result;
+	cmdv [cc+1] = lv [k];
+
+	Tcl_IncrRefCount (cmdv [cc]);
+	Tcl_IncrRefCount (cmdv [cc+1]);
+
+	code = Tcl_EvalObjv (interp, cmdc, cmdv, 0);
+
+	Tcl_DecrRefCount (cmdv [cc]);
+	Tcl_DecrRefCount (cmdv [cc+1]);
+
+	if (code != TCL_OK) {
+	    goto abort;
+	}
+
+	Tcl_DecrRefCount (result);
+	result = Tcl_GetObjResult (interp);
+	Tcl_IncrRefCount (result);
+    }
+
+done:
+    for (k=0; k < cc; k++) { Tcl_DecrRefCount (cmdv [k]); }
+    ckfree ((char*) cmdv);
+    return result;
+
+abort:
+    Tcl_DecrRefCount (result);
+    result = NULL;
+    goto done;
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide clist 1
diff --git a/src/vfs/critcl.vfs/examples/clist/clist_tcl.tcl b/src/vfs/critcl.vfs/examples/clist/clist_tcl.tcl
new file mode 100644
index 00000000..cc4c227a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/clist/clist_tcl.tcl
@@ -0,0 +1,27 @@
+# clist_tcl.tcl --
+#
+#	Tcl companion file to clist. Takes the primitives exported
+#	by the C parts and arranges them into a nice and proper
+#	ensemble command.
+#
+# Copyright (c) 2011,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# Example of using a Tcl companion file to put a layer of structure
+# (and/or policy) on top of a set of C primitives.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements.
+
+# See clist.tcl
+
+# # ## ### ##### ######## ############# #####################
+## Implementation.
+
+namespace eval ::clist {
+    namespace export map foldl filter
+    namespace ensemble create
+}
+
+# ### ### ### ######### ######### #########
+## OK
+
diff --git a/src/vfs/critcl.vfs/examples/clist/cr.tcl b/src/vfs/critcl.vfs/examples/clist/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/clist/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/clist/example.tcl b/src/vfs/critcl.vfs/examples/clist/example.tcl
new file mode 100644
index 00000000..67e63a75
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/clist/example.tcl
@@ -0,0 +1,21 @@
+
+package require Tcl 8.6
+package require lambda
+
+# Force compile and load.
+catch {clist::map}
+
+# squares
+ex clist map [lambda {x} {
+    expr {$x * $x}
+}] {0 1 2 3 4 5  6 7 8 9}
+
+# filter out even numbers <=> select odd numbers
+ex ::clist::filter [lambda {x} {
+    expr {$x % 2}
+}] {0 1 2 3 4 5  6 7 8 9}
+
+# sum
+ex ::clist foldl [lambda {a x} {
+    expr {$a + $x}
+}] 0 {0 1 2 3 4 5  6 7 8 9}
diff --git a/src/vfs/critcl.vfs/examples/cr.tcl b/src/vfs/critcl.vfs/examples/cr.tcl
new file mode 100644
index 00000000..1a733102
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/cr.tcl
@@ -0,0 +1,21 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+
+set selfdir [file dirname [file normalize [info script]]]
+set self    [file tail [info script]]
+
+set pattern [lindex $argv 0]
+if {$pattern eq ""} {
+    set pattern *
+}
+# Perform "compile & run" in the sub-directories.
+
+puts ""
+foreach cr [lsort -dict [glob -directory $selfdir $pattern/$self]] {
+    puts "$cr _______________________________________________"
+    catch {
+	eval [list exec 2>@ stderr >@ stdout [info nameofexecutable] $cr]
+    }
+    puts ""
+    puts ""
+}
diff --git a/src/vfs/critcl.vfs/examples/emap-both/build.tcl b/src/vfs/critcl.vfs/examples/emap-both/build.tcl
new file mode 100644
index 00000000..2194338f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emap-both/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {emap-both}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/emap-both/cr.tcl b/src/vfs/critcl.vfs/examples/emap-both/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emap-both/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/emap-both/emap-both.tcl b/src/vfs/critcl.vfs/examples/emap-both/emap-both.tcl
new file mode 100644
index 00000000..17ff52c2
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emap-both/emap-both.tcl
@@ -0,0 +1,71 @@
+# emap_ex.tcl --
+#
+#	A template demonstrating the handling of emap conversions.
+#
+# Copyright (c) 2014,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl          8.6
+package require critcl       3.1.11
+package require critcl::emap 1
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Bitmap conversion}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare an emap
+    converter and use it in cproc's or ccommand's.
+}
+
+critcl::subject demonstration {emap conversion} {encode emap} \
+    {decode emap} {convert emap}
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::ccode {
+    #define STATE_INIT 0
+    #define STATE_MIX  1
+    #define STATE_DONE 2
+}
+
+critcl::emap::def demo {
+    init STATE_INIT
+    mix  STATE_MIX
+    done STATE_DONE
+} -mode {c tcl}
+# Add -nocase as last argument for case-insensitive Tcl strings.
+
+critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* state} int {
+    return demo_encode_cstr (Tcl_GetString(state));
+}
+
+critcl::cproc decode {Tcl_Interp* ip int scode} object {
+    Tcl_Obj* res = Tcl_NewStringObj (demo_decode_cstr (scode), -1);
+    if (res) { Tcl_IncrRefCount (res); }
+    return res;
+}
+
+# Encode hidden in the argtype.
+critcl::cproc xencode {Tcl_Interp* ip demo state} int {
+    return state;
+}
+
+# Decode hidden in the resultype
+critcl::cproc xdecode {Tcl_Interp* ip int state} demo {
+    return state;
+}
+
+# encode {exact filler} => 6
+# decode 5              => {global filler}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide emap-both 1
diff --git a/src/vfs/critcl.vfs/examples/emap-both/example.tcl b/src/vfs/critcl.vfs/examples/emap-both/example.tcl
new file mode 100644
index 00000000..88ffff3d
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emap-both/example.tcl
@@ -0,0 +1,16 @@
+
+package require emap-both
+
+ex encode  mix  ;# 1
+ex xencode done ;# 2
+
+ex decode  0 ;# init
+ex xdecode 1 ;# mix
+
+ex encode  foo
+ex xencode bar
+ex decode  55
+ex xdecode -2
+
+ex xencode MIX
+
diff --git a/src/vfs/critcl.vfs/examples/emap-c/build.tcl b/src/vfs/critcl.vfs/examples/emap-c/build.tcl
new file mode 100644
index 00000000..be055461
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emap-c/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {emap-c}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/emap-c/cr.tcl b/src/vfs/critcl.vfs/examples/emap-c/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emap-c/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/emap-c/emap-c.tcl b/src/vfs/critcl.vfs/examples/emap-c/emap-c.tcl
new file mode 100644
index 00000000..51ca83fe
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emap-c/emap-c.tcl
@@ -0,0 +1,61 @@
+# emap_ex.tcl --
+#
+#	A template demonstrating the handling of emap conversions.
+#
+# Copyright (c) 2014,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl          8.6
+package require critcl       3.1.11
+package require critcl::emap 1
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Bitmap conversion}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare an emap
+    converter and use it in cproc's or ccommand's.
+}
+
+critcl::subject demonstration {emap conversion} {encode emap} \
+    {decode emap} {convert emap}
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::ccode {
+    #define STATE_INIT 0
+    #define STATE_MIX  1
+    #define STATE_DONE 2
+}
+
+critcl::emap::def demo {
+    init STATE_INIT
+    mix  STATE_MIX
+    done STATE_DONE
+} -mode c
+# Add -nocase as last argument for case-insensitive Tcl strings.
+
+critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* state} int {
+    return demo_encode_cstr (Tcl_GetString(state));
+}
+
+critcl::cproc decode {Tcl_Interp* ip int scode} object {
+    Tcl_Obj* res = Tcl_NewStringObj (demo_decode_cstr (scode), -1);
+    if (res) { Tcl_IncrRefCount (res); }
+    return res;
+}
+
+# encode {exact filler} => 6
+# decode 5              => {global filler}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide emap-c 1
diff --git a/src/vfs/critcl.vfs/examples/emap-c/example.tcl b/src/vfs/critcl.vfs/examples/emap-c/example.tcl
new file mode 100644
index 00000000..bfe7341a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emap-c/example.tcl
@@ -0,0 +1,8 @@
+
+package require emap-c
+
+ex encode  mix  ;# 1
+ex encode  foo
+
+ex decode  0 ;# init
+ex decode  55
diff --git a/src/vfs/critcl.vfs/examples/emap/build.tcl b/src/vfs/critcl.vfs/examples/emap/build.tcl
new file mode 100644
index 00000000..48ca964c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emap/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {emap}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/emap/cr.tcl b/src/vfs/critcl.vfs/examples/emap/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emap/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/emap/emap-ex.tcl b/src/vfs/critcl.vfs/examples/emap/emap-ex.tcl
new file mode 100644
index 00000000..d108f2e8
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emap/emap-ex.tcl
@@ -0,0 +1,75 @@
+# emap_ex.tcl --
+#
+#	A template demonstrating the handling of emap conversions.
+#
+# Copyright (c) 2014,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl          8.6
+package require critcl       3.1.11
+package require critcl::emap 1
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Bitmap conversion}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare an emap
+    converter and use it in cproc's or ccommand's.
+}
+
+critcl::subject demonstration {emap conversion} {encode emap} \
+    {decode emap} {convert emap}
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::ccode {
+    #define STATE_INIT 0
+    #define STATE_MIX  1
+    #define STATE_DONE 2
+}
+
+critcl::emap::def demo {
+    init STATE_INIT
+    mix  STATE_MIX
+    done STATE_DONE
+}
+# Add -nocase as last argument for case-insensitive Tcl strings.
+
+critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* state} int {
+    int scode;
+    if (demo_encode (ip, state, &scode) != TCL_OK) {
+	return -1;
+    }
+    return scode;
+}
+
+critcl::cproc decode {Tcl_Interp* ip int scode} object {
+    Tcl_Obj* res = demo_decode (ip, scode);
+    if (res) { Tcl_IncrRefCount (res); }
+    return res;
+}
+
+# Encode hidden in the argtype.
+critcl::cproc xencode {Tcl_Interp* ip demo state} int {
+    return state;
+}
+
+# Decode hidden in the resultype
+critcl::cproc xdecode {Tcl_Interp* ip int state} demo {
+    return state;
+}
+
+# encode {exact filler} => 6
+# decode 5              => {global filler}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide emap 1
diff --git a/src/vfs/critcl.vfs/examples/emap/example.tcl b/src/vfs/critcl.vfs/examples/emap/example.tcl
new file mode 100644
index 00000000..b18d2f06
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emap/example.tcl
@@ -0,0 +1,16 @@
+
+package require emap
+
+ex encode  mix  ;# 1
+ex xencode done ;# 2
+
+ex decode  0 ;# init
+ex xdecode 1 ;# mix
+
+ex encode  foo
+ex xencode bar
+ex decode  55
+ex xdecode -2
+
+ex xencode MIX
+
diff --git a/src/vfs/critcl.vfs/examples/emapint-both/build.tcl b/src/vfs/critcl.vfs/examples/emapint-both/build.tcl
new file mode 100644
index 00000000..06667d80
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emapint-both/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {emapint-both}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/emapint-both/cr.tcl b/src/vfs/critcl.vfs/examples/emapint-both/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emapint-both/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/emapint-both/emapint-both.tcl b/src/vfs/critcl.vfs/examples/emapint-both/emapint-both.tcl
new file mode 100644
index 00000000..2e68c4dd
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emapint-both/emapint-both.tcl
@@ -0,0 +1,70 @@
+# emap_ex.tcl --
+#
+#	A template demonstrating the handling of emap conversions.
+#
+# Copyright (c) 2014,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl          8.6
+package require critcl       3.1.11
+package require critcl::emap 1
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Bitmap conversion}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare an emap
+    converter and use it in cproc's or ccommand's.
+}
+
+critcl::subject demonstration {emap conversion} {encode emap} \
+    {decode emap} {convert emap}
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::emap::def demo {
+    init  0
+    start 0
+    mix   1
+    final 2
+    done  2
+} -nocase -mode {c tcl}
+# Add
+#    loop  5
+# to the spec to see an example with a hole in the code sequence.
+# Append -nocase as last arg to make encoding case-insensitive.
+
+critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* state} int {
+    return demo_encode_cstr (Tcl_GetString(state));
+}
+
+critcl::cproc decode {Tcl_Interp* ip int scode} object {
+    Tcl_Obj* res = Tcl_NewStringObj (demo_decode_cstr (scode), -1);
+    if (res) { Tcl_IncrRefCount (res); }
+    return res;
+}
+
+# Encode hidden in the argtype.
+critcl::cproc xencode {Tcl_Interp* ip demo state} int {
+    return state;
+}
+
+# Decode hidden in the resultype
+critcl::cproc xdecode {Tcl_Interp* ip int state} demo {
+    return state;
+}
+
+# encode {exact filler} => 6
+# decode 5              => {global filler}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide emapint-both 1
diff --git a/src/vfs/critcl.vfs/examples/emapint-both/example.tcl b/src/vfs/critcl.vfs/examples/emapint-both/example.tcl
new file mode 100644
index 00000000..0227f8ad
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emapint-both/example.tcl
@@ -0,0 +1,16 @@
+
+package require emapint-both
+
+ex encode  mix  ;# 1
+ex xencode done ;# 2
+
+ex decode  0 ;# init
+ex xdecode 1 ;# mix
+
+ex encode  foo
+ex xencode bar
+ex decode  55
+ex decode  4
+ex xdecode -2
+ex xdecode 4
+ex xencode MIX
diff --git a/src/vfs/critcl.vfs/examples/emapint-c/build.tcl b/src/vfs/critcl.vfs/examples/emapint-c/build.tcl
new file mode 100644
index 00000000..462b2d3b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emapint-c/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {emapint-c}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/emapint-c/cr.tcl b/src/vfs/critcl.vfs/examples/emapint-c/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emapint-c/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/emapint-c/emapint-c.tcl b/src/vfs/critcl.vfs/examples/emapint-c/emapint-c.tcl
new file mode 100644
index 00000000..bbabfe8a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emapint-c/emapint-c.tcl
@@ -0,0 +1,60 @@
+# emap_ex.tcl --
+#
+#	A template demonstrating the handling of emap conversions.
+#
+# Copyright (c) 2014,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl          8.6
+package require critcl       3.2
+package require critcl::emap 1
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Bitmap conversion}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare an emap
+    converter and use it in cproc's or ccommand's.
+}
+
+critcl::subject demonstration {emap conversion} {encode emap} \
+    {decode emap} {convert emap}
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::emap::def demo {
+    init  0
+    start 0
+    mix   1
+    final 2
+    done  2
+} -nocase -mode c
+# Add
+#    loop  5
+# to the spec to see an example with a hole in the code sequence.
+# Append -nocase as last arg to make encoding case-insensitive.
+
+critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* state} int {
+    return demo_encode_cstr (Tcl_GetString(state));
+}
+
+critcl::cproc decode {Tcl_Interp* ip int scode} object {
+    Tcl_Obj* res = Tcl_NewStringObj (demo_decode_cstr (scode), -1);
+    if (res) { Tcl_IncrRefCount (res); }
+    return res;
+}
+
+# encode {exact filler} => 6
+# decode 5              => {global filler}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide emapint-c 1
diff --git a/src/vfs/critcl.vfs/examples/emapint-c/example.tcl b/src/vfs/critcl.vfs/examples/emapint-c/example.tcl
new file mode 100644
index 00000000..94cf72e7
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emapint-c/example.tcl
@@ -0,0 +1,9 @@
+
+package require emapint-c
+
+ex encode  mix  ;# 1
+ex encode  foo
+
+ex decode  0 ;# init
+ex decode  55
+ex decode  4
diff --git a/src/vfs/critcl.vfs/examples/emapint/build.tcl b/src/vfs/critcl.vfs/examples/emapint/build.tcl
new file mode 100644
index 00000000..5f21fc19
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emapint/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {emapint}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/emapint/cr.tcl b/src/vfs/critcl.vfs/examples/emapint/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emapint/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/emapint/emapint.tcl b/src/vfs/critcl.vfs/examples/emapint/emapint.tcl
new file mode 100644
index 00000000..415ac929
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emapint/emapint.tcl
@@ -0,0 +1,74 @@
+# emap_ex.tcl --
+#
+#	A template demonstrating the handling of emap conversions.
+#
+# Copyright (c) 2014,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl          8.6
+package require critcl       3.2
+package require critcl::emap 1
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Bitmap conversion}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare an emap
+    converter and use it in cproc's or ccommand's.
+}
+
+critcl::subject demonstration {emap conversion} {encode emap} \
+    {decode emap} {convert emap}
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::emap::def demo {
+    init  0
+    start 0
+    mix   1
+    final 2
+    done  2
+} -nocase
+# Add
+#    loop  5
+# to the spec to see an example with a hole in the code sequence.
+# Append -nocase as last arg to make encoding case-insensitive.
+
+critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* state} int {
+    int scode;
+    if (demo_encode (ip, state, &scode) != TCL_OK) {
+	return -1;
+    }
+    return scode;
+}
+
+critcl::cproc decode {Tcl_Interp* ip int scode} object {
+    Tcl_Obj* res = demo_decode (ip, scode);
+    if (res) { Tcl_IncrRefCount (res); }
+    return res;
+}
+
+# Encode hidden in the argtype.
+critcl::cproc xencode {Tcl_Interp* ip demo state} int {
+    return state;
+}
+
+# Decode hidden in the resultype
+critcl::cproc xdecode {Tcl_Interp* ip int state} demo {
+    return state;
+}
+
+# encode {exact filler} => 6
+# decode 5              => {global filler}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide emapint 1
diff --git a/src/vfs/critcl.vfs/examples/emapint/example.tcl b/src/vfs/critcl.vfs/examples/emapint/example.tcl
new file mode 100644
index 00000000..0cea93a8
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/emapint/example.tcl
@@ -0,0 +1,16 @@
+
+package require emapint
+
+ex encode  mix  ;# 1
+ex xencode done ;# 2
+
+ex decode  0 ;# init
+ex xdecode 1 ;# mix
+
+ex encode  foo
+ex xencode bar
+ex decode  55
+ex decode  4
+ex xdecode -2
+ex xdecode 4
+ex xencode MIX
diff --git a/src/vfs/critcl.vfs/examples/enum-list/build.tcl b/src/vfs/critcl.vfs/examples/enum-list/build.tcl
new file mode 100644
index 00000000..d620f847
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/enum-list/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {enum}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/enum-list/cr.tcl b/src/vfs/critcl.vfs/examples/enum-list/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/enum-list/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/enum-list/enum.tcl b/src/vfs/critcl.vfs/examples/enum-list/enum.tcl
new file mode 100644
index 00000000..b38f4a68
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/enum-list/enum.tcl
@@ -0,0 +1,51 @@
+# enum.tcl --
+#
+#	A template demonstrating the handling of enum conversions.
+#	Configured for to allow multi-access returning a list
+#
+# Copyright (c) 2018,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl          8.6
+package require critcl       3.1.11
+package require critcl::enum 1.1
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Enum conversion}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare an enum
+    converter and use it in cproc's or ccommand's.
+}
+
+critcl::subject demonstration {enum conversion} {encode enum} \
+    {decode enum} {convert enum}
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::enum::def demo {
+    E_global global
+    E_exact  exact
+    E_filler filler
+} +list
+
+critcl::cproc decode {Tcl_Interp* ip int args} object {
+    Tcl_Obj* res = demo_ToObjList (ip, args.c, args.v);
+    Tcl_IncrRefCount (res);
+    return res;
+}
+
+# decode  2 => filler
+# decode  8 => panic, abort, core dump
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide enum 1
diff --git a/src/vfs/critcl.vfs/examples/enum-list/example.tcl b/src/vfs/critcl.vfs/examples/enum-list/example.tcl
new file mode 100644
index 00000000..d3a45045
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/enum-list/example.tcl
@@ -0,0 +1,5 @@
+
+ex decode  2
+ex decode  1 0 2
+
+#ex decode  8 => panic, abort, core dump
diff --git a/src/vfs/critcl.vfs/examples/enum/build.tcl b/src/vfs/critcl.vfs/examples/enum/build.tcl
new file mode 100644
index 00000000..d620f847
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/enum/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {enum}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/enum/cr.tcl b/src/vfs/critcl.vfs/examples/enum/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/enum/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/enum/enum.tcl b/src/vfs/critcl.vfs/examples/enum/enum.tcl
new file mode 100644
index 00000000..266cd436
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/enum/enum.tcl
@@ -0,0 +1,77 @@
+# bitmap.tcl --
+#
+#	A template demonstrating the handling of enum conversions.
+#
+# Copyright (c) 2014,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl          8.6
+package require critcl       3.1.11
+package require critcl::enum 1
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Enum conversion}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare an enum
+    converter and use it in cproc's or ccommand's.
+}
+
+critcl::subject demonstration {enum conversion} {encode enum} \
+    {decode enum} {convert enum}
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::enum::def demo {
+    E_global global
+    E_exact  exact
+    E_filler filler
+}
+
+critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* str} int {
+    int val;
+    demo_GetFromObj (ip, str, 0, &val);
+    return val;
+}
+
+critcl::cproc decode {Tcl_Interp* ip int val} object {
+    Tcl_Obj* res = demo_ToObj (ip, val);
+    Tcl_IncrRefCount (res);
+    return res;
+}
+
+# Encode hidden in the argtype.
+critcl::cproc xencode {Tcl_Interp* ip demo str} int {
+    return str;
+}
+
+# Encode hidden in the argtype.
+critcl::cproc xencode-p {Tcl_Interp* ip demo-prefix str} int {
+    return str;
+}
+
+# Decode hidden in the resultype
+critcl::cproc xdecode {Tcl_Interp* ip int val} demo {
+    return val;
+}
+
+# encode    exact  => 1
+# xencode   filler => 2
+# xencode-p glob   => 0
+# xencode   glob   => /error/
+
+# decode  2 => filler
+# xdecode 0 => global
+# decode  8 => panic, abort, core dump
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide enum 1
diff --git a/src/vfs/critcl.vfs/examples/enum/example.tcl b/src/vfs/critcl.vfs/examples/enum/example.tcl
new file mode 100644
index 00000000..402996e3
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/enum/example.tcl
@@ -0,0 +1,11 @@
+
+ex encode    exact
+ex xencode   filler
+ex xencode-p glob
+ex xencode   glob
+
+ex decode  2
+ex xdecode 0
+
+#ex decode  8 => panic, abort, core dump
+#ex xdecode 8 ditto
diff --git a/src/vfs/critcl.vfs/examples/icounter/build.tcl b/src/vfs/critcl.vfs/examples/icounter/build.tcl
new file mode 100644
index 00000000..4209066f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/icounter/build.tcl
@@ -0,0 +1,287 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {icounter}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall all packages, build for debugging.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -keep -debug symbols -cache [pwd]/BUILD.$p -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/icounter/cr.tcl b/src/vfs/critcl.vfs/examples/icounter/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/icounter/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/icounter/example.tcl b/src/vfs/critcl.vfs/examples/icounter/example.tcl
new file mode 100644
index 00000000..db048941
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/icounter/example.tcl
@@ -0,0 +1,6 @@
+
+# Force compile and load.
+catch {icounter 4}
+
+ex icounter 0
+ex ::icounter -1
diff --git a/src/vfs/critcl.vfs/examples/icounter/icounter.tcl b/src/vfs/critcl.vfs/examples/icounter/icounter.tcl
new file mode 100644
index 00000000..866f3c29
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/icounter/icounter.tcl
@@ -0,0 +1,54 @@
+# icounter.tcl --
+#
+#       Implementation of a counter associated with an interpreter.
+#       This code based on critcl v3.1, API compatible to the PTI [x].
+#       [x] Pure Tcl Implementation.
+#
+# Copyright (c) 2012,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::buildrequirement {
+    package require critcl::iassoc ; # Maintain an interpreter association.
+}
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} {BSD licensed}
+
+critcl::summary {Per interpreter global counters.}
+
+critcl::description {
+    This package implements a per-interpreter counter.
+}
+
+critcl::subject counter
+
+# # ## ### ##### ######## ############# #####################
+## Define and maintain the per-interp structure.
+
+critcl::iassoc::def icounter {int base} {
+    int counter; /* The counter variable */
+} {
+    data->counter = base;
+} {
+    /* Nothing to release */
+}
+
+# # ## ### ##### ######## ############# #####################
+## Access and expose the per-interp structure to scripts.
+
+critcl::cproc icounter {Tcl_Interp* interp int base} int {
+    icounter_data d = icounter (interp, base);
+    d->counter ++;
+    return d->counter;
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide icounter 1
diff --git a/src/vfs/critcl.vfs/examples/lit-both/build.tcl b/src/vfs/critcl.vfs/examples/lit-both/build.tcl
new file mode 100644
index 00000000..f013ee5d
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/lit-both/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {pool}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/lit-both/cr.tcl b/src/vfs/critcl.vfs/examples/lit-both/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/lit-both/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/lit-both/example.tcl b/src/vfs/critcl.vfs/examples/lit-both/example.tcl
new file mode 100644
index 00000000..81030771
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/lit-both/example.tcl
@@ -0,0 +1,6 @@
+
+# Force compile and load.
+catch {str}
+
+ex str  1
+ex cstr 2
diff --git a/src/vfs/critcl.vfs/examples/lit-both/pool.tcl b/src/vfs/critcl.vfs/examples/lit-both/pool.tcl
new file mode 100644
index 00000000..985085b9
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/lit-both/pool.tcl
@@ -0,0 +1,57 @@
+# pool.tcl --
+#
+#	A template demonstrating the handling of string/literal pools.
+#
+# Copyright (c) 2014,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl              8.6
+package require critcl           3.2
+package require critcl::literals 1.1 ;# result-type
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {String pools}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare a shared
+    string pool and use it in cproc's or ccommand's
+}
+
+critcl::subject demonstration {string pool} {literal pool} \
+    {shared strings} {shared literals}
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::literals::def demo {
+    here  "here"
+    comes "comes"
+    the   "the"
+    sun   "sun"
+} {c tcl}
+
+critcl::cproc str {Tcl_Interp* ip int code} object {
+    Tcl_Obj* res = demo (ip, code);
+    Tcl_IncrRefCount (res);
+    return res;
+}
+
+critcl::cproc cstr {Tcl_Interp* ip int code} object {
+    Tcl_Obj* res = Tcl_NewStringObj (demo_cstr (code), -1);
+    Tcl_IncrRefCount (res);
+    return res;
+}
+
+# str 0
+# str 7 - panic, abort, core dump
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide pool 1
diff --git a/src/vfs/critcl.vfs/examples/lit-c/build.tcl b/src/vfs/critcl.vfs/examples/lit-c/build.tcl
new file mode 100644
index 00000000..f013ee5d
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/lit-c/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {pool}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/lit-c/cr.tcl b/src/vfs/critcl.vfs/examples/lit-c/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/lit-c/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/lit-c/example.tcl b/src/vfs/critcl.vfs/examples/lit-c/example.tcl
new file mode 100644
index 00000000..de5c587a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/lit-c/example.tcl
@@ -0,0 +1,5 @@
+
+# Force compile and load.
+catch {str}
+
+ex str 3
diff --git a/src/vfs/critcl.vfs/examples/lit-c/pool.tcl b/src/vfs/critcl.vfs/examples/lit-c/pool.tcl
new file mode 100644
index 00000000..8194b0aa
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/lit-c/pool.tcl
@@ -0,0 +1,57 @@
+# pool.tcl --
+#
+#	A template demonstrating the handling of string/literal pools.
+#	Configured for C access, no wrappers for Tcl.
+#
+# Copyright (c) 2014-2017,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl              8.6
+package require critcl           3.2
+package require critcl::literals 1.2 ;# result-type
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {String pools}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare a shared
+    string pool and use it in cproc's or ccommand's
+}
+
+critcl::subject demonstration \
+    {string pool} \
+    {literal pool} \
+    {shared strings} \
+    {shared literals}
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::literals::def demo {
+    here  "here"
+    comes "comes"
+    the   "the"
+    sun   "sun"
+} c
+
+critcl::cproc str {Tcl_Interp* ip int code} object {
+    Tcl_Obj* res = Tcl_NewStringObj (demo_cstr (code), -1);
+    Tcl_IncrRefCount (res);
+    return res;
+}
+
+# str 0
+# str 7 - panic, abort, core dump
+
+# # ## ### ##### ######## ############# #####################
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide pool 1
diff --git a/src/vfs/critcl.vfs/examples/lit-list/build.tcl b/src/vfs/critcl.vfs/examples/lit-list/build.tcl
new file mode 100644
index 00000000..f013ee5d
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/lit-list/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {pool}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/lit-list/cr.tcl b/src/vfs/critcl.vfs/examples/lit-list/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/lit-list/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/lit-list/example.tcl b/src/vfs/critcl.vfs/examples/lit-list/example.tcl
new file mode 100644
index 00000000..725bc8bd
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/lit-list/example.tcl
@@ -0,0 +1,6 @@
+
+# Force compile and load.
+catch {str}
+
+ex strs 2
+ex strs 3 0 1
diff --git a/src/vfs/critcl.vfs/examples/lit-list/pool.tcl b/src/vfs/critcl.vfs/examples/lit-list/pool.tcl
new file mode 100644
index 00000000..e42a6995
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/lit-list/pool.tcl
@@ -0,0 +1,54 @@
+# pool.tcl --
+#
+#	A template demonstrating the handling of string/literal pools.
+#	Configured for multi-access
+#
+# Copyright (c) 2018,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl              8.6
+package require critcl           3.2
+package require critcl::literals 1.3 ;# result-type
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {String pools}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare a shared
+    string pool and use it in cproc's or ccommand's
+}
+
+critcl::subject demonstration \
+    {string pool} {literal pool} \
+    {shared strings} {shared literals} \
+    {multi-access}
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::literals::def demo {
+    here  "here"
+    comes "comes"
+    the   "the"
+    sun   "sun"
+} +list
+
+critcl::cproc strs {Tcl_Interp* ip int args} object {
+    Tcl_Obj* res = demo_list (ip, args.c, args.v);
+    Tcl_IncrRefCount (res);
+    return res;
+}
+
+# str 0
+# str 7 - panic, abort, core dump
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide pool 1
diff --git a/src/vfs/critcl.vfs/examples/literals/build.tcl b/src/vfs/critcl.vfs/examples/literals/build.tcl
new file mode 100644
index 00000000..f013ee5d
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/literals/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {pool}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/literals/cr.tcl b/src/vfs/critcl.vfs/examples/literals/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/literals/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/literals/example.tcl b/src/vfs/critcl.vfs/examples/literals/example.tcl
new file mode 100644
index 00000000..c0df3503
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/literals/example.tcl
@@ -0,0 +1,6 @@
+
+# Force compile and load.
+catch {str}
+
+ex str  1
+ex xstr 2
diff --git a/src/vfs/critcl.vfs/examples/literals/pool.tcl b/src/vfs/critcl.vfs/examples/literals/pool.tcl
new file mode 100644
index 00000000..57837a88
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/literals/pool.tcl
@@ -0,0 +1,56 @@
+# pool.tcl --
+#
+#	A template demonstrating the handling of string/literal pools.
+#
+# Copyright (c) 2014,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl              8.6
+package require critcl           3.1.11
+package require critcl::literals 1.1 ;# result-type
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {String pools}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare a shared
+    string pool and use it in cproc's or ccommand's
+}
+
+critcl::subject demonstration {string pool} {literal pool} \
+    {shared strings} {shared literals}
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::literals::def demo {
+    here  "here"
+    comes "comes"
+    the   "the"
+    sun   "sun"
+}
+
+critcl::cproc str {Tcl_Interp* ip int code} object {
+    Tcl_Obj* res = demo (ip, code);
+    Tcl_IncrRefCount (res);
+    return res;
+}
+
+# Conversion hidden in the result-type
+critcl::cproc xstr {Tcl_Interp* ip int code} demo {
+    return code;
+}
+
+# str 0
+# str 7 - panic, abort, core dump
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide pool 1
diff --git a/src/vfs/critcl.vfs/examples/md5/cr.tcl b/src/vfs/critcl.vfs/examples/md5/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/md5/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/md5/example.tcl b/src/vfs/critcl.vfs/examples/md5/example.tcl
new file mode 100644
index 00000000..f5c8284b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/md5/example.tcl
@@ -0,0 +1,39 @@
+
+package require critcl_md5c
+#set pkgtest 1
+
+#source ../../lib/critcl-md5c/md5c.tcl
+
+    proc md5c_try {} {
+	foreach {msg expected} {
+	    ""
+	    "d41d8cd98f00b204e9800998ecf8427e"
+	    "a"
+	    "0cc175b9c0f1b6a831c399e269772661"
+	    "abc"
+	    "900150983cd24fb0d6963f7d28e17f72"
+	    "message digest"
+	    "f96b697d7cb7938d525a2f31aaf161d0"
+	    "abcdefghijklmnopqrstuvwxyz"
+	    "c3fcd3d76192e4007dfb496cca67e13b"
+	    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+	    "d174ab98d277d9f5a5611c2c9f419d9f"
+	    "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+	    "57edf4a22be3c955ac49da2e2107b67a"
+	} {
+	    puts "testing: md5 \"$msg\""
+	    binary scan [md5c $msg] H* computed
+	    puts "computed: $computed"
+	    if {0 != [string compare $computed $expected]} {
+		puts "expected: $expected"
+		puts "FAILED"
+	    }
+	}
+
+	foreach len {10 50 100 500 1000 5000 10000 50000 100000 500000 1000000} {
+	    set blanks [format %$len.0s ""]
+	    puts "input length $len: [time {md5c $blanks} 1000]"
+	}
+    }
+
+    md5c_try
diff --git a/src/vfs/critcl.vfs/examples/optional/build.tcl b/src/vfs/critcl.vfs/examples/optional/build.tcl
new file mode 100644
index 00000000..e8e7dbe1
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/optional/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {optional}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/optional/cr.tcl b/src/vfs/critcl.vfs/examples/optional/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/optional/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/optional/example.tcl b/src/vfs/critcl.vfs/examples/optional/example.tcl
new file mode 100644
index 00000000..466c2d15
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/optional/example.tcl
@@ -0,0 +1,18 @@
+#!/usr/bin/env tclsh
+
+package require Tcl 8.5
+package require optional
+
+foreach a {
+    {}
+    {6}
+    {6 7}
+    {6 7 8}
+    {6 7 8 9}
+    {6 7 8 9 0}
+} {
+    ex fixed           {*}$a
+    ex optional_head   {*}$a
+    ex optional_middle {*}$a
+    ex optional_tail   {*}$a
+}
diff --git a/src/vfs/critcl.vfs/examples/optional/optional.tcl b/src/vfs/critcl.vfs/examples/optional/optional.tcl
new file mode 100644
index 00000000..6dd11ea5
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/optional/optional.tcl
@@ -0,0 +1,54 @@
+# optional.tcl --
+#
+#	A template demonstrating the handling of optional arguments to cproc.
+#
+# Copyright (c) 2012,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.6
+package require critcl 3.2
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Optional arguments for cproc}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare cproc's
+    with optional arguments.
+}
+
+critcl::subject demonstration {cproc optional arguments}
+#critcl::config lines 0
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::cproc fixed {int a int b int c int d} void {
+    printf ("F|%d|%d|%d|%d|\n", a,b,c,d);
+    fflush(stdout);
+}
+
+critcl::cproc optional_head {int {a 1} int {b 2} int c int d} void {
+    printf ("H|%d|%d|%d|%d|\n", a,b,c,d);
+    fflush(stdout);
+}
+
+critcl::cproc optional_tail {int a int b int {c 1} int {d 2}} void {
+    printf ("T|%d|%d|%d|%d|\n", a,b,c,d);
+    fflush(stdout);
+}
+
+critcl::cproc optional_middle {int a int {b 1} int {c 2} int d} void {
+    printf ("M|%d|%d|%d|%d|\n", a,b,c,d);
+    fflush(stdout);
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide optional 1
diff --git a/src/vfs/critcl.vfs/examples/queue/README.txt b/src/vfs/critcl.vfs/examples/queue/README.txt
new file mode 100644
index 00000000..11cfc2d6
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/queue/README.txt
@@ -0,0 +1,13 @@
+Example of critcl-based packages.
+
+A larger example written to demonstrate
+
+	Easy writing of C classes, with class and instances
+	represented as commands, through the utility package
+	critcl::class
+
+Sources
+	Package "queuec":	queuec.tcl, queuec/*.[ch]
+
+Notes:
+	--
diff --git a/src/vfs/critcl.vfs/examples/queue/build.tcl b/src/vfs/critcl.vfs/examples/queue/build.tcl
new file mode 100644
index 00000000..cc864b3a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/queue/build.tcl
@@ -0,0 +1,295 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {queuec}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+    package require critcl
+    package require critcl::class
+
+    puts v=[set v  [package present critcl]]
+    puts [package ifneeded critcl        $v]
+
+    puts v=[set vc [package present critcl::class]]
+    puts [package ifneeded critcl::class $vc]
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall all packages, build for debugging.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -keep -debug symbols -cache [pwd]/BUILD.$p -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/queue/cr.tcl b/src/vfs/critcl.vfs/examples/queue/cr.tcl
new file mode 100644
index 00000000..548273b0
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/queue/cr.tcl
@@ -0,0 +1,54 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+
+package require critcl 3.2
+
+puts v=[set v [package present critcl]]
+puts [package ifneeded critcl $v]
+
+package require critcl::class
+
+puts v=[set vc [package present critcl::class]]
+puts [package ifneeded critcl::class $vc]
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/queue/example.tcl b/src/vfs/critcl.vfs/examples/queue/example.tcl
new file mode 100644
index 00000000..fe4f0611
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/queue/example.tcl
@@ -0,0 +1,12 @@
+
+ex queuec new
+ex queuec1 size
+ex queuec1 clear
+ex queuec1 put a b c
+ex queuec1 peek 2
+ex queuec1 get 2
+ex queuec1 size
+ex queuec1 clear
+ex queuec1 size
+ex queuec1 destroy
+ex queuec1
diff --git a/src/vfs/critcl.vfs/examples/queue/queuec.tcl b/src/vfs/critcl.vfs/examples/queue/queuec.tcl
new file mode 100644
index 00000000..e525e71f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/queue/queuec.tcl
@@ -0,0 +1,396 @@
+# queuec.tcl --
+#
+#       Implementation of a queue data structure for Tcl.
+#       This code based on critcl v3.1, API compatible to the PTI [x].
+#       [x] Pure Tcl Implementation.
+#
+# Mainly demonstrates the utility package for the creation of classes
+# and objects in C, with both classes and their instances represented
+# as Tcl commands. In contrast to the stackc demo this does not use a
+# separate data structure package, nor separately written method
+# implementations.
+#
+# Copyright (c) 2012,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::buildrequirement {
+    package require critcl::class ; # DSL, easy spec of Tcl class/object commands.
+}
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} {BSD licensed}
+
+critcl::summary {Queue objects for Tcl.}
+
+critcl::description {
+    This package implements queue objects
+    for Tcl.
+}
+
+critcl::subject queue
+critcl::subject {data structure}
+critcl::subject structure
+critcl::subject {abstract data structure}
+critcl::subject {generic data structure}
+
+# # ## ### ##### ######## ############# #####################
+## Configuration and implementation.
+
+critcl::cheaders util.h
+
+critcl::class::define ::queuec {
+    include util.h
+
+    constructor {
+	if (objc > 0) {
+	    Tcl_AppendResult (interp, "wrong#args for constructor, expected none", NULL);
+	    goto error;
+	}
+    }
+
+    method_introspection
+
+    # # ## ### ##### ######## ############# #####################
+    insvariable Tcl_Obj* unget {
+	List object holding unget'ted elements.
+    } {
+	instance->unget  = Tcl_NewListObj (0,NULL);
+	Tcl_IncrRefCount (instance->unget);
+    } {
+	Tcl_DecrRefCount (instance->unget);
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    insvariable Tcl_Obj* queue {
+	List object holding the main queue.
+    } {
+	instance->queue  = Tcl_NewListObj (0,NULL);
+	Tcl_IncrRefCount (instance->queue);
+    } {
+	Tcl_DecrRefCount (instance->queue);
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    insvariable Tcl_Obj* append {
+	List object holding new elements
+    } {
+	instance->append = Tcl_NewListObj (0,NULL);
+	Tcl_IncrRefCount (instance->append);
+    } {
+	Tcl_DecrRefCount (instance->append);
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    insvariable int at {
+	Index of next element to return from the main queue.
+	(variable: queue).
+    } {
+	instance->at = 0;
+    } ; # no need for a destructor
+
+    # # ## ### ##### ######## ############# #####################
+    method clear proc {} void {
+	/*
+	 * Delete and recreate the queue memory. A combination of delete/new,
+	 * except the main structure is left unchanged
+	 */
+
+	Tcl_DecrRefCount (instance->unget);
+	Tcl_DecrRefCount (instance->queue);
+	Tcl_DecrRefCount (instance->append);
+
+	instance->at     = 0;
+	instance->unget  = Tcl_NewListObj (0,NULL);
+	instance->queue  = Tcl_NewListObj (0,NULL);
+	instance->append = Tcl_NewListObj (0,NULL);
+
+	Tcl_IncrRefCount (instance->unget);
+	Tcl_IncrRefCount (instance->queue);
+	Tcl_IncrRefCount (instance->append);
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    method get  as QueueRetrieve 1
+    method peek as QueueRetrieve 0
+
+    # # ## ### ##### ######## ############# #####################
+    method put command {
+	item... = objv[2]...
+    } {
+	int i;
+
+	if (objc < 3) {
+	    Tcl_WrongNumArgs (interp, 2, objv, "item ?item ...?");
+	    return TCL_ERROR;
+	}
+
+	for (i = 2; i < objc; i++) {
+	    Tcl_ListObjAppendElement (interp, instance->append, objv[i]);
+	}
+
+	return TCL_OK;
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    method size proc {} int {
+	return QueueSize (instance, NULL, NULL, NULL);
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    method unget proc {Tcl_Obj* item} ok {
+	if (instance->at == 0) {
+	    /* Need the unget stack */
+	    Tcl_ListObjAppendElement (interp, instance->unget, item);
+	} else {
+	    /*
+	     * We have room in the return buffer, so splice directly instead of
+	     * using the unget stack.
+	     */
+
+	    int queuec = 0;
+	    Tcl_ListObjLength (NULL, instance->queue,  &queuec);
+
+	    instance->at --;
+	    ASSERT_BOUNDS(instance->at,queuec);
+	    Tcl_ListObjReplace (interp, instance->queue, instance->at, 1, 1, &item);
+	}
+
+	return TCL_OK;
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    support {
+	static int
+	QueueSize (@instancetype@ q, int* u, int* r, int* a)
+	{
+	    int ungetc  = 0;
+	    int queuec  = 0;
+	    int appendc = 0;
+
+	    Tcl_ListObjLength (NULL, q->unget,  &ungetc);
+	    Tcl_ListObjLength (NULL, q->queue,  &queuec);
+	    Tcl_ListObjLength (NULL, q->append, &appendc);
+
+	    if (u) *u = ungetc;
+	    if (r) *r = queuec;
+	    if (a) *a = appendc;
+
+	    return ungetc + queuec + appendc - q->at;
+	}
+
+	static void
+	QueueShift (@instancetype@ q)
+	{
+	    int queuec = 0;
+	    int appendc = 0;
+
+	    /* The queue is not done yet, no shift */
+	    Tcl_ListObjLength (NULL, q->queue, &queuec);
+	    if (q->at < queuec) return;
+
+	    /* The queue is done, however there is nothing
+	     * to shift into it, so we don't
+	     */
+	    Tcl_ListObjLength (NULL, q->append, &appendc);
+	    if (!appendc) return;
+
+	    q->at = 0;
+	    Tcl_DecrRefCount (q->queue);
+	    q->queue  = q->append;
+	    q->append = Tcl_NewListObj (0,NULL);
+	    Tcl_IncrRefCount (q->append);
+	}
+
+	static int
+	QueueRetrieve (@instancetype@  instance,
+		       Tcl_Interp*     interp,
+		       int             objc,
+		       Tcl_Obj* CONST* objv,
+		       int             get)
+	{
+	    /* Syntax: queue peek|get ?n?
+	     *	       [0]  [1]       [2]
+	     */
+
+	    int       listc = 0;
+	    Tcl_Obj** listv;
+	    Tcl_Obj*  r;
+	    int       n = 1;
+	    int       ungetc;
+	    int       queuec;
+	    int       appendc;
+
+	    if ((objc != 2) && (objc != 3)) {
+		Tcl_WrongNumArgs (interp, 2, objv, "?n?");
+		return TCL_ERROR;
+	    }
+
+	    if (objc == 3) {
+		if (Tcl_GetIntFromObj(interp, objv[2], &n) != TCL_OK) {
+		    return TCL_ERROR;
+		} else if (n < 1) {
+		    Tcl_AppendResult (interp, "invalid item count ",
+				      Tcl_GetString (objv[2]),
+				      NULL);
+		    return TCL_ERROR;
+		}
+	    }
+
+	    if (n > QueueSize(instance, &ungetc, &queuec, &appendc)) {
+		Tcl_AppendResult (interp,
+				  "insufficient items in queue to fill request",
+				  NULL);
+		return TCL_ERROR;
+	    }
+
+	    /* 1. We have item on the unget stack
+	     *    a. Enough to satisfy request.
+	     *    b. Not enough.
+	     * 2. We have items in the return buffer.
+	     *    a. Enough to satisfy request.
+	     *    b. Not enough.
+	     * 3. We have items in the append buffer.
+	     *    a. Enough to satisfy request.
+	     *    b. Not enough.
+	     *
+	     * Case 3. can assume 2b, because an empty return buffer will be filled
+	     * from the append buffer before looking at either. Case 3. cannot happen
+	     * for n==1, the return buffer will contain at least one element.
+	     *
+	     * We distinguish between single and multi-element requests.
+	     *
+	     * XXX AK optimizations - If we can return everything from a single
+	     * buffer, be it queue, or append, just return the buffer object, do not
+	     * create something new.
+	     */
+
+	    if (n == 1) {
+		if (ungetc) {
+		    /* Pull from unget stack */
+		    Tcl_ListObjGetElements (interp, instance->unget, &listc, &listv);
+		    r = listv [listc-1];
+		    Tcl_SetObjResult (interp, r);
+		    if (get) {
+			/* XXX AK : Should maintain max size info, and proper index, for discard. */
+			Tcl_ListObjReplace (interp, instance->unget, listc-1, 1, 0, NULL);
+		    }
+		} else {
+		    QueueShift (instance);
+		    Tcl_ListObjGetElements (interp, instance->queue, &listc, &listv);
+		    ASSERT_BOUNDS(instance->at,listc);
+		    r = listv [instance->at];
+		    Tcl_SetObjResult (interp, r);
+		    /*
+		     * Note: Doing the SetObj now is important. It increments the
+		     * refcount of 'r', allowing it to survive if the 'QueueShift' below
+		     * kills the internal list (instance->queue) holding it.
+		     */
+		    if (get) {
+			instance->at ++;
+			QueueShift (instance);
+		    }
+		}
+	    } else {
+		/*
+		 * Allocate buffer for result, then fill it using the various data
+		 * sources.
+		 */
+
+		int i = 0, j;
+		Tcl_Obj** resv = NALLOC(n,Tcl_Obj*);
+
+		if (ungetc) {
+		    Tcl_ListObjGetElements (interp, instance->unget, &listc, &listv);
+		    /*
+		     * Note how we are iterating backward in listv. unget is managed
+		     * as a stack, avoiding mem-copy operations and both push and pop.
+		     */
+		    for (j = listc-1;
+			 j >= 0 && i < n;
+			 j--, i++) {
+				    ASSERT_BOUNDS(i,n);
+				    ASSERT_BOUNDS(j,listc);
+				    resv[i] = listv[j];
+				    Tcl_IncrRefCount (resv[i]);
+				}
+		    if (get) {
+			/* XXX AK : Should maintain max size info, and proper index, for discard. */
+			Tcl_ListObjReplace (interp, instance->unget, j, i, 0, NULL);
+			/* XXX CHECK index calcs. */
+		    }
+		}
+		if (i < n) {
+		    QueueShift (instance);
+		    Tcl_ListObjGetElements (interp, instance->queue, &listc, &listv);
+		    for (j = instance->at;
+			 j < listc && i < n;
+			 j++, i++) {
+				    ASSERT_BOUNDS(i,n);
+				    ASSERT_BOUNDS(j,listc);
+				    resv[i] = listv[j];
+				    Tcl_IncrRefCount (resv[i]);
+				}
+
+		    if (get) {
+			instance->at = j;
+			QueueShift (instance);
+		    } else if (i < n) {
+			/* XX */
+			Tcl_ListObjGetElements (interp, instance->append, &listc, &listv);
+			for (j = 0;
+			     j < listc && i < n;
+			     j++, i++) {
+					ASSERT_BOUNDS(i,n);
+					ASSERT_BOUNDS(j,listc);
+					resv[i] = listv[j];
+					Tcl_IncrRefCount (resv[i]);
+				    }
+		    }
+		}
+
+		/*
+		 * This can happen if and only if we have to pull data from append,
+		 * and get is set. Without get XX would have run and filled the result
+		 * to completion.
+		 */
+
+		if (i < n) {
+		    ASSERT(get,"Impossible 2nd return pull without get");
+		    QueueShift (instance);
+		    Tcl_ListObjGetElements (interp, instance->queue, &listc, &listv);
+		    for (j = instance->at;
+			 j < listc && i < n;
+			 j++, i++) {
+			    ASSERT_BOUNDS(i,n);
+			    ASSERT_BOUNDS(j,listc);
+			    resv[i] = listv[j];
+			    Tcl_IncrRefCount (resv[i]);
+		    }
+		    instance->at = j;
+		    QueueShift (instance);
+		}
+
+		r = Tcl_NewListObj (n, resv);
+		Tcl_SetObjResult (interp, r);
+
+		for (i=0;i<n;i++) {
+		   Tcl_DecrRefCount (resv[i]);
+	        }
+		ckfree((char*)resv);
+	    }
+
+	    return TCL_OK;
+	}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide queuec 1
diff --git a/src/vfs/critcl.vfs/examples/queue/util.h b/src/vfs/critcl.vfs/examples/queue/util.h
new file mode 100644
index 00000000..380c2f9c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/queue/util.h
@@ -0,0 +1,41 @@
+/* stackc - critcl - layer 0 declarations
+ * API general utilities
+ */
+
+#ifndef _UTIL_H
+#define _UTIL_H 1
+
+#include <tcl.h>
+
+/* Allocation macros for common situations.
+ */
+
+#define ALLOC(type)    (type *) ckalloc (sizeof (type))
+#define NALLOC(n,type) (type *) ckalloc ((n) * sizeof (type))
+
+/* Assertions in general, and asserting the proper range of an array index.
+ */
+
+#undef  STACKC_DEBUG
+#define STACKC_DEBUG 1
+
+#ifdef STACKC_DEBUG
+#define XSTR(x) #x
+#define STR(x) XSTR(x)
+#define RANGEOK(i,n) ((0 <= (i)) && (i < (n)))
+#define ASSERT(x,msg) if (!(x)) { Tcl_Panic (msg " (" #x "), in file " __FILE__ " @line " STR(__LINE__));}
+#define ASSERT_BOUNDS(i,n) ASSERT (RANGEOK(i,n),"array index out of bounds: " STR(i) " > " STR(n))
+#else
+#define ASSERT(x,msg)
+#define ASSERT_BOUNDS(i,n)
+#endif
+
+#endif /* _UTIL_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/examples/random/README.txt b/src/vfs/critcl.vfs/examples/random/README.txt
new file mode 100644
index 00000000..086d2868
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/random/README.txt
@@ -0,0 +1,30 @@
+Example of critcl-based packages.
+
+A larger example written to demonstrate
+
+	Export of an API as Tcl stubs table	(Package "rnmath")
+	Import of an API defined as stubs-table	(Package "random")
+
+Package "random" incidentially also demonstrates
+
+	Programmatic access to the imported API for use in C code
+	generation, and
+
+	Complex C code generation (class and instance commands) from a
+	few parameters (function name, arguments, ...).
+
+Sources
+	Package	"rnmath":	rnmath.tcl
+	Package "random":	random.tcl
+
+Notes:
+
+*	"rnmath" contains and exports low-level functions for
+	generating random numbers following a variety of
+	distributions. The functions are state-less. The system
+	function random() (On win: rand()) is used internally as the
+	basic source of random values.
+
+*	"random" wraps the low-level math into a Tcl class/object
+	system where generators are objects, each represented as a Tcl
+	command.
diff --git a/src/vfs/critcl.vfs/examples/random/build.tcl b/src/vfs/critcl.vfs/examples/random/build.tcl
new file mode 100644
index 00000000..5445e44d
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/random/build.tcl
@@ -0,0 +1,289 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+# Order of building and installation: "rnmath", then "random", as the
+# latter depends on the former. Not relevant for wrap4tea.
+set packages {rnmath random}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/random/random.tcl b/src/vfs/critcl.vfs/examples/random/random.tcl
new file mode 100644
index 00000000..8735415a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/random/random.tcl
@@ -0,0 +1,376 @@
+# -*- tcl -*- (critcl actually, Tcl + embedded C)
+# sr.tcl --
+#
+#	Object-based random number generators. The low-level math, i.e.
+#	the rnmath functions, is provided by package 'rnmath'.
+#
+# Concept pulled out of and derived from tcllib/modules/simulation/random.tcl
+# Copyright (c) 2007 by Arjen Markus <arjenmarkus@users.sourceforge.net>
+#
+# Critcl code generation and setup
+# Copyright (c) 2011,2022 by Andreas Kupries <andreas_kupris@users.sourceforge.net>
+#
+# Example of how to IMPORT a C-level stubs API through critcl v3.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::buildrequirement {
+    package require stubs::gen ; # Generator/iterator framework ...
+}
+
+namespace eval ::random {}
+
+# # ## ### ##### ######## ############# #####################
+## Configuration
+
+critcl::license \
+    {Arjen Markus, Andreas Kupries} \
+    {BSD licensed.}
+
+critcl::summary {Random number generator objects for Tcl.}
+
+critcl::description {
+    This package implements random number generator objects for
+    Tcl. It uses the functions provided by package 'rnmath' for
+    the actual math.
+}
+
+critcl::subject {random number generator}
+# plus the distributions, see inside of 'genclass'
+
+# # ## ### ##### ######## ############# #####################
+## Dependencies.
+
+# C random number generator functions.
+set ::random::T [critcl::api import rnmath 1]
+
+if {$::random::T eq {}} {
+    critcl::error "Unable to work without programmatic access to the rnmath API, the expected rnmath.decls was not found."
+}
+
+# # ## ### ##### ######## ############# #####################
+## Code generation commands converting a simple RNMATH declaration into
+## the necessary C code for class and object commands.
+
+proc ::random::wrap {} {
+    variable T
+    variable PS {}
+    # Iterate over the slots in the stubs table and generator wrap code for each
+    # rnmath_ function.
+    ::stubs::gen::forall $T rnmath [namespace current]::Make 0
+
+    # Finalize the parameter union ...
+    set PS "typedef union RNMATHparam \{\n${PS}\} RNMATHparam;"
+
+    # The union is placed into a generated header, getting around
+    # ordering problems, namely that this is finalized after a number
+    # of pieces needing the type are declared. The first such piece
+    # has a #include to the generated header. Whic h works because the
+    # build happens after everything is generated.
+
+    # critcl::stash ? command
+    file mkdir     [critcl::cache]
+    set    c [open [critcl::cache]/sr_param.h w]
+    puts  $c $PS
+    close $c
+    #critcl::ccode $PS
+    return
+}
+
+proc ::random::Make {name decl index} {
+    # Handle a single slot.
+
+    variable PS ; # The code for the parameter union (RNMATHparam) is accumulated here.
+
+    lassign $decl ftype fname farguments
+    # ASSERT ftype == void
+    if {$ftype ne "void"} return
+
+    # ASSERT fname match rnmath_*
+    if {![string match rnmath_* $fname]} return
+
+    # Extract generator name from function name.
+    regsub {^rnmath_} $fname {} rname
+
+    # Split arguments into arguments and results. The latter are
+    # recognized through their pointer types (Ending in '*').
+    set arguments {}
+    set rtypes    {}
+    foreach a $farguments {
+	lassign $a atype aname aflag
+	# ASSERT aflag == {}
+	if {[string index $atype end] eq "*"} {
+	    lappend rtypes [string range $atype 0 end-1] $aname
+	} else {
+	    lappend arguments $atype $aname
+	}
+    }
+
+    # Generate a structure to hold the function arguments.
+    # This is added to PS and will become a union of all
+    # parameter structures.
+    append PS "    struct \{\n"
+    foreach {atype aname} $arguments {
+	append PS "        $atype $aname;\n"
+    }
+    append PS "    \} $rname;\n"
+
+    # Invoke the actual code generator.
+    critcl::msg -nonewline " ($rname)"
+    genclass $rtypes $rname $arguments
+    return
+}
+
+proc ::random::genclass {rtypes name arguments} {
+    # Extend the meta data. Same as used by 'rnmath', to put them
+    # together, near each other.
+    critcl::subject "$name probability distribution"
+    critcl::subject "probability distribution $name"
+    critcl::subject "distribution $name"
+
+    set ingest ""
+    foreach {t a} $arguments {
+	append  ingest        "\t    rnmathp->$name.$a = _$a;\n"
+	lappend theparameters "rnmathp->${name}.$a"
+    }
+
+    set argnames     [critcl::argnames $arguments]
+    set thearguments [join [critcl::argcsignature $arguments] {, }]
+    set argvars      [indent "\t    " [join [critcl::argvardecls   $arguments] \n]]\n
+    set argcheck     [indent "\t  "   [join [critcl::argconversion $arguments] \n]]\n
+
+    if {[llength $rtypes] == 2} {
+	# Single-value result. Variables for each, and construction of a list.
+
+	lassign $rtypes t r
+
+	append  resultvars     "\t    $t _$r;\n"
+	append  resultvars     "\t    Tcl_Obj* _lv;\n"
+
+	append  resultget      "\t    _lv = Tcl_New[cap $t]Obj (_$r);\n"
+	append  thearguments  ", $t* $r"
+	lappend theparameters "&_$r"
+	set resultset "_lv"
+    } else {
+	# Multi-value result. Variables for each, and construction of a list.
+	set lc 0
+	foreach {t r} $rtypes {
+	    append resultvars     "\t    $t _$r;\n"
+	    append resultget      "\t    _lv\[$lc\] = Tcl_New[cap $t]Obj (_$r);\n"
+	    append thearguments  ", $t* $r"
+	    lappend theparameters "&_$r"
+	    incr lc
+	}
+	append resultvars "\t    Tcl_Obj* _lv\[$lc\];\n"
+	set resultset "Tcl_NewListObj ($lc,_lv)"
+    }
+
+    set theparameters [join $theparameters {, }]
+
+    # Low-level math function generating the numbers. Imported from rnmath stubs.
+
+    # Instance command for the generators. Invokes the math function
+    # with the parameters it got through its client data.
+
+    critcl::ccode [subst -nocommand {
+	static int
+	r_${name}_objcmd (ClientData cd, Tcl_Interp* interp, int objc, Tcl_Obj *CONST objv[])
+	{
+	    RNMATHparam* rnmathp = (RNMATHparam*) cd;
+$resultvars
+	    if (objc > 1) {
+		Tcl_WrongNumArgs (interp, 1, objv, "");
+		return TCL_ERROR;
+	    }
+
+	    rnmath_$name ($theparameters);
+$resultget
+	    Tcl_SetObjResult (interp, $resultset);
+	    return TCL_OK;
+	}
+    }]
+
+    # Class command for generators of this type. Creates instance
+    # commands with proper client data.
+    set np   [llength $argnames]
+    set nmin [expr {$np + 1}]
+    set nmax [expr {$np + 2}]
+
+    critcl::ccommand ::random::$name {cd interp oc ov} [subst -nocommands {
+	RNMATHparam* rnmathp;
+	char* name;
+$argvars
+	if (oc == $nmin) {
+	    name = NULL;
+	} else if (oc == $nmax) {
+	    name = Tcl_GetString (ov [1]);
+	    ov++;
+	} else {
+	    Tcl_WrongNumArgs (interp, 1, ov, "?name? $argnames");
+	    return TCL_ERROR;
+	}
+
+$argcheck
+	rnmathp = RNMATHnewCmd (interp, "$name", name, r_${name}_objcmd);
+
+	if (!rnmathp) {
+	    return TCL_ERROR;
+	}
+
+$ingest
+	return TCL_OK;
+    }]
+
+    return
+}
+
+proc ::random::cap {name} {
+    return [string toupper [string index $name 0]][string range $name 1 end]
+}
+
+proc ::random::indent {prefix text} {
+    return ${prefix}[join [split $text \n] \n$prefix]
+}
+
+# # ## ### ##### ######## ############# #####################
+## Intro and shared/common/fixed code.
+
+critcl::ccode {
+    /* -*- c -*- */
+    /* .................................................. */
+    /* Global generator management, per interp */
+
+#include <sr_param.h> /* Generated, see random::wrap */
+#define PREFIX "random"
+
+    typedef struct RNMATHglobal {
+	long int counter;
+	char buf [sizeof (PREFIX) + 40 + 40];
+	/* 40 - generator type string, 40 - space for long integer */
+    } RNMATHglobal;
+
+    /* Union parameter structure for all generators. */
+    /* So that we have one structure for all, and a single destructor function */
+    /* We can't get around the need for multiple constructors for the different */
+    /* generators */
+
+    static void
+    RNMATHglobalFree (ClientData cd, Tcl_Interp* interp)
+    {
+	ckfree((char*) cd);
+    }
+
+    static char*
+    AutoName (Tcl_Interp* interp, char* rtype)
+    {
+#define KEY "package/random"
+
+	Tcl_InterpDeleteProc* proc = RNMATHglobalFree;
+	RNMATHglobal*            rnmathglobal;
+
+	rnmathglobal = Tcl_GetAssocData (interp, KEY, &proc);
+	if (rnmathglobal == NULL) {
+	    rnmathglobal = (RNMATHglobal*) ckalloc (sizeof (RNMATHglobal));
+	    rnmathglobal->counter = 0;
+
+	    Tcl_SetAssocData (interp, KEY, proc,
+			      (ClientData) rnmathglobal);
+	}
+
+	rnmathglobal->counter ++;
+	sprintf (rnmathglobal->buf, PREFIX "%s%d", rtype, rnmathglobal->counter);
+	return rnmathglobal->buf;
+
+#undef  KEY
+    }
+
+    static void
+    RNMATHdeleteCmd (ClientData clientData)
+    {
+	/* Release the generator parameters */
+	ckfree ((char*) clientData);
+    }
+
+    static RNMATHparam*
+    RNMATHnewCmd (Tcl_Interp* interp, char* rtype, char* name, Tcl_ObjCmdProc p)
+    {
+	Tcl_Obj*    fqn;
+	Tcl_CmdInfo ci;
+	RNMATHparam*   rnmathp;
+
+	if (!name) {
+	    name = AutoName (interp, rtype);
+	}
+
+	if (!Tcl_StringMatch (name, "::*")) {
+	    /* Relative name. Prefix with current namespace */
+
+	    Tcl_Eval (interp, "namespace current");
+	    fqn = Tcl_GetObjResult (interp);
+	    fqn = Tcl_DuplicateObj (fqn);
+	    Tcl_IncrRefCount (fqn);
+
+	    if (!Tcl_StringMatch (Tcl_GetString (fqn), "::")) {
+		Tcl_AppendToObj (fqn, "::", -1);
+	    }
+	    Tcl_AppendToObj (fqn, name, -1);
+	} else {
+	    fqn = Tcl_NewStringObj (name, -1);
+	    Tcl_IncrRefCount (fqn);
+	}
+	Tcl_ResetResult (interp);
+
+	if (Tcl_GetCommandInfo (interp,
+				Tcl_GetString (fqn),
+				&ci)) {
+	    Tcl_Obj* err;
+
+	    err = Tcl_NewObj ();
+	    Tcl_AppendToObj    (err, "command \"", -1);
+	    Tcl_AppendObjToObj (err, fqn);
+	    Tcl_AppendToObj    (err, "\" already exists, unable to create generator", -1);
+
+	    Tcl_DecrRefCount (fqn);
+	    Tcl_SetObjResult (interp, err);
+	    return NULL;
+	}
+
+	rnmathp = (RNMATHparam*) ckalloc (sizeof (RNMATHparam));
+
+	Tcl_CreateObjCommand (interp, Tcl_GetString (fqn),
+			      p, (ClientData) rnmathp,
+			      RNMATHdeleteCmd);
+
+	Tcl_SetObjResult (interp, fqn);
+	Tcl_DecrRefCount (fqn);
+
+	return rnmathp;
+    }
+
+    static double
+    RANDOM (void)
+    {
+	return random () / 2147483647.0;
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Genereate generators from the imported API.
+
+::random::wrap
+
+# # ## ### ##### ######## ############# #####################
+## Finalization; drop helper commands, and provide the package.
+
+unset  ::random::T
+rename ::random::cap      {}
+rename ::random::indent   {}
+rename ::random::genclass {}
+rename ::random::wrap     {}
+
+package provide random 1
+return
diff --git a/src/vfs/critcl.vfs/examples/random/rnmath.tcl b/src/vfs/critcl.vfs/examples/random/rnmath.tcl
new file mode 100644
index 00000000..930be5bf
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/random/rnmath.tcl
@@ -0,0 +1,375 @@
+# -*- tcl -*- (critcl actually, Tcl + embedded C)
+# rnmath.tcl --
+#
+#	Low-level functions for the generation of random numbers
+#	following various distributions (Poisson, Gaussian/Normal,
+#	etc.).
+#
+# Math pulled out of and derived from tcllib/modules/simulation/random.tcl
+# Copyright (c) 2007 by Arjen Markus <arjenmarkus@users.sourceforge.net>
+#     Note:
+#     Several formulae and algorithms come from "Monte Carlo Simulation"
+#     by C. Mooney (Sage Publications, 1997)
+#
+# Critcl code generation and setup
+# Copyright (c) 2011,2022 by Andreas Kupries <andreas_kupris@users.sourceforge.net>
+#
+# Example of how to EXPORT a C-level stubs API through critcl v3.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.6
+package require critcl 3.2
+
+# # ## ### ##### ######## ############# #####################
+## Configuration
+
+critcl::license \
+    {Arjen Markus, Andreas Kupries} \
+    {BSD licensed.}
+
+critcl::summary {C-level functions for the generation of random numbers.}
+
+critcl::description {
+    This package implements functions for the generation
+    of random values following various known probability
+    distribution. No Tcl-binding is provided. See package
+    'random' for that.
+}
+
+critcl::subject {random numbers}
+# plus the distributions, see inside of 'generator'
+
+# # ## ### ##### ######## ############# #####################
+## Code generation helper command converting a simple RNG declaration
+## into the necessary C code.
+
+proc generator {name parameters body rtypes} {
+    # Generator results are returned through pointer arguments coming
+    # after the generator parameters.
+    foreach {t r} $rtypes {
+	lappend parameters ${t}* $r
+    }
+
+    set fname      rnmath_$name
+    set cparameters [join [critcl::argcsignature $parameters] {, }]
+
+    # Low-level math function generating the numbers.
+
+    lappend map @fname@ $fname
+    lappend map @param@ $cparameters
+    lappend map @body@  $body
+    critcl::ccode [string map $map {void @fname@ (@param@) {@body@}}]
+
+    # Exported through a stubs table.
+    critcl::api function void $fname $parameters
+
+    # Extend the meta data.
+    critcl::subject "$name probability distribution"
+    critcl::subject "probability distribution $name"
+    critcl::subject "distribution $name"
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## Intro and shared/common/fixed code.
+
+critcl::ccode {
+    /* -*- c -*- */
+
+#include <math.h>
+
+#ifndef M_PI
+#define M_PI (3.141592653589793238462643)
+#endif
+
+    static double
+    RANDOM (void)
+    {
+	/* Random numbers in range [0,1) */
+#ifdef WIN32
+	return ((unsigned int)  rand   ()) / 2147483648.0;
+#else
+	return ((unsigned long) random ()) / 2147483648.0;
+#endif
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Generators ...
+
+# Bernoulli --
+#     Produce random numbers with a Bernoulli distribution
+#
+# Arguments:
+#     p         Probability that the outcome will be 1
+#
+# Result:
+#     Name of a procedure that returns a Bernoulli-distributed random number
+#
+
+generator bernoulli {double p} {
+    *v = (RANDOM () < p) ? 1 : 0;
+} {int v}
+
+# Uniform --
+#     Produce random numbers with a uniform distribution in a given range
+#
+# Arguments:
+#     min       Minimum value
+#     max       Maximum value
+#
+# Result:
+#     Name of a procedure that returns a uniformly distributed
+#     random number
+#
+
+generator uniform {double min double max} {
+    *v = min + (max-min) * RANDOM ();
+} {double v}
+
+# Exponential --
+#     Produce random numbers with an exponential distribution with given mean
+#
+# Arguments:
+#     min       Minimum value
+#     mean      Mean value
+#
+# Result:
+#     Name of a procedure that returns an exponentially distributed
+#     random number
+#
+
+generator exponential {double min double mean} {
+    *v = min + (mean-min)*log(RANDOM ());
+} {double v}
+
+# Discrete --
+#     Produce random numbers with a uniform but discrete distribution
+#
+# Arguments:
+#     n         Outcome is an integer between 0 and n-1
+#
+# Result:
+#     Name of a procedure that returns such a random number
+#
+
+generator discrete {int n} {
+    *v = (int) (n*RANDOM ());
+} {int v}
+
+# Poisson --
+#     Produce random numbers with a Poisson distribution
+#
+# Arguments:
+#     lambda    The one parameter of the Poisson distribution
+#
+# Result:
+#     Name of a procedure that returns such a random number
+#
+
+generator poisson {double lambda} {
+    double r       = RANDOM ();
+    int    number  = 0;
+    double sum     = exp(-lambda);
+    double rfactor = sum;
+
+    while (r > sum) {
+	rfactor *= lambda / (number + 1);
+	sum += rfactor;
+	number ++;
+    }
+
+    *v = number;
+} {int v}
+
+# Normal --
+#     Produce random numbers with a normal distribution
+#
+# Arguments:
+#     mean      Mean of the distribution
+#     stdev     Standard deviation of the distribution
+#
+# Result:
+#     Name of a procedure that returns such a random number
+#
+# Note:
+#     Use the Box-Mueller method to generate a normal random number
+#
+
+generator normal {double mean double sigma} {
+    /* Note: RANDOM () in [0,1); log < 0 for that interval */
+    double rad = sqrt (-2 * log (RANDOM ()));
+    double phi = 2 * M_PI * RANDOM ();
+    double r   = rad * cos (phi);
+
+    *v = mean + r*sigma;
+} {double v}
+
+# Pareto --
+#     Produce random numbers with a Pareto distribution
+#
+# Arguments:
+#     min       Minimum value for the distribution
+#     steep     Steepness of the descent (> 0!)
+#
+# Result:
+#     Name of a procedure that returns a Pareto-distributed number
+#
+
+generator pareto {double min double steepness} {
+    *v = min * pow (1. - RANDOM (), 1./steepness);
+} {double v}
+
+# Gumbel --
+#     Produce random numbers with a Gumbel distribution
+#
+# Arguments:
+#     min       Minimum value for the distribution
+#     f         Factor to scale the value
+#
+# Result:
+#     Name of a procedure that returns a Gumbel-distributed number
+#
+# Note:
+#     The chance P(v) = exp( -exp( f*(v-min) ) )
+#
+
+generator gumbel {double min double f} {
+    *v = min + log ( -log (1. - RANDOM ()) / f);
+} {double v}
+
+# chiSquared --
+#     Produce random numbers with a chi-squared distribution
+#
+# Arguments:
+#     df        Degrees of freedom
+#
+# Result:
+#     Name of a procedure that returns a chi-squared distributed number
+#     with mean 0 and standard deviation 1
+#
+
+generator chisquared {int df} {
+    double y = 0;
+    int i;
+
+    for (i = 0; i < df; i++) {
+      double rad = sqrt (-log (RANDOM ()));
+      double phi = 2 * M_PI * RANDOM ();
+      double r   = rad * cos (phi);
+      /* So far like a normal distribution */
+      y += r * r;
+    }
+
+    /* http://www.dsplog.com/2008/07/28/chi-square-random-variable/ */
+
+    *v = (y - df)/sqrt (2*df);
+} {double v}
+
+# Disk --
+#     Produce random numbers with a uniform distribution of points on a disk
+#
+# Arguments:
+#     rad       Radius of the disk
+#
+# Result:
+#     Name of a procedure that returns the x- and y-coordinates of
+#     such a random point
+#
+
+generator disk {double radius} {
+    double rad = radius * sqrt (RANDOM ());
+    double phi = 2 * M_PI * RANDOM ();
+
+    *x   = rad * cos (phi);
+    *y   = rad * sin (phi);
+} {double x double y}
+
+# Ball --
+#     Produce random numbers with a uniform distribution of points within a ball
+#
+# Arguments:
+#     rad       Radius of the ball
+#
+# Result:
+#     Name of a procedure that returns the x-, y- and z-coordinates of
+#     such a random point
+#
+
+generator ball {double radius} {
+    double rad   = radius * pow (RANDOM (), 1./3.);
+    double phi   = 2 * M_PI * RANDOM ();
+    double theta = acos ( 2 * RANDOM () - 1);
+
+    *x   = rad * cos (phi) * cos (theta);
+    *y   = rad * sin (phi) * cos (theta);
+    *z   = rad * sin (theta);
+} {double x double y double z}
+
+# Sphere --
+#     Produce random numbers with a uniform distribution of points on the surface
+#     of a sphere
+#
+# Arguments:
+#     rad       Radius of the sphere
+#
+# Result:
+#     Name of a procedure that returns the x-, y- and z-coordinates of
+#     such a random point
+#
+
+generator sphere {double radius} {
+    double phi   = 2 * M_PI * RANDOM ();
+    double theta = acos ( 2 * RANDOM () - 1);
+
+    *x   = radius * cos (phi) * cos (theta);
+    *y   = radius * sin (phi) * cos (theta);
+    *z   = radius * sin (theta);
+} {double x double y double z}
+
+# Rectangle --
+#     Produce random numbers with a uniform distribution of points in a rectangle
+#
+# Arguments:
+#     length    Length of the rectangle (x-direction)
+#     width     Width of the rectangle (y-direction)
+#
+# Result:
+#     Name of a procedure that returns the x- and y-coordinates of
+#     such a random point
+#
+
+generator rectangle {double length double width} {
+    *x   = length * RANDOM ();
+    *y   = width  * RANDOM ();
+} {double x double y}
+
+# Block --
+#     Produce random numbers with a uniform distribution of points in a block
+#
+# Arguments:
+#     length    Length of the block (x-direction)
+#     width     Width of the block (y-direction)
+#     depth     Depth of the block (y-direction)
+#
+# Result:
+#     Name of a procedure that returns the x-, y- and z-coordinates of
+#     such a random point
+#
+
+generator block {double length double width double depth} {
+    *x   = length * RANDOM ();
+    *y   = width  * RANDOM ();
+    *z   = depth  * RANDOM ();
+} {double x double y double z}
+
+
+# # ## ### ##### ######## ############# #####################
+## Finalization; drop the helper command, and provide the package.
+
+rename generator {}
+
+package provide rnmath 1
+return
diff --git a/src/vfs/critcl.vfs/examples/selfcompanion/build.tcl b/src/vfs/critcl.vfs/examples/selfcompanion/build.tcl
new file mode 100644
index 00000000..d12c1544
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/selfcompanion/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {selfcompanion}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/selfcompanion/cr.tcl b/src/vfs/critcl.vfs/examples/selfcompanion/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/selfcompanion/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/selfcompanion/example.tcl b/src/vfs/critcl.vfs/examples/selfcompanion/example.tcl
new file mode 100644
index 00000000..c316ac3c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/selfcompanion/example.tcl
@@ -0,0 +1,3 @@
+
+ex self
+ex companion
diff --git a/src/vfs/critcl.vfs/examples/selfcompanion/selfcompanion.tcl b/src/vfs/critcl.vfs/examples/selfcompanion/selfcompanion.tcl
new file mode 100644
index 00000000..7c03353d
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/selfcompanion/selfcompanion.tcl
@@ -0,0 +1,76 @@
+# selfcompanion.tcl --
+#
+#	A template demonstrating how to distribute the critcl file
+#	as its own Tcl companion file.
+#
+#	This is not really the recommended way of handling Tcl
+#	companion code, however as critcl 2 supported this, and v3 is
+#	still supporting it, an example might still be in order.
+#
+#	One issue this causes is a dependency on critcl itself in the
+#	generated package. Whereas if the Tcl code to distribute is
+#	properly split off into a separate companion file such a
+#	dependency can be avoided.
+#
+# Copyright (c) 2011,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.6
+package require critcl 3.2
+
+# # ## ### ##### ######## ############# #####################
+## Define the Tcl companion code. This is done always, as we
+## might be in mode 'build & run'.
+
+proc companion {} {
+    return [self]
+}
+
+# # ## ### ##### ######## ############# #####################
+## Determine the environment, and define/build the C parts only
+## if not noted as build already.
+
+#puts Compiled=[critcl::compiled]
+
+if {[critcl::compiled]} return
+
+#critcl::msg "Declaring, building C parts"
+
+#puts Compiling=[critcl::compiling]
+
+if {![critcl::compiling]} {
+    return -code error "Unable to build the C parts of selfcompanion"
+}
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Demonstration of using the critcl file as its own Tcl companion}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to setup and distribute
+    the critcl file as its own Tcl companion file.
+}
+
+critcl::subject template demonstration self-companion
+
+# # ## ### ##### ######## ############# #####################
+## Configuration, setup as its own Tcl companion file.
+
+critcl::tsources [info script]
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::cdata self "me"
+
+# ... And other parts of the C level ...
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide selfcompanion 1
diff --git a/src/vfs/critcl.vfs/examples/stack/README.txt b/src/vfs/critcl.vfs/examples/stack/README.txt
new file mode 100644
index 00000000..c434d1a3
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/stack/README.txt
@@ -0,0 +1,32 @@
+Example of critcl-based packages.
+
+A larger example written to demonstrate
+
+	Export of an API as Tcl stubs table	(Package "cstack")
+	Import of an API defined as stubs-table	(Package "stackc")
+
+	Easy writing of C classes, with class and instances
+	represented as commands, through the utility package
+	critcl::class
+
+Package "cstack" also demonstrate the export of a companion header
+file containing declarations of package specific data structures and
+macros which are not expressible in the basic .decls file and header
+derived from it, plus, incidentally, the separation of public and
+internal headers.
+
+Package "stackc" incidentially also demonstrates the use of companion
+.c and .h files in the implementation of a package.
+
+Sources
+	Package	"cstack":	cstack.tcl, cstack.c, cstack.h, cstackInt.h
+	Package "stackc":	stackc.tcl, stackc/*.[ch]
+
+Notes:
+
+*	"cstack" implements an abstract stack data type and exports
+	a C-level API for it, as a stubs table.
+
+*	"stackc" wraps the abstract stack data type of "cstack" into
+	a Tcl class/object system where stacks are objects, each
+	represented as a Tcl command.
diff --git a/src/vfs/critcl.vfs/examples/stack/build.tcl b/src/vfs/critcl.vfs/examples/stack/build.tcl
new file mode 100644
index 00000000..53842338
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/stack/build.tcl
@@ -0,0 +1,289 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+# Order of building and installation: "cstack", then "stackc", as the
+# latter depends on the former. Not relevant for wrap4tea.
+set packages {cstack stackc}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall all packages, build for debugging.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -keep -debug symbols -cache [pwd]/BUILD.$p -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/stack/cstack.c b/src/vfs/critcl.vfs/examples/stack/cstack.c
new file mode 100644
index 00000000..2d106129
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/stack/cstack.c
@@ -0,0 +1,206 @@
+#include "cstackInt.h"
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+CSTACK
+cstack_new (CSTACK_CELL_FREE freeCell, void* clientdata)
+{
+    CSTACK s = ALLOC (CSTACK_);
+    s->cell = NALLOC (CSTACK_INITIAL_SIZE, void*);
+    s->max  = CSTACK_INITIAL_SIZE;
+    s->top  = 0;
+    s->freeCell   = freeCell;
+    s->clientData = clientdata;
+
+    return s;
+}
+
+void
+cstack_del (CSTACK s)
+{
+    if (s->freeCell && s->top) {
+	long int i;
+	for (i=0; i < s->top; i++) {
+	    ASSERT_BOUNDS(i,s->max);
+	    s->freeCell ( s->cell [i] );
+	}
+    }
+
+    ckfree ((char*) s->cell);
+    ckfree ((char*) s);
+}
+
+void
+cstack_push (CSTACK s, void* item)
+{
+    if (s->top >= s->max) {
+	long int new  = s->max ? (2 * s->max) : CSTACK_INITIAL_SIZE;
+	void**   cell = (void**) ckrealloc ((char*) s->cell, new * sizeof(void*));
+	ASSERT (cell,"Memory allocation failure for cstack");
+	s->max  = new;
+	s->cell = cell;
+    }
+
+    ASSERT_BOUNDS(s->top,s->max);
+    s->cell [s->top] = item;
+    s->top ++;
+}
+
+void*
+cstack_top (CSTACK s)
+{
+    ASSERT_BOUNDS(s->top-1,s->max);
+    return s->cell [s->top - 1];
+}
+
+void
+cstack_pop (CSTACK s, long int n)
+{
+    ASSERT (n >= 0, "Bad pop count");
+    if (n == 0) return;
+
+    if (s->freeCell) {
+	while (n) {
+	    s->top --;
+	    ASSERT_BOUNDS(s->top,s->max);
+	    s->freeCell ( s->cell [s->top] );
+	    n --;
+	}
+    } else {
+	s->top -= n;
+    }
+}
+
+void
+cstack_trim (CSTACK s, long int n)
+{
+    ASSERT (n >= 0, "Bad trimsize");
+
+    if (s->freeCell) {
+	while (s->top > n) {
+	    s->top --;
+	    ASSERT_BOUNDS(s->top,s->max);
+	    s->freeCell ( s->cell [s->top] );
+	}
+    } else {
+	s->top = n;
+    }
+}
+
+void
+cstack_drop (CSTACK s, long int n)
+{
+    ASSERT (n >= 0, "Bad pop count");
+    if (n == 0) return;
+    s->top -= n;
+}
+
+void
+cstack_move (CSTACK dst, CSTACK src)
+{
+    ASSERT (dst->freeCell == src->freeCell, "Ownership mismatch");
+
+    /*
+     * Note: The destination takes ownership of the moved cell, thus there is
+     * no need to run free on them.
+     */
+
+    while (src->top > 0) {
+	src->top --;
+	ASSERT_BOUNDS(src->top,src->max);
+	cstack_push (dst, src->cell [src->top] );
+    }
+}
+
+void
+cstack_get (CSTACK s, long int n, CSTACK_DIRECTION dir, CSTACK_SLICE* slice)
+{
+    ASSERT (n <= s->top, "Not enough elements in the cstack");
+
+    /*
+     * Note the double negation below. To get the normal order of the result,
+     * the order has to be reversed. To get the reverted order, nothing is to
+     * be done. So we revers on dir == cstack_normal.
+     *
+     * As optimization we know that direction is irrrelevant when returning a
+     * single element and thus we can use the code path not doing any
+     * allocations.
+     */
+
+    if ((dir == cstack_revers) || (n < 2)) {
+	slice->dynamic = 0;
+	slice->cell = s->cell + (s->top - n);
+    } else {
+	int i;
+
+	slice->dynamic = 1;
+	slice->cell = NALLOC (n, void*);
+
+	for (i=0; i<n; i++) {
+	    ASSERT_BOUNDS (i,n);
+	    ASSERT_BOUNDS (s->top-i-1,s->top);
+	    slice->cell [i] = s->cell [s->top-i-1];
+	}
+    }
+}
+
+void
+cstack_rol (CSTACK s, long int n, long int steps)
+{
+    long int i, j, start = s->top - n;
+    void**   cell = s->cell;
+    void**   tmp;
+
+    steps = steps % n;
+    while (steps < 0) steps += n;
+    steps = n - steps;
+    cell += start;
+
+    tmp = NALLOC(n,void*);
+
+    for (i = 0; i < n; i++) {
+	j = (i + steps) % n;
+	ASSERT_BOUNDS (i,n);
+	ASSERT_BOUNDS (j,n);
+	tmp[i] = cell [j];
+    }
+    for (i = 0; i < n; i++) {
+	ASSERT_BOUNDS (i,n);
+	cell [i] = tmp [i];
+    }
+
+    ckfree ((char*) tmp);
+}
+
+long int
+cstack_size (CSTACK s)
+{
+    return s->top;
+}
+
+void
+cstack_clientdata_set (CSTACK s, void* clientdata)
+{
+    s->clientData = clientdata;
+}
+
+void*
+cstack_clientdata_get (CSTACK s)
+{
+    return s->clientData;
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/examples/stack/cstack.h b/src/vfs/critcl.vfs/examples/stack/cstack.h
new file mode 100644
index 00000000..1501806e
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/stack/cstack.h
@@ -0,0 +1,55 @@
+#ifndef CSTACK_H
+#define CSTACK_H 1
+
+/*
+ * Forward declaration of stacks (opaque handle).
+ */
+
+typedef struct CSTACK_* CSTACK;
+
+/*
+ * Stacks are conceptually an array of void* cells, with each cell
+ * either directly containing the data, or a pointer to it.
+ *
+ * To handle the latter a pointer to a per-cell delete function is
+ * maintained, enabling the stack code to delete cells which are
+ * pointers to the actual data.
+ *
+ * Note however that the allocation of cell data is the responsibility
+ * of the stack's user.
+ */
+
+typedef void (*CSTACK_CELL_FREE) (void* cell);
+
+/*
+ * Data structure filled by 'stack_get'. The pointer to the cells may be
+ * allocated on the heap, or not. If it is allocated the flag 'dynamic' is set
+ * to true, and false otherwise.
+ */
+
+typedef struct CSTACK_SLICE_ {
+    void** cell;
+    int    dynamic;
+} CSTACK_SLICE;
+
+#define cstack_slice_cleanup(slice) \
+    if ((slice).dynamic) { ckfree ((char*) (slice).cell); }
+
+/*
+ * Cue to 'cstack_get' where to put the top element of the stack in the returned slice.
+ */
+
+typedef enum {
+    cstack_normal,  /* cstack_get returns the slice with top-element at left/beginning */
+    cstack_revers   /* cstack_get returns the slice with top-element at right/end */
+} CSTACK_DIRECTION;
+
+#endif /* CSTACK_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/examples/stack/cstack.tcl b/src/vfs/critcl.vfs/examples/stack/cstack.tcl
new file mode 100644
index 00000000..28b1eba8
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/stack/cstack.tcl
@@ -0,0 +1,83 @@
+# cstack.tcl --
+#
+#	Low-level stack data structure. With wrapping usable as
+#	a Tcl-level stack.
+#
+# Copyright (c) 2008-2011,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# Example of exporting a C-level stubs API through critcl v3, with a
+# package header file containing public type definitions, macros,
+# etc., and internal C companion files.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.6
+package require critcl 3.2
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {A C-level abstract datatype for stacks}
+
+critcl::description {
+    This package implements an abstract
+    data type for stacks, at the C-level.
+    No Tcl-binding is provided. See package
+    'stackc' for that.
+}
+
+critcl::subject stack
+critcl::subject {data structure}
+critcl::subject structure
+critcl::subject {abstract data structure}
+critcl::subject {generic data structure}
+
+# # ## ### ##### ######## ############# #####################
+## Configuration
+
+critcl::api header cstack.h
+critcl::cheaders   cstackInt.h
+
+# # ## ### ##### ######## ############# #####################
+## Exported API
+
+#
+#  Notes
+#  - push -- Item allocation is responsibility of caller.
+#            Stack takes ownership of the item.
+#  - pop  -- Stack frees allocated item.
+#  - trim -- Ditto
+#  - top  -- Provides top item, no transfer of ownership.
+#  - del  -- Releases stack, cell array, and items, if any.
+#  - drop -- Like pop, but doesn't free, assumes that caller
+#            is taking ownership of the pointer.
+#
+
+critcl::api function CSTACK     cstack_new  {CSTACK_CELL_FREE freeCell void* clientdata}
+critcl::api function void       cstack_del  {CSTACK s}
+
+critcl::api function {long int} cstack_size {CSTACK s}
+critcl::api function void*      cstack_top  {CSTACK s}
+critcl::api function void       cstack_push {CSTACK s void*      item}
+critcl::api function void       cstack_pop  {CSTACK s {long int} n}
+critcl::api function void       cstack_trim {CSTACK s {long int} n}
+critcl::api function void       cstack_drop {CSTACK s {long int} n}
+critcl::api function void       cstack_rol  {CSTACK s {long int} n {long int} step}
+critcl::api function void       cstack_get  {CSTACK s {long int} n CSTACK_DIRECTION dir CSTACK_SLICE* slice}
+critcl::api function void       cstack_move {CSTACK s CSTACK      src}
+
+critcl::api function void       cstack_clientdata_set {CSTACK s void* clientdata}
+critcl::api function void*      cstack_clientdata_get {CSTACK s}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation.
+
+critcl::csources cstack.c
+critcl::ccode {} ; # Fake the 'nothing to build detector'
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide cstack 1
diff --git a/src/vfs/critcl.vfs/examples/stack/cstackInt.h b/src/vfs/critcl.vfs/examples/stack/cstackInt.h
new file mode 100644
index 00000000..a408c173
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/stack/cstackInt.h
@@ -0,0 +1,63 @@
+#ifndef CSTACK_INT_H
+#define CSTACK_INT_H 1
+
+#include "cstack/cstackDecls.h"
+
+/*
+ * Waste a bit of space (1K) on each new stack to reduce the amount of
+ * reallocation going on for most stacks, which should be small.
+ */
+
+static const int CSTACK_INITIAL_SIZE = 256;
+
+/*
+ * Actual type of the stack data structure. Used only inside of the
+ * package.
+ */
+
+typedef struct CSTACK_ {
+    long int        max;   /* Size of the cell array. */
+    long int        top;   /* Index of the topmost _unused_ cell in the
+			    * array === Index of the _next_ cell to use
+			    * === Size of the stack. */
+    CSTACK_CELL_FREE freeCell;
+    void*           clientData;
+
+    void**          cell;  /* Array of the stack cells. */
+} CSTACK_;
+
+/*
+ * Allocation macros for common situations.
+ */
+
+#define ALLOC(type)    (type *) ckalloc (sizeof (type))
+#define NALLOC(n,type) (type *) ckalloc ((n) * sizeof (type))
+
+/*
+ * Assertions in general, and asserting the proper range of an array
+ * index.
+ */
+
+#undef  CSTACK_DEBUG
+#define CSTACK_DEBUG 1
+
+#ifdef CSTACK_DEBUG
+#define XSTR(x) #x
+#define STR(x) XSTR(x)
+#define RANGEOK(i,n) ((0 <= (i)) && (i < (n)))
+#define ASSERT(x,msg) if (!(x)) { Tcl_Panic (msg " (" #x "), in file " __FILE__ " @line " STR(__LINE__));}
+#define ASSERT_BOUNDS(i,n) ASSERT (RANGEOK(i,n),"array index out of bounds: " STR(i) " > " STR(n))
+#else
+#define ASSERT(x,msg)
+#define ASSERT_BOUNDS(i,n)
+#endif
+
+#endif /* CSTACK_INT_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/examples/stack/stackc.tcl b/src/vfs/critcl.vfs/examples/stack/stackc.tcl
new file mode 100644
index 00000000..0df3dab3
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/stack/stackc.tcl
@@ -0,0 +1,93 @@
+# stackc.tcl --
+#
+#       Implementation of a stack data structure for Tcl.
+#       This code based on critcl v3.1, API compatible to the PTI [x].
+#       [x] Pure Tcl Implementation.
+#
+# Demonstrates not just the stubs import and meta data declaration,
+# but also the utility package for the creation of classes and objects
+# in C, with both claaes and their instances represented as Tcl
+# commands.
+#
+# Copyright (c) 2012,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::buildrequirement {
+    package require critcl::class ; # DSL, easy spec of Tcl class/object commands.
+}
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} {BSD licensed}
+
+critcl::summary {Stack objects for Tcl.}
+
+critcl::description {
+    This package implements stack objects
+    for Tcl. It uses the abstract data type
+    provided by package 'cstack' for actual
+    storage and operations.
+}
+
+critcl::subject stack
+critcl::subject {data structure}
+critcl::subject structure
+critcl::subject {abstract data structure}
+critcl::subject {generic data structure}
+
+# # ## ### ##### ######## ############# #####################
+## Configuration and implementation.
+
+critcl::api import cstack 1
+
+critcl::cheaders stackc/*.h ; # Method declarations and implementation,
+critcl::csources stackc/*.c ; # outside of this main file.
+
+critcl::class::define ::stackc {
+    include m.h                  ; # Method function declarations.
+    include cstack/cstackDecls.h ; # API of the generic CSTACK we are binding to.
+    type    CSTACK
+
+    constructor {
+	instance = cstack_new (StackcFreeCell, 0);
+    } {
+	/* Set back reference from CSTACK instance to instance command */
+	cstack_clientdata_set (instance, (ClientData) cmd);
+    }
+
+    destructor {
+	/* Release the whole stack. */
+	cstack_del (instance);
+    }
+
+    method clear   as stm_CLEAR
+    method destroy as stm_DESTROY
+    method peek    as stm_PEEK 0 0
+    method peekr   as stm_PEEK 0 1
+    method pop     as stm_PEEK 1 0
+    method push    as stm_PUSH
+    method rotate  as stm_ROTATE
+    method size    as stm_SIZE
+    method get     as stm_GET 0
+    method getr    as stm_GET 1
+    method trim    as stm_TRIM 1
+    method trimv   as stm_TRIM 0
+
+    support {
+	static void
+	StackcFreeCell (void* cell) {
+	    /* Release the cell. */
+	    Tcl_DecrRefCount ((Tcl_Obj*) cell);
+	}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide stackc 1
diff --git a/src/vfs/critcl.vfs/examples/stack/stackc/m.c b/src/vfs/critcl.vfs/examples/stack/stackc/m.c
new file mode 100644
index 00000000..e97e7334
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/stack/stackc/m.c
@@ -0,0 +1,372 @@
+/* ::stack - critcl - layer 3 definitions.
+ *
+ * -> Method functions.
+ *    Implementations for all stack methods.
+ */
+
+#include "util.h"
+#include "m.h"
+
+/* .................................................. */
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * stm_CLEAR --
+ *
+ *	Removes all elements currently on the stack. I.e empties the stack.
+ *
+ * Results:
+ *	A standard Tcl result code.
+ *
+ * Side effects:
+ *	Only internal, memory allocation changes ...
+ *
+ *---------------------------------------------------------------------------
+ */
+
+int
+stm_CLEAR (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: stack clear
+     *	       [0]   [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    cstack_pop (s, cstack_size (s));
+    return TCL_OK;
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * stm_DESTROY --
+ *
+ *	Destroys the whole stack object.
+ *
+ * Results:
+ *	A standard Tcl result code.
+ *
+ * Side effects:
+ *	Releases memory.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+int
+stm_DESTROY (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: stack destroy
+     *	       [0]   [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    Tcl_DeleteCommandFromToken(interp, (Tcl_Command) cstack_clientdata_get (s));
+    return TCL_OK;
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * stm_GET --
+ *
+ *	Non-destructively retrieves all elements of the stack.
+ *
+ * Results:
+ *	A standard Tcl result code.
+ *
+ * Side effects:
+ *	Only internal, memory allocation changes ...
+ *
+ *---------------------------------------------------------------------------
+ */
+
+int
+stm_GET (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv, int revers)
+{
+    /* Syntax: stack get
+     *	       [0]  [1]
+     */
+
+    long int n;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    n = cstack_size (s);
+
+    if (!n) {
+	Tcl_SetObjResult (interp, Tcl_NewListObj (0,NULL));
+    } else {
+	CSTACK_SLICE sl;
+
+	cstack_get (s, n, (CSTACK_DIRECTION) revers, &sl);
+	Tcl_SetObjResult (interp, Tcl_NewListObj (n, (Tcl_Obj**) sl.cell));
+	cstack_slice_cleanup (sl);
+    }
+
+    return TCL_OK;
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * stm_TRIM --
+ *
+ *	Destructively retrieves one or more elements from the top of the
+ *	stack, trims the stack to a new size.
+ *
+ * Results:
+ *	A standard Tcl result code.
+ *
+ * Side effects:
+ *	Only internal, memory allocation changes ...
+ *
+ *---------------------------------------------------------------------------
+ */
+
+int
+stm_TRIM (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv, int ret)
+{
+    /* Syntax: stack trim N
+     *	       [0]  [1]   [2]
+     */
+
+    int n, len;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "newsize");
+	return TCL_ERROR;
+    }
+
+    if (Tcl_GetIntFromObj(interp, objv[2], &n) != TCL_OK) {
+	    return TCL_ERROR;
+    } else if (n < 0) {
+	Tcl_AppendResult (interp, "invalid size ",
+			  Tcl_GetString (objv[2]),
+			  NULL);
+	return TCL_ERROR;
+    }
+
+    len = cstack_size (s);
+
+    if (len <= n) {
+	Tcl_SetObjResult (interp, Tcl_NewListObj (0,NULL));
+    } else {
+	if (ret) {
+	    CSTACK_SLICE sl;
+
+	    cstack_get (s, len-n, cstack_normal, &sl);
+
+	    Tcl_SetObjResult (interp, Tcl_NewListObj (len-n, (Tcl_Obj**) sl.cell));
+
+	    cstack_slice_cleanup (sl);
+	}
+	cstack_trim (s, n);
+    }
+
+    return TCL_OK;
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * stm_PEEK/POP --
+ *
+ *	(Non-)destructively retrieves one or more elements from the top of the
+ *	stack.
+ *
+ * Results:
+ *	A standard Tcl result code.
+ *
+ * Side effects:
+ *	Only internal, memory allocation changes ...
+ *
+ *---------------------------------------------------------------------------
+ */
+
+int
+stm_PEEK (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv, int pop, int revers)
+{
+    /* Syntax: stack peek|pop ?n?
+     *	       [0]  [1]       [2]
+     */
+
+    int n = 1;
+
+    if ((objc != 2) && (objc != 3)) {
+	Tcl_WrongNumArgs (interp, 2, objv, "?n?");
+	return TCL_ERROR;
+    }
+
+    if (objc == 3) {
+	if (Tcl_GetIntFromObj(interp, objv[2], &n) != TCL_OK) {
+	    return TCL_ERROR;
+	} else if (n < 1) {
+	    Tcl_AppendResult (interp, "invalid item count ",
+			      Tcl_GetString (objv[2]),
+			      NULL);
+	    return TCL_ERROR;
+	}
+    }
+
+    if (n > cstack_size (s)) {
+       Tcl_AppendResult (interp,
+                          "insufficient items on stack to fill request",
+                          NULL);
+        return TCL_ERROR;
+    } else {
+	CSTACK_SLICE sl;
+
+	cstack_get (s, n, (CSTACK_DIRECTION) revers, &sl);
+
+	if (n == 1) {
+	    Tcl_SetObjResult (interp, (Tcl_Obj*) sl.cell[0]);
+	} else {
+	    Tcl_SetObjResult (interp, Tcl_NewListObj (n, (Tcl_Obj**) sl.cell));
+	}
+
+	cstack_slice_cleanup (sl);
+
+	if (pop) {
+	    cstack_pop (s, n);
+	}
+    }
+
+    return TCL_OK;
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * stm_PUSH --
+ *
+ *	Adds one or more elements to the stack.
+ *
+ * Results:
+ *	A standard Tcl result code.
+ *
+ * Side effects:
+ *	May release and allocate memory.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+int
+stm_PUSH (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: stack push item...
+     *	       [0]   [1]  [2]
+     */
+
+    int i;
+
+    if (objc < 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "item ?item ...?");
+	return TCL_ERROR;
+    }
+
+    for (i = 2; i < objc; i++) {
+	cstack_push (s, objv[i]);
+	Tcl_IncrRefCount (objv[i]);
+    }
+
+    return TCL_OK;
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * stm_ROTATE --
+ *
+ *	Rotates the N top elements of the stack by K steps.
+ *
+ * Results:
+ *	A standard Tcl result code.
+ *
+ * Side effects:
+ *	May release and allocate memory.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+int
+stm_ROTATE (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: stack rotate count steps
+     *	       [0]   [1]    [2]   [3]
+     */
+
+    int n, steps;
+
+    if (objc != 4) {
+	Tcl_WrongNumArgs (interp, 2, objv, "count steps");
+	return TCL_ERROR;
+    }
+
+    if (Tcl_GetIntFromObj(interp, objv[2], &n) != TCL_OK) {
+	return TCL_ERROR;
+    }
+    if (Tcl_GetIntFromObj(interp, objv[3], &steps) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    if (n > cstack_size (s)) {
+	Tcl_AppendResult (interp, "insufficient items on stack to fill request",
+			  NULL);
+	return TCL_ERROR;
+    }
+
+    cstack_rol (s, n, steps);
+    return TCL_OK;
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * stm_SIZE --
+ *
+ *	Returns the number of elements currently held by the stack.
+ *
+ * Results:
+ *	A standard Tcl result code.
+ *
+ * Side effects:
+ *	None.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+int
+stm_SIZE (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: stack size
+     *	       [0]   [1]
+     */
+
+    if ((objc != 2)) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    Tcl_SetObjResult  (interp, Tcl_NewIntObj (cstack_size (s)));
+    return TCL_OK;
+}
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/examples/stack/stackc/m.h b/src/vfs/critcl.vfs/examples/stack/stackc/m.h
new file mode 100644
index 00000000..dd842dd5
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/stack/stackc/m.h
@@ -0,0 +1,28 @@
+/* ::stack - critcl - layer 3 declarations
+ * Method functions.
+ */
+
+#ifndef _M_H
+#define _M_H 1
+
+#include "tcl.h"
+#include <cstack/cstackDecls.h>
+
+int stm_CLEAR   (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int stm_DESTROY (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int stm_PEEK    (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv, int pop, int revers);
+int stm_PUSH    (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int stm_ROTATE  (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int stm_SIZE    (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int stm_GET     (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv, int revers);
+int stm_TRIM    (CSTACK s, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv, int ret);
+
+#endif /* _M_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/examples/stack/stackc/util.h b/src/vfs/critcl.vfs/examples/stack/stackc/util.h
new file mode 100644
index 00000000..380c2f9c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/stack/stackc/util.h
@@ -0,0 +1,41 @@
+/* stackc - critcl - layer 0 declarations
+ * API general utilities
+ */
+
+#ifndef _UTIL_H
+#define _UTIL_H 1
+
+#include <tcl.h>
+
+/* Allocation macros for common situations.
+ */
+
+#define ALLOC(type)    (type *) ckalloc (sizeof (type))
+#define NALLOC(n,type) (type *) ckalloc ((n) * sizeof (type))
+
+/* Assertions in general, and asserting the proper range of an array index.
+ */
+
+#undef  STACKC_DEBUG
+#define STACKC_DEBUG 1
+
+#ifdef STACKC_DEBUG
+#define XSTR(x) #x
+#define STR(x) XSTR(x)
+#define RANGEOK(i,n) ((0 <= (i)) && (i < (n)))
+#define ASSERT(x,msg) if (!(x)) { Tcl_Panic (msg " (" #x "), in file " __FILE__ " @line " STR(__LINE__));}
+#define ASSERT_BOUNDS(i,n) ASSERT (RANGEOK(i,n),"array index out of bounds: " STR(i) " > " STR(n))
+#else
+#define ASSERT(x,msg)
+#define ASSERT_BOUNDS(i,n)
+#endif
+
+#endif /* _UTIL_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/examples/tk8.4/build.tcl b/src/vfs/critcl.vfs/examples/tk8.4/build.tcl
new file mode 100644
index 00000000..4209066f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/tk8.4/build.tcl
@@ -0,0 +1,287 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {icounter}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall all packages, build for debugging.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -keep -debug symbols -cache [pwd]/BUILD.$p -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/tk8.4/cr.tcl b/src/vfs/critcl.vfs/examples/tk8.4/cr.tcl
new file mode 100644
index 00000000..96fef714
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/tk8.4/cr.tcl
@@ -0,0 +1,48 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+catch {puts [package ifneeded critcl::platform [package present critcl::platform]]}
+catch {puts [package ifneeded platform [package present platform]]}
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/tk8.4/example.tcl b/src/vfs/critcl.vfs/examples/tk8.4/example.tcl
new file mode 100644
index 00000000..db048941
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/tk8.4/example.tcl
@@ -0,0 +1,6 @@
+
+# Force compile and load.
+catch {icounter 4}
+
+ex icounter 0
+ex ::icounter -1
diff --git a/src/vfs/critcl.vfs/examples/tk8.4/icounter.tcl b/src/vfs/critcl.vfs/examples/tk8.4/icounter.tcl
new file mode 100644
index 00000000..d61f5b63
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/tk8.4/icounter.tcl
@@ -0,0 +1,47 @@
+# tk8.4.tcl --
+#
+#       Implementation of a counter associated an interpreter.
+#       This code based on critcl v3.1, API compatible to the PTI [x].
+#       [x] Pure Tcl Implementation.
+#
+# Copyright (c) 2016,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::buildrequirement {
+    package require critcl::iassoc ; # Maintain an interpreter association.
+}
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::tcl 8.4
+critcl::tk
+
+# # ## ### ##### ######## ############# #####################
+## Define and maintain the per-interp structure.
+
+critcl::iassoc::def icounter {int base} {
+    int counter; /* The counter variable */
+} {
+    data->counter = base;
+} {
+    /* Nothing to release */
+}
+
+# # ## ### ##### ######## ############# #####################
+## Access and expose the per-interp structure to scripts.
+
+critcl::cproc icounter {Tcl_Interp* interp int base} int {
+    icounter_data d = icounter (interp, base);
+    d->counter ++;
+    return d->counter;
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide icounter 1
diff --git a/src/vfs/critcl.vfs/examples/tk8.5/build.tcl b/src/vfs/critcl.vfs/examples/tk8.5/build.tcl
new file mode 100644
index 00000000..4209066f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/tk8.5/build.tcl
@@ -0,0 +1,287 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {icounter}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall all packages, build for debugging.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -keep -debug symbols -cache [pwd]/BUILD.$p -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/tk8.5/cr.tcl b/src/vfs/critcl.vfs/examples/tk8.5/cr.tcl
new file mode 100644
index 00000000..96fef714
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/tk8.5/cr.tcl
@@ -0,0 +1,48 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+catch {puts [package ifneeded critcl::platform [package present critcl::platform]]}
+catch {puts [package ifneeded platform [package present platform]]}
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/tk8.5/example.tcl b/src/vfs/critcl.vfs/examples/tk8.5/example.tcl
new file mode 100644
index 00000000..db048941
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/tk8.5/example.tcl
@@ -0,0 +1,6 @@
+
+# Force compile and load.
+catch {icounter 4}
+
+ex icounter 0
+ex ::icounter -1
diff --git a/src/vfs/critcl.vfs/examples/tk8.5/icounter.tcl b/src/vfs/critcl.vfs/examples/tk8.5/icounter.tcl
new file mode 100644
index 00000000..b88a9ab4
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/tk8.5/icounter.tcl
@@ -0,0 +1,47 @@
+# tk8.5.tcl --
+#
+#       Implementation of a counter associated an interpreter.
+#       This code based on critcl v3.1, API compatible to the PTI [x].
+#       [x] Pure Tcl Implementation.
+#
+# Copyright (c) 2016,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::buildrequirement {
+    package require critcl::iassoc ; # Maintain an interpreter association.
+}
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::tcl 8.5
+critcl::tk
+
+# # ## ### ##### ######## ############# #####################
+## Define and maintain the per-interp structure.
+
+critcl::iassoc::def icounter {int base} {
+    int counter; /* The counter variable */
+} {
+    data->counter = base;
+} {
+    /* Nothing to release */
+}
+
+# # ## ### ##### ######## ############# #####################
+## Access and expose the per-interp structure to scripts.
+
+critcl::cproc icounter {Tcl_Interp* interp int base} int {
+    icounter_data d = icounter (interp, base);
+    d->counter ++;
+    return d->counter;
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide icounter 1
diff --git a/src/vfs/critcl.vfs/examples/tk8.6/build.tcl b/src/vfs/critcl.vfs/examples/tk8.6/build.tcl
new file mode 100644
index 00000000..4209066f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/tk8.6/build.tcl
@@ -0,0 +1,287 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {icounter}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall all packages, build for debugging.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	puts ""
+
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -keep -debug symbols -cache [pwd]/BUILD.$p -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/tk8.6/cr.tcl b/src/vfs/critcl.vfs/examples/tk8.6/cr.tcl
new file mode 100644
index 00000000..96fef714
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/tk8.6/cr.tcl
@@ -0,0 +1,48 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+catch {puts [package ifneeded critcl::platform [package present critcl::platform]]}
+catch {puts [package ifneeded platform [package present platform]]}
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/tk8.6/example.tcl b/src/vfs/critcl.vfs/examples/tk8.6/example.tcl
new file mode 100644
index 00000000..db048941
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/tk8.6/example.tcl
@@ -0,0 +1,6 @@
+
+# Force compile and load.
+catch {icounter 4}
+
+ex icounter 0
+ex ::icounter -1
diff --git a/src/vfs/critcl.vfs/examples/tk8.6/icounter.tcl b/src/vfs/critcl.vfs/examples/tk8.6/icounter.tcl
new file mode 100644
index 00000000..29cc4a22
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/tk8.6/icounter.tcl
@@ -0,0 +1,47 @@
+# tk8.6.tcl --
+#
+#       Implementation of a counter associated an interpreter.
+#       This code based on critcl v3.1, API compatible to the PTI [x].
+#       [x] Pure Tcl Implementation.
+#
+# Copyright (c) 2012,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.6
+package require critcl 3.2
+
+critcl::buildrequirement {
+    package require critcl::iassoc ; # Maintain an interpreter association.
+}
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::tcl 8.6
+critcl::tk
+
+# # ## ### ##### ######## ############# #####################
+## Define and maintain the per-interp structure.
+
+critcl::iassoc::def icounter {int base} {
+    int counter; /* The counter variable */
+} {
+    data->counter = base;
+} {
+    /* Nothing to release */
+}
+
+# # ## ### ##### ######## ############# #####################
+## Access and expose the per-interp structure to scripts.
+
+critcl::cproc icounter {Tcl_Interp* interp int base} int {
+    icounter_data d = icounter (interp, base);
+    d->counter ++;
+    return d->counter;
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide icounter 1
diff --git a/src/vfs/critcl.vfs/examples/trace/build.tcl b/src/vfs/critcl.vfs/examples/trace/build.tcl
new file mode 100644
index 00000000..cdd0f38f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/trace/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {pool}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -keep -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/trace/cr.tcl b/src/vfs/critcl.vfs/examples/trace/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/trace/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/trace/example.tcl b/src/vfs/critcl.vfs/examples/trace/example.tcl
new file mode 100644
index 00000000..6273f5b0
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/trace/example.tcl
@@ -0,0 +1,9 @@
+
+# Force compile and load.
+catch {str}
+
+ex str  1
+ex xstr 3
+ex moon
+ex nothing
+ex xstr sun
diff --git a/src/vfs/critcl.vfs/examples/trace/pool.tcl b/src/vfs/critcl.vfs/examples/trace/pool.tcl
new file mode 100644
index 00000000..cec3d02a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/trace/pool.tcl
@@ -0,0 +1,65 @@
+# pool.tcl --
+#
+#	A template demonstrating the cproc/ccommand tracing facility.
+#	Built on top of the string pool demonstrator.
+#
+# Copyright (c) 2014,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl              8.6
+package require critcl           3.2
+package require critcl::literals 1.1 ;# result-type
+
+# Activate tracing code
+critcl::config trace yes
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Tracing cproc, ccomands, etc}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to activate the builtin
+    tracing of cprocs, ccommands, etc.
+}
+
+critcl::subject demonstration trace {narrative trace} debug
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::literals::def demo {
+    here  "here"
+    comes "comes"
+    the   "the"
+    sun   "sun"
+}
+
+critcl::cproc str {Tcl_Interp* ip int code} object {
+    Tcl_Obj* res = demo (ip, code);
+    Tcl_IncrRefCount (res);
+    return res;
+}
+
+critcl::cproc xstr {Tcl_Interp* ip int code} demo {
+    return code;
+}
+
+critcl::cconst moon int 55
+
+critcl::ccommand nothing {} {
+    /* Set nothing */
+    return TCL_OK;
+}
+
+# str 0
+# str 7 - panic, abort, core dump
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide pool 1
diff --git a/src/vfs/critcl.vfs/examples/variadic/build.tcl b/src/vfs/critcl.vfs/examples/variadic/build.tcl
new file mode 100644
index 00000000..05c87e96
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/variadic/build.tcl
@@ -0,0 +1,283 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {variadic}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\]." }
+proc _install {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\]." }
+proc _debug {{ldir {}}} {
+    global packages
+    if {[llength [info level 0]] < 2} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD.$p
+	critcl::app::main [list -cache [pwd]/BUILD.$p -keep -debug all -libdir $ldir -includedir $idir -pkg $src]
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/variadic/cr.tcl b/src/vfs/critcl.vfs/examples/variadic/cr.tcl
new file mode 100644
index 00000000..3d3c180c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/variadic/cr.tcl
@@ -0,0 +1,45 @@
+#!/usr/bin/env tclsh
+# -*- tcl -*-
+# Run the example via mode "compile & run".
+# Note: generic code, same in all examples.
+
+cd [file dirname [file normalize [info script]]]
+source ../../lib/critcl/critcl.tcl
+
+# Show the config
+puts ""
+puts "target-config:   [critcl::targetconfig]"
+puts "target-platform: [critcl::targetplatform]"
+puts "target-actual:   [critcl::actualtarget]"
+puts "build-platform:  [critcl::buildplatform]"
+puts "cache:           [critcl::cache]"
+puts ""
+
+# Pull the package, ignoring build and examples ...
+foreach f [glob *.tcl] {
+    if {[string match build* $f]} continue
+    if {[string match cr* $f]} continue
+    if {[string match example* $f]} continue
+
+    puts "Reading $f ..."
+    source $f
+}
+
+proc ex {args} {
+    set code [catch {uplevel 1 $args} result]
+    set code [string map {0 ok 1 error 2 break 3 continue} $code]
+    set max  [expr {80 - [string length $args] - [string length "Example: "]}]
+    puts "Example: $args [string repeat _ $max]"
+    puts "Code:    (($code))"
+    puts "Result:  (($result))"
+    puts ""
+    return
+}
+
+# ... and run the examples.
+foreach f [glob -nocomplain example*] {
+    puts "Running $f ..."
+    source $f
+}
+
+exit
diff --git a/src/vfs/critcl.vfs/examples/variadic/example.tcl b/src/vfs/critcl.vfs/examples/variadic/example.tcl
new file mode 100644
index 00000000..ad220d92
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/variadic/example.tcl
@@ -0,0 +1,16 @@
+#!/usr/bin/env tclsh
+
+package require Tcl 8.5
+package require variadic
+
+foreach a {
+    {}
+    {6}
+    {6 7}
+    {6 7 8}
+    {6 7 8 9}
+    {6 7 8 9 0}
+} {
+    ex variadic  {*}$a
+    ex ovariadic {*}$a
+}
diff --git a/src/vfs/critcl.vfs/examples/variadic/variadic.tcl b/src/vfs/critcl.vfs/examples/variadic/variadic.tcl
new file mode 100644
index 00000000..d0f53a11
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/variadic/variadic.tcl
@@ -0,0 +1,48 @@
+# variadic.tcl --
+#
+#	A template demonstrating the handling of variadic arguments
+#	to cproc.
+#
+# Copyright (c) 2012,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.6
+package require critcl 3.2
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {Variadic arguments for cproc}
+
+critcl::description {
+    This package implements nothing. It serves only as a
+    demonstration and template on how to declare cproc's
+    with variadic arguments.
+}
+
+critcl::subject demonstration {cproc variadic arguments}
+#critcl::config lines 0
+
+# # ## ### ##### ######## ############# #####################
+## C code.
+
+critcl::cproc variadic {int args} void {
+    int i;
+    for (i=0; i < args.c; i++) printf ("[%2d] = %d\n", i, args.v[i]);
+    fflush(stdout);
+}
+
+critcl::cproc ovariadic {Tcl_Obj* args} void {
+    int i;
+    for (i=0; i < args.c; i++) printf ("[%2d] = '%s'\n", i, Tcl_GetString(args.v[i]));
+    fflush(stdout);
+}
+
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide variadic 1
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/README.txt b/src/vfs/critcl.vfs/examples/zlibwrap/README.txt
new file mode 100644
index 00000000..26174bae
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/README.txt
@@ -0,0 +1,15 @@
+Example of critcl-based packages.
+
+A larger example written to demonstrate
+
+	Export of an API from an external 3rd party library as Tcl stubs table.
+	Build switchability between
+		linking a system instance of the 3rd party library
+	and	building a static library from local sources and
+		linking against this.
+
+Sources
+	Package "zlib":			zlib.tcl
+	Local sources of C zlib:	zlib/
+
+Notes:
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/build.tcl b/src/vfs/critcl.vfs/examples/zlibwrap/build.tcl
new file mode 100644
index 00000000..dabb3cfa
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/build.tcl
@@ -0,0 +1,293 @@
+#!/bin/sh
+# -*- tcl -*- \
+exec tclsh "$0" ${1+"$@"}
+set me [file normalize [info script]]
+set packages {zlib}
+proc main {} {
+    global argv tcl_platform tag
+    set tag {}
+    if {![llength $argv]} {
+	if {$tcl_platform(platform) eq "windows"} {
+	    set argv gui
+	} else {
+	    set argv help
+	}
+    }
+    if {[catch {
+	eval _$argv
+    }]} usage
+    exit 0
+}
+proc usage {{status 1}} {
+    global errorInfo
+    if {[info exists errorInfo] && ($errorInfo ne {}) &&
+	![string match {invalid command name "_*"*} $errorInfo]
+    } {
+	puts stderr $::errorInfo
+	exit
+    }
+
+    global argv0
+    set prefix "Usage: "
+    foreach c [lsort -dict [info commands _*]] {
+	set c [string range $c 1 end]
+	if {[catch {
+	    H${c}
+	} res]} {
+	    puts stderr "$prefix$argv0 $c args...\n"
+	} else {
+	    puts stderr "$prefix$argv0 $c $res\n"
+	}
+	set prefix "       "
+    }
+    exit $status
+}
+proc tag {t} {
+    global tag
+    set tag $t
+    return
+}
+proc myexit {} {
+    tag ok
+    puts DONE
+    return
+}
+proc log {args} {
+    global tag
+    set newline 1
+    if {[lindex $args 0] eq "-nonewline"} {
+	set newline 0
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] == 2} {
+	lassign $args chan text
+	if {$chan ni {stdout stderr}} {
+	    ::_puts {*}[lrange [info level 0] 1 end]
+	    return
+	}
+    } else {
+	set text [lindex $args 0]
+	set chan stdout
+    }
+    # chan <=> tag, if not overriden
+    if {[string match {Files left*} $text]} {
+	set tag warn
+	set text \n$text
+    }
+    if {$tag eq {}} { set tag $chan }
+    #::_puts $tag/$text
+
+    .t insert end-1c $text $tag
+    set tag {}
+    if {$newline} {
+	.t insert end-1c \n
+    }
+
+    update
+    return
+}
+proc +x {path} {
+    catch { file attributes $path -permissions u+x }
+    return
+}
+proc grep {file pattern} {
+    set lines [split [read [set chan [open $file r]]] \n]
+    close $chan
+    return [lsearch -all -inline -glob $lines $pattern]
+}
+proc version {file} {
+    set provisions [grep $file {*package provide*}]
+    #puts /$provisions/
+    return [lindex $provisions 0 3]
+}
+proc Hhelp {} { return "\n\tPrint this help" }
+proc _help {} {
+    usage 0
+    return
+}
+proc Hrecipes {} { return "\n\tList all brew commands, without details." }
+proc _recipes {} {
+    set r {}
+    foreach c [info commands _*] {
+	lappend r [string range $c 1 end]
+    }
+    puts [lsort -dict $r]
+    return
+}
+proc Hinstall {} { return "?destination? ?mode?\n\tInstall all packages, and application.\n\tdestination = path of package directory, default \[info library\].\n\tmode        = Build mode, one of system, system-static, or local. Default is system." }
+proc _install {{ldir {}} {mode {}}} {
+    global packages
+    if {$ldir eq {}} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force [pwd]/BUILD
+
+	if {$mode eq {}} {
+	    critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+	} else {
+	    critcl::app::main [list -with-mode $mode -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
+	}
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hdebug {} { return "?destination? ?mode?\n\tInstall debug builds of all packages.\n\tdestination = path of package directory, default \[info library\].\n\tmode        = Build mode, one of system, system-static, or local. Default is system." }
+proc _debug {{ldir {}} {mode {}}} {
+    global packages
+    if {$ldir eq {}} {
+	set ldir [info library]
+	set idir [file dirname [file dirname $ldir]]/include
+    } else {
+	set idir [file dirname $ldir]/include
+    }
+
+    # Create directories, might not exist.
+    file mkdir $idir
+    file mkdir $ldir
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force [pwd]/BUILD.$p
+
+	if {$mode eq {}} {
+	    critcl::app::main [list -keep -debug all -cache [pwd]/BUILD.$p -libdir $ldir -includedir $idir -pkg $src]
+	} else {
+	    critcl::app::main [list -keep -debug all -with-mode $mode -cache [pwd]/BUILD.$p -libdir $ldir -includedir $idir -pkg $src]
+	}
+
+	if {![file exists $ldir/$p]} {
+	    set ::NOTE {warn {DONE, with FAILURES}}
+	    break
+	}
+
+	file delete -force $ldir/$p$version
+	file rename        $ldir/$p $ldir/$p$version
+
+	puts -nonewline "Installed package:     "
+	tag ok
+	puts $ldir/$p$version
+    }
+    return
+}
+proc Hgui {} { return "\n\tInstall all packages, and application.\n\tDone from a small GUI." }
+proc _gui {} {
+    global INSTALLPATH
+    package require Tk
+    package require widget::scrolledwindow
+
+    wm protocol . WM_DELETE_WINDOW ::_exit
+
+    label  .l -text {Install Path: }
+    entry  .e -textvariable ::INSTALLPATH
+    button .i -command Install -text Install
+
+    widget::scrolledwindow .st -borderwidth 1 -relief sunken
+    text   .t
+    .st setwidget .t
+
+    .t tag configure stdout -font {Helvetica 8}
+    .t tag configure stderr -background red    -font {Helvetica 12}
+    .t tag configure ok     -background green  -font {Helvetica 8}
+    .t tag configure warn   -background yellow -font {Helvetica 12}
+
+    grid .l  -row 0 -column 0 -sticky new
+    grid .e  -row 0 -column 1 -sticky new
+    grid .i  -row 0 -column 2 -sticky new
+    grid .st -row 1 -column 0 -sticky swen -columnspan 2
+
+    grid rowconfigure . 0 -weight 0
+    grid rowconfigure . 1 -weight 1
+
+    grid columnconfigure . 0 -weight 0
+    grid columnconfigure . 1 -weight 1
+    grid columnconfigure . 2 -weight 0
+
+    set INSTALLPATH [info library]
+
+    # Redirect all output into our log window, and disable uncontrolled exit.
+    rename ::puts ::_puts
+    rename ::log ::puts
+    rename ::exit   ::_exit
+    rename ::myexit ::exit
+
+    # And start to interact with the user.
+    vwait forever
+    return
+}
+proc Install {} {
+    global INSTALLPATH NOTE
+    .i configure -state disabled
+
+    set NOTE {ok DONE}
+    set fail [catch {
+	_install $INSTALLPATH
+
+	puts ""
+	tag  [lindex $NOTE 0]
+	puts [lindex $NOTE 1]
+    } e o]
+
+    .i configure -state normal
+    .i configure -command ::_exit -text Exit -bg green
+
+    if {$fail} {
+	# rethrow
+	return {*}$o $e
+    }
+    return
+}
+proc Hwrap4tea {} { return "?destination?\n\tGenerate a source package with TEA-based build system wrapped around critcl.\n\tdestination = path of source package directory, default is sub-directory 'tea' of the CWD." }
+proc _wrap4tea {{dst {}}} {
+    global packages
+
+    if {[llength [info level 0]] < 2} {
+	set dst [file join [pwd] tea]
+    }
+
+    file mkdir $dst
+
+    package require critcl::app
+
+    foreach p $packages {
+	set src     [file dirname $::me]/$p.tcl
+	set version [version $src]
+
+	file delete -force             [pwd]/BUILD
+	critcl::app::main [list -cache [pwd]/BUILD -libdir $dst -tea $src]
+	file delete -force         $dst/$p$version
+	file rename        $dst/$p $dst/$p$version
+
+	puts "Wrapped package:     $dst/$p$version"
+    }
+    return
+}
+main
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib.tcl b/src/vfs/critcl.vfs/examples/zlibwrap/zlib.tcl
new file mode 100644
index 00000000..d03210b8
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib.tcl
@@ -0,0 +1,327 @@
+# zlib.tcl --
+#
+#	Low-level wrapper around libz, making it a Tcl package.
+#
+# Copyright (c) 2011,2022 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# Example of exporting a C-level stubs API through critcl v3, linking
+# against an external library and/or baking in the library using its sources.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.6
+package require critcl 3.2
+
+# # ## ### ##### ######## ############# #####################
+## Administrivia
+
+critcl::license {Andreas Kupries} BSD
+
+critcl::summary {A C-level wrapper of the zlib compression library}
+critcl::description {
+    This package wraps around zlib, making its
+    C-level functions available as Tcl package,
+    with stubs. No Tcl-binding is provided.
+}
+
+critcl::subject gzip zip zlib libz
+critcl::subject compression {data compression}
+critcl::subject decompression {data decompression}
+
+# # ## ### ##### ######## ############# #####################
+## Configuration
+
+critcl::userconfig define mode {
+    choose the zlib to build and link against.
+} {
+    system
+    system-static
+    local
+}
+
+# # ## ### ##### ######## ############# #####################
+## Exported API
+
+critcl::api scspec ZEXTERN
+
+# # ## ### ##### ######## ############# #####################
+##  Misc. interfaces
+
+critcl::api function {const char *} zlibVersion {}
+critcl::api function {const char *} zError      {int err}
+
+critcl::api function uLong crc32 {
+    uLong crc
+    {const Bytef *} buf
+    uInt len
+}
+
+critcl::api function uLong adler32 {
+    uLong adler
+    {const Bytef *} buf
+    uInt len
+}
+
+# # ## ### ##### ######## ############# #####################
+##  Deflate = Compression
+
+critcl::api function int deflateInit_ {
+    z_streamp      stream
+    int            level
+    {const char *} version
+    int            stream_size
+}
+
+critcl::api function int deflateInit2_ {
+    z_streamp stream
+    int            level
+    int            method
+    int            windowBits
+    int            memLevel
+    int            strategy
+    {const char *} version
+    int            stream_size
+}
+
+critcl::api function int deflate {
+    z_streamp stream
+    int       flush
+}
+
+critcl::api function int deflateEnd {
+    z_streamp stream
+}
+
+critcl::api function int deflateSetDictionary {
+    z_streamp       stream
+    {const Bytef *} dict
+    uInt            dictLength
+}
+
+critcl::api function int deflateCopy {
+    z_streamp dst
+    z_streamp src
+}
+
+critcl::api function int deflateReset {
+    z_streamp stream
+}
+
+critcl::api function int deflateParams {
+    z_streamp stream
+    int       level
+    int       strategy
+}
+
+# # ## ### ##### ######## ############# #####################
+##
+
+critcl::api function int compress {
+    {Bytef *}       dest
+    {uLongf *}      destLen
+    {const Bytef *} source
+    uLong           sourceLen
+}
+
+critcl::api function int compress2 {
+    {Bytef *}       dest
+    {uLongf *}      destLen
+    {const Bytef *} source
+    uLong           sourceLen
+    int             level
+}
+
+# # ## ### ##### ######## ############# #####################
+##  Inflate = Decompression
+
+critcl::api function int inflateInit_ {
+    z_streamp      stream
+    {const char *} version
+    int            stream_size
+}
+
+critcl::api function int inflateInit2_ {
+    z_streamp      stream
+    int            windowBits
+    {const char *} version
+    int            stream_size
+}
+
+critcl::api function int inflate {
+    z_streamp stream
+    int       flush
+}
+
+critcl::api function int inflateEnd {
+    z_streamp stream
+}
+
+critcl::api function int inflateSetDictionary {
+    z_streamp       stream
+    {const Bytef *} dict
+    uInt            dictLength
+}
+
+critcl::api function int inflateSync  {z_streamp stream}
+critcl::api function int inflateReset {z_streamp stream}
+
+# # ## ### ##### ######## ############# #####################
+##
+
+critcl::api function int uncompress {
+    {Bytef *}       dest
+    {uLongf *}      destLen
+    {const Bytef *} source
+    uLong           sourceLen
+}
+
+# # ## ### ##### ######## ############# #####################
+## gz'ip layer
+
+critcl::api function gzFile gzopen {
+    {const char *} path
+    {const char *} mode
+}
+
+critcl::api function gzFile gzdopen {
+    int            fd
+    {const char *} mode
+}
+
+critcl::api function int gzsetparams {
+    gzFile file
+    int    level
+    int    strategy
+}
+
+critcl::api function int gzread {
+    gzFile   file
+    voidp    buf
+    unsigned len
+}
+
+critcl::api function int gzwrite {
+    gzFile   file
+    voidpc   buf
+    unsigned len
+}
+
+critcl::api function int gzprintf {
+    gzFile file
+    {const char *} format
+    ...
+}
+
+critcl::api function int gzputs {
+    gzFile         file
+    {const char *} s
+}
+
+critcl::api function {char *} gzgets {
+    gzFile   file
+    {char *} buf
+    int      len
+}
+
+critcl::api function int gzputc {
+    gzFile file
+    int    c
+}
+
+critcl::api function int gzgetc {
+    gzFile file
+}
+
+critcl::api function int gzflush {
+    gzFile file
+    int    flush
+}
+
+critcl::api function z_off_t gzseek {
+    gzFile   file
+    z_off_t offset
+    int     whence
+}
+
+critcl::api function int     gzrewind {gzFile file}
+critcl::api function z_off_t gztell   {gzFile file}
+critcl::api function int     gzeof    {gzFile file}
+critcl::api function int     gzclose  {gzFile file}
+
+critcl::api function {const char *} gzerror {
+    gzFile  file
+    {int *} errnum
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation.
+
+namespace eval ::zlib {}
+
+# Export zlib version number. Together with the 'variant' (see below),
+# we know what this package is an interface to.
+critcl::cproc ::zlib::version {} vstring {
+    return zlibVersion ();
+}
+
+critcl::cdata ::zlib::variant [critcl::userconfig query mode]
+critcl::msg -nonewline " /[critcl::userconfig query mode]"
+
+switch -exact -- [critcl::userconfig query mode] {
+    local {
+	# Build against the local z/lib/z sources.
+	critcl::api header zlib/zconf.h
+	critcl::api header zlib/zlib.h
+
+	critcl::cheaders zlib/*.h
+	critcl::csources zlib/adler32.c
+	critcl::csources zlib/compress.c
+	critcl::csources zlib/crc32.c
+	critcl::csources zlib/deflate.c
+	critcl::csources zlib/gzclose.c
+	critcl::csources zlib/gzlib.c
+	critcl::csources zlib/gzread.c
+	critcl::csources zlib/gzwrite.c
+	critcl::csources zlib/infback.c
+	critcl::csources zlib/inffast.c
+	critcl::csources zlib/inflate.c
+	critcl::csources zlib/inftrees.c
+	critcl::csources zlib/trees.c
+	critcl::csources zlib/uncompr.c
+	critcl::csources zlib/zutil.c
+    }
+    system {
+	# Build against system z/lib/z
+
+	critcl::api extheader zconf.h
+	critcl::api extheader zlib.h
+
+	critcl::clibraries -lz
+    }
+    system-static {
+	# Build against system z/lib/z, statically
+
+	critcl::api extheader zconf.h
+	critcl::api extheader zlib.h
+
+	set ok 0
+	foreach p {
+	    /lib
+	    /usr/lib
+	    /usr/local/lib
+	} {
+	    if {![file exists $p/libz.a]} continue
+	    critcl::clibraries $p/libz.a
+	    set ok 1
+	    break
+	}
+	if {!$ok} {
+	    critcl::error "Unable to find static libz.a"
+	}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide zlib 1 ; # for libz 1.2.5
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/CMakeLists.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/CMakeLists.txt
new file mode 100644
index 00000000..a64fe0b2
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/CMakeLists.txt
@@ -0,0 +1,190 @@
+cmake_minimum_required(VERSION 2.4.4)
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
+
+project(zlib C)
+
+if(NOT DEFINED BUILD_SHARED_LIBS)
+    option(BUILD_SHARED_LIBS "Build a shared library form of zlib" ON)
+endif()
+
+include(CheckTypeSize)
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckCSourceCompiles)
+enable_testing()
+
+check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+check_include_file(stdint.h    HAVE_STDINT_H)
+check_include_file(stddef.h    HAVE_STDDEF_H)
+
+#
+# Check to see if we have large file support
+#
+set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
+# We add these other definitions here because CheckTypeSize.cmake
+# in CMake 2.4.x does not automatically do so and we want
+# compatibility with CMake 2.4.x.
+if(HAVE_SYS_TYPES_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
+endif()
+if(HAVE_STDINT_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
+endif()
+if(HAVE_STDDEF_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
+endif()
+check_type_size(off64_t OFF64_T)
+if(HAVE_OFF64_T)
+   add_definitions(-D_LARGEFILE64_SOURCE=1)
+endif()
+set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
+
+#
+# Check for fseeko
+#
+check_function_exists(fseeko HAVE_FSEEKO)
+if(NOT HAVE_FSEEKO)
+    add_definitions(-DNO_FSEEKO)
+endif()
+
+#
+# Check for unistd.h
+#
+check_include_file(unistd.h Z_HAVE_UNISTD_H)
+
+if(MSVC)
+    set(CMAKE_DEBUG_POSTFIX "d")
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+endif()
+
+if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
+    # If we're doing an out of source build and the user has a zconf.h
+    # in their source tree...
+    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
+        message(FATAL_ERROR
+            "You must remove ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h "
+            "from the source tree.  This file is included with zlib "
+            "but CMake generates this file for you automatically "
+            "in the build directory.")
+  endif()
+endif()
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
+               ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+
+#============================================================================
+# zlib
+#============================================================================
+
+set(ZLIB_PUBLIC_HDRS
+    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
+    zlib.h
+)
+set(ZLIB_PRIVATE_HDRS
+    crc32.h
+    deflate.h
+    gzguts.h
+    inffast.h
+    inffixed.h
+    inflate.h
+    inftrees.h
+    trees.h
+    zutil.h
+)
+set(ZLIB_SRCS
+    adler32.c
+    compress.c
+    crc32.c
+    deflate.c
+    gzclose.c
+    gzlib.c
+    gzread.c
+    gzwrite.c
+    inflate.c
+    infback.c
+    inftrees.c
+    inffast.c
+    trees.c
+    uncompr.c
+    zutil.c
+    win32/zlib1.rc
+)
+
+# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
+string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([0-9A-Za-z.]+)\".*"
+    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
+
+if(MINGW)
+    # This gets us DLL resource information when compiling on MinGW.
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                       COMMAND windres.exe
+                            -D GCC_WINDRES
+                            -I ${CMAKE_CURRENT_SOURCE_DIR}
+                            -I ${CMAKE_CURRENT_BINARY_DIR}
+                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
+    set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+endif(MINGW)
+
+add_library(zlib ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+
+set_target_properties(zlib PROPERTIES SOVERSION 1)
+
+if(NOT CYGWIN)
+    # This property causes shared libraries on Linux to have the full version
+    # encoded into their final filename.  We disable this on Cygwin because
+    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
+    # seems to be the default.
+    #
+    # This has no effect with MSVC, on that platform the version info for
+    # the DLL comes from the resource file win32/zlib1.rc
+    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
+endif()
+
+if(UNIX)
+    # On unix-like platforms the library is almost always called libz
+   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
+elseif(BUILD_SHARED_LIBS AND WIN32)
+    # Creates zlib1.dll when building shared library version
+    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
+endif()
+
+if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
+    install(TARGETS zlib
+        RUNTIME DESTINATION bin
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib )
+endif()
+if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
+    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION include)
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+    install(FILES zlib.3 DESTINATION share/man/man3)
+endif()
+
+#============================================================================
+# Example binaries
+#============================================================================
+
+add_executable(example example.c)
+target_link_libraries(example zlib)
+add_test(example example)
+
+add_executable(minigzip minigzip.c)
+target_link_libraries(minigzip zlib)
+
+if(HAVE_OFF64_T)
+    add_executable(example64 example.c)
+    target_link_libraries(example64 zlib)
+    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+    add_test(example64 example64)
+
+    add_executable(minigzip64 minigzip.c)
+    target_link_libraries(minigzip64 zlib)
+    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+endif()
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/ChangeLog b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/ChangeLog
new file mode 100644
index 00000000..fd5bca11
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/ChangeLog
@@ -0,0 +1,1208 @@
+
+                ChangeLog file for zlib
+
+Changes in 1.2.5 (19 Apr 2010)
+- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]
+- Default to libdir as sharedlibdir in configure [Nieder]
+- Update copyright dates on modified source files
+- Update trees.c to be able to generate modified trees.h
+- Exit configure for MinGW, suggesting win32/Makefile.gcc
+
+Changes in 1.2.4.5 (18 Apr 2010)
+- Set sharedlibdir in configure [Torok]
+- Set LDFLAGS in Makefile.in [Bar-Lev]
+- Avoid mkdir objs race condition in Makefile.in [Bowler]
+- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays
+- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C
+- Don't use hidden attribute when it is a warning generator (e.g. Solaris)
+
+Changes in 1.2.4.4 (18 Apr 2010)
+- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok]
+- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
+- Try to use bash or ksh regardless of functionality of /bin/sh
+- Fix configure incompatibility with NetBSD sh
+- Remove attempt to run under bash or ksh since have better NetBSD fix
+- Fix win32/Makefile.gcc for MinGW [Bar-Lev]
+- Add diagnostic messages when using CROSS_PREFIX in configure
+- Added --sharedlibdir option to configure [Weigelt]
+- Use hidden visibility attribute when available [Frysinger]
+
+Changes in 1.2.4.3 (10 Apr 2010)
+- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
+- Use CROSS_PREFIX for nm [Bar-Lev]
+- Assume _LARGEFILE64_SOURCE defined is equivalent to true
+- Avoid use of undefined symbols in #if with && and ||
+- Make *64 prototypes in gzguts.h consistent with functions
+- Add -shared load option for MinGW in configure [Bowler]
+- Move z_off64_t to public interface, use instead of off64_t
+- Remove ! from shell test in configure (not portable to Solaris)
+- Change +0 macro tests to -0 for possibly increased portability
+
+Changes in 1.2.4.2 (9 Apr 2010)
+- Add consistent carriage returns to readme.txt's in masmx86 and masmx64
+- Really provide prototypes for *64 functions when building without LFS
+- Only define unlink() in minigzip.c if unistd.h not included
+- Update README to point to contrib/vstudio project files
+- Move projects/vc6 to old/ and remove projects/
+- Include stdlib.h in minigzip.c for setmode() definition under WinCE
+- Clean up assembler builds in win32/Makefile.msc [Rowe]
+- Include sys/types.h for Microsoft for off_t definition
+- Fix memory leak on error in gz_open()
+- Symbolize nm as $NM in configure [Weigelt]
+- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt]
+- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined
+- Fix bug in gzeof() to take into account unused input data
+- Avoid initialization of structures with variables in puff.c
+- Updated win32/README-WIN32.txt [Rowe]
+
+Changes in 1.2.4.1 (28 Mar 2010)
+- Remove the use of [a-z] constructs for sed in configure [gentoo 310225]
+- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech]
+- Restore "for debugging" comment on sprintf() in gzlib.c
+- Remove fdopen for MVS from gzguts.h
+- Put new README-WIN32.txt in win32 [Rowe]
+- Add check for shell to configure and invoke another shell if needed
+- Fix big fat stinking bug in gzseek() on uncompressed files
+- Remove vestigial F_OPEN64 define in zutil.h
+- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE
+- Avoid errors on non-LFS systems when applications define LFS macros
+- Set EXE to ".exe" in configure for MINGW [Kahle]
+- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill]
+- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev]
+- Add DLL install in win32/makefile.gcc [Bar-Lev]
+- Allow Linux* or linux* from uname in configure [Bar-Lev]
+- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev]
+- Add cross-compilation prefixes to configure [Bar-Lev]
+- Match type exactly in gz_load() invocation in gzread.c
+- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func
+- Provide prototypes for *64 functions when building zlib without LFS
+- Don't use -lc when linking shared library on MinGW
+- Remove errno.h check in configure and vestigial errno code in zutil.h
+
+Changes in 1.2.4 (14 Mar 2010)
+- Fix VER3 extraction in configure for no fourth subversion
+- Update zlib.3, add docs to Makefile.in to make .pdf out of it
+- Add zlib.3.pdf to distribution
+- Don't set error code in gzerror() if passed pointer is NULL
+- Apply destination directory fixes to CMakeLists.txt [Lowman]
+- Move #cmakedefine's to a new zconf.in.cmakein
+- Restore zconf.h for builds that don't use configure or cmake
+- Add distclean to dummy Makefile for convenience
+- Update and improve INDEX, README, and FAQ
+- Update CMakeLists.txt for the return of zconf.h [Lowman]
+- Update contrib/vstudio/vc9 and vc10 [Vollant]
+- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc
+- Apply license and readme changes to contrib/asm686 [Raiter]
+- Check file name lengths and add -c option in minigzip.c [Li]
+- Update contrib/amd64 and contrib/masmx86/ [Vollant]
+- Avoid use of "eof" parameter in trees.c to not shadow library variable
+- Update make_vms.com for removal of zlibdefs.h [Zinser]
+- Update assembler code and vstudio projects in contrib [Vollant]
+- Remove outdated assembler code contrib/masm686 and contrib/asm586
+- Remove old vc7 and vc8 from contrib/vstudio
+- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe]
+- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open()
+- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant]
+- Remove *64 functions from win32/zlib.def (they're not 64-bit yet)
+- Fix bug in void-returning vsprintf() case in gzwrite.c
+- Fix name change from inflate.h in contrib/inflate86/inffas86.c
+- Check if temporary file exists before removing in make_vms.com [Zinser]
+- Fix make install and uninstall for --static option
+- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta]
+- Update readme.txt in contrib/masmx64 and masmx86 to assemble
+
+Changes in 1.2.3.9 (21 Feb 2010)
+- Expunge gzio.c
+- Move as400 build information to old
+- Fix updates in contrib/minizip and contrib/vstudio
+- Add const to vsnprintf test in configure to avoid warnings [Weigelt]
+- Delete zconf.h (made by configure) [Weigelt]
+- Change zconf.in.h to zconf.h.in per convention [Weigelt]
+- Check for NULL buf in gzgets()
+- Return empty string for gzgets() with len == 1 (like fgets())
+- Fix description of gzgets() in zlib.h for end-of-file, NULL return
+- Update minizip to 1.1 [Vollant]
+- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c
+- Note in zlib.h that gzerror() should be used to distinguish from EOF
+- Remove use of snprintf() from gzlib.c
+- Fix bug in gzseek()
+- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant]
+- Fix zconf.h generation in CMakeLists.txt [Lowman]
+- Improve comments in zconf.h where modified by configure
+
+Changes in 1.2.3.8 (13 Feb 2010)
+- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer]
+- Use z_off64_t in gz_zero() and gz_skip() to match state->skip
+- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t)
+- Revert to Makefile.in from 1.2.3.6 (live with the clutter)
+- Fix missing error return in gzflush(), add zlib.h note
+- Add *64 functions to zlib.map [Levin]
+- Fix signed/unsigned comparison in gz_comp()
+- Use SFLAGS when testing shared linking in configure
+- Add --64 option to ./configure to use -m64 with gcc
+- Fix ./configure --help to correctly name options
+- Have make fail if a test fails [Levin]
+- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson]
+- Remove assembler object files from contrib
+
+Changes in 1.2.3.7 (24 Jan 2010)
+- Always gzopen() with O_LARGEFILE if available
+- Fix gzdirect() to work immediately after gzopen() or gzdopen()
+- Make gzdirect() more precise when the state changes while reading
+- Improve zlib.h documentation in many places
+- Catch memory allocation failure in gz_open()
+- Complete close operation if seek forward in gzclose_w() fails
+- Return Z_ERRNO from gzclose_r() if close() fails
+- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL
+- Return zero for gzwrite() errors to match zlib.h description
+- Return -1 on gzputs() error to match zlib.h description
+- Add zconf.in.h to allow recovery from configure modification [Weigelt]
+- Fix static library permissions in Makefile.in [Weigelt]
+- Avoid warnings in configure tests that hide functionality [Weigelt]
+- Add *BSD and DragonFly to Linux case in configure [gentoo 123571]
+- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212]
+- Avoid access of uninitialized data for first inflateReset2 call [Gomes]
+- Keep object files in subdirectories to reduce the clutter somewhat
+- Remove default Makefile and zlibdefs.h, add dummy Makefile
+- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_
+- Remove zlibdefs.h completely -- modify zconf.h instead
+
+Changes in 1.2.3.6 (17 Jan 2010)
+- Avoid void * arithmetic in gzread.c and gzwrite.c
+- Make compilers happier with const char * for gz_error message
+- Avoid unused parameter warning in inflate.c
+- Avoid signed-unsigned comparison warning in inflate.c
+- Indent #pragma's for traditional C
+- Fix usage of strwinerror() in glib.c, change to gz_strwinerror()
+- Correct email address in configure for system options
+- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser]
+- Update zlib.map [Brown]
+- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok]
+- Apply various fixes to CMakeLists.txt [Lowman]
+- Add checks on len in gzread() and gzwrite()
+- Add error message for no more room for gzungetc()
+- Remove zlib version check in gzwrite()
+- Defer compression of gzprintf() result until need to
+- Use snprintf() in gzdopen() if available
+- Remove USE_MMAP configuration determination (only used by minigzip)
+- Remove examples/pigz.c (available separately)
+- Update examples/gun.c to 1.6
+
+Changes in 1.2.3.5 (8 Jan 2010)
+- Add space after #if in zutil.h for some compilers
+- Fix relatively harmless bug in deflate_fast() [Exarevsky]
+- Fix same problem in deflate_slow()
+- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown]
+- Add deflate_rle() for faster Z_RLE strategy run-length encoding
+- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding
+- Change name of "write" variable in inffast.c to avoid library collisions
+- Fix premature EOF from gzread() in gzio.c [Brown]
+- Use zlib header window size if windowBits is 0 in inflateInit2()
+- Remove compressBound() call in deflate.c to avoid linking compress.o
+- Replace use of errno in gz* with functions, support WinCE [Alves]
+- Provide alternative to perror() in minigzip.c for WinCE [Alves]
+- Don't use _vsnprintf on later versions of MSVC [Lowman]
+- Add CMake build script and input file [Lowman]
+- Update contrib/minizip to 1.1 [Svensson, Vollant]
+- Moved nintendods directory from contrib to .
+- Replace gzio.c with a new set of routines with the same functionality
+- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above
+- Update contrib/minizip to 1.1b
+- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h
+
+Changes in 1.2.3.4 (21 Dec 2009)
+- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility
+- Update comments in configure and Makefile.in for default --shared
+- Fix test -z's in configure [Marquess]
+- Build examplesh and minigzipsh when not testing
+- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h
+- Import LDFLAGS from the environment in configure
+- Fix configure to populate SFLAGS with discovered CFLAGS options
+- Adapt make_vms.com to the new Makefile.in [Zinser]
+- Add zlib2ansi script for C++ compilation [Marquess]
+- Add _FILE_OFFSET_BITS=64 test to make test (when applicable)
+- Add AMD64 assembler code for longest match to contrib [Teterin]
+- Include options from $SFLAGS when doing $LDSHARED
+- Simplify 64-bit file support by introducing z_off64_t type
+- Make shared object files in objs directory to work around old Sun cc
+- Use only three-part version number for Darwin shared compiles
+- Add rc option to ar in Makefile.in for when ./configure not run
+- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4*
+- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile
+- Protect against _FILE_OFFSET_BITS being defined when compiling zlib
+- Rename Makefile.in targets allstatic to static and allshared to shared
+- Fix static and shared Makefile.in targets to be independent
+- Correct error return bug in gz_open() by setting state [Brown]
+- Put spaces before ;;'s in configure for better sh compatibility
+- Add pigz.c (parallel implementation of gzip) to examples/
+- Correct constant in crc32.c to UL [Leventhal]
+- Reject negative lengths in crc32_combine()
+- Add inflateReset2() function to work like inflateEnd()/inflateInit2()
+- Include sys/types.h for _LARGEFILE64_SOURCE [Brown]
+- Correct typo in doc/algorithm.txt [Janik]
+- Fix bug in adler32_combine() [Zhu]
+- Catch missing-end-of-block-code error in all inflates and in puff
+    Assures that random input to inflate eventually results in an error
+- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/
+- Update ENOUGH and its usage to reflect discovered bounds
+- Fix gzerror() error report on empty input file [Brown]
+- Add ush casts in trees.c to avoid pedantic runtime errors
+- Fix typo in zlib.h uncompress() description [Reiss]
+- Correct inflate() comments with regard to automatic header detection
+- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays)
+- Put new version of gzlog (2.0) in examples with interruption recovery
+- Add puff compile option to permit invalid distance-too-far streams
+- Add puff TEST command options, ability to read piped input
+- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but
+  _LARGEFILE64_SOURCE not defined
+- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart
+- Fix deflateSetDictionary() to use all 32K for output consistency
+- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h)
+- Clear bytes after deflate lookahead to avoid use of uninitialized data
+- Change a limit in inftrees.c to be more transparent to Coverity Prevent
+- Update win32/zlib.def with exported symbols from zlib.h
+- Correct spelling error in zlib.h [Willem]
+- Allow Z_BLOCK for deflate() to force a new block
+- Allow negative bits in inflatePrime() to delete existing bit buffer
+- Add Z_TREES flush option to inflate() to return at end of trees
+- Add inflateMark() to return current state information for random access
+- Add Makefile for NintendoDS to contrib [Costa]
+- Add -w in configure compile tests to avoid spurious warnings [Beucler]
+- Fix typos in zlib.h comments for deflateSetDictionary()
+- Fix EOF detection in transparent gzread() [Maier]
+
+Changes in 1.2.3.3 (2 October 2006)
+- Make --shared the default for configure, add a --static option
+- Add compile option to permit invalid distance-too-far streams
+- Add inflateUndermine() function which is required to enable above
+- Remove use of "this" variable name for C++ compatibility [Marquess]
+- Add testing of shared library in make test, if shared library built
+- Use ftello() and fseeko() if available instead of ftell() and fseek()
+- Provide two versions of all functions that use the z_off_t type for
+  binary compatibility -- a normal version and a 64-bit offset version,
+  per the Large File Support Extension when _LARGEFILE64_SOURCE is
+  defined; use the 64-bit versions by default when _FILE_OFFSET_BITS
+  is defined to be 64
+- Add a --uname= option to configure to perhaps help with cross-compiling
+
+Changes in 1.2.3.2 (3 September 2006)
+- Turn off silly Borland warnings [Hay]
+- Use off64_t and define _LARGEFILE64_SOURCE when present
+- Fix missing dependency on inffixed.h in Makefile.in
+- Rig configure --shared to build both shared and static [Teredesai, Truta]
+- Remove zconf.in.h and instead create a new zlibdefs.h file
+- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant]
+- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt]
+
+Changes in 1.2.3.1 (16 August 2006)
+- Add watcom directory with OpenWatcom make files [Daniel]
+- Remove #undef of FAR in zconf.in.h for MVS [Fedtke]
+- Update make_vms.com [Zinser]
+- Use -fPIC for shared build in configure [Teredesai, Nicholson]
+- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
+- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck]
+- Add some FAQ entries about the contrib directory
+- Update the MVS question in the FAQ
+- Avoid extraneous reads after EOF in gzio.c [Brown]
+- Correct spelling of "successfully" in gzio.c [Randers-Pehrson]
+- Add comments to zlib.h about gzerror() usage [Brown]
+- Set extra flags in gzip header in gzopen() like deflate() does
+- Make configure options more compatible with double-dash conventions
+  [Weigelt]
+- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen]
+- Fix uninstall target in Makefile.in [Truta]
+- Add pkgconfig support [Weigelt]
+- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt]
+- Replace set_data_type() with a more accurate detect_data_type() in
+  trees.c, according to the txtvsbin.txt document [Truta]
+- Swap the order of #include <stdio.h> and #include "zlib.h" in
+  gzio.c, example.c and minigzip.c [Truta]
+- Shut up annoying VS2005 warnings about standard C deprecation [Rowe,
+  Truta] (where?)
+- Fix target "clean" from win32/Makefile.bor [Truta]
+- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe]
+- Update zlib www home address in win32/DLL_FAQ.txt [Truta]
+- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove]
+- Enable browse info in the "Debug" and "ASM Debug" configurations in
+  the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta]
+- Add pkgconfig support [Weigelt]
+- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h,
+  for use in win32/zlib1.rc [Polushin, Rowe, Truta]
+- Add a document that explains the new text detection scheme to
+  doc/txtvsbin.txt [Truta]
+- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta]
+- Move algorithm.txt into doc/ [Truta]
+- Synchronize FAQ with website
+- Fix compressBound(), was low for some pathological cases [Fearnley]
+- Take into account wrapper variations in deflateBound()
+- Set examples/zpipe.c input and output to binary mode for Windows
+- Update examples/zlib_how.html with new zpipe.c (also web site)
+- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems
+  that gcc became pickier in 4.0)
+- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain
+  un-versioned, the patch adds versioning only for symbols introduced in
+  zlib-1.2.0 or later.  It also declares as local those symbols which are
+  not designed to be exported." [Levin]
+- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure
+- Do not initialize global static by default in trees.c, add a response
+  NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess]
+- Don't use strerror() in gzio.c under WinCE [Yakimov]
+- Don't use errno.h in zutil.h under WinCE [Yakimov]
+- Move arguments for AR to its usage to allow replacing ar [Marot]
+- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson]
+- Improve inflateInit() and inflateInit2() documentation
+- Fix structure size comment in inflate.h
+- Change configure help option from --h* to --help [Santos]
+
+Changes in 1.2.3 (18 July 2005)
+- Apply security vulnerability fixes to contrib/infback9 as well
+- Clean up some text files (carriage returns, trailing space)
+- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
+
+Changes in 1.2.2.4 (11 July 2005)
+- Add inflatePrime() function for starting inflation at bit boundary
+- Avoid some Visual C warnings in deflate.c
+- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
+  compile
+- Fix some spelling errors in comments [Betts]
+- Correct inflateInit2() error return documentation in zlib.h
+- Add zran.c example of compressed data random access to examples
+  directory, shows use of inflatePrime()
+- Fix cast for assignments to strm->state in inflate.c and infback.c
+- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
+- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
+- Add cast in trees.c t avoid a warning [Oberhumer]
+- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
+- Update make_vms.com [Zinser]
+- Initialize state->write in inflateReset() since copied in inflate_fast()
+- Be more strict on incomplete code sets in inflate_table() and increase
+  ENOUGH and MAXD -- this repairs a possible security vulnerability for
+  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for
+  discovering the vulnerability and providing test cases.
+- Add ia64 support to configure for HP-UX [Smith]
+- Add error return to gzread() for format or i/o error [Levin]
+- Use malloc.h for OS/2 [Necasek]
+
+Changes in 1.2.2.3 (27 May 2005)
+- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
+- Typecast fread() return values in gzio.c [Vollant]
+- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
+- Fix crc check bug in gzread() after gzungetc() [Heiner]
+- Add the deflateTune() function to adjust internal compression parameters
+- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
+- Remove an incorrect assertion in examples/zpipe.c
+- Add C++ wrapper in infback9.h [Donais]
+- Fix bug in inflateCopy() when decoding fixed codes
+- Note in zlib.h how much deflateSetDictionary() actually uses
+- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
+- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
+- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
+- Add gzdirect() function to indicate transparent reads
+- Update contrib/minizip [Vollant]
+- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
+- Add casts in crc32.c to avoid warnings [Oberhumer]
+- Add contrib/masmx64 [Vollant]
+- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
+
+Changes in 1.2.2.2 (30 December 2004)
+- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
+  avoid implicit memcpy calls (portability for no-library compilation)
+- Increase sprintf() buffer size in gzdopen() to allow for large numbers
+- Add INFLATE_STRICT to check distances against zlib header
+- Improve WinCE errno handling and comments [Chang]
+- Remove comment about no gzip header processing in FAQ
+- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
+- Add updated make_vms.com [Coghlan], update README
+- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
+  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
+- Add FAQ entry and comments in deflate.c on uninitialized memory access
+- Add Solaris 9 make options in configure [Gilbert]
+- Allow strerror() usage in gzio.c for STDC
+- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
+- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
+- Use z_off_t for adler32_combine() and crc32_combine() lengths
+- Make adler32() much faster for small len
+- Use OS_CODE in deflate() default gzip header
+
+Changes in 1.2.2.1 (31 October 2004)
+- Allow inflateSetDictionary() call for raw inflate
+- Fix inflate header crc check bug for file names and comments
+- Add deflateSetHeader() and gz_header structure for custom gzip headers
+- Add inflateGetheader() to retrieve gzip headers
+- Add crc32_combine() and adler32_combine() functions
+- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
+- Use zstreamp consistently in zlib.h (inflate_back functions)
+- Remove GUNZIP condition from definition of inflate_mode in inflate.h
+  and in contrib/inflate86/inffast.S [Truta, Anderson]
+- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
+- Update projects/README.projects and projects/visualc6 [Truta]
+- Update win32/DLL_FAQ.txt [Truta]
+- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
+- Deprecate Z_ASCII; use Z_TEXT instead [Truta]
+- Use a new algorithm for setting strm->data_type in trees.c [Truta]
+- Do not define an exit() prototype in zutil.c unless DEBUG defined
+- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
+- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
+- Fix Darwin build version identification [Peterson]
+
+Changes in 1.2.2 (3 October 2004)
+- Update zlib.h comments on gzip in-memory processing
+- Set adler to 1 in inflateReset() to support Java test suite [Walles]
+- Add contrib/dotzlib [Ravn]
+- Update win32/DLL_FAQ.txt [Truta]
+- Update contrib/minizip [Vollant]
+- Move contrib/visual-basic.txt to old/ [Truta]
+- Fix assembler builds in projects/visualc6/ [Truta]
+
+Changes in 1.2.1.2 (9 September 2004)
+- Update INDEX file
+- Fix trees.c to update strm->data_type (no one ever noticed!)
+- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
+- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
+- Add limited multitasking protection to DYNAMIC_CRC_TABLE
+- Add NO_vsnprintf for VMS in zutil.h [Mozilla]
+- Don't declare strerror() under VMS [Mozilla]
+- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
+- Update contrib/ada [Anisimkov]
+- Update contrib/minizip [Vollant]
+- Fix configure to not hardcode directories for Darwin [Peterson]
+- Fix gzio.c to not return error on empty files [Brown]
+- Fix indentation; update version in contrib/delphi/ZLib.pas and
+  contrib/pascal/zlibpas.pas [Truta]
+- Update mkasm.bat in contrib/masmx86 [Truta]
+- Update contrib/untgz [Truta]
+- Add projects/README.projects [Truta]
+- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
+- Update win32/DLL_FAQ.txt [Truta]
+- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
+- Remove an unnecessary assignment to curr in inftrees.c [Truta]
+- Add OS/2 to exe builds in configure [Poltorak]
+- Remove err dummy parameter in zlib.h [Kientzle]
+
+Changes in 1.2.1.1 (9 January 2004)
+- Update email address in README
+- Several FAQ updates
+- Fix a big fat bug in inftrees.c that prevented decoding valid
+  dynamic blocks with only literals and no distance codes --
+  Thanks to "Hot Emu" for the bug report and sample file
+- Add a note to puff.c on no distance codes case.
+
+Changes in 1.2.1 (17 November 2003)
+- Remove a tab in contrib/gzappend/gzappend.c
+- Update some interfaces in contrib for new zlib functions
+- Update zlib version number in some contrib entries
+- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
+- Support shared libraries on Hurd and KFreeBSD [Brown]
+- Fix error in NO_DIVIDE option of adler32.c
+
+Changes in 1.2.0.8 (4 November 2003)
+- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
+- Add experimental NO_DIVIDE #define in adler32.c
+    - Possibly faster on some processors (let me know if it is)
+- Correct Z_BLOCK to not return on first inflate call if no wrap
+- Fix strm->data_type on inflate() return to correctly indicate EOB
+- Add deflatePrime() function for appending in the middle of a byte
+- Add contrib/gzappend for an example of appending to a stream
+- Update win32/DLL_FAQ.txt [Truta]
+- Delete Turbo C comment in README [Truta]
+- Improve some indentation in zconf.h [Truta]
+- Fix infinite loop on bad input in configure script [Church]
+- Fix gzeof() for concatenated gzip files [Johnson]
+- Add example to contrib/visual-basic.txt [Michael B.]
+- Add -p to mkdir's in Makefile.in [vda]
+- Fix configure to properly detect presence or lack of printf functions
+- Add AS400 support [Monnerat]
+- Add a little Cygwin support [Wilson]
+
+Changes in 1.2.0.7 (21 September 2003)
+- Correct some debug formats in contrib/infback9
+- Cast a type in a debug statement in trees.c
+- Change search and replace delimiter in configure from % to # [Beebe]
+- Update contrib/untgz to 0.2 with various fixes [Truta]
+- Add build support for Amiga [Nikl]
+- Remove some directories in old that have been updated to 1.2
+- Add dylib building for Mac OS X in configure and Makefile.in
+- Remove old distribution stuff from Makefile
+- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
+- Update links in README
+
+Changes in 1.2.0.6 (13 September 2003)
+- Minor FAQ updates
+- Update contrib/minizip to 1.00 [Vollant]
+- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
+- Update POSTINC comment for 68060 [Nikl]
+- Add contrib/infback9 with deflate64 decoding (unsupported)
+- For MVS define NO_vsnprintf and undefine FAR [van Burik]
+- Add pragma for fdopen on MVS [van Burik]
+
+Changes in 1.2.0.5 (8 September 2003)
+- Add OF to inflateBackEnd() declaration in zlib.h
+- Remember start when using gzdopen in the middle of a file
+- Use internal off_t counters in gz* functions to properly handle seeks
+- Perform more rigorous check for distance-too-far in inffast.c
+- Add Z_BLOCK flush option to return from inflate at block boundary
+- Set strm->data_type on return from inflate
+    - Indicate bits unused, if at block boundary, and if in last block
+- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
+- Add condition so old NO_DEFLATE define still works for compatibility
+- FAQ update regarding the Windows DLL [Truta]
+- INDEX update: add qnx entry, remove aix entry [Truta]
+- Install zlib.3 into mandir [Wilson]
+- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
+- Adapt the zlib interface to the new DLL convention guidelines [Truta]
+- Introduce ZLIB_WINAPI macro to allow the export of functions using
+  the WINAPI calling convention, for Visual Basic [Vollant, Truta]
+- Update msdos and win32 scripts and makefiles [Truta]
+- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
+- Add contrib/ada [Anisimkov]
+- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
+- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
+- Add contrib/masm686 [Truta]
+- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
+  [Truta, Vollant]
+- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
+- Remove contrib/delphi2; add a new contrib/delphi [Truta]
+- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
+  and fix some method prototypes [Truta]
+- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
+  [Truta]
+- Avoid the use of backslash (\) in contrib/minizip [Vollant]
+- Fix file time handling in contrib/untgz; update makefiles [Truta]
+- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
+  [Vollant]
+- Remove contrib/vstudio/vc15_16 [Vollant]
+- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
+- Update README.contrib [Truta]
+- Invert the assignment order of match_head and s->prev[...] in
+  INSERT_STRING [Truta]
+- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
+  [Truta]
+- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
+- Fix prototype of syncsearch in inflate.c [Truta]
+- Introduce ASMINF macro to be enabled when using an ASM implementation
+  of inflate_fast [Truta]
+- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
+- Modify test_gzio in example.c to take a single file name as a
+  parameter [Truta]
+- Exit the example.c program if gzopen fails [Truta]
+- Add type casts around strlen in example.c [Truta]
+- Remove casting to sizeof in minigzip.c; give a proper type
+  to the variable compared with SUFFIX_LEN [Truta]
+- Update definitions of STDC and STDC99 in zconf.h [Truta]
+- Synchronize zconf.h with the new Windows DLL interface [Truta]
+- Use SYS16BIT instead of __32BIT__ to distinguish between
+  16- and 32-bit platforms [Truta]
+- Use far memory allocators in small 16-bit memory models for
+  Turbo C [Truta]
+- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
+  zlibCompileFlags [Truta]
+- Cygwin has vsnprintf [Wilson]
+- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
+- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
+
+Changes in 1.2.0.4 (10 August 2003)
+- Minor FAQ updates
+- Be more strict when checking inflateInit2's windowBits parameter
+- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
+- Add gzip wrapper option to deflateInit2 using windowBits
+- Add updated QNX rule in configure and qnx directory [Bonnefoy]
+- Make inflate distance-too-far checks more rigorous
+- Clean up FAR usage in inflate
+- Add casting to sizeof() in gzio.c and minigzip.c
+
+Changes in 1.2.0.3 (19 July 2003)
+- Fix silly error in gzungetc() implementation [Vollant]
+- Update contrib/minizip and contrib/vstudio [Vollant]
+- Fix printf format in example.c
+- Correct cdecl support in zconf.in.h [Anisimkov]
+- Minor FAQ updates
+
+Changes in 1.2.0.2 (13 July 2003)
+- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
+- Attempt to avoid warnings in crc32.c for pointer-int conversion
+- Add AIX to configure, remove aix directory [Bakker]
+- Add some casts to minigzip.c
+- Improve checking after insecure sprintf() or vsprintf() calls
+- Remove #elif's from crc32.c
+- Change leave label to inf_leave in inflate.c and infback.c to avoid
+  library conflicts
+- Remove inflate gzip decoding by default--only enable gzip decoding by
+  special request for stricter backward compatibility
+- Add zlibCompileFlags() function to return compilation information
+- More typecasting in deflate.c to avoid warnings
+- Remove leading underscore from _Capital #defines [Truta]
+- Fix configure to link shared library when testing
+- Add some Windows CE target adjustments [Mai]
+- Remove #define ZLIB_DLL in zconf.h [Vollant]
+- Add zlib.3 [Rodgers]
+- Update RFC URL in deflate.c and algorithm.txt [Mai]
+- Add zlib_dll_FAQ.txt to contrib [Truta]
+- Add UL to some constants [Truta]
+- Update minizip and vstudio [Vollant]
+- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
+- Expand use of NO_DUMMY_DECL to avoid all dummy structures
+- Added iostream3 to contrib [Schwardt]
+- Replace rewind() with fseek() for WinCE [Truta]
+- Improve setting of zlib format compression level flags
+    - Report 0 for huffman and rle strategies and for level == 0 or 1
+    - Report 2 only for level == 6
+- Only deal with 64K limit when necessary at compile time [Truta]
+- Allow TOO_FAR check to be turned off at compile time [Truta]
+- Add gzclearerr() function [Souza]
+- Add gzungetc() function
+
+Changes in 1.2.0.1 (17 March 2003)
+- Add Z_RLE strategy for run-length encoding [Truta]
+    - When Z_RLE requested, restrict matches to distance one
+    - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
+- Correct FASTEST compilation to allow level == 0
+- Clean up what gets compiled for FASTEST
+- Incorporate changes to zconf.in.h [Vollant]
+    - Refine detection of Turbo C need for dummy returns
+    - Refine ZLIB_DLL compilation
+    - Include additional header file on VMS for off_t typedef
+- Try to use _vsnprintf where it supplants vsprintf [Vollant]
+- Add some casts in inffast.c
+- Enchance comments in zlib.h on what happens if gzprintf() tries to
+  write more than 4095 bytes before compression
+- Remove unused state from inflateBackEnd()
+- Remove exit(0) from minigzip.c, example.c
+- Get rid of all those darn tabs
+- Add "check" target to Makefile.in that does the same thing as "test"
+- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
+- Update contrib/inflate86 [Anderson]
+- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
+- Add msdos and win32 directories with makefiles [Truta]
+- More additions and improvements to the FAQ
+
+Changes in 1.2.0 (9 March 2003)
+- New and improved inflate code
+    - About 20% faster
+    - Does not allocate 32K window unless and until needed
+    - Automatically detects and decompresses gzip streams
+    - Raw inflate no longer needs an extra dummy byte at end
+    - Added inflateBack functions using a callback interface--even faster
+      than inflate, useful for file utilities (gzip, zip)
+    - Added inflateCopy() function to record state for random access on
+      externally generated deflate streams (e.g. in gzip files)
+    - More readable code (I hope)
+- New and improved crc32()
+    - About 50% faster, thanks to suggestions from Rodney Brown
+- Add deflateBound() and compressBound() functions
+- Fix memory leak in deflateInit2()
+- Permit setting dictionary for raw deflate (for parallel deflate)
+- Fix const declaration for gzwrite()
+- Check for some malloc() failures in gzio.c
+- Fix bug in gzopen() on single-byte file 0x1f
+- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
+  and next buffer doesn't start with 0x8b
+- Fix uncompress() to return Z_DATA_ERROR on truncated input
+- Free memory at end of example.c
+- Remove MAX #define in trees.c (conflicted with some libraries)
+- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
+- Declare malloc() and free() in gzio.c if STDC not defined
+- Use malloc() instead of calloc() in zutil.c if int big enough
+- Define STDC for AIX
+- Add aix/ with approach for compiling shared library on AIX
+- Add HP-UX support for shared libraries in configure
+- Add OpenUNIX support for shared libraries in configure
+- Use $cc instead of gcc to build shared library
+- Make prefix directory if needed when installing
+- Correct Macintosh avoidance of typedef Byte in zconf.h
+- Correct Turbo C memory allocation when under Linux
+- Use libz.a instead of -lz in Makefile (assure use of compiled library)
+- Update configure to check for snprintf or vsnprintf functions and their
+  return value, warn during make if using an insecure function
+- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
+  is lost when library is used--resolution is to build new zconf.h
+- Documentation improvements (in zlib.h):
+    - Document raw deflate and inflate
+    - Update RFCs URL
+    - Point out that zlib and gzip formats are different
+    - Note that Z_BUF_ERROR is not fatal
+    - Document string limit for gzprintf() and possible buffer overflow
+    - Note requirement on avail_out when flushing
+    - Note permitted values of flush parameter of inflate()
+- Add some FAQs (and even answers) to the FAQ
+- Add contrib/inflate86/ for x86 faster inflate
+- Add contrib/blast/ for PKWare Data Compression Library decompression
+- Add contrib/puff/ simple inflate for deflate format description
+
+Changes in 1.1.4 (11 March 2002)
+- ZFREE was repeated on same allocation on some error conditions.
+  This creates a security problem described in
+  http://www.zlib.org/advisory-2002-03-11.txt
+- Returned incorrect error (Z_MEM_ERROR) on some invalid data
+- Avoid accesses before window for invalid distances with inflate window
+  less than 32K.
+- force windowBits > 8 to avoid a bug in the encoder for a window size
+  of 256 bytes. (A complete fix will be available in 1.1.5).
+
+Changes in 1.1.3 (9 July 1998)
+- fix "an inflate input buffer bug that shows up on rare but persistent
+  occasions" (Mark)
+- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
+- fix gzseek(..., SEEK_SET) in write mode
+- fix crc check after a gzeek (Frank Faubert)
+- fix miniunzip when the last entry in a zip file is itself a zip file
+  (J Lillge)
+- add contrib/asm586 and contrib/asm686 (Brian Raiter)
+  See http://www.muppetlabs.com/~breadbox/software/assembly.html
+- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
+- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
+- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
+- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
+- added a FAQ file
+
+- Support gzdopen on Mac with Metrowerks (Jason Linhart)
+- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
+- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
+- avoid some warnings with Borland C (Tom Tanner)
+- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
+- emulate utime() for WIN32 in contrib/untgz  (Gilles Vollant)
+- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
+- use libdir and includedir in Makefile.in (Tim Mooney)
+- support shared libraries on OSF1 V4 (Tim Mooney)
+- remove so_locations in "make clean"  (Tim Mooney)
+- fix maketree.c compilation error (Glenn, Mark)
+- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
+- new Makefile.riscos (Rich Walker)
+- initialize static descriptors in trees.c for embedded targets (Nick Smith)
+- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
+- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
+- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
+- fix maketree.c to allow clean compilation of inffixed.h (Mark)
+- fix parameter check in deflateCopy (Gunther Nikl)
+- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
+- Many portability patches by Christian Spieler:
+  . zutil.c, zutil.h: added "const" for zmem*
+  . Make_vms.com: fixed some typos
+  . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
+  . msdos/Makefile.msc: remove "default rtl link library" info from obj files
+  . msdos/Makefile.*: use model-dependent name for the built zlib library
+  . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
+     new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
+- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
+- replace __far with _far for better portability (Christian Spieler, Tom Lane)
+- fix test for errno.h in configure (Tim Newsham)
+
+Changes in 1.1.2 (19 March 98)
+- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
+  See http://www.winimage.com/zLibDll/unzip.html
+- preinitialize the inflate tables for fixed codes, to make the code
+  completely thread safe (Mark)
+- some simplifications and slight speed-up to the inflate code (Mark)
+- fix gzeof on non-compressed files (Allan Schrum)
+- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
+- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
+- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
+- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
+- do not wrap extern "C" around system includes (Tom Lane)
+- mention zlib binding for TCL in README (Andreas Kupries)
+- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
+- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
+- allow "configure --prefix $HOME" (Tim Mooney)
+- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
+- move Makefile.sas to amiga/Makefile.sas
+
+Changes in 1.1.1 (27 Feb 98)
+- fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson)
+- remove block truncation heuristic which had very marginal effect for zlib
+  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
+  compression ratio on some files. This also allows inlining _tr_tally for
+  matches in deflate_slow.
+- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
+
+Changes in 1.1.0 (24 Feb 98)
+- do not return STREAM_END prematurely in inflate (John Bowler)
+- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
+- compile with -DFASTEST to get compression code optimized for speed only
+- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
+- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
+  on Sun but significant on HP)
+
+- add a pointer to experimental unzip library in README (Gilles Vollant)
+- initialize variable gcc in configure (Chris Herborth)
+
+Changes in 1.0.9 (17 Feb 1998)
+- added gzputs and gzgets functions
+- do not clear eof flag in gzseek (Mark Diekhans)
+- fix gzseek for files in transparent mode (Mark Diekhans)
+- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
+- replace EXPORT with ZEXPORT to avoid conflict with other programs
+- added compress2 in zconf.h, zlib.def, zlib.dnt
+- new asm code from Gilles Vollant in contrib/asm386
+- simplify the inflate code (Mark):
+ . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
+ . ZALLOC the length list in inflate_trees_fixed() instead of using stack
+ . ZALLOC the value area for huft_build() instead of using stack
+ . Simplify Z_FINISH check in inflate()
+
+- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
+- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
+- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
+  the declaration of FAR (Gilles VOllant)
+- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
+- read_buf buf parameter of type Bytef* instead of charf*
+- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
+- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
+- fix check for presence of directories in "make install" (Ian Willis)
+
+Changes in 1.0.8 (27 Jan 1998)
+- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
+- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
+- added compress2() to allow setting the compression level
+- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
+- use constant arrays for the static trees in trees.c instead of computing
+  them at run time (thanks to Ken Raeburn for this suggestion). To create
+  trees.h, compile with GEN_TREES_H and run "make test".
+- check return code of example in "make test" and display result
+- pass minigzip command line options to file_compress
+- simplifying code of inflateSync to avoid gcc 2.8 bug
+
+- support CC="gcc -Wall" in configure -s (QingLong)
+- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
+- fix test for shared library support to avoid compiler warnings
+- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
+- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
+- do not use fdopen for Metrowerks on Mac (Brad Pettit))
+- add checks for gzputc and gzputc in example.c
+- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
+- use const for the CRC table (Ken Raeburn)
+- fixed "make uninstall" for shared libraries
+- use Tracev instead of Trace in infblock.c
+- in example.c use correct compressed length for test_sync
+- suppress +vnocompatwarnings in configure for HPUX (not always supported)
+
+Changes in 1.0.7 (20 Jan 1998)
+- fix gzseek which was broken in write mode
+- return error for gzseek to negative absolute position
+- fix configure for Linux (Chun-Chung Chen)
+- increase stack space for MSC (Tim Wegner)
+- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
+- define EXPORTVA for gzprintf (Gilles Vollant)
+- added man page zlib.3 (Rick Rodgers)
+- for contrib/untgz, fix makedir() and improve Makefile
+
+- check gzseek in write mode in example.c
+- allocate extra buffer for seeks only if gzseek is actually called
+- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
+- add inflateSyncPoint in zconf.h
+- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
+
+Changes in 1.0.6 (19 Jan 1998)
+- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
+  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
+- Fix a deflate bug occurring only with compression level 0 (thanks to
+  Andy Buckler for finding this one).
+- In minigzip, pass transparently also the first byte for .Z files.
+- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
+- check Z_FINISH in inflate (thanks to Marc Schluper)
+- Implement deflateCopy (thanks to Adam Costello)
+- make static libraries by default in configure, add --shared option.
+- move MSDOS or Windows specific files to directory msdos
+- suppress the notion of partial flush to simplify the interface
+  (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
+- suppress history buffer provided by application to simplify the interface
+  (this feature was not implemented anyway in 1.0.4)
+- next_in and avail_in must be initialized before calling inflateInit or
+  inflateInit2
+- add EXPORT in all exported functions (for Windows DLL)
+- added Makefile.nt (thanks to Stephen Williams)
+- added the unsupported "contrib" directory:
+   contrib/asm386/ by Gilles Vollant <info@winimage.com>
+        386 asm code replacing longest_match().
+   contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
+        A C++ I/O streams interface to the zlib gz* functions
+   contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
+        Another C++ I/O streams interface
+   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
+        A very simple tar.gz file extractor using zlib
+   contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
+        How to use compress(), uncompress() and the gz* functions from VB.
+- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
+  level) in minigzip (thanks to Tom Lane)
+
+- use const for rommable constants in deflate
+- added test for gzseek and gztell in example.c
+- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
+- add undocumented function zError to convert error code to string
+  (for Tim Smithers)
+- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
+- Use default memcpy for Symantec MSDOS compiler.
+- Add EXPORT keyword for check_func (needed for Windows DLL)
+- add current directory to LD_LIBRARY_PATH for "make test"
+- create also a link for libz.so.1
+- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
+- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
+- added -soname for Linux in configure (Chun-Chung Chen,
+- assign numbers to the exported functions in zlib.def (for Windows DLL)
+- add advice in zlib.h for best usage of deflateSetDictionary
+- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
+- allow compilation with ANSI keywords only enabled for TurboC in large model
+- avoid "versionString"[0] (Borland bug)
+- add NEED_DUMMY_RETURN for Borland
+- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
+- allow compilation with CC
+- defined STDC for OS/2 (David Charlap)
+- limit external names to 8 chars for MVS (Thomas Lund)
+- in minigzip.c, use static buffers only for 16-bit systems
+- fix suffix check for "minigzip -d foo.gz"
+- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
+- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
+- added makelcc.bat for lcc-win32 (Tom St Denis)
+- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
+- Avoid expanded $Id: ChangeLog 246 2010-04-23 10:54:55Z nijtmans $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
+- check for unistd.h in configure (for off_t)
+- remove useless check parameter in inflate_blocks_free
+- avoid useless assignment of s->check to itself in inflate_blocks_new
+- do not flush twice in gzclose (thanks to Ken Raeburn)
+- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
+- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
+- work around buggy fclose on pipes for HP/UX
+- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
+- fix configure if CC is already equal to gcc
+
+Changes in 1.0.5 (3 Jan 98)
+- Fix inflate to terminate gracefully when fed corrupted or invalid data
+- Use const for rommable constants in inflate
+- Eliminate memory leaks on error conditions in inflate
+- Removed some vestigial code in inflate
+- Update web address in README
+
+Changes in 1.0.4 (24 Jul 96)
+- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
+  bit, so the decompressor could decompress all the correct data but went
+  on to attempt decompressing extra garbage data. This affected minigzip too.
+- zlibVersion and gzerror return const char* (needed for DLL)
+- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
+- use z_error only for DEBUG (avoid problem with DLLs)
+
+Changes in 1.0.3 (2 Jul 96)
+- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
+  small and medium models; this makes the library incompatible with previous
+  versions for these models. (No effect in large model or on other systems.)
+- return OK instead of BUF_ERROR if previous deflate call returned with
+  avail_out as zero but there is nothing to do
+- added memcmp for non STDC compilers
+- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
+- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
+- better check for 16-bit mode MSC (avoids problem with Symantec)
+
+Changes in 1.0.2 (23 May 96)
+- added Windows DLL support
+- added a function zlibVersion (for the DLL support)
+- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
+- Bytef is define's instead of typedef'd only for Borland C
+- avoid reading uninitialized memory in example.c
+- mention in README that the zlib format is now RFC1950
+- updated Makefile.dj2
+- added algorithm.doc
+
+Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
+- fix array overlay in deflate.c which sometimes caused bad compressed data
+- fix inflate bug with empty stored block
+- fix MSDOS medium model which was broken in 0.99
+- fix deflateParams() which could generated bad compressed data.
+- Bytef is define'd instead of typedef'ed (work around Borland bug)
+- added an INDEX file
+- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
+  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
+- speed up adler32 for modern machines without auto-increment
+- added -ansi for IRIX in configure
+- static_init_done in trees.c is an int
+- define unlink as delete for VMS
+- fix configure for QNX
+- add configure branch for SCO and HPUX
+- avoid many warnings (unused variables, dead assignments, etc...)
+- no fdopen for BeOS
+- fix the Watcom fix for 32 bit mode (define FAR as empty)
+- removed redefinition of Byte for MKWERKS
+- work around an MWKERKS bug (incorrect merge of all .h files)
+
+Changes in 0.99 (27 Jan 96)
+- allow preset dictionary shared between compressor and decompressor
+- allow compression level 0 (no compression)
+- add deflateParams in zlib.h: allow dynamic change of compression level
+  and compression strategy.
+- test large buffers and deflateParams in example.c
+- add optional "configure" to build zlib as a shared library
+- suppress Makefile.qnx, use configure instead
+- fixed deflate for 64-bit systems (detected on Cray)
+- fixed inflate_blocks for 64-bit systems (detected on Alpha)
+- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
+- always return Z_BUF_ERROR when deflate() has nothing to do
+- deflateInit and inflateInit are now macros to allow version checking
+- prefix all global functions and types with z_ with -DZ_PREFIX
+- make falloc completely reentrant (inftrees.c)
+- fixed very unlikely race condition in ct_static_init
+- free in reverse order of allocation to help memory manager
+- use zlib-1.0/* instead of zlib/* inside the tar.gz
+- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
+  -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
+- allow gzread on concatenated .gz files
+- deflateEnd now returns Z_DATA_ERROR if it was premature
+- deflate is finally (?) fully deterministic (no matches beyond end of input)
+- Document Z_SYNC_FLUSH
+- add uninstall in Makefile
+- Check for __cpluplus in zlib.h
+- Better test in ct_align for partial flush
+- avoid harmless warnings for Borland C++
+- initialize hash_head in deflate.c
+- avoid warning on fdopen (gzio.c) for HP cc -Aa
+- include stdlib.h for STDC compilers
+- include errno.h for Cray
+- ignore error if ranlib doesn't exist
+- call ranlib twice for NeXTSTEP
+- use exec_prefix instead of prefix for libz.a
+- renamed ct_* as _tr_* to avoid conflict with applications
+- clear z->msg in inflateInit2 before any error return
+- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
+- fixed typo in zconf.h (_GNUC__ => __GNUC__)
+- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
+- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
+- in fcalloc, normalize pointer if size > 65520 bytes
+- don't use special fcalloc for 32 bit Borland C++
+- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
+- use Z_BINARY instead of BINARY
+- document that gzclose after gzdopen will close the file
+- allow "a" as mode in gzopen.
+- fix error checking in gzread
+- allow skipping .gz extra-field on pipes
+- added reference to Perl interface in README
+- put the crc table in FAR data (I dislike more and more the medium model :)
+- added get_crc_table
+- added a dimension to all arrays (Borland C can't count).
+- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
+- guard against multiple inclusion of *.h (for precompiled header on Mac)
+- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
+- don't use unsized arrays to avoid silly warnings by Visual C++:
+     warning C4746: 'inflate_mask' : unsized array treated as  '__far'
+     (what's wrong with far data in far model?).
+- define enum out of inflate_blocks_state to allow compilation with C++
+
+Changes in 0.95 (16 Aug 95)
+- fix MSDOS small and medium model (now easier to adapt to any compiler)
+- inlined send_bits
+- fix the final (:-) bug for deflate with flush (output was correct but
+  not completely flushed in rare occasions).
+- default window size is same for compression and decompression
+  (it's now sufficient to set MAX_WBITS in zconf.h).
+- voidp -> voidpf and voidnp -> voidp (for consistency with other
+  typedefs and because voidnp was not near in large model).
+
+Changes in 0.94 (13 Aug 95)
+- support MSDOS medium model
+- fix deflate with flush (could sometimes generate bad output)
+- fix deflateReset (zlib header was incorrectly suppressed)
+- added support for VMS
+- allow a compression level in gzopen()
+- gzflush now calls fflush
+- For deflate with flush, flush even if no more input is provided.
+- rename libgz.a as libz.a
+- avoid complex expression in infcodes.c triggering Turbo C bug
+- work around a problem with gcc on Alpha (in INSERT_STRING)
+- don't use inline functions (problem with some gcc versions)
+- allow renaming of Byte, uInt, etc... with #define.
+- avoid warning about (unused) pointer before start of array in deflate.c
+- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
+- avoid reserved word 'new' in trees.c
+
+Changes in 0.93 (25 June 95)
+- temporarily disable inline functions
+- make deflate deterministic
+- give enough lookahead for PARTIAL_FLUSH
+- Set binary mode for stdin/stdout in minigzip.c for OS/2
+- don't even use signed char in inflate (not portable enough)
+- fix inflate memory leak for segmented architectures
+
+Changes in 0.92 (3 May 95)
+- don't assume that char is signed (problem on SGI)
+- Clear bit buffer when starting a stored block
+- no memcpy on Pyramid
+- suppressed inftest.c
+- optimized fill_window, put longest_match inline for gcc
+- optimized inflate on stored blocks.
+- untabify all sources to simplify patches
+
+Changes in 0.91 (2 May 95)
+- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
+- Document the memory requirements in zconf.h
+- added "make install"
+- fix sync search logic in inflateSync
+- deflate(Z_FULL_FLUSH) now works even if output buffer too short
+- after inflateSync, don't scare people with just "lo world"
+- added support for DJGPP
+
+Changes in 0.9 (1 May 95)
+- don't assume that zalloc clears the allocated memory (the TurboC bug
+  was Mark's bug after all :)
+- let again gzread copy uncompressed data unchanged (was working in 0.71)
+- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
+- added a test of inflateSync in example.c
+- moved MAX_WBITS to zconf.h because users might want to change that.
+- document explicitly that zalloc(64K) on MSDOS must return a normalized
+  pointer (zero offset)
+- added Makefiles for Microsoft C, Turbo C, Borland C++
+- faster crc32()
+
+Changes in 0.8 (29 April 95)
+- added fast inflate (inffast.c)
+- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
+  is incompatible with previous versions of zlib which returned Z_OK.
+- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
+  (actually that was not a compiler bug, see 0.81 above)
+- gzread no longer reads one extra byte in certain cases
+- In gzio destroy(), don't reference a freed structure
+- avoid many warnings for MSDOS
+- avoid the ERROR symbol which is used by MS Windows
+
+Changes in 0.71 (14 April 95)
+- Fixed more MSDOS compilation problems :( There is still a bug with
+  TurboC large model.
+
+Changes in 0.7 (14 April 95)
+- Added full inflate support.
+- Simplified the crc32() interface. The pre- and post-conditioning
+  (one's complement) is now done inside crc32(). WARNING: this is
+  incompatible with previous versions; see zlib.h for the new usage.
+
+Changes in 0.61 (12 April 95)
+- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
+
+Changes in 0.6 (11 April 95)
+- added minigzip.c
+- added gzdopen to reopen a file descriptor as gzFile
+- added transparent reading of non-gziped files in gzread.
+- fixed bug in gzread (don't read crc as data)
+- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
+- don't allocate big arrays in the stack (for MSDOS)
+- fix some MSDOS compilation problems
+
+Changes in 0.5:
+- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
+  not yet Z_FULL_FLUSH.
+- support decompression but only in a single step (forced Z_FINISH)
+- added opaque object for zalloc and zfree.
+- added deflateReset and inflateReset
+- added a variable zlib_version for consistency checking.
+- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
+  Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
+
+Changes in 0.4:
+- avoid "zip" everywhere, use zlib instead of ziplib.
+- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
+  if compression method == 8.
+- added adler32 and crc32
+- renamed deflateOptions as deflateInit2, call one or the other but not both
+- added the method parameter for deflateInit2.
+- added inflateInit2
+- simplied considerably deflateInit and inflateInit by not supporting
+  user-provided history buffer. This is supported only in deflateInit2
+  and inflateInit2.
+
+Changes in 0.3:
+- prefix all macro names with Z_
+- use Z_FINISH instead of deflateEnd to finish compression.
+- added Z_HUFFMAN_ONLY
+- added gzerror()
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/FAQ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/FAQ
new file mode 100644
index 00000000..1a22750a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/FAQ
@@ -0,0 +1,366 @@
+
+                Frequently Asked Questions about zlib
+
+
+If your question is not there, please check the zlib home page
+http://zlib.net/ which may have more recent information.
+The lastest zlib FAQ is at http://zlib.net/zlib_faq.html
+
+
+ 1. Is zlib Y2K-compliant?
+
+    Yes. zlib doesn't handle dates.
+
+ 2. Where can I get a Windows DLL version?
+
+    The zlib sources can be compiled without change to produce a DLL.  See the
+    file win32/DLL_FAQ.txt in the zlib distribution.  Pointers to the
+    precompiled DLL are found in the zlib web site at http://zlib.net/ .
+
+ 3. Where can I get a Visual Basic interface to zlib?
+
+    See
+        * http://marknelson.us/1997/01/01/zlib-engine/
+        * win32/DLL_FAQ.txt in the zlib distribution
+
+ 4. compress() returns Z_BUF_ERROR.
+
+    Make sure that before the call of compress(), the length of the compressed
+    buffer is equal to the available size of the compressed buffer and not
+    zero.  For Visual Basic, check that this parameter is passed by reference
+    ("as any"), not by value ("as long").
+
+ 5. deflate() or inflate() returns Z_BUF_ERROR.
+
+    Before making the call, make sure that avail_in and avail_out are not zero.
+    When setting the parameter flush equal to Z_FINISH, also make sure that
+    avail_out is big enough to allow processing all pending input.  Note that a
+    Z_BUF_ERROR is not fatal--another call to deflate() or inflate() can be
+    made with more input or output space.  A Z_BUF_ERROR may in fact be
+    unavoidable depending on how the functions are used, since it is not
+    possible to tell whether or not there is more output pending when
+    strm.avail_out returns with zero.  See http://zlib.net/zlib_how.html for a
+    heavily annotated example.
+
+ 6. Where's the zlib documentation (man pages, etc.)?
+
+    It's in zlib.h .  Examples of zlib usage are in the files example.c and
+    minigzip.c, with more in examples/ .
+
+ 7. Why don't you use GNU autoconf or libtool or ...?
+
+    Because we would like to keep zlib as a very small and simple package.
+    zlib is rather portable and doesn't need much configuration.
+
+ 8. I found a bug in zlib.
+
+    Most of the time, such problems are due to an incorrect usage of zlib.
+    Please try to reproduce the problem with a small program and send the
+    corresponding source to us at zlib@gzip.org .  Do not send multi-megabyte
+    data files without prior agreement.
+
+ 9. Why do I get "undefined reference to gzputc"?
+
+    If "make test" produces something like
+
+       example.o(.text+0x154): undefined reference to `gzputc'
+
+    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or
+    /usr/X11R6/lib. Remove any old versions, then do "make install".
+
+10. I need a Delphi interface to zlib.
+
+    See the contrib/delphi directory in the zlib distribution.
+
+11. Can zlib handle .zip archives?
+
+    Not by itself, no.  See the directory contrib/minizip in the zlib
+    distribution.
+
+12. Can zlib handle .Z files?
+
+    No, sorry.  You have to spawn an uncompress or gunzip subprocess, or adapt
+    the code of uncompress on your own.
+
+13. How can I make a Unix shared library?
+
+    make clean
+    ./configure -s
+    make
+
+14. How do I install a shared zlib library on Unix?
+
+    After the above, then:
+
+    make install
+
+    However, many flavors of Unix come with a shared zlib already installed.
+    Before going to the trouble of compiling a shared version of zlib and
+    trying to install it, you may want to check if it's already there!  If you
+    can #include <zlib.h>, it's there.  The -lz option will probably link to
+    it.  You can check the version at the top of zlib.h or with the
+    ZLIB_VERSION symbol defined in zlib.h .
+
+15. I have a question about OttoPDF.
+
+    We are not the authors of OttoPDF. The real author is on the OttoPDF web
+    site: Joel Hainley, jhainley@myndkryme.com.
+
+16. Can zlib decode Flate data in an Adobe PDF file?
+
+    Yes. See http://www.pdflib.com/ . To modify PDF forms, see
+    http://sourceforge.net/projects/acroformtool/ .
+
+17. Why am I getting this "register_frame_info not found" error on Solaris?
+
+    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib
+    generates an error such as:
+
+        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:
+        symbol __register_frame_info: referenced symbol not found
+
+    The symbol __register_frame_info is not part of zlib, it is generated by
+    the C compiler (cc or gcc).  You must recompile applications using zlib
+    which have this problem.  This problem is specific to Solaris.  See
+    http://www.sunfreeware.com for Solaris versions of zlib and applications
+    using zlib.
+
+18. Why does gzip give an error on a file I make with compress/deflate?
+
+    The compress and deflate functions produce data in the zlib format, which
+    is different and incompatible with the gzip format.  The gz* functions in
+    zlib on the other hand use the gzip format.  Both the zlib and gzip formats
+    use the same compressed data format internally, but have different headers
+    and trailers around the compressed data.
+
+19. Ok, so why are there two different formats?
+
+    The gzip format was designed to retain the directory information about a
+    single file, such as the name and last modification date.  The zlib format
+    on the other hand was designed for in-memory and communication channel
+    applications, and has a much more compact header and trailer and uses a
+    faster integrity check than gzip.
+
+20. Well that's nice, but how do I make a gzip file in memory?
+
+    You can request that deflate write the gzip format instead of the zlib
+    format using deflateInit2().  You can also request that inflate decode the
+    gzip format using inflateInit2().  Read zlib.h for more details.
+
+21. Is zlib thread-safe?
+
+    Yes.  However any library routines that zlib uses and any application-
+    provided memory allocation routines must also be thread-safe.  zlib's gz*
+    functions use stdio library routines, and most of zlib's functions use the
+    library memory allocation routines by default.  zlib's *Init* functions
+    allow for the application to provide custom memory allocation routines.
+
+    Of course, you should only operate on any given zlib or gzip stream from a
+    single thread at a time.
+
+22. Can I use zlib in my commercial application?
+
+    Yes.  Please read the license in zlib.h.
+
+23. Is zlib under the GNU license?
+
+    No.  Please read the license in zlib.h.
+
+24. The license says that altered source versions must be "plainly marked". So
+    what exactly do I need to do to meet that requirement?
+
+    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h.  In
+    particular, the final version number needs to be changed to "f", and an
+    identification string should be appended to ZLIB_VERSION.  Version numbers
+    x.x.x.f are reserved for modifications to zlib by others than the zlib
+    maintainers.  For example, if the version of the base zlib you are altering
+    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and
+    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3".  You can also
+    update the version strings in deflate.c and inftrees.c.
+
+    For altered source distributions, you should also note the origin and
+    nature of the changes in zlib.h, as well as in ChangeLog and README, along
+    with the dates of the alterations.  The origin should include at least your
+    name (or your company's name), and an email address to contact for help or
+    issues with the library.
+
+    Note that distributing a compiled zlib library along with zlib.h and
+    zconf.h is also a source distribution, and so you should change
+    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes
+    in zlib.h as you would for a full source distribution.
+
+25. Will zlib work on a big-endian or little-endian architecture, and can I
+    exchange compressed data between them?
+
+    Yes and yes.
+
+26. Will zlib work on a 64-bit machine?
+
+    Yes.  It has been tested on 64-bit machines, and has no dependence on any
+    data types being limited to 32-bits in length.  If you have any
+    difficulties, please provide a complete problem report to zlib@gzip.org
+
+27. Will zlib decompress data from the PKWare Data Compression Library?
+
+    No.  The PKWare DCL uses a completely different compressed data format than
+    does PKZIP and zlib.  However, you can look in zlib's contrib/blast
+    directory for a possible solution to your problem.
+
+28. Can I access data randomly in a compressed stream?
+
+    No, not without some preparation.  If when compressing you periodically use
+    Z_FULL_FLUSH, carefully write all the pending data at those points, and
+    keep an index of those locations, then you can start decompression at those
+    points.  You have to be careful to not use Z_FULL_FLUSH too often, since it
+    can significantly degrade compression.  Alternatively, you can scan a
+    deflate stream once to generate an index, and then use that index for
+    random access.  See examples/zran.c .
+
+29. Does zlib work on MVS, OS/390, CICS, etc.?
+
+    It has in the past, but we have not heard of any recent evidence.  There
+    were working ports of zlib 1.1.4 to MVS, but those links no longer work.
+    If you know of recent, successful applications of zlib on these operating
+    systems, please let us know.  Thanks.
+
+30. Is there some simpler, easier to read version of inflate I can look at to
+    understand the deflate format?
+
+    First off, you should read RFC 1951.  Second, yes.  Look in zlib's
+    contrib/puff directory.
+
+31. Does zlib infringe on any patents?
+
+    As far as we know, no.  In fact, that was originally the whole point behind
+    zlib.  Look here for some more information:
+
+    http://www.gzip.org/#faq11
+
+32. Can zlib work with greater than 4 GB of data?
+
+    Yes.  inflate() and deflate() will process any amount of data correctly.
+    Each call of inflate() or deflate() is limited to input and output chunks
+    of the maximum value that can be stored in the compiler's "unsigned int"
+    type, but there is no limit to the number of chunks.  Note however that the
+    strm.total_in and strm_total_out counters may be limited to 4 GB.  These
+    counters are provided as a convenience and are not used internally by
+    inflate() or deflate().  The application can easily set up its own counters
+    updated after each call of inflate() or deflate() to count beyond 4 GB.
+    compress() and uncompress() may be limited to 4 GB, since they operate in a
+    single call.  gzseek() and gztell() may be limited to 4 GB depending on how
+    zlib is compiled.  See the zlibCompileFlags() function in zlib.h.
+
+    The word "may" appears several times above since there is a 4 GB limit only
+    if the compiler's "long" type is 32 bits.  If the compiler's "long" type is
+    64 bits, then the limit is 16 exabytes.
+
+33. Does zlib have any security vulnerabilities?
+
+    The only one that we are aware of is potentially in gzprintf().  If zlib is
+    compiled to use sprintf() or vsprintf(), then there is no protection
+    against a buffer overflow of an 8K string space (or other value as set by
+    gzbuffer()), other than the caller of gzprintf() assuring that the output
+    will not exceed 8K.  On the other hand, if zlib is compiled to use
+    snprintf() or vsnprintf(), which should normally be the case, then there is
+    no vulnerability.  The ./configure script will display warnings if an
+    insecure variation of sprintf() will be used by gzprintf().  Also the
+    zlibCompileFlags() function will return information on what variant of
+    sprintf() is used by gzprintf().
+
+    If you don't have snprintf() or vsnprintf() and would like one, you can
+    find a portable implementation here:
+
+        http://www.ijs.si/software/snprintf/
+
+    Note that you should be using the most recent version of zlib.  Versions
+    1.1.3 and before were subject to a double-free vulnerability, and versions
+    1.2.1 and 1.2.2 were subject to an access exception when decompressing
+    invalid compressed data.
+
+34. Is there a Java version of zlib?
+
+    Probably what you want is to use zlib in Java. zlib is already included
+    as part of the Java SDK in the java.util.zip package. If you really want
+    a version of zlib written in the Java language, look on the zlib home
+    page for links: http://zlib.net/ .
+
+35. I get this or that compiler or source-code scanner warning when I crank it
+    up to maximally-pedantic. Can't you guys write proper code?
+
+    Many years ago, we gave up attempting to avoid warnings on every compiler
+    in the universe.  It just got to be a waste of time, and some compilers
+    were downright silly as well as contradicted each other.  So now, we simply
+    make sure that the code always works.
+
+36. Valgrind (or some similar memory access checker) says that deflate is
+    performing a conditional jump that depends on an uninitialized value.
+    Isn't that a bug?
+
+    No.  That is intentional for performance reasons, and the output of deflate
+    is not affected.  This only started showing up recently since zlib 1.2.x
+    uses malloc() by default for allocations, whereas earlier versions used
+    calloc(), which zeros out the allocated memory.  Even though the code was
+    correct, versions 1.2.4 and later was changed to not stimulate these
+    checkers.
+
+37. Will zlib read the (insert any ancient or arcane format here) compressed
+    data format?
+
+    Probably not. Look in the comp.compression FAQ for pointers to various
+    formats and associated software.
+
+38. How can I encrypt/decrypt zip files with zlib?
+
+    zlib doesn't support encryption.  The original PKZIP encryption is very
+    weak and can be broken with freely available programs.  To get strong
+    encryption, use GnuPG, http://www.gnupg.org/ , which already includes zlib
+    compression.  For PKZIP compatible "encryption", look at
+    http://www.info-zip.org/
+
+39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?
+
+    "gzip" is the gzip format, and "deflate" is the zlib format.  They should
+    probably have called the second one "zlib" instead to avoid confusion with
+    the raw deflate compressed data format.  While the HTTP 1.1 RFC 2616
+    correctly points to the zlib specification in RFC 1950 for the "deflate"
+    transfer encoding, there have been reports of servers and browsers that
+    incorrectly produce or expect raw deflate data per the deflate
+    specficiation in RFC 1951, most notably Microsoft.  So even though the
+    "deflate" transfer encoding using the zlib format would be the more
+    efficient approach (and in fact exactly what the zlib format was designed
+    for), using the "gzip" transfer encoding is probably more reliable due to
+    an unfortunate choice of name on the part of the HTTP 1.1 authors.
+
+    Bottom line: use the gzip format for HTTP 1.1 encoding.
+
+40. Does zlib support the new "Deflate64" format introduced by PKWare?
+
+    No.  PKWare has apparently decided to keep that format proprietary, since
+    they have not documented it as they have previous compression formats.  In
+    any case, the compression improvements are so modest compared to other more
+    modern approaches, that it's not worth the effort to implement.
+
+41. I'm having a problem with the zip functions in zlib, can you help?
+
+    There are no zip functions in zlib.  You are probably using minizip by
+    Giles Vollant, which is found in the contrib directory of zlib.  It is not
+    part of zlib.  In fact none of the stuff in contrib is part of zlib.  The
+    files in there are not supported by the zlib authors.  You need to contact
+    the authors of the respective contribution for help.
+
+42. The match.asm code in contrib is under the GNU General Public License.
+    Since it's part of zlib, doesn't that mean that all of zlib falls under the
+    GNU GPL?
+
+    No.  The files in contrib are not part of zlib.  They were contributed by
+    other authors and are provided as a convenience to the user within the zlib
+    distribution.  Each item in contrib has its own license.
+
+43. Is zlib subject to export controls?  What is its ECCN?
+
+    zlib is not subject to export controls, and so is classified as EAR99.
+
+44. Can you please sign these lengthy legal documents and fax them back to us
+    so that we can use your software in our product?
+
+    No. Go away. Shoo.
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/INDEX b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/INDEX
new file mode 100644
index 00000000..f6c51ca1
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/INDEX
@@ -0,0 +1,65 @@
+CMakeLists.txt  cmake build file
+ChangeLog       history of changes
+FAQ             Frequently Asked Questions about zlib
+INDEX           this file
+Makefile        dummy Makefile that tells you to ./configure
+Makefile.in     template for Unix Makefile
+README          guess what
+configure       configure script for Unix
+make_vms.com    makefile for VMS
+treebuild.xml   XML description of source file dependencies
+zconf.h.cmakein zconf.h template for cmake
+zconf.h.in      zconf.h template for configure
+zlib.3          Man page for zlib
+zlib.3.pdf      Man page in PDF format
+zlib.map        Linux symbol information
+zlib.pc.in      Template for pkg-config descriptor
+zlib2ansi       perl script to convert source files for C++ compilation
+
+amiga/          makefiles for Amiga SAS C
+doc/            documentation for formats and algorithms
+msdos/          makefiles for MSDOS
+nintendods/     makefile for Nintendo DS
+old/            makefiles for various architectures and zlib documentation
+                files that have not yet been updated for zlib 1.2.x
+qnx/            makefiles for QNX
+watcom/         makefiles for OpenWatcom
+win32/          makefiles for Windows
+
+                zlib public header files (required for library use):
+zconf.h
+zlib.h
+
+                private source files used to build the zlib library:
+adler32.c
+compress.c
+crc32.c
+crc32.h
+deflate.c
+deflate.h
+gzclose.c
+gzguts.h
+gzlib.c
+gzread.c
+gzwrite.c
+infback.c
+inffast.c
+inffast.h
+inffixed.h
+inflate.c
+inflate.h
+inftrees.c
+inftrees.h
+trees.c
+trees.h
+uncompr.c
+zutil.c
+zutil.h
+
+                source files for sample programs:
+example.c
+minigzip.c
+See examples/README.examples for more
+
+                unsupported contribution by third parties
+See contrib/README.contrib
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/Makefile b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/Makefile
new file mode 100644
index 00000000..6bba86c7
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/Makefile
@@ -0,0 +1,5 @@
+all:
+	-@echo "Please use ./configure first.  Thank you."
+
+distclean:
+	make -f Makefile.in distclean
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/Makefile.in b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/Makefile.in
new file mode 100644
index 00000000..5b15bd00
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/Makefile.in
@@ -0,0 +1,257 @@
+# Makefile for zlib
+# Copyright (C) 1995-2010 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile and test, type:
+#    ./configure; make test
+# Normally configure builds both a static and a shared library.
+# If you want to build just a static library, use: ./configure --static
+
+# To use the asm code, type:
+#    cp contrib/asm?86/match.S ./match.S
+#    make LOC=-DASMV OBJA=match.o
+
+# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
+#    make install
+# To install in $HOME instead of /usr/local, use:
+#    make install prefix=$HOME
+
+CC=cc
+
+CFLAGS=-O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-g -DDEBUG
+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+#           -Wstrict-prototypes -Wmissing-prototypes
+
+SFLAGS=-O
+LDFLAGS=
+TEST_LDFLAGS=-L. libz.a
+LDSHARED=$(CC)
+CPP=$(CC) -E
+
+STATICLIB=libz.a
+SHAREDLIB=libz.so
+SHAREDLIBV=libz.so.1.2.5
+SHAREDLIBM=libz.so.1
+LIBS=$(STATICLIB) $(SHAREDLIBV)
+
+AR=ar rc
+RANLIB=ranlib
+LDCONFIG=ldconfig
+LDSHAREDLIBC=-lc
+TAR=tar
+SHELL=/bin/sh
+EXE=
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+libdir = ${exec_prefix}/lib
+sharedlibdir = ${libdir}
+includedir = ${prefix}/include
+mandir = ${prefix}/share/man
+man3dir = ${mandir}/man3
+pkgconfigdir = ${libdir}/pkgconfig
+
+OBJC = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
+	gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
+
+PIC_OBJC = adler32.lo compress.lo crc32.lo deflate.lo gzclose.lo gzlib.lo gzread.lo \
+	gzwrite.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo uncompr.lo zutil.lo
+
+# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
+OBJA =
+PIC_OBJA =
+
+OBJS = $(OBJC) $(OBJA)
+
+PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA)
+
+all: static shared
+
+static: example$(EXE) minigzip$(EXE)
+
+shared: examplesh$(EXE) minigzipsh$(EXE)
+
+all64: example64$(EXE) minigzip64$(EXE)
+
+check: test
+
+test: all teststatic testshared
+
+teststatic: static
+	@if echo hello world | ./minigzip | ./minigzip -d && ./example; then \
+	  echo '		*** zlib test OK ***'; \
+	else \
+	  echo '		*** zlib test FAILED ***'; false; \
+	fi
+	-@rm -f foo.gz
+
+testshared: shared
+	@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
+	LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
+	DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
+	SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
+	if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh; then \
+	  echo '		*** zlib shared test OK ***'; \
+	else \
+	  echo '		*** zlib shared test FAILED ***'; false; \
+	fi
+	-@rm -f foo.gz
+
+test64: all64
+	@if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64; then \
+	  echo '		*** zlib 64-bit test OK ***'; \
+	else \
+	  echo '		*** zlib 64-bit test FAILED ***'; false; \
+	fi
+	-@rm -f foo.gz
+
+libz.a: $(OBJS)
+	$(AR) $@ $(OBJS)
+	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
+
+match.o: match.S
+	$(CPP) match.S > _match.s
+	$(CC) -c _match.s
+	mv _match.o match.o
+	rm -f _match.s
+
+match.lo: match.S
+	$(CPP) match.S > _match.s
+	$(CC) -c -fPIC _match.s
+	mv _match.o match.lo
+	rm -f _match.s
+
+example64.o: example.c zlib.h zconf.h
+	$(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ example.c
+
+minigzip64.o: minigzip.c zlib.h zconf.h
+	$(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ minigzip.c
+
+.SUFFIXES: .lo
+
+.c.lo:
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $<
+	-@mv objs/$*.o $@
+
+$(SHAREDLIBV): $(PIC_OBJS)
+	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
+	rm -f $(SHAREDLIB) $(SHAREDLIBM)
+	ln -s $@ $(SHAREDLIB)
+	ln -s $@ $(SHAREDLIBM)
+	-@rmdir objs
+
+example$(EXE): example.o $(STATICLIB)
+	$(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
+
+minigzip$(EXE): minigzip.o $(STATICLIB)
+	$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
+
+examplesh$(EXE): example.o $(SHAREDLIBV)
+	$(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
+
+minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
+	$(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
+
+example64$(EXE): example64.o $(STATICLIB)
+	$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
+
+minigzip64$(EXE): minigzip64.o $(STATICLIB)
+	$(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
+
+install-libs: $(LIBS)
+	-@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
+	-@if [ ! -d $(DESTDIR)$(libdir)       ]; then mkdir -p $(DESTDIR)$(libdir); fi
+	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
+	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
+	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+	cp $(STATICLIB) $(DESTDIR)$(libdir)
+	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
+	cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
+	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+	-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
+	  chmod 755 $(SHAREDLIBV); \
+	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \
+	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \
+	  ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
+	  ($(LDCONFIG) || true)  >/dev/null 2>&1; \
+	fi
+	cp zlib.3 $(DESTDIR)$(man3dir)
+	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
+	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
+	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
+# The ranlib in install is needed on NeXTSTEP which checks file times
+# ldconfig is for Linux
+
+install: install-libs
+	-@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
+	cp zlib.h zconf.h $(DESTDIR)$(includedir)
+	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
+
+uninstall:
+	cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h
+	cd $(DESTDIR)$(libdir); rm -f libz.a; \
+	if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
+	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
+	fi
+	cd $(DESTDIR)$(man3dir); rm -f zlib.3
+	cd $(DESTDIR)$(pkgconfigdir); rm -f zlib.pc
+
+docs: zlib.3.pdf
+
+zlib.3.pdf: zlib.3
+	groff -mandoc -f H -T ps zlib.3 | ps2pdf - zlib.3.pdf
+
+zconf.h.in: zconf.h.cmakein
+	sed "/^#cmakedefine/D" < zconf.h.cmakein > zconf.h.in
+	touch -r zconf.h.cmakein zconf.h.in
+
+zconf: zconf.h.in
+	cp -p zconf.h.in zconf.h
+
+mostlyclean: clean
+clean:
+	rm -f *.o *.lo *~ \
+	   example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
+	   example64$(EXE) minigzip64$(EXE) \
+	   libz.* foo.gz so_locations \
+	   _match.s maketree contrib/infback9/*.o
+	rm -rf objs
+
+maintainer-clean: distclean
+distclean: clean zconf docs
+	rm -f Makefile zlib.pc
+	-@rm -f .DS_Store
+	-@printf 'all:\n\t-@echo "Please use ./configure first.  Thank you."\n' > Makefile
+	-@printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile
+	-@touch -r Makefile.in Makefile
+
+tags:
+	etags *.[ch]
+
+depend:
+	makedepend -- $(CFLAGS) -- *.[ch]
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o zutil.o: zutil.h zlib.h zconf.h
+gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h
+compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h
+crc32.o: zutil.h zlib.h zconf.h crc32.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+infback.o inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
+
+adler32.lo zutil.lo: zutil.h zlib.h zconf.h
+gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h
+compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h
+crc32.lo: zutil.h zlib.h zconf.h crc32.h
+deflate.lo: deflate.h zutil.h zlib.h zconf.h
+infback.lo inflate.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
+inffast.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.lo: zutil.h zlib.h zconf.h inftrees.h
+trees.lo: deflate.h zutil.h zlib.h zconf.h trees.h
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/README b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/README
new file mode 100644
index 00000000..d4219bf8
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/README
@@ -0,0 +1,115 @@
+ZLIB DATA COMPRESSION LIBRARY
+
+zlib 1.2.5 is a general purpose data compression library.  All the code is
+thread safe.  The data format used by the zlib library is described by RFCs
+(Request for Comments) 1950 to 1952 in the files
+http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
+and rfc1952.txt (gzip format).
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example
+of the library is given in the file example.c which also tests that the library
+is working correctly.  Another example is given in the file minigzip.c.  The
+compression library itself is composed of all source files except example.c and
+minigzip.c.
+
+To compile all files and run the test program, follow the instructions given at
+the top of Makefile.in.  In short "./configure; make test", and if that goes
+well, "make install" should work for most flavors of Unix.  For Windows, use one
+of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
+make_vms.com.
+
+Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
+<info@winimage.com> for the Windows DLL version.  The zlib home page is
+http://zlib.net/ .  Before reporting a problem, please check this site to
+verify that you have the latest version of zlib; otherwise get the latest
+version and check whether the problem still exists or not.
+
+PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
+
+Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
+issue of Dr.  Dobb's Journal; a copy of the article is available at
+http://marknelson.us/1997/01/01/zlib-engine/ .
+
+The changes made in version 1.2.5 are documented in the file ChangeLog.
+
+Unsupported third party contributions are provided in directory contrib/ .
+
+zlib is available in Java using the java.util.zip package, documented at
+http://java.sun.com/developer/technicalArticles/Programming/compression/ .
+
+A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available
+at CPAN (Comprehensive Perl Archive Network) sites, including
+http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
+
+A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
+available in Python 1.5 and later versions, see
+http://www.python.org/doc/lib/module-zlib.html .
+
+zlib is built into tcl: http://wiki.tcl.tk/4610 .
+
+An experimental package to read and write files in .zip format, written on top
+of zlib by Gilles Vollant <info@winimage.com>, is available in the
+contrib/minizip directory of zlib.
+
+
+Notes for some targets:
+
+- For Windows DLL versions, please see win32/DLL_FAQ.txt
+
+- For 64-bit Irix, deflate.c must be compiled without any optimization. With
+  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
+  compiler flag). The compiler bug has been reported to SGI.
+
+- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
+  when compiled with cc.
+
+- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
+  necessary to get gzprintf working correctly. This is done by configure.
+
+- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
+  other compilers. Use "make test" to check your compiler.
+
+- gzdopen is not supported on RISCOS or BEOS.
+
+- For PalmOs, see http://palmzlib.sourceforge.net/
+
+
+Acknowledgments:
+
+  The deflate format used by zlib was defined by Phil Katz.  The deflate and
+  zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
+  people who reported problems and suggested various improvements in zlib; they
+  are too numerous to cite here.
+
+Copyright notice:
+
+ (C) 1995-2010 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not* receiving
+lengthy legal documents to sign.  The sources are provided for free but without
+warranty of any kind.  The library has been entirely written by Jean-loup
+Gailly and Mark Adler; it does not include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include in
+the file ChangeLog history information documenting your changes.  Please read
+the FAQ for more information on the distribution of modified source versions.
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/adler32.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/adler32.c
new file mode 100644
index 00000000..64eb4b94
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/adler32.c
@@ -0,0 +1,169 @@
+/* adler32.c -- compute the Adler-32 checksum of a data stream
+ * Copyright (C) 1995-2007 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: adler32.c 246 2010-04-23 10:54:55Z nijtmans $ */
+
+#include "zutil.h"
+
+#define local static
+
+local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);
+
+#define BASE 65521UL    /* largest prime smaller than 65536 */
+#define NMAX 5552
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+
+#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
+
+/* use NO_DIVIDE if your processor does not do division in hardware */
+#ifdef NO_DIVIDE
+#  define MOD(a) \
+    do { \
+        if (a >= (BASE << 16)) a -= (BASE << 16); \
+        if (a >= (BASE << 15)) a -= (BASE << 15); \
+        if (a >= (BASE << 14)) a -= (BASE << 14); \
+        if (a >= (BASE << 13)) a -= (BASE << 13); \
+        if (a >= (BASE << 12)) a -= (BASE << 12); \
+        if (a >= (BASE << 11)) a -= (BASE << 11); \
+        if (a >= (BASE << 10)) a -= (BASE << 10); \
+        if (a >= (BASE << 9)) a -= (BASE << 9); \
+        if (a >= (BASE << 8)) a -= (BASE << 8); \
+        if (a >= (BASE << 7)) a -= (BASE << 7); \
+        if (a >= (BASE << 6)) a -= (BASE << 6); \
+        if (a >= (BASE << 5)) a -= (BASE << 5); \
+        if (a >= (BASE << 4)) a -= (BASE << 4); \
+        if (a >= (BASE << 3)) a -= (BASE << 3); \
+        if (a >= (BASE << 2)) a -= (BASE << 2); \
+        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#  define MOD4(a) \
+    do { \
+        if (a >= (BASE << 4)) a -= (BASE << 4); \
+        if (a >= (BASE << 3)) a -= (BASE << 3); \
+        if (a >= (BASE << 2)) a -= (BASE << 2); \
+        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#else
+#  define MOD(a) a %= BASE
+#  define MOD4(a) a %= BASE
+#endif
+
+/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    uInt len;
+{
+    unsigned long sum2;
+    unsigned n;
+
+    /* split Adler-32 into component sums */
+    sum2 = (adler >> 16) & 0xffff;
+    adler &= 0xffff;
+
+    /* in case user likes doing a byte at a time, keep it fast */
+    if (len == 1) {
+        adler += buf[0];
+        if (adler >= BASE)
+            adler -= BASE;
+        sum2 += adler;
+        if (sum2 >= BASE)
+            sum2 -= BASE;
+        return adler | (sum2 << 16);
+    }
+
+    /* initial Adler-32 value (deferred check for len == 1 speed) */
+    if (buf == Z_NULL)
+        return 1L;
+
+    /* in case short lengths are provided, keep it somewhat fast */
+    if (len < 16) {
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        if (adler >= BASE)
+            adler -= BASE;
+        MOD4(sum2);             /* only added so many BASE's */
+        return adler | (sum2 << 16);
+    }
+
+    /* do length NMAX blocks -- requires just one modulo operation */
+    while (len >= NMAX) {
+        len -= NMAX;
+        n = NMAX / 16;          /* NMAX is divisible by 16 */
+        do {
+            DO16(buf);          /* 16 sums unrolled */
+            buf += 16;
+        } while (--n);
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* do remaining bytes (less than NMAX, still just one modulo) */
+    if (len) {                  /* avoid modulos if none remaining */
+        while (len >= 16) {
+            len -= 16;
+            DO16(buf);
+            buf += 16;
+        }
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* return recombined sums */
+    return adler | (sum2 << 16);
+}
+
+/* ========================================================================= */
+local uLong adler32_combine_(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    unsigned long sum1;
+    unsigned long sum2;
+    unsigned rem;
+
+    /* the derivation of this formula is left as an exercise for the reader */
+    rem = (unsigned)(len2 % BASE);
+    sum1 = adler1 & 0xffff;
+    sum2 = rem * sum1;
+    MOD(sum2);
+    sum1 += (adler2 & 0xffff) + BASE - 1;
+    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
+    if (sum2 >= BASE) sum2 -= BASE;
+    return sum1 | (sum2 << 16);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT adler32_combine(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
+
+uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/amiga/Makefile.pup b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/amiga/Makefile.pup
new file mode 100644
index 00000000..8940c120
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/amiga/Makefile.pup
@@ -0,0 +1,69 @@
+# Amiga powerUP (TM) Makefile
+# makefile for libpng and SAS C V6.58/7.00 PPC compiler
+# Copyright (C) 1998 by Andreas R. Kleinert
+
+LIBNAME	= libzip.a
+
+CC	= scppc
+CFLAGS	= NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL \
+	  OPTLOOP OPTRDEP=8 OPTDEP=8 OPTCOMP=8 NOVER
+AR	= ppc-amigaos-ar cr
+RANLIB	= ppc-amigaos-ranlib
+LD	= ppc-amigaos-ld -r
+LDFLAGS	= -o
+LDLIBS	= LIB:scppc.a LIB:end.o
+RM	= delete quiet
+
+OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
+       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
+
+TEST_OBJS = example.o minigzip.o
+
+all: example minigzip
+
+check: test
+test: all
+	example
+	echo hello world | minigzip | minigzip -d
+
+$(LIBNAME): $(OBJS)
+	$(AR) $@ $(OBJS)
+	-$(RANLIB) $@
+
+example: example.o $(LIBNAME)
+	$(LD) $(LDFLAGS) $@ LIB:c_ppc.o $@.o $(LIBNAME) $(LDLIBS)
+
+minigzip: minigzip.o $(LIBNAME)
+	$(LD) $(LDFLAGS) $@ LIB:c_ppc.o $@.o $(LIBNAME) $(LDLIBS)
+
+mostlyclean: clean
+clean:
+	$(RM) *.o example minigzip $(LIBNAME) foo.gz
+
+zip:
+	zip -ul9 zlib README ChangeLog Makefile Make????.??? Makefile.?? \
+	  descrip.mms *.[ch]
+
+tgz:
+	cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
+	  zlib/Make????.??? zlib/Makefile.?? zlib/descrip.mms zlib/*.[ch]
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o: zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: crc32.h zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+example.o: zlib.h zconf.h
+gzclose.o: zlib.h zconf.h gzguts.h
+gzlib.o: zlib.h zconf.h gzguts.h
+gzread.o: zlib.h zconf.h gzguts.h
+gzwrite.o: zlib.h zconf.h gzguts.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+minigzip.o: zlib.h zconf.h
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/amiga/Makefile.sas b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/amiga/Makefile.sas
new file mode 100644
index 00000000..749e2915
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/amiga/Makefile.sas
@@ -0,0 +1,68 @@
+# SMakefile for zlib
+# Modified from the standard UNIX Makefile Copyright Jean-loup Gailly
+# Osma Ahvenlampi <Osma.Ahvenlampi@hut.fi>
+# Amiga, SAS/C 6.56 & Smake
+
+CC=sc
+CFLAGS=OPT
+#CFLAGS=OPT CPU=68030
+#CFLAGS=DEBUG=LINE
+LDFLAGS=LIB z.lib
+
+SCOPTIONS=OPTSCHED OPTINLINE OPTALIAS OPTTIME OPTINLOCAL STRMERGE \
+       NOICONS PARMS=BOTH NOSTACKCHECK UTILLIB NOVERSION ERRORREXX \
+       DEF=POSTINC
+
+OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
+       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
+
+TEST_OBJS = example.o minigzip.o
+
+all: SCOPTIONS example minigzip
+
+check: test
+test: all
+	example
+	echo hello world | minigzip | minigzip -d
+
+install: z.lib
+	copy clone zlib.h zconf.h INCLUDE:
+	copy clone z.lib LIB:
+
+z.lib: $(OBJS)
+	oml z.lib r $(OBJS)
+
+example: example.o z.lib
+	$(CC) $(CFLAGS) LINK TO $@ example.o $(LDFLAGS)
+
+minigzip: minigzip.o z.lib
+	$(CC) $(CFLAGS) LINK TO $@ minigzip.o $(LDFLAGS)
+
+mostlyclean: clean
+clean:
+	-delete force quiet example minigzip *.o z.lib foo.gz *.lnk SCOPTIONS
+
+SCOPTIONS: Makefile.sas
+	copy to $@ <from <
+$(SCOPTIONS)
+<
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o: zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: crc32.h zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+example.o: zlib.h zconf.h
+gzclose.o: zlib.h zconf.h gzguts.h
+gzlib.o: zlib.h zconf.h gzguts.h
+gzread.o: zlib.h zconf.h gzguts.h
+gzwrite.o: zlib.h zconf.h gzguts.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+minigzip.o: zlib.h zconf.h
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/compress.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/compress.c
new file mode 100644
index 00000000..0c3efa8e
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/compress.c
@@ -0,0 +1,80 @@
+/* compress.c -- compress a memory buffer
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: compress.c 246 2010-04-23 10:54:55Z nijtmans $ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+/* ===========================================================================
+     Compresses the source buffer into the destination buffer. The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer. Upon entry, destLen is the total size of the
+   destination buffer, which must be at least 0.1% larger than sourceLen plus
+   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+    int level;
+{
+    z_stream stream;
+    int err;
+
+    stream.next_in = (Bytef*)source;
+    stream.avail_in = (uInt)sourceLen;
+#ifdef MAXSEG_64K
+    /* Check for source > 64K on 16-bit machine: */
+    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
+#endif
+    stream.next_out = dest;
+    stream.avail_out = (uInt)*destLen;
+    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
+
+    err = deflateInit(&stream, level);
+    if (err != Z_OK) return err;
+
+    err = deflate(&stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        deflateEnd(&stream);
+        return err == Z_OK ? Z_BUF_ERROR : err;
+    }
+    *destLen = stream.total_out;
+
+    err = deflateEnd(&stream);
+    return err;
+}
+
+/* ===========================================================================
+ */
+int ZEXPORT compress (dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
+}
+
+/* ===========================================================================
+     If the default memLevel or windowBits for deflateInit() is changed, then
+   this function needs to be updated.
+ */
+uLong ZEXPORT compressBound (sourceLen)
+    uLong sourceLen;
+{
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/configure b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/configure
new file mode 100644
index 00000000..bd9edd26
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/configure
@@ -0,0 +1,596 @@
+#!/bin/sh
+# configure script for zlib.
+#
+# Normally configure builds both a static and a shared library.
+# If you want to build just a static library, use: ./configure --static
+#
+# To impose specific compiler or flags or install directory, use for example:
+#    prefix=$HOME CC=cc CFLAGS="-O4" ./configure
+# or for csh/tcsh users:
+#    (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
+
+# Incorrect settings of CC or CFLAGS may prevent creating a shared library.
+# If you have problems, try without defining CC and CFLAGS before reporting
+# an error.
+
+if [ -n "${CHOST}" ]; then
+    uname="$(echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/')"
+    CROSS_PREFIX="${CHOST}-"
+fi
+
+STATICLIB=libz.a
+LDFLAGS="${LDFLAGS} -L. ${STATICLIB}"
+VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
+VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h`
+VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
+VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
+if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then
+    AR=${AR-"${CROSS_PREFIX}ar"}
+    test -n "${CROSS_PREFIX}" && echo Using ${AR}
+else
+    AR=${AR-"ar"}
+    test -n "${CROSS_PREFIX}" && echo Using ${AR}
+fi
+AR_RC="${AR} rc"
+if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then
+    RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"}
+    test -n "${CROSS_PREFIX}" && echo Using ${RANLIB}
+else
+    RANLIB=${RANLIB-"ranlib"}
+fi
+if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then
+    NM=${NM-"${CROSS_PREFIX}nm"}
+    test -n "${CROSS_PREFIX}" && echo Using ${NM}
+else
+    NM=${NM-"nm"}
+fi
+LDCONFIG=${LDCONFIG-"ldconfig"}
+LDSHAREDLIBC="${LDSHAREDLIBC--lc}"
+prefix=${prefix-/usr/local}
+exec_prefix=${exec_prefix-'${prefix}'}
+libdir=${libdir-'${exec_prefix}/lib'}
+sharedlibdir=${sharedlibdir-'${libdir}'}
+includedir=${includedir-'${prefix}/include'}
+mandir=${mandir-'${prefix}/share/man'}
+shared_ext='.so'
+shared=1
+zprefix=0
+build64=0
+gcc=0
+old_cc="$CC"
+old_cflags="$CFLAGS"
+
+while test $# -ge 1
+do
+case "$1" in
+    -h* | --help)
+      echo 'usage:'
+      echo '  configure [--zprefix] [--prefix=PREFIX]  [--eprefix=EXPREFIX]'
+      echo '    [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]'
+      echo '    [--includedir=INCLUDEDIR]'
+        exit 0 ;;
+    -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;;
+    -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;;
+    -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;;
+    --sharedlibdir=*) sharedlibdir=`echo $1 | sed 's/.*=//'`; shift ;;
+    -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;;
+    -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;;
+    -p* | --prefix) prefix="$2"; shift; shift ;;
+    -e* | --eprefix) exec_prefix="$2"; shift; shift ;;
+    -l* | --libdir) libdir="$2"; shift; shift ;;
+    -i* | --includedir) includedir="$2"; shift; shift ;;
+    -s* | --shared | --enable-shared) shared=1; shift ;;
+    -t | --static) shared=0; shift ;;
+    -z* | --zprefix) zprefix=1; shift ;;
+    -6* | --64) build64=1; shift ;;
+    --sysconfdir=*) echo "ignored option: --sysconfdir"; shift ;;
+    --localstatedir=*) echo "ignored option: --localstatedir"; shift ;;
+    *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1 ;;
+    esac
+done
+
+test=ztest$$
+cat > $test.c <<EOF
+extern int getchar();
+int hello() {return getchar();}
+EOF
+
+test -z "$CC" && echo Checking for ${CROSS_PREFIX}gcc...
+cc=${CC-${CROSS_PREFIX}gcc}
+cflags=${CFLAGS-"-O3"}
+# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+case "$cc" in
+  *gcc*) gcc=1 ;;
+esac
+
+if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
+  CC="$cc"
+  SFLAGS="${CFLAGS--O3} -fPIC"
+  CFLAGS="${CFLAGS--O3}"
+  if test $build64 -eq 1; then
+    CFLAGS="${CFLAGS} -m64"
+    SFLAGS="${SFLAGS} -m64"
+  fi
+  if test "${ZLIBGCCWARN}" = "YES"; then
+    CFLAGS="${CFLAGS} -Wall -Wextra -pedantic"
+  fi
+  if test -z "$uname"; then
+    uname=`(uname -s || echo unknown) 2>/dev/null`
+  fi
+  case "$uname" in
+  Linux* | linux* | GNU | GNU/* | *BSD | DragonFly) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
+  CYGWIN* | Cygwin* | cygwin* | OS/2*)
+        EXE='.exe' ;;
+  MINGW*|mingw*)
+# temporary bypass
+        rm -f $test.[co] $test $test$shared_ext
+        echo "Please use win32/Makefile.gcc instead."
+        exit 1
+        LDSHARED=${LDSHARED-"$cc -shared"}
+        LDSHAREDLIBC=""
+        EXE='.exe' ;;
+  QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
+         # (alain.bonnefoy@icbt.com)
+                 LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"} ;;
+  HP-UX*)
+         LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
+         case `(uname -m || echo unknown) 2>/dev/null` in
+         ia64)
+                 shared_ext='.so'
+                 SHAREDLIB='libz.so' ;;
+         *)
+                 shared_ext='.sl'
+                 SHAREDLIB='libz.sl' ;;
+         esac ;;
+  Darwin*)   shared_ext='.dylib'
+             SHAREDLIB=libz$shared_ext
+             SHAREDLIBV=libz.$VER$shared_ext
+             SHAREDLIBM=libz.$VER1$shared_ext
+             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} ;;
+  *)             LDSHARED=${LDSHARED-"$cc -shared"} ;;
+  esac
+else
+  # find system name and corresponding cc options
+  CC=${CC-cc}
+  gcc=0
+  if test -z "$uname"; then
+    uname=`(uname -sr || echo unknown) 2>/dev/null`
+  fi
+  case "$uname" in
+  HP-UX*)    SFLAGS=${CFLAGS-"-O +z"}
+             CFLAGS=${CFLAGS-"-O"}
+#            LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}
+             LDSHARED=${LDSHARED-"ld -b"}
+         case `(uname -m || echo unknown) 2>/dev/null` in
+         ia64)
+             shared_ext='.so'
+             SHAREDLIB='libz.so' ;;
+         *)
+             shared_ext='.sl'
+             SHAREDLIB='libz.sl' ;;
+         esac ;;
+  IRIX*)     SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
+             CFLAGS=${CFLAGS-"-ansi -O2"}
+             LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
+  OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}
+             CFLAGS=${CFLAGS-"-O -std1"}
+             LDFLAGS="${LDFLAGS} -Wl,-rpath,."
+             LDSHARED=${LDSHARED-"cc -shared  -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"} ;;
+  OSF1*)     SFLAGS=${CFLAGS-"-O -std1"}
+             CFLAGS=${CFLAGS-"-O -std1"}
+             LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
+  QNX*)      SFLAGS=${CFLAGS-"-4 -O"}
+             CFLAGS=${CFLAGS-"-4 -O"}
+             LDSHARED=${LDSHARED-"cc"}
+             RANLIB=${RANLIB-"true"}
+             AR_RC="cc -A" ;;
+  SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
+             CFLAGS=${CFLAGS-"-O3"}
+             LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;;
+  SunOS\ 5*) LDSHARED=${LDSHARED-"cc -G"}
+         case `(uname -m || echo unknown) 2>/dev/null` in
+         i86*)
+             SFLAGS=${CFLAGS-"-xpentium -fast -KPIC -R."}
+             CFLAGS=${CFLAGS-"-xpentium -fast"} ;;
+         *)
+             SFLAGS=${CFLAGS-"-fast -xcg92 -KPIC -R."}
+             CFLAGS=${CFLAGS-"-fast -xcg92"} ;;
+         esac ;;
+  SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
+             CFLAGS=${CFLAGS-"-O2"}
+             LDSHARED=${LDSHARED-"ld"} ;;
+  SunStudio\ 9*) SFLAGS=${CFLAGS-"-fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"}
+             CFLAGS=${CFLAGS-"-fast -xtarget=ultra3 -xarch=v9b"}
+             LDSHARED=${LDSHARED-"cc -xarch=v9b"} ;;
+  UNIX_System_V\ 4.2.0)
+             SFLAGS=${CFLAGS-"-KPIC -O"}
+             CFLAGS=${CFLAGS-"-O"}
+             LDSHARED=${LDSHARED-"cc -G"} ;;
+  UNIX_SV\ 4.2MP)
+             SFLAGS=${CFLAGS-"-Kconform_pic -O"}
+             CFLAGS=${CFLAGS-"-O"}
+             LDSHARED=${LDSHARED-"cc -G"} ;;
+  OpenUNIX\ 5)
+             SFLAGS=${CFLAGS-"-KPIC -O"}
+             CFLAGS=${CFLAGS-"-O"}
+             LDSHARED=${LDSHARED-"cc -G"} ;;
+  AIX*)  # Courtesy of dbakker@arrayasolutions.com
+             SFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
+             CFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
+             LDSHARED=${LDSHARED-"xlc -G"} ;;
+  # send working options for other systems to zlib@gzip.org
+  *)         SFLAGS=${CFLAGS-"-O"}
+             CFLAGS=${CFLAGS-"-O"}
+             LDSHARED=${LDSHARED-"cc -shared"} ;;
+  esac
+fi
+
+SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}
+SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}
+SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
+
+if test $shared -eq 1; then
+  echo Checking for shared library support...
+  # we must test in two steps (cc then ld), required at least on SunOS 4.x
+  if test "`($CC -w -c $SFLAGS $test.c) 2>&1`" = "" &&
+     test "`($LDSHARED $SFLAGS -o $test$shared_ext $test.o) 2>&1`" = ""; then
+    echo Building shared library $SHAREDLIBV with $CC.
+  elif test -z "$old_cc" -a -z "$old_cflags"; then
+    echo No shared library support.
+    shared=0;
+  else
+    echo Tested $CC -w -c $SFLAGS $test.c
+    $CC -w -c $SFLAGS $test.c
+    echo Tested $LDSHARED $SFLAGS -o $test$shared_ext $test.o
+    $LDSHARED $SFLAGS -o $test$shared_ext $test.o
+    echo 'No shared library support; try without defining CC and CFLAGS'
+    shared=0;
+  fi
+fi
+if test $shared -eq 0; then
+  LDSHARED="$CC"
+  ALL="static"
+  TEST="all teststatic"
+  SHAREDLIB=""
+  SHAREDLIBV=""
+  SHAREDLIBM=""
+  echo Building static library $STATICLIB version $VER with $CC.
+else
+  ALL="static shared"
+  TEST="all teststatic testshared"
+fi
+
+cat > $test.c <<EOF
+#include <sys/types.h>
+off64_t dummy = 0;
+EOF
+if test "`($CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c) 2>&1`" = ""; then
+  CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
+  SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"
+  ALL="${ALL} all64"
+  TEST="${TEST} test64"
+  echo "Checking for off64_t... Yes."
+  echo "Checking for fseeko... Yes."
+else
+  echo "Checking for off64_t... No."
+  cat > $test.c <<EOF
+#include <stdio.h>
+int main(void) {
+  fseeko(NULL, 0, 0);
+  return 0;
+}
+EOF
+  if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then
+    echo "Checking for fseeko... Yes."
+  else
+    CFLAGS="${CFLAGS} -DNO_FSEEKO"
+    SFLAGS="${SFLAGS} -DNO_FSEEKO"
+    echo "Checking for fseeko... No."
+  fi
+fi
+
+cp -p zconf.h.in zconf.h
+
+cat > $test.c <<EOF
+#include <unistd.h>
+int main() { return 0; }
+EOF
+if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+  sed < zconf.h "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\(.*\) may be/ 1\1 was/" > zconf.temp.h
+  mv zconf.temp.h zconf.h
+  echo "Checking for unistd.h... Yes."
+else
+  echo "Checking for unistd.h... No."
+fi
+
+if test $zprefix -eq 1; then
+  sed < zconf.h "/#ifdef Z_PREFIX.* may be/s/def Z_PREFIX\(.*\) may be/ 1\1 was/" > zconf.temp.h
+  mv zconf.temp.h zconf.h
+  echo "Using z_ prefix on all symbols."
+fi
+
+cat > $test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+#include "zconf.h"
+
+int main()
+{
+#ifndef STDC
+  choke me
+#endif
+
+  return 0;
+}
+EOF
+
+if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()."
+
+  cat > $test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+
+int mytest(const char *fmt, ...)
+{
+  char buf[20];
+  va_list ap;
+
+  va_start(ap, fmt);
+  vsnprintf(buf, sizeof(buf), fmt, ap);
+  va_end(ap);
+  return 0;
+}
+
+int main()
+{
+  return (mytest("Hello%d\n", 1));
+}
+EOF
+
+  if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then
+    echo "Checking for vsnprintf() in stdio.h... Yes."
+
+    cat >$test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+
+int mytest(const char *fmt, ...)
+{
+  int n;
+  char buf[20];
+  va_list ap;
+
+  va_start(ap, fmt);
+  n = vsnprintf(buf, sizeof(buf), fmt, ap);
+  va_end(ap);
+  return n;
+}
+
+int main()
+{
+  return (mytest("Hello%d\n", 1));
+}
+EOF
+
+    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+      echo "Checking for return value of vsnprintf()... Yes."
+    else
+      CFLAGS="$CFLAGS -DHAS_vsnprintf_void"
+      SFLAGS="$SFLAGS -DHAS_vsnprintf_void"
+      echo "Checking for return value of vsnprintf()... No."
+      echo "  WARNING: apparently vsnprintf() does not return a value. zlib"
+      echo "  can build but will be open to possible string-format security"
+      echo "  vulnerabilities."
+    fi
+  else
+    CFLAGS="$CFLAGS -DNO_vsnprintf"
+    SFLAGS="$SFLAGS -DNO_vsnprintf"
+    echo "Checking for vsnprintf() in stdio.h... No."
+    echo "  WARNING: vsnprintf() not found, falling back to vsprintf(). zlib"
+    echo "  can build but will be open to possible buffer-overflow security"
+    echo "  vulnerabilities."
+
+    cat >$test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+
+int mytest(const char *fmt, ...)
+{
+  int n;
+  char buf[20];
+  va_list ap;
+
+  va_start(ap, fmt);
+  n = vsprintf(buf, fmt, ap);
+  va_end(ap);
+  return n;
+}
+
+int main()
+{
+  return (mytest("Hello%d\n", 1));
+}
+EOF
+
+    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+      echo "Checking for return value of vsprintf()... Yes."
+    else
+      CFLAGS="$CFLAGS -DHAS_vsprintf_void"
+      SFLAGS="$SFLAGS -DHAS_vsprintf_void"
+      echo "Checking for return value of vsprintf()... No."
+      echo "  WARNING: apparently vsprintf() does not return a value. zlib"
+      echo "  can build but will be open to possible string-format security"
+      echo "  vulnerabilities."
+    fi
+  fi
+else
+  echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()."
+
+  cat >$test.c <<EOF
+#include <stdio.h>
+
+int mytest()
+{
+  char buf[20];
+
+  snprintf(buf, sizeof(buf), "%s", "foo");
+  return 0;
+}
+
+int main()
+{
+  return (mytest());
+}
+EOF
+
+  if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then
+    echo "Checking for snprintf() in stdio.h... Yes."
+
+    cat >$test.c <<EOF
+#include <stdio.h>
+
+int mytest()
+{
+  char buf[20];
+
+  return snprintf(buf, sizeof(buf), "%s", "foo");
+}
+
+int main()
+{
+  return (mytest());
+}
+EOF
+
+    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+      echo "Checking for return value of snprintf()... Yes."
+    else
+      CFLAGS="$CFLAGS -DHAS_snprintf_void"
+      SFLAGS="$SFLAGS -DHAS_snprintf_void"
+      echo "Checking for return value of snprintf()... No."
+      echo "  WARNING: apparently snprintf() does not return a value. zlib"
+      echo "  can build but will be open to possible string-format security"
+      echo "  vulnerabilities."
+    fi
+  else
+    CFLAGS="$CFLAGS -DNO_snprintf"
+    SFLAGS="$SFLAGS -DNO_snprintf"
+    echo "Checking for snprintf() in stdio.h... No."
+    echo "  WARNING: snprintf() not found, falling back to sprintf(). zlib"
+    echo "  can build but will be open to possible buffer-overflow security"
+    echo "  vulnerabilities."
+
+    cat >$test.c <<EOF
+#include <stdio.h>
+
+int mytest()
+{
+  char buf[20];
+
+  return sprintf(buf, "%s", "foo");
+}
+
+int main()
+{
+  return (mytest());
+}
+EOF
+
+    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+      echo "Checking for return value of sprintf()... Yes."
+    else
+      CFLAGS="$CFLAGS -DHAS_sprintf_void"
+      SFLAGS="$SFLAGS -DHAS_sprintf_void"
+      echo "Checking for return value of sprintf()... No."
+      echo "  WARNING: apparently sprintf() does not return a value. zlib"
+      echo "  can build but will be open to possible string-format security"
+      echo "  vulnerabilities."
+    fi
+  fi
+fi
+
+if test "$gcc" -eq 1; then
+  cat > $test.c <<EOF
+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33)
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+int ZLIB_INTERNAL foo;
+int main()
+{
+  return 0;
+}
+EOF
+  if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+    echo "Checking for attribute(visibility) support... Yes."
+  else
+    CFLAGS="$CFLAGS -DNO_VIZ"
+    SFLAGS="$SFLAGS -DNO_VIZ"
+    echo "Checking for attribute(visibility) support... No."
+  fi
+fi
+
+CPP=${CPP-"$CC -E"}
+case $CFLAGS in
+  *ASMV*)
+    if test "`$NM $test.o | grep _hello`" = ""; then
+      CPP="$CPP -DNO_UNDERLINE"
+      echo Checking for underline in external names... No.
+    else
+      echo Checking for underline in external names... Yes.
+    fi ;;
+esac
+
+rm -f $test.[co] $test $test$shared_ext
+
+# udpate Makefile
+sed < Makefile.in "
+/^CC *=/s#=.*#=$CC#
+/^CFLAGS *=/s#=.*#=$CFLAGS#
+/^SFLAGS *=/s#=.*#=$SFLAGS#
+/^LDFLAGS *=/s#=.*#=$LDFLAGS#
+/^LDSHARED *=/s#=.*#=$LDSHARED#
+/^CPP *=/s#=.*#=$CPP#
+/^STATICLIB *=/s#=.*#=$STATICLIB#
+/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
+/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
+/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
+/^AR *=/s#=.*#=$AR_RC#
+/^RANLIB *=/s#=.*#=$RANLIB#
+/^LDCONFIG *=/s#=.*#=$LDCONFIG#
+/^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC#
+/^EXE *=/s#=.*#=$EXE#
+/^prefix *=/s#=.*#=$prefix#
+/^exec_prefix *=/s#=.*#=$exec_prefix#
+/^libdir *=/s#=.*#=$libdir#
+/^sharedlibdir *=/s#=.*#=$sharedlibdir#
+/^includedir *=/s#=.*#=$includedir#
+/^mandir *=/s#=.*#=$mandir#
+/^all: */s#:.*#: $ALL#
+/^test: */s#:.*#: $TEST#
+" > Makefile
+
+sed < zlib.pc.in "
+/^CC *=/s#=.*#=$CC#
+/^CFLAGS *=/s#=.*#=$CFLAGS#
+/^CPP *=/s#=.*#=$CPP#
+/^LDSHARED *=/s#=.*#=$LDSHARED#
+/^STATICLIB *=/s#=.*#=$STATICLIB#
+/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
+/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
+/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
+/^AR *=/s#=.*#=$AR_RC#
+/^RANLIB *=/s#=.*#=$RANLIB#
+/^EXE *=/s#=.*#=$EXE#
+/^prefix *=/s#=.*#=$prefix#
+/^exec_prefix *=/s#=.*#=$exec_prefix#
+/^libdir *=/s#=.*#=$libdir#
+/^sharedlibdir *=/s#=.*#=$sharedlibdir#
+/^includedir *=/s#=.*#=$includedir#
+/^mandir *=/s#=.*#=$mandir#
+/^LDFLAGS *=/s#=.*#=$LDFLAGS#
+" | sed -e "
+s/\@VERSION\@/$VER/g;
+" > zlib.pc
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/README.contrib b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/README.contrib
new file mode 100644
index 00000000..dd2285d9
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/README.contrib
@@ -0,0 +1,77 @@
+All files under this contrib directory are UNSUPPORTED. There were
+provided by users of zlib and were not tested by the authors of zlib.
+Use at your own risk. Please contact the authors of the contributions
+for help about these, not the zlib authors. Thanks.
+
+
+ada/        by Dmitriy Anisimkov <anisimkov@yahoo.com>
+        Support for Ada
+        See http://zlib-ada.sourceforge.net/
+
+amd64/      by Mikhail Teterin <mi@ALDAN.algebra.com>
+        asm code for AMD64
+        See patch at http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/96393
+
+asm686/     by Brian Raiter <breadbox@muppetlabs.com>
+        asm code for Pentium and PPro/PII, using the AT&T (GNU as) syntax
+        See http://www.muppetlabs.com/~breadbox/software/assembly.html
+
+blast/      by Mark Adler <madler@alumni.caltech.edu>
+        Decompressor for output of PKWare Data Compression Library (DCL)
+
+delphi/     by Cosmin Truta <cosmint@cs.ubbcluj.ro>
+        Support for Delphi and C++ Builder
+
+dotzlib/    by Henrik Ravn <henrik@ravn.com>
+        Support for Microsoft .Net and Visual C++ .Net
+
+gcc_gvmat64/by Gilles Vollant <info@winimage.com>
+        GCC Version of x86 64-bit (AMD64 and Intel EM64t) code for x64
+        assembler to replace longest_match() and inflate_fast()
+
+infback9/   by Mark Adler <madler@alumni.caltech.edu>
+        Unsupported diffs to infback to decode the deflate64 format
+
+inflate86/  by Chris Anderson <christop@charm.net>
+        Tuned x86 gcc asm code to replace inflate_fast()
+
+iostream/   by Kevin Ruland <kevin@rodin.wustl.edu>
+        A C++ I/O streams interface to the zlib gz* functions
+
+iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
+        Another C++ I/O streams interface
+
+iostream3/  by Ludwig Schwardt <schwardt@sun.ac.za>
+            and Kevin Ruland <kevin@rodin.wustl.edu>
+        Yet another C++ I/O streams interface
+
+masmx64/    by Gilles Vollant <info@winimage.com>
+        x86 64-bit (AMD64 and Intel EM64t) code for x64 assembler to
+        replace longest_match() and inflate_fast(),  also masm x86
+        64-bits translation of Chris Anderson inflate_fast()
+
+masmx86/    by Gilles Vollant <info@winimage.com>
+        x86 asm code to replace longest_match() and inflate_fast(),
+        for Visual C++ and MASM (32 bits).
+        Based on Brian Raiter (asm686) and Chris Anderson (inflate86)
+
+minizip/    by Gilles Vollant <info@winimage.com>
+        Mini zip and unzip based on zlib
+        Includes Zip64 support by Mathias Svensson <mathias@result42.com>
+        See http://www.winimage.com/zLibDll/unzip.html
+
+pascal/     by Bob Dellaca <bobdl@xtra.co.nz> et al.
+        Support for Pascal
+
+puff/       by Mark Adler <madler@alumni.caltech.edu>
+        Small, low memory usage inflate.  Also serves to provide an
+        unambiguous description of the deflate format.
+
+testzlib/   by Gilles Vollant <info@winimage.com>
+        Example of the use of zlib
+
+untgz/      by Pedro A. Aranda Gutierrez <paag@tid.es>
+        A very simple tar.gz file extractor using zlib
+
+vstudio/    by Gilles Vollant <info@winimage.com>
+        Building a minizip-enhanced zlib with Microsoft Visual Studio
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/buffer_demo.adb b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/buffer_demo.adb
new file mode 100644
index 00000000..0410c508
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/buffer_demo.adb
@@ -0,0 +1,106 @@
+----------------------------------------------------------------
+--  ZLib for Ada thick binding.                               --
+--                                                            --
+--  Copyright (C) 2002-2004 Dmitriy Anisimkov                 --
+--                                                            --
+--  Open source license information is in the zlib.ads file.  --
+----------------------------------------------------------------
+--
+--  $Id: buffer_demo.adb 66 2005-08-17 18:20:58Z andreas_kupries $
+
+--  This demo program provided by Dr Steve Sangwine <sjs@essex.ac.uk>
+--
+--  Demonstration of a problem with Zlib-Ada (already fixed) when a buffer
+--  of exactly the correct size is used for decompressed data, and the last
+--  few bytes passed in to Zlib are checksum bytes.
+
+--  This program compresses a string of text, and then decompresses the
+--  compressed text into a buffer of the same size as the original text.
+
+with Ada.Streams; use Ada.Streams;
+with Ada.Text_IO;
+
+with ZLib; use ZLib;
+
+procedure Buffer_Demo is
+   EOL  : Character renames ASCII.LF;
+   Text : constant String
+     := "Four score and seven years ago our fathers brought forth," & EOL &
+        "upon this continent, a new nation, conceived in liberty," & EOL &
+        "and dedicated to the proposition that `all men are created equal'.";
+
+   Source : Stream_Element_Array (1 .. Text'Length);
+   for Source'Address use Text'Address;
+
+begin
+   Ada.Text_IO.Put (Text);
+   Ada.Text_IO.New_Line;
+   Ada.Text_IO.Put_Line
+     ("Uncompressed size : " & Positive'Image (Text'Length) & " bytes");
+
+   declare
+      Compressed_Data : Stream_Element_Array (1 .. Text'Length);
+      L               : Stream_Element_Offset;
+   begin
+      Compress : declare
+         Compressor : Filter_Type;
+         I : Stream_Element_Offset;
+      begin
+         Deflate_Init (Compressor);
+
+         --  Compress the whole of T at once.
+
+         Translate (Compressor, Source, I, Compressed_Data, L, Finish);
+         pragma Assert (I = Source'Last);
+
+         Close (Compressor);
+
+         Ada.Text_IO.Put_Line
+           ("Compressed size :   "
+            & Stream_Element_Offset'Image (L) & " bytes");
+      end Compress;
+
+      --  Now we decompress the data, passing short blocks of data to Zlib
+      --  (because this demonstrates the problem - the last block passed will
+      --  contain checksum information and there will be no output, only a
+      --  check inside Zlib that the checksum is correct).
+
+      Decompress : declare
+         Decompressor : Filter_Type;
+
+         Uncompressed_Data : Stream_Element_Array (1 .. Text'Length);
+
+         Block_Size : constant := 4;
+         --  This makes sure that the last block contains
+         --  only Adler checksum data.
+
+         P : Stream_Element_Offset := Compressed_Data'First - 1;
+         O : Stream_Element_Offset;
+      begin
+         Inflate_Init (Decompressor);
+
+         loop
+            Translate
+              (Decompressor,
+               Compressed_Data
+                 (P + 1 .. Stream_Element_Offset'Min (P + Block_Size, L)),
+               P,
+               Uncompressed_Data
+                 (Total_Out (Decompressor) + 1 .. Uncompressed_Data'Last),
+               O,
+               No_Flush);
+
+               Ada.Text_IO.Put_Line
+                 ("Total in : " & Count'Image (Total_In (Decompressor)) &
+                  ", out : " & Count'Image (Total_Out (Decompressor)));
+
+               exit when P = L;
+         end loop;
+
+         Ada.Text_IO.New_Line;
+         Ada.Text_IO.Put_Line
+           ("Decompressed text matches original text : "
+             & Boolean'Image (Uncompressed_Data = Source));
+      end Decompress;
+   end;
+end Buffer_Demo;
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/mtest.adb b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/mtest.adb
new file mode 100644
index 00000000..4b064096
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/mtest.adb
@@ -0,0 +1,156 @@
+----------------------------------------------------------------
+--  ZLib for Ada thick binding.                               --
+--                                                            --
+--  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
+--                                                            --
+--  Open source license information is in the zlib.ads file.  --
+----------------------------------------------------------------
+--  Continuous test for ZLib multithreading. If the test would fail
+--  we should provide thread safe allocation routines for the Z_Stream.
+--
+--  $Id: mtest.adb 66 2005-08-17 18:20:58Z andreas_kupries $
+
+with ZLib;
+with Ada.Streams;
+with Ada.Numerics.Discrete_Random;
+with Ada.Text_IO;
+with Ada.Exceptions;
+with Ada.Task_Identification;
+
+procedure MTest is
+   use Ada.Streams;
+   use ZLib;
+
+   Stop : Boolean := False;
+
+   pragma Atomic (Stop);
+
+   subtype Visible_Symbols is Stream_Element range 16#20# .. 16#7E#;
+
+   package Random_Elements is
+      new Ada.Numerics.Discrete_Random (Visible_Symbols);
+
+   task type Test_Task;
+
+   task body Test_Task is
+      Buffer : Stream_Element_Array (1 .. 100_000);
+      Gen : Random_Elements.Generator;
+
+      Buffer_First  : Stream_Element_Offset;
+      Compare_First : Stream_Element_Offset;
+
+      Deflate : Filter_Type;
+      Inflate : Filter_Type;
+
+      procedure Further (Item : in Stream_Element_Array);
+
+      procedure Read_Buffer
+        (Item : out Ada.Streams.Stream_Element_Array;
+         Last : out Ada.Streams.Stream_Element_Offset);
+
+      -------------
+      -- Further --
+      -------------
+
+      procedure Further (Item : in Stream_Element_Array) is
+
+         procedure Compare (Item : in Stream_Element_Array);
+
+         -------------
+         -- Compare --
+         -------------
+
+         procedure Compare (Item : in Stream_Element_Array) is
+            Next_First : Stream_Element_Offset := Compare_First + Item'Length;
+         begin
+            if Buffer (Compare_First .. Next_First - 1) /= Item then
+               raise Program_Error;
+            end if;
+
+            Compare_First := Next_First;
+         end Compare;
+
+         procedure Compare_Write is new ZLib.Write (Write => Compare);
+      begin
+         Compare_Write (Inflate, Item, No_Flush);
+      end Further;
+
+      -----------------
+      -- Read_Buffer --
+      -----------------
+
+      procedure Read_Buffer
+        (Item : out Ada.Streams.Stream_Element_Array;
+         Last : out Ada.Streams.Stream_Element_Offset)
+      is
+         Buff_Diff   : Stream_Element_Offset := Buffer'Last - Buffer_First;
+         Next_First : Stream_Element_Offset;
+      begin
+         if Item'Length <= Buff_Diff then
+            Last := Item'Last;
+
+            Next_First := Buffer_First + Item'Length;
+
+            Item := Buffer (Buffer_First .. Next_First - 1);
+
+            Buffer_First := Next_First;
+         else
+            Last := Item'First + Buff_Diff;
+            Item (Item'First .. Last) := Buffer (Buffer_First .. Buffer'Last);
+            Buffer_First := Buffer'Last + 1;
+         end if;
+      end Read_Buffer;
+
+      procedure Translate is new Generic_Translate
+                                   (Data_In  => Read_Buffer,
+                                    Data_Out => Further);
+
+   begin
+      Random_Elements.Reset (Gen);
+
+      Buffer := (others => 20);
+
+      Main : loop
+         for J in Buffer'Range loop
+            Buffer (J) := Random_Elements.Random (Gen);
+
+            Deflate_Init (Deflate);
+            Inflate_Init (Inflate);
+
+            Buffer_First  := Buffer'First;
+            Compare_First := Buffer'First;
+
+            Translate (Deflate);
+
+            if Compare_First /= Buffer'Last + 1 then
+               raise Program_Error;
+            end if;
+
+            Ada.Text_IO.Put_Line
+              (Ada.Task_Identification.Image
+                 (Ada.Task_Identification.Current_Task)
+               & Stream_Element_Offset'Image (J)
+               & ZLib.Count'Image (Total_Out (Deflate)));
+
+            Close (Deflate);
+            Close (Inflate);
+
+            exit Main when Stop;
+         end loop;
+      end loop Main;
+   exception
+      when E : others =>
+         Ada.Text_IO.Put_Line (Ada.Exceptions.Exception_Information (E));
+         Stop := True;
+   end Test_Task;
+
+   Test : array (1 .. 4) of Test_Task;
+
+   pragma Unreferenced (Test);
+
+   Dummy : Character;
+
+begin
+   Ada.Text_IO.Get_Immediate (Dummy);
+   Stop := True;
+end MTest;
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/read.adb b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/read.adb
new file mode 100644
index 00000000..06273ecf
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/read.adb
@@ -0,0 +1,156 @@
+----------------------------------------------------------------
+--  ZLib for Ada thick binding.                               --
+--                                                            --
+--  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
+--                                                            --
+--  Open source license information is in the zlib.ads file.  --
+----------------------------------------------------------------
+
+--  $Id: read.adb 66 2005-08-17 18:20:58Z andreas_kupries $
+
+--  Test/demo program for the generic read interface.
+
+with Ada.Numerics.Discrete_Random;
+with Ada.Streams;
+with Ada.Text_IO;
+
+with ZLib;
+
+procedure Read is
+
+   use Ada.Streams;
+
+   ------------------------------------
+   --  Test configuration parameters --
+   ------------------------------------
+
+   File_Size   : Stream_Element_Offset := 100_000;
+
+   Continuous  : constant Boolean          := False;
+   --  If this constant is True, the test would be repeated again and again,
+   --  with increment File_Size for every iteration.
+
+   Header      : constant ZLib.Header_Type := ZLib.Default;
+   --  Do not use Header other than Default in ZLib versions 1.1.4 and older.
+
+   Init_Random : constant := 8;
+   --  We are using the same random sequence, in case of we catch bug,
+   --  so we would be able to reproduce it.
+
+   -- End --
+
+   Pack_Size : Stream_Element_Offset;
+   Offset    : Stream_Element_Offset;
+
+   Filter     : ZLib.Filter_Type;
+
+   subtype Visible_Symbols
+      is Stream_Element range 16#20# .. 16#7E#;
+
+   package Random_Elements is new
+      Ada.Numerics.Discrete_Random (Visible_Symbols);
+
+   Gen : Random_Elements.Generator;
+   Period  : constant Stream_Element_Offset := 200;
+   --  Period constant variable for random generator not to be very random.
+   --  Bigger period, harder random.
+
+   Read_Buffer : Stream_Element_Array (1 .. 2048);
+   Read_First  : Stream_Element_Offset;
+   Read_Last   : Stream_Element_Offset;
+
+   procedure Reset;
+
+   procedure Read
+     (Item : out Stream_Element_Array;
+      Last : out Stream_Element_Offset);
+   --  this procedure is for generic instantiation of
+   --  ZLib.Read
+   --  reading data from the File_In.
+
+   procedure Read is new ZLib.Read
+                           (Read,
+                            Read_Buffer,
+                            Rest_First => Read_First,
+                            Rest_Last  => Read_Last);
+
+   ----------
+   -- Read --
+   ----------
+
+   procedure Read
+     (Item : out Stream_Element_Array;
+      Last : out Stream_Element_Offset) is
+   begin
+      Last := Stream_Element_Offset'Min
+               (Item'Last,
+                Item'First + File_Size - Offset);
+
+      for J in Item'First .. Last loop
+         if J < Item'First + Period then
+            Item (J) := Random_Elements.Random (Gen);
+         else
+            Item (J) := Item (J - Period);
+         end if;
+
+         Offset   := Offset + 1;
+      end loop;
+   end Read;
+
+   -----------
+   -- Reset --
+   -----------
+
+   procedure Reset is
+   begin
+      Random_Elements.Reset (Gen, Init_Random);
+      Pack_Size := 0;
+      Offset := 1;
+      Read_First := Read_Buffer'Last + 1;
+      Read_Last  := Read_Buffer'Last;
+   end Reset;
+
+begin
+   Ada.Text_IO.Put_Line ("ZLib " & ZLib.Version);
+
+   loop
+      for Level in ZLib.Compression_Level'Range loop
+
+         Ada.Text_IO.Put ("Level ="
+            & ZLib.Compression_Level'Image (Level));
+
+         --  Deflate using generic instantiation.
+
+         ZLib.Deflate_Init
+               (Filter,
+                Level,
+                Header => Header);
+
+         Reset;
+
+         Ada.Text_IO.Put
+           (Stream_Element_Offset'Image (File_Size) & " ->");
+
+         loop
+            declare
+               Buffer : Stream_Element_Array (1 .. 1024);
+               Last   : Stream_Element_Offset;
+            begin
+               Read (Filter, Buffer, Last);
+
+               Pack_Size := Pack_Size + Last - Buffer'First + 1;
+
+               exit when Last < Buffer'Last;
+            end;
+         end loop;
+
+         Ada.Text_IO.Put_Line (Stream_Element_Offset'Image (Pack_Size));
+
+         ZLib.Close (Filter);
+      end loop;
+
+      exit when not Continuous;
+
+      File_Size := File_Size + 1;
+   end loop;
+end Read;
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/readme.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/readme.txt
new file mode 100644
index 00000000..ce4d2cad
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/readme.txt
@@ -0,0 +1,65 @@
+                        ZLib for Ada thick binding (ZLib.Ada)
+                        Release 1.3
+
+ZLib.Ada is a thick binding interface to the popular ZLib data
+compression library, available at http://www.gzip.org/zlib/.
+It provides Ada-style access to the ZLib C library.
+
+
+        Here are the main changes since ZLib.Ada 1.2:
+
+- Attension: ZLib.Read generic routine have a initialization requirement
+  for Read_Last parameter now. It is a bit incompartible with previous version,
+  but extends functionality, we could use new parameters Allow_Read_Some and
+  Flush now.
+
+- Added Is_Open routines to ZLib and ZLib.Streams packages.
+
+- Add pragma Assert to check Stream_Element is 8 bit.
+
+- Fix extraction to buffer with exact known decompressed size. Error reported by
+  Steve Sangwine.
+
+- Fix definition of ULong (changed to unsigned_long), fix regression on 64 bits
+  computers. Patch provided by Pascal Obry.
+
+- Add Status_Error exception definition.
+
+- Add pragma Assertion that Ada.Streams.Stream_Element size is 8 bit.
+
+
+        How to build ZLib.Ada under GNAT
+
+You should have the ZLib library already build on your computer, before
+building ZLib.Ada. Make the directory of ZLib.Ada sources current and
+issue the command:
+
+  gnatmake test -largs -L<directory where libz.a is> -lz
+
+Or use the GNAT project file build for GNAT 3.15 or later:
+
+  gnatmake -Pzlib.gpr -L<directory where libz.a is>
+
+
+        How to build ZLib.Ada under Aonix ObjectAda for Win32 7.2.2
+
+1. Make a project with all *.ads and *.adb files from the distribution.
+2. Build the libz.a library from the ZLib C sources.
+3. Rename libz.a to z.lib.
+4. Add the library z.lib to the project.
+5. Add the libc.lib library from the ObjectAda distribution to the project.
+6. Build the executable using test.adb as a main procedure.
+
+
+        How to use ZLib.Ada
+
+The source files test.adb and read.adb are small demo programs that show
+the main functionality of ZLib.Ada.
+
+The routines from the package specifications are commented.
+
+
+Homepage: http://zlib-ada.sourceforge.net/
+Author: Dmitriy Anisimkov <anisimkov@yahoo.com>
+
+Contributors: Pascal Obry <pascal@obry.org>, Steve Sangwine <sjs@essex.ac.uk>
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/test.adb b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/test.adb
new file mode 100644
index 00000000..4733f76a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/test.adb
@@ -0,0 +1,463 @@
+----------------------------------------------------------------
+--  ZLib for Ada thick binding.                               --
+--                                                            --
+--  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
+--                                                            --
+--  Open source license information is in the zlib.ads file.  --
+----------------------------------------------------------------
+
+--  $Id: test.adb 66 2005-08-17 18:20:58Z andreas_kupries $
+
+--  The program has a few aims.
+--  1. Test ZLib.Ada95 thick binding functionality.
+--  2. Show the example of use main functionality of the ZLib.Ada95 binding.
+--  3. Build this program automatically compile all ZLib.Ada95 packages under
+--     GNAT Ada95 compiler.
+
+with ZLib.Streams;
+with Ada.Streams.Stream_IO;
+with Ada.Numerics.Discrete_Random;
+
+with Ada.Text_IO;
+
+with Ada.Calendar;
+
+procedure Test is
+
+   use Ada.Streams;
+   use Stream_IO;
+
+   ------------------------------------
+   --  Test configuration parameters --
+   ------------------------------------
+
+   File_Size   : Count   := 100_000;
+   Continuous  : constant Boolean := False;
+
+   Header      : constant ZLib.Header_Type := ZLib.Default;
+                                              --  ZLib.None;
+                                              --  ZLib.Auto;
+                                              --  ZLib.GZip;
+   --  Do not use Header other then Default in ZLib versions 1.1.4
+   --  and older.
+
+   Strategy    : constant ZLib.Strategy_Type := ZLib.Default_Strategy;
+   Init_Random : constant := 10;
+
+   -- End --
+
+   In_File_Name  : constant String := "testzlib.in";
+   --  Name of the input file
+
+   Z_File_Name   : constant String := "testzlib.zlb";
+   --  Name of the compressed file.
+
+   Out_File_Name : constant String := "testzlib.out";
+   --  Name of the decompressed file.
+
+   File_In   : File_Type;
+   File_Out  : File_Type;
+   File_Back : File_Type;
+   File_Z    : ZLib.Streams.Stream_Type;
+
+   Filter : ZLib.Filter_Type;
+
+   Time_Stamp : Ada.Calendar.Time;
+
+   procedure Generate_File;
+   --  Generate file of spetsified size with some random data.
+   --  The random data is repeatable, for the good compression.
+
+   procedure Compare_Streams
+     (Left, Right : in out Root_Stream_Type'Class);
+   --  The procedure compearing data in 2 streams.
+   --  It is for compare data before and after compression/decompression.
+
+   procedure Compare_Files (Left, Right : String);
+   --  Compare files. Based on the Compare_Streams.
+
+   procedure Copy_Streams
+     (Source, Target : in out Root_Stream_Type'Class;
+      Buffer_Size    : in     Stream_Element_Offset := 1024);
+   --  Copying data from one stream to another. It is for test stream
+   --  interface of the library.
+
+   procedure Data_In
+     (Item : out Stream_Element_Array;
+      Last : out Stream_Element_Offset);
+   --  this procedure is for generic instantiation of
+   --  ZLib.Generic_Translate.
+   --  reading data from the File_In.
+
+   procedure Data_Out (Item : in Stream_Element_Array);
+   --  this procedure is for generic instantiation of
+   --  ZLib.Generic_Translate.
+   --  writing data to the File_Out.
+
+   procedure Stamp;
+   --  Store the timestamp to the local variable.
+
+   procedure Print_Statistic (Msg : String; Data_Size : ZLib.Count);
+   --  Print the time statistic with the message.
+
+   procedure Translate is new ZLib.Generic_Translate
+                                (Data_In  => Data_In,
+                                 Data_Out => Data_Out);
+   --  This procedure is moving data from File_In to File_Out
+   --  with compression or decompression, depend on initialization of
+   --  Filter parameter.
+
+   -------------------
+   -- Compare_Files --
+   -------------------
+
+   procedure Compare_Files (Left, Right : String) is
+      Left_File, Right_File : File_Type;
+   begin
+      Open (Left_File, In_File, Left);
+      Open (Right_File, In_File, Right);
+      Compare_Streams (Stream (Left_File).all, Stream (Right_File).all);
+      Close (Left_File);
+      Close (Right_File);
+   end Compare_Files;
+
+   ---------------------
+   -- Compare_Streams --
+   ---------------------
+
+   procedure Compare_Streams
+     (Left, Right : in out Ada.Streams.Root_Stream_Type'Class)
+   is
+      Left_Buffer, Right_Buffer : Stream_Element_Array (0 .. 16#FFF#);
+      Left_Last, Right_Last : Stream_Element_Offset;
+   begin
+      loop
+         Read (Left, Left_Buffer, Left_Last);
+         Read (Right, Right_Buffer, Right_Last);
+
+         if Left_Last /= Right_Last then
+            Ada.Text_IO.Put_Line ("Compare error :"
+              & Stream_Element_Offset'Image (Left_Last)
+              & " /= "
+              & Stream_Element_Offset'Image (Right_Last));
+
+            raise Constraint_Error;
+
+         elsif Left_Buffer (0 .. Left_Last)
+               /= Right_Buffer (0 .. Right_Last)
+         then
+            Ada.Text_IO.Put_Line ("ERROR: IN and OUT files is not equal.");
+            raise Constraint_Error;
+
+         end if;
+
+         exit when Left_Last < Left_Buffer'Last;
+      end loop;
+   end Compare_Streams;
+
+   ------------------
+   -- Copy_Streams --
+   ------------------
+
+   procedure Copy_Streams
+     (Source, Target : in out Ada.Streams.Root_Stream_Type'Class;
+      Buffer_Size    : in     Stream_Element_Offset := 1024)
+   is
+      Buffer : Stream_Element_Array (1 .. Buffer_Size);
+      Last   : Stream_Element_Offset;
+   begin
+      loop
+         Read  (Source, Buffer, Last);
+         Write (Target, Buffer (1 .. Last));
+
+         exit when Last < Buffer'Last;
+      end loop;
+   end Copy_Streams;
+
+   -------------
+   -- Data_In --
+   -------------
+
+   procedure Data_In
+     (Item : out Stream_Element_Array;
+      Last : out Stream_Element_Offset) is
+   begin
+      Read (File_In, Item, Last);
+   end Data_In;
+
+   --------------
+   -- Data_Out --
+   --------------
+
+   procedure Data_Out (Item : in Stream_Element_Array) is
+   begin
+      Write (File_Out, Item);
+   end Data_Out;
+
+   -------------------
+   -- Generate_File --
+   -------------------
+
+   procedure Generate_File is
+      subtype Visible_Symbols is Stream_Element range 16#20# .. 16#7E#;
+
+      package Random_Elements is
+         new Ada.Numerics.Discrete_Random (Visible_Symbols);
+
+      Gen    : Random_Elements.Generator;
+      Buffer : Stream_Element_Array := (1 .. 77 => 16#20#) & 10;
+
+      Buffer_Count : constant Count := File_Size / Buffer'Length;
+      --  Number of same buffers in the packet.
+
+      Density : constant Count := 30; --  from 0 to Buffer'Length - 2;
+
+      procedure Fill_Buffer (J, D : in Count);
+      --  Change the part of the buffer.
+
+      -----------------
+      -- Fill_Buffer --
+      -----------------
+
+      procedure Fill_Buffer (J, D : in Count) is
+      begin
+         for K in 0 .. D loop
+            Buffer
+              (Stream_Element_Offset ((J + K) mod (Buffer'Length - 1) + 1))
+             := Random_Elements.Random (Gen);
+
+         end loop;
+      end Fill_Buffer;
+
+   begin
+      Random_Elements.Reset (Gen, Init_Random);
+
+      Create (File_In, Out_File, In_File_Name);
+
+      Fill_Buffer (1, Buffer'Length - 2);
+
+      for J in 1 .. Buffer_Count loop
+         Write (File_In, Buffer);
+
+         Fill_Buffer (J, Density);
+      end loop;
+
+      --  fill remain size.
+
+      Write
+        (File_In,
+         Buffer
+           (1 .. Stream_Element_Offset
+                   (File_Size - Buffer'Length * Buffer_Count)));
+
+      Flush (File_In);
+      Close (File_In);
+   end Generate_File;
+
+   ---------------------
+   -- Print_Statistic --
+   ---------------------
+
+   procedure Print_Statistic (Msg : String; Data_Size : ZLib.Count) is
+      use Ada.Calendar;
+      use Ada.Text_IO;
+
+      package Count_IO is new Integer_IO (ZLib.Count);
+
+      Curr_Dur : Duration := Clock - Time_Stamp;
+   begin
+      Put (Msg);
+
+      Set_Col (20);
+      Ada.Text_IO.Put ("size =");
+
+      Count_IO.Put
+        (Data_Size,
+         Width => Stream_IO.Count'Image (File_Size)'Length);
+
+      Put_Line (" duration =" & Duration'Image (Curr_Dur));
+   end Print_Statistic;
+
+   -----------
+   -- Stamp --
+   -----------
+
+   procedure Stamp is
+   begin
+      Time_Stamp := Ada.Calendar.Clock;
+   end Stamp;
+
+begin
+   Ada.Text_IO.Put_Line ("ZLib " & ZLib.Version);
+
+   loop
+      Generate_File;
+
+      for Level in ZLib.Compression_Level'Range loop
+
+         Ada.Text_IO.Put_Line ("Level ="
+            & ZLib.Compression_Level'Image (Level));
+
+         --  Test generic interface.
+         Open   (File_In, In_File, In_File_Name);
+         Create (File_Out, Out_File, Z_File_Name);
+
+         Stamp;
+
+         --  Deflate using generic instantiation.
+
+         ZLib.Deflate_Init
+               (Filter   => Filter,
+                Level    => Level,
+                Strategy => Strategy,
+                Header   => Header);
+
+         Translate (Filter);
+         Print_Statistic ("Generic compress", ZLib.Total_Out (Filter));
+         ZLib.Close (Filter);
+
+         Close (File_In);
+         Close (File_Out);
+
+         Open   (File_In, In_File, Z_File_Name);
+         Create (File_Out, Out_File, Out_File_Name);
+
+         Stamp;
+
+         --  Inflate using generic instantiation.
+
+         ZLib.Inflate_Init (Filter, Header => Header);
+
+         Translate (Filter);
+         Print_Statistic ("Generic decompress", ZLib.Total_Out (Filter));
+
+         ZLib.Close (Filter);
+
+         Close (File_In);
+         Close (File_Out);
+
+         Compare_Files (In_File_Name, Out_File_Name);
+
+         --  Test stream interface.
+
+         --  Compress to the back stream.
+
+         Open   (File_In, In_File, In_File_Name);
+         Create (File_Back, Out_File, Z_File_Name);
+
+         Stamp;
+
+         ZLib.Streams.Create
+           (Stream          => File_Z,
+            Mode            => ZLib.Streams.Out_Stream,
+            Back            => ZLib.Streams.Stream_Access
+                                 (Stream (File_Back)),
+            Back_Compressed => True,
+            Level           => Level,
+            Strategy        => Strategy,
+            Header          => Header);
+
+         Copy_Streams
+           (Source => Stream (File_In).all,
+            Target => File_Z);
+
+         --  Flushing internal buffers to the back stream.
+
+         ZLib.Streams.Flush (File_Z, ZLib.Finish);
+
+         Print_Statistic ("Write compress",
+                          ZLib.Streams.Write_Total_Out (File_Z));
+
+         ZLib.Streams.Close (File_Z);
+
+         Close (File_In);
+         Close (File_Back);
+
+         --  Compare reading from original file and from
+         --  decompression stream.
+
+         Open (File_In,   In_File, In_File_Name);
+         Open (File_Back, In_File, Z_File_Name);
+
+         ZLib.Streams.Create
+           (Stream          => File_Z,
+            Mode            => ZLib.Streams.In_Stream,
+            Back            => ZLib.Streams.Stream_Access
+                                 (Stream (File_Back)),
+            Back_Compressed => True,
+            Header          => Header);
+
+         Stamp;
+         Compare_Streams (Stream (File_In).all, File_Z);
+
+         Print_Statistic ("Read decompress",
+                          ZLib.Streams.Read_Total_Out (File_Z));
+
+         ZLib.Streams.Close (File_Z);
+         Close (File_In);
+         Close (File_Back);
+
+         --  Compress by reading from compression stream.
+
+         Open (File_Back, In_File, In_File_Name);
+         Create (File_Out, Out_File, Z_File_Name);
+
+         ZLib.Streams.Create
+           (Stream          => File_Z,
+            Mode            => ZLib.Streams.In_Stream,
+            Back            => ZLib.Streams.Stream_Access
+                                 (Stream (File_Back)),
+            Back_Compressed => False,
+            Level           => Level,
+            Strategy        => Strategy,
+            Header          => Header);
+
+         Stamp;
+         Copy_Streams
+           (Source => File_Z,
+            Target => Stream (File_Out).all);
+
+         Print_Statistic ("Read compress",
+                          ZLib.Streams.Read_Total_Out (File_Z));
+
+         ZLib.Streams.Close (File_Z);
+
+         Close (File_Out);
+         Close (File_Back);
+
+         --  Decompress to decompression stream.
+
+         Open   (File_In,   In_File, Z_File_Name);
+         Create (File_Back, Out_File, Out_File_Name);
+
+         ZLib.Streams.Create
+           (Stream          => File_Z,
+            Mode            => ZLib.Streams.Out_Stream,
+            Back            => ZLib.Streams.Stream_Access
+                                 (Stream (File_Back)),
+            Back_Compressed => False,
+            Header          => Header);
+
+         Stamp;
+
+         Copy_Streams
+           (Source => Stream (File_In).all,
+            Target => File_Z);
+
+         Print_Statistic ("Write decompress",
+                          ZLib.Streams.Write_Total_Out (File_Z));
+
+         ZLib.Streams.Close (File_Z);
+         Close (File_In);
+         Close (File_Back);
+
+         Compare_Files (In_File_Name, Out_File_Name);
+      end loop;
+
+      Ada.Text_IO.Put_Line (Count'Image (File_Size) & " Ok.");
+
+      exit when not Continuous;
+
+      File_Size := File_Size + 1;
+   end loop;
+end Test;
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib-streams.adb b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib-streams.adb
new file mode 100644
index 00000000..3eb8a279
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib-streams.adb
@@ -0,0 +1,225 @@
+----------------------------------------------------------------
+--  ZLib for Ada thick binding.                               --
+--                                                            --
+--  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
+--                                                            --
+--  Open source license information is in the zlib.ads file.  --
+----------------------------------------------------------------
+
+--  $Id: zlib-streams.adb 66 2005-08-17 18:20:58Z andreas_kupries $
+
+with Ada.Unchecked_Deallocation;
+
+package body ZLib.Streams is
+
+   -----------
+   -- Close --
+   -----------
+
+   procedure Close (Stream : in out Stream_Type) is
+      procedure Free is new Ada.Unchecked_Deallocation
+         (Stream_Element_Array, Buffer_Access);
+   begin
+      if Stream.Mode = Out_Stream or Stream.Mode = Duplex then
+         --  We should flush the data written by the writer.
+
+         Flush (Stream, Finish);
+
+         Close (Stream.Writer);
+      end if;
+
+      if Stream.Mode = In_Stream or Stream.Mode = Duplex then
+         Close (Stream.Reader);
+         Free (Stream.Buffer);
+      end if;
+   end Close;
+
+   ------------
+   -- Create --
+   ------------
+
+   procedure Create
+     (Stream            :    out Stream_Type;
+      Mode              : in     Stream_Mode;
+      Back              : in     Stream_Access;
+      Back_Compressed   : in     Boolean;
+      Level             : in     Compression_Level := Default_Compression;
+      Strategy          : in     Strategy_Type     := Default_Strategy;
+      Header            : in     Header_Type       := Default;
+      Read_Buffer_Size  : in     Ada.Streams.Stream_Element_Offset
+                                    := Default_Buffer_Size;
+      Write_Buffer_Size : in     Ada.Streams.Stream_Element_Offset
+                                    := Default_Buffer_Size)
+   is
+
+      subtype Buffer_Subtype is Stream_Element_Array (1 .. Read_Buffer_Size);
+
+      procedure Init_Filter
+         (Filter   : in out Filter_Type;
+          Compress : in     Boolean);
+
+      -----------------
+      -- Init_Filter --
+      -----------------
+
+      procedure Init_Filter
+         (Filter   : in out Filter_Type;
+          Compress : in     Boolean) is
+      begin
+         if Compress then
+            Deflate_Init
+              (Filter, Level, Strategy, Header => Header);
+         else
+            Inflate_Init (Filter, Header => Header);
+         end if;
+      end Init_Filter;
+
+   begin
+      Stream.Back := Back;
+      Stream.Mode := Mode;
+
+      if Mode = Out_Stream or Mode = Duplex then
+         Init_Filter (Stream.Writer, Back_Compressed);
+         Stream.Buffer_Size := Write_Buffer_Size;
+      else
+         Stream.Buffer_Size := 0;
+      end if;
+
+      if Mode = In_Stream or Mode = Duplex then
+         Init_Filter (Stream.Reader, not Back_Compressed);
+
+         Stream.Buffer     := new Buffer_Subtype;
+         Stream.Rest_First := Stream.Buffer'Last + 1;
+         Stream.Rest_Last  := Stream.Buffer'Last;
+      end if;
+   end Create;
+
+   -----------
+   -- Flush --
+   -----------
+
+   procedure Flush
+     (Stream : in out Stream_Type;
+      Mode   : in     Flush_Mode := Sync_Flush)
+   is
+      Buffer : Stream_Element_Array (1 .. Stream.Buffer_Size);
+      Last   : Stream_Element_Offset;
+   begin
+      loop
+         Flush (Stream.Writer, Buffer, Last, Mode);
+
+         Ada.Streams.Write (Stream.Back.all, Buffer (1 .. Last));
+
+         exit when Last < Buffer'Last;
+      end loop;
+   end Flush;
+
+   -------------
+   -- Is_Open --
+   -------------
+
+   function Is_Open (Stream : Stream_Type) return Boolean is
+   begin
+      return Is_Open (Stream.Reader) or else Is_Open (Stream.Writer);
+   end Is_Open;
+
+   ----------
+   -- Read --
+   ----------
+
+   procedure Read
+     (Stream : in out Stream_Type;
+      Item   :    out Stream_Element_Array;
+      Last   :    out Stream_Element_Offset)
+   is
+
+      procedure Read
+        (Item : out Stream_Element_Array;
+         Last : out Stream_Element_Offset);
+
+      ----------
+      -- Read --
+      ----------
+
+      procedure Read
+        (Item : out Stream_Element_Array;
+         Last : out Stream_Element_Offset) is
+      begin
+         Ada.Streams.Read (Stream.Back.all, Item, Last);
+      end Read;
+
+      procedure Read is new ZLib.Read
+         (Read       => Read,
+          Buffer     => Stream.Buffer.all,
+          Rest_First => Stream.Rest_First,
+          Rest_Last  => Stream.Rest_Last);
+
+   begin
+      Read (Stream.Reader, Item, Last);
+   end Read;
+
+   -------------------
+   -- Read_Total_In --
+   -------------------
+
+   function Read_Total_In (Stream : in Stream_Type) return Count is
+   begin
+      return Total_In (Stream.Reader);
+   end Read_Total_In;
+
+   --------------------
+   -- Read_Total_Out --
+   --------------------
+
+   function Read_Total_Out (Stream : in Stream_Type) return Count is
+   begin
+      return Total_Out (Stream.Reader);
+   end Read_Total_Out;
+
+   -----------
+   -- Write --
+   -----------
+
+   procedure Write
+     (Stream : in out Stream_Type;
+      Item   : in     Stream_Element_Array)
+   is
+
+      procedure Write (Item : in Stream_Element_Array);
+
+      -----------
+      -- Write --
+      -----------
+
+      procedure Write (Item : in Stream_Element_Array) is
+      begin
+         Ada.Streams.Write (Stream.Back.all, Item);
+      end Write;
+
+      procedure Write is new ZLib.Write
+         (Write       => Write,
+          Buffer_Size => Stream.Buffer_Size);
+
+   begin
+      Write (Stream.Writer, Item, No_Flush);
+   end Write;
+
+   --------------------
+   -- Write_Total_In --
+   --------------------
+
+   function Write_Total_In (Stream : in Stream_Type) return Count is
+   begin
+      return Total_In (Stream.Writer);
+   end Write_Total_In;
+
+   ---------------------
+   -- Write_Total_Out --
+   ---------------------
+
+   function Write_Total_Out (Stream : in Stream_Type) return Count is
+   begin
+      return Total_Out (Stream.Writer);
+   end Write_Total_Out;
+
+end ZLib.Streams;
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib-streams.ads b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib-streams.ads
new file mode 100644
index 00000000..36b9109a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib-streams.ads
@@ -0,0 +1,114 @@
+----------------------------------------------------------------
+--  ZLib for Ada thick binding.                               --
+--                                                            --
+--  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
+--                                                            --
+--  Open source license information is in the zlib.ads file.  --
+----------------------------------------------------------------
+
+--  $Id: zlib-streams.ads 66 2005-08-17 18:20:58Z andreas_kupries $
+
+package ZLib.Streams is
+
+   type Stream_Mode is (In_Stream, Out_Stream, Duplex);
+
+   type Stream_Access is access all Ada.Streams.Root_Stream_Type'Class;
+
+   type Stream_Type is
+      new Ada.Streams.Root_Stream_Type with private;
+
+   procedure Read
+     (Stream : in out Stream_Type;
+      Item   :    out Ada.Streams.Stream_Element_Array;
+      Last   :    out Ada.Streams.Stream_Element_Offset);
+
+   procedure Write
+     (Stream : in out Stream_Type;
+      Item   : in     Ada.Streams.Stream_Element_Array);
+
+   procedure Flush
+     (Stream : in out Stream_Type;
+      Mode   : in     Flush_Mode := Sync_Flush);
+   --  Flush the written data to the back stream,
+   --  all data placed to the compressor is flushing to the Back stream.
+   --  Should not be used untill necessary, becouse it is decreasing
+   --  compression.
+
+   function Read_Total_In (Stream : in Stream_Type) return Count;
+   pragma Inline (Read_Total_In);
+   --  Return total number of bytes read from back stream so far.
+
+   function Read_Total_Out (Stream : in Stream_Type) return Count;
+   pragma Inline (Read_Total_Out);
+   --  Return total number of bytes read so far.
+
+   function Write_Total_In (Stream : in Stream_Type) return Count;
+   pragma Inline (Write_Total_In);
+   --  Return total number of bytes written so far.
+
+   function Write_Total_Out (Stream : in Stream_Type) return Count;
+   pragma Inline (Write_Total_Out);
+   --  Return total number of bytes written to the back stream.
+
+   procedure Create
+     (Stream            :    out Stream_Type;
+      Mode              : in     Stream_Mode;
+      Back              : in     Stream_Access;
+      Back_Compressed   : in     Boolean;
+      Level             : in     Compression_Level := Default_Compression;
+      Strategy          : in     Strategy_Type     := Default_Strategy;
+      Header            : in     Header_Type       := Default;
+      Read_Buffer_Size  : in     Ada.Streams.Stream_Element_Offset
+                                    := Default_Buffer_Size;
+      Write_Buffer_Size : in     Ada.Streams.Stream_Element_Offset
+                                    := Default_Buffer_Size);
+   --  Create the Comression/Decompression stream.
+   --  If mode is In_Stream then Write operation is disabled.
+   --  If mode is Out_Stream then Read operation is disabled.
+
+   --  If Back_Compressed is true then
+   --  Data written to the Stream is compressing to the Back stream
+   --  and data read from the Stream is decompressed data from the Back stream.
+
+   --  If Back_Compressed is false then
+   --  Data written to the Stream is decompressing to the Back stream
+   --  and data read from the Stream is compressed data from the Back stream.
+
+   --  !!! When the Need_Header is False ZLib-Ada is using undocumented
+   --  ZLib 1.1.4 functionality to do not create/wait for ZLib headers.
+
+   function Is_Open (Stream : Stream_Type) return Boolean;
+
+   procedure Close (Stream : in out Stream_Type);
+
+private
+
+   use Ada.Streams;
+
+   type Buffer_Access is access all Stream_Element_Array;
+
+   type Stream_Type
+     is new Root_Stream_Type with
+   record
+      Mode       : Stream_Mode;
+
+      Buffer     : Buffer_Access;
+      Rest_First : Stream_Element_Offset;
+      Rest_Last  : Stream_Element_Offset;
+      --  Buffer for Read operation.
+      --  We need to have this buffer in the record
+      --  becouse not all read data from back stream
+      --  could be processed during the read operation.
+
+      Buffer_Size : Stream_Element_Offset;
+      --  Buffer size for write operation.
+      --  We do not need to have this buffer
+      --  in the record becouse all data could be
+      --  processed in the write operation.
+
+      Back       : Stream_Access;
+      Reader     : Filter_Type;
+      Writer     : Filter_Type;
+   end record;
+
+end ZLib.Streams;
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib-thin.adb b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib-thin.adb
new file mode 100644
index 00000000..2e4a0174
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib-thin.adb
@@ -0,0 +1,141 @@
+----------------------------------------------------------------
+--  ZLib for Ada thick binding.                               --
+--                                                            --
+--  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
+--                                                            --
+--  Open source license information is in the zlib.ads file.  --
+----------------------------------------------------------------
+
+--  $Id: zlib-thin.adb 66 2005-08-17 18:20:58Z andreas_kupries $
+
+package body ZLib.Thin is
+
+   ZLIB_VERSION  : constant Chars_Ptr := zlibVersion;
+
+   Z_Stream_Size : constant Int := Z_Stream'Size / System.Storage_Unit;
+
+   --------------
+   -- Avail_In --
+   --------------
+
+   function Avail_In (Strm : in Z_Stream) return UInt is
+   begin
+      return Strm.Avail_In;
+   end Avail_In;
+
+   ---------------
+   -- Avail_Out --
+   ---------------
+
+   function Avail_Out (Strm : in Z_Stream) return UInt is
+   begin
+      return Strm.Avail_Out;
+   end Avail_Out;
+
+   ------------------
+   -- Deflate_Init --
+   ------------------
+
+   function Deflate_Init
+     (strm       : Z_Streamp;
+      level      : Int;
+      method     : Int;
+      windowBits : Int;
+      memLevel   : Int;
+      strategy   : Int)
+      return       Int is
+   begin
+      return deflateInit2
+               (strm,
+                level,
+                method,
+                windowBits,
+                memLevel,
+                strategy,
+                ZLIB_VERSION,
+                Z_Stream_Size);
+   end Deflate_Init;
+
+   ------------------
+   -- Inflate_Init --
+   ------------------
+
+   function Inflate_Init (strm : Z_Streamp; windowBits : Int) return Int is
+   begin
+      return inflateInit2 (strm, windowBits, ZLIB_VERSION, Z_Stream_Size);
+   end Inflate_Init;
+
+   ------------------------
+   -- Last_Error_Message --
+   ------------------------
+
+   function Last_Error_Message (Strm : in Z_Stream) return String is
+      use Interfaces.C.Strings;
+   begin
+      if Strm.msg = Null_Ptr then
+         return "";
+      else
+         return Value (Strm.msg);
+      end if;
+   end Last_Error_Message;
+
+   ------------
+   -- Set_In --
+   ------------
+
+   procedure Set_In
+     (Strm   : in out Z_Stream;
+      Buffer : in     Voidp;
+      Size   : in     UInt) is
+   begin
+      Strm.Next_In  := Buffer;
+      Strm.Avail_In := Size;
+   end Set_In;
+
+   ------------------
+   -- Set_Mem_Func --
+   ------------------
+
+   procedure Set_Mem_Func
+     (Strm   : in out Z_Stream;
+      Opaque : in     Voidp;
+      Alloc  : in     alloc_func;
+      Free   : in     free_func) is
+   begin
+      Strm.opaque := Opaque;
+      Strm.zalloc := Alloc;
+      Strm.zfree  := Free;
+   end Set_Mem_Func;
+
+   -------------
+   -- Set_Out --
+   -------------
+
+   procedure Set_Out
+     (Strm   : in out Z_Stream;
+      Buffer : in     Voidp;
+      Size   : in     UInt) is
+   begin
+      Strm.Next_Out  := Buffer;
+      Strm.Avail_Out := Size;
+   end Set_Out;
+
+   --------------
+   -- Total_In --
+   --------------
+
+   function Total_In (Strm : in Z_Stream) return ULong is
+   begin
+      return Strm.Total_In;
+   end Total_In;
+
+   ---------------
+   -- Total_Out --
+   ---------------
+
+   function Total_Out (Strm : in Z_Stream) return ULong is
+   begin
+      return Strm.Total_Out;
+   end Total_Out;
+
+end ZLib.Thin;
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib-thin.ads b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib-thin.ads
new file mode 100644
index 00000000..e48c4f15
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib-thin.ads
@@ -0,0 +1,450 @@
+----------------------------------------------------------------
+--  ZLib for Ada thick binding.                               --
+--                                                            --
+--  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
+--                                                            --
+--  Open source license information is in the zlib.ads file.  --
+----------------------------------------------------------------
+
+--  $Id: zlib-thin.ads 66 2005-08-17 18:20:58Z andreas_kupries $
+
+with Interfaces.C.Strings;
+
+with System;
+
+private package ZLib.Thin is
+
+   --  From zconf.h
+
+   MAX_MEM_LEVEL : constant := 9;         --  zconf.h:105
+                                          --  zconf.h:105
+   MAX_WBITS : constant := 15;      --  zconf.h:115
+                                    --  32K LZ77 window
+                                    --  zconf.h:115
+   SEEK_SET : constant := 8#0000#;  --  zconf.h:244
+                                    --  Seek from beginning of file.
+                                    --  zconf.h:244
+   SEEK_CUR : constant := 1;        --  zconf.h:245
+                                    --  Seek from current position.
+                                    --  zconf.h:245
+   SEEK_END : constant := 2;        --  zconf.h:246
+                                    --  Set file pointer to EOF plus "offset"
+                                    --  zconf.h:246
+
+   type Byte is new Interfaces.C.unsigned_char; --  8 bits
+                                                --  zconf.h:214
+   type UInt is new Interfaces.C.unsigned;      --  16 bits or more
+                                                --  zconf.h:216
+   type Int is new Interfaces.C.int;
+
+   type ULong is new Interfaces.C.unsigned_long;     --  32 bits or more
+                                                     --  zconf.h:217
+   subtype Chars_Ptr is Interfaces.C.Strings.chars_ptr;
+
+   type ULong_Access is access ULong;
+   type Int_Access is access Int;
+
+   subtype Voidp is System.Address;            --  zconf.h:232
+
+   subtype Byte_Access is Voidp;
+
+   Nul : constant Voidp := System.Null_Address;
+   --  end from zconf
+
+   Z_NO_FLUSH : constant := 8#0000#;   --  zlib.h:125
+                                       --  zlib.h:125
+   Z_PARTIAL_FLUSH : constant := 1;       --  zlib.h:126
+                                          --  will be removed, use
+                                          --  Z_SYNC_FLUSH instead
+                                          --  zlib.h:126
+   Z_SYNC_FLUSH : constant := 2;       --  zlib.h:127
+                                       --  zlib.h:127
+   Z_FULL_FLUSH : constant := 3;       --  zlib.h:128
+                                       --  zlib.h:128
+   Z_FINISH : constant := 4;        --  zlib.h:129
+                                    --  zlib.h:129
+   Z_OK : constant := 8#0000#;   --  zlib.h:132
+                                 --  zlib.h:132
+   Z_STREAM_END : constant := 1;       --  zlib.h:133
+                                       --  zlib.h:133
+   Z_NEED_DICT : constant := 2;        --  zlib.h:134
+                                       --  zlib.h:134
+   Z_ERRNO : constant := -1;        --  zlib.h:135
+                                    --  zlib.h:135
+   Z_STREAM_ERROR : constant := -2;       --  zlib.h:136
+                                          --  zlib.h:136
+   Z_DATA_ERROR : constant := -3;      --  zlib.h:137
+                                       --  zlib.h:137
+   Z_MEM_ERROR : constant := -4;       --  zlib.h:138
+                                       --  zlib.h:138
+   Z_BUF_ERROR : constant := -5;       --  zlib.h:139
+                                       --  zlib.h:139
+   Z_VERSION_ERROR : constant := -6;      --  zlib.h:140
+                                          --  zlib.h:140
+   Z_NO_COMPRESSION : constant := 8#0000#;   --  zlib.h:145
+                                             --  zlib.h:145
+   Z_BEST_SPEED : constant := 1;       --  zlib.h:146
+                                       --  zlib.h:146
+   Z_BEST_COMPRESSION : constant := 9;       --  zlib.h:147
+                                             --  zlib.h:147
+   Z_DEFAULT_COMPRESSION : constant := -1;      --  zlib.h:148
+                                                --  zlib.h:148
+   Z_FILTERED : constant := 1;      --  zlib.h:151
+                                    --  zlib.h:151
+   Z_HUFFMAN_ONLY : constant := 2;        --  zlib.h:152
+                                          --  zlib.h:152
+   Z_DEFAULT_STRATEGY : constant := 8#0000#; --  zlib.h:153
+                                             --  zlib.h:153
+   Z_BINARY : constant := 8#0000#;  --  zlib.h:156
+                                    --  zlib.h:156
+   Z_ASCII : constant := 1;      --  zlib.h:157
+                                 --  zlib.h:157
+   Z_UNKNOWN : constant := 2;       --  zlib.h:158
+                                    --  zlib.h:158
+   Z_DEFLATED : constant := 8;      --  zlib.h:161
+                                    --  zlib.h:161
+   Z_NULL : constant := 8#0000#; --  zlib.h:164
+                                 --  for initializing zalloc, zfree, opaque
+                                 --  zlib.h:164
+   type gzFile is new Voidp;                  --  zlib.h:646
+
+   type Z_Stream is private;
+
+   type Z_Streamp is access all Z_Stream;     --  zlib.h:89
+
+   type alloc_func is access function
+     (Opaque : Voidp;
+      Items  : UInt;
+      Size   : UInt)
+      return Voidp; --  zlib.h:63
+
+   type free_func is access procedure (opaque : Voidp; address : Voidp);
+
+   function zlibVersion return Chars_Ptr;
+
+   function Deflate (strm : Z_Streamp; flush : Int) return Int;
+
+   function DeflateEnd (strm : Z_Streamp) return Int;
+
+   function Inflate (strm : Z_Streamp; flush : Int) return Int;
+
+   function InflateEnd (strm : Z_Streamp) return Int;
+
+   function deflateSetDictionary
+     (strm       : Z_Streamp;
+      dictionary : Byte_Access;
+      dictLength : UInt)
+      return       Int;
+
+   function deflateCopy (dest : Z_Streamp; source : Z_Streamp) return Int;
+   --  zlib.h:478
+
+   function deflateReset (strm : Z_Streamp) return Int; -- zlib.h:495
+
+   function deflateParams
+     (strm     : Z_Streamp;
+      level    : Int;
+      strategy : Int)
+      return     Int;       -- zlib.h:506
+
+   function inflateSetDictionary
+     (strm       : Z_Streamp;
+      dictionary : Byte_Access;
+      dictLength : UInt)
+      return       Int; --  zlib.h:548
+
+   function inflateSync (strm : Z_Streamp) return Int;  --  zlib.h:565
+
+   function inflateReset (strm : Z_Streamp) return Int; --  zlib.h:580
+
+   function compress
+     (dest      : Byte_Access;
+      destLen   : ULong_Access;
+      source    : Byte_Access;
+      sourceLen : ULong)
+      return      Int;           -- zlib.h:601
+
+   function compress2
+     (dest      : Byte_Access;
+      destLen   : ULong_Access;
+      source    : Byte_Access;
+      sourceLen : ULong;
+      level     : Int)
+      return      Int;          -- zlib.h:615
+
+   function uncompress
+     (dest      : Byte_Access;
+      destLen   : ULong_Access;
+      source    : Byte_Access;
+      sourceLen : ULong)
+      return      Int;
+
+   function gzopen (path : Chars_Ptr; mode : Chars_Ptr) return gzFile;
+
+   function gzdopen (fd : Int; mode : Chars_Ptr) return gzFile;
+
+   function gzsetparams
+     (file     : gzFile;
+      level    : Int;
+      strategy : Int)
+      return     Int;
+
+   function gzread
+     (file : gzFile;
+      buf  : Voidp;
+      len  : UInt)
+      return Int;
+
+   function gzwrite
+     (file : in gzFile;
+      buf  : in Voidp;
+      len  : in UInt)
+      return Int;
+
+   function gzprintf (file : in gzFile; format : in Chars_Ptr) return Int;
+
+   function gzputs (file : in gzFile; s : in Chars_Ptr) return Int;
+
+   function gzgets
+     (file : gzFile;
+      buf  : Chars_Ptr;
+      len  : Int)
+      return Chars_Ptr;
+
+   function gzputc (file : gzFile; char : Int) return Int;
+
+   function gzgetc (file : gzFile) return Int;
+
+   function gzflush (file : gzFile; flush : Int) return Int;
+
+   function gzseek
+     (file   : gzFile;
+      offset : Int;
+      whence : Int)
+      return   Int;
+
+   function gzrewind (file : gzFile) return Int;
+
+   function gztell (file : gzFile) return Int;
+
+   function gzeof (file : gzFile) return Int;
+
+   function gzclose (file : gzFile) return Int;
+
+   function gzerror (file : gzFile; errnum : Int_Access) return Chars_Ptr;
+
+   function adler32
+     (adler : ULong;
+      buf   : Byte_Access;
+      len   : UInt)
+      return  ULong;
+
+   function crc32
+     (crc  : ULong;
+      buf  : Byte_Access;
+      len  : UInt)
+      return ULong;
+
+   function deflateInit
+     (strm        : Z_Streamp;
+      level       : Int;
+      version     : Chars_Ptr;
+      stream_size : Int)
+      return        Int;
+
+   function deflateInit2
+     (strm        : Z_Streamp;
+      level       : Int;
+      method      : Int;
+      windowBits  : Int;
+      memLevel    : Int;
+      strategy    : Int;
+      version     : Chars_Ptr;
+      stream_size : Int)
+      return        Int;
+
+   function Deflate_Init
+     (strm       : Z_Streamp;
+      level      : Int;
+      method     : Int;
+      windowBits : Int;
+      memLevel   : Int;
+      strategy   : Int)
+      return       Int;
+   pragma Inline (Deflate_Init);
+
+   function inflateInit
+     (strm        : Z_Streamp;
+      version     : Chars_Ptr;
+      stream_size : Int)
+      return        Int;
+
+   function inflateInit2
+     (strm        : in Z_Streamp;
+      windowBits  : in Int;
+      version     : in Chars_Ptr;
+      stream_size : in Int)
+      return      Int;
+
+   function inflateBackInit
+     (strm        : in Z_Streamp;
+      windowBits  : in Int;
+      window      : in Byte_Access;
+      version     : in Chars_Ptr;
+      stream_size : in Int)
+      return      Int;
+   --  Size of window have to be 2**windowBits.
+
+   function Inflate_Init (strm : Z_Streamp; windowBits : Int) return Int;
+   pragma Inline (Inflate_Init);
+
+   function zError (err : Int) return Chars_Ptr;
+
+   function inflateSyncPoint (z : Z_Streamp) return Int;
+
+   function get_crc_table return ULong_Access;
+
+   --  Interface to the available fields of the z_stream structure.
+   --  The application must update next_in and avail_in when avail_in has
+   --  dropped to zero. It must update next_out and avail_out when avail_out
+   --  has dropped to zero. The application must initialize zalloc, zfree and
+   --  opaque before calling the init function.
+
+   procedure Set_In
+     (Strm   : in out Z_Stream;
+      Buffer : in Voidp;
+      Size   : in UInt);
+   pragma Inline (Set_In);
+
+   procedure Set_Out
+     (Strm   : in out Z_Stream;
+      Buffer : in Voidp;
+      Size   : in UInt);
+   pragma Inline (Set_Out);
+
+   procedure Set_Mem_Func
+     (Strm   : in out Z_Stream;
+      Opaque : in Voidp;
+      Alloc  : in alloc_func;
+      Free   : in free_func);
+   pragma Inline (Set_Mem_Func);
+
+   function Last_Error_Message (Strm : in Z_Stream) return String;
+   pragma Inline (Last_Error_Message);
+
+   function Avail_Out (Strm : in Z_Stream) return UInt;
+   pragma Inline (Avail_Out);
+
+   function Avail_In (Strm : in Z_Stream) return UInt;
+   pragma Inline (Avail_In);
+
+   function Total_In (Strm : in Z_Stream) return ULong;
+   pragma Inline (Total_In);
+
+   function Total_Out (Strm : in Z_Stream) return ULong;
+   pragma Inline (Total_Out);
+
+   function inflateCopy
+     (dest   : in Z_Streamp;
+      Source : in Z_Streamp)
+      return Int;
+
+   function compressBound (Source_Len : in ULong) return ULong;
+
+   function deflateBound
+     (Strm       : in Z_Streamp;
+      Source_Len : in ULong)
+      return     ULong;
+
+   function gzungetc (C : in Int; File : in  gzFile) return Int;
+
+   function zlibCompileFlags return ULong;
+
+private
+
+   type Z_Stream is record            -- zlib.h:68
+      Next_In   : Voidp      := Nul;  -- next input byte
+      Avail_In  : UInt       := 0;    -- number of bytes available at next_in
+      Total_In  : ULong      := 0;    -- total nb of input bytes read so far
+      Next_Out  : Voidp      := Nul;  -- next output byte should be put there
+      Avail_Out : UInt       := 0;    -- remaining free space at next_out
+      Total_Out : ULong      := 0;    -- total nb of bytes output so far
+      msg       : Chars_Ptr;          -- last error message, NULL if no error
+      state     : Voidp;              -- not visible by applications
+      zalloc    : alloc_func := null; -- used to allocate the internal state
+      zfree     : free_func  := null; -- used to free the internal state
+      opaque    : Voidp;              -- private data object passed to
+                                      --  zalloc and zfree
+      data_type : Int;                -- best guess about the data type:
+                                      --  ascii or binary
+      adler     : ULong;              -- adler32 value of the uncompressed
+                                      --  data
+      reserved  : ULong;              -- reserved for future use
+   end record;
+
+   pragma Convention (C, Z_Stream);
+
+   pragma Import (C, zlibVersion, "zlibVersion");
+   pragma Import (C, Deflate, "deflate");
+   pragma Import (C, DeflateEnd, "deflateEnd");
+   pragma Import (C, Inflate, "inflate");
+   pragma Import (C, InflateEnd, "inflateEnd");
+   pragma Import (C, deflateSetDictionary, "deflateSetDictionary");
+   pragma Import (C, deflateCopy, "deflateCopy");
+   pragma Import (C, deflateReset, "deflateReset");
+   pragma Import (C, deflateParams, "deflateParams");
+   pragma Import (C, inflateSetDictionary, "inflateSetDictionary");
+   pragma Import (C, inflateSync, "inflateSync");
+   pragma Import (C, inflateReset, "inflateReset");
+   pragma Import (C, compress, "compress");
+   pragma Import (C, compress2, "compress2");
+   pragma Import (C, uncompress, "uncompress");
+   pragma Import (C, gzopen, "gzopen");
+   pragma Import (C, gzdopen, "gzdopen");
+   pragma Import (C, gzsetparams, "gzsetparams");
+   pragma Import (C, gzread, "gzread");
+   pragma Import (C, gzwrite, "gzwrite");
+   pragma Import (C, gzprintf, "gzprintf");
+   pragma Import (C, gzputs, "gzputs");
+   pragma Import (C, gzgets, "gzgets");
+   pragma Import (C, gzputc, "gzputc");
+   pragma Import (C, gzgetc, "gzgetc");
+   pragma Import (C, gzflush, "gzflush");
+   pragma Import (C, gzseek, "gzseek");
+   pragma Import (C, gzrewind, "gzrewind");
+   pragma Import (C, gztell, "gztell");
+   pragma Import (C, gzeof, "gzeof");
+   pragma Import (C, gzclose, "gzclose");
+   pragma Import (C, gzerror, "gzerror");
+   pragma Import (C, adler32, "adler32");
+   pragma Import (C, crc32, "crc32");
+   pragma Import (C, deflateInit, "deflateInit_");
+   pragma Import (C, inflateInit, "inflateInit_");
+   pragma Import (C, deflateInit2, "deflateInit2_");
+   pragma Import (C, inflateInit2, "inflateInit2_");
+   pragma Import (C, zError, "zError");
+   pragma Import (C, inflateSyncPoint, "inflateSyncPoint");
+   pragma Import (C, get_crc_table, "get_crc_table");
+
+   --  since zlib 1.2.0:
+
+   pragma Import (C, inflateCopy, "inflateCopy");
+   pragma Import (C, compressBound, "compressBound");
+   pragma Import (C, deflateBound, "deflateBound");
+   pragma Import (C, gzungetc, "gzungetc");
+   pragma Import (C, zlibCompileFlags, "zlibCompileFlags");
+
+   pragma Import (C, inflateBackInit, "inflateBackInit_");
+
+   --  I stopped binding the inflateBack routines, becouse realize that
+   --  it does not support zlib and gzip headers for now, and have no
+   --  symmetric deflateBack routines.
+   --  ZLib-Ada is symmetric regarding deflate/inflate data transformation
+   --  and has a similar generic callback interface for the
+   --  deflate/inflate transformation based on the regular Deflate/Inflate
+   --  routines.
+
+   --  pragma Import (C, inflateBack, "inflateBack");
+   --  pragma Import (C, inflateBackEnd, "inflateBackEnd");
+
+end ZLib.Thin;
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib.adb b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib.adb
new file mode 100644
index 00000000..24917f84
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib.adb
@@ -0,0 +1,701 @@
+----------------------------------------------------------------
+--  ZLib for Ada thick binding.                               --
+--                                                            --
+--  Copyright (C) 2002-2004 Dmitriy Anisimkov                 --
+--                                                            --
+--  Open source license information is in the zlib.ads file.  --
+----------------------------------------------------------------
+
+--  $Id: zlib.adb 66 2005-08-17 18:20:58Z andreas_kupries $
+
+with Ada.Exceptions;
+with Ada.Unchecked_Conversion;
+with Ada.Unchecked_Deallocation;
+
+with Interfaces.C.Strings;
+
+with ZLib.Thin;
+
+package body ZLib is
+
+   use type Thin.Int;
+
+   type Z_Stream is new Thin.Z_Stream;
+
+   type Return_Code_Enum is
+      (OK,
+       STREAM_END,
+       NEED_DICT,
+       ERRNO,
+       STREAM_ERROR,
+       DATA_ERROR,
+       MEM_ERROR,
+       BUF_ERROR,
+       VERSION_ERROR);
+
+   type Flate_Step_Function is access
+     function (Strm : in Thin.Z_Streamp; Flush : in Thin.Int) return Thin.Int;
+   pragma Convention (C, Flate_Step_Function);
+
+   type Flate_End_Function is access
+      function (Ctrm : in Thin.Z_Streamp) return Thin.Int;
+   pragma Convention (C, Flate_End_Function);
+
+   type Flate_Type is record
+      Step : Flate_Step_Function;
+      Done : Flate_End_Function;
+   end record;
+
+   subtype Footer_Array is Stream_Element_Array (1 .. 8);
+
+   Simple_GZip_Header : constant Stream_Element_Array (1 .. 10)
+     := (16#1f#, 16#8b#,                 --  Magic header
+         16#08#,                         --  Z_DEFLATED
+         16#00#,                         --  Flags
+         16#00#, 16#00#, 16#00#, 16#00#, --  Time
+         16#00#,                         --  XFlags
+         16#03#                          --  OS code
+        );
+   --  The simplest gzip header is not for informational, but just for
+   --  gzip format compatibility.
+   --  Note that some code below is using assumption
+   --  Simple_GZip_Header'Last > Footer_Array'Last, so do not make
+   --  Simple_GZip_Header'Last <= Footer_Array'Last.
+
+   Return_Code : constant array (Thin.Int range <>) of Return_Code_Enum
+     := (0 => OK,
+         1 => STREAM_END,
+         2 => NEED_DICT,
+        -1 => ERRNO,
+        -2 => STREAM_ERROR,
+        -3 => DATA_ERROR,
+        -4 => MEM_ERROR,
+        -5 => BUF_ERROR,
+        -6 => VERSION_ERROR);
+
+   Flate : constant array (Boolean) of Flate_Type
+     := (True  => (Step => Thin.Deflate'Access,
+                   Done => Thin.DeflateEnd'Access),
+         False => (Step => Thin.Inflate'Access,
+                   Done => Thin.InflateEnd'Access));
+
+   Flush_Finish : constant array (Boolean) of Flush_Mode
+     := (True => Finish, False => No_Flush);
+
+   procedure Raise_Error (Stream : in Z_Stream);
+   pragma Inline (Raise_Error);
+
+   procedure Raise_Error (Message : in String);
+   pragma Inline (Raise_Error);
+
+   procedure Check_Error (Stream : in Z_Stream; Code : in Thin.Int);
+
+   procedure Free is new Ada.Unchecked_Deallocation
+      (Z_Stream, Z_Stream_Access);
+
+   function To_Thin_Access is new Ada.Unchecked_Conversion
+     (Z_Stream_Access, Thin.Z_Streamp);
+
+   procedure Translate_GZip
+     (Filter    : in out Filter_Type;
+      In_Data   : in     Ada.Streams.Stream_Element_Array;
+      In_Last   :    out Ada.Streams.Stream_Element_Offset;
+      Out_Data  :    out Ada.Streams.Stream_Element_Array;
+      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
+      Flush     : in     Flush_Mode);
+   --  Separate translate routine for make gzip header.
+
+   procedure Translate_Auto
+     (Filter    : in out Filter_Type;
+      In_Data   : in     Ada.Streams.Stream_Element_Array;
+      In_Last   :    out Ada.Streams.Stream_Element_Offset;
+      Out_Data  :    out Ada.Streams.Stream_Element_Array;
+      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
+      Flush     : in     Flush_Mode);
+   --  translate routine without additional headers.
+
+   -----------------
+   -- Check_Error --
+   -----------------
+
+   procedure Check_Error (Stream : in Z_Stream; Code : in Thin.Int) is
+      use type Thin.Int;
+   begin
+      if Code /= Thin.Z_OK then
+         Raise_Error
+            (Return_Code_Enum'Image (Return_Code (Code))
+              & ": " & Last_Error_Message (Stream));
+      end if;
+   end Check_Error;
+
+   -----------
+   -- Close --
+   -----------
+
+   procedure Close
+     (Filter       : in out Filter_Type;
+      Ignore_Error : in     Boolean := False)
+   is
+      Code : Thin.Int;
+   begin
+      if not Ignore_Error and then not Is_Open (Filter) then
+         raise Status_Error;
+      end if;
+
+      Code := Flate (Filter.Compression).Done (To_Thin_Access (Filter.Strm));
+
+      if Ignore_Error or else Code = Thin.Z_OK then
+         Free (Filter.Strm);
+      else
+         declare
+            Error_Message : constant String
+              := Last_Error_Message (Filter.Strm.all);
+         begin
+            Free (Filter.Strm);
+            Ada.Exceptions.Raise_Exception
+               (ZLib_Error'Identity,
+                Return_Code_Enum'Image (Return_Code (Code))
+                  & ": " & Error_Message);
+         end;
+      end if;
+   end Close;
+
+   -----------
+   -- CRC32 --
+   -----------
+
+   function CRC32
+     (CRC  : in Unsigned_32;
+      Data : in Ada.Streams.Stream_Element_Array)
+      return Unsigned_32
+   is
+      use Thin;
+   begin
+      return Unsigned_32 (crc32 (ULong (CRC),
+                                 Data'Address,
+                                 Data'Length));
+   end CRC32;
+
+   procedure CRC32
+     (CRC  : in out Unsigned_32;
+      Data : in     Ada.Streams.Stream_Element_Array) is
+   begin
+      CRC := CRC32 (CRC, Data);
+   end CRC32;
+
+   ------------------
+   -- Deflate_Init --
+   ------------------
+
+   procedure Deflate_Init
+     (Filter       : in out Filter_Type;
+      Level        : in     Compression_Level  := Default_Compression;
+      Strategy     : in     Strategy_Type      := Default_Strategy;
+      Method       : in     Compression_Method := Deflated;
+      Window_Bits  : in     Window_Bits_Type   := Default_Window_Bits;
+      Memory_Level : in     Memory_Level_Type  := Default_Memory_Level;
+      Header       : in     Header_Type        := Default)
+   is
+      use type Thin.Int;
+      Win_Bits : Thin.Int := Thin.Int (Window_Bits);
+   begin
+      if Is_Open (Filter) then
+         raise Status_Error;
+      end if;
+
+      --  We allow ZLib to make header only in case of default header type.
+      --  Otherwise we would either do header by ourselfs, or do not do
+      --  header at all.
+
+      if Header = None or else Header = GZip then
+         Win_Bits := -Win_Bits;
+      end if;
+
+      --  For the GZip CRC calculation and make headers.
+
+      if Header = GZip then
+         Filter.CRC    := 0;
+         Filter.Offset := Simple_GZip_Header'First;
+      else
+         Filter.Offset := Simple_GZip_Header'Last + 1;
+      end if;
+
+      Filter.Strm        := new Z_Stream;
+      Filter.Compression := True;
+      Filter.Stream_End  := False;
+      Filter.Header      := Header;
+
+      if Thin.Deflate_Init
+           (To_Thin_Access (Filter.Strm),
+            Level      => Thin.Int (Level),
+            method     => Thin.Int (Method),
+            windowBits => Win_Bits,
+            memLevel   => Thin.Int (Memory_Level),
+            strategy   => Thin.Int (Strategy)) /= Thin.Z_OK
+      then
+         Raise_Error (Filter.Strm.all);
+      end if;
+   end Deflate_Init;
+
+   -----------
+   -- Flush --
+   -----------
+
+   procedure Flush
+     (Filter    : in out Filter_Type;
+      Out_Data  :    out Ada.Streams.Stream_Element_Array;
+      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
+      Flush     : in     Flush_Mode)
+   is
+      No_Data : Stream_Element_Array := (1 .. 0 => 0);
+      Last    : Stream_Element_Offset;
+   begin
+      Translate (Filter, No_Data, Last, Out_Data, Out_Last, Flush);
+   end Flush;
+
+   -----------------------
+   -- Generic_Translate --
+   -----------------------
+
+   procedure Generic_Translate
+     (Filter          : in out ZLib.Filter_Type;
+      In_Buffer_Size  : in     Integer := Default_Buffer_Size;
+      Out_Buffer_Size : in     Integer := Default_Buffer_Size)
+   is
+      In_Buffer  : Stream_Element_Array
+                     (1 .. Stream_Element_Offset (In_Buffer_Size));
+      Out_Buffer : Stream_Element_Array
+                     (1 .. Stream_Element_Offset (Out_Buffer_Size));
+      Last       : Stream_Element_Offset;
+      In_Last    : Stream_Element_Offset;
+      In_First   : Stream_Element_Offset;
+      Out_Last   : Stream_Element_Offset;
+   begin
+      Main : loop
+         Data_In (In_Buffer, Last);
+
+         In_First := In_Buffer'First;
+
+         loop
+            Translate
+              (Filter   => Filter,
+               In_Data  => In_Buffer (In_First .. Last),
+               In_Last  => In_Last,
+               Out_Data => Out_Buffer,
+               Out_Last => Out_Last,
+               Flush    => Flush_Finish (Last < In_Buffer'First));
+
+            if Out_Buffer'First <= Out_Last then
+               Data_Out (Out_Buffer (Out_Buffer'First .. Out_Last));
+            end if;
+
+            exit Main when Stream_End (Filter);
+
+            --  The end of in buffer.
+
+            exit when In_Last = Last;
+
+            In_First := In_Last + 1;
+         end loop;
+      end loop Main;
+
+   end Generic_Translate;
+
+   ------------------
+   -- Inflate_Init --
+   ------------------
+
+   procedure Inflate_Init
+     (Filter      : in out Filter_Type;
+      Window_Bits : in     Window_Bits_Type := Default_Window_Bits;
+      Header      : in     Header_Type      := Default)
+   is
+      use type Thin.Int;
+      Win_Bits : Thin.Int := Thin.Int (Window_Bits);
+
+      procedure Check_Version;
+      --  Check the latest header types compatibility.
+
+      procedure Check_Version is
+      begin
+         if Version <= "1.1.4" then
+            Raise_Error
+              ("Inflate header type " & Header_Type'Image (Header)
+               & " incompatible with ZLib version " & Version);
+         end if;
+      end Check_Version;
+
+   begin
+      if Is_Open (Filter) then
+         raise Status_Error;
+      end if;
+
+      case Header is
+         when None =>
+            Check_Version;
+
+            --  Inflate data without headers determined
+            --  by negative Win_Bits.
+
+            Win_Bits := -Win_Bits;
+         when GZip =>
+            Check_Version;
+
+            --  Inflate gzip data defined by flag 16.
+
+            Win_Bits := Win_Bits + 16;
+         when Auto =>
+            Check_Version;
+
+            --  Inflate with automatic detection
+            --  of gzip or native header defined by flag 32.
+
+            Win_Bits := Win_Bits + 32;
+         when Default => null;
+      end case;
+
+      Filter.Strm        := new Z_Stream;
+      Filter.Compression := False;
+      Filter.Stream_End  := False;
+      Filter.Header      := Header;
+
+      if Thin.Inflate_Init
+         (To_Thin_Access (Filter.Strm), Win_Bits) /= Thin.Z_OK
+      then
+         Raise_Error (Filter.Strm.all);
+      end if;
+   end Inflate_Init;
+
+   -------------
+   -- Is_Open --
+   -------------
+
+   function Is_Open (Filter : in Filter_Type) return Boolean is
+   begin
+      return Filter.Strm /= null;
+   end Is_Open;
+
+   -----------------
+   -- Raise_Error --
+   -----------------
+
+   procedure Raise_Error (Message : in String) is
+   begin
+      Ada.Exceptions.Raise_Exception (ZLib_Error'Identity, Message);
+   end Raise_Error;
+
+   procedure Raise_Error (Stream : in Z_Stream) is
+   begin
+      Raise_Error (Last_Error_Message (Stream));
+   end Raise_Error;
+
+   ----------
+   -- Read --
+   ----------
+
+   procedure Read
+     (Filter : in out Filter_Type;
+      Item   :    out Ada.Streams.Stream_Element_Array;
+      Last   :    out Ada.Streams.Stream_Element_Offset;
+      Flush  : in     Flush_Mode := No_Flush)
+   is
+      In_Last    : Stream_Element_Offset;
+      Item_First : Ada.Streams.Stream_Element_Offset := Item'First;
+      V_Flush    : Flush_Mode := Flush;
+
+   begin
+      pragma Assert (Rest_First in Buffer'First .. Buffer'Last + 1);
+      pragma Assert (Rest_Last in Buffer'First - 1 .. Buffer'Last);
+
+      loop
+         if Rest_Last = Buffer'First - 1 then
+            V_Flush := Finish;
+
+         elsif Rest_First > Rest_Last then
+            Read (Buffer, Rest_Last);
+            Rest_First := Buffer'First;
+
+            if Rest_Last < Buffer'First then
+               V_Flush := Finish;
+            end if;
+         end if;
+
+         Translate
+           (Filter   => Filter,
+            In_Data  => Buffer (Rest_First .. Rest_Last),
+            In_Last  => In_Last,
+            Out_Data => Item (Item_First .. Item'Last),
+            Out_Last => Last,
+            Flush    => V_Flush);
+
+         Rest_First := In_Last + 1;
+
+         exit when Stream_End (Filter)
+           or else Last = Item'Last
+           or else (Last >= Item'First and then Allow_Read_Some);
+
+         Item_First := Last + 1;
+      end loop;
+   end Read;
+
+   ----------------
+   -- Stream_End --
+   ----------------
+
+   function Stream_End (Filter : in Filter_Type) return Boolean is
+   begin
+      if Filter.Header = GZip and Filter.Compression then
+         return Filter.Stream_End
+            and then Filter.Offset = Footer_Array'Last + 1;
+      else
+         return Filter.Stream_End;
+      end if;
+   end Stream_End;
+
+   --------------
+   -- Total_In --
+   --------------
+
+   function Total_In (Filter : in Filter_Type) return Count is
+   begin
+      return Count (Thin.Total_In (To_Thin_Access (Filter.Strm).all));
+   end Total_In;
+
+   ---------------
+   -- Total_Out --
+   ---------------
+
+   function Total_Out (Filter : in Filter_Type) return Count is
+   begin
+      return Count (Thin.Total_Out (To_Thin_Access (Filter.Strm).all));
+   end Total_Out;
+
+   ---------------
+   -- Translate --
+   ---------------
+
+   procedure Translate
+     (Filter    : in out Filter_Type;
+      In_Data   : in     Ada.Streams.Stream_Element_Array;
+      In_Last   :    out Ada.Streams.Stream_Element_Offset;
+      Out_Data  :    out Ada.Streams.Stream_Element_Array;
+      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
+      Flush     : in     Flush_Mode) is
+   begin
+      if Filter.Header = GZip and then Filter.Compression then
+         Translate_GZip
+           (Filter   => Filter,
+            In_Data  => In_Data,
+            In_Last  => In_Last,
+            Out_Data => Out_Data,
+            Out_Last => Out_Last,
+            Flush    => Flush);
+      else
+         Translate_Auto
+           (Filter   => Filter,
+            In_Data  => In_Data,
+            In_Last  => In_Last,
+            Out_Data => Out_Data,
+            Out_Last => Out_Last,
+            Flush    => Flush);
+      end if;
+   end Translate;
+
+   --------------------
+   -- Translate_Auto --
+   --------------------
+
+   procedure Translate_Auto
+     (Filter    : in out Filter_Type;
+      In_Data   : in     Ada.Streams.Stream_Element_Array;
+      In_Last   :    out Ada.Streams.Stream_Element_Offset;
+      Out_Data  :    out Ada.Streams.Stream_Element_Array;
+      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
+      Flush     : in     Flush_Mode)
+   is
+      use type Thin.Int;
+      Code : Thin.Int;
+
+   begin
+      if not Is_Open (Filter) then
+         raise Status_Error;
+      end if;
+
+      if Out_Data'Length = 0 and then In_Data'Length = 0 then
+         raise Constraint_Error;
+      end if;
+
+      Set_Out (Filter.Strm.all, Out_Data'Address, Out_Data'Length);
+      Set_In  (Filter.Strm.all, In_Data'Address, In_Data'Length);
+
+      Code := Flate (Filter.Compression).Step
+        (To_Thin_Access (Filter.Strm),
+         Thin.Int (Flush));
+
+      if Code = Thin.Z_STREAM_END then
+         Filter.Stream_End := True;
+      else
+         Check_Error (Filter.Strm.all, Code);
+      end if;
+
+      In_Last  := In_Data'Last
+         - Stream_Element_Offset (Avail_In (Filter.Strm.all));
+      Out_Last := Out_Data'Last
+         - Stream_Element_Offset (Avail_Out (Filter.Strm.all));
+   end Translate_Auto;
+
+   --------------------
+   -- Translate_GZip --
+   --------------------
+
+   procedure Translate_GZip
+     (Filter    : in out Filter_Type;
+      In_Data   : in     Ada.Streams.Stream_Element_Array;
+      In_Last   :    out Ada.Streams.Stream_Element_Offset;
+      Out_Data  :    out Ada.Streams.Stream_Element_Array;
+      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
+      Flush     : in     Flush_Mode)
+   is
+      Out_First : Stream_Element_Offset;
+
+      procedure Add_Data (Data : in Stream_Element_Array);
+      --  Add data to stream from the Filter.Offset till necessary,
+      --  used for add gzip headr/footer.
+
+      procedure Put_32
+        (Item : in out Stream_Element_Array;
+         Data : in     Unsigned_32);
+      pragma Inline (Put_32);
+
+      --------------
+      -- Add_Data --
+      --------------
+
+      procedure Add_Data (Data : in Stream_Element_Array) is
+         Data_First : Stream_Element_Offset renames Filter.Offset;
+         Data_Last  : Stream_Element_Offset;
+         Data_Len   : Stream_Element_Offset; --  -1
+         Out_Len    : Stream_Element_Offset; --  -1
+      begin
+         Out_First := Out_Last + 1;
+
+         if Data_First > Data'Last then
+            return;
+         end if;
+
+         Data_Len  := Data'Last     - Data_First;
+         Out_Len   := Out_Data'Last - Out_First;
+
+         if Data_Len <= Out_Len then
+            Out_Last  := Out_First  + Data_Len;
+            Data_Last := Data'Last;
+         else
+            Out_Last  := Out_Data'Last;
+            Data_Last := Data_First + Out_Len;
+         end if;
+
+         Out_Data (Out_First .. Out_Last) := Data (Data_First .. Data_Last);
+
+         Data_First := Data_Last + 1;
+         Out_First  := Out_Last + 1;
+      end Add_Data;
+
+      ------------
+      -- Put_32 --
+      ------------
+
+      procedure Put_32
+        (Item : in out Stream_Element_Array;
+         Data : in     Unsigned_32)
+      is
+         D : Unsigned_32 := Data;
+      begin
+         for J in Item'First .. Item'First + 3 loop
+            Item (J) := Stream_Element (D and 16#FF#);
+            D := Shift_Right (D, 8);
+         end loop;
+      end Put_32;
+
+   begin
+      Out_Last := Out_Data'First - 1;
+
+      if not Filter.Stream_End then
+         Add_Data (Simple_GZip_Header);
+
+         Translate_Auto
+           (Filter   => Filter,
+            In_Data  => In_Data,
+            In_Last  => In_Last,
+            Out_Data => Out_Data (Out_First .. Out_Data'Last),
+            Out_Last => Out_Last,
+            Flush    => Flush);
+
+         CRC32 (Filter.CRC, In_Data (In_Data'First .. In_Last));
+      end if;
+
+      if Filter.Stream_End and then Out_Last <= Out_Data'Last then
+         --  This detection method would work only when
+         --  Simple_GZip_Header'Last > Footer_Array'Last
+
+         if Filter.Offset = Simple_GZip_Header'Last + 1 then
+            Filter.Offset := Footer_Array'First;
+         end if;
+
+         declare
+            Footer : Footer_Array;
+         begin
+            Put_32 (Footer, Filter.CRC);
+            Put_32 (Footer (Footer'First + 4 .. Footer'Last),
+                    Unsigned_32 (Total_In (Filter)));
+            Add_Data (Footer);
+         end;
+      end if;
+   end Translate_GZip;
+
+   -------------
+   -- Version --
+   -------------
+
+   function Version return String is
+   begin
+      return Interfaces.C.Strings.Value (Thin.zlibVersion);
+   end Version;
+
+   -----------
+   -- Write --
+   -----------
+
+   procedure Write
+     (Filter : in out Filter_Type;
+      Item   : in     Ada.Streams.Stream_Element_Array;
+      Flush  : in     Flush_Mode := No_Flush)
+   is
+      Buffer   : Stream_Element_Array (1 .. Buffer_Size);
+      In_Last  : Stream_Element_Offset;
+      Out_Last : Stream_Element_Offset;
+      In_First : Stream_Element_Offset := Item'First;
+   begin
+      if Item'Length = 0 and Flush = No_Flush then
+         return;
+      end if;
+
+      loop
+         Translate
+           (Filter   => Filter,
+            In_Data  => Item (In_First .. Item'Last),
+            In_Last  => In_Last,
+            Out_Data => Buffer,
+            Out_Last => Out_Last,
+            Flush    => Flush);
+
+         if Out_Last >= Buffer'First then
+            Write (Buffer (1 .. Out_Last));
+         end if;
+
+         exit when In_Last = Item'Last or Stream_End (Filter);
+
+         In_First := In_Last + 1;
+      end loop;
+   end Write;
+
+end ZLib;
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib.ads b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib.ads
new file mode 100644
index 00000000..d909fc3e
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib.ads
@@ -0,0 +1,328 @@
+------------------------------------------------------------------------------
+--                      ZLib for Ada thick binding.                         --
+--                                                                          --
+--              Copyright (C) 2002-2004 Dmitriy Anisimkov                   --
+--                                                                          --
+--  This library 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.                                         --
+--                                                                          --
+--  This library 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 library; if not, write to the Free Software Foundation, --
+--  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.          --
+--                                                                          --
+--  As a special exception, if other files instantiate generics from this   --
+--  unit, or you link this unit with other files to produce an executable,  --
+--  this  unit  does not  by itself cause  the resulting executable to be   --
+--  covered by the GNU General Public License. This exception does not      --
+--  however invalidate any other reasons why the executable file  might be  --
+--  covered by the  GNU Public License.                                     --
+------------------------------------------------------------------------------
+
+--  $Id: zlib.ads 66 2005-08-17 18:20:58Z andreas_kupries $
+
+with Ada.Streams;
+
+with Interfaces;
+
+package ZLib is
+
+   ZLib_Error   : exception;
+   Status_Error : exception;
+
+   type Compression_Level is new Integer range -1 .. 9;
+
+   type Flush_Mode is private;
+
+   type Compression_Method is private;
+
+   type Window_Bits_Type is new Integer range 8 .. 15;
+
+   type Memory_Level_Type is new Integer range 1 .. 9;
+
+   type Unsigned_32 is new Interfaces.Unsigned_32;
+
+   type Strategy_Type is private;
+
+   type Header_Type is (None, Auto, Default, GZip);
+   --  Header type usage have a some limitation for inflate.
+   --  See comment for Inflate_Init.
+
+   subtype Count is Ada.Streams.Stream_Element_Count;
+
+   Default_Memory_Level : constant Memory_Level_Type := 8;
+   Default_Window_Bits  : constant Window_Bits_Type  := 15;
+
+   ----------------------------------
+   -- Compression method constants --
+   ----------------------------------
+
+   Deflated : constant Compression_Method;
+   --  Only one method allowed in this ZLib version
+
+   ---------------------------------
+   -- Compression level constants --
+   ---------------------------------
+
+   No_Compression      : constant Compression_Level := 0;
+   Best_Speed          : constant Compression_Level := 1;
+   Best_Compression    : constant Compression_Level := 9;
+   Default_Compression : constant Compression_Level := -1;
+
+   --------------------------
+   -- Flush mode constants --
+   --------------------------
+
+   No_Flush      : constant Flush_Mode;
+   --  Regular way for compression, no flush
+
+   Partial_Flush : constant Flush_Mode;
+   --  Will be removed, use Z_SYNC_FLUSH instead
+
+   Sync_Flush    : constant Flush_Mode;
+   --  All pending output is flushed to the output buffer and the output
+   --  is aligned on a byte boundary, so that the decompressor can get all
+   --  input data available so far. (In particular avail_in is zero after the
+   --  call if enough output space has been provided  before the call.)
+   --  Flushing may degrade compression for some compression algorithms and so
+   --  it should be used only when necessary.
+
+   Block_Flush   : constant Flush_Mode;
+   --  Z_BLOCK requests that inflate() stop
+   --  if and when it get to the next deflate block boundary. When decoding the
+   --  zlib or gzip format, this will cause inflate() to return immediately
+   --  after the header and before the first block. When doing a raw inflate,
+   --  inflate() will go ahead and process the first block, and will return
+   --  when it gets to the end of that block, or when it runs out of data.
+
+   Full_Flush    : constant Flush_Mode;
+   --  All output is flushed as with SYNC_FLUSH, and the compression state
+   --  is reset so that decompression can restart from this point if previous
+   --  compressed data has been damaged or if random access is desired. Using
+   --  Full_Flush too often can seriously degrade the compression.
+
+   Finish        : constant Flush_Mode;
+   --  Just for tell the compressor that input data is complete.
+
+   ------------------------------------
+   -- Compression strategy constants --
+   ------------------------------------
+
+   --  RLE stategy could be used only in version 1.2.0 and later.
+
+   Filtered         : constant Strategy_Type;
+   Huffman_Only     : constant Strategy_Type;
+   RLE              : constant Strategy_Type;
+   Default_Strategy : constant Strategy_Type;
+
+   Default_Buffer_Size : constant := 4096;
+
+   type Filter_Type is tagged limited private;
+   --  The filter is for compression and for decompression.
+   --  The usage of the type is depend of its initialization.
+
+   function Version return String;
+   pragma Inline (Version);
+   --  Return string representation of the ZLib version.
+
+   procedure Deflate_Init
+     (Filter       : in out Filter_Type;
+      Level        : in     Compression_Level  := Default_Compression;
+      Strategy     : in     Strategy_Type      := Default_Strategy;
+      Method       : in     Compression_Method := Deflated;
+      Window_Bits  : in     Window_Bits_Type   := Default_Window_Bits;
+      Memory_Level : in     Memory_Level_Type  := Default_Memory_Level;
+      Header       : in     Header_Type        := Default);
+   --  Compressor initialization.
+   --  When Header parameter is Auto or Default, then default zlib header
+   --  would be provided for compressed data.
+   --  When Header is GZip, then gzip header would be set instead of
+   --  default header.
+   --  When Header is None, no header would be set for compressed data.
+
+   procedure Inflate_Init
+     (Filter      : in out Filter_Type;
+      Window_Bits : in     Window_Bits_Type := Default_Window_Bits;
+      Header      : in     Header_Type      := Default);
+   --  Decompressor initialization.
+   --  Default header type mean that ZLib default header is expecting in the
+   --  input compressed stream.
+   --  Header type None mean that no header is expecting in the input stream.
+   --  GZip header type mean that GZip header is expecting in the
+   --  input compressed stream.
+   --  Auto header type mean that header type (GZip or Native) would be
+   --  detected automatically in the input stream.
+   --  Note that header types parameter values None, GZip and Auto are
+   --  supported for inflate routine only in ZLib versions 1.2.0.2 and later.
+   --  Deflate_Init is supporting all header types.
+
+   function Is_Open (Filter : in Filter_Type) return Boolean;
+   pragma Inline (Is_Open);
+   --  Is the filter opened for compression or decompression.
+
+   procedure Close
+     (Filter       : in out Filter_Type;
+      Ignore_Error : in     Boolean := False);
+   --  Closing the compression or decompressor.
+   --  If stream is closing before the complete and Ignore_Error is False,
+   --  The exception would be raised.
+
+   generic
+      with procedure Data_In
+        (Item : out Ada.Streams.Stream_Element_Array;
+         Last : out Ada.Streams.Stream_Element_Offset);
+      with procedure Data_Out
+        (Item : in Ada.Streams.Stream_Element_Array);
+   procedure Generic_Translate
+     (Filter          : in out Filter_Type;
+      In_Buffer_Size  : in     Integer := Default_Buffer_Size;
+      Out_Buffer_Size : in     Integer := Default_Buffer_Size);
+   --  Compress/decompress data fetch from Data_In routine and pass the result
+   --  to the Data_Out routine. User should provide Data_In and Data_Out
+   --  for compression/decompression data flow.
+   --  Compression or decompression depend on Filter initialization.
+
+   function Total_In (Filter : in Filter_Type) return Count;
+   pragma Inline (Total_In);
+   --  Returns total number of input bytes read so far
+
+   function Total_Out (Filter : in Filter_Type) return Count;
+   pragma Inline (Total_Out);
+   --  Returns total number of bytes output so far
+
+   function CRC32
+     (CRC    : in Unsigned_32;
+      Data   : in Ada.Streams.Stream_Element_Array)
+      return Unsigned_32;
+   pragma Inline (CRC32);
+   --  Compute CRC32, it could be necessary for make gzip format
+
+   procedure CRC32
+     (CRC  : in out Unsigned_32;
+      Data : in     Ada.Streams.Stream_Element_Array);
+   pragma Inline (CRC32);
+   --  Compute CRC32, it could be necessary for make gzip format
+
+   -------------------------------------------------
+   --  Below is more complex low level routines.  --
+   -------------------------------------------------
+
+   procedure Translate
+     (Filter    : in out Filter_Type;
+      In_Data   : in     Ada.Streams.Stream_Element_Array;
+      In_Last   :    out Ada.Streams.Stream_Element_Offset;
+      Out_Data  :    out Ada.Streams.Stream_Element_Array;
+      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
+      Flush     : in     Flush_Mode);
+   --  Compress/decompress the In_Data buffer and place the result into
+   --  Out_Data. In_Last is the index of last element from In_Data accepted by
+   --  the Filter. Out_Last is the last element of the received data from
+   --  Filter. To tell the filter that incoming data are complete put the
+   --  Flush parameter to Finish.
+
+   function Stream_End (Filter : in Filter_Type) return Boolean;
+   pragma Inline (Stream_End);
+   --  Return the true when the stream is complete.
+
+   procedure Flush
+     (Filter    : in out Filter_Type;
+      Out_Data  :    out Ada.Streams.Stream_Element_Array;
+      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
+      Flush     : in     Flush_Mode);
+   pragma Inline (Flush);
+   --  Flushing the data from the compressor.
+
+   generic
+      with procedure Write
+        (Item : in Ada.Streams.Stream_Element_Array);
+      --  User should provide this routine for accept
+      --  compressed/decompressed data.
+
+      Buffer_Size : in Ada.Streams.Stream_Element_Offset
+         := Default_Buffer_Size;
+      --  Buffer size for Write user routine.
+
+   procedure Write
+     (Filter  : in out Filter_Type;
+      Item    : in     Ada.Streams.Stream_Element_Array;
+      Flush   : in     Flush_Mode := No_Flush);
+   --  Compress/Decompress data from Item to the generic parameter procedure
+   --  Write. Output buffer size could be set in Buffer_Size generic parameter.
+
+   generic
+      with procedure Read
+        (Item : out Ada.Streams.Stream_Element_Array;
+         Last : out Ada.Streams.Stream_Element_Offset);
+      --  User should provide data for compression/decompression
+      --  thru this routine.
+
+      Buffer : in out Ada.Streams.Stream_Element_Array;
+      --  Buffer for keep remaining data from the previous
+      --  back read.
+
+      Rest_First, Rest_Last : in out Ada.Streams.Stream_Element_Offset;
+      --  Rest_First have to be initialized to Buffer'Last + 1
+      --  Rest_Last have to be initialized to Buffer'Last
+      --  before usage.
+
+      Allow_Read_Some : in Boolean := False;
+      --  Is it allowed to return Last < Item'Last before end of data.
+
+   procedure Read
+     (Filter : in out Filter_Type;
+      Item   :    out Ada.Streams.Stream_Element_Array;
+      Last   :    out Ada.Streams.Stream_Element_Offset;
+      Flush  : in     Flush_Mode := No_Flush);
+   --  Compress/Decompress data from generic parameter procedure Read to the
+   --  Item. User should provide Buffer and initialized Rest_First, Rest_Last
+   --  indicators. If Allow_Read_Some is True, Read routines could return
+   --  Last < Item'Last only at end of stream.
+
+private
+
+   use Ada.Streams;
+
+   pragma Assert (Ada.Streams.Stream_Element'Size    =    8);
+   pragma Assert (Ada.Streams.Stream_Element'Modulus = 2**8);
+
+   type Flush_Mode is new Integer range 0 .. 5;
+
+   type Compression_Method is new Integer range 8 .. 8;
+
+   type Strategy_Type is new Integer range 0 .. 3;
+
+   No_Flush      : constant Flush_Mode := 0;
+   Partial_Flush : constant Flush_Mode := 1;
+   Sync_Flush    : constant Flush_Mode := 2;
+   Full_Flush    : constant Flush_Mode := 3;
+   Finish        : constant Flush_Mode := 4;
+   Block_Flush   : constant Flush_Mode := 5;
+
+   Filtered         : constant Strategy_Type := 1;
+   Huffman_Only     : constant Strategy_Type := 2;
+   RLE              : constant Strategy_Type := 3;
+   Default_Strategy : constant Strategy_Type := 0;
+
+   Deflated : constant Compression_Method := 8;
+
+   type Z_Stream;
+
+   type Z_Stream_Access is access all Z_Stream;
+
+   type Filter_Type is tagged limited record
+      Strm        : Z_Stream_Access;
+      Compression : Boolean;
+      Stream_End  : Boolean;
+      Header      : Header_Type;
+      CRC         : Unsigned_32;
+      Offset      : Stream_Element_Offset;
+      --  Offset for gzip header/footer output.
+   end record;
+
+end ZLib;
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib.gpr b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib.gpr
new file mode 100644
index 00000000..296b22aa
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/ada/zlib.gpr
@@ -0,0 +1,20 @@
+project Zlib is
+
+   for Languages use ("Ada");
+   for Source_Dirs use (".");
+   for Object_Dir use ".";
+   for Main use ("test.adb", "mtest.adb", "read.adb", "buffer_demo");
+
+   package Compiler is
+      for Default_Switches ("ada") use ("-gnatwcfilopru", "-gnatVcdfimorst", "-gnatyabcefhiklmnoprst");
+   end Compiler;
+
+   package Linker is
+      for Default_Switches ("ada") use ("-lz");
+   end Linker;
+
+   package Builder is
+      for Default_Switches ("ada") use ("-s", "-gnatQ");
+   end Builder;
+
+end Zlib;
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/amd64/amd64-match.S b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/amd64/amd64-match.S
new file mode 100644
index 00000000..81d4a1c9
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/amd64/amd64-match.S
@@ -0,0 +1,452 @@
+/*
+ * match.S -- optimized version of longest_match()
+ * based on the similar work by Gilles Vollant, and Brian Raiter, written 1998
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the BSD License. Use by owners of Che Guevarra
+ * parafernalia is prohibited, where possible, and highly discouraged
+ * elsewhere.
+ */
+
+#ifndef NO_UNDERLINE
+#	define	match_init	_match_init
+#	define	longest_match	_longest_match
+#endif
+
+#define	scanend		ebx
+#define	scanendw	bx
+#define	chainlenwmask	edx /* high word: current chain len low word: s->wmask */
+#define	curmatch	rsi
+#define	curmatchd	esi
+#define	windowbestlen	r8
+#define	scanalign	r9
+#define	scanalignd	r9d
+#define	window		r10
+#define	bestlen		r11
+#define	bestlend	r11d
+#define	scanstart	r12d
+#define	scanstartw	r12w
+#define scan		r13
+#define nicematch	r14d
+#define	limit		r15
+#define	limitd		r15d
+#define prev		rcx
+
+/*
+ * The 258 is a "magic number, not a parameter -- changing it
+ * breaks the hell loose
+ */
+#define	MAX_MATCH	(258)
+#define	MIN_MATCH	(3)
+#define	MIN_LOOKAHEAD	(MAX_MATCH + MIN_MATCH + 1)
+#define	MAX_MATCH_8	((MAX_MATCH + 7) & ~7)
+
+/* stack frame offsets */
+#define	LocalVarsSize	(112)
+#define _chainlenwmask	( 8-LocalVarsSize)(%rsp)
+#define _windowbestlen	(16-LocalVarsSize)(%rsp)
+#define save_r14        (24-LocalVarsSize)(%rsp)
+#define save_rsi        (32-LocalVarsSize)(%rsp)
+#define save_rbx        (40-LocalVarsSize)(%rsp)
+#define save_r12        (56-LocalVarsSize)(%rsp)
+#define save_r13        (64-LocalVarsSize)(%rsp)
+#define save_r15        (80-LocalVarsSize)(%rsp)
+
+
+.globl	match_init, longest_match
+
+/*
+ * On AMD64 the first argument of a function (in our case -- the pointer to
+ * deflate_state structure) is passed in %rdi, hence our offsets below are
+ * all off of that.
+ */
+
+/* you can check the structure offset by running
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "deflate.h"
+
+void print_depl()
+{
+deflate_state ds;
+deflate_state *s=&ds;
+printf("size pointer=%u\n",(int)sizeof(void*));
+
+printf("#define dsWSize         (%3u)(%%rdi)\n",(int)(((char*)&(s->w_size))-((char*)s)));
+printf("#define dsWMask         (%3u)(%%rdi)\n",(int)(((char*)&(s->w_mask))-((char*)s)));
+printf("#define dsWindow        (%3u)(%%rdi)\n",(int)(((char*)&(s->window))-((char*)s)));
+printf("#define dsPrev          (%3u)(%%rdi)\n",(int)(((char*)&(s->prev))-((char*)s)));
+printf("#define dsMatchLen      (%3u)(%%rdi)\n",(int)(((char*)&(s->match_length))-((char*)s)));
+printf("#define dsPrevMatch     (%3u)(%%rdi)\n",(int)(((char*)&(s->prev_match))-((char*)s)));
+printf("#define dsStrStart      (%3u)(%%rdi)\n",(int)(((char*)&(s->strstart))-((char*)s)));
+printf("#define dsMatchStart    (%3u)(%%rdi)\n",(int)(((char*)&(s->match_start))-((char*)s)));
+printf("#define dsLookahead     (%3u)(%%rdi)\n",(int)(((char*)&(s->lookahead))-((char*)s)));
+printf("#define dsPrevLen       (%3u)(%%rdi)\n",(int)(((char*)&(s->prev_length))-((char*)s)));
+printf("#define dsMaxChainLen   (%3u)(%%rdi)\n",(int)(((char*)&(s->max_chain_length))-((char*)s)));
+printf("#define dsGoodMatch     (%3u)(%%rdi)\n",(int)(((char*)&(s->good_match))-((char*)s)));
+printf("#define dsNiceMatch     (%3u)(%%rdi)\n",(int)(((char*)&(s->nice_match))-((char*)s)));
+}
+
+*/
+
+
+/*
+  to compile for XCode 3.2 on MacOSX x86_64
+  - run "gcc -g -c -DXCODE_MAC_X64_STRUCTURE amd64-match.S"
+ */
+
+
+#ifndef CURRENT_LINX_XCODE_MAC_X64_STRUCTURE
+#define dsWSize		( 68)(%rdi)
+#define dsWMask		( 76)(%rdi)
+#define dsWindow	( 80)(%rdi)
+#define dsPrev		( 96)(%rdi)
+#define dsMatchLen	(144)(%rdi)
+#define dsPrevMatch	(148)(%rdi)
+#define dsStrStart	(156)(%rdi)
+#define dsMatchStart	(160)(%rdi)
+#define dsLookahead	(164)(%rdi)
+#define dsPrevLen	(168)(%rdi)
+#define dsMaxChainLen	(172)(%rdi)
+#define dsGoodMatch	(188)(%rdi)
+#define dsNiceMatch	(192)(%rdi)
+
+#else 
+
+#ifndef STRUCT_OFFSET
+#	define STRUCT_OFFSET	(0)
+#endif
+
+
+#define dsWSize		( 56 + STRUCT_OFFSET)(%rdi)
+#define dsWMask		( 64 + STRUCT_OFFSET)(%rdi)
+#define dsWindow	( 72 + STRUCT_OFFSET)(%rdi)
+#define dsPrev		( 88 + STRUCT_OFFSET)(%rdi)
+#define dsMatchLen	(136 + STRUCT_OFFSET)(%rdi)
+#define dsPrevMatch	(140 + STRUCT_OFFSET)(%rdi)
+#define dsStrStart	(148 + STRUCT_OFFSET)(%rdi)
+#define dsMatchStart	(152 + STRUCT_OFFSET)(%rdi)
+#define dsLookahead	(156 + STRUCT_OFFSET)(%rdi)
+#define dsPrevLen	(160 + STRUCT_OFFSET)(%rdi)
+#define dsMaxChainLen	(164 + STRUCT_OFFSET)(%rdi)
+#define dsGoodMatch	(180 + STRUCT_OFFSET)(%rdi)
+#define dsNiceMatch	(184 + STRUCT_OFFSET)(%rdi)
+
+#endif
+
+
+
+
+.text
+
+/* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */
+
+longest_match:
+/*
+ * Retrieve the function arguments. %curmatch will hold cur_match
+ * throughout the entire function (passed via rsi on amd64).
+ * rdi will hold the pointer to the deflate_state (first arg on amd64)
+ */
+		mov     %rsi, save_rsi
+		mov     %rbx, save_rbx
+		mov	%r12, save_r12
+		mov     %r13, save_r13
+		mov     %r14, save_r14
+		mov     %r15, save_r15
+
+/* uInt wmask = s->w_mask;						*/
+/* unsigned chain_length = s->max_chain_length;				*/
+/* if (s->prev_length >= s->good_match) {				*/
+/*     chain_length >>= 2;						*/
+/* }									*/
+
+		movl	dsPrevLen, %eax
+		movl	dsGoodMatch, %ebx
+		cmpl	%ebx, %eax
+		movl	dsWMask, %eax
+		movl	dsMaxChainLen, %chainlenwmask
+		jl	LastMatchGood
+		shrl	$2, %chainlenwmask
+LastMatchGood:
+
+/* chainlen is decremented once beforehand so that the function can	*/
+/* use the sign flag instead of the zero flag for the exit test.	*/
+/* It is then shifted into the high word, to make room for the wmask	*/
+/* value, which it will always accompany.				*/
+
+		decl	%chainlenwmask
+		shll	$16, %chainlenwmask
+		orl	%eax, %chainlenwmask
+
+/* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;	*/
+
+		movl	dsNiceMatch, %eax
+		movl	dsLookahead, %ebx
+		cmpl	%eax, %ebx
+		jl	LookaheadLess
+		movl	%eax, %ebx
+LookaheadLess:	movl	%ebx, %nicematch
+
+/* register Bytef *scan = s->window + s->strstart;			*/
+
+		mov	dsWindow, %window
+		movl	dsStrStart, %limitd
+		lea	(%limit, %window), %scan
+
+/* Determine how many bytes the scan ptr is off from being		*/
+/* dword-aligned.							*/
+
+		mov	%scan, %scanalign
+		negl	%scanalignd
+		andl	$3, %scanalignd
+
+/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ?			*/
+/*     s->strstart - (IPos)MAX_DIST(s) : NIL;				*/
+
+		movl	dsWSize, %eax
+		subl	$MIN_LOOKAHEAD, %eax
+		xorl	%ecx, %ecx
+		subl	%eax, %limitd
+		cmovng	%ecx, %limitd
+
+/* int best_len = s->prev_length;					*/
+
+		movl	dsPrevLen, %bestlend
+
+/* Store the sum of s->window + best_len in %windowbestlen locally, and in memory.	*/
+
+		lea	(%window, %bestlen), %windowbestlen
+		mov	%windowbestlen, _windowbestlen
+
+/* register ush scan_start = *(ushf*)scan;				*/
+/* register ush scan_end   = *(ushf*)(scan+best_len-1);			*/
+/* Posf *prev = s->prev;						*/
+
+		movzwl	(%scan), %scanstart
+		movzwl	-1(%scan, %bestlen), %scanend
+		mov	dsPrev, %prev
+
+/* Jump into the main loop.						*/
+
+		movl	%chainlenwmask, _chainlenwmask
+		jmp	LoopEntry
+
+.balign 16
+
+/* do {
+ *     match = s->window + cur_match;
+ *     if (*(ushf*)(match+best_len-1) != scan_end ||
+ *         *(ushf*)match != scan_start) continue;
+ *     [...]
+ * } while ((cur_match = prev[cur_match & wmask]) > limit
+ *          && --chain_length != 0);
+ *
+ * Here is the inner loop of the function. The function will spend the
+ * majority of its time in this loop, and majority of that time will
+ * be spent in the first ten instructions.
+ */
+LookupLoop:
+		andl	%chainlenwmask, %curmatchd
+		movzwl	(%prev, %curmatch, 2), %curmatchd
+		cmpl	%limitd, %curmatchd
+		jbe	LeaveNow
+		subl	$0x00010000, %chainlenwmask
+		js	LeaveNow
+LoopEntry:	cmpw	-1(%windowbestlen, %curmatch), %scanendw
+		jne	LookupLoop
+		cmpw	%scanstartw, (%window, %curmatch)
+		jne	LookupLoop
+
+/* Store the current value of chainlen.					*/
+		movl	%chainlenwmask, _chainlenwmask
+
+/* %scan is the string under scrutiny, and %prev to the string we	*/
+/* are hoping to match it up with. In actuality, %esi and %edi are	*/
+/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is	*/
+/* initialized to -(MAX_MATCH_8 - scanalign).				*/
+
+		mov	$(-MAX_MATCH_8), %rdx
+		lea	(%curmatch, %window), %windowbestlen
+		lea	MAX_MATCH_8(%windowbestlen, %scanalign), %windowbestlen
+		lea	MAX_MATCH_8(%scan, %scanalign), %prev
+
+/* the prefetching below makes very little difference... */
+		prefetcht1	(%windowbestlen, %rdx)
+		prefetcht1	(%prev, %rdx)
+
+/*
+ * Test the strings for equality, 8 bytes at a time. At the end,
+ * adjust %rdx so that it is offset to the exact byte that mismatched.
+ *
+ * It should be confessed that this loop usually does not represent
+ * much of the total running time. Replacing it with a more
+ * straightforward "rep cmpsb" would not drastically degrade
+ * performance -- unrolling it, for example, makes no difference.
+ */
+
+#undef USE_SSE	/* works, but is 6-7% slower, than non-SSE... */
+
+LoopCmps:
+#ifdef USE_SSE
+		/* Preload the SSE registers */
+		movdqu	  (%windowbestlen, %rdx), %xmm1
+		movdqu	  (%prev, %rdx), %xmm2
+		pcmpeqb	%xmm2, %xmm1
+		movdqu	16(%windowbestlen, %rdx), %xmm3
+		movdqu	16(%prev, %rdx), %xmm4
+		pcmpeqb	%xmm4, %xmm3
+		movdqu	32(%windowbestlen, %rdx), %xmm5
+		movdqu	32(%prev, %rdx), %xmm6
+		pcmpeqb	%xmm6, %xmm5
+		movdqu	48(%windowbestlen, %rdx), %xmm7
+		movdqu	48(%prev, %rdx), %xmm8
+		pcmpeqb	%xmm8, %xmm7
+
+		/* Check the comparisions' results */
+		pmovmskb %xmm1, %rax
+		notw	%ax
+		bsfw	%ax, %ax
+		jnz	LeaveLoopCmps
+		
+		/* this is the only iteration of the loop with a possibility of having
+		   incremented rdx by 0x108 (each loop iteration add 16*4 = 0x40 
+		   and (0x40*4)+8=0x108 */
+		add	$8, %rdx
+		jz LenMaximum
+		add	$8, %rdx
+
+		
+		pmovmskb %xmm3, %rax
+		notw	%ax
+		bsfw	%ax, %ax
+		jnz	LeaveLoopCmps
+		
+		
+		add	$16, %rdx
+
+
+		pmovmskb %xmm5, %rax
+		notw	%ax
+		bsfw	%ax, %ax
+		jnz	LeaveLoopCmps
+		
+		add	$16, %rdx
+
+
+		pmovmskb %xmm7, %rax
+		notw	%ax
+		bsfw	%ax, %ax
+		jnz	LeaveLoopCmps
+		
+		add	$16, %rdx
+		
+		jmp	LoopCmps
+LeaveLoopCmps:	add	%rax, %rdx
+#else
+		mov	(%windowbestlen, %rdx), %rax
+		xor	(%prev, %rdx), %rax
+		jnz	LeaveLoopCmps
+		
+		mov	8(%windowbestlen, %rdx), %rax
+		xor	8(%prev, %rdx), %rax
+		jnz	LeaveLoopCmps8
+
+		mov	16(%windowbestlen, %rdx), %rax
+		xor	16(%prev, %rdx), %rax
+		jnz	LeaveLoopCmps16
+				
+		add	$24, %rdx
+		jnz	LoopCmps
+		jmp	LenMaximum
+#	if 0
+/*
+ * This three-liner is tantalizingly simple, but bsf is a slow instruction,
+ * and the complicated alternative down below is quite a bit faster. Sad...
+ */
+
+LeaveLoopCmps:	bsf	%rax, %rax /* find the first non-zero bit */
+		shrl	$3, %eax /* divide by 8 to get the byte */
+		add	%rax, %rdx
+#	else
+LeaveLoopCmps16:
+		add	$8, %rdx
+LeaveLoopCmps8:
+		add	$8, %rdx
+LeaveLoopCmps:	testl   $0xFFFFFFFF, %eax /* Check the first 4 bytes */
+		jnz     Check16
+		add     $4, %rdx
+		shr     $32, %rax
+Check16:        testw   $0xFFFF, %ax
+		jnz     LenLower
+		add	$2, %rdx
+		shrl	$16, %eax
+LenLower:	subb	$1, %al
+		adc	$0, %rdx
+#	endif
+#endif
+
+/* Calculate the length of the match. If it is longer than MAX_MATCH,	*/
+/* then automatically accept it as the best possible match and leave.	*/
+
+		lea	(%prev, %rdx), %rax
+		sub	%scan, %rax
+		cmpl	$MAX_MATCH, %eax
+		jge	LenMaximum
+
+/* If the length of the match is not longer than the best match we	*/
+/* have so far, then forget it and return to the lookup loop.		*/
+
+		cmpl	%bestlend, %eax
+		jg	LongerMatch
+		mov	_windowbestlen, %windowbestlen
+		mov	dsPrev, %prev
+		movl	_chainlenwmask, %edx
+		jmp	LookupLoop
+
+/*         s->match_start = cur_match;					*/
+/*         best_len = len;						*/
+/*         if (len >= nice_match) break;				*/
+/*         scan_end = *(ushf*)(scan+best_len-1);			*/
+
+LongerMatch:
+		movl	%eax, %bestlend
+		movl	%curmatchd, dsMatchStart
+		cmpl	%nicematch, %eax
+		jge	LeaveNow
+
+		lea	(%window, %bestlen), %windowbestlen
+		mov	%windowbestlen, _windowbestlen
+
+		movzwl	-1(%scan, %rax), %scanend
+		mov	dsPrev, %prev
+		movl	_chainlenwmask, %chainlenwmask
+		jmp	LookupLoop
+
+/* Accept the current string, with the maximum possible length.		*/
+
+LenMaximum:
+		movl	$MAX_MATCH, %bestlend
+		movl	%curmatchd, dsMatchStart
+
+/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len;		*/
+/* return s->lookahead;							*/
+
+LeaveNow:
+		movl	dsLookahead, %eax
+		cmpl	%eax, %bestlend
+		cmovngl	%bestlend, %eax
+LookaheadRet:
+
+/* Restore the registers and return from whence we came.			*/
+
+	mov	save_rsi, %rsi
+	mov	save_rbx, %rbx
+	mov	save_r12, %r12
+	mov	save_r13, %r13
+	mov	save_r14, %r14
+	mov	save_r15, %r15
+
+	ret
+
+match_init:	ret
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/asm686/README.686 b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/asm686/README.686
new file mode 100644
index 00000000..a0bf3bea
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/asm686/README.686
@@ -0,0 +1,51 @@
+This is a patched version of zlib, modified to use
+Pentium-Pro-optimized assembly code in the deflation algorithm. The
+files changed/added by this patch are:
+
+README.686
+match.S
+
+The speedup that this patch provides varies, depending on whether the
+compiler used to build the original version of zlib falls afoul of the
+PPro's speed traps. My own tests show a speedup of around 10-20% at
+the default compression level, and 20-30% using -9, against a version
+compiled using gcc 2.7.2.3. Your mileage may vary.
+
+Note that this code has been tailored for the PPro/PII in particular,
+and will not perform particuarly well on a Pentium.
+
+If you are using an assembler other than GNU as, you will have to
+translate match.S to use your assembler's syntax. (Have fun.)
+
+Brian Raiter
+breadbox@muppetlabs.com
+April, 1998
+
+
+Added for zlib 1.1.3:
+
+The patches come from
+http://www.muppetlabs.com/~breadbox/software/assembly.html
+
+To compile zlib with this asm file, copy match.S to the zlib directory
+then do:
+
+CFLAGS="-O3 -DASMV" ./configure
+make OBJA=match.o
+
+
+Update:
+
+I've been ignoring these assembly routines for years, believing that
+gcc's generated code had caught up with it sometime around gcc 2.95
+and the major rearchitecting of the Pentium 4. However, I recently
+learned that, despite what I believed, this code still has some life
+in it. On the Pentium 4 and AMD64 chips, it continues to run about 8%
+faster than the code produced by gcc 4.1.
+
+In acknowledgement of its continuing usefulness, I've altered the
+license to match that of the rest of zlib. Share and Enjoy!
+
+Brian Raiter
+breadbox@muppetlabs.com
+April, 2007
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/asm686/match.S b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/asm686/match.S
new file mode 100644
index 00000000..06817e1d
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/asm686/match.S
@@ -0,0 +1,343 @@
+/* match.S -- x86 assembly version of the zlib longest_match() function.
+ * Optimized for the Intel 686 chips (PPro and later).
+ *
+ * Copyright (C) 1998, 2007 Brian Raiter <breadbox@muppetlabs.com>
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty.  In no event will the author be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ *    claim that you wrote the original software. If you use this software
+ *    in a product, an acknowledgment in the product documentation would be
+ *    appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef NO_UNDERLINE
+#define	match_init	_match_init
+#define	longest_match	_longest_match
+#endif
+
+#define	MAX_MATCH	(258)
+#define	MIN_MATCH	(3)
+#define	MIN_LOOKAHEAD	(MAX_MATCH + MIN_MATCH + 1)
+#define	MAX_MATCH_8	((MAX_MATCH + 7) & ~7)
+
+/* stack frame offsets */
+
+#define	chainlenwmask		0	/* high word: current chain len	*/
+					/* low word: s->wmask		*/
+#define	window			4	/* local copy of s->window	*/
+#define	windowbestlen		8	/* s->window + bestlen		*/
+#define	scanstart		16	/* first two bytes of string	*/
+#define	scanend			12	/* last two bytes of string	*/
+#define	scanalign		20	/* dword-misalignment of string	*/
+#define	nicematch		24	/* a good enough match size	*/
+#define	bestlen			28	/* size of best match so far	*/
+#define	scan			32	/* ptr to string wanting match	*/
+
+#define	LocalVarsSize		(36)
+/*	saved ebx		36 */
+/*	saved edi		40 */
+/*	saved esi		44 */
+/*	saved ebp		48 */
+/*	return address		52 */
+#define	deflatestate		56	/* the function arguments	*/
+#define	curmatch		60
+
+/* All the +zlib1222add offsets are due to the addition of fields
+ *  in zlib in the deflate_state structure since the asm code was first written
+ * (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
+ * (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
+ * if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
+ */
+
+#define zlib1222add		(8)
+
+#define	dsWSize			(36+zlib1222add)
+#define	dsWMask			(44+zlib1222add)
+#define	dsWindow		(48+zlib1222add)
+#define	dsPrev			(56+zlib1222add)
+#define	dsMatchLen		(88+zlib1222add)
+#define	dsPrevMatch		(92+zlib1222add)
+#define	dsStrStart		(100+zlib1222add)
+#define	dsMatchStart		(104+zlib1222add)
+#define	dsLookahead		(108+zlib1222add)
+#define	dsPrevLen		(112+zlib1222add)
+#define	dsMaxChainLen		(116+zlib1222add)
+#define	dsGoodMatch		(132+zlib1222add)
+#define	dsNiceMatch		(136+zlib1222add)
+
+
+.file "match.S"
+
+.globl	match_init, longest_match
+
+.text
+
+/* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */
+
+longest_match:
+
+/* Save registers that the compiler may be using, and adjust %esp to	*/
+/* make room for our stack frame.					*/
+
+		pushl	%ebp
+		pushl	%edi
+		pushl	%esi
+		pushl	%ebx
+		subl	$LocalVarsSize, %esp
+
+/* Retrieve the function arguments. %ecx will hold cur_match		*/
+/* throughout the entire function. %edx will hold the pointer to the	*/
+/* deflate_state structure during the function's setup (before		*/
+/* entering the main loop).						*/
+
+		movl	deflatestate(%esp), %edx
+		movl	curmatch(%esp), %ecx
+
+/* uInt wmask = s->w_mask;						*/
+/* unsigned chain_length = s->max_chain_length;				*/
+/* if (s->prev_length >= s->good_match) {				*/
+/*     chain_length >>= 2;						*/
+/* }									*/
+
+		movl	dsPrevLen(%edx), %eax
+		movl	dsGoodMatch(%edx), %ebx
+		cmpl	%ebx, %eax
+		movl	dsWMask(%edx), %eax
+		movl	dsMaxChainLen(%edx), %ebx
+		jl	LastMatchGood
+		shrl	$2, %ebx
+LastMatchGood:
+
+/* chainlen is decremented once beforehand so that the function can	*/
+/* use the sign flag instead of the zero flag for the exit test.	*/
+/* It is then shifted into the high word, to make room for the wmask	*/
+/* value, which it will always accompany.				*/
+
+		decl	%ebx
+		shll	$16, %ebx
+		orl	%eax, %ebx
+		movl	%ebx, chainlenwmask(%esp)
+
+/* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;	*/
+
+		movl	dsNiceMatch(%edx), %eax
+		movl	dsLookahead(%edx), %ebx
+		cmpl	%eax, %ebx
+		jl	LookaheadLess
+		movl	%eax, %ebx
+LookaheadLess:	movl	%ebx, nicematch(%esp)
+
+/* register Bytef *scan = s->window + s->strstart;			*/
+
+		movl	dsWindow(%edx), %esi
+		movl	%esi, window(%esp)
+		movl	dsStrStart(%edx), %ebp
+		lea	(%esi,%ebp), %edi
+		movl	%edi, scan(%esp)
+
+/* Determine how many bytes the scan ptr is off from being		*/
+/* dword-aligned.							*/
+
+		movl	%edi, %eax
+		negl	%eax
+		andl	$3, %eax
+		movl	%eax, scanalign(%esp)
+
+/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ?			*/
+/*     s->strstart - (IPos)MAX_DIST(s) : NIL;				*/
+
+		movl	dsWSize(%edx), %eax
+		subl	$MIN_LOOKAHEAD, %eax
+		subl	%eax, %ebp
+		jg	LimitPositive
+		xorl	%ebp, %ebp
+LimitPositive:
+
+/* int best_len = s->prev_length;					*/
+
+		movl	dsPrevLen(%edx), %eax
+		movl	%eax, bestlen(%esp)
+
+/* Store the sum of s->window + best_len in %esi locally, and in %esi.	*/
+
+		addl	%eax, %esi
+		movl	%esi, windowbestlen(%esp)
+
+/* register ush scan_start = *(ushf*)scan;				*/
+/* register ush scan_end   = *(ushf*)(scan+best_len-1);			*/
+/* Posf *prev = s->prev;						*/
+
+		movzwl	(%edi), %ebx
+		movl	%ebx, scanstart(%esp)
+		movzwl	-1(%edi,%eax), %ebx
+		movl	%ebx, scanend(%esp)
+		movl	dsPrev(%edx), %edi
+
+/* Jump into the main loop.						*/
+
+		movl	chainlenwmask(%esp), %edx
+		jmp	LoopEntry
+
+.balign 16
+
+/* do {
+ *     match = s->window + cur_match;
+ *     if (*(ushf*)(match+best_len-1) != scan_end ||
+ *         *(ushf*)match != scan_start) continue;
+ *     [...]
+ * } while ((cur_match = prev[cur_match & wmask]) > limit
+ *          && --chain_length != 0);
+ *
+ * Here is the inner loop of the function. The function will spend the
+ * majority of its time in this loop, and majority of that time will
+ * be spent in the first ten instructions.
+ *
+ * Within this loop:
+ * %ebx = scanend
+ * %ecx = curmatch
+ * %edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
+ * %esi = windowbestlen - i.e., (window + bestlen)
+ * %edi = prev
+ * %ebp = limit
+ */
+LookupLoop:
+		andl	%edx, %ecx
+		movzwl	(%edi,%ecx,2), %ecx
+		cmpl	%ebp, %ecx
+		jbe	LeaveNow
+		subl	$0x00010000, %edx
+		js	LeaveNow
+LoopEntry:	movzwl	-1(%esi,%ecx), %eax
+		cmpl	%ebx, %eax
+		jnz	LookupLoop
+		movl	window(%esp), %eax
+		movzwl	(%eax,%ecx), %eax
+		cmpl	scanstart(%esp), %eax
+		jnz	LookupLoop
+
+/* Store the current value of chainlen.					*/
+
+		movl	%edx, chainlenwmask(%esp)
+
+/* Point %edi to the string under scrutiny, and %esi to the string we	*/
+/* are hoping to match it up with. In actuality, %esi and %edi are	*/
+/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is	*/
+/* initialized to -(MAX_MATCH_8 - scanalign).				*/
+
+		movl	window(%esp), %esi
+		movl	scan(%esp), %edi
+		addl	%ecx, %esi
+		movl	scanalign(%esp), %eax
+		movl	$(-MAX_MATCH_8), %edx
+		lea	MAX_MATCH_8(%edi,%eax), %edi
+		lea	MAX_MATCH_8(%esi,%eax), %esi
+
+/* Test the strings for equality, 8 bytes at a time. At the end,
+ * adjust %edx so that it is offset to the exact byte that mismatched.
+ *
+ * We already know at this point that the first three bytes of the
+ * strings match each other, and they can be safely passed over before
+ * starting the compare loop. So what this code does is skip over 0-3
+ * bytes, as much as necessary in order to dword-align the %edi
+ * pointer. (%esi will still be misaligned three times out of four.)
+ *
+ * It should be confessed that this loop usually does not represent
+ * much of the total running time. Replacing it with a more
+ * straightforward "rep cmpsb" would not drastically degrade
+ * performance.
+ */
+LoopCmps:
+		movl	(%esi,%edx), %eax
+		xorl	(%edi,%edx), %eax
+		jnz	LeaveLoopCmps
+		movl	4(%esi,%edx), %eax
+		xorl	4(%edi,%edx), %eax
+		jnz	LeaveLoopCmps4
+		addl	$8, %edx
+		jnz	LoopCmps
+		jmp	LenMaximum
+LeaveLoopCmps4:	addl	$4, %edx
+LeaveLoopCmps:	testl	$0x0000FFFF, %eax
+		jnz	LenLower
+		addl	$2, %edx
+		shrl	$16, %eax
+LenLower:	subb	$1, %al
+		adcl	$0, %edx
+
+/* Calculate the length of the match. If it is longer than MAX_MATCH,	*/
+/* then automatically accept it as the best possible match and leave.	*/
+
+		lea	(%edi,%edx), %eax
+		movl	scan(%esp), %edi
+		subl	%edi, %eax
+		cmpl	$MAX_MATCH, %eax
+		jge	LenMaximum
+
+/* If the length of the match is not longer than the best match we	*/
+/* have so far, then forget it and return to the lookup loop.		*/
+
+		movl	deflatestate(%esp), %edx
+		movl	bestlen(%esp), %ebx
+		cmpl	%ebx, %eax
+		jg	LongerMatch
+		movl	windowbestlen(%esp), %esi
+		movl	dsPrev(%edx), %edi
+		movl	scanend(%esp), %ebx
+		movl	chainlenwmask(%esp), %edx
+		jmp	LookupLoop
+
+/*         s->match_start = cur_match;					*/
+/*         best_len = len;						*/
+/*         if (len >= nice_match) break;				*/
+/*         scan_end = *(ushf*)(scan+best_len-1);			*/
+
+LongerMatch:	movl	nicematch(%esp), %ebx
+		movl	%eax, bestlen(%esp)
+		movl	%ecx, dsMatchStart(%edx)
+		cmpl	%ebx, %eax
+		jge	LeaveNow
+		movl	window(%esp), %esi
+		addl	%eax, %esi
+		movl	%esi, windowbestlen(%esp)
+		movzwl	-1(%edi,%eax), %ebx
+		movl	dsPrev(%edx), %edi
+		movl	%ebx, scanend(%esp)
+		movl	chainlenwmask(%esp), %edx
+		jmp	LookupLoop
+
+/* Accept the current string, with the maximum possible length.		*/
+
+LenMaximum:	movl	deflatestate(%esp), %edx
+		movl	$MAX_MATCH, bestlen(%esp)
+		movl	%ecx, dsMatchStart(%edx)
+
+/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len;		*/
+/* return s->lookahead;							*/
+
+LeaveNow:
+		movl	deflatestate(%esp), %edx
+		movl	bestlen(%esp), %ebx
+		movl	dsLookahead(%edx), %eax
+		cmpl	%eax, %ebx
+		jg	LookaheadRet
+		movl	%ebx, %eax
+LookaheadRet:
+
+/* Restore the stack and return from whence we came.			*/
+
+		addl	$LocalVarsSize, %esp
+		popl	%ebx
+		popl	%esi
+		popl	%edi
+		popl	%ebp
+match_init:	ret
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/Makefile b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/Makefile
new file mode 100644
index 00000000..9be80baf
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/Makefile
@@ -0,0 +1,8 @@
+blast: blast.c blast.h
+	cc -DTEST -o blast blast.c
+
+test: blast
+	blast < test.pk | cmp - test.txt
+
+clean:
+	rm -f blast blast.o
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/README b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/README
new file mode 100644
index 00000000..e3a60b3f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/README
@@ -0,0 +1,4 @@
+Read blast.h for purpose and usage.
+
+Mark Adler
+madler@alumni.caltech.edu
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/blast.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/blast.c
new file mode 100644
index 00000000..4ce697a4
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/blast.c
@@ -0,0 +1,444 @@
+/* blast.c
+ * Copyright (C) 2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in blast.h
+ * version 1.1, 16 Feb 2003
+ *
+ * blast.c decompresses data compressed by the PKWare Compression Library.
+ * This function provides functionality similar to the explode() function of
+ * the PKWare library, hence the name "blast".
+ *
+ * This decompressor is based on the excellent format description provided by
+ * Ben Rudiak-Gould in comp.compression on August 13, 2001.  Interestingly, the
+ * example Ben provided in the post is incorrect.  The distance 110001 should
+ * instead be 111000.  When corrected, the example byte stream becomes:
+ *
+ *    00 04 82 24 25 8f 80 7f
+ *
+ * which decompresses to "AIAIAIAIAIAIA" (without the quotes).
+ */
+
+/*
+ * Change history:
+ *
+ * 1.0  12 Feb 2003     - First version
+ * 1.1  16 Feb 2003     - Fixed distance check for > 4 GB uncompressed data
+ */
+
+#include <setjmp.h>             /* for setjmp(), longjmp(), and jmp_buf */
+#include "blast.h"              /* prototype for blast() */
+
+#define local static            /* for local function definitions */
+#define MAXBITS 13              /* maximum code length */
+#define MAXWIN 4096             /* maximum window size */
+
+/* input and output state */
+struct state {
+    /* input state */
+    blast_in infun;             /* input function provided by user */
+    void *inhow;                /* opaque information passed to infun() */
+    unsigned char *in;          /* next input location */
+    unsigned left;              /* available input at in */
+    int bitbuf;                 /* bit buffer */
+    int bitcnt;                 /* number of bits in bit buffer */
+
+    /* input limit error return state for bits() and decode() */
+    jmp_buf env;
+
+    /* output state */
+    blast_out outfun;           /* output function provided by user */
+    void *outhow;               /* opaque information passed to outfun() */
+    unsigned next;              /* index of next write location in out[] */
+    int first;                  /* true to check distances (for first 4K) */
+    unsigned char out[MAXWIN];  /* output buffer and sliding window */
+};
+
+/*
+ * Return need bits from the input stream.  This always leaves less than
+ * eight bits in the buffer.  bits() works properly for need == 0.
+ *
+ * Format notes:
+ *
+ * - Bits are stored in bytes from the least significant bit to the most
+ *   significant bit.  Therefore bits are dropped from the bottom of the bit
+ *   buffer, using shift right, and new bytes are appended to the top of the
+ *   bit buffer, using shift left.
+ */
+local int bits(struct state *s, int need)
+{
+    int val;            /* bit accumulator */
+
+    /* load at least need bits into val */
+    val = s->bitbuf;
+    while (s->bitcnt < need) {
+        if (s->left == 0) {
+            s->left = s->infun(s->inhow, &(s->in));
+            if (s->left == 0) longjmp(s->env, 1);       /* out of input */
+        }
+        val |= (int)(*(s->in)++) << s->bitcnt;          /* load eight bits */
+        s->left--;
+        s->bitcnt += 8;
+    }
+
+    /* drop need bits and update buffer, always zero to seven bits left */
+    s->bitbuf = val >> need;
+    s->bitcnt -= need;
+
+    /* return need bits, zeroing the bits above that */
+    return val & ((1 << need) - 1);
+}
+
+/*
+ * Huffman code decoding tables.  count[1..MAXBITS] is the number of symbols of
+ * each length, which for a canonical code are stepped through in order.
+ * symbol[] are the symbol values in canonical order, where the number of
+ * entries is the sum of the counts in count[].  The decoding process can be
+ * seen in the function decode() below.
+ */
+struct huffman {
+    short *count;       /* number of symbols of each length */
+    short *symbol;      /* canonically ordered symbols */
+};
+
+/*
+ * Decode a code from the stream s using huffman table h.  Return the symbol or
+ * a negative value if there is an error.  If all of the lengths are zero, i.e.
+ * an empty code, or if the code is incomplete and an invalid code is received,
+ * then -9 is returned after reading MAXBITS bits.
+ *
+ * Format notes:
+ *
+ * - The codes as stored in the compressed data are bit-reversed relative to
+ *   a simple integer ordering of codes of the same lengths.  Hence below the
+ *   bits are pulled from the compressed data one at a time and used to
+ *   build the code value reversed from what is in the stream in order to
+ *   permit simple integer comparisons for decoding.
+ *
+ * - The first code for the shortest length is all ones.  Subsequent codes of
+ *   the same length are simply integer decrements of the previous code.  When
+ *   moving up a length, a one bit is appended to the code.  For a complete
+ *   code, the last code of the longest length will be all zeros.  To support
+ *   this ordering, the bits pulled during decoding are inverted to apply the
+ *   more "natural" ordering starting with all zeros and incrementing.
+ */
+local int decode(struct state *s, struct huffman *h)
+{
+    int len;            /* current number of bits in code */
+    int code;           /* len bits being decoded */
+    int first;          /* first code of length len */
+    int count;          /* number of codes of length len */
+    int index;          /* index of first code of length len in symbol table */
+    int bitbuf;         /* bits from stream */
+    int left;           /* bits left in next or left to process */
+    short *next;        /* next number of codes */
+
+    bitbuf = s->bitbuf;
+    left = s->bitcnt;
+    code = first = index = 0;
+    len = 1;
+    next = h->count + 1;
+    while (1) {
+        while (left--) {
+            code |= (bitbuf & 1) ^ 1;   /* invert code */
+            bitbuf >>= 1;
+            count = *next++;
+            if (code < first + count) { /* if length len, return symbol */
+                s->bitbuf = bitbuf;
+                s->bitcnt = (s->bitcnt - len) & 7;
+                return h->symbol[index + (code - first)];
+            }
+            index += count;             /* else update for next length */
+            first += count;
+            first <<= 1;
+            code <<= 1;
+            len++;
+        }
+        left = (MAXBITS+1) - len;
+        if (left == 0) break;
+        if (s->left == 0) {
+            s->left = s->infun(s->inhow, &(s->in));
+            if (s->left == 0) longjmp(s->env, 1);       /* out of input */
+        }
+        bitbuf = *(s->in)++;
+        s->left--;
+        if (left > 8) left = 8;
+    }
+    return -9;                          /* ran out of codes */
+}
+
+/*
+ * Given a list of repeated code lengths rep[0..n-1], where each byte is a
+ * count (high four bits + 1) and a code length (low four bits), generate the
+ * list of code lengths.  This compaction reduces the size of the object code.
+ * Then given the list of code lengths length[0..n-1] representing a canonical
+ * Huffman code for n symbols, construct the tables required to decode those
+ * codes.  Those tables are the number of codes of each length, and the symbols
+ * sorted by length, retaining their original order within each length.  The
+ * return value is zero for a complete code set, negative for an over-
+ * subscribed code set, and positive for an incomplete code set.  The tables
+ * can be used if the return value is zero or positive, but they cannot be used
+ * if the return value is negative.  If the return value is zero, it is not
+ * possible for decode() using that table to return an error--any stream of
+ * enough bits will resolve to a symbol.  If the return value is positive, then
+ * it is possible for decode() using that table to return an error for received
+ * codes past the end of the incomplete lengths.
+ */
+local int construct(struct huffman *h, const unsigned char *rep, int n)
+{
+    int symbol;         /* current symbol when stepping through length[] */
+    int len;            /* current length when stepping through h->count[] */
+    int left;           /* number of possible codes left of current length */
+    short offs[MAXBITS+1];      /* offsets in symbol table for each length */
+    short length[256];  /* code lengths */
+
+    /* convert compact repeat counts into symbol bit length list */
+    symbol = 0;
+    do {
+        len = *rep++;
+        left = (len >> 4) + 1;
+        len &= 15;
+        do {
+            length[symbol++] = len;
+        } while (--left);
+    } while (--n);
+    n = symbol;
+
+    /* count number of codes of each length */
+    for (len = 0; len <= MAXBITS; len++)
+        h->count[len] = 0;
+    for (symbol = 0; symbol < n; symbol++)
+        (h->count[length[symbol]])++;   /* assumes lengths are within bounds */
+    if (h->count[0] == n)               /* no codes! */
+        return 0;                       /* complete, but decode() will fail */
+
+    /* check for an over-subscribed or incomplete set of lengths */
+    left = 1;                           /* one possible code of zero length */
+    for (len = 1; len <= MAXBITS; len++) {
+        left <<= 1;                     /* one more bit, double codes left */
+        left -= h->count[len];          /* deduct count from possible codes */
+        if (left < 0) return left;      /* over-subscribed--return negative */
+    }                                   /* left > 0 means incomplete */
+
+    /* generate offsets into symbol table for each length for sorting */
+    offs[1] = 0;
+    for (len = 1; len < MAXBITS; len++)
+        offs[len + 1] = offs[len] + h->count[len];
+
+    /*
+     * put symbols in table sorted by length, by symbol order within each
+     * length
+     */
+    for (symbol = 0; symbol < n; symbol++)
+        if (length[symbol] != 0)
+            h->symbol[offs[length[symbol]]++] = symbol;
+
+    /* return zero for complete set, positive for incomplete set */
+    return left;
+}
+
+/*
+ * Decode PKWare Compression Library stream.
+ *
+ * Format notes:
+ *
+ * - First byte is 0 if literals are uncoded or 1 if they are coded.  Second
+ *   byte is 4, 5, or 6 for the number of extra bits in the distance code.
+ *   This is the base-2 logarithm of the dictionary size minus six.
+ *
+ * - Compressed data is a combination of literals and length/distance pairs
+ *   terminated by an end code.  Literals are either Huffman coded or
+ *   uncoded bytes.  A length/distance pair is a coded length followed by a
+ *   coded distance to represent a string that occurs earlier in the
+ *   uncompressed data that occurs again at the current location.
+ *
+ * - A bit preceding a literal or length/distance pair indicates which comes
+ *   next, 0 for literals, 1 for length/distance.
+ *
+ * - If literals are uncoded, then the next eight bits are the literal, in the
+ *   normal bit order in th stream, i.e. no bit-reversal is needed. Similarly,
+ *   no bit reversal is needed for either the length extra bits or the distance
+ *   extra bits.
+ *
+ * - Literal bytes are simply written to the output.  A length/distance pair is
+ *   an instruction to copy previously uncompressed bytes to the output.  The
+ *   copy is from distance bytes back in the output stream, copying for length
+ *   bytes.
+ *
+ * - Distances pointing before the beginning of the output data are not
+ *   permitted.
+ *
+ * - Overlapped copies, where the length is greater than the distance, are
+ *   allowed and common.  For example, a distance of one and a length of 518
+ *   simply copies the last byte 518 times.  A distance of four and a length of
+ *   twelve copies the last four bytes three times.  A simple forward copy
+ *   ignoring whether the length is greater than the distance or not implements
+ *   this correctly.
+ */
+local int decomp(struct state *s)
+{
+    int lit;            /* true if literals are coded */
+    int dict;           /* log2(dictionary size) - 6 */
+    int symbol;         /* decoded symbol, extra bits for distance */
+    int len;            /* length for copy */
+    int dist;           /* distance for copy */
+    int copy;           /* copy counter */
+    unsigned char *from, *to;   /* copy pointers */
+    static int virgin = 1;                              /* build tables once */
+    static short litcnt[MAXBITS+1], litsym[256];        /* litcode memory */
+    static short lencnt[MAXBITS+1], lensym[16];         /* lencode memory */
+    static short distcnt[MAXBITS+1], distsym[64];       /* distcode memory */
+    static struct huffman litcode = {litcnt, litsym};   /* length code */
+    static struct huffman lencode = {lencnt, lensym};   /* length code */
+    static struct huffman distcode = {distcnt, distsym};/* distance code */
+        /* bit lengths of literal codes */
+    static const unsigned char litlen[] = {
+        11, 124, 8, 7, 28, 7, 188, 13, 76, 4, 10, 8, 12, 10, 12, 10, 8, 23, 8,
+        9, 7, 6, 7, 8, 7, 6, 55, 8, 23, 24, 12, 11, 7, 9, 11, 12, 6, 7, 22, 5,
+        7, 24, 6, 11, 9, 6, 7, 22, 7, 11, 38, 7, 9, 8, 25, 11, 8, 11, 9, 12,
+        8, 12, 5, 38, 5, 38, 5, 11, 7, 5, 6, 21, 6, 10, 53, 8, 7, 24, 10, 27,
+        44, 253, 253, 253, 252, 252, 252, 13, 12, 45, 12, 45, 12, 61, 12, 45,
+        44, 173};
+        /* bit lengths of length codes 0..15 */
+    static const unsigned char lenlen[] = {2, 35, 36, 53, 38, 23};
+        /* bit lengths of distance codes 0..63 */
+    static const unsigned char distlen[] = {2, 20, 53, 230, 247, 151, 248};
+    static const short base[16] = {     /* base for length codes */
+        3, 2, 4, 5, 6, 7, 8, 9, 10, 12, 16, 24, 40, 72, 136, 264};
+    static const char extra[16] = {     /* extra bits for length codes */
+        0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8};
+
+    /* set up decoding tables (once--might not be thread-safe) */
+    if (virgin) {
+        construct(&litcode, litlen, sizeof(litlen));
+        construct(&lencode, lenlen, sizeof(lenlen));
+        construct(&distcode, distlen, sizeof(distlen));
+        virgin = 0;
+    }
+
+    /* read header */
+    lit = bits(s, 8);
+    if (lit > 1) return -1;
+    dict = bits(s, 8);
+    if (dict < 4 || dict > 6) return -2;
+
+    /* decode literals and length/distance pairs */
+    do {
+        if (bits(s, 1)) {
+            /* get length */
+            symbol = decode(s, &lencode);
+            len = base[symbol] + bits(s, extra[symbol]);
+            if (len == 519) break;              /* end code */
+
+            /* get distance */
+            symbol = len == 2 ? 2 : dict;
+            dist = decode(s, &distcode) << symbol;
+            dist += bits(s, symbol);
+            dist++;
+            if (s->first && dist > s->next)
+                return -3;              /* distance too far back */
+
+            /* copy length bytes from distance bytes back */
+            do {
+                to = s->out + s->next;
+                from = to - dist;
+                copy = MAXWIN;
+                if (s->next < dist) {
+                    from += copy;
+                    copy = dist;
+                }
+                copy -= s->next;
+                if (copy > len) copy = len;
+                len -= copy;
+                s->next += copy;
+                do {
+                    *to++ = *from++;
+                } while (--copy);
+                if (s->next == MAXWIN) {
+                    if (s->outfun(s->outhow, s->out, s->next)) return 1;
+                    s->next = 0;
+                    s->first = 0;
+                }
+            } while (len != 0);
+        }
+        else {
+            /* get literal and write it */
+            symbol = lit ? decode(s, &litcode) : bits(s, 8);
+            s->out[s->next++] = symbol;
+            if (s->next == MAXWIN) {
+                if (s->outfun(s->outhow, s->out, s->next)) return 1;
+                s->next = 0;
+                s->first = 0;
+            }
+        }
+    } while (1);
+    return 0;
+}
+
+/* See comments in blast.h */
+int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow)
+{
+    struct state s;             /* input/output state */
+    int err;                    /* return value */
+
+    /* initialize input state */
+    s.infun = infun;
+    s.inhow = inhow;
+    s.left = 0;
+    s.bitbuf = 0;
+    s.bitcnt = 0;
+
+    /* initialize output state */
+    s.outfun = outfun;
+    s.outhow = outhow;
+    s.next = 0;
+    s.first = 1;
+
+    /* return if bits() or decode() tries to read past available input */
+    if (setjmp(s.env) != 0)             /* if came back here via longjmp(), */
+        err = 2;                        /*  then skip decomp(), return error */
+    else
+        err = decomp(&s);               /* decompress */
+
+    /* write any leftover output and update the error code if needed */
+    if (err != 1 && s.next && s.outfun(s.outhow, s.out, s.next) && err == 0)
+        err = 1;
+    return err;
+}
+
+#ifdef TEST
+/* Example of how to use blast() */
+#include <stdio.h>
+#include <stdlib.h>
+
+#define CHUNK 16384
+
+local unsigned inf(void *how, unsigned char **buf)
+{
+    static unsigned char hold[CHUNK];
+
+    *buf = hold;
+    return fread(hold, 1, CHUNK, (FILE *)how);
+}
+
+local int outf(void *how, unsigned char *buf, unsigned len)
+{
+    return fwrite(buf, 1, len, (FILE *)how) != len;
+}
+
+/* Decompress a PKWare Compression Library stream from stdin to stdout */
+int main(void)
+{
+    int ret, n;
+
+    /* decompress to stdout */
+    ret = blast(inf, stdin, outf, stdout);
+    if (ret != 0) fprintf(stderr, "blast error: %d\n", ret);
+
+    /* see if there are any leftover bytes */
+    n = 0;
+    while (getchar() != EOF) n++;
+    if (n) fprintf(stderr, "blast warning: %d unused bytes of input\n", n);
+
+    /* return blast() error code */
+    return ret;
+}
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/blast.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/blast.h
new file mode 100644
index 00000000..ce9e5410
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/blast.h
@@ -0,0 +1,71 @@
+/* blast.h -- interface for blast.c
+  Copyright (C) 2003 Mark Adler
+  version 1.1, 16 Feb 2003
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the author be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Mark Adler    madler@alumni.caltech.edu
+ */
+
+
+/*
+ * blast() decompresses the PKWare Data Compression Library (DCL) compressed
+ * format.  It provides the same functionality as the explode() function in
+ * that library.  (Note: PKWare overused the "implode" verb, and the format
+ * used by their library implode() function is completely different and
+ * incompatible with the implode compression method supported by PKZIP.)
+ */
+
+
+typedef unsigned (*blast_in)(void *how, unsigned char **buf);
+typedef int (*blast_out)(void *how, unsigned char *buf, unsigned len);
+/* Definitions for input/output functions passed to blast().  See below for
+ * what the provided functions need to do.
+ */
+
+
+int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow);
+/* Decompress input to output using the provided infun() and outfun() calls.
+ * On success, the return value of blast() is zero.  If there is an error in
+ * the source data, i.e. it is not in the proper format, then a negative value
+ * is returned.  If there is not enough input available or there is not enough
+ * output space, then a positive error is returned.
+ *
+ * The input function is invoked: len = infun(how, &buf), where buf is set by
+ * infun() to point to the input buffer, and infun() returns the number of
+ * available bytes there.  If infun() returns zero, then blast() returns with
+ * an input error.  (blast() only asks for input if it needs it.)  inhow is for
+ * use by the application to pass an input descriptor to infun(), if desired.
+ *
+ * The output function is invoked: err = outfun(how, buf, len), where the bytes
+ * to be written are buf[0..len-1].  If err is not zero, then blast() returns
+ * with an output error.  outfun() is always called with len <= 4096.  outhow
+ * is for use by the application to pass an output descriptor to outfun(), if
+ * desired.
+ *
+ * The return codes are:
+ *
+ *   2:  ran out of input before completing decompression
+ *   1:  output error before completing decompression
+ *   0:  successful decompression
+ *  -1:  literal flag not zero or one
+ *  -2:  dictionary size not in 4..6
+ *  -3:  distance is too far back
+ *
+ * At the bottom of blast.c is an example program that uses blast() that can be
+ * compiled to produce a command-line decompression filter by defining TEST.
+ */
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/test.pk b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/test.pk
new file mode 100644
index 00000000..be10b2bb
Binary files /dev/null and b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/test.pk differ
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/test.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/test.txt
new file mode 100644
index 00000000..bfdf1c5d
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/blast/test.txt
@@ -0,0 +1 @@
+AIAIAIAIAIAIA
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/delphi/ZLib.pas b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/delphi/ZLib.pas
new file mode 100644
index 00000000..0d86fb52
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/delphi/ZLib.pas
@@ -0,0 +1,557 @@
+{*******************************************************}
+{                                                       }
+{       Borland Delphi Supplemental Components          }
+{       ZLIB Data Compression Interface Unit            }
+{                                                       }
+{       Copyright (c) 1997,99 Borland Corporation       }
+{                                                       }
+{*******************************************************}
+
+{ Updated for zlib 1.2.x by Cosmin Truta <cosmint@cs.ubbcluj.ro> }
+
+unit ZLib;
+
+interface
+
+uses SysUtils, Classes;
+
+type
+  TAlloc = function (AppData: Pointer; Items, Size: Integer): Pointer; cdecl;
+  TFree = procedure (AppData, Block: Pointer); cdecl;
+
+  // Internal structure.  Ignore.
+  TZStreamRec = packed record
+    next_in: PChar;       // next input byte
+    avail_in: Integer;    // number of bytes available at next_in
+    total_in: Longint;    // total nb of input bytes read so far
+
+    next_out: PChar;      // next output byte should be put here
+    avail_out: Integer;   // remaining free space at next_out
+    total_out: Longint;   // total nb of bytes output so far
+
+    msg: PChar;           // last error message, NULL if no error
+    internal: Pointer;    // not visible by applications
+
+    zalloc: TAlloc;       // used to allocate the internal state
+    zfree: TFree;         // used to free the internal state
+    AppData: Pointer;     // private data object passed to zalloc and zfree
+
+    data_type: Integer;   // best guess about the data type: ascii or binary
+    adler: Longint;       // adler32 value of the uncompressed data
+    reserved: Longint;    // reserved for future use
+  end;
+
+  // Abstract ancestor class
+  TCustomZlibStream = class(TStream)
+  private
+    FStrm: TStream;
+    FStrmPos: Integer;
+    FOnProgress: TNotifyEvent;
+    FZRec: TZStreamRec;
+    FBuffer: array [Word] of Char;
+  protected
+    procedure Progress(Sender: TObject); dynamic;
+    property OnProgress: TNotifyEvent read FOnProgress write FOnProgress;
+    constructor Create(Strm: TStream);
+  end;
+
+{ TCompressionStream compresses data on the fly as data is written to it, and
+  stores the compressed data to another stream.
+
+  TCompressionStream is write-only and strictly sequential. Reading from the
+  stream will raise an exception. Using Seek to move the stream pointer
+  will raise an exception.
+
+  Output data is cached internally, written to the output stream only when
+  the internal output buffer is full.  All pending output data is flushed
+  when the stream is destroyed.
+
+  The Position property returns the number of uncompressed bytes of
+  data that have been written to the stream so far.
+
+  CompressionRate returns the on-the-fly percentage by which the original
+  data has been compressed:  (1 - (CompressedBytes / UncompressedBytes)) * 100
+  If raw data size = 100 and compressed data size = 25, the CompressionRate
+  is 75%
+
+  The OnProgress event is called each time the output buffer is filled and
+  written to the output stream.  This is useful for updating a progress
+  indicator when you are writing a large chunk of data to the compression
+  stream in a single call.}
+
+
+  TCompressionLevel = (clNone, clFastest, clDefault, clMax);
+
+  TCompressionStream = class(TCustomZlibStream)
+  private
+    function GetCompressionRate: Single;
+  public
+    constructor Create(CompressionLevel: TCompressionLevel; Dest: TStream);
+    destructor Destroy; override;
+    function Read(var Buffer; Count: Longint): Longint; override;
+    function Write(const Buffer; Count: Longint): Longint; override;
+    function Seek(Offset: Longint; Origin: Word): Longint; override;
+    property CompressionRate: Single read GetCompressionRate;
+    property OnProgress;
+  end;
+
+{ TDecompressionStream decompresses data on the fly as data is read from it.
+
+  Compressed data comes from a separate source stream.  TDecompressionStream
+  is read-only and unidirectional; you can seek forward in the stream, but not
+  backwards.  The special case of setting the stream position to zero is
+  allowed.  Seeking forward decompresses data until the requested position in
+  the uncompressed data has been reached.  Seeking backwards, seeking relative
+  to the end of the stream, requesting the size of the stream, and writing to
+  the stream will raise an exception.
+
+  The Position property returns the number of bytes of uncompressed data that
+  have been read from the stream so far.
+
+  The OnProgress event is called each time the internal input buffer of
+  compressed data is exhausted and the next block is read from the input stream.
+  This is useful for updating a progress indicator when you are reading a
+  large chunk of data from the decompression stream in a single call.}
+
+  TDecompressionStream = class(TCustomZlibStream)
+  public
+    constructor Create(Source: TStream);
+    destructor Destroy; override;
+    function Read(var Buffer; Count: Longint): Longint; override;
+    function Write(const Buffer; Count: Longint): Longint; override;
+    function Seek(Offset: Longint; Origin: Word): Longint; override;
+    property OnProgress;
+  end;
+
+
+
+{ CompressBuf compresses data, buffer to buffer, in one call.
+   In: InBuf = ptr to compressed data
+       InBytes = number of bytes in InBuf
+  Out: OutBuf = ptr to newly allocated buffer containing decompressed data
+       OutBytes = number of bytes in OutBuf   }
+procedure CompressBuf(const InBuf: Pointer; InBytes: Integer;
+                      out OutBuf: Pointer; out OutBytes: Integer);
+
+
+{ DecompressBuf decompresses data, buffer to buffer, in one call.
+   In: InBuf = ptr to compressed data
+       InBytes = number of bytes in InBuf
+       OutEstimate = zero, or est. size of the decompressed data
+  Out: OutBuf = ptr to newly allocated buffer containing decompressed data
+       OutBytes = number of bytes in OutBuf   }
+procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer;
+ OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer);
+
+{ DecompressToUserBuf decompresses data, buffer to buffer, in one call.
+   In: InBuf = ptr to compressed data
+       InBytes = number of bytes in InBuf
+  Out: OutBuf = ptr to user-allocated buffer to contain decompressed data
+       BufSize = number of bytes in OutBuf   }
+procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
+  const OutBuf: Pointer; BufSize: Integer);
+
+const
+  zlib_version = '1.2.5';
+
+type
+  EZlibError = class(Exception);
+  ECompressionError = class(EZlibError);
+  EDecompressionError = class(EZlibError);
+
+implementation
+
+uses ZLibConst;
+
+const
+  Z_NO_FLUSH      = 0;
+  Z_PARTIAL_FLUSH = 1;
+  Z_SYNC_FLUSH    = 2;
+  Z_FULL_FLUSH    = 3;
+  Z_FINISH        = 4;
+
+  Z_OK            = 0;
+  Z_STREAM_END    = 1;
+  Z_NEED_DICT     = 2;
+  Z_ERRNO         = (-1);
+  Z_STREAM_ERROR  = (-2);
+  Z_DATA_ERROR    = (-3);
+  Z_MEM_ERROR     = (-4);
+  Z_BUF_ERROR     = (-5);
+  Z_VERSION_ERROR = (-6);
+
+  Z_NO_COMPRESSION       =   0;
+  Z_BEST_SPEED           =   1;
+  Z_BEST_COMPRESSION     =   9;
+  Z_DEFAULT_COMPRESSION  = (-1);
+
+  Z_FILTERED            = 1;
+  Z_HUFFMAN_ONLY        = 2;
+  Z_RLE                 = 3;
+  Z_DEFAULT_STRATEGY    = 0;
+
+  Z_BINARY   = 0;
+  Z_ASCII    = 1;
+  Z_UNKNOWN  = 2;
+
+  Z_DEFLATED = 8;
+
+
+{$L adler32.obj}
+{$L compress.obj}
+{$L crc32.obj}
+{$L deflate.obj}
+{$L infback.obj}
+{$L inffast.obj}
+{$L inflate.obj}
+{$L inftrees.obj}
+{$L trees.obj}
+{$L uncompr.obj}
+{$L zutil.obj}
+
+procedure adler32; external;
+procedure compressBound; external;
+procedure crc32; external;
+procedure deflateInit2_; external;
+procedure deflateParams; external;
+
+function _malloc(Size: Integer): Pointer; cdecl;
+begin
+  Result := AllocMem(Size);
+end;
+
+procedure _free(Block: Pointer); cdecl;
+begin
+  FreeMem(Block);
+end;
+
+procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl;
+begin
+  FillChar(P^, count, B);
+end;
+
+procedure _memcpy(dest, source: Pointer; count: Integer); cdecl;
+begin
+  Move(source^, dest^, count);
+end;
+
+
+
+// deflate compresses data
+function deflateInit_(var strm: TZStreamRec; level: Integer; version: PChar;
+  recsize: Integer): Integer; external;
+function deflate(var strm: TZStreamRec; flush: Integer): Integer; external;
+function deflateEnd(var strm: TZStreamRec): Integer; external;
+
+// inflate decompresses data
+function inflateInit_(var strm: TZStreamRec; version: PChar;
+  recsize: Integer): Integer; external;
+function inflate(var strm: TZStreamRec; flush: Integer): Integer; external;
+function inflateEnd(var strm: TZStreamRec): Integer; external;
+function inflateReset(var strm: TZStreamRec): Integer; external;
+
+
+function zlibAllocMem(AppData: Pointer; Items, Size: Integer): Pointer; cdecl;
+begin
+//  GetMem(Result, Items*Size);
+  Result := AllocMem(Items * Size);
+end;
+
+procedure zlibFreeMem(AppData, Block: Pointer); cdecl;
+begin
+  FreeMem(Block);
+end;
+
+{function zlibCheck(code: Integer): Integer;
+begin
+  Result := code;
+  if code < 0 then
+    raise EZlibError.Create('error');    //!!
+end;}
+
+function CCheck(code: Integer): Integer;
+begin
+  Result := code;
+  if code < 0 then
+    raise ECompressionError.Create('error'); //!!
+end;
+
+function DCheck(code: Integer): Integer;
+begin
+  Result := code;
+  if code < 0 then
+    raise EDecompressionError.Create('error');  //!!
+end;
+
+procedure CompressBuf(const InBuf: Pointer; InBytes: Integer;
+                      out OutBuf: Pointer; out OutBytes: Integer);
+var
+  strm: TZStreamRec;
+  P: Pointer;
+begin
+  FillChar(strm, sizeof(strm), 0);
+  strm.zalloc := zlibAllocMem;
+  strm.zfree := zlibFreeMem;
+  OutBytes := ((InBytes + (InBytes div 10) + 12) + 255) and not 255;
+  GetMem(OutBuf, OutBytes);
+  try
+    strm.next_in := InBuf;
+    strm.avail_in := InBytes;
+    strm.next_out := OutBuf;
+    strm.avail_out := OutBytes;
+    CCheck(deflateInit_(strm, Z_BEST_COMPRESSION, zlib_version, sizeof(strm)));
+    try
+      while CCheck(deflate(strm, Z_FINISH)) <> Z_STREAM_END do
+      begin
+        P := OutBuf;
+        Inc(OutBytes, 256);
+        ReallocMem(OutBuf, OutBytes);
+        strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P)));
+        strm.avail_out := 256;
+      end;
+    finally
+      CCheck(deflateEnd(strm));
+    end;
+    ReallocMem(OutBuf, strm.total_out);
+    OutBytes := strm.total_out;
+  except
+    FreeMem(OutBuf);
+    raise
+  end;
+end;
+
+
+procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer;
+  OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer);
+var
+  strm: TZStreamRec;
+  P: Pointer;
+  BufInc: Integer;
+begin
+  FillChar(strm, sizeof(strm), 0);
+  strm.zalloc := zlibAllocMem;
+  strm.zfree := zlibFreeMem;
+  BufInc := (InBytes + 255) and not 255;
+  if OutEstimate = 0 then
+    OutBytes := BufInc
+  else
+    OutBytes := OutEstimate;
+  GetMem(OutBuf, OutBytes);
+  try
+    strm.next_in := InBuf;
+    strm.avail_in := InBytes;
+    strm.next_out := OutBuf;
+    strm.avail_out := OutBytes;
+    DCheck(inflateInit_(strm, zlib_version, sizeof(strm)));
+    try
+      while DCheck(inflate(strm, Z_NO_FLUSH)) <> Z_STREAM_END do
+      begin
+        P := OutBuf;
+        Inc(OutBytes, BufInc);
+        ReallocMem(OutBuf, OutBytes);
+        strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P)));
+        strm.avail_out := BufInc;
+      end;
+    finally
+      DCheck(inflateEnd(strm));
+    end;
+    ReallocMem(OutBuf, strm.total_out);
+    OutBytes := strm.total_out;
+  except
+    FreeMem(OutBuf);
+    raise
+  end;
+end;
+
+procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
+  const OutBuf: Pointer; BufSize: Integer);
+var
+  strm: TZStreamRec;
+begin
+  FillChar(strm, sizeof(strm), 0);
+  strm.zalloc := zlibAllocMem;
+  strm.zfree := zlibFreeMem;
+  strm.next_in := InBuf;
+  strm.avail_in := InBytes;
+  strm.next_out := OutBuf;
+  strm.avail_out := BufSize;
+  DCheck(inflateInit_(strm, zlib_version, sizeof(strm)));
+  try
+    if DCheck(inflate(strm, Z_FINISH)) <> Z_STREAM_END then
+      raise EZlibError.CreateRes(@sTargetBufferTooSmall);
+  finally
+    DCheck(inflateEnd(strm));
+  end;
+end;
+
+// TCustomZlibStream
+
+constructor TCustomZLibStream.Create(Strm: TStream);
+begin
+  inherited Create;
+  FStrm := Strm;
+  FStrmPos := Strm.Position;
+  FZRec.zalloc := zlibAllocMem;
+  FZRec.zfree := zlibFreeMem;
+end;
+
+procedure TCustomZLibStream.Progress(Sender: TObject);
+begin
+  if Assigned(FOnProgress) then FOnProgress(Sender);
+end;
+
+
+// TCompressionStream
+
+constructor TCompressionStream.Create(CompressionLevel: TCompressionLevel;
+  Dest: TStream);
+const
+  Levels: array [TCompressionLevel] of ShortInt =
+    (Z_NO_COMPRESSION, Z_BEST_SPEED, Z_DEFAULT_COMPRESSION, Z_BEST_COMPRESSION);
+begin
+  inherited Create(Dest);
+  FZRec.next_out := FBuffer;
+  FZRec.avail_out := sizeof(FBuffer);
+  CCheck(deflateInit_(FZRec, Levels[CompressionLevel], zlib_version, sizeof(FZRec)));
+end;
+
+destructor TCompressionStream.Destroy;
+begin
+  FZRec.next_in := nil;
+  FZRec.avail_in := 0;
+  try
+    if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
+    while (CCheck(deflate(FZRec, Z_FINISH)) <> Z_STREAM_END)
+      and (FZRec.avail_out = 0) do
+    begin
+      FStrm.WriteBuffer(FBuffer, sizeof(FBuffer));
+      FZRec.next_out := FBuffer;
+      FZRec.avail_out := sizeof(FBuffer);
+    end;
+    if FZRec.avail_out < sizeof(FBuffer) then
+      FStrm.WriteBuffer(FBuffer, sizeof(FBuffer) - FZRec.avail_out);
+  finally
+    deflateEnd(FZRec);
+  end;
+  inherited Destroy;
+end;
+
+function TCompressionStream.Read(var Buffer; Count: Longint): Longint;
+begin
+  raise ECompressionError.CreateRes(@sInvalidStreamOp);
+end;
+
+function TCompressionStream.Write(const Buffer; Count: Longint): Longint;
+begin
+  FZRec.next_in := @Buffer;
+  FZRec.avail_in := Count;
+  if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
+  while (FZRec.avail_in > 0) do
+  begin
+    CCheck(deflate(FZRec, 0));
+    if FZRec.avail_out = 0 then
+    begin
+      FStrm.WriteBuffer(FBuffer, sizeof(FBuffer));
+      FZRec.next_out := FBuffer;
+      FZRec.avail_out := sizeof(FBuffer);
+      FStrmPos := FStrm.Position;
+      Progress(Self);
+    end;
+  end;
+  Result := Count;
+end;
+
+function TCompressionStream.Seek(Offset: Longint; Origin: Word): Longint;
+begin
+  if (Offset = 0) and (Origin = soFromCurrent) then
+    Result := FZRec.total_in
+  else
+    raise ECompressionError.CreateRes(@sInvalidStreamOp);
+end;
+
+function TCompressionStream.GetCompressionRate: Single;
+begin
+  if FZRec.total_in = 0 then
+    Result := 0
+  else
+    Result := (1.0 - (FZRec.total_out / FZRec.total_in)) * 100.0;
+end;
+
+
+// TDecompressionStream
+
+constructor TDecompressionStream.Create(Source: TStream);
+begin
+  inherited Create(Source);
+  FZRec.next_in := FBuffer;
+  FZRec.avail_in := 0;
+  DCheck(inflateInit_(FZRec, zlib_version, sizeof(FZRec)));
+end;
+
+destructor TDecompressionStream.Destroy;
+begin
+  FStrm.Seek(-FZRec.avail_in, 1);
+  inflateEnd(FZRec);
+  inherited Destroy;
+end;
+
+function TDecompressionStream.Read(var Buffer; Count: Longint): Longint;
+begin
+  FZRec.next_out := @Buffer;
+  FZRec.avail_out := Count;
+  if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
+  while (FZRec.avail_out > 0) do
+  begin
+    if FZRec.avail_in = 0 then
+    begin
+      FZRec.avail_in := FStrm.Read(FBuffer, sizeof(FBuffer));
+      if FZRec.avail_in = 0 then
+      begin
+        Result := Count - FZRec.avail_out;
+        Exit;
+      end;
+      FZRec.next_in := FBuffer;
+      FStrmPos := FStrm.Position;
+      Progress(Self);
+    end;
+    CCheck(inflate(FZRec, 0));
+  end;
+  Result := Count;
+end;
+
+function TDecompressionStream.Write(const Buffer; Count: Longint): Longint;
+begin
+  raise EDecompressionError.CreateRes(@sInvalidStreamOp);
+end;
+
+function TDecompressionStream.Seek(Offset: Longint; Origin: Word): Longint;
+var
+  I: Integer;
+  Buf: array [0..4095] of Char;
+begin
+  if (Offset = 0) and (Origin = soFromBeginning) then
+  begin
+    DCheck(inflateReset(FZRec));
+    FZRec.next_in := FBuffer;
+    FZRec.avail_in := 0;
+    FStrm.Position := 0;
+    FStrmPos := 0;
+  end
+  else if ( (Offset >= 0) and (Origin = soFromCurrent)) or
+          ( ((Offset - FZRec.total_out) > 0) and (Origin = soFromBeginning)) then
+  begin
+    if Origin = soFromBeginning then Dec(Offset, FZRec.total_out);
+    if Offset > 0 then
+    begin
+      for I := 1 to Offset div sizeof(Buf) do
+        ReadBuffer(Buf, sizeof(Buf));
+      ReadBuffer(Buf, Offset mod sizeof(Buf));
+    end;
+  end
+  else
+    raise EDecompressionError.CreateRes(@sInvalidStreamOp);
+  Result := FZRec.total_out;
+end;
+
+
+end.
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/delphi/ZLibConst.pas b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/delphi/ZLibConst.pas
new file mode 100644
index 00000000..cdfe1367
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/delphi/ZLibConst.pas
@@ -0,0 +1,11 @@
+unit ZLibConst;
+
+interface
+
+resourcestring
+  sTargetBufferTooSmall = 'ZLib error: target buffer may be too small';
+  sInvalidStreamOp = 'Invalid stream operation';
+
+implementation
+
+end.
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/delphi/readme.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/delphi/readme.txt
new file mode 100644
index 00000000..2dc9a8bb
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/delphi/readme.txt
@@ -0,0 +1,76 @@
+
+Overview
+========
+
+This directory contains an update to the ZLib interface unit,
+distributed by Borland as a Delphi supplemental component.
+
+The original ZLib unit is Copyright (c) 1997,99 Borland Corp.,
+and is based on zlib version 1.0.4.  There are a series of bugs
+and security problems associated with that old zlib version, and
+we recommend the users to update their ZLib unit.
+
+
+Summary of modifications
+========================
+
+- Improved makefile, adapted to zlib version 1.2.1.
+
+- Some field types from TZStreamRec are changed from Integer to
+  Longint, for consistency with the zlib.h header, and for 64-bit
+  readiness.
+
+- The zlib_version constant is updated.
+
+- The new Z_RLE strategy has its corresponding symbolic constant.
+
+- The allocation and deallocation functions and function types
+  (TAlloc, TFree, zlibAllocMem and zlibFreeMem) are now cdecl,
+  and _malloc and _free are added as C RTL stubs.  As a result,
+  the original C sources of zlib can be compiled out of the box,
+  and linked to the ZLib unit.
+
+
+Suggestions for improvements
+============================
+
+Currently, the ZLib unit provides only a limited wrapper around
+the zlib library, and much of the original zlib functionality is
+missing.  Handling compressed file formats like ZIP/GZIP or PNG
+cannot be implemented without having this functionality.
+Applications that handle these formats are either using their own,
+duplicated code, or not using the ZLib unit at all.
+
+Here are a few suggestions:
+
+- Checksum class wrappers around adler32() and crc32(), similar
+  to the Java classes that implement the java.util.zip.Checksum
+  interface.
+
+- The ability to read and write raw deflate streams, without the
+  zlib stream header and trailer.  Raw deflate streams are used
+  in the ZIP file format.
+
+- The ability to read and write gzip streams, used in the GZIP
+  file format, and normally produced by the gzip program.
+
+- The ability to select a different compression strategy, useful
+  to PNG and MNG image compression, and to multimedia compression
+  in general.  Besides the compression level
+
+    TCompressionLevel = (clNone, clFastest, clDefault, clMax);
+
+  which, in fact, could have used the 'z' prefix and avoided
+  TColor-like symbols
+
+    TCompressionLevel = (zcNone, zcFastest, zcDefault, zcMax);
+
+  there could be a compression strategy
+
+    TCompressionStrategy = (zsDefault, zsFiltered, zsHuffmanOnly, zsRle);
+
+- ZIP and GZIP stream handling via TStreams.
+
+
+--
+Cosmin Truta <cosmint@cs.ubbcluj.ro>
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/delphi/zlibd32.mak b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/delphi/zlibd32.mak
new file mode 100644
index 00000000..0d0699a6
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/delphi/zlibd32.mak
@@ -0,0 +1,99 @@
+# Makefile for zlib
+# For use with Delphi and C++ Builder under Win32
+# Updated for zlib 1.2.x by Cosmin Truta
+
+# ------------ Borland C++ ------------
+
+# This project uses the Delphi (fastcall/register) calling convention:
+LOC = -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
+
+CC = bcc32
+LD = bcc32
+AR = tlib
+# do not use "-pr" in CFLAGS
+CFLAGS = -a -d -k- -O2 $(LOC)
+LDFLAGS =
+
+
+# variables
+ZLIB_LIB = zlib.lib
+
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
+OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
+OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
+
+
+# targets
+all: $(ZLIB_LIB) example.exe minigzip.exe
+
+.c.obj:
+	$(CC) -c $(CFLAGS) $*.c
+
+adler32.obj: adler32.c zlib.h zconf.h
+
+compress.obj: compress.c zlib.h zconf.h
+
+crc32.obj: crc32.c zlib.h zconf.h crc32.h
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+
+gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
+
+gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
+
+gzread.obj: gzread.c zlib.h zconf.h gzguts.h
+
+gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
+
+infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+
+trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+
+example.obj: example.c zlib.h zconf.h
+
+minigzip.obj: minigzip.c zlib.h zconf.h
+
+
+# For the sake of the old Borland make,
+# the command line is cut to fit in the MS-DOS 128 byte limit:
+$(ZLIB_LIB): $(OBJ1) $(OBJ2)
+	-del $(ZLIB_LIB)
+	$(AR) $(ZLIB_LIB) $(OBJP1)
+	$(AR) $(ZLIB_LIB) $(OBJP2)
+
+
+# testing
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d
+
+example.exe: example.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
+
+minigzip.exe: minigzip.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
+
+
+# cleanup
+clean:
+	-del *.obj
+	-del *.exe
+	-del *.lib
+	-del *.tds
+	-del zlib.bak
+	-del foo.gz
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib.build b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib.build
new file mode 100644
index 00000000..e69630ce
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib.build
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="DotZLib" default="build" basedir="./DotZLib">
+	<description>A .Net wrapper library around ZLib1.dll</description>
+
+	<property name="nunit.location" value="c:/program files/NUnit V2.1/bin" />
+	<property name="build.root" value="bin" />
+
+	<property name="debug" value="true" />
+	<property name="nunit" value="true" />
+
+	<property name="build.folder" value="${build.root}/debug/" if="${debug}" />
+	<property name="build.folder" value="${build.root}/release/" unless="${debug}" />
+
+	<target name="clean" description="Remove all generated files">
+		<delete dir="${build.root}" failonerror="false" />
+	</target>
+
+	<target name="build" description="compiles the source code">
+
+		<mkdir dir="${build.folder}" />
+		<csc target="library" output="${build.folder}DotZLib.dll" debug="${debug}">
+			<references basedir="${nunit.location}">
+				<includes if="${nunit}" name="nunit.framework.dll" />
+			</references>
+			<sources>
+				<includes name="*.cs" />
+				<excludes name="UnitTests.cs" unless="${nunit}" />
+			</sources>
+			<arg value="/d:nunit" if="${nunit}" />
+		</csc>
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib.chm b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib.chm
new file mode 100644
index 00000000..f214a444
Binary files /dev/null and b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib.chm differ
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib.sln b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib.sln
new file mode 100644
index 00000000..5d533d6b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotZLib", "DotZLib\DotZLib.csproj", "{BB1EE0B1-1808-46CB-B786-949D91117FC5}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.ActiveCfg = Debug|.NET
+		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.Build.0 = Debug|.NET
+		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.ActiveCfg = Release|.NET
+		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.Build.0 = Release|.NET
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
new file mode 100644
index 00000000..724c5347
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("DotZLib")]
+[assembly: AssemblyDescription(".Net bindings for ZLib compression dll 1.2.x")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Henrik Ravn")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("(c) 2004 by Henrik Ravn")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing.
+//
+// Notes:
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
new file mode 100644
index 00000000..b110dae6
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
@@ -0,0 +1,202 @@
+//
+// © Copyright Henrik Ravn 2004
+//
+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+
+
+namespace DotZLib
+{
+    #region ChecksumGeneratorBase
+    /// <summary>
+    /// Implements the common functionality needed for all <see cref="ChecksumGenerator"/>s
+    /// </summary>
+    /// <example></example>
+    public abstract class ChecksumGeneratorBase : ChecksumGenerator
+    {
+        /// <summary>
+        /// The value of the current checksum
+        /// </summary>
+        protected uint _current;
+
+        /// <summary>
+        /// Initializes a new instance of the checksum generator base - the current checksum is
+        /// set to zero
+        /// </summary>
+        public ChecksumGeneratorBase()
+        {
+            _current = 0;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the checksum generator basewith a specified value
+        /// </summary>
+        /// <param name="initialValue">The value to set the current checksum to</param>
+        public ChecksumGeneratorBase(uint initialValue)
+        {
+            _current = initialValue;
+        }
+
+        /// <summary>
+        /// Resets the current checksum to zero
+        /// </summary>
+        public void Reset() { _current = 0; }
+
+        /// <summary>
+        /// Gets the current checksum value
+        /// </summary>
+        public uint Value { get { return _current; } }
+
+        /// <summary>
+        /// Updates the current checksum with part of an array of bytes
+        /// </summary>
+        /// <param name="data">The data to update the checksum with</param>
+        /// <param name="offset">Where in <c>data</c> to start updating</param>
+        /// <param name="count">The number of bytes from <c>data</c> to use</param>
+        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
+        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
+        /// <remarks>All the other <c>Update</c> methods are implmeneted in terms of this one.
+        /// This is therefore the only method a derived class has to implement</remarks>
+        public abstract void Update(byte[] data, int offset, int count);
+
+        /// <summary>
+        /// Updates the current checksum with an array of bytes.
+        /// </summary>
+        /// <param name="data">The data to update the checksum with</param>
+        public void Update(byte[] data)
+        {
+            Update(data, 0, data.Length);
+        }
+
+        /// <summary>
+        /// Updates the current checksum with the data from a string
+        /// </summary>
+        /// <param name="data">The string to update the checksum with</param>
+        /// <remarks>The characters in the string are converted by the UTF-8 encoding</remarks>
+        public void Update(string data)
+        {
+			Update(Encoding.UTF8.GetBytes(data));
+        }
+
+        /// <summary>
+        /// Updates the current checksum with the data from a string, using a specific encoding
+        /// </summary>
+        /// <param name="data">The string to update the checksum with</param>
+        /// <param name="encoding">The encoding to use</param>
+        public void Update(string data, Encoding encoding)
+        {
+            Update(encoding.GetBytes(data));
+        }
+
+    }
+    #endregion
+
+    #region CRC32
+    /// <summary>
+    /// Implements a CRC32 checksum generator
+    /// </summary>
+    public sealed class CRC32Checksum : ChecksumGeneratorBase
+    {
+        #region DLL imports
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern uint crc32(uint crc, int data, uint length);
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the CRC32 checksum generator
+        /// </summary>
+        public CRC32Checksum() : base() {}
+
+        /// <summary>
+        /// Initializes a new instance of the CRC32 checksum generator with a specified value
+        /// </summary>
+        /// <param name="initialValue">The value to set the current checksum to</param>
+        public CRC32Checksum(uint initialValue) : base(initialValue) {}
+
+        /// <summary>
+        /// Updates the current checksum with part of an array of bytes
+        /// </summary>
+        /// <param name="data">The data to update the checksum with</param>
+        /// <param name="offset">Where in <c>data</c> to start updating</param>
+        /// <param name="count">The number of bytes from <c>data</c> to use</param>
+        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
+        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
+        public override void Update(byte[] data, int offset, int count)
+        {
+            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
+            if ((offset+count) > data.Length) throw new ArgumentException();
+            GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned);
+            try
+            {
+                _current = crc32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count);
+            }
+            finally
+            {
+                hData.Free();
+            }
+        }
+
+    }
+    #endregion
+
+    #region Adler
+    /// <summary>
+    /// Implements a checksum generator that computes the Adler checksum on data
+    /// </summary>
+    public sealed class AdlerChecksum : ChecksumGeneratorBase
+    {
+        #region DLL imports
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern uint adler32(uint adler, int data, uint length);
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the Adler checksum generator
+        /// </summary>
+        public AdlerChecksum() : base() {}
+
+        /// <summary>
+        /// Initializes a new instance of the Adler checksum generator with a specified value
+        /// </summary>
+        /// <param name="initialValue">The value to set the current checksum to</param>
+        public AdlerChecksum(uint initialValue) : base(initialValue) {}
+
+        /// <summary>
+        /// Updates the current checksum with part of an array of bytes
+        /// </summary>
+        /// <param name="data">The data to update the checksum with</param>
+        /// <param name="offset">Where in <c>data</c> to start updating</param>
+        /// <param name="count">The number of bytes from <c>data</c> to use</param>
+        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
+        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
+        public override void Update(byte[] data, int offset, int count)
+        {
+            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
+            if ((offset+count) > data.Length) throw new ArgumentException();
+            GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned);
+            try
+            {
+                _current = adler32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count);
+            }
+            finally
+            {
+                hData.Free();
+            }
+        }
+
+    }
+    #endregion
+
+}
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
new file mode 100644
index 00000000..9c8d6019
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
@@ -0,0 +1,83 @@
+//
+// © Copyright Henrik Ravn 2004
+//
+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+using System;
+using System.Diagnostics;
+
+namespace DotZLib
+{
+
+	/// <summary>
+	/// This class implements a circular buffer
+	/// </summary>
+	internal class CircularBuffer
+	{
+        #region Private data
+        private int _capacity;
+        private int _head;
+        private int _tail;
+        private int _size;
+        private byte[] _buffer;
+        #endregion
+
+        public CircularBuffer(int capacity)
+        {
+            Debug.Assert( capacity > 0 );
+            _buffer = new byte[capacity];
+            _capacity = capacity;
+            _head = 0;
+            _tail = 0;
+            _size = 0;
+        }
+
+        public int Size { get { return _size; } }
+
+        public int Put(byte[] source, int offset, int count)
+        {
+            Debug.Assert( count > 0 );
+            int trueCount = Math.Min(count, _capacity - Size);
+            for (int i = 0; i < trueCount; ++i)
+                _buffer[(_tail+i) % _capacity] = source[offset+i];
+            _tail += trueCount;
+            _tail %= _capacity;
+            _size += trueCount;
+            return trueCount;
+        }
+
+        public bool Put(byte b)
+        {
+            if (Size == _capacity) // no room
+                return false;
+            _buffer[_tail++] = b;
+            _tail %= _capacity;
+            ++_size;
+            return true;
+        }
+
+        public int Get(byte[] destination, int offset, int count)
+        {
+            int trueCount = Math.Min(count,Size);
+            for (int i = 0; i < trueCount; ++i)
+                destination[offset + i] = _buffer[(_head+i) % _capacity];
+            _head += trueCount;
+            _head %= _capacity;
+            _size -= trueCount;
+            return trueCount;
+        }
+
+        public int Get()
+        {
+            if (Size == 0)
+                return -1;
+
+            int result = (int)_buffer[_head++ % _capacity];
+            --_size;
+            return result;
+        }
+
+    }
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/CodecBase.cs b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
new file mode 100644
index 00000000..b0eb78a0
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
@@ -0,0 +1,198 @@
+//
+// © Copyright Henrik Ravn 2004
+//
+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace DotZLib
+{
+	/// <summary>
+	/// Implements the common functionality needed for all <see cref="Codec"/>s
+	/// </summary>
+	public abstract class CodecBase : Codec, IDisposable
+	{
+
+        #region Data members
+
+        /// <summary>
+        /// Instance of the internal zlib buffer structure that is
+        /// passed to all functions in the zlib dll
+        /// </summary>
+        internal ZStream _ztream = new ZStream();
+
+        /// <summary>
+        /// True if the object instance has been disposed, false otherwise
+        /// </summary>
+        protected bool _isDisposed = false;
+
+        /// <summary>
+        /// The size of the internal buffers
+        /// </summary>
+        protected const int kBufferSize = 16384;
+
+        private byte[] _outBuffer = new byte[kBufferSize];
+        private byte[] _inBuffer = new byte[kBufferSize];
+
+        private GCHandle _hInput;
+        private GCHandle _hOutput;
+
+        private uint _checksum = 0;
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the <c>CodeBase</c> class.
+        /// </summary>
+		public CodecBase()
+		{
+            try
+            {
+                _hInput = GCHandle.Alloc(_inBuffer, GCHandleType.Pinned);
+                _hOutput = GCHandle.Alloc(_outBuffer, GCHandleType.Pinned);
+            }
+            catch (Exception)
+            {
+                CleanUp(false);
+                throw;
+            }
+        }
+
+
+        #region Codec Members
+
+        /// <summary>
+        /// Occurs when more processed data are available.
+        /// </summary>
+        public event DataAvailableHandler DataAvailable;
+
+        /// <summary>
+        /// Fires the <see cref="DataAvailable"/> event
+        /// </summary>
+        protected void OnDataAvailable()
+        {
+            if (_ztream.total_out > 0)
+            {
+                if (DataAvailable != null)
+                    DataAvailable( _outBuffer, 0, (int)_ztream.total_out);
+                resetOutput();
+            }
+        }
+
+        /// <summary>
+        /// Adds more data to the codec to be processed.
+        /// </summary>
+        /// <param name="data">Byte array containing the data to be added to the codec</param>
+        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
+        public void Add(byte[] data)
+        {
+            Add(data,0,data.Length);
+        }
+
+        /// <summary>
+        /// Adds more data to the codec to be processed.
+        /// </summary>
+        /// <param name="data">Byte array containing the data to be added to the codec</param>
+        /// <param name="offset">The index of the first byte to add from <c>data</c></param>
+        /// <param name="count">The number of bytes to add</param>
+        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
+        /// <remarks>This must be implemented by a derived class</remarks>
+        public abstract void Add(byte[] data, int offset, int count);
+
+        /// <summary>
+        /// Finishes up any pending data that needs to be processed and handled.
+        /// </summary>
+        /// <remarks>This must be implemented by a derived class</remarks>
+        public abstract void Finish();
+
+        /// <summary>
+        /// Gets the checksum of the data that has been added so far
+        /// </summary>
+        public uint Checksum { get { return _checksum; } }
+
+        #endregion
+
+        #region Destructor & IDisposable stuff
+
+        /// <summary>
+        /// Destroys this instance
+        /// </summary>
+        ~CodecBase()
+        {
+            CleanUp(false);
+        }
+
+        /// <summary>
+        /// Releases any unmanaged resources and calls the <see cref="CleanUp()"/> method of the derived class
+        /// </summary>
+        public void Dispose()
+        {
+            CleanUp(true);
+        }
+
+        /// <summary>
+        /// Performs any codec specific cleanup
+        /// </summary>
+        /// <remarks>This must be implemented by a derived class</remarks>
+        protected abstract void CleanUp();
+
+        // performs the release of the handles and calls the dereived CleanUp()
+        private void CleanUp(bool isDisposing)
+        {
+            if (!_isDisposed)
+            {
+                CleanUp();
+                if (_hInput.IsAllocated)
+                    _hInput.Free();
+                if (_hOutput.IsAllocated)
+                    _hOutput.Free();
+
+                _isDisposed = true;
+            }
+        }
+
+
+        #endregion
+
+        #region Helper methods
+
+        /// <summary>
+        /// Copies a number of bytes to the internal codec buffer - ready for proccesing
+        /// </summary>
+        /// <param name="data">The byte array that contains the data to copy</param>
+        /// <param name="startIndex">The index of the first byte to copy</param>
+        /// <param name="count">The number of bytes to copy from <c>data</c></param>
+        protected void copyInput(byte[] data, int startIndex, int count)
+        {
+            Array.Copy(data, startIndex, _inBuffer,0, count);
+            _ztream.next_in = _hInput.AddrOfPinnedObject();
+            _ztream.total_in = 0;
+            _ztream.avail_in = (uint)count;
+
+        }
+
+        /// <summary>
+        /// Resets the internal output buffers to a known state - ready for processing
+        /// </summary>
+        protected void resetOutput()
+        {
+            _ztream.total_out = 0;
+            _ztream.avail_out = kBufferSize;
+            _ztream.next_out = _hOutput.AddrOfPinnedObject();
+        }
+
+        /// <summary>
+        /// Updates the running checksum property
+        /// </summary>
+        /// <param name="newSum">The new checksum value</param>
+        protected void setChecksum(uint newSum)
+        {
+            _checksum = newSum;
+        }
+        #endregion
+
+    }
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/Deflater.cs b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/Deflater.cs
new file mode 100644
index 00000000..9039f41f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/Deflater.cs
@@ -0,0 +1,106 @@
+//
+// © Copyright Henrik Ravn 2004
+//
+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace DotZLib
+{
+
+    /// <summary>
+    /// Implements a data compressor, using the deflate algorithm in the ZLib dll
+    /// </summary>
+	public sealed class Deflater : CodecBase
+	{
+        #region Dll imports
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)]
+        private static extern int deflateInit_(ref ZStream sz, int level, string vs, int size);
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern int deflate(ref ZStream sz, int flush);
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern int deflateReset(ref ZStream sz);
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern int deflateEnd(ref ZStream sz);
+        #endregion
+
+        /// <summary>
+        /// Constructs an new instance of the <c>Deflater</c>
+        /// </summary>
+        /// <param name="level">The compression level to use for this <c>Deflater</c></param>
+		public Deflater(CompressLevel level) : base()
+		{
+            int retval = deflateInit_(ref _ztream, (int)level, Info.Version, Marshal.SizeOf(_ztream));
+            if (retval != 0)
+                throw new ZLibException(retval, "Could not initialize deflater");
+
+            resetOutput();
+		}
+
+        /// <summary>
+        /// Adds more data to the codec to be processed.
+        /// </summary>
+        /// <param name="data">Byte array containing the data to be added to the codec</param>
+        /// <param name="offset">The index of the first byte to add from <c>data</c></param>
+        /// <param name="count">The number of bytes to add</param>
+        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
+        public override void Add(byte[] data, int offset, int count)
+        {
+            if (data == null) throw new ArgumentNullException();
+            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
+            if ((offset+count) > data.Length) throw new ArgumentException();
+
+            int total = count;
+            int inputIndex = offset;
+            int err = 0;
+
+            while (err >= 0 && inputIndex < total)
+            {
+                copyInput(data, inputIndex, Math.Min(total - inputIndex, kBufferSize));
+                while (err >= 0 && _ztream.avail_in > 0)
+                {
+                    err = deflate(ref _ztream, (int)FlushTypes.None);
+                    if (err == 0)
+                        while (_ztream.avail_out == 0)
+                        {
+                            OnDataAvailable();
+                            err = deflate(ref _ztream, (int)FlushTypes.None);
+                        }
+                    inputIndex += (int)_ztream.total_in;
+                }
+            }
+            setChecksum( _ztream.adler );
+        }
+
+
+        /// <summary>
+        /// Finishes up any pending data that needs to be processed and handled.
+        /// </summary>
+        public override void Finish()
+        {
+            int err;
+            do
+            {
+                err = deflate(ref _ztream, (int)FlushTypes.Finish);
+                OnDataAvailable();
+            }
+            while (err == 0);
+            setChecksum( _ztream.adler );
+            deflateReset(ref _ztream);
+            resetOutput();
+        }
+
+        /// <summary>
+        /// Closes the internal zlib deflate stream
+        /// </summary>
+        protected override void CleanUp() { deflateEnd(ref _ztream); }
+
+    }
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/DotZLib.cs b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
new file mode 100644
index 00000000..90c7c3b3
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
@@ -0,0 +1,288 @@
+//
+// © Copyright Henrik Ravn 2004
+//
+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+
+
+namespace DotZLib
+{
+
+    #region Internal types
+
+    /// <summary>
+    /// Defines constants for the various flush types used with zlib
+    /// </summary>
+    internal enum FlushTypes
+    {
+        None,  Partial,  Sync,  Full,  Finish,  Block
+    }
+
+    #region ZStream structure
+    // internal mapping of the zlib zstream structure for marshalling
+    [StructLayoutAttribute(LayoutKind.Sequential, Pack=4, Size=0, CharSet=CharSet.Ansi)]
+    internal struct ZStream
+    {
+        public IntPtr next_in;
+        public uint avail_in;
+        public uint total_in;
+
+        public IntPtr next_out;
+        public uint avail_out;
+        public uint total_out;
+
+        [MarshalAs(UnmanagedType.LPStr)]
+        string msg;
+        uint state;
+
+        uint zalloc;
+        uint zfree;
+        uint opaque;
+
+        int data_type;
+        public uint adler;
+        uint reserved;
+    }
+
+    #endregion
+
+    #endregion
+
+    #region Public enums
+    /// <summary>
+    /// Defines constants for the available compression levels in zlib
+    /// </summary>
+    public enum CompressLevel : int
+    {
+        /// <summary>
+        /// The default compression level with a reasonable compromise between compression and speed
+        /// </summary>
+        Default = -1,
+        /// <summary>
+        /// No compression at all. The data are passed straight through.
+        /// </summary>
+        None = 0,
+        /// <summary>
+        /// The maximum compression rate available.
+        /// </summary>
+        Best = 9,
+        /// <summary>
+        /// The fastest available compression level.
+        /// </summary>
+        Fastest = 1
+    }
+    #endregion
+
+    #region Exception classes
+    /// <summary>
+    /// The exception that is thrown when an error occurs on the zlib dll
+    /// </summary>
+    public class ZLibException : ApplicationException
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ZLibException"/> class with a specified
+        /// error message and error code
+        /// </summary>
+        /// <param name="errorCode">The zlib error code that caused the exception</param>
+        /// <param name="msg">A message that (hopefully) describes the error</param>
+        public ZLibException(int errorCode, string msg) : base(String.Format("ZLib error {0} {1}", errorCode, msg))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ZLibException"/> class with a specified
+        /// error code
+        /// </summary>
+        /// <param name="errorCode">The zlib error code that caused the exception</param>
+        public ZLibException(int errorCode) : base(String.Format("ZLib error {0}", errorCode))
+        {
+        }
+    }
+    #endregion
+
+    #region Interfaces
+
+    /// <summary>
+    /// Declares methods and properties that enables a running checksum to be calculated
+    /// </summary>
+    public interface ChecksumGenerator
+    {
+        /// <summary>
+        /// Gets the current value of the checksum
+        /// </summary>
+        uint Value { get; }
+
+        /// <summary>
+        /// Clears the current checksum to 0
+        /// </summary>
+        void Reset();
+
+        /// <summary>
+        /// Updates the current checksum with an array of bytes
+        /// </summary>
+        /// <param name="data">The data to update the checksum with</param>
+        void Update(byte[] data);
+
+        /// <summary>
+        /// Updates the current checksum with part of an array of bytes
+        /// </summary>
+        /// <param name="data">The data to update the checksum with</param>
+        /// <param name="offset">Where in <c>data</c> to start updating</param>
+        /// <param name="count">The number of bytes from <c>data</c> to use</param>
+        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
+        /// <exception cref="ArgumentNullException"><c>data</c> is a null reference</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
+        void Update(byte[] data, int offset, int count);
+
+        /// <summary>
+        /// Updates the current checksum with the data from a string
+        /// </summary>
+        /// <param name="data">The string to update the checksum with</param>
+        /// <remarks>The characters in the string are converted by the UTF-8 encoding</remarks>
+        void Update(string data);
+
+        /// <summary>
+        /// Updates the current checksum with the data from a string, using a specific encoding
+        /// </summary>
+        /// <param name="data">The string to update the checksum with</param>
+        /// <param name="encoding">The encoding to use</param>
+        void Update(string data, Encoding encoding);
+    }
+
+
+    /// <summary>
+    /// Represents the method that will be called from a codec when new data
+    /// are available.
+    /// </summary>
+    /// <paramref name="data">The byte array containing the processed data</paramref>
+    /// <paramref name="startIndex">The index of the first processed byte in <c>data</c></paramref>
+    /// <paramref name="count">The number of processed bytes available</paramref>
+    /// <remarks>On return from this method, the data may be overwritten, so grab it while you can.
+    /// You cannot assume that startIndex will be zero.
+    /// </remarks>
+    public delegate void DataAvailableHandler(byte[] data, int startIndex, int count);
+
+    /// <summary>
+    /// Declares methods and events for implementing compressors/decompressors
+    /// </summary>
+    public interface Codec
+    {
+        /// <summary>
+        /// Occurs when more processed data are available.
+        /// </summary>
+        event DataAvailableHandler DataAvailable;
+
+        /// <summary>
+        /// Adds more data to the codec to be processed.
+        /// </summary>
+        /// <param name="data">Byte array containing the data to be added to the codec</param>
+        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
+        void Add(byte[] data);
+
+        /// <summary>
+        /// Adds more data to the codec to be processed.
+        /// </summary>
+        /// <param name="data">Byte array containing the data to be added to the codec</param>
+        /// <param name="offset">The index of the first byte to add from <c>data</c></param>
+        /// <param name="count">The number of bytes to add</param>
+        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
+        void Add(byte[] data, int offset, int count);
+
+        /// <summary>
+        /// Finishes up any pending data that needs to be processed and handled.
+        /// </summary>
+        void Finish();
+
+        /// <summary>
+        /// Gets the checksum of the data that has been added so far
+        /// </summary>
+        uint Checksum { get; }
+
+
+    }
+
+    #endregion
+
+    #region Classes
+    /// <summary>
+    /// Encapsulates general information about the ZLib library
+    /// </summary>
+    public class Info
+    {
+        #region DLL imports
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern uint zlibCompileFlags();
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern string zlibVersion();
+        #endregion
+
+        #region Private stuff
+        private uint _flags;
+
+        // helper function that unpacks a bitsize mask
+        private static int bitSize(uint bits)
+        {
+            switch (bits)
+            {
+                case 0: return 16;
+                case 1: return 32;
+                case 2: return 64;
+            }
+            return -1;
+        }
+        #endregion
+
+        /// <summary>
+        /// Constructs an instance of the <c>Info</c> class.
+        /// </summary>
+        public Info()
+        {
+            _flags = zlibCompileFlags();
+        }
+
+        /// <summary>
+        /// True if the library is compiled with debug info
+        /// </summary>
+        public bool HasDebugInfo { get { return 0 != (_flags & 0x100); } }
+
+        /// <summary>
+        /// True if the library is compiled with assembly optimizations
+        /// </summary>
+        public bool UsesAssemblyCode { get { return 0 != (_flags & 0x200); } }
+
+        /// <summary>
+        /// Gets the size of the unsigned int that was compiled into Zlib
+        /// </summary>
+        public int SizeOfUInt { get { return bitSize(_flags & 3); } }
+
+        /// <summary>
+        /// Gets the size of the unsigned long that was compiled into Zlib
+        /// </summary>
+        public int SizeOfULong { get { return bitSize((_flags >> 2) & 3); } }
+
+        /// <summary>
+        /// Gets the size of the pointers that were compiled into Zlib
+        /// </summary>
+        public int SizeOfPointer { get { return bitSize((_flags >> 4) & 3); } }
+
+        /// <summary>
+        /// Gets the size of the z_off_t type that was compiled into Zlib
+        /// </summary>
+        public int SizeOfOffset { get { return bitSize((_flags >> 6) & 3); } }
+
+        /// <summary>
+        /// Gets the version of ZLib as a string, e.g. "1.2.1"
+        /// </summary>
+        public static string Version { get { return zlibVersion(); } }
+    }
+
+    #endregion
+
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj
new file mode 100644
index 00000000..dea7fb16
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj
@@ -0,0 +1,141 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{BB1EE0B1-1808-46CB-B786-949D91117FC5}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "DotZLib"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "DotZLib"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = "docs\DotZLib.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = "1591"
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = "docs\DotZLib.xml"
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "E:\apps\NUnit V2.1\\bin\nunit.framework.dll"
+                    AssemblyFolderKey = "hklm\dn\nunit.framework"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "ChecksumImpl.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CircularBuffer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CodecBase.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Deflater.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DotZLib.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "GZipStream.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Inflater.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "UnitTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/GZipStream.cs b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
new file mode 100644
index 00000000..f0eada1d
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
@@ -0,0 +1,301 @@
+//
+// © Copyright Henrik Ravn 2004
+//
+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+
+namespace DotZLib
+{
+	/// <summary>
+	/// Implements a compressed <see cref="Stream"/>, in GZip (.gz) format.
+	/// </summary>
+	public class GZipStream : Stream, IDisposable
+	{
+        #region Dll Imports
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)]
+        private static extern IntPtr gzopen(string name, string mode);
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern int gzclose(IntPtr gzFile);
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern int gzwrite(IntPtr gzFile, int data, int length);
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern int gzread(IntPtr gzFile, int data, int length);
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern int gzgetc(IntPtr gzFile);
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern int gzputc(IntPtr gzFile, int c);
+
+        #endregion
+
+        #region Private data
+        private IntPtr _gzFile;
+        private bool _isDisposed = false;
+        private bool _isWriting;
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Creates a new file as a writeable GZipStream
+        /// </summary>
+        /// <param name="fileName">The name of the compressed file to create</param>
+        /// <param name="level">The compression level to use when adding data</param>
+        /// <exception cref="ZLibException">If an error occurred in the internal zlib function</exception>
+		public GZipStream(string fileName, CompressLevel level)
+		{
+            _isWriting = true;
+            _gzFile = gzopen(fileName, String.Format("wb{0}", (int)level));
+            if (_gzFile == IntPtr.Zero)
+                throw new ZLibException(-1, "Could not open " + fileName);
+		}
+
+        /// <summary>
+        /// Opens an existing file as a readable GZipStream
+        /// </summary>
+        /// <param name="fileName">The name of the file to open</param>
+        /// <exception cref="ZLibException">If an error occurred in the internal zlib function</exception>
+        public GZipStream(string fileName)
+        {
+            _isWriting = false;
+            _gzFile = gzopen(fileName, "rb");
+            if (_gzFile == IntPtr.Zero)
+                throw new ZLibException(-1, "Could not open " + fileName);
+
+        }
+        #endregion
+
+        #region Access properties
+        /// <summary>
+        /// Returns true of this stream can be read from, false otherwise
+        /// </summary>
+        public override bool CanRead
+        {
+            get
+            {
+                return !_isWriting;
+            }
+        }
+
+
+        /// <summary>
+        /// Returns false.
+        /// </summary>
+        public override bool CanSeek
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Returns true if this tsream is writeable, false otherwise
+        /// </summary>
+        public override bool CanWrite
+        {
+            get
+            {
+                return _isWriting;
+            }
+        }
+        #endregion
+
+        #region Destructor & IDispose stuff
+
+        /// <summary>
+        /// Destroys this instance
+        /// </summary>
+        ~GZipStream()
+        {
+            cleanUp(false);
+        }
+
+        /// <summary>
+        /// Closes the external file handle
+        /// </summary>
+        public void Dispose()
+        {
+            cleanUp(true);
+        }
+
+        // Does the actual closing of the file handle.
+        private void cleanUp(bool isDisposing)
+        {
+            if (!_isDisposed)
+            {
+                gzclose(_gzFile);
+                _isDisposed = true;
+            }
+        }
+        #endregion
+
+        #region Basic reading and writing
+        /// <summary>
+        /// Attempts to read a number of bytes from the stream.
+        /// </summary>
+        /// <param name="buffer">The destination data buffer</param>
+        /// <param name="offset">The index of the first destination byte in <c>buffer</c></param>
+        /// <param name="count">The number of bytes requested</param>
+        /// <returns>The number of bytes read</returns>
+        /// <exception cref="ArgumentNullException">If <c>buffer</c> is null</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If <c>count</c> or <c>offset</c> are negative</exception>
+        /// <exception cref="ArgumentException">If <c>offset</c>  + <c>count</c> is &gt; buffer.Length</exception>
+        /// <exception cref="NotSupportedException">If this stream is not readable.</exception>
+        /// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception>
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            if (!CanRead) throw new NotSupportedException();
+            if (buffer == null) throw new ArgumentNullException();
+            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
+            if ((offset+count) > buffer.Length) throw new ArgumentException();
+            if (_isDisposed) throw new ObjectDisposedException("GZipStream");
+
+            GCHandle h = GCHandle.Alloc(buffer, GCHandleType.Pinned);
+            int result;
+            try
+            {
+                result = gzread(_gzFile, h.AddrOfPinnedObject().ToInt32() + offset, count);
+                if (result < 0)
+                    throw new IOException();
+            }
+            finally
+            {
+                h.Free();
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Attempts to read a single byte from the stream.
+        /// </summary>
+        /// <returns>The byte that was read, or -1 in case of error or End-Of-File</returns>
+        public override int ReadByte()
+        {
+            if (!CanRead) throw new NotSupportedException();
+            if (_isDisposed) throw new ObjectDisposedException("GZipStream");
+            return gzgetc(_gzFile);
+        }
+
+        /// <summary>
+        /// Writes a number of bytes to the stream
+        /// </summary>
+        /// <param name="buffer"></param>
+        /// <param name="offset"></param>
+        /// <param name="count"></param>
+        /// <exception cref="ArgumentNullException">If <c>buffer</c> is null</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If <c>count</c> or <c>offset</c> are negative</exception>
+        /// <exception cref="ArgumentException">If <c>offset</c>  + <c>count</c> is &gt; buffer.Length</exception>
+        /// <exception cref="NotSupportedException">If this stream is not writeable.</exception>
+        /// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception>
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            if (!CanWrite) throw new NotSupportedException();
+            if (buffer == null) throw new ArgumentNullException();
+            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
+            if ((offset+count) > buffer.Length) throw new ArgumentException();
+            if (_isDisposed) throw new ObjectDisposedException("GZipStream");
+
+            GCHandle h = GCHandle.Alloc(buffer, GCHandleType.Pinned);
+            try
+            {
+                int result = gzwrite(_gzFile, h.AddrOfPinnedObject().ToInt32() + offset, count);
+                if (result < 0)
+                    throw new IOException();
+            }
+            finally
+            {
+                h.Free();
+            }
+        }
+
+        /// <summary>
+        /// Writes a single byte to the stream
+        /// </summary>
+        /// <param name="value">The byte to add to the stream.</param>
+        /// <exception cref="NotSupportedException">If this stream is not writeable.</exception>
+        /// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception>
+        public override void WriteByte(byte value)
+        {
+            if (!CanWrite) throw new NotSupportedException();
+            if (_isDisposed) throw new ObjectDisposedException("GZipStream");
+
+            int result = gzputc(_gzFile, (int)value);
+            if (result < 0)
+                throw new IOException();
+        }
+        #endregion
+
+        #region Position & length stuff
+        /// <summary>
+        /// Not supported.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <exception cref="NotSupportedException">Always thrown</exception>
+        public override void SetLength(long value)
+        {
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        ///  Not suppported.
+        /// </summary>
+        /// <param name="offset"></param>
+        /// <param name="origin"></param>
+        /// <returns></returns>
+        /// <exception cref="NotSupportedException">Always thrown</exception>
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Flushes the <c>GZipStream</c>.
+        /// </summary>
+        /// <remarks>In this implementation, this method does nothing. This is because excessive
+        /// flushing may degrade the achievable compression rates.</remarks>
+        public override void Flush()
+        {
+            // left empty on purpose
+        }
+
+        /// <summary>
+        /// Gets/sets the current position in the <c>GZipStream</c>. Not suppported.
+        /// </summary>
+        /// <remarks>In this implementation this property is not supported</remarks>
+        /// <exception cref="NotSupportedException">Always thrown</exception>
+        public override long Position
+        {
+            get
+            {
+                throw new NotSupportedException();
+            }
+            set
+            {
+                throw new NotSupportedException();
+            }
+        }
+
+        /// <summary>
+        /// Gets the size of the stream. Not suppported.
+        /// </summary>
+        /// <remarks>In this implementation this property is not supported</remarks>
+        /// <exception cref="NotSupportedException">Always thrown</exception>
+        public override long Length
+        {
+            get
+            {
+                throw new NotSupportedException();
+            }
+        }
+        #endregion
+    }
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/Inflater.cs b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/Inflater.cs
new file mode 100644
index 00000000..d295f268
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/Inflater.cs
@@ -0,0 +1,105 @@
+//
+// © Copyright Henrik Ravn 2004
+//
+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace DotZLib
+{
+
+    /// <summary>
+    /// Implements a data decompressor, using the inflate algorithm in the ZLib dll
+    /// </summary>
+    public class Inflater : CodecBase
+	{
+        #region Dll imports
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)]
+        private static extern int inflateInit_(ref ZStream sz, string vs, int size);
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern int inflate(ref ZStream sz, int flush);
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern int inflateReset(ref ZStream sz);
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern int inflateEnd(ref ZStream sz);
+        #endregion
+
+        /// <summary>
+        /// Constructs an new instance of the <c>Inflater</c>
+        /// </summary>
+        public Inflater() : base()
+		{
+            int retval = inflateInit_(ref _ztream, Info.Version, Marshal.SizeOf(_ztream));
+            if (retval != 0)
+                throw new ZLibException(retval, "Could not initialize inflater");
+
+            resetOutput();
+        }
+
+
+        /// <summary>
+        /// Adds more data to the codec to be processed.
+        /// </summary>
+        /// <param name="data">Byte array containing the data to be added to the codec</param>
+        /// <param name="offset">The index of the first byte to add from <c>data</c></param>
+        /// <param name="count">The number of bytes to add</param>
+        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
+        public override void Add(byte[] data, int offset, int count)
+        {
+            if (data == null) throw new ArgumentNullException();
+            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
+            if ((offset+count) > data.Length) throw new ArgumentException();
+
+            int total = count;
+            int inputIndex = offset;
+            int err = 0;
+
+            while (err >= 0 && inputIndex < total)
+            {
+                copyInput(data, inputIndex, Math.Min(total - inputIndex, kBufferSize));
+                err = inflate(ref _ztream, (int)FlushTypes.None);
+                if (err == 0)
+                    while (_ztream.avail_out == 0)
+                    {
+                        OnDataAvailable();
+                        err = inflate(ref _ztream, (int)FlushTypes.None);
+                    }
+
+                inputIndex += (int)_ztream.total_in;
+            }
+            setChecksum( _ztream.adler );
+        }
+
+
+        /// <summary>
+        /// Finishes up any pending data that needs to be processed and handled.
+        /// </summary>
+        public override void Finish()
+        {
+            int err;
+            do
+            {
+                err = inflate(ref _ztream, (int)FlushTypes.Finish);
+                OnDataAvailable();
+            }
+            while (err == 0);
+            setChecksum( _ztream.adler );
+            inflateReset(ref _ztream);
+            resetOutput();
+        }
+
+        /// <summary>
+        /// Closes the internal zlib inflate stream
+        /// </summary>
+        protected override void CleanUp() { inflateEnd(ref _ztream); }
+
+
+	}
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
new file mode 100644
index 00000000..528a0398
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -0,0 +1,274 @@
+//
+// © Copyright Henrik Ravn 2004
+//
+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+using System;
+using System.Collections;
+using System.IO;
+
+// uncomment the define below to include unit tests
+//#define nunit
+#if nunit
+using NUnit.Framework;
+
+// Unit tests for the DotZLib class library
+// ----------------------------------------
+//
+// Use this with NUnit 2 from http://www.nunit.org
+//
+
+namespace DotZLibTests
+{
+    using DotZLib;
+
+    // helper methods
+    internal class Utils
+    {
+        public static bool byteArrEqual( byte[] lhs, byte[] rhs )
+        {
+            if (lhs.Length != rhs.Length)
+                return false;
+            for (int i = lhs.Length-1; i >= 0; --i)
+                if (lhs[i] != rhs[i])
+                    return false;
+            return true;
+        }
+
+    }
+
+
+    [TestFixture]
+    public class CircBufferTests
+    {
+        #region Circular buffer tests
+        [Test]
+        public void SinglePutGet()
+        {
+            CircularBuffer buf = new CircularBuffer(10);
+            Assert.AreEqual( 0, buf.Size );
+            Assert.AreEqual( -1, buf.Get() );
+
+            Assert.IsTrue(buf.Put( 1 ));
+            Assert.AreEqual( 1, buf.Size );
+            Assert.AreEqual( 1, buf.Get() );
+            Assert.AreEqual( 0, buf.Size );
+            Assert.AreEqual( -1, buf.Get() );
+        }
+
+        [Test]
+        public void BlockPutGet()
+        {
+            CircularBuffer buf = new CircularBuffer(10);
+            byte[] arr = {1,2,3,4,5,6,7,8,9,10};
+            Assert.AreEqual( 10, buf.Put(arr,0,10) );
+            Assert.AreEqual( 10, buf.Size );
+            Assert.IsFalse( buf.Put(11) );
+            Assert.AreEqual( 1, buf.Get() );
+            Assert.IsTrue( buf.Put(11) );
+
+            byte[] arr2 = (byte[])arr.Clone();
+            Assert.AreEqual( 9, buf.Get(arr2,1,9) );
+            Assert.IsTrue( Utils.byteArrEqual(arr,arr2) );
+        }
+
+        #endregion
+    }
+
+    [TestFixture]
+    public class ChecksumTests
+    {
+        #region CRC32 Tests
+        [Test]
+        public void CRC32_Null()
+        {
+            CRC32Checksum crc32 = new CRC32Checksum();
+            Assert.AreEqual( 0, crc32.Value );
+
+            crc32 = new CRC32Checksum(1);
+            Assert.AreEqual( 1, crc32.Value );
+
+            crc32 = new CRC32Checksum(556);
+            Assert.AreEqual( 556, crc32.Value );
+        }
+
+        [Test]
+        public void CRC32_Data()
+        {
+            CRC32Checksum crc32 = new CRC32Checksum();
+            byte[] data = { 1,2,3,4,5,6,7 };
+            crc32.Update(data);
+            Assert.AreEqual( 0x70e46888, crc32.Value  );
+
+            crc32 = new CRC32Checksum();
+            crc32.Update("penguin");
+            Assert.AreEqual( 0x0e5c1a120, crc32.Value );
+
+            crc32 = new CRC32Checksum(1);
+            crc32.Update("penguin");
+            Assert.AreEqual(0x43b6aa94, crc32.Value);
+
+        }
+        #endregion
+
+        #region Adler tests
+
+        [Test]
+        public void Adler_Null()
+        {
+            AdlerChecksum adler = new AdlerChecksum();
+            Assert.AreEqual(0, adler.Value);
+
+            adler = new AdlerChecksum(1);
+            Assert.AreEqual( 1, adler.Value );
+
+            adler = new AdlerChecksum(556);
+            Assert.AreEqual( 556, adler.Value );
+        }
+
+        [Test]
+        public void Adler_Data()
+        {
+            AdlerChecksum adler = new AdlerChecksum(1);
+            byte[] data = { 1,2,3,4,5,6,7 };
+            adler.Update(data);
+            Assert.AreEqual( 0x5b001d, adler.Value  );
+
+            adler = new AdlerChecksum();
+            adler.Update("penguin");
+            Assert.AreEqual(0x0bcf02f6, adler.Value );
+
+            adler = new AdlerChecksum(1);
+            adler.Update("penguin");
+            Assert.AreEqual(0x0bd602f7, adler.Value);
+
+        }
+        #endregion
+    }
+
+    [TestFixture]
+    public class InfoTests
+    {
+        #region Info tests
+        [Test]
+        public void Info_Version()
+        {
+            Info info = new Info();
+            Assert.AreEqual("1.2.5", Info.Version);
+            Assert.AreEqual(32, info.SizeOfUInt);
+            Assert.AreEqual(32, info.SizeOfULong);
+            Assert.AreEqual(32, info.SizeOfPointer);
+            Assert.AreEqual(32, info.SizeOfOffset);
+        }
+        #endregion
+    }
+
+    [TestFixture]
+    public class DeflateInflateTests
+    {
+        #region Deflate tests
+        [Test]
+        public void Deflate_Init()
+        {
+            using (Deflater def = new Deflater(CompressLevel.Default))
+            {
+            }
+        }
+
+        private ArrayList compressedData = new ArrayList();
+        private uint adler1;
+
+        private ArrayList uncompressedData = new ArrayList();
+        private uint adler2;
+
+        public void CDataAvail(byte[] data, int startIndex, int count)
+        {
+            for (int i = 0; i < count; ++i)
+                compressedData.Add(data[i+startIndex]);
+        }
+
+        [Test]
+        public void Deflate_Compress()
+        {
+            compressedData.Clear();
+
+            byte[] testData = new byte[35000];
+            for (int i = 0; i < testData.Length; ++i)
+                testData[i] = 5;
+
+            using (Deflater def = new Deflater((CompressLevel)5))
+            {
+                def.DataAvailable += new DataAvailableHandler(CDataAvail);
+                def.Add(testData);
+                def.Finish();
+                adler1 = def.Checksum;
+            }
+        }
+        #endregion
+
+        #region Inflate tests
+        [Test]
+        public void Inflate_Init()
+        {
+            using (Inflater inf = new Inflater())
+            {
+            }
+        }
+
+        private void DDataAvail(byte[] data, int startIndex, int count)
+        {
+            for (int i = 0; i < count; ++i)
+                uncompressedData.Add(data[i+startIndex]);
+        }
+
+        [Test]
+        public void Inflate_Expand()
+        {
+            uncompressedData.Clear();
+
+            using (Inflater inf = new Inflater())
+            {
+                inf.DataAvailable += new DataAvailableHandler(DDataAvail);
+                inf.Add((byte[])compressedData.ToArray(typeof(byte)));
+                inf.Finish();
+                adler2 = inf.Checksum;
+            }
+            Assert.AreEqual( adler1, adler2 );
+        }
+        #endregion
+    }
+
+    [TestFixture]
+    public class GZipStreamTests
+    {
+        #region GZipStream test
+        [Test]
+        public void GZipStream_WriteRead()
+        {
+            using (GZipStream gzOut = new GZipStream("gzstream.gz", CompressLevel.Best))
+            {
+                BinaryWriter writer = new BinaryWriter(gzOut);
+                writer.Write("hi there");
+                writer.Write(Math.PI);
+                writer.Write(42);
+            }
+
+            using (GZipStream gzIn = new GZipStream("gzstream.gz"))
+            {
+                BinaryReader reader = new BinaryReader(gzIn);
+                string s = reader.ReadString();
+                Assert.AreEqual("hi there",s);
+                double d = reader.ReadDouble();
+                Assert.AreEqual(Math.PI, d);
+                int i = reader.ReadInt32();
+                Assert.AreEqual(42,i);
+            }
+
+        }
+        #endregion
+	}
+}
+
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/LICENSE_1_0.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/LICENSE_1_0.txt
new file mode 100644
index 00000000..127a5bc3
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/LICENSE_1_0.txt
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/readme.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/readme.txt
new file mode 100644
index 00000000..4d8c2dd9
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/dotzlib/readme.txt
@@ -0,0 +1,58 @@
+This directory contains a .Net wrapper class library for the ZLib1.dll
+
+The wrapper includes support for inflating/deflating memory buffers,
+.Net streaming wrappers for the gz streams part of zlib, and wrappers
+for the checksum parts of zlib. See DotZLib/UnitTests.cs for examples.
+
+Directory structure:
+--------------------
+
+LICENSE_1_0.txt       - License file.
+readme.txt            - This file.
+DotZLib.chm           - Class library documentation
+DotZLib.build         - NAnt build file
+DotZLib.sln           - Microsoft Visual Studio 2003 solution file
+
+DotZLib\*.cs          - Source files for the class library
+
+Unit tests:
+-----------
+The file DotZLib/UnitTests.cs contains unit tests for use with NUnit 2.1 or higher.
+To include unit tests in the build, define nunit before building.
+
+
+Build instructions:
+-------------------
+
+1. Using Visual Studio.Net 2003:
+   Open DotZLib.sln in VS.Net and build from there. Output file (DotZLib.dll)
+   will be found ./DotZLib/bin/release or ./DotZLib/bin/debug, depending on
+   you are building the release or debug version of the library. Check
+   DotZLib/UnitTests.cs for instructions on how to include unit tests in the
+   build.
+
+2. Using NAnt:
+   Open a command prompt with access to the build environment and run nant
+   in the same directory as the DotZLib.build file.
+   You can define 2 properties on the nant command-line to control the build:
+   debug={true|false} to toggle between release/debug builds (default=true).
+   nunit={true|false} to include or esclude unit tests (default=true).
+   Also the target clean will remove binaries.
+   Output file (DotZLib.dll) will be found in either ./DotZLib/bin/release
+   or ./DotZLib/bin/debug, depending on whether you are building the release
+   or debug version of the library.
+
+   Examples:
+     nant -D:debug=false -D:nunit=false
+       will build a release mode version of the library without unit tests.
+     nant
+       will build a debug version of the library with unit tests
+     nant clean
+       will remove all previously built files.
+
+
+---------------------------------
+Copyright (c) Henrik Ravn 2004
+
+Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+(See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/gcc_gvmat64/gvmat64.S b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/gcc_gvmat64/gvmat64.S
new file mode 100644
index 00000000..dd858ddb
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/gcc_gvmat64/gvmat64.S
@@ -0,0 +1,574 @@
+/*
+;uInt longest_match_x64(
+;    deflate_state *s,
+;    IPos cur_match);                             // current match 
+
+; gvmat64.S -- Asm portion of the optimized longest_match for 32 bits x86_64
+;  (AMD64 on Athlon 64, Opteron, Phenom
+;     and Intel EM64T on Pentium 4 with EM64T, Pentium D, Core 2 Duo, Core I5/I7)
+; this file is translation from gvmat64.asm to GCC 4.x (for Linux, Mac XCode)
+; Copyright (C) 1995-2010 Jean-loup Gailly, Brian Raiter and Gilles Vollant.
+;
+; File written by Gilles Vollant, by converting to assembly the longest_match
+;  from Jean-loup Gailly in deflate.c of zLib and infoZip zip.
+;  and by taking inspiration on asm686 with masm, optimised assembly code
+;        from Brian Raiter, written 1998
+;
+;  This software is provided 'as-is', without any express or implied
+;  warranty.  In no event will the authors be held liable for any damages
+;  arising from the use of this software.
+;
+;  Permission is granted to anyone to use this software for any purpose,
+;  including commercial applications, and to alter it and redistribute it
+;  freely, subject to the following restrictions:
+;
+;  1. The origin of this software must not be misrepresented; you must not
+;     claim that you wrote the original software. If you use this software
+;     in a product, an acknowledgment in the product documentation would be
+;     appreciated but is not required.
+;  2. Altered source versions must be plainly marked as such, and must not be
+;     misrepresented as being the original software
+;  3. This notice may not be removed or altered from any source distribution.
+;
+;         http://www.zlib.net
+;         http://www.winimage.com/zLibDll
+;         http://www.muppetlabs.com/~breadbox/software/assembly.html
+;
+; to compile this file for zLib, I use option:
+;   gcc -c -arch x86_64 gvmat64.S
+
+
+;uInt longest_match(s, cur_match)
+;    deflate_state *s;
+;    IPos cur_match;                             // current match /
+;
+; with XCode for Mac, I had strange error with some jump on intel syntax
+; this is why BEFORE_JMP and AFTER_JMP are used
+ */
+
+
+#define BEFORE_JMP .att_syntax
+#define AFTER_JMP .intel_syntax noprefix
+
+#ifndef NO_UNDERLINE
+#	define	match_init	_match_init
+#	define	longest_match	_longest_match
+#endif
+
+.intel_syntax noprefix
+
+.globl	match_init, longest_match
+.text
+longest_match:
+
+
+
+#define LocalVarsSize 96
+/*
+; register used : rax,rbx,rcx,rdx,rsi,rdi,r8,r9,r10,r11,r12
+; free register :  r14,r15
+; register can be saved : rsp
+*/
+
+#define chainlenwmask     (rsp + 8 - LocalVarsSize)
+#define nicematch         (rsp + 16 - LocalVarsSize)
+
+#define save_rdi        (rsp + 24 - LocalVarsSize)
+#define save_rsi        (rsp + 32 - LocalVarsSize)
+#define save_rbx        (rsp + 40 - LocalVarsSize)
+#define save_rbp        (rsp + 48 - LocalVarsSize)
+#define save_r12        (rsp + 56 - LocalVarsSize)
+#define save_r13        (rsp + 64 - LocalVarsSize)
+#define save_r14        (rsp + 72 - LocalVarsSize)
+#define save_r15        (rsp + 80 - LocalVarsSize)
+
+
+/*
+;  all the +4 offsets are due to the addition of pending_buf_size (in zlib
+;  in the deflate_state structure since the asm code was first written
+;  (if you compile with zlib 1.0.4 or older, remove the +4).
+;  Note : these value are good with a 8 bytes boundary pack structure
+*/
+
+#define    MAX_MATCH              258
+#define    MIN_MATCH              3
+#define    MIN_LOOKAHEAD          (MAX_MATCH+MIN_MATCH+1)
+
+/*
+;;; Offsets for fields in the deflate_state structure. These numbers
+;;; are calculated from the definition of deflate_state, with the
+;;; assumption that the compiler will dword-align the fields. (Thus,
+;;; changing the definition of deflate_state could easily cause this
+;;; program to crash horribly, without so much as a warning at
+;;; compile time. Sigh.)
+
+;  all the +zlib1222add offsets are due to the addition of fields
+;  in zlib in the deflate_state structure since the asm code was first written
+;  (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
+;  (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
+;  if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
+*/
+
+
+
+/* you can check the structure offset by running
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "deflate.h"
+
+void print_depl()
+{
+deflate_state ds;
+deflate_state *s=&ds;
+printf("size pointer=%u\n",(int)sizeof(void*));
+
+printf("#define dsWSize         %u\n",(int)(((char*)&(s->w_size))-((char*)s)));
+printf("#define dsWMask         %u\n",(int)(((char*)&(s->w_mask))-((char*)s)));
+printf("#define dsWindow        %u\n",(int)(((char*)&(s->window))-((char*)s)));
+printf("#define dsPrev          %u\n",(int)(((char*)&(s->prev))-((char*)s)));
+printf("#define dsMatchLen      %u\n",(int)(((char*)&(s->match_length))-((char*)s)));
+printf("#define dsPrevMatch     %u\n",(int)(((char*)&(s->prev_match))-((char*)s)));
+printf("#define dsStrStart      %u\n",(int)(((char*)&(s->strstart))-((char*)s)));
+printf("#define dsMatchStart    %u\n",(int)(((char*)&(s->match_start))-((char*)s)));
+printf("#define dsLookahead     %u\n",(int)(((char*)&(s->lookahead))-((char*)s)));
+printf("#define dsPrevLen       %u\n",(int)(((char*)&(s->prev_length))-((char*)s)));
+printf("#define dsMaxChainLen   %u\n",(int)(((char*)&(s->max_chain_length))-((char*)s)));
+printf("#define dsGoodMatch     %u\n",(int)(((char*)&(s->good_match))-((char*)s)));
+printf("#define dsNiceMatch     %u\n",(int)(((char*)&(s->nice_match))-((char*)s)));
+}
+*/
+
+#define dsWSize          68
+#define dsWMask          76
+#define dsWindow         80
+#define dsPrev           96
+#define dsMatchLen       144
+#define dsPrevMatch      148
+#define dsStrStart       156
+#define dsMatchStart     160
+#define dsLookahead      164
+#define dsPrevLen        168
+#define dsMaxChainLen    172
+#define dsGoodMatch      188
+#define dsNiceMatch      192
+
+#define window_size      [ rcx + dsWSize]
+#define WMask            [ rcx + dsWMask]
+#define window_ad        [ rcx + dsWindow]
+#define prev_ad          [ rcx + dsPrev]
+#define strstart         [ rcx + dsStrStart]
+#define match_start      [ rcx + dsMatchStart]
+#define Lookahead        [ rcx + dsLookahead] //; 0ffffffffh on infozip
+#define prev_length      [ rcx + dsPrevLen]
+#define max_chain_length [ rcx + dsMaxChainLen]
+#define good_match       [ rcx + dsGoodMatch]
+#define nice_match       [ rcx + dsNiceMatch]
+
+/*
+; windows:
+; parameter 1 in rcx(deflate state s), param 2 in rdx (cur match)
+
+; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and
+; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp
+;
+; All registers must be preserved across the call, except for
+;   rax, rcx, rdx, r8, r9, r10, and r11, which are scratch.
+
+;
+; gcc on macosx-linux:
+; see http://www.x86-64.org/documentation/abi-0.99.pdf
+; param 1 in rdi, param 2 in rsi
+; rbx, rsp, rbp, r12 to r15 must be preserved
+
+;;; Save registers that the compiler may be using, and adjust esp to
+;;; make room for our stack frame.
+
+
+;;; Retrieve the function arguments. r8d will hold cur_match
+;;; throughout the entire function. edx will hold the pointer to the
+;;; deflate_state structure during the function's setup (before
+;;; entering the main loop.
+
+; ms: parameter 1 in rcx (deflate_state* s), param 2 in edx -> r8 (cur match)
+; mac: param 1 in rdi, param 2 rsi
+; this clear high 32 bits of r8, which can be garbage in both r8 and rdx
+*/
+        mov [save_rbx],rbx
+        mov [save_rbp],rbp
+
+
+        mov rcx,rdi
+
+        mov r8d,esi
+
+
+        mov [save_r12],r12
+        mov [save_r13],r13
+        mov [save_r14],r14
+        mov [save_r15],r15
+
+
+//;;; uInt wmask = s->w_mask;
+//;;; unsigned chain_length = s->max_chain_length;
+//;;; if (s->prev_length >= s->good_match) {
+//;;;     chain_length >>= 2;
+//;;; }
+
+
+        mov edi, prev_length
+        mov esi, good_match
+        mov eax, WMask
+        mov ebx, max_chain_length
+        cmp edi, esi
+        jl  LastMatchGood
+        shr ebx, 2
+LastMatchGood:
+
+//;;; chainlen is decremented once beforehand so that the function can
+//;;; use the sign flag instead of the zero flag for the exit test.
+//;;; It is then shifted into the high word, to make room for the wmask
+//;;; value, which it will always accompany.
+
+        dec ebx
+        shl ebx, 16
+        or  ebx, eax
+
+//;;; on zlib only
+//;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+
+
+
+        mov eax, nice_match
+        mov [chainlenwmask], ebx
+        mov r10d, Lookahead
+        cmp r10d, eax
+        cmovnl r10d, eax
+        mov [nicematch],r10d
+
+
+
+//;;; register Bytef *scan = s->window + s->strstart;
+        mov r10, window_ad
+        mov ebp, strstart
+        lea r13, [r10 + rbp]
+
+//;;; Determine how many bytes the scan ptr is off from being
+//;;; dword-aligned.
+
+         mov r9,r13
+         neg r13
+         and r13,3
+
+//;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+//;;;     s->strstart - (IPos)MAX_DIST(s) : NIL;
+
+
+        mov eax, window_size
+        sub eax, MIN_LOOKAHEAD
+
+
+        xor edi,edi
+        sub ebp, eax
+
+        mov r11d, prev_length
+
+        cmovng ebp,edi
+
+//;;; int best_len = s->prev_length;
+
+
+//;;; Store the sum of s->window + best_len in esi locally, and in esi.
+
+       lea  rsi,[r10+r11]
+
+//;;; register ush scan_start = *(ushf*)scan;
+//;;; register ush scan_end   = *(ushf*)(scan+best_len-1);
+//;;; Posf *prev = s->prev;
+
+        movzx r12d,word ptr [r9]
+        movzx ebx, word ptr [r9 + r11 - 1]
+
+        mov rdi, prev_ad
+
+//;;; Jump into the main loop.
+
+        mov edx, [chainlenwmask]
+
+        cmp bx,word ptr [rsi + r8 - 1]
+        jz  LookupLoopIsZero
+				
+						
+						
+LookupLoop1:
+        and r8d, edx
+
+        movzx   r8d, word ptr [rdi + r8*2]
+        cmp r8d, ebp
+        jbe LeaveNow
+		
+		
+		
+        sub edx, 0x00010000
+		BEFORE_JMP
+        js  LeaveNow
+		AFTER_JMP
+
+LoopEntry1:
+        cmp bx,word ptr [rsi + r8 - 1]
+		BEFORE_JMP
+        jz  LookupLoopIsZero
+		AFTER_JMP
+
+LookupLoop2:
+        and r8d, edx
+
+        movzx   r8d, word ptr [rdi + r8*2]
+        cmp r8d, ebp
+		BEFORE_JMP
+        jbe LeaveNow
+		AFTER_JMP
+        sub edx, 0x00010000
+		BEFORE_JMP
+        js  LeaveNow
+		AFTER_JMP
+
+LoopEntry2:
+        cmp bx,word ptr [rsi + r8 - 1]
+		BEFORE_JMP
+        jz  LookupLoopIsZero
+		AFTER_JMP
+
+LookupLoop4:
+        and r8d, edx
+
+        movzx   r8d, word ptr [rdi + r8*2]
+        cmp r8d, ebp
+		BEFORE_JMP
+        jbe LeaveNow
+		AFTER_JMP
+        sub edx, 0x00010000
+		BEFORE_JMP
+        js  LeaveNow
+		AFTER_JMP
+
+LoopEntry4:
+
+        cmp bx,word ptr [rsi + r8 - 1]
+		BEFORE_JMP
+        jnz LookupLoop1
+        jmp LookupLoopIsZero
+		AFTER_JMP
+/*
+;;; do {
+;;;     match = s->window + cur_match;
+;;;     if (*(ushf*)(match+best_len-1) != scan_end ||
+;;;         *(ushf*)match != scan_start) continue;
+;;;     [...]
+;;; } while ((cur_match = prev[cur_match & wmask]) > limit
+;;;          && --chain_length != 0);
+;;;
+;;; Here is the inner loop of the function. The function will spend the
+;;; majority of its time in this loop, and majority of that time will
+;;; be spent in the first ten instructions.
+;;;
+;;; Within this loop:
+;;; ebx = scanend
+;;; r8d = curmatch
+;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
+;;; esi = windowbestlen - i.e., (window + bestlen)
+;;; edi = prev
+;;; ebp = limit
+*/
+.balign 16
+LookupLoop:
+        and r8d, edx
+
+        movzx   r8d, word ptr [rdi + r8*2]
+        cmp r8d, ebp
+		BEFORE_JMP
+        jbe LeaveNow
+		AFTER_JMP
+        sub edx, 0x00010000
+		BEFORE_JMP
+        js  LeaveNow
+		AFTER_JMP
+
+LoopEntry:
+
+        cmp bx,word ptr [rsi + r8 - 1]
+		BEFORE_JMP
+        jnz LookupLoop1
+		AFTER_JMP
+LookupLoopIsZero:
+        cmp     r12w, word ptr [r10 + r8]
+		BEFORE_JMP
+        jnz LookupLoop1
+		AFTER_JMP
+
+
+//;;; Store the current value of chainlen.
+        mov [chainlenwmask], edx
+/*
+;;; Point edi to the string under scrutiny, and esi to the string we
+;;; are hoping to match it up with. In actuality, esi and edi are
+;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is
+;;; initialized to -(MAX_MATCH_8 - scanalign).
+*/
+        lea rsi,[r8+r10]
+        mov rdx, 0xfffffffffffffef8 //; -(MAX_MATCH_8)
+        lea rsi, [rsi + r13 + 0x0108] //;MAX_MATCH_8]
+        lea rdi, [r9 + r13 + 0x0108] //;MAX_MATCH_8]
+
+        prefetcht1 [rsi+rdx]
+        prefetcht1 [rdi+rdx]
+
+/*
+;;; Test the strings for equality, 8 bytes at a time. At the end,
+;;; adjust rdx so that it is offset to the exact byte that mismatched.
+;;;
+;;; We already know at this point that the first three bytes of the
+;;; strings match each other, and they can be safely passed over before
+;;; starting the compare loop. So what this code does is skip over 0-3
+;;; bytes, as much as necessary in order to dword-align the edi
+;;; pointer. (rsi will still be misaligned three times out of four.)
+;;;
+;;; It should be confessed that this loop usually does not represent
+;;; much of the total running time. Replacing it with a more
+;;; straightforward "rep cmpsb" would not drastically degrade
+;;; performance.
+*/
+
+LoopCmps:
+        mov rax, [rsi + rdx]
+        xor rax, [rdi + rdx]
+        jnz LeaveLoopCmps
+
+        mov rax, [rsi + rdx + 8]
+        xor rax, [rdi + rdx + 8]
+        jnz LeaveLoopCmps8
+
+
+        mov rax, [rsi + rdx + 8+8]
+        xor rax, [rdi + rdx + 8+8]
+        jnz LeaveLoopCmps16
+
+        add rdx,8+8+8
+
+		BEFORE_JMP
+        jnz  LoopCmps
+        jmp  LenMaximum
+		AFTER_JMP
+		
+LeaveLoopCmps16: add rdx,8
+LeaveLoopCmps8: add rdx,8
+LeaveLoopCmps:
+
+        test    eax, 0x0000FFFF
+        jnz LenLower
+
+        test eax,0xffffffff
+
+        jnz LenLower32
+
+        add rdx,4
+        shr rax,32
+        or ax,ax
+		BEFORE_JMP
+        jnz LenLower
+		AFTER_JMP
+
+LenLower32:
+        shr eax,16
+        add rdx,2
+		
+LenLower:		
+        sub al, 1
+        adc rdx, 0
+//;;; Calculate the length of the match. If it is longer than MAX_MATCH,
+//;;; then automatically accept it as the best possible match and leave.
+
+        lea rax, [rdi + rdx]
+        sub rax, r9
+        cmp eax, MAX_MATCH
+		BEFORE_JMP
+        jge LenMaximum
+		AFTER_JMP
+/*
+;;; If the length of the match is not longer than the best match we
+;;; have so far, then forget it and return to the lookup loop.
+;///////////////////////////////////
+*/
+        cmp eax, r11d
+        jg  LongerMatch
+
+        lea rsi,[r10+r11]
+
+        mov rdi, prev_ad
+        mov edx, [chainlenwmask]
+		BEFORE_JMP
+        jmp LookupLoop
+		AFTER_JMP
+/*
+;;;         s->match_start = cur_match;
+;;;         best_len = len;
+;;;         if (len >= nice_match) break;
+;;;         scan_end = *(ushf*)(scan+best_len-1);
+*/
+LongerMatch:
+        mov r11d, eax
+        mov match_start, r8d
+        cmp eax, [nicematch]
+		BEFORE_JMP
+        jge LeaveNow
+		AFTER_JMP
+
+        lea rsi,[r10+rax]
+
+        movzx   ebx, word ptr [r9 + rax - 1]
+        mov rdi, prev_ad
+        mov edx, [chainlenwmask]
+		BEFORE_JMP
+        jmp LookupLoop
+		AFTER_JMP
+
+//;;; Accept the current string, with the maximum possible length.
+
+LenMaximum:
+        mov r11d,MAX_MATCH
+        mov match_start, r8d
+
+//;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+//;;; return s->lookahead;
+
+LeaveNow:
+        mov eax, Lookahead
+        cmp r11d, eax
+        cmovng eax, r11d
+
+
+
+//;;; Restore the stack and return from whence we came.
+
+
+//        mov rsi,[save_rsi]
+//        mov rdi,[save_rdi]
+        mov rbx,[save_rbx]
+        mov rbp,[save_rbp]
+        mov r12,[save_r12]
+        mov r13,[save_r13]
+        mov r14,[save_r14]
+        mov r15,[save_r15]
+
+
+        ret 0
+//; please don't remove this string !
+//; Your can freely use gvmat64 in any free or commercial app
+//; but it is far better don't remove the string in the binary!
+ //   db     0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998, converted to amd 64 by Gilles Vollant 2005",0dh,0ah,0
+
+
+match_init:
+  ret 0
+
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/README b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/README
new file mode 100644
index 00000000..e75ed132
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/README
@@ -0,0 +1 @@
+See infback9.h for what this is and how to use it.
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/infback9.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/infback9.c
new file mode 100644
index 00000000..7bbe90ce
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/infback9.c
@@ -0,0 +1,617 @@
+/* infback9.c -- inflate deflate64 data using a call-back interface
+ * Copyright (C) 1995-2008 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "infback9.h"
+#include "inftree9.h"
+#include "inflate9.h"
+
+#define WSIZE 65536UL
+
+/*
+   strm provides memory allocation functions in zalloc and zfree, or
+   Z_NULL to use the library memory allocation functions.
+
+   window is a user-supplied window and output buffer that is 64K bytes.
+ */
+int ZEXPORT inflateBack9Init_(strm, window, version, stream_size)
+z_stream FAR *strm;
+unsigned char FAR *window;
+const char *version;
+int stream_size;
+{
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL || window == Z_NULL)
+        return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+    }
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
+                                               sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (voidpf)state;
+    state->window = window;
+    return Z_OK;
+}
+
+/*
+   Build and output length and distance decoding tables for fixed code
+   decoding.
+ */
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+void makefixed9(void)
+{
+    unsigned sym, bits, low, size;
+    code *next, *lenfix, *distfix;
+    struct inflate_state state;
+    code fixed[544];
+
+    /* literal/length table */
+    sym = 0;
+    while (sym < 144) state.lens[sym++] = 8;
+    while (sym < 256) state.lens[sym++] = 9;
+    while (sym < 280) state.lens[sym++] = 7;
+    while (sym < 288) state.lens[sym++] = 8;
+    next = fixed;
+    lenfix = next;
+    bits = 9;
+    inflate_table9(LENS, state.lens, 288, &(next), &(bits), state.work);
+
+    /* distance table */
+    sym = 0;
+    while (sym < 32) state.lens[sym++] = 5;
+    distfix = next;
+    bits = 5;
+    inflate_table9(DISTS, state.lens, 32, &(next), &(bits), state.work);
+
+    /* write tables */
+    puts("    /* inffix9.h -- table for decoding deflate64 fixed codes");
+    puts("     * Generated automatically by makefixed9().");
+    puts("     */");
+    puts("");
+    puts("    /* WARNING: this file should *not* be used by applications.");
+    puts("       It is part of the implementation of this library and is");
+    puts("       subject to change. Applications should only use zlib.h.");
+    puts("     */");
+    puts("");
+    size = 1U << 9;
+    printf("    static const code lenfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 6) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", lenfix[low].op, lenfix[low].bits,
+               lenfix[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+    size = 1U << 5;
+    printf("\n    static const code distfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 5) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", distfix[low].op, distfix[low].bits,
+               distfix[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+}
+#endif /* MAKEFIXED */
+
+/* Macros for inflateBack(): */
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Assure that some input is available.  If input is requested, but denied,
+   then return a Z_BUF_ERROR from inflateBack(). */
+#define PULL() \
+    do { \
+        if (have == 0) { \
+            have = in(in_desc, &next); \
+            if (have == 0) { \
+                next = Z_NULL; \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflateBack()
+   with an error if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        PULL(); \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflateBack() with
+   an error. */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n <= 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/* Assure that some output space is available, by writing out the window
+   if it's full.  If the write fails, return from inflateBack() with a
+   Z_BUF_ERROR. */
+#define ROOM() \
+    do { \
+        if (left == 0) { \
+            put = window; \
+            left = WSIZE; \
+            wrap = 1; \
+            if (out(out_desc, put, (unsigned)left)) { \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/*
+   strm provides the memory allocation functions and window buffer on input,
+   and provides information on the unused input on return.  For Z_DATA_ERROR
+   returns, strm will also provide an error message.
+
+   in() and out() are the call-back input and output functions.  When
+   inflateBack() needs more input, it calls in().  When inflateBack() has
+   filled the window with output, or when it completes with data in the
+   window, it calls out() to write out the data.  The application must not
+   change the provided input until in() is called again or inflateBack()
+   returns.  The application must not change the window/output buffer until
+   inflateBack() returns.
+
+   in() and out() are called with a descriptor parameter provided in the
+   inflateBack() call.  This parameter can be a structure that provides the
+   information required to do the read or write, as well as accumulated
+   information on the input and output such as totals and check values.
+
+   in() should return zero on failure.  out() should return non-zero on
+   failure.  If either in() or out() fails, than inflateBack() returns a
+   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
+   was in() or out() that caused in the error.  Otherwise,  inflateBack()
+   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
+   error, or Z_MEM_ERROR if it could not allocate memory for the state.
+   inflateBack() can also return Z_STREAM_ERROR if the input parameters
+   are not correct, i.e. strm is Z_NULL or the state was not initialized.
+ */
+int ZEXPORT inflateBack9(strm, in, in_desc, out, out_desc)
+z_stream FAR *strm;
+in_func in;
+void FAR *in_desc;
+out_func out;
+void FAR *out_desc;
+{
+    struct inflate_state FAR *state;
+    unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have;              /* available input */
+    unsigned long left;         /* available output */
+    inflate_mode mode;          /* current inflate mode */
+    int lastblock;              /* true if processing last block */
+    int wrap;                   /* true if the window has wrapped */
+    unsigned long write;        /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if needed */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned extra;             /* extra bits needed */
+    unsigned long length;       /* literal or length of data to copy */
+    unsigned long offset;       /* distance back to copy string from */
+    unsigned long copy;         /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code const FAR *lencode;    /* starting table for length/literal codes */
+    code const FAR *distcode;   /* starting table for distance codes */
+    unsigned lenbits;           /* index bits for lencode */
+    unsigned distbits;          /* index bits for distcode */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+#include "inffix9.h"
+
+    /* Check that the strm exists and that the state was initialized */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* Reset the state */
+    strm->msg = Z_NULL;
+    mode = TYPE;
+    lastblock = 0;
+    write = 0;
+    wrap = 0;
+    window = state->window;
+    next = strm->next_in;
+    have = next != Z_NULL ? strm->avail_in : 0;
+    hold = 0;
+    bits = 0;
+    put = window;
+    left = WSIZE;
+    lencode = Z_NULL;
+    distcode = Z_NULL;
+
+    /* Inflate until end of block marked as last */
+    for (;;)
+        switch (mode) {
+        case TYPE:
+            /* determine and dispatch block type */
+            if (lastblock) {
+                BYTEBITS();
+                mode = DONE;
+                break;
+            }
+            NEEDBITS(3);
+            lastblock = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        lastblock ? " (last)" : ""));
+                mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                lencode = lenfix;
+                lenbits = 9;
+                distcode = distfix;
+                distbits = 5;
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        lastblock ? " (last)" : ""));
+                mode = LEN;                     /* decode codes */
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        lastblock ? " (last)" : ""));
+                mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+
+        case STORED:
+            /* get and verify stored block length */
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                mode = BAD;
+                break;
+            }
+            length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %lu\n",
+                    length));
+            INITBITS();
+
+            /* copy stored block from input to output */
+            while (length != 0) {
+                copy = length;
+                PULL();
+                ROOM();
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                length -= copy;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            mode = TYPE;
+            break;
+
+        case TABLE:
+            /* get dynamic table entries descriptor */
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+            if (state->nlen > 286) {
+                strm->msg = (char *)"too many length symbols";
+                mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+
+            /* get code length code lengths (not a typo) */
+            state->have = 0;
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            lencode = (code const FAR *)(state->next);
+            lenbits = 7;
+            ret = inflate_table9(CODES, state->lens, 19, &(state->next),
+                                &(lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+
+            /* get length and distance code code lengths */
+            state->have = 0;
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = lencode[BITS(lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    NEEDBITS(here.bits);
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            mode = BAD;
+                            break;
+                        }
+                        len = (unsigned)(state->lens[state->have - 1]);
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftree9.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            lencode = (code const FAR *)(state->next);
+            lenbits = 9;
+            ret = inflate_table9(LENS, state->lens, state->nlen,
+                            &(state->next), &(lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                mode = BAD;
+                break;
+            }
+            distcode = (code const FAR *)(state->next);
+            distbits = 6;
+            ret = inflate_table9(DISTS, state->lens + state->nlen,
+                            state->ndist, &(state->next), &(distbits),
+                            state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            mode = LEN;
+
+        case LEN:
+            /* get a literal, length, or end-of-block code */
+            for (;;) {
+                here = lencode[BITS(lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            length = (unsigned)here.val;
+
+            /* process literal */
+            if (here.op == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                ROOM();
+                *put++ = (unsigned char)(length);
+                left--;
+                mode = LEN;
+                break;
+            }
+
+            /* process end of block */
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                mode = TYPE;
+                break;
+            }
+
+            /* invalid code */
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                mode = BAD;
+                break;
+            }
+
+            /* length code -- get extra bits, if any */
+            extra = (unsigned)(here.op) & 31;
+            if (extra != 0) {
+                NEEDBITS(extra);
+                length += BITS(extra);
+                DROPBITS(extra);
+            }
+            Tracevv((stderr, "inflate:         length %lu\n", length));
+
+            /* get distance code */
+            for (;;) {
+                here = distcode[BITS(distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                mode = BAD;
+                break;
+            }
+            offset = (unsigned)here.val;
+
+            /* get distance extra bits, if any */
+            extra = (unsigned)(here.op) & 15;
+            if (extra != 0) {
+                NEEDBITS(extra);
+                offset += BITS(extra);
+                DROPBITS(extra);
+            }
+            if (offset > WSIZE - (wrap ? 0: left)) {
+                strm->msg = (char *)"invalid distance too far back";
+                mode = BAD;
+                break;
+            }
+            Tracevv((stderr, "inflate:         distance %lu\n", offset));
+
+            /* copy match from window to output */
+            do {
+                ROOM();
+                copy = WSIZE - offset;
+                if (copy < left) {
+                    from = put + copy;
+                    copy = left - copy;
+                }
+                else {
+                    from = put - offset;
+                    copy = left;
+                }
+                if (copy > length) copy = length;
+                length -= copy;
+                left -= copy;
+                do {
+                    *put++ = *from++;
+                } while (--copy);
+            } while (length != 0);
+            break;
+
+        case DONE:
+            /* inflate stream terminated properly -- write leftover output */
+            ret = Z_STREAM_END;
+            if (left < WSIZE) {
+                if (out(out_desc, window, (unsigned)(WSIZE - left)))
+                    ret = Z_BUF_ERROR;
+            }
+            goto inf_leave;
+
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+
+        default:                /* can't happen, but makes compilers happy */
+            ret = Z_STREAM_ERROR;
+            goto inf_leave;
+        }
+
+    /* Return unused input */
+  inf_leave:
+    strm->next_in = next;
+    strm->avail_in = have;
+    return ret;
+}
+
+int ZEXPORT inflateBack9End(strm)
+z_stream FAR *strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/infback9.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/infback9.h
new file mode 100644
index 00000000..1073c0a3
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/infback9.h
@@ -0,0 +1,37 @@
+/* infback9.h -- header for using inflateBack9 functions
+ * Copyright (C) 2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * This header file and associated patches provide a decoder for PKWare's
+ * undocumented deflate64 compression method (method 9).  Use with infback9.c,
+ * inftree9.h, inftree9.c, and inffix9.h.  These patches are not supported.
+ * This should be compiled with zlib, since it uses zutil.h and zutil.o.
+ * This code has not yet been tested on 16-bit architectures.  See the
+ * comments in zlib.h for inflateBack() usage.  These functions are used
+ * identically, except that there is no windowBits parameter, and a 64K
+ * window must be provided.  Also if int's are 16 bits, then a zero for
+ * the third parameter of the "out" function actually means 65536UL.
+ * zlib.h must be included before this header file.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ZEXTERN int ZEXPORT inflateBack9 OF((z_stream FAR *strm,
+                                    in_func in, void FAR *in_desc,
+                                    out_func out, void FAR *out_desc));
+ZEXTERN int ZEXPORT inflateBack9End OF((z_stream FAR *strm));
+ZEXTERN int ZEXPORT inflateBack9Init_ OF((z_stream FAR *strm,
+                                         unsigned char FAR *window,
+                                         const char *version,
+                                         int stream_size));
+#define inflateBack9Init(strm, window) \
+        inflateBack9Init_((strm), (window), \
+        ZLIB_VERSION, sizeof(z_stream))
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/inffix9.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/inffix9.h
new file mode 100644
index 00000000..ee5671d2
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/inffix9.h
@@ -0,0 +1,107 @@
+    /* inffix9.h -- table for decoding deflate64 fixed codes
+     * Generated automatically by makefixed9().
+     */
+
+    /* WARNING: this file should *not* be used by applications.
+       It is part of the implementation of this library and is
+       subject to change. Applications should only use zlib.h.
+     */
+
+    static const code lenfix[512] = {
+        {96,7,0},{0,8,80},{0,8,16},{132,8,115},{130,7,31},{0,8,112},
+        {0,8,48},{0,9,192},{128,7,10},{0,8,96},{0,8,32},{0,9,160},
+        {0,8,0},{0,8,128},{0,8,64},{0,9,224},{128,7,6},{0,8,88},
+        {0,8,24},{0,9,144},{131,7,59},{0,8,120},{0,8,56},{0,9,208},
+        {129,7,17},{0,8,104},{0,8,40},{0,9,176},{0,8,8},{0,8,136},
+        {0,8,72},{0,9,240},{128,7,4},{0,8,84},{0,8,20},{133,8,227},
+        {131,7,43},{0,8,116},{0,8,52},{0,9,200},{129,7,13},{0,8,100},
+        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},
+        {128,7,8},{0,8,92},{0,8,28},{0,9,152},{132,7,83},{0,8,124},
+        {0,8,60},{0,9,216},{130,7,23},{0,8,108},{0,8,44},{0,9,184},
+        {0,8,12},{0,8,140},{0,8,76},{0,9,248},{128,7,3},{0,8,82},
+        {0,8,18},{133,8,163},{131,7,35},{0,8,114},{0,8,50},{0,9,196},
+        {129,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},{0,8,130},
+        {0,8,66},{0,9,228},{128,7,7},{0,8,90},{0,8,26},{0,9,148},
+        {132,7,67},{0,8,122},{0,8,58},{0,9,212},{130,7,19},{0,8,106},
+        {0,8,42},{0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},
+        {128,7,5},{0,8,86},{0,8,22},{65,8,0},{131,7,51},{0,8,118},
+        {0,8,54},{0,9,204},{129,7,15},{0,8,102},{0,8,38},{0,9,172},
+        {0,8,6},{0,8,134},{0,8,70},{0,9,236},{128,7,9},{0,8,94},
+        {0,8,30},{0,9,156},{132,7,99},{0,8,126},{0,8,62},{0,9,220},
+        {130,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
+        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{133,8,131},
+        {130,7,31},{0,8,113},{0,8,49},{0,9,194},{128,7,10},{0,8,97},
+        {0,8,33},{0,9,162},{0,8,1},{0,8,129},{0,8,65},{0,9,226},
+        {128,7,6},{0,8,89},{0,8,25},{0,9,146},{131,7,59},{0,8,121},
+        {0,8,57},{0,9,210},{129,7,17},{0,8,105},{0,8,41},{0,9,178},
+        {0,8,9},{0,8,137},{0,8,73},{0,9,242},{128,7,4},{0,8,85},
+        {0,8,21},{144,8,3},{131,7,43},{0,8,117},{0,8,53},{0,9,202},
+        {129,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},
+        {0,8,69},{0,9,234},{128,7,8},{0,8,93},{0,8,29},{0,9,154},
+        {132,7,83},{0,8,125},{0,8,61},{0,9,218},{130,7,23},{0,8,109},
+        {0,8,45},{0,9,186},{0,8,13},{0,8,141},{0,8,77},{0,9,250},
+        {128,7,3},{0,8,83},{0,8,19},{133,8,195},{131,7,35},{0,8,115},
+        {0,8,51},{0,9,198},{129,7,11},{0,8,99},{0,8,35},{0,9,166},
+        {0,8,3},{0,8,131},{0,8,67},{0,9,230},{128,7,7},{0,8,91},
+        {0,8,27},{0,9,150},{132,7,67},{0,8,123},{0,8,59},{0,9,214},
+        {130,7,19},{0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},
+        {0,8,75},{0,9,246},{128,7,5},{0,8,87},{0,8,23},{77,8,0},
+        {131,7,51},{0,8,119},{0,8,55},{0,9,206},{129,7,15},{0,8,103},
+        {0,8,39},{0,9,174},{0,8,7},{0,8,135},{0,8,71},{0,9,238},
+        {128,7,9},{0,8,95},{0,8,31},{0,9,158},{132,7,99},{0,8,127},
+        {0,8,63},{0,9,222},{130,7,27},{0,8,111},{0,8,47},{0,9,190},
+        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},
+        {0,8,16},{132,8,115},{130,7,31},{0,8,112},{0,8,48},{0,9,193},
+        {128,7,10},{0,8,96},{0,8,32},{0,9,161},{0,8,0},{0,8,128},
+        {0,8,64},{0,9,225},{128,7,6},{0,8,88},{0,8,24},{0,9,145},
+        {131,7,59},{0,8,120},{0,8,56},{0,9,209},{129,7,17},{0,8,104},
+        {0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},{0,9,241},
+        {128,7,4},{0,8,84},{0,8,20},{133,8,227},{131,7,43},{0,8,116},
+        {0,8,52},{0,9,201},{129,7,13},{0,8,100},{0,8,36},{0,9,169},
+        {0,8,4},{0,8,132},{0,8,68},{0,9,233},{128,7,8},{0,8,92},
+        {0,8,28},{0,9,153},{132,7,83},{0,8,124},{0,8,60},{0,9,217},
+        {130,7,23},{0,8,108},{0,8,44},{0,9,185},{0,8,12},{0,8,140},
+        {0,8,76},{0,9,249},{128,7,3},{0,8,82},{0,8,18},{133,8,163},
+        {131,7,35},{0,8,114},{0,8,50},{0,9,197},{129,7,11},{0,8,98},
+        {0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
+        {128,7,7},{0,8,90},{0,8,26},{0,9,149},{132,7,67},{0,8,122},
+        {0,8,58},{0,9,213},{130,7,19},{0,8,106},{0,8,42},{0,9,181},
+        {0,8,10},{0,8,138},{0,8,74},{0,9,245},{128,7,5},{0,8,86},
+        {0,8,22},{65,8,0},{131,7,51},{0,8,118},{0,8,54},{0,9,205},
+        {129,7,15},{0,8,102},{0,8,38},{0,9,173},{0,8,6},{0,8,134},
+        {0,8,70},{0,9,237},{128,7,9},{0,8,94},{0,8,30},{0,9,157},
+        {132,7,99},{0,8,126},{0,8,62},{0,9,221},{130,7,27},{0,8,110},
+        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},
+        {96,7,0},{0,8,81},{0,8,17},{133,8,131},{130,7,31},{0,8,113},
+        {0,8,49},{0,9,195},{128,7,10},{0,8,97},{0,8,33},{0,9,163},
+        {0,8,1},{0,8,129},{0,8,65},{0,9,227},{128,7,6},{0,8,89},
+        {0,8,25},{0,9,147},{131,7,59},{0,8,121},{0,8,57},{0,9,211},
+        {129,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},{0,8,137},
+        {0,8,73},{0,9,243},{128,7,4},{0,8,85},{0,8,21},{144,8,3},
+        {131,7,43},{0,8,117},{0,8,53},{0,9,203},{129,7,13},{0,8,101},
+        {0,8,37},{0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},
+        {128,7,8},{0,8,93},{0,8,29},{0,9,155},{132,7,83},{0,8,125},
+        {0,8,61},{0,9,219},{130,7,23},{0,8,109},{0,8,45},{0,9,187},
+        {0,8,13},{0,8,141},{0,8,77},{0,9,251},{128,7,3},{0,8,83},
+        {0,8,19},{133,8,195},{131,7,35},{0,8,115},{0,8,51},{0,9,199},
+        {129,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
+        {0,8,67},{0,9,231},{128,7,7},{0,8,91},{0,8,27},{0,9,151},
+        {132,7,67},{0,8,123},{0,8,59},{0,9,215},{130,7,19},{0,8,107},
+        {0,8,43},{0,9,183},{0,8,11},{0,8,139},{0,8,75},{0,9,247},
+        {128,7,5},{0,8,87},{0,8,23},{77,8,0},{131,7,51},{0,8,119},
+        {0,8,55},{0,9,207},{129,7,15},{0,8,103},{0,8,39},{0,9,175},
+        {0,8,7},{0,8,135},{0,8,71},{0,9,239},{128,7,9},{0,8,95},
+        {0,8,31},{0,9,159},{132,7,99},{0,8,127},{0,8,63},{0,9,223},
+        {130,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},
+        {0,8,79},{0,9,255}
+    };
+
+    static const code distfix[32] = {
+        {128,5,1},{135,5,257},{131,5,17},{139,5,4097},{129,5,5},
+        {137,5,1025},{133,5,65},{141,5,16385},{128,5,3},{136,5,513},
+        {132,5,33},{140,5,8193},{130,5,9},{138,5,2049},{134,5,129},
+        {142,5,32769},{128,5,2},{135,5,385},{131,5,25},{139,5,6145},
+        {129,5,7},{137,5,1537},{133,5,97},{141,5,24577},{128,5,4},
+        {136,5,769},{132,5,49},{140,5,12289},{130,5,13},{138,5,3073},
+        {134,5,193},{142,5,49153}
+    };
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/inflate9.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/inflate9.h
new file mode 100644
index 00000000..ee9a7939
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/inflate9.h
@@ -0,0 +1,47 @@
+/* inflate9.h -- internal inflate state definition
+ * Copyright (C) 1995-2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* Possible inflate modes between inflate() calls */
+typedef enum {
+        TYPE,       /* i: waiting for type bits, including last-flag bit */
+        STORED,     /* i: waiting for stored size (length and complement) */
+        TABLE,      /* i: waiting for dynamic block table lengths */
+            LEN,        /* i: waiting for length/lit code */
+    DONE,       /* finished check, done -- remain here until reset */
+    BAD         /* got a data error -- remain here until reset */
+} inflate_mode;
+
+/*
+    State transitions between above modes -
+
+    (most modes can go to the BAD mode -- not shown for clarity)
+
+    Read deflate blocks:
+            TYPE -> STORED or TABLE or LEN or DONE
+            STORED -> TYPE
+            TABLE -> LENLENS -> CODELENS -> LEN
+    Read deflate codes:
+                LEN -> LEN or TYPE
+ */
+
+/* state maintained between inflate() calls.  Approximately 7K bytes. */
+struct inflate_state {
+        /* sliding window */
+    unsigned char FAR *window;  /* allocated sliding window, if needed */
+        /* dynamic table building */
+    unsigned ncode;             /* number of code length code lengths */
+    unsigned nlen;              /* number of length code lengths */
+    unsigned ndist;             /* number of distance code lengths */
+    unsigned have;              /* number of code lengths in lens[] */
+    code FAR *next;             /* next available space in codes[] */
+    unsigned short lens[320];   /* temporary storage for code lengths */
+    unsigned short work[288];   /* work area for code table building */
+    code codes[ENOUGH];         /* space for code tables */
+};
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/inftree9.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/inftree9.c
new file mode 100644
index 00000000..306c5f1b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/inftree9.c
@@ -0,0 +1,324 @@
+/* inftree9.c -- generate Huffman trees for efficient decoding
+ * Copyright (C) 1995-2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftree9.h"
+
+#define MAXBITS 15
+
+const char inflate9_copyright[] =
+   " inflate9 1.2.5 Copyright 1995-2010 Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/*
+   Build a set of tables to decode the provided canonical Huffman code.
+   The code lengths are lens[0..codes-1].  The result starts at *table,
+   whose indices are 0..2^bits-1.  work is a writable array of at least
+   lens shorts, which is used as a work area.  type is the type of code
+   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
+   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
+   on return points to the next available entry's address.  bits is the
+   requested root table index bits, and on return it is the actual root
+   table index bits.  It will differ if the request is greater than the
+   longest code or if it is less than the shortest code.
+ */
+int inflate_table9(type, lens, codes, table, bits, work)
+codetype type;
+unsigned short FAR *lens;
+unsigned codes;
+code FAR * FAR *table;
+unsigned FAR *bits;
+unsigned short FAR *work;
+{
+    unsigned len;               /* a code's length in bits */
+    unsigned sym;               /* index of code symbols */
+    unsigned min, max;          /* minimum and maximum code lengths */
+    unsigned root;              /* number of index bits for root table */
+    unsigned curr;              /* number of index bits for current table */
+    unsigned drop;              /* code bits to drop for sub-table */
+    int left;                   /* number of prefix codes available */
+    unsigned used;              /* code entries in table used */
+    unsigned huff;              /* Huffman code */
+    unsigned incr;              /* for incrementing code, index */
+    unsigned fill;              /* index for replicating entries */
+    unsigned low;               /* low bits for current root entry */
+    unsigned mask;              /* mask for low root bits */
+    code this;                  /* table entry for duplication */
+    code FAR *next;             /* next available space in table */
+    const unsigned short FAR *base;     /* base value table to use */
+    const unsigned short FAR *extra;    /* extra bits table to use */
+    int end;                    /* use base and extra for symbol > end */
+    unsigned short count[MAXBITS+1];    /* number of codes of each length */
+    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
+    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17,
+        19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115,
+        131, 163, 195, 227, 3, 0, 0};
+    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
+        128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
+        130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
+        133, 133, 133, 133, 144, 73, 195};
+    static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
+        65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
+        4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153};
+    static const unsigned short dext[32] = { /* Distance codes 0..31 extra */
+        128, 128, 128, 128, 129, 129, 130, 130, 131, 131, 132, 132,
+        133, 133, 134, 134, 135, 135, 136, 136, 137, 137, 138, 138,
+        139, 139, 140, 140, 141, 141, 142, 142};
+
+    /*
+       Process a set of code lengths to create a canonical Huffman code.  The
+       code lengths are lens[0..codes-1].  Each length corresponds to the
+       symbols 0..codes-1.  The Huffman code is generated by first sorting the
+       symbols by length from short to long, and retaining the symbol order
+       for codes with equal lengths.  Then the code starts with all zero bits
+       for the first code of the shortest length, and the codes are integer
+       increments for the same length, and zeros are appended as the length
+       increases.  For the deflate format, these bits are stored backwards
+       from their more natural integer increment ordering, and so when the
+       decoding tables are built in the large loop below, the integer codes
+       are incremented backwards.
+
+       This routine assumes, but does not check, that all of the entries in
+       lens[] are in the range 0..MAXBITS.  The caller must assure this.
+       1..MAXBITS is interpreted as that code length.  zero means that that
+       symbol does not occur in this code.
+
+       The codes are sorted by computing a count of codes for each length,
+       creating from that a table of starting indices for each length in the
+       sorted table, and then entering the symbols in order in the sorted
+       table.  The sorted table is work[], with that space being provided by
+       the caller.
+
+       The length counts are used for other purposes as well, i.e. finding
+       the minimum and maximum length codes, determining if there are any
+       codes at all, checking for a valid set of lengths, and looking ahead
+       at length counts to determine sub-table sizes when building the
+       decoding tables.
+     */
+
+    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
+    for (len = 0; len <= MAXBITS; len++)
+        count[len] = 0;
+    for (sym = 0; sym < codes; sym++)
+        count[lens[sym]]++;
+
+    /* bound code lengths, force root to be within code lengths */
+    root = *bits;
+    for (max = MAXBITS; max >= 1; max--)
+        if (count[max] != 0) break;
+    if (root > max) root = max;
+    if (max == 0) return -1;            /* no codes! */
+    for (min = 1; min <= MAXBITS; min++)
+        if (count[min] != 0) break;
+    if (root < min) root = min;
+
+    /* check for an over-subscribed or incomplete set of lengths */
+    left = 1;
+    for (len = 1; len <= MAXBITS; len++) {
+        left <<= 1;
+        left -= count[len];
+        if (left < 0) return -1;        /* over-subscribed */
+    }
+    if (left > 0 && (type == CODES || max != 1))
+        return -1;                      /* incomplete set */
+
+    /* generate offsets into symbol table for each length for sorting */
+    offs[1] = 0;
+    for (len = 1; len < MAXBITS; len++)
+        offs[len + 1] = offs[len] + count[len];
+
+    /* sort symbols by length, by symbol order within each length */
+    for (sym = 0; sym < codes; sym++)
+        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
+
+    /*
+       Create and fill in decoding tables.  In this loop, the table being
+       filled is at next and has curr index bits.  The code being used is huff
+       with length len.  That code is converted to an index by dropping drop
+       bits off of the bottom.  For codes where len is less than drop + curr,
+       those top drop + curr - len bits are incremented through all values to
+       fill the table with replicated entries.
+
+       root is the number of index bits for the root table.  When len exceeds
+       root, sub-tables are created pointed to by the root entry with an index
+       of the low root bits of huff.  This is saved in low to check for when a
+       new sub-table should be started.  drop is zero when the root table is
+       being filled, and drop is root when sub-tables are being filled.
+
+       When a new sub-table is needed, it is necessary to look ahead in the
+       code lengths to determine what size sub-table is needed.  The length
+       counts are used for this, and so count[] is decremented as codes are
+       entered in the tables.
+
+       used keeps track of how many table entries have been allocated from the
+       provided *table space.  It is checked for LENS and DIST tables against
+       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
+       the initial root table size constants.  See the comments in inftree9.h
+       for more information.
+
+       sym increments through all symbols, and the loop terminates when
+       all codes of length max, i.e. all codes, have been processed.  This
+       routine permits incomplete codes, so another loop after this one fills
+       in the rest of the decoding tables with invalid code markers.
+     */
+
+    /* set up for code type */
+    switch (type) {
+    case CODES:
+        base = extra = work;    /* dummy value--not used */
+        end = 19;
+        break;
+    case LENS:
+        base = lbase;
+        base -= 257;
+        extra = lext;
+        extra -= 257;
+        end = 256;
+        break;
+    default:            /* DISTS */
+        base = dbase;
+        extra = dext;
+        end = -1;
+    }
+
+    /* initialize state for loop */
+    huff = 0;                   /* starting code */
+    sym = 0;                    /* starting code symbol */
+    len = min;                  /* starting code length */
+    next = *table;              /* current table to fill in */
+    curr = root;                /* current table index bits */
+    drop = 0;                   /* current bits to drop from code for index */
+    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
+    used = 1U << root;          /* use root table entries */
+    mask = used - 1;            /* mask for comparing low */
+
+    /* check available table space */
+    if ((type == LENS && used >= ENOUGH_LENS) ||
+        (type == DISTS && used >= ENOUGH_DISTS))
+        return 1;
+
+    /* process all codes and make table entries */
+    for (;;) {
+        /* create table entry */
+        this.bits = (unsigned char)(len - drop);
+        if ((int)(work[sym]) < end) {
+            this.op = (unsigned char)0;
+            this.val = work[sym];
+        }
+        else if ((int)(work[sym]) > end) {
+            this.op = (unsigned char)(extra[work[sym]]);
+            this.val = base[work[sym]];
+        }
+        else {
+            this.op = (unsigned char)(32 + 64);         /* end of block */
+            this.val = 0;
+        }
+
+        /* replicate for those indices with low len bits equal to huff */
+        incr = 1U << (len - drop);
+        fill = 1U << curr;
+        do {
+            fill -= incr;
+            next[(huff >> drop) + fill] = this;
+        } while (fill != 0);
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+
+        /* go to next symbol, update count, len */
+        sym++;
+        if (--(count[len]) == 0) {
+            if (len == max) break;
+            len = lens[work[sym]];
+        }
+
+        /* create new sub-table if needed */
+        if (len > root && (huff & mask) != low) {
+            /* if first time, transition to sub-tables */
+            if (drop == 0)
+                drop = root;
+
+            /* increment past last table */
+            next += 1U << curr;
+
+            /* determine length of next table */
+            curr = len - drop;
+            left = (int)(1 << curr);
+            while (curr + drop < max) {
+                left -= count[curr + drop];
+                if (left <= 0) break;
+                curr++;
+                left <<= 1;
+            }
+
+            /* check for enough space */
+            used += 1U << curr;
+            if ((type == LENS && used >= ENOUGH_LENS) ||
+                (type == DISTS && used >= ENOUGH_DISTS))
+                return 1;
+
+            /* point entry in root table to sub-table */
+            low = huff & mask;
+            (*table)[low].op = (unsigned char)curr;
+            (*table)[low].bits = (unsigned char)root;
+            (*table)[low].val = (unsigned short)(next - *table);
+        }
+    }
+
+    /*
+       Fill in rest of table for incomplete codes.  This loop is similar to the
+       loop above in incrementing huff for table indices.  It is assumed that
+       len is equal to curr + drop, so there is no loop needed to increment
+       through high index bits.  When the current sub-table is filled, the loop
+       drops back to the root table to fill in any remaining entries there.
+     */
+    this.op = (unsigned char)64;                /* invalid code marker */
+    this.bits = (unsigned char)(len - drop);
+    this.val = (unsigned short)0;
+    while (huff != 0) {
+        /* when done with sub-table, drop back to root table */
+        if (drop != 0 && (huff & mask) != low) {
+            drop = 0;
+            len = root;
+            next = *table;
+            curr = root;
+            this.bits = (unsigned char)len;
+        }
+
+        /* put invalid code marker in table */
+        next[huff >> drop] = this;
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+    }
+
+    /* set return parameters */
+    *table += used;
+    *bits = root;
+    return 0;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/inftree9.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/inftree9.h
new file mode 100644
index 00000000..5ab21f0c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/infback9/inftree9.h
@@ -0,0 +1,61 @@
+/* inftree9.h -- header to use inftree9.c
+ * Copyright (C) 1995-2008 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* Structure for decoding tables.  Each entry provides either the
+   information needed to do the operation requested by the code that
+   indexed that table entry, or it provides a pointer to another
+   table that indexes more bits of the code.  op indicates whether
+   the entry is a pointer to another table, a literal, a length or
+   distance, an end-of-block, or an invalid code.  For a table
+   pointer, the low four bits of op is the number of index bits of
+   that table.  For a length or distance, the low four bits of op
+   is the number of extra bits to get after the code.  bits is
+   the number of bits in this code or part of the code to drop off
+   of the bit buffer.  val is the actual byte to output in the case
+   of a literal, the base length or distance, or the offset from
+   the current table to the next table.  Each entry is four bytes. */
+typedef struct {
+    unsigned char op;           /* operation, extra bits, table bits */
+    unsigned char bits;         /* bits in this part of the code */
+    unsigned short val;         /* offset in table or code value */
+} code;
+
+/* op values as set by inflate_table():
+    00000000 - literal
+    0000tttt - table link, tttt != 0 is the number of table index bits
+    100eeeee - length or distance, eeee is the number of extra bits
+    01100000 - end of block
+    01000000 - invalid code
+ */
+
+/* Maximum size of the dynamic table.  The maximum number of code structures is
+   1446, which is the sum of 852 for literal/length codes and 594 for distance
+   codes.  These values were found by exhaustive searches using the program
+   examples/enough.c found in the zlib distribtution.  The arguments to that
+   program are the number of symbols, the initial root table size, and the
+   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
+   returns returns 852, and "enough 32 6 15" for distance codes returns 594.
+   The initial root table size (9 or 6) is found in the fifth argument of the
+   inflate_table() calls in infback9.c.  If the root table size is changed,
+   then these maximum sizes would be need to be recalculated and updated. */
+#define ENOUGH_LENS 852
+#define ENOUGH_DISTS 594
+#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
+
+/* Type of code to build for inflate_table9() */
+typedef enum {
+    CODES,
+    LENS,
+    DISTS
+} codetype;
+
+extern int inflate_table9 OF((codetype type, unsigned short FAR *lens,
+                             unsigned codes, code FAR * FAR *table,
+                             unsigned FAR *bits, unsigned short FAR *work));
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/inflate86/inffas86.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/inflate86/inffas86.c
new file mode 100644
index 00000000..7292f67b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/inflate86/inffas86.c
@@ -0,0 +1,1157 @@
+/* inffas86.c is a hand tuned assembler version of
+ *
+ * inffast.c -- fast decoding
+ * Copyright (C) 1995-2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Copyright (C) 2003 Chris Anderson <christop@charm.net>
+ * Please use the copyright conditions above.
+ *
+ * Dec-29-2003 -- I added AMD64 inflate asm support.  This version is also
+ * slightly quicker on x86 systems because, instead of using rep movsb to copy
+ * data, it uses rep movsw, which moves data in 2-byte chunks instead of single
+ * bytes.  I've tested the AMD64 code on a Fedora Core 1 + the x86_64 updates
+ * from http://fedora.linux.duke.edu/fc1_x86_64
+ * which is running on an Athlon 64 3000+ / Gigabyte GA-K8VT800M system with
+ * 1GB ram.  The 64-bit version is about 4% faster than the 32-bit version,
+ * when decompressing mozilla-source-1.3.tar.gz.
+ *
+ * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from
+ * the gcc -S output of zlib-1.2.0/inffast.c.  Zlib-1.2.0 is in beta release at
+ * the moment.  I have successfully compiled and tested this code with gcc2.96,
+ * gcc3.2, icc5.0, msvc6.0.  It is very close to the speed of inffast.S
+ * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX
+ * enabled.  I will attempt to merge the MMX code into this version.  Newer
+ * versions of this and inffast.S can be found at
+ * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+/* Mark Adler's comments from inffast.c: */
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state->mode == LEN
+        strm->avail_in >= 6
+        strm->avail_out >= 258
+        start >= strm->avail_out
+        state->bits < 8
+
+   On return, state->mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm->avail_out >= 258 for each loop to avoid checking for
+      output space.
+ */
+void inflate_fast(strm, start)
+z_streamp strm;
+unsigned start;         /* inflate()'s starting value for strm->avail_out */
+{
+    struct inflate_state FAR *state;
+    struct inffast_ar {
+/* 64   32                               x86  x86_64 */
+/* ar offset                              register */
+/*  0    0 */ void *esp;                /* esp save */
+/*  8    4 */ void *ebp;                /* ebp save */
+/* 16    8 */ unsigned char FAR *in;    /* esi rsi  local strm->next_in */
+/* 24   12 */ unsigned char FAR *last;  /*     r9   while in < last */
+/* 32   16 */ unsigned char FAR *out;   /* edi rdi  local strm->next_out */
+/* 40   20 */ unsigned char FAR *beg;   /*          inflate()'s init next_out */
+/* 48   24 */ unsigned char FAR *end;   /*     r10  while out < end */
+/* 56   28 */ unsigned char FAR *window;/*          size of window, wsize!=0 */
+/* 64   32 */ code const FAR *lcode;    /* ebp rbp  local strm->lencode */
+/* 72   36 */ code const FAR *dcode;    /*     r11  local strm->distcode */
+/* 80   40 */ unsigned long hold;       /* edx rdx  local strm->hold */
+/* 88   44 */ unsigned bits;            /* ebx rbx  local strm->bits */
+/* 92   48 */ unsigned wsize;           /*          window size */
+/* 96   52 */ unsigned write;           /*          window write index */
+/*100   56 */ unsigned lmask;           /*     r12  mask for lcode */
+/*104   60 */ unsigned dmask;           /*     r13  mask for dcode */
+/*108   64 */ unsigned len;             /*     r14  match length */
+/*112   68 */ unsigned dist;            /*     r15  match distance */
+/*116   72 */ unsigned status;          /*          set when state chng*/
+    } ar;
+
+#if defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )
+#define PAD_AVAIL_IN 6
+#define PAD_AVAIL_OUT 258
+#else
+#define PAD_AVAIL_IN 5
+#define PAD_AVAIL_OUT 257
+#endif
+
+    /* copy state to local variables */
+    state = (struct inflate_state FAR *)strm->state;
+    ar.in = strm->next_in;
+    ar.last = ar.in + (strm->avail_in - PAD_AVAIL_IN);
+    ar.out = strm->next_out;
+    ar.beg = ar.out - (start - strm->avail_out);
+    ar.end = ar.out + (strm->avail_out - PAD_AVAIL_OUT);
+    ar.wsize = state->wsize;
+    ar.write = state->wnext;
+    ar.window = state->window;
+    ar.hold = state->hold;
+    ar.bits = state->bits;
+    ar.lcode = state->lencode;
+    ar.dcode = state->distcode;
+    ar.lmask = (1U << state->lenbits) - 1;
+    ar.dmask = (1U << state->distbits) - 1;
+
+    /* decode literals and length/distances until end-of-block or not enough
+       input data or output space */
+
+    /* align in on 1/2 hold size boundary */
+    while (((unsigned long)(void *)ar.in & (sizeof(ar.hold) / 2 - 1)) != 0) {
+        ar.hold += (unsigned long)*ar.in++ << ar.bits;
+        ar.bits += 8;
+    }
+
+#if defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )
+    __asm__ __volatile__ (
+"        leaq    %0, %%rax\n"
+"        movq    %%rbp, 8(%%rax)\n"       /* save regs rbp and rsp */
+"        movq    %%rsp, (%%rax)\n"
+"        movq    %%rax, %%rsp\n"          /* make rsp point to &ar */
+"        movq    16(%%rsp), %%rsi\n"      /* rsi  = in */
+"        movq    32(%%rsp), %%rdi\n"      /* rdi  = out */
+"        movq    24(%%rsp), %%r9\n"       /* r9   = last */
+"        movq    48(%%rsp), %%r10\n"      /* r10  = end */
+"        movq    64(%%rsp), %%rbp\n"      /* rbp  = lcode */
+"        movq    72(%%rsp), %%r11\n"      /* r11  = dcode */
+"        movq    80(%%rsp), %%rdx\n"      /* rdx  = hold */
+"        movl    88(%%rsp), %%ebx\n"      /* ebx  = bits */
+"        movl    100(%%rsp), %%r12d\n"    /* r12d = lmask */
+"        movl    104(%%rsp), %%r13d\n"    /* r13d = dmask */
+                                          /* r14d = len */
+                                          /* r15d = dist */
+"        cld\n"
+"        cmpq    %%rdi, %%r10\n"
+"        je      .L_one_time\n"           /* if only one decode left */
+"        cmpq    %%rsi, %%r9\n"
+"        je      .L_one_time\n"
+"        jmp     .L_do_loop\n"
+
+".L_one_time:\n"
+"        movq    %%r12, %%r8\n"           /* r8 = lmask */
+"        cmpb    $32, %%bl\n"
+"        ja      .L_get_length_code_one_time\n"
+
+"        lodsl\n"                         /* eax = *(uint *)in++ */
+"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
+"        addb    $32, %%bl\n"             /* bits += 32 */
+"        shlq    %%cl, %%rax\n"
+"        orq     %%rax, %%rdx\n"          /* hold |= *((uint *)in)++ << bits */
+"        jmp     .L_get_length_code_one_time\n"
+
+".align 32,0x90\n"
+".L_while_test:\n"
+"        cmpq    %%rdi, %%r10\n"
+"        jbe     .L_break_loop\n"
+"        cmpq    %%rsi, %%r9\n"
+"        jbe     .L_break_loop\n"
+
+".L_do_loop:\n"
+"        movq    %%r12, %%r8\n"           /* r8 = lmask */
+"        cmpb    $32, %%bl\n"
+"        ja      .L_get_length_code\n"    /* if (32 < bits) */
+
+"        lodsl\n"                         /* eax = *(uint *)in++ */
+"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
+"        addb    $32, %%bl\n"             /* bits += 32 */
+"        shlq    %%cl, %%rax\n"
+"        orq     %%rax, %%rdx\n"          /* hold |= *((uint *)in)++ << bits */
+
+".L_get_length_code:\n"
+"        andq    %%rdx, %%r8\n"            /* r8 &= hold */
+"        movl    (%%rbp,%%r8,4), %%eax\n"  /* eax = lcode[hold & lmask] */
+
+"        movb    %%ah, %%cl\n"            /* cl = this.bits */
+"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
+"        shrq    %%cl, %%rdx\n"           /* hold >>= this.bits */
+
+"        testb   %%al, %%al\n"
+"        jnz     .L_test_for_length_base\n" /* if (op != 0) 45.7% */
+
+"        movq    %%r12, %%r8\n"            /* r8 = lmask */
+"        shrl    $16, %%eax\n"            /* output this.val char */
+"        stosb\n"
+
+".L_get_length_code_one_time:\n"
+"        andq    %%rdx, %%r8\n"            /* r8 &= hold */
+"        movl    (%%rbp,%%r8,4), %%eax\n" /* eax = lcode[hold & lmask] */
+
+".L_dolen:\n"
+"        movb    %%ah, %%cl\n"            /* cl = this.bits */
+"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
+"        shrq    %%cl, %%rdx\n"           /* hold >>= this.bits */
+
+"        testb   %%al, %%al\n"
+"        jnz     .L_test_for_length_base\n" /* if (op != 0) 45.7% */
+
+"        shrl    $16, %%eax\n"            /* output this.val char */
+"        stosb\n"
+"        jmp     .L_while_test\n"
+
+".align 32,0x90\n"
+".L_test_for_length_base:\n"
+"        movl    %%eax, %%r14d\n"         /* len = this */
+"        shrl    $16, %%r14d\n"           /* len = this.val */
+"        movb    %%al, %%cl\n"
+
+"        testb   $16, %%al\n"
+"        jz      .L_test_for_second_level_length\n" /* if ((op & 16) == 0) 8% */
+"        andb    $15, %%cl\n"             /* op &= 15 */
+"        jz      .L_decode_distance\n"    /* if (!op) */
+
+".L_add_bits_to_len:\n"
+"        subb    %%cl, %%bl\n"
+"        xorl    %%eax, %%eax\n"
+"        incl    %%eax\n"
+"        shll    %%cl, %%eax\n"
+"        decl    %%eax\n"
+"        andl    %%edx, %%eax\n"          /* eax &= hold */
+"        shrq    %%cl, %%rdx\n"
+"        addl    %%eax, %%r14d\n"         /* len += hold & mask[op] */
+
+".L_decode_distance:\n"
+"        movq    %%r13, %%r8\n"           /* r8 = dmask */
+"        cmpb    $32, %%bl\n"
+"        ja      .L_get_distance_code\n"  /* if (32 < bits) */
+
+"        lodsl\n"                         /* eax = *(uint *)in++ */
+"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
+"        addb    $32, %%bl\n"             /* bits += 32 */
+"        shlq    %%cl, %%rax\n"
+"        orq     %%rax, %%rdx\n"          /* hold |= *((uint *)in)++ << bits */
+
+".L_get_distance_code:\n"
+"        andq    %%rdx, %%r8\n"           /* r8 &= hold */
+"        movl    (%%r11,%%r8,4), %%eax\n" /* eax = dcode[hold & dmask] */
+
+".L_dodist:\n"
+"        movl    %%eax, %%r15d\n"         /* dist = this */
+"        shrl    $16, %%r15d\n"           /* dist = this.val */
+"        movb    %%ah, %%cl\n"
+"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
+"        shrq    %%cl, %%rdx\n"           /* hold >>= this.bits */
+"        movb    %%al, %%cl\n"            /* cl = this.op */
+
+"        testb   $16, %%al\n"             /* if ((op & 16) == 0) */
+"        jz      .L_test_for_second_level_dist\n"
+"        andb    $15, %%cl\n"             /* op &= 15 */
+"        jz      .L_check_dist_one\n"
+
+".L_add_bits_to_dist:\n"
+"        subb    %%cl, %%bl\n"
+"        xorl    %%eax, %%eax\n"
+"        incl    %%eax\n"
+"        shll    %%cl, %%eax\n"
+"        decl    %%eax\n"                 /* (1 << op) - 1 */
+"        andl    %%edx, %%eax\n"          /* eax &= hold */
+"        shrq    %%cl, %%rdx\n"
+"        addl    %%eax, %%r15d\n"         /* dist += hold & ((1 << op) - 1) */
+
+".L_check_window:\n"
+"        movq    %%rsi, %%r8\n"           /* save in so from can use it's reg */
+"        movq    %%rdi, %%rax\n"
+"        subq    40(%%rsp), %%rax\n"      /* nbytes = out - beg */
+
+"        cmpl    %%r15d, %%eax\n"
+"        jb      .L_clip_window\n"        /* if (dist > nbytes) 4.2% */
+
+"        movl    %%r14d, %%ecx\n"         /* ecx = len */
+"        movq    %%rdi, %%rsi\n"
+"        subq    %%r15, %%rsi\n"          /* from = out - dist */
+
+"        sarl    %%ecx\n"
+"        jnc     .L_copy_two\n"           /* if len % 2 == 0 */
+
+"        rep     movsw\n"
+"        movb    (%%rsi), %%al\n"
+"        movb    %%al, (%%rdi)\n"
+"        incq    %%rdi\n"
+
+"        movq    %%r8, %%rsi\n"           /* move in back to %rsi, toss from */
+"        jmp     .L_while_test\n"
+
+".L_copy_two:\n"
+"        rep     movsw\n"
+"        movq    %%r8, %%rsi\n"           /* move in back to %rsi, toss from */
+"        jmp     .L_while_test\n"
+
+".align 32,0x90\n"
+".L_check_dist_one:\n"
+"        cmpl    $1, %%r15d\n"            /* if dist 1, is a memset */
+"        jne     .L_check_window\n"
+"        cmpq    %%rdi, 40(%%rsp)\n"      /* if out == beg, outside window */
+"        je      .L_check_window\n"
+
+"        movl    %%r14d, %%ecx\n"         /* ecx = len */
+"        movb    -1(%%rdi), %%al\n"
+"        movb    %%al, %%ah\n"
+
+"        sarl    %%ecx\n"
+"        jnc     .L_set_two\n"
+"        movb    %%al, (%%rdi)\n"
+"        incq    %%rdi\n"
+
+".L_set_two:\n"
+"        rep     stosw\n"
+"        jmp     .L_while_test\n"
+
+".align 32,0x90\n"
+".L_test_for_second_level_length:\n"
+"        testb   $64, %%al\n"
+"        jnz     .L_test_for_end_of_block\n" /* if ((op & 64) != 0) */
+
+"        xorl    %%eax, %%eax\n"
+"        incl    %%eax\n"
+"        shll    %%cl, %%eax\n"
+"        decl    %%eax\n"
+"        andl    %%edx, %%eax\n"         /* eax &= hold */
+"        addl    %%r14d, %%eax\n"        /* eax += len */
+"        movl    (%%rbp,%%rax,4), %%eax\n" /* eax = lcode[val+(hold&mask[op])]*/
+"        jmp     .L_dolen\n"
+
+".align 32,0x90\n"
+".L_test_for_second_level_dist:\n"
+"        testb   $64, %%al\n"
+"        jnz     .L_invalid_distance_code\n" /* if ((op & 64) != 0) */
+
+"        xorl    %%eax, %%eax\n"
+"        incl    %%eax\n"
+"        shll    %%cl, %%eax\n"
+"        decl    %%eax\n"
+"        andl    %%edx, %%eax\n"         /* eax &= hold */
+"        addl    %%r15d, %%eax\n"        /* eax += dist */
+"        movl    (%%r11,%%rax,4), %%eax\n" /* eax = dcode[val+(hold&mask[op])]*/
+"        jmp     .L_dodist\n"
+
+".align 32,0x90\n"
+".L_clip_window:\n"
+"        movl    %%eax, %%ecx\n"         /* ecx = nbytes */
+"        movl    92(%%rsp), %%eax\n"     /* eax = wsize, prepare for dist cmp */
+"        negl    %%ecx\n"                /* nbytes = -nbytes */
+
+"        cmpl    %%r15d, %%eax\n"
+"        jb      .L_invalid_distance_too_far\n" /* if (dist > wsize) */
+
+"        addl    %%r15d, %%ecx\n"         /* nbytes = dist - nbytes */
+"        cmpl    $0, 96(%%rsp)\n"
+"        jne     .L_wrap_around_window\n" /* if (write != 0) */
+
+"        movq    56(%%rsp), %%rsi\n"     /* from  = window */
+"        subl    %%ecx, %%eax\n"         /* eax  -= nbytes */
+"        addq    %%rax, %%rsi\n"         /* from += wsize - nbytes */
+
+"        movl    %%r14d, %%eax\n"        /* eax = len */
+"        cmpl    %%ecx, %%r14d\n"
+"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
+
+"        subl    %%ecx, %%eax\n"         /* eax -= nbytes */
+"        rep     movsb\n"
+"        movq    %%rdi, %%rsi\n"
+"        subq    %%r15, %%rsi\n"         /* from = &out[ -dist ] */
+"        jmp     .L_do_copy\n"
+
+".align 32,0x90\n"
+".L_wrap_around_window:\n"
+"        movl    96(%%rsp), %%eax\n"     /* eax = write */
+"        cmpl    %%eax, %%ecx\n"
+"        jbe     .L_contiguous_in_window\n" /* if (write >= nbytes) */
+
+"        movl    92(%%rsp), %%esi\n"     /* from  = wsize */
+"        addq    56(%%rsp), %%rsi\n"     /* from += window */
+"        addq    %%rax, %%rsi\n"         /* from += write */
+"        subq    %%rcx, %%rsi\n"         /* from -= nbytes */
+"        subl    %%eax, %%ecx\n"         /* nbytes -= write */
+
+"        movl    %%r14d, %%eax\n"        /* eax = len */
+"        cmpl    %%ecx, %%eax\n"
+"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
+
+"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
+"        rep     movsb\n"
+"        movq    56(%%rsp), %%rsi\n"     /* from = window */
+"        movl    96(%%rsp), %%ecx\n"     /* nbytes = write */
+"        cmpl    %%ecx, %%eax\n"
+"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
+
+"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
+"        rep     movsb\n"
+"        movq    %%rdi, %%rsi\n"
+"        subq    %%r15, %%rsi\n"         /* from = out - dist */
+"        jmp     .L_do_copy\n"
+
+".align 32,0x90\n"
+".L_contiguous_in_window:\n"
+"        movq    56(%%rsp), %%rsi\n"     /* rsi = window */
+"        addq    %%rax, %%rsi\n"
+"        subq    %%rcx, %%rsi\n"         /* from += write - nbytes */
+
+"        movl    %%r14d, %%eax\n"        /* eax = len */
+"        cmpl    %%ecx, %%eax\n"
+"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
+
+"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
+"        rep     movsb\n"
+"        movq    %%rdi, %%rsi\n"
+"        subq    %%r15, %%rsi\n"         /* from = out - dist */
+"        jmp     .L_do_copy\n"           /* if (nbytes >= len) */
+
+".align 32,0x90\n"
+".L_do_copy:\n"
+"        movl    %%eax, %%ecx\n"         /* ecx = len */
+"        rep     movsb\n"
+
+"        movq    %%r8, %%rsi\n"          /* move in back to %esi, toss from */
+"        jmp     .L_while_test\n"
+
+".L_test_for_end_of_block:\n"
+"        testb   $32, %%al\n"
+"        jz      .L_invalid_literal_length_code\n"
+"        movl    $1, 116(%%rsp)\n"
+"        jmp     .L_break_loop_with_status\n"
+
+".L_invalid_literal_length_code:\n"
+"        movl    $2, 116(%%rsp)\n"
+"        jmp     .L_break_loop_with_status\n"
+
+".L_invalid_distance_code:\n"
+"        movl    $3, 116(%%rsp)\n"
+"        jmp     .L_break_loop_with_status\n"
+
+".L_invalid_distance_too_far:\n"
+"        movl    $4, 116(%%rsp)\n"
+"        jmp     .L_break_loop_with_status\n"
+
+".L_break_loop:\n"
+"        movl    $0, 116(%%rsp)\n"
+
+".L_break_loop_with_status:\n"
+/* put in, out, bits, and hold back into ar and pop esp */
+"        movq    %%rsi, 16(%%rsp)\n"     /* in */
+"        movq    %%rdi, 32(%%rsp)\n"     /* out */
+"        movl    %%ebx, 88(%%rsp)\n"     /* bits */
+"        movq    %%rdx, 80(%%rsp)\n"     /* hold */
+"        movq    (%%rsp), %%rax\n"       /* restore rbp and rsp */
+"        movq    8(%%rsp), %%rbp\n"
+"        movq    %%rax, %%rsp\n"
+          :
+          : "m" (ar)
+          : "memory", "%rax", "%rbx", "%rcx", "%rdx", "%rsi", "%rdi",
+            "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"
+    );
+#elif ( defined( __GNUC__ ) || defined( __ICC ) ) && defined( __i386 )
+    __asm__ __volatile__ (
+"        leal    %0, %%eax\n"
+"        movl    %%esp, (%%eax)\n"        /* save esp, ebp */
+"        movl    %%ebp, 4(%%eax)\n"
+"        movl    %%eax, %%esp\n"
+"        movl    8(%%esp), %%esi\n"       /* esi = in */
+"        movl    16(%%esp), %%edi\n"      /* edi = out */
+"        movl    40(%%esp), %%edx\n"      /* edx = hold */
+"        movl    44(%%esp), %%ebx\n"      /* ebx = bits */
+"        movl    32(%%esp), %%ebp\n"      /* ebp = lcode */
+
+"        cld\n"
+"        jmp     .L_do_loop\n"
+
+".align 32,0x90\n"
+".L_while_test:\n"
+"        cmpl    %%edi, 24(%%esp)\n"      /* out < end */
+"        jbe     .L_break_loop\n"
+"        cmpl    %%esi, 12(%%esp)\n"      /* in < last */
+"        jbe     .L_break_loop\n"
+
+".L_do_loop:\n"
+"        cmpb    $15, %%bl\n"
+"        ja      .L_get_length_code\n"    /* if (15 < bits) */
+
+"        xorl    %%eax, %%eax\n"
+"        lodsw\n"                         /* al = *(ushort *)in++ */
+"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
+"        addb    $16, %%bl\n"             /* bits += 16 */
+"        shll    %%cl, %%eax\n"
+"        orl     %%eax, %%edx\n"        /* hold |= *((ushort *)in)++ << bits */
+
+".L_get_length_code:\n"
+"        movl    56(%%esp), %%eax\n"      /* eax = lmask */
+"        andl    %%edx, %%eax\n"          /* eax &= hold */
+"        movl    (%%ebp,%%eax,4), %%eax\n" /* eax = lcode[hold & lmask] */
+
+".L_dolen:\n"
+"        movb    %%ah, %%cl\n"            /* cl = this.bits */
+"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
+"        shrl    %%cl, %%edx\n"           /* hold >>= this.bits */
+
+"        testb   %%al, %%al\n"
+"        jnz     .L_test_for_length_base\n" /* if (op != 0) 45.7% */
+
+"        shrl    $16, %%eax\n"            /* output this.val char */
+"        stosb\n"
+"        jmp     .L_while_test\n"
+
+".align 32,0x90\n"
+".L_test_for_length_base:\n"
+"        movl    %%eax, %%ecx\n"          /* len = this */
+"        shrl    $16, %%ecx\n"            /* len = this.val */
+"        movl    %%ecx, 64(%%esp)\n"      /* save len */
+"        movb    %%al, %%cl\n"
+
+"        testb   $16, %%al\n"
+"        jz      .L_test_for_second_level_length\n" /* if ((op & 16) == 0) 8% */
+"        andb    $15, %%cl\n"             /* op &= 15 */
+"        jz      .L_decode_distance\n"    /* if (!op) */
+"        cmpb    %%cl, %%bl\n"
+"        jae     .L_add_bits_to_len\n"    /* if (op <= bits) */
+
+"        movb    %%cl, %%ch\n"            /* stash op in ch, freeing cl */
+"        xorl    %%eax, %%eax\n"
+"        lodsw\n"                         /* al = *(ushort *)in++ */
+"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
+"        addb    $16, %%bl\n"             /* bits += 16 */
+"        shll    %%cl, %%eax\n"
+"        orl     %%eax, %%edx\n"         /* hold |= *((ushort *)in)++ << bits */
+"        movb    %%ch, %%cl\n"            /* move op back to ecx */
+
+".L_add_bits_to_len:\n"
+"        subb    %%cl, %%bl\n"
+"        xorl    %%eax, %%eax\n"
+"        incl    %%eax\n"
+"        shll    %%cl, %%eax\n"
+"        decl    %%eax\n"
+"        andl    %%edx, %%eax\n"          /* eax &= hold */
+"        shrl    %%cl, %%edx\n"
+"        addl    %%eax, 64(%%esp)\n"      /* len += hold & mask[op] */
+
+".L_decode_distance:\n"
+"        cmpb    $15, %%bl\n"
+"        ja      .L_get_distance_code\n"  /* if (15 < bits) */
+
+"        xorl    %%eax, %%eax\n"
+"        lodsw\n"                         /* al = *(ushort *)in++ */
+"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
+"        addb    $16, %%bl\n"             /* bits += 16 */
+"        shll    %%cl, %%eax\n"
+"        orl     %%eax, %%edx\n"         /* hold |= *((ushort *)in)++ << bits */
+
+".L_get_distance_code:\n"
+"        movl    60(%%esp), %%eax\n"      /* eax = dmask */
+"        movl    36(%%esp), %%ecx\n"      /* ecx = dcode */
+"        andl    %%edx, %%eax\n"          /* eax &= hold */
+"        movl    (%%ecx,%%eax,4), %%eax\n"/* eax = dcode[hold & dmask] */
+
+".L_dodist:\n"
+"        movl    %%eax, %%ebp\n"          /* dist = this */
+"        shrl    $16, %%ebp\n"            /* dist = this.val */
+"        movb    %%ah, %%cl\n"
+"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
+"        shrl    %%cl, %%edx\n"           /* hold >>= this.bits */
+"        movb    %%al, %%cl\n"            /* cl = this.op */
+
+"        testb   $16, %%al\n"             /* if ((op & 16) == 0) */
+"        jz      .L_test_for_second_level_dist\n"
+"        andb    $15, %%cl\n"             /* op &= 15 */
+"        jz      .L_check_dist_one\n"
+"        cmpb    %%cl, %%bl\n"
+"        jae     .L_add_bits_to_dist\n"   /* if (op <= bits) 97.6% */
+
+"        movb    %%cl, %%ch\n"            /* stash op in ch, freeing cl */
+"        xorl    %%eax, %%eax\n"
+"        lodsw\n"                         /* al = *(ushort *)in++ */
+"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
+"        addb    $16, %%bl\n"             /* bits += 16 */
+"        shll    %%cl, %%eax\n"
+"        orl     %%eax, %%edx\n"        /* hold |= *((ushort *)in)++ << bits */
+"        movb    %%ch, %%cl\n"            /* move op back to ecx */
+
+".L_add_bits_to_dist:\n"
+"        subb    %%cl, %%bl\n"
+"        xorl    %%eax, %%eax\n"
+"        incl    %%eax\n"
+"        shll    %%cl, %%eax\n"
+"        decl    %%eax\n"                 /* (1 << op) - 1 */
+"        andl    %%edx, %%eax\n"          /* eax &= hold */
+"        shrl    %%cl, %%edx\n"
+"        addl    %%eax, %%ebp\n"          /* dist += hold & ((1 << op) - 1) */
+
+".L_check_window:\n"
+"        movl    %%esi, 8(%%esp)\n"       /* save in so from can use it's reg */
+"        movl    %%edi, %%eax\n"
+"        subl    20(%%esp), %%eax\n"      /* nbytes = out - beg */
+
+"        cmpl    %%ebp, %%eax\n"
+"        jb      .L_clip_window\n"        /* if (dist > nbytes) 4.2% */
+
+"        movl    64(%%esp), %%ecx\n"      /* ecx = len */
+"        movl    %%edi, %%esi\n"
+"        subl    %%ebp, %%esi\n"          /* from = out - dist */
+
+"        sarl    %%ecx\n"
+"        jnc     .L_copy_two\n"           /* if len % 2 == 0 */
+
+"        rep     movsw\n"
+"        movb    (%%esi), %%al\n"
+"        movb    %%al, (%%edi)\n"
+"        incl    %%edi\n"
+
+"        movl    8(%%esp), %%esi\n"       /* move in back to %esi, toss from */
+"        movl    32(%%esp), %%ebp\n"      /* ebp = lcode */
+"        jmp     .L_while_test\n"
+
+".L_copy_two:\n"
+"        rep     movsw\n"
+"        movl    8(%%esp), %%esi\n"       /* move in back to %esi, toss from */
+"        movl    32(%%esp), %%ebp\n"      /* ebp = lcode */
+"        jmp     .L_while_test\n"
+
+".align 32,0x90\n"
+".L_check_dist_one:\n"
+"        cmpl    $1, %%ebp\n"            /* if dist 1, is a memset */
+"        jne     .L_check_window\n"
+"        cmpl    %%edi, 20(%%esp)\n"
+"        je      .L_check_window\n"      /* out == beg, if outside window */
+
+"        movl    64(%%esp), %%ecx\n"      /* ecx = len */
+"        movb    -1(%%edi), %%al\n"
+"        movb    %%al, %%ah\n"
+
+"        sarl    %%ecx\n"
+"        jnc     .L_set_two\n"
+"        movb    %%al, (%%edi)\n"
+"        incl    %%edi\n"
+
+".L_set_two:\n"
+"        rep     stosw\n"
+"        movl    32(%%esp), %%ebp\n"      /* ebp = lcode */
+"        jmp     .L_while_test\n"
+
+".align 32,0x90\n"
+".L_test_for_second_level_length:\n"
+"        testb   $64, %%al\n"
+"        jnz     .L_test_for_end_of_block\n" /* if ((op & 64) != 0) */
+
+"        xorl    %%eax, %%eax\n"
+"        incl    %%eax\n"
+"        shll    %%cl, %%eax\n"
+"        decl    %%eax\n"
+"        andl    %%edx, %%eax\n"         /* eax &= hold */
+"        addl    64(%%esp), %%eax\n"     /* eax += len */
+"        movl    (%%ebp,%%eax,4), %%eax\n" /* eax = lcode[val+(hold&mask[op])]*/
+"        jmp     .L_dolen\n"
+
+".align 32,0x90\n"
+".L_test_for_second_level_dist:\n"
+"        testb   $64, %%al\n"
+"        jnz     .L_invalid_distance_code\n" /* if ((op & 64) != 0) */
+
+"        xorl    %%eax, %%eax\n"
+"        incl    %%eax\n"
+"        shll    %%cl, %%eax\n"
+"        decl    %%eax\n"
+"        andl    %%edx, %%eax\n"         /* eax &= hold */
+"        addl    %%ebp, %%eax\n"         /* eax += dist */
+"        movl    36(%%esp), %%ecx\n"     /* ecx = dcode */
+"        movl    (%%ecx,%%eax,4), %%eax\n" /* eax = dcode[val+(hold&mask[op])]*/
+"        jmp     .L_dodist\n"
+
+".align 32,0x90\n"
+".L_clip_window:\n"
+"        movl    %%eax, %%ecx\n"
+"        movl    48(%%esp), %%eax\n"     /* eax = wsize */
+"        negl    %%ecx\n"                /* nbytes = -nbytes */
+"        movl    28(%%esp), %%esi\n"     /* from = window */
+
+"        cmpl    %%ebp, %%eax\n"
+"        jb      .L_invalid_distance_too_far\n" /* if (dist > wsize) */
+
+"        addl    %%ebp, %%ecx\n"         /* nbytes = dist - nbytes */
+"        cmpl    $0, 52(%%esp)\n"
+"        jne     .L_wrap_around_window\n" /* if (write != 0) */
+
+"        subl    %%ecx, %%eax\n"
+"        addl    %%eax, %%esi\n"         /* from += wsize - nbytes */
+
+"        movl    64(%%esp), %%eax\n"     /* eax = len */
+"        cmpl    %%ecx, %%eax\n"
+"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
+
+"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
+"        rep     movsb\n"
+"        movl    %%edi, %%esi\n"
+"        subl    %%ebp, %%esi\n"         /* from = out - dist */
+"        jmp     .L_do_copy\n"
+
+".align 32,0x90\n"
+".L_wrap_around_window:\n"
+"        movl    52(%%esp), %%eax\n"     /* eax = write */
+"        cmpl    %%eax, %%ecx\n"
+"        jbe     .L_contiguous_in_window\n" /* if (write >= nbytes) */
+
+"        addl    48(%%esp), %%esi\n"     /* from += wsize */
+"        addl    %%eax, %%esi\n"         /* from += write */
+"        subl    %%ecx, %%esi\n"         /* from -= nbytes */
+"        subl    %%eax, %%ecx\n"         /* nbytes -= write */
+
+"        movl    64(%%esp), %%eax\n"     /* eax = len */
+"        cmpl    %%ecx, %%eax\n"
+"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
+
+"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
+"        rep     movsb\n"
+"        movl    28(%%esp), %%esi\n"     /* from = window */
+"        movl    52(%%esp), %%ecx\n"     /* nbytes = write */
+"        cmpl    %%ecx, %%eax\n"
+"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
+
+"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
+"        rep     movsb\n"
+"        movl    %%edi, %%esi\n"
+"        subl    %%ebp, %%esi\n"         /* from = out - dist */
+"        jmp     .L_do_copy\n"
+
+".align 32,0x90\n"
+".L_contiguous_in_window:\n"
+"        addl    %%eax, %%esi\n"
+"        subl    %%ecx, %%esi\n"         /* from += write - nbytes */
+
+"        movl    64(%%esp), %%eax\n"     /* eax = len */
+"        cmpl    %%ecx, %%eax\n"
+"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
+
+"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
+"        rep     movsb\n"
+"        movl    %%edi, %%esi\n"
+"        subl    %%ebp, %%esi\n"         /* from = out - dist */
+"        jmp     .L_do_copy\n"           /* if (nbytes >= len) */
+
+".align 32,0x90\n"
+".L_do_copy:\n"
+"        movl    %%eax, %%ecx\n"
+"        rep     movsb\n"
+
+"        movl    8(%%esp), %%esi\n"      /* move in back to %esi, toss from */
+"        movl    32(%%esp), %%ebp\n"     /* ebp = lcode */
+"        jmp     .L_while_test\n"
+
+".L_test_for_end_of_block:\n"
+"        testb   $32, %%al\n"
+"        jz      .L_invalid_literal_length_code\n"
+"        movl    $1, 72(%%esp)\n"
+"        jmp     .L_break_loop_with_status\n"
+
+".L_invalid_literal_length_code:\n"
+"        movl    $2, 72(%%esp)\n"
+"        jmp     .L_break_loop_with_status\n"
+
+".L_invalid_distance_code:\n"
+"        movl    $3, 72(%%esp)\n"
+"        jmp     .L_break_loop_with_status\n"
+
+".L_invalid_distance_too_far:\n"
+"        movl    8(%%esp), %%esi\n"
+"        movl    $4, 72(%%esp)\n"
+"        jmp     .L_break_loop_with_status\n"
+
+".L_break_loop:\n"
+"        movl    $0, 72(%%esp)\n"
+
+".L_break_loop_with_status:\n"
+/* put in, out, bits, and hold back into ar and pop esp */
+"        movl    %%esi, 8(%%esp)\n"      /* save in */
+"        movl    %%edi, 16(%%esp)\n"     /* save out */
+"        movl    %%ebx, 44(%%esp)\n"     /* save bits */
+"        movl    %%edx, 40(%%esp)\n"     /* save hold */
+"        movl    4(%%esp), %%ebp\n"      /* restore esp, ebp */
+"        movl    (%%esp), %%esp\n"
+          :
+          : "m" (ar)
+          : "memory", "%eax", "%ebx", "%ecx", "%edx", "%esi", "%edi"
+    );
+#elif defined( _MSC_VER ) && ! defined( _M_AMD64 )
+    __asm {
+	lea	eax, ar
+	mov	[eax], esp         /* save esp, ebp */
+	mov	[eax+4], ebp
+	mov	esp, eax
+	mov	esi, [esp+8]       /* esi = in */
+	mov	edi, [esp+16]      /* edi = out */
+	mov	edx, [esp+40]      /* edx = hold */
+	mov	ebx, [esp+44]      /* ebx = bits */
+	mov	ebp, [esp+32]      /* ebp = lcode */
+
+	cld
+	jmp	L_do_loop
+
+ALIGN 4
+L_while_test:
+	cmp	[esp+24], edi
+	jbe	L_break_loop
+	cmp	[esp+12], esi
+	jbe	L_break_loop
+
+L_do_loop:
+	cmp	bl, 15
+	ja	L_get_length_code    /* if (15 < bits) */
+
+	xor	eax, eax
+	lodsw                         /* al = *(ushort *)in++ */
+	mov	cl, bl            /* cl = bits, needs it for shifting */
+	add	bl, 16             /* bits += 16 */
+	shl	eax, cl
+	or	edx, eax        /* hold |= *((ushort *)in)++ << bits */
+
+L_get_length_code:
+	mov	eax, [esp+56]      /* eax = lmask */
+	and	eax, edx          /* eax &= hold */
+	mov	eax, [ebp+eax*4] /* eax = lcode[hold & lmask] */
+
+L_dolen:
+	mov	cl, ah            /* cl = this.bits */
+	sub	bl, ah            /* bits -= this.bits */
+	shr	edx, cl           /* hold >>= this.bits */
+
+	test	al, al
+	jnz	L_test_for_length_base /* if (op != 0) 45.7% */
+
+	shr	eax, 16            /* output this.val char */
+	stosb
+	jmp	L_while_test
+
+ALIGN 4
+L_test_for_length_base:
+	mov	ecx, eax          /* len = this */
+	shr	ecx, 16            /* len = this.val */
+	mov	[esp+64], ecx      /* save len */
+	mov	cl, al
+
+	test	al, 16
+	jz	L_test_for_second_level_length /* if ((op & 16) == 0) 8% */
+	and	cl, 15             /* op &= 15 */
+	jz	L_decode_distance    /* if (!op) */
+	cmp	bl, cl
+	jae	L_add_bits_to_len    /* if (op <= bits) */
+
+	mov	ch, cl            /* stash op in ch, freeing cl */
+	xor	eax, eax
+	lodsw                         /* al = *(ushort *)in++ */
+	mov	cl, bl            /* cl = bits, needs it for shifting */
+	add	bl, 16             /* bits += 16 */
+	shl	eax, cl
+	or	edx, eax         /* hold |= *((ushort *)in)++ << bits */
+	mov	cl, ch            /* move op back to ecx */
+
+L_add_bits_to_len:
+	sub	bl, cl
+	xor	eax, eax
+	inc	eax
+	shl	eax, cl
+	dec	eax
+	and	eax, edx          /* eax &= hold */
+	shr	edx, cl
+	add	[esp+64], eax      /* len += hold & mask[op] */
+
+L_decode_distance:
+	cmp	bl, 15
+	ja	L_get_distance_code  /* if (15 < bits) */
+
+	xor	eax, eax
+	lodsw                         /* al = *(ushort *)in++ */
+	mov	cl, bl            /* cl = bits, needs it for shifting */
+	add	bl, 16             /* bits += 16 */
+	shl	eax, cl
+	or	edx, eax         /* hold |= *((ushort *)in)++ << bits */
+
+L_get_distance_code:
+	mov	eax, [esp+60]      /* eax = dmask */
+	mov	ecx, [esp+36]      /* ecx = dcode */
+	and	eax, edx          /* eax &= hold */
+	mov	eax, [ecx+eax*4]/* eax = dcode[hold & dmask] */
+
+L_dodist:
+	mov	ebp, eax          /* dist = this */
+	shr	ebp, 16            /* dist = this.val */
+	mov	cl, ah
+	sub	bl, ah            /* bits -= this.bits */
+	shr	edx, cl           /* hold >>= this.bits */
+	mov	cl, al            /* cl = this.op */
+
+	test	al, 16             /* if ((op & 16) == 0) */
+	jz	L_test_for_second_level_dist
+	and	cl, 15             /* op &= 15 */
+	jz	L_check_dist_one
+	cmp	bl, cl
+	jae	L_add_bits_to_dist   /* if (op <= bits) 97.6% */
+
+	mov	ch, cl            /* stash op in ch, freeing cl */
+	xor	eax, eax
+	lodsw                         /* al = *(ushort *)in++ */
+	mov	cl, bl            /* cl = bits, needs it for shifting */
+	add	bl, 16             /* bits += 16 */
+	shl	eax, cl
+	or	edx, eax        /* hold |= *((ushort *)in)++ << bits */
+	mov	cl, ch            /* move op back to ecx */
+
+L_add_bits_to_dist:
+	sub	bl, cl
+	xor	eax, eax
+	inc	eax
+	shl	eax, cl
+	dec	eax                 /* (1 << op) - 1 */
+	and	eax, edx          /* eax &= hold */
+	shr	edx, cl
+	add	ebp, eax          /* dist += hold & ((1 << op) - 1) */
+
+L_check_window:
+	mov	[esp+8], esi       /* save in so from can use it's reg */
+	mov	eax, edi
+	sub	eax, [esp+20]      /* nbytes = out - beg */
+
+	cmp	eax, ebp
+	jb	L_clip_window        /* if (dist > nbytes) 4.2% */
+
+	mov	ecx, [esp+64]      /* ecx = len */
+	mov	esi, edi
+	sub	esi, ebp          /* from = out - dist */
+
+	sar	ecx, 1
+	jnc	L_copy_two
+
+	rep     movsw
+	mov	al, [esi]
+	mov	[edi], al
+	inc	edi
+
+	mov	esi, [esp+8]      /* move in back to %esi, toss from */
+	mov	ebp, [esp+32]     /* ebp = lcode */
+	jmp	L_while_test
+
+L_copy_two:
+	rep     movsw
+	mov	esi, [esp+8]      /* move in back to %esi, toss from */
+	mov	ebp, [esp+32]     /* ebp = lcode */
+	jmp	L_while_test
+
+ALIGN 4
+L_check_dist_one:
+	cmp	ebp, 1            /* if dist 1, is a memset */
+	jne	L_check_window
+	cmp	[esp+20], edi
+	je	L_check_window    /* out == beg, if outside window */
+
+	mov	ecx, [esp+64]     /* ecx = len */
+	mov	al, [edi-1]
+	mov	ah, al
+
+	sar	ecx, 1
+	jnc	L_set_two
+	mov	[edi], al         /* memset out with from[-1] */
+	inc	edi
+
+L_set_two:
+	rep     stosw
+	mov	ebp, [esp+32]     /* ebp = lcode */
+	jmp	L_while_test
+
+ALIGN 4
+L_test_for_second_level_length:
+	test	al, 64
+	jnz	L_test_for_end_of_block /* if ((op & 64) != 0) */
+
+	xor	eax, eax
+	inc	eax
+	shl	eax, cl
+	dec	eax
+	and	eax, edx         /* eax &= hold */
+	add	eax, [esp+64]     /* eax += len */
+	mov	eax, [ebp+eax*4] /* eax = lcode[val+(hold&mask[op])]*/
+	jmp	L_dolen
+
+ALIGN 4
+L_test_for_second_level_dist:
+	test	al, 64
+	jnz	L_invalid_distance_code /* if ((op & 64) != 0) */
+
+	xor	eax, eax
+	inc	eax
+	shl	eax, cl
+	dec	eax
+	and	eax, edx         /* eax &= hold */
+	add	eax, ebp         /* eax += dist */
+	mov	ecx, [esp+36]     /* ecx = dcode */
+	mov	eax, [ecx+eax*4] /* eax = dcode[val+(hold&mask[op])]*/
+	jmp	L_dodist
+
+ALIGN 4
+L_clip_window:
+	mov	ecx, eax
+	mov	eax, [esp+48]     /* eax = wsize */
+	neg	ecx                /* nbytes = -nbytes */
+	mov	esi, [esp+28]     /* from = window */
+
+	cmp	eax, ebp
+	jb	L_invalid_distance_too_far /* if (dist > wsize) */
+
+	add	ecx, ebp         /* nbytes = dist - nbytes */
+	cmp	dword ptr [esp+52], 0
+	jne	L_wrap_around_window /* if (write != 0) */
+
+	sub	eax, ecx
+	add	esi, eax         /* from += wsize - nbytes */
+
+	mov	eax, [esp+64]    /* eax = len */
+	cmp	eax, ecx
+	jbe	L_do_copy          /* if (nbytes >= len) */
+
+	sub	eax, ecx         /* len -= nbytes */
+	rep     movsb
+	mov	esi, edi
+	sub	esi, ebp         /* from = out - dist */
+	jmp	L_do_copy
+
+ALIGN 4
+L_wrap_around_window:
+	mov	eax, [esp+52]    /* eax = write */
+	cmp	ecx, eax
+	jbe	L_contiguous_in_window /* if (write >= nbytes) */
+
+	add	esi, [esp+48]    /* from += wsize */
+	add	esi, eax         /* from += write */
+	sub	esi, ecx         /* from -= nbytes */
+	sub	ecx, eax         /* nbytes -= write */
+
+	mov	eax, [esp+64]    /* eax = len */
+	cmp	eax, ecx
+	jbe	L_do_copy          /* if (nbytes >= len) */
+
+	sub	eax, ecx         /* len -= nbytes */
+	rep     movsb
+	mov	esi, [esp+28]     /* from = window */
+	mov	ecx, [esp+52]     /* nbytes = write */
+	cmp	eax, ecx
+	jbe	L_do_copy          /* if (nbytes >= len) */
+
+	sub	eax, ecx         /* len -= nbytes */
+	rep     movsb
+	mov	esi, edi
+	sub	esi, ebp         /* from = out - dist */
+	jmp	L_do_copy
+
+ALIGN 4
+L_contiguous_in_window:
+	add	esi, eax
+	sub	esi, ecx         /* from += write - nbytes */
+
+	mov	eax, [esp+64]    /* eax = len */
+	cmp	eax, ecx
+	jbe	L_do_copy          /* if (nbytes >= len) */
+
+	sub	eax, ecx         /* len -= nbytes */
+	rep     movsb
+	mov	esi, edi
+	sub	esi, ebp         /* from = out - dist */
+	jmp	L_do_copy
+
+ALIGN 4
+L_do_copy:
+	mov	ecx, eax
+	rep     movsb
+
+	mov	esi, [esp+8]      /* move in back to %esi, toss from */
+	mov	ebp, [esp+32]     /* ebp = lcode */
+	jmp	L_while_test
+
+L_test_for_end_of_block:
+	test	al, 32
+	jz	L_invalid_literal_length_code
+	mov	dword ptr [esp+72], 1
+	jmp	L_break_loop_with_status
+
+L_invalid_literal_length_code:
+	mov	dword ptr [esp+72], 2
+	jmp	L_break_loop_with_status
+
+L_invalid_distance_code:
+	mov	dword ptr [esp+72], 3
+	jmp	L_break_loop_with_status
+
+L_invalid_distance_too_far:
+	mov	esi, [esp+4]
+	mov	dword ptr [esp+72], 4
+	jmp	L_break_loop_with_status
+
+L_break_loop:
+	mov	dword ptr [esp+72], 0
+
+L_break_loop_with_status:
+/* put in, out, bits, and hold back into ar and pop esp */
+	mov	[esp+8], esi     /* save in */
+	mov	[esp+16], edi    /* save out */
+	mov	[esp+44], ebx    /* save bits */
+	mov	[esp+40], edx    /* save hold */
+	mov	ebp, [esp+4]     /* restore esp, ebp */
+	mov	esp, [esp]
+    }
+#else
+#error "x86 architecture not defined"
+#endif
+
+    if (ar.status > 1) {
+        if (ar.status == 2)
+            strm->msg = "invalid literal/length code";
+        else if (ar.status == 3)
+            strm->msg = "invalid distance code";
+        else
+            strm->msg = "invalid distance too far back";
+        state->mode = BAD;
+    }
+    else if ( ar.status == 1 ) {
+        state->mode = TYPE;
+    }
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    ar.len = ar.bits >> 3;
+    ar.in -= ar.len;
+    ar.bits -= ar.len << 3;
+    ar.hold &= (1U << ar.bits) - 1;
+
+    /* update state and return */
+    strm->next_in = ar.in;
+    strm->next_out = ar.out;
+    strm->avail_in = (unsigned)(ar.in < ar.last ?
+                                PAD_AVAIL_IN + (ar.last - ar.in) :
+                                PAD_AVAIL_IN - (ar.in - ar.last));
+    strm->avail_out = (unsigned)(ar.out < ar.end ?
+                                 PAD_AVAIL_OUT + (ar.end - ar.out) :
+                                 PAD_AVAIL_OUT - (ar.out - ar.end));
+    state->hold = ar.hold;
+    state->bits = ar.bits;
+    return;
+}
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/inflate86/inffast.S b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/inflate86/inffast.S
new file mode 100644
index 00000000..2245a290
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/inflate86/inffast.S
@@ -0,0 +1,1368 @@
+/*
+ * inffast.S is a hand tuned assembler version of:
+ *
+ * inffast.c -- fast decoding
+ * Copyright (C) 1995-2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Copyright (C) 2003 Chris Anderson <christop@charm.net>
+ * Please use the copyright conditions above.
+ *
+ * This version (Jan-23-2003) of inflate_fast was coded and tested under
+ * GNU/Linux on a pentium 3, using the gcc-3.2 compiler distribution.  On that
+ * machine, I found that gzip style archives decompressed about 20% faster than
+ * the gcc-3.2 -O3 -fomit-frame-pointer compiled version.  Your results will
+ * depend on how large of a buffer is used for z_stream.next_in & next_out
+ * (8K-32K worked best for my 256K cpu cache) and how much overhead there is in
+ * stream processing I/O and crc32/addler32.  In my case, this routine used
+ * 70% of the cpu time and crc32 used 20%.
+ *
+ * I am confident that this version will work in the general case, but I have
+ * not tested a wide variety of datasets or a wide variety of platforms.
+ *
+ * Jan-24-2003 -- Added -DUSE_MMX define for slightly faster inflating.
+ * It should be a runtime flag instead of compile time flag...
+ *
+ * Jan-26-2003 -- Added runtime check for MMX support with cpuid instruction.
+ * With -DUSE_MMX, only MMX code is compiled.  With -DNO_MMX, only non-MMX code
+ * is compiled.  Without either option, runtime detection is enabled.  Runtime
+ * detection should work on all modern cpus and the recomended algorithm (flip
+ * ID bit on eflags and then use the cpuid instruction) is used in many
+ * multimedia applications.  Tested under win2k with gcc-2.95 and gas-2.12
+ * distributed with cygwin3.  Compiling with gcc-2.95 -c inffast.S -o
+ * inffast.obj generates a COFF object which can then be linked with MSVC++
+ * compiled code.  Tested under FreeBSD 4.7 with gcc-2.95.
+ *
+ * Jan-28-2003 -- Tested Athlon XP... MMX mode is slower than no MMX (and
+ * slower than compiler generated code).  Adjusted cpuid check to use the MMX
+ * code only for Pentiums < P4 until I have more data on the P4.  Speed
+ * improvment is only about 15% on the Athlon when compared with code generated
+ * with MSVC++.  Not sure yet, but I think the P4 will also be slower using the
+ * MMX mode because many of it's x86 ALU instructions execute in .5 cycles and
+ * have less latency than MMX ops.  Added code to buffer the last 11 bytes of
+ * the input stream since the MMX code grabs bits in chunks of 32, which
+ * differs from the inffast.c algorithm.  I don't think there would have been
+ * read overruns where a page boundary was crossed (a segfault), but there
+ * could have been overruns when next_in ends on unaligned memory (unintialized
+ * memory read).
+ *
+ * Mar-13-2003 -- P4 MMX is slightly slower than P4 NO_MMX.  I created a C
+ * version of the non-MMX code so that it doesn't depend on zstrm and zstate
+ * structure offsets which are hard coded in this file.  This was last tested
+ * with zlib-1.2.0 which is currently in beta testing, newer versions of this
+ * and inffas86.c can be found at http://www.eetbeetee.com/zlib/ and
+ * http://www.charm.net/~christop/zlib/
+ */
+
+
+/*
+ * if you have underscore linking problems (_inflate_fast undefined), try
+ * using -DGAS_COFF
+ */
+#if ! defined( GAS_COFF ) && ! defined( GAS_ELF )
+
+#if defined( WIN32 ) || defined( __CYGWIN__ )
+#define GAS_COFF /* windows object format */
+#else
+#define GAS_ELF
+#endif
+
+#endif /* ! GAS_COFF && ! GAS_ELF */
+
+
+#if defined( GAS_COFF )
+
+/* coff externals have underscores */
+#define inflate_fast _inflate_fast
+#define inflate_fast_use_mmx _inflate_fast_use_mmx
+
+#endif /* GAS_COFF */
+
+
+.file "inffast.S"
+
+.globl inflate_fast
+
+.text
+.align 4,0
+.L_invalid_literal_length_code_msg:
+.string "invalid literal/length code"
+
+.align 4,0
+.L_invalid_distance_code_msg:
+.string "invalid distance code"
+
+.align 4,0
+.L_invalid_distance_too_far_msg:
+.string "invalid distance too far back"
+
+#if ! defined( NO_MMX )
+.align 4,0
+.L_mask: /* mask[N] = ( 1 << N ) - 1 */
+.long 0
+.long 1
+.long 3
+.long 7
+.long 15
+.long 31
+.long 63
+.long 127
+.long 255
+.long 511
+.long 1023
+.long 2047
+.long 4095
+.long 8191
+.long 16383
+.long 32767
+.long 65535
+.long 131071
+.long 262143
+.long 524287
+.long 1048575
+.long 2097151
+.long 4194303
+.long 8388607
+.long 16777215
+.long 33554431
+.long 67108863
+.long 134217727
+.long 268435455
+.long 536870911
+.long 1073741823
+.long 2147483647
+.long 4294967295
+#endif /* NO_MMX */
+
+.text
+
+/*
+ * struct z_stream offsets, in zlib.h
+ */
+#define next_in_strm   0   /* strm->next_in */
+#define avail_in_strm  4   /* strm->avail_in */
+#define next_out_strm  12  /* strm->next_out */
+#define avail_out_strm 16  /* strm->avail_out */
+#define msg_strm       24  /* strm->msg */
+#define state_strm     28  /* strm->state */
+
+/*
+ * struct inflate_state offsets, in inflate.h
+ */
+#define mode_state     0   /* state->mode */
+#define wsize_state    32  /* state->wsize */
+#define write_state    40  /* state->write */
+#define window_state   44  /* state->window */
+#define hold_state     48  /* state->hold */
+#define bits_state     52  /* state->bits */
+#define lencode_state  68  /* state->lencode */
+#define distcode_state 72  /* state->distcode */
+#define lenbits_state  76  /* state->lenbits */
+#define distbits_state 80  /* state->distbits */
+
+/*
+ * inflate_fast's activation record
+ */
+#define local_var_size 64 /* how much local space for vars */
+#define strm_sp        88 /* first arg: z_stream * (local_var_size + 24) */
+#define start_sp       92 /* second arg: unsigned int (local_var_size + 28) */
+
+/*
+ * offsets for local vars on stack
+ */
+#define out            60  /* unsigned char* */
+#define window         56  /* unsigned char* */
+#define wsize          52  /* unsigned int */
+#define write          48  /* unsigned int */
+#define in             44  /* unsigned char* */
+#define beg            40  /* unsigned char* */
+#define buf            28  /* char[ 12 ] */
+#define len            24  /* unsigned int */
+#define last           20  /* unsigned char* */
+#define end            16  /* unsigned char* */
+#define dcode          12  /* code* */
+#define lcode           8  /* code* */
+#define dmask           4  /* unsigned int */
+#define lmask           0  /* unsigned int */
+
+/*
+ * typedef enum inflate_mode consts, in inflate.h
+ */
+#define INFLATE_MODE_TYPE 11  /* state->mode flags enum-ed in inflate.h */
+#define INFLATE_MODE_BAD  26
+
+
+#if ! defined( USE_MMX ) && ! defined( NO_MMX )
+
+#define RUN_TIME_MMX
+
+#define CHECK_MMX    1
+#define DO_USE_MMX   2
+#define DONT_USE_MMX 3
+
+.globl inflate_fast_use_mmx
+
+.data
+
+.align 4,0
+inflate_fast_use_mmx: /* integer flag for run time control 1=check,2=mmx,3=no */
+.long CHECK_MMX
+
+#if defined( GAS_ELF )
+/* elf info */
+.type   inflate_fast_use_mmx,@object
+.size   inflate_fast_use_mmx,4
+#endif
+
+#endif /* RUN_TIME_MMX */
+
+#if defined( GAS_COFF )
+/* coff info: scl 2 = extern, type 32 = function */
+.def inflate_fast; .scl 2; .type 32; .endef
+#endif
+
+.text
+
+.align 32,0x90
+inflate_fast:
+        pushl   %edi
+        pushl   %esi
+        pushl   %ebp
+        pushl   %ebx
+        pushf   /* save eflags (strm_sp, state_sp assumes this is 32 bits) */
+        subl    $local_var_size, %esp
+        cld
+
+#define strm_r  %esi
+#define state_r %edi
+
+        movl    strm_sp(%esp), strm_r
+        movl    state_strm(strm_r), state_r
+
+        /* in = strm->next_in;
+         * out = strm->next_out;
+         * last = in + strm->avail_in - 11;
+         * beg = out - (start - strm->avail_out);
+         * end = out + (strm->avail_out - 257);
+         */
+        movl    avail_in_strm(strm_r), %edx
+        movl    next_in_strm(strm_r), %eax
+
+        addl    %eax, %edx      /* avail_in += next_in */
+        subl    $11, %edx       /* avail_in -= 11 */
+
+        movl    %eax, in(%esp)
+        movl    %edx, last(%esp)
+
+        movl    start_sp(%esp), %ebp
+        movl    avail_out_strm(strm_r), %ecx
+        movl    next_out_strm(strm_r), %ebx
+
+        subl    %ecx, %ebp      /* start -= avail_out */
+        negl    %ebp            /* start = -start */
+        addl    %ebx, %ebp      /* start += next_out */
+
+        subl    $257, %ecx      /* avail_out -= 257 */
+        addl    %ebx, %ecx      /* avail_out += out */
+
+        movl    %ebx, out(%esp)
+        movl    %ebp, beg(%esp)
+        movl    %ecx, end(%esp)
+
+        /* wsize = state->wsize;
+         * write = state->write;
+         * window = state->window;
+         * hold = state->hold;
+         * bits = state->bits;
+         * lcode = state->lencode;
+         * dcode = state->distcode;
+         * lmask = ( 1 << state->lenbits ) - 1;
+         * dmask = ( 1 << state->distbits ) - 1;
+         */
+
+        movl    lencode_state(state_r), %eax
+        movl    distcode_state(state_r), %ecx
+
+        movl    %eax, lcode(%esp)
+        movl    %ecx, dcode(%esp)
+
+        movl    $1, %eax
+        movl    lenbits_state(state_r), %ecx
+        shll    %cl, %eax
+        decl    %eax
+        movl    %eax, lmask(%esp)
+
+        movl    $1, %eax
+        movl    distbits_state(state_r), %ecx
+        shll    %cl, %eax
+        decl    %eax
+        movl    %eax, dmask(%esp)
+
+        movl    wsize_state(state_r), %eax
+        movl    write_state(state_r), %ecx
+        movl    window_state(state_r), %edx
+
+        movl    %eax, wsize(%esp)
+        movl    %ecx, write(%esp)
+        movl    %edx, window(%esp)
+
+        movl    hold_state(state_r), %ebp
+        movl    bits_state(state_r), %ebx
+
+#undef strm_r
+#undef state_r
+
+#define in_r       %esi
+#define from_r     %esi
+#define out_r      %edi
+
+        movl    in(%esp), in_r
+        movl    last(%esp), %ecx
+        cmpl    in_r, %ecx
+        ja      .L_align_long           /* if in < last */
+
+        addl    $11, %ecx               /* ecx = &in[ avail_in ] */
+        subl    in_r, %ecx              /* ecx = avail_in */
+        movl    $12, %eax
+        subl    %ecx, %eax              /* eax = 12 - avail_in */
+        leal    buf(%esp), %edi
+        rep     movsb                   /* memcpy( buf, in, avail_in ) */
+        movl    %eax, %ecx
+        xorl    %eax, %eax
+        rep     stosb         /* memset( &buf[ avail_in ], 0, 12 - avail_in ) */
+        leal    buf(%esp), in_r         /* in = buf */
+        movl    in_r, last(%esp)        /* last = in, do just one iteration */
+        jmp     .L_is_aligned
+
+        /* align in_r on long boundary */
+.L_align_long:
+        testl   $3, in_r
+        jz      .L_is_aligned
+        xorl    %eax, %eax
+        movb    (in_r), %al
+        incl    in_r
+        movl    %ebx, %ecx
+        addl    $8, %ebx
+        shll    %cl, %eax
+        orl     %eax, %ebp
+        jmp     .L_align_long
+
+.L_is_aligned:
+        movl    out(%esp), out_r
+
+#if defined( NO_MMX )
+        jmp     .L_do_loop
+#endif
+
+#if defined( USE_MMX )
+        jmp     .L_init_mmx
+#endif
+
+/*** Runtime MMX check ***/
+
+#if defined( RUN_TIME_MMX )
+.L_check_mmx:
+        cmpl    $DO_USE_MMX, inflate_fast_use_mmx
+        je      .L_init_mmx
+        ja      .L_do_loop /* > 2 */
+
+        pushl   %eax
+        pushl   %ebx
+        pushl   %ecx
+        pushl   %edx
+        pushf
+        movl    (%esp), %eax      /* copy eflags to eax */
+        xorl    $0x200000, (%esp) /* try toggling ID bit of eflags (bit 21)
+                                   * to see if cpu supports cpuid...
+                                   * ID bit method not supported by NexGen but
+                                   * bios may load a cpuid instruction and
+                                   * cpuid may be disabled on Cyrix 5-6x86 */
+        popf
+        pushf
+        popl    %edx              /* copy new eflags to edx */
+        xorl    %eax, %edx        /* test if ID bit is flipped */
+        jz      .L_dont_use_mmx   /* not flipped if zero */
+        xorl    %eax, %eax
+        cpuid
+        cmpl    $0x756e6547, %ebx /* check for GenuineIntel in ebx,ecx,edx */
+        jne     .L_dont_use_mmx
+        cmpl    $0x6c65746e, %ecx
+        jne     .L_dont_use_mmx
+        cmpl    $0x49656e69, %edx
+        jne     .L_dont_use_mmx
+        movl    $1, %eax
+        cpuid                     /* get cpu features */
+        shrl    $8, %eax
+        andl    $15, %eax
+        cmpl    $6, %eax          /* check for Pentium family, is 0xf for P4 */
+        jne     .L_dont_use_mmx
+        testl   $0x800000, %edx   /* test if MMX feature is set (bit 23) */
+        jnz     .L_use_mmx
+        jmp     .L_dont_use_mmx
+.L_use_mmx:
+        movl    $DO_USE_MMX, inflate_fast_use_mmx
+        jmp     .L_check_mmx_pop
+.L_dont_use_mmx:
+        movl    $DONT_USE_MMX, inflate_fast_use_mmx
+.L_check_mmx_pop:
+        popl    %edx
+        popl    %ecx
+        popl    %ebx
+        popl    %eax
+        jmp     .L_check_mmx
+#endif
+
+
+/*** Non-MMX code ***/
+
+#if defined ( NO_MMX ) || defined( RUN_TIME_MMX )
+
+#define hold_r     %ebp
+#define bits_r     %bl
+#define bitslong_r %ebx
+
+.align 32,0x90
+.L_while_test:
+        /* while (in < last && out < end)
+         */
+        cmpl    out_r, end(%esp)
+        jbe     .L_break_loop           /* if (out >= end) */
+
+        cmpl    in_r, last(%esp)
+        jbe     .L_break_loop
+
+.L_do_loop:
+        /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out
+         *
+         * do {
+         *   if (bits < 15) {
+         *     hold |= *((unsigned short *)in)++ << bits;
+         *     bits += 16
+         *   }
+         *   this = lcode[hold & lmask]
+         */
+        cmpb    $15, bits_r
+        ja      .L_get_length_code      /* if (15 < bits) */
+
+        xorl    %eax, %eax
+        lodsw                           /* al = *(ushort *)in++ */
+        movb    bits_r, %cl             /* cl = bits, needs it for shifting */
+        addb    $16, bits_r             /* bits += 16 */
+        shll    %cl, %eax
+        orl     %eax, hold_r            /* hold |= *((ushort *)in)++ << bits */
+
+.L_get_length_code:
+        movl    lmask(%esp), %edx       /* edx = lmask */
+        movl    lcode(%esp), %ecx       /* ecx = lcode */
+        andl    hold_r, %edx            /* edx &= hold */
+        movl    (%ecx,%edx,4), %eax     /* eax = lcode[hold & lmask] */
+
+.L_dolen:
+        /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out
+         *
+         * dolen:
+         *    bits -= this.bits;
+         *    hold >>= this.bits
+         */
+        movb    %ah, %cl                /* cl = this.bits */
+        subb    %ah, bits_r             /* bits -= this.bits */
+        shrl    %cl, hold_r             /* hold >>= this.bits */
+
+        /* check if op is a literal
+         * if (op == 0) {
+         *    PUP(out) = this.val;
+         *  }
+         */
+        testb   %al, %al
+        jnz     .L_test_for_length_base /* if (op != 0) 45.7% */
+
+        shrl    $16, %eax               /* output this.val char */
+        stosb
+        jmp     .L_while_test
+
+.L_test_for_length_base:
+        /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out, %edx = len
+         *
+         * else if (op & 16) {
+         *   len = this.val
+         *   op &= 15
+         *   if (op) {
+         *     if (op > bits) {
+         *       hold |= *((unsigned short *)in)++ << bits;
+         *       bits += 16
+         *     }
+         *     len += hold & mask[op];
+         *     bits -= op;
+         *     hold >>= op;
+         *   }
+         */
+#define len_r %edx
+        movl    %eax, len_r             /* len = this */
+        shrl    $16, len_r              /* len = this.val */
+        movb    %al, %cl
+
+        testb   $16, %al
+        jz      .L_test_for_second_level_length /* if ((op & 16) == 0) 8% */
+        andb    $15, %cl                /* op &= 15 */
+        jz      .L_save_len             /* if (!op) */
+        cmpb    %cl, bits_r
+        jae     .L_add_bits_to_len      /* if (op <= bits) */
+
+        movb    %cl, %ch                /* stash op in ch, freeing cl */
+        xorl    %eax, %eax
+        lodsw                           /* al = *(ushort *)in++ */
+        movb    bits_r, %cl             /* cl = bits, needs it for shifting */
+        addb    $16, bits_r             /* bits += 16 */
+        shll    %cl, %eax
+        orl     %eax, hold_r            /* hold |= *((ushort *)in)++ << bits */
+        movb    %ch, %cl                /* move op back to ecx */
+
+.L_add_bits_to_len:
+        movl    $1, %eax
+        shll    %cl, %eax
+        decl    %eax
+        subb    %cl, bits_r
+        andl    hold_r, %eax            /* eax &= hold */
+        shrl    %cl, hold_r
+        addl    %eax, len_r             /* len += hold & mask[op] */
+
+.L_save_len:
+        movl    len_r, len(%esp)        /* save len */
+#undef  len_r
+
+.L_decode_distance:
+        /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out, %edx = dist
+         *
+         *   if (bits < 15) {
+         *     hold |= *((unsigned short *)in)++ << bits;
+         *     bits += 16
+         *   }
+         *   this = dcode[hold & dmask];
+         * dodist:
+         *   bits -= this.bits;
+         *   hold >>= this.bits;
+         *   op = this.op;
+         */
+
+        cmpb    $15, bits_r
+        ja      .L_get_distance_code    /* if (15 < bits) */
+
+        xorl    %eax, %eax
+        lodsw                           /* al = *(ushort *)in++ */
+        movb    bits_r, %cl             /* cl = bits, needs it for shifting */
+        addb    $16, bits_r             /* bits += 16 */
+        shll    %cl, %eax
+        orl     %eax, hold_r            /* hold |= *((ushort *)in)++ << bits */
+
+.L_get_distance_code:
+        movl    dmask(%esp), %edx       /* edx = dmask */
+        movl    dcode(%esp), %ecx       /* ecx = dcode */
+        andl    hold_r, %edx            /* edx &= hold */
+        movl    (%ecx,%edx,4), %eax     /* eax = dcode[hold & dmask] */
+
+#define dist_r %edx
+.L_dodist:
+        movl    %eax, dist_r            /* dist = this */
+        shrl    $16, dist_r             /* dist = this.val */
+        movb    %ah, %cl
+        subb    %ah, bits_r             /* bits -= this.bits */
+        shrl    %cl, hold_r             /* hold >>= this.bits */
+
+        /* if (op & 16) {
+         *   dist = this.val
+         *   op &= 15
+         *   if (op > bits) {
+         *     hold |= *((unsigned short *)in)++ << bits;
+         *     bits += 16
+         *   }
+         *   dist += hold & mask[op];
+         *   bits -= op;
+         *   hold >>= op;
+         */
+        movb    %al, %cl                /* cl = this.op */
+
+        testb   $16, %al                /* if ((op & 16) == 0) */
+        jz      .L_test_for_second_level_dist
+        andb    $15, %cl                /* op &= 15 */
+        jz      .L_check_dist_one
+        cmpb    %cl, bits_r
+        jae     .L_add_bits_to_dist     /* if (op <= bits) 97.6% */
+
+        movb    %cl, %ch                /* stash op in ch, freeing cl */
+        xorl    %eax, %eax
+        lodsw                           /* al = *(ushort *)in++ */
+        movb    bits_r, %cl             /* cl = bits, needs it for shifting */
+        addb    $16, bits_r             /* bits += 16 */
+        shll    %cl, %eax
+        orl     %eax, hold_r            /* hold |= *((ushort *)in)++ << bits */
+        movb    %ch, %cl                /* move op back to ecx */
+
+.L_add_bits_to_dist:
+        movl    $1, %eax
+        shll    %cl, %eax
+        decl    %eax                    /* (1 << op) - 1 */
+        subb    %cl, bits_r
+        andl    hold_r, %eax            /* eax &= hold */
+        shrl    %cl, hold_r
+        addl    %eax, dist_r            /* dist += hold & ((1 << op) - 1) */
+        jmp     .L_check_window
+
+.L_check_window:
+        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
+         *       %ecx = nbytes
+         *
+         * nbytes = out - beg;
+         * if (dist <= nbytes) {
+         *   from = out - dist;
+         *   do {
+         *     PUP(out) = PUP(from);
+         *   } while (--len > 0) {
+         * }
+         */
+
+        movl    in_r, in(%esp)          /* save in so from can use it's reg */
+        movl    out_r, %eax
+        subl    beg(%esp), %eax         /* nbytes = out - beg */
+
+        cmpl    dist_r, %eax
+        jb      .L_clip_window          /* if (dist > nbytes) 4.2% */
+
+        movl    len(%esp), %ecx
+        movl    out_r, from_r
+        subl    dist_r, from_r          /* from = out - dist */
+
+        subl    $3, %ecx
+        movb    (from_r), %al
+        movb    %al, (out_r)
+        movb    1(from_r), %al
+        movb    2(from_r), %dl
+        addl    $3, from_r
+        movb    %al, 1(out_r)
+        movb    %dl, 2(out_r)
+        addl    $3, out_r
+        rep     movsb
+
+        movl    in(%esp), in_r          /* move in back to %esi, toss from */
+        jmp     .L_while_test
+
+.align 16,0x90
+.L_check_dist_one:
+        cmpl    $1, dist_r
+        jne     .L_check_window
+        cmpl    out_r, beg(%esp)
+        je      .L_check_window
+
+        decl    out_r
+        movl    len(%esp), %ecx
+        movb    (out_r), %al
+        subl    $3, %ecx
+
+        movb    %al, 1(out_r)
+        movb    %al, 2(out_r)
+        movb    %al, 3(out_r)
+        addl    $4, out_r
+        rep     stosb
+
+        jmp     .L_while_test
+
+.align 16,0x90
+.L_test_for_second_level_length:
+        /* else if ((op & 64) == 0) {
+         *   this = lcode[this.val + (hold & mask[op])];
+         * }
+         */
+        testb   $64, %al
+        jnz     .L_test_for_end_of_block  /* if ((op & 64) != 0) */
+
+        movl    $1, %eax
+        shll    %cl, %eax
+        decl    %eax
+        andl    hold_r, %eax            /* eax &= hold */
+        addl    %edx, %eax              /* eax += this.val */
+        movl    lcode(%esp), %edx       /* edx = lcode */
+        movl    (%edx,%eax,4), %eax     /* eax = lcode[val + (hold&mask[op])] */
+        jmp     .L_dolen
+
+.align 16,0x90
+.L_test_for_second_level_dist:
+        /* else if ((op & 64) == 0) {
+         *   this = dcode[this.val + (hold & mask[op])];
+         * }
+         */
+        testb   $64, %al
+        jnz     .L_invalid_distance_code  /* if ((op & 64) != 0) */
+
+        movl    $1, %eax
+        shll    %cl, %eax
+        decl    %eax
+        andl    hold_r, %eax            /* eax &= hold */
+        addl    %edx, %eax              /* eax += this.val */
+        movl    dcode(%esp), %edx       /* edx = dcode */
+        movl    (%edx,%eax,4), %eax     /* eax = dcode[val + (hold&mask[op])] */
+        jmp     .L_dodist
+
+.align 16,0x90
+.L_clip_window:
+        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
+         *       %ecx = nbytes
+         *
+         * else {
+         *   if (dist > wsize) {
+         *     invalid distance
+         *   }
+         *   from = window;
+         *   nbytes = dist - nbytes;
+         *   if (write == 0) {
+         *     from += wsize - nbytes;
+         */
+#define nbytes_r %ecx
+        movl    %eax, nbytes_r
+        movl    wsize(%esp), %eax       /* prepare for dist compare */
+        negl    nbytes_r                /* nbytes = -nbytes */
+        movl    window(%esp), from_r    /* from = window */
+
+        cmpl    dist_r, %eax
+        jb      .L_invalid_distance_too_far /* if (dist > wsize) */
+
+        addl    dist_r, nbytes_r        /* nbytes = dist - nbytes */
+        cmpl    $0, write(%esp)
+        jne     .L_wrap_around_window   /* if (write != 0) */
+
+        subl    nbytes_r, %eax
+        addl    %eax, from_r            /* from += wsize - nbytes */
+
+        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
+         *       %ecx = nbytes, %eax = len
+         *
+         *     if (nbytes < len) {
+         *       len -= nbytes;
+         *       do {
+         *         PUP(out) = PUP(from);
+         *       } while (--nbytes);
+         *       from = out - dist;
+         *     }
+         *   }
+         */
+#define len_r %eax
+        movl    len(%esp), len_r
+        cmpl    nbytes_r, len_r
+        jbe     .L_do_copy1             /* if (nbytes >= len) */
+
+        subl    nbytes_r, len_r         /* len -= nbytes */
+        rep     movsb
+        movl    out_r, from_r
+        subl    dist_r, from_r          /* from = out - dist */
+        jmp     .L_do_copy1
+
+        cmpl    nbytes_r, len_r
+        jbe     .L_do_copy1             /* if (nbytes >= len) */
+
+        subl    nbytes_r, len_r         /* len -= nbytes */
+        rep     movsb
+        movl    out_r, from_r
+        subl    dist_r, from_r          /* from = out - dist */
+        jmp     .L_do_copy1
+
+.L_wrap_around_window:
+        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
+         *       %ecx = nbytes, %eax = write, %eax = len
+         *
+         *   else if (write < nbytes) {
+         *     from += wsize + write - nbytes;
+         *     nbytes -= write;
+         *     if (nbytes < len) {
+         *       len -= nbytes;
+         *       do {
+         *         PUP(out) = PUP(from);
+         *       } while (--nbytes);
+         *       from = window;
+         *       nbytes = write;
+         *       if (nbytes < len) {
+         *         len -= nbytes;
+         *         do {
+         *           PUP(out) = PUP(from);
+         *         } while(--nbytes);
+         *         from = out - dist;
+         *       }
+         *     }
+         *   }
+         */
+#define write_r %eax
+        movl    write(%esp), write_r
+        cmpl    write_r, nbytes_r
+        jbe     .L_contiguous_in_window /* if (write >= nbytes) */
+
+        addl    wsize(%esp), from_r
+        addl    write_r, from_r
+        subl    nbytes_r, from_r        /* from += wsize + write - nbytes */
+        subl    write_r, nbytes_r       /* nbytes -= write */
+#undef write_r
+
+        movl    len(%esp), len_r
+        cmpl    nbytes_r, len_r
+        jbe     .L_do_copy1             /* if (nbytes >= len) */
+
+        subl    nbytes_r, len_r         /* len -= nbytes */
+        rep     movsb
+        movl    window(%esp), from_r    /* from = window */
+        movl    write(%esp), nbytes_r   /* nbytes = write */
+        cmpl    nbytes_r, len_r
+        jbe     .L_do_copy1             /* if (nbytes >= len) */
+
+        subl    nbytes_r, len_r         /* len -= nbytes */
+        rep     movsb
+        movl    out_r, from_r
+        subl    dist_r, from_r          /* from = out - dist */
+        jmp     .L_do_copy1
+
+.L_contiguous_in_window:
+        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
+         *       %ecx = nbytes, %eax = write, %eax = len
+         *
+         *   else {
+         *     from += write - nbytes;
+         *     if (nbytes < len) {
+         *       len -= nbytes;
+         *       do {
+         *         PUP(out) = PUP(from);
+         *       } while (--nbytes);
+         *       from = out - dist;
+         *     }
+         *   }
+         */
+#define write_r %eax
+        addl    write_r, from_r
+        subl    nbytes_r, from_r        /* from += write - nbytes */
+#undef write_r
+
+        movl    len(%esp), len_r
+        cmpl    nbytes_r, len_r
+        jbe     .L_do_copy1             /* if (nbytes >= len) */
+
+        subl    nbytes_r, len_r         /* len -= nbytes */
+        rep     movsb
+        movl    out_r, from_r
+        subl    dist_r, from_r          /* from = out - dist */
+
+.L_do_copy1:
+        /* regs: %esi = from, %esi = in, %ebp = hold, %bl = bits, %edi = out
+         *       %eax = len
+         *
+         *     while (len > 0) {
+         *       PUP(out) = PUP(from);
+         *       len--;
+         *     }
+         *   }
+         * } while (in < last && out < end);
+         */
+#undef nbytes_r
+#define in_r %esi
+        movl    len_r, %ecx
+        rep     movsb
+
+        movl    in(%esp), in_r          /* move in back to %esi, toss from */
+        jmp     .L_while_test
+
+#undef len_r
+#undef dist_r
+
+#endif /* NO_MMX || RUN_TIME_MMX */
+
+
+/*** MMX code ***/
+
+#if defined( USE_MMX ) || defined( RUN_TIME_MMX )
+
+.align 32,0x90
+.L_init_mmx:
+        emms
+
+#undef  bits_r
+#undef  bitslong_r
+#define bitslong_r %ebp
+#define hold_mm    %mm0
+        movd    %ebp, hold_mm
+        movl    %ebx, bitslong_r
+
+#define used_mm   %mm1
+#define dmask2_mm %mm2
+#define lmask2_mm %mm3
+#define lmask_mm  %mm4
+#define dmask_mm  %mm5
+#define tmp_mm    %mm6
+
+        movd    lmask(%esp), lmask_mm
+        movq    lmask_mm, lmask2_mm
+        movd    dmask(%esp), dmask_mm
+        movq    dmask_mm, dmask2_mm
+        pxor    used_mm, used_mm
+        movl    lcode(%esp), %ebx       /* ebx = lcode */
+        jmp     .L_do_loop_mmx
+
+.align 32,0x90
+.L_while_test_mmx:
+        /* while (in < last && out < end)
+         */
+        cmpl    out_r, end(%esp)
+        jbe     .L_break_loop           /* if (out >= end) */
+
+        cmpl    in_r, last(%esp)
+        jbe     .L_break_loop
+
+.L_do_loop_mmx:
+        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
+
+        cmpl    $32, bitslong_r
+        ja      .L_get_length_code_mmx  /* if (32 < bits) */
+
+        movd    bitslong_r, tmp_mm
+        movd    (in_r), %mm7
+        addl    $4, in_r
+        psllq   tmp_mm, %mm7
+        addl    $32, bitslong_r
+        por     %mm7, hold_mm           /* hold_mm |= *((uint *)in)++ << bits */
+
+.L_get_length_code_mmx:
+        pand    hold_mm, lmask_mm
+        movd    lmask_mm, %eax
+        movq    lmask2_mm, lmask_mm
+        movl    (%ebx,%eax,4), %eax     /* eax = lcode[hold & lmask] */
+
+.L_dolen_mmx:
+        movzbl  %ah, %ecx               /* ecx = this.bits */
+        movd    %ecx, used_mm
+        subl    %ecx, bitslong_r        /* bits -= this.bits */
+
+        testb   %al, %al
+        jnz     .L_test_for_length_base_mmx /* if (op != 0) 45.7% */
+
+        shrl    $16, %eax               /* output this.val char */
+        stosb
+        jmp     .L_while_test_mmx
+
+.L_test_for_length_base_mmx:
+#define len_r  %edx
+        movl    %eax, len_r             /* len = this */
+        shrl    $16, len_r              /* len = this.val */
+
+        testb   $16, %al
+        jz      .L_test_for_second_level_length_mmx /* if ((op & 16) == 0) 8% */
+        andl    $15, %eax               /* op &= 15 */
+        jz      .L_decode_distance_mmx  /* if (!op) */
+
+        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
+        movd    %eax, used_mm
+        movd    hold_mm, %ecx
+        subl    %eax, bitslong_r
+        andl    .L_mask(,%eax,4), %ecx
+        addl    %ecx, len_r             /* len += hold & mask[op] */
+
+.L_decode_distance_mmx:
+        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
+
+        cmpl    $32, bitslong_r
+        ja      .L_get_dist_code_mmx    /* if (32 < bits) */
+
+        movd    bitslong_r, tmp_mm
+        movd    (in_r), %mm7
+        addl    $4, in_r
+        psllq   tmp_mm, %mm7
+        addl    $32, bitslong_r
+        por     %mm7, hold_mm           /* hold_mm |= *((uint *)in)++ << bits */
+
+.L_get_dist_code_mmx:
+        movl    dcode(%esp), %ebx       /* ebx = dcode */
+        pand    hold_mm, dmask_mm
+        movd    dmask_mm, %eax
+        movq    dmask2_mm, dmask_mm
+        movl    (%ebx,%eax,4), %eax     /* eax = dcode[hold & lmask] */
+
+.L_dodist_mmx:
+#define dist_r %ebx
+        movzbl  %ah, %ecx               /* ecx = this.bits */
+        movl    %eax, dist_r
+        shrl    $16, dist_r             /* dist  = this.val */
+        subl    %ecx, bitslong_r        /* bits -= this.bits */
+        movd    %ecx, used_mm
+
+        testb   $16, %al                /* if ((op & 16) == 0) */
+        jz      .L_test_for_second_level_dist_mmx
+        andl    $15, %eax               /* op &= 15 */
+        jz      .L_check_dist_one_mmx
+
+.L_add_bits_to_dist_mmx:
+        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
+        movd    %eax, used_mm           /* save bit length of current op */
+        movd    hold_mm, %ecx           /* get the next bits on input stream */
+        subl    %eax, bitslong_r        /* bits -= op bits */
+        andl    .L_mask(,%eax,4), %ecx  /* ecx   = hold & mask[op] */
+        addl    %ecx, dist_r            /* dist += hold & mask[op] */
+
+.L_check_window_mmx:
+        movl    in_r, in(%esp)          /* save in so from can use it's reg */
+        movl    out_r, %eax
+        subl    beg(%esp), %eax         /* nbytes = out - beg */
+
+        cmpl    dist_r, %eax
+        jb      .L_clip_window_mmx      /* if (dist > nbytes) 4.2% */
+
+        movl    len_r, %ecx
+        movl    out_r, from_r
+        subl    dist_r, from_r          /* from = out - dist */
+
+        subl    $3, %ecx
+        movb    (from_r), %al
+        movb    %al, (out_r)
+        movb    1(from_r), %al
+        movb    2(from_r), %dl
+        addl    $3, from_r
+        movb    %al, 1(out_r)
+        movb    %dl, 2(out_r)
+        addl    $3, out_r
+        rep     movsb
+
+        movl    in(%esp), in_r          /* move in back to %esi, toss from */
+        movl    lcode(%esp), %ebx       /* move lcode back to %ebx, toss dist */
+        jmp     .L_while_test_mmx
+
+.align 16,0x90
+.L_check_dist_one_mmx:
+        cmpl    $1, dist_r
+        jne     .L_check_window_mmx
+        cmpl    out_r, beg(%esp)
+        je      .L_check_window_mmx
+
+        decl    out_r
+        movl    len_r, %ecx
+        movb    (out_r), %al
+        subl    $3, %ecx
+
+        movb    %al, 1(out_r)
+        movb    %al, 2(out_r)
+        movb    %al, 3(out_r)
+        addl    $4, out_r
+        rep     stosb
+
+        movl    lcode(%esp), %ebx       /* move lcode back to %ebx, toss dist */
+        jmp     .L_while_test_mmx
+
+.align 16,0x90
+.L_test_for_second_level_length_mmx:
+        testb   $64, %al
+        jnz     .L_test_for_end_of_block  /* if ((op & 64) != 0) */
+
+        andl    $15, %eax
+        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
+        movd    hold_mm, %ecx
+        andl    .L_mask(,%eax,4), %ecx
+        addl    len_r, %ecx
+        movl    (%ebx,%ecx,4), %eax     /* eax = lcode[hold & lmask] */
+        jmp     .L_dolen_mmx
+
+.align 16,0x90
+.L_test_for_second_level_dist_mmx:
+        testb   $64, %al
+        jnz     .L_invalid_distance_code  /* if ((op & 64) != 0) */
+
+        andl    $15, %eax
+        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
+        movd    hold_mm, %ecx
+        andl    .L_mask(,%eax,4), %ecx
+        movl    dcode(%esp), %eax       /* ecx = dcode */
+        addl    dist_r, %ecx
+        movl    (%eax,%ecx,4), %eax     /* eax = lcode[hold & lmask] */
+        jmp     .L_dodist_mmx
+
+.align 16,0x90
+.L_clip_window_mmx:
+#define nbytes_r %ecx
+        movl    %eax, nbytes_r
+        movl    wsize(%esp), %eax       /* prepare for dist compare */
+        negl    nbytes_r                /* nbytes = -nbytes */
+        movl    window(%esp), from_r    /* from = window */
+
+        cmpl    dist_r, %eax
+        jb      .L_invalid_distance_too_far /* if (dist > wsize) */
+
+        addl    dist_r, nbytes_r        /* nbytes = dist - nbytes */
+        cmpl    $0, write(%esp)
+        jne     .L_wrap_around_window_mmx /* if (write != 0) */
+
+        subl    nbytes_r, %eax
+        addl    %eax, from_r            /* from += wsize - nbytes */
+
+        cmpl    nbytes_r, len_r
+        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
+
+        subl    nbytes_r, len_r         /* len -= nbytes */
+        rep     movsb
+        movl    out_r, from_r
+        subl    dist_r, from_r          /* from = out - dist */
+        jmp     .L_do_copy1_mmx
+
+        cmpl    nbytes_r, len_r
+        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
+
+        subl    nbytes_r, len_r         /* len -= nbytes */
+        rep     movsb
+        movl    out_r, from_r
+        subl    dist_r, from_r          /* from = out - dist */
+        jmp     .L_do_copy1_mmx
+
+.L_wrap_around_window_mmx:
+#define write_r %eax
+        movl    write(%esp), write_r
+        cmpl    write_r, nbytes_r
+        jbe     .L_contiguous_in_window_mmx /* if (write >= nbytes) */
+
+        addl    wsize(%esp), from_r
+        addl    write_r, from_r
+        subl    nbytes_r, from_r        /* from += wsize + write - nbytes */
+        subl    write_r, nbytes_r       /* nbytes -= write */
+#undef write_r
+
+        cmpl    nbytes_r, len_r
+        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
+
+        subl    nbytes_r, len_r         /* len -= nbytes */
+        rep     movsb
+        movl    window(%esp), from_r    /* from = window */
+        movl    write(%esp), nbytes_r   /* nbytes = write */
+        cmpl    nbytes_r, len_r
+        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
+
+        subl    nbytes_r, len_r         /* len -= nbytes */
+        rep     movsb
+        movl    out_r, from_r
+        subl    dist_r, from_r          /* from = out - dist */
+        jmp     .L_do_copy1_mmx
+
+.L_contiguous_in_window_mmx:
+#define write_r %eax
+        addl    write_r, from_r
+        subl    nbytes_r, from_r        /* from += write - nbytes */
+#undef write_r
+
+        cmpl    nbytes_r, len_r
+        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
+
+        subl    nbytes_r, len_r         /* len -= nbytes */
+        rep     movsb
+        movl    out_r, from_r
+        subl    dist_r, from_r          /* from = out - dist */
+
+.L_do_copy1_mmx:
+#undef nbytes_r
+#define in_r %esi
+        movl    len_r, %ecx
+        rep     movsb
+
+        movl    in(%esp), in_r          /* move in back to %esi, toss from */
+        movl    lcode(%esp), %ebx       /* move lcode back to %ebx, toss dist */
+        jmp     .L_while_test_mmx
+
+#undef hold_r
+#undef bitslong_r
+
+#endif /* USE_MMX || RUN_TIME_MMX */
+
+
+/*** USE_MMX, NO_MMX, and RUNTIME_MMX from here on ***/
+
+.L_invalid_distance_code:
+        /* else {
+         *   strm->msg = "invalid distance code";
+         *   state->mode = BAD;
+         * }
+         */
+        movl    $.L_invalid_distance_code_msg, %ecx
+        movl    $INFLATE_MODE_BAD, %edx
+        jmp     .L_update_stream_state
+
+.L_test_for_end_of_block:
+        /* else if (op & 32) {
+         *   state->mode = TYPE;
+         *   break;
+         * }
+         */
+        testb   $32, %al
+        jz      .L_invalid_literal_length_code  /* if ((op & 32) == 0) */
+
+        movl    $0, %ecx
+        movl    $INFLATE_MODE_TYPE, %edx
+        jmp     .L_update_stream_state
+
+.L_invalid_literal_length_code:
+        /* else {
+         *   strm->msg = "invalid literal/length code";
+         *   state->mode = BAD;
+         * }
+         */
+        movl    $.L_invalid_literal_length_code_msg, %ecx
+        movl    $INFLATE_MODE_BAD, %edx
+        jmp     .L_update_stream_state
+
+.L_invalid_distance_too_far:
+        /* strm->msg = "invalid distance too far back";
+         * state->mode = BAD;
+         */
+        movl    in(%esp), in_r          /* from_r has in's reg, put in back */
+        movl    $.L_invalid_distance_too_far_msg, %ecx
+        movl    $INFLATE_MODE_BAD, %edx
+        jmp     .L_update_stream_state
+
+.L_update_stream_state:
+        /* set strm->msg = %ecx, strm->state->mode = %edx */
+        movl    strm_sp(%esp), %eax
+        testl   %ecx, %ecx              /* if (msg != NULL) */
+        jz      .L_skip_msg
+        movl    %ecx, msg_strm(%eax)    /* strm->msg = msg */
+.L_skip_msg:
+        movl    state_strm(%eax), %eax  /* state = strm->state */
+        movl    %edx, mode_state(%eax)  /* state->mode = edx (BAD | TYPE) */
+        jmp     .L_break_loop
+
+.align 32,0x90
+.L_break_loop:
+
+/*
+ * Regs:
+ *
+ * bits = %ebp when mmx, and in %ebx when non-mmx
+ * hold = %hold_mm when mmx, and in %ebp when non-mmx
+ * in   = %esi
+ * out  = %edi
+ */
+
+#if defined( USE_MMX ) || defined( RUN_TIME_MMX )
+
+#if defined( RUN_TIME_MMX )
+
+        cmpl    $DO_USE_MMX, inflate_fast_use_mmx
+        jne     .L_update_next_in
+
+#endif /* RUN_TIME_MMX */
+
+        movl    %ebp, %ebx
+
+.L_update_next_in:
+
+#endif
+
+#define strm_r  %eax
+#define state_r %edx
+
+        /* len = bits >> 3;
+         * in -= len;
+         * bits -= len << 3;
+         * hold &= (1U << bits) - 1;
+         * state->hold = hold;
+         * state->bits = bits;
+         * strm->next_in = in;
+         * strm->next_out = out;
+         */
+        movl    strm_sp(%esp), strm_r
+        movl    %ebx, %ecx
+        movl    state_strm(strm_r), state_r
+        shrl    $3, %ecx
+        subl    %ecx, in_r
+        shll    $3, %ecx
+        subl    %ecx, %ebx
+        movl    out_r, next_out_strm(strm_r)
+        movl    %ebx, bits_state(state_r)
+        movl    %ebx, %ecx
+
+        leal    buf(%esp), %ebx
+        cmpl    %ebx, last(%esp)
+        jne     .L_buf_not_used         /* if buf != last */
+
+        subl    %ebx, in_r              /* in -= buf */
+        movl    next_in_strm(strm_r), %ebx
+        movl    %ebx, last(%esp)        /* last = strm->next_in */
+        addl    %ebx, in_r              /* in += strm->next_in */
+        movl    avail_in_strm(strm_r), %ebx
+        subl    $11, %ebx
+        addl    %ebx, last(%esp)    /* last = &strm->next_in[ avail_in - 11 ] */
+
+.L_buf_not_used:
+        movl    in_r, next_in_strm(strm_r)
+
+        movl    $1, %ebx
+        shll    %cl, %ebx
+        decl    %ebx
+
+#if defined( USE_MMX ) || defined( RUN_TIME_MMX )
+
+#if defined( RUN_TIME_MMX )
+
+        cmpl    $DO_USE_MMX, inflate_fast_use_mmx
+        jne     .L_update_hold
+
+#endif /* RUN_TIME_MMX */
+
+        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
+        movd    hold_mm, %ebp
+
+        emms
+
+.L_update_hold:
+
+#endif /* USE_MMX || RUN_TIME_MMX */
+
+        andl    %ebx, %ebp
+        movl    %ebp, hold_state(state_r)
+
+#define last_r %ebx
+
+        /* strm->avail_in = in < last ? 11 + (last - in) : 11 - (in - last) */
+        movl    last(%esp), last_r
+        cmpl    in_r, last_r
+        jbe     .L_last_is_smaller     /* if (in >= last) */
+
+        subl    in_r, last_r           /* last -= in */
+        addl    $11, last_r            /* last += 11 */
+        movl    last_r, avail_in_strm(strm_r)
+        jmp     .L_fixup_out
+.L_last_is_smaller:
+        subl    last_r, in_r           /* in -= last */
+        negl    in_r                   /* in = -in */
+        addl    $11, in_r              /* in += 11 */
+        movl    in_r, avail_in_strm(strm_r)
+
+#undef last_r
+#define end_r %ebx
+
+.L_fixup_out:
+        /* strm->avail_out = out < end ? 257 + (end - out) : 257 - (out - end)*/
+        movl    end(%esp), end_r
+        cmpl    out_r, end_r
+        jbe     .L_end_is_smaller      /* if (out >= end) */
+
+        subl    out_r, end_r           /* end -= out */
+        addl    $257, end_r            /* end += 257 */
+        movl    end_r, avail_out_strm(strm_r)
+        jmp     .L_done
+.L_end_is_smaller:
+        subl    end_r, out_r           /* out -= end */
+        negl    out_r                  /* out = -out */
+        addl    $257, out_r            /* out += 257 */
+        movl    out_r, avail_out_strm(strm_r)
+
+#undef end_r
+#undef strm_r
+#undef state_r
+
+.L_done:
+        addl    $local_var_size, %esp
+        popf
+        popl    %ebx
+        popl    %ebp
+        popl    %esi
+        popl    %edi
+        ret
+
+#if defined( GAS_ELF )
+/* elf info */
+.type inflate_fast,@function
+.size inflate_fast,.-inflate_fast
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream/test.cpp b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream/test.cpp
new file mode 100644
index 00000000..7d265b3b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream/test.cpp
@@ -0,0 +1,24 @@
+
+#include "zfstream.h"
+
+int main() {
+
+  // Construct a stream object with this filebuffer.  Anything sent
+  // to this stream will go to standard out.
+  gzofstream os( 1, ios::out );
+
+  // This text is getting compressed and sent to stdout.
+  // To prove this, run 'test | zcat'.
+  os << "Hello, Mommy" << endl;
+
+  os << setcompressionlevel( Z_NO_COMPRESSION );
+  os << "hello, hello, hi, ho!" << endl;
+
+  setcompressionlevel( os, Z_DEFAULT_COMPRESSION )
+    << "I'm compressing again" << endl;
+
+  os.close();
+
+  return 0;
+
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream/zfstream.cpp b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream/zfstream.cpp
new file mode 100644
index 00000000..d0cd85fa
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream/zfstream.cpp
@@ -0,0 +1,329 @@
+
+#include "zfstream.h"
+
+gzfilebuf::gzfilebuf() :
+  file(NULL),
+  mode(0),
+  own_file_descriptor(0)
+{ }
+
+gzfilebuf::~gzfilebuf() {
+
+  sync();
+  if ( own_file_descriptor )
+    close();
+
+}
+
+gzfilebuf *gzfilebuf::open( const char *name,
+                            int io_mode ) {
+
+  if ( is_open() )
+    return NULL;
+
+  char char_mode[10];
+  char *p = char_mode;
+
+  if ( io_mode & ios::in ) {
+    mode = ios::in;
+    *p++ = 'r';
+  } else if ( io_mode & ios::app ) {
+    mode = ios::app;
+    *p++ = 'a';
+  } else {
+    mode = ios::out;
+    *p++ = 'w';
+  }
+
+  if ( io_mode & ios::binary ) {
+    mode |= ios::binary;
+    *p++ = 'b';
+  }
+
+  // Hard code the compression level
+  if ( io_mode & (ios::out|ios::app )) {
+    *p++ = '9';
+  }
+
+  // Put the end-of-string indicator
+  *p = '\0';
+
+  if ( (file = gzopen(name, char_mode)) == NULL )
+    return NULL;
+
+  own_file_descriptor = 1;
+
+  return this;
+
+}
+
+gzfilebuf *gzfilebuf::attach( int file_descriptor,
+                              int io_mode ) {
+
+  if ( is_open() )
+    return NULL;
+
+  char char_mode[10];
+  char *p = char_mode;
+
+  if ( io_mode & ios::in ) {
+    mode = ios::in;
+    *p++ = 'r';
+  } else if ( io_mode & ios::app ) {
+    mode = ios::app;
+    *p++ = 'a';
+  } else {
+    mode = ios::out;
+    *p++ = 'w';
+  }
+
+  if ( io_mode & ios::binary ) {
+    mode |= ios::binary;
+    *p++ = 'b';
+  }
+
+  // Hard code the compression level
+  if ( io_mode & (ios::out|ios::app )) {
+    *p++ = '9';
+  }
+
+  // Put the end-of-string indicator
+  *p = '\0';
+
+  if ( (file = gzdopen(file_descriptor, char_mode)) == NULL )
+    return NULL;
+
+  own_file_descriptor = 0;
+
+  return this;
+
+}
+
+gzfilebuf *gzfilebuf::close() {
+
+  if ( is_open() ) {
+
+    sync();
+    gzclose( file );
+    file = NULL;
+
+  }
+
+  return this;
+
+}
+
+int gzfilebuf::setcompressionlevel( int comp_level ) {
+
+  return gzsetparams(file, comp_level, -2);
+
+}
+
+int gzfilebuf::setcompressionstrategy( int comp_strategy ) {
+
+  return gzsetparams(file, -2, comp_strategy);
+
+}
+
+
+streampos gzfilebuf::seekoff( streamoff off, ios::seek_dir dir, int which ) {
+
+  return streampos(EOF);
+
+}
+
+int gzfilebuf::underflow() {
+
+  // If the file hasn't been opened for reading, error.
+  if ( !is_open() || !(mode & ios::in) )
+    return EOF;
+
+  // if a buffer doesn't exists, allocate one.
+  if ( !base() ) {
+
+    if ( (allocate()) == EOF )
+      return EOF;
+    setp(0,0);
+
+  } else {
+
+    if ( in_avail() )
+      return (unsigned char) *gptr();
+
+    if ( out_waiting() ) {
+      if ( flushbuf() == EOF )
+        return EOF;
+    }
+
+  }
+
+  // Attempt to fill the buffer.
+
+  int result = fillbuf();
+  if ( result == EOF ) {
+    // disable get area
+    setg(0,0,0);
+    return EOF;
+  }
+
+  return (unsigned char) *gptr();
+
+}
+
+int gzfilebuf::overflow( int c ) {
+
+  if ( !is_open() || !(mode & ios::out) )
+    return EOF;
+
+  if ( !base() ) {
+    if ( allocate() == EOF )
+      return EOF;
+    setg(0,0,0);
+  } else {
+    if (in_avail()) {
+        return EOF;
+    }
+    if (out_waiting()) {
+      if (flushbuf() == EOF)
+        return EOF;
+    }
+  }
+
+  int bl = blen();
+  setp( base(), base() + bl);
+
+  if ( c != EOF ) {
+
+    *pptr() = c;
+    pbump(1);
+
+  }
+
+  return 0;
+
+}
+
+int gzfilebuf::sync() {
+
+  if ( !is_open() )
+    return EOF;
+
+  if ( out_waiting() )
+    return flushbuf();
+
+  return 0;
+
+}
+
+int gzfilebuf::flushbuf() {
+
+  int n;
+  char *q;
+
+  q = pbase();
+  n = pptr() - q;
+
+  if ( gzwrite( file, q, n) < n )
+    return EOF;
+
+  setp(0,0);
+
+  return 0;
+
+}
+
+int gzfilebuf::fillbuf() {
+
+  int required;
+  char *p;
+
+  p = base();
+
+  required = blen();
+
+  int t = gzread( file, p, required );
+
+  if ( t <= 0) return EOF;
+
+  setg( base(), base(), base()+t);
+
+  return t;
+
+}
+
+gzfilestream_common::gzfilestream_common() :
+  ios( gzfilestream_common::rdbuf() )
+{ }
+
+gzfilestream_common::~gzfilestream_common()
+{ }
+
+void gzfilestream_common::attach( int fd, int io_mode ) {
+
+  if ( !buffer.attach( fd, io_mode) )
+    clear( ios::failbit | ios::badbit );
+  else
+    clear();
+
+}
+
+void gzfilestream_common::open( const char *name, int io_mode ) {
+
+  if ( !buffer.open( name, io_mode ) )
+    clear( ios::failbit | ios::badbit );
+  else
+    clear();
+
+}
+
+void gzfilestream_common::close() {
+
+  if ( !buffer.close() )
+    clear( ios::failbit | ios::badbit );
+
+}
+
+gzfilebuf *gzfilestream_common::rdbuf()
+{
+  return &buffer;
+}
+
+gzifstream::gzifstream() :
+  ios( gzfilestream_common::rdbuf() )
+{
+  clear( ios::badbit );
+}
+
+gzifstream::gzifstream( const char *name, int io_mode ) :
+  ios( gzfilestream_common::rdbuf() )
+{
+  gzfilestream_common::open( name, io_mode );
+}
+
+gzifstream::gzifstream( int fd, int io_mode ) :
+  ios( gzfilestream_common::rdbuf() )
+{
+  gzfilestream_common::attach( fd, io_mode );
+}
+
+gzifstream::~gzifstream() { }
+
+gzofstream::gzofstream() :
+  ios( gzfilestream_common::rdbuf() )
+{
+  clear( ios::badbit );
+}
+
+gzofstream::gzofstream( const char *name, int io_mode ) :
+  ios( gzfilestream_common::rdbuf() )
+{
+  gzfilestream_common::open( name, io_mode );
+}
+
+gzofstream::gzofstream( int fd, int io_mode ) :
+  ios( gzfilestream_common::rdbuf() )
+{
+  gzfilestream_common::attach( fd, io_mode );
+}
+
+gzofstream::~gzofstream() { }
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream/zfstream.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream/zfstream.h
new file mode 100644
index 00000000..ed79098a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream/zfstream.h
@@ -0,0 +1,128 @@
+
+#ifndef zfstream_h
+#define zfstream_h
+
+#include <fstream.h>
+#include "zlib.h"
+
+class gzfilebuf : public streambuf {
+
+public:
+
+  gzfilebuf( );
+  virtual ~gzfilebuf();
+
+  gzfilebuf *open( const char *name, int io_mode );
+  gzfilebuf *attach( int file_descriptor, int io_mode );
+  gzfilebuf *close();
+
+  int setcompressionlevel( int comp_level );
+  int setcompressionstrategy( int comp_strategy );
+
+  inline int is_open() const { return (file !=NULL); }
+
+  virtual streampos seekoff( streamoff, ios::seek_dir, int );
+
+  virtual int sync();
+
+protected:
+
+  virtual int underflow();
+  virtual int overflow( int = EOF );
+
+private:
+
+  gzFile file;
+  short mode;
+  short own_file_descriptor;
+
+  int flushbuf();
+  int fillbuf();
+
+};
+
+class gzfilestream_common : virtual public ios {
+
+  friend class gzifstream;
+  friend class gzofstream;
+  friend gzofstream &setcompressionlevel( gzofstream &, int );
+  friend gzofstream &setcompressionstrategy( gzofstream &, int );
+
+public:
+  virtual ~gzfilestream_common();
+
+  void attach( int fd, int io_mode );
+  void open( const char *name, int io_mode );
+  void close();
+
+protected:
+  gzfilestream_common();
+
+private:
+  gzfilebuf *rdbuf();
+
+  gzfilebuf buffer;
+
+};
+
+class gzifstream : public gzfilestream_common, public istream {
+
+public:
+
+  gzifstream();
+  gzifstream( const char *name, int io_mode = ios::in );
+  gzifstream( int fd, int io_mode = ios::in );
+
+  virtual ~gzifstream();
+
+};
+
+class gzofstream : public gzfilestream_common, public ostream {
+
+public:
+
+  gzofstream();
+  gzofstream( const char *name, int io_mode = ios::out );
+  gzofstream( int fd, int io_mode = ios::out );
+
+  virtual ~gzofstream();
+
+};
+
+template<class T> class gzomanip {
+  friend gzofstream &operator<<(gzofstream &, const gzomanip<T> &);
+public:
+  gzomanip(gzofstream &(*f)(gzofstream &, T), T v) : func(f), val(v) { }
+private:
+  gzofstream &(*func)(gzofstream &, T);
+  T val;
+};
+
+template<class T> gzofstream &operator<<(gzofstream &s, const gzomanip<T> &m)
+{
+  return (*m.func)(s, m.val);
+}
+
+inline gzofstream &setcompressionlevel( gzofstream &s, int l )
+{
+  (s.rdbuf())->setcompressionlevel(l);
+  return s;
+}
+
+inline gzofstream &setcompressionstrategy( gzofstream &s, int l )
+{
+  (s.rdbuf())->setcompressionstrategy(l);
+  return s;
+}
+
+inline gzomanip<int> setcompressionlevel(int l)
+{
+  return gzomanip<int>(&setcompressionlevel,l);
+}
+
+inline gzomanip<int> setcompressionstrategy(int l)
+{
+  return gzomanip<int>(&setcompressionstrategy,l);
+}
+
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream2/zstream.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream2/zstream.h
new file mode 100644
index 00000000..8ba7f050
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream2/zstream.h
@@ -0,0 +1,307 @@
+/*
+ *
+ * Copyright (c) 1997
+ * Christian Michelsen Research AS
+ * Advanced Computing
+ * Fantoftvegen 38, 5036 BERGEN, Norway
+ * http://www.cmr.no
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Christian Michelsen Research AS makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ */
+
+#ifndef ZSTREAM__H
+#define ZSTREAM__H
+
+/*
+ * zstream.h - C++ interface to the 'zlib' general purpose compression library
+ * $Id: zstream.h 66 2005-08-17 18:20:58Z andreas_kupries $
+ */
+
+#include <strstream.h>
+#include <string.h>
+#include <stdio.h>
+#include "zlib.h"
+
+#if defined(_WIN32)
+#   include <fcntl.h>
+#   include <io.h>
+#   define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
+#else
+#   define SET_BINARY_MODE(file)
+#endif
+
+class zstringlen {
+public:
+    zstringlen(class izstream&);
+    zstringlen(class ozstream&, const char*);
+    size_t value() const { return val.word; }
+private:
+    struct Val { unsigned char byte; size_t word; } val;
+};
+
+//  ----------------------------- izstream -----------------------------
+
+class izstream
+{
+    public:
+        izstream() : m_fp(0) {}
+        izstream(FILE* fp) : m_fp(0) { open(fp); }
+        izstream(const char* name) : m_fp(0) { open(name); }
+        ~izstream() { close(); }
+
+        /* Opens a gzip (.gz) file for reading.
+         * open() can be used to read a file which is not in gzip format;
+         * in this case read() will directly read from the file without
+         * decompression. errno can be checked to distinguish two error
+         * cases (if errno is zero, the zlib error is Z_MEM_ERROR).
+         */
+        void open(const char* name) {
+            if (m_fp) close();
+            m_fp = ::gzopen(name, "rb");
+        }
+
+        void open(FILE* fp) {
+            SET_BINARY_MODE(fp);
+            if (m_fp) close();
+            m_fp = ::gzdopen(fileno(fp), "rb");
+        }
+
+        /* Flushes all pending input if necessary, closes the compressed file
+         * and deallocates all the (de)compression state. The return value is
+         * the zlib error number (see function error() below).
+         */
+        int close() {
+            int r = ::gzclose(m_fp);
+            m_fp = 0; return r;
+        }
+
+        /* Binary read the given number of bytes from the compressed file.
+         */
+        int read(void* buf, size_t len) {
+            return ::gzread(m_fp, buf, len);
+        }
+
+        /* Returns the error message for the last error which occurred on the
+         * given compressed file. errnum is set to zlib error number. If an
+         * error occurred in the file system and not in the compression library,
+         * errnum is set to Z_ERRNO and the application may consult errno
+         * to get the exact error code.
+         */
+        const char* error(int* errnum) {
+            return ::gzerror(m_fp, errnum);
+        }
+
+        gzFile fp() { return m_fp; }
+
+    private:
+        gzFile m_fp;
+};
+
+/*
+ * Binary read the given (array of) object(s) from the compressed file.
+ * If the input file was not in gzip format, read() copies the objects number
+ * of bytes into the buffer.
+ * returns the number of uncompressed bytes actually read
+ * (0 for end of file, -1 for error).
+ */
+template <class T, class Items>
+inline int read(izstream& zs, T* x, Items items) {
+    return ::gzread(zs.fp(), x, items*sizeof(T));
+}
+
+/*
+ * Binary input with the '>' operator.
+ */
+template <class T>
+inline izstream& operator>(izstream& zs, T& x) {
+    ::gzread(zs.fp(), &x, sizeof(T));
+    return zs;
+}
+
+
+inline zstringlen::zstringlen(izstream& zs) {
+    zs > val.byte;
+    if (val.byte == 255) zs > val.word;
+    else val.word = val.byte;
+}
+
+/*
+ * Read length of string + the string with the '>' operator.
+ */
+inline izstream& operator>(izstream& zs, char* x) {
+    zstringlen len(zs);
+    ::gzread(zs.fp(), x, len.value());
+    x[len.value()] = '\0';
+    return zs;
+}
+
+inline char* read_string(izstream& zs) {
+    zstringlen len(zs);
+    char* x = new char[len.value()+1];
+    ::gzread(zs.fp(), x, len.value());
+    x[len.value()] = '\0';
+    return x;
+}
+
+// ----------------------------- ozstream -----------------------------
+
+class ozstream
+{
+    public:
+        ozstream() : m_fp(0), m_os(0) {
+        }
+        ozstream(FILE* fp, int level = Z_DEFAULT_COMPRESSION)
+            : m_fp(0), m_os(0) {
+            open(fp, level);
+        }
+        ozstream(const char* name, int level = Z_DEFAULT_COMPRESSION)
+            : m_fp(0), m_os(0) {
+            open(name, level);
+        }
+        ~ozstream() {
+            close();
+        }
+
+        /* Opens a gzip (.gz) file for writing.
+         * The compression level parameter should be in 0..9
+         * errno can be checked to distinguish two error cases
+         * (if errno is zero, the zlib error is Z_MEM_ERROR).
+         */
+        void open(const char* name, int level = Z_DEFAULT_COMPRESSION) {
+            char mode[4] = "wb\0";
+            if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level;
+            if (m_fp) close();
+            m_fp = ::gzopen(name, mode);
+        }
+
+        /* open from a FILE pointer.
+         */
+        void open(FILE* fp, int level = Z_DEFAULT_COMPRESSION) {
+            SET_BINARY_MODE(fp);
+            char mode[4] = "wb\0";
+            if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level;
+            if (m_fp) close();
+            m_fp = ::gzdopen(fileno(fp), mode);
+        }
+
+        /* Flushes all pending output if necessary, closes the compressed file
+         * and deallocates all the (de)compression state. The return value is
+         * the zlib error number (see function error() below).
+         */
+        int close() {
+            if (m_os) {
+                ::gzwrite(m_fp, m_os->str(), m_os->pcount());
+                delete[] m_os->str(); delete m_os; m_os = 0;
+            }
+            int r = ::gzclose(m_fp); m_fp = 0; return r;
+        }
+
+        /* Binary write the given number of bytes into the compressed file.
+         */
+        int write(const void* buf, size_t len) {
+            return ::gzwrite(m_fp, (voidp) buf, len);
+        }
+
+        /* Flushes all pending output into the compressed file. The parameter
+         * _flush is as in the deflate() function. The return value is the zlib
+         * error number (see function gzerror below). flush() returns Z_OK if
+         * the flush_ parameter is Z_FINISH and all output could be flushed.
+         * flush() should be called only when strictly necessary because it can
+         * degrade compression.
+         */
+        int flush(int _flush) {
+            os_flush();
+            return ::gzflush(m_fp, _flush);
+        }
+
+        /* Returns the error message for the last error which occurred on the
+         * given compressed file. errnum is set to zlib error number. If an
+         * error occurred in the file system and not in the compression library,
+         * errnum is set to Z_ERRNO and the application may consult errno
+         * to get the exact error code.
+         */
+        const char* error(int* errnum) {
+            return ::gzerror(m_fp, errnum);
+        }
+
+        gzFile fp() { return m_fp; }
+
+        ostream& os() {
+            if (m_os == 0) m_os = new ostrstream;
+            return *m_os;
+        }
+
+        void os_flush() {
+            if (m_os && m_os->pcount()>0) {
+                ostrstream* oss = new ostrstream;
+                oss->fill(m_os->fill());
+                oss->flags(m_os->flags());
+                oss->precision(m_os->precision());
+                oss->width(m_os->width());
+                ::gzwrite(m_fp, m_os->str(), m_os->pcount());
+                delete[] m_os->str(); delete m_os; m_os = oss;
+            }
+        }
+
+    private:
+        gzFile m_fp;
+        ostrstream* m_os;
+};
+
+/*
+ * Binary write the given (array of) object(s) into the compressed file.
+ * returns the number of uncompressed bytes actually written
+ * (0 in case of error).
+ */
+template <class T, class Items>
+inline int write(ozstream& zs, const T* x, Items items) {
+    return ::gzwrite(zs.fp(), (voidp) x, items*sizeof(T));
+}
+
+/*
+ * Binary output with the '<' operator.
+ */
+template <class T>
+inline ozstream& operator<(ozstream& zs, const T& x) {
+    ::gzwrite(zs.fp(), (voidp) &x, sizeof(T));
+    return zs;
+}
+
+inline zstringlen::zstringlen(ozstream& zs, const char* x) {
+    val.byte = 255;  val.word = ::strlen(x);
+    if (val.word < 255) zs < (val.byte = val.word);
+    else zs < val;
+}
+
+/*
+ * Write length of string + the string with the '<' operator.
+ */
+inline ozstream& operator<(ozstream& zs, const char* x) {
+    zstringlen len(zs, x);
+    ::gzwrite(zs.fp(), (voidp) x, len.value());
+    return zs;
+}
+
+#ifdef _MSC_VER
+inline ozstream& operator<(ozstream& zs, char* const& x) {
+    return zs < (const char*) x;
+}
+#endif
+
+/*
+ * Ascii write with the << operator;
+ */
+template <class T>
+inline ostream& operator<<(ozstream& zs, const T& x) {
+    zs.os_flush();
+    return zs.os() << x;
+}
+
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream2/zstream_test.cpp b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream2/zstream_test.cpp
new file mode 100644
index 00000000..6273f62d
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream2/zstream_test.cpp
@@ -0,0 +1,25 @@
+#include "zstream.h"
+#include <math.h>
+#include <stdlib.h>
+#include <iomanip.h>
+
+void main() {
+    char h[256] = "Hello";
+    char* g = "Goodbye";
+    ozstream out("temp.gz");
+    out < "This works well" < h < g;
+    out.close();
+
+    izstream in("temp.gz"); // read it back
+    char *x = read_string(in), *y = new char[256], z[256];
+    in > y > z;
+    in.close();
+    cout << x << endl << y << endl << z << endl;
+
+    out.open("temp.gz"); // try ascii output; zcat temp.gz to see the results
+    out << setw(50) << setfill('#') << setprecision(20) << x << endl << y << endl << z << endl;
+    out << z << endl << y << endl << x << endl;
+    out << 1.1234567890123456789 << endl;
+
+    delete[] x; delete[] y;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/README b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/README
new file mode 100644
index 00000000..f7b319ab
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/README
@@ -0,0 +1,35 @@
+These classes provide a C++ stream interface to the zlib library. It allows you
+to do things like:
+
+  gzofstream outf("blah.gz");
+  outf << "These go into the gzip file " << 123 << endl;
+
+It does this by deriving a specialized stream buffer for gzipped files, which is
+the way Stroustrup would have done it. :->
+
+The gzifstream and gzofstream classes were originally written by Kevin Ruland
+and made available in the zlib contrib/iostream directory. The older version still
+compiles under gcc 2.xx, but not under gcc 3.xx, which sparked the development of
+this version.
+
+The new classes are as standard-compliant as possible, closely following the
+approach of the standard library's fstream classes. It compiles under gcc versions
+3.2 and 3.3, but not under gcc 2.xx. This is mainly due to changes in the standard
+library naming scheme. The new version of gzifstream/gzofstream/gzfilebuf differs
+from the previous one in the following respects:
+- added showmanyc
+- added setbuf, with support for unbuffered output via setbuf(0,0)
+- a few bug fixes of stream behavior
+- gzipped output file opened with default compression level instead of maximum level
+- setcompressionlevel()/strategy() members replaced by single setcompression()
+
+The code is provided "as is", with the permission to use, copy, modify, distribute
+and sell it for any purpose without fee.
+
+Ludwig Schwardt
+<schwardt@sun.ac.za>
+
+DSP Lab
+Electrical & Electronic Engineering Department
+University of Stellenbosch
+South Africa
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/TODO b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/TODO
new file mode 100644
index 00000000..7032f97b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/TODO
@@ -0,0 +1,17 @@
+Possible upgrades to gzfilebuf:
+
+- The ability to do putback (e.g. putbackfail)
+
+- The ability to seek (zlib supports this, but could be slow/tricky)
+
+- Simultaneous read/write access (does it make sense?)
+
+- Support for ios_base::ate open mode
+
+- Locale support?
+
+- Check public interface to see which calls give problems
+  (due to dependence on library internals)
+
+- Override operator<<(ostream&, gzfilebuf*) to allow direct copying
+  of stream buffer to stream ( i.e. os << is.rdbuf(); )
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/test.cc b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/test.cc
new file mode 100644
index 00000000..94235334
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/test.cc
@@ -0,0 +1,50 @@
+/*
+ * Test program for gzifstream and gzofstream
+ *
+ * by Ludwig Schwardt <schwardt@sun.ac.za>
+ * original version by Kevin Ruland <kevin@rodin.wustl.edu>
+ */
+
+#include "zfstream.h"
+#include <iostream>      // for cout
+
+int main() {
+
+  gzofstream outf;
+  gzifstream inf;
+  char buf[80];
+
+  outf.open("test1.txt.gz");
+  outf << "The quick brown fox sidestepped the lazy canine\n"
+       << 1.3 << "\nPlan " << 9 << std::endl;
+  outf.close();
+  std::cout << "Wrote the following message to 'test1.txt.gz' (check with zcat or zless):\n"
+            << "The quick brown fox sidestepped the lazy canine\n"
+            << 1.3 << "\nPlan " << 9 << std::endl;
+
+  std::cout << "\nReading 'test1.txt.gz' (buffered) produces:\n";
+  inf.open("test1.txt.gz");
+  while (inf.getline(buf,80,'\n')) {
+    std::cout << buf << "\t(" << inf.rdbuf()->in_avail() << " chars left in buffer)\n";
+  }
+  inf.close();
+
+  outf.rdbuf()->pubsetbuf(0,0);
+  outf.open("test2.txt.gz");
+  outf << setcompression(Z_NO_COMPRESSION)
+       << "The quick brown fox sidestepped the lazy canine\n"
+       << 1.3 << "\nPlan " << 9 << std::endl;
+  outf.close();
+  std::cout << "\nWrote the same message to 'test2.txt.gz' in uncompressed form";
+
+  std::cout << "\nReading 'test2.txt.gz' (unbuffered) produces:\n";
+  inf.rdbuf()->pubsetbuf(0,0);
+  inf.open("test2.txt.gz");
+  while (inf.getline(buf,80,'\n')) {
+    std::cout << buf << "\t(" << inf.rdbuf()->in_avail() << " chars left in buffer)\n";
+  }
+  inf.close();
+
+  return 0;
+
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/zfstream.cc b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/zfstream.cc
new file mode 100644
index 00000000..94eb9334
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/zfstream.cc
@@ -0,0 +1,479 @@
+/*
+ * A C++ I/O streams interface to the zlib gz* functions
+ *
+ * by Ludwig Schwardt <schwardt@sun.ac.za>
+ * original version by Kevin Ruland <kevin@rodin.wustl.edu>
+ *
+ * This version is standard-compliant and compatible with gcc 3.x.
+ */
+
+#include "zfstream.h"
+#include <cstring>          // for strcpy, strcat, strlen (mode strings)
+#include <cstdio>           // for BUFSIZ
+
+// Internal buffer sizes (default and "unbuffered" versions)
+#define BIGBUFSIZE BUFSIZ
+#define SMALLBUFSIZE 1
+
+/*****************************************************************************/
+
+// Default constructor
+gzfilebuf::gzfilebuf()
+: file(NULL), io_mode(std::ios_base::openmode(0)), own_fd(false),
+  buffer(NULL), buffer_size(BIGBUFSIZE), own_buffer(true)
+{
+  // No buffers to start with
+  this->disable_buffer();
+}
+
+// Destructor
+gzfilebuf::~gzfilebuf()
+{
+  // Sync output buffer and close only if responsible for file
+  // (i.e. attached streams should be left open at this stage)
+  this->sync();
+  if (own_fd)
+    this->close();
+  // Make sure internal buffer is deallocated
+  this->disable_buffer();
+}
+
+// Set compression level and strategy
+int
+gzfilebuf::setcompression(int comp_level,
+                          int comp_strategy)
+{
+  return gzsetparams(file, comp_level, comp_strategy);
+}
+
+// Open gzipped file
+gzfilebuf*
+gzfilebuf::open(const char *name,
+                std::ios_base::openmode mode)
+{
+  // Fail if file already open
+  if (this->is_open())
+    return NULL;
+  // Don't support simultaneous read/write access (yet)
+  if ((mode & std::ios_base::in) && (mode & std::ios_base::out))
+    return NULL;
+
+  // Build mode string for gzopen and check it [27.8.1.3.2]
+  char char_mode[6] = "\0\0\0\0\0";
+  if (!this->open_mode(mode, char_mode))
+    return NULL;
+
+  // Attempt to open file
+  if ((file = gzopen(name, char_mode)) == NULL)
+    return NULL;
+
+  // On success, allocate internal buffer and set flags
+  this->enable_buffer();
+  io_mode = mode;
+  own_fd = true;
+  return this;
+}
+
+// Attach to gzipped file
+gzfilebuf*
+gzfilebuf::attach(int fd,
+                  std::ios_base::openmode mode)
+{
+  // Fail if file already open
+  if (this->is_open())
+    return NULL;
+  // Don't support simultaneous read/write access (yet)
+  if ((mode & std::ios_base::in) && (mode & std::ios_base::out))
+    return NULL;
+
+  // Build mode string for gzdopen and check it [27.8.1.3.2]
+  char char_mode[6] = "\0\0\0\0\0";
+  if (!this->open_mode(mode, char_mode))
+    return NULL;
+
+  // Attempt to attach to file
+  if ((file = gzdopen(fd, char_mode)) == NULL)
+    return NULL;
+
+  // On success, allocate internal buffer and set flags
+  this->enable_buffer();
+  io_mode = mode;
+  own_fd = false;
+  return this;
+}
+
+// Close gzipped file
+gzfilebuf*
+gzfilebuf::close()
+{
+  // Fail immediately if no file is open
+  if (!this->is_open())
+    return NULL;
+  // Assume success
+  gzfilebuf* retval = this;
+  // Attempt to sync and close gzipped file
+  if (this->sync() == -1)
+    retval = NULL;
+  if (gzclose(file) < 0)
+    retval = NULL;
+  // File is now gone anyway (postcondition [27.8.1.3.8])
+  file = NULL;
+  own_fd = false;
+  // Destroy internal buffer if it exists
+  this->disable_buffer();
+  return retval;
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+// Convert int open mode to mode string
+bool
+gzfilebuf::open_mode(std::ios_base::openmode mode,
+                     char* c_mode) const
+{
+  bool testb = mode & std::ios_base::binary;
+  bool testi = mode & std::ios_base::in;
+  bool testo = mode & std::ios_base::out;
+  bool testt = mode & std::ios_base::trunc;
+  bool testa = mode & std::ios_base::app;
+
+  // Check for valid flag combinations - see [27.8.1.3.2] (Table 92)
+  // Original zfstream hardcoded the compression level to maximum here...
+  // Double the time for less than 1% size improvement seems
+  // excessive though - keeping it at the default level
+  // To change back, just append "9" to the next three mode strings
+  if (!testi && testo && !testt && !testa)
+    strcpy(c_mode, "w");
+  if (!testi && testo && !testt && testa)
+    strcpy(c_mode, "a");
+  if (!testi && testo && testt && !testa)
+    strcpy(c_mode, "w");
+  if (testi && !testo && !testt && !testa)
+    strcpy(c_mode, "r");
+  // No read/write mode yet
+//  if (testi && testo && !testt && !testa)
+//    strcpy(c_mode, "r+");
+//  if (testi && testo && testt && !testa)
+//    strcpy(c_mode, "w+");
+
+  // Mode string should be empty for invalid combination of flags
+  if (strlen(c_mode) == 0)
+    return false;
+  if (testb)
+    strcat(c_mode, "b");
+  return true;
+}
+
+// Determine number of characters in internal get buffer
+std::streamsize
+gzfilebuf::showmanyc()
+{
+  // Calls to underflow will fail if file not opened for reading
+  if (!this->is_open() || !(io_mode & std::ios_base::in))
+    return -1;
+  // Make sure get area is in use
+  if (this->gptr() && (this->gptr() < this->egptr()))
+    return std::streamsize(this->egptr() - this->gptr());
+  else
+    return 0;
+}
+
+// Fill get area from gzipped file
+gzfilebuf::int_type
+gzfilebuf::underflow()
+{
+  // If something is left in the get area by chance, return it
+  // (this shouldn't normally happen, as underflow is only supposed
+  // to be called when gptr >= egptr, but it serves as error check)
+  if (this->gptr() && (this->gptr() < this->egptr()))
+    return traits_type::to_int_type(*(this->gptr()));
+
+  // If the file hasn't been opened for reading, produce error
+  if (!this->is_open() || !(io_mode & std::ios_base::in))
+    return traits_type::eof();
+
+  // Attempt to fill internal buffer from gzipped file
+  // (buffer must be guaranteed to exist...)
+  int bytes_read = gzread(file, buffer, buffer_size);
+  // Indicates error or EOF
+  if (bytes_read <= 0)
+  {
+    // Reset get area
+    this->setg(buffer, buffer, buffer);
+    return traits_type::eof();
+  }
+  // Make all bytes read from file available as get area
+  this->setg(buffer, buffer, buffer + bytes_read);
+
+  // Return next character in get area
+  return traits_type::to_int_type(*(this->gptr()));
+}
+
+// Write put area to gzipped file
+gzfilebuf::int_type
+gzfilebuf::overflow(int_type c)
+{
+  // Determine whether put area is in use
+  if (this->pbase())
+  {
+    // Double-check pointer range
+    if (this->pptr() > this->epptr() || this->pptr() < this->pbase())
+      return traits_type::eof();
+    // Add extra character to buffer if not EOF
+    if (!traits_type::eq_int_type(c, traits_type::eof()))
+    {
+      *(this->pptr()) = traits_type::to_char_type(c);
+      this->pbump(1);
+    }
+    // Number of characters to write to file
+    int bytes_to_write = this->pptr() - this->pbase();
+    // Overflow doesn't fail if nothing is to be written
+    if (bytes_to_write > 0)
+    {
+      // If the file hasn't been opened for writing, produce error
+      if (!this->is_open() || !(io_mode & std::ios_base::out))
+        return traits_type::eof();
+      // If gzipped file won't accept all bytes written to it, fail
+      if (gzwrite(file, this->pbase(), bytes_to_write) != bytes_to_write)
+        return traits_type::eof();
+      // Reset next pointer to point to pbase on success
+      this->pbump(-bytes_to_write);
+    }
+  }
+  // Write extra character to file if not EOF
+  else if (!traits_type::eq_int_type(c, traits_type::eof()))
+  {
+    // If the file hasn't been opened for writing, produce error
+    if (!this->is_open() || !(io_mode & std::ios_base::out))
+      return traits_type::eof();
+    // Impromptu char buffer (allows "unbuffered" output)
+    char_type last_char = traits_type::to_char_type(c);
+    // If gzipped file won't accept this character, fail
+    if (gzwrite(file, &last_char, 1) != 1)
+      return traits_type::eof();
+  }
+
+  // If you got here, you have succeeded (even if c was EOF)
+  // The return value should therefore be non-EOF
+  if (traits_type::eq_int_type(c, traits_type::eof()))
+    return traits_type::not_eof(c);
+  else
+    return c;
+}
+
+// Assign new buffer
+std::streambuf*
+gzfilebuf::setbuf(char_type* p,
+                  std::streamsize n)
+{
+  // First make sure stuff is sync'ed, for safety
+  if (this->sync() == -1)
+    return NULL;
+  // If buffering is turned off on purpose via setbuf(0,0), still allocate one...
+  // "Unbuffered" only really refers to put [27.8.1.4.10], while get needs at
+  // least a buffer of size 1 (very inefficient though, therefore make it bigger?)
+  // This follows from [27.5.2.4.3]/12 (gptr needs to point at something, it seems)
+  if (!p || !n)
+  {
+    // Replace existing buffer (if any) with small internal buffer
+    this->disable_buffer();
+    buffer = NULL;
+    buffer_size = 0;
+    own_buffer = true;
+    this->enable_buffer();
+  }
+  else
+  {
+    // Replace existing buffer (if any) with external buffer
+    this->disable_buffer();
+    buffer = p;
+    buffer_size = n;
+    own_buffer = false;
+    this->enable_buffer();
+  }
+  return this;
+}
+
+// Write put area to gzipped file (i.e. ensures that put area is empty)
+int
+gzfilebuf::sync()
+{
+  return traits_type::eq_int_type(this->overflow(), traits_type::eof()) ? -1 : 0;
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+// Allocate internal buffer
+void
+gzfilebuf::enable_buffer()
+{
+  // If internal buffer required, allocate one
+  if (own_buffer && !buffer)
+  {
+    // Check for buffered vs. "unbuffered"
+    if (buffer_size > 0)
+    {
+      // Allocate internal buffer
+      buffer = new char_type[buffer_size];
+      // Get area starts empty and will be expanded by underflow as need arises
+      this->setg(buffer, buffer, buffer);
+      // Setup entire internal buffer as put area.
+      // The one-past-end pointer actually points to the last element of the buffer,
+      // so that overflow(c) can safely add the extra character c to the sequence.
+      // These pointers remain in place for the duration of the buffer
+      this->setp(buffer, buffer + buffer_size - 1);
+    }
+    else
+    {
+      // Even in "unbuffered" case, (small?) get buffer is still required
+      buffer_size = SMALLBUFSIZE;
+      buffer = new char_type[buffer_size];
+      this->setg(buffer, buffer, buffer);
+      // "Unbuffered" means no put buffer
+      this->setp(0, 0);
+    }
+  }
+  else
+  {
+    // If buffer already allocated, reset buffer pointers just to make sure no
+    // stale chars are lying around
+    this->setg(buffer, buffer, buffer);
+    this->setp(buffer, buffer + buffer_size - 1);
+  }
+}
+
+// Destroy internal buffer
+void
+gzfilebuf::disable_buffer()
+{
+  // If internal buffer exists, deallocate it
+  if (own_buffer && buffer)
+  {
+    // Preserve unbuffered status by zeroing size
+    if (!this->pbase())
+      buffer_size = 0;
+    delete[] buffer;
+    buffer = NULL;
+    this->setg(0, 0, 0);
+    this->setp(0, 0);
+  }
+  else
+  {
+    // Reset buffer pointers to initial state if external buffer exists
+    this->setg(buffer, buffer, buffer);
+    if (buffer)
+      this->setp(buffer, buffer + buffer_size - 1);
+    else
+      this->setp(0, 0);
+  }
+}
+
+/*****************************************************************************/
+
+// Default constructor initializes stream buffer
+gzifstream::gzifstream()
+: std::istream(NULL), sb()
+{ this->init(&sb); }
+
+// Initialize stream buffer and open file
+gzifstream::gzifstream(const char* name,
+                       std::ios_base::openmode mode)
+: std::istream(NULL), sb()
+{
+  this->init(&sb);
+  this->open(name, mode);
+}
+
+// Initialize stream buffer and attach to file
+gzifstream::gzifstream(int fd,
+                       std::ios_base::openmode mode)
+: std::istream(NULL), sb()
+{
+  this->init(&sb);
+  this->attach(fd, mode);
+}
+
+// Open file and go into fail() state if unsuccessful
+void
+gzifstream::open(const char* name,
+                 std::ios_base::openmode mode)
+{
+  if (!sb.open(name, mode | std::ios_base::in))
+    this->setstate(std::ios_base::failbit);
+  else
+    this->clear();
+}
+
+// Attach to file and go into fail() state if unsuccessful
+void
+gzifstream::attach(int fd,
+                   std::ios_base::openmode mode)
+{
+  if (!sb.attach(fd, mode | std::ios_base::in))
+    this->setstate(std::ios_base::failbit);
+  else
+    this->clear();
+}
+
+// Close file
+void
+gzifstream::close()
+{
+  if (!sb.close())
+    this->setstate(std::ios_base::failbit);
+}
+
+/*****************************************************************************/
+
+// Default constructor initializes stream buffer
+gzofstream::gzofstream()
+: std::ostream(NULL), sb()
+{ this->init(&sb); }
+
+// Initialize stream buffer and open file
+gzofstream::gzofstream(const char* name,
+                       std::ios_base::openmode mode)
+: std::ostream(NULL), sb()
+{
+  this->init(&sb);
+  this->open(name, mode);
+}
+
+// Initialize stream buffer and attach to file
+gzofstream::gzofstream(int fd,
+                       std::ios_base::openmode mode)
+: std::ostream(NULL), sb()
+{
+  this->init(&sb);
+  this->attach(fd, mode);
+}
+
+// Open file and go into fail() state if unsuccessful
+void
+gzofstream::open(const char* name,
+                 std::ios_base::openmode mode)
+{
+  if (!sb.open(name, mode | std::ios_base::out))
+    this->setstate(std::ios_base::failbit);
+  else
+    this->clear();
+}
+
+// Attach to file and go into fail() state if unsuccessful
+void
+gzofstream::attach(int fd,
+                   std::ios_base::openmode mode)
+{
+  if (!sb.attach(fd, mode | std::ios_base::out))
+    this->setstate(std::ios_base::failbit);
+  else
+    this->clear();
+}
+
+// Close file
+void
+gzofstream::close()
+{
+  if (!sb.close())
+    this->setstate(std::ios_base::failbit);
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/zfstream.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/zfstream.h
new file mode 100644
index 00000000..8574479a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/iostream3/zfstream.h
@@ -0,0 +1,466 @@
+/*
+ * A C++ I/O streams interface to the zlib gz* functions
+ *
+ * by Ludwig Schwardt <schwardt@sun.ac.za>
+ * original version by Kevin Ruland <kevin@rodin.wustl.edu>
+ *
+ * This version is standard-compliant and compatible with gcc 3.x.
+ */
+
+#ifndef ZFSTREAM_H
+#define ZFSTREAM_H
+
+#include <istream>  // not iostream, since we don't need cin/cout
+#include <ostream>
+#include "zlib.h"
+
+/*****************************************************************************/
+
+/**
+ *  @brief  Gzipped file stream buffer class.
+ *
+ *  This class implements basic_filebuf for gzipped files. It doesn't yet support
+ *  seeking (allowed by zlib but slow/limited), putback and read/write access
+ *  (tricky). Otherwise, it attempts to be a drop-in replacement for the standard
+ *  file streambuf.
+*/
+class gzfilebuf : public std::streambuf
+{
+public:
+  //  Default constructor.
+  gzfilebuf();
+
+  //  Destructor.
+  virtual
+  ~gzfilebuf();
+
+  /**
+   *  @brief  Set compression level and strategy on the fly.
+   *  @param  comp_level  Compression level (see zlib.h for allowed values)
+   *  @param  comp_strategy  Compression strategy (see zlib.h for allowed values)
+   *  @return  Z_OK on success, Z_STREAM_ERROR otherwise.
+   *
+   *  Unfortunately, these parameters cannot be modified separately, as the
+   *  previous zfstream version assumed. Since the strategy is seldom changed,
+   *  it can default and setcompression(level) then becomes like the old
+   *  setcompressionlevel(level).
+  */
+  int
+  setcompression(int comp_level,
+                 int comp_strategy = Z_DEFAULT_STRATEGY);
+
+  /**
+   *  @brief  Check if file is open.
+   *  @return  True if file is open.
+  */
+  bool
+  is_open() const { return (file != NULL); }
+
+  /**
+   *  @brief  Open gzipped file.
+   *  @param  name  File name.
+   *  @param  mode  Open mode flags.
+   *  @return  @c this on success, NULL on failure.
+  */
+  gzfilebuf*
+  open(const char* name,
+       std::ios_base::openmode mode);
+
+  /**
+   *  @brief  Attach to already open gzipped file.
+   *  @param  fd  File descriptor.
+   *  @param  mode  Open mode flags.
+   *  @return  @c this on success, NULL on failure.
+  */
+  gzfilebuf*
+  attach(int fd,
+         std::ios_base::openmode mode);
+
+  /**
+   *  @brief  Close gzipped file.
+   *  @return  @c this on success, NULL on failure.
+  */
+  gzfilebuf*
+  close();
+
+protected:
+  /**
+   *  @brief  Convert ios open mode int to mode string used by zlib.
+   *  @return  True if valid mode flag combination.
+  */
+  bool
+  open_mode(std::ios_base::openmode mode,
+            char* c_mode) const;
+
+  /**
+   *  @brief  Number of characters available in stream buffer.
+   *  @return  Number of characters.
+   *
+   *  This indicates number of characters in get area of stream buffer.
+   *  These characters can be read without accessing the gzipped file.
+  */
+  virtual std::streamsize
+  showmanyc();
+
+  /**
+   *  @brief  Fill get area from gzipped file.
+   *  @return  First character in get area on success, EOF on error.
+   *
+   *  This actually reads characters from gzipped file to stream
+   *  buffer. Always buffered.
+  */
+  virtual int_type
+  underflow();
+
+  /**
+   *  @brief  Write put area to gzipped file.
+   *  @param  c  Extra character to add to buffer contents.
+   *  @return  Non-EOF on success, EOF on error.
+   *
+   *  This actually writes characters in stream buffer to
+   *  gzipped file. With unbuffered output this is done one
+   *  character at a time.
+  */
+  virtual int_type
+  overflow(int_type c = traits_type::eof());
+
+  /**
+   *  @brief  Installs external stream buffer.
+   *  @param  p  Pointer to char buffer.
+   *  @param  n  Size of external buffer.
+   *  @return  @c this on success, NULL on failure.
+   *
+   *  Call setbuf(0,0) to enable unbuffered output.
+  */
+  virtual std::streambuf*
+  setbuf(char_type* p,
+         std::streamsize n);
+
+  /**
+   *  @brief  Flush stream buffer to file.
+   *  @return  0 on success, -1 on error.
+   *
+   *  This calls underflow(EOF) to do the job.
+  */
+  virtual int
+  sync();
+
+//
+// Some future enhancements
+//
+//  virtual int_type uflow();
+//  virtual int_type pbackfail(int_type c = traits_type::eof());
+//  virtual pos_type
+//  seekoff(off_type off,
+//          std::ios_base::seekdir way,
+//          std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out);
+//  virtual pos_type
+//  seekpos(pos_type sp,
+//          std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out);
+
+private:
+  /**
+   *  @brief  Allocate internal buffer.
+   *
+   *  This function is safe to call multiple times. It will ensure
+   *  that a proper internal buffer exists if it is required. If the
+   *  buffer already exists or is external, the buffer pointers will be
+   *  reset to their original state.
+  */
+  void
+  enable_buffer();
+
+  /**
+   *  @brief  Destroy internal buffer.
+   *
+   *  This function is safe to call multiple times. It will ensure
+   *  that the internal buffer is deallocated if it exists. In any
+   *  case, it will also reset the buffer pointers.
+  */
+  void
+  disable_buffer();
+
+  /**
+   *  Underlying file pointer.
+  */
+  gzFile file;
+
+  /**
+   *  Mode in which file was opened.
+  */
+  std::ios_base::openmode io_mode;
+
+  /**
+   *  @brief  True if this object owns file descriptor.
+   *
+   *  This makes the class responsible for closing the file
+   *  upon destruction.
+  */
+  bool own_fd;
+
+  /**
+   *  @brief  Stream buffer.
+   *
+   *  For simplicity this remains allocated on the free store for the
+   *  entire life span of the gzfilebuf object, unless replaced by setbuf.
+  */
+  char_type* buffer;
+
+  /**
+   *  @brief  Stream buffer size.
+   *
+   *  Defaults to system default buffer size (typically 8192 bytes).
+   *  Modified by setbuf.
+  */
+  std::streamsize buffer_size;
+
+  /**
+   *  @brief  True if this object owns stream buffer.
+   *
+   *  This makes the class responsible for deleting the buffer
+   *  upon destruction.
+  */
+  bool own_buffer;
+};
+
+/*****************************************************************************/
+
+/**
+ *  @brief  Gzipped file input stream class.
+ *
+ *  This class implements ifstream for gzipped files. Seeking and putback
+ *  is not supported yet.
+*/
+class gzifstream : public std::istream
+{
+public:
+  //  Default constructor
+  gzifstream();
+
+  /**
+   *  @brief  Construct stream on gzipped file to be opened.
+   *  @param  name  File name.
+   *  @param  mode  Open mode flags (forced to contain ios::in).
+  */
+  explicit
+  gzifstream(const char* name,
+             std::ios_base::openmode mode = std::ios_base::in);
+
+  /**
+   *  @brief  Construct stream on already open gzipped file.
+   *  @param  fd    File descriptor.
+   *  @param  mode  Open mode flags (forced to contain ios::in).
+  */
+  explicit
+  gzifstream(int fd,
+             std::ios_base::openmode mode = std::ios_base::in);
+
+  /**
+   *  Obtain underlying stream buffer.
+  */
+  gzfilebuf*
+  rdbuf() const
+  { return const_cast<gzfilebuf*>(&sb); }
+
+  /**
+   *  @brief  Check if file is open.
+   *  @return  True if file is open.
+  */
+  bool
+  is_open() { return sb.is_open(); }
+
+  /**
+   *  @brief  Open gzipped file.
+   *  @param  name  File name.
+   *  @param  mode  Open mode flags (forced to contain ios::in).
+   *
+   *  Stream will be in state good() if file opens successfully;
+   *  otherwise in state fail(). This differs from the behavior of
+   *  ifstream, which never sets the state to good() and therefore
+   *  won't allow you to reuse the stream for a second file unless
+   *  you manually clear() the state. The choice is a matter of
+   *  convenience.
+  */
+  void
+  open(const char* name,
+       std::ios_base::openmode mode = std::ios_base::in);
+
+  /**
+   *  @brief  Attach to already open gzipped file.
+   *  @param  fd  File descriptor.
+   *  @param  mode  Open mode flags (forced to contain ios::in).
+   *
+   *  Stream will be in state good() if attach succeeded; otherwise
+   *  in state fail().
+  */
+  void
+  attach(int fd,
+         std::ios_base::openmode mode = std::ios_base::in);
+
+  /**
+   *  @brief  Close gzipped file.
+   *
+   *  Stream will be in state fail() if close failed.
+  */
+  void
+  close();
+
+private:
+  /**
+   *  Underlying stream buffer.
+  */
+  gzfilebuf sb;
+};
+
+/*****************************************************************************/
+
+/**
+ *  @brief  Gzipped file output stream class.
+ *
+ *  This class implements ofstream for gzipped files. Seeking and putback
+ *  is not supported yet.
+*/
+class gzofstream : public std::ostream
+{
+public:
+  //  Default constructor
+  gzofstream();
+
+  /**
+   *  @brief  Construct stream on gzipped file to be opened.
+   *  @param  name  File name.
+   *  @param  mode  Open mode flags (forced to contain ios::out).
+  */
+  explicit
+  gzofstream(const char* name,
+             std::ios_base::openmode mode = std::ios_base::out);
+
+  /**
+   *  @brief  Construct stream on already open gzipped file.
+   *  @param  fd    File descriptor.
+   *  @param  mode  Open mode flags (forced to contain ios::out).
+  */
+  explicit
+  gzofstream(int fd,
+             std::ios_base::openmode mode = std::ios_base::out);
+
+  /**
+   *  Obtain underlying stream buffer.
+  */
+  gzfilebuf*
+  rdbuf() const
+  { return const_cast<gzfilebuf*>(&sb); }
+
+  /**
+   *  @brief  Check if file is open.
+   *  @return  True if file is open.
+  */
+  bool
+  is_open() { return sb.is_open(); }
+
+  /**
+   *  @brief  Open gzipped file.
+   *  @param  name  File name.
+   *  @param  mode  Open mode flags (forced to contain ios::out).
+   *
+   *  Stream will be in state good() if file opens successfully;
+   *  otherwise in state fail(). This differs from the behavior of
+   *  ofstream, which never sets the state to good() and therefore
+   *  won't allow you to reuse the stream for a second file unless
+   *  you manually clear() the state. The choice is a matter of
+   *  convenience.
+  */
+  void
+  open(const char* name,
+       std::ios_base::openmode mode = std::ios_base::out);
+
+  /**
+   *  @brief  Attach to already open gzipped file.
+   *  @param  fd  File descriptor.
+   *  @param  mode  Open mode flags (forced to contain ios::out).
+   *
+   *  Stream will be in state good() if attach succeeded; otherwise
+   *  in state fail().
+  */
+  void
+  attach(int fd,
+         std::ios_base::openmode mode = std::ios_base::out);
+
+  /**
+   *  @brief  Close gzipped file.
+   *
+   *  Stream will be in state fail() if close failed.
+  */
+  void
+  close();
+
+private:
+  /**
+   *  Underlying stream buffer.
+  */
+  gzfilebuf sb;
+};
+
+/*****************************************************************************/
+
+/**
+ *  @brief  Gzipped file output stream manipulator class.
+ *
+ *  This class defines a two-argument manipulator for gzofstream. It is used
+ *  as base for the setcompression(int,int) manipulator.
+*/
+template<typename T1, typename T2>
+  class gzomanip2
+  {
+  public:
+    // Allows insertor to peek at internals
+    template <typename Ta, typename Tb>
+      friend gzofstream&
+      operator<<(gzofstream&,
+                 const gzomanip2<Ta,Tb>&);
+
+    // Constructor
+    gzomanip2(gzofstream& (*f)(gzofstream&, T1, T2),
+              T1 v1,
+              T2 v2);
+  private:
+    // Underlying manipulator function
+    gzofstream&
+    (*func)(gzofstream&, T1, T2);
+
+    // Arguments for manipulator function
+    T1 val1;
+    T2 val2;
+  };
+
+/*****************************************************************************/
+
+// Manipulator function thunks through to stream buffer
+inline gzofstream&
+setcompression(gzofstream &gzs, int l, int s = Z_DEFAULT_STRATEGY)
+{
+  (gzs.rdbuf())->setcompression(l, s);
+  return gzs;
+}
+
+// Manipulator constructor stores arguments
+template<typename T1, typename T2>
+  inline
+  gzomanip2<T1,T2>::gzomanip2(gzofstream &(*f)(gzofstream &, T1, T2),
+                              T1 v1,
+                              T2 v2)
+  : func(f), val1(v1), val2(v2)
+  { }
+
+// Insertor applies underlying manipulator function to stream
+template<typename T1, typename T2>
+  inline gzofstream&
+  operator<<(gzofstream& s, const gzomanip2<T1,T2>& m)
+  { return (*m.func)(s, m.val1, m.val2); }
+
+// Insert this onto stream to simplify setting of compression level
+inline gzomanip2<int,int>
+setcompression(int l, int s = Z_DEFAULT_STRATEGY)
+{ return gzomanip2<int,int>(&setcompression, l, s); }
+
+#endif // ZFSTREAM_H
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/bld_ml64.bat b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/bld_ml64.bat
new file mode 100644
index 00000000..f74bcef5
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/bld_ml64.bat
@@ -0,0 +1,2 @@
+ml64.exe /Flinffasx64 /c /Zi inffasx64.asm
+ml64.exe /Flgvmat64   /c /Zi gvmat64.asm
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/gvmat64.asm b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/gvmat64.asm
new file mode 100644
index 00000000..c1817f1b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/gvmat64.asm
@@ -0,0 +1,553 @@
+;uInt longest_match_x64(
+;    deflate_state *s,
+;    IPos cur_match);                             /* current match */
+
+; gvmat64.asm -- Asm portion of the optimized longest_match for 32 bits x86_64
+;  (AMD64 on Athlon 64, Opteron, Phenom
+;     and Intel EM64T on Pentium 4 with EM64T, Pentium D, Core 2 Duo, Core I5/I7)
+; Copyright (C) 1995-2010 Jean-loup Gailly, Brian Raiter and Gilles Vollant.
+;
+; File written by Gilles Vollant, by converting to assembly the longest_match
+;  from Jean-loup Gailly in deflate.c of zLib and infoZip zip.
+;
+;  and by taking inspiration on asm686 with masm, optimised assembly code
+;        from Brian Raiter, written 1998
+;
+;  This software is provided 'as-is', without any express or implied
+;  warranty.  In no event will the authors be held liable for any damages
+;  arising from the use of this software.
+;
+;  Permission is granted to anyone to use this software for any purpose,
+;  including commercial applications, and to alter it and redistribute it
+;  freely, subject to the following restrictions:
+;
+;  1. The origin of this software must not be misrepresented; you must not
+;     claim that you wrote the original software. If you use this software
+;     in a product, an acknowledgment in the product documentation would be
+;     appreciated but is not required.
+;  2. Altered source versions must be plainly marked as such, and must not be
+;     misrepresented as being the original software
+;  3. This notice may not be removed or altered from any source distribution.
+;
+;
+;
+;         http://www.zlib.net
+;         http://www.winimage.com/zLibDll
+;         http://www.muppetlabs.com/~breadbox/software/assembly.html
+;
+; to compile this file for infozip Zip, I use option:
+;   ml64.exe /Flgvmat64 /c /Zi /DINFOZIP gvmat64.asm
+;
+; to compile this file for zLib, I use option:
+;   ml64.exe /Flgvmat64 /c /Zi gvmat64.asm
+; Be carrefull to adapt zlib1222add below to your version of zLib
+;   (if you use a version of zLib before 1.0.4 or after 1.2.2.2, change
+;    value of zlib1222add later)
+;
+; This file compile with Microsoft Macro Assembler (x64) for AMD64
+;
+;   ml64.exe is given with Visual Studio 2005/2008/2010 and Windows WDK
+;
+;   (you can get Windows WDK with ml64 for AMD64 from
+;      http://www.microsoft.com/whdc/Devtools/wdk/default.mspx for low price)
+;
+
+
+;uInt longest_match(s, cur_match)
+;    deflate_state *s;
+;    IPos cur_match;                             /* current match */
+.code
+longest_match PROC
+
+
+;LocalVarsSize   equ 88
+ LocalVarsSize   equ 72
+
+; register used : rax,rbx,rcx,rdx,rsi,rdi,r8,r9,r10,r11,r12
+; free register :  r14,r15
+; register can be saved : rsp
+
+ chainlenwmask   equ  rsp + 8 - LocalVarsSize    ; high word: current chain len
+                                                 ; low word: s->wmask
+;window          equ  rsp + xx - LocalVarsSize   ; local copy of s->window ; stored in r10
+;windowbestlen   equ  rsp + xx - LocalVarsSize   ; s->window + bestlen , use r10+r11
+;scanstart       equ  rsp + xx - LocalVarsSize   ; first two bytes of string ; stored in r12w
+;scanend         equ  rsp + xx - LocalVarsSize   ; last two bytes of string use ebx
+;scanalign       equ  rsp + xx - LocalVarsSize   ; dword-misalignment of string r13
+;bestlen         equ  rsp + xx - LocalVarsSize   ; size of best match so far -> r11d
+;scan            equ  rsp + xx - LocalVarsSize   ; ptr to string wanting match -> r9
+IFDEF INFOZIP
+ELSE
+ nicematch       equ  (rsp + 16 - LocalVarsSize) ; a good enough match size
+ENDIF
+
+save_rdi        equ  rsp + 24 - LocalVarsSize
+save_rsi        equ  rsp + 32 - LocalVarsSize
+save_rbx        equ  rsp + 40 - LocalVarsSize
+save_rbp        equ  rsp + 48 - LocalVarsSize
+save_r12        equ  rsp + 56 - LocalVarsSize
+save_r13        equ  rsp + 64 - LocalVarsSize
+;save_r14        equ  rsp + 72 - LocalVarsSize
+;save_r15        equ  rsp + 80 - LocalVarsSize
+
+
+; summary of register usage
+; scanend     ebx
+; scanendw    bx
+; chainlenwmask   edx
+; curmatch    rsi
+; curmatchd   esi
+; windowbestlen   r8
+; scanalign   r9
+; scanalignd  r9d
+; window      r10
+; bestlen     r11
+; bestlend    r11d
+; scanstart   r12d
+; scanstartw  r12w
+; scan        r13
+; nicematch   r14d
+; limit       r15
+; limitd      r15d
+; prev        rcx
+
+;  all the +4 offsets are due to the addition of pending_buf_size (in zlib
+;  in the deflate_state structure since the asm code was first written
+;  (if you compile with zlib 1.0.4 or older, remove the +4).
+;  Note : these value are good with a 8 bytes boundary pack structure
+
+
+    MAX_MATCH           equ     258
+    MIN_MATCH           equ     3
+    MIN_LOOKAHEAD       equ     (MAX_MATCH+MIN_MATCH+1)
+
+
+;;; Offsets for fields in the deflate_state structure. These numbers
+;;; are calculated from the definition of deflate_state, with the
+;;; assumption that the compiler will dword-align the fields. (Thus,
+;;; changing the definition of deflate_state could easily cause this
+;;; program to crash horribly, without so much as a warning at
+;;; compile time. Sigh.)
+
+;  all the +zlib1222add offsets are due to the addition of fields
+;  in zlib in the deflate_state structure since the asm code was first written
+;  (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
+;  (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
+;  if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
+
+
+IFDEF INFOZIP
+
+_DATA   SEGMENT
+COMM    window_size:DWORD
+; WMask ; 7fff
+COMM    window:BYTE:010040H
+COMM    prev:WORD:08000H
+; MatchLen : unused
+; PrevMatch : unused
+COMM    strstart:DWORD
+COMM    match_start:DWORD
+; Lookahead : ignore
+COMM    prev_length:DWORD ; PrevLen
+COMM    max_chain_length:DWORD
+COMM    good_match:DWORD
+COMM    nice_match:DWORD
+prev_ad equ OFFSET prev
+window_ad equ OFFSET window
+nicematch equ nice_match
+_DATA ENDS
+WMask equ 07fffh
+
+ELSE
+
+  IFNDEF zlib1222add
+    zlib1222add equ 8
+  ENDIF
+dsWSize         equ 56+zlib1222add+(zlib1222add/2)
+dsWMask         equ 64+zlib1222add+(zlib1222add/2)
+dsWindow        equ 72+zlib1222add
+dsPrev          equ 88+zlib1222add
+dsMatchLen      equ 128+zlib1222add
+dsPrevMatch     equ 132+zlib1222add
+dsStrStart      equ 140+zlib1222add
+dsMatchStart    equ 144+zlib1222add
+dsLookahead     equ 148+zlib1222add
+dsPrevLen       equ 152+zlib1222add
+dsMaxChainLen   equ 156+zlib1222add
+dsGoodMatch     equ 172+zlib1222add
+dsNiceMatch     equ 176+zlib1222add
+
+window_size     equ [ rcx + dsWSize]
+WMask           equ [ rcx + dsWMask]
+window_ad       equ [ rcx + dsWindow]
+prev_ad         equ [ rcx + dsPrev]
+strstart        equ [ rcx + dsStrStart]
+match_start     equ [ rcx + dsMatchStart]
+Lookahead       equ [ rcx + dsLookahead] ; 0ffffffffh on infozip
+prev_length     equ [ rcx + dsPrevLen]
+max_chain_length equ [ rcx + dsMaxChainLen]
+good_match      equ [ rcx + dsGoodMatch]
+nice_match      equ [ rcx + dsNiceMatch]
+ENDIF
+
+; parameter 1 in r8(deflate state s), param 2 in rdx (cur match)
+
+; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and
+; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp
+;
+; All registers must be preserved across the call, except for
+;   rax, rcx, rdx, r8, r9, r10, and r11, which are scratch.
+
+
+
+;;; Save registers that the compiler may be using, and adjust esp to
+;;; make room for our stack frame.
+
+
+;;; Retrieve the function arguments. r8d will hold cur_match
+;;; throughout the entire function. edx will hold the pointer to the
+;;; deflate_state structure during the function's setup (before
+;;; entering the main loop.
+
+; parameter 1 in rcx (deflate_state* s), param 2 in edx -> r8 (cur match)
+
+; this clear high 32 bits of r8, which can be garbage in both r8 and rdx
+
+        mov [save_rdi],rdi
+        mov [save_rsi],rsi
+        mov [save_rbx],rbx
+        mov [save_rbp],rbp
+IFDEF INFOZIP
+        mov r8d,ecx
+ELSE
+        mov r8d,edx
+ENDIF
+        mov [save_r12],r12
+        mov [save_r13],r13
+;        mov [save_r14],r14
+;        mov [save_r15],r15
+
+
+;;; uInt wmask = s->w_mask;
+;;; unsigned chain_length = s->max_chain_length;
+;;; if (s->prev_length >= s->good_match) {
+;;;     chain_length >>= 2;
+;;; }
+
+        mov edi, prev_length
+        mov esi, good_match
+        mov eax, WMask
+        mov ebx, max_chain_length
+        cmp edi, esi
+        jl  LastMatchGood
+        shr ebx, 2
+LastMatchGood:
+
+;;; chainlen is decremented once beforehand so that the function can
+;;; use the sign flag instead of the zero flag for the exit test.
+;;; It is then shifted into the high word, to make room for the wmask
+;;; value, which it will always accompany.
+
+        dec ebx
+        shl ebx, 16
+        or  ebx, eax
+
+;;; on zlib only
+;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+
+IFDEF INFOZIP
+        mov [chainlenwmask], ebx
+; on infozip nice_match = [nice_match]
+ELSE
+        mov eax, nice_match
+        mov [chainlenwmask], ebx
+        mov r10d, Lookahead
+        cmp r10d, eax
+        cmovnl r10d, eax
+        mov [nicematch],r10d
+ENDIF
+
+;;; register Bytef *scan = s->window + s->strstart;
+        mov r10, window_ad
+        mov ebp, strstart
+        lea r13, [r10 + rbp]
+
+;;; Determine how many bytes the scan ptr is off from being
+;;; dword-aligned.
+
+         mov r9,r13
+         neg r13
+         and r13,3
+
+;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+;;;     s->strstart - (IPos)MAX_DIST(s) : NIL;
+IFDEF INFOZIP
+        mov eax,07efah ; MAX_DIST = (WSIZE-MIN_LOOKAHEAD) (0x8000-(3+8+1))
+ELSE
+        mov eax, window_size
+        sub eax, MIN_LOOKAHEAD
+ENDIF
+        xor edi,edi
+        sub ebp, eax
+
+        mov r11d, prev_length
+
+        cmovng ebp,edi
+
+;;; int best_len = s->prev_length;
+
+
+;;; Store the sum of s->window + best_len in esi locally, and in esi.
+
+       lea  rsi,[r10+r11]
+
+;;; register ush scan_start = *(ushf*)scan;
+;;; register ush scan_end   = *(ushf*)(scan+best_len-1);
+;;; Posf *prev = s->prev;
+
+        movzx r12d,word ptr [r9]
+        movzx ebx, word ptr [r9 + r11 - 1]
+
+        mov rdi, prev_ad
+
+;;; Jump into the main loop.
+
+        mov edx, [chainlenwmask]
+
+        cmp bx,word ptr [rsi + r8 - 1]
+        jz  LookupLoopIsZero
+
+LookupLoop1:
+        and r8d, edx
+
+        movzx   r8d, word ptr [rdi + r8*2]
+        cmp r8d, ebp
+        jbe LeaveNow
+        sub edx, 00010000h
+        js  LeaveNow
+
+LoopEntry1:
+        cmp bx,word ptr [rsi + r8 - 1]
+        jz  LookupLoopIsZero
+
+LookupLoop2:
+        and r8d, edx
+
+        movzx   r8d, word ptr [rdi + r8*2]
+        cmp r8d, ebp
+        jbe LeaveNow
+        sub edx, 00010000h
+        js  LeaveNow
+
+LoopEntry2:
+        cmp bx,word ptr [rsi + r8 - 1]
+        jz  LookupLoopIsZero
+
+LookupLoop4:
+        and r8d, edx
+
+        movzx   r8d, word ptr [rdi + r8*2]
+        cmp r8d, ebp
+        jbe LeaveNow
+        sub edx, 00010000h
+        js  LeaveNow
+
+LoopEntry4:
+
+        cmp bx,word ptr [rsi + r8 - 1]
+        jnz LookupLoop1
+        jmp LookupLoopIsZero
+
+
+;;; do {
+;;;     match = s->window + cur_match;
+;;;     if (*(ushf*)(match+best_len-1) != scan_end ||
+;;;         *(ushf*)match != scan_start) continue;
+;;;     [...]
+;;; } while ((cur_match = prev[cur_match & wmask]) > limit
+;;;          && --chain_length != 0);
+;;;
+;;; Here is the inner loop of the function. The function will spend the
+;;; majority of its time in this loop, and majority of that time will
+;;; be spent in the first ten instructions.
+;;;
+;;; Within this loop:
+;;; ebx = scanend
+;;; r8d = curmatch
+;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
+;;; esi = windowbestlen - i.e., (window + bestlen)
+;;; edi = prev
+;;; ebp = limit
+
+LookupLoop:
+        and r8d, edx
+
+        movzx   r8d, word ptr [rdi + r8*2]
+        cmp r8d, ebp
+        jbe LeaveNow
+        sub edx, 00010000h
+        js  LeaveNow
+
+LoopEntry:
+
+        cmp bx,word ptr [rsi + r8 - 1]
+        jnz LookupLoop1
+LookupLoopIsZero:
+        cmp     r12w, word ptr [r10 + r8]
+        jnz LookupLoop1
+
+
+;;; Store the current value of chainlen.
+        mov [chainlenwmask], edx
+
+;;; Point edi to the string under scrutiny, and esi to the string we
+;;; are hoping to match it up with. In actuality, esi and edi are
+;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is
+;;; initialized to -(MAX_MATCH_8 - scanalign).
+
+        lea rsi,[r8+r10]
+        mov rdx, 0fffffffffffffef8h; -(MAX_MATCH_8)
+        lea rsi, [rsi + r13 + 0108h] ;MAX_MATCH_8]
+        lea rdi, [r9 + r13 + 0108h] ;MAX_MATCH_8]
+
+        prefetcht1 [rsi+rdx]
+        prefetcht1 [rdi+rdx]
+
+
+;;; Test the strings for equality, 8 bytes at a time. At the end,
+;;; adjust rdx so that it is offset to the exact byte that mismatched.
+;;;
+;;; We already know at this point that the first three bytes of the
+;;; strings match each other, and they can be safely passed over before
+;;; starting the compare loop. So what this code does is skip over 0-3
+;;; bytes, as much as necessary in order to dword-align the edi
+;;; pointer. (rsi will still be misaligned three times out of four.)
+;;;
+;;; It should be confessed that this loop usually does not represent
+;;; much of the total running time. Replacing it with a more
+;;; straightforward "rep cmpsb" would not drastically degrade
+;;; performance.
+
+
+LoopCmps:
+        mov rax, [rsi + rdx]
+        xor rax, [rdi + rdx]
+        jnz LeaveLoopCmps
+
+        mov rax, [rsi + rdx + 8]
+        xor rax, [rdi + rdx + 8]
+        jnz LeaveLoopCmps8
+
+
+        mov rax, [rsi + rdx + 8+8]
+        xor rax, [rdi + rdx + 8+8]
+        jnz LeaveLoopCmps16
+
+        add rdx,8+8+8
+
+        jnz short LoopCmps
+        jmp short LenMaximum
+LeaveLoopCmps16: add rdx,8
+LeaveLoopCmps8: add rdx,8
+LeaveLoopCmps:
+
+        test    eax, 0000FFFFh
+        jnz LenLower
+
+        test eax,0ffffffffh
+
+        jnz LenLower32
+
+        add rdx,4
+        shr rax,32
+        or ax,ax
+        jnz LenLower
+
+LenLower32:
+        shr eax,16
+        add rdx,2
+LenLower:   sub al, 1
+        adc rdx, 0
+;;; Calculate the length of the match. If it is longer than MAX_MATCH,
+;;; then automatically accept it as the best possible match and leave.
+
+        lea rax, [rdi + rdx]
+        sub rax, r9
+        cmp eax, MAX_MATCH
+        jge LenMaximum
+
+;;; If the length of the match is not longer than the best match we
+;;; have so far, then forget it and return to the lookup loop.
+;///////////////////////////////////
+
+        cmp eax, r11d
+        jg  LongerMatch
+
+        lea rsi,[r10+r11]
+
+        mov rdi, prev_ad
+        mov edx, [chainlenwmask]
+        jmp LookupLoop
+
+;;;         s->match_start = cur_match;
+;;;         best_len = len;
+;;;         if (len >= nice_match) break;
+;;;         scan_end = *(ushf*)(scan+best_len-1);
+
+LongerMatch:
+        mov r11d, eax
+        mov match_start, r8d
+        cmp eax, [nicematch]
+        jge LeaveNow
+
+        lea rsi,[r10+rax]
+
+        movzx   ebx, word ptr [r9 + rax - 1]
+        mov rdi, prev_ad
+        mov edx, [chainlenwmask]
+        jmp LookupLoop
+
+;;; Accept the current string, with the maximum possible length.
+
+LenMaximum:
+        mov r11d,MAX_MATCH
+        mov match_start, r8d
+
+;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+;;; return s->lookahead;
+
+LeaveNow:
+IFDEF INFOZIP
+        mov eax,r11d
+ELSE
+        mov eax, Lookahead
+        cmp r11d, eax
+        cmovng eax, r11d
+ENDIF
+
+;;; Restore the stack and return from whence we came.
+
+
+        mov rsi,[save_rsi]
+        mov rdi,[save_rdi]
+        mov rbx,[save_rbx]
+        mov rbp,[save_rbp]
+        mov r12,[save_r12]
+        mov r13,[save_r13]
+;        mov r14,[save_r14]
+;        mov r15,[save_r15]
+
+
+        ret 0
+; please don't remove this string !
+; Your can freely use gvmat64 in any free or commercial app
+; but it is far better don't remove the string in the binary!
+    db     0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998, converted to amd 64 by Gilles Vollant 2005",0dh,0ah,0
+longest_match   ENDP
+
+match_init PROC
+  ret 0
+match_init ENDP
+
+
+END
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/inffas8664.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/inffas8664.c
new file mode 100644
index 00000000..aa861a33
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/inffas8664.c
@@ -0,0 +1,186 @@
+/* inffas8664.c is a hand tuned assembler version of inffast.c - fast decoding
+ * version for AMD64 on Windows using Microsoft C compiler
+ *
+ * Copyright (C) 1995-2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Copyright (C) 2003 Chris Anderson <christop@charm.net>
+ * Please use the copyright conditions above.
+ *
+ * 2005 - Adaptation to Microsoft C Compiler for AMD64 by Gilles Vollant
+ *
+ * inffas8664.c call function inffas8664fnc in inffasx64.asm
+ *  inffasx64.asm is automatically convert from AMD64 portion of inffas86.c
+ *
+ * Dec-29-2003 -- I added AMD64 inflate asm support.  This version is also
+ * slightly quicker on x86 systems because, instead of using rep movsb to copy
+ * data, it uses rep movsw, which moves data in 2-byte chunks instead of single
+ * bytes.  I've tested the AMD64 code on a Fedora Core 1 + the x86_64 updates
+ * from http://fedora.linux.duke.edu/fc1_x86_64
+ * which is running on an Athlon 64 3000+ / Gigabyte GA-K8VT800M system with
+ * 1GB ram.  The 64-bit version is about 4% faster than the 32-bit version,
+ * when decompressing mozilla-source-1.3.tar.gz.
+ *
+ * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from
+ * the gcc -S output of zlib-1.2.0/inffast.c.  Zlib-1.2.0 is in beta release at
+ * the moment.  I have successfully compiled and tested this code with gcc2.96,
+ * gcc3.2, icc5.0, msvc6.0.  It is very close to the speed of inffast.S
+ * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX
+ * enabled.  I will attempt to merge the MMX code into this version.  Newer
+ * versions of this and inffast.S can be found at
+ * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/
+ *
+ */
+
+#include <stdio.h>
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+/* Mark Adler's comments from inffast.c: */
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state->mode == LEN
+        strm->avail_in >= 6
+        strm->avail_out >= 258
+        start >= strm->avail_out
+        state->bits < 8
+
+   On return, state->mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm->avail_out >= 258 for each loop to avoid checking for
+      output space.
+ */
+
+
+
+    typedef struct inffast_ar {
+/* 64   32                               x86  x86_64 */
+/* ar offset                              register */
+/*  0    0 */ void *esp;                /* esp save */
+/*  8    4 */ void *ebp;                /* ebp save */
+/* 16    8 */ unsigned char FAR *in;    /* esi rsi  local strm->next_in */
+/* 24   12 */ unsigned char FAR *last;  /*     r9   while in < last */
+/* 32   16 */ unsigned char FAR *out;   /* edi rdi  local strm->next_out */
+/* 40   20 */ unsigned char FAR *beg;   /*          inflate()'s init next_out */
+/* 48   24 */ unsigned char FAR *end;   /*     r10  while out < end */
+/* 56   28 */ unsigned char FAR *window;/*          size of window, wsize!=0 */
+/* 64   32 */ code const FAR *lcode;    /* ebp rbp  local strm->lencode */
+/* 72   36 */ code const FAR *dcode;    /*     r11  local strm->distcode */
+/* 80   40 */ size_t /*unsigned long */hold;       /* edx rdx  local strm->hold */
+/* 88   44 */ unsigned bits;            /* ebx rbx  local strm->bits */
+/* 92   48 */ unsigned wsize;           /*          window size */
+/* 96   52 */ unsigned write;           /*          window write index */
+/*100   56 */ unsigned lmask;           /*     r12  mask for lcode */
+/*104   60 */ unsigned dmask;           /*     r13  mask for dcode */
+/*108   64 */ unsigned len;             /*     r14  match length */
+/*112   68 */ unsigned dist;            /*     r15  match distance */
+/*116   72 */ unsigned status;          /*          set when state chng*/
+    } type_ar;
+#ifdef ASMINF
+
+void inflate_fast(strm, start)
+z_streamp strm;
+unsigned start;         /* inflate()'s starting value for strm->avail_out */
+{
+    struct inflate_state FAR *state;
+    type_ar ar;
+    void inffas8664fnc(struct inffast_ar * par);
+
+
+
+#if (defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )) || (defined(_MSC_VER) && defined(_M_AMD64))
+#define PAD_AVAIL_IN 6
+#define PAD_AVAIL_OUT 258
+#else
+#define PAD_AVAIL_IN 5
+#define PAD_AVAIL_OUT 257
+#endif
+
+    /* copy state to local variables */
+    state = (struct inflate_state FAR *)strm->state;
+
+    ar.in = strm->next_in;
+    ar.last = ar.in + (strm->avail_in - PAD_AVAIL_IN);
+    ar.out = strm->next_out;
+    ar.beg = ar.out - (start - strm->avail_out);
+    ar.end = ar.out + (strm->avail_out - PAD_AVAIL_OUT);
+    ar.wsize = state->wsize;
+    ar.write = state->wnext;
+    ar.window = state->window;
+    ar.hold = state->hold;
+    ar.bits = state->bits;
+    ar.lcode = state->lencode;
+    ar.dcode = state->distcode;
+    ar.lmask = (1U << state->lenbits) - 1;
+    ar.dmask = (1U << state->distbits) - 1;
+
+    /* decode literals and length/distances until end-of-block or not enough
+       input data or output space */
+
+    /* align in on 1/2 hold size boundary */
+    while (((size_t)(void *)ar.in & (sizeof(ar.hold) / 2 - 1)) != 0) {
+        ar.hold += (unsigned long)*ar.in++ << ar.bits;
+        ar.bits += 8;
+    }
+
+    inffas8664fnc(&ar);
+
+    if (ar.status > 1) {
+        if (ar.status == 2)
+            strm->msg = "invalid literal/length code";
+        else if (ar.status == 3)
+            strm->msg = "invalid distance code";
+        else
+            strm->msg = "invalid distance too far back";
+        state->mode = BAD;
+    }
+    else if ( ar.status == 1 ) {
+        state->mode = TYPE;
+    }
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    ar.len = ar.bits >> 3;
+    ar.in -= ar.len;
+    ar.bits -= ar.len << 3;
+    ar.hold &= (1U << ar.bits) - 1;
+
+    /* update state and return */
+    strm->next_in = ar.in;
+    strm->next_out = ar.out;
+    strm->avail_in = (unsigned)(ar.in < ar.last ?
+                                PAD_AVAIL_IN + (ar.last - ar.in) :
+                                PAD_AVAIL_IN - (ar.in - ar.last));
+    strm->avail_out = (unsigned)(ar.out < ar.end ?
+                                 PAD_AVAIL_OUT + (ar.end - ar.out) :
+                                 PAD_AVAIL_OUT - (ar.out - ar.end));
+    state->hold = (unsigned long)ar.hold;
+    state->bits = ar.bits;
+    return;
+}
+
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/inffasx64.asm b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/inffasx64.asm
new file mode 100644
index 00000000..41ec8239
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/inffasx64.asm
@@ -0,0 +1,396 @@
+; inffasx64.asm is a hand tuned assembler version of inffast.c - fast decoding
+; version for AMD64 on Windows using Microsoft C compiler
+;
+; inffasx64.asm is automatically convert from AMD64 portion of inffas86.c
+; inffasx64.asm is called by inffas8664.c, which contain more info.
+
+
+; to compile this file, I use option
+;   ml64.exe /Flinffasx64 /c /Zi inffasx64.asm
+;   with Microsoft Macro Assembler (x64) for AMD64
+;
+
+; This file compile with Microsoft Macro Assembler (x64) for AMD64
+;
+;   ml64.exe is given with Visual Studio 2005/2008/2010 and Windows WDK
+;
+;   (you can get Windows WDK with ml64 for AMD64 from
+;      http://www.microsoft.com/whdc/Devtools/wdk/default.mspx for low price)
+;
+
+
+.code
+inffas8664fnc PROC
+
+; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and
+; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp
+;
+; All registers must be preserved across the call, except for
+;   rax, rcx, rdx, r8, r-9, r10, and r11, which are scratch.
+
+
+	mov [rsp-8],rsi
+	mov [rsp-16],rdi
+	mov [rsp-24],r12
+	mov [rsp-32],r13
+	mov [rsp-40],r14
+	mov [rsp-48],r15
+	mov [rsp-56],rbx
+
+	mov rax,rcx
+
+	mov	[rax+8], rbp       ; /* save regs rbp and rsp */
+	mov	[rax], rsp
+
+	mov	rsp, rax          ; /* make rsp point to &ar */
+
+	mov	rsi, [rsp+16]      ; /* rsi  = in */
+	mov	rdi, [rsp+32]      ; /* rdi  = out */
+	mov	r9, [rsp+24]       ; /* r9   = last */
+	mov	r10, [rsp+48]      ; /* r10  = end */
+	mov	rbp, [rsp+64]      ; /* rbp  = lcode */
+	mov	r11, [rsp+72]      ; /* r11  = dcode */
+	mov	rdx, [rsp+80]      ; /* rdx  = hold */
+	mov	ebx, [rsp+88]      ; /* ebx  = bits */
+	mov	r12d, [rsp+100]    ; /* r12d = lmask */
+	mov	r13d, [rsp+104]    ; /* r13d = dmask */
+                                          ; /* r14d = len */
+                                          ; /* r15d = dist */
+
+
+	cld
+	cmp	r10, rdi
+	je	L_one_time           ; /* if only one decode left */
+	cmp	r9, rsi
+
+    jne L_do_loop
+
+
+L_one_time:
+	mov	r8, r12           ; /* r8 = lmask */
+	cmp	bl, 32
+	ja	L_get_length_code_one_time
+
+	lodsd                         ; /* eax = *(uint *)in++ */
+	mov	cl, bl            ; /* cl = bits, needs it for shifting */
+	add	bl, 32             ; /* bits += 32 */
+	shl	rax, cl
+	or	rdx, rax          ; /* hold |= *((uint *)in)++ << bits */
+	jmp	L_get_length_code_one_time
+
+ALIGN 4
+L_while_test:
+	cmp	r10, rdi
+	jbe	L_break_loop
+	cmp	r9, rsi
+	jbe	L_break_loop
+
+L_do_loop:
+	mov	r8, r12           ; /* r8 = lmask */
+	cmp	bl, 32
+	ja	L_get_length_code    ; /* if (32 < bits) */
+
+	lodsd                         ; /* eax = *(uint *)in++ */
+	mov	cl, bl            ; /* cl = bits, needs it for shifting */
+	add	bl, 32             ; /* bits += 32 */
+	shl	rax, cl
+	or	rdx, rax          ; /* hold |= *((uint *)in)++ << bits */
+
+L_get_length_code:
+	and	r8, rdx            ; /* r8 &= hold */
+	mov	eax, [rbp+r8*4]  ; /* eax = lcode[hold & lmask] */
+
+	mov	cl, ah            ; /* cl = this.bits */
+	sub	bl, ah            ; /* bits -= this.bits */
+	shr	rdx, cl           ; /* hold >>= this.bits */
+
+	test	al, al
+	jnz	L_test_for_length_base ; /* if (op != 0) 45.7% */
+
+	mov	r8, r12            ; /* r8 = lmask */
+	shr	eax, 16            ; /* output this.val char */
+	stosb
+
+L_get_length_code_one_time:
+	and	r8, rdx            ; /* r8 &= hold */
+	mov	eax, [rbp+r8*4] ; /* eax = lcode[hold & lmask] */
+
+L_dolen:
+	mov	cl, ah            ; /* cl = this.bits */
+	sub	bl, ah            ; /* bits -= this.bits */
+	shr	rdx, cl           ; /* hold >>= this.bits */
+
+	test	al, al
+	jnz	L_test_for_length_base ; /* if (op != 0) 45.7% */
+
+	shr	eax, 16            ; /* output this.val char */
+	stosb
+	jmp	L_while_test
+
+ALIGN 4
+L_test_for_length_base:
+	mov	r14d, eax         ; /* len = this */
+	shr	r14d, 16           ; /* len = this.val */
+	mov	cl, al
+
+	test	al, 16
+	jz	L_test_for_second_level_length ; /* if ((op & 16) == 0) 8% */
+	and	cl, 15             ; /* op &= 15 */
+	jz	L_decode_distance    ; /* if (!op) */
+
+L_add_bits_to_len:
+	sub	bl, cl
+	xor	eax, eax
+	inc	eax
+	shl	eax, cl
+	dec	eax
+	and	eax, edx          ; /* eax &= hold */
+	shr	rdx, cl
+	add	r14d, eax         ; /* len += hold & mask[op] */
+
+L_decode_distance:
+	mov	r8, r13           ; /* r8 = dmask */
+	cmp	bl, 32
+	ja	L_get_distance_code  ; /* if (32 < bits) */
+
+	lodsd                         ; /* eax = *(uint *)in++ */
+	mov	cl, bl            ; /* cl = bits, needs it for shifting */
+	add	bl, 32             ; /* bits += 32 */
+	shl	rax, cl
+	or	rdx, rax          ; /* hold |= *((uint *)in)++ << bits */
+
+L_get_distance_code:
+	and	r8, rdx           ; /* r8 &= hold */
+	mov	eax, [r11+r8*4] ; /* eax = dcode[hold & dmask] */
+
+L_dodist:
+	mov	r15d, eax         ; /* dist = this */
+	shr	r15d, 16           ; /* dist = this.val */
+	mov	cl, ah
+	sub	bl, ah            ; /* bits -= this.bits */
+	shr	rdx, cl           ; /* hold >>= this.bits */
+	mov	cl, al            ; /* cl = this.op */
+
+	test	al, 16             ; /* if ((op & 16) == 0) */
+	jz	L_test_for_second_level_dist
+	and	cl, 15             ; /* op &= 15 */
+	jz	L_check_dist_one
+
+L_add_bits_to_dist:
+	sub	bl, cl
+	xor	eax, eax
+	inc	eax
+	shl	eax, cl
+	dec	eax                 ; /* (1 << op) - 1 */
+	and	eax, edx          ; /* eax &= hold */
+	shr	rdx, cl
+	add	r15d, eax         ; /* dist += hold & ((1 << op) - 1) */
+
+L_check_window:
+	mov	r8, rsi           ; /* save in so from can use it's reg */
+	mov	rax, rdi
+	sub	rax, [rsp+40]      ; /* nbytes = out - beg */
+
+	cmp	eax, r15d
+	jb	L_clip_window        ; /* if (dist > nbytes) 4.2% */
+
+	mov	ecx, r14d         ; /* ecx = len */
+	mov	rsi, rdi
+	sub	rsi, r15          ; /* from = out - dist */
+
+	sar	ecx, 1
+	jnc	L_copy_two           ; /* if len % 2 == 0 */
+
+	rep     movsw
+	mov	al, [rsi]
+	mov	[rdi], al
+	inc	rdi
+
+	mov	rsi, r8           ; /* move in back to %rsi, toss from */
+	jmp	L_while_test
+
+L_copy_two:
+	rep     movsw
+	mov	rsi, r8           ; /* move in back to %rsi, toss from */
+	jmp	L_while_test
+
+ALIGN 4
+L_check_dist_one:
+	cmp	r15d, 1            ; /* if dist 1, is a memset */
+	jne	L_check_window
+	cmp	[rsp+40], rdi      ; /* if out == beg, outside window */
+	je	L_check_window
+
+	mov	ecx, r14d         ; /* ecx = len */
+	mov	al, [rdi-1]
+	mov	ah, al
+
+	sar	ecx, 1
+	jnc	L_set_two
+	mov	[rdi], al
+	inc	rdi
+
+L_set_two:
+	rep     stosw
+	jmp	L_while_test
+
+ALIGN 4
+L_test_for_second_level_length:
+	test	al, 64
+	jnz	L_test_for_end_of_block ; /* if ((op & 64) != 0) */
+
+	xor	eax, eax
+	inc	eax
+	shl	eax, cl
+	dec	eax
+	and	eax, edx         ; /* eax &= hold */
+	add	eax, r14d        ; /* eax += len */
+	mov	eax, [rbp+rax*4] ; /* eax = lcode[val+(hold&mask[op])]*/
+	jmp	L_dolen
+
+ALIGN 4
+L_test_for_second_level_dist:
+	test	al, 64
+	jnz	L_invalid_distance_code ; /* if ((op & 64) != 0) */
+
+	xor	eax, eax
+	inc	eax
+	shl	eax, cl
+	dec	eax
+	and	eax, edx         ; /* eax &= hold */
+	add	eax, r15d        ; /* eax += dist */
+	mov	eax, [r11+rax*4] ; /* eax = dcode[val+(hold&mask[op])]*/
+	jmp	L_dodist
+
+ALIGN 4
+L_clip_window:
+	mov	ecx, eax         ; /* ecx = nbytes */
+	mov	eax, [rsp+92]     ; /* eax = wsize, prepare for dist cmp */
+	neg	ecx                ; /* nbytes = -nbytes */
+
+	cmp	eax, r15d
+	jb	L_invalid_distance_too_far ; /* if (dist > wsize) */
+
+	add	ecx, r15d         ; /* nbytes = dist - nbytes */
+	cmp	dword ptr [rsp+96], 0
+	jne	L_wrap_around_window ; /* if (write != 0) */
+
+	mov	rsi, [rsp+56]     ; /* from  = window */
+	sub	eax, ecx         ; /* eax  -= nbytes */
+	add	rsi, rax         ; /* from += wsize - nbytes */
+
+	mov	eax, r14d        ; /* eax = len */
+	cmp	r14d, ecx
+	jbe	L_do_copy           ; /* if (nbytes >= len) */
+
+	sub	eax, ecx         ; /* eax -= nbytes */
+	rep     movsb
+	mov	rsi, rdi
+	sub	rsi, r15         ; /* from = &out[ -dist ] */
+	jmp	L_do_copy
+
+ALIGN 4
+L_wrap_around_window:
+	mov	eax, [rsp+96]     ; /* eax = write */
+	cmp	ecx, eax
+	jbe	L_contiguous_in_window ; /* if (write >= nbytes) */
+
+	mov	esi, [rsp+92]     ; /* from  = wsize */
+	add	rsi, [rsp+56]     ; /* from += window */
+	add	rsi, rax         ; /* from += write */
+	sub	rsi, rcx         ; /* from -= nbytes */
+	sub	ecx, eax         ; /* nbytes -= write */
+
+	mov	eax, r14d        ; /* eax = len */
+	cmp	eax, ecx
+	jbe	L_do_copy           ; /* if (nbytes >= len) */
+
+	sub	eax, ecx         ; /* len -= nbytes */
+	rep     movsb
+	mov	rsi, [rsp+56]     ; /* from = window */
+	mov	ecx, [rsp+96]     ; /* nbytes = write */
+	cmp	eax, ecx
+	jbe	L_do_copy           ; /* if (nbytes >= len) */
+
+	sub	eax, ecx         ; /* len -= nbytes */
+	rep     movsb
+	mov	rsi, rdi
+	sub	rsi, r15         ; /* from = out - dist */
+	jmp	L_do_copy
+
+ALIGN 4
+L_contiguous_in_window:
+	mov	rsi, [rsp+56]     ; /* rsi = window */
+	add	rsi, rax
+	sub	rsi, rcx         ; /* from += write - nbytes */
+
+	mov	eax, r14d        ; /* eax = len */
+	cmp	eax, ecx
+	jbe	L_do_copy           ; /* if (nbytes >= len) */
+
+	sub	eax, ecx         ; /* len -= nbytes */
+	rep     movsb
+	mov	rsi, rdi
+	sub	rsi, r15         ; /* from = out - dist */
+	jmp	L_do_copy           ; /* if (nbytes >= len) */
+
+ALIGN 4
+L_do_copy:
+	mov	ecx, eax         ; /* ecx = len */
+	rep     movsb
+
+	mov	rsi, r8          ; /* move in back to %esi, toss from */
+	jmp	L_while_test
+
+L_test_for_end_of_block:
+	test	al, 32
+	jz	L_invalid_literal_length_code
+	mov	dword ptr [rsp+116], 1
+	jmp	L_break_loop_with_status
+
+L_invalid_literal_length_code:
+	mov	dword ptr [rsp+116], 2
+	jmp	L_break_loop_with_status
+
+L_invalid_distance_code:
+	mov	dword ptr [rsp+116], 3
+	jmp	L_break_loop_with_status
+
+L_invalid_distance_too_far:
+	mov	dword ptr [rsp+116], 4
+	jmp	L_break_loop_with_status
+
+L_break_loop:
+	mov	dword ptr [rsp+116], 0
+
+L_break_loop_with_status:
+; /* put in, out, bits, and hold back into ar and pop esp */
+	mov	[rsp+16], rsi     ; /* in */
+	mov	[rsp+32], rdi     ; /* out */
+	mov	[rsp+88], ebx     ; /* bits */
+	mov	[rsp+80], rdx     ; /* hold */
+
+	mov	rax, [rsp]       ; /* restore rbp and rsp */
+	mov	rbp, [rsp+8]
+	mov	rsp, rax
+
+
+
+	mov rsi,[rsp-8]
+	mov rdi,[rsp-16]
+	mov r12,[rsp-24]
+	mov r13,[rsp-32]
+	mov r14,[rsp-40]
+	mov r15,[rsp-48]
+	mov rbx,[rsp-56]
+
+    ret 0
+;          :
+;          : "m" (ar)
+;          : "memory", "%rax", "%rbx", "%rcx", "%rdx", "%rsi", "%rdi",
+;            "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"
+;    );
+
+inffas8664fnc 	ENDP
+;_TEXT	ENDS
+END
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/readme.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/readme.txt
new file mode 100644
index 00000000..652571c7
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx64/readme.txt
@@ -0,0 +1,31 @@
+Summary
+-------
+This directory contains ASM implementations of the functions
+longest_match() and inflate_fast(), for 64 bits x86 (both AMD64 and Intel EM64t),
+for use with Microsoft Macro Assembler (x64) for AMD64 and Microsoft C++ 64 bits.
+
+gvmat64.asm is written by Gilles Vollant (2005), by using Brian Raiter 686/32 bits
+   assembly optimized version from Jean-loup Gailly original longest_match function
+
+inffasx64.asm and inffas8664.c were written by Chris Anderson, by optimizing
+   original function from Mark Adler
+
+Use instructions
+----------------
+Assemble the .asm files using MASM and put the object files into the zlib source
+directory.  You can also get object files here:
+
+     http://www.winimage.com/zLibDll/zlib124_masm_obj.zip
+
+define ASMV and ASMINF in your project. Include inffas8664.c in your source tree,
+and inffasx64.obj and gvmat64.obj as object to link.
+
+
+Build instructions
+------------------
+run bld_64.bat with Microsoft Macro Assembler (x64) for AMD64 (ml64.exe)
+
+ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK
+
+You can get Windows 2003 server DDK with ml64 and cl for AMD64 from
+  http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price)
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx86/bld_ml32.bat b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx86/bld_ml32.bat
new file mode 100644
index 00000000..fcf5755e
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx86/bld_ml32.bat
@@ -0,0 +1,2 @@
+ml /coff /Zi /c /Flmatch686.lst match686.asm
+ml /coff /Zi /c /Flinffas32.lst inffas32.asm
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx86/inffas32.asm b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx86/inffas32.asm
new file mode 100644
index 00000000..14f9d351
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx86/inffas32.asm
@@ -0,0 +1,1083 @@
+;/* inffas32.asm is a hand tuned assembler version of inffast.c -- fast decoding
+; *
+; * inffas32.asm is derivated from inffas86.c, with translation of assembly code
+; *
+; * Copyright (C) 1995-2003 Mark Adler
+; * For conditions of distribution and use, see copyright notice in zlib.h
+; *
+; * Copyright (C) 2003 Chris Anderson <christop@charm.net>
+; * Please use the copyright conditions above.
+; *
+; * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from
+; * the gcc -S output of zlib-1.2.0/inffast.c.  Zlib-1.2.0 is in beta release at
+; * the moment.  I have successfully compiled and tested this code with gcc2.96,
+; * gcc3.2, icc5.0, msvc6.0.  It is very close to the speed of inffast.S
+; * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX
+; * enabled.  I will attempt to merge the MMX code into this version.  Newer
+; * versions of this and inffast.S can be found at
+; * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/
+; *
+; * 2005 : modification by Gilles Vollant
+; */
+; For Visual C++ 4.x and higher and ML 6.x and higher
+;   ml.exe is in directory \MASM611C of Win95 DDK
+;   ml.exe is also distributed in http://www.masm32.com/masmdl.htm
+;    and in VC++2003 toolkit at http://msdn.microsoft.com/visualc/vctoolkit2003/
+;
+;
+;   compile with command line option
+;   ml  /coff /Zi /c /Flinffas32.lst inffas32.asm
+
+;   if you define NO_GZIP (see inflate.h), compile with
+;   ml  /coff /Zi /c /Flinffas32.lst /DNO_GUNZIP inffas32.asm
+
+
+; zlib122sup is 0 fort zlib 1.2.2.1 and lower
+; zlib122sup is 8 fort zlib 1.2.2.2 and more (with addition of dmax and head
+;        in inflate_state in inflate.h)
+zlib1222sup      equ    8
+
+
+IFDEF GUNZIP
+  INFLATE_MODE_TYPE    equ 11
+  INFLATE_MODE_BAD     equ 26
+ELSE
+  IFNDEF NO_GUNZIP
+    INFLATE_MODE_TYPE    equ 11
+    INFLATE_MODE_BAD     equ 26
+  ELSE
+    INFLATE_MODE_TYPE    equ 3
+    INFLATE_MODE_BAD     equ 17
+  ENDIF
+ENDIF
+
+
+; 75 "inffast.S"
+;FILE "inffast.S"
+
+;;;GLOBAL _inflate_fast
+
+;;;SECTION .text
+
+
+
+	.586p
+	.mmx
+
+	name	inflate_fast_x86
+	.MODEL	FLAT
+
+_DATA			segment
+inflate_fast_use_mmx:
+	dd	1
+
+
+_TEXT			segment
+PUBLIC _inflate_fast
+
+ALIGN 4
+_inflate_fast:
+	jmp inflate_fast_entry
+
+
+
+ALIGN 4
+	db	'Fast decoding Code from Chris Anderson'
+	db	0
+
+ALIGN 4
+invalid_literal_length_code_msg:
+	db	'invalid literal/length code'
+	db	0
+
+ALIGN 4
+invalid_distance_code_msg:
+	db	'invalid distance code'
+	db	0
+
+ALIGN 4
+invalid_distance_too_far_msg:
+	db	'invalid distance too far back'
+	db	0
+
+
+ALIGN 4
+inflate_fast_mask:
+dd	0
+dd	1
+dd	3
+dd	7
+dd	15
+dd	31
+dd	63
+dd	127
+dd	255
+dd	511
+dd	1023
+dd	2047
+dd	4095
+dd	8191
+dd	16383
+dd	32767
+dd	65535
+dd	131071
+dd	262143
+dd	524287
+dd	1048575
+dd	2097151
+dd	4194303
+dd	8388607
+dd	16777215
+dd	33554431
+dd	67108863
+dd	134217727
+dd	268435455
+dd	536870911
+dd	1073741823
+dd	2147483647
+dd	4294967295
+
+
+mode_state	 equ	0	;/* state->mode	*/
+wsize_state	 equ	(32+zlib1222sup)	;/* state->wsize */
+write_state	 equ	(36+4+zlib1222sup)	;/* state->write */
+window_state	 equ	(40+4+zlib1222sup)	;/* state->window */
+hold_state	 equ	(44+4+zlib1222sup)	;/* state->hold	*/
+bits_state	 equ	(48+4+zlib1222sup)	;/* state->bits	*/
+lencode_state	 equ	(64+4+zlib1222sup)	;/* state->lencode */
+distcode_state	 equ	(68+4+zlib1222sup)	;/* state->distcode */
+lenbits_state	 equ	(72+4+zlib1222sup)	;/* state->lenbits */
+distbits_state	 equ	(76+4+zlib1222sup)	;/* state->distbits */
+
+
+;;SECTION .text
+; 205 "inffast.S"
+;GLOBAL	inflate_fast_use_mmx
+
+;SECTION .data
+
+
+; GLOBAL inflate_fast_use_mmx:object
+;.size inflate_fast_use_mmx, 4
+; 226 "inffast.S"
+;SECTION .text
+
+ALIGN 4
+inflate_fast_entry:
+	push  edi
+	push  esi
+	push  ebp
+	push  ebx
+	pushfd
+	sub  esp,64
+	cld
+
+
+
+
+	mov  esi, [esp+88]
+	mov  edi, [esi+28]
+
+
+
+
+
+
+
+	mov  edx, [esi+4]
+	mov  eax, [esi+0]
+
+	add  edx,eax
+	sub  edx,11
+
+	mov  [esp+44],eax
+	mov  [esp+20],edx
+
+	mov  ebp, [esp+92]
+	mov  ecx, [esi+16]
+	mov  ebx, [esi+12]
+
+	sub  ebp,ecx
+	neg  ebp
+	add  ebp,ebx
+
+	sub  ecx,257
+	add  ecx,ebx
+
+	mov  [esp+60],ebx
+	mov  [esp+40],ebp
+	mov  [esp+16],ecx
+; 285 "inffast.S"
+	mov  eax, [edi+lencode_state]
+	mov  ecx, [edi+distcode_state]
+
+	mov  [esp+8],eax
+	mov  [esp+12],ecx
+
+	mov  eax,1
+	mov  ecx, [edi+lenbits_state]
+	shl  eax,cl
+	dec  eax
+	mov  [esp+0],eax
+
+	mov  eax,1
+	mov  ecx, [edi+distbits_state]
+	shl  eax,cl
+	dec  eax
+	mov  [esp+4],eax
+
+	mov  eax, [edi+wsize_state]
+	mov  ecx, [edi+write_state]
+	mov  edx, [edi+window_state]
+
+	mov  [esp+52],eax
+	mov  [esp+48],ecx
+	mov  [esp+56],edx
+
+	mov  ebp, [edi+hold_state]
+	mov  ebx, [edi+bits_state]
+; 321 "inffast.S"
+	mov  esi, [esp+44]
+	mov  ecx, [esp+20]
+	cmp  ecx,esi
+	ja   L_align_long
+
+	add  ecx,11
+	sub  ecx,esi
+	mov  eax,12
+	sub  eax,ecx
+	lea  edi, [esp+28]
+	rep movsb
+	mov  ecx,eax
+	xor  eax,eax
+	rep stosb
+	lea  esi, [esp+28]
+	mov  [esp+20],esi
+	jmp  L_is_aligned
+
+
+L_align_long:
+	test  esi,3
+	jz   L_is_aligned
+	xor  eax,eax
+	mov  al, [esi]
+	inc  esi
+	mov  ecx,ebx
+	add  ebx,8
+	shl  eax,cl
+	or  ebp,eax
+	jmp L_align_long
+
+L_is_aligned:
+	mov  edi, [esp+60]
+; 366 "inffast.S"
+L_check_mmx:
+	cmp  dword ptr [inflate_fast_use_mmx],2
+	je   L_init_mmx
+	ja   L_do_loop
+
+	push  eax
+	push  ebx
+	push  ecx
+	push  edx
+	pushfd
+	mov  eax, [esp]
+	xor  dword ptr [esp],0200000h
+
+
+
+
+	popfd
+	pushfd
+	pop  edx
+	xor  edx,eax
+	jz   L_dont_use_mmx
+	xor  eax,eax
+	cpuid
+	cmp  ebx,0756e6547h
+	jne  L_dont_use_mmx
+	cmp  ecx,06c65746eh
+	jne  L_dont_use_mmx
+	cmp  edx,049656e69h
+	jne  L_dont_use_mmx
+	mov  eax,1
+	cpuid
+	shr  eax,8
+	and  eax,15
+	cmp  eax,6
+	jne  L_dont_use_mmx
+	test  edx,0800000h
+	jnz  L_use_mmx
+	jmp  L_dont_use_mmx
+L_use_mmx:
+	mov  dword ptr [inflate_fast_use_mmx],2
+	jmp  L_check_mmx_pop
+L_dont_use_mmx:
+	mov  dword ptr [inflate_fast_use_mmx],3
+L_check_mmx_pop:
+	pop  edx
+	pop  ecx
+	pop  ebx
+	pop  eax
+	jmp  L_check_mmx
+; 426 "inffast.S"
+ALIGN 4
+L_do_loop:
+; 437 "inffast.S"
+	cmp  bl,15
+	ja   L_get_length_code
+
+	xor  eax,eax
+	lodsw
+	mov  cl,bl
+	add  bl,16
+	shl  eax,cl
+	or  ebp,eax
+
+L_get_length_code:
+	mov  edx, [esp+0]
+	mov  ecx, [esp+8]
+	and  edx,ebp
+	mov  eax, [ecx+edx*4]
+
+L_dolen:
+
+
+
+
+
+
+	mov  cl,ah
+	sub  bl,ah
+	shr  ebp,cl
+
+
+
+
+
+
+	test  al,al
+	jnz   L_test_for_length_base
+
+	shr  eax,16
+	stosb
+
+L_while_test:
+
+
+	cmp  [esp+16],edi
+	jbe  L_break_loop
+
+	cmp  [esp+20],esi
+	ja   L_do_loop
+	jmp  L_break_loop
+
+L_test_for_length_base:
+; 502 "inffast.S"
+	mov  edx,eax
+	shr  edx,16
+	mov  cl,al
+
+	test  al,16
+	jz   L_test_for_second_level_length
+	and  cl,15
+	jz   L_save_len
+	cmp  bl,cl
+	jae  L_add_bits_to_len
+
+	mov  ch,cl
+	xor  eax,eax
+	lodsw
+	mov  cl,bl
+	add  bl,16
+	shl  eax,cl
+	or  ebp,eax
+	mov  cl,ch
+
+L_add_bits_to_len:
+	mov  eax,1
+	shl  eax,cl
+	dec  eax
+	sub  bl,cl
+	and  eax,ebp
+	shr  ebp,cl
+	add  edx,eax
+
+L_save_len:
+	mov  [esp+24],edx
+
+
+L_decode_distance:
+; 549 "inffast.S"
+	cmp  bl,15
+	ja   L_get_distance_code
+
+	xor  eax,eax
+	lodsw
+	mov  cl,bl
+	add  bl,16
+	shl  eax,cl
+	or  ebp,eax
+
+L_get_distance_code:
+	mov  edx, [esp+4]
+	mov  ecx, [esp+12]
+	and  edx,ebp
+	mov  eax, [ecx+edx*4]
+
+
+L_dodist:
+	mov  edx,eax
+	shr  edx,16
+	mov  cl,ah
+	sub  bl,ah
+	shr  ebp,cl
+; 584 "inffast.S"
+	mov  cl,al
+
+	test  al,16
+	jz  L_test_for_second_level_dist
+	and  cl,15
+	jz  L_check_dist_one
+	cmp  bl,cl
+	jae  L_add_bits_to_dist
+
+	mov  ch,cl
+	xor  eax,eax
+	lodsw
+	mov  cl,bl
+	add  bl,16
+	shl  eax,cl
+	or  ebp,eax
+	mov  cl,ch
+
+L_add_bits_to_dist:
+	mov  eax,1
+	shl  eax,cl
+	dec  eax
+	sub  bl,cl
+	and  eax,ebp
+	shr  ebp,cl
+	add  edx,eax
+	jmp  L_check_window
+
+L_check_window:
+; 625 "inffast.S"
+	mov  [esp+44],esi
+	mov  eax,edi
+	sub  eax, [esp+40]
+
+	cmp  eax,edx
+	jb   L_clip_window
+
+	mov  ecx, [esp+24]
+	mov  esi,edi
+	sub  esi,edx
+
+	sub  ecx,3
+	mov  al, [esi]
+	mov  [edi],al
+	mov  al, [esi+1]
+	mov  dl, [esi+2]
+	add  esi,3
+	mov  [edi+1],al
+	mov  [edi+2],dl
+	add  edi,3
+	rep movsb
+
+	mov  esi, [esp+44]
+	jmp  L_while_test
+
+ALIGN 4
+L_check_dist_one:
+	cmp  edx,1
+	jne  L_check_window
+	cmp  [esp+40],edi
+	je  L_check_window
+
+	dec  edi
+	mov  ecx, [esp+24]
+	mov  al, [edi]
+	sub  ecx,3
+
+	mov  [edi+1],al
+	mov  [edi+2],al
+	mov  [edi+3],al
+	add  edi,4
+	rep stosb
+
+	jmp  L_while_test
+
+ALIGN 4
+L_test_for_second_level_length:
+
+
+
+
+	test  al,64
+	jnz   L_test_for_end_of_block
+
+	mov  eax,1
+	shl  eax,cl
+	dec  eax
+	and  eax,ebp
+	add  eax,edx
+	mov  edx, [esp+8]
+	mov  eax, [edx+eax*4]
+	jmp  L_dolen
+
+ALIGN 4
+L_test_for_second_level_dist:
+
+
+
+
+	test  al,64
+	jnz   L_invalid_distance_code
+
+	mov  eax,1
+	shl  eax,cl
+	dec  eax
+	and  eax,ebp
+	add  eax,edx
+	mov  edx, [esp+12]
+	mov  eax, [edx+eax*4]
+	jmp  L_dodist
+
+ALIGN 4
+L_clip_window:
+; 721 "inffast.S"
+	mov  ecx,eax
+	mov  eax, [esp+52]
+	neg  ecx
+	mov  esi, [esp+56]
+
+	cmp  eax,edx
+	jb   L_invalid_distance_too_far
+
+	add  ecx,edx
+	cmp  dword ptr [esp+48],0
+	jne  L_wrap_around_window
+
+	sub  eax,ecx
+	add  esi,eax
+; 749 "inffast.S"
+	mov  eax, [esp+24]
+	cmp  eax,ecx
+	jbe  L_do_copy1
+
+	sub  eax,ecx
+	rep movsb
+	mov  esi,edi
+	sub  esi,edx
+	jmp  L_do_copy1
+
+	cmp  eax,ecx
+	jbe  L_do_copy1
+
+	sub  eax,ecx
+	rep movsb
+	mov  esi,edi
+	sub  esi,edx
+	jmp  L_do_copy1
+
+L_wrap_around_window:
+; 793 "inffast.S"
+	mov  eax, [esp+48]
+	cmp  ecx,eax
+	jbe  L_contiguous_in_window
+
+	add  esi, [esp+52]
+	add  esi,eax
+	sub  esi,ecx
+	sub  ecx,eax
+
+
+	mov  eax, [esp+24]
+	cmp  eax,ecx
+	jbe  L_do_copy1
+
+	sub  eax,ecx
+	rep movsb
+	mov  esi, [esp+56]
+	mov  ecx, [esp+48]
+	cmp  eax,ecx
+	jbe  L_do_copy1
+
+	sub  eax,ecx
+	rep movsb
+	mov  esi,edi
+	sub  esi,edx
+	jmp  L_do_copy1
+
+L_contiguous_in_window:
+; 836 "inffast.S"
+	add  esi,eax
+	sub  esi,ecx
+
+
+	mov  eax, [esp+24]
+	cmp  eax,ecx
+	jbe  L_do_copy1
+
+	sub  eax,ecx
+	rep movsb
+	mov  esi,edi
+	sub  esi,edx
+
+L_do_copy1:
+; 862 "inffast.S"
+	mov  ecx,eax
+	rep movsb
+
+	mov  esi, [esp+44]
+	jmp  L_while_test
+; 878 "inffast.S"
+ALIGN 4
+L_init_mmx:
+	emms
+
+
+
+
+
+	movd mm0,ebp
+	mov  ebp,ebx
+; 896 "inffast.S"
+	movd mm4,dword ptr [esp+0]
+	movq mm3,mm4
+	movd mm5,dword ptr [esp+4]
+	movq mm2,mm5
+	pxor mm1,mm1
+	mov  ebx, [esp+8]
+	jmp  L_do_loop_mmx
+
+ALIGN 4
+L_do_loop_mmx:
+	psrlq mm0,mm1
+
+	cmp  ebp,32
+	ja  L_get_length_code_mmx
+
+	movd mm6,ebp
+	movd mm7,dword ptr [esi]
+	add  esi,4
+	psllq mm7,mm6
+	add  ebp,32
+	por mm0,mm7
+
+L_get_length_code_mmx:
+	pand mm4,mm0
+	movd eax,mm4
+	movq mm4,mm3
+	mov  eax, [ebx+eax*4]
+
+L_dolen_mmx:
+	movzx  ecx,ah
+	movd mm1,ecx
+	sub  ebp,ecx
+
+	test  al,al
+	jnz L_test_for_length_base_mmx
+
+	shr  eax,16
+	stosb
+
+L_while_test_mmx:
+
+
+	cmp  [esp+16],edi
+	jbe L_break_loop
+
+	cmp  [esp+20],esi
+	ja L_do_loop_mmx
+	jmp L_break_loop
+
+L_test_for_length_base_mmx:
+
+	mov  edx,eax
+	shr  edx,16
+
+	test  al,16
+	jz  L_test_for_second_level_length_mmx
+	and  eax,15
+	jz L_decode_distance_mmx
+
+	psrlq mm0,mm1
+	movd mm1,eax
+	movd ecx,mm0
+	sub  ebp,eax
+	and  ecx, [inflate_fast_mask+eax*4]
+	add  edx,ecx
+
+L_decode_distance_mmx:
+	psrlq mm0,mm1
+
+	cmp  ebp,32
+	ja L_get_dist_code_mmx
+
+	movd mm6,ebp
+	movd mm7,dword ptr [esi]
+	add  esi,4
+	psllq mm7,mm6
+	add  ebp,32
+	por mm0,mm7
+
+L_get_dist_code_mmx:
+	mov  ebx, [esp+12]
+	pand mm5,mm0
+	movd eax,mm5
+	movq mm5,mm2
+	mov  eax, [ebx+eax*4]
+
+L_dodist_mmx:
+
+	movzx  ecx,ah
+	mov  ebx,eax
+	shr  ebx,16
+	sub  ebp,ecx
+	movd mm1,ecx
+
+	test  al,16
+	jz L_test_for_second_level_dist_mmx
+	and  eax,15
+	jz L_check_dist_one_mmx
+
+L_add_bits_to_dist_mmx:
+	psrlq mm0,mm1
+	movd mm1,eax
+	movd ecx,mm0
+	sub  ebp,eax
+	and  ecx, [inflate_fast_mask+eax*4]
+	add  ebx,ecx
+
+L_check_window_mmx:
+	mov  [esp+44],esi
+	mov  eax,edi
+	sub  eax, [esp+40]
+
+	cmp  eax,ebx
+	jb L_clip_window_mmx
+
+	mov  ecx,edx
+	mov  esi,edi
+	sub  esi,ebx
+
+	sub  ecx,3
+	mov  al, [esi]
+	mov  [edi],al
+	mov  al, [esi+1]
+	mov  dl, [esi+2]
+	add  esi,3
+	mov  [edi+1],al
+	mov  [edi+2],dl
+	add  edi,3
+	rep movsb
+
+	mov  esi, [esp+44]
+	mov  ebx, [esp+8]
+	jmp  L_while_test_mmx
+
+ALIGN 4
+L_check_dist_one_mmx:
+	cmp  ebx,1
+	jne  L_check_window_mmx
+	cmp  [esp+40],edi
+	je   L_check_window_mmx
+
+	dec  edi
+	mov  ecx,edx
+	mov  al, [edi]
+	sub  ecx,3
+
+	mov  [edi+1],al
+	mov  [edi+2],al
+	mov  [edi+3],al
+	add  edi,4
+	rep stosb
+
+	mov  ebx, [esp+8]
+	jmp  L_while_test_mmx
+
+ALIGN 4
+L_test_for_second_level_length_mmx:
+	test  al,64
+	jnz L_test_for_end_of_block
+
+	and  eax,15
+	psrlq mm0,mm1
+	movd ecx,mm0
+	and  ecx, [inflate_fast_mask+eax*4]
+	add  ecx,edx
+	mov  eax, [ebx+ecx*4]
+	jmp L_dolen_mmx
+
+ALIGN 4
+L_test_for_second_level_dist_mmx:
+	test  al,64
+	jnz L_invalid_distance_code
+
+	and  eax,15
+	psrlq mm0,mm1
+	movd ecx,mm0
+	and  ecx, [inflate_fast_mask+eax*4]
+	mov  eax, [esp+12]
+	add  ecx,ebx
+	mov  eax, [eax+ecx*4]
+	jmp  L_dodist_mmx
+
+ALIGN 4
+L_clip_window_mmx:
+
+	mov  ecx,eax
+	mov  eax, [esp+52]
+	neg  ecx
+	mov  esi, [esp+56]
+
+	cmp  eax,ebx
+	jb  L_invalid_distance_too_far
+
+	add  ecx,ebx
+	cmp  dword ptr [esp+48],0
+	jne  L_wrap_around_window_mmx
+
+	sub  eax,ecx
+	add  esi,eax
+
+	cmp  edx,ecx
+	jbe  L_do_copy1_mmx
+
+	sub  edx,ecx
+	rep movsb
+	mov  esi,edi
+	sub  esi,ebx
+	jmp  L_do_copy1_mmx
+
+	cmp  edx,ecx
+	jbe  L_do_copy1_mmx
+
+	sub  edx,ecx
+	rep movsb
+	mov  esi,edi
+	sub  esi,ebx
+	jmp  L_do_copy1_mmx
+
+L_wrap_around_window_mmx:
+
+	mov  eax, [esp+48]
+	cmp  ecx,eax
+	jbe  L_contiguous_in_window_mmx
+
+	add  esi, [esp+52]
+	add  esi,eax
+	sub  esi,ecx
+	sub  ecx,eax
+
+
+	cmp  edx,ecx
+	jbe  L_do_copy1_mmx
+
+	sub  edx,ecx
+	rep movsb
+	mov  esi, [esp+56]
+	mov  ecx, [esp+48]
+	cmp  edx,ecx
+	jbe  L_do_copy1_mmx
+
+	sub  edx,ecx
+	rep movsb
+	mov  esi,edi
+	sub  esi,ebx
+	jmp  L_do_copy1_mmx
+
+L_contiguous_in_window_mmx:
+
+	add  esi,eax
+	sub  esi,ecx
+
+
+	cmp  edx,ecx
+	jbe  L_do_copy1_mmx
+
+	sub  edx,ecx
+	rep movsb
+	mov  esi,edi
+	sub  esi,ebx
+
+L_do_copy1_mmx:
+
+
+	mov  ecx,edx
+	rep movsb
+
+	mov  esi, [esp+44]
+	mov  ebx, [esp+8]
+	jmp  L_while_test_mmx
+; 1174 "inffast.S"
+L_invalid_distance_code:
+
+
+
+
+
+	mov  ecx, invalid_distance_code_msg
+	mov  edx,INFLATE_MODE_BAD
+	jmp  L_update_stream_state
+
+L_test_for_end_of_block:
+
+
+
+
+
+	test  al,32
+	jz  L_invalid_literal_length_code
+
+	mov  ecx,0
+	mov  edx,INFLATE_MODE_TYPE
+	jmp  L_update_stream_state
+
+L_invalid_literal_length_code:
+
+
+
+
+
+	mov  ecx, invalid_literal_length_code_msg
+	mov  edx,INFLATE_MODE_BAD
+	jmp  L_update_stream_state
+
+L_invalid_distance_too_far:
+
+
+
+	mov  esi, [esp+44]
+	mov  ecx, invalid_distance_too_far_msg
+	mov  edx,INFLATE_MODE_BAD
+	jmp  L_update_stream_state
+
+L_update_stream_state:
+
+	mov  eax, [esp+88]
+	test  ecx,ecx
+	jz  L_skip_msg
+	mov  [eax+24],ecx
+L_skip_msg:
+	mov  eax, [eax+28]
+	mov  [eax+mode_state],edx
+	jmp  L_break_loop
+
+ALIGN 4
+L_break_loop:
+; 1243 "inffast.S"
+	cmp  dword ptr [inflate_fast_use_mmx],2
+	jne  L_update_next_in
+
+
+
+	mov  ebx,ebp
+
+L_update_next_in:
+; 1266 "inffast.S"
+	mov  eax, [esp+88]
+	mov  ecx,ebx
+	mov  edx, [eax+28]
+	shr  ecx,3
+	sub  esi,ecx
+	shl  ecx,3
+	sub  ebx,ecx
+	mov  [eax+12],edi
+	mov  [edx+bits_state],ebx
+	mov  ecx,ebx
+
+	lea  ebx, [esp+28]
+	cmp  [esp+20],ebx
+	jne  L_buf_not_used
+
+	sub  esi,ebx
+	mov  ebx, [eax+0]
+	mov  [esp+20],ebx
+	add  esi,ebx
+	mov  ebx, [eax+4]
+	sub  ebx,11
+	add  [esp+20],ebx
+
+L_buf_not_used:
+	mov  [eax+0],esi
+
+	mov  ebx,1
+	shl  ebx,cl
+	dec  ebx
+
+
+
+
+
+	cmp  dword ptr [inflate_fast_use_mmx],2
+	jne  L_update_hold
+
+
+
+	psrlq mm0,mm1
+	movd ebp,mm0
+
+	emms
+
+L_update_hold:
+
+
+
+	and  ebp,ebx
+	mov  [edx+hold_state],ebp
+
+
+
+
+	mov  ebx, [esp+20]
+	cmp  ebx,esi
+	jbe  L_last_is_smaller
+
+	sub  ebx,esi
+	add  ebx,11
+	mov  [eax+4],ebx
+	jmp  L_fixup_out
+L_last_is_smaller:
+	sub  esi,ebx
+	neg  esi
+	add  esi,11
+	mov  [eax+4],esi
+
+
+
+
+L_fixup_out:
+
+	mov  ebx, [esp+16]
+	cmp  ebx,edi
+	jbe  L_end_is_smaller
+
+	sub  ebx,edi
+	add  ebx,257
+	mov  [eax+16],ebx
+	jmp  L_done
+L_end_is_smaller:
+	sub  edi,ebx
+	neg  edi
+	add  edi,257
+	mov  [eax+16],edi
+
+
+
+
+
+L_done:
+	add  esp,64
+	popfd
+	pop  ebx
+	pop  ebp
+	pop  esi
+	pop  edi
+	ret
+
+_TEXT	ends
+end
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx86/match686.asm b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx86/match686.asm
new file mode 100644
index 00000000..1eaf5550
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx86/match686.asm
@@ -0,0 +1,478 @@
+; match686.asm -- Asm portion of the optimized longest_match for 32 bits x86
+; Copyright (C) 1995-1996 Jean-loup Gailly, Brian Raiter and Gilles Vollant.
+; File written by Gilles Vollant, by converting match686.S from Brian Raiter
+; for MASM. This is as assembly version of longest_match
+;  from Jean-loup Gailly in deflate.c
+;
+;         http://www.zlib.net
+;         http://www.winimage.com/zLibDll
+;         http://www.muppetlabs.com/~breadbox/software/assembly.html
+;
+; For Visual C++ 4.x and higher and ML 6.x and higher
+;   ml.exe is distributed in
+;  http://www.microsoft.com/downloads/details.aspx?FamilyID=7a1c9da0-0510-44a2-b042-7ef370530c64
+;
+; this file contain two implementation of longest_match
+;
+;  this longest_match was written by Brian raiter (1998), optimized for Pentium Pro
+;   (and the faster known version of match_init on modern Core 2 Duo and AMD Phenom)
+;
+;  for using an assembly version of longest_match, you need define ASMV in project
+;
+;    compile the asm file running
+;           ml /coff /Zi /c /Flmatch686.lst match686.asm
+;    and do not include match686.obj in your project
+;
+; note: contrib of zLib 1.2.3 and earlier contained both a deprecated version for
+;  Pentium (prior Pentium Pro) and this version for Pentium Pro and modern processor
+;  with autoselect (with cpu detection code)
+;  if you want support the old pentium optimization, you can still use these version
+;
+; this file is not optimized for old pentium, but it compatible with all x86 32 bits
+; processor (starting 80386)
+;
+;
+; see below : zlib1222add must be adjuster if you use a zlib version < 1.2.2.2
+
+;uInt longest_match(s, cur_match)
+;    deflate_state *s;
+;    IPos cur_match;                             /* current match */
+
+    NbStack         equ     76
+    cur_match       equ     dword ptr[esp+NbStack-0]
+    str_s           equ     dword ptr[esp+NbStack-4]
+; 5 dword on top (ret,ebp,esi,edi,ebx)
+    adrret          equ     dword ptr[esp+NbStack-8]
+    pushebp         equ     dword ptr[esp+NbStack-12]
+    pushedi         equ     dword ptr[esp+NbStack-16]
+    pushesi         equ     dword ptr[esp+NbStack-20]
+    pushebx         equ     dword ptr[esp+NbStack-24]
+
+    chain_length    equ     dword ptr [esp+NbStack-28]
+    limit           equ     dword ptr [esp+NbStack-32]
+    best_len        equ     dword ptr [esp+NbStack-36]
+    window          equ     dword ptr [esp+NbStack-40]
+    prev            equ     dword ptr [esp+NbStack-44]
+    scan_start      equ      word ptr [esp+NbStack-48]
+    wmask           equ     dword ptr [esp+NbStack-52]
+    match_start_ptr equ     dword ptr [esp+NbStack-56]
+    nice_match      equ     dword ptr [esp+NbStack-60]
+    scan            equ     dword ptr [esp+NbStack-64]
+
+    windowlen       equ     dword ptr [esp+NbStack-68]
+    match_start     equ     dword ptr [esp+NbStack-72]
+    strend          equ     dword ptr [esp+NbStack-76]
+    NbStackAdd      equ     (NbStack-24)
+
+    .386p
+
+    name    gvmatch
+    .MODEL  FLAT
+
+
+
+;  all the +zlib1222add offsets are due to the addition of fields
+;  in zlib in the deflate_state structure since the asm code was first written
+;  (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
+;  (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
+;  if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
+
+    zlib1222add         equ     8
+
+;  Note : these value are good with a 8 bytes boundary pack structure
+    dep_chain_length    equ     74h+zlib1222add
+    dep_window          equ     30h+zlib1222add
+    dep_strstart        equ     64h+zlib1222add
+    dep_prev_length     equ     70h+zlib1222add
+    dep_nice_match      equ     88h+zlib1222add
+    dep_w_size          equ     24h+zlib1222add
+    dep_prev            equ     38h+zlib1222add
+    dep_w_mask          equ     2ch+zlib1222add
+    dep_good_match      equ     84h+zlib1222add
+    dep_match_start     equ     68h+zlib1222add
+    dep_lookahead       equ     6ch+zlib1222add
+
+
+_TEXT                   segment
+
+IFDEF NOUNDERLINE
+            public  longest_match
+            public  match_init
+ELSE
+            public  _longest_match
+            public  _match_init
+ENDIF
+
+    MAX_MATCH           equ     258
+    MIN_MATCH           equ     3
+    MIN_LOOKAHEAD       equ     (MAX_MATCH+MIN_MATCH+1)
+
+
+
+MAX_MATCH       equ     258
+MIN_MATCH       equ     3
+MIN_LOOKAHEAD   equ     (MAX_MATCH + MIN_MATCH + 1)
+MAX_MATCH_8_     equ     ((MAX_MATCH + 7) AND 0FFF0h)
+
+
+;;; stack frame offsets
+
+chainlenwmask   equ  esp + 0    ; high word: current chain len
+                    ; low word: s->wmask
+window      equ  esp + 4    ; local copy of s->window
+windowbestlen   equ  esp + 8    ; s->window + bestlen
+scanstart   equ  esp + 16   ; first two bytes of string
+scanend     equ  esp + 12   ; last two bytes of string
+scanalign   equ  esp + 20   ; dword-misalignment of string
+nicematch   equ  esp + 24   ; a good enough match size
+bestlen     equ  esp + 28   ; size of best match so far
+scan        equ  esp + 32   ; ptr to string wanting match
+
+LocalVarsSize   equ 36
+;   saved ebx   byte esp + 36
+;   saved edi   byte esp + 40
+;   saved esi   byte esp + 44
+;   saved ebp   byte esp + 48
+;   return address  byte esp + 52
+deflatestate    equ  esp + 56   ; the function arguments
+curmatch    equ  esp + 60
+
+;;; Offsets for fields in the deflate_state structure. These numbers
+;;; are calculated from the definition of deflate_state, with the
+;;; assumption that the compiler will dword-align the fields. (Thus,
+;;; changing the definition of deflate_state could easily cause this
+;;; program to crash horribly, without so much as a warning at
+;;; compile time. Sigh.)
+
+dsWSize     equ 36+zlib1222add
+dsWMask     equ 44+zlib1222add
+dsWindow    equ 48+zlib1222add
+dsPrev      equ 56+zlib1222add
+dsMatchLen  equ 88+zlib1222add
+dsPrevMatch equ 92+zlib1222add
+dsStrStart  equ 100+zlib1222add
+dsMatchStart    equ 104+zlib1222add
+dsLookahead equ 108+zlib1222add
+dsPrevLen   equ 112+zlib1222add
+dsMaxChainLen   equ 116+zlib1222add
+dsGoodMatch equ 132+zlib1222add
+dsNiceMatch equ 136+zlib1222add
+
+
+;;; match686.asm -- Pentium-Pro-optimized version of longest_match()
+;;; Written for zlib 1.1.2
+;;; Copyright (C) 1998 Brian Raiter <breadbox@muppetlabs.com>
+;;; You can look at http://www.muppetlabs.com/~breadbox/software/assembly.html
+;;;
+;;
+;;  This software is provided 'as-is', without any express or implied
+;;  warranty.  In no event will the authors be held liable for any damages
+;;  arising from the use of this software.
+;;
+;;  Permission is granted to anyone to use this software for any purpose,
+;;  including commercial applications, and to alter it and redistribute it
+;;  freely, subject to the following restrictions:
+;;
+;;  1. The origin of this software must not be misrepresented; you must not
+;;     claim that you wrote the original software. If you use this software
+;;     in a product, an acknowledgment in the product documentation would be
+;;     appreciated but is not required.
+;;  2. Altered source versions must be plainly marked as such, and must not be
+;;     misrepresented as being the original software
+;;  3. This notice may not be removed or altered from any source distribution.
+;;
+
+;GLOBAL _longest_match, _match_init
+
+
+;SECTION    .text
+
+;;; uInt longest_match(deflate_state *deflatestate, IPos curmatch)
+
+;_longest_match:
+    IFDEF NOUNDERLINE
+    longest_match       proc near
+    ELSE
+    _longest_match      proc near
+    ENDIF
+
+;;; Save registers that the compiler may be using, and adjust esp to
+;;; make room for our stack frame.
+
+        push    ebp
+        push    edi
+        push    esi
+        push    ebx
+        sub esp, LocalVarsSize
+
+;;; Retrieve the function arguments. ecx will hold cur_match
+;;; throughout the entire function. edx will hold the pointer to the
+;;; deflate_state structure during the function's setup (before
+;;; entering the main loop.
+
+        mov edx, [deflatestate]
+        mov ecx, [curmatch]
+
+;;; uInt wmask = s->w_mask;
+;;; unsigned chain_length = s->max_chain_length;
+;;; if (s->prev_length >= s->good_match) {
+;;;     chain_length >>= 2;
+;;; }
+
+        mov eax, [edx + dsPrevLen]
+        mov ebx, [edx + dsGoodMatch]
+        cmp eax, ebx
+        mov eax, [edx + dsWMask]
+        mov ebx, [edx + dsMaxChainLen]
+        jl  LastMatchGood
+        shr ebx, 2
+LastMatchGood:
+
+;;; chainlen is decremented once beforehand so that the function can
+;;; use the sign flag instead of the zero flag for the exit test.
+;;; It is then shifted into the high word, to make room for the wmask
+;;; value, which it will always accompany.
+
+        dec ebx
+        shl ebx, 16
+        or  ebx, eax
+        mov [chainlenwmask], ebx
+
+;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+
+        mov eax, [edx + dsNiceMatch]
+        mov ebx, [edx + dsLookahead]
+        cmp ebx, eax
+        jl  LookaheadLess
+        mov ebx, eax
+LookaheadLess:  mov [nicematch], ebx
+
+;;; register Bytef *scan = s->window + s->strstart;
+
+        mov esi, [edx + dsWindow]
+        mov [window], esi
+        mov ebp, [edx + dsStrStart]
+        lea edi, [esi + ebp]
+        mov [scan], edi
+
+;;; Determine how many bytes the scan ptr is off from being
+;;; dword-aligned.
+
+        mov eax, edi
+        neg eax
+        and eax, 3
+        mov [scanalign], eax
+
+;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+;;;     s->strstart - (IPos)MAX_DIST(s) : NIL;
+
+        mov eax, [edx + dsWSize]
+        sub eax, MIN_LOOKAHEAD
+        sub ebp, eax
+        jg  LimitPositive
+        xor ebp, ebp
+LimitPositive:
+
+;;; int best_len = s->prev_length;
+
+        mov eax, [edx + dsPrevLen]
+        mov [bestlen], eax
+
+;;; Store the sum of s->window + best_len in esi locally, and in esi.
+
+        add esi, eax
+        mov [windowbestlen], esi
+
+;;; register ush scan_start = *(ushf*)scan;
+;;; register ush scan_end   = *(ushf*)(scan+best_len-1);
+;;; Posf *prev = s->prev;
+
+        movzx   ebx, word ptr [edi]
+        mov [scanstart], ebx
+        movzx   ebx, word ptr [edi + eax - 1]
+        mov [scanend], ebx
+        mov edi, [edx + dsPrev]
+
+;;; Jump into the main loop.
+
+        mov edx, [chainlenwmask]
+        jmp short LoopEntry
+
+align 4
+
+;;; do {
+;;;     match = s->window + cur_match;
+;;;     if (*(ushf*)(match+best_len-1) != scan_end ||
+;;;         *(ushf*)match != scan_start) continue;
+;;;     [...]
+;;; } while ((cur_match = prev[cur_match & wmask]) > limit
+;;;          && --chain_length != 0);
+;;;
+;;; Here is the inner loop of the function. The function will spend the
+;;; majority of its time in this loop, and majority of that time will
+;;; be spent in the first ten instructions.
+;;;
+;;; Within this loop:
+;;; ebx = scanend
+;;; ecx = curmatch
+;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
+;;; esi = windowbestlen - i.e., (window + bestlen)
+;;; edi = prev
+;;; ebp = limit
+
+LookupLoop:
+        and ecx, edx
+        movzx   ecx, word ptr [edi + ecx*2]
+        cmp ecx, ebp
+        jbe LeaveNow
+        sub edx, 00010000h
+        js  LeaveNow
+LoopEntry:  movzx   eax, word ptr [esi + ecx - 1]
+        cmp eax, ebx
+        jnz LookupLoop
+        mov eax, [window]
+        movzx   eax, word ptr [eax + ecx]
+        cmp eax, [scanstart]
+        jnz LookupLoop
+
+;;; Store the current value of chainlen.
+
+        mov [chainlenwmask], edx
+
+;;; Point edi to the string under scrutiny, and esi to the string we
+;;; are hoping to match it up with. In actuality, esi and edi are
+;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is
+;;; initialized to -(MAX_MATCH_8 - scanalign).
+
+        mov esi, [window]
+        mov edi, [scan]
+        add esi, ecx
+        mov eax, [scanalign]
+        mov edx, 0fffffef8h; -(MAX_MATCH_8)
+        lea edi, [edi + eax + 0108h] ;MAX_MATCH_8]
+        lea esi, [esi + eax + 0108h] ;MAX_MATCH_8]
+
+;;; Test the strings for equality, 8 bytes at a time. At the end,
+;;; adjust edx so that it is offset to the exact byte that mismatched.
+;;;
+;;; We already know at this point that the first three bytes of the
+;;; strings match each other, and they can be safely passed over before
+;;; starting the compare loop. So what this code does is skip over 0-3
+;;; bytes, as much as necessary in order to dword-align the edi
+;;; pointer. (esi will still be misaligned three times out of four.)
+;;;
+;;; It should be confessed that this loop usually does not represent
+;;; much of the total running time. Replacing it with a more
+;;; straightforward "rep cmpsb" would not drastically degrade
+;;; performance.
+
+LoopCmps:
+        mov eax, [esi + edx]
+        xor eax, [edi + edx]
+        jnz LeaveLoopCmps
+        mov eax, [esi + edx + 4]
+        xor eax, [edi + edx + 4]
+        jnz LeaveLoopCmps4
+        add edx, 8
+        jnz LoopCmps
+        jmp short LenMaximum
+LeaveLoopCmps4: add edx, 4
+LeaveLoopCmps:  test    eax, 0000FFFFh
+        jnz LenLower
+        add edx,  2
+        shr eax, 16
+LenLower:   sub al, 1
+        adc edx, 0
+
+;;; Calculate the length of the match. If it is longer than MAX_MATCH,
+;;; then automatically accept it as the best possible match and leave.
+
+        lea eax, [edi + edx]
+        mov edi, [scan]
+        sub eax, edi
+        cmp eax, MAX_MATCH
+        jge LenMaximum
+
+;;; If the length of the match is not longer than the best match we
+;;; have so far, then forget it and return to the lookup loop.
+
+        mov edx, [deflatestate]
+        mov ebx, [bestlen]
+        cmp eax, ebx
+        jg  LongerMatch
+        mov esi, [windowbestlen]
+        mov edi, [edx + dsPrev]
+        mov ebx, [scanend]
+        mov edx, [chainlenwmask]
+        jmp LookupLoop
+
+;;;         s->match_start = cur_match;
+;;;         best_len = len;
+;;;         if (len >= nice_match) break;
+;;;         scan_end = *(ushf*)(scan+best_len-1);
+
+LongerMatch:    mov ebx, [nicematch]
+        mov [bestlen], eax
+        mov [edx + dsMatchStart], ecx
+        cmp eax, ebx
+        jge LeaveNow
+        mov esi, [window]
+        add esi, eax
+        mov [windowbestlen], esi
+        movzx   ebx, word ptr [edi + eax - 1]
+        mov edi, [edx + dsPrev]
+        mov [scanend], ebx
+        mov edx, [chainlenwmask]
+        jmp LookupLoop
+
+;;; Accept the current string, with the maximum possible length.
+
+LenMaximum: mov edx, [deflatestate]
+        mov dword ptr [bestlen], MAX_MATCH
+        mov [edx + dsMatchStart], ecx
+
+;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+;;; return s->lookahead;
+
+LeaveNow:
+        mov edx, [deflatestate]
+        mov ebx, [bestlen]
+        mov eax, [edx + dsLookahead]
+        cmp ebx, eax
+        jg  LookaheadRet
+        mov eax, ebx
+LookaheadRet:
+
+;;; Restore the stack and return from whence we came.
+
+        add esp, LocalVarsSize
+        pop ebx
+        pop esi
+        pop edi
+        pop ebp
+
+        ret
+; please don't remove this string !
+; Your can freely use match686 in any free or commercial app if you don't remove the string in the binary!
+    db     0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998",0dh,0ah
+
+
+    IFDEF NOUNDERLINE
+    longest_match       endp
+    ELSE
+    _longest_match      endp
+    ENDIF
+
+    IFDEF NOUNDERLINE
+    match_init      proc near
+                    ret
+    match_init      endp
+    ELSE
+    _match_init     proc near
+                    ret
+    _match_init     endp
+    ENDIF
+
+
+_TEXT   ends
+end
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx86/readme.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx86/readme.txt
new file mode 100644
index 00000000..3f888867
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/masmx86/readme.txt
@@ -0,0 +1,27 @@
+
+Summary
+-------
+This directory contains ASM implementations of the functions
+longest_match() and inflate_fast().
+
+
+Use instructions
+----------------
+Assemble using MASM, and copy the object files into the zlib source
+directory, then run the appropriate makefile, as suggested below.  You can
+donwload MASM from here:
+
+    http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=7a1c9da0-0510-44a2-b042-7ef370530c64
+
+You can also get objects files here:
+
+    http://www.winimage.com/zLibDll/zlib124_masm_obj.zip
+
+Build instructions
+------------------
+* With Microsoft C and MASM:
+nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" OBJA="match686.obj inffas32.obj"
+
+* With Borland C and TASM:
+make -f win32/Makefile.bor LOCAL_ZLIB="-DASMV -DASMINF" OBJA="match686.obj inffas32.obj" OBJPA="+match686c.obj+match686.obj+inffas32.obj"
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/Makefile b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/Makefile
new file mode 100644
index 00000000..84eaad20
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/Makefile
@@ -0,0 +1,25 @@
+CC=cc
+CFLAGS=-O -I../..
+
+UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
+ZIP_OBJS = minizip.o zip.o   ioapi.o ../../libz.a
+
+.c.o:
+	$(CC) -c $(CFLAGS) $*.c
+
+all: miniunz minizip
+
+miniunz:  $(UNZ_OBJS)
+	$(CC) $(CFLAGS) -o $@ $(UNZ_OBJS)
+
+minizip:  $(ZIP_OBJS)
+	$(CC) $(CFLAGS) -o $@ $(ZIP_OBJS)
+
+test:	miniunz minizip
+	./minizip test readme.txt
+	./miniunz -l test.zip
+	mv readme.txt readme.old
+	./miniunz test.zip
+
+clean:
+	/bin/rm -f *.o *~ minizip miniunz
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/MiniZip64_Changes.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/MiniZip64_Changes.txt
new file mode 100644
index 00000000..13a1bd91
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/MiniZip64_Changes.txt
@@ -0,0 +1,6 @@
+
+MiniZip 1.1 was derrived from MiniZip at version 1.01f
+
+Change in 1.0 (Okt 2009)
+ - **TODO - Add history**
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/MiniZip64_info.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/MiniZip64_info.txt
new file mode 100644
index 00000000..57d71524
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/MiniZip64_info.txt
@@ -0,0 +1,74 @@
+MiniZip - Copyright (c) 1998-2010 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson
+
+Introduction
+---------------------
+MiniZip 1.1 is built from MiniZip 1.0 by Gilles Vollant ( http://www.winimage.com/zLibDll/minizip.html )
+
+When adding ZIP64 support into minizip it would result into risk of breaking compatibility with minizip 1.0.
+All possible work was done for compatibility.
+
+
+Background
+---------------------
+When adding ZIP64 support Mathias Svensson found that Even Rouault have added ZIP64 
+support for unzip.c into minizip for a open source project called gdal ( http://www.gdal.org/ )
+
+That was used as a starting point. And after that ZIP64 support was added to zip.c
+some refactoring and code cleanup was also done.
+
+
+Changed from MiniZip 1.0 to MiniZip 1.1
+---------------------------------------
+* Added ZIP64 support for unzip ( by Even Rouault )
+* Added ZIP64 support for zip ( by Mathias Svensson )
+* Reverted some changed that Even Rouault did.
+* Bunch of patches received from Gulles Vollant that he received for MiniZip from various users.
+* Added unzip patch for BZIP Compression method (patch create by Daniel Borca)
+* Added BZIP Compress method for zip
+* Did some refactoring and code cleanup
+
+
+Credits
+
+ Gilles Vollant    - Original MiniZip author
+ Even Rouault      - ZIP64 unzip Support
+ Daniel Borca      - BZip Compression method support in unzip
+ Mathias Svensson  - ZIP64 zip support
+ Mathias Svensson  - BZip Compression method support in zip
+
+ Resources
+
+ ZipLayout   http://result42.com/projects/ZipFileLayout
+             Command line tool for Windows that shows the layout and information of the headers in a zip archive.
+             Used when debugging and validating the creation of zip files using MiniZip64
+
+
+ ZIP App Note  http://www.pkware.com/documents/casestudies/APPNOTE.TXT
+               Zip File specification
+
+
+Notes.
+ * To be able to use BZip compression method in zip64.c or unzip64.c the BZIP2 lib is needed and HAVE_BZIP2 need to be defined.
+
+License
+----------------------------------------------------------
+   Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+----------------------------------------------------------
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/crypt.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/crypt.h
new file mode 100644
index 00000000..a01d08d9
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/crypt.h
@@ -0,0 +1,131 @@
+/* crypt.h -- base code for crypt/uncrypt ZIPfile
+
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   This code is a modified version of crypting code in Infozip distribution
+
+   The encryption/decryption parts of this source code (as opposed to the
+   non-echoing password parts) were originally written in Europe.  The
+   whole source package can be freely distributed, including from the USA.
+   (Prior to January 2000, re-export from the US was a violation of US law.)
+
+   This encryption code is a direct transcription of the algorithm from
+   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+   file (appnote.txt) is distributed with the PKZIP program (even in the
+   version without encryption capabilities).
+
+   If you don't need crypting in your application, just define symbols
+   NOCRYPT and NOUNCRYPT.
+
+   This code support the "Traditional PKWARE Encryption".
+
+   The new AES encryption added on Zip format by Winzip (see the page
+   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
+   Encryption is not supported.
+*/
+
+#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
+
+/***********************************************************************
+ * Return the next byte in the pseudo-random sequence
+ */
+static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
+{
+    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
+                     * unpredictable manner on 16-bit systems; not a problem
+                     * with any known compiler so far, though */
+
+    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
+    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
+}
+
+/***********************************************************************
+ * Update the encryption keys with the next byte of plain text
+ */
+static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
+{
+    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
+    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
+    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
+    {
+      register int keyshift = (int)((*(pkeys+1)) >> 24);
+      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
+    }
+    return c;
+}
+
+
+/***********************************************************************
+ * Initialize the encryption keys and the random header according to
+ * the given password.
+ */
+static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
+{
+    *(pkeys+0) = 305419896L;
+    *(pkeys+1) = 591751049L;
+    *(pkeys+2) = 878082192L;
+    while (*passwd != '\0') {
+        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
+        passwd++;
+    }
+}
+
+#define zdecode(pkeys,pcrc_32_tab,c) \
+    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
+
+#define zencode(pkeys,pcrc_32_tab,c,t) \
+    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
+
+#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+
+#define RAND_HEAD_LEN  12
+   /* "last resort" source for second part of crypt seed pattern */
+#  ifndef ZCR_SEED2
+#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
+#  endif
+
+static int crypthead(const char* passwd,      /* password string */
+                     unsigned char* buf,      /* where to write header */
+                     int bufSize,
+                     unsigned long* pkeys,
+                     const unsigned long* pcrc_32_tab,
+                     unsigned long crcForCrypting)
+{
+    int n;                       /* index in random header */
+    int t;                       /* temporary */
+    int c;                       /* random byte */
+    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
+    static unsigned calls = 0;   /* ensure different random header each time */
+
+    if (bufSize<RAND_HEAD_LEN)
+      return 0;
+
+    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
+     * output of rand() to get less predictability, since rand() is
+     * often poorly implemented.
+     */
+    if (++calls == 1)
+    {
+        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
+    }
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        c = (rand() >> 7) & 0xff;
+        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
+    }
+    /* Encrypt random header (last two bytes is high word of crc) */
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
+    }
+    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
+    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
+    return n;
+}
+
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/ioapi.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/ioapi.c
new file mode 100644
index 00000000..49958f61
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/ioapi.c
@@ -0,0 +1,235 @@
+/* ioapi.h -- IO base function header for compress/uncompress .zip
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+*/
+
+#if (defined(_WIN32))
+        #define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#include "ioapi.h"
+
+voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
+{
+    if (pfilefunc->zfile_func64.zopen64_file != NULL)
+        return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
+    else
+    {
+        return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
+    }
+}
+
+long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
+{
+    if (pfilefunc->zfile_func64.zseek64_file != NULL)
+        return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
+    else
+    {
+        uLong offsetTruncated = (uLong)offset;
+        if (offsetTruncated != offset)
+            return -1;
+        else
+            return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
+    }
+}
+
+ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
+{
+    if (pfilefunc->zfile_func64.zseek64_file != NULL)
+        return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
+    else
+    {
+        uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
+        if ((tell_uLong) == ((uLong)-1))
+            return (ZPOS64_T)-1;
+        else
+            return tell_uLong;
+    }
+}
+
+void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
+{
+    p_filefunc64_32->zfile_func64.zopen64_file = NULL;
+    p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
+    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
+    p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
+    p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
+    p_filefunc64_32->zfile_func64.ztell64_file = NULL;
+    p_filefunc64_32->zfile_func64.zseek64_file = NULL;
+    p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
+    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
+    p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
+    p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
+    p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
+}
+
+
+
+static voidpf  ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode));
+static uLong   ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+static uLong   ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
+static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
+static long    ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+static int     ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
+static int     ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
+
+static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
+{
+    FILE* file = NULL;
+    const char* mode_fopen = NULL;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+        mode_fopen = "rb";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+        mode_fopen = "r+b";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+        mode_fopen = "wb";
+
+    if ((filename!=NULL) && (mode_fopen != NULL))
+        file = fopen(filename, mode_fopen);
+    return file;
+}
+
+static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
+{
+    FILE* file = NULL;
+    const char* mode_fopen = NULL;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+        mode_fopen = "rb";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+        mode_fopen = "r+b";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+        mode_fopen = "wb";
+
+    if ((filename!=NULL) && (mode_fopen != NULL))
+        file = fopen64((const char*)filename, mode_fopen);
+    return file;
+}
+
+
+static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
+{
+    uLong ret;
+    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
+    return ret;
+}
+
+static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
+{
+    uLong ret;
+    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
+    return ret;
+}
+
+static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
+{
+    long ret;
+    ret = ftell((FILE *)stream);
+    return ret;
+}
+
+
+static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
+{
+    ZPOS64_T ret;
+    ret = ftello64((FILE *)stream);
+    return ret;
+}
+
+static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
+{
+    int fseek_origin=0;
+    long ret;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        fseek_origin = SEEK_CUR;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        fseek_origin = SEEK_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        fseek_origin = SEEK_SET;
+        break;
+    default: return -1;
+    }
+    ret = 0;
+    if (fseek((FILE *)stream, offset, fseek_origin) != 0)
+        ret = -1;
+    return ret;
+}
+
+static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
+{
+    int fseek_origin=0;
+    long ret;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        fseek_origin = SEEK_CUR;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        fseek_origin = SEEK_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        fseek_origin = SEEK_SET;
+        break;
+    default: return -1;
+    }
+    ret = 0;
+
+    if(fseeko64((FILE *)stream, offset, fseek_origin) != 0)
+                        ret = -1;
+
+    return ret;
+}
+
+
+static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
+{
+    int ret;
+    ret = fclose((FILE *)stream);
+    return ret;
+}
+
+static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
+{
+    int ret;
+    ret = ferror((FILE *)stream);
+    return ret;
+}
+
+void fill_fopen_filefunc (pzlib_filefunc_def)
+  zlib_filefunc_def* pzlib_filefunc_def;
+{
+    pzlib_filefunc_def->zopen_file = fopen_file_func;
+    pzlib_filefunc_def->zread_file = fread_file_func;
+    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
+    pzlib_filefunc_def->ztell_file = ftell_file_func;
+    pzlib_filefunc_def->zseek_file = fseek_file_func;
+    pzlib_filefunc_def->zclose_file = fclose_file_func;
+    pzlib_filefunc_def->zerror_file = ferror_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+void fill_fopen64_filefunc (zlib_filefunc64_def*  pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = fopen64_file_func;
+    pzlib_filefunc_def->zread_file = fread_file_func;
+    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
+    pzlib_filefunc_def->ztell64_file = ftell64_file_func;
+    pzlib_filefunc_def->zseek64_file = fseek64_file_func;
+    pzlib_filefunc_def->zclose_file = fclose_file_func;
+    pzlib_filefunc_def->zerror_file = ferror_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/ioapi.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/ioapi.h
new file mode 100644
index 00000000..8309c4cf
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/ioapi.h
@@ -0,0 +1,200 @@
+/* ioapi.h -- IO base function header for compress/uncompress .zip
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         Changes
+
+    Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
+    Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
+               More if/def section may be needed to support other platforms
+    Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
+                          (but you should use iowin32.c for windows instead)
+
+*/
+
+#ifndef _ZLIBIOAPI64_H
+#define _ZLIBIOAPI64_H
+
+#if (!defined(_WIN32)) && (!defined(WIN32))
+
+  // Linux needs this to support file operation on files larger then 4+GB
+  // But might need better if/def to select just the platforms that needs them.
+
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "zlib.h"
+
+#if defined(USE_FILE32API)
+#define fopen64 fopen
+#define ftello64 ftell
+#define fseeko64 fseek
+#else
+#ifdef _MSC_VER
+ #define fopen64 fopen
+ #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
+  #define ftello64 _ftelli64
+  #define fseeko64 _fseeki64
+ #else // old MSC
+  #define ftello64 ftell
+  #define fseeko64 fseek
+ #endif
+#endif
+#endif
+
+/*
+#ifndef ZPOS64_T
+  #ifdef _WIN32
+                #define ZPOS64_T fpos_t
+  #else
+    #include <stdint.h>
+    #define ZPOS64_T uint64_t
+  #endif
+#endif
+*/
+
+#ifdef HAVE_MINIZIP64_CONF_H
+#include "mz64conf.h"
+#endif
+
+/* a type choosen by DEFINE */
+#ifdef HAVE_64BIT_INT_CUSTOM
+typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
+#else
+#ifdef HAS_STDINT_H
+#include "stdint.h"
+typedef uint64_t ZPOS64_T;
+#else
+
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+typedef unsigned __int64 ZPOS64_T;
+#else
+typedef unsigned long long int ZPOS64_T;
+#endif
+#endif
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define ZLIB_FILEFUNC_SEEK_CUR (1)
+#define ZLIB_FILEFUNC_SEEK_END (2)
+#define ZLIB_FILEFUNC_SEEK_SET (0)
+
+#define ZLIB_FILEFUNC_MODE_READ      (1)
+#define ZLIB_FILEFUNC_MODE_WRITE     (2)
+#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
+
+#define ZLIB_FILEFUNC_MODE_EXISTING (4)
+#define ZLIB_FILEFUNC_MODE_CREATE   (8)
+
+
+#ifndef ZCALLBACK
+ #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
+   #define ZCALLBACK CALLBACK
+ #else
+   #define ZCALLBACK
+ #endif
+#endif
+
+
+
+
+typedef voidpf   (ZCALLBACK *open_file_func)      OF((voidpf opaque, const char* filename, int mode));
+typedef uLong    (ZCALLBACK *read_file_func)      OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+typedef uLong    (ZCALLBACK *write_file_func)     OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+typedef int      (ZCALLBACK *close_file_func)     OF((voidpf opaque, voidpf stream));
+typedef int      (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+
+typedef long     (ZCALLBACK *tell_file_func)      OF((voidpf opaque, voidpf stream));
+typedef long     (ZCALLBACK *seek_file_func)      OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+
+
+/* here is the "old" 32 bits structure structure */
+typedef struct zlib_filefunc_def_s
+{
+    open_file_func      zopen_file;
+    read_file_func      zread_file;
+    write_file_func     zwrite_file;
+    tell_file_func      ztell_file;
+    seek_file_func      zseek_file;
+    close_file_func     zclose_file;
+    testerror_file_func zerror_file;
+    voidpf              opaque;
+} zlib_filefunc_def;
+
+typedef ZPOS64_T (ZCALLBACK *tell64_file_func)    OF((voidpf opaque, voidpf stream));
+typedef long     (ZCALLBACK *seek64_file_func)    OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+typedef voidpf   (ZCALLBACK *open64_file_func)    OF((voidpf opaque, const void* filename, int mode));
+
+typedef struct zlib_filefunc64_def_s
+{
+    open64_file_func    zopen64_file;
+    read_file_func      zread_file;
+    write_file_func     zwrite_file;
+    tell64_file_func    ztell64_file;
+    seek64_file_func    zseek64_file;
+    close_file_func     zclose_file;
+    testerror_file_func zerror_file;
+    voidpf              opaque;
+} zlib_filefunc64_def;
+
+void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+
+/* now internal definition, only for zip.c and unzip.h */
+typedef struct zlib_filefunc64_32_def_s
+{
+    zlib_filefunc64_def zfile_func64;
+    open_file_func      zopen32_file;
+    tell_file_func      ztell32_file;
+    seek_file_func      zseek32_file;
+} zlib_filefunc64_32_def;
+
+
+#define ZREAD64(filefunc,filestream,buf,size)     ((*((filefunc).zfile_func64.zread_file))   ((filefunc).zfile_func64.opaque,filestream,buf,size))
+#define ZWRITE64(filefunc,filestream,buf,size)    ((*((filefunc).zfile_func64.zwrite_file))  ((filefunc).zfile_func64.opaque,filestream,buf,size))
+//#define ZTELL64(filefunc,filestream)            ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
+//#define ZSEEK64(filefunc,filestream,pos,mode)   ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
+#define ZCLOSE64(filefunc,filestream)             ((*((filefunc).zfile_func64.zclose_file))  ((filefunc).zfile_func64.opaque,filestream))
+#define ZERROR64(filefunc,filestream)             ((*((filefunc).zfile_func64.zerror_file))  ((filefunc).zfile_func64.opaque,filestream))
+
+voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
+long    call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
+ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
+
+void    fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
+
+#define ZOPEN64(filefunc,filename,mode)         (call_zopen64((&(filefunc)),(filename),(mode)))
+#define ZTELL64(filefunc,filestream)            (call_ztell64((&(filefunc)),(filestream)))
+#define ZSEEK64(filefunc,filestream,pos,mode)   (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/iowin32.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/iowin32.c
new file mode 100644
index 00000000..6a2a883b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/iowin32.c
@@ -0,0 +1,389 @@
+/* iowin32.c -- IO base function header for compress/uncompress .zip
+     Version 1.1, February 14h, 2010
+     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+     For more info read MiniZip_info.txt
+
+*/
+
+#include <stdlib.h>
+
+#include "zlib.h"
+#include "ioapi.h"
+#include "iowin32.h"
+
+#ifndef INVALID_HANDLE_VALUE
+#define INVALID_HANDLE_VALUE (0xFFFFFFFF)
+#endif
+
+#ifndef INVALID_SET_FILE_POINTER
+#define INVALID_SET_FILE_POINTER ((DWORD)-1)
+#endif
+
+voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
+uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+uLong   ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+ZPOS64_T ZCALLBACK win32_tell64_file_func  OF((voidpf opaque, voidpf stream));
+long    ZCALLBACK win32_seek64_file_func  OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+int     ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream));
+int     ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream));
+
+typedef struct
+{
+    HANDLE hf;
+    int error;
+} WIN32FILE_IOWIN;
+
+
+static void win32_translate_open_mode(int mode,
+                                      DWORD* lpdwDesiredAccess,
+                                      DWORD* lpdwCreationDisposition,
+                                      DWORD* lpdwShareMode,
+                                      DWORD* lpdwFlagsAndAttributes)
+{
+    *lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0;
+
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+    {
+        *lpdwDesiredAccess = GENERIC_READ;
+        *lpdwCreationDisposition = OPEN_EXISTING;
+        *lpdwShareMode = FILE_SHARE_READ;
+    }
+    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+    {
+        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        *lpdwCreationDisposition = OPEN_EXISTING;
+    }
+    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+    {
+        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        *lpdwCreationDisposition = CREATE_ALWAYS;
+    }
+}
+
+static voidpf win32_build_iowin(HANDLE hFile)
+{
+    voidpf ret=NULL;
+
+    if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE))
+    {
+        WIN32FILE_IOWIN w32fiow;
+        w32fiow.hf = hFile;
+        w32fiow.error = 0;
+        ret = malloc(sizeof(WIN32FILE_IOWIN));
+
+        if (ret==NULL)
+            CloseHandle(hFile);
+        else
+            *((WIN32FILE_IOWIN*)ret) = w32fiow;
+    }
+    return ret;
+}
+
+voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+
+    return win32_build_iowin(hFile);
+}
+
+
+uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uLong size)
+{
+    uLong ret=0;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+
+    if (hFile != NULL)
+    {
+        if (!ReadFile(hFile, buf, size, &ret, NULL))
+        {
+            DWORD dwErr = GetLastError();
+            if (dwErr == ERROR_HANDLE_EOF)
+                dwErr = 0;
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+        }
+    }
+
+    return ret;
+}
+
+
+uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size)
+{
+    uLong ret=0;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+
+    if (hFile != NULL)
+    {
+        if (!WriteFile(hFile, buf, size, &ret, NULL))
+        {
+            DWORD dwErr = GetLastError();
+            if (dwErr == ERROR_HANDLE_EOF)
+                dwErr = 0;
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+        }
+    }
+
+    return ret;
+}
+
+long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream)
+{
+    long ret=-1;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+    if (hFile != NULL)
+    {
+        DWORD dwSet = SetFilePointer(hFile, 0, NULL, FILE_CURRENT);
+        if (dwSet == INVALID_SET_FILE_POINTER)
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = -1;
+        }
+        else
+            ret=(long)dwSet;
+    }
+    return ret;
+}
+
+ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream)
+{
+    ZPOS64_T ret= (ZPOS64_T)-1;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
+
+    if (hFile)
+    {
+        LARGE_INTEGER li;
+        li.QuadPart = 0;
+        li.u.LowPart = SetFilePointer(hFile, li.u.LowPart, &li.u.HighPart, FILE_CURRENT);
+        if ( (li.LowPart == 0xFFFFFFFF) && (GetLastError() != NO_ERROR))
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = (ZPOS64_T)-1;
+        }
+        else
+            ret=li.QuadPart;
+    }
+    return ret;
+}
+
+
+long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,int origin)
+{
+    DWORD dwMoveMethod=0xFFFFFFFF;
+    HANDLE hFile = NULL;
+
+    long ret=-1;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        dwMoveMethod = FILE_CURRENT;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        dwMoveMethod = FILE_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        dwMoveMethod = FILE_BEGIN;
+        break;
+    default: return -1;
+    }
+
+    if (hFile != NULL)
+    {
+        DWORD dwSet = SetFilePointer(hFile, offset, NULL, dwMoveMethod);
+        if (dwSet == INVALID_SET_FILE_POINTER)
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = -1;
+        }
+        else
+            ret=0;
+    }
+    return ret;
+}
+
+long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin)
+{
+    DWORD dwMoveMethod=0xFFFFFFFF;
+    HANDLE hFile = NULL;
+    long ret=-1;
+
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
+
+    switch (origin)
+    {
+        case ZLIB_FILEFUNC_SEEK_CUR :
+            dwMoveMethod = FILE_CURRENT;
+            break;
+        case ZLIB_FILEFUNC_SEEK_END :
+            dwMoveMethod = FILE_END;
+            break;
+        case ZLIB_FILEFUNC_SEEK_SET :
+            dwMoveMethod = FILE_BEGIN;
+            break;
+        default: return -1;
+    }
+
+    if (hFile)
+    {
+        LARGE_INTEGER* li = (LARGE_INTEGER*)&offset;
+        DWORD dwSet = SetFilePointer(hFile, li->u.LowPart, &li->u.HighPart, dwMoveMethod);
+        if (dwSet == INVALID_SET_FILE_POINTER)
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = -1;
+        }
+        else
+            ret=0;
+    }
+    return ret;
+}
+
+int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream)
+{
+    int ret=-1;
+
+    if (stream!=NULL)
+    {
+        HANDLE hFile;
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+        if (hFile != NULL)
+        {
+            CloseHandle(hFile);
+            ret=0;
+        }
+        free(stream);
+    }
+    return ret;
+}
+
+int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream)
+{
+    int ret=-1;
+    if (stream!=NULL)
+    {
+        ret = ((WIN32FILE_IOWIN*)stream) -> error;
+    }
+    return ret;
+}
+
+void fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen_file = win32_open_file_func;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell_file = win32_tell_file_func;
+    pzlib_filefunc_def->zseek_file = win32_seek_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_func;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+
+void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+
+void fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/iowin32.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/iowin32.h
new file mode 100644
index 00000000..0ca0969a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/iowin32.h
@@ -0,0 +1,28 @@
+/* iowin32.h -- IO base function header for compress/uncompress .zip
+     Version 1.1, February 14h, 2010
+     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+*/
+
+#include <windows.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+void fill_win32_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_win32_filefunc64A OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_win32_filefunc64W OF((zlib_filefunc64_def* pzlib_filefunc_def));
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/make_vms.com b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/make_vms.com
new file mode 100644
index 00000000..9ac13a98
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/make_vms.com
@@ -0,0 +1,25 @@
+$ if f$search("ioapi.h_orig") .eqs. "" then copy ioapi.h ioapi.h_orig
+$ open/write zdef vmsdefs.h
+$ copy sys$input: zdef
+$ deck
+#define unix
+#define fill_zlib_filefunc64_32_def_from_filefunc32 fillzffunc64from
+#define Write_Zip64EndOfCentralDirectoryLocator Write_Zip64EoDLocator
+#define Write_Zip64EndOfCentralDirectoryRecord Write_Zip64EoDRecord
+#define Write_EndOfCentralDirectoryRecord Write_EoDRecord
+$ eod
+$ close zdef
+$ copy vmsdefs.h,ioapi.h_orig ioapi.h
+$ cc/include=[--]/prefix=all ioapi.c
+$ cc/include=[--]/prefix=all miniunz.c
+$ cc/include=[--]/prefix=all unzip.c
+$ cc/include=[--]/prefix=all minizip.c
+$ cc/include=[--]/prefix=all zip.c
+$ link miniunz,unzip,ioapi,[--]libz.olb/lib
+$ link minizip,zip,ioapi,[--]libz.olb/lib
+$ mcr []minizip test minizip_info.txt
+$ mcr []miniunz -l test.zip
+$ rename minizip_info.txt; minizip_info.txt_old
+$ mcr []miniunz test.zip
+$ delete test.zip;*
+$exit
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/miniunz.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/miniunz.c
new file mode 100644
index 00000000..9ed009fb
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/miniunz.c
@@ -0,0 +1,648 @@
+/*
+   miniunz.c
+   Version 1.1, February 14h, 2010
+   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+*/
+
+#ifndef _WIN32
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#ifdef unix
+# include <unistd.h>
+# include <utime.h>
+#else
+# include <direct.h>
+# include <io.h>
+#endif
+
+#include "unzip.h"
+
+#define CASESENSITIVITY (0)
+#define WRITEBUFFERSIZE (8192)
+#define MAXFILENAME (256)
+
+#ifdef _WIN32
+#define USEWIN32IOAPI
+#include "iowin32.h"
+#endif
+/*
+  mini unzip, demo of unzip package
+
+  usage :
+  Usage : miniunz [-exvlo] file.zip [file_to_extract] [-d extractdir]
+
+  list the file in the zipfile, and print the content of FILE_ID.ZIP or README.TXT
+    if it exists
+*/
+
+
+/* change_file_date : change the date/time of a file
+    filename : the filename of the file where date/time must be modified
+    dosdate : the new date at the MSDos format (4 bytes)
+    tmu_date : the SAME new date at the tm_unz format */
+void change_file_date(filename,dosdate,tmu_date)
+    const char *filename;
+    uLong dosdate;
+    tm_unz tmu_date;
+{
+#ifdef _WIN32
+  HANDLE hFile;
+  FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;
+
+  hFile = CreateFileA(filename,GENERIC_READ | GENERIC_WRITE,
+                      0,NULL,OPEN_EXISTING,0,NULL);
+  GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite);
+  DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal);
+  LocalFileTimeToFileTime(&ftLocal,&ftm);
+  SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
+  CloseHandle(hFile);
+#else
+#ifdef unix
+  struct utimbuf ut;
+  struct tm newdate;
+  newdate.tm_sec = tmu_date.tm_sec;
+  newdate.tm_min=tmu_date.tm_min;
+  newdate.tm_hour=tmu_date.tm_hour;
+  newdate.tm_mday=tmu_date.tm_mday;
+  newdate.tm_mon=tmu_date.tm_mon;
+  if (tmu_date.tm_year > 1900)
+      newdate.tm_year=tmu_date.tm_year - 1900;
+  else
+      newdate.tm_year=tmu_date.tm_year ;
+  newdate.tm_isdst=-1;
+
+  ut.actime=ut.modtime=mktime(&newdate);
+  utime(filename,&ut);
+#endif
+#endif
+}
+
+
+/* mymkdir and change_file_date are not 100 % portable
+   As I don't know well Unix, I wait feedback for the unix portion */
+
+int mymkdir(dirname)
+    const char* dirname;
+{
+    int ret=0;
+#ifdef _WIN32
+    ret = _mkdir(dirname);
+#else
+#ifdef unix
+    ret = mkdir (dirname,0775);
+#endif
+#endif
+    return ret;
+}
+
+int makedir (newdir)
+    char *newdir;
+{
+  char *buffer ;
+  char *p;
+  int  len = (int)strlen(newdir);
+
+  if (len <= 0)
+    return 0;
+
+  buffer = (char*)malloc(len+1);
+        if (buffer==NULL)
+        {
+                printf("Error allocating memory\n");
+                return UNZ_INTERNALERROR;
+        }
+  strcpy(buffer,newdir);
+
+  if (buffer[len-1] == '/') {
+    buffer[len-1] = '\0';
+  }
+  if (mymkdir(buffer) == 0)
+    {
+      free(buffer);
+      return 1;
+    }
+
+  p = buffer+1;
+  while (1)
+    {
+      char hold;
+
+      while(*p && *p != '\\' && *p != '/')
+        p++;
+      hold = *p;
+      *p = 0;
+      if ((mymkdir(buffer) == -1) && (errno == ENOENT))
+        {
+          printf("couldn't create directory %s\n",buffer);
+          free(buffer);
+          return 0;
+        }
+      if (hold == 0)
+        break;
+      *p++ = hold;
+    }
+  free(buffer);
+  return 1;
+}
+
+void do_banner()
+{
+    printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
+    printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
+}
+
+void do_help()
+{
+    printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
+           "  -e  Extract without pathname (junk paths)\n" \
+           "  -x  Extract with pathname\n" \
+           "  -v  list files\n" \
+           "  -l  list files\n" \
+           "  -d  directory to extract into\n" \
+           "  -o  overwrite files without prompting\n" \
+           "  -p  extract crypted file using password\n\n");
+}
+
+void Display64BitsSize(ZPOS64_T n, int size_char)
+{
+  /* to avoid compatibility problem , we do here the conversion */
+  char number[21];
+  int offset=19;
+  int pos_string = 19;
+  number[20]=0;
+  for (;;) {
+      number[offset]=(char)((n%10)+'0');
+      if (number[offset] != '0')
+          pos_string=offset;
+      n/=10;
+      if (offset==0)
+          break;
+      offset--;
+  }
+  {
+      int size_display_string = 19-pos_string;
+      while (size_char > size_display_string)
+      {
+          size_char--;
+          printf(" ");
+      }
+  }
+
+  printf("%s",&number[pos_string]);
+}
+
+int do_list(uf)
+    unzFile uf;
+{
+    uLong i;
+    unz_global_info64 gi;
+    int err;
+
+    err = unzGetGlobalInfo64(uf,&gi);
+    if (err!=UNZ_OK)
+        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
+    printf("  Length  Method     Size Ratio   Date    Time   CRC-32     Name\n");
+    printf("  ------  ------     ---- -----   ----    ----   ------     ----\n");
+    for (i=0;i<gi.number_entry;i++)
+    {
+        char filename_inzip[256];
+        unz_file_info64 file_info;
+        uLong ratio=0;
+        const char *string_method;
+        char charCrypt=' ';
+        err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+        if (err!=UNZ_OK)
+        {
+            printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
+            break;
+        }
+        if (file_info.uncompressed_size>0)
+            ratio = (uLong)((file_info.compressed_size*100)/file_info.uncompressed_size);
+
+        /* display a '*' if the file is crypted */
+        if ((file_info.flag & 1) != 0)
+            charCrypt='*';
+
+        if (file_info.compression_method==0)
+            string_method="Stored";
+        else
+        if (file_info.compression_method==Z_DEFLATED)
+        {
+            uInt iLevel=(uInt)((file_info.flag & 0x6)/2);
+            if (iLevel==0)
+              string_method="Defl:N";
+            else if (iLevel==1)
+              string_method="Defl:X";
+            else if ((iLevel==2) || (iLevel==3))
+              string_method="Defl:F"; /* 2:fast , 3 : extra fast*/
+        }
+        else
+        if (file_info.compression_method==Z_BZIP2ED)
+        {
+              string_method="BZip2 ";
+        }
+        else
+            string_method="Unkn. ";
+
+        Display64BitsSize(file_info.uncompressed_size,7);
+        printf("  %6s%c",string_method,charCrypt);
+        Display64BitsSize(file_info.compressed_size,7);
+        printf(" %3lu%%  %2.2lu-%2.2lu-%2.2lu  %2.2lu:%2.2lu  %8.8lx   %s\n",
+                ratio,
+                (uLong)file_info.tmu_date.tm_mon + 1,
+                (uLong)file_info.tmu_date.tm_mday,
+                (uLong)file_info.tmu_date.tm_year % 100,
+                (uLong)file_info.tmu_date.tm_hour,(uLong)file_info.tmu_date.tm_min,
+                (uLong)file_info.crc,filename_inzip);
+        if ((i+1)<gi.number_entry)
+        {
+            err = unzGoToNextFile(uf);
+            if (err!=UNZ_OK)
+            {
+                printf("error %d with zipfile in unzGoToNextFile\n",err);
+                break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+
+int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
+    unzFile uf;
+    const int* popt_extract_without_path;
+    int* popt_overwrite;
+    const char* password;
+{
+    char filename_inzip[256];
+    char* filename_withoutpath;
+    char* p;
+    int err=UNZ_OK;
+    FILE *fout=NULL;
+    void* buf;
+    uInt size_buf;
+
+    unz_file_info64 file_info;
+    uLong ratio=0;
+    err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+
+    if (err!=UNZ_OK)
+    {
+        printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
+        return err;
+    }
+
+    size_buf = WRITEBUFFERSIZE;
+    buf = (void*)malloc(size_buf);
+    if (buf==NULL)
+    {
+        printf("Error allocating memory\n");
+        return UNZ_INTERNALERROR;
+    }
+
+    p = filename_withoutpath = filename_inzip;
+    while ((*p) != '\0')
+    {
+        if (((*p)=='/') || ((*p)=='\\'))
+            filename_withoutpath = p+1;
+        p++;
+    }
+
+    if ((*filename_withoutpath)=='\0')
+    {
+        if ((*popt_extract_without_path)==0)
+        {
+            printf("creating directory: %s\n",filename_inzip);
+            mymkdir(filename_inzip);
+        }
+    }
+    else
+    {
+        const char* write_filename;
+        int skip=0;
+
+        if ((*popt_extract_without_path)==0)
+            write_filename = filename_inzip;
+        else
+            write_filename = filename_withoutpath;
+
+        err = unzOpenCurrentFilePassword(uf,password);
+        if (err!=UNZ_OK)
+        {
+            printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err);
+        }
+
+        if (((*popt_overwrite)==0) && (err==UNZ_OK))
+        {
+            char rep=0;
+            FILE* ftestexist;
+            ftestexist = fopen64(write_filename,"rb");
+            if (ftestexist!=NULL)
+            {
+                fclose(ftestexist);
+                do
+                {
+                    char answer[128];
+                    int ret;
+
+                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
+                    ret = scanf("%1s",answer);
+                    if (ret != 1)
+                    {
+                       exit(EXIT_FAILURE);
+                    }
+                    rep = answer[0] ;
+                    if ((rep>='a') && (rep<='z'))
+                        rep -= 0x20;
+                }
+                while ((rep!='Y') && (rep!='N') && (rep!='A'));
+            }
+
+            if (rep == 'N')
+                skip = 1;
+
+            if (rep == 'A')
+                *popt_overwrite=1;
+        }
+
+        if ((skip==0) && (err==UNZ_OK))
+        {
+            fout=fopen64(write_filename,"wb");
+
+            /* some zipfile don't contain directory alone before file */
+            if ((fout==NULL) && ((*popt_extract_without_path)==0) &&
+                                (filename_withoutpath!=(char*)filename_inzip))
+            {
+                char c=*(filename_withoutpath-1);
+                *(filename_withoutpath-1)='\0';
+                makedir(write_filename);
+                *(filename_withoutpath-1)=c;
+                fout=fopen64(write_filename,"wb");
+            }
+
+            if (fout==NULL)
+            {
+                printf("error opening %s\n",write_filename);
+            }
+        }
+
+        if (fout!=NULL)
+        {
+            printf(" extracting: %s\n",write_filename);
+
+            do
+            {
+                err = unzReadCurrentFile(uf,buf,size_buf);
+                if (err<0)
+                {
+                    printf("error %d with zipfile in unzReadCurrentFile\n",err);
+                    break;
+                }
+                if (err>0)
+                    if (fwrite(buf,err,1,fout)!=1)
+                    {
+                        printf("error in writing extracted file\n");
+                        err=UNZ_ERRNO;
+                        break;
+                    }
+            }
+            while (err>0);
+            if (fout)
+                    fclose(fout);
+
+            if (err==0)
+                change_file_date(write_filename,file_info.dosDate,
+                                 file_info.tmu_date);
+        }
+
+        if (err==UNZ_OK)
+        {
+            err = unzCloseCurrentFile (uf);
+            if (err!=UNZ_OK)
+            {
+                printf("error %d with zipfile in unzCloseCurrentFile\n",err);
+            }
+        }
+        else
+            unzCloseCurrentFile(uf); /* don't lose the error */
+    }
+
+    free(buf);
+    return err;
+}
+
+
+int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
+    unzFile uf;
+    int opt_extract_without_path;
+    int opt_overwrite;
+    const char* password;
+{
+    uLong i;
+    unz_global_info64 gi;
+    int err;
+    FILE* fout=NULL;
+
+    err = unzGetGlobalInfo64(uf,&gi);
+    if (err!=UNZ_OK)
+        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
+
+    for (i=0;i<gi.number_entry;i++)
+    {
+        if (do_extract_currentfile(uf,&opt_extract_without_path,
+                                      &opt_overwrite,
+                                      password) != UNZ_OK)
+            break;
+
+        if ((i+1)<gi.number_entry)
+        {
+            err = unzGoToNextFile(uf);
+            if (err!=UNZ_OK)
+            {
+                printf("error %d with zipfile in unzGoToNextFile\n",err);
+                break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)
+    unzFile uf;
+    const char* filename;
+    int opt_extract_without_path;
+    int opt_overwrite;
+    const char* password;
+{
+    int err = UNZ_OK;
+    if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK)
+    {
+        printf("file %s not found in the zipfile\n",filename);
+        return 2;
+    }
+
+    if (do_extract_currentfile(uf,&opt_extract_without_path,
+                                      &opt_overwrite,
+                                      password) == UNZ_OK)
+        return 0;
+    else
+        return 1;
+}
+
+
+int main(argc,argv)
+    int argc;
+    char *argv[];
+{
+    const char *zipfilename=NULL;
+    const char *filename_to_extract=NULL;
+    const char *password=NULL;
+    char filename_try[MAXFILENAME+16] = "";
+    int i;
+    int ret_value=0;
+    int opt_do_list=0;
+    int opt_do_extract=1;
+    int opt_do_extract_withoutpath=0;
+    int opt_overwrite=0;
+    int opt_extractdir=0;
+    const char *dirname=NULL;
+    unzFile uf=NULL;
+
+    do_banner();
+    if (argc==1)
+    {
+        do_help();
+        return 0;
+    }
+    else
+    {
+        for (i=1;i<argc;i++)
+        {
+            if ((*argv[i])=='-')
+            {
+                const char *p=argv[i]+1;
+
+                while ((*p)!='\0')
+                {
+                    char c=*(p++);;
+                    if ((c=='l') || (c=='L'))
+                        opt_do_list = 1;
+                    if ((c=='v') || (c=='V'))
+                        opt_do_list = 1;
+                    if ((c=='x') || (c=='X'))
+                        opt_do_extract = 1;
+                    if ((c=='e') || (c=='E'))
+                        opt_do_extract = opt_do_extract_withoutpath = 1;
+                    if ((c=='o') || (c=='O'))
+                        opt_overwrite=1;
+                    if ((c=='d') || (c=='D'))
+                    {
+                        opt_extractdir=1;
+                        dirname=argv[i+1];
+                    }
+
+                    if (((c=='p') || (c=='P')) && (i+1<argc))
+                    {
+                        password=argv[i+1];
+                        i++;
+                    }
+                }
+            }
+            else
+            {
+                if (zipfilename == NULL)
+                    zipfilename = argv[i];
+                else if ((filename_to_extract==NULL) && (!opt_extractdir))
+                        filename_to_extract = argv[i] ;
+            }
+        }
+    }
+
+    if (zipfilename!=NULL)
+    {
+
+#        ifdef USEWIN32IOAPI
+        zlib_filefunc64_def ffunc;
+#        endif
+
+        strncpy(filename_try, zipfilename,MAXFILENAME-1);
+        /* strncpy doesnt append the trailing NULL, of the string is too long. */
+        filename_try[ MAXFILENAME ] = '\0';
+
+#        ifdef USEWIN32IOAPI
+        fill_win32_filefunc64A(&ffunc);
+        uf = unzOpen2_64(zipfilename,&ffunc);
+#        else
+        uf = unzOpen64(zipfilename);
+#        endif
+        if (uf==NULL)
+        {
+            strcat(filename_try,".zip");
+#            ifdef USEWIN32IOAPI
+            uf = unzOpen2_64(filename_try,&ffunc);
+#            else
+            uf = unzOpen64(filename_try);
+#            endif
+        }
+    }
+
+    if (uf==NULL)
+    {
+        printf("Cannot open %s or %s.zip\n",zipfilename,zipfilename);
+        return 1;
+    }
+    printf("%s opened\n",filename_try);
+
+    if (opt_do_list==1)
+        ret_value = do_list(uf);
+    else if (opt_do_extract==1)
+    {
+#ifdef _WIN32
+        if (opt_extractdir && _chdir(dirname))
+#else
+        if (opt_extractdir && chdir(dirname))
+#endif
+        {
+          printf("Error changing into %s, aborting\n", dirname);
+          exit(-1);
+        }
+
+        if (filename_to_extract == NULL)
+            ret_value = do_extract(uf, opt_do_extract_withoutpath, opt_overwrite, password);
+        else
+            ret_value = do_extract_onefile(uf, filename_to_extract, opt_do_extract_withoutpath, opt_overwrite, password);
+    }
+
+    unzClose(uf);
+
+    return ret_value;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/minizip.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/minizip.c
new file mode 100644
index 00000000..7a4fa5a6
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/minizip.c
@@ -0,0 +1,507 @@
+/*
+   minizip.c
+   Version 1.1, February 14h, 2010
+   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+*/
+
+
+#ifndef _WIN32
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#ifdef unix
+# include <unistd.h>
+# include <utime.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+#else
+# include <direct.h>
+# include <io.h>
+#endif
+
+#include "zip.h"
+
+#ifdef _WIN32
+        #define USEWIN32IOAPI
+        #include "iowin32.h"
+#endif
+
+
+
+#define WRITEBUFFERSIZE (16384)
+#define MAXFILENAME (256)
+
+#ifdef _WIN32
+uLong filetime(f, tmzip, dt)
+    char *f;                /* name of file to get info on */
+    tm_zip *tmzip;             /* return value: access, modific. and creation times */
+    uLong *dt;             /* dostime */
+{
+  int ret = 0;
+  {
+      FILETIME ftLocal;
+      HANDLE hFind;
+      WIN32_FIND_DATAA ff32;
+
+      hFind = FindFirstFileA(f,&ff32);
+      if (hFind != INVALID_HANDLE_VALUE)
+      {
+        FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal);
+        FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0);
+        FindClose(hFind);
+        ret = 1;
+      }
+  }
+  return ret;
+}
+#else
+#ifdef unix
+uLong filetime(f, tmzip, dt)
+    char *f;               /* name of file to get info on */
+    tm_zip *tmzip;         /* return value: access, modific. and creation times */
+    uLong *dt;             /* dostime */
+{
+  int ret=0;
+  struct stat s;        /* results of stat() */
+  struct tm* filedate;
+  time_t tm_t=0;
+
+  if (strcmp(f,"-")!=0)
+  {
+    char name[MAXFILENAME+1];
+    int len = strlen(f);
+    if (len > MAXFILENAME)
+      len = MAXFILENAME;
+
+    strncpy(name, f,MAXFILENAME-1);
+    /* strncpy doesnt append the trailing NULL, of the string is too long. */
+    name[ MAXFILENAME ] = '\0';
+
+    if (name[len - 1] == '/')
+      name[len - 1] = '\0';
+    /* not all systems allow stat'ing a file with / appended */
+    if (stat(name,&s)==0)
+    {
+      tm_t = s.st_mtime;
+      ret = 1;
+    }
+  }
+  filedate = localtime(&tm_t);
+
+  tmzip->tm_sec  = filedate->tm_sec;
+  tmzip->tm_min  = filedate->tm_min;
+  tmzip->tm_hour = filedate->tm_hour;
+  tmzip->tm_mday = filedate->tm_mday;
+  tmzip->tm_mon  = filedate->tm_mon ;
+  tmzip->tm_year = filedate->tm_year;
+
+  return ret;
+}
+#else
+uLong filetime(f, tmzip, dt)
+    char *f;                /* name of file to get info on */
+    tm_zip *tmzip;             /* return value: access, modific. and creation times */
+    uLong *dt;             /* dostime */
+{
+    return 0;
+}
+#endif
+#endif
+
+
+
+
+int check_exist_file(filename)
+    const char* filename;
+{
+    FILE* ftestexist;
+    int ret = 1;
+    ftestexist = fopen64(filename,"rb");
+    if (ftestexist==NULL)
+        ret = 0;
+    else
+        fclose(ftestexist);
+    return ret;
+}
+
+void do_banner()
+{
+    printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n");
+    printf("more info on MiniZip at http://www.winimage.com/zLibDll/minizip.html\n\n");
+}
+
+void do_help()
+{
+    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \
+           "  -o  Overwrite existing file.zip\n" \
+           "  -a  Append to existing file.zip\n" \
+           "  -0  Store only\n" \
+           "  -1  Compress faster\n" \
+           "  -9  Compress better\n\n" \
+           "  -j  exclude path. store only the file name.\n\n");
+}
+
+/* calculate the CRC32 of a file,
+   because to encrypt a file, we need known the CRC32 of the file before */
+int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc)
+{
+   unsigned long calculate_crc=0;
+   int err=ZIP_OK;
+   FILE * fin = fopen64(filenameinzip,"rb");
+   unsigned long size_read = 0;
+   unsigned long total_read = 0;
+   if (fin==NULL)
+   {
+       err = ZIP_ERRNO;
+   }
+
+    if (err == ZIP_OK)
+        do
+        {
+            err = ZIP_OK;
+            size_read = (int)fread(buf,1,size_buf,fin);
+            if (size_read < size_buf)
+                if (feof(fin)==0)
+            {
+                printf("error in reading %s\n",filenameinzip);
+                err = ZIP_ERRNO;
+            }
+
+            if (size_read>0)
+                calculate_crc = crc32(calculate_crc,buf,size_read);
+            total_read += size_read;
+
+        } while ((err == ZIP_OK) && (size_read>0));
+
+    if (fin)
+        fclose(fin);
+
+    *result_crc=calculate_crc;
+    printf("file %s crc %lx\n", filenameinzip, calculate_crc);
+    return err;
+}
+
+int isLargeFile(const char* filename)
+{
+  int largeFile = 0;
+  ZPOS64_T pos = 0;
+  FILE* pFile = fopen64(filename, "rb");
+
+  if(pFile != NULL)
+  {
+    int n = fseeko64(pFile, 0, SEEK_END);
+
+    pos = ftello64(pFile);
+
+                printf("File : %s is %lld bytes\n", filename, pos);
+
+    if(pos >= 0xffffffff)
+     largeFile = 1;
+
+                fclose(pFile);
+  }
+
+ return largeFile;
+}
+
+int main(argc,argv)
+    int argc;
+    char *argv[];
+{
+    int i;
+    int opt_overwrite=0;
+    int opt_compress_level=Z_DEFAULT_COMPRESSION;
+    int opt_exclude_path=0;
+    int zipfilenamearg = 0;
+    char filename_try[MAXFILENAME+16];
+    int zipok;
+    int err=0;
+    int size_buf=0;
+    void* buf=NULL;
+    const char* password=NULL;
+
+
+    do_banner();
+    if (argc==1)
+    {
+        do_help();
+        return 0;
+    }
+    else
+    {
+        for (i=1;i<argc;i++)
+        {
+            if ((*argv[i])=='-')
+            {
+                const char *p=argv[i]+1;
+
+                while ((*p)!='\0')
+                {
+                    char c=*(p++);;
+                    if ((c=='o') || (c=='O'))
+                        opt_overwrite = 1;
+                    if ((c=='a') || (c=='A'))
+                        opt_overwrite = 2;
+                    if ((c>='0') && (c<='9'))
+                        opt_compress_level = c-'0';
+                    if ((c=='j') || (c=='J'))
+                        opt_exclude_path = 1;
+
+                    if (((c=='p') || (c=='P')) && (i+1<argc))
+                    {
+                        password=argv[i+1];
+                        i++;
+                    }
+                }
+            }
+            else
+            {
+                if (zipfilenamearg == 0)
+                {
+                    zipfilenamearg = i ;
+                }
+            }
+        }
+    }
+
+    size_buf = WRITEBUFFERSIZE;
+    buf = (void*)malloc(size_buf);
+    if (buf==NULL)
+    {
+        printf("Error allocating memory\n");
+        return ZIP_INTERNALERROR;
+    }
+
+    if (zipfilenamearg==0)
+    {
+        zipok=0;
+    }
+    else
+    {
+        int i,len;
+        int dot_found=0;
+
+        zipok = 1 ;
+        strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1);
+        /* strncpy doesnt append the trailing NULL, of the string is too long. */
+        filename_try[ MAXFILENAME ] = '\0';
+
+        len=(int)strlen(filename_try);
+        for (i=0;i<len;i++)
+            if (filename_try[i]=='.')
+                dot_found=1;
+
+        if (dot_found==0)
+            strcat(filename_try,".zip");
+
+        if (opt_overwrite==2)
+        {
+            /* if the file don't exist, we not append file */
+            if (check_exist_file(filename_try)==0)
+                opt_overwrite=1;
+        }
+        else
+        if (opt_overwrite==0)
+            if (check_exist_file(filename_try)!=0)
+            {
+                char rep=0;
+                do
+                {
+                    char answer[128];
+                    int ret;
+                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [a]ppend : ",filename_try);
+                    ret = scanf("%1s",answer);
+                    if (ret != 1)
+                    {
+                       exit(EXIT_FAILURE);
+                    }
+                    rep = answer[0] ;
+                    if ((rep>='a') && (rep<='z'))
+                        rep -= 0x20;
+                }
+                while ((rep!='Y') && (rep!='N') && (rep!='A'));
+                if (rep=='N')
+                    zipok = 0;
+                if (rep=='A')
+                    opt_overwrite = 2;
+            }
+    }
+
+    if (zipok==1)
+    {
+        zipFile zf;
+        int errclose;
+#        ifdef USEWIN32IOAPI
+        zlib_filefunc64_def ffunc;
+        fill_win32_filefunc64A(&ffunc);
+        zf = zipOpen2_64(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc);
+#        else
+        zf = zipOpen64(filename_try,(opt_overwrite==2) ? 2 : 0);
+#        endif
+
+        if (zf == NULL)
+        {
+            printf("error opening %s\n",filename_try);
+            err= ZIP_ERRNO;
+        }
+        else
+            printf("creating %s\n",filename_try);
+
+        for (i=zipfilenamearg+1;(i<argc) && (err==ZIP_OK);i++)
+        {
+            if (!((((*(argv[i]))=='-') || ((*(argv[i]))=='/')) &&
+                  ((argv[i][1]=='o') || (argv[i][1]=='O') ||
+                   (argv[i][1]=='a') || (argv[i][1]=='A') ||
+                   (argv[i][1]=='p') || (argv[i][1]=='P') ||
+                   ((argv[i][1]>='0') || (argv[i][1]<='9'))) &&
+                  (strlen(argv[i]) == 2)))
+            {
+                FILE * fin;
+                int size_read;
+                const char* filenameinzip = argv[i];
+                const char *savefilenameinzip;
+                zip_fileinfo zi;
+                unsigned long crcFile=0;
+                int zip64 = 0;
+
+                zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour =
+                zi.tmz_date.tm_mday = zi.tmz_date.tm_mon = zi.tmz_date.tm_year = 0;
+                zi.dosDate = 0;
+                zi.internal_fa = 0;
+                zi.external_fa = 0;
+                filetime(filenameinzip,&zi.tmz_date,&zi.dosDate);
+
+/*
+                err = zipOpenNewFileInZip(zf,filenameinzip,&zi,
+                                 NULL,0,NULL,0,NULL / * comment * /,
+                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
+                                 opt_compress_level);
+*/
+                if ((password != NULL) && (err==ZIP_OK))
+                    err = getFileCrc(filenameinzip,buf,size_buf,&crcFile);
+
+                zip64 = isLargeFile(filenameinzip);
+
+                                                         /* The path name saved, should not include a leading slash. */
+               /*if it did, windows/xp and dynazip couldn't read the zip file. */
+                 savefilenameinzip = filenameinzip;
+                 while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' )
+                 {
+                     savefilenameinzip++;
+                 }
+
+                 /*should the zip file contain any path at all?*/
+                 if( opt_exclude_path )
+                 {
+                     const char *tmpptr;
+                     const char *lastslash = 0;
+                     for( tmpptr = savefilenameinzip; *tmpptr; tmpptr++)
+                     {
+                         if( *tmpptr == '\\' || *tmpptr == '/')
+                         {
+                             lastslash = tmpptr;
+                         }
+                     }
+                     if( lastslash != NULL )
+                     {
+                         savefilenameinzip = lastslash+1; // base filename follows last slash.
+                     }
+                 }
+
+                 /**/
+                err = zipOpenNewFileInZip3_64(zf,savefilenameinzip,&zi,
+                                 NULL,0,NULL,0,NULL /* comment*/,
+                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
+                                 opt_compress_level,0,
+                                 /* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 password,crcFile, zip64);
+
+                if (err != ZIP_OK)
+                    printf("error in opening %s in zipfile\n",filenameinzip);
+                else
+                {
+                    fin = fopen64(filenameinzip,"rb");
+                    if (fin==NULL)
+                    {
+                        err=ZIP_ERRNO;
+                        printf("error in opening %s for reading\n",filenameinzip);
+                    }
+                }
+
+                if (err == ZIP_OK)
+                    do
+                    {
+                        err = ZIP_OK;
+                        size_read = (int)fread(buf,1,size_buf,fin);
+                        if (size_read < size_buf)
+                            if (feof(fin)==0)
+                        {
+                            printf("error in reading %s\n",filenameinzip);
+                            err = ZIP_ERRNO;
+                        }
+
+                        if (size_read>0)
+                        {
+                            err = zipWriteInFileInZip (zf,buf,size_read);
+                            if (err<0)
+                            {
+                                printf("error in writing %s in the zipfile\n",
+                                                 filenameinzip);
+                            }
+
+                        }
+                    } while ((err == ZIP_OK) && (size_read>0));
+
+                if (fin)
+                    fclose(fin);
+
+                if (err<0)
+                    err=ZIP_ERRNO;
+                else
+                {
+                    err = zipCloseFileInZip(zf);
+                    if (err!=ZIP_OK)
+                        printf("error in closing %s in the zipfile\n",
+                                    filenameinzip);
+                }
+            }
+        }
+        errclose = zipClose(zf,NULL);
+        if (errclose != ZIP_OK)
+            printf("error in closing %s\n",filename_try);
+    }
+    else
+    {
+       do_help();
+    }
+
+    free(buf);
+    return 0;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/mztools.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/mztools.c
new file mode 100644
index 00000000..f9092e65
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/mztools.c
@@ -0,0 +1,281 @@
+/*
+  Additional tools for Minizip
+  Code: Xavier Roche '2004
+  License: Same as ZLIB (www.gzip.org)
+*/
+
+/* Code */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "zlib.h"
+#include "unzip.h"
+
+#define READ_8(adr)  ((unsigned char)*(adr))
+#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
+#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
+
+#define WRITE_8(buff, n) do { \
+  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
+} while(0)
+#define WRITE_16(buff, n) do { \
+  WRITE_8((unsigned char*)(buff), n); \
+  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
+} while(0)
+#define WRITE_32(buff, n) do { \
+  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
+  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
+} while(0)
+
+extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)
+const char* file;
+const char* fileOut;
+const char* fileOutTmp;
+uLong* nRecovered;
+uLong* bytesRecovered;
+{
+  int err = Z_OK;
+  FILE* fpZip = fopen(file, "rb");
+  FILE* fpOut = fopen(fileOut, "wb");
+  FILE* fpOutCD = fopen(fileOutTmp, "wb");
+  if (fpZip != NULL &&  fpOut != NULL) {
+    int entries = 0;
+    uLong totalBytes = 0;
+    char header[30];
+    char filename[256];
+    char extra[1024];
+    int offset = 0;
+    int offsetCD = 0;
+    while ( fread(header, 1, 30, fpZip) == 30 ) {
+      int currentOffset = offset;
+
+      /* File entry */
+      if (READ_32(header) == 0x04034b50) {
+        unsigned int version = READ_16(header + 4);
+        unsigned int gpflag = READ_16(header + 6);
+        unsigned int method = READ_16(header + 8);
+        unsigned int filetime = READ_16(header + 10);
+        unsigned int filedate = READ_16(header + 12);
+        unsigned int crc = READ_32(header + 14); /* crc */
+        unsigned int cpsize = READ_32(header + 18); /* compressed size */
+        unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */
+        unsigned int fnsize = READ_16(header + 26); /* file name length */
+        unsigned int extsize = READ_16(header + 28); /* extra field length */
+        filename[0] = extra[0] = '\0';
+
+        /* Header */
+        if (fwrite(header, 1, 30, fpOut) == 30) {
+          offset += 30;
+        } else {
+          err = Z_ERRNO;
+          break;
+        }
+
+        /* Filename */
+        if (fnsize > 0) {
+          if (fread(filename, 1, fnsize, fpZip) == fnsize) {
+            if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {
+              offset += fnsize;
+            } else {
+              err = Z_ERRNO;
+              break;
+            }
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        } else {
+          err = Z_STREAM_ERROR;
+          break;
+        }
+
+        /* Extra field */
+        if (extsize > 0) {
+          if (fread(extra, 1, extsize, fpZip) == extsize) {
+            if (fwrite(extra, 1, extsize, fpOut) == extsize) {
+              offset += extsize;
+            } else {
+              err = Z_ERRNO;
+              break;
+            }
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+
+        /* Data */
+        {
+          int dataSize = cpsize;
+          if (dataSize == 0) {
+            dataSize = uncpsize;
+          }
+          if (dataSize > 0) {
+            char* data = malloc(dataSize);
+            if (data != NULL) {
+              if ((int)fread(data, 1, dataSize, fpZip) == dataSize) {
+                if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) {
+                  offset += dataSize;
+                  totalBytes += dataSize;
+                } else {
+                  err = Z_ERRNO;
+                }
+              } else {
+                err = Z_ERRNO;
+              }
+              free(data);
+              if (err != Z_OK) {
+                break;
+              }
+            } else {
+              err = Z_MEM_ERROR;
+              break;
+            }
+          }
+        }
+
+        /* Central directory entry */
+        {
+          char header[46];
+          char* comment = "";
+          int comsize = (int) strlen(comment);
+          WRITE_32(header, 0x02014b50);
+          WRITE_16(header + 4, version);
+          WRITE_16(header + 6, version);
+          WRITE_16(header + 8, gpflag);
+          WRITE_16(header + 10, method);
+          WRITE_16(header + 12, filetime);
+          WRITE_16(header + 14, filedate);
+          WRITE_32(header + 16, crc);
+          WRITE_32(header + 20, cpsize);
+          WRITE_32(header + 24, uncpsize);
+          WRITE_16(header + 28, fnsize);
+          WRITE_16(header + 30, extsize);
+          WRITE_16(header + 32, comsize);
+          WRITE_16(header + 34, 0);     /* disk # */
+          WRITE_16(header + 36, 0);     /* int attrb */
+          WRITE_32(header + 38, 0);     /* ext attrb */
+          WRITE_32(header + 42, currentOffset);
+          /* Header */
+          if (fwrite(header, 1, 46, fpOutCD) == 46) {
+            offsetCD += 46;
+
+            /* Filename */
+            if (fnsize > 0) {
+              if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
+                offsetCD += fnsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            } else {
+              err = Z_STREAM_ERROR;
+              break;
+            }
+
+            /* Extra field */
+            if (extsize > 0) {
+              if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
+                offsetCD += extsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            }
+
+            /* Comment field */
+            if (comsize > 0) {
+              if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {
+                offsetCD += comsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            }
+
+
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+
+        /* Success */
+        entries++;
+
+      } else {
+        break;
+      }
+    }
+
+    /* Final central directory  */
+    {
+      int entriesZip = entries;
+      char header[22];
+      char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";
+      int comsize = (int) strlen(comment);
+      if (entriesZip > 0xffff) {
+        entriesZip = 0xffff;
+      }
+      WRITE_32(header, 0x06054b50);
+      WRITE_16(header + 4, 0);    /* disk # */
+      WRITE_16(header + 6, 0);    /* disk # */
+      WRITE_16(header + 8, entriesZip);   /* hack */
+      WRITE_16(header + 10, entriesZip);  /* hack */
+      WRITE_32(header + 12, offsetCD);    /* size of CD */
+      WRITE_32(header + 16, offset);      /* offset to CD */
+      WRITE_16(header + 20, comsize);     /* comment */
+
+      /* Header */
+      if (fwrite(header, 1, 22, fpOutCD) == 22) {
+
+        /* Comment field */
+        if (comsize > 0) {
+          if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {
+            err = Z_ERRNO;
+          }
+        }
+
+      } else {
+        err = Z_ERRNO;
+      }
+    }
+
+    /* Final merge (file + central directory) */
+    fclose(fpOutCD);
+    if (err == Z_OK) {
+      fpOutCD = fopen(fileOutTmp, "rb");
+      if (fpOutCD != NULL) {
+        int nRead;
+        char buffer[8192];
+        while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) {
+          if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+        fclose(fpOutCD);
+      }
+    }
+
+    /* Close */
+    fclose(fpZip);
+    fclose(fpOut);
+
+    /* Wipe temporary file */
+    (void)remove(fileOutTmp);
+
+    /* Number of recovered entries */
+    if (err == Z_OK) {
+      if (nRecovered != NULL) {
+        *nRecovered = entries;
+      }
+      if (bytesRecovered != NULL) {
+        *bytesRecovered = totalBytes;
+      }
+    }
+  } else {
+    err = Z_STREAM_ERROR;
+  }
+  return err;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/mztools.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/mztools.h
new file mode 100644
index 00000000..88b34592
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/mztools.h
@@ -0,0 +1,31 @@
+/*
+  Additional tools for Minizip
+  Code: Xavier Roche '2004
+  License: Same as ZLIB (www.gzip.org)
+*/
+
+#ifndef _zip_tools_H
+#define _zip_tools_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#include "unzip.h"
+
+/* Repair a ZIP file (missing central directory)
+   file: file to recover
+   fileOut: output file after recovery
+   fileOutTmp: temporary file name used for recovery
+*/
+extern int ZEXPORT unzRepair(const char* file,
+                             const char* fileOut,
+                             const char* fileOutTmp,
+                             uLong* nRecovered,
+                             uLong* bytesRecovered);
+
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/unzip.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/unzip.c
new file mode 100644
index 00000000..7617f41f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/unzip.c
@@ -0,0 +1,2125 @@
+/* unzip.c -- IO for uncompress .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+
+  ------------------------------------------------------------------------------------
+  Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
+  compatibility with older software. The following is from the original crypt.c.
+  Code woven in by Terry Thorsen 1/2003.
+
+  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
+
+  See the accompanying file LICENSE, version 2000-Apr-09 or later
+  (the contents of which are also included in zip.h) for terms of use.
+  If, for some reason, all these files are missing, the Info-ZIP license
+  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
+
+        crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
+
+  The encryption/decryption parts of this source code (as opposed to the
+  non-echoing password parts) were originally written in Europe.  The
+  whole source package can be freely distributed, including from the USA.
+  (Prior to January 2000, re-export from the US was a violation of US law.)
+
+        This encryption code is a direct transcription of the algorithm from
+  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+  file (appnote.txt) is distributed with the PKZIP program (even in the
+  version without encryption capabilities).
+
+        ------------------------------------------------------------------------------------
+
+        Changes in unzip.c
+
+        2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
+  2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz*
+  2007-2008 - Even Rouault - Remove old C style function prototypes
+  2007-2008 - Even Rouault - Add unzip support for ZIP64
+
+        Copyright (C) 2007-2008 Even Rouault
+
+
+        Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
+  Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
+                                should only read the compressed/uncompressed size from the Zip64 format if
+                                the size from normal header was 0xFFFFFFFF
+  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
+        Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
+                                Patch created by Daniel Borca
+
+  Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
+
+  Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
+
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef NOUNCRYPT
+        #define NOUNCRYPT
+#endif
+
+#include "zlib.h"
+#include "unzip.h"
+
+#ifdef STDC
+#  include <stddef.h>
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+    extern int errno;
+#else
+#   include <errno.h>
+#endif
+
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+
+#ifndef CASESENSITIVITYDEFAULT_NO
+#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
+#    define CASESENSITIVITYDEFAULT_NO
+#  endif
+#endif
+
+
+#ifndef UNZ_BUFSIZE
+#define UNZ_BUFSIZE (16384)
+#endif
+
+#ifndef UNZ_MAXFILENAMEINZIP
+#define UNZ_MAXFILENAMEINZIP (256)
+#endif
+
+#ifndef ALLOC
+# define ALLOC(size) (malloc(size))
+#endif
+#ifndef TRYFREE
+# define TRYFREE(p) {if (p) free(p);}
+#endif
+
+#define SIZECENTRALDIRITEM (0x2e)
+#define SIZEZIPLOCALHEADER (0x1e)
+
+
+const char unz_copyright[] =
+   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+/* unz_file_info_interntal contain internal info about a file in zipfile*/
+typedef struct unz_file_info64_internal_s
+{
+    ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
+} unz_file_info64_internal;
+
+
+/* file_in_zip_read_info_s contain internal information about a file in zipfile,
+    when reading and decompress it */
+typedef struct
+{
+    char  *read_buffer;         /* internal buffer for compressed data */
+    z_stream stream;            /* zLib stream structure for inflate */
+
+#ifdef HAVE_BZIP2
+    bz_stream bstream;          /* bzLib stream structure for bziped */
+#endif
+
+    ZPOS64_T pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
+    uLong stream_initialised;   /* flag set if stream structure is initialised*/
+
+    ZPOS64_T offset_local_extrafield;/* offset of the local extra field */
+    uInt  size_local_extrafield;/* size of the local extra field */
+    ZPOS64_T pos_local_extrafield;   /* position in the local extra field in read*/
+    ZPOS64_T total_out_64;
+
+    uLong crc32;                /* crc32 of all data uncompressed */
+    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
+    ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */
+    ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/
+    zlib_filefunc64_32_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    uLong compression_method;   /* compression method (0==store) */
+    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    int   raw;
+} file_in_zip64_read_info_s;
+
+
+/* unz64_s contain internal information about the zipfile
+*/
+typedef struct
+{
+    zlib_filefunc64_32_def z_filefunc;
+    int is64bitOpenFunction;
+    voidpf filestream;        /* io structore of the zipfile */
+    unz_global_info64 gi;       /* public global information */
+    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    ZPOS64_T num_file;             /* number of the current file in the zipfile*/
+    ZPOS64_T pos_in_central_dir;   /* pos of the current file in the central dir*/
+    ZPOS64_T current_file_ok;      /* flag about the usability of the current file*/
+    ZPOS64_T central_pos;          /* position of the beginning of the central dir*/
+
+    ZPOS64_T size_central_dir;     /* size of the central directory  */
+    ZPOS64_T offset_central_dir;   /* offset of start of central directory with
+                                   respect to the starting disk number */
+
+    unz_file_info64 cur_file_info; /* public info about the current file in zip*/
+    unz_file_info64_internal cur_file_info_internal; /* private info about it*/
+    file_in_zip64_read_info_s* pfile_in_zip_read; /* structure about the current
+                                        file if we are decompressing it */
+    int encrypted;
+
+    int isZip64;
+
+#    ifndef NOUNCRYPT
+    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+    const unsigned long* pcrc_32_tab;
+#    endif
+} unz64_s;
+
+
+#ifndef NOUNCRYPT
+#include "crypt.h"
+#endif
+
+/* ===========================================================================
+     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
+   for end of file.
+   IN assertion: the stream s has been sucessfully opened for reading.
+*/
+
+
+local int unz64local_getByte OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    int *pi));
+
+local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi)
+{
+    unsigned char c;
+    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
+    if (err==1)
+    {
+        *pi = (int)c;
+        return UNZ_OK;
+    }
+    else
+    {
+        if (ZERROR64(*pzlib_filefunc_def,filestream))
+            return UNZ_ERRNO;
+        else
+            return UNZ_EOF;
+    }
+}
+
+
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets
+*/
+local int unz64local_getShort OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unz64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                             voidpf filestream,
+                             uLong *pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<8;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int unz64local_getLong OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unz64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                            voidpf filestream,
+                            uLong *pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<8;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<16;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<24;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int unz64local_getLong64 OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    ZPOS64_T *pX));
+
+
+local int unz64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                            voidpf filestream,
+                            ZPOS64_T *pX)
+{
+    ZPOS64_T x ;
+    int i = 0;
+    int err;
+
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (ZPOS64_T)i;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<8;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<16;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<24;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<32;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<40;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<48;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<56;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+/* My own strcmpi / strcasecmp */
+local int strcmpcasenosensitive_internal (const char* fileName1, const char* fileName2)
+{
+    for (;;)
+    {
+        char c1=*(fileName1++);
+        char c2=*(fileName2++);
+        if ((c1>='a') && (c1<='z'))
+            c1 -= 0x20;
+        if ((c2>='a') && (c2<='z'))
+            c2 -= 0x20;
+        if (c1=='\0')
+            return ((c2=='\0') ? 0 : -1);
+        if (c2=='\0')
+            return 1;
+        if (c1<c2)
+            return -1;
+        if (c1>c2)
+            return 1;
+    }
+}
+
+
+#ifdef  CASESENSITIVITYDEFAULT_NO
+#define CASESENSITIVITYDEFAULTVALUE 2
+#else
+#define CASESENSITIVITYDEFAULTVALUE 1
+#endif
+
+#ifndef STRCMPCASENOSENTIVEFUNCTION
+#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
+#endif
+
+/*
+   Compare two filename (fileName1,fileName2).
+   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+                                                                or strcasecmp)
+   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+        (like 1 on Unix, 2 on Windows)
+
+*/
+extern int ZEXPORT unzStringFileNameCompare (const char*  fileName1,
+                                                 const char*  fileName2,
+                                                 int iCaseSensitivity)
+
+{
+    if (iCaseSensitivity==0)
+        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
+
+    if (iCaseSensitivity==1)
+        return strcmp(fileName1,fileName2);
+
+    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
+}
+
+#ifndef BUFREADCOMMENT
+#define BUFREADCOMMENT (0x400)
+#endif
+
+/*
+  Locate the Central directory of a zipfile (at the end, just before
+    the global comment)
+*/
+local ZPOS64_T unz64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+    unsigned char* buf;
+    ZPOS64_T uSizeFile;
+    ZPOS64_T uBackRead;
+    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+    ZPOS64_T uPosFound=0;
+
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
+
+
+    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
+
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize;
+        ZPOS64_T uReadPos ;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
+
+        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
+
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
+
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    return uPosFound;
+}
+
+
+/*
+  Locate the Central directory 64 of a zipfile (at the end, just before
+    the global comment)
+*/
+local ZPOS64_T unz64local_SearchCentralDir64 OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream));
+
+local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                                      voidpf filestream)
+{
+    unsigned char* buf;
+    ZPOS64_T uSizeFile;
+    ZPOS64_T uBackRead;
+    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+    ZPOS64_T uPosFound=0;
+    uLong uL;
+                ZPOS64_T relativeOffset;
+
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
+
+
+    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
+
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize;
+        ZPOS64_T uReadPos;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
+
+        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
+
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
+
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    if (uPosFound == 0)
+        return 0;
+
+    /* Zip64 end of central directory locator */
+    if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return 0;
+
+    /* the signature, already checked */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+
+    /* number of the disk with the start of the zip64 end of  central directory */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+    if (uL != 0)
+        return 0;
+
+    /* relative offset of the zip64 end of central directory record */
+    if (unz64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=UNZ_OK)
+        return 0;
+
+    /* total number of disks */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+    if (uL != 1)
+        return 0;
+
+    /* Goto end of central directory record */
+    if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return 0;
+
+     /* the signature */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+
+    if (uL != 0x06064b50)
+        return 0;
+
+    return relativeOffset;
+}
+
+/*
+  Open a Zip file. path contain the full pathname (by example,
+     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
+     "zlib/zlib114.zip".
+     If the zipfile cannot be opened (file doesn't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is a unzFile Handle, usable with other function
+       of this unzip package.
+*/
+local unzFile unzOpenInternal (const void *path,
+                               zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
+                               int is64bitOpenFunction)
+{
+    unz64_s us;
+    unz64_s *s;
+    ZPOS64_T central_pos;
+    uLong   uL;
+
+    uLong number_disk;          /* number of the current dist, used for
+                                   spaning ZIP, unsupported, always 0*/
+    uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                                   for spaning ZIP, unsupported, always 0*/
+    ZPOS64_T number_entry_CD;      /* total number of entries in
+                                   the central dir
+                                   (same than number_entry on nospan) */
+
+    int err=UNZ_OK;
+
+    if (unz_copyright[0]!=' ')
+        return NULL;
+
+    us.z_filefunc.zseek32_file = NULL;
+    us.z_filefunc.ztell32_file = NULL;
+    if (pzlib_filefunc64_32_def==NULL)
+        fill_fopen64_filefunc(&us.z_filefunc.zfile_func64);
+    else
+        us.z_filefunc = *pzlib_filefunc64_32_def;
+    us.is64bitOpenFunction = is64bitOpenFunction;
+
+
+
+    us.filestream = ZOPEN64(us.z_filefunc,
+                                                 path,
+                                                 ZLIB_FILEFUNC_MODE_READ |
+                                                 ZLIB_FILEFUNC_MODE_EXISTING);
+    if (us.filestream==NULL)
+        return NULL;
+
+    central_pos = unz64local_SearchCentralDir64(&us.z_filefunc,us.filestream);
+    if (central_pos)
+    {
+        uLong uS;
+        ZPOS64_T uL64;
+
+        us.isZip64 = 1;
+
+        if (ZSEEK64(us.z_filefunc, us.filestream,
+                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
+
+        /* the signature, already checked */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* size of zip64 end of central directory record */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&uL64)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* version made by */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* version needed to extract */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of this disk */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of the disk with the start of the central directory */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* total number of entries in the central directory on this disk */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* total number of entries in the central directory */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        if ((number_entry_CD!=us.gi.number_entry) ||
+            (number_disk_with_CD!=0) ||
+            (number_disk!=0))
+            err=UNZ_BADZIPFILE;
+
+        /* size of the central directory */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* offset of start of central directory with respect to the
+          starting disk number */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        us.gi.size_comment = 0;
+    }
+    else
+    {
+        central_pos = unz64local_SearchCentralDir(&us.z_filefunc,us.filestream);
+        if (central_pos==0)
+            err=UNZ_ERRNO;
+
+        us.isZip64 = 0;
+
+        if (ZSEEK64(us.z_filefunc, us.filestream,
+                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err=UNZ_ERRNO;
+
+        /* the signature, already checked */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of this disk */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of the disk with the start of the central directory */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* total number of entries in the central dir on this disk */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.gi.number_entry = uL;
+
+        /* total number of entries in the central dir */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        number_entry_CD = uL;
+
+        if ((number_entry_CD!=us.gi.number_entry) ||
+            (number_disk_with_CD!=0) ||
+            (number_disk!=0))
+            err=UNZ_BADZIPFILE;
+
+        /* size of the central directory */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.size_central_dir = uL;
+
+        /* offset of start of central directory with respect to the
+            starting disk number */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.offset_central_dir = uL;
+
+        /* zipfile comment length */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
+            err=UNZ_ERRNO;
+    }
+
+    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
+        (err==UNZ_OK))
+        err=UNZ_BADZIPFILE;
+
+    if (err!=UNZ_OK)
+    {
+        ZCLOSE64(us.z_filefunc, us.filestream);
+        return NULL;
+    }
+
+    us.byte_before_the_zipfile = central_pos -
+                            (us.offset_central_dir+us.size_central_dir);
+    us.central_pos = central_pos;
+    us.pfile_in_zip_read = NULL;
+    us.encrypted = 0;
+
+
+    s=(unz64_s*)ALLOC(sizeof(unz64_s));
+    if( s != NULL)
+    {
+        *s=us;
+        unzGoToFirstFile((unzFile)s);
+    }
+    return (unzFile)s;
+}
+
+
+extern unzFile ZEXPORT unzOpen2 (const char *path,
+                                        zlib_filefunc_def* pzlib_filefunc32_def)
+{
+    if (pzlib_filefunc32_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
+        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 0);
+    }
+    else
+        return unzOpenInternal(path, NULL, 0);
+}
+
+extern unzFile ZEXPORT unzOpen2_64 (const void *path,
+                                     zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    if (pzlib_filefunc_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
+        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
+        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
+        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 1);
+    }
+    else
+        return unzOpenInternal(path, NULL, 1);
+}
+
+extern unzFile ZEXPORT unzOpen (const char *path)
+{
+    return unzOpenInternal(path, NULL, 0);
+}
+
+extern unzFile ZEXPORT unzOpen64 (const void *path)
+{
+    return unzOpenInternal(path, NULL, 1);
+}
+
+/*
+  Close a ZipFile opened with unzipOpen.
+  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
+    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+  return UNZ_OK if there is no problem. */
+extern int ZEXPORT unzClose (unzFile file)
+{
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    if (s->pfile_in_zip_read!=NULL)
+        unzCloseCurrentFile(file);
+
+    ZCLOSE64(s->z_filefunc, s->filestream);
+    TRYFREE(s);
+    return UNZ_OK;
+}
+
+
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem. */
+extern int ZEXPORT unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglobal_info)
+{
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    *pglobal_info=s->gi;
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info* pglobal_info32)
+{
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    /* to do : check if number_entry is not truncated */
+    pglobal_info32->number_entry = (uLong)s->gi.number_entry;
+    pglobal_info32->size_comment = s->gi.size_comment;
+    return UNZ_OK;
+}
+/*
+   Translate date/time from Dos format to tm_unz (readable more easilty)
+*/
+local void unz64local_DosDateToTmuDate (ZPOS64_T ulDosDate, tm_unz* ptm)
+{
+    ZPOS64_T uDate;
+    uDate = (ZPOS64_T)(ulDosDate>>16);
+    ptm->tm_mday = (uInt)(uDate&0x1f) ;
+    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
+    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
+
+    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
+    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
+    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
+}
+
+/*
+  Get Info about the current file in the zipfile, with internal only info
+*/
+local int unz64local_GetCurrentFileInfoInternal OF((unzFile file,
+                                                  unz_file_info64 *pfile_info,
+                                                  unz_file_info64_internal
+                                                  *pfile_info_internal,
+                                                  char *szFileName,
+                                                  uLong fileNameBufferSize,
+                                                  void *extraField,
+                                                  uLong extraFieldBufferSize,
+                                                  char *szComment,
+                                                  uLong commentBufferSize));
+
+local int unz64local_GetCurrentFileInfoInternal (unzFile file,
+                                                  unz_file_info64 *pfile_info,
+                                                  unz_file_info64_internal
+                                                  *pfile_info_internal,
+                                                  char *szFileName,
+                                                  uLong fileNameBufferSize,
+                                                  void *extraField,
+                                                  uLong extraFieldBufferSize,
+                                                  char *szComment,
+                                                  uLong commentBufferSize)
+{
+    unz64_s* s;
+    unz_file_info64 file_info;
+    unz_file_info64_internal file_info_internal;
+    int err=UNZ_OK;
+    uLong uMagic;
+    long lSeek=0;
+    uLong uL;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (ZSEEK64(s->z_filefunc, s->filestream,
+              s->pos_in_central_dir+s->byte_before_the_zipfile,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
+
+
+    /* we check the magic */
+    if (err==UNZ_OK)
+    {
+        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x02014b50)
+            err=UNZ_BADZIPFILE;
+    }
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    unz64local_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info.compressed_size = uL;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info.uncompressed_size = uL;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+                // relative offset of local header
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info_internal.offset_curfile = uL;
+
+    lSeek+=file_info.size_filename;
+    if ((err==UNZ_OK) && (szFileName!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_filename<fileNameBufferSize)
+        {
+            *(szFileName+file_info.size_filename)='\0';
+            uSizeRead = file_info.size_filename;
+        }
+        else
+            uSizeRead = fileNameBufferSize;
+
+        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
+            if (ZREAD64(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek -= uSizeRead;
+    }
+
+    // Read extrafield
+    if ((err==UNZ_OK) && (extraField!=NULL))
+    {
+        ZPOS64_T uSizeRead ;
+        if (file_info.size_file_extra<extraFieldBufferSize)
+            uSizeRead = file_info.size_file_extra;
+        else
+            uSizeRead = extraFieldBufferSize;
+
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+
+        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
+            if (ZREAD64(s->z_filefunc, s->filestream,extraField,(uLong)uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+
+        lSeek += file_info.size_file_extra - (uLong)uSizeRead;
+    }
+    else
+        lSeek += file_info.size_file_extra;
+
+
+    if ((err==UNZ_OK) && (file_info.size_file_extra != 0))
+    {
+                                uLong acc = 0;
+
+        // since lSeek now points to after the extra field we need to move back
+        lSeek -= file_info.size_file_extra;
+
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+
+        while(acc < file_info.size_file_extra)
+        {
+            uLong headerId;
+                                                uLong dataSize;
+
+            if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK)
+                err=UNZ_ERRNO;
+
+            if (unz64local_getShort(&s->z_filefunc, s->filestream,&dataSize) != UNZ_OK)
+                err=UNZ_ERRNO;
+
+            /* ZIP64 extra fields */
+            if (headerId == 0x0001)
+            {
+                                                        uLong uL;
+
+                                                                if(file_info.uncompressed_size == (ZPOS64_T)(unsigned long)-1)
+                                                                {
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+                                                                                        err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info.compressed_size == (ZPOS64_T)(unsigned long)-1)
+                                                                {
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+                                                                                  err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info_internal.offset_curfile == (ZPOS64_T)(unsigned long)-1)
+                                                                {
+                                                                        /* Relative Header offset */
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+                                                                                err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info.disk_num_start == (unsigned long)-1)
+                                                                {
+                                                                        /* Disk Start Number */
+                                                                        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+                                                                                err=UNZ_ERRNO;
+                                                                }
+
+            }
+            else
+            {
+                if (ZSEEK64(s->z_filefunc, s->filestream,dataSize,ZLIB_FILEFUNC_SEEK_CUR)!=0)
+                    err=UNZ_ERRNO;
+            }
+
+            acc += 2 + 2 + dataSize;
+        }
+    }
+
+    if ((err==UNZ_OK) && (szComment!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_file_comment<commentBufferSize)
+        {
+            *(szComment+file_info.size_file_comment)='\0';
+            uSizeRead = file_info.size_file_comment;
+        }
+        else
+            uSizeRead = commentBufferSize;
+
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+
+        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
+            if (ZREAD64(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek+=file_info.size_file_comment - uSizeRead;
+    }
+    else
+        lSeek+=file_info.size_file_comment;
+
+
+    if ((err==UNZ_OK) && (pfile_info!=NULL))
+        *pfile_info=file_info;
+
+    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
+        *pfile_info_internal=file_info_internal;
+
+    return err;
+}
+
+
+
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem.
+*/
+extern int ZEXPORT unzGetCurrentFileInfo64 (unzFile file,
+                                          unz_file_info64 * pfile_info,
+                                          char * szFileName, uLong fileNameBufferSize,
+                                          void *extraField, uLong extraFieldBufferSize,
+                                          char* szComment,  uLong commentBufferSize)
+{
+    return unz64local_GetCurrentFileInfoInternal(file,pfile_info,NULL,
+                                                szFileName,fileNameBufferSize,
+                                                extraField,extraFieldBufferSize,
+                                                szComment,commentBufferSize);
+}
+
+extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
+                                          unz_file_info * pfile_info,
+                                          char * szFileName, uLong fileNameBufferSize,
+                                          void *extraField, uLong extraFieldBufferSize,
+                                          char* szComment,  uLong commentBufferSize)
+{
+    int err;
+    unz_file_info64 file_info64;
+    err = unz64local_GetCurrentFileInfoInternal(file,&file_info64,NULL,
+                                                szFileName,fileNameBufferSize,
+                                                extraField,extraFieldBufferSize,
+                                                szComment,commentBufferSize);
+    if (err==UNZ_OK)
+    {
+        pfile_info->version = file_info64.version;
+        pfile_info->version_needed = file_info64.version_needed;
+        pfile_info->flag = file_info64.flag;
+        pfile_info->compression_method = file_info64.compression_method;
+        pfile_info->dosDate = file_info64.dosDate;
+        pfile_info->crc = file_info64.crc;
+
+        pfile_info->size_filename = file_info64.size_filename;
+        pfile_info->size_file_extra = file_info64.size_file_extra;
+        pfile_info->size_file_comment = file_info64.size_file_comment;
+
+        pfile_info->disk_num_start = file_info64.disk_num_start;
+        pfile_info->internal_fa = file_info64.internal_fa;
+        pfile_info->external_fa = file_info64.external_fa;
+
+        pfile_info->tmu_date = file_info64.tmu_date,
+
+
+        pfile_info->compressed_size = (uLong)file_info64.compressed_size;
+        pfile_info->uncompressed_size = (uLong)file_info64.uncompressed_size;
+
+    }
+    return err;
+}
+/*
+  Set the current file of the zipfile to the first file.
+  return UNZ_OK if there is no problem
+*/
+extern int ZEXPORT unzGoToFirstFile (unzFile file)
+{
+    int err=UNZ_OK;
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    s->pos_in_central_dir=s->offset_central_dir;
+    s->num_file=0;
+    err=unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                             &s->cur_file_info_internal,
+                                             NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+/*
+  Set the current file of the zipfile to the next file.
+  return UNZ_OK if there is no problem
+  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
+*/
+extern int ZEXPORT unzGoToNextFile (unzFile  file)
+{
+    unz64_s* s;
+    int err;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
+      if (s->num_file+1==s->gi.number_entry)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
+            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
+    s->num_file++;
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+
+/*
+  Try locate the file szFileName in the zipfile.
+  For the iCaseSensitivity signification, see unzipStringFileNameCompare
+
+  return value :
+  UNZ_OK if the file is found. It becomes the current file.
+  UNZ_END_OF_LIST_OF_FILE if the file is not found
+*/
+extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
+{
+    unz64_s* s;
+    int err;
+
+    /* We remember the 'current' position in the file so that we can jump
+     * back there if we fail.
+     */
+    unz_file_info64 cur_file_infoSaved;
+    unz_file_info64_internal cur_file_info_internalSaved;
+    ZPOS64_T num_fileSaved;
+    ZPOS64_T pos_in_central_dirSaved;
+
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+
+    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
+        return UNZ_PARAMERROR;
+
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    /* Save the current state */
+    num_fileSaved = s->num_file;
+    pos_in_central_dirSaved = s->pos_in_central_dir;
+    cur_file_infoSaved = s->cur_file_info;
+    cur_file_info_internalSaved = s->cur_file_info_internal;
+
+    err = unzGoToFirstFile(file);
+
+    while (err == UNZ_OK)
+    {
+        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
+        err = unzGetCurrentFileInfo64(file,NULL,
+                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
+                                    NULL,0,NULL,0);
+        if (err == UNZ_OK)
+        {
+            if (unzStringFileNameCompare(szCurrentFileName,
+                                            szFileName,iCaseSensitivity)==0)
+                return UNZ_OK;
+            err = unzGoToNextFile(file);
+        }
+    }
+
+    /* We failed, so restore the state of the 'current file' to where we
+     * were.
+     */
+    s->num_file = num_fileSaved ;
+    s->pos_in_central_dir = pos_in_central_dirSaved ;
+    s->cur_file_info = cur_file_infoSaved;
+    s->cur_file_info_internal = cur_file_info_internalSaved;
+    return err;
+}
+
+
+/*
+///////////////////////////////////////////
+// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
+// I need random access
+//
+// Further optimization could be realized by adding an ability
+// to cache the directory in memory. The goal being a single
+// comprehensive file read to put the file I need in a memory.
+*/
+
+/*
+typedef struct unz_file_pos_s
+{
+    ZPOS64_T pos_in_zip_directory;   // offset in file
+    ZPOS64_T num_of_file;            // # of file
+} unz_file_pos;
+*/
+
+extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos*  file_pos)
+{
+    unz64_s* s;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
+    file_pos->num_of_file           = s->num_file;
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzGetFilePos(
+    unzFile file,
+    unz_file_pos* file_pos)
+{
+    unz64_file_pos file_pos64;
+    int err = unzGetFilePos64(file,&file_pos64);
+    if (err==UNZ_OK)
+    {
+        file_pos->pos_in_zip_directory = (uLong)file_pos64.pos_in_zip_directory;
+        file_pos->num_of_file = (uLong)file_pos64.num_of_file;
+    }
+    return err;
+}
+
+extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos)
+{
+    unz64_s* s;
+    int err;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    /* jump to the right spot */
+    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
+    s->num_file           = file_pos->num_of_file;
+
+    /* set the current file */
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    /* return results */
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+extern int ZEXPORT unzGoToFilePos(
+    unzFile file,
+    unz_file_pos* file_pos)
+{
+    unz64_file_pos file_pos64;
+    if (file_pos == NULL)
+        return UNZ_PARAMERROR;
+
+    file_pos64.pos_in_zip_directory = file_pos->pos_in_zip_directory;
+    file_pos64.num_of_file = file_pos->num_of_file;
+    return unzGoToFilePos64(file,&file_pos64);
+}
+
+/*
+// Unzip Helper Functions - should be here?
+///////////////////////////////////////////
+*/
+
+/*
+  Read the local header of the current zipfile
+  Check the coherency of the local header and info in the end of central
+        directory about this file
+  store in *piSizeVar the size of extra info in local header
+        (filename and size of extra field data)
+*/
+local int unz64local_CheckCurrentFileCoherencyHeader (unz64_s* s, uInt* piSizeVar,
+                                                    ZPOS64_T * poffset_local_extrafield,
+                                                    uInt  * psize_local_extrafield)
+{
+    uLong uMagic,uData,uFlags;
+    uLong size_filename;
+    uLong size_extra_field;
+    int err=UNZ_OK;
+
+    *piSizeVar = 0;
+    *poffset_local_extrafield = 0;
+    *psize_local_extrafield = 0;
+
+    if (ZSEEK64(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
+                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+
+    if (err==UNZ_OK)
+    {
+        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x04034b50)
+            err=UNZ_BADZIPFILE;
+    }
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+/*
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
+        err=UNZ_BADZIPFILE;
+*/
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
+        err=UNZ_BADZIPFILE;
+
+    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
+/* #ifdef HAVE_BZIP2 */
+                         (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
+/* #endif */
+                         (s->cur_file_info.compression_method!=Z_DEFLATED))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
+        err=UNZ_ERRNO;
+    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
+        err=UNZ_ERRNO;
+    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
+        err=UNZ_BADZIPFILE;
+
+    *piSizeVar += (uInt)size_filename;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
+        err=UNZ_ERRNO;
+    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
+                                    SIZEZIPLOCALHEADER + size_filename;
+    *psize_local_extrafield = (uInt)size_extra_field;
+
+    *piSizeVar += (uInt)size_extra_field;
+
+    return err;
+}
+
+/*
+  Open for reading data the current file in the zipfile.
+  If there is no error and the file is opened, the return value is UNZ_OK.
+*/
+extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
+                                            int* level, int raw, const char* password)
+{
+    int err=UNZ_OK;
+    uInt iSizeVar;
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    ZPOS64_T offset_local_extrafield;  /* offset of the local extra field */
+    uInt  size_local_extrafield;    /* size of the local extra field */
+#    ifndef NOUNCRYPT
+    char source[12];
+#    else
+    if (password != NULL)
+        return UNZ_PARAMERROR;
+#    endif
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_PARAMERROR;
+
+    if (s->pfile_in_zip_read != NULL)
+        unzCloseCurrentFile(file);
+
+    if (unz64local_CheckCurrentFileCoherencyHeader(s,&iSizeVar, &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
+        return UNZ_BADZIPFILE;
+
+    pfile_in_zip_read_info = (file_in_zip64_read_info_s*)ALLOC(sizeof(file_in_zip64_read_info_s));
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_INTERNALERROR;
+
+    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
+    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
+    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
+    pfile_in_zip_read_info->pos_local_extrafield=0;
+    pfile_in_zip_read_info->raw=raw;
+
+    if (pfile_in_zip_read_info->read_buffer==NULL)
+    {
+        TRYFREE(pfile_in_zip_read_info);
+        return UNZ_INTERNALERROR;
+    }
+
+    pfile_in_zip_read_info->stream_initialised=0;
+
+    if (method!=NULL)
+        *method = (int)s->cur_file_info.compression_method;
+
+    if (level!=NULL)
+    {
+        *level = 6;
+        switch (s->cur_file_info.flag & 0x06)
+        {
+          case 6 : *level = 1; break;
+          case 4 : *level = 2; break;
+          case 2 : *level = 9; break;
+        }
+    }
+
+    if ((s->cur_file_info.compression_method!=0) &&
+/* #ifdef HAVE_BZIP2 */
+        (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
+/* #endif */
+        (s->cur_file_info.compression_method!=Z_DEFLATED))
+
+        err=UNZ_BADZIPFILE;
+
+    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
+    pfile_in_zip_read_info->crc32=0;
+    pfile_in_zip_read_info->total_out_64=0;
+    pfile_in_zip_read_info->compression_method = s->cur_file_info.compression_method;
+    pfile_in_zip_read_info->filestream=s->filestream;
+    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
+    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
+
+    pfile_in_zip_read_info->stream.total_out = 0;
+
+    if ((s->cur_file_info.compression_method==Z_BZIP2ED) && (!raw))
+    {
+#ifdef HAVE_BZIP2
+      pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0;
+      pfile_in_zip_read_info->bstream.bzfree = (free_func)0;
+      pfile_in_zip_read_info->bstream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->bstream.state = (voidpf)0;
+
+      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+      pfile_in_zip_read_info->stream.zfree = (free_func)0;
+      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
+      pfile_in_zip_read_info->stream.avail_in = 0;
+
+      err=BZ2_bzDecompressInit(&pfile_in_zip_read_info->bstream, 0, 0);
+      if (err == Z_OK)
+        pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED;
+      else
+      {
+        TRYFREE(pfile_in_zip_read_info);
+        return err;
+      }
+#else
+      pfile_in_zip_read_info->raw=1;
+#endif
+    }
+    else if ((s->cur_file_info.compression_method==Z_DEFLATED) && (!raw))
+    {
+      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+      pfile_in_zip_read_info->stream.zfree = (free_func)0;
+      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = 0;
+      pfile_in_zip_read_info->stream.avail_in = 0;
+
+      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
+      if (err == Z_OK)
+        pfile_in_zip_read_info->stream_initialised=Z_DEFLATED;
+      else
+      {
+        TRYFREE(pfile_in_zip_read_info);
+        return err;
+      }
+        /* windowBits is passed < 0 to tell that there is no zlib header.
+         * Note that in this case inflate *requires* an extra "dummy" byte
+         * after the compressed stream in order to complete decompression and
+         * return Z_STREAM_END.
+         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
+         * size of both compressed and uncompressed data
+         */
+    }
+    pfile_in_zip_read_info->rest_read_compressed =
+            s->cur_file_info.compressed_size ;
+    pfile_in_zip_read_info->rest_read_uncompressed =
+            s->cur_file_info.uncompressed_size ;
+
+
+    pfile_in_zip_read_info->pos_in_zipfile =
+            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
+              iSizeVar;
+
+    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
+
+    s->pfile_in_zip_read = pfile_in_zip_read_info;
+                s->encrypted = 0;
+
+#    ifndef NOUNCRYPT
+    if (password != NULL)
+    {
+        int i;
+        s->pcrc_32_tab = get_crc_table();
+        init_keys(password,s->keys,s->pcrc_32_tab);
+        if (ZSEEK64(s->z_filefunc, s->filestream,
+                  s->pfile_in_zip_read->pos_in_zipfile +
+                     s->pfile_in_zip_read->byte_before_the_zipfile,
+                  SEEK_SET)!=0)
+            return UNZ_INTERNALERROR;
+        if(ZREAD64(s->z_filefunc, s->filestream,source, 12)<12)
+            return UNZ_INTERNALERROR;
+
+        for (i = 0; i<12; i++)
+            zdecode(s->keys,s->pcrc_32_tab,source[i]);
+
+        s->pfile_in_zip_read->pos_in_zipfile+=12;
+        s->encrypted=1;
+    }
+#    endif
+
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzOpenCurrentFile (unzFile file)
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
+}
+
+extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char*  password)
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
+}
+
+extern int ZEXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw)
+{
+    return unzOpenCurrentFile3(file, method, level, raw, NULL);
+}
+
+/** Addition for GDAL : START */
+
+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64( unzFile file)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    s=(unz64_s*)file;
+    if (file==NULL)
+        return 0; //UNZ_PARAMERROR;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+    if (pfile_in_zip_read_info==NULL)
+        return 0; //UNZ_PARAMERROR;
+    return pfile_in_zip_read_info->pos_in_zipfile +
+                         pfile_in_zip_read_info->byte_before_the_zipfile;
+}
+
+/** Addition for GDAL : END */
+
+/*
+  Read bytes from the current file.
+  buf contain buffer where data must be copied
+  len the size of buf.
+
+  return the number of byte copied if somes bytes are copied
+  return 0 if the end of file was reached
+  return <0 with error code if there is an error
+    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+*/
+extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
+{
+    int err=UNZ_OK;
+    uInt iRead = 0;
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+
+    if ((pfile_in_zip_read_info->read_buffer == NULL))
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (len==0)
+        return 0;
+
+    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
+
+    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
+
+    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
+        (!(pfile_in_zip_read_info->raw)))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+
+    if ((len>pfile_in_zip_read_info->rest_read_compressed+
+           pfile_in_zip_read_info->stream.avail_in) &&
+         (pfile_in_zip_read_info->raw))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_compressed+
+            pfile_in_zip_read_info->stream.avail_in;
+
+    while (pfile_in_zip_read_info->stream.avail_out>0)
+    {
+        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
+            (pfile_in_zip_read_info->rest_read_compressed>0))
+        {
+            uInt uReadThis = UNZ_BUFSIZE;
+            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
+                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
+            if (uReadThis == 0)
+                return UNZ_EOF;
+            if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->pos_in_zipfile +
+                         pfile_in_zip_read_info->byte_before_the_zipfile,
+                         ZLIB_FILEFUNC_SEEK_SET)!=0)
+                return UNZ_ERRNO;
+            if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->read_buffer,
+                      uReadThis)!=uReadThis)
+                return UNZ_ERRNO;
+
+
+#            ifndef NOUNCRYPT
+            if(s->encrypted)
+            {
+                uInt i;
+                for(i=0;i<uReadThis;i++)
+                  pfile_in_zip_read_info->read_buffer[i] =
+                      zdecode(s->keys,s->pcrc_32_tab,
+                              pfile_in_zip_read_info->read_buffer[i]);
+            }
+#            endif
+
+
+            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
+
+            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
+
+            pfile_in_zip_read_info->stream.next_in =
+                (Bytef*)pfile_in_zip_read_info->read_buffer;
+            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
+        }
+
+        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
+        {
+            uInt uDoCopy,i ;
+
+            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                return (iRead==0) ? UNZ_EOF : iRead;
+
+            if (pfile_in_zip_read_info->stream.avail_out <
+                            pfile_in_zip_read_info->stream.avail_in)
+                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
+            else
+                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
+
+            for (i=0;i<uDoCopy;i++)
+                *(pfile_in_zip_read_info->stream.next_out+i) =
+                        *(pfile_in_zip_read_info->stream.next_in+i);
+
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uDoCopy;
+
+            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
+                                pfile_in_zip_read_info->stream.next_out,
+                                uDoCopy);
+            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
+            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
+            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
+            pfile_in_zip_read_info->stream.next_out += uDoCopy;
+            pfile_in_zip_read_info->stream.next_in += uDoCopy;
+            pfile_in_zip_read_info->stream.total_out += uDoCopy;
+            iRead += uDoCopy;
+        }
+        else if (pfile_in_zip_read_info->compression_method==Z_BZIP2ED)
+        {
+#ifdef HAVE_BZIP2
+            uLong uTotalOutBefore,uTotalOutAfter;
+            const Bytef *bufBefore;
+            uLong uOutThis;
+
+            pfile_in_zip_read_info->bstream.next_in        = (char*)pfile_in_zip_read_info->stream.next_in;
+            pfile_in_zip_read_info->bstream.avail_in       = pfile_in_zip_read_info->stream.avail_in;
+            pfile_in_zip_read_info->bstream.total_in_lo32  = pfile_in_zip_read_info->stream.total_in;
+            pfile_in_zip_read_info->bstream.total_in_hi32  = 0;
+            pfile_in_zip_read_info->bstream.next_out       = (char*)pfile_in_zip_read_info->stream.next_out;
+            pfile_in_zip_read_info->bstream.avail_out      = pfile_in_zip_read_info->stream.avail_out;
+            pfile_in_zip_read_info->bstream.total_out_lo32 = pfile_in_zip_read_info->stream.total_out;
+            pfile_in_zip_read_info->bstream.total_out_hi32 = 0;
+
+            uTotalOutBefore = pfile_in_zip_read_info->bstream.total_out_lo32;
+            bufBefore = (const Bytef *)pfile_in_zip_read_info->bstream.next_out;
+
+            err=BZ2_bzDecompress(&pfile_in_zip_read_info->bstream);
+
+            uTotalOutAfter = pfile_in_zip_read_info->bstream.total_out_lo32;
+            uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
+
+            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,bufBefore, (uInt)(uOutThis));
+            pfile_in_zip_read_info->rest_read_uncompressed -= uOutThis;
+            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
+
+            pfile_in_zip_read_info->stream.next_in   = (Bytef*)pfile_in_zip_read_info->bstream.next_in;
+            pfile_in_zip_read_info->stream.avail_in  = pfile_in_zip_read_info->bstream.avail_in;
+            pfile_in_zip_read_info->stream.total_in  = pfile_in_zip_read_info->bstream.total_in_lo32;
+            pfile_in_zip_read_info->stream.next_out  = (Bytef*)pfile_in_zip_read_info->bstream.next_out;
+            pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->bstream.avail_out;
+            pfile_in_zip_read_info->stream.total_out = pfile_in_zip_read_info->bstream.total_out_lo32;
+
+            if (err==BZ_STREAM_END)
+              return (iRead==0) ? UNZ_EOF : iRead;
+            if (err!=BZ_OK)
+              break;
+#endif
+        } // end Z_BZIP2ED
+        else
+        {
+            ZPOS64_T uTotalOutBefore,uTotalOutAfter;
+            const Bytef *bufBefore;
+            ZPOS64_T uOutThis;
+            int flush=Z_SYNC_FLUSH;
+
+            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
+            bufBefore = pfile_in_zip_read_info->stream.next_out;
+
+            /*
+            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
+                     pfile_in_zip_read_info->stream.avail_out) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                flush = Z_FINISH;
+            */
+            err=inflate(&pfile_in_zip_read_info->stream,flush);
+
+            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
+              err = Z_DATA_ERROR;
+
+            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
+            uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
+
+            pfile_in_zip_read_info->crc32 =
+                crc32(pfile_in_zip_read_info->crc32,bufBefore,
+                        (uInt)(uOutThis));
+
+            pfile_in_zip_read_info->rest_read_uncompressed -=
+                uOutThis;
+
+            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
+
+            if (err==Z_STREAM_END)
+                return (iRead==0) ? UNZ_EOF : iRead;
+            if (err!=Z_OK)
+                break;
+        }
+    }
+
+    if (err==Z_OK)
+        return iRead;
+    return err;
+}
+
+
+/*
+  Give the current position in uncompressed data
+*/
+extern z_off_t ZEXPORT unztell (unzFile file)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
+}
+
+extern ZPOS64_T ZEXPORT unztell64 (unzFile file)
+{
+
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return (ZPOS64_T)-1;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return (ZPOS64_T)-1;
+
+    return pfile_in_zip_read_info->total_out_64;
+}
+
+
+/*
+  return 1 if the end of file was reached, 0 elsewhere
+*/
+extern int ZEXPORT unzeof (unzFile file)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
+        return 1;
+    else
+        return 0;
+}
+
+
+
+/*
+Read extra field from the current file (opened by unzOpenCurrentFile)
+This is the local-header version of the extra field (sometimes, there is
+more info in the local-header version than in the central-header)
+
+  if buf==NULL, it return the size of the local extra field that can be read
+
+  if buf!=NULL, len is the size of the buffer, the extra header is copied in
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
+*/
+extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    uInt read_now;
+    ZPOS64_T size_to_read;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
+                pfile_in_zip_read_info->pos_local_extrafield);
+
+    if (buf==NULL)
+        return (int)size_to_read;
+
+    if (len>size_to_read)
+        read_now = (uInt)size_to_read;
+    else
+        read_now = (uInt)len ;
+
+    if (read_now==0)
+        return 0;
+
+    if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              pfile_in_zip_read_info->offset_local_extrafield +
+              pfile_in_zip_read_info->pos_local_extrafield,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              buf,read_now)!=read_now)
+        return UNZ_ERRNO;
+
+    return (int)read_now;
+}
+
+/*
+  Close the file in zip opened with unzipOpenCurrentFile
+  Return UNZ_CRCERROR if all the file was read but the CRC is not good
+*/
+extern int ZEXPORT unzCloseCurrentFile (unzFile file)
+{
+    int err=UNZ_OK;
+
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+
+    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
+        (!pfile_in_zip_read_info->raw))
+    {
+        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
+            err=UNZ_CRCERROR;
+    }
+
+
+    TRYFREE(pfile_in_zip_read_info->read_buffer);
+    pfile_in_zip_read_info->read_buffer = NULL;
+    if (pfile_in_zip_read_info->stream_initialised == Z_DEFLATED)
+        inflateEnd(&pfile_in_zip_read_info->stream);
+#ifdef HAVE_BZIP2
+    else if (pfile_in_zip_read_info->stream_initialised == Z_BZIP2ED)
+        BZ2_bzDecompressEnd(&pfile_in_zip_read_info->bstream);
+#endif
+
+
+    pfile_in_zip_read_info->stream_initialised = 0;
+    TRYFREE(pfile_in_zip_read_info);
+
+    s->pfile_in_zip_read=NULL;
+
+    return err;
+}
+
+
+/*
+  Get the global comment string of the ZipFile, in the szComment buffer.
+  uSizeBuf is the size of the szComment buffer.
+  return the number of byte copied or an error code <0
+*/
+extern int ZEXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uSizeBuf)
+{
+    unz64_s* s;
+    uLong uReadThis ;
+    if (file==NULL)
+        return (int)UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    uReadThis = uSizeBuf;
+    if (uReadThis>s->gi.size_comment)
+        uReadThis = s->gi.size_comment;
+
+    if (ZSEEK64(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (uReadThis>0)
+    {
+      *szComment='\0';
+      if (ZREAD64(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
+        return UNZ_ERRNO;
+    }
+
+    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
+        *(szComment+s->gi.size_comment)='\0';
+    return (int)uReadThis;
+}
+
+/* Additions by RX '2004 */
+extern ZPOS64_T ZEXPORT unzGetOffset64(unzFile file)
+{
+    unz64_s* s;
+
+    if (file==NULL)
+          return 0; //UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+      return 0;
+    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
+      if (s->num_file==s->gi.number_entry)
+         return 0;
+    return s->pos_in_central_dir;
+}
+
+extern uLong ZEXPORT unzGetOffset (unzFile file)
+{
+    ZPOS64_T offset64;
+
+    if (file==NULL)
+          return 0; //UNZ_PARAMERROR;
+    offset64 = unzGetOffset64(file);
+    return (uLong)offset64;
+}
+
+extern int ZEXPORT unzSetOffset64(unzFile file, ZPOS64_T pos)
+{
+    unz64_s* s;
+    int err;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    s->pos_in_central_dir = pos;
+    s->num_file = s->gi.number_entry;      /* hack */
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                              &s->cur_file_info_internal,
+                                              NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos)
+{
+    return unzSetOffset64(file,pos);
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/unzip.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/unzip.h
new file mode 100644
index 00000000..3183968b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/unzip.h
@@ -0,0 +1,437 @@
+/* unzip.h -- IO for uncompress .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         ---------------------------------------------------------------------------------
+
+        Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  ---------------------------------------------------------------------------------
+
+        Changes
+
+        See header of unzip64.c
+
+*/
+
+#ifndef _unz64_H
+#define _unz64_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#ifndef  _ZLIBIOAPI_H
+#include "ioapi.h"
+#endif
+
+#ifdef HAVE_BZIP2
+#include "bzlib.h"
+#endif
+
+#define Z_BZIP2ED 12
+
+#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
+/* like the STRICT of WIN32, we define a pointer that cannot be converted
+    from (void*) without cast */
+typedef struct TagunzFile__ { int unused; } unzFile__;
+typedef unzFile__ *unzFile;
+#else
+typedef voidp unzFile;
+#endif
+
+
+#define UNZ_OK                          (0)
+#define UNZ_END_OF_LIST_OF_FILE         (-100)
+#define UNZ_ERRNO                       (Z_ERRNO)
+#define UNZ_EOF                         (0)
+#define UNZ_PARAMERROR                  (-102)
+#define UNZ_BADZIPFILE                  (-103)
+#define UNZ_INTERNALERROR               (-104)
+#define UNZ_CRCERROR                    (-105)
+
+/* tm_unz contain date/time info */
+typedef struct tm_unz_s
+{
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
+} tm_unz;
+
+/* unz_global_info structure contain global data about the ZIPfile
+   These data comes from the end of central dir */
+typedef struct unz_global_info64_s
+{
+    ZPOS64_T number_entry;         /* total number of entries in
+                                     the central dir on this disk */
+    uLong size_comment;         /* size of the global comment of the zipfile */
+} unz_global_info64;
+
+typedef struct unz_global_info_s
+{
+    uLong number_entry;         /* total number of entries in
+                                     the central dir on this disk */
+    uLong size_comment;         /* size of the global comment of the zipfile */
+} unz_global_info;
+
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_info64_s
+{
+    uLong version;              /* version made by                 2 bytes */
+    uLong version_needed;       /* version needed to extract       2 bytes */
+    uLong flag;                 /* general purpose bit flag        2 bytes */
+    uLong compression_method;   /* compression method              2 bytes */
+    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+    uLong crc;                  /* crc-32                          4 bytes */
+    ZPOS64_T compressed_size;   /* compressed size                 8 bytes */
+    ZPOS64_T uncompressed_size; /* uncompressed size               8 bytes */
+    uLong size_filename;        /* filename length                 2 bytes */
+    uLong size_file_extra;      /* extra field length              2 bytes */
+    uLong size_file_comment;    /* file comment length             2 bytes */
+
+    uLong disk_num_start;       /* disk number start               2 bytes */
+    uLong internal_fa;          /* internal file attributes        2 bytes */
+    uLong external_fa;          /* external file attributes        4 bytes */
+
+    tm_unz tmu_date;
+} unz_file_info64;
+
+typedef struct unz_file_info_s
+{
+    uLong version;              /* version made by                 2 bytes */
+    uLong version_needed;       /* version needed to extract       2 bytes */
+    uLong flag;                 /* general purpose bit flag        2 bytes */
+    uLong compression_method;   /* compression method              2 bytes */
+    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+    uLong crc;                  /* crc-32                          4 bytes */
+    uLong compressed_size;      /* compressed size                 4 bytes */
+    uLong uncompressed_size;    /* uncompressed size               4 bytes */
+    uLong size_filename;        /* filename length                 2 bytes */
+    uLong size_file_extra;      /* extra field length              2 bytes */
+    uLong size_file_comment;    /* file comment length             2 bytes */
+
+    uLong disk_num_start;       /* disk number start               2 bytes */
+    uLong internal_fa;          /* internal file attributes        2 bytes */
+    uLong external_fa;          /* external file attributes        4 bytes */
+
+    tm_unz tmu_date;
+} unz_file_info;
+
+extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
+                                                 const char* fileName2,
+                                                 int iCaseSensitivity));
+/*
+   Compare two filename (fileName1,fileName2).
+   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+                                or strcasecmp)
+   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+    (like 1 on Unix, 2 on Windows)
+*/
+
+
+extern unzFile ZEXPORT unzOpen OF((const char *path));
+extern unzFile ZEXPORT unzOpen64 OF((const void *path));
+/*
+  Open a Zip file. path contain the full pathname (by example,
+     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
+     "zlib/zlib113.zip".
+     If the zipfile cannot be opened (file don't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is a unzFile Handle, usable with other function
+       of this unzip package.
+     the "64" function take a const void* pointer, because the path is just the
+       value passed to the open64_file_func callback.
+     Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path
+       is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char*
+       does not describe the reality
+*/
+
+
+extern unzFile ZEXPORT unzOpen2 OF((const char *path,
+                                    zlib_filefunc_def* pzlib_filefunc_def));
+/*
+   Open a Zip file, like unzOpen, but provide a set of file low level API
+      for read/write the zip file (see ioapi.h)
+*/
+
+extern unzFile ZEXPORT unzOpen2_64 OF((const void *path,
+                                    zlib_filefunc64_def* pzlib_filefunc_def));
+/*
+   Open a Zip file, like unz64Open, but provide a set of file low level API
+      for read/write the zip file (see ioapi.h)
+*/
+
+extern int ZEXPORT unzClose OF((unzFile file));
+/*
+  Close a ZipFile opened with unzipOpen.
+  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
+    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+  return UNZ_OK if there is no problem. */
+
+extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
+                                        unz_global_info *pglobal_info));
+
+extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file,
+                                        unz_global_info64 *pglobal_info));
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem. */
+
+
+extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
+                                           char *szComment,
+                                           uLong uSizeBuf));
+/*
+  Get the global comment string of the ZipFile, in the szComment buffer.
+  uSizeBuf is the size of the szComment buffer.
+  return the number of byte copied or an error code <0
+*/
+
+
+/***************************************************************************/
+/* Unzip package allow you browse the directory of the zipfile */
+
+extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
+/*
+  Set the current file of the zipfile to the first file.
+  return UNZ_OK if there is no problem
+*/
+
+extern int ZEXPORT unzGoToNextFile OF((unzFile file));
+/*
+  Set the current file of the zipfile to the next file.
+  return UNZ_OK if there is no problem
+  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
+*/
+
+extern int ZEXPORT unzLocateFile OF((unzFile file,
+                     const char *szFileName,
+                     int iCaseSensitivity));
+/*
+  Try locate the file szFileName in the zipfile.
+  For the iCaseSensitivity signification, see unzStringFileNameCompare
+
+  return value :
+  UNZ_OK if the file is found. It becomes the current file.
+  UNZ_END_OF_LIST_OF_FILE if the file is not found
+*/
+
+
+/* ****************************************** */
+/* Ryan supplied functions */
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_pos_s
+{
+    uLong pos_in_zip_directory;   /* offset in zip file directory */
+    uLong num_of_file;            /* # of file */
+} unz_file_pos;
+
+extern int ZEXPORT unzGetFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+extern int ZEXPORT unzGoToFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+typedef struct unz64_file_pos_s
+{
+    ZPOS64_T pos_in_zip_directory;   /* offset in zip file directory */
+    ZPOS64_T num_of_file;            /* # of file */
+} unz64_file_pos;
+
+extern int ZEXPORT unzGetFilePos64(
+    unzFile file,
+    unz64_file_pos* file_pos);
+
+extern int ZEXPORT unzGoToFilePos64(
+    unzFile file,
+    const unz64_file_pos* file_pos);
+
+/* ****************************************** */
+
+extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file,
+                         unz_file_info64 *pfile_info,
+                         char *szFileName,
+                         uLong fileNameBufferSize,
+                         void *extraField,
+                         uLong extraFieldBufferSize,
+                         char *szComment,
+                         uLong commentBufferSize));
+
+extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
+                         unz_file_info *pfile_info,
+                         char *szFileName,
+                         uLong fileNameBufferSize,
+                         void *extraField,
+                         uLong extraFieldBufferSize,
+                         char *szComment,
+                         uLong commentBufferSize));
+/*
+  Get Info about the current file
+  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
+        the current file
+  if szFileName!=NULL, the filemane string will be copied in szFileName
+            (fileNameBufferSize is the size of the buffer)
+  if extraField!=NULL, the extra field information will be copied in extraField
+            (extraFieldBufferSize is the size of the buffer).
+            This is the Central-header version of the extra field
+  if szComment!=NULL, the comment string of the file will be copied in szComment
+            (commentBufferSize is the size of the buffer)
+*/
+
+
+/** Addition for GDAL : START */
+
+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
+
+/** Addition for GDAL : END */
+
+
+/***************************************************************************/
+/* for reading the content of the current zipfile, you can open it, read data
+   from it, and close it (you can close it before reading all the file)
+   */
+
+extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
+/*
+  Open for reading data the current file in the zipfile.
+  If there is no error, the return value is UNZ_OK.
+*/
+
+extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
+                                                  const char* password));
+/*
+  Open for reading data the current file in the zipfile.
+  password is a crypting password
+  If there is no error, the return value is UNZ_OK.
+*/
+
+extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw,
+                                           const char* password));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+
+extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
+/*
+  Close the file in zip opened with unzOpenCurrentFile
+  Return UNZ_CRCERROR if all the file was read but the CRC is not good
+*/
+
+extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
+                      voidp buf,
+                      unsigned len));
+/*
+  Read bytes from the current file (opened by unzOpenCurrentFile)
+  buf contain buffer where data must be copied
+  len the size of buf.
+
+  return the number of byte copied if somes bytes are copied
+  return 0 if the end of file was reached
+  return <0 with error code if there is an error
+    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+*/
+
+extern z_off_t ZEXPORT unztell OF((unzFile file));
+
+extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));
+/*
+  Give the current position in uncompressed data
+*/
+
+extern int ZEXPORT unzeof OF((unzFile file));
+/*
+  return 1 if the end of file was reached, 0 elsewhere
+*/
+
+extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
+                                             voidp buf,
+                                             unsigned len));
+/*
+  Read extra field from the current file (opened by unzOpenCurrentFile)
+  This is the local-header version of the extra field (sometimes, there is
+    more info in the local-header version than in the central-header)
+
+  if buf==NULL, it return the size of the local extra field
+
+  if buf!=NULL, len is the size of the buffer, the extra header is copied in
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
+*/
+
+/***************************************************************************/
+
+/* Get the current file offset */
+extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);
+extern uLong ZEXPORT unzGetOffset (unzFile file);
+
+/* Set the current file offset */
+extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _unz64_H */
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/zip.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/zip.c
new file mode 100644
index 00000000..3c34fc8b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/zip.c
@@ -0,0 +1,2004 @@
+/* zip.c -- IO on .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         Changes
+   Oct-2009 - Mathias Svensson - Remove old C style function prototypes
+   Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
+   Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
+   Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
+                                 It is used when recreting zip archive with RAW when deleting items from a zip.
+                                 ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed.
+   Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
+   Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
+
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include "zlib.h"
+#include "zip.h"
+
+#ifdef STDC
+#  include <stddef.h>
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+    extern int errno;
+#else
+#   include <errno.h>
+#endif
+
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+#ifndef VERSIONMADEBY
+# define VERSIONMADEBY   (0x0) /* platform depedent */
+#endif
+
+#ifndef Z_BUFSIZE
+#define Z_BUFSIZE (64*1024) //(16384)
+#endif
+
+#ifndef Z_MAXFILENAMEINZIP
+#define Z_MAXFILENAMEINZIP (256)
+#endif
+
+#ifndef ALLOC
+# define ALLOC(size) (malloc(size))
+#endif
+#ifndef TRYFREE
+# define TRYFREE(p) {if (p) free(p);}
+#endif
+
+/*
+#define SIZECENTRALDIRITEM (0x2e)
+#define SIZEZIPLOCALHEADER (0x1e)
+*/
+
+/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
+
+
+// NOT sure that this work on ALL platform
+#define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
+
+#ifndef SEEK_CUR
+#define SEEK_CUR    1
+#endif
+
+#ifndef SEEK_END
+#define SEEK_END    2
+#endif
+
+#ifndef SEEK_SET
+#define SEEK_SET    0
+#endif
+
+#ifndef DEF_MEM_LEVEL
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+#endif
+const char zip_copyright[] =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+
+#define SIZEDATA_INDATABLOCK (4096-(4*4))
+
+#define LOCALHEADERMAGIC    (0x04034b50)
+#define CENTRALHEADERMAGIC  (0x02014b50)
+#define ENDHEADERMAGIC      (0x06054b50)
+#define ZIP64ENDHEADERMAGIC      (0x6064b50)
+#define ZIP64ENDLOCHEADERMAGIC   (0x7064b50)
+
+#define FLAG_LOCALHEADER_OFFSET (0x06)
+#define CRC_LOCALHEADER_OFFSET  (0x0e)
+
+#define SIZECENTRALHEADER (0x2e) /* 46 */
+
+typedef struct linkedlist_datablock_internal_s
+{
+  struct linkedlist_datablock_internal_s* next_datablock;
+  uLong  avail_in_this_block;
+  uLong  filled_in_this_block;
+  uLong  unused; /* for future use and alignement */
+  unsigned char data[SIZEDATA_INDATABLOCK];
+} linkedlist_datablock_internal;
+
+typedef struct linkedlist_data_s
+{
+    linkedlist_datablock_internal* first_block;
+    linkedlist_datablock_internal* last_block;
+} linkedlist_data;
+
+
+typedef struct
+{
+    z_stream stream;            /* zLib stream structure for inflate */
+#ifdef HAVE_BZIP2
+    bz_stream bstream;          /* bzLib stream structure for bziped */
+#endif
+
+    int  stream_initialised;    /* 1 is stream is initialised */
+    uInt pos_in_buffered_data;  /* last written byte in buffered_data */
+
+    ZPOS64_T pos_local_header;     /* offset of the local header of the file
+                                     currenty writing */
+    char* central_header;       /* central header data for the current file */
+    uLong size_centralExtra;
+    uLong size_centralheader;   /* size of the central header for cur file */
+    uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */
+    uLong flag;                 /* flag of the file currently writing */
+
+    int  method;                /* compression method of file currenty wr.*/
+    int  raw;                   /* 1 for directly writing raw data */
+    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
+    uLong dosDate;
+    uLong crc32;
+    int  encrypt;
+    int  zip64;               /* Add ZIP64 extened information in the extra field */
+    ZPOS64_T pos_zip64extrainfo;
+    ZPOS64_T totalCompressedData;
+    ZPOS64_T totalUncompressedData;
+#ifndef NOCRYPT
+    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+    const unsigned long* pcrc_32_tab;
+    int crypt_header_size;
+#endif
+} curfile64_info;
+
+typedef struct
+{
+    zlib_filefunc64_32_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    linkedlist_data central_dir;/* datablock with central dir in construction*/
+    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
+    curfile64_info ci;            /* info on the file curretly writing */
+
+    ZPOS64_T begin_pos;            /* position of the beginning of the zipfile */
+    ZPOS64_T add_position_when_writting_offset;
+    ZPOS64_T number_entry;
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    char *globalcomment;
+#endif
+
+} zip64_internal;
+
+
+#ifndef NOCRYPT
+#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+#include "crypt.h"
+#endif
+
+local linkedlist_datablock_internal* allocate_new_datablock()
+{
+    linkedlist_datablock_internal* ldi;
+    ldi = (linkedlist_datablock_internal*)
+                 ALLOC(sizeof(linkedlist_datablock_internal));
+    if (ldi!=NULL)
+    {
+        ldi->next_datablock = NULL ;
+        ldi->filled_in_this_block = 0 ;
+        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
+    }
+    return ldi;
+}
+
+local void free_datablock(linkedlist_datablock_internal* ldi)
+{
+    while (ldi!=NULL)
+    {
+        linkedlist_datablock_internal* ldinext = ldi->next_datablock;
+        TRYFREE(ldi);
+        ldi = ldinext;
+    }
+}
+
+local void init_linkedlist(linkedlist_data* ll)
+{
+    ll->first_block = ll->last_block = NULL;
+}
+
+local void free_linkedlist(linkedlist_data* ll)
+{
+    free_datablock(ll->first_block);
+    ll->first_block = ll->last_block = NULL;
+}
+
+
+local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
+{
+    linkedlist_datablock_internal* ldi;
+    const unsigned char* from_copy;
+
+    if (ll==NULL)
+        return ZIP_INTERNALERROR;
+
+    if (ll->last_block == NULL)
+    {
+        ll->first_block = ll->last_block = allocate_new_datablock();
+        if (ll->first_block == NULL)
+            return ZIP_INTERNALERROR;
+    }
+
+    ldi = ll->last_block;
+    from_copy = (unsigned char*)buf;
+
+    while (len>0)
+    {
+        uInt copy_this;
+        uInt i;
+        unsigned char* to_copy;
+
+        if (ldi->avail_in_this_block==0)
+        {
+            ldi->next_datablock = allocate_new_datablock();
+            if (ldi->next_datablock == NULL)
+                return ZIP_INTERNALERROR;
+            ldi = ldi->next_datablock ;
+            ll->last_block = ldi;
+        }
+
+        if (ldi->avail_in_this_block < len)
+            copy_this = (uInt)ldi->avail_in_this_block;
+        else
+            copy_this = (uInt)len;
+
+        to_copy = &(ldi->data[ldi->filled_in_this_block]);
+
+        for (i=0;i<copy_this;i++)
+            *(to_copy+i)=*(from_copy+i);
+
+        ldi->filled_in_this_block += copy_this;
+        ldi->avail_in_this_block -= copy_this;
+        from_copy += copy_this ;
+        len -= copy_this;
+    }
+    return ZIP_OK;
+}
+
+
+
+/****************************************************************************/
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+/* ===========================================================================
+   Inputs a long in LSB order to the given file
+   nbByte == 1, 2 ,4 or 8 (byte, short or long, ZPOS64_T)
+*/
+
+local int zip64local_putValue OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte));
+local int zip64local_putValue (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte)
+{
+    unsigned char buf[8];
+    int n;
+    for (n = 0; n < nbByte; n++)
+    {
+        buf[n] = (unsigned char)(x & 0xff);
+        x >>= 8;
+    }
+    if (x != 0)
+      {     /* data overflow - hack for ZIP64 (X Roche) */
+      for (n = 0; n < nbByte; n++)
+        {
+          buf[n] = 0xff;
+        }
+      }
+
+    if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
+        return ZIP_ERRNO;
+    else
+        return ZIP_OK;
+}
+
+local void zip64local_putValue_inmemory OF((void* dest, ZPOS64_T x, int nbByte));
+local void zip64local_putValue_inmemory (void* dest, ZPOS64_T x, int nbByte)
+{
+    unsigned char* buf=(unsigned char*)dest;
+    int n;
+    for (n = 0; n < nbByte; n++) {
+        buf[n] = (unsigned char)(x & 0xff);
+        x >>= 8;
+    }
+
+    if (x != 0)
+    {     /* data overflow - hack for ZIP64 */
+       for (n = 0; n < nbByte; n++)
+       {
+          buf[n] = 0xff;
+       }
+    }
+}
+
+/****************************************************************************/
+
+
+local uLong zip64local_TmzDateToDosDate(const tm_zip* ptm)
+{
+    uLong year = (uLong)ptm->tm_year;
+    if (year>=1980)
+        year-=1980;
+    else if (year>=80)
+        year-=80;
+    return
+      (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
+        ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
+}
+
+
+/****************************************************************************/
+
+local int zip64local_getByte OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi));
+
+local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def,voidpf filestream,int* pi)
+{
+    unsigned char c;
+    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
+    if (err==1)
+    {
+        *pi = (int)c;
+        return ZIP_OK;
+    }
+    else
+    {
+        if (ZERROR64(*pzlib_filefunc_def,filestream))
+            return ZIP_ERRNO;
+        else
+            return ZIP_EOF;
+    }
+}
+
+
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets
+*/
+local int zip64local_getShort OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
+
+local int zip64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==ZIP_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int zip64local_getLong OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
+
+local int zip64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<16;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<24;
+
+    if (err==ZIP_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int zip64local_getLong64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX));
+
+
+local int zip64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX)
+{
+  ZPOS64_T x;
+  int i = 0;
+  int err;
+
+  err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x = (ZPOS64_T)i;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<8;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<16;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<24;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<32;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<40;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<48;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<56;
+
+  if (err==ZIP_OK)
+    *pX = x;
+  else
+    *pX = 0;
+
+  return err;
+}
+
+#ifndef BUFREADCOMMENT
+#define BUFREADCOMMENT (0x400)
+#endif
+/*
+  Locate the Central directory of a zipfile (at the end, just before
+    the global comment)
+*/
+local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+
+local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+  unsigned char* buf;
+  ZPOS64_T uSizeFile;
+  ZPOS64_T uBackRead;
+  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+  ZPOS64_T uPosFound=0;
+
+  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+    return 0;
+
+
+  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+  if (uMaxBack>uSizeFile)
+    uMaxBack = uSizeFile;
+
+  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+  if (buf==NULL)
+    return 0;
+
+  uBackRead = 4;
+  while (uBackRead<uMaxBack)
+  {
+    uLong uReadSize;
+    ZPOS64_T uReadPos ;
+    int i;
+    if (uBackRead+BUFREADCOMMENT>uMaxBack)
+      uBackRead = uMaxBack;
+    else
+      uBackRead+=BUFREADCOMMENT;
+    uReadPos = uSizeFile-uBackRead ;
+
+    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      break;
+
+    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+      break;
+
+    for (i=(int)uReadSize-3; (i--)>0;)
+      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+        ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+      {
+        uPosFound = uReadPos+i;
+        break;
+      }
+
+      if (uPosFound!=0)
+        break;
+  }
+  TRYFREE(buf);
+  return uPosFound;
+}
+
+/*
+Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
+the global comment)
+*/
+local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+
+local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+  unsigned char* buf;
+  ZPOS64_T uSizeFile;
+  ZPOS64_T uBackRead;
+  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+  ZPOS64_T uPosFound=0;
+  uLong uL;
+  ZPOS64_T relativeOffset;
+
+  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+    return 0;
+
+  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+  if (uMaxBack>uSizeFile)
+    uMaxBack = uSizeFile;
+
+  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+  if (buf==NULL)
+    return 0;
+
+  uBackRead = 4;
+  while (uBackRead<uMaxBack)
+  {
+    uLong uReadSize;
+    ZPOS64_T uReadPos;
+    int i;
+    if (uBackRead+BUFREADCOMMENT>uMaxBack)
+      uBackRead = uMaxBack;
+    else
+      uBackRead+=BUFREADCOMMENT;
+    uReadPos = uSizeFile-uBackRead ;
+
+    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      break;
+
+    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+      break;
+
+    for (i=(int)uReadSize-3; (i--)>0;)
+    {
+      // Signature "0x07064b50" Zip64 end of central directory locater
+      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
+      {
+        uPosFound = uReadPos+i;
+        break;
+      }
+    }
+
+      if (uPosFound!=0)
+        break;
+  }
+
+  TRYFREE(buf);
+  if (uPosFound == 0)
+    return 0;
+
+  /* Zip64 end of central directory locator */
+  if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
+    return 0;
+
+  /* the signature, already checked */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+
+  /* number of the disk with the start of the zip64 end of  central directory */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+  if (uL != 0)
+    return 0;
+
+  /* relative offset of the zip64 end of central directory record */
+  if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
+    return 0;
+
+  /* total number of disks */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+  if (uL != 1)
+    return 0;
+
+  /* Goto Zip64 end of central directory record */
+  if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
+    return 0;
+
+  /* the signature */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+
+  if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
+    return 0;
+
+  return relativeOffset;
+}
+
+int LoadCentralDirectoryRecord(zip64_internal* pziinit)
+{
+  int err=ZIP_OK;
+  ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+
+  ZPOS64_T size_central_dir;     /* size of the central directory  */
+  ZPOS64_T offset_central_dir;   /* offset of start of central directory */
+  ZPOS64_T central_pos;
+  uLong uL;
+
+  uLong number_disk;          /* number of the current dist, used for
+                              spaning ZIP, unsupported, always 0*/
+  uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                              for spaning ZIP, unsupported, always 0*/
+  ZPOS64_T number_entry;
+  ZPOS64_T number_entry_CD;      /* total number of entries in
+                                the central dir
+                                (same than number_entry on nospan) */
+  uLong VersionMadeBy;
+  uLong VersionNeeded;
+  uLong size_comment;
+
+  int hasZIP64Record = 0;
+
+  // check first if we find a ZIP64 record
+  central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
+  if(central_pos > 0)
+  {
+    hasZIP64Record = 1;
+  }
+  else if(central_pos == 0)
+  {
+    central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
+  }
+
+/* disable to allow appending to empty ZIP archive
+        if (central_pos==0)
+            err=ZIP_ERRNO;
+*/
+
+  if(hasZIP64Record)
+  {
+    ZPOS64_T sizeEndOfCentralDirectory;
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
+      err=ZIP_ERRNO;
+
+    /* the signature, already checked */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* size of zip64 end of central directory record */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* version made by */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* version needed to extract */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of this disk */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of the disk with the start of the central directory */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central directory on this disk */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central directory */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
+      err=ZIP_BADZIPFILE;
+
+    /* size of the central directory */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* offset of start of central directory with respect to the
+    starting disk number */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    // TODO..
+    // read the comment from the standard central header.
+    size_comment = 0;
+  }
+  else
+  {
+    // Read End of central Directory info
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      err=ZIP_ERRNO;
+
+    /* the signature, already checked */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of this disk */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of the disk with the start of the central directory */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central dir on this disk */
+    number_entry = 0;
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      number_entry = uL;
+
+    /* total number of entries in the central dir */
+    number_entry_CD = 0;
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      number_entry_CD = uL;
+
+    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
+      err=ZIP_BADZIPFILE;
+
+    /* size of the central directory */
+    size_central_dir = 0;
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      size_central_dir = uL;
+
+    /* offset of start of central directory with respect to the starting disk number */
+    offset_central_dir = 0;
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      offset_central_dir = uL;
+
+
+    /* zipfile global comment length */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
+      err=ZIP_ERRNO;
+  }
+
+  if ((central_pos<offset_central_dir+size_central_dir) &&
+    (err==ZIP_OK))
+    err=ZIP_BADZIPFILE;
+
+  if (err!=ZIP_OK)
+  {
+    ZCLOSE64(pziinit->z_filefunc, pziinit->filestream);
+    return ZIP_ERRNO;
+  }
+
+  if (size_comment>0)
+  {
+    pziinit->globalcomment = (char*)ALLOC(size_comment+1);
+    if (pziinit->globalcomment)
+    {
+      size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
+      pziinit->globalcomment[size_comment]=0;
+    }
+  }
+
+  byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
+  pziinit->add_position_when_writting_offset = byte_before_the_zipfile;
+
+  {
+    ZPOS64_T size_central_dir_to_read = size_central_dir;
+    size_t buf_size = SIZEDATA_INDATABLOCK;
+    void* buf_read = (void*)ALLOC(buf_size);
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
+      err=ZIP_ERRNO;
+
+    while ((size_central_dir_to_read>0) && (err==ZIP_OK))
+    {
+      ZPOS64_T read_this = SIZEDATA_INDATABLOCK;
+      if (read_this > size_central_dir_to_read)
+        read_this = size_central_dir_to_read;
+
+      if (ZREAD64(pziinit->z_filefunc, pziinit->filestream,buf_read,(uLong)read_this) != read_this)
+        err=ZIP_ERRNO;
+
+      if (err==ZIP_OK)
+        err = add_data_in_datablock(&pziinit->central_dir,buf_read, (uLong)read_this);
+
+      size_central_dir_to_read-=read_this;
+    }
+    TRYFREE(buf_read);
+  }
+  pziinit->begin_pos = byte_before_the_zipfile;
+  pziinit->number_entry = number_entry_CD;
+
+  if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
+    err=ZIP_ERRNO;
+
+  return err;
+}
+
+
+#endif /* !NO_ADDFILEINEXISTINGZIP*/
+
+
+/************************************************************/
+extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def)
+{
+    zip64_internal ziinit;
+    zip64_internal* zi;
+    int err=ZIP_OK;
+
+    ziinit.z_filefunc.zseek32_file = NULL;
+    ziinit.z_filefunc.ztell32_file = NULL;
+    if (pzlib_filefunc64_32_def==NULL)
+        fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
+    else
+        ziinit.z_filefunc = *pzlib_filefunc64_32_def;
+
+    ziinit.filestream = ZOPEN64(ziinit.z_filefunc,
+                  pathname,
+                  (append == APPEND_STATUS_CREATE) ?
+                  (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
+                    (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
+
+    if (ziinit.filestream == NULL)
+        return NULL;
+
+    if (append == APPEND_STATUS_CREATEAFTER)
+        ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
+
+    ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
+    ziinit.in_opened_file_inzip = 0;
+    ziinit.ci.stream_initialised = 0;
+    ziinit.number_entry = 0;
+    ziinit.add_position_when_writting_offset = 0;
+    init_linkedlist(&(ziinit.central_dir));
+
+
+
+    zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
+    if (zi==NULL)
+    {
+        ZCLOSE64(ziinit.z_filefunc,ziinit.filestream);
+        return NULL;
+    }
+
+    /* now we add file in a zipfile */
+#    ifndef NO_ADDFILEINEXISTINGZIP
+    ziinit.globalcomment = NULL;
+    if (append == APPEND_STATUS_ADDINZIP)
+    {
+      // Read and Cache Central Directory Records
+      err = LoadCentralDirectoryRecord(&ziinit);
+    }
+
+    if (globalcomment)
+    {
+      *globalcomment = ziinit.globalcomment;
+    }
+#    endif /* !NO_ADDFILEINEXISTINGZIP*/
+
+    if (err != ZIP_OK)
+    {
+#    ifndef NO_ADDFILEINEXISTINGZIP
+        TRYFREE(ziinit.globalcomment);
+#    endif /* !NO_ADDFILEINEXISTINGZIP*/
+        TRYFREE(zi);
+        return NULL;
+    }
+    else
+    {
+        *zi = ziinit;
+        return (zipFile)zi;
+    }
+}
+
+extern zipFile ZEXPORT zipOpen2 (const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
+{
+    if (pzlib_filefunc32_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
+        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
+    }
+    else
+        return zipOpen3(pathname, append, globalcomment, NULL);
+}
+
+extern zipFile ZEXPORT zipOpen2_64 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    if (pzlib_filefunc_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
+        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
+        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
+        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
+    }
+    else
+        return zipOpen3(pathname, append, globalcomment, NULL);
+}
+
+
+
+extern zipFile ZEXPORT zipOpen (const char* pathname, int append)
+{
+    return zipOpen3((const void*)pathname,append,NULL,NULL);
+}
+
+extern zipFile ZEXPORT zipOpen64 (const void* pathname, int append)
+{
+    return zipOpen3(pathname,append,NULL,NULL);
+}
+
+int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
+{
+  /* write the local header */
+  int err;
+  uInt size_filename = (uInt)strlen(filename);
+  uInt size_extrafield = size_extrafield_local;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC, 4);
+
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
+
+  // CRC / Compressed size / Uncompressed size will be filled in later and rewritten later
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* compressed size, unknown */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
+  }
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* uncompressed size, unknown */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
+
+  if(zi->ci.zip64)
+  {
+    size_extrafield += 20;
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield,2);
+
+  if ((err==ZIP_OK) && (size_filename > 0))
+  {
+    if (ZWRITE64(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
+      err = ZIP_ERRNO;
+  }
+
+  if ((err==ZIP_OK) && (size_extrafield_local > 0))
+  {
+    if (ZWRITE64(zi->z_filefunc, zi->filestream, extrafield_local, size_extrafield_local) != size_extrafield_local)
+      err = ZIP_ERRNO;
+  }
+
+
+  if ((err==ZIP_OK) && (zi->ci.zip64))
+  {
+      // write the Zip64 extended info
+      short HeaderID = 1;
+      short DataSize = 16;
+      ZPOS64_T CompressedSize = 0;
+      ZPOS64_T UncompressedSize = 0;
+
+      // Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file)
+      zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
+
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
+
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
+  }
+
+  return err;
+}
+
+/*
+ NOTE.
+ When writing RAW the ZIP64 extended information in extrafield_local and extrafield_global needs to be stripped
+ before calling this function it can be done with zipRemoveExtraInfoBlock
+
+ It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize
+ unnecessary allocations.
+ */
+extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting,
+                                         uLong versionMadeBy, uLong flagBase, int zip64)
+{
+    zip64_internal* zi;
+    uInt size_filename;
+    uInt size_comment;
+    uInt i;
+    int err = ZIP_OK;
+
+#    ifdef NOCRYPT
+    if (password != NULL)
+        return ZIP_PARAMERROR;
+#    endif
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+
+#ifdef HAVE_BZIP2
+    if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
+      return ZIP_PARAMERROR;
+#else
+    if ((method!=0) && (method!=Z_DEFLATED))
+      return ZIP_PARAMERROR;
+#endif
+
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 1)
+    {
+        err = zipCloseFileInZip (file);
+        if (err != ZIP_OK)
+            return err;
+    }
+
+    if (filename==NULL)
+        filename="-";
+
+    if (comment==NULL)
+        size_comment = 0;
+    else
+        size_comment = (uInt)strlen(comment);
+
+    size_filename = (uInt)strlen(filename);
+
+    if (zipfi == NULL)
+        zi->ci.dosDate = 0;
+    else
+    {
+        if (zipfi->dosDate != 0)
+            zi->ci.dosDate = zipfi->dosDate;
+        else
+          zi->ci.dosDate = zip64local_TmzDateToDosDate(&zipfi->tmz_date);
+    }
+
+    zi->ci.flag = flagBase;
+    if ((level==8) || (level==9))
+      zi->ci.flag |= 2;
+    if ((level==2))
+      zi->ci.flag |= 4;
+    if ((level==1))
+      zi->ci.flag |= 6;
+    if (password != NULL)
+      zi->ci.flag |= 1;
+
+    zi->ci.crc32 = 0;
+    zi->ci.method = method;
+    zi->ci.encrypt = 0;
+    zi->ci.stream_initialised = 0;
+    zi->ci.pos_in_buffered_data = 0;
+    zi->ci.raw = raw;
+    zi->ci.pos_local_header = ZTELL64(zi->z_filefunc,zi->filestream);
+
+    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + size_extrafield_global + size_comment;
+    zi->ci.size_centralExtraFree = 32; // Extra space we have reserved in case we need to add ZIP64 extra info data
+
+    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader + zi->ci.size_centralExtraFree);
+
+    zi->ci.size_centralExtra = size_extrafield_global;
+    zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
+    /* version info */
+    zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
+    zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
+    zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
+    zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
+    zip64local_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
+
+    if (zipfi==NULL)
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
+    else
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
+
+    if (zipfi==NULL)
+        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
+    else
+        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
+
+    if(zi->ci.pos_local_header >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writting_offset,4);
+
+    for (i=0;i<size_filename;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
+
+    for (i=0;i<size_extrafield_global;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
+              *(((const char*)extrafield_global)+i);
+
+    for (i=0;i<size_comment;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
+              size_extrafield_global+i) = *(comment+i);
+    if (zi->ci.central_header == NULL)
+        return ZIP_INTERNALERROR;
+
+    zi->ci.zip64 = zip64;
+    zi->ci.totalCompressedData = 0;
+    zi->ci.totalUncompressedData = 0;
+    zi->ci.pos_zip64extrainfo = 0;
+
+    err = Write_LocalFileHeader(zi, filename, size_extrafield_local, extrafield_local);
+
+#ifdef HAVE_BZIP2
+    zi->ci.bstream.avail_in = (uInt)0;
+    zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+    zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+    zi->ci.bstream.total_in_hi32 = 0;
+    zi->ci.bstream.total_in_lo32 = 0;
+    zi->ci.bstream.total_out_hi32 = 0;
+    zi->ci.bstream.total_out_lo32 = 0;
+#endif
+
+    zi->ci.stream.avail_in = (uInt)0;
+    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+    zi->ci.stream.next_out = zi->ci.buffered_data;
+    zi->ci.stream.total_in = 0;
+    zi->ci.stream.total_out = 0;
+    zi->ci.stream.data_type = Z_BINARY;
+
+#ifdef HAVE_BZIP2
+    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED || zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+#else
+    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+#endif
+    {
+        if(zi->ci.method == Z_DEFLATED)
+        {
+          zi->ci.stream.zalloc = (alloc_func)0;
+          zi->ci.stream.zfree = (free_func)0;
+          zi->ci.stream.opaque = (voidpf)0;
+
+          if (windowBits>0)
+              windowBits = -windowBits;
+
+          err = deflateInit2(&zi->ci.stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
+
+          if (err==Z_OK)
+              zi->ci.stream_initialised = Z_DEFLATED;
+        }
+        else if(zi->ci.method == Z_BZIP2ED)
+        {
+#ifdef HAVE_BZIP2
+            // Init BZip stuff here
+          zi->ci.bstream.bzalloc = 0;
+          zi->ci.bstream.bzfree = 0;
+          zi->ci.bstream.opaque = (voidpf)0;
+
+          err = BZ2_bzCompressInit(&zi->ci.bstream, level, 0,35);
+          if(err == BZ_OK)
+            zi->ci.stream_initialised = Z_BZIP2ED;
+#endif
+        }
+
+    }
+
+#    ifndef NOCRYPT
+    zi->ci.crypt_header_size = 0;
+    if ((err==Z_OK) && (password != NULL))
+    {
+        unsigned char bufHead[RAND_HEAD_LEN];
+        unsigned int sizeHead;
+        zi->ci.encrypt = 1;
+        zi->ci.pcrc_32_tab = get_crc_table();
+        /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
+
+        sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
+        zi->ci.crypt_header_size = sizeHead;
+
+        if (ZWRITE64(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
+                err = ZIP_ERRNO;
+    }
+#    endif
+
+    if (err==Z_OK)
+        zi->in_opened_file_inzip = 1;
+    return err;
+}
+
+extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting,
+                                         uLong versionMadeBy, uLong flagBase)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, versionMadeBy, flagBase, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, VERSIONMADEBY, 0, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void* extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int raw)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void* extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int raw, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void*extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, 0,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void*extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, 0,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, 0);
+}
+
+local int zip64FlushWriteBuffer(zip64_internal* zi)
+{
+    int err=ZIP_OK;
+
+    if (zi->ci.encrypt != 0)
+    {
+#ifndef NOCRYPT
+        uInt i;
+        int t;
+        for (i=0;i<zi->ci.pos_in_buffered_data;i++)
+            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
+#endif
+    }
+
+    if (ZWRITE64(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data) != zi->ci.pos_in_buffered_data)
+      err = ZIP_ERRNO;
+
+    zi->ci.totalCompressedData += zi->ci.pos_in_buffered_data;
+
+#ifdef HAVE_BZIP2
+    if(zi->ci.method == Z_BZIP2ED)
+    {
+      zi->ci.totalUncompressedData += zi->ci.bstream.total_in_lo32;
+      zi->ci.bstream.total_in_lo32 = 0;
+      zi->ci.bstream.total_in_hi32 = 0;
+    }
+    else
+#endif
+    {
+      zi->ci.totalUncompressedData += zi->ci.stream.total_in;
+      zi->ci.stream.total_in = 0;
+    }
+
+
+    zi->ci.pos_in_buffered_data = 0;
+
+    return err;
+}
+
+extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len)
+{
+    zip64_internal* zi;
+    int err=ZIP_OK;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 0)
+        return ZIP_PARAMERROR;
+
+    zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len);
+
+#ifdef HAVE_BZIP2
+    if(zi->ci.method == Z_BZIP2ED && (!zi->ci.raw))
+    {
+      zi->ci.bstream.next_in = (void*)buf;
+      zi->ci.bstream.avail_in = len;
+      err = BZ_RUN_OK;
+
+      while ((err==BZ_RUN_OK) && (zi->ci.bstream.avail_in>0))
+      {
+        if (zi->ci.bstream.avail_out == 0)
+        {
+          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+            err = ZIP_ERRNO;
+          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+        }
+
+
+        if(err != BZ_RUN_OK)
+          break;
+
+        if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+        {
+          uLong uTotalOutBefore_lo = zi->ci.bstream.total_out_lo32;
+//          uLong uTotalOutBefore_hi = zi->ci.bstream.total_out_hi32;
+          err=BZ2_bzCompress(&zi->ci.bstream,  BZ_RUN);
+
+          zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore_lo) ;
+        }
+      }
+
+      if(err == BZ_RUN_OK)
+        err = ZIP_OK;
+    }
+    else
+#endif
+    {
+      zi->ci.stream.next_in = (Bytef*)buf;
+      zi->ci.stream.avail_in = len;
+
+      while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
+      {
+          if (zi->ci.stream.avail_out == 0)
+          {
+              if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+                  err = ZIP_ERRNO;
+              zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+              zi->ci.stream.next_out = zi->ci.buffered_data;
+          }
+
+
+          if(err != ZIP_OK)
+              break;
+
+          if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+          {
+              uLong uTotalOutBefore = zi->ci.stream.total_out;
+              err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
+              if(uTotalOutBefore > zi->ci.stream.total_out)
+              {
+                int bBreak = 0;
+                bBreak++;
+              }
+
+              zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+          }
+          else
+          {
+              uInt copy_this,i;
+              if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
+                  copy_this = zi->ci.stream.avail_in;
+              else
+                  copy_this = zi->ci.stream.avail_out;
+
+              for (i = 0; i < copy_this; i++)
+                  *(((char*)zi->ci.stream.next_out)+i) =
+                      *(((const char*)zi->ci.stream.next_in)+i);
+              {
+                  zi->ci.stream.avail_in -= copy_this;
+                  zi->ci.stream.avail_out-= copy_this;
+                  zi->ci.stream.next_in+= copy_this;
+                  zi->ci.stream.next_out+= copy_this;
+                  zi->ci.stream.total_in+= copy_this;
+                  zi->ci.stream.total_out+= copy_this;
+                  zi->ci.pos_in_buffered_data += copy_this;
+              }
+          }
+      }// while(...)
+    }
+
+    return err;
+}
+
+extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
+{
+    return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
+}
+
+extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
+{
+    zip64_internal* zi;
+    ZPOS64_T compressed_size;
+    uLong invalidValue = 0xffffffff;
+    short datasize = 0;
+    int err=ZIP_OK;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 0)
+        return ZIP_PARAMERROR;
+    zi->ci.stream.avail_in = 0;
+
+    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+                {
+                        while (err==ZIP_OK)
+                        {
+                                uLong uTotalOutBefore;
+                                if (zi->ci.stream.avail_out == 0)
+                                {
+                                        if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+                                                err = ZIP_ERRNO;
+                                        zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+                                        zi->ci.stream.next_out = zi->ci.buffered_data;
+                                }
+                                uTotalOutBefore = zi->ci.stream.total_out;
+                                err=deflate(&zi->ci.stream,  Z_FINISH);
+                                zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+                        }
+                }
+    else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+    {
+#ifdef HAVE_BZIP2
+      err = BZ_FINISH_OK;
+      while (err==BZ_FINISH_OK)
+      {
+        uLong uTotalOutBefore;
+        if (zi->ci.bstream.avail_out == 0)
+        {
+          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+            err = ZIP_ERRNO;
+          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+        }
+        uTotalOutBefore = zi->ci.bstream.total_out_lo32;
+        err=BZ2_bzCompress(&zi->ci.bstream,  BZ_FINISH);
+        if(err == BZ_STREAM_END)
+          err = Z_STREAM_END;
+
+        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
+      }
+
+      if(err == BZ_FINISH_OK)
+        err = ZIP_OK;
+#endif
+    }
+
+    if (err==Z_STREAM_END)
+        err=ZIP_OK; /* this is normal */
+
+    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
+                {
+        if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
+            err = ZIP_ERRNO;
+                }
+
+    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+    {
+        int tmp_err = deflateEnd(&zi->ci.stream);
+        if (err == ZIP_OK)
+            err = tmp_err;
+        zi->ci.stream_initialised = 0;
+    }
+#ifdef HAVE_BZIP2
+    else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+    {
+      int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
+                        if (err==ZIP_OK)
+                                err = tmperr;
+                        zi->ci.stream_initialised = 0;
+    }
+#endif
+
+    if (!zi->ci.raw)
+    {
+        crc32 = (uLong)zi->ci.crc32;
+        uncompressed_size = zi->ci.totalUncompressedData;
+    }
+    compressed_size = zi->ci.totalCompressedData;
+
+#    ifndef NOCRYPT
+    compressed_size += zi->ci.crypt_header_size;
+#    endif
+
+    // update Current Item crc and sizes,
+    if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
+    {
+      /*version Made by*/
+      zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
+      /*version needed*/
+      zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
+
+    }
+
+    zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
+
+
+    if(compressed_size >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
+
+    /// set internal file attributes field
+    if (zi->ci.stream.data_type == Z_ASCII)
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
+
+    if(uncompressed_size >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
+
+    // Add ZIP64 extra info field for uncompressed size
+    if(uncompressed_size >= 0xffffffff)
+      datasize += 8;
+
+    // Add ZIP64 extra info field for compressed size
+    if(compressed_size >= 0xffffffff)
+      datasize += 8;
+
+    // Add ZIP64 extra info field for relative offset to local file header of current file
+    if(zi->ci.pos_local_header >= 0xffffffff)
+      datasize += 8;
+
+    if(datasize > 0)
+    {
+      char* p = NULL;
+
+      if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
+      {
+        // we can not write more data to the buffer that we have room for.
+        return ZIP_BADZIPFILE;
+      }
+
+      p = zi->ci.central_header + zi->ci.size_centralheader;
+
+      // Add Extra Information Header for 'ZIP64 information'
+      zip64local_putValue_inmemory(p, 0x0001, 2); // HeaderID
+      p += 2;
+      zip64local_putValue_inmemory(p, datasize, 2); // DataSize
+      p += 2;
+
+      if(uncompressed_size >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, uncompressed_size, 8);
+        p += 8;
+      }
+
+      if(compressed_size >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, compressed_size, 8);
+        p += 8;
+      }
+
+      if(zi->ci.pos_local_header >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
+        p += 8;
+      }
+
+      // Update how much extra free space we got in the memory buffer
+      // and increase the centralheader size so the new ZIP64 fields are included
+      // ( 4 below is the size of HeaderID and DataSize field )
+      zi->ci.size_centralExtraFree -= datasize + 4;
+      zi->ci.size_centralheader += datasize + 4;
+
+      // Update the extra info size field
+      zi->ci.size_centralExtra += datasize + 4;
+      zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
+    }
+
+    if (err==ZIP_OK)
+        err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
+
+    free(zi->ci.central_header);
+
+    if (err==ZIP_OK)
+    {
+        // Update the LocalFileHeader with the new values.
+
+        ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
+
+        if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err = ZIP_ERRNO;
+
+        if (err==ZIP_OK)
+            err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
+
+        if(uncompressed_size >= 0xffffffff)
+        {
+          if(zi->ci.pos_zip64extrainfo > 0)
+          {
+            // Update the size in the ZIP64 extended field.
+            if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
+              err = ZIP_ERRNO;
+
+            if (err==ZIP_OK) /* compressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
+
+            if (err==ZIP_OK) /* uncompressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
+          }
+        }
+        else
+        {
+          if (err==ZIP_OK) /* compressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
+
+          if (err==ZIP_OK) /* uncompressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
+        }
+
+        if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err = ZIP_ERRNO;
+    }
+
+    zi->number_entry ++;
+    zi->in_opened_file_inzip = 0;
+
+    return err;
+}
+
+extern int ZEXPORT zipCloseFileInZip (zipFile file)
+{
+    return zipCloseFileInZipRaw (file,0,0);
+}
+
+int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
+{
+  int err = ZIP_OK;
+  ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
+
+  /*num disks*/
+    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  /*relative offset*/
+    if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
+
+  /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
+    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
+
+    return err;
+}
+
+int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+{
+  int err = ZIP_OK;
+
+  uLong Zip64DataSize = 44;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
+
+  if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); // why ZPOS64_T of this ?
+
+  if (err==ZIP_OK) /* version made by */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
+
+  if (err==ZIP_OK) /* version needed */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
+
+  if (err==ZIP_OK) /* number of this disk */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
+    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir */
+    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
+
+  if (err==ZIP_OK) /* size of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
+
+  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
+  {
+    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
+  }
+  return err;
+}
+int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+{
+  int err = ZIP_OK;
+
+  /*signature*/
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
+
+  if (err==ZIP_OK) /* number of this disk */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
+  {
+    {
+      if(zi->number_entry >= 0xFFFF)
+        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
+      else
+        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+    }
+  }
+
+  if (err==ZIP_OK) /* total number of entries in the central dir */
+  {
+    if(zi->number_entry >= 0xFFFF)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+  }
+
+  if (err==ZIP_OK) /* size of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
+
+  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
+  {
+    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+    if(pos >= 0xffffffff)
+    {
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
+    }
+    else
+                  err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
+  }
+
+   return err;
+}
+
+int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
+{
+  int err = ZIP_OK;
+  uInt size_global_comment = 0;
+
+  if(global_comment != NULL)
+    size_global_comment = (uInt)strlen(global_comment);
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
+
+  if (err == ZIP_OK && size_global_comment > 0)
+  {
+    if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
+      err = ZIP_ERRNO;
+  }
+  return err;
+}
+
+extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
+{
+    zip64_internal* zi;
+    int err = 0;
+    uLong size_centraldir = 0;
+    ZPOS64_T centraldir_pos_inzip;
+    ZPOS64_T pos;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 1)
+    {
+        err = zipCloseFileInZip (file);
+    }
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    if (global_comment==NULL)
+        global_comment = zi->globalcomment;
+#endif
+
+    centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
+
+    if (err==ZIP_OK)
+    {
+        linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
+        while (ldi!=NULL)
+        {
+            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
+            {
+                if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
+                    err = ZIP_ERRNO;
+            }
+
+            size_centraldir += ldi->filled_in_this_block;
+            ldi = ldi->next_datablock;
+        }
+    }
+    free_linkedlist(&(zi->central_dir));
+
+    pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+    if(pos >= 0xffffffff)
+    {
+      ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
+      Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
+
+      Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
+    }
+
+    if (err==ZIP_OK)
+      err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
+
+    if(err == ZIP_OK)
+      err = Write_GlobalComment(zi, global_comment);
+
+    if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0)
+        if (err == ZIP_OK)
+            err = ZIP_ERRNO;
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    TRYFREE(zi->globalcomment);
+#endif
+    TRYFREE(zi);
+
+    return err;
+}
+
+extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
+{
+  char* p = pData;
+  int size = 0;
+  char* pNewHeader;
+  char* pTmp;
+  short header;
+  short dataSize;
+
+  int retVal = ZIP_OK;
+
+  if(pData == NULL || *dataLen < 4)
+    return ZIP_PARAMERROR;
+
+  pNewHeader = (char*)ALLOC(*dataLen);
+  pTmp = pNewHeader;
+
+  while(p < (pData + *dataLen))
+  {
+    header = *(short*)p;
+    dataSize = *(((short*)p)+1);
+
+    if( header == sHeader ) // Header found.
+    {
+      p += dataSize + 4; // skip it. do not copy to temp buffer
+    }
+    else
+    {
+      // Extra Info block should not be removed, So copy it to the temp buffer.
+      memcpy(pTmp, p, dataSize + 4);
+      p += dataSize + 4;
+      size += dataSize + 4;
+    }
+
+  }
+
+  if(size < *dataLen)
+  {
+    // clean old extra info block.
+    memset(pData,0, *dataLen);
+
+    // copy the new extra info block over the old
+    if(size > 0)
+      memcpy(pData, pNewHeader, size);
+
+    // set the new extra info size
+    *dataLen = size;
+
+    retVal = ZIP_OK;
+  }
+  else
+    retVal = ZIP_ERRNO;
+
+  TRYFREE(pNewHeader);
+
+  return retVal;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/zip.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/zip.h
new file mode 100644
index 00000000..8aaebb62
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/minizip/zip.h
@@ -0,0 +1,362 @@
+/* zip.h -- IO on .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         ---------------------------------------------------------------------------
+
+   Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+        ---------------------------------------------------------------------------
+
+        Changes
+
+        See header of zip.h
+
+*/
+
+#ifndef _zip12_H
+#define _zip12_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//#define HAVE_BZIP2
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#ifndef _ZLIBIOAPI_H
+#include "ioapi.h"
+#endif
+
+#ifdef HAVE_BZIP2
+#include "bzlib.h"
+#endif
+
+#define Z_BZIP2ED 12
+
+#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
+/* like the STRICT of WIN32, we define a pointer that cannot be converted
+    from (void*) without cast */
+typedef struct TagzipFile__ { int unused; } zipFile__;
+typedef zipFile__ *zipFile;
+#else
+typedef voidp zipFile;
+#endif
+
+#define ZIP_OK                          (0)
+#define ZIP_EOF                         (0)
+#define ZIP_ERRNO                       (Z_ERRNO)
+#define ZIP_PARAMERROR                  (-102)
+#define ZIP_BADZIPFILE                  (-103)
+#define ZIP_INTERNALERROR               (-104)
+
+#ifndef DEF_MEM_LEVEL
+#  if MAX_MEM_LEVEL >= 8
+#    define DEF_MEM_LEVEL 8
+#  else
+#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#  endif
+#endif
+/* default memLevel */
+
+/* tm_zip contain date/time info */
+typedef struct tm_zip_s
+{
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
+} tm_zip;
+
+typedef struct
+{
+    tm_zip      tmz_date;       /* date in understandable format           */
+    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */
+/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */
+
+    uLong       internal_fa;    /* internal file attributes        2 bytes */
+    uLong       external_fa;    /* external file attributes        4 bytes */
+} zip_fileinfo;
+
+typedef const char* zipcharpc;
+
+
+#define APPEND_STATUS_CREATE        (0)
+#define APPEND_STATUS_CREATEAFTER   (1)
+#define APPEND_STATUS_ADDINZIP      (2)
+
+extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
+extern zipFile ZEXPORT zipOpen64 OF((const void *pathname, int append));
+/*
+  Create a zipfile.
+     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
+       an Unix computer "zlib/zlib113.zip".
+     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
+       will be created at the end of the file.
+         (useful if the file contain a self extractor code)
+     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
+       add files in existing zip (be sure you don't add file that doesn't exist)
+     If the zipfile cannot be opened, the return value is NULL.
+     Else, the return value is a zipFile Handle, usable with other function
+       of this zip package.
+*/
+
+/* Note : there is no delete function into a zipfile.
+   If you want delete file into a zipfile, you must open a zipfile, and create another
+   Of couse, you can use RAW reading and writing to copy the file you did not want delte
+*/
+
+extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
+                                   int append,
+                                   zipcharpc* globalcomment,
+                                   zlib_filefunc_def* pzlib_filefunc_def));
+
+extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname,
+                                   int append,
+                                   zipcharpc* globalcomment,
+                                   zlib_filefunc64_def* pzlib_filefunc_def));
+
+extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
+                       const char* filename,
+                       const zip_fileinfo* zipfi,
+                       const void* extrafield_local,
+                       uInt size_extrafield_local,
+                       const void* extrafield_global,
+                       uInt size_extrafield_global,
+                       const char* comment,
+                       int method,
+                       int level));
+
+extern int ZEXPORT zipOpenNewFileInZip64 OF((zipFile file,
+                       const char* filename,
+                       const zip_fileinfo* zipfi,
+                       const void* extrafield_local,
+                       uInt size_extrafield_local,
+                       const void* extrafield_global,
+                       uInt size_extrafield_global,
+                       const char* comment,
+                       int method,
+                       int level,
+                       int zip64));
+
+/*
+  Open a file in the ZIP for writing.
+  filename : the filename in zip (if NULL, '-' without quote will be used
+  *zipfi contain supplemental information
+  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
+    contains the extrafield data the the local header
+  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
+    contains the extrafield data the the local header
+  if comment != NULL, comment contain the comment string
+  method contain the compression method (0 for store, Z_DEFLATED for deflate)
+  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
+  zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
+                    this MUST be '1' if the uncompressed size is >= 0xffffffff.
+
+*/
+
+
+extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw));
+
+
+extern int ZEXPORT zipOpenNewFileInZip2_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int zip64));
+/*
+  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
+ */
+
+extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting));
+
+extern int ZEXPORT zipOpenNewFileInZip3_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            int zip64
+                                            ));
+
+/*
+  Same than zipOpenNewFileInZip2, except
+    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
+    password : crypting password (NULL for no crypting)
+    crcForCrypting : crc of file to compress (needed for crypting)
+ */
+
+extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            uLong versionMadeBy,
+                                            uLong flagBase
+                                            ));
+
+
+extern int ZEXPORT zipOpenNewFileInZip4_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            uLong versionMadeBy,
+                                            uLong flagBase,
+                                            int zip64
+                                            ));
+/*
+  Same than zipOpenNewFileInZip4, except
+    versionMadeBy : value for Version made by field
+    flag : value for flag field (compression level info will be added)
+ */
+
+
+extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
+                       const void* buf,
+                       unsigned len));
+/*
+  Write data in the zipfile
+*/
+
+extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
+/*
+  Close the current file in the zipfile
+*/
+
+extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
+                                            uLong uncompressed_size,
+                                            uLong crc32));
+
+extern int ZEXPORT zipCloseFileInZipRaw64 OF((zipFile file,
+                                            ZPOS64_T uncompressed_size,
+                                            uLong crc32));
+
+/*
+  Close the current file in the zipfile, for file opened with
+    parameter raw=1 in zipOpenNewFileInZip2
+  uncompressed_size and crc32 are value for the uncompressed size
+*/
+
+extern int ZEXPORT zipClose OF((zipFile file,
+                const char* global_comment));
+/*
+  Close the zipfile
+*/
+
+
+extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader));
+/*
+  zipRemoveExtraInfoBlock -  Added by Mathias Svensson
+
+  Remove extra information block from a extra information data for the local file header or central directory header
+
+  It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode.
+
+  0x0001 is the signature header for the ZIP64 extra information blocks
+
+  usage.
+                        Remove ZIP64 Extra information from a central director extra field data
+              zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001);
+
+                        Remove ZIP64 Extra information from a Local File Header extra field data
+        zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001);
+*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _zip64_H */
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/pascal/example.pas b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/pascal/example.pas
new file mode 100644
index 00000000..5518b36a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/pascal/example.pas
@@ -0,0 +1,599 @@
+(* example.c -- usage example of the zlib compression library
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Pascal translation
+ * Copyright (C) 1998 by Jacques Nomssi Nzali.
+ * For conditions of distribution and use, see copyright notice in readme.txt
+ *
+ * Adaptation to the zlibpas interface
+ * Copyright (C) 2003 by Cosmin Truta.
+ * For conditions of distribution and use, see copyright notice in readme.txt
+ *)
+
+program example;
+
+{$DEFINE TEST_COMPRESS}
+{DO NOT $DEFINE TEST_GZIO}
+{$DEFINE TEST_DEFLATE}
+{$DEFINE TEST_INFLATE}
+{$DEFINE TEST_FLUSH}
+{$DEFINE TEST_SYNC}
+{$DEFINE TEST_DICT}
+
+uses SysUtils, zlibpas;
+
+const TESTFILE = 'foo.gz';
+
+(* "hello world" would be more standard, but the repeated "hello"
+ * stresses the compression code better, sorry...
+ *)
+const hello: PChar = 'hello, hello!';
+
+const dictionary: PChar = 'hello';
+
+var dictId: LongInt; (* Adler32 value of the dictionary *)
+
+procedure CHECK_ERR(err: Integer; msg: String);
+begin
+  if err <> Z_OK then
+  begin
+    WriteLn(msg, ' error: ', err);
+    Halt(1);
+  end;
+end;
+
+procedure EXIT_ERR(const msg: String);
+begin
+  WriteLn('Error: ', msg);
+  Halt(1);
+end;
+
+(* ===========================================================================
+ * Test compress and uncompress
+ *)
+{$IFDEF TEST_COMPRESS}
+procedure test_compress(compr: Pointer; comprLen: LongInt;
+                        uncompr: Pointer; uncomprLen: LongInt);
+var err: Integer;
+    len: LongInt;
+begin
+  len := StrLen(hello)+1;
+
+  err := compress(compr, comprLen, hello, len);
+  CHECK_ERR(err, 'compress');
+
+  StrCopy(PChar(uncompr), 'garbage');
+
+  err := uncompress(uncompr, uncomprLen, compr, comprLen);
+  CHECK_ERR(err, 'uncompress');
+
+  if StrComp(PChar(uncompr), hello) <> 0 then
+    EXIT_ERR('bad uncompress')
+  else
+    WriteLn('uncompress(): ', PChar(uncompr));
+end;
+{$ENDIF}
+
+(* ===========================================================================
+ * Test read/write of .gz files
+ *)
+{$IFDEF TEST_GZIO}
+procedure test_gzio(const fname: PChar; (* compressed file name *)
+                    uncompr: Pointer;
+                    uncomprLen: LongInt);
+var err: Integer;
+    len: Integer;
+    zfile: gzFile;
+    pos: LongInt;
+begin
+  len := StrLen(hello)+1;
+
+  zfile := gzopen(fname, 'wb');
+  if zfile = NIL then
+  begin
+    WriteLn('gzopen error');
+    Halt(1);
+  end;
+  gzputc(zfile, 'h');
+  if gzputs(zfile, 'ello') <> 4 then
+  begin
+    WriteLn('gzputs err: ', gzerror(zfile, err));
+    Halt(1);
+  end;
+  {$IFDEF GZ_FORMAT_STRING}
+  if gzprintf(zfile, ', %s!', 'hello') <> 8 then
+  begin
+    WriteLn('gzprintf err: ', gzerror(zfile, err));
+    Halt(1);
+  end;
+  {$ELSE}
+  if gzputs(zfile, ', hello!') <> 8 then
+  begin
+    WriteLn('gzputs err: ', gzerror(zfile, err));
+    Halt(1);
+  end;
+  {$ENDIF}
+  gzseek(zfile, 1, SEEK_CUR); (* add one zero byte *)
+  gzclose(zfile);
+
+  zfile := gzopen(fname, 'rb');
+  if zfile = NIL then
+  begin
+    WriteLn('gzopen error');
+    Halt(1);
+  end;
+
+  StrCopy(PChar(uncompr), 'garbage');
+
+  if gzread(zfile, uncompr, uncomprLen) <> len then
+  begin
+    WriteLn('gzread err: ', gzerror(zfile, err));
+    Halt(1);
+  end;
+  if StrComp(PChar(uncompr), hello) <> 0 then
+  begin
+    WriteLn('bad gzread: ', PChar(uncompr));
+    Halt(1);
+  end
+  else
+    WriteLn('gzread(): ', PChar(uncompr));
+
+  pos := gzseek(zfile, -8, SEEK_CUR);
+  if (pos <> 6) or (gztell(zfile) <> pos) then
+  begin
+    WriteLn('gzseek error, pos=', pos, ', gztell=', gztell(zfile));
+    Halt(1);
+  end;
+
+  if gzgetc(zfile) <> ' ' then
+  begin
+    WriteLn('gzgetc error');
+    Halt(1);
+  end;
+
+  if gzungetc(' ', zfile) <> ' ' then
+  begin
+    WriteLn('gzungetc error');
+    Halt(1);
+  end;
+
+  gzgets(zfile, PChar(uncompr), uncomprLen);
+  uncomprLen := StrLen(PChar(uncompr));
+  if uncomprLen <> 7 then (* " hello!" *)
+  begin
+    WriteLn('gzgets err after gzseek: ', gzerror(zfile, err));
+    Halt(1);
+  end;
+  if StrComp(PChar(uncompr), hello + 6) <> 0 then
+  begin
+    WriteLn('bad gzgets after gzseek');
+    Halt(1);
+  end
+  else
+    WriteLn('gzgets() after gzseek: ', PChar(uncompr));
+
+  gzclose(zfile);
+end;
+{$ENDIF}
+
+(* ===========================================================================
+ * Test deflate with small buffers
+ *)
+{$IFDEF TEST_DEFLATE}
+procedure test_deflate(compr: Pointer; comprLen: LongInt);
+var c_stream: z_stream; (* compression stream *)
+    err: Integer;
+    len: LongInt;
+begin
+  len := StrLen(hello)+1;
+
+  c_stream.zalloc := NIL;
+  c_stream.zfree := NIL;
+  c_stream.opaque := NIL;
+
+  err := deflateInit(c_stream, Z_DEFAULT_COMPRESSION);
+  CHECK_ERR(err, 'deflateInit');
+
+  c_stream.next_in := hello;
+  c_stream.next_out := compr;
+
+  while (c_stream.total_in <> len) and
+        (c_stream.total_out < comprLen) do
+  begin
+    c_stream.avail_out := 1; { force small buffers }
+    c_stream.avail_in := 1;
+    err := deflate(c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, 'deflate');
+  end;
+
+  (* Finish the stream, still forcing small buffers: *)
+  while TRUE do
+  begin
+    c_stream.avail_out := 1;
+    err := deflate(c_stream, Z_FINISH);
+    if err = Z_STREAM_END then
+      break;
+    CHECK_ERR(err, 'deflate');
+  end;
+
+  err := deflateEnd(c_stream);
+  CHECK_ERR(err, 'deflateEnd');
+end;
+{$ENDIF}
+
+(* ===========================================================================
+ * Test inflate with small buffers
+ *)
+{$IFDEF TEST_INFLATE}
+procedure test_inflate(compr: Pointer; comprLen : LongInt;
+                       uncompr: Pointer; uncomprLen : LongInt);
+var err: Integer;
+    d_stream: z_stream; (* decompression stream *)
+begin
+  StrCopy(PChar(uncompr), 'garbage');
+
+  d_stream.zalloc := NIL;
+  d_stream.zfree := NIL;
+  d_stream.opaque := NIL;
+
+  d_stream.next_in := compr;
+  d_stream.avail_in := 0;
+  d_stream.next_out := uncompr;
+
+  err := inflateInit(d_stream);
+  CHECK_ERR(err, 'inflateInit');
+
+  while (d_stream.total_out < uncomprLen) and
+        (d_stream.total_in < comprLen) do
+  begin
+    d_stream.avail_out := 1; (* force small buffers *)
+    d_stream.avail_in := 1;
+    err := inflate(d_stream, Z_NO_FLUSH);
+    if err = Z_STREAM_END then
+      break;
+    CHECK_ERR(err, 'inflate');
+  end;
+
+  err := inflateEnd(d_stream);
+  CHECK_ERR(err, 'inflateEnd');
+
+  if StrComp(PChar(uncompr), hello) <> 0 then
+    EXIT_ERR('bad inflate')
+  else
+    WriteLn('inflate(): ', PChar(uncompr));
+end;
+{$ENDIF}
+
+(* ===========================================================================
+ * Test deflate with large buffers and dynamic change of compression level
+ *)
+{$IFDEF TEST_DEFLATE}
+procedure test_large_deflate(compr: Pointer; comprLen: LongInt;
+                             uncompr: Pointer; uncomprLen: LongInt);
+var c_stream: z_stream; (* compression stream *)
+    err: Integer;
+begin
+  c_stream.zalloc := NIL;
+  c_stream.zfree := NIL;
+  c_stream.opaque := NIL;
+
+  err := deflateInit(c_stream, Z_BEST_SPEED);
+  CHECK_ERR(err, 'deflateInit');
+
+  c_stream.next_out := compr;
+  c_stream.avail_out := Integer(comprLen);
+
+  (* At this point, uncompr is still mostly zeroes, so it should compress
+   * very well:
+   *)
+  c_stream.next_in := uncompr;
+  c_stream.avail_in := Integer(uncomprLen);
+  err := deflate(c_stream, Z_NO_FLUSH);
+  CHECK_ERR(err, 'deflate');
+  if c_stream.avail_in <> 0 then
+    EXIT_ERR('deflate not greedy');
+
+  (* Feed in already compressed data and switch to no compression: *)
+  deflateParams(c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
+  c_stream.next_in := compr;
+  c_stream.avail_in := Integer(comprLen div 2);
+  err := deflate(c_stream, Z_NO_FLUSH);
+  CHECK_ERR(err, 'deflate');
+
+  (* Switch back to compressing mode: *)
+  deflateParams(c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
+  c_stream.next_in := uncompr;
+  c_stream.avail_in := Integer(uncomprLen);
+  err := deflate(c_stream, Z_NO_FLUSH);
+  CHECK_ERR(err, 'deflate');
+
+  err := deflate(c_stream, Z_FINISH);
+  if err <> Z_STREAM_END then
+    EXIT_ERR('deflate should report Z_STREAM_END');
+
+  err := deflateEnd(c_stream);
+  CHECK_ERR(err, 'deflateEnd');
+end;
+{$ENDIF}
+
+(* ===========================================================================
+ * Test inflate with large buffers
+ *)
+{$IFDEF TEST_INFLATE}
+procedure test_large_inflate(compr: Pointer; comprLen: LongInt;
+                             uncompr: Pointer; uncomprLen: LongInt);
+var err: Integer;
+    d_stream: z_stream; (* decompression stream *)
+begin
+  StrCopy(PChar(uncompr), 'garbage');
+
+  d_stream.zalloc := NIL;
+  d_stream.zfree := NIL;
+  d_stream.opaque := NIL;
+
+  d_stream.next_in := compr;
+  d_stream.avail_in := Integer(comprLen);
+
+  err := inflateInit(d_stream);
+  CHECK_ERR(err, 'inflateInit');
+
+  while TRUE do
+  begin
+    d_stream.next_out := uncompr;            (* discard the output *)
+    d_stream.avail_out := Integer(uncomprLen);
+    err := inflate(d_stream, Z_NO_FLUSH);
+    if err = Z_STREAM_END then
+      break;
+    CHECK_ERR(err, 'large inflate');
+  end;
+
+  err := inflateEnd(d_stream);
+  CHECK_ERR(err, 'inflateEnd');
+
+  if d_stream.total_out <> 2 * uncomprLen + comprLen div 2 then
+  begin
+    WriteLn('bad large inflate: ', d_stream.total_out);
+    Halt(1);
+  end
+  else
+    WriteLn('large_inflate(): OK');
+end;
+{$ENDIF}
+
+(* ===========================================================================
+ * Test deflate with full flush
+ *)
+{$IFDEF TEST_FLUSH}
+procedure test_flush(compr: Pointer; var comprLen : LongInt);
+var c_stream: z_stream; (* compression stream *)
+    err: Integer;
+    len: Integer;
+begin
+  len := StrLen(hello)+1;
+
+  c_stream.zalloc := NIL;
+  c_stream.zfree := NIL;
+  c_stream.opaque := NIL;
+
+  err := deflateInit(c_stream, Z_DEFAULT_COMPRESSION);
+  CHECK_ERR(err, 'deflateInit');
+
+  c_stream.next_in := hello;
+  c_stream.next_out := compr;
+  c_stream.avail_in := 3;
+  c_stream.avail_out := Integer(comprLen);
+  err := deflate(c_stream, Z_FULL_FLUSH);
+  CHECK_ERR(err, 'deflate');
+
+  Inc(PByteArray(compr)^[3]); (* force an error in first compressed block *)
+  c_stream.avail_in := len - 3;
+
+  err := deflate(c_stream, Z_FINISH);
+  if err <> Z_STREAM_END then
+    CHECK_ERR(err, 'deflate');
+
+  err := deflateEnd(c_stream);
+  CHECK_ERR(err, 'deflateEnd');
+
+  comprLen := c_stream.total_out;
+end;
+{$ENDIF}
+
+(* ===========================================================================
+ * Test inflateSync()
+ *)
+{$IFDEF TEST_SYNC}
+procedure test_sync(compr: Pointer; comprLen: LongInt;
+                    uncompr: Pointer; uncomprLen : LongInt);
+var err: Integer;
+    d_stream: z_stream; (* decompression stream *)
+begin
+  StrCopy(PChar(uncompr), 'garbage');
+
+  d_stream.zalloc := NIL;
+  d_stream.zfree := NIL;
+  d_stream.opaque := NIL;
+
+  d_stream.next_in := compr;
+  d_stream.avail_in := 2; (* just read the zlib header *)
+
+  err := inflateInit(d_stream);
+  CHECK_ERR(err, 'inflateInit');
+
+  d_stream.next_out := uncompr;
+  d_stream.avail_out := Integer(uncomprLen);
+
+  inflate(d_stream, Z_NO_FLUSH);
+  CHECK_ERR(err, 'inflate');
+
+  d_stream.avail_in := Integer(comprLen-2);   (* read all compressed data *)
+  err := inflateSync(d_stream);               (* but skip the damaged part *)
+  CHECK_ERR(err, 'inflateSync');
+
+  err := inflate(d_stream, Z_FINISH);
+  if err <> Z_DATA_ERROR then
+    EXIT_ERR('inflate should report DATA_ERROR');
+    (* Because of incorrect adler32 *)
+
+  err := inflateEnd(d_stream);
+  CHECK_ERR(err, 'inflateEnd');
+
+  WriteLn('after inflateSync(): hel', PChar(uncompr));
+end;
+{$ENDIF}
+
+(* ===========================================================================
+ * Test deflate with preset dictionary
+ *)
+{$IFDEF TEST_DICT}
+procedure test_dict_deflate(compr: Pointer; comprLen: LongInt);
+var c_stream: z_stream; (* compression stream *)
+    err: Integer;
+begin
+  c_stream.zalloc := NIL;
+  c_stream.zfree := NIL;
+  c_stream.opaque := NIL;
+
+  err := deflateInit(c_stream, Z_BEST_COMPRESSION);
+  CHECK_ERR(err, 'deflateInit');
+
+  err := deflateSetDictionary(c_stream, dictionary, StrLen(dictionary));
+  CHECK_ERR(err, 'deflateSetDictionary');
+
+  dictId := c_stream.adler;
+  c_stream.next_out := compr;
+  c_stream.avail_out := Integer(comprLen);
+
+  c_stream.next_in := hello;
+  c_stream.avail_in := StrLen(hello)+1;
+
+  err := deflate(c_stream, Z_FINISH);
+  if err <> Z_STREAM_END then
+    EXIT_ERR('deflate should report Z_STREAM_END');
+
+  err := deflateEnd(c_stream);
+  CHECK_ERR(err, 'deflateEnd');
+end;
+{$ENDIF}
+
+(* ===========================================================================
+ * Test inflate with a preset dictionary
+ *)
+{$IFDEF TEST_DICT}
+procedure test_dict_inflate(compr: Pointer; comprLen: LongInt;
+                            uncompr: Pointer; uncomprLen: LongInt);
+var err: Integer;
+    d_stream: z_stream; (* decompression stream *)
+begin
+  StrCopy(PChar(uncompr), 'garbage');
+
+  d_stream.zalloc := NIL;
+  d_stream.zfree := NIL;
+  d_stream.opaque := NIL;
+
+  d_stream.next_in := compr;
+  d_stream.avail_in := Integer(comprLen);
+
+  err := inflateInit(d_stream);
+  CHECK_ERR(err, 'inflateInit');
+
+  d_stream.next_out := uncompr;
+  d_stream.avail_out := Integer(uncomprLen);
+
+  while TRUE do
+  begin
+    err := inflate(d_stream, Z_NO_FLUSH);
+    if err = Z_STREAM_END then
+      break;
+    if err = Z_NEED_DICT then
+    begin
+      if d_stream.adler <> dictId then
+        EXIT_ERR('unexpected dictionary');
+      err := inflateSetDictionary(d_stream, dictionary, StrLen(dictionary));
+    end;
+    CHECK_ERR(err, 'inflate with dict');
+  end;
+
+  err := inflateEnd(d_stream);
+  CHECK_ERR(err, 'inflateEnd');
+
+  if StrComp(PChar(uncompr), hello) <> 0 then
+    EXIT_ERR('bad inflate with dict')
+  else
+    WriteLn('inflate with dictionary: ', PChar(uncompr));
+end;
+{$ENDIF}
+
+var compr, uncompr: Pointer;
+    comprLen, uncomprLen: LongInt;
+
+begin
+  if zlibVersion^ <> ZLIB_VERSION[1] then
+    EXIT_ERR('Incompatible zlib version');
+
+  WriteLn('zlib version: ', zlibVersion);
+  WriteLn('zlib compile flags: ', Format('0x%x', [zlibCompileFlags]));
+
+  comprLen := 10000 * SizeOf(Integer); (* don't overflow on MSDOS *)
+  uncomprLen := comprLen;
+  GetMem(compr, comprLen);
+  GetMem(uncompr, uncomprLen);
+  if (compr = NIL) or (uncompr = NIL) then
+    EXIT_ERR('Out of memory');
+  (* compr and uncompr are cleared to avoid reading uninitialized
+   * data and to ensure that uncompr compresses well.
+   *)
+  FillChar(compr^, comprLen, 0);
+  FillChar(uncompr^, uncomprLen, 0);
+
+  {$IFDEF TEST_COMPRESS}
+  WriteLn('** Testing compress');
+  test_compress(compr, comprLen, uncompr, uncomprLen);
+  {$ENDIF}
+
+  {$IFDEF TEST_GZIO}
+  WriteLn('** Testing gzio');
+  if ParamCount >= 1 then
+    test_gzio(ParamStr(1), uncompr, uncomprLen)
+  else
+    test_gzio(TESTFILE, uncompr, uncomprLen);
+  {$ENDIF}
+
+  {$IFDEF TEST_DEFLATE}
+  WriteLn('** Testing deflate with small buffers');
+  test_deflate(compr, comprLen);
+  {$ENDIF}
+  {$IFDEF TEST_INFLATE}
+  WriteLn('** Testing inflate with small buffers');
+  test_inflate(compr, comprLen, uncompr, uncomprLen);
+  {$ENDIF}
+
+  {$IFDEF TEST_DEFLATE}
+  WriteLn('** Testing deflate with large buffers');
+  test_large_deflate(compr, comprLen, uncompr, uncomprLen);
+  {$ENDIF}
+  {$IFDEF TEST_INFLATE}
+  WriteLn('** Testing inflate with large buffers');
+  test_large_inflate(compr, comprLen, uncompr, uncomprLen);
+  {$ENDIF}
+
+  {$IFDEF TEST_FLUSH}
+  WriteLn('** Testing deflate with full flush');
+  test_flush(compr, comprLen);
+  {$ENDIF}
+  {$IFDEF TEST_SYNC}
+  WriteLn('** Testing inflateSync');
+  test_sync(compr, comprLen, uncompr, uncomprLen);
+  {$ENDIF}
+  comprLen := uncomprLen;
+
+  {$IFDEF TEST_DICT}
+  WriteLn('** Testing deflate and inflate with preset dictionary');
+  test_dict_deflate(compr, comprLen);
+  test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
+  {$ENDIF}
+
+  FreeMem(compr, comprLen);
+  FreeMem(uncompr, uncomprLen);
+end.
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/pascal/readme.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/pascal/readme.txt
new file mode 100644
index 00000000..60e87c8a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/pascal/readme.txt
@@ -0,0 +1,76 @@
+
+This directory contains a Pascal (Delphi, Kylix) interface to the
+zlib data compression library.
+
+
+Directory listing
+=================
+
+zlibd32.mak     makefile for Borland C++
+example.pas     usage example of zlib
+zlibpas.pas     the Pascal interface to zlib
+readme.txt      this file
+
+
+Compatibility notes
+===================
+
+- Although the name "zlib" would have been more normal for the
+  zlibpas unit, this name is already taken by Borland's ZLib unit.
+  This is somehow unfortunate, because that unit is not a genuine
+  interface to the full-fledged zlib functionality, but a suite of
+  class wrappers around zlib streams.  Other essential features,
+  such as checksums, are missing.
+  It would have been more appropriate for that unit to have a name
+  like "ZStreams", or something similar.
+
+- The C and zlib-supplied types int, uInt, long, uLong, etc. are
+  translated directly into Pascal types of similar sizes (Integer,
+  LongInt, etc.), to avoid namespace pollution.  In particular,
+  there is no conversion of unsigned int into a Pascal unsigned
+  integer.  The Word type is non-portable and has the same size
+  (16 bits) both in a 16-bit and in a 32-bit environment, unlike
+  Integer.  Even if there is a 32-bit Cardinal type, there is no
+  real need for unsigned int in zlib under a 32-bit environment.
+
+- Except for the callbacks, the zlib function interfaces are
+  assuming the calling convention normally used in Pascal
+  (__pascal for DOS and Windows16, __fastcall for Windows32).
+  Since the cdecl keyword is used, the old Turbo Pascal does
+  not work with this interface.
+
+- The gz* function interfaces are not translated, to avoid
+  interfacing problems with the C runtime library.  Besides,
+    gzprintf(gzFile file, const char *format, ...)
+  cannot be translated into Pascal.
+
+
+Legal issues
+============
+
+The zlibpas interface is:
+  Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler.
+  Copyright (C) 1998 by Bob Dellaca.
+  Copyright (C) 2003 by Cosmin Truta.
+
+The example program is:
+  Copyright (C) 1995-2003 by Jean-loup Gailly.
+  Copyright (C) 1998,1999,2000 by Jacques Nomssi Nzali.
+  Copyright (C) 2003 by Cosmin Truta.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the author be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/pascal/zlibd32.mak b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/pascal/zlibd32.mak
new file mode 100644
index 00000000..0d0699a6
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/pascal/zlibd32.mak
@@ -0,0 +1,99 @@
+# Makefile for zlib
+# For use with Delphi and C++ Builder under Win32
+# Updated for zlib 1.2.x by Cosmin Truta
+
+# ------------ Borland C++ ------------
+
+# This project uses the Delphi (fastcall/register) calling convention:
+LOC = -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
+
+CC = bcc32
+LD = bcc32
+AR = tlib
+# do not use "-pr" in CFLAGS
+CFLAGS = -a -d -k- -O2 $(LOC)
+LDFLAGS =
+
+
+# variables
+ZLIB_LIB = zlib.lib
+
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
+OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
+OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
+
+
+# targets
+all: $(ZLIB_LIB) example.exe minigzip.exe
+
+.c.obj:
+	$(CC) -c $(CFLAGS) $*.c
+
+adler32.obj: adler32.c zlib.h zconf.h
+
+compress.obj: compress.c zlib.h zconf.h
+
+crc32.obj: crc32.c zlib.h zconf.h crc32.h
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+
+gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
+
+gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
+
+gzread.obj: gzread.c zlib.h zconf.h gzguts.h
+
+gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
+
+infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+
+trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+
+example.obj: example.c zlib.h zconf.h
+
+minigzip.obj: minigzip.c zlib.h zconf.h
+
+
+# For the sake of the old Borland make,
+# the command line is cut to fit in the MS-DOS 128 byte limit:
+$(ZLIB_LIB): $(OBJ1) $(OBJ2)
+	-del $(ZLIB_LIB)
+	$(AR) $(ZLIB_LIB) $(OBJP1)
+	$(AR) $(ZLIB_LIB) $(OBJP2)
+
+
+# testing
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d
+
+example.exe: example.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
+
+minigzip.exe: minigzip.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
+
+
+# cleanup
+clean:
+	-del *.obj
+	-del *.exe
+	-del *.lib
+	-del *.tds
+	-del zlib.bak
+	-del foo.gz
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/pascal/zlibpas.pas b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/pascal/zlibpas.pas
new file mode 100644
index 00000000..637ae3a3
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/pascal/zlibpas.pas
@@ -0,0 +1,236 @@
+(* zlibpas -- Pascal interface to the zlib data compression library
+ *
+ * Copyright (C) 2003 Cosmin Truta.
+ * Derived from original sources by Bob Dellaca.
+ * For conditions of distribution and use, see copyright notice in readme.txt
+ *)
+
+unit zlibpas;
+
+interface
+
+const
+  ZLIB_VERSION = '1.2.5';
+
+type
+  alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
+                 cdecl;
+  free_func  = procedure(opaque, address: Pointer);
+                 cdecl;
+
+  in_func    = function(opaque: Pointer; var buf: PByte): Integer;
+                 cdecl;
+  out_func   = function(opaque: Pointer; buf: PByte; size: Integer): Integer;
+                 cdecl;
+
+  z_streamp = ^z_stream;
+  z_stream = packed record
+    next_in: PChar;       (* next input byte *)
+    avail_in: Integer;    (* number of bytes available at next_in *)
+    total_in: LongInt;    (* total nb of input bytes read so far *)
+
+    next_out: PChar;      (* next output byte should be put there *)
+    avail_out: Integer;   (* remaining free space at next_out *)
+    total_out: LongInt;   (* total nb of bytes output so far *)
+
+    msg: PChar;           (* last error message, NULL if no error *)
+    state: Pointer;       (* not visible by applications *)
+
+    zalloc: alloc_func;   (* used to allocate the internal state *)
+    zfree: free_func;     (* used to free the internal state *)
+    opaque: Pointer;      (* private data object passed to zalloc and zfree *)
+
+    data_type: Integer;   (* best guess about the data type: ascii or binary *)
+    adler: LongInt;       (* adler32 value of the uncompressed data *)
+    reserved: LongInt;    (* reserved for future use *)
+  end;
+
+(* constants *)
+const
+  Z_NO_FLUSH      = 0;
+  Z_PARTIAL_FLUSH = 1;
+  Z_SYNC_FLUSH    = 2;
+  Z_FULL_FLUSH    = 3;
+  Z_FINISH        = 4;
+
+  Z_OK            =  0;
+  Z_STREAM_END    =  1;
+  Z_NEED_DICT     =  2;
+  Z_ERRNO         = -1;
+  Z_STREAM_ERROR  = -2;
+  Z_DATA_ERROR    = -3;
+  Z_MEM_ERROR     = -4;
+  Z_BUF_ERROR     = -5;
+  Z_VERSION_ERROR = -6;
+
+  Z_NO_COMPRESSION       =  0;
+  Z_BEST_SPEED           =  1;
+  Z_BEST_COMPRESSION     =  9;
+  Z_DEFAULT_COMPRESSION  = -1;
+
+  Z_FILTERED            = 1;
+  Z_HUFFMAN_ONLY        = 2;
+  Z_RLE                 = 3;
+  Z_DEFAULT_STRATEGY    = 0;
+
+  Z_BINARY   = 0;
+  Z_ASCII    = 1;
+  Z_UNKNOWN  = 2;
+
+  Z_DEFLATED = 8;
+
+(* basic functions *)
+function zlibVersion: PChar;
+function deflateInit(var strm: z_stream; level: Integer): Integer;
+function deflate(var strm: z_stream; flush: Integer): Integer;
+function deflateEnd(var strm: z_stream): Integer;
+function inflateInit(var strm: z_stream): Integer;
+function inflate(var strm: z_stream; flush: Integer): Integer;
+function inflateEnd(var strm: z_stream): Integer;
+
+(* advanced functions *)
+function deflateInit2(var strm: z_stream; level, method, windowBits,
+                      memLevel, strategy: Integer): Integer;
+function deflateSetDictionary(var strm: z_stream; const dictionary: PChar;
+                              dictLength: Integer): Integer;
+function deflateCopy(var dest, source: z_stream): Integer;
+function deflateReset(var strm: z_stream): Integer;
+function deflateParams(var strm: z_stream; level, strategy: Integer): Integer;
+function deflateBound(var strm: z_stream; sourceLen: LongInt): LongInt;
+function deflatePrime(var strm: z_stream; bits, value: Integer): Integer;
+function inflateInit2(var strm: z_stream; windowBits: Integer): Integer;
+function inflateSetDictionary(var strm: z_stream; const dictionary: PChar;
+                              dictLength: Integer): Integer;
+function inflateSync(var strm: z_stream): Integer;
+function inflateCopy(var dest, source: z_stream): Integer;
+function inflateReset(var strm: z_stream): Integer;
+function inflateBackInit(var strm: z_stream;
+                         windowBits: Integer; window: PChar): Integer;
+function inflateBack(var strm: z_stream; in_fn: in_func; in_desc: Pointer;
+                     out_fn: out_func; out_desc: Pointer): Integer;
+function inflateBackEnd(var strm: z_stream): Integer;
+function zlibCompileFlags: LongInt;
+
+(* utility functions *)
+function compress(dest: PChar; var destLen: LongInt;
+                  const source: PChar; sourceLen: LongInt): Integer;
+function compress2(dest: PChar; var destLen: LongInt;
+                  const source: PChar; sourceLen: LongInt;
+                  level: Integer): Integer;
+function compressBound(sourceLen: LongInt): LongInt;
+function uncompress(dest: PChar; var destLen: LongInt;
+                    const source: PChar; sourceLen: LongInt): Integer;
+
+(* checksum functions *)
+function adler32(adler: LongInt; const buf: PChar; len: Integer): LongInt;
+function crc32(crc: LongInt; const buf: PChar; len: Integer): LongInt;
+
+(* various hacks, don't look :) *)
+function deflateInit_(var strm: z_stream; level: Integer;
+                      const version: PChar; stream_size: Integer): Integer;
+function inflateInit_(var strm: z_stream; const version: PChar;
+                      stream_size: Integer): Integer;
+function deflateInit2_(var strm: z_stream;
+                       level, method, windowBits, memLevel, strategy: Integer;
+                       const version: PChar; stream_size: Integer): Integer;
+function inflateInit2_(var strm: z_stream; windowBits: Integer;
+                       const version: PChar; stream_size: Integer): Integer;
+function inflateBackInit_(var strm: z_stream;
+                          windowBits: Integer; window: PChar;
+                          const version: PChar; stream_size: Integer): Integer;
+
+
+implementation
+
+{$L adler32.obj}
+{$L compress.obj}
+{$L crc32.obj}
+{$L deflate.obj}
+{$L infback.obj}
+{$L inffast.obj}
+{$L inflate.obj}
+{$L inftrees.obj}
+{$L trees.obj}
+{$L uncompr.obj}
+{$L zutil.obj}
+
+function adler32; external;
+function compress; external;
+function compress2; external;
+function compressBound; external;
+function crc32; external;
+function deflate; external;
+function deflateBound; external;
+function deflateCopy; external;
+function deflateEnd; external;
+function deflateInit_; external;
+function deflateInit2_; external;
+function deflateParams; external;
+function deflatePrime; external;
+function deflateReset; external;
+function deflateSetDictionary; external;
+function inflate; external;
+function inflateBack; external;
+function inflateBackEnd; external;
+function inflateBackInit_; external;
+function inflateCopy; external;
+function inflateEnd; external;
+function inflateInit_; external;
+function inflateInit2_; external;
+function inflateReset; external;
+function inflateSetDictionary; external;
+function inflateSync; external;
+function uncompress; external;
+function zlibCompileFlags; external;
+function zlibVersion; external;
+
+function deflateInit(var strm: z_stream; level: Integer): Integer;
+begin
+  Result := deflateInit_(strm, level, ZLIB_VERSION, sizeof(z_stream));
+end;
+
+function deflateInit2(var strm: z_stream; level, method, windowBits, memLevel,
+                      strategy: Integer): Integer;
+begin
+  Result := deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+                          ZLIB_VERSION, sizeof(z_stream));
+end;
+
+function inflateInit(var strm: z_stream): Integer;
+begin
+  Result := inflateInit_(strm, ZLIB_VERSION, sizeof(z_stream));
+end;
+
+function inflateInit2(var strm: z_stream; windowBits: Integer): Integer;
+begin
+  Result := inflateInit2_(strm, windowBits, ZLIB_VERSION, sizeof(z_stream));
+end;
+
+function inflateBackInit(var strm: z_stream;
+                         windowBits: Integer; window: PChar): Integer;
+begin
+  Result := inflateBackInit_(strm, windowBits, window,
+                             ZLIB_VERSION, sizeof(z_stream));
+end;
+
+function _malloc(Size: Integer): Pointer; cdecl;
+begin
+  GetMem(Result, Size);
+end;
+
+procedure _free(Block: Pointer); cdecl;
+begin
+  FreeMem(Block);
+end;
+
+procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl;
+begin
+  FillChar(P^, count, B);
+end;
+
+procedure _memcpy(dest, source: Pointer; count: Integer); cdecl;
+begin
+  Move(source^, dest^, count);
+end;
+
+end.
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/Makefile b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/Makefile
new file mode 100644
index 00000000..b6b69404
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/Makefile
@@ -0,0 +1,8 @@
+puff: puff.c puff.h
+	cc -DTEST -o puff puff.c
+
+test: puff
+	puff zeros.raw
+
+clean:
+	rm -f puff puff.o
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/README b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/README
new file mode 100644
index 00000000..bbc4cb59
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/README
@@ -0,0 +1,63 @@
+Puff -- A Simple Inflate
+3 Mar 2003
+Mark Adler
+madler@alumni.caltech.edu
+
+What this is --
+
+puff.c provides the routine puff() to decompress the deflate data format.  It
+does so more slowly than zlib, but the code is about one-fifth the size of the
+inflate code in zlib, and written to be very easy to read.
+
+Why I wrote this --
+
+puff.c was written to document the deflate format unambiguously, by virtue of
+being working C code.  It is meant to supplement RFC 1951, which formally
+describes the deflate format.  I have received many questions on details of the
+deflate format, and I hope that reading this code will answer those questions.
+puff.c is heavily commented with details of the deflate format, especially
+those little nooks and cranies of the format that might not be obvious from a
+specification.
+
+puff.c may also be useful in applications where code size or memory usage is a
+very limited resource, and speed is not as important.
+
+How to use it --
+
+Well, most likely you should just be reading puff.c and using zlib for actual
+applications, but if you must ...
+
+Include puff.h in your code, which provides this prototype:
+
+int puff(unsigned char *dest,           /* pointer to destination pointer */
+         unsigned long *destlen,        /* amount of output space */
+         unsigned char *source,         /* pointer to source data pointer */
+         unsigned long *sourcelen);     /* amount of input available */
+
+Then you can call puff() to decompress a deflate stream that is in memory in
+its entirety at source, to a sufficiently sized block of memory for the
+decompressed data at dest.  puff() is the only external symbol in puff.c  The
+only C library functions that puff.c needs are setjmp() and longjmp(), which
+are used to simplify error checking in the code to improve readabilty.  puff.c
+does no memory allocation, and uses less than 2K bytes off of the stack.
+
+If destlen is not enough space for the uncompressed data, then inflate will
+return an error without writing more than destlen bytes.  Note that this means
+that in order to decompress the deflate data successfully, you need to know
+the size of the uncompressed data ahead of time.
+
+If needed, puff() can determine the size of the uncompressed data with no
+output space.  This is done by passing dest equal to (unsigned char *)0.  Then
+the initial value of *destlen is ignored and *destlen is set to the length of
+the uncompressed data.  So if the size of the uncompressed data is not known,
+then two passes of puff() can be used--first to determine the size, and second
+to do the actual inflation after allocating the appropriate memory.  Not
+pretty, but it works.  (This is one of the reasons you should be using zlib.)
+
+The deflate format is self-terminating.  If the deflate stream does not end
+in *sourcelen bytes, puff() will return an error without reading at or past
+endsource.
+
+On return, *sourcelen is updated to the amount of input data consumed, and
+*destlen is updated to the size of the uncompressed data.  See the comments
+in puff.c for the possible return codes for puff().
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/puff.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/puff.c
new file mode 100644
index 00000000..650694e9
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/puff.c
@@ -0,0 +1,955 @@
+/*
+ * puff.c
+ * Copyright (C) 2002-2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in puff.h
+ * version 2.1, 4 Apr 2010
+ *
+ * puff.c is a simple inflate written to be an unambiguous way to specify the
+ * deflate format.  It is not written for speed but rather simplicity.  As a
+ * side benefit, this code might actually be useful when small code is more
+ * important than speed, such as bootstrap applications.  For typical deflate
+ * data, zlib's inflate() is about four times as fast as puff().  zlib's
+ * inflate compiles to around 20K on my machine, whereas puff.c compiles to
+ * around 4K on my machine (a PowerPC using GNU cc).  If the faster decode()
+ * function here is used, then puff() is only twice as slow as zlib's
+ * inflate().
+ *
+ * All dynamically allocated memory comes from the stack.  The stack required
+ * is less than 2K bytes.  This code is compatible with 16-bit int's and
+ * assumes that long's are at least 32 bits.  puff.c uses the short data type,
+ * assumed to be 16 bits, for arrays in order to to conserve memory.  The code
+ * works whether integers are stored big endian or little endian.
+ *
+ * In the comments below are "Format notes" that describe the inflate process
+ * and document some of the less obvious aspects of the format.  This source
+ * code is meant to supplement RFC 1951, which formally describes the deflate
+ * format:
+ *
+ *    http://www.zlib.org/rfc-deflate.html
+ */
+
+/*
+ * Change history:
+ *
+ * 1.0  10 Feb 2002     - First version
+ * 1.1  17 Feb 2002     - Clarifications of some comments and notes
+ *                      - Update puff() dest and source pointers on negative
+ *                        errors to facilitate debugging deflators
+ *                      - Remove longest from struct huffman -- not needed
+ *                      - Simplify offs[] index in construct()
+ *                      - Add input size and checking, using longjmp() to
+ *                        maintain easy readability
+ *                      - Use short data type for large arrays
+ *                      - Use pointers instead of long to specify source and
+ *                        destination sizes to avoid arbitrary 4 GB limits
+ * 1.2  17 Mar 2002     - Add faster version of decode(), doubles speed (!),
+ *                        but leave simple version for readabilty
+ *                      - Make sure invalid distances detected if pointers
+ *                        are 16 bits
+ *                      - Fix fixed codes table error
+ *                      - Provide a scanning mode for determining size of
+ *                        uncompressed data
+ * 1.3  20 Mar 2002     - Go back to lengths for puff() parameters [Jean-loup]
+ *                      - Add a puff.h file for the interface
+ *                      - Add braces in puff() for else do [Jean-loup]
+ *                      - Use indexes instead of pointers for readability
+ * 1.4  31 Mar 2002     - Simplify construct() code set check
+ *                      - Fix some comments
+ *                      - Add FIXLCODES #define
+ * 1.5   6 Apr 2002     - Minor comment fixes
+ * 1.6   7 Aug 2002     - Minor format changes
+ * 1.7   3 Mar 2003     - Added test code for distribution
+ *                      - Added zlib-like license
+ * 1.8   9 Jan 2004     - Added some comments on no distance codes case
+ * 1.9  21 Feb 2008     - Fix bug on 16-bit integer architectures [Pohland]
+ *                      - Catch missing end-of-block symbol error
+ * 2.0  25 Jul 2008     - Add #define to permit distance too far back
+ *                      - Add option in TEST code for puff to write the data
+ *                      - Add option in TEST code to skip input bytes
+ *                      - Allow TEST code to read from piped stdin
+ * 2.1   4 Apr 2010     - Avoid variable initialization for happier compilers
+ *                      - Avoid unsigned comparisons for even happier compilers
+ */
+
+#include <setjmp.h>             /* for setjmp(), longjmp(), and jmp_buf */
+#include "puff.h"               /* prototype for puff() */
+
+#define local static            /* for local function definitions */
+#define NIL ((unsigned char *)0)        /* for no output option */
+
+/*
+ * Maximums for allocations and loops.  It is not useful to change these --
+ * they are fixed by the deflate format.
+ */
+#define MAXBITS 15              /* maximum bits in a code */
+#define MAXLCODES 286           /* maximum number of literal/length codes */
+#define MAXDCODES 30            /* maximum number of distance codes */
+#define MAXCODES (MAXLCODES+MAXDCODES)  /* maximum codes lengths to read */
+#define FIXLCODES 288           /* number of fixed literal/length codes */
+
+/* input and output state */
+struct state {
+    /* output state */
+    unsigned char *out;         /* output buffer */
+    unsigned long outlen;       /* available space at out */
+    unsigned long outcnt;       /* bytes written to out so far */
+
+    /* input state */
+    unsigned char *in;          /* input buffer */
+    unsigned long inlen;        /* available input at in */
+    unsigned long incnt;        /* bytes read so far */
+    int bitbuf;                 /* bit buffer */
+    int bitcnt;                 /* number of bits in bit buffer */
+
+    /* input limit error return state for bits() and decode() */
+    jmp_buf env;
+};
+
+/*
+ * Return need bits from the input stream.  This always leaves less than
+ * eight bits in the buffer.  bits() works properly for need == 0.
+ *
+ * Format notes:
+ *
+ * - Bits are stored in bytes from the least significant bit to the most
+ *   significant bit.  Therefore bits are dropped from the bottom of the bit
+ *   buffer, using shift right, and new bytes are appended to the top of the
+ *   bit buffer, using shift left.
+ */
+local int bits(struct state *s, int need)
+{
+    long val;           /* bit accumulator (can use up to 20 bits) */
+
+    /* load at least need bits into val */
+    val = s->bitbuf;
+    while (s->bitcnt < need) {
+        if (s->incnt == s->inlen) longjmp(s->env, 1);   /* out of input */
+        val |= (long)(s->in[s->incnt++]) << s->bitcnt;  /* load eight bits */
+        s->bitcnt += 8;
+    }
+
+    /* drop need bits and update buffer, always zero to seven bits left */
+    s->bitbuf = (int)(val >> need);
+    s->bitcnt -= need;
+
+    /* return need bits, zeroing the bits above that */
+    return (int)(val & ((1L << need) - 1));
+}
+
+/*
+ * Process a stored block.
+ *
+ * Format notes:
+ *
+ * - After the two-bit stored block type (00), the stored block length and
+ *   stored bytes are byte-aligned for fast copying.  Therefore any leftover
+ *   bits in the byte that has the last bit of the type, as many as seven, are
+ *   discarded.  The value of the discarded bits are not defined and should not
+ *   be checked against any expectation.
+ *
+ * - The second inverted copy of the stored block length does not have to be
+ *   checked, but it's probably a good idea to do so anyway.
+ *
+ * - A stored block can have zero length.  This is sometimes used to byte-align
+ *   subsets of the compressed data for random access or partial recovery.
+ */
+local int stored(struct state *s)
+{
+    unsigned len;       /* length of stored block */
+
+    /* discard leftover bits from current byte (assumes s->bitcnt < 8) */
+    s->bitbuf = 0;
+    s->bitcnt = 0;
+
+    /* get length and check against its one's complement */
+    if (s->incnt + 4 > s->inlen) return 2;      /* not enough input */
+    len = s->in[s->incnt++];
+    len |= s->in[s->incnt++] << 8;
+    if (s->in[s->incnt++] != (~len & 0xff) ||
+        s->in[s->incnt++] != ((~len >> 8) & 0xff))
+        return -2;                              /* didn't match complement! */
+
+    /* copy len bytes from in to out */
+    if (s->incnt + len > s->inlen) return 2;    /* not enough input */
+    if (s->out != NIL) {
+        if (s->outcnt + len > s->outlen)
+            return 1;                           /* not enough output space */
+        while (len--)
+            s->out[s->outcnt++] = s->in[s->incnt++];
+    }
+    else {                                      /* just scanning */
+        s->outcnt += len;
+        s->incnt += len;
+    }
+
+    /* done with a valid stored block */
+    return 0;
+}
+
+/*
+ * Huffman code decoding tables.  count[1..MAXBITS] is the number of symbols of
+ * each length, which for a canonical code are stepped through in order.
+ * symbol[] are the symbol values in canonical order, where the number of
+ * entries is the sum of the counts in count[].  The decoding process can be
+ * seen in the function decode() below.
+ */
+struct huffman {
+    short *count;       /* number of symbols of each length */
+    short *symbol;      /* canonically ordered symbols */
+};
+
+/*
+ * Decode a code from the stream s using huffman table h.  Return the symbol or
+ * a negative value if there is an error.  If all of the lengths are zero, i.e.
+ * an empty code, or if the code is incomplete and an invalid code is received,
+ * then -10 is returned after reading MAXBITS bits.
+ *
+ * Format notes:
+ *
+ * - The codes as stored in the compressed data are bit-reversed relative to
+ *   a simple integer ordering of codes of the same lengths.  Hence below the
+ *   bits are pulled from the compressed data one at a time and used to
+ *   build the code value reversed from what is in the stream in order to
+ *   permit simple integer comparisons for decoding.  A table-based decoding
+ *   scheme (as used in zlib) does not need to do this reversal.
+ *
+ * - The first code for the shortest length is all zeros.  Subsequent codes of
+ *   the same length are simply integer increments of the previous code.  When
+ *   moving up a length, a zero bit is appended to the code.  For a complete
+ *   code, the last code of the longest length will be all ones.
+ *
+ * - Incomplete codes are handled by this decoder, since they are permitted
+ *   in the deflate format.  See the format notes for fixed() and dynamic().
+ */
+#ifdef SLOW
+local int decode(struct state *s, struct huffman *h)
+{
+    int len;            /* current number of bits in code */
+    int code;           /* len bits being decoded */
+    int first;          /* first code of length len */
+    int count;          /* number of codes of length len */
+    int index;          /* index of first code of length len in symbol table */
+
+    code = first = index = 0;
+    for (len = 1; len <= MAXBITS; len++) {
+        code |= bits(s, 1);             /* get next bit */
+        count = h->count[len];
+        if (code - count < first)       /* if length len, return symbol */
+            return h->symbol[index + (code - first)];
+        index += count;                 /* else update for next length */
+        first += count;
+        first <<= 1;
+        code <<= 1;
+    }
+    return -10;                         /* ran out of codes */
+}
+
+/*
+ * A faster version of decode() for real applications of this code.   It's not
+ * as readable, but it makes puff() twice as fast.  And it only makes the code
+ * a few percent larger.
+ */
+#else /* !SLOW */
+local int decode(struct state *s, struct huffman *h)
+{
+    int len;            /* current number of bits in code */
+    int code;           /* len bits being decoded */
+    int first;          /* first code of length len */
+    int count;          /* number of codes of length len */
+    int index;          /* index of first code of length len in symbol table */
+    int bitbuf;         /* bits from stream */
+    int left;           /* bits left in next or left to process */
+    short *next;        /* next number of codes */
+
+    bitbuf = s->bitbuf;
+    left = s->bitcnt;
+    code = first = index = 0;
+    len = 1;
+    next = h->count + 1;
+    while (1) {
+        while (left--) {
+            code |= bitbuf & 1;
+            bitbuf >>= 1;
+            count = *next++;
+            if (code - count < first) { /* if length len, return symbol */
+                s->bitbuf = bitbuf;
+                s->bitcnt = (s->bitcnt - len) & 7;
+                return h->symbol[index + (code - first)];
+            }
+            index += count;             /* else update for next length */
+            first += count;
+            first <<= 1;
+            code <<= 1;
+            len++;
+        }
+        left = (MAXBITS+1) - len;
+        if (left == 0) break;
+        if (s->incnt == s->inlen) longjmp(s->env, 1);   /* out of input */
+        bitbuf = s->in[s->incnt++];
+        if (left > 8) left = 8;
+    }
+    return -10;                         /* ran out of codes */
+}
+#endif /* SLOW */
+
+/*
+ * Given the list of code lengths length[0..n-1] representing a canonical
+ * Huffman code for n symbols, construct the tables required to decode those
+ * codes.  Those tables are the number of codes of each length, and the symbols
+ * sorted by length, retaining their original order within each length.  The
+ * return value is zero for a complete code set, negative for an over-
+ * subscribed code set, and positive for an incomplete code set.  The tables
+ * can be used if the return value is zero or positive, but they cannot be used
+ * if the return value is negative.  If the return value is zero, it is not
+ * possible for decode() using that table to return an error--any stream of
+ * enough bits will resolve to a symbol.  If the return value is positive, then
+ * it is possible for decode() using that table to return an error for received
+ * codes past the end of the incomplete lengths.
+ *
+ * Not used by decode(), but used for error checking, h->count[0] is the number
+ * of the n symbols not in the code.  So n - h->count[0] is the number of
+ * codes.  This is useful for checking for incomplete codes that have more than
+ * one symbol, which is an error in a dynamic block.
+ *
+ * Assumption: for all i in 0..n-1, 0 <= length[i] <= MAXBITS
+ * This is assured by the construction of the length arrays in dynamic() and
+ * fixed() and is not verified by construct().
+ *
+ * Format notes:
+ *
+ * - Permitted and expected examples of incomplete codes are one of the fixed
+ *   codes and any code with a single symbol which in deflate is coded as one
+ *   bit instead of zero bits.  See the format notes for fixed() and dynamic().
+ *
+ * - Within a given code length, the symbols are kept in ascending order for
+ *   the code bits definition.
+ */
+local int construct(struct huffman *h, short *length, int n)
+{
+    int symbol;         /* current symbol when stepping through length[] */
+    int len;            /* current length when stepping through h->count[] */
+    int left;           /* number of possible codes left of current length */
+    short offs[MAXBITS+1];      /* offsets in symbol table for each length */
+
+    /* count number of codes of each length */
+    for (len = 0; len <= MAXBITS; len++)
+        h->count[len] = 0;
+    for (symbol = 0; symbol < n; symbol++)
+        (h->count[length[symbol]])++;   /* assumes lengths are within bounds */
+    if (h->count[0] == n)               /* no codes! */
+        return 0;                       /* complete, but decode() will fail */
+
+    /* check for an over-subscribed or incomplete set of lengths */
+    left = 1;                           /* one possible code of zero length */
+    for (len = 1; len <= MAXBITS; len++) {
+        left <<= 1;                     /* one more bit, double codes left */
+        left -= h->count[len];          /* deduct count from possible codes */
+        if (left < 0) return left;      /* over-subscribed--return negative */
+    }                                   /* left > 0 means incomplete */
+
+    /* generate offsets into symbol table for each length for sorting */
+    offs[1] = 0;
+    for (len = 1; len < MAXBITS; len++)
+        offs[len + 1] = offs[len] + h->count[len];
+
+    /*
+     * put symbols in table sorted by length, by symbol order within each
+     * length
+     */
+    for (symbol = 0; symbol < n; symbol++)
+        if (length[symbol] != 0)
+            h->symbol[offs[length[symbol]]++] = symbol;
+
+    /* return zero for complete set, positive for incomplete set */
+    return left;
+}
+
+/*
+ * Decode literal/length and distance codes until an end-of-block code.
+ *
+ * Format notes:
+ *
+ * - Compressed data that is after the block type if fixed or after the code
+ *   description if dynamic is a combination of literals and length/distance
+ *   pairs terminated by and end-of-block code.  Literals are simply Huffman
+ *   coded bytes.  A length/distance pair is a coded length followed by a
+ *   coded distance to represent a string that occurs earlier in the
+ *   uncompressed data that occurs again at the current location.
+ *
+ * - Literals, lengths, and the end-of-block code are combined into a single
+ *   code of up to 286 symbols.  They are 256 literals (0..255), 29 length
+ *   symbols (257..285), and the end-of-block symbol (256).
+ *
+ * - There are 256 possible lengths (3..258), and so 29 symbols are not enough
+ *   to represent all of those.  Lengths 3..10 and 258 are in fact represented
+ *   by just a length symbol.  Lengths 11..257 are represented as a symbol and
+ *   some number of extra bits that are added as an integer to the base length
+ *   of the length symbol.  The number of extra bits is determined by the base
+ *   length symbol.  These are in the static arrays below, lens[] for the base
+ *   lengths and lext[] for the corresponding number of extra bits.
+ *
+ * - The reason that 258 gets its own symbol is that the longest length is used
+ *   often in highly redundant files.  Note that 258 can also be coded as the
+ *   base value 227 plus the maximum extra value of 31.  While a good deflate
+ *   should never do this, it is not an error, and should be decoded properly.
+ *
+ * - If a length is decoded, including its extra bits if any, then it is
+ *   followed a distance code.  There are up to 30 distance symbols.  Again
+ *   there are many more possible distances (1..32768), so extra bits are added
+ *   to a base value represented by the symbol.  The distances 1..4 get their
+ *   own symbol, but the rest require extra bits.  The base distances and
+ *   corresponding number of extra bits are below in the static arrays dist[]
+ *   and dext[].
+ *
+ * - Literal bytes are simply written to the output.  A length/distance pair is
+ *   an instruction to copy previously uncompressed bytes to the output.  The
+ *   copy is from distance bytes back in the output stream, copying for length
+ *   bytes.
+ *
+ * - Distances pointing before the beginning of the output data are not
+ *   permitted.
+ *
+ * - Overlapped copies, where the length is greater than the distance, are
+ *   allowed and common.  For example, a distance of one and a length of 258
+ *   simply copies the last byte 258 times.  A distance of four and a length of
+ *   twelve copies the last four bytes three times.  A simple forward copy
+ *   ignoring whether the length is greater than the distance or not implements
+ *   this correctly.  You should not use memcpy() since its behavior is not
+ *   defined for overlapped arrays.  You should not use memmove() or bcopy()
+ *   since though their behavior -is- defined for overlapping arrays, it is
+ *   defined to do the wrong thing in this case.
+ */
+local int codes(struct state *s,
+                struct huffman *lencode,
+                struct huffman *distcode)
+{
+    int symbol;         /* decoded symbol */
+    int len;            /* length for copy */
+    unsigned dist;      /* distance for copy */
+    static const short lens[29] = { /* Size base for length codes 257..285 */
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258};
+    static const short lext[29] = { /* Extra bits for length codes 257..285 */
+        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0};
+    static const short dists[30] = { /* Offset base for distance codes 0..29 */
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+        8193, 12289, 16385, 24577};
+    static const short dext[30] = { /* Extra bits for distance codes 0..29 */
+        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
+        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
+        12, 12, 13, 13};
+
+    /* decode literals and length/distance pairs */
+    do {
+        symbol = decode(s, lencode);
+        if (symbol < 0) return symbol;  /* invalid symbol */
+        if (symbol < 256) {             /* literal: symbol is the byte */
+            /* write out the literal */
+            if (s->out != NIL) {
+                if (s->outcnt == s->outlen) return 1;
+                s->out[s->outcnt] = symbol;
+            }
+            s->outcnt++;
+        }
+        else if (symbol > 256) {        /* length */
+            /* get and compute length */
+            symbol -= 257;
+            if (symbol >= 29) return -10;       /* invalid fixed code */
+            len = lens[symbol] + bits(s, lext[symbol]);
+
+            /* get and check distance */
+            symbol = decode(s, distcode);
+            if (symbol < 0) return symbol;      /* invalid symbol */
+            dist = dists[symbol] + bits(s, dext[symbol]);
+#ifndef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+            if (dist > s->outcnt)
+                return -11;     /* distance too far back */
+#endif
+
+            /* copy length bytes from distance bytes back */
+            if (s->out != NIL) {
+                if (s->outcnt + len > s->outlen) return 1;
+                while (len--) {
+                    s->out[s->outcnt] =
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                        dist > s->outcnt ? 0 :
+#endif
+                        s->out[s->outcnt - dist];
+                    s->outcnt++;
+                }
+            }
+            else
+                s->outcnt += len;
+        }
+    } while (symbol != 256);            /* end of block symbol */
+
+    /* done with a valid fixed or dynamic block */
+    return 0;
+}
+
+/*
+ * Process a fixed codes block.
+ *
+ * Format notes:
+ *
+ * - This block type can be useful for compressing small amounts of data for
+ *   which the size of the code descriptions in a dynamic block exceeds the
+ *   benefit of custom codes for that block.  For fixed codes, no bits are
+ *   spent on code descriptions.  Instead the code lengths for literal/length
+ *   codes and distance codes are fixed.  The specific lengths for each symbol
+ *   can be seen in the "for" loops below.
+ *
+ * - The literal/length code is complete, but has two symbols that are invalid
+ *   and should result in an error if received.  This cannot be implemented
+ *   simply as an incomplete code since those two symbols are in the "middle"
+ *   of the code.  They are eight bits long and the longest literal/length\
+ *   code is nine bits.  Therefore the code must be constructed with those
+ *   symbols, and the invalid symbols must be detected after decoding.
+ *
+ * - The fixed distance codes also have two invalid symbols that should result
+ *   in an error if received.  Since all of the distance codes are the same
+ *   length, this can be implemented as an incomplete code.  Then the invalid
+ *   codes are detected while decoding.
+ */
+local int fixed(struct state *s)
+{
+    static int virgin = 1;
+    static short lencnt[MAXBITS+1], lensym[FIXLCODES];
+    static short distcnt[MAXBITS+1], distsym[MAXDCODES];
+    static struct huffman lencode, distcode;
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        int symbol;
+        short lengths[FIXLCODES];
+
+        /* literal/length table */
+        for (symbol = 0; symbol < 144; symbol++)
+            lengths[symbol] = 8;
+        for (; symbol < 256; symbol++)
+            lengths[symbol] = 9;
+        for (; symbol < 280; symbol++)
+            lengths[symbol] = 7;
+        for (; symbol < FIXLCODES; symbol++)
+            lengths[symbol] = 8;
+        construct(&lencode, lengths, FIXLCODES);
+
+        /* distance table */
+        for (symbol = 0; symbol < MAXDCODES; symbol++)
+            lengths[symbol] = 5;
+        construct(&distcode, lengths, MAXDCODES);
+
+        /* construct lencode and distcode */
+        lencode.count = lencnt;
+        lencode.symbol = lensym;
+        distcode.count = distcnt;
+        distcode.symbol = distsym;
+
+        /* do this just once */
+        virgin = 0;
+    }
+
+    /* decode data until end-of-block code */
+    return codes(s, &lencode, &distcode);
+}
+
+/*
+ * Process a dynamic codes block.
+ *
+ * Format notes:
+ *
+ * - A dynamic block starts with a description of the literal/length and
+ *   distance codes for that block.  New dynamic blocks allow the compressor to
+ *   rapidly adapt to changing data with new codes optimized for that data.
+ *
+ * - The codes used by the deflate format are "canonical", which means that
+ *   the actual bits of the codes are generated in an unambiguous way simply
+ *   from the number of bits in each code.  Therefore the code descriptions
+ *   are simply a list of code lengths for each symbol.
+ *
+ * - The code lengths are stored in order for the symbols, so lengths are
+ *   provided for each of the literal/length symbols, and for each of the
+ *   distance symbols.
+ *
+ * - If a symbol is not used in the block, this is represented by a zero as
+ *   as the code length.  This does not mean a zero-length code, but rather
+ *   that no code should be created for this symbol.  There is no way in the
+ *   deflate format to represent a zero-length code.
+ *
+ * - The maximum number of bits in a code is 15, so the possible lengths for
+ *   any code are 1..15.
+ *
+ * - The fact that a length of zero is not permitted for a code has an
+ *   interesting consequence.  Normally if only one symbol is used for a given
+ *   code, then in fact that code could be represented with zero bits.  However
+ *   in deflate, that code has to be at least one bit.  So for example, if
+ *   only a single distance base symbol appears in a block, then it will be
+ *   represented by a single code of length one, in particular one 0 bit.  This
+ *   is an incomplete code, since if a 1 bit is received, it has no meaning,
+ *   and should result in an error.  So incomplete distance codes of one symbol
+ *   should be permitted, and the receipt of invalid codes should be handled.
+ *
+ * - It is also possible to have a single literal/length code, but that code
+ *   must be the end-of-block code, since every dynamic block has one.  This
+ *   is not the most efficient way to create an empty block (an empty fixed
+ *   block is fewer bits), but it is allowed by the format.  So incomplete
+ *   literal/length codes of one symbol should also be permitted.
+ *
+ * - If there are only literal codes and no lengths, then there are no distance
+ *   codes.  This is represented by one distance code with zero bits.
+ *
+ * - The list of up to 286 length/literal lengths and up to 30 distance lengths
+ *   are themselves compressed using Huffman codes and run-length encoding.  In
+ *   the list of code lengths, a 0 symbol means no code, a 1..15 symbol means
+ *   that length, and the symbols 16, 17, and 18 are run-length instructions.
+ *   Each of 16, 17, and 18 are follwed by extra bits to define the length of
+ *   the run.  16 copies the last length 3 to 6 times.  17 represents 3 to 10
+ *   zero lengths, and 18 represents 11 to 138 zero lengths.  Unused symbols
+ *   are common, hence the special coding for zero lengths.
+ *
+ * - The symbols for 0..18 are Huffman coded, and so that code must be
+ *   described first.  This is simply a sequence of up to 19 three-bit values
+ *   representing no code (0) or the code length for that symbol (1..7).
+ *
+ * - A dynamic block starts with three fixed-size counts from which is computed
+ *   the number of literal/length code lengths, the number of distance code
+ *   lengths, and the number of code length code lengths (ok, you come up with
+ *   a better name!) in the code descriptions.  For the literal/length and
+ *   distance codes, lengths after those provided are considered zero, i.e. no
+ *   code.  The code length code lengths are received in a permuted order (see
+ *   the order[] array below) to make a short code length code length list more
+ *   likely.  As it turns out, very short and very long codes are less likely
+ *   to be seen in a dynamic code description, hence what may appear initially
+ *   to be a peculiar ordering.
+ *
+ * - Given the number of literal/length code lengths (nlen) and distance code
+ *   lengths (ndist), then they are treated as one long list of nlen + ndist
+ *   code lengths.  Therefore run-length coding can and often does cross the
+ *   boundary between the two sets of lengths.
+ *
+ * - So to summarize, the code description at the start of a dynamic block is
+ *   three counts for the number of code lengths for the literal/length codes,
+ *   the distance codes, and the code length codes.  This is followed by the
+ *   code length code lengths, three bits each.  This is used to construct the
+ *   code length code which is used to read the remainder of the lengths.  Then
+ *   the literal/length code lengths and distance lengths are read as a single
+ *   set of lengths using the code length codes.  Codes are constructed from
+ *   the resulting two sets of lengths, and then finally you can start
+ *   decoding actual compressed data in the block.
+ *
+ * - For reference, a "typical" size for the code description in a dynamic
+ *   block is around 80 bytes.
+ */
+local int dynamic(struct state *s)
+{
+    int nlen, ndist, ncode;             /* number of lengths in descriptor */
+    int index;                          /* index of lengths[] */
+    int err;                            /* construct() return value */
+    short lengths[MAXCODES];            /* descriptor code lengths */
+    short lencnt[MAXBITS+1], lensym[MAXLCODES];         /* lencode memory */
+    short distcnt[MAXBITS+1], distsym[MAXDCODES];       /* distcode memory */
+    struct huffman lencode, distcode;   /* length and distance codes */
+    static const short order[19] =      /* permutation of code length codes */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    /* construct lencode and distcode */
+    lencode.count = lencnt;
+    lencode.symbol = lensym;
+    distcode.count = distcnt;
+    distcode.symbol = distsym;
+
+    /* get number of lengths in each table, check lengths */
+    nlen = bits(s, 5) + 257;
+    ndist = bits(s, 5) + 1;
+    ncode = bits(s, 4) + 4;
+    if (nlen > MAXLCODES || ndist > MAXDCODES)
+        return -3;                      /* bad counts */
+
+    /* read code length code lengths (really), missing lengths are zero */
+    for (index = 0; index < ncode; index++)
+        lengths[order[index]] = bits(s, 3);
+    for (; index < 19; index++)
+        lengths[order[index]] = 0;
+
+    /* build huffman table for code lengths codes (use lencode temporarily) */
+    err = construct(&lencode, lengths, 19);
+    if (err != 0) return -4;            /* require complete code set here */
+
+    /* read length/literal and distance code length tables */
+    index = 0;
+    while (index < nlen + ndist) {
+        int symbol;             /* decoded value */
+        int len;                /* last length to repeat */
+
+        symbol = decode(s, &lencode);
+        if (symbol < 16)                /* length in 0..15 */
+            lengths[index++] = symbol;
+        else {                          /* repeat instruction */
+            len = 0;                    /* assume repeating zeros */
+            if (symbol == 16) {         /* repeat last length 3..6 times */
+                if (index == 0) return -5;      /* no last length! */
+                len = lengths[index - 1];       /* last length */
+                symbol = 3 + bits(s, 2);
+            }
+            else if (symbol == 17)      /* repeat zero 3..10 times */
+                symbol = 3 + bits(s, 3);
+            else                        /* == 18, repeat zero 11..138 times */
+                symbol = 11 + bits(s, 7);
+            if (index + symbol > nlen + ndist)
+                return -6;              /* too many lengths! */
+            while (symbol--)            /* repeat last or zero symbol times */
+                lengths[index++] = len;
+        }
+    }
+
+    /* check for end-of-block code -- there better be one! */
+    if (lengths[256] == 0)
+        return -9;
+
+    /* build huffman table for literal/length codes */
+    err = construct(&lencode, lengths, nlen);
+    if (err < 0 || (err > 0 && nlen - lencode.count[0] != 1))
+        return -7;      /* only allow incomplete codes if just one code */
+
+    /* build huffman table for distance codes */
+    err = construct(&distcode, lengths + nlen, ndist);
+    if (err < 0 || (err > 0 && ndist - distcode.count[0] != 1))
+        return -8;      /* only allow incomplete codes if just one code */
+
+    /* decode data until end-of-block code */
+    return codes(s, &lencode, &distcode);
+}
+
+/*
+ * Inflate source to dest.  On return, destlen and sourcelen are updated to the
+ * size of the uncompressed data and the size of the deflate data respectively.
+ * On success, the return value of puff() is zero.  If there is an error in the
+ * source data, i.e. it is not in the deflate format, then a negative value is
+ * returned.  If there is not enough input available or there is not enough
+ * output space, then a positive error is returned.  In that case, destlen and
+ * sourcelen are not updated to facilitate retrying from the beginning with the
+ * provision of more input data or more output space.  In the case of invalid
+ * inflate data (a negative error), the dest and source pointers are updated to
+ * facilitate the debugging of deflators.
+ *
+ * puff() also has a mode to determine the size of the uncompressed output with
+ * no output written.  For this dest must be (unsigned char *)0.  In this case,
+ * the input value of *destlen is ignored, and on return *destlen is set to the
+ * size of the uncompressed output.
+ *
+ * The return codes are:
+ *
+ *   2:  available inflate data did not terminate
+ *   1:  output space exhausted before completing inflate
+ *   0:  successful inflate
+ *  -1:  invalid block type (type == 3)
+ *  -2:  stored block length did not match one's complement
+ *  -3:  dynamic block code description: too many length or distance codes
+ *  -4:  dynamic block code description: code lengths codes incomplete
+ *  -5:  dynamic block code description: repeat lengths with no first length
+ *  -6:  dynamic block code description: repeat more than specified lengths
+ *  -7:  dynamic block code description: invalid literal/length code lengths
+ *  -8:  dynamic block code description: invalid distance code lengths
+ *  -9:  dynamic block code description: missing end-of-block code
+ * -10:  invalid literal/length or distance code in fixed or dynamic block
+ * -11:  distance is too far back in fixed or dynamic block
+ *
+ * Format notes:
+ *
+ * - Three bits are read for each block to determine the kind of block and
+ *   whether or not it is the last block.  Then the block is decoded and the
+ *   process repeated if it was not the last block.
+ *
+ * - The leftover bits in the last byte of the deflate data after the last
+ *   block (if it was a fixed or dynamic block) are undefined and have no
+ *   expected values to check.
+ */
+int puff(unsigned char *dest,           /* pointer to destination pointer */
+         unsigned long *destlen,        /* amount of output space */
+         unsigned char *source,         /* pointer to source data pointer */
+         unsigned long *sourcelen)      /* amount of input available */
+{
+    struct state s;             /* input/output state */
+    int last, type;             /* block information */
+    int err;                    /* return value */
+
+    /* initialize output state */
+    s.out = dest;
+    s.outlen = *destlen;                /* ignored if dest is NIL */
+    s.outcnt = 0;
+
+    /* initialize input state */
+    s.in = source;
+    s.inlen = *sourcelen;
+    s.incnt = 0;
+    s.bitbuf = 0;
+    s.bitcnt = 0;
+
+    /* return if bits() or decode() tries to read past available input */
+    if (setjmp(s.env) != 0)             /* if came back here via longjmp() */
+        err = 2;                        /* then skip do-loop, return error */
+    else {
+        /* process blocks until last block or error */
+        do {
+            last = bits(&s, 1);         /* one if last block */
+            type = bits(&s, 2);         /* block type 0..3 */
+            err = type == 0 ? stored(&s) :
+                  (type == 1 ? fixed(&s) :
+                   (type == 2 ? dynamic(&s) :
+                    -1));               /* type == 3, invalid */
+            if (err != 0) break;        /* return with error */
+        } while (!last);
+    }
+
+    /* update the lengths and return */
+    if (err <= 0) {
+        *destlen = s.outcnt;
+        *sourcelen = s.incnt;
+    }
+    return err;
+}
+
+#ifdef TEST
+/* Examples of how to use puff().
+
+   Usage: puff [-w] [-nnn] file
+          ... | puff [-w] [-nnn]
+
+   where file is the input file with deflate data, nnn is the number of bytes
+   of input to skip before inflating (e.g. to skip a zlib or gzip header), and
+   -w is used to write the decompressed data to stdout */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/* Return size times approximately the cube root of 2, keeping the result as 1,
+   3, or 5 times a power of 2 -- the result is always > size, until the result
+   is the maximum value of an unsigned long, where it remains.  This is useful
+   to keep reallocations less than ~33% over the actual data. */
+local size_t bythirds(size_t size)
+{
+    int n;
+    size_t m;
+
+    m = size;
+    for (n = 0; m; n++)
+        m >>= 1;
+    if (n < 3)
+        return size + 1;
+    n -= 3;
+    m = size >> n;
+    m += m == 6 ? 2 : 1;
+    m <<= n;
+    return m > size ? m : (size_t)(-1);
+}
+
+/* Read the input file *name, or stdin if name is NULL, into allocated memory.
+   Reallocate to larger buffers until the entire file is read in.  Return a
+   pointer to the allocated data, or NULL if there was a memory allocation
+   failure.  *len is the number of bytes of data read from the input file (even
+   if load() returns NULL).  If the input file was empty or could not be opened
+   or read, *len is zero. */
+local void *load(char *name, size_t *len)
+{
+    size_t size;
+    void *buf, *swap;
+    FILE *in;
+
+    *len = 0;
+    buf = malloc(size = 4096);
+    if (buf == NULL)
+        return NULL;
+    in = name == NULL ? stdin : fopen(name, "rb");
+    if (in != NULL) {
+        for (;;) {
+            *len += fread((char *)buf + *len, 1, size - *len, in);
+            if (*len < size) break;
+            size = bythirds(size);
+            if (size == *len || (swap = realloc(buf, size)) == NULL) {
+                free(buf);
+                buf = NULL;
+                break;
+            }
+            buf = swap;
+        }
+        fclose(in);
+    }
+    return buf;
+}
+
+int main(int argc, char **argv)
+{
+    int ret, put = 0;
+    unsigned skip = 0;
+    char *arg, *name = NULL;
+    unsigned char *source = NULL, *dest;
+    size_t len = 0;
+    unsigned long sourcelen, destlen;
+
+    /* process arguments */
+    while (arg = *++argv, --argc)
+        if (arg[0] == '-') {
+            if (arg[1] == 'w' && arg[2] == 0)
+                put = 1;
+            else if (arg[1] >= '0' && arg[1] <= '9')
+                skip = (unsigned)atoi(arg + 1);
+            else {
+                fprintf(stderr, "invalid option %s\n", arg);
+                return 3;
+            }
+        }
+        else if (name != NULL) {
+            fprintf(stderr, "only one file name allowed\n");
+            return 3;
+        }
+        else
+            name = arg;
+    source = load(name, &len);
+    if (source == NULL) {
+        fprintf(stderr, "memory allocation failure\n");
+        return 4;
+    }
+    if (len == 0) {
+        fprintf(stderr, "could not read %s, or it was empty\n",
+                name == NULL ? "<stdin>" : name);
+        free(source);
+        return 3;
+    }
+    if (skip >= len) {
+        fprintf(stderr, "skip request of %d leaves no input\n", skip);
+        free(source);
+        return 3;
+    }
+
+    /* test inflate data with offset skip */
+    len -= skip;
+    sourcelen = (unsigned long)len;
+    ret = puff(NIL, &destlen, source + skip, &sourcelen);
+    if (ret)
+        fprintf(stderr, "puff() failed with return code %d\n", ret);
+    else {
+        fprintf(stderr, "puff() succeeded uncompressing %lu bytes\n", destlen);
+        if (sourcelen < len) fprintf(stderr, "%lu compressed bytes unused\n",
+                                     len - sourcelen);
+    }
+
+    /* if requested, inflate again and write decompressd data to stdout */
+    if (put) {
+        dest = malloc(destlen);
+        if (dest == NULL) {
+            fprintf(stderr, "memory allocation failure\n");
+            free(source);
+            return 4;
+        }
+        puff(dest, &destlen, source + skip, &sourcelen);
+        fwrite(dest, 1, destlen, stdout);
+        free(dest);
+    }
+
+    /* clean up */
+    free(source);
+    return ret;
+}
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/puff.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/puff.h
new file mode 100644
index 00000000..88d1b384
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/puff.h
@@ -0,0 +1,31 @@
+/* puff.h
+  Copyright (C) 2002-2010 Mark Adler, all rights reserved
+  version 2.1, 4 Apr 2010
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the author be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Mark Adler    madler@alumni.caltech.edu
+ */
+
+
+/*
+ * See puff.c for purpose and usage.
+ */
+int puff(unsigned char *dest,           /* pointer to destination pointer */
+         unsigned long *destlen,        /* amount of output space */
+         unsigned char *source,         /* pointer to source data pointer */
+         unsigned long *sourcelen);     /* amount of input available */
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/zeros.raw b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/zeros.raw
new file mode 100644
index 00000000..637b7be6
Binary files /dev/null and b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/puff/zeros.raw differ
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/testzlib/testzlib.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/testzlib/testzlib.c
new file mode 100644
index 00000000..f559a364
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/testzlib/testzlib.c
@@ -0,0 +1,275 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <windows.h>
+
+#include "zlib.h"
+
+
+void MyDoMinus64(LARGE_INTEGER *R,LARGE_INTEGER A,LARGE_INTEGER B)
+{
+    R->HighPart = A.HighPart - B.HighPart;
+    if (A.LowPart >= B.LowPart)
+        R->LowPart = A.LowPart - B.LowPart;
+    else
+    {
+        R->LowPart = A.LowPart - B.LowPart;
+        R->HighPart --;
+    }
+}
+
+#ifdef _M_X64
+// see http://msdn2.microsoft.com/library/twchhe95(en-us,vs.80).aspx for __rdtsc
+unsigned __int64 __rdtsc(void);
+void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)
+{
+ //   printf("rdtsc = %I64x\n",__rdtsc());
+   pbeginTime64->QuadPart=__rdtsc();
+}
+
+LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
+{
+    LARGE_INTEGER LIres;
+    unsigned _int64 res=__rdtsc()-((unsigned _int64)(beginTime64.QuadPart));
+    LIres.QuadPart=res;
+   // printf("rdtsc = %I64x\n",__rdtsc());
+    return LIres;
+}
+#else
+#ifdef _M_IX86
+void myGetRDTSC32(LARGE_INTEGER * pbeginTime64)
+{
+    DWORD dwEdx,dwEax;
+    _asm
+    {
+        rdtsc
+        mov dwEax,eax
+        mov dwEdx,edx
+    }
+    pbeginTime64->LowPart=dwEax;
+    pbeginTime64->HighPart=dwEdx;
+}
+
+void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)
+{
+    myGetRDTSC32(pbeginTime64);
+}
+
+LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
+{
+    LARGE_INTEGER LIres,endTime64;
+    myGetRDTSC32(&endTime64);
+
+    LIres.LowPart=LIres.HighPart=0;
+    MyDoMinus64(&LIres,endTime64,beginTime64);
+    return LIres;
+}
+#else
+void myGetRDTSC32(LARGE_INTEGER * pbeginTime64)
+{
+}
+
+void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)
+{
+}
+
+LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
+{
+    LARGE_INTEGER lr;
+    lr.QuadPart=0;
+    return lr;
+}
+#endif
+#endif
+
+void BeginCountPerfCounter(LARGE_INTEGER * pbeginTime64,BOOL fComputeTimeQueryPerf)
+{
+    if ((!fComputeTimeQueryPerf) || (!QueryPerformanceCounter(pbeginTime64)))
+    {
+        pbeginTime64->LowPart = GetTickCount();
+        pbeginTime64->HighPart = 0;
+    }
+}
+
+DWORD GetMsecSincePerfCounter(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
+{
+    LARGE_INTEGER endTime64,ticksPerSecond,ticks;
+    DWORDLONG ticksShifted,tickSecShifted;
+    DWORD dwLog=16+0;
+    DWORD dwRet;
+    if ((!fComputeTimeQueryPerf) || (!QueryPerformanceCounter(&endTime64)))
+        dwRet = (GetTickCount() - beginTime64.LowPart)*1;
+    else
+    {
+        MyDoMinus64(&ticks,endTime64,beginTime64);
+        QueryPerformanceFrequency(&ticksPerSecond);
+
+
+        {
+            ticksShifted = Int64ShrlMod32(*(DWORDLONG*)&ticks,dwLog);
+            tickSecShifted = Int64ShrlMod32(*(DWORDLONG*)&ticksPerSecond,dwLog);
+
+        }
+
+        dwRet = (DWORD)((((DWORD)ticksShifted)*1000)/(DWORD)(tickSecShifted));
+        dwRet *=1;
+    }
+    return dwRet;
+}
+
+int ReadFileMemory(const char* filename,long* plFileSize,void** pFilePtr)
+{
+    FILE* stream;
+    void* ptr;
+    int retVal=1;
+    stream=fopen(filename, "rb");
+    if (stream==NULL)
+        return 0;
+
+    fseek(stream,0,SEEK_END);
+
+    *plFileSize=ftell(stream);
+    fseek(stream,0,SEEK_SET);
+    ptr=malloc((*plFileSize)+1);
+    if (ptr==NULL)
+        retVal=0;
+    else
+    {
+        if (fread(ptr, 1, *plFileSize,stream) != (*plFileSize))
+            retVal=0;
+    }
+    fclose(stream);
+    *pFilePtr=ptr;
+    return retVal;
+}
+
+int main(int argc, char *argv[])
+{
+    int BlockSizeCompress=0x8000;
+    int BlockSizeUncompress=0x8000;
+    int cprLevel=Z_DEFAULT_COMPRESSION ;
+    long lFileSize;
+    unsigned char* FilePtr;
+    long lBufferSizeCpr;
+    long lBufferSizeUncpr;
+    long lCompressedSize=0;
+    unsigned char* CprPtr;
+    unsigned char* UncprPtr;
+    long lSizeCpr,lSizeUncpr;
+    DWORD dwGetTick,dwMsecQP;
+    LARGE_INTEGER li_qp,li_rdtsc,dwResRdtsc;
+
+    if (argc<=1)
+    {
+        printf("run TestZlib <File> [BlockSizeCompress] [BlockSizeUncompress] [compres. level]\n");
+        return 0;
+    }
+
+    if (ReadFileMemory(argv[1],&lFileSize,&FilePtr)==0)
+    {
+        printf("error reading %s\n",argv[1]);
+        return 1;
+    }
+    else printf("file %s read, %u bytes\n",argv[1],lFileSize);
+
+    if (argc>=3)
+        BlockSizeCompress=atol(argv[2]);
+
+    if (argc>=4)
+        BlockSizeUncompress=atol(argv[3]);
+
+    if (argc>=5)
+        cprLevel=(int)atol(argv[4]);
+
+    lBufferSizeCpr = lFileSize + (lFileSize/0x10) + 0x200;
+    lBufferSizeUncpr = lBufferSizeCpr;
+
+    CprPtr=(unsigned char*)malloc(lBufferSizeCpr + BlockSizeCompress);
+
+    BeginCountPerfCounter(&li_qp,TRUE);
+    dwGetTick=GetTickCount();
+    BeginCountRdtsc(&li_rdtsc);
+    {
+        z_stream zcpr;
+        int ret=Z_OK;
+        long lOrigToDo = lFileSize;
+        long lOrigDone = 0;
+        int step=0;
+        memset(&zcpr,0,sizeof(z_stream));
+        deflateInit(&zcpr,cprLevel);
+
+        zcpr.next_in = FilePtr;
+        zcpr.next_out = CprPtr;
+
+
+        do
+        {
+            long all_read_before = zcpr.total_in;
+            zcpr.avail_in = min(lOrigToDo,BlockSizeCompress);
+            zcpr.avail_out = BlockSizeCompress;
+            ret=deflate(&zcpr,(zcpr.avail_in==lOrigToDo) ? Z_FINISH : Z_SYNC_FLUSH);
+            lOrigDone += (zcpr.total_in-all_read_before);
+            lOrigToDo -= (zcpr.total_in-all_read_before);
+            step++;
+        } while (ret==Z_OK);
+
+        lSizeCpr=zcpr.total_out;
+        deflateEnd(&zcpr);
+        dwGetTick=GetTickCount()-dwGetTick;
+        dwMsecQP=GetMsecSincePerfCounter(li_qp,TRUE);
+        dwResRdtsc=GetResRdtsc(li_rdtsc,TRUE);
+        printf("total compress size = %u, in %u step\n",lSizeCpr,step);
+        printf("time = %u msec = %f sec\n",dwGetTick,dwGetTick/(double)1000.);
+        printf("defcpr time QP = %u msec = %f sec\n",dwMsecQP,dwMsecQP/(double)1000.);
+        printf("defcpr result rdtsc = %I64x\n\n",dwResRdtsc.QuadPart);
+    }
+
+    CprPtr=(unsigned char*)realloc(CprPtr,lSizeCpr);
+    UncprPtr=(unsigned char*)malloc(lBufferSizeUncpr + BlockSizeUncompress);
+
+    BeginCountPerfCounter(&li_qp,TRUE);
+    dwGetTick=GetTickCount();
+    BeginCountRdtsc(&li_rdtsc);
+    {
+        z_stream zcpr;
+        int ret=Z_OK;
+        long lOrigToDo = lSizeCpr;
+        long lOrigDone = 0;
+        int step=0;
+        memset(&zcpr,0,sizeof(z_stream));
+        inflateInit(&zcpr);
+
+        zcpr.next_in = CprPtr;
+        zcpr.next_out = UncprPtr;
+
+
+        do
+        {
+            long all_read_before = zcpr.total_in;
+            zcpr.avail_in = min(lOrigToDo,BlockSizeUncompress);
+            zcpr.avail_out = BlockSizeUncompress;
+            ret=inflate(&zcpr,Z_SYNC_FLUSH);
+            lOrigDone += (zcpr.total_in-all_read_before);
+            lOrigToDo -= (zcpr.total_in-all_read_before);
+            step++;
+        } while (ret==Z_OK);
+
+        lSizeUncpr=zcpr.total_out;
+        inflateEnd(&zcpr);
+        dwGetTick=GetTickCount()-dwGetTick;
+        dwMsecQP=GetMsecSincePerfCounter(li_qp,TRUE);
+        dwResRdtsc=GetResRdtsc(li_rdtsc,TRUE);
+        printf("total uncompress size = %u, in %u step\n",lSizeUncpr,step);
+        printf("time = %u msec = %f sec\n",dwGetTick,dwGetTick/(double)1000.);
+        printf("uncpr  time QP = %u msec = %f sec\n",dwMsecQP,dwMsecQP/(double)1000.);
+        printf("uncpr  result rdtsc = %I64x\n\n",dwResRdtsc.QuadPart);
+    }
+
+    if (lSizeUncpr==lFileSize)
+    {
+        if (memcmp(FilePtr,UncprPtr,lFileSize)==0)
+            printf("compare ok\n");
+
+    }
+
+    return 0;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/testzlib/testzlib.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/testzlib/testzlib.txt
new file mode 100644
index 00000000..e508bb22
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/testzlib/testzlib.txt
@@ -0,0 +1,10 @@
+To build testzLib with Visual Studio 2005:
+
+copy to a directory file from :
+- root of zLib tree
+- contrib/testzlib
+- contrib/masmx86
+- contrib/masmx64
+- contrib/vstudio/vc7
+
+and open testzlib8.sln
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/untgz/Makefile b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/untgz/Makefile
new file mode 100644
index 00000000..b54266fb
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/untgz/Makefile
@@ -0,0 +1,14 @@
+CC=cc
+CFLAGS=-g
+
+untgz: untgz.o ../../libz.a
+	$(CC) $(CFLAGS) -o untgz untgz.o -L../.. -lz
+
+untgz.o: untgz.c ../../zlib.h
+	$(CC) $(CFLAGS) -c -I../.. untgz.c
+
+../../libz.a:
+	cd ../..; ./configure; make
+
+clean:
+	rm -f untgz untgz.o *~
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/untgz/Makefile.msc b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/untgz/Makefile.msc
new file mode 100644
index 00000000..77b86022
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/untgz/Makefile.msc
@@ -0,0 +1,17 @@
+CC=cl
+CFLAGS=-MD
+
+untgz.exe: untgz.obj ..\..\zlib.lib
+	$(CC) $(CFLAGS) untgz.obj ..\..\zlib.lib
+
+untgz.obj: untgz.c ..\..\zlib.h
+	$(CC) $(CFLAGS) -c -I..\.. untgz.c
+
+..\..\zlib.lib:
+	cd ..\..
+	$(MAKE) -f win32\makefile.msc
+	cd contrib\untgz
+
+clean:
+	-del untgz.obj
+	-del untgz.exe
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/untgz/untgz.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/untgz/untgz.c
new file mode 100644
index 00000000..2c391e59
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/untgz/untgz.c
@@ -0,0 +1,674 @@
+/*
+ * untgz.c -- Display contents and extract files from a gzip'd TAR file
+ *
+ * written by Pedro A. Aranda Gutierrez <paag@tid.es>
+ * adaptation to Unix by Jean-loup Gailly <jloup@gzip.org>
+ * various fixes by Cosmin Truta <cosmint@cs.ubbcluj.ro>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+
+#include "zlib.h"
+
+#ifdef unix
+#  include <unistd.h>
+#else
+#  include <direct.h>
+#  include <io.h>
+#endif
+
+#ifdef WIN32
+#include <windows.h>
+#  ifndef F_OK
+#    define F_OK  0
+#  endif
+#  define mkdir(dirname,mode)   _mkdir(dirname)
+#  ifdef _MSC_VER
+#    define access(path,mode)   _access(path,mode)
+#    define chmod(path,mode)    _chmod(path,mode)
+#    define strdup(str)         _strdup(str)
+#  endif
+#else
+#  include <utime.h>
+#endif
+
+
+/* values used in typeflag field */
+
+#define REGTYPE  '0'            /* regular file */
+#define AREGTYPE '\0'           /* regular file */
+#define LNKTYPE  '1'            /* link */
+#define SYMTYPE  '2'            /* reserved */
+#define CHRTYPE  '3'            /* character special */
+#define BLKTYPE  '4'            /* block special */
+#define DIRTYPE  '5'            /* directory */
+#define FIFOTYPE '6'            /* FIFO special */
+#define CONTTYPE '7'            /* reserved */
+
+/* GNU tar extensions */
+
+#define GNUTYPE_DUMPDIR  'D'    /* file names from dumped directory */
+#define GNUTYPE_LONGLINK 'K'    /* long link name */
+#define GNUTYPE_LONGNAME 'L'    /* long file name */
+#define GNUTYPE_MULTIVOL 'M'    /* continuation of file from another volume */
+#define GNUTYPE_NAMES    'N'    /* file name that does not fit into main hdr */
+#define GNUTYPE_SPARSE   'S'    /* sparse file */
+#define GNUTYPE_VOLHDR   'V'    /* tape/volume header */
+
+
+/* tar header */
+
+#define BLOCKSIZE     512
+#define SHORTNAMESIZE 100
+
+struct tar_header
+{                               /* byte offset */
+  char name[100];               /*   0 */
+  char mode[8];                 /* 100 */
+  char uid[8];                  /* 108 */
+  char gid[8];                  /* 116 */
+  char size[12];                /* 124 */
+  char mtime[12];               /* 136 */
+  char chksum[8];               /* 148 */
+  char typeflag;                /* 156 */
+  char linkname[100];           /* 157 */
+  char magic[6];                /* 257 */
+  char version[2];              /* 263 */
+  char uname[32];               /* 265 */
+  char gname[32];               /* 297 */
+  char devmajor[8];             /* 329 */
+  char devminor[8];             /* 337 */
+  char prefix[155];             /* 345 */
+                                /* 500 */
+};
+
+union tar_buffer
+{
+  char               buffer[BLOCKSIZE];
+  struct tar_header  header;
+};
+
+struct attr_item
+{
+  struct attr_item  *next;
+  char              *fname;
+  int                mode;
+  time_t             time;
+};
+
+enum { TGZ_EXTRACT, TGZ_LIST, TGZ_INVALID };
+
+char *TGZfname          OF((const char *));
+void TGZnotfound        OF((const char *));
+
+int getoct              OF((char *, int));
+char *strtime           OF((time_t *));
+int setfiletime         OF((char *, time_t));
+void push_attr          OF((struct attr_item **, char *, int, time_t));
+void restore_attr       OF((struct attr_item **));
+
+int ExprMatch           OF((char *, char *));
+
+int makedir             OF((char *));
+int matchname           OF((int, int, char **, char *));
+
+void error              OF((const char *));
+int tar                 OF((gzFile, int, int, int, char **));
+
+void help               OF((int));
+int main                OF((int, char **));
+
+char *prog;
+
+const char *TGZsuffix[] = { "\0", ".tar", ".tar.gz", ".taz", ".tgz", NULL };
+
+/* return the file name of the TGZ archive */
+/* or NULL if it does not exist */
+
+char *TGZfname (const char *arcname)
+{
+  static char buffer[1024];
+  int origlen,i;
+
+  strcpy(buffer,arcname);
+  origlen = strlen(buffer);
+
+  for (i=0; TGZsuffix[i]; i++)
+    {
+       strcpy(buffer+origlen,TGZsuffix[i]);
+       if (access(buffer,F_OK) == 0)
+         return buffer;
+    }
+  return NULL;
+}
+
+
+/* error message for the filename */
+
+void TGZnotfound (const char *arcname)
+{
+  int i;
+
+  fprintf(stderr,"%s: Couldn't find ",prog);
+  for (i=0;TGZsuffix[i];i++)
+    fprintf(stderr,(TGZsuffix[i+1]) ? "%s%s, " : "or %s%s\n",
+            arcname,
+            TGZsuffix[i]);
+  exit(1);
+}
+
+
+/* convert octal digits to int */
+/* on error return -1 */
+
+int getoct (char *p,int width)
+{
+  int result = 0;
+  char c;
+
+  while (width--)
+    {
+      c = *p++;
+      if (c == 0)
+        break;
+      if (c == ' ')
+        continue;
+      if (c < '0' || c > '7')
+        return -1;
+      result = result * 8 + (c - '0');
+    }
+  return result;
+}
+
+
+/* convert time_t to string */
+/* use the "YYYY/MM/DD hh:mm:ss" format */
+
+char *strtime (time_t *t)
+{
+  struct tm   *local;
+  static char result[32];
+
+  local = localtime(t);
+  sprintf(result,"%4d/%02d/%02d %02d:%02d:%02d",
+          local->tm_year+1900, local->tm_mon+1, local->tm_mday,
+          local->tm_hour, local->tm_min, local->tm_sec);
+  return result;
+}
+
+
+/* set file time */
+
+int setfiletime (char *fname,time_t ftime)
+{
+#ifdef WIN32
+  static int isWinNT = -1;
+  SYSTEMTIME st;
+  FILETIME locft, modft;
+  struct tm *loctm;
+  HANDLE hFile;
+  int result;
+
+  loctm = localtime(&ftime);
+  if (loctm == NULL)
+    return -1;
+
+  st.wYear         = (WORD)loctm->tm_year + 1900;
+  st.wMonth        = (WORD)loctm->tm_mon + 1;
+  st.wDayOfWeek    = (WORD)loctm->tm_wday;
+  st.wDay          = (WORD)loctm->tm_mday;
+  st.wHour         = (WORD)loctm->tm_hour;
+  st.wMinute       = (WORD)loctm->tm_min;
+  st.wSecond       = (WORD)loctm->tm_sec;
+  st.wMilliseconds = 0;
+  if (!SystemTimeToFileTime(&st, &locft) ||
+      !LocalFileTimeToFileTime(&locft, &modft))
+    return -1;
+
+  if (isWinNT < 0)
+    isWinNT = (GetVersion() < 0x80000000) ? 1 : 0;
+  hFile = CreateFile(fname, GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
+                     (isWinNT ? FILE_FLAG_BACKUP_SEMANTICS : 0),
+                     NULL);
+  if (hFile == INVALID_HANDLE_VALUE)
+    return -1;
+  result = SetFileTime(hFile, NULL, NULL, &modft) ? 0 : -1;
+  CloseHandle(hFile);
+  return result;
+#else
+  struct utimbuf settime;
+
+  settime.actime = settime.modtime = ftime;
+  return utime(fname,&settime);
+#endif
+}
+
+
+/* push file attributes */
+
+void push_attr(struct attr_item **list,char *fname,int mode,time_t time)
+{
+  struct attr_item *item;
+
+  item = (struct attr_item *)malloc(sizeof(struct attr_item));
+  if (item == NULL)
+    error("Out of memory");
+  item->fname = strdup(fname);
+  item->mode  = mode;
+  item->time  = time;
+  item->next  = *list;
+  *list       = item;
+}
+
+
+/* restore file attributes */
+
+void restore_attr(struct attr_item **list)
+{
+  struct attr_item *item, *prev;
+
+  for (item = *list; item != NULL; )
+    {
+      setfiletime(item->fname,item->time);
+      chmod(item->fname,item->mode);
+      prev = item;
+      item = item->next;
+      free(prev);
+    }
+  *list = NULL;
+}
+
+
+/* match regular expression */
+
+#define ISSPECIAL(c) (((c) == '*') || ((c) == '/'))
+
+int ExprMatch (char *string,char *expr)
+{
+  while (1)
+    {
+      if (ISSPECIAL(*expr))
+        {
+          if (*expr == '/')
+            {
+              if (*string != '\\' && *string != '/')
+                return 0;
+              string ++; expr++;
+            }
+          else if (*expr == '*')
+            {
+              if (*expr ++ == 0)
+                return 1;
+              while (*++string != *expr)
+                if (*string == 0)
+                  return 0;
+            }
+        }
+      else
+        {
+          if (*string != *expr)
+            return 0;
+          if (*expr++ == 0)
+            return 1;
+          string++;
+        }
+    }
+}
+
+
+/* recursive mkdir */
+/* abort on ENOENT; ignore other errors like "directory already exists" */
+/* return 1 if OK */
+/*        0 on error */
+
+int makedir (char *newdir)
+{
+  char *buffer = strdup(newdir);
+  char *p;
+  int  len = strlen(buffer);
+
+  if (len <= 0) {
+    free(buffer);
+    return 0;
+  }
+  if (buffer[len-1] == '/') {
+    buffer[len-1] = '\0';
+  }
+  if (mkdir(buffer, 0755) == 0)
+    {
+      free(buffer);
+      return 1;
+    }
+
+  p = buffer+1;
+  while (1)
+    {
+      char hold;
+
+      while(*p && *p != '\\' && *p != '/')
+        p++;
+      hold = *p;
+      *p = 0;
+      if ((mkdir(buffer, 0755) == -1) && (errno == ENOENT))
+        {
+          fprintf(stderr,"%s: Couldn't create directory %s\n",prog,buffer);
+          free(buffer);
+          return 0;
+        }
+      if (hold == 0)
+        break;
+      *p++ = hold;
+    }
+  free(buffer);
+  return 1;
+}
+
+
+int matchname (int arg,int argc,char **argv,char *fname)
+{
+  if (arg == argc)      /* no arguments given (untgz tgzarchive) */
+    return 1;
+
+  while (arg < argc)
+    if (ExprMatch(fname,argv[arg++]))
+      return 1;
+
+  return 0; /* ignore this for the moment being */
+}
+
+
+/* tar file list or extract */
+
+int tar (gzFile in,int action,int arg,int argc,char **argv)
+{
+  union  tar_buffer buffer;
+  int    len;
+  int    err;
+  int    getheader = 1;
+  int    remaining = 0;
+  FILE   *outfile = NULL;
+  char   fname[BLOCKSIZE];
+  int    tarmode;
+  time_t tartime;
+  struct attr_item *attributes = NULL;
+
+  if (action == TGZ_LIST)
+    printf("    date      time     size                       file\n"
+           " ---------- -------- --------- -------------------------------------\n");
+  while (1)
+    {
+      len = gzread(in, &buffer, BLOCKSIZE);
+      if (len < 0)
+        error(gzerror(in, &err));
+      /*
+       * Always expect complete blocks to process
+       * the tar information.
+       */
+      if (len != BLOCKSIZE)
+        {
+          action = TGZ_INVALID; /* force error exit */
+          remaining = 0;        /* force I/O cleanup */
+        }
+
+      /*
+       * If we have to get a tar header
+       */
+      if (getheader >= 1)
+        {
+          /*
+           * if we met the end of the tar
+           * or the end-of-tar block,
+           * we are done
+           */
+          if (len == 0 || buffer.header.name[0] == 0)
+            break;
+
+          tarmode = getoct(buffer.header.mode,8);
+          tartime = (time_t)getoct(buffer.header.mtime,12);
+          if (tarmode == -1 || tartime == (time_t)-1)
+            {
+              buffer.header.name[0] = 0;
+              action = TGZ_INVALID;
+            }
+
+          if (getheader == 1)
+            {
+              strncpy(fname,buffer.header.name,SHORTNAMESIZE);
+              if (fname[SHORTNAMESIZE-1] != 0)
+                  fname[SHORTNAMESIZE] = 0;
+            }
+          else
+            {
+              /*
+               * The file name is longer than SHORTNAMESIZE
+               */
+              if (strncmp(fname,buffer.header.name,SHORTNAMESIZE-1) != 0)
+                  error("bad long name");
+              getheader = 1;
+            }
+
+          /*
+           * Act according to the type flag
+           */
+          switch (buffer.header.typeflag)
+            {
+            case DIRTYPE:
+              if (action == TGZ_LIST)
+                printf(" %s     <dir> %s\n",strtime(&tartime),fname);
+              if (action == TGZ_EXTRACT)
+                {
+                  makedir(fname);
+                  push_attr(&attributes,fname,tarmode,tartime);
+                }
+              break;
+            case REGTYPE:
+            case AREGTYPE:
+              remaining = getoct(buffer.header.size,12);
+              if (remaining == -1)
+                {
+                  action = TGZ_INVALID;
+                  break;
+                }
+              if (action == TGZ_LIST)
+                printf(" %s %9d %s\n",strtime(&tartime),remaining,fname);
+              else if (action == TGZ_EXTRACT)
+                {
+                  if (matchname(arg,argc,argv,fname))
+                    {
+                      outfile = fopen(fname,"wb");
+                      if (outfile == NULL) {
+                        /* try creating directory */
+                        char *p = strrchr(fname, '/');
+                        if (p != NULL) {
+                          *p = '\0';
+                          makedir(fname);
+                          *p = '/';
+                          outfile = fopen(fname,"wb");
+                        }
+                      }
+                      if (outfile != NULL)
+                        printf("Extracting %s\n",fname);
+                      else
+                        fprintf(stderr, "%s: Couldn't create %s",prog,fname);
+                    }
+                  else
+                    outfile = NULL;
+                }
+              getheader = 0;
+              break;
+            case GNUTYPE_LONGLINK:
+            case GNUTYPE_LONGNAME:
+              remaining = getoct(buffer.header.size,12);
+              if (remaining < 0 || remaining >= BLOCKSIZE)
+                {
+                  action = TGZ_INVALID;
+                  break;
+                }
+              len = gzread(in, fname, BLOCKSIZE);
+              if (len < 0)
+                error(gzerror(in, &err));
+              if (fname[BLOCKSIZE-1] != 0 || (int)strlen(fname) > remaining)
+                {
+                  action = TGZ_INVALID;
+                  break;
+                }
+              getheader = 2;
+              break;
+            default:
+              if (action == TGZ_LIST)
+                printf(" %s     <---> %s\n",strtime(&tartime),fname);
+              break;
+            }
+        }
+      else
+        {
+          unsigned int bytes = (remaining > BLOCKSIZE) ? BLOCKSIZE : remaining;
+
+          if (outfile != NULL)
+            {
+              if (fwrite(&buffer,sizeof(char),bytes,outfile) != bytes)
+                {
+                  fprintf(stderr,
+                    "%s: Error writing %s -- skipping\n",prog,fname);
+                  fclose(outfile);
+                  outfile = NULL;
+                  remove(fname);
+                }
+            }
+          remaining -= bytes;
+        }
+
+      if (remaining == 0)
+        {
+          getheader = 1;
+          if (outfile != NULL)
+            {
+              fclose(outfile);
+              outfile = NULL;
+              if (action != TGZ_INVALID)
+                push_attr(&attributes,fname,tarmode,tartime);
+            }
+        }
+
+      /*
+       * Abandon if errors are found
+       */
+      if (action == TGZ_INVALID)
+        {
+          error("broken archive");
+          break;
+        }
+    }
+
+  /*
+   * Restore file modes and time stamps
+   */
+  restore_attr(&attributes);
+
+  if (gzclose(in) != Z_OK)
+    error("failed gzclose");
+
+  return 0;
+}
+
+
+/* ============================================================ */
+
+void help(int exitval)
+{
+  printf("untgz version 0.2.1\n"
+         "  using zlib version %s\n\n",
+         zlibVersion());
+  printf("Usage: untgz file.tgz            extract all files\n"
+         "       untgz file.tgz fname ...  extract selected files\n"
+         "       untgz -l file.tgz         list archive contents\n"
+         "       untgz -h                  display this help\n");
+  exit(exitval);
+}
+
+void error(const char *msg)
+{
+  fprintf(stderr, "%s: %s\n", prog, msg);
+  exit(1);
+}
+
+
+/* ============================================================ */
+
+#if defined(WIN32) && defined(__GNUC__)
+int _CRT_glob = 0;      /* disable argument globbing in MinGW */
+#endif
+
+int main(int argc,char **argv)
+{
+    int         action = TGZ_EXTRACT;
+    int         arg = 1;
+    char        *TGZfile;
+    gzFile      *f;
+
+    prog = strrchr(argv[0],'\\');
+    if (prog == NULL)
+      {
+        prog = strrchr(argv[0],'/');
+        if (prog == NULL)
+          {
+            prog = strrchr(argv[0],':');
+            if (prog == NULL)
+              prog = argv[0];
+            else
+              prog++;
+          }
+        else
+          prog++;
+      }
+    else
+      prog++;
+
+    if (argc == 1)
+      help(0);
+
+    if (strcmp(argv[arg],"-l") == 0)
+      {
+        action = TGZ_LIST;
+        if (argc == ++arg)
+          help(0);
+      }
+    else if (strcmp(argv[arg],"-h") == 0)
+      {
+        help(0);
+      }
+
+    if ((TGZfile = TGZfname(argv[arg])) == NULL)
+      TGZnotfound(argv[arg]);
+
+    ++arg;
+    if ((action == TGZ_LIST) && (arg != argc))
+      help(1);
+
+/*
+ *  Process the TGZ file
+ */
+    switch(action)
+      {
+      case TGZ_LIST:
+      case TGZ_EXTRACT:
+        f = gzopen(TGZfile,"rb");
+        if (f == NULL)
+          {
+            fprintf(stderr,"%s: Couldn't gzopen %s\n",prog,TGZfile);
+            return 1;
+          }
+        exit(tar(f, action, arg, argc, argv));
+      break;
+
+      default:
+        error("Unknown option");
+        exit(1);
+      }
+
+    return 0;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/readme.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/readme.txt
new file mode 100644
index 00000000..ebe13bf1
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/readme.txt
@@ -0,0 +1,60 @@
+Building instructions for the DLL versions of Zlib 1.2.4
+========================================================
+
+This directory contains projects that build zlib and minizip using
+Microsoft Visual C++ 9.0/10.0, and Visual C++ .
+
+You don't need to build these projects yourself. You can download the
+binaries from:
+  http://www.winimage.com/zLibDll
+
+More information can be found at this site.
+
+first compile assembly code by running
+bld_ml64.bat in contrib\masmx64
+bld_ml32.bat in contrib\masmx86
+
+
+
+
+Build instructions for Visual Studio 2008 (32 bits or 64 bits)
+--------------------------------------------------------------
+- Uncompress current zlib, including all contrib/* files
+- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008.0
+- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
+
+Build instructions for Visual Studio 2010 (32 bits or 64 bits)
+--------------------------------------------------------------
+- Uncompress current zlib, including all contrib/* files
+- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010.0
+
+
+Important
+---------
+- To use zlibwapi.dll in your application, you must define the
+  macro ZLIB_WINAPI when compiling your application's source files.
+
+
+Additional notes
+----------------
+- This DLL, named zlibwapi.dll, is compatible to the old zlib.dll built
+  by Gilles Vollant from the zlib 1.1.x sources, and distributed at
+    http://www.winimage.com/zLibDll
+  It uses the WINAPI calling convention for the exported functions, and
+  includes the minizip functionality. If your application needs that
+  particular build of zlib.dll, you can rename zlibwapi.dll to zlib.dll.
+
+- The new DLL was renamed because there exist several incompatible
+  versions of zlib.dll on the Internet.
+
+- There is also an official DLL build of zlib, named zlib1.dll. This one
+  is exporting the functions using the CDECL convention. See the file
+  win32\DLL_FAQ.txt found in this zlib distribution.
+
+- There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol
+  has a slightly different effect. To avoid compatibility problems, do
+  not define it here.
+
+
+Gilles Vollant
+info@winimage.com
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/miniunz.vcxproj b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/miniunz.vcxproj
new file mode 100644
index 00000000..74e15c90
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/miniunz.vcxproj
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Itanium">
+      <Configuration>Debug</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Itanium">
+      <Configuration>Release</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
+    <Midl>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineIA64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
+    <Midl>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineIA64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\minizip\miniunz.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="zlibvc.vcxproj">
+      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters
new file mode 100644
index 00000000..0b2a3de2
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{048af943-022b-4db6-beeb-a54c34774ee2}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{c1d600d2-888f-4aea-b73e-8b0dd9befa0c}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{0844199a-966b-4f19-81db-1e0125e141b9}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\minizip\miniunz.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/miniunz.vcxproj.user b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/miniunz.vcxproj.user
new file mode 100644
index 00000000..695b5c78
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/miniunz.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/minizip.vcxproj b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/minizip.vcxproj
new file mode 100644
index 00000000..917e1565
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/minizip.vcxproj
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Itanium">
+      <Configuration>Debug</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Itanium">
+      <Configuration>Release</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)minizip.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)minizip.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)minizip.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
+    <Midl>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)minizip.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineIA64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)minizip.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
+    <Midl>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)minizip.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineIA64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\minizip\minizip.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="zlibvc.vcxproj">
+      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters
new file mode 100644
index 00000000..dd73cd31
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{c0419b40-bf50-40da-b153-ff74215b79de}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bb87b070-735b-478e-92ce-7383abb2f36c}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{f46ab6a6-548f-43cb-ae96-681abb5bd5db}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\minizip\minizip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/minizip.vcxproj.user b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/minizip.vcxproj.user
new file mode 100644
index 00000000..695b5c78
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/minizip.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlib.vcxproj b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlib.vcxproj
new file mode 100644
index 00000000..9088d176
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlib.vcxproj
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Itanium">
+      <Configuration>Debug</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
+      <Configuration>ReleaseWithoutAsm</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
+      <Configuration>ReleaseWithoutAsm</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
+      <Configuration>ReleaseWithoutAsm</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Itanium">
+      <Configuration>Release</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
+    <RootNamespace>testzlib</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
+    <Midl>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineIA64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
+    <Midl>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineIA64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
+    <Midl>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineIA64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\adler32.c" />
+    <ClCompile Include="..\..\..\compress.c" />
+    <ClCompile Include="..\..\..\crc32.c" />
+    <ClCompile Include="..\..\..\deflate.c" />
+    <ClCompile Include="..\..\..\infback.c" />
+    <ClCompile Include="..\..\masmx64\inffas8664.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\inffast.c" />
+    <ClCompile Include="..\..\..\inflate.c" />
+    <ClCompile Include="..\..\..\inftrees.c" />
+    <ClCompile Include="..\..\testzlib\testzlib.c" />
+    <ClCompile Include="..\..\..\trees.c" />
+    <ClCompile Include="..\..\..\uncompr.c" />
+    <ClCompile Include="..\..\..\zutil.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters
new file mode 100644
index 00000000..249daa89
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{c1f6a2e3-5da5-4955-8653-310d3efe05a9}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{c2aaffdc-2c95-4d6f-8466-4bec5890af2c}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{c274fe07-05f2-461c-964b-f6341e4e7eb5}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\adler32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\compress.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\crc32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\deflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\infback.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\masmx64\inffas8664.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\inffast.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\inflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\inftrees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\testzlib\testzlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\trees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\uncompr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\zutil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlib.vcxproj.user b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlib.vcxproj.user
new file mode 100644
index 00000000..695b5c78
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlib.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj
new file mode 100644
index 00000000..2d628158
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Itanium">
+      <Configuration>Debug</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Itanium">
+      <Configuration>Release</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
+    <Midl>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineIA64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
+    <Midl>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineIA64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\testzlib\testzlib.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="zlibvc.vcxproj">
+      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
new file mode 100644
index 00000000..53a8693b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{fa61a89f-93fc-4c89-b29e-36224b7592f4}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{d4b85da0-2ba2-4934-b57f-e2584e3848ee}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{e573e075-00bd-4a7d-bd67-a8cc9bfc5aca}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\testzlib\testzlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.user b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.user
new file mode 100644
index 00000000..695b5c78
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlib.rc b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlib.rc
new file mode 100644
index 00000000..f8224508
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlib.rc
@@ -0,0 +1,32 @@
+#include <windows.h>
+
+#define IDR_VERSION1  1
+IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
+  FILEVERSION	 1,2,5,0
+  PRODUCTVERSION 1,2,5,0
+  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
+  FILEFLAGS	0
+  FILEOS	VOS_DOS_WINDOWS32
+  FILETYPE	VFT_DLL
+  FILESUBTYPE	0	// not used
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    //language ID = U.S. English, char set = Windows, Multilingual
+
+    BEGIN
+      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
+      VALUE "FileVersion",	"1.2.5\0"
+      VALUE "InternalName",	"zlib\0"
+      VALUE "OriginalFilename",	"zlib.dll\0"
+      VALUE "ProductName",	"ZLib.DLL\0"
+      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
+      VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x0409, 1252
+  END
+END
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibstat.vcxproj b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibstat.vcxproj
new file mode 100644
index 00000000..2682fca2
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibstat.vcxproj
@@ -0,0 +1,457 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Itanium">
+      <Configuration>Debug</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
+      <Configuration>ReleaseWithoutAsm</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
+      <Configuration>ReleaseWithoutAsm</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
+      <Configuration>ReleaseWithoutAsm</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Itanium">
+      <Configuration>Release</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
+      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
+      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
+      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
+    <Midl>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
+      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
+    <Midl>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
+      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
+      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
+    <Midl>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
+      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\adler32.c" />
+    <ClCompile Include="..\..\..\compress.c" />
+    <ClCompile Include="..\..\..\crc32.c" />
+    <ClCompile Include="..\..\..\deflate.c" />
+    <ClCompile Include="..\..\..\gzclose.c" />
+    <ClCompile Include="..\..\..\gzlib.c" />
+    <ClCompile Include="..\..\..\gzread.c" />
+    <ClCompile Include="..\..\..\gzwrite.c" />
+    <ClCompile Include="..\..\..\infback.c" />
+    <ClCompile Include="..\..\masmx64\inffas8664.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\inffast.c" />
+    <ClCompile Include="..\..\..\inflate.c" />
+    <ClCompile Include="..\..\..\inftrees.c" />
+    <ClCompile Include="..\..\minizip\ioapi.c" />
+    <ClCompile Include="..\..\..\trees.c" />
+    <ClCompile Include="..\..\..\uncompr.c" />
+    <ClCompile Include="..\..\minizip\unzip.c" />
+    <ClCompile Include="..\..\minizip\zip.c" />
+    <ClCompile Include="..\..\..\zutil.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="zlib.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="zlibvc.def" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters
new file mode 100644
index 00000000..c8c7f7ea
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{174213f6-7f66-4ae8-a3a8-a1e0a1e6ffdd}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\adler32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\compress.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\crc32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\deflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gzclose.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gzlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gzread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gzwrite.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\infback.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\masmx64\inffas8664.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\inffast.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\inflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\inftrees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\minizip\ioapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\trees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\uncompr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\minizip\unzip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\minizip\zip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\zutil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="zlib.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="zlibvc.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.user b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.user
new file mode 100644
index 00000000..695b5c78
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.def b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.def
new file mode 100644
index 00000000..0269ef72
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.def
@@ -0,0 +1,130 @@
+LIBRARY
+; zlib data compression and ZIP file I/O library
+
+VERSION		1.24
+
+EXPORTS
+        adler32                                  @1
+        compress                                 @2
+        crc32                                    @3
+        deflate                                  @4
+        deflateCopy                              @5
+        deflateEnd                               @6
+        deflateInit2_                            @7
+        deflateInit_                             @8
+        deflateParams                            @9
+        deflateReset                             @10
+        deflateSetDictionary                     @11
+        gzclose                                  @12
+        gzdopen                                  @13
+        gzerror                                  @14
+        gzflush                                  @15
+        gzopen                                   @16
+        gzread                                   @17
+        gzwrite                                  @18
+        inflate                                  @19
+        inflateEnd                               @20
+        inflateInit2_                            @21
+        inflateInit_                             @22
+        inflateReset                             @23
+        inflateSetDictionary                     @24
+        inflateSync                              @25
+        uncompress                               @26
+        zlibVersion                              @27
+        gzprintf                                 @28
+        gzputc                                   @29
+        gzgetc                                   @30
+        gzseek                                   @31
+        gzrewind                                 @32
+        gztell                                   @33
+        gzeof                                    @34
+        gzsetparams                              @35
+        zError                                   @36
+        inflateSyncPoint                         @37
+        get_crc_table                            @38
+        compress2                                @39
+        gzputs                                   @40
+        gzgets                                   @41
+        inflateCopy                              @42
+        inflateBackInit_                         @43
+        inflateBack                              @44
+        inflateBackEnd                           @45
+        compressBound                            @46
+        deflateBound                             @47
+        gzclearerr                               @48
+        gzungetc                                 @49
+        zlibCompileFlags                         @50
+        deflatePrime                             @51
+
+        unzOpen                                  @61
+        unzClose                                 @62
+        unzGetGlobalInfo                         @63
+        unzGetCurrentFileInfo                    @64
+        unzGoToFirstFile                         @65
+        unzGoToNextFile                          @66
+        unzOpenCurrentFile                       @67
+        unzReadCurrentFile                       @68
+        unzOpenCurrentFile3                      @69
+        unztell                                  @70
+        unzeof                                   @71
+        unzCloseCurrentFile                      @72
+        unzGetGlobalComment                      @73
+        unzStringFileNameCompare                 @74
+        unzLocateFile                            @75
+        unzGetLocalExtrafield                    @76
+        unzOpen2                                 @77
+        unzOpenCurrentFile2                      @78
+        unzOpenCurrentFilePassword               @79
+
+        zipOpen                                  @80
+        zipOpenNewFileInZip                      @81
+        zipWriteInFileInZip                      @82
+        zipCloseFileInZip                        @83
+        zipClose                                 @84
+        zipOpenNewFileInZip2                     @86
+        zipCloseFileInZipRaw                     @87
+        zipOpen2                                 @88
+        zipOpenNewFileInZip3                     @89
+
+        unzGetFilePos                            @100
+        unzGoToFilePos                           @101
+
+        fill_win32_filefunc                      @110
+
+; zlibwapi v1.2.4 added:
+        fill_win32_filefunc64                   @111
+        fill_win32_filefunc64A                  @112
+        fill_win32_filefunc64W                  @113
+
+        unzOpen64                               @120
+        unzOpen2_64                             @121
+        unzGetGlobalInfo64                      @122
+        unzGetCurrentFileInfo64                 @124
+        unzGetCurrentFileZStreamPos64           @125
+        unztell64                               @126
+        unzGetFilePos64                         @127
+        unzGoToFilePos64                        @128
+
+        zipOpen64                               @130
+        zipOpen2_64                             @131
+        zipOpenNewFileInZip64                   @132
+        zipOpenNewFileInZip2_64                 @133
+        zipOpenNewFileInZip3_64                 @134
+        zipOpenNewFileInZip4_64                 @135
+        zipCloseFileInZipRaw64                  @136
+
+; zlib1 v1.2.4 added:
+        adler32_combine                         @140
+        crc32_combine                           @142
+        deflateSetHeader                        @144
+        deflateTune                             @145
+        gzbuffer                                @146
+        gzclose_r                               @147
+        gzclose_w                               @148
+        gzdirect                                @149
+        gzoffset                                @150
+        inflateGetHeader                        @156
+        inflateMark                             @157
+        inflatePrime                            @158
+        inflateReset2                           @159
+        inflateUndermine                        @160
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.sln b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.sln
new file mode 100644
index 00000000..6f6ffd5e
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.sln
@@ -0,0 +1,135 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Itanium = Debug|Itanium
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Itanium = Release|Itanium
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
+		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
+		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Itanium
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.Build.0 = Debug|Itanium
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Itanium
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Itanium
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.Build.0 = Debug|Itanium
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Itanium
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.Build.0 = Release|Itanium
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.Build.0 = Debug|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.Build.0 = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.Build.0 = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.vcxproj b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
new file mode 100644
index 00000000..98623989
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
@@ -0,0 +1,659 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Itanium">
+      <Configuration>Debug</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
+      <Configuration>ReleaseWithoutAsm</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
+      <Configuration>ReleaseWithoutAsm</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
+      <Configuration>ReleaseWithoutAsm</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Itanium">
+      <Configuration>Release</Configuration>
+      <Platform>Itanium</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+      <TargetMachine>MachineIA64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+      <TargetMachine>MachineIA64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Itanium</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+      <TargetMachine>MachineIA64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\adler32.c" />
+    <ClCompile Include="..\..\..\compress.c" />
+    <ClCompile Include="..\..\..\crc32.c" />
+    <ClCompile Include="..\..\..\deflate.c" />
+    <ClCompile Include="..\..\..\gzclose.c" />
+    <ClCompile Include="..\..\..\gzlib.c" />
+    <ClCompile Include="..\..\..\gzread.c" />
+    <ClCompile Include="..\..\..\gzwrite.c" />
+    <ClCompile Include="..\..\..\infback.c" />
+    <ClCompile Include="..\..\masmx64\inffas8664.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\inffast.c" />
+    <ClCompile Include="..\..\..\inflate.c" />
+    <ClCompile Include="..\..\..\inftrees.c" />
+    <ClCompile Include="..\..\minizip\ioapi.c" />
+    <ClCompile Include="..\..\minizip\iowin32.c" />
+    <ClCompile Include="..\..\..\trees.c" />
+    <ClCompile Include="..\..\..\uncompr.c" />
+    <ClCompile Include="..\..\minizip\unzip.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\minizip\zip.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\..\zutil.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="zlib.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="zlibvc.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\deflate.h" />
+    <ClInclude Include="..\..\..\infblock.h" />
+    <ClInclude Include="..\..\..\infcodes.h" />
+    <ClInclude Include="..\..\..\inffast.h" />
+    <ClInclude Include="..\..\..\inftrees.h" />
+    <ClInclude Include="..\..\..\infutil.h" />
+    <ClInclude Include="..\..\..\zconf.h" />
+    <ClInclude Include="..\..\..\zlib.h" />
+    <ClInclude Include="..\..\..\zutil.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters
new file mode 100644
index 00000000..180b71cd
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{07934a85-8b61-443d-a0ee-b2eedb74f3cd}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{1d99675b-433d-4a21-9e50-ed4ab8b19762}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{431c0958-fa71-44d0-9084-2d19d100c0cc}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\adler32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\compress.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\crc32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\deflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gzclose.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gzlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gzread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gzwrite.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\infback.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\masmx64\inffas8664.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\inffast.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\inflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\inftrees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\minizip\ioapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\minizip\iowin32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\trees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\uncompr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\minizip\unzip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\minizip\zip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\zutil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="zlib.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="zlibvc.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\deflate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\infblock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\infcodes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\inffast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\inftrees.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\infutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\zconf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\zlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\zutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.user b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.user
new file mode 100644
index 00000000..695b5c78
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/miniunz.vcproj b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/miniunz.vcproj
new file mode 100644
index 00000000..7da32b91
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/miniunz.vcproj
@@ -0,0 +1,565 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="miniunz"
+	ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+		<Platform
+			Name="Itanium"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="x86\MiniUnzip$(ConfigurationName)"
+			IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="false"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"
+				OutputFile="$(OutDir)/miniunz.exe"
+				LinkIncremental="2"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="x86\MiniUnzip$(ConfigurationName)"
+			IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
+				StringPooling="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
+				OutputFile="$(OutDir)/miniunz.exe"
+				LinkIncremental="1"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="x64\MiniUnzip$(ConfigurationName)"
+			IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
+				OutputFile="$(OutDir)/miniunz.exe"
+				LinkIncremental="2"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Itanium"
+			OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"
+			IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="2"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
+				OutputFile="$(OutDir)/miniunz.exe"
+				LinkIncremental="2"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
+				SubSystem="1"
+				TargetMachine="5"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="x64\MiniUnzip$(ConfigurationName)"
+			IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
+				StringPooling="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"
+				OutputFile="$(OutDir)/miniunz.exe"
+				LinkIncremental="1"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Itanium"
+			OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"
+			IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="2"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
+				StringPooling="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"
+				OutputFile="$(OutDir)/miniunz.exe"
+				LinkIncremental="1"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				TargetMachine="5"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+			>
+			<File
+				RelativePath="..\..\minizip\miniunz.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/minizip.vcproj b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/minizip.vcproj
new file mode 100644
index 00000000..e57e07d9
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/minizip.vcproj
@@ -0,0 +1,562 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="minizip"
+	ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+		<Platform
+			Name="Itanium"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="x86\MiniZip$(ConfigurationName)"
+			IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="false"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"
+				OutputFile="$(OutDir)/minizip.exe"
+				LinkIncremental="2"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/minizip.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="x86\MiniZip$(ConfigurationName)"
+			IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
+				StringPooling="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
+				OutputFile="$(OutDir)/minizip.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="x64\$(ConfigurationName)"
+			IntermediateDirectory="x64\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
+				OutputFile="$(OutDir)/minizip.exe"
+				LinkIncremental="2"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/minizip.pdb"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Itanium"
+			OutputDirectory="ia64\$(ConfigurationName)"
+			IntermediateDirectory="ia64\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="2"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
+				OutputFile="$(OutDir)/minizip.exe"
+				LinkIncremental="2"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/minizip.pdb"
+				SubSystem="1"
+				TargetMachine="5"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="x64\$(ConfigurationName)"
+			IntermediateDirectory="x64\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
+				StringPooling="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"
+				OutputFile="$(OutDir)/minizip.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Itanium"
+			OutputDirectory="ia64\$(ConfigurationName)"
+			IntermediateDirectory="ia64\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="2"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
+				StringPooling="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"
+				OutputFile="$(OutDir)/minizip.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				TargetMachine="5"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+			>
+			<File
+				RelativePath="..\..\minizip\minizip.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/testzlib.vcproj b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/testzlib.vcproj
new file mode 100644
index 00000000..9cb0bf87
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/testzlib.vcproj
@@ -0,0 +1,852 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="testzlib"
+	ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
+	RootNamespace="testzlib"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+		<Platform
+			Name="Itanium"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="x86\TestZlib$(ConfigurationName)"
+			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="false"
+				UsePrecompiledHeader="0"
+				AssemblerOutput="4"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
+				OutputFile="$(OutDir)/testzlib.exe"
+				LinkIncremental="2"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="x64\TestZlib$(ConfigurationName)"
+			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				AssemblerListingLocation="$(IntDir)\"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
+				GenerateManifest="false"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Itanium"
+			OutputDirectory="ia64\TestZlib$(ConfigurationName)"
+			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="2"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				UsePrecompiledHeader="0"
+				AssemblerOutput="4"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/testzlib.exe"
+				LinkIncremental="2"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
+				SubSystem="1"
+				TargetMachine="5"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseWithoutAsm|Win32"
+			OutputDirectory="x86\TestZlib$(ConfigurationName)"
+			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				StringPooling="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/testzlib.exe"
+				LinkIncremental="1"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseWithoutAsm|x64"
+			OutputDirectory="x64\TestZlib$(ConfigurationName)"
+			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				AssemblerListingLocation="$(IntDir)\"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				GenerateManifest="false"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseWithoutAsm|Itanium"
+			OutputDirectory="ia64\TestZlib$(ConfigurationName)"
+			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="2"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
+				StringPooling="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/testzlib.exe"
+				LinkIncremental="1"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				TargetMachine="5"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="x86\TestZlib$(ConfigurationName)"
+			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				StringPooling="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
+				OutputFile="$(OutDir)/testzlib.exe"
+				LinkIncremental="1"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="x64\TestZlib$(ConfigurationName)"
+			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				AssemblerListingLocation="$(IntDir)\"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
+				GenerateManifest="false"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Itanium"
+			OutputDirectory="ia64\TestZlib$(ConfigurationName)"
+			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="2"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
+				StringPooling="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/testzlib.exe"
+				LinkIncremental="1"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				TargetMachine="5"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+			>
+			<File
+				RelativePath="..\..\..\adler32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compress.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\crc32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\deflate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\infback.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\masmx64\inffas8664.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Itanium"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseWithoutAsm|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseWithoutAsm|Itanium"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Itanium"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\inffast.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\inflate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\inftrees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\testzlib\testzlib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\uncompr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\zutil.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/testzlibdll.vcproj b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
new file mode 100644
index 00000000..b1ddde05
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
@@ -0,0 +1,565 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="TestZlibDll"
+	ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+		<Platform
+			Name="Itanium"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
+			IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="false"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"
+				OutputFile="$(OutDir)/testzlib.exe"
+				LinkIncremental="2"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
+			IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
+				StringPooling="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
+				OutputFile="$(OutDir)/testzlib.exe"
+				LinkIncremental="1"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="x64\TestZlibDll$(ConfigurationName)"
+			IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
+				OutputFile="$(OutDir)/testzlib.exe"
+				LinkIncremental="2"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Itanium"
+			OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"
+			IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="2"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
+				OutputFile="$(OutDir)/testzlib.exe"
+				LinkIncremental="2"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
+				SubSystem="1"
+				TargetMachine="5"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="x64\TestZlibDll$(ConfigurationName)"
+			IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
+				StringPooling="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"
+				OutputFile="$(OutDir)/testzlib.exe"
+				LinkIncremental="1"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Itanium"
+			OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"
+			IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="2"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
+				StringPooling="true"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"
+				OutputFile="$(OutDir)/testzlib.exe"
+				LinkIncremental="1"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				TargetMachine="5"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+			>
+			<File
+				RelativePath="..\..\testzlib\testzlib.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlib.rc b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlib.rc
new file mode 100644
index 00000000..f8224508
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlib.rc
@@ -0,0 +1,32 @@
+#include <windows.h>
+
+#define IDR_VERSION1  1
+IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
+  FILEVERSION	 1,2,5,0
+  PRODUCTVERSION 1,2,5,0
+  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
+  FILEFLAGS	0
+  FILEOS	VOS_DOS_WINDOWS32
+  FILETYPE	VFT_DLL
+  FILESUBTYPE	0	// not used
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    //language ID = U.S. English, char set = Windows, Multilingual
+
+    BEGIN
+      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
+      VALUE "FileVersion",	"1.2.5\0"
+      VALUE "InternalName",	"zlib\0"
+      VALUE "OriginalFilename",	"zlib.dll\0"
+      VALUE "ProductName",	"ZLib.DLL\0"
+      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
+      VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x0409, 1252
+  END
+END
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlibstat.vcproj b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlibstat.vcproj
new file mode 100644
index 00000000..61c76c7c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlibstat.vcproj
@@ -0,0 +1,835 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="zlibstat"
+	ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+		<Platform
+			Name="Itanium"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="x86\ZlibStat$(ConfigurationName)"
+			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
+			ConfigurationType="4"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				ExceptionHandling="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="false"
+				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
+				OutputFile="$(OutDir)\zlibstat.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="x64\ZlibStat$(ConfigurationName)"
+			IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
+			ConfigurationType="4"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
+				ExceptionHandling="0"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
+				OutputFile="$(OutDir)\zlibstat.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Itanium"
+			OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
+			IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
+			ConfigurationType="4"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="2"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
+				ExceptionHandling="0"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"
+				OutputFile="$(OutDir)\zlibstat.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="x86\ZlibStat$(ConfigurationName)"
+			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
+			ConfigurationType="4"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
+				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "
+				OutputFile="$(OutDir)\zlibstat.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="x64\ZlibStat$(ConfigurationName)"
+			IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
+			ConfigurationType="4"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
+				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
+				OutputFile="$(OutDir)\zlibstat.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Itanium"
+			OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
+			IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
+			ConfigurationType="4"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="2"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"
+				OutputFile="$(OutDir)\zlibstat.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseWithoutAsm|Win32"
+			OutputDirectory="x86\ZlibStat$(ConfigurationName)"
+			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
+			ConfigurationType="4"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
+				OutputFile="$(OutDir)\zlibstat.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseWithoutAsm|x64"
+			OutputDirectory="x64\ZlibStat$(ConfigurationName)"
+			IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
+			ConfigurationType="4"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
+				OutputFile="$(OutDir)\zlibstat.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseWithoutAsm|Itanium"
+			OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
+			IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
+			ConfigurationType="4"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="2"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"
+				OutputFile="$(OutDir)\zlibstat.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath="..\..\..\adler32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compress.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\crc32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\deflate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gzclose.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gzguts.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gzlib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gzread.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gzwrite.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\infback.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\masmx64\inffas8664.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Itanium"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Itanium"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseWithoutAsm|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseWithoutAsm|Itanium"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\inffast.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\inflate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\inftrees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\minizip\ioapi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\uncompr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\minizip\unzip.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\minizip\zip.c"
+				>
+			</File>
+			<File
+				RelativePath=".\zlib.rc"
+				>
+			</File>
+			<File
+				RelativePath=".\zlibvc.def"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\zutil.c"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlibvc.def b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlibvc.def
new file mode 100644
index 00000000..0269ef72
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlibvc.def
@@ -0,0 +1,130 @@
+LIBRARY
+; zlib data compression and ZIP file I/O library
+
+VERSION		1.24
+
+EXPORTS
+        adler32                                  @1
+        compress                                 @2
+        crc32                                    @3
+        deflate                                  @4
+        deflateCopy                              @5
+        deflateEnd                               @6
+        deflateInit2_                            @7
+        deflateInit_                             @8
+        deflateParams                            @9
+        deflateReset                             @10
+        deflateSetDictionary                     @11
+        gzclose                                  @12
+        gzdopen                                  @13
+        gzerror                                  @14
+        gzflush                                  @15
+        gzopen                                   @16
+        gzread                                   @17
+        gzwrite                                  @18
+        inflate                                  @19
+        inflateEnd                               @20
+        inflateInit2_                            @21
+        inflateInit_                             @22
+        inflateReset                             @23
+        inflateSetDictionary                     @24
+        inflateSync                              @25
+        uncompress                               @26
+        zlibVersion                              @27
+        gzprintf                                 @28
+        gzputc                                   @29
+        gzgetc                                   @30
+        gzseek                                   @31
+        gzrewind                                 @32
+        gztell                                   @33
+        gzeof                                    @34
+        gzsetparams                              @35
+        zError                                   @36
+        inflateSyncPoint                         @37
+        get_crc_table                            @38
+        compress2                                @39
+        gzputs                                   @40
+        gzgets                                   @41
+        inflateCopy                              @42
+        inflateBackInit_                         @43
+        inflateBack                              @44
+        inflateBackEnd                           @45
+        compressBound                            @46
+        deflateBound                             @47
+        gzclearerr                               @48
+        gzungetc                                 @49
+        zlibCompileFlags                         @50
+        deflatePrime                             @51
+
+        unzOpen                                  @61
+        unzClose                                 @62
+        unzGetGlobalInfo                         @63
+        unzGetCurrentFileInfo                    @64
+        unzGoToFirstFile                         @65
+        unzGoToNextFile                          @66
+        unzOpenCurrentFile                       @67
+        unzReadCurrentFile                       @68
+        unzOpenCurrentFile3                      @69
+        unztell                                  @70
+        unzeof                                   @71
+        unzCloseCurrentFile                      @72
+        unzGetGlobalComment                      @73
+        unzStringFileNameCompare                 @74
+        unzLocateFile                            @75
+        unzGetLocalExtrafield                    @76
+        unzOpen2                                 @77
+        unzOpenCurrentFile2                      @78
+        unzOpenCurrentFilePassword               @79
+
+        zipOpen                                  @80
+        zipOpenNewFileInZip                      @81
+        zipWriteInFileInZip                      @82
+        zipCloseFileInZip                        @83
+        zipClose                                 @84
+        zipOpenNewFileInZip2                     @86
+        zipCloseFileInZipRaw                     @87
+        zipOpen2                                 @88
+        zipOpenNewFileInZip3                     @89
+
+        unzGetFilePos                            @100
+        unzGoToFilePos                           @101
+
+        fill_win32_filefunc                      @110
+
+; zlibwapi v1.2.4 added:
+        fill_win32_filefunc64                   @111
+        fill_win32_filefunc64A                  @112
+        fill_win32_filefunc64W                  @113
+
+        unzOpen64                               @120
+        unzOpen2_64                             @121
+        unzGetGlobalInfo64                      @122
+        unzGetCurrentFileInfo64                 @124
+        unzGetCurrentFileZStreamPos64           @125
+        unztell64                               @126
+        unzGetFilePos64                         @127
+        unzGoToFilePos64                        @128
+
+        zipOpen64                               @130
+        zipOpen2_64                             @131
+        zipOpenNewFileInZip64                   @132
+        zipOpenNewFileInZip2_64                 @133
+        zipOpenNewFileInZip3_64                 @134
+        zipOpenNewFileInZip4_64                 @135
+        zipCloseFileInZipRaw64                  @136
+
+; zlib1 v1.2.4 added:
+        adler32_combine                         @140
+        crc32_combine                           @142
+        deflateSetHeader                        @144
+        deflateTune                             @145
+        gzbuffer                                @146
+        gzclose_r                               @147
+        gzclose_w                               @148
+        gzdirect                                @149
+        gzoffset                                @150
+        inflateGetHeader                        @156
+        inflateMark                             @157
+        inflatePrime                            @158
+        inflateReset2                           @159
+        inflateUndermine                        @160
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlibvc.sln b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlibvc.sln
new file mode 100644
index 00000000..b4829671
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlibvc.sln
@@ -0,0 +1,144 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestZlibDll", "testzlibdll.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Itanium = Debug|Itanium
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Itanium = Release|Itanium
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
+		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
+		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Itanium
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.Build.0 = Debug|Itanium
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Itanium
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Itanium
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.Build.0 = Debug|Itanium
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Itanium
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.Build.0 = Release|Itanium
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.Build.0 = Debug|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.Build.0 = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.Build.0 = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlibvc.vcproj b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlibvc.vcproj
new file mode 100644
index 00000000..c9a89471
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/contrib/vstudio/vc9/zlibvc.vcproj
@@ -0,0 +1,1156 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="zlibvc"
+	ProjectGUID="{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
+	RootNamespace="zlibvc"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+		<Platform
+			Name="Itanium"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="x86\ZlibDll$(ConfigurationName)"
+			IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="2"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName="$(OutDir)/zlibvc.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
+				ExceptionHandling="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="false"
+				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				BrowseInformation="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
+				OutputFile="$(OutDir)\zlibwapi.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateManifest="false"
+				ModuleDefinitionFile=".\zlibvc.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)/zlibwapi.map"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)/zlibwapi.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="x64\ZlibDll$(ConfigurationName)"
+			IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="2"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="3"
+				TypeLibraryName="$(OutDir)/zlibvc.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"
+				ExceptionHandling="0"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				BrowseInformation="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
+				OutputFile="$(OutDir)\zlibwapi.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateManifest="false"
+				ModuleDefinitionFile=".\zlibvc.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)/zlibwapi.map"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/zlibwapi.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Itanium"
+			OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
+			IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="2"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="2"
+				TypeLibraryName="$(OutDir)/zlibvc.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
+				ExceptionHandling="0"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				BrowseInformation="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\zlibwapi.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateManifest="false"
+				ModuleDefinitionFile=".\zlibvc.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)/zlibwapi.map"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/zlibwapi.lib"
+				TargetMachine="5"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseWithoutAsm|Win32"
+			OutputDirectory="x86\ZlibDll$(ConfigurationName)"
+			IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="2"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName="$(OutDir)/zlibvc.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				BrowseInformation="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				OutputFile="$(OutDir)\zlibwapi.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="false"
+				ModuleDefinitionFile=".\zlibvc.def"
+				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)/zlibwapi.map"
+				SubSystem="2"
+				OptimizeForWindows98="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)/zlibwapi.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseWithoutAsm|x64"
+			OutputDirectory="x64\ZlibDll$(ConfigurationName)"
+			IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="2"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="3"
+				TypeLibraryName="$(OutDir)/zlibvc.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				BrowseInformation="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\zlibwapi.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="false"
+				ModuleDefinitionFile=".\zlibvc.def"
+				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)/zlibwapi.map"
+				SubSystem="2"
+				OptimizeForWindows98="1"
+				ImportLibrary="$(OutDir)/zlibwapi.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseWithoutAsm|Itanium"
+			OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
+			IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="2"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="2"
+				TypeLibraryName="$(OutDir)/zlibvc.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				BrowseInformation="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\zlibwapi.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="false"
+				ModuleDefinitionFile=".\zlibvc.def"
+				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)/zlibwapi.map"
+				SubSystem="2"
+				OptimizeForWindows98="1"
+				ImportLibrary="$(OutDir)/zlibwapi.lib"
+				TargetMachine="5"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="x86\ZlibDll$(ConfigurationName)"
+			IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="2"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName="$(OutDir)/zlibvc.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				BrowseInformation="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "
+				OutputFile="$(OutDir)\zlibwapi.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="false"
+				ModuleDefinitionFile=".\zlibvc.def"
+				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)/zlibwapi.map"
+				SubSystem="2"
+				OptimizeForWindows98="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)/zlibwapi.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="x64\ZlibDll$(ConfigurationName)"
+			IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="2"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="3"
+				TypeLibraryName="$(OutDir)/zlibvc.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				BrowseInformation="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
+				OutputFile="$(OutDir)\zlibwapi.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="false"
+				ModuleDefinitionFile=".\zlibvc.def"
+				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)/zlibwapi.map"
+				SubSystem="2"
+				OptimizeForWindows98="1"
+				ImportLibrary="$(OutDir)/zlibwapi.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Itanium"
+			OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
+			IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
+			ConfigurationType="2"
+			InheritedPropertySheets="UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="2"
+				TypeLibraryName="$(OutDir)/zlibvc.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				BrowseInformation="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\zlibwapi.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="false"
+				ModuleDefinitionFile=".\zlibvc.def"
+				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)/zlibwapi.map"
+				SubSystem="2"
+				OptimizeForWindows98="1"
+				ImportLibrary="$(OutDir)/zlibwapi.lib"
+				TargetMachine="5"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+			>
+			<File
+				RelativePath="..\..\..\adler32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compress.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\crc32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\deflate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gzclose.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gzguts.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gzlib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gzread.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gzwrite.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\infback.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\masmx64\inffas8664.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Itanium"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseWithoutAsm|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseWithoutAsm|Itanium"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Itanium"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\inffast.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\inflate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\inftrees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\minizip\ioapi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\minizip\iowin32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\uncompr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\minizip\unzip.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ZLIB_INTERNAL"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ZLIB_INTERNAL"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Itanium"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ZLIB_INTERNAL"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\minizip\zip.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ZLIB_INTERNAL"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ZLIB_INTERNAL"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Itanium"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ZLIB_INTERNAL"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\zlib.rc"
+				>
+			</File>
+			<File
+				RelativePath=".\zlibvc.def"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\zutil.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;fi;fd"
+			>
+			<File
+				RelativePath="..\..\..\deflate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\infblock.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\infcodes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\inffast.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\inftrees.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\infutil.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\zconf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\zlib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\zutil.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/crc32.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/crc32.c
new file mode 100644
index 00000000..17a6fbf0
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/crc32.c
@@ -0,0 +1,442 @@
+/* crc32.c -- compute the CRC-32 of a data stream
+ * Copyright (C) 1995-2006, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
+ * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
+ * tables for updating the shift register in one step with three exclusive-ors
+ * instead of four steps with four exclusive-ors.  This results in about a
+ * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
+ */
+
+/* @(#) $Id: crc32.c 246 2010-04-23 10:54:55Z nijtmans $ */
+
+/*
+  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
+  protection on the static variables used to control the first-use generation
+  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
+  first call get_crc_table() to initialize the tables before allowing more than
+  one thread to use crc32().
+ */
+
+#ifdef MAKECRCH
+#  include <stdio.h>
+#  ifndef DYNAMIC_CRC_TABLE
+#    define DYNAMIC_CRC_TABLE
+#  endif /* !DYNAMIC_CRC_TABLE */
+#endif /* MAKECRCH */
+
+#include "zutil.h"      /* for STDC and FAR definitions */
+
+#define local static
+
+/* Find a four-byte integer type for crc32_little() and crc32_big(). */
+#ifndef NOBYFOUR
+#  ifdef STDC           /* need ANSI C limits.h to determine sizes */
+#    include <limits.h>
+#    define BYFOUR
+#    if (UINT_MAX == 0xffffffffUL)
+       typedef unsigned int u4;
+#    else
+#      if (ULONG_MAX == 0xffffffffUL)
+         typedef unsigned long u4;
+#      else
+#        if (USHRT_MAX == 0xffffffffUL)
+           typedef unsigned short u4;
+#        else
+#          undef BYFOUR     /* can't find a four-byte integer type! */
+#        endif
+#      endif
+#    endif
+#  endif /* STDC */
+#endif /* !NOBYFOUR */
+
+/* Definitions for doing the crc four data bytes at a time. */
+#ifdef BYFOUR
+#  define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \
+                (((w)&0xff00)<<8)+(((w)&0xff)<<24))
+   local unsigned long crc32_little OF((unsigned long,
+                        const unsigned char FAR *, unsigned));
+   local unsigned long crc32_big OF((unsigned long,
+                        const unsigned char FAR *, unsigned));
+#  define TBLS 8
+#else
+#  define TBLS 1
+#endif /* BYFOUR */
+
+/* Local functions for crc concatenation */
+local unsigned long gf2_matrix_times OF((unsigned long *mat,
+                                         unsigned long vec));
+local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
+local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2);
+
+
+#ifdef DYNAMIC_CRC_TABLE
+
+local volatile int crc_table_empty = 1;
+local unsigned long FAR crc_table[TBLS][256];
+local void make_crc_table OF((void));
+#ifdef MAKECRCH
+   local void write_table OF((FILE *, const unsigned long FAR *));
+#endif /* MAKECRCH */
+/*
+  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,
+  with the lowest powers in the most significant bit.  Then adding polynomials
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by
+  one.  If we call the above polynomial p, and represent a byte as the
+  polynomial q, also with the lowest power in the most significant bit (so the
+  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+  where a mod b means the remainder after dividing a by b.
+
+  This calculation is done using the shift-register method of multiplying and
+  taking the remainder.  The register is initialized to zero, and for each
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
+  x (which is shifting right by one and adding x^32 mod p if the bit shifted
+  out is a one).  We start with the highest power (least significant bit) of
+  q and repeat for all eight bits of q.
+
+  The first table is simply the CRC of all possible eight bit values.  This is
+  all the information needed to generate CRCs on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.  The remaining tables
+  allow for word-at-a-time CRC calculation for both big-endian and little-
+  endian machines, where a word is four bytes.
+*/
+local void make_crc_table()
+{
+    unsigned long c;
+    int n, k;
+    unsigned long poly;                 /* polynomial exclusive-or pattern */
+    /* terms of polynomial defining this crc (except x^32): */
+    static volatile int first = 1;      /* flag to limit concurrent making */
+    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+
+    /* See if another task is already doing this (not thread-safe, but better
+       than nothing -- significantly reduces duration of vulnerability in
+       case the advice about DYNAMIC_CRC_TABLE is ignored) */
+    if (first) {
+        first = 0;
+
+        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
+        poly = 0UL;
+        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
+            poly |= 1UL << (31 - p[n]);
+
+        /* generate a crc for every 8-bit value */
+        for (n = 0; n < 256; n++) {
+            c = (unsigned long)n;
+            for (k = 0; k < 8; k++)
+                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
+            crc_table[0][n] = c;
+        }
+
+#ifdef BYFOUR
+        /* generate crc for each value followed by one, two, and three zeros,
+           and then the byte reversal of those as well as the first table */
+        for (n = 0; n < 256; n++) {
+            c = crc_table[0][n];
+            crc_table[4][n] = REV(c);
+            for (k = 1; k < 4; k++) {
+                c = crc_table[0][c & 0xff] ^ (c >> 8);
+                crc_table[k][n] = c;
+                crc_table[k + 4][n] = REV(c);
+            }
+        }
+#endif /* BYFOUR */
+
+        crc_table_empty = 0;
+    }
+    else {      /* not first */
+        /* wait for the other guy to finish (not efficient, but rare) */
+        while (crc_table_empty)
+            ;
+    }
+
+#ifdef MAKECRCH
+    /* write out CRC tables to crc32.h */
+    {
+        FILE *out;
+
+        out = fopen("crc32.h", "w");
+        if (out == NULL) return;
+        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
+        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
+        fprintf(out, "local const unsigned long FAR ");
+        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
+        write_table(out, crc_table[0]);
+#  ifdef BYFOUR
+        fprintf(out, "#ifdef BYFOUR\n");
+        for (k = 1; k < 8; k++) {
+            fprintf(out, "  },\n  {\n");
+            write_table(out, crc_table[k]);
+        }
+        fprintf(out, "#endif\n");
+#  endif /* BYFOUR */
+        fprintf(out, "  }\n};\n");
+        fclose(out);
+    }
+#endif /* MAKECRCH */
+}
+
+#ifdef MAKECRCH
+local void write_table(out, table)
+    FILE *out;
+    const unsigned long FAR *table;
+{
+    int n;
+
+    for (n = 0; n < 256; n++)
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],
+                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
+}
+#endif /* MAKECRCH */
+
+#else /* !DYNAMIC_CRC_TABLE */
+/* ========================================================================
+ * Tables of CRC-32s of all single-byte values, made by make_crc_table().
+ */
+#include "crc32.h"
+#endif /* DYNAMIC_CRC_TABLE */
+
+/* =========================================================================
+ * This function can be used by asm versions of crc32()
+ */
+const unsigned long FAR * ZEXPORT get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+    return (const unsigned long FAR *)crc_table;
+}
+
+/* ========================================================================= */
+#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
+#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+
+/* ========================================================================= */
+unsigned long ZEXPORT crc32(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    uInt len;
+{
+    if (buf == Z_NULL) return 0UL;
+
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+
+#ifdef BYFOUR
+    if (sizeof(void *) == sizeof(ptrdiff_t)) {
+        u4 endian;
+
+        endian = 1;
+        if (*((unsigned char *)(&endian)))
+            return crc32_little(crc, buf, len);
+        else
+            return crc32_big(crc, buf, len);
+    }
+#endif /* BYFOUR */
+    crc = crc ^ 0xffffffffUL;
+    while (len >= 8) {
+        DO8;
+        len -= 8;
+    }
+    if (len) do {
+        DO1;
+    } while (--len);
+    return crc ^ 0xffffffffUL;
+}
+
+#ifdef BYFOUR
+
+/* ========================================================================= */
+#define DOLIT4 c ^= *buf4++; \
+        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
+            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
+#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
+
+/* ========================================================================= */
+local unsigned long crc32_little(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    unsigned len;
+{
+    register u4 c;
+    register const u4 FAR *buf4;
+
+    c = (u4)crc;
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+        len--;
+    }
+
+    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    while (len >= 32) {
+        DOLIT32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOLIT4;
+        len -= 4;
+    }
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)c;
+}
+
+/* ========================================================================= */
+#define DOBIG4 c ^= *++buf4; \
+        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
+            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
+#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
+
+/* ========================================================================= */
+local unsigned long crc32_big(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    unsigned len;
+{
+    register u4 c;
+    register const u4 FAR *buf4;
+
+    c = REV((u4)crc);
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+        len--;
+    }
+
+    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    buf4--;
+    while (len >= 32) {
+        DOBIG32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOBIG4;
+        len -= 4;
+    }
+    buf4++;
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)(REV(c));
+}
+
+#endif /* BYFOUR */
+
+#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
+
+/* ========================================================================= */
+local unsigned long gf2_matrix_times(mat, vec)
+    unsigned long *mat;
+    unsigned long vec;
+{
+    unsigned long sum;
+
+    sum = 0;
+    while (vec) {
+        if (vec & 1)
+            sum ^= *mat;
+        vec >>= 1;
+        mat++;
+    }
+    return sum;
+}
+
+/* ========================================================================= */
+local void gf2_matrix_square(square, mat)
+    unsigned long *square;
+    unsigned long *mat;
+{
+    int n;
+
+    for (n = 0; n < GF2_DIM; n++)
+        square[n] = gf2_matrix_times(mat, mat[n]);
+}
+
+/* ========================================================================= */
+local uLong crc32_combine_(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off64_t len2;
+{
+    int n;
+    unsigned long row;
+    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
+    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
+
+    /* degenerate case (also disallow negative lengths) */
+    if (len2 <= 0)
+        return crc1;
+
+    /* put operator for one zero bit in odd */
+    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
+    row = 1;
+    for (n = 1; n < GF2_DIM; n++) {
+        odd[n] = row;
+        row <<= 1;
+    }
+
+    /* put operator for two zero bits in even */
+    gf2_matrix_square(even, odd);
+
+    /* put operator for four zero bits in odd */
+    gf2_matrix_square(odd, even);
+
+    /* apply len2 zeros to crc1 (first square will put the operator for one
+       zero byte, eight zero bits, in even) */
+    do {
+        /* apply zeros operator for this bit of len2 */
+        gf2_matrix_square(even, odd);
+        if (len2 & 1)
+            crc1 = gf2_matrix_times(even, crc1);
+        len2 >>= 1;
+
+        /* if no more bits set, then done */
+        if (len2 == 0)
+            break;
+
+        /* another iteration of the loop with odd and even swapped */
+        gf2_matrix_square(odd, even);
+        if (len2 & 1)
+            crc1 = gf2_matrix_times(odd, crc1);
+        len2 >>= 1;
+
+        /* if no more bits set, then done */
+    } while (len2 != 0);
+
+    /* return combined crc */
+    crc1 ^= crc2;
+    return crc1;
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off_t len2;
+{
+    return crc32_combine_(crc1, crc2, len2);
+}
+
+uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off64_t len2;
+{
+    return crc32_combine_(crc1, crc2, len2);
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/crc32.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/crc32.h
new file mode 100644
index 00000000..8053b611
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/crc32.h
@@ -0,0 +1,441 @@
+/* crc32.h -- tables for rapid CRC calculation
+ * Generated automatically by crc32.c
+ */
+
+local const unsigned long FAR crc_table[TBLS][256] =
+{
+  {
+    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
+    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
+    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
+    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
+    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
+    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
+    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
+    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
+    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
+    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
+    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
+    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
+    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
+    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
+    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
+    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
+    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
+    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
+    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
+    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
+    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
+    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
+    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
+    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
+    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
+    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
+    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
+    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
+    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
+    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
+    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
+    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
+    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
+    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
+    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
+    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
+    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
+    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
+    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
+    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
+    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
+    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
+    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
+    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
+    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
+    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
+    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
+    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
+    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
+    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
+    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
+    0x2d02ef8dUL
+#ifdef BYFOUR
+  },
+  {
+    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
+    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
+    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
+    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
+    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
+    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
+    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
+    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
+    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
+    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
+    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
+    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
+    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
+    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
+    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
+    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
+    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
+    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
+    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
+    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
+    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
+    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
+    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
+    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
+    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
+    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
+    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
+    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
+    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
+    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
+    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
+    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
+    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
+    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
+    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
+    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
+    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
+    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
+    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
+    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
+    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
+    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
+    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
+    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
+    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
+    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
+    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
+    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
+    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
+    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
+    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
+    0x9324fd72UL
+  },
+  {
+    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
+    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
+    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
+    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
+    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
+    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
+    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
+    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
+    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
+    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
+    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
+    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
+    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
+    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
+    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
+    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
+    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
+    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
+    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
+    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
+    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
+    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
+    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
+    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
+    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
+    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
+    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
+    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
+    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
+    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
+    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
+    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
+    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
+    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
+    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
+    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
+    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
+    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
+    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
+    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
+    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
+    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
+    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
+    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
+    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
+    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
+    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
+    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
+    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
+    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
+    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
+    0xbe9834edUL
+  },
+  {
+    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
+    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
+    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
+    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
+    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
+    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
+    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
+    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
+    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
+    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
+    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
+    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
+    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
+    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
+    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
+    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
+    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
+    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
+    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
+    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
+    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
+    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
+    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
+    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
+    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
+    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
+    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
+    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
+    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
+    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
+    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
+    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
+    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
+    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
+    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
+    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
+    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
+    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
+    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
+    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
+    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
+    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
+    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
+    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
+    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
+    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
+    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
+    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
+    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
+    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
+    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
+    0xde0506f1UL
+  },
+  {
+    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
+    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
+    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
+    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
+    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
+    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
+    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
+    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
+    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
+    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
+    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
+    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
+    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
+    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
+    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
+    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
+    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
+    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
+    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
+    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
+    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
+    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
+    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
+    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
+    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
+    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
+    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
+    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
+    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
+    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
+    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
+    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
+    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
+    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
+    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
+    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
+    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
+    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
+    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
+    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
+    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
+    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
+    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
+    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
+    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
+    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
+    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
+    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
+    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
+    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
+    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
+    0x8def022dUL
+  },
+  {
+    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
+    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
+    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
+    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
+    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
+    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
+    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
+    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
+    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
+    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
+    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
+    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
+    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
+    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
+    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
+    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
+    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
+    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
+    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
+    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
+    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
+    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
+    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
+    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
+    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
+    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
+    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
+    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
+    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
+    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
+    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
+    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
+    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
+    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
+    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
+    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
+    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
+    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
+    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
+    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
+    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
+    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
+    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
+    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
+    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
+    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
+    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
+    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
+    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
+    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
+    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
+    0x72fd2493UL
+  },
+  {
+    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
+    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
+    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
+    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
+    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
+    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
+    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
+    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
+    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
+    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
+    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
+    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
+    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
+    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
+    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
+    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
+    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
+    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
+    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
+    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
+    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
+    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
+    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
+    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
+    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
+    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
+    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
+    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
+    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
+    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
+    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
+    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
+    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
+    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
+    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
+    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
+    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
+    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
+    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
+    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
+    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
+    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
+    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
+    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
+    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
+    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
+    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
+    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
+    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
+    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
+    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
+    0xed3498beUL
+  },
+  {
+    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
+    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
+    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
+    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
+    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
+    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
+    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
+    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
+    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
+    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
+    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
+    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
+    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
+    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
+    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
+    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
+    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
+    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
+    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
+    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
+    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
+    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
+    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
+    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
+    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
+    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
+    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
+    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
+    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
+    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
+    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
+    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
+    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
+    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
+    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
+    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
+    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
+    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
+    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
+    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
+    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
+    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
+    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
+    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
+    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
+    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
+    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
+    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
+    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
+    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
+    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
+    0xf10605deUL
+#endif
+  }
+};
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/deflate.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/deflate.c
new file mode 100644
index 00000000..617673f6
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/deflate.c
@@ -0,0 +1,1834 @@
+/* deflate.c -- compress data using the deflation algorithm
+ * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process depends on being able to identify portions
+ *      of the input text which are identical to earlier input (within a
+ *      sliding window trailing behind the input currently being processed).
+ *
+ *      The most straightforward technique turns out to be the fastest for
+ *      most input files: try all possible matches and select the longest.
+ *      The key feature of this algorithm is that insertions into the string
+ *      dictionary are very simple and thus fast, and deletions are avoided
+ *      completely. Insertions are performed at each input character, whereas
+ *      string matches are performed only when the previous match ends. So it
+ *      is preferable to spend more time in matches to allow very fast string
+ *      insertions and avoid deletions. The matching algorithm for small
+ *      strings is inspired from that of Rabin & Karp. A brute force approach
+ *      is used to find longer strings when a small match has been found.
+ *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
+ *      (by Leonid Broukhis).
+ *         A previous version of this file used a more sophisticated algorithm
+ *      (by Fiala and Greene) which is guaranteed to run in linear amortized
+ *      time, but has a larger average cost, uses more memory and is patented.
+ *      However the F&G algorithm may be faster for some highly redundant
+ *      files if the parameter max_chain_length (described below) is too large.
+ *
+ *  ACKNOWLEDGEMENTS
+ *
+ *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
+ *      I found it in 'freeze' written by Leonid Broukhis.
+ *      Thanks to many people for bug reports and testing.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
+ *      Available in http://www.ietf.org/rfc/rfc1951.txt
+ *
+ *      A description of the Rabin and Karp algorithm is given in the book
+ *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
+ *
+ *      Fiala,E.R., and Greene,D.H.
+ *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
+ *
+ */
+
+/* @(#) $Id: deflate.c 246 2010-04-23 10:54:55Z nijtmans $ */
+
+#include "deflate.h"
+
+const char deflate_copyright[] =
+   " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/* ===========================================================================
+ *  Function prototypes.
+ */
+typedef enum {
+    need_more,      /* block not completed, need more input or more output */
+    block_done,     /* block flush performed */
+    finish_started, /* finish started, need only more output at next deflate */
+    finish_done     /* finish done, accept no more input or output */
+} block_state;
+
+typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+/* Compression function. Returns the block state after the call. */
+
+local void fill_window    OF((deflate_state *s));
+local block_state deflate_stored OF((deflate_state *s, int flush));
+local block_state deflate_fast   OF((deflate_state *s, int flush));
+#ifndef FASTEST
+local block_state deflate_slow   OF((deflate_state *s, int flush));
+#endif
+local block_state deflate_rle    OF((deflate_state *s, int flush));
+local block_state deflate_huff   OF((deflate_state *s, int flush));
+local void lm_init        OF((deflate_state *s));
+local void putShortMSB    OF((deflate_state *s, uInt b));
+local void flush_pending  OF((z_streamp strm));
+local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
+#ifdef ASMV
+      void match_init OF((void)); /* asm code initialization */
+      uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#else
+local uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#endif
+
+#ifdef DEBUG
+local  void check_match OF((deflate_state *s, IPos start, IPos match,
+                            int length));
+#endif
+
+/* ===========================================================================
+ * Local data
+ */
+
+#define NIL 0
+/* Tail of hash chains */
+
+#ifndef TOO_FAR
+#  define TOO_FAR 4096
+#endif
+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+
+/* Values for max_lazy_match, good_match and max_chain_length, depending on
+ * the desired pack level (0..9). The values given below have been tuned to
+ * exclude worst case performance for pathological files. Better values may be
+ * found for specific files.
+ */
+typedef struct config_s {
+   ush good_length; /* reduce lazy search above this match length */
+   ush max_lazy;    /* do not perform lazy search above this match length */
+   ush nice_length; /* quit search above this match length */
+   ush max_chain;
+   compress_func func;
+} config;
+
+#ifdef FASTEST
+local const config configuration_table[2] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
+#else
+local const config configuration_table[10] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
+/* 2 */ {4,    5, 16,    8, deflate_fast},
+/* 3 */ {4,    6, 32,   32, deflate_fast},
+
+/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
+/* 5 */ {8,   16, 32,   32, deflate_slow},
+/* 6 */ {8,   16, 128, 128, deflate_slow},
+/* 7 */ {8,   32, 128, 256, deflate_slow},
+/* 8 */ {32, 128, 258, 1024, deflate_slow},
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
+#endif
+
+/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
+ * meaning.
+ */
+
+#define EQUAL 0
+/* result of memcmp for equal strings */
+
+#ifndef NO_DUMMY_DECL
+struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
+#endif
+
+/* ===========================================================================
+ * Update a hash value with the given input byte
+ * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
+ *    input characters, so that a running hash key can be computed from the
+ *    previous key instead of complete recalculation each time.
+ */
+#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
+
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * If this file is compiled with -DFASTEST, the compression level is forced
+ * to 1, and no hash chains are maintained.
+ * IN  assertion: all calls to to INSERT_STRING are made with consecutive
+ *    input characters and the first MIN_MATCH bytes of str are valid
+ *    (except for the last MIN_MATCH-1 bytes of the input file).
+ */
+#ifdef FASTEST
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#else
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#endif
+
+/* ===========================================================================
+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
+ * prev[] will be initialized on the fly.
+ */
+#define CLEAR_HASH(s) \
+    s->head[s->hash_size-1] = NIL; \
+    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+
+/* ========================================================================= */
+int ZEXPORT deflateInit_(strm, level, version, stream_size)
+    z_streamp strm;
+    int level;
+    const char *version;
+    int stream_size;
+{
+    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
+                         Z_DEFAULT_STRATEGY, version, stream_size);
+    /* To do: ignore strm->next_in if we use it as window */
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+                  version, stream_size)
+    z_streamp strm;
+    int  level;
+    int  method;
+    int  windowBits;
+    int  memLevel;
+    int  strategy;
+    const char *version;
+    int stream_size;
+{
+    deflate_state *s;
+    int wrap = 1;
+    static const char my_version[] = ZLIB_VERSION;
+
+    ushf *overlay;
+    /* We overlay pending_buf and d_buf+l_buf. This works since the average
+     * output size for (length,distance) codes is <= 24 bits.
+     */
+
+    if (version == Z_NULL || version[0] != my_version[0] ||
+        stream_size != sizeof(z_stream)) {
+        return Z_VERSION_ERROR;
+    }
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+
+    strm->msg = Z_NULL;
+    if (strm->zalloc == (alloc_func)0) {
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+    }
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+
+    if (windowBits < 0) { /* suppress zlib wrapper */
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+#ifdef GZIP
+    else if (windowBits > 15) {
+        wrap = 2;       /* write gzip wrapper instead */
+        windowBits -= 16;
+    }
+#endif
+    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
+        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
+        strategy < 0 || strategy > Z_FIXED) {
+        return Z_STREAM_ERROR;
+    }
+    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
+    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
+    if (s == Z_NULL) return Z_MEM_ERROR;
+    strm->state = (struct internal_state FAR *)s;
+    s->strm = strm;
+
+    s->wrap = wrap;
+    s->gzhead = Z_NULL;
+    s->w_bits = windowBits;
+    s->w_size = 1 << s->w_bits;
+    s->w_mask = s->w_size - 1;
+
+    s->hash_bits = memLevel + 7;
+    s->hash_size = 1 << s->hash_bits;
+    s->hash_mask = s->hash_size - 1;
+    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+
+    s->high_water = 0;      /* nothing written to s->window yet */
+
+    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+
+    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+    s->pending_buf = (uchf *) overlay;
+    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
+
+    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+        s->pending_buf == Z_NULL) {
+        s->status = FINISH_STATE;
+        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
+        deflateEnd (strm);
+        return Z_MEM_ERROR;
+    }
+    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+
+    s->level = level;
+    s->strategy = strategy;
+    s->method = (Byte)method;
+
+    return deflateReset(strm);
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+    z_streamp strm;
+    const Bytef *dictionary;
+    uInt  dictLength;
+{
+    deflate_state *s;
+    uInt length = dictLength;
+    uInt n;
+    IPos hash_head = 0;
+
+    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
+        strm->state->wrap == 2 ||
+        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))
+        return Z_STREAM_ERROR;
+
+    s = strm->state;
+    if (s->wrap)
+        strm->adler = adler32(strm->adler, dictionary, dictLength);
+
+    if (length < MIN_MATCH) return Z_OK;
+    if (length > s->w_size) {
+        length = s->w_size;
+        dictionary += dictLength - length; /* use the tail of the dictionary */
+    }
+    zmemcpy(s->window, dictionary, length);
+    s->strstart = length;
+    s->block_start = (long)length;
+
+    /* Insert all strings in the hash table (except for the last two bytes).
+     * s->lookahead stays null, so s->ins_h will be recomputed at the next
+     * call of fill_window.
+     */
+    s->ins_h = s->window[0];
+    UPDATE_HASH(s, s->ins_h, s->window[1]);
+    for (n = 0; n <= length - MIN_MATCH; n++) {
+        INSERT_STRING(s, n, hash_head);
+    }
+    if (hash_head) hash_head = 0;  /* to make compiler happy */
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateReset (strm)
+    z_streamp strm;
+{
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
+        return Z_STREAM_ERROR;
+    }
+
+    strm->total_in = strm->total_out = 0;
+    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
+    strm->data_type = Z_UNKNOWN;
+
+    s = (deflate_state *)strm->state;
+    s->pending = 0;
+    s->pending_out = s->pending_buf;
+
+    if (s->wrap < 0) {
+        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
+    }
+    s->status = s->wrap ? INIT_STATE : BUSY_STATE;
+    strm->adler =
+#ifdef GZIP
+        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
+#endif
+        adler32(0L, Z_NULL, 0);
+    s->last_flush = Z_NO_FLUSH;
+
+    _tr_init(s);
+    lm_init(s);
+
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetHeader (strm, head)
+    z_streamp strm;
+    gz_headerp head;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (strm->state->wrap != 2) return Z_STREAM_ERROR;
+    strm->state->gzhead = head;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePrime (strm, bits, value)
+    z_streamp strm;
+    int bits;
+    int value;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    strm->state->bi_valid = bits;
+    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateParams(strm, level, strategy)
+    z_streamp strm;
+    int level;
+    int strategy;
+{
+    deflate_state *s;
+    compress_func func;
+    int err = Z_OK;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
+        return Z_STREAM_ERROR;
+    }
+    func = configuration_table[s->level].func;
+
+    if ((strategy != s->strategy || func != configuration_table[level].func) &&
+        strm->total_in != 0) {
+        /* Flush the last buffer: */
+        err = deflate(strm, Z_BLOCK);
+    }
+    if (s->level != level) {
+        s->level = level;
+        s->max_lazy_match   = configuration_table[level].max_lazy;
+        s->good_match       = configuration_table[level].good_length;
+        s->nice_match       = configuration_table[level].nice_length;
+        s->max_chain_length = configuration_table[level].max_chain;
+    }
+    s->strategy = strategy;
+    return err;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
+    z_streamp strm;
+    int good_length;
+    int max_lazy;
+    int nice_length;
+    int max_chain;
+{
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+    s->good_match = good_length;
+    s->max_lazy_match = max_lazy;
+    s->nice_match = nice_length;
+    s->max_chain_length = max_chain;
+    return Z_OK;
+}
+
+/* =========================================================================
+ * For the default windowBits of 15 and memLevel of 8, this function returns
+ * a close to exact, as well as small, upper bound on the compressed size.
+ * They are coded as constants here for a reason--if the #define's are
+ * changed, then this function needs to be changed as well.  The return
+ * value for 15 and 8 only works for those exact settings.
+ *
+ * For any setting other than those defaults for windowBits and memLevel,
+ * the value returned is a conservative worst case for the maximum expansion
+ * resulting from using fixed blocks instead of stored blocks, which deflate
+ * can emit on compressed data for some combinations of the parameters.
+ *
+ * This function could be more sophisticated to provide closer upper bounds for
+ * every combination of windowBits and memLevel.  But even the conservative
+ * upper bound of about 14% expansion does not seem onerous for output buffer
+ * allocation.
+ */
+uLong ZEXPORT deflateBound(strm, sourceLen)
+    z_streamp strm;
+    uLong sourceLen;
+{
+    deflate_state *s;
+    uLong complen, wraplen;
+    Bytef *str;
+
+    /* conservative upper bound for compressed data */
+    complen = sourceLen +
+              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
+
+    /* if can't get parameters, return conservative bound plus zlib wrapper */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return complen + 6;
+
+    /* compute wrapper length */
+    s = strm->state;
+    switch (s->wrap) {
+    case 0:                                 /* raw deflate */
+        wraplen = 0;
+        break;
+    case 1:                                 /* zlib wrapper */
+        wraplen = 6 + (s->strstart ? 4 : 0);
+        break;
+    case 2:                                 /* gzip wrapper */
+        wraplen = 18;
+        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
+            if (s->gzhead->extra != Z_NULL)
+                wraplen += 2 + s->gzhead->extra_len;
+            str = s->gzhead->name;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            str = s->gzhead->comment;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            if (s->gzhead->hcrc)
+                wraplen += 2;
+        }
+        break;
+    default:                                /* for compiler happiness */
+        wraplen = 6;
+    }
+
+    /* if not default parameters, return conservative bound */
+    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
+        return complen + wraplen;
+
+    /* default settings: return tight bound for that case */
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13 - 6 + wraplen;
+}
+
+/* =========================================================================
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
+ * IN assertion: the stream state is correct and there is enough room in
+ * pending_buf.
+ */
+local void putShortMSB (s, b)
+    deflate_state *s;
+    uInt b;
+{
+    put_byte(s, (Byte)(b >> 8));
+    put_byte(s, (Byte)(b & 0xff));
+}
+
+/* =========================================================================
+ * Flush as much pending output as possible. All deflate() output goes
+ * through this function so some applications may wish to modify it
+ * to avoid allocating a large strm->next_out buffer and copying into it.
+ * (See also read_buf()).
+ */
+local void flush_pending(strm)
+    z_streamp strm;
+{
+    unsigned len = strm->state->pending;
+
+    if (len > strm->avail_out) len = strm->avail_out;
+    if (len == 0) return;
+
+    zmemcpy(strm->next_out, strm->state->pending_out, len);
+    strm->next_out  += len;
+    strm->state->pending_out  += len;
+    strm->total_out += len;
+    strm->avail_out  -= len;
+    strm->state->pending -= len;
+    if (strm->state->pending == 0) {
+        strm->state->pending_out = strm->state->pending_buf;
+    }
+}
+
+/* ========================================================================= */
+int ZEXPORT deflate (strm, flush)
+    z_streamp strm;
+    int flush;
+{
+    int old_flush; /* value of flush param for previous deflate call */
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL ||
+        flush > Z_BLOCK || flush < 0) {
+        return Z_STREAM_ERROR;
+    }
+    s = strm->state;
+
+    if (strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
+        (s->status == FINISH_STATE && flush != Z_FINISH)) {
+        ERR_RETURN(strm, Z_STREAM_ERROR);
+    }
+    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
+
+    s->strm = strm; /* just in case */
+    old_flush = s->last_flush;
+    s->last_flush = flush;
+
+    /* Write the header */
+    if (s->status == INIT_STATE) {
+#ifdef GZIP
+        if (s->wrap == 2) {
+            strm->adler = crc32(0L, Z_NULL, 0);
+            put_byte(s, 31);
+            put_byte(s, 139);
+            put_byte(s, 8);
+            if (s->gzhead == Z_NULL) {
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, s->level == 9 ? 2 :
+                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                             4 : 0));
+                put_byte(s, OS_CODE);
+                s->status = BUSY_STATE;
+            }
+            else {
+                put_byte(s, (s->gzhead->text ? 1 : 0) +
+                            (s->gzhead->hcrc ? 2 : 0) +
+                            (s->gzhead->extra == Z_NULL ? 0 : 4) +
+                            (s->gzhead->name == Z_NULL ? 0 : 8) +
+                            (s->gzhead->comment == Z_NULL ? 0 : 16)
+                        );
+                put_byte(s, (Byte)(s->gzhead->time & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
+                put_byte(s, s->level == 9 ? 2 :
+                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                             4 : 0));
+                put_byte(s, s->gzhead->os & 0xff);
+                if (s->gzhead->extra != Z_NULL) {
+                    put_byte(s, s->gzhead->extra_len & 0xff);
+                    put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
+                }
+                if (s->gzhead->hcrc)
+                    strm->adler = crc32(strm->adler, s->pending_buf,
+                                        s->pending);
+                s->gzindex = 0;
+                s->status = EXTRA_STATE;
+            }
+        }
+        else
+#endif
+        {
+            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+            uInt level_flags;
+
+            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
+                level_flags = 0;
+            else if (s->level < 6)
+                level_flags = 1;
+            else if (s->level == 6)
+                level_flags = 2;
+            else
+                level_flags = 3;
+            header |= (level_flags << 6);
+            if (s->strstart != 0) header |= PRESET_DICT;
+            header += 31 - (header % 31);
+
+            s->status = BUSY_STATE;
+            putShortMSB(s, header);
+
+            /* Save the adler32 of the preset dictionary: */
+            if (s->strstart != 0) {
+                putShortMSB(s, (uInt)(strm->adler >> 16));
+                putShortMSB(s, (uInt)(strm->adler & 0xffff));
+            }
+            strm->adler = adler32(0L, Z_NULL, 0);
+        }
+    }
+#ifdef GZIP
+    if (s->status == EXTRA_STATE) {
+        if (s->gzhead->extra != Z_NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+
+            while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size)
+                        break;
+                }
+                put_byte(s, s->gzhead->extra[s->gzindex]);
+                s->gzindex++;
+            }
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (s->gzindex == s->gzhead->extra_len) {
+                s->gzindex = 0;
+                s->status = NAME_STATE;
+            }
+        }
+        else
+            s->status = NAME_STATE;
+    }
+    if (s->status == NAME_STATE) {
+        if (s->gzhead->name != Z_NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+            int val;
+
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size) {
+                        val = 1;
+                        break;
+                    }
+                }
+                val = s->gzhead->name[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (val == 0) {
+                s->gzindex = 0;
+                s->status = COMMENT_STATE;
+            }
+        }
+        else
+            s->status = COMMENT_STATE;
+    }
+    if (s->status == COMMENT_STATE) {
+        if (s->gzhead->comment != Z_NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+            int val;
+
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size) {
+                        val = 1;
+                        break;
+                    }
+                }
+                val = s->gzhead->comment[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (val == 0)
+                s->status = HCRC_STATE;
+        }
+        else
+            s->status = HCRC_STATE;
+    }
+    if (s->status == HCRC_STATE) {
+        if (s->gzhead->hcrc) {
+            if (s->pending + 2 > s->pending_buf_size)
+                flush_pending(strm);
+            if (s->pending + 2 <= s->pending_buf_size) {
+                put_byte(s, (Byte)(strm->adler & 0xff));
+                put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+                strm->adler = crc32(0L, Z_NULL, 0);
+                s->status = BUSY_STATE;
+            }
+        }
+        else
+            s->status = BUSY_STATE;
+    }
+#endif
+
+    /* Flush as much pending output as possible */
+    if (s->pending != 0) {
+        flush_pending(strm);
+        if (strm->avail_out == 0) {
+            /* Since avail_out is 0, deflate will be called again with
+             * more output space, but possibly with both pending and
+             * avail_in equal to zero. There won't be anything to do,
+             * but this is not an error situation so make sure we
+             * return OK instead of BUF_ERROR at next call of deflate:
+             */
+            s->last_flush = -1;
+            return Z_OK;
+        }
+
+    /* Make sure there is something to do and avoid duplicate consecutive
+     * flushes. For repeated and useless calls with Z_FINISH, we keep
+     * returning Z_STREAM_END instead of Z_BUF_ERROR.
+     */
+    } else if (strm->avail_in == 0 && flush <= old_flush &&
+               flush != Z_FINISH) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* User must not provide more input after the first FINISH: */
+    if (s->status == FINISH_STATE && strm->avail_in != 0) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* Start a new block or continue the current one.
+     */
+    if (strm->avail_in != 0 || s->lookahead != 0 ||
+        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
+        block_state bstate;
+
+        bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
+                    (s->strategy == Z_RLE ? deflate_rle(s, flush) :
+                        (*(configuration_table[s->level].func))(s, flush));
+
+        if (bstate == finish_started || bstate == finish_done) {
+            s->status = FINISH_STATE;
+        }
+        if (bstate == need_more || bstate == finish_started) {
+            if (strm->avail_out == 0) {
+                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
+            }
+            return Z_OK;
+            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+             * of deflate should use the same flush parameter to make sure
+             * that the flush is complete. So we don't have to output an
+             * empty block here, this will be done at next call. This also
+             * ensures that for a very small output buffer, we emit at most
+             * one empty block.
+             */
+        }
+        if (bstate == block_done) {
+            if (flush == Z_PARTIAL_FLUSH) {
+                _tr_align(s);
+            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
+                _tr_stored_block(s, (char*)0, 0L, 0);
+                /* For a full flush, this empty block will be recognized
+                 * as a special marker by inflate_sync().
+                 */
+                if (flush == Z_FULL_FLUSH) {
+                    CLEAR_HASH(s);             /* forget history */
+                    if (s->lookahead == 0) {
+                        s->strstart = 0;
+                        s->block_start = 0L;
+                    }
+                }
+            }
+            flush_pending(strm);
+            if (strm->avail_out == 0) {
+              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
+              return Z_OK;
+            }
+        }
+    }
+    Assert(strm->avail_out > 0, "bug2");
+
+    if (flush != Z_FINISH) return Z_OK;
+    if (s->wrap <= 0) return Z_STREAM_END;
+
+    /* Write the trailer */
+#ifdef GZIP
+    if (s->wrap == 2) {
+        put_byte(s, (Byte)(strm->adler & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
+        put_byte(s, (Byte)(strm->total_in & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
+    }
+    else
+#endif
+    {
+        putShortMSB(s, (uInt)(strm->adler >> 16));
+        putShortMSB(s, (uInt)(strm->adler & 0xffff));
+    }
+    flush_pending(strm);
+    /* If avail_out is zero, the application will call deflate again
+     * to flush the rest.
+     */
+    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
+    return s->pending != 0 ? Z_OK : Z_STREAM_END;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateEnd (strm)
+    z_streamp strm;
+{
+    int status;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+
+    status = strm->state->status;
+    if (status != INIT_STATE &&
+        status != EXTRA_STATE &&
+        status != NAME_STATE &&
+        status != COMMENT_STATE &&
+        status != HCRC_STATE &&
+        status != BUSY_STATE &&
+        status != FINISH_STATE) {
+      return Z_STREAM_ERROR;
+    }
+
+    /* Deallocate in reverse order of allocations: */
+    TRY_FREE(strm, strm->state->pending_buf);
+    TRY_FREE(strm, strm->state->head);
+    TRY_FREE(strm, strm->state->prev);
+    TRY_FREE(strm, strm->state->window);
+
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+
+    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
+}
+
+/* =========================================================================
+ * Copy the source state to the destination state.
+ * To simplify the source, this is not supported for 16-bit MSDOS (which
+ * doesn't have enough memory anyway to duplicate compression states).
+ */
+int ZEXPORT deflateCopy (dest, source)
+    z_streamp dest;
+    z_streamp source;
+{
+#ifdef MAXSEG_64K
+    return Z_STREAM_ERROR;
+#else
+    deflate_state *ds;
+    deflate_state *ss;
+    ushf *overlay;
+
+
+    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
+        return Z_STREAM_ERROR;
+    }
+
+    ss = source->state;
+
+    zmemcpy(dest, source, sizeof(z_stream));
+
+    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
+    if (ds == Z_NULL) return Z_MEM_ERROR;
+    dest->state = (struct internal_state FAR *) ds;
+    zmemcpy(ds, ss, sizeof(deflate_state));
+    ds->strm = dest;
+
+    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
+    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
+    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+    ds->pending_buf = (uchf *) overlay;
+
+    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+        ds->pending_buf == Z_NULL) {
+        deflateEnd (dest);
+        return Z_MEM_ERROR;
+    }
+    /* following zmemcpy do not work for 16-bit MSDOS */
+    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
+    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+
+    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
+    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
+
+    ds->l_desc.dyn_tree = ds->dyn_ltree;
+    ds->d_desc.dyn_tree = ds->dyn_dtree;
+    ds->bl_desc.dyn_tree = ds->bl_tree;
+
+    return Z_OK;
+#endif /* MAXSEG_64K */
+}
+
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
+local int read_buf(strm, buf, size)
+    z_streamp strm;
+    Bytef *buf;
+    unsigned size;
+{
+    unsigned len = strm->avail_in;
+
+    if (len > size) len = size;
+    if (len == 0) return 0;
+
+    strm->avail_in  -= len;
+
+    if (strm->state->wrap == 1) {
+        strm->adler = adler32(strm->adler, strm->next_in, len);
+    }
+#ifdef GZIP
+    else if (strm->state->wrap == 2) {
+        strm->adler = crc32(strm->adler, strm->next_in, len);
+    }
+#endif
+    zmemcpy(buf, strm->next_in, len);
+    strm->next_in  += len;
+    strm->total_in += len;
+
+    return (int)len;
+}
+
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init (s)
+    deflate_state *s;
+{
+    s->window_size = (ulg)2L*s->w_size;
+
+    CLEAR_HASH(s);
+
+    /* Set the default configuration parameters:
+     */
+    s->max_lazy_match   = configuration_table[s->level].max_lazy;
+    s->good_match       = configuration_table[s->level].good_length;
+    s->nice_match       = configuration_table[s->level].nice_length;
+    s->max_chain_length = configuration_table[s->level].max_chain;
+
+    s->strstart = 0;
+    s->block_start = 0L;
+    s->lookahead = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    s->ins_h = 0;
+#ifndef FASTEST
+#ifdef ASMV
+    match_init(); /* initialize the asm code */
+#endif
+#endif
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Set match_start to the longest match starting at the given string and
+ * return its length. Matches shorter or equal to prev_length are discarded,
+ * in which case the result is equal to prev_length and match_start is
+ * garbage.
+ * IN assertions: cur_match is the head of the hash chain for the current
+ *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
+ * OUT assertion: the match length is not greater than s->lookahead.
+ */
+#ifndef ASMV
+/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
+ * match.S. The code will be functionally equivalent.
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    unsigned chain_length = s->max_chain_length;/* max hash chain length */
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    int best_len = s->prev_length;              /* best match length so far */
+    int nice_match = s->nice_match;             /* stop if match long enough */
+    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+        s->strstart - (IPos)MAX_DIST(s) : NIL;
+    /* Stop when cur_match becomes <= limit. To simplify the code,
+     * we prevent matches with the string of window index 0.
+     */
+    Posf *prev = s->prev;
+    uInt wmask = s->w_mask;
+
+#ifdef UNALIGNED_OK
+    /* Compare two bytes at a time. Note: this is not always beneficial.
+     * Try with and without -DUNALIGNED_OK to check.
+     */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+    register ush scan_start = *(ushf*)scan;
+    register ush scan_end   = *(ushf*)(scan+best_len-1);
+#else
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+    register Byte scan_end1  = scan[best_len-1];
+    register Byte scan_end   = scan[best_len];
+#endif
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    /* Do not waste too much time if we already have a good match: */
+    if (s->prev_length >= s->good_match) {
+        chain_length >>= 2;
+    }
+    /* Do not look for matches beyond the end of the input. This is necessary
+     * to make deflate deterministic.
+     */
+    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    do {
+        Assert(cur_match < s->strstart, "no future");
+        match = s->window + cur_match;
+
+        /* Skip to next match if the match length cannot increase
+         * or if the match length is less than 2.  Note that the checks below
+         * for insufficient lookahead only occur occasionally for performance
+         * reasons.  Therefore uninitialized memory will be accessed, and
+         * conditional jumps will be made that depend on those values.
+         * However the length of the match is limited to the lookahead, so
+         * the output of deflate is not affected by the uninitialized values.
+         */
+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
+        /* This code assumes sizeof(unsigned short) == 2. Do not use
+         * UNALIGNED_OK if your compiler uses a different size.
+         */
+        if (*(ushf*)(match+best_len-1) != scan_end ||
+            *(ushf*)match != scan_start) continue;
+
+        /* It is not necessary to compare scan[2] and match[2] since they are
+         * always equal when the other bytes match, given that the hash keys
+         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
+         * strstart+3, +5, ... up to strstart+257. We check for insufficient
+         * lookahead only every 4th comparison; the 128th check will be made
+         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+         * necessary to put more guard bytes at the end of the window, or
+         * to check more often for insufficient lookahead.
+         */
+        Assert(scan[2] == match[2], "scan[2]?");
+        scan++, match++;
+        do {
+        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 scan < strend);
+        /* The funny "do {}" generates better code on most compilers */
+
+        /* Here, scan <= window+strstart+257 */
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        if (*scan == *match) scan++;
+
+        len = (MAX_MATCH - 1) - (int)(strend-scan);
+        scan = strend - (MAX_MATCH-1);
+
+#else /* UNALIGNED_OK */
+
+        if (match[best_len]   != scan_end  ||
+            match[best_len-1] != scan_end1 ||
+            *match            != *scan     ||
+            *++match          != scan[1])      continue;
+
+        /* The check at best_len-1 can be removed because it will be made
+         * again later. (This heuristic is not always a win.)
+         * It is not necessary to compare scan[2] and match[2] since they
+         * are always equal when the other bytes match, given that
+         * the hash keys are equal and that HASH_BITS >= 8.
+         */
+        scan += 2, match++;
+        Assert(*scan == *match, "match[2]?");
+
+        /* We check for insufficient lookahead only every 8th comparison;
+         * the 256th check will be made at strstart+258.
+         */
+        do {
+        } while (*++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 scan < strend);
+
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+        len = MAX_MATCH - (int)(strend - scan);
+        scan = strend - MAX_MATCH;
+
+#endif /* UNALIGNED_OK */
+
+        if (len > best_len) {
+            s->match_start = cur_match;
+            best_len = len;
+            if (len >= nice_match) break;
+#ifdef UNALIGNED_OK
+            scan_end = *(ushf*)(scan+best_len-1);
+#else
+            scan_end1  = scan[best_len-1];
+            scan_end   = scan[best_len];
+#endif
+        }
+    } while ((cur_match = prev[cur_match & wmask]) > limit
+             && --chain_length != 0);
+
+    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+    return s->lookahead;
+}
+#endif /* ASMV */
+
+#else /* FASTEST */
+
+/* ---------------------------------------------------------------------------
+ * Optimized version for FASTEST only
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    Assert(cur_match < s->strstart, "no future");
+
+    match = s->window + cur_match;
+
+    /* Return failure if the match length is less than 2:
+     */
+    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
+
+    /* The check at best_len-1 can be removed because it will be made
+     * again later. (This heuristic is not always a win.)
+     * It is not necessary to compare scan[2] and match[2] since they
+     * are always equal when the other bytes match, given that
+     * the hash keys are equal and that HASH_BITS >= 8.
+     */
+    scan += 2, match += 2;
+    Assert(*scan == *match, "match[2]?");
+
+    /* We check for insufficient lookahead only every 8th comparison;
+     * the 256th check will be made at strstart+258.
+     */
+    do {
+    } while (*++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             scan < strend);
+
+    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+    len = MAX_MATCH - (int)(strend - scan);
+
+    if (len < MIN_MATCH) return MIN_MATCH - 1;
+
+    s->match_start = cur_match;
+    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
+}
+
+#endif /* FASTEST */
+
+#ifdef DEBUG
+/* ===========================================================================
+ * Check that the match at match_start is indeed a match.
+ */
+local void check_match(s, start, match, length)
+    deflate_state *s;
+    IPos start, match;
+    int length;
+{
+    /* check that the match is indeed a match */
+    if (zmemcmp(s->window + match,
+                s->window + start, length) != EQUAL) {
+        fprintf(stderr, " start %u, match %u, length %d\n",
+                start, match, length);
+        do {
+            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
+        } while (--length != 0);
+        z_error("invalid match");
+    }
+    if (z_verbose > 1) {
+        fprintf(stderr,"\\[%d,%d]", start-match, length);
+        do { putc(s->window[start++], stderr); } while (--length != 0);
+    }
+}
+#else
+#  define check_match(s, start, match, length)
+#endif /* DEBUG */
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ *    At least one byte has been read, or avail_in == 0; reads are
+ *    performed for at least two bytes (required for the zip translate_eol
+ *    option -- not supported here).
+ */
+local void fill_window(s)
+    deflate_state *s;
+{
+    register unsigned n, m;
+    register Posf *p;
+    unsigned more;    /* Amount of free space at the end of the window. */
+    uInt wsize = s->w_size;
+
+    do {
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+        /* Deal with !@#$% 64K limit: */
+        if (sizeof(int) <= 2) {
+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+                more = wsize;
+
+            } else if (more == (unsigned)(-1)) {
+                /* Very unlikely, but possible on 16 bit machine if
+                 * strstart == 0 && lookahead == 1 (input done a byte at time)
+                 */
+                more--;
+            }
+        }
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        if (s->strstart >= wsize+MAX_DIST(s)) {
+
+            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
+            s->match_start -= wsize;
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
+            s->block_start -= (long) wsize;
+
+            /* Slide the hash table (could be avoided with 32 bit values
+               at the expense of memory usage). We slide even when level == 0
+               to keep the hash table consistent if we switch back to level > 0
+               later. (Using level 0 permanently is not an optimal usage of
+               zlib, so we don't care about this pathological case.)
+             */
+            n = s->hash_size;
+            p = &s->head[n];
+            do {
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+            } while (--n);
+
+            n = wsize;
+#ifndef FASTEST
+            p = &s->prev[n];
+            do {
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+                /* If n is not on any hash chain, prev[n] is garbage but
+                 * its value will never be used.
+                 */
+            } while (--n);
+#endif
+            more += wsize;
+        }
+        if (s->strm->avail_in == 0) return;
+
+        /* If there was no sliding:
+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+         *    more == window_size - lookahead - strstart
+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+         * => more >= window_size - 2*WSIZE + 2
+         * In the BIG_MEM or MMAP case (not yet supported),
+         *   window_size == input_size + MIN_LOOKAHEAD  &&
+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+         * Otherwise, window_size == 2*WSIZE so more >= 2.
+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+         */
+        Assert(more >= 2, "more < 2");
+
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+        s->lookahead += n;
+
+        /* Initialize the hash value now that we have some input: */
+        if (s->lookahead >= MIN_MATCH) {
+            s->ins_h = s->window[s->strstart];
+            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+        }
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+         * but this is not important since only literal bytes will be emitted.
+         */
+
+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+
+    /* If the WIN_INIT bytes after the end of the current data have never been
+     * written, then zero those bytes in order to avoid memory check reports of
+     * the use of uninitialized (or uninitialised as Julian writes) bytes by
+     * the longest match routines.  Update the high water mark for the next
+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
+     */
+    if (s->high_water < s->window_size) {
+        ulg curr = s->strstart + (ulg)(s->lookahead);
+        ulg init;
+
+        if (s->high_water < curr) {
+            /* Previous high water mark below current data -- zero WIN_INIT
+             * bytes or up to end of window, whichever is less.
+             */
+            init = s->window_size - curr;
+            if (init > WIN_INIT)
+                init = WIN_INIT;
+            zmemzero(s->window + curr, (unsigned)init);
+            s->high_water = curr + init;
+        }
+        else if (s->high_water < (ulg)curr + WIN_INIT) {
+            /* High water mark at or above current data, but below current data
+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
+             * to end of window, whichever is less.
+             */
+            init = (ulg)curr + WIN_INIT - s->high_water;
+            if (init > s->window_size - s->high_water)
+                init = s->window_size - s->high_water;
+            zmemzero(s->window + s->high_water, (unsigned)init);
+            s->high_water += init;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Flush the current block, with given end-of-file flag.
+ * IN assertion: strstart is set to the end of the current match.
+ */
+#define FLUSH_BLOCK_ONLY(s, last) { \
+   _tr_flush_block(s, (s->block_start >= 0L ? \
+                   (charf *)&s->window[(unsigned)s->block_start] : \
+                   (charf *)Z_NULL), \
+                (ulg)((long)s->strstart - s->block_start), \
+                (last)); \
+   s->block_start = s->strstart; \
+   flush_pending(s->strm); \
+   Tracev((stderr,"[FLUSH]")); \
+}
+
+/* Same but force premature exit if necessary. */
+#define FLUSH_BLOCK(s, last) { \
+   FLUSH_BLOCK_ONLY(s, last); \
+   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
+}
+
+/* ===========================================================================
+ * Copy without compression as much as possible from the input stream, return
+ * the current block state.
+ * This function does not insert new strings in the dictionary since
+ * uncompressible data is probably not useful. This function is used
+ * only for the level=0 compression option.
+ * NOTE: this function should be optimized to avoid extra copying from
+ * window to pending_buf.
+ */
+local block_state deflate_stored(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
+     * to pending_buf_size, and each stored block has a 5 byte header:
+     */
+    ulg max_block_size = 0xffff;
+    ulg max_start;
+
+    if (max_block_size > s->pending_buf_size - 5) {
+        max_block_size = s->pending_buf_size - 5;
+    }
+
+    /* Copy as much as possible from input to output: */
+    for (;;) {
+        /* Fill the window as much as possible: */
+        if (s->lookahead <= 1) {
+
+            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
+                   s->block_start >= (long)s->w_size, "slide too late");
+
+            fill_window(s);
+            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
+
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+        Assert(s->block_start >= 0L, "block gone");
+
+        s->strstart += s->lookahead;
+        s->lookahead = 0;
+
+        /* Emit a stored block if pending_buf will be full: */
+        max_start = s->block_start + max_block_size;
+        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
+            /* strstart == 0 is possible when wraparound on 16-bit machine */
+            s->lookahead = (uInt)(s->strstart - max_start);
+            s->strstart = (uInt)max_start;
+            FLUSH_BLOCK(s, 0);
+        }
+        /* Flush if we may have to slide, otherwise block_start may become
+         * negative and the data will be gone:
+         */
+        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
+            FLUSH_BLOCK(s, 0);
+        }
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+
+/* ===========================================================================
+ * Compress as much as possible from the input stream, return the current
+ * block state.
+ * This function does not perform lazy evaluation of matches and inserts
+ * new strings in the dictionary only for unmatched strings or for short
+ * matches. It is used only for the fast compression options.
+ */
+local block_state deflate_fast(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head;       /* head of the hash chain */
+    int bflush;           /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        hash_head = NIL;
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         * At this point we have always match_length < MIN_MATCH
+         */
+        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
+        }
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->match_start, s->match_length);
+
+            _tr_tally_dist(s, s->strstart - s->match_start,
+                           s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+
+            /* Insert new strings in the hash table only if the match length
+             * is not too large. This saves time but degrades compression.
+             */
+#ifndef FASTEST
+            if (s->match_length <= s->max_insert_length &&
+                s->lookahead >= MIN_MATCH) {
+                s->match_length--; /* string at strstart already in table */
+                do {
+                    s->strstart++;
+                    INSERT_STRING(s, s->strstart, hash_head);
+                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                     * always MIN_MATCH bytes ahead.
+                     */
+                } while (--s->match_length != 0);
+                s->strstart++;
+            } else
+#endif
+            {
+                s->strstart += s->match_length;
+                s->match_length = 0;
+                s->ins_h = s->window[s->strstart];
+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+                Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                 * matter since it will be recomputed at next deflate call.
+                 */
+            }
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Same as above, but achieves better compression. We use a lazy
+ * evaluation for matches: a match is finally adopted only if there is
+ * no better match at the next window position.
+ */
+local block_state deflate_slow(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head;          /* head of hash chain */
+    int bflush;              /* set if current block must be flushed */
+
+    /* Process the input block. */
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        hash_head = NIL;
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         */
+        s->prev_length = s->match_length, s->prev_match = s->match_start;
+        s->match_length = MIN_MATCH-1;
+
+        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
+            s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
+
+            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
+#if TOO_FAR <= 32767
+                || (s->match_length == MIN_MATCH &&
+                    s->strstart - s->match_start > TOO_FAR)
+#endif
+                )) {
+
+                /* If prev_match is also MIN_MATCH, match_start is garbage
+                 * but we will ignore the current match anyway.
+                 */
+                s->match_length = MIN_MATCH-1;
+            }
+        }
+        /* If there was a match at the previous step and the current
+         * match is not better, output the previous match:
+         */
+        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+            /* Do not insert strings in hash table beyond this. */
+
+            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+
+            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+                           s->prev_length - MIN_MATCH, bflush);
+
+            /* Insert in hash table all strings up to the end of the match.
+             * strstart-1 and strstart are already inserted. If there is not
+             * enough lookahead, the last two strings are not inserted in
+             * the hash table.
+             */
+            s->lookahead -= s->prev_length-1;
+            s->prev_length -= 2;
+            do {
+                if (++s->strstart <= max_insert) {
+                    INSERT_STRING(s, s->strstart, hash_head);
+                }
+            } while (--s->prev_length != 0);
+            s->match_available = 0;
+            s->match_length = MIN_MATCH-1;
+            s->strstart++;
+
+            if (bflush) FLUSH_BLOCK(s, 0);
+
+        } else if (s->match_available) {
+            /* If there was no match at the previous position, output a
+             * single literal. If there was a match but the current match
+             * is longer, truncate the previous match to a single literal.
+             */
+            Tracevv((stderr,"%c", s->window[s->strstart-1]));
+            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+            if (bflush) {
+                FLUSH_BLOCK_ONLY(s, 0);
+            }
+            s->strstart++;
+            s->lookahead--;
+            if (s->strm->avail_out == 0) return need_more;
+        } else {
+            /* There is no previous match to compare with, wait for
+             * the next step to decide.
+             */
+            s->match_available = 1;
+            s->strstart++;
+            s->lookahead--;
+        }
+    }
+    Assert (flush != Z_NO_FLUSH, "no flush?");
+    if (s->match_available) {
+        Tracevv((stderr,"%c", s->window[s->strstart-1]));
+        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+        s->match_available = 0;
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+#endif /* FASTEST */
+
+/* ===========================================================================
+ * For Z_RLE, simply look for runs of bytes, generate matches only of distance
+ * one.  Do not maintain a hash table.  (It will be regenerated if this run of
+ * deflate switches away from Z_RLE.)
+ */
+local block_state deflate_rle(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;             /* set if current block must be flushed */
+    uInt prev;              /* byte at distance one to match */
+    Bytef *scan, *strend;   /* scan goes up to strend for length of run */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the longest encodable run.
+         */
+        if (s->lookahead < MAX_MATCH) {
+            fill_window(s);
+            if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* See how many times the previous byte repeats */
+        s->match_length = 0;
+        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
+            scan = s->window + s->strstart - 1;
+            prev = *scan;
+            if (prev == *++scan && prev == *++scan && prev == *++scan) {
+                strend = s->window + s->strstart + MAX_MATCH;
+                do {
+                } while (prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         scan < strend);
+                s->match_length = MAX_MATCH - (int)(strend - scan);
+                if (s->match_length > s->lookahead)
+                    s->match_length = s->lookahead;
+            }
+        }
+
+        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->strstart - 1, s->match_length);
+
+            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+            s->strstart += s->match_length;
+            s->match_length = 0;
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+
+/* ===========================================================================
+ * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
+ * (It will be regenerated if this run of deflate switches away from Huffman.)
+ */
+local block_state deflate_huff(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;             /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we have a literal to write. */
+        if (s->lookahead == 0) {
+            fill_window(s);
+            if (s->lookahead == 0) {
+                if (flush == Z_NO_FLUSH)
+                    return need_more;
+                break;      /* flush the current block */
+            }
+        }
+
+        /* Output a literal byte */
+        s->match_length = 0;
+        Tracevv((stderr,"%c", s->window[s->strstart]));
+        _tr_tally_lit (s, s->window[s->strstart], bflush);
+        s->lookahead--;
+        s->strstart++;
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/deflate.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/deflate.h
new file mode 100644
index 00000000..7867e58f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/deflate.h
@@ -0,0 +1,342 @@
+/* deflate.h -- internal compression state
+ * Copyright (C) 1995-2010 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id: deflate.h 246 2010-04-23 10:54:55Z nijtmans $ */
+
+#ifndef DEFLATE_H
+#define DEFLATE_H
+
+#include "zutil.h"
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip encoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GZIP
+#endif
+
+/* ===========================================================================
+ * Internal compression state.
+ */
+
+#define LENGTH_CODES 29
+/* number of length codes, not counting the special END_BLOCK code */
+
+#define LITERALS  256
+/* number of literal bytes 0..255 */
+
+#define L_CODES (LITERALS+1+LENGTH_CODES)
+/* number of Literal or Length codes, including the END_BLOCK code */
+
+#define D_CODES   30
+/* number of distance codes */
+
+#define BL_CODES  19
+/* number of codes used to transfer the bit lengths */
+
+#define HEAP_SIZE (2*L_CODES+1)
+/* maximum heap size */
+
+#define MAX_BITS 15
+/* All codes must not exceed MAX_BITS bits */
+
+#define INIT_STATE    42
+#define EXTRA_STATE   69
+#define NAME_STATE    73
+#define COMMENT_STATE 91
+#define HCRC_STATE   103
+#define BUSY_STATE   113
+#define FINISH_STATE 666
+/* Stream status */
+
+
+/* Data structure describing a single value and its code string. */
+typedef struct ct_data_s {
+    union {
+        ush  freq;       /* frequency count */
+        ush  code;       /* bit string */
+    } fc;
+    union {
+        ush  dad;        /* father node in Huffman tree */
+        ush  len;        /* length of bit string */
+    } dl;
+} FAR ct_data;
+
+#define Freq fc.freq
+#define Code fc.code
+#define Dad  dl.dad
+#define Len  dl.len
+
+typedef struct static_tree_desc_s  static_tree_desc;
+
+typedef struct tree_desc_s {
+    ct_data *dyn_tree;           /* the dynamic tree */
+    int     max_code;            /* largest code with non zero frequency */
+    static_tree_desc *stat_desc; /* the corresponding static tree */
+} FAR tree_desc;
+
+typedef ush Pos;
+typedef Pos FAR Posf;
+typedef unsigned IPos;
+
+/* A Pos is an index in the character window. We use short instead of int to
+ * save space in the various tables. IPos is used only for parameter passing.
+ */
+
+typedef struct internal_state {
+    z_streamp strm;      /* pointer back to this zlib stream */
+    int   status;        /* as the name implies */
+    Bytef *pending_buf;  /* output still pending */
+    ulg   pending_buf_size; /* size of pending_buf */
+    Bytef *pending_out;  /* next pending byte to output to the stream */
+    uInt   pending;      /* nb of bytes in the pending buffer */
+    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
+    gz_headerp  gzhead;  /* gzip header information to write */
+    uInt   gzindex;      /* where in extra, name, or comment */
+    Byte  method;        /* STORED (for zip only) or DEFLATED */
+    int   last_flush;    /* value of flush param for previous deflate call */
+
+                /* used by deflate.c: */
+
+    uInt  w_size;        /* LZ77 window size (32K by default) */
+    uInt  w_bits;        /* log2(w_size)  (8..16) */
+    uInt  w_mask;        /* w_size - 1 */
+
+    Bytef *window;
+    /* Sliding window. Input bytes are read into the second half of the window,
+     * and move to the first half later to keep a dictionary of at least wSize
+     * bytes. With this organization, matches are limited to a distance of
+     * wSize-MAX_MATCH bytes, but this ensures that IO is always
+     * performed with a length multiple of the block size. Also, it limits
+     * the window size to 64K, which is quite useful on MSDOS.
+     * To do: use the user input buffer as sliding window.
+     */
+
+    ulg window_size;
+    /* Actual size of window: 2*wSize, except when the user input buffer
+     * is directly used as sliding window.
+     */
+
+    Posf *prev;
+    /* Link to older string with same hash index. To limit the size of this
+     * array to 64K, this link is maintained only for the last 32K strings.
+     * An index in this array is thus a window index modulo 32K.
+     */
+
+    Posf *head; /* Heads of the hash chains or NIL. */
+
+    uInt  ins_h;          /* hash index of string to be inserted */
+    uInt  hash_size;      /* number of elements in hash table */
+    uInt  hash_bits;      /* log2(hash_size) */
+    uInt  hash_mask;      /* hash_size-1 */
+
+    uInt  hash_shift;
+    /* Number of bits by which ins_h must be shifted at each input
+     * step. It must be such that after MIN_MATCH steps, the oldest
+     * byte no longer takes part in the hash key, that is:
+     *   hash_shift * MIN_MATCH >= hash_bits
+     */
+
+    long block_start;
+    /* Window position at the beginning of the current output block. Gets
+     * negative when the window is moved backwards.
+     */
+
+    uInt match_length;           /* length of best match */
+    IPos prev_match;             /* previous match */
+    int match_available;         /* set if previous match exists */
+    uInt strstart;               /* start of string to insert */
+    uInt match_start;            /* start of matching string */
+    uInt lookahead;              /* number of valid bytes ahead in window */
+
+    uInt prev_length;
+    /* Length of the best match at previous step. Matches not greater than this
+     * are discarded. This is used in the lazy match evaluation.
+     */
+
+    uInt max_chain_length;
+    /* To speed up deflation, hash chains are never searched beyond this
+     * length.  A higher limit improves compression ratio but degrades the
+     * speed.
+     */
+
+    uInt max_lazy_match;
+    /* Attempt to find a better match only when the current match is strictly
+     * smaller than this value. This mechanism is used only for compression
+     * levels >= 4.
+     */
+#   define max_insert_length  max_lazy_match
+    /* Insert new strings in the hash table only if the match length is not
+     * greater than this length. This saves time but degrades compression.
+     * max_insert_length is used only for compression levels <= 3.
+     */
+
+    int level;    /* compression level (1..9) */
+    int strategy; /* favor or force Huffman coding*/
+
+    uInt good_match;
+    /* Use a faster search when the previous match is longer than this */
+
+    int nice_match; /* Stop searching when current match exceeds this */
+
+                /* used by trees.c: */
+    /* Didn't use ct_data typedef below to supress compiler warning */
+    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
+    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
+    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
+
+    struct tree_desc_s l_desc;               /* desc. for literal tree */
+    struct tree_desc_s d_desc;               /* desc. for distance tree */
+    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
+
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
+    int heap_len;               /* number of elements in the heap */
+    int heap_max;               /* element of largest frequency */
+    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
+     * The same heap array is used to build all trees.
+     */
+
+    uch depth[2*L_CODES+1];
+    /* Depth of each subtree used as tie breaker for trees of equal frequency
+     */
+
+    uchf *l_buf;          /* buffer for literals or lengths */
+
+    uInt  lit_bufsize;
+    /* Size of match buffer for literals/lengths.  There are 4 reasons for
+     * limiting lit_bufsize to 64K:
+     *   - frequencies can be kept in 16 bit counters
+     *   - if compression is not successful for the first block, all input
+     *     data is still in the window so we can still emit a stored block even
+     *     when input comes from standard input.  (This can also be done for
+     *     all blocks if lit_bufsize is not greater than 32K.)
+     *   - if compression is not successful for a file smaller than 64K, we can
+     *     even emit a stored file instead of a stored block (saving 5 bytes).
+     *     This is applicable only for zip (not gzip or zlib).
+     *   - creating new Huffman trees less frequently may not provide fast
+     *     adaptation to changes in the input data statistics. (Take for
+     *     example a binary file with poorly compressible code followed by
+     *     a highly compressible string table.) Smaller buffer sizes give
+     *     fast adaptation but have of course the overhead of transmitting
+     *     trees more frequently.
+     *   - I can't count above 4
+     */
+
+    uInt last_lit;      /* running index in l_buf */
+
+    ushf *d_buf;
+    /* Buffer for distances. To simplify the code, d_buf and l_buf have
+     * the same number of elements. To use different lengths, an extra flag
+     * array would be necessary.
+     */
+
+    ulg opt_len;        /* bit length of current block with optimal trees */
+    ulg static_len;     /* bit length of current block with static trees */
+    uInt matches;       /* number of string matches in current block */
+    int last_eob_len;   /* bit length of EOB code for last block */
+
+#ifdef DEBUG
+    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
+    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
+#endif
+
+    ush bi_buf;
+    /* Output buffer. bits are inserted starting at the bottom (least
+     * significant bits).
+     */
+    int bi_valid;
+    /* Number of valid bits in bi_buf.  All bits above the last valid bit
+     * are always zero.
+     */
+
+    ulg high_water;
+    /* High water mark offset in window for initialized bytes -- bytes above
+     * this are set to zero in order to avoid memory check warnings when
+     * longest match routines access bytes past the input.  This is then
+     * updated to the new high water mark.
+     */
+
+} FAR deflate_state;
+
+/* Output a byte on the stream.
+ * IN assertion: there is enough room in pending_buf.
+ */
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
+
+
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
+#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
+/* In order to simplify the code, particularly on 16 bit machines, match
+ * distances are limited to MAX_DIST instead of WSIZE.
+ */
+
+#define WIN_INIT MAX_MATCH
+/* Number of bytes after end of data in window to initialize in order to avoid
+   memory checker errors from longest match routines */
+
+        /* in trees.c */
+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+
+#define d_code(dist) \
+   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
+/* Mapping from a distance to a distance code. dist is the distance - 1 and
+ * must not have side effects. _dist_code[256] and _dist_code[257] are never
+ * used.
+ */
+
+#ifndef DEBUG
+/* Inline versions of _tr_tally for speed: */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+  extern uch ZLIB_INTERNAL _length_code[];
+  extern uch ZLIB_INTERNAL _dist_code[];
+#else
+  extern const uch ZLIB_INTERNAL _length_code[];
+  extern const uch ZLIB_INTERNAL _dist_code[];
+#endif
+
+# define _tr_tally_lit(s, c, flush) \
+  { uch cc = (c); \
+    s->d_buf[s->last_lit] = 0; \
+    s->l_buf[s->last_lit++] = cc; \
+    s->dyn_ltree[cc].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+   }
+# define _tr_tally_dist(s, distance, length, flush) \
+  { uch len = (length); \
+    ush dist = (distance); \
+    s->d_buf[s->last_lit] = dist; \
+    s->l_buf[s->last_lit++] = len; \
+    dist--; \
+    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+    s->dyn_dtree[d_code(dist)].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+  }
+#else
+# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
+# define _tr_tally_dist(s, distance, length, flush) \
+              flush = _tr_tally(s, distance, length)
+#endif
+
+#endif /* DEFLATE_H */
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/algorithm.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/algorithm.txt
new file mode 100644
index 00000000..34960bdd
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/algorithm.txt
@@ -0,0 +1,209 @@
+1. Compression algorithm (deflate)
+
+The deflation algorithm used by gzip (also zip and zlib) is a variation of
+LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in
+the input data.  The second occurrence of a string is replaced by a
+pointer to the previous string, in the form of a pair (distance,
+length).  Distances are limited to 32K bytes, and lengths are limited
+to 258 bytes. When a string does not occur anywhere in the previous
+32K bytes, it is emitted as a sequence of literal bytes.  (In this
+description, `string' must be taken as an arbitrary sequence of bytes,
+and is not restricted to printable characters.)
+
+Literals or match lengths are compressed with one Huffman tree, and
+match distances are compressed with another tree. The trees are stored
+in a compact form at the start of each block. The blocks can have any
+size (except that the compressed data for one block must fit in
+available memory). A block is terminated when deflate() determines that
+it would be useful to start another block with fresh trees. (This is
+somewhat similar to the behavior of LZW-based _compress_.)
+
+Duplicated strings are found using a hash table. All input strings of
+length 3 are inserted in the hash table. A hash index is computed for
+the next 3 bytes. If the hash chain for this index is not empty, all
+strings in the chain are compared with the current input string, and
+the longest match is selected.
+
+The hash chains are searched starting with the most recent strings, to
+favor small distances and thus take advantage of the Huffman encoding.
+The hash chains are singly linked. There are no deletions from the
+hash chains, the algorithm simply discards matches that are too old.
+
+To avoid a worst-case situation, very long hash chains are arbitrarily
+truncated at a certain length, determined by a runtime option (level
+parameter of deflateInit). So deflate() does not always find the longest
+possible match but generally finds a match which is long enough.
+
+deflate() also defers the selection of matches with a lazy evaluation
+mechanism. After a match of length N has been found, deflate() searches for
+a longer match at the next input byte. If a longer match is found, the
+previous match is truncated to a length of one (thus producing a single
+literal byte) and the process of lazy evaluation begins again. Otherwise,
+the original match is kept, and the next match search is attempted only N
+steps later.
+
+The lazy match evaluation is also subject to a runtime parameter. If
+the current match is long enough, deflate() reduces the search for a longer
+match, thus speeding up the whole process. If compression ratio is more
+important than speed, deflate() attempts a complete second search even if
+the first match is already long enough.
+
+The lazy match evaluation is not performed for the fastest compression
+modes (level parameter 1 to 3). For these fast modes, new strings
+are inserted in the hash table only when no match was found, or
+when the match is not too long. This degrades the compression ratio
+but saves time since there are both fewer insertions and fewer searches.
+
+
+2. Decompression algorithm (inflate)
+
+2.1 Introduction
+
+The key question is how to represent a Huffman code (or any prefix code) so
+that you can decode fast.  The most important characteristic is that shorter
+codes are much more common than longer codes, so pay attention to decoding the
+short codes fast, and let the long codes take longer to decode.
+
+inflate() sets up a first level table that covers some number of bits of
+input less than the length of longest code.  It gets that many bits from the
+stream, and looks it up in the table.  The table will tell if the next
+code is that many bits or less and how many, and if it is, it will tell
+the value, else it will point to the next level table for which inflate()
+grabs more bits and tries to decode a longer code.
+
+How many bits to make the first lookup is a tradeoff between the time it
+takes to decode and the time it takes to build the table.  If building the
+table took no time (and if you had infinite memory), then there would only
+be a first level table to cover all the way to the longest code.  However,
+building the table ends up taking a lot longer for more bits since short
+codes are replicated many times in such a table.  What inflate() does is
+simply to make the number of bits in the first table a variable, and  then
+to set that variable for the maximum speed.
+
+For inflate, which has 286 possible codes for the literal/length tree, the size
+of the first table is nine bits.  Also the distance trees have 30 possible
+values, and the size of the first table is six bits.  Note that for each of
+those cases, the table ended up one bit longer than the ``average'' code
+length, i.e. the code length of an approximately flat code which would be a
+little more than eight bits for 286 symbols and a little less than five bits
+for 30 symbols.
+
+
+2.2 More details on the inflate table lookup
+
+Ok, you want to know what this cleverly obfuscated inflate tree actually
+looks like.  You are correct that it's not a Huffman tree.  It is simply a
+lookup table for the first, let's say, nine bits of a Huffman symbol.  The
+symbol could be as short as one bit or as long as 15 bits.  If a particular
+symbol is shorter than nine bits, then that symbol's translation is duplicated
+in all those entries that start with that symbol's bits.  For example, if the
+symbol is four bits, then it's duplicated 32 times in a nine-bit table.  If a
+symbol is nine bits long, it appears in the table once.
+
+If the symbol is longer than nine bits, then that entry in the table points
+to another similar table for the remaining bits.  Again, there are duplicated
+entries as needed.  The idea is that most of the time the symbol will be short
+and there will only be one table look up.  (That's whole idea behind data
+compression in the first place.)  For the less frequent long symbols, there
+will be two lookups.  If you had a compression method with really long
+symbols, you could have as many levels of lookups as is efficient.  For
+inflate, two is enough.
+
+So a table entry either points to another table (in which case nine bits in
+the above example are gobbled), or it contains the translation for the symbol
+and the number of bits to gobble.  Then you start again with the next
+ungobbled bit.
+
+You may wonder: why not just have one lookup table for how ever many bits the
+longest symbol is?  The reason is that if you do that, you end up spending
+more time filling in duplicate symbol entries than you do actually decoding.
+At least for deflate's output that generates new trees every several 10's of
+kbytes.  You can imagine that filling in a 2^15 entry table for a 15-bit code
+would take too long if you're only decoding several thousand symbols.  At the
+other extreme, you could make a new table for every bit in the code.  In fact,
+that's essentially a Huffman tree.  But then you spend too much time
+traversing the tree while decoding, even for short symbols.
+
+So the number of bits for the first lookup table is a trade of the time to
+fill out the table vs. the time spent looking at the second level and above of
+the table.
+
+Here is an example, scaled down:
+
+The code being decoded, with 10 symbols, from 1 to 6 bits long:
+
+A: 0
+B: 10
+C: 1100
+D: 11010
+E: 11011
+F: 11100
+G: 11101
+H: 11110
+I: 111110
+J: 111111
+
+Let's make the first table three bits long (eight entries):
+
+000: A,1
+001: A,1
+010: A,1
+011: A,1
+100: B,2
+101: B,2
+110: -> table X (gobble 3 bits)
+111: -> table Y (gobble 3 bits)
+
+Each entry is what the bits decode as and how many bits that is, i.e. how
+many bits to gobble.  Or the entry points to another table, with the number of
+bits to gobble implicit in the size of the table.
+
+Table X is two bits long since the longest code starting with 110 is five bits
+long:
+
+00: C,1
+01: C,1
+10: D,2
+11: E,2
+
+Table Y is three bits long since the longest code starting with 111 is six
+bits long:
+
+000: F,2
+001: F,2
+010: G,2
+011: G,2
+100: H,2
+101: H,2
+110: I,3
+111: J,3
+
+So what we have here are three tables with a total of 20 entries that had to
+be constructed.  That's compared to 64 entries for a single table.  Or
+compared to 16 entries for a Huffman tree (six two entry tables and one four
+entry table).  Assuming that the code ideally represents the probability of
+the symbols, it takes on the average 1.25 lookups per symbol.  That's compared
+to one lookup for the single table, or 1.66 lookups per symbol for the
+Huffman tree.
+
+There, I think that gives you a picture of what's going on.  For inflate, the
+meaning of a particular symbol is often more than just a letter.  It can be a
+byte (a "literal"), or it can be either a length or a distance which
+indicates a base value and a number of bits to fetch after the code that is
+added to the base value.  Or it might be the special end-of-block code.  The
+data structures created in inftrees.c try to encode all that information
+compactly in the tables.
+
+
+Jean-loup Gailly        Mark Adler
+jloup@gzip.org          madler@alumni.caltech.edu
+
+
+References:
+
+[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data
+Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3,
+pp. 337-343.
+
+``DEFLATE Compressed Data Format Specification'' available in
+http://www.ietf.org/rfc/rfc1951.txt
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/rfc1950.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/rfc1950.txt
new file mode 100644
index 00000000..ce6428a0
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/rfc1950.txt
@@ -0,0 +1,619 @@
+
+
+
+
+
+
+Network Working Group                                         P. Deutsch
+Request for Comments: 1950                           Aladdin Enterprises
+Category: Informational                                      J-L. Gailly
+                                                                Info-ZIP
+                                                                May 1996
+
+
+         ZLIB Compressed Data Format Specification version 3.3
+
+Status of This Memo
+
+   This memo provides information for the Internet community.  This memo
+   does not specify an Internet standard of any kind.  Distribution of
+   this memo is unlimited.
+
+IESG Note:
+
+   The IESG takes no position on the validity of any Intellectual
+   Property Rights statements contained in this document.
+
+Notices
+
+   Copyright (c) 1996 L. Peter Deutsch and Jean-Loup Gailly
+
+   Permission is granted to copy and distribute this document for any
+   purpose and without charge, including translations into other
+   languages and incorporation into compilations, provided that the
+   copyright notice and this notice are preserved, and that any
+   substantive changes or deletions from the original are clearly
+   marked.
+
+   A pointer to the latest version of this and related documentation in
+   HTML format can be found at the URL
+   <ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html>.
+
+Abstract
+
+   This specification defines a lossless compressed data format.  The
+   data can be produced or consumed, even for an arbitrarily long
+   sequentially presented input data stream, using only an a priori
+   bounded amount of intermediate storage.  The format presently uses
+   the DEFLATE compression method but can be easily extended to use
+   other compression methods.  It can be implemented readily in a manner
+   not covered by patents.  This specification also defines the ADLER-32
+   checksum (an extension and improvement of the Fletcher checksum),
+   used for detection of data corruption, and provides an algorithm for
+   computing it.
+
+
+
+
+Deutsch & Gailly             Informational                      [Page 1]
+
+RFC 1950       ZLIB Compressed Data Format Specification        May 1996
+
+
+Table of Contents
+
+   1. Introduction ................................................... 2
+      1.1. Purpose ................................................... 2
+      1.2. Intended audience ......................................... 3
+      1.3. Scope ..................................................... 3
+      1.4. Compliance ................................................ 3
+      1.5.  Definitions of terms and conventions used ................ 3
+      1.6. Changes from previous versions ............................ 3
+   2. Detailed specification ......................................... 3
+      2.1. Overall conventions ....................................... 3
+      2.2. Data format ............................................... 4
+      2.3. Compliance ................................................ 7
+   3. References ..................................................... 7
+   4. Source code .................................................... 8
+   5. Security Considerations ........................................ 8
+   6. Acknowledgements ............................................... 8
+   7. Authors' Addresses ............................................. 8
+   8. Appendix: Rationale ............................................ 9
+   9. Appendix: Sample code ..........................................10
+
+1. Introduction
+
+   1.1. Purpose
+
+      The purpose of this specification is to define a lossless
+      compressed data format that:
+
+          * Is independent of CPU type, operating system, file system,
+            and character set, and hence can be used for interchange;
+
+          * Can be produced or consumed, even for an arbitrarily long
+            sequentially presented input data stream, using only an a
+            priori bounded amount of intermediate storage, and hence can
+            be used in data communications or similar structures such as
+            Unix filters;
+
+          * Can use a number of different compression methods;
+
+          * Can be implemented readily in a manner not covered by
+            patents, and hence can be practiced freely.
+
+      The data format defined by this specification does not attempt to
+      allow random access to compressed data.
+
+
+
+
+
+
+
+Deutsch & Gailly             Informational                      [Page 2]
+
+RFC 1950       ZLIB Compressed Data Format Specification        May 1996
+
+
+   1.2. Intended audience
+
+      This specification is intended for use by implementors of software
+      to compress data into zlib format and/or decompress data from zlib
+      format.
+
+      The text of the specification assumes a basic background in
+      programming at the level of bits and other primitive data
+      representations.
+
+   1.3. Scope
+
+      The specification specifies a compressed data format that can be
+      used for in-memory compression of a sequence of arbitrary bytes.
+
+   1.4. Compliance
+
+      Unless otherwise indicated below, a compliant decompressor must be
+      able to accept and decompress any data set that conforms to all
+      the specifications presented here; a compliant compressor must
+      produce data sets that conform to all the specifications presented
+      here.
+
+   1.5.  Definitions of terms and conventions used
+
+      byte: 8 bits stored or transmitted as a unit (same as an octet).
+      (For this specification, a byte is exactly 8 bits, even on
+      machines which store a character on a number of bits different
+      from 8.) See below, for the numbering of bits within a byte.
+
+   1.6. Changes from previous versions
+
+      Version 3.1 was the first public release of this specification.
+      In version 3.2, some terminology was changed and the Adler-32
+      sample code was rewritten for clarity.  In version 3.3, the
+      support for a preset dictionary was introduced, and the
+      specification was converted to RFC style.
+
+2. Detailed specification
+
+   2.1. Overall conventions
+
+      In the diagrams below, a box like this:
+
+         +---+
+         |   | <-- the vertical bars might be missing
+         +---+
+
+
+
+
+Deutsch & Gailly             Informational                      [Page 3]
+
+RFC 1950       ZLIB Compressed Data Format Specification        May 1996
+
+
+      represents one byte; a box like this:
+
+         +==============+
+         |              |
+         +==============+
+
+      represents a variable number of bytes.
+
+      Bytes stored within a computer do not have a "bit order", since
+      they are always treated as a unit.  However, a byte considered as
+      an integer between 0 and 255 does have a most- and least-
+      significant bit, and since we write numbers with the most-
+      significant digit on the left, we also write bytes with the most-
+      significant bit on the left.  In the diagrams below, we number the
+      bits of a byte so that bit 0 is the least-significant bit, i.e.,
+      the bits are numbered:
+
+         +--------+
+         |76543210|
+         +--------+
+
+      Within a computer, a number may occupy multiple bytes.  All
+      multi-byte numbers in the format described here are stored with
+      the MOST-significant byte first (at the lower memory address).
+      For example, the decimal number 520 is stored as:
+
+             0     1
+         +--------+--------+
+         |00000010|00001000|
+         +--------+--------+
+          ^        ^
+          |        |
+          |        + less significant byte = 8
+          + more significant byte = 2 x 256
+
+   2.2. Data format
+
+      A zlib stream has the following structure:
+
+           0   1
+         +---+---+
+         |CMF|FLG|   (more-->)
+         +---+---+
+
+
+
+
+
+
+
+
+Deutsch & Gailly             Informational                      [Page 4]
+
+RFC 1950       ZLIB Compressed Data Format Specification        May 1996
+
+
+      (if FLG.FDICT set)
+
+           0   1   2   3
+         +---+---+---+---+
+         |     DICTID    |   (more-->)
+         +---+---+---+---+
+
+         +=====================+---+---+---+---+
+         |...compressed data...|    ADLER32    |
+         +=====================+---+---+---+---+
+
+      Any data which may appear after ADLER32 are not part of the zlib
+      stream.
+
+      CMF (Compression Method and flags)
+         This byte is divided into a 4-bit compression method and a 4-
+         bit information field depending on the compression method.
+
+            bits 0 to 3  CM     Compression method
+            bits 4 to 7  CINFO  Compression info
+
+      CM (Compression method)
+         This identifies the compression method used in the file. CM = 8
+         denotes the "deflate" compression method with a window size up
+         to 32K.  This is the method used by gzip and PNG (see
+         references [1] and [2] in Chapter 3, below, for the reference
+         documents).  CM = 15 is reserved.  It might be used in a future
+         version of this specification to indicate the presence of an
+         extra field before the compressed data.
+
+      CINFO (Compression info)
+         For CM = 8, CINFO is the base-2 logarithm of the LZ77 window
+         size, minus eight (CINFO=7 indicates a 32K window size). Values
+         of CINFO above 7 are not allowed in this version of the
+         specification.  CINFO is not defined in this specification for
+         CM not equal to 8.
+
+      FLG (FLaGs)
+         This flag byte is divided as follows:
+
+            bits 0 to 4  FCHECK  (check bits for CMF and FLG)
+            bit  5       FDICT   (preset dictionary)
+            bits 6 to 7  FLEVEL  (compression level)
+
+         The FCHECK value must be such that CMF and FLG, when viewed as
+         a 16-bit unsigned integer stored in MSB order (CMF*256 + FLG),
+         is a multiple of 31.
+
+
+
+
+Deutsch & Gailly             Informational                      [Page 5]
+
+RFC 1950       ZLIB Compressed Data Format Specification        May 1996
+
+
+      FDICT (Preset dictionary)
+         If FDICT is set, a DICT dictionary identifier is present
+         immediately after the FLG byte. The dictionary is a sequence of
+         bytes which are initially fed to the compressor without
+         producing any compressed output. DICT is the Adler-32 checksum
+         of this sequence of bytes (see the definition of ADLER32
+         below).  The decompressor can use this identifier to determine
+         which dictionary has been used by the compressor.
+
+      FLEVEL (Compression level)
+         These flags are available for use by specific compression
+         methods.  The "deflate" method (CM = 8) sets these flags as
+         follows:
+
+            0 - compressor used fastest algorithm
+            1 - compressor used fast algorithm
+            2 - compressor used default algorithm
+            3 - compressor used maximum compression, slowest algorithm
+
+         The information in FLEVEL is not needed for decompression; it
+         is there to indicate if recompression might be worthwhile.
+
+      compressed data
+         For compression method 8, the compressed data is stored in the
+         deflate compressed data format as described in the document
+         "DEFLATE Compressed Data Format Specification" by L. Peter
+         Deutsch. (See reference [3] in Chapter 3, below)
+
+         Other compressed data formats are not specified in this version
+         of the zlib specification.
+
+      ADLER32 (Adler-32 checksum)
+         This contains a checksum value of the uncompressed data
+         (excluding any dictionary data) computed according to Adler-32
+         algorithm. This algorithm is a 32-bit extension and improvement
+         of the Fletcher algorithm, used in the ITU-T X.224 / ISO 8073
+         standard. See references [4] and [5] in Chapter 3, below)
+
+         Adler-32 is composed of two sums accumulated per byte: s1 is
+         the sum of all bytes, s2 is the sum of all s1 values. Both sums
+         are done modulo 65521. s1 is initialized to 1, s2 to zero.  The
+         Adler-32 checksum is stored as s2*65536 + s1 in most-
+         significant-byte first (network) order.
+
+
+
+
+
+
+
+
+Deutsch & Gailly             Informational                      [Page 6]
+
+RFC 1950       ZLIB Compressed Data Format Specification        May 1996
+
+
+   2.3. Compliance
+
+      A compliant compressor must produce streams with correct CMF, FLG
+      and ADLER32, but need not support preset dictionaries.  When the
+      zlib data format is used as part of another standard data format,
+      the compressor may use only preset dictionaries that are specified
+      by this other data format.  If this other format does not use the
+      preset dictionary feature, the compressor must not set the FDICT
+      flag.
+
+      A compliant decompressor must check CMF, FLG, and ADLER32, and
+      provide an error indication if any of these have incorrect values.
+      A compliant decompressor must give an error indication if CM is
+      not one of the values defined in this specification (only the
+      value 8 is permitted in this version), since another value could
+      indicate the presence of new features that would cause subsequent
+      data to be interpreted incorrectly.  A compliant decompressor must
+      give an error indication if FDICT is set and DICTID is not the
+      identifier of a known preset dictionary.  A decompressor may
+      ignore FLEVEL and still be compliant.  When the zlib data format
+      is being used as a part of another standard format, a compliant
+      decompressor must support all the preset dictionaries specified by
+      the other format. When the other format does not use the preset
+      dictionary feature, a compliant decompressor must reject any
+      stream in which the FDICT flag is set.
+
+3. References
+
+   [1] Deutsch, L.P.,"GZIP Compressed Data Format Specification",
+       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
+
+   [2] Thomas Boutell, "PNG (Portable Network Graphics) specification",
+       available in ftp://ftp.uu.net/graphics/png/documents/
+
+   [3] Deutsch, L.P.,"DEFLATE Compressed Data Format Specification",
+       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
+
+   [4] Fletcher, J. G., "An Arithmetic Checksum for Serial
+       Transmissions," IEEE Transactions on Communications, Vol. COM-30,
+       No. 1, January 1982, pp. 247-252.
+
+   [5] ITU-T Recommendation X.224, Annex D, "Checksum Algorithms,"
+       November, 1993, pp. 144, 145. (Available from
+       gopher://info.itu.ch). ITU-T X.244 is also the same as ISO 8073.
+
+
+
+
+
+
+
+Deutsch & Gailly             Informational                      [Page 7]
+
+RFC 1950       ZLIB Compressed Data Format Specification        May 1996
+
+
+4. Source code
+
+   Source code for a C language implementation of a "zlib" compliant
+   library is available at ftp://ftp.uu.net/pub/archiving/zip/zlib/.
+
+5. Security Considerations
+
+   A decoder that fails to check the ADLER32 checksum value may be
+   subject to undetected data corruption.
+
+6. Acknowledgements
+
+   Trademarks cited in this document are the property of their
+   respective owners.
+
+   Jean-Loup Gailly and Mark Adler designed the zlib format and wrote
+   the related software described in this specification.  Glenn
+   Randers-Pehrson converted this document to RFC and HTML format.
+
+7. Authors' Addresses
+
+   L. Peter Deutsch
+   Aladdin Enterprises
+   203 Santa Margarita Ave.
+   Menlo Park, CA 94025
+
+   Phone: (415) 322-0103 (AM only)
+   FAX:   (415) 322-1734
+   EMail: <ghost@aladdin.com>
+
+
+   Jean-Loup Gailly
+
+   EMail: <gzip@prep.ai.mit.edu>
+
+   Questions about the technical content of this specification can be
+   sent by email to
+
+   Jean-Loup Gailly <gzip@prep.ai.mit.edu> and
+   Mark Adler <madler@alumni.caltech.edu>
+
+   Editorial comments on this specification can be sent by email to
+
+   L. Peter Deutsch <ghost@aladdin.com> and
+   Glenn Randers-Pehrson <randeg@alumni.rpi.edu>
+
+
+
+
+
+
+Deutsch & Gailly             Informational                      [Page 8]
+
+RFC 1950       ZLIB Compressed Data Format Specification        May 1996
+
+
+8. Appendix: Rationale
+
+   8.1. Preset dictionaries
+
+      A preset dictionary is specially useful to compress short input
+      sequences. The compressor can take advantage of the dictionary
+      context to encode the input in a more compact manner. The
+      decompressor can be initialized with the appropriate context by
+      virtually decompressing a compressed version of the dictionary
+      without producing any output. However for certain compression
+      algorithms such as the deflate algorithm this operation can be
+      achieved without actually performing any decompression.
+
+      The compressor and the decompressor must use exactly the same
+      dictionary. The dictionary may be fixed or may be chosen among a
+      certain number of predefined dictionaries, according to the kind
+      of input data. The decompressor can determine which dictionary has
+      been chosen by the compressor by checking the dictionary
+      identifier. This document does not specify the contents of
+      predefined dictionaries, since the optimal dictionaries are
+      application specific. Standard data formats using this feature of
+      the zlib specification must precisely define the allowed
+      dictionaries.
+
+   8.2. The Adler-32 algorithm
+
+      The Adler-32 algorithm is much faster than the CRC32 algorithm yet
+      still provides an extremely low probability of undetected errors.
+
+      The modulo on unsigned long accumulators can be delayed for 5552
+      bytes, so the modulo operation time is negligible.  If the bytes
+      are a, b, c, the second sum is 3a + 2b + c + 3, and so is position
+      and order sensitive, unlike the first sum, which is just a
+      checksum.  That 65521 is prime is important to avoid a possible
+      large class of two-byte errors that leave the check unchanged.
+      (The Fletcher checksum uses 255, which is not prime and which also
+      makes the Fletcher check insensitive to single byte changes 0 <->
+      255.)
+
+      The sum s1 is initialized to 1 instead of zero to make the length
+      of the sequence part of s2, so that the length does not have to be
+      checked separately. (Any sequence of zeroes has a Fletcher
+      checksum of zero.)
+
+
+
+
+
+
+
+
+Deutsch & Gailly             Informational                      [Page 9]
+
+RFC 1950       ZLIB Compressed Data Format Specification        May 1996
+
+
+9. Appendix: Sample code
+
+   The following C code computes the Adler-32 checksum of a data buffer.
+   It is written for clarity, not for speed.  The sample code is in the
+   ANSI C programming language. Non C users may find it easier to read
+   with these hints:
+
+      &      Bitwise AND operator.
+      >>     Bitwise right shift operator. When applied to an
+             unsigned quantity, as here, right shift inserts zero bit(s)
+             at the left.
+      <<     Bitwise left shift operator. Left shift inserts zero
+             bit(s) at the right.
+      ++     "n++" increments the variable n.
+      %      modulo operator: a % b is the remainder of a divided by b.
+
+      #define BASE 65521 /* largest prime smaller than 65536 */
+
+      /*
+         Update a running Adler-32 checksum with the bytes buf[0..len-1]
+       and return the updated checksum. The Adler-32 checksum should be
+       initialized to 1.
+
+       Usage example:
+
+         unsigned long adler = 1L;
+
+         while (read_buffer(buffer, length) != EOF) {
+           adler = update_adler32(adler, buffer, length);
+         }
+         if (adler != original_adler) error();
+      */
+      unsigned long update_adler32(unsigned long adler,
+         unsigned char *buf, int len)
+      {
+        unsigned long s1 = adler & 0xffff;
+        unsigned long s2 = (adler >> 16) & 0xffff;
+        int n;
+
+        for (n = 0; n < len; n++) {
+          s1 = (s1 + buf[n]) % BASE;
+          s2 = (s2 + s1)     % BASE;
+        }
+        return (s2 << 16) + s1;
+      }
+
+      /* Return the adler32 of the bytes buf[0..len-1] */
+
+
+
+
+Deutsch & Gailly             Informational                     [Page 10]
+
+RFC 1950       ZLIB Compressed Data Format Specification        May 1996
+
+
+      unsigned long adler32(unsigned char *buf, int len)
+      {
+        return update_adler32(1L, buf, len);
+      }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Deutsch & Gailly             Informational                     [Page 11]
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/rfc1951.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/rfc1951.txt
new file mode 100644
index 00000000..403c8c72
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/rfc1951.txt
@@ -0,0 +1,955 @@
+
+
+
+
+
+
+Network Working Group                                         P. Deutsch
+Request for Comments: 1951                           Aladdin Enterprises
+Category: Informational                                         May 1996
+
+
+        DEFLATE Compressed Data Format Specification version 1.3
+
+Status of This Memo
+
+   This memo provides information for the Internet community.  This memo
+   does not specify an Internet standard of any kind.  Distribution of
+   this memo is unlimited.
+
+IESG Note:
+
+   The IESG takes no position on the validity of any Intellectual
+   Property Rights statements contained in this document.
+
+Notices
+
+   Copyright (c) 1996 L. Peter Deutsch
+
+   Permission is granted to copy and distribute this document for any
+   purpose and without charge, including translations into other
+   languages and incorporation into compilations, provided that the
+   copyright notice and this notice are preserved, and that any
+   substantive changes or deletions from the original are clearly
+   marked.
+
+   A pointer to the latest version of this and related documentation in
+   HTML format can be found at the URL
+   <ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html>.
+
+Abstract
+
+   This specification defines a lossless compressed data format that
+   compresses data using a combination of the LZ77 algorithm and Huffman
+   coding, with efficiency comparable to the best currently available
+   general-purpose compression methods.  The data can be produced or
+   consumed, even for an arbitrarily long sequentially presented input
+   data stream, using only an a priori bounded amount of intermediate
+   storage.  The format can be implemented readily in a manner not
+   covered by patents.
+
+
+
+
+
+
+
+
+Deutsch                      Informational                      [Page 1]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+Table of Contents
+
+   1. Introduction ................................................... 2
+      1.1. Purpose ................................................... 2
+      1.2. Intended audience ......................................... 3
+      1.3. Scope ..................................................... 3
+      1.4. Compliance ................................................ 3
+      1.5.  Definitions of terms and conventions used ................ 3
+      1.6. Changes from previous versions ............................ 4
+   2. Compressed representation overview ............................. 4
+   3. Detailed specification ......................................... 5
+      3.1. Overall conventions ....................................... 5
+          3.1.1. Packing into bytes .................................. 5
+      3.2. Compressed block format ................................... 6
+          3.2.1. Synopsis of prefix and Huffman coding ............... 6
+          3.2.2. Use of Huffman coding in the "deflate" format ....... 7
+          3.2.3. Details of block format ............................. 9
+          3.2.4. Non-compressed blocks (BTYPE=00) ................... 11
+          3.2.5. Compressed blocks (length and distance codes) ...... 11
+          3.2.6. Compression with fixed Huffman codes (BTYPE=01) .... 12
+          3.2.7. Compression with dynamic Huffman codes (BTYPE=10) .. 13
+      3.3. Compliance ............................................... 14
+   4. Compression algorithm details ................................. 14
+   5. References .................................................... 16
+   6. Security Considerations ....................................... 16
+   7. Source code ................................................... 16
+   8. Acknowledgements .............................................. 16
+   9. Author's Address .............................................. 17
+
+1. Introduction
+
+   1.1. Purpose
+
+      The purpose of this specification is to define a lossless
+      compressed data format that:
+          * Is independent of CPU type, operating system, file system,
+            and character set, and hence can be used for interchange;
+          * Can be produced or consumed, even for an arbitrarily long
+            sequentially presented input data stream, using only an a
+            priori bounded amount of intermediate storage, and hence
+            can be used in data communications or similar structures
+            such as Unix filters;
+          * Compresses data with efficiency comparable to the best
+            currently available general-purpose compression methods,
+            and in particular considerably better than the "compress"
+            program;
+          * Can be implemented readily in a manner not covered by
+            patents, and hence can be practiced freely;
+
+
+
+Deutsch                      Informational                      [Page 2]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+          * Is compatible with the file format produced by the current
+            widely used gzip utility, in that conforming decompressors
+            will be able to read data produced by the existing gzip
+            compressor.
+
+      The data format defined by this specification does not attempt to:
+
+          * Allow random access to compressed data;
+          * Compress specialized data (e.g., raster graphics) as well
+            as the best currently available specialized algorithms.
+
+      A simple counting argument shows that no lossless compression
+      algorithm can compress every possible input data set.  For the
+      format defined here, the worst case expansion is 5 bytes per 32K-
+      byte block, i.e., a size increase of 0.015% for large data sets.
+      English text usually compresses by a factor of 2.5 to 3;
+      executable files usually compress somewhat less; graphical data
+      such as raster images may compress much more.
+
+   1.2. Intended audience
+
+      This specification is intended for use by implementors of software
+      to compress data into "deflate" format and/or decompress data from
+      "deflate" format.
+
+      The text of the specification assumes a basic background in
+      programming at the level of bits and other primitive data
+      representations.  Familiarity with the technique of Huffman coding
+      is helpful but not required.
+
+   1.3. Scope
+
+      The specification specifies a method for representing a sequence
+      of bytes as a (usually shorter) sequence of bits, and a method for
+      packing the latter bit sequence into bytes.
+
+   1.4. Compliance
+
+      Unless otherwise indicated below, a compliant decompressor must be
+      able to accept and decompress any data set that conforms to all
+      the specifications presented here; a compliant compressor must
+      produce data sets that conform to all the specifications presented
+      here.
+
+   1.5.  Definitions of terms and conventions used
+
+      Byte: 8 bits stored or transmitted as a unit (same as an octet).
+      For this specification, a byte is exactly 8 bits, even on machines
+
+
+
+Deutsch                      Informational                      [Page 3]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+      which store a character on a number of bits different from eight.
+      See below, for the numbering of bits within a byte.
+
+      String: a sequence of arbitrary bytes.
+
+   1.6. Changes from previous versions
+
+      There have been no technical changes to the deflate format since
+      version 1.1 of this specification.  In version 1.2, some
+      terminology was changed.  Version 1.3 is a conversion of the
+      specification to RFC style.
+
+2. Compressed representation overview
+
+   A compressed data set consists of a series of blocks, corresponding
+   to successive blocks of input data.  The block sizes are arbitrary,
+   except that non-compressible blocks are limited to 65,535 bytes.
+
+   Each block is compressed using a combination of the LZ77 algorithm
+   and Huffman coding. The Huffman trees for each block are independent
+   of those for previous or subsequent blocks; the LZ77 algorithm may
+   use a reference to a duplicated string occurring in a previous block,
+   up to 32K input bytes before.
+
+   Each block consists of two parts: a pair of Huffman code trees that
+   describe the representation of the compressed data part, and a
+   compressed data part.  (The Huffman trees themselves are compressed
+   using Huffman encoding.)  The compressed data consists of a series of
+   elements of two types: literal bytes (of strings that have not been
+   detected as duplicated within the previous 32K input bytes), and
+   pointers to duplicated strings, where a pointer is represented as a
+   pair <length, backward distance>.  The representation used in the
+   "deflate" format limits distances to 32K bytes and lengths to 258
+   bytes, but does not limit the size of a block, except for
+   uncompressible blocks, which are limited as noted above.
+
+   Each type of value (literals, distances, and lengths) in the
+   compressed data is represented using a Huffman code, using one code
+   tree for literals and lengths and a separate code tree for distances.
+   The code trees for each block appear in a compact form just before
+   the compressed data for that block.
+
+
+
+
+
+
+
+
+
+
+Deutsch                      Informational                      [Page 4]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+3. Detailed specification
+
+   3.1. Overall conventions In the diagrams below, a box like this:
+
+         +---+
+         |   | <-- the vertical bars might be missing
+         +---+
+
+      represents one byte; a box like this:
+
+         +==============+
+         |              |
+         +==============+
+
+      represents a variable number of bytes.
+
+      Bytes stored within a computer do not have a "bit order", since
+      they are always treated as a unit.  However, a byte considered as
+      an integer between 0 and 255 does have a most- and least-
+      significant bit, and since we write numbers with the most-
+      significant digit on the left, we also write bytes with the most-
+      significant bit on the left.  In the diagrams below, we number the
+      bits of a byte so that bit 0 is the least-significant bit, i.e.,
+      the bits are numbered:
+
+         +--------+
+         |76543210|
+         +--------+
+
+      Within a computer, a number may occupy multiple bytes.  All
+      multi-byte numbers in the format described here are stored with
+      the least-significant byte first (at the lower memory address).
+      For example, the decimal number 520 is stored as:
+
+             0        1
+         +--------+--------+
+         |00001000|00000010|
+         +--------+--------+
+          ^        ^
+          |        |
+          |        + more significant byte = 2 x 256
+          + less significant byte = 8
+
+      3.1.1. Packing into bytes
+
+         This document does not address the issue of the order in which
+         bits of a byte are transmitted on a bit-sequential medium,
+         since the final data format described here is byte- rather than
+
+
+
+Deutsch                      Informational                      [Page 5]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+         bit-oriented.  However, we describe the compressed block format
+         in below, as a sequence of data elements of various bit
+         lengths, not a sequence of bytes.  We must therefore specify
+         how to pack these data elements into bytes to form the final
+         compressed byte sequence:
+
+             * Data elements are packed into bytes in order of
+               increasing bit number within the byte, i.e., starting
+               with the least-significant bit of the byte.
+             * Data elements other than Huffman codes are packed
+               starting with the least-significant bit of the data
+               element.
+             * Huffman codes are packed starting with the most-
+               significant bit of the code.
+
+         In other words, if one were to print out the compressed data as
+         a sequence of bytes, starting with the first byte at the
+         *right* margin and proceeding to the *left*, with the most-
+         significant bit of each byte on the left as usual, one would be
+         able to parse the result from right to left, with fixed-width
+         elements in the correct MSB-to-LSB order and Huffman codes in
+         bit-reversed order (i.e., with the first bit of the code in the
+         relative LSB position).
+
+   3.2. Compressed block format
+
+      3.2.1. Synopsis of prefix and Huffman coding
+
+         Prefix coding represents symbols from an a priori known
+         alphabet by bit sequences (codes), one code for each symbol, in
+         a manner such that different symbols may be represented by bit
+         sequences of different lengths, but a parser can always parse
+         an encoded string unambiguously symbol-by-symbol.
+
+         We define a prefix code in terms of a binary tree in which the
+         two edges descending from each non-leaf node are labeled 0 and
+         1 and in which the leaf nodes correspond one-for-one with (are
+         labeled with) the symbols of the alphabet; then the code for a
+         symbol is the sequence of 0's and 1's on the edges leading from
+         the root to the leaf labeled with that symbol.  For example:
+
+
+
+
+
+
+
+
+
+
+
+Deutsch                      Informational                      [Page 6]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+                          /\              Symbol    Code
+                         0  1             ------    ----
+                        /    \                A      00
+                       /\     B               B       1
+                      0  1                    C     011
+                     /    \                   D     010
+                    A     /\
+                         0  1
+                        /    \
+                       D      C
+
+         A parser can decode the next symbol from an encoded input
+         stream by walking down the tree from the root, at each step
+         choosing the edge corresponding to the next input bit.
+
+         Given an alphabet with known symbol frequencies, the Huffman
+         algorithm allows the construction of an optimal prefix code
+         (one which represents strings with those symbol frequencies
+         using the fewest bits of any possible prefix codes for that
+         alphabet).  Such a code is called a Huffman code.  (See
+         reference [1] in Chapter 5, references for additional
+         information on Huffman codes.)
+
+         Note that in the "deflate" format, the Huffman codes for the
+         various alphabets must not exceed certain maximum code lengths.
+         This constraint complicates the algorithm for computing code
+         lengths from symbol frequencies.  Again, see Chapter 5,
+         references for details.
+
+      3.2.2. Use of Huffman coding in the "deflate" format
+
+         The Huffman codes used for each alphabet in the "deflate"
+         format have two additional rules:
+
+             * All codes of a given bit length have lexicographically
+               consecutive values, in the same order as the symbols
+               they represent;
+
+             * Shorter codes lexicographically precede longer codes.
+
+
+
+
+
+
+
+
+
+
+
+
+Deutsch                      Informational                      [Page 7]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+         We could recode the example above to follow this rule as
+         follows, assuming that the order of the alphabet is ABCD:
+
+            Symbol  Code
+            ------  ----
+            A       10
+            B       0
+            C       110
+            D       111
+
+         I.e., 0 precedes 10 which precedes 11x, and 110 and 111 are
+         lexicographically consecutive.
+
+         Given this rule, we can define the Huffman code for an alphabet
+         just by giving the bit lengths of the codes for each symbol of
+         the alphabet in order; this is sufficient to determine the
+         actual codes.  In our example, the code is completely defined
+         by the sequence of bit lengths (2, 1, 3, 3).  The following
+         algorithm generates the codes as integers, intended to be read
+         from most- to least-significant bit.  The code lengths are
+         initially in tree[I].Len; the codes are produced in
+         tree[I].Code.
+
+         1)  Count the number of codes for each code length.  Let
+             bl_count[N] be the number of codes of length N, N >= 1.
+
+         2)  Find the numerical value of the smallest code for each
+             code length:
+
+                code = 0;
+                bl_count[0] = 0;
+                for (bits = 1; bits <= MAX_BITS; bits++) {
+                    code = (code + bl_count[bits-1]) << 1;
+                    next_code[bits] = code;
+                }
+
+         3)  Assign numerical values to all codes, using consecutive
+             values for all codes of the same length with the base
+             values determined at step 2. Codes that are never used
+             (which have a bit length of zero) must not be assigned a
+             value.
+
+                for (n = 0;  n <= max_code; n++) {
+                    len = tree[n].Len;
+                    if (len != 0) {
+                        tree[n].Code = next_code[len];
+                        next_code[len]++;
+                    }
+
+
+
+Deutsch                      Informational                      [Page 8]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+                }
+
+         Example:
+
+         Consider the alphabet ABCDEFGH, with bit lengths (3, 3, 3, 3,
+         3, 2, 4, 4).  After step 1, we have:
+
+            N      bl_count[N]
+            -      -----------
+            2      1
+            3      5
+            4      2
+
+         Step 2 computes the following next_code values:
+
+            N      next_code[N]
+            -      ------------
+            1      0
+            2      0
+            3      2
+            4      14
+
+         Step 3 produces the following code values:
+
+            Symbol Length   Code
+            ------ ------   ----
+            A       3        010
+            B       3        011
+            C       3        100
+            D       3        101
+            E       3        110
+            F       2         00
+            G       4       1110
+            H       4       1111
+
+      3.2.3. Details of block format
+
+         Each block of compressed data begins with 3 header bits
+         containing the following data:
+
+            first bit       BFINAL
+            next 2 bits     BTYPE
+
+         Note that the header bits do not necessarily begin on a byte
+         boundary, since a block does not necessarily occupy an integral
+         number of bytes.
+
+
+
+
+
+Deutsch                      Informational                      [Page 9]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+         BFINAL is set if and only if this is the last block of the data
+         set.
+
+         BTYPE specifies how the data are compressed, as follows:
+
+            00 - no compression
+            01 - compressed with fixed Huffman codes
+            10 - compressed with dynamic Huffman codes
+            11 - reserved (error)
+
+         The only difference between the two compressed cases is how the
+         Huffman codes for the literal/length and distance alphabets are
+         defined.
+
+         In all cases, the decoding algorithm for the actual data is as
+         follows:
+
+            do
+               read block header from input stream.
+               if stored with no compression
+                  skip any remaining bits in current partially
+                     processed byte
+                  read LEN and NLEN (see next section)
+                  copy LEN bytes of data to output
+               otherwise
+                  if compressed with dynamic Huffman codes
+                     read representation of code trees (see
+                        subsection below)
+                  loop (until end of block code recognized)
+                     decode literal/length value from input stream
+                     if value < 256
+                        copy value (literal byte) to output stream
+                     otherwise
+                        if value = end of block (256)
+                           break from loop
+                        otherwise (value = 257..285)
+                           decode distance from input stream
+
+                           move backwards distance bytes in the output
+                           stream, and copy length bytes from this
+                           position to the output stream.
+                  end loop
+            while not last block
+
+         Note that a duplicated string reference may refer to a string
+         in a previous block; i.e., the backward distance may cross one
+         or more block boundaries.  However a distance cannot refer past
+         the beginning of the output stream.  (An application using a
+
+
+
+Deutsch                      Informational                     [Page 10]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+         preset dictionary might discard part of the output stream; a
+         distance can refer to that part of the output stream anyway)
+         Note also that the referenced string may overlap the current
+         position; for example, if the last 2 bytes decoded have values
+         X and Y, a string reference with <length = 5, distance = 2>
+         adds X,Y,X,Y,X to the output stream.
+
+         We now specify each compression method in turn.
+
+      3.2.4. Non-compressed blocks (BTYPE=00)
+
+         Any bits of input up to the next byte boundary are ignored.
+         The rest of the block consists of the following information:
+
+              0   1   2   3   4...
+            +---+---+---+---+================================+
+            |  LEN  | NLEN  |... LEN bytes of literal data...|
+            +---+---+---+---+================================+
+
+         LEN is the number of data bytes in the block.  NLEN is the
+         one's complement of LEN.
+
+      3.2.5. Compressed blocks (length and distance codes)
+
+         As noted above, encoded data blocks in the "deflate" format
+         consist of sequences of symbols drawn from three conceptually
+         distinct alphabets: either literal bytes, from the alphabet of
+         byte values (0..255), or <length, backward distance> pairs,
+         where the length is drawn from (3..258) and the distance is
+         drawn from (1..32,768).  In fact, the literal and length
+         alphabets are merged into a single alphabet (0..285), where
+         values 0..255 represent literal bytes, the value 256 indicates
+         end-of-block, and values 257..285 represent length codes
+         (possibly in conjunction with extra bits following the symbol
+         code) as follows:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Deutsch                      Informational                     [Page 11]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+                 Extra               Extra               Extra
+            Code Bits Length(s) Code Bits Lengths   Code Bits Length(s)
+            ---- ---- ------     ---- ---- -------   ---- ---- -------
+             257   0     3       267   1   15,16     277   4   67-82
+             258   0     4       268   1   17,18     278   4   83-98
+             259   0     5       269   2   19-22     279   4   99-114
+             260   0     6       270   2   23-26     280   4  115-130
+             261   0     7       271   2   27-30     281   5  131-162
+             262   0     8       272   2   31-34     282   5  163-194
+             263   0     9       273   3   35-42     283   5  195-226
+             264   0    10       274   3   43-50     284   5  227-257
+             265   1  11,12      275   3   51-58     285   0    258
+             266   1  13,14      276   3   59-66
+
+         The extra bits should be interpreted as a machine integer
+         stored with the most-significant bit first, e.g., bits 1110
+         represent the value 14.
+
+                  Extra           Extra               Extra
+             Code Bits Dist  Code Bits   Dist     Code Bits Distance
+             ---- ---- ----  ---- ----  ------    ---- ---- --------
+               0   0    1     10   4     33-48    20    9   1025-1536
+               1   0    2     11   4     49-64    21    9   1537-2048
+               2   0    3     12   5     65-96    22   10   2049-3072
+               3   0    4     13   5     97-128   23   10   3073-4096
+               4   1   5,6    14   6    129-192   24   11   4097-6144
+               5   1   7,8    15   6    193-256   25   11   6145-8192
+               6   2   9-12   16   7    257-384   26   12  8193-12288
+               7   2  13-16   17   7    385-512   27   12 12289-16384
+               8   3  17-24   18   8    513-768   28   13 16385-24576
+               9   3  25-32   19   8   769-1024   29   13 24577-32768
+
+      3.2.6. Compression with fixed Huffman codes (BTYPE=01)
+
+         The Huffman codes for the two alphabets are fixed, and are not
+         represented explicitly in the data.  The Huffman code lengths
+         for the literal/length alphabet are:
+
+                   Lit Value    Bits        Codes
+                   ---------    ----        -----
+                     0 - 143     8          00110000 through
+                                            10111111
+                   144 - 255     9          110010000 through
+                                            111111111
+                   256 - 279     7          0000000 through
+                                            0010111
+                   280 - 287     8          11000000 through
+                                            11000111
+
+
+
+Deutsch                      Informational                     [Page 12]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+         The code lengths are sufficient to generate the actual codes,
+         as described above; we show the codes in the table for added
+         clarity.  Literal/length values 286-287 will never actually
+         occur in the compressed data, but participate in the code
+         construction.
+
+         Distance codes 0-31 are represented by (fixed-length) 5-bit
+         codes, with possible additional bits as shown in the table
+         shown in Paragraph 3.2.5, above.  Note that distance codes 30-
+         31 will never actually occur in the compressed data.
+
+      3.2.7. Compression with dynamic Huffman codes (BTYPE=10)
+
+         The Huffman codes for the two alphabets appear in the block
+         immediately after the header bits and before the actual
+         compressed data, first the literal/length code and then the
+         distance code.  Each code is defined by a sequence of code
+         lengths, as discussed in Paragraph 3.2.2, above.  For even
+         greater compactness, the code length sequences themselves are
+         compressed using a Huffman code.  The alphabet for code lengths
+         is as follows:
+
+               0 - 15: Represent code lengths of 0 - 15
+                   16: Copy the previous code length 3 - 6 times.
+                       The next 2 bits indicate repeat length
+                             (0 = 3, ... , 3 = 6)
+                          Example:  Codes 8, 16 (+2 bits 11),
+                                    16 (+2 bits 10) will expand to
+                                    12 code lengths of 8 (1 + 6 + 5)
+                   17: Repeat a code length of 0 for 3 - 10 times.
+                       (3 bits of length)
+                   18: Repeat a code length of 0 for 11 - 138 times
+                       (7 bits of length)
+
+         A code length of 0 indicates that the corresponding symbol in
+         the literal/length or distance alphabet will not occur in the
+         block, and should not participate in the Huffman code
+         construction algorithm given earlier.  If only one distance
+         code is used, it is encoded using one bit, not zero bits; in
+         this case there is a single code length of one, with one unused
+         code.  One distance code of zero bits means that there are no
+         distance codes used at all (the data is all literals).
+
+         We can now define the format of the block:
+
+               5 Bits: HLIT, # of Literal/Length codes - 257 (257 - 286)
+               5 Bits: HDIST, # of Distance codes - 1        (1 - 32)
+               4 Bits: HCLEN, # of Code Length codes - 4     (4 - 19)
+
+
+
+Deutsch                      Informational                     [Page 13]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+               (HCLEN + 4) x 3 bits: code lengths for the code length
+                  alphabet given just above, in the order: 16, 17, 18,
+                  0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
+
+                  These code lengths are interpreted as 3-bit integers
+                  (0-7); as above, a code length of 0 means the
+                  corresponding symbol (literal/length or distance code
+                  length) is not used.
+
+               HLIT + 257 code lengths for the literal/length alphabet,
+                  encoded using the code length Huffman code
+
+               HDIST + 1 code lengths for the distance alphabet,
+                  encoded using the code length Huffman code
+
+               The actual compressed data of the block,
+                  encoded using the literal/length and distance Huffman
+                  codes
+
+               The literal/length symbol 256 (end of data),
+                  encoded using the literal/length Huffman code
+
+         The code length repeat codes can cross from HLIT + 257 to the
+         HDIST + 1 code lengths.  In other words, all code lengths form
+         a single sequence of HLIT + HDIST + 258 values.
+
+   3.3. Compliance
+
+      A compressor may limit further the ranges of values specified in
+      the previous section and still be compliant; for example, it may
+      limit the range of backward pointers to some value smaller than
+      32K.  Similarly, a compressor may limit the size of blocks so that
+      a compressible block fits in memory.
+
+      A compliant decompressor must accept the full range of possible
+      values defined in the previous section, and must accept blocks of
+      arbitrary size.
+
+4. Compression algorithm details
+
+   While it is the intent of this document to define the "deflate"
+   compressed data format without reference to any particular
+   compression algorithm, the format is related to the compressed
+   formats produced by LZ77 (Lempel-Ziv 1977, see reference [2] below);
+   since many variations of LZ77 are patented, it is strongly
+   recommended that the implementor of a compressor follow the general
+   algorithm presented here, which is known not to be patented per se.
+   The material in this section is not part of the definition of the
+
+
+
+Deutsch                      Informational                     [Page 14]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+   specification per se, and a compressor need not follow it in order to
+   be compliant.
+
+   The compressor terminates a block when it determines that starting a
+   new block with fresh trees would be useful, or when the block size
+   fills up the compressor's block buffer.
+
+   The compressor uses a chained hash table to find duplicated strings,
+   using a hash function that operates on 3-byte sequences.  At any
+   given point during compression, let XYZ be the next 3 input bytes to
+   be examined (not necessarily all different, of course).  First, the
+   compressor examines the hash chain for XYZ.  If the chain is empty,
+   the compressor simply writes out X as a literal byte and advances one
+   byte in the input.  If the hash chain is not empty, indicating that
+   the sequence XYZ (or, if we are unlucky, some other 3 bytes with the
+   same hash function value) has occurred recently, the compressor
+   compares all strings on the XYZ hash chain with the actual input data
+   sequence starting at the current point, and selects the longest
+   match.
+
+   The compressor searches the hash chains starting with the most recent
+   strings, to favor small distances and thus take advantage of the
+   Huffman encoding.  The hash chains are singly linked. There are no
+   deletions from the hash chains; the algorithm simply discards matches
+   that are too old.  To avoid a worst-case situation, very long hash
+   chains are arbitrarily truncated at a certain length, determined by a
+   run-time parameter.
+
+   To improve overall compression, the compressor optionally defers the
+   selection of matches ("lazy matching"): after a match of length N has
+   been found, the compressor searches for a longer match starting at
+   the next input byte.  If it finds a longer match, it truncates the
+   previous match to a length of one (thus producing a single literal
+   byte) and then emits the longer match.  Otherwise, it emits the
+   original match, and, as described above, advances N bytes before
+   continuing.
+
+   Run-time parameters also control this "lazy match" procedure.  If
+   compression ratio is most important, the compressor attempts a
+   complete second search regardless of the length of the first match.
+   In the normal case, if the current match is "long enough", the
+   compressor reduces the search for a longer match, thus speeding up
+   the process.  If speed is most important, the compressor inserts new
+   strings in the hash table only when no match was found, or when the
+   match is not "too long".  This degrades the compression ratio but
+   saves time since there are both fewer insertions and fewer searches.
+
+
+
+
+
+Deutsch                      Informational                     [Page 15]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+5. References
+
+   [1] Huffman, D. A., "A Method for the Construction of Minimum
+       Redundancy Codes", Proceedings of the Institute of Radio
+       Engineers, September 1952, Volume 40, Number 9, pp. 1098-1101.
+
+   [2] Ziv J., Lempel A., "A Universal Algorithm for Sequential Data
+       Compression", IEEE Transactions on Information Theory, Vol. 23,
+       No. 3, pp. 337-343.
+
+   [3] Gailly, J.-L., and Adler, M., ZLIB documentation and sources,
+       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
+
+   [4] Gailly, J.-L., and Adler, M., GZIP documentation and sources,
+       available as gzip-*.tar in ftp://prep.ai.mit.edu/pub/gnu/
+
+   [5] Schwartz, E. S., and Kallick, B. "Generating a canonical prefix
+       encoding." Comm. ACM, 7,3 (Mar. 1964), pp. 166-169.
+
+   [6] Hirschberg and Lelewer, "Efficient decoding of prefix codes,"
+       Comm. ACM, 33,4, April 1990, pp. 449-459.
+
+6. Security Considerations
+
+   Any data compression method involves the reduction of redundancy in
+   the data.  Consequently, any corruption of the data is likely to have
+   severe effects and be difficult to correct.  Uncompressed text, on
+   the other hand, will probably still be readable despite the presence
+   of some corrupted bytes.
+
+   It is recommended that systems using this data format provide some
+   means of validating the integrity of the compressed data.  See
+   reference [3], for example.
+
+7. Source code
+
+   Source code for a C language implementation of a "deflate" compliant
+   compressor and decompressor is available within the zlib package at
+   ftp://ftp.uu.net/pub/archiving/zip/zlib/.
+
+8. Acknowledgements
+
+   Trademarks cited in this document are the property of their
+   respective owners.
+
+   Phil Katz designed the deflate format.  Jean-Loup Gailly and Mark
+   Adler wrote the related software described in this specification.
+   Glenn Randers-Pehrson converted this document to RFC and HTML format.
+
+
+
+Deutsch                      Informational                     [Page 16]
+
+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
+
+
+9. Author's Address
+
+   L. Peter Deutsch
+   Aladdin Enterprises
+   203 Santa Margarita Ave.
+   Menlo Park, CA 94025
+
+   Phone: (415) 322-0103 (AM only)
+   FAX:   (415) 322-1734
+   EMail: <ghost@aladdin.com>
+
+   Questions about the technical content of this specification can be
+   sent by email to:
+
+   Jean-Loup Gailly <gzip@prep.ai.mit.edu> and
+   Mark Adler <madler@alumni.caltech.edu>
+
+   Editorial comments on this specification can be sent by email to:
+
+   L. Peter Deutsch <ghost@aladdin.com> and
+   Glenn Randers-Pehrson <randeg@alumni.rpi.edu>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Deutsch                      Informational                     [Page 17]
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/rfc1952.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/rfc1952.txt
new file mode 100644
index 00000000..a8e51b45
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/rfc1952.txt
@@ -0,0 +1,675 @@
+
+
+
+
+
+
+Network Working Group                                         P. Deutsch
+Request for Comments: 1952                           Aladdin Enterprises
+Category: Informational                                         May 1996
+
+
+               GZIP file format specification version 4.3
+
+Status of This Memo
+
+   This memo provides information for the Internet community.  This memo
+   does not specify an Internet standard of any kind.  Distribution of
+   this memo is unlimited.
+
+IESG Note:
+
+   The IESG takes no position on the validity of any Intellectual
+   Property Rights statements contained in this document.
+
+Notices
+
+   Copyright (c) 1996 L. Peter Deutsch
+
+   Permission is granted to copy and distribute this document for any
+   purpose and without charge, including translations into other
+   languages and incorporation into compilations, provided that the
+   copyright notice and this notice are preserved, and that any
+   substantive changes or deletions from the original are clearly
+   marked.
+
+   A pointer to the latest version of this and related documentation in
+   HTML format can be found at the URL
+   <ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html>.
+
+Abstract
+
+   This specification defines a lossless compressed data format that is
+   compatible with the widely used GZIP utility.  The format includes a
+   cyclic redundancy check value for detecting data corruption.  The
+   format presently uses the DEFLATE method of compression but can be
+   easily extended to use other compression methods.  The format can be
+   implemented readily in a manner not covered by patents.
+
+
+
+
+
+
+
+
+
+
+Deutsch                      Informational                      [Page 1]
+
+RFC 1952             GZIP File Format Specification             May 1996
+
+
+Table of Contents
+
+   1. Introduction ................................................... 2
+      1.1. Purpose ................................................... 2
+      1.2. Intended audience ......................................... 3
+      1.3. Scope ..................................................... 3
+      1.4. Compliance ................................................ 3
+      1.5. Definitions of terms and conventions used ................. 3
+      1.6. Changes from previous versions ............................ 3
+   2. Detailed specification ......................................... 4
+      2.1. Overall conventions ....................................... 4
+      2.2. File format ............................................... 5
+      2.3. Member format ............................................. 5
+          2.3.1. Member header and trailer ........................... 6
+              2.3.1.1. Extra field ................................... 8
+              2.3.1.2. Compliance .................................... 9
+      3. References .................................................. 9
+      4. Security Considerations .................................... 10
+      5. Acknowledgements ........................................... 10
+      6. Author's Address ........................................... 10
+      7. Appendix: Jean-Loup Gailly's gzip utility .................. 11
+      8. Appendix: Sample CRC Code .................................. 11
+
+1. Introduction
+
+   1.1. Purpose
+
+      The purpose of this specification is to define a lossless
+      compressed data format that:
+
+          * Is independent of CPU type, operating system, file system,
+            and character set, and hence can be used for interchange;
+          * Can compress or decompress a data stream (as opposed to a
+            randomly accessible file) to produce another data stream,
+            using only an a priori bounded amount of intermediate
+            storage, and hence can be used in data communications or
+            similar structures such as Unix filters;
+          * Compresses data with efficiency comparable to the best
+            currently available general-purpose compression methods,
+            and in particular considerably better than the "compress"
+            program;
+          * Can be implemented readily in a manner not covered by
+            patents, and hence can be practiced freely;
+          * Is compatible with the file format produced by the current
+            widely used gzip utility, in that conforming decompressors
+            will be able to read data produced by the existing gzip
+            compressor.
+
+
+
+
+Deutsch                      Informational                      [Page 2]
+
+RFC 1952             GZIP File Format Specification             May 1996
+
+
+      The data format defined by this specification does not attempt to:
+
+          * Provide random access to compressed data;
+          * Compress specialized data (e.g., raster graphics) as well as
+            the best currently available specialized algorithms.
+
+   1.2. Intended audience
+
+      This specification is intended for use by implementors of software
+      to compress data into gzip format and/or decompress data from gzip
+      format.
+
+      The text of the specification assumes a basic background in
+      programming at the level of bits and other primitive data
+      representations.
+
+   1.3. Scope
+
+      The specification specifies a compression method and a file format
+      (the latter assuming only that a file can store a sequence of
+      arbitrary bytes).  It does not specify any particular interface to
+      a file system or anything about character sets or encodings
+      (except for file names and comments, which are optional).
+
+   1.4. Compliance
+
+      Unless otherwise indicated below, a compliant decompressor must be
+      able to accept and decompress any file that conforms to all the
+      specifications presented here; a compliant compressor must produce
+      files that conform to all the specifications presented here.  The
+      material in the appendices is not part of the specification per se
+      and is not relevant to compliance.
+
+   1.5. Definitions of terms and conventions used
+
+      byte: 8 bits stored or transmitted as a unit (same as an octet).
+      (For this specification, a byte is exactly 8 bits, even on
+      machines which store a character on a number of bits different
+      from 8.)  See below for the numbering of bits within a byte.
+
+   1.6. Changes from previous versions
+
+      There have been no technical changes to the gzip format since
+      version 4.1 of this specification.  In version 4.2, some
+      terminology was changed, and the sample CRC code was rewritten for
+      clarity and to eliminate the requirement for the caller to do pre-
+      and post-conditioning.  Version 4.3 is a conversion of the
+      specification to RFC style.
+
+
+
+Deutsch                      Informational                      [Page 3]
+
+RFC 1952             GZIP File Format Specification             May 1996
+
+
+2. Detailed specification
+
+   2.1. Overall conventions
+
+      In the diagrams below, a box like this:
+
+         +---+
+         |   | <-- the vertical bars might be missing
+         +---+
+
+      represents one byte; a box like this:
+
+         +==============+
+         |              |
+         +==============+
+
+      represents a variable number of bytes.
+
+      Bytes stored within a computer do not have a "bit order", since
+      they are always treated as a unit.  However, a byte considered as
+      an integer between 0 and 255 does have a most- and least-
+      significant bit, and since we write numbers with the most-
+      significant digit on the left, we also write bytes with the most-
+      significant bit on the left.  In the diagrams below, we number the
+      bits of a byte so that bit 0 is the least-significant bit, i.e.,
+      the bits are numbered:
+
+         +--------+
+         |76543210|
+         +--------+
+
+      This document does not address the issue of the order in which
+      bits of a byte are transmitted on a bit-sequential medium, since
+      the data format described here is byte- rather than bit-oriented.
+
+      Within a computer, a number may occupy multiple bytes.  All
+      multi-byte numbers in the format described here are stored with
+      the least-significant byte first (at the lower memory address).
+      For example, the decimal number 520 is stored as:
+
+             0        1
+         +--------+--------+
+         |00001000|00000010|
+         +--------+--------+
+          ^        ^
+          |        |
+          |        + more significant byte = 2 x 256
+          + less significant byte = 8
+
+
+
+Deutsch                      Informational                      [Page 4]
+
+RFC 1952             GZIP File Format Specification             May 1996
+
+
+   2.2. File format
+
+      A gzip file consists of a series of "members" (compressed data
+      sets).  The format of each member is specified in the following
+      section.  The members simply appear one after another in the file,
+      with no additional information before, between, or after them.
+
+   2.3. Member format
+
+      Each member has the following structure:
+
+         +---+---+---+---+---+---+---+---+---+---+
+         |ID1|ID2|CM |FLG|     MTIME     |XFL|OS | (more-->)
+         +---+---+---+---+---+---+---+---+---+---+
+
+      (if FLG.FEXTRA set)
+
+         +---+---+=================================+
+         | XLEN  |...XLEN bytes of "extra field"...| (more-->)
+         +---+---+=================================+
+
+      (if FLG.FNAME set)
+
+         +=========================================+
+         |...original file name, zero-terminated...| (more-->)
+         +=========================================+
+
+      (if FLG.FCOMMENT set)
+
+         +===================================+
+         |...file comment, zero-terminated...| (more-->)
+         +===================================+
+
+      (if FLG.FHCRC set)
+
+         +---+---+
+         | CRC16 |
+         +---+---+
+
+         +=======================+
+         |...compressed blocks...| (more-->)
+         +=======================+
+
+           0   1   2   3   4   5   6   7
+         +---+---+---+---+---+---+---+---+
+         |     CRC32     |     ISIZE     |
+         +---+---+---+---+---+---+---+---+
+
+
+
+
+Deutsch                      Informational                      [Page 5]
+
+RFC 1952             GZIP File Format Specification             May 1996
+
+
+      2.3.1. Member header and trailer
+
+         ID1 (IDentification 1)
+         ID2 (IDentification 2)
+            These have the fixed values ID1 = 31 (0x1f, \037), ID2 = 139
+            (0x8b, \213), to identify the file as being in gzip format.
+
+         CM (Compression Method)
+            This identifies the compression method used in the file.  CM
+            = 0-7 are reserved.  CM = 8 denotes the "deflate"
+            compression method, which is the one customarily used by
+            gzip and which is documented elsewhere.
+
+         FLG (FLaGs)
+            This flag byte is divided into individual bits as follows:
+
+               bit 0   FTEXT
+               bit 1   FHCRC
+               bit 2   FEXTRA
+               bit 3   FNAME
+               bit 4   FCOMMENT
+               bit 5   reserved
+               bit 6   reserved
+               bit 7   reserved
+
+            If FTEXT is set, the file is probably ASCII text.  This is
+            an optional indication, which the compressor may set by
+            checking a small amount of the input data to see whether any
+            non-ASCII characters are present.  In case of doubt, FTEXT
+            is cleared, indicating binary data. For systems which have
+            different file formats for ascii text and binary data, the
+            decompressor can use FTEXT to choose the appropriate format.
+            We deliberately do not specify the algorithm used to set
+            this bit, since a compressor always has the option of
+            leaving it cleared and a decompressor always has the option
+            of ignoring it and letting some other program handle issues
+            of data conversion.
+
+            If FHCRC is set, a CRC16 for the gzip header is present,
+            immediately before the compressed data. The CRC16 consists
+            of the two least significant bytes of the CRC32 for all
+            bytes of the gzip header up to and not including the CRC16.
+            [The FHCRC bit was never set by versions of gzip up to
+            1.2.4, even though it was documented with a different
+            meaning in gzip 1.2.4.]
+
+            If FEXTRA is set, optional extra fields are present, as
+            described in a following section.
+
+
+
+Deutsch                      Informational                      [Page 6]
+
+RFC 1952             GZIP File Format Specification             May 1996
+
+
+            If FNAME is set, an original file name is present,
+            terminated by a zero byte.  The name must consist of ISO
+            8859-1 (LATIN-1) characters; on operating systems using
+            EBCDIC or any other character set for file names, the name
+            must be translated to the ISO LATIN-1 character set.  This
+            is the original name of the file being compressed, with any
+            directory components removed, and, if the file being
+            compressed is on a file system with case insensitive names,
+            forced to lower case. There is no original file name if the
+            data was compressed from a source other than a named file;
+            for example, if the source was stdin on a Unix system, there
+            is no file name.
+
+            If FCOMMENT is set, a zero-terminated file comment is
+            present.  This comment is not interpreted; it is only
+            intended for human consumption.  The comment must consist of
+            ISO 8859-1 (LATIN-1) characters.  Line breaks should be
+            denoted by a single line feed character (10 decimal).
+
+            Reserved FLG bits must be zero.
+
+         MTIME (Modification TIME)
+            This gives the most recent modification time of the original
+            file being compressed.  The time is in Unix format, i.e.,
+            seconds since 00:00:00 GMT, Jan.  1, 1970.  (Note that this
+            may cause problems for MS-DOS and other systems that use
+            local rather than Universal time.)  If the compressed data
+            did not come from a file, MTIME is set to the time at which
+            compression started.  MTIME = 0 means no time stamp is
+            available.
+
+         XFL (eXtra FLags)
+            These flags are available for use by specific compression
+            methods.  The "deflate" method (CM = 8) sets these flags as
+            follows:
+
+               XFL = 2 - compressor used maximum compression,
+                         slowest algorithm
+               XFL = 4 - compressor used fastest algorithm
+
+         OS (Operating System)
+            This identifies the type of file system on which compression
+            took place.  This may be useful in determining end-of-line
+            convention for text files.  The currently defined values are
+            as follows:
+
+
+
+
+
+
+Deutsch                      Informational                      [Page 7]
+
+RFC 1952             GZIP File Format Specification             May 1996
+
+
+                 0 - FAT filesystem (MS-DOS, OS/2, NT/Win32)
+                 1 - Amiga
+                 2 - VMS (or OpenVMS)
+                 3 - Unix
+                 4 - VM/CMS
+                 5 - Atari TOS
+                 6 - HPFS filesystem (OS/2, NT)
+                 7 - Macintosh
+                 8 - Z-System
+                 9 - CP/M
+                10 - TOPS-20
+                11 - NTFS filesystem (NT)
+                12 - QDOS
+                13 - Acorn RISCOS
+               255 - unknown
+
+         XLEN (eXtra LENgth)
+            If FLG.FEXTRA is set, this gives the length of the optional
+            extra field.  See below for details.
+
+         CRC32 (CRC-32)
+            This contains a Cyclic Redundancy Check value of the
+            uncompressed data computed according to CRC-32 algorithm
+            used in the ISO 3309 standard and in section 8.1.1.6.2 of
+            ITU-T recommendation V.42.  (See http://www.iso.ch for
+            ordering ISO documents. See gopher://info.itu.ch for an
+            online version of ITU-T V.42.)
+
+         ISIZE (Input SIZE)
+            This contains the size of the original (uncompressed) input
+            data modulo 2^32.
+
+      2.3.1.1. Extra field
+
+         If the FLG.FEXTRA bit is set, an "extra field" is present in
+         the header, with total length XLEN bytes.  It consists of a
+         series of subfields, each of the form:
+
+            +---+---+---+---+==================================+
+            |SI1|SI2|  LEN  |... LEN bytes of subfield data ...|
+            +---+---+---+---+==================================+
+
+         SI1 and SI2 provide a subfield ID, typically two ASCII letters
+         with some mnemonic value.  Jean-Loup Gailly
+         <gzip@prep.ai.mit.edu> is maintaining a registry of subfield
+         IDs; please send him any subfield ID you wish to use.  Subfield
+         IDs with SI2 = 0 are reserved for future use.  The following
+         IDs are currently defined:
+
+
+
+Deutsch                      Informational                      [Page 8]
+
+RFC 1952             GZIP File Format Specification             May 1996
+
+
+            SI1         SI2         Data
+            ----------  ----------  ----
+            0x41 ('A')  0x70 ('P')  Apollo file type information
+
+         LEN gives the length of the subfield data, excluding the 4
+         initial bytes.
+
+      2.3.1.2. Compliance
+
+         A compliant compressor must produce files with correct ID1,
+         ID2, CM, CRC32, and ISIZE, but may set all the other fields in
+         the fixed-length part of the header to default values (255 for
+         OS, 0 for all others).  The compressor must set all reserved
+         bits to zero.
+
+         A compliant decompressor must check ID1, ID2, and CM, and
+         provide an error indication if any of these have incorrect
+         values.  It must examine FEXTRA/XLEN, FNAME, FCOMMENT and FHCRC
+         at least so it can skip over the optional fields if they are
+         present.  It need not examine any other part of the header or
+         trailer; in particular, a decompressor may ignore FTEXT and OS
+         and always produce binary output, and still be compliant.  A
+         compliant decompressor must give an error indication if any
+         reserved bit is non-zero, since such a bit could indicate the
+         presence of a new field that would cause subsequent data to be
+         interpreted incorrectly.
+
+3. References
+
+   [1] "Information Processing - 8-bit single-byte coded graphic
+       character sets - Part 1: Latin alphabet No.1" (ISO 8859-1:1987).
+       The ISO 8859-1 (Latin-1) character set is a superset of 7-bit
+       ASCII. Files defining this character set are available as
+       iso_8859-1.* in ftp://ftp.uu.net/graphics/png/documents/
+
+   [2] ISO 3309
+
+   [3] ITU-T recommendation V.42
+
+   [4] Deutsch, L.P.,"DEFLATE Compressed Data Format Specification",
+       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
+
+   [5] Gailly, J.-L., GZIP documentation, available as gzip-*.tar in
+       ftp://prep.ai.mit.edu/pub/gnu/
+
+   [6] Sarwate, D.V., "Computation of Cyclic Redundancy Checks via Table
+       Look-Up", Communications of the ACM, 31(8), pp.1008-1013.
+
+
+
+
+Deutsch                      Informational                      [Page 9]
+
+RFC 1952             GZIP File Format Specification             May 1996
+
+
+   [7] Schwaderer, W.D., "CRC Calculation", April 85 PC Tech Journal,
+       pp.118-133.
+
+   [8] ftp://ftp.adelaide.edu.au/pub/rocksoft/papers/crc_v3.txt,
+       describing the CRC concept.
+
+4. Security Considerations
+
+   Any data compression method involves the reduction of redundancy in
+   the data.  Consequently, any corruption of the data is likely to have
+   severe effects and be difficult to correct.  Uncompressed text, on
+   the other hand, will probably still be readable despite the presence
+   of some corrupted bytes.
+
+   It is recommended that systems using this data format provide some
+   means of validating the integrity of the compressed data, such as by
+   setting and checking the CRC-32 check value.
+
+5. Acknowledgements
+
+   Trademarks cited in this document are the property of their
+   respective owners.
+
+   Jean-Loup Gailly designed the gzip format and wrote, with Mark Adler,
+   the related software described in this specification.  Glenn
+   Randers-Pehrson converted this document to RFC and HTML format.
+
+6. Author's Address
+
+   L. Peter Deutsch
+   Aladdin Enterprises
+   203 Santa Margarita Ave.
+   Menlo Park, CA 94025
+
+   Phone: (415) 322-0103 (AM only)
+   FAX:   (415) 322-1734
+   EMail: <ghost@aladdin.com>
+
+   Questions about the technical content of this specification can be
+   sent by email to:
+
+   Jean-Loup Gailly <gzip@prep.ai.mit.edu> and
+   Mark Adler <madler@alumni.caltech.edu>
+
+   Editorial comments on this specification can be sent by email to:
+
+   L. Peter Deutsch <ghost@aladdin.com> and
+   Glenn Randers-Pehrson <randeg@alumni.rpi.edu>
+
+
+
+Deutsch                      Informational                     [Page 10]
+
+RFC 1952             GZIP File Format Specification             May 1996
+
+
+7. Appendix: Jean-Loup Gailly's gzip utility
+
+   The most widely used implementation of gzip compression, and the
+   original documentation on which this specification is based, were
+   created by Jean-Loup Gailly <gzip@prep.ai.mit.edu>.  Since this
+   implementation is a de facto standard, we mention some more of its
+   features here.  Again, the material in this section is not part of
+   the specification per se, and implementations need not follow it to
+   be compliant.
+
+   When compressing or decompressing a file, gzip preserves the
+   protection, ownership, and modification time attributes on the local
+   file system, since there is no provision for representing protection
+   attributes in the gzip file format itself.  Since the file format
+   includes a modification time, the gzip decompressor provides a
+   command line switch that assigns the modification time from the file,
+   rather than the local modification time of the compressed input, to
+   the decompressed output.
+
+8. Appendix: Sample CRC Code
+
+   The following sample code represents a practical implementation of
+   the CRC (Cyclic Redundancy Check). (See also ISO 3309 and ITU-T V.42
+   for a formal specification.)
+
+   The sample code is in the ANSI C programming language. Non C users
+   may find it easier to read with these hints:
+
+      &      Bitwise AND operator.
+      ^      Bitwise exclusive-OR operator.
+      >>     Bitwise right shift operator. When applied to an
+             unsigned quantity, as here, right shift inserts zero
+             bit(s) at the left.
+      !      Logical NOT operator.
+      ++     "n++" increments the variable n.
+      0xNNN  0x introduces a hexadecimal (base 16) constant.
+             Suffix L indicates a long value (at least 32 bits).
+
+      /* Table of CRCs of all 8-bit messages. */
+      unsigned long crc_table[256];
+
+      /* Flag: has the table been computed? Initially false. */
+      int crc_table_computed = 0;
+
+      /* Make the table for a fast CRC. */
+      void make_crc_table(void)
+      {
+        unsigned long c;
+
+
+
+Deutsch                      Informational                     [Page 11]
+
+RFC 1952             GZIP File Format Specification             May 1996
+
+
+        int n, k;
+        for (n = 0; n < 256; n++) {
+          c = (unsigned long) n;
+          for (k = 0; k < 8; k++) {
+            if (c & 1) {
+              c = 0xedb88320L ^ (c >> 1);
+            } else {
+              c = c >> 1;
+            }
+          }
+          crc_table[n] = c;
+        }
+        crc_table_computed = 1;
+      }
+
+      /*
+         Update a running crc with the bytes buf[0..len-1] and return
+       the updated crc. The crc should be initialized to zero. Pre- and
+       post-conditioning (one's complement) is performed within this
+       function so it shouldn't be done by the caller. Usage example:
+
+         unsigned long crc = 0L;
+
+         while (read_buffer(buffer, length) != EOF) {
+           crc = update_crc(crc, buffer, length);
+         }
+         if (crc != original_crc) error();
+      */
+      unsigned long update_crc(unsigned long crc,
+                      unsigned char *buf, int len)
+      {
+        unsigned long c = crc ^ 0xffffffffL;
+        int n;
+
+        if (!crc_table_computed)
+          make_crc_table();
+        for (n = 0; n < len; n++) {
+          c = crc_table[(c ^ buf[n]) & 0xff] ^ (c >> 8);
+        }
+        return c ^ 0xffffffffL;
+      }
+
+      /* Return the CRC of the bytes buf[0..len-1]. */
+      unsigned long crc(unsigned char *buf, int len)
+      {
+        return update_crc(0L, buf, len);
+      }
+
+
+
+
+Deutsch                      Informational                     [Page 12]
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/txtvsbin.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/txtvsbin.txt
new file mode 100644
index 00000000..3d0f0634
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/doc/txtvsbin.txt
@@ -0,0 +1,107 @@
+A Fast Method for Identifying Plain Text Files
+==============================================
+
+
+Introduction
+------------
+
+Given a file coming from an unknown source, it is sometimes desirable
+to find out whether the format of that file is plain text.  Although
+this may appear like a simple task, a fully accurate detection of the
+file type requires heavy-duty semantic analysis on the file contents.
+It is, however, possible to obtain satisfactory results by employing
+various heuristics.
+
+Previous versions of PKZip and other zip-compatible compression tools
+were using a crude detection scheme: if more than 80% (4/5) of the bytes
+found in a certain buffer are within the range [7..127], the file is
+labeled as plain text, otherwise it is labeled as binary.  A prominent
+limitation of this scheme is the restriction to Latin-based alphabets.
+Other alphabets, like Greek, Cyrillic or Asian, make extensive use of
+the bytes within the range [128..255], and texts using these alphabets
+are most often misidentified by this scheme; in other words, the rate
+of false negatives is sometimes too high, which means that the recall
+is low.  Another weakness of this scheme is a reduced precision, due to
+the false positives that may occur when binary files containing large
+amounts of textual characters are misidentified as plain text.
+
+In this article we propose a new, simple detection scheme that features
+a much increased precision and a near-100% recall.  This scheme is
+designed to work on ASCII, Unicode and other ASCII-derived alphabets,
+and it handles single-byte encodings (ISO-8859, MacRoman, KOI8, etc.)
+and variable-sized encodings (ISO-2022, UTF-8, etc.).  Wider encodings
+(UCS-2/UTF-16 and UCS-4/UTF-32) are not handled, however.
+
+
+The Algorithm
+-------------
+
+The algorithm works by dividing the set of bytecodes [0..255] into three
+categories:
+- The white list of textual bytecodes:
+  9 (TAB), 10 (LF), 13 (CR), 32 (SPACE) to 255.
+- The gray list of tolerated bytecodes:
+  7 (BEL), 8 (BS), 11 (VT), 12 (FF), 26 (SUB), 27 (ESC).
+- The black list of undesired, non-textual bytecodes:
+  0 (NUL) to 6, 14 to 31.
+
+If a file contains at least one byte that belongs to the white list and
+no byte that belongs to the black list, then the file is categorized as
+plain text; otherwise, it is categorized as binary.  (The boundary case,
+when the file is empty, automatically falls into the latter category.)
+
+
+Rationale
+---------
+
+The idea behind this algorithm relies on two observations.
+
+The first observation is that, although the full range of 7-bit codes
+[0..127] is properly specified by the ASCII standard, most control
+characters in the range [0..31] are not used in practice.  The only
+widely-used, almost universally-portable control codes are 9 (TAB),
+10 (LF) and 13 (CR).  There are a few more control codes that are
+recognized on a reduced range of platforms and text viewers/editors:
+7 (BEL), 8 (BS), 11 (VT), 12 (FF), 26 (SUB) and 27 (ESC); but these
+codes are rarely (if ever) used alone, without being accompanied by
+some printable text.  Even the newer, portable text formats such as
+XML avoid using control characters outside the list mentioned here.
+
+The second observation is that most of the binary files tend to contain
+control characters, especially 0 (NUL).  Even though the older text
+detection schemes observe the presence of non-ASCII codes from the range
+[128..255], the precision rarely has to suffer if this upper range is
+labeled as textual, because the files that are genuinely binary tend to
+contain both control characters and codes from the upper range.  On the
+other hand, the upper range needs to be labeled as textual, because it
+is used by virtually all ASCII extensions.  In particular, this range is
+used for encoding non-Latin scripts.
+
+Since there is no counting involved, other than simply observing the
+presence or the absence of some byte values, the algorithm produces
+consistent results, regardless what alphabet encoding is being used.
+(If counting were involved, it could be possible to obtain different
+results on a text encoded, say, using ISO-8859-16 versus UTF-8.)
+
+There is an extra category of plain text files that are "polluted" with
+one or more black-listed codes, either by mistake or by peculiar design
+considerations.  In such cases, a scheme that tolerates a small fraction
+of black-listed codes would provide an increased recall (i.e. more true
+positives).  This, however, incurs a reduced precision overall, since
+false positives are more likely to appear in binary files that contain
+large chunks of textual data.  Furthermore, "polluted" plain text should
+be regarded as binary by general-purpose text detection schemes, because
+general-purpose text processing algorithms might not be applicable.
+Under this premise, it is safe to say that our detection method provides
+a near-100% recall.
+
+Experiments have been run on many files coming from various platforms
+and applications.  We tried plain text files, system logs, source code,
+formatted office documents, compiled object code, etc.  The results
+confirm the optimistic assumptions about the capabilities of this
+algorithm.
+
+
+--
+Cosmin Truta
+Last updated: 2006-May-28
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/example.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/example.c
new file mode 100644
index 00000000..442b6020
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/example.c
@@ -0,0 +1,565 @@
+/* example.c -- usage example of the zlib compression library
+ * Copyright (C) 1995-2006 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: example.c 246 2010-04-23 10:54:55Z nijtmans $ */
+
+#include "zlib.h"
+#include <stdio.h>
+
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+
+#if defined(VMS) || defined(RISCOS)
+#  define TESTFILE "foo-gz"
+#else
+#  define TESTFILE "foo.gz"
+#endif
+
+#define CHECK_ERR(err, msg) { \
+    if (err != Z_OK) { \
+        fprintf(stderr, "%s error: %d\n", msg, err); \
+        exit(1); \
+    } \
+}
+
+const char hello[] = "hello, hello!";
+/* "hello world" would be more standard, but the repeated "hello"
+ * stresses the compression code better, sorry...
+ */
+
+const char dictionary[] = "hello";
+uLong dictId; /* Adler32 value of the dictionary */
+
+void test_compress      OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_gzio          OF((const char *fname,
+                            Byte *uncompr, uLong uncomprLen));
+void test_deflate       OF((Byte *compr, uLong comprLen));
+void test_inflate       OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_large_deflate OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_large_inflate OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_flush         OF((Byte *compr, uLong *comprLen));
+void test_sync          OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_dict_deflate  OF((Byte *compr, uLong comprLen));
+void test_dict_inflate  OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+int  main               OF((int argc, char *argv[]));
+
+/* ===========================================================================
+ * Test compress() and uncompress()
+ */
+void test_compress(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    uLong len = (uLong)strlen(hello)+1;
+
+    err = compress(compr, &comprLen, (const Bytef*)hello, len);
+    CHECK_ERR(err, "compress");
+
+    strcpy((char*)uncompr, "garbage");
+
+    err = uncompress(uncompr, &uncomprLen, compr, comprLen);
+    CHECK_ERR(err, "uncompress");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad uncompress\n");
+        exit(1);
+    } else {
+        printf("uncompress(): %s\n", (char *)uncompr);
+    }
+}
+
+/* ===========================================================================
+ * Test read/write of .gz files
+ */
+void test_gzio(fname, uncompr, uncomprLen)
+    const char *fname; /* compressed file name */
+    Byte *uncompr;
+    uLong uncomprLen;
+{
+#ifdef NO_GZCOMPRESS
+    fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n");
+#else
+    int err;
+    int len = (int)strlen(hello)+1;
+    gzFile file;
+    z_off_t pos;
+
+    file = gzopen(fname, "wb");
+    if (file == NULL) {
+        fprintf(stderr, "gzopen error\n");
+        exit(1);
+    }
+    gzputc(file, 'h');
+    if (gzputs(file, "ello") != 4) {
+        fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));
+        exit(1);
+    }
+    if (gzprintf(file, ", %s!", "hello") != 8) {
+        fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));
+        exit(1);
+    }
+    gzseek(file, 1L, SEEK_CUR); /* add one zero byte */
+    gzclose(file);
+
+    file = gzopen(fname, "rb");
+    if (file == NULL) {
+        fprintf(stderr, "gzopen error\n");
+        exit(1);
+    }
+    strcpy((char*)uncompr, "garbage");
+
+    if (gzread(file, uncompr, (unsigned)uncomprLen) != len) {
+        fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
+        exit(1);
+    }
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);
+        exit(1);
+    } else {
+        printf("gzread(): %s\n", (char*)uncompr);
+    }
+
+    pos = gzseek(file, -8L, SEEK_CUR);
+    if (pos != 6 || gztell(file) != pos) {
+        fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",
+                (long)pos, (long)gztell(file));
+        exit(1);
+    }
+
+    if (gzgetc(file) != ' ') {
+        fprintf(stderr, "gzgetc error\n");
+        exit(1);
+    }
+
+    if (gzungetc(' ', file) != ' ') {
+        fprintf(stderr, "gzungetc error\n");
+        exit(1);
+    }
+
+    gzgets(file, (char*)uncompr, (int)uncomprLen);
+    if (strlen((char*)uncompr) != 7) { /* " hello!" */
+        fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));
+        exit(1);
+    }
+    if (strcmp((char*)uncompr, hello + 6)) {
+        fprintf(stderr, "bad gzgets after gzseek\n");
+        exit(1);
+    } else {
+        printf("gzgets() after gzseek: %s\n", (char*)uncompr);
+    }
+
+    gzclose(file);
+#endif
+}
+
+/* ===========================================================================
+ * Test deflate() with small buffers
+ */
+void test_deflate(compr, comprLen)
+    Byte *compr;
+    uLong comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+    uLong len = (uLong)strlen(hello)+1;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_in  = (Bytef*)hello;
+    c_stream.next_out = compr;
+
+    while (c_stream.total_in != len && c_stream.total_out < comprLen) {
+        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
+        err = deflate(&c_stream, Z_NO_FLUSH);
+        CHECK_ERR(err, "deflate");
+    }
+    /* Finish the stream, still forcing small buffers: */
+    for (;;) {
+        c_stream.avail_out = 1;
+        err = deflate(&c_stream, Z_FINISH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "deflate");
+    }
+
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with small buffers
+ */
+void test_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = 0;
+    d_stream.next_out = uncompr;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
+        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "inflate");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad inflate\n");
+        exit(1);
+    } else {
+        printf("inflate(): %s\n", (char *)uncompr);
+    }
+}
+
+/* ===========================================================================
+ * Test deflate() with large buffers and dynamic change of compression level
+ */
+void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_BEST_SPEED);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_out = compr;
+    c_stream.avail_out = (uInt)comprLen;
+
+    /* At this point, uncompr is still mostly zeroes, so it should compress
+     * very well:
+     */
+    c_stream.next_in = uncompr;
+    c_stream.avail_in = (uInt)uncomprLen;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+    if (c_stream.avail_in != 0) {
+        fprintf(stderr, "deflate not greedy\n");
+        exit(1);
+    }
+
+    /* Feed in already compressed data and switch to no compression: */
+    deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
+    c_stream.next_in = compr;
+    c_stream.avail_in = (uInt)comprLen/2;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    /* Switch back to compressing mode: */
+    deflateParams(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
+    c_stream.next_in = uncompr;
+    c_stream.avail_in = (uInt)uncomprLen;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "deflate should report Z_STREAM_END\n");
+        exit(1);
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with large buffers
+ */
+void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = (uInt)comprLen;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    for (;;) {
+        d_stream.next_out = uncompr;            /* discard the output */
+        d_stream.avail_out = (uInt)uncomprLen;
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "large inflate");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
+        fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
+        exit(1);
+    } else {
+        printf("large_inflate(): OK\n");
+    }
+}
+
+/* ===========================================================================
+ * Test deflate() with full flush
+ */
+void test_flush(compr, comprLen)
+    Byte *compr;
+    uLong *comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+    uInt len = (uInt)strlen(hello)+1;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_in  = (Bytef*)hello;
+    c_stream.next_out = compr;
+    c_stream.avail_in = 3;
+    c_stream.avail_out = (uInt)*comprLen;
+    err = deflate(&c_stream, Z_FULL_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    compr[3]++; /* force an error in first compressed block */
+    c_stream.avail_in = len - 3;
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        CHECK_ERR(err, "deflate");
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+
+    *comprLen = c_stream.total_out;
+}
+
+/* ===========================================================================
+ * Test inflateSync()
+ */
+void test_sync(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = 2; /* just read the zlib header */
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    d_stream.next_out = uncompr;
+    d_stream.avail_out = (uInt)uncomprLen;
+
+    inflate(&d_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "inflate");
+
+    d_stream.avail_in = (uInt)comprLen-2;   /* read all compressed data */
+    err = inflateSync(&d_stream);           /* but skip the damaged part */
+    CHECK_ERR(err, "inflateSync");
+
+    err = inflate(&d_stream, Z_FINISH);
+    if (err != Z_DATA_ERROR) {
+        fprintf(stderr, "inflate should report DATA_ERROR\n");
+        /* Because of incorrect adler32 */
+        exit(1);
+    }
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    printf("after inflateSync(): hel%s\n", (char *)uncompr);
+}
+
+/* ===========================================================================
+ * Test deflate() with preset dictionary
+ */
+void test_dict_deflate(compr, comprLen)
+    Byte *compr;
+    uLong comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_BEST_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    err = deflateSetDictionary(&c_stream,
+                               (const Bytef*)dictionary, sizeof(dictionary));
+    CHECK_ERR(err, "deflateSetDictionary");
+
+    dictId = c_stream.adler;
+    c_stream.next_out = compr;
+    c_stream.avail_out = (uInt)comprLen;
+
+    c_stream.next_in = (Bytef*)hello;
+    c_stream.avail_in = (uInt)strlen(hello)+1;
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "deflate should report Z_STREAM_END\n");
+        exit(1);
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with a preset dictionary
+ */
+void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = (uInt)comprLen;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    d_stream.next_out = uncompr;
+    d_stream.avail_out = (uInt)uncomprLen;
+
+    for (;;) {
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        if (err == Z_NEED_DICT) {
+            if (d_stream.adler != dictId) {
+                fprintf(stderr, "unexpected dictionary");
+                exit(1);
+            }
+            err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
+                                       sizeof(dictionary));
+        }
+        CHECK_ERR(err, "inflate with dict");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad inflate with dict\n");
+        exit(1);
+    } else {
+        printf("inflate with dictionary: %s\n", (char *)uncompr);
+    }
+}
+
+/* ===========================================================================
+ * Usage:  example [output.gz  [input.gz]]
+ */
+
+int main(argc, argv)
+    int argc;
+    char *argv[];
+{
+    Byte *compr, *uncompr;
+    uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
+    uLong uncomprLen = comprLen;
+    static const char* myVersion = ZLIB_VERSION;
+
+    if (zlibVersion()[0] != myVersion[0]) {
+        fprintf(stderr, "incompatible zlib version\n");
+        exit(1);
+
+    } else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
+        fprintf(stderr, "warning: different zlib version\n");
+    }
+
+    printf("zlib version %s = 0x%04x, compile flags = 0x%lx\n",
+            ZLIB_VERSION, ZLIB_VERNUM, zlibCompileFlags());
+
+    compr    = (Byte*)calloc((uInt)comprLen, 1);
+    uncompr  = (Byte*)calloc((uInt)uncomprLen, 1);
+    /* compr and uncompr are cleared to avoid reading uninitialized
+     * data and to ensure that uncompr compresses well.
+     */
+    if (compr == Z_NULL || uncompr == Z_NULL) {
+        printf("out of memory\n");
+        exit(1);
+    }
+    test_compress(compr, comprLen, uncompr, uncomprLen);
+
+    test_gzio((argc > 1 ? argv[1] : TESTFILE),
+              uncompr, uncomprLen);
+
+    test_deflate(compr, comprLen);
+    test_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    test_large_deflate(compr, comprLen, uncompr, uncomprLen);
+    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    test_flush(compr, &comprLen);
+    test_sync(compr, comprLen, uncompr, uncomprLen);
+    comprLen = uncomprLen;
+
+    test_dict_deflate(compr, comprLen);
+    test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    free(compr);
+    free(uncompr);
+
+    return 0;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/README.examples b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/README.examples
new file mode 100644
index 00000000..56a31714
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/README.examples
@@ -0,0 +1,49 @@
+This directory contains examples of the use of zlib and other relevant
+programs and documentation.
+
+enough.c
+    calculation and justification of ENOUGH parameter in inftrees.h
+    - calculates the maximum table space used in inflate tree
+      construction over all possible Huffman codes
+
+fitblk.c
+    compress just enough input to nearly fill a requested output size
+    - zlib isn't designed to do this, but fitblk does it anyway
+
+gun.c
+    uncompress a gzip file
+    - illustrates the use of inflateBack() for high speed file-to-file
+      decompression using call-back functions
+    - is approximately twice as fast as gzip -d
+    - also provides Unix uncompress functionality, again twice as fast
+
+gzappend.c
+    append to a gzip file
+    - illustrates the use of the Z_BLOCK flush parameter for inflate()
+    - illustrates the use of deflatePrime() to start at any bit
+
+gzjoin.c
+    join gzip files without recalculating the crc or recompressing
+    - illustrates the use of the Z_BLOCK flush parameter for inflate()
+    - illustrates the use of crc32_combine()
+
+gzlog.c
+gzlog.h
+    efficiently and robustly maintain a message log file in gzip format
+    - illustrates use of raw deflate, Z_PARTIAL_FLUSH, deflatePrime(),
+      and deflateSetDictionary()
+    - illustrates use of a gzip header extra field
+
+zlib_how.html
+    painfully comprehensive description of zpipe.c (see below)
+    - describes in excruciating detail the use of deflate() and inflate()
+
+zpipe.c
+    reads and writes zlib streams from stdin to stdout
+    - illustrates the proper use of deflate() and inflate()
+    - deeply commented in zlib_how.html (see above)
+
+zran.c
+    index a zlib or gzip stream and randomly access it
+    - illustrates the use of Z_BLOCK, inflatePrime(), and
+      inflateSetDictionary() to provide random access
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/enough.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/enough.c
new file mode 100644
index 00000000..c40410ba
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/enough.c
@@ -0,0 +1,569 @@
+/* enough.c -- determine the maximum size of inflate's Huffman code tables over
+ * all possible valid and complete Huffman codes, subject to a length limit.
+ * Copyright (C) 2007, 2008 Mark Adler
+ * Version 1.3  17 February 2008  Mark Adler
+ */
+
+/* Version history:
+   1.0   3 Jan 2007  First version (derived from codecount.c version 1.4)
+   1.1   4 Jan 2007  Use faster incremental table usage computation
+                     Prune examine() search on previously visited states
+   1.2   5 Jan 2007  Comments clean up
+                     As inflate does, decrease root for short codes
+                     Refuse cases where inflate would increase root
+   1.3  17 Feb 2008  Add argument for initial root table size
+                     Fix bug for initial root table size == max - 1
+                     Use a macro to compute the history index
+ */
+
+/*
+   Examine all possible Huffman codes for a given number of symbols and a
+   maximum code length in bits to determine the maximum table size for zilb's
+   inflate.  Only complete Huffman codes are counted.
+
+   Two codes are considered distinct if the vectors of the number of codes per
+   length are not identical.  So permutations of the symbol assignments result
+   in the same code for the counting, as do permutations of the assignments of
+   the bit values to the codes (i.e. only canonical codes are counted).
+
+   We build a code from shorter to longer lengths, determining how many symbols
+   are coded at each length.  At each step, we have how many symbols remain to
+   be coded, what the last code length used was, and how many bit patterns of
+   that length remain unused. Then we add one to the code length and double the
+   number of unused patterns to graduate to the next code length.  We then
+   assign all portions of the remaining symbols to that code length that
+   preserve the properties of a correct and eventually complete code.  Those
+   properties are: we cannot use more bit patterns than are available; and when
+   all the symbols are used, there are exactly zero possible bit patterns
+   remaining.
+
+   The inflate Huffman decoding algorithm uses two-level lookup tables for
+   speed.  There is a single first-level table to decode codes up to root bits
+   in length (root == 9 in the current inflate implementation).  The table
+   has 1 << root entries and is indexed by the next root bits of input.  Codes
+   shorter than root bits have replicated table entries, so that the correct
+   entry is pointed to regardless of the bits that follow the short code.  If
+   the code is longer than root bits, then the table entry points to a second-
+   level table.  The size of that table is determined by the longest code with
+   that root-bit prefix.  If that longest code has length len, then the table
+   has size 1 << (len - root), to index the remaining bits in that set of
+   codes.  Each subsequent root-bit prefix then has its own sub-table.  The
+   total number of table entries required by the code is calculated
+   incrementally as the number of codes at each bit length is populated.  When
+   all of the codes are shorter than root bits, then root is reduced to the
+   longest code length, resulting in a single, smaller, one-level table.
+
+   The inflate algorithm also provides for small values of root (relative to
+   the log2 of the number of symbols), where the shortest code has more bits
+   than root.  In that case, root is increased to the length of the shortest
+   code.  This program, by design, does not handle that case, so it is verified
+   that the number of symbols is less than 2^(root + 1).
+
+   In order to speed up the examination (by about ten orders of magnitude for
+   the default arguments), the intermediate states in the build-up of a code
+   are remembered and previously visited branches are pruned.  The memory
+   required for this will increase rapidly with the total number of symbols and
+   the maximum code length in bits.  However this is a very small price to pay
+   for the vast speedup.
+
+   First, all of the possible Huffman codes are counted, and reachable
+   intermediate states are noted by a non-zero count in a saved-results array.
+   Second, the intermediate states that lead to (root + 1) bit or longer codes
+   are used to look at all sub-codes from those junctures for their inflate
+   memory usage.  (The amount of memory used is not affected by the number of
+   codes of root bits or less in length.)  Third, the visited states in the
+   construction of those sub-codes and the associated calculation of the table
+   size is recalled in order to avoid recalculating from the same juncture.
+   Beginning the code examination at (root + 1) bit codes, which is enabled by
+   identifying the reachable nodes, accounts for about six of the orders of
+   magnitude of improvement for the default arguments.  About another four
+   orders of magnitude come from not revisiting previous states.  Out of
+   approximately 2x10^16 possible Huffman codes, only about 2x10^6 sub-codes
+   need to be examined to cover all of the possible table memory usage cases
+   for the default arguments of 286 symbols limited to 15-bit codes.
+
+   Note that an unsigned long long type is used for counting.  It is quite easy
+   to exceed the capacity of an eight-byte integer with a large number of
+   symbols and a large maximum code length, so multiple-precision arithmetic
+   would need to replace the unsigned long long arithmetic in that case.  This
+   program will abort if an overflow occurs.  The big_t type identifies where
+   the counting takes place.
+
+   An unsigned long long type is also used for calculating the number of
+   possible codes remaining at the maximum length.  This limits the maximum
+   code length to the number of bits in a long long minus the number of bits
+   needed to represent the symbols in a flat code.  The code_t type identifies
+   where the bit pattern counting takes place.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#define local static
+
+/* special data types */
+typedef unsigned long long big_t;   /* type for code counting */
+typedef unsigned long long code_t;  /* type for bit pattern counting */
+struct tab {                        /* type for been here check */
+    size_t len;         /* length of bit vector in char's */
+    char *vec;          /* allocated bit vector */
+};
+
+/* The array for saving results, num[], is indexed with this triplet:
+
+      syms: number of symbols remaining to code
+      left: number of available bit patterns at length len
+      len: number of bits in the codes currently being assigned
+
+   Those indices are constrained thusly when saving results:
+
+      syms: 3..totsym (totsym == total symbols to code)
+      left: 2..syms - 1, but only the evens (so syms == 8 -> 2, 4, 6)
+      len: 1..max - 1 (max == maximum code length in bits)
+
+   syms == 2 is not saved since that immediately leads to a single code.  left
+   must be even, since it represents the number of available bit patterns at
+   the current length, which is double the number at the previous length.
+   left ends at syms-1 since left == syms immediately results in a single code.
+   (left > sym is not allowed since that would result in an incomplete code.)
+   len is less than max, since the code completes immediately when len == max.
+
+   The offset into the array is calculated for the three indices with the
+   first one (syms) being outermost, and the last one (len) being innermost.
+   We build the array with length max-1 lists for the len index, with syms-3
+   of those for each symbol.  There are totsym-2 of those, with each one
+   varying in length as a function of sym.  See the calculation of index in
+   count() for the index, and the calculation of size in main() for the size
+   of the array.
+
+   For the deflate example of 286 symbols limited to 15-bit codes, the array
+   has 284,284 entries, taking up 2.17 MB for an 8-byte big_t.  More than
+   half of the space allocated for saved results is actually used -- not all
+   possible triplets are reached in the generation of valid Huffman codes.
+ */
+
+/* The array for tracking visited states, done[], is itself indexed identically
+   to the num[] array as described above for the (syms, left, len) triplet.
+   Each element in the array is further indexed by the (mem, rem) doublet,
+   where mem is the amount of inflate table space used so far, and rem is the
+   remaining unused entries in the current inflate sub-table.  Each indexed
+   element is simply one bit indicating whether the state has been visited or
+   not.  Since the ranges for mem and rem are not known a priori, each bit
+   vector is of a variable size, and grows as needed to accommodate the visited
+   states.  mem and rem are used to calculate a single index in a triangular
+   array.  Since the range of mem is expected in the default case to be about
+   ten times larger than the range of rem, the array is skewed to reduce the
+   memory usage, with eight times the range for mem than for rem.  See the
+   calculations for offset and bit in beenhere() for the details.
+
+   For the deflate example of 286 symbols limited to 15-bit codes, the bit
+   vectors grow to total approximately 21 MB, in addition to the 4.3 MB done[]
+   array itself.
+ */
+
+/* Globals to avoid propagating constants or constant pointers recursively */
+local int max;          /* maximum allowed bit length for the codes */
+local int root;         /* size of base code table in bits */
+local int large;        /* largest code table so far */
+local size_t size;      /* number of elements in num and done */
+local int *code;        /* number of symbols assigned to each bit length */
+local big_t *num;       /* saved results array for code counting */
+local struct tab *done; /* states already evaluated array */
+
+/* Index function for num[] and done[] */
+#define INDEX(i,j,k) (((size_t)((i-1)>>1)*((i-2)>>1)+(j>>1)-1)*(max-1)+k-1)
+
+/* Free allocated space.  Uses globals code, num, and done. */
+local void cleanup(void)
+{
+    size_t n;
+
+    if (done != NULL) {
+        for (n = 0; n < size; n++)
+            if (done[n].len)
+                free(done[n].vec);
+        free(done);
+    }
+    if (num != NULL)
+        free(num);
+    if (code != NULL)
+        free(code);
+}
+
+/* Return the number of possible Huffman codes using bit patterns of lengths
+   len through max inclusive, coding syms symbols, with left bit patterns of
+   length len unused -- return -1 if there is an overflow in the counting.
+   Keep a record of previous results in num to prevent repeating the same
+   calculation.  Uses the globals max and num. */
+local big_t count(int syms, int len, int left)
+{
+    big_t sum;          /* number of possible codes from this juncture */
+    big_t got;          /* value returned from count() */
+    int least;          /* least number of syms to use at this juncture */
+    int most;           /* most number of syms to use at this juncture */
+    int use;            /* number of bit patterns to use in next call */
+    size_t index;       /* index of this case in *num */
+
+    /* see if only one possible code */
+    if (syms == left)
+        return 1;
+
+    /* note and verify the expected state */
+    assert(syms > left && left > 0 && len < max);
+
+    /* see if we've done this one already */
+    index = INDEX(syms, left, len);
+    got = num[index];
+    if (got)
+        return got;         /* we have -- return the saved result */
+
+    /* we need to use at least this many bit patterns so that the code won't be
+       incomplete at the next length (more bit patterns than symbols) */
+    least = (left << 1) - syms;
+    if (least < 0)
+        least = 0;
+
+    /* we can use at most this many bit patterns, lest there not be enough
+       available for the remaining symbols at the maximum length (if there were
+       no limit to the code length, this would become: most = left - 1) */
+    most = (((code_t)left << (max - len)) - syms) /
+            (((code_t)1 << (max - len)) - 1);
+
+    /* count all possible codes from this juncture and add them up */
+    sum = 0;
+    for (use = least; use <= most; use++) {
+        got = count(syms - use, len + 1, (left - use) << 1);
+        sum += got;
+        if (got == -1 || sum < got)         /* overflow */
+            return -1;
+    }
+
+    /* verify that all recursive calls are productive */
+    assert(sum != 0);
+
+    /* save the result and return it */
+    num[index] = sum;
+    return sum;
+}
+
+/* Return true if we've been here before, set to true if not.  Set a bit in a
+   bit vector to indicate visiting this state.  Each (syms,len,left) state
+   has a variable size bit vector indexed by (mem,rem).  The bit vector is
+   lengthened if needed to allow setting the (mem,rem) bit. */
+local int beenhere(int syms, int len, int left, int mem, int rem)
+{
+    size_t index;       /* index for this state's bit vector */
+    size_t offset;      /* offset in this state's bit vector */
+    int bit;            /* mask for this state's bit */
+    size_t length;      /* length of the bit vector in bytes */
+    char *vector;       /* new or enlarged bit vector */
+
+    /* point to vector for (syms,left,len), bit in vector for (mem,rem) */
+    index = INDEX(syms, left, len);
+    mem -= 1 << root;
+    offset = (mem >> 3) + rem;
+    offset = ((offset * (offset + 1)) >> 1) + rem;
+    bit = 1 << (mem & 7);
+
+    /* see if we've been here */
+    length = done[index].len;
+    if (offset < length && (done[index].vec[offset] & bit) != 0)
+        return 1;       /* done this! */
+
+    /* we haven't been here before -- set the bit to show we have now */
+
+    /* see if we need to lengthen the vector in order to set the bit */
+    if (length <= offset) {
+        /* if we have one already, enlarge it, zero out the appended space */
+        if (length) {
+            do {
+                length <<= 1;
+            } while (length <= offset);
+            vector = realloc(done[index].vec, length);
+            if (vector != NULL)
+                memset(vector + done[index].len, 0, length - done[index].len);
+        }
+
+        /* otherwise we need to make a new vector and zero it out */
+        else {
+            length = 1 << (len - root);
+            while (length <= offset)
+                length <<= 1;
+            vector = calloc(length, sizeof(char));
+        }
+
+        /* in either case, bail if we can't get the memory */
+        if (vector == NULL) {
+            fputs("abort: unable to allocate enough memory\n", stderr);
+            cleanup();
+            exit(1);
+        }
+
+        /* install the new vector */
+        done[index].len = length;
+        done[index].vec = vector;
+    }
+
+    /* set the bit */
+    done[index].vec[offset] |= bit;
+    return 0;
+}
+
+/* Examine all possible codes from the given node (syms, len, left).  Compute
+   the amount of memory required to build inflate's decoding tables, where the
+   number of code structures used so far is mem, and the number remaining in
+   the current sub-table is rem.  Uses the globals max, code, root, large, and
+   done. */
+local void examine(int syms, int len, int left, int mem, int rem)
+{
+    int least;          /* least number of syms to use at this juncture */
+    int most;           /* most number of syms to use at this juncture */
+    int use;            /* number of bit patterns to use in next call */
+
+    /* see if we have a complete code */
+    if (syms == left) {
+        /* set the last code entry */
+        code[len] = left;
+
+        /* complete computation of memory used by this code */
+        while (rem < left) {
+            left -= rem;
+            rem = 1 << (len - root);
+            mem += rem;
+        }
+        assert(rem == left);
+
+        /* if this is a new maximum, show the entries used and the sub-code */
+        if (mem > large) {
+            large = mem;
+            printf("max %d: ", mem);
+            for (use = root + 1; use <= max; use++)
+                if (code[use])
+                    printf("%d[%d] ", code[use], use);
+            putchar('\n');
+            fflush(stdout);
+        }
+
+        /* remove entries as we drop back down in the recursion */
+        code[len] = 0;
+        return;
+    }
+
+    /* prune the tree if we can */
+    if (beenhere(syms, len, left, mem, rem))
+        return;
+
+    /* we need to use at least this many bit patterns so that the code won't be
+       incomplete at the next length (more bit patterns than symbols) */
+    least = (left << 1) - syms;
+    if (least < 0)
+        least = 0;
+
+    /* we can use at most this many bit patterns, lest there not be enough
+       available for the remaining symbols at the maximum length (if there were
+       no limit to the code length, this would become: most = left - 1) */
+    most = (((code_t)left << (max - len)) - syms) /
+            (((code_t)1 << (max - len)) - 1);
+
+    /* occupy least table spaces, creating new sub-tables as needed */
+    use = least;
+    while (rem < use) {
+        use -= rem;
+        rem = 1 << (len - root);
+        mem += rem;
+    }
+    rem -= use;
+
+    /* examine codes from here, updating table space as we go */
+    for (use = least; use <= most; use++) {
+        code[len] = use;
+        examine(syms - use, len + 1, (left - use) << 1,
+                mem + (rem ? 1 << (len - root) : 0), rem << 1);
+        if (rem == 0) {
+            rem = 1 << (len - root);
+            mem += rem;
+        }
+        rem--;
+    }
+
+    /* remove entries as we drop back down in the recursion */
+    code[len] = 0;
+}
+
+/* Look at all sub-codes starting with root + 1 bits.  Look at only the valid
+   intermediate code states (syms, left, len).  For each completed code,
+   calculate the amount of memory required by inflate to build the decoding
+   tables. Find the maximum amount of memory required and show the code that
+   requires that maximum.  Uses the globals max, root, and num. */
+local void enough(int syms)
+{
+    int n;              /* number of remaing symbols for this node */
+    int left;           /* number of unused bit patterns at this length */
+    size_t index;       /* index of this case in *num */
+
+    /* clear code */
+    for (n = 0; n <= max; n++)
+        code[n] = 0;
+
+    /* look at all (root + 1) bit and longer codes */
+    large = 1 << root;              /* base table */
+    if (root < max)                 /* otherwise, there's only a base table */
+        for (n = 3; n <= syms; n++)
+            for (left = 2; left < n; left += 2)
+            {
+                /* look at all reachable (root + 1) bit nodes, and the
+                   resulting codes (complete at root + 2 or more) */
+                index = INDEX(n, left, root + 1);
+                if (root + 1 < max && num[index])       /* reachable node */
+                    examine(n, root + 1, left, 1 << root, 0);
+
+                /* also look at root bit codes with completions at root + 1
+                   bits (not saved in num, since complete), just in case */
+                if (num[index - 1] && n <= left << 1)
+                    examine((n - left) << 1, root + 1, (n - left) << 1,
+                            1 << root, 0);
+            }
+
+    /* done */
+    printf("done: maximum of %d table entries\n", large);
+}
+
+/*
+   Examine and show the total number of possible Huffman codes for a given
+   maximum number of symbols, initial root table size, and maximum code length
+   in bits -- those are the command arguments in that order.  The default
+   values are 286, 9, and 15 respectively, for the deflate literal/length code.
+   The possible codes are counted for each number of coded symbols from two to
+   the maximum.  The counts for each of those and the total number of codes are
+   shown.  The maximum number of inflate table entires is then calculated
+   across all possible codes.  Each new maximum number of table entries and the
+   associated sub-code (starting at root + 1 == 10 bits) is shown.
+
+   To count and examine Huffman codes that are not length-limited, provide a
+   maximum length equal to the number of symbols minus one.
+
+   For the deflate literal/length code, use "enough".  For the deflate distance
+   code, use "enough 30 6".
+
+   This uses the %llu printf format to print big_t numbers, which assumes that
+   big_t is an unsigned long long.  If the big_t type is changed (for example
+   to a multiple precision type), the method of printing will also need to be
+   updated.
+ */
+int main(int argc, char **argv)
+{
+    int syms;           /* total number of symbols to code */
+    int n;              /* number of symbols to code for this run */
+    big_t got;          /* return value of count() */
+    big_t sum;          /* accumulated number of codes over n */
+
+    /* set up globals for cleanup() */
+    code = NULL;
+    num = NULL;
+    done = NULL;
+
+    /* get arguments -- default to the deflate literal/length code */
+    syms = 286;
+        root = 9;
+    max = 15;
+    if (argc > 1) {
+        syms = atoi(argv[1]);
+        if (argc > 2) {
+            root = atoi(argv[2]);
+                        if (argc > 3)
+                                max = atoi(argv[3]);
+                }
+    }
+    if (argc > 4 || syms < 2 || root < 1 || max < 1) {
+        fputs("invalid arguments, need: [sym >= 2 [root >= 1 [max >= 1]]]\n",
+                          stderr);
+        return 1;
+    }
+
+    /* if not restricting the code length, the longest is syms - 1 */
+    if (max > syms - 1)
+        max = syms - 1;
+
+    /* determine the number of bits in a code_t */
+    n = 0;
+    while (((code_t)1 << n) != 0)
+        n++;
+
+    /* make sure that the calculation of most will not overflow */
+    if (max > n || syms - 2 >= (((code_t)0 - 1) >> (max - 1))) {
+        fputs("abort: code length too long for internal types\n", stderr);
+        return 1;
+    }
+
+    /* reject impossible code requests */
+    if (syms - 1 > ((code_t)1 << max) - 1) {
+        fprintf(stderr, "%d symbols cannot be coded in %d bits\n",
+                syms, max);
+        return 1;
+    }
+
+    /* allocate code vector */
+    code = calloc(max + 1, sizeof(int));
+    if (code == NULL) {
+        fputs("abort: unable to allocate enough memory\n", stderr);
+        return 1;
+    }
+
+    /* determine size of saved results array, checking for overflows,
+       allocate and clear the array (set all to zero with calloc()) */
+    if (syms == 2)              /* iff max == 1 */
+        num = NULL;             /* won't be saving any results */
+    else {
+        size = syms >> 1;
+        if (size > ((size_t)0 - 1) / (n = (syms - 1) >> 1) ||
+                (size *= n, size > ((size_t)0 - 1) / (n = max - 1)) ||
+                (size *= n, size > ((size_t)0 - 1) / sizeof(big_t)) ||
+                (num = calloc(size, sizeof(big_t))) == NULL) {
+            fputs("abort: unable to allocate enough memory\n", stderr);
+            cleanup();
+            return 1;
+        }
+    }
+
+    /* count possible codes for all numbers of symbols, add up counts */
+    sum = 0;
+    for (n = 2; n <= syms; n++) {
+        got = count(n, 1, 2);
+        sum += got;
+        if (got == -1 || sum < got) {       /* overflow */
+            fputs("abort: can't count that high!\n", stderr);
+            cleanup();
+            return 1;
+        }
+        printf("%llu %d-codes\n", got, n);
+    }
+    printf("%llu total codes for 2 to %d symbols", sum, syms);
+    if (max < syms - 1)
+        printf(" (%d-bit length limit)\n", max);
+    else
+        puts(" (no length limit)");
+
+    /* allocate and clear done array for beenhere() */
+    if (syms == 2)
+        done = NULL;
+    else if (size > ((size_t)0 - 1) / sizeof(struct tab) ||
+             (done = calloc(size, sizeof(struct tab))) == NULL) {
+        fputs("abort: unable to allocate enough memory\n", stderr);
+        cleanup();
+        return 1;
+    }
+
+    /* find and show maximum inflate table usage */
+        if (root > max)                 /* reduce root to max length */
+                root = max;
+    if (syms < ((code_t)1 << (root + 1)))
+        enough(syms);
+    else
+        puts("cannot handle minimum code lengths > root");
+
+    /* done */
+    cleanup();
+    return 0;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/fitblk.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/fitblk.c
new file mode 100644
index 00000000..c61de5c9
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/fitblk.c
@@ -0,0 +1,233 @@
+/* fitblk.c: example of fitting compressed output to a specified size
+   Not copyrighted -- provided to the public domain
+   Version 1.1  25 November 2004  Mark Adler */
+
+/* Version history:
+   1.0  24 Nov 2004  First version
+   1.1  25 Nov 2004  Change deflateInit2() to deflateInit()
+                     Use fixed-size, stack-allocated raw buffers
+                     Simplify code moving compression to subroutines
+                     Use assert() for internal errors
+                     Add detailed description of approach
+ */
+
+/* Approach to just fitting a requested compressed size:
+
+   fitblk performs three compression passes on a portion of the input
+   data in order to determine how much of that input will compress to
+   nearly the requested output block size.  The first pass generates
+   enough deflate blocks to produce output to fill the requested
+   output size plus a specfied excess amount (see the EXCESS define
+   below).  The last deflate block may go quite a bit past that, but
+   is discarded.  The second pass decompresses and recompresses just
+   the compressed data that fit in the requested plus excess sized
+   buffer.  The deflate process is terminated after that amount of
+   input, which is less than the amount consumed on the first pass.
+   The last deflate block of the result will be of a comparable size
+   to the final product, so that the header for that deflate block and
+   the compression ratio for that block will be about the same as in
+   the final product.  The third compression pass decompresses the
+   result of the second step, but only the compressed data up to the
+   requested size minus an amount to allow the compressed stream to
+   complete (see the MARGIN define below).  That will result in a
+   final compressed stream whose length is less than or equal to the
+   requested size.  Assuming sufficient input and a requested size
+   greater than a few hundred bytes, the shortfall will typically be
+   less than ten bytes.
+
+   If the input is short enough that the first compression completes
+   before filling the requested output size, then that compressed
+   stream is return with no recompression.
+
+   EXCESS is chosen to be just greater than the shortfall seen in a
+   two pass approach similar to the above.  That shortfall is due to
+   the last deflate block compressing more efficiently with a smaller
+   header on the second pass.  EXCESS is set to be large enough so
+   that there is enough uncompressed data for the second pass to fill
+   out the requested size, and small enough so that the final deflate
+   block of the second pass will be close in size to the final deflate
+   block of the third and final pass.  MARGIN is chosen to be just
+   large enough to assure that the final compression has enough room
+   to complete in all cases.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include "zlib.h"
+
+#define local static
+
+/* print nastygram and leave */
+local void quit(char *why)
+{
+    fprintf(stderr, "fitblk abort: %s\n", why);
+    exit(1);
+}
+
+#define RAWLEN 4096    /* intermediate uncompressed buffer size */
+
+/* compress from file to def until provided buffer is full or end of
+   input reached; return last deflate() return value, or Z_ERRNO if
+   there was read error on the file */
+local int partcompress(FILE *in, z_streamp def)
+{
+    int ret, flush;
+    unsigned char raw[RAWLEN];
+
+    flush = Z_NO_FLUSH;
+    do {
+        def->avail_in = fread(raw, 1, RAWLEN, in);
+        if (ferror(in))
+            return Z_ERRNO;
+        def->next_in = raw;
+        if (feof(in))
+            flush = Z_FINISH;
+        ret = deflate(def, flush);
+        assert(ret != Z_STREAM_ERROR);
+    } while (def->avail_out != 0 && flush == Z_NO_FLUSH);
+    return ret;
+}
+
+/* recompress from inf's input to def's output; the input for inf and
+   the output for def are set in those structures before calling;
+   return last deflate() return value, or Z_MEM_ERROR if inflate()
+   was not able to allocate enough memory when it needed to */
+local int recompress(z_streamp inf, z_streamp def)
+{
+    int ret, flush;
+    unsigned char raw[RAWLEN];
+
+    flush = Z_NO_FLUSH;
+    do {
+        /* decompress */
+        inf->avail_out = RAWLEN;
+        inf->next_out = raw;
+        ret = inflate(inf, Z_NO_FLUSH);
+        assert(ret != Z_STREAM_ERROR && ret != Z_DATA_ERROR &&
+               ret != Z_NEED_DICT);
+        if (ret == Z_MEM_ERROR)
+            return ret;
+
+        /* compress what was decompresed until done or no room */
+        def->avail_in = RAWLEN - inf->avail_out;
+        def->next_in = raw;
+        if (inf->avail_out != 0)
+            flush = Z_FINISH;
+        ret = deflate(def, flush);
+        assert(ret != Z_STREAM_ERROR);
+    } while (ret != Z_STREAM_END && def->avail_out != 0);
+    return ret;
+}
+
+#define EXCESS 256      /* empirically determined stream overage */
+#define MARGIN 8        /* amount to back off for completion */
+
+/* compress from stdin to fixed-size block on stdout */
+int main(int argc, char **argv)
+{
+    int ret;                /* return code */
+    unsigned size;          /* requested fixed output block size */
+    unsigned have;          /* bytes written by deflate() call */
+    unsigned char *blk;     /* intermediate and final stream */
+    unsigned char *tmp;     /* close to desired size stream */
+    z_stream def, inf;      /* zlib deflate and inflate states */
+
+    /* get requested output size */
+    if (argc != 2)
+        quit("need one argument: size of output block");
+    ret = strtol(argv[1], argv + 1, 10);
+    if (argv[1][0] != 0)
+        quit("argument must be a number");
+    if (ret < 8)            /* 8 is minimum zlib stream size */
+        quit("need positive size of 8 or greater");
+    size = (unsigned)ret;
+
+    /* allocate memory for buffers and compression engine */
+    blk = malloc(size + EXCESS);
+    def.zalloc = Z_NULL;
+    def.zfree = Z_NULL;
+    def.opaque = Z_NULL;
+    ret = deflateInit(&def, Z_DEFAULT_COMPRESSION);
+    if (ret != Z_OK || blk == NULL)
+        quit("out of memory");
+
+    /* compress from stdin until output full, or no more input */
+    def.avail_out = size + EXCESS;
+    def.next_out = blk;
+    ret = partcompress(stdin, &def);
+    if (ret == Z_ERRNO)
+        quit("error reading input");
+
+    /* if it all fit, then size was undersubscribed -- done! */
+    if (ret == Z_STREAM_END && def.avail_out >= EXCESS) {
+        /* write block to stdout */
+        have = size + EXCESS - def.avail_out;
+        if (fwrite(blk, 1, have, stdout) != have || ferror(stdout))
+            quit("error writing output");
+
+        /* clean up and print results to stderr */
+        ret = deflateEnd(&def);
+        assert(ret != Z_STREAM_ERROR);
+        free(blk);
+        fprintf(stderr,
+                "%u bytes unused out of %u requested (all input)\n",
+                size - have, size);
+        return 0;
+    }
+
+    /* it didn't all fit -- set up for recompression */
+    inf.zalloc = Z_NULL;
+    inf.zfree = Z_NULL;
+    inf.opaque = Z_NULL;
+    inf.avail_in = 0;
+    inf.next_in = Z_NULL;
+    ret = inflateInit(&inf);
+    tmp = malloc(size + EXCESS);
+    if (ret != Z_OK || tmp == NULL)
+        quit("out of memory");
+    ret = deflateReset(&def);
+    assert(ret != Z_STREAM_ERROR);
+
+    /* do first recompression close to the right amount */
+    inf.avail_in = size + EXCESS;
+    inf.next_in = blk;
+    def.avail_out = size + EXCESS;
+    def.next_out = tmp;
+    ret = recompress(&inf, &def);
+    if (ret == Z_MEM_ERROR)
+        quit("out of memory");
+
+    /* set up for next reocmpression */
+    ret = inflateReset(&inf);
+    assert(ret != Z_STREAM_ERROR);
+    ret = deflateReset(&def);
+    assert(ret != Z_STREAM_ERROR);
+
+    /* do second and final recompression (third compression) */
+    inf.avail_in = size - MARGIN;   /* assure stream will complete */
+    inf.next_in = tmp;
+    def.avail_out = size;
+    def.next_out = blk;
+    ret = recompress(&inf, &def);
+    if (ret == Z_MEM_ERROR)
+        quit("out of memory");
+    assert(ret == Z_STREAM_END);    /* otherwise MARGIN too small */
+
+    /* done -- write block to stdout */
+    have = size - def.avail_out;
+    if (fwrite(blk, 1, have, stdout) != have || ferror(stdout))
+        quit("error writing output");
+
+    /* clean up and print results to stderr */
+    free(tmp);
+    ret = inflateEnd(&inf);
+    assert(ret != Z_STREAM_ERROR);
+    ret = deflateEnd(&def);
+    assert(ret != Z_STREAM_ERROR);
+    free(blk);
+    fprintf(stderr,
+            "%u bytes unused out of %u requested (%lu input)\n",
+            size - have, size, def.total_in);
+    return 0;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gun.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gun.c
new file mode 100644
index 00000000..72b0882a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gun.c
@@ -0,0 +1,701 @@
+/* gun.c -- simple gunzip to give an example of the use of inflateBack()
+ * Copyright (C) 2003, 2005, 2008, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+   Version 1.6  17 January 2010  Mark Adler */
+
+/* Version history:
+   1.0  16 Feb 2003  First version for testing of inflateBack()
+   1.1  21 Feb 2005  Decompress concatenated gzip streams
+                     Remove use of "this" variable (C++ keyword)
+                     Fix return value for in()
+                     Improve allocation failure checking
+                     Add typecasting for void * structures
+                     Add -h option for command version and usage
+                     Add a bunch of comments
+   1.2  20 Mar 2005  Add Unix compress (LZW) decompression
+                     Copy file attributes from input file to output file
+   1.3  12 Jun 2005  Add casts for error messages [Oberhumer]
+   1.4   8 Dec 2006  LZW decompression speed improvements
+   1.5   9 Feb 2008  Avoid warning in latest version of gcc
+   1.6  17 Jan 2010  Avoid signed/unsigned comparison warnings
+ */
+
+/*
+   gun [ -t ] [ name ... ]
+
+   decompresses the data in the named gzip files.  If no arguments are given,
+   gun will decompress from stdin to stdout.  The names must end in .gz, -gz,
+   .z, -z, _z, or .Z.  The uncompressed data will be written to a file name
+   with the suffix stripped.  On success, the original file is deleted.  On
+   failure, the output file is deleted.  For most failures, the command will
+   continue to process the remaining names on the command line.  A memory
+   allocation failure will abort the command.  If -t is specified, then the
+   listed files or stdin will be tested as gzip files for integrity (without
+   checking for a proper suffix), no output will be written, and no files
+   will be deleted.
+
+   Like gzip, gun allows concatenated gzip streams and will decompress them,
+   writing all of the uncompressed data to the output.  Unlike gzip, gun allows
+   an empty file on input, and will produce no error writing an empty output
+   file.
+
+   gun will also decompress files made by Unix compress, which uses LZW
+   compression.  These files are automatically detected by virtue of their
+   magic header bytes.  Since the end of Unix compress stream is marked by the
+   end-of-file, they cannot be concantenated.  If a Unix compress stream is
+   encountered in an input file, it is the last stream in that file.
+
+   Like gunzip and uncompress, the file attributes of the orignal compressed
+   file are maintained in the final uncompressed file, to the extent that the
+   user permissions allow it.
+
+   On my Mac OS X PowerPC G4, gun is almost twice as fast as gunzip (version
+   1.2.4) is on the same file, when gun is linked with zlib 1.2.2.  Also the
+   LZW decompression provided by gun is about twice as fast as the standard
+   Unix uncompress command.
+ */
+
+/* external functions and related types and constants */
+#include <stdio.h>          /* fprintf() */
+#include <stdlib.h>         /* malloc(), free() */
+#include <string.h>         /* strerror(), strcmp(), strlen(), memcpy() */
+#include <errno.h>          /* errno */
+#include <fcntl.h>          /* open() */
+#include <unistd.h>         /* read(), write(), close(), chown(), unlink() */
+#include <sys/types.h>
+#include <sys/stat.h>       /* stat(), chmod() */
+#include <utime.h>          /* utime() */
+#include "zlib.h"           /* inflateBackInit(), inflateBack(), */
+                            /* inflateBackEnd(), crc32() */
+
+/* function declaration */
+#define local static
+
+/* buffer constants */
+#define SIZE 32768U         /* input and output buffer sizes */
+#define PIECE 16384         /* limits i/o chunks for 16-bit int case */
+
+/* structure for infback() to pass to input function in() -- it maintains the
+   input file and a buffer of size SIZE */
+struct ind {
+    int infile;
+    unsigned char *inbuf;
+};
+
+/* Load input buffer, assumed to be empty, and return bytes loaded and a
+   pointer to them.  read() is called until the buffer is full, or until it
+   returns end-of-file or error.  Return 0 on error. */
+local unsigned in(void *in_desc, unsigned char **buf)
+{
+    int ret;
+    unsigned len;
+    unsigned char *next;
+    struct ind *me = (struct ind *)in_desc;
+
+    next = me->inbuf;
+    *buf = next;
+    len = 0;
+    do {
+        ret = PIECE;
+        if ((unsigned)ret > SIZE - len)
+            ret = (int)(SIZE - len);
+        ret = (int)read(me->infile, next, ret);
+        if (ret == -1) {
+            len = 0;
+            break;
+        }
+        next += ret;
+        len += ret;
+    } while (ret != 0 && len < SIZE);
+    return len;
+}
+
+/* structure for infback() to pass to output function out() -- it maintains the
+   output file, a running CRC-32 check on the output and the total number of
+   bytes output, both for checking against the gzip trailer.  (The length in
+   the gzip trailer is stored modulo 2^32, so it's ok if a long is 32 bits and
+   the output is greater than 4 GB.) */
+struct outd {
+    int outfile;
+    int check;                  /* true if checking crc and total */
+    unsigned long crc;
+    unsigned long total;
+};
+
+/* Write output buffer and update the CRC-32 and total bytes written.  write()
+   is called until all of the output is written or an error is encountered.
+   On success out() returns 0.  For a write failure, out() returns 1.  If the
+   output file descriptor is -1, then nothing is written.
+ */
+local int out(void *out_desc, unsigned char *buf, unsigned len)
+{
+    int ret;
+    struct outd *me = (struct outd *)out_desc;
+
+    if (me->check) {
+        me->crc = crc32(me->crc, buf, len);
+        me->total += len;
+    }
+    if (me->outfile != -1)
+        do {
+            ret = PIECE;
+            if ((unsigned)ret > len)
+                ret = (int)len;
+            ret = (int)write(me->outfile, buf, ret);
+            if (ret == -1)
+                return 1;
+            buf += ret;
+            len -= ret;
+        } while (len != 0);
+    return 0;
+}
+
+/* next input byte macro for use inside lunpipe() and gunpipe() */
+#define NEXT() (have ? 0 : (have = in(indp, &next)), \
+                last = have ? (have--, (int)(*next++)) : -1)
+
+/* memory for gunpipe() and lunpipe() --
+   the first 256 entries of prefix[] and suffix[] are never used, could
+   have offset the index, but it's faster to waste the memory */
+unsigned char inbuf[SIZE];              /* input buffer */
+unsigned char outbuf[SIZE];             /* output buffer */
+unsigned short prefix[65536];           /* index to LZW prefix string */
+unsigned char suffix[65536];            /* one-character LZW suffix */
+unsigned char match[65280 + 2];         /* buffer for reversed match or gzip
+                                           32K sliding window */
+
+/* throw out what's left in the current bits byte buffer (this is a vestigial
+   aspect of the compressed data format derived from an implementation that
+   made use of a special VAX machine instruction!) */
+#define FLUSHCODE() \
+    do { \
+        left = 0; \
+        rem = 0; \
+        if (chunk > have) { \
+            chunk -= have; \
+            have = 0; \
+            if (NEXT() == -1) \
+                break; \
+            chunk--; \
+            if (chunk > have) { \
+                chunk = have = 0; \
+                break; \
+            } \
+        } \
+        have -= chunk; \
+        next += chunk; \
+        chunk = 0; \
+    } while (0)
+
+/* Decompress a compress (LZW) file from indp to outfile.  The compress magic
+   header (two bytes) has already been read and verified.  There are have bytes
+   of buffered input at next.  strm is used for passing error information back
+   to gunpipe().
+
+   lunpipe() will return Z_OK on success, Z_BUF_ERROR for an unexpected end of
+   file, read error, or write error (a write error indicated by strm->next_in
+   not equal to Z_NULL), or Z_DATA_ERROR for invalid input.
+ */
+local int lunpipe(unsigned have, unsigned char *next, struct ind *indp,
+                  int outfile, z_stream *strm)
+{
+    int last;                   /* last byte read by NEXT(), or -1 if EOF */
+    unsigned chunk;             /* bytes left in current chunk */
+    int left;                   /* bits left in rem */
+    unsigned rem;               /* unused bits from input */
+    int bits;                   /* current bits per code */
+    unsigned code;              /* code, table traversal index */
+    unsigned mask;              /* mask for current bits codes */
+    int max;                    /* maximum bits per code for this stream */
+    unsigned flags;             /* compress flags, then block compress flag */
+    unsigned end;               /* last valid entry in prefix/suffix tables */
+    unsigned temp;              /* current code */
+    unsigned prev;              /* previous code */
+    unsigned final;             /* last character written for previous code */
+    unsigned stack;             /* next position for reversed string */
+    unsigned outcnt;            /* bytes in output buffer */
+    struct outd outd;           /* output structure */
+    unsigned char *p;
+
+    /* set up output */
+    outd.outfile = outfile;
+    outd.check = 0;
+
+    /* process remainder of compress header -- a flags byte */
+    flags = NEXT();
+    if (last == -1)
+        return Z_BUF_ERROR;
+    if (flags & 0x60) {
+        strm->msg = (char *)"unknown lzw flags set";
+        return Z_DATA_ERROR;
+    }
+    max = flags & 0x1f;
+    if (max < 9 || max > 16) {
+        strm->msg = (char *)"lzw bits out of range";
+        return Z_DATA_ERROR;
+    }
+    if (max == 9)                           /* 9 doesn't really mean 9 */
+        max = 10;
+    flags &= 0x80;                          /* true if block compress */
+
+    /* clear table */
+    bits = 9;
+    mask = 0x1ff;
+    end = flags ? 256 : 255;
+
+    /* set up: get first 9-bit code, which is the first decompressed byte, but
+       don't create a table entry until the next code */
+    if (NEXT() == -1)                       /* no compressed data is ok */
+        return Z_OK;
+    final = prev = (unsigned)last;          /* low 8 bits of code */
+    if (NEXT() == -1)                       /* missing a bit */
+        return Z_BUF_ERROR;
+    if (last & 1) {                         /* code must be < 256 */
+        strm->msg = (char *)"invalid lzw code";
+        return Z_DATA_ERROR;
+    }
+    rem = (unsigned)last >> 1;              /* remaining 7 bits */
+    left = 7;
+    chunk = bits - 2;                       /* 7 bytes left in this chunk */
+    outbuf[0] = (unsigned char)final;       /* write first decompressed byte */
+    outcnt = 1;
+
+    /* decode codes */
+    stack = 0;
+    for (;;) {
+        /* if the table will be full after this, increment the code size */
+        if (end >= mask && bits < max) {
+            FLUSHCODE();
+            bits++;
+            mask <<= 1;
+            mask++;
+        }
+
+        /* get a code of length bits */
+        if (chunk == 0)                     /* decrement chunk modulo bits */
+            chunk = bits;
+        code = rem;                         /* low bits of code */
+        if (NEXT() == -1) {                 /* EOF is end of compressed data */
+            /* write remaining buffered output */
+            if (outcnt && out(&outd, outbuf, outcnt)) {
+                strm->next_in = outbuf;     /* signal write error */
+                return Z_BUF_ERROR;
+            }
+            return Z_OK;
+        }
+        code += (unsigned)last << left;     /* middle (or high) bits of code */
+        left += 8;
+        chunk--;
+        if (bits > left) {                  /* need more bits */
+            if (NEXT() == -1)               /* can't end in middle of code */
+                return Z_BUF_ERROR;
+            code += (unsigned)last << left; /* high bits of code */
+            left += 8;
+            chunk--;
+        }
+        code &= mask;                       /* mask to current code length */
+        left -= bits;                       /* number of unused bits */
+        rem = (unsigned)last >> (8 - left); /* unused bits from last byte */
+
+        /* process clear code (256) */
+        if (code == 256 && flags) {
+            FLUSHCODE();
+            bits = 9;                       /* initialize bits and mask */
+            mask = 0x1ff;
+            end = 255;                      /* empty table */
+            continue;                       /* get next code */
+        }
+
+        /* special code to reuse last match */
+        temp = code;                        /* save the current code */
+        if (code > end) {
+            /* Be picky on the allowed code here, and make sure that the code
+               we drop through (prev) will be a valid index so that random
+               input does not cause an exception.  The code != end + 1 check is
+               empirically derived, and not checked in the original uncompress
+               code.  If this ever causes a problem, that check could be safely
+               removed.  Leaving this check in greatly improves gun's ability
+               to detect random or corrupted input after a compress header.
+               In any case, the prev > end check must be retained. */
+            if (code != end + 1 || prev > end) {
+                strm->msg = (char *)"invalid lzw code";
+                return Z_DATA_ERROR;
+            }
+            match[stack++] = (unsigned char)final;
+            code = prev;
+        }
+
+        /* walk through linked list to generate output in reverse order */
+        p = match + stack;
+        while (code >= 256) {
+            *p++ = suffix[code];
+            code = prefix[code];
+        }
+        stack = p - match;
+        match[stack++] = (unsigned char)code;
+        final = code;
+
+        /* link new table entry */
+        if (end < mask) {
+            end++;
+            prefix[end] = (unsigned short)prev;
+            suffix[end] = (unsigned char)final;
+        }
+
+        /* set previous code for next iteration */
+        prev = temp;
+
+        /* write output in forward order */
+        while (stack > SIZE - outcnt) {
+            while (outcnt < SIZE)
+                outbuf[outcnt++] = match[--stack];
+            if (out(&outd, outbuf, outcnt)) {
+                strm->next_in = outbuf; /* signal write error */
+                return Z_BUF_ERROR;
+            }
+            outcnt = 0;
+        }
+        p = match + stack;
+        do {
+            outbuf[outcnt++] = *--p;
+        } while (p > match);
+        stack = 0;
+
+        /* loop for next code with final and prev as the last match, rem and
+           left provide the first 0..7 bits of the next code, end is the last
+           valid table entry */
+    }
+}
+
+/* Decompress a gzip file from infile to outfile.  strm is assumed to have been
+   successfully initialized with inflateBackInit().  The input file may consist
+   of a series of gzip streams, in which case all of them will be decompressed
+   to the output file.  If outfile is -1, then the gzip stream(s) integrity is
+   checked and nothing is written.
+
+   The return value is a zlib error code: Z_MEM_ERROR if out of memory,
+   Z_DATA_ERROR if the header or the compressed data is invalid, or if the
+   trailer CRC-32 check or length doesn't match, Z_BUF_ERROR if the input ends
+   prematurely or a write error occurs, or Z_ERRNO if junk (not a another gzip
+   stream) follows a valid gzip stream.
+ */
+local int gunpipe(z_stream *strm, int infile, int outfile)
+{
+    int ret, first, last;
+    unsigned have, flags, len;
+    unsigned char *next = NULL;
+    struct ind ind, *indp;
+    struct outd outd;
+
+    /* setup input buffer */
+    ind.infile = infile;
+    ind.inbuf = inbuf;
+    indp = &ind;
+
+    /* decompress concatenated gzip streams */
+    have = 0;                               /* no input data read in yet */
+    first = 1;                              /* looking for first gzip header */
+    strm->next_in = Z_NULL;                 /* so Z_BUF_ERROR means EOF */
+    for (;;) {
+        /* look for the two magic header bytes for a gzip stream */
+        if (NEXT() == -1) {
+            ret = Z_OK;
+            break;                          /* empty gzip stream is ok */
+        }
+        if (last != 31 || (NEXT() != 139 && last != 157)) {
+            strm->msg = (char *)"incorrect header check";
+            ret = first ? Z_DATA_ERROR : Z_ERRNO;
+            break;                          /* not a gzip or compress header */
+        }
+        first = 0;                          /* next non-header is junk */
+
+        /* process a compress (LZW) file -- can't be concatenated after this */
+        if (last == 157) {
+            ret = lunpipe(have, next, indp, outfile, strm);
+            break;
+        }
+
+        /* process remainder of gzip header */
+        ret = Z_BUF_ERROR;
+        if (NEXT() != 8) {                  /* only deflate method allowed */
+            if (last == -1) break;
+            strm->msg = (char *)"unknown compression method";
+            ret = Z_DATA_ERROR;
+            break;
+        }
+        flags = NEXT();                     /* header flags */
+        NEXT();                             /* discard mod time, xflgs, os */
+        NEXT();
+        NEXT();
+        NEXT();
+        NEXT();
+        NEXT();
+        if (last == -1) break;
+        if (flags & 0xe0) {
+            strm->msg = (char *)"unknown header flags set";
+            ret = Z_DATA_ERROR;
+            break;
+        }
+        if (flags & 4) {                    /* extra field */
+            len = NEXT();
+            len += (unsigned)(NEXT()) << 8;
+            if (last == -1) break;
+            while (len > have) {
+                len -= have;
+                have = 0;
+                if (NEXT() == -1) break;
+                len--;
+            }
+            if (last == -1) break;
+            have -= len;
+            next += len;
+        }
+        if (flags & 8)                      /* file name */
+            while (NEXT() != 0 && last != -1)
+                ;
+        if (flags & 16)                     /* comment */
+            while (NEXT() != 0 && last != -1)
+                ;
+        if (flags & 2) {                    /* header crc */
+            NEXT();
+            NEXT();
+        }
+        if (last == -1) break;
+
+        /* set up output */
+        outd.outfile = outfile;
+        outd.check = 1;
+        outd.crc = crc32(0L, Z_NULL, 0);
+        outd.total = 0;
+
+        /* decompress data to output */
+        strm->next_in = next;
+        strm->avail_in = have;
+        ret = inflateBack(strm, in, indp, out, &outd);
+        if (ret != Z_STREAM_END) break;
+        next = strm->next_in;
+        have = strm->avail_in;
+        strm->next_in = Z_NULL;             /* so Z_BUF_ERROR means EOF */
+
+        /* check trailer */
+        ret = Z_BUF_ERROR;
+        if (NEXT() != (int)(outd.crc & 0xff) ||
+            NEXT() != (int)((outd.crc >> 8) & 0xff) ||
+            NEXT() != (int)((outd.crc >> 16) & 0xff) ||
+            NEXT() != (int)((outd.crc >> 24) & 0xff)) {
+            /* crc error */
+            if (last != -1) {
+                strm->msg = (char *)"incorrect data check";
+                ret = Z_DATA_ERROR;
+            }
+            break;
+        }
+        if (NEXT() != (int)(outd.total & 0xff) ||
+            NEXT() != (int)((outd.total >> 8) & 0xff) ||
+            NEXT() != (int)((outd.total >> 16) & 0xff) ||
+            NEXT() != (int)((outd.total >> 24) & 0xff)) {
+            /* length error */
+            if (last != -1) {
+                strm->msg = (char *)"incorrect length check";
+                ret = Z_DATA_ERROR;
+            }
+            break;
+        }
+
+        /* go back and look for another gzip stream */
+    }
+
+    /* clean up and return */
+    return ret;
+}
+
+/* Copy file attributes, from -> to, as best we can.  This is best effort, so
+   no errors are reported.  The mode bits, including suid, sgid, and the sticky
+   bit are copied (if allowed), the owner's user id and group id are copied
+   (again if allowed), and the access and modify times are copied. */
+local void copymeta(char *from, char *to)
+{
+    struct stat was;
+    struct utimbuf when;
+
+    /* get all of from's Unix meta data, return if not a regular file */
+    if (stat(from, &was) != 0 || (was.st_mode & S_IFMT) != S_IFREG)
+        return;
+
+    /* set to's mode bits, ignore errors */
+    (void)chmod(to, was.st_mode & 07777);
+
+    /* copy owner's user and group, ignore errors */
+    (void)chown(to, was.st_uid, was.st_gid);
+
+    /* copy access and modify times, ignore errors */
+    when.actime = was.st_atime;
+    when.modtime = was.st_mtime;
+    (void)utime(to, &when);
+}
+
+/* Decompress the file inname to the file outnname, of if test is true, just
+   decompress without writing and check the gzip trailer for integrity.  If
+   inname is NULL or an empty string, read from stdin.  If outname is NULL or
+   an empty string, write to stdout.  strm is a pre-initialized inflateBack
+   structure.  When appropriate, copy the file attributes from inname to
+   outname.
+
+   gunzip() returns 1 if there is an out-of-memory error or an unexpected
+   return code from gunpipe().  Otherwise it returns 0.
+ */
+local int gunzip(z_stream *strm, char *inname, char *outname, int test)
+{
+    int ret;
+    int infile, outfile;
+
+    /* open files */
+    if (inname == NULL || *inname == 0) {
+        inname = "-";
+        infile = 0;     /* stdin */
+    }
+    else {
+        infile = open(inname, O_RDONLY, 0);
+        if (infile == -1) {
+            fprintf(stderr, "gun cannot open %s\n", inname);
+            return 0;
+        }
+    }
+    if (test)
+        outfile = -1;
+    else if (outname == NULL || *outname == 0) {
+        outname = "-";
+        outfile = 1;    /* stdout */
+    }
+    else {
+        outfile = open(outname, O_CREAT | O_TRUNC | O_WRONLY, 0666);
+        if (outfile == -1) {
+            close(infile);
+            fprintf(stderr, "gun cannot create %s\n", outname);
+            return 0;
+        }
+    }
+    errno = 0;
+
+    /* decompress */
+    ret = gunpipe(strm, infile, outfile);
+    if (outfile > 2) close(outfile);
+    if (infile > 2) close(infile);
+
+    /* interpret result */
+    switch (ret) {
+    case Z_OK:
+    case Z_ERRNO:
+        if (infile > 2 && outfile > 2) {
+            copymeta(inname, outname);          /* copy attributes */
+            unlink(inname);
+        }
+        if (ret == Z_ERRNO)
+            fprintf(stderr, "gun warning: trailing garbage ignored in %s\n",
+                    inname);
+        break;
+    case Z_DATA_ERROR:
+        if (outfile > 2) unlink(outname);
+        fprintf(stderr, "gun data error on %s: %s\n", inname, strm->msg);
+        break;
+    case Z_MEM_ERROR:
+        if (outfile > 2) unlink(outname);
+        fprintf(stderr, "gun out of memory error--aborting\n");
+        return 1;
+    case Z_BUF_ERROR:
+        if (outfile > 2) unlink(outname);
+        if (strm->next_in != Z_NULL) {
+            fprintf(stderr, "gun write error on %s: %s\n",
+                    outname, strerror(errno));
+        }
+        else if (errno) {
+            fprintf(stderr, "gun read error on %s: %s\n",
+                    inname, strerror(errno));
+        }
+        else {
+            fprintf(stderr, "gun unexpected end of file on %s\n",
+                    inname);
+        }
+        break;
+    default:
+        if (outfile > 2) unlink(outname);
+        fprintf(stderr, "gun internal error--aborting\n");
+        return 1;
+    }
+    return 0;
+}
+
+/* Process the gun command line arguments.  See the command syntax near the
+   beginning of this source file. */
+int main(int argc, char **argv)
+{
+    int ret, len, test;
+    char *outname;
+    unsigned char *window;
+    z_stream strm;
+
+    /* initialize inflateBack state for repeated use */
+    window = match;                         /* reuse LZW match buffer */
+    strm.zalloc = Z_NULL;
+    strm.zfree = Z_NULL;
+    strm.opaque = Z_NULL;
+    ret = inflateBackInit(&strm, 15, window);
+    if (ret != Z_OK) {
+        fprintf(stderr, "gun out of memory error--aborting\n");
+        return 1;
+    }
+
+    /* decompress each file to the same name with the suffix removed */
+    argc--;
+    argv++;
+    test = 0;
+    if (argc && strcmp(*argv, "-h") == 0) {
+        fprintf(stderr, "gun 1.6 (17 Jan 2010)\n");
+        fprintf(stderr, "Copyright (C) 2003-2010 Mark Adler\n");
+        fprintf(stderr, "usage: gun [-t] [file1.gz [file2.Z ...]]\n");
+        return 0;
+    }
+    if (argc && strcmp(*argv, "-t") == 0) {
+        test = 1;
+        argc--;
+        argv++;
+    }
+    if (argc)
+        do {
+            if (test)
+                outname = NULL;
+            else {
+                len = (int)strlen(*argv);
+                if (strcmp(*argv + len - 3, ".gz") == 0 ||
+                    strcmp(*argv + len - 3, "-gz") == 0)
+                    len -= 3;
+                else if (strcmp(*argv + len - 2, ".z") == 0 ||
+                    strcmp(*argv + len - 2, "-z") == 0 ||
+                    strcmp(*argv + len - 2, "_z") == 0 ||
+                    strcmp(*argv + len - 2, ".Z") == 0)
+                    len -= 2;
+                else {
+                    fprintf(stderr, "gun error: no gz type on %s--skipping\n",
+                            *argv);
+                    continue;
+                }
+                outname = malloc(len + 1);
+                if (outname == NULL) {
+                    fprintf(stderr, "gun out of memory error--aborting\n");
+                    ret = 1;
+                    break;
+                }
+                memcpy(outname, *argv, len);
+                outname[len] = 0;
+            }
+            ret = gunzip(&strm, *argv, outname, test);
+            if (outname != NULL) free(outname);
+            if (ret) break;
+        } while (argv++, --argc);
+    else
+        ret = gunzip(&strm, NULL, NULL, test);
+
+    /* clean up */
+    inflateBackEnd(&strm);
+    return ret;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gzappend.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gzappend.c
new file mode 100644
index 00000000..e9e878e1
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gzappend.c
@@ -0,0 +1,500 @@
+/* gzappend -- command to append to a gzip file
+
+  Copyright (C) 2003 Mark Adler, all rights reserved
+  version 1.1, 4 Nov 2003
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the author be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Mark Adler    madler@alumni.caltech.edu
+ */
+
+/*
+ * Change history:
+ *
+ * 1.0  19 Oct 2003     - First version
+ * 1.1   4 Nov 2003     - Expand and clarify some comments and notes
+ *                      - Add version and copyright to help
+ *                      - Send help to stdout instead of stderr
+ *                      - Add some preemptive typecasts
+ *                      - Add L to constants in lseek() calls
+ *                      - Remove some debugging information in error messages
+ *                      - Use new data_type definition for zlib 1.2.1
+ *                      - Simplfy and unify file operations
+ *                      - Finish off gzip file in gztack()
+ *                      - Use deflatePrime() instead of adding empty blocks
+ *                      - Keep gzip file clean on appended file read errors
+ *                      - Use in-place rotate instead of auxiliary buffer
+ *                        (Why you ask?  Because it was fun to write!)
+ */
+
+/*
+   gzappend takes a gzip file and appends to it, compressing files from the
+   command line or data from stdin.  The gzip file is written to directly, to
+   avoid copying that file, in case it's large.  Note that this results in the
+   unfriendly behavior that if gzappend fails, the gzip file is corrupted.
+
+   This program was written to illustrate the use of the new Z_BLOCK option of
+   zlib 1.2.x's inflate() function.  This option returns from inflate() at each
+   block boundary to facilitate locating and modifying the last block bit at
+   the start of the final deflate block.  Also whether using Z_BLOCK or not,
+   another required feature of zlib 1.2.x is that inflate() now provides the
+   number of unusued bits in the last input byte used.  gzappend will not work
+   with versions of zlib earlier than 1.2.1.
+
+   gzappend first decompresses the gzip file internally, discarding all but
+   the last 32K of uncompressed data, and noting the location of the last block
+   bit and the number of unused bits in the last byte of the compressed data.
+   The gzip trailer containing the CRC-32 and length of the uncompressed data
+   is verified.  This trailer will be later overwritten.
+
+   Then the last block bit is cleared by seeking back in the file and rewriting
+   the byte that contains it.  Seeking forward, the last byte of the compressed
+   data is saved along with the number of unused bits to initialize deflate.
+
+   A deflate process is initialized, using the last 32K of the uncompressed
+   data from the gzip file to initialize the dictionary.  If the total
+   uncompressed data was less than 32K, then all of it is used to initialize
+   the dictionary.  The deflate output bit buffer is also initialized with the
+   last bits from the original deflate stream.  From here on, the data to
+   append is simply compressed using deflate, and written to the gzip file.
+   When that is complete, the new CRC-32 and uncompressed length are written
+   as the trailer of the gzip file.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include "zlib.h"
+
+#define local static
+#define LGCHUNK 14
+#define CHUNK (1U << LGCHUNK)
+#define DSIZE 32768U
+
+/* print an error message and terminate with extreme prejudice */
+local void bye(char *msg1, char *msg2)
+{
+    fprintf(stderr, "gzappend error: %s%s\n", msg1, msg2);
+    exit(1);
+}
+
+/* return the greatest common divisor of a and b using Euclid's algorithm,
+   modified to be fast when one argument much greater than the other, and
+   coded to avoid unnecessary swapping */
+local unsigned gcd(unsigned a, unsigned b)
+{
+    unsigned c;
+
+    while (a && b)
+        if (a > b) {
+            c = b;
+            while (a - c >= c)
+                c <<= 1;
+            a -= c;
+        }
+        else {
+            c = a;
+            while (b - c >= c)
+                c <<= 1;
+            b -= c;
+        }
+    return a + b;
+}
+
+/* rotate list[0..len-1] left by rot positions, in place */
+local void rotate(unsigned char *list, unsigned len, unsigned rot)
+{
+    unsigned char tmp;
+    unsigned cycles;
+    unsigned char *start, *last, *to, *from;
+
+    /* normalize rot and handle degenerate cases */
+    if (len < 2) return;
+    if (rot >= len) rot %= len;
+    if (rot == 0) return;
+
+    /* pointer to last entry in list */
+    last = list + (len - 1);
+
+    /* do simple left shift by one */
+    if (rot == 1) {
+        tmp = *list;
+        memcpy(list, list + 1, len - 1);
+        *last = tmp;
+        return;
+    }
+
+    /* do simple right shift by one */
+    if (rot == len - 1) {
+        tmp = *last;
+        memmove(list + 1, list, len - 1);
+        *list = tmp;
+        return;
+    }
+
+    /* otherwise do rotate as a set of cycles in place */
+    cycles = gcd(len, rot);             /* number of cycles */
+    do {
+        start = from = list + cycles;   /* start index is arbitrary */
+        tmp = *from;                    /* save entry to be overwritten */
+        for (;;) {
+            to = from;                  /* next step in cycle */
+            from += rot;                /* go right rot positions */
+            if (from > last) from -= len;   /* (pointer better not wrap) */
+            if (from == start) break;   /* all but one shifted */
+            *to = *from;                /* shift left */
+        }
+        *to = tmp;                      /* complete the circle */
+    } while (--cycles);
+}
+
+/* structure for gzip file read operations */
+typedef struct {
+    int fd;                     /* file descriptor */
+    int size;                   /* 1 << size is bytes in buf */
+    unsigned left;              /* bytes available at next */
+    unsigned char *buf;         /* buffer */
+    unsigned char *next;        /* next byte in buffer */
+    char *name;                 /* file name for error messages */
+} file;
+
+/* reload buffer */
+local int readin(file *in)
+{
+    int len;
+
+    len = read(in->fd, in->buf, 1 << in->size);
+    if (len == -1) bye("error reading ", in->name);
+    in->left = (unsigned)len;
+    in->next = in->buf;
+    return len;
+}
+
+/* read from file in, exit if end-of-file */
+local int readmore(file *in)
+{
+    if (readin(in) == 0) bye("unexpected end of ", in->name);
+    return 0;
+}
+
+#define read1(in) (in->left == 0 ? readmore(in) : 0, \
+                   in->left--, *(in->next)++)
+
+/* skip over n bytes of in */
+local void skip(file *in, unsigned n)
+{
+    unsigned bypass;
+
+    if (n > in->left) {
+        n -= in->left;
+        bypass = n & ~((1U << in->size) - 1);
+        if (bypass) {
+            if (lseek(in->fd, (off_t)bypass, SEEK_CUR) == -1)
+                bye("seeking ", in->name);
+            n -= bypass;
+        }
+        readmore(in);
+        if (n > in->left)
+            bye("unexpected end of ", in->name);
+    }
+    in->left -= n;
+    in->next += n;
+}
+
+/* read a four-byte unsigned integer, little-endian, from in */
+unsigned long read4(file *in)
+{
+    unsigned long val;
+
+    val = read1(in);
+    val += (unsigned)read1(in) << 8;
+    val += (unsigned long)read1(in) << 16;
+    val += (unsigned long)read1(in) << 24;
+    return val;
+}
+
+/* skip over gzip header */
+local void gzheader(file *in)
+{
+    int flags;
+    unsigned n;
+
+    if (read1(in) != 31 || read1(in) != 139) bye(in->name, " not a gzip file");
+    if (read1(in) != 8) bye("unknown compression method in", in->name);
+    flags = read1(in);
+    if (flags & 0xe0) bye("unknown header flags set in", in->name);
+    skip(in, 6);
+    if (flags & 4) {
+        n = read1(in);
+        n += (unsigned)(read1(in)) << 8;
+        skip(in, n);
+    }
+    if (flags & 8) while (read1(in) != 0) ;
+    if (flags & 16) while (read1(in) != 0) ;
+    if (flags & 2) skip(in, 2);
+}
+
+/* decompress gzip file "name", return strm with a deflate stream ready to
+   continue compression of the data in the gzip file, and return a file
+   descriptor pointing to where to write the compressed data -- the deflate
+   stream is initialized to compress using level "level" */
+local int gzscan(char *name, z_stream *strm, int level)
+{
+    int ret, lastbit, left, full;
+    unsigned have;
+    unsigned long crc, tot;
+    unsigned char *window;
+    off_t lastoff, end;
+    file gz;
+
+    /* open gzip file */
+    gz.name = name;
+    gz.fd = open(name, O_RDWR, 0);
+    if (gz.fd == -1) bye("cannot open ", name);
+    gz.buf = malloc(CHUNK);
+    if (gz.buf == NULL) bye("out of memory", "");
+    gz.size = LGCHUNK;
+    gz.left = 0;
+
+    /* skip gzip header */
+    gzheader(&gz);
+
+    /* prepare to decompress */
+    window = malloc(DSIZE);
+    if (window == NULL) bye("out of memory", "");
+    strm->zalloc = Z_NULL;
+    strm->zfree = Z_NULL;
+    strm->opaque = Z_NULL;
+    ret = inflateInit2(strm, -15);
+    if (ret != Z_OK) bye("out of memory", " or library mismatch");
+
+    /* decompress the deflate stream, saving append information */
+    lastbit = 0;
+    lastoff = lseek(gz.fd, 0L, SEEK_CUR) - gz.left;
+    left = 0;
+    strm->avail_in = gz.left;
+    strm->next_in = gz.next;
+    crc = crc32(0L, Z_NULL, 0);
+    have = full = 0;
+    do {
+        /* if needed, get more input */
+        if (strm->avail_in == 0) {
+            readmore(&gz);
+            strm->avail_in = gz.left;
+            strm->next_in = gz.next;
+        }
+
+        /* set up output to next available section of sliding window */
+        strm->avail_out = DSIZE - have;
+        strm->next_out = window + have;
+
+        /* inflate and check for errors */
+        ret = inflate(strm, Z_BLOCK);
+        if (ret == Z_STREAM_ERROR) bye("internal stream error!", "");
+        if (ret == Z_MEM_ERROR) bye("out of memory", "");
+        if (ret == Z_DATA_ERROR)
+            bye("invalid compressed data--format violated in", name);
+
+        /* update crc and sliding window pointer */
+        crc = crc32(crc, window + have, DSIZE - have - strm->avail_out);
+        if (strm->avail_out)
+            have = DSIZE - strm->avail_out;
+        else {
+            have = 0;
+            full = 1;
+        }
+
+        /* process end of block */
+        if (strm->data_type & 128) {
+            if (strm->data_type & 64)
+                left = strm->data_type & 0x1f;
+            else {
+                lastbit = strm->data_type & 0x1f;
+                lastoff = lseek(gz.fd, 0L, SEEK_CUR) - strm->avail_in;
+            }
+        }
+    } while (ret != Z_STREAM_END);
+    inflateEnd(strm);
+    gz.left = strm->avail_in;
+    gz.next = strm->next_in;
+
+    /* save the location of the end of the compressed data */
+    end = lseek(gz.fd, 0L, SEEK_CUR) - gz.left;
+
+    /* check gzip trailer and save total for deflate */
+    if (crc != read4(&gz))
+        bye("invalid compressed data--crc mismatch in ", name);
+    tot = strm->total_out;
+    if ((tot & 0xffffffffUL) != read4(&gz))
+        bye("invalid compressed data--length mismatch in", name);
+
+    /* if not at end of file, warn */
+    if (gz.left || readin(&gz))
+        fprintf(stderr,
+            "gzappend warning: junk at end of gzip file overwritten\n");
+
+    /* clear last block bit */
+    lseek(gz.fd, lastoff - (lastbit != 0), SEEK_SET);
+    if (read(gz.fd, gz.buf, 1) != 1) bye("reading after seek on ", name);
+    *gz.buf = (unsigned char)(*gz.buf ^ (1 << ((8 - lastbit) & 7)));
+    lseek(gz.fd, -1L, SEEK_CUR);
+    if (write(gz.fd, gz.buf, 1) != 1) bye("writing after seek to ", name);
+
+    /* if window wrapped, build dictionary from window by rotating */
+    if (full) {
+        rotate(window, DSIZE, have);
+        have = DSIZE;
+    }
+
+    /* set up deflate stream with window, crc, total_in, and leftover bits */
+    ret = deflateInit2(strm, level, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY);
+    if (ret != Z_OK) bye("out of memory", "");
+    deflateSetDictionary(strm, window, have);
+    strm->adler = crc;
+    strm->total_in = tot;
+    if (left) {
+        lseek(gz.fd, --end, SEEK_SET);
+        if (read(gz.fd, gz.buf, 1) != 1) bye("reading after seek on ", name);
+        deflatePrime(strm, 8 - left, *gz.buf);
+    }
+    lseek(gz.fd, end, SEEK_SET);
+
+    /* clean up and return */
+    free(window);
+    free(gz.buf);
+    return gz.fd;
+}
+
+/* append file "name" to gzip file gd using deflate stream strm -- if last
+   is true, then finish off the deflate stream at the end */
+local void gztack(char *name, int gd, z_stream *strm, int last)
+{
+    int fd, len, ret;
+    unsigned left;
+    unsigned char *in, *out;
+
+    /* open file to compress and append */
+    fd = 0;
+    if (name != NULL) {
+        fd = open(name, O_RDONLY, 0);
+        if (fd == -1)
+            fprintf(stderr, "gzappend warning: %s not found, skipping ...\n",
+                    name);
+    }
+
+    /* allocate buffers */
+    in = fd == -1 ? NULL : malloc(CHUNK);
+    out = malloc(CHUNK);
+    if (out == NULL) bye("out of memory", "");
+
+    /* compress input file and append to gzip file */
+    do {
+        /* get more input */
+        len = fd == -1 ? 0 : read(fd, in, CHUNK);
+        if (len == -1) {
+            fprintf(stderr,
+                    "gzappend warning: error reading %s, skipping rest ...\n",
+                    name);
+            len = 0;
+        }
+        strm->avail_in = (unsigned)len;
+        strm->next_in = in;
+        if (len) strm->adler = crc32(strm->adler, in, (unsigned)len);
+
+        /* compress and write all available output */
+        do {
+            strm->avail_out = CHUNK;
+            strm->next_out = out;
+            ret = deflate(strm, last && len == 0 ? Z_FINISH : Z_NO_FLUSH);
+            left = CHUNK - strm->avail_out;
+            while (left) {
+                len = write(gd, out + CHUNK - strm->avail_out - left, left);
+                if (len == -1) bye("writing gzip file", "");
+                left -= (unsigned)len;
+            }
+        } while (strm->avail_out == 0 && ret != Z_STREAM_END);
+    } while (len != 0);
+
+    /* write trailer after last entry */
+    if (last) {
+        deflateEnd(strm);
+        out[0] = (unsigned char)(strm->adler);
+        out[1] = (unsigned char)(strm->adler >> 8);
+        out[2] = (unsigned char)(strm->adler >> 16);
+        out[3] = (unsigned char)(strm->adler >> 24);
+        out[4] = (unsigned char)(strm->total_in);
+        out[5] = (unsigned char)(strm->total_in >> 8);
+        out[6] = (unsigned char)(strm->total_in >> 16);
+        out[7] = (unsigned char)(strm->total_in >> 24);
+        len = 8;
+        do {
+            ret = write(gd, out + 8 - len, len);
+            if (ret == -1) bye("writing gzip file", "");
+            len -= ret;
+        } while (len);
+        close(gd);
+    }
+
+    /* clean up and return */
+    free(out);
+    if (in != NULL) free(in);
+    if (fd > 0) close(fd);
+}
+
+/* process the compression level option if present, scan the gzip file, and
+   append the specified files, or append the data from stdin if no other file
+   names are provided on the command line -- the gzip file must be writable
+   and seekable */
+int main(int argc, char **argv)
+{
+    int gd, level;
+    z_stream strm;
+
+    /* ignore command name */
+    argv++;
+
+    /* provide usage if no arguments */
+    if (*argv == NULL) {
+        printf("gzappend 1.1 (4 Nov 2003) Copyright (C) 2003 Mark Adler\n");
+        printf(
+            "usage: gzappend [-level] file.gz [ addthis [ andthis ... ]]\n");
+        return 0;
+    }
+
+    /* set compression level */
+    level = Z_DEFAULT_COMPRESSION;
+    if (argv[0][0] == '-') {
+        if (argv[0][1] < '0' || argv[0][1] > '9' || argv[0][2] != 0)
+            bye("invalid compression level", "");
+        level = argv[0][1] - '0';
+        if (*++argv == NULL) bye("no gzip file name after options", "");
+    }
+
+    /* prepare to append to gzip file */
+    gd = gzscan(*argv++, &strm, level);
+
+    /* append files on command line, or from stdin if none */
+    if (*argv == NULL)
+        gztack(NULL, gd, &strm, 1);
+    else
+        do {
+            gztack(*argv, gd, &strm, argv[1] == NULL);
+        } while (*++argv != NULL);
+    return 0;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gzjoin.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gzjoin.c
new file mode 100644
index 00000000..129347ce
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gzjoin.c
@@ -0,0 +1,448 @@
+/* gzjoin -- command to join gzip files into one gzip file
+
+  Copyright (C) 2004 Mark Adler, all rights reserved
+  version 1.0, 11 Dec 2004
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the author be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Mark Adler    madler@alumni.caltech.edu
+ */
+
+/*
+ * Change history:
+ *
+ * 1.0  11 Dec 2004     - First version
+ * 1.1  12 Jun 2005     - Changed ssize_t to long for portability
+ */
+
+/*
+   gzjoin takes one or more gzip files on the command line and writes out a
+   single gzip file that will uncompress to the concatenation of the
+   uncompressed data from the individual gzip files.  gzjoin does this without
+   having to recompress any of the data and without having to calculate a new
+   crc32 for the concatenated uncompressed data.  gzjoin does however have to
+   decompress all of the input data in order to find the bits in the compressed
+   data that need to be modified to concatenate the streams.
+
+   gzjoin does not do an integrity check on the input gzip files other than
+   checking the gzip header and decompressing the compressed data.  They are
+   otherwise assumed to be complete and correct.
+
+   Each joint between gzip files removes at least 18 bytes of previous trailer
+   and subsequent header, and inserts an average of about three bytes to the
+   compressed data in order to connect the streams.  The output gzip file
+   has a minimal ten-byte gzip header with no file name or modification time.
+
+   This program was written to illustrate the use of the Z_BLOCK option of
+   inflate() and the crc32_combine() function.  gzjoin will not compile with
+   versions of zlib earlier than 1.2.3.
+ */
+
+#include <stdio.h>      /* fputs(), fprintf(), fwrite(), putc() */
+#include <stdlib.h>     /* exit(), malloc(), free() */
+#include <fcntl.h>      /* open() */
+#include <unistd.h>     /* close(), read(), lseek() */
+#include "zlib.h"
+    /* crc32(), crc32_combine(), inflateInit2(), inflate(), inflateEnd() */
+
+#define local static
+
+/* exit with an error (return a value to allow use in an expression) */
+local int bail(char *why1, char *why2)
+{
+    fprintf(stderr, "gzjoin error: %s%s, output incomplete\n", why1, why2);
+    exit(1);
+    return 0;
+}
+
+/* -- simple buffered file input with access to the buffer -- */
+
+#define CHUNK 32768         /* must be a power of two and fit in unsigned */
+
+/* bin buffered input file type */
+typedef struct {
+    char *name;             /* name of file for error messages */
+    int fd;                 /* file descriptor */
+    unsigned left;          /* bytes remaining at next */
+    unsigned char *next;    /* next byte to read */
+    unsigned char *buf;     /* allocated buffer of length CHUNK */
+} bin;
+
+/* close a buffered file and free allocated memory */
+local void bclose(bin *in)
+{
+    if (in != NULL) {
+        if (in->fd != -1)
+            close(in->fd);
+        if (in->buf != NULL)
+            free(in->buf);
+        free(in);
+    }
+}
+
+/* open a buffered file for input, return a pointer to type bin, or NULL on
+   failure */
+local bin *bopen(char *name)
+{
+    bin *in;
+
+    in = malloc(sizeof(bin));
+    if (in == NULL)
+        return NULL;
+    in->buf = malloc(CHUNK);
+    in->fd = open(name, O_RDONLY, 0);
+    if (in->buf == NULL || in->fd == -1) {
+        bclose(in);
+        return NULL;
+    }
+    in->left = 0;
+    in->next = in->buf;
+    in->name = name;
+    return in;
+}
+
+/* load buffer from file, return -1 on read error, 0 or 1 on success, with
+   1 indicating that end-of-file was reached */
+local int bload(bin *in)
+{
+    long len;
+
+    if (in == NULL)
+        return -1;
+    if (in->left != 0)
+        return 0;
+    in->next = in->buf;
+    do {
+        len = (long)read(in->fd, in->buf + in->left, CHUNK - in->left);
+        if (len < 0)
+            return -1;
+        in->left += (unsigned)len;
+    } while (len != 0 && in->left < CHUNK);
+    return len == 0 ? 1 : 0;
+}
+
+/* get a byte from the file, bail if end of file */
+#define bget(in) (in->left ? 0 : bload(in), \
+                  in->left ? (in->left--, *(in->next)++) : \
+                    bail("unexpected end of file on ", in->name))
+
+/* get a four-byte little-endian unsigned integer from file */
+local unsigned long bget4(bin *in)
+{
+    unsigned long val;
+
+    val = bget(in);
+    val += (unsigned long)(bget(in)) << 8;
+    val += (unsigned long)(bget(in)) << 16;
+    val += (unsigned long)(bget(in)) << 24;
+    return val;
+}
+
+/* skip bytes in file */
+local void bskip(bin *in, unsigned skip)
+{
+    /* check pointer */
+    if (in == NULL)
+        return;
+
+    /* easy case -- skip bytes in buffer */
+    if (skip <= in->left) {
+        in->left -= skip;
+        in->next += skip;
+        return;
+    }
+
+    /* skip what's in buffer, discard buffer contents */
+    skip -= in->left;
+    in->left = 0;
+
+    /* seek past multiples of CHUNK bytes */
+    if (skip > CHUNK) {
+        unsigned left;
+
+        left = skip & (CHUNK - 1);
+        if (left == 0) {
+            /* exact number of chunks: seek all the way minus one byte to check
+               for end-of-file with a read */
+            lseek(in->fd, skip - 1, SEEK_CUR);
+            if (read(in->fd, in->buf, 1) != 1)
+                bail("unexpected end of file on ", in->name);
+            return;
+        }
+
+        /* skip the integral chunks, update skip with remainder */
+        lseek(in->fd, skip - left, SEEK_CUR);
+        skip = left;
+    }
+
+    /* read more input and skip remainder */
+    bload(in);
+    if (skip > in->left)
+        bail("unexpected end of file on ", in->name);
+    in->left -= skip;
+    in->next += skip;
+}
+
+/* -- end of buffered input functions -- */
+
+/* skip the gzip header from file in */
+local void gzhead(bin *in)
+{
+    int flags;
+
+    /* verify gzip magic header and compression method */
+    if (bget(in) != 0x1f || bget(in) != 0x8b || bget(in) != 8)
+        bail(in->name, " is not a valid gzip file");
+
+    /* get and verify flags */
+    flags = bget(in);
+    if ((flags & 0xe0) != 0)
+        bail("unknown reserved bits set in ", in->name);
+
+    /* skip modification time, extra flags, and os */
+    bskip(in, 6);
+
+    /* skip extra field if present */
+    if (flags & 4) {
+        unsigned len;
+
+        len = bget(in);
+        len += (unsigned)(bget(in)) << 8;
+        bskip(in, len);
+    }
+
+    /* skip file name if present */
+    if (flags & 8)
+        while (bget(in) != 0)
+            ;
+
+    /* skip comment if present */
+    if (flags & 16)
+        while (bget(in) != 0)
+            ;
+
+    /* skip header crc if present */
+    if (flags & 2)
+        bskip(in, 2);
+}
+
+/* write a four-byte little-endian unsigned integer to out */
+local void put4(unsigned long val, FILE *out)
+{
+    putc(val & 0xff, out);
+    putc((val >> 8) & 0xff, out);
+    putc((val >> 16) & 0xff, out);
+    putc((val >> 24) & 0xff, out);
+}
+
+/* Load up zlib stream from buffered input, bail if end of file */
+local void zpull(z_streamp strm, bin *in)
+{
+    if (in->left == 0)
+        bload(in);
+    if (in->left == 0)
+        bail("unexpected end of file on ", in->name);
+    strm->avail_in = in->left;
+    strm->next_in = in->next;
+}
+
+/* Write header for gzip file to out and initialize trailer. */
+local void gzinit(unsigned long *crc, unsigned long *tot, FILE *out)
+{
+    fwrite("\x1f\x8b\x08\0\0\0\0\0\0\xff", 1, 10, out);
+    *crc = crc32(0L, Z_NULL, 0);
+    *tot = 0;
+}
+
+/* Copy the compressed data from name, zeroing the last block bit of the last
+   block if clr is true, and adding empty blocks as needed to get to a byte
+   boundary.  If clr is false, then the last block becomes the last block of
+   the output, and the gzip trailer is written.  crc and tot maintains the
+   crc and length (modulo 2^32) of the output for the trailer.  The resulting
+   gzip file is written to out.  gzinit() must be called before the first call
+   of gzcopy() to write the gzip header and to initialize crc and tot. */
+local void gzcopy(char *name, int clr, unsigned long *crc, unsigned long *tot,
+                  FILE *out)
+{
+    int ret;                /* return value from zlib functions */
+    int pos;                /* where the "last block" bit is in byte */
+    int last;               /* true if processing the last block */
+    bin *in;                /* buffered input file */
+    unsigned char *start;   /* start of compressed data in buffer */
+    unsigned char *junk;    /* buffer for uncompressed data -- discarded */
+    z_off_t len;            /* length of uncompressed data (support > 4 GB) */
+    z_stream strm;          /* zlib inflate stream */
+
+    /* open gzip file and skip header */
+    in = bopen(name);
+    if (in == NULL)
+        bail("could not open ", name);
+    gzhead(in);
+
+    /* allocate buffer for uncompressed data and initialize raw inflate
+       stream */
+    junk = malloc(CHUNK);
+    strm.zalloc = Z_NULL;
+    strm.zfree = Z_NULL;
+    strm.opaque = Z_NULL;
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, -15);
+    if (junk == NULL || ret != Z_OK)
+        bail("out of memory", "");
+
+    /* inflate and copy compressed data, clear last-block bit if requested */
+    len = 0;
+    zpull(&strm, in);
+    start = strm.next_in;
+    last = start[0] & 1;
+    if (last && clr)
+        start[0] &= ~1;
+    strm.avail_out = 0;
+    for (;;) {
+        /* if input used and output done, write used input and get more */
+        if (strm.avail_in == 0 && strm.avail_out != 0) {
+            fwrite(start, 1, strm.next_in - start, out);
+            start = in->buf;
+            in->left = 0;
+            zpull(&strm, in);
+        }
+
+        /* decompress -- return early when end-of-block reached */
+        strm.avail_out = CHUNK;
+        strm.next_out = junk;
+        ret = inflate(&strm, Z_BLOCK);
+        switch (ret) {
+        case Z_MEM_ERROR:
+            bail("out of memory", "");
+        case Z_DATA_ERROR:
+            bail("invalid compressed data in ", in->name);
+        }
+
+        /* update length of uncompressed data */
+        len += CHUNK - strm.avail_out;
+
+        /* check for block boundary (only get this when block copied out) */
+        if (strm.data_type & 128) {
+            /* if that was the last block, then done */
+            if (last)
+                break;
+
+            /* number of unused bits in last byte */
+            pos = strm.data_type & 7;
+
+            /* find the next last-block bit */
+            if (pos != 0) {
+                /* next last-block bit is in last used byte */
+                pos = 0x100 >> pos;
+                last = strm.next_in[-1] & pos;
+                if (last && clr)
+                    strm.next_in[-1] &= ~pos;
+            }
+            else {
+                /* next last-block bit is in next unused byte */
+                if (strm.avail_in == 0) {
+                    /* don't have that byte yet -- get it */
+                    fwrite(start, 1, strm.next_in - start, out);
+                    start = in->buf;
+                    in->left = 0;
+                    zpull(&strm, in);
+                }
+                last = strm.next_in[0] & 1;
+                if (last && clr)
+                    strm.next_in[0] &= ~1;
+            }
+        }
+    }
+
+    /* update buffer with unused input */
+    in->left = strm.avail_in;
+    in->next = strm.next_in;
+
+    /* copy used input, write empty blocks to get to byte boundary */
+    pos = strm.data_type & 7;
+    fwrite(start, 1, in->next - start - 1, out);
+    last = in->next[-1];
+    if (pos == 0 || !clr)
+        /* already at byte boundary, or last file: write last byte */
+        putc(last, out);
+    else {
+        /* append empty blocks to last byte */
+        last &= ((0x100 >> pos) - 1);       /* assure unused bits are zero */
+        if (pos & 1) {
+            /* odd -- append an empty stored block */
+            putc(last, out);
+            if (pos == 1)
+                putc(0, out);               /* two more bits in block header */
+            fwrite("\0\0\xff\xff", 1, 4, out);
+        }
+        else {
+            /* even -- append 1, 2, or 3 empty fixed blocks */
+            switch (pos) {
+            case 6:
+                putc(last | 8, out);
+                last = 0;
+            case 4:
+                putc(last | 0x20, out);
+                last = 0;
+            case 2:
+                putc(last | 0x80, out);
+                putc(0, out);
+            }
+        }
+    }
+
+    /* update crc and tot */
+    *crc = crc32_combine(*crc, bget4(in), len);
+    *tot += (unsigned long)len;
+
+    /* clean up */
+    inflateEnd(&strm);
+    free(junk);
+    bclose(in);
+
+    /* write trailer if this is the last gzip file */
+    if (!clr) {
+        put4(*crc, out);
+        put4(*tot, out);
+    }
+}
+
+/* join the gzip files on the command line, write result to stdout */
+int main(int argc, char **argv)
+{
+    unsigned long crc, tot;     /* running crc and total uncompressed length */
+
+    /* skip command name */
+    argc--;
+    argv++;
+
+    /* show usage if no arguments */
+    if (argc == 0) {
+        fputs("gzjoin usage: gzjoin f1.gz [f2.gz [f3.gz ...]] > fjoin.gz\n",
+              stderr);
+        return 0;
+    }
+
+    /* join gzip files on command line and write to stdout */
+    gzinit(&crc, &tot, stdout);
+    while (argc--)
+        gzcopy(*argv++, argc, &crc, &tot, stdout);
+
+    /* done */
+    return 0;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gzlog.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gzlog.c
new file mode 100644
index 00000000..d70aacab
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gzlog.c
@@ -0,0 +1,1058 @@
+/*
+ * gzlog.c
+ * Copyright (C) 2004, 2008 Mark Adler, all rights reserved
+ * For conditions of distribution and use, see copyright notice in gzlog.h
+ * version 2.0, 25 Apr 2008
+ */
+
+/*
+   gzlog provides a mechanism for frequently appending short strings to a gzip
+   file that is efficient both in execution time and compression ratio.  The
+   strategy is to write the short strings in an uncompressed form to the end of
+   the gzip file, only compressing when the amount of uncompressed data has
+   reached a given threshold.
+
+   gzlog also provides protection against interruptions in the process due to
+   system crashes.  The status of the operation is recorded in an extra field
+   in the gzip file, and is only updated once the gzip file is brought to a
+   valid state.  The last data to be appended or compressed is saved in an
+   auxiliary file, so that if the operation is interrupted, it can be completed
+   the next time an append operation is attempted.
+
+   gzlog maintains another auxiliary file with the last 32K of data from the
+   compressed portion, which is preloaded for the compression of the subsequent
+   data.  This minimizes the impact to the compression ratio of appending.
+ */
+
+/*
+   Operations Concept:
+
+   Files (log name "foo"):
+   foo.gz -- gzip file with the complete log
+   foo.add -- last message to append or last data to compress
+   foo.dict -- dictionary of the last 32K of data for next compression
+   foo.temp -- temporary dictionary file for compression after this one
+   foo.lock -- lock file for reading and writing the other files
+   foo.repairs -- log file for log file recovery operations (not compressed)
+
+   gzip file structure:
+   - fixed-length (no file name) header with extra field (see below)
+   - compressed data ending initially with empty stored block
+   - uncompressed data filling out originally empty stored block and
+     subsequent stored blocks as needed (16K max each)
+   - gzip trailer
+   - no junk at end (no other gzip streams)
+
+   When appending data, the information in the first three items above plus the
+   foo.add file are sufficient to recover an interrupted append operation.  The
+   extra field has the necessary information to restore the start of the last
+   stored block and determine where to append the data in the foo.add file, as
+   well as the crc and length of the gzip data before the append operation.
+
+   The foo.add file is created before the gzip file is marked for append, and
+   deleted after the gzip file is marked as complete.  So if the append
+   operation is interrupted, the data to add will still be there.  If due to
+   some external force, the foo.add file gets deleted between when the append
+   operation was interrupted and when recovery is attempted, the gzip file will
+   still be restored, but without the appended data.
+
+   When compressing data, the information in the first two items above plus the
+   foo.add file are sufficient to recover an interrupted compress operation.
+   The extra field has the necessary information to find the end of the
+   compressed data, and contains both the crc and length of just the compressed
+   data and of the complete set of data including the contents of the foo.add
+   file.
+
+   Again, the foo.add file is maintained during the compress operation in case
+   of an interruption.  If in the unlikely event the foo.add file with the data
+   to be compressed is missing due to some external force, a gzip file with
+   just the previous compressed data will be reconstructed.  In this case, all
+   of the data that was to be compressed is lost (approximately one megabyte).
+   This will not occur if all that happened was an interruption of the compress
+   operation.
+
+   The third state that is marked is the replacement of the old dictionary with
+   the new dictionary after a compress operation.  Once compression is
+   complete, the gzip file is marked as being in the replace state.  This
+   completes the gzip file, so an interrupt after being so marked does not
+   result in recompression.  Then the dictionary file is replaced, and the gzip
+   file is marked as completed.  This state prevents the possibility of
+   restarting compression with the wrong dictionary file.
+
+   All three operations are wrapped by a lock/unlock procedure.  In order to
+   gain exclusive access to the log files, first a foo.lock file must be
+   exclusively created.  When all operations are complete, the lock is
+   released by deleting the foo.lock file.  If when attempting to create the
+   lock file, it already exists and the modify time of the lock file is more
+   than five minutes old (set by the PATIENCE define below), then the old
+   lock file is considered stale and deleted, and the exclusive creation of
+   the lock file is retried.  To assure that there are no false assessments
+   of the staleness of the lock file, the operations periodically touch the
+   lock file to update the modified date.
+
+   Following is the definition of the extra field with all of the information
+   required to enable the above append and compress operations and their
+   recovery if interrupted.  Multi-byte values are stored little endian
+   (consistent with the gzip format).  File pointers are eight bytes long.
+   The crc's and lengths for the gzip trailer are four bytes long.  (Note that
+   the length at the end of a gzip file is used for error checking only, and
+   for large files is actually the length modulo 2^32.)  The stored block
+   length is two bytes long.  The gzip extra field two-byte identification is
+   "ap" for append.  It is assumed that writing the extra field to the file is
+   an "atomic" operation.  That is, either all of the extra field is written
+   to the file, or none of it is, if the operation is interrupted right at the
+   point of updating the extra field.  This is a reasonable assumption, since
+   the extra field is within the first 52 bytes of the file, which is smaller
+   than any expected block size for a mass storage device (usually 512 bytes or
+   larger).
+
+   Extra field (35 bytes):
+   - Pointer to first stored block length -- this points to the two-byte length
+     of the first stored block, which is followed by the two-byte, one's
+     complement of that length.  The stored block length is preceded by the
+     three-bit header of the stored block, which is the actual start of the
+     stored block in the deflate format.  See the bit offset field below.
+   - Pointer to the last stored block length.  This is the same as above, but
+     for the last stored block of the uncompressed data in the gzip file.
+     Initially this is the same as the first stored block length pointer.
+     When the stored block gets to 16K (see the MAX_STORE define), then a new
+     stored block as added, at which point the last stored block length pointer
+     is different from the first stored block length pointer.  When they are
+     different, the first bit of the last stored block header is eight bits, or
+     one byte back from the block length.
+   - Compressed data crc and length.  This is the crc and length of the data
+     that is in the compressed portion of the deflate stream.  These are used
+     only in the event that the foo.add file containing the data to compress is
+     lost after a compress operation is interrupted.
+   - Total data crc and length.  This is the crc and length of all of the data
+     stored in the gzip file, compressed and uncompressed.  It is used to
+     reconstruct the gzip trailer when compressing, as well as when recovering
+     interrupted operations.
+   - Final stored block length.  This is used to quickly find where to append,
+     and allows the restoration of the original final stored block state when
+     an append operation is interrupted.
+   - First stored block start as the number of bits back from the final stored
+     block first length byte.  This value is in the range of 3..10, and is
+     stored as the low three bits of the final byte of the extra field after
+     subtracting three (0..7).  This allows the last-block bit of the stored
+     block header to be updated when a new stored block is added, for the case
+     when the first stored block and the last stored block are the same.  (When
+     they are different, the numbers of bits back is known to be eight.)  This
+     also allows for new compressed data to be appended to the old compressed
+     data in the compress operation, overwriting the previous first stored
+     block, or for the compressed data to be terminated and a valid gzip file
+     reconstructed on the off chance that a compression operation was
+     interrupted and the data to compress in the foo.add file was deleted.
+   - The operation in process.  This is the next two bits in the last byte (the
+     bits under the mask 0x18).  The are interpreted as 0: nothing in process,
+     1: append in process, 2: compress in process, 3: replace in process.
+   - The top three bits of the last byte in the extra field are reserved and
+     are currently set to zero.
+
+   Main procedure:
+   - Exclusively create the foo.lock file using the O_CREAT and O_EXCL modes of
+     the system open() call.  If the modify time of an existing lock file is
+     more than PATIENCE seconds old, then the lock file is deleted and the
+     exclusive create is retried.
+   - Load the extra field from the foo.gz file, and see if an operation was in
+     progress but not completed.  If so, apply the recovery procedure below.
+   - Perform the append procedure with the provided data.
+   - If the uncompressed data in the foo.gz file is 1MB or more, apply the
+     compress procedure.
+   - Delete the foo.lock file.
+
+   Append procedure:
+   - Put what to append in the foo.add file so that the operation can be
+     restarted if this procedure is interrupted.
+   - Mark the foo.gz extra field with the append operation in progress.
+   + Restore the original last-block bit and stored block length of the last
+     stored block from the information in the extra field, in case a previous
+     append operation was interrupted.
+   - Append the provided data to the last stored block, creating new stored
+     blocks as needed and updating the stored blocks last-block bits and
+     lengths.
+   - Update the crc and length with the new data, and write the gzip trailer.
+   - Write over the extra field (with a single write operation) with the new
+     pointers, lengths, and crc's, and mark the gzip file as not in process.
+     Though there is still a foo.add file, it will be ignored since nothing
+     is in process.  If a foo.add file is leftover from a previously
+     completed operation, it is truncated when writing new data to it.
+   - Delete the foo.add file.
+
+   Compress and replace procedures:
+   - Read all of the uncompressed data in the stored blocks in foo.gz and write
+     it to foo.add.  Also write foo.temp with the last 32K of that data to
+     provide a dictionary for the next invocation of this procedure.
+   - Rewrite the extra field marking foo.gz with a compression in process.
+   * If there is no data provided to compress (due to a missing foo.add file
+     when recovering), reconstruct and truncate the foo.gz file to contain
+     only the previous compressed data and proceed to the step after the next
+     one.  Otherwise ...
+   - Compress the data with the dictionary in foo.dict, and write to the
+     foo.gz file starting at the bit immediately following the last previously
+     compressed block.  If there is no foo.dict, proceed anyway with the
+     compression at slightly reduced efficiency.  (For the foo.dict file to be
+     missing requires some external failure beyond simply the interruption of
+     a compress operation.)  During this process, the foo.lock file is
+     periodically touched to assure that that file is not considered stale by
+     another process before we're done.  The deflation is terminated with a
+     non-last empty static block (10 bits long), that is then located and
+     written over by a last-bit-set empty stored block.
+   - Append the crc and length of the data in the gzip file (previously
+     calculated during the append operations).
+   - Write over the extra field with the updated stored block offsets, bits
+     back, crc's, and lengths, and mark foo.gz as in process for a replacement
+     of the dictionary.
+   @ Delete the foo.add file.
+   - Replace foo.dict with foo.temp.
+   - Write over the extra field, marking foo.gz as complete.
+
+   Recovery procedure:
+   - If not a replace recovery, read in the foo.add file, and provide that data
+     to the appropriate recovery below.  If there is no foo.add file, provide
+     a zero data length to the recovery.  In that case, the append recovery
+     restores the foo.gz to the previous compressed + uncompressed data state.
+     For the the compress recovery, a missing foo.add file results in foo.gz
+     being restored to the previous compressed-only data state.
+   - Append recovery:
+     - Pick up append at + step above
+   - Compress recovery:
+     - Pick up compress at * step above
+   - Replace recovery:
+     - Pick up compress at @ step above
+   - Log the repair with a date stamp in foo.repairs
+ */
+
+#include <sys/types.h>
+#include <stdio.h>      /* rename, fopen, fprintf, fclose */
+#include <stdlib.h>     /* malloc, free */
+#include <string.h>     /* strlen, strrchr, strcpy, strncpy, strcmp */
+#include <fcntl.h>      /* open */
+#include <unistd.h>     /* lseek, read, write, close, unlink, sleep, */
+                        /* ftruncate, fsync */
+#include <errno.h>      /* errno */
+#include <time.h>       /* time, ctime */
+#include <sys/stat.h>   /* stat */
+#include <sys/time.h>   /* utimes */
+#include "zlib.h"       /* crc32 */
+
+#include "gzlog.h"      /* header for external access */
+
+#define local static
+typedef unsigned int uint;
+typedef unsigned long ulong;
+
+/* Macro for debugging to deterministically force recovery operations */
+#ifdef DEBUG
+    #include <setjmp.h>         /* longjmp */
+    jmp_buf gzlog_jump;         /* where to go back to */
+    int gzlog_bail = 0;         /* which point to bail at (1..8) */
+    int gzlog_count = -1;       /* number of times through to wait */
+#   define BAIL(n) do { if (n == gzlog_bail && gzlog_count-- == 0) \
+                            longjmp(gzlog_jump, gzlog_bail); } while (0)
+#else
+#   define BAIL(n)
+#endif
+
+/* how old the lock file can be in seconds before considering it stale */
+#define PATIENCE 300
+
+/* maximum stored block size in Kbytes -- must be in 1..63 */
+#define MAX_STORE 16
+
+/* number of stored Kbytes to trigger compression (must be >= 32 to allow
+   dictionary construction, and <= 204 * MAX_STORE, in order for >> 10 to
+   discard the stored block headers contribution of five bytes each) */
+#define TRIGGER 1024
+
+/* size of a deflate dictionary (this cannot be changed) */
+#define DICT 32768U
+
+/* values for the operation (2 bits) */
+#define NO_OP 0
+#define APPEND_OP 1
+#define COMPRESS_OP 2
+#define REPLACE_OP 3
+
+/* macros to extract little-endian integers from an unsigned byte buffer */
+#define PULL2(p) ((p)[0]+((uint)((p)[1])<<8))
+#define PULL4(p) (PULL2(p)+((ulong)PULL2(p+2)<<16))
+#define PULL8(p) (PULL4(p)+((off_t)PULL4(p+4)<<32))
+
+/* macros to store integers into a byte buffer in little-endian order */
+#define PUT2(p,a) do {(p)[0]=a;(p)[1]=(a)>>8;} while(0)
+#define PUT4(p,a) do {PUT2(p,a);PUT2(p+2,a>>16);} while(0)
+#define PUT8(p,a) do {PUT4(p,a);PUT4(p+4,a>>32);} while(0)
+
+/* internal structure for log information */
+#define LOGID "\106\035\172"    /* should be three non-zero characters */
+struct log {
+    char id[4];     /* contains LOGID to detect inadvertent overwrites */
+    int fd;         /* file descriptor for .gz file, opened read/write */
+    char *path;     /* allocated path, e.g. "/var/log/foo" or "foo" */
+    char *end;      /* end of path, for appending suffices such as ".gz" */
+    off_t first;    /* offset of first stored block first length byte */
+    int back;       /* location of first block id in bits back from first */
+    uint stored;    /* bytes currently in last stored block */
+    off_t last;     /* offset of last stored block first length byte */
+    ulong ccrc;     /* crc of compressed data */
+    ulong clen;     /* length (modulo 2^32) of compressed data */
+    ulong tcrc;     /* crc of total data */
+    ulong tlen;     /* length (modulo 2^32) of total data */
+    time_t lock;    /* last modify time of our lock file */
+};
+
+/* gzip header for gzlog */
+local unsigned char log_gzhead[] = {
+    0x1f, 0x8b,                 /* magic gzip id */
+    8,                          /* compression method is deflate */
+    4,                          /* there is an extra field (no file name) */
+    0, 0, 0, 0,                 /* no modification time provided */
+    0, 0xff,                    /* no extra flags, no OS specified */
+    39, 0, 'a', 'p', 35, 0      /* extra field with "ap" subfield */
+                                /* 35 is EXTRA, 39 is EXTRA + 4 */
+};
+
+#define HEAD sizeof(log_gzhead)     /* should be 16 */
+
+/* initial gzip extra field content (52 == HEAD + EXTRA + 1) */
+local unsigned char log_gzext[] = {
+    52, 0, 0, 0, 0, 0, 0, 0,    /* offset of first stored block length */
+    52, 0, 0, 0, 0, 0, 0, 0,    /* offset of last stored block length */
+    0, 0, 0, 0, 0, 0, 0, 0,     /* compressed data crc and length */
+    0, 0, 0, 0, 0, 0, 0, 0,     /* total data crc and length */
+    0, 0,                       /* final stored block data length */
+    5                           /* op is NO_OP, last bit 8 bits back */
+};
+
+#define EXTRA sizeof(log_gzext)     /* should be 35 */
+
+/* initial gzip data and trailer */
+local unsigned char log_gzbody[] = {
+    1, 0, 0, 0xff, 0xff,        /* empty stored block (last) */
+    0, 0, 0, 0,                 /* crc */
+    0, 0, 0, 0                  /* uncompressed length */
+};
+
+#define BODY sizeof(log_gzbody)
+
+/* Exclusively create foo.lock in order to negotiate exclusive access to the
+   foo.* files.  If the modify time of an existing lock file is greater than
+   PATIENCE seconds in the past, then consider the lock file to have been
+   abandoned, delete it, and try the exclusive create again.  Save the lock
+   file modify time for verification of ownership.  Return 0 on success, or -1
+   on failure, usually due to an access restriction or invalid path.  Note that
+   if stat() or unlink() fails, it may be due to another process noticing the
+   abandoned lock file a smidge sooner and deleting it, so those are not
+   flagged as an error. */
+local int log_lock(struct log *log)
+{
+    int fd;
+    struct stat st;
+
+    strcpy(log->end, ".lock");
+    while ((fd = open(log->path, O_CREAT | O_EXCL, 0644)) < 0) {
+        if (errno != EEXIST)
+            return -1;
+        if (stat(log->path, &st) == 0 && time(NULL) - st.st_mtime > PATIENCE) {
+            unlink(log->path);
+            continue;
+        }
+        sleep(2);       /* relinquish the CPU for two seconds while waiting */
+    }
+    close(fd);
+    if (stat(log->path, &st) == 0)
+        log->lock = st.st_mtime;
+    return 0;
+}
+
+/* Update the modify time of the lock file to now, in order to prevent another
+   task from thinking that the lock is stale.  Save the lock file modify time
+   for verification of ownership. */
+local void log_touch(struct log *log)
+{
+    struct stat st;
+
+    strcpy(log->end, ".lock");
+    utimes(log->path, NULL);
+    if (stat(log->path, &st) == 0)
+        log->lock = st.st_mtime;
+}
+
+/* Check the log file modify time against what is expected.  Return true if
+   this is not our lock.  If it is our lock, touch it to keep it. */
+local int log_check(struct log *log)
+{
+    struct stat st;
+
+    strcpy(log->end, ".lock");
+    if (stat(log->path, &st) || st.st_mtime != log->lock)
+        return 1;
+    log_touch(log);
+    return 0;
+}
+
+/* Unlock a previously acquired lock, but only if it's ours. */
+local void log_unlock(struct log *log)
+{
+    if (log_check(log))
+        return;
+    strcpy(log->end, ".lock");
+    unlink(log->path);
+    log->lock = 0;
+}
+
+/* Check the gzip header and read in the extra field, filling in the values in
+   the log structure.  Return op on success or -1 if the gzip header was not as
+   expected.  op is the current operation in progress last written to the extra
+   field.  This assumes that the gzip file has already been opened, with the
+   file descriptor log->fd. */
+local int log_head(struct log *log)
+{
+    int op;
+    unsigned char buf[HEAD + EXTRA];
+
+    if (lseek(log->fd, 0, SEEK_SET) < 0 ||
+        read(log->fd, buf, HEAD + EXTRA) != HEAD + EXTRA ||
+        memcmp(buf, log_gzhead, HEAD)) {
+        return -1;
+    }
+    log->first = PULL8(buf + HEAD);
+    log->last = PULL8(buf + HEAD + 8);
+    log->ccrc = PULL4(buf + HEAD + 16);
+    log->clen = PULL4(buf + HEAD + 20);
+    log->tcrc = PULL4(buf + HEAD + 24);
+    log->tlen = PULL4(buf + HEAD + 28);
+    log->stored = PULL2(buf + HEAD + 32);
+    log->back = 3 + (buf[HEAD + 34] & 7);
+    op = (buf[HEAD + 34] >> 3) & 3;
+    return op;
+}
+
+/* Write over the extra field contents, marking the operation as op.  Use fsync
+   to assure that the device is written to, and in the requested order.  This
+   operation, and only this operation, is assumed to be atomic in order to
+   assure that the log is recoverable in the event of an interruption at any
+   point in the process.  Return -1 if the write to foo.gz failed. */
+local int log_mark(struct log *log, int op)
+{
+    int ret;
+    unsigned char ext[EXTRA];
+
+    PUT8(ext, log->first);
+    PUT8(ext + 8, log->last);
+    PUT4(ext + 16, log->ccrc);
+    PUT4(ext + 20, log->clen);
+    PUT4(ext + 24, log->tcrc);
+    PUT4(ext + 28, log->tlen);
+    PUT2(ext + 32, log->stored);
+    ext[34] = log->back - 3 + (op << 3);
+    fsync(log->fd);
+    ret = lseek(log->fd, HEAD, SEEK_SET) < 0 ||
+          write(log->fd, ext, EXTRA) != EXTRA ? -1 : 0;
+    fsync(log->fd);
+    return ret;
+}
+
+/* Rewrite the last block header bits and subsequent zero bits to get to a byte
+   boundary, setting the last block bit if last is true, and then write the
+   remainder of the stored block header (length and one's complement).  Leave
+   the file pointer after the end of the last stored block data.  Return -1 if
+   there is a read or write failure on the foo.gz file */
+local int log_last(struct log *log, int last)
+{
+    int back, len, mask;
+    unsigned char buf[6];
+
+    /* determine the locations of the bytes and bits to modify */
+    back = log->last == log->first ? log->back : 8;
+    len = back > 8 ? 2 : 1;                 /* bytes back from log->last */
+    mask = 0x80 >> ((back - 1) & 7);        /* mask for block last-bit */
+
+    /* get the byte to modify (one or two back) into buf[0] -- don't need to
+       read the byte if the last-bit is eight bits back, since in that case
+       the entire byte will be modified */
+    buf[0] = 0;
+    if (back != 8 && (lseek(log->fd, log->last - len, SEEK_SET) < 0 ||
+                      read(log->fd, buf, 1) != 1))
+        return -1;
+
+    /* change the last-bit of the last stored block as requested -- note
+       that all bits above the last-bit are set to zero, per the type bits
+       of a stored block being 00 and per the convention that the bits to
+       bring the stream to a byte boundary are also zeros */
+    buf[1] = 0;
+    buf[2 - len] = (*buf & (mask - 1)) + (last ? mask : 0);
+
+    /* write the modified stored block header and lengths, move the file
+       pointer to after the last stored block data */
+    PUT2(buf + 2, log->stored);
+    PUT2(buf + 4, log->stored ^ 0xffff);
+    return lseek(log->fd, log->last - len, SEEK_SET) < 0 ||
+           write(log->fd, buf + 2 - len, len + 4) != len + 4 ||
+           lseek(log->fd, log->stored, SEEK_CUR) < 0 ? -1 : 0;
+}
+
+/* Append len bytes from data to the locked and open log file.  len may be zero
+   if recovering and no .add file was found.  In that case, the previous state
+   of the foo.gz file is restored.  The data is appended uncompressed in
+   deflate stored blocks.  Return -1 if there was an error reading or writing
+   the foo.gz file. */
+local int log_append(struct log *log, unsigned char *data, size_t len)
+{
+    uint put;
+    off_t end;
+    unsigned char buf[8];
+
+    /* set the last block last-bit and length, in case recovering an
+       interrupted append, then position the file pointer to append to the
+       block */
+    if (log_last(log, 1))
+        return -1;
+
+    /* append, adding stored blocks and updating the offset of the last stored
+       block as needed, and update the total crc and length */
+    while (len) {
+        /* append as much as we can to the last block */
+        put = (MAX_STORE << 10) - log->stored;
+        if (put > len)
+            put = (uint)len;
+        if (put) {
+            if (write(log->fd, data, put) != put)
+                return -1;
+            BAIL(1);
+            log->tcrc = crc32(log->tcrc, data, put);
+            log->tlen += put;
+            log->stored += put;
+            data += put;
+            len -= put;
+        }
+
+        /* if we need to, add a new empty stored block */
+        if (len) {
+            /* mark current block as not last */
+            if (log_last(log, 0))
+                return -1;
+
+            /* point to new, empty stored block */
+            log->last += 4 + log->stored + 1;
+            log->stored = 0;
+        }
+
+        /* mark last block as last, update its length */
+        if (log_last(log, 1))
+            return -1;
+        BAIL(2);
+    }
+
+    /* write the new crc and length trailer, and truncate just in case (could
+       be recovering from partial append with a missing foo.add file) */
+    PUT4(buf, log->tcrc);
+    PUT4(buf + 4, log->tlen);
+    if (write(log->fd, buf, 8) != 8 ||
+        (end = lseek(log->fd, 0, SEEK_CUR)) < 0 || ftruncate(log->fd, end))
+        return -1;
+
+    /* write the extra field, marking the log file as done, delete .add file */
+    if (log_mark(log, NO_OP))
+        return -1;
+    strcpy(log->end, ".add");
+    unlink(log->path);          /* ignore error, since may not exist */
+    return 0;
+}
+
+/* Replace the foo.dict file with the foo.temp file.  Also delete the foo.add
+   file, since the compress operation may have been interrupted before that was
+   done.  Returns 1 if memory could not be allocated, or -1 if reading or
+   writing foo.gz fails, or if the rename fails for some reason other than
+   foo.temp not existing.  foo.temp not existing is a permitted error, since
+   the replace operation may have been interrupted after the rename is done,
+   but before foo.gz is marked as complete. */
+local int log_replace(struct log *log)
+{
+    int ret;
+    char *dest;
+
+    /* delete foo.add file */
+    strcpy(log->end, ".add");
+    unlink(log->path);         /* ignore error, since may not exist */
+    BAIL(3);
+
+    /* rename foo.name to foo.dict, replacing foo.dict if it exists */
+    strcpy(log->end, ".dict");
+    dest = malloc(strlen(log->path) + 1);
+    if (dest == NULL)
+        return -2;
+    strcpy(dest, log->path);
+    strcpy(log->end, ".temp");
+    ret = rename(log->path, dest);
+    free(dest);
+    if (ret && errno != ENOENT)
+        return -1;
+    BAIL(4);
+
+    /* mark the foo.gz file as done */
+    return log_mark(log, NO_OP);
+}
+
+/* Compress the len bytes at data and append the compressed data to the
+   foo.gz deflate data immediately after the previous compressed data.  This
+   overwrites the previous uncompressed data, which was stored in foo.add
+   and is the data provided in data[0..len-1].  If this operation is
+   interrupted, it picks up at the start of this routine, with the foo.add
+   file read in again.  If there is no data to compress (len == 0), then we
+   simply terminate the foo.gz file after the previously compressed data,
+   appending a final empty stored block and the gzip trailer.  Return -1 if
+   reading or writing the log.gz file failed, or -2 if there was a memory
+   allocation failure. */
+local int log_compress(struct log *log, unsigned char *data, size_t len)
+{
+    int fd;
+    uint got, max;
+    ssize_t dict;
+    off_t end;
+    z_stream strm;
+    unsigned char buf[DICT];
+
+    /* compress and append compressed data */
+    if (len) {
+        /* set up for deflate, allocating memory */
+        strm.zalloc = Z_NULL;
+        strm.zfree = Z_NULL;
+        strm.opaque = Z_NULL;
+        if (deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, -15, 8,
+                         Z_DEFAULT_STRATEGY) != Z_OK)
+            return -2;
+
+        /* read in dictionary (last 32K of data that was compressed) */
+        strcpy(log->end, ".dict");
+        fd = open(log->path, O_RDONLY, 0);
+        if (fd >= 0) {
+            dict = read(fd, buf, DICT);
+            close(fd);
+            if (dict < 0) {
+                deflateEnd(&strm);
+                return -1;
+            }
+            if (dict)
+                deflateSetDictionary(&strm, buf, (uint)dict);
+        }
+        log_touch(log);
+
+        /* prime deflate with last bits of previous block, position write
+           pointer to write those bits and overwrite what follows */
+        if (lseek(log->fd, log->first - (log->back > 8 ? 2 : 1),
+                SEEK_SET) < 0 ||
+            read(log->fd, buf, 1) != 1 || lseek(log->fd, -1, SEEK_CUR) < 0) {
+            deflateEnd(&strm);
+            return -1;
+        }
+        deflatePrime(&strm, (8 - log->back) & 7, *buf);
+
+        /* compress, finishing with a partial non-last empty static block */
+        strm.next_in = data;
+        max = (((uint)0 - 1) >> 1) + 1; /* in case int smaller than size_t */
+        do {
+            strm.avail_in = len > max ? max : (uint)len;
+            len -= strm.avail_in;
+            do {
+                strm.avail_out = DICT;
+                strm.next_out = buf;
+                deflate(&strm, len ? Z_NO_FLUSH : Z_PARTIAL_FLUSH);
+                got = DICT - strm.avail_out;
+                if (got && write(log->fd, buf, got) != got) {
+                    deflateEnd(&strm);
+                    return -1;
+                }
+                log_touch(log);
+            } while (strm.avail_out == 0);
+        } while (len);
+        deflateEnd(&strm);
+        BAIL(5);
+
+        /* find start of empty static block -- scanning backwards the first one
+           bit is the second bit of the block, if the last byte is zero, then
+           we know the byte before that has a one in the top bit, since an
+           empty static block is ten bits long */
+        if ((log->first = lseek(log->fd, -1, SEEK_CUR)) < 0 ||
+            read(log->fd, buf, 1) != 1)
+            return -1;
+        log->first++;
+        if (*buf) {
+            log->back = 1;
+            while ((*buf & ((uint)1 << (8 - log->back++))) == 0)
+                ;       /* guaranteed to terminate, since *buf != 0 */
+        }
+        else
+            log->back = 10;
+
+        /* update compressed crc and length */
+        log->ccrc = log->tcrc;
+        log->clen = log->tlen;
+    }
+    else {
+        /* no data to compress -- fix up existing gzip stream */
+        log->tcrc = log->ccrc;
+        log->tlen = log->clen;
+    }
+
+    /* complete and truncate gzip stream */
+    log->last = log->first;
+    log->stored = 0;
+    PUT4(buf, log->tcrc);
+    PUT4(buf + 4, log->tlen);
+    if (log_last(log, 1) || write(log->fd, buf, 8) != 8 ||
+        (end = lseek(log->fd, 0, SEEK_CUR)) < 0 || ftruncate(log->fd, end))
+        return -1;
+    BAIL(6);
+
+    /* mark as being in the replace operation */
+    if (log_mark(log, REPLACE_OP))
+        return -1;
+
+    /* execute the replace operation and mark the file as done */
+    return log_replace(log);
+}
+
+/* log a repair record to the .repairs file */
+local void log_log(struct log *log, int op, char *record)
+{
+    time_t now;
+    FILE *rec;
+
+    now = time(NULL);
+    strcpy(log->end, ".repairs");
+    rec = fopen(log->path, "a");
+    if (rec == NULL)
+        return;
+    fprintf(rec, "%.24s %s recovery: %s\n", ctime(&now), op == APPEND_OP ?
+            "append" : (op == COMPRESS_OP ? "compress" : "replace"), record);
+    fclose(rec);
+    return;
+}
+
+/* Recover the interrupted operation op.  First read foo.add for recovering an
+   append or compress operation.  Return -1 if there was an error reading or
+   writing foo.gz or reading an existing foo.add, or -2 if there was a memory
+   allocation failure. */
+local int log_recover(struct log *log, int op)
+{
+    int fd, ret = 0;
+    unsigned char *data = NULL;
+    size_t len = 0;
+    struct stat st;
+
+    /* log recovery */
+    log_log(log, op, "start");
+
+    /* load foo.add file if expected and present */
+    if (op == APPEND_OP || op == COMPRESS_OP) {
+        strcpy(log->end, ".add");
+        if (stat(log->path, &st) == 0 && st.st_size) {
+            len = (size_t)(st.st_size);
+            if (len != st.st_size || (data = malloc(st.st_size)) == NULL) {
+                log_log(log, op, "allocation failure");
+                return -2;
+            }
+            if ((fd = open(log->path, O_RDONLY, 0)) < 0) {
+                log_log(log, op, ".add file read failure");
+                return -1;
+            }
+            ret = read(fd, data, len) != len;
+            close(fd);
+            if (ret) {
+                log_log(log, op, ".add file read failure");
+                return -1;
+            }
+            log_log(log, op, "loaded .add file");
+        }
+        else
+            log_log(log, op, "missing .add file!");
+    }
+
+    /* recover the interrupted operation */
+    switch (op) {
+    case APPEND_OP:
+        ret = log_append(log, data, len);
+        break;
+    case COMPRESS_OP:
+        ret = log_compress(log, data, len);
+        break;
+    case REPLACE_OP:
+        ret = log_replace(log);
+    }
+
+    /* log status */
+    log_log(log, op, ret ? "failure" : "complete");
+
+    /* clean up */
+    if (data != NULL)
+        free(data);
+    return ret;
+}
+
+/* Close the foo.gz file (if open) and release the lock. */
+local void log_close(struct log *log)
+{
+    if (log->fd >= 0)
+        close(log->fd);
+    log->fd = -1;
+    log_unlock(log);
+}
+
+/* Open foo.gz, verify the header, and load the extra field contents, after
+   first creating the foo.lock file to gain exclusive access to the foo.*
+   files.  If foo.gz does not exist or is empty, then write the initial header,
+   extra, and body content of an empty foo.gz log file.  If there is an error
+   creating the lock file due to access restrictions, or an error reading or
+   writing the foo.gz file, or if the foo.gz file is not a proper log file for
+   this object (e.g. not a gzip file or does not contain the expected extra
+   field), then return true.  If there is an error, the lock is released.
+   Otherwise, the lock is left in place. */
+local int log_open(struct log *log)
+{
+    int op;
+
+    /* release open file resource if left over -- can occur if lock lost
+       between gzlog_open() and gzlog_write() */
+    if (log->fd >= 0)
+        close(log->fd);
+    log->fd = -1;
+
+    /* negotiate exclusive access */
+    if (log_lock(log) < 0)
+        return -1;
+
+    /* open the log file, foo.gz */
+    strcpy(log->end, ".gz");
+    log->fd = open(log->path, O_RDWR | O_CREAT, 0644);
+    if (log->fd < 0) {
+        log_close(log);
+        return -1;
+    }
+
+    /* if new, initialize foo.gz with an empty log, delete old dictionary */
+    if (lseek(log->fd, 0, SEEK_END) == 0) {
+        if (write(log->fd, log_gzhead, HEAD) != HEAD ||
+            write(log->fd, log_gzext, EXTRA) != EXTRA ||
+            write(log->fd, log_gzbody, BODY) != BODY) {
+            log_close(log);
+            return -1;
+        }
+        strcpy(log->end, ".dict");
+        unlink(log->path);
+    }
+
+    /* verify log file and load extra field information */
+    if ((op = log_head(log)) < 0) {
+        log_close(log);
+        return -1;
+    }
+
+    /* check for interrupted process and if so, recover */
+    if (op != NO_OP && log_recover(log, op)) {
+        log_close(log);
+        return -1;
+    }
+
+    /* touch the lock file to prevent another process from grabbing it */
+    log_touch(log);
+    return 0;
+}
+
+/* See gzlog.h for the description of the external methods below */
+gzlog *gzlog_open(char *path)
+{
+    size_t n;
+    struct log *log;
+
+    /* check arguments */
+    if (path == NULL || *path == 0)
+        return NULL;
+
+    /* allocate and initialize log structure */
+    log = malloc(sizeof(struct log));
+    if (log == NULL)
+        return NULL;
+    strcpy(log->id, LOGID);
+    log->fd = -1;
+
+    /* save path and end of path for name construction */
+    n = strlen(path);
+    log->path = malloc(n + 9);              /* allow for ".repairs" */
+    if (log->path == NULL) {
+        free(log);
+        return NULL;
+    }
+    strcpy(log->path, path);
+    log->end = log->path + n;
+
+    /* gain exclusive access and verify log file -- may perform a
+       recovery operation if needed */
+    if (log_open(log)) {
+        free(log->path);
+        free(log);
+        return NULL;
+    }
+
+    /* return pointer to log structure */
+    return log;
+}
+
+/* gzlog_compress() return values:
+    0: all good
+   -1: file i/o error (usually access issue)
+   -2: memory allocation failure
+   -3: invalid log pointer argument */
+int gzlog_compress(gzlog *logd)
+{
+    int fd, ret;
+    uint block;
+    size_t len, next;
+    unsigned char *data, buf[5];
+    struct log *log = logd;
+
+    /* check arguments */
+    if (log == NULL || strcmp(log->id, LOGID) || len < 0)
+        return -3;
+
+    /* see if we lost the lock -- if so get it again and reload the extra
+       field information (it probably changed), recover last operation if
+       necessary */
+    if (log_check(log) && log_open(log))
+        return -1;
+
+    /* create space for uncompressed data */
+    len = ((size_t)(log->last - log->first) & ~(((size_t)1 << 10) - 1)) +
+          log->stored;
+    if ((data = malloc(len)) == NULL)
+        return -2;
+
+    /* do statement here is just a cheap trick for error handling */
+    do {
+        /* read in the uncompressed data */
+        if (lseek(log->fd, log->first - 1, SEEK_SET) < 0)
+            break;
+        next = 0;
+        while (next < len) {
+            if (read(log->fd, buf, 5) != 5)
+                break;
+            block = PULL2(buf + 1);
+            if (next + block > len ||
+                read(log->fd, (char *)data + next, block) != block)
+                break;
+            next += block;
+        }
+        if (lseek(log->fd, 0, SEEK_CUR) != log->last + 4 + log->stored)
+            break;
+        log_touch(log);
+
+        /* write the uncompressed data to the .add file */
+        strcpy(log->end, ".add");
+        fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+        if (fd < 0)
+            break;
+        ret = write(fd, data, len) != len;
+        if (ret | close(fd))
+            break;
+        log_touch(log);
+
+        /* write the dictionary for the next compress to the .temp file */
+        strcpy(log->end, ".temp");
+        fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+        if (fd < 0)
+            break;
+        next = DICT > len ? len : DICT;
+        ret = write(fd, (char *)data + len - next, next) != next;
+        if (ret | close(fd))
+            break;
+        log_touch(log);
+
+        /* roll back to compressed data, mark the compress in progress */
+        log->last = log->first;
+        log->stored = 0;
+        if (log_mark(log, COMPRESS_OP))
+            break;
+        BAIL(7);
+
+        /* compress and append the data (clears mark) */
+        ret = log_compress(log, data, len);
+        free(data);
+        return ret;
+    } while (0);
+
+    /* broke out of do above on i/o error */
+    free(data);
+    return -1;
+}
+
+/* gzlog_write() return values:
+    0: all good
+   -1: file i/o error (usually access issue)
+   -2: memory allocation failure
+   -3: invalid log pointer argument */
+int gzlog_write(gzlog *logd, void *data, size_t len)
+{
+    int fd, ret;
+    struct log *log = logd;
+
+    /* check arguments */
+    if (log == NULL || strcmp(log->id, LOGID) || len < 0)
+        return -3;
+    if (data == NULL || len == 0)
+        return 0;
+
+    /* see if we lost the lock -- if so get it again and reload the extra
+       field information (it probably changed), recover last operation if
+       necessary */
+    if (log_check(log) && log_open(log))
+        return -1;
+
+    /* create and write .add file */
+    strcpy(log->end, ".add");
+    fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+    if (fd < 0)
+        return -1;
+    ret = write(fd, data, len) != len;
+    if (ret | close(fd))
+        return -1;
+    log_touch(log);
+
+    /* mark log file with append in progress */
+    if (log_mark(log, APPEND_OP))
+        return -1;
+    BAIL(8);
+
+    /* append data (clears mark) */
+    if (log_append(log, data, len))
+        return -1;
+
+    /* check to see if it's time to compress -- if not, then done */
+    if (((log->last - log->first) >> 10) + (log->stored >> 10) < TRIGGER)
+        return 0;
+
+    /* time to compress */
+    return gzlog_compress(log);
+}
+
+/* gzlog_close() return values:
+    0: ok
+   -3: invalid log pointer argument */
+int gzlog_close(gzlog *logd)
+{
+    struct log *log = logd;
+
+    /* check arguments */
+    if (log == NULL || strcmp(log->id, LOGID))
+        return -3;
+
+    /* close the log file and release the lock */
+    log_close(log);
+
+    /* free structure and return */
+    if (log->path != NULL)
+        free(log->path);
+    strcpy(log->id, "bad");
+    free(log);
+    return 0;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gzlog.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gzlog.h
new file mode 100644
index 00000000..c4614267
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/gzlog.h
@@ -0,0 +1,89 @@
+/* gzlog.h
+  Copyright (C) 2004, 2008 Mark Adler, all rights reserved
+  version 2.0, 25 Apr 2008
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the author be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Mark Adler    madler@alumni.caltech.edu
+ */
+
+/* Version History:
+   1.0  26 Nov 2004  First version
+   2.0  25 Apr 2008  Complete redesign for recovery of interrupted operations
+                     Interface changed slightly in that now path is a prefix
+                     Compression now occurs as needed during gzlog_write()
+                     gzlog_write() now always leaves the log file as valid gzip
+ */
+
+/*
+   The gzlog object allows writing short messages to a gzipped log file,
+   opening the log file locked for small bursts, and then closing it.  The log
+   object works by appending stored (uncompressed) data to the gzip file until
+   1 MB has been accumulated.  At that time, the stored data is compressed, and
+   replaces the uncompressed data in the file.  The log file is truncated to
+   its new size at that time.  After each write operation, the log file is a
+   valid gzip file that can decompressed to recover what was written.
+
+   The gzlog operations can be interupted at any point due to an application or
+   system crash, and the log file will be recovered the next time the log is
+   opened with gzlog_open().
+ */
+
+#ifndef GZLOG_H
+#define GZLOG_H
+
+/* gzlog object type */
+typedef void gzlog;
+
+/* Open a gzlog object, creating the log file if it does not exist.  Return
+   NULL on error.  Note that gzlog_open() could take a while to complete if it
+   has to wait to verify that a lock is stale (possibly for five minutes), or
+   if there is significant contention with other instantiations of this object
+   when locking the resource.  path is the prefix of the file names created by
+   this object.  If path is "foo", then the log file will be "foo.gz", and
+   other auxiliary files will be created and destroyed during the process:
+   "foo.dict" for a compression dictionary, "foo.temp" for a temporary (next)
+   dictionary, "foo.add" for data being added or compressed, "foo.lock" for the
+   lock file, and "foo.repairs" to log recovery operations performed due to
+   interrupted gzlog operations.  A gzlog_open() followed by a gzlog_close()
+   will recover a previously interrupted operation, if any. */
+gzlog *gzlog_open(char *path);
+
+/* Write to a gzlog object.  Return zero on success, -1 if there is a file i/o
+   error on any of the gzlog files (this should not happen if gzlog_open()
+   succeeded, unless the device has run out of space or leftover auxiliary
+   files have permissions or ownership that prevent their use), -2 if there is
+   a memory allocation failure, or -3 if the log argument is invalid (e.g. if
+   it was not created by gzlog_open()).  This function will write data to the
+   file uncompressed, until 1 MB has been accumulated, at which time that data
+   will be compressed.  The log file will be a valid gzip file upon successful
+   return. */
+int gzlog_write(gzlog *log, void *data, size_t len);
+
+/* Force compression of any uncompressed data in the log.  This should be used
+   sparingly, if at all.  The main application would be when a log file will
+   not be appended to again.  If this is used to compress frequently while
+   appending, it will both significantly increase the execution time and
+   reduce the compression ratio.  The return codes are the same as for
+   gzlog_write(). */
+int gzlog_compress(gzlog *log);
+
+/* Close a gzlog object.  Return zero on success, -3 if the log argument is
+   invalid.  The log object is freed, and so cannot be referenced again. */
+int gzlog_close(gzlog *log);
+
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/zlib_how.html b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/zlib_how.html
new file mode 100644
index 00000000..444ff1c9
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/zlib_how.html
@@ -0,0 +1,545 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+  "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>zlib Usage Example</title>
+<!--  Copyright (c) 2004, 2005 Mark Adler.  -->
+</head>
+<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#00A000">
+<h2 align="center"> zlib Usage Example </h2>
+We often get questions about how the <tt>deflate()</tt> and <tt>inflate()</tt> functions should be used.
+Users wonder when they should provide more input, when they should use more output,
+what to do with a <tt>Z_BUF_ERROR</tt>, how to make sure the process terminates properly, and
+so on.  So for those who have read <tt>zlib.h</tt> (a few times), and
+would like further edification, below is an annotated example in C of simple routines to compress and decompress
+from an input file to an output file using <tt>deflate()</tt> and <tt>inflate()</tt> respectively.  The
+annotations are interspersed between lines of the code.  So please read between the lines.
+We hope this helps explain some of the intricacies of <em>zlib</em>.
+<p>
+Without further adieu, here is the program <a href="zpipe.c"><tt>zpipe.c</tt></a>:
+<pre><b>
+/* zpipe.c: example of proper use of zlib's inflate() and deflate()
+   Not copyrighted -- provided to the public domain
+   Version 1.4  11 December 2005  Mark Adler */
+
+/* Version history:
+   1.0  30 Oct 2004  First version
+   1.1   8 Nov 2004  Add void casting for unused return values
+                     Use switch statement for inflate() return values
+   1.2   9 Nov 2004  Add assertions to document zlib guarantees
+   1.3   6 Apr 2005  Remove incorrect assertion in inf()
+   1.4  11 Dec 2005  Add hack to avoid MSDOS end-of-line conversions
+                     Avoid some compiler warnings for input and output buffers
+ */
+</b></pre><!-- -->
+We now include the header files for the required definitions.  From
+<tt>stdio.h</tt> we use <tt>fopen()</tt>, <tt>fread()</tt>, <tt>fwrite()</tt>,
+<tt>feof()</tt>, <tt>ferror()</tt>, and <tt>fclose()</tt> for file i/o, and
+<tt>fputs()</tt> for error messages.  From <tt>string.h</tt> we use
+<tt>strcmp()</tt> for command line argument processing.
+From <tt>assert.h</tt> we use the <tt>assert()</tt> macro.
+From <tt>zlib.h</tt>
+we use the basic compression functions <tt>deflateInit()</tt>,
+<tt>deflate()</tt>, and <tt>deflateEnd()</tt>, and the basic decompression
+functions <tt>inflateInit()</tt>, <tt>inflate()</tt>, and
+<tt>inflateEnd()</tt>.
+<pre><b>
+#include &lt;stdio.h&gt;
+#include &lt;string.h&gt;
+#include &lt;assert.h&gt;
+#include "zlib.h"
+</b></pre><!-- -->
+This is an ugly hack required to avoid corruption of the input and output data on
+Windows/MS-DOS systems.  Without this, those systems would assume that the input and output
+files are text, and try to convert the end-of-line characters from one standard to
+another.  That would corrupt binary data, and in particular would render the compressed data unusable.
+This sets the input and output to binary which suppresses the end-of-line conversions.
+<tt>SET_BINARY_MODE()</tt> will be used later on <tt>stdin</tt> and <tt>stdout</tt>, at the beginning of <tt>main()</tt>.
+<pre><b>
+#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
+#  include &lt;fcntl.h&gt;
+#  include &lt;io.h&gt;
+#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
+#else
+#  define SET_BINARY_MODE(file)
+#endif
+</b></pre><!-- -->
+<tt>CHUNK</tt> is simply the buffer size for feeding data to and pulling data
+from the <em>zlib</em> routines.  Larger buffer sizes would be more efficient,
+especially for <tt>inflate()</tt>.  If the memory is available, buffers sizes
+on the order of 128K or 256K bytes should be used.
+<pre><b>
+#define CHUNK 16384
+</b></pre><!-- -->
+The <tt>def()</tt> routine compresses data from an input file to an output file.  The output data
+will be in the <em>zlib</em> format, which is different from the <em>gzip</em> or <em>zip</em>
+formats.  The <em>zlib</em> format has a very small header of only two bytes to identify it as
+a <em>zlib</em> stream and to provide decoding information, and a four-byte trailer with a fast
+check value to verify the integrity of the uncompressed data after decoding.
+<pre><b>
+/* Compress from file source to file dest until EOF on source.
+   def() returns Z_OK on success, Z_MEM_ERROR if memory could not be
+   allocated for processing, Z_STREAM_ERROR if an invalid compression
+   level is supplied, Z_VERSION_ERROR if the version of zlib.h and the
+   version of the library linked do not match, or Z_ERRNO if there is
+   an error reading or writing the files. */
+int def(FILE *source, FILE *dest, int level)
+{
+</b></pre>
+Here are the local variables for <tt>def()</tt>.  <tt>ret</tt> will be used for <em>zlib</em>
+return codes.  <tt>flush</tt> will keep track of the current flushing state for <tt>deflate()</tt>,
+which is either no flushing, or flush to completion after the end of the input file is reached.
+<tt>have</tt> is the amount of data returned from <tt>deflate()</tt>.  The <tt>strm</tt> structure
+is used to pass information to and from the <em>zlib</em> routines, and to maintain the
+<tt>deflate()</tt> state.  <tt>in</tt> and <tt>out</tt> are the input and output buffers for
+<tt>deflate()</tt>.
+<pre><b>
+    int ret, flush;
+    unsigned have;
+    z_stream strm;
+    unsigned char in[CHUNK];
+    unsigned char out[CHUNK];
+</b></pre><!-- -->
+The first thing we do is to initialize the <em>zlib</em> state for compression using
+<tt>deflateInit()</tt>.  This must be done before the first use of <tt>deflate()</tt>.
+The <tt>zalloc</tt>, <tt>zfree</tt>, and <tt>opaque</tt> fields in the <tt>strm</tt>
+structure must be initialized before calling <tt>deflateInit()</tt>.  Here they are
+set to the <em>zlib</em> constant <tt>Z_NULL</tt> to request that <em>zlib</em> use
+the default memory allocation routines.  An application may also choose to provide
+custom memory allocation routines here.  <tt>deflateInit()</tt> will allocate on the
+order of 256K bytes for the internal state.
+(See <a href="zlib_tech.html"><em>zlib Technical Details</em></a>.)
+<p>
+<tt>deflateInit()</tt> is called with a pointer to the structure to be initialized and
+the compression level, which is an integer in the range of -1 to 9.  Lower compression
+levels result in faster execution, but less compression.  Higher levels result in
+greater compression, but slower execution.  The <em>zlib</em> constant Z_DEFAULT_COMPRESSION,
+equal to -1,
+provides a good compromise between compression and speed and is equivalent to level 6.
+Level 0 actually does no compression at all, and in fact expands the data slightly to produce
+the <em>zlib</em> format (it is not a byte-for-byte copy of the input).
+More advanced applications of <em>zlib</em>
+may use <tt>deflateInit2()</tt> here instead.  Such an application may want to reduce how
+much memory will be used, at some price in compression.  Or it may need to request a
+<em>gzip</em> header and trailer instead of a <em>zlib</em> header and trailer, or raw
+encoding with no header or trailer at all.
+<p>
+We must check the return value of <tt>deflateInit()</tt> against the <em>zlib</em> constant
+<tt>Z_OK</tt> to make sure that it was able to
+allocate memory for the internal state, and that the provided arguments were valid.
+<tt>deflateInit()</tt> will also check that the version of <em>zlib</em> that the <tt>zlib.h</tt>
+file came from matches the version of <em>zlib</em> actually linked with the program.  This
+is especially important for environments in which <em>zlib</em> is a shared library.
+<p>
+Note that an application can initialize multiple, independent <em>zlib</em> streams, which can
+operate in parallel.  The state information maintained in the structure allows the <em>zlib</em>
+routines to be reentrant.
+<pre><b>
+    /* allocate deflate state */
+    strm.zalloc = Z_NULL;
+    strm.zfree = Z_NULL;
+    strm.opaque = Z_NULL;
+    ret = deflateInit(&amp;strm, level);
+    if (ret != Z_OK)
+        return ret;
+</b></pre><!-- -->
+With the pleasantries out of the way, now we can get down to business.  The outer <tt>do</tt>-loop
+reads all of the input file and exits at the bottom of the loop once end-of-file is reached.
+This loop contains the only call of <tt>deflate()</tt>.  So we must make sure that all of the
+input data has been processed and that all of the output data has been generated and consumed
+before we fall out of the loop at the bottom.
+<pre><b>
+    /* compress until end of file */
+    do {
+</b></pre>
+We start off by reading data from the input file.  The number of bytes read is put directly
+into <tt>avail_in</tt>, and a pointer to those bytes is put into <tt>next_in</tt>.  We also
+check to see if end-of-file on the input has been reached.  If we are at the end of file, then <tt>flush</tt> is set to the
+<em>zlib</em> constant <tt>Z_FINISH</tt>, which is later passed to <tt>deflate()</tt> to
+indicate that this is the last chunk of input data to compress.  We need to use <tt>feof()</tt>
+to check for end-of-file as opposed to seeing if fewer than <tt>CHUNK</tt> bytes have been read.  The
+reason is that if the input file length is an exact multiple of <tt>CHUNK</tt>, we will miss
+the fact that we got to the end-of-file, and not know to tell <tt>deflate()</tt> to finish
+up the compressed stream.  If we are not yet at the end of the input, then the <em>zlib</em>
+constant <tt>Z_NO_FLUSH</tt> will be passed to <tt>deflate</tt> to indicate that we are still
+in the middle of the uncompressed data.
+<p>
+If there is an error in reading from the input file, the process is aborted with
+<tt>deflateEnd()</tt> being called to free the allocated <em>zlib</em> state before returning
+the error.  We wouldn't want a memory leak, now would we?  <tt>deflateEnd()</tt> can be called
+at any time after the state has been initialized.  Once that's done, <tt>deflateInit()</tt> (or
+<tt>deflateInit2()</tt>) would have to be called to start a new compression process.  There is
+no point here in checking the <tt>deflateEnd()</tt> return code.  The deallocation can't fail.
+<pre><b>
+        strm.avail_in = fread(in, 1, CHUNK, source);
+        if (ferror(source)) {
+            (void)deflateEnd(&amp;strm);
+            return Z_ERRNO;
+        }
+        flush = feof(source) ? Z_FINISH : Z_NO_FLUSH;
+        strm.next_in = in;
+</b></pre><!-- -->
+The inner <tt>do</tt>-loop passes our chunk of input data to <tt>deflate()</tt>, and then
+keeps calling <tt>deflate()</tt> until it is done producing output.  Once there is no more
+new output, <tt>deflate()</tt> is guaranteed to have consumed all of the input, i.e.,
+<tt>avail_in</tt> will be zero.
+<pre><b>
+        /* run deflate() on input until output buffer not full, finish
+           compression if all of source has been read in */
+        do {
+</b></pre>
+Output space is provided to <tt>deflate()</tt> by setting <tt>avail_out</tt> to the number
+of available output bytes and <tt>next_out</tt> to a pointer to that space.
+<pre><b>
+            strm.avail_out = CHUNK;
+            strm.next_out = out;
+</b></pre>
+Now we call the compression engine itself, <tt>deflate()</tt>.  It takes as many of the
+<tt>avail_in</tt> bytes at <tt>next_in</tt> as it can process, and writes as many as
+<tt>avail_out</tt> bytes to <tt>next_out</tt>.  Those counters and pointers are then
+updated past the input data consumed and the output data written.  It is the amount of
+output space available that may limit how much input is consumed.
+Hence the inner loop to make sure that
+all of the input is consumed by providing more output space each time.  Since <tt>avail_in</tt>
+and <tt>next_in</tt> are updated by <tt>deflate()</tt>, we don't have to mess with those
+between <tt>deflate()</tt> calls until it's all used up.
+<p>
+The parameters to <tt>deflate()</tt> are a pointer to the <tt>strm</tt> structure containing
+the input and output information and the internal compression engine state, and a parameter
+indicating whether and how to flush data to the output.  Normally <tt>deflate</tt> will consume
+several K bytes of input data before producing any output (except for the header), in order
+to accumulate statistics on the data for optimum compression.  It will then put out a burst of
+compressed data, and proceed to consume more input before the next burst.  Eventually,
+<tt>deflate()</tt>
+must be told to terminate the stream, complete the compression with provided input data, and
+write out the trailer check value.  <tt>deflate()</tt> will continue to compress normally as long
+as the flush parameter is <tt>Z_NO_FLUSH</tt>.  Once the <tt>Z_FINISH</tt> parameter is provided,
+<tt>deflate()</tt> will begin to complete the compressed output stream.  However depending on how
+much output space is provided, <tt>deflate()</tt> may have to be called several times until it
+has provided the complete compressed stream, even after it has consumed all of the input.  The flush
+parameter must continue to be <tt>Z_FINISH</tt> for those subsequent calls.
+<p>
+There are other values of the flush parameter that are used in more advanced applications.  You can
+force <tt>deflate()</tt> to produce a burst of output that encodes all of the input data provided
+so far, even if it wouldn't have otherwise, for example to control data latency on a link with
+compressed data.  You can also ask that <tt>deflate()</tt> do that as well as erase any history up to
+that point so that what follows can be decompressed independently, for example for random access
+applications.  Both requests will degrade compression by an amount depending on how often such
+requests are made.
+<p>
+<tt>deflate()</tt> has a return value that can indicate errors, yet we do not check it here.  Why
+not?  Well, it turns out that <tt>deflate()</tt> can do no wrong here.  Let's go through
+<tt>deflate()</tt>'s return values and dispense with them one by one.  The possible values are
+<tt>Z_OK</tt>, <tt>Z_STREAM_END</tt>, <tt>Z_STREAM_ERROR</tt>, or <tt>Z_BUF_ERROR</tt>.  <tt>Z_OK</tt>
+is, well, ok.  <tt>Z_STREAM_END</tt> is also ok and will be returned for the last call of
+<tt>deflate()</tt>.  This is already guaranteed by calling <tt>deflate()</tt> with <tt>Z_FINISH</tt>
+until it has no more output.  <tt>Z_STREAM_ERROR</tt> is only possible if the stream is not
+initialized properly, but we did initialize it properly.  There is no harm in checking for
+<tt>Z_STREAM_ERROR</tt> here, for example to check for the possibility that some
+other part of the application inadvertently clobbered the memory containing the <em>zlib</em> state.
+<tt>Z_BUF_ERROR</tt> will be explained further below, but
+suffice it to say that this is simply an indication that <tt>deflate()</tt> could not consume
+more input or produce more output.  <tt>deflate()</tt> can be called again with more output space
+or more available input, which it will be in this code.
+<pre><b>
+            ret = deflate(&amp;strm, flush);    /* no bad return value */
+            assert(ret != Z_STREAM_ERROR);  /* state not clobbered */
+</b></pre>
+Now we compute how much output <tt>deflate()</tt> provided on the last call, which is the
+difference between how much space was provided before the call, and how much output space
+is still available after the call.  Then that data, if any, is written to the output file.
+We can then reuse the output buffer for the next call of <tt>deflate()</tt>.  Again if there
+is a file i/o error, we call <tt>deflateEnd()</tt> before returning to avoid a memory leak.
+<pre><b>
+            have = CHUNK - strm.avail_out;
+            if (fwrite(out, 1, have, dest) != have || ferror(dest)) {
+                (void)deflateEnd(&amp;strm);
+                return Z_ERRNO;
+            }
+</b></pre>
+The inner <tt>do</tt>-loop is repeated until the last <tt>deflate()</tt> call fails to fill the
+provided output buffer.  Then we know that <tt>deflate()</tt> has done as much as it can with
+the provided input, and that all of that input has been consumed.  We can then fall out of this
+loop and reuse the input buffer.
+<p>
+The way we tell that <tt>deflate()</tt> has no more output is by seeing that it did not fill
+the output buffer, leaving <tt>avail_out</tt> greater than zero.  However suppose that
+<tt>deflate()</tt> has no more output, but just so happened to exactly fill the output buffer!
+<tt>avail_out</tt> is zero, and we can't tell that <tt>deflate()</tt> has done all it can.
+As far as we know, <tt>deflate()</tt>
+has more output for us.  So we call it again.  But now <tt>deflate()</tt> produces no output
+at all, and <tt>avail_out</tt> remains unchanged as <tt>CHUNK</tt>.  That <tt>deflate()</tt> call
+wasn't able to do anything, either consume input or produce output, and so it returns
+<tt>Z_BUF_ERROR</tt>.  (See, I told you I'd cover this later.)  However this is not a problem at
+all.  Now we finally have the desired indication that <tt>deflate()</tt> is really done,
+and so we drop out of the inner loop to provide more input to <tt>deflate()</tt>.
+<p>
+With <tt>flush</tt> set to <tt>Z_FINISH</tt>, this final set of <tt>deflate()</tt> calls will
+complete the output stream.  Once that is done, subsequent calls of <tt>deflate()</tt> would return
+<tt>Z_STREAM_ERROR</tt> if the flush parameter is not <tt>Z_FINISH</tt>, and do no more processing
+until the state is reinitialized.
+<p>
+Some applications of <em>zlib</em> have two loops that call <tt>deflate()</tt>
+instead of the single inner loop we have here.  The first loop would call
+without flushing and feed all of the data to <tt>deflate()</tt>.  The second loop would call
+<tt>deflate()</tt> with no more
+data and the <tt>Z_FINISH</tt> parameter to complete the process.  As you can see from this
+example, that can be avoided by simply keeping track of the current flush state.
+<pre><b>
+        } while (strm.avail_out == 0);
+        assert(strm.avail_in == 0);     /* all input will be used */
+</b></pre><!-- -->
+Now we check to see if we have already processed all of the input file.  That information was
+saved in the <tt>flush</tt> variable, so we see if that was set to <tt>Z_FINISH</tt>.  If so,
+then we're done and we fall out of the outer loop.  We're guaranteed to get <tt>Z_STREAM_END</tt>
+from the last <tt>deflate()</tt> call, since we ran it until the last chunk of input was
+consumed and all of the output was generated.
+<pre><b>
+        /* done when last data in file processed */
+    } while (flush != Z_FINISH);
+    assert(ret == Z_STREAM_END);        /* stream will be complete */
+</b></pre><!-- -->
+The process is complete, but we still need to deallocate the state to avoid a memory leak
+(or rather more like a memory hemorrhage if you didn't do this).  Then
+finally we can return with a happy return value.
+<pre><b>
+    /* clean up and return */
+    (void)deflateEnd(&amp;strm);
+    return Z_OK;
+}
+</b></pre><!-- -->
+Now we do the same thing for decompression in the <tt>inf()</tt> routine. <tt>inf()</tt>
+decompresses what is hopefully a valid <em>zlib</em> stream from the input file and writes the
+uncompressed data to the output file.  Much of the discussion above for <tt>def()</tt>
+applies to <tt>inf()</tt> as well, so the discussion here will focus on the differences between
+the two.
+<pre><b>
+/* Decompress from file source to file dest until stream ends or EOF.
+   inf() returns Z_OK on success, Z_MEM_ERROR if memory could not be
+   allocated for processing, Z_DATA_ERROR if the deflate data is
+   invalid or incomplete, Z_VERSION_ERROR if the version of zlib.h and
+   the version of the library linked do not match, or Z_ERRNO if there
+   is an error reading or writing the files. */
+int inf(FILE *source, FILE *dest)
+{
+</b></pre>
+The local variables have the same functionality as they do for <tt>def()</tt>.  The
+only difference is that there is no <tt>flush</tt> variable, since <tt>inflate()</tt>
+can tell from the <em>zlib</em> stream itself when the stream is complete.
+<pre><b>
+    int ret;
+    unsigned have;
+    z_stream strm;
+    unsigned char in[CHUNK];
+    unsigned char out[CHUNK];
+</b></pre><!-- -->
+The initialization of the state is the same, except that there is no compression level,
+of course, and two more elements of the structure are initialized.  <tt>avail_in</tt>
+and <tt>next_in</tt> must be initialized before calling <tt>inflateInit()</tt>.  This
+is because the application has the option to provide the start of the zlib stream in
+order for <tt>inflateInit()</tt> to have access to information about the compression
+method to aid in memory allocation.  In the current implementation of <em>zlib</em>
+(up through versions 1.2.x), the method-dependent memory allocations are deferred to the first call of
+<tt>inflate()</tt> anyway.  However those fields must be initialized since later versions
+of <em>zlib</em> that provide more compression methods may take advantage of this interface.
+In any case, no decompression is performed by <tt>inflateInit()</tt>, so the
+<tt>avail_out</tt> and <tt>next_out</tt> fields do not need to be initialized before calling.
+<p>
+Here <tt>avail_in</tt> is set to zero and <tt>next_in</tt> is set to <tt>Z_NULL</tt> to
+indicate that no input data is being provided.
+<pre><b>
+    /* allocate inflate state */
+    strm.zalloc = Z_NULL;
+    strm.zfree = Z_NULL;
+    strm.opaque = Z_NULL;
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit(&amp;strm);
+    if (ret != Z_OK)
+        return ret;
+</b></pre><!-- -->
+The outer <tt>do</tt>-loop decompresses input until <tt>inflate()</tt> indicates
+that it has reached the end of the compressed data and has produced all of the uncompressed
+output.  This is in contrast to <tt>def()</tt> which processes all of the input file.
+If end-of-file is reached before the compressed data self-terminates, then the compressed
+data is incomplete and an error is returned.
+<pre><b>
+    /* decompress until deflate stream ends or end of file */
+    do {
+</b></pre>
+We read input data and set the <tt>strm</tt> structure accordingly.  If we've reached the
+end of the input file, then we leave the outer loop and report an error, since the
+compressed data is incomplete.  Note that we may read more data than is eventually consumed
+by <tt>inflate()</tt>, if the input file continues past the <em>zlib</em> stream.
+For applications where <em>zlib</em> streams are embedded in other data, this routine would
+need to be modified to return the unused data, or at least indicate how much of the input
+data was not used, so the application would know where to pick up after the <em>zlib</em> stream.
+<pre><b>
+        strm.avail_in = fread(in, 1, CHUNK, source);
+        if (ferror(source)) {
+            (void)inflateEnd(&amp;strm);
+            return Z_ERRNO;
+        }
+        if (strm.avail_in == 0)
+            break;
+        strm.next_in = in;
+</b></pre><!-- -->
+The inner <tt>do</tt>-loop has the same function it did in <tt>def()</tt>, which is to
+keep calling <tt>inflate()</tt> until has generated all of the output it can with the
+provided input.
+<pre><b>
+        /* run inflate() on input until output buffer not full */
+        do {
+</b></pre>
+Just like in <tt>def()</tt>, the same output space is provided for each call of <tt>inflate()</tt>.
+<pre><b>
+            strm.avail_out = CHUNK;
+            strm.next_out = out;
+</b></pre>
+Now we run the decompression engine itself.  There is no need to adjust the flush parameter, since
+the <em>zlib</em> format is self-terminating. The main difference here is that there are
+return values that we need to pay attention to.  <tt>Z_DATA_ERROR</tt>
+indicates that <tt>inflate()</tt> detected an error in the <em>zlib</em> compressed data format,
+which means that either the data is not a <em>zlib</em> stream to begin with, or that the data was
+corrupted somewhere along the way since it was compressed.  The other error to be processed is
+<tt>Z_MEM_ERROR</tt>, which can occur since memory allocation is deferred until <tt>inflate()</tt>
+needs it, unlike <tt>deflate()</tt>, whose memory is allocated at the start by <tt>deflateInit()</tt>.
+<p>
+Advanced applications may use
+<tt>deflateSetDictionary()</tt> to prime <tt>deflate()</tt> with a set of likely data to improve the
+first 32K or so of compression.  This is noted in the <em>zlib</em> header, so <tt>inflate()</tt>
+requests that that dictionary be provided before it can start to decompress.  Without the dictionary,
+correct decompression is not possible.  For this routine, we have no idea what the dictionary is,
+so the <tt>Z_NEED_DICT</tt> indication is converted to a <tt>Z_DATA_ERROR</tt>.
+<p>
+<tt>inflate()</tt> can also return <tt>Z_STREAM_ERROR</tt>, which should not be possible here,
+but could be checked for as noted above for <tt>def()</tt>.  <tt>Z_BUF_ERROR</tt> does not need to be
+checked for here, for the same reasons noted for <tt>def()</tt>.  <tt>Z_STREAM_END</tt> will be
+checked for later.
+<pre><b>
+            ret = inflate(&amp;strm, Z_NO_FLUSH);
+            assert(ret != Z_STREAM_ERROR);  /* state not clobbered */
+            switch (ret) {
+            case Z_NEED_DICT:
+                ret = Z_DATA_ERROR;     /* and fall through */
+            case Z_DATA_ERROR:
+            case Z_MEM_ERROR:
+                (void)inflateEnd(&amp;strm);
+                return ret;
+            }
+</b></pre>
+The output of <tt>inflate()</tt> is handled identically to that of <tt>deflate()</tt>.
+<pre><b>
+            have = CHUNK - strm.avail_out;
+            if (fwrite(out, 1, have, dest) != have || ferror(dest)) {
+                (void)inflateEnd(&amp;strm);
+                return Z_ERRNO;
+            }
+</b></pre>
+The inner <tt>do</tt>-loop ends when <tt>inflate()</tt> has no more output as indicated
+by not filling the output buffer, just as for <tt>deflate()</tt>.  In this case, we cannot
+assert that <tt>strm.avail_in</tt> will be zero, since the deflate stream may end before the file
+does.
+<pre><b>
+        } while (strm.avail_out == 0);
+</b></pre><!-- -->
+The outer <tt>do</tt>-loop ends when <tt>inflate()</tt> reports that it has reached the
+end of the input <em>zlib</em> stream, has completed the decompression and integrity
+check, and has provided all of the output.  This is indicated by the <tt>inflate()</tt>
+return value <tt>Z_STREAM_END</tt>.  The inner loop is guaranteed to leave <tt>ret</tt>
+equal to <tt>Z_STREAM_END</tt> if the last chunk of the input file read contained the end
+of the <em>zlib</em> stream.  So if the return value is not <tt>Z_STREAM_END</tt>, the
+loop continues to read more input.
+<pre><b>
+        /* done when inflate() says it's done */
+    } while (ret != Z_STREAM_END);
+</b></pre><!-- -->
+At this point, decompression successfully completed, or we broke out of the loop due to no
+more data being available from the input file.  If the last <tt>inflate()</tt> return value
+is not <tt>Z_STREAM_END</tt>, then the <em>zlib</em> stream was incomplete and a data error
+is returned.  Otherwise, we return with a happy return value.  Of course, <tt>inflateEnd()</tt>
+is called first to avoid a memory leak.
+<pre><b>
+    /* clean up and return */
+    (void)inflateEnd(&amp;strm);
+    return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR;
+}
+</b></pre><!-- -->
+That ends the routines that directly use <em>zlib</em>.  The following routines make this
+a command-line program by running data through the above routines from <tt>stdin</tt> to
+<tt>stdout</tt>, and handling any errors reported by <tt>def()</tt> or <tt>inf()</tt>.
+<p>
+<tt>zerr()</tt> is used to interpret the possible error codes from <tt>def()</tt>
+and <tt>inf()</tt>, as detailed in their comments above, and print out an error message.
+Note that these are only a subset of the possible return values from <tt>deflate()</tt>
+and <tt>inflate()</tt>.
+<pre><b>
+/* report a zlib or i/o error */
+void zerr(int ret)
+{
+    fputs("zpipe: ", stderr);
+    switch (ret) {
+    case Z_ERRNO:
+        if (ferror(stdin))
+            fputs("error reading stdin\n", stderr);
+        if (ferror(stdout))
+            fputs("error writing stdout\n", stderr);
+        break;
+    case Z_STREAM_ERROR:
+        fputs("invalid compression level\n", stderr);
+        break;
+    case Z_DATA_ERROR:
+        fputs("invalid or incomplete deflate data\n", stderr);
+        break;
+    case Z_MEM_ERROR:
+        fputs("out of memory\n", stderr);
+        break;
+    case Z_VERSION_ERROR:
+        fputs("zlib version mismatch!\n", stderr);
+    }
+}
+</b></pre><!-- -->
+Here is the <tt>main()</tt> routine used to test <tt>def()</tt> and <tt>inf()</tt>.  The
+<tt>zpipe</tt> command is simply a compression pipe from <tt>stdin</tt> to <tt>stdout</tt>, if
+no arguments are given, or it is a decompression pipe if <tt>zpipe -d</tt> is used.  If any other
+arguments are provided, no compression or decompression is performed.  Instead a usage
+message is displayed.  Examples are <tt>zpipe < foo.txt > foo.txt.z</tt> to compress, and
+<tt>zpipe -d < foo.txt.z > foo.txt</tt> to decompress.
+<pre><b>
+/* compress or decompress from stdin to stdout */
+int main(int argc, char **argv)
+{
+    int ret;
+
+    /* avoid end-of-line conversions */
+    SET_BINARY_MODE(stdin);
+    SET_BINARY_MODE(stdout);
+
+    /* do compression if no arguments */
+    if (argc == 1) {
+        ret = def(stdin, stdout, Z_DEFAULT_COMPRESSION);
+        if (ret != Z_OK)
+            zerr(ret);
+        return ret;
+    }
+
+    /* do decompression if -d specified */
+    else if (argc == 2 &amp;&amp; strcmp(argv[1], "-d") == 0) {
+        ret = inf(stdin, stdout);
+        if (ret != Z_OK)
+            zerr(ret);
+        return ret;
+    }
+
+    /* otherwise, report usage */
+    else {
+        fputs("zpipe usage: zpipe [-d] &lt; source &gt; dest\n", stderr);
+        return 1;
+    }
+}
+</b></pre>
+<hr>
+<i>Copyright (c) 2004, 2005 by Mark Adler<br>Last modified 11 December 2005</i>
+</body>
+</html>
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/zpipe.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/zpipe.c
new file mode 100644
index 00000000..83535d16
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/zpipe.c
@@ -0,0 +1,205 @@
+/* zpipe.c: example of proper use of zlib's inflate() and deflate()
+   Not copyrighted -- provided to the public domain
+   Version 1.4  11 December 2005  Mark Adler */
+
+/* Version history:
+   1.0  30 Oct 2004  First version
+   1.1   8 Nov 2004  Add void casting for unused return values
+                     Use switch statement for inflate() return values
+   1.2   9 Nov 2004  Add assertions to document zlib guarantees
+   1.3   6 Apr 2005  Remove incorrect assertion in inf()
+   1.4  11 Dec 2005  Add hack to avoid MSDOS end-of-line conversions
+                     Avoid some compiler warnings for input and output buffers
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include "zlib.h"
+
+#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
+#  include <fcntl.h>
+#  include <io.h>
+#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
+#else
+#  define SET_BINARY_MODE(file)
+#endif
+
+#define CHUNK 16384
+
+/* Compress from file source to file dest until EOF on source.
+   def() returns Z_OK on success, Z_MEM_ERROR if memory could not be
+   allocated for processing, Z_STREAM_ERROR if an invalid compression
+   level is supplied, Z_VERSION_ERROR if the version of zlib.h and the
+   version of the library linked do not match, or Z_ERRNO if there is
+   an error reading or writing the files. */
+int def(FILE *source, FILE *dest, int level)
+{
+    int ret, flush;
+    unsigned have;
+    z_stream strm;
+    unsigned char in[CHUNK];
+    unsigned char out[CHUNK];
+
+    /* allocate deflate state */
+    strm.zalloc = Z_NULL;
+    strm.zfree = Z_NULL;
+    strm.opaque = Z_NULL;
+    ret = deflateInit(&strm, level);
+    if (ret != Z_OK)
+        return ret;
+
+    /* compress until end of file */
+    do {
+        strm.avail_in = fread(in, 1, CHUNK, source);
+        if (ferror(source)) {
+            (void)deflateEnd(&strm);
+            return Z_ERRNO;
+        }
+        flush = feof(source) ? Z_FINISH : Z_NO_FLUSH;
+        strm.next_in = in;
+
+        /* run deflate() on input until output buffer not full, finish
+           compression if all of source has been read in */
+        do {
+            strm.avail_out = CHUNK;
+            strm.next_out = out;
+            ret = deflate(&strm, flush);    /* no bad return value */
+            assert(ret != Z_STREAM_ERROR);  /* state not clobbered */
+            have = CHUNK - strm.avail_out;
+            if (fwrite(out, 1, have, dest) != have || ferror(dest)) {
+                (void)deflateEnd(&strm);
+                return Z_ERRNO;
+            }
+        } while (strm.avail_out == 0);
+        assert(strm.avail_in == 0);     /* all input will be used */
+
+        /* done when last data in file processed */
+    } while (flush != Z_FINISH);
+    assert(ret == Z_STREAM_END);        /* stream will be complete */
+
+    /* clean up and return */
+    (void)deflateEnd(&strm);
+    return Z_OK;
+}
+
+/* Decompress from file source to file dest until stream ends or EOF.
+   inf() returns Z_OK on success, Z_MEM_ERROR if memory could not be
+   allocated for processing, Z_DATA_ERROR if the deflate data is
+   invalid or incomplete, Z_VERSION_ERROR if the version of zlib.h and
+   the version of the library linked do not match, or Z_ERRNO if there
+   is an error reading or writing the files. */
+int inf(FILE *source, FILE *dest)
+{
+    int ret;
+    unsigned have;
+    z_stream strm;
+    unsigned char in[CHUNK];
+    unsigned char out[CHUNK];
+
+    /* allocate inflate state */
+    strm.zalloc = Z_NULL;
+    strm.zfree = Z_NULL;
+    strm.opaque = Z_NULL;
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit(&strm);
+    if (ret != Z_OK)
+        return ret;
+
+    /* decompress until deflate stream ends or end of file */
+    do {
+        strm.avail_in = fread(in, 1, CHUNK, source);
+        if (ferror(source)) {
+            (void)inflateEnd(&strm);
+            return Z_ERRNO;
+        }
+        if (strm.avail_in == 0)
+            break;
+        strm.next_in = in;
+
+        /* run inflate() on input until output buffer not full */
+        do {
+            strm.avail_out = CHUNK;
+            strm.next_out = out;
+            ret = inflate(&strm, Z_NO_FLUSH);
+            assert(ret != Z_STREAM_ERROR);  /* state not clobbered */
+            switch (ret) {
+            case Z_NEED_DICT:
+                ret = Z_DATA_ERROR;     /* and fall through */
+            case Z_DATA_ERROR:
+            case Z_MEM_ERROR:
+                (void)inflateEnd(&strm);
+                return ret;
+            }
+            have = CHUNK - strm.avail_out;
+            if (fwrite(out, 1, have, dest) != have || ferror(dest)) {
+                (void)inflateEnd(&strm);
+                return Z_ERRNO;
+            }
+        } while (strm.avail_out == 0);
+
+        /* done when inflate() says it's done */
+    } while (ret != Z_STREAM_END);
+
+    /* clean up and return */
+    (void)inflateEnd(&strm);
+    return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR;
+}
+
+/* report a zlib or i/o error */
+void zerr(int ret)
+{
+    fputs("zpipe: ", stderr);
+    switch (ret) {
+    case Z_ERRNO:
+        if (ferror(stdin))
+            fputs("error reading stdin\n", stderr);
+        if (ferror(stdout))
+            fputs("error writing stdout\n", stderr);
+        break;
+    case Z_STREAM_ERROR:
+        fputs("invalid compression level\n", stderr);
+        break;
+    case Z_DATA_ERROR:
+        fputs("invalid or incomplete deflate data\n", stderr);
+        break;
+    case Z_MEM_ERROR:
+        fputs("out of memory\n", stderr);
+        break;
+    case Z_VERSION_ERROR:
+        fputs("zlib version mismatch!\n", stderr);
+    }
+}
+
+/* compress or decompress from stdin to stdout */
+int main(int argc, char **argv)
+{
+    int ret;
+
+    /* avoid end-of-line conversions */
+    SET_BINARY_MODE(stdin);
+    SET_BINARY_MODE(stdout);
+
+    /* do compression if no arguments */
+    if (argc == 1) {
+        ret = def(stdin, stdout, Z_DEFAULT_COMPRESSION);
+        if (ret != Z_OK)
+            zerr(ret);
+        return ret;
+    }
+
+    /* do decompression if -d specified */
+    else if (argc == 2 && strcmp(argv[1], "-d") == 0) {
+        ret = inf(stdin, stdout);
+        if (ret != Z_OK)
+            zerr(ret);
+        return ret;
+    }
+
+    /* otherwise, report usage */
+    else {
+        fputs("zpipe usage: zpipe [-d] < source > dest\n", stderr);
+        return 1;
+    }
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/zran.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/zran.c
new file mode 100644
index 00000000..617a1308
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/examples/zran.c
@@ -0,0 +1,404 @@
+/* zran.c -- example of zlib/gzip stream indexing and random access
+ * Copyright (C) 2005 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+   Version 1.0  29 May 2005  Mark Adler */
+
+/* Illustrate the use of Z_BLOCK, inflatePrime(), and inflateSetDictionary()
+   for random access of a compressed file.  A file containing a zlib or gzip
+   stream is provided on the command line.  The compressed stream is decoded in
+   its entirety, and an index built with access points about every SPAN bytes
+   in the uncompressed output.  The compressed file is left open, and can then
+   be read randomly, having to decompress on the average SPAN/2 uncompressed
+   bytes before getting to the desired block of data.
+
+   An access point can be created at the start of any deflate block, by saving
+   the starting file offset and bit of that block, and the 32K bytes of
+   uncompressed data that precede that block.  Also the uncompressed offset of
+   that block is saved to provide a referece for locating a desired starting
+   point in the uncompressed stream.  build_index() works by decompressing the
+   input zlib or gzip stream a block at a time, and at the end of each block
+   deciding if enough uncompressed data has gone by to justify the creation of
+   a new access point.  If so, that point is saved in a data structure that
+   grows as needed to accommodate the points.
+
+   To use the index, an offset in the uncompressed data is provided, for which
+   the latest accees point at or preceding that offset is located in the index.
+   The input file is positioned to the specified location in the index, and if
+   necessary the first few bits of the compressed data is read from the file.
+   inflate is initialized with those bits and the 32K of uncompressed data, and
+   the decompression then proceeds until the desired offset in the file is
+   reached.  Then the decompression continues to read the desired uncompressed
+   data from the file.
+
+   Another approach would be to generate the index on demand.  In that case,
+   requests for random access reads from the compressed data would try to use
+   the index, but if a read far enough past the end of the index is required,
+   then further index entries would be generated and added.
+
+   There is some fair bit of overhead to starting inflation for the random
+   access, mainly copying the 32K byte dictionary.  So if small pieces of the
+   file are being accessed, it would make sense to implement a cache to hold
+   some lookahead and avoid many calls to extract() for small lengths.
+
+   Another way to build an index would be to use inflateCopy().  That would
+   not be constrained to have access points at block boundaries, but requires
+   more memory per access point, and also cannot be saved to file due to the
+   use of pointers in the state.  The approach here allows for storage of the
+   index in a file.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "zlib.h"
+
+#define local static
+
+#define SPAN 1048576L       /* desired distance between access points */
+#define WINSIZE 32768U      /* sliding window size */
+#define CHUNK 16384         /* file input buffer size */
+
+/* access point entry */
+struct point {
+    off_t out;          /* corresponding offset in uncompressed data */
+    off_t in;           /* offset in input file of first full byte */
+    int bits;           /* number of bits (1-7) from byte at in - 1, or 0 */
+    unsigned char window[WINSIZE];  /* preceding 32K of uncompressed data */
+};
+
+/* access point list */
+struct access {
+    int have;           /* number of list entries filled in */
+    int size;           /* number of list entries allocated */
+    struct point *list; /* allocated list */
+};
+
+/* Deallocate an index built by build_index() */
+local void free_index(struct access *index)
+{
+    if (index != NULL) {
+        free(index->list);
+        free(index);
+    }
+}
+
+/* Add an entry to the access point list.  If out of memory, deallocate the
+   existing list and return NULL. */
+local struct access *addpoint(struct access *index, int bits,
+    off_t in, off_t out, unsigned left, unsigned char *window)
+{
+    struct point *next;
+
+    /* if list is empty, create it (start with eight points) */
+    if (index == NULL) {
+        index = malloc(sizeof(struct access));
+        if (index == NULL) return NULL;
+        index->list = malloc(sizeof(struct point) << 3);
+        if (index->list == NULL) {
+            free(index);
+            return NULL;
+        }
+        index->size = 8;
+        index->have = 0;
+    }
+
+    /* if list is full, make it bigger */
+    else if (index->have == index->size) {
+        index->size <<= 1;
+        next = realloc(index->list, sizeof(struct point) * index->size);
+        if (next == NULL) {
+            free_index(index);
+            return NULL;
+        }
+        index->list = next;
+    }
+
+    /* fill in entry and increment how many we have */
+    next = index->list + index->have;
+    next->bits = bits;
+    next->in = in;
+    next->out = out;
+    if (left)
+        memcpy(next->window, window + WINSIZE - left, left);
+    if (left < WINSIZE)
+        memcpy(next->window + left, window, WINSIZE - left);
+    index->have++;
+
+    /* return list, possibly reallocated */
+    return index;
+}
+
+/* Make one entire pass through the compressed stream and build an index, with
+   access points about every span bytes of uncompressed output -- span is
+   chosen to balance the speed of random access against the memory requirements
+   of the list, about 32K bytes per access point.  Note that data after the end
+   of the first zlib or gzip stream in the file is ignored.  build_index()
+   returns the number of access points on success (>= 1), Z_MEM_ERROR for out
+   of memory, Z_DATA_ERROR for an error in the input file, or Z_ERRNO for a
+   file read error.  On success, *built points to the resulting index. */
+local int build_index(FILE *in, off_t span, struct access **built)
+{
+    int ret;
+    off_t totin, totout;        /* our own total counters to avoid 4GB limit */
+    off_t last;                 /* totout value of last access point */
+    struct access *index;       /* access points being generated */
+    z_stream strm;
+    unsigned char input[CHUNK];
+    unsigned char window[WINSIZE];
+
+    /* initialize inflate */
+    strm.zalloc = Z_NULL;
+    strm.zfree = Z_NULL;
+    strm.opaque = Z_NULL;
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, 47);      /* automatic zlib or gzip decoding */
+    if (ret != Z_OK)
+        return ret;
+
+    /* inflate the input, maintain a sliding window, and build an index -- this
+       also validates the integrity of the compressed data using the check
+       information at the end of the gzip or zlib stream */
+    totin = totout = last = 0;
+    index = NULL;               /* will be allocated by first addpoint() */
+    strm.avail_out = 0;
+    do {
+        /* get some compressed data from input file */
+        strm.avail_in = fread(input, 1, CHUNK, in);
+        if (ferror(in)) {
+            ret = Z_ERRNO;
+            goto build_index_error;
+        }
+        if (strm.avail_in == 0) {
+            ret = Z_DATA_ERROR;
+            goto build_index_error;
+        }
+        strm.next_in = input;
+
+        /* process all of that, or until end of stream */
+        do {
+            /* reset sliding window if necessary */
+            if (strm.avail_out == 0) {
+                strm.avail_out = WINSIZE;
+                strm.next_out = window;
+            }
+
+            /* inflate until out of input, output, or at end of block --
+               update the total input and output counters */
+            totin += strm.avail_in;
+            totout += strm.avail_out;
+            ret = inflate(&strm, Z_BLOCK);      /* return at end of block */
+            totin -= strm.avail_in;
+            totout -= strm.avail_out;
+            if (ret == Z_NEED_DICT)
+                ret = Z_DATA_ERROR;
+            if (ret == Z_MEM_ERROR || ret == Z_DATA_ERROR)
+                goto build_index_error;
+            if (ret == Z_STREAM_END)
+                break;
+
+            /* if at end of block, consider adding an index entry (note that if
+               data_type indicates an end-of-block, then all of the
+               uncompressed data from that block has been delivered, and none
+               of the compressed data after that block has been consumed,
+               except for up to seven bits) -- the totout == 0 provides an
+               entry point after the zlib or gzip header, and assures that the
+               index always has at least one access point; we avoid creating an
+               access point after the last block by checking bit 6 of data_type
+             */
+            if ((strm.data_type & 128) && !(strm.data_type & 64) &&
+                (totout == 0 || totout - last > span)) {
+                index = addpoint(index, strm.data_type & 7, totin,
+                                 totout, strm.avail_out, window);
+                if (index == NULL) {
+                    ret = Z_MEM_ERROR;
+                    goto build_index_error;
+                }
+                last = totout;
+            }
+        } while (strm.avail_in != 0);
+    } while (ret != Z_STREAM_END);
+
+    /* clean up and return index (release unused entries in list) */
+    (void)inflateEnd(&strm);
+    index = realloc(index, sizeof(struct point) * index->have);
+    index->size = index->have;
+    *built = index;
+    return index->size;
+
+    /* return error */
+  build_index_error:
+    (void)inflateEnd(&strm);
+    if (index != NULL)
+        free_index(index);
+    return ret;
+}
+
+/* Use the index to read len bytes from offset into buf, return bytes read or
+   negative for error (Z_DATA_ERROR or Z_MEM_ERROR).  If data is requested past
+   the end of the uncompressed data, then extract() will return a value less
+   than len, indicating how much as actually read into buf.  This function
+   should not return a data error unless the file was modified since the index
+   was generated.  extract() may also return Z_ERRNO if there is an error on
+   reading or seeking the input file. */
+local int extract(FILE *in, struct access *index, off_t offset,
+                  unsigned char *buf, int len)
+{
+    int ret, skip;
+    z_stream strm;
+    struct point *here;
+    unsigned char input[CHUNK];
+    unsigned char discard[WINSIZE];
+
+    /* proceed only if something reasonable to do */
+    if (len < 0)
+        return 0;
+
+    /* find where in stream to start */
+    here = index->list;
+    ret = index->have;
+    while (--ret && here[1].out <= offset)
+        here++;
+
+    /* initialize file and inflate state to start there */
+    strm.zalloc = Z_NULL;
+    strm.zfree = Z_NULL;
+    strm.opaque = Z_NULL;
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, -15);         /* raw inflate */
+    if (ret != Z_OK)
+        return ret;
+    ret = fseeko(in, here->in - (here->bits ? 1 : 0), SEEK_SET);
+    if (ret == -1)
+        goto extract_ret;
+    if (here->bits) {
+        ret = getc(in);
+        if (ret == -1) {
+            ret = ferror(in) ? Z_ERRNO : Z_DATA_ERROR;
+            goto extract_ret;
+        }
+        (void)inflatePrime(&strm, here->bits, ret >> (8 - here->bits));
+    }
+    (void)inflateSetDictionary(&strm, here->window, WINSIZE);
+
+    /* skip uncompressed bytes until offset reached, then satisfy request */
+    offset -= here->out;
+    strm.avail_in = 0;
+    skip = 1;                               /* while skipping to offset */
+    do {
+        /* define where to put uncompressed data, and how much */
+        if (offset == 0 && skip) {          /* at offset now */
+            strm.avail_out = len;
+            strm.next_out = buf;
+            skip = 0;                       /* only do this once */
+        }
+        if (offset > WINSIZE) {             /* skip WINSIZE bytes */
+            strm.avail_out = WINSIZE;
+            strm.next_out = discard;
+            offset -= WINSIZE;
+        }
+        else if (offset != 0) {             /* last skip */
+            strm.avail_out = (unsigned)offset;
+            strm.next_out = discard;
+            offset = 0;
+        }
+
+        /* uncompress until avail_out filled, or end of stream */
+        do {
+            if (strm.avail_in == 0) {
+                strm.avail_in = fread(input, 1, CHUNK, in);
+                if (ferror(in)) {
+                    ret = Z_ERRNO;
+                    goto extract_ret;
+                }
+                if (strm.avail_in == 0) {
+                    ret = Z_DATA_ERROR;
+                    goto extract_ret;
+                }
+                strm.next_in = input;
+            }
+            ret = inflate(&strm, Z_NO_FLUSH);       /* normal inflate */
+            if (ret == Z_NEED_DICT)
+                ret = Z_DATA_ERROR;
+            if (ret == Z_MEM_ERROR || ret == Z_DATA_ERROR)
+                goto extract_ret;
+            if (ret == Z_STREAM_END)
+                break;
+        } while (strm.avail_out != 0);
+
+        /* if reach end of stream, then don't keep trying to get more */
+        if (ret == Z_STREAM_END)
+            break;
+
+        /* do until offset reached and requested data read, or stream ends */
+    } while (skip);
+
+    /* compute number of uncompressed bytes read after offset */
+    ret = skip ? 0 : len - strm.avail_out;
+
+    /* clean up and return bytes read or error */
+  extract_ret:
+    (void)inflateEnd(&strm);
+    return ret;
+}
+
+/* Demonstrate the use of build_index() and extract() by processing the file
+   provided on the command line, and the extracting 16K from about 2/3rds of
+   the way through the uncompressed output, and writing that to stdout. */
+int main(int argc, char **argv)
+{
+    int len;
+    off_t offset;
+    FILE *in;
+    struct access *index = NULL;
+    unsigned char buf[CHUNK];
+
+    /* open input file */
+    if (argc != 2) {
+        fprintf(stderr, "usage: zran file.gz\n");
+        return 1;
+    }
+    in = fopen(argv[1], "rb");
+    if (in == NULL) {
+        fprintf(stderr, "zran: could not open %s for reading\n", argv[1]);
+        return 1;
+    }
+
+    /* build index */
+    len = build_index(in, SPAN, &index);
+    if (len < 0) {
+        fclose(in);
+        switch (len) {
+        case Z_MEM_ERROR:
+            fprintf(stderr, "zran: out of memory\n");
+            break;
+        case Z_DATA_ERROR:
+            fprintf(stderr, "zran: compressed data error in %s\n", argv[1]);
+            break;
+        case Z_ERRNO:
+            fprintf(stderr, "zran: read error on %s\n", argv[1]);
+            break;
+        default:
+            fprintf(stderr, "zran: error %d while building index\n", len);
+        }
+        return 1;
+    }
+    fprintf(stderr, "zran: built index with %d access points\n", len);
+
+    /* use index by reading some bytes from an arbitrary offset */
+    offset = (index->list[index->have - 1].out << 1) / 3;
+    len = extract(in, index, offset, buf, CHUNK);
+    if (len < 0)
+        fprintf(stderr, "zran: extraction failed: %s error\n",
+                len == Z_MEM_ERROR ? "out of memory" : "input corrupted");
+    else {
+        fwrite(buf, 1, len, stdout);
+        fprintf(stderr, "zran: extracted %d bytes at %llu\n", len, offset);
+    }
+
+    /* clean up and exit */
+    free_index(index);
+    fclose(in);
+    return 0;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzclose.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzclose.c
new file mode 100644
index 00000000..caeb99a3
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzclose.c
@@ -0,0 +1,25 @@
+/* gzclose.c -- zlib gzclose() function
+ * Copyright (C) 2004, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* gzclose() is in a separate file so that it is linked in only if it is used.
+   That way the other gzclose functions can be used instead to avoid linking in
+   unneeded compression or decompression routines. */
+int ZEXPORT gzclose(file)
+    gzFile file;
+{
+#ifndef NO_GZCOMPRESS
+    gz_statep state;
+
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file);
+#else
+    return gzclose_r(file);
+#endif
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzguts.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzguts.h
new file mode 100644
index 00000000..0f8fb79f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzguts.h
@@ -0,0 +1,132 @@
+/* gzguts.h -- zlib internal header definitions for gz* operations
+ * Copyright (C) 2004, 2005, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#ifdef _LARGEFILE64_SOURCE
+#  ifndef _LARGEFILE_SOURCE
+#    define _LARGEFILE_SOURCE 1
+#  endif
+#  ifdef _FILE_OFFSET_BITS
+#    undef _FILE_OFFSET_BITS
+#  endif
+#endif
+
+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
+#include <stdio.h>
+#include "zlib.h"
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#  include <limits.h>
+#endif
+#include <fcntl.h>
+
+#ifdef NO_DEFLATE       /* for compatibility with old definition */
+#  define NO_GZCOMPRESS
+#endif
+
+#ifdef _MSC_VER
+#  include <io.h>
+#  define vsnprintf _vsnprintf
+#endif
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+/* gz* functions always use library allocation functions */
+#ifndef STDC
+  extern voidp  malloc OF((uInt size));
+  extern void   free   OF((voidpf ptr));
+#endif
+
+/* get errno and strerror definition */
+#if defined UNDER_CE
+#  include <windows.h>
+#  define zstrerror() gz_strwinerror((DWORD)GetLastError())
+#else
+#  ifdef STDC
+#    include <errno.h>
+#    define zstrerror() strerror(errno)
+#  else
+#    define zstrerror() "stdio error (consult errno)"
+#  endif
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
+    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+#endif
+
+/* default i/o buffer size -- double this for output when reading */
+#define GZBUFSIZE 8192
+
+/* gzip modes, also provide a little integrity check on the passed structure */
+#define GZ_NONE 0
+#define GZ_READ 7247
+#define GZ_WRITE 31153
+#define GZ_APPEND 1     /* mode set to GZ_WRITE after the file is opened */
+
+/* values for gz_state how */
+#define LOOK 0      /* look for a gzip header */
+#define COPY 1      /* copy input directly */
+#define GZIP 2      /* decompress a gzip stream */
+
+/* internal gzip file state data structure */
+typedef struct {
+        /* used for both reading and writing */
+    int mode;               /* see gzip modes above */
+    int fd;                 /* file descriptor */
+    char *path;             /* path or fd for error messages */
+    z_off64_t pos;          /* current position in uncompressed data */
+    unsigned size;          /* buffer size, zero if not allocated yet */
+    unsigned want;          /* requested buffer size, default is GZBUFSIZE */
+    unsigned char *in;      /* input buffer */
+    unsigned char *out;     /* output buffer (double-sized when reading) */
+    unsigned char *next;    /* next output data to deliver or write */
+        /* just for reading */
+    unsigned have;          /* amount of output data unused at next */
+    int eof;                /* true if end of input file reached */
+    z_off64_t start;        /* where the gzip data started, for rewinding */
+    z_off64_t raw;          /* where the raw data started, for seeking */
+    int how;                /* 0: get header, 1: copy, 2: decompress */
+    int direct;             /* true if last read direct, false if gzip */
+        /* just for writing */
+    int level;              /* compression level */
+    int strategy;           /* compression strategy */
+        /* seek request */
+    z_off64_t skip;         /* amount to skip (already rewound if backwards) */
+    int seek;               /* true if seek request pending */
+        /* error information */
+    int err;                /* error code */
+    char *msg;              /* error message */
+        /* zlib inflate or deflate stream */
+    z_stream strm;          /* stream structure in-place (not a pointer) */
+} gz_state;
+typedef gz_state FAR *gz_statep;
+
+/* shared functions */
+void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
+#if defined UNDER_CE
+char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
+#endif
+
+/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
+   value -- needed when comparing unsigned to z_off64_t, which is signed
+   (possible z_off64_t types off_t, off64_t, and long are all signed) */
+#ifdef INT_MAX
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
+#else
+unsigned ZLIB_INTERNAL gz_intmax OF((void));
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzlib.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzlib.c
new file mode 100644
index 00000000..603e60ed
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzlib.c
@@ -0,0 +1,537 @@
+/* gzlib.c -- zlib functions common to reading and writing gzip files
+ * Copyright (C) 2004, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#  define LSEEK lseek64
+#else
+#  define LSEEK lseek
+#endif
+
+/* Local functions */
+local void gz_reset OF((gz_statep));
+local gzFile gz_open OF((const char *, int, const char *));
+
+#if defined UNDER_CE
+
+/* Map the Windows error number in ERROR to a locale-dependent error message
+   string and return a pointer to it.  Typically, the values for ERROR come
+   from GetLastError.
+
+   The string pointed to shall not be modified by the application, but may be
+   overwritten by a subsequent call to gz_strwinerror
+
+   The gz_strwinerror function does not change the current setting of
+   GetLastError. */
+char ZLIB_INTERNAL *gz_strwinerror (error)
+     DWORD error;
+{
+    static char buf[1024];
+
+    wchar_t *msgbuf;
+    DWORD lasterr = GetLastError();
+    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
+        | FORMAT_MESSAGE_ALLOCATE_BUFFER,
+        NULL,
+        error,
+        0, /* Default language */
+        (LPVOID)&msgbuf,
+        0,
+        NULL);
+    if (chars != 0) {
+        /* If there is an \r\n appended, zap it.  */
+        if (chars >= 2
+            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
+            chars -= 2;
+            msgbuf[chars] = 0;
+        }
+
+        if (chars > sizeof (buf) - 1) {
+            chars = sizeof (buf) - 1;
+            msgbuf[chars] = 0;
+        }
+
+        wcstombs(buf, msgbuf, chars + 1);
+        LocalFree(msgbuf);
+    }
+    else {
+        sprintf(buf, "unknown win32 error (%ld)", error);
+    }
+
+    SetLastError(lasterr);
+    return buf;
+}
+
+#endif /* UNDER_CE */
+
+/* Reset gzip file state */
+local void gz_reset(state)
+    gz_statep state;
+{
+    if (state->mode == GZ_READ) {   /* for reading ... */
+        state->have = 0;            /* no output data available */
+        state->eof = 0;             /* not at end of file */
+        state->how = LOOK;          /* look for gzip header */
+        state->direct = 1;          /* default for empty file */
+    }
+    state->seek = 0;                /* no seek request pending */
+    gz_error(state, Z_OK, NULL);    /* clear error */
+    state->pos = 0;                 /* no uncompressed data yet */
+    state->strm.avail_in = 0;       /* no input data yet */
+}
+
+/* Open a gzip file either by name or file descriptor. */
+local gzFile gz_open(path, fd, mode)
+    const char *path;
+    int fd;
+    const char *mode;
+{
+    gz_statep state;
+
+    /* allocate gzFile structure to return */
+    state = malloc(sizeof(gz_state));
+    if (state == NULL)
+        return NULL;
+    state->size = 0;            /* no buffers allocated yet */
+    state->want = GZBUFSIZE;    /* requested buffer size */
+    state->msg = NULL;          /* no error message yet */
+
+    /* interpret mode */
+    state->mode = GZ_NONE;
+    state->level = Z_DEFAULT_COMPRESSION;
+    state->strategy = Z_DEFAULT_STRATEGY;
+    while (*mode) {
+        if (*mode >= '0' && *mode <= '9')
+            state->level = *mode - '0';
+        else
+            switch (*mode) {
+            case 'r':
+                state->mode = GZ_READ;
+                break;
+#ifndef NO_GZCOMPRESS
+            case 'w':
+                state->mode = GZ_WRITE;
+                break;
+            case 'a':
+                state->mode = GZ_APPEND;
+                break;
+#endif
+            case '+':       /* can't read and write at the same time */
+                free(state);
+                return NULL;
+            case 'b':       /* ignore -- will request binary anyway */
+                break;
+            case 'f':
+                state->strategy = Z_FILTERED;
+                break;
+            case 'h':
+                state->strategy = Z_HUFFMAN_ONLY;
+                break;
+            case 'R':
+                state->strategy = Z_RLE;
+                break;
+            case 'F':
+                state->strategy = Z_FIXED;
+            default:        /* could consider as an error, but just ignore */
+                ;
+            }
+        mode++;
+    }
+
+    /* must provide an "r", "w", or "a" */
+    if (state->mode == GZ_NONE) {
+        free(state);
+        return NULL;
+    }
+
+    /* save the path name for error messages */
+    state->path = malloc(strlen(path) + 1);
+    if (state->path == NULL) {
+        free(state);
+        return NULL;
+    }
+    strcpy(state->path, path);
+
+    /* open the file with the appropriate mode (or just use fd) */
+    state->fd = fd != -1 ? fd :
+        open(path,
+#ifdef O_LARGEFILE
+            O_LARGEFILE |
+#endif
+#ifdef O_BINARY
+            O_BINARY |
+#endif
+            (state->mode == GZ_READ ?
+                O_RDONLY :
+                (O_WRONLY | O_CREAT | (
+                    state->mode == GZ_WRITE ?
+                        O_TRUNC :
+                        O_APPEND))),
+            0666);
+    if (state->fd == -1) {
+        free(state->path);
+        free(state);
+        return NULL;
+    }
+    if (state->mode == GZ_APPEND)
+        state->mode = GZ_WRITE;         /* simplify later checks */
+
+    /* save the current position for rewinding (only if reading) */
+    if (state->mode == GZ_READ) {
+        state->start = LSEEK(state->fd, 0, SEEK_CUR);
+        if (state->start == -1) state->start = 0;
+    }
+
+    /* initialize stream */
+    gz_reset(state);
+
+    /* return stream */
+    return (gzFile)state;
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzopen(path, mode)
+    const char *path;
+    const char *mode;
+{
+    return gz_open(path, -1, mode);
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzopen64(path, mode)
+    const char *path;
+    const char *mode;
+{
+    return gz_open(path, -1, mode);
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzdopen(fd, mode)
+    int fd;
+    const char *mode;
+{
+    char *path;         /* identifier for error messages */
+    gzFile gz;
+
+    if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL)
+        return NULL;
+    sprintf(path, "<fd:%d>", fd);   /* for debugging */
+    gz = gz_open(path, fd, mode);
+    free(path);
+    return gz;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzbuffer(file, size)
+    gzFile file;
+    unsigned size;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* make sure we haven't already allocated memory */
+    if (state->size != 0)
+        return -1;
+
+    /* check and set requested size */
+    if (size == 0)
+        return -1;
+    state->want = size;
+    return 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzrewind(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no error */
+    if (state->mode != GZ_READ || state->err != Z_OK)
+        return -1;
+
+    /* back up and start over */
+    if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
+        return -1;
+    gz_reset(state);
+    return 0;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gzseek64(file, offset, whence)
+    gzFile file;
+    z_off64_t offset;
+    int whence;
+{
+    unsigned n;
+    z_off64_t ret;
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* check that there's no error */
+    if (state->err != Z_OK)
+        return -1;
+
+    /* can only seek from start or relative to current position */
+    if (whence != SEEK_SET && whence != SEEK_CUR)
+        return -1;
+
+    /* normalize offset to a SEEK_CUR specification */
+    if (whence == SEEK_SET)
+        offset -= state->pos;
+    else if (state->seek)
+        offset += state->skip;
+    state->seek = 0;
+
+    /* if within raw area while reading, just go there */
+    if (state->mode == GZ_READ && state->how == COPY &&
+        state->pos + offset >= state->raw) {
+        ret = LSEEK(state->fd, offset - state->have, SEEK_CUR);
+        if (ret == -1)
+            return -1;
+        state->have = 0;
+        state->eof = 0;
+        state->seek = 0;
+        gz_error(state, Z_OK, NULL);
+        state->strm.avail_in = 0;
+        state->pos += offset;
+        return state->pos;
+    }
+
+    /* calculate skip amount, rewinding if needed for back seek when reading */
+    if (offset < 0) {
+        if (state->mode != GZ_READ)         /* writing -- can't go backwards */
+            return -1;
+        offset += state->pos;
+        if (offset < 0)                     /* before start of file! */
+            return -1;
+        if (gzrewind(file) == -1)           /* rewind, then skip to offset */
+            return -1;
+    }
+
+    /* if reading, skip what's in output buffer (one less gzgetc() check) */
+    if (state->mode == GZ_READ) {
+        n = GT_OFF(state->have) || (z_off64_t)state->have > offset ?
+            (unsigned)offset : state->have;
+        state->have -= n;
+        state->next += n;
+        state->pos += n;
+        offset -= n;
+    }
+
+    /* request skip (if not zero) */
+    if (offset) {
+        state->seek = 1;
+        state->skip = offset;
+    }
+    return state->pos + offset;
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gzseek(file, offset, whence)
+    gzFile file;
+    z_off_t offset;
+    int whence;
+{
+    z_off64_t ret;
+
+    ret = gzseek64(file, (z_off64_t)offset, whence);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gztell64(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* return position */
+    return state->pos + (state->seek ? state->skip : 0);
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gztell(file)
+    gzFile file;
+{
+    z_off64_t ret;
+
+    ret = gztell64(file);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gzoffset64(file)
+    gzFile file;
+{
+    z_off64_t offset;
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* compute and return effective offset in file */
+    offset = LSEEK(state->fd, 0, SEEK_CUR);
+    if (offset == -1)
+        return -1;
+    if (state->mode == GZ_READ)             /* reading */
+        offset -= state->strm.avail_in;     /* don't count buffered input */
+    return offset;
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gzoffset(file)
+    gzFile file;
+{
+    z_off64_t ret;
+
+    ret = gzoffset64(file);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzeof(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return 0;
+
+    /* return end-of-file state */
+    return state->mode == GZ_READ ?
+        (state->eof && state->strm.avail_in == 0 && state->have == 0) : 0;
+}
+
+/* -- see zlib.h -- */
+const char * ZEXPORT gzerror(file, errnum)
+    gzFile file;
+    int *errnum;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return NULL;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return NULL;
+
+    /* return error information */
+    if (errnum != NULL)
+        *errnum = state->err;
+    return state->msg == NULL ? "" : state->msg;
+}
+
+/* -- see zlib.h -- */
+void ZEXPORT gzclearerr(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return;
+
+    /* clear error and end-of-file */
+    if (state->mode == GZ_READ)
+        state->eof = 0;
+    gz_error(state, Z_OK, NULL);
+}
+
+/* Create an error message in allocated memory and set state->err and
+   state->msg accordingly.  Free any previous error message already there.  Do
+   not try to free or allocate space if the error is Z_MEM_ERROR (out of
+   memory).  Simply save the error message as a static string.  If there is an
+   allocation failure constructing the error message, then convert the error to
+   out of memory. */
+void ZLIB_INTERNAL gz_error(state, err, msg)
+    gz_statep state;
+    int err;
+    const char *msg;
+{
+    /* free previously allocated message and clear */
+    if (state->msg != NULL) {
+        if (state->err != Z_MEM_ERROR)
+            free(state->msg);
+        state->msg = NULL;
+    }
+
+    /* set error code, and if no message, then done */
+    state->err = err;
+    if (msg == NULL)
+        return;
+
+    /* for an out of memory error, save as static string */
+    if (err == Z_MEM_ERROR) {
+        state->msg = (char *)msg;
+        return;
+    }
+
+    /* construct error message with path */
+    if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) {
+        state->err = Z_MEM_ERROR;
+        state->msg = (char *)"out of memory";
+        return;
+    }
+    strcpy(state->msg, state->path);
+    strcat(state->msg, ": ");
+    strcat(state->msg, msg);
+    return;
+}
+
+#ifndef INT_MAX
+/* portably return maximum value for an int (when limits.h presumed not
+   available) -- we need to do this to cover cases where 2's complement not
+   used, since C standard permits 1's complement and sign-bit representations,
+   otherwise we could just use ((unsigned)-1) >> 1 */
+unsigned ZLIB_INTERNAL gz_intmax()
+{
+    unsigned p, q;
+
+    p = 1;
+    do {
+        q = p;
+        p <<= 1;
+        p++;
+    } while (p > q);
+    return q >> 1;
+}
+#endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzread.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzread.c
new file mode 100644
index 00000000..548201ab
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzread.c
@@ -0,0 +1,653 @@
+/* gzread.c -- zlib functions for reading gzip files
+ * Copyright (C) 2004, 2005, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* Local functions */
+local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
+local int gz_avail OF((gz_statep));
+local int gz_next4 OF((gz_statep, unsigned long *));
+local int gz_head OF((gz_statep));
+local int gz_decomp OF((gz_statep));
+local int gz_make OF((gz_statep));
+local int gz_skip OF((gz_statep, z_off64_t));
+
+/* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
+   state->fd, and update state->eof, state->err, and state->msg as appropriate.
+   This function needs to loop on read(), since read() is not guaranteed to
+   read the number of bytes requested, depending on the type of descriptor. */
+local int gz_load(state, buf, len, have)
+    gz_statep state;
+    unsigned char *buf;
+    unsigned len;
+    unsigned *have;
+{
+    int ret;
+
+    *have = 0;
+    do {
+        ret = read(state->fd, buf + *have, len - *have);
+        if (ret <= 0)
+            break;
+        *have += ret;
+    } while (*have < len);
+    if (ret < 0) {
+        gz_error(state, Z_ERRNO, zstrerror());
+        return -1;
+    }
+    if (ret == 0)
+        state->eof = 1;
+    return 0;
+}
+
+/* Load up input buffer and set eof flag if last data loaded -- return -1 on
+   error, 0 otherwise.  Note that the eof flag is set when the end of the input
+   file is reached, even though there may be unused data in the buffer.  Once
+   that data has been used, no more attempts will be made to read the file.
+   gz_avail() assumes that strm->avail_in == 0. */
+local int gz_avail(state)
+    gz_statep state;
+{
+    z_streamp strm = &(state->strm);
+
+    if (state->err != Z_OK)
+        return -1;
+    if (state->eof == 0) {
+        if (gz_load(state, state->in, state->size,
+                (unsigned *)&(strm->avail_in)) == -1)
+            return -1;
+        strm->next_in = state->in;
+    }
+    return 0;
+}
+
+/* Get next byte from input, or -1 if end or error. */
+#define NEXT() ((strm->avail_in == 0 && gz_avail(state) == -1) ? -1 : \
+                (strm->avail_in == 0 ? -1 : \
+                 (strm->avail_in--, *(strm->next_in)++)))
+
+/* Get a four-byte little-endian integer and return 0 on success and the value
+   in *ret.  Otherwise -1 is returned and *ret is not modified. */
+local int gz_next4(state, ret)
+    gz_statep state;
+    unsigned long *ret;
+{
+    int ch;
+    unsigned long val;
+    z_streamp strm = &(state->strm);
+
+    val = NEXT();
+    val += (unsigned)NEXT() << 8;
+    val += (unsigned long)NEXT() << 16;
+    ch = NEXT();
+    if (ch == -1)
+        return -1;
+    val += (unsigned long)ch << 24;
+    *ret = val;
+    return 0;
+}
+
+/* Look for gzip header, set up for inflate or copy.  state->have must be zero.
+   If this is the first time in, allocate required memory.  state->how will be
+   left unchanged if there is no more input data available, will be set to COPY
+   if there is no gzip header and direct copying will be performed, or it will
+   be set to GZIP for decompression, and the gzip header will be skipped so
+   that the next available input data is the raw deflate stream.  If direct
+   copying, then leftover input data from the input buffer will be copied to
+   the output buffer.  In that case, all further file reads will be directly to
+   either the output buffer or a user buffer.  If decompressing, the inflate
+   state and the check value will be initialized.  gz_head() will return 0 on
+   success or -1 on failure.  Failures may include read errors or gzip header
+   errors.  */
+local int gz_head(state)
+    gz_statep state;
+{
+    z_streamp strm = &(state->strm);
+    int flags;
+    unsigned len;
+
+    /* allocate read buffers and inflate memory */
+    if (state->size == 0) {
+        /* allocate buffers */
+        state->in = malloc(state->want);
+        state->out = malloc(state->want << 1);
+        if (state->in == NULL || state->out == NULL) {
+            if (state->out != NULL)
+                free(state->out);
+            if (state->in != NULL)
+                free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+        state->size = state->want;
+
+        /* allocate inflate memory */
+        state->strm.zalloc = Z_NULL;
+        state->strm.zfree = Z_NULL;
+        state->strm.opaque = Z_NULL;
+        state->strm.avail_in = 0;
+        state->strm.next_in = Z_NULL;
+        if (inflateInit2(&(state->strm), -15) != Z_OK) {    /* raw inflate */
+            free(state->out);
+            free(state->in);
+            state->size = 0;
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+    }
+
+    /* get some data in the input buffer */
+    if (strm->avail_in == 0) {
+        if (gz_avail(state) == -1)
+            return -1;
+        if (strm->avail_in == 0)
+            return 0;
+    }
+
+    /* look for the gzip magic header bytes 31 and 139 */
+    if (strm->next_in[0] == 31) {
+        strm->avail_in--;
+        strm->next_in++;
+        if (strm->avail_in == 0 && gz_avail(state) == -1)
+            return -1;
+        if (strm->avail_in && strm->next_in[0] == 139) {
+            /* we have a gzip header, woo hoo! */
+            strm->avail_in--;
+            strm->next_in++;
+
+            /* skip rest of header */
+            if (NEXT() != 8) {      /* compression method */
+                gz_error(state, Z_DATA_ERROR, "unknown compression method");
+                return -1;
+            }
+            flags = NEXT();
+            if (flags & 0xe0) {     /* reserved flag bits */
+                gz_error(state, Z_DATA_ERROR, "unknown header flags set");
+                return -1;
+            }
+            NEXT();                 /* modification time */
+            NEXT();
+            NEXT();
+            NEXT();
+            NEXT();                 /* extra flags */
+            NEXT();                 /* operating system */
+            if (flags & 4) {        /* extra field */
+                len = (unsigned)NEXT();
+                len += (unsigned)NEXT() << 8;
+                while (len--)
+                    if (NEXT() < 0)
+                        break;
+            }
+            if (flags & 8)          /* file name */
+                while (NEXT() > 0)
+                    ;
+            if (flags & 16)         /* comment */
+                while (NEXT() > 0)
+                    ;
+            if (flags & 2) {        /* header crc */
+                NEXT();
+                NEXT();
+            }
+            /* an unexpected end of file is not checked for here -- it will be
+               noticed on the first request for uncompressed data */
+
+            /* set up for decompression */
+            inflateReset(strm);
+            strm->adler = crc32(0L, Z_NULL, 0);
+            state->how = GZIP;
+            state->direct = 0;
+            return 0;
+        }
+        else {
+            /* not a gzip file -- save first byte (31) and fall to raw i/o */
+            state->out[0] = 31;
+            state->have = 1;
+        }
+    }
+
+    /* doing raw i/o, save start of raw data for seeking, copy any leftover
+       input to output -- this assumes that the output buffer is larger than
+       the input buffer, which also assures space for gzungetc() */
+    state->raw = state->pos;
+    state->next = state->out;
+    if (strm->avail_in) {
+        memcpy(state->next + state->have, strm->next_in, strm->avail_in);
+        state->have += strm->avail_in;
+        strm->avail_in = 0;
+    }
+    state->how = COPY;
+    state->direct = 1;
+    return 0;
+}
+
+/* Decompress from input to the provided next_out and avail_out in the state.
+   If the end of the compressed data is reached, then verify the gzip trailer
+   check value and length (modulo 2^32).  state->have and state->next are set
+   to point to the just decompressed data, and the crc is updated.  If the
+   trailer is verified, state->how is reset to LOOK to look for the next gzip
+   stream or raw data, once state->have is depleted.  Returns 0 on success, -1
+   on failure.  Failures may include invalid compressed data or a failed gzip
+   trailer verification. */
+local int gz_decomp(state)
+    gz_statep state;
+{
+    int ret;
+    unsigned had;
+    unsigned long crc, len;
+    z_streamp strm = &(state->strm);
+
+    /* fill output buffer up to end of deflate stream */
+    had = strm->avail_out;
+    do {
+        /* get more input for inflate() */
+        if (strm->avail_in == 0 && gz_avail(state) == -1)
+            return -1;
+        if (strm->avail_in == 0) {
+            gz_error(state, Z_DATA_ERROR, "unexpected end of file");
+            return -1;
+        }
+
+        /* decompress and handle errors */
+        ret = inflate(strm, Z_NO_FLUSH);
+        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
+            gz_error(state, Z_STREAM_ERROR,
+                      "internal error: inflate stream corrupt");
+            return -1;
+        }
+        if (ret == Z_MEM_ERROR) {
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+        if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */
+            gz_error(state, Z_DATA_ERROR,
+                      strm->msg == NULL ? "compressed data error" : strm->msg);
+            return -1;
+        }
+    } while (strm->avail_out && ret != Z_STREAM_END);
+
+    /* update available output and crc check value */
+    state->have = had - strm->avail_out;
+    state->next = strm->next_out - state->have;
+    strm->adler = crc32(strm->adler, state->next, state->have);
+
+    /* check gzip trailer if at end of deflate stream */
+    if (ret == Z_STREAM_END) {
+        if (gz_next4(state, &crc) == -1 || gz_next4(state, &len) == -1) {
+            gz_error(state, Z_DATA_ERROR, "unexpected end of file");
+            return -1;
+        }
+        if (crc != strm->adler) {
+            gz_error(state, Z_DATA_ERROR, "incorrect data check");
+            return -1;
+        }
+        if (len != (strm->total_out & 0xffffffffL)) {
+            gz_error(state, Z_DATA_ERROR, "incorrect length check");
+            return -1;
+        }
+        state->how = LOOK;      /* ready for next stream, once have is 0 (leave
+                                   state->direct unchanged to remember how) */
+    }
+
+    /* good decompression */
+    return 0;
+}
+
+/* Make data and put in the output buffer.  Assumes that state->have == 0.
+   Data is either copied from the input file or decompressed from the input
+   file depending on state->how.  If state->how is LOOK, then a gzip header is
+   looked for (and skipped if found) to determine wither to copy or decompress.
+   Returns -1 on error, otherwise 0.  gz_make() will leave state->have as COPY
+   or GZIP unless the end of the input file has been reached and all data has
+   been processed.  */
+local int gz_make(state)
+    gz_statep state;
+{
+    z_streamp strm = &(state->strm);
+
+    if (state->how == LOOK) {           /* look for gzip header */
+        if (gz_head(state) == -1)
+            return -1;
+        if (state->have)                /* got some data from gz_head() */
+            return 0;
+    }
+    if (state->how == COPY) {           /* straight copy */
+        if (gz_load(state, state->out, state->size << 1, &(state->have)) == -1)
+            return -1;
+        state->next = state->out;
+    }
+    else if (state->how == GZIP) {      /* decompress */
+        strm->avail_out = state->size << 1;
+        strm->next_out = state->out;
+        if (gz_decomp(state) == -1)
+            return -1;
+    }
+    return 0;
+}
+
+/* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */
+local int gz_skip(state, len)
+    gz_statep state;
+    z_off64_t len;
+{
+    unsigned n;
+
+    /* skip over len bytes or reach end-of-file, whichever comes first */
+    while (len)
+        /* skip over whatever is in output buffer */
+        if (state->have) {
+            n = GT_OFF(state->have) || (z_off64_t)state->have > len ?
+                (unsigned)len : state->have;
+            state->have -= n;
+            state->next += n;
+            state->pos += n;
+            len -= n;
+        }
+
+        /* output buffer empty -- return if we're at the end of the input */
+        else if (state->eof && state->strm.avail_in == 0)
+            break;
+
+        /* need more data to skip -- load up output buffer */
+        else {
+            /* get more output, looking for header if required */
+            if (gz_make(state) == -1)
+                return -1;
+        }
+    return 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzread(file, buf, len)
+    gzFile file;
+    voidp buf;
+    unsigned len;
+{
+    unsigned got, n;
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're reading and that there's no error */
+    if (state->mode != GZ_READ || state->err != Z_OK)
+        return -1;
+
+    /* since an int is returned, make sure len fits in one, otherwise return
+       with an error (this avoids the flaw in the interface) */
+    if ((int)len < 0) {
+        gz_error(state, Z_BUF_ERROR, "requested length does not fit in int");
+        return -1;
+    }
+
+    /* if len is zero, avoid unnecessary operations */
+    if (len == 0)
+        return 0;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* get len bytes to buf, or less than len if at the end */
+    got = 0;
+    do {
+        /* first just try copying data from the output buffer */
+        if (state->have) {
+            n = state->have > len ? len : state->have;
+            memcpy(buf, state->next, n);
+            state->next += n;
+            state->have -= n;
+        }
+
+        /* output buffer empty -- return if we're at the end of the input */
+        else if (state->eof && strm->avail_in == 0)
+            break;
+
+        /* need output data -- for small len or new stream load up our output
+           buffer */
+        else if (state->how == LOOK || len < (state->size << 1)) {
+            /* get more output, looking for header if required */
+            if (gz_make(state) == -1)
+                return -1;
+            continue;       /* no progress yet -- go back to memcpy() above */
+            /* the copy above assures that we will leave with space in the
+               output buffer, allowing at least one gzungetc() to succeed */
+        }
+
+        /* large len -- read directly into user buffer */
+        else if (state->how == COPY) {      /* read directly */
+            if (gz_load(state, buf, len, &n) == -1)
+                return -1;
+        }
+
+        /* large len -- decompress directly into user buffer */
+        else {  /* state->how == GZIP */
+            strm->avail_out = len;
+            strm->next_out = buf;
+            if (gz_decomp(state) == -1)
+                return -1;
+            n = state->have;
+            state->have = 0;
+        }
+
+        /* update progress */
+        len -= n;
+        buf = (char *)buf + n;
+        got += n;
+        state->pos += n;
+    } while (len);
+
+    /* return number of bytes read into user buffer (will fit in int) */
+    return (int)got;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzgetc(file)
+    gzFile file;
+{
+    int ret;
+    unsigned char buf[1];
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no error */
+    if (state->mode != GZ_READ || state->err != Z_OK)
+        return -1;
+
+    /* try output buffer (no need to check for skip request) */
+    if (state->have) {
+        state->have--;
+        state->pos++;
+        return *(state->next)++;
+    }
+
+    /* nothing there -- try gzread() */
+    ret = gzread(file, buf, 1);
+    return ret < 1 ? -1 : buf[0];
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzungetc(c, file)
+    int c;
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no error */
+    if (state->mode != GZ_READ || state->err != Z_OK)
+        return -1;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* can't push EOF */
+    if (c < 0)
+        return -1;
+
+    /* if output buffer empty, put byte at end (allows more pushing) */
+    if (state->have == 0) {
+        state->have = 1;
+        state->next = state->out + (state->size << 1) - 1;
+        state->next[0] = c;
+        state->pos--;
+        return c;
+    }
+
+    /* if no room, give up (must have already done a gzungetc()) */
+    if (state->have == (state->size << 1)) {
+        gz_error(state, Z_BUF_ERROR, "out of room to push characters");
+        return -1;
+    }
+
+    /* slide output data if needed and insert byte before existing data */
+    if (state->next == state->out) {
+        unsigned char *src = state->out + state->have;
+        unsigned char *dest = state->out + (state->size << 1);
+        while (src > state->out)
+            *--dest = *--src;
+        state->next = dest;
+    }
+    state->have++;
+    state->next--;
+    state->next[0] = c;
+    state->pos--;
+    return c;
+}
+
+/* -- see zlib.h -- */
+char * ZEXPORT gzgets(file, buf, len)
+    gzFile file;
+    char *buf;
+    int len;
+{
+    unsigned left, n;
+    char *str;
+    unsigned char *eol;
+    gz_statep state;
+
+    /* check parameters and get internal structure */
+    if (file == NULL || buf == NULL || len < 1)
+        return NULL;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no error */
+    if (state->mode != GZ_READ || state->err != Z_OK)
+        return NULL;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return NULL;
+    }
+
+    /* copy output bytes up to new line or len - 1, whichever comes first --
+       append a terminating zero to the string (we don't check for a zero in
+       the contents, let the user worry about that) */
+    str = buf;
+    left = (unsigned)len - 1;
+    if (left) do {
+        /* assure that something is in the output buffer */
+        if (state->have == 0) {
+            if (gz_make(state) == -1)
+                return NULL;            /* error */
+            if (state->have == 0) {     /* end of file */
+                if (buf == str)         /* got bupkus */
+                    return NULL;
+                break;                  /* got something -- return it */
+            }
+        }
+
+        /* look for end-of-line in current output buffer */
+        n = state->have > left ? left : state->have;
+        eol = memchr(state->next, '\n', n);
+        if (eol != NULL)
+            n = (unsigned)(eol - state->next) + 1;
+
+        /* copy through end-of-line, or remainder if not found */
+        memcpy(buf, state->next, n);
+        state->have -= n;
+        state->next += n;
+        state->pos += n;
+        left -= n;
+        buf += n;
+    } while (left && eol == NULL);
+
+    /* found end-of-line or out of space -- terminate string and return it */
+    buf[0] = 0;
+    return str;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzdirect(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+
+    /* check that we're reading */
+    if (state->mode != GZ_READ)
+        return 0;
+
+    /* if the state is not known, but we can find out, then do so (this is
+       mainly for right after a gzopen() or gzdopen()) */
+    if (state->how == LOOK && state->have == 0)
+        (void)gz_head(state);
+
+    /* return 1 if reading direct, 0 if decompressing a gzip stream */
+    return state->direct;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzclose_r(file)
+    gzFile file;
+{
+    int ret;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    /* check that we're reading */
+    if (state->mode != GZ_READ)
+        return Z_STREAM_ERROR;
+
+    /* free memory and close file */
+    if (state->size) {
+        inflateEnd(&(state->strm));
+        free(state->out);
+        free(state->in);
+    }
+    gz_error(state, Z_OK, NULL);
+    free(state->path);
+    ret = close(state->fd);
+    free(state);
+    return ret ? Z_ERRNO : Z_OK;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzwrite.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzwrite.c
new file mode 100644
index 00000000..e8defc68
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/gzwrite.c
@@ -0,0 +1,531 @@
+/* gzwrite.c -- zlib functions for writing gzip files
+ * Copyright (C) 2004, 2005, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* Local functions */
+local int gz_init OF((gz_statep));
+local int gz_comp OF((gz_statep, int));
+local int gz_zero OF((gz_statep, z_off64_t));
+
+/* Initialize state for writing a gzip file.  Mark initialization by setting
+   state->size to non-zero.  Return -1 on failure or 0 on success. */
+local int gz_init(state)
+    gz_statep state;
+{
+    int ret;
+    z_streamp strm = &(state->strm);
+
+    /* allocate input and output buffers */
+    state->in = malloc(state->want);
+    state->out = malloc(state->want);
+    if (state->in == NULL || state->out == NULL) {
+        if (state->out != NULL)
+            free(state->out);
+        if (state->in != NULL)
+            free(state->in);
+        gz_error(state, Z_MEM_ERROR, "out of memory");
+        return -1;
+    }
+
+    /* allocate deflate memory, set up for gzip compression */
+    strm->zalloc = Z_NULL;
+    strm->zfree = Z_NULL;
+    strm->opaque = Z_NULL;
+    ret = deflateInit2(strm, state->level, Z_DEFLATED,
+                       15 + 16, 8, state->strategy);
+    if (ret != Z_OK) {
+        free(state->in);
+        gz_error(state, Z_MEM_ERROR, "out of memory");
+        return -1;
+    }
+
+    /* mark state as initialized */
+    state->size = state->want;
+
+    /* initialize write buffer */
+    strm->avail_out = state->size;
+    strm->next_out = state->out;
+    state->next = strm->next_out;
+    return 0;
+}
+
+/* Compress whatever is at avail_in and next_in and write to the output file.
+   Return -1 if there is an error writing to the output file, otherwise 0.
+   flush is assumed to be a valid deflate() flush value.  If flush is Z_FINISH,
+   then the deflate() state is reset to start a new gzip stream. */
+local int gz_comp(state, flush)
+    gz_statep state;
+    int flush;
+{
+    int ret, got;
+    unsigned have;
+    z_streamp strm = &(state->strm);
+
+    /* allocate memory if this is the first time through */
+    if (state->size == 0 && gz_init(state) == -1)
+        return -1;
+
+    /* run deflate() on provided input until it produces no more output */
+    ret = Z_OK;
+    do {
+        /* write out current buffer contents if full, or if flushing, but if
+           doing Z_FINISH then don't write until we get to Z_STREAM_END */
+        if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
+            (flush != Z_FINISH || ret == Z_STREAM_END))) {
+            have = (unsigned)(strm->next_out - state->next);
+            if (have && ((got = write(state->fd, state->next, have)) < 0 ||
+                         (unsigned)got != have)) {
+                gz_error(state, Z_ERRNO, zstrerror());
+                return -1;
+            }
+            if (strm->avail_out == 0) {
+                strm->avail_out = state->size;
+                strm->next_out = state->out;
+            }
+            state->next = strm->next_out;
+        }
+
+        /* compress */
+        have = strm->avail_out;
+        ret = deflate(strm, flush);
+        if (ret == Z_STREAM_ERROR) {
+            gz_error(state, Z_STREAM_ERROR,
+                      "internal error: deflate stream corrupt");
+            return -1;
+        }
+        have -= strm->avail_out;
+    } while (have);
+
+    /* if that completed a deflate stream, allow another to start */
+    if (flush == Z_FINISH)
+        deflateReset(strm);
+
+    /* all done, no errors */
+    return 0;
+}
+
+/* Compress len zeros to output.  Return -1 on error, 0 on success. */
+local int gz_zero(state, len)
+    gz_statep state;
+    z_off64_t len;
+{
+    int first;
+    unsigned n;
+    z_streamp strm = &(state->strm);
+
+    /* consume whatever's left in the input buffer */
+    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+        return -1;
+
+    /* compress len zeros (len guaranteed > 0) */
+    first = 1;
+    while (len) {
+        n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
+            (unsigned)len : state->size;
+        if (first) {
+            memset(state->in, 0, n);
+            first = 0;
+        }
+        strm->avail_in = n;
+        strm->next_in = state->in;
+        state->pos += n;
+        if (gz_comp(state, Z_NO_FLUSH) == -1)
+            return -1;
+        len -= n;
+    }
+    return 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzwrite(file, buf, len)
+    gzFile file;
+    voidpc buf;
+    unsigned len;
+{
+    unsigned put = len;
+    unsigned n;
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return 0;
+
+    /* since an int is returned, make sure len fits in one, otherwise return
+       with an error (this avoids the flaw in the interface) */
+    if ((int)len < 0) {
+        gz_error(state, Z_BUF_ERROR, "requested length does not fit in int");
+        return 0;
+    }
+
+    /* if len is zero, avoid unnecessary operations */
+    if (len == 0)
+        return 0;
+
+    /* allocate memory if this is the first time through */
+    if (state->size == 0 && gz_init(state) == -1)
+        return 0;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return 0;
+    }
+
+    /* for small len, copy to input buffer, otherwise compress directly */
+    if (len < state->size) {
+        /* copy to input buffer, compress when full */
+        do {
+            if (strm->avail_in == 0)
+                strm->next_in = state->in;
+            n = state->size - strm->avail_in;
+            if (n > len)
+                n = len;
+            memcpy(strm->next_in + strm->avail_in, buf, n);
+            strm->avail_in += n;
+            state->pos += n;
+            buf = (char *)buf + n;
+            len -= n;
+            if (len && gz_comp(state, Z_NO_FLUSH) == -1)
+                return 0;
+        } while (len);
+    }
+    else {
+        /* consume whatever's left in the input buffer */
+        if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+            return 0;
+
+        /* directly compress user buffer to file */
+        strm->avail_in = len;
+        strm->next_in = (voidp)buf;
+        state->pos += len;
+        if (gz_comp(state, Z_NO_FLUSH) == -1)
+            return 0;
+    }
+
+    /* input was all buffered or compressed (put will fit in int) */
+    return (int)put;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzputc(file, c)
+    gzFile file;
+    int c;
+{
+    unsigned char buf[1];
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return -1;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* try writing to input buffer for speed (state->size == 0 if buffer not
+       initialized) */
+    if (strm->avail_in < state->size) {
+        if (strm->avail_in == 0)
+            strm->next_in = state->in;
+        strm->next_in[strm->avail_in++] = c;
+        state->pos++;
+        return c;
+    }
+
+    /* no room in buffer or not initialized, use gz_write() */
+    buf[0] = c;
+    if (gzwrite(file, buf, 1) != 1)
+        return -1;
+    return c;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzputs(file, str)
+    gzFile file;
+    const char *str;
+{
+    int ret;
+    unsigned len;
+
+    /* write string */
+    len = (unsigned)strlen(str);
+    ret = gzwrite(file, str, len);
+    return ret == 0 && len != 0 ? -1 : ret;
+}
+
+#ifdef STDC
+#include <stdarg.h>
+
+/* -- see zlib.h -- */
+int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
+{
+    int size, len;
+    gz_statep state;
+    z_streamp strm;
+    va_list va;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return 0;
+
+    /* make sure we have some buffer space */
+    if (state->size == 0 && gz_init(state) == -1)
+        return 0;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return 0;
+    }
+
+    /* consume whatever's left in the input buffer */
+    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+        return 0;
+
+    /* do the printf() into the input buffer, put length in len */
+    size = (int)(state->size);
+    state->in[size - 1] = 0;
+    va_start(va, format);
+#ifdef NO_vsnprintf
+#  ifdef HAS_vsprintf_void
+    (void)vsprintf(state->in, format, va);
+    va_end(va);
+    for (len = 0; len < size; len++)
+        if (state->in[len] == 0) break;
+#  else
+    len = vsprintf(state->in, format, va);
+    va_end(va);
+#  endif
+#else
+#  ifdef HAS_vsnprintf_void
+    (void)vsnprintf(state->in, size, format, va);
+    va_end(va);
+    len = strlen(state->in);
+#  else
+    len = vsnprintf((char *)(state->in), size, format, va);
+    va_end(va);
+#  endif
+#endif
+
+    /* check that printf() results fit in buffer */
+    if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)
+        return 0;
+
+    /* update buffer and position, defer compression until needed */
+    strm->avail_in = (unsigned)len;
+    strm->next_in = state->in;
+    state->pos += len;
+    return len;
+}
+
+#else /* !STDC */
+
+/* -- see zlib.h -- */
+int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
+    gzFile file;
+    const char *format;
+    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
+{
+    int size, len;
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return 0;
+
+    /* make sure we have some buffer space */
+    if (state->size == 0 && gz_init(state) == -1)
+        return 0;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return 0;
+    }
+
+    /* consume whatever's left in the input buffer */
+    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+        return 0;
+
+    /* do the printf() into the input buffer, put length in len */
+    size = (int)(state->size);
+    state->in[size - 1] = 0;
+#ifdef NO_snprintf
+#  ifdef HAS_sprintf_void
+    sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,
+            a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    for (len = 0; len < size; len++)
+        if (state->in[len] == 0) break;
+#  else
+    len = sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,
+                a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#  endif
+#else
+#  ifdef HAS_snprintf_void
+    snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,
+             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    len = strlen(state->in);
+#  else
+    len = snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,
+                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#  endif
+#endif
+
+    /* check that printf() results fit in buffer */
+    if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)
+        return 0;
+
+    /* update buffer and position, defer compression until needed */
+    strm->avail_in = (unsigned)len;
+    strm->next_in = state->in;
+    state->pos += len;
+    return len;
+}
+
+#endif
+
+/* -- see zlib.h -- */
+int ZEXPORT gzflush(file, flush)
+    gzFile file;
+    int flush;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* check flush parameter */
+    if (flush < 0 || flush > Z_FINISH)
+        return Z_STREAM_ERROR;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* compress remaining data with requested flush */
+    gz_comp(state, flush);
+    return state->err;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzsetparams(file, level, strategy)
+    gzFile file;
+    int level;
+    int strategy;
+{
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* if no change is requested, then do nothing */
+    if (level == state->level && strategy == state->strategy)
+        return Z_OK;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* change compression parameters for subsequent input */
+    if (state->size) {
+        /* flush previous input with previous parameters before changing */
+        if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1)
+            return state->err;
+        deflateParams(strm, level, strategy);
+    }
+    state->level = level;
+    state->strategy = strategy;
+    return Z_OK;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzclose_w(file)
+    gzFile file;
+{
+    int ret = 0;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    /* check that we're writing */
+    if (state->mode != GZ_WRITE)
+        return Z_STREAM_ERROR;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        ret += gz_zero(state, state->skip);
+    }
+
+    /* flush, free memory, and close file */
+    ret += gz_comp(state, Z_FINISH);
+    (void)deflateEnd(&(state->strm));
+    free(state->out);
+    free(state->in);
+    gz_error(state, Z_OK, NULL);
+    free(state->path);
+    ret += close(state->fd);
+    free(state);
+    return ret ? Z_ERRNO : Z_OK;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/infback.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/infback.c
new file mode 100644
index 00000000..af3a8c96
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/infback.c
@@ -0,0 +1,632 @@
+/* infback.c -- inflate using a call-back interface
+ * Copyright (C) 1995-2009 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+   This code is largely copied from inflate.c.  Normally either infback.o or
+   inflate.o would be linked into an application--not both.  The interface
+   with inffast.c is retained so that optimized assembler-coded versions of
+   inflate_fast() can be used with either inflate.c or infback.c.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+/* function prototypes */
+local void fixedtables OF((struct inflate_state FAR *state));
+
+/*
+   strm provides memory allocation functions in zalloc and zfree, or
+   Z_NULL to use the library memory allocation functions.
+
+   windowBits is in the range 8..15, and window is a user-supplied
+   window and output buffer that is 2**windowBits bytes.
+ */
+int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
+z_streamp strm;
+int windowBits;
+unsigned char FAR *window;
+const char *version;
+int stream_size;
+{
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL || window == Z_NULL ||
+        windowBits < 8 || windowBits > 15)
+        return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+    }
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
+                                               sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    state->dmax = 32768U;
+    state->wbits = windowBits;
+    state->wsize = 1U << windowBits;
+    state->window = window;
+    state->wnext = 0;
+    state->whave = 0;
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+/* Macros for inflateBack(): */
+
+/* Load returned state from inflate_fast() */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Set state from registers for inflate_fast() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Assure that some input is available.  If input is requested, but denied,
+   then return a Z_BUF_ERROR from inflateBack(). */
+#define PULL() \
+    do { \
+        if (have == 0) { \
+            have = in(in_desc, &next); \
+            if (have == 0) { \
+                next = Z_NULL; \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflateBack()
+   with an error if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        PULL(); \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflateBack() with
+   an error. */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/* Assure that some output space is available, by writing out the window
+   if it's full.  If the write fails, return from inflateBack() with a
+   Z_BUF_ERROR. */
+#define ROOM() \
+    do { \
+        if (left == 0) { \
+            put = state->window; \
+            left = state->wsize; \
+            state->whave = left; \
+            if (out(out_desc, put, left)) { \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/*
+   strm provides the memory allocation functions and window buffer on input,
+   and provides information on the unused input on return.  For Z_DATA_ERROR
+   returns, strm will also provide an error message.
+
+   in() and out() are the call-back input and output functions.  When
+   inflateBack() needs more input, it calls in().  When inflateBack() has
+   filled the window with output, or when it completes with data in the
+   window, it calls out() to write out the data.  The application must not
+   change the provided input until in() is called again or inflateBack()
+   returns.  The application must not change the window/output buffer until
+   inflateBack() returns.
+
+   in() and out() are called with a descriptor parameter provided in the
+   inflateBack() call.  This parameter can be a structure that provides the
+   information required to do the read or write, as well as accumulated
+   information on the input and output such as totals and check values.
+
+   in() should return zero on failure.  out() should return non-zero on
+   failure.  If either in() or out() fails, than inflateBack() returns a
+   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
+   was in() or out() that caused in the error.  Otherwise,  inflateBack()
+   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
+   error, or Z_MEM_ERROR if it could not allocate memory for the state.
+   inflateBack() can also return Z_STREAM_ERROR if the input parameters
+   are not correct, i.e. strm is Z_NULL or the state was not initialized.
+ */
+int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
+z_streamp strm;
+in_func in;
+void FAR *in_desc;
+out_func out;
+void FAR *out_desc;
+{
+    struct inflate_state FAR *state;
+    unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    /* Check that the strm exists and that the state was initialized */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* Reset the state */
+    strm->msg = Z_NULL;
+    state->mode = TYPE;
+    state->last = 0;
+    state->whave = 0;
+    next = strm->next_in;
+    have = next != Z_NULL ? strm->avail_in : 0;
+    hold = 0;
+    bits = 0;
+    put = state->window;
+    left = state->wsize;
+
+    /* Inflate until end of block marked as last */
+    for (;;)
+        switch (state->mode) {
+        case TYPE:
+            /* determine and dispatch block type */
+            if (state->last) {
+                BYTEBITS();
+                state->mode = DONE;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN;              /* decode codes */
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+
+        case STORED:
+            /* get and verify stored block length */
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+
+            /* copy stored block from input to output */
+            while (state->length != 0) {
+                copy = state->length;
+                PULL();
+                ROOM();
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+
+        case TABLE:
+            /* get dynamic table entries descriptor */
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+
+            /* get code length code lengths (not a typo) */
+            state->have = 0;
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+
+            /* get length and distance code code lengths */
+            state->have = 0;
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    NEEDBITS(here.bits);
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = (unsigned)(state->lens[state->have - 1]);
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (code const FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN;
+
+        case LEN:
+            /* use inflate_fast() if we have enough input and output */
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                if (state->whave < state->wsize)
+                    state->whave = state->wsize - left;
+                inflate_fast(strm, state->wsize);
+                LOAD();
+                break;
+            }
+
+            /* get a literal, length, or end-of-block code */
+            for (;;) {
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            state->length = (unsigned)here.val;
+
+            /* process literal */
+            if (here.op == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                ROOM();
+                *put++ = (unsigned char)(state->length);
+                left--;
+                state->mode = LEN;
+                break;
+            }
+
+            /* process end of block */
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->mode = TYPE;
+                break;
+            }
+
+            /* invalid code */
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+
+            /* length code -- get extra bits, if any */
+            state->extra = (unsigned)(here.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+
+            /* get distance code */
+            for (;;) {
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)here.val;
+
+            /* get distance extra bits, if any */
+            state->extra = (unsigned)(here.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            if (state->offset > state->wsize - (state->whave < state->wsize ?
+                                                left : 0)) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+
+            /* copy match from window to output */
+            do {
+                ROOM();
+                copy = state->wsize - state->offset;
+                if (copy < left) {
+                    from = put + copy;
+                    copy = left - copy;
+                }
+                else {
+                    from = put - state->offset;
+                    copy = left;
+                }
+                if (copy > state->length) copy = state->length;
+                state->length -= copy;
+                left -= copy;
+                do {
+                    *put++ = *from++;
+                } while (--copy);
+            } while (state->length != 0);
+            break;
+
+        case DONE:
+            /* inflate stream terminated properly -- write leftover output */
+            ret = Z_STREAM_END;
+            if (left < state->wsize) {
+                if (out(out_desc, state->window, state->wsize - left))
+                    ret = Z_BUF_ERROR;
+            }
+            goto inf_leave;
+
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+
+        default:                /* can't happen, but makes compilers happy */
+            ret = Z_STREAM_ERROR;
+            goto inf_leave;
+        }
+
+    /* Return unused input */
+  inf_leave:
+    strm->next_in = next;
+    strm->avail_in = have;
+    return ret;
+}
+
+int ZEXPORT inflateBackEnd(strm)
+z_streamp strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inffast.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inffast.c
new file mode 100644
index 00000000..2f1d60b4
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inffast.c
@@ -0,0 +1,340 @@
+/* inffast.c -- fast decoding
+ * Copyright (C) 1995-2008, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifndef ASMINF
+
+/* Allow machine dependent optimization for post-increment or pre-increment.
+   Based on testing to date,
+   Pre-increment preferred for:
+   - PowerPC G3 (Adler)
+   - MIPS R5000 (Randers-Pehrson)
+   Post-increment preferred for:
+   - none
+   No measurable difference:
+   - Pentium III (Anderson)
+   - M68060 (Nikl)
+ */
+#ifdef POSTINC
+#  define OFF 0
+#  define PUP(a) *(a)++
+#else
+#  define OFF 1
+#  define PUP(a) *++(a)
+#endif
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state->mode == LEN
+        strm->avail_in >= 6
+        strm->avail_out >= 258
+        start >= strm->avail_out
+        state->bits < 8
+
+   On return, state->mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm->avail_out >= 258 for each loop to avoid checking for
+      output space.
+ */
+void ZLIB_INTERNAL inflate_fast(strm, start)
+z_streamp strm;
+unsigned start;         /* inflate()'s starting value for strm->avail_out */
+{
+    struct inflate_state FAR *state;
+    unsigned char FAR *in;      /* local strm->next_in */
+    unsigned char FAR *last;    /* while in < last, enough input available */
+    unsigned char FAR *out;     /* local strm->next_out */
+    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
+    unsigned char FAR *end;     /* while out < end, enough space available */
+#ifdef INFLATE_STRICT
+    unsigned dmax;              /* maximum distance from zlib header */
+#endif
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned wnext;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
+    unsigned long hold;         /* local strm->hold */
+    unsigned bits;              /* local strm->bits */
+    code const FAR *lcode;      /* local strm->lencode */
+    code const FAR *dcode;      /* local strm->distcode */
+    unsigned lmask;             /* mask for first level of length codes */
+    unsigned dmask;             /* mask for first level of distance codes */
+    code here;                  /* retrieved table entry */
+    unsigned op;                /* code bits, operation, extra bits, or */
+                                /*  window position, window bytes to copy */
+    unsigned len;               /* match length, unused bytes */
+    unsigned dist;              /* match distance */
+    unsigned char FAR *from;    /* where to copy match from */
+
+    /* copy state to local variables */
+    state = (struct inflate_state FAR *)strm->state;
+    in = strm->next_in - OFF;
+    last = in + (strm->avail_in - 5);
+    out = strm->next_out - OFF;
+    beg = out - (start - strm->avail_out);
+    end = out + (strm->avail_out - 257);
+#ifdef INFLATE_STRICT
+    dmax = state->dmax;
+#endif
+    wsize = state->wsize;
+    whave = state->whave;
+    wnext = state->wnext;
+    window = state->window;
+    hold = state->hold;
+    bits = state->bits;
+    lcode = state->lencode;
+    dcode = state->distcode;
+    lmask = (1U << state->lenbits) - 1;
+    dmask = (1U << state->distbits) - 1;
+
+    /* decode literals and length/distances until end-of-block or not enough
+       input data or output space */
+    do {
+        if (bits < 15) {
+            hold += (unsigned long)(PUP(in)) << bits;
+            bits += 8;
+            hold += (unsigned long)(PUP(in)) << bits;
+            bits += 8;
+        }
+        here = lcode[hold & lmask];
+      dolen:
+        op = (unsigned)(here.bits);
+        hold >>= op;
+        bits -= op;
+        op = (unsigned)(here.op);
+        if (op == 0) {                          /* literal */
+            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                    "inflate:         literal '%c'\n" :
+                    "inflate:         literal 0x%02x\n", here.val));
+            PUP(out) = (unsigned char)(here.val);
+        }
+        else if (op & 16) {                     /* length base */
+            len = (unsigned)(here.val);
+            op &= 15;                           /* number of extra bits */
+            if (op) {
+                if (bits < op) {
+                    hold += (unsigned long)(PUP(in)) << bits;
+                    bits += 8;
+                }
+                len += (unsigned)hold & ((1U << op) - 1);
+                hold >>= op;
+                bits -= op;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", len));
+            if (bits < 15) {
+                hold += (unsigned long)(PUP(in)) << bits;
+                bits += 8;
+                hold += (unsigned long)(PUP(in)) << bits;
+                bits += 8;
+            }
+            here = dcode[hold & dmask];
+          dodist:
+            op = (unsigned)(here.bits);
+            hold >>= op;
+            bits -= op;
+            op = (unsigned)(here.op);
+            if (op & 16) {                      /* distance base */
+                dist = (unsigned)(here.val);
+                op &= 15;                       /* number of extra bits */
+                if (bits < op) {
+                    hold += (unsigned long)(PUP(in)) << bits;
+                    bits += 8;
+                    if (bits < op) {
+                        hold += (unsigned long)(PUP(in)) << bits;
+                        bits += 8;
+                    }
+                }
+                dist += (unsigned)hold & ((1U << op) - 1);
+#ifdef INFLATE_STRICT
+                if (dist > dmax) {
+                    strm->msg = (char *)"invalid distance too far back";
+                    state->mode = BAD;
+                    break;
+                }
+#endif
+                hold >>= op;
+                bits -= op;
+                Tracevv((stderr, "inflate:         distance %u\n", dist));
+                op = (unsigned)(out - beg);     /* max distance in output */
+                if (dist > op) {                /* see if copy from window */
+                    op = dist - op;             /* distance back in window */
+                    if (op > whave) {
+                        if (state->sane) {
+                            strm->msg =
+                                (char *)"invalid distance too far back";
+                            state->mode = BAD;
+                            break;
+                        }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                        if (len <= op - whave) {
+                            do {
+                                PUP(out) = 0;
+                            } while (--len);
+                            continue;
+                        }
+                        len -= op - whave;
+                        do {
+                            PUP(out) = 0;
+                        } while (--op > whave);
+                        if (op == 0) {
+                            from = out - dist;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--len);
+                            continue;
+                        }
+#endif
+                    }
+                    from = window - OFF;
+                    if (wnext == 0) {           /* very common case */
+                        from += wsize - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    else if (wnext < op) {      /* wrap around window */
+                        from += wsize + wnext - op;
+                        op -= wnext;
+                        if (op < len) {         /* some from end of window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = window - OFF;
+                            if (wnext < len) {  /* some from start of window */
+                                op = wnext;
+                                len -= op;
+                                do {
+                                    PUP(out) = PUP(from);
+                                } while (--op);
+                                from = out - dist;      /* rest from output */
+                            }
+                        }
+                    }
+                    else {                      /* contiguous in window */
+                        from += wnext - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    while (len > 2) {
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        len -= 3;
+                    }
+                    if (len) {
+                        PUP(out) = PUP(from);
+                        if (len > 1)
+                            PUP(out) = PUP(from);
+                    }
+                }
+                else {
+                    from = out - dist;          /* copy direct from output */
+                    do {                        /* minimum length is three */
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        len -= 3;
+                    } while (len > 2);
+                    if (len) {
+                        PUP(out) = PUP(from);
+                        if (len > 1)
+                            PUP(out) = PUP(from);
+                    }
+                }
+            }
+            else if ((op & 64) == 0) {          /* 2nd level distance code */
+                here = dcode[here.val + (hold & ((1U << op) - 1))];
+                goto dodist;
+            }
+            else {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+        }
+        else if ((op & 64) == 0) {              /* 2nd level length code */
+            here = lcode[here.val + (hold & ((1U << op) - 1))];
+            goto dolen;
+        }
+        else if (op & 32) {                     /* end-of-block */
+            Tracevv((stderr, "inflate:         end of block\n"));
+            state->mode = TYPE;
+            break;
+        }
+        else {
+            strm->msg = (char *)"invalid literal/length code";
+            state->mode = BAD;
+            break;
+        }
+    } while (in < last && out < end);
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    len = bits >> 3;
+    in -= len;
+    bits -= len << 3;
+    hold &= (1U << bits) - 1;
+
+    /* update state and return */
+    strm->next_in = in + OFF;
+    strm->next_out = out + OFF;
+    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
+    strm->avail_out = (unsigned)(out < end ?
+                                 257 + (end - out) : 257 - (out - end));
+    state->hold = hold;
+    state->bits = bits;
+    return;
+}
+
+/*
+   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
+   - Using bit fields for code structure
+   - Different op definition to avoid & for extra bits (do & for table bits)
+   - Three separate decoding do-loops for direct, window, and wnext == 0
+   - Special case for distance > 1 copies to do overlapped load and store copy
+   - Explicit branch predictions (based on measured branch probabilities)
+   - Deferring match copy and interspersed it with decoding subsequent codes
+   - Swapping literal/length else
+   - Swapping window/direct else
+   - Larger unrolled copy loops (three is about right)
+   - Moving len -= 3 statement into middle of loop
+ */
+
+#endif /* !ASMINF */
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inffast.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inffast.h
new file mode 100644
index 00000000..e5c1aa4c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inffast.h
@@ -0,0 +1,11 @@
+/* inffast.h -- header to use inffast.c
+ * Copyright (C) 1995-2003, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inffixed.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inffixed.h
new file mode 100644
index 00000000..75ed4b59
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inffixed.h
@@ -0,0 +1,94 @@
+    /* inffixed.h -- table for decoding fixed codes
+     * Generated automatically by makefixed().
+     */
+
+    /* WARNING: this file should *not* be used by applications. It
+       is part of the implementation of the compression library and
+       is subject to change. Applications should only use zlib.h.
+     */
+
+    static const code lenfix[512] = {
+        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
+        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
+        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
+        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
+        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
+        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
+        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
+        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
+        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
+        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
+        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
+        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
+        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
+        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
+        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
+        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
+        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
+        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
+        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
+        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
+        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
+        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
+        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
+        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
+        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
+        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
+        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
+        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
+        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
+        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
+        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
+        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
+        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
+        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
+        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
+        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
+        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
+        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
+        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
+        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
+        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
+        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
+        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
+        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
+        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
+        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
+        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
+        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
+        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
+        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
+        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
+        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
+        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
+        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
+        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
+        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
+        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
+        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
+        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
+        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
+        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
+        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
+        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
+        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
+        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
+        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
+        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
+        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
+        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
+        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
+        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
+        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
+        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
+        {0,9,255}
+    };
+
+    static const code distfix[32] = {
+        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
+        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
+        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
+        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
+        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
+        {22,5,193},{64,5,0}
+    };
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inflate.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inflate.c
new file mode 100644
index 00000000..a8431abe
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inflate.c
@@ -0,0 +1,1480 @@
+/* inflate.c -- zlib decompression
+ * Copyright (C) 1995-2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * Change history:
+ *
+ * 1.2.beta0    24 Nov 2002
+ * - First version -- complete rewrite of inflate to simplify code, avoid
+ *   creation of window when not needed, minimize use of window when it is
+ *   needed, make inffast.c even faster, implement gzip decoding, and to
+ *   improve code readability and style over the previous zlib inflate code
+ *
+ * 1.2.beta1    25 Nov 2002
+ * - Use pointers for available input and output checking in inffast.c
+ * - Remove input and output counters in inffast.c
+ * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
+ * - Remove unnecessary second byte pull from length extra in inffast.c
+ * - Unroll direct copy to three copies per loop in inffast.c
+ *
+ * 1.2.beta2    4 Dec 2002
+ * - Change external routine names to reduce potential conflicts
+ * - Correct filename to inffixed.h for fixed tables in inflate.c
+ * - Make hbuf[] unsigned char to match parameter type in inflate.c
+ * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
+ *   to avoid negation problem on Alphas (64 bit) in inflate.c
+ *
+ * 1.2.beta3    22 Dec 2002
+ * - Add comments on state->bits assertion in inffast.c
+ * - Add comments on op field in inftrees.h
+ * - Fix bug in reuse of allocated window after inflateReset()
+ * - Remove bit fields--back to byte structure for speed
+ * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
+ * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
+ * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
+ * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
+ * - Use local copies of stream next and avail values, as well as local bit
+ *   buffer and bit count in inflate()--for speed when inflate_fast() not used
+ *
+ * 1.2.beta4    1 Jan 2003
+ * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
+ * - Move a comment on output buffer sizes from inffast.c to inflate.c
+ * - Add comments in inffast.c to introduce the inflate_fast() routine
+ * - Rearrange window copies in inflate_fast() for speed and simplification
+ * - Unroll last copy for window match in inflate_fast()
+ * - Use local copies of window variables in inflate_fast() for speed
+ * - Pull out common wnext == 0 case for speed in inflate_fast()
+ * - Make op and len in inflate_fast() unsigned for consistency
+ * - Add FAR to lcode and dcode declarations in inflate_fast()
+ * - Simplified bad distance check in inflate_fast()
+ * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
+ *   source file infback.c to provide a call-back interface to inflate for
+ *   programs like gzip and unzip -- uses window as output buffer to avoid
+ *   window copying
+ *
+ * 1.2.beta5    1 Jan 2003
+ * - Improved inflateBack() interface to allow the caller to provide initial
+ *   input in strm.
+ * - Fixed stored blocks bug in inflateBack()
+ *
+ * 1.2.beta6    4 Jan 2003
+ * - Added comments in inffast.c on effectiveness of POSTINC
+ * - Typecasting all around to reduce compiler warnings
+ * - Changed loops from while (1) or do {} while (1) to for (;;), again to
+ *   make compilers happy
+ * - Changed type of window in inflateBackInit() to unsigned char *
+ *
+ * 1.2.beta7    27 Jan 2003
+ * - Changed many types to unsigned or unsigned short to avoid warnings
+ * - Added inflateCopy() function
+ *
+ * 1.2.0        9 Mar 2003
+ * - Changed inflateBack() interface to provide separate opaque descriptors
+ *   for the in() and out() functions
+ * - Changed inflateBack() argument and in_func typedef to swap the length
+ *   and buffer address return values for the input function
+ * - Check next_in and next_out for Z_NULL on entry to inflate()
+ *
+ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifdef MAKEFIXED
+#  ifndef BUILDFIXED
+#    define BUILDFIXED
+#  endif
+#endif
+
+/* function prototypes */
+local void fixedtables OF((struct inflate_state FAR *state));
+local int updatewindow OF((z_streamp strm, unsigned out));
+#ifdef BUILDFIXED
+   void makefixed OF((void));
+#endif
+local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
+                              unsigned len));
+
+int ZEXPORT inflateReset(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    strm->total_in = strm->total_out = state->total = 0;
+    strm->msg = Z_NULL;
+    strm->adler = 1;        /* to support ill-conceived Java test suite */
+    state->mode = HEAD;
+    state->last = 0;
+    state->havedict = 0;
+    state->dmax = 32768U;
+    state->head = Z_NULL;
+    state->wsize = 0;
+    state->whave = 0;
+    state->wnext = 0;
+    state->hold = 0;
+    state->bits = 0;
+    state->lencode = state->distcode = state->next = state->codes;
+    state->sane = 1;
+    state->back = -1;
+    Tracev((stderr, "inflate: reset\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateReset2(strm, windowBits)
+z_streamp strm;
+int windowBits;
+{
+    int wrap;
+    struct inflate_state FAR *state;
+
+    /* get the state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* extract wrap request from windowBits parameter */
+    if (windowBits < 0) {
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+    else {
+        wrap = (windowBits >> 4) + 1;
+#ifdef GUNZIP
+        if (windowBits < 48)
+            windowBits &= 15;
+#endif
+    }
+
+    /* set number of window bits, free window if different */
+    if (windowBits && (windowBits < 8 || windowBits > 15))
+        return Z_STREAM_ERROR;
+    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
+        ZFREE(strm, state->window);
+        state->window = Z_NULL;
+    }
+
+    /* update state and reset the rest of it */
+    state->wrap = wrap;
+    state->wbits = (unsigned)windowBits;
+    return inflateReset(strm);
+}
+
+int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
+z_streamp strm;
+int windowBits;
+const char *version;
+int stream_size;
+{
+    int ret;
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+    }
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    state = (struct inflate_state FAR *)
+            ZALLOC(strm, 1, sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    state->window = Z_NULL;
+    ret = inflateReset2(strm, windowBits);
+    if (ret != Z_OK) {
+        ZFREE(strm, state);
+        strm->state = Z_NULL;
+    }
+    return ret;
+}
+
+int ZEXPORT inflateInit_(strm, version, stream_size)
+z_streamp strm;
+const char *version;
+int stream_size;
+{
+    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
+}
+
+int ZEXPORT inflatePrime(strm, bits, value)
+z_streamp strm;
+int bits;
+int value;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (bits < 0) {
+        state->hold = 0;
+        state->bits = 0;
+        return Z_OK;
+    }
+    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
+    value &= (1L << bits) - 1;
+    state->hold += value << state->bits;
+    state->bits += bits;
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+/*
+   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
+   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
+   those tables to stdout, which would be piped to inffixed.h.  A small program
+   can simply call makefixed to do this:
+
+    void makefixed(void);
+
+    int main(void)
+    {
+        makefixed();
+        return 0;
+    }
+
+   Then that can be linked with zlib built with MAKEFIXED defined and run:
+
+    a.out > inffixed.h
+ */
+void makefixed()
+{
+    unsigned low, size;
+    struct inflate_state state;
+
+    fixedtables(&state);
+    puts("    /* inffixed.h -- table for decoding fixed codes");
+    puts("     * Generated automatically by makefixed().");
+    puts("     */");
+    puts("");
+    puts("    /* WARNING: this file should *not* be used by applications.");
+    puts("       It is part of the implementation of this library and is");
+    puts("       subject to change. Applications should only use zlib.h.");
+    puts("     */");
+    puts("");
+    size = 1U << 9;
+    printf("    static const code lenfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 7) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
+               state.lencode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+    size = 1U << 5;
+    printf("\n    static const code distfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 6) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
+               state.distcode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+}
+#endif /* MAKEFIXED */
+
+/*
+   Update the window with the last wsize (normally 32K) bytes written before
+   returning.  If window does not exist yet, create it.  This is only called
+   when a window is already in use, or when output has been written during this
+   inflate call, but the end of the deflate stream has not been reached yet.
+   It is also called to create a window for dictionary data when a dictionary
+   is loaded.
+
+   Providing output buffers larger than 32K to inflate() should provide a speed
+   advantage, since only the last 32K of output is copied to the sliding window
+   upon return from inflate(), and since all distances after the first 32K of
+   output will fall in the output data, making match copies simpler and faster.
+   The advantage may be dependent on the size of the processor's data caches.
+ */
+local int updatewindow(strm, out)
+z_streamp strm;
+unsigned out;
+{
+    struct inflate_state FAR *state;
+    unsigned copy, dist;
+
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* if it hasn't been done already, allocate space for the window */
+    if (state->window == Z_NULL) {
+        state->window = (unsigned char FAR *)
+                        ZALLOC(strm, 1U << state->wbits,
+                               sizeof(unsigned char));
+        if (state->window == Z_NULL) return 1;
+    }
+
+    /* if window not in use yet, initialize */
+    if (state->wsize == 0) {
+        state->wsize = 1U << state->wbits;
+        state->wnext = 0;
+        state->whave = 0;
+    }
+
+    /* copy state->wsize or less output bytes into the circular window */
+    copy = out - strm->avail_out;
+    if (copy >= state->wsize) {
+        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
+        state->wnext = 0;
+        state->whave = state->wsize;
+    }
+    else {
+        dist = state->wsize - state->wnext;
+        if (dist > copy) dist = copy;
+        zmemcpy(state->window + state->wnext, strm->next_out - copy, dist);
+        copy -= dist;
+        if (copy) {
+            zmemcpy(state->window, strm->next_out - copy, copy);
+            state->wnext = copy;
+            state->whave = state->wsize;
+        }
+        else {
+            state->wnext += dist;
+            if (state->wnext == state->wsize) state->wnext = 0;
+            if (state->whave < state->wsize) state->whave += dist;
+        }
+    }
+    return 0;
+}
+
+/* Macros for inflate(): */
+
+/* check function to use adler32() for zlib or crc32() for gzip */
+#ifdef GUNZIP
+#  define UPDATE(check, buf, len) \
+    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
+#else
+#  define UPDATE(check, buf, len) adler32(check, buf, len)
+#endif
+
+/* check macros for header crc */
+#ifdef GUNZIP
+#  define CRC2(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        check = crc32(check, hbuf, 2); \
+    } while (0)
+
+#  define CRC4(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        hbuf[2] = (unsigned char)((word) >> 16); \
+        hbuf[3] = (unsigned char)((word) >> 24); \
+        check = crc32(check, hbuf, 4); \
+    } while (0)
+#endif
+
+/* Load registers with state in inflate() for speed */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Restore state from registers in inflate() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflate()
+   if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        if (have == 0) goto inf_leave; \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflate(). */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/* Reverse the bytes in a 32-bit value */
+#define REVERSE(q) \
+    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+
+/*
+   inflate() uses a state machine to process as much input data and generate as
+   much output data as possible before returning.  The state machine is
+   structured roughly as follows:
+
+    for (;;) switch (state) {
+    ...
+    case STATEn:
+        if (not enough input data or output space to make progress)
+            return;
+        ... make progress ...
+        state = STATEm;
+        break;
+    ...
+    }
+
+   so when inflate() is called again, the same case is attempted again, and
+   if the appropriate resources are provided, the machine proceeds to the
+   next state.  The NEEDBITS() macro is usually the way the state evaluates
+   whether it can proceed or should return.  NEEDBITS() does the return if
+   the requested bits are not available.  The typical use of the BITS macros
+   is:
+
+        NEEDBITS(n);
+        ... do something with BITS(n) ...
+        DROPBITS(n);
+
+   where NEEDBITS(n) either returns from inflate() if there isn't enough
+   input left to load n bits into the accumulator, or it continues.  BITS(n)
+   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
+   the low n bits off the accumulator.  INITBITS() clears the accumulator
+   and sets the number of available bits to zero.  BYTEBITS() discards just
+   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
+   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
+
+   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
+   if there is no input available.  The decoding of variable length codes uses
+   PULLBYTE() directly in order to pull just enough bytes to decode the next
+   code, and no more.
+
+   Some states loop until they get enough input, making sure that enough
+   state information is maintained to continue the loop where it left off
+   if NEEDBITS() returns in the loop.  For example, want, need, and keep
+   would all have to actually be part of the saved state in case NEEDBITS()
+   returns:
+
+    case STATEw:
+        while (want < need) {
+            NEEDBITS(n);
+            keep[want++] = BITS(n);
+            DROPBITS(n);
+        }
+        state = STATEx;
+    case STATEx:
+
+   As shown above, if the next state is also the next case, then the break
+   is omitted.
+
+   A state may also return if there is not enough output space available to
+   complete that state.  Those states are copying stored data, writing a
+   literal byte, and copying a matching string.
+
+   When returning, a "goto inf_leave" is used to update the total counters,
+   update the check value, and determine whether any progress has been made
+   during that inflate() call in order to return the proper return code.
+   Progress is defined as a change in either strm->avail_in or strm->avail_out.
+   When there is a window, goto inf_leave will update the window with the last
+   output written.  If a goto inf_leave occurs in the middle of decompression
+   and there is no window currently, goto inf_leave will create one and copy
+   output to the window for the next call of inflate().
+
+   In this implementation, the flush parameter of inflate() only affects the
+   return code (per zlib.h).  inflate() always writes as much as possible to
+   strm->next_out, given the space available and the provided input--the effect
+   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
+   the allocation of and copying into a sliding window until necessary, which
+   provides the effect documented in zlib.h for Z_FINISH when the entire input
+   stream available.  So the only thing the flush parameter actually does is:
+   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
+   will return Z_BUF_ERROR if it has not reached the end of the stream.
+ */
+
+int ZEXPORT inflate(strm, flush)
+z_streamp strm;
+int flush;
+{
+    struct inflate_state FAR *state;
+    unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned in, out;           /* save starting available input and output */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+#ifdef GUNZIP
+    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
+#endif
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0))
+        return Z_STREAM_ERROR;
+
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
+    LOAD();
+    in = have;
+    out = left;
+    ret = Z_OK;
+    for (;;)
+        switch (state->mode) {
+        case HEAD:
+            if (state->wrap == 0) {
+                state->mode = TYPEDO;
+                break;
+            }
+            NEEDBITS(16);
+#ifdef GUNZIP
+            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
+                state->check = crc32(0L, Z_NULL, 0);
+                CRC2(state->check, hold);
+                INITBITS();
+                state->mode = FLAGS;
+                break;
+            }
+            state->flags = 0;           /* expect zlib header */
+            if (state->head != Z_NULL)
+                state->head->done = -1;
+            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
+#else
+            if (
+#endif
+                ((BITS(8) << 8) + (hold >> 8)) % 31) {
+                strm->msg = (char *)"incorrect header check";
+                state->mode = BAD;
+                break;
+            }
+            if (BITS(4) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            DROPBITS(4);
+            len = BITS(4) + 8;
+            if (state->wbits == 0)
+                state->wbits = len;
+            else if (len > state->wbits) {
+                strm->msg = (char *)"invalid window size";
+                state->mode = BAD;
+                break;
+            }
+            state->dmax = 1U << len;
+            Tracev((stderr, "inflate:   zlib header ok\n"));
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = hold & 0x200 ? DICTID : TYPE;
+            INITBITS();
+            break;
+#ifdef GUNZIP
+        case FLAGS:
+            NEEDBITS(16);
+            state->flags = (int)(hold);
+            if ((state->flags & 0xff) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            if (state->flags & 0xe000) {
+                strm->msg = (char *)"unknown header flags set";
+                state->mode = BAD;
+                break;
+            }
+            if (state->head != Z_NULL)
+                state->head->text = (int)((hold >> 8) & 1);
+            if (state->flags & 0x0200) CRC2(state->check, hold);
+            INITBITS();
+            state->mode = TIME;
+        case TIME:
+            NEEDBITS(32);
+            if (state->head != Z_NULL)
+                state->head->time = hold;
+            if (state->flags & 0x0200) CRC4(state->check, hold);
+            INITBITS();
+            state->mode = OS;
+        case OS:
+            NEEDBITS(16);
+            if (state->head != Z_NULL) {
+                state->head->xflags = (int)(hold & 0xff);
+                state->head->os = (int)(hold >> 8);
+            }
+            if (state->flags & 0x0200) CRC2(state->check, hold);
+            INITBITS();
+            state->mode = EXLEN;
+        case EXLEN:
+            if (state->flags & 0x0400) {
+                NEEDBITS(16);
+                state->length = (unsigned)(hold);
+                if (state->head != Z_NULL)
+                    state->head->extra_len = (unsigned)hold;
+                if (state->flags & 0x0200) CRC2(state->check, hold);
+                INITBITS();
+            }
+            else if (state->head != Z_NULL)
+                state->head->extra = Z_NULL;
+            state->mode = EXTRA;
+        case EXTRA:
+            if (state->flags & 0x0400) {
+                copy = state->length;
+                if (copy > have) copy = have;
+                if (copy) {
+                    if (state->head != Z_NULL &&
+                        state->head->extra != Z_NULL) {
+                        len = state->head->extra_len - state->length;
+                        zmemcpy(state->head->extra + len, next,
+                                len + copy > state->head->extra_max ?
+                                state->head->extra_max - len : copy);
+                    }
+                    if (state->flags & 0x0200)
+                        state->check = crc32(state->check, next, copy);
+                    have -= copy;
+                    next += copy;
+                    state->length -= copy;
+                }
+                if (state->length) goto inf_leave;
+            }
+            state->length = 0;
+            state->mode = NAME;
+        case NAME:
+            if (state->flags & 0x0800) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->name != Z_NULL &&
+                            state->length < state->head->name_max)
+                        state->head->name[state->length++] = len;
+                } while (len && copy < have);
+                if (state->flags & 0x0200)
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->name = Z_NULL;
+            state->length = 0;
+            state->mode = COMMENT;
+        case COMMENT:
+            if (state->flags & 0x1000) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->comment != Z_NULL &&
+                            state->length < state->head->comm_max)
+                        state->head->comment[state->length++] = len;
+                } while (len && copy < have);
+                if (state->flags & 0x0200)
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->comment = Z_NULL;
+            state->mode = HCRC;
+        case HCRC:
+            if (state->flags & 0x0200) {
+                NEEDBITS(16);
+                if (hold != (state->check & 0xffff)) {
+                    strm->msg = (char *)"header crc mismatch";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+            }
+            if (state->head != Z_NULL) {
+                state->head->hcrc = (int)((state->flags >> 9) & 1);
+                state->head->done = 1;
+            }
+            strm->adler = state->check = crc32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+            break;
+#endif
+        case DICTID:
+            NEEDBITS(32);
+            strm->adler = state->check = REVERSE(hold);
+            INITBITS();
+            state->mode = DICT;
+        case DICT:
+            if (state->havedict == 0) {
+                RESTORE();
+                return Z_NEED_DICT;
+            }
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+        case TYPE:
+            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
+        case TYPEDO:
+            if (state->last) {
+                BYTEBITS();
+                state->mode = CHECK;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN_;             /* decode codes */
+                if (flush == Z_TREES) {
+                    DROPBITS(2);
+                    goto inf_leave;
+                }
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+        case STORED:
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+            state->mode = COPY_;
+            if (flush == Z_TREES) goto inf_leave;
+        case COPY_:
+            state->mode = COPY;
+        case COPY:
+            copy = state->length;
+            if (copy) {
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                if (copy == 0) goto inf_leave;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+                break;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+        case TABLE:
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+            state->have = 0;
+            state->mode = LENLENS;
+        case LENLENS:
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+            state->have = 0;
+            state->mode = CODELENS;
+        case CODELENS:
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    NEEDBITS(here.bits);
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = state->lens[state->have - 1];
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (code const FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN_;
+            if (flush == Z_TREES) goto inf_leave;
+        case LEN_:
+            state->mode = LEN;
+        case LEN:
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                inflate_fast(strm, out);
+                LOAD();
+                if (state->mode == TYPE)
+                    state->back = -1;
+                break;
+            }
+            state->back = 0;
+            for (;;) {
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            state->length = (unsigned)here.val;
+            if ((int)(here.op) == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                state->mode = LIT;
+                break;
+            }
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->back = -1;
+                state->mode = TYPE;
+                break;
+            }
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = LENEXT;
+        case LENEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+            state->was = state->length;
+            state->mode = DIST;
+        case DIST:
+            for (;;) {
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)here.val;
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = DISTEXT;
+        case DISTEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+#ifdef INFLATE_STRICT
+            if (state->offset > state->dmax) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+            state->mode = MATCH;
+        case MATCH:
+            if (left == 0) goto inf_leave;
+            copy = out - left;
+            if (state->offset > copy) {         /* copy from window */
+                copy = state->offset - copy;
+                if (copy > state->whave) {
+                    if (state->sane) {
+                        strm->msg = (char *)"invalid distance too far back";
+                        state->mode = BAD;
+                        break;
+                    }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                    Trace((stderr, "inflate.c too far\n"));
+                    copy -= state->whave;
+                    if (copy > state->length) copy = state->length;
+                    if (copy > left) copy = left;
+                    left -= copy;
+                    state->length -= copy;
+                    do {
+                        *put++ = 0;
+                    } while (--copy);
+                    if (state->length == 0) state->mode = LEN;
+                    break;
+#endif
+                }
+                if (copy > state->wnext) {
+                    copy -= state->wnext;
+                    from = state->window + (state->wsize - copy);
+                }
+                else
+                    from = state->window + (state->wnext - copy);
+                if (copy > state->length) copy = state->length;
+            }
+            else {                              /* copy from output */
+                from = put - state->offset;
+                copy = state->length;
+            }
+            if (copy > left) copy = left;
+            left -= copy;
+            state->length -= copy;
+            do {
+                *put++ = *from++;
+            } while (--copy);
+            if (state->length == 0) state->mode = LEN;
+            break;
+        case LIT:
+            if (left == 0) goto inf_leave;
+            *put++ = (unsigned char)(state->length);
+            left--;
+            state->mode = LEN;
+            break;
+        case CHECK:
+            if (state->wrap) {
+                NEEDBITS(32);
+                out -= left;
+                strm->total_out += out;
+                state->total += out;
+                if (out)
+                    strm->adler = state->check =
+                        UPDATE(state->check, put - out, out);
+                out = left;
+                if ((
+#ifdef GUNZIP
+                     state->flags ? hold :
+#endif
+                     REVERSE(hold)) != state->check) {
+                    strm->msg = (char *)"incorrect data check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   check matches trailer\n"));
+            }
+#ifdef GUNZIP
+            state->mode = LENGTH;
+        case LENGTH:
+            if (state->wrap && state->flags) {
+                NEEDBITS(32);
+                if (hold != (state->total & 0xffffffffUL)) {
+                    strm->msg = (char *)"incorrect length check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   length matches trailer\n"));
+            }
+#endif
+            state->mode = DONE;
+        case DONE:
+            ret = Z_STREAM_END;
+            goto inf_leave;
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+        case MEM:
+            return Z_MEM_ERROR;
+        case SYNC:
+        default:
+            return Z_STREAM_ERROR;
+        }
+
+    /*
+       Return from inflate(), updating the total counts and the check value.
+       If there was no progress during the inflate() call, return a buffer
+       error.  Call updatewindow() to create and/or update the window state.
+       Note: a memory error from inflate() is non-recoverable.
+     */
+  inf_leave:
+    RESTORE();
+    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
+        if (updatewindow(strm, out)) {
+            state->mode = MEM;
+            return Z_MEM_ERROR;
+        }
+    in -= strm->avail_in;
+    out -= strm->avail_out;
+    strm->total_in += in;
+    strm->total_out += out;
+    state->total += out;
+    if (state->wrap && out)
+        strm->adler = state->check =
+            UPDATE(state->check, strm->next_out - out, out);
+    strm->data_type = state->bits + (state->last ? 64 : 0) +
+                      (state->mode == TYPE ? 128 : 0) +
+                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
+    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
+        ret = Z_BUF_ERROR;
+    return ret;
+}
+
+int ZEXPORT inflateEnd(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->window != Z_NULL) ZFREE(strm, state->window);
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+const Bytef *dictionary;
+uInt dictLength;
+{
+    struct inflate_state FAR *state;
+    unsigned long id;
+
+    /* check state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->wrap != 0 && state->mode != DICT)
+        return Z_STREAM_ERROR;
+
+    /* check for correct dictionary id */
+    if (state->mode == DICT) {
+        id = adler32(0L, Z_NULL, 0);
+        id = adler32(id, dictionary, dictLength);
+        if (id != state->check)
+            return Z_DATA_ERROR;
+    }
+
+    /* copy dictionary to window */
+    if (updatewindow(strm, strm->avail_out)) {
+        state->mode = MEM;
+        return Z_MEM_ERROR;
+    }
+    if (dictLength > state->wsize) {
+        zmemcpy(state->window, dictionary + dictLength - state->wsize,
+                state->wsize);
+        state->whave = state->wsize;
+    }
+    else {
+        zmemcpy(state->window + state->wsize - dictLength, dictionary,
+                dictLength);
+        state->whave = dictLength;
+    }
+    state->havedict = 1;
+    Tracev((stderr, "inflate:   dictionary set\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetHeader(strm, head)
+z_streamp strm;
+gz_headerp head;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
+
+    /* save header structure */
+    state->head = head;
+    head->done = 0;
+    return Z_OK;
+}
+
+/*
+   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
+   or when out of input.  When called, *have is the number of pattern bytes
+   found in order so far, in 0..3.  On return *have is updated to the new
+   state.  If on return *have equals four, then the pattern was found and the
+   return value is how many bytes were read including the last byte of the
+   pattern.  If *have is less than four, then the pattern has not been found
+   yet and the return value is len.  In the latter case, syncsearch() can be
+   called again with more data and the *have state.  *have is initialized to
+   zero for the first call.
+ */
+local unsigned syncsearch(have, buf, len)
+unsigned FAR *have;
+unsigned char FAR *buf;
+unsigned len;
+{
+    unsigned got;
+    unsigned next;
+
+    got = *have;
+    next = 0;
+    while (next < len && got < 4) {
+        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
+            got++;
+        else if (buf[next])
+            got = 0;
+        else
+            got = 4 - got;
+        next++;
+    }
+    *have = got;
+    return next;
+}
+
+int ZEXPORT inflateSync(strm)
+z_streamp strm;
+{
+    unsigned len;               /* number of bytes to look at or looked at */
+    unsigned long in, out;      /* temporary to save total_in and total_out */
+    unsigned char buf[4];       /* to restore bit buffer to byte string */
+    struct inflate_state FAR *state;
+
+    /* check parameters */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
+
+    /* if first time, start search in bit buffer */
+    if (state->mode != SYNC) {
+        state->mode = SYNC;
+        state->hold <<= state->bits & 7;
+        state->bits -= state->bits & 7;
+        len = 0;
+        while (state->bits >= 8) {
+            buf[len++] = (unsigned char)(state->hold);
+            state->hold >>= 8;
+            state->bits -= 8;
+        }
+        state->have = 0;
+        syncsearch(&(state->have), buf, len);
+    }
+
+    /* search available input */
+    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
+    strm->avail_in -= len;
+    strm->next_in += len;
+    strm->total_in += len;
+
+    /* return no joy or set up to restart inflate() on a new block */
+    if (state->have != 4) return Z_DATA_ERROR;
+    in = strm->total_in;  out = strm->total_out;
+    inflateReset(strm);
+    strm->total_in = in;  strm->total_out = out;
+    state->mode = TYPE;
+    return Z_OK;
+}
+
+/*
+   Returns true if inflate is currently at the end of a block generated by
+   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+   implementation to provide an additional safety check. PPP uses
+   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
+   block. When decompressing, PPP checks that at the end of input packet,
+   inflate is waiting for these length bytes.
+ */
+int ZEXPORT inflateSyncPoint(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    return state->mode == STORED && state->bits == 0;
+}
+
+int ZEXPORT inflateCopy(dest, source)
+z_streamp dest;
+z_streamp source;
+{
+    struct inflate_state FAR *state;
+    struct inflate_state FAR *copy;
+    unsigned char FAR *window;
+    unsigned wsize;
+
+    /* check input */
+    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
+        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)source->state;
+
+    /* allocate space */
+    copy = (struct inflate_state FAR *)
+           ZALLOC(source, 1, sizeof(struct inflate_state));
+    if (copy == Z_NULL) return Z_MEM_ERROR;
+    window = Z_NULL;
+    if (state->window != Z_NULL) {
+        window = (unsigned char FAR *)
+                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
+        if (window == Z_NULL) {
+            ZFREE(source, copy);
+            return Z_MEM_ERROR;
+        }
+    }
+
+    /* copy state */
+    zmemcpy(dest, source, sizeof(z_stream));
+    zmemcpy(copy, state, sizeof(struct inflate_state));
+    if (state->lencode >= state->codes &&
+        state->lencode <= state->codes + ENOUGH - 1) {
+        copy->lencode = copy->codes + (state->lencode - state->codes);
+        copy->distcode = copy->codes + (state->distcode - state->codes);
+    }
+    copy->next = copy->codes + (state->next - state->codes);
+    if (window != Z_NULL) {
+        wsize = 1U << state->wbits;
+        zmemcpy(window, state->window, wsize);
+    }
+    copy->window = window;
+    dest->state = (struct internal_state FAR *)copy;
+    return Z_OK;
+}
+
+int ZEXPORT inflateUndermine(strm, subvert)
+z_streamp strm;
+int subvert;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    state->sane = !subvert;
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+    return Z_OK;
+#else
+    state->sane = 1;
+    return Z_DATA_ERROR;
+#endif
+}
+
+long ZEXPORT inflateMark(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
+    state = (struct inflate_state FAR *)strm->state;
+    return ((long)(state->back) << 16) +
+        (state->mode == COPY ? state->length :
+            (state->mode == MATCH ? state->was - state->length : 0));
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inflate.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inflate.h
new file mode 100644
index 00000000..95f4986d
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inflate.h
@@ -0,0 +1,122 @@
+/* inflate.h -- internal inflate state definition
+ * Copyright (C) 1995-2009 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip decoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GUNZIP
+#endif
+
+/* Possible inflate modes between inflate() calls */
+typedef enum {
+    HEAD,       /* i: waiting for magic header */
+    FLAGS,      /* i: waiting for method and flags (gzip) */
+    TIME,       /* i: waiting for modification time (gzip) */
+    OS,         /* i: waiting for extra flags and operating system (gzip) */
+    EXLEN,      /* i: waiting for extra length (gzip) */
+    EXTRA,      /* i: waiting for extra bytes (gzip) */
+    NAME,       /* i: waiting for end of file name (gzip) */
+    COMMENT,    /* i: waiting for end of comment (gzip) */
+    HCRC,       /* i: waiting for header crc (gzip) */
+    DICTID,     /* i: waiting for dictionary check value */
+    DICT,       /* waiting for inflateSetDictionary() call */
+        TYPE,       /* i: waiting for type bits, including last-flag bit */
+        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
+        STORED,     /* i: waiting for stored size (length and complement) */
+        COPY_,      /* i/o: same as COPY below, but only first time in */
+        COPY,       /* i/o: waiting for input or output to copy stored block */
+        TABLE,      /* i: waiting for dynamic block table lengths */
+        LENLENS,    /* i: waiting for code length code lengths */
+        CODELENS,   /* i: waiting for length/lit and distance code lengths */
+            LEN_,       /* i: same as LEN below, but only first time in */
+            LEN,        /* i: waiting for length/lit/eob code */
+            LENEXT,     /* i: waiting for length extra bits */
+            DIST,       /* i: waiting for distance code */
+            DISTEXT,    /* i: waiting for distance extra bits */
+            MATCH,      /* o: waiting for output space to copy string */
+            LIT,        /* o: waiting for output space to write literal */
+    CHECK,      /* i: waiting for 32-bit check value */
+    LENGTH,     /* i: waiting for 32-bit length (gzip) */
+    DONE,       /* finished check, done -- remain here until reset */
+    BAD,        /* got a data error -- remain here until reset */
+    MEM,        /* got an inflate() memory error -- remain here until reset */
+    SYNC        /* looking for synchronization bytes to restart inflate() */
+} inflate_mode;
+
+/*
+    State transitions between above modes -
+
+    (most modes can go to BAD or MEM on error -- not shown for clarity)
+
+    Process header:
+        HEAD -> (gzip) or (zlib) or (raw)
+        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
+                  HCRC -> TYPE
+        (zlib) -> DICTID or TYPE
+        DICTID -> DICT -> TYPE
+        (raw) -> TYPEDO
+    Read deflate blocks:
+            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
+            STORED -> COPY_ -> COPY -> TYPE
+            TABLE -> LENLENS -> CODELENS -> LEN_
+            LEN_ -> LEN
+    Read deflate codes in fixed or dynamic block:
+                LEN -> LENEXT or LIT or TYPE
+                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
+                LIT -> LEN
+    Process trailer:
+        CHECK -> LENGTH -> DONE
+ */
+
+/* state maintained between inflate() calls.  Approximately 10K bytes. */
+struct inflate_state {
+    inflate_mode mode;          /* current inflate mode */
+    int last;                   /* true if processing last block */
+    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */
+    int havedict;               /* true if dictionary provided */
+    int flags;                  /* gzip header method and flags (0 if zlib) */
+    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
+    unsigned long check;        /* protected copy of check value */
+    unsigned long total;        /* protected copy of output count */
+    gz_headerp head;            /* where to save gzip header information */
+        /* sliding window */
+    unsigned wbits;             /* log base 2 of requested window size */
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned wnext;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if needed */
+        /* bit accumulator */
+    unsigned long hold;         /* input bit accumulator */
+    unsigned bits;              /* number of bits in "in" */
+        /* for string and stored block copying */
+    unsigned length;            /* literal or length of data to copy */
+    unsigned offset;            /* distance back to copy string from */
+        /* for table and code decoding */
+    unsigned extra;             /* extra bits needed */
+        /* fixed and dynamic code tables */
+    code const FAR *lencode;    /* starting table for length/literal codes */
+    code const FAR *distcode;   /* starting table for distance codes */
+    unsigned lenbits;           /* index bits for lencode */
+    unsigned distbits;          /* index bits for distcode */
+        /* dynamic table building */
+    unsigned ncode;             /* number of code length code lengths */
+    unsigned nlen;              /* number of length code lengths */
+    unsigned ndist;             /* number of distance code lengths */
+    unsigned have;              /* number of code lengths in lens[] */
+    code FAR *next;             /* next available space in codes[] */
+    unsigned short lens[320];   /* temporary storage for code lengths */
+    unsigned short work[288];   /* work area for code table building */
+    code codes[ENOUGH];         /* space for code tables */
+    int sane;                   /* if false, allow invalid distance too far */
+    int back;                   /* bits back of last unprocessed length/lit */
+    unsigned was;               /* initial length of match */
+};
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inftrees.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inftrees.c
new file mode 100644
index 00000000..11e9c52a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inftrees.c
@@ -0,0 +1,330 @@
+/* inftrees.c -- generate Huffman trees for efficient decoding
+ * Copyright (C) 1995-2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+
+#define MAXBITS 15
+
+const char inflate_copyright[] =
+   " inflate 1.2.5 Copyright 1995-2010 Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/*
+   Build a set of tables to decode the provided canonical Huffman code.
+   The code lengths are lens[0..codes-1].  The result starts at *table,
+   whose indices are 0..2^bits-1.  work is a writable array of at least
+   lens shorts, which is used as a work area.  type is the type of code
+   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
+   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
+   on return points to the next available entry's address.  bits is the
+   requested root table index bits, and on return it is the actual root
+   table index bits.  It will differ if the request is greater than the
+   longest code or if it is less than the shortest code.
+ */
+int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
+codetype type;
+unsigned short FAR *lens;
+unsigned codes;
+code FAR * FAR *table;
+unsigned FAR *bits;
+unsigned short FAR *work;
+{
+    unsigned len;               /* a code's length in bits */
+    unsigned sym;               /* index of code symbols */
+    unsigned min, max;          /* minimum and maximum code lengths */
+    unsigned root;              /* number of index bits for root table */
+    unsigned curr;              /* number of index bits for current table */
+    unsigned drop;              /* code bits to drop for sub-table */
+    int left;                   /* number of prefix codes available */
+    unsigned used;              /* code entries in table used */
+    unsigned huff;              /* Huffman code */
+    unsigned incr;              /* for incrementing code, index */
+    unsigned fill;              /* index for replicating entries */
+    unsigned low;               /* low bits for current root entry */
+    unsigned mask;              /* mask for low root bits */
+    code here;                  /* table entry for duplication */
+    code FAR *next;             /* next available space in table */
+    const unsigned short FAR *base;     /* base value table to use */
+    const unsigned short FAR *extra;    /* extra bits table to use */
+    int end;                    /* use base and extra for symbol > end */
+    unsigned short count[MAXBITS+1];    /* number of codes of each length */
+    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
+    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
+        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195};
+    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+        8193, 12289, 16385, 24577, 0, 0};
+    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
+        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
+        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
+        28, 28, 29, 29, 64, 64};
+
+    /*
+       Process a set of code lengths to create a canonical Huffman code.  The
+       code lengths are lens[0..codes-1].  Each length corresponds to the
+       symbols 0..codes-1.  The Huffman code is generated by first sorting the
+       symbols by length from short to long, and retaining the symbol order
+       for codes with equal lengths.  Then the code starts with all zero bits
+       for the first code of the shortest length, and the codes are integer
+       increments for the same length, and zeros are appended as the length
+       increases.  For the deflate format, these bits are stored backwards
+       from their more natural integer increment ordering, and so when the
+       decoding tables are built in the large loop below, the integer codes
+       are incremented backwards.
+
+       This routine assumes, but does not check, that all of the entries in
+       lens[] are in the range 0..MAXBITS.  The caller must assure this.
+       1..MAXBITS is interpreted as that code length.  zero means that that
+       symbol does not occur in this code.
+
+       The codes are sorted by computing a count of codes for each length,
+       creating from that a table of starting indices for each length in the
+       sorted table, and then entering the symbols in order in the sorted
+       table.  The sorted table is work[], with that space being provided by
+       the caller.
+
+       The length counts are used for other purposes as well, i.e. finding
+       the minimum and maximum length codes, determining if there are any
+       codes at all, checking for a valid set of lengths, and looking ahead
+       at length counts to determine sub-table sizes when building the
+       decoding tables.
+     */
+
+    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
+    for (len = 0; len <= MAXBITS; len++)
+        count[len] = 0;
+    for (sym = 0; sym < codes; sym++)
+        count[lens[sym]]++;
+
+    /* bound code lengths, force root to be within code lengths */
+    root = *bits;
+    for (max = MAXBITS; max >= 1; max--)
+        if (count[max] != 0) break;
+    if (root > max) root = max;
+    if (max == 0) {                     /* no symbols to code at all */
+        here.op = (unsigned char)64;    /* invalid code marker */
+        here.bits = (unsigned char)1;
+        here.val = (unsigned short)0;
+        *(*table)++ = here;             /* make a table to force an error */
+        *(*table)++ = here;
+        *bits = 1;
+        return 0;     /* no symbols, but wait for decoding to report error */
+    }
+    for (min = 1; min < max; min++)
+        if (count[min] != 0) break;
+    if (root < min) root = min;
+
+    /* check for an over-subscribed or incomplete set of lengths */
+    left = 1;
+    for (len = 1; len <= MAXBITS; len++) {
+        left <<= 1;
+        left -= count[len];
+        if (left < 0) return -1;        /* over-subscribed */
+    }
+    if (left > 0 && (type == CODES || max != 1))
+        return -1;                      /* incomplete set */
+
+    /* generate offsets into symbol table for each length for sorting */
+    offs[1] = 0;
+    for (len = 1; len < MAXBITS; len++)
+        offs[len + 1] = offs[len] + count[len];
+
+    /* sort symbols by length, by symbol order within each length */
+    for (sym = 0; sym < codes; sym++)
+        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
+
+    /*
+       Create and fill in decoding tables.  In this loop, the table being
+       filled is at next and has curr index bits.  The code being used is huff
+       with length len.  That code is converted to an index by dropping drop
+       bits off of the bottom.  For codes where len is less than drop + curr,
+       those top drop + curr - len bits are incremented through all values to
+       fill the table with replicated entries.
+
+       root is the number of index bits for the root table.  When len exceeds
+       root, sub-tables are created pointed to by the root entry with an index
+       of the low root bits of huff.  This is saved in low to check for when a
+       new sub-table should be started.  drop is zero when the root table is
+       being filled, and drop is root when sub-tables are being filled.
+
+       When a new sub-table is needed, it is necessary to look ahead in the
+       code lengths to determine what size sub-table is needed.  The length
+       counts are used for this, and so count[] is decremented as codes are
+       entered in the tables.
+
+       used keeps track of how many table entries have been allocated from the
+       provided *table space.  It is checked for LENS and DIST tables against
+       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
+       the initial root table size constants.  See the comments in inftrees.h
+       for more information.
+
+       sym increments through all symbols, and the loop terminates when
+       all codes of length max, i.e. all codes, have been processed.  This
+       routine permits incomplete codes, so another loop after this one fills
+       in the rest of the decoding tables with invalid code markers.
+     */
+
+    /* set up for code type */
+    switch (type) {
+    case CODES:
+        base = extra = work;    /* dummy value--not used */
+        end = 19;
+        break;
+    case LENS:
+        base = lbase;
+        base -= 257;
+        extra = lext;
+        extra -= 257;
+        end = 256;
+        break;
+    default:            /* DISTS */
+        base = dbase;
+        extra = dext;
+        end = -1;
+    }
+
+    /* initialize state for loop */
+    huff = 0;                   /* starting code */
+    sym = 0;                    /* starting code symbol */
+    len = min;                  /* starting code length */
+    next = *table;              /* current table to fill in */
+    curr = root;                /* current table index bits */
+    drop = 0;                   /* current bits to drop from code for index */
+    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
+    used = 1U << root;          /* use root table entries */
+    mask = used - 1;            /* mask for comparing low */
+
+    /* check available table space */
+    if ((type == LENS && used >= ENOUGH_LENS) ||
+        (type == DISTS && used >= ENOUGH_DISTS))
+        return 1;
+
+    /* process all codes and make table entries */
+    for (;;) {
+        /* create table entry */
+        here.bits = (unsigned char)(len - drop);
+        if ((int)(work[sym]) < end) {
+            here.op = (unsigned char)0;
+            here.val = work[sym];
+        }
+        else if ((int)(work[sym]) > end) {
+            here.op = (unsigned char)(extra[work[sym]]);
+            here.val = base[work[sym]];
+        }
+        else {
+            here.op = (unsigned char)(32 + 64);         /* end of block */
+            here.val = 0;
+        }
+
+        /* replicate for those indices with low len bits equal to huff */
+        incr = 1U << (len - drop);
+        fill = 1U << curr;
+        min = fill;                 /* save offset to next table */
+        do {
+            fill -= incr;
+            next[(huff >> drop) + fill] = here;
+        } while (fill != 0);
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+
+        /* go to next symbol, update count, len */
+        sym++;
+        if (--(count[len]) == 0) {
+            if (len == max) break;
+            len = lens[work[sym]];
+        }
+
+        /* create new sub-table if needed */
+        if (len > root && (huff & mask) != low) {
+            /* if first time, transition to sub-tables */
+            if (drop == 0)
+                drop = root;
+
+            /* increment past last table */
+            next += min;            /* here min is 1 << curr */
+
+            /* determine length of next table */
+            curr = len - drop;
+            left = (int)(1 << curr);
+            while (curr + drop < max) {
+                left -= count[curr + drop];
+                if (left <= 0) break;
+                curr++;
+                left <<= 1;
+            }
+
+            /* check for enough space */
+            used += 1U << curr;
+            if ((type == LENS && used >= ENOUGH_LENS) ||
+                (type == DISTS && used >= ENOUGH_DISTS))
+                return 1;
+
+            /* point entry in root table to sub-table */
+            low = huff & mask;
+            (*table)[low].op = (unsigned char)curr;
+            (*table)[low].bits = (unsigned char)root;
+            (*table)[low].val = (unsigned short)(next - *table);
+        }
+    }
+
+    /*
+       Fill in rest of table for incomplete codes.  This loop is similar to the
+       loop above in incrementing huff for table indices.  It is assumed that
+       len is equal to curr + drop, so there is no loop needed to increment
+       through high index bits.  When the current sub-table is filled, the loop
+       drops back to the root table to fill in any remaining entries there.
+     */
+    here.op = (unsigned char)64;                /* invalid code marker */
+    here.bits = (unsigned char)(len - drop);
+    here.val = (unsigned short)0;
+    while (huff != 0) {
+        /* when done with sub-table, drop back to root table */
+        if (drop != 0 && (huff & mask) != low) {
+            drop = 0;
+            len = root;
+            next = *table;
+            here.bits = (unsigned char)len;
+        }
+
+        /* put invalid code marker in table */
+        next[huff >> drop] = here;
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+    }
+
+    /* set return parameters */
+    *table += used;
+    *bits = root;
+    return 0;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inftrees.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inftrees.h
new file mode 100644
index 00000000..baa53a0b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/inftrees.h
@@ -0,0 +1,62 @@
+/* inftrees.h -- header to use inftrees.c
+ * Copyright (C) 1995-2005, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* Structure for decoding tables.  Each entry provides either the
+   information needed to do the operation requested by the code that
+   indexed that table entry, or it provides a pointer to another
+   table that indexes more bits of the code.  op indicates whether
+   the entry is a pointer to another table, a literal, a length or
+   distance, an end-of-block, or an invalid code.  For a table
+   pointer, the low four bits of op is the number of index bits of
+   that table.  For a length or distance, the low four bits of op
+   is the number of extra bits to get after the code.  bits is
+   the number of bits in this code or part of the code to drop off
+   of the bit buffer.  val is the actual byte to output in the case
+   of a literal, the base length or distance, or the offset from
+   the current table to the next table.  Each entry is four bytes. */
+typedef struct {
+    unsigned char op;           /* operation, extra bits, table bits */
+    unsigned char bits;         /* bits in this part of the code */
+    unsigned short val;         /* offset in table or code value */
+} code;
+
+/* op values as set by inflate_table():
+    00000000 - literal
+    0000tttt - table link, tttt != 0 is the number of table index bits
+    0001eeee - length or distance, eeee is the number of extra bits
+    01100000 - end of block
+    01000000 - invalid code
+ */
+
+/* Maximum size of the dynamic table.  The maximum number of code structures is
+   1444, which is the sum of 852 for literal/length codes and 592 for distance
+   codes.  These values were found by exhaustive searches using the program
+   examples/enough.c found in the zlib distribtution.  The arguments to that
+   program are the number of symbols, the initial root table size, and the
+   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
+   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
+   The initial root table size (9 or 6) is found in the fifth argument of the
+   inflate_table() calls in inflate.c and infback.c.  If the root table size is
+   changed, then these maximum sizes would be need to be recalculated and
+   updated. */
+#define ENOUGH_LENS 852
+#define ENOUGH_DISTS 592
+#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
+
+/* Type of code to build for inflate_table() */
+typedef enum {
+    CODES,
+    LENS,
+    DISTS
+} codetype;
+
+int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
+                             unsigned codes, code FAR * FAR *table,
+                             unsigned FAR *bits, unsigned short FAR *work));
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/make_vms.com b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/make_vms.com
new file mode 100644
index 00000000..6576490e
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/make_vms.com
@@ -0,0 +1,804 @@
+$! make libz under VMS written by
+$! Martin P.J. Zinser
+$!
+$! In case of problems with the install you might contact me at
+$! zinser@zinser.no-ip.info(preferred) or
+$! zinser@sysdev.deutsche-boerse.com (work)
+$!
+$! Make procedure history for Zlib
+$!
+$!------------------------------------------------------------------------------
+$! Version history
+$! 0.01 20060120 First version to receive a number
+$! 0.02 20061008 Adapt to new Makefile.in
+$! 0.03 20091224 Add support for large file check
+$! 0.04 20100110 Add new gzclose, gzlib, gzread, gzwrite
+$! 0.05 20100221 Exchange zlibdefs.h by zconf.h.in
+$!
+$ on error then goto err_exit
+$ set proc/parse=ext
+$!
+$ true  = 1
+$ false = 0
+$ tmpnam = "temp_" + f$getjpi("","pid")
+$ tt = tmpnam + ".txt"
+$ tc = tmpnam + ".c"
+$ th = tmpnam + ".h"
+$ define/nolog tconfig 'th'
+$ its_decc = false
+$ its_vaxc = false
+$ its_gnuc = false
+$ s_case   = False
+$!
+$! Setup variables holding "config" information
+$!
+$ Make    = ""
+$ name     = "Zlib"
+$ version  = "?.?.?"
+$ v_string = "ZLIB_VERSION"
+$ v_file   = "zlib.h"
+$ ccopt   = ""
+$ lopts   = ""
+$ dnsrl   = ""
+$ aconf_in_file = "zconf.h.in#zconf.h_in"
+$ conf_check_string = ""
+$ linkonly = false
+$ optfile  = name + ".opt"
+$ libdefs  = ""
+$ axp      = f$getsyi("HW_MODEL").ge.1024 .and. f$getsyi("HW_MODEL").lt.4096
+$!
+$ whoami = f$parse(f$enviornment("Procedure"),,,,"NO_CONCEAL")
+$ mydef  = F$parse(whoami,,,"DEVICE")
+$ mydir  = f$parse(whoami,,,"DIRECTORY") - "]["
+$ myproc = f$parse(whoami,,,"Name") + f$parse(whoami,,,"type")
+$!
+$! Check for MMK/MMS
+$!
+$ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"
+$ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"
+$!
+$!
+$ gosub find_version
+$!
+$  open/write topt tmp.opt
+$  open/write optf 'optfile'
+$!
+$ gosub check_opts
+$!
+$! Look for the compiler used
+$!
+$ gosub check_compiler
+$ close topt
+$!
+$ if its_decc
+$ then
+$   ccopt = "/prefix=all" + ccopt
+$   if f$trnlnm("SYS") .eqs. ""
+$   then
+$     if axp
+$     then
+$       define sys sys$library:
+$     else
+$       ccopt = "/decc" + ccopt
+$       define sys decc$library_include:
+$     endif
+$   endif
+$ endif
+$ if its_vaxc .or. its_gnuc
+$ then
+$    if f$trnlnm("SYS").eqs."" then define sys sys$library:
+$ endif
+$!
+$! Build a fake configure input header
+$!
+$ open/write conf_hin config.hin
+$ write conf_hin "#undef _LARGEFILE64_SOURCE"
+$ close conf_hin
+$!
+$!
+$ i = 0
+$FIND_ACONF:
+$ fname = f$element(i,"#",aconf_in_file)
+$ if fname .eqs. "#" then goto AMISS_ERR
+$ if f$search(fname) .eqs. ""
+$ then
+$   i = i + 1
+$   goto find_aconf
+$ endif
+$ open/read/err=aconf_err aconf_in 'fname'
+$ open/write aconf zconf.h
+$ACONF_LOOP:
+$ read/end_of_file=aconf_exit aconf_in line
+$ work = f$edit(line, "compress,trim")
+$ if f$extract(0,6,work) .nes. "#undef"
+$ then
+$   if f$extract(0,12,work) .nes. "#cmakedefine"
+$   then
+$       write aconf line
+$   endif
+$ else
+$   cdef = f$element(1," ",work)
+$   gosub check_config
+$ endif
+$ goto aconf_loop
+$ACONF_EXIT:
+$ write aconf "#define VMS 1"
+$ write aconf "#include <unistd.h>"
+$ write aconf "#include <unixio.h>"
+$ write aconf "#ifdef _LARGEFILE"
+$ write aconf "#define off64_t __off64_t"
+$ write aconf "#define fopen64 fopen"
+$ write aconf "#define fseeko64 fseeko"
+$ write aconf "#define lseek64 lseek"
+$ write aconf "#define ftello64 ftell"
+$ write aconf "#endif"
+$ close aconf_in
+$ close aconf
+$ if f$search("''th'") .nes. "" then delete 'th';*
+$! Build the thing plain or with mms
+$!
+$ write sys$output "Compiling Zlib sources ..."
+$ if make.eqs.""
+$  then
+$   dele example.obj;*,minigzip.obj;*
+$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
+                adler32.c zlib.h zconf.h
+$   CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
+                compress.c zlib.h zconf.h
+$   CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
+                crc32.c zlib.h zconf.h
+$   CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
+                deflate.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE gzclose.OBJ "CC ''CCOPT' gzclose" -
+                gzclose.c zutil.h zlib.h zconf.h
+$   CALL MAKE gzlib.OBJ "CC ''CCOPT' gzlib" -
+                gzlib.c zutil.h zlib.h zconf.h
+$   CALL MAKE gzread.OBJ "CC ''CCOPT' gzread" -
+                gzread.c zutil.h zlib.h zconf.h
+$   CALL MAKE gzwrite.OBJ "CC ''CCOPT' gzwrite" -
+                gzwrite.c zutil.h zlib.h zconf.h
+$   CALL MAKE infback.OBJ "CC ''CCOPT' infback" -
+                infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
+$   CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
+                inffast.c zutil.h zlib.h zconf.h inffast.h
+$   CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
+                inflate.c zutil.h zlib.h zconf.h infblock.h
+$   CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
+                inftrees.c zutil.h zlib.h zconf.h inftrees.h
+$   CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
+                trees.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
+                uncompr.c zlib.h zconf.h
+$   CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
+                zutil.c zutil.h zlib.h zconf.h
+$   write sys$output "Building Zlib ..."
+$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
+$   write sys$output "Building example..."
+$   CALL MAKE example.OBJ "CC ''CCOPT' example" -
+                example.c zlib.h zconf.h
+$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
+$   if f$search("x11vms:xvmsutils.olb") .nes. ""
+$   then
+$     write sys$output "Building minigzip..."
+$     CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -
+                minigzip.c zlib.h zconf.h
+$     call make minigzip.exe -
+                "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" -
+                minigzip.obj libz.olb
+$   endif
+$  else
+$   gosub crea_mms
+$   write sys$output "Make ''name' ''version' with ''Make' "
+$   'make'
+$  endif
+$!
+$! Alpha gets a shareable image
+$!
+$ If axp
+$ Then
+$   gosub crea_olist
+$   write sys$output "Creating libzshr.exe"
+$   call anal_obj_axp modules.opt _link.opt
+$   if s_case
+$   then
+$      open/append optf modules.opt
+$      write optf "case_sensitive=YES"
+$      close optf
+$   endif
+$   LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,_link.opt/opt
+$ endif
+$ write sys$output "Zlib build completed"
+$ exit
+$CC_ERR:
+$ write sys$output "C compiler required to build ''name'"
+$ goto err_exit
+$ERR_EXIT:
+$ set message/facil/ident/sever/text
+$ close/nolog optf
+$ close/nolog topt
+$ close/nolog conf_hin
+$ close/nolog aconf_in
+$ close/nolog aconf
+$ close/nolog out
+$ close/nolog min
+$ close/nolog mod
+$ close/nolog h_in
+$ write sys$output "Exiting..."
+$ exit 2
+$!
+$!
+$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
+$ V = 'F$Verify(0)
+$! P1 = What we are trying to make
+$! P2 = Command to make it
+$! P3 - P8  What it depends on
+$
+$ If F$Search(P1) .Eqs. "" Then Goto Makeit
+$ Time = F$CvTime(F$File(P1,"RDT"))
+$arg=3
+$Loop:
+$       Argument = P'arg
+$       If Argument .Eqs. "" Then Goto Exit
+$       El=0
+$Loop2:
+$       File = F$Element(El," ",Argument)
+$       If File .Eqs. " " Then Goto Endl
+$       AFile = ""
+$Loop3:
+$       OFile = AFile
+$       AFile = F$Search(File)
+$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
+$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
+$       Goto Loop3
+$NextEL:
+$       El = El + 1
+$       Goto Loop2
+$EndL:
+$ arg=arg+1
+$ If arg .Le. 8 Then Goto Loop
+$ Goto Exit
+$
+$Makeit:
+$ VV=F$VERIFY(0)
+$ write sys$output P2
+$ 'P2
+$ VV='F$Verify(VV)
+$Exit:
+$ If V Then Set Verify
+$ENDSUBROUTINE
+$!------------------------------------------------------------------------------
+$!
+$! Check command line options and set symbols accordingly
+$!
+$!------------------------------------------------------------------------------
+$! Version history
+$! 0.01 20041206 First version to receive a number
+$! 0.02 20060126 Add new "HELP" target
+$ CHECK_OPTS:
+$ i = 1
+$ OPT_LOOP:
+$ if i .lt. 9
+$ then
+$   cparm = f$edit(p'i',"upcase")
+$!
+$! Check if parameter actually contains something
+$!
+$   if f$edit(cparm,"trim") .nes. ""
+$   then
+$     if cparm .eqs. "DEBUG"
+$     then
+$       ccopt = ccopt + "/noopt/deb"
+$       lopts = lopts + "/deb"
+$     endif
+$     if f$locate("CCOPT=",cparm) .lt. f$length(cparm)
+$     then
+$       start = f$locate("=",cparm) + 1
+$       len   = f$length(cparm) - start
+$       ccopt = ccopt + f$extract(start,len,cparm)
+$       if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
+          then s_case = true
+$     endif
+$     if cparm .eqs. "LINK" then linkonly = true
+$     if f$locate("LOPTS=",cparm) .lt. f$length(cparm)
+$     then
+$       start = f$locate("=",cparm) + 1
+$       len   = f$length(cparm) - start
+$       lopts = lopts + f$extract(start,len,cparm)
+$     endif
+$     if f$locate("CC=",cparm) .lt. f$length(cparm)
+$     then
+$       start  = f$locate("=",cparm) + 1
+$       len    = f$length(cparm) - start
+$       cc_com = f$extract(start,len,cparm)
+        if (cc_com .nes. "DECC") .and. -
+           (cc_com .nes. "VAXC") .and. -
+           (cc_com .nes. "GNUC")
+$       then
+$         write sys$output "Unsupported compiler choice ''cc_com' ignored"
+$         write sys$output "Use DECC, VAXC, or GNUC instead"
+$       else
+$         if cc_com .eqs. "DECC" then its_decc = true
+$         if cc_com .eqs. "VAXC" then its_vaxc = true
+$         if cc_com .eqs. "GNUC" then its_gnuc = true
+$       endif
+$     endif
+$     if f$locate("MAKE=",cparm) .lt. f$length(cparm)
+$     then
+$       start  = f$locate("=",cparm) + 1
+$       len    = f$length(cparm) - start
+$       mmks = f$extract(start,len,cparm)
+$       if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")
+$       then
+$         make = mmks
+$       else
+$         write sys$output "Unsupported make choice ''mmks' ignored"
+$         write sys$output "Use MMK or MMS instead"
+$       endif
+$     endif
+$     if cparm .eqs. "HELP" then gosub bhelp
+$   endif
+$   i = i + 1
+$   goto opt_loop
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Look for the compiler used
+$!
+$! Version history
+$! 0.01 20040223 First version to receive a number
+$! 0.02 20040229 Save/set value of decc$no_rooted_search_lists
+$! 0.03 20060202 Extend handling of GNU C
+$! 0.04 20090402 Compaq -> hp
+$CHECK_COMPILER:
+$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
+$ then
+$   its_decc = (f$search("SYS$SYSTEM:DECC$COMPILER.EXE") .nes. "")
+$   its_vaxc = .not. its_decc .and. (F$Search("SYS$System:VAXC.Exe") .nes. "")
+$   its_gnuc = .not. (its_decc .or. its_vaxc) .and. (f$trnlnm("gnu_cc") .nes. "")
+$ endif
+$!
+$! Exit if no compiler available
+$!
+$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
+$ then goto CC_ERR
+$ else
+$   if its_decc
+$   then
+$     write sys$output "CC compiler check ... hp C"
+$     if f$trnlnm("decc$no_rooted_search_lists") .nes. ""
+$     then
+$       dnrsl = f$trnlnm("decc$no_rooted_search_lists")
+$     endif
+$     define/nolog decc$no_rooted_search_lists 1
+$   else
+$     if its_vaxc then write sys$output "CC compiler check ... VAX C"
+$     if its_gnuc
+$     then
+$         write sys$output "CC compiler check ... GNU C"
+$         if f$trnlnm(topt) then write topt "gnu_cc:[000000]gcclib.olb/lib"
+$         if f$trnlnm(optf) then write optf "gnu_cc:[000000]gcclib.olb/lib"
+$         cc = "gcc"
+$     endif
+$     if f$trnlnm(topt) then write topt "sys$share:vaxcrtl.exe/share"
+$     if f$trnlnm(optf) then write optf "sys$share:vaxcrtl.exe/share"
+$   endif
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! If MMS/MMK are available dump out the descrip.mms if required
+$!
+$CREA_MMS:
+$ write sys$output "Creating descrip.mms..."
+$ create descrip.mms
+$ open/append out descrip.mms
+$ copy sys$input: out
+$ deck
+# descrip.mms: MMS description file for building zlib on VMS
+# written by Martin P.J. Zinser
+# <zinser@zinser.no-ip.info or zinser@sysdev.deutsche-boerse.com>
+
+OBJS = adler32.obj, compress.obj, crc32.obj, gzclose.obj, gzlib.obj\
+       gzread.obj, gzwrite.obj, uncompr.obj, infback.obj\
+       deflate.obj, trees.obj, zutil.obj, inflate.obj, \
+       inftrees.obj, inffast.obj
+
+$ eod
+$ write out "CFLAGS=", ccopt
+$ write out "LOPTS=", lopts
+$ copy sys$input: out
+$ deck
+
+all : example.exe minigzip.exe libz.olb
+        @ write sys$output " Example applications available"
+
+libz.olb : libz.olb($(OBJS))
+	@ write sys$output " libz available"
+
+example.exe : example.obj libz.olb
+              link $(LOPTS) example,libz.olb/lib
+
+minigzip.exe : minigzip.obj libz.olb
+              link $(LOPTS) minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib
+
+clean :
+	delete *.obj;*,libz.olb;*,*.opt;*,*.exe;*
+
+
+# Other dependencies.
+adler32.obj  : adler32.c zutil.h zlib.h zconf.h
+compress.obj : compress.c zlib.h zconf.h
+crc32.obj    : crc32.c zutil.h zlib.h zconf.h
+deflate.obj  : deflate.c deflate.h zutil.h zlib.h zconf.h
+example.obj  : example.c zlib.h zconf.h
+gzclose.obj  : gzclose.c zutil.h zlib.h zconf.h
+gzlib.obj    : gzlib.c zutil.h zlib.h zconf.h
+gzread.obj   : gzread.c zutil.h zlib.h zconf.h
+gzwrite.obj  : gzwrite.c zutil.h zlib.h zconf.h
+inffast.obj  : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h
+inflate.obj  : inflate.c zutil.h zlib.h zconf.h
+inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h
+minigzip.obj : minigzip.c zlib.h zconf.h
+trees.obj    : trees.c deflate.h zutil.h zlib.h zconf.h
+uncompr.obj  : uncompr.c zlib.h zconf.h
+zutil.obj    : zutil.c zutil.h zlib.h zconf.h
+infback.obj  : infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
+$ eod
+$ close out
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Read list of core library sources from makefile.in and create options
+$! needed to build shareable image
+$!
+$CREA_OLIST:
+$ open/read min makefile.in
+$ open/write mod modules.opt
+$ src_check = "OBJC ="
+$MRLOOP:
+$ read/end=mrdone min rec
+$ if (f$extract(0,6,rec) .nes. src_check) then goto mrloop
+$ rec = rec - src_check
+$ gosub extra_filnam
+$ if (f$element(1,"\",rec) .eqs. "\") then goto mrdone
+$MRSLOOP:
+$ read/end=mrdone min rec
+$ gosub extra_filnam
+$ if (f$element(1,"\",rec) .nes. "\") then goto mrsloop
+$MRDONE:
+$ close min
+$ close mod
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Take record extracted in crea_olist and split it into single filenames
+$!
+$EXTRA_FILNAM:
+$ myrec = f$edit(rec - "\", "trim,compress")
+$ i = 0
+$FELOOP:
+$ srcfil = f$element(i," ", myrec)
+$ if (srcfil .nes. " ")
+$ then
+$   write mod f$parse(srcfil,,,"NAME"), ".obj"
+$   i = i + 1
+$   goto feloop
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Find current Zlib version number
+$!
+$FIND_VERSION:
+$ open/read h_in 'v_file'
+$hloop:
+$ read/end=hdone h_in rec
+$ rec = f$edit(rec,"TRIM")
+$ if (f$extract(0,1,rec) .nes. "#") then goto hloop
+$ rec = f$edit(rec - "#", "TRIM")
+$ if f$element(0," ",rec) .nes. "define" then goto hloop
+$ if f$element(1," ",rec) .eqs. v_string
+$ then
+$   version = 'f$element(2," ",rec)'
+$   goto hdone
+$ endif
+$ goto hloop
+$hdone:
+$ close h_in
+$ return
+$!------------------------------------------------------------------------------
+$!
+$CHECK_CONFIG:
+$!
+$ in_ldef = f$locate(cdef,libdefs)
+$ if (in_ldef .lt. f$length(libdefs))
+$ then
+$   write aconf "#define ''cdef' 1"
+$   libdefs = f$extract(0,in_ldef,libdefs) + -
+              f$extract(in_ldef + f$length(cdef) + 1, -
+                        f$length(libdefs) - in_ldef - f$length(cdef) - 1, -
+                        libdefs)
+$ else
+$   if (f$type('cdef') .eqs. "INTEGER")
+$   then
+$     write aconf "#define ''cdef' ", 'cdef'
+$   else
+$     if (f$type('cdef') .eqs. "STRING")
+$     then
+$       write aconf "#define ''cdef' ", """", '''cdef'', """"
+$     else
+$       gosub check_cc_def
+$     endif
+$   endif
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Check if this is a define relating to the properties of the C/C++
+$! compiler
+$!
+$ CHECK_CC_DEF:
+$ if (cdef .eqs. "_LARGEFILE64_SOURCE")
+$ then
+$   copy sys$input: 'tc'
+$   deck
+#include "tconfig"
+#define _LARGEFILE
+#include <stdio.h>
+
+int main(){
+FILE *fp;
+  fp = fopen("temp.txt","r");
+  fseeko(fp,1,SEEK_SET);
+  fclose(fp);
+}
+
+$   eod
+$   test_inv = false
+$   comm_h = false
+$   gosub cc_prop_check
+$   return
+$ endif
+$ write aconf "/* ", line, " */"
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Check for properties of C/C++ compiler
+$!
+$! Version history
+$! 0.01 20031020 First version to receive a number
+$! 0.02 20031022 Added logic for defines with value
+$! 0.03 20040309 Make sure local config file gets not deleted
+$! 0.04 20041230 Also write include for configure run
+$! 0.05 20050103 Add processing of "comment defines"
+$CC_PROP_CHECK:
+$ cc_prop = true
+$ is_need = false
+$ is_need = (f$extract(0,4,cdef) .eqs. "NEED") .or. (test_inv .eq. true)
+$ if f$search(th) .eqs. "" then create 'th'
+$ set message/nofac/noident/nosever/notext
+$ on error then continue
+$ cc 'tmpnam'
+$ if .not. ($status)  then cc_prop = false
+$ on error then continue
+$! The headers might lie about the capabilities of the RTL
+$ link 'tmpnam',tmp.opt/opt
+$ if .not. ($status)  then cc_prop = false
+$ set message/fac/ident/sever/text
+$ on error then goto err_exit
+$ delete/nolog 'tmpnam'.*;*/exclude='th'
+$ if (cc_prop .and. .not. is_need) .or. -
+     (.not. cc_prop .and. is_need)
+$ then
+$   write sys$output "Checking for ''cdef'... yes"
+$   if f$type('cdef_val'_yes) .nes. ""
+$   then
+$     if f$type('cdef_val'_yes) .eqs. "INTEGER" -
+         then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_yes)
+$     if f$type('cdef_val'_yes) .eqs. "STRING" -
+         then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_yes)
+$   else
+$     call write_config f$fao("#define !AS 1",cdef)
+$   endif
+$   if (cdef .eqs. "HAVE_FSEEKO") .or. (cdef .eqs. "_LARGE_FILES") .or. -
+       (cdef .eqs. "_LARGEFILE64_SOURCE") then -
+      call write_config f$string("#define _LARGEFILE 1")
+$ else
+$   write sys$output "Checking for ''cdef'... no"
+$   if (comm_h)
+$   then
+      call write_config f$fao("/* !AS */",line)
+$   else
+$     if f$type('cdef_val'_no) .nes. ""
+$     then
+$       if f$type('cdef_val'_no) .eqs. "INTEGER" -
+           then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_no)
+$       if f$type('cdef_val'_no) .eqs. "STRING" -
+           then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_no)
+$     else
+$       call write_config f$fao("#undef !AS",cdef)
+$     endif
+$   endif
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Check for properties of C/C++ compiler with multiple result values
+$!
+$! Version history
+$! 0.01 20040127 First version
+$! 0.02 20050103 Reconcile changes from cc_prop up to version 0.05
+$CC_MPROP_CHECK:
+$ cc_prop = true
+$ i    = 1
+$ idel = 1
+$ MT_LOOP:
+$ if f$type(result_'i') .eqs. "STRING"
+$ then
+$   set message/nofac/noident/nosever/notext
+$   on error then continue
+$   cc 'tmpnam'_'i'
+$   if .not. ($status)  then cc_prop = false
+$   on error then continue
+$! The headers might lie about the capabilities of the RTL
+$   link 'tmpnam'_'i',tmp.opt/opt
+$   if .not. ($status)  then cc_prop = false
+$   set message/fac/ident/sever/text
+$   on error then goto err_exit
+$   delete/nolog 'tmpnam'_'i'.*;*
+$   if (cc_prop)
+$   then
+$     write sys$output "Checking for ''cdef'... ", mdef_'i'
+$     if f$type(mdef_'i') .eqs. "INTEGER" -
+         then call write_config f$fao("#define !AS !UL",cdef,mdef_'i')
+$     if f$type('cdef_val'_yes) .eqs. "STRING" -
+         then call write_config f$fao("#define !AS !AS",cdef,mdef_'i')
+$     goto msym_clean
+$   else
+$     i = i + 1
+$     goto mt_loop
+$   endif
+$ endif
+$ write sys$output "Checking for ''cdef'... no"
+$ call write_config f$fao("#undef !AS",cdef)
+$ MSYM_CLEAN:
+$ if (idel .le. msym_max)
+$ then
+$   delete/sym mdef_'idel'
+$   idel = idel + 1
+$   goto msym_clean
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Analyze Object files for OpenVMS AXP to extract Procedure and Data
+$! information to build a symbol vector for a shareable image
+$! All the "brains" of this logic was suggested by Hartmut Becker
+$! (Hartmut.Becker@compaq.com). All the bugs were introduced by me
+$! (zinser@zinser.no-ip.info), so if you do have problem reports please do not
+$! bother Hartmut/HP, but get in touch with me
+$!
+$! Version history
+$! 0.01 20040406 Skip over shareable images in option file
+$! 0.02 20041109 Fix option file for shareable images with case_sensitive=YES
+$! 0.03 20050107 Skip over Identification labels in option file
+$! 0.04 20060117 Add uppercase alias to code compiled with /name=as_is
+$!
+$ ANAL_OBJ_AXP: Subroutine
+$ V = 'F$Verify(0)
+$ SAY := "WRITE_ SYS$OUTPUT"
+$
+$ IF F$SEARCH("''P1'") .EQS. ""
+$ THEN
+$    SAY "ANAL_OBJ_AXP-E-NOSUCHFILE:  Error, inputfile ''p1' not available"
+$    goto exit_aa
+$ ENDIF
+$ IF "''P2'" .EQS. ""
+$ THEN
+$    SAY "ANAL_OBJ_AXP:  Error, no output file provided"
+$    goto exit_aa
+$ ENDIF
+$
+$ open/read in 'p1
+$ create a.tmp
+$ open/append atmp a.tmp
+$ loop:
+$ read/end=end_loop in line
+$ if f$locate("/SHARE",f$edit(line,"upcase")) .lt. f$length(line)
+$ then
+$   write sys$output "ANAL_SKP_SHR-i-skipshare, ''line'"
+$   goto loop
+$ endif
+$ if f$locate("IDENTIFICATION=",f$edit(line,"upcase")) .lt. f$length(line)
+$ then
+$   write sys$output "ANAL_OBJ_AXP-i-ident: Identification ", -
+                     f$element(1,"=",line)
+$   goto loop
+$ endif
+$ f= f$search(line)
+$ if f .eqs. ""
+$ then
+$	write sys$output "ANAL_OBJ_AXP-w-nosuchfile, ''line'"
+$	goto loop
+$ endif
+$ define/user sys$output nl:
+$ define/user sys$error nl:
+$ anal/obj/gsd 'f /out=x.tmp
+$ open/read xtmp x.tmp
+$ XLOOP:
+$ read/end=end_xloop xtmp xline
+$ xline = f$edit(xline,"compress")
+$ write atmp xline
+$ goto xloop
+$ END_XLOOP:
+$ close xtmp
+$ goto loop
+$ end_loop:
+$ close in
+$ close atmp
+$ if f$search("a.tmp") .eqs. "" -
+	then $ exit
+$ ! all global definitions
+$ search a.tmp "symbol:","EGSY$V_DEF 1","EGSY$V_NORM 1"/out=b.tmp
+$ ! all procedures
+$ search b.tmp "EGSY$V_NORM 1"/wind=(0,1) /out=c.tmp
+$ search c.tmp "symbol:"/out=d.tmp
+$ define/user sys$output nl:
+$ edito/edt/command=sys$input d.tmp
+sub/symbol: "/symbol_vector=(/whole
+sub/"/=PROCEDURE)/whole
+exit
+$ ! all data
+$ search b.tmp "EGSY$V_DEF 1"/wind=(0,1) /out=e.tmp
+$ search e.tmp "symbol:"/out=f.tmp
+$ define/user sys$output nl:
+$ edito/edt/command=sys$input f.tmp
+sub/symbol: "/symbol_vector=(/whole
+sub/"/=DATA)/whole
+exit
+$ sort/nodupl d.tmp,f.tmp g.tmp
+$ open/read raw_vector g.tmp
+$ open/write case_vector 'p2'
+$ RAWLOOP:
+$ read/end=end_rawloop raw_vector raw_element
+$ write case_vector raw_element
+$ if f$locate("=PROCEDURE)",raw_element) .lt. f$length(raw_element)
+$ then
+$     name = f$element(1,"=",raw_element) - "("
+$     if f$edit(name,"UPCASE") .nes. name then -
+          write case_vector f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)", -
+	                          f$edit(name,"UPCASE"), name)
+$ endif
+$ if f$locate("=DATA)",raw_element) .lt. f$length(raw_element)
+$ then
+$     name = f$element(1,"=",raw_element) - "("
+$     if f$edit(name,"UPCASE") .nes. name then -
+          write case_vector f$fao(" symbol_vector=(!AS/!AS=DATA)", -
+	                          f$edit(name,"UPCASE"), name)
+$ endif
+$ goto rawloop
+$ END_RAWLOOP:
+$ close raw_vector
+$ close case_vector
+$ delete a.tmp;*,b.tmp;*,c.tmp;*,d.tmp;*,e.tmp;*,f.tmp;*,g.tmp;*
+$ if f$search("x.tmp") .nes. "" -
+	then $ delete x.tmp;*
+$!
+$ EXIT_AA:
+$ if V then set verify
+$ endsubroutine
+$!------------------------------------------------------------------------------
+$!
+$! Write configuration to both permanent and temporary config file
+$!
+$! Version history
+$! 0.01 20031029 First version to receive a number
+$!
+$WRITE_CONFIG: SUBROUTINE
+$  write aconf 'p1'
+$  open/append confh 'th'
+$  write confh 'p1'
+$  close confh
+$ENDSUBROUTINE
+$!------------------------------------------------------------------------------
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/minigzip.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/minigzip.c
new file mode 100644
index 00000000..fe618836
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/minigzip.c
@@ -0,0 +1,440 @@
+/* minigzip.c -- simulate gzip using the zlib compression library
+ * Copyright (C) 1995-2006, 2010 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * minigzip is a minimal implementation of the gzip utility. This is
+ * only an example of using zlib and isn't meant to replace the
+ * full-featured gzip. No attempt is made to deal with file systems
+ * limiting names to 14 or 8+3 characters, etc... Error checking is
+ * very limited. So use minigzip only for testing; use gzip for the
+ * real thing. On MSDOS, use only on file names without extension
+ * or in pipe mode.
+ */
+
+/* @(#) $Id: minigzip.c 246 2010-04-23 10:54:55Z nijtmans $ */
+
+#include "zlib.h"
+#include <stdio.h>
+
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+
+#ifdef USE_MMAP
+#  include <sys/types.h>
+#  include <sys/mman.h>
+#  include <sys/stat.h>
+#endif
+
+#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
+#  include <fcntl.h>
+#  include <io.h>
+#  ifdef UNDER_CE
+#    include <stdlib.h>
+#  endif
+#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
+#else
+#  define SET_BINARY_MODE(file)
+#endif
+
+#ifdef VMS
+#  define unlink delete
+#  define GZ_SUFFIX "-gz"
+#endif
+#ifdef RISCOS
+#  define unlink remove
+#  define GZ_SUFFIX "-gz"
+#  define fileno(file) file->__file
+#endif
+#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#  include <unix.h> /* for fileno */
+#endif
+
+#if !defined(Z_HAVE_UNISTD_H) && !defined(_LARGEFILE64_SOURCE)
+#ifndef WIN32 /* unlink already in stdio.h for WIN32 */
+  extern int unlink OF((const char *));
+#endif
+#endif
+
+#if defined(UNDER_CE)
+#  include <windows.h>
+#  define perror(s) pwinerror(s)
+
+/* Map the Windows error number in ERROR to a locale-dependent error
+   message string and return a pointer to it.  Typically, the values
+   for ERROR come from GetLastError.
+
+   The string pointed to shall not be modified by the application,
+   but may be overwritten by a subsequent call to strwinerror
+
+   The strwinerror function does not change the current setting
+   of GetLastError.  */
+
+static char *strwinerror (error)
+     DWORD error;
+{
+    static char buf[1024];
+
+    wchar_t *msgbuf;
+    DWORD lasterr = GetLastError();
+    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
+        | FORMAT_MESSAGE_ALLOCATE_BUFFER,
+        NULL,
+        error,
+        0, /* Default language */
+        (LPVOID)&msgbuf,
+        0,
+        NULL);
+    if (chars != 0) {
+        /* If there is an \r\n appended, zap it.  */
+        if (chars >= 2
+            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
+            chars -= 2;
+            msgbuf[chars] = 0;
+        }
+
+        if (chars > sizeof (buf) - 1) {
+            chars = sizeof (buf) - 1;
+            msgbuf[chars] = 0;
+        }
+
+        wcstombs(buf, msgbuf, chars + 1);
+        LocalFree(msgbuf);
+    }
+    else {
+        sprintf(buf, "unknown win32 error (%ld)", error);
+    }
+
+    SetLastError(lasterr);
+    return buf;
+}
+
+static void pwinerror (s)
+    const char *s;
+{
+    if (s && *s)
+        fprintf(stderr, "%s: %s\n", s, strwinerror(GetLastError ()));
+    else
+        fprintf(stderr, "%s\n", strwinerror(GetLastError ()));
+}
+
+#endif /* UNDER_CE */
+
+#ifndef GZ_SUFFIX
+#  define GZ_SUFFIX ".gz"
+#endif
+#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
+
+#define BUFLEN      16384
+#define MAX_NAME_LEN 1024
+
+#ifdef MAXSEG_64K
+#  define local static
+   /* Needed for systems with limitation on stack size. */
+#else
+#  define local
+#endif
+
+char *prog;
+
+void error            OF((const char *msg));
+void gz_compress      OF((FILE   *in, gzFile out));
+#ifdef USE_MMAP
+int  gz_compress_mmap OF((FILE   *in, gzFile out));
+#endif
+void gz_uncompress    OF((gzFile in, FILE   *out));
+void file_compress    OF((char  *file, char *mode));
+void file_uncompress  OF((char  *file));
+int  main             OF((int argc, char *argv[]));
+
+/* ===========================================================================
+ * Display error message and exit
+ */
+void error(msg)
+    const char *msg;
+{
+    fprintf(stderr, "%s: %s\n", prog, msg);
+    exit(1);
+}
+
+/* ===========================================================================
+ * Compress input to output then close both files.
+ */
+
+void gz_compress(in, out)
+    FILE   *in;
+    gzFile out;
+{
+    local char buf[BUFLEN];
+    int len;
+    int err;
+
+#ifdef USE_MMAP
+    /* Try first compressing with mmap. If mmap fails (minigzip used in a
+     * pipe), use the normal fread loop.
+     */
+    if (gz_compress_mmap(in, out) == Z_OK) return;
+#endif
+    for (;;) {
+        len = (int)fread(buf, 1, sizeof(buf), in);
+        if (ferror(in)) {
+            perror("fread");
+            exit(1);
+        }
+        if (len == 0) break;
+
+        if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
+    }
+    fclose(in);
+    if (gzclose(out) != Z_OK) error("failed gzclose");
+}
+
+#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
+
+/* Try compressing the input file at once using mmap. Return Z_OK if
+ * if success, Z_ERRNO otherwise.
+ */
+int gz_compress_mmap(in, out)
+    FILE   *in;
+    gzFile out;
+{
+    int len;
+    int err;
+    int ifd = fileno(in);
+    caddr_t buf;    /* mmap'ed buffer for the entire input file */
+    off_t buf_len;  /* length of the input file */
+    struct stat sb;
+
+    /* Determine the size of the file, needed for mmap: */
+    if (fstat(ifd, &sb) < 0) return Z_ERRNO;
+    buf_len = sb.st_size;
+    if (buf_len <= 0) return Z_ERRNO;
+
+    /* Now do the actual mmap: */
+    buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
+    if (buf == (caddr_t)(-1)) return Z_ERRNO;
+
+    /* Compress the whole file at once: */
+    len = gzwrite(out, (char *)buf, (unsigned)buf_len);
+
+    if (len != (int)buf_len) error(gzerror(out, &err));
+
+    munmap(buf, buf_len);
+    fclose(in);
+    if (gzclose(out) != Z_OK) error("failed gzclose");
+    return Z_OK;
+}
+#endif /* USE_MMAP */
+
+/* ===========================================================================
+ * Uncompress input to output then close both files.
+ */
+void gz_uncompress(in, out)
+    gzFile in;
+    FILE   *out;
+{
+    local char buf[BUFLEN];
+    int len;
+    int err;
+
+    for (;;) {
+        len = gzread(in, buf, sizeof(buf));
+        if (len < 0) error (gzerror(in, &err));
+        if (len == 0) break;
+
+        if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
+            error("failed fwrite");
+        }
+    }
+    if (fclose(out)) error("failed fclose");
+
+    if (gzclose(in) != Z_OK) error("failed gzclose");
+}
+
+
+/* ===========================================================================
+ * Compress the given file: create a corresponding .gz file and remove the
+ * original.
+ */
+void file_compress(file, mode)
+    char  *file;
+    char  *mode;
+{
+    local char outfile[MAX_NAME_LEN];
+    FILE  *in;
+    gzFile out;
+
+    if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile)) {
+        fprintf(stderr, "%s: filename too long\n", prog);
+        exit(1);
+    }
+
+    strcpy(outfile, file);
+    strcat(outfile, GZ_SUFFIX);
+
+    in = fopen(file, "rb");
+    if (in == NULL) {
+        perror(file);
+        exit(1);
+    }
+    out = gzopen(outfile, mode);
+    if (out == NULL) {
+        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
+        exit(1);
+    }
+    gz_compress(in, out);
+
+    unlink(file);
+}
+
+
+/* ===========================================================================
+ * Uncompress the given file and remove the original.
+ */
+void file_uncompress(file)
+    char  *file;
+{
+    local char buf[MAX_NAME_LEN];
+    char *infile, *outfile;
+    FILE  *out;
+    gzFile in;
+    size_t len = strlen(file);
+
+    if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) {
+        fprintf(stderr, "%s: filename too long\n", prog);
+        exit(1);
+    }
+
+    strcpy(buf, file);
+
+    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
+        infile = file;
+        outfile = buf;
+        outfile[len-3] = '\0';
+    } else {
+        outfile = file;
+        infile = buf;
+        strcat(infile, GZ_SUFFIX);
+    }
+    in = gzopen(infile, "rb");
+    if (in == NULL) {
+        fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
+        exit(1);
+    }
+    out = fopen(outfile, "wb");
+    if (out == NULL) {
+        perror(file);
+        exit(1);
+    }
+
+    gz_uncompress(in, out);
+
+    unlink(infile);
+}
+
+
+/* ===========================================================================
+ * Usage:  minigzip [-c] [-d] [-f] [-h] [-r] [-1 to -9] [files...]
+ *   -c : write to standard output
+ *   -d : decompress
+ *   -f : compress with Z_FILTERED
+ *   -h : compress with Z_HUFFMAN_ONLY
+ *   -r : compress with Z_RLE
+ *   -1 to -9 : compression level
+ */
+
+int main(argc, argv)
+    int argc;
+    char *argv[];
+{
+    int copyout = 0;
+    int uncompr = 0;
+    gzFile file;
+    char *bname, outmode[20];
+
+    strcpy(outmode, "wb6 ");
+
+    prog = argv[0];
+    bname = strrchr(argv[0], '/');
+    if (bname)
+      bname++;
+    else
+      bname = argv[0];
+    argc--, argv++;
+
+    if (!strcmp(bname, "gunzip"))
+      uncompr = 1;
+    else if (!strcmp(bname, "zcat"))
+      copyout = uncompr = 1;
+
+    while (argc > 0) {
+      if (strcmp(*argv, "-c") == 0)
+        copyout = 1;
+      else if (strcmp(*argv, "-d") == 0)
+        uncompr = 1;
+      else if (strcmp(*argv, "-f") == 0)
+        outmode[3] = 'f';
+      else if (strcmp(*argv, "-h") == 0)
+        outmode[3] = 'h';
+      else if (strcmp(*argv, "-r") == 0)
+        outmode[3] = 'R';
+      else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' &&
+               (*argv)[2] == 0)
+        outmode[2] = (*argv)[1];
+      else
+        break;
+      argc--, argv++;
+    }
+    if (outmode[3] == ' ')
+        outmode[3] = 0;
+    if (argc == 0) {
+        SET_BINARY_MODE(stdin);
+        SET_BINARY_MODE(stdout);
+        if (uncompr) {
+            file = gzdopen(fileno(stdin), "rb");
+            if (file == NULL) error("can't gzdopen stdin");
+            gz_uncompress(file, stdout);
+        } else {
+            file = gzdopen(fileno(stdout), outmode);
+            if (file == NULL) error("can't gzdopen stdout");
+            gz_compress(stdin, file);
+        }
+    } else {
+        if (copyout) {
+            SET_BINARY_MODE(stdout);
+        }
+        do {
+            if (uncompr) {
+                if (copyout) {
+                    file = gzopen(*argv, "rb");
+                    if (file == NULL)
+                        fprintf(stderr, "%s: can't gzopen %s\n", prog, *argv);
+                    else
+                        gz_uncompress(file, stdout);
+                } else {
+                    file_uncompress(*argv);
+                }
+            } else {
+                if (copyout) {
+                    FILE * in = fopen(*argv, "rb");
+
+                    if (in == NULL) {
+                        perror(*argv);
+                    } else {
+                        file = gzdopen(fileno(stdout), outmode);
+                        if (file == NULL) error("can't gzdopen stdout");
+
+                        gz_compress(in, file);
+                    }
+
+                } else {
+                    file_compress(*argv, outmode);
+                }
+            }
+        } while (argv++, --argc);
+    }
+    return 0;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.bor b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.bor
new file mode 100644
index 00000000..0c1b99c9
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.bor
@@ -0,0 +1,115 @@
+# Makefile for zlib
+# Borland C++
+# Last updated: 15-Mar-2003
+
+# To use, do "make -fmakefile.bor"
+# To compile in small model, set below: MODEL=s
+
+# WARNING: the small model is supported but only for small values of
+# MAX_WBITS and MAX_MEM_LEVEL. For example:
+#    -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to the LOC macro below:
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# See zconf.h for details about the memory requirements.
+
+# ------------ Turbo C++, Borland C++ ------------
+
+#    Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
+#    should be added to the environment via "set LOCAL_ZLIB=-DFOO" or added
+#    to the declaration of LOC here:
+LOC = $(LOCAL_ZLIB)
+
+# type for CPU required: 0: 8086, 1: 80186, 2: 80286, 3: 80386, etc.
+CPU_TYP = 0
+
+# memory model: one of s, m, c, l (small, medium, compact, large)
+MODEL=l
+
+# replace bcc with tcc for Turbo C++ 1.0, with bcc32 for the 32 bit version
+CC=bcc
+LD=bcc
+AR=tlib
+
+# compiler flags
+# replace "-O2" by "-O -G -a -d" for Turbo C++ 1.0
+CFLAGS=-O2 -Z -m$(MODEL) $(LOC)
+
+LDFLAGS=-m$(MODEL) -f-
+
+
+# variables
+ZLIB_LIB = zlib_$(MODEL).lib
+
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
+OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
+OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
+
+
+# targets
+all: $(ZLIB_LIB) example.exe minigzip.exe
+
+.c.obj:
+	$(CC) -c $(CFLAGS) $*.c
+
+adler32.obj: adler32.c zlib.h zconf.h
+
+compress.obj: compress.c zlib.h zconf.h
+
+crc32.obj: crc32.c zlib.h zconf.h crc32.h
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+
+gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
+
+gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
+
+gzread.obj: gzread.c zlib.h zconf.h gzguts.h
+
+gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
+
+infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+
+trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+
+example.obj: example.c zlib.h zconf.h
+
+minigzip.obj: minigzip.c zlib.h zconf.h
+
+
+# the command line is cut to fit in the MS-DOS 128 byte limit:
+$(ZLIB_LIB): $(OBJ1) $(OBJ2)
+	-del $(ZLIB_LIB)
+	$(AR) $(ZLIB_LIB) $(OBJP1)
+	$(AR) $(ZLIB_LIB) $(OBJP2)
+
+example.exe: example.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
+
+minigzip.exe: minigzip.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
+
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d
+
+clean:
+	-del *.obj
+	-del *.lib
+	-del *.exe
+	-del zlib_*.bak
+	-del foo.gz
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.dj2 b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.dj2
new file mode 100644
index 00000000..29b03954
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.dj2
@@ -0,0 +1,104 @@
+# Makefile for zlib.  Modified for djgpp v2.0 by F. J. Donahoe, 3/15/96.
+# Copyright (C) 1995-1998 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile, or to compile and test, type:
+#
+#   make -fmakefile.dj2;  make test -fmakefile.dj2
+#
+# To install libz.a, zconf.h and zlib.h in the djgpp directories, type:
+#
+#    make install -fmakefile.dj2
+#
+# after first defining LIBRARY_PATH and INCLUDE_PATH in djgpp.env as
+# in the sample below if the pattern of the DJGPP distribution is to
+# be followed.  Remember that, while <sp>'es around <=> are ignored in
+# makefiles, they are *not* in batch files or in djgpp.env.
+# - - - - -
+# [make]
+# INCLUDE_PATH=%\>;INCLUDE_PATH%%\DJDIR%\include
+# LIBRARY_PATH=%\>;LIBRARY_PATH%%\DJDIR%\lib
+# BUTT=-m486
+# - - - - -
+# Alternately, these variables may be defined below, overriding the values
+# in djgpp.env, as
+# INCLUDE_PATH=c:\usr\include
+# LIBRARY_PATH=c:\usr\lib
+
+CC=gcc
+
+#CFLAGS=-MMD -O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-MMD -g -DDEBUG
+CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+             -Wstrict-prototypes -Wmissing-prototypes
+
+# If cp.exe is available, replace "copy /Y" with "cp -fp" .
+CP=copy /Y
+# If gnu install.exe is available, replace $(CP) with ginstall.
+INSTALL=$(CP)
+# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
+RM=del
+LDLIBS=-L. -lz
+LD=$(CC) -s -o
+LDSHARED=$(CC)
+
+INCL=zlib.h zconf.h
+LIBS=libz.a
+
+AR=ar rcs
+
+prefix=/usr/local
+exec_prefix = $(prefix)
+
+OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
+       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
+
+OBJA =
+# to use the asm code: make OBJA=match.o
+
+TEST_OBJS = example.o minigzip.o
+
+all: example.exe minigzip.exe
+
+check: test
+test: all
+	./example
+	echo hello world | .\minigzip | .\minigzip -d
+
+%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+libz.a: $(OBJS) $(OBJA)
+	$(AR) $@ $(OBJS) $(OBJA)
+
+%.exe : %.o $(LIBS)
+	$(LD) $@ $< $(LDLIBS)
+
+# INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env .
+
+.PHONY : uninstall clean
+
+install: $(INCL) $(LIBS)
+	-@if not exist $(INCLUDE_PATH)\nul mkdir $(INCLUDE_PATH)
+	-@if not exist $(LIBRARY_PATH)\nul mkdir $(LIBRARY_PATH)
+	$(INSTALL) zlib.h $(INCLUDE_PATH)
+	$(INSTALL) zconf.h $(INCLUDE_PATH)
+	$(INSTALL) libz.a $(LIBRARY_PATH)
+
+uninstall:
+	$(RM) $(INCLUDE_PATH)\zlib.h
+	$(RM) $(INCLUDE_PATH)\zconf.h
+	$(RM) $(LIBRARY_PATH)\libz.a
+
+clean:
+	$(RM) *.d
+	$(RM) *.o
+	$(RM) *.exe
+	$(RM) libz.a
+	$(RM) foo.gz
+
+DEPS := $(wildcard *.d)
+ifneq ($(DEPS),)
+include $(DEPS)
+endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.emx b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.emx
new file mode 100644
index 00000000..9c1b57a5
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.emx
@@ -0,0 +1,69 @@
+# Makefile for zlib.  Modified for emx 0.9c by Chr. Spieler, 6/17/98.
+# Copyright (C) 1995-1998 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile, or to compile and test, type:
+#
+#   make -fmakefile.emx;  make test -fmakefile.emx
+#
+
+CC=gcc
+
+#CFLAGS=-MMD -O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-MMD -g -DDEBUG
+CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+             -Wstrict-prototypes -Wmissing-prototypes
+
+# If cp.exe is available, replace "copy /Y" with "cp -fp" .
+CP=copy /Y
+# If gnu install.exe is available, replace $(CP) with ginstall.
+INSTALL=$(CP)
+# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
+RM=del
+LDLIBS=-L. -lzlib
+LD=$(CC) -s -o
+LDSHARED=$(CC)
+
+INCL=zlib.h zconf.h
+LIBS=zlib.a
+
+AR=ar rcs
+
+prefix=/usr/local
+exec_prefix = $(prefix)
+
+OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
+       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
+
+TEST_OBJS = example.o minigzip.o
+
+all: example.exe minigzip.exe
+
+test: all
+	./example
+	echo hello world | .\minigzip | .\minigzip -d
+
+%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+zlib.a: $(OBJS)
+	$(AR) $@ $(OBJS)
+
+%.exe : %.o $(LIBS)
+	$(LD) $@ $< $(LDLIBS)
+
+
+.PHONY : clean
+
+clean:
+	$(RM) *.d
+	$(RM) *.o
+	$(RM) *.exe
+	$(RM) zlib.a
+	$(RM) foo.gz
+
+DEPS := $(wildcard *.d)
+ifneq ($(DEPS),)
+include $(DEPS)
+endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.msc b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.msc
new file mode 100644
index 00000000..cd2816fb
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.msc
@@ -0,0 +1,112 @@
+# Makefile for zlib
+# Microsoft C 5.1 or later
+# Last updated: 19-Mar-2003
+
+# To use, do "make makefile.msc"
+# To compile in small model, set below: MODEL=S
+
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to the LOC macro below:
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# See zconf.h for details about the memory requirements.
+
+# ------------- Microsoft C 5.1 and later -------------
+
+#    Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
+#    should be added to the environment via "set LOCAL_ZLIB=-DFOO" or added
+#    to the declaration of LOC here:
+LOC = $(LOCAL_ZLIB)
+
+# Type for CPU required: 0: 8086, 1: 80186, 2: 80286, 3: 80386, etc.
+CPU_TYP = 0
+
+# Memory model: one of S, M, C, L (small, medium, compact, large)
+MODEL=L
+
+CC=cl
+CFLAGS=-nologo -A$(MODEL) -G$(CPU_TYP) -W3 -Oait -Gs $(LOC)
+#-Ox generates bad code with MSC 5.1
+LIB_CFLAGS=-Zl $(CFLAGS)
+
+LD=link
+LDFLAGS=/noi/e/st:0x1500/noe/farcall/packcode
+# "/farcall/packcode" are only useful for `large code' memory models
+# but should be a "no-op" for small code models.
+
+
+# variables
+ZLIB_LIB = zlib_$(MODEL).lib
+
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
+OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+
+
+# targets
+all:  $(ZLIB_LIB) example.exe minigzip.exe
+
+.c.obj:
+	$(CC) -c $(LIB_CFLAGS) $*.c
+
+adler32.obj: adler32.c zlib.h zconf.h
+
+compress.obj: compress.c zlib.h zconf.h
+
+crc32.obj: crc32.c zlib.h zconf.h crc32.h
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+
+gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
+
+gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
+
+gzread.obj: gzread.c zlib.h zconf.h gzguts.h
+
+gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
+
+infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+
+trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+
+example.obj: example.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+minigzip.obj: minigzip.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+
+# the command line is cut to fit in the MS-DOS 128 byte limit:
+$(ZLIB_LIB): $(OBJ1) $(OBJ2)
+	if exist $(ZLIB_LIB) del $(ZLIB_LIB)
+	lib $(ZLIB_LIB) $(OBJ1);
+	lib $(ZLIB_LIB) $(OBJ2);
+
+example.exe: example.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) example.obj,,,$(ZLIB_LIB);
+
+minigzip.exe: minigzip.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) minigzip.obj,,,$(ZLIB_LIB);
+
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d
+
+clean:
+	-del *.obj
+	-del *.lib
+	-del *.exe
+	-del *.map
+	-del zlib_*.bak
+	-del foo.gz
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.tc b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.tc
new file mode 100644
index 00000000..bcd0d188
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/msdos/Makefile.tc
@@ -0,0 +1,100 @@
+# Makefile for zlib
+# Turbo C 2.01, Turbo C++ 1.01
+# Last updated: 15-Mar-2003
+
+# To use, do "make -fmakefile.tc"
+# To compile in small model, set below: MODEL=s
+
+# WARNING: the small model is supported but only for small values of
+# MAX_WBITS and MAX_MEM_LEVEL. For example:
+#    -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to CFLAGS below:
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# See zconf.h for details about the memory requirements.
+
+# ------------ Turbo C 2.01, Turbo C++ 1.01 ------------
+MODEL=l
+CC=tcc
+LD=tcc
+AR=tlib
+# CFLAGS=-O2 -G -Z -m$(MODEL) -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
+CFLAGS=-O2 -G -Z -m$(MODEL)
+LDFLAGS=-m$(MODEL) -f-
+
+
+# variables
+ZLIB_LIB = zlib_$(MODEL).lib
+
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
+OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
+OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
+
+
+# targets
+all: $(ZLIB_LIB) example.exe minigzip.exe
+
+.c.obj:
+	$(CC) -c $(CFLAGS) $*.c
+
+adler32.obj: adler32.c zlib.h zconf.h
+
+compress.obj: compress.c zlib.h zconf.h
+
+crc32.obj: crc32.c zlib.h zconf.h crc32.h
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+
+gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
+
+gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
+
+gzread.obj: gzread.c zlib.h zconf.h gzguts.h
+
+gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
+
+infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+
+trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+
+example.obj: example.c zlib.h zconf.h
+
+minigzip.obj: minigzip.c zlib.h zconf.h
+
+
+# the command line is cut to fit in the MS-DOS 128 byte limit:
+$(ZLIB_LIB): $(OBJ1) $(OBJ2)
+	-del $(ZLIB_LIB)
+	$(AR) $(ZLIB_LIB) $(OBJP1)
+	$(AR) $(ZLIB_LIB) $(OBJP2)
+
+example.exe: example.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
+
+minigzip.exe: minigzip.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
+
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d
+
+clean:
+	-del *.obj
+	-del *.lib
+	-del *.exe
+	-del zlib_*.bak
+	-del foo.gz
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/nintendods/Makefile b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/nintendods/Makefile
new file mode 100644
index 00000000..21337d01
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/nintendods/Makefile
@@ -0,0 +1,126 @@
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
+
+ifeq ($(strip $(DEVKITARM)),)
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
+endif
+
+include $(DEVKITARM)/ds_rules
+
+#---------------------------------------------------------------------------------
+# TARGET is the name of the output
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+#---------------------------------------------------------------------------------
+TARGET		:=	$(shell basename $(CURDIR))
+BUILD		:=	build
+SOURCES		:=	../../
+DATA		:=	data
+INCLUDES	:=	include
+
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH	:=	-mthumb -mthumb-interwork
+
+CFLAGS	:=	-Wall -O2\
+		-march=armv5te -mtune=arm946e-s \
+		-fomit-frame-pointer -ffast-math \
+		$(ARCH)
+
+CFLAGS	+=	$(INCLUDE) -DARM9
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions
+
+ASFLAGS	:=	$(ARCH) -march=armv5te -mtune=arm946e-s
+LDFLAGS	=	-specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
+
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS	:=	$(LIBNDS)
+
+#---------------------------------------------------------------------------------
+# no real need to edit anything past this point unless you need to add additional
+# rules for different file extensions
+#---------------------------------------------------------------------------------
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+#---------------------------------------------------------------------------------
+
+export OUTPUT	:=	$(CURDIR)/lib/libz.a
+
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+export DEPSDIR	:=	$(CURDIR)/$(BUILD)
+
+CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
+
+#---------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CXX)
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
+			$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+			-I$(CURDIR)/$(BUILD)
+
+.PHONY: $(BUILD) clean all
+
+#---------------------------------------------------------------------------------
+all: $(BUILD)
+	@[ -d $@ ] || mkdir -p include
+	@cp ../../*.h include
+
+lib:
+	@[ -d $@ ] || mkdir -p $@
+	
+$(BUILD): lib
+	@[ -d $@ ] || mkdir -p $@
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+
+#---------------------------------------------------------------------------------
+clean:
+	@echo clean ...
+	@rm -fr $(BUILD) lib
+
+#---------------------------------------------------------------------------------
+else
+
+DEPENDS	:=	$(OFILES:.o=.d)
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+$(OUTPUT)	:	$(OFILES)
+
+#---------------------------------------------------------------------------------
+%.bin.o	:	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@$(bin2o)
+
+
+-include $(DEPENDS)
+
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/nintendods/README b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/nintendods/README
new file mode 100644
index 00000000..ba7a37db
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/nintendods/README
@@ -0,0 +1,5 @@
+This Makefile requires devkitARM (http://www.devkitpro.org/category/devkitarm/) and works inside "contrib/nds". It is based on a devkitARM template.
+
+Eduardo Costa <eduardo.m.costa@gmail.com>
+January 3, 2009
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/Makefile.riscos b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/Makefile.riscos
new file mode 100644
index 00000000..57e29d3f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/Makefile.riscos
@@ -0,0 +1,151 @@
+# Project:   zlib_1_03
+# Patched for zlib 1.1.2 rw@shadow.org.uk 19980430
+# test works out-of-the-box, installs `somewhere' on demand
+
+# Toolflags:
+CCflags = -c -depend !Depend -IC: -g -throwback  -DRISCOS  -fah
+C++flags = -c -depend !Depend -IC: -throwback
+Linkflags = -aif -c++ -o $@
+ObjAsmflags = -throwback -NoCache -depend !Depend
+CMHGflags =
+LibFileflags = -c -l -o $@
+Squeezeflags = -o $@
+
+# change the line below to where _you_ want the library installed.
+libdest = lib:zlib
+
+# Final targets:
+@.lib:   @.o.adler32 @.o.compress @.o.crc32 @.o.deflate @.o.gzio \
+        @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil @.o.trees \
+        @.o.uncompr @.o.zutil
+        LibFile $(LibFileflags) @.o.adler32 @.o.compress @.o.crc32 @.o.deflate \
+        @.o.gzio @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil \
+        @.o.trees @.o.uncompr @.o.zutil
+test:   @.minigzip @.example @.lib
+	@copy @.lib @.libc  A~C~DF~L~N~P~Q~RS~TV
+	@echo running tests: hang on.
+	@/@.minigzip -f -9 libc
+	@/@.minigzip -d libc-gz
+	@/@.minigzip -f -1 libc
+	@/@.minigzip -d libc-gz
+	@/@.minigzip -h -9 libc
+	@/@.minigzip -d libc-gz
+	@/@.minigzip -h -1 libc
+	@/@.minigzip -d libc-gz
+	@/@.minigzip -9 libc
+	@/@.minigzip -d libc-gz
+	@/@.minigzip -1 libc
+	@/@.minigzip -d libc-gz
+	@diff @.lib @.libc
+	@echo that should have reported '@.lib and @.libc identical' if you have diff.
+	@/@.example @.fred @.fred
+	@echo that will have given lots of hello!'s.
+
+@.minigzip:   @.o.minigzip @.lib C:o.Stubs
+        Link $(Linkflags) @.o.minigzip @.lib C:o.Stubs
+@.example:   @.o.example @.lib C:o.Stubs
+        Link $(Linkflags) @.o.example @.lib C:o.Stubs
+
+install: @.lib
+	cdir $(libdest)
+	cdir $(libdest).h
+	@copy @.h.zlib $(libdest).h.zlib A~C~DF~L~N~P~Q~RS~TV
+	@copy @.h.zconf $(libdest).h.zconf A~C~DF~L~N~P~Q~RS~TV
+	@copy @.lib $(libdest).lib  A~C~DF~L~N~P~Q~RS~TV
+	@echo okay, installed zlib in $(libdest)
+
+clean:; remove @.minigzip
+	remove @.example
+	remove @.libc
+	-wipe @.o.* F~r~cV
+	remove @.fred
+
+# User-editable dependencies:
+.c.o:
+        cc $(ccflags) -o $@ $<
+
+# Static dependencies:
+
+# Dynamic dependencies:
+o.example:	c.example
+o.example:	h.zlib
+o.example:	h.zconf
+o.minigzip:	c.minigzip
+o.minigzip:	h.zlib
+o.minigzip:	h.zconf
+o.adler32:	c.adler32
+o.adler32:	h.zlib
+o.adler32:	h.zconf
+o.compress:	c.compress
+o.compress:	h.zlib
+o.compress:	h.zconf
+o.crc32:	c.crc32
+o.crc32:	h.zlib
+o.crc32:	h.zconf
+o.deflate:	c.deflate
+o.deflate:	h.deflate
+o.deflate:	h.zutil
+o.deflate:	h.zlib
+o.deflate:	h.zconf
+o.gzio:	c.gzio
+o.gzio:	h.zutil
+o.gzio:	h.zlib
+o.gzio:	h.zconf
+o.infblock:	c.infblock
+o.infblock:	h.zutil
+o.infblock:	h.zlib
+o.infblock:	h.zconf
+o.infblock:	h.infblock
+o.infblock:	h.inftrees
+o.infblock:	h.infcodes
+o.infblock:	h.infutil
+o.infcodes:	c.infcodes
+o.infcodes:	h.zutil
+o.infcodes:	h.zlib
+o.infcodes:	h.zconf
+o.infcodes:	h.inftrees
+o.infcodes:	h.infblock
+o.infcodes:	h.infcodes
+o.infcodes:	h.infutil
+o.infcodes:	h.inffast
+o.inffast:	c.inffast
+o.inffast:	h.zutil
+o.inffast:	h.zlib
+o.inffast:	h.zconf
+o.inffast:	h.inftrees
+o.inffast:	h.infblock
+o.inffast:	h.infcodes
+o.inffast:	h.infutil
+o.inffast:	h.inffast
+o.inflate:	c.inflate
+o.inflate:	h.zutil
+o.inflate:	h.zlib
+o.inflate:	h.zconf
+o.inflate:	h.infblock
+o.inftrees:	c.inftrees
+o.inftrees:	h.zutil
+o.inftrees:	h.zlib
+o.inftrees:	h.zconf
+o.inftrees:	h.inftrees
+o.inftrees:	h.inffixed
+o.infutil:	c.infutil
+o.infutil:	h.zutil
+o.infutil:	h.zlib
+o.infutil:	h.zconf
+o.infutil:	h.infblock
+o.infutil:	h.inftrees
+o.infutil:	h.infcodes
+o.infutil:	h.infutil
+o.trees:	c.trees
+o.trees:	h.deflate
+o.trees:	h.zutil
+o.trees:	h.zlib
+o.trees:	h.zconf
+o.trees:	h.trees
+o.uncompr:	c.uncompr
+o.uncompr:	h.zlib
+o.uncompr:	h.zconf
+o.zutil:	c.zutil
+o.zutil:	h.zutil
+o.zutil:	h.zlib
+o.zutil:	h.zconf
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/README b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/README
new file mode 100644
index 00000000..800bf079
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/README
@@ -0,0 +1,3 @@
+This directory contains files that have not been updated for zlib 1.2.x
+
+(Volunteers are encouraged to help clean this up.  Thanks.)
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/as400/bndsrc b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/as400/bndsrc
new file mode 100644
index 00000000..9cf94bb3
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/as400/bndsrc
@@ -0,0 +1,132 @@
+STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.1.3 entry points.                                    */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+/********************************************************************/
+/*   *MODULE      ADLER32      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("adler32")
+
+/********************************************************************/
+/*   *MODULE      COMPRESS     ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("compress")
+  EXPORT SYMBOL("compress2")
+
+/********************************************************************/
+/*   *MODULE      CRC32        ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("crc32")
+  EXPORT SYMBOL("get_crc_table")
+
+/********************************************************************/
+/*   *MODULE      DEFLATE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("deflate")
+  EXPORT SYMBOL("deflateEnd")
+  EXPORT SYMBOL("deflateSetDictionary")
+  EXPORT SYMBOL("deflateCopy")
+  EXPORT SYMBOL("deflateReset")
+  EXPORT SYMBOL("deflateParams")
+  EXPORT SYMBOL("deflatePrime")
+  EXPORT SYMBOL("deflateInit_")
+  EXPORT SYMBOL("deflateInit2_")
+
+/********************************************************************/
+/*   *MODULE      GZIO         ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("gzopen")
+  EXPORT SYMBOL("gzdopen")
+  EXPORT SYMBOL("gzsetparams")
+  EXPORT SYMBOL("gzread")
+  EXPORT SYMBOL("gzwrite")
+  EXPORT SYMBOL("gzprintf")
+  EXPORT SYMBOL("gzputs")
+  EXPORT SYMBOL("gzgets")
+  EXPORT SYMBOL("gzputc")
+  EXPORT SYMBOL("gzgetc")
+  EXPORT SYMBOL("gzflush")
+  EXPORT SYMBOL("gzseek")
+  EXPORT SYMBOL("gzrewind")
+  EXPORT SYMBOL("gztell")
+  EXPORT SYMBOL("gzeof")
+  EXPORT SYMBOL("gzclose")
+  EXPORT SYMBOL("gzerror")
+
+/********************************************************************/
+/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("inflate")
+  EXPORT SYMBOL("inflateEnd")
+  EXPORT SYMBOL("inflateSetDictionary")
+  EXPORT SYMBOL("inflateSync")
+  EXPORT SYMBOL("inflateReset")
+  EXPORT SYMBOL("inflateInit_")
+  EXPORT SYMBOL("inflateInit2_")
+  EXPORT SYMBOL("inflateSyncPoint")
+
+/********************************************************************/
+/*   *MODULE      UNCOMPR      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("uncompress")
+
+/********************************************************************/
+/*   *MODULE      ZUTIL        ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("zlibVersion")
+  EXPORT SYMBOL("zError")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.2.1 additional entry points.                         */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+/********************************************************************/
+/*   *MODULE      COMPRESS     ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("compressBound")
+
+/********************************************************************/
+/*   *MODULE      DEFLATE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("deflateBound")
+
+/********************************************************************/
+/*   *MODULE      GZIO         ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("gzungetc")
+  EXPORT SYMBOL("gzclearerr")
+
+/********************************************************************/
+/*   *MODULE      INFBACK      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("inflateBack")
+  EXPORT SYMBOL("inflateBackEnd")
+  EXPORT SYMBOL("inflateBackInit_")
+
+/********************************************************************/
+/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("inflateCopy")
+
+/********************************************************************/
+/*   *MODULE      ZUTIL        ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("zlibCompileFlags")
+
+ENDPGMEXP
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/as400/compile.clp b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/as400/compile.clp
new file mode 100644
index 00000000..85549515
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/as400/compile.clp
@@ -0,0 +1,123 @@
+/******************************************************************************/
+/*                                                                            */
+/*  ZLIB                                                                      */
+/*                                                                            */
+/*    Compile sources into modules and link them into a service program.      */
+/*                                                                            */
+/******************************************************************************/
+
+             PGM
+
+/*      Configuration adjustable parameters.                                  */
+
+             DCL        VAR(&SRCLIB) TYPE(*CHAR) LEN(10) +
+                          VALUE('ZLIB')                         /* Source library. */
+             DCL        VAR(&SRCFILE) TYPE(*CHAR) LEN(10) +
+                          VALUE('SOURCES')                      /* Source member file. */
+             DCL        VAR(&CTLFILE) TYPE(*CHAR) LEN(10) +
+                          VALUE('TOOLS')                        /* Control member file. */
+
+             DCL        VAR(&MODLIB) TYPE(*CHAR) LEN(10) +
+                          VALUE('ZLIB')                         /* Module library. */
+
+             DCL        VAR(&SRVLIB) TYPE(*CHAR) LEN(10) +
+                          VALUE('LGPL')                         /* Service program library. */
+
+             DCL        VAR(&CFLAGS) TYPE(*CHAR) +
+                          VALUE('OPTIMIZE(40)')                 /* Compile options. */
+
+
+/*      Working storage.                                                      */
+
+             DCL        VAR(&CMDLEN) TYPE(*DEC) LEN(15 5) VALUE(300)    /* Command length. */
+             DCL        VAR(&CMD) TYPE(*CHAR) LEN(512)
+
+
+/*      Compile sources into modules.                                         */
+
+             CHGVAR     VAR(&CMD) VALUE('CRTCMOD MODULE(' *TCAT &MODLIB *TCAT  +
+                        '/ADLER32)               SRCFILE(' *TCAT               +
+                        &SRCLIB *TCAT '/' *TCAT &SRCFILE *TCAT                 +
+                        ') SYSIFCOPT(*IFSIO)' *BCAT &CFLAGS)
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE('CRTCMOD MODULE(' *TCAT &MODLIB *TCAT  +
+                        '/COMPRESS)              SRCFILE(' *TCAT               +
+                        &SRCLIB *TCAT '/' *TCAT &SRCFILE *TCAT                 +
+                        ') SYSIFCOPT(*IFSIO)' *BCAT &CFLAGS)
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE('CRTCMOD MODULE(' *TCAT &MODLIB *TCAT  +
+                        '/CRC32)                 SRCFILE(' *TCAT               +
+                        &SRCLIB *TCAT '/' *TCAT &SRCFILE *TCAT                 +
+                        ') SYSIFCOPT(*IFSIO)' *BCAT &CFLAGS)
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE('CRTCMOD MODULE(' *TCAT &MODLIB *TCAT  +
+                        '/DEFLATE)               SRCFILE(' *TCAT               +
+                        &SRCLIB *TCAT '/' *TCAT &SRCFILE *TCAT                 +
+                        ') SYSIFCOPT(*IFSIO)' *BCAT &CFLAGS)
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE('CRTCMOD MODULE(' *TCAT &MODLIB *TCAT  +
+                        '/GZIO)                  SRCFILE(' *TCAT               +
+                        &SRCLIB *TCAT '/' *TCAT &SRCFILE *TCAT                 +
+                        ') SYSIFCOPT(*IFSIO)' *BCAT &CFLAGS)
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE('CRTCMOD MODULE(' *TCAT &MODLIB *TCAT  +
+                        '/INFBACK)               SRCFILE(' *TCAT               +
+                        &SRCLIB *TCAT '/' *TCAT &SRCFILE *TCAT                 +
+                        ') SYSIFCOPT(*IFSIO)' *BCAT &CFLAGS)
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE('CRTCMOD MODULE(' *TCAT &MODLIB *TCAT  +
+                        '/INFFAST)               SRCFILE(' *TCAT               +
+                        &SRCLIB *TCAT '/' *TCAT &SRCFILE *TCAT                 +
+                        ') SYSIFCOPT(*IFSIO)' *BCAT &CFLAGS)
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE('CRTCMOD MODULE(' *TCAT &MODLIB *TCAT  +
+                        '/INFLATE)               SRCFILE(' *TCAT               +
+                        &SRCLIB *TCAT '/' *TCAT &SRCFILE *TCAT                 +
+                        ') SYSIFCOPT(*IFSIO)' *BCAT &CFLAGS)
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE('CRTCMOD MODULE(' *TCAT &MODLIB *TCAT  +
+                        '/INFTREES)              SRCFILE(' *TCAT               +
+                        &SRCLIB *TCAT '/' *TCAT &SRCFILE *TCAT                 +
+                        ') SYSIFCOPT(*IFSIO)' *BCAT &CFLAGS)
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE('CRTCMOD MODULE(' *TCAT &MODLIB *TCAT  +
+                        '/TREES)                 SRCFILE(' *TCAT               +
+                        &SRCLIB *TCAT '/' *TCAT &SRCFILE *TCAT                 +
+                        ') SYSIFCOPT(*IFSIO)' *BCAT &CFLAGS)
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE('CRTCMOD MODULE(' *TCAT &MODLIB *TCAT  +
+                        '/UNCOMPR)               SRCFILE(' *TCAT               +
+                        &SRCLIB *TCAT '/' *TCAT &SRCFILE *TCAT                 +
+                        ') SYSIFCOPT(*IFSIO)' *BCAT &CFLAGS)
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE('CRTCMOD MODULE(' *TCAT &MODLIB *TCAT  +
+                        '/ZUTIL)                 SRCFILE(' *TCAT               +
+                        &SRCLIB *TCAT '/' *TCAT &SRCFILE *TCAT                 +
+                        ') SYSIFCOPT(*IFSIO)' *BCAT &CFLAGS)
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+
+/*      Link modules into a service program.                                  */
+
+             CRTSRVPGM  SRVPGM(&SRVLIB/ZLIB) +
+                          MODULE(&MODLIB/ADLER32     &MODLIB/COMPRESS    +
+                                 &MODLIB/CRC32       &MODLIB/DEFLATE     +
+                                 &MODLIB/GZIO        &MODLIB/INFBACK     +
+                                 &MODLIB/INFFAST     &MODLIB/INFLATE     +
+                                 &MODLIB/INFTREES    &MODLIB/TREES       +
+                                 &MODLIB/UNCOMPR     &MODLIB/ZUTIL)      +
+                          SRCFILE(&SRCLIB/&CTLFILE) SRCMBR(BNDSRC) +
+                          TEXT('ZLIB 1.2.3') TGTRLS(V4R4M0)
+
+             ENDPGM
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/as400/readme.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/as400/readme.txt
new file mode 100644
index 00000000..beae13f5
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/as400/readme.txt
@@ -0,0 +1,111 @@
+        ZLIB version 1.2.3 for AS400 installation instructions
+
+I) From an AS400 *SAVF file:
+
+1)      Unpacking archive to an AS400 save file
+
+On the AS400:
+
+_       Create the ZLIB AS400 library:
+
+        CRTLIB LIB(ZLIB) TYPE(PROD) TEXT('ZLIB compression API library')
+
+_       Create a work save file, for example:
+
+                CRTSAVF FILE(ZLIB/ZLIBSAVF)
+
+On a PC connected to the target AS400:
+
+_       Unpack the save file image to a PC file "ZLIBSAVF"
+_       Upload this file into the save file on the AS400, for example
+                using ftp in BINARY mode.
+
+
+2)      Populating the ZLIB AS400 source library
+
+On the AS400:
+
+_       Extract the saved objects into the ZLIB AS400 library using:
+
+RSTOBJ OBJ(*ALL) SAVLIB(ZLIB) DEV(*SAVF) SAVF(ZLIB/ZLIBSAVF) RSTLIB(ZLIB)
+
+
+3)      Customize installation:
+
+_       Edit CL member ZLIB/TOOLS(COMPILE) and change parameters if needed,
+                according to the comments.
+
+_       Compile this member with:
+
+        CRTCLPGM PGM(ZLIB/COMPILE) SRCFILE(ZLIB/TOOLS) SRCMBR(COMPILE)
+
+
+4)      Compile and generate the service program:
+
+_       This can now be done by executing:
+
+        CALL PGM(ZLIB/COMPILE)
+
+
+
+II) From the original source distribution:
+
+1)      On the AS400, create the source library:
+
+        CRTLIB LIB(ZLIB) TYPE(PROD) TEXT('ZLIB compression API library')
+
+2)      Create the source files:
+
+        CRTSRCPF FILE(ZLIB/SOURCES) RCDLEN(112) TEXT('ZLIB library modules')
+        CRTSRCPF FILE(ZLIB/H)       RCDLEN(112) TEXT('ZLIB library includes')
+        CRTSRCPF FILE(ZLIB/TOOLS)   RCDLEN(112) TEXT('ZLIB library control utilities')
+
+3)      From the machine hosting the distribution files, upload them (with
+                FTP in text mode, for example) according to the following table:
+
+    Original    AS400   AS400    AS400 AS400
+    file        file    member   type  description
+                SOURCES                Original ZLIB C subprogram sources
+    adler32.c           ADLER32  C     ZLIB - Compute the Adler-32 checksum of a dta strm
+    compress.c          COMPRESS C     ZLIB - Compress a memory buffer
+    crc32.c             CRC32    C     ZLIB - Compute the CRC-32 of a data stream
+    deflate.c           DEFLATE  C     ZLIB - Compress data using the deflation algorithm
+    gzio.c              GZIO     C     ZLIB - IO on .gz files
+    infback.c           INFBACK  C     ZLIB - Inflate using a callback interface
+    inffast.c           INFFAST  C     ZLIB - Fast proc. literals & length/distance pairs
+    inflate.c           INFLATE  C     ZLIB - Interface to inflate modules
+    inftrees.c          INFTREES C     ZLIB - Generate Huffman trees for efficient decode
+    trees.c             TREES    C     ZLIB - Output deflated data using Huffman coding
+    uncompr.c           UNCOMPR  C     ZLIB - Decompress a memory buffer
+    zutil.c             ZUTIL    C     ZLIB - Target dependent utility functions
+                H                      Original ZLIB C and ILE/RPG include files
+    crc32.h             CRC32    C     ZLIB - CRC32 tables
+    deflate.h           DEFLATE  C     ZLIB - Internal compression state
+    inffast.h           INFFAST  C     ZLIB - Header to use inffast.c
+    inffixed.h          INFFIXED C     ZLIB - Table for decoding fixed codes
+    inflate.h           INFLATE  C     ZLIB - Internal inflate state definitions
+    inftrees.h          INFTREES C     ZLIB - Header to use inftrees.c
+    trees.h             TREES    C     ZLIB - Created automatically with -DGEN_TREES_H
+    zconf.h             ZCONF    C     ZLIB - Compression library configuration
+    zlib.h              ZLIB     C     ZLIB - Compression library C user interface
+    as400/zlib.inc      ZLIB.INC RPGLE ZLIB - Compression library ILE RPG user interface
+    zutil.h             ZUTIL    C     ZLIB - Internal interface and configuration
+                TOOLS                  Building source software & AS/400 README
+    as400/bndsrc        BNDSRC         Entry point exportation list
+    as400/compile.clp   COMPILE  CLP   Compile sources & generate service program
+    as400/readme.txt    README   TXT   Installation instructions
+
+4)      Continue as in I)3).
+
+
+
+
+Notes:  For AS400 ILE RPG programmers, a /copy member defining the ZLIB
+                API prototypes for ILE RPG can be found in ZLIB/H(ZLIB.INC).
+                Please read comments in this member for more information.
+
+        Remember that most foreign textual data are ASCII coded: this
+                implementation does not handle conversion from/to ASCII, so
+                text data code conversions must be done explicitely.
+
+        Always open zipped files in binary mode.
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/as400/zlib.inc b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/as400/zlib.inc
new file mode 100644
index 00000000..a9a4f5cf
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/as400/zlib.inc
@@ -0,0 +1,331 @@
+      *  ZLIB.INC - Interface to the general purpose compression library
+      *
+      *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
+      *  Version 1.2.3.9
+      *
+      *
+      *  WARNING:
+      *     Procedures inflateInit(), inflateInit2(), deflateInit(),
+      *         deflateInit2() and inflateBackInit() need to be called with
+      *         two additional arguments:
+      *         the package version string and the stream control structure.
+      *         size. This is needed because RPG lacks some macro feature.
+      *         Call these procedures as:
+      *             inflateInit(...: ZLIB_VERSION: %size(z_stream))
+      *
+      /if not defined(ZLIB_H_)
+      /define ZLIB_H_
+      *
+      **************************************************************************
+      *                               Constants
+      **************************************************************************
+      *
+      *  Versioning information.
+      *
+     D ZLIB_VERSION    C                   '1.2.3.9'
+     D ZLIB_VERNUM     C                   X'1239'
+      *
+      *  Other equates.
+      *
+     D Z_NO_FLUSH      C                   0
+     D Z_SYNC_FLUSH    C                   2
+     D Z_FULL_FLUSH    C                   3
+     D Z_FINISH        C                   4
+     D Z_BLOCK         C                   5
+      *
+     D Z_OK            C                   0
+     D Z_STREAM_END    C                   1
+     D Z_NEED_DICT     C                   2
+     D Z_ERRNO         C                   -1
+     D Z_STREAM_ERROR  C                   -2
+     D Z_DATA_ERROR    C                   -3
+     D Z_MEM_ERROR     C                   -4
+     D Z_BUF_ERROR     C                   -5
+     DZ_VERSION_ERROR  C                   -6
+      *
+     D Z_NO_COMPRESSION...
+     D                 C                   0
+     D Z_BEST_SPEED    C                   1
+     D Z_BEST_COMPRESSION...
+     D                 C                   9
+     D Z_DEFAULT_COMPRESSION...
+     D                 C                   -1
+      *
+     D Z_FILTERED      C                   1
+     D Z_HUFFMAN_ONLY  C                   2
+     D Z_RLE           C                   3
+     D Z_DEFAULT_STRATEGY...
+     D                 C                   0
+      *
+     D Z_BINARY        C                   0
+     D Z_ASCII         C                   1
+     D Z_UNKNOWN       C                   2
+      *
+     D Z_DEFLATED      C                   8
+      *
+     D Z_NULL          C                   0
+      *
+      **************************************************************************
+      *                                 Types
+      **************************************************************************
+      *
+     D z_streamp       S               *                                        Stream struct ptr
+     D gzFile          S               *                                        File pointer
+     D z_off_t         S             10i 0                                      Stream offsets
+      *
+      **************************************************************************
+      *                               Structures
+      **************************************************************************
+      *
+      *  The GZIP encode/decode stream support structure.
+      *
+     D z_stream        DS                  align based(z_streamp)
+     D  zs_next_in                     *                                        Next input byte
+     D  zs_avail_in                  10U 0                                      Byte cnt at next_in
+     D  zs_total_in                  10U 0                                      Total bytes read
+     D  zs_next_out                    *                                        Output buffer ptr
+     D  zs_avail_out                 10U 0                                      Room left @ next_out
+     D  zs_total_out                 10U 0                                      Total bytes written
+     D  zs_msg                         *                                        Last errmsg or null
+     D  zs_state                       *                                        Internal state
+     D  zs_zalloc                      *   procptr                              Int. state allocator
+     D  zs_free                        *   procptr                              Int. state dealloc.
+     D  zs_opaque                      *                                        Private alloc. data
+     D  zs_data_type                 10i 0                                      ASC/BIN best guess
+     D  zs_adler                     10u 0                                      Uncompr. adler32 val
+     D                               10U 0                                      Reserved
+     D                               10U 0                                      Ptr. alignment
+      *
+      **************************************************************************
+      *                     Utility function prototypes
+      **************************************************************************
+      *
+     D compress        PR            10I 0 extproc('compress')
+     D  dest                      32767    options(*varsize)                    Destination buffer
+     D  destLen                      10U 0                                      Destination length
+     D  source                    32767    const options(*varsize)              Source buffer
+     D  sourceLen                    10u 0 value                                Source length
+      *
+     D compress2       PR            10I 0 extproc('compress2')
+     D  dest                      32767    options(*varsize)                    Destination buffer
+     D  destLen                      10U 0                                      Destination length
+     D  source                    32767    const options(*varsize)              Source buffer
+     D  sourceLen                    10U 0 value                                Source length
+     D  level                        10I 0 value                                Compression level
+      *
+     D compressBound   PR            10U 0 extproc('compressBound')
+     D  sourceLen                    10U 0 value
+      *
+     D uncompress      PR            10I 0 extproc('uncompress')
+     D  dest                      32767    options(*varsize)                    Destination buffer
+     D  destLen                      10U 0                                      Destination length
+     D  source                    32767    const options(*varsize)              Source buffer
+     D  sourceLen                    10U 0 value                                Source length
+      *
+     D gzopen          PR                  extproc('gzopen')
+     D                                     like(gzFile)
+     D  path                           *   value options(*string)               File pathname
+     D  mode                           *   value options(*string)               Open mode
+      *
+     D gzdopen         PR                  extproc('gzdopen')
+     D                                     like(gzFile)
+     D  fd                           10i 0 value                                File descriptor
+     D  mode                           *   value options(*string)               Open mode
+      *
+     D gzsetparams     PR            10I 0 extproc('gzsetparams')
+     D  file                               value like(gzFile)                   File pointer
+     D  level                        10I 0 value
+     D  strategy                     10i 0 value
+      *
+     D gzread          PR            10I 0 extproc('gzread')
+     D  file                               value like(gzFile)                   File pointer
+     D  buf                       32767    options(*varsize)                    Buffer
+     D  len                          10u 0 value                                Buffer length
+      *
+     D gzwrite         PR            10I 0 extproc('gzwrite')
+     D  file                               value like(gzFile)                   File pointer
+     D  buf                       32767    const options(*varsize)              Buffer
+     D  len                          10u 0 value                                Buffer length
+      *
+     D gzputs          PR            10I 0 extproc('gzputs')
+     D  file                               value like(gzFile)                   File pointer
+     D  s                              *   value options(*string)               String to output
+      *
+     D gzgets          PR              *   extproc('gzgets')
+     D  file                               value like(gzFile)                   File pointer
+     D  buf                       32767    options(*varsize)                    Read buffer
+     D  len                          10i 0 value                                Buffer length
+      *
+     D gzflush         PR            10i 0 extproc('gzflush')
+     D  file                               value like(gzFile)                   File pointer
+     D  flush                        10I 0 value                                Type of flush
+      *
+     D gzseek          PR                  extproc('gzseek')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+     D  offset                             value like(z_off_t)                  Offset
+     D  whence                       10i 0 value                                Origin
+      *
+     D gzrewind        PR            10i 0 extproc('gzrewind')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gztell          PR                  extproc('gztell')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzeof           PR            10i 0 extproc('gzeof')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzclose         PR            10i 0 extproc('gzclose')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzerror         PR              *   extproc('gzerror')                   Error string
+     D  file                               value like(gzFile)                   File pointer
+     D  errnum                       10I 0                                      Error code
+      *
+     D gzclearerr      PR                  extproc('gzclearerr')
+     D  file                               value like(gzFile)                   File pointer
+      *
+      **************************************************************************
+      *                        Basic function prototypes
+      **************************************************************************
+      *
+     D zlibVersion     PR              *   extproc('zlibVersion')               Version string
+      *
+     D deflateInit     PR            10I 0 extproc('deflateInit_')              Init. compression
+     D  strm                               like(z_stream)                       Compression stream
+     D  level                        10I 0 value                                Compression level
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D deflate         PR            10I 0 extproc('deflate')                   Compress data
+     D  strm                               like(z_stream)                       Compression stream
+     D  flush                        10I 0 value                                Flush type required
+      *
+     D deflateEnd      PR            10I 0 extproc('deflateEnd')                Termin. compression
+     D  strm                               like(z_stream)                       Compression stream
+      *
+     D inflateInit     PR            10I 0 extproc('inflateInit_')              Init. expansion
+     D  strm                               like(z_stream)                       Expansion stream
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D inflate         PR            10I 0 extproc('inflate')                   Expand data
+     D  strm                               like(z_stream)                       Expansion stream
+     D  flush                        10I 0 value                                Flush type required
+      *
+     D inflateEnd      PR            10I 0 extproc('inflateEnd')                Termin. expansion
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+      **************************************************************************
+      *                        Advanced function prototypes
+      **************************************************************************
+      *
+     D deflateInit2    PR            10I 0 extproc('deflateInit2_')             Init. compression
+     D  strm                               like(z_stream)                       Compression stream
+     D  level                        10I 0 value                                Compression level
+     D  method                       10I 0 value                                Compression method
+     D  windowBits                   10I 0 value                                log2(window size)
+     D  memLevel                     10I 0 value                                Mem/cmpress tradeoff
+     D  strategy                     10I 0 value                                Compression stategy
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D deflateSetDictionary...
+     D                 PR            10I 0 extproc('deflateSetDictionary')      Init. dictionary
+     D  strm                               like(z_stream)                       Compression stream
+     D  dictionary                32767    const options(*varsize)              Dictionary bytes
+     D  dictLength                   10U 0 value                                Dictionary length
+      *
+     D deflateCopy     PR            10I 0 extproc('deflateCopy')               Compress strm 2 strm
+     D  dest                               like(z_stream)                       Destination stream
+     D  source                             like(z_stream)                       Source stream
+      *
+     D deflateReset    PR            10I 0 extproc('deflateReset')              End and init. stream
+     D  strm                               like(z_stream)                       Compression stream
+      *
+     D deflateParams   PR            10I 0 extproc('deflateParams')             Change level & strat
+     D  strm                               like(z_stream)                       Compression stream
+     D  level                        10I 0 value                                Compression level
+     D  strategy                     10I 0 value                                Compression stategy
+      *
+     D deflateBound    PR            10U 0 extproc('deflateBound')              Change level & strat
+     D  strm                               like(z_stream)                       Compression stream
+     D  sourcelen                    10U 0 value                                Compression level
+      *
+     D deflatePrime    PR            10I 0 extproc('deflatePrime')              Change level & strat
+     D  strm                               like(z_stream)                       Compression stream
+     D  bits                         10I 0 value                                Number of bits to insert
+     D  value                        10I 0 value                                Bits to insert
+      *
+     D inflateInit2    PR            10I 0 extproc('inflateInit2_')             Init. expansion
+     D  strm                               like(z_stream)                       Expansion stream
+     D  windowBits                   10I 0 value                                log2(window size)
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D inflateSetDictionary...
+     D                 PR            10I 0 extproc('inflateSetDictionary')      Init. dictionary
+     D  strm                               like(z_stream)                       Expansion stream
+     D  dictionary                32767    const options(*varsize)              Dictionary bytes
+     D  dictLength                   10U 0 value                                Dictionary length
+      *
+     D inflateSync     PR            10I 0 extproc('inflateSync')               Sync. expansion
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D inflateCopy     PR            10I 0 extproc('inflateCopy')
+     D  dest                               like(z_stream)                       Destination stream
+     D  source                             like(z_stream)                       Source stream
+      *
+     D inflateReset    PR            10I 0 extproc('inflateReset')              End and init. stream
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D inflateBackInit...
+     D                 PR            10I 0 extproc('inflateBackInit_')
+     D  strm                               like(z_stream)                       Expansion stream
+     D  windowBits                   10I 0 value                                Log2(buffer size)
+     D  window                    32767    options(*varsize)                    Buffer
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D inflateBack     PR            10I 0 extproc('inflateBack')
+     D  strm                               like(z_stream)                       Expansion stream
+     D  in                             *   value procptr                        Input function
+     D  in_desc                        *   value                                Input descriptor
+     D  out                            *   value procptr                        Output function
+     D  out_desc                       *   value                                Output descriptor
+      *
+     D inflateBackEnd  PR            10I 0 extproc('inflateBackEnd')
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D zlibCompileFlags...
+     D                 PR            10U 0 extproc('zlibCompileFlags')
+      *
+      **************************************************************************
+      *                        Checksum function prototypes
+      **************************************************************************
+      *
+     D adler32         PR            10U 0 extproc('adler32')                   New checksum
+     D  adler                        10U 0 value                                Old checksum
+     D  buf                       32767    const options(*varsize)              Bytes to accumulate
+     D  len                          10U 0 value                                Buffer length
+      *
+     D crc32           PR            10U 0 extproc('crc32')                     New checksum
+     D  crc                          10U 0 value                                Old checksum
+     D  buf                       32767    const options(*varsize)              Bytes to accumulate
+     D  len                          10U 0 value                                Buffer length
+      *
+      **************************************************************************
+      *                     Miscellaneous function prototypes
+      **************************************************************************
+      *
+     D zError          PR              *   extproc('zError')                    Error string
+     D  err                          10I 0 value                                Error code
+      *
+     D inflateSyncPoint...
+     D                 PR            10I 0 extproc('inflateSyncPoint')
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D get_crc_table   PR              *   extproc('get_crc_table')             Ptr to ulongs
+      *
+      /endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/descrip.mms b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/descrip.mms
new file mode 100644
index 00000000..7066da5b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/descrip.mms
@@ -0,0 +1,48 @@
+# descrip.mms: MMS description file for building zlib on VMS
+# written by Martin P.J. Zinser <m.zinser@gsi.de>
+
+cc_defs =
+c_deb =
+
+.ifdef __DECC__
+pref = /prefix=all
+.endif
+
+OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj,\
+       deflate.obj, trees.obj, zutil.obj, inflate.obj, infblock.obj,\
+       inftrees.obj, infcodes.obj, infutil.obj, inffast.obj
+
+CFLAGS= $(C_DEB) $(CC_DEFS) $(PREF)
+
+all : example.exe minigzip.exe
+        @ write sys$output " Example applications available"
+libz.olb : libz.olb($(OBJS))
+	@ write sys$output " libz available"
+
+example.exe : example.obj libz.olb
+              link example,libz.olb/lib
+
+minigzip.exe : minigzip.obj libz.olb
+              link minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib
+
+clean :
+	delete *.obj;*,libz.olb;*
+
+
+# Other dependencies.
+adler32.obj : zutil.h zlib.h zconf.h
+compress.obj : zlib.h zconf.h
+crc32.obj : zutil.h zlib.h zconf.h
+deflate.obj : deflate.h zutil.h zlib.h zconf.h
+example.obj : zlib.h zconf.h
+gzio.obj : zutil.h zlib.h zconf.h
+infblock.obj : zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+infcodes.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
+inffast.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+inflate.obj : zutil.h zlib.h zconf.h infblock.h
+inftrees.obj : zutil.h zlib.h zconf.h inftrees.h
+infutil.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h
+minigzip.obj : zlib.h zconf.h
+trees.obj : deflate.h zutil.h zlib.h zconf.h
+uncompr.obj : zlib.h zconf.h
+zutil.obj : zutil.h zlib.h zconf.h
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/os2/Makefile.os2 b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/os2/Makefile.os2
new file mode 100644
index 00000000..a105aaa5
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/os2/Makefile.os2
@@ -0,0 +1,136 @@
+# Makefile for zlib under OS/2 using GCC (PGCC)
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile and test, type:
+#   cp Makefile.os2 ..
+#   cd ..
+#   make -f Makefile.os2 test
+
+# This makefile will build a static library z.lib, a shared library
+# z.dll and a import library zdll.lib. You can use either z.lib or
+# zdll.lib by specifying either -lz or -lzdll on gcc's command line
+
+CC=gcc -Zomf -s
+
+CFLAGS=-O6 -Wall
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-g -DDEBUG
+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+#           -Wstrict-prototypes -Wmissing-prototypes
+
+#################### BUG WARNING: #####################
+## infcodes.c hits a bug in pgcc-1.0, so you have to use either
+## -O# where # <= 4 or one of (-fno-ommit-frame-pointer or -fno-force-mem)
+## This bug is reportedly fixed in pgcc >1.0, but this was not tested
+CFLAGS+=-fno-force-mem
+
+LDFLAGS=-s -L. -lzdll -Zcrtdll
+LDSHARED=$(CC) -s -Zomf -Zdll -Zcrtdll
+
+VER=1.1.0
+ZLIB=z.lib
+SHAREDLIB=z.dll
+SHAREDLIBIMP=zdll.lib
+LIBS=$(ZLIB) $(SHAREDLIB) $(SHAREDLIBIMP)
+
+AR=emxomfar cr
+IMPLIB=emximp
+RANLIB=echo
+TAR=tar
+SHELL=bash
+
+prefix=/usr/local
+exec_prefix = $(prefix)
+
+OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
+
+TEST_OBJS = example.o minigzip.o
+
+DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] *.[ch] descrip.mms \
+  algorithm.txt zlib.3 msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \
+  nt/Makefile.nt nt/zlib.dnt  contrib/README.contrib contrib/*.txt \
+  contrib/asm386/*.asm contrib/asm386/*.c \
+  contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/iostream/*.cpp \
+  contrib/iostream/*.h  contrib/iostream2/*.h contrib/iostream2/*.cpp \
+  contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32
+
+all: example.exe minigzip.exe
+
+test: all
+	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
+	echo hello world | ./minigzip | ./minigzip -d || \
+	  echo '		*** minigzip test FAILED ***' ; \
+	if ./example; then \
+	  echo '		*** zlib test OK ***'; \
+	else \
+	  echo '		*** zlib test FAILED ***'; \
+	fi
+
+$(ZLIB): $(OBJS)
+	$(AR) $@ $(OBJS)
+	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
+
+$(SHAREDLIB): $(OBJS) os2/z.def
+	$(LDSHARED) -o $@ $^
+
+$(SHAREDLIBIMP): os2/z.def
+	$(IMPLIB) -o $@ $^
+
+example.exe: example.o $(LIBS)
+	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
+
+minigzip.exe: minigzip.o $(LIBS)
+	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+
+clean:
+	rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
+
+distclean:	clean
+
+zip:
+	mv Makefile Makefile~; cp -p Makefile.in Makefile
+	rm -f test.c ztest*.c
+	v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+	zip -ul9 zlib$$v $(DISTFILES)
+	mv Makefile~ Makefile
+
+dist:
+	mv Makefile Makefile~; cp -p Makefile.in Makefile
+	rm -f test.c ztest*.c
+	d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+	rm -f $$d.tar.gz; \
+	if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
+	files=""; \
+	for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \
+	cd ..; \
+	GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \
+	if test ! -d $$d; then rm -f $$d; fi
+	mv Makefile~ Makefile
+
+tags:
+	etags *.[ch]
+
+depend:
+	makedepend -- $(CFLAGS) -- *.[ch]
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o: zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+example.o: zlib.h zconf.h
+gzio.o: zutil.h zlib.h zconf.h
+infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h
+infcodes.o: zutil.h zlib.h zconf.h
+infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h
+inffast.o: infblock.h infcodes.h infutil.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h infblock.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+minigzip.o: zlib.h zconf.h
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/os2/zlib.def b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/os2/zlib.def
new file mode 100644
index 00000000..438e8c0d
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/os2/zlib.def
@@ -0,0 +1,51 @@
+;
+; Slightly modified version of ../nt/zlib.dnt :-)
+;
+
+LIBRARY		Z
+DESCRIPTION	"Zlib compression library for OS/2"
+CODE		PRELOAD MOVEABLE DISCARDABLE
+DATA		PRELOAD MOVEABLE MULTIPLE
+
+EXPORTS
+    adler32
+    compress
+    crc32
+    deflate
+    deflateCopy
+    deflateEnd
+    deflateInit2_
+    deflateInit_
+    deflateParams
+    deflateReset
+    deflateSetDictionary
+    gzclose
+    gzdopen
+    gzerror
+    gzflush
+    gzopen
+    gzread
+    gzwrite
+    inflate
+    inflateEnd
+    inflateInit2_
+    inflateInit_
+    inflateReset
+    inflateSetDictionary
+    inflateSync
+    uncompress
+    zlibVersion
+    gzprintf
+    gzputc
+    gzgetc
+    gzseek
+    gzrewind
+    gztell
+    gzeof
+    gzsetparams
+    zError
+    inflateSyncPoint
+    get_crc_table
+    compress2
+    gzputs
+    gzgets
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visual-basic.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visual-basic.txt
new file mode 100644
index 00000000..57efe581
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visual-basic.txt
@@ -0,0 +1,160 @@
+See below some functions declarations for Visual Basic.
+
+Frequently Asked Question:
+
+Q: Each time I use the compress function I get the -5 error (not enough
+   room in the output buffer).
+
+A: Make sure that the length of the compressed buffer is passed by
+   reference ("as any"), not by value ("as long"). Also check that
+   before the call of compress this length is equal to the total size of
+   the compressed buffer and not zero.
+
+
+From: "Jon Caruana" <jon-net@usa.net>
+Subject: Re: How to port zlib declares to vb?
+Date: Mon, 28 Oct 1996 18:33:03 -0600
+
+Got the answer! (I haven't had time to check this but it's what I got, and
+looks correct):
+
+He has the following routines working:
+        compress
+        uncompress
+        gzopen
+        gzwrite
+        gzread
+        gzclose
+
+Declares follow: (Quoted from Carlos Rios <c_rios@sonda.cl>, in Vb4 form)
+
+#If Win16 Then   'Use Win16 calls.
+Declare Function compress Lib "ZLIB.DLL" (ByVal compr As
+        String, comprLen As Any, ByVal buf As String, ByVal buflen
+        As Long) As Integer
+Declare Function uncompress Lib "ZLIB.DLL" (ByVal uncompr
+        As String, uncomprLen As Any, ByVal compr As String, ByVal
+        lcompr As Long) As Integer
+Declare Function gzopen Lib "ZLIB.DLL" (ByVal filePath As
+        String, ByVal mode As String) As Long
+Declare Function gzread Lib "ZLIB.DLL" (ByVal file As
+        Long, ByVal uncompr As String, ByVal uncomprLen As Integer)
+        As Integer
+Declare Function gzwrite Lib "ZLIB.DLL" (ByVal file As
+        Long, ByVal uncompr As String, ByVal uncomprLen As Integer)
+        As Integer
+Declare Function gzclose Lib "ZLIB.DLL" (ByVal file As
+        Long) As Integer
+#Else
+Declare Function compress Lib "ZLIB32.DLL"
+        (ByVal compr As String, comprLen As Any, ByVal buf As
+        String, ByVal buflen As Long) As Integer
+Declare Function uncompress Lib "ZLIB32.DLL"
+        (ByVal uncompr As String, uncomprLen As Any, ByVal compr As
+        String, ByVal lcompr As Long) As Long
+Declare Function gzopen Lib "ZLIB32.DLL"
+        (ByVal file As String, ByVal mode As String) As Long
+Declare Function gzread Lib "ZLIB32.DLL"
+        (ByVal file As Long, ByVal uncompr As String, ByVal
+        uncomprLen As Long) As Long
+Declare Function gzwrite Lib "ZLIB32.DLL"
+        (ByVal file As Long, ByVal uncompr As String, ByVal
+        uncomprLen As Long) As Long
+Declare Function gzclose Lib "ZLIB32.DLL"
+        (ByVal file As Long) As Long
+#End If
+
+-Jon Caruana
+jon-net@usa.net
+Microsoft Sitebuilder Network Level 1 Member - HTML Writer's Guild Member
+
+
+Here is another example from Michael <michael_borgsys@hotmail.com> that he
+says conforms to the VB guidelines, and that solves the problem of not
+knowing the uncompressed size by storing it at the end of the file:
+
+'Calling the functions:
+'bracket meaning: <parameter> [optional] {Range of possible values}
+'Call subCompressFile(<path with filename to compress> [, <path with
+filename to write to>, [level of compression {1..9}]])
+'Call subUncompressFile(<path with filename to compress>)
+
+Option Explicit
+Private lngpvtPcnSml As Long 'Stores value for 'lngPercentSmaller'
+Private Const SUCCESS As Long = 0
+Private Const strFilExt As String = ".cpr"
+Private Declare Function lngfncCpr Lib "zlib.dll" Alias "compress2" (ByRef
+dest As Any, ByRef destLen As Any, ByRef src As Any, ByVal srcLen As Long,
+ByVal level As Integer) As Long
+Private Declare Function lngfncUcp Lib "zlib.dll" Alias "uncompress" (ByRef
+dest As Any, ByRef destLen As Any, ByRef src As Any, ByVal srcLen As Long)
+As Long
+
+Public Sub subCompressFile(ByVal strargOriFilPth As String, Optional ByVal
+strargCprFilPth As String, Optional ByVal intLvl As Integer = 9)
+    Dim strCprPth As String
+    Dim lngOriSiz As Long
+    Dim lngCprSiz As Long
+    Dim bytaryOri() As Byte
+    Dim bytaryCpr() As Byte
+    lngOriSiz = FileLen(strargOriFilPth)
+    ReDim bytaryOri(lngOriSiz - 1)
+    Open strargOriFilPth For Binary Access Read As #1
+        Get #1, , bytaryOri()
+    Close #1
+    strCprPth = IIf(strargCprFilPth = "", strargOriFilPth, strargCprFilPth)
+'Select file path and name
+    strCprPth = strCprPth & IIf(Right(strCprPth, Len(strFilExt)) =
+strFilExt, "", strFilExt) 'Add file extension if not exists
+    lngCprSiz = (lngOriSiz * 1.01) + 12 'Compression needs temporary a bit
+more space then original file size
+    ReDim bytaryCpr(lngCprSiz - 1)
+    If lngfncCpr(bytaryCpr(0), lngCprSiz, bytaryOri(0), lngOriSiz, intLvl) =
+SUCCESS Then
+        lngpvtPcnSml = (1# - (lngCprSiz / lngOriSiz)) * 100
+        ReDim Preserve bytaryCpr(lngCprSiz - 1)
+        Open strCprPth For Binary Access Write As #1
+            Put #1, , bytaryCpr()
+            Put #1, , lngOriSiz 'Add the the original size value to the end
+(last 4 bytes)
+        Close #1
+    Else
+        MsgBox "Compression error"
+    End If
+    Erase bytaryCpr
+    Erase bytaryOri
+End Sub
+
+Public Sub subUncompressFile(ByVal strargFilPth As String)
+    Dim bytaryCpr() As Byte
+    Dim bytaryOri() As Byte
+    Dim lngOriSiz As Long
+    Dim lngCprSiz As Long
+    Dim strOriPth As String
+    lngCprSiz = FileLen(strargFilPth)
+    ReDim bytaryCpr(lngCprSiz - 1)
+    Open strargFilPth For Binary Access Read As #1
+        Get #1, , bytaryCpr()
+    Close #1
+    'Read the original file size value:
+    lngOriSiz = bytaryCpr(lngCprSiz - 1) * (2 ^ 24) _
+              + bytaryCpr(lngCprSiz - 2) * (2 ^ 16) _
+              + bytaryCpr(lngCprSiz - 3) * (2 ^ 8) _
+              + bytaryCpr(lngCprSiz - 4)
+    ReDim Preserve bytaryCpr(lngCprSiz - 5) 'Cut of the original size value
+    ReDim bytaryOri(lngOriSiz - 1)
+    If lngfncUcp(bytaryOri(0), lngOriSiz, bytaryCpr(0), lngCprSiz) = SUCCESS
+Then
+        strOriPth = Left(strargFilPth, Len(strargFilPth) - Len(strFilExt))
+        Open strOriPth For Binary Access Write As #1
+            Put #1, , bytaryOri()
+        Close #1
+    Else
+        MsgBox "Uncompression error"
+    End If
+    Erase bytaryCpr
+    Erase bytaryOri
+End Sub
+Public Property Get lngPercentSmaller() As Long
+    lngPercentSmaller = lngpvtPcnSml
+End Property
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/README.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/README.txt
new file mode 100644
index 00000000..3d0aef0a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/README.txt
@@ -0,0 +1,73 @@
+Microsoft Developer Studio Project Files, Format Version 6.00 for zlib.
+
+Copyright (C) 2000-2004 Simon-Pierre Cadieux.
+Copyright (C) 2004 Cosmin Truta.
+For conditions of distribution and use, see copyright notice in zlib.h.
+
+
+This project builds the zlib binaries as follows:
+
+* Win32_DLL_Release\zlib1.dll       DLL build
+* Win32_DLL_Debug\zlib1d.dll        DLL build (debug version)
+* Win32_DLL_ASM_Release\zlib1.dll   DLL build using ASM code
+* Win32_DLL_ASM_Debug\zlib1d.dll    DLL build using ASM code (debug version)
+* Win32_LIB_Release\zlib.lib        static build
+* Win32_LIB_Debug\zlibd.lib         static build (debug version)
+* Win32_LIB_ASM_Release\zlib.lib    static build using ASM code
+* Win32_LIB_ASM_Debug\zlibd.lib     static build using ASM code (debug version)
+
+
+For more information regarding the DLL builds, please see the DLL FAQ
+in ..\..\win32\DLL_FAQ.txt.
+
+
+To build and test:
+
+1) On the main menu, select "File | Open Workspace".
+   Open "zlib.dsw".
+
+2) Select "Build | Set Active Configuration".
+   Choose the configuration you wish to build.
+
+3) Select "Build | Clean".
+
+4) Select "Build | Build ... (F7)".  Ignore warning messages about
+   not being able to find certain include files (e.g. alloc.h).
+
+5) If you built one of the sample programs (example or minigzip),
+   select "Build | Execute ... (Ctrl+F5)".
+
+
+To use:
+
+1) Select "Project | Settings (Alt+F7)".
+   Make note of the configuration names used in your project.
+   Usually, these names are "Win32 Release" and "Win32 Debug".
+
+2) In the Workspace window, select the "FileView" tab.
+   Right-click on the root item "Workspace '...'".
+   Select "Insert Project into Workspace".
+   Switch on the checkbox "Dependency of:", and select the name
+   of your project.  Open "zlib.dsp".
+
+3) Select "Build | Configurations".
+   For each configuration of your project:
+   3.1) Choose the zlib configuration you wish to use.
+   3.2) Click on "Add".
+   3.3) Set the new zlib configuration name to the name used by
+        the configuration from the current iteration.
+
+4) Select "Build | Set Active Configuration".
+   Choose the configuration you wish to build.
+
+5) Select "Build | Build ... (F7)".
+
+6) If you built an executable program, select
+   "Build | Execute ... (Ctrl+F5)".
+
+
+Note:
+
+To build the ASM-enabled code, you need Microsoft Assembler
+(ML.EXE).  You can get it by downloading and installing the
+latest Processor Pack for Visual C++ 6.0.
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/example.dsp b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/example.dsp
new file mode 100644
index 00000000..d3580525
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/example.dsp
@@ -0,0 +1,278 @@
+# Microsoft Developer Studio Project File - Name="example" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=example - Win32 LIB Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "example.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "example.mak" CFG="example - Win32 LIB Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "example - Win32 DLL ASM Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "example - Win32 DLL ASM Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "example - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "example - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "example - Win32 LIB ASM Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "example - Win32 LIB ASM Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "example - Win32 LIB Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "example - Win32 LIB Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "example - Win32 DLL ASM Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "example___Win32_DLL_ASM_Release"
+# PROP BASE Intermediate_Dir "example___Win32_DLL_ASM_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Win32_DLL_ASM_Release"
+# PROP Intermediate_Dir "Win32_DLL_ASM_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "example - Win32 DLL ASM Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "example___Win32_DLL_ASM_Debug"
+# PROP BASE Intermediate_Dir "example___Win32_DLL_ASM_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Win32_DLL_ASM_Debug"
+# PROP Intermediate_Dir "Win32_DLL_ASM_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "example - Win32 DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "example___Win32_DLL_Release"
+# PROP BASE Intermediate_Dir "example___Win32_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Win32_DLL_Release"
+# PROP Intermediate_Dir "Win32_DLL_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "example - Win32 DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "example___Win32_DLL_Debug"
+# PROP BASE Intermediate_Dir "example___Win32_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Win32_DLL_Debug"
+# PROP Intermediate_Dir "Win32_DLL_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "example - Win32 LIB ASM Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "example___Win32_LIB_ASM_Release"
+# PROP BASE Intermediate_Dir "example___Win32_LIB_ASM_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Win32_LIB_ASM_Release"
+# PROP Intermediate_Dir "Win32_LIB_ASM_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "example - Win32 LIB ASM Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "example___Win32_LIB_ASM_Debug"
+# PROP BASE Intermediate_Dir "example___Win32_LIB_ASM_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Win32_LIB_ASM_Debug"
+# PROP Intermediate_Dir "Win32_LIB_ASM_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "example - Win32 LIB Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "example___Win32_LIB_Release"
+# PROP BASE Intermediate_Dir "example___Win32_LIB_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Win32_LIB_Release"
+# PROP Intermediate_Dir "Win32_LIB_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "example - Win32 LIB Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "example___Win32_LIB_Debug"
+# PROP BASE Intermediate_Dir "example___Win32_LIB_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Win32_LIB_Debug"
+# PROP Intermediate_Dir "Win32_LIB_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "example - Win32 DLL ASM Release"
+# Name "example - Win32 DLL ASM Debug"
+# Name "example - Win32 DLL Release"
+# Name "example - Win32 DLL Debug"
+# Name "example - Win32 LIB ASM Release"
+# Name "example - Win32 LIB ASM Debug"
+# Name "example - Win32 LIB Release"
+# Name "example - Win32 LIB Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\example.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\zconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/minigzip.dsp b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/minigzip.dsp
new file mode 100644
index 00000000..71034684
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/minigzip.dsp
@@ -0,0 +1,278 @@
+# Microsoft Developer Studio Project File - Name="minigzip" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=minigzip - Win32 LIB Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "minigzip.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "minigzip.mak" CFG="minigzip - Win32 LIB Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "minigzip - Win32 DLL ASM Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "minigzip - Win32 DLL ASM Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "minigzip - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "minigzip - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "minigzip - Win32 LIB ASM Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "minigzip - Win32 LIB ASM Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "minigzip - Win32 LIB Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "minigzip - Win32 LIB Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "minigzip - Win32 DLL ASM Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "minigzip___Win32_DLL_ASM_Release"
+# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_ASM_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Win32_DLL_ASM_Release"
+# PROP Intermediate_Dir "Win32_DLL_ASM_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "minigzip - Win32 DLL ASM Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "minigzip___Win32_DLL_ASM_Debug"
+# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_ASM_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Win32_DLL_ASM_Debug"
+# PROP Intermediate_Dir "Win32_DLL_ASM_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "minigzip - Win32 DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "minigzip___Win32_DLL_Release"
+# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Win32_DLL_Release"
+# PROP Intermediate_Dir "Win32_DLL_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "minigzip - Win32 DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "minigzip___Win32_DLL_Debug"
+# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Win32_DLL_Debug"
+# PROP Intermediate_Dir "Win32_DLL_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "minigzip - Win32 LIB ASM Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "minigzip___Win32_LIB_ASM_Release"
+# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_ASM_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Win32_LIB_ASM_Release"
+# PROP Intermediate_Dir "Win32_LIB_ASM_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "minigzip - Win32 LIB ASM Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "minigzip___Win32_LIB_ASM_Debug"
+# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_ASM_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Win32_LIB_ASM_Debug"
+# PROP Intermediate_Dir "Win32_LIB_ASM_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "minigzip - Win32 LIB Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "minigzip___Win32_LIB_Release"
+# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Win32_LIB_Release"
+# PROP Intermediate_Dir "Win32_LIB_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "minigzip - Win32 LIB Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "minigzip___Win32_LIB_Debug"
+# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Win32_LIB_Debug"
+# PROP Intermediate_Dir "Win32_LIB_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "minigzip - Win32 DLL ASM Release"
+# Name "minigzip - Win32 DLL ASM Debug"
+# Name "minigzip - Win32 DLL Release"
+# Name "minigzip - Win32 DLL Debug"
+# Name "minigzip - Win32 LIB ASM Release"
+# Name "minigzip - Win32 LIB ASM Debug"
+# Name "minigzip - Win32 LIB Release"
+# Name "minigzip - Win32 LIB Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\minigzip.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\zconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/zlib.dsp b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/zlib.dsp
new file mode 100644
index 00000000..00f54ea4
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/zlib.dsp
@@ -0,0 +1,621 @@
+# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=zlib - Win32 LIB Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "zlib.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 LIB Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "zlib - Win32 DLL ASM Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "zlib - Win32 DLL ASM Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "zlib - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "zlib - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "zlib - Win32 LIB ASM Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "zlib - Win32 LIB ASM Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "zlib - Win32 LIB Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "zlib - Win32 LIB Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "zlib___Win32_DLL_ASM_Release"
+# PROP BASE Intermediate_Dir "zlib___Win32_DLL_ASM_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Win32_DLL_ASM_Release"
+# PROP Intermediate_Dir "Win32_DLL_ASM_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Win32_DLL_ASM_Release\zlib1.dll"
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "zlib___Win32_DLL_ASM_Debug"
+# PROP BASE Intermediate_Dir "zlib___Win32_DLL_ASM_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Win32_DLL_ASM_Debug"
+# PROP Intermediate_Dir "Win32_DLL_ASM_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /D "ASMV" /D "ASMINF" /FR /FD /GZ /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Win32_DLL_ASM_Debug\zlib1d.dll" /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "zlib___Win32_DLL_Release"
+# PROP BASE Intermediate_Dir "zlib___Win32_DLL_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Win32_DLL_Release"
+# PROP Intermediate_Dir "Win32_DLL_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Win32_DLL_Release\zlib1.dll"
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "zlib___Win32_DLL_Debug"
+# PROP BASE Intermediate_Dir "zlib___Win32_DLL_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Win32_DLL_Debug"
+# PROP Intermediate_Dir "Win32_DLL_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /FR /FD /GZ /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Win32_DLL_Debug\zlib1d.dll" /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "zlib___Win32_LIB_ASM_Release"
+# PROP BASE Intermediate_Dir "zlib___Win32_LIB_ASM_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Win32_LIB_ASM_Release"
+# PROP Intermediate_Dir "Win32_LIB_ASM_Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "zlib___Win32_LIB_ASM_Debug"
+# PROP BASE Intermediate_Dir "zlib___Win32_LIB_ASM_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Win32_LIB_ASM_Debug"
+# PROP Intermediate_Dir "Win32_LIB_ASM_Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /D "ASMV" /D "ASMINF" /FR /FD /GZ /c
+# SUBTRACT CPP /YX /Yc /Yu
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"Win32_LIB_ASM_Debug\zlibd.lib"
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "zlib___Win32_LIB_Release"
+# PROP BASE Intermediate_Dir "zlib___Win32_LIB_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Win32_LIB_Release"
+# PROP Intermediate_Dir "Win32_LIB_Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "zlib___Win32_LIB_Debug"
+# PROP BASE Intermediate_Dir "zlib___Win32_LIB_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Win32_LIB_Debug"
+# PROP Intermediate_Dir "Win32_LIB_Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /FR /FD /GZ /c
+# SUBTRACT CPP /YX /Yc /Yu
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"Win32_LIB_Debug\zlibd.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "zlib - Win32 DLL ASM Release"
+# Name "zlib - Win32 DLL ASM Debug"
+# Name "zlib - Win32 DLL Release"
+# Name "zlib - Win32 DLL Debug"
+# Name "zlib - Win32 LIB ASM Release"
+# Name "zlib - Win32 LIB ASM Debug"
+# Name "zlib - Win32 LIB Release"
+# Name "zlib - Win32 LIB Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\adler32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gzclose.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gzlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gzread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gzwrite.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\infback.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inftrees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\trees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\uncompr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\win32\zlib.def
+
+!IF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Release"
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zutil.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\crc32.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\deflate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inffast.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inffixed.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inflate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inftrees.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\trees.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zutil.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\win32\zlib1.rc
+# End Source File
+# End Group
+# Begin Group "Assembler Files (Unsupported)"
+
+# PROP Default_Filter "asm;obj;c;cpp;cxx;h;hpp;hxx"
+# Begin Source File
+
+SOURCE=..\..\contrib\masmx86\gvmat32.asm
+
+!IF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
+
+# Begin Custom Build - Assembling...
+IntDir=.\Win32_DLL_ASM_Release
+InputPath=..\..\contrib\masmx86\gvmat32.asm
+InputName=gvmat32
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	ml.exe /nologo /c /coff /Cx /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
+
+# Begin Custom Build - Assembling...
+IntDir=.\Win32_DLL_ASM_Debug
+InputPath=..\..\contrib\masmx86\gvmat32.asm
+InputName=gvmat32
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	ml.exe /nologo /c /coff /Cx /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
+
+# Begin Custom Build - Assembling...
+IntDir=.\Win32_LIB_ASM_Release
+InputPath=..\..\contrib\masmx86\gvmat32.asm
+InputName=gvmat32
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	ml.exe /nologo /c /coff /Cx /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
+
+# Begin Custom Build - Assembling...
+IntDir=.\Win32_LIB_ASM_Debug
+InputPath=..\..\contrib\masmx86\gvmat32.asm
+InputName=gvmat32
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	ml.exe /nologo /c /coff /Cx /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\contrib\masmx86\gvmat32c.c
+
+!IF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
+
+# ADD CPP /I "..\.."
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
+
+# ADD CPP /I "..\.."
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Release"
+
+# PROP Exclude_From_Build 1
+# ADD CPP /I "..\.."
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
+
+# PROP Exclude_From_Build 1
+# ADD CPP /I "..\.."
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
+
+# ADD CPP /I "..\.."
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
+
+# ADD CPP /I "..\.."
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
+
+# PROP Exclude_From_Build 1
+# ADD CPP /I "..\.."
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
+
+# PROP Exclude_From_Build 1
+# ADD CPP /I "..\.."
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\contrib\masmx86\inffas32.asm
+
+!IF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
+
+# Begin Custom Build - Assembling...
+IntDir=.\Win32_DLL_ASM_Release
+InputPath=..\..\contrib\masmx86\inffas32.asm
+InputName=inffas32
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	ml.exe /nologo /c /coff /Cx /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
+
+# Begin Custom Build - Assembling...
+IntDir=.\Win32_DLL_ASM_Debug
+InputPath=..\..\contrib\masmx86\inffas32.asm
+InputName=inffas32
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	ml.exe /nologo /c /coff /Cx /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
+
+# Begin Custom Build - Assembling...
+IntDir=.\Win32_LIB_ASM_Release
+InputPath=..\..\contrib\masmx86\inffas32.asm
+InputName=inffas32
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	ml.exe /nologo /c /coff /Cx /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
+
+# Begin Custom Build - Assembling...
+IntDir=.\Win32_LIB_ASM_Debug
+InputPath=..\..\contrib\masmx86\inffas32.asm
+InputName=inffas32
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	ml.exe /nologo /c /coff /Cx /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\README.txt
+# End Source File
+# End Target
+# End Project
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/zlib.dsw b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/zlib.dsw
new file mode 100644
index 00000000..3a771fce
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/old/visualc6/zlib.dsw
@@ -0,0 +1,59 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "example"=.\example.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "minigzip"=.\minigzip.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "zlib"=.\zlib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/qnx/package.qpg b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/qnx/package.qpg
new file mode 100644
index 00000000..2bc63b21
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/qnx/package.qpg
@@ -0,0 +1,141 @@
+<QPG:Generation>
+   <QPG:Options>
+      <QPG:User unattended="no" verbosity="2" listfiles="yes"/>
+      <QPG:Defaults type="qnx_package"/>
+      <QPG:Source></QPG:Source>
+      <QPG:Release number="+"/>
+      <QPG:Build></QPG:Build>
+      <QPG:FileSorting strip="yes"/>
+      <QPG:Package targets="combine"/>
+      <QPG:Repository generate="yes"/>
+      <QPG:FinalDir></QPG:FinalDir>
+      <QPG:Cleanup></QPG:Cleanup>
+   </QPG:Options>
+
+   <QPG:Responsible>
+      <QPG:Company></QPG:Company>
+      <QPG:Department></QPG:Department>
+      <QPG:Group></QPG:Group>
+      <QPG:Team></QPG:Team>
+      <QPG:Employee></QPG:Employee>
+      <QPG:EmailAddress></QPG:EmailAddress>
+   </QPG:Responsible>
+
+   <QPG:Values>
+      <QPG:Files>
+         <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
+         <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
+         <QPG:Add file="../libz.so.1.2.5" install="/opt/lib/" user="root:bin" permission="644"/>
+         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.5"/>
+         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.5"/>
+         <QPG:Add file="../libz.so.1.2.5" install="/opt/lib/" component="slib"/>
+      </QPG:Files>
+
+      <QPG:PackageFilter>
+         <QPM:PackageManifest>
+            <QPM:PackageDescription>
+               <QPM:PackageType>Library</QPM:PackageType>
+               <QPM:PackageReleaseNotes></QPM:PackageReleaseNotes>
+               <QPM:PackageReleaseUrgency>Medium</QPM:PackageReleaseUrgency>
+               <QPM:PackageRepository></QPM:PackageRepository>
+               <QPM:FileVersion>2.0</QPM:FileVersion>
+            </QPM:PackageDescription>
+
+            <QPM:ProductDescription>
+               <QPM:ProductName>zlib</QPM:ProductName>
+               <QPM:ProductIdentifier>zlib</QPM:ProductIdentifier>
+               <QPM:ProductEmail>alain.bonnefoy@icbt.com</QPM:ProductEmail>
+               <QPM:VendorName>Public</QPM:VendorName>
+               <QPM:VendorInstallName>public</QPM:VendorInstallName>
+               <QPM:VendorURL>www.gzip.org/zlib</QPM:VendorURL>
+               <QPM:VendorEmbedURL></QPM:VendorEmbedURL>
+               <QPM:VendorEmail></QPM:VendorEmail>
+               <QPM:AuthorName>Jean-Loup Gailly,Mark Adler</QPM:AuthorName>
+               <QPM:AuthorURL>www.gzip.org/zlib</QPM:AuthorURL>
+               <QPM:AuthorEmbedURL></QPM:AuthorEmbedURL>
+               <QPM:AuthorEmail>zlib@gzip.org</QPM:AuthorEmail>
+               <QPM:ProductIconSmall></QPM:ProductIconSmall>
+               <QPM:ProductIconLarge></QPM:ProductIconLarge>
+               <QPM:ProductDescriptionShort>A massively spiffy yet delicately unobtrusive compression library.</QPM:ProductDescriptionShort>
+               <QPM:ProductDescriptionLong>zlib is designed to be a free, general-purpose, legally unencumbered, lossless data compression library for use on virtually any computer hardware and operating system.</QPM:ProductDescriptionLong>
+               <QPM:ProductDescriptionURL>http://www.gzip.org/zlib</QPM:ProductDescriptionURL>
+               <QPM:ProductDescriptionEmbedURL></QPM:ProductDescriptionEmbedURL>
+            </QPM:ProductDescription>
+
+            <QPM:ReleaseDescription>
+               <QPM:ReleaseVersion>1.2.5</QPM:ReleaseVersion>
+               <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
+               <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
+               <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
+               <QPM:ReleaseNoteMajor></QPM:ReleaseNoteMajor>
+               <QPM:ExcludeCountries>
+                  <QPM:Country></QPM:Country>
+               </QPM:ExcludeCountries>
+
+               <QPM:ReleaseCopyright>No License</QPM:ReleaseCopyright>
+            </QPM:ReleaseDescription>
+
+            <QPM:ContentDescription>
+               <QPM:ContentTopic xmlmultiple="true">Software Development/Libraries and Extensions/C Libraries</QPM:ContentTopic>
+               <QPM:ContentKeyword>zlib,compression</QPM:ContentKeyword>
+               <QPM:TargetOS>qnx6</QPM:TargetOS>
+               <QPM:HostOS>qnx6</QPM:HostOS>
+               <QPM:DisplayEnvironment xmlmultiple="true">None</QPM:DisplayEnvironment>
+               <QPM:TargetAudience xmlmultiple="true">Developer</QPM:TargetAudience>
+            </QPM:ContentDescription>
+         </QPM:PackageManifest>
+      </QPG:PackageFilter>
+
+      <QPG:PackageFilter proc="none" target="none">
+         <QPM:PackageManifest>
+            <QPM:ProductInstallationDependencies>
+               <QPM:ProductRequirements></QPM:ProductRequirements>
+            </QPM:ProductInstallationDependencies>
+
+            <QPM:ProductInstallationProcedure>
+               <QPM:Script xmlmultiple="true">
+                  <QPM:ScriptName></QPM:ScriptName>
+                  <QPM:ScriptType>Install</QPM:ScriptType>
+                  <QPM:ScriptTiming>Post</QPM:ScriptTiming>
+                  <QPM:ScriptBlocking>No</QPM:ScriptBlocking>
+                  <QPM:ScriptResult>Ignore</QPM:ScriptResult>
+                  <QPM:ShortDescription></QPM:ShortDescription>
+                  <QPM:UseBinaries>No</QPM:UseBinaries>
+                  <QPM:Priority>Optional</QPM:Priority>
+               </QPM:Script>
+            </QPM:ProductInstallationProcedure>
+         </QPM:PackageManifest>
+
+         <QPM:Launch>
+         </QPM:Launch>
+      </QPG:PackageFilter>
+
+      <QPG:PackageFilter type="core" component="none">
+         <QPM:PackageManifest>
+            <QPM:ProductInstallationProcedure>
+	       <QPM:OrderDependency xmlmultiple="true">
+	          <QPM:Order>InstallOver</QPM:Order>
+	          <QPM:Product>zlib</QPM:Product>
+	       </QPM:OrderDependency>
+            </QPM:ProductInstallationProcedure>
+         </QPM:PackageManifest>
+
+         <QPM:Launch>
+         </QPM:Launch>
+      </QPG:PackageFilter>
+
+      <QPG:PackageFilter type="core" component="dev">
+         <QPM:PackageManifest>
+            <QPM:ProductInstallationProcedure>
+	       <QPM:OrderDependency xmlmultiple="true">
+	          <QPM:Order>InstallOver</QPM:Order>
+	          <QPM:Product>zlib-dev</QPM:Product>
+	       </QPM:OrderDependency>
+            </QPM:ProductInstallationProcedure>
+         </QPM:PackageManifest>
+
+         <QPM:Launch>
+         </QPM:Launch>
+      </QPG:PackageFilter>
+   </QPG:Values>
+</QPG:Generation>
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/treebuild.xml b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/treebuild.xml
new file mode 100644
index 00000000..6b8f5428
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/treebuild.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" ?>
+<package name="zlib" version="1.2.5">
+    <library name="zlib" dlversion="1.2.5" dlname="z">
+	<property name="description"> zip compression library </property>
+	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
+
+	<!-- fixme: not implemented yet -->
+	<property name="compiler/c/inline" value="yes" />
+
+	<include-file name="zlib.h" scope="public" mode="644" />
+	<include-file name="zconf.h" scope="public" mode="644" />
+
+	<source name="adler32.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	</source>
+	<source name="compress.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	</source>
+	<source name="crc32.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="crc32.h" />
+	</source>
+	<source name="gzclose.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="gzguts.h" />
+	</source>
+	<source name="gzlib.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="gzguts.h" />
+	</source>
+	<source name="gzread.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="gzguts.h" />
+	</source>
+	<source name="gzwrite.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="gzguts.h" />
+	</source>
+	<source name="uncompr.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	</source>
+	<source name="deflate.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	    <depend name="deflate.h" />
+	</source>
+	<source name="trees.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	    <depend name="deflate.h" />
+	    <depend name="trees.h" />
+	</source>
+	<source name="zutil.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	</source>
+	<source name="inflate.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	    <depend name="inftrees.h" />
+	    <depend name="inflate.h" />
+	    <depend name="inffast.h" />
+	</source>
+	<source name="infback.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	    <depend name="inftrees.h" />
+	    <depend name="inflate.h" />
+	    <depend name="inffast.h" />
+	</source>
+	<source name="inftrees.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	    <depend name="inftrees.h" />
+	</source>
+	<source name="inffast.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	    <depend name="inftrees.h" />
+	    <depend name="inflate.h" />
+	    <depend name="inffast.h" />
+	</source>
+    </library>
+</package>
+
+<!--
+CFLAGS=-O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-g -DDEBUG
+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+#           -Wstrict-prototypes -Wmissing-prototypes
+
+# OBJA =
+# to use the asm code: make OBJA=match.o
+#
+match.o: match.S
+	$(CPP) match.S > _match.s
+	$(CC) -c _match.s
+	mv _match.o match.o
+	rm -f _match.s
+-->
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/trees.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/trees.c
new file mode 100644
index 00000000..098ef669
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/trees.c
@@ -0,0 +1,1244 @@
+/* trees.c -- output deflated data using Huffman coding
+ * Copyright (C) 1995-2010 Jean-loup Gailly
+ * detect_data_type() function provided freely by Cosmin Truta, 2006
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process uses several Huffman trees. The more
+ *      common source values are represented by shorter bit sequences.
+ *
+ *      Each code tree is stored in a compressed form which is itself
+ * a Huffman encoding of the lengths of all the code strings (in
+ * ascending order by source values).  The actual code strings are
+ * reconstructed from the lengths in the inflate process, as described
+ * in the deflate specification.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
+ *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
+ *
+ *      Storer, James A.
+ *          Data Compression:  Methods and Theory, pp. 49-50.
+ *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
+ *
+ *      Sedgewick, R.
+ *          Algorithms, p290.
+ *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
+ */
+
+/* @(#) $Id: trees.c 246 2010-04-23 10:54:55Z nijtmans $ */
+
+/* #define GEN_TREES_H */
+
+#include "deflate.h"
+
+#ifdef DEBUG
+#  include <ctype.h>
+#endif
+
+/* ===========================================================================
+ * Constants
+ */
+
+#define MAX_BL_BITS 7
+/* Bit length codes must not exceed MAX_BL_BITS bits */
+
+#define END_BLOCK 256
+/* end of block literal code */
+
+#define REP_3_6      16
+/* repeat previous bit length 3-6 times (2 bits of repeat count) */
+
+#define REPZ_3_10    17
+/* repeat a zero length 3-10 times  (3 bits of repeat count) */
+
+#define REPZ_11_138  18
+/* repeat a zero length 11-138 times  (7 bits of repeat count) */
+
+local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
+   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
+
+local const int extra_dbits[D_CODES] /* extra bits for each distance code */
+   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+
+local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
+   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
+
+local const uch bl_order[BL_CODES]
+   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
+/* The lengths of the bit length codes are sent in order of decreasing
+ * probability, to avoid transmitting the lengths for unused bit length codes.
+ */
+
+#define Buf_size (8 * 2*sizeof(char))
+/* Number of bits used within bi_buf. (bi_buf might be implemented on
+ * more than 16 bits on some systems.)
+ */
+
+/* ===========================================================================
+ * Local data. These are initialized only once.
+ */
+
+#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+/* non ANSI compilers may not accept trees.h */
+
+local ct_data static_ltree[L_CODES+2];
+/* The static literal tree. Since the bit lengths are imposed, there is no
+ * need for the L_CODES extra codes used during heap construction. However
+ * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
+ * below).
+ */
+
+local ct_data static_dtree[D_CODES];
+/* The static distance tree. (Actually a trivial tree since all codes use
+ * 5 bits.)
+ */
+
+uch _dist_code[DIST_CODE_LEN];
+/* Distance codes. The first 256 values correspond to the distances
+ * 3 .. 258, the last 256 values correspond to the top 8 bits of
+ * the 15 bit distances.
+ */
+
+uch _length_code[MAX_MATCH-MIN_MATCH+1];
+/* length code for each normalized match length (0 == MIN_MATCH) */
+
+local int base_length[LENGTH_CODES];
+/* First normalized length for each code (0 = MIN_MATCH) */
+
+local int base_dist[D_CODES];
+/* First normalized distance for each code (0 = distance of 1) */
+
+#else
+#  include "trees.h"
+#endif /* GEN_TREES_H */
+
+struct static_tree_desc_s {
+    const ct_data *static_tree;  /* static tree or NULL */
+    const intf *extra_bits;      /* extra bits for each code or NULL */
+    int     extra_base;          /* base index for extra_bits */
+    int     elems;               /* max number of elements in the tree */
+    int     max_length;          /* max bit length for the codes */
+};
+
+local static_tree_desc  static_l_desc =
+{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
+
+local static_tree_desc  static_d_desc =
+{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
+
+local static_tree_desc  static_bl_desc =
+{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
+
+/* ===========================================================================
+ * Local (static) routines in this file.
+ */
+
+local void tr_static_init OF((void));
+local void init_block     OF((deflate_state *s));
+local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
+local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
+local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
+local void build_tree     OF((deflate_state *s, tree_desc *desc));
+local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local int  build_bl_tree  OF((deflate_state *s));
+local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
+                              int blcodes));
+local void compress_block OF((deflate_state *s, ct_data *ltree,
+                              ct_data *dtree));
+local int  detect_data_type OF((deflate_state *s));
+local unsigned bi_reverse OF((unsigned value, int length));
+local void bi_windup      OF((deflate_state *s));
+local void bi_flush       OF((deflate_state *s));
+local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
+                              int header));
+
+#ifdef GEN_TREES_H
+local void gen_trees_header OF((void));
+#endif
+
+#ifndef DEBUG
+#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
+   /* Send a code of the given tree. c and tree must not have side effects */
+
+#else /* DEBUG */
+#  define send_code(s, c, tree) \
+     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
+       send_bits(s, tree[c].Code, tree[c].Len); }
+#endif
+
+/* ===========================================================================
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
+ */
+#define put_short(s, w) { \
+    put_byte(s, (uch)((w) & 0xff)); \
+    put_byte(s, (uch)((ush)(w) >> 8)); \
+}
+
+/* ===========================================================================
+ * Send a value on a given number of bits.
+ * IN assertion: length <= 16 and value fits in length bits.
+ */
+#ifdef DEBUG
+local void send_bits      OF((deflate_state *s, int value, int length));
+
+local void send_bits(s, value, length)
+    deflate_state *s;
+    int value;  /* value to send */
+    int length; /* number of bits */
+{
+    Tracevv((stderr," l %2d v %4x ", length, value));
+    Assert(length > 0 && length <= 15, "invalid length");
+    s->bits_sent += (ulg)length;
+
+    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
+     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * unused bits in value.
+     */
+    if (s->bi_valid > (int)Buf_size - length) {
+        s->bi_buf |= (ush)value << s->bi_valid;
+        put_short(s, s->bi_buf);
+        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
+        s->bi_valid += length - Buf_size;
+    } else {
+        s->bi_buf |= (ush)value << s->bi_valid;
+        s->bi_valid += length;
+    }
+}
+#else /* !DEBUG */
+
+#define send_bits(s, value, length) \
+{ int len = length;\
+  if (s->bi_valid > (int)Buf_size - len) {\
+    int val = value;\
+    s->bi_buf |= (ush)val << s->bi_valid;\
+    put_short(s, s->bi_buf);\
+    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
+    s->bi_valid += len - Buf_size;\
+  } else {\
+    s->bi_buf |= (ush)(value) << s->bi_valid;\
+    s->bi_valid += len;\
+  }\
+}
+#endif /* DEBUG */
+
+
+/* the arguments must not have side effects */
+
+/* ===========================================================================
+ * Initialize the various 'constant' tables.
+ */
+local void tr_static_init()
+{
+#if defined(GEN_TREES_H) || !defined(STDC)
+    static int static_init_done = 0;
+    int n;        /* iterates over tree elements */
+    int bits;     /* bit counter */
+    int length;   /* length value */
+    int code;     /* code value */
+    int dist;     /* distance index */
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    if (static_init_done) return;
+
+    /* For some embedded targets, global variables are not initialized: */
+#ifdef NO_INIT_GLOBAL_POINTERS
+    static_l_desc.static_tree = static_ltree;
+    static_l_desc.extra_bits = extra_lbits;
+    static_d_desc.static_tree = static_dtree;
+    static_d_desc.extra_bits = extra_dbits;
+    static_bl_desc.extra_bits = extra_blbits;
+#endif
+
+    /* Initialize the mapping length (0..255) -> length code (0..28) */
+    length = 0;
+    for (code = 0; code < LENGTH_CODES-1; code++) {
+        base_length[code] = length;
+        for (n = 0; n < (1<<extra_lbits[code]); n++) {
+            _length_code[length++] = (uch)code;
+        }
+    }
+    Assert (length == 256, "tr_static_init: length != 256");
+    /* Note that the length 255 (match length 258) can be represented
+     * in two different ways: code 284 + 5 bits or code 285, so we
+     * overwrite length_code[255] to use the best encoding:
+     */
+    _length_code[length-1] = (uch)code;
+
+    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
+    dist = 0;
+    for (code = 0 ; code < 16; code++) {
+        base_dist[code] = dist;
+        for (n = 0; n < (1<<extra_dbits[code]); n++) {
+            _dist_code[dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: dist != 256");
+    dist >>= 7; /* from now on, all distances are divided by 128 */
+    for ( ; code < D_CODES; code++) {
+        base_dist[code] = dist << 7;
+        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+            _dist_code[256 + dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: 256+dist != 512");
+
+    /* Construct the codes of the static literal tree */
+    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
+    n = 0;
+    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
+    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
+    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
+    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
+    /* Codes 286 and 287 do not exist, but we must include them in the
+     * tree construction to get a canonical Huffman tree (longest code
+     * all ones)
+     */
+    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
+
+    /* The static distance tree is trivial: */
+    for (n = 0; n < D_CODES; n++) {
+        static_dtree[n].Len = 5;
+        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
+    }
+    static_init_done = 1;
+
+#  ifdef GEN_TREES_H
+    gen_trees_header();
+#  endif
+#endif /* defined(GEN_TREES_H) || !defined(STDC) */
+}
+
+/* ===========================================================================
+ * Genererate the file trees.h describing the static trees.
+ */
+#ifdef GEN_TREES_H
+#  ifndef DEBUG
+#    include <stdio.h>
+#  endif
+
+#  define SEPARATOR(i, last, width) \
+      ((i) == (last)? "\n};\n\n" :    \
+       ((i) % (width) == (width)-1 ? ",\n" : ", "))
+
+void gen_trees_header()
+{
+    FILE *header = fopen("trees.h", "w");
+    int i;
+
+    Assert (header != NULL, "Can't open trees.h");
+    fprintf(header,
+            "/* header created automatically with -DGEN_TREES_H */\n\n");
+
+    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
+    for (i = 0; i < L_CODES+2; i++) {
+        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
+                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
+    }
+
+    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
+                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
+    }
+
+    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
+    for (i = 0; i < DIST_CODE_LEN; i++) {
+        fprintf(header, "%2u%s", _dist_code[i],
+                SEPARATOR(i, DIST_CODE_LEN-1, 20));
+    }
+
+    fprintf(header,
+        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
+        fprintf(header, "%2u%s", _length_code[i],
+                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
+    }
+
+    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
+    for (i = 0; i < LENGTH_CODES; i++) {
+        fprintf(header, "%1u%s", base_length[i],
+                SEPARATOR(i, LENGTH_CODES-1, 20));
+    }
+
+    fprintf(header, "local const int base_dist[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+        fprintf(header, "%5u%s", base_dist[i],
+                SEPARATOR(i, D_CODES-1, 10));
+    }
+
+    fclose(header);
+}
+#endif /* GEN_TREES_H */
+
+/* ===========================================================================
+ * Initialize the tree data structures for a new zlib stream.
+ */
+void ZLIB_INTERNAL _tr_init(s)
+    deflate_state *s;
+{
+    tr_static_init();
+
+    s->l_desc.dyn_tree = s->dyn_ltree;
+    s->l_desc.stat_desc = &static_l_desc;
+
+    s->d_desc.dyn_tree = s->dyn_dtree;
+    s->d_desc.stat_desc = &static_d_desc;
+
+    s->bl_desc.dyn_tree = s->bl_tree;
+    s->bl_desc.stat_desc = &static_bl_desc;
+
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+    s->last_eob_len = 8; /* enough lookahead for inflate */
+#ifdef DEBUG
+    s->compressed_len = 0L;
+    s->bits_sent = 0L;
+#endif
+
+    /* Initialize the first block of the first file: */
+    init_block(s);
+}
+
+/* ===========================================================================
+ * Initialize a new block.
+ */
+local void init_block(s)
+    deflate_state *s;
+{
+    int n; /* iterates over tree elements */
+
+    /* Initialize the trees. */
+    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
+    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
+    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
+
+    s->dyn_ltree[END_BLOCK].Freq = 1;
+    s->opt_len = s->static_len = 0L;
+    s->last_lit = s->matches = 0;
+}
+
+#define SMALLEST 1
+/* Index within the heap array of least frequent node in the Huffman tree */
+
+
+/* ===========================================================================
+ * Remove the smallest element from the heap and recreate the heap with
+ * one less element. Updates heap and heap_len.
+ */
+#define pqremove(s, tree, top) \
+{\
+    top = s->heap[SMALLEST]; \
+    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
+    pqdownheap(s, tree, SMALLEST); \
+}
+
+/* ===========================================================================
+ * Compares to subtrees, using the tree depth as tie breaker when
+ * the subtrees have equal frequency. This minimizes the worst case length.
+ */
+#define smaller(tree, n, m, depth) \
+   (tree[n].Freq < tree[m].Freq || \
+   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
+
+/* ===========================================================================
+ * Restore the heap property by moving down the tree starting at node k,
+ * exchanging a node with the smallest of its two sons if necessary, stopping
+ * when the heap property is re-established (each father smaller than its
+ * two sons).
+ */
+local void pqdownheap(s, tree, k)
+    deflate_state *s;
+    ct_data *tree;  /* the tree to restore */
+    int k;               /* node to move down */
+{
+    int v = s->heap[k];
+    int j = k << 1;  /* left son of k */
+    while (j <= s->heap_len) {
+        /* Set j to the smallest of the two sons: */
+        if (j < s->heap_len &&
+            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+            j++;
+        }
+        /* Exit if v is smaller than both sons */
+        if (smaller(tree, v, s->heap[j], s->depth)) break;
+
+        /* Exchange v with the smallest son */
+        s->heap[k] = s->heap[j];  k = j;
+
+        /* And continue down the tree, setting j to the left son of k */
+        j <<= 1;
+    }
+    s->heap[k] = v;
+}
+
+/* ===========================================================================
+ * Compute the optimal bit lengths for a tree and update the total bit length
+ * for the current block.
+ * IN assertion: the fields freq and dad are set, heap[heap_max] and
+ *    above are the tree nodes sorted by increasing frequency.
+ * OUT assertions: the field len is set to the optimal bit length, the
+ *     array bl_count contains the frequencies for each bit length.
+ *     The length opt_len is updated; static_len is also updated if stree is
+ *     not null.
+ */
+local void gen_bitlen(s, desc)
+    deflate_state *s;
+    tree_desc *desc;    /* the tree descriptor */
+{
+    ct_data *tree        = desc->dyn_tree;
+    int max_code         = desc->max_code;
+    const ct_data *stree = desc->stat_desc->static_tree;
+    const intf *extra    = desc->stat_desc->extra_bits;
+    int base             = desc->stat_desc->extra_base;
+    int max_length       = desc->stat_desc->max_length;
+    int h;              /* heap index */
+    int n, m;           /* iterate over the tree elements */
+    int bits;           /* bit length */
+    int xbits;          /* extra bits */
+    ush f;              /* frequency */
+    int overflow = 0;   /* number of elements with bit length too large */
+
+    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
+
+    /* In a first pass, compute the optimal bit lengths (which may
+     * overflow in the case of the bit length tree).
+     */
+    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
+
+    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+        n = s->heap[h];
+        bits = tree[tree[n].Dad].Len + 1;
+        if (bits > max_length) bits = max_length, overflow++;
+        tree[n].Len = (ush)bits;
+        /* We overwrite tree[n].Dad which is no longer needed */
+
+        if (n > max_code) continue; /* not a leaf node */
+
+        s->bl_count[bits]++;
+        xbits = 0;
+        if (n >= base) xbits = extra[n-base];
+        f = tree[n].Freq;
+        s->opt_len += (ulg)f * (bits + xbits);
+        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
+    }
+    if (overflow == 0) return;
+
+    Trace((stderr,"\nbit length overflow\n"));
+    /* This happens for example on obj2 and pic of the Calgary corpus */
+
+    /* Find the first bit length which could increase: */
+    do {
+        bits = max_length-1;
+        while (s->bl_count[bits] == 0) bits--;
+        s->bl_count[bits]--;      /* move one leaf down the tree */
+        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+        s->bl_count[max_length]--;
+        /* The brother of the overflow item also moves one step up,
+         * but this does not affect bl_count[max_length]
+         */
+        overflow -= 2;
+    } while (overflow > 0);
+
+    /* Now recompute all bit lengths, scanning in increasing frequency.
+     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
+     * lengths instead of fixing only the wrong ones. This idea is taken
+     * from 'ar' written by Haruhiko Okumura.)
+     */
+    for (bits = max_length; bits != 0; bits--) {
+        n = s->bl_count[bits];
+        while (n != 0) {
+            m = s->heap[--h];
+            if (m > max_code) continue;
+            if ((unsigned) tree[m].Len != (unsigned) bits) {
+                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
+                s->opt_len += ((long)bits - (long)tree[m].Len)
+                              *(long)tree[m].Freq;
+                tree[m].Len = (ush)bits;
+            }
+            n--;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Generate the codes for a given tree and bit counts (which need not be
+ * optimal).
+ * IN assertion: the array bl_count contains the bit length statistics for
+ * the given tree and the field len is set for all tree elements.
+ * OUT assertion: the field code is set for all tree elements of non
+ *     zero code length.
+ */
+local void gen_codes (tree, max_code, bl_count)
+    ct_data *tree;             /* the tree to decorate */
+    int max_code;              /* largest code with non zero frequency */
+    ushf *bl_count;            /* number of codes at each bit length */
+{
+    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
+    ush code = 0;              /* running code value */
+    int bits;                  /* bit index */
+    int n;                     /* code index */
+
+    /* The distribution counts are first used to generate the code values
+     * without bit reversal.
+     */
+    for (bits = 1; bits <= MAX_BITS; bits++) {
+        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
+    }
+    /* Check that the bit counts in bl_count are consistent. The last code
+     * must be all ones.
+     */
+    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
+            "inconsistent bit counts");
+    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+
+    for (n = 0;  n <= max_code; n++) {
+        int len = tree[n].Len;
+        if (len == 0) continue;
+        /* Now reverse the bits */
+        tree[n].Code = bi_reverse(next_code[len]++, len);
+
+        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
+    }
+}
+
+/* ===========================================================================
+ * Construct one Huffman tree and assigns the code bit strings and lengths.
+ * Update the total bit length for the current block.
+ * IN assertion: the field freq is set for all tree elements.
+ * OUT assertions: the fields len and code are set to the optimal bit length
+ *     and corresponding code. The length opt_len is updated; static_len is
+ *     also updated if stree is not null. The field max_code is set.
+ */
+local void build_tree(s, desc)
+    deflate_state *s;
+    tree_desc *desc; /* the tree descriptor */
+{
+    ct_data *tree         = desc->dyn_tree;
+    const ct_data *stree  = desc->stat_desc->static_tree;
+    int elems             = desc->stat_desc->elems;
+    int n, m;          /* iterate over heap elements */
+    int max_code = -1; /* largest code with non zero frequency */
+    int node;          /* new node being created */
+
+    /* Construct the initial heap, with least frequent element in
+     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+     * heap[0] is not used.
+     */
+    s->heap_len = 0, s->heap_max = HEAP_SIZE;
+
+    for (n = 0; n < elems; n++) {
+        if (tree[n].Freq != 0) {
+            s->heap[++(s->heap_len)] = max_code = n;
+            s->depth[n] = 0;
+        } else {
+            tree[n].Len = 0;
+        }
+    }
+
+    /* The pkzip format requires that at least one distance code exists,
+     * and that at least one bit should be sent even if there is only one
+     * possible code. So to avoid special checks later on we force at least
+     * two codes of non zero frequency.
+     */
+    while (s->heap_len < 2) {
+        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
+        tree[node].Freq = 1;
+        s->depth[node] = 0;
+        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
+        /* node is 0 or 1 so it does not have extra bits */
+    }
+    desc->max_code = max_code;
+
+    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+     * establish sub-heaps of increasing lengths:
+     */
+    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
+
+    /* Construct the Huffman tree by repeatedly combining the least two
+     * frequent nodes.
+     */
+    node = elems;              /* next internal node of the tree */
+    do {
+        pqremove(s, tree, n);  /* n = node of least frequency */
+        m = s->heap[SMALLEST]; /* m = node of next least frequency */
+
+        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
+        s->heap[--(s->heap_max)] = m;
+
+        /* Create a new node father of n and m */
+        tree[node].Freq = tree[n].Freq + tree[m].Freq;
+        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
+                                s->depth[n] : s->depth[m]) + 1);
+        tree[n].Dad = tree[m].Dad = (ush)node;
+#ifdef DUMP_BL_TREE
+        if (tree == s->bl_tree) {
+            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
+                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
+        }
+#endif
+        /* and insert the new node in the heap */
+        s->heap[SMALLEST] = node++;
+        pqdownheap(s, tree, SMALLEST);
+
+    } while (s->heap_len >= 2);
+
+    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
+
+    /* At this point, the fields freq and dad are set. We can now
+     * generate the bit lengths.
+     */
+    gen_bitlen(s, (tree_desc *)desc);
+
+    /* The field len is now set, we can generate the bit codes */
+    gen_codes ((ct_data *)tree, max_code, s->bl_count);
+}
+
+/* ===========================================================================
+ * Scan a literal or distance tree to determine the frequencies of the codes
+ * in the bit length tree.
+ */
+local void scan_tree (s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree;   /* the tree to be scanned */
+    int max_code;    /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    if (nextlen == 0) max_count = 138, min_count = 3;
+    tree[max_code+1].Len = (ush)0xffff; /* guard */
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n+1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            s->bl_tree[curlen].Freq += count;
+        } else if (curlen != 0) {
+            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
+            s->bl_tree[REP_3_6].Freq++;
+        } else if (count <= 10) {
+            s->bl_tree[REPZ_3_10].Freq++;
+        } else {
+            s->bl_tree[REPZ_11_138].Freq++;
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Send a literal or distance tree in compressed form, using the codes in
+ * bl_tree.
+ */
+local void send_tree (s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree; /* the tree to be scanned */
+    int max_code;       /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    /* tree[max_code+1].Len = -1; */  /* guard already set */
+    if (nextlen == 0) max_count = 138, min_count = 3;
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n+1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
+
+        } else if (curlen != 0) {
+            if (curlen != prevlen) {
+                send_code(s, curlen, s->bl_tree); count--;
+            }
+            Assert(count >= 3 && count <= 6, " 3_6?");
+            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+
+        } else if (count <= 10) {
+            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+
+        } else {
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Construct the Huffman tree for the bit lengths and return the index in
+ * bl_order of the last bit length code to send.
+ */
+local int build_bl_tree(s)
+    deflate_state *s;
+{
+    int max_blindex;  /* index of last bit length code of non zero freq */
+
+    /* Determine the bit length frequencies for literal and distance trees */
+    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
+    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
+
+    /* Build the bit length tree: */
+    build_tree(s, (tree_desc *)(&(s->bl_desc)));
+    /* opt_len now includes the length of the tree representations, except
+     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+     */
+
+    /* Determine the number of bit length codes to send. The pkzip format
+     * requires that at least 4 bit length codes be sent. (appnote.txt says
+     * 3 but the actual value used is 4.)
+     */
+    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
+        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
+    }
+    /* Update opt_len to include the bit length tree and counts */
+    s->opt_len += 3*(max_blindex+1) + 5+5+4;
+    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
+            s->opt_len, s->static_len));
+
+    return max_blindex;
+}
+
+/* ===========================================================================
+ * Send the header for a block using dynamic Huffman trees: the counts, the
+ * lengths of the bit length codes, the literal tree and the distance tree.
+ * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
+ */
+local void send_all_trees(s, lcodes, dcodes, blcodes)
+    deflate_state *s;
+    int lcodes, dcodes, blcodes; /* number of codes for each tree */
+{
+    int rank;                    /* index in bl_order */
+
+    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
+    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
+            "too many codes");
+    Tracev((stderr, "\nbl counts: "));
+    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
+    send_bits(s, dcodes-1,   5);
+    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
+    for (rank = 0; rank < blcodes; rank++) {
+        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
+        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
+    }
+    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
+}
+
+/* ===========================================================================
+ * Send a stored block
+ */
+void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
+    deflate_state *s;
+    charf *buf;       /* input block */
+    ulg stored_len;   /* length of input block */
+    int last;         /* one if this is the last block for a file */
+{
+    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
+#ifdef DEBUG
+    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
+    s->compressed_len += (stored_len + 4) << 3;
+#endif
+    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
+}
+
+/* ===========================================================================
+ * Send one empty static block to give enough lookahead for inflate.
+ * This takes 10 bits, of which 7 may remain in the bit buffer.
+ * The current inflate code requires 9 bits of lookahead. If the
+ * last two codes for the previous block (real code plus EOB) were coded
+ * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
+ * the last real code. In this case we send two empty static blocks instead
+ * of one. (There are no problems if the previous block is stored or fixed.)
+ * To simplify the code, we assume the worst case of last real code encoded
+ * on one bit only.
+ */
+void ZLIB_INTERNAL _tr_align(s)
+    deflate_state *s;
+{
+    send_bits(s, STATIC_TREES<<1, 3);
+    send_code(s, END_BLOCK, static_ltree);
+#ifdef DEBUG
+    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
+#endif
+    bi_flush(s);
+    /* Of the 10 bits for the empty block, we have already sent
+     * (10 - bi_valid) bits. The lookahead for the last real code (before
+     * the EOB of the previous block) was thus at least one plus the length
+     * of the EOB plus what we have just sent of the empty static block.
+     */
+    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
+        send_bits(s, STATIC_TREES<<1, 3);
+        send_code(s, END_BLOCK, static_ltree);
+#ifdef DEBUG
+        s->compressed_len += 10L;
+#endif
+        bi_flush(s);
+    }
+    s->last_eob_len = 7;
+}
+
+/* ===========================================================================
+ * Determine the best encoding for the current block: dynamic trees, static
+ * trees or store, and output the encoded block to the zip file.
+ */
+void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
+    deflate_state *s;
+    charf *buf;       /* input block, or NULL if too old */
+    ulg stored_len;   /* length of input block */
+    int last;         /* one if this is the last block for a file */
+{
+    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
+    int max_blindex = 0;  /* index of last bit length code of non zero freq */
+
+    /* Build the Huffman trees unless a stored block is forced */
+    if (s->level > 0) {
+
+        /* Check if the file is binary or text */
+        if (s->strm->data_type == Z_UNKNOWN)
+            s->strm->data_type = detect_data_type(s);
+
+        /* Construct the literal and distance trees */
+        build_tree(s, (tree_desc *)(&(s->l_desc)));
+        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
+                s->static_len));
+
+        build_tree(s, (tree_desc *)(&(s->d_desc)));
+        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
+                s->static_len));
+        /* At this point, opt_len and static_len are the total bit lengths of
+         * the compressed block data, excluding the tree representations.
+         */
+
+        /* Build the bit length tree for the above two trees, and get the index
+         * in bl_order of the last bit length code to send.
+         */
+        max_blindex = build_bl_tree(s);
+
+        /* Determine the best encoding. Compute the block lengths in bytes. */
+        opt_lenb = (s->opt_len+3+7)>>3;
+        static_lenb = (s->static_len+3+7)>>3;
+
+        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+                s->last_lit));
+
+        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+
+    } else {
+        Assert(buf != (char*)0, "lost buf");
+        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
+    }
+
+#ifdef FORCE_STORED
+    if (buf != (char*)0) { /* force stored block */
+#else
+    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+                       /* 4: two words for the lengths */
+#endif
+        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
+         * Otherwise we can't have processed more than WSIZE input bytes since
+         * the last block flush, because compression would have been
+         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
+         * transform a block into a stored block.
+         */
+        _tr_stored_block(s, buf, stored_len, last);
+
+#ifdef FORCE_STATIC
+    } else if (static_lenb >= 0) { /* force static trees */
+#else
+    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
+#endif
+        send_bits(s, (STATIC_TREES<<1)+last, 3);
+        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
+#ifdef DEBUG
+        s->compressed_len += 3 + s->static_len;
+#endif
+    } else {
+        send_bits(s, (DYN_TREES<<1)+last, 3);
+        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
+                       max_blindex+1);
+        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
+#ifdef DEBUG
+        s->compressed_len += 3 + s->opt_len;
+#endif
+    }
+    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
+    /* The above check is made mod 2^32, for files larger than 512 MB
+     * and uLong implemented on 32 bits.
+     */
+    init_block(s);
+
+    if (last) {
+        bi_windup(s);
+#ifdef DEBUG
+        s->compressed_len += 7;  /* align on byte boundary */
+#endif
+    }
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
+           s->compressed_len-7*last));
+}
+
+/* ===========================================================================
+ * Save the match info and tally the frequency counts. Return true if
+ * the current block must be flushed.
+ */
+int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+    deflate_state *s;
+    unsigned dist;  /* distance of matched string */
+    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+{
+    s->d_buf[s->last_lit] = (ush)dist;
+    s->l_buf[s->last_lit++] = (uch)lc;
+    if (dist == 0) {
+        /* lc is the unmatched char */
+        s->dyn_ltree[lc].Freq++;
+    } else {
+        s->matches++;
+        /* Here, lc is the match length - MIN_MATCH */
+        dist--;             /* dist = match distance - 1 */
+        Assert((ush)dist < (ush)MAX_DIST(s) &&
+               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
+               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
+
+        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+        s->dyn_dtree[d_code(dist)].Freq++;
+    }
+
+#ifdef TRUNCATE_BLOCK
+    /* Try to guess if it is profitable to stop the current block here */
+    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
+        /* Compute an upper bound for the compressed length */
+        ulg out_length = (ulg)s->last_lit*8L;
+        ulg in_length = (ulg)((long)s->strstart - s->block_start);
+        int dcode;
+        for (dcode = 0; dcode < D_CODES; dcode++) {
+            out_length += (ulg)s->dyn_dtree[dcode].Freq *
+                (5L+extra_dbits[dcode]);
+        }
+        out_length >>= 3;
+        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
+               s->last_lit, in_length, out_length,
+               100L - out_length*100L/in_length));
+        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
+    }
+#endif
+    return (s->last_lit == s->lit_bufsize-1);
+    /* We avoid equality with lit_bufsize because of wraparound at 64K
+     * on 16 bit machines and because stored blocks are restricted to
+     * 64K-1 bytes.
+     */
+}
+
+/* ===========================================================================
+ * Send the block data compressed using the given Huffman trees
+ */
+local void compress_block(s, ltree, dtree)
+    deflate_state *s;
+    ct_data *ltree; /* literal tree */
+    ct_data *dtree; /* distance tree */
+{
+    unsigned dist;      /* distance of matched string */
+    int lc;             /* match length or unmatched char (if dist == 0) */
+    unsigned lx = 0;    /* running index in l_buf */
+    unsigned code;      /* the code to send */
+    int extra;          /* number of extra bits to send */
+
+    if (s->last_lit != 0) do {
+        dist = s->d_buf[lx];
+        lc = s->l_buf[lx++];
+        if (dist == 0) {
+            send_code(s, lc, ltree); /* send a literal byte */
+            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+        } else {
+            /* Here, lc is the match length - MIN_MATCH */
+            code = _length_code[lc];
+            send_code(s, code+LITERALS+1, ltree); /* send the length code */
+            extra = extra_lbits[code];
+            if (extra != 0) {
+                lc -= base_length[code];
+                send_bits(s, lc, extra);       /* send the extra length bits */
+            }
+            dist--; /* dist is now the match distance - 1 */
+            code = d_code(dist);
+            Assert (code < D_CODES, "bad d_code");
+
+            send_code(s, code, dtree);       /* send the distance code */
+            extra = extra_dbits[code];
+            if (extra != 0) {
+                dist -= base_dist[code];
+                send_bits(s, dist, extra);   /* send the extra distance bits */
+            }
+        } /* literal or match pair ? */
+
+        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
+               "pendingBuf overflow");
+
+    } while (lx < s->last_lit);
+
+    send_code(s, END_BLOCK, ltree);
+    s->last_eob_len = ltree[END_BLOCK].Len;
+}
+
+/* ===========================================================================
+ * Check if the data type is TEXT or BINARY, using the following algorithm:
+ * - TEXT if the two conditions below are satisfied:
+ *    a) There are no non-portable control characters belonging to the
+ *       "black list" (0..6, 14..25, 28..31).
+ *    b) There is at least one printable character belonging to the
+ *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
+ * - BINARY otherwise.
+ * - The following partially-portable control characters form a
+ *   "gray list" that is ignored in this detection algorithm:
+ *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
+ * IN assertion: the fields Freq of dyn_ltree are set.
+ */
+local int detect_data_type(s)
+    deflate_state *s;
+{
+    /* black_mask is the bit mask of black-listed bytes
+     * set bits 0..6, 14..25, and 28..31
+     * 0xf3ffc07f = binary 11110011111111111100000001111111
+     */
+    unsigned long black_mask = 0xf3ffc07fUL;
+    int n;
+
+    /* Check for non-textual ("black-listed") bytes. */
+    for (n = 0; n <= 31; n++, black_mask >>= 1)
+        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
+            return Z_BINARY;
+
+    /* Check for textual ("white-listed") bytes. */
+    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
+            || s->dyn_ltree[13].Freq != 0)
+        return Z_TEXT;
+    for (n = 32; n < LITERALS; n++)
+        if (s->dyn_ltree[n].Freq != 0)
+            return Z_TEXT;
+
+    /* There are no "black-listed" or "white-listed" bytes:
+     * this stream either is empty or has tolerated ("gray-listed") bytes only.
+     */
+    return Z_BINARY;
+}
+
+/* ===========================================================================
+ * Reverse the first len bits of a code, using straightforward code (a faster
+ * method would use a table)
+ * IN assertion: 1 <= len <= 15
+ */
+local unsigned bi_reverse(code, len)
+    unsigned code; /* the value to invert */
+    int len;       /* its bit length */
+{
+    register unsigned res = 0;
+    do {
+        res |= code & 1;
+        code >>= 1, res <<= 1;
+    } while (--len > 0);
+    return res >> 1;
+}
+
+/* ===========================================================================
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+local void bi_flush(s)
+    deflate_state *s;
+{
+    if (s->bi_valid == 16) {
+        put_short(s, s->bi_buf);
+        s->bi_buf = 0;
+        s->bi_valid = 0;
+    } else if (s->bi_valid >= 8) {
+        put_byte(s, (Byte)s->bi_buf);
+        s->bi_buf >>= 8;
+        s->bi_valid -= 8;
+    }
+}
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
+ */
+local void bi_windup(s)
+    deflate_state *s;
+{
+    if (s->bi_valid > 8) {
+        put_short(s, s->bi_buf);
+    } else if (s->bi_valid > 0) {
+        put_byte(s, (Byte)s->bi_buf);
+    }
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+#ifdef DEBUG
+    s->bits_sent = (s->bits_sent+7) & ~7;
+#endif
+}
+
+/* ===========================================================================
+ * Copy a stored block, storing first the length and its
+ * one's complement if requested.
+ */
+local void copy_block(s, buf, len, header)
+    deflate_state *s;
+    charf    *buf;    /* the input data */
+    unsigned len;     /* its length */
+    int      header;  /* true if block header must be written */
+{
+    bi_windup(s);        /* align on byte boundary */
+    s->last_eob_len = 8; /* enough lookahead for inflate */
+
+    if (header) {
+        put_short(s, (ush)len);
+        put_short(s, (ush)~len);
+#ifdef DEBUG
+        s->bits_sent += 2*16;
+#endif
+    }
+#ifdef DEBUG
+    s->bits_sent += (ulg)len<<3;
+#endif
+    while (len--) {
+        put_byte(s, *buf++);
+    }
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/trees.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/trees.h
new file mode 100644
index 00000000..d35639d8
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/trees.h
@@ -0,0 +1,128 @@
+/* header created automatically with -DGEN_TREES_H */
+
+local const ct_data static_ltree[L_CODES+2] = {
+{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
+{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
+{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
+{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
+{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
+{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
+{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
+{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
+{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
+{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
+{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
+{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
+{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
+{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
+{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
+{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
+{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
+{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
+{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
+{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
+{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
+{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
+{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
+{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
+{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
+{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
+{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
+{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
+{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
+{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
+{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
+{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
+{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
+{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
+{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
+{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
+{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
+{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
+{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
+{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
+{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
+{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
+{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
+{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
+{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
+{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
+{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
+{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
+{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
+{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
+{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
+{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
+{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
+{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
+{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
+{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
+{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
+{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
+};
+
+local const ct_data static_dtree[D_CODES] = {
+{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
+{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
+{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
+{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
+{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
+{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
+};
+
+const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
+ 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
+ 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
+10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
+18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
+};
+
+const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
+ 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
+13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
+17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
+19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
+22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
+};
+
+local const int base_length[LENGTH_CODES] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
+64, 80, 96, 112, 128, 160, 192, 224, 0
+};
+
+local const int base_dist[D_CODES] = {
+    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
+   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
+ 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
+};
+
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/uncompr.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/uncompr.c
new file mode 100644
index 00000000..ed694113
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/uncompr.c
@@ -0,0 +1,59 @@
+/* uncompr.c -- decompress a memory buffer
+ * Copyright (C) 1995-2003, 2010 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: uncompr.c 246 2010-04-23 10:54:55Z nijtmans $ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+/* ===========================================================================
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be large enough to hold the
+   entire uncompressed data. (The size of the uncompressed data must have
+   been saved previously by the compressor and transmitted to the decompressor
+   by some mechanism outside the scope of this compression library.)
+   Upon exit, destLen is the actual size of the compressed buffer.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted.
+*/
+int ZEXPORT uncompress (dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    z_stream stream;
+    int err;
+
+    stream.next_in = (Bytef*)source;
+    stream.avail_in = (uInt)sourceLen;
+    /* Check for source > 64K on 16-bit machine: */
+    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
+
+    stream.next_out = dest;
+    stream.avail_out = (uInt)*destLen;
+    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+
+    err = inflateInit(&stream);
+    if (err != Z_OK) return err;
+
+    err = inflate(&stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        inflateEnd(&stream);
+        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
+            return Z_DATA_ERROR;
+        return err;
+    }
+    *destLen = stream.total_out;
+
+    err = inflateEnd(&stream);
+    return err;
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/watcom/watcom_f.mak b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/watcom/watcom_f.mak
new file mode 100644
index 00000000..37f4d74c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/watcom/watcom_f.mak
@@ -0,0 +1,43 @@
+# Makefile for zlib
+# OpenWatcom flat model
+# Last updated: 28-Dec-2005
+
+# To use, do "wmake -f watcom_f.mak"
+
+C_SOURCE =  adler32.c  compress.c crc32.c   deflate.c    &
+	    gzclose.c  gzlib.c    gzread.c  gzwrite.c    &
+            infback.c  inffast.c  inflate.c inftrees.c   &
+            trees.c    uncompr.c  zutil.c
+
+OBJS =      adler32.obj  compress.obj crc32.obj   deflate.obj    &
+	    gzclose.obj  gzlib.obj    gzread.obj  gzwrite.obj    &
+            infback.obj  inffast.obj  inflate.obj inftrees.obj   &
+            trees.obj    uncompr.obj  zutil.obj
+
+CC       = wcc386
+LINKER   = wcl386
+CFLAGS   = -zq -mf -3r -fp3 -s -bt=dos -oilrtfm -fr=nul -wx
+ZLIB_LIB = zlib_f.lib
+
+.C.OBJ:
+        $(CC) $(CFLAGS) $[@
+
+all: $(ZLIB_LIB) example.exe minigzip.exe
+
+$(ZLIB_LIB): $(OBJS)
+	wlib -b -c $(ZLIB_LIB) -+adler32.obj  -+compress.obj -+crc32.obj
+	wlib -b -c $(ZLIB_LIB) -+gzclose.obj  -+gzlib.obj    -+gzread.obj   -+gzwrite.obj
+        wlib -b -c $(ZLIB_LIB) -+deflate.obj  -+infback.obj
+        wlib -b -c $(ZLIB_LIB) -+inffast.obj  -+inflate.obj  -+inftrees.obj
+        wlib -b -c $(ZLIB_LIB) -+trees.obj    -+uncompr.obj  -+zutil.obj
+
+example.exe: $(ZLIB_LIB) example.obj
+	$(LINKER) -ldos32a -fe=example.exe example.obj $(ZLIB_LIB)
+
+minigzip.exe: $(ZLIB_LIB) minigzip.obj
+	$(LINKER) -ldos32a -fe=minigzip.exe minigzip.obj $(ZLIB_LIB)
+
+clean: .SYMBOLIC
+          del *.obj
+          del $(ZLIB_LIB)
+          @echo Cleaning done
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/watcom/watcom_l.mak b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/watcom/watcom_l.mak
new file mode 100644
index 00000000..193eed7b
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/watcom/watcom_l.mak
@@ -0,0 +1,43 @@
+# Makefile for zlib
+# OpenWatcom large model
+# Last updated: 28-Dec-2005
+
+# To use, do "wmake -f watcom_l.mak"
+
+C_SOURCE =  adler32.c  compress.c crc32.c   deflate.c    &
+	    gzclose.c  gzlib.c    gzread.c  gzwrite.c    &
+            infback.c  inffast.c  inflate.c inftrees.c   &
+            trees.c    uncompr.c  zutil.c
+
+OBJS =      adler32.obj  compress.obj crc32.obj   deflate.obj    &
+	    gzclose.obj  gzlib.obj    gzread.obj  gzwrite.obj    &
+            infback.obj  inffast.obj  inflate.obj inftrees.obj   &
+            trees.obj    uncompr.obj  zutil.obj
+
+CC       = wcc
+LINKER   = wcl
+CFLAGS   = -zq -ml -s -bt=dos -oilrtfm -fr=nul -wx
+ZLIB_LIB = zlib_l.lib
+
+.C.OBJ:
+        $(CC) $(CFLAGS) $[@
+
+all: $(ZLIB_LIB) example.exe minigzip.exe
+
+$(ZLIB_LIB): $(OBJS)
+	wlib -b -c $(ZLIB_LIB) -+adler32.obj  -+compress.obj -+crc32.obj
+	wlib -b -c $(ZLIB_LIB) -+gzclose.obj  -+gzlib.obj    -+gzread.obj   -+gzwrite.obj
+        wlib -b -c $(ZLIB_LIB) -+deflate.obj  -+infback.obj
+        wlib -b -c $(ZLIB_LIB) -+inffast.obj  -+inflate.obj  -+inftrees.obj
+        wlib -b -c $(ZLIB_LIB) -+trees.obj    -+uncompr.obj  -+zutil.obj
+
+example.exe: $(ZLIB_LIB) example.obj
+	$(LINKER) -fe=example.exe example.obj $(ZLIB_LIB)
+
+minigzip.exe: $(ZLIB_LIB) minigzip.obj
+	$(LINKER) -fe=minigzip.exe minigzip.obj $(ZLIB_LIB)
+
+clean: .SYMBOLIC
+          del *.obj
+          del $(ZLIB_LIB)
+          @echo Cleaning done
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/DLL_FAQ.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/DLL_FAQ.txt
new file mode 100644
index 00000000..12c00901
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/DLL_FAQ.txt
@@ -0,0 +1,397 @@
+
+            Frequently Asked Questions about ZLIB1.DLL
+
+
+This document describes the design, the rationale, and the usage
+of the official DLL build of zlib, named ZLIB1.DLL.  If you have
+general questions about zlib, you should see the file "FAQ" found
+in the zlib distribution, or at the following location:
+  http://www.gzip.org/zlib/zlib_faq.html
+
+
+ 1. What is ZLIB1.DLL, and how can I get it?
+
+  - ZLIB1.DLL is the official build of zlib as a DLL.
+    (Please remark the character '1' in the name.)
+
+    Pointers to a precompiled ZLIB1.DLL can be found in the zlib
+    web site at:
+      http://www.zlib.net/
+
+    Applications that link to ZLIB1.DLL can rely on the following
+    specification:
+
+    * The exported symbols are exclusively defined in the source
+      files "zlib.h" and "zlib.def", found in an official zlib
+      source distribution.
+    * The symbols are exported by name, not by ordinal.
+    * The exported names are undecorated.
+    * The calling convention of functions is "C" (CDECL).
+    * The ZLIB1.DLL binary is linked to MSVCRT.DLL.
+
+    The archive in which ZLIB1.DLL is bundled contains compiled
+    test programs that must run with a valid build of ZLIB1.DLL.
+    It is recommended to download the prebuilt DLL from the zlib
+    web site, instead of building it yourself, to avoid potential
+    incompatibilities that could be introduced by your compiler
+    and build settings.  If you do build the DLL yourself, please
+    make sure that it complies with all the above requirements,
+    and it runs with the precompiled test programs, bundled with
+    the original ZLIB1.DLL distribution.
+
+    If, for any reason, you need to build an incompatible DLL,
+    please use a different file name.
+
+
+ 2. Why did you change the name of the DLL to ZLIB1.DLL?
+    What happened to the old ZLIB.DLL?
+
+  - The old ZLIB.DLL, built from zlib-1.1.4 or earlier, required
+    compilation settings that were incompatible to those used by
+    a static build.  The DLL settings were supposed to be enabled
+    by defining the macro ZLIB_DLL, before including "zlib.h".
+    Incorrect handling of this macro was silently accepted at
+    build time, resulting in two major problems:
+
+    * ZLIB_DLL was missing from the old makefile.  When building
+      the DLL, not all people added it to the build options.  In
+      consequence, incompatible incarnations of ZLIB.DLL started
+      to circulate around the net.
+
+    * When switching from using the static library to using the
+      DLL, applications had to define the ZLIB_DLL macro and
+      to recompile all the sources that contained calls to zlib
+      functions.  Failure to do so resulted in creating binaries
+      that were unable to run with the official ZLIB.DLL build.
+
+    The only possible solution that we could foresee was to make
+    a binary-incompatible change in the DLL interface, in order to
+    remove the dependency on the ZLIB_DLL macro, and to release
+    the new DLL under a different name.
+
+    We chose the name ZLIB1.DLL, where '1' indicates the major
+    zlib version number.  We hope that we will not have to break
+    the binary compatibility again, at least not as long as the
+    zlib-1.x series will last.
+
+    There is still a ZLIB_DLL macro, that can trigger a more
+    efficient build and use of the DLL, but compatibility no
+    longer dependents on it.
+
+
+ 3. Can I build ZLIB.DLL from the new zlib sources, and replace
+    an old ZLIB.DLL, that was built from zlib-1.1.4 or earlier?
+
+  - In principle, you can do it by assigning calling convention
+    keywords to the macros ZEXPORT and ZEXPORTVA.  In practice,
+    it depends on what you mean by "an old ZLIB.DLL", because the
+    old DLL exists in several mutually-incompatible versions.
+    You have to find out first what kind of calling convention is
+    being used in your particular ZLIB.DLL build, and to use the
+    same one in the new build.  If you don't know what this is all
+    about, you might be better off if you would just leave the old
+    DLL intact.
+
+
+ 4. Can I compile my application using the new zlib interface, and
+    link it to an old ZLIB.DLL, that was built from zlib-1.1.4 or
+    earlier?
+
+  - The official answer is "no"; the real answer depends again on
+    what kind of ZLIB.DLL you have.  Even if you are lucky, this
+    course of action is unreliable.
+
+    If you rebuild your application and you intend to use a newer
+    version of zlib (post- 1.1.4), it is strongly recommended to
+    link it to the new ZLIB1.DLL.
+
+
+ 5. Why are the zlib symbols exported by name, and not by ordinal?
+
+  - Although exporting symbols by ordinal is a little faster, it
+    is risky.  Any single glitch in the maintenance or use of the
+    DEF file that contains the ordinals can result in incompatible
+    builds and frustrating crashes.  Simply put, the benefits of
+    exporting symbols by ordinal do not justify the risks.
+
+    Technically, it should be possible to maintain ordinals in
+    the DEF file, and still export the symbols by name.  Ordinals
+    exist in every DLL, and even if the dynamic linking performed
+    at the DLL startup is searching for names, ordinals serve as
+    hints, for a faster name lookup.  However, if the DEF file
+    contains ordinals, the Microsoft linker automatically builds
+    an implib that will cause the executables linked to it to use
+    those ordinals, and not the names.  It is interesting to
+    notice that the GNU linker for Win32 does not suffer from this
+    problem.
+
+    It is possible to avoid the DEF file if the exported symbols
+    are accompanied by a "__declspec(dllexport)" attribute in the
+    source files.  You can do this in zlib by predefining the
+    ZLIB_DLL macro.
+
+
+ 6. I see that the ZLIB1.DLL functions use the "C" (CDECL) calling
+    convention.  Why not use the STDCALL convention?
+    STDCALL is the standard convention in Win32, and I need it in
+    my Visual Basic project!
+
+    (For readability, we use CDECL to refer to the convention
+     triggered by the "__cdecl" keyword, STDCALL to refer to
+     the convention triggered by "__stdcall", and FASTCALL to
+     refer to the convention triggered by "__fastcall".)
+
+  - Most of the native Windows API functions (without varargs) use
+    indeed the WINAPI convention (which translates to STDCALL in
+    Win32), but the standard C functions use CDECL.  If a user
+    application is intrinsically tied to the Windows API (e.g.
+    it calls native Windows API functions such as CreateFile()),
+    sometimes it makes sense to decorate its own functions with
+    WINAPI.  But if ANSI C or POSIX portability is a goal (e.g.
+    it calls standard C functions such as fopen()), it is not a
+    sound decision to request the inclusion of <windows.h>, or to
+    use non-ANSI constructs, for the sole purpose to make the user
+    functions STDCALL-able.
+
+    The functionality offered by zlib is not in the category of
+    "Windows functionality", but is more like "C functionality".
+
+    Technically, STDCALL is not bad; in fact, it is slightly
+    faster than CDECL, and it works with variable-argument
+    functions, just like CDECL.  It is unfortunate that, in spite
+    of using STDCALL in the Windows API, it is not the default
+    convention used by the C compilers that run under Windows.
+    The roots of the problem reside deep inside the unsafety of
+    the K&R-style function prototypes, where the argument types
+    are not specified; but that is another story for another day.
+
+    The remaining fact is that CDECL is the default convention.
+    Even if an explicit convention is hard-coded into the function
+    prototypes inside C headers, problems may appear.  The
+    necessity to expose the convention in users' callbacks is one
+    of these problems.
+
+    The calling convention issues are also important when using
+    zlib in other programming languages.  Some of them, like Ada
+    (GNAT) and Fortran (GNU G77), have C bindings implemented
+    initially on Unix, and relying on the C calling convention.
+    On the other hand, the pre- .NET versions of Microsoft Visual
+    Basic require STDCALL, while Borland Delphi prefers, although
+    it does not require, FASTCALL.
+
+    In fairness to all possible uses of zlib outside the C
+    programming language, we choose the default "C" convention.
+    Anyone interested in different bindings or conventions is
+    encouraged to maintain specialized projects.  The "contrib/"
+    directory from the zlib distribution already holds a couple
+    of foreign bindings, such as Ada, C++, and Delphi.
+
+
+ 7. I need a DLL for my Visual Basic project.  What can I do?
+
+  - Define the ZLIB_WINAPI macro before including "zlib.h", when
+    building both the DLL and the user application (except that
+    you don't need to define anything when using the DLL in Visual
+    Basic).  The ZLIB_WINAPI macro will switch on the WINAPI
+    (STDCALL) convention.  The name of this DLL must be different
+    than the official ZLIB1.DLL.
+
+    Gilles Vollant has contributed a build named ZLIBWAPI.DLL,
+    with the ZLIB_WINAPI macro turned on, and with the minizip
+    functionality built in.  For more information, please read
+    the notes inside "contrib/vstudio/readme.txt", found in the
+    zlib distribution.
+
+
+ 8. I need to use zlib in my Microsoft .NET project.  What can I
+    do?
+
+  - Henrik Ravn has contributed a .NET wrapper around zlib.  Look
+    into contrib/dotzlib/, inside the zlib distribution.
+
+
+ 9. If my application uses ZLIB1.DLL, should I link it to
+    MSVCRT.DLL?  Why?
+
+  - It is not required, but it is recommended to link your
+    application to MSVCRT.DLL, if it uses ZLIB1.DLL.
+
+    The executables (.EXE, .DLL, etc.) that are involved in the
+    same process and are using the C run-time library (i.e. they
+    are calling standard C functions), must link to the same
+    library.  There are several libraries in the Win32 system:
+    CRTDLL.DLL, MSVCRT.DLL, the static C libraries, etc.
+    Since ZLIB1.DLL is linked to MSVCRT.DLL, the executables that
+    depend on it should also be linked to MSVCRT.DLL.
+
+
+10. Why are you saying that ZLIB1.DLL and my application should
+    be linked to the same C run-time (CRT) library?  I linked my
+    application and my DLLs to different C libraries (e.g. my
+    application to a static library, and my DLLs to MSVCRT.DLL),
+    and everything works fine.
+
+  - If a user library invokes only pure Win32 API (accessible via
+    <windows.h> and the related headers), its DLL build will work
+    in any context.  But if this library invokes standard C API,
+    things get more complicated.
+
+    There is a single Win32 library in a Win32 system.  Every
+    function in this library resides in a single DLL module, that
+    is safe to call from anywhere.  On the other hand, there are
+    multiple versions of the C library, and each of them has its
+    own separate internal state.  Standalone executables and user
+    DLLs that call standard C functions must link to a C run-time
+    (CRT) library, be it static or shared (DLL).  Intermixing
+    occurs when an executable (not necessarily standalone) and a
+    DLL are linked to different CRTs, and both are running in the
+    same process.
+
+    Intermixing multiple CRTs is possible, as long as their
+    internal states are kept intact.  The Microsoft Knowledge Base
+    articles KB94248 "HOWTO: Use the C Run-Time" and KB140584
+    "HOWTO: Link with the Correct C Run-Time (CRT) Library"
+    mention the potential problems raised by intermixing.
+
+    If intermixing works for you, it's because your application
+    and DLLs are avoiding the corruption of each of the CRTs'
+    internal states, maybe by careful design, or maybe by fortune.
+
+    Also note that linking ZLIB1.DLL to non-Microsoft CRTs, such
+    as those provided by Borland, raises similar problems.
+
+
+11. Why are you linking ZLIB1.DLL to MSVCRT.DLL?
+
+  - MSVCRT.DLL exists on every Windows 95 with a new service pack
+    installed, or with Microsoft Internet Explorer 4 or later, and
+    on all other Windows 4.x or later (Windows 98, Windows NT 4,
+    or later).  It is freely distributable; if not present in the
+    system, it can be downloaded from Microsoft or from other
+    software provider for free.
+
+    The fact that MSVCRT.DLL does not exist on a virgin Windows 95
+    is not so problematic.  Windows 95 is scarcely found nowadays,
+    Microsoft ended its support a long time ago, and many recent
+    applications from various vendors, including Microsoft, do not
+    even run on it.  Furthermore, no serious user should run
+    Windows 95 without a proper update installed.
+
+
+12. Why are you not linking ZLIB1.DLL to
+    <<my favorite C run-time library>> ?
+
+  - We considered and abandoned the following alternatives:
+
+    * Linking ZLIB1.DLL to a static C library (LIBC.LIB, or
+      LIBCMT.LIB) is not a good option.  People are using the DLL
+      mainly to save disk space.  If you are linking your program
+      to a static C library, you may as well consider linking zlib
+      in statically, too.
+
+    * Linking ZLIB1.DLL to CRTDLL.DLL looks appealing, because
+      CRTDLL.DLL is present on every Win32 installation.
+      Unfortunately, it has a series of problems: it does not
+      work properly with Microsoft's C++ libraries, it does not
+      provide support for 64-bit file offsets, (and so on...),
+      and Microsoft discontinued its support a long time ago.
+
+    * Linking ZLIB1.DLL to MSVCR70.DLL or MSVCR71.DLL, supplied
+      with the Microsoft .NET platform, and Visual C++ 7.0/7.1,
+      raises problems related to the status of ZLIB1.DLL as a
+      system component.  According to the Microsoft Knowledge Base
+      article KB326922 "INFO: Redistribution of the Shared C
+      Runtime Component in Visual C++ .NET", MSVCR70.DLL and
+      MSVCR71.DLL are not supposed to function as system DLLs,
+      because they may clash with MSVCRT.DLL.  Instead, the
+      application's installer is supposed to put these DLLs
+      (if needed) in the application's private directory.
+      If ZLIB1.DLL depends on a non-system runtime, it cannot
+      function as a redistributable system component.
+
+    * Linking ZLIB1.DLL to non-Microsoft runtimes, such as
+      Borland's, or Cygwin's, raises problems related to the
+      reliable presence of these runtimes on Win32 systems.
+      It's easier to let the DLL build of zlib up to the people
+      who distribute these runtimes, and who may proceed as
+      explained in the answer to Question 14.
+
+
+13. If ZLIB1.DLL cannot be linked to MSVCR70.DLL or MSVCR71.DLL,
+    how can I build/use ZLIB1.DLL in Microsoft Visual C++ 7.0
+    (Visual Studio .NET) or newer?
+
+  - Due to the problems explained in the Microsoft Knowledge Base
+    article KB326922 (see the previous answer), the C runtime that
+    comes with the VC7 environment is no longer considered a
+    system component.  That is, it should not be assumed that this
+    runtime exists, or may be installed in a system directory.
+    Since ZLIB1.DLL is supposed to be a system component, it may
+    not depend on a non-system component.
+
+    In order to link ZLIB1.DLL and your application to MSVCRT.DLL
+    in VC7, you need the library of Visual C++ 6.0 or older.  If
+    you don't have this library at hand, it's probably best not to
+    use ZLIB1.DLL.
+
+    We are hoping that, in the future, Microsoft will provide a
+    way to build applications linked to a proper system runtime,
+    from the Visual C++ environment.  Until then, you have a
+    couple of alternatives, such as linking zlib in statically.
+    If your application requires dynamic linking, you may proceed
+    as explained in the answer to Question 14.
+
+
+14. I need to link my own DLL build to a CRT different than
+    MSVCRT.DLL.  What can I do?
+
+  - Feel free to rebuild the DLL from the zlib sources, and link
+    it the way you want.  You should, however, clearly state that
+    your build is unofficial.  You should give it a different file
+    name, and/or install it in a private directory that can be
+    accessed by your application only, and is not visible to the
+    others (i.e. it's neither in the PATH, nor in the SYSTEM or
+    SYSTEM32 directories).  Otherwise, your build may clash with
+    applications that link to the official build.
+
+    For example, in Cygwin, zlib is linked to the Cygwin runtime
+    CYGWIN1.DLL, and it is distributed under the name CYGZ.DLL.
+
+
+15. May I include additional pieces of code that I find useful,
+    link them in ZLIB1.DLL, and export them?
+
+  - No.  A legitimate build of ZLIB1.DLL must not include code
+    that does not originate from the official zlib source code.
+    But you can make your own private DLL build, under a different
+    file name, as suggested in the previous answer.
+
+    For example, zlib is a part of the VCL library, distributed
+    with Borland Delphi and C++ Builder.  The DLL build of VCL
+    is a redistributable file, named VCLxx.DLL.
+
+
+16. May I remove some functionality out of ZLIB1.DLL, by enabling
+    macros like NO_GZCOMPRESS or NO_GZIP at compile time?
+
+  - No.  A legitimate build of ZLIB1.DLL must provide the complete
+    zlib functionality, as implemented in the official zlib source
+    code.  But you can make your own private DLL build, under a
+    different file name, as suggested in the previous answer.
+
+
+17. I made my own ZLIB1.DLL build.  Can I test it for compliance?
+
+  - We prefer that you download the official DLL from the zlib
+    web site.  If you need something peculiar from this DLL, you
+    can send your suggestion to the zlib mailing list.
+
+    However, in case you do rebuild the DLL yourself, you can run
+    it with the test programs found in the DLL distribution.
+    Running these test programs is not a guarantee of compliance,
+    but a failure can imply a detected problem.
+
+**
+
+This document is written and maintained by
+Cosmin Truta <cosmint@cs.ubbcluj.ro>
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/Makefile.bor b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/Makefile.bor
new file mode 100644
index 00000000..3981d424
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/Makefile.bor
@@ -0,0 +1,110 @@
+# Makefile for zlib
+# Borland C++ for Win32
+#
+# Usage:
+#  make -f win32/Makefile.bor
+#  make -f win32/Makefile.bor LOCAL_ZLIB=-DASMV OBJA=match.obj OBJPA=+match.obj
+
+# ------------ Borland C++ ------------
+
+# Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
+# should be added to the environment via "set LOCAL_ZLIB=-DFOO" or
+# added to the declaration of LOC here:
+LOC = $(LOCAL_ZLIB)
+
+CC = bcc32
+AS = bcc32
+LD = bcc32
+AR = tlib
+CFLAGS  = -a -d -k- -O2 $(LOC)
+ASFLAGS = $(LOC)
+LDFLAGS = $(LOC)
+
+
+# variables
+ZLIB_LIB = zlib.lib
+
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
+OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+#OBJA =
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
+OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
+#OBJPA=
+
+
+# targets
+all: $(ZLIB_LIB) example.exe minigzip.exe
+
+.c.obj:
+	$(CC) -c $(CFLAGS) $<
+
+.asm.obj:
+	$(AS) -c $(ASFLAGS) $<
+
+adler32.obj: adler32.c zlib.h zconf.h
+
+compress.obj: compress.c zlib.h zconf.h
+
+crc32.obj: crc32.c zlib.h zconf.h crc32.h
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+
+gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
+
+gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
+
+gzread.obj: gzread.c zlib.h zconf.h gzguts.h
+
+gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
+
+infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+
+trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+
+example.obj: example.c zlib.h zconf.h
+
+minigzip.obj: minigzip.c zlib.h zconf.h
+
+
+# For the sake of the old Borland make,
+# the command line is cut to fit in the MS-DOS 128 byte limit:
+$(ZLIB_LIB): $(OBJ1) $(OBJ2) $(OBJA)
+	-del $(ZLIB_LIB)
+	$(AR) $(ZLIB_LIB) $(OBJP1)
+	$(AR) $(ZLIB_LIB) $(OBJP2)
+	$(AR) $(ZLIB_LIB) $(OBJPA)
+
+
+# testing
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d
+
+example.exe: example.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
+
+minigzip.exe: minigzip.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
+
+
+# cleanup
+clean:
+	-del $(ZLIB_LIB)
+	-del *.obj
+	-del *.exe
+	-del *.tds
+	-del zlib.bak
+	-del foo.gz
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/Makefile.emx b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/Makefile.emx
new file mode 100644
index 00000000..4d6ab0ef
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/Makefile.emx
@@ -0,0 +1,69 @@
+# Makefile for zlib.  Modified for emx/rsxnt by Chr. Spieler, 6/16/98.
+# Copyright (C) 1995-1998 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile, or to compile and test, type:
+#
+#   make -fmakefile.emx;  make test -fmakefile.emx
+#
+
+CC=gcc -Zwin32
+
+#CFLAGS=-MMD -O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-MMD -g -DDEBUG
+CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+             -Wstrict-prototypes -Wmissing-prototypes
+
+# If cp.exe is available, replace "copy /Y" with "cp -fp" .
+CP=copy /Y
+# If gnu install.exe is available, replace $(CP) with ginstall.
+INSTALL=$(CP)
+# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
+RM=del
+LDLIBS=-L. -lzlib
+LD=$(CC) -s -o
+LDSHARED=$(CC)
+
+INCL=zlib.h zconf.h
+LIBS=zlib.a
+
+AR=ar rcs
+
+prefix=/usr/local
+exec_prefix = $(prefix)
+
+OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
+       gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
+
+TEST_OBJS = example.o minigzip.o
+
+all: example.exe minigzip.exe
+
+test: all
+	./example
+	echo hello world | .\minigzip | .\minigzip -d
+
+%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+zlib.a: $(OBJS)
+	$(AR) $@ $(OBJS)
+
+%.exe : %.o $(LIBS)
+	$(LD) $@ $< $(LDLIBS)
+
+
+.PHONY : clean
+
+clean:
+	$(RM) *.d
+	$(RM) *.o
+	$(RM) *.exe
+	$(RM) zlib.a
+	$(RM) foo.gz
+
+DEPS := $(wildcard *.d)
+ifneq ($(DEPS),)
+include $(DEPS)
+endif
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/Makefile.gcc b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/Makefile.gcc
new file mode 100644
index 00000000..0a33bf6a
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/Makefile.gcc
@@ -0,0 +1,164 @@
+# Makefile for zlib, derived from Makefile.dj2.
+# Modified for mingw32 by C. Spieler, 6/16/98.
+# Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003.
+# Last updated: 1-Aug-2003.
+# Tested under Cygwin and MinGW.
+
+# Copyright (C) 1995-2003 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile, or to compile and test, type:
+#
+#   make -fmakefile.gcc;  make test testdll -fmakefile.gcc
+#
+# To use the asm code, type:
+#   cp contrib/asm?86/match.S ./match.S
+#   make LOC=-DASMV OBJA=match.o -fmakefile.gcc
+#
+# To install libz.a, zconf.h and zlib.h in the system directories, type:
+#
+#   make install -fmakefile.gcc
+
+# Note:
+# If the platform is *not* MinGW (e.g. it is Cygwin or UWIN),
+# the DLL name should be changed from "zlib1.dll".
+
+STATICLIB = libz.a
+SHAREDLIB = zlib1.dll
+IMPLIB    = libzdll.a
+
+#
+# Set to 1 if shared object needs to be installed
+#
+SHARED_MODE=0
+
+#LOC = -DASMV
+#LOC = -DDEBUG -g
+
+PREFIX =
+CC = $(PREFIX)gcc
+CFLAGS = $(LOC) -O3 -Wall
+EXTRA_CFLAGS = -DNO_VIZ
+
+AS = $(CC)
+ASFLAGS = $(LOC) -Wall
+
+LD = $(CC)
+LDFLAGS = $(LOC)
+
+AR = $(PREFIX)ar
+ARFLAGS = rcs
+
+RC = $(PREFIX)windres
+RCFLAGS = --define GCC_WINDRES
+
+STRIP = $(PREFIX)strip
+
+CP = cp -fp
+# If GNU install is available, replace $(CP) with install.
+INSTALL = $(CP)
+RM = rm -f
+
+prefix = /usr/local
+exec_prefix = $(prefix)
+
+OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
+       gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
+OBJA =
+
+all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example.exe minigzip.exe example_d.exe minigzip_d.exe
+
+test: example.exe minigzip.exe
+	./example
+	echo hello world | ./minigzip | ./minigzip -d
+
+testdll: example_d.exe minigzip_d.exe
+	./example_d
+	echo hello world | ./minigzip_d | ./minigzip_d -d
+
+.c.o:
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+
+.S.o:
+	$(AS) $(ASFLAGS) -c -o $@ $<
+
+$(STATICLIB): $(OBJS) $(OBJA)
+	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
+
+$(IMPLIB): $(SHAREDLIB)
+
+$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
+	$(CC) -shared -Wl,--out-implib,$(IMPLIB) $(LDFLAGS) \
+	-o $@ win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
+	$(STRIP) $@
+
+example.exe: example.o $(STATICLIB)
+	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
+	$(STRIP) $@
+
+minigzip.exe: minigzip.o $(STATICLIB)
+	$(LD) $(LDFLAGS) -o $@ minigzip.o $(STATICLIB)
+	$(STRIP) $@
+
+example_d.exe: example.o $(IMPLIB)
+	$(LD) $(LDFLAGS) -o $@ example.o $(IMPLIB)
+	$(STRIP) $@
+
+minigzip_d.exe: minigzip.o $(IMPLIB)
+	$(LD) $(LDFLAGS) -o $@ minigzip.o $(IMPLIB)
+	$(STRIP) $@
+
+zlibrc.o: win32/zlib1.rc
+	$(RC) $(RCFLAGS) -o $@ win32/zlib1.rc
+
+
+# BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set.
+
+.PHONY: install uninstall clean
+
+install: zlib.h zconf.h $(STATICLIB) $(IMPLIB)
+	-@mkdir -p $(INCLUDE_PATH)
+	-@mkdir -p $(LIBRARY_PATH)
+	-if [ "$(SHARED_MODE)" = "1" ]; then \
+		mkdir -p $(BINARY_PATH); \
+		$(INSTALL) $(SHAREDLIB) $(BINARY_PATH); \
+		$(INSTALL) $(IMPLIB) $(LIBRARY_PATH); \
+	fi
+	-$(INSTALL) zlib.h $(INCLUDE_PATH)
+	-$(INSTALL) zconf.h $(INCLUDE_PATH)
+	-$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)
+
+uninstall:
+	-if [ "$(SHARED_MODE)" = "1" ]; then \
+		$(RM) $(BINARY_PATH)/$(SHAREDLIB); \
+		$(RM) $(LIBRARY_PATH)/$(IMPLIB); \
+	fi
+	-$(RM) $(INCLUDE_PATH)/zlib.h
+	-$(RM) $(INCLUDE_PATH)/zconf.h
+	-$(RM) $(LIBRARY_PATH)/$(STATICLIB)
+
+clean:
+	-$(RM) $(STATICLIB)
+	-$(RM) $(SHAREDLIB)
+	-$(RM) $(IMPLIB)
+	-$(RM) *.o
+	-$(RM) *.exe
+	-$(RM) foo.gz
+
+adler32.o: zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: crc32.h zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+example.o: zlib.h zconf.h
+gzclose.o: zlib.h zconf.h gzguts.h
+gzlib.o: zlib.h zconf.h gzguts.h
+gzread.o: zlib.h zconf.h gzguts.h
+gzwrite.o: zlib.h zconf.h gzguts.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+minigzip.o: zlib.h zconf.h
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/Makefile.msc b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/Makefile.msc
new file mode 100644
index 00000000..fa10a1aa
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/Makefile.msc
@@ -0,0 +1,157 @@
+# Makefile for zlib using Microsoft (Visual) C
+# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
+#
+# Usage:
+#   nmake -f win32/Makefile.msc                          (standard build)
+#   nmake -f win32/Makefile.msc LOC=-DFOO                (nonstandard build)
+#   nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" \
+#         OBJA="inffas32.obj match686.obj"               (use ASM code, x86)
+#   nmake -f win32/Makefile.msc AS=ml64 LOC="-DASMV -DASMINF" \
+#         OBJA="inffasx64.obj gvmat64.obj inffas8664.c"  (use ASM code, x64)
+
+# optional build flags
+LOC =
+
+# variables
+STATICLIB = zlib.lib
+SHAREDLIB = zlib1.dll
+IMPLIB    = zdll.lib
+
+CC = cl
+AS = ml
+LD = link
+AR = lib
+RC = rc
+CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
+WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+ASFLAGS = -coff -Zi $(LOC)
+LDFLAGS = -nologo -debug -incremental:no -opt:ref
+ARFLAGS = -nologo
+RCFLAGS = /dWIN32 /r
+
+OBJS = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj \
+       gzwrite.obj infback.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+OBJA =
+
+
+# targets
+all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) \
+     example.exe minigzip.exe example_d.exe minigzip_d.exe
+
+$(STATICLIB): $(OBJS) $(OBJA)
+	$(AR) $(ARFLAGS) -out:$@ $(OBJS) $(OBJA)
+
+$(IMPLIB): $(SHAREDLIB)
+
+$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlib1.res
+	$(LD) $(LDFLAGS) -def:win32/zlib.def -dll -implib:$(IMPLIB) \
+	  -out:$@ -base:0x5A4C0000 $(OBJS) $(OBJA) zlib1.res
+	if exist $@.manifest \
+	  mt -nologo -manifest $@.manifest -outputresource:$@;2
+
+example.exe: example.obj $(STATICLIB)
+	$(LD) $(LDFLAGS) example.obj $(STATICLIB)
+	if exist $@.manifest \
+	  mt -nologo -manifest $@.manifest -outputresource:$@;1
+
+minigzip.exe: minigzip.obj $(STATICLIB)
+	$(LD) $(LDFLAGS) minigzip.obj $(STATICLIB)
+	if exist $@.manifest \
+	  mt -nologo -manifest $@.manifest -outputresource:$@;1
+
+example_d.exe: example.obj $(IMPLIB)
+	$(LD) $(LDFLAGS) -out:$@ example.obj $(IMPLIB)
+	if exist $@.manifest \
+	  mt -nologo -manifest $@.manifest -outputresource:$@;1
+
+minigzip_d.exe: minigzip.obj $(IMPLIB)
+	$(LD) $(LDFLAGS) -out:$@ minigzip.obj $(IMPLIB)
+	if exist $@.manifest \
+	  mt -nologo -manifest $@.manifest -outputresource:$@;1
+
+.c.obj:
+	$(CC) -c $(WFLAGS) $(CFLAGS) $<
+
+{contrib/masmx64}.c.obj:
+	$(CC) -c $(WFLAGS) $(CFLAGS) $<
+
+{contrib/masmx64}.asm.obj:
+	$(AS) -c $(ASFLAGS) $<
+
+{contrib/masmx86}.asm.obj:
+	$(AS) -c $(ASFLAGS) $<
+
+adler32.obj: adler32.c zlib.h zconf.h
+
+compress.obj: compress.c zlib.h zconf.h
+
+crc32.obj: crc32.c zlib.h zconf.h crc32.h
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+
+gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
+
+gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
+
+gzread.obj: gzread.c zlib.h zconf.h gzguts.h
+
+gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
+
+infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+             inffast.h inffixed.h
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+             inffast.h
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+             inffast.h inffixed.h
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+
+trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+
+gvmat64.obj: contrib\masmx64\gvmat64.asm
+
+inffasx64.obj: contrib\masmx64\inffasx64.asm
+
+inffas8664.obj: contrib\masmx64\inffas8664.c zutil.h zlib.h zconf.h \
+		inftrees.h inflate.h inffast.h
+
+inffas32.obj: contrib\masmx86\inffas32.asm
+
+match686.obj: contrib\masmx86\match686.asm
+
+example.obj: example.c zlib.h zconf.h
+
+minigzip.obj: minigzip.c zlib.h zconf.h
+
+zlib1.res: win32/zlib1.rc
+	$(RC) $(RCFLAGS) /fo$@ win32/zlib1.rc
+
+
+# testing
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d
+
+testdll: example_d.exe minigzip_d.exe
+	example_d
+	echo hello world | minigzip_d | minigzip_d -d
+
+
+# cleanup
+clean:
+	-del $(STATICLIB)
+	-del $(SHAREDLIB)
+	-del $(IMPLIB)
+	-del *.obj
+	-del *.res
+	-del *.exp
+	-del *.exe
+	-del *.pdb
+	-del *.manifest
+	-del foo.gz
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/README-WIN32.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/README-WIN32.txt
new file mode 100644
index 00000000..1e4c093c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/README-WIN32.txt
@@ -0,0 +1,103 @@
+ZLIB DATA COMPRESSION LIBRARY
+
+zlib 1.2.4 is a general purpose data compression library.  All the code is
+thread safe.  The data format used by the zlib library is described by RFCs
+(Request for Comments) 1950 to 1952 in the files
+http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
+and rfc1952.txt (gzip format).
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact zlib@gzip.org).  Two compiled
+examples are distributed in this package, example and minigzip.  The example_d
+and minigzip_d flavors validate that the zlib1.dll file is working correctly.
+
+Questions about zlib should be sent to <zlib@gzip.org>.  The zlib home page
+is http://zlib.net/ .  Before reporting a problem, please check this site to
+verify that you have the latest version of zlib; otherwise get the latest
+version and check whether the problem still exists or not.
+
+PLEASE read DLL_FAQ.txt, and the the zlib FAQ http://zlib.net/zlib_faq.html
+before asking for help.
+
+
+Manifest:
+
+The package zlib-1.2.4-win32-x86.zip contains the following files:
+
+  README-WIN32.txt This document
+  ChangeLog        Changes since previous zlib packages
+  DLL_FAQ.txt      Frequently asked questions about zlib1.dll
+  zlib.3.pdf       Documentation of this library in Adobe Acrobat format
+
+  example.exe      A statically-bound example (using zlib.lib, not the dll)
+  example.pdb      Symbolic information for debugging example.exe
+
+  example_d.exe    A zlib1.dll bound example (using zdll.lib)
+  example_d.pdb    Symbolic information for debugging example_d.exe
+
+  minigzip.exe     A statically-bound test program (using zlib.lib, not the dll)
+  minigzip.pdb     Symbolic information for debugging minigzip.exe
+
+  minigzip_d.exe   A zlib1.dll bound test program (using zdll.lib)
+  minigzip_d.pdb   Symbolic information for debugging minigzip_d.exe
+
+  zlib.h           Install these files into the compilers' INCLUDE path to
+  zconf.h          compile programs which use zlib.lib or zdll.lib
+
+  zdll.lib         Install these files into the compilers' LIB path if linking
+  zdll.exp         a compiled program to the zlib1.dll binary
+
+  zlib.lib         Install these files into the compilers' LIB path to link zlib
+  zlib.pdb         into compiled programs, without zlib1.dll runtime dependency
+                   (zlib.pdb provides debugging info to the compile time linker)
+
+  zlib1.dll        Install this binary shared library into the system PATH, or
+                   the program's runtime directory (where the .exe resides)
+  zlib1.pdb        Install in the same directory as zlib1.dll, in order to debug
+                   an application crash using WinDbg or similar tools.
+
+All .pdb files above are entirely optional, but are very useful to a developer
+attempting to diagnose program misbehavior or a crash.  Many additional
+important files for developers can be found in the zlib124.zip source package
+available from http://zlib.net/ - review that package's README file for details.
+
+
+Acknowledgments:
+
+The deflate format used by zlib was defined by Phil Katz.  The deflate and
+zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
+people who reported problems and suggested various improvements in zlib; they
+are too numerous to cite here.
+
+
+Copyright notice:
+
+  (C) 1995-2010 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not* receiving
+lengthy legal documents to sign.  The sources are provided for free but without
+warranty of any kind.  The library has been entirely written by Jean-loup
+Gailly and Mark Adler; it does not include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include in
+the file ChangeLog history information documenting your changes.  Please read
+the FAQ for more information on the distribution of modified source versions.
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/VisualC.txt b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/VisualC.txt
new file mode 100644
index 00000000..579a5fc9
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/VisualC.txt
@@ -0,0 +1,3 @@
+
+To build zlib using the Microsoft Visual C++ environment,
+use the appropriate project from the projects/ directory.
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/zlib.def b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/zlib.def
new file mode 100644
index 00000000..94533753
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/zlib.def
@@ -0,0 +1,74 @@
+LIBRARY
+; zlib data compression library
+
+EXPORTS
+; basic functions
+    zlibVersion
+    deflate
+    deflateEnd
+    inflate
+    inflateEnd
+; advanced functions
+    deflateSetDictionary
+    deflateCopy
+    deflateReset
+    deflateParams
+    deflateTune
+    deflateBound
+    deflatePrime
+    deflateSetHeader
+    inflateSetDictionary
+    inflateSync
+    inflateCopy
+    inflateReset
+    inflateReset2
+    inflatePrime
+    inflateMark
+    inflateGetHeader
+    inflateBack
+    inflateBackEnd
+    zlibCompileFlags
+; utility functions
+    compress
+    compress2
+    compressBound
+    uncompress
+    gzopen
+    gzdopen
+    gzbuffer
+    gzsetparams
+    gzread
+    gzwrite
+    gzprintf
+    gzputs
+    gzgets
+    gzputc
+    gzgetc
+    gzungetc
+    gzflush
+    gzseek
+    gzrewind
+    gztell
+    gzoffset
+    gzeof
+    gzdirect
+    gzclose
+    gzclose_r
+    gzclose_w
+    gzerror
+    gzclearerr
+; checksum functions
+    adler32
+    crc32
+    adler32_combine
+    crc32_combine
+; various hacks, don't look :)
+    deflateInit_
+    deflateInit2_
+    inflateInit_
+    inflateInit2_
+    inflateBackInit_
+    zError
+    inflateSyncPoint
+    get_crc_table
+    inflateUndermine
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/zlib1.rc b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/zlib1.rc
new file mode 100644
index 00000000..0d1d7ffc
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/win32/zlib1.rc
@@ -0,0 +1,40 @@
+#include <winver.h>
+#include "../zlib.h"
+
+#ifdef GCC_WINDRES
+VS_VERSION_INFO		VERSIONINFO
+#else
+VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
+#endif
+  FILEVERSION		ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
+  PRODUCTVERSION	ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
+  FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+  FILEFLAGS		1
+#else
+  FILEFLAGS		0
+#endif
+  FILEOS		VOS__WINDOWS32
+  FILETYPE		VFT_DLL
+  FILESUBTYPE		0	// not used
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    //language ID = U.S. English, char set = Windows, Multilingual
+    BEGIN
+      VALUE "FileDescription",	"zlib data compression library\0"
+      VALUE "FileVersion",	ZLIB_VERSION "\0"
+      VALUE "InternalName",	"zlib1.dll\0"
+      VALUE "LegalCopyright",	"(C) 1995-2006 Jean-loup Gailly & Mark Adler\0"
+      VALUE "OriginalFilename",	"zlib1.dll\0"
+      VALUE "ProductName",	"zlib\0"
+      VALUE "ProductVersion",	ZLIB_VERSION "\0"
+      VALUE "Comments",		"For more information visit http://www.zlib.net/\0"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x0409, 1252
+  END
+END
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zconf.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zconf.h
new file mode 100644
index 00000000..043488fe
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zconf.h
@@ -0,0 +1,428 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2010 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: zconf.h 246 2010-04-23 10:54:55Z nijtmans $ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+
+/* all linked symbols */
+#  define _dist_code            z__dist_code
+#  define _length_code          z__length_code
+#  define _tr_align             z__tr_align
+#  define _tr_flush_block       z__tr_flush_block
+#  define _tr_init              z__tr_init
+#  define _tr_stored_block      z__tr_stored_block
+#  define _tr_tally             z__tr_tally
+#  define adler32               z_adler32
+#  define adler32_combine       z_adler32_combine
+#  define adler32_combine64     z_adler32_combine64
+#  define compress              z_compress
+#  define compress2             z_compress2
+#  define compressBound         z_compressBound
+#  define crc32                 z_crc32
+#  define crc32_combine         z_crc32_combine
+#  define crc32_combine64       z_crc32_combine64
+#  define deflate               z_deflate
+#  define deflateBound          z_deflateBound
+#  define deflateCopy           z_deflateCopy
+#  define deflateEnd            z_deflateEnd
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateInit_          z_deflateInit_
+#  define deflateParams         z_deflateParams
+#  define deflatePrime          z_deflatePrime
+#  define deflateReset          z_deflateReset
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetHeader      z_deflateSetHeader
+#  define deflateTune           z_deflateTune
+#  define deflate_copyright     z_deflate_copyright
+#  define get_crc_table         z_get_crc_table
+#  define gz_error              z_gz_error
+#  define gz_intmax             z_gz_intmax
+#  define gz_strwinerror        z_gz_strwinerror
+#  define gzbuffer              z_gzbuffer
+#  define gzclearerr            z_gzclearerr
+#  define gzclose               z_gzclose
+#  define gzclose_r             z_gzclose_r
+#  define gzclose_w             z_gzclose_w
+#  define gzdirect              z_gzdirect
+#  define gzdopen               z_gzdopen
+#  define gzeof                 z_gzeof
+#  define gzerror               z_gzerror
+#  define gzflush               z_gzflush
+#  define gzgetc                z_gzgetc
+#  define gzgets                z_gzgets
+#  define gzoffset              z_gzoffset
+#  define gzoffset64            z_gzoffset64
+#  define gzopen                z_gzopen
+#  define gzopen64              z_gzopen64
+#  define gzprintf              z_gzprintf
+#  define gzputc                z_gzputc
+#  define gzputs                z_gzputs
+#  define gzread                z_gzread
+#  define gzrewind              z_gzrewind
+#  define gzseek                z_gzseek
+#  define gzseek64              z_gzseek64
+#  define gzsetparams           z_gzsetparams
+#  define gztell                z_gztell
+#  define gztell64              z_gztell64
+#  define gzungetc              z_gzungetc
+#  define gzwrite               z_gzwrite
+#  define inflate               z_inflate
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCopy           z_inflateCopy
+#  define inflateEnd            z_inflateEnd
+#  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateInit_          z_inflateInit_
+#  define inflateMark           z_inflateMark
+#  define inflatePrime          z_inflatePrime
+#  define inflateReset          z_inflateReset
+#  define inflateReset2         z_inflateReset2
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateUndermine      z_inflateUndermine
+#  define inflate_copyright     z_inflate_copyright
+#  define inflate_fast          z_inflate_fast
+#  define inflate_table         z_inflate_table
+#  define uncompress            z_uncompress
+#  define zError                z_zError
+#  define zcalloc               z_zcalloc
+#  define zcfree                z_zcfree
+#  define zlibCompileFlags      z_zlibCompileFlags
+#  define zlibVersion           z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+#  define Byte                  z_Byte
+#  define Bytef                 z_Bytef
+#  define alloc_func            z_alloc_func
+#  define charf                 z_charf
+#  define free_func             z_free_func
+#  define gzFile                z_gzFile
+#  define gz_header             z_gz_header
+#  define gz_headerp            z_gz_headerp
+#  define in_func               z_in_func
+#  define intf                  z_intf
+#  define out_func              z_out_func
+#  define uInt                  z_uInt
+#  define uIntf                 z_uIntf
+#  define uLong                 z_uLong
+#  define uLongf                z_uLongf
+#  define voidp                 z_voidp
+#  define voidpc                z_voidpc
+#  define voidpf                z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+#  define gz_header_s           z_gz_header_s
+#  define internal_state        z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+#  define NO_DUMMY_DECL
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef STDC
+#  include <sys/types.h>    /* for off_t */
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#  include <unistd.h>       /* for SEEK_* and off_t */
+#  ifdef VMS
+#    include <unixio.h>     /* for off_t */
+#  endif
+#  ifndef z_off_t
+#    define z_off_t off_t
+#  endif
+#endif
+
+#ifndef SEEK_SET
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#  define z_off64_t off64_t
+#else
+#  define z_off64_t z_off_t
+#endif
+
+#if defined(__OS400__)
+#  define NO_vsnprintf
+#endif
+
+#if defined(__MVS__)
+#  define NO_vsnprintf
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zconf.h.cmakein b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zconf.h.cmakein
new file mode 100644
index 00000000..a2f71b1f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zconf.h.cmakein
@@ -0,0 +1,430 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2010 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+#cmakedefine Z_PREFIX
+#cmakedefine Z_HAVE_UNISTD_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+
+/* all linked symbols */
+#  define _dist_code            z__dist_code
+#  define _length_code          z__length_code
+#  define _tr_align             z__tr_align
+#  define _tr_flush_block       z__tr_flush_block
+#  define _tr_init              z__tr_init
+#  define _tr_stored_block      z__tr_stored_block
+#  define _tr_tally             z__tr_tally
+#  define adler32               z_adler32
+#  define adler32_combine       z_adler32_combine
+#  define adler32_combine64     z_adler32_combine64
+#  define compress              z_compress
+#  define compress2             z_compress2
+#  define compressBound         z_compressBound
+#  define crc32                 z_crc32
+#  define crc32_combine         z_crc32_combine
+#  define crc32_combine64       z_crc32_combine64
+#  define deflate               z_deflate
+#  define deflateBound          z_deflateBound
+#  define deflateCopy           z_deflateCopy
+#  define deflateEnd            z_deflateEnd
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateInit_          z_deflateInit_
+#  define deflateParams         z_deflateParams
+#  define deflatePrime          z_deflatePrime
+#  define deflateReset          z_deflateReset
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetHeader      z_deflateSetHeader
+#  define deflateTune           z_deflateTune
+#  define deflate_copyright     z_deflate_copyright
+#  define get_crc_table         z_get_crc_table
+#  define gz_error              z_gz_error
+#  define gz_intmax             z_gz_intmax
+#  define gz_strwinerror        z_gz_strwinerror
+#  define gzbuffer              z_gzbuffer
+#  define gzclearerr            z_gzclearerr
+#  define gzclose               z_gzclose
+#  define gzclose_r             z_gzclose_r
+#  define gzclose_w             z_gzclose_w
+#  define gzdirect              z_gzdirect
+#  define gzdopen               z_gzdopen
+#  define gzeof                 z_gzeof
+#  define gzerror               z_gzerror
+#  define gzflush               z_gzflush
+#  define gzgetc                z_gzgetc
+#  define gzgets                z_gzgets
+#  define gzoffset              z_gzoffset
+#  define gzoffset64            z_gzoffset64
+#  define gzopen                z_gzopen
+#  define gzopen64              z_gzopen64
+#  define gzprintf              z_gzprintf
+#  define gzputc                z_gzputc
+#  define gzputs                z_gzputs
+#  define gzread                z_gzread
+#  define gzrewind              z_gzrewind
+#  define gzseek                z_gzseek
+#  define gzseek64              z_gzseek64
+#  define gzsetparams           z_gzsetparams
+#  define gztell                z_gztell
+#  define gztell64              z_gztell64
+#  define gzungetc              z_gzungetc
+#  define gzwrite               z_gzwrite
+#  define inflate               z_inflate
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCopy           z_inflateCopy
+#  define inflateEnd            z_inflateEnd
+#  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateInit_          z_inflateInit_
+#  define inflateMark           z_inflateMark
+#  define inflatePrime          z_inflatePrime
+#  define inflateReset          z_inflateReset
+#  define inflateReset2         z_inflateReset2
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateUndermine      z_inflateUndermine
+#  define inflate_copyright     z_inflate_copyright
+#  define inflate_fast          z_inflate_fast
+#  define inflate_table         z_inflate_table
+#  define uncompress            z_uncompress
+#  define zError                z_zError
+#  define zcalloc               z_zcalloc
+#  define zcfree                z_zcfree
+#  define zlibCompileFlags      z_zlibCompileFlags
+#  define zlibVersion           z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+#  define Byte                  z_Byte
+#  define Bytef                 z_Bytef
+#  define alloc_func            z_alloc_func
+#  define charf                 z_charf
+#  define free_func             z_free_func
+#  define gzFile                z_gzFile
+#  define gz_header             z_gz_header
+#  define gz_headerp            z_gz_headerp
+#  define in_func               z_in_func
+#  define intf                  z_intf
+#  define out_func              z_out_func
+#  define uInt                  z_uInt
+#  define uIntf                 z_uIntf
+#  define uLong                 z_uLong
+#  define uLongf                z_uLongf
+#  define voidp                 z_voidp
+#  define voidpc                z_voidpc
+#  define voidpf                z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+#  define gz_header_s           z_gz_header_s
+#  define internal_state        z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+#  define NO_DUMMY_DECL
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef STDC
+#  include <sys/types.h>    /* for off_t */
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#  include <unistd.h>       /* for SEEK_* and off_t */
+#  ifdef VMS
+#    include <unixio.h>     /* for off_t */
+#  endif
+#  ifndef z_off_t
+#    define z_off_t off_t
+#  endif
+#endif
+
+#ifndef SEEK_SET
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#  define z_off64_t off64_t
+#else
+#  define z_off64_t z_off_t
+#endif
+
+#if defined(__OS400__)
+#  define NO_vsnprintf
+#endif
+
+#if defined(__MVS__)
+#  define NO_vsnprintf
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zconf.h.in b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zconf.h.in
new file mode 100644
index 00000000..3e9a4813
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zconf.h.in
@@ -0,0 +1,428 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2010 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: zconf.h.in 246 2010-04-23 10:54:55Z nijtmans $ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+
+/* all linked symbols */
+#  define _dist_code            z__dist_code
+#  define _length_code          z__length_code
+#  define _tr_align             z__tr_align
+#  define _tr_flush_block       z__tr_flush_block
+#  define _tr_init              z__tr_init
+#  define _tr_stored_block      z__tr_stored_block
+#  define _tr_tally             z__tr_tally
+#  define adler32               z_adler32
+#  define adler32_combine       z_adler32_combine
+#  define adler32_combine64     z_adler32_combine64
+#  define compress              z_compress
+#  define compress2             z_compress2
+#  define compressBound         z_compressBound
+#  define crc32                 z_crc32
+#  define crc32_combine         z_crc32_combine
+#  define crc32_combine64       z_crc32_combine64
+#  define deflate               z_deflate
+#  define deflateBound          z_deflateBound
+#  define deflateCopy           z_deflateCopy
+#  define deflateEnd            z_deflateEnd
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateInit_          z_deflateInit_
+#  define deflateParams         z_deflateParams
+#  define deflatePrime          z_deflatePrime
+#  define deflateReset          z_deflateReset
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetHeader      z_deflateSetHeader
+#  define deflateTune           z_deflateTune
+#  define deflate_copyright     z_deflate_copyright
+#  define get_crc_table         z_get_crc_table
+#  define gz_error              z_gz_error
+#  define gz_intmax             z_gz_intmax
+#  define gz_strwinerror        z_gz_strwinerror
+#  define gzbuffer              z_gzbuffer
+#  define gzclearerr            z_gzclearerr
+#  define gzclose               z_gzclose
+#  define gzclose_r             z_gzclose_r
+#  define gzclose_w             z_gzclose_w
+#  define gzdirect              z_gzdirect
+#  define gzdopen               z_gzdopen
+#  define gzeof                 z_gzeof
+#  define gzerror               z_gzerror
+#  define gzflush               z_gzflush
+#  define gzgetc                z_gzgetc
+#  define gzgets                z_gzgets
+#  define gzoffset              z_gzoffset
+#  define gzoffset64            z_gzoffset64
+#  define gzopen                z_gzopen
+#  define gzopen64              z_gzopen64
+#  define gzprintf              z_gzprintf
+#  define gzputc                z_gzputc
+#  define gzputs                z_gzputs
+#  define gzread                z_gzread
+#  define gzrewind              z_gzrewind
+#  define gzseek                z_gzseek
+#  define gzseek64              z_gzseek64
+#  define gzsetparams           z_gzsetparams
+#  define gztell                z_gztell
+#  define gztell64              z_gztell64
+#  define gzungetc              z_gzungetc
+#  define gzwrite               z_gzwrite
+#  define inflate               z_inflate
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCopy           z_inflateCopy
+#  define inflateEnd            z_inflateEnd
+#  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateInit_          z_inflateInit_
+#  define inflateMark           z_inflateMark
+#  define inflatePrime          z_inflatePrime
+#  define inflateReset          z_inflateReset
+#  define inflateReset2         z_inflateReset2
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateUndermine      z_inflateUndermine
+#  define inflate_copyright     z_inflate_copyright
+#  define inflate_fast          z_inflate_fast
+#  define inflate_table         z_inflate_table
+#  define uncompress            z_uncompress
+#  define zError                z_zError
+#  define zcalloc               z_zcalloc
+#  define zcfree                z_zcfree
+#  define zlibCompileFlags      z_zlibCompileFlags
+#  define zlibVersion           z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+#  define Byte                  z_Byte
+#  define Bytef                 z_Bytef
+#  define alloc_func            z_alloc_func
+#  define charf                 z_charf
+#  define free_func             z_free_func
+#  define gzFile                z_gzFile
+#  define gz_header             z_gz_header
+#  define gz_headerp            z_gz_headerp
+#  define in_func               z_in_func
+#  define intf                  z_intf
+#  define out_func              z_out_func
+#  define uInt                  z_uInt
+#  define uIntf                 z_uIntf
+#  define uLong                 z_uLong
+#  define uLongf                z_uLongf
+#  define voidp                 z_voidp
+#  define voidpc                z_voidpc
+#  define voidpf                z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+#  define gz_header_s           z_gz_header_s
+#  define internal_state        z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+#  define NO_DUMMY_DECL
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef STDC
+#  include <sys/types.h>    /* for off_t */
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#  include <unistd.h>       /* for SEEK_* and off_t */
+#  ifdef VMS
+#    include <unixio.h>     /* for off_t */
+#  endif
+#  ifndef z_off_t
+#    define z_off_t off_t
+#  endif
+#endif
+
+#ifndef SEEK_SET
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#  define z_off64_t off64_t
+#else
+#  define z_off64_t z_off_t
+#endif
+
+#if defined(__OS400__)
+#  define NO_vsnprintf
+#endif
+
+#if defined(__MVS__)
+#  define NO_vsnprintf
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.3 b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.3
new file mode 100644
index 00000000..27adc4cd
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.3
@@ -0,0 +1,151 @@
+.TH ZLIB 3 "19 Apr 2010"
+.SH NAME
+zlib \- compression/decompression library
+.SH SYNOPSIS
+[see
+.I zlib.h
+for full description]
+.SH DESCRIPTION
+The
+.I zlib
+library is a general purpose data compression library.
+The code is thread safe, assuming that the standard library functions
+used are thread safe, such as memory allocation routines.
+It provides in-memory compression and decompression functions,
+including integrity checks of the uncompressed data.
+This version of the library supports only one compression method (deflation)
+but other algorithms may be added later
+with the same stream interface.
+.LP
+Compression can be done in a single step if the buffers are large enough
+or can be done by repeated calls of the compression function.
+In the latter case,
+the application must provide more input and/or consume the output
+(providing more output space) before each call.
+.LP
+The library also supports reading and writing files in
+.IR gzip (1)
+(.gz) format
+with an interface similar to that of stdio.
+.LP
+The library does not install any signal handler.
+The decoder checks the consistency of the compressed data,
+so the library should never crash even in the case of corrupted input.
+.LP
+All functions of the compression library are documented in the file
+.IR zlib.h .
+The distribution source includes examples of use of the library
+in the files
+.I example.c
+and
+.IR minigzip.c,
+as well as other examples in the
+.IR examples/
+directory.
+.LP
+Changes to this version are documented in the file
+.I ChangeLog
+that accompanies the source.
+.LP
+.I zlib
+is available in Java using the java.util.zip package:
+.IP
+http://java.sun.com/developer/technicalArticles/Programming/compression/
+.LP
+A Perl interface to
+.IR zlib ,
+written by Paul Marquess (pmqs@cpan.org),
+is available at CPAN (Comprehensive Perl Archive Network) sites,
+including:
+.IP
+http://search.cpan.org/~pmqs/IO-Compress-Zlib/
+.LP
+A Python interface to
+.IR zlib ,
+written by A.M. Kuchling (amk@magnet.com),
+is available in Python 1.5 and later versions:
+.IP
+http://www.python.org/doc/lib/module-zlib.html
+.LP
+.I zlib
+is built into
+.IR tcl:
+.IP
+http://wiki.tcl.tk/4610
+.LP
+An experimental package to read and write files in .zip format,
+written on top of
+.I zlib
+by Gilles Vollant (info@winimage.com),
+is available at:
+.IP
+http://www.winimage.com/zLibDll/minizip.html
+and also in the
+.I contrib/minizip
+directory of the main
+.I zlib
+source distribution.
+.SH "SEE ALSO"
+The
+.I zlib
+web site can be found at:
+.IP
+http://zlib.net/
+.LP
+The data format used by the zlib library is described by RFC
+(Request for Comments) 1950 to 1952 in the files:
+.IP
+http://www.ietf.org/rfc/rfc1950.txt (for the zlib header and trailer format)
+.br
+http://www.ietf.org/rfc/rfc1951.txt (for the deflate compressed data format)
+.br
+http://www.ietf.org/rfc/rfc1952.txt (for the gzip header and trailer format)
+.LP
+Mark Nelson wrote an article about
+.I zlib
+for the Jan. 1997 issue of  Dr. Dobb's Journal;
+a copy of the article is available at:
+.IP
+http://marknelson.us/1997/01/01/zlib-engine/
+.SH "REPORTING PROBLEMS"
+Before reporting a problem,
+please check the
+.I zlib
+web site to verify that you have the latest version of
+.IR zlib ;
+otherwise,
+obtain the latest version and see if the problem still exists.
+Please read the
+.I zlib
+FAQ at:
+.IP
+http://zlib.net/zlib_faq.html
+.LP
+before asking for help.
+Send questions and/or comments to zlib@gzip.org,
+or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
+.SH AUTHORS
+Version 1.2.5
+Copyright (C) 1995-2010 Jean-loup Gailly (jloup@gzip.org)
+and Mark Adler (madler@alumni.caltech.edu).
+.LP
+This software is provided "as-is,"
+without any express or implied warranty.
+In no event will the authors be held liable for any damages
+arising from the use of this software.
+See the distribution directory with respect to requirements
+governing redistribution.
+The deflate format used by
+.I zlib
+was defined by Phil Katz.
+The deflate and
+.I zlib
+specifications were written by L. Peter Deutsch.
+Thanks to all the people who reported problems and suggested various
+improvements in
+.IR zlib ;
+who are too numerous to cite here.
+.LP
+UNIX manual page by R. P. C. Rodgers,
+U.S. National Library of Medicine (rodgers@nlm.nih.gov).
+.\" end of man page
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.3.pdf b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.3.pdf
new file mode 100644
index 00000000..9f8a2c39
Binary files /dev/null and b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.3.pdf differ
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.h
new file mode 100644
index 00000000..bfbba83e
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.h
@@ -0,0 +1,1613 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.2.5, April 19th, 2010
+
+  Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
+  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+*/
+
+#ifndef ZLIB_H
+#define ZLIB_H
+
+#include "zconf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.2.5"
+#define ZLIB_VERNUM 0x1250
+#define ZLIB_VER_MAJOR 1
+#define ZLIB_VER_MINOR 2
+#define ZLIB_VER_REVISION 5
+#define ZLIB_VER_SUBREVISION 0
+
+/*
+    The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed data.
+  This version of the library supports only one compression method (deflation)
+  but other algorithms will be added later and will have the same stream
+  interface.
+
+    Compression can be done in a single step if the buffers are large enough,
+  or can be done by repeated calls of the compression function.  In the latter
+  case, the application must provide more input and/or consume the output
+  (providing more output space) before each call.
+
+    The compressed data format used by default by the in-memory functions is
+  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+  around a deflate stream, which is itself documented in RFC 1951.
+
+    The library also supports reading and writing files in gzip (.gz) format
+  with an interface similar to that of stdio using the functions that start
+  with "gz".  The gzip format is different from the zlib format.  gzip is a
+  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+    This library can optionally read and write gzip streams in memory as well.
+
+    The zlib format was designed to be compact and fast for use in memory
+  and on communications channels.  The gzip format was designed for single-
+  file compression on file systems, has a larger header than zlib to maintain
+  directory information, and uses a different, slower check method than zlib.
+
+    The library does not install any signal handler.  The decoder checks
+  the consistency of the compressed data, so the library should never crash
+  even in case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+    Bytef    *next_in;  /* next input byte */
+    uInt     avail_in;  /* number of bytes available at next_in */
+    uLong    total_in;  /* total nb of input bytes read so far */
+
+    Bytef    *next_out; /* next output byte should be put there */
+    uInt     avail_out; /* remaining free space at next_out */
+    uLong    total_out; /* total nb of bytes output so far */
+
+    char     *msg;      /* last error message, NULL if no error */
+    struct internal_state FAR *state; /* not visible by applications */
+
+    alloc_func zalloc;  /* used to allocate the internal state */
+    free_func  zfree;   /* used to free the internal state */
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */
+
+    int     data_type;  /* best guess about the data type: binary or text */
+    uLong   adler;      /* adler32 value of the uncompressed data */
+    uLong   reserved;   /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+     gzip header information passed to and from zlib routines.  See RFC 1952
+  for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+    int     text;       /* true if compressed data believed to be text */
+    uLong   time;       /* modification time */
+    int     xflags;     /* extra flags (not used when writing a gzip file) */
+    int     os;         /* operating system */
+    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
+    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
+    uInt    extra_max;  /* space at extra (only when reading header) */
+    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
+    uInt    name_max;   /* space at name (only when reading header) */
+    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
+    uInt    comm_max;   /* space at comment (only when reading header) */
+    int     hcrc;       /* true if there was or will be a header crc */
+    int     done;       /* true when done reading gzip header (not used
+                           when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
+/*
+     The application must update next_in and avail_in when avail_in has dropped
+   to zero.  It must update next_out and avail_out when avail_out has dropped
+   to zero.  The application must initialize zalloc, zfree and opaque before
+   calling the init function.  All other fields are set by the compression
+   library and must not be updated by the application.
+
+     The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree.  This can be useful for custom
+   memory management.  The compression library attaches no meaning to the
+   opaque value.
+
+     zalloc must return Z_NULL if there is not enough memory for the object.
+   If zlib is used in a multi-threaded application, zalloc and zfree must be
+   thread safe.
+
+     On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this if
+   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
+   returned by zalloc for objects of exactly 65536 bytes *must* have their
+   offset normalized to zero.  The default allocation function provided by this
+   library ensures this (see zutil.c).  To reduce memory requirements and avoid
+   any allocation of 64K objects, at the expense of compression ratio, compile
+   the library with -DMAX_WBITS=14 (see zconf.h).
+
+     The fields total_in and total_out can be used for statistics or progress
+   reports.  After compression, total_in holds the total size of the
+   uncompressed data and may be saved for use in the decompressor (particularly
+   if the decompressor wants to decompress everything in a single step).
+*/
+
+                        /* constants */
+
+#define Z_NO_FLUSH      0
+#define Z_PARTIAL_FLUSH 1
+#define Z_SYNC_FLUSH    2
+#define Z_FULL_FLUSH    3
+#define Z_FINISH        4
+#define Z_BLOCK         5
+#define Z_TREES         6
+/* Allowed flush values; see deflate() and inflate() below for details */
+
+#define Z_OK            0
+#define Z_STREAM_END    1
+#define Z_NEED_DICT     2
+#define Z_ERRNO        (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR   (-3)
+#define Z_MEM_ERROR    (-4)
+#define Z_BUF_ERROR    (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative values
+ * are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION         0
+#define Z_BEST_SPEED             1
+#define Z_BEST_COMPRESSION       9
+#define Z_DEFAULT_COMPRESSION  (-1)
+/* compression levels */
+
+#define Z_FILTERED            1
+#define Z_HUFFMAN_ONLY        2
+#define Z_RLE                 3
+#define Z_FIXED               4
+#define Z_DEFAULT_STRATEGY    0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY   0
+#define Z_TEXT     1
+#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
+#define Z_UNKNOWN  2
+/* Possible values of the data_type field (though see inflate()) */
+
+#define Z_DEFLATED   8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+
+                        /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+   If the first character differs, the library code actually used is not
+   compatible with the zlib.h header file used by the application.  This check
+   is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+     Initializes the internal stream state for compression.  The fields
+   zalloc, zfree and opaque must be initialized before by the caller.  If
+   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
+   allocation functions.
+
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+   1 gives best speed, 9 gives best compression, 0 gives no compression at all
+   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
+   requests a default compromise between speed and compression (currently
+   equivalent to level 6).
+
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if level is not a valid compression level, or
+   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
+   if there is no error message.  deflateInit does not perform any compression:
+   this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+    deflate compresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+    The detailed semantics are as follows.  deflate performs one or both of the
+  following actions:
+
+  - Compress more input starting at next_in and update next_in and avail_in
+    accordingly.  If not all input can be processed (because there is not
+    enough room in the output buffer), next_in and avail_in are updated and
+    processing will resume at this point for the next call of deflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly.  This action is forced if the parameter flush is non zero.
+    Forcing flush frequently degrades the compression ratio, so this parameter
+    should be set only when necessary (in interactive applications).  Some
+    output may be provided even if flush is not set.
+
+    Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating avail_in or avail_out accordingly; avail_out should
+  never be zero before the call.  The application can consume the compressed
+  output when it wants, for example when the output buffer is full (avail_out
+  == 0), or after each call of deflate().  If deflate returns Z_OK and with
+  zero avail_out, it must be called again after making room in the output
+  buffer because there might be more output pending.
+
+    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+  decide how much data to accumulate before producing output, in order to
+  maximize compression.
+
+    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+  flushed to the output buffer and the output is aligned on a byte boundary, so
+  that the decompressor can get all input data available so far.  (In
+  particular avail_in is zero after the call if enough output space has been
+  provided before the call.) Flushing may degrade compression for some
+  compression algorithms and so it should be used only when necessary.  This
+  completes the current deflate block and follows it with an empty stored block
+  that is three bits plus filler bits to the next byte, followed by four bytes
+  (00 00 ff ff).
+
+    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
+  output buffer, but the output is not aligned to a byte boundary.  All of the
+  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
+  This completes the current deflate block and follows it with an empty fixed
+  codes block that is 10 bits long.  This assures that enough bytes are output
+  in order for the decompressor to finish the block before the empty fixed code
+  block.
+
+    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
+  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
+  seven bits of the current block are held to be written as the next byte after
+  the next deflate block is completed.  In this case, the decompressor may not
+  be provided enough bits at this point in order to complete decompression of
+  the data provided so far to the compressor.  It may need to wait for the next
+  block to be emitted.  This is for advanced applications that need to control
+  the emission of deflate blocks.
+
+    If flush is set to Z_FULL_FLUSH, all output is flushed as with
+  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+  restart from this point if previous compressed data has been damaged or if
+  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
+  compression.
+
+    If deflate returns with avail_out == 0, this function must be called again
+  with the same value of the flush parameter and more output space (updated
+  avail_out), until the flush is complete (deflate returns with non-zero
+  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out is greater than six to avoid repeated flush markers due to
+  avail_out == 0 on return.
+
+    If the parameter flush is set to Z_FINISH, pending input is processed,
+  pending output is flushed and deflate returns with Z_STREAM_END if there was
+  enough output space; if deflate returns with Z_OK, this function must be
+  called again with Z_FINISH and more output space (updated avail_out) but no
+  more input data, until it returns with Z_STREAM_END or an error.  After
+  deflate has returned Z_STREAM_END, the only possible operations on the stream
+  are deflateReset or deflateEnd.
+
+    Z_FINISH can be used immediately after deflateInit if all the compression
+  is to be done in a single step.  In this case, avail_out must be at least the
+  value returned by deflateBound (see below).  If deflate does not return
+  Z_STREAM_END, then it must be called again as described above.
+
+    deflate() sets strm->adler to the adler32 checksum of all input read
+  so far (that is, total_in bytes).
+
+    deflate() may update strm->data_type if it can make a good guess about
+  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
+  binary.  This field is only for information purposes and does not affect the
+  compression algorithm in any manner.
+
+    deflate() returns Z_OK if some progress has been made (more input
+  processed or more output produced), Z_STREAM_END if all input has been
+  consumed and all output has been produced (only when flush is set to
+  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
+  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
+  fatal, and deflate() can be called again with more input and more output
+  space to continue compressing.
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any pending
+   output.
+
+     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+   prematurely (some input or output was discarded).  In the error case, msg
+   may be set but then points to a static string (which must not be
+   deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+     Initializes the internal stream state for decompression.  The fields
+   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
+   exact value depends on the compression method), inflateInit determines the
+   compression method from the zlib header and allocates all data structures
+   accordingly; otherwise the allocation will be deferred to the first call of
+   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+   use default allocation functions.
+
+     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit does not perform any decompression
+   apart from possibly reading the zlib header if present: actual decompression
+   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out and avail_out are unused and unchanged.) The current implementation
+   of inflateInit() does not process any header information -- that is deferred
+   until inflate() is called.
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+    inflate decompresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+  The detailed semantics are as follows.  inflate performs one or both of the
+  following actions:
+
+  - Decompress more input starting at next_in and update next_in and avail_in
+    accordingly.  If not all input can be processed (because there is not
+    enough room in the output buffer), next_in is updated and processing will
+    resume at this point for the next call of inflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly.  inflate() provides as much output as possible, until there is
+    no more input data or no more space in the output buffer (see below about
+    the flush parameter).
+
+    Before the call of inflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating the next_* and avail_* values accordingly.  The
+  application can consume the uncompressed output when it wants, for example
+  when the output buffer is full (avail_out == 0), or after each call of
+  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
+  called again after making room in the output buffer because there might be
+  more output pending.
+
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
+  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer.  Z_BLOCK requests that inflate()
+  stop if and when it gets to the next deflate block boundary.  When decoding
+  the zlib or gzip format, this will cause inflate() to return immediately
+  after the header and before the first block.  When doing a raw inflate,
+  inflate() will go ahead and process the first block, and will return when it
+  gets to the end of that block, or when it runs out of data.
+
+    The Z_BLOCK option assists in appending to or combining deflate streams.
+  Also to assist in this, on return inflate() will set strm->data_type to the
+  number of unused bits in the last byte taken from strm->next_in, plus 64 if
+  inflate() is currently decoding the last block in the deflate stream, plus
+  128 if inflate() returned immediately after decoding an end-of-block code or
+  decoding the complete header up to just before the first byte of the deflate
+  stream.  The end-of-block will not be indicated until all of the uncompressed
+  data from that block has been written to strm->next_out.  The number of
+  unused bits may in general be greater than seven, except when bit 7 of
+  data_type is set, in which case the number of unused bits will be less than
+  eight.  data_type is set as noted here every time inflate() returns for all
+  flush options, and so can be used to determine the amount of currently
+  consumed input in bits.
+
+    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
+  end of each deflate block header is reached, before any actual data in that
+  block is decoded.  This allows the caller to determine the length of the
+  deflate block header for later use in random access within a deflate block.
+  256 is added to the value of strm->data_type when inflate() returns
+  immediately after reaching the end of the deflate block header.
+
+    inflate() should normally be called until it returns Z_STREAM_END or an
+  error.  However if all decompression is to be performed in a single step (a
+  single call of inflate), the parameter flush should be set to Z_FINISH.  In
+  this case all pending input is processed and all pending output is flushed;
+  avail_out must be large enough to hold all the uncompressed data.  (The size
+  of the uncompressed data may have been saved by the compressor for this
+  purpose.) The next operation on this stream must be inflateEnd to deallocate
+  the decompression state.  The use of Z_FINISH is never required, but can be
+  used to inform inflate that a faster approach may be used for the single
+  inflate() call.
+
+     In this implementation, inflate() always flushes as much output as
+  possible to the output buffer, and always uses the faster approach on the
+  first call.  So the only effect of the flush parameter in this implementation
+  is on the return value of inflate(), as noted below, or when it returns early
+  because Z_BLOCK or Z_TREES is used.
+
+     If a preset dictionary is needed after this call (see inflateSetDictionary
+  below), inflate sets strm->adler to the adler32 checksum of the dictionary
+  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+  strm->adler to the adler32 checksum of all output produced so far (that is,
+  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+  below.  At the end of the stream, inflate() checks that its computed adler32
+  checksum is equal to that saved by the compressor and returns Z_STREAM_END
+  only if the checksum is correct.
+
+    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically, if requested when
+  initializing with inflateInit2().  Any information contained in the gzip
+  header is not retained, so applications that need that information should
+  instead use raw inflate, see inflateInit2() below, or inflateBack() and
+  perform their own processing of the gzip header and trailer.
+
+    inflate() returns Z_OK if some progress has been made (more input processed
+  or more output produced), Z_STREAM_END if the end of the compressed data has
+  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+  corrupted (input stream not conforming to the zlib format or incorrect check
+  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
+  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
+  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
+  inflate() can be called again with more input and more output space to
+  continue decompressing.  If Z_DATA_ERROR is returned, the application may
+  then call inflateSync() to look for a good compression block if a partial
+  recovery of the data is desired.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any pending
+   output.
+
+     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+   was inconsistent.  In the error case, msg may be set but then points to a
+   static string (which must not be deallocated).
+*/
+
+
+                        /* Advanced functions */
+
+/*
+    The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+                                     int  level,
+                                     int  method,
+                                     int  windowBits,
+                                     int  memLevel,
+                                     int  strategy));
+
+     This is another version of deflateInit with more compression options.  The
+   fields next_in, zalloc, zfree and opaque must be initialized before by the
+   caller.
+
+     The method parameter is the compression method.  It must be Z_DEFLATED in
+   this version of the library.
+
+     The windowBits parameter is the base two logarithm of the window size
+   (the size of the history buffer).  It should be in the range 8..15 for this
+   version of the library.  Larger values of this parameter result in better
+   compression at the expense of memory usage.  The default value is 15 if
+   deflateInit is used instead.
+
+     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
+   determines the window size.  deflate() will then generate raw deflate data
+   with no zlib header or trailer, and will not compute an adler32 check value.
+
+     windowBits can also be greater than 15 for optional gzip encoding.  Add
+   16 to windowBits to write a simple gzip header and trailer around the
+   compressed data instead of a zlib wrapper.  The gzip header will have no
+   file name, no extra data, no comment, no modification time (set to zero), no
+   header crc, and the operating system will be set to 255 (unknown).  If a
+   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+
+     The memLevel parameter specifies how much memory should be allocated
+   for the internal compression state.  memLevel=1 uses minimum memory but is
+   slow and reduces compression ratio; memLevel=9 uses maximum memory for
+   optimal speed.  The default value is 8.  See zconf.h for total memory usage
+   as a function of windowBits and memLevel.
+
+     The strategy parameter is used to tune the compression algorithm.  Use the
+   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+   string match), or Z_RLE to limit match distances to one (run-length
+   encoding).  Filtered data consists mostly of small values with a somewhat
+   random distribution.  In this case, the compression algorithm is tuned to
+   compress them better.  The effect of Z_FILTERED is to force more Huffman
+   coding and less string matching; it is somewhat intermediate between
+   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
+   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
+   strategy parameter only affects the compression ratio but not the
+   correctness of the compressed output even if it is not set appropriately.
+   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
+   decoder for special applications.
+
+     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
+   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
+   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
+   set to null if there is no error message.  deflateInit2 does not perform any
+   compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the compression dictionary from the given byte sequence
+   without producing any compressed output.  This function must be called
+   immediately after deflateInit, deflateInit2 or deflateReset, before any call
+   of deflate.  The compressor and decompressor must use exactly the same
+   dictionary (see inflateSetDictionary).
+
+     The dictionary should consist of strings (byte sequences) that are likely
+   to be encountered later in the data to be compressed, with the most commonly
+   used strings preferably put towards the end of the dictionary.  Using a
+   dictionary is most useful when the data to be compressed is short and can be
+   predicted with good accuracy; the data can then be compressed better than
+   with the default empty dictionary.
+
+     Depending on the size of the compression data structures selected by
+   deflateInit or deflateInit2, a part of the dictionary may in effect be
+   discarded, for example if the dictionary is larger than the window size
+   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
+   useful should be put at the end of the dictionary, not at the front.  In
+   addition, the current implementation of deflate will use at most the window
+   size minus 262 bytes of the provided dictionary.
+
+     Upon return of this function, strm->adler is set to the adler32 value
+   of the dictionary; the decompressor may later use this value to determine
+   which dictionary has been used by the compressor.  (The adler32 value
+   applies to the whole dictionary even if only a subset of the dictionary is
+   actually used by the compressor.) If a raw deflate was requested, then the
+   adler32 value is not computed and strm->adler is not set.
+
+     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   inconsistent (for example if deflate has already been called for this stream
+   or if the compression method is bsort).  deflateSetDictionary does not
+   perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when several compression strategies will be
+   tried, for example when there are several ways of pre-processing the input
+   data with a filter.  The streams that will be discarded should then be freed
+   by calling deflateEnd.  Note that deflateCopy duplicates the internal
+   compression state which can be quite large, so this strategy is slow and can
+   consume lots of memory.
+
+     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to deflateEnd followed by deflateInit,
+   but does not free and reallocate all the internal compression state.  The
+   stream will keep the same compression level and any other attributes that
+   may have been set by deflateInit2.
+
+     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+                                      int level,
+                                      int strategy));
+/*
+     Dynamically update the compression level and compression strategy.  The
+   interpretation of level and strategy is as in deflateInit2.  This can be
+   used to switch between compression and straight copy of the input data, or
+   to switch to a different kind of input data requiring a different strategy.
+   If the compression level is changed, the input available so far is
+   compressed with the old level (and may be flushed); the new level will take
+   effect only at the next call of deflate().
+
+     Before the call of deflateParams, the stream state must be set as for
+   a call of deflate(), since the currently available input may have to be
+   compressed and flushed.  In particular, strm->avail_out must be non-zero.
+
+     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
+   strm->avail_out was zero.
+*/
+
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
+                                    int good_length,
+                                    int max_lazy,
+                                    int nice_length,
+                                    int max_chain));
+/*
+     Fine tune deflate's internal compression parameters.  This should only be
+   used by someone who understands the algorithm used by zlib's deflate for
+   searching for the best matching string, and even then only by the most
+   fanatic optimizer trying to squeeze out the last compressed bit for their
+   specific input data.  Read the deflate.c source code for the meaning of the
+   max_lazy, good_length, nice_length, and max_chain parameters.
+
+     deflateTune() can be called after deflateInit() or deflateInit2(), and
+   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+                                       uLong sourceLen));
+/*
+     deflateBound() returns an upper bound on the compressed size after
+   deflation of sourceLen bytes.  It must be called after deflateInit() or
+   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
+   to allocate an output buffer for deflation in a single pass, and so would be
+   called before deflate().
+*/
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     deflatePrime() inserts bits in the deflate output stream.  The intent
+   is that this function is used to start off the deflate output with the bits
+   leftover from a previous deflate stream when appending to it.  As such, this
+   function can only be used for raw deflate, and must be used before the first
+   deflate() call after a deflateInit2() or deflateReset().  bits must be less
+   than or equal to 16, and that many of the least significant bits of value
+   will be inserted in the output.
+
+     deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+     deflateSetHeader() provides gzip header information for when a gzip
+   stream is requested by deflateInit2().  deflateSetHeader() may be called
+   after deflateInit2() or deflateReset() and before the first call of
+   deflate().  The text, time, os, extra field, name, and comment information
+   in the provided gz_header structure are written to the gzip header (xflag is
+   ignored -- the extra flags are set according to the compression level).  The
+   caller must assure that, if not Z_NULL, name and comment are terminated with
+   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+   available there.  If hcrc is true, a gzip header crc is included.  Note that
+   the current versions of the command-line version of gzip (up through version
+   1.3.x) do not support header crc's, and will report that it is a "multi-part
+   gzip file" and give up.
+
+     If deflateSetHeader is not used, the default gzip header has text false,
+   the time set to zero, and os set to 255, with no extra, name, or comment
+   fields.  The gzip header is returned to the default state by deflateReset().
+
+     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+                                     int  windowBits));
+
+     This is another version of inflateInit with an extra parameter.  The
+   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+   before by the caller.
+
+     The windowBits parameter is the base two logarithm of the maximum window
+   size (the size of the history buffer).  It should be in the range 8..15 for
+   this version of the library.  The default value is 15 if inflateInit is used
+   instead.  windowBits must be greater than or equal to the windowBits value
+   provided to deflateInit2() while compressing, or it must be equal to 15 if
+   deflateInit2() was not used.  If a compressed stream with a larger window
+   size is given as input, inflate() will return with the error code
+   Z_DATA_ERROR instead of trying to allocate a larger window.
+
+     windowBits can also be zero to request that inflate use the window size in
+   the zlib header of the compressed stream.
+
+     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
+   determines the window size.  inflate() will then process raw deflate data,
+   not looking for a zlib or gzip header, not generating a check value, and not
+   looking for any check values for comparison at the end of the stream.  This
+   is for use with other formats that use the deflate compressed data format
+   such as zip.  Those formats provide their own check values.  If a custom
+   format is developed using the raw deflate format for compressed data, it is
+   recommended that a check value such as an adler32 or a crc32 be applied to
+   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
+   most applications, the zlib format should be used as is.  Note that comments
+   above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+     windowBits can also be greater than 15 for optional gzip decoding.  Add
+   32 to windowBits to enable zlib and gzip decoding with automatic header
+   detection, or add 16 to decode only the gzip format (the zlib format will
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
+   crc32 instead of an adler32.
+
+     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit2 does not perform any decompression
+   apart from possibly reading the zlib header if present: actual decompression
+   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out and avail_out are unused and unchanged.) The current implementation
+   of inflateInit2() does not process any header information -- that is
+   deferred until inflate() is called.
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the decompression dictionary from the given uncompressed byte
+   sequence.  This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
+   can be determined from the adler32 value returned by that call of inflate.
+   The compressor and decompressor must use exactly the same dictionary (see
+   deflateSetDictionary).  For raw inflate, this function can be called
+   immediately after inflateInit2() or inflateReset() and before any call of
+   inflate() to set the dictionary.  The application must insure that the
+   dictionary that was used for compression is provided.
+
+     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+   expected one (incorrect adler32 value).  inflateSetDictionary does not
+   perform any decompression: this will be done by subsequent calls of
+   inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+     Skips invalid compressed data until a full flush point (see above the
+   description of deflate with Z_FULL_FLUSH) can be found, or until all
+   available input is skipped.  No output is provided.
+
+     inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
+   if no more input was provided, Z_DATA_ERROR if no flush point has been
+   found, or Z_STREAM_ERROR if the stream structure was inconsistent.  In the
+   success case, the application may save the current current value of total_in
+   which indicates where valid compressed data was found.  In the error case,
+   the application may repeatedly call inflateSync, providing more input each
+   time, until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when randomly accessing a large stream.  The
+   first pass through the stream can periodically record the inflate state,
+   allowing restarting inflate at those points when randomly accessing the
+   stream.
+
+     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to inflateEnd followed by inflateInit,
+   but does not free and reallocate all the internal decompression state.  The
+   stream will keep attributes that may have been set by inflateInit2.
+
+     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
+                                      int windowBits));
+/*
+     This function is the same as inflateReset, but it also permits changing
+   the wrap and window size requests.  The windowBits parameter is interpreted
+   the same as it is for inflateInit2.
+
+     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
+   the windowBits parameter is invalid.
+*/
+
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     This function inserts bits in the inflate input stream.  The intent is
+   that this function is used to start inflating at a bit position in the
+   middle of a byte.  The provided bits will be used before any bytes are used
+   from next_in.  This function should only be used with raw inflate, and
+   should be used before the first inflate() call after inflateInit2() or
+   inflateReset().  bits must be less than or equal to 16, and that many of the
+   least significant bits of value will be inserted in the input.
+
+     If bits is negative, then the input stream bit buffer is emptied.  Then
+   inflatePrime() can be called again to put bits in the buffer.  This is used
+   to clear out bits leftover after feeding inflate a block description prior
+   to feeding inflate codes.
+
+     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+/*
+     This function returns two values, one in the lower 16 bits of the return
+   value, and the other in the remaining upper bits, obtained by shifting the
+   return value down 16 bits.  If the upper value is -1 and the lower value is
+   zero, then inflate() is currently decoding information outside of a block.
+   If the upper value is -1 and the lower value is non-zero, then inflate is in
+   the middle of a stored block, with the lower value equaling the number of
+   bytes from the input remaining to copy.  If the upper value is not -1, then
+   it is the number of bits back from the current bit position in the input of
+   the code (literal or length/distance pair) currently being processed.  In
+   that case the lower value is the number of bytes already emitted for that
+   code.
+
+     A code is being processed if inflate is waiting for more input to complete
+   decoding of the code, or if it has completed decoding but is waiting for
+   more output space to write the literal or match data.
+
+     inflateMark() is used to mark locations in the input data for random
+   access, which may be at bit positions, and to note those cases where the
+   output of a code may span boundaries of random access blocks.  The current
+   location in the input stream can be determined from avail_in and data_type
+   as noted in the description for the Z_BLOCK flush parameter for inflate.
+
+     inflateMark returns the value noted above or -1 << 16 if the provided
+   source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+     inflateGetHeader() requests that gzip header information be stored in the
+   provided gz_header structure.  inflateGetHeader() may be called after
+   inflateInit2() or inflateReset(), and before the first call of inflate().
+   As inflate() processes the gzip stream, head->done is zero until the header
+   is completed, at which time head->done is set to one.  If a zlib stream is
+   being decoded, then head->done is set to -1 to indicate that there will be
+   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
+   used to force inflate() to return immediately after header processing is
+   complete and before any actual data is decompressed.
+
+     The text, time, xflags, and os fields are filled in with the gzip header
+   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
+   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
+   contains the maximum number of bytes to write to extra.  Once done is true,
+   extra_len contains the actual extra field length, and extra contains the
+   extra field, or that field truncated if extra_max is less than extra_len.
+   If name is not Z_NULL, then up to name_max characters are written there,
+   terminated with a zero unless the length is greater than name_max.  If
+   comment is not Z_NULL, then up to comm_max characters are written there,
+   terminated with a zero unless the length is greater than comm_max.  When any
+   of extra, name, or comment are not Z_NULL and the respective field is not
+   present in the header, then that field is set to Z_NULL to signal its
+   absence.  This allows the use of deflateSetHeader() with the returned
+   structure to duplicate the header.  However if those fields are set to
+   allocated memory, then the application will need to save those pointers
+   elsewhere so that they can be eventually freed.
+
+     If inflateGetHeader is not used, then the header information is simply
+   discarded.  The header is always checked for validity, including the header
+   CRC if present.  inflateReset() will reset the process to discard the header
+   information.  The application would need to call inflateGetHeader() again to
+   retrieve the header from the next gzip stream.
+
+     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+                                        unsigned char FAR *window));
+
+     Initialize the internal stream state for decompression using inflateBack()
+   calls.  The fields zalloc, zfree and opaque in strm must be initialized
+   before the call.  If zalloc and zfree are Z_NULL, then the default library-
+   derived memory allocation routines are used.  windowBits is the base two
+   logarithm of the window size, in the range 8..15.  window is a caller
+   supplied buffer of that size.  Except for special applications where it is
+   assured that deflate was used with small window sizes, windowBits must be 15
+   and a 32K byte window must be supplied to be able to decompress general
+   deflate streams.
+
+     See inflateBack() for the usage of these routines.
+
+     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+   the paramaters are invalid, Z_MEM_ERROR if the internal state could not be
+   allocated, or Z_VERSION_ERROR if the version of the library does not match
+   the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+                                    in_func in, void FAR *in_desc,
+                                    out_func out, void FAR *out_desc));
+/*
+     inflateBack() does a raw inflate with a single call using a call-back
+   interface for input and output.  This is more efficient than inflate() for
+   file i/o applications in that it avoids copying between the output and the
+   sliding window by simply making the window itself the output buffer.  This
+   function trusts the application to not change the output buffer passed by
+   the output function, at least until inflateBack() returns.
+
+     inflateBackInit() must be called first to allocate the internal state
+   and to initialize the state with the user-provided window buffer.
+   inflateBack() may then be used multiple times to inflate a complete, raw
+   deflate stream with each call.  inflateBackEnd() is then called to free the
+   allocated state.
+
+     A raw deflate stream is one with no zlib or gzip header or trailer.
+   This routine would normally be used in a utility that reads zip or gzip
+   files and writes out uncompressed files.  The utility would decode the
+   header and process the trailer on its own, hence this routine expects only
+   the raw deflate stream to decompress.  This is different from the normal
+   behavior of inflate(), which expects either a zlib or gzip header and
+   trailer around the deflate stream.
+
+     inflateBack() uses two subroutines supplied by the caller that are then
+   called by inflateBack() for input and output.  inflateBack() calls those
+   routines until it reads a complete deflate stream and writes out all of the
+   uncompressed data, or until it encounters an error.  The function's
+   parameters and return types are defined above in the in_func and out_func
+   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
+   number of bytes of provided input, and a pointer to that input in buf.  If
+   there is no input available, in() must return zero--buf is ignored in that
+   case--and inflateBack() will return a buffer error.  inflateBack() will call
+   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
+   should return zero on success, or non-zero on failure.  If out() returns
+   non-zero, inflateBack() will return with an error.  Neither in() nor out()
+   are permitted to change the contents of the window provided to
+   inflateBackInit(), which is also the buffer that out() uses to write from.
+   The length written by out() will be at most the window size.  Any non-zero
+   amount of input may be provided by in().
+
+     For convenience, inflateBack() can be provided input on the first call by
+   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
+   in() will be called.  Therefore strm->next_in must be initialized before
+   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
+   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
+   must also be initialized, and then if strm->avail_in is not zero, input will
+   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
+
+     The in_desc and out_desc parameters of inflateBack() is passed as the
+   first parameter of in() and out() respectively when they are called.  These
+   descriptors can be optionally used to pass any information that the caller-
+   supplied in() and out() functions need to do their job.
+
+     On return, inflateBack() will set strm->next_in and strm->avail_in to
+   pass back any unused input that was provided by the last in() call.  The
+   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
+   in the deflate stream (in which case strm->msg is set to indicate the nature
+   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
+   In the case of Z_BUF_ERROR, an input or output error can be distinguished
+   using strm->next_in which will be Z_NULL only if in() returned an error.  If
+   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
+   non-zero.  (in() will always be called before out(), so strm->next_in is
+   assured to be defined if out() returns non-zero.) Note that inflateBack()
+   cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+/*
+     All memory allocated by inflateBackInit() is freed.
+
+     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+   state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+     1.0: size of uInt
+     3.2: size of uLong
+     5.4: size of voidpf (pointer)
+     7.6: size of z_off_t
+
+    Compiler, assembler, and debug options:
+     8: DEBUG
+     9: ASMV or ASMINF -- use ASM code
+     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+     11: 0 (reserved)
+
+    One-time table building (smaller code, but not thread-safe if true):
+     12: BUILDFIXED -- build static block decoding tables when needed
+     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+     14,15: 0 (reserved)
+
+    Library content (indicates missing functionality):
+     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+                          deflate code when not needed)
+     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+                    and decode gzip streams (to avoid linking crc code)
+     18-19: 0 (reserved)
+
+    Operation variations (changes in library functionality):
+     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+     21: FASTEST -- deflate algorithm with only one, lowest compression level
+     22,23: 0 (reserved)
+
+    The sprintf variant used by gzprintf (zero is best):
+     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+    Remainder:
+     27-31: 0 (reserved)
+ */
+
+
+                        /* utility functions */
+
+/*
+     The following utility functions are implemented on top of the basic
+   stream-oriented functions.  To simplify the interface, some default options
+   are assumed (compression level and memory usage, standard memory allocation
+   functions).  The source code of these utility functions can be modified if
+   you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+/*
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
+   compressed buffer.
+
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
+                                  const Bytef *source, uLong sourceLen,
+                                  int level));
+/*
+     Compresses the source buffer into the destination buffer.  The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer.  Upon entry, destLen is the total size of the
+   destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
+   compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+     compressBound() returns an upper bound on the compressed size after
+   compress() or compress2() on sourceLen bytes.  It would be used before a
+   compress() or compress2() call to allocate the destination buffer.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+/*
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be large enough to hold the entire
+   uncompressed data.  (The size of the uncompressed data must have been saved
+   previously by the compressor and transmitted to the decompressor by some
+   mechanism outside the scope of this compression library.) Upon exit, destLen
+   is the actual size of the uncompressed buffer.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
+*/
+
+
+                        /* gzip file access functions */
+
+/*
+     This library supports reading and writing files in gzip (.gz) format with
+   an interface similar to that of stdio, using the functions that start with
+   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
+   wrapper, documented in RFC 1952, wrapped around a deflate stream.
+*/
+
+typedef voidp gzFile;       /* opaque gzip file descriptor */
+
+/*
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+
+     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
+   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
+   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
+   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
+   for fixed code compression as in "wb9F".  (See the description of
+   deflateInit2 for more information about the strategy parameter.) Also "a"
+   can be used instead of "w" to request that the gzip stream that will be
+   written be appended to the file.  "+" will result in an error, since reading
+   and writing to the same gzip file is not supported.
+
+     gzopen can be used to read a file which is not in gzip format; in this
+   case gzread will directly read from the file without decompression.
+
+     gzopen returns NULL if the file could not be opened, if there was
+   insufficient memory to allocate the gzFile state, or if an invalid mode was
+   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
+   errno can be checked to determine if the reason gzopen failed was that the
+   file could not be opened.
+*/
+
+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+/*
+     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
+   are obtained from calls like open, dup, creat, pipe or fileno (if the file
+   has been previously opened with fopen).  The mode parameter is as in gzopen.
+
+     The next call of gzclose on the returned gzFile will also close the file
+   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
+   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
+   mode);.  The duplicated descriptor should be saved to avoid a leak, since
+   gzdopen does not close fd if it fails.
+
+     gzdopen returns NULL if there was insufficient memory to allocate the
+   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
+   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
+   used until the next gz* read, write, seek, or close operation, so gzdopen
+   will not detect if fd is invalid (unless fd is -1).
+*/
+
+ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
+/*
+     Set the internal buffer size used by this library's functions.  The
+   default buffer size is 8192 bytes.  This function must be called after
+   gzopen() or gzdopen(), and before any other calls that read or write the
+   file.  The buffer memory allocation is always deferred to the first read or
+   write.  Two buffers are allocated, either both of the specified size when
+   writing, or one of the specified size and the other twice that size when
+   reading.  A larger buffer size of, for example, 64K or 128K bytes will
+   noticeably increase the speed of decompression (reading).
+
+     The new buffer size also affects the maximum length for gzprintf().
+
+     gzbuffer() returns 0 on success, or -1 on failure, such as being called
+   too late.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+     Dynamically update the compression level or strategy.  See the description
+   of deflateInit2 for the meaning of these parameters.
+
+     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+   opened for writing.
+*/
+
+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+/*
+     Reads the given number of uncompressed bytes from the compressed file.  If
+   the input file was not in gzip format, gzread copies the given number of
+   bytes into the buffer.
+
+     After reaching the end of a gzip stream in the input, gzread will continue
+   to read, looking for another gzip stream, or failing that, reading the rest
+   of the input file directly without decompression.  The entire input file
+   will be read if gzread is called until it returns less than the requested
+   len.
+
+     gzread returns the number of uncompressed bytes actually read, less than
+   len for end of file, or -1 for error.
+*/
+
+ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
+                                voidpc buf, unsigned len));
+/*
+     Writes the given number of uncompressed bytes into the compressed file.
+   gzwrite returns the number of uncompressed bytes written or 0 in case of
+   error.
+*/
+
+ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
+/*
+     Converts, formats, and writes the arguments to the compressed file under
+   control of the format string, as in fprintf.  gzprintf returns the number of
+   uncompressed bytes actually written, or 0 in case of error.  The number of
+   uncompressed bytes written is limited to 8191, or one less than the buffer
+   size given to gzbuffer().  The caller should assure that this limit is not
+   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
+   nothing written.  In this case, there may also be a buffer overflow with
+   unpredictable consequences, which is possible only if zlib was compiled with
+   the insecure functions sprintf() or vsprintf() because the secure snprintf()
+   or vsnprintf() functions were not available.  This can be determined using
+   zlibCompileFlags().
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+     Writes the given null-terminated string to the compressed file, excluding
+   the terminating null character.
+
+     gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+     Reads bytes from the compressed file until len-1 characters are read, or a
+   newline character is read and transferred to buf, or an end-of-file
+   condition is encountered.  If any characters are read or if len == 1, the
+   string is terminated with a null character.  If no characters are read due
+   to an end-of-file or len < 1, then the buffer is left untouched.
+
+     gzgets returns buf which is a null-terminated string, or it returns NULL
+   for end-of-file or in case of error.  If there was an error, the contents at
+   buf are indeterminate.
+*/
+
+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+/*
+     Writes c, converted to an unsigned char, into the compressed file.  gzputc
+   returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+/*
+     Reads one byte from the compressed file.  gzgetc returns this byte or -1
+   in case of end of file or error.
+*/
+
+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+/*
+     Push one character back onto the stream to be read as the first character
+   on the next read.  At least one character of push-back is allowed.
+   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
+   fail if c is -1, and may fail if a character has been pushed but not read
+   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
+   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
+   The pushed character will be discarded if the stream is repositioned with
+   gzseek() or gzrewind().
+*/
+
+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+/*
+     Flushes all pending output into the compressed file.  The parameter flush
+   is as in the deflate() function.  The return value is the zlib error number
+   (see function gzerror below).  gzflush is only permitted when writing.
+
+     If the flush parameter is Z_FINISH, the remaining data is written and the
+   gzip stream is completed in the output.  If gzwrite() is called again, a new
+   gzip stream will be started in the output.  gzread() is able to read such
+   concatented gzip streams.
+
+     gzflush should be called only when strictly necessary because it will
+   degrade compression if called too often.
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
+                                   z_off_t offset, int whence));
+
+     Sets the starting position for the next gzread or gzwrite on the given
+   compressed file.  The offset represents a number of bytes in the
+   uncompressed data stream.  The whence parameter is defined as in lseek(2);
+   the value SEEK_END is not supported.
+
+     If the file is opened for reading, this function is emulated but can be
+   extremely slow.  If the file is opened for writing, only forward seeks are
+   supported; gzseek then compresses a sequence of zeroes up to the new
+   starting position.
+
+     gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error, in
+   particular if the file is opened for writing and the new starting position
+   would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+/*
+     Rewinds the given file. This function is supported only for reading.
+
+     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+
+     Returns the starting position for the next gzread or gzwrite on the given
+   compressed file.  This position represents a number of bytes in the
+   uncompressed data stream, and is zero when starting, even if appending or
+   reading a gzip stream from the middle of a file using gzdopen().
+
+     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
+
+     Returns the current offset in the file being read or written.  This offset
+   includes the count of bytes that precede the gzip stream, for example when
+   appending or when using gzdopen() for reading.  When reading, the offset
+   does not include as yet unused buffered input.  This information can be used
+   for a progress indicator.  On error, gzoffset() returns -1.
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+     Returns true (1) if the end-of-file indicator has been set while reading,
+   false (0) otherwise.  Note that the end-of-file indicator is set only if the
+   read tried to go past the end of the input, but came up short.  Therefore,
+   just like feof(), gzeof() may return false even if there is no more data to
+   read, in the event that the last read request was for the exact number of
+   bytes remaining in the input file.  This will happen if the input file size
+   is an exact multiple of the buffer size.
+
+     If gzeof() returns true, then the read functions will return no more data,
+   unless the end-of-file indicator is reset by gzclearerr() and the input file
+   has grown since the previous end of file was detected.
+*/
+
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+     Returns true (1) if file is being copied directly while reading, or false
+   (0) if file is a gzip stream being decompressed.  This state can change from
+   false to true while reading the input file if the end of a gzip stream is
+   reached, but is followed by data that is not another gzip stream.
+
+     If the input file is empty, gzdirect() will return true, since the input
+   does not contain a gzip stream.
+
+     If gzdirect() is used immediately after gzopen() or gzdopen() it will
+   cause buffers to be allocated to allow reading the file to determine if it
+   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
+   gzdirect().
+*/
+
+ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+/*
+     Flushes all pending output if necessary, closes the compressed file and
+   deallocates the (de)compression state.  Note that once file is closed, you
+   cannot call gzerror with file, since its structures have been deallocated.
+   gzclose must not be called more than once on the same file, just as free
+   must not be called more than once on the same allocation.
+
+     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
+   file operation error, or Z_OK on success.
+*/
+
+ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
+/*
+     Same as gzclose(), but gzclose_r() is only for use when reading, and
+   gzclose_w() is only for use when writing or appending.  The advantage to
+   using these instead of gzclose() is that they avoid linking in zlib
+   compression or decompression code that is not used when only reading or only
+   writing respectively.  If gzclose() is used, then both compression and
+   decompression code will be included the application when linking to a static
+   zlib library.
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+     Returns the error message for the last error which occurred on the given
+   compressed file.  errnum is set to zlib error number.  If an error occurred
+   in the file system and not in the compression library, errnum is set to
+   Z_ERRNO and the application may consult errno to get the exact error code.
+
+     The application must not modify the returned string.  Future calls to
+   this function may invalidate the previously returned string.  If file is
+   closed, then the string previously returned by gzerror will no longer be
+   available.
+
+     gzerror() should be used to distinguish errors from end-of-file for those
+   functions above that do not distinguish those cases in their return values.
+*/
+
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+     Clears the error and end-of-file flags for file.  This is analogous to the
+   clearerr() function in stdio.  This is useful for continuing to read a gzip
+   file that is being written concurrently.
+*/
+
+
+                        /* checksum functions */
+
+/*
+     These functions are not related to compression but are exported
+   anyway because they might be useful in applications using the compression
+   library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+/*
+     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+   return the updated checksum.  If buf is Z_NULL, this function returns the
+   required initial value for the checksum.
+
+     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+   much faster.
+
+   Usage example:
+
+     uLong adler = adler32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       adler = adler32(adler, buffer, length);
+     }
+     if (adler != original_adler) error();
+*/
+
+/*
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+                                          z_off_t len2));
+
+     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
+   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
+*/
+
+ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
+/*
+     Update a running CRC-32 with the bytes buf[0..len-1] and return the
+   updated CRC-32.  If buf is Z_NULL, this function returns the required
+   initial value for the for the crc.  Pre- and post-conditioning (one's
+   complement) is performed within this function so it shouldn't be done by the
+   application.
+
+   Usage example:
+
+     uLong crc = crc32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       crc = crc32(crc, buffer, length);
+     }
+     if (crc != original_crc) error();
+*/
+
+/*
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+     Combine two CRC-32 check values into one.  For two sequences of bytes,
+   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
+   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+   len2.
+*/
+
+
+                        /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
+                                      int windowBits, int memLevel,
+                                      int strategy, const char *version,
+                                      int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
+                                      const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
+                                         unsigned char FAR *window,
+                                         const char *version,
+                                         int stream_size));
+#define deflateInit(strm, level) \
+        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit(strm) \
+        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit2(strm, windowBits) \
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+#define inflateBackInit(strm, windowBits, window) \
+        inflateBackInit_((strm), (windowBits), (window), \
+                                            ZLIB_VERSION, sizeof(z_stream))
+
+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
+ * both are true, the application gets the *64 functions, and the regular
+ * functions are changed to 64 bits) -- in case these are set on systems
+ * without large file support, _LFS64_LARGEFILE must also be true
+ */
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
+   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+#endif
+
+#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
+#  define gzopen gzopen64
+#  define gzseek gzseek64
+#  define gztell gztell64
+#  define gzoffset gzoffset64
+#  define adler32_combine adler32_combine64
+#  define crc32_combine crc32_combine64
+#  ifdef _LARGEFILE64_SOURCE
+     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+#  endif
+#else
+   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
+   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
+   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+#endif
+
+/* hack for buggy compilers */
+#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
+    struct internal_state {int dummy;};
+#endif
+
+/* undocumented functions */
+ZEXTERN const char   * ZEXPORT zError           OF((int));
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
+ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZLIB_H */
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.map b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.map
new file mode 100644
index 00000000..f282d362
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.map
@@ -0,0 +1,68 @@
+ZLIB_1.2.0 {
+  global:
+    compressBound;
+    deflateBound;
+    inflateBack;
+    inflateBackEnd;
+    inflateBackInit_;
+    inflateCopy;
+  local:
+    deflate_copyright;
+    inflate_copyright;
+    inflate_fast;
+    inflate_table;
+    zcalloc;
+    zcfree;
+    z_errmsg;
+    gz_error;
+    gz_intmax;
+    _*;
+};
+
+ZLIB_1.2.0.2 {
+    gzclearerr;
+    gzungetc;
+    zlibCompileFlags;
+} ZLIB_1.2.0;
+
+ZLIB_1.2.0.8 {
+    deflatePrime;
+} ZLIB_1.2.0.2;
+
+ZLIB_1.2.2 {
+    adler32_combine;
+    crc32_combine;
+    deflateSetHeader;
+    inflateGetHeader;
+} ZLIB_1.2.0.8;
+
+ZLIB_1.2.2.3 {
+    deflateTune;
+    gzdirect;
+} ZLIB_1.2.2;
+
+ZLIB_1.2.2.4 {
+    inflatePrime;
+} ZLIB_1.2.2.3;
+
+ZLIB_1.2.3.3 {
+    adler32_combine64;
+    crc32_combine64;
+    gzopen64;
+    gzseek64;
+    gztell64;
+    inflateUndermine;
+} ZLIB_1.2.2.4;
+
+ZLIB_1.2.3.4 {
+    inflateReset2;
+    inflateMark;
+} ZLIB_1.2.3.3;
+
+ZLIB_1.2.3.5 {
+    gzbuffer;
+    gzoffset;
+    gzoffset64;
+    gzclose_r;
+    gzclose_w;
+} ZLIB_1.2.3.4;
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.pc.in b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.pc.in
new file mode 100644
index 00000000..7e5acf9c
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+sharedlibdir=@sharedlibdir@
+includedir=@includedir@
+
+Name: zlib
+Description: zlib compression library
+Version: @VERSION@
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -lz
+Cflags: -I${includedir}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib2ansi b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib2ansi
new file mode 100644
index 00000000..15e3e165
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zlib2ansi
@@ -0,0 +1,152 @@
+#!/usr/bin/perl
+
+# Transform K&R C function definitions into ANSI equivalent.
+#
+# Author: Paul Marquess
+# Version: 1.0
+# Date: 3 October 2006
+
+# TODO
+#
+# Asumes no function pointer parameters. unless they are typedefed.
+# Assumes no literal strings that look like function definitions
+# Assumes functions start at the beginning of a line
+
+use strict;
+use warnings;
+
+local $/;
+$_ = <>;
+
+my $sp = qr{ \s* (?: /\* .*? \*/ )? \s* }x; # assume no nested comments
+
+my $d1    = qr{ $sp (?: [\w\*\s]+ $sp)* $sp \w+ $sp [\[\]\s]* $sp }x ;
+my $decl  = qr{ $sp (?: \w+ $sp )+ $d1 }xo ;
+my $dList = qr{ $sp $decl (?: $sp , $d1 )* $sp ; $sp }xo ;
+
+
+while (s/^
+            (                  # Start $1
+                (              #   Start $2
+                    .*?        #     Minimal eat content
+                    ( ^ \w [\w\s\*]+ )    #     $3 -- function name
+                    \s*        #     optional whitespace
+                )              # $2 - Matched up to before parameter list
+
+                \( \s*         # Literal "(" + optional whitespace
+                ( [^\)]+ )     # $4 - one or more anythings except ")"
+                \s* \)         # optional whitespace surrounding a Literal ")"
+
+                ( (?: $dList )+ ) # $5
+
+                $sp ^ {        # literal "{" at start of line
+            )                  # Remember to $1
+        //xsom
+      )
+{
+    my $all = $1 ;
+    my $prefix = $2;
+    my $param_list = $4 ;
+    my $params = $5;
+
+    StripComments($params);
+    StripComments($param_list);
+    $param_list =~ s/^\s+//;
+    $param_list =~ s/\s+$//;
+
+    my $i = 0 ;
+    my %pList = map { $_ => $i++ }
+                split /\s*,\s*/, $param_list;
+    my $pMatch = '(\b' . join('|', keys %pList) . '\b)\W*$' ;
+
+    my @params = split /\s*;\s*/, $params;
+    my @outParams = ();
+    foreach my $p (@params)
+    {
+        if ($p =~ /,/)
+        {
+            my @bits = split /\s*,\s*/, $p;
+            my $first = shift @bits;
+            $first =~ s/^\s*//;
+            push @outParams, $first;
+            $first =~ /^(\w+\s*)/;
+            my $type = $1 ;
+            push @outParams, map { $type . $_ } @bits;
+        }
+        else
+        {
+            $p =~ s/^\s+//;
+            push @outParams, $p;
+        }
+    }
+
+
+    my %tmp = map { /$pMatch/;  $_ => $pList{$1}  }
+              @outParams ;
+
+    @outParams = map  { "    $_" }
+                 sort { $tmp{$a} <=> $tmp{$b} }
+                 @outParams ;
+
+    print $prefix ;
+    print "(\n" . join(",\n", @outParams) . ")\n";
+    print "{" ;
+
+}
+
+# Output any trailing code.
+print ;
+exit 0;
+
+
+sub StripComments
+{
+
+  no warnings;
+
+  # Strip C & C++ coments
+  # From the perlfaq
+  $_[0] =~
+
+    s{
+       /\*         ##  Start of /* ... */ comment
+       [^*]*\*+    ##  Non-* followed by 1-or-more *'s
+       (
+         [^/*][^*]*\*+
+       )*          ##  0-or-more things which don't start with /
+                   ##    but do end with '*'
+       /           ##  End of /* ... */ comment
+
+     |         ##     OR  C++ Comment
+       //          ## Start of C++ comment //
+       [^\n]*      ## followed by 0-or-more non end of line characters
+
+     |         ##     OR  various things which aren't comments:
+
+       (
+         "           ##  Start of " ... " string
+         (
+           \\.           ##  Escaped char
+         |               ##    OR
+           [^"\\]        ##  Non "\
+         )*
+         "           ##  End of " ... " string
+
+       |         ##     OR
+
+         '           ##  Start of ' ... ' string
+         (
+           \\.           ##  Escaped char
+         |               ##    OR
+           [^'\\]        ##  Non '\
+         )*
+         '           ##  End of ' ... ' string
+
+       |         ##     OR
+
+         .           ##  Anything other char
+         [^/"'\\]*   ##  Chars which doesn't start a comment, string or escape
+       )
+     }{$2}gxs;
+
+}
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zutil.c b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zutil.c
new file mode 100644
index 00000000..d9451be7
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zutil.c
@@ -0,0 +1,318 @@
+/* zutil.c -- target dependent utility functions for the compression library
+ * Copyright (C) 1995-2005, 2010 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: zutil.c 246 2010-04-23 10:54:55Z nijtmans $ */
+
+#include "zutil.h"
+
+#ifndef NO_DUMMY_DECL
+struct internal_state      {int dummy;}; /* for buggy compilers */
+#endif
+
+const char * const z_errmsg[10] = {
+"need dictionary",     /* Z_NEED_DICT       2  */
+"stream end",          /* Z_STREAM_END      1  */
+"",                    /* Z_OK              0  */
+"file error",          /* Z_ERRNO         (-1) */
+"stream error",        /* Z_STREAM_ERROR  (-2) */
+"data error",          /* Z_DATA_ERROR    (-3) */
+"insufficient memory", /* Z_MEM_ERROR     (-4) */
+"buffer error",        /* Z_BUF_ERROR     (-5) */
+"incompatible version",/* Z_VERSION_ERROR (-6) */
+""};
+
+
+const char * ZEXPORT zlibVersion()
+{
+    return ZLIB_VERSION;
+}
+
+uLong ZEXPORT zlibCompileFlags()
+{
+    uLong flags;
+
+    flags = 0;
+    switch ((int)(sizeof(uInt))) {
+    case 2:     break;
+    case 4:     flags += 1;     break;
+    case 8:     flags += 2;     break;
+    default:    flags += 3;
+    }
+    switch ((int)(sizeof(uLong))) {
+    case 2:     break;
+    case 4:     flags += 1 << 2;        break;
+    case 8:     flags += 2 << 2;        break;
+    default:    flags += 3 << 2;
+    }
+    switch ((int)(sizeof(voidpf))) {
+    case 2:     break;
+    case 4:     flags += 1 << 4;        break;
+    case 8:     flags += 2 << 4;        break;
+    default:    flags += 3 << 4;
+    }
+    switch ((int)(sizeof(z_off_t))) {
+    case 2:     break;
+    case 4:     flags += 1 << 6;        break;
+    case 8:     flags += 2 << 6;        break;
+    default:    flags += 3 << 6;
+    }
+#ifdef DEBUG
+    flags += 1 << 8;
+#endif
+#if defined(ASMV) || defined(ASMINF)
+    flags += 1 << 9;
+#endif
+#ifdef ZLIB_WINAPI
+    flags += 1 << 10;
+#endif
+#ifdef BUILDFIXED
+    flags += 1 << 12;
+#endif
+#ifdef DYNAMIC_CRC_TABLE
+    flags += 1 << 13;
+#endif
+#ifdef NO_GZCOMPRESS
+    flags += 1L << 16;
+#endif
+#ifdef NO_GZIP
+    flags += 1L << 17;
+#endif
+#ifdef PKZIP_BUG_WORKAROUND
+    flags += 1L << 20;
+#endif
+#ifdef FASTEST
+    flags += 1L << 21;
+#endif
+#ifdef STDC
+#  ifdef NO_vsnprintf
+        flags += 1L << 25;
+#    ifdef HAS_vsprintf_void
+        flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_vsnprintf_void
+        flags += 1L << 26;
+#    endif
+#  endif
+#else
+        flags += 1L << 24;
+#  ifdef NO_snprintf
+        flags += 1L << 25;
+#    ifdef HAS_sprintf_void
+        flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_snprintf_void
+        flags += 1L << 26;
+#    endif
+#  endif
+#endif
+    return flags;
+}
+
+#ifdef DEBUG
+
+#  ifndef verbose
+#    define verbose 0
+#  endif
+int ZLIB_INTERNAL z_verbose = verbose;
+
+void ZLIB_INTERNAL z_error (m)
+    char *m;
+{
+    fprintf(stderr, "%s\n", m);
+    exit(1);
+}
+#endif
+
+/* exported to allow conversion of error code to string for compress() and
+ * uncompress()
+ */
+const char * ZEXPORT zError(err)
+    int err;
+{
+    return ERR_MSG(err);
+}
+
+#if defined(_WIN32_WCE)
+    /* The Microsoft C Run-Time Library for Windows CE doesn't have
+     * errno.  We define it as a global variable to simplify porting.
+     * Its value is always 0 and should not be used.
+     */
+    int errno = 0;
+#endif
+
+#ifndef HAVE_MEMCPY
+
+void ZLIB_INTERNAL zmemcpy(dest, source, len)
+    Bytef* dest;
+    const Bytef* source;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = *source++; /* ??? to be unrolled */
+    } while (--len != 0);
+}
+
+int ZLIB_INTERNAL zmemcmp(s1, s2, len)
+    const Bytef* s1;
+    const Bytef* s2;
+    uInt  len;
+{
+    uInt j;
+
+    for (j = 0; j < len; j++) {
+        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+    }
+    return 0;
+}
+
+void ZLIB_INTERNAL zmemzero(dest, len)
+    Bytef* dest;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = 0;  /* ??? to be unrolled */
+    } while (--len != 0);
+}
+#endif
+
+
+#ifdef SYS16BIT
+
+#ifdef __TURBOC__
+/* Turbo C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
+ * and farmalloc(64K) returns a pointer with an offset of 8, so we
+ * must fix the pointer. Warning: the pointer must be put back to its
+ * original form in order to free it, use zcfree().
+ */
+
+#define MAX_PTR 10
+/* 10*64K = 640K */
+
+local int next_ptr = 0;
+
+typedef struct ptr_table_s {
+    voidpf org_ptr;
+    voidpf new_ptr;
+} ptr_table;
+
+local ptr_table table[MAX_PTR];
+/* This table is used to remember the original form of pointers
+ * to large buffers (64K). Such pointers are normalized with a zero offset.
+ * Since MSDOS is not a preemptive multitasking OS, this table is not
+ * protected from concurrent access. This hack doesn't work anyway on
+ * a protected system like OS/2. Use Microsoft C instead.
+ */
+
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+    voidpf buf = opaque; /* just to make some compilers happy */
+    ulg bsize = (ulg)items*size;
+
+    /* If we allocate less than 65520 bytes, we assume that farmalloc
+     * will return a usable pointer which doesn't have to be normalized.
+     */
+    if (bsize < 65520L) {
+        buf = farmalloc(bsize);
+        if (*(ush*)&buf != 0) return buf;
+    } else {
+        buf = farmalloc(bsize + 16L);
+    }
+    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
+    table[next_ptr].org_ptr = buf;
+
+    /* Normalize the pointer to seg:0 */
+    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
+    *(ush*)&buf = 0;
+    table[next_ptr++].new_ptr = buf;
+    return buf;
+}
+
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+{
+    int n;
+    if (*(ush*)&ptr != 0) { /* object < 64K */
+        farfree(ptr);
+        return;
+    }
+    /* Find the original pointer */
+    for (n = 0; n < next_ptr; n++) {
+        if (ptr != table[n].new_ptr) continue;
+
+        farfree(table[n].org_ptr);
+        while (++n < next_ptr) {
+            table[n-1] = table[n];
+        }
+        next_ptr--;
+        return;
+    }
+    ptr = opaque; /* just to make some compilers happy */
+    Assert(0, "zcfree: ptr not found");
+}
+
+#endif /* __TURBOC__ */
+
+
+#ifdef M_I86
+/* Microsoft C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
+#  define _halloc  halloc
+#  define _hfree   hfree
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    return _halloc((long)items, size);
+}
+
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    _hfree(ptr);
+}
+
+#endif /* M_I86 */
+
+#endif /* SYS16BIT */
+
+
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
+
+#ifndef STDC
+extern voidp  malloc OF((uInt size));
+extern voidp  calloc OF((uInt items, uInt size));
+extern void   free   OF((voidpf ptr));
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
+    voidpf opaque;
+    unsigned items;
+    unsigned size;
+{
+    if (opaque) items += size - size; /* make compiler happy */
+    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
+                              (voidpf)calloc(items, size);
+}
+
+void ZLIB_INTERNAL zcfree (opaque, ptr)
+    voidpf opaque;
+    voidpf ptr;
+{
+    free(ptr);
+    if (opaque) return; /* make compiler happy */
+}
+
+#endif /* MY_ZCALLOC */
diff --git a/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zutil.h b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zutil.h
new file mode 100644
index 00000000..e7832a1f
--- /dev/null
+++ b/src/vfs/critcl.vfs/examples/zlibwrap/zlib/zutil.h
@@ -0,0 +1,274 @@
+/* zutil.h -- internal interface and configuration of the compression library
+ * Copyright (C) 1995-2010 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id: zutil.h 246 2010-04-23 10:54:55Z nijtmans $ */
+
+#ifndef ZUTIL_H
+#define ZUTIL_H
+
+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
+#include "zlib.h"
+
+#ifdef STDC
+#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
+#    include <stddef.h>
+#  endif
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+typedef unsigned char  uch;
+typedef uch FAR uchf;
+typedef unsigned short ush;
+typedef ush FAR ushf;
+typedef unsigned long  ulg;
+
+extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+/* (size given to avoid silly warnings with Visual C++) */
+
+#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+
+#define ERR_RETURN(strm,err) \
+  return (strm->msg = (char*)ERR_MSG(err), (err))
+/* To be used only when the state is known to be valid */
+
+        /* common constants */
+
+#ifndef DEF_WBITS
+#  define DEF_WBITS MAX_WBITS
+#endif
+/* default windowBits for decompression. MAX_WBITS is for compression only */
+
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+/* default memLevel */
+
+#define STORED_BLOCK 0
+#define STATIC_TREES 1
+#define DYN_TREES    2
+/* The three kinds of block type */
+
+#define MIN_MATCH  3
+#define MAX_MATCH  258
+/* The minimum and maximum match lengths */
+
+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
+
+        /* target dependencies */
+
+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
+#  define OS_CODE  0x00
+#  if defined(__TURBOC__) || defined(__BORLANDC__)
+#    if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+       /* Allow compilation with ANSI keywords only enabled */
+       void _Cdecl farfree( void *block );
+       void *_Cdecl farmalloc( unsigned long nbytes );
+#    else
+#      include <alloc.h>
+#    endif
+#  else /* MSC or DJGPP */
+#    include <malloc.h>
+#  endif
+#endif
+
+#ifdef AMIGA
+#  define OS_CODE  0x01
+#endif
+
+#if defined(VAXC) || defined(VMS)
+#  define OS_CODE  0x02
+#  define F_OPEN(name, mode) \
+     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
+#endif
+
+#if defined(ATARI) || defined(atarist)
+#  define OS_CODE  0x05
+#endif
+
+#ifdef OS2
+#  define OS_CODE  0x06
+#  ifdef M_I86
+#    include <malloc.h>
+#  endif
+#endif
+
+#if defined(MACOS) || defined(TARGET_OS_MAC)
+#  define OS_CODE  0x07
+#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#    include <unix.h> /* for fdopen */
+#  else
+#    ifndef fdopen
+#      define fdopen(fd,mode) NULL /* No fdopen() */
+#    endif
+#  endif
+#endif
+
+#ifdef TOPS20
+#  define OS_CODE  0x0a
+#endif
+
+#ifdef WIN32
+#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
+#    define OS_CODE  0x0b
+#  endif
+#endif
+
+#ifdef __50SERIES /* Prime/PRIMOS */
+#  define OS_CODE  0x0f
+#endif
+
+#if defined(_BEOS_) || defined(RISCOS)
+#  define fdopen(fd,mode) NULL /* No fdopen() */
+#endif
+
+#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
+#  if defined(_WIN32_WCE)
+#    define fdopen(fd,mode) NULL /* No fdopen() */
+#    ifndef _PTRDIFF_T_DEFINED
+       typedef int ptrdiff_t;
+#      define _PTRDIFF_T_DEFINED
+#    endif
+#  else
+#    define fdopen(fd,type)  _fdopen(fd,type)
+#  endif
+#endif
+
+#if defined(__BORLANDC__)
+  #pragma warn -8004
+  #pragma warn -8008
+  #pragma warn -8066
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
+    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+#endif
+
+        /* common defaults */
+
+#ifndef OS_CODE
+#  define OS_CODE  0x03  /* assume Unix */
+#endif
+
+#ifndef F_OPEN
+#  define F_OPEN(name, mode) fopen((name), (mode))
+#endif
+
+         /* functions */
+
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+#if defined(__CYGWIN__)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+#ifndef HAVE_VSNPRINTF
+#  ifdef MSDOS
+     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+        but for now we just assume it doesn't. */
+#    define NO_vsnprintf
+#  endif
+#  ifdef __TURBOC__
+#    define NO_vsnprintf
+#  endif
+#  ifdef WIN32
+     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
+#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
+#         define vsnprintf _vsnprintf
+#      endif
+#    endif
+#  endif
+#  ifdef __SASC
+#    define NO_vsnprintf
+#  endif
+#endif
+#ifdef VMS
+#  define NO_vsnprintf
+#endif
+
+#if defined(pyr)
+#  define NO_MEMCPY
+#endif
+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
+ /* Use our own functions for small and medium model with MSC <= 5.0.
+  * You may have to use the same strategy for Borland C (untested).
+  * The __SC__ check is for Symantec.
+  */
+#  define NO_MEMCPY
+#endif
+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
+#  define HAVE_MEMCPY
+#endif
+#ifdef HAVE_MEMCPY
+#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
+#    define zmemcpy _fmemcpy
+#    define zmemcmp _fmemcmp
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)
+#  else
+#    define zmemcpy memcpy
+#    define zmemcmp memcmp
+#    define zmemzero(dest, len) memset(dest, 0, len)
+#  endif
+#else
+   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
+   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
+   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
+#endif
+
+/* Diagnostic functions */
+#ifdef DEBUG
+#  include <stdio.h>
+   extern int ZLIB_INTERNAL z_verbose;
+   extern void ZLIB_INTERNAL z_error OF((char *m));
+#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
+#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
+#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
+#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
+#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
+#else
+#  define Assert(cond,msg)
+#  define Trace(x)
+#  define Tracev(x)
+#  define Tracevv(x)
+#  define Tracec(c,x)
+#  define Tracecv(c,x)
+#endif
+
+
+voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+                        unsigned size));
+void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+
+#define ZALLOC(strm, items, size) \
+           (*((strm)->zalloc))((strm)->opaque, (items), (size))
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
+
+#endif /* ZUTIL_H */
diff --git a/src/vfs/critcl.vfs/lib/app-critcl/critcl.tcl b/src/vfs/critcl.vfs/lib/app-critcl/critcl.tcl
new file mode 100644
index 00000000..47e5bf64
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/app-critcl/critcl.tcl
@@ -0,0 +1,1861 @@
+#!/bin/sh
+# -*- tcl -*-
+# # ## ### ##### ######## ############# #####################
+
+# Critcl Application.
+
+# # ## ### ##### ######## ############# #####################
+
+# Prebuild shared libraries using the Critcl package.
+#
+#   Based originally on critbind by Jean-Claude Wippler
+#   Transmogrified into critcl   by Steve Landers
+#
+# Copyright (c) 2001-20?? Jean-Claude Wippler
+# Copyright (c) 2002-20?? Steve Landers
+# Copyright (c) 20??-2023 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# \
+    exec tclkit $0 ${1+"$@"}
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.6 9
+package provide critcl::app [package require critcl]
+package require cmdline
+
+# It is expected here that critcl already imported platform, or an
+# equivalent package, i.e. the critcl::platform fallback. No need to
+# do it again.
+#package require platform
+
+# Note: We can assume here that the commands lassign and dict are
+# available. The critcl package has made sure of that.
+
+namespace eval ::critcl::app {}
+
+# # ## ### ##### ######## ############# #####################
+## https://github.com/andreas-kupries/critcl/issues/112
+## Ensure that we have maximal 'info frame' data, if supported
+#
+## ATTENTION: This slows the Tcl core down by about 10%, sometimes
+## more, due to the need to track location information in some
+## critical paths of Tcl_Obj management.
+#
+## I am willing to pay that price here, because this is isolated to
+## the operation of the critcl application itself. While some more
+## time is spent in the ahead-of-time compilation the result is not
+## affected. And I want the more precise location information for when
+## compilation fails.
+
+catch { interp debug {} -frame 1 }
+
+# # ## ### ##### ######## ############# #####################
+## Intercept 'package' calls.
+#
+# This code is present to handle the possibility of building multiple
+# different versions of the same package, or of different packages
+# having dependencies on different versions of a 3rd party
+# package. Each will 'package provide' its version to our Tcl, and
+# thus normally be reported as a conflict. To prevent that the
+# intercepted command checks for this situation, and forces Tcl to
+# forget the previously registered package.
+
+rename package ::critcl::app::__package
+proc package {option args} {
+    if {$option eq "provide"} {
+        if {![catch {
+	    set v [::critcl::app::__package present [lindex $args 0]]
+	}] &&
+	    ([llength $args] > 1) &&
+	    ($v ne [lindex $args 1])
+	} {
+	    # A package is provided which is already present in
+	    # memory, the number of arguments is ok, and the version
+	    # of the new package is different from what is
+	    # known. Force Tcl to forget the previous package, this is
+	    # not truly a conflict.
+            ::critcl::app::__package forget [lindex $args 0]
+        }
+    }
+
+    return [eval [linsert $args 0 ::critcl::app::__package $option]]
+}
+
+# # ## ### ##### ######## ############# #####################
+## Override the default of the critcl package for errors and
+## message. Write them to the terminal (and, for errors, abort the
+## application instead of throwing them up the stack to an uncertain
+## catch).
+
+proc ::critcl::error {msg} {
+    global argv0
+    puts stderr "$argv0 error: $msg"
+    flush stderr
+    exit 1
+}
+
+proc ::critcl::msg {args} {
+    switch -exact -- [llength $args] {
+	1 {
+	    puts stdout [lindex $args 0]
+	    flush stdout
+	}
+	2 {
+	    lassign $args o m
+	    if {$o ne "-nonewline"} {
+		return -code error "wrong\#args, expected: ?-nonewline? msg"
+	    }
+	    puts -nonewline stdout $m
+	    flush stdout
+	}
+	default {
+	    return -code error "wrong\#args, expected: ?-nonewline? msg"
+	}
+    }
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+##
+# Rewrite the hook handling declarations found after the build.
+# The default of clearing state for a new build is not the right
+# thing to do in mode "precompile". Here we want to see an ERROR.
+
+proc ::critcl::HandleDeclAfterBuild {} {
+    if {![done]} return
+    set cloc {}
+    if {![catch {
+	array set loc [info frame -2]
+    } msg]} {
+	if {$loc(type) eq "source"} {
+	    set cloc "@$loc(file):$loc(line)"
+	} else {
+	    set cloc " ([array get loc])"
+	}
+    } ;#else { set cloc " ($msg)" }
+
+    append err [lindex [info level -1] 0]
+    append err $cloc
+    append err ": Illegal attempt to define C code in [This] after it was built."
+    append err \n [at::SHOWFRAMES]
+    error $err
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::critcl::app::main {argv} {
+    Cmdline $argv
+
+    # When creating a package use a transient cache which is not in
+    # conflict with "compile & run", or other instances of the critcl
+    # application.
+
+    if {$v::mode eq "pkg"} {
+	set pkgcache [PackageCache]
+	critcl::cache $pkgcache
+	critcl::fastuuid
+    }
+
+    ProcessInput
+    StopOnFailed
+
+    # All input files have been processed and their data saved. Now
+    # generate the boilerplate bracketing all the sub-ordinate
+    # Foo_Init() functions, i.e. the code which provides a single
+    # initialization function for the whole set of input files.
+
+    if {$v::mode eq "pkg"} {
+	# Create a merged shared library and put a proper Tcl package
+	# around it.
+
+	BuildBracket
+	StopOnFailed
+	AssemblePackage
+
+	if {!$v::keep} {
+	    file delete -force $pkgcache
+	}
+    } elseif {$v::mode eq "tea"} {
+	AssembleTEA
+    }
+
+    StopOnFailed
+
+    if {$v::keep} {
+	::critcl::print stderr "Files left in [critcl::cache]"
+    }
+
+    ::critcl::print "Done\n"
+    return
+}
+
+proc ::critcl::app::PackageCache {} {
+    global env
+    if {$v::cache ne {}} {
+	return $v::cache
+    }
+    return [file join $env(HOME) .critcl pkg[pid].[clock seconds]]
+}
+
+proc ::critcl::app::StopOnFailed {} {
+    if {!$v::failed} return
+    ::critcl::print stderr "Files left in [critcl::cache]"
+    ::critcl::print stderr "FAILURES $v::failed"
+    ::critcl::print stderr "FAILED:  [join $v::borken "\nFAILED:  "]"
+    ::critcl::print stderr "FAILED   [join [split [join $v::log \n\n] \n] "\nFAILED   "]"
+    exit 1 ; #return -code return
+}
+
+proc ::critcl::app::Cmdline {argv} {
+    variable options
+
+    # Rationalized application name. Direct user is the intercepted
+    # '::critcl::error' command.
+    set ::argv0 [cmdline::getArgv0]
+
+    # Semi-global application configuration.
+    set v::verbose  0      ; # Default, no logging.
+    set v::src     {}      ; # No files to process.
+    set v::mode    cache   ; # Fill cache. Alternatively build a
+			     # package, or TEA hierarchy.
+    set v::shlname ""      ; # Name of shlib to build.
+    set v::outname ""      ; # Name of shlib dir to create.
+    set v::libdir  lib     ; # Directory to put the -pkg or -tea
+			     # directory into.
+    set v::incdir  include ; # Directory to put the -pkg include files into (stubs export),
+                             # and search in (stubs import)
+    set v::keep    0       ; # Default: Do not keep generated .c files.
+
+    # Local actions.
+    set selftest   0 ;# Invoke the application selftest, which simply
+                      # runs whatever test/*.tst files are found in the
+                      # starkit or starpack. IOW, this functionality is
+                      # usable only for a wrapped critcl application.
+    set cleaning   0 ;# Clean the critcl cache. Default: no.
+    set showall    0 ;# Show all configurations in full. Default: no.
+    set show       0 ;# Show the chosen build configuration. Default: no.
+    set showtarget 0 ;# Show the chosen build target only. Default: no.
+    set targets    0 ;# Show the available targets.
+    set help       0 ;# Show the application's help text.
+
+    # Local configuration. Seen outside of this procedure only
+    # directly, through the chosen build configuration.
+
+    set target     "" ;# The user-specified build target, if any.
+    set configfile "" ;# The user-specified custom configuration file,
+		       # if any
+
+    # Process the command line...
+
+    while {[set result [cmdline::getopt argv $options opt arg]] != 0} {
+	if {$result == -1} {
+	    switch -glob -- $opt {
+		with-* {
+		    set argv [lassign $argv opt arg]
+		    regsub {^-with-} $opt {} opt
+		    lappend v::uc $opt $arg
+		    continue
+		}
+		default {
+		    Usage "Unknown option \"$opt\""
+		}
+	    }
+	}
+	switch -exact -- $opt {
+	    v - -version {
+		::critcl::print [package present critcl]
+		::exit 0
+	    }
+	    I          { AddIncludePath $arg }
+	    L          { AddLibraryPath $arg }
+	    cache      { set v::cache $arg }
+	    clean      { incr cleaning }
+	    config     { set configfile $arg }
+	    debug      {
+		lappend v::debug $arg
+		#critcl::config lines 0
+	    }
+	    force      {
+		critcl::config force 1
+		::critcl::print stderr "Compilation forced"
+	    }
+	    disable-tcl9 {
+		critcl::config tcl9 0
+		::critcl::print stderr "Disabled checking for Tcl 9 compatibility issues"
+	    }
+	    keep       {
+		critcl::config keepsrc 1
+		#critcl::config lines 0
+		set v::keep 1
+	    }
+	    trace-commands {
+		critcl::config trace 1
+	    }
+	    trace {
+		critcl::cflags -DCRITCL_TRACER
+	    }
+	    help       { incr help }
+	    libdir     {
+		set v::libdir $arg
+
+		# In case critcl is wrapped Tcl must be told about the
+		# outside location for packages.
+
+		lappend ::auto_path $arg
+		lappend ::auto_path [file dirname $arg]
+		AddLibraryPath $arg
+	    }
+	    includedir {
+		set v::incdir  $arg
+		AddIncludePath $arg
+	    }
+	    enable     { lappend v::uc $arg 1 }
+	    disable    { lappend v::uc $arg 0 }
+	    pkg        { set v::mode pkg ; incr v::verbose }
+	    tea        { set v::mode tea ; incr v::verbose }
+	    show       { incr show }
+	    showall    { incr showall }
+	    showtarget { incr showtarget }
+	    target     { set target $arg }
+	    targets    { incr targets }
+	    test       { set selftest 1 }
+	    default {
+		Usage "Unknown option \"$opt\""
+	    }
+	}
+    }
+
+    # ... validate the settings, and act on them.
+
+    if {$help} {
+	Help
+	exit
+    }
+
+    # Parse the user-specified configuration file, if any. This
+    # overrides the default configuration file read by the critcl
+    # package when it was loaded. It does keep the default platform
+    # from that active.
+
+    if {$configfile ne ""} {
+	if {$argv eq "" && [file extension $configfile] eq ".tcl"} {
+	    # probably means the user has omitted the config file and we've
+	    # picked up the source file name
+	    Usage "-config is missing file argument"
+	}
+	if {![file exists $configfile]} {
+	    Usate "Can't read configuration file $configfile"
+	}
+	critcl::readconfig $configfile
+    }
+
+    # And switch to the user-provided target platform.
+
+    if {$target ne ""} {
+	if {($argv eq "") && [file extension $target] eq ".tcl"} {
+	    # probably means the user has omitted the config file and we've
+	    # picked up the source file name
+	    Usage "-target is missing file argument"
+	}
+
+	set match [critcl::chooseconfig $target 1]
+
+	if {[llength $match] == 1} {
+	    critcl::setconfig [lindex $match 0]
+	} else {
+	    Usage "multiple targets matched : $match"
+	}
+    }
+
+    if {($v::mode eq "pkg") || $show} {
+	critcl::crosscheck
+    }
+
+    if {$cleaning} {
+	critcl::clean_cache
+    }
+
+    if {$show} {
+	if {$v::mode eq "pkg"} {
+	    critcl::cache [PackageCache]
+	}
+	critcl::showconfig stdout
+    }
+
+    if {$showall} {
+	critcl::showallconfig stdout
+    }
+
+    if {$showtarget} {
+	::critcl::print [critcl::targetplatform]
+    }
+
+    if {$targets} {
+	::critcl::print [critcl::knowntargets]
+    }
+
+    if {$show || $showall || $targets || $showtarget} {
+	exit
+    }
+
+    if {$selftest} {
+	Selftest
+	exit
+    }
+
+    # Invoking the application without input files is an error, except
+    # if it was to just clean the local critcl cache.
+
+    if {[llength $argv] < 1} {
+	if {!$cleaning} Usage
+	exit
+    }
+
+    # The remainder of the arguments are the files to process, except
+    # for lib and pkg modes where they can be prefixed with the name
+    # of the output file, i.e. shared library. If however no such
+    # output file is present the name of the first input file will be
+    # used as name of the library.
+
+    set v::src $argv
+
+    # (%) Determine the name of the shared library to generate from
+    # the input files. This location is referenced by (=).
+
+    if {$v::mode ne "cache"} {
+	set name [lindex $argv 0]
+	set addext 0
+
+	# Split a version number off the package name.
+	set ver {}
+	if {[regexp {^([^0-9]+)([0-9][.0-9]*)$} $name -> base ver]} {
+	    set name $base
+	}
+
+	switch [file extension $name] {
+	    .dll   -
+	    .dylib -
+	    .sl    -
+	    .so {
+		# The name of the result shlib is prefixed, take it as
+		# package name, and strip it off the list of input
+		# files.
+		set v::outname [file rootname $name]
+		set v::src     [lrange $v::src 1 end]
+		set addext 1
+	    }
+	    .tcl {
+		# We have no discernible result shlib, take
+		# the stem of the first input file as package
+		# name
+
+		set v::outname [file rootname $name]
+		set addext 1
+	    }
+	    "" {
+		# See above for .tcl, except that there is no stem to
+		# take. And if this is the only argument we also have
+		# to derive the full name of the expected input file
+		# from it.
+		set v::outname $name
+		if {[llength $argv] == 1} {
+		    set v::src [list $v::outname.tcl]
+		} else {
+		    set v::src [lrange $v::src 1 end]
+		}
+	    }
+	    default {
+		Usage "Not sure how to handle \"$name\""
+	    }
+	}
+
+	# Put the version number back. We have to distinguish package
+	# library file name and package directory name. Only the
+	# latter should have the version number.
+	set v::shlname $v::outname
+	if {$ver ne {}} {
+	    append v::outname $ver
+	}
+
+	if {$addext || ([file extension $v::shlname] eq "")} {
+	    append v::shlname [critcl::sharedlibext]
+	}
+
+	critcl::config combine dynamic
+
+	if {![llength $v::src]} {
+	    Usage "No input files"
+	}
+    }
+
+    # Determine the platform to use by the build backend, based on
+    # actual platform we are on and the user's chosen target, if any.
+
+    set v::actualplatform [::critcl::actualtarget]
+    return
+}
+
+proc ::critcl::app::AddIncludePath {path} {
+    set dirs [critcl::config I]
+    lappend dirs [file normalize $path]
+    critcl::config I $dirs
+    return
+}
+
+proc ::critcl::app::AddLibraryPath {path} {
+    set dirs [critcl::config L]
+    lappend dirs [file normalize $path]
+    critcl::config L $dirs
+    return
+}
+
+proc ::critcl::app::Log {text} {
+    if {!$v::verbose} return
+    ::critcl::print -nonewline $text
+    flush stdout
+    return
+}
+
+proc ::critcl::app::LogLn {text} {
+    if {!$v::verbose} return
+    ::critcl::print $text
+    flush stdout
+    return
+}
+
+proc ::critcl::app::Usage {args} {
+    global argv0
+    if {[llength $args]} {
+	::critcl::print stderr "$argv0 error: [join $args]"
+    }
+
+    ::critcl::print stderr [string map [list @ $argv0] {To compile and run a tcl script
+	@ [-force] [-keep] [-cache dir] file[.tcl]
+
+To compile and build a package
+    @ options -pkg ?name? [files...]
+
+To repackage for TEA
+    @ options -tea ?name? [files...]
+
+Options include:
+    -debug [symbols|memory|all] enable debugging
+    -force          force compilation of C files
+    -show           show the configuration options being used
+    -target target  generate binary for specified target platform/architecture
+
+Other options that may be useful:
+    -I dir          adds dir to the include search path when compiling.
+    -L dir          adds dir to the library search path when linking.
+    -cache dir      sets the Critcl cache directory to dir.
+    -keep           keep intermediate C files in the Critcl cache
+    -config file    read the Critcl configuration options from file
+    -libdir dir     location of generated library/package
+    -includedir dir location of generated package headers (stubs)
+    -showall        show configuration for all supported platforms
+    -targets        show all available target platforms
+
+You can display the built-in help wiki on most platforms using:
+    @ -help }]
+    exit 1
+    return
+}
+
+proc ::critcl::app::Help {} {
+    if {[catch {package require Mk4tcl} msg] ||
+	[catch {package require Wikit} msg]} {
+	::critcl::print $msg
+        set txt "Couldn't load the Critcl help Wiki\n"
+        append txt "To display the Critcl help wiki run \"critcl\" "
+        append txt "without any options.\n"
+        ::critcl::print $txt
+        exit
+    } else {
+        Wikit::init [file join $::starkit::topdir doc critcl.tkd]
+    }
+}
+
+proc ::critcl::app::Selftest {} {
+    foreach t [glob -directory [file join $starkit::topdir test] *.tst] {
+        source $t
+    }
+    return
+}
+
+proc ::critcl::app::ProcessInput {} {
+    # Main loop. This processes the input files, one by one.
+
+    set v::debug [lsort -unique $v::debug]
+
+    # NOTE that this effectively executes them (source!) in the
+    # context of this application. The files are trusted to not
+    # contain malicious side-effects, etc.
+
+    # Initialize the accumulator variables for various per-file
+    # information which will be needed later when building the
+    # over-arching initialization code.
+
+    set v::clibraries {}  ;# External libraries used. To link the final shlib against.
+    set v::ldflags    {}  ;# Linker flags.
+    set v::objects    {}  ;# The object files to link.
+    set v::edecls     {}  ;# Initialization function decls for the pieces.
+    set v::initnames  {}  ;# Initialization function calls for the pieces.
+    set v::tsources   {}  ;# Tcl companion sources.
+    set v::mintcl     8.4 ;# Minimum version of Tcl required to run the package.
+    set v::tk         0   ;# Boolean flag. Set if any sub-package needs Tk, forcing it on the collection as well.
+    set v::preload    {}  ;# List of libraries declared for preload.
+    set v::license    {}  ;# Accumulated licenses, if any.
+    set v::failed      0  ;# Number of build failures encountered.
+    set v::borken     {}  ;# List of files which failed to build.
+    set v::log        {}  ;# List of log messages for the failed files
+    set v::headers    {}  ;# List of header directories (in the result cache)
+                           # to export.
+    set v::pkgs       {}  ;# List of package names for the pieces.
+    set v::inits      {}  ;# Init function names for the pieces, list.
+    set v::meta       {}  ;# All meta data declared by the input files.
+
+    # Other loop status information.
+
+    set first  1  ;# Flag, reset after first round, helps with output formatting.
+    set missing 0
+
+    if {$v::mode eq "tea"} {
+	LogLn "Config:   TEA Generation"
+	Log   "Source:   "
+
+	# Initialize the accumulator variables for various per-file
+	# information.
+
+	set v::org      {} ; # Organization the package is licensed by.
+	set v::ver      {} ; # Version of the package.
+	set v::cfiles   {} ; # Companion files (.tcl, .c, .h, etc).
+	set v::teasrc   {} ; # Input file(s) transformed for use in the Makefile.in.
+	set v::imported {} ; # List of stubs APIs imported from elsewhere.
+	set v::config   {} ; # List of user-specified configuration settings.
+
+    } elseif {[llength $v::src]} {
+	LogLn "Config:   [::critcl::targetconfig]"
+	LogLn "Build:    [::critcl::buildplatform]"
+
+	set t [::critcl::targetplatform]
+	if {$v::actualplatform ne $t} {
+	    LogLn "Target:   $v::actualplatform (by $t)"
+	} else {
+	    LogLn "Target:   $v::actualplatform"
+	}
+	Log   "Source:   "
+    }
+
+    foreach f $v::src {
+	# Avoid reloading itself.
+	if {[file rootname [file tail $f]] eq "critcl"} continue
+
+	if {$v::mode eq "tea"} {
+	    lappend v::teasrc "\${srcdir}/src/[file tail $f]"
+	}
+
+	# Canonicalize input argument, and search in a few places.
+	set fn [file normalize $f]
+
+	set found [file exists $fn]
+	if {!$found} {
+	    if {[file extension $fn] ne ".tcl"} {
+		append fn .tcl
+		set found [file exists $fn]
+	    }
+	    if {!$found} {
+		if {!$first} { ::critcl::print stderr "" }
+		::critcl::print stderr "$f doesn't exist"
+		incr missing
+		continue
+	    }
+	}
+
+	set first 0
+	LogLn "[file tail $fn]"
+	set dir [file dirname $fn]
+
+	if {$v::mode eq "tea"} {
+	    # In TEA mode we are not building anything at all. We only
+	    # wish to know and scan for the declarations of companion
+	    # files, so that we know what to put these into the TEA
+	    # directory hierarchy. This also provides us with the
+	    # version number to use.
+
+	    LogLn ""
+	    array set r [critcl::scan $fn]
+	    lappend v::cfiles $f $r(files)
+	    if {$r(org) ne {}} {
+		lappend v::org $r(org)
+	    }
+	    if {$r(version) ne {}} {
+		lappend v::ver $r(version)
+	    }
+	    if {$r(imported) ne {}} {
+		critcl::lappendlist v::imported $r(imported)
+	    }
+	    if {$r(config) ne {}} {
+		critcl::lappendlist v::config $r(config)
+	    }
+	    if {$r(meta) ne {}} {
+		lappend v::meta $r(meta)
+	    }
+	    continue
+	}
+
+	# Execute the input file and collect all the crit(i)c(a)l :)
+	# information. Depending on the use of 'critcl::failed' this
+	# may or may not have generated the internal object file.
+
+	if {$v::mode eq "pkg"} {
+	    critcl::buildforpackage
+	}
+
+	if {[llength $v::debug]} {
+	    # As the debug settings are stored per file we now take
+	    # the information from the application's commandline and
+	    # force things here, faking the proper path information.
+
+	    set save [info script]
+	    info script $fn
+	    eval [linsert $v::debug 0 critcl::debug]
+	    info script $save
+	}
+
+	#puts ||$v::uc||
+	if {[llength $v::uc]} {
+	    # As the user-config settings are stored per file we now
+	    # take the information from the application's commandline
+	    # and force things here, faking the proper path information.
+	    # Full checking of the data happens only if the setting is
+	    # actually used by the file.
+
+	    set save [info script]
+	    info script $fn
+
+	    foreach {k v} $v::uc {
+		#puts UC($k)=|$v|
+		critcl::userconfig set $k $v
+	    }
+	    info script $save
+	}
+
+	# Ensure that critcl's namespace introspection is done
+	# correctly, and not thinking that 'critcl::app' is the
+	# namespace to use for the user's commands.
+
+	uplevel #0 [list source $fn]
+
+	if {[critcl::cnothingtodo $fn]} {
+	    ::critcl::print stderr "nothing to build for $f"
+	    continue
+	}
+
+	# Force build. Our 'buildforpackage' call above disabled
+	# 'critcl::failed' and 'critcl::load' (Causing them to return
+	# OK, and bypassing anything conditional on their failure). If
+	# there is a failure we want to know it correctly, here.
+	#
+	# Regardless, we have to force (and later restore) the proper
+	# script location, something the 'source' comand above did
+	# automatically.
+
+	set save [info script]
+	info script $fn
+	set failed [critcl::cbuild $fn 0]
+	incr v::failed $failed
+	info script $save
+
+	# We can skip the part where we collect the build results for
+	# use by the overarching code if either no overall shlib is
+	# generated from the input, or any of the builds made so far
+	# failed.
+
+	# NOTE that we were NOT skipping the build step for any of the
+	# packages, even if previous packages failed. We want the
+	# maximum information about problems from a single run, not
+	# fix things one by one.
+
+	set results [critcl::cresults $fn]
+	if {$failed} {
+	    lappend v::borken $f
+	    lappend v::log    [dict get $results log]
+	    Log "(FAILED) "
+	} elseif {[dict exists $results warnings]} {
+	    # There might be warnings to print even if the build did
+	    # not fail.
+	    set warnings [dict get $results warnings]
+	    if {[llength $warnings]} {
+		::critcl::print stderr "\n\nWarning  [join $warnings "\nWarning  "]"
+	    }
+	}
+	if {$v::failed || ($v::mode ne "pkg")} continue
+
+	array set r $results
+
+	append v::edecls    "extern Tcl_AppInitProc $r(initname)_Init;\n"
+	append v::initnames "    if ($r(initname)_Init(interp) != TCL_OK) return TCL_ERROR;\n"
+	append v::license   [License $f $r(license)]
+
+	lappend v::pkgs  $r(pkgname)
+	lappend v::inits $r(initname)
+	lappend v::meta  $r(meta)
+
+	# The overall minimum version of Tcl required by the combined
+	# packages is the maximum over all of their minima.
+	set v::mintcl [Vmax $v::mintcl $r(mintcl)]
+	set v::tk     [Max $v::tk $r(tk)]
+	critcl::lappendlist v::objects    $r(objects)
+	critcl::lappendlist v::tsources   $r(tsources)
+	critcl::lappendlist v::clibraries $r(clibraries)
+	critcl::lappendlist v::ldflags    $r(ldflags)
+	critcl::lappendlist v::preload    $r(preload)
+
+	if {[info exists r(apiheader)]} {
+	    critcl::lappendlist v::headers $r(apiheader)
+	}
+    }
+
+    if {$missing} {
+	critcl::error  "Missing files: $missing, aborting"
+    }
+
+    # Reduce package and init function to the first pieces. Easier to
+    # do it this way than having a conditional set in the loop.
+
+    set v::pkgs  [lindex $v::pkgs  0]
+    set v::inits [lindex $v::inits 0]
+    # Strip the prefix used by the foundation package. Keep in sync.
+    regsub {^ns_} $v::inits {} v::inits
+
+    return
+}
+
+proc ::critcl::app::Vmax {a b} {
+    if {[package vcompare $a $b] >= 0} {
+	return $a
+    } else {
+	return $b
+    }
+}
+
+proc ::critcl::app::Max {a b} {
+    if {$a >= $b} {
+	return $a
+    } else {
+	return $b
+    }
+}
+
+proc ::critcl::app::License {file text} {
+    if {$text eq "<<Undefined>>"} { return {} }
+    return "\n\[\[ [file tail $file] \]\] __________________\n$text"
+}
+
+proc ::critcl::app::BuildBracket {} {
+    ::critcl::print "\nLibrary:  [file tail $v::shlname]"
+
+    # The overarching initialization code, the bracket, has no real
+    # file behind it. Fake it based on the destination shlib, this
+    # ensures that the generated _Init function has the proper name
+    # without having to redefine things through C macros, as was done
+    # before.
+    info script $v::shlname
+
+    critcl::config combine ""
+
+    # Inject the information collected from the input files, making
+    # them part of the final result.
+    critcl::tcl $v::mintcl
+    if {$v::tk} { critcl::tk }
+
+    set                 lib critcl::cobjects
+    critcl::lappendlist lib $v::objects
+    eval $lib
+
+    set                 lib critcl::clibraries
+    critcl::lappendlist lib $v::clibraries
+    eval $lib
+
+    eval [linsert [lsort -unique $v::ldflags] 0 critcl::ldflags]
+    eval [linsert [lsort -unique $v::preload] 0 critcl::preload]
+
+    critcl::cinit $v::initnames $v::edecls
+
+    # And build everything.
+    critcl::buildforpackage 0
+    set failed [critcl::cbuild "" 0]
+
+    incr v::failed $failed
+    if {$failed} {
+	lappend v::borken <<Bracket>>
+	Log "(FAILED) "
+    }
+    return
+}
+
+proc ::critcl::app::PlaceShlib {} {
+    # Copy the generated shlib from the cache to its final resting
+    # place. For -pkg this was set be inside the directory hierarchy
+    # of the newly-minted package. To prevent hassle a previously
+    # existing file gets deleted.
+
+    if {[file exists $v::shlname]} {
+	file delete -force $v::shlname
+    }
+
+    # NOTE that the fake 'info script location' set by 'BuildBracket'
+    # is still in effect, making access to the build results easy.
+    set shlib [dict get [critcl::cresults] shlib]
+    file copy $shlib $v::shlname
+
+    # For MSVC debug builds we get a separate debug info file.
+    set pdb [file root $shlib].pdb
+    if {[file exists $pdb]} {
+	file copy -force $pdb [file root $v::shlname].pdb
+    }
+
+    # Record shlib in the meta data, list of package files.
+    set d [file tail [file dirname $v::shlname]]
+    set f [file tail $v::shlname]
+    lappend v::meta [list included [file join $d $f]]
+    return
+}
+
+proc ::critcl::app::ExportHeaders {} {
+    set incdir [CreateIncludeDirectory]
+
+    foreach dir $v::headers {
+	set stem [file tail $dir]
+	set dst  [file join $incdir $stem]
+
+	::critcl::print "Headers Placed Into: $v::incdir/$stem"
+
+	file mkdir $dst
+	foreach f [glob -nocomplain -directory $dir *] {
+	    file copy -force $f $dst
+	}
+    }
+    return
+}
+
+proc ::critcl::app::AssemblePackage {} {
+    # Validate and/or create the main destination directory L. The
+    # package will become a subdirectory of L. See (x). And a platform
+    # specific directory inside of that will hold the shared
+    # library. This allows us to later merge the packages for
+    # different platforms into a single multi-platform package.
+
+    if {![llength $v::pkgs]} {
+	::critcl::print stderr "ERROR: `package provide` missing in package sources"
+	exit 1
+    }
+
+    set libdir [CreateLibDirectory]
+
+    set libname  [file tail $v::outname]
+    set pkgdir   [file join $libdir $libname]
+    set shlibdir [file join $pkgdir $v::actualplatform]
+
+    # XXX fileutil::stripPwd ...
+    if {[string first [pwd] $pkgdir] != -1} {
+	set first [string length [pwd]]
+	set dir [string range $pkgdir [incr first] end]
+    } else {
+	set dir $pkgdir
+    }
+    ::critcl::print "\nPackage Placed Into: $dir"
+
+    file mkdir             $pkgdir
+    file mkdir             $shlibdir
+
+    set shl [file tail $v::shlname]
+
+    CreatePackageIndex     $shlibdir [file rootname $shl] \
+	[PlaceTclCompanionFiles $pkgdir]
+    CreateLicenseTerms     $pkgdir
+    CreateRuntimeSupport   $pkgdir
+
+    # Place the shlib generated by BuildBracket into its final resting
+    # place, in the directory hierarchy of the just-assembled package.
+
+    set v::shlname [file join $shlibdir $shl]
+    PlaceShlib
+
+    # At last we can generate and write the meta data. Many of the
+    # commands before added application-level information (like
+    # included files, entrytclcommand, ...) to the information
+    # collected from the input files
+
+    CreateTeapotMetadata $pkgdir
+    ExportHeaders
+    return
+}
+
+proc ::critcl::app::CreatePackageIndex {shlibdir libname tsources} {
+    # Build pkgIndex.tcl
+
+    set version [package present $v::pkgs]
+
+    # (=) The 'package present' works because (a) 'ProcessInput'
+    # sources the package files in its own context, this process, and
+    # (b) the package files (are expected to) contain the proper
+    # 'package provide' commands (for compile & run mode), and we
+    # expect that at least one of the input files specifies the
+    # overall package built from all the inputs. See also (%) in
+    # Cmdline, where the application determines shlib name and package
+    # name, often from the first input file, and/or working backwards
+    # from package name to input file.
+
+    set    index [open [file join [file dirname $shlibdir] pkgIndex.tcl] w]
+    puts  $index [PackageGuard $v::mintcl]
+    puts  $index [IndexCommand $version $libname $tsources $shlibdir]
+    close $index
+    return
+}
+
+proc ::critcl::app::Mapping {} {
+    # Create the platform mapping for each of the platforms listed on
+    # the Config platform line
+
+    set map    [critcl::getconfigvalue platform]
+    set minver [lindex $map 1]
+
+    set plats  [list]
+    foreach plat [lrange $map 2 end] {
+	set mapping($plat) [list [critcl::actualtarget] $minver]
+	lappend plats $plat
+    }
+
+    if {[llength $plats]} {
+	::critcl::print "Platform: [join $plats {, }] $minver and later"
+    }
+
+    set map {}
+    foreach plat [lsort [array names mapping]] {
+	lappend map $plat $mapping($plat)
+    }
+    return $map
+}
+
+proc ::critcl::app::Preload {shlibdir} {
+    if {![llength $v::preload]} { return {} }
+
+    # Locate the external libraries declared for preloading and put
+    # them into the package. Put the shared library of the internal
+    # preload support pseudo-package into it as well. This will all be
+    # picked up by the 'package ifneeded' script.
+
+    # First handle the declared libraries. Any problem there throws an
+    # error, or aborts.
+
+    set preload {}
+    foreach shlib $v::preload {
+	file copy -force [PreloadLocation $shlib] $shlibdir
+	lappend preload [file tail $shlib]
+    }
+
+    # Everything was ok, now place the supporting shlib into the
+    # package as well.
+
+    file copy -force \
+	[file join [critcl::cache] preload[critcl::sharedlibext]] \
+	$shlibdir
+
+    ::critcl::print "Preload:  [join $preload {, }]"
+    return $preload
+}
+
+proc ::critcl::app::PreloadLocation {shlib} {
+    set searchpath [PreloadSearchPath $shlib]
+
+    foreach path $searchpath {
+	if {![file exists $path]} continue
+	return $path
+    }
+
+    set    msg "can't find preload library $shlib"
+    append msg " for target platform \"$v::actualplatform\";"
+    append msg " searched for "
+    append msg [linsert [join $searchpath {, }] end-1 and]
+    critcl::error $msg
+    return
+}
+
+proc ::critcl::app::PreloadSearchPath {shlib} {
+
+    # Look for lib FOO as follows:
+    # (1) FOO.so
+    # (2) FOO/FOO.so
+    # (3) FOO/<platform>/FOO.so
+    #
+    # Look for lib BAR/FOO as follows:
+    # (1) FOO.so
+    #
+    # Then, if BAR/FOO doesn't exist as directory:
+    # (2) BAR/FOO.so
+    # (3) BAR/<platform>/FOO.so
+    #
+    # Conversely, if BAR/FOO does exist as directory:
+    # (2) BAR/FOO/FOO.so
+    # (3) BAR/FOO/<platform>/FOO.so
+
+    #   - lib.so
+    #   - dir/lib.so
+    #   - dir/plat/lib.so
+
+    set tail [file tail $shlib]
+
+    if {[file isdirectory $shlib]} {
+	set dir $shlib
+    } else {
+	set dir [file dirname $shlib]
+	if {$dir eq "."} {
+	    set dir $tail
+	}
+    }
+
+    set ext [critcl::sharedlibext]
+    return [list \
+		$tail$ext \
+		[file join $dir $tail$ext] \
+		[file join $dir $v::actualplatform $tail$ext]]
+}
+
+proc ::critcl::app::PackageGuard {v} {
+    return [string map [list @ $v] \
+	{if {![package vsatisfies [package provide Tcl] @]} {return}}]
+}
+
+proc ::critcl::app::IndexCommand {version libname tsources shlibdir} {
+    # We precompute as much as possible instead of wholesale defering
+    # to the runtime and dynamic code. See ticket (38bf01b26e). That
+    # makes it easier to debug the index command, as it is immediately
+    # visible in the pkgIndex.tcl file. And supports placement into
+    # the meta data.
+
+    set loadcmd [LoadCommand $version $libname $tsources $shlibdir]
+    return "package ifneeded [list $v::pkgs $version] $loadcmd"
+}
+
+proc ::critcl::app::LoadCommand {version libname tsources shlibdir} {
+    # New style. Precompute as much as possible.
+
+    set map [Mapping]
+    if {$map ne {}} { set map " [list $map]" }
+    set platform "\[::critcl::runtime::MapPlatform$map\]"
+
+    set     loadcmd {}
+    lappend loadcmd {source [file join $dir critcl-rt.tcl]}
+    lappend loadcmd "set path \[file join \$dir $platform\]"
+    lappend loadcmd "set ext \[info sharedlibextension\]"
+    lappend loadcmd "set lib \[file join \$path \"$libname\$ext\"\]"
+
+    foreach p [Preload $shlibdir] {
+	lappend loadcmd "::critcl::runtime::preFetch \$path \$ext [list $p]"
+    }
+
+    lappend loadcmd "load \$lib [list $v::inits]"
+
+    foreach t $tsources {
+	lappend loadcmd "::critcl::runtime::Fetch \$dir [list $t]"
+    }
+
+    lappend loadcmd [list package provide $v::pkgs $version]
+
+    # Wrap the load command for use by the index command.
+    # First make it a proper script, indented, i.e. proc body.
+
+    set loadcmd "\n    [join $loadcmd "\n    "]"
+
+    if {[package vsatisfies $v::mintcl 8.5]} {
+	# 8.5+: Put the load command into an ::apply, i.e. make it
+	# an anonymous procedure.
+
+	set loadcmd "\[list ::apply \{dir \{$loadcmd\n\}\} \$dir\]"
+    } else {
+	# 8.4: Use a named, transient procedure. Name is chosen
+	# for low probability of collision with anything else.
+	# NOTE: We have to catch the auto-delete command because
+	# the procedure may have been redefined and destroyed by
+	# recursive calls to 'package require' of more critcl-based
+	# packages.
+	set n __critcl_load__
+	append loadcmd "\n    catch \{rename $n {}\}";# auto delete
+	set loadcmd "\"\[list proc $n \{dir\} \{[string map [list \n { ; }] $loadcmd]\}\] ; \[list $n \$dir\]\""
+    }
+
+    lappend v::meta [list entrytclcommand [list "eval $loadcmd"]]
+
+    return $loadcmd
+}
+
+proc ::critcl::app::IndexCommandXXXXX {version libname tsources shlibdir} {
+    # Old style critcl. Ifneeded and loading is entirely and
+    # dynamically handled in the runtime support code.
+
+    set map       [Mapping]
+    set preload   [Preload $shlibdir]
+    set arguments [list $v::pkgs $version $libname $v::inits $tsources $map]
+    return "source \[file join \$dir critcl-rt.tcl\]\n::critcl::runtime::loadlib \$dir $arguments $preload"
+}
+
+proc ::critcl::app::CreateLicenseTerms {pkgdir} {
+    # Create a license.terms file.
+
+    if {$v::license eq ""} {
+	set v::license <<Undefined>>
+    } else {
+	set v::license [string trimleft $v::license]
+    }
+    set    license [open [file join $pkgdir license.terms] w]
+    puts  $license $v::license
+    close $license
+    return
+}
+
+proc ::critcl::app::CreateTeapotMetadata {pkgdir} {
+    if {![llength $v::meta]} {
+	critcl::error "Meta data missing"
+	return
+    }
+
+    # Merge the data from all input files, creating a list of words
+    # per key. Note: Data from later input files does not replace
+    # previous words, they get added instead.
+
+    set umd {}
+    foreach md $v::meta {
+	foreach {k vlist} $md {
+	    foreach v $vlist {
+		dict lappend umd $k $v
+	    }
+	}
+    }
+
+    # Check the identifying keys, i.e. package name, version, and
+    # platform for existence.
+
+    foreach k {name version platform} {
+	if {![dict exists $umd $k]} {
+	    critcl::error "Package $k missing in meta data"
+	}
+    }
+
+
+    # Collapse the data of various keys which must have only one,
+    # unique, element.
+
+    foreach k {name version platform build::date generated::date} {
+	if {![dict exists $umd $k]} continue
+	dict set umd $k [lindex [dict get $umd $k] 0]
+    }
+
+    # Add the entity information, and format the data for writing,
+    # using the "external" format for TEApot meta data. This writer
+    # limits lines to 72 characters, roughly. Beyond that nothing is
+    # done to make the output look pretty.
+
+    set md {}
+    lappend md "Package [dict get $umd name] [dict get $umd version]"
+    dict unset umd name
+    dict unset umd version
+
+    dict for {k vlist} $umd {
+	set init 1
+	foreach v $vlist {
+	    if {$init} {
+		# The first element of the value list is always added,
+		# regardless of length, to avoid infinite looping
+		# without progress.
+		set line {}
+		lappend line Meta $k $v
+		set init 0
+		continue
+	    }
+	    if {[string length [linsert $line end $v]] > 72} {
+		# If the next element brings us beyond the limit we
+		# flush the current state and re-initialize.
+		lappend md $line
+		set line {}
+		lappend line Meta $k $v
+		set init 0
+		continue
+	    }
+	    # Add the current element, extending the line.
+	    lappend line $v
+	}
+
+	# Flush the last line.
+	lappend md $line
+    }
+
+    # Last step, write the formatted meta data to the associated file.
+
+    set    teapot [open [file join $pkgdir teapot.txt] w]
+    puts  $teapot [join $md \n]
+    close $teapot
+    return
+}
+
+proc ::critcl::app::PlaceTclCompanionFiles {pkgdir} {
+    # Arrange for the companion Tcl source files (as specified by
+    # critcl::tsources) to be copied into the Tcl subdirectory (in
+    # accordance with TIP 55)
+
+    if {![llength $v::tsources]} { return {} }
+
+    set tcldir [file join $pkgdir tcl]
+    file mkdir $tcldir
+    set files {}
+    set id 0
+    foreach t $v::tsources {
+	set dst [file tail $t]
+	set dst [file rootname $dst]_[incr id][file extension $dst]
+
+	file copy -force $t $tcldir/$dst
+	lappend files $dst
+
+	# Metadata management
+	lappend v::meta [list included tcl/$dst]
+    }
+    return $files
+}
+
+proc ::critcl::app::CreateRuntimeSupport {pkgdir} {
+    # Create the critcl-rt.tcl file in the generated package. This
+    # provides the code which dynamically assembles at runtime the
+    # package loading code, i.e. the 'package ifneeded' command
+    # expected by Tcl package management.
+
+    variable mydir
+    set runtime [file join $mydir runtime.tcl]
+
+    if {![file exists $runtime]} {
+	critcl::error "can't find Critcl's package runtime support file \"runtime.tcl\""
+    }
+
+    set fd [open $runtime]
+    set txt [read $fd]
+    close $fd
+
+    append txt [DummyCritclPackage]
+    append txt [PlatformGeneric]
+
+    set    fd [open [file join $pkgdir critcl-rt.tcl] w]
+    puts  $fd $txt
+    close $fd
+
+    lappend v::meta [list included critcl-rt.tcl]
+    return
+}
+
+proc ::critcl::app::DummyCritclPackage {} {
+    # This command provides conditional no-ops for any of the critcl
+    # procedures exported by the regular package, so that a .tcl file
+    # with embedded C can also be its own companion file declaring Tcl
+    # procedures etc. These dummy procedures are defined if and only
+    # if their regular counterpart is not present.
+
+    # Note: We are generating code checking each and every relevant
+    # command individually to avoid trouble with different versions of
+    # critcl which may export a differing set of procedures. This way
+    # we will not miss anything just because we assumed that the
+    # presence of critcl::FOO also implies having critcl::BAR, or not.
+
+    # Append dummy Critcl procs
+    # XXX This should be made conditional on the .tcl actually using itself as companion.
+    append txt "\n\# Dummy implementation of the critcl package, if not present\n"
+
+    foreach name [lsort [namespace eval ::critcl {namespace export}]] {
+	switch $name {
+	    compiled  { set result 1 }
+	    compiling { set result 0 }
+	    done      { set result 1 }
+	    check     { set result 0 }
+	    failed    { set result 0 }
+	    load      { set result 1 }
+	    Ignore    { append txt [DummyCritclCommand $name {
+		namespace eval ::critcl::v {}
+		set ::critcl::v::ignore([file normalize [lindex $args 0]]) .
+	    }]
+		continue
+	    }
+	    default   {
+		append txt [DummyCritclCommand $name {}]
+		continue
+	    }
+	}
+	append txt [DummyCritclCommand $name "return $result"]
+    }
+
+    return $txt
+}
+
+proc ::critcl::app::DummyCritclCommand {name result} {
+    append txt "if \{!\[llength \[info commands ::critcl::$name\]\]\} \{\n"
+    append txt "    namespace eval ::critcl \{\}\n"
+    append txt "    proc ::critcl::$name \{args\} \{$result\}\n"
+    append txt "\}\n"
+    return $txt
+}
+
+proc ::critcl::app::PlatformGeneric {} {
+    # Return a clone of the platform::generic command, from the
+    # currently loaded platform package. The generated package cannot
+    # assume that the deployment environment contains this package. To
+    # avoid trouble if the DP has the package the definition is made
+    # conditional, i.e. the clone is skipped if the command is already
+    # present.
+
+    set body [info body ::platform::generic]
+
+    append txt "\n# Define a clone of platform::generic, if needed\n"
+    append txt "if \{!\[llength \[info commands ::platform::generic\]\]\} \{\n"
+    append txt "    namespace eval ::platform \{\}\n"
+    append txt "    proc ::platform::generic \{\} \{"
+    append txt [join [split $body \n] "\n    "]
+    append txt "\}\n"
+    append txt "\}\n\n"
+
+    return $txt
+}
+
+proc ::critcl::app::AssembleTEA {} {
+    LogLn {Assembling TEA hierarchy...}
+
+    set libdir  [CreateLibDirectory]
+    set libname [file rootname [file tail $v::outname]]
+    set pkgdir  [file join $libdir $libname]
+
+    LogLn "\tPackage: $pkgdir"
+
+    file mkdir $pkgdir
+
+    # Get a proper version number
+    set ver 0.0
+    if {[llength $v::ver]} {
+	set ver [lindex $v::ver 0]
+    }
+    # Get a proper organization this is licensed by
+    set org Unknown
+    if {[llength $v::org]} {
+	set org [lindex $v::org 0]
+    }
+
+    PlaceTEASupport    $pkgdir $libname $ver $org
+    PlaceCritclSupport $pkgdir
+    PlaceInputFiles    $pkgdir
+
+    # Last, meta data for the TEA setup.
+    CreateTeapotMetadata $pkgdir
+    return
+}
+
+proc ::critcl::app::CreateLibDirectory {} {
+    set libdir [file normalize $v::libdir]
+    if {[file isfile $libdir]} {
+	critcl::error "can't package $v::shlname - $libdir is not a directory"
+    } elseif {![file isdirectory $libdir]} {
+	file mkdir $libdir
+    }
+
+    return $libdir
+}
+
+proc ::critcl::app::CreateIncludeDirectory {} {
+    set incdir [file normalize $v::incdir]
+    if {[file isfile $incdir]} {
+	::critcl::error "can't package $v::shlname headers - $incdir is not a directory"
+    } elseif {![file isdirectory $incdir]} {
+	file mkdir $incdir
+    }
+
+    return $incdir
+}
+
+proc ::critcl::app::PlaceTEASupport {pkgdir pkgname pversion porg} {
+    # Create the configure.in file in the generated TEA
+    # hierarchy.
+
+    LogLn "\tPlacing TEA support..."
+
+    foreach {pmajor pminor} [split $pversion .] break
+    if {$pminor eq {}} { set pminor 0 }
+    if {$pmajor eq {}} { set pmajor 0 }
+
+    variable mydir
+    set tea [file join $mydir tea]
+
+    if {![file exists $tea]} {
+	critcl::error "can't find Critcl's TEA support files"
+    }
+
+    # Copy the raw support files over.
+    foreach f [glob -directory $tea *] {
+	file copy $f $pkgdir
+
+	if {[file tail $f] eq "tclconfig"} {
+	    foreach f [glob -directory $tea/tclconfig *] {
+		lappend v::meta [list included tclconfig/[file tail $f]]
+	    }
+	} else {
+	    lappend v::meta [list included [file tail $f]]
+	}
+    }
+
+    # Basic map for the placeholders in the templates
+
+    set now  [clock seconds]
+    set year [clock format $now -format {%Y}]
+    set now  [clock format $now]
+    set map  [list \
+		 @@CRITCL@@     "\"$::argv0 $::argv\"" \
+		 @@PNAME@@   $pkgname \
+		 @@PMAJORV@@ $pmajor  \
+		 @@PMINORV@@ $pminor  \
+		 @@PFILES@@  "\\\n\t[join $v::teasrc " \\\n\t"]" \
+		 @@PORG@@    $porg \
+		 @@YEAR@@    $year \
+		 @@NOW@@     $now]
+    set cmap $map
+    set mmap $map
+
+    # Extend map with stubs API data
+
+    if {![llength $v::imported]} {
+	lappend cmap @@API@@ {}
+	lappend mmap @@API@@ {} @@APIUSE@@ {}
+    } else {
+	set macros {}
+	# Creating the --with-foo-include options for imported APIs.
+
+	lappend macros "#-----------------------------------------------------------------------"
+	lappend macros "## TEA stubs header setup"
+	lappend macros ""
+	foreach api $v::imported {
+	    set capi [string map {:: _} $api]
+
+	    lappend macros  "CRITCL_TEA_PUBLIC_PACKAGE_HEADERS(\[$capi\])"
+	    lappend mvardef "CRITCL_API_${capi}_INCLUDE = @CRITCL_API_${capi}_INCLUDE@"
+	    lappend mvaruse "-I \$(CRITCL_API_${capi}_INCLUDE)"
+	}
+	lappend cmap @@API@@    \n[join $macros \n]\n
+	lappend mmap @@API@@    \n[join $mvardef \n]\n
+	lappend mmap @@APIUSE@@ " \\\n\t\t[join $mvaruse " \\\n\t\t"]"
+    }
+
+    # Extend map with custom user configuration data.
+
+    if {![llength $v::config]} {
+	lappend cmap @@UCONFIG@@ {}
+	lappend mmap @@UCONFIG@@ {} @@UCONFIGUSE@@ {}
+    } else {
+
+	# Note: While we could assume that the user-specified
+	# configuration options of a single file are consistent with
+	# each other here we have a union of options from multiple
+	# files. No such assumption can be made. Thus, we unique the
+	# list, and then check that each option name left has a unique
+	# definition as well.
+
+	set ok 1
+	array set udef {}
+	set uclist [lsort -unique $v::config]
+	foreach uc $uclist {
+	    set oname [lindex $uc 0]
+	    if {[info exists udef($oname)]} {
+		LogLn "\t    Inconsistent definition for $oname"
+		LogLn "\t    (1) $uc"
+		LogLn "\t    (2) $udef($oname)"
+		set ok 0
+		continue
+	    }
+	    set udef($oname) $uc
+	}
+	if {!$ok} {
+	    ::critcl::error "Conflicting user-specified configuration settings."
+	}
+
+	# Creating the --(with,enable,disable)-foo options for
+	# user-specified configuration options.
+
+	lappend macros "#-----------------------------------------------------------------------"
+	lappend macros "## TEA user option setup"
+	lappend macros ""
+	foreach uc $uclist {
+	    lassign $uc oname odesc otype odefault
+
+	    if {$otype eq "bool"} {
+		set odefault [expr {$odefault ? "yes" : "no"}]
+		if {$odesc eq {}} {
+		    set odesc "--enable-$oname"
+		}
+		append odesc " (default: $odefault)"
+
+		lappend macros  "CRITCL_TEA_BOOL_CONFIG(\[$oname\],\n\t\[$odefault\],\n\t\[$odesc\])"
+	    } else {
+		if {$odesc eq {}} {
+		    set odesc "--with-$oname"
+		}
+		append odesc " (default: $odefault, of [join $otype {, }])"
+
+		lappend macros  "CRITCL_TEA_WITH_CONFIG(\[$oname\],\n\t\[[join $otype { }]\],\n\t\[$odefault\],\n\t\[$odesc\])"
+	    }
+
+	    lappend mvardef "CRITCL_UCONFIG_${oname} = @CRITCL_UCONFIG_${oname}@"
+	    lappend mvaruse "\$(CRITCL_UCONFIG_${oname})"
+	}
+	lappend cmap @@UCONFIG@@    \n[join $macros \n]\n
+	lappend mmap @@UCONFIG@@    \n[join $mvardef \n]\n
+	lappend mmap @@UCONFIGUSE@@ " \\\n\t\t[join $mvaruse " \\\n\t\t"]"
+    }
+
+    # Postprocess a few files (configure.in, Makefile.in).
+
+    Map  [file join $pkgdir configure.in] $cmap
+    Map  [file join $pkgdir Makefile.in]  $mmap
+    Map  [file join $pkgdir Config.in]    $map
+
+    # At last locate a suitable autoconf (2.59+), and generate
+    # configure from the configure.in.
+
+    set here [pwd]
+    cd $pkgdir
+    if {$::tcl_platform(platform) eq "windows"} {
+	# msys/mingw, cygwin, or other unix emulation on windows.
+	exec sh [LocateAutoconf 1]
+    } else {
+	exec [LocateAutoconf 0]
+    }
+    file delete -force autom4te.cache
+
+    lappend v::meta [list included configure]
+
+    cd $here
+
+    return
+}
+
+proc ::critcl::app::Map {path map} {
+    set fd  [open $path r]
+    set txt [read $fd]
+    close $fd
+
+    set txt [string map $map $txt]
+
+    set    fd  [open $path w]
+    puts -nonewline $fd $txt
+    close $fd
+
+    return
+}
+
+proc ::critcl::app::PlaceCritclSupport {pkgdir} {
+    LogLn "\tPlacing Critcl support..."
+
+    set c [file join $pkgdir critcl]
+    set l [file join $c lib]
+    file mkdir $l
+
+    # Locate the critcl packages, and their forward compatibility
+    # support packages, and copy them into the TEA hierarchy for use
+    # by the generated Makefile.
+    foreach {pkg dir} {
+	critcl            critcl
+	critcl::app       app-critcl
+	critcl::util      critcl-util
+        critcl::class     critcl-class
+        critcl::iassoc    critcl-iassoc
+        critcl::bitmap    critcl-bitmap
+        critcl::cutil     critcl-cutil
+        critcl::emap      critcl-emap
+        critcl::enum      critcl-enum
+        critcl::literals  critcl-literals
+        critcl::platform  critcl-platform
+	stubs::container  stubs_container
+        stubs::gen        stubs_genframe
+        stubs::gen::decl  stubs_gen_decl
+        stubs::gen::lib   stubs_gen_lib
+        stubs::gen::macro stubs_gen_macro
+        stubs::gen::slot  stubs_gen_slot
+        stubs::gen::header stubs_gen_header
+        stubs::gen::init  stubs_gen_init
+        stubs::reader     stubs_reader
+        stubs::writer     stubs_writer
+    } {
+	set cmd      [package ifneeded $pkg [package require $pkg]]
+	set location [file dirname [lindex $cmd end]]
+
+	# Squash any soft-links, which Tcl would copy as links.
+	set location [file dirname [file normalize $location/__]]
+	file copy $location $l/$dir
+    }
+
+    # Generate a suitable main.tcl. Note that this main file sources
+    # the critcl packages directly, to ensure that the build uses the
+    # code put into the generated TEA hierarchy, and is not influenced
+    # by whatever is installed outside.
+
+    set     pfiles {}
+    lappend pfiles stubs_container/container stubs_reader/reader
+    lappend pfiles stubs_genframe/genframe stubs_gen_decl/gen_decl
+    lappend pfiles stubs_gen_macro/gen_macro stubs_gen_slot/gen_slot
+    lappend pfiles stubs_gen_header/gen_header stubs_gen_init/gen_init
+    lappend pfiles stubs_gen_lib/gen_lib stubs_writer/writer
+    lappend pfiles critcl/critcl app-critcl/critcl critcl-util/util
+    lappend pfiles critcl-class/class critcl-iassoc/iassoc
+    lappend pfiles critcl-bitmap/bitmap critcl-cutil/cutil
+    lappend pfiles critcl-literals/literals critcl-platform/platform
+    lappend pfiles critcl-emap/emap critcl-enum/enum
+
+    set fd [open [file join $pkgdir critcl main.tcl] w]
+    puts $fd [join \
+		  [list \
+		       "# Required packages: cmdline, md5" \
+		       "# Optional: tcllibc, Trf, md5c, cryptkit (md5 acceleration)" \
+		       "# Enforce usage of the local critcl packages." \
+		       "foreach p \{\n\t[join $pfiles \n\t]\n\} \{" \
+		       {    source [file dirname [info script]]/lib/$p.tcl} \
+		       "\}" \
+		       {critcl::app::main $argv}] \n]
+    close $fd
+
+    # Add to set of included files.
+    lappend v::meta [list included critcl/main.tcl]
+    foreach p $pfiles {
+	lappend v::meta [list included critcl/lib/$p.tcl]
+    }
+    return
+}
+
+proc ::critcl::app::PlaceInputFiles {pkgdir} {
+    LogLn "\tPlacing input files..."
+
+    # Main critcl source file(s), plus companions
+
+    foreach f $v::src {
+	#LogLn "\tB   $f"
+
+	set dst [file join src [file tail $f]]
+	lappend v::meta [list included $dst]
+
+	set dst [file join $pkgdir $dst]
+	file mkdir [file dirname $dst]
+	file copy $f $dst
+    }
+
+    foreach {f cf} $v::cfiles {
+	set base [file dirname $f]
+	foreach f [lsort -unique $cf] {
+	    set fs [file join $base $f]
+
+	    #LogLn "\tC   $fs"
+
+	    set dst [file join src $f]
+	    lappend v::meta [list included $dst]
+
+	    set dst [file join $pkgdir $dst]
+
+	    file mkdir [file dirname $dst]
+	    file copy $fs $dst
+	}
+    }
+    return
+}
+
+proc ::critcl::app::LocateAutoconf {iswin} {
+    set ac [auto_execok autoconf]
+
+    if {$ac eq {}} {
+	return -code error "autoconf 2.59 or higher required, not found"
+    }
+
+    if {$iswin} {
+	# msys/mingw, cygwin, or other unix emulation on windows.
+	set cmd [linsert $ac 0 exec sh]
+    } else {
+	set cmd [linsert $ac 0 exec]
+    }
+
+    set v [lindex [split [eval [linsert $cmd end --version]] \n] 0 end]
+
+    if {![package vsatisfies $v 2.59]} {
+	return -code error "$ac $v is not 2.59 or higher, as required"
+    }
+
+    return $ac
+}
+
+# # ## ### ##### ######## ############# #####################
+
+namespace eval ::critcl::app {
+    # Path of the application package directory.
+    variable myself [file normalize [info script]]
+    variable mydir [file dirname $myself]
+
+    variable options {
+	I.arg L.arg cache.arg clean config.arg debug.arg force help
+	keep libdir.arg pkg show showall target.arg targets
+	test tea showtarget includedir.arg enable.arg disable.arg
+	v -version
+    }
+
+    # Application state
+    namespace eval v {
+	# - -- --- ----- -------- ------------- ---------------------
+	# Data collected from the command line.
+
+	variable verbose    0 ;# Level of chattering written during a run.
+	variable src       {} ;# List of files to process.
+
+	variable actualplatform {} ;# Target platform, with x-compile information resolved.
+
+	variable shlname   "" ;# Name of the shlib to generate (-pkg, -tea).
+	variable outname   "" ;# Name of the shlib dir to use (-pkg, -tea).
+	variable libdir   lib ;# Place for the package (-pkg, -tea).
+	variable incdir   include ; # Directory to put the -pkg include files into (stubs export),
+                                    # and search in (stubs import)
+	variable keep       0 ;# Boolean flag. Default: Do not keep generated .c files.
+	variable debug     {} ;# List of debug modes to activate.
+	variable cache     {} ;# User specified path to the directory for the result cache.
+	variable uc        {} ;# List. User specified configuration data.
+
+	# Build mode. Default is to fill the result
+	# cache. Alternatives are building a package (-pkg), or
+	# assembling/repackaging for TEWA (-tea).
+
+	variable mode cache ;# pkg, tea
+
+	# - -- --- ----- -------- ------------- ---------------------
+	# Data accumulated while processing the input files.
+
+	variable failed      0  ;# Number of build failures encountered.
+	variable clibraries {}  ;# External libraries used. To link the final shlib against.
+	variable ldflags    {}  ;# Linker flags.
+	variable objects    {}  ;# The object files to link.
+	variable edecls     {}  ;# Initialization function decls for the pieces (C code block).
+	variable initnames  {}  ;# Initialization function calls for the pieces (C code block).
+	variable tsources   {}  ;# Tcl companion sources.
+	variable mintcl     8.4 ;# Minimum version of Tcl required to run the package.
+	variable preload    {}  ;# List of libraries declared for preload.
+	variable license    {}  ;# Accumulated licenses, if any.
+	variable pkgs       {}  ;# List of package names for the pieces.
+	variable inits      {}  ;# Init function names for the pieces, list.
+	variable meta       {}  ;# All meta data declared by the input files.
+
+	# critcl::scan results
+	variable org        {}  ;# Organization package is licensed by
+	variable ver        {}  ;# Version of the package.
+	variable cfiles     {}  ;# Companion files (.tcl, .c, .h, etc).
+	variable teasrc     {}  ;# Input file(s) transformed for use in the Makefile.in.
+	variable imported   {}  ;# List of stubs APIs imported from elsewhere.
+	variable config     {}  ;# List of user-specified configuration settings.
+	# variable meta         ;# See above.
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+return
diff --git a/src/vfs/critcl.vfs/lib/app-critcl/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/app-critcl/pkgIndex.tcl
new file mode 100644
index 00000000..e45086a7
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/app-critcl/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+package ifneeded critcl::app 3.2.1 [list source [file join $dir critcl.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/app-critcl/runtime.tcl b/src/vfs/critcl.vfs/lib/app-critcl/runtime.tcl
new file mode 100644
index 00000000..e6b95918
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/app-critcl/runtime.tcl
@@ -0,0 +1,134 @@
+#
+#   Critcl - build C extensions on-the-fly
+#
+#   Copyright (c) 2001-2007 Jean-Claude Wippler
+#   Copyright (c) 2002-2007 Steve Landers
+#
+#   See http://wiki.tcl.tk/critcl
+#
+#   This is the Critcl runtime that loads the appropriate
+#   shared library when a package is requested
+#
+
+namespace eval ::critcl::runtime {}
+
+proc ::critcl::runtime::loadlib {dir package version libname initfun tsrc mapping args} {
+    # XXX At least parts of this can be done by the package generator,
+    # XXX like listing the Tcl files to source. The glob here allows
+    # XXX code-injection after-the-fact, by simply adding a .tcl in
+    # XXX the proper place.
+    set path [file join $dir [MapPlatform $mapping]]
+    set ext [info sharedlibextension]
+    set lib [file join $path $libname$ext]
+    set provide [list]
+
+    # Now the runtime equivalent of a series of 'preFetch' commands.
+    if {[llength $args]} {
+	set preload [file join $path preload$ext]
+	foreach p $args {
+	    set prelib [file join $path $p$ext]
+	    if {[file readable $preload] && [file readable $prelib]} {
+		lappend provide [list load $preload];# XXX Move this out of the loop, do only once.
+		lappend provide [list ::critcl::runtime::preload $prelib]
+	    }
+	}
+    }
+
+    lappend provide [list load $lib $initfun]
+    foreach t $tsrc {
+	lappend loadcmd "::critcl::runtime::Fetch \$dir [list $t]"
+    }
+    lappend provide "package provide $package $version"
+    package ifneeded $package $version [join $provide "\n"]
+    return
+}
+
+proc ::critcl::runtime::preFetch {path ext dll} {
+    set preload [file join $path preload$ext]
+    if {![file readable $preload]} return
+
+    set prelib [file join $path $dll$ext]
+    if {![file readable $prelib]} return
+
+    load $preload ; # Defines next command.
+    ::critcl::runtime::preload $prelib
+    return
+}
+
+proc ::critcl::runtime::Fetch {dir t} {
+    # The 'Ignore' disables compile & run functionality.
+
+    # Background: If the regular critcl package is already loaded, and
+    # this prebuilt package uses its defining .tcl file also as a
+    # 'tsources' then critcl might try to collect data and build it
+    # because of the calls to its API, despite the necessary binaries
+    # already being present, just not in the critcl cache. That is
+    # redundant in the best case, and fails in the worst case (no
+    # compiler), preventing the use o a perfectly fine package. The
+    # 'ignore' call now tells critcl that it should ignore any calls
+    # made to it by the sourced files, and thus avoids that trouble.
+
+    # The other case, the regular critcl package getting loaded after
+    # this prebuilt package is irrelevant. At that point the tsources
+    # were already run, and used the dummy procedures defined in the
+    # critcl-rt.tcl, which ignore the calls by definition.
+
+    set t [file join $dir tcl $t]
+    ::critcl::Ignore $t
+    uplevel #0 [list source $t]
+    return
+}
+
+proc ::critcl::runtime::precopy {dll} {
+    # This command is only used on Windows when preloading out of a
+    # VFS that doesn't support direct loading (usually, a Starkit)
+    #   - we preserve the dll name so that dependencies are satisfied
+    #	- The critcl::runtime::preload command is defined in the supporting
+    #     "preload" package, implemented in "critcl/lib/critcl/critcl_c/preload.c"
+
+    global env
+    if {[info exists env(TEMP)]} {
+	set dir $env(TEMP)
+    } elseif {[info exists env(TMP)]} {
+	set dir $env(TMP)
+    } elseif {[file exists $env(HOME)]} {
+	set dir $env(HOME)
+    } else {
+	set dir .
+    }
+    set dir [file join $dir TCL[pid]]
+    set i 0
+    while {[file exists $dir]} {
+	append dir [incr i]
+    }
+    set new [file join $dir [file tail $dll]]
+    file mkdir $dir
+    file copy $dll $new
+    return $new
+}
+
+proc ::critcl::runtime::MapPlatform {{mapping {}}} {
+    # A sibling of critcl::platform that applies the platform mapping
+
+    set platform [::platform::generic]
+    set version $::tcl_platform(osVersion)
+    if {[string match "macosx-*" $platform]} {
+	# "normalize" the osVersion to match OSX release numbers
+	set v [split $version .]
+	set v1 [lindex $v 0]
+	set v2 [lindex $v 1]
+	incr v1 -4
+	set version 10.$v1.$v2
+    } else {
+	# Strip trailing non-version info
+	regsub -- {-.*$} $version {} version
+    }
+    foreach {config map} $mapping {
+	if {![string match $config $platform]} continue
+	set minver [lindex $map 1]
+	if {[package vcompare $version $minver] < 0} continue
+	set platform [lindex $map 0]
+	break
+    }
+    return $platform
+}
diff --git a/src/vfs/critcl.vfs/lib/app-critcl/tea/Config.in b/src/vfs/critcl.vfs/lib/app-critcl/tea/Config.in
new file mode 100644
index 00000000..f71888e4
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/app-critcl/tea/Config.in
@@ -0,0 +1,188 @@
+## -*- tcl -*- Critcl configuration file
+# # ## ### ##### ######## ############# #####################
+## For
+# 	@@PNAME@@ @@PMAJORV@@.@@PMINORV@@
+#
+# Copyright (c) @@YEAR@@ @@PORG@@
+#
+# Generated by @@CRITCL@@
+# At           @@NOW@@
+
+# This specific file gets filled by the TEA configure(.in) with the
+# compiler information it found when run, and the accompanying
+# Makefile(.in) uses it to overide critcl's default configuration
+# settings. In this way we manage to get a proper TEA setup of flags
+# and such, bypassing all of critcl's own selection logic. critcl is
+# essentially 'just' used as a custom compiler driver, whereas a
+# standard TEA Makefile would have all the relevant commands listed
+# explicitly in its rules.
+
+# # ## ### ##### ######## ############# #####################
+## First, keep the GCC specific defaults.
+
+compile         gcc -c -fPIC
+version         gcc -v
+link            gcc -shared
+include         -I
+preproc_define  gcc -E -dM
+preproc_enum    gcc -E
+tclstubs        -DUSE_TCL_STUBS
+tkstubs         -DUSE_TK_STUBS
+debug_memory    -DTCL_MEM_DEBUG
+debug_symbols   -g
+object          .o
+output          -o [list $outfile]
+ldoutput
+link_debug
+link_release
+link_preload    --unresolved-symbols=ignore-in-shared-libs
+strip           -Wl,-s
+optimize        -O2
+noassert        -DNDEBUG
+threadflags     -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1    \
+                -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1   \
+                -DTCL_THREADS=1
+
+
+# # ## ### ##### ######## ############# #####################
+## Second, define settings based on the system information found by
+## configure(.in), converted into something usable by critcl. See the
+## section below for the raw settings.
+
+TEA platform        @CRITCL_PLATFORM@
+TEA compile         @CRITCL_CC@
+TEA version         @CRITCL_VERSION@
+TEA link            @CRITCL_LINK@
+TEA preproc_define  @CRITCL_CPP_DEFINE@
+TEA preproc_enum    @CRITCL_CPP_ENUM@
+TEA debug_symbols   @CFLAGS_DEBUG@
+TEA object          .@OBJEXT@
+TEA output          @CRITCL_CC_OUTPUT@
+TEA ldoutput        @CRITCL_LD_OUTPUT@
+TEA link_debug      @CRITCL_LD_DBG@
+TEA link_release    @CRITCL_LD_REL@
+TEA link_preload    --unresolved-symbols=ignore-in-shared-libs
+TEA strip           
+TEA optimize        @CFLAGS_OPTIMIZE@
+
+
+# # ## ### ##### ######## ############# #####################
+## Third, the exact raw settings generated by configure(.in),
+## as found in build_dir/config.status. To help debugging the
+## munging, when its wrong.
+##
+## The lines marked with ** are those which are of especially high
+## interest.
+
+#**	CC			= (@CC@)
+#**	CFLAGS			= (@CFLAGS@)
+#**	CFLAGS_DEBUG		= (@CFLAGS_DEBUG@)
+#**	CFLAGS_OPTIMIZE		= (@CFLAGS_OPTIMIZE@)
+#**	CFLAGS_WARNING		= (@CFLAGS_WARNING@)
+#**	CPP			= (@CPP@)
+#**	CPPFLAGS		= (@CPPFLAGS@)
+#**	DEFS			= (@DEFS@)
+#**	LDFLAGS			= (@LDFLAGS@)
+#**	LDFLAGS_DEFAULT		= (@LDFLAGS_DEFAULT@)
+#**	LIBS			= (@LIBS@)
+#**	MAKE_LIB		= (@MAKE_LIB@)
+#**	MAKE_SHARED_LIB		= (@MAKE_SHARED_LIB@)
+#**	MAKE_STATIC_LIB		= (@MAKE_STATIC_LIB@)
+#**	MAKE_STUB_LIB		= (@MAKE_STUB_LIB@)
+#**	MATH_LIBS		= (@MATH_LIBS@)
+#**	OBJEXT			= (@OBJEXT@)
+#**	SHLIB_CFLAGS		= (@SHLIB_CFLAGS@)
+#**	SHLIB_LD		= (@SHLIB_LD@)
+#**	SHLIB_LD_LIBS		= (@SHLIB_LD_LIBS@)
+#**	SHLIB_SUFFIX		= (@SHLIB_SUFFIX@)
+#**	STLIB_LD		= (@STLIB_LD@)
+#**	TCL_EXTRA_CFLAGS	= (@TCL_EXTRA_CFLAGS@)
+#**	TCL_INCLUDES		= (@TCL_INCLUDES@)
+#**	TCL_LD_FLAGS		= (@TCL_LD_FLAGS@)
+#**	TCL_LIBS		= (@TCL_LIBS@)
+#**	TCL_SHLIB_LD_LIBS	= (@TCL_SHLIB_LD_LIBS@)
+#**	TCL_THREADS		= (@TCL_THREADS@)
+
+#	AR			= (@AR@)
+#	CELIB_DIR		= (@CELIB_DIR@)
+#	CFLAGS_DEFAULT		= (@CFLAGS_DEFAULT@)
+#	CLEANFILES		= (@CLEANFILES@)
+#	CYGPATH			= (@CYGPATH@)
+#	ECHO_C			= (@ECHO_C@)
+#	ECHO_N			= (@ECHO_N@)
+#	ECHO_T			= (@ECHO_T@)
+#	EGREP			= (@EGREP@)
+#	EXEEXT			= (@EXEEXT@)
+#	GREP			= (@GREP@)
+#	INSTALL_DATA		= (@INSTALL_DATA@)
+#	INSTALL_PROGRAM		= (@INSTALL_PROGRAM@)
+#	INSTALL_SCRIPT		= (@INSTALL_SCRIPT@)
+#	LD_LIBRARY_PATH_VAR	= (@LD_LIBRARY_PATH_VAR@)
+#	LIBOBJS			= (@LIBOBJS@)
+#	LTLIBOBJS		= (@LTLIBOBJS@)
+#	PACKAGE_BUGREPORT	= (@PACKAGE_BUGREPORT@)
+#	PACKAGE_NAME		= (@PACKAGE_NAME@)
+#	PACKAGE_STRING		= (@PACKAGE_STRING@)
+#	PACKAGE_TARNAME		= (@PACKAGE_TARNAME@)
+#	PACKAGE_VERSION		= (@PACKAGE_VERSION@)
+#	PATH_SEPARATOR		= (@PATH_SEPARATOR@)
+#	PKG_CFLAGS		= (@PKG_CFLAGS@)
+#	PKG_HEADERS		= (@PKG_HEADERS@)
+#	PKG_INCLUDES		= (@PKG_INCLUDES@)
+#	PKG_LIBS		= (@PKG_LIBS@)
+#	PKG_LIB_FILE		= (@PKG_LIB_FILE@)
+#	PKG_OBJECTS		= (@PKG_OBJECTS@)
+#	PKG_SOURCES		= (@PKG_SOURCES@)
+#	PKG_STUB_LIB_FILE	= (@PKG_STUB_LIB_FILE@)
+#	PKG_STUB_OBJECTS	= (@PKG_STUB_OBJECTS@)
+#	PKG_STUB_SOURCES	= (@PKG_STUB_SOURCES@)
+#	PKG_TCL_SOURCES		= (@PKG_TCL_SOURCES@)
+#	RANLIB			= (@RANLIB@)
+#	RANLIB_STUB		= (@RANLIB_STUB@)
+#	SET_MAKE		= (@SET_MAKE@)
+#	SHARED_BUILD		= (@SHARED_BUILD@)
+#	SHELL			= (@SHELL@)
+#	TCLSH_PROG		= (@TCLSH_PROG@)
+#	TCL_BIN_DIR		= (@TCL_BIN_DIR@)
+#	TCL_DBGX		= (@TCL_DBGX@)
+#	TCL_DEFS		= (@TCL_DEFS@)
+#	TCL_LIB_FILE		= (@TCL_LIB_FILE@)
+#	TCL_LIB_FLAG		= (@TCL_LIB_FLAG@)
+#	TCL_LIB_SPEC		= (@TCL_LIB_SPEC@)
+#	TCL_PATCH_LEVEL		= (@TCL_PATCH_LEVEL@)
+#	TCL_SRC_DIR		= (@TCL_SRC_DIR@)
+#	TCL_STUB_LIB_FILE	= (@TCL_STUB_LIB_FILE@)
+#	TCL_STUB_LIB_FLAG	= (@TCL_STUB_LIB_FLAG@)
+#	TCL_STUB_LIB_SPEC	= (@TCL_STUB_LIB_SPEC@)
+#	TCL_VERSION		= (@TCL_VERSION@)
+#	VC_MANIFEST_EMBED_DLL	= (@VC_MANIFEST_EMBED_DLL@)
+#	VC_MANIFEST_EMBED_EXE	= (@VC_MANIFEST_EMBED_EXE@)
+
+#	ac_ct_CC		= (@ac_ct_CC@)
+#	bindir			= (@bindir@)
+#	build_alias		= (@build_alias@)
+#	datadir			= (@datadir@)
+#	datarootdir		= (@datarootdir@)
+#	docdir			= (@docdir@)
+#	dvidir			= (@dvidir@)
+#	exec_prefix		= (@exec_prefix@)
+#	host_alias		= (@host_alias@)
+#	htmldir			= (@htmldir@)
+#	includedir		= (@includedir@)
+#	infodir			= (@infodir@)
+#	libdir			= (@libdir@)
+#	libexecdir		= (@libexecdir@)
+#	localedir		= (@localedir@)
+#	localstatedir		= (@localstatedir@)
+#	mandir			= (@mandir@)
+#	oldincludedir		= (@oldincludedir@)
+#	pdfdir			= (@pdfdir@)
+#	prefix			= (@prefix@)
+#	program_transform_name	= (@program_transform_name@)
+#	psdir			= (@psdir@)
+#	sbindir			= (@sbindir@)
+#	sharedstatedir		= (@sharedstatedir@)
+#	sysconfdir		= (@sysconfdir@)
+#	target_alias		= (@target_alias@)
+
+# # ## ### ##### ######## ############# #####################
diff --git a/src/vfs/critcl.vfs/lib/app-critcl/tea/Makefile.in b/src/vfs/critcl.vfs/lib/app-critcl/tea/Makefile.in
new file mode 100644
index 00000000..3173aa50
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/app-critcl/tea/Makefile.in
@@ -0,0 +1,145 @@
+# Makefile.in --
+#
+#	This file is a Makefile for "@@PNAME@@ @@PMAJORV@@.@@PMINORV@@". If this
+#	is "Makefile.in" then it is a template for a Makefile;  to generate 
+#	the actual Makefile, run "./configure", which is a configuration script
+#	generated by the "autoconf" program (constructs like "@foo@" will get
+#	replaced in the actual Makefile.
+#
+# Copyright (c) @@YEAR@@ @@PORG@@
+#
+# Generated by @@CRITCL@@
+# At           @@NOW@@
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+#========================================================================
+# Nothing of the variables below this line need to be changed.  Please
+# check the TARGETS section below to make sure the make targets are
+# correct.
+#========================================================================
+
+SHELL		= @SHELL@
+
+srcdir		= @srcdir@
+top_srcdir	= @top_srcdir@
+prefix		= @prefix@
+exec_prefix	= @exec_prefix@
+libdir		= @libdir@
+mandir		= @mandir@
+bindir		= @bindir@
+
+sbindir		= @sbindir@
+libexecdir	= @libexecdir@
+datarootdir	= @datarootdir@
+datadir		= @datadir@
+sysconfdir	= @sysconfdir@
+sharedir	= @sharedstatedir@
+statedir	= @localstatedir@
+includedir	= @includedir@
+oldincludedir	= @oldincludedir@
+
+DESTDIR		=
+pkglibdir	= $(libdir)/@PACKAGE_NAME@@PACKAGE_VERSION@
+top_builddir	= .
+
+PACKAGE = @PACKAGE_NAME@
+VERSION = @PACKAGE_VERSION@
+CYGPATH = @CYGPATH@
+
+TCLSH_PROG = @TCLSH_PROG@
+CRITCL     = `$(CYGPATH) $(srcdir)/critcl/main.tcl`
+
+CONFIG_CLEAN_FILES =
+@@API@@
+@@UCONFIG@@
+#========================================================================
+# PKG_TCL_SOURCES identifies Tcl runtime files that are associated with
+# this package that need to be installed, if any.
+#========================================================================
+
+PKG_TCL_SOURCES = @@PFILES@@
+
+#========================================================================
+# Start of user-definable TARGETS section
+#========================================================================
+
+all:
+	@echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+	@echo Please run '"make install"' to build and install the package.
+	@echo Critcl has no separate build-step.
+
+doc:
+	@echo No documentation to build.
+
+install:
+	@echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ; \
+	cat $(top_builddir)/Config | grep -v '^#' ; \
+	echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ; \
+	rm -rf $(top_builddir)/results-tea ; \
+	$(TCLSH_PROG) $(CRITCL) \
+		-I $(prefix)/include \
+		-I $(exec_prefix)/include \
+		-I $(includedir)@@APIUSE@@ \
+		@@UCONFIGUSE@@ \
+		-keep       -cache  $(top_builddir)/results-tea \
+		-target TEA -config $(top_builddir)/Config \
+		-libdir     $(DESTDIR)$(libdir) \
+		-includedir $(DESTDIR)$(includedir) \
+		-pkg $(PACKAGE)$(VERSION) \
+		$(PKG_TCL_SOURCES) ; \
+	echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ; \
+	cat $(top_builddir)/results-tea/*.log
+	echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ; \
+
+install-auto: show-auto
+	@rm -rf $(top_builddir)/results-auto ; \
+	$(TCLSH_PROG) $(CRITCL) \
+		-I $(prefix)/include \
+		-I $(exec_prefix)/include \
+		-I $(includedir)@@APIUSE@@ \
+		@@UCONFIGUSE@@ \
+		-keep -cache $(top_builddir)/results-auto \
+		-libdir     $(DESTDIR)$(libdir) \
+		-includedir $(DESTDIR)$(includedir) \
+		-pkg $(PACKAGE)$(VERSION) \
+		$(PKG_TCL_SOURCES) ; \
+	echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ; \
+	cat $(top_builddir)/results-auto/*.log
+	echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ; \
+
+install-doc:
+	@echo No documentation to install.
+
+show:
+	@$(TCLSH_PROG) $(CRITCL) \
+		-keep -cache $(top_builddir)/results-tea \
+		-target TEA -config $(top_builddir)/Config \
+		-libdir $(DESTDIR)$(libdir) \
+		-pkg -show
+
+show-auto:
+	@$(TCLSH_PROG) $(CRITCL) \
+		-keep -cache $(top_builddir)/results-auto \
+		-libdir $(DESTDIR)$(libdir) \
+		-pkg -show
+
+clean:
+	rm -rf doc *-doc
+
+distclean: clean
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f config.status
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+.PHONY: all binaries clean depend distclean doc install installdirs libraries test
+
+# 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/src/vfs/critcl.vfs/lib/app-critcl/tea/aclocal.m4 b/src/vfs/critcl.vfs/lib/app-critcl/tea/aclocal.m4
new file mode 100644
index 00000000..e4db369f
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/app-critcl/tea/aclocal.m4
@@ -0,0 +1,180 @@
+#
+# Include the TEA standard macro set
+#
+
+builtin(include,tclconfig/tcl.m4)
+
+#
+# Add here whatever m4 macros you want to define for your package
+#
+
+#------------------------------------------------------------------------
+# CRITCL_TEA_PUBLIC_PACKAGE_HEADERS --
+#
+#	Locate the installed public FOO header files
+#
+# Arguments:
+#	Name of the package to search headers for.
+#
+# Requires:
+#	CYGPATH must be set
+#
+# Results:
+#
+#	Adds a --with-[$1]-include switch to configure.
+#	Result is cached.
+#
+#	Substs the following vars:
+#		CRITCL_API_$1_INCLUDE
+#------------------------------------------------------------------------
+
+AC_DEFUN([CRITCL_TEA_PUBLIC_PACKAGE_HEADERS],[
+    # CRITCL_TEA_PUBLIC_PACKAGE_HEADERS: $1
+    AC_MSG_CHECKING([for $1 public headers])
+    AC_ARG_WITH([$1-include], [  --with-$1-include       directory containing the public $1 header files], [with_$1_include=${withval}])
+    AC_CACHE_VAL(ac_cv_c_$1_header, [
+	# Use the value from --with-$1-include, if it was given
+
+	if test x"[$]{with_$1_include}" != x ; then
+	    if test -f "[$]{with_$1_include}/$1Decls.h" ; then
+		ac_cv_c_$1_header=[$]{with_$1_include}
+	    else
+		AC_MSG_ERROR([[$]{with_$1_include} directory does not contain $1Decls.h])
+	    fi
+	else
+	    list=""
+	    if test "`uname -s`" = "Darwin"; then
+		# If $1 was built as a framework, attempt to use
+		# the framework's Headers directory
+		case [$]{$1_DEFS} in
+		    *$1_FRAMEWORK*)
+			list="`ls -d [$]{$1_BIN_DIR}/Headers 2>/dev/null`"
+			;;
+		esac
+	    fi
+
+	    # Check order: pkg --prefix location, Tcl's --prefix location,
+	    # relative to directory of $1Config.sh.
+
+	    eval "temp_includedir=[$]{includedir}"
+	    list="[$]list \
+		`ls -d [$]{temp_includedir}        2>/dev/null` \
+		`ls -d [$]{$1_PREFIX}/include     2>/dev/null` \
+		`ls -d [$]{$1_BIN_DIR}/../include 2>/dev/null` \
+		`ls -d ${TCL_PREFIX}/include     2>/dev/null` \
+		`ls -d ${TCL_BIN_DIR}/../include 2>/dev/null`"
+
+	    if test "[$]{TEA_PLATFORM}" != "windows" -o "[$]GCC" = "yes"; then
+		list="[$]list /usr/local/include /usr/include"
+		if test x"[$]{$1_INCLUDE_SPEC}" != x ; then
+		    d=`echo "[$]{$1_INCLUDE_SPEC}" | sed -e 's/^-I//'`
+		    list="[$]list `ls -d ${d} 2>/dev/null`"
+		fi
+	    fi
+	    for i in [$]list ; do
+		if test -f "[$]i/$1/$1Decls.h" ; then
+		    ac_cv_c_$1_header=[$]i
+		    break
+		fi
+	    done
+	fi
+    ])
+
+    # Print a message based on how we determined the include path
+    if test x"[$]{ac_cv_c_$1_header}" = x ; then
+	AC_MSG_ERROR([$1Decls.h not found.  Please specify its location with --with-$1-include])
+    else
+	AC_MSG_RESULT([[$]{ac_cv_c_$1_header}])
+    fi
+
+    # Convert to a native path and substitute into the transfer variable.
+    # NOTE: Anything going into actual TEA would have to use A TEA_xx
+    # transfer variable, instead of critcl.
+    INCLUDE_DIR_NATIVE=`[$]{CYGPATH} [$]{ac_cv_c_$1_header}`
+    CRITCL_API_$1_INCLUDE="\"[$]{INCLUDE_DIR_NATIVE}\""
+    AC_SUBST([CRITCL_API_$1_INCLUDE])
+])
+
+#------------------------------------------------------------------------
+# CRITCL_TEA_WITH_CONFIG --
+#
+#	Declare a --with-FOO option, with default and legal values.
+#
+# Arguments:
+#	Name of the option.
+#	List of legal values.
+#	Default value.
+#	Option description.
+#
+# Requires:
+# Results:
+#	Adds a --with-[$1] switch to configure.
+#
+#	Substs the following vars:
+#		CRITCL_UCONFIG_$1
+#------------------------------------------------------------------------
+
+AC_DEFUN([CRITCL_TEA_WITH_CONFIG],[
+    # CRITCL_TEA_WITH_CONFIG: $1
+    AC_ARG_WITH([$1],
+	AC_HELP_STRING([--with-$1],
+		       [$4]),
+	[with_uc_$1=${withval}])
+
+    # Use default if user did not specify anything.
+    if test x"[$]{with_uc_$1}" = x ; then
+	with_uc_$1="$3"
+    fi
+
+    AC_MSG_CHECKING([Validating $1])
+    tcl_ok=no
+    for x in $2
+    do
+        if test "[$]x" = "[$]with_uc_$1" ; then
+	    tcl_ok=yes
+	    break
+	fi
+    done
+    if test "[$]tcl_ok" = "no" ; then
+	AC_MSG_ERROR([Illegal value [$]with_uc_$1, expected one of: $2])
+    else
+	AC_MSG_RESULT([[$]with_uc_$1])
+    fi
+
+    CRITCL_UCONFIG_$1="-with-$1 \"[$]with_uc_$1\""
+    AC_SUBST([CRITCL_UCONFIG_$1])
+])
+
+#------------------------------------------------------------------------
+# CRITCL_TEA_BOOL_CONFIG --
+#
+#	Declare a --disable/enable-FOO option, with default.
+#
+# Arguments:
+#	Name of the option.
+#	Default value.
+#	Option description.
+#
+# Requires:
+# Results:
+#	Adds a --enable-[$1] switch to configure.
+#
+#	Substs the following vars:
+#		CRITCL_UCONFIG_$1
+#------------------------------------------------------------------------
+
+AC_DEFUN([CRITCL_TEA_BOOL_CONFIG],[
+    # CRITCL_TEA_BOOL_CONFIG: $1
+    AC_ARG_ENABLE([$1],
+	AC_HELP_STRING([--enable-$1],[$3]),
+	[bool_uc_$1=${enableval}]
+	[bool_uc_$1="$2"])
+
+    if test "bool_uc_$1" = "yes" ; then
+    	CRITCL_UCONFIG_$1="-enable $1"
+    else
+    	CRITCL_UCONFIG_$1="-disable $1"
+    fi
+
+    AC_SUBST([CRITCL_UCONFIG_$1])
+])
diff --git a/src/vfs/critcl.vfs/lib/app-critcl/tea/configure.in b/src/vfs/critcl.vfs/lib/app-critcl/tea/configure.in
new file mode 100644
index 00000000..331b523d
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/app-critcl/tea/configure.in
@@ -0,0 +1,151 @@
+# Configure for
+# 	@@PNAME@@ @@PMAJORV@@.@@PMINORV@@
+#
+# Copyright (c) @@YEAR@@ @@PORG@@
+#
+# Generated by @@CRITCL@@
+# At           @@NOW@@
+
+AC_INIT([@@PNAME@@],[@@PMAJORV@@.@@PMINORV@@])
+
+TEA_INIT([3.9])
+
+AC_CONFIG_AUX_DIR(tclconfig)
+
+#--------------------------------------------------------------------
+# Configure script for package '@@PNAME@@'.
+# TEA compliant.
+#--------------------------------------------------------------------
+
+#--------------------------------------------------------------------
+# Load the tclConfig.sh file
+#--------------------------------------------------------------------
+
+TEA_PATH_TCLCONFIG
+TEA_LOAD_TCLCONFIG
+
+#-----------------------------------------------------------------------
+## Std TEA setup
+
+TEA_PREFIX
+TEA_SETUP_COMPILER
+TEA_PUBLIC_TCL_HEADERS
+#TEA_PRIVATE_TCL_HEADERS
+TEA_ENABLE_THREADS
+TEA_ENABLE_SHARED
+TEA_CONFIG_CFLAGS
+TEA_ENABLE_SYMBOLS
+AC_DEFINE(USE_TCL_STUBS)
+TEA_MAKE_LIB
+TEA_PROG_TCLSH
+@@API@@
+@@UCONFIG@@
+#-----------------------------------------------------------------------
+## Convert the TEA settings determined by the macros in the last
+## section into something critcl can use throughts configuration.
+
+AC_MSG_RESULT([critcl config: derived from core TEA])
+
+#AC_MSG_RESULT([critcl config: CC............. ${CC}])
+#AC_MSG_RESULT([critcl config: CFLAGS......... ${CFLAGS}])
+#AC_MSG_RESULT([critcl config: SHLIB_LD....... ${SHLIB_LD}])
+#AC_MSG_RESULT([critcl config: LIBS........... ${LIBS}|
+#AC_MSG_RESULT([critcl config: MATH_LIBS...... ${MATH_LIBS}])
+#AC_MSG_RESULT([critcl config: CFLAGS_DEFAULT. ${CFLAGS_DEFAULT}])
+#AC_MSG_RESULT([critcl config: CFLAGS_WARNING. ${CFLAGS_WARNING}])
+#AC_MSG_RESULT([critcl config: SHLIB_CFLAGS... ${SHLIB_CFLAGS}])
+#AC_MSG_RESULT([critcl config: LDFLAGS_DEFAULT ${LDFLAGS_DEFAULT}])
+
+#-----------------------------------------------------------------------
+## 1. Basic/foundational translation.
+
+CRITCL_CC="$(eval echo ${CC} -c ${CFLAGS})"
+CRITCL_VERSION="${CC} -v"
+CRITCL_LINK="$(eval echo $(eval echo ${SHLIB_LD} ${LIBS} ${MATH_LIBS}))"
+CRITCL_PLATFORM="$(${TCLSH_PROG} ${srcdir}/critcl/main.tcl -showtarget)"
+CRITCL_LD_DBG=""
+CRITCL_LD_REL=""
+CRITCL_CC_OUTPUT="-o [[list \$outfile]]"
+CRITCL_LD_OUTPUT=""
+
+if test "${GCC}" = "yes"
+then
+   CRITCL_CPP_DEFINE="${CPP} -dM"
+else
+   CRITCL_CPP_DEFINE="${CPP}"
+
+   if test "${TEA_PLATFORM}" = "windows"
+   then
+      # windows, no gcc => msvc
+      CRITCL_CC_OUTPUT="[[list -Fo\$outfile]]"
+      CRITCL_LD_OUTPUT="-dll [[list -out:\$outfile]]"
+      CRITCL_LD_DBG="-debug:full -debugtype:cv -verbose:lib"
+      CRITCL_LD_REL="-release -opt:ref -opt:icf,3 -ws:aggressive -verbose:lib"
+      if test "$do64bit" = "no" ; then
+          # 32bit
+	  CRITCL_LD_DBG="$CRITCL_LD_DBG -nodefaultlib:libc"
+      fi
+   fi
+fi
+CRITCL_CPP_ENUM="${CPP}"
+
+#-----------------------------------------------------------------------
+## 2. Fine tuning the commands, this now is platform specific.
+
+case $(uname -s) in
+Darwin*)
+	AC_MSG_RESULT([critcl config: darwin specific tune-up])
+
+	# - Critcl, due to essentially generating its private
+	#   lib{tcl,tk}stub.a does generate common symbols for the
+	#   stubs tables. Use of -fno-common then prevents linking the
+	#   object files.
+	#
+	# - A version 0.0 as pulled from TEA package version is not
+	#   liked by the Darwin gcc either (Example: crimp).
+
+	CRITCL_CC="$(echo   "$CRITCL_CC"  |sed -e 's,-fno-common,,g')"
+	CRITCL_LINK="$(echo "$CRITCL_LINK"|sed -e 's,-fno-common,,g')"
+	CRITCL_LINK="$(echo "$CRITCL_LINK"|sed -e 's,-current_version 0\.0,,g')"
+	CRITCL_LINK="$(echo "$CRITCL_LINK"|sed -e 's,-compatibility_version 0\.0,,g')"
+	;;
+*)
+	;;
+esac
+
+#-----------------------------------------------------------------------
+## Conversion results
+
+AC_MSG_RESULT([critcl config: platform.......... $CRITCL_PLATFORM])
+AC_MSG_RESULT([critcl config: compile........... $CRITCL_CC])
+AC_MSG_RESULT([critcl config: link.............. $CRITCL_LINK])
+AC_MSG_RESULT([critcl config: cpp define........ $CRITCL_CPP_DEFINE])
+AC_MSG_RESULT([critcl config: cpp enum.......... $CRITCL_CPP_ENUM])
+AC_MSG_RESULT([critcl config: version inquiry... $CRITCL_VERSION])
+AC_MSG_RESULT([critcl config: cc output......... $CRITCL_CC_OUTPUT])
+AC_MSG_RESULT([critcl config: ld output......... $CRITCL_LD_OUTPUT])
+AC_MSG_RESULT([critcl config: ld debug.......... $CRITCL_LD_DBG])
+AC_MSG_RESULT([critcl config: ld release........ $CRITCL_LD_REL])
+
+#-----------------------------------------------------------------------
+
+AC_SUBST(CRITCL_CC)
+AC_SUBST(CRITCL_VERSION)
+AC_SUBST(CRITCL_LINK)
+AC_SUBST(CRITCL_PLATFORM)
+AC_SUBST(CRITCL_CPP_DEFINE)
+AC_SUBST(CRITCL_CPP_ENUM)
+AC_SUBST(CRITCL_CC_OUTPUT)
+AC_SUBST(CRITCL_LD_OUTPUT)
+AC_SUBST(CRITCL_LD_DBG)
+AC_SUBST(CRITCL_LD_REL)
+#AC_SUBST(CRITCL_)
+#AC_SUBST()
+
+#--------------------------------------------------------------------
+# Finally, substitute all of the various values into the Makefile.
+# You may alternatively have a special pkgIndex.tcl.in or other files
+# which require substituting th AC variables in.  Include these here.
+#--------------------------------------------------------------------
+
+AC_OUTPUT([Makefile Config])
diff --git a/src/vfs/critcl.vfs/lib/app-critcl/tea/tclconfig/README.txt b/src/vfs/critcl.vfs/lib/app-critcl/tea/tclconfig/README.txt
new file mode 100644
index 00000000..715cb9dd
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/app-critcl/tea/tclconfig/README.txt
@@ -0,0 +1,26 @@
+These files comprise the basic building blocks for a Tcl Extension
+Architecture (TEA) extension.  For more information on TEA see:
+
+	http://www.tcl.tk/doc/tea/
+
+This package is part of the Tcl project at SourceForge, but sources
+and bug/patch database are hosted on fossil here:
+
+	https://core.tcl-lang.org/tclconfig
+
+This package is a freely available open source package.  You can do
+virtually anything you like with it, such as modifying it, redistributing
+it, and selling it either in whole or in part.
+
+CONTENTS
+========
+The following is a short description of the files you will find in
+the sample extension.
+
+README.txt	This file
+
+install-sh	Program used for copying binaries and script files
+		to their install locations.
+
+tcl.m4		Collection of Tcl autoconf macros.  Included by a package's
+		aclocal.m4 to define TEA_* macros.
diff --git a/src/vfs/critcl.vfs/lib/app-critcl/tea/tclconfig/install-sh b/src/vfs/critcl.vfs/lib/app-critcl/tea/tclconfig/install-sh
new file mode 100644
index 00000000..ec298b53
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/app-critcl/tea/tclconfig/install-sh
@@ -0,0 +1,541 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2020-11-14.01; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+tab='	'
+nl='
+'
+IFS=" $tab$nl"
+
+# Set DOITPROG to "echo" to test this script.
+
+doit=${DOITPROG-}
+doit_exec=${doit:-exec}
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+# Create dirs (including intermediate dirs) using mode 755.
+# This is like GNU 'install' as of coreutils 8.32 (2020).
+mkdir_umask=22
+
+backupsuffix=
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+is_target_a_directory=possibly
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -p            pass -p to $cpprog.
+  -s            $stripprog installed files.
+  -S SUFFIX     attempt to back up existing files, with suffix SUFFIX.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+
+By default, rm is invoked with -f; when overridden with RMPROG,
+it's up to you to specify -f if you want it.
+
+If -S is not specified, no backups are attempted.
+
+Email bug reports to bug-automake@gnu.org.
+Automake home page: https://www.gnu.org/software/automake/
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
+
+    -o) chowncmd="$chownprog $2"
+        shift;;
+
+    -p) cpprog="$cpprog -p";;
+
+    -s) stripcmd=$stripprog;;
+
+    -S) backupsuffix="$2"
+        shift;;
+
+    -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) is_target_a_directory=never;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --) shift
+        break;;
+
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
+
+    *)  break;;
+  esac
+  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.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+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
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+    # Don't chown directories that already exist.
+    if test $dstdir_status = 0; then
+      chowncmd=""
+    fi
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename.
+    if test -d "$dst"; then
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
+      fi
+      dstdir=$dst
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
+      dstdir_status=0
+    else
+      dstdir=`dirname "$dst"`
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+	# The $RANDOM variable is not portable (e.g., dash).  Use it
+	# here however when possible just to lower collision chance.
+	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+	trap '
+	  ret=$?
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+	  exit $ret
+	' 0
+
+	# Because "mkdir -p" follows existing symlinks and we likely work
+	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directory is successfully created first before we actually test
+	# 'mkdir -p'.
+	if (umask $mkdir_umask &&
+	    $mkdirprog $mkdir_mode "$tmpdir" &&
+	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+	then
+	  if test -z "$dir_arg" || {
+	       # Check for POSIX incompatibilities with -m.
+	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+	       # other-writable bit of parent directory when it shouldn't.
+	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+	       test_tmpdir="$tmpdir/a"
+	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+	       case $ls_ld_tmpdir in
+		 d????-?r-*) different_mode=700;;
+		 d????-?--*) different_mode=755;;
+		 *) false;;
+	       esac &&
+	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+	       }
+	     }
+	  then posix_mkdir=:
+	  fi
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+	else
+	  # Remove any dirs left behind by ancient mkdir implementations.
+	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+	fi
+	trap '' 0;;
+    esac
+
+    if
+      $posix_mkdir && (
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      set -f
+      set fnord $dstdir
+      shift
+      set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask $mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask &&
+     { test -z "$stripcmd" || {
+	 # Create $dsttmp read-write so that cp doesn't create it read-only,
+	 # which would cause strip to fail.
+	 if test -z "$doit"; then
+	   : >"$dsttmp" # No need to fork-exec 'touch'.
+	 else
+	   $doit touch "$dsttmp"
+	 fi
+       }
+     } &&
+     $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       set +f &&
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # If $backupsuffix is set, and the file being installed
+      # already exists, attempt a backup.  Don't worry if it fails,
+      # e.g., if mv doesn't support -f.
+      if test -n "$backupsuffix" && test -f "$dst"; then
+        $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
+      fi
+
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/src/vfs/critcl.vfs/lib/app-critcl/tea/tclconfig/license.terms b/src/vfs/critcl.vfs/lib/app-critcl/tea/tclconfig/license.terms
new file mode 100644
index 00000000..d8049cd9
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/app-critcl/tea/tclconfig/license.terms
@@ -0,0 +1,40 @@
+This software is copyrighted by the Regents of the University of
+California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
+Corporation and other parties.  The following terms apply to all files
+associated with the software unless explicitly disclaimed in
+individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7014 (b) (3) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license.
diff --git a/src/vfs/critcl.vfs/lib/app-critcl/tea/tclconfig/tcl.m4 b/src/vfs/critcl.vfs/lib/app-critcl/tea/tclconfig/tcl.m4
new file mode 100644
index 00000000..9ac67c22
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/app-critcl/tea/tclconfig/tcl.m4
@@ -0,0 +1,4091 @@
+# tcl.m4 --
+#
+#	This file provides a set of autoconf macros to help TEA-enable
+#	a Tcl extension.
+#
+# Copyright (c) 1999-2000 Ajuba Solutions.
+# Copyright (c) 2002-2005 ActiveState Corporation.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+AC_PREREQ([2.69])
+
+# Possible values for key variables defined:
+#
+# TEA_WINDOWINGSYSTEM - win32 aqua x11 (mirrors 'tk windowingsystem')
+# TEA_PLATFORM        - windows unix
+# TEA_TK_EXTENSION    - True if this is a Tk extension
+#
+
+#------------------------------------------------------------------------
+# TEA_PATH_TCLCONFIG --
+#
+#	Locate the tclConfig.sh file and perform a sanity check on
+#	the Tcl compile flags
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--with-tcl=...
+#
+#	Defines the following vars:
+#		TCL_BIN_DIR	Full path to the directory containing
+#				the tclConfig.sh file
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_PATH_TCLCONFIG], [
+    dnl TEA specific: Make sure we are initialized
+    AC_REQUIRE([TEA_INIT])
+    #
+    # Ok, lets find the tcl configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tcl
+    #
+
+    if test x"${no_tcl}" = x ; then
+	# we reset no_tcl in case something fails here
+	no_tcl=true
+	AC_ARG_WITH(tcl,
+	    AS_HELP_STRING([--with-tcl],
+		[directory containing tcl configuration (tclConfig.sh)]),
+	    [with_tclconfig="${withval}"])
+	AC_ARG_WITH(tcl8,
+	    AS_HELP_STRING([--with-tcl8],
+		[Compile for Tcl8 in Tcl9 environment]),
+	    [with_tcl8="${withval}"])
+	AC_MSG_CHECKING([for Tcl configuration])
+	AC_CACHE_VAL(ac_cv_c_tclconfig,[
+
+	    # First check to see if --with-tcl was specified.
+	    if test x"${with_tclconfig}" != x ; then
+		case "${with_tclconfig}" in
+		    */tclConfig.sh )
+			if test -f "${with_tclconfig}"; then
+			    AC_MSG_WARN([--with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself])
+			    with_tclconfig="`echo "${with_tclconfig}" | sed 's!/tclConfig\.sh$!!'`"
+			fi ;;
+		esac
+		if test -f "${with_tclconfig}/tclConfig.sh" ; then
+		    ac_cv_c_tclconfig="`(cd "${with_tclconfig}"; pwd)`"
+		else
+		    AC_MSG_ERROR([${with_tclconfig} directory doesn't contain tclConfig.sh])
+		fi
+	    fi
+
+	    # then check for a private Tcl installation
+	    if test x"${ac_cv_c_tclconfig}" = x ; then
+		for i in \
+			../tcl \
+			`ls -dr ../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../tcl[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../tcl[[8-9]].[[0-9]]* 2>/dev/null` \
+			../../tcl \
+			`ls -dr ../../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../tcl[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../../tcl[[8-9]].[[0-9]]* 2>/dev/null` \
+			../../../tcl \
+			`ls -dr ../../../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../../tcl[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../../../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
+		    if test "${TEA_PLATFORM}" = "windows" \
+			    -a -f "$i/win/tclConfig.sh" ; then
+			ac_cv_c_tclconfig="`(cd $i/win; pwd)`"
+			break
+		    fi
+		    if test -f "$i/unix/tclConfig.sh" ; then
+			ac_cv_c_tclconfig="`(cd $i/unix; pwd)`"
+			break
+		    fi
+		done
+	    fi
+
+	    # on Darwin, check in Framework installation locations
+	    if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tclconfig}" = x ; then
+		for i in `ls -d ~/Library/Frameworks 2>/dev/null` \
+			`ls -d /Library/Frameworks 2>/dev/null` \
+			`ls -d /Network/Library/Frameworks 2>/dev/null` \
+			`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/Library/Frameworks/Tcl.framework 2>/dev/null` \
+			`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/Network/Library/Frameworks/Tcl.framework 2>/dev/null` \
+			`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Tcl.framework 2>/dev/null` \
+			; do
+		    if test -f "$i/Tcl.framework/tclConfig.sh" ; then
+			ac_cv_c_tclconfig="`(cd $i/Tcl.framework; pwd)`"
+			break
+		    fi
+		done
+	    fi
+
+	    # TEA specific: on Windows, check in common installation locations
+	    if test "${TEA_PLATFORM}" = "windows" \
+		-a x"${ac_cv_c_tclconfig}" = x ; then
+		for i in `ls -d C:/Tcl/lib 2>/dev/null` \
+			`ls -d C:/Progra~1/Tcl/lib 2>/dev/null` \
+			; do
+		    if test -f "$i/tclConfig.sh" ; then
+			ac_cv_c_tclconfig="`(cd $i; pwd)`"
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_tclconfig}" = x ; then
+		for i in `ls -d ${libdir} 2>/dev/null` \
+			`ls -d ${exec_prefix}/lib 2>/dev/null` \
+			`ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/local/lib 2>/dev/null` \
+			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/pkg/lib 2>/dev/null` \
+			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
+			`ls -d /usr/lib/tcl8.6 2>/dev/null` \
+			`ls -d /usr/lib/tcl8.5 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl8.5 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl/tcl8.6 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl/tcl8.5 2>/dev/null` \
+			; do
+		    if test -f "$i/tclConfig.sh" ; then
+			ac_cv_c_tclconfig="`(cd $i; pwd)`"
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few other private locations
+	    if test x"${ac_cv_c_tclconfig}" = x ; then
+		for i in \
+			${srcdir}/../tcl \
+			`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
+		    if test "${TEA_PLATFORM}" = "windows" \
+			    -a -f "$i/win/tclConfig.sh" ; then
+			ac_cv_c_tclconfig="`(cd $i/win; pwd)`"
+			break
+		    fi
+		    if test -f "$i/unix/tclConfig.sh" ; then
+			ac_cv_c_tclconfig="`(cd $i/unix; pwd)`"
+			break
+		    fi
+		done
+	    fi
+	])
+
+	if test x"${ac_cv_c_tclconfig}" = x ; then
+	    TCL_BIN_DIR="# no Tcl configs found"
+	    AC_MSG_ERROR([Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh])
+	else
+	    no_tcl=
+	    TCL_BIN_DIR="${ac_cv_c_tclconfig}"
+	    AC_MSG_RESULT([found ${TCL_BIN_DIR}/tclConfig.sh])
+	fi
+    fi
+])
+
+#------------------------------------------------------------------------
+# TEA_PATH_TKCONFIG --
+#
+#	Locate the tkConfig.sh file
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--with-tk=...
+#
+#	Defines the following vars:
+#		TK_BIN_DIR	Full path to the directory containing
+#				the tkConfig.sh file
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_PATH_TKCONFIG], [
+    #
+    # Ok, lets find the tk configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tk
+    #
+
+    if test x"${no_tk}" = x ; then
+	# we reset no_tk in case something fails here
+	no_tk=true
+	AC_ARG_WITH(tk,
+	    AS_HELP_STRING([--with-tk],
+		[directory containing tk configuration (tkConfig.sh)]),
+	    [with_tkconfig="${withval}"])
+	AC_MSG_CHECKING([for Tk configuration])
+	AC_CACHE_VAL(ac_cv_c_tkconfig,[
+
+	    # First check to see if --with-tkconfig was specified.
+	    if test x"${with_tkconfig}" != x ; then
+		case "${with_tkconfig}" in
+		    */tkConfig.sh )
+			if test -f "${with_tkconfig}"; then
+			    AC_MSG_WARN([--with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself])
+			    with_tkconfig="`echo "${with_tkconfig}" | sed 's!/tkConfig\.sh$!!'`"
+			fi ;;
+		esac
+		if test -f "${with_tkconfig}/tkConfig.sh" ; then
+		    ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`"
+		else
+		    AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh])
+		fi
+	    fi
+
+	    # then check for a private Tk library
+	    if test x"${ac_cv_c_tkconfig}" = x ; then
+		for i in \
+			../tk \
+			`ls -dr ../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../tk[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../tk[[8-9]].[[0-9]]* 2>/dev/null` \
+			../../tk \
+			`ls -dr ../../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../tk[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../../tk[[8-9]].[[0-9]]* 2>/dev/null` \
+			../../../tk \
+			`ls -dr ../../../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../../tk[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../../../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do
+		    if test "${TEA_PLATFORM}" = "windows" \
+			    -a -f "$i/win/tkConfig.sh" ; then
+			ac_cv_c_tkconfig="`(cd $i/win; pwd)`"
+			break
+		    fi
+		    if test -f "$i/unix/tkConfig.sh" ; then
+			ac_cv_c_tkconfig="`(cd $i/unix; pwd)`"
+			break
+		    fi
+		done
+	    fi
+
+	    # on Darwin, check in Framework installation locations
+	    if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tkconfig}" = x ; then
+		for i in `ls -d ~/Library/Frameworks 2>/dev/null` \
+			`ls -d /Library/Frameworks 2>/dev/null` \
+			`ls -d /Network/Library/Frameworks 2>/dev/null` \
+			; do
+		    if test -f "$i/Tk.framework/tkConfig.sh" ; then
+			ac_cv_c_tkconfig="`(cd $i/Tk.framework; pwd)`"
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_tkconfig}" = x ; then
+		for i in `ls -d ${libdir} 2>/dev/null` \
+			`ls -d ${exec_prefix}/lib 2>/dev/null` \
+			`ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/local/lib 2>/dev/null` \
+			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/pkg/lib 2>/dev/null` \
+			`ls -d /usr/lib/tk8.6 2>/dev/null` \
+			`ls -d /usr/lib/tk8.5 2>/dev/null` \
+			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
+			`ls -d /usr/local/lib/tk8.6 2>/dev/null` \
+			`ls -d /usr/local/lib/tk8.5 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl/tk8.6 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl/tk8.5 2>/dev/null` \
+			; do
+		    if test -f "$i/tkConfig.sh" ; then
+			ac_cv_c_tkconfig="`(cd $i; pwd)`"
+			break
+		    fi
+		done
+	    fi
+
+	    # TEA specific: on Windows, check in common installation locations
+	    if test "${TEA_PLATFORM}" = "windows" \
+		-a x"${ac_cv_c_tkconfig}" = x ; then
+		for i in `ls -d C:/Tcl/lib 2>/dev/null` \
+			`ls -d C:/Progra~1/Tcl/lib 2>/dev/null` \
+			; do
+		    if test -f "$i/tkConfig.sh" ; then
+			ac_cv_c_tkconfig="`(cd $i; pwd)`"
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few other private locations
+	    if test x"${ac_cv_c_tkconfig}" = x ; then
+		for i in \
+			${srcdir}/../tk \
+			`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do
+		    if test "${TEA_PLATFORM}" = "windows" \
+			    -a -f "$i/win/tkConfig.sh" ; then
+			ac_cv_c_tkconfig="`(cd $i/win; pwd)`"
+			break
+		    fi
+		    if test -f "$i/unix/tkConfig.sh" ; then
+			ac_cv_c_tkconfig="`(cd $i/unix; pwd)`"
+			break
+		    fi
+		done
+	    fi
+	])
+
+	if test x"${ac_cv_c_tkconfig}" = x ; then
+	    TK_BIN_DIR="# no Tk configs found"
+	    AC_MSG_ERROR([Can't find Tk configuration definitions. Use --with-tk to specify a directory containing tkConfig.sh])
+	else
+	    no_tk=
+	    TK_BIN_DIR="${ac_cv_c_tkconfig}"
+	    AC_MSG_RESULT([found ${TK_BIN_DIR}/tkConfig.sh])
+	fi
+    fi
+])
+
+#------------------------------------------------------------------------
+# TEA_LOAD_TCLCONFIG --
+#
+#	Load the tclConfig.sh file
+#
+# Arguments:
+#
+#	Requires the following vars to be set:
+#		TCL_BIN_DIR
+#
+# Results:
+#
+#	Substitutes the following vars:
+#		TCL_BIN_DIR
+#		TCL_SRC_DIR
+#		TCL_LIB_FILE
+#		TCL_ZIP_FILE
+#		TCL_ZIPFS_SUPPORT
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_LOAD_TCLCONFIG], [
+    AC_MSG_CHECKING([for existence of ${TCL_BIN_DIR}/tclConfig.sh])
+
+    if test -f "${TCL_BIN_DIR}/tclConfig.sh" ; then
+        AC_MSG_RESULT([loading])
+	. "${TCL_BIN_DIR}/tclConfig.sh"
+    else
+        AC_MSG_RESULT([could not find ${TCL_BIN_DIR}/tclConfig.sh])
+    fi
+
+    # If the TCL_BIN_DIR is the build directory (not the install directory),
+    # then set the common variable name to the value of the build variables.
+    # For example, the variable TCL_LIB_SPEC will be set to the value
+    # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC
+    # instead of TCL_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    if test -f "${TCL_BIN_DIR}/Makefile" ; then
+        TCL_LIB_SPEC="${TCL_BUILD_LIB_SPEC}"
+        TCL_STUB_LIB_SPEC="${TCL_BUILD_STUB_LIB_SPEC}"
+        TCL_STUB_LIB_PATH="${TCL_BUILD_STUB_LIB_PATH}"
+    elif test "`uname -s`" = "Darwin"; then
+	# If Tcl was built as a framework, attempt to use the libraries
+	# from the framework at the given location so that linking works
+	# against Tcl.framework installed in an arbitrary location.
+	case ${TCL_DEFS} in
+	    *TCL_FRAMEWORK*)
+		if test -f "${TCL_BIN_DIR}/${TCL_LIB_FILE}"; then
+		    for i in "`cd "${TCL_BIN_DIR}"; pwd`" \
+			     "`cd "${TCL_BIN_DIR}"/../..; pwd`"; do
+			if test "`basename "$i"`" = "${TCL_LIB_FILE}.framework"; then
+			    TCL_LIB_SPEC="-F`dirname "$i" | sed -e 's/ /\\\\ /g'` -framework ${TCL_LIB_FILE}"
+			    break
+			fi
+		    done
+		fi
+		if test -f "${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}"; then
+		    TCL_STUB_LIB_SPEC="-L`echo "${TCL_BIN_DIR}"  | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
+		    TCL_STUB_LIB_PATH="${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}"
+		fi
+		;;
+	esac
+    fi
+
+    AC_SUBST(TCL_VERSION)
+    AC_SUBST(TCL_PATCH_LEVEL)
+    AC_SUBST(TCL_BIN_DIR)
+    AC_SUBST(TCL_SRC_DIR)
+
+    AC_SUBST(TCL_LIB_FILE)
+    AC_SUBST(TCL_LIB_FLAG)
+    AC_SUBST(TCL_LIB_SPEC)
+
+    AC_SUBST(TCL_STUB_LIB_FILE)
+    AC_SUBST(TCL_STUB_LIB_FLAG)
+    AC_SUBST(TCL_STUB_LIB_SPEC)
+
+    AC_MSG_CHECKING([platform])
+    hold_cc=$CC; CC="$TCL_CC"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+	    #ifdef _WIN32
+		#error win32
+	    #endif
+	]])],[
+	    # first test we've already retrieved platform (cross-compile), fallback to unix otherwise:
+	    TEA_PLATFORM="${TEA_PLATFORM-unix}"
+	    CYGPATH=echo
+	],[
+	    TEA_PLATFORM="windows"
+	    AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo)
+    ])
+    CC=$hold_cc
+    AC_MSG_RESULT($TEA_PLATFORM)
+
+    # The BUILD_$pkg is to define the correct extern storage class
+    # handling when making this package
+    AC_DEFINE_UNQUOTED(BUILD_${PACKAGE_NAME}, [],
+	    [Building extension source?])
+    # Do this here as we have fully defined TEA_PLATFORM now
+    if test "${TEA_PLATFORM}" = "windows" ; then
+	EXEEXT=".exe"
+	CLEANFILES="$CLEANFILES *.lib *.dll *.pdb *.exp"
+    fi
+
+    # TEA specific:
+    AC_SUBST(CLEANFILES)
+    AC_SUBST(TCL_LIBS)
+    AC_SUBST(TCL_DEFS)
+    AC_SUBST(TCL_EXTRA_CFLAGS)
+    AC_SUBST(TCL_LD_FLAGS)
+    AC_SUBST(TCL_SHLIB_LD_LIBS)
+])
+
+#------------------------------------------------------------------------
+# TEA_LOAD_TKCONFIG --
+#
+#	Load the tkConfig.sh file
+#
+# Arguments:
+#
+#	Requires the following vars to be set:
+#		TK_BIN_DIR
+#
+# Results:
+#
+#	Sets the following vars that should be in tkConfig.sh:
+#		TK_BIN_DIR
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_LOAD_TKCONFIG], [
+    AC_MSG_CHECKING([for existence of ${TK_BIN_DIR}/tkConfig.sh])
+
+    if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then
+        AC_MSG_RESULT([loading])
+	. "${TK_BIN_DIR}/tkConfig.sh"
+    else
+        AC_MSG_RESULT([could not find ${TK_BIN_DIR}/tkConfig.sh])
+    fi
+
+    # If the TK_BIN_DIR is the build directory (not the install directory),
+    # then set the common variable name to the value of the build variables.
+    # For example, the variable TK_LIB_SPEC will be set to the value
+    # of TK_BUILD_LIB_SPEC. An extension should make use of TK_LIB_SPEC
+    # instead of TK_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    if test -f "${TK_BIN_DIR}/Makefile" ; then
+        TK_LIB_SPEC="${TK_BUILD_LIB_SPEC}"
+        TK_STUB_LIB_SPEC="${TK_BUILD_STUB_LIB_SPEC}"
+        TK_STUB_LIB_PATH="${TK_BUILD_STUB_LIB_PATH}"
+    elif test "`uname -s`" = "Darwin"; then
+	# If Tk was built as a framework, attempt to use the libraries
+	# from the framework at the given location so that linking works
+	# against Tk.framework installed in an arbitrary location.
+	case ${TK_DEFS} in
+	    *TK_FRAMEWORK*)
+		if test -f "${TK_BIN_DIR}/${TK_LIB_FILE}"; then
+		    for i in "`cd "${TK_BIN_DIR}"; pwd`" \
+			     "`cd "${TK_BIN_DIR}"/../..; pwd`"; do
+			if test "`basename "$i"`" = "${TK_LIB_FILE}.framework"; then
+			    TK_LIB_SPEC="-F`dirname "$i" | sed -e 's/ /\\\\ /g'` -framework ${TK_LIB_FILE}"
+			    break
+			fi
+		    done
+		fi
+		if test -f "${TK_BIN_DIR}/${TK_STUB_LIB_FILE}"; then
+		    TK_STUB_LIB_SPEC="-L` echo "${TK_BIN_DIR}"  | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
+		    TK_STUB_LIB_PATH="${TK_BIN_DIR}/${TK_STUB_LIB_FILE}"
+		fi
+		;;
+	esac
+    fi
+
+    # TEA specific: Ensure windowingsystem is defined
+    if test "${TEA_PLATFORM}" = "unix" ; then
+	case ${TK_DEFS} in
+	    *MAC_OSX_TK*)
+		AC_DEFINE(MAC_OSX_TK, 1, [Are we building against Mac OS X TkAqua?])
+		TEA_WINDOWINGSYSTEM="aqua"
+		;;
+	    *)
+		TEA_WINDOWINGSYSTEM="x11"
+		;;
+	esac
+    elif test "${TEA_PLATFORM}" = "windows" ; then
+	TEA_WINDOWINGSYSTEM="win32"
+    fi
+
+    AC_SUBST(TK_VERSION)
+    AC_SUBST(TK_BIN_DIR)
+    AC_SUBST(TK_SRC_DIR)
+
+    AC_SUBST(TK_LIB_FILE)
+    AC_SUBST(TK_LIB_FLAG)
+    AC_SUBST(TK_LIB_SPEC)
+
+    AC_SUBST(TK_STUB_LIB_FILE)
+    AC_SUBST(TK_STUB_LIB_FLAG)
+    AC_SUBST(TK_STUB_LIB_SPEC)
+
+    # TEA specific:
+    AC_SUBST(TK_LIBS)
+    AC_SUBST(TK_XINCLUDES)
+])
+
+#------------------------------------------------------------------------
+# TEA_PROG_TCLSH
+#	Determine the fully qualified path name of the tclsh executable
+#	in the Tcl build directory or the tclsh installed in a bin
+#	directory. This macro will correctly determine the name
+#	of the tclsh executable even if tclsh has not yet been
+#	built in the build directory. The tclsh found is always
+#	associated with a tclConfig.sh file. This tclsh should be used
+#	only for running extension test cases. It should never be
+#	or generation of files (like pkgIndex.tcl) at build time.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	Substitutes the following vars:
+#		TCLSH_PROG
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_PROG_TCLSH], [
+    AC_MSG_CHECKING([for tclsh])
+    if test -f "${TCL_BIN_DIR}/Makefile" ; then
+        # tclConfig.sh is in Tcl build directory
+        if test "${TEA_PLATFORM}" = "windows"; then
+          if test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}" ; then
+            TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}"
+          elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}s${EXEEXT}" ; then
+            TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}s${EXEEXT}"
+          elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}t${EXEEXT}" ; then
+            TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}t${EXEEXT}"
+          elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}st${EXEEXT}" ; then
+            TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}st${EXEEXT}"
+          fi
+        else
+            TCLSH_PROG="${TCL_BIN_DIR}/tclsh"
+        fi
+    else
+        # tclConfig.sh is in install location
+        if test "${TEA_PLATFORM}" = "windows"; then
+            TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}"
+        else
+            TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
+        fi
+        list="`ls -d ${TCL_BIN_DIR}/../bin 2>/dev/null` \
+              `ls -d ${TCL_BIN_DIR}/..     2>/dev/null` \
+              `ls -d ${TCL_PREFIX}/bin     2>/dev/null`"
+        for i in $list ; do
+            if test -f "$i/${TCLSH_PROG}" ; then
+                REAL_TCL_BIN_DIR="`cd "$i"; pwd`/"
+                break
+            fi
+        done
+        TCLSH_PROG="${REAL_TCL_BIN_DIR}${TCLSH_PROG}"
+    fi
+    AC_MSG_RESULT([${TCLSH_PROG}])
+    AC_SUBST(TCLSH_PROG)
+])
+
+#------------------------------------------------------------------------
+# TEA_PROG_WISH
+#	Determine the fully qualified path name of the wish executable
+#	in the Tk build directory or the wish installed in a bin
+#	directory. This macro will correctly determine the name
+#	of the wish executable even if wish has not yet been
+#	built in the build directory. The wish found is always
+#	associated with a tkConfig.sh file. This wish should be used
+#	only for running extension test cases. It should never be
+#	or generation of files (like pkgIndex.tcl) at build time.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	Substitutes the following vars:
+#		WISH_PROG
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_PROG_WISH], [
+    AC_MSG_CHECKING([for wish])
+    if test -f "${TK_BIN_DIR}/Makefile" ; then
+        # tkConfig.sh is in Tk build directory
+        if test "${TEA_PLATFORM}" = "windows"; then
+          if test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${EXEEXT}" ; then
+            WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${EXEEXT}"
+          elif test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}s${EXEEXT}" ; then
+            WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}$s{EXEEXT}"
+          elif test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}t${EXEEXT}" ; then
+            WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}t${EXEEXT}"
+          elif test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}st${EXEEXT}" ; then
+            WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}st${EXEEXT}"
+          fi
+        else
+            WISH_PROG="${TK_BIN_DIR}/wish"
+        fi
+    else
+        # tkConfig.sh is in install location
+        if test "${TEA_PLATFORM}" = "windows"; then
+            WISH_PROG="wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${EXEEXT}"
+        else
+            WISH_PROG="wish${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
+        fi
+        list="`ls -d ${TK_BIN_DIR}/../bin 2>/dev/null` \
+              `ls -d ${TK_BIN_DIR}/..     2>/dev/null` \
+              `ls -d ${TK_PREFIX}/bin     2>/dev/null`"
+        for i in $list ; do
+            if test -f "$i/${WISH_PROG}" ; then
+                REAL_TK_BIN_DIR="`cd "$i"; pwd`/"
+                break
+            fi
+        done
+        WISH_PROG="${REAL_TK_BIN_DIR}${WISH_PROG}"
+    fi
+    AC_MSG_RESULT([${WISH_PROG}])
+    AC_SUBST(WISH_PROG)
+])
+
+#------------------------------------------------------------------------
+# TEA_ENABLE_SHARED --
+#
+#	Allows the building of shared libraries
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--enable-shared=yes|no
+#		--enable-stubs=yes|no
+#
+#	Defines the following vars:
+#		STATIC_BUILD	Used for building import/export libraries
+#				on Windows.
+#
+#	Sets the following vars:
+#		SHARED_BUILD	Value of 1 or 0
+#               STUBS_BUILD     Value if 1 or 0
+#               USE_TCL_STUBS   Value true: if SHARED_BUILD or --enable-stubs
+#               USE_TCLOO_STUBS Value true: if SHARED_BUILD or --enable-stubs
+#               USE_TK_STUBS    Value true: if SHARED_BUILD or --enable-stubs
+#                                AND TEA_WINDOWING_SYSTEM != ""
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_ENABLE_SHARED], [
+    AC_MSG_CHECKING([how to build libraries])
+    AC_ARG_ENABLE(shared,
+	AS_HELP_STRING([--enable-shared],
+	    [build and link with shared libraries (default: on)]),
+	[shared_ok=$enableval], [shared_ok=yes])
+
+    if test "${enable_shared+set}" = set; then
+	enableval="$enable_shared"
+	shared_ok=$enableval
+    else
+	shared_ok=yes
+    fi
+
+    AC_ARG_ENABLE(stubs,
+	AS_HELP_STRING([--enable-stubs],
+	    [build and link with stub libraries. Always true for shared builds (default: on)]),
+	[stubs_ok=$enableval], [stubs_ok=yes])
+
+    if test "${enable_stubs+set}" = set; then
+	enableval="$enable_stubs"
+	stubs_ok=$enableval
+    else
+	stubs_ok=yes
+    fi
+
+    # Stubs are always enabled for shared builds
+    if test "$shared_ok" = "yes" ; then
+	AC_MSG_RESULT([shared])
+	SHARED_BUILD=1
+        STUBS_BUILD=1
+    else
+	AC_MSG_RESULT([static])
+	SHARED_BUILD=0
+	AC_DEFINE(STATIC_BUILD, 1, [This a static build])
+        if test "$stubs_ok" = "yes" ; then
+          STUBS_BUILD=1
+        else
+          STUBS_BUILD=0
+        fi
+    fi
+    if test "${STUBS_BUILD}" = "1" ; then
+      AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
+      AC_DEFINE(USE_TCLOO_STUBS, 1, [Use TclOO stubs])
+      if test "${TEA_WINDOWINGSYSTEM}" != ""; then
+        AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
+      fi
+    fi
+
+    AC_SUBST(SHARED_BUILD)
+    AC_SUBST(STUBS_BUILD)
+])
+
+#------------------------------------------------------------------------
+# TEA_ENABLE_THREADS --
+#
+#	Specify if thread support should be enabled.  If "yes" is specified
+#	as an arg (optional), threads are enabled by default, "no" means
+#	threads are disabled.  "yes" is the default.
+#
+#	TCL_THREADS is checked so that if you are compiling an extension
+#	against a threaded core, your extension must be compiled threaded
+#	as well.
+#
+#	Note that it is legal to have a thread enabled extension run in a
+#	threaded or non-threaded Tcl core, but a non-threaded extension may
+#	only run in a non-threaded Tcl core.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--enable-threads
+#
+#	Sets the following vars:
+#		THREADS_LIBS	Thread library(s)
+#
+#	Defines the following vars:
+#		TCL_THREADS
+#		_REENTRANT
+#		_THREAD_SAFE
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_ENABLE_THREADS], [
+    AC_ARG_ENABLE(threads,
+	AS_HELP_STRING([--enable-threads],
+	    [build with threads (default: on)]),
+	[tcl_ok=$enableval], [tcl_ok=yes])
+
+    if test "${enable_threads+set}" = set; then
+	enableval="$enable_threads"
+	tcl_ok=$enableval
+    else
+	tcl_ok=yes
+    fi
+
+    if test "$tcl_ok" = "yes" -o "${TCL_THREADS}" = 1; then
+	TCL_THREADS=1
+
+	if test "${TEA_PLATFORM}" != "windows" ; then
+	    # We are always OK on Windows, so check what this platform wants:
+
+	    # USE_THREAD_ALLOC tells us to try the special thread-based
+	    # allocator that significantly reduces lock contention
+	    AC_DEFINE(USE_THREAD_ALLOC, 1,
+		[Do we want to use the threaded memory allocator?])
+	    AC_DEFINE(_REENTRANT, 1, [Do we want the reentrant OS API?])
+	    if test "`uname -s`" = "SunOS" ; then
+		AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1,
+			[Do we really want to follow the standard? Yes we do!])
+	    fi
+	    AC_DEFINE(_THREAD_SAFE, 1, [Do we want the thread-safe OS API?])
+	    AC_CHECK_LIB(pthread,pthread_mutex_init,tcl_ok=yes,tcl_ok=no)
+	    if test "$tcl_ok" = "no"; then
+		# Check a little harder for __pthread_mutex_init in the same
+		# library, as some systems hide it there until pthread.h is
+		# defined.  We could alternatively do an AC_TRY_COMPILE with
+		# pthread.h, but that will work with libpthread really doesn't
+		# exist, like AIX 4.2.  [Bug: 4359]
+		AC_CHECK_LIB(pthread, __pthread_mutex_init,
+		    tcl_ok=yes, tcl_ok=no)
+	    fi
+
+	    if test "$tcl_ok" = "yes"; then
+		# The space is needed
+		THREADS_LIBS=" -lpthread"
+	    else
+		AC_CHECK_LIB(pthreads, pthread_mutex_init,
+		    tcl_ok=yes, tcl_ok=no)
+		if test "$tcl_ok" = "yes"; then
+		    # The space is needed
+		    THREADS_LIBS=" -lpthreads"
+		else
+		    AC_CHECK_LIB(c, pthread_mutex_init,
+			tcl_ok=yes, tcl_ok=no)
+		    if test "$tcl_ok" = "no"; then
+			AC_CHECK_LIB(c_r, pthread_mutex_init,
+			    tcl_ok=yes, tcl_ok=no)
+			if test "$tcl_ok" = "yes"; then
+			    # The space is needed
+			    THREADS_LIBS=" -pthread"
+			else
+			    TCL_THREADS=0
+			    AC_MSG_WARN([Do not know how to find pthread lib on your system - thread support disabled])
+			fi
+		    fi
+		fi
+	    fi
+	fi
+    else
+	TCL_THREADS=0
+    fi
+    # Do checking message here to not mess up interleaved configure output
+    AC_MSG_CHECKING([for building with threads])
+    if test "${TCL_THREADS}" = 1; then
+	AC_DEFINE(TCL_THREADS, 1, [Are we building with threads enabled?])
+	AC_MSG_RESULT([yes (default)])
+    else
+	AC_MSG_RESULT([no])
+    fi
+    # TCL_THREADS sanity checking.  See if our request for building with
+    # threads is the same as the way Tcl was built.  If not, warn the user.
+    case ${TCL_DEFS} in
+	*THREADS=1*)
+	    if test "${TCL_THREADS}" = "0"; then
+		AC_MSG_WARN([
+    Building ${PACKAGE_NAME} without threads enabled, but building against Tcl
+    that IS thread-enabled.  It is recommended to use --enable-threads.])
+	    fi
+	    ;;
+    esac
+    AC_SUBST(TCL_THREADS)
+])
+
+#------------------------------------------------------------------------
+# TEA_ENABLE_SYMBOLS --
+#
+#	Specify if debugging symbols should be used.
+#	Memory (TCL_MEM_DEBUG) debugging can also be enabled.
+#
+# Arguments:
+#	none
+#
+#	TEA varies from core Tcl in that C|LDFLAGS_DEFAULT receives
+#	the value of C|LDFLAGS_OPTIMIZE|DEBUG already substituted.
+#	Requires the following vars to be set in the Makefile:
+#		CFLAGS_DEFAULT
+#		LDFLAGS_DEFAULT
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--enable-symbols
+#
+#	Defines the following vars:
+#		CFLAGS_DEFAULT	Sets to $(CFLAGS_DEBUG) if true
+#				Sets to "$(CFLAGS_OPTIMIZE) -DNDEBUG" if false
+#		LDFLAGS_DEFAULT	Sets to $(LDFLAGS_DEBUG) if true
+#				Sets to $(LDFLAGS_OPTIMIZE) if false
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_ENABLE_SYMBOLS], [
+    dnl TEA specific: Make sure we are initialized
+    AC_REQUIRE([TEA_CONFIG_CFLAGS])
+    AC_MSG_CHECKING([for build with symbols])
+    AC_ARG_ENABLE(symbols,
+	AS_HELP_STRING([--enable-symbols],
+	    [build with debugging symbols (default: off)]),
+	[tcl_ok=$enableval], [tcl_ok=no])
+    if test "$tcl_ok" = "no"; then
+	CFLAGS_DEFAULT="${CFLAGS_OPTIMIZE} -DNDEBUG"
+	LDFLAGS_DEFAULT="${LDFLAGS_OPTIMIZE}"
+	AC_MSG_RESULT([no])
+	AC_DEFINE(TCL_CFG_OPTIMIZED, 1, [Is this an optimized build?])
+    else
+	CFLAGS_DEFAULT="${CFLAGS_DEBUG}"
+	LDFLAGS_DEFAULT="${LDFLAGS_DEBUG}"
+	if test "$tcl_ok" = "yes"; then
+	    AC_MSG_RESULT([yes (standard debugging)])
+	fi
+    fi
+    AC_SUBST(CFLAGS_DEFAULT)
+    AC_SUBST(LDFLAGS_DEFAULT)
+
+    if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then
+	AC_DEFINE(TCL_MEM_DEBUG, 1, [Is memory debugging enabled?])
+    fi
+
+    if test "$tcl_ok" != "yes" -a "$tcl_ok" != "no"; then
+	if test "$tcl_ok" = "all"; then
+	    AC_MSG_RESULT([enabled symbols mem debugging])
+	else
+	    AC_MSG_RESULT([enabled $tcl_ok debugging])
+	fi
+    fi
+])
+
+#------------------------------------------------------------------------
+# TEA_ENABLE_LANGINFO --
+#
+#	Allows use of modern nl_langinfo check for better l10n.
+#	This is only relevant for Unix.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--enable-langinfo=yes|no (default is yes)
+#
+#	Defines the following vars:
+#		HAVE_LANGINFO	Triggers use of nl_langinfo if defined.
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_ENABLE_LANGINFO], [
+    AC_ARG_ENABLE(langinfo,
+	AS_HELP_STRING([--enable-langinfo],
+	    [use nl_langinfo if possible to determine encoding at startup, otherwise use old heuristic (default: on)]),
+	[langinfo_ok=$enableval], [langinfo_ok=yes])
+
+    HAVE_LANGINFO=0
+    if test "$langinfo_ok" = "yes"; then
+	AC_CHECK_HEADER(langinfo.h,[langinfo_ok=yes],[langinfo_ok=no])
+    fi
+    AC_MSG_CHECKING([whether to use nl_langinfo])
+    if test "$langinfo_ok" = "yes"; then
+	AC_CACHE_VAL(tcl_cv_langinfo_h, [
+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],
+		    [tcl_cv_langinfo_h=yes],[tcl_cv_langinfo_h=no])])
+	AC_MSG_RESULT([$tcl_cv_langinfo_h])
+	if test $tcl_cv_langinfo_h = yes; then
+	    AC_DEFINE(HAVE_LANGINFO, 1, [Do we have nl_langinfo()?])
+	fi
+    else
+	AC_MSG_RESULT([$langinfo_ok])
+    fi
+])
+
+#--------------------------------------------------------------------
+# TEA_CONFIG_SYSTEM
+#
+#	Determine what the system is (some things cannot be easily checked
+#	on a feature-driven basis, alas). This can usually be done via the
+#	"uname" command.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	Defines the following var:
+#
+#	system -	System/platform/version identification code.
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([TEA_CONFIG_SYSTEM], [
+    AC_CACHE_CHECK([system version], tcl_cv_sys_version, [
+	# TEA specific:
+	if test "${TEA_PLATFORM}" = "windows" ; then
+	    tcl_cv_sys_version=windows
+	else
+	    tcl_cv_sys_version=`uname -s`-`uname -r`
+	    if test "$?" -ne 0 ; then
+		AC_MSG_WARN([can't find uname command])
+		tcl_cv_sys_version=unknown
+	    else
+		if test "`uname -s`" = "AIX" ; then
+		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
+		fi
+		if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
+		    tcl_cv_sys_version=NetBSD-Debian
+		fi
+	    fi
+	fi
+    ])
+    system=$tcl_cv_sys_version
+])
+
+#--------------------------------------------------------------------
+# TEA_CONFIG_CFLAGS
+#
+#	Try to determine the proper flags to pass to the compiler
+#	for building shared libraries and other such nonsense.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Defines and substitutes the following vars:
+#
+#	DL_OBJS, DL_LIBS - removed for TEA, only needed by core.
+#       LDFLAGS -      Flags to pass to the compiler when linking object
+#                       files into an executable application binary such
+#                       as tclsh.
+#       LD_SEARCH_FLAGS-Flags to pass to ld, such as "-R /usr/local/tcl/lib",
+#                       that tell the run-time dynamic linker where to look
+#                       for shared libraries such as libtcl.so.  Depends on
+#                       the variable LIB_RUNTIME_DIR in the Makefile. Could
+#                       be the same as CC_SEARCH_FLAGS if ${CC} is used to link.
+#       CC_SEARCH_FLAGS-Flags to pass to ${CC}, such as "-Wl,-rpath,/usr/local/tcl/lib",
+#                       that tell the run-time dynamic linker where to look
+#                       for shared libraries such as libtcl.so.  Depends on
+#                       the variable LIB_RUNTIME_DIR in the Makefile.
+#       SHLIB_CFLAGS -  Flags to pass to cc when compiling the components
+#                       of a shared library (may request position-independent
+#                       code, among other things).
+#       SHLIB_LD -      Base command to use for combining object files
+#                       into a shared library.
+#       SHLIB_LD_LIBS - Dependent libraries for the linker to scan when
+#                       creating shared libraries.  This symbol typically
+#                       goes at the end of the "ld" commands that build
+#                       shared libraries. The value of the symbol defaults to
+#                       "${LIBS}" if all of the dependent libraries should
+#                       be specified when creating a shared library.  If
+#                       dependent libraries should not be specified (as on
+#                       SunOS 4.x, where they cause the link to fail, or in
+#                       general if Tcl and Tk aren't themselves shared
+#                       libraries), then this symbol has an empty string
+#                       as its value.
+#       SHLIB_SUFFIX -  Suffix to use for the names of dynamically loadable
+#                       extensions.  An empty string means we don't know how
+#                       to use shared libraries on this platform.
+#       LIB_SUFFIX -    Specifies everything that comes after the "libfoo"
+#                       in a static or shared library name, using the $PACKAGE_VERSION variable
+#                       to put the version in the right place.  This is used
+#                       by platforms that need non-standard library names.
+#                       Examples:  ${PACKAGE_VERSION}.so.1.1 on NetBSD, since it needs
+#                       to have a version after the .so, and ${PACKAGE_VERSION}.a
+#                       on AIX, since a shared library needs to have
+#                       a .a extension whereas shared objects for loadable
+#                       extensions have a .so extension.  Defaults to
+#                       ${PACKAGE_VERSION}${SHLIB_SUFFIX}.
+#	CFLAGS_DEBUG -
+#			Flags used when running the compiler in debug mode
+#	CFLAGS_OPTIMIZE -
+#			Flags used when running the compiler in optimize mode
+#	CFLAGS -	Additional CFLAGS added as necessary (usually 64-bit)
+#--------------------------------------------------------------------
+
+AC_DEFUN([TEA_CONFIG_CFLAGS], [
+    dnl TEA specific: Make sure we are initialized
+    AC_REQUIRE([TEA_INIT])
+
+    # Step 0.a: Enable 64 bit support?
+
+    AC_MSG_CHECKING([if 64bit support is requested])
+    AC_ARG_ENABLE(64bit,
+	AS_HELP_STRING([--enable-64bit],
+	    [enable 64bit support (default: off)]),
+	[do64bit=$enableval], [do64bit=no])
+    AC_MSG_RESULT([$do64bit])
+
+    # Step 0.b: Enable Solaris 64 bit VIS support?
+
+    AC_MSG_CHECKING([if 64bit Sparc VIS support is requested])
+    AC_ARG_ENABLE(64bit-vis,
+	AS_HELP_STRING([--enable-64bit-vis],
+	    [enable 64bit Sparc VIS support (default: off)]),
+	[do64bitVIS=$enableval], [do64bitVIS=no])
+    AC_MSG_RESULT([$do64bitVIS])
+    # Force 64bit on with VIS
+    AS_IF([test "$do64bitVIS" = "yes"], [do64bit=yes])
+
+    # Step 0.c: Check if visibility support is available. Do this here so
+    # that platform specific alternatives can be used below if this fails.
+
+    AC_CACHE_CHECK([if compiler supports visibility "hidden"],
+	tcl_cv_cc_visibility_hidden, [
+	hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+	    extern __attribute__((__visibility__("hidden"))) void f(void);
+	    void f(void) {}]], [[f();]])],[tcl_cv_cc_visibility_hidden=yes],
+	    [tcl_cv_cc_visibility_hidden=no])
+	CFLAGS=$hold_cflags])
+    AS_IF([test $tcl_cv_cc_visibility_hidden = yes], [
+	AC_DEFINE(MODULE_SCOPE,
+	    [extern __attribute__((__visibility__("hidden")))],
+	    [Compiler support for module scope symbols])
+	AC_DEFINE(HAVE_HIDDEN, [1], [Compiler support for module scope symbols])
+    ])
+
+    # Step 0.d: Disable -rpath support?
+
+    AC_MSG_CHECKING([if rpath support is requested])
+    AC_ARG_ENABLE(rpath,
+	AS_HELP_STRING([--disable-rpath],
+	    [disable rpath support (default: on)]),
+	[doRpath=$enableval], [doRpath=yes])
+    AC_MSG_RESULT([$doRpath])
+
+    # Set the variable "system" to hold the name and version number
+    # for the system.
+
+    TEA_CONFIG_SYSTEM
+
+    # Require ranlib early so we can override it in special cases below.
+
+    AC_REQUIRE([AC_PROG_RANLIB])
+
+    # Set configuration options based on system name and version.
+    # This is similar to Tcl's unix/tcl.m4 except that we've added a
+    # "windows" case and removed some core-only vars.
+
+    do64bit_ok=no
+    # default to '{$LIBS}' and set to "" on per-platform necessary basis
+    SHLIB_LD_LIBS='${LIBS}'
+    # When ld needs options to work in 64-bit mode, put them in
+    # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
+    # is disabled by the user. [Bug 1016796]
+    LDFLAGS_ARCH=""
+    UNSHARED_LIB_SUFFIX=""
+    # TEA specific: use PACKAGE_VERSION instead of VERSION
+    TCL_TRIM_DOTS='`echo ${PACKAGE_VERSION} | tr -d .`'
+    ECHO_VERSION='`echo ${PACKAGE_VERSION}`'
+    TCL_LIB_VERSIONS_OK=ok
+    CFLAGS_DEBUG=-g
+    AS_IF([test "$GCC" = yes], [
+	CFLAGS_OPTIMIZE=-O2
+	CFLAGS_WARNING="-Wall"
+    ], [
+	CFLAGS_OPTIMIZE=-O
+	CFLAGS_WARNING=""
+    ])
+    AC_CHECK_TOOL(AR, ar)
+    STLIB_LD='${AR} cr'
+    LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH"
+    AS_IF([test "x$SHLIB_VERSION" = x],[SHLIB_VERSION=""],[SHLIB_VERSION=".$SHLIB_VERSION"])
+    case $system in
+	# TEA specific:
+	windows)
+	    MACHINE="X86"
+	    if test "$do64bit" != "no" ; then
+		case "$do64bit" in
+		    amd64|x64|yes)
+			MACHINE="AMD64" ; # default to AMD64 64-bit build
+			;;
+		    arm64|aarch64)
+			MACHINE="ARM64"
+			;;
+		    ia64)
+			MACHINE="IA64"
+			;;
+		esac
+	    fi
+
+	    if test "$GCC" != "yes" ; then
+	        if test "${SHARED_BUILD}" = "0" ; then
+		    runtime=-MT
+	        else
+		    runtime=-MD
+	        fi
+	        case "x`echo \${VisualStudioVersion}`" in
+	            x1[[4-9]]*)
+		        lflags="${lflags} -nodefaultlib:libucrt.lib"
+		        TEA_ADD_LIBS([ucrt.lib])
+	            ;;
+	            *)
+	            ;;
+	        esac
+
+                if test "$do64bit" != "no" ; then
+		    CC="cl.exe"
+		    RC="rc.exe"
+		    lflags="${lflags} -nologo -MACHINE:${MACHINE} "
+		    LINKBIN="link.exe"
+		    CFLAGS_DEBUG="-nologo -Zi -Od -W3 ${runtime}d"
+		    CFLAGS_OPTIMIZE="-nologo -O2 -W2 ${runtime}"
+		    # Avoid 'unresolved external symbol __security_cookie'
+		    # errors, c.f. http://support.microsoft.com/?id=894573
+		    TEA_ADD_LIBS([bufferoverflowU.lib])
+		else
+		    RC="rc"
+		    lflags="${lflags} -nologo"
+		    LINKBIN="link"
+		    CFLAGS_DEBUG="-nologo -Z7 -Od -W3 -WX ${runtime}d"
+		    CFLAGS_OPTIMIZE="-nologo -O2 -W2 ${runtime}"
+		fi
+	    fi
+
+	    if test "$GCC" = "yes"; then
+		# mingw gcc mode
+		AC_CHECK_TOOL(RC, windres)
+		CFLAGS_DEBUG="-g"
+		CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
+		SHLIB_LD='${CC} -shared'
+		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+		LDFLAGS_CONSOLE="-wl,--subsystem,console ${lflags}"
+		LDFLAGS_WINDOW="-wl,--subsystem,windows ${lflags}"
+
+		AC_CACHE_CHECK(for cross-compile version of gcc,
+			ac_cv_cross,
+			AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+			    #ifdef _WIN32
+				#error cross-compiler
+			    #endif
+			]], [[]])],
+			[ac_cv_cross=yes],
+			[ac_cv_cross=no])
+		      )
+		      if test "$ac_cv_cross" = "yes"; then
+			case "$do64bit" in
+			    amd64|x64|yes)
+				CC="x86_64-w64-mingw32-${CC}"
+				LD="x86_64-w64-mingw32-ld"
+				AR="x86_64-w64-mingw32-ar"
+				RANLIB="x86_64-w64-mingw32-ranlib"
+				RC="x86_64-w64-mingw32-windres"
+			    ;;
+			    arm64|aarch64)
+				CC="aarch64-w64-mingw32-clang"
+				LD="aarch64-w64-mingw32-ld"
+				AR="aarch64-w64-mingw32-ar"
+				RANLIB="aarch64-w64-mingw32-ranlib"
+				RC="aarch64-w64-mingw32-windres"
+			    ;;
+			    *)
+				CC="i686-w64-mingw32-${CC}"
+				LD="i686-w64-mingw32-ld"
+				AR="i686-w64-mingw32-ar"
+				RANLIB="i686-w64-mingw32-ranlib"
+				RC="i686-w64-mingw32-windres"
+			    ;;
+			esac
+		fi
+
+	    else
+		SHLIB_LD="${LINKBIN} -dll ${lflags}"
+		# link -lib only works when -lib is the first arg
+		STLIB_LD="${LINKBIN} -lib ${lflags}"
+		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.lib'
+		PATHTYPE=-w
+		# For information on what debugtype is most useful, see:
+		# http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp
+		# and also
+		# http://msdn2.microsoft.com/en-us/library/y0zzbyt4%28VS.80%29.aspx
+		# This essentially turns it all on.
+		LDFLAGS_DEBUG="-debug -debugtype:cv"
+		LDFLAGS_OPTIMIZE="-release"
+		LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}"
+		LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}"
+	    fi
+
+	    SHLIB_SUFFIX=".dll"
+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.dll'
+
+	    TCL_LIB_VERSIONS_OK=nodots
+    	    ;;
+	AIX-*)
+	    AS_IF([test "$GCC" != "yes"], [
+		# AIX requires the _r compiler when gcc isn't being used
+		case "${CC}" in
+		    *_r|*_r\ *)
+			# ok ...
+			;;
+		    *)
+			# Make sure only first arg gets _r
+		    	CC=`echo "$CC" | sed -e 's/^\([[^ ]]*\)/\1_r/'`
+			;;
+		esac
+		AC_MSG_RESULT([Using $CC for compiling with threads])
+	    ])
+	    LIBS="$LIBS -lc"
+	    SHLIB_CFLAGS=""
+	    SHLIB_SUFFIX=".so"
+
+	    LD_LIBRARY_PATH_VAR="LIBPATH"
+
+	    # Check to enable 64-bit flags for compiler/linker
+	    AS_IF([test "$do64bit" = yes], [
+		AS_IF([test "$GCC" = yes], [
+		    AC_MSG_WARN([64bit mode not supported with GCC on $system])
+		], [
+		    do64bit_ok=yes
+		    CFLAGS="$CFLAGS -q64"
+		    LDFLAGS_ARCH="-q64"
+		    RANLIB="${RANLIB} -X64"
+		    AR="${AR} -X64"
+		    SHLIB_LD_FLAGS="-b64"
+		])
+	    ])
+
+	    AS_IF([test "`uname -m`" = ia64], [
+		# AIX-5 uses ELF style dynamic libraries on IA-64, but not PPC
+		SHLIB_LD="/usr/ccs/bin/ld -G -z text"
+		AS_IF([test "$GCC" = yes], [
+		    CC_SEARCH_FLAGS='"-Wl,-R,${LIB_RUNTIME_DIR}"'
+		], [
+		    CC_SEARCH_FLAGS='"-R${LIB_RUNTIME_DIR}"'
+		])
+		LD_SEARCH_FLAGS='-R "${LIB_RUNTIME_DIR}"'
+	    ], [
+		AS_IF([test "$GCC" = yes], [
+		    SHLIB_LD='${CC} -shared -Wl,-bexpall'
+		], [
+		    SHLIB_LD="/bin/ld -bhalt:4 -bM:SRE -bexpall -H512 -T512 -bnoentry"
+		    LDFLAGS="$LDFLAGS -brtl"
+		])
+		SHLIB_LD="${SHLIB_LD} ${SHLIB_LD_FLAGS}"
+		CC_SEARCH_FLAGS='"-L${LIB_RUNTIME_DIR}"'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    ])
+	    ;;
+	BeOS*)
+	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_LD='${CC} -nostart'
+	    SHLIB_SUFFIX=".so"
+
+	    #-----------------------------------------------------------
+	    # Check for inet_ntoa in -lbind, for BeOS (which also needs
+	    # -lsocket, even if the network functions are in -lnet which
+	    # is always linked to, for compatibility.
+	    #-----------------------------------------------------------
+	    AC_CHECK_LIB(bind, inet_ntoa, [LIBS="$LIBS -lbind -lsocket"])
+	    ;;
+	BSD/OS-2.1*|BSD/OS-3*)
+	    SHLIB_CFLAGS=""
+	    SHLIB_LD="shlicc -r"
+	    SHLIB_SUFFIX=".so"
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	BSD/OS-4.*)
+	    SHLIB_CFLAGS="-export-dynamic -fPIC"
+	    SHLIB_LD='${CC} -shared'
+	    SHLIB_SUFFIX=".so"
+	    LDFLAGS="$LDFLAGS -export-dynamic"
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	CYGWIN_*)
+	    SHLIB_CFLAGS=""
+	    SHLIB_LD='${CC} -shared'
+	    SHLIB_SUFFIX=".dll"
+	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$[@].a"
+	    EXEEXT=".exe"
+	    do64bit_ok=yes
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	dgux*)
+	    SHLIB_CFLAGS="-K PIC"
+	    SHLIB_LD='${CC} -G'
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	Haiku*)
+	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_SUFFIX=".so"
+	    SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
+	    AC_CHECK_LIB(network, inet_ntoa, [LIBS="$LIBS -lnetwork"])
+	    ;;
+	HP-UX-*.11.*)
+	    # Use updated header definitions where possible
+	    AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Do we want to use the XOPEN network library?])
+	    # TEA specific: Needed by Tcl, but not most extensions
+	    #AC_DEFINE(_XOPEN_SOURCE, 1, [Do we want to use the XOPEN network library?])
+	    #LIBS="$LIBS -lxnet"               # Use the XOPEN network library
+
+	    AS_IF([test "`uname -m`" = ia64], [
+		SHLIB_SUFFIX=".so"
+	    ], [
+		SHLIB_SUFFIX=".sl"
+	    ])
+	    AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no)
+	    AS_IF([test "$tcl_ok" = yes], [
+		SHLIB_CFLAGS="+z"
+		SHLIB_LD="ld -b"
+		LDFLAGS="$LDFLAGS -Wl,-E"
+		CC_SEARCH_FLAGS='"-Wl,+s,+b,${LIB_RUNTIME_DIR}:."'
+		LD_SEARCH_FLAGS='+s +b "${LIB_RUNTIME_DIR}:."'
+		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
+	    ])
+	    AS_IF([test "$GCC" = yes], [
+		SHLIB_LD='${CC} -shared'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    ], [
+		CFLAGS="$CFLAGS -z"
+	    ])
+
+	    # Check to enable 64-bit flags for compiler/linker
+	    AS_IF([test "$do64bit" = "yes"], [
+		AS_IF([test "$GCC" = yes], [
+		    case `${CC} -dumpmachine` in
+			hppa64*)
+			    # 64-bit gcc in use.  Fix flags for GNU ld.
+			    do64bit_ok=yes
+			    SHLIB_LD='${CC} -shared'
+			    AS_IF([test $doRpath = yes], [
+				CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
+			    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+			    ;;
+			*)
+			    AC_MSG_WARN([64bit mode not supported with GCC on $system])
+			    ;;
+		    esac
+		], [
+		    do64bit_ok=yes
+		    CFLAGS="$CFLAGS +DD64"
+		    LDFLAGS_ARCH="+DD64"
+		])
+	    ]) ;;
+	HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
+	    SHLIB_SUFFIX=".sl"
+	    AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no)
+	    AS_IF([test "$tcl_ok" = yes], [
+		SHLIB_CFLAGS="+z"
+		SHLIB_LD="ld -b"
+		SHLIB_LD_LIBS=""
+		LDFLAGS="$LDFLAGS -Wl,-E"
+		CC_SEARCH_FLAGS='"-Wl,+s,+b,${LIB_RUNTIME_DIR}:."'
+		LD_SEARCH_FLAGS='+s +b "${LIB_RUNTIME_DIR}:."'
+		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
+	    ]) ;;
+	IRIX-5.*)
+	    SHLIB_CFLAGS=""
+	    SHLIB_LD="ld -shared -rdata_shared"
+	    SHLIB_SUFFIX=".so"
+	    AC_LIBOBJ(mkstemp)
+	    AS_IF([test $doRpath = yes], [
+		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
+		LD_SEARCH_FLAGS='-rpath "${LIB_RUNTIME_DIR}"'])
+	    ;;
+	IRIX-6.*)
+	    SHLIB_CFLAGS=""
+	    SHLIB_LD="ld -n32 -shared -rdata_shared"
+	    SHLIB_SUFFIX=".so"
+	    AS_IF([test $doRpath = yes], [
+		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
+		LD_SEARCH_FLAGS='-rpath "${LIB_RUNTIME_DIR}"'])
+	    AS_IF([test "$GCC" = yes], [
+		CFLAGS="$CFLAGS -mabi=n32"
+		LDFLAGS="$LDFLAGS -mabi=n32"
+	    ], [
+		case $system in
+		    IRIX-6.3)
+			# Use to build 6.2 compatible binaries on 6.3.
+			CFLAGS="$CFLAGS -n32 -D_OLD_TERMIOS"
+			;;
+		    *)
+			CFLAGS="$CFLAGS -n32"
+			;;
+		esac
+		LDFLAGS="$LDFLAGS -n32"
+	    ])
+	    ;;
+	IRIX64-6.*)
+	    SHLIB_CFLAGS=""
+	    SHLIB_LD="ld -n32 -shared -rdata_shared"
+	    SHLIB_SUFFIX=".so"
+	    AS_IF([test $doRpath = yes], [
+		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
+		LD_SEARCH_FLAGS='-rpath "${LIB_RUNTIME_DIR}"'])
+
+	    # Check to enable 64-bit flags for compiler/linker
+
+	    AS_IF([test "$do64bit" = yes], [
+	        AS_IF([test "$GCC" = yes], [
+	            AC_MSG_WARN([64bit mode not supported by gcc])
+	        ], [
+	            do64bit_ok=yes
+	            SHLIB_LD="ld -64 -shared -rdata_shared"
+	            CFLAGS="$CFLAGS -64"
+	            LDFLAGS_ARCH="-64"
+	        ])
+	    ])
+	    ;;
+	Linux*|GNU*|NetBSD-Debian|DragonFly-*|FreeBSD-*)
+	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_SUFFIX=".so"
+
+	    # TEA specific:
+	    CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
+
+	    # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
+	    SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS_DEFAULT} -shared'
+	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+
+	    case $system in
+	    DragonFly-*|FreeBSD-*)
+		AS_IF([test "${TCL_THREADS}" = "1"], [
+		    # The -pthread needs to go in the LDFLAGS, not LIBS
+		    LIBS=`echo $LIBS | sed s/-pthread//`
+		    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+		    LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
+	    ;;
+            esac
+
+	    AS_IF([test $doRpath = yes], [
+		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
+	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
+	    AS_IF([test $do64bit = yes], [
+		AC_CACHE_CHECK([if compiler accepts -m64 flag], tcl_cv_cc_m64, [
+		    hold_cflags=$CFLAGS
+		    CFLAGS="$CFLAGS -m64"
+		    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+			    [tcl_cv_cc_m64=yes],[tcl_cv_cc_m64=no])
+		    CFLAGS=$hold_cflags])
+		AS_IF([test $tcl_cv_cc_m64 = yes], [
+		    CFLAGS="$CFLAGS -m64"
+		    do64bit_ok=yes
+		])
+	   ])
+
+	    # The combo of gcc + glibc has a bug related to inlining of
+	    # functions like strtod(). The -fno-builtin flag should address
+	    # this problem but it does not work. The -fno-inline flag is kind
+	    # of overkill but it works. Disable inlining only when one of the
+	    # files in compat/*.c is being linked in.
+
+	    AS_IF([test x"${USE_COMPAT}" != x],[CFLAGS="$CFLAGS -fno-inline"])
+	    ;;
+	Lynx*)
+	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_SUFFIX=".so"
+	    CFLAGS_OPTIMIZE=-02
+	    SHLIB_LD='${CC} -shared'
+	    LD_FLAGS="-Wl,--export-dynamic"
+	    AS_IF([test $doRpath = yes], [
+		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
+		LD_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
+	    ;;
+	OpenBSD-*)
+	    arch=`arch -s`
+	    case "$arch" in
+	    alpha|sparc64)
+		SHLIB_CFLAGS="-fPIC"
+		;;
+	    *)
+		SHLIB_CFLAGS="-fpic"
+		;;
+	    esac
+	    SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+	    SHLIB_SUFFIX=".so"
+	    AS_IF([test $doRpath = yes], [
+		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
+	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+	    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+	    CFLAGS_OPTIMIZE="-O2"
+	    # On OpenBSD:	Compile with -pthread
+	    #		Don't link with -lpthread
+	    LIBS=`echo $LIBS | sed s/-lpthread//`
+	    CFLAGS="$CFLAGS -pthread"
+	    # OpenBSD doesn't do version numbers with dots.
+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+	    TCL_LIB_VERSIONS_OK=nodots
+	    ;;
+	NetBSD-*)
+	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+	    SHLIB_SUFFIX=".so"
+	    LDFLAGS="$LDFLAGS -export-dynamic"
+	    AS_IF([test $doRpath = yes], [
+		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
+	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    # The -pthread needs to go in the CFLAGS, not LIBS
+	    LIBS=`echo $LIBS | sed s/-pthread//`
+	    CFLAGS="$CFLAGS -pthread"
+	    LDFLAGS="$LDFLAGS -pthread"
+	    ;;
+	Darwin-*)
+	    CFLAGS_OPTIMIZE="-Os"
+	    SHLIB_CFLAGS="-fno-common"
+	    # To avoid discrepancies between what headers configure sees during
+	    # preprocessing tests and compiling tests, move any -isysroot and
+	    # -mmacosx-version-min flags from CFLAGS to CPPFLAGS:
+	    CPPFLAGS="${CPPFLAGS} `echo " ${CFLAGS}" | \
+		awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
+		if ([$]i~/^(isysroot|mmacosx-version-min)/) print "-"[$]i}'`"
+	    CFLAGS="`echo " ${CFLAGS}" | \
+		awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
+		if (!([$]i~/^(isysroot|mmacosx-version-min)/)) print "-"[$]i}'`"
+	    AS_IF([test $do64bit = yes], [
+		case `arch` in
+		    ppc)
+			AC_CACHE_CHECK([if compiler accepts -arch ppc64 flag],
+				tcl_cv_cc_arch_ppc64, [
+			    hold_cflags=$CFLAGS
+			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
+			    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+				    [tcl_cv_cc_arch_ppc64=yes],[tcl_cv_cc_arch_ppc64=no])
+			    CFLAGS=$hold_cflags])
+			AS_IF([test $tcl_cv_cc_arch_ppc64 = yes], [
+			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
+			    do64bit_ok=yes
+			]);;
+		    i386)
+			AC_CACHE_CHECK([if compiler accepts -arch x86_64 flag],
+				tcl_cv_cc_arch_x86_64, [
+			    hold_cflags=$CFLAGS
+			    CFLAGS="$CFLAGS -arch x86_64"
+			    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+				    [tcl_cv_cc_arch_x86_64=yes],[tcl_cv_cc_arch_x86_64=no])
+			    CFLAGS=$hold_cflags])
+			AS_IF([test $tcl_cv_cc_arch_x86_64 = yes], [
+			    CFLAGS="$CFLAGS -arch x86_64"
+			    do64bit_ok=yes
+			]);;
+		    *)
+			AC_MSG_WARN([Don't know how enable 64-bit on architecture `arch`]);;
+		esac
+	    ], [
+		# Check for combined 32-bit and 64-bit fat build
+		AS_IF([echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64) ' \
+		    && echo "$CFLAGS " |grep -E -q -- '-arch (ppc|i386) '], [
+		    fat_32_64=yes])
+	    ])
+	    # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
+	    SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT}'
+	    AC_CACHE_CHECK([if ld accepts -single_module flag], tcl_cv_ld_single_module, [
+		hold_ldflags=$LDFLAGS
+		LDFLAGS="$LDFLAGS -dynamiclib -Wl,-single_module"
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int i;]])],
+			[tcl_cv_ld_single_module=yes],[tcl_cv_ld_single_module=no])
+		LDFLAGS=$hold_ldflags])
+	    AS_IF([test $tcl_cv_ld_single_module = yes], [
+		SHLIB_LD="${SHLIB_LD} -Wl,-single_module"
+	    ])
+	    # TEA specific: link shlib with current and compatibility version flags
+	    vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([[0-9]]\{1,5\}\)\(\(\.[[0-9]]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d`
+	    SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}"
+	    SHLIB_SUFFIX=".dylib"
+	    LDFLAGS="$LDFLAGS -headerpad_max_install_names"
+	    AC_CACHE_CHECK([if ld accepts -search_paths_first flag],
+		    tcl_cv_ld_search_paths_first, [
+		hold_ldflags=$LDFLAGS
+		LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int i;]])],
+			[tcl_cv_ld_search_paths_first=yes],[tcl_cv_ld_search_paths_first=no])
+		LDFLAGS=$hold_ldflags])
+	    AS_IF([test $tcl_cv_ld_search_paths_first = yes], [
+		LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+	    ])
+	    AS_IF([test "$tcl_cv_cc_visibility_hidden" != yes], [
+		AC_DEFINE(MODULE_SCOPE, [__private_extern__],
+		    [Compiler support for module scope symbols])
+		tcl_cv_cc_visibility_hidden=yes
+	    ])
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
+	    # TEA specific: for combined 32 & 64 bit fat builds of Tk
+	    # extensions, verify that 64-bit build is possible.
+	    AS_IF([test "$fat_32_64" = yes && test -n "${TK_BIN_DIR}"], [
+		AS_IF([test "${TEA_WINDOWINGSYSTEM}" = x11], [
+		    AC_CACHE_CHECK([for 64-bit X11], tcl_cv_lib_x11_64, [
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc / /g" -e "s/-arch i386 / /g"`"'
+			done
+			CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
+			LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XrmInitialize();]])],
+			    [tcl_cv_lib_x11_64=yes],[tcl_cv_lib_x11_64=no])
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval $v'="$hold_'$v'"'
+			done])
+		])
+		AS_IF([test "${TEA_WINDOWINGSYSTEM}" = aqua], [
+		    AC_CACHE_CHECK([for 64-bit Tk], tcl_cv_lib_tk_64, [
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc / /g" -e "s/-arch i386 / /g"`"'
+			done
+			CPPFLAGS="$CPPFLAGS -DUSE_TCL_STUBS=1 -DUSE_TK_STUBS=1 ${TCL_INCLUDES} ${TK_INCLUDES}"
+			LDFLAGS="$LDFLAGS ${TCL_STUB_LIB_SPEC} ${TK_STUB_LIB_SPEC}"
+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <tk.h>]], [[Tk_InitStubs(NULL, "", 0);]])],
+			    [tcl_cv_lib_tk_64=yes],[tcl_cv_lib_tk_64=no])
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval $v'="$hold_'$v'"'
+			done])
+		])
+		# remove 64-bit arch flags from CFLAGS et al. if configuration
+		# does not support 64-bit.
+		AS_IF([test "$tcl_cv_lib_tk_64" = no -o "$tcl_cv_lib_x11_64" = no], [
+		    AC_MSG_NOTICE([Removing 64-bit architectures from compiler & linker flags])
+		    for v in CFLAGS CPPFLAGS LDFLAGS; do
+			eval $v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'
+		    done])
+	    ])
+	    ;;
+	OS/390-*)
+	    CFLAGS_OPTIMIZE=""		# Optimizer is buggy
+	    AC_DEFINE(_OE_SOCKETS, 1,	# needed in sys/socket.h
+		[Should OS/390 do the right thing with sockets?])
+	    ;;
+	OSF1-V*)
+	    # Digital OSF/1
+	    SHLIB_CFLAGS=""
+	    AS_IF([test "$SHARED_BUILD" = 1], [
+	        SHLIB_LD='ld -shared -expect_unresolved "*"'
+	    ], [
+	        SHLIB_LD='ld -non_shared -expect_unresolved "*"'
+	    ])
+	    SHLIB_SUFFIX=".so"
+	    AS_IF([test $doRpath = yes], [
+		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
+		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
+	    AS_IF([test "$GCC" = yes], [CFLAGS="$CFLAGS -mieee"], [
+		CFLAGS="$CFLAGS -DHAVE_TZSET -std1 -ieee"])
+	    # see pthread_intro(3) for pthread support on osf1, k.furukawa
+	    CFLAGS="$CFLAGS -DHAVE_PTHREAD_ATTR_SETSTACKSIZE"
+	    CFLAGS="$CFLAGS -DTCL_THREAD_STACK_MIN=PTHREAD_STACK_MIN*64"
+	    LIBS=`echo $LIBS | sed s/-lpthreads//`
+	    AS_IF([test "$GCC" = yes], [
+		LIBS="$LIBS -lpthread -lmach -lexc"
+	    ], [
+		CFLAGS="$CFLAGS -pthread"
+		LDFLAGS="$LDFLAGS -pthread"
+	    ])
+	    ;;
+	QNX-6*)
+	    # QNX RTP
+	    # This may work for all QNX, but it was only reported for v6.
+	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_LD="ld -Bshareable -x"
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	SCO_SV-3.2*)
+	    AS_IF([test "$GCC" = yes], [
+		SHLIB_CFLAGS="-fPIC -melf"
+		LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
+	    ], [
+		SHLIB_CFLAGS="-Kpic -belf"
+		LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
+	    ])
+	    SHLIB_LD="ld -G"
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	SunOS-5.[[0-6]])
+	    # Careful to not let 5.10+ fall into this case
+
+	    # Note: If _REENTRANT isn't defined, then Solaris
+	    # won't define thread-safe library routines.
+
+	    AC_DEFINE(_REENTRANT, 1, [Do we want the reentrant OS API?])
+	    AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1,
+		[Do we really want to follow the standard? Yes we do!])
+
+	    SHLIB_CFLAGS="-KPIC"
+	    SHLIB_SUFFIX=".so"
+	    AS_IF([test "$GCC" = yes], [
+		SHLIB_LD='${CC} -shared'
+		CC_SEARCH_FLAGS='"-Wl,-R,${LIB_RUNTIME_DIR}"'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    ], [
+		SHLIB_LD="/usr/ccs/bin/ld -G -z text"
+		CC_SEARCH_FLAGS='-R "${LIB_RUNTIME_DIR}"'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    ])
+	    ;;
+	SunOS-5*)
+	    # Note: If _REENTRANT isn't defined, then Solaris
+	    # won't define thread-safe library routines.
+
+	    AC_DEFINE(_REENTRANT, 1, [Do we want the reentrant OS API?])
+	    AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1,
+		[Do we really want to follow the standard? Yes we do!])
+
+	    SHLIB_CFLAGS="-KPIC"
+
+	    # Check to enable 64-bit flags for compiler/linker
+	    AS_IF([test "$do64bit" = yes], [
+		arch=`isainfo`
+		AS_IF([test "$arch" = "sparcv9 sparc"], [
+		    AS_IF([test "$GCC" = yes], [
+			AS_IF([test "`${CC} -dumpversion | awk -F. '{print [$]1}'`" -lt 3], [
+			    AC_MSG_WARN([64bit mode not supported with GCC < 3.2 on $system])
+			], [
+			    do64bit_ok=yes
+			    CFLAGS="$CFLAGS -m64 -mcpu=v9"
+			    LDFLAGS="$LDFLAGS -m64 -mcpu=v9"
+			    SHLIB_CFLAGS="-fPIC"
+			])
+		    ], [
+			do64bit_ok=yes
+			AS_IF([test "$do64bitVIS" = yes], [
+			    CFLAGS="$CFLAGS -xarch=v9a"
+			    LDFLAGS_ARCH="-xarch=v9a"
+			], [
+			    CFLAGS="$CFLAGS -xarch=v9"
+			    LDFLAGS_ARCH="-xarch=v9"
+			])
+			# Solaris 64 uses this as well
+			#LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH_64"
+		    ])
+		], [AS_IF([test "$arch" = "amd64 i386"], [
+		    AS_IF([test "$GCC" = yes], [
+			case $system in
+			    SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*)
+				do64bit_ok=yes
+				CFLAGS="$CFLAGS -m64"
+				LDFLAGS="$LDFLAGS -m64";;
+			    *)
+				AC_MSG_WARN([64bit mode not supported with GCC on $system]);;
+			esac
+		    ], [
+			do64bit_ok=yes
+			case $system in
+			    SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*)
+				CFLAGS="$CFLAGS -m64"
+				LDFLAGS="$LDFLAGS -m64";;
+			    *)
+				CFLAGS="$CFLAGS -xarch=amd64"
+				LDFLAGS="$LDFLAGS -xarch=amd64";;
+			esac
+		    ])
+		], [AC_MSG_WARN([64bit mode not supported for $arch])])])
+	    ])
+
+	    SHLIB_SUFFIX=".so"
+	    AS_IF([test "$GCC" = yes], [
+		SHLIB_LD='${CC} -shared'
+		CC_SEARCH_FLAGS='"-Wl,-R,${LIB_RUNTIME_DIR}"'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+		AS_IF([test "$do64bit_ok" = yes], [
+		    AS_IF([test "$arch" = "sparcv9 sparc"], [
+			# We need to specify -static-libgcc or we need to
+			# add the path to the sparv9 libgcc.
+			# JH: static-libgcc is necessary for core Tcl, but may
+			# not be necessary for extensions.
+			SHLIB_LD="$SHLIB_LD -m64 -mcpu=v9 -static-libgcc"
+			# for finding sparcv9 libgcc, get the regular libgcc
+			# path, remove so name and append 'sparcv9'
+			#v9gcclibdir="`gcc -print-file-name=libgcc_s.so` | ..."
+			#CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir"
+		    ], [AS_IF([test "$arch" = "amd64 i386"], [
+			# JH: static-libgcc is necessary for core Tcl, but may
+			# not be necessary for extensions.
+			SHLIB_LD="$SHLIB_LD -m64 -static-libgcc"
+		    ])])
+		])
+	    ], [
+		case $system in
+		    SunOS-5.[[1-9]][[0-9]]*)
+			# TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
+			SHLIB_LD='${CC} -G -z text ${LDFLAGS_DEFAULT}';;
+		    *)
+			SHLIB_LD='/usr/ccs/bin/ld -G -z text';;
+		esac
+		CC_SEARCH_FLAGS='"-Wl,-R,${LIB_RUNTIME_DIR}"'
+		LD_SEARCH_FLAGS='-R "${LIB_RUNTIME_DIR}"'
+	    ])
+	    ;;
+	UNIX_SV* | UnixWare-5*)
+	    SHLIB_CFLAGS="-KPIC"
+	    SHLIB_LD='${CC} -G'
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    # Some UNIX_SV* systems (unixware 1.1.2 for example) have linkers
+	    # that don't grok the -Bexport option.  Test that it does.
+	    AC_CACHE_CHECK([for ld accepts -Bexport flag], tcl_cv_ld_Bexport, [
+		hold_ldflags=$LDFLAGS
+		LDFLAGS="$LDFLAGS -Wl,-Bexport"
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int i;]])],
+			[tcl_cv_ld_Bexport=yes],[tcl_cv_ld_Bexport=no])
+	        LDFLAGS=$hold_ldflags])
+	    AS_IF([test $tcl_cv_ld_Bexport = yes], [
+		LDFLAGS="$LDFLAGS -Wl,-Bexport"
+	    ])
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+    esac
+
+    AS_IF([test "$do64bit" = yes -a "$do64bit_ok" = no], [
+	AC_MSG_WARN([64bit support being disabled -- don't know magic for this platform])
+    ])
+
+dnl # Add any CPPFLAGS set in the environment to our CFLAGS, but delay doing so
+dnl # until the end of configure, as configure's compile and link tests use
+dnl # both CPPFLAGS and CFLAGS (unlike our compile and link) but configure's
+dnl # preprocessing tests use only CPPFLAGS.
+    AC_CONFIG_COMMANDS_PRE([CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS=""])
+
+    # Add in the arch flags late to ensure it wasn't removed.
+    # Not necessary in TEA, but this is aligned with core
+    LDFLAGS="$LDFLAGS $LDFLAGS_ARCH"
+
+    # If we're running gcc, then change the C flags for compiling shared
+    # libraries to the right flags for gcc, instead of those for the
+    # standard manufacturer compiler.
+
+    AS_IF([test "$GCC" = yes], [
+	case $system in
+	    AIX-*) ;;
+	    BSD/OS*) ;;
+	    CYGWIN_*|MINGW32_*|MINGW64_*|MSYS_*) ;;
+	    IRIX*) ;;
+	    NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;;
+	    Darwin-*) ;;
+	    SCO_SV-3.2*) ;;
+	    windows) ;;
+	    *) SHLIB_CFLAGS="-fPIC" ;;
+	esac])
+
+    AS_IF([test "$tcl_cv_cc_visibility_hidden" != yes], [
+	AC_DEFINE(MODULE_SCOPE, [extern],
+	    [No Compiler support for module scope symbols])
+    ])
+
+    AS_IF([test "$SHARED_LIB_SUFFIX" = ""], [
+    # TEA specific: use PACKAGE_VERSION instead of VERSION
+    SHARED_LIB_SUFFIX='${PACKAGE_VERSION}${SHLIB_SUFFIX}'])
+    AS_IF([test "$UNSHARED_LIB_SUFFIX" = ""], [
+    # TEA specific: use PACKAGE_VERSION instead of VERSION
+    UNSHARED_LIB_SUFFIX='${PACKAGE_VERSION}.a'])
+
+    if test "${GCC}" = "yes" -a ${SHLIB_SUFFIX} = ".dll"; then
+	AC_CACHE_CHECK(for SEH support in compiler,
+	    tcl_cv_seh,
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+
+	    int main(int argc, char** argv) {
+		int a, b = 0;
+		__try {
+		    a = 666 / b;
+		}
+		__except (EXCEPTION_EXECUTE_HANDLER) {
+		    return 0;
+		}
+		return 1;
+	    }
+	]])],
+	    [tcl_cv_seh=yes],
+	    [tcl_cv_seh=no],
+	    [tcl_cv_seh=no])
+	)
+	if test "$tcl_cv_seh" = "no" ; then
+	    AC_DEFINE(HAVE_NO_SEH, 1,
+		    [Defined when mingw does not support SEH])
+	fi
+
+	#
+	# Check to see if the excpt.h include file provided contains the
+	# definition for EXCEPTION_DISPOSITION; if not, which is the case
+	# with Cygwin's version as of 2002-04-10, define it to be int,
+	# sufficient for getting the current code to work.
+	#
+	AC_CACHE_CHECK(for EXCEPTION_DISPOSITION support in include files,
+	    tcl_cv_eh_disposition,
+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#	    define WIN32_LEAN_AND_MEAN
+#	    include <windows.h>
+#	    undef WIN32_LEAN_AND_MEAN
+	    ]], [[
+		EXCEPTION_DISPOSITION x;
+	    ]])],
+		[tcl_cv_eh_disposition=yes],
+		[tcl_cv_eh_disposition=no])
+	)
+	if test "$tcl_cv_eh_disposition" = "no" ; then
+	AC_DEFINE(EXCEPTION_DISPOSITION, int,
+		[Defined when cygwin/mingw does not support EXCEPTION DISPOSITION])
+	fi
+
+	# Check to see if winnt.h defines CHAR, SHORT, and LONG
+	# even if VOID has already been #defined. The win32api
+	# used by mingw and cygwin is known to do this.
+
+	AC_CACHE_CHECK(for winnt.h that ignores VOID define,
+	    tcl_cv_winnt_ignore_void,
+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#define VOID void
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+	    ]], [[
+		CHAR c;
+		SHORT s;
+		LONG l;
+	    ]])],
+        [tcl_cv_winnt_ignore_void=yes],
+        [tcl_cv_winnt_ignore_void=no])
+	)
+	if test "$tcl_cv_winnt_ignore_void" = "yes" ; then
+	    AC_DEFINE(HAVE_WINNT_IGNORE_VOID, 1,
+		    [Defined when cygwin/mingw ignores VOID define in winnt.h])
+	fi
+    fi
+
+	# See if the compiler supports casting to a union type.
+	# This is used to stop gcc from printing a compiler
+	# warning when initializing a union member.
+
+	AC_CACHE_CHECK(for cast to union support,
+	    tcl_cv_cast_to_union,
+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+		  union foo { int i; double d; };
+		  union foo f = (union foo) (int) 0;
+	    ]])],
+	    [tcl_cv_cast_to_union=yes],
+	    [tcl_cv_cast_to_union=no])
+	)
+	if test "$tcl_cv_cast_to_union" = "yes"; then
+	    AC_DEFINE(HAVE_CAST_TO_UNION, 1,
+		    [Defined when compiler supports casting to union type.])
+	fi
+
+	AC_CHECK_HEADER(stdbool.h, [AC_DEFINE(HAVE_STDBOOL_H, 1, [Do we have <stdbool.h>?])],)
+
+    AC_SUBST(CFLAGS_DEBUG)
+    AC_SUBST(CFLAGS_OPTIMIZE)
+    AC_SUBST(CFLAGS_WARNING)
+    AC_SUBST(LDFLAGS_DEBUG)
+    AC_SUBST(LDFLAGS_OPTIMIZE)
+
+    AC_SUBST(STLIB_LD)
+    AC_SUBST(SHLIB_LD)
+
+    AC_SUBST(SHLIB_LD_LIBS)
+    AC_SUBST(SHLIB_CFLAGS)
+
+    AC_SUBST(LD_LIBRARY_PATH_VAR)
+
+    # These must be called after we do the basic CFLAGS checks and
+    # verify any possible 64-bit or similar switches are necessary
+    TEA_TCL_EARLY_FLAGS
+    TEA_TCL_64BIT_FLAGS
+])
+
+#--------------------------------------------------------------------
+# TEA_SERIAL_PORT
+#
+#	Determine which interface to use to talk to the serial port.
+#	Note that #include lines must begin in leftmost column for
+#	some compilers to recognize them as preprocessor directives,
+#	and some build environments have stdin not pointing at a
+#	pseudo-terminal (usually /dev/null instead.)
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Defines only one of the following vars:
+#		HAVE_SYS_MODEM_H
+#		USE_TERMIOS
+#		USE_TERMIO
+#		USE_SGTTY
+#--------------------------------------------------------------------
+
+AC_DEFUN([TEA_SERIAL_PORT], [
+    AC_CHECK_HEADERS(sys/modem.h)
+    AC_CACHE_CHECK([termios vs. termio vs. sgtty], tcl_cv_api_serial, [
+    AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <termios.h>
+
+int main() {
+    struct termios t;
+    if (tcgetattr(0, &t) == 0) {
+	cfsetospeed(&t, 0);
+	t.c_cflag |= PARENB | PARODD | CSIZE | CSTOPB;
+	return 0;
+    }
+    return 1;
+}]])],[tcl_cv_api_serial=termios],[tcl_cv_api_serial=no],[tcl_cv_api_serial=no])
+    if test $tcl_cv_api_serial = no ; then
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <termio.h>
+
+int main() {
+    struct termio t;
+    if (ioctl(0, TCGETA, &t) == 0) {
+	t.c_cflag |= CBAUD | PARENB | PARODD | CSIZE | CSTOPB;
+	return 0;
+    }
+    return 1;
+}]])],[tcl_cv_api_serial=termio],[tcl_cv_api_serial=no],[tcl_cv_api_serial=no])
+    fi
+    if test $tcl_cv_api_serial = no ; then
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <sgtty.h>
+
+int main() {
+    struct sgttyb t;
+    if (ioctl(0, TIOCGETP, &t) == 0) {
+	t.sg_ospeed = 0;
+	t.sg_flags |= ODDP | EVENP | RAW;
+	return 0;
+    }
+    return 1;
+}]])],[tcl_cv_api_serial=sgtty],[tcl_cv_api_serial=no],[tcl_cv_api_serial=no])
+    fi
+    if test $tcl_cv_api_serial = no ; then
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <termios.h>
+#include <errno.h>
+
+int main() {
+    struct termios t;
+    if (tcgetattr(0, &t) == 0
+	|| errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
+	cfsetospeed(&t, 0);
+	t.c_cflag |= PARENB | PARODD | CSIZE | CSTOPB;
+	return 0;
+    }
+    return 1;
+}]])],[tcl_cv_api_serial=termios],[tcl_cv_api_serial=no],[tcl_cv_api_serial=no])
+    fi
+    if test $tcl_cv_api_serial = no; then
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <termio.h>
+#include <errno.h>
+
+int main() {
+    struct termio t;
+    if (ioctl(0, TCGETA, &t) == 0
+	|| errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
+	t.c_cflag |= CBAUD | PARENB | PARODD | CSIZE | CSTOPB;
+	return 0;
+    }
+    return 1;
+    }]])],[tcl_cv_api_serial=termio],[tcl_cv_api_serial=no],[tcl_cv_api_serial=no])
+    fi
+    if test $tcl_cv_api_serial = no; then
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <sgtty.h>
+#include <errno.h>
+
+int main() {
+    struct sgttyb t;
+    if (ioctl(0, TIOCGETP, &t) == 0
+	|| errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
+	t.sg_ospeed = 0;
+	t.sg_flags |= ODDP | EVENP | RAW;
+	return 0;
+    }
+    return 1;
+}]])],[tcl_cv_api_serial=sgtty],[tcl_cv_api_serial=none],[tcl_cv_api_serial=none])
+    fi])
+    case $tcl_cv_api_serial in
+	termios) AC_DEFINE(USE_TERMIOS, 1, [Use the termios API for serial lines]);;
+	termio)  AC_DEFINE(USE_TERMIO, 1, [Use the termio API for serial lines]);;
+	sgtty)   AC_DEFINE(USE_SGTTY, 1, [Use the sgtty API for serial lines]);;
+    esac
+])
+
+#--------------------------------------------------------------------
+# TEA_PATH_X
+#
+#	Locate the X11 header files and the X11 library archive.  Try
+#	the ac_path_x macro first, but if it doesn't find the X stuff
+#	(e.g. because there's no xmkmf program) then check through
+#	a list of possible directories.  Under some conditions the
+#	autoconf macro will return an include directory that contains
+#	no include files, so double-check its result just to be safe.
+#
+#	This should be called after TEA_CONFIG_CFLAGS as setting the
+#	LIBS line can confuse some configure macro magic.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Sets the following vars:
+#		XINCLUDES
+#		XLIBSW
+#		PKG_LIBS (appends to)
+#--------------------------------------------------------------------
+
+AC_DEFUN([TEA_PATH_X], [
+    if test "${TEA_WINDOWINGSYSTEM}" = "x11" ; then
+	TEA_PATH_UNIX_X
+    fi
+])
+
+AC_DEFUN([TEA_PATH_UNIX_X], [
+    AC_PATH_X
+    not_really_there=""
+    if test "$no_x" = ""; then
+	if test "$x_includes" = ""; then
+	    AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>]])],[],[not_really_there="yes"])
+	else
+	    if test ! -r $x_includes/X11/Xlib.h; then
+		not_really_there="yes"
+	    fi
+	fi
+    fi
+    if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
+	AC_MSG_CHECKING([for X11 header files])
+	found_xincludes="no"
+	AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>]])],[found_xincludes="yes"],[found_xincludes="no"])
+	if test "$found_xincludes" = "no"; then
+	    dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include"
+	    for i in $dirs ; do
+		if test -r $i/X11/Xlib.h; then
+		    AC_MSG_RESULT([$i])
+		    XINCLUDES=" -I$i"
+		    found_xincludes="yes"
+		    break
+		fi
+	    done
+	fi
+    else
+	if test "$x_includes" != ""; then
+	    XINCLUDES="-I$x_includes"
+	    found_xincludes="yes"
+	fi
+    fi
+    if test "$found_xincludes" = "no"; then
+	AC_MSG_RESULT([couldn't find any!])
+    fi
+
+    if test "$no_x" = yes; then
+	AC_MSG_CHECKING([for X11 libraries])
+	XLIBSW=nope
+	dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
+	for i in $dirs ; do
+	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
+		AC_MSG_RESULT([$i])
+		XLIBSW="-L$i -lX11"
+		x_libraries="$i"
+		break
+	    fi
+	done
+    else
+	if test "$x_libraries" = ""; then
+	    XLIBSW=-lX11
+	else
+	    XLIBSW="-L$x_libraries -lX11"
+	fi
+    fi
+    if test "$XLIBSW" = nope ; then
+	AC_CHECK_LIB(Xwindow, XCreateWindow, XLIBSW=-lXwindow)
+    fi
+    if test "$XLIBSW" = nope ; then
+	AC_MSG_RESULT([could not find any!  Using -lX11.])
+	XLIBSW=-lX11
+    fi
+    # TEA specific:
+    if test x"${XLIBSW}" != x ; then
+	PKG_LIBS="${PKG_LIBS} ${XLIBSW}"
+    fi
+])
+
+#--------------------------------------------------------------------
+# TEA_BLOCKING_STYLE
+#
+#	The statements below check for systems where POSIX-style
+#	non-blocking I/O (O_NONBLOCK) doesn't work or is unimplemented.
+#	On these systems (mostly older ones), use the old BSD-style
+#	FIONBIO approach instead.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Defines some of the following vars:
+#		HAVE_SYS_IOCTL_H
+#		HAVE_SYS_FILIO_H
+#		USE_FIONBIO
+#		O_NONBLOCK
+#--------------------------------------------------------------------
+
+AC_DEFUN([TEA_BLOCKING_STYLE], [
+    AC_CHECK_HEADERS(sys/ioctl.h)
+    AC_CHECK_HEADERS(sys/filio.h)
+    TEA_CONFIG_SYSTEM
+    AC_MSG_CHECKING([FIONBIO vs. O_NONBLOCK for nonblocking I/O])
+    case $system in
+	OSF*)
+	    AC_DEFINE(USE_FIONBIO, 1, [Should we use FIONBIO?])
+	    AC_MSG_RESULT([FIONBIO])
+	    ;;
+	*)
+	    AC_MSG_RESULT([O_NONBLOCK])
+	    ;;
+    esac
+])
+
+#--------------------------------------------------------------------
+# TEA_TIME_HANDLER
+#
+#	Checks how the system deals with time.h, what time structures
+#	are used on the system, and what fields the structures have.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Defines some of the following vars:
+#		USE_DELTA_FOR_TZ
+#		HAVE_TM_GMTOFF
+#		HAVE_TM_TZADJ
+#		HAVE_TIMEZONE_VAR
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([TEA_TIME_HANDLER], [
+    AC_CHECK_HEADERS(sys/time.h)
+    AC_HEADER_TIME
+    AC_STRUCT_TIMEZONE
+
+    AC_CHECK_FUNCS(gmtime_r localtime_r mktime)
+
+    AC_CACHE_CHECK([tm_tzadj in struct tm], tcl_cv_member_tm_tzadj, [
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[struct tm tm; (void)tm.tm_tzadj;]])],
+	    [tcl_cv_member_tm_tzadj=yes],
+	    [tcl_cv_member_tm_tzadj=no])])
+    if test $tcl_cv_member_tm_tzadj = yes ; then
+	AC_DEFINE(HAVE_TM_TZADJ, 1, [Should we use the tm_tzadj field of struct tm?])
+    fi
+
+    AC_CACHE_CHECK([tm_gmtoff in struct tm], tcl_cv_member_tm_gmtoff, [
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[struct tm tm; (void)tm.tm_gmtoff;]])],
+	    [tcl_cv_member_tm_gmtoff=yes],
+	    [tcl_cv_member_tm_gmtoff=no])])
+    if test $tcl_cv_member_tm_gmtoff = yes ; then
+	AC_DEFINE(HAVE_TM_GMTOFF, 1, [Should we use the tm_gmtoff field of struct tm?])
+    fi
+
+    #
+    # Its important to include time.h in this check, as some systems
+    # (like convex) have timezone functions, etc.
+    #
+    AC_CACHE_CHECK([long timezone variable], tcl_cv_timezone_long, [
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>
+#include <stdlib.h>]],
+	[[extern long timezone;
+	    timezone += 1;
+	    exit (0);]])],
+	    [tcl_cv_timezone_long=yes], [tcl_cv_timezone_long=no])])
+    if test $tcl_cv_timezone_long = yes ; then
+	AC_DEFINE(HAVE_TIMEZONE_VAR, 1, [Should we use the global timezone variable?])
+    else
+	#
+	# On some systems (eg IRIX 6.2), timezone is a time_t and not a long.
+	#
+	AC_CACHE_CHECK([time_t timezone variable], tcl_cv_timezone_time, [
+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>
+#include <stdlib.h>]],
+	    [[extern time_t timezone;
+		timezone += 1;
+		exit (0);]])],
+		[tcl_cv_timezone_time=yes], [tcl_cv_timezone_time=no])])
+	if test $tcl_cv_timezone_time = yes ; then
+	    AC_DEFINE(HAVE_TIMEZONE_VAR, 1, [Should we use the global timezone variable?])
+	fi
+    fi
+])
+
+#--------------------------------------------------------------------
+# TEA_BUGGY_STRTOD
+#
+#	Under Solaris 2.4, strtod returns the wrong value for the
+#	terminating character under some conditions.  Check for this
+#	and if the problem exists use a substitute procedure
+#	"fixstrtod" (provided by Tcl) that corrects the error.
+#	Also, on Compaq's Tru64 Unix 5.0,
+#	strtod(" ") returns 0.0 instead of a failure to convert.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Might defines some of the following vars:
+#		strtod (=fixstrtod)
+#--------------------------------------------------------------------
+
+AC_DEFUN([TEA_BUGGY_STRTOD], [
+    AC_CHECK_FUNC(strtod, tcl_strtod=1, tcl_strtod=0)
+    if test "$tcl_strtod" = 1; then
+	AC_CACHE_CHECK([for Solaris2.4/Tru64 strtod bugs], tcl_cv_strtod_buggy,[
+	    AC_RUN_IFELSE([AC_LANG_SOURCE([[
+		#include <stdlib.h>
+		extern double strtod();
+		int main() {
+		    char *infString="Inf", *nanString="NaN", *spaceString=" ";
+		    char *term;
+		    double value;
+		    value = strtod(infString, &term);
+		    if ((term != infString) && (term[-1] == 0)) {
+			exit(1);
+		    }
+		    value = strtod(nanString, &term);
+		    if ((term != nanString) && (term[-1] == 0)) {
+			exit(1);
+		    }
+		    value = strtod(spaceString, &term);
+		    if (term == (spaceString+1)) {
+			exit(1);
+		    }
+		    exit(0);
+		}]])], [tcl_cv_strtod_buggy=ok], [tcl_cv_strtod_buggy=buggy],
+		    [tcl_cv_strtod_buggy=buggy])])
+	if test "$tcl_cv_strtod_buggy" = buggy; then
+	    AC_LIBOBJ([fixstrtod])
+	    USE_COMPAT=1
+	    AC_DEFINE(strtod, fixstrtod, [Do we want to use the strtod() in compat?])
+	fi
+    fi
+])
+
+#--------------------------------------------------------------------
+# TEA_TCL_LINK_LIBS
+#
+#	Search for the libraries needed to link the Tcl shell.
+#	Things like the math library (-lm), socket stuff (-lsocket vs.
+#	-lnsl), zlib (-lz) and libtommath (-ltommath) are dealt with here.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#
+#	Might append to the following vars:
+#		LIBS
+#		MATH_LIBS
+#
+#	Might define the following vars:
+#		HAVE_NET_ERRNO_H
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([TEA_TCL_LINK_LIBS], [
+    #--------------------------------------------------------------------
+    # On a few very rare systems, all of the libm.a stuff is
+    # already in libc.a.  Set compiler flags accordingly.
+    #--------------------------------------------------------------------
+
+    AC_CHECK_FUNC(sin, MATH_LIBS="", MATH_LIBS="-lm")
+
+    #--------------------------------------------------------------------
+    # Interactive UNIX requires -linet instead of -lsocket, plus it
+    # needs net/errno.h to define the socket-related error codes.
+    #--------------------------------------------------------------------
+
+    AC_CHECK_LIB(inet, main, [LIBS="$LIBS -linet"])
+    AC_CHECK_HEADER(net/errno.h, [
+	AC_DEFINE(HAVE_NET_ERRNO_H, 1, [Do we have <net/errno.h>?])])
+
+    #--------------------------------------------------------------------
+    #	Check for the existence of the -lsocket and -lnsl libraries.
+    #	The order here is important, so that they end up in the right
+    #	order in the command line generated by make.  Here are some
+    #	special considerations:
+    #	1. Use "connect" and "accept" to check for -lsocket, and
+    #	   "gethostbyname" to check for -lnsl.
+    #	2. Use each function name only once:  can't redo a check because
+    #	   autoconf caches the results of the last check and won't redo it.
+    #	3. Use -lnsl and -lsocket only if they supply procedures that
+    #	   aren't already present in the normal libraries.  This is because
+    #	   IRIX 5.2 has libraries, but they aren't needed and they're
+    #	   bogus:  they goof up name resolution if used.
+    #	4. On some SVR4 systems, can't use -lsocket without -lnsl too.
+    #	   To get around this problem, check for both libraries together
+    #	   if -lsocket doesn't work by itself.
+    #--------------------------------------------------------------------
+
+    tcl_checkBoth=0
+    AC_CHECK_FUNC(connect, tcl_checkSocket=0, tcl_checkSocket=1)
+    if test "$tcl_checkSocket" = 1; then
+	AC_CHECK_FUNC(setsockopt, , [AC_CHECK_LIB(socket, setsockopt,
+	    LIBS="$LIBS -lsocket", tcl_checkBoth=1)])
+    fi
+    if test "$tcl_checkBoth" = 1; then
+	tk_oldLibs=$LIBS
+	LIBS="$LIBS -lsocket -lnsl"
+	AC_CHECK_FUNC(accept, tcl_checkNsl=0, [LIBS=$tk_oldLibs])
+    fi
+    AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl, gethostbyname,
+	    [LIBS="$LIBS -lnsl"])])
+    AC_CHECK_FUNC(mp_log_u32, , [AC_CHECK_LIB(tommath, mp_log_u32,
+	    [LIBS="$LIBS -ltommath"])])
+    AC_CHECK_FUNC(deflateSetHeader, , [AC_CHECK_LIB(z, deflateSetHeader,
+	    [LIBS="$LIBS -lz"])])
+])
+
+#--------------------------------------------------------------------
+# TEA_TCL_EARLY_FLAGS
+#
+#	Check for what flags are needed to be passed so the correct OS
+#	features are available.
+#
+# Arguments:
+#	None
+#
+# Results:
+#
+#	Might define the following vars:
+#		_ISOC99_SOURCE
+#		_FILE_OFFSET_BITS
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([TEA_TCL_EARLY_FLAG],[
+    AC_CACHE_VAL([tcl_cv_flag_]translit($1,[A-Z],[a-z]),
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$2]], [[$3]])],
+	    [tcl_cv_flag_]translit($1,[A-Z],[a-z])=no,[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[[#define ]$1[ ]m4_default([$4],[1])[
+]$2]], [[$3]])],
+	[tcl_cv_flag_]translit($1,[A-Z],[a-z])=yes,
+	[tcl_cv_flag_]translit($1,[A-Z],[a-z])=no)]))
+    if test ["x${tcl_cv_flag_]translit($1,[A-Z],[a-z])[}" = "xyes"] ; then
+	AC_DEFINE($1, m4_default([$4],[1]), [Add the ]$1[ flag when building])
+	tcl_flags="$tcl_flags $1"
+    fi
+])
+
+AC_DEFUN([TEA_TCL_EARLY_FLAGS],[
+    AC_MSG_CHECKING([for required early compiler flags])
+    tcl_flags=""
+    TEA_TCL_EARLY_FLAG(_ISOC99_SOURCE,[#include <stdlib.h>],
+	[char *p = (char *)strtoll; char *q = (char *)strtoull;])
+    if test "${TCL_MAJOR_VERSION}" -ne 8 ; then
+	TEA_TCL_EARLY_FLAG(_FILE_OFFSET_BITS,[#include <sys/stat.h>],
+	    [switch (0) { case 0: case (sizeof(off_t)==sizeof(long long)): ; }],64)
+    fi
+    if test "x${tcl_flags}" = "x" ; then
+	AC_MSG_RESULT([none])
+    else
+	AC_MSG_RESULT([${tcl_flags}])
+    fi
+])
+
+#--------------------------------------------------------------------
+# TEA_TCL_64BIT_FLAGS
+#
+#	Check for what is defined in the way of 64-bit features.
+#
+# Arguments:
+#	None
+#
+# Results:
+#
+#	Might define the following vars:
+#		TCL_WIDE_INT_IS_LONG
+#		TCL_WIDE_INT_TYPE
+#		HAVE_STRUCT_DIRENT64, HAVE_DIR64
+#		HAVE_STRUCT_STAT64
+#		HAVE_TYPE_OFF64_T
+#		_TIME_BITS
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([TEA_TCL_64BIT_FLAGS], [
+    AC_MSG_CHECKING([for 64-bit integer type])
+    AC_CACHE_VAL(tcl_cv_type_64bit,[
+	tcl_cv_type_64bit=none
+	# See if the compiler knows natively about __int64
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[__int64 value = (__int64) 0;]])],
+	    [tcl_type_64bit=__int64],[tcl_type_64bit="long long"])
+	# See if we could use long anyway  Note that we substitute in the
+	# type that is our current guess for a 64-bit type inside this check
+	# program, so it should be modified only carefully...
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[switch (0) {
+            case 1: case (sizeof(${tcl_type_64bit})==sizeof(long)): ;
+        }]])],[tcl_cv_type_64bit=${tcl_type_64bit}],[])])
+    if test "${tcl_cv_type_64bit}" = none ; then
+	AC_DEFINE(TCL_WIDE_INT_IS_LONG, 1, [Do 'long' and 'long long' have the same size (64-bit)?])
+	AC_MSG_RESULT([yes])
+    elif test "${tcl_cv_type_64bit}" = "__int64" \
+		-a "${TEA_PLATFORM}" = "windows" ; then
+	# TEA specific: We actually want to use the default tcl.h checks in
+	# this case to handle both TCL_WIDE_INT_TYPE and TCL_LL_MODIFIER*
+	AC_MSG_RESULT([using Tcl header defaults])
+    else
+	AC_DEFINE_UNQUOTED(TCL_WIDE_INT_TYPE,${tcl_cv_type_64bit},
+	    [What type should be used to define wide integers?])
+	AC_MSG_RESULT([${tcl_cv_type_64bit}])
+
+	# Now check for auxiliary declarations
+    if test "${TCL_MAJOR_VERSION}" -ne 8 ; then
+	    AC_CACHE_CHECK([for 64-bit time_t], tcl_cv_time_t_64,[
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]],
+		    [[switch (0) {case 0: case (sizeof(time_t)==sizeof(long long)): ;}]])],
+		    [tcl_cv_time_t_64=yes],[tcl_cv_time_t_64=no])])
+	    if test "x${tcl_cv_time_t_64}" = "xno" ; then
+		# Note that _TIME_BITS=64 requires _FILE_OFFSET_BITS=64
+		# which SC_TCL_EARLY_FLAGS has defined if necessary.
+		AC_CACHE_CHECK([if _TIME_BITS=64 enables 64-bit time_t], tcl_cv__time_bits,[
+		    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _TIME_BITS 64
+#include <sys/types.h>]],
+			[[switch (0) {case 0: case (sizeof(time_t)==sizeof(long long)): ;}]])],
+			[tcl_cv__time_bits=yes],[tcl_cv__time_bits=no])])
+		if test "x${tcl_cv__time_bits}" = "xyes" ; then
+		    AC_DEFINE(_TIME_BITS, 64, [_TIME_BITS=64 enables 64-bit time_t.])
+		fi
+	    fi
+	fi
+
+	AC_CACHE_CHECK([for struct dirent64], tcl_cv_struct_dirent64,[
+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <dirent.h>]], [[struct dirent64 p;]])],
+		[tcl_cv_struct_dirent64=yes],[tcl_cv_struct_dirent64=no])])
+	if test "x${tcl_cv_struct_dirent64}" = "xyes" ; then
+	    AC_DEFINE(HAVE_STRUCT_DIRENT64, 1, [Is 'struct dirent64' in <sys/types.h>?])
+	fi
+
+	AC_CACHE_CHECK([for DIR64], tcl_cv_DIR64,[
+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <dirent.h>]], [[struct dirent64 *p; DIR64 d = opendir64(".");
+            p = readdir64(d); rewinddir64(d); closedir64(d);]])],
+		[tcl_cv_DIR64=yes], [tcl_cv_DIR64=no])])
+	if test "x${tcl_cv_DIR64}" = "xyes" ; then
+	    AC_DEFINE(HAVE_DIR64, 1, [Is 'DIR64' in <sys/types.h>?])
+	fi
+
+	AC_CACHE_CHECK([for struct stat64], tcl_cv_struct_stat64,[
+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[struct stat64 p;
+]])],
+		[tcl_cv_struct_stat64=yes], [tcl_cv_struct_stat64=no])])
+	if test "x${tcl_cv_struct_stat64}" = "xyes" ; then
+	    AC_DEFINE(HAVE_STRUCT_STAT64, 1, [Is 'struct stat64' in <sys/stat.h>?])
+	fi
+
+	AC_CHECK_FUNCS(open64 lseek64)
+	AC_MSG_CHECKING([for off64_t])
+	AC_CACHE_VAL(tcl_cv_type_off64_t,[
+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]], [[off64_t offset;
+]])],
+		[tcl_cv_type_off64_t=yes], [tcl_cv_type_off64_t=no])])
+	dnl Define HAVE_TYPE_OFF64_T only when the off64_t type and the
+	dnl functions lseek64 and open64 are defined.
+	if test "x${tcl_cv_type_off64_t}" = "xyes" && \
+	        test "x${ac_cv_func_lseek64}" = "xyes" && \
+	        test "x${ac_cv_func_open64}" = "xyes" ; then
+	    AC_DEFINE(HAVE_TYPE_OFF64_T, 1, [Is off64_t in <sys/types.h>?])
+	    AC_MSG_RESULT([yes])
+	else
+	    AC_MSG_RESULT([no])
+	fi
+    fi
+])
+
+##
+## Here ends the standard Tcl configuration bits and starts the
+## TEA specific functions
+##
+
+#------------------------------------------------------------------------
+# TEA_INIT --
+#
+#	Init various Tcl Extension Architecture (TEA) variables.
+#	This should be the first called TEA_* macro.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Defines and substs the following vars:
+#		CYGPATH
+#		EXEEXT
+#	Defines only:
+#		TEA_VERSION
+#		TEA_INITED
+#		TEA_PLATFORM (windows or unix)
+#
+# "cygpath" is used on windows to generate native path names for include
+# files. These variables should only be used with the compiler and linker
+# since they generate native path names.
+#
+# EXEEXT
+#	Select the executable extension based on the host type.  This
+#	is a lightweight replacement for AC_EXEEXT that doesn't require
+#	a compiler.
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_INIT], [
+    TEA_VERSION="3.13"
+
+    AC_MSG_CHECKING([TEA configuration])
+    if test x"${PACKAGE_NAME}" = x ; then
+	AC_MSG_ERROR([
+The PACKAGE_NAME variable must be defined by your TEA configure.ac])
+    fi
+    AC_MSG_RESULT([ok (TEA ${TEA_VERSION})])
+
+    # If the user did not set CFLAGS, set it now to keep macros
+    # like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2".
+    if test "${CFLAGS+set}" != "set" ; then
+	CFLAGS=""
+    fi
+
+    case "`uname -s`" in
+	*win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+	    AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo)
+	    EXEEXT=".exe"
+	    TEA_PLATFORM="windows"
+	    ;;
+	*CYGWIN_*)
+	    EXEEXT=".exe"
+	    # CYGPATH and TEA_PLATFORM are determined later in LOAD_TCLCONFIG
+	    ;;
+	*)
+	    CYGPATH=echo
+	    # Maybe we are cross-compiling....
+	    case ${host_alias} in
+		*mingw32*)
+		EXEEXT=".exe"
+		TEA_PLATFORM="windows"
+		;;
+	    *)
+		EXEEXT=""
+		TEA_PLATFORM="unix"
+		;;
+	    esac
+	    ;;
+    esac
+
+    # Check if exec_prefix is set. If not use fall back to prefix.
+    # Note when adjusted, so that TEA_PREFIX can correct for this.
+    # This is needed for recursive configures, since autoconf propagates
+    # $prefix, but not $exec_prefix (doh!).
+    if test x$exec_prefix = xNONE ; then
+	exec_prefix_default=yes
+	exec_prefix=$prefix
+    fi
+
+    AC_MSG_NOTICE([configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}])
+
+    AC_SUBST(EXEEXT)
+    AC_SUBST(CYGPATH)
+
+    # This package name must be replaced statically for AC_SUBST to work
+    AC_SUBST(PKG_LIB_FILE)
+    AC_SUBST(PKG_LIB_FILE8)
+    AC_SUBST(PKG_LIB_FILE9)
+    # Substitute STUB_LIB_FILE in case package creates a stub library too.
+    AC_SUBST(PKG_STUB_LIB_FILE)
+
+    # We AC_SUBST these here to ensure they are subst'ed,
+    # in case the user doesn't call TEA_ADD_...
+    AC_SUBST(PKG_STUB_SOURCES)
+    AC_SUBST(PKG_STUB_OBJECTS)
+    AC_SUBST(PKG_TCL_SOURCES)
+    AC_SUBST(PKG_HEADERS)
+    AC_SUBST(PKG_INCLUDES)
+    AC_SUBST(PKG_LIBS)
+    AC_SUBST(PKG_CFLAGS)
+
+    # Configure the installer.
+    TEA_INSTALLER
+])
+
+#------------------------------------------------------------------------
+# TEA_ADD_SOURCES --
+#
+#	Specify one or more source files.  Users should check for
+#	the right platform before adding to their list.
+#	It is not important to specify the directory, as long as it is
+#	in the generic, win or unix subdirectory of $(srcdir).
+#
+# Arguments:
+#	one or more file names
+#
+# Results:
+#
+#	Defines and substs the following vars:
+#		PKG_SOURCES
+#		PKG_OBJECTS
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_ADD_SOURCES], [
+    vars="$@"
+    for i in $vars; do
+	case $i in
+	    [\$]*)
+		# allow $-var names
+		PKG_SOURCES="$PKG_SOURCES $i"
+		PKG_OBJECTS="$PKG_OBJECTS $i"
+		;;
+	    *)
+		# check for existence - allows for generic/win/unix VPATH
+		# To add more dirs here (like 'src'), you have to update VPATH
+		# in Makefile.in as well
+		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
+		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
+		    -a ! -f "${srcdir}/macosx/$i" \
+		    ; then
+		    AC_MSG_ERROR([could not find source file '$i'])
+		fi
+		PKG_SOURCES="$PKG_SOURCES $i"
+		# this assumes it is in a VPATH dir
+		i=`basename $i`
+		# handle user calling this before or after TEA_SETUP_COMPILER
+		if test x"${OBJEXT}" != x ; then
+		    j="`echo $i | sed -e 's/\.[[^.]]*$//'`.${OBJEXT}"
+		else
+		    j="`echo $i | sed -e 's/\.[[^.]]*$//'`.\${OBJEXT}"
+		fi
+		PKG_OBJECTS="$PKG_OBJECTS $j"
+		;;
+	esac
+    done
+    AC_SUBST(PKG_SOURCES)
+    AC_SUBST(PKG_OBJECTS)
+])
+
+#------------------------------------------------------------------------
+# TEA_ADD_STUB_SOURCES --
+#
+#	Specify one or more source files.  Users should check for
+#	the right platform before adding to their list.
+#	It is not important to specify the directory, as long as it is
+#	in the generic, win or unix subdirectory of $(srcdir).
+#
+# Arguments:
+#	one or more file names
+#
+# Results:
+#
+#	Defines and substs the following vars:
+#		PKG_STUB_SOURCES
+#		PKG_STUB_OBJECTS
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_ADD_STUB_SOURCES], [
+    vars="$@"
+    for i in $vars; do
+	# check for existence - allows for generic/win/unix VPATH
+	if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
+	    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
+	    -a ! -f "${srcdir}/macosx/$i" \
+	    ; then
+	    AC_MSG_ERROR([could not find stub source file '$i'])
+	fi
+	PKG_STUB_SOURCES="$PKG_STUB_SOURCES $i"
+	# this assumes it is in a VPATH dir
+	i=`basename $i`
+	# handle user calling this before or after TEA_SETUP_COMPILER
+	if test x"${OBJEXT}" != x ; then
+	    j="`echo $i | sed -e 's/\.[[^.]]*$//'`.${OBJEXT}"
+	else
+	    j="`echo $i | sed -e 's/\.[[^.]]*$//'`.\${OBJEXT}"
+	fi
+	PKG_STUB_OBJECTS="$PKG_STUB_OBJECTS $j"
+    done
+    AC_SUBST(PKG_STUB_SOURCES)
+    AC_SUBST(PKG_STUB_OBJECTS)
+])
+
+#------------------------------------------------------------------------
+# TEA_ADD_TCL_SOURCES --
+#
+#	Specify one or more Tcl source files.  These should be platform
+#	independent runtime files.
+#
+# Arguments:
+#	one or more file names
+#
+# Results:
+#
+#	Defines and substs the following vars:
+#		PKG_TCL_SOURCES
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_ADD_TCL_SOURCES], [
+    vars="$@"
+    for i in $vars; do
+	# check for existence, be strict because it is installed
+	if test ! -f "${srcdir}/$i" ; then
+	    AC_MSG_ERROR([could not find tcl source file '${srcdir}/$i'])
+	fi
+	PKG_TCL_SOURCES="$PKG_TCL_SOURCES $i"
+    done
+    AC_SUBST(PKG_TCL_SOURCES)
+])
+
+#------------------------------------------------------------------------
+# TEA_ADD_HEADERS --
+#
+#	Specify one or more source headers.  Users should check for
+#	the right platform before adding to their list.
+#
+# Arguments:
+#	one or more file names
+#
+# Results:
+#
+#	Defines and substs the following vars:
+#		PKG_HEADERS
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_ADD_HEADERS], [
+    vars="$@"
+    for i in $vars; do
+	# check for existence, be strict because it is installed
+	if test ! -f "${srcdir}/$i" ; then
+	    AC_MSG_ERROR([could not find header file '${srcdir}/$i'])
+	fi
+	PKG_HEADERS="$PKG_HEADERS $i"
+    done
+    AC_SUBST(PKG_HEADERS)
+])
+
+#------------------------------------------------------------------------
+# TEA_ADD_INCLUDES --
+#
+#	Specify one or more include dirs.  Users should check for
+#	the right platform before adding to their list.
+#
+# Arguments:
+#	one or more file names
+#
+# Results:
+#
+#	Defines and substs the following vars:
+#		PKG_INCLUDES
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_ADD_INCLUDES], [
+    vars="$@"
+    for i in $vars; do
+	PKG_INCLUDES="$PKG_INCLUDES $i"
+    done
+    AC_SUBST(PKG_INCLUDES)
+])
+
+#------------------------------------------------------------------------
+# TEA_ADD_LIBS --
+#
+#	Specify one or more libraries.  Users should check for
+#	the right platform before adding to their list.  For Windows,
+#	libraries provided in "foo.lib" format will be converted to
+#	"-lfoo" when using GCC (mingw).
+#
+# Arguments:
+#	one or more file names
+#
+# Results:
+#
+#	Defines and substs the following vars:
+#		PKG_LIBS
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_ADD_LIBS], [
+    vars="$@"
+    for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([[^-]].*\)\.[[lL]][[iI]][[bB]][$]/-l\1/'`
+	fi
+	PKG_LIBS="$PKG_LIBS $i"
+    done
+    AC_SUBST(PKG_LIBS)
+])
+
+#------------------------------------------------------------------------
+# TEA_ADD_CFLAGS --
+#
+#	Specify one or more CFLAGS.  Users should check for
+#	the right platform before adding to their list.
+#
+# Arguments:
+#	one or more file names
+#
+# Results:
+#
+#	Defines and substs the following vars:
+#		PKG_CFLAGS
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_ADD_CFLAGS], [
+    PKG_CFLAGS="$PKG_CFLAGS $@"
+    AC_SUBST(PKG_CFLAGS)
+])
+
+#------------------------------------------------------------------------
+# TEA_ADD_CLEANFILES --
+#
+#	Specify one or more CLEANFILES.
+#
+# Arguments:
+#	one or more file names to clean target
+#
+# Results:
+#
+#	Appends to CLEANFILES, already defined for subst in LOAD_TCLCONFIG
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_ADD_CLEANFILES], [
+    CLEANFILES="$CLEANFILES $@"
+])
+
+#------------------------------------------------------------------------
+# TEA_PREFIX --
+#
+#	Handle the --prefix=... option by defaulting to what Tcl gave
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	If --prefix or --exec-prefix was not specified, $prefix and
+#	$exec_prefix will be set to the values given to Tcl when it was
+#	configured.
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_PREFIX], [
+    if test "${prefix}" = "NONE"; then
+	prefix_default=yes
+	if test x"${TCL_PREFIX}" != x; then
+	    AC_MSG_NOTICE([--prefix defaulting to TCL_PREFIX ${TCL_PREFIX}])
+	    prefix=${TCL_PREFIX}
+	else
+	    AC_MSG_NOTICE([--prefix defaulting to /usr/local])
+	    prefix=/usr/local
+	fi
+    fi
+    if test "${exec_prefix}" = "NONE" -a x"${prefix_default}" = x"yes" \
+	-o x"${exec_prefix_default}" = x"yes" ; then
+	if test x"${TCL_EXEC_PREFIX}" != x; then
+	    AC_MSG_NOTICE([--exec-prefix defaulting to TCL_EXEC_PREFIX ${TCL_EXEC_PREFIX}])
+	    exec_prefix=${TCL_EXEC_PREFIX}
+	else
+	    AC_MSG_NOTICE([--exec-prefix defaulting to ${prefix}])
+	    exec_prefix=$prefix
+	fi
+    fi
+])
+
+#------------------------------------------------------------------------
+# TEA_SETUP_COMPILER_CC --
+#
+#	Do compiler checks the way we want.  This is just a replacement
+#	for AC_PROG_CC in TEA configure.ac files to make them cleaner.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Sets up CC var and other standard bits we need to make executables.
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_SETUP_COMPILER_CC], [
+    # Don't put any macros that use the compiler (e.g. AC_TRY_COMPILE)
+    # in this macro, they need to go into TEA_SETUP_COMPILER instead.
+
+    AC_PROG_CC
+    AC_PROG_CPP
+
+    #--------------------------------------------------------------------
+    # Checks to see if the make program sets the $MAKE variable.
+    #--------------------------------------------------------------------
+
+    AC_PROG_MAKE_SET
+
+    #--------------------------------------------------------------------
+    # Find ranlib
+    #--------------------------------------------------------------------
+
+    AC_CHECK_TOOL(RANLIB, ranlib)
+
+    #--------------------------------------------------------------------
+    # Determines the correct binary file extension (.o, .obj, .exe etc.)
+    #--------------------------------------------------------------------
+
+    AC_OBJEXT
+    AC_EXEEXT
+])
+
+#------------------------------------------------------------------------
+# TEA_SETUP_COMPILER --
+#
+#	Do compiler checks that use the compiler.  This must go after
+#	TEA_SETUP_COMPILER_CC, which does the actual compiler check.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Sets up CC var and other standard bits we need to make executables.
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_SETUP_COMPILER], [
+    # Any macros that use the compiler (e.g. AC_TRY_COMPILE) have to go here.
+    AC_REQUIRE([TEA_SETUP_COMPILER_CC])
+
+    #------------------------------------------------------------------------
+    # If we're using GCC, see if the compiler understands -pipe. If so, use it.
+    # It makes compiling go faster.  (This is only a performance feature.)
+    #------------------------------------------------------------------------
+
+    if test -z "$no_pipe" -a -n "$GCC"; then
+	AC_CACHE_CHECK([if the compiler understands -pipe],
+	    tcl_cv_cc_pipe, [
+	    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -pipe"
+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[tcl_cv_cc_pipe=yes],[tcl_cv_cc_pipe=no])
+	    CFLAGS=$hold_cflags])
+	if test $tcl_cv_cc_pipe = yes; then
+	    CFLAGS="$CFLAGS -pipe"
+	fi
+    fi
+
+    #--------------------------------------------------------------------
+    # Common compiler flag setup
+    #--------------------------------------------------------------------
+
+    AC_C_BIGENDIAN
+])
+
+#------------------------------------------------------------------------
+# TEA_MAKE_LIB --
+#
+#	Generate a line that can be used to build a shared/unshared library
+#	in a platform independent manner.
+#
+# Arguments:
+#	none
+#
+#	Requires:
+#
+# Results:
+#
+#	Defines the following vars:
+#	CFLAGS -	Done late here to note disturb other AC macros
+#       MAKE_LIB -      Command to execute to build the Tcl library;
+#                       differs depending on whether or not Tcl is being
+#                       compiled as a shared library.
+#	MAKE_SHARED_LIB	Makefile rule for building a shared library
+#	MAKE_STATIC_LIB	Makefile rule for building a static library
+#	MAKE_STUB_LIB	Makefile rule for building a stub library
+#	VC_MANIFEST_EMBED_DLL Makefile rule for embedded VC manifest in DLL
+#	VC_MANIFEST_EMBED_EXE Makefile rule for embedded VC manifest in EXE
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_MAKE_LIB], [
+    if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes"; then
+	MAKE_STATIC_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_OBJECTS)"
+	MAKE_SHARED_LIB="\${SHLIB_LD} \${LDFLAGS} \${LDFLAGS_DEFAULT} -out:\[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}"
+	AC_EGREP_CPP([manifest needed], [
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+print("manifest needed")
+#endif
+	], [
+	# Could do a CHECK_PROG for mt, but should always be with MSVC8+
+	VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;2 ; fi"
+	VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;1 ; fi"
+	MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}"
+	TEA_ADD_CLEANFILES([*.manifest])
+	])
+	MAKE_STUB_LIB="\${STLIB_LD} -nodefaultlib -out:\[$]@ \$(PKG_STUB_OBJECTS)"
+    else
+	MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)"
+	MAKE_SHARED_LIB="\${SHLIB_LD} \${LDFLAGS} \${LDFLAGS_DEFAULT} -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}"
+	MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)"
+    fi
+
+    if test "${SHARED_BUILD}" = "1" ; then
+	MAKE_LIB="${MAKE_SHARED_LIB} "
+    else
+	MAKE_LIB="${MAKE_STATIC_LIB} "
+    fi
+
+    #--------------------------------------------------------------------
+    # Shared libraries and static libraries have different names.
+    # Use the double eval to make sure any variables in the suffix is
+    # substituted. (@@@ Might not be necessary anymore)
+    #--------------------------------------------------------------------
+
+    PACKAGE_LIB_PREFIX8="${PACKAGE_LIB_PREFIX}"
+    PACKAGE_LIB_PREFIX9="${PACKAGE_LIB_PREFIX}tcl9"
+    if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" == x; then
+	PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX9}"
+    else
+	PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX8}"
+	AC_DEFINE(TCL_MAJOR_VERSION, 8, [Compile for Tcl8?])
+    fi
+    if test "${TEA_PLATFORM}" = "windows" ; then
+	if test "${SHARED_BUILD}" = "1" ; then
+	    # We force the unresolved linking of symbols that are really in
+	    # the private libraries of Tcl and Tk.
+	    if test x"${TK_BIN_DIR}" != x ; then
+		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
+	    fi
+	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
+	    if test "$GCC" = "yes"; then
+		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
+	    fi
+	    eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+	    eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+	else
+	    if test "$GCC" = "yes"; then
+		PACKAGE_LIB_PREFIX=lib${PACKAGE_LIB_PREFIX}
+	    fi
+	    eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+	    eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+	fi
+	# Some packages build their own stubs libraries
+	eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
+	if test "$GCC" = "yes"; then
+	    PKG_STUB_LIB_FILE=lib${PKG_STUB_LIB_FILE}
+	fi
+	# These aren't needed on Windows (either MSVC or gcc)
+	RANLIB=:
+	RANLIB_STUB=:
+    else
+	RANLIB_STUB="${RANLIB}"
+	if test "${SHARED_BUILD}" = "1" ; then
+	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TCL_STUB_LIB_SPEC}"
+	    if test x"${TK_BIN_DIR}" != x ; then
+		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
+	    fi
+	    eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+	    eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+	    eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+	    RANLIB=:
+	else
+	    eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+	    eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+	    eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+	fi
+	# Some packages build their own stubs libraries
+	eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
+    fi
+
+    # These are escaped so that only CFLAGS is picked up at configure time.
+    # The other values will be substituted at make time.
+    CFLAGS="${CFLAGS} \${CFLAGS_DEFAULT} \${CFLAGS_WARNING}"
+    if test "${SHARED_BUILD}" = "1" ; then
+	CFLAGS="${CFLAGS} \${SHLIB_CFLAGS}"
+    fi
+
+    AC_SUBST(MAKE_LIB)
+    AC_SUBST(MAKE_SHARED_LIB)
+    AC_SUBST(MAKE_STATIC_LIB)
+    AC_SUBST(MAKE_STUB_LIB)
+    AC_SUBST(RANLIB_STUB)
+    AC_SUBST(VC_MANIFEST_EMBED_DLL)
+    AC_SUBST(VC_MANIFEST_EMBED_EXE)
+])
+
+#------------------------------------------------------------------------
+# TEA_LIB_SPEC --
+#
+#	Compute the name of an existing object library located in libdir
+#	from the given base name and produce the appropriate linker flags.
+#
+# Arguments:
+#	basename	The base name of the library without version
+#			numbers, extensions, or "lib" prefixes.
+#	extra_dir	Extra directory in which to search for the
+#			library.  This location is used first, then
+#			$prefix/$exec-prefix, then some defaults.
+#
+# Requires:
+#	TEA_INIT and TEA_PREFIX must be called first.
+#
+# Results:
+#
+#	Defines the following vars:
+#		${basename}_LIB_NAME	The computed library name.
+#		${basename}_LIB_SPEC	The computed linker flags.
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_LIB_SPEC], [
+    AC_MSG_CHECKING([for $1 library])
+
+    # Look in exec-prefix for the library (defined by TEA_PREFIX).
+
+    tea_lib_name_dir="${exec_prefix}/lib"
+
+    # Or in a user-specified location.
+
+    if test x"$2" != x ; then
+	tea_extra_lib_dir=$2
+    else
+	tea_extra_lib_dir=NONE
+    fi
+
+    for i in \
+	    `ls -dr ${tea_extra_lib_dir}/$1[[0-9]]*.lib 2>/dev/null ` \
+	    `ls -dr ${tea_extra_lib_dir}/lib$1[[0-9]]* 2>/dev/null ` \
+	    `ls -dr ${tea_lib_name_dir}/$1[[0-9]]*.lib 2>/dev/null ` \
+	    `ls -dr ${tea_lib_name_dir}/lib$1[[0-9]]* 2>/dev/null ` \
+	    `ls -dr /usr/lib/$1[[0-9]]*.lib 2>/dev/null ` \
+	    `ls -dr /usr/lib/lib$1[[0-9]]* 2>/dev/null ` \
+	    `ls -dr /usr/lib64/$1[[0-9]]*.lib 2>/dev/null ` \
+	    `ls -dr /usr/lib64/lib$1[[0-9]]* 2>/dev/null ` \
+	    `ls -dr /usr/local/lib/$1[[0-9]]*.lib 2>/dev/null ` \
+	    `ls -dr /usr/local/lib/lib$1[[0-9]]* 2>/dev/null ` ; do
+	if test -f "$i" ; then
+	    tea_lib_name_dir=`dirname $i`
+	    $1_LIB_NAME=`basename $i`
+	    $1_LIB_PATH_NAME=$i
+	    break
+	fi
+    done
+
+    if test "${TEA_PLATFORM}" = "windows"; then
+	$1_LIB_SPEC=\"`${CYGPATH} ${$1_LIB_PATH_NAME} 2>/dev/null`\"
+    else
+	# Strip off the leading "lib" and trailing ".a" or ".so"
+
+	tea_lib_name_lib=`echo ${$1_LIB_NAME}|sed -e 's/^lib//' -e 's/\.[[^.]]*$//' -e 's/\.so.*//'`
+	$1_LIB_SPEC="-L${tea_lib_name_dir} -l${tea_lib_name_lib}"
+    fi
+
+    if test "x${$1_LIB_NAME}" = x ; then
+	AC_MSG_ERROR([not found])
+    else
+	AC_MSG_RESULT([${$1_LIB_SPEC}])
+    fi
+])
+
+#------------------------------------------------------------------------
+# TEA_PRIVATE_TCL_HEADERS --
+#
+#	Locate the private Tcl include files
+#
+# Arguments:
+#
+#	Requires:
+#		TCL_SRC_DIR	Assumes that TEA_LOAD_TCLCONFIG has
+#				already been called.
+#
+# Results:
+#
+#	Substitutes the following vars:
+#		TCL_TOP_DIR_NATIVE
+#		TCL_INCLUDES
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_PRIVATE_TCL_HEADERS], [
+    # Allow for --with-tclinclude to take effect and define ${ac_cv_c_tclh}
+    AC_REQUIRE([TEA_PUBLIC_TCL_HEADERS])
+    AC_MSG_CHECKING([for Tcl private include files])
+
+    TCL_SRC_DIR_NATIVE=`${CYGPATH} ${TCL_SRC_DIR}`
+    TCL_TOP_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}\"
+
+    # Check to see if tcl<Plat>Port.h isn't already with the public headers
+    # Don't look for tclInt.h because that resides with tcl.h in the core
+    # sources, but the <plat>Port headers are in a different directory
+    if test "${TEA_PLATFORM}" = "windows" -a \
+	-f "${ac_cv_c_tclh}/tclWinPort.h"; then
+	result="private headers found with public headers"
+    elif test "${TEA_PLATFORM}" = "unix" -a \
+	-f "${ac_cv_c_tclh}/tclUnixPort.h"; then
+	result="private headers found with public headers"
+    else
+	TCL_GENERIC_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}/generic\"
+	if test "${TEA_PLATFORM}" = "windows"; then
+	    TCL_PLATFORM_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}/win\"
+	else
+	    TCL_PLATFORM_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}/unix\"
+	fi
+	# Overwrite the previous TCL_INCLUDES as this should capture both
+	# public and private headers in the same set.
+	# We want to ensure these are substituted so as not to require
+	# any *_NATIVE vars be defined in the Makefile
+	TCL_INCLUDES="-I${TCL_GENERIC_DIR_NATIVE} -I${TCL_PLATFORM_DIR_NATIVE}"
+	if test "`uname -s`" = "Darwin"; then
+            # If Tcl was built as a framework, attempt to use
+            # the framework's Headers and PrivateHeaders directories
+            case ${TCL_DEFS} in
+	    	*TCL_FRAMEWORK*)
+		    if test -d "${TCL_BIN_DIR}/Headers" -a \
+			    -d "${TCL_BIN_DIR}/PrivateHeaders"; then
+			TCL_INCLUDES="-I\"${TCL_BIN_DIR}/Headers\" -I\"${TCL_BIN_DIR}/PrivateHeaders\" ${TCL_INCLUDES}"
+		    else
+			TCL_INCLUDES="${TCL_INCLUDES} ${TCL_INCLUDE_SPEC} `echo "${TCL_INCLUDE_SPEC}" | sed -e 's/Headers/PrivateHeaders/'`"
+		    fi
+	            ;;
+	    esac
+	    result="Using ${TCL_INCLUDES}"
+	else
+	    if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then
+		AC_MSG_ERROR([Cannot find private header tclInt.h in ${TCL_SRC_DIR}])
+	    fi
+	    result="Using srcdir found in tclConfig.sh: ${TCL_SRC_DIR}"
+	fi
+    fi
+
+    AC_SUBST(TCL_TOP_DIR_NATIVE)
+
+    AC_SUBST(TCL_INCLUDES)
+    AC_MSG_RESULT([${result}])
+])
+
+#------------------------------------------------------------------------
+# TEA_PUBLIC_TCL_HEADERS --
+#
+#	Locate the installed public Tcl header files
+#
+# Arguments:
+#	None.
+#
+# Requires:
+#	CYGPATH must be set
+#
+# Results:
+#
+#	Adds a --with-tclinclude switch to configure.
+#	Result is cached.
+#
+#	Substitutes the following vars:
+#		TCL_INCLUDES
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_PUBLIC_TCL_HEADERS], [
+    AC_MSG_CHECKING([for Tcl public headers])
+
+    AC_ARG_WITH(tclinclude, [  --with-tclinclude       directory containing the public Tcl header files], with_tclinclude=${withval})
+
+    AC_CACHE_VAL(ac_cv_c_tclh, [
+	# Use the value from --with-tclinclude, if it was given
+
+	if test x"${with_tclinclude}" != x ; then
+	    if test -f "${with_tclinclude}/tcl.h" ; then
+		ac_cv_c_tclh=${with_tclinclude}
+	    else
+		AC_MSG_ERROR([${with_tclinclude} directory does not contain tcl.h])
+	    fi
+	else
+	    list=""
+	    if test "`uname -s`" = "Darwin"; then
+		# If Tcl was built as a framework, attempt to use
+		# the framework's Headers directory
+		case ${TCL_DEFS} in
+		    *TCL_FRAMEWORK*)
+			list="`ls -d ${TCL_BIN_DIR}/Headers 2>/dev/null`"
+			;;
+		esac
+	    fi
+
+	    # Look in the source dir only if Tcl is not installed,
+	    # and in that situation, look there before installed locations.
+	    if test -f "${TCL_BIN_DIR}/Makefile" ; then
+		list="$list `ls -d ${TCL_SRC_DIR}/generic 2>/dev/null`"
+	    fi
+
+	    # Check order: pkg --prefix location, Tcl's --prefix location,
+	    # relative to directory of tclConfig.sh.
+
+	    eval "temp_includedir=${includedir}"
+	    list="$list \
+		`ls -d ${temp_includedir}        2>/dev/null` \
+		`ls -d ${TCL_PREFIX}/include     2>/dev/null` \
+		`ls -d ${TCL_BIN_DIR}/../include 2>/dev/null`"
+	    if test "${TEA_PLATFORM}" != "windows" -o "$GCC" = "yes"; then
+		list="$list /usr/local/include /usr/include"
+		if test x"${TCL_INCLUDE_SPEC}" != x ; then
+		    d=`echo "${TCL_INCLUDE_SPEC}" | sed -e 's/^-I//'`
+		    list="$list `ls -d ${d} 2>/dev/null`"
+		fi
+	    fi
+	    for i in $list ; do
+		if test -f "$i/tcl.h" ; then
+		    ac_cv_c_tclh=$i
+		    break
+		fi
+	    done
+	fi
+    ])
+
+    # Print a message based on how we determined the include path
+
+    if test x"${ac_cv_c_tclh}" = x ; then
+	AC_MSG_ERROR([tcl.h not found.  Please specify its location with --with-tclinclude])
+    else
+	AC_MSG_RESULT([${ac_cv_c_tclh}])
+    fi
+
+    # Convert to a native path and substitute into the output files.
+
+    INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclh}`
+
+    TCL_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\"
+
+    AC_SUBST(TCL_INCLUDES)
+])
+
+#------------------------------------------------------------------------
+# TEA_PRIVATE_TK_HEADERS --
+#
+#	Locate the private Tk include files
+#
+# Arguments:
+#
+#	Requires:
+#		TK_SRC_DIR	Assumes that TEA_LOAD_TKCONFIG has
+#				 already been called.
+#
+# Results:
+#
+#	Substitutes the following vars:
+#		TK_INCLUDES
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_PRIVATE_TK_HEADERS], [
+    # Allow for --with-tkinclude to take effect and define ${ac_cv_c_tkh}
+    AC_REQUIRE([TEA_PUBLIC_TK_HEADERS])
+    AC_MSG_CHECKING([for Tk private include files])
+
+    TK_SRC_DIR_NATIVE=`${CYGPATH} ${TK_SRC_DIR}`
+    TK_TOP_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}\"
+
+    # Check to see if tk<Plat>Port.h isn't already with the public headers
+    # Don't look for tkInt.h because that resides with tk.h in the core
+    # sources, but the <plat>Port headers are in a different directory
+    if test "${TEA_PLATFORM}" = "windows" -a \
+	-f "${ac_cv_c_tkh}/tkWinPort.h"; then
+	result="private headers found with public headers"
+    elif test "${TEA_PLATFORM}" = "unix" -a \
+	-f "${ac_cv_c_tkh}/tkUnixPort.h"; then
+	result="private headers found with public headers"
+    else
+	TK_GENERIC_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/generic\"
+	TK_XLIB_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/xlib\"
+	if test "${TEA_PLATFORM}" = "windows"; then
+	    TK_PLATFORM_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/win\"
+	else
+	    TK_PLATFORM_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/unix\"
+	fi
+	# Overwrite the previous TK_INCLUDES as this should capture both
+	# public and private headers in the same set.
+	# We want to ensure these are substituted so as not to require
+	# any *_NATIVE vars be defined in the Makefile
+	TK_INCLUDES="-I${TK_GENERIC_DIR_NATIVE} -I${TK_PLATFORM_DIR_NATIVE}"
+	# Detect and add ttk subdir
+	if test -d "${TK_SRC_DIR}/generic/ttk"; then
+	   TK_INCLUDES="${TK_INCLUDES} -I\"${TK_SRC_DIR_NATIVE}/generic/ttk\""
+	fi
+	if test "${TEA_WINDOWINGSYSTEM}" != "x11"; then
+	   TK_INCLUDES="${TK_INCLUDES} -I\"${TK_XLIB_DIR_NATIVE}\""
+	fi
+	if test "${TEA_WINDOWINGSYSTEM}" = "aqua"; then
+	   TK_INCLUDES="${TK_INCLUDES} -I\"${TK_SRC_DIR_NATIVE}/macosx\""
+	fi
+	if test "`uname -s`" = "Darwin"; then
+	    # If Tk was built as a framework, attempt to use
+	    # the framework's Headers and PrivateHeaders directories
+	    case ${TK_DEFS} in
+		*TK_FRAMEWORK*)
+			if test -d "${TK_BIN_DIR}/Headers" -a \
+				-d "${TK_BIN_DIR}/PrivateHeaders"; then
+			    TK_INCLUDES="-I\"${TK_BIN_DIR}/Headers\" -I\"${TK_BIN_DIR}/PrivateHeaders\" ${TK_INCLUDES}"
+			else
+			    TK_INCLUDES="${TK_INCLUDES} ${TK_INCLUDE_SPEC} `echo "${TK_INCLUDE_SPEC}" | sed -e 's/Headers/PrivateHeaders/'`"
+			fi
+			;;
+	    esac
+	    result="Using ${TK_INCLUDES}"
+	else
+	    if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then
+	       AC_MSG_ERROR([Cannot find private header tkInt.h in ${TK_SRC_DIR}])
+	    fi
+	    result="Using srcdir found in tkConfig.sh: ${TK_SRC_DIR}"
+	fi
+    fi
+
+    AC_SUBST(TK_TOP_DIR_NATIVE)
+    AC_SUBST(TK_XLIB_DIR_NATIVE)
+
+    AC_SUBST(TK_INCLUDES)
+    AC_MSG_RESULT([${result}])
+])
+
+#------------------------------------------------------------------------
+# TEA_PUBLIC_TK_HEADERS --
+#
+#	Locate the installed public Tk header files
+#
+# Arguments:
+#	None.
+#
+# Requires:
+#	CYGPATH must be set
+#
+# Results:
+#
+#	Adds a --with-tkinclude switch to configure.
+#	Result is cached.
+#
+#	Substitutes the following vars:
+#		TK_INCLUDES
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_PUBLIC_TK_HEADERS], [
+    AC_MSG_CHECKING([for Tk public headers])
+
+    AC_ARG_WITH(tkinclude, [  --with-tkinclude        directory containing the public Tk header files], with_tkinclude=${withval})
+
+    AC_CACHE_VAL(ac_cv_c_tkh, [
+	# Use the value from --with-tkinclude, if it was given
+
+	if test x"${with_tkinclude}" != x ; then
+	    if test -f "${with_tkinclude}/tk.h" ; then
+		ac_cv_c_tkh=${with_tkinclude}
+	    else
+		AC_MSG_ERROR([${with_tkinclude} directory does not contain tk.h])
+	    fi
+	else
+	    list=""
+	    if test "`uname -s`" = "Darwin"; then
+		# If Tk was built as a framework, attempt to use
+		# the framework's Headers directory.
+		case ${TK_DEFS} in
+		    *TK_FRAMEWORK*)
+			list="`ls -d ${TK_BIN_DIR}/Headers 2>/dev/null`"
+			;;
+		esac
+	    fi
+
+	    # Look in the source dir only if Tk is not installed,
+	    # and in that situation, look there before installed locations.
+	    if test -f "${TK_BIN_DIR}/Makefile" ; then
+		list="$list `ls -d ${TK_SRC_DIR}/generic 2>/dev/null`"
+	    fi
+
+	    # Check order: pkg --prefix location, Tk's --prefix location,
+	    # relative to directory of tkConfig.sh, Tcl's --prefix location,
+	    # relative to directory of tclConfig.sh.
+
+	    eval "temp_includedir=${includedir}"
+	    list="$list \
+		`ls -d ${temp_includedir}        2>/dev/null` \
+		`ls -d ${TK_PREFIX}/include      2>/dev/null` \
+		`ls -d ${TK_BIN_DIR}/../include  2>/dev/null` \
+		`ls -d ${TCL_PREFIX}/include     2>/dev/null` \
+		`ls -d ${TCL_BIN_DIR}/../include 2>/dev/null`"
+	    if test "${TEA_PLATFORM}" != "windows" -o "$GCC" = "yes"; then
+		list="$list /usr/local/include /usr/include"
+		if test x"${TK_INCLUDE_SPEC}" != x ; then
+		    d=`echo "${TK_INCLUDE_SPEC}" | sed -e 's/^-I//'`
+		    list="$list `ls -d ${d} 2>/dev/null`"
+		fi
+	    fi
+	    for i in $list ; do
+		if test -f "$i/tk.h" ; then
+		    ac_cv_c_tkh=$i
+		    break
+		fi
+	    done
+	fi
+    ])
+
+    # Print a message based on how we determined the include path
+
+    if test x"${ac_cv_c_tkh}" = x ; then
+	AC_MSG_ERROR([tk.h not found.  Please specify its location with --with-tkinclude])
+    else
+	AC_MSG_RESULT([${ac_cv_c_tkh}])
+    fi
+
+    # Convert to a native path and substitute into the output files.
+
+    INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tkh}`
+
+    TK_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\"
+
+    AC_SUBST(TK_INCLUDES)
+
+    if test "${TEA_WINDOWINGSYSTEM}" != "x11"; then
+	# On Windows and Aqua, we need the X compat headers
+	AC_MSG_CHECKING([for X11 header files])
+	if test ! -r "${INCLUDE_DIR_NATIVE}/X11/Xlib.h"; then
+	    INCLUDE_DIR_NATIVE="`${CYGPATH} ${TK_SRC_DIR}/xlib`"
+	    TK_XINCLUDES=-I\"${INCLUDE_DIR_NATIVE}\"
+	    AC_SUBST(TK_XINCLUDES)
+	fi
+	AC_MSG_RESULT([${INCLUDE_DIR_NATIVE}])
+    fi
+])
+
+#------------------------------------------------------------------------
+# TEA_PATH_CONFIG --
+#
+#	Locate the ${1}Config.sh file and perform a sanity check on
+#	the ${1} compile flags.  These are used by packages like
+#	[incr Tk] that load *Config.sh files from more than Tcl and Tk.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--with-$1=...
+#
+#	Defines the following vars:
+#		$1_BIN_DIR	Full path to the directory containing
+#				the $1Config.sh file
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_PATH_CONFIG], [
+    #
+    # Ok, lets find the $1 configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-$1
+    #
+
+    if test x"${no_$1}" = x ; then
+	# we reset no_$1 in case something fails here
+	no_$1=true
+	AC_ARG_WITH($1, [  --with-$1              directory containing $1 configuration ($1Config.sh)], with_$1config=${withval})
+	AC_MSG_CHECKING([for $1 configuration])
+	AC_CACHE_VAL(ac_cv_c_$1config,[
+
+	    # First check to see if --with-$1 was specified.
+	    if test x"${with_$1config}" != x ; then
+		case ${with_$1config} in
+		    */$1Config.sh )
+			if test -f ${with_$1config}; then
+			    AC_MSG_WARN([--with-$1 argument should refer to directory containing $1Config.sh, not to $1Config.sh itself])
+			    with_$1config=`echo ${with_$1config} | sed 's!/$1Config\.sh$!!'`
+			fi;;
+		esac
+		if test -f "${with_$1config}/$1Config.sh" ; then
+		    ac_cv_c_$1config=`(cd ${with_$1config}; pwd)`
+		else
+		    AC_MSG_ERROR([${with_$1config} directory doesn't contain $1Config.sh])
+		fi
+	    fi
+
+	    # then check for a private $1 installation
+	    if test x"${ac_cv_c_$1config}" = x ; then
+		for i in \
+			../$1 \
+			`ls -dr ../$1*[[0-9]].[[0-9]]*.[[0-9]]* 2>/dev/null` \
+			`ls -dr ../$1*[[0-9]].[[0-9]][[0-9]] 2>/dev/null` \
+			`ls -dr ../$1*[[0-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../$1*[[0-9]].[[0-9]]* 2>/dev/null` \
+			../../$1 \
+			`ls -dr ../../$1*[[0-9]].[[0-9]]*.[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../$1*[[0-9]].[[0-9]][[0-9]] 2>/dev/null` \
+			`ls -dr ../../$1*[[0-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../../$1*[[0-9]].[[0-9]]* 2>/dev/null` \
+			../../../$1 \
+			`ls -dr ../../../$1*[[0-9]].[[0-9]]*.[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../../$1*[[0-9]].[[0-9]][[0-9]] 2>/dev/null` \
+			`ls -dr ../../../$1*[[0-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../../../$1*[[0-9]].[[0-9]]* 2>/dev/null` \
+			${srcdir}/../$1 \
+			`ls -dr ${srcdir}/../$1*[[0-9]].[[0-9]]*.[[0-9]]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../$1*[[0-9]].[[0-9]][[0-9]] 2>/dev/null` \
+			`ls -dr ${srcdir}/../$1*[[0-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ${srcdir}/../$1*[[0-9]].[[0-9]]* 2>/dev/null` \
+			; do
+		    if test -f "$i/$1Config.sh" ; then
+			ac_cv_c_$1config=`(cd $i; pwd)`
+			break
+		    fi
+		    if test -f "$i/unix/$1Config.sh" ; then
+			ac_cv_c_$1config=`(cd $i/unix; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_$1config}" = x ; then
+		for i in `ls -d ${libdir} 2>/dev/null` \
+			`ls -d ${exec_prefix}/lib 2>/dev/null` \
+			`ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/local/lib 2>/dev/null` \
+			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/pkg/lib 2>/dev/null` \
+			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
+			; do
+		    if test -f "$i/$1Config.sh" ; then
+			ac_cv_c_$1config=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+	])
+
+	if test x"${ac_cv_c_$1config}" = x ; then
+	    $1_BIN_DIR="# no $1 configs found"
+	    AC_MSG_WARN([Cannot find $1 configuration definitions])
+	    exit 0
+	else
+	    no_$1=
+	    $1_BIN_DIR=${ac_cv_c_$1config}
+	    AC_MSG_RESULT([found $$1_BIN_DIR/$1Config.sh])
+	fi
+    fi
+])
+
+#------------------------------------------------------------------------
+# TEA_LOAD_CONFIG --
+#
+#	Load the $1Config.sh file
+#
+# Arguments:
+#
+#	Requires the following vars to be set:
+#		$1_BIN_DIR
+#
+# Results:
+#
+#	Substitutes the following vars:
+#		$1_SRC_DIR
+#		$1_LIB_FILE
+#		$1_LIB_SPEC
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_LOAD_CONFIG], [
+    AC_MSG_CHECKING([for existence of ${$1_BIN_DIR}/$1Config.sh])
+
+    if test -f "${$1_BIN_DIR}/$1Config.sh" ; then
+        AC_MSG_RESULT([loading])
+	. "${$1_BIN_DIR}/$1Config.sh"
+    else
+        AC_MSG_RESULT([file not found])
+    fi
+
+    #
+    # If the $1_BIN_DIR is the build directory (not the install directory),
+    # then set the common variable name to the value of the build variables.
+    # For example, the variable $1_LIB_SPEC will be set to the value
+    # of $1_BUILD_LIB_SPEC. An extension should make use of $1_LIB_SPEC
+    # instead of $1_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    #
+
+    if test -f "${$1_BIN_DIR}/Makefile" ; then
+	AC_MSG_WARN([Found Makefile - using build library specs for $1])
+        $1_LIB_SPEC=${$1_BUILD_LIB_SPEC}
+        $1_STUB_LIB_SPEC=${$1_BUILD_STUB_LIB_SPEC}
+        $1_STUB_LIB_PATH=${$1_BUILD_STUB_LIB_PATH}
+        $1_INCLUDE_SPEC=${$1_BUILD_INCLUDE_SPEC}
+        $1_LIBRARY_PATH=${$1_LIBRARY_PATH}
+    fi
+
+    AC_SUBST($1_VERSION)
+    AC_SUBST($1_BIN_DIR)
+    AC_SUBST($1_SRC_DIR)
+
+    AC_SUBST($1_LIB_FILE)
+    AC_SUBST($1_LIB_SPEC)
+
+    AC_SUBST($1_STUB_LIB_FILE)
+    AC_SUBST($1_STUB_LIB_SPEC)
+    AC_SUBST($1_STUB_LIB_PATH)
+
+    # Allow the caller to prevent this auto-check by specifying any 2nd arg
+    AS_IF([test "x$2" = x], [
+	# Check both upper and lower-case variants
+	# If a dev wanted non-stubs libs, this function could take an option
+	# to not use _STUB in the paths below
+	AS_IF([test "x${$1_STUB_LIB_SPEC}" = x],
+	    [TEA_LOAD_CONFIG_LIB(translit($1,[a-z],[A-Z])_STUB)],
+	    [TEA_LOAD_CONFIG_LIB($1_STUB)])
+    ])
+])
+
+#------------------------------------------------------------------------
+# TEA_LOAD_CONFIG_LIB --
+#
+#	Helper function to load correct library from another extension's
+#	${PACKAGE}Config.sh.
+#
+# Results:
+#	Adds to LIBS the appropriate extension library
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_LOAD_CONFIG_LIB], [
+    AC_MSG_CHECKING([For $1 library for LIBS])
+    # This simplifies the use of stub libraries by automatically adding
+    # the stub lib to your path.  Normally this would add to SHLIB_LD_LIBS,
+    # but this is called before CONFIG_CFLAGS.  More importantly, this adds
+    # to PKG_LIBS, which becomes LIBS, and that is only used by SHLIB_LD.
+    if test "x${$1_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+	    TEA_ADD_LIBS([\"`${CYGPATH} ${$1_LIB_PATH}`\"])
+	    AC_MSG_RESULT([using $1_LIB_PATH ${$1_LIB_PATH}])
+	else
+	    TEA_ADD_LIBS([${$1_LIB_SPEC}])
+	    AC_MSG_RESULT([using $1_LIB_SPEC ${$1_LIB_SPEC}])
+	fi
+    else
+	AC_MSG_RESULT([file not found])
+    fi
+])
+
+#------------------------------------------------------------------------
+# TEA_EXPORT_CONFIG --
+#
+#	Define the data to insert into the ${PACKAGE}Config.sh file
+#
+# Arguments:
+#
+#	Requires the following vars to be set:
+#		$1
+#
+# Results:
+#	Substitutes the following vars:
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_EXPORT_CONFIG], [
+    #--------------------------------------------------------------------
+    # These are for $1Config.sh
+    #--------------------------------------------------------------------
+
+    # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
+    eval pkglibdir="[$]{libdir}/$1${PACKAGE_VERSION}"
+    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+	eval $1_LIB_FLAG="-l$1${PACKAGE_VERSION}"
+	eval $1_STUB_LIB_FLAG="-l$1stub${PACKAGE_VERSION}"
+    else
+	eval $1_LIB_FLAG="-l$1`echo ${PACKAGE_VERSION} | tr -d .`"
+	eval $1_STUB_LIB_FLAG="-l$1stub`echo ${PACKAGE_VERSION} | tr -d .`"
+    fi
+    $1_BUILD_LIB_SPEC="-L`$CYGPATH $(pwd)` ${$1_LIB_FLAG}"
+    $1_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${$1_LIB_FLAG}"
+    $1_BUILD_STUB_LIB_SPEC="-L`$CYGPATH $(pwd)` [$]{$1_STUB_LIB_FLAG}"
+    $1_STUB_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` [$]{$1_STUB_LIB_FLAG}"
+    $1_BUILD_STUB_LIB_PATH="`$CYGPATH $(pwd)`/[$]{PKG_STUB_LIB_FILE}"
+    $1_STUB_LIB_PATH="`$CYGPATH ${pkglibdir}`/[$]{PKG_STUB_LIB_FILE}"
+
+    AC_SUBST($1_BUILD_LIB_SPEC)
+    AC_SUBST($1_LIB_SPEC)
+    AC_SUBST($1_BUILD_STUB_LIB_SPEC)
+    AC_SUBST($1_STUB_LIB_SPEC)
+    AC_SUBST($1_BUILD_STUB_LIB_PATH)
+    AC_SUBST($1_STUB_LIB_PATH)
+
+    AC_SUBST(MAJOR_VERSION)
+    AC_SUBST(MINOR_VERSION)
+    AC_SUBST(PATCHLEVEL)
+])
+
+
+#------------------------------------------------------------------------
+# TEA_INSTALLER --
+#
+#	Configure the installer.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	Substitutes the following vars:
+#		INSTALL
+#		INSTALL_DATA_DIR
+#		INSTALL_DATA
+#		INSTALL_PROGRAM
+#		INSTALL_SCRIPT
+#		INSTALL_LIBRARY
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_INSTALLER], [
+    INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
+    INSTALL_DATA_DIR='${INSTALL} -d -m 755'
+    INSTALL_DATA='${INSTALL} -m 644'
+    INSTALL_PROGRAM='${INSTALL} -m 755'
+    INSTALL_SCRIPT='${INSTALL} -m 755'
+
+    TEA_CONFIG_SYSTEM
+    case $system in
+	HP-UX-*) INSTALL_LIBRARY='${INSTALL} -m 755' ;;
+	      *) INSTALL_LIBRARY='${INSTALL} -m 644' ;;
+    esac
+
+    AC_SUBST(INSTALL)
+    AC_SUBST(INSTALL_DATA_DIR)
+    AC_SUBST(INSTALL_DATA)
+    AC_SUBST(INSTALL_PROGRAM)
+    AC_SUBST(INSTALL_SCRIPT)
+    AC_SUBST(INSTALL_LIBRARY)
+])
+
+###
+# Tip 430 - ZipFS Modifications
+###
+#------------------------------------------------------------------------
+# TEA_ZIPFS_SUPPORT
+#	Locate a zip encoder installed on the system path, or none.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	Substitutes the following vars:
+#       MACHER_PROG
+#       ZIP_PROG
+#       ZIP_PROG_OPTIONS
+#       ZIP_PROG_VFSSEARCH
+#       ZIP_INSTALL_OBJS
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_ZIPFS_SUPPORT], [
+    MACHER_PROG=""
+    ZIP_PROG=""
+    ZIP_PROG_OPTIONS=""
+    ZIP_PROG_VFSSEARCH=""
+    ZIP_INSTALL_OBJS=""
+
+    AC_MSG_CHECKING([for macher])
+    AC_CACHE_VAL(ac_cv_path_macher, [
+    search_path=`echo ${PATH} | sed -e 's/:/ /g'`
+    for dir in $search_path ; do
+        for j in `ls -r $dir/macher 2> /dev/null` \
+            `ls -r $dir/macher 2> /dev/null` ; do
+        if test x"$ac_cv_path_macher" = x ; then
+            if test -f "$j" ; then
+            ac_cv_path_macher=$j
+            break
+            fi
+        fi
+        done
+    done
+    ])
+    if test -f "$ac_cv_path_macher" ; then
+        MACHER_PROG="$ac_cv_path_macher"
+        AC_MSG_RESULT([$MACHER_PROG])
+        AC_MSG_RESULT([Found macher in environment])
+    fi
+    AC_MSG_CHECKING([for zip])
+    AC_CACHE_VAL(ac_cv_path_zip, [
+    search_path=`echo ${PATH} | sed -e 's/:/ /g'`
+    for dir in $search_path ; do
+        for j in `ls -r $dir/zip 2> /dev/null` \
+            `ls -r $dir/zip 2> /dev/null` ; do
+        if test x"$ac_cv_path_zip" = x ; then
+            if test -f "$j" ; then
+            ac_cv_path_zip=$j
+            break
+            fi
+        fi
+        done
+    done
+    ])
+    if test -f "$ac_cv_path_zip" ; then
+        ZIP_PROG="$ac_cv_path_zip"
+        AC_MSG_RESULT([$ZIP_PROG])
+        ZIP_PROG_OPTIONS="-rq"
+        ZIP_PROG_VFSSEARCH="*"
+        AC_MSG_RESULT([Found INFO Zip in environment])
+        # Use standard arguments for zip
+    else
+        # It is not an error if an installed version of Zip can't be located.
+        # We can use the locally distributed minizip instead
+        ZIP_PROG="./minizip${EXEEXT_FOR_BUILD}"
+        ZIP_PROG_OPTIONS="-o -r"
+        ZIP_PROG_VFSSEARCH="*"
+        ZIP_INSTALL_OBJS="minizip${EXEEXT_FOR_BUILD}"
+        AC_MSG_RESULT([No zip found on PATH. Building minizip])
+    fi
+    AC_SUBST(MACHER_PROG)
+    AC_SUBST(ZIP_PROG)
+    AC_SUBST(ZIP_PROG_OPTIONS)
+    AC_SUBST(ZIP_PROG_VFSSEARCH)
+    AC_SUBST(ZIP_INSTALL_OBJS)
+])
+
+# Local Variables:
+# mode: autoconf
+# End:
diff --git a/src/vfs/critcl.vfs/lib/critcl-bitmap/bitmap.tcl b/src/vfs/critcl.vfs/lib/critcl-bitmap/bitmap.tcl
new file mode 100644
index 00000000..fa54c5e2
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-bitmap/bitmap.tcl
@@ -0,0 +1,228 @@
+## -*- tcl -*-
+# # ## ### ##### ######## ############# #####################
+# Pragmas for MetaData Scanner.
+# n/a
+
+# CriTcl Utility Package for bitmap en- and decoder.
+# Based on i-assoc.
+
+package provide critcl::bitmap 1.1.1
+
+# # ## ### ##### ######## ############# #####################
+## Requirements.
+
+package require Tcl    8.6 9     ; # Min supported version.
+package require critcl 3.2
+package require critcl::iassoc
+
+namespace eval ::critcl::bitmap {}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: Embed C Code
+
+proc critcl::bitmap::def {name dict {exclusions {}}} {
+    # dict: Tcl symbolic name -> (C bit-mask (1))
+    #
+    # (Ad 1) Can be numeric, or symbolic, as long as it is a C int
+    #        expression in the end.
+    #
+    # (Ad exclusions)
+    #        Excluded bit-masks cannot be converted back to Tcl
+    #        symbols. These are usually masks with multiple bits
+    #        set. Conversion back delivers the individual elements
+    #        instead of the combined mask.
+    #
+    #        If no exclusions are specified the generated code is
+    #        simpler, i.e. not containing anything for dealing with
+    #        exclusions at runtime.
+
+    # For the C level opt array we want the elements sorted alphabetically.
+    set symbols [lsort -dict [dict keys $dict]]
+    set i 0
+    foreach s $symbols {
+	set id($s) $i
+	incr i
+    }
+    set last $i
+
+    set hasexcl [llength $exclusions]
+    set excl {}
+    foreach e $exclusions {
+	dict set excl $e .
+    }
+
+    dict for {sym mask} $dict {
+	set receivable [expr {![dict exists $excl $mask]}]
+
+	set map [list @ID@ $id($sym) @SYM@ $sym @MASK@ $mask @RECV@ $receivable]
+
+	if {$hasexcl} {
+	    append init \n[critcl::at::here!][string map $map {
+		data->c    [@ID@] = "@SYM@";
+		data->mask [@ID@] = @MASK@;
+		data->recv [@ID@] = @RECV@;
+		data->tcl  [@ID@] = Tcl_NewStringObj ("@SYM@", -1);
+		Tcl_IncrRefCount (data->tcl [@ID@]);
+	    }]
+	} else {
+	    append init \n[critcl::at::here!][string map $map {
+		data->c    [@ID@] = "@SYM@";
+		data->mask [@ID@] = @MASK@;
+		data->tcl  [@ID@] = Tcl_NewStringObj ("@SYM@", -1);
+		Tcl_IncrRefCount (data->tcl [@ID@]);
+	    }]
+	}
+
+	append final \n[critcl::at::here!][string map $map {
+	    Tcl_DecrRefCount (data->tcl [@ID@]);
+	}]
+    }
+    append init \n "    data->c \[$last\] = NULL;"
+
+    lappend map @NAME@  $name
+    lappend map @UNAME@ [string toupper $name]
+    lappend map @LAST@  $last
+
+    # I. Generate a header file for inclusion by other parts of the
+    #    package, i.e. csources. Include the header here as well, for
+    #    the following blocks of code.
+    #
+    #    Declaration of the en- and decoder functions.
+
+    critcl::include [critcl::make ${name}.h \n[critcl::at::here!][string map $map {
+	#ifndef @NAME@_HEADER
+	#define @NAME@_HEADER
+
+	/* Encode a flag list into the corresponding bitset */
+	extern int
+	@NAME@_encode (Tcl_Interp* interp,
+		       Tcl_Obj*    flags,
+		       int*        result);
+
+	/* Decode a bitset into the corresponding flag list */
+	extern Tcl_Obj*
+	@NAME@_decode (Tcl_Interp* interp,
+		       int         mask);
+
+	#endif
+    }]]
+
+    # II: Generate the interp association holding the various
+    #     conversion maps.
+
+    if {$hasexcl} {
+	critcl::iassoc def ${name}_iassoc {} \n[critcl::at::here!][string map $map {
+	    const char*    c    [@LAST@+1]; /* Bit name, C string */
+	    Tcl_Obj*       tcl  [@LAST@];   /* Bit name, Tcl_Obj*, sharable */
+	    int            mask [@LAST@];   /* Bit mask */
+	    int            recv [@LAST@];   /* Flag, true for receivable event */
+	}] $init $final
+    } else {
+	critcl::iassoc def ${name}_iassoc {} \n[critcl::at::here!][string map $map {
+	    const char*    c    [@LAST@+1]; /* Bit name, C string */
+	    Tcl_Obj*       tcl  [@LAST@];   /* Bit name, Tcl_Obj*, sharable */
+	    int            mask [@LAST@];   /* Bit mask */
+	}] $init $final
+    }
+
+    # III: Generate encoder function: Conversion of list of flag names
+    #      into corresponding bitset.
+
+    critcl::ccode \n[critcl::at::here!][string map $map {
+	int
+	@NAME@_encode (Tcl_Interp* interp,
+		       Tcl_Obj*    flags,
+		       int*        result)
+	{
+	    @NAME@_iassoc_data context = @NAME@_iassoc (interp);
+	    Tcl_Size lc, i;
+	    int mask, id;
+	    Tcl_Obj** lv;
+
+	    if (Tcl_ListObjGetElements (interp, flags, &lc, &lv) != TCL_OK) { /* OK tcl9 */
+		return TCL_ERROR;
+	    }
+
+	    mask = 0;
+	    for (i = 0; i < lc; i++)  {
+		if (Tcl_GetIndexFromObj (interp, lv[i], context->c, "@NAME@", 0,
+					 &id) != TCL_OK) {
+		    Tcl_SetErrorCode (interp, "@UNAME@", "FLAG", NULL);
+		    return TCL_ERROR;
+		}
+		mask |= context->mask [id];
+	    }
+
+	    *result = mask;
+	    return TCL_OK;
+	}
+    }]
+
+    # IV: Generate decoder function: Convert bitset into the
+    #     corresponding list of flag names.
+
+    if {$hasexcl} {
+	critcl::ccode \n[critcl::at::here!][string map $map {
+	    Tcl_Obj*
+	    @NAME@_decode (Tcl_Interp* interp, int mask)
+	    {
+		int i;
+		@NAME@_iassoc_data context = @NAME@_iassoc (interp);
+		Tcl_Obj*           res     = Tcl_NewListObj (0, NULL);
+
+		for (i = 0; i < @LAST@; i++)  {
+		    if (!context->recv[i])          continue;
+		    if (!(mask & context->mask[i])) continue;
+		    (void) Tcl_ListObjAppendElement (interp, res, context->tcl [i]);
+		}
+		return res;
+	    }
+	}]
+    } else {
+	critcl::ccode \n[critcl::at::here!][string map $map {
+	    Tcl_Obj*
+	    @NAME@_decode (Tcl_Interp* interp, int mask)
+	    {
+		int i;
+		@NAME@_iassoc_data context = @NAME@_iassoc (interp);
+		Tcl_Obj*           res     = Tcl_NewListObj (0, NULL);
+
+		for (i = 0; i < @LAST@; i++)  {
+		    if (!(mask & context->mask[i])) continue;
+		    (void) Tcl_ListObjAppendElement (interp, res, context->tcl [i]);
+		}
+		return res;
+	    }
+	}]
+    }
+
+    # V. Define convenient argument- and result-type definitions
+    #    wrapping the de- and encoder functions for use by cprocs.
+
+    critcl::argtype $name \n[critcl::at::here!][string map $map {
+	if (@NAME@_encode (interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    }] int int
+
+    critcl::resulttype $name \n[critcl::at::here!][string map $map {
+	/* @NAME@_decode result is 0-refcount */
+	Tcl_SetObjResult (interp, @NAME@_decode (interp, rv));
+	return TCL_OK;
+    }] int
+}
+
+# # ## ### ##### ######## ############# #####################
+## Export API
+
+namespace eval ::critcl::bitmap {
+    namespace export def
+    catch { namespace ensemble create }
+}
+
+namespace eval ::critcl {
+    namespace export bitmap
+    catch { namespace ensemble create }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+return
diff --git a/src/vfs/critcl.vfs/lib/critcl-bitmap/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/critcl-bitmap/pkgIndex.tcl
new file mode 100644
index 00000000..2accc5bd
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-bitmap/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+package ifneeded critcl::bitmap 1.1.1 [list source [file join $dir bitmap.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/critcl-callback/c/callback.c b/src/vfs/critcl.vfs/lib/critcl-callback/c/callback.c
new file mode 100644
index 00000000..04007bf4
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-callback/c/callback.c
@@ -0,0 +1,114 @@
+/*
+ * Callback - Implementation
+ */
+
+#include <callback_int.h>
+
+#include <critcl_trace.h>
+#include <critcl_assert.h>
+#include <critcl_alloc.h>
+
+TRACE_ON;
+
+/*
+ * API
+ */
+
+critcl_callback_p
+critcl_callback_new (Tcl_Interp* interp, Tcl_Size objc, Tcl_Obj** objv, Tcl_Size nargs)
+{
+    TRACE_FUNC ("((Interp*) %p, objc %d, (Tcl_Obj**) %p, nargs %d)",
+		interp, objc, objv, nargs);
+
+    critcl_callback_p c = ALLOC (critcl_callback);
+    int total  = objc + nargs;
+    c->nfixed  = objc;
+    c->nargs   = nargs;
+    c->command = NALLOC (Tcl_Obj*, total);
+    c->interp  = interp;
+
+    int i;
+    for (i = 0; i < objc; i++) {
+	TRACE ("D [%3d] = (TclObj*) %p = '%s'", i, objv [i], Tcl_GetString (objv [i]));
+	c->command [i] = objv [i];
+	Tcl_IncrRefCount (objv [i]);
+    }
+    for (; i < total; i++) {
+	TRACE ("D [%3d] = n/a", i);
+	c->command [i] = 0;
+    }
+
+    TRACE_RETURN ("(critcl_callback_p) %p", c);
+}
+
+void
+critcl_callback_extend (critcl_callback_p callback, Tcl_Obj* argument)
+{
+    TRACE_FUNC ("((critcl_callback_p) %p, (Tcl_Obj*) %p)", callback, argument);
+    ASSERT (callback->nargs > 0, "No arguments left to use for extension");
+
+    TRACE ("E [%3d] = (TclObj*) %p = '%s'", callback->nfixed, argument, Tcl_GetString (argument));
+
+    callback->command [callback->nfixed] = argument;
+    Tcl_IncrRefCount (argument);
+
+    callback->nargs  --;
+    callback->nfixed ++;
+
+    TRACE_RETURN_VOID;
+}
+
+void
+critcl_callback_destroy (critcl_callback_p callback)
+{
+    TRACE_FUNC ("((critcl_callback_p) %p)", callback);
+
+    int i;
+    for (i = callback->nfixed-1; i > 0; i--) {
+	Tcl_DecrRefCount (callback->command [i]);
+    }
+    FREE (callback->command);
+    FREE (callback);
+
+    TRACE_RETURN_VOID;
+}
+
+int
+critcl_callback_invoke (critcl_callback_p callback, Tcl_Size objc, Tcl_Obj** objv)
+{
+    TRACE_FUNC ("((critcl_callback_p) %p, objc %d, (Tcl_Obj**) %p)", callback, objc, objv);
+    ASSERT (objc <= callback->nargs, "Too many arguments");
+
+    Tcl_Size i, j;
+
+    for (i = 0; i < callback->nfixed; i++) {
+	TRACE ("I [%3d] = (TclObj*) %p = '%s'", i, callback->command [i], Tcl_GetString (callback->command [i]));
+	Tcl_IncrRefCount (callback->command [i]);
+    }
+    for (i = callback->nfixed, j = 0 ; j < objc; i++, j++) {
+	TRACE ("I [%3d] = (TclObj*) %p = '%s'", i, objv [j], Tcl_GetString (objv [j]));
+	Tcl_IncrRefCount (objv [j]);
+	callback->command [i] = objv [j];
+    }
+
+    int res = Tcl_EvalObjv (callback->interp, i, callback->command, TCL_EVAL_GLOBAL); /* OK tcl9 */
+
+    for (i = 0; i < callback->nfixed; i++) {
+	Tcl_DecrRefCount (callback->command [i]);
+    }
+    for (j = 0 ; j < objc; j++) {
+	Tcl_DecrRefCount (objv [j]);
+    }
+
+    TRACE ("R (Tcl_Obj*) %p = '%s'", Tcl_GetObjResult (callback->interp),
+	   Tcl_GetString (Tcl_GetObjResult (callback->interp)));
+    TRACE_RETURN ("(int) %d", res);
+}
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/lib/critcl-callback/c/callback.h b/src/vfs/critcl.vfs/lib/critcl-callback/c/callback.h
new file mode 100644
index 00000000..77e86b27
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-callback/c/callback.h
@@ -0,0 +1,22 @@
+#ifndef CRITCL_CALLBACK_H
+#define CRITCL_CALLBACK_H
+
+/*
+ * critcl callback class - declarations
+ *
+ * Opaque instance information and Tcl 8/9 compatibility layer.
+ */
+
+#include <tclpre9compat.h>	/* tcl.h + Portability Tcl <=8.6 */
+
+typedef struct critcl_callback* critcl_callback_p;
+
+#endif
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/lib/critcl-callback/c/callback_int.h b/src/vfs/critcl.vfs/lib/critcl-callback/c/callback_int.h
new file mode 100644
index 00000000..7e1b60ca
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-callback/c/callback_int.h
@@ -0,0 +1,28 @@
+#ifndef CRITCL_CALLBACK_INT_H
+#define CRITCL_CALLBACK_INT_H
+/*
+ * critcl callback class - internal declarations
+ *
+ * Instance information.
+ */
+
+#include <callback.h>
+
+typedef struct critcl_callback {
+
+    Tcl_Size    nfixed;  // Number of elements in the command prefix
+    Tcl_Size    nargs;   // Number of elements to reserve for the command arguments
+    Tcl_Obj**   command; // Array for the command elements, prefix and arguments
+    Tcl_Interp* interp;  // The Tcl interpreter to run the command in
+
+} critcl_callback;
+
+#endif
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/lib/critcl-callback/callback.tcl b/src/vfs/critcl.vfs/lib/critcl-callback/callback.tcl
new file mode 100644
index 00000000..46e55f37
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-callback/callback.tcl
@@ -0,0 +1,109 @@
+# callback.tcl -
+#
+# C support package for the management of callbacks into Tcl.
+#
+# __Note__, this package does not expose anything at Tcl level.  It
+# only provides stubs (i.e. functions) and data structures providing
+# C-level callback managers.
+
+package provide critcl::callback 1.1
+
+package require critcl 3.2
+critcl::buildrequirement {
+    package require critcl::cutil ;# assertions, allocation support, tracing
+}
+
+if {![critcl::compiling]} {
+    error "Unable to build `critcl::callback`, no proper compiler found."
+}
+
+# # ## ### ##### ######## #############
+## Build configuration
+# (1) Assertions, and tracing
+# (2) Debugging symbols, memory tracking
+
+critcl::cutil::assertions off
+critcl::cutil::tracer     off
+
+#critcl::debug symbols
+
+#Activate when in need of memory debugging - Valgrind is an alternative
+#critcl::debug symbols memory
+
+critcl::config lines 1
+critcl::config trace 0
+
+# # ## ### ##### ######## #############
+## Administrivia
+
+critcl::license \
+    {Andreas Kupries} \
+    {Under a BSD license.}
+
+critcl::summary \
+    {Critcl utility package providing functions and structures to manage callbacks into Tcl, from C}
+
+critcl::description \
+    {Part of Critcl}
+
+critcl::subject critcl callbacks {management of callbacks}
+critcl::subject {Tcl callbacks from C}
+
+# # ## ### ##### ######## #############
+## Implementation.
+
+critcl::cutil::alloc
+
+# # ## ### ##### ######## #############
+
+critcl::cheaders c/*.h
+critcl::csources c/*.c
+
+# Stubs definitions.
+
+critcl::api header c/callback.h
+
+# Create a new callback instance with prefix objc/objv and space for
+# `nargs` arguments. The callback keeps the objv elements as is and
+# signal this by incrementing their reference counts. The callback
+# will be run in the provided interpreter, at the global level and
+# namespace.
+
+critcl::api function critcl_callback_p critcl_callback_new {
+    Tcl_Interp* interp
+    Tcl_Size    objc
+    Tcl_Obj**   objv
+    Tcl_Size    nargs
+}
+
+# Modify the specified callback by placing the argument into the first
+# free argument slot. This extends the prefix part of the callback,
+# and reduces the argument part, by one.
+
+critcl::api function void critcl_callback_extend {
+    critcl_callback_p callback
+    Tcl_Obj*          argument
+}
+
+# Release all memory associated with the callback instance. For the
+# objv elements saved during construction (see above) this is signaled
+# by decrementing their reference counts.
+
+critcl::api function void critcl_callback_destroy {
+    critcl_callback_p callback
+}
+
+# Invoke the callback using the objc/objv elements as the arguments.
+# The operation will panic or crash if more arguments are provided
+# than the callback has space for. See the `nargs` parameter of the
+# constructor function above. Less arguments then constructed for
+# however are ok.
+
+critcl::api function int critcl_callback_invoke {
+    critcl_callback_p callback
+    Tcl_Size          objc
+    Tcl_Obj**         objv
+}
+
+##
+return
diff --git a/src/vfs/critcl.vfs/lib/critcl-class/class.h b/src/vfs/critcl.vfs/lib/critcl-class/class.h
new file mode 100644
index 00000000..339c95c1
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-class/class.h
@@ -0,0 +1,468 @@
+/*
+ * For package "@package@".
+ * Implementation of Tcl Class "@class@".
+ *
+ * Flags: @buildflags@
+ */
+
+#ifndef @stem@_IMPLEMENTATION
+#define @stem@_IMPLEMENTATION (1)
+/* # # ## ### ##### ######## ############# ##################### */
+
+@includes@
+#line 14 "class.h"
+/*
+ * Instance method names and enumeration.
+ */
+
+static CONST char* @stem@_methodnames [] = {
+@method_names@
+#line 21 "class.h"
+    NULL
+};
+
+typedef enum @stem@_methods {
+@method_enumeration@
+#line 27 "class.h"
+} @stem@_methods;
+
+/*
+ * Class method names and enumeration.
+ */
+
+static CONST char* @stem@_class_methodnames [] = {
+    "create",
+    "new",@class_method_names@
+#line 37 "class.h"
+    NULL
+};
+
+typedef enum @stem@_classmethods {
+    @stem@_CM_create,
+    @stem@_CM_new@class_method_enumeration@
+#line 44 "class.h"
+} @stem@_classmethods;
+
+/*
+ * Class structures I. Class variables.
+ */
+
+typedef struct @classtype@__ {
+@ctypedecl@
+#line 53 "class.h"
+} @classtype@__;
+typedef struct @classtype@__* @classtype@;
+
+/*
+ * Class structures II. Creation management.
+ */
+
+typedef struct @classtype@_mgr_ {
+@classmgrstruct@
+#line 63 "class.h"
+    @classtype@__ user;                       /* User-specified class variables */
+} @classtype@_mgr_;
+typedef struct @classtype@_mgr_* @classtype@_mgr;
+
+/*
+ * Instance structure.
+ */
+
+@itypedecl@
+#line 73 "class.h"
+
+/* # # ## ### ##### ######## User: General support */
+@support@
+#line 77 "class.h"
+/* # # ## ### ##### ######## */
+
+/*
+ * Class support functions.
+ */
+
+static void
+@stem@_ClassRelease (ClientData cd, Tcl_Interp* interp)
+{
+    @classtype@_mgr classmgr = (@classtype@_mgr) cd;
+    @classtype@     class    = &classmgr->user;
+    @classdestructor@
+#line 90 "class.h"
+    ckfree((char*) cd);
+}
+
+static @classtype@_mgr
+@stem@_Class (Tcl_Interp* interp)
+{
+#define KEY "@package@/@class@"
+
+    Tcl_InterpDeleteProc* proc = @stem@_ClassRelease;
+    @classtype@_mgr       classmgr;
+    @classtype@           class;
+
+    classmgr = Tcl_GetAssocData (interp, KEY, &proc);
+    if (classmgr) {
+	return classmgr;
+    }
+
+    classmgr = (@classtype@_mgr) ckalloc (sizeof (@classtype@_mgr_));
+@classmgrsetup@
+#line 110 "class.h"
+    class = &classmgr->user;
+
+    @classconstructor@
+#line 114 "class.h"
+
+    Tcl_SetAssocData (interp, KEY, proc, (ClientData) classmgr);
+    return classmgr;
+ error:
+    ckfree ((char*) classmgr);
+    return NULL;
+#undef KEY
+}
+@classmgrnin@
+#line 124 "class.h"
+/* # # ## ### ##### ######## */
+
+static @instancetype@
+@stem@_Constructor (Tcl_Interp* interp,
+		    @classtype@ class,
+		    Tcl_Size       objcskip,
+		    Tcl_Size       objc,
+		    Tcl_Obj*const* objv)
+{
+@ivardecl@;
+    /* # # ## ### ##### ######## User: Constructor */
+    @constructor@
+#line 137 "class.h"
+    /* # # ## ### ##### ######## */
+    return instance;
+@ivarerror@;
+#line 141 "class.h"
+}
+
+static void
+@stem@_PostConstructor (Tcl_Interp* interp,
+		        @instancetype@ instance,
+		        Tcl_Command cmd,
+			Tcl_Obj* fqn)
+{
+    /* # # ## ### ##### ######## User: Post Constructor */
+    @postconstructor@
+#line 152 "class.h"
+    /* # # ## ### ##### ######## */
+}
+
+static void
+@stem@_Destructor (ClientData clientData)
+{
+    @instancetype@ instance = (@instancetype@) clientData;
+    /* # # ## ### ##### ######## User: Destructor */
+    @destructor@
+#line 162 "class.h"
+    /* # # ## ### ##### ######## */
+@ivarrelease@;
+#line 165 "class.h"
+}
+
+/* # # ## ### ##### ######## User: Methods */
+@method_implementations@
+#line 170 "class.h"
+/* # # ## ### ##### ######## */
+
+/*
+ * Instance command, method dispatch
+ */
+
+static int
+@stem@_InstanceCommand (ClientData      clientData,
+			Tcl_Interp*     interp,
+			Tcl_Size        objc,
+			Tcl_Obj* CONST* objv)
+{
+    @instancetype@ instance = (@instancetype@) clientData;
+    int mcode;
+
+    if (objc < 2) {
+	Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?");
+	return TCL_ERROR;
+    } else if (Tcl_GetIndexFromObj (interp, objv [1],
+				    (const char**) @stem@_methodnames,
+				    "option", 0, &mcode) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    /*
+     * Dispatch to methods. They check the #args in detail before performing
+     * the requested functionality
+     */
+
+    switch ((@stem@_methods) mcode) {
+@method_dispatch@
+#line 202 "class.h"
+    }
+    /* Not coming to this place */
+    return TCL_ERROR;
+}
+
+@cconscmd@
+#line 209 "class.h"
+@capiclassvaraccess@
+#line 211 "class.h"
+@tclconscmd@
+#line 213 "class.h"
+/* # # ## ### ##### ######## User: Class Methods */
+@class_method_implementations@
+#line 216 "class.h"
+@classcommand@
+#line 218 "class.h"
+/* # # ## ### ##### ######## ############# ##################### */
+#endif /* @stem@_IMPLEMENTATION */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
+
+#line 230 "class.h"
+	const char*   name;                       /* Class name, for debugging */
+	long int      counter;                    /* Id generation counter */
+	char          buf [sizeof("@class@")+20]; /* Stash for the auto-generated object names. */
+
+	classmgr->name = "@stem@";
+	classmgr->counter = 0;
+
+#line 238 "class.h"
+static CONST char*
+@stem@_NewInstanceName (@classtype@_mgr classmgr)
+{
+    classmgr->counter ++;
+    sprintf (classmgr->buf, "@class@%ld", classmgr->counter);
+    return classmgr->buf;
+}
+
+#line 247 "class.h"
+/* # # ## ### ##### ######## */
+/*
+ * Tcl API :: Class command, class method, especially instance construction.
+ */
+
+int
+@stem@_ClassCommand (ClientData      clientData,
+		     Tcl_Interp*     interp,
+		     Tcl_Size        objc,
+		     Tcl_Obj* CONST* objv)
+{
+    @classtype@_mgr classmgr;
+    @classtype@     class;
+    int mcode;
+
+    if (objc < 2) {
+	Tcl_WrongNumArgs (interp, 0, objv, "method ?args...?");
+	return TCL_ERROR;
+    }
+
+    if (Tcl_GetIndexFromObj (interp, objv [1],
+			     (const char**) @stem@_class_methodnames,
+			     "option", 0, &mcode) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    classmgr = @stem@_Class (interp);
+    if (!classmgr) {
+	return TCL_ERROR;
+    }
+    class = &classmgr->user;
+
+    /*
+     * Dispatch to methods. They check the #args in detail before performing
+     * the requested functionality
+     */
+
+    switch ((@stem@_classmethods) mcode) {
+    case @stem@_CM_create: return @stem@_CM_createCmd (classmgr, interp, objc, objv); break;
+    case @stem@_CM_new:    return @stem@_CM_newCmd    (classmgr, interp, objc, objv); break;@class_method_dispatch@
+#line 288 "class.h"
+    }
+    /* Not coming to this place */
+    return TCL_ERROR;
+}
+
+#line 294 "class.h"
+/* # # ## ### ##### ########: Predefined class methods */
+static int
+@stem@_NewInstance (const char*     name,
+		    @classtype@_mgr classmgr,
+		    Tcl_Interp*     interp,
+		    Tcl_Size        objcskip,
+		    Tcl_Size        objc,
+		    Tcl_Obj* CONST* objv)
+{
+    @instancetype@ instance;
+    Tcl_Obj*    fqn;
+    Tcl_CmdInfo ci;
+    Tcl_Command cmd;
+
+    /*
+     * Compute the fully qualified command name to use, putting
+     * the command into the current namespace if necessary.
+     */
+
+    if (!Tcl_StringMatch (name, "::*")) {
+	/* Relative name. Prefix with current namespace */
+
+	Tcl_Eval (interp, "namespace current");
+	fqn = Tcl_GetObjResult (interp);
+	fqn = Tcl_DuplicateObj (fqn);
+	Tcl_IncrRefCount (fqn);
+
+	if (!Tcl_StringMatch (Tcl_GetString (fqn), "::")) {
+	    Tcl_AppendToObj (fqn, "::", -1);
+	}
+	Tcl_AppendToObj (fqn, name, -1);
+    } else {
+	fqn = Tcl_NewStringObj (name, -1);
+	Tcl_IncrRefCount (fqn);
+    }
+    Tcl_ResetResult (interp);
+
+    /*
+     * Check if the commands exists already, and bail out if so.
+     * We will not overwrite an existing command.
+     */
+
+    if (Tcl_GetCommandInfo (interp, Tcl_GetString (fqn), &ci)) {
+	Tcl_Obj* err;
+
+	err = Tcl_NewObj ();
+	Tcl_AppendToObj    (err, "command \"", -1);
+	Tcl_AppendObjToObj (err, fqn);
+	Tcl_AppendToObj    (err, "\" already exists, unable to create @class@ instance", -1);
+
+	Tcl_DecrRefCount (fqn);
+	Tcl_SetObjResult (interp, err);
+	return TCL_ERROR;
+    }
+
+    /*
+     * Construct instance state, and command.
+     */
+
+    instance = @stem@_Constructor (interp, &classmgr->user, objcskip, objc, objv);
+    if (!instance) {
+	return TCL_ERROR;
+    }
+
+    cmd = Tcl_CreateObjCommand2 (interp, Tcl_GetString (fqn),
+				 @stem@_InstanceCommand,
+				 (ClientData) instance,
+				 @stem@_Destructor);
+
+    @stem@_PostConstructor (interp, instance, cmd, fqn);
+
+    Tcl_SetObjResult (interp, fqn);
+    Tcl_DecrRefCount (fqn);
+    return TCL_OK;
+}
+
+static int
+@stem@_CM_createCmd (@classtype@_mgr classmgr,
+		     Tcl_Interp*     interp,
+		     Tcl_Size        objc,
+		     Tcl_Obj* CONST* objv)
+{
+    /* <class> create <name> ... */
+    char* name;
+
+    if (objc < 3) {
+	Tcl_WrongNumArgs (interp, 1, objv, "name ?args...?");
+	return TCL_ERROR;
+    }
+
+    name = Tcl_GetString (objv [2]);
+
+    objc -= 3;
+    objv += 3;
+
+    return @stem@_NewInstance (name, classmgr, interp, 3, objc, objv);
+}
+
+static int
+@stem@_CM_newCmd (@classtype@_mgr classmgr,
+		  Tcl_Interp*     interp,
+		  Tcl_Size        objc,
+		  Tcl_Obj* CONST* objv)
+{
+    /* <class> new ... */
+    const char* name;
+
+    if (objc < 2) {
+	Tcl_WrongNumArgs (interp, 1, objv, "?args...?");
+	return TCL_ERROR;
+    }
+
+    objc -= 2;
+    objv += 2;
+
+    name = @stem@_NewInstanceName (classmgr);
+    return @stem@_NewInstance (name, classmgr, interp, 2, objc, objv);
+}
+
+#line 414 "class.h"
+/* # # ## ### ##### ######## */
+/*
+ * C API :: Instance (de)construction, dispatch
+ */
+
+typedef struct @instancetype@__ @capiprefix@;
+typedef struct @capiprefix@* @capiprefix@_p;
+
+@capiprefix@_p
+@capiprefix@_new (Tcl_Interp*	  interp,
+		  Tcl_Size	  objc,
+		  Tcl_Obj* CONST* objv)
+{
+    @classtype@_mgr classmgr = @stem@_Class (interp);
+    @instancetype@ instance;
+
+    /*
+     * Construct instance state
+     */
+
+    instance = @stem@_Constructor (interp, &classmgr->user, 0, objc, objv);
+    if (!instance) {
+	return NULL;
+    }
+
+    @stem@_PostConstructor (interp, instance, 0, 0);
+
+    return (@capiprefix@_p) instance;
+}
+
+void
+@capiprefix@_destroy (@capiprefix@_p instance)
+{
+    @stem@_Destructor (instance);
+}
+
+int
+@capiprefix@_invoke (@capiprefix@_p instance,
+		     Tcl_Interp*     interp,
+		     Tcl_Size	     objc,
+		     Tcl_Obj* CONST* objv)
+{
+    Tcl_Obj** v = (Tcl_Obj**) ckalloc ((objc+1)*sizeof (Tcl_Obj*));
+    Tcl_Obj* i = Tcl_NewStringObj ("@capiprefix@", sizeof ("@capiprefix@")-1);
+    Tcl_IncrRefCount (i);
+
+    v[0] = i;
+    memcpy (v+1, objv, objc * sizeof (Tcl_Obj*));
+
+    int r = @stem@_InstanceCommand (instance, interp, objc+1, v);
+
+    Tcl_DecrRefCount (i);
+    ckfree ((char*) v);
+    return r;
+}
diff --git a/src/vfs/critcl.vfs/lib/critcl-class/class.tcl b/src/vfs/critcl.vfs/lib/critcl-class/class.tcl
new file mode 100644
index 00000000..5f4d91bd
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-class/class.tcl
@@ -0,0 +1,1171 @@
+## -*- tcl -*-
+# # ## ### ##### ######## ############# #####################
+# Pragmas for MetaData Scanner.
+# @mdgen OWNER: class.h
+
+# CriTcl Utility Commands. Specification of a command representing a
+# class made easy, with code for object command and method dispatch
+# generated.
+
+package provide critcl::class 1.2.1
+
+# # ## ### ##### ######## ############# #####################
+## Requirements.
+
+package require Tcl    8.6 9  ; # Min supported version.
+package require critcl 3.1.17 ; # Need 'meta?' to get the package name.
+                                # Need 'name2c' returning 4 values.
+                                # Need 'Deline' helper.
+                                # Need cproc -tracename
+package require critcl::util  ; # Use the package's Get/Put commands.
+
+namespace eval ::critcl::class {}
+
+# # ## ### ##### ######## ############# #####################
+## API: Generate the declaration and implementation files for the class.
+
+proc ::critcl::class::define {classname script} {
+    variable state
+
+    # Structure of the specification database
+    #
+    # TODO: Separate the spec::Process results from the template placeholders.
+    # TODO: Explain the various keys
+    #
+    # NOTE: All toplevel keys go into the map
+    #       used to configure the template file (class.h).
+    #       See `GenerateCode` and `MakeMap`.
+    #
+    #       The various `Process*` procedures are responsible
+    #       for converting the base specification delivered by
+    #       `spec::Process` into the placeholders expected by
+    #       template
+    ##
+    # state = dict <<
+    #   tcl-api      -> bool
+    #   c-api        -> bool
+    #   capiprefix   -> string
+    #   buildflags   -> string
+    #   classmgrstruct -> string
+    #   classmgrsetup  -> string
+    #   classmgrnin    -> string
+    #   classcommand   -> string
+    #   tclconscmd     -> string
+    #   package      -> string
+    #   class        -> string
+    #   stem         -> string
+    #   classtype    -> string (C type class structure)
+    #   (class)method       -> dict <<
+    #     names   -> list (string)
+    #     def -> (name) -> <<
+    #       enum
+    #       case
+    #       code
+    #       syntax
+    #     >>
+    #     typedef -> ^instancetype
+    #     menum   ->
+    #     typekey ->
+    #     prefix  -> ''|'class_' (see *1*)
+    #     startn  ->
+    #     starte  ->
+    #   >>
+    #   (class)variable     -> dict <<
+    #     names   -> list (string)
+    #     def     -> (name) -> <<
+    #       ctype   ->
+    #       loc     ->
+    #       comment ->
+    #     >>
+    #   >>
+    #   stop         -> bool|presence
+    #   includes     -> string (C code fragment)
+    #   include      ->
+    #   instancetype ->
+    #   ivardecl     -> string (C code fragment)
+    #   ivarrelease  -> string (C code fragment)
+    #   ivarerror    -> string (C code fragment)
+    #   itypedecl    -> string (C code fragment, instance type)
+    #   ctypedecl    -> string (C code fragment, class type)
+    # *1*, (class_)method.prefix use
+    #   (class_)method_names
+    #   (class_)method_enumeration
+    #   (class_)method_dispatch
+    #   (class_)method_implementations
+    # >>
+
+    catch { unset state }
+
+    # Arguments:
+    # - name of the Tcl command representing the class.
+    #   May contain namespace qualifiers. Represented by a ccommand.
+    # - script specifying the state structure and methods.
+
+    #puts "=== |$classname|"
+    #puts "--- $script"
+
+    # Pull the package we are working on out of the system.
+
+    set package [critcl::meta? name]
+    set qpackage [expr {[string match ::* $package]
+			? "$package"
+			: "::$package"}]
+    lassign [uplevel 1 [list ::critcl::name2c $classname]] ns  cns  classname cclassname
+    lassign [uplevel 1 [list ::critcl::name2c $qpackage]]  pns pcns package   cpackage
+
+    #puts "%%% pNS  |$pns|"
+    #puts "%%% Pkg  |$package|"
+    #puts "%%% pCNS |$pcns|"
+    #puts "%%% cPkg |$cpackage|"
+
+    #puts "%%% NS    |$ns|"
+    #puts "%%% CName |$classname|"
+    #puts "%%% CNS   |$cns|"
+    #puts "%%% CCName|$cclassname|"
+
+    set stem ${pcns}${cpackage}_$cns$cclassname
+
+    dict set state tcl-api      1
+    dict set state c-api        0
+    dict set state capiprefix   $cns$cclassname
+    dict set state package      $pns$package
+    dict set state class        $ns$classname
+    dict set state stem         $stem
+    dict set state classtype    ${stem}_CLASS
+    dict set state method      names {}
+    dict set state classmethod names {}
+
+    # Check if the 'info frame' information for 'script' passes through properly.
+    spec::Process $script
+
+    #puts "@@@ <<$state>>"
+
+    ProcessFlags
+    ProcessIncludes
+    ProcessExternalType
+    ProcessInstanceVariables
+    ProcessClassVariables
+
+    ProcessMethods method
+    ProcessMethods classmethod
+
+    ProcessFragment classconstructor "\{\n" " " "\}"
+    ProcessFragment classdestructor  "\{\n" " " "\}"
+    ProcessFragment constructor      "\{\n" " " "\}"
+    ProcessFragment postconstructor  "\{\n" " " "\}"
+    ProcessFragment destructor       "\{\n" " " "\}"
+    ProcessFragment support          "" \n ""
+
+    GenerateCode
+
+    unset state
+    return
+}
+
+proc ::critcl::class::ProcessFlags {} {
+    variable state
+    set flags {}
+    foreach key {tcl-api c-api} {
+	if {![dict get $state $key]} continue
+	lappend flags $key
+    }
+    if {![llength $flags]} {
+	return -code error "No APIs to generate found. Please activate at least one API."
+    }
+
+    dict set state buildflags [join $flags {, }]
+    critcl::msg "\n\tClass flags:     $flags"
+    return
+}
+
+proc ::critcl::class::ProcessIncludes {} {
+    variable state
+    if {[dict exists $state include]} {
+	ProcessFragment include "#include <" "\n" ">"
+	dict set state includes [dict get $state include]
+	dict unset state include
+    } else {
+	dict set state includes {/* No inclusions */}
+    }
+    return
+}
+
+proc ::critcl::class::ProcessExternalType {} {
+    variable state
+    if {![dict exists $state instancetype]} return
+
+    # Handle external C type for instances.
+    set itype [dict get $state instancetype]
+    dict set state ivardecl    "    $itype instance"
+    dict set state ivarrelease ""
+    dict set state ivarerror   "error:\n    return NULL;"
+    dict set state itypedecl   "/* External type for instance state: $itype */"
+
+    # For ProcessMethods
+    dict set state method typedef $itype
+    return
+}
+
+proc ::critcl::class::ProcessInstanceVariables {} {
+    variable state
+
+    if {![dict exists $state variable]} {
+	if {![dict exists $state instancetype]} {
+	    # We have neither external type, nor instance variables.
+	    # Fake ourselves out, recurse.
+	    dict set state variable names {}
+	    ProcessInstanceVariables itype
+	    return
+	}
+
+	# For ProcessMethods
+	dict set state method menum   M_EMPTY
+	dict set state method typekey @instancetype@
+	dict set state method prefix  {}
+	dict set state method startn  {}
+	dict set state method starte  {}
+	return
+    }
+
+    # Convert the set of instance variables (which can be empty) into
+    # a C instance structure type declaration, plus variable name.
+
+    set itype [dict get $state stem]_INSTANCE
+
+    set decl {}
+    lappend decl "typedef struct ${itype}__ \{"
+
+    foreach fname [dict get $state variable names] {
+	set ctype   [dict get $state variable def $fname ctype]
+	set vloc    [dict get $state variable def $fname loc]
+	set comment [dict get $state variable def $fname comment]
+
+	set field "$vloc    $ctype $fname;"
+	if {$comment ne {}} {
+	    append field " /* $comment */"
+	}
+	lappend decl $field
+    }
+
+    lappend decl "\} ${itype}__;"
+    lappend decl "typedef struct ${itype}__* $itype;"
+
+    dict set state instancetype $itype
+    dict set state ivardecl    "    $itype instance = ($itype) ckalloc (sizeof (${itype}__))"
+    dict set state ivarerror   "error:\n    ckfree ((char*) instance);\n    return NULL;"
+    dict set state ivarrelease "    ckfree ((char*) instance)"
+    dict set state itypedecl   [join $decl \n]
+
+    # For ProcessMethods
+    dict set state method typedef $itype
+    dict set state method menum   M_EMPTY
+    dict set state method typekey @instancetype@
+    dict set state method prefix  {}
+    dict set state method startn  {}
+    dict set state method starte  {}
+    return
+}
+
+proc ::critcl::class::ProcessClassVariables {} {
+    variable state
+
+    # For ProcessMethods
+    dict set state classmethod typedef [dict get $state classtype]
+    dict set state classmethod menum   {}
+    dict set state classmethod typekey @classtype@
+    dict set state classmethod prefix  class_
+    dict set state classmethod startn  "\n"
+    dict set state classmethod starte  ",\n"
+    dict set state ctypedecl {}
+
+    dict set state capiclassvaraccess {}
+
+    if {![dict exists $state classvariable]} {
+	# Some compilers are unable to handle a structure without
+	# members (notably ANSI C89 Solaris, AIX). Taking the easy way
+	# out here, adding a dummy element. A more complex solution
+	# would be to ifdef the empty structure out of the system.
+
+	dict set state ctypedecl {int __dummy__;}
+	return
+    }
+
+    # Convert class variables  into class type field declarations.
+
+    set decl {}
+    lappend decl "/* # # ## ### ##### ######## User: Class variables */"
+
+    if {[dict get $state c-api]} {
+	lappend acc  "/* # # ## ### ##### ######## User: C-API :: Class variable accessors */\n"
+    }
+
+    foreach fname [dict get $state classvariable names] {
+	set ctype   [dict get $state classvariable def $fname ctype]
+	set vloc    [dict get $state classvariable def $fname loc]
+	set comment [dict get $state classvariable def $fname comment]
+
+	set field "$vloc$ctype $fname;"
+	if {$comment ne {}} {
+	    append field " /* $comment */"
+	}
+	lappend decl $field
+
+	# If needed, generate accessor functions for all class variables,
+	# i.e setters and getters.
+
+	if {[dict get $state c-api]} {
+	    lappend acc "$ctype @capiprefix@_${fname}_get (Tcl_Interp* interp) \{"
+	    lappend acc "    return @stem@_Class (interp)->user.$fname;"
+	    lappend acc "\}"
+	    lappend acc ""
+	    lappend acc "void @capiprefix@_${fname}_set (Tcl_Interp* interp, $ctype v) \{"
+	    lappend acc "    @stem@_Class (interp)->user.$fname = v;"
+	    lappend acc "\}"
+	}
+    }
+
+    lappend decl "/* # # ## ### ##### ######## */"
+
+    dict set state ctypedecl "    [join $decl "\n    "]\n"
+
+    if {[dict get $state c-api]} {
+	dict set state capiclassvaraccess [join $acc \n]
+    }
+    return
+}
+
+proc ::critcl::class::Max {v s} {
+    upvar 1 $v max
+    set l [string length $s]
+    if {$l < $max} return
+    set max $l
+    return
+}
+
+proc ::critcl::class::ProcessMethods {key} {
+    variable state
+    # Process method declarations. Ensure that the names are listed in
+    # alphabetical order, to be nice.
+
+    # From Process(Instance|Class)Variables
+    set pfx  [dict get $state $key prefix]
+    set stn  [dict get $state $key startn]
+    set ste  [dict get $state $key starte]
+
+    if {[dict exists $state $key names] &&
+	[llength [dict get $state $key names]]} {
+	set map [list @stem@ [dict get $state stem] \
+		     [dict get $state $key typekey] \
+		     [dict get $state $key typedef]]
+
+	set maxe 0
+	set maxn 0
+	foreach name [lsort -dict [dict get $state $key names]] {
+	    Max maxn $name
+	    Max maxe [dict get $state $key def $name enum]
+	}
+	incr maxn 3
+
+	foreach name [lsort -dict [dict get $state $key names]] {
+	    set enum   [string map $map [dict get $state $key def $name enum]]
+	    set case   [string map $map [dict get $state $key def $name case]]
+	    set code   [string map $map [dict get $state $key def $name code]]
+	    set syntax [string map $map [dict get $state $key def $name syntax]]
+
+	    lappend names "[format %-${maxn}s \"$name\",] $syntax"
+	    lappend enums "[format %-${maxe}s $enum] $syntax"
+	    regexp {(:.*)$} $case tail
+	    set case "case [format %-${maxe}s $enum]$tail"
+	    lappend cases $case
+	    lappend codes $code
+	}
+
+	dict set state ${pfx}method_names           "${stn}    [join $names  "\n    "]"
+	dict set state ${pfx}method_enumeration     "${ste}    [join $enums ",\n    "]"
+	dict set state ${pfx}method_dispatch        "${stn}\t[join $cases \n\t]"
+	dict set state ${pfx}method_implementations [join $codes \n\n]
+    } else {
+	set enums [dict get $state $key menum]
+	if {[llength $enums]} {
+	    set enums "${ste}    [join $enums ",\n    "]"
+	}
+
+	dict set state ${pfx}method_names           {}
+	dict set state ${pfx}method_enumeration     $enums
+	dict set state ${pfx}method_dispatch        {}
+	dict set state ${pfx}method_implementations {}
+    }
+
+
+    dict unset state $key
+    return
+}
+
+proc ::critcl::class::ProcessFragment {key prefix sep suffix} {
+    # Process code fragments into a single block, if any.
+    # Ensure it exists, even if empty. Required by template.
+    # Optional in specification.
+
+    variable state
+    if {![dict exists $state $key]} {
+	set new {}
+    } else {
+	set new ${prefix}[join [dict get $state $key] $suffix$sep$prefix]$suffix
+    }
+    dict set state $key $new
+    return
+}
+
+proc ::critcl::class::GenerateCode {} {
+    variable state
+
+    set stem     [dict get $state stem]
+    set class    [dict get $state class]
+    set hdr      ${stem}_class.h
+    set header   [file join [critcl::cache] $hdr]
+
+    file mkdir [critcl::cache]
+    set template [critcl::Deline [Template class.h]]
+    #puts T=[string length $template]
+
+    # Note, the template file is many files/parts, separated by ^Z
+    lassign [split $template \x1a] \
+	template mgrstruct mgrsetup newinsname classcmd tclconscmd \
+	cconscmd
+
+    # Configure the flag-dependent parts of the template
+
+    if {[dict get $state tcl-api]} {
+	dict set state classmgrstruct $mgrstruct
+	dict set state classmgrsetup  $mgrsetup
+	dict set state classmgrnin    $newinsname
+	dict set state classcommand   $classcmd
+	dict set state tclconscmd     $tclconscmd
+    } else {
+	dict set state classmgrstruct {}
+	dict set state classmgrsetup  {}
+	dict set state classmgrnin    {}
+	dict set state classcommand   {}
+	dict set state tclconscmd     {}
+    }
+
+    if {[dict get $state c-api]} {
+	dict set state cconscmd     $cconscmd
+    } else {
+	dict set state cconscmd     {}
+    }
+
+    critcl::util::Put $header [string map [MakeMap] $template]
+
+    critcl::ccode "#include <$hdr>"
+    if {[dict get $state tcl-api]} {
+	uplevel 2 [list critcl::ccommand $class ${stem}_ClassCommand]
+    }
+    return
+}
+
+proc ::critcl::class::MakeMap {} {
+    variable state
+
+    # First set of substitutions.
+    set premap {}
+    dict for {k v} $state {
+	lappend premap @${k}@ $v
+    }
+
+    # Resolve the substitutions used in the fragments of code to
+    # generate the final map.
+    set map {}
+    foreach {k v} $premap {
+	lappend map $k [string map $premap $v]
+    }
+
+    return $map
+}
+
+proc ::critcl::class::Template {path} {
+    variable selfdir
+    set path $selfdir/$path
+    critcl::msg "\tClass templates: $path"
+    return [Get $path]
+}
+
+proc ::critcl::class::Get {path} {
+    if {[catch {
+	set c [open $path r]
+	fconfigure $c -eofchar {}
+	set d [read $c]
+	close $c
+    }]} {
+	set d {}
+    }
+    return $d
+}
+
+proc ::critcl::class::Dedent {pfx text} {
+    set result {}
+    foreach l [split $text \n] {
+	lappend result [regsub ^$pfx $l {}]
+    }
+    join $result \n
+}
+
+# # ## ### ##### ######## ############# #####################
+##
+# Internal: All the helper commands providing access to the system
+# state to the specification commands (see next section)
+##
+# # ## ### ##### ######## ############# #####################
+
+proc ::critcl::class::CAPIPrefix {name} {
+    variable state
+    dict set state capiprefix $name
+    return
+}
+
+proc ::critcl::class::Flag {key flag} {
+    critcl::msg " ($key = $flag)"
+    variable state
+    dict set state $key $flag
+    return
+}
+
+proc ::critcl::class::Include {header} {
+    # Name of an API to include in the generated code.
+    variable state
+    dict lappend state include $header
+    return
+}
+
+proc ::critcl::class::ExternalType {name} {
+    # Declaration of the C type to use for the object state.  This
+    # type is expected to be declared externally. It allows us to use
+    # a 3rd party structure directly. Cannot be specified if instance
+    # and/or class variables for our own structures have been declared
+    # already.
+
+    variable state
+
+    if {[dict exists $state variable]} {
+	return -code error "Invalid external instance type. Instance variables already declared."
+    }
+    if {[dict exists $state classvariable]} {
+	return -code error "Invalid external instance type. Class variables already declared."
+    }
+
+    dict set state instancetype $name
+    return
+}
+
+proc ::critcl::class::Variable {ctype name comment vloc} {
+    # Declaration of an instance variable. In other words, a field in
+    # the C structure for instances. Cannot be specified if an
+    # external "type" has been specified already.
+
+    variable state
+
+    if {[dict exists $state instancetype]} {
+	return -code error \
+	    "Invalid instance variable. External instance type already declared."
+    }
+
+    if {[dict exists $state variable def $name]} {
+	return -code error "Duplicate definition of instance variable \"$name\""
+    }
+
+    # Create the automatic instance variable to hold the instance
+    # command token.
+
+    if {![dict exists $state stop] &&
+	(![dict exists $state variable] ||
+	 ![llength [dict get $state variable names]])
+    } {
+	# To make it easier on us we reuse the existing definition
+	# commands to set everything up. To avoid infinite recursion
+	# we set a flag stopping us from re-entering this block.
+
+	dict set state stop 1
+	critcl::at::here ; Variable Tcl_Command cmd {
+	    Automatically generated. Holds the token for the instance command,
+	    for use by the automatically created destroy method.
+	} [critcl::at::get]
+	dict unset state stop
+
+	PostConstructor "[critcl::at::here!]\tinstance->cmd = cmd;\n"
+
+	# And the destroy method using the above instance variable.
+	critcl::at::here ; MethodExplicit destroy proc {} void {
+	    Tcl_DeleteCommandFromToken(interp, instance->cmd);
+	}
+    }
+
+    dict update state variable f {
+	dict lappend f names $name
+    }
+    dict set state variable def $name ctype   $ctype
+    dict set state variable def $name loc     $vloc
+    dict set state variable def $name comment [string trim $comment]
+    return
+}
+
+proc ::critcl::class::ClassVariable {ctype name comment vloc} {
+    # Declaration of a class variable. In other words, a field in the
+    # C structure for the class. Cannot be specified if a an external
+    # "type" has been specified already.
+
+    variable state
+
+    if {[dict exists $state instancetype]} {
+	return -code error \
+	    "Invalid class variable. External instance type already declared."
+    }
+
+    if {[dict exists $state classvariable def $name]} {
+	return -code error "Duplicate definition of class variable \"$name\""
+    }
+
+    dict update state classvariable c {
+	dict lappend c names $name
+    }
+    dict set state classvariable def $name ctype   $ctype
+    dict set state classvariable def $name loc     $vloc
+    dict set state classvariable def $name comment [string trim $comment]
+
+    if {[llength [dict get $state classvariable names]] == 1} {
+	# On declaration of the first class variable we declare an
+	# instance variable which provides the instances with a
+	# reference to their class (structure).
+	critcl::at::here ; Variable @classtype@ class {
+	    Automatically generated. Reference to the class (variables)
+	    from the instance.
+	} [critcl::at::get]
+	Constructor "[critcl::at::here!]\tinstance->class = class;\n"
+    }
+    return
+}
+
+proc ::critcl::class::Constructor {code} {
+    CodeFragment constructor $code
+    return
+}
+
+proc ::critcl::class::PostConstructor {code} {
+    CodeFragment postconstructor $code
+    return
+}
+
+proc ::critcl::class::Destructor {code} {
+    CodeFragment destructor $code
+    return
+}
+
+proc ::critcl::class::ClassConstructor {code} {
+    CodeFragment classconstructor $code
+    return
+}
+
+proc ::critcl::class::ClassDestructor {code} {
+    CodeFragment classdestructor $code
+    return
+ }
+
+proc ::critcl::class::Support {code} {
+    CodeFragment support $code
+    return
+}
+
+proc ::critcl::class::MethodExternal {name function details} {
+    MethodCheck method instance $name
+
+    set map {}
+    if {[llength $details]} {
+	set  details [join $details {, }]
+	lappend map objv "objv, $details"
+	set details " ($details)"
+    }
+
+    MethodDef method instance $name [MethodEnum method $name] {} $function $map \
+	"/* $name : External function @function@$details */"
+    return
+}
+
+proc ::critcl::class::MethodExplicit {name mtype arguments args} {
+    # mtype in {proc, command}
+    MethodCheck method instance $name
+    variable state
+
+    set bloc     [critcl::at::get]
+    set enum     [MethodEnum method $name]
+    set function ${enum}_Cmd
+    set cdimport "[critcl::at::here!]    @instancetype@ instance = (@instancetype@) clientdata;"
+    set tname    "[dict get $state class] M  $name"
+
+    if {$mtype eq "proc"} {
+	# Method is cproc.
+	# |args| == 2, args => rtype, body
+	# arguments is (argtype argname...)
+	# (See critcl::cproc for full details)
+
+	# Force availability of the interp in methods.
+	if {[lindex $arguments 0] ne "Tcl_Interp*"} {
+	    set arguments [linsert $arguments 0 Tcl_Interp* interp]
+	}
+
+	lassign $args rtype body
+
+	set body   $bloc[string trimright $body]
+	set cargs  [critcl::argnames $arguments]
+	if {[llength $cargs]} { set cargs " $cargs" }
+	set syntax "/* Syntax: <instance> $name$cargs */"
+	set body   "\n    $syntax\n$cdimport\n    $body"
+
+	set code [critcl::collect {
+	    critcl::cproc $function $arguments $rtype $body \
+		-cname 1 -pass-cdata 1 -arg-offset 1 -tracename $tname
+	}]
+
+    } else {
+	# Method is ccommand.
+	# |args| == 1, args => body
+	lassign $args body
+
+	if {$arguments ne {}} {set arguments " cmd<<$arguments>>"}
+	set body   $bloc[string trimright $body]
+	set syntax "/* Syntax: <instance> $name$arguments */"
+	set body   "\n    $syntax\n$cdimport\n    $body"
+
+	set code [critcl::collect {
+	    critcl::ccommand $function {} $body \
+		-cname 1 -tracename $tname
+	}]
+    }
+
+    MethodDef method instance $name $enum $syntax $function {} $code
+    return
+}
+
+proc ::critcl::class::ClassMethodExternal {name function details} {
+    MethodCheck classmethod class $name
+
+    set map {}
+    if {[llength $details]} {
+	lappend map objv "objv, [join $details {, }]"
+    }
+
+    MethodDef classmethod "&classmgr->user" $name [MethodEnum classmethod $name] {} $function $map \
+	"/* $name : External function @function@ */"
+    return
+}
+
+proc ::critcl::class::ClassMethodExplicit {name mtype arguments args} {
+    # mtype in {proc, command}
+    MethodCheck classmethod class $name
+    variable state
+
+    set bloc     [critcl::at::get]
+    set enum     [MethodEnum classmethod $name]
+    set function ${enum}_Cmd
+    set cdimport "[critcl::at::here!]    @classtype@ class = (@classtype@) clientdata;"
+    set tname    "[dict get $state class] CM $name"
+
+    if {$mtype eq "proc"} {
+	# Method is cproc.
+	# |args| == 2, args => rtype, body
+	# arguments is (argtype argname...)
+	# (See critcl::cproc for full details)
+
+	# Force availability of the interp in methods.
+	if {[lindex $arguments 0] ne "Tcl_Interp*"} {
+	    set arguments [linsert $arguments 0 Tcl_Interp* interp]
+	}
+
+	lassign $args rtype body
+
+	set body   $bloc[string trimright $body]
+	set cargs  [critcl::argnames $arguments]
+	if {[llength $cargs]} { set cargs " $cargs" }
+	set syntax "/* Syntax: <class> $name$cargs */"
+	set body   "\n    $syntax\n$cdimport\n    $body"
+
+	set code [critcl::collect {
+	    critcl::cproc $function $arguments $rtype $body \
+		-cname 1 -pass-cdata 1 -arg-offset 1 \
+		-tracename $tname
+	}]
+
+    } else {
+	# Method is ccommand.
+	# |args| == 1, args => body
+	lassign $args body
+
+	if {$arguments ne {}} {set arguments " cmd<<$arguments>>"}
+	set body   $bloc[string trimright $body]
+	set syntax "/* Syntax: <class> $name$arguments */"
+	set body   "\n    $syntax\n$cdimport\n    $body"
+
+	set code [critcl::collect {
+	    critcl::ccommand $function {} $body \
+		-cname 1 -tracename $tname
+	}]
+    }
+
+    MethodDef classmethod class $name $enum $syntax $function {} $code
+    return
+}
+
+proc ::critcl::class::MethodCheck {section label name} {
+    variable state
+    if {[dict exists $state $section def $name]} {
+	return -code error "Duplicate definition of $label method \"$name\""
+    }
+    return
+}
+
+proc ::critcl::class::MethodEnum {section name} {
+    variable state
+    # Compute a C enum identifier from the (class) method name.
+
+    # To avoid trouble we have to remove any non-alphabetic
+    # characters. A serial number is required to distinguish methods
+    # which would, despite having different names, transform to the
+    # same C enum identifier.
+
+    regsub -all -- {[^a-zA-Z0-9_]} $name _ name
+    regsub -all -- {_+} $name _ name
+
+    set serial [llength [dict get $state $section names]]
+    set M [expr {$section eq "method" ? "M" : "CM"}]
+
+    return @stem@_${M}_${serial}_[string toupper $name]
+}
+
+proc ::critcl::class::MethodDef {section var name enum syntax function xmap code} {
+    variable state
+
+    set case  "case $enum: return @function@ ($var, interp, objc, objv); break;"
+    set case [string map $xmap $case]
+
+    set map [list @function@ $function]
+
+    dict update state $section m {
+	dict lappend m names $name
+    }
+    dict set state $section def $name enum $enum
+    dict set state $section def $name case   [string map $map $case]
+    dict set state $section def $name code   [string map $map $code]
+    dict set state $section def $name syntax [string map $map $syntax]
+    return
+}
+
+proc ::critcl::class::CodeFragment {section code} {
+    variable state
+    set code [string trim $code \n]
+    if {$code ne {}} {
+	dict lappend state $section $code
+    }
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+##
+# Internal: Namespace holding the class specification commands. The
+# associated state resides in the outer namespace, as do all the
+# procedures actually accessing that state (see above). Treat it like
+# a sub-package, with a proper API.
+##
+# # ## ### ##### ######## ############# #####################
+
+namespace eval ::critcl::class::spec {}
+
+proc ::critcl::class::spec::Process {script} {
+    # Note how this script is evaluated within the 'spec' namespace,
+    # providing it with access to the specification methods.
+
+    # Point the global namespace resolution into the spec namespace,
+    # to ensure that the commands are properly found even if the
+    # script moved through helper commands and other namespaces.
+
+    # Note that even this will not override the builtin 'variable'
+    # command with ours, which is why ours is now called
+    # 'insvariable'.
+
+    namespace eval :: [list namespace path [list [namespace current] ::]]
+
+    eval $script
+
+    namespace eval :: {namespace path {}}
+    return
+}
+
+proc ::critcl::class::spec::tcl-api {flag} {
+    ::critcl::class::Flag tcl-api $flag
+}
+
+proc ::critcl::class::spec::c-api {flag {name {}}} {
+    ::critcl::class::Flag c-api $flag
+    if {$name eq {}} return
+    ::critcl::class::CAPIPrefix $name
+}
+
+proc ::critcl::class::spec::include {header} {
+    ::critcl::class::Include $header
+}
+
+proc ::critcl::class::spec::type {name} {
+    ::critcl::class::ExternalType $name
+}
+
+proc ::critcl::class::spec::insvariable {ctype name {comment {}} {constructor {}} {destructor {}}} {
+    ::critcl::at::caller
+    set vloc [critcl::at::get*]
+    ::critcl::at::incrt $comment     ; set cloc [::critcl::at::get*]
+    ::critcl::at::incrt $constructor ; set dloc [::critcl::at::get]
+
+
+    ::critcl::class::Variable $ctype $name $comment $vloc
+
+    if {$constructor ne {}} {
+	::critcl::class::Constructor $cloc$constructor
+    }
+    if {$destructor ne {}} {
+	::critcl::class::Destructor $dloc$destructor
+    }
+
+    return
+}
+
+proc ::critcl::class::spec::constructor {code {postcode {}}} {
+    ::critcl::at::caller      ; set cloc [::critcl::at::get*]
+    ::critcl::at::incrt $code ; set ploc [::critcl::at::get]
+
+    if {$code ne {}} {
+	::critcl::class::Constructor $cloc$code
+    }
+    if {$postcode ne {}} {
+	::critcl::class::PostConstructor $ploc$postcode
+    }
+    return
+}
+
+proc ::critcl::class::spec::destructor {code} {
+    ::critcl::class::Destructor [::critcl::at::caller!]$code
+    return
+}
+
+proc ::critcl::class::spec::method {name op detail args} {
+    # Syntax
+    # (1) method <name> as      <function>  ...
+    # (2) method <name> proc    <arguments> <rtype> <body>
+    # (3) method <name> command <arguments> <body>
+    #            name   op      detail      args__________
+
+    # op = as|proc|cmd|command
+
+    # op == proc
+    # detail  = argument list, syntax as per cproc.
+    # args[0] = r(esult)type
+    # args[1] = body
+
+    # op == command
+    # detail  = argument syntax. not used in code, purely descriptive.
+    # args[0] = body
+
+    switch -exact -- $op {
+	as {
+	    # The instance method is an external C function matching
+	    # an ObjCmd in signature, possibly with additional
+	    # parameters at the end.
+	    #
+	    # detail = name of that function
+	    # args   = values for the additional parameters, if any.
+
+	    ::critcl::class::MethodExternal $name $detail $args
+	    return
+	}
+	proc {
+	    if {[llength $args] != 2} {
+		return -code error "wrong#args"
+	    }
+	}
+	cmd - command {
+	    set op command
+	    if {[llength $args] != 1} {
+		return -code error "wrong#args"
+	    }
+	}
+	default {
+	    return -code error "Illegal method type \"$op\", expected one of cmd, command, or proc"
+	}
+    }
+
+    ::critcl::at::caller
+    ::critcl::at::incrt $detail
+
+    eval [linsert $args 0 ::critcl::class::MethodExplicit $name $op [string trim $detail]]
+    #::critcl::class::MethodExplicit $name $op [string trim $detail] {*}$args
+    return
+}
+
+proc ::critcl::class::spec::classvariable {ctype name {comment {}} {constructor {}} {destructor {}}} {
+    ::critcl::at::caller
+    set vloc [critcl::at::get*]
+    ::critcl::at::incrt $comment     ; set cloc [::critcl::at::get*]
+    ::critcl::at::incrt $constructor ; set dloc [::critcl::at::get]
+
+    ::critcl::class::ClassVariable $ctype $name $comment $vloc
+
+    if {$constructor ne {}} {
+	::critcl::class::ClassConstructor $cloc$constructor
+    }
+    if {$destructor ne {}} {
+	::critcl::class::ClassDestructor $dloc$destructor
+    }
+    return
+}
+
+proc ::critcl::class::spec::classconstructor {code} {
+    ::critcl::class::ClassConstructor [::critcl::at::caller!]$code
+    return
+}
+
+proc ::critcl::class::spec::classdestructor {code} {
+    ::critcl::class::ClassDestructor [::critcl::at::caller!]$code
+    return
+}
+
+proc ::critcl::class::spec::classmethod {name op detail args} {
+    # Syntax
+    # (1) classmethod <name> as      <function>  ...
+    # (2) classmethod <name> proc    <arguments> <rtype> <body>
+    # (3) classmethod <name> command <arguments> <body>
+    #                 name   op      detail      args__________
+
+    # op = as|proc|cmd|command
+
+    # op == proc
+    # detail  = argument syntax per cproc.
+    # args[0] = r(esult)type
+    # args[1] = body
+
+    # op == command
+    # detail  = argument syntax. not used in code, purely descriptive.
+    # args[0] = body
+
+    switch -exact -- $op {
+	as {
+	    # The class method is an external C function matching an
+	    # ObjCmd in signature, possibly with additional parameters
+	    # at the end.
+	    #
+	    # detail = name of that function
+	    # args   = values for the additional parameters, if any.
+
+	    ::critcl::class::ClassMethodExternal $name $detail $args
+	    return
+	}
+	proc {
+	    if {[llength $args] != 2} {
+		return -code error "wrong#args"
+	    }
+	}
+	cmd - command {
+	    set op command
+	    if {[llength $args] != 1} {
+		return -code error "wrong#args"
+	    }
+	}
+	default {
+	    return -code error "Illegal method type \"$op\", expected one of cmd, command, or proc"
+	}
+    }
+
+    ::critcl::at::caller
+    ::critcl::at::incrt $detail
+    eval [linsert $args 0 ::critcl::class::ClassMethodExplicit $name $op [string trim $detail]]
+    # ::critcl::class::ClassMethodExplicit $name $op [string trim $detail] {*}$args
+    return
+}
+
+proc ::critcl::class::spec::support {code} {
+    ::critcl::class::Support [::critcl::at::caller!]$code
+    return
+}
+
+proc ::critcl::class::spec::method_introspection {} {
+    ::critcl::class::spec::classvariable Tcl_Obj* methods {
+	Cache for the list of method names.
+    } {
+	class->methods = ComputeMethodList (@stem@_methodnames);
+	Tcl_IncrRefCount (class->methods);
+    } {
+	Tcl_DecrRefCount (class->methods);
+	class->methods = NULL;
+    }
+
+    # The ifdef/define/endif block below ensures that the supporting
+    # code will be defined only once, even if multiple classes
+    # activate method-introspection. Note that what we cannot prevent
+    # is the appearance of multiple copies of the code below in the
+    # generated output, only that it is compiled multiple times.
+
+    ::critcl::class::spec::support {
+#ifndef CRITCL_CLASS__HAVE_COMPUTE_METHOD_LIST
+#define CRITCL_CLASS__HAVE_COMPUTE_METHOD_LIST
+static Tcl_Obj*
+ComputeMethodList (CONST char** table)
+{
+    Tcl_Size n, i;
+    char** item;
+    Tcl_Obj** lv;
+    Tcl_Obj* result;
+
+    item = (char**) table;
+    n = 0;
+    while (*item) {
+	n ++;
+	item ++;
+    }
+
+    lv = (Tcl_Obj**) ckalloc (n * sizeof (Tcl_Obj*));
+    i = 0;
+    while (table [i]) {
+	lv [i] = Tcl_NewStringObj (table [i], -1);
+	i ++;
+    }
+
+    result = Tcl_NewListObj (n, lv);
+    ckfree ((char*) lv);
+
+    return result;
+}
+#endif /* CRITCL_CLASS__HAVE_COMPUTE_METHOD_LIST */
+    }
+
+    ::critcl::class::spec::method methods proc {} void {
+	Tcl_SetObjResult (interp, instance->class->methods);
+    }
+
+    ::critcl::class::spec::classmethod methods proc {} void {
+	Tcl_SetObjResult (interp, class->methods);
+    }
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## State
+
+namespace eval ::critcl::class {
+    variable selfdir [file dirname [file normalize [info script]]]
+}
+
+# # ## ### ##### ######## ############# #####################
+## Export API
+
+namespace eval ::critcl::class {
+    namespace export define
+    catch { namespace ensemble create } ; # 8.5+
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+return
diff --git a/src/vfs/critcl.vfs/lib/critcl-class/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/critcl-class/pkgIndex.tcl
new file mode 100644
index 00000000..5e353486
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-class/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+package ifneeded critcl::class 1.2.1 [list source [file join $dir class.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/critcl-cutil/allocs/critcl_alloc.h b/src/vfs/critcl.vfs/lib/critcl-cutil/allocs/critcl_alloc.h
new file mode 100644
index 00000000..684eafe5
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-cutil/allocs/critcl_alloc.h
@@ -0,0 +1,57 @@
+#ifndef __CRITCL_UTIL_ALLOC_H
+#define __CRITCL_UTIL_ALLOC_H 1
+
+/*
+ * Copyright (c) 2017-2020 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+ * = = == === ===== ======== ============= =====================
+ */
+
+#include <string.h> /* memcpy - See STREP */
+#include <tcl.h>
+
+/*
+ * Helper macros for easy allocation of structures and arrays.
+ */
+
+#define ALLOC(type)        (type *) ckalloc   (sizeof (type))
+#define ALLOC_PLUS(type,n) (type *) ckalloc   (sizeof (type) + (n))
+#define NALLOC(type,n)     (type *) ckalloc   (sizeof (type) * (n))
+#define REALLOC(x,type,n)  (type *) ckrealloc ((char*) x, sizeof (type) * (n))
+
+#define FREE(p) ckfree ((char*)(p))
+
+/*
+ * Macros to properly set a string rep from a string or DString. The main
+ * point is adding the terminating \0 character. The Tcl core checks for that.
+ */
+
+#define STREP(o,str,len)		\
+    (o)->length = (len);		\
+    (o)->bytes  = ckalloc((len)+1);	\
+    memcpy ((o)->bytes, (str), (len));	\
+    (o)->bytes[(len)] = '\0'
+
+#define STREP_DS(o,ds) {				\
+	int length = Tcl_DStringLength (ds);		\
+	STREP(o, Tcl_DStringValue (ds), length);	\
+    }
+
+#define STRDUP(v,s) {			    \
+        char* str = ckalloc (1+strlen (s)); \
+	strcpy (str, s);		    \
+	v = str; \
+    }
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+#endif /* __CRITCL_UTIL_ALLOC_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/lib/critcl-cutil/asserts/critcl_assert.h b/src/vfs/critcl.vfs/lib/critcl-cutil/asserts/critcl_assert.h
new file mode 100644
index 00000000..32ff0755
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-cutil/asserts/critcl_assert.h
@@ -0,0 +1,68 @@
+#ifndef __CRITCL_CUTIL_ASSERT_H
+#define __CRITCL_CUTIL_ASSERT_H 1
+
+/*
+ * Copyright (c) 2017-2020 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+ * = = == === ===== ======== ============= =====================
+ */
+
+#include <tcl.h>
+
+/*
+ * Macros for assertions, controlled via CRITCL_ASSERT.
+ * Especially a helper to check array bounds, and counted
+ * abort.
+ */
+
+#ifdef CRITCL_ASSERT
+
+#define CRITCL_CUTIL_XSTR(x) #x
+#define CRITCL_CUTIL_STR(x) CRITCL_CUTIL_XSTR(x)
+#define CRITCL_CUTIL_RANGEOK(i,n) ((0 <= (i)) && ((i) < (n)))
+
+#define ASSERT(x,msg) if (!(x)) {				\
+	Tcl_Panic (msg " (" #x "), in file %s @line %d",	\
+		   __FILE__, __LINE__);				\
+    }
+
+#define ASSERT_VA(x,msg,format,...) if (!(x)) {				\
+	Tcl_Panic (msg " (" #x "), in file %s @line %d, " format,	\
+		   __FILE__, __LINE__, __VA_ARGS__);			\
+    }
+
+#define ASSERT_BOUNDS(i,n)			\
+    ASSERT_VA (CRITCL_CUTIL_RANGEOK(i,n),	\
+	       "array index out of bounds",	\
+	       CRITCL_CUTIL_STR(i)		\
+	       " = (%d) >= (%d) = "		\
+	       CRITCL_CUTIL_STR(n),		\
+	       i, n)
+
+#define STOPAFTER(x) {				\
+	static int count = (x);			\
+	count --;				\
+	if (!count) { Tcl_Panic ("stop"); }	\
+    }
+
+#else /* ! CRITCL_ASSERT */
+
+#define ASSERT(x,msg)
+#define ASSERT_VA(x,msg,format,...)
+#define ASSERT_BOUNDS(i,n)
+#define STOPAFTER(x)
+
+#endif
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+#endif /* __CRITCL_CUTIL_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/lib/critcl-cutil/cutil.tcl b/src/vfs/critcl.vfs/lib/critcl-cutil/cutil.tcl
new file mode 100644
index 00000000..9a56160c
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-cutil/cutil.tcl
@@ -0,0 +1,69 @@
+## -*- tcl -*-
+# # ## ### ##### ######## ############# #####################
+# Pragmas for MetaData Scanner.
+# n/a
+
+# CriTcl Utility Commands To Provide Common C-level utility functions.
+#
+# Copyright (c) 2017-2023 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+package provide critcl::cutil 0.4
+
+# # ## ### ##### ######## ############# #####################
+## Requirements.
+
+package require Tcl    8.6 9   ; # Min supported version.
+package require critcl 3.2
+
+namespace eval ::critcl::cutil {}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: Embed C Code
+
+# # ## ### ##### ######## ############# #####################
+
+proc critcl::cutil::alloc {} {
+    variable selfdir
+    critcl::cheaders -I$selfdir/allocs
+    critcl::include critcl_alloc.h
+    return
+}
+
+proc critcl::cutil::assertions {{enable 0}} {
+    variable selfdir
+    critcl::cheaders -I$selfdir/asserts
+    critcl::include critcl_assert.h
+    if {!$enable} return
+    critcl::cflags -DCRITCL_ASSERT
+    return
+}
+
+proc critcl::cutil::tracer {{enable 0}} {
+    variable selfdir
+    alloc ;# Tracer uses the allocation utilities in its implementation
+    critcl::cheaders -I$selfdir/trace
+    critcl::include  critcl_trace.h
+    critcl::csources $selfdir/trace/trace.c
+    if {!$enable} return
+    critcl::cflags -DCRITCL_TRACER
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## State
+
+namespace eval ::critcl::cutil {
+    variable selfdir [file dirname [file normalize [info script]]]
+}
+
+# # ## ### ##### ######## ############# #####################
+## Export API
+
+namespace eval ::critcl::cutil {
+    namespace export alloc assert tracer
+    catch { namespace ensemble create }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+return
diff --git a/src/vfs/critcl.vfs/lib/critcl-cutil/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/critcl-cutil/pkgIndex.tcl
new file mode 100644
index 00000000..bd16d532
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-cutil/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+package ifneeded critcl::cutil 0.4 [list source [file join $dir cutil.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/critcl-cutil/trace/critcl_trace.h b/src/vfs/critcl.vfs/lib/critcl-cutil/trace/critcl_trace.h
new file mode 100644
index 00000000..a0d1d203
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-cutil/trace/critcl_trace.h
@@ -0,0 +1,156 @@
+#ifndef __CRITCL_UTIL_TRACE_H
+#define __CRITCL_UTIL_TRACE_H 1
+
+/*
+ * Copyright (c) 2017-2023 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+ *
+ * Narrative tracing support, controlled by CRITCL_TRACER
+ * = = == === ===== ======== ============= =====================
+ *
+ * Further control of the active logical sub-streams is done via the
+ * declarators
+ * - TRACE_ON
+ * - TRACE_OFF
+ * - TRACE_TAG_ON
+ * - TRACE_TAG_OFF
+ *
+ * The macros make use of the standard macros __FILE__ and __LINE__
+ * to identify traced locations (physically).
+ *
+ * ATTENTION: The trace facility assumes a C99 compiler to have
+ *            access to the __func__ string which holds the name
+ *            of the current function.
+ *
+ * NOTE: define CRITCL_TRACE_NOTHREADS if the tracer is run on a single-threaded
+ *       process for sure. Else leave it at the new default of multi-threaded
+ *       operation.
+ *
+ *       In this mode it generates one `.trace` file per thread with active tracing.
+ *	 In single-threaded mode it writes to stdout as before.
+ */
+
+#include <tcl.h>
+
+/*
+ * Main (convenience) commands:
+ *
+ * - TRACE_FUNC        :: Function entry, formatted parameters
+ * - TRACE_FUNC_VOID   :: Function entry, no parameters
+ * - TRACE_RETURN      :: Function exit, formatted result
+ * - TRACE_RETURN_VOID :: Function exit, no result
+ * - TRACE             :: Additional trace line.
+ *
+ * The above commands are composed from the lower level commands below.
+ *
+ * Scoping
+ * - TRACE_PUSH_SCOPE :: Start a named scope, no output
+ * - TRACE_PUSH_FUNC  :: Start a scope, named by the current function, no output
+ * - TRACE_POP        :: End a scope, no output
+
+ * Tracing
+ * - TRACE_HEADER  :: Start of trace line (location, indentation, scope)
+ * - TRACE_ADD     :: Extend trace line, formatted information
+ * - TRACE_CLOSER  :: End of trace line
+ *
+ * All of the tracing command also come in TRACE_TAG_ forms which take an
+ * additional 1st argument, the tag of the stream. The scoping commands do not
+ * take tags. They manage indentation without generating output on their own.
+ */
+
+#ifndef CRITCL_TRACER
+/* Tracing disabled. All macros vanish */
+#define TRACE_PUSH_SCOPE(string)
+#define TRACE_PUSH_FUNC
+#define TRACE_POP
+#define TRACE_ON
+#define TRACE_OFF
+#define TRACE_HEADER(indent)
+#define TRACE_ADD(format, ...)
+#define TRACE_CLOSER
+#define TRACE_TAG_ON(tag)
+#define TRACE_TAG_OFF(tag)
+#define TRACE_TAG_HEADER(tag,indent)
+#define TRACE_TAG_ADD(tag, format, ...)
+#define TRACE_TAG_CLOSER(tag)
+#define TRACE_FUNC(format, ...)
+#define TRACE_FUNC_VOID
+#define TRACE_RETURN(format,x) return (x);
+#define TRACE_RETURN_VOID      return;
+#define TRACE(format, ...)
+#define TRACE_TAG_FUNC(tag, format, ...)
+#define TRACE_TAG_FUNC_VOID(tag)
+#define TRACE_TAG_RETURN(tag, format, x) return (x);
+#define TRACE_TAG_RETURN_VOID(tag)       return;
+#define TRACE_TAG(tag, format, ...)
+#define TRACE_RUN(code)
+#define TRACE_DO(code)
+#define TRACE_TAG_DO(tag, code)
+#define TRACE_TAG_VAR(tag) 0
+#endif
+
+#ifdef CRITCL_TRACER
+/* Tracing active. Macros expand to content.
+ */
+#define TRACE_PUSH_SCOPE(string) critcl_trace_push (string)
+#define TRACE_PUSH_FUNC          TRACE_PUSH_SCOPE (__func__)
+#define TRACE_POP                critcl_trace_pop()
+
+#define TRACE_ON  TRACE_TAG_ON  (THIS_FILE)
+#define TRACE_OFF TRACE_TAG_OFF (THIS_FILE)
+
+#define TRACE_HEADER(indent)   TRACE_TAG_HEADER (THIS_FILE, indent)
+#define TRACE_ADD(format, ...) TRACE_TAG_ADD    (THIS_FILE, format, __VA_ARGS__)
+#define TRACE_CLOSER           TRACE_TAG_CLOSER (THIS_FILE)
+
+#define TRACE_TAG_ON(tag)  static int TRACE_TAG_VAR (tag) = 1
+#define TRACE_TAG_OFF(tag) static int TRACE_TAG_VAR (tag) = 0
+#define TRACE_TAG_VAR(tag) __critcl_tag_ ## tag ## _status
+
+#define TRACE_TAG_HEADER(tag, indent)   critcl_trace_header (TRACE_TAG_VAR (tag), (indent), __FILE__, __LINE__)
+#define TRACE_TAG_ADD(tag, format, ...) critcl_trace_printf (TRACE_TAG_VAR (tag), format, __VA_ARGS__)
+#define TRACE_TAG_CLOSER(tag)           critcl_trace_closer (TRACE_TAG_VAR (tag))
+
+/* Highlevel (convenience) tracing.
+ */
+
+#define TRACE_FUNC(format, ...) TRACE_TAG_FUNC        (THIS_FILE, format, __VA_ARGS__)
+#define TRACE_FUNC_VOID         TRACE_TAG_FUNC_VOID   (THIS_FILE)
+#define TRACE_RETURN(format,x)  TRACE_TAG_RETURN      (THIS_FILE, format, x)
+#define TRACE_RETURN_VOID       TRACE_TAG_RETURN_VOID (THIS_FILE)
+#define TRACE(format, ...)      TRACE_TAG             (THIS_FILE, format, __VA_ARGS__)
+
+#define TRACE_TAG_FUNC(tag, format, ...) TRACE_PUSH_FUNC; TRACE_TAG_HEADER (tag,1); TRACE_TAG_ADD (tag, format, __VA_ARGS__); TRACE_TAG_CLOSER (tag)
+#define TRACE_TAG_FUNC_VOID(tag)         TRACE_PUSH_FUNC; TRACE_TAG_HEADER (tag,1); TRACE_TAG_ADD (tag, "(%s)", "void"); TRACE_TAG_CLOSER (tag)
+#define TRACE_TAG_RETURN(tag, format, x) TRACE_TAG_HEADER (tag,1); TRACE_TAG_ADD (tag, "%s", "RETURN = ") ; TRACE_TAG_ADD (tag, format, x) ; TRACE_TAG_CLOSER (tag) ; TRACE_POP ; return (x)
+#define TRACE_TAG_RETURN_VOID(tag)       TRACE_TAG_HEADER (tag,1); TRACE_TAG_ADD (tag, "RETURN %s", "(void)") ; TRACE_TAG_CLOSER (tag) ; TRACE_POP ; return
+#define TRACE_TAG(tag, format, ...)      TRACE_TAG_HEADER (tag,1); TRACE_TAG_ADD (tag, format, __VA_ARGS__) ; TRACE_TAG_CLOSER (tag)
+
+#define TRACE_RUN(code)         code
+#define TRACE_DO(code)          TRACE_TAG_DO (THIS_FILE, code)
+#define TRACE_TAG_DO(tag, code) if (TRACE_TAG_VAR (tag)) { code ; }
+
+/* Support functions used in the macros.
+ */
+
+extern void critcl_trace_push      (const char* scope);
+extern void critcl_trace_pop       (void);
+extern void critcl_trace_header    (int on, int indent, const char *filename, int line);
+extern void critcl_trace_printf    (int on, const char *pat, ...);
+extern void critcl_trace_closer    (int on);
+
+/* Support functions used by the implementation of "critcl::cproc".
+ */
+
+extern void critcl_trace_cmd_args   (const char* scope, int oc, Tcl_Obj*const* ov);
+extern int  critcl_trace_cmd_result (int status, Tcl_Interp* ip);
+
+#endif
+#endif /* __CRITCL_UTIL_TRACE_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/lib/critcl-cutil/trace/trace.c b/src/vfs/critcl.vfs/lib/critcl-cutil/trace/trace.c
new file mode 100644
index 00000000..f4e4ab82
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-cutil/trace/trace.c
@@ -0,0 +1,267 @@
+/*
+ * Copyright (c) 2017-2024 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+ * = = == === ===== ======== ============= =====================
+ */
+
+#include <critcl_alloc.h>
+#include <string.h>
+#include <stdarg.h>
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+#ifdef CRITCL_TRACER
+
+/* Tracking the stack of scopes,
+ * single-linked list,
+ * top to bottom.
+ */
+
+typedef struct scope_stack {
+    const char*         scope;
+    struct scope_stack* down;
+} scope_stack;
+
+/*
+ * = = == === ===== ======== ============= =====================
+ * Tracing state (stack of scopes, associated indentation level)
+ *
+ * API regexp for trace output:
+ *  (header printf* closer)*
+ *
+ * - closed == 1 :: post (closer)
+ * - closed == 0 :: post (header)
+ *
+ * [1] in (header) && !closed
+ *     => starting a new line in the middle of an incomplete line
+ *     => force closer
+ * [2] in (printf) && closed
+ *     => continuing a line which was interrupted by another (see [1])
+ *     => force header
+ */
+
+#define MSGMAX (1024*1024)
+
+#ifdef CRITCL_TRACE_NOTHREADS
+
+static scope_stack* top   = 0;
+static int          level = 0;
+static int          closed = 1;
+static char         msg [MSGMAX];
+
+#define SETUP
+#define TOP    top
+#define LEVEL  level
+#define CLOSED closed
+#define MSG    msg
+#define CHAN   stdout
+
+#else
+
+typedef struct ThreadSpecificData {
+    scope_stack* top;
+    int          level;
+    int          closed;
+    char         msg [MSGMAX];
+    FILE*        chan;
+} ThreadSpecificData;
+
+/* copied from tclInt.h */
+#define TCL_TSD_INIT(keyPtr) \
+    (ThreadSpecificData *)Tcl_GetThreadData((keyPtr), sizeof(ThreadSpecificData)) /* OK tcl9 */
+
+static Tcl_ThreadDataKey ctraceDataKey;
+
+#define TOP    tsdPtr->top
+#define LEVEL  tsdPtr->level
+#define CLOSED tsdPtr->closed
+#define MSG    tsdPtr->msg
+#define CHAN   chan()
+#define SETUP  ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&ctraceDataKey)
+
+// Very lazy channel initialization - First actual write
+static FILE* chan (void) {
+    SETUP;
+    if (!tsdPtr->chan) {
+	sprintf (MSG, "%p.trace", Tcl_GetCurrentThread());
+	tsdPtr->chan = fopen (MSG, "w");
+    }
+    return tsdPtr->chan;
+}
+
+#endif
+
+/*
+ * = = == === ===== ======== ============= =====================
+ * Internals
+ */
+
+static void
+indent (void)
+{
+    int i;
+    SETUP;
+    for (i = 0; i < LEVEL; i++) { fwrite(" ", 1, 1, CHAN); }
+    fflush (CHAN);
+}
+
+static void
+scope (void)
+{
+    SETUP;
+    if (!TOP) return;
+    fwrite (TOP->scope, 1, strlen(TOP->scope), CHAN);
+    fflush (CHAN);
+}
+
+static void
+separator (void)
+{
+    SETUP;
+    fwrite(" | ", 1, 3, CHAN);
+    fflush             (CHAN);
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ * API
+ */
+
+void
+critcl_trace_push (const char* scope)
+{
+    SETUP;
+    scope_stack* new = ALLOC (scope_stack);
+    new->scope = scope;
+    new->down  = TOP;
+    TOP        = new;
+    LEVEL     += 4;
+}
+
+void
+critcl_trace_pop (void)
+{
+    SETUP;
+    scope_stack* next = TOP->down;
+    LEVEL -= 4;
+    ckfree ((char*) TOP);
+    TOP = next;
+}
+
+void
+critcl_trace_closer (int on)
+{
+    if (!on) return;
+    SETUP;
+    fwrite ("\n", 1, 1, CHAN);
+    fflush (CHAN);
+    CLOSED = 1;
+}
+
+void
+critcl_trace_header (int on, int ind, const char* filename, int line)
+{
+    if (!on) return;
+    SETUP;
+    if (!CLOSED) critcl_trace_closer (1);
+    // location prefix
+#if 0 /* varying path length breaks indenting by call level :( */
+    if (filename) {
+	fprintf (CHAN, "%s:%6d", filename, line);
+	fflush  (CHAN);
+    }
+#endif
+    // indentation, scope, separator
+    if (ind) { indent (); }
+    scope ();
+    separator();
+    CLOSED = 0;
+}
+
+void
+critcl_trace_printf (int on, const char *format, ...)
+{
+    /*
+     * 1MB output-buffer. We may trace large data structures. This is also a
+     * reason why the implementation can be compiled out entirely.
+     */
+    int len;
+    va_list args;
+    if (!on) return;
+    SETUP;
+    if (CLOSED) critcl_trace_header (1, 1, 0, 0);
+
+    va_start (args, format);
+    len = vsnprintf (MSG, MSGMAX, format, args);
+    va_end (args);
+    fwrite (MSG, 1, len, CHAN);
+    fflush              (CHAN);
+}
+
+void
+critcl_trace_cmd_args (const char* scopename, int argc, Tcl_Obj*const* argv)
+{
+    int i;
+    critcl_trace_push (scopename);
+    for (i=0; i < argc; i++) {
+	// No location information
+	indent();
+	scope();
+	separator();
+	critcl_trace_printf (1, "ARG [%3d] = %p (^%d:%s) '%s'\n",
+			     i, argv[i], argv[i]->refCount,
+			     argv[i]->typePtr ? argv[i]->typePtr->name : "<unknown>",
+			     Tcl_GetString((Tcl_Obj*) argv[i]));
+    }
+}
+
+int
+critcl_trace_cmd_result (int status, Tcl_Interp* ip)
+{
+    Tcl_Obj*    robj = Tcl_GetObjResult (ip);
+    const char* rstr = Tcl_GetString (robj);
+    const char* rstate;
+    const char* rtype;
+    static const char* state_str[] = {
+	/* 0 */ "OK",
+	/* 1 */ "ERROR",
+	/* 2 */ "RETURN",
+	/* 3 */ "BREAK",
+	/* 4 */ "CONTINUE",
+    };
+    char buf [TCL_INTEGER_SPACE];
+    if (status <= TCL_CONTINUE) {
+	rstate = state_str [status];
+    } else {
+	sprintf (buf, "%d", status);
+	rstate = (const char*) buf;
+    }
+    if (robj->typePtr) {
+	rtype = robj->typePtr->name;
+    } else {
+	rtype = "<unknown>";
+    }
+
+    // No location information
+    indent();
+    scope();
+    separator();
+    critcl_trace_printf (1, "RESULT = %s %p (^%d:%s) '%s'\n",
+			 rstate, robj, robj->refCount, rtype, rstr);
+    critcl_trace_pop ();
+    return status;
+}
+
+#endif /*  CRITCL_TRACER */
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+/*
+ * local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/lib/critcl-emap/emap.tcl b/src/vfs/critcl.vfs/lib/critcl-emap/emap.tcl
new file mode 100644
index 00000000..4e5b0ebe
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-emap/emap.tcl
@@ -0,0 +1,696 @@
+## -*- tcl -*-
+# # ## ### ##### ######## ############# #####################
+# Pragmas for MetaData Scanner.
+# n/a
+
+# CriTcl Utility Package for en- and decoding an external enum.
+# Based on i-assoc.
+#
+# Copyright (c) 2014-2023 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+package provide critcl::emap 1.3.1
+
+# # ## ### ##### ######## ############# #####################
+## Requirements.
+
+package require Tcl    8.6 9   ; # Min supported version.
+package require critcl 3.1.11  ; # make, include -- dict portability
+package require critcl::iassoc
+
+namespace eval ::critcl::emap {}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: Embed C Code
+
+proc critcl::emap::def {name dict args} {
+    # dict: Tcl symbolic name -> (C int value (1))
+    #
+    # (Ad 1) Can be numeric, or symbolic, as long as it is a C int
+    #        expression in the end.
+
+    # args = options. Currently supported:
+    # * -nocase : case-insensitive strings on encoding.
+    # * -mode   : list of use cases, access case: tcl, c (default: tcl)
+
+    Options $args
+    Index $dict id symbols last
+    # symbols :: list of words, lexicographically sorted
+    # id   :: symbol -> index (sorted)
+    # last :: number of symbols
+
+    Header $name
+    ConstStringTable $name $symbols $dict $nocase $last
+    set isdirect [DecideIfDirect $dict min max direct]
+    if {$isdirect} {
+	DecodeDirect $name $min $max id direct
+    }
+    Tcl  Iassoc       $name $symbols $dict $nocase $last
+    Tcl  EncoderTcl   $name                $nocase
+    Tcl  DecoderTcl   $name $isdirect              $last
+    List Decoder+List $name
+    Tcl  ArgType      $name
+    Tcl  ResultType   $name
+    C    EncoderC     $name                $nocase $last
+    C    DecoderC     $name $isdirect              $last
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## Internals
+
+proc critcl::emap::DecoderTcl {name isdirect last} {
+    if {$isdirect} {
+	DecoderTclDirect $name
+    } else {
+	DecoderTclSearch $name $last
+    }
+    return
+}
+
+proc critcl::emap::DecoderTclSearch {name last} {
+    # Decoder based on linear search. Because we either
+    # - see some symbolic values (= do not know actual value)
+    # - the direct mapping table would be too large (> 50 entries).
+    lappend map @NAME@  $name
+    lappend map @UNAME@ [string toupper $name]
+    lappend map @LAST@  $last
+
+    critcl::ccode \n[critcl::at::here!][string map $map {
+	Tcl_Obj*
+	@NAME@_decode (Tcl_Interp* interp, int state)
+	{
+	    /* Decode via linear search */
+	    char buf [20];
+	    int i;
+	    @NAME@_iassoc_data context = @NAME@_iassoc (interp);
+
+	    for (i = 0; i < @LAST@; i++)  {
+		if (@NAME@_emap_state [i] != state) continue;
+		return context->tcl [i];
+	    }
+
+	    sprintf (buf, "%d", state);
+	    Tcl_AppendResult (interp, "Invalid @NAME@ state code ", buf, NULL);
+	    Tcl_SetErrorCode (interp, "@UNAME@", "STATE", NULL);
+	    return NULL;
+	}
+    }]
+    return
+}
+
+proc critcl::emap::DecodeDirect {name min max iv dv} {
+    upvar 1 $iv id $dv direct
+    # Decoder based on a direct mapping table. We can do this because
+    # we found that all the values are pure integers, i.e. we know
+    # them in detail, and that the table is not too big (< 50 entries).
+
+    lassign [DirectTable $min $max id direct] table size
+
+    lappend map @NAME@      $name
+    lappend map @DIRECT@    $table
+    lappend map @SIZE@      $size
+    lappend map @MIN@       $min
+    lappend map @MAX@       $max
+    lappend map @OFFSET@    [Offset $min]
+
+    critcl::ccode \n[critcl::at::here!][string map $map {
+	static int @NAME@_direct (int state)
+	{
+	    static const int direct [@SIZE@] = {@DIRECT@
+	    };
+	    /* Check limits first */
+	    if (state < @MIN@) { return -1; }
+	    if (state > @MAX@) { return -1; }
+	    /* Map to string index */
+	    return direct [state@OFFSET@];
+	}
+    }]
+}
+
+proc critcl::emap::DecoderTclDirect {name} {
+    lappend map @NAME@      $name
+    lappend map @UNAME@     [string toupper $name]
+
+    critcl::ccode \n[critcl::at::here!][string map $map {
+	Tcl_Obj*
+	@NAME@_decode (Tcl_Interp* interp, int state)
+	{
+	    /* Decode via direct mapping */
+	    char buf [20];
+	    int i;
+	    @NAME@_iassoc_data context = @NAME@_iassoc (interp);
+
+	    i = @NAME@_direct (state);
+	    if (i < 0) { goto error; }
+
+	    /* Return the chosen string */
+	    return context->tcl [i];
+
+	    error:
+	    sprintf (buf, "%d", state);
+	    Tcl_AppendResult (interp, "Invalid @NAME@ state code ", buf, NULL);
+	    Tcl_SetErrorCode (interp, "@UNAME@", "STATE", NULL);
+	    return NULL;
+	}
+    }]
+    return
+}
+
+proc critcl::emap::Decoder+List {name} {
+    lappend map @NAME@      $name
+    lappend map @UNAME@     [string toupper $name]
+
+    # Note on perf: O(mc), for m states in the definition, and c
+    # states to convert. As the number of declared states is however
+    # fixed, and small, we can say O(c) for some larger constant
+    # factor.
+
+    critcl::ccode \n[critcl::at::here!][string map $map {
+	Tcl_Obj*
+	@NAME@_decode_list (Tcl_Interp* interp, int c, int* state)
+	{
+	    int k;
+	    Tcl_Obj* result = Tcl_NewListObj (0, 0);
+	    /* Failed to create, abort immediately */
+	    if (!result) {
+		return result;
+	    }
+	    for (k=0; k < c; k++) {
+		Tcl_Obj* lit = @NAME@_decode (interp, state[k]);
+		if (lit && (TCL_OK == Tcl_ListObjAppendElement (interp, result, lit))) {
+		    continue;
+		}
+		/* Failed to translate or append; release and abort */
+		Tcl_DecrRefCount (result);
+		return NULL;
+	    }
+	    return result;
+	}
+    }]
+    return
+}
+
+proc critcl::emap::DirectTable {min max iv dv} {
+    upvar 1 $iv id $dv direct
+
+    set table {}
+    set fmt   %[string length $max]d
+
+    for {set i $min} {$i <= $max} {incr i} {
+	if {[info exists direct($i)]} {
+	    set sym [lindex $direct($i) 0]
+	    set code $id($sym)
+	    lappend table "$code,\t/* [format $fmt $i] <=> \"$sym\" */"
+	} else {
+	    lappend table "-1,"
+	}
+    }
+
+    return [list "\n\t\t    [join $table "\n\t\t    "]" [llength $table]]
+}
+
+proc critcl::emap::Offset {min} {
+    if {$min == 0} {
+	return ""
+    } elseif {$min < 0} {
+	return "+[expr {0-$min}]"
+    } else {
+	# Note: The 0+... ensures that we get a decimal number.
+	return "-[expr {0+$min}]"
+    }
+}
+
+proc critcl::emap::DecideIfDirect {dict minv maxv dv} {
+    upvar 1 $minv min $maxv max $dv direct
+
+    set min  {}
+    set max  {}
+
+    dict for {sym value} $dict {
+	# Manage a direct mapping table from stati to strings, if we
+	# can see the numeric value of all stati.
+	if {[string is integer -strict $value]} {
+	    if {($min eq {}) || ($value < $min)} { set min $value }
+	    if {($max eq {}) || ($value > $max)} { set max $value }
+	    lappend direct($value) $sym
+	} else {
+	    return 0
+	}
+    }
+
+    if {$min eq {}}        { return 0 }
+    if {$max eq {}}        { return 0 }
+    if {($max-$min) >= 50} { return 0 }
+    return 1
+}
+
+proc critcl::emap::EncoderTcl {name nocase} {
+    if {$nocase} {
+	EncoderTclNocase $name
+    } else {
+	EncoderTclPlain $name
+    }
+    return
+}
+
+proc critcl::emap::EncoderTclPlain {name} {
+    lappend map @NAME@ $name
+    lappend map @UNAME@ [string toupper $name]
+
+    critcl::ccode \n[critcl::at::here!][string map $map {
+	int
+	@NAME@_encode (Tcl_Interp* interp,
+		       Tcl_Obj*    state,
+		       int*        result)
+	{
+	    int id, res;
+	    res = Tcl_GetIndexFromObj (interp, state, @NAME@_emap_cstr, "@NAME@", 0, &id);
+	    if (res != TCL_OK) {
+		Tcl_SetErrorCode (interp, "@UNAME@", "STATE", NULL);
+		return TCL_ERROR;
+	    }
+
+	    *result = @NAME@_emap_state [id];
+	    return TCL_OK;
+	}
+    }]
+    return
+}
+
+proc critcl::emap::EncoderTclNocase {name} {
+    lappend map @NAME@ $name
+    lappend map @UNAME@ [string toupper $name]
+
+    critcl::ccode \n[critcl::at::here!][string map $map {
+	int
+	@NAME@_encode (Tcl_Interp* interp,
+		       Tcl_Obj*    state,
+		       int*        result)
+	{
+	    int id, res;
+	    /* -nocase :: We duplicate the state string, making it unshared,
+	     * allowing us to convert in place. As the string may change
+	     * length (shrinking) we have to reset the length after
+	     * conversion.
+	     */
+	    state = Tcl_DuplicateObj (state);
+	    Tcl_SetObjLength(state, Tcl_UtfToLower (Tcl_GetString (state))); /* OK tcl9 */
+	    res = Tcl_GetIndexFromObj (interp, state, @NAME@_emap_cstr, "@NAME@", 0, &id);
+	    Tcl_DecrRefCount (state);
+	    if (res != TCL_OK) {
+		Tcl_SetErrorCode (interp, "@UNAME@", "STATE", NULL);
+		return TCL_ERROR;
+	    }
+
+	    *result = @NAME@_emap_state [id];
+	    return TCL_OK;
+	}
+    }]
+    return
+}
+
+proc critcl::emap::EncoderC {name nocase last} {
+    if {$nocase} {
+	EncoderCNocase $name $last
+    } else {
+	EncoderCPlain $name $last
+    }
+    return
+}
+
+proc critcl::emap::EncoderCPlain {name last} {
+    lappend map @NAME@ $name
+    lappend map @UNAME@ [string toupper $name]
+    lappend map @LAST@  $last
+
+    # case-sensitive search
+    critcl::ccode \n[critcl::at::here!][string map $map {
+	#include <string.h>
+
+	int
+	@NAME@_encode_cstr (const char* state)
+	{
+	    int id;
+	    /* explicit linear search */
+	    for (id = 0; id < @LAST@; id++)  {
+		if (strcmp (state, @NAME@_emap_cstr [id]) != 0) continue;
+		return @NAME@_emap_state [id];
+	    }
+	    return -1;
+	}
+    }]
+    return
+}
+
+proc critcl::emap::EncoderCNocase {name last} {
+    lappend map @NAME@ $name
+    lappend map @UNAME@ [string toupper $name]
+    lappend map @LAST@  $last
+
+    # case-insensitive search
+    critcl::ccode \n[critcl::at::here!][string map $map {
+	#include <string.h>
+
+	int
+	@NAME@_encode_cstr (const char* state)
+	{
+	    /* -nocase :: We duplicate the state string, allowing us to
+	     * convert in place. As the string may change length (shrink)
+	     * we have to re-terminate it after conversion.
+	     */
+	    int id, slen = 1 + strlen (state);
+	    char* lower = ckalloc (slen);
+
+	    memcpy (lower, state, slen);
+	    lower [Tcl_UtfToLower (lower)] = '\0';
+
+	    /* explicit linear search */
+	    for (id = 0; id < @LAST@; id++)  {
+		if (strcmp (lower, @NAME@_emap_cstr [id]) != 0) continue;
+		ckfree ((char*) lower);
+		return @NAME@_emap_state [id];
+	    }
+	    ckfree ((char*) lower);
+	    return -1;
+	}
+    }]
+    return
+}
+
+proc critcl::emap::DecoderC {name isdirect last} {
+    if {$isdirect} {
+	DecoderCDirect $name
+    } else {
+	DecoderCSearch $name $last
+    }
+    return
+}
+
+proc critcl::emap::DecoderCSearch {name last} {
+    # Decoder based on linear search. Because we either
+    # - see some symbolic values (= do not know actual value)
+    # - the direct mapping table would be too large (> 50 entries).
+    lappend map @NAME@  $name
+    lappend map @UNAME@ [string toupper $name]
+    lappend map @LAST@  $last
+
+    critcl::ccode \n[critcl::at::here!][string map $map {
+	const char*
+	@NAME@_decode_cstr (int state)
+	{
+	    /* Decode via linear search */
+	    int id;
+	    for (id = 0; id < @LAST@; id++)  {
+		if (@NAME@_emap_state [id] != state) continue;
+		return @NAME@_emap_cstr [id];
+	    }
+	    return NULL;
+	}
+    }]
+    return
+}
+
+proc critcl::emap::DecoderCDirect {name} {
+    lappend map @NAME@      $name
+    lappend map @UNAME@     [string toupper $name]
+
+    critcl::ccode \n[critcl::at::here!][string map $map {
+	const char*
+	@NAME@_decode_cstr (int state)
+	{
+	    /* Decode via direct mapping */
+	    int i = @NAME@_direct (state);
+	    if (i < 0) { return NULL; }
+	    /* Return the chosen string */
+	    return @NAME@_emap_cstr [i];
+	}
+    }]
+    return
+}
+
+proc critcl::emap::ResultType {name} {
+    lappend map @NAME@ $name
+    critcl::resulttype $name \n[critcl::at::here!][string map $map {
+	/* @NAME@_decode result is 0-refcount */
+	{ Tcl_Obj* ro = @NAME@_decode (interp, rv);
+	if (ro == NULL) { return TCL_ERROR; }
+	Tcl_SetObjResult (interp, ro);
+	return TCL_OK; }
+    }] int
+    return
+}
+
+proc critcl::emap::ArgType {name} {
+    lappend map @NAME@ $name
+    critcl::argtype $name \n[critcl::at::here!][string map $map {
+	if (@NAME@_encode (interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    }] int int
+    return
+}
+
+proc critcl::emap::Header {name} {
+    # I. Generate a header file for inclusion by other parts of the
+    #    package, i.e. csources. Include the header here as well, for
+    #    the following blocks of code.
+    #
+    #    Declaration of the en- and decoder functions.
+    upvar 1 mode mode
+    append h [HeaderIntro      $name]
+    append h [Tcl  HeaderTcl   $name]
+    append h [List Header+List $name]
+    append h [C    HeaderC     $name]
+    append h [HeaderEnd        $name]
+    critcl::include [critcl::make ${name}.h $h]
+    return
+}
+
+proc critcl::emap::HeaderIntro {name} {
+    lappend map @NAME@  $name
+    return \n[critcl::at::here!][string map $map {
+	#ifndef @NAME@_EMAP_HEADER
+	#define @NAME@_EMAP_HEADER
+
+	#include <tcl.h>
+    }]
+}
+
+proc critcl::emap::HeaderEnd {name} {
+    lappend map @NAME@ $name
+    return [string map $map {
+	#endif /* @NAME@_EMAP_HEADER */
+    }]
+}
+
+proc critcl::emap::HeaderTcl {name} {
+    lappend map @NAME@ $name
+    return \n[critcl::at::here!][string map $map {
+	/* "tcl"
+	 * Encode a Tcl string into the corresponding state code
+	 * Decode a state into the corresponding Tcl string
+	 */
+	extern int      @NAME@_encode (Tcl_Interp* interp, Tcl_Obj* state, int* result);
+	extern Tcl_Obj* @NAME@_decode (Tcl_Interp* interp, int state);
+    }]
+}
+
+proc critcl::emap::Header+List {name} {
+    lappend map @NAME@ $name
+    return \n[critcl::at::here!][string map $map {
+	/* "+list"
+	 * Decode a set of states into a list of the corresponding Tcl strings
+	 */
+	extern Tcl_Obj* @NAME@_decode_list (Tcl_Interp* interp, int c, int* state);
+    }]
+}
+
+proc critcl::emap::HeaderC {name} {
+    lappend map @NAME@ $name
+    return \n[critcl::at::here!][string map $map {
+	/* "c"
+	 * Encode a C string into the corresponding state code
+	 * Decode a state into the corresponding C string
+	 */
+	extern int         @NAME@_encode_cstr (const char* state);
+	extern const char* @NAME@_decode_cstr (int state);
+    }]
+}
+
+proc critcl::emap::Iassoc {name symbols dict nocase last} {
+    upvar 1 mode mode
+    critcl::iassoc def ${name}_iassoc {} \
+	[IassocStructure $last] \
+	[IassocInit  $name $symbols $dict $nocase $last] \
+	[IassocFinal       $symbols $dict]
+    return
+}
+
+proc critcl::emap::IassocStructure {last} {
+    lappend map @LAST@ $last
+    return \n[critcl::at::here!][string map $map {
+	Tcl_Obj* tcl [@LAST@]; /* State name, Tcl_Obj*, sharable */
+    }]
+}
+
+proc critcl::emap::IassocInit {name symbols dict nocase last} {
+    set id -1
+    foreach sym $symbols {
+	set value [dict get $dict $sym]
+	incr id
+	if {$nocase} { set sym [string tolower $sym] }
+	set map [list @ID@ $id @SYM@ $sym @VALUE@ $value @NAME@ $name]
+
+	# iassoc initialization, direct from string, no C level
+	append init \n[critcl::at::here!][string map $map {
+	    data->tcl [@ID@] = Tcl_NewStringObj (@NAME@_emap_cstr[@ID@], -1);
+	    Tcl_IncrRefCount (data->tcl [@ID@]);
+	}]
+    }
+    return $init
+}
+
+proc critcl::emap::IassocFinal {symbols dict} {
+    set id -1
+    foreach sym $symbols {
+	incr id
+	set map [list @ID@ $id]
+	append final \n[critcl::at::here!][string map $map {
+	    Tcl_DecrRefCount (data->tcl [@ID@]);
+	}]
+    }
+    return $final
+}
+
+proc critcl::emap::ConstStringTable {name symbols dict nocase last} {
+    # C level table initialization (constant data)
+    foreach sym $symbols {
+	set value [dict get $dict $sym]
+	if {$nocase} { set sym [string tolower $sym] }
+	append ctable "\n\t    \"${sym}\","
+	append stable "\n\t    ${value},"
+    }
+    append ctable "\n\t    0"
+    set stable [string trimright $stable ,]
+
+    lappend map @NAME@    $name
+    lappend map @STRINGS@ $ctable
+    lappend map @STATES@  $stable
+    lappend map @LAST@    $last
+
+    critcl::ccode [critcl::at::here!][string map $map {
+	/* State names, C string */
+	static const char* @NAME@_emap_cstr [@LAST@+1] = {@STRINGS@
+	};
+
+	/* State codes */
+	static int @NAME@_emap_state [@LAST@] = {@STATES@
+	};
+    }]
+    return
+}
+
+proc critcl::emap::C {args} {
+    upvar 1 mode mode
+    if {!$mode(c)} return
+    return [uplevel 1 $args]
+}
+
+proc critcl::emap::!C {args} {
+    upvar 1 mode mode
+    if {$mode(c)} return
+    return [uplevel 1 $args]
+}
+
+proc critcl::emap::Tcl {args} {
+    upvar 1 mode mode
+    if {!$mode(tcl)} return
+    return [uplevel 1 $args]
+}
+
+proc critcl::emap::!Tcl {args} {
+    upvar 1 mode mode
+    if {$mode(tcl)} return
+    return [uplevel 1 $args]
+}
+
+proc critcl::emap::List {args} {
+    upvar 1 mode mode
+    if {!$mode(+list)} return
+    return [uplevel 1 $args]
+}
+
+proc critcl::emap::!List {args} {
+    upvar 1 mode mode
+    if {$mode(+list)} return
+    return [uplevel 1 $args]
+}
+
+proc critcl::emap::Index {dict iv sv lv} {
+    upvar 1 $iv id $sv symbols $lv last
+    # For the C level search we want lexicographically sorted elements
+    set symbols [lsort -dict [dict keys $dict]]
+    set i 0
+    foreach s $symbols {
+	set id($s) $i
+	incr i
+    }
+    set last $i
+    # id :: symbol -> index (sorted)
+    return
+}
+
+proc critcl::emap::Options {options} {
+    upvar 1 nocase nocase mode mode
+    set nocase 0
+    set use    tcl
+
+    while {[llength $options]} {
+	set options [lassign $options o]
+	switch -glob -- $o {
+	    -nocase -
+	    -nocas -
+	    -noca -
+	    -noc -
+	    -no -
+	    -n { set nocase 1 }
+	    -mode -
+	    -mod -
+	    -mo -
+	    -m { set options [lassign $options use] }
+	    -* -
+	    default {
+		return -code error -errorcode {CRITCL EMAP INVALID-OPTION} \
+		    "Expected option -nocase, or -use, got \"$o\""
+	    }
+	}
+    }
+    Use $use
+    return
+}
+
+proc critcl::emap::Use {use} {
+    # Use cases: tcl, c, both
+    upvar 1 mode mode
+    set uses 0
+    foreach u {c tcl +list} { set mode($u) 0 }
+    foreach u $use          { set mode($u) 1 ; incr uses }
+    if {$mode(+list)} { set mode(tcl) 1 }
+    if {$uses} return
+    return -code error "Need at least one use case (c, tcl, or +list)"
+}
+
+# # ## ### ##### ######## ############# #####################
+## Export API
+
+namespace eval ::critcl::emap {
+    namespace export def
+    catch { namespace ensemble create }
+}
+
+namespace eval ::critcl {
+    namespace export emap
+    catch { namespace ensemble create }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+return
diff --git a/src/vfs/critcl.vfs/lib/critcl-emap/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/critcl-emap/pkgIndex.tcl
new file mode 100644
index 00000000..f608bf57
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-emap/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+package ifneeded critcl::emap 1.3.1 [list source [file join $dir emap.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/critcl-enum/enum.tcl b/src/vfs/critcl.vfs/lib/critcl-enum/enum.tcl
new file mode 100644
index 00000000..7541e9be
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-enum/enum.tcl
@@ -0,0 +1,151 @@
+## -*- tcl -*-
+# # ## ### ##### ######## ############# #####################
+# Pragmas for MetaData Scanner.
+# n/a
+
+# CriTcl Utility Commands. Generation of functions handling conversion
+# from and to a C enum. Not a full Tcl_ObjType. Based on
+# Tcl_GetIndexFromObj() instead.
+
+package provide critcl::enum 1.2.1
+
+# # ## ### ##### ######## ############# #####################
+## Requirements.
+
+package require Tcl              8.6 9  ; # Min supported version.
+package require critcl           3.1.11 ; # make, include -- dict portability
+package require critcl::literals 1.1    ; # String pool for conversion to Tcl.
+
+namespace eval ::critcl::enum {}
+
+# # ## ### ##### ######## ############# #####################
+## API: Generate the declaration and implementation files for the enum.
+
+proc ::critcl::enum::def {name dict {use tcl}} {
+    # Arguments are
+    # - the C name of the enumeration, and
+    # - dict of strings to convert. Key is the symbolic C name, value
+    #   is the string. Numeric C value is in the order of the strings in
+    #   the dict, treating it as list for that case.
+    #
+    # dict: C symbolic name -> Tcl string (Tcl symbolic name).
+
+    if {![dict size $dict]} {
+	return -code error -errorcode {CRITCL ENUM DEF INVALID} \
+	    "Expected an enum definition, got empty string"
+    }
+
+    set plist 0
+    foreach m $use {
+	switch $m {
+	    tcl   {}
+	    +list { set plist 1 }
+	    default {
+		return -code error -errorcode {CRITCL ENUM DEF MODE INVALID} \
+		    "Unknown mode $m, expected one of \"+list\", or \"tcl\""
+	    }
+	}
+    }
+
+    critcl::literals::def ${name}_pool $dict $use
+
+    # <name>_pool_names = C enum of symbolic names, and implied numeric values.
+    # <name>_pool.h     = Header
+    # <name>_pool ( interp, code ) => Tcl_Obj* :: up-conversion C to Tcl.
+
+    # Exporting:
+    # Header    <name>.h
+    # Function  <name>_ToObj      (interp, code) -> obj
+    # Function  <name>_ToObjList  (interp, count, code*) -> obj (**)
+    # Function  <name>_GetFromObj (interp, obj, flags, &code) -> Tcl code
+    # Enum type <name>_names
+    #
+    # (**) Mode +list only.
+
+    dict for {sym str} $dict {
+	lappend table "\t\t\"$str\","
+    }
+
+    lappend map @NAME@   $name
+    lappend map @TABLE@  \n[join $table \n]
+    lappend map @TSIZE@  [llength $table]
+    lappend map @TSIZE1@ [expr {1 + [llength $table]}]
+
+    if {$plist} {
+	lappend map @PLIST@ \
+	    "\n	#define ${name}_ToObjList(i,c,l) (${name}_pool_list(i,c,l))"
+    } else {
+	lappend map @PLIST@ ""
+    }
+
+    critcl::include [critcl::make ${name}.h \n[critcl::at::here!][string map $map {
+	#ifndef @NAME@_HEADER
+	#define @NAME@_HEADER
+	#include <@NAME@_pool.h>
+	#include <tcl.h>
+
+	typedef @NAME@_pool_names @NAME@;
+	#define @NAME@_LAST @NAME@_pool_name_LAST
+
+	extern int
+	@NAME@_GetFromObj (Tcl_Interp*   interp,
+			   Tcl_Obj*      obj,
+			   int           flags,
+			   int*          literal);
+
+	#define @NAME@_ToObj(i,l) (@NAME@_pool(i,l))@PLIST@
+	#endif
+    }]]
+
+    # Create second function, down-conversion Tcl to C.
+
+    critcl::ccode [critcl::at::here!][string map $map {
+	extern int
+	@NAME@_GetFromObj (Tcl_Interp*   interp,
+			   Tcl_Obj*      obj,
+			   int           flags,
+			   int*          literal )
+	{
+	    static const char* strings[@TSIZE1@] = {@TABLE@
+		NULL
+	    };
+
+	    return Tcl_GetIndexFromObj (interp, obj, strings,
+					"@NAME@",
+					flags, literal);
+	}
+    }]
+
+
+    # V. Define convenient argument- and result-type definitions
+    #    wrapping the de- and encoder functions for use by cprocs.
+
+    critcl::argtype $name \n[critcl::at::here!][string map $map {
+	if (@NAME@_GetFromObj (interp, @@, TCL_EXACT, &@A) != TCL_OK) return TCL_ERROR;
+    }] int int
+
+    critcl::argtype ${name}-prefix \n[critcl::at::here!][string map $map {
+	if (@NAME@_GetFromObj (interp, @@, 0, &@A) != TCL_OK) return TCL_ERROR;
+    }] int int
+
+    # Use the underlying literal pool directly.
+    critcl::resulttype $name = ${name}_pool
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## Export API
+
+namespace eval ::critcl::enum {
+    namespace export def
+    catch { namespace ensemble create }
+}
+
+namespace eval ::critcl {
+    namespace export enum
+    catch { namespace ensemble create }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+return
diff --git a/src/vfs/critcl.vfs/lib/critcl-enum/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/critcl-enum/pkgIndex.tcl
new file mode 100644
index 00000000..f7a9e188
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-enum/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+package ifneeded critcl::enum 1.2.1 [list source [file join $dir enum.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/critcl-iassoc/iassoc.tcl b/src/vfs/critcl.vfs/lib/critcl-iassoc/iassoc.tcl
new file mode 100644
index 00000000..691d5cae
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-iassoc/iassoc.tcl
@@ -0,0 +1,182 @@
+## -*- tcl -*-
+# # ## ### ##### ######## ############# #####################
+# Pragmas for MetaData Scanner.
+# @mdgen OWNER: iassoc.h
+
+# CriTcl Utility Commands. Specification of a C function and structure
+# associated with an interpreter made easy.
+
+package provide critcl::iassoc 1.2.1
+
+# # ## ### ##### ######## ############# #####################
+## Requirements.
+
+package require Tcl    8.6 9  ; # Min supported version.
+package require critcl 3.1.13 ; # Need 'meta?' to get the package name.
+                                # Need 'Deline' helper.
+package require critcl::util  ; # Use the package's Get/Put commands.
+
+namespace eval ::critcl::iassoc {}
+
+# # ## ### ##### ######## ############# #####################
+## API: Generate the declaration and implementation files for the iassoc.
+
+proc ::critcl::iassoc::def {name arguments struct constructor destructor} {
+    critcl::at::caller
+    critcl::at::incrt $arguments   ; set sloc [critcl::at::get*]
+    critcl::at::incrt $struct      ; set cloc [critcl::at::get*]
+    critcl::at::incrt $constructor ; set dloc [critcl::at::get]
+
+    set struct      $sloc$struct
+    set constructor $cloc$constructor
+    set destructor  $dloc$destructor
+
+    # Arguments:
+    # - name of the C function which will provide access to the
+    #   structure. This name, with a fixed prefix is also used to
+    #   identify the association within the interpreter, and for
+    #   the structure's type.
+    #
+    # - C code declaring the structure's contents.
+    # - C code executed to initialize the structure.
+    # - C code executed to destroy the structure.
+
+    # Note that this is, essentially, a singleton object, without
+    # methods.
+
+    # Pull the package we are working on out of the system.
+
+    set package  [critcl::meta? name]
+    set qpackage [expr {[string match ::* $package]
+			? "$package"
+			: "::$package"}]
+    lassign [uplevel 1 [list ::critcl::name2c $qpackage]] pns pcns package cpackage
+
+    #puts "%%% pNS  |$pns|"
+    #puts "%%% Pkg  |$package|"
+    #puts "%%% pCNS |$pcns|"
+    #puts "%%% cPkg |$cpackage|"
+    #puts "%%% Name |$name|"
+    #puts "@@@ <<$data>>"
+
+    set stem  ${pcns}${cpackage}_iassoc_${name}
+    set type  ${name}_data
+    set label critcl::iassoc/p=$package/a=$name
+
+    set anames {}
+    if {[llength $arguments]} {
+	foreach {t v} $arguments {
+	    lappend alist "$t $v"
+	    lappend anames $v
+	}
+	set arguments ", [join $alist {, }]"
+	set anames ", [join $anames {, }]"
+    }
+
+    lappend map "\t" {}
+    lappend map @package@     $package
+    lappend map @name@        $name
+    lappend map @stem@        $stem
+    lappend map @label@       $label
+    lappend map @type@        $type
+    lappend map @struct@      $struct
+    lappend map @argdecls@    $arguments
+    lappend map @argnames@    $anames
+    lappend map @constructor@ $constructor
+    lappend map @destructor@  $destructor
+
+    #puts T=[string length $template]
+
+    critcl::include [critcl::make ${name}.h \n[critcl::at::here!][string map $map {
+	#ifndef @name@_HEADER
+	#define @name@_HEADER
+
+	#include <tcl.h>
+
+	typedef struct @type@__ {
+	@struct@
+	} @type@__;
+	typedef struct @type@__* @type@;
+
+	extern @type@
+	@name@ (Tcl_Interp* interp@argdecls@);
+
+	#endif
+    }]]
+
+    # Note: Making the .c code a `csources` instead of including it
+    # directly is a backward incompatible API change (The C code does
+    # not see any preceding includes. Which may define things used
+    # in/by the user's constructor. Breaks the users of iassoc, like
+    # bitmap, emap, etc. -- change defered --
+    critcl::include [critcl::make ${name}.c \n[critcl::at::here!][string map $map {
+	/*
+	 * For package "@package@".
+	 * Implementation of Tcl Interpreter Association "@name@".
+	 *
+	 * Support functions for structure creation and destruction.
+	 */
+
+	static void
+	@stem@_Release (@type@ data, Tcl_Interp* interp)
+	{
+	    @destructor@
+	    ckfree((char*) data);
+	}
+
+	static @type@
+	@stem@_Init (Tcl_Interp* interp@argdecls@)
+	{
+	    @type@ data = (@type@) ckalloc (sizeof (@type@__));
+
+	    @constructor@
+	    return data;
+
+	error:
+	    ckfree ((char*) data);
+	    return NULL;
+	}
+
+	/*
+	 * Structure accessor, automatically creating it if the
+	 * interpreter does not have it already, setting it up for
+	 * destruction on interpreter shutdown.
+	 */
+
+	@type@
+	@name@ (Tcl_Interp* interp@argdecls@)
+	{
+	    #define KEY "@label@"
+
+	    Tcl_InterpDeleteProc* proc = (Tcl_InterpDeleteProc*) @stem@_Release;
+	    @type@ data;
+
+	    data = Tcl_GetAssocData (interp, KEY, &proc);
+	    if (data) {
+		return data;
+	    }
+
+	    data = @stem@_Init (interp@argnames@);
+
+	    if (data) {
+		Tcl_SetAssocData (interp, KEY, proc, (ClientData) data);
+	    }
+
+	    return data;
+	    #undef KEY
+	}
+    }]]
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## Export API
+
+namespace eval ::critcl::iassoc {
+    namespace export def
+    catch { namespace ensemble create }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+return
diff --git a/src/vfs/critcl.vfs/lib/critcl-iassoc/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/critcl-iassoc/pkgIndex.tcl
new file mode 100644
index 00000000..61ee1c52
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-iassoc/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+package ifneeded critcl::iassoc 1.2.1 [list source [file join $dir iassoc.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/critcl-literals/literals.tcl b/src/vfs/critcl.vfs/lib/critcl-literals/literals.tcl
new file mode 100644
index 00000000..feaf5ac6
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-literals/literals.tcl
@@ -0,0 +1,330 @@
+## -*- tcl -*-
+# # ## ### ##### ######## ############# #####################
+# Pragmas for MetaData Scanner.
+# n/a
+
+# CriTcl Utility Package for Shared Tcl_Obj* literals of a package.
+# Based on critcl::iassoc.
+#
+# Copyright (c) 20??-2023 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+package provide critcl::literals 1.4.1
+
+# # ## ### ##### ######## ############# #####################
+## Requirements.
+
+package require Tcl    8.6 9   ; # Min supported version.
+package require critcl 3.1.11  ; # make, include -- dict portability
+package require critcl::iassoc
+
+namespace eval ::critcl::literals {}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: Embed C Code
+
+proc critcl::literals::def {name dict {use tcl}} {
+    # dict :: map (C symbolic name -> string)
+    Use $use
+    Header             $name $dict
+
+    C ConstStringTable $name $dict
+    C AccessorC        $name
+
+    Tcl Iassoc         $name $dict
+    Tcl AccessorTcl    $name
+    Tcl ResultType     $name
+
+    +List AccessorTcl+List $name
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## Internals
+
+proc critcl::literals::Use {use} {
+    # Use cases: tcl, c, both, +list-mode
+    upvar 1 mode mode
+    set uses 0
+    foreach u {c tcl +list} { set mode($u) 0 }
+    foreach u $use    { set mode($u) 1 ; incr uses }
+    # +list-mode is an extension of tcl mode, thus implies it
+    if {$mode(+list)} { set mode(tcl) 1 }
+    if {$uses} return
+    return -code error "Need at least one use case (c, +list, or tcl)"
+}
+
+proc critcl::literals::ConstStringTable {name dict} {
+    # C level table initialization (constant data)
+    dict for {sym string} $dict {
+	append ctable "\n\t\"${string}\","
+    }
+    append ctable "\n\t0"
+
+    lappend map @NAME@    $name
+    lappend map @STRINGS@ $ctable
+    critcl::ccode [critcl::at::here!][string map $map {
+	static const char* @NAME@_literal[] = {
+	    @STRINGS@
+	};
+    }]
+    return
+}
+
+proc critcl::literals::Iassoc {name dict} {
+    upvar 1 mode mode
+    lappend map @NAME@  $name
+    critcl::iassoc def ${name}_iassoc {} \n[critcl::at::here!][string map $map {
+	/* Array of the string literals, indexed by the symbolic names */
+	Tcl_Obj* literal [@NAME@_name_LAST];
+    }] [IassocInit $name $dict] [IassocFinal $dict]
+    return
+}
+
+proc critcl::literals::IassocFinal {dict} {
+    # Finalization code for iassoc structures
+    dict for {sym string} $dict {
+	append final "\n[critcl::at::here!]\n\tTcl_DecrRefCount (data->literal \[$sym\]);"
+    }
+    return $final
+}
+
+proc critcl::literals::IassocInit {name dict} {
+    # Initialization code for iassoc structures.
+    # Details dependent on if C is supported together with Tcl, or not.
+    upvar 1 mode mode
+    return [C IassocInitWithC $name $dict][!C IassocInitTcl $dict]
+}
+
+proc critcl::literals::IassocInitWithC {name dict} {
+    dict for {sym string} $dict {
+	set map [list @SYM@ $sym @NAME@ $name]
+	append init \n[critcl::at::here!][string map $map {
+	    data->literal [@SYM@] = Tcl_NewStringObj (@NAME@_literal[@SYM@], -1);
+	    Tcl_IncrRefCount (data->literal [@SYM@]);
+	}]
+    }
+    return $init
+}
+
+proc critcl::literals::IassocInitTcl {dict} {
+    dict for {sym string} $dict {
+	set map [list @SYM@ $sym @STR@ $string]
+	append init \n[critcl::at::here!][string map $map {
+	    data->literal [@SYM@] = Tcl_NewStringObj ("@STR@", -1);
+	    Tcl_IncrRefCount (data->literal [@SYM@]);
+	}]
+    }
+    return $init
+}
+
+proc critcl::literals::Header {name dict} {
+    # I. Generate a header file for inclusion by other parts of the
+    #    package, i.e. csources. Include the header here as well, for
+    #    the following blocks of code.
+    #
+    #    Declarations of an enum of the symbolic names, plus the
+    #    accessor function.
+    upvar 1 mode mode
+    append h [HeaderIntro          $name $dict]
+    append h [Tcl HeaderTcl        $name]
+    append h [+List HeaderTcl+List $name]
+    append h [C HeaderC            $name]
+    append h [HeaderEnd            $name]
+    critcl::include [critcl::make ${name}.h $h]
+    return
+}
+
+proc critcl::literals::HeaderIntro {name dict} {
+    lappend map @NAME@  $name
+    lappend map @CODES@ [join [dict keys $dict] {, }]
+    return \n[critcl::at::here!][string map $map {
+	#ifndef @NAME@_LITERALS_HEADER
+	#define @NAME@_LITERALS_HEADER
+
+	#include <tcl.h>
+
+	/* Symbolic names for the literals */
+	typedef enum @NAME@_names {
+	    @CODES@
+	    , @NAME@_name_LAST
+	} @NAME@_names;
+    }]
+}
+
+proc critcl::literals::HeaderEnd {name} {
+    lappend map @NAME@ $name
+    return [string map $map {
+	#endif /* @NAME@_LITERALS_HEADER */
+    }]
+}
+
+proc critcl::literals::HeaderTcl {name} {
+    lappend map @NAME@ $name
+    return \n[critcl::at::here!][string map $map {
+	/* Tcl Accessor function for the literals */
+	extern Tcl_Obj*
+	@NAME@ (Tcl_Interp* interp, @NAME@_names literal);
+    }]
+}
+
+proc critcl::literals::HeaderTcl+List {name} {
+    lappend map @NAME@ $name
+    return \n[critcl::at::here!][string map $map {
+	/* Tcl "+list" Accessor function for the literals */
+	extern Tcl_Obj*
+	@NAME@_list (Tcl_Interp* interp, int c, @NAME@_names* literal);
+    }]
+}
+
+proc critcl::literals::HeaderC {name} {
+    lappend map @NAME@ $name
+    return \n[critcl::at::here!][string map $map {
+	/* C Accessor function for the literals */
+	extern const char* @NAME@_cstr (@NAME@_names literal);
+    }]
+}
+
+proc critcl::literals::ResultType {name} {
+    lappend map @NAME@ $name
+    critcl::resulttype $name \n[critcl::at::here!][string map $map {
+	/* @NAME@ result is effectively 0-refcount */
+	Tcl_SetObjResult (interp, @NAME@ (interp, rv));
+	return TCL_OK;
+    }] int
+}
+
+proc critcl::literals::AccessorTcl {name} {
+    lappend map @NAME@ $name
+    critcl::ccode [critcl::at::here!][string map $map {
+	Tcl_Obj*
+	@NAME@ (Tcl_Interp* interp, @NAME@_names literal)
+	{
+	    if ((literal < 0) || (literal >= @NAME@_name_LAST)) {
+		Tcl_Panic ("Bad @NAME@ literal index %d outside [0...%d]",
+			   literal, @NAME@_name_LAST-1);
+	    }
+	    return @NAME@_iassoc (interp)->literal [literal];
+	}
+    }]
+    return
+}
+
+proc critcl::literals::AccessorTcl+List {name} {
+    lappend map @NAME@ $name
+    critcl::ccode [critcl::at::here!][string map $map {
+	Tcl_Obj*
+	@NAME@_list (Tcl_Interp* interp, int c, @NAME@_names* literal)
+	{
+	    int k;
+	    for (k=0; k < c; k++) {
+		if ((literal[k] < 0) || (literal[k] >= @NAME@_name_LAST)) {
+		    Tcl_Panic ("Bad @NAME@ literal index %d outside [0...%d]",
+			       literal[k], @NAME@_name_LAST-1);
+		}
+	    }
+
+	    Tcl_Obj* result = Tcl_NewListObj (0, 0);
+	    if (!result) return result;
+
+	    for (k=0; k < c; k++) {
+		if (TCL_OK == Tcl_ListObjAppendElement (interp, result, @NAME@_iassoc (interp)->literal [literal [k]]))
+		    continue;
+		/* Failed to append, release and abort */
+		Tcl_DecrRefCount (result);
+		return 0;
+	    }
+
+	    return result;
+	}
+    }]
+    return
+}
+
+proc critcl::literals::AccessorC {name} {
+    upvar 1 mode mode
+    return [Tcl AccessorCWithTcl $name][!Tcl AccessorCRaw $name]
+}
+
+proc critcl::literals::AccessorCWithTcl {name} {
+    # C accessor can use Tcl API
+    lappend map @NAME@ $name
+    critcl::ccode [critcl::at::here!][string map $map {
+	const char*
+	@NAME@_cstr (@NAME@_names literal)
+	{
+	    if ((literal < 0) || (literal >= @NAME@_name_LAST)) {
+		Tcl_Panic ("Bad @NAME@ literal");
+	    }
+	    return @NAME@_literal [literal];
+	}
+    }]
+    return
+}
+
+proc critcl::literals::AccessorCRaw {name} {
+    # C accessor has only basics
+    lappend map @NAME@ $name
+    critcl::ccode [critcl::at::here!][string map $map {
+	#include <assert.h>
+	const char*
+	@NAME@_cstr (@NAME@_names literal)
+	{
+	    assert ((0 <= literal) && (literal < @NAME@_name_LAST));
+	    return @NAME@_literal [literal];
+	}
+    }]
+    return
+}
+
+proc critcl::literals::C {args} {
+    upvar 1 mode mode
+    if {!$mode(c)} return
+    return [uplevel 1 $args]
+}
+
+proc critcl::literals::!C {args} {
+    upvar 1 mode mode
+    if {$mode(c)} return
+    return [uplevel 1 $args]
+}
+
+proc critcl::literals::Tcl {args} {
+    upvar 1 mode mode
+    if {!$mode(tcl)} return
+    return [uplevel 1 $args]
+}
+
+proc critcl::literals::!Tcl {args} {
+    upvar 1 mode mode
+    if {$mode(tcl)} return
+    return [uplevel 1 $args]
+}
+
+proc critcl::literals::+List {args} {
+    upvar 1 mode mode
+    if {!$mode(+list)} return
+    return [uplevel 1 $args]
+}
+
+proc critcl::literals::!+List {args} {
+    upvar 1 mode mode
+    if {$mode(+list)} return
+    return [uplevel 1 $args]
+}
+
+# # ## ### ##### ######## ############# #####################
+## Export API
+
+namespace eval ::critcl::literals {
+    namespace export def
+    catch { namespace ensemble create }
+}
+
+namespace eval ::critcl {
+    namespace export literals
+    catch { namespace ensemble create }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+return
diff --git a/src/vfs/critcl.vfs/lib/critcl-literals/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/critcl-literals/pkgIndex.tcl
new file mode 100644
index 00000000..146857fe
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-literals/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+package ifneeded critcl::literals 1.4.1 [list source [file join $dir literals.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/critcl-md5c/md5c.tcl b/src/vfs/critcl.vfs/lib/critcl-md5c/md5c.tcl
new file mode 100644
index 00000000..79500ccd
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-md5c/md5c.tcl
@@ -0,0 +1,145 @@
+# md5c.tcl -
+#
+# Wrapper for RSA's Message Digest in C
+#
+# Written by Jean-Claude Wippler <jcw@equi4.com>
+
+package require critcl      3.2
+package provide critcl_md5c 0.12
+
+critcl::cheaders md5c_c/md5.h;                 # The RSA header file
+critcl::csources md5c_c/md5.c;                 # The RSA MD5 implementation.
+
+critcl::ccode {
+    #include <string.h>
+    #include "md5.h"
+    #include <assert.h>
+
+    static
+    Tcl_ObjType md5_type; /* fast internal access representation */
+
+    static void
+    md5_free_rep(Tcl_Obj *obj)
+    {
+	MD5_CTX *mp = (MD5_CTX *) obj->internalRep.otherValuePtr;
+	Tcl_Free((char*)mp);
+    }
+
+    static void
+    md5_dup_rep(Tcl_Obj *obj, Tcl_Obj *dup)
+    {
+	MD5_CTX *mp = (MD5_CTX *) obj->internalRep.otherValuePtr;
+	dup->internalRep.otherValuePtr = Tcl_Alloc(sizeof *mp);
+	memcpy(dup->internalRep.otherValuePtr, mp, sizeof *mp);
+	dup->typePtr = &md5_type;
+    }
+
+    static void
+    md5_string_rep(Tcl_Obj *obj)
+    {
+	unsigned char buf[16];
+	Tcl_Obj *temp;
+	char *str;
+	MD5_CTX dup = *(MD5_CTX *) obj->internalRep.otherValuePtr;
+
+	MD5Final(buf, &dup);
+
+	/* convert via a byte array to properly handle null bytes */
+	temp = Tcl_NewByteArrayObj(buf, sizeof (buf)); /* OK tcl9 */
+	Tcl_IncrRefCount(temp);
+
+	str = Tcl_GetStringFromObj(temp, &obj->length); /* OK tcl9 */
+	obj->bytes = Tcl_Alloc(obj->length + 1);
+	memcpy(obj->bytes, str, obj->length + 1);
+
+	Tcl_DecrRefCount(temp);
+    }
+
+    static int
+    md5_from_any(Tcl_Interp* ip, Tcl_Obj* obj)
+    {
+	assert(0);
+	return TCL_ERROR;
+    }
+
+    static
+    Tcl_ObjType md5_type = {
+	"md5c", md5_free_rep, md5_dup_rep, md5_string_rep, md5_from_any
+    };
+}
+
+critcl::ccommand md5c {dummy ip objc objv} {
+    MD5_CTX *mp;
+    unsigned char *data;
+    Tcl_Size size;
+    Tcl_Obj *obj;
+
+    if (objc < 2 || objc > 3) {
+	Tcl_WrongNumArgs(ip, 1, objv, "data ?context?"); /* OK tcl9 */
+	return TCL_ERROR;
+    }
+
+    if (objc == 3) {
+	if (objv[2]->typePtr != &md5_type && md5_from_any(ip, objv[2]) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	obj = objv[2];
+	if (Tcl_IsShared(obj)) {
+	    obj = Tcl_DuplicateObj(obj);
+	}
+    } else {
+	mp = (MD5_CTX *)Tcl_Alloc(sizeof *mp);
+	MD5Init(mp);
+	obj = Tcl_NewObj();
+	Tcl_InvalidateStringRep(obj);
+	obj->internalRep.otherValuePtr = mp;
+	obj->typePtr = &md5_type;
+    }
+
+    mp = (MD5_CTX *) obj->internalRep.otherValuePtr;
+
+    data = Tcl_GetBytesFromObj(ip, objv[1], &size); /* OK tcl9 */
+    if (data == NULL) return TCL_ERROR;
+
+    MD5Update(mp, data, size);
+    Tcl_SetObjResult(ip, obj);
+
+    return TCL_OK;
+}
+
+if {[info exists pkgtest] && $pkgtest} {
+
+    proc md5c_try {} {
+	foreach {msg expected} {
+	    ""
+	    "d41d8cd98f00b204e9800998ecf8427e"
+	    "a"
+	    "0cc175b9c0f1b6a831c399e269772661"
+	    "abc"
+	    "900150983cd24fb0d6963f7d28e17f72"
+	    "message digest"
+	    "f96b697d7cb7938d525a2f31aaf161d0"
+	    "abcdefghijklmnopqrstuvwxyz"
+	    "c3fcd3d76192e4007dfb496cca67e13b"
+	    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+	    "d174ab98d277d9f5a5611c2c9f419d9f"
+	    "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+	    "57edf4a22be3c955ac49da2e2107b67a"
+	} {
+	    puts "testing: md5c \"$msg\""
+	    binary scan [md5c $msg] H* computed
+	    puts "computed: $computed"
+	    if {0 != [string compare $computed $expected]} {
+		puts "expected: $expected"
+		puts "FAILED"
+	    }
+	}
+
+	foreach len {10 50 100 500 1000 5000 10000} {
+	    set blanks [format %$len.0s ""]
+	    puts "input length $len: [time {md5c $blanks} 1000]"
+	}
+    }
+
+    md5c_try
+}
diff --git a/src/vfs/critcl.vfs/lib/critcl-md5c/md5c_c/md5.c b/src/vfs/critcl.vfs/lib/critcl-md5c/md5c_c/md5.c
new file mode 100644
index 00000000..0a8cafe4
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-md5c/md5c_c/md5.c
@@ -0,0 +1,293 @@
+/*
+ ***********************************************************************
+ ** md5.c -- the source code for MD5 routines                         **
+ ** RSA Data Security, Inc. MD5 Message-Digest Algorithm              **
+ ** Created: 2/17/90 RLR                                              **
+ ** Revised: 1/91 SRD,AJ,BSK,JT Reference C Version                   **
+ ***********************************************************************
+ */
+
+/*
+ * Edited 7 May 93 by CP to change the interface to match that
+ * of the MD5 routines in RSAREF.  Due to this alteration, this
+ * code is "derived from the RSA Data Security, Inc. MD5 Message-
+ * Digest Algorithm".  (See below.)
+ */
+
+/*
+ ***********************************************************************
+ ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.  **
+ **                                                                   **
+ ** License to copy and use this software is granted provided that    **
+ ** it is identified as the "RSA Data Security, Inc. MD5 Message-     **
+ ** Digest Algorithm" in all material mentioning or referencing this  **
+ ** software or this function.                                        **
+ **                                                                   **
+ ** License is also granted to make and use derivative works          **
+ ** provided that such works are identified as "derived from the RSA  **
+ ** Data Security, Inc. MD5 Message-Digest Algorithm" in all          **
+ ** material mentioning or referencing the derived work.              **
+ **                                                                   **
+ ** RSA Data Security, Inc. makes no representations concerning       **
+ ** either the merchantability of this software or the suitability    **
+ ** of this software for any particular purpose.  It is provided "as  **
+ ** is" without express or implied warranty of any kind.              **
+ **                                                                   **
+ ** These notices must be retained in any copies of any part of this  **
+ ** documentation and/or software.                                    **
+ ***********************************************************************
+ */
+
+#include "md5.h"
+
+/*
+ ***********************************************************************
+ **  Message-digest routines:                                         **
+ **  To form the message digest for a message M                       **
+ **    (1) Initialize a context buffer mdContext using MD5Init        **
+ **    (2) Call MD5Update on mdContext and M                          **
+ **    (3) Call MD5Final on mdContext                                 **
+ **  The message digest is now in the bugffer passed to MD5Final      **
+ ***********************************************************************
+ */
+
+static unsigned char PADDING[64] = {
+  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+/* F, G, H and I are basic MD5 functions */
+#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | (~z)))
+
+/* ROTATE_LEFT rotates x left n bits */
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */
+/* Rotation is separate from addition to prevent recomputation */
+#define FF(a, b, c, d, x, s, ac) \
+  {(a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define GG(a, b, c, d, x, s, ac) \
+  {(a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define HH(a, b, c, d, x, s, ac) \
+  {(a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define II(a, b, c, d, x, s, ac) \
+  {(a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+
+/* The routine MD5Init initializes the message-digest context
+   mdContext. All fields are set to zero.
+ */
+void MD5Init (mdContext)
+MD5_CTX *mdContext;
+{
+  mdContext->i[0] = mdContext->i[1] = (UINT4)0;
+
+  /* Load magic initialization constants.
+   */
+  mdContext->buf[0] = (UINT4)0x67452301L;
+  mdContext->buf[1] = (UINT4)0xefcdab89L;
+  mdContext->buf[2] = (UINT4)0x98badcfeL;
+  mdContext->buf[3] = (UINT4)0x10325476L;
+}
+
+/* The routine MD5Update updates the message-digest context to
+   account for the presence of each of the characters inBuf[0..inLen-1]
+   in the message whose digest is being computed.
+ */
+void MD5Update (mdContext, inBuf, inLen)
+register MD5_CTX *mdContext; unsigned char *inBuf;
+		 unsigned int inLen;
+{
+  register int i, ii;
+  int mdi;
+  UINT4 in[16];
+
+  /* compute number of bytes mod 64 */
+  mdi = (int)((mdContext->i[0] >> 3) & 0x3F);
+
+  /* update number of bits */
+  if ((mdContext->i[0] + ((UINT4)inLen << 3)) < mdContext->i[0])
+    mdContext->i[1]++;
+  mdContext->i[0] += ((UINT4)inLen << 3);
+  mdContext->i[1] += ((UINT4)inLen >> 29);
+
+  while (inLen--) {
+    /* add new character to buffer, increment mdi */
+    mdContext->in[mdi++] = *inBuf++;
+
+    /* transform if necessary */
+    if (mdi == 0x40) {
+      for (i = 0, ii = 0; i < 16; i++, ii += 4)
+        in[i] = (((UINT4)mdContext->in[ii+3]) << 24) |
+                (((UINT4)mdContext->in[ii+2]) << 16) |
+                (((UINT4)mdContext->in[ii+1]) << 8) |
+                ((UINT4)mdContext->in[ii]);
+      Transform (mdContext->buf, in);
+      mdi = 0;
+    }
+  }
+}
+
+/* The routine MD5Final terminates the message-digest computation and
+   ends with the desired message digest in mdContext->digest[0...15].
+ */
+void MD5Final (digest, mdContext)
+unsigned char digest[16]; MD5_CTX *mdContext;
+{
+  UINT4 in[16];
+  int mdi;
+  unsigned int i, ii;
+  unsigned int padLen;
+
+  /* save number of bits */
+  in[14] = mdContext->i[0];
+  in[15] = mdContext->i[1];
+
+  /* compute number of bytes mod 64 */
+  mdi = (int)((mdContext->i[0] >> 3) & 0x3F);
+
+  /* pad out to 56 mod 64 */
+  padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi);
+  MD5Update (mdContext, PADDING, padLen);
+
+  /* append length in bits and transform */
+  for (i = 0, ii = 0; i < 14; i++, ii += 4)
+    in[i] = (((UINT4)mdContext->in[ii+3]) << 24) |
+            (((UINT4)mdContext->in[ii+2]) << 16) |
+            (((UINT4)mdContext->in[ii+1]) << 8) |
+            ((UINT4)mdContext->in[ii]);
+  Transform (mdContext->buf, in);
+
+  /* store buffer in digest */
+  for (i = 0, ii = 0; i < 4; i++, ii += 4) {
+    digest[ii]   = (unsigned char) (mdContext->buf[i]        & 0xFF);
+    digest[ii+1] = (unsigned char)((mdContext->buf[i] >> 8)  & 0xFF);
+    digest[ii+2] = (unsigned char)((mdContext->buf[i] >> 16) & 0xFF);
+    digest[ii+3] = (unsigned char)((mdContext->buf[i] >> 24) & 0xFF);
+  }
+}
+
+/* Basic MD5 step. Transforms buf based on in.  Note that if the Mysterious
+   Constants are arranged backwards in little-endian order and decrypted with
+   the DES they produce OCCULT MESSAGES!
+ */
+void Transform(buf, in)
+register UINT4 *buf;
+register UINT4 *in;
+{
+  register UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
+
+  /* Round 1 */
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+  FF ( a, b, c, d, in[ 0], S11, 0xD76AA478L); /* 1 */
+  FF ( d, a, b, c, in[ 1], S12, 0xE8C7B756L); /* 2 */
+  FF ( c, d, a, b, in[ 2], S13, 0x242070DBL); /* 3 */
+  FF ( b, c, d, a, in[ 3], S14, 0xC1BDCEEEL); /* 4 */
+  FF ( a, b, c, d, in[ 4], S11, 0xF57C0FAFL); /* 5 */
+  FF ( d, a, b, c, in[ 5], S12, 0x4787C62AL); /* 6 */
+  FF ( c, d, a, b, in[ 6], S13, 0xA8304613L); /* 7 */
+  FF ( b, c, d, a, in[ 7], S14, 0xFD469501L); /* 8 */
+  FF ( a, b, c, d, in[ 8], S11, 0x698098D8L); /* 9 */
+  FF ( d, a, b, c, in[ 9], S12, 0x8B44F7AFL); /* 10 */
+  FF ( c, d, a, b, in[10], S13, 0xFFFF5BB1L); /* 11 */
+  FF ( b, c, d, a, in[11], S14, 0x895CD7BEL); /* 12 */
+  FF ( a, b, c, d, in[12], S11, 0x6B901122L); /* 13 */
+  FF ( d, a, b, c, in[13], S12, 0xFD987193L); /* 14 */
+  FF ( c, d, a, b, in[14], S13, 0xA679438EL); /* 15 */
+  FF ( b, c, d, a, in[15], S14, 0x49B40821L); /* 16 */
+
+  /* Round 2 */
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+  GG ( a, b, c, d, in[ 1], S21, 0xF61E2562L); /* 17 */
+  GG ( d, a, b, c, in[ 6], S22, 0xC040B340L); /* 18 */
+  GG ( c, d, a, b, in[11], S23, 0x265E5A51L); /* 19 */
+  GG ( b, c, d, a, in[ 0], S24, 0xE9B6C7AAL); /* 20 */
+  GG ( a, b, c, d, in[ 5], S21, 0xD62F105DL); /* 21 */
+  GG ( d, a, b, c, in[10], S22, 0x02441453L); /* 22 */
+  GG ( c, d, a, b, in[15], S23, 0xD8A1E681L); /* 23 */
+  GG ( b, c, d, a, in[ 4], S24, 0xE7D3FBC8L); /* 24 */
+  GG ( a, b, c, d, in[ 9], S21, 0x21E1CDE6L); /* 25 */
+  GG ( d, a, b, c, in[14], S22, 0xC33707D6L); /* 26 */
+  GG ( c, d, a, b, in[ 3], S23, 0xF4D50D87L); /* 27 */
+  GG ( b, c, d, a, in[ 8], S24, 0x455A14EDL); /* 28 */
+  GG ( a, b, c, d, in[13], S21, 0xA9E3E905L); /* 29 */
+  GG ( d, a, b, c, in[ 2], S22, 0xFCEFA3F8L); /* 30 */
+  GG ( c, d, a, b, in[ 7], S23, 0x676F02D9L); /* 31 */
+  GG ( b, c, d, a, in[12], S24, 0x8D2A4C8AL); /* 32 */
+
+  /* Round 3 */
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+  HH ( a, b, c, d, in[ 5], S31, 0xFFFA3942L); /* 33 */
+  HH ( d, a, b, c, in[ 8], S32, 0x8771F681L); /* 34 */
+  HH ( c, d, a, b, in[11], S33, 0x6D9D6122L); /* 35 */
+  HH ( b, c, d, a, in[14], S34, 0xFDE5380CL); /* 36 */
+  HH ( a, b, c, d, in[ 1], S31, 0xA4BEEA44L); /* 37 */
+  HH ( d, a, b, c, in[ 4], S32, 0x4BDECFA9L); /* 38 */
+  HH ( c, d, a, b, in[ 7], S33, 0xF6BB4B60L); /* 39 */
+  HH ( b, c, d, a, in[10], S34, 0xBEBFBC70L); /* 40 */
+  HH ( a, b, c, d, in[13], S31, 0x289B7EC6L); /* 41 */
+  HH ( d, a, b, c, in[ 0], S32, 0xEAA127FAL); /* 42 */
+  HH ( c, d, a, b, in[ 3], S33, 0xD4EF3085L); /* 43 */
+  HH ( b, c, d, a, in[ 6], S34, 0x04881D05L); /* 44 */
+  HH ( a, b, c, d, in[ 9], S31, 0xD9D4D039L); /* 45 */
+  HH ( d, a, b, c, in[12], S32, 0xE6DB99E5L); /* 46 */
+  HH ( c, d, a, b, in[15], S33, 0x1FA27CF8L); /* 47 */
+  HH ( b, c, d, a, in[ 2], S34, 0xC4AC5665L); /* 48 */
+
+  /* Round 4 */
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+  II ( a, b, c, d, in[ 0], S41, 0xF4292244L); /* 49 */
+  II ( d, a, b, c, in[ 7], S42, 0x432AFF97L); /* 50 */
+  II ( c, d, a, b, in[14], S43, 0xAB9423A7L); /* 51 */
+  II ( b, c, d, a, in[ 5], S44, 0xFC93A039L); /* 52 */
+  II ( a, b, c, d, in[12], S41, 0x655B59C3L); /* 53 */
+  II ( d, a, b, c, in[ 3], S42, 0x8F0CCC92L); /* 54 */
+  II ( c, d, a, b, in[10], S43, 0xFFEFF47DL); /* 55 */
+  II ( b, c, d, a, in[ 1], S44, 0x85845DD1L); /* 56 */
+  II ( a, b, c, d, in[ 8], S41, 0x6FA87E4FL); /* 57 */
+  II ( d, a, b, c, in[15], S42, 0xFE2CE6E0L); /* 58 */
+  II ( c, d, a, b, in[ 6], S43, 0xA3014314L); /* 59 */
+  II ( b, c, d, a, in[13], S44, 0x4E0811A1L); /* 60 */
+  II ( a, b, c, d, in[ 4], S41, 0xF7537E82L); /* 61 */
+  II ( d, a, b, c, in[11], S42, 0xBD3AF235L); /* 62 */
+  II ( c, d, a, b, in[ 2], S43, 0x2AD7D2BBL); /* 63 */
+  II ( b, c, d, a, in[ 9], S44, 0xEB86D391L); /* 64 */
+
+  buf[0] += a;
+  buf[1] += b;
+  buf[2] += c;
+  buf[3] += d;
+}
+
diff --git a/src/vfs/critcl.vfs/lib/critcl-md5c/md5c_c/md5.h b/src/vfs/critcl.vfs/lib/critcl-md5c/md5c_c/md5.h
new file mode 100644
index 00000000..5627f627
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-md5c/md5c_c/md5.h
@@ -0,0 +1,74 @@
+#ifndef MD5_H
+#define MD5_H
+
+/*
+ ***********************************************************************
+ ** md5.h -- header file for implementation of MD5                    **
+ ** RSA Data Security, Inc. MD5 Message-Digest Algorithm              **
+ ** Created: 2/17/90 RLR                                              **
+ ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version               **
+ ** Revised (for MD5): RLR 4/27/91                                    **
+ **   -- G modified to have y&~z instead of y&z                       **
+ **   -- FF, GG, HH modified to add in last register done             **
+ **   -- Access pattern: round 2 works mod 5, round 3 works mod 3     **
+ **   -- distinct additive constant for each step                     **
+ **   -- round 4 added, working mod 7                                 **
+ ***********************************************************************
+ */
+
+/*
+ * Edited 7 May 93 by CP to change the interface to match that
+ * of the MD5 routines in RSAREF.  Due to this alteration, this
+ * code is "derived from the RSA Data Security, Inc. MD5 Message-
+ * Digest Algorithm".  (See below.)  Also added argument names
+ * to the prototypes.
+ */
+
+/*
+ ***********************************************************************
+ ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.  **
+ **                                                                   **
+ ** License to copy and use this software is granted provided that    **
+ ** it is identified as the "RSA Data Security, Inc. MD5 Message-     **
+ ** Digest Algorithm" in all material mentioning or referencing this  **
+ ** software or this function.                                        **
+ **                                                                   **
+ ** License is also granted to make and use derivative works          **
+ ** provided that such works are identified as "derived from the RSA  **
+ ** Data Security, Inc. MD5 Message-Digest Algorithm" in all          **
+ ** material mentioning or referencing the derived work.              **
+ **                                                                   **
+ ** RSA Data Security, Inc. makes no representations concerning       **
+ ** either the merchantability of this software or the suitability    **
+ ** of this software for any particular purpose.  It is provided "as  **
+ ** is" without express or implied warranty of any kind.              **
+ **                                                                   **
+ ** These notices must be retained in any copies of any part of this  **
+ ** documentation and/or software.                                    **
+ ***********************************************************************
+ */
+
+/* typedef a 32-bit unsigned integer type */
+
+#include <limits.h>
+#if UINT_MAX == 4294967295U
+  typedef unsigned int UINT4;
+#elif ULONG_MAX == 4294967295UL
+  typedef unsigned long UINT4;
+#else
+#error "Unable to define UINT4, no 32bit unsigned integer type found"
+#endif
+
+/* Data structure for MD5 (Message-Digest) computation */
+typedef struct {
+  UINT4 buf[4];                                    /* scratch buffer */
+  UINT4 i[2];                   /* number of _bits_ handled mod 2^64 */
+  unsigned char in[64];                              /* input buffer */
+} MD5_CTX;
+
+void MD5Init   (MD5_CTX *mdContext);
+void MD5Update (MD5_CTX *mdContext, unsigned char *buf, unsigned int len);
+void MD5Final  (unsigned char digest[16], MD5_CTX *mdContext);
+void Transform (UINT4 *buf, UINT4 *in);
+
+#endif
diff --git a/src/vfs/critcl.vfs/lib/critcl-platform/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/critcl-platform/pkgIndex.tcl
new file mode 100644
index 00000000..f2bd08b5
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-platform/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+package ifneeded critcl::platform 1.1.1 [list source [file join $dir platform.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/critcl-platform/platform.tcl b/src/vfs/critcl.vfs/lib/critcl-platform/platform.tcl
new file mode 100644
index 00000000..fbfc5353
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-platform/platform.tcl
@@ -0,0 +1,404 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Overview
+
+# Heuristics to assemble a platform identifier from publicly available
+# information. The identifier describes the platform of the currently
+# running tcl shell. This is a mixture of the runtime environment and
+# of build-time properties of the executable itself.
+#
+# Examples:
+# <1> A tcl shell executing on a x86_64 processor, but having a
+#   wordsize of 4 was compiled for the x86 environment, i.e. 32
+#   bit, and loaded packages have to match that, and not the
+#   actual cpu.
+#
+# <2> The hp/solaris 32/64 bit builds of the core cannot be
+#   distinguished by looking at tcl_platform. As packages have to
+#   match the 32/64 information we have to look in more places. In
+#   this case we inspect the executable itself (magic numbers,
+#   i.e. fileutil::magic::filetype).
+#
+# The basic information used comes out of the 'os' and 'machine'
+# entries of the 'tcl_platform' array. A number of general and
+# os/machine specific transformation are applied to get a canonical
+# result.
+#
+# General
+# Only the first element of 'os' is used - we don't care whether we
+# are on "Windows NT" or "Windows XP" or whatever.
+#
+# Machine specific
+# % arm*   -> arm
+# % sun4*  -> sparc
+# % intel  -> ix86
+# % i*86*  -> ix86
+# % Power* -> powerpc
+# % x86_64 + wordSize 4 => x86 code
+#
+# OS specific
+# % AIX are always powerpc machines
+# % HP-UX 9000/800 etc means parisc
+# % linux has to take glibc version into account
+# % sunos -> solaris, and keep version number
+#
+# NOTE: A platform like linux glibc 2.3, which can use glibc 2.2 stuff
+# has to provide all possible allowed platform identifiers when
+# searching search. Ditto a solaris 2.8 platform can use solaris 2.6
+# packages. Etc. This is handled by the other procedure, see below.
+
+package require Tcl 8.6 9
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+namespace eval ::platform {}
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+# -- platform::generic
+#
+# Assembles an identifier for the generic platform. It leaves out
+# details like kernel version, libc version, etc.
+
+proc ::platform::generic {} {
+    global tcl_platform
+
+    set plat [string tolower [lindex $tcl_platform(os) 0]]
+    set cpu  $tcl_platform(machine)
+
+    switch -glob -- $cpu {
+	sun4* {
+	    set cpu sparc
+	}
+	intel -
+	i*86* {
+	    set cpu ix86
+	}
+	x86_64 {
+	    if {$tcl_platform(wordSize) == 4} {
+		# See Example <1> at the top of this file.
+		set cpu ix86
+	    }
+	}
+	"Power*" {
+	    set cpu powerpc
+	}
+	"arm*" {
+	    set cpu arm
+	}
+	ia64 {
+	    if {$tcl_platform(wordSize) == 4} {
+		append cpu _32
+	    }
+	}
+    }
+
+    switch -glob -- $plat {
+	cygwin* {
+	    set plat cygwin
+	}
+	windows {
+	    if {$tcl_platform(platform) == "unix"} {
+		set plat cygwin
+	    } else {
+		set plat win32
+	    }
+	    if {$cpu eq "amd64"} {
+		# Do not check wordSize, win32-x64 is an IL32P64 platform.
+		set cpu x86_64
+	    }
+	}
+	sunos {
+	    set plat solaris
+	    if {[string match "ix86" $cpu]} {
+		if {$tcl_platform(wordSize) == 8} {
+		    set cpu x86_64
+		}
+	    } elseif {![string match "ia64*" $cpu]} {
+		# sparc
+		if {$tcl_platform(wordSize) == 8} {
+		    append cpu 64
+		}
+	    }
+	}
+	darwin {
+	    set plat macosx
+	    # Correctly identify the cpu when running as a 64bit
+	    # process on a machine with a 32bit kernel
+	    if {$cpu eq "ix86"} {
+		if {$tcl_platform(wordSize) == 8} {
+		    set cpu x86_64
+		}
+	    }
+	}
+	aix {
+	    set cpu powerpc
+	    if {$tcl_platform(wordSize) == 8} {
+		append cpu 64
+	    }
+	}
+	hp-ux {
+	    set plat hpux
+	    if {![string match "ia64*" $cpu]} {
+		set cpu parisc
+		if {$tcl_platform(wordSize) == 8} {
+		    append cpu 64
+		}
+	    }
+	}
+	osf1 {
+	    set plat tru64
+	}
+    }
+
+    return "${plat}-${cpu}"
+}
+
+# -- platform::identify
+#
+# Assembles an identifier for the exact platform, by extending the
+# generic identifier. I.e. it adds in details like kernel version,
+# libc version, etc., if they are relevant for the loading of
+# packages on the platform.
+
+proc ::platform::identify {} {
+    global tcl_platform
+
+    set id [generic]
+    regexp {^([^-]+)-([^-]+)$} $id -> plat cpu
+
+    switch -- $plat {
+	freebsd {
+	    set abi [lindex [split $tcl_platform(osVersion) .] 0]
+	    append plat $abi
+	    return "${plat}-${cpu}"
+	}
+	solaris {
+	    regsub {^5} $tcl_platform(osVersion) 2 text
+	    append plat $text
+	    return "${plat}-${cpu}"
+	}
+	macosx {
+	    set major [lindex [split $tcl_platform(osVersion) .] 0]
+	    if {$major > 8} {
+		incr major -4
+		append plat 10.$major
+		return "${plat}-${cpu}"
+	    }
+	}
+	linux {
+	    # Look for the libc*.so and determine its version
+	    # (libc5/6, libc6 further glibc 2.X)
+
+	    set v unknown
+
+	    # Determine in which directory to look. /lib, or /lib64.
+	    # For that we use the tcl_platform(wordSize).
+	    #
+	    # We could use the 'cpu' info, per the equivalence below,
+	    # that however would be restricted to intel. And this may
+	    # be a arm, mips, etc. system. The wordsize is more
+	    # fundamental.
+	    #
+	    # ix86   <=> (wordSize == 4) <=> 32 bit ==> /lib
+	    # x86_64 <=> (wordSize == 8) <=> 64 bit ==> /lib64
+	    #
+	    # Do not look into /lib64 even if present, if the cpu
+	    # doesn't fit.
+
+	    # TODO: Determine the prefixes (i386, x86_64, ...) for
+	    # other cpus.  The path after the generic one is utterly
+	    # specific to intel right now.  Ok, on Ubuntu, possibly
+	    # other Debian systems we may apparently be able to query
+	    # the necessary CPU code. If we can't we simply use the
+	    # hardwired fallback.
+
+	    switch -exact -- $tcl_platform(wordSize) {
+		4 {
+		    lappend bases /lib
+		    if {[catch {
+			exec dpkg-architecture -qDEB_HOST_MULTIARCH
+		    } res]} {
+			lappend bases /lib/i386-linux-gnu
+		    } else {
+			# dpkg-arch returns the full tripled, not just cpu.
+			lappend bases /lib/$res
+		    }
+		}
+		8 {
+		    lappend bases /lib64
+		    if {[catch {
+			exec dpkg-architecture -qDEB_HOST_MULTIARCH
+		    } res]} {
+			lappend bases /lib/x86_64-linux-gnu
+		    } else {
+			# dpkg-arch returns the full tripled, not just cpu.
+			lappend bases /lib/$res
+		    }
+		}
+		default {
+		    return -code error "Bad wordSize $tcl_platform(wordSize), expected 4 or 8"
+		}
+	    }
+
+	    foreach base $bases {
+		if {[LibcVersion $base -> v]} break
+	    }
+
+	    append plat -$v
+	    return "${plat}-${cpu}"
+	}
+    }
+
+    return $id
+}
+
+proc ::platform::LibcVersion {base _->_ vv} {
+    upvar 1 $vv v
+    set libclist [lsort [glob -nocomplain -directory $base libc*]]
+
+    if {![llength $libclist]} { return 0 }
+
+    set libc [lindex $libclist 0]
+
+    # Try executing the library first. This should suceed
+    # for a glibc library, and return the version
+    # information.
+
+    if {![catch {
+	set vdata [lindex [split [exec $libc] \n] 0]
+    }]} {
+	regexp {version ([0-9]+(\.[0-9]+)*)} $vdata -> v
+	foreach {major minor} [split $v .] break
+	set v glibc${major}.${minor}
+	return 1
+    } else {
+	# We had trouble executing the library. We are now
+	# inspecting its name to determine the version
+	# number. This code by Larry McVoy.
+
+	if {[regexp -- {libc-([0-9]+)\.([0-9]+)} $libc -> major minor]} {
+	    set v glibc${major}.${minor}
+	    return 1
+	}
+    }
+    return 0
+}
+
+# -- platform::patterns
+#
+# Given an exact platform identifier, i.e. _not_ the generic
+# identifier it assembles a list of exact platform identifier
+# describing platform which should be compatible with the
+# input.
+#
+# I.e. packages for all platforms in the result list should be
+# loadable on the specified platform.
+
+# << Should we add the generic identifier to the list as well ? In
+#    general it is not compatible I believe. So better not. In many
+#    cases the exact identifier is identical to the generic one
+#    anyway.
+# >>
+
+proc ::platform::patterns {id} {
+    set res [list $id]
+    if {$id eq "tcl"} {return $res}
+
+    switch -glob --  $id {
+	solaris*-* {
+	    if {[regexp {solaris([^-]*)-(.*)} $id -> v cpu]} {
+		if {$v eq ""} {return $id}
+		foreach {major minor} [split $v .] break
+		incr minor -1
+		for {set j $minor} {$j >= 6} {incr j -1} {
+		    lappend res solaris${major}.${j}-${cpu}
+		}
+	    }
+	}
+	linux*-* {
+	    if {[regexp {linux-glibc([^-]*)-(.*)} $id -> v cpu]} {
+		foreach {major minor} [split $v .] break
+		incr minor -1
+		for {set j $minor} {$j >= 0} {incr j -1} {
+		    lappend res linux-glibc${major}.${j}-${cpu}
+		}
+	    }
+	}
+	macosx-powerpc {
+	    lappend res macosx-universal
+	}
+	macosx-x86_64 {
+	    lappend res macosx-i386-x86_64
+	}
+	macosx-ix86 {
+	    lappend res macosx-universal macosx-i386-x86_64
+	}
+	macosx*-*    {
+	    # 10.5+
+	    if {[regexp {macosx([^-]*)-(.*)} $id -> v cpu]} {
+
+		switch -exact -- $cpu {
+		    ix86    {
+			lappend alt i386-x86_64
+			lappend alt universal
+		    }
+		    x86_64  { lappend alt i386-x86_64 }
+		    default { set alt {} }
+		}
+
+		if {$v ne ""} {
+		    foreach {major minor} [split $v .] break
+
+		    # Add 10.5 to 10.minor to patterns.
+		    set res {}
+		    for {set j $minor} {$j >= 5} {incr j -1} {
+			lappend res macosx${major}.${j}-${cpu}
+			foreach a $alt {
+			    lappend res macosx${major}.${j}-$a
+			}
+		    }
+
+		    # Add unversioned patterns for 10.3/10.4 builds.
+		    lappend res macosx-${cpu}
+		    foreach a $alt {
+			lappend res macosx-$a
+		    }
+		} else {
+		    # No version, just do unversioned patterns.
+		    foreach a $alt {
+			lappend res macosx-$a
+		    }
+		}
+	    } else {
+		# no v, no cpu ... nothing
+	    }
+	}
+    }
+    lappend res tcl ; # Pure tcl packages are always compatible.
+    return $res
+}
+
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide critcl::platform 1.1.1
+
+# ### ### ### ######### ######### #########
+## Demo application
+
+if {[info exists argv0] && ($argv0 eq [info script])} {
+    puts ====================================
+    parray tcl_platform
+    puts ====================================
+    puts Generic\ identification:\ [::platform::generic]
+    puts Exact\ identification:\ \ \ [::platform::identify]
+    puts ====================================
+    puts Search\ patterns:
+    puts *\ [join [::platform::patterns [::platform::identify]] \n*\ ]
+    puts ====================================
+    exit 0
+}
diff --git a/src/vfs/critcl.vfs/lib/critcl-util/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/critcl-util/pkgIndex.tcl
new file mode 100644
index 00000000..d5262dee
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-util/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+package ifneeded critcl::util 1.2.1 [list source [file join $dir util.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/critcl-util/util.tcl b/src/vfs/critcl.vfs/lib/critcl-util/util.tcl
new file mode 100644
index 00000000..22f758d6
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl-util/util.tcl
@@ -0,0 +1,149 @@
+## -*- tcl -*-
+# # ## ### ##### ######## ############# #####################
+# Pragmas for MetaData Scanner.
+# n/a
+
+# CriTcl Utility Commands.
+
+package provide critcl::util 1.2.1
+
+# # ## ### ##### ######## ############# #####################
+## Requirements.
+
+package require Tcl    8.6 9 ; # Min supported version.
+package require critcl 3.2
+
+namespace eval ::critcl::util {}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: Embed C Code
+
+proc ::critcl::util::locate {label paths {cmd {}}} {
+    # Locate a file across set of paths.
+    # Relative paths are to "::critcl::Here".
+    # Paths are run through subst for dynamic construction.
+    # A command prefix can be specified, to further check/process each found path.
+    # Result is the found path, as coming from the paths argument.
+    # Should go into cheader or similar command.
+    # Failure to find is reported via critcl::error
+
+    foreach path $paths {
+	if {[file pathtype $path] eq "relative"} {
+	    set fullpath [file normalize [file join [critcl::Here] $path]]
+	} else {
+	    set fullpath $path
+	}
+	if {![file exists $fullpath]} continue
+	if {[llength $cmd] && ![uplevel 1 [linsert $cmd end $fullpath]]} continue
+	critcl::msg "${label}: $path"
+	return $path
+    }
+    critcl::error "${label}: not found, searched [linsert [join $paths {, }] end-1 and]"
+    return
+}
+
+proc ::critcl::util::checkfun {name {label {}}} {
+    variable cftemplate
+    if {$label eq {}} { set label "Checking for function '$name'" }
+    return [critcl::checklink $label [string map [list @@@ $name] $cftemplate]]
+}
+
+proc ::critcl::util::def {configfile define {value 1}} {
+    set result [file join [critcl::cache] [file tail $configfile]]
+
+    Put $result "[Get $result]\n\#define $define $value\n"
+    return
+}
+
+proc ::critcl::util::undef {configfile define} {
+    set result [file join [critcl::cache] [file tail $configfile]]
+
+    Put $result "[Get $result]\n\#undef $define\n"
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::critcl::util::Get {path} {
+    if {[catch {
+	set c [open $path r]
+	set d [read $c]
+	close $c
+    }]} {
+	set d {}
+    }
+    return $d
+}
+
+proc ::critcl::util::Put {path data} {
+    # Write changes back, via temp file. Commit via atomic rename.
+    set c [open $path.[pid] w]
+    puts -nonewline $c $data
+    close $c
+    file rename -force $path.[pid] $path
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## State
+
+namespace eval ::critcl::util {
+    variable cftemplate {
+	/* The header <limits.h> may declare @@@. To avoid a clash
+	 * redefine it to something aside. As an example, gettimeofday()
+	 * is declared in the <limits.h> provided by HP-UX 11i. Regardless,
+	 * we pull in a system header defining the __stub macros, and a
+	 * few prototypes only possibly in conflict with @@@, we hope.
+	 * As <limits.h> exists even on free-standing compilers its use
+	 * is preferred when __STDC__ is active.
+	 */
+
+	#define @@@ innocuous_@@@
+	#ifdef __STDC__
+	# include <limits.h>
+	#else
+	# include <assert.h>
+	#endif
+	#undef @@@
+
+	/* Next up a declaration to override whatever internal prototype
+	 * was declared by GCC, to prevent an error. As the return type
+	 * 'int' might match such a GCC builtin, and thus causing the application
+	 * of the argument prototype despite this we use 'char' instead.
+	 */
+
+	#ifdef __cplusplus
+	extern "C"
+	#endif
+	char @@@ ();
+
+	/* Lastly the GNU libc defines a few special names for its functions,
+	 * these will always fail with ENONSYS. Further, some functions
+	 * actually start with __, with the normal name (we are looking for)
+	 * an alias of it. Regardless, for these we bail.
+	*/
+
+	#if defined __stub_@@@ || defined __stub___@@@
+	choke me
+	#endif
+
+	int main ()
+	{
+	    return @@@ ();
+	    ;
+	    return 0;
+	}
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Export API
+
+namespace eval ::critcl::util {
+    namespace export checkfun def undef locate
+    catch { namespace ensemble create }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+return
diff --git a/src/vfs/critcl.vfs/lib/critcl/Config b/src/vfs/critcl.vfs/lib/critcl/Config
new file mode 100644
index 00000000..185b968e
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/Config
@@ -0,0 +1,537 @@
+# -*- tcl -*- Critcl configuration file
+
+# some defaults - you can override these in the platform specific section
+# but shouldn't need to for typical *nix toolchains using gcc
+#
+#   platform        sets the platform (defaults to platform::generic)
+#   target          indicates that this is a cross-compile target, the value is the actual platform code.
+#   compile         compile a C source file to an object file
+#   version         print the compiler version number
+#   ldout           See below
+#   link            Command to link one or more object files and create a shared library
+#   embed_manifest  Command to embed a manifest into a DLL. (Win-specific)
+#   link_debug      See below
+#   link_preload    Linker flags to use when dependent libraries are pre-loaded.
+#   link_release    See below
+#   preproc_define  preprocess C source file (for critcl::cdefines)
+#   preproc_enum    ditto
+#   tclstubs        cflag to set USE_TCL_STUBS
+#   tkstubs         cflag to set USE_TK_STUBS
+#   debug_memory    cflag to enable memory debugging
+#   debug_symbols   cflag to add symbols to resulting library
+#   object          file extension for object files
+#   output          flags to set output file
+#   strip           cflag to tell linker to strip symbols
+#   optimize        cflag to specify optimization level
+#   include         cflag to add an include directory
+#   noassert        cflag to turn off assertions in Tcl code
+#   threadflags     cflags to enable threaded build
+#   sharedlibext    the platform's file extension for shared libraries
+#
+#   (Support for Fortran)
+#   fcompile        compile a Fortran source file to an object file
+#   fversion        print the Fortran compiler version number
+#   flink           link one or more object files and create a shared library,
+#                   if at least one object file comes from Fortran
+#   foutput         Fortran flag(s) to set output file
+#   finclude        Fortran flag to add an include directory
+#   fextra_cflags   Extra C flags for indicating type of Fortran compiler
+#
+# Any other config options are assumed to refer to Tcl variables and
+# these are set when building so they can be used in the Critcl script.
+# Typically this is used when defining cross-compile environments to set
+# various tcl_platform() values.
+#
+# You can also set Tcl variables to use in "when" options (see the MacOSX
+# section for an example - "set universal ..."). These commands and the
+# "when" commands are run in a separate interpreter.
+#
+# You can also base a build configuration on an existing one by using
+# the "copy" option and then specifically setting the config bits that
+# you want to change. See win32-x86_64-cl for an example.
+
+compile         gcc -c -fPIC
+version         gcc -v
+link            gcc -shared
+include         -I
+libinclude      -L
+preproc_define  gcc -E -dM
+preproc_enum    gcc -E
+tclstubs        -DUSE_TCL_STUBS
+tkstubs         -DUSE_TK_STUBS
+debug_memory    -DTCL_MEM_DEBUG
+debug_symbols   -g
+object          .o
+output          -o [list $outfile]
+embed_manifest  
+ldoutput
+link_debug
+link_release
+link_preload    --unresolved-symbols=ignore-in-shared-libs
+link_rpath      -Wl,-rpath,@
+strip           -Wl,-s
+optimize        -O2
+noassert        -DNDEBUG
+threadflags     -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1    \
+                -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1   \
+                -DTCL_THREADS=1
+
+# platform specific stuff follows
+
+# OSX - check if universal binaries supported by the installed toolchain
+
+if {[string match macosx-* $platform]} {
+    if {[info exists ::env(SDKROOT)] && $::env(SDKROOT) ne ""} {
+        set SDKROOT $::env(SDKROOT)
+    } else {
+        # look for an SDK supporting universal binaries
+        set pos [string length MacOSX]
+	set sdklist {}
+	set base /Developer
+	catch {set base [exec xcode-select -print-path]}
+        foreach dir [glob -nocomplain -tails \
+			    -directory $base/SDKs MacOSX*] {
+            set ver [string trimright \
+                        [file rootname [string range $dir $pos end]] u]
+            if {"$ver" != "" && [package vcompare $ver 10.4] >= 0}  {
+                # 10.4 is earliest supporting universal that we support
+                set path($ver) $dir
+                lappend sdklist $ver
+            }
+        }
+        if {[llength $sdklist]} {
+            set ver [lindex [lsort -command "package vcompare" $sdklist] 0]
+            set SDKROOT $base/SDKs/$path($ver)
+        } else {
+            set SDKROOT  ""
+        }
+    }
+    if {$SDKROOT ne ""} {
+        # get the SDKsettings for the min OSX value supported
+	set info ""
+        if [catch {
+                set info [exec defaults read $SDKROOT/SDKSettings buildSettings]
+        }] {
+            catch {
+                set info [exec defaults read $SDKROOT/SDKSettings DefaultProperties \
+			      -dict MACOSX_DEPLOYMENT_TARGET]
+            }
+        }
+	if {$info eq ""} {
+	    puts stderr "SDKROOT isn't configured correctly on this host"
+	    puts stderr "current setting $SDKROOT needs updating"
+	    exit 1
+	}
+        set info [string trim $info]
+        regsub -all {[\n"\;=\{\}]+} $info "" info ;#" help emacs hilighting
+        regsub -all {\s+} $info " " info
+        set osxmin [lindex $info 1]
+    } else {
+        # use the current platform
+        foreach {v1 v2 v3} [split $::tcl_platform(osVersion) .] break
+        incr v1 -4
+        set osxmin 10.$v1.$v2
+        # do we actually need to check if universal is supported, given the
+        # gcc check below will do it for us?
+        # set info [exec lipo -info /usr/lib/libSystem.dylib]
+        # set plats [split [string trim [lindex [split $info :] 2]]]
+    }
+    if {[info exists ::env(osxmin)] && $::env(osxmin) ne ""} {
+        set osxmin $::env(osxmin)
+    }
+    set universal 0
+    catch {
+	set ppc    [expr {[exec gcc -v -arch ppc    > /dev/null 2>@stdout] eq ""}]
+	set ppc64  [expr {[exec gcc -v -arch ppc64  > /dev/null 2>@stdout] eq ""}]
+	set i386   [expr {[exec gcc -v -arch i386   > /dev/null 2>@stdout] eq ""}]
+	set x86_64 [expr {[exec gcc -v -arch x86_64 > /dev/null 2>@stdout] eq ""}]
+    }
+}
+
+# Note: The result of 'platform::generic' is used to restrict which of
+# the following blocks will be considered.
+
+# Note 2: The platform declarations are required to set up a proper
+# mapping in pkgIndex.tcl of a -pkg.
+
+# default on OSX ppc is universal containing ppc and x86 32 bit
+macosx-powerpc when         $ppc
+macosx-powerpc compile      gcc -c -arch ppc \
+    -isysroot $SDKROOT \
+    -mmacosx-version-min=$osxmin
+macosx-powerpc link         gcc -bundle -arch ppc \
+    -isysroot $SDKROOT \
+    -mmacosx-version-min=$osxmin
+macosx-powerpc link_preload -undefined dynamic_lookup -mmacosx-version-min=10.3
+macosx-powerpc strip
+
+# default on OSX intel is universal containing x86 32 and 64 bit
+macosx-ix86 when            $i386 && $x86_64
+macosx-ix86 compile         gcc -c -arch i386 -arch x86_64 \
+    -isysroot $SDKROOT \
+    -mmacosx-version-min=$osxmin
+macosx-ix86 link            gcc -bundle -arch i386 -arch x86_64 \
+    -isysroot $SDKROOT \
+    -mmacosx-version-min=$osxmin
+macosx-ix86 link_preload    -undefined dynamic_lookup -mmacosx-version-min=10.3
+macosx-ix86 strip
+macosx-ix86 platform        macosx-ix86 $osxmin \
+	    macosx-ix86 \
+	    macosx-x86_64
+
+# target for most common architectures
+macosx-most when            $ppc && $i386 && $x86_64
+macosx-most compile         gcc -c -arch i386 -arch x86_64 -arch ppc \
+    -isysroot $SDKROOT \
+    -mmacosx-version-min=$osxmin
+macosx-most link            gcc -bundle -arch i386 -arch x86_64 -arch ppc \
+    -isysroot $SDKROOT \
+    -mmacosx-version-min=$osxmin
+macosx-most link_preload    -undefined dynamic_lookup -mmacosx-version-min=10.3
+macosx-most strip
+macosx-most platform        macosx-most $osxmin \
+	    macosx-powerpc \
+	    macosx-ix86 \
+	    macosx-x86_64
+
+# target for old universal, ppc and x86 32.
+macosx-universal when            $ppc && $i386
+macosx-universal compile         gcc -c -arch i386 -arch ppc \
+    -isysroot $SDKROOT \
+    -mmacosx-version-min=$osxmin
+macosx-universal link            gcc -bundle -arch i386 -arch ppc \
+    -isysroot $SDKROOT \
+    -mmacosx-version-min=$osxmin
+macosx-universal link_preload    -undefined dynamic_lookup -mmacosx-version-min=10.3
+macosx-universal strip
+macosx-universal platform        macosx-universal $osxmin \
+	    macosx-powerpc \
+	    macosx-ix86
+
+# target for all architectures
+macosx-all when            $ppc && $ppc64 && $i386 && $x86_64
+macosx-all compile         gcc -c -arch i386 -arch x86_64 -arch ppc -arch ppc64 \
+    -isysroot $SDKROOT \
+    -mmacosx-version-min=$osxmin
+macosx-all link            gcc -bundle -arch i386 -arch x86_64 -arch ppc -arch ppc64 \
+    -isysroot $SDKROOT \
+    -mmacosx-version-min=$osxmin
+macosx-all link_preload    -undefined dynamic_lookup -mmacosx-version-min=10.3
+macosx-all strip
+macosx-all platform        macosx-all $osxmin \
+	    macosx-powerpc \
+	    macosx-powerpc64 \
+	    macosx-ix86 \
+	    macosx-x86_64
+
+# OSX ppc 32 bit
+macosx-ppc32 when           $ppc
+macosx-ppc32 compile        gcc -c -arch ppc
+macosx-ppc32 link           gcc -bundle -arch ppc
+macosx-ppc32 link_preload   -undefined dynamic_lookup
+macosx-ppc32 strip
+macosx-ppc32 platform       macosx-powerpc
+
+# OSX ppc 64 bit
+macosx-ppc64 when           $ppc64
+macosx-ppc64 compile        gcc -c -arch ppc64
+macosx-ppc64 link           gcc -bundle -arch ppc64
+macosx-ppc64 link_preload   -undefined dynamic_lookup
+macosx-ppc64 strip
+macosx-ppc64 platform       macosx-powerpc64
+
+# OSX x86 32 bit
+macosx-x86_32 when          $i386
+macosx-x86_32 compile       gcc -c -arch i386
+macosx-x86_32 link          gcc -bundle -arch i386
+macosx-x86_32 link_preload  -undefined dynamic_lookup
+macosx-x86_32 strip
+macosx-x86_32 platform      macosx-ix86
+
+# OSX x86 64 bit
+macosx-x86_64 when          $x86_64
+macosx-x86_64 compile       gcc -c -arch x86_64
+macosx-x86_64 link          gcc -bundle -arch x86_64
+macosx-x86_64 link_preload  -undefined dynamic_lookup
+macosx-x86_64 strip
+macosx-x86_64 platform      macosx-x86_64
+
+# Linux - 32 bit or 64 bit build - select using "-target" if you don't
+#         want the platform default (32 on 32, 64 on 64). This requires
+#         some work to detect the cpu class in use and then set a platform
+#         with the proper variant name.
+
+if {[string match linux-* $platform]} {
+    # platform = os-cpu(-compiler)
+    set cpu [lindex [split $platform -] 1]
+
+    switch -- $cpu {
+	x86_64 - ix86 {
+	    set cpu32 ix86
+	    set cpu64 x86_64
+	}
+	* {
+	    #error "Unknown architecture"
+	    set cpu32 unknown32fixme_$cpu
+	    set cpu64 unknown64fixme_$cpu
+	}
+    }
+}
+
+linux-32-*  compile   gcc -c -m32
+linux-32-*  link      gcc -shared -m32
+linux-32-*  platform  linux-$cpu32
+
+linux-64-*  compile   gcc -c -m64
+linux-64-*  link      gcc -shared -m64
+linux-64-*  platform  linux-$cpu64
+
+# Windows - Check if bufferoverflowU.lib is required, or not. We
+# assume that "requiredness" coincides with "presence". IOW, if the
+# library is present in the LIB search paths, then it is required.
+# This should be ok, for linking to it when it is present but not
+# required, should do no harm.
+
+set msvc 0
+if {[string match win32-* $platform]} {
+    set cl [file nativename [lindex [auto_execok cl] 0]]
+    if {$cl ne ""} {
+	set msvc 1
+
+	set msvcbufferoverflowlib ""
+	foreach p [split $::env(LIB) \;] {
+	    if {[llength [glob -nocomplain -directory $p bufferoverflowu.lib]]} {
+		set msvcbufferoverflowlib bufferoverflowU.lib
+		break
+	    }
+	}
+
+	set tmpfile $::env(TMP)/[pid].txt
+	catch { exec $cl 2> $tmpfile > NUL: } msg
+	#puts "M $msg"
+	set chan [open $tmpfile r]
+	set output [read $chan]
+	#puts "O $output"
+	close $chan
+	file delete $tmpfile
+
+	regexp {Version ([0-9.]*)} $output -> msvcversion
+	#puts V=$msvcversion
+	if {[package vcompare $msvcversion 15.00.30729.01] >= 0} {
+	    # VC9 or higher. -debug:full is not supported anymore.
+	    # VC9 - warning, VC10 - error
+	    set msvclinkdebug -debug
+            # Enable local stack checks for buffer overflow
+            set msvcstackchecks -GS
+            # -GZ deprecated in favor of -RTC1
+            set msvcdebugchecks -RTC1
+            set msvclinkglobaloptimize -ltcg
+	} else {
+	    set msvclinkdebug -debug:full
+            set msvcdebugchecks -GZ
+            set msvcstackchecks ""
+            set msvclinkglobaloptimize ""
+	}
+
+	if {[package vcompare $msvcversion 14] >= 0} {
+            # -Op not supported or needed.  Use -fp instead to match Tcl
+            set msvcfpopt -fp:strict
+            set msvclinkworkingset ""
+        } else {
+            # -Op -> floating point consistency
+            set msvcfpopt -Op
+            # Working set optimization
+            set msvclinkworkingset -ws:aggressive
+        }
+    }
+}
+
+# Windows - using 32-bit MS VC++
+#
+# Note: the language option for cl is -TC for c and -TP for c++ or
+#       it can treat single files -Tc<filename>
+#
+win32-ix86-cl  when            $msvc
+win32-ix86-cl  compile         cl -nologo -c
+win32-ix86-cl  link            link -nologo
+win32-ix86-cl  embed_manifest  mt -manifest [list $outfile].manifest -outputresource:[list $outfile]\;2
+win32-ix86-cl  preproc_define  cl -nologo -E
+win32-ix86-cl  preproc_enum    cl -nologo -E
+win32-ix86-cl  libinclude      /LIBPATH:
+win32-ix86-cl  object          .obj
+win32-ix86-cl  debug_symbols   -W3 -Od -Zi $msvcstackchecks $msvcdebugchecks -MDd -D_DEBUG $msvcfpopt
+win32-ix86-cl  optimize        -W3 -O2 -MD $msvcstackchecks $msvcfpopt
+win32-ix86-cl  output          [list -Fo$outfile]
+win32-ix86-cl  ldoutput        -dll [list -out:$outfile]
+win32-ix86-cl  link_debug      $msvclinkdebug -debugtype:cv -verbose:lib -nodefaultlib:libc
+win32-ix86-cl  link_release    -release -opt:ref -opt:icf,3 $msvclinkworkingset  -verbose:lib $msvclinkglobaloptimize
+win32-ix86-cl  link_preload
+win32-ix86-cl  link_rpath
+win32-ix86-cl  strip
+win32-ix86-cl  version         cl
+win32-ix86-cl  platform        win32-ix86
+
+# Windows - using 64-bit MS VC++
+#
+# Note: the language option for cl is -TC for c and -TP for c++ or
+#       it can treat single files -Tc<filename>
+#
+
+win32-x86_64-cl  when            $msvc
+win32-x86_64-cl  copy            win32-ix86-cl
+win32-x86_64-cl  link_debug      $msvclinkdebug -debugtype:cv -verbose:lib $msvcbufferoverflowlib
+win32-x86_64-cl  link_release    -release -opt:ref -opt:icf,3 $msvclinkworkingset -verbose:lib $msvclinkglobaloptimize $msvcbufferoverflowlib
+win32-x86_64-cl  platform        win32-x86_64
+
+# Cross-compile for Windows using Xmingwin
+mingw32     target         win32-ix86
+mingw32     compile        gcc -c -nostdlib
+mingw32     link           gcc -shared
+mingw32     link_preload
+mingw32     sharedlibext  .dll
+mingw32     tcl_platform(byteOrder)  littleEndian
+mingw32     tcl_platform(machine)    intel
+mingw32     tcl_platform(os)         Windows NT
+mingw32     tcl_platform(osVersion)  5.0
+mingw32     tcl_platform(platform)   windows
+mingw32     tcl_platform(wordSize)   4
+
+# Cross-compile for ARM (n770/Zaurus/etc) using Scratchbox et al
+linux-arm   target
+linux-arm   sharedlibext .so
+linux-arm   tcl_platform(byteOrder)  littleEndian
+linux-arm   tcl_platform(machine)    arm
+linux-arm   tcl_platform(os)         Linux
+linux-arm   tcl_platform(osVersion)  2.6
+linux-arm   tcl_platform(platform)   unix
+linux-arm   tcl_platform(wordSize)   4
+
+# hpux itanium, native cc, 32 and 64bit builds.
+# +z <=> -fPIC on hpux.
+# +DD64 invokes the 64bit mode.
+
+hpux-ia64_32-cc compile         cc -c +z
+hpux-ia64_32-cc link            ld -b
+hpux-ia64_32-cc preproc_define  cc -E
+hpux-ia64_32-cc preproc_enum    cc -E
+hpux-ia64_32-cc link_preload
+hpux-ia64_32-cc strip
+
+hpux-ia64-cc    compile         cc -c +z +DD64
+hpux-ia64-cc    link            ld -b
+hpux-ia64-cc    preproc_define  cc -E
+hpux-ia64-cc    preproc_enum    cc -E
+hpux-ia64-cc    link_preload
+hpux-ia64-cc    strip
+
+# hpux, itanium, gcc
+# This works only if the -lgcc for 64bit is somewhere reachable.
+# hpux-ia64	gcc -c -fPIC -mlp64
+
+hpux-parisc-cc    compile         cc -c +z +DAportable
+hpux-parisc-cc    link            ld -b
+hpux-parisc-cc    preproc_define  cc -E
+hpux-parisc-cc    preproc_enum    cc -E
+hpux-parisc-cc    link_preload
+hpux-parisc-cc    strip
+
+hpux-parisc64-cc  compile         cc -c +z +DA2.0W
+hpux-parisc64-cc  link            ld -b
+hpux-parisc64-cc  preproc_define  cc -E
+hpux-parisc64-cc  preproc_enum    cc -E
+hpux-parisc64-cc  link_preload
+hpux-parisc64-cc  strip
+
+# hpux-parisc, 64bit, gcc
+#
+# For this architecture gcc does not have compiler switches for change
+# between 32/64 results. Rather, gcc has to be built specifically to
+# produce either 32 or 64 bit binaries. And if both results are
+# wanted, it has to be built and installed twice (in different
+# directories).
+#
+# HP provides precompiled binaries of these two variants at
+# http://www.hp.com/go/gcc. Install the desired compiler(s). In case
+# of having both ensure that the desired one is first in the PATH.
+
+# aix, rs6000/powerpc, native cc, 32bit build
+# The link line is pretty much copied from Tcl.
+
+# NOTE: ldAix was copied from Tcl into a directory in the PATH.
+
+# It might make sense to stuff this file into critcl and then copy it
+# out when needed, either into a fixed place, or tempdir. In the
+# latter case the link line needs some way of getting the value
+# substituted into it. I have no idea of the critcl config allows
+# that, and if yes, nor how.
+
+# cc_r = something with thread-enabled. better use it than cc and have
+# things fail.
+
+aix-powerpc-cc    compile         cc_r -c -O
+aix-powerpc-cc    link            ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry -lm -lc
+aix-powerpc-cc    preproc_define  cc -E
+aix-powerpc-cc    preproc_enum    cc -E
+aix-powerpc-cc    link_preload
+aix-powerpc-cc    strip
+
+aix-powerpc64-cc  compile         cc_r -c -O -q64
+aix-powerpc64-cc  link            ldAix /bin/ld -b64 -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry -lm -lc
+aix-powerpc64-cc  preproc_define  cc -E
+aix-powerpc64-cc  preproc_enum    cc -E
+aix-powerpc64-cc  link_preload
+aix-powerpc64-cc  strip
+
+aix-powerpc-xlc    compile         xlc_r -c -O
+aix-powerpc-xlc    link            ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry -lm -lc
+aix-powerpc-xlc    preproc_define  xlc -E
+aix-powerpc-xlc    preproc_enum    xlc -E
+aix-powerpc-xlc    link_preload
+aix-powerpc-xlc    strip
+
+aix-powerpc64-xlc  compile         xlc_r -c -O -q64
+aix-powerpc64-xlc  link            ldAix /bin/ld -b64 -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry -lm -lc
+aix-powerpc64-xlc  preproc_define  xlc -E
+aix-powerpc64-xlc  preproc_enum    xlc -E
+aix-powerpc64-xlc  link_preload
+aix-powerpc64-xlc  strip
+
+# Solaris, Sparc and Intel platforms, 32 and 64 bit
+
+solaris-x86_64-cc   compile         cc -m64 -c -KPIC
+solaris-x86_64-cc   link            /usr/ccs/bin/ld -L/lib/64 -G -lc -lnsl
+solaris-x86_64-cc   preproc_define  cc -E
+solaris-x86_64-cc   preproc_enum    cc -E
+solaris-x86_64-cc   version         cc -V
+solaris-x86_64-cc   link_preload
+solaris-x86_64-cc   strip
+
+solaris-x86_64-gcc  compile         gcc -m64 -c -fPIC
+solaris-x86_64-gcc  link            gcc -m64 -shared
+
+solaris-ix86-cc     compile         cc -m32 -c -KPIC
+solaris-ix86-cc     link            /usr/ccs/bin/ld -G -lc -lnsl
+solaris-ix86-cc     preproc_define  cc -E
+solaris-ix86-cc     preproc_enum    cc -E
+solaris-ix86-cc     version         cc -V
+solaris-ix86-cc     link_preload
+solaris-ix86-cc     strip
+
+solaris-sparc-cc    compile         cc -KPIC -c
+solaris-sparc-cc    link            /usr/ccs/bin/ld -G -lc -lnsl
+solaris-sparc-cc    preproc_define  cc -E
+solaris-sparc-cc    preproc_enum    cc -E
+solaris-sparc-cc    version         cc -V
+solaris-sparc-cc    link_preload
+solaris-sparc-cc    strip
+
+solaris-sparc64-cc  compile         cc -KPIC -xarch=v9 -c
+solaris-sparc64-cc  link            /usr/ccs/bin/ld -G -lc -lnsl
+solaris-sparc64-cc  preproc_define  cc -E
+solaris-sparc64-cc  preproc_enum    cc -E
+solaris-sparc64-cc  version         cc -V
+solaris-sparc64-cc  link_preload
+solaris-sparc64-cc  strip
+
+solaris-sparc64-gcc compile         gcc -m64 -c -fPIC -mcpu=v9
+solaris-sparc64-gcc link            gcc -m64 -shared -mcpu=v9
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl.tcl b/src/vfs/critcl.vfs/lib/critcl/critcl.tcl
new file mode 100644
index 00000000..212847c8
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl.tcl
@@ -0,0 +1,6832 @@
+## -*- tcl -*-
+# # ## ### ##### ######## ############# #####################
+# Pragmas for MetaData Scanner.
+# @mdgen OWNER: Config
+# @mdgen OWNER: critcl_c
+#
+# Copyright (c) 2001-20?? Jean-Claude Wippler
+# Copyright (c) 2002-20?? Steve Landers
+# Copyright (c) 20??-2023 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+# CriTcl Core.
+
+package provide critcl 3.2.1
+
+namespace eval ::critcl {}
+
+# # ## ### ##### ######## ############# #####################
+## Requirements.
+
+package require Tcl 8.6 9 ; # Minimal supported Tcl runtime.
+if {[catch {
+    package require platform 1.0.2 ; # Determine current platform.
+}]} {
+    # Fall back to our internal copy (currently equivalent to platform
+    # 1.0.14(+)) if the environment does not have the official
+    # package.
+    package require critcl::platform
+} elseif {
+    [string match freebsd* [platform::generic]] &&
+    ([platform::generic] eq [platform::identify])
+} {
+    # Again fall back to the internal package if we are on FreeBSD and
+    # the official package does not properly identify the OS ABI
+    # version.
+    package require critcl::platform
+}
+
+# # ## ### ##### ######## ############# #####################
+## https://github.com/andreas-kupries/critcl/issues/112
+#
+## Removed the code ensuring that we have maximal 'info frame' data,
+## if supported. This code was moved into the app-critcl package
+## instead.
+#
+## The issue with having it here is that this changes a global setting
+## of the core, i.e. this will not only affect critcl itself when
+## building binaries, but also the larger environment, i.e. the
+## application using critcl.  Given that this feature being active
+## slows the Tcl core down by about 10%, sometimes more this is not a
+## good decision to make on behalf of the user.
+#
+## In the critcl application itself I am willing to pay the price for
+## the more precise location information in case of compilation
+## failures, and the isolation to that application. For the
+## dynamically `compile & run` in arbitrary environments OTOH not.
+
+# # ## ### ##### ######## ############# #####################
+# This is the md5 package bundled with critcl.
+# No need to look for fallbacks.
+
+proc ::critcl::md5_hex {s} {
+    if {$v::uuidcounter} {
+	return [format %032d [incr v::uuidcounter]]
+    }
+    package require critcl_md5c
+    # As `s` is an arbitrary string of unknown origin we cannot assume
+    # that it contains byte data. And we definitely cannot assume that
+    # it only contains ASCII characters. For MD5 to operate correctly
+    # we have to convert the string into a proper series of bytes.
+    binary scan [md5c [encoding convertto utf-8 $s]] H* md; return $md
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::critcl::lappendlist {lvar list} {
+    if {![llength $list]} return
+    upvar $lvar dest
+    lappend dest {*}$list
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+##
+
+proc ::critcl::buildrequirement {script} {
+    # In regular code this does nothing. It is a marker for
+    # the static scanner to change under what key to record
+    # the 'package require' found in the script.
+    uplevel 1 $script
+}
+
+proc ::critcl::TeapotPlatform {} {
+    # Platform identifier HACK. Most of the data in critcl is based on
+    # 'platform::generic'. The TEApot MD however uses
+    # 'platform::identify' with its detail information (solaris kernel
+    # version, linux glibc version). But, if a cross-compile is
+    # running we are SOL, because we have no place to pull the
+    # necessary detail from, 'identify' is a purely local operation :(
+
+    set platform [actualtarget]
+    if {[platform::generic] eq $platform} {
+	set platform [platform::identify]
+    }
+
+    return $platform
+}
+
+proc ::critcl::TeapotRequire {dspec} {
+    # Syntax of dspec: (a) pname
+    #             ...: (b) pname req-version...
+    #             ...: (c) pname -exact req-version
+    #
+    # We can assume that the syntax is generally ok, because otherwise
+    # the 'package require' itself will fail in a moment, blocking the
+    # further execution of the .critcl file. So we only have to
+    # distinguish the cases.
+
+    if {([llength $dspec] == 3) &&
+	([lindex $dspec 1] eq "-exact")} {
+	# (c)
+	lassign $dspec pn _ pv
+	set spec [list $pn ${pv}-$pv]
+    } else {
+	# (a, b)
+	set spec $dspec
+    }
+
+    return $spec
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: Embed C Code
+
+proc ::critcl::HeaderLines {text} {
+    if {![regexp {^[\t\n ]+} $text header]} {
+	return [list 0 $text]
+    }
+    set lines [regexp -all {\n} $header]
+    # => The C code begins $lines lines after location of the c**
+    #    command. This goes as offset into the generated #line pragma,
+    #    because now (see next line) we throw away this leading
+    #    whitespace.
+    set text [string trim $text]
+    return [list $lines $text]
+}
+
+proc ::critcl::Lines {text} {
+    set n [regexp -all {\n} $text]
+    return $n
+}
+
+proc ::critcl::ccode {text} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+    CCodeCore $file $text
+    return
+}
+
+proc ::critcl::CCodeCore {file text} {
+    set digest [UUID.extend $file .ccode $text]
+
+    set block {}
+    lassign [HeaderLines $text] leadoffset text
+    Transition9Check [at::Loc $leadoffset -3 $file] $text
+    if {$v::options(lines)} {
+	append block [at::CPragma $leadoffset -3 $file]
+    }
+
+    append block $text \n
+    dict update v::code($file) config c {
+	dict lappend c fragments $digest
+	dict set     c block     $digest $block
+	dict lappend c defs      $digest
+    }
+    return
+}
+
+proc ::critcl::ccommand {name anames args} {
+    SkipIgnored [set file [This]]
+    HandleDeclAfterBuild
+
+    # Basic key for the clientdata and delproc arrays.
+    set cname $name[UUID.serial $file]
+
+    if {[llength $args]} {
+	set body [lindex $args 0]
+	set args [lrange $args 1 end]
+    } else {
+	set body {}
+    }
+
+    set clientdata NULL ;# Default: ClientData expression
+    set delproc    NULL ;# Default: Function pointer expression
+    set acname     0
+    set tname      ""
+    while {[string match "-*" $args]} {
+        switch -- [set opt [lindex $args 0]] {
+	    -clientdata { set clientdata [lindex $args 1] }
+	    -delproc    { set delproc    [lindex $args 1] }
+	    -cname      { set acname     [lindex $args 1] }
+	    -tracename  { set tname      [lindex $args 1] }
+	    default {
+		error "Unknown option $opt, expected one of -clientdata, -cname, -delproc"
+	    }
+        }
+        set args [lrange $args 2 end]
+    }
+
+    # Put body back into args for integration into the MD5 uuid
+    # generated for mode compile&run. Bug and fix reported by Peter
+    # Spjuth.
+    lappend args $body
+
+    if {$acname} {
+	BeginCommand static $name $anames $args
+	set ns    {}
+	set cns   {}
+	set key   $cname
+	set wname $name
+	if {$tname ne {}} {
+	    set traceref \"$tname\"
+	} else {
+	    set traceref \"$name\"
+	}
+    } else {
+	lassign [BeginCommand public $name $anames $args] ns cns name cname
+	set key   [string map {:: _} $ns$cname]
+	set wname tcl_$cns$cname
+	set traceref   ns_$cns$cname
+    }
+
+    # XXX clientdata/delproc, either note clashes, or keep information per-file.
+
+    set v::clientdata($key) $clientdata
+    set v::delproc($key) $delproc
+
+    #set body [join $args]
+    if {$body != ""} {
+	lappend anames ""
+	foreach {cd ip oc ov} $anames break
+	if {$cd eq ""} { set cd clientdata }
+	if {$ip eq ""} { set ip interp }
+	if {$oc eq ""} { set oc objc }
+	if {$ov eq ""} { set ov objv }
+
+	set ca "(ClientData $cd, Tcl_Interp *$ip, Tcl_Size $oc, Tcl_Obj *CONST $ov\[])"
+
+	if {$v::options(trace)} {
+	    # For ccommand tracing we will emit a shim after the implementation.
+	    # Give the implementation a different name.
+	    Emitln "static int\n${wname}_actual$ca"
+	} else {
+	    Emitln "static int\n$wname$ca"
+	}
+
+	Emit   \{\n
+	lassign [HeaderLines $body] leadoffset body
+	Transition9Check [at::Loc $leadoffset -2 $file] $body
+	if {$v::options(lines)} {
+	    Emit [at::CPragma $leadoffset -2 $file]
+	}
+	Emit   $body
+	Emitln \n\}
+
+	# Now emit the call to the ccommand tracing shim. It simply
+	# calls the regular implementation and places the tracing
+	# around that.
+	if {$v::options(trace)} {
+	    Emitln "\nstatic int\n$wname$ca"
+	    Emitln \{
+	    Emitln "  int _rv;"
+	    Emitln "  critcl_trace_cmd_args ($traceref, $oc, $ov);"
+	    Emitln "  _rv = ${wname}_actual ($cd, $ip, $oc, $ov);"
+	    Emitln "  return critcl_trace_cmd_result (_rv, $ip);"
+	    Emitln \}
+	}
+    } else {
+	# if no body is specified, then $anames is alias for the real cmd proc
+	Emitln "#define $wname $anames"
+	Emitln "int $anames\(\);"
+    }
+    EndCommand
+    return
+}
+
+proc ::critcl::cdata {name data} {
+    SkipIgnored [This]
+    HandleDeclAfterBuild
+    binary scan $data c* bytes ;# split as bytes, not (unicode) chars
+
+    set inittext ""
+    set line ""
+    foreach x $bytes {
+	if {[string length $line] > 70} {
+	    append inittext "    " $line \n
+	    set line ""
+	}
+	append line $x ,
+    }
+    append inittext "    " $line
+
+    set count [llength $bytes]
+
+    set body [subst [Cat [Template cdata.c]]]
+    #               ^=> count, inittext
+
+    # NOTE: The uplevel is needed because otherwise 'ccommand' will
+    # not properly determine the caller's namespace.
+    uplevel 1 [list critcl::ccommand $name {dummy ip objc objv} [at::caller!]$body]
+    return $name
+}
+
+proc ::critcl::cdefines {defines {namespace "::"}} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+    set digest [UUID.extend $file .cdefines [list $defines $namespace]]
+
+    dict update v::code($file) config c {
+	foreach def $defines {
+	    dict set c const $def $namespace
+	}
+    }
+    return
+}
+
+proc ::critcl::MakeDerivedType {type ev} {
+    upvar 1 $ev errmsg
+    foreach synth {
+	MakeScalarLimited
+	MakeList
+    } {
+	set ltype [$synth $type errmsg]
+	if {$ltype eq {}} continue
+	return $ltype
+    }
+    return
+}
+
+# Dynamically create an arg-type for "(length-limited) list (of T)".
+proc ::critcl::MakeList {type ev} {
+    # Check for basic syntax.
+    # Accept the list indicator syntax as either prefix or suffix of the base type.
+
+    if {![regexp {^\[(\d*|\*)\](.*)$} $type -> limit base]} {
+	if {![regexp {^(.*)\[(\d*|\*)\]$} $type -> base limit]} {
+	    return
+	}
+    }
+
+    # This looks like a list type, start recording errors
+
+    if {($base ne {}) && ![has-argtype $base]} {
+	# XXX TODO: Recurse into the base for possible further synthesis.
+	set err "list: Unknown base type '$base'"
+	return
+    }
+    if {($limit ne {}) && ($limit == 0)} {
+	set err "list: Bad size 0, i.e. would be empty"
+	return
+    }
+
+    # (LIST) Note: The '[]' and '[*]', i.e. unlimited lists of any type cannot appear here, because
+    # they exist as standard builtins. This means that at least one of base or limit is __not__ empty.
+
+    set ntype list
+
+    if {$base eq {}} {
+	append ntype _obj
+    } else {
+	append ntype _$base
+    }
+
+    # Save the type-specific list type, without length restrictions factored in.
+    # This is what we need for the data structures and conversion, nothing more.
+    # IOW we do not wish to create multiple different types and functions for the
+    # same list type, just different length restrictions.
+    set nctype $ntype
+
+    if {$limit in {{} *}} {
+        set limit {}
+	append ntype _any
+    } else {
+	append ntype _$limit
+    }
+
+    # Check if this list type was seen before
+    if {[has-argtype $ntype]} { return $ntype }
+
+    # Generate the validator for this kind of list.
+
+    if {$base eq {}} {
+	# Without a base type simply start from `list`.
+
+	set ctype [ArgumentCType      list]
+	set code  [ArgumentConversion list]
+	set new $code
+    } else {
+	# With a base type the start is not quite `list`. Because the C type is different, and we
+	# need a proper place for the list of Tcl_Obj* to get the element from.
+
+	set new {
+	    int k;
+	    Tcl_Obj** el;
+	    if (Tcl_ListObjGetElements (interp, @@, /* OK tcl9 */
+			&(@A.c), &el) != TCL_OK) return TCL_ERROR;
+	    @A.o = @@;
+	}
+    }
+
+    if {$limit ne {}} {
+	# Check that the list conforms to the expected size
+	append new \
+	    "\n\t/* Size check, assert (length (list) == $limit) */" \
+	    "\n\tif (@A.c != $limit) \{" \
+	    "\n\t    Tcl_AppendResult (interp, \"Expected a list of $limit\", NULL);" \
+	    "\n\t    return TCL_ERROR;" \
+	    "\n\t\}"
+    }
+
+    if {$base eq {}} {
+	# Without a base type we have a length-limited plain list, and there nothing more to do.
+
+	argtype $ntype $new $ctype $ctype
+	argtypesupport $ntype [ArgumentSupport list]
+
+	return $ntype
+    }
+
+    # With a base type it is now time to synthesize something more complex to validate the list
+    # elements against the base type. `el` is the array of Tcl_Obj* holding the unconverted raw
+    # values. See `MakeVariadicTypeFor` too. It uses the same general schema, applied to the list of
+    # remaining cproc 'args'.
+
+    lappend one @@  src
+    lappend one &@A dst
+    lappend one @A  *dst
+    lappend one @A. dst->
+
+    lappend map @1conv@  [Deline [string map $one [ArgumentConversion $base]]]
+    lappend map @type@   [ArgumentCType $base]
+    lappend map @ntype@  $ntype
+    lappend map @nctype@ $nctype
+
+    append new [string map $map {
+	@A.v = (@type@*) ((!@A.c) ? 0 : ckalloc (@A.c * sizeof (@type@)));
+	for (k = 0; k < @A.c; k++) {
+	    if (_critcl_@nctype@_item (interp, el[k], &(@A.v[k])) != TCL_OK) {
+		ckfree ((char*) @A.v); /* Cleanup partial work */
+		return TCL_ERROR;
+	    }
+	}
+    }]
+
+    argtype $ntype $new critcl_$nctype critcl_$nctype
+
+    argtypesupport $ntype [string map $map {
+	/* NOTE: Array 'v' is allocated on the heap. The argument
+	// release code is used to free it after the worker
+	// function returned. Depending on type and what is done
+	// by the worker it may have to make copies of the data.
+	*/
+
+	typedef struct critcl_@nctype@ {
+	    Tcl_Obj* o; /* Original list object, for pass-through cases */
+	    Tcl_Size c; /* Element count */
+	    @type@*  v; /* Allocated array of the elements */
+	} critcl_@nctype@;
+
+	static int
+	_critcl_@nctype@_item (Tcl_Interp* interp, Tcl_Obj* src, @type@* dst) {
+	    @1conv@
+	    return TCL_OK;
+	}
+    }] $nctype
+
+    argtyperelease $ntype [string map $map {
+	if (@A.c) { ckfree ((char*) @A.v); }
+    }]
+
+    return $ntype
+}
+
+proc ::critcl::MakeScalarLimited {type ev} {
+    upvar 1 $ev errmsg
+    if {[catch {llength $type}]} return
+
+    if {[lindex $type 0] ni {
+	int long wideint double float
+    }} return
+
+    # At this point we assume that it can be a restricted scalar type and we record errors.
+
+    set limits [lassign $type base]
+    set n [llength $type]
+    if {($n < 3) || (($n % 2) == 0)} { set err "$type: Incomplete restriction" ; return }
+
+    foreach {op _} $limits {
+	if {$op in {> < >= <=}} continue
+	set err "$type: Bad relation '$op'"
+	return
+    }
+
+    if {$base in {int long wideint}} {
+	foreach {_ v} $limits {
+	    if {[string is integer -strict $v]} continue
+	    set err "$base: Expected integer, have '$v'"
+	    return
+	}
+    } else {
+	# double or float
+	foreach {_ v} $limits {
+	    if {[string is double -strict $v]} continue
+	    set err "$base: Expected float, have '$v'"
+	    return
+	}
+    }
+
+    # This looks mostly good. Condense the set of restrictions into a simple min/max range
+    lassign {} mingt minge maxlt maxle
+
+    # Phase 1. Fuse identical kind of restrictions into a single of their type
+    foreach {op v} $limits {
+	switch -exact -- $op {
+	    >  { if {($mingt eq {}) || ($v > $mingt)} { set mingt $v } }
+	    >= { if {($minge eq {}) || ($v > $minge)} { set minge $v } }
+	    <  { if {($maxlt eq {}) || ($v < $maxlt)} { set maxlt $v } }
+	    <= { if {($maxle eq {}) || ($v < $maxle)} { set maxle $v } }
+	}
+    }
+
+    # Phase 2. Fuse similar (lt/le, gt/ge) into a single
+
+    if {($mingt ne {}) && ($minge ne {})} {
+	# We have both x >  a &&
+	#              x >= b
+	# ... Determine the stricter form.
+
+	# a  > b => ">  a"
+	# a  < b => ">= b"
+	# a == b => ">  a"
+
+	if {$mingt >= $minge} {
+	    set min   $mingt
+	    set minop >
+	} else {
+	    set min   $minge
+	    set minop >=
+	}
+    } elseif {$mingt ne {}} {
+	# x > a only
+	set min   $mingt
+	set minop >
+    } elseif {$minge ne {}} {
+	# x >= a only
+	set min   $minge
+	set minop >=
+    } else {
+	# No limit
+	lassign {} min minop
+    }
+
+    if {($maxlt ne {}) && ($maxle ne {})} {
+	# We have both x <  a &&
+	#              x <= b
+	# ... Determine the stricter form.
+
+	# a  > b => "<= b"
+	# a  < b => "<  a"
+	# a == b => "<  a"
+
+	if {$maxlt <= $maxle} {
+	    set max   $maxlt
+	    set maxop <
+	} else {
+	    set max   $maxle
+	    set maxop <=
+	}
+    } elseif {$maxlt ne {}} {
+	# x > a only
+	set max   $maxlt
+	set maxop <
+    } elseif {$maxle ne {}} {
+	# x >= a only
+	set max   $maxle
+	set maxop <=
+    } else {
+	# No limit
+	lassign {} max maxop
+    }
+
+    if {($min ne {}) && ($max ne {})} {
+	# With both limits they may specify an empty range, or a range allowing only single value.
+	# That is not sensible.
+
+	# a <  x <  b -- a >= b is empty
+	# a <= x <  b -- a >= b is empty
+	# a <  x <= b -- a >= b is empty
+	# a <= x <= b -- a >  b is empty, a == b is singular,
+
+	# Reduced checks:
+	# - a >  b is empty
+	# - a == b is singular if both <=, else empty
+
+	if {($min > $max)} {
+	    set err "$base: Limits do not allow any value as valid"
+	    return
+	}
+	if {$min == $max} {
+	    if {$minop$maxop eq ">=<=")} {
+		set err "$base: Limits only allow a single value as valid: $min"
+	    } else {
+		set err "$base: Limits do not allow any value as valid"
+	    }
+	    return
+	}
+    }
+
+    # Compute canonical type from the fused ranges.
+
+    set ntype $base
+    if {$min ne {}} { lappend ntype $minop $min }
+    if {$max ne {}} { lappend ntype $maxop $max }
+
+    # Check if we saw this canonical type before.
+
+    if {[has-argtype $ntype]} { return $ntype }
+
+    # Generate the new type
+
+    set ctype [ArgumentCType      $base]
+    set code  [ArgumentConversion $base]
+
+    set head  "expected $ntype, but got \\\""
+    set tail  "\\\""
+    set msg   "\"$head\", Tcl_GetString (@@), \"$tail\""
+    set new $code
+
+    if {$min ne {}} {
+	append new \
+	    "\n\t/* Range check, assert (x $minop $min) */" \
+	    "\n\tif (!(@A $minop $min)) \{" \
+	    "\n\t    Tcl_AppendResult (interp, $msg, NULL);" \
+	    "\n\t    return TCL_ERROR;" \
+	    "\n\t\}"
+    }
+    if {$max ne {}} {
+	append new \
+	    "\n\t/* Range check, assert (x $maxop $max) */" \
+	    "\n\tif (!(@A $maxop $max)) \{" \
+	    "\n\t    Tcl_AppendResult (interp, $msg, NULL);" \
+	    "\n\t    return TCL_ERROR;" \
+	    "\n\t\}"
+    }
+
+    argtype $ntype $new $ctype $ctype
+
+    return $ntype
+}
+
+proc ::critcl::MakeVariadicTypeFor {type} {
+    # Note: The type "Tcl_Obj*" required special treatment and is
+    # directly defined as a builtin, see 'Initialize'. The has-argtype
+    # check below will prevent us from trying to create something
+    # generic, and wrong.
+
+    set ltype variadic_$type
+    if {![has-argtype $ltype]} {
+	# Generate a type representing a list/array of <type>
+	# elements, plus conversion code. Similar to the 'list' type,
+	# except for custom C types, and conversion assumes variadic,
+	# not single argument.
+
+	lappend one @@  src
+	lappend one &@A dst
+	lappend one @A  *dst
+	lappend one @A. dst->
+	lappend map @1conv@ [Deline [string map $one [ArgumentConversion $type]]]
+
+	lappend map @type@  [ArgumentCType $type]
+	lappend map @ltype@ $ltype
+
+	argtype $ltype [string map $map {
+	    int src, dst, leftovers = @C;
+	    @A.c = leftovers;
+	    @A.v = (@type@*) ((!leftovers) ? 0 : ckalloc (leftovers * sizeof (@type@)));
+	    @A.o = (Tcl_Obj**) &ov[@I];
+	    for (src = @I, dst = 0; leftovers > 0; dst++, src++, leftovers--) {
+	       if (_critcl_variadic_@type@_item (interp, ov[src], &(@A.v[dst])) != TCL_OK) {
+		   ckfree ((char*) @A.v); /* Cleanup partial work */
+		   return TCL_ERROR;
+	       }
+	    }
+	}] critcl_$ltype critcl_$ltype
+
+	argtypesupport $ltype [string map $map {
+	    /* NOTE: Array 'v' is allocated on the heap. The argument
+	    // release code is used to free it after the worker
+	    // function returned. Depending on type and what is done
+	    // by the worker it may have to make copies of the data.
+	    */
+
+	    typedef struct critcl_@ltype@ {
+		Tcl_Obj** o; /* Original object array */
+		int       c; /* Element count */
+		@type@*   v; /* Allocated array of the elements */
+	    } critcl_@ltype@;
+
+	    static int
+	    _critcl_variadic_@type@_item (Tcl_Interp* interp, Tcl_Obj* src, @type@* dst) {
+		@1conv@
+		return TCL_OK;
+	    }
+	}]
+
+	argtyperelease $ltype [string map $map {
+	    if (@A.c) { ckfree ((char*) @A.v); }
+	}]
+    }
+    return $ltype
+}
+
+proc ::critcl::ArgsInprocess {adefs skip} {
+    # Convert the regular arg spec from the API into a dictionary
+    # containing all the derived data we need in the various places of
+    # the cproc implementation.
+
+    set db {}
+
+    set names    {} ; # list of raw argument names
+    set cnames   {} ; # list of C var names for the arguments.
+    set optional {} ; # list of flags signaling optional args.
+    set variadic {} ; # list of flags signaling variadic args.
+    set islast   {} ; # list of flags signaling the last arg.
+    set varargs  no ; # flag signaling 'args' collector.
+    set defaults {} ; # list of default values.
+    set csig     {} ; # C signature of worker function.
+    set tsig     {} ; # Tcl signature for frontend/shim command.
+    set vardecls {} ; # C variables for arg conversion in the shim.
+    set support  {} ; # Conversion support code for arguments.
+    set has      {} ; # Types for which we have emitted the support
+                      # code already. (dict: type -> '.' (presence))
+    set hasopt   no ; # Overall flag - Have optionals ...
+    set min      0  ; # Count required args - minimal needed.
+    set max      0  ; # Count all args      - maximal allowed.
+    set aconv    {} ; # list of the basic argument conversions.
+    set achdr    {} ; # list of arg conversion annotations.
+    set arel     {} ; # List of arg release code fragments, for those which have them.
+
+    # Normalization, and typo fixing:
+    # - Remove singular commas from the list.
+    # - Strip argument names of trailing commas.
+    # - Strip type names of leading commas.
+    # Reason: Handle mistakenly entered C syntax for a function/command.
+    #
+    # Newly accepted syntax:
+    # = int x , int y ...
+    # = int x, int y ...
+    # = int x ,int y ...
+
+    # TODO: lmap.
+    set adefnew {}
+    set mode type
+    foreach word $adefs {
+	if {$word eq ","} continue
+	switch -exact -- $mode {
+	    type { lappend adefnew [string trimleft  $word ,] ; set mode args }
+	    args { lappend adefnew [string trimright $word ,] ; set mode type }
+	}
+    }
+    set adefs $adefnew ; unset adefnew mode
+
+    # A 1st argument matching "Tcl_Interp*" does not count as a user
+    # visible command argument. But appears in both signature and
+    # actual list of arguments.
+    if {[lindex $adefs 0] eq "Tcl_Interp*"} {
+	lappend csig   [lrange $adefs 0 1]
+	lappend cnames interp;#Fixed name for cproc[lindex $adefs 1]
+	set adefs [lrange $adefs 2 end]
+    }
+
+    set last [expr {[llength $adefs]/2-1}]
+    set current 0
+
+    foreach {t a} $adefs {
+	# t = type
+	# a = name | {name default}
+
+	# Check for a special case of list syntax, where the list indicator is written as suffix of
+	# the argument name, instead of attached to the base type. When found normalize to the
+	# expected form. I.e. transform a spec of the form `type a[...]` into `[...]type a`.
+	#
+	# Note that the argument name may be packaged with a default value. Ensure that we deail
+	# with only the name itself.
+
+	set hasdefault [expr {[llength $a] == 2}]
+	lassign $a name defaultvalue
+
+	if {[regexp {^(.+)(\[(\d*|\*)\])$} $name -> abase limit _]} {
+	    set name $abase
+	    set t $limit$t
+	}
+
+	# Check type validity
+
+	if {![has-argtype $t]} {
+	    # XXXA Attempt to compute a derived type on the fly.
+	    set err "Argument type '$t' is not known"
+	    set ltype [MakeDerivedType $t err]
+	    if {$ltype eq {}} {
+		return -code error $err
+	    }
+
+	    set t $ltype
+	}
+
+	# Base type support
+	if {![dict exists $has $t]} {
+	    dict set has $t .
+	    lappend support "[ArgumentSupport $t]"
+	}
+
+	lappend islast [expr {$current == $last}]
+
+	# Cases to consider:
+	# 1. 'args' as the last argument, without a default.
+	# 2. Any argument with a default value.
+	# 3. Any argument.
+
+	if {($current == $last) && ($name eq "args") && !$hasdefault} {
+	    set hdr  "  /* ($t $name, ...) - - -- --- ----- -------- */"
+	    lappend optional 0
+	    lappend variadic 1
+	    lappend defaults n/a
+	    lappend tsig ?${name}...?
+	    set varargs yes
+	    set max     Inf ; # No limit on the number of args.
+
+	    # Dynamically create an arg-type for "variadic list of T".
+	    set t [MakeVariadicTypeFor $t]
+	    # List support.
+	    if {![dict exists $has $t]} {
+		dict set has $t .
+		lappend support "[ArgumentSupport $t]"
+	    }
+
+	} elseif {$hasdefault} {
+	    incr max
+	    set hasopt yes
+	    set hdr  "  /* ($t $name, optional, default $defaultvalue) - - -- --- ----- -------- */"
+	    lappend tsig ?${name}?
+	    lappend optional 1
+	    lappend variadic 0
+	    lappend defaults $defaultvalue
+	    lappend cnames   _has_$name
+	    # Argument to signal if the optional argument was set
+	    # (true) or is the default (false).
+	    lappend csig     "int has_$name"
+	    lappend vardecls "int _has_$name = 0;"
+
+	} else {
+	    set hdr  "  /* ($t $name) - - -- --- ----- -------- */"
+	    lappend tsig $name
+	    incr max
+	    incr min
+	    lappend optional 0
+	    lappend variadic 0
+	    lappend defaults n/a
+	}
+
+        lappend achdr    $hdr
+	lappend csig     "[ArgumentCTypeB $t] $name"
+	lappend vardecls "[ArgumentCType  $t] _$name;"
+
+	lappend names  $name
+	lappend cnames _$name
+	lappend aconv  [TraceReturns "\"$t\" argument" [ArgumentConversion $t]]
+
+        set rel [ArgumentRelease $t]
+        if {$rel ne {}} {
+	    set rel [string map [list @A _$name] $rel]
+	    set hdr [string map {( {(Release: }} $hdr]
+	    lappend arel "$hdr$rel"
+	}
+
+	incr current
+    }
+
+    set thresholds {}
+    if {$hasopt} {
+	# Compute thresholds for optional arguments. The threshold T
+	# of an optional argument A is the number of required
+	# arguments _after_ A. If during arg processing more than T
+	# arguments are left then A can take the current word,
+	# otherwise A is left to its default. We compute them from the
+	# end.
+	set t 0
+	foreach o [lreverse $optional] {
+	    if {$o} {
+		lappend thresholds $t
+	    } else {
+		lappend thresholds -
+		incr t
+	    }
+	}
+	set thresholds [lreverse $thresholds]
+    }
+
+    set tsig [join $tsig { }]
+    if {$tsig eq {}} {
+	set tsig NULL
+    } else {
+	set tsig \"$tsig\"
+    }
+
+    # Generate code for wrong#args checking, based on the collected
+    # min/max information. Cases to consider:
+    #
+    # a. max == Inf && min == 0   <=> All argc allowed.
+    # b. max == Inf && min  > 0   <=> Fail argc < min.
+    # c. max  < Inf && min == max <=> Fail argc != min.
+    # d. max  < Inf && min  < max <=> Fail argc < min || max < argc
+
+    if {$max == Inf} {
+	# a, b
+	if {!$min} {
+	    # a: nothing to check.
+	    set wacondition {}
+	} else {
+	    # b: argc < min
+	    set wacondition {oc < MIN_ARGS}
+	}
+    } else {
+	# c, d
+	if {$min == $max} {
+	    # c: argc != min
+	    set wacondition {oc != MIN_ARGS}
+	} else {
+	    # d: argc < min || max < argc
+	    set wacondition {(oc < MIN_ARGS) || (MAX_ARGS < oc)}
+	}
+    }
+
+    # Generate conversion code for arguments. Use the threshold
+    # information to handle optional arguments at all positions.
+    # The code is executed after the wrong#args check.
+    # That means we have at least 'min' arguments, enough to fill
+    # all the required parameters.
+
+    set map {}
+    set conv   {}
+    set opt    no
+    set idx    $skip
+    set    prefix   "  idx_  = $idx;" ; # Start at skip offset!
+    append prefix "\n  argc_ = oc - $idx;"
+    foreach \
+	name $names \
+	t $thresholds \
+	o $optional \
+	v $variadic \
+	l $islast   \
+	h $achdr \
+	c $aconv \
+	d $defaults {
+
+	# Things to consider:
+	# 1. Required variables at the beginning.
+	#    We can access these using fixed indices.
+	# 2. Any other variable require access using a dynamic index
+	#    (idx_). During (1) we maintain the code initializing
+	#    this.
+
+	set useindex [expr {!$l}] ;# last arg => no need for idx/argc updates
+
+	if {$v} {
+	    # Variadic argument. Can only be last.
+	    # opt  => dynamic access at idx_..., collect argc_
+	    # !opt => static access at $idx ..., collect oc-$idx
+
+	    unset   map
+	    lappend map @A _$name
+	    if {$opt} {
+		lappend map @I idx_ @C argc_
+	    } else {
+		lappend map @I $idx @C (oc-$idx)
+	    }
+
+	    set c   [string map $map $c]
+
+	    lappend conv $h
+	    lappend conv $c
+	    lappend conv {}
+	    lappend conv {}
+	    break
+	}
+
+	if {$o} {
+	    # Optional argument. Anywhere. Check threshold.
+
+	    unset   map
+	    lappend map @@ "ov\[idx_\]"
+	    lappend map @A _$name
+
+	    set c   [string map $map $c]
+
+	    if {$prefix ne {}} { lappend conv $prefix\n }
+	    lappend conv $h
+	    lappend conv "  if (argc_ > $t) \{"
+	    lappend conv $c
+	    if {$useindex} {
+		lappend conv "    idx_++;"
+		lappend conv "    argc_--;"
+	    }
+	    lappend conv "    _has_$name = 1;"
+	    lappend conv "  \} else \{"
+	    lappend conv "    _$name = $d;"
+	    lappend conv "  \}"
+	    lappend conv {}
+	    lappend conv {}
+
+	    set prefix {}
+	    set opt    yes
+	    continue
+	}
+
+	if {$opt} {
+	    # Required argument, after one or more optional arguments
+	    # were processed. Access to current word is dynamic.
+
+	    unset   map
+	    lappend map @@ "ov\[idx_\]"
+	    lappend map @A _$name
+
+	    set c   [string map $map $c]
+
+	    lappend conv $h
+	    lappend conv $c
+	    lappend conv {}
+	    if {$useindex} {
+		lappend conv "  idx_++;"
+		lappend conv "  argc_--;"
+	    }
+	    lappend conv {}
+	    lappend conv {}
+	    continue
+	}
+
+	# Required argument. No optionals processed yet. Access to
+	# current word is via static index.
+
+        unset   map
+	lappend map @@ "ov\[$idx\]"
+        lappend map @A _$name
+
+	set c   [string map $map $c]
+
+	lappend conv $h
+	lappend conv $c
+	lappend conv {}
+	lappend conv {}
+
+	incr idx
+	set    prefix   "  idx_  = $idx;"
+	append prefix "\n  argc_ = oc - $idx;"
+    }
+    set conv [Deline [join $conv \n]]
+
+    # Save results ...
+
+    dict set db skip        $skip
+    dict set db aconv       $conv
+    dict set db arelease    $arel
+    dict set db thresholds  $thresholds
+    dict set db wacondition $wacondition
+    dict set db min         $min
+    dict set db max         $max
+    dict set db tsignature  $tsig
+    dict set db names       $names
+    dict set db cnames      $cnames
+    dict set db optional    $optional
+    dict set db variadic    $variadic
+    dict set db islast      $islast
+    dict set db defaults    $defaults
+    dict set db varargs     $varargs
+    dict set db csignature  $csig
+    dict set db vardecls    $vardecls
+    dict set db support     $support
+    dict set db hasoptional $hasopt
+
+    #puts ___________________________________________________________|$adefs
+    #array set __ $db ; parray __
+    #puts _______________________________________________________________\n
+    return $db
+}
+
+proc ::critcl::argoptional {adefs} {
+    set optional {}
+
+    # A 1st argument matching "Tcl_Interp*" does not count as a user
+    # visible command argument.
+    if {[lindex $adefs 0] eq "Tcl_Interp*"} {
+	set adefs [lrange $adefs 2 end]
+    }
+
+    foreach {t a} $adefs {
+	if {[llength $a] == 2} {
+	    lappend optional 1
+	} else {
+	    lappend optional 0
+	}
+    }
+
+    return $optional
+}
+
+proc ::critcl::argdefaults {adefs} {
+    set defaults {}
+
+    # A 1st argument matching "Tcl_Interp*" does not count as a user
+    # visible command argument.
+    if {[lindex $adefs 0] eq "Tcl_Interp*"} {
+	set adefs [lrange $adefs 2 end]
+    }
+
+    foreach {t a} $adefs {
+	if {[llength $a] == 2} {
+	    lappend defaults [lindex $a 1]
+	}
+    }
+
+    return $defaults
+}
+
+proc ::critcl::argnames {adefs} {
+    set names {}
+
+    # A 1st argument matching "Tcl_Interp*" does not count as a user
+    # visible command argument.
+    if {[lindex $adefs 0] eq "Tcl_Interp*"} {
+	set adefs [lrange $adefs 2 end]
+    }
+
+    foreach {t a} $adefs {
+	if {[llength $a] == 2} {
+	    set a [lindex $a 0]
+	}
+	lappend names $a
+    }
+
+    return $names
+}
+
+proc ::critcl::argcnames {adefs {interp ip}} {
+    set cnames {}
+
+    if {[lindex $adefs 0] eq "Tcl_Interp*"} {
+	lappend cnames interp
+	set     adefs  [lrange $adefs 2 end]
+    }
+
+    foreach {t a} $adefs {
+	if {[llength $a] == 2} {
+	    set a [lindex $a 0]
+	    lappend cnames _has_$a
+	}
+	lappend cnames _$a
+    }
+
+    return $cnames
+}
+
+proc ::critcl::argcsignature {adefs} {
+    # Construct the signature of the low-level C function.
+
+    set cargs {}
+
+    # If the 1st argument is "Tcl_Interp*", we pass it without
+    # counting it as a command argument.
+
+    if {[lindex $adefs 0] eq "Tcl_Interp*"} {
+	lappend cargs  [lrange $adefs 0 1]
+	set     adefs  [lrange $adefs 2 end]
+    }
+
+    foreach {t a} $adefs {
+	if {[llength $a] == 2} {
+	    set a [lindex $a 0]
+	    # Argument to signal if the optional argument was set
+	    # (true) or is the default (false).
+	    lappend cargs "int has_$a"
+	}
+	lappend cargs  "[ArgumentCTypeB $t] $a"
+    }
+
+    return $cargs
+}
+
+proc ::critcl::argvardecls {adefs} {
+    # Argument variables, destinations for the Tcl -> C conversion.
+
+    # A 1st argument matching "Tcl_Interp*" does not count as a user
+    # visible command argument.
+    if {[lindex $adefs 0] eq "Tcl_Interp*"} {
+	set adefs [lrange $adefs 2 end]
+    }
+
+    set result {}
+    foreach {t a} $adefs {
+	if {[llength $a] == 2} {
+	    set a [lindex $a 0]
+	    lappend result "[ArgumentCType $t] _$a;\n  int _has_$a = 0;"
+	} else {
+	    lappend result "[ArgumentCType $t] _$a;"
+	}
+    }
+
+    return $result
+}
+
+proc ::critcl::argsupport {adefs} {
+    # Argument global support, outside/before function.
+
+    # A 1st argument matching "Tcl_Interp*" does not count as a user
+    # visible command argument.
+    if {[lindex $adefs 0] eq "Tcl_Interp*"} {
+	set adefs [lrange $adefs 2 end]
+    }
+
+    set has {}
+
+    set result {}
+    foreach {t a} $adefs {
+	if {[lsearch -exact $has $t] >= 0} continue
+	lappend has $t
+	lappend result "[ArgumentSupport $t]"
+    }
+
+    return $result
+}
+
+proc ::critcl::argconversion {adefs {n 1}} {
+    # A 1st argument matching "Tcl_Interp*" does not count as a user
+    # visible command argument.
+    if {[lindex $adefs 0] eq "Tcl_Interp*"} {
+	set adefs [lrange $adefs 2 end]
+    }
+
+    set min $n ; # count all non-optional arguments. min required.
+    foreach {t a} $adefs {
+	if {[llength $a] == 2} continue
+	incr min
+    }
+
+    set result {}
+    set opt 0
+    set prefix "    idx_ = $n;\n"
+
+    foreach {t a} $adefs {
+	if {[llength $a] == 2} {
+	    # Optional argument. Can be first, or later.
+	    # For the first the prefix gives us the code to initialize idx_.
+
+	    lassign $a a default
+
+	    set map [list @@ "ov\[idx_\]" @A _$a]
+	    set code [string map $map [ArgumentConversion $t]]
+
+	    set code "${prefix}  if (oc > $min) \{\n$code\n    idx_++;\n    _has_$a = 1;\n  \} else \{\n    _$a = $default;\n  \}"
+	    incr min
+
+	    lappend result "  /* ($t $a, optional, default $default) - - -- --- ----- -------- */"
+	    lappend result $code
+	    lappend result {}
+	    set opt 1
+	    set prefix ""
+	} elseif {$opt} {
+	    # Fixed argument, after the optionals.
+	    # Main issue: Use idx_ to access the array.
+	    # We know that no optionals can follow, only the same.
+
+	    set map [list @@ "ov\[idx_\]" @A _$a]
+	    lappend result "  /* ($t $a) - - -- --- ----- -------- */"
+	    lappend result [string map $map [ArgumentConversion $t]]
+	    lappend result "  idx_++;"
+	    lappend result {}
+
+	} else {
+	    # Fixed argument, before any optionals.
+	    set map [list @@ "ov\[$n\]" @A _$a]
+	    lappend result "  /* ($t $a) - - -- --- ----- -------- */"
+	    lappend result [string map $map [ArgumentConversion $t]]
+	    lappend result {}
+	    incr n
+	    set prefix "    idx_ = $n;\n"
+	}
+    }
+
+    return [Deline $result]
+}
+
+proc ::critcl::has-argtype {name} {
+    variable v::aconv
+    return [info exists aconv($name)]
+}
+
+proc ::critcl::argtype-def {name} {
+    lappend def [ArgumentCType      $name]
+    lappend def [ArgumentCTypeB     $name]
+    lappend def [ArgumentConversion $name]
+    lappend def [ArgumentRelease    $name]
+    lappend def [ArgumentSupport    $name]
+    return $def
+}
+
+proc ::critcl::argtype {name conversion {ctype {}} {ctypeb {}}} {
+    variable v::actype
+    variable v::actypeb
+    variable v::aconv
+    variable v::acrel
+    variable v::acsup
+
+    # ctype  Type of variable holding the argument.
+    # ctypeb Type of formal C function argument.
+
+    # Handle aliases by copying the original definition.
+    if {$conversion eq "="} {
+	# XXXA auto-create derived type from known base types.
+
+	if {![info exists aconv($ctype)]} {
+	    return -code error "Unable to alias unknown type '$ctype'."
+	}
+
+	# Do not forget to copy support and release code, if present.
+	if {[info exists acsup($ctype)]} {
+	    #puts COPY/S:$ctype
+	    set acsup($name) $acsup($ctype)
+	}
+	if {[info exists acrel($ctype)]} {
+	    #puts COPY/R:$ctype
+	    set acrel($name) $acrel($ctype)
+	}
+
+	set conversion $aconv($ctype)
+	set ctypeb     $actypeb($ctype)
+	set ctype      $actype($ctype)
+    } else {
+	lassign [HeaderLines $conversion] leadoffset conversion
+	Transition9Check [at::Loc $leadoffset 0 [This]] $conversion
+	set conversion "\t\{\n[at::caller! $leadoffset]\t[string trim $conversion] \}"
+    }
+    if {$ctype eq {}} {
+	set ctype $name
+    }
+    if {$ctypeb eq {}} {
+	set ctypeb $name
+    }
+
+    if {[info exists aconv($name)] &&
+	(($aconv($name)   ne $conversion) ||
+	 ($actype($name)  ne $ctype) ||
+	 ($actypeb($name) ne $ctypeb))
+    } {
+	return -code error "Illegal duplicate definition of '$name'."
+    }
+
+    set aconv($name)   $conversion
+    set actype($name)  $ctype
+    set actypeb($name) $ctypeb
+    return
+}
+
+proc ::critcl::argtypesupport {name code {guard {}}} {
+    variable v::aconv
+    variable v::acsup
+    if {![info exists aconv($name)]} {
+	return -code error "No definition for '$name'."
+    }
+    if {$guard eq {}} {
+	set guard $name ; # Handle non-identifier chars!
+    }
+    lappend lines "#ifndef CRITCL_$guard"
+    lappend lines "#define CRITCL_$guard"
+    lappend lines $code
+    lappend lines "#endif /* CRITCL_$guard _________ */"
+    set support [join $lines \n]\n
+
+    if {[info exists acsup($name)] &&
+	($acsup($name) ne $support)
+    } {
+	return -code error "Illegal duplicate support of '$name'."
+    }
+
+    set acsup($name) $support
+    return
+}
+
+proc ::critcl::argtyperelease {name code} {
+    variable v::aconv
+    variable v::acrel
+    if {![info exists aconv($name)]} {
+	return -code error "No definition for '$name'."
+    }
+    if {[info exists acrel($name)] &&
+	($acrel($name) ne $code)
+    } {
+	return -code error "Illegal duplicate release of '$name'."
+    }
+
+    set acrel($name) $code
+    return
+}
+
+proc ::critcl::has-resulttype {name} {
+    variable v::rconv
+    return [info exists rconv($name)]
+}
+
+proc ::critcl::resulttype {name conversion {ctype {}}} {
+    variable v::rctype
+    variable v::rconv
+
+    # Handle aliases by copying the original definition.
+    if {$conversion eq "="} {
+	if {![info exists rconv($ctype)]} {
+	    return -code error "Unable to alias unknown type '$ctype'."
+	}
+	set conversion $rconv($ctype)
+	set ctype      $rctype($ctype)
+    } else {
+	lassign [HeaderLines $conversion] leadoffset conversion
+	Transition9Check [at::Loc $leadoffset 0 [This]] $conversion
+	set conversion [at::caller! $leadoffset]\t[string trimright $conversion]
+    }
+    if {$ctype eq {}} {
+	set ctype $name
+    }
+
+    if {[info exists rconv($name)] &&
+	(($rconv($name)  ne $conversion) ||
+	 ($rctype($name) ne $ctype))
+    } {
+	return -code error "Illegal duplicate definition of '$name'."
+    }
+
+    set rconv($name)  $conversion
+    set rctype($name) $ctype
+    return
+}
+
+proc ::critcl::cconst {name rtype rvalue} {
+    # The semantics are equivalent to
+    #
+    #   cproc $name {} $rtype { return $rvalue ; }
+    #
+    # The main feature of this new command is the knowledge of a
+    # constant return value, which allows the optimization of the
+    # generated code. Only the shim is emitted, with the return value
+    # in place. No need for a lower-level C function containing a
+    # function body.
+
+    SkipIgnored [set file [This]]
+    HandleDeclAfterBuild
+
+    # A void result does not make sense for constants.
+    if {$rtype eq "void"} {
+	error "Constants cannot be of type \"void\""
+    }
+
+    lassign [BeginCommand public $name $rtype $rvalue] ns cns name cname
+    set traceref ns_$cns$cname
+    set wname    tcl_$cns$cname
+    set cname    c_$cns$cname
+
+    # Construct the shim handling the conversion between Tcl and C
+    # realms.
+
+    set adb [ArgsInprocess {} 1]
+
+    EmitShimHeader         $wname
+    EmitShimVariables      $adb $rtype
+    EmitArgTracing         $traceref
+    EmitWrongArgsCheck     $adb
+    EmitConst              $rtype $rvalue
+    EmitShimFooter         $adb $rtype
+    EndCommand
+    return
+}
+
+proc ::critcl::CheckForTracing {} {
+    if {!$v::options(trace)} return
+    if {[info exists ::critcl::v::__trace__]} return
+
+    package require critcl::cutil
+    ::critcl::cutil::tracer on
+    set ::critcl::v::__trace__ marker ;# See above
+    return
+}
+
+proc ::critcl::cproc {name adefs rtype {body "#"} args} {
+    SkipIgnored [set file [This]]
+    HandleDeclAfterBuild
+    CheckForTracing
+
+    set acname 0
+    set passcd 0
+    set aoffset 0
+    set tname ""
+    while {[string match "-*" $args]} {
+        switch -- [set opt [lindex $args 0]] {
+	    -cname      { set acname  [lindex $args 1] }
+	    -pass-cdata { set passcd  [lindex $args 1] }
+	    -arg-offset { set aoffset [lindex $args 1] }
+	    -tracename  { set tname   [lindex $args 1] }
+	    default {
+		error "Unknown option $opt, expected one of -cname, or -pass-cdata"
+	    }
+        }
+        set args [lrange $args 2 end]
+    }
+
+    incr aoffset ; # always include the command name.
+    set adb [ArgsInprocess $adefs $aoffset]
+
+    if {$acname} {
+	BeginCommand static $name $adefs $rtype $body
+	set ns  {}
+	set cns {}
+	set wname $name
+	set cname c_$name
+	if {$tname ne {}} {
+	    set traceref \"$tname\"
+	} else {
+	    set traceref \"$name\"
+	}
+    } else {
+	lassign [BeginCommand public $name $adefs $rtype $body] ns cns name cname
+	set traceref ns_$cns$cname
+	set wname    tcl_$cns$cname
+	set cname    c_$cns$cname
+    }
+
+    set names  [dict get $adb names]
+    set cargs  [dict get $adb csignature]
+    set cnames [dict get $adb cnames]
+
+    if {$passcd} {
+	set cargs  [linsert $cargs 0 {ClientData clientdata}]
+	set cnames [linsert $cnames 0 cd]
+    }
+
+    # Support code for argument conversions (i.e. structures, helper
+    # functions, etc. ...)
+    EmitSupport $adb
+
+    # Emit either the low-level function, or, if it wasn't defined
+    # here, a reference to the shim we can use.
+
+    if {$body ne "#"} {
+	Emit   "static [ResultCType $rtype] "
+	Emitln "${cname}([join $cargs {, }])"
+	Emit   \{\n
+
+	at::caller
+	at::incrt $name
+	at::incrt $adefs
+	at::incrt $rtype
+	Transition9Check [at::raw] $body
+
+	lassign [HeaderLines $body] leadoffset body
+	if {$v::options(lines)} {
+	    Emit [at::CPragma $leadoffset -2 $file]
+	}
+	Emit   $body
+	Emitln \n\}
+    } else {
+	Emitln "#define $cname $name"
+    }
+
+    # Construct the shim handling the conversion between Tcl and C
+    # realms.
+
+    EmitShimHeader         $wname
+    EmitShimVariables      $adb $rtype
+    EmitArgTracing         $traceref
+    EmitWrongArgsCheck     $adb
+    Emit    [dict get $adb aconv]
+    EmitCall               $cname $cnames $rtype
+    EmitShimFooter         $adb $rtype
+    EndCommand
+    return
+}
+
+proc ::critcl::cinit {text edecls} {
+    set file [SkipIgnored [set file [This]]]
+    HandleDeclAfterBuild
+    CInitCore $file $text $edecls
+    return
+}
+
+proc ::critcl::CInitCore {file text edecls} {
+    set digesta [UUID.extend $file .cinit.f $text]
+    set digestb [UUID.extend $file .cinit.e $edecls]
+
+    set initc {}
+    set skip [Lines $text]
+    lassign [HeaderLines $text] leadoffset text
+    Transition9Check [at::Loc $leadoffset -2 $file] $text
+    if {$v::options(lines)} {
+	append initc [at::CPragma $leadoffset -2 $file]
+    }
+    append initc $text \n
+
+    set edec {}
+    lassign [HeaderLines $edecls] leadoffset edecls
+    Transition9Check [at::Loc $leadoffset -2 $file] $edecls
+    if {$v::options(lines)} {
+	incr leadoffset $skip
+	append edec [at::CPragma $leadoffset -2 $file]
+    }
+    append edec $edecls \n
+
+    dict update v::code($file) config c {
+	dict append  c initc  $initc \n
+	dict append  c edecls $edec  \n
+    }
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## Public API to code origin handling.
+
+namespace eval ::critcl::at {
+    namespace export caller caller! here here! get get* raw raw* incr incrt =
+    catch { namespace ensemble create }
+}
+
+# caller  - stash caller location, possibly modified (level change, line offset)
+# caller! - format & return caller location, clears stash
+# here    - stash current location
+# here!   - return format & return  current location, clears stash
+# incr*   - modify stashed location (only line number, not file).
+# get     - format, return, and clear stash
+# get*    - format & return stash
+
+proc ::critcl::at::caller {{off 0} {level 0}} {
+    ::incr level -3
+    Where $off $level [::critcl::This]
+    return
+}
+
+proc ::critcl::at::caller! {{off 0} {level 0}} {
+    ::incr level -3
+    Where $off $level [::critcl::This]
+    return [get]
+}
+
+proc ::critcl::at::here {} {
+    Where 0 -2 [::critcl::This]
+    return
+}
+
+proc ::critcl::at::here! {} {
+    Where 0 -2 [::critcl::This]
+    return [get]
+}
+
+proc ::critcl::at::get {} {
+    variable where
+    if {!$::critcl::v::options(lines)} {
+	return {}
+    }
+    if {![info exists where]} {
+	return -code error "No location defined"
+    }
+    set result [Format $where]
+    unset where
+    return $result
+}
+
+proc ::critcl::at::raw {} {
+    variable where
+    if {![info exists where]} {
+	return -code error "No location defined"
+    }
+    set result $where
+    set where {}
+    return $result
+}
+
+proc ::critcl::at::get* {} {
+    variable where
+    if {!$::critcl::v::options(lines)} {
+	return {}
+    }
+    if {![info exists where]} {
+	return -code error "No location defined"
+    }
+    return [Format $where]
+}
+
+proc ::critcl::at::raw* {} {
+    variable where
+    if {![info exists where]} {
+	return -code error "No location defined"
+    }
+    return $where
+}
+
+proc ::critcl::at::= {file line} {
+    variable where
+    set where [list $file $line]
+    return
+}
+
+proc ::critcl::at::incr {args} {
+    variable where
+    lassign $where file line
+    foreach offset $args {
+	::incr line $offset
+    }
+    set where [list $file $line]
+    return
+}
+
+proc ::critcl::at::incrt {args} {
+    variable where
+    if {$where eq {}} {
+	# Ignore problem when we have no precise locations.
+	if {![interp debug {} -frame]} return
+	return -code error "No location to change"
+    }
+    lassign $where file line
+    foreach text $args {
+	::incr line [::critcl::Lines $text]
+    }
+    set where [list $file $line]
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: Input and Output control
+
+proc ::critcl::collect {script {slot {}}} {
+    collect_begin $slot
+    uplevel 1 $script
+    return [collect_end]
+}
+
+proc ::critcl::collect_begin {{slot {}}} {
+    # Divert the collection of code fragments to slot
+    # (output control). Stack on any previous diversion.
+    variable v::this
+    # See critcl::This for where this information is injected into the
+    # code generation system.
+
+    if {$slot eq {}} {
+	set slot MEMORY[expr { [info exists this]
+			       ? [llength $this]
+			       : 0 }]
+    }
+    # Prefix prevents collision of slot names and file paths.
+    lappend this critcl://$slot
+    return
+}
+
+proc ::critcl::collect_end {} {
+    # Stop last diversion, and return the collected information as
+    # single string of C code.
+    variable v::this
+    # See critcl::This for where this information is injected into the
+    # code generation system.
+
+    # Ensure that a diversion is actually open.
+    if {![info exists this] || ![llength $this]} {
+	return -code error "collect_end mismatch, no diversions active"
+    }
+
+    set slot [Dpop]
+    set block {}
+
+    foreach digest [dict get $v::code($slot) config fragments] {
+	append block "[Separator]\n\n"
+	append block [dict get $v::code($slot) config block $digest]\n
+    }
+
+    # Drop all the collected data. Note how anything other than the C
+    # code fragments is lost, and how cbuild results are removed
+    # also. These do not belong anyway.
+    unset v::code($slot)
+
+    return $block
+}
+
+
+proc ::critcl::Dpop {} {
+    variable v::this
+
+    # Get current slot, and pop from the diversion stack.
+    # Remove stack when it becomes empty.
+    set slot [lindex $this end]
+    set v::this [lrange $this 0 end-1]
+    if {![llength $this]} {
+	unset this
+    }
+    return $slot
+}
+
+proc ::critcl::include {path args} {
+    # Include headers or other C files into the current code.
+    set args [linsert $args 0 $path]
+    msg "  (include <[join $args ">)\n  (include <"]>)"
+    ccode "#include <[join $args ">\n#include <"]>"
+}
+
+proc ::critcl::make {path contents} {
+    # Generate a header or other C file for pickup by other parts of
+    # the current package. Stored in the cache dir, making it local.
+    file mkdir [cache]
+    set cname [file join [cache] $path]
+
+    set c [open $cname.[pid] w]
+    puts -nonewline $c $contents\n\n
+    close $c
+    file rename -force $cname.[pid] $cname
+
+    return $path
+}
+
+proc ::critcl::source {path} {
+    # Source a critcl file in the context of the current file,
+    # i.e. [This]. Enables the factorization of a large critcl
+    # file into smaller, easier to read pieces.
+    SkipIgnored [set file [This]]
+    HandleDeclAfterBuild
+
+    msg "  (importing $path)"
+
+    set undivert 0
+    variable v::this
+    if {![info exists this] || ![llength $this]} {
+	# critcl::source is recording the critcl commands in the
+	# context of the toplevel file which started the chain the
+	# critcl::source. So why are we twiddling with the diversion
+	# state?
+	#
+	# The condition above tells us that we are in the first
+	# non-diverted critcl::source called by the context. [This]
+	# returns that context. Due to our use of regular 'source' (*)
+	# during its execution [This] would return the sourced file as
+	# context. Wrong. Our fix for this is to perform, essentially,
+	# an anti-diversion. Saving [This] as diversion, forces it to
+	# return the proper value during the whole sourcing.
+	#
+	# And if the critcl::source is run in an already diverted
+	# context then the changes to [info script] by 'source' do not
+	# matter, making an anti-diversion unnecessary.
+	#
+	# Diversions inside of 'source' will work as usual, given
+	# their nesting nature.
+	#
+	# (Ad *) And we use 'source' as only this ensures proper
+	# collection of [info frame] location information.
+
+	lappend this [This]
+	set undivert 1
+    }
+
+    foreach f [Expand $file $path] {
+	set v::source $f
+	# The source file information is used by critcl::at::Where
+	#uplevel 1 [Cat $f]
+	uplevel #0 [list ::source $f]
+	unset -nocomplain v::source
+    }
+
+    if {$undivert} Dpop
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: Control & Interface
+
+proc ::critcl::owns {args} {}
+
+proc ::critcl::cheaders {args} {
+    SkipIgnored [This]
+    HandleDeclAfterBuild
+    return [SetParam cheaders [ResolveRelative -I $args]]
+}
+
+proc ::critcl::csources {args} {
+    SkipIgnored [This]
+    HandleDeclAfterBuild
+    return [SetParam csources $args 1 1 1]
+}
+
+proc ::critcl::clibraries {args} {
+    SkipIgnored [This]
+    HandleDeclAfterBuild
+    return [SetParam clibraries [ResolveRelative {
+	-L --library-directory
+    } $args]]
+}
+
+proc ::critcl::cobjects {args} {
+    SkipIgnored [This]
+    HandleDeclAfterBuild
+    return [SetParam cobjects $args]
+}
+
+proc ::critcl::tsources {args} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+    # Here, 'license', 'meta?' and 'meta' are the only places where we
+    # are not extending the UUID. Because the companion Tcl sources
+    # (count, order, and content) have no bearing on the binary at
+    # all.
+    InitializeFile $file
+
+    set dfiles {}
+    dict update v::code($file) config c {
+	foreach f $args {
+	    foreach e [Expand $file $f] {
+		dict lappend c tsources $e
+		lappend dfiles $e
+	    }
+	}
+    }
+    # Attention: The actual scanning is done outside of the `dict
+    # update`, because it makes changes to the dictionary which would
+    # be revert on exiting the update.
+    foreach e $dfiles {
+	ScanDependencies $file $e
+    }
+    return
+}
+
+proc ::critcl::cflags {args} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+    if {![llength $args]} return
+    CFlagsCore $file $args
+    return
+}
+
+proc ::critcl::CFlagsCore {file flags} {
+    UUID.extend $file .cflags $flags
+    dict update v::code($file) config c {
+	foreach flag $flags {
+	    dict lappend c cflags $flag
+	}
+    }
+    return
+}
+
+proc ::critcl::ldflags {args} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+    if {![llength $args]} return
+
+    UUID.extend $file .ldflags $args
+    dict update v::code($file) config c {
+	foreach flag $args {
+	    # Drop any -Wl prefix which will be added back a moment
+	    # later, otherwise it would be doubled, breaking the command.
+	    regsub -all {^-Wl,} $flag {} flag
+	    dict lappend c ldflags -Wl,$flag
+	}
+    }
+    return
+}
+
+proc ::critcl::framework {args} {
+    SkipIgnored [This]
+    HandleDeclAfterBuild
+
+    # Check if we are building for OSX and ignore the command if we
+    # are not. Our usage of "actualtarget" means that we allow for a
+    # cross-compilation environment to OS X as well.
+    if {![string match "macosx*" [actualtarget]]} return
+
+    foreach arg $args {
+	# if an arg contains a slash it must be a framework path
+	if {[string first / $arg] == -1} {
+	    ldflags -framework $arg
+	} else {
+	    cflags  -F$arg
+	    ldflags -F$arg
+	}
+    }
+    return
+}
+
+proc ::critcl::tcl {version} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+
+    msg "  (tcl $version)"
+
+    # When a minimum Tcl version is requested it can be assumed that the C code will work for that
+    # version. Doing compatibility checks of any kind is not needed.
+    config tcl9 0
+
+    UUID.extend $file .mintcl $version
+    dict set v::code($file) config mintcl $version
+
+    # This is also a dependency to record in the meta data. A 'package
+    # require' is not needed. This can be inside of the generated and
+    # loaded C code.
+
+    ImetaAdd $file require [list [list Tcl $version]]
+    return
+}
+
+proc ::critcl::tk {} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+
+    msg "  (+tk)"
+
+    UUID.extend $file .tk 1
+    dict set v::code($file) config tk 1
+
+    # This is also a dependency to record in the meta data. A 'package
+    # require' is not needed. This can be inside of the generated and
+    # loaded C code.
+
+    ImetaAdd $file require Tk
+    return
+}
+
+# Register a shared library for pre-loading - this will eventually be
+# redundant when TIP #239 is widely available
+proc ::critcl::preload {args} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+    if {![llength $args]} return
+
+    UUID.extend $file .preload $args
+    dict update v::code($file) config c {
+	foreach lib $args {
+	    dict lappend c preload $lib
+	}
+    }
+    return
+}
+
+proc ::critcl::license {who args} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+
+    set who [string trim $who]
+    if {$who ne ""} {
+	set license "This software is copyrighted by $who.\n"
+    } else {
+	set license ""
+    }
+
+    set elicense [LicenseText $args]
+
+    append license $elicense
+
+    # This, 'tsources', 'meta?', and 'meta' are the only places where
+    # we are not extending the UUID. Because the license text has no
+    # bearing on the binary at all.
+    InitializeFile $file
+
+    ImetaSet $file license [Text2Words   $elicense]
+    ImetaSet $file author  [Text2Authors $who]
+    return
+}
+
+proc ::critcl::LicenseText {words} {
+    if {[llength $words]} {
+	# Use the supplied license details as our suffix.
+	return [join $words]
+    } else {
+	# No details were supplied, fall back to the critcl license as
+	# template for the generated package. This is found in a
+	# sibling of this file.
+
+	# We strip the first 2 lines from the file, this gets rid of
+	# the author information for critcl itself, allowing us to
+	# replace it by the user-supplied author.
+
+	variable mydir
+	set f [file join $mydir license.terms]
+	return [join [lrange [split [Cat $f] \n] 2 end] \n]
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: meta data (teapot)
+
+proc ::critcl::description {text} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+    InitializeFile $file
+
+    ImetaSet $file description [Text2Words $text]
+    return
+}
+
+proc ::critcl::summary {text} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+    InitializeFile $file
+
+    ImetaSet $file summary [Text2Words $text]
+    return
+}
+
+proc ::critcl::subject {args} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+    InitializeFile $file
+
+    ImetaAdd $file subject $args
+    return
+}
+
+proc ::critcl::meta {key args} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+
+    # This, 'meta?', 'license', and 'tsources' are the only places
+    # where we are not extending the UUID. Because the meta data has
+    # no bearing on the binary at all.
+    InitializeFile $file
+
+    dict update v::code($file) config c {
+	dict update c meta m {
+	    foreach v $args { dict lappend m $key $v }
+	}
+    }
+    return
+}
+
+proc ::critcl::meta? {key} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+
+    # This, 'meta', 'license', and 'tsources' are the only places
+    # where we are not extending the UUID. Because the meta data has
+    # no bearing on the binary at all.
+    InitializeFile $file
+
+    if {[dict exists $v::code($file) config package $key]} {
+	return [dict get $v::code($file) config package $key]
+    }
+    if {[dict exists $v::code($file) config meta $key]} {
+	return [dict get $v::code($file) config meta $key]
+    }
+    return -code error "Unknown meta data key \"$key\""
+}
+
+proc ::critcl::ImetaSet {file key words} {
+    dict set v::code($file) config package $key $words
+    #puts |||$key|%|[dict get $v::code($file) config package $key]|
+    return
+}
+
+proc ::critcl::ImetaAdd {file key words} {
+    dict update v::code($file) config c {
+	dict update c package p {
+	    foreach word $words {
+		dict lappend p $key $word
+	    }
+	}
+    }
+    #puts XXX|$file||$key|+|[dict get $v::code($file) config package $key]|
+    return
+}
+
+proc ::critcl::Text2Words {text} {
+    regsub -all {[ \t\n]+} $text { } text
+    return [split [string trim $text]]
+}
+
+proc ::critcl::Text2Authors {text} {
+    regsub -all {[ \t\n]+} $text { } text
+    set authors {}
+    foreach a [split [string trim $text] ,] {
+	lappend authors [string trim $a]
+    }
+    return $authors
+}
+
+proc ::critcl::GetMeta {file} {
+    if {![dict exists $v::code($file) config meta]} {
+	set result {}
+    } else {
+	set result [dict get $v::code($file) config meta]
+    }
+
+    # Merge the package information (= system meta data) with the
+    # user's meta data. The system information overrides anything the
+    # user may have declared for the reserved keys (name, version,
+    # platform, as::author, as::build::date, license, description,
+    # summary, require). Note that for the internal bracketing code
+    # the system information may not exist, hence the catch. Might be
+    # better to indicate the bracket somehow and make it properly
+    # conditional.
+
+    #puts %$file
+
+    catch {
+	set result [dict merge $result [dict get $v::code($file) config package]]
+    }
+
+    # A few keys need a cleanup, i.e. removal of duplicates, and the like
+    catch {
+	dict set result require         [lsort -dict -unique [dict get $result require]]
+    }
+    catch {
+	dict set result build::require  [lsort -dict -unique [dict get $result build::require]]
+    }
+    catch {
+	dict set result platform        [lindex [dict get $result platform] 0]
+    }
+    catch {
+	dict set result generated::by   [lrange [dict get $result generated::by] 0 1]
+    }
+    catch {
+	dict set result generated::date [lindex [dict get $result generated::by] 0]
+    }
+
+    #array set ___M $result ; parray ___M ; unset ___M
+    return $result
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: user configuration options.
+
+proc ::critcl::userconfig {cmd args} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+    InitializeFile $file
+
+    if {![llength [info commands ::critcl::UC$cmd]]} {
+	return -code error "Unknown method \"$cmd\""
+    }
+
+    # Dispatch
+    return [eval [linsert $args 0 ::critcl::UC$cmd $file]]
+}
+
+proc ::critcl::UCdefine {file oname odesc otype {odefault {}}} {
+    # When declared without a default determine one of our own. Bool
+    # flag default to true, whereas enum flags, which is the rest,
+    # default to their first value.
+
+    # The actual definition ignores the config description. This
+    # argument is only used by the static code scanner supporting
+    # TEA. See ::critcl::scan::userconfig.
+
+    if {[llength [info level 0]] < 6} {
+	set odefault [UcDefault $otype]
+    }
+
+    # Validate the default against the type too, before saving
+    # everything.
+    UcValidate $oname $otype $odefault
+
+    UUID.extend $file .uc-def [list $oname $otype $odefault]
+
+    dict set v::code($file) config userflag $oname type    $otype
+    dict set v::code($file) config userflag $oname default $odefault
+    return
+}
+
+proc ::critcl::UCset {file oname value} {
+    # NOTE: We can set any user flag we choose, even if not declared
+    # yet. Validation of the value happens on query, at which time the
+    # flag must be declared.
+
+    dict set v::code($file) config userflag $oname value $value
+    return
+}
+
+proc ::critcl::UCquery {file oname} {
+    # Prefer cached data. This is known as declared, defaults merged,
+    # validated.
+    if {[dict exists $v::code($file) config userflag $oname =]} {
+	return [dict get $v::code($file) config userflag $oname =]
+    }
+
+    # Reject use of undeclared user flags.
+    if {![dict exists $v::code($file) config userflag $oname type]} {
+	error "Unknown user flag \"$oname\""
+    }
+
+    # Check if a value was supplied by the calling app. If not, fall
+    # back to the declared default.
+
+    if {[dict exists $v::code($file) config userflag $oname value]} {
+	set value [dict get $v::code($file) config userflag $oname value]
+    } else {
+	set value [dict get $v::code($file) config userflag $oname default]
+    }
+
+    # Validate value against the flag's type.
+    set otype [dict get $v::code($file) config userflag $oname type]
+    UcValidate $oname $otype $value
+
+    # Fill cache
+    dict set v::code($file) config userflag $oname = $value
+    return $value
+}
+
+proc ::critcl::UcValidate {oname otype value} {
+    switch -exact -- $otype {
+	bool {
+	    if {![string is bool -strict $value]} {
+		error "Expected boolean for user flag \"$oname\", got \"$value\""
+	    }
+	}
+	default {
+	    if {[lsearch -exact $otype $value] < 0} {
+		error "Expected one of [linsert [join $otype {, }] end-1 or] for user flag \"$oname\", got \"$value\""
+	    }
+	}
+    }
+}
+
+proc ::critcl::UcDefault {otype} {
+    switch -exact -- $otype {
+	bool {
+	    return 1
+	}
+	default {
+	    return [lindex $otype 0]
+	}
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: API (stubs) management
+
+proc ::critcl::api {cmd args} {
+    set file [SkipIgnored [This]]
+    HandleDeclAfterBuild
+
+    if {![llength [info commands ::critcl::API$cmd]]} {
+	return -code error "Unknown method \"$cmd\""
+    }
+
+    # Dispatch
+    return [eval [linsert $args 0 ::critcl::API$cmd $file]]
+}
+
+proc ::critcl::APIscspec {file scspec} {
+    UUID.extend $file .api-scspec $scspec
+    dict set v::code($file) config api_scspec $scspec
+    return
+}
+
+proc ::critcl::APIimport {file name version} {
+
+    # First we request the imported package, giving it a chance to
+    # generate the headers searched for in a moment (maybe it was
+    # critcl based as well, and generates things dynamically).
+
+    # Note that this can fail, for example in a cross-compilation
+    # environment. Such a failure however does not imply that the
+    # required API headers are not present, so we can continue.
+
+    catch {
+	package require $name $version
+    }
+
+    ImetaAdd $file require [list [list $name $version]]
+
+    # Now we check that the relevant headers of the imported package
+    # can be found in the specified search paths.
+
+    set cname [string map {:: _} $name]
+
+    set at [API_locate $cname searched]
+    if {$at eq {}} {
+	error "Headers for API $name not found in \n-\t[join $searched \n-\t]"
+    } else {
+	msg "  (stubs import $name $version @ $at/$cname)"
+    }
+
+    set def [list $name $version]
+    UUID.extend $file .api-import $def
+    dict update v::code($file) config c {
+	dict lappend c api_use $def
+    }
+
+    # At last look for the optional .decls file. Ignore if there is
+    # none. Decode and return contained stubs table otherwise.
+
+    set decls $at/$cname/$cname.decls
+    if {[file exists $decls]} {
+	package require stubs::reader
+	set T [stubs::container::new]
+	stubs::reader::file T $decls
+	return $T
+    }
+    return
+}
+
+proc ::critcl::APIexport {file name} {
+    msg "  (stubs export $name)"
+
+    UUID.extend $file .api-self $name
+    return [dict set v::code($file) config api_self $name]
+}
+
+proc ::critcl::APIheader {file args} {
+    UUID.extend $file .api-headers $args
+    return [SetParam api_hdrs $args]
+}
+
+proc ::critcl::APIextheader {file args} {
+    UUID.extend $file .api-eheaders $args
+    return [SetParam api_ehdrs $args 0]
+}
+
+proc ::critcl::APIfunction {file rtype name arguments} {
+    package require stubs::reader
+
+    # Generate a declaration as it would have come straight out of the
+    # stubs reader. To this end we generate a C code fragment as it
+    # would be have been written inside of a .decls file.
+
+    # TODO: We should record this as well, and later generate a .decls
+    # file as part of the export. Or regenerate it from the internal
+    # representation.
+
+    if {[llength $arguments]} {
+	foreach {t a} $arguments {
+	    lappend ax "$t $a"
+	}
+    } else {
+	set ax void
+    }
+    set decl [stubs::reader::ParseDecl "$rtype $name ([join $ax ,])"]
+
+    UUID.extend $file .api-fun $decl
+    dict update v::code($file) config c {
+	dict lappend c api_fun $decl
+    }
+    return
+}
+
+proc ::critcl::API_locate {name sv} {
+    upvar 1 $sv searched
+    foreach dir [SystemIncludePaths [This]] {
+	    lappend searched $dir
+	if {[API_at $dir $name]} { return $dir }
+    }
+    return {}
+}
+
+proc ::critcl::API_at {dir name} {
+    foreach suffix {
+	Decls.h StubLib.h
+    } {
+	if {![file exists [file join $dir $name $name$suffix]]} { return 0 }
+    }
+    return 1
+}
+
+proc ::critcl::API_setup {file} {
+    package require stubs::gen
+
+    lassign [API_setup_import $file] iprefix idefines
+    dict set v::code($file) result apidefines $idefines
+
+    append prefix $iprefix
+    append prefix [API_setup_export $file]
+
+    # Save prefix to result dictionary for pickup by Compile.
+    if {$prefix eq ""} return
+
+    dict set v::code($file) result apiprefix  $prefix\n
+    return
+}
+
+proc ::critcl::API_setup_import {file} {
+    if {![dict exists $v::code($file) config api_use]} {
+	return ""
+    }
+
+    #msg -nonewline " (stubs import)"
+
+    set prefix ""
+    set defines {}
+
+    foreach def [dict get $v::code($file) config api_use] {
+	lassign $def iname iversion
+
+	set cname   [string map {:: _} $iname]
+	set upname  [string toupper  $cname]
+	set capname [stubs::gen::cap $cname]
+
+	set import [critcl::at::here!][subst -nocommands {
+	    /* Import API: $iname */
+	    #define USE_${upname}_STUBS 1
+	    #include <$cname/${cname}Decls.h>
+	}]
+	append prefix \n$import
+	CCodeCore $file $import
+
+	# TODO :: DOCUMENT environment of the cinit code.
+	CInitCore $file [subst -nocommands {
+	    if (!${capname}_InitStubs (ip, "$iversion", 0)) {
+		return TCL_ERROR;
+	    }
+	}] [subst -nocommands {
+	    #include <$cname/${cname}StubLib.h>
+	}]
+
+	lappend defines -DUSE_${upname}_STUBS=1
+    }
+
+    return [list $prefix $defines]
+}
+
+proc ::critcl::API_setup_export {file} {
+    if {![dict exists $v::code($file) config api_hdrs] &&
+	![dict exists $v::code($file) config api_ehdrs] &&
+	![dict exists $v::code($file) config api_fun]} return
+
+    if {[dict exists $v::code($file) config api_self]} {
+	# API name was declared explicitly
+	set ename [dict get $v::code($file) config api_self]
+    } else {
+	# API name is implicitly defined, is package name.
+	set ename [dict get $v::code($file) config package name]
+    }
+
+    set prefix ""
+
+    #msg -nonewline " (stubs export)"
+
+    set cname   [string map {:: _} $ename]
+    set upname  [string toupper  $cname]
+    set capname [stubs::gen::cap $cname]
+
+    set import [at::here!][subst -nocommands {
+	/* Import our own exported API: $ename, mapping disabled */
+	#undef USE_${upname}_STUBS
+	#include <$cname/${cname}Decls.h>
+    }]
+    append prefix \n$import
+    CCodeCore $file $import
+
+    # Generate the necessary header files.
+
+    append sdecls "\#ifndef ${cname}_DECLS_H\n"
+    append sdecls "\#define ${cname}_DECLS_H\n"
+    append sdecls "\n"
+    append sdecls "\#include <tcl.h>\n"
+
+    if {[dict exists $v::code($file) config api_ehdrs]} {
+	append sdecls "\n"
+	file mkdir [cache]/$cname
+	foreach hdr [dict get $v::code($file) config api_ehdrs] {
+	    append sdecls "\#include \"[file tail $hdr]\"\n"
+	}
+    }
+
+    if {[dict exists $v::code($file) config api_hdrs]} {
+	append sdecls "\n"
+	file mkdir [cache]/$cname
+	foreach hdr [dict get $v::code($file) config api_hdrs] {
+	    Copy $hdr [cache]/$cname
+	    append sdecls "\#include \"[file tail $hdr]\"\n"
+	}
+    }
+
+    # Insert code to handle the storage class settings on Windows.
+
+    append sdecls [string map \
+		       [list @cname@ $cname @up@ $upname] \
+		       $v::storageclass]
+
+    package require stubs::container
+    package require stubs::reader
+    package require stubs::gen
+    package require stubs::gen::header
+    package require stubs::gen::init
+    package require stubs::gen::lib
+    package require stubs::writer
+
+    # Implied .decls file. Not actually written, only implied in the
+    # stubs container invocations, as if read from such a file.
+
+    set T [stubs::container::new]
+    stubs::container::library   T $ename
+    stubs::container::interface T $cname
+
+    if {[dict exists $v::code($file) config api_scspec]} {
+	stubs::container::scspec T \
+	    [dict get $v::code($file) config api_scspec]
+    }
+
+    if {[dict exists $v::code($file) config api_fun]} {
+	set index 0
+	foreach decl [dict get $v::code($file) config api_fun] {
+	    #puts D==|$decl|
+	    stubs::container::declare T $cname $index generic $decl
+	    incr index
+	}
+	append sdecls "\n"
+	append sdecls [stubs::gen::header::gen $T $cname]
+    }
+
+    append sdecls "\#endif /* ${cname}_DECLS_H */\n"
+
+    set comment "/* Stubs API Export: $ename */"
+
+    set    thedecls [stubs::writer::gen $T]
+    set    slib     [stubs::gen::lib::gen $T]
+    set    sinitstatic "  $comment\n  "
+    append sinitstatic [stubs::gen::init::gen $T]
+
+    set pn [dict get $v::code($file) config package name]
+    set pv [dict get $v::code($file) config package version]
+
+    set    sinitrun $comment\n
+    append sinitrun "Tcl_PkgProvideEx (ip, \"$pn\", \"$pv\", (ClientData) &${cname}Stubs);"
+
+    # Save the header files to the result cache for pickup (importers
+    # in mode "compile & run", or by the higher-level code doing a
+    # "generate package")
+
+    WriteCache $cname/${cname}Decls.h   $sdecls
+    WriteCache $cname/${cname}StubLib.h $slib
+    WriteCache $cname/${cname}.decls    $thedecls
+
+    dict update v::code($file) result r {
+	dict lappend r apiheader [file join [cache] $cname]
+    }
+
+    CInitCore  $file $sinitrun $sinitstatic
+    CFlagsCore $file [list -DBUILD_$cname]
+
+    return $prefix
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: Introspection
+
+proc ::critcl::check {args} {
+    set file [SkipIgnored [This] 0]
+    HandleDeclAfterBuild
+
+    switch -exact -- [llength $args] {
+	1 {
+	    set label Checking
+	    set code  [lindex $args 0]
+	}
+	2 {
+	    lassign $args label code
+	}
+	default {
+	    return -code error "wrong#args: Expected ?label? code"
+	}
+    }
+
+    set src [WriteCache check_[pid].c $code]
+    set obj [file rootname $src][getconfigvalue object]
+
+    # See also the internal helper 'Compile'. Thre code here is in
+    # essence a simplified form of that.
+
+    set         cmdline [getconfigvalue compile]
+    lappendlist cmdline [GetParam $file cflags]
+    lappendlist cmdline [SystemIncludes $file]
+    lappendlist cmdline [CompileResult $obj]
+    lappend     cmdline $src
+
+    LogOpen $file
+    Log* "${label}... "
+    StatusReset
+    set ok [ExecWithLogging $cmdline OK FAILED]
+    StatusReset
+
+    LogClose
+    clean_cache check_[pid].*
+    return $ok
+}
+
+proc ::critcl::checklink {args} {
+    set file [SkipIgnored [This] 0]
+    HandleDeclAfterBuild
+
+    switch -exact -- [llength $args] {
+	1 {
+	    set label Checking
+	    set code  [lindex $args 0]
+	}
+	2 {
+	    lassign $args label code
+	}
+	default {
+	    return -code error "wrong#args: Expected ?label? code"
+	}
+    }
+
+    set src [WriteCache check_[pid].c $code]
+    set obj [file rootname $src][getconfigvalue object]
+
+    # See also the internal helper 'Compile'. Thre code here is in
+    # essence a simplified form of that.
+
+    set         cmdline [getconfigvalue compile]
+    lappendlist cmdline [GetParam $file cflags]
+    lappendlist cmdline [SystemIncludes $file]
+    lappendlist cmdline [CompileResult $obj]
+    lappend     cmdline $src
+
+    LogOpen $file
+    Log* "${label} (build)... "
+    StatusReset
+    set ok [ExecWithLogging $cmdline OK FAILED]
+    StatusReset
+
+    if {!$ok} {
+	LogClose
+	clean_cache check_[pid].*
+	return 0
+    }
+
+    set out [file join [cache] a_[pid].out]
+    set cmdline [getconfigvalue link]
+
+    if {$option::debug_symbols} {
+	lappendlist cmdline [getconfigvalue link_debug]
+    } else {
+	lappendlist cmdline [getconfigvalue strip]
+	lappendlist cmdline [getconfigvalue link_release]
+    }
+
+    lappendlist cmdline [LinkResult $out]
+    lappendlist cmdline $obj
+    lappendlist cmdline [SystemLibraries]
+    lappendlist cmdline [FixLibraries [GetParam $file clibraries]]
+    lappendlist cmdline [GetParam $file ldflags]
+
+    Log* "${label} (link)... "
+    StatusReset
+    set ok [ExecWithLogging $cmdline OK ERR]
+
+    LogClose
+    clean_cache check_[pid].* a_[pid].*
+    return $ok
+}
+
+proc ::critcl::compiled {} {
+    SkipIgnored [This] 1
+    HandleDeclAfterBuild
+    return 0
+}
+
+proc ::critcl::compiling {} {
+    SkipIgnored [This] 0
+    HandleDeclAfterBuild
+    # Check that we can indeed run a compiler
+    # Should only need to do this if we have to compile the code?
+    if {[auto_execok [lindex [getconfigvalue compile] 0]] eq ""} {
+	set v::compiling 0
+    } else {
+	set v::compiling 1
+    }
+    return $v::compiling
+}
+
+proc ::critcl::done {} {
+    set file [SkipIgnored [This] 1]
+    return [expr {[info exists  v::code($file)] &&
+		  [dict exists $v::code($file) result closed]}]
+}
+
+proc ::critcl::failed {} {
+    SkipIgnored [This] 0
+    if {$v::buildforpackage} { return 0 }
+    return [cbuild [This] 0]
+}
+
+proc ::critcl::load {} {
+    SkipIgnored [This] 1
+    if {$v::buildforpackage} { return 1 }
+    return [expr {![cbuild [This]]}]
+}
+
+# # ## ### ##### ######## ############# #####################
+## Default error behaviour
+
+proc ::critcl::error {msg} {
+    return -code error $msg
+}
+
+# # ## ### ##### ######## ############# #####################
+## Default message behaviour
+
+proc ::critcl::msg {args} {
+    # ignore message (compile & run)
+}
+
+# # ## ### ##### ######## ############# #####################
+## Default print behaviour
+
+proc ::critcl::print {args} {
+    # API same as for builtin ::puts. Use as is.
+    return [eval [linsert $args 0 ::puts]]
+}
+
+# # ## ### ##### ######## ############# #####################
+## Runtime support to handle the possibility of a prebuilt package using
+## the .tcl file with embedded C as its own companon defining regular
+## Tcl code for the package as well. If the critcl package is loaded
+## already this will cause it to ignore the C definitions, with best
+## guesses for failed, done, load, check, compiled, and compiling.
+
+proc ::critcl::Ignore {f} {
+    set v::ignore([file normalize $f]) .
+    return
+}
+
+proc ::critcl::SkipIgnored {f {result {}}} {
+    if {[info exists v::ignore($f)]} { return -code return $result }
+    return $f
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: Build Management
+
+proc ::critcl::config {option args} {
+    if {![info exists v::options($option)] || [llength $args] > 1} {
+	error "option must be one of: [lsort [array names v::options]]"
+    }
+    if {![llength $args]} {
+	return $v::options($option)
+    }
+    set v::options($option) [lindex $args 0]
+}
+
+proc ::critcl::debug {args} {
+    # Replace 'all' everywhere, and squash duplicates, whether from
+    # this, or user-specified.
+    set args [string map {all {memory symbols}} $args]
+    set args [lsort -unique $args]
+
+    foreach arg $args {
+	switch -- $arg {
+	    memory  { foreach x [getconfigvalue debug_memory]  { cflags $x } }
+	    symbols { foreach x [getconfigvalue debug_symbols] { cflags $x }
+		set option::debug_symbols 1
+	    }
+	    default {
+		error "unknown critcl::debug option - $arg"
+	    }
+	}
+    }
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: Result Cache
+
+proc ::critcl::cache {{dir ""}} {
+    if {[llength [info level 0]] == 2} {
+	set v::cache [file normalize $dir]
+    }
+    return $v::cache
+}
+
+proc ::critcl::clean_cache {args} {
+    if {![llength $args]} { lappend args * }
+    foreach pattern $args {
+	foreach file [glob -nocomplain -directory $v::cache $pattern] {
+	    file delete -force $file
+	}
+    }
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: Build Configuration
+# read toolchain information from config file
+
+proc ::critcl::readconfig {config} {
+    variable run
+    variable configfile $config
+
+    set cfg [open $config]
+    set knowntargets [list]
+    set cont ""
+    set whenplat ""
+
+    interp eval $run set platform $v::buildplatform
+
+    set i 0
+    while {[gets $cfg line] >= 0} {
+	incr i
+	if {[set line [string trim $line]] ne ""} {
+	    # config lines can be continued using trailing backslash
+	    if {[string index $line end] eq "\\"} {
+		append cont " [string range $line 0 end-1]"
+		continue
+	    }
+	    if {$cont ne ""} {
+		append cont $line
+		set line [string trim $cont]
+		set cont ""
+	    }
+
+	    # At this point we have a complete line/command in 'line'.
+	    # We expect the following forms of input:
+	    #
+	    # (1.) if {...} {.............} - Tcl command, run in the
+	    #                                 backend interpreter.
+	    #                                 Note that this can EXIT
+	    #                                 the application using
+	    #                                 the critcl package.
+	    # (2.)  set VAR VALUE.......... - Ditto.
+	    # (3.)  # ..................... - Comment. Skipped
+	    # (4.) PLATFORM VAR VALUE...... - Platform-specific
+	    #                                 configuration variable
+	    #                                 and value.
+
+	    # (4a) PLATFORM when .........  - Makes the PLATFORM
+	    #                                 conditional on the
+	    #                                 expression after the
+	    #                                 'when' keyword. This
+	    #                                 uses variables set by
+	    #                                 (1) and/or (2). The
+	    #                                 expression is run in the
+	    #                                 backend interpreter. If
+	    #                                 and only if PLATFORM is
+	    #                                 a prefix of the current
+	    #                                 build platform, or the
+	    #                                 reverse, then the code
+	    #                                 with an TRUE when is
+	    #                                 chosen as the
+	    #                                 configuration.
+
+	    # (4b) PLATFORM target ?actual? - Marks the platform as a
+	    #                                 cross-compile target,
+	    #                                 and actual is the
+	    #                                 platform identifier of
+	    #                                 the result. If not
+	    #                                 specified it defaults to
+	    #                                 PLATFORM.
+            # (4c) PLATFORM copy PARENT...  - Copies the currently defined
+            #                                 configuration variables and
+            #                                 values to the settings for
+            #                                 this platform.
+	    # (5.) VAR VALUE............... - Default configuration
+	    #                                 variable, and value.
+
+	    set plat [lindex [split $line] 0]
+
+	    # (1), or (2)
+	    if {$plat eq "set" || $plat eq "if"} {
+		while {![info complete $line] && ![eof $cfg]} {
+		    if {[gets $cfg more] == -1} {
+			set msg "incomplete command in Critcl Config file "
+			append msg "starting at line $i"
+			error $msg
+		    }
+		    append line  "\n$more"
+
+		}
+		interp eval $run $line
+		continue
+	    }
+
+	    # (3)
+	    if {$plat eq "#"} continue
+
+	    # (4), or (5).
+	    if {[lsearch -exact $v::configvars $plat] != -1} {
+		# (5) default config option
+		set cmd ""
+		if {![regexp {(\S+)\s+(.*)} $line -> type cmd]} {
+		    # cmd is empty
+		    set type $plat
+		    set cmd ""
+		}
+		set plat ""
+	    } else {
+		# (4) platform config option
+		if {![regexp {(\S+)\s+(\S+)\s+(.*)} $line -> p type cmd]} {
+		    # cmd is empty
+		    set type [lindex $line 1]
+		    set cmd ""
+		}
+
+		# (4a) if and only if either build platform or config
+		#      code are a prefix of each other can the 'when'
+		#      condition be evaluated and override the
+		#      standard selection for the configuration.
+
+		if {$type eq "when" &&
+		    ( [string match ${v::buildplatform}* $plat] ||
+		      [string match ${plat}* $v::buildplatform] )} {
+		    set res ""
+		    catch {
+			set res [interp eval $run expr $cmd]
+		    }
+		    switch $res {
+			"" -
+			0 { set whenfalse($plat) 1 }
+			1 { set whenplat $plat }
+		    }
+		}
+		lappend knowntargets $plat
+	    }
+
+            switch -exact -- $type {
+                target {
+                    # (4b) cross compile target.
+                    # cmd = actual target platform identifier.
+                    if {$cmd eq ""} {
+                        set cmd $plat
+                    }
+                    set v::xtargets($plat) $cmd
+                }
+                copy {
+                    # (4c) copy an existing config
+                    # XXX - should we error out if no definitions exist
+                    # for parent platform config
+                    # $cmd contains the parent platform
+                    foreach {key val} [array get v::toolchain "$cmd,*"] {
+                        set key [lindex [split $key ,] 1]
+                        set v::toolchain($plat,$key) $val
+                    }
+                }
+                default {
+                    set v::toolchain($plat,$type) $cmd
+                }
+	    }
+	}
+    }
+    set knowntargets [lsort -unique $knowntargets]
+    close $cfg
+
+    # Config file processing has completed.
+    # Now select the platform to configure the
+    # compiler backend with.
+
+    set v::knowntargets $knowntargets
+
+    # The config file may have selected a configuration based on the
+    # TRUE when conditions. Which were matched to v::buildplatform,
+    # making the chosen config a variant of it. If that did not happen
+    # a platform is chosen from the set of defined targets.
+    if {$whenplat ne ""} {
+	set match [list $whenplat]
+    } else {
+	set match [critcl::chooseconfig $v::buildplatform]
+    }
+
+    # Configure the backend.
+
+    setconfig ""    ;# defaults
+    if {[llength $match]} {
+	setconfig [lindex $match 0]
+    } else {
+	setconfig $v::buildplatform
+    }
+    return
+}
+
+proc ::critcl::chooseconfig {targetconfig {err 0}} {
+    # first try to match exactly
+    set match [lsearch -exact -all -inline $v::knowntargets $targetconfig]
+
+    # on failure, try to match as glob pattern
+    if {![llength $match]} {
+        set match [lsearch -glob -all -inline $v::knowntargets $targetconfig]
+    }
+
+    # on failure, error out if requested
+    if {![llength $match] && $err} {
+	error "unknown target $targetconfig - use one of $v::knowntargets"
+    }
+    return $match
+}
+
+proc ::critcl::showconfig {{fd ""}} {
+    variable run
+    variable configfile
+
+    # XXX replace gen - v::buildplatform
+    # XXX Do not use v::targetplatform here. Use v::config.
+    # XXX Similarly in setconfig.
+
+    set gen $v::buildplatform
+    if {$v::targetplatform eq ""} {
+	set plat "default"
+    } else {
+	set plat $v::targetplatform
+    }
+    set out [list]
+    if {$plat eq $gen} {
+	lappend out "Config: $plat"
+    } else {
+	lappend out "Config: $plat (built on $gen)"
+    }
+    lappend out "Origin: $configfile"
+    lappend out "    [format %-15s cache] [cache]"
+    foreach var [lsort $v::configvars] {
+	set val [getconfigvalue $var]
+	set line "    [format %-15s $var]"
+	foreach word [split [string trim $val]] {
+	    if {[set word [string trim $word]] eq ""} continue
+	    if {[string length "$line $word"] > 70} {
+		lappend out "$line \\"
+		set line "    [format %-15s { }] $word"
+	    } else {
+		set line "$line $word"
+	    }
+	}
+	lappend out $line
+    }
+    # Tcl variables - Combined LengthLongestWord (all), and filtering
+    set vars [list]
+    set max 0
+    foreach idx [array names v::toolchain $v::targetplatform,*] {
+	set var [lindex [split $idx ,] 1]
+	if {[set len [string length $var]] > $max} {
+	    set max $len
+	}
+	if {$var ne "when" && ![info exists c::$var]} {
+	    lappend vars $idx $var
+	}
+    }
+    if {[llength $vars]} {
+	lappend out "Tcl variables:"
+	foreach {idx var} $vars {
+	    set val $v::toolchain($idx)
+	    if {[llength $val] == 1} {
+		# for when someone inevitably puts quotes around
+		# values - e.g. "Windows NT"
+		set val [lindex $val 0]
+	    }
+	    lappend out "    [PadRight $max $var] $val"
+	}
+    }
+    set out [join $out \n]
+    if {$fd ne ""} {
+	puts $fd $out
+    } else {
+	return $out
+    }
+}
+
+proc ::critcl::showallconfig {{ofd ""}} {
+    variable configfile
+    set txt [Cat $configfile]
+    if {$ofd ne ""} {
+	puts $ofd $txt
+    } else {
+	return $txt
+    }
+}
+
+proc ::critcl::setconfig {targetconfig} {
+    global env
+    set v::targetconfig   $targetconfig
+
+    # Strip the compiler information from the configuration to get the
+    # platform identifier embedded into it. This is a semi-recurrence
+    # of the original hardwired block handling win32/gcc/cl. We can
+    # partly emulate this with 'platform' directives in the Config
+    # file, however this breaks down when trying to handle the default
+    # settings. I.e. something like FOO-gcc which has no configuration
+    # block in the file uses the defaults, and thus has no proper
+    # place for a custom platform directive. So we have to do it here,
+    # in code. For symmetry the other compilers (-cc, -cl) are handled
+    # as well.
+
+    set v::targetplatform $targetconfig
+    foreach p {gcc cc_r xlc xlc_r cc cl clang([[:digit:]])*} {
+	if {[regsub -- "-$p\$" $v::targetplatform {} v::targetplatform]} break
+    }
+
+    set c::platform     ""
+    set c::sharedlibext ""
+
+    foreach var $v::configvars {
+	if {[info exists v::toolchain($targetconfig,$var)]} {
+
+	    set c::$var $v::toolchain($targetconfig,$var)
+
+	    if {$var eq "platform"} {
+		set px [getconfigvalue platform]
+		set v::targetplatform [lindex $px 0]
+		set v::version        [lindex $px 1]
+	    }
+	}
+    }
+    if {[info exists env(CFLAGS)]} {
+	variable c::compile
+	append   c::compile      " $env(CFLAGS)"
+    }
+    if {[info exists env(LDFLAGS)]} {
+	variable c::link
+	append   c::link         " $env(LDFLAGS)"
+	append   c::link_preload " $env(LDFLAGS)"
+    }
+    if {[string match $v::targetplatform $v::buildplatform]} {
+	# expand platform to match host if it contains wildcards
+	set v::targetplatform $v::buildplatform
+    }
+    if {$c::platform eq ""} {
+	# default config platform (mainly for the "show" command)
+	set c::platform $v::targetplatform
+    }
+    if {$c::sharedlibext eq ""} {
+	set c::sharedlibext [info sharedlibextension]
+    }
+
+    # The following definition of the cache directory is only relevant
+    # for mode "compile & run". The critcl application handling the
+    # package mode places the cache in a process-specific location
+    # without care about platforms. For here this means that we can
+    # ignore both cross-compilation, and the user choosing a target
+    # for us, as neither happens nor works for "compile & run". We can
+    # assume that build and target platforms will be the same, be the
+    # current platform, and we can make a simple choice for the
+    # directory.
+
+    cache [file join $env(HOME) .critcl [platform::identify]]
+
+    # Initialize Tcl variables based on the chosen tooling
+    foreach idx [array names v::toolchain $v::targetplatform,*] {
+	set var [lindex [split $idx ,] 1]
+	if {![info exists c::$var]} {
+	    set val $v::toolchain($idx)
+	    if {[llength $val] == 1} {
+		# for when someone inevitably puts quotes around
+		# values - e.g. "Windows NT"
+		set val [lindex $val 0]
+	    }
+	    set $var $val
+	}
+    }
+    return
+}
+
+proc ::critcl::getconfigvalue {var} {
+    variable run
+    if {[catch {set val [interp eval $run [list subst [set c::$var]]]}]} {
+	set val [set c::$var]
+    }
+    return $val
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- API: Application
+
+# The regular commands used by the application, defined in other
+# sections of the package are:
+#
+# C critcl::cache
+# C critcl::ccode
+# C critcl::chooseconfig
+# C critcl::cinit
+# C critcl::clean_cache
+# C critcl::clibraries
+# C critcl::cobjects
+# C critcl::config I, L, lines, force, keepsrc, combine, trace, tcl9, outdir
+# C critcl::debug
+# C critcl::error               | App overrides our implementation.
+# C critcl::getconfigvalue
+# C critcl::lappendlist
+# C critcl::ldflags
+# C critcl::preload
+# C critcl::readconfig
+# C critcl::setconfig
+# C critcl::showallconfig
+# C critcl::showconfig
+
+proc ::critcl::crosscheck {} {
+    variable run
+    global tcl_platform
+
+    if {$tcl_platform(platform) eq "windows"} {
+	set null NUL:
+    } else {
+	set null /dev/null
+    }
+
+    if {![catch {
+	set     cmd [linsert $c::version 0 exec]
+	lappend cmd 2> $null;#@stdout
+	set config [interp eval $run $cmd]
+    } msg]} {
+	set host ""
+	set target ""
+	foreach line $config {
+	    foreach arg [split $line] {
+		if {[string match "--*" $arg]} {
+		    lassign [split [string trim $arg -] =] cfg val
+		    set $cfg $val
+		}
+	    }
+	}
+	if {$host ne $target && [info exists v::xtargets($target)]} {
+	    setconfig $target
+	    print stderr "Cross compiling using $target"
+	}
+	# XXX host != target, but not know as config ?
+	# XXX Currently ignored.
+	# XXX Throwing an error better ?
+    }
+    return
+}
+
+# See (XX) at the end of the file (package state variable setup)
+# for explanations of the exact differences between these.
+
+proc ::critcl::knowntargets {} {
+    return $v::knowntargets
+}
+
+proc ::critcl::targetconfig {} {
+    return $v::targetconfig
+}
+
+proc ::critcl::targetplatform {} {
+    return $v::targetplatform
+}
+
+proc ::critcl::buildplatform {} {
+    return $v::buildplatform
+}
+
+proc ::critcl::actualtarget {} {
+    # Check if the chosen target is a cross-compile target.  If yes,
+    # we return the actual platform identifier of the target. This is
+    # used to select the proper platform director names in the critcl
+    # cache, generated packages, when searching for preload libraries,
+    # etc. Whereas the chosen target provides the proper compile
+    # configuration which will invoke the proper cross-compiler, etc.
+
+    if {[info exists v::xtargets($v::targetplatform)]} {
+	return $v::xtargets($v::targetplatform)
+    } else {
+	return $v::targetplatform
+    }
+}
+
+proc ::critcl::sharedlibext {} {
+    return [getconfigvalue sharedlibext]
+}
+
+proc ::critcl::buildforpackage {{buildforpackage 1}} {
+    set v::buildforpackage $buildforpackage
+    return
+}
+
+proc ::critcl::fastuuid {} {
+    set v::uuidcounter 1 ;# Activates it.
+    return
+}
+
+proc ::critcl::cbuild {file {load 1}} {
+    if {[info exists v::code($file,failed)] && !$load} {
+	set v::buildforpackage 0
+	return $v::code($file,failed)
+    }
+
+    StatusReset
+
+    # Determine if we should place stubs code into the generated file.
+    set placestubs [expr {!$v::buildforpackage}]
+
+    # Determine the requested mode and reset for next call.
+    set buildforpackage $v::buildforpackage
+    set v::buildforpackage 0
+
+    if {$file eq ""} {
+	set file [This]
+    }
+
+    # NOTE: The 4 pieces of data just below has to be copied into the
+    # result even if the build and link-steps are suppressed. Because
+    # the load-step must have this information.
+
+    set shlib    [DetermineShlibName $file]
+    set initname [DetermineInitName  $file [expr {$buildforpackage ? "ns" : ""}]]
+
+    dict set v::code($file) result tsources   [GetParam $file tsources]
+    dict set v::code($file) result mintcl     [MinTclVersion $file]
+
+    set emsg {}
+    set msgs {}
+
+    if {$v::options(force) || ![file exists $shlib]} {
+	LogOpen $file
+	set base   [BaseOf              $file]
+	set object [DetermineObjectName $file]
+
+	API_setup $file
+
+	# Generate the main C file
+	CollectEmbeddedSources $file $base.c $object $initname $placestubs
+
+	# Set the marker for critcl::done and its user, HandleDeclAfterBuild.
+	dict set v::code($file) result closed mark
+
+	# Compile main file
+        lappend objects [Compile $file $file $base.c $object]
+
+	# Compile the companion C sources as well, if there are any.
+        foreach src [GetParam $file csources] {
+	    lappend objects [Compile $file $src $src \
+				 [CompanionObject $src]]
+	}
+
+	# NOTE: The data below has to be copied into the result even
+	# if the link-step is suppressed. Because the application
+	# (mode 'generate package') must have this information to be
+	# able to perform the final link.
+
+	lappendlist objects [GetParam $file cobjects]
+
+	dict set v::code($file) result clibraries [set clib [GetParam $file clibraries]]
+	dict set v::code($file) result libpaths   [LibPaths $clib]
+	dict set v::code($file) result ldflags    [GetParam $file ldflags]
+	dict set v::code($file) result objects    $objects
+	dict set v::code($file) result tk         [UsingTk  $file]
+	dict set v::code($file) result preload    [GetParam $file preload]
+	dict set v::code($file) result license    [GetParam $file license <<Undefined>>]
+	dict set v::code($file) result log        {}
+	dict set v::code($file) result meta       [GetMeta $file]
+
+	# Link and load steps.
+        if {$load || !$buildforpackage} {
+	    Link $file
+	}
+
+	lassign [LogClose] msgs emsg
+
+	dict set v::code($file) result warnings [CheckForWarnings $emsg]
+    }
+
+    dict set v::code($file) result log $msgs
+    dict set v::code($file) result exl $emsg
+
+    if {$v::failed} {
+	if {!$buildforpackage} {
+	    print stderr "$msgs\ncritcl build failed ($file)"
+	}
+    } elseif {$load && !$buildforpackage} {
+	Load $file
+    }
+
+    # Release the data which was collected for the just-built file, as
+    # it is not needed any longer.
+    dict unset v::code($file) config
+
+    return [StatusSave $file]
+}
+
+proc ::critcl::cresults {{file {}}} {
+    if {$file eq ""} { set file [This] }
+    return [dict get $v::code($file) result]
+}
+
+proc ::critcl::cnothingtodo {f} {
+    # No critcl definitions at all ?
+    if {![info exists  v::code($f)]} { return 1 }
+
+    # We have results already, so where had been something to do.
+    if {[dict exists $v::code($f) result]} { return 0 }
+
+    # No C code collected for compilation ?
+    if {![dict exists $v::code($f) config fragments]} { return 1 }
+
+    # Ok, something has to be done.
+    return 0
+}
+
+proc ::critcl::c++command {tclname class constructors methods} {
+    # Build the body of the function to define a new tcl command for
+    # the C++ class
+    set helpline {}
+    set classptr ptr_$tclname
+    set comproc "    $class* $classptr;\n"
+    append comproc "    switch (objc) \{\n"
+
+    if {![llength $constructors]} {
+	set constructors {{}}
+    }
+
+    foreach adefs $constructors {
+	array set types {}
+	set names {}
+	set cargs {}
+	set cnames {}
+
+	foreach {t n} $adefs {
+	    set types($n) $t
+	    lappend names $n
+	    lappend cnames _$n
+	    lappend cargs "$t $n"
+	}
+	lappend helpline "$tclname pathName [join $names { }]"
+	set nargs  [llength $names]
+	set ncargs [expr {$nargs + 2}]
+	append comproc "        case $ncargs: \{\n"
+
+	if {!$nargs} {
+	    append comproc "            $classptr = new $class\();\n"
+	} else  {
+	    append comproc [ProcessArgs types $names $cnames]
+	    append comproc "            $classptr = new $class\([join $cnames {, }]);\n"
+	}
+	append comproc "            break;\n"
+	append comproc "        \}\n"
+
+    }
+    append comproc "        default: \{\n"
+    append comproc "            Tcl_SetResult(ip, \"wrong # args: should be either [join $helpline { or }]\",TCL_STATIC);\n"
+    append comproc "            return TCL_ERROR;\n"
+    append comproc "        \}\n"
+    append comproc "    \}\n"
+
+    append comproc "    if ( $classptr == NULL ) \{\n"
+    append comproc "        Tcl_SetResult(ip, \"Not enough memory to allocate a new $tclname\", TCL_STATIC);\n"
+    append comproc "        return TCL_ERROR;\n"
+    append comproc "    \}\n"
+
+    append comproc "    Tcl_CreateObjCommand2(ip, Tcl_GetString(objv\[1]), cmdproc_$tclname, (ClientData) $classptr, delproc_$tclname);\n"
+    append comproc "    return TCL_OK;\n"
+    #
+    #  Build the body of the c function called when the object is deleted
+    #
+    set delproc "void delproc_$tclname\(ClientData cd) \{\n"
+    append delproc "    if (cd != NULL)\n"
+    append delproc "        delete ($class*) cd;\n"
+    append delproc "\}\n"
+
+    #
+    # Build the body of the function that processes the tcl commands for the class
+    #
+    set cmdproc "int cmdproc_$tclname\(ClientData cd, Tcl_Interp* ip, Tcl_Size objc, Tcl_Obj *CONST objv\[]) \{\n"
+    append cmdproc "    int index;\n"
+    append cmdproc "    $class* $classptr = ($class*) cd;\n"
+
+    set rtypes {}
+    set tnames {}
+    set mnames {}
+    set adefs {}
+    foreach {rt n a} $methods {
+	lappend rtypes $rt
+	lappend tnames [lindex $n 0]
+	set tmp [lindex $n 1]
+	if {$tmp eq ""}  {
+	    lappend mnames [lindex $n 0]
+	} else {
+	    lappend mnames [lindex $n 1]
+	}
+	lappend adefs $a
+    }
+    append cmdproc "    static const char* cmds\[]=\{\"[join $tnames {","}]\",NULL\};\n"
+    append cmdproc "    if (objc < 2) \{\n"
+    append cmdproc "       Tcl_WrongNumArgs(ip, 1, objv, \"expecting pathName option\");\n"
+    append cmdproc "       return TCL_ERROR;\n"
+    append cmdproc "    \}\n\n"
+    append cmdproc "    if (Tcl_GetIndexFromObj(ip, objv\[1], cmds, \"option\", TCL_EXACT, &index) != TCL_OK)\n"
+    append cmdproc "        return TCL_ERROR;\n"
+    append cmdproc "    switch (index) \{\n"
+
+    set ndx 0
+    foreach rtype $rtypes tname $tnames mname $mnames adef $adefs {
+	array set types {}
+	set names {}
+	set cargs {}
+	set cnames {}
+
+	switch -- $rtype {
+	    ok      { set rtype2 "int" }
+	    string -
+	    dstring -
+	    vstring { set rtype2 "char*" }
+	    default { set rtype2 $rtype }
+	}
+
+	foreach {t n} $adef {
+	    set types($n) $t
+	    lappend names $n
+	    lappend cnames _$n
+	    lappend cargs "$t $n"
+	}
+	set helpline "$tname [join $names { }]"
+	set nargs  [llength $names]
+	set ncargs [expr {$nargs + 2}]
+
+	append cmdproc "        case $ndx: \{\n"
+	append cmdproc "            if (objc == $ncargs) \{\n"
+	append cmdproc  [ProcessArgs types $names $cnames]
+	append cmdproc "                "
+	if {$rtype ne "void"} {
+	    append cmdproc "$rtype2 rv = "
+	}
+	append cmdproc "$classptr->$mname\([join $cnames {, }]);\n"
+	append cmdproc "                "
+	switch -- $rtype {
+	    void     { }
+	    ok   { append cmdproc "return rv;" }
+	    int  { append cmdproc "Tcl_SetIntObj(Tcl_GetObjResult(ip), rv);" }
+	    long { append cmdproc " Tcl_SetLongObj(Tcl_GetObjResult(ip), rv);" }
+	    float -
+	    double { append cmdproc "Tcl_SetDoubleObj(Tcl_GetObjResult(ip), rv);" }
+	    char*  { append cmdproc "Tcl_SetResult(ip, rv, TCL_STATIC);" }
+	    string -
+	    dstring  { append cmdproc "Tcl_SetResult(ip, rv, TCL_DYNAMIC);" }
+	    vstring  { append cmdproc "Tcl_SetResult(ip, rv, TCL_VOLATILE);" }
+	    default  { append cmdproc "if (rv == NULL) \{ return TCL_ERROR ; \}\n  Tcl_SetObjResult(ip, rv); Tcl_DecrRefCount(rv);" }
+	}
+	append cmdproc "\n"
+	append cmdproc "                "
+	if {$rtype ne "ok"} { append cmdproc "return TCL_OK;\n" }
+
+	append cmdproc "            \} else \{\n"
+	append cmdproc "               Tcl_WrongNumArgs(ip, 1, objv, \"$helpline\");\n"
+	append cmdproc "               return TCL_ERROR;\n"
+	append cmdproc "            \}\n"
+	append cmdproc "        \}\n"
+	incr ndx
+    }
+    append cmdproc "    \}\n\}\n"
+
+    # TODO: line pragma fix ?!
+    ccode $delproc
+    ccode $cmdproc
+
+    # Force the new ccommand to be defined in the caller's namespace
+    # instead of improperly in ::critcl.
+    namespace eval [uplevel 1 namespace current] \
+	[list critcl::ccommand $tclname {dummy ip objc objv} $comproc]
+
+    return
+}
+
+proc ::critcl::ProcessArgs {typesArray names cnames}  {
+    upvar 1 $typesArray types
+    set body ""
+    foreach x $names c $cnames {
+	set t $types($x)
+	switch -- $t {
+	    int - long - float - double - char* - Tcl_Obj* {
+		append body "            $t $c;\n"
+	    }
+	    default {
+		append body "            void* $c;\n"
+	    }
+	}
+    }
+    set n 1
+    foreach x $names c $cnames {
+	set t $types($x)
+	incr n
+	switch -- $t {
+	    int {
+		append body "            if (Tcl_GetIntFromObj(ip, objv\[$n], &$c) != TCL_OK)\n"
+		append body "                return TCL_ERROR;\n"
+	    }
+	    long {
+		append body "            if (Tcl_GetLongFromObj(ip, objv\[$n], &$c) != TCL_OK)\n"
+		append body "                return TCL_ERROR;\n"
+	    }
+	    float {
+		append body "            \{ double tmp;\n"
+		append body "                if (Tcl_GetDoubleFromObj(ip, objv\[$n], &tmp) != TCL_OK)\n"
+		append body "                   return TCL_ERROR;\n"
+		append body "                $c = (float) tmp;\n"
+		append body "            \}\n"
+	    }
+	    double {
+		append body "            if (Tcl_GetDoubleFromObj(ip, objv\[$n], &$c) != TCL_OK)\n"
+		append body "                return TCL_ERROR;\n"
+	    }
+	    char* {
+		append body "            $c = Tcl_GetString(objv\[$n]);\n"
+	    }
+	    default {
+		append body "            $c = objv\[$n];\n"
+	    }
+	}
+    }
+    return $body
+}
+
+proc ::critcl::scan {file} {
+    set lines [split [Cat $file] \n]
+
+    set scan::rkey    require
+    set scan::base    [file dirname [file normalize $file]]
+    set scan::capture {
+	org         {}
+	version     {}
+	files       {}
+	imported    {}
+	config      {}
+	meta-user   {}
+	meta-system {}
+	tsources    {}
+    }
+
+    ScanCore $lines {
+	critcl::api			sub
+	critcl::api/extheader		ok
+	critcl::api/function		ok
+	critcl::api/header		warn
+	critcl::api/import		ok
+	critcl::source                  warn
+	critcl::cheaders		warn
+	critcl::csources		warn
+	critcl::license			warn
+	critcl::meta			warn
+	critcl::owns			warn
+	critcl::tcl			ok
+	critcl::tk			ok
+	critcl::tsources		warn
+	critcl::userconfig		sub
+	critcl::userconfig/define	ok
+	critcl::userconfig/query	ok
+	critcl::userconfig/set		ok
+	package				warn
+    }
+
+    set version [dict get $scan::capture version]
+    print "\tVersion:      $version"
+
+    # TODO : Report requirements.
+    # TODO : tsources - Scan files for dependencies!
+
+    set n [llength [dict get $scan::capture files]]
+    print -nonewline "\tInput:        $file"
+    if {$n} {
+	print -nonewline " + $n Companion"
+	if {$n > 1} { print -nonewline s }
+    }
+    print ""
+
+    # Merge the system and user meta data, with system overriding the
+    # user. See 'GetMeta' for same operation when actually builing the
+    # package. Plus scan any Tcl companions for more requirements.
+
+    set     md {}
+    lappend md [dict get $scan::capture meta-user]
+    lappend md [dict get $scan::capture meta-system]
+
+    foreach ts [dict get $scan::capture tsources] {
+	lappend md [dict get [ScanDependencies $file \
+				  [file join [file dirname $file] $ts] \
+				  capture] meta-system]
+    }
+
+    dict unset scan::capture meta-user
+    dict unset scan::capture meta-system
+    dict unset scan::capture tsources
+
+    dict set scan::capture meta \
+	[eval [linsert $md 0 dict merge]]
+    # meta = dict merge {*}$md
+
+    if {[dict exists $scan::capture meta require]} {
+	foreach r [dict get $scan::capture meta require] {
+	    print "\tRequired:     $r"
+	}
+    }
+
+    return $scan::capture
+}
+
+proc ::critcl::ScanDependencies {dfile file {mode plain}} {
+    set lines [split [Cat $file] \n]
+
+    catch {
+	set saved $scan::capture
+    }
+
+    set scan::rkey    require
+    set scan::base    [file dirname [file normalize $file]]
+    set scan::capture {
+	name        {}
+	version     {}
+	meta-system {}
+    }
+
+    ScanCore $lines {
+	critcl::buildrequirement	warn
+	package				warn
+    }
+
+    if {$mode eq "capture"} {
+	set result $scan::capture
+	set scan::capture $saved
+	return $result
+    }
+
+    dict with scan::capture {
+	if {$mode eq "provide"} {
+	    msg "  (provide $name $version)"
+
+	    ImetaSet $dfile name     $name
+	    ImetaSet $dfile version  $version
+	}
+
+	dict for {k vlist} [dict get $scan::capture meta-system] {
+	    if {$k eq "name"}    continue
+	    if {$k eq "version"} continue
+
+	    ImetaAdd $dfile $k $vlist
+
+	    if {$k ne "require"} continue
+	    # vlist = package list, each element a package name,
+	    # and optional version.
+	    msg "  ([file tail $file]: require [join [lsort -dict -unique $vlist] {, }])"
+	}
+
+	# The above information also goes into the teapot meta data of
+	# the file in question. This however is defered until the meta
+	# data is actually pulled for delivery to the tool using the
+	# package. See 'GetMeta' for where the merging happens.
+    }
+
+    return
+}
+
+proc ::critcl::ScanCore {lines theconfig} {
+    # config = dictionary
+    # - <cmdname> => mode (ok, warn, sub)
+    # Unlisted commands are ignored.
+
+    variable scan::config $theconfig
+
+    set collect 0
+    set buf {}
+    set lno -1
+    foreach line $lines {
+	#puts |$line|
+
+	incr lno
+	if {$collect} {
+	    if {![info complete $buf]} {
+		append buf $line \n
+		continue
+	    }
+	    set collect 0
+
+	    #puts %%$buf%%
+
+	    # Prevent heavily dynamic code from stopping the scan.
+	    # WARN the user.
+	    regexp {^(\S+)} $buf -> cmd
+	    if {[dict exists $config $cmd]} {
+		set mode [dict get $config $cmd]
+
+		if {[catch {
+		    # Run in the scan namespace, with its special
+		    # command implementations.
+		    namespace eval ::critcl::scan $buf
+		} msg]} {
+		    if {$mode eq "sub"} {
+			regexp {^(\S+)\s+(\S+)} $buf -> _ method
+			append cmd /$method
+			set mode [dict get $config $cmd]
+		    }
+		    if {$mode eq "warn"} {
+			msg "Line $lno, $cmd: Failed execution of dynamic command may"
+			msg "Line $lno, $cmd: cause incorrect TEA results. Please check."
+			msg "Line $lno, $cmd: $msg"
+		    }
+		}
+	    }
+
+	    set buf ""
+	    # fall through, to handle the line which just got NOT
+	    # added to the buf.
+	}
+
+	set line [string trimleft $line " \t:"]
+	if {[string trim $line] eq {}} continue
+
+	regexp {^(\S+)} $line -> cmd
+	if {[dict exists $config $cmd]} {
+	    append buf $line \n
+	    set collect 1
+	}
+    }
+}
+
+# Handle the extracted commands
+namespace eval ::critcl::scan::critcl {}
+
+proc ::critcl::scan::critcl::buildrequirement {script} {
+    # Recursive scan of the script, same configuration, except
+    # switched to record 'package require's under the build::reqire
+    # key.
+
+    variable ::critcl::scan::config
+    variable ::critcl::scan::rkey
+
+    set saved $rkey
+    set rkey build::require
+
+    ::critcl::ScanCore [split $script \n] $config
+
+    set rkey $saved
+    return
+}
+
+# Meta data.
+# Capture specific dependencies
+proc ::critcl::scan::critcl::tcl {version} {
+    variable ::critcl::scan::capture
+    dict update capture meta-system m {
+	dict lappend m require [list Tcl $version]
+    }
+    return
+}
+
+proc ::critcl::scan::critcl::tk {} {
+    variable ::critcl::scan::capture
+    dict update capture meta-system m {
+	dict lappend m require Tk
+    }
+    return
+}
+
+proc ::critcl::scan::critcl::description {text} {
+    variable ::critcl::scan::capture
+    dict set capture meta-system description \
+	[::critcl::Text2Words $text]
+    return
+}
+
+proc ::critcl::scan::critcl::summary {text} {
+    variable ::critcl::scan::capture
+    dict set capture meta-system summary \
+	[::critcl::Text2Words $text]
+    return
+}
+
+proc ::critcl::scan::critcl::subject {args} {
+    variable ::critcl::scan::capture
+    dict update capture meta-system m {
+	foreach word $args {
+	    dict lappend m subject $word
+	}
+    }
+    return
+}
+
+proc ::critcl::scan::critcl::meta {key args} {
+    variable ::critcl::scan::capture
+    dict update capture meta-user m {
+	foreach word $args {
+	    dict lappend m $key $word
+	}
+    }
+    return
+}
+
+# Capture files
+proc ::critcl::scan::critcl::source   {path} {
+    # Recursively scan the imported file.
+    # Keep the current context.
+    variable ::critcl::scan::config
+
+    foreach f [Files $path] {
+	set lines [split [::critcl::Cat $f] \n]
+	ScanCore $lines $config
+    }
+    return
+}
+proc ::critcl::scan::critcl::owns     {args} { eval [linsert $args 0 Files] }
+proc ::critcl::scan::critcl::cheaders {args} { eval [linsert $args 0 Files] }
+proc ::critcl::scan::critcl::csources {args} { eval [linsert $args 0 Files] }
+proc ::critcl::scan::critcl::tsources {args} {
+    variable ::critcl::scan::capture
+    foreach ts [eval [linsert $args 0 Files]] {
+	dict lappend capture tsources $ts
+    }
+    return
+}
+
+proc ::critcl::scan::critcl::Files {args} {
+    variable ::critcl::scan::capture
+    set res {}
+    foreach v $args {
+	if {[string match "-*" $v]} continue
+	foreach f [Expand $v] {
+	    dict lappend capture files $f
+	    lappend res $f
+	}
+    }
+    return $res
+}
+
+proc ::critcl::scan::critcl::Expand {pattern} {
+    variable ::critcl::scan::base
+
+    # Note: We cannot use -directory here. The PATTERN may already be
+    # an absolute path, in which case the join will return the
+    # unmodified PATTERN to glob on, whereas with -directory the final
+    # pattern will be BASE/PATTERN which won't find anything, even if
+    # PATTERN actually exists.
+
+    set prefix [file split $base]
+
+    set files {}
+    foreach vfile [glob [file join $base $pattern]] {
+	set xfile [file normalize $vfile]
+	if {![file exists $xfile]} {
+	    error "$vfile: not found"
+	}
+
+	# Constrain to be inside of the base directory.
+	# Snarfed from fileutil::stripPath
+
+	set npath [file split $xfile]
+
+	if {![string match -nocase "${prefix} *" $npath]} {
+	    error "$vfile: Not inside of $base"
+	}
+
+	set xfile [eval [linsert [lrange $npath [llength $prefix] end] 0 file join ]]
+	lappend files $xfile
+    }
+    return $files
+}
+
+# Capture license (org name)
+proc ::critcl::scan::critcl::license {who args} {
+    variable ::critcl::scan::capture
+    dict set capture org $who
+
+    ::critcl::print "\tOrganization: $who"
+
+    # Meta data.
+    set elicense [::critcl::LicenseText $args]
+
+    dict set capture meta-system license \
+	[::critcl::Text2Words $elicense]
+    dict set capture meta-system author \
+	[::critcl::Text2Authors $who]
+    return
+}
+
+# Capture version of the provided package.
+proc ::critcl::scan::package {cmd args} {
+    if {$cmd eq "provide"} {
+	# Syntax: package provide <name> <version>
+
+	variable capture
+	lassign $args name version
+	dict set capture name    $name
+	dict set capture version $version
+
+	# Save as meta data as well.
+
+	dict set capture meta-system name     $name
+	dict set capture meta-system version  $version
+	dict set capture meta-system platform source
+	dict set capture meta-system generated::by \
+	    [list \
+		 [list critcl [::package present critcl]] \
+		 $::tcl_platform(user)]
+	dict set capture meta-system generated::date \
+	    [list [clock format [clock seconds] -format {%Y-%m-%d}]]
+	return
+    } elseif {$cmd eq "require"} {
+	# Syntax: package require <name> ?-exact? <version>
+	#       : package require <name> <version-range>...
+
+	# Save dependencies as meta data.
+
+	# Ignore the critcl core
+	if {[lindex $args 0] eq "critcl"} return
+
+	variable capture
+	variable rkey
+	dict update capture meta-system m {
+	    dict lappend m $rkey [::critcl::TeapotRequire $args]
+	}
+	return
+    }
+
+    # ignore anything else.
+    return
+}
+
+# Capture the APIs imported by the package
+proc ::critcl::scan::critcl::api {cmd args} {
+    variable ::critcl::scan::capture
+    switch -exact -- $cmd {
+	header {
+	    eval [linsert $args 0 Files]
+	}
+	import {
+	    # Syntax: critcl::api import <name> <version>
+	    lassign $args name _
+	    dict lappend capture imported $name
+	    print "\tImported:     $name"
+	}
+	default {}
+    }
+    return
+}
+
+# Capture the user config options declared by the package
+proc ::critcl::scan::critcl::userconfig {cmd args} {
+    variable ::critcl::scan::capture
+    switch -exact -- $cmd {
+	define {
+	    # Syntax: critcl::userconfig define <name> <description> <type> ?<default>?
+	    lassign $args oname odesc otype odefault
+	    set odesc [string trim $odesc]
+	    if {[llength $args] < 4} {
+		set odefault [::critcl::UcDefault $otype]
+	    }
+	    dict lappend capture config [list $oname $odesc $otype $odefault]
+	    print "\tUser Config:  $oname ([join $otype { }] -> $odefault) $odesc"
+	}
+	set - query -
+	default {}
+    }
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- Internals - cproc conversion helpers.
+
+proc ::critcl::EmitShimHeader {wname} {
+    # Function head
+    set ca "(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov\[])"
+    Emitln
+    Emitln "static int"
+    Emitln "$wname$ca"
+    Emitln \{
+    return
+}
+
+proc ::critcl::EmitShimVariables {adb rtype} {
+    foreach d [dict get $adb vardecls] {
+	Emitln "  $d"
+    }
+    if {[dict get $adb hasoptional]} {
+	Emitln "  int idx_;"
+	Emitln "  int argc_;"
+    }
+
+    # Result variable, source for the C -> Tcl conversion.
+    if {$rtype ne "void"} { Emit "  [ResultCType $rtype] rv;" }
+    return
+}
+
+proc ::critcl::EmitArgTracing {fun} {
+    if {!$v::options(trace)} return
+    Emitln "\n  critcl_trace_cmd_args ($fun, oc, ov);"
+    return
+}
+
+proc ::critcl::EmitWrongArgsCheck {adb} {
+    # Code checking for the correct count of arguments, and generating
+    # the proper error if not.
+
+    set wac [dict get $adb wacondition]
+    if {$wac eq {}} return
+
+    # Have a check, put the pieces together.
+
+    set offset [dict get $adb skip]
+    set tsig   [dict get $adb tsignature]
+    set min    [dict get $adb min]
+    set max    [dict get $adb max]
+
+    incr min $offset
+    if {$max != Inf} {
+	incr max $offset
+    }
+
+    lappend map MIN_ARGS $min
+    lappend map MAX_ARGS $max
+    set wac [string map $map $wac]
+
+    Emitln ""
+    Emitln "  if ($wac) \{"
+    Emitln "    Tcl_WrongNumArgs(interp, $offset, ov, $tsig);"
+    Emitln [TraceReturns "wrong-arg-num check" "    return TCL_ERROR;"]
+    Emitln "  \}"
+    Emitln ""
+    return
+}
+
+proc ::critcl::EmitSupport {adb} {
+    set s [dict get $adb support]
+    if {![llength $s]} return
+    if {[join $s {}] eq {}} return
+    Emit [join $s \n]\n
+    return
+}
+
+proc ::critcl::EmitCall {cname cnames rtype} {
+    # Invoke the low-level function.
+
+    Emitln  "  /* Call - - -- --- ----- -------- */"
+    Emit "  "
+    if {$rtype ne "void"} { Emit "rv = " }
+    Emitln "${cname}([join $cnames {, }]);"
+    Emitln
+    return
+}
+
+proc ::critcl::EmitConst {rtype rvalue} {
+    # Assign the constant directly to the shim's result variable.
+
+    Emitln  "  /* Const - - -- --- ----- -------- */"
+    Emit "  "
+    if {$rtype ne "void"} { Emit "rv = " }
+    Emitln "${rvalue};"
+    Emitln
+    return
+}
+
+proc ::critcl::TraceReturns {label code} {
+    if {!$v::options(trace)} {
+	return $code
+    }
+
+    # Inject tracing into the 'return's.
+    regsub -all \
+	{return[[:space:]]*([^;]*);}           $code \
+	{return critcl_trace_cmd_result (\1, interp);} newcode
+    if {[string match {*return *} $code] && ($newcode eq $code)} {
+	error "Failed to inject tracing code into $label"
+    }
+    return $newcode
+}
+
+proc ::critcl::EmitShimFooter {adb rtype} {
+    # Run release code for arguments which allocated temp memory.
+    set arelease [dict get $adb arelease]
+    if {[llength $arelease]} {
+	Emit "[join $arelease "\n  "]\n"
+    }
+
+    # Convert the returned low-level result from C to Tcl, if required.
+    # Return a standard status, if required.
+
+    set code [Deline [ResultConversion $rtype]]
+    if {$code ne {}} {
+	set code [TraceReturns "\"$rtype\" result" $code]
+	Emitln "  /* ($rtype return) - - -- --- ----- -------- */"
+	Emitln $code
+    } else {
+	if {$v::options(trace)} {
+	    Emitln "  critcl_trace_header (1, 0, 0);"
+	    Emitln "  critcl_trace_printf (1, \"RETURN (void)\");"
+	    Emitln "  critcl_trace_closer (1);"
+	    Emitln "  critcl_trace_pop();"
+	    Emitln "  return;"
+	}
+    }
+    Emitln \}
+    return
+}
+
+proc ::critcl::ArgumentSupport {type} {
+    if {[info exists v::acsup($type)]} { return $v::acsup($type) }
+    return {}
+}
+
+proc ::critcl::ArgumentRelease {type} {
+    if {[info exists v::acrel($type)]} { return $v::acrel($type) }
+    return {}
+}
+
+proc ::critcl::ArgumentCType {type} {
+    if {[info exists v::actype($type)]} { return $v::actype($type) }
+    return -code error "Unknown argument type \"$type\""
+}
+
+proc ::critcl::ArgumentCTypeB {type} {
+    if {[info exists v::actypeb($type)]} { return $v::actypeb($type) }
+    return -code error "Unknown argument type \"$type\""
+}
+
+proc ::critcl::ArgumentConversion {type} {
+    if {[info exists v::aconv($type)]} { return $v::aconv($type) }
+    return -code error "Unknown argument type \"$type\""
+}
+
+proc ::critcl::ResultCType {type} {
+    if {[info exists v::rctype($type)]} {
+	return $v::rctype($type)
+    }
+    return -code error "Unknown result type \"$type\""
+}
+
+proc ::critcl::ResultConversion {type} {
+    if {[info exists v::rconv($type)]} {
+	return $v::rconv($type)
+    }
+    return -code error "Unknown result type \"$type\""
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- Internals - Manage complex per-file settings.
+
+proc ::critcl::GetParam {file type {default {}}} {
+    if {[info exists  v::code($file)] &&
+	[dict exists $v::code($file) config $type]} {
+	return [dict get $v::code($file) config $type]
+    } else {
+	return $default
+    }
+}
+
+proc ::critcl::SetParam {type values {expand 1} {uuid 0} {unique 0}} {
+    set file [This]
+    if {![llength $values]} return
+
+    UUID.extend $file .$type $values
+
+    if {$type ne "cobjects"} {
+	#todo (debug flag): msg "\t$type += $values"
+	set dtype [string map {
+	    cheaders   {headers:    }
+	    csources   {companions: }
+	    api_hdrs    api-headers:
+	    api_ehdrs  {api-exthdr: }
+	    clibraries {libraries:  }
+	} $type]
+	set prefix "  ($dtype "
+	msg "$prefix[join $values ")\n$prefix"])"
+    }
+
+    # Process the list of flags, treat non-option arguments as glob
+    # patterns and expand them to a set of files, stored as absolute
+    # paths.
+
+    set have {}
+    if {$unique && [dict exists $v::code($file) config $type]} {
+	foreach v [dict get $v::code($file) config $type] {
+	    dict set have $v .
+	}
+    }
+
+    set tmp {}
+    foreach v $values {
+	if {[string match "-*" $v]} {
+	    lappend tmp $v
+	} else {
+	    if {$expand} {
+		foreach f [Expand $file $v] {
+		    if {$unique && [dict exists $have $f]} continue
+		    lappend tmp $f
+		    if {$unique} { dict set have $f . }
+		    if {$uuid} { UUID.extend $file .$type.$f [Cat $f] }
+		}
+	    } else {
+		if {$unique && [dict exists $have $v]} continue
+		lappend tmp $v
+		if {$unique} { dict set have $v . }
+	    }
+	}
+    }
+
+    if {$type eq "csources"} {
+	foreach v $tmp {
+	    at::= $v 1
+	    Transition9Check [at::raw] [Cat $v]
+	}
+    }
+
+    # And save into the system state.
+    dict update v::code($file) config c {
+	foreach v $tmp {
+	    dict lappend c $type $v
+	}
+    }
+
+    return
+}
+
+proc ::critcl::Expand {file pattern} {
+    set base [file dirname $file]
+
+    # Note: We cannot use -directory here. The PATTERN may already be
+    # an absolute path, in which case the join will return the
+    # unmodified PATTERN to glob on, whereas with -directory the final
+    # pattern will be BASE/PATTERN which won't find anything, even if
+    # PATTERN actually exists.
+
+    set files {}
+    foreach vfile [glob [file join $base $pattern]] {
+	set vfile [file normalize $vfile]
+	if {![file exists $vfile]} {
+	    error "$vfile: not found"
+	}
+	lappend files $vfile
+    }
+    return $files
+}
+
+proc ::critcl::InitializeFile {file} {
+    if {![info exists v::code($file)]} {
+	set      v::code($file) {}
+
+	# Initialize the meta data sections (user (meta) and system
+	# (package)).
+
+	dict set v::code($file) config meta    {}
+
+	dict set v::code($file) config package platform \
+	    [TeapotPlatform]
+	dict set v::code($file) config package build::date \
+	    [list [clock format [clock seconds] -format {%Y-%m-%d}]]
+
+	# May not exist, bracket code.
+	if {![file exists $file]} return
+
+	ScanDependencies $file $file provide
+	return
+    }
+
+    if {![dict exists $v::code($file) config]} {
+	dict set v::code($file) config {}
+    }
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- Internals - Management of in-memory C source fragment.
+
+proc ::critcl::name2c {name} {
+    # Note: A slightly modified copy (different depth in the call-stack) of this
+    # is inlined into the internal command "BeginCommand".
+
+    # Locate caller, as the data is saved per .tcl file.
+    set file [This]
+
+    if {![string match ::* $name]} {
+	# Locate caller's namespace. Two up, skipping the
+	# ccommand/cproc frame. This is where the new Tcl command will
+	# be defined in.
+
+	set ns [uplevel 1 namespace current]
+	if {$ns ne "::"} { append ns :: }
+
+	set name ${ns}$name
+    }
+
+    # First ensure that any namespace qualifiers found in the name
+    # itself are shifted over to the namespace information.
+
+    set ns   [namespace qualifiers $name]
+    set name [namespace tail       $name]
+
+    # Then ensure that everything is fully qualified, and that the C
+    # level name doesn't contain bad characters. We have to remove any
+    # non-alphabetic characters. A serial number is further required
+    # to distinguish identifiers which would, despite having different
+    # Tcl names, transform to the same C identifier.
+
+    if {$ns ne "::"} { append ns :: }
+    set cns [string map {:: _} $ns]
+
+    regsub -all -- {[^a-zA-Z0-9_]} $name _ cname
+    regsub -all -- {_+} $cname _ cname
+
+    regsub -all -- {[^a-zA-Z0-9_]} $cns _ cns
+    regsub -all -- {_+} $cns _ cns
+
+    set cname $cname[UUID.serial $file]
+
+    return [list $ns $cns $name $cname]
+}
+
+proc ::critcl::BeginCommand {visibility name args} {
+    # Locate caller, as the data is saved per .tcl file.
+    set file [This]
+
+    # Inlined name2c
+    if {![string match ::* $name]} {
+	# Locate caller's namespace. Two up, skipping the
+	# ccommand/cproc frame. This is where the new Tcl command will
+	# be defined in.
+
+	set ns [uplevel 2 namespace current]
+	if {$ns ne "::"} { append ns :: }
+
+	set name ${ns}$name
+    }
+
+    # First ensure that any namespace qualifiers found in the name
+    # itself are shifted over to the namespace information.
+
+    set ns   [namespace qualifiers $name]
+    set name [namespace tail       $name]
+
+    # Then ensure that everything is fully qualified, and that the C
+    # level identifiers don't contain bad characters. We have to
+    # remove any non-alphabetic characters. A serial number is further
+    # required to distinguish identifiers which would, despite having
+    # different Tcl names, transform to the same C identifier.
+
+    if {$ns ne "::"} { append ns :: }
+    set cns [string map {:: _} $ns]
+
+    regsub -all -- {[^a-zA-Z0-9_]} $name _ cname
+    regsub -all -- {_+} $cname _ cname
+
+    regsub -all -- {[^a-zA-Z0-9_]} $cns _ cns
+    regsub -all -- {_+} $cns _ cns
+
+    set cname $cname[UUID.serial $file]
+
+    # Set the defered build-on-demand used by mode 'comile & run' up.
+    # Note: Removing the leading :: because it trips Tcl's unknown
+    # command, i.e. the command will not be found when called in a
+    # script without leading ::.
+    set ::auto_index([string trimleft $ns$name :]) [list [namespace current]::cbuild $file]
+
+    set v::curr [UUID.extend $file .function "$ns $name $args"]
+
+    dict update v::code($file) config c {
+	dict lappend c functions $cns$cname
+	dict lappend c fragments $v::curr
+    }
+
+    if {$visibility eq "public"} {
+	Emitln "#define ns_$cns$cname \"$ns$name\""
+    }
+    return [list $ns $cns $name $cname]
+}
+
+proc ::critcl::EndCommand {} {
+    set file [This]
+
+    set v::code($v::curr) $v::block
+
+    dict set v::code($file) config block $v::curr $v::block
+
+    unset v::curr
+    unset v::block
+    return
+}
+
+proc ::critcl::Emit {s} {
+    append v::block $s
+    return
+}
+
+proc ::critcl::Emitln {{s ""}} {
+    Emit $s\n
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## At internal processing
+
+proc ::critcl::at::Where {leadoffset level file} {
+    variable where
+
+    set line 1
+
+    # If the interpreter running critcl has TIP 280 support use it to
+    # place more exact line number information into the generated C
+    # file.
+
+    #puts "XXX-WHERE-($leadoffset $level $file)"
+    #set ::errorInfo {}
+    if {[catch {
+	#::critcl::msg [SHOWFRAMES $level 0]
+	array set loc [info frame $level]
+	#puts XXX-TYPE-$loc(type)
+    }]} {
+	#puts XXX-NO-DATA-$::errorInfo
+	set where {}
+	return
+    }
+
+    if {$loc(type) eq "source"} {
+	#parray loc
+	set  file  $loc(file)
+	set  fline $loc(line)
+
+	# Adjust for removed leading whitespace.
+	::incr fline $leadoffset
+
+	# Keep the limitations of native compilers in mind and stay
+	# inside their bounds.
+
+	if {$fline > $line} {
+	    set line $fline
+	}
+
+	set where [list [file tail $file] $line]
+	return
+    }
+
+    if {($loc(type) eq "eval") &&
+       [info exists loc(proc)] &&
+       ($loc(proc) eq "::critcl::source")
+    } {
+	# A relative location in critcl::source is absolute in the
+	# sourced file.  I.e. we can provide proper line information.
+
+	set  fline $loc(line)
+	# Adjust for removed leading whitespace.
+	::incr fline $leadoffset
+
+	# Keep the limitations of native compilers in mind and stay
+	# inside their bounds.
+
+	if {$fline > $line} {
+	    set line $fline
+	}
+
+	variable ::critcl::v::source
+	set where [list [file tail $source] $line]
+	return
+    }
+
+    #puts XXX-NO-DATA-$loc(type)
+    set where {}
+    return
+}
+
+proc ::critcl::at::Loc {leadoffset level file} {
+    # internal variant of 'caller!'
+    ::incr level -1
+    Where $leadoffset $level $file
+    return [raw]
+}
+
+proc ::critcl::at::CPragma {leadoffset level file} {
+    # internal variant of 'caller!'
+    ::incr level -1
+    Where $leadoffset $level $file
+    return [get]
+}
+
+proc ::critcl::at::Format {loc} {
+   if {![llength $loc]} {
+	return ""
+    }
+    lassign $loc file line
+    #::critcl::msg "#line $line \"$file\"\n"
+    return        "#line $line \"$file\"\n"
+}
+
+proc ::critcl::at::SHOWFRAMES {level {all 1}} {
+    set lines {}
+    set n [info frame]
+    set i 0
+    set id 1
+    while {$n} {
+	lappend lines "[expr {$level == $id ? "**" : "  "}] frame [format %3d $id]: [info frame $i]"
+	::incr i -1
+	::incr id -1
+	::incr n -1
+	if {($level > $id) && !$all} break
+    }
+    return [join $lines \n]
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::critcl::CollectEmbeddedSources {file destination libfile ininame placestubs} {
+    set fd [open $destination w]
+
+    if {[dict exists $v::code($file) result apiprefix]} {
+	set api [dict get $v::code($file) result apiprefix]
+    } else {
+	set api ""
+    }
+
+    # Boilerplate header.
+    puts $fd [subst [Cat [Template header.c]]]
+    #         ^=> file, libfile, api
+
+    # Make Tk available, if requested
+    if {[UsingTk $file]} {
+	puts $fd "\n#include \"tk.h\""
+    }
+
+    # Write the collected C fragments, in order of collection.
+    foreach digest [GetParam $file fragments] {
+	puts $fd "[Separator]\n"
+	puts $fd [dict get $v::code($file) config block $digest]
+    }
+
+    # Boilerplate trailer.
+
+    # Stubs setup, Tcl, and, if requested, Tk as well.
+    puts $fd [Separator]
+    set mintcl [MinTclVersion $file]
+
+    if {$placestubs} {
+	# Put full stubs definitions into the code, which can be
+	# either the bracket generated for a -pkg, or the package
+	# itself, build in mode "compile & run".
+	msg "  Stubs:"
+	set stubs     [TclDecls     $file]
+	set platstubs [TclPlatDecls $file]
+	puts -nonewline $fd [Deline [subst [Cat [Template stubs.c]]]]
+	#                            ^=> mintcl, stubs, platstubs
+    } else {
+	# Declarations only, for linking, in the sub-packages.
+	puts -nonewline $fd [Deline [subst [Cat [Template stubs_e.c]]]]
+	#                            ^=> mintcl
+    }
+
+    if {[UsingTk $file]} {
+	SetupTkStubs $fd $mintcl
+    }
+
+    # Initialization boilerplate. This ends in the middle of the
+    # FOO_Init() function, leaving it incomplete.
+
+    set ext [GetParam $file edecls]
+    puts $fd [subst [Cat [Template pkginit.c]]]
+    #         ^=> ext, ininame
+
+    # From here on we are completing FOO_Init().
+    # Tk setup first, if requested. (Tcl is already done).
+    if {[UsingTk $file]} {
+	puts $fd [Cat [Template pkginittk.c]]
+    }
+
+    # User specified initialization code.
+    puts $fd "[GetParam $file initc] "
+
+    # Setup of the variables serving up defined constants.
+    if {[dict exists $v::code($file) config const]} {
+	BuildDefines $fd $file
+    }
+
+    # Take the names collected earlier and register them as Tcl
+    # commands.
+    set names [lsort [GetParam $file functions]]
+    set max   [LengthLongestWord $names]
+    foreach name $names {
+	if {[info exists v::clientdata($name)]} {
+	    set cd $v::clientdata($name)
+	} else {
+	    set cd NULL
+	}
+	if {[info exists v::delproc($name)]} {
+	    set dp $v::delproc($name)
+	} else {
+	    set dp 0
+	}
+	puts $fd "  Tcl_CreateObjCommand2(interp, [PadRight [expr {$max+4}] ns_$name,] [PadRight [expr {$max+5}] tcl_$name,] $cd, $dp);"
+    }
+
+    # Complete the trailer and be done.
+    puts  $fd [Cat [Template pkginitend.c]]
+    close $fd
+    return
+}
+
+proc ::critcl::MinTclVersion {file} {
+    # For the default differentiate 8.x and 9.x series. When running under 9+ an
+    # 8.x default is not sensible.
+    set mintcldefault 8.6
+    if {[package vsatisfies [package provide Tcl] 9]} { set mintcldefault 9 }
+
+    set required [GetParam $file mintcl $mintcldefault]
+    foreach version $v::hdrsavailable {
+	if {[package vsatisfies $version $required]} {
+	    return $version
+	}
+    }
+    return $required
+}
+
+proc ::critcl::UsingTk {file} {
+    return [GetParam $file tk 0]
+}
+
+proc ::critcl::TclIncludes {file} {
+    # Provide access to the Tcl/Tk headers using a -I flag pointing
+    # into the critcl package directory hierarchy. No copying of files
+    # required. This also handles the case of the X11 headers on
+    # windows, for free.
+
+    set hdrs tcl[MinTclVersion $file]
+    set path [file join $v::hdrdir $hdrs]
+
+    if {[file system $path] ne "native"} {
+	# The critcl package is wrapped. Copy the relevant headers out
+	# to disk and change the include path appropriately.
+
+	Copy $path [cache]
+	set path [file join [cache] $hdrs]
+    }
+
+    return [list $c::include$path $c::include$v::hdrdir]
+}
+
+proc ::critcl::TclHeader {file {header {}}} {
+    # Provide access to the Tcl/Tk headers in the critcl package
+    # directory hierarchy. No copying of files required.
+    set hdrs tcl[MinTclVersion $file]
+    return [file join $v::hdrdir $hdrs $header]
+}
+
+proc ::critcl::SystemIncludes {file} {
+    set includes {}
+    foreach dir [SystemIncludePaths $file] {
+	lappend includes $c::include$dir
+    }
+    return $includes
+}
+
+proc ::critcl::SystemIncludePaths {file} {
+    set paths {}
+    set has {}
+
+    # critcl -I options.
+    foreach dir $v::options(I) {
+	if {[dict exists $has $dir]} continue
+	dict set has $dir yes
+	lappend paths $dir
+    }
+
+    # Result cache.
+    lappend paths [cache]
+
+    # critcl::cheaders
+    foreach flag [GetParam $file cheaders] {
+	if {![string match "-*" $flag]} {
+	    # flag = normalized absolute path to a header file.
+	    # Transform into a -I directory reference.
+	    set dir [file dirname $flag]
+	} else {
+	    # Chop leading -I
+	    set dir [string range $flag 2 end]
+	}
+
+	if {[dict exists $has $dir]} continue
+	dict set has $dir yes
+	lappend paths $dir
+    }
+
+    return $paths
+}
+
+proc ::critcl::SystemLibraries {} {
+    set libincludes {}
+    foreach dir [SystemLibraryPaths] {
+	lappend libincludes $c::libinclude$dir
+    }
+    return $libincludes
+}
+
+proc ::critcl::SystemLibraryPaths {} {
+    set paths {}
+    set has {}
+
+    # critcl -L options.
+    foreach dir $v::options(L) {
+	if {[dict exists $has $dir]} continue
+	dict set has $dir yes
+	lappend paths $dir
+    }
+
+    return $paths
+}
+
+proc ::critcl::Compile {tclfile origin cfile obj} {
+    StatusAbort?
+
+    # tclfile = The .tcl file under whose auspices the C is compiled.
+    # origin  = The origin of the C sources, either tclfile, or cfile.
+    # cfile   = The file holding the C sources to compile.
+    #
+    # 'origin == cfile' for the companion C files of a critcl file,
+    # i.e. the csources. For a .tcl critcl file, the 'origin ==
+    # tclfile', and the cfile is the .c derived from tclfile.
+    #
+    # obj = Object file to compile to, to generate.
+
+    set         cmdline [getconfigvalue compile]
+    lappendlist cmdline [GetParam $tclfile cflags]
+    lappendlist cmdline [getconfigvalue threadflags]
+    if {$v::options(combine) ne "standalone"} {
+	lappendlist cmdline [getconfigvalue tclstubs]
+    }
+    if {$v::options(language) ne "" && [file tail $tclfile] ne "critcl.tcl"} {
+	# XXX Is this gcc specific ?
+	# XXX Should this not be configurable via some c::* setting ?
+	# See also -x none below.
+	lappend cmdline -x $v::options(language)
+    }
+    lappendlist cmdline [TclIncludes $tclfile]
+    lappendlist cmdline [SystemIncludes $tclfile]
+
+    if {[dict exists $v::code($tclfile) result apidefines]} {
+	lappendlist cmdline [dict get $v::code($tclfile) result apidefines]
+    }
+
+    lappendlist cmdline [CompileResult $obj]
+    lappend     cmdline $cfile
+
+    if {$v::options(language) ne ""} {
+	# Allow the compiler to determine the type of file otherwise
+	# it will try to compile the libs
+	# XXX Is this gcc specific ?
+	# XXX Should this not be configurable via some c::* setting ?
+	lappend cmdline -x none
+    }
+
+    # Add the Tk stubs to the command line, if requested and not suppressed
+    if {[UsingTk $tclfile] && ($v::options(combine) ne "standalone")} {
+	lappendlist cmdline [getconfigvalue tkstubs]
+    }
+
+    if {!$option::debug_symbols} {
+	lappendlist cmdline [getconfigvalue optimize]
+	lappendlist cmdline [getconfigvalue noassert]
+    }
+
+    if {[ExecWithLogging $cmdline \
+	     {$obj: [file size $obj] bytes} \
+	     {ERROR while compiling code in $origin:}]} {
+	if {!$v::options(keepsrc) && $cfile ne $origin} {
+	    file delete $cfile
+	}
+    }
+
+    return $obj
+}
+
+proc ::critcl::MakePreloadLibrary {file} {
+    StatusAbort?
+
+    # compile and link the preload support, if necessary, i.e. not yet
+    # done.
+
+    set shlib [file join [cache] preload[getconfigvalue sharedlibext]]
+    if {[file exists $shlib]} return
+
+    # Operate like TclIncludes. Use the template file directly, if
+    # possible, or, if we reside in a virtual filesystem, copy it to
+    # disk.
+
+    set src [Template preload.c]
+    if {[file system $src] ne "native"} {
+	file mkdir [cache]
+	file copy -force $src [cache]
+	set src [file join [cache] preload.c]
+    }
+
+    # Build the object for the helper package, 'preload' ...
+
+    set obj [file join [cache] preload.o]
+    Compile $file $src $src $obj
+
+    # ... and link it.
+    # Custom linker command. XXX Can we bent Link to the task?
+    set         cmdline [getconfigvalue link]
+    lappend     cmdline $obj
+    lappendlist cmdline [getconfigvalue strip]
+    lappendlist cmdline [LinkResult $shlib]
+
+    ExecWithLogging $cmdline \
+	{$shlib: [file size $shlib] bytes} \
+	{ERROR while linking $shlib:}
+
+    # Now the critcl application can pick up this helper shlib and
+    # stuff it into the package it is making.
+    return
+}
+
+proc ::critcl::Link {file} {
+    StatusAbort?
+
+    set shlib   [dict get $v::code($file) result shlib]
+    set preload [dict get $v::code($file) result preload]
+
+    # Assemble the link command.
+    set cmdline [getconfigvalue link]
+
+    if {[llength $preload]} {
+	lappendlist cmdline [getconfigvalue link_preload]
+    }
+
+    if {$option::debug_symbols} {
+	lappendlist cmdline [getconfigvalue link_debug]
+    } else {
+	lappendlist cmdline [getconfigvalue strip]
+	lappendlist cmdline [getconfigvalue link_release]
+    }
+
+    lappendlist cmdline [LinkResult $shlib]
+    lappendlist cmdline [GetObjects $file]
+    lappendlist cmdline [SystemLibraries]
+    lappendlist cmdline [GetLibraries $file]
+    lappendlist cmdline [dict get $v::code($file) result ldflags]
+    # lappend cmdline bufferoverflowU.lib ;# msvc >=1400 && <1500 for amd64
+
+    # Extend library search paths with user-specified locations.
+    # (-L, clibraries)
+    set libpaths [dict get $v::code($file) result libpaths]
+    if {[llength $libpaths]} {
+	set opt [getconfigvalue link_rpath]
+	if {$opt ne {}} {
+	    foreach path $libpaths {
+		# todo (debug flag) msg "\trpath += $path"
+		lappend cmdline [string map [list @ $path] $opt]
+	    }
+	}
+    }
+
+    # Run the linker
+    ExecWithLogging $cmdline \
+	{$shlib: [file size $shlib] bytes} \
+	{ERROR while linking $shlib:}
+
+    # Now, if there is a manifest file around, and the
+    # 'embed_manifest' command defined we use its command to merge the
+    # manifest into the shared library. This is pretty much only
+    # happening on Windows platforms, and with newer dev environments
+    # actually using manifests.
+
+    set em [getconfigvalue embed_manifest]
+
+    critcl::Log "Manifest Command: $em"
+    critcl::Log "Manifest File:    [expr {[file exists $shlib.manifest]
+	   ? "$shlib.manifest"
+	   : "<<not present>>, ignored"}]"
+
+    if {[llength $em] && [file exists $shlib.manifest]} {
+	set cmdline [ManifestCommand $em $shlib]
+
+	# Run the manifest tool
+	ExecWithLogging $cmdline \
+	    {$shlib: [file size $shlib] bytes, with manifest} \
+	    {ERROR while embedding the manifest into $shlib:}
+    }
+
+    # At last, build the preload support library, if necessary.
+    if {[llength $preload]} {
+	MakePreloadLibrary $file
+    }
+    return
+}
+
+proc ::critcl::ManifestCommand {em shlib} {
+    # Variable used by the subst'able config setting.
+    set outfile $shlib
+    return [subst $em]
+}
+
+proc ::critcl::CompanionObject {src} {
+    set tail    [file tail $src]
+    set srcbase [file rootname $tail]
+
+    if {[cache] ne [file dirname $src]} {
+	set srcbase [file tail [file dirname $src]]_$srcbase
+    }
+
+    return [file join [cache] ${srcbase}[getconfigvalue object]]
+}
+
+proc ::critcl::CompileResult {object} {
+    # Variable used by the subst'able config setting.
+    set outfile $object
+    return [subst $c::output]
+}
+
+proc ::critcl::LinkResult {shlib} {
+    # Variable used by the subst'able config setting.
+    set outfile $shlib
+
+    set ldout [subst $c::ldoutput]
+    if {$ldout eq ""} {
+	set ldout [subst $c::output]
+    }
+
+    return $ldout
+}
+
+proc ::critcl::GetObjects {file} {
+    # On windows using the native MSVC compiler put the companion
+    # object files into a link file to read, instead of separately on
+    # the command line.
+
+    set objects [dict get $v::code($file) result objects]
+
+    if {![string match "win32-*-cl" $v::buildplatform]} {
+	return $objects
+    }
+
+    set rsp [WriteCache link.fil \"[join $objects \"\n\"]\"]
+    return [list @$rsp]
+}
+
+proc ::critcl::GetLibraries {file} {
+    # On windows using the native MSVC compiler, transform all -lFOO
+    # references into FOO.lib.
+
+    return [FixLibraries [dict get $v::code($file) result clibraries]]
+}
+
+proc ::critcl::FixLibraries {libraries} {
+    if {[string match "win32-*-cl" $v::buildplatform]} {
+	# On windows using the native MSVC compiler, transform all
+	# -lFOO references into FOO.lib.
+
+	regsub -all -- {-l(\S+)} $libraries {\1.lib} libraries
+    } else {
+	# On unix we look for '-l:' references and rewrite them to the
+	# full path of the library, doing the search on our own.
+	#
+	# GNU ld understands this since at least 2.22 (don't know if
+	# earlier, 2.15 definitely doesn't), and it helps in
+	# specifying static libraries (Regular -l prefers .so over .a,
+	# and -l: overrides that).
+
+	# Search paths specified via -L, -libdir.
+	set lpath [SystemLibraryPaths]
+
+	set tmp {}
+	foreach word $libraries {
+	    # Extend search path with -L options from clibraries.
+	    if {[string match -L* $word]} {
+		lappend lpath [string range $word 2 end]
+		lappend tmp $word
+		continue
+	    }
+	    if {![string match -l:* $word]} {
+		lappend tmp $word
+		continue
+	    }
+	    # Search named library.
+	    lappend tmp [ResolveColonSpec $lpath [string range $word 3 end]]
+	}
+	set libraries $tmp
+    }
+
+    return $libraries
+}
+
+proc ::critcl::ResolveColonSpec {lpath name} {
+    foreach path $lpath {
+	set f [file join $lpath $name]
+	if {![file exists $f]} continue
+	return $f
+    }
+    return -l:$name
+}
+
+proc ::critcl::SetupTkStubs {fd mintcl} {
+    if {[package vcompare $mintcl 8.6] < 0} {
+	# Before 8.6+. tkStubsPtr and tkIntXlibStubsPtr are not const yet.
+	set contents [Cat [Template tkstubs_noconst.c]]
+    } else {
+	set contents [Cat [Template tkstubs.c]]
+    }
+
+    puts -nonewline $fd $contents
+    return
+}
+
+proc ::critcl::BuildDefines {fd file} {
+    # we process the cdefines in three steps
+    #   - get the list of defines by preprocessing the source using the
+    #     cpp -dM directive which causes any #defines to be output
+    #   - extract the list of enums using regular expressions (not perfect,
+    #     but will do for now)
+    #   - generate Tcl_ObjSetVar2 commands to initialise Tcl variables
+
+    # Pull the collected ccode blocks together into a transient file
+    # we then search in.
+
+    set def [WriteCache define_[pid].c {}]
+    foreach digest [dict get $v::code($file) config defs] {
+	Append $def [dict get $v::code($file) config block $digest]
+    }
+
+    # For the command lines to be constructed we need all the include
+    # information the regular files will get during their compilation.
+
+    set hdrs [SystemIncludes $file]
+
+    # The result of the next two steps, a list of triples (namespace +
+    # label + value) of the defines to export.
+
+    set defines {}
+
+    # First step - get list of matching defines
+    set         cmd [getconfigvalue preproc_define]
+    lappendlist cmd $hdrs
+    lappend     cmd $def
+
+    set pipe [open "| $cmd" r]
+    while {[gets $pipe line] >= 0} {
+	# Check if the line contains a define.
+	set fields [split [string trim $line]]
+	if {[lindex $fields 0] ne "#define"} continue
+
+	# Yes. Get name and value. The latter is the joining of all
+	# fields after the name, except for any enclosing parentheses,
+	# which we strip off.
+
+	set var [lindex $fields 1]
+	set val [string trim [join [lrange $fields 2 end]] {()}]
+
+	# We ignore however any and all defines the user is not
+	# interested in making public. This is, in essence, a set
+	# intersection on the names of the defines.
+
+	if {![TakeDefine $file $var namespace]} continue
+
+	# And for those which are kept we integrate the information
+	# from both sources, i.e. namespace, and definition, under a
+	# single name.
+
+	lappend defines $namespace $var $val
+    }
+    close $pipe
+
+    # Second step - get list of enums
+
+    set         cmd [getconfigvalue preproc_enum]
+    lappendlist cmd $hdrs
+    lappend     cmd $def
+
+    set pipe [open "| $cmd" r]
+    set code [read $pipe]
+    close $pipe
+
+    set matches [regexp -all -inline {enum [^\{\(\)]*{([^\}]*)}} $code]
+    foreach {match submatch} $matches {
+	foreach line [split $submatch \n] {
+	    foreach sub [split $line ,] {
+		set enum [lindex [split [string trim $sub]] 0]
+
+		# We ignore however any and all enum values the user
+		# is not interested in making public. This is, in
+		# essence, a set intersection on the names of the
+		# enum values.
+
+		if {![TakeDefine $file $enum namespace]} continue
+
+		# And for those which are kept we integrate the
+		# information from both sources, i.e. namespace, and
+		# definition, under a single name.
+
+		lappend defines $namespace $enum $enum
+	    }
+	}
+    }
+
+    # Third step - generate Tcl_ObjSetVar2 commands exporting the
+    # defines and their values as Tcl variables.
+
+    foreach {namespace constname constvalue} $defines {
+	if {![info exists created($namespace)]} {
+	    # we need to force the creation of the namespace
+	    # because this code will be run before the user code
+	    puts $fd "  Tcl_Eval(ip, \"namespace eval $namespace {}\");"
+	    set created($namespace) 1
+	}
+	set var "Tcl_NewStringObj(\"${namespace}::$constname\", -1)"
+	if {$constname eq $constvalue} {
+	    # enum - assume integer
+	    set constvalue "Tcl_NewIntObj($constvalue)"
+	} else {
+	    # text or int - force to string
+	    set constvalue "Tcl_NewStringObj(\"$constvalue\", -1)"
+	}
+	puts $fd "  Tcl_ObjSetVar2(ip, $var, NULL, $constvalue, TCL_GLOBAL_ONLY);"
+    }
+
+    # Cleanup after ourselves, removing the helper file.
+
+    if {!$v::options(keepsrc)} { file delete $def }
+    return
+}
+
+proc ::critcl::TakeDefine {file identifier nsvar} {
+    upvar 1 $nsvar dst
+    if 0 {if {[dict exists $v::code($file) config const $identifier]} {
+	set dst [dict get $v::code($file) config const $identifier]
+	return 1
+    }}
+    foreach {pattern def} [dict get $v::code($file) config const] {
+	if {[string match $pattern $identifier]} {
+	    set dst $def
+	    return 1
+	}
+    }
+    return 0
+}
+
+proc ::critcl::Load {f} {
+    set shlib [dict get $v::code($f) result shlib]
+    set init  [dict get $v::code($f) result initname]
+    set tsrc  [dict get $v::code($f) result tsources]
+    set minv  [dict get $v::code($f) result mintcl]
+
+    # Using the renamed builtin. While this is a dependency it was
+    # recorded already. See 'critcl::tcl', and 'critcl::tk'.
+    #package require Tcl $minv
+    ::load $shlib $init
+
+    # See the critcl application for equivalent code placing the
+    # companion tcl sources into the generated package. Here, for
+    # 'compile & run' we now source the companion files directly.
+    foreach t $tsrc {
+	Ignore $t
+	::source $t
+    }
+    return
+}
+
+proc ::critcl::ResolveRelative {prefixes flags} {
+    set new {}
+    set take no
+    foreach flag $flags {
+	if {$take} {
+	    set take no
+	    set flag [file normalize [file join [file dirname [This]] $flag]]
+	    lappend new $flag
+	    continue
+	}
+	foreach prefix $prefixes {
+	    if {$flag eq $prefix} {
+		set take yes
+		lappend new $flag
+		break
+	    }
+	    set n [string length $prefix]
+	    if {[string match ${prefix}* $flag]} {
+		set path [string range $flag $n end]
+		set flag ${prefix}[file normalize [file join [file dirname [This]] $path]]
+		break
+	    }
+	    if {[string match ${prefix}=* $flag]} {
+		incr n
+		set path [string range $flag $n end]
+		set flag ${prefix}[file normalize [file join [file dirname [This]] $path]]
+		break
+	    }
+	}
+	lappend new $flag
+    }
+    return $new
+}
+
+proc ::critcl::LibPaths {clibraries} {
+    set lpath {}
+    set take no
+
+    set sa [string length -L]
+    set sb [string length --library-directory=]
+
+    foreach word $clibraries {
+	# Get paths from -L..., --library-directory ...,
+	# --library-directory=...  and full library paths.  Ignore
+	# anything else.
+
+	if {$take} {
+	    # path argument separate from preceding option.
+	    set take no
+	    lappend lpath $word
+	    continue
+	}
+	if {[string match -L* $word]} {
+	    # path at tail of argument
+	    lappend lpath [string range $word $sa end]
+	    continue
+	}
+	if {[string match -l* $word]} {
+	    # ignore
+	    continue
+	}
+	if {[string match --library-directory=* $word]} {
+	    # path at tail of argument
+	    lappend lpath [string range $word $sb end]
+	    continue
+	}
+	if {[string equal --library-directory $word]} {
+	    # Next argument is the desired path
+	    set take yes
+	    continue
+	}
+	if {[file isfile $word]} {
+	    # directory of the file
+	    lappend lpath [file dirname $word]
+	}
+	# else ignore
+    }
+    return $lpath
+}
+
+proc ::critcl::HandleDeclAfterBuild {} {
+    # Hook default, mode "compile & run". Clear existing build results
+    # for the file, make way for new declarations.
+
+    set fx [This]
+    if {[info exists v::code($fx)] &&
+	[dict exists $v::code($fx) result]} {
+	dict unset v::code($fx) result
+    }
+    return
+}
+
+# XXX Refactor to avoid duplication of the memoization code.
+proc ::critcl::DetermineShlibName {file} {
+    # Return cached information, if present.
+    if {[info exists  v::code($file)] &&
+	[dict exists $v::code($file) result shlib]} {
+	return [dict get $v::code($file) result shlib]
+    }
+
+    # The name of the shared library we hope to produce (or use)
+    set shlib [BaseOf $file][getconfigvalue sharedlibext]
+
+    dict set v::code($file) result shlib $shlib
+    return $shlib
+}
+
+proc ::critcl::DetermineObjectName {file} {
+    # Return cached information, if present.
+    if {[info exists  v::code($file)] &&
+	[dict exists $v::code($file) result object]} {
+	return [dict get $v::code($file) result object]
+    }
+
+    set object [BaseOf $file]
+
+    # The generated object file will be saved for permanent use if the
+    # outdir option is set (in which case rebuilds will no longer be
+    # automatic).
+    if {$v::options(outdir) ne ""} {
+	set odir [file join [file dirname $file] $v::options(outdir)]
+	set oroot  [file rootname [file tail $file]]
+	set object [file normalize [file join $odir $oroot]]
+	file mkdir $odir
+    }
+
+    # Modify the output file name if debugging symbols are requested.
+    if {$option::debug_symbols} {
+        append object _g
+    }
+
+    # Choose a distinct suffix so switching between them causes a
+    # rebuild.
+    switch -- $v::options(combine) {
+	""         -
+	dynamic    { append object _pic[getconfigvalue object] }
+	static     { append object _stub[getconfigvalue object] }
+	standalone { append object [getconfigvalue object] }
+    }
+
+    dict set v::code($file) result object $object
+    return $object
+}
+
+proc ::critcl::DetermineInitName {file prefix} {
+    set ininame [PkgInit $file]
+
+    # Add in the build prefix, if specified. This is done in mode
+    # 'generate package', for the pieces, ensuring that the overall
+    # initialization function cannot be in conflict with the
+    # initialization functions of these same pieces.
+
+    if {$prefix ne ""} {
+        set ininame "${prefix}_$ininame"
+    }
+
+    dict set v::code($file) result initname $ininame
+
+    catch {
+	dict set v::code($file) result pkgname \
+	    [dict get $v::code($file) config package name]
+    }
+
+    return $ininame
+}
+
+proc ::critcl::PkgInit {file} {
+    # The init function name takes a capitalized prefix from the name
+    # of the input file name (alphanumeric prefix, including
+    # underscores). This implicitly drops the file extension, as the
+    # '.' is not an allowed character.
+
+    # While related to the package name, it can be different,
+    # especially if the package name contains :: separators.
+
+    if {$file eq {}} {
+	return Stdin
+    } else {
+	set ininame [file rootname [file tail $file]]
+	regsub -all {[^[:alnum:]_]} $ininame {} ininame
+	return [string totitle $ininame]
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- Internals - Access to the log file
+
+proc ::critcl::LogFile {} {
+    file mkdir [cache]
+    return [file join [cache] [pid].log]
+}
+
+proc ::critcl::LogFileExec {} {
+    file mkdir [cache]
+    return [file join [cache] [pid]_exec.log]
+}
+
+proc ::critcl::LogOpen {file} {
+    set   v::logfile [LogFile]
+    set   v::log     [open $v::logfile w]
+    puts $v::log "\n[clock format [clock seconds]] - $file"
+    # Create secondary file as well, leave empty, may not be used.
+    close [open ${v::logfile}_ w]
+    return
+}
+
+proc ::critcl::LogCmdline {cmdline} {
+    set w [join [lassign $cmdline cmd] \n\t]
+    Log \n$cmd\n\t$w\n
+    return
+}
+
+proc ::critcl::Log {msg} {
+    puts $v::log $msg
+    return
+}
+
+proc ::critcl::Log* {msg} {
+    puts -nonewline $v::log $msg
+    return
+}
+
+proc ::critcl::LogClose {} {
+    # Transfer the log messages for the current file over into the
+    # global critcl log, and cleanup.
+
+    close $v::log
+    set msgs [Cat $v::logfile]
+    set emsg [Cat ${v::logfile}_]
+
+    AppendCache $v::prefix.log $msgs
+
+    file delete -force $v::logfile ${v::logfile}_
+    unset v::log v::logfile
+
+    return [list $msgs $emsg]
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- Internals - UUID management, change detection
+
+proc ::critcl::UUID.extend {file key value} {
+    set digest [md5_hex /$value]
+    InitializeFile $file
+    dict update v::code($file) config c {
+	dict lappend c uuid $key $digest
+    }
+    return $digest
+}
+
+proc ::critcl::UUID.serial {file} {
+    InitializeFile $file
+    if {[catch {
+	set len [llength [dict get $v::code($file) config uuid]]
+    }]} {
+	set len 0
+    }
+    return $len
+}
+
+proc ::critcl::UUID {f} {
+    return [md5_hex "$f [GetParam $f uuid]"]
+}
+
+proc ::critcl::BaseOf {f} {
+    # Return cached information, if present.
+    if {[info exists  v::code($f)] &&
+	[dict exists $v::code($f) result base]} {
+	return [dict get $v::code($f) result base]
+    }
+
+    set base [file normalize \
+		  [file join [cache] ${v::prefix}_[UUID $f]]]
+
+    dict set v::code($f) result base $base
+    return $base
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- Internals - Miscellanea
+
+proc ::critcl::Deline {text} {
+    if {![config lines]} {
+	set text [join [GrepV "\#line*" [split $text \n]] \n]
+    }
+    return $text
+}
+
+proc ::critcl::Separator {} {
+    return "/* [string repeat - 70] */"
+}
+
+proc ::critcl::Template {file} {
+    variable v::hdrdir
+    return [file join $hdrdir $file]
+}
+
+proc ::critcl::Copy {src dst} {
+    foreach p [glob -nocomplain $src] {
+	if {[file isdirectory $p]} {
+	    set stem [file tail $p]
+	    file mkdir $dst/$stem
+	    Copy $p/* $dst/$stem
+	} else {
+	    file copy -force $p $dst
+	}
+    }
+}
+
+proc ::critcl::Cat {path} {
+    # Easier to write our own copy than requiring fileutil and then
+    # using fileutil::cat.
+
+    set fd [open $path r]
+    set data [read $fd]
+    close $fd
+    return $data
+}
+
+proc ::critcl::WriteCache {name content} {
+    set dst [file join [cache] $name]
+    file mkdir [file dirname $dst] ;# just in case
+    return [Write [file normalize $dst] $content]
+}
+
+proc ::critcl::Write {path content} {
+    set    chan [open $path w]
+    puts  $chan $content
+    close $chan
+    return $path
+}
+
+proc ::critcl::AppendCache {name content} {
+    file mkdir [cache] ;# just in case
+    return [Append [file normalize [file join [cache] $name]] $content]
+}
+
+proc ::critcl::Append {path content} {
+    set    chan [open $path a]
+    puts  $chan $content
+    close $chan
+    return $path
+}
+
+# # ## ### ##### ######## ############# #####################
+## Implementation -- Internals - Status Operations, and execution
+## of external commands.
+
+proc ::critcl::StatusReset {} {
+    set v::failed 0
+    return
+}
+
+proc ::critcl::StatusAbort? {} {
+    if {$v::failed} { return -code return }
+    return
+}
+
+proc ::critcl::StatusSave {file} {
+    # XXX FUTURE Use '$(file) result failed' later
+    set result $v::failed
+    set v::code($file,failed) $v::failed
+    set v::failed 0
+    return $result
+}
+
+proc ::critcl::CheckForWarnings {text} {
+    set warnings [dict create]
+    foreach line [split $text \n] {
+	# Ignore everything not a warning.
+        if {![string match -nocase *warning* $line]} continue
+	# Ignore duplicates (which is why we store the lines as dict
+	# keys for now).
+	if {[dict exists $warnings $line]} continue
+	dict set warnings $line .
+    }
+    return [dict keys $warnings]
+}
+
+proc ::critcl::Exec {cmdline} {
+    variable run
+
+    set v::failed [catch {
+	interp eval $run [linsert $cmdline 0 exec]
+    } v::err]
+
+    return [expr {!$v::failed}]
+}
+
+proc ::critcl::ExecWithLogging {cmdline okmsg errmsg} {
+    variable run
+
+    # todo (debug flag) msg "EXEC: $cmdline"
+    LogCmdline $cmdline
+
+    # Extend the command, redirect all of its output (stdout and
+    # stderr) into a temp log.
+    set elogfile [LogFileExec]
+    set elog     [open $elogfile w]
+
+    lappend cmdline >&@ $elog
+    interp transfer {}  $elog $run
+
+    set ok [Exec $cmdline]
+
+    interp transfer $run $elog {}
+    close $elog
+
+    # Put the command output into the main log ...
+    set  msgs [Cat $elogfile]
+    Log $msgs
+
+    # ... as well as into a separate execution log.
+    Append ${v::logfile}_ $msgs
+
+    file delete -force $elogfile
+
+    if {$ok} {
+	Log [uplevel 1 [list subst $okmsg]]
+    } else {
+	Log [uplevel 1 [list subst $errmsg]]
+	Log $v::err
+    }
+
+    return $ok
+}
+
+proc ::critcl::BuildPlatform {} {
+    set platform [::platform::generic]
+
+    # Behave like an autoconf generated configure
+    # - $CC (user's choice first)
+    # - gcc, if available.
+    # - cc/cl otherwise (without further check for availability)
+
+    if {[info exists ::env(CC)]} {
+	# The compiler may be a gcc, despite being named .../cc.
+
+	set cc $::env(CC)
+	if {[IsGCC $cc]} {
+	    set cc gcc
+	}
+    } elseif {[llength [auto_execok gcc]]} {
+	set cc gcc
+    } else {
+	if {[string match "win32-*" $platform]} {
+	    set cc cl
+	} else {
+	    set cc cc
+	}
+    }
+
+    # The cc may be specified with a full path, through the CC
+    # environment variable, which cannot be used as is in the platform
+    # code. Use only the last element of the path, without extensions
+    # (.exe). And it may be followed by options too, so look for and
+    # strip these off as well. This last part assumes that the path of
+    # the compiler itself doesn't contain spaces.
+
+    regsub {( .*)$} [file tail $cc] {} cc
+    append platform -[file rootname $cc]
+
+    # Memoize
+    proc ::critcl::BuildPlatform {} [list return $platform]
+    return $platform
+}
+
+proc ::critcl::IsGCC {path} {
+    if {[catch {
+	set lines [exec $path -v |& grep gcc]
+    }] || ($lines eq {})} { return 0 }
+    return 1
+}
+
+proc ::critcl::This {} {
+    variable v::this
+    # For management of v::this see critcl::{source,collect*}
+    # If present, an output redirection is active.
+    if {[info exists this] && [llength $this]} {
+	return [lindex $this end]
+    }
+    return [file normalize [info script]]
+}
+
+proc ::critcl::Here {} {
+    return [file dirname [This]]
+}
+
+proc ::critcl::TclDecls {file} {
+    return [TclDef $file tclDecls.h     tclStubsPtr    {tclStubsPtr    }]
+}
+
+proc ::critcl::TclPlatDecls {file} {
+    return [TclDef $file tclPlatDecls.h tclPlatStubsPtr tclPlatStubsPtr]
+}
+
+proc ::critcl::TclDef {file hdr var varlabel} {
+    #puts F|$file
+    set hdr [TclHeader $file $hdr]
+
+    if {![file exists   $hdr]} { error "Header file not found: $hdr" }
+    if {![file isfile   $hdr]} { error "Header not a file: $hdr" }
+    if {![file readable $hdr]} { error "Header not readable: $hdr (no permission)" }
+
+    #puts H|$hdr
+    if {[catch {
+	set hdrcontent [split [Cat $hdr] \n]
+    } msg]} {
+	error "Header not readable: $hdr ($msg)"
+    }
+
+    # Note, Danger: The code below is able to use declarations which
+    # are commented out in various ways (#if 0, /* ... */, and //
+    # ...), because it is performing a simple line-oriented search
+    # without context, and not matching against comment syntax either.
+
+    set ext [Grep *extern* $hdrcontent]
+    if {![llength $ext]} {
+	error "No extern declarations found in $hdr"
+    }
+
+    set vardecl [Grep *${var}* $ext]
+    if {![llength $vardecl]} {
+	error "No declarations for $var found in $hdr"
+    }
+
+    set def [string map {extern {}} [lindex $vardecl 0]]
+    msg "    [join [lrange [file split $hdr] end-3 end] /]:"
+    msg "      ($varlabel => $def)"
+    return $def
+}
+
+proc ::critcl::Grep {pattern lines} {
+    set r {}
+    foreach line $lines {
+	if {![string match $pattern $line]} continue
+	lappend r $line
+    }
+    return $r
+}
+
+proc ::critcl::GrepV {pattern lines} {
+    set r {}
+    foreach line $lines {
+	if {[string match $pattern $line]} continue
+	lappend r $line
+    }
+    return $r
+}
+
+proc ::critcl::PadRight {len w} {
+    # <=> Left justified
+    format %-${len}s $w
+}
+
+proc ::critcl::LengthLongestWord {words} {
+    set max 0
+    foreach w $words {
+	set n [string length $w]
+	if {$n <= $max} continue
+	set max $n
+    }
+    return $max
+}
+
+# # ## ### ##### ######## ############# #####################
+## Tcl 8.6 vs 9 checking. The check is simple, there is no C
+## parsing. No detection of C comments either.
+
+proc ::critcl::Transition9Check {loc script} {
+    if {!$v::options(tcl9)} return
+
+    lassign $loc filename lno
+    if {$filename eq {}} { set filename <undef> }
+    if {$lno      eq {}} { set lno      1 }
+
+    foreach line [split $script \n] {
+	Transition9CheckLine $filename $lno $line
+	incr lno
+    }
+    return
+}
+
+proc ::critcl::Transition9CheckLine {file lno codeline} {
+    set reported 0
+
+    # TIP 568 Tcl_GetByteArrayFromObj transition to Tcl_GetBytesFromObj
+    if {[string match *Tcl_GetByteArrayFromObj* $codeline]} {
+	T9Report $file $lno $codeline "(TIP 568): Use `Tcl_GetBytesFromObj` and handle NULL results."
+	T9Report $file $lno $codeline "(TIP 568): Read the referenced TIP for the sordid details."
+	T9Report $file $lno $codeline "(TIP 568): Document the obligations of the script level."
+    }
+
+    foreach fun {
+	Tcl_NewStringObj
+	Tcl_AppendToObj
+	Tcl_AddObjErrorInfo
+	Tcl_DStringAppend
+	Tcl_NumUtfChars
+	Tcl_UtfToUniCharDString
+	Tcl_LogCommandInfo
+	Tcl_AppendLimitedToObj
+    } {
+	if { [string match *${fun}*     $codeline] &&
+	     [string match *-1*         $codeline] &&
+	     ![string match {*OK tcl9*} $codeline]} {
+	    T9Report $file $lno $codeline "(TIP 494): Use TCL_AUTO_LENGTH for string length."
+	}
+    }
+
+    # Tcl_Size I
+    foreach {kind fun} [Transition9TclSize] {
+	if {![string match *${fun}*    $codeline]} continue
+	if { [string match {*OK tcl9*} $codeline]} continue
+	T9Report $file $lno $codeline "(Tcl_Size): $fun ($kind)"
+    }
+
+    # Tcl_Size II
+    foreach {fun replace} {
+	Tcl_GetIntFromObj Tcl_GetSizeIntFromObj
+	Tcl_NewIntObj	  Tcl_NewSizeIntObj
+    } {
+	if {![string match *${fun}*    $codeline]} continue
+	if { [string match {*OK tcl9*} $codeline]} continue
+	T9Report $file $lno $codeline "(Tcl_Size): $fun, check if replacement $replace is needed"
+    }
+
+    # Tcl Interp State handling
+    foreach {pattern message} {
+	Tcl_SavedResult   {Reewrite to use type `Tcl_InterpState` instead}
+	Tcl_SaveResult    {Rewrite to `<statevar> = Tcl_SaveInterpState (<interp>, TCL_OK)`}
+	Tcl_RestoreResult {Rewrite to `Tcl_RestoreInterpState (<interp>, <statevar>)`}
+	Tcl_DiscardResult {Rewrite to `Tcl_DiscardInterpState (<statevar>)`}
+    } {
+	if {![string match *${pattern}* $codeline]} continue
+	T9Report $file $lno $codeline "(Interp State handling): $message"
+    }
+
+    # command creation
+    if { [string match *Tcl_CreateObjCommand*  $codeline] &&
+	![string match *Tcl_CreateObjCommand2* $codeline]} {
+	T9Report $file $lno $codeline "(Tcl_Size): Use `Tcl_CreateObjCommand2` for command creation"
+    }
+    return
+}
+
+proc ::critcl::T9Report {fname lno code msg} {
+    upvar 1 reported reported
+
+    set prefix "File \"$fname\", line $lno: "
+    set common "Tcl 9 compatibility warning "
+
+    set blue \033\[34m
+    set off  \033\[0m
+    set mag  \033\[35m
+
+    if {!$reported} { critcl::msg "$prefix$blue[string trim $code]$off" }
+    incr reported
+    critcl::msg "$prefix${common}: $mag$msg$off"
+}
+
+proc ::critcl::Transition9TclSize {} {
+    return {
+	InParam Tcl_AppendFormatToObj
+	InParam Tcl_AppendLimitedToObj
+	InParam Tcl_AppendLimitedToObj
+	InParam Tcl_AppendToObj
+	InParam Tcl_AppendUnicodeToObj
+	InParam Tcl_AttemptSetObjLength
+	InParam Tcl_Char16ToUtfDString
+	InParam Tcl_Concat
+	InParam Tcl_ConcatObj
+	InParam Tcl_ConvertCountedElement
+	InParam Tcl_CreateAlias
+	InParam Tcl_CreateAliasObj
+	InParam Tcl_CreateObjTrace
+	InParam Tcl_CreateObjTrace2
+	InParam Tcl_CreateTrace
+	InParam Tcl_DbNewByteArrayObj
+	InParam Tcl_DbNewListObj
+	InParam Tcl_DbNewStringObj
+	InParam Tcl_DetachPids
+	InParam Tcl_DictObjPutKeyList
+	InParam Tcl_DictObjRemoveKeyList
+	InParam Tcl_DStringAppend
+	InParam Tcl_DStringSetLength
+	InParam Tcl_EvalEx
+	InParam Tcl_EvalObjv
+	InParam Tcl_EvalTokensStandard
+	InParam Tcl_ExternalToUtf
+	InParam Tcl_ExternalToUtf
+	InParam Tcl_ExternalToUtfDString
+	InParam Tcl_ExternalToUtfDStringEx
+	InParam Tcl_Format
+	InParam Tcl_FSJoinPath
+	InParam Tcl_FSJoinToPath
+	InParam Tcl_GetIndexFromObjStruct
+	InParam Tcl_GetIntForIndex
+	InParam Tcl_GetNumber
+	InParam Tcl_GetRange
+	InParam Tcl_GetRange
+	InParam Tcl_GetThreadData
+	InParam Tcl_GetUniChar
+	InParam Tcl_JoinPath
+	InParam Tcl_LimitSetCommands
+	InParam Tcl_LinkArray
+	InParam Tcl_ListObjIndex
+	InParam Tcl_ListObjReplace
+	InParam Tcl_ListObjReplace
+	InParam Tcl_ListObjReplace
+	InParam Tcl_LogCommandInfo
+	InParam Tcl_MacOSXOpenVersionedBundleResources
+	InParam Tcl_MainEx
+	InParam Tcl_Merge
+	InParam Tcl_NewByteArrayObj
+	InParam Tcl_NewListObj
+	InParam Tcl_NewStringObj
+	InParam Tcl_NewUnicodeObj
+	InParam Tcl_NRCallObjProc
+	InParam Tcl_NRCallObjProc2
+	InParam Tcl_NRCmdSwap
+	InParam Tcl_NREvalObjv
+	InParam Tcl_NumUtfChars
+	InParam Tcl_OpenCommandChannel
+	InParam Tcl_ParseBraces
+	InParam Tcl_ParseCommand
+	InParam Tcl_ParseExpr
+	InParam Tcl_ParseQuotedString
+	InParam Tcl_ParseVarName
+	InParam Tcl_PkgRequireProc
+	InParam Tcl_ProcObjCmd
+	InParam Tcl_Read
+	InParam Tcl_ReadChars
+	InParam Tcl_ReadRaw
+	InParam Tcl_RegExpExecObj
+	InParam Tcl_RegExpExecObj
+	InParam Tcl_RegExpRange
+	InParam Tcl_ScanCountedElement
+	InParam Tcl_SetByteArrayLength
+	InParam Tcl_SetByteArrayObj
+	InParam Tcl_SetChannelBufferSize
+	InParam Tcl_SetListObj
+	InParam Tcl_SetObjLength
+	InParam Tcl_SetRecursionLimit
+	InParam Tcl_SetStringObj
+	InParam Tcl_SetUnicodeObj
+	InParam Tcl_Ungets
+	InParam Tcl_UniCharAtIndex
+	InParam Tcl_UniCharToUtfDString
+	InParam Tcl_UtfAtIndex
+	InParam Tcl_UtfCharComplete
+	InParam Tcl_UtfToChar16DString
+	InParam Tcl_UtfToExternal
+	InParam Tcl_UtfToExternal
+	InParam Tcl_UtfToExternalDString
+	InParam Tcl_UtfToExternalDStringEx
+	InParam Tcl_UtfToUniCharDString
+	InParam Tcl_Write
+	InParam Tcl_WriteChars
+	InParam Tcl_WriteRaw
+	InParam Tcl_WrongNumArgs
+	InParam Tcl_ZlibAdler32
+	InParam Tcl_ZlibCRC32
+	InParam Tcl_ZlibInflate
+	InParam Tcl_ZlibStreamGet
+	InParam TclGetRange
+	InParam TclGetRange
+	InParam TclGetUniChar
+	InParam TclNumUtfChars
+	InParam TclUtfAtIndex
+	InParam TclUtfCharComplete
+
+	OutParam Tcl_DictObjSize
+	OutParam Tcl_ExternalToUtfDStringEx
+	OutParam Tcl_FSSplitPath
+	OutParam Tcl_GetByteArrayFromObj
+	OutParam Tcl_GetBytesFromObj
+	OutParam Tcl_GetIntForIndex
+	OutParam Tcl_GetSizeIntFromObj
+	OutParam Tcl_GetStringFromObj
+	OutParam Tcl_GetUnicodeFromObj
+	OutParam Tcl_ListObjGetElements
+	OutParam Tcl_ListObjLength
+	OutParam Tcl_ParseArgsObjv
+	OutParam Tcl_SplitList
+	OutParam Tcl_SplitPath
+	OutParam Tcl_UtfToExternalDStringEx
+
+	Return Tcl_Char16Len
+	Return Tcl_ConvertCountedElement
+	Return Tcl_ConvertElement
+	Return Tcl_GetChannelBufferSize
+	Return Tcl_GetCharLength
+	Return Tcl_GetEncodingNulLength
+	Return Tcl_Gets
+	Return Tcl_GetsObj
+	Return Tcl_NumUtfChars
+	Return Tcl_Read
+	Return Tcl_ReadChars
+	Return Tcl_ReadRaw
+	Return Tcl_ScanCountedElement
+	Return Tcl_ScanElement
+	Return Tcl_SetRecursionLimit
+	Return Tcl_Ungets
+	Return Tcl_UniCharLen
+	Return Tcl_UniCharToUtf
+	Return Tcl_UtfBackslash
+	Return Tcl_UtfToChar16
+	Return Tcl_UtfToLower
+	Return Tcl_UtfToTitle
+	Return Tcl_UtfToUniChar
+	Return Tcl_UtfToUpper
+	Return Tcl_Write
+	Return Tcl_WriteChars
+	Return Tcl_WriteObj
+	Return Tcl_WriteRaw
+	Return TclGetCharLength
+	Return TclNumUtfChars
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Initialization
+
+proc ::critcl::Initialize {} {
+    variable mydir [Here] ; # Path of the critcl package directory.
+
+    variable run              [interp create]
+    variable v::buildplatform [BuildPlatform]
+    variable v::hdrdir	      [file join $mydir critcl_c]
+    variable v::hdrsavailable
+    variable v::storageclass  [Cat [file join $hdrdir storageclass.c]]
+
+    # Scan the directory holding the C fragments and our copies of the
+    # Tcl header and determine for which versions of Tcl we actually
+    # have headers. This allows distributions to modify the directory,
+    # i.e. drop our copies and refer to the system headers instead, as
+    # much as are installed, and critcl adapts. The tcl versions are
+    # recorded in ascending order, making upcoming searches easier,
+    # the first satisfying version is also always the smallest.
+
+    foreach d [lsort -dict [glob -types {d r} -directory $hdrdir -tails tcl*]] {
+	lappend hdrsavailable [regsub {^tcl} $d {}]
+    }
+
+    # The prefix is based on the package's version. This allows
+    # multiple versions of the package to use the same cache without
+    # interfering with each. Note that we cannot use 'pid' and similar
+    # information, because this would circumvent the goal of the
+    # cache, the reuse of binaries whose sources did not change.
+
+    variable v::prefix	"v[package require critcl]"
+
+    regsub -all {\.} $prefix {} prefix
+
+    # keep config options in a namespace
+    foreach var $v::configvars {
+	set c::$var {}
+    }
+
+    # read default configuration. This also chooses and sets the
+    # target platform.
+    readconfig [file join $mydir Config]
+
+    # Declare the standard argument types for cproc.
+
+    argtype int {
+	if (Tcl_GetIntFromObj(interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    }
+    argtype boolean {
+	if (Tcl_GetBooleanFromObj(interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    } int int
+    argtype bool = boolean
+
+    argtype long {
+	if (Tcl_GetLongFromObj(interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    }
+
+    argtype wideint {
+	if (Tcl_GetWideIntFromObj(interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    } Tcl_WideInt Tcl_WideInt
+
+    argtype double {
+	if (Tcl_GetDoubleFromObj(interp, @@, &@A) != TCL_OK) return TCL_ERROR;
+    }
+    argtype float {
+	double t;
+	if (Tcl_GetDoubleFromObj(interp, @@, &t) != TCL_OK) return TCL_ERROR;
+	@A = (float) t;
+    }
+
+    # Premade scalar type derivations for common range restrictions.
+    # Look to marker XXXA for the places where auto-creation would
+    # need fitting in (future).
+    #
+    # See also `MakeScalarLimited`, which is able to generate validators for extended forms of this
+    # kind (multiple relations, arbitrary limit values, ...)
+    foreach type {
+	int long wideint double float
+    } {
+	set ctype [ArgumentCType $type]
+	set code  [ArgumentConversion $type]
+	foreach restriction {
+	    {> 0}	    {>= 0}	    {> 1}	    {>= 1}
+	    {< 0}	    {<= 0}	    {< 1}	    {<= 1}
+	} {
+	    set ntype "$type $restriction"
+	    set head  "expected $ntype, but got \\\""
+	    set tail  "\\\""
+	    set msg   "\"$head\", Tcl_GetString (@@), \"$tail\""
+	    set    new $code
+	    append new \
+		"\n\t/* Range check, assert (x $restriction) */" \
+		"\n\tif (!(@A $restriction)) \{" \
+		"\n\t    Tcl_AppendResult (interp, $msg, NULL);" \
+		"\n\t    return TCL_ERROR;" \
+		"\n\t\}"
+
+	    argtype $ntype $new $ctype $ctype
+	}
+    }
+
+    argtype char* {
+	@A = Tcl_GetString(@@);
+    } {const char*} {const char*}
+
+    argtype pstring {
+	@A.s = Tcl_GetStringFromObj(@@, &(@A.len));
+	@A.o = @@;
+    } critcl_pstring critcl_pstring
+
+    argtypesupport pstring {
+	typedef struct critcl_pstring {
+	    Tcl_Obj*    o;
+	    const char* s;
+	    Tcl_Size    len;
+	} critcl_pstring;
+    }
+
+    argtype dict {
+	Tcl_Size size;
+	if (Tcl_DictObjSize (interp, @@, &size) != TCL_OK) return TCL_ERROR;
+	@A = @@;
+    } Tcl_Obj* Tcl_Obj*
+
+    argtype list {
+	if (Tcl_ListObjGetElements (interp, @@, /* OK tcl9 */
+		    &(@A.c), (Tcl_Obj***) &(@A.v)) != TCL_OK) return TCL_ERROR;
+	@A.o = @@;
+    } critcl_list critcl_list
+
+    argtypesupport list {
+	typedef struct critcl_list {
+	    Tcl_Obj*        o;
+	    Tcl_Obj* const* v;
+	    Tcl_Size        c;
+	} critcl_list;
+    }
+
+    # See also `MakeList` which is able to generate arbitrary length-limited lists, lists over a
+    # base type, or a combination of both. This here defines the base case of the recognized syntax
+    # for "unlimited-length list with no base type". This shortcuts the operation of `MakeList`, no
+    # special types and code needed.
+    argtype {[]} = list
+    argtype {[*]} = list
+
+    argtype Tcl_Obj* {
+	@A = @@;
+    }
+    argtype object = Tcl_Obj*
+
+    # Predefined variadic type for the special Tcl_Obj*.
+    # - No actual conversion, nor allocation, copying, release needed.
+    # - Just point into and reuse the incoming ov[] array.
+    # This shortcuts the operation of 'MakeVariadicTypeFor'.
+
+    argtype variadic_object {
+	@A.c = @C;
+	@A.v = &ov[@I];
+    } critcl_variadic_object critcl_variadic_object
+
+    argtypesupport variadic_object {
+	typedef struct critcl_variadic_object {
+	    int             c;
+	    Tcl_Obj* const* v;
+	} critcl_variadic_object;
+    }
+
+    argtype variadic_Tcl_Obj* = variadic_object
+
+    # NEW Raw binary string _with_ length information.
+
+    argtype bytes {
+	/* Raw binary string _with_ length information */
+	@A.s = Tcl_GetBytesFromObj(interp, @@, &(@A.len));
+	if (@A.s == NULL) return TCL_ERROR;
+	@A.o = @@;
+    } critcl_bytes critcl_bytes
+
+    argtypesupport bytes {
+	typedef struct critcl_bytes {
+	    Tcl_Obj*             o;
+	    const unsigned char* s;
+	    Tcl_Size             len;
+	} critcl_bytes;
+    }
+
+    argtype channel {
+	int mode;
+	@A = Tcl_GetChannel(interp, Tcl_GetString (@@), &mode);
+	if (@A == NULL) return TCL_ERROR;
+    } Tcl_Channel Tcl_Channel
+
+    argtype unshared-channel {
+	int mode;
+	@A = Tcl_GetChannel(interp, Tcl_GetString (@@), &mode);
+	if (@A == NULL) return TCL_ERROR;
+	if (Tcl_IsChannelShared (@A)) {
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("channel is shared", -1));
+	    return TCL_ERROR;
+	}
+    } Tcl_Channel Tcl_Channel
+
+    # Note, the complementary resulttype is `return-channel`.
+    argtype take-channel {
+	int mode;
+	@A = Tcl_GetChannel(interp, Tcl_GetString (@@), &mode);
+	if (@A == NULL) return TCL_ERROR;
+	if (Tcl_IsChannelShared (@A)) {
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("channel is shared", -1));
+	    return TCL_ERROR;
+	}
+	{
+	    /* Disable event processing for the channel, both by
+	     * removing any registered handler, and forcing interest
+	     * to none. This also disables the processing of pending
+	     * events which are ready to fire for the given
+	     * channel. If we do not do this, events will hit the
+	     * detached channel and potentially wreck havoc on our
+	     * memory and eventually badly hurt us...
+	     */
+	    Tcl_DriverWatchProc *watchProc;
+	    Tcl_ClearChannelHandlers(@A);
+	    watchProc = Tcl_ChannelWatchProc(Tcl_GetChannelType(@A));
+	    if (watchProc) {
+		(*watchProc)(Tcl_GetChannelInstanceData(@A), 0);
+	    }
+	    /* Next some fiddling with the reference count to prevent
+	     * the unregistration from killing it. We basically record
+	     * it as globally known before removing it from the
+	     * current interpreter
+	     */
+	    Tcl_RegisterChannel((Tcl_Interp *) NULL, @A);
+	    Tcl_UnregisterChannel(interp, @A);
+	}
+    } Tcl_Channel Tcl_Channel
+
+    resulttype void {
+	return TCL_OK;
+    }
+
+    resulttype ok {
+	return rv;
+    } int
+
+    resulttype int {
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return TCL_OK;
+    }
+    resulttype boolean = int
+    resulttype bool    = int
+
+    resulttype long {
+	Tcl_SetObjResult(interp, Tcl_NewLongObj(rv));
+	return TCL_OK;
+    }
+
+    resulttype wideint {
+	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(rv));
+	return TCL_OK;
+    } Tcl_WideInt
+
+    resulttype double {
+	Tcl_SetObjResult(interp, Tcl_NewDoubleObj(rv));
+	return TCL_OK;
+    }
+    resulttype float {
+	Tcl_SetObjResult(interp, Tcl_NewDoubleObj(rv));
+	return TCL_OK;
+    }
+
+    # Static and volatile strings. Duplicate.
+    resulttype char* {
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(rv, -1));
+	return TCL_OK;
+    }
+    resulttype {const char*} {
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(rv, -1));
+	return TCL_OK;
+    }
+    resulttype vstring = char*
+
+    # Dynamic strings, allocated via Tcl_Alloc.
+    #
+    # We are avoiding the Tcl_Obj* API here, as its use requires an
+    # additional duplicate of the string, churning memory and
+    # requiring more copying.
+    #   Tcl_SetObjResult(interp, Tcl_NewStringObj(rv, -1));
+    #   Tcl_Free (rv);
+    resulttype string {
+	Tcl_SetResult (interp, rv, TCL_DYNAMIC);
+	return TCL_OK;
+    } char*
+    resulttype dstring = string
+
+    resulttype Tcl_Obj* {
+	if (rv == NULL) { return TCL_ERROR; }
+	Tcl_SetObjResult(interp, rv);
+	Tcl_DecrRefCount(rv);
+	return TCL_OK;
+    }
+    resulttype object = Tcl_Obj*
+
+    critcl::resulttype Tcl_Obj*0 {
+	if (rv == NULL) { return TCL_ERROR; }
+	Tcl_SetObjResult(interp, rv);
+	/* No refcount adjustment */
+	return TCL_OK;
+    } Tcl_Obj*
+    resulttype object0 = Tcl_Obj*0
+
+    resulttype new-channel {
+	if (rv == NULL) { return TCL_ERROR; }
+	Tcl_RegisterChannel (interp, rv);
+	Tcl_SetObjResult (interp, Tcl_NewStringObj (Tcl_GetChannelName (rv), -1));
+	return TCL_OK;
+    } Tcl_Channel
+
+    resulttype known-channel {
+	if (rv == NULL) { return TCL_ERROR; }
+	Tcl_SetObjResult (interp, Tcl_NewStringObj (Tcl_GetChannelName (rv), -1));
+	return TCL_OK;
+    } Tcl_Channel
+
+    # Note, this is complementary to argtype `take-channel`.
+    resulttype return-channel {
+	if (rv == NULL) { return TCL_ERROR; }
+	Tcl_RegisterChannel (interp, rv);
+	Tcl_UnregisterChannel(NULL, rv);
+	Tcl_SetObjResult (interp, Tcl_NewStringObj (Tcl_GetChannelName (rv), -1));
+	return TCL_OK;
+    } Tcl_Channel
+
+    rename ::critcl::Initialize {}
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## State
+
+namespace eval ::critcl {
+    variable mydir    ;# Path of the critcl package directory.
+    variable run      ;# interpreter to run commands, eval when, etc
+
+    # XXX configfile - See the *config commands, path of last config file run through 'readconfig'.
+
+    # namespace to flag when options set
+    namespace eval option {
+        variable debug_symbols  0
+    }
+
+    # keep all variables in a sub-namespace for easy access
+    namespace eval v {
+	variable cache           ;# Path. Cache directory. Platform-dependent
+				  # (target platform).
+
+	# ----------------------------------------------------------------
+
+	# (XX) To understand the set of variables below and their
+	# differences some terminology is required.
+	#
+	# First we have to distinguish between "target identifiers"
+	# and "platform identifiers". The first is the name for a
+	# particular set of configuration settings specifying commands
+	# and command line arguments to use. The second is the name of
+	# a machine configuration, identifying both operating system,
+	# and cpu architecture.
+	#
+	# The problem critcl has is that in 99% of the cases found in
+	# a critcl config file the "target identifier" is also a valid
+	# "platform identifier". Example: "linux-ix86". That does not
+	# make them semantically interchangable however.
+	#
+	# Especially when we add cross-compilation to the mix, where
+	# we have to further distinguish between the platform critcl
+	# itself is running on (build), and the platform for which
+	# critcl is generating code (target), and the last one sounds
+	# similar to "target identifier".
+
+	variable targetconfig    ;# Target identifier. The chosen configuration.
+	variable targetplatform  ;# Platform identifier. Type of generated binaries.
+	variable buildplatform   ;# Platform identifier. We run here.
+
+	variable knowntargets {} ;# List of all target identifiers found
+	# in the configuration file last processed by "readconfig".
+
+	variable xtargets        ;# Cross-compile targets. This array maps from
+	array set xtargets {}    ;# the target identifier to the actual platform
+	# identifier of the target platform in question. If a target identifier
+	# has no entry here, it is assumed to be the platform identifier itself.
+	# See "critcl::actualtarget".
+
+	# ----------------------------------------------------------------
+
+	variable version ""      ;# String. Min version number on platform
+	variable hdrdir          ;# Path. Directory containing the helper
+				  # files of the package. A sub-
+				  # directory of 'mydir', see above.
+	variable hdrsavailable   ;# List. Of Tcl versions for which we have
+	                          # Tcl header files available. For details
+	                          # see procedure 'Initialize' above.
+	variable prefix          ;# String. The string to start all file names
+				  # generated by the package with. See
+				  # 'Initialize' for our choice and
+				  # explanation of it.
+	variable options         ;# An array containing options
+				  # controlling the code generator.
+				  # For more details see below.
+	set options(outdir)   "" ;# - Path. If set the place where the generated
+				  #   shared library is saved for permanent use.
+	set options(keepsrc)  0  ;# - Boolean. If set all generated .c files are
+				  #   kept after compilation. Helps with debugging
+				  #   the critcl package.
+	set options(combine)  "" ;# - XXX standalone/dynamic/static
+				  #   XXX Meaning of combine?
+	set options(force)    0  ;# - Boolean. If set (re)compilation is
+				  #   forced, regardless of the state of
+				  #   the cache.
+	set options(I)        "" ;# - List. Additional include
+				  #   directories, globally specified by
+				  #   the user for mode 'generate
+				  #   package', for all components put
+				  #   into the package's library.
+	set options(L)        "" ;# - List. Additional library search
+				  #   directories, globally specified by
+				  #   the user for mode 'generate
+				  #   package'.
+	set options(language) "" ;# - String. XXX
+	set options(tcl9)     1  ;# - Boolean. If set critcl will check C code
+				  #   fragments for 8.6/9 compatibility problems.
+	set options(lines)    1  ;# - Boolean. If set the generator will
+				  #   emit #line-directives to help locating
+				  #   C code in the .tcl in case of compile
+				  #   warnings and errors.
+	set options(trace)    0  ;# - Boolean. If set the generator will
+	                          #   emit code tracing command entry
+	                          #   and return, for all cprocs and
+	                          #   ccommands. The latter is done by
+	                          #   creating a shim function. For
+	                          #   cprocs their regular shim
+	                          #   function is used and modified.
+	                          #   The functionality is based on
+	                          #   'critcl::cutil's 'tracer'
+	                          #   command and C code.
+
+	# XXX clientdata() per-command (See ccommand). per-file+ccommand better?
+	# XXX delproc()    per-command (See ccommand). s.a
+
+	# XXX toolchain()  <platform>,<configvarname> -> data
+	# XXX            Used only in {read,set,show}config.
+	# XXX            Seems to be a database holding the total contents of the
+	# XXX            config file.
+
+	# knowntargets  - See the *config commands, list of all platforms we can compile for.
+
+	# I suspect that this came later
+
+	# Conversion maps, Tcl types for procedure arguments and
+	# results to C types and code fragments for the conversion
+	# between the realms. Used by the helper commands
+	# "ArgumentCType", "ArgumentConversion", and
+	# "ResultConversion". These commands also supply the default
+	# values for unknown types.
+
+	variable  actype
+	array set actype {}
+
+	variable  actypeb
+	array set actypeb {}
+
+	# In the code fragments below we have the following environment (placeholders, variables):
+	# ip - C variable, Tcl_Interp* of the interpreter providing the arguments.
+	# @@ - Tcl_Obj* valued expression returning the Tcl argument value.
+	# @A - Name of the C-level argument variable.
+	#
+	variable  aconv
+	array set aconv {}
+
+	# Mapping from cproc result to C result type of the function.
+	# This is also the C type of the helper variable holding the result.
+	# NOTE: 'void' is special, as it has no result, nor result variable.
+	variable  rctype
+	array set rctype {}
+
+	# In the code fragments for result conversion:
+	# 'rv' == variable capturing the return value of the C function.
+	# 'ip' == variable containing pointer to the interp to set the result into.
+	variable  rconv
+	array set rconv {}
+
+	variable storageclass {} ;# See Initialize for setup.
+
+	variable code	         ;# This array collects all code snippets and
+				  # data about them.
+
+	# Keys for 'code' (above) and their contents:
+	#
+	# <file> -> Per-file information, nested dictionary. Sub keys:
+	#
+	#	result		- Results needed for 'generate package'.
+	#		initname	- String. Foo in Foo_Init().
+	#		tsources	- List. The companion tcl sources for <file>.
+	#		object		- String. Name of the object file backing <file>.
+	#		objects		- List. All object files, main and companions.
+	#		shlib		- String. Name of the shared library backing <file>.
+	#		base		- String. Common prefix (file root) of 'object' and 'shlib'.
+	#		clibraries	- List. See config. Copy for global linkage.
+	#		ldflags		- List. See config. Copy for global linkage.
+	#		mintcl		- String. Minimum version of Tcl required by the package.
+	#		preload		- List. Names of all libraries to load before the package library.
+	#		license		- String. License text.
+	#	<= "critcl::cresults"
+	#
+	#	config		- Collected code and configuration (ccode, etc.).
+	#		tsources	- List. The companion tcl sources for <file>.
+	#				  => "critcl::tsources".
+	#		cheaders	- List. => "critcl::cheaders"
+	#		csources	- List. => "critcl::csources"
+	#		clibraries	- List. => "critcl::clibraries"
+	#		cflags		- List. => "critcl::cflags", "critcl::framework",
+	#					   "critcl::debug", "critcl::include"
+	#		ldflags		- List. => "critcl::ldflags", "critcl::framework"
+	#		initc		- String. Initialization code for Foo_Init(), "critcl::cinit"
+	#		edecls		- String. Declarations of externals needed by Foo_Init(), "critcl::cinit"
+	#		functions	- List. Collected function names.
+	#		fragments	- List. Hashes of the collected C source bodies (functions, and unnamed code).
+	#		block		- Dictionary. Maps the hashes to their C sources for fragments.
+	#		defs		- List. Hashes of the collected C source bodies (only unnamed code), for extraction of defines.
+	#		const		- Dictionary. Maps the names of defines to the namespace their variables will be in.
+	#		uuid		- List. Strings used to generate the file's uuid/hash.
+	#		mintcl		- String. Minimum version of Tcl required by the package.
+	#		preload		- List. Names of all libraries to load
+	#				  before the package library. This
+	#				  information is used only by mode
+	#				  'generate package'. This means that
+	#				  packages with preload can't be used
+	#				  in mode 'compile & run'.
+	#		license		- String. License text.
+	#		api_self	- String. Name of our API. Defaults to package name.
+	#		api_hdrs	- List. Exported public headers of the API.
+	#		api_ehdrs	- List. Exported external public headers of the API.
+	#		api_fun		- List. Exported functions (signatures of result type, name, and arguments (C syntax))
+	#		meta		- Dictionary. Arbitrary keys to values, the user meta-data for the package.
+	#		package		- Dictionary. Keys, see below. System meta data for the package. Values are lists.
+	#			name		- Name of current package
+	#			version		- Version of same.
+	#			description	- Long description.
+	#			summary		- Short description (one line).
+	#			subject		- Keywords and -phrases.
+	#			as::build::date	- Date-stamp for the build.
+	#
+	# ---------------------------------------------------------------------
+	#
+	# <file>,failed -> Per-file information: Boolean. Build status. Failed or not.
+	#
+	# 'ccode'     -> Accumulated in-memory storage of code-fragments.
+	#                Extended by 'ccode', used by 'BuildDefines',
+	#                called by 'cbuild'. Apparently tries to extract defines
+	#                and enums, and their values, for comparison with 'cdefine'd
+	#		 values.
+	#
+	# NOTE: <file> are normalized absolute path names for exact
+	#       identification of the relevant .tcl file.
+
+	# _____________________________________________________________________
+	# State used by "cbuild" ______________________________________________
+
+	variable log     ""      ;# Log channel, opened to logfile.
+	variable logfile ""      ;# Path of logfile. Accessed by
+				  # "Log*" and "ExecWithLogging".
+	variable failed  0       ;# Build status. Used by "Status*"
+	variable err     ""	 ;# and "Exec*". Build error text.
+
+	variable uuidcounter 0   ;# Counter for uuid generation in package mode.
+	                         ;# md5 is bypassed when used.
+
+	variable buildforpackage 0 ;# Boolean flag controlling
+				    # cbuild's behaviour. Named after
+				    # the mode 'generate package'.
+				    # Auto-resets to OFF after each
+				    # call of "cbuild". Can be activated
+				    # by "buildforpackage".
+
+	# _____________________________________________________________________
+	# State used by "BeginCommand", "EndCommand", "Emit*" _________________
+
+	variable curr	         ;# Hash of the last BeginCommand.
+	variable block           ;# C code assembled by Emit* calls
+				  # between Begin- and EndCommand.
+
+	# _____________________________________________________________________
+
+	variable compiling 0     ;# Boolean. Indicates that a C compiler
+				  # (gcc, native, cl) is available.
+
+	# _____________________________________________________________________
+	# config variables
+	variable configvars {
+	    compile
+	    debug_memory
+	    debug_symbols
+	    include
+	    libinclude
+	    ldoutput
+	    embed_manifest
+	    link
+	    link_debug
+	    link_preload
+	    link_release
+	    link_rpath
+	    noassert
+	    object
+	    optimize
+	    output
+	    platform
+	    preproc_define
+	    preproc_enum
+	    sharedlibext
+	    strip
+	    tclstubs
+	    threadflags
+	    tkstubs
+	    version
+	}
+    }
+
+    # namespace holding the compiler configuration (commands and
+    # options for the various tasks, i.e. compilation, linking, etc.).
+    namespace eval c {
+	# See sibling file 'Config' for the detailed and full
+	# information about the variables in use. configvars above, and
+	# the code below list only the variables relevant to C. Keep this
+	# information in sync with the contents of 'Config'.
+
+	# compile         Command to compile a C source file to an object file
+	# debug_memory    Compiler flags to enable memory debugging
+	# debug_symbols   Compiler flags to add symbols to resulting library
+	# include         Compiler flag to add an include directory
+	# libinclude      Linker flag to add a library directory
+	# ldoutput       - ? See 'Config'
+	# link            Command to link one or more object files and create a shared library
+	# embed_manifest  Command to embed a manifest into a DLL. (Win-specific)
+	# link_debug     - ? See 'Config'
+	# link_preload   Linker flags to use when dependent libraries are pre-loaded.
+	# link_release   - ? See 'Config'
+	# noassert        Compiler flag to turn off assertions in Tcl code
+	# object          File extension for object files
+	# optimize        Compiler flag to specify optimization level
+	# output          Compiler flag to set output file, with argument $object => Use via [subst].
+	# platform        Platform identification string (defaults to platform::generic)
+	# preproc_define  Command to preprocess C source file (for critcl::cdefines)
+	# preproc_enum    ditto
+	# sharedlibext    The platform's file extension used for shared library files.
+	# strip           Compiler flag to tell the linker to strip symbols
+	# target          Presence of this key indicates that this is a cross-compile target
+	# tclstubs        Compiler flag to set USE_TCL_STUBS
+	# threadflags     Compiler flags to enable threaded build
+	# tkstubs         Compiler flag to set USE_TK_STUBS
+	# version         Command to print the compiler version number
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Export API
+
+namespace eval ::critcl {
+    namespace export \
+	at cache ccode ccommand cdata cdefines cflags cheaders \
+	check cinit clibraries compiled compiling config cproc \
+	csources debug done failed framework ldflags platform \
+	tk tsources preload license load tcl api userconfig meta \
+	source include make
+    # This is exported for critcl::app to pick up when generating the
+    # dummy commands in the runtime support of a generated package.
+    namespace export Ignore
+    catch { namespace ensemble create }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+::critcl::Initialize
+return
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/cdata.c b/src/vfs/critcl.vfs/lib/critcl/critcl_c/cdata.c
new file mode 100644
index 00000000..da92e52b
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/cdata.c
@@ -0,0 +1,5 @@
+  static char script\[$count] = {
+    $inittext
+  };
+  Tcl_SetByteArrayObj(Tcl_GetObjResult(ip), (unsigned char*) script, $count);
+  return TCL_OK;
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/header.c b/src/vfs/critcl.vfs/lib/critcl/critcl_c/header.c
new file mode 100644
index 00000000..f3018d6f
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/header.c
@@ -0,0 +1,6 @@
+/* Generated by critcl on [clock format [clock seconds]]
+ * source: $file
+ * binary: $libfile
+ */
+$api
+#include "tclpre9compat.h" /* tcl.h + Portability Tcl <=8.6 */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/pkginit.c b/src/vfs/critcl.vfs/lib/critcl/critcl_c/pkginit.c
new file mode 100644
index 00000000..e4668847
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/pkginit.c
@@ -0,0 +1,12 @@
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+      ${ext}
+DLLEXPORT int
+${ininame}_Init(Tcl_Interp *interp)
+{
+#define ip interp
+#if USE_TCL_STUBS
+  if (!MyInitTclStubs(interp)) return TCL_ERROR;
+#endif
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/pkginitend.c b/src/vfs/critcl.vfs/lib/critcl/critcl_c/pkginitend.c
new file mode 100644
index 00000000..57450a19
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/pkginitend.c
@@ -0,0 +1,6 @@
+  return TCL_OK;
+#undef ip
+}
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/pkginittk.c b/src/vfs/critcl.vfs/lib/critcl/critcl_c/pkginittk.c
new file mode 100644
index 00000000..29945cf7
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/pkginittk.c
@@ -0,0 +1,5 @@
+
+# line 1 "MyInitTkStubs"
+#if USE_TK_STUBS
+  if (!MyInitTkStubs(interp)) return TCL_ERROR;
+#endif
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/preload.c b/src/vfs/critcl.vfs/lib/critcl/critcl_c/preload.c
new file mode 100644
index 00000000..5ebccce7
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/preload.c
@@ -0,0 +1,169 @@
+/*
+ * pre-load a shared library
+ *   - for situations where a Tcl package depends on another library
+ *   - will be superceded by the functionality in TIP #239
+ *   - based on tclLoad.c from Tcl 8.4.13 and MyInitTclStubs from Critcl
+ */
+
+#include "tcl.h"
+
+TclStubs *tclStubsPtr;
+TclPlatStubs *tclPlatStubsPtr;
+struct TclIntStubs *tclIntStubsPtr;
+struct TclIntPlatStubs *tclIntPlatStubsPtr;
+
+static int
+MyInitTclStubs (Tcl_Interp *ip)
+{
+    typedef struct {
+      char *result;
+      Tcl_FreeProc *freeProc;
+      int errorLine;
+      TclStubs *stubTable;
+    } HeadOfInterp;
+
+    HeadOfInterp *hoi = (HeadOfInterp*) ip;
+ 
+    if (hoi->stubTable == NULL || hoi->stubTable->magic != TCL_STUB_MAGIC) {
+      ip->result = "This extension requires stubs-support.";
+      ip->freeProc = TCL_STATIC;
+      return 0;
+    }
+
+    tclStubsPtr = hoi->stubTable;
+
+    if (Tcl_PkgRequire(ip, "Tcl", "8.1", 0) == NULL) {
+      tclStubsPtr = NULL;
+      return 0;
+    }
+
+    if (tclStubsPtr->hooks != NULL) {
+        tclPlatStubsPtr = tclStubsPtr->hooks->tclPlatStubs;
+        tclIntStubsPtr = tclStubsPtr->hooks->tclIntStubs;
+        tclIntPlatStubsPtr = tclStubsPtr->hooks->tclIntPlatStubs;
+    }
+ 
+    return 1;
+} 
+
+#ifdef WIN32
+
+#include <windows.h>
+
+typedef struct PreloadInfo {
+    Tcl_Obj *dir;
+    Tcl_LoadHandle handle;
+} PreloadInfo;
+
+static void
+removeDLLCopy(ClientData clientData) {
+    PreloadInfo *preload = (PreloadInfo *) clientData;
+    Tcl_Obj *dir = preload->dir;
+    Tcl_LoadHandle handle = preload->handle;
+    Tcl_Obj *errorPtr;
+
+    // no idea why, but we have to call FreeLibrary twice for the subsequent
+    // Tcl_FSRemoveDirectory to work
+    FreeLibrary((HINSTANCE) handle);
+    FreeLibrary((HINSTANCE) handle);
+
+    if (Tcl_FSRemoveDirectory(dir, 1, &errorPtr) != TCL_OK) {
+	fprintf(stderr, "error removing dir = %s\n", Tcl_GetString(errorPtr));
+    }
+}
+
+#endif
+
+TCL_DECLARE_MUTEX(packageMutex)
+
+static int
+Critcl_Preload(
+    ClientData dummy,
+    Tcl_Interp *interp,
+    int objc,
+    Tcl_Obj *objv[])
+{
+    int code;
+    Tcl_PackageInitProc *proc1, *proc2;
+    Tcl_LoadHandle loadHandle;
+    Tcl_FSUnloadFileProc *unLoadProcPtr = NULL;
+    Tcl_Filesystem *fsPtr;
+#ifdef WIN32
+    PreloadInfo	*preload = NULL;
+#endif
+
+    if (objc != 2) {
+        Tcl_WrongNumArgs(interp, 1, objv, "fileName");
+        return TCL_ERROR;
+    }
+    if (Tcl_FSConvertToPathType(interp, objv[1]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+#ifdef WIN32
+    // if the filesystem holding the dll doesn't support direct loading
+    // we need to copy it to a temporary directory and load it from there
+    //  - The command "critcl::runtime::precopy" is defined by the support
+    //    file "critcl/lib/app-critcl/runtime.tcl". At load time this is
+    //    the file "critcl-rt.tcl", sibling to "pkgIndex.tcl".
+
+    if ((fsPtr = Tcl_FSGetFileSystemForPath(objv[1])) != NULL \
+		&& fsPtr->loadFileProc == NULL) {
+	int len;
+	Tcl_Obj *dirs;
+	objv[0] = Tcl_NewStringObj("::critcl::runtime::precopy", -1);
+	if ((code = Tcl_EvalObjv(interp, 2, objv, 0)) != TCL_OK) {
+	    Tcl_SetErrorCode(interp, "could not preload ",
+				      Tcl_GetString(objv[1]), 0);
+	    return TCL_ERROR;
+	}
+	objv[1] = Tcl_GetObjResult(interp);
+	Tcl_IncrRefCount(objv[1]);
+	dirs = Tcl_FSSplitPath(objv[1], &len);
+	preload = (PreloadInfo *) ckalloc(sizeof(PreloadInfo));
+	preload->dir = Tcl_FSJoinPath(dirs, --len);
+	Tcl_IncrRefCount(preload->dir);
+    }
+#endif
+
+    Tcl_MutexLock(&packageMutex);
+    code = Tcl_FSLoadFile(interp, objv[1], NULL, NULL, NULL, NULL,
+				  &loadHandle, &unLoadProcPtr);
+    Tcl_MutexUnlock(&packageMutex);
+#ifdef WIN32
+    if (preload) {
+	preload->handle = loadHandle;
+	Tcl_CreateExitHandler(removeDLLCopy, (ClientData) preload);
+    }
+#endif
+    return code;
+}
+
+DLLEXPORT int
+Preload_Init(Tcl_Interp *interp)
+{
+    if (!MyInitTclStubs(interp)) 
+        return TCL_ERROR;
+    // The Tcl command can't be "preload" because the Tcl source might
+    // be copied into the target package (so Tcl procs are available)
+    // and we want critcl::runtime::preload to then be a no-op because
+    // the preloading is done from the loadlib command when the target
+    // package is loaded
+    Tcl_CreateObjCommand(interp, "::critcl::runtime::preload", Critcl_Preload, NULL, 0);
+    return 0;
+}
+
+DLLEXPORT int
+Preload_SafeInit(Tcl_Interp *interp)
+{
+    if (!MyInitTclStubs(interp)) 
+        return TCL_ERROR;
+    Tcl_CreateObjCommand(interp, "::critcl::runtime::preload", Critcl_Preload, NULL, 0);
+    return 0;
+}
+
+DLLEXPORT int
+Preload_Unload(Tcl_Interp *interp) {}
+
+DLLEXPORT int
+Preload_SafeUnload(Tcl_Interp *interp) {}
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/storageclass.c b/src/vfs/critcl.vfs/lib/critcl/critcl_c/storageclass.c
new file mode 100644
index 00000000..11e44f00
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/storageclass.c
@@ -0,0 +1,26 @@
+/*
+ * These macros are used to control whether functions are being declared for
+ * import or export. If a function is being declared while it is being built
+ * to be included in a shared library, then it should have the DLLEXPORT
+ * storage class. If is being declared for use by a module that is going to
+ * link against the shared library, then it should have the DLLIMPORT storage
+ * class. If the symbol is beind declared for a static build or for use from a
+ * stub library, then the storage class should be empty.
+ *
+ * The convention is that a macro called BUILD_xxxx, where xxxx is the name of
+ * a library we are building, is set on the compile line for sources that are
+ * to be placed in the library. When this macro is set, the storage class will
+ * be set to DLLEXPORT. At the end of the header file, the storage class will
+ * be reset to DLLIMPORT.
+ */
+
+#undef TCL_STORAGE_CLASS
+#ifdef BUILD_@cname@
+#   define TCL_STORAGE_CLASS DLLEXPORT
+#else
+#   ifdef USE_@up@_STUBS
+#      define TCL_STORAGE_CLASS
+#   else
+#      define TCL_STORAGE_CLASS DLLIMPORT
+#   endif
+#endif
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/stubs.c b/src/vfs/critcl.vfs/lib/critcl/critcl_c/stubs.c
new file mode 100644
index 00000000..19084328
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/stubs.c
@@ -0,0 +1,43 @@
+
+#line 1 "MyInitTclStubs"
+
+#if USE_TCL_STUBS
+  $stubs
+  $platstubs
+  const struct TclIntStubs *tclIntStubsPtr;
+  const struct TclIntPlatStubs *tclIntPlatStubsPtr;
+
+  static int
+  MyInitTclStubs (Tcl_Interp *ip)
+  {
+    typedef struct {
+      char *result;
+      Tcl_FreeProc *freeProc;
+      int errorLine;
+      TclStubs *stubTable;
+    } HeadOfInterp;
+
+    HeadOfInterp *hoi = (HeadOfInterp*) ip;
+
+    if (hoi->stubTable == NULL || hoi->stubTable->magic != TCL_STUB_MAGIC) {
+      hoi->result = "This extension requires stubs-support.";
+      hoi->freeProc = TCL_STATIC;
+      return 0;
+    }
+
+    tclStubsPtr = hoi->stubTable;
+
+    if (Tcl_PkgRequire(ip, "Tcl", "$mintcl", 0) == NULL) {
+      tclStubsPtr = NULL;
+      return 0;
+    }
+
+    if (tclStubsPtr->hooks != NULL) {
+	tclPlatStubsPtr = tclStubsPtr->hooks->tclPlatStubs;
+	tclIntStubsPtr = tclStubsPtr->hooks->tclIntStubs;
+	tclIntPlatStubsPtr = tclStubsPtr->hooks->tclIntPlatStubs;
+    }
+
+    return 1;
+  }
+#endif
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/stubs_e.c b/src/vfs/critcl.vfs/lib/critcl/critcl_c/stubs_e.c
new file mode 100644
index 00000000..42c17b61
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/stubs_e.c
@@ -0,0 +1,10 @@
+
+#line 1 "MyInitTclStubs"
+
+#if USE_TCL_STUBS
+  static int
+  MyInitTclStubs (Tcl_Interp *ip)
+  {
+    return 1;
+  }
+#endif
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/X.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/X.h
new file mode 100644
index 00000000..daf22830
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/X.h
@@ -0,0 +1,677 @@
+/*
+ *	$XConsortium: X.h,v 1.66 88/09/06 15:55:56 jim Exp $
+ */
+
+/* Definitions for the X window system likely to be used by applications */
+
+#ifndef X_H
+#define X_H
+
+/***********************************************************
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital or MIT not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+#define X_PROTOCOL	11		/* current protocol version */
+#define X_PROTOCOL_REVISION 0		/* current minor version */
+
+#if defined(MAC_OSX_TK)
+#   define Cursor XCursor
+#   define Region XRegion
+#endif
+
+/* Resources */
+
+#ifdef _WIN64
+typedef __int64 XID;
+#else
+typedef unsigned long XID;
+#endif
+
+typedef XID Window;
+typedef XID Drawable;
+typedef XID Font;
+typedef XID Pixmap;
+typedef XID Cursor;
+typedef XID Colormap;
+typedef XID GContext;
+typedef XID KeySym;
+
+typedef unsigned long Mask;
+
+typedef unsigned long Atom;
+
+typedef unsigned long VisualID;
+
+typedef unsigned long Time;
+
+typedef unsigned long KeyCode;	/* In order to use IME, the Macintosh needs
+				 * to pack 3 bytes into the keyCode field in
+				 * the XEvent.  In the real X.h, a KeyCode is
+				 * defined as a short, which wouldn't be big
+				 * enough. */
+
+/*****************************************************************
+ * RESERVED RESOURCE AND CONSTANT DEFINITIONS
+ *****************************************************************/
+
+#define None                 0L	/* universal null resource or null atom */
+
+#define ParentRelative       1L	/* background pixmap in CreateWindow
+				    and ChangeWindowAttributes */
+
+#define CopyFromParent       0L	/* border pixmap in CreateWindow
+				       and ChangeWindowAttributes
+				   special VisualID and special window
+				       class passed to CreateWindow */
+
+#define PointerWindow        0L	/* destination window in SendEvent */
+#define InputFocus           1L	/* destination window in SendEvent */
+
+#define PointerRoot          1L	/* focus window in SetInputFocus */
+
+#define AnyPropertyType      0L	/* special Atom, passed to GetProperty */
+
+#define AnyKey		     0L	/* special Key Code, passed to GrabKey */
+
+#define AnyButton            0L	/* special Button Code, passed to GrabButton */
+
+#define AllTemporary         0L	/* special Resource ID passed to KillClient */
+
+#define CurrentTime          0L	/* special Time */
+
+#define NoSymbol	     0L	/* special KeySym */
+
+/*****************************************************************
+ * EVENT DEFINITIONS
+ *****************************************************************/
+
+/* Input Event Masks. Used as event-mask window attribute and as arguments
+   to Grab requests.  Not to be confused with event names.  */
+
+#define NoEventMask			0L
+#define KeyPressMask			(1L<<0)
+#define KeyReleaseMask			(1L<<1)
+#define ButtonPressMask			(1L<<2)
+#define ButtonReleaseMask		(1L<<3)
+#define EnterWindowMask			(1L<<4)
+#define LeaveWindowMask			(1L<<5)
+#define PointerMotionMask		(1L<<6)
+#define PointerMotionHintMask		(1L<<7)
+#define Button1MotionMask		(1L<<8)
+#define Button2MotionMask		(1L<<9)
+#define Button3MotionMask		(1L<<10)
+#define Button4MotionMask		(1L<<11)
+#define Button5MotionMask		(1L<<12)
+#define ButtonMotionMask		(1L<<13)
+#define KeymapStateMask			(1L<<14)
+#define ExposureMask			(1L<<15)
+#define VisibilityChangeMask		(1L<<16)
+#define StructureNotifyMask		(1L<<17)
+#define ResizeRedirectMask		(1L<<18)
+#define SubstructureNotifyMask		(1L<<19)
+#define SubstructureRedirectMask	(1L<<20)
+#define FocusChangeMask			(1L<<21)
+#define PropertyChangeMask		(1L<<22)
+#define ColormapChangeMask		(1L<<23)
+#define OwnerGrabButtonMask		(1L<<24)
+
+/* Event names.  Used in "type" field in XEvent structures.  Not to be
+confused with event masks above.  They start from 2 because 0 and 1
+are reserved in the protocol for errors and replies. */
+
+#define KeyPress		2
+#define KeyRelease		3
+#define ButtonPress		4
+#define ButtonRelease		5
+#define MotionNotify		6
+#define EnterNotify		7
+#define LeaveNotify		8
+#define FocusIn			9
+#define FocusOut		10
+#define KeymapNotify		11
+#define Expose			12
+#define GraphicsExpose		13
+#define NoExpose		14
+#define VisibilityNotify	15
+#define CreateNotify		16
+#define DestroyNotify		17
+#define UnmapNotify		18
+#define MapNotify		19
+#define MapRequest		20
+#define ReparentNotify		21
+#define ConfigureNotify		22
+#define ConfigureRequest	23
+#define GravityNotify		24
+#define ResizeRequest		25
+#define CirculateNotify		26
+#define CirculateRequest	27
+#define PropertyNotify		28
+#define SelectionClear		29
+#define SelectionRequest	30
+#define SelectionNotify		31
+#define ColormapNotify		32
+#define ClientMessage		33
+#define MappingNotify		34
+#define LASTEvent		35	/* must be bigger than any event # */
+
+
+/* Key masks. Used as modifiers to GrabButton and GrabKey, results of QueryPointer,
+   state in various key-, mouse-, and button-related events. */
+
+#define ShiftMask		(1<<0)
+#define LockMask		(1<<1)
+#define ControlMask		(1<<2)
+#define Mod1Mask		(1<<3)
+#define Mod2Mask		(1<<4)
+#define Mod3Mask		(1<<5)
+#define Mod4Mask		(1<<6)
+#define Mod5Mask		(1<<7)
+
+/* modifier names.  Used to build a SetModifierMapping request or
+   to read a GetModifierMapping request.  These correspond to the
+   masks defined above. */
+#define ShiftMapIndex		0
+#define LockMapIndex		1
+#define ControlMapIndex		2
+#define Mod1MapIndex		3
+#define Mod2MapIndex		4
+#define Mod3MapIndex		5
+#define Mod4MapIndex		6
+#define Mod5MapIndex		7
+
+
+/* button masks.  Used in same manner as Key masks above. Not to be confused
+   with button names below. */
+
+#define Button1Mask		(1<<8)
+#define Button2Mask		(1<<9)
+#define Button3Mask		(1<<10)
+#define Button4Mask		(1<<11)
+#define Button5Mask		(1<<12)
+
+#define AnyModifier		(1<<15)  /* used in GrabButton, GrabKey */
+
+
+/* button names. Used as arguments to GrabButton and as detail in ButtonPress
+   and ButtonRelease events.  Not to be confused with button masks above.
+   Note that 0 is already defined above as "AnyButton".  */
+
+#define Button1			1
+#define Button2			2
+#define Button3			3
+#define Button4			4
+#define Button5			5
+
+/* Notify modes */
+
+#define NotifyNormal		0
+#define NotifyGrab		1
+#define NotifyUngrab		2
+#define NotifyWhileGrabbed	3
+
+#define NotifyHint		1	/* for MotionNotify events */
+
+/* Notify detail */
+
+#define NotifyAncestor		0
+#define NotifyVirtual		1
+#define NotifyInferior		2
+#define NotifyNonlinear		3
+#define NotifyNonlinearVirtual	4
+#define NotifyPointer		5
+#define NotifyPointerRoot	6
+#define NotifyDetailNone	7
+
+/* Visibility notify */
+
+#define VisibilityUnobscured		0
+#define VisibilityPartiallyObscured	1
+#define VisibilityFullyObscured		2
+
+/* Circulation request */
+
+#define PlaceOnTop		0
+#define PlaceOnBottom		1
+
+/* protocol families */
+
+#define FamilyInternet		0
+#define FamilyDECnet		1
+#define FamilyChaos		2
+
+/* Property notification */
+
+#define PropertyNewValue	0
+#define PropertyDelete		1
+
+/* Color Map notification */
+
+#define ColormapUninstalled	0
+#define ColormapInstalled	1
+
+/* GrabPointer, GrabButton, GrabKeyboard, GrabKey Modes */
+
+#define GrabModeSync		0
+#define GrabModeAsync		1
+
+/* GrabPointer, GrabKeyboard reply status */
+
+#define GrabSuccess		0
+#define AlreadyGrabbed		1
+#define GrabInvalidTime		2
+#define GrabNotViewable		3
+#define GrabFrozen		4
+
+/* AllowEvents modes */
+
+#define AsyncPointer		0
+#define SyncPointer		1
+#define ReplayPointer		2
+#define AsyncKeyboard		3
+#define SyncKeyboard		4
+#define ReplayKeyboard		5
+#define AsyncBoth		6
+#define SyncBoth		7
+
+/* Used in SetInputFocus, GetInputFocus */
+
+#define RevertToNone		(int)None
+#define RevertToPointerRoot	(int)PointerRoot
+#define RevertToParent		2
+
+/*****************************************************************
+ * ERROR CODES
+ *****************************************************************/
+
+#define Success		   0	/* everything's okay */
+#define BadRequest	   1	/* bad request code */
+#define BadValue	   2	/* int parameter out of range */
+#define BadWindow	   3	/* parameter not a Window */
+#define BadPixmap	   4	/* parameter not a Pixmap */
+#define BadAtom		   5	/* parameter not an Atom */
+#define BadCursor	   6	/* parameter not a Cursor */
+#define BadFont		   7	/* parameter not a Font */
+#define BadMatch	   8	/* parameter mismatch */
+#define BadDrawable	   9	/* parameter not a Pixmap or Window */
+#define BadAccess	  10	/* depending on context:
+				 - key/button already grabbed
+				 - attempt to free an illegal
+				   cmap entry
+				- attempt to store into a read-only
+				   color map entry.
+ 				- attempt to modify the access control
+				   list from other than the local host.
+				*/
+#define BadAlloc	  11	/* insufficient resources */
+#define BadColor	  12	/* no such colormap */
+#define BadGC		  13	/* parameter not a GC */
+#define BadIDChoice	  14	/* choice not in range or already used */
+#define BadName		  15	/* font or color name doesn't exist */
+#define BadLength	  16	/* Request length incorrect */
+#define BadImplementation 17	/* server is defective */
+
+#define FirstExtensionError	128
+#define LastExtensionError	255
+
+/*****************************************************************
+ * WINDOW DEFINITIONS
+ *****************************************************************/
+
+/* Window classes used by CreateWindow */
+/* Note that CopyFromParent is already defined as 0 above */
+
+#define InputOutput		1
+#define InputOnly		2
+
+/* Window attributes for CreateWindow and ChangeWindowAttributes */
+
+#define CWBackPixmap		(1L<<0)
+#define CWBackPixel		(1L<<1)
+#define CWBorderPixmap		(1L<<2)
+#define CWBorderPixel           (1L<<3)
+#define CWBitGravity		(1L<<4)
+#define CWWinGravity		(1L<<5)
+#define CWBackingStore          (1L<<6)
+#define CWBackingPlanes	        (1L<<7)
+#define CWBackingPixel	        (1L<<8)
+#define CWOverrideRedirect	(1L<<9)
+#define CWSaveUnder		(1L<<10)
+#define CWEventMask		(1L<<11)
+#define CWDontPropagate	        (1L<<12)
+#define CWColormap		(1L<<13)
+#define CWCursor	        (1L<<14)
+
+/* ConfigureWindow structure */
+
+#define CWX			(1<<0)
+#define CWY			(1<<1)
+#define CWWidth			(1<<2)
+#define CWHeight		(1<<3)
+#define CWBorderWidth		(1<<4)
+#define CWSibling		(1<<5)
+#define CWStackMode		(1<<6)
+
+
+/* Bit Gravity */
+
+#define ForgetGravity		0
+#define NorthWestGravity	1
+#define NorthGravity		2
+#define NorthEastGravity	3
+#define WestGravity		4
+#define CenterGravity		5
+#define EastGravity		6
+#define SouthWestGravity	7
+#define SouthGravity		8
+#define SouthEastGravity	9
+#define StaticGravity		10
+
+/* Window gravity + bit gravity above */
+
+#define UnmapGravity		0
+
+/* Used in CreateWindow for backing-store hint */
+
+#define NotUseful               0
+#define WhenMapped              1
+#define Always                  2
+
+/* Used in GetWindowAttributes reply */
+
+#define IsUnmapped		0
+#define IsUnviewable		1
+#define IsViewable		2
+
+/* Used in ChangeSaveSet */
+
+#define SetModeInsert           0
+#define SetModeDelete           1
+
+/* Used in ChangeCloseDownMode */
+
+#define DestroyAll              0
+#define RetainPermanent         1
+#define RetainTemporary         2
+
+/* Window stacking method (in configureWindow) */
+
+#define Above                   0
+#define Below                   1
+#define TopIf                   2
+#define BottomIf                3
+#define Opposite                4
+
+/* Circulation direction */
+
+#define RaiseLowest             0
+#define LowerHighest            1
+
+/* Property modes */
+
+#define PropModeReplace         0
+#define PropModePrepend         1
+#define PropModeAppend          2
+
+/*****************************************************************
+ * GRAPHICS DEFINITIONS
+ *****************************************************************/
+
+/* graphics functions, as in GC.alu */
+
+#define	GXclear			0x0		/* 0 */
+#define GXand			0x1		/* src AND dst */
+#define GXandReverse		0x2		/* src AND NOT dst */
+#define GXcopy			0x3		/* src */
+#define GXandInverted		0x4		/* NOT src AND dst */
+#define	GXnoop			0x5		/* dst */
+#define GXxor			0x6		/* src XOR dst */
+#define GXor			0x7		/* src OR dst */
+#define GXnor			0x8		/* NOT src AND NOT dst */
+#define GXequiv			0x9		/* NOT src XOR dst */
+#define GXinvert		0xa		/* NOT dst */
+#define GXorReverse		0xb		/* src OR NOT dst */
+#define GXcopyInverted		0xc		/* NOT src */
+#define GXorInverted		0xd		/* NOT src OR dst */
+#define GXnand			0xe		/* NOT src OR NOT dst */
+#define GXset			0xf		/* 1 */
+
+/* LineStyle */
+
+#define LineSolid		0
+#define LineOnOffDash		1
+#define LineDoubleDash		2
+
+/* capStyle */
+
+#define CapNotLast		0
+#define CapButt			1
+#define CapRound		2
+#define CapProjecting		3
+
+/* joinStyle */
+
+#define JoinMiter		0
+#define JoinRound		1
+#define JoinBevel		2
+
+/* fillStyle */
+
+#define FillSolid		0
+#define FillTiled		1
+#define FillStippled		2
+#define FillOpaqueStippled	3
+
+/* fillRule */
+
+#define EvenOddRule		0
+#define WindingRule		1
+
+/* subwindow mode */
+
+#define ClipByChildren		0
+#define IncludeInferiors	1
+
+/* SetClipRectangles ordering */
+
+#define Unsorted		0
+#define YSorted			1
+#define YXSorted		2
+#define YXBanded		3
+
+/* CoordinateMode for drawing routines */
+
+#define CoordModeOrigin		0	/* relative to the origin */
+#define CoordModePrevious       1	/* relative to previous point */
+
+/* Polygon shapes */
+
+#define Complex			0	/* paths may intersect */
+#define Nonconvex		1	/* no paths intersect, but not convex */
+#define Convex			2	/* wholly convex */
+
+/* Arc modes for PolyFillArc */
+
+#define ArcChord		0	/* join endpoints of arc */
+#define ArcPieSlice		1	/* join endpoints to center of arc */
+
+/* GC components: masks used in CreateGC, CopyGC, ChangeGC, OR'ed into
+   GC.stateChanges */
+
+#define GCFunction              (1L<<0)
+#define GCPlaneMask             (1L<<1)
+#define GCForeground            (1L<<2)
+#define GCBackground            (1L<<3)
+#define GCLineWidth             (1L<<4)
+#define GCLineStyle             (1L<<5)
+#define GCCapStyle              (1L<<6)
+#define GCJoinStyle		(1L<<7)
+#define GCFillStyle		(1L<<8)
+#define GCFillRule		(1L<<9)
+#define GCTile			(1L<<10)
+#define GCStipple		(1L<<11)
+#define GCTileStipXOrigin	(1L<<12)
+#define GCTileStipYOrigin	(1L<<13)
+#define GCFont 			(1L<<14)
+#define GCSubwindowMode		(1L<<15)
+#define GCGraphicsExposures     (1L<<16)
+#define GCClipXOrigin		(1L<<17)
+#define GCClipYOrigin		(1L<<18)
+#define GCClipMask		(1L<<19)
+#define GCDashOffset		(1L<<20)
+#define GCDashList		(1L<<21)
+#define GCArcMode		(1L<<22)
+
+#define GCLastBit		22
+/*****************************************************************
+ * FONTS
+ *****************************************************************/
+
+/* used in QueryFont -- draw direction */
+
+#define FontLeftToRight		0
+#define FontRightToLeft		1
+
+#define FontChange		255
+
+/*****************************************************************
+ *  IMAGING
+ *****************************************************************/
+
+/* ImageFormat -- PutImage, GetImage */
+
+#define XYBitmap		0	/* depth 1, XYFormat */
+#define XYPixmap		1	/* depth == drawable depth */
+#define ZPixmap			2	/* depth == drawable depth */
+
+/*****************************************************************
+ *  COLOR MAP STUFF
+ *****************************************************************/
+
+/* For CreateColormap */
+
+#define AllocNone		0	/* create map with no entries */
+#define AllocAll		1	/* allocate entire map writeable */
+
+
+/* Flags used in StoreNamedColor, StoreColors */
+
+#define DoRed			(1<<0)
+#define DoGreen			(1<<1)
+#define DoBlue			(1<<2)
+
+/*****************************************************************
+ * CURSOR STUFF
+ *****************************************************************/
+
+/* QueryBestSize Class */
+
+#define CursorShape		0	/* largest size that can be displayed */
+#define TileShape		1	/* size tiled fastest */
+#define StippleShape		2	/* size stippled fastest */
+
+/*****************************************************************
+ * KEYBOARD/POINTER STUFF
+ *****************************************************************/
+
+#define AutoRepeatModeOff	0
+#define AutoRepeatModeOn	1
+#define AutoRepeatModeDefault	2
+
+#define LedModeOff		0
+#define LedModeOn		1
+
+/* masks for ChangeKeyboardControl */
+
+#define KBKeyClickPercent	(1L<<0)
+#define KBBellPercent		(1L<<1)
+#define KBBellPitch		(1L<<2)
+#define KBBellDuration		(1L<<3)
+#define KBLed			(1L<<4)
+#define KBLedMode		(1L<<5)
+#define KBKey			(1L<<6)
+#define KBAutoRepeatMode	(1L<<7)
+
+#define MappingSuccess     	0
+#define MappingBusy        	1
+#define MappingFailed		2
+
+#define MappingModifier		0
+#define MappingKeyboard		1
+#define MappingPointer		2
+
+/*****************************************************************
+ * SCREEN SAVER STUFF
+ *****************************************************************/
+
+#define DontPreferBlanking	0
+#define PreferBlanking		1
+#define DefaultBlanking		2
+
+#define DisableScreenSaver	0
+#define DisableScreenInterval	0
+
+#define DontAllowExposures	0
+#define AllowExposures		1
+#define DefaultExposures	2
+
+/* for ForceScreenSaver */
+
+#define ScreenSaverReset 0
+#define ScreenSaverActive 1
+
+/*****************************************************************
+ * HOSTS AND CONNECTIONS
+ *****************************************************************/
+
+/* for ChangeHosts */
+
+#define HostInsert		0
+#define HostDelete		1
+
+/* for ChangeAccessControl */
+
+#define EnableAccess		1
+#define DisableAccess		0
+
+/* Display classes  used in opening the connection
+ * Note that the statically allocated ones are even numbered and the
+ * dynamically changeable ones are odd numbered */
+
+#define StaticGray		0
+#define GrayScale		1
+#define StaticColor		2
+#define PseudoColor		3
+#define TrueColor		4
+#define DirectColor		5
+
+
+/* Byte order  used in imageByteOrder and bitmapBitOrder */
+
+#define LSBFirst		0
+#define MSBFirst		1
+
+#if defined(MAC_OSX_TK)
+#   undef Cursor
+#   undef Region
+#endif
+
+#endif /* X_H */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/Xatom.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/Xatom.h
new file mode 100644
index 00000000..485a4236
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/Xatom.h
@@ -0,0 +1,79 @@
+#ifndef XATOM_H
+#define XATOM_H 1
+
+/* THIS IS A GENERATED FILE
+ *
+ * Do not change!  Changing this file implies a protocol change!
+ */
+
+#define XA_PRIMARY ((Atom) 1)
+#define XA_SECONDARY ((Atom) 2)
+#define XA_ARC ((Atom) 3)
+#define XA_ATOM ((Atom) 4)
+#define XA_BITMAP ((Atom) 5)
+#define XA_CARDINAL ((Atom) 6)
+#define XA_COLORMAP ((Atom) 7)
+#define XA_CURSOR ((Atom) 8)
+#define XA_CUT_BUFFER0 ((Atom) 9)
+#define XA_CUT_BUFFER1 ((Atom) 10)
+#define XA_CUT_BUFFER2 ((Atom) 11)
+#define XA_CUT_BUFFER3 ((Atom) 12)
+#define XA_CUT_BUFFER4 ((Atom) 13)
+#define XA_CUT_BUFFER5 ((Atom) 14)
+#define XA_CUT_BUFFER6 ((Atom) 15)
+#define XA_CUT_BUFFER7 ((Atom) 16)
+#define XA_DRAWABLE ((Atom) 17)
+#define XA_FONT ((Atom) 18)
+#define XA_INTEGER ((Atom) 19)
+#define XA_PIXMAP ((Atom) 20)
+#define XA_POINT ((Atom) 21)
+#define XA_RECTANGLE ((Atom) 22)
+#define XA_RESOURCE_MANAGER ((Atom) 23)
+#define XA_RGB_COLOR_MAP ((Atom) 24)
+#define XA_RGB_BEST_MAP ((Atom) 25)
+#define XA_RGB_BLUE_MAP ((Atom) 26)
+#define XA_RGB_DEFAULT_MAP ((Atom) 27)
+#define XA_RGB_GRAY_MAP ((Atom) 28)
+#define XA_RGB_GREEN_MAP ((Atom) 29)
+#define XA_RGB_RED_MAP ((Atom) 30)
+#define XA_STRING ((Atom) 31)
+#define XA_VISUALID ((Atom) 32)
+#define XA_WINDOW ((Atom) 33)
+#define XA_WM_COMMAND ((Atom) 34)
+#define XA_WM_HINTS ((Atom) 35)
+#define XA_WM_CLIENT_MACHINE ((Atom) 36)
+#define XA_WM_ICON_NAME ((Atom) 37)
+#define XA_WM_ICON_SIZE ((Atom) 38)
+#define XA_WM_NAME ((Atom) 39)
+#define XA_WM_NORMAL_HINTS ((Atom) 40)
+#define XA_WM_SIZE_HINTS ((Atom) 41)
+#define XA_WM_ZOOM_HINTS ((Atom) 42)
+#define XA_MIN_SPACE ((Atom) 43)
+#define XA_NORM_SPACE ((Atom) 44)
+#define XA_MAX_SPACE ((Atom) 45)
+#define XA_END_SPACE ((Atom) 46)
+#define XA_SUPERSCRIPT_X ((Atom) 47)
+#define XA_SUPERSCRIPT_Y ((Atom) 48)
+#define XA_SUBSCRIPT_X ((Atom) 49)
+#define XA_SUBSCRIPT_Y ((Atom) 50)
+#define XA_UNDERLINE_POSITION ((Atom) 51)
+#define XA_UNDERLINE_THICKNESS ((Atom) 52)
+#define XA_STRIKEOUT_ASCENT ((Atom) 53)
+#define XA_STRIKEOUT_DESCENT ((Atom) 54)
+#define XA_ITALIC_ANGLE ((Atom) 55)
+#define XA_X_HEIGHT ((Atom) 56)
+#define XA_QUAD_WIDTH ((Atom) 57)
+#define XA_WEIGHT ((Atom) 58)
+#define XA_POINT_SIZE ((Atom) 59)
+#define XA_RESOLUTION ((Atom) 60)
+#define XA_COPYRIGHT ((Atom) 61)
+#define XA_NOTICE ((Atom) 62)
+#define XA_FONT_NAME ((Atom) 63)
+#define XA_FAMILY_NAME ((Atom) 64)
+#define XA_FULL_NAME ((Atom) 65)
+#define XA_CAP_HEIGHT ((Atom) 66)
+#define XA_WM_CLASS ((Atom) 67)
+#define XA_WM_TRANSIENT_FOR ((Atom) 68)
+
+#define XA_LAST_PREDEFINED ((Atom) 68)
+#endif /* XATOM_H */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/Xfuncproto.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/Xfuncproto.h
new file mode 100644
index 00000000..6d63002e
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/Xfuncproto.h
@@ -0,0 +1,60 @@
+/* $XConsortium: Xfuncproto.h,v 1.7 91/05/13 20:49:21 rws Exp $ */
+/*
+ * Copyright 1989, 1991 by the Massachusetts Institute of Technology
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising
+ * or publicity pertaining to distribution of the software without specific,
+ * written prior permission. M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ */
+
+/* Definitions to make function prototypes manageable */
+
+#ifndef _XFUNCPROTO_H_
+#define _XFUNCPROTO_H_
+
+#ifndef NeedFunctionPrototypes
+#define NeedFunctionPrototypes 1
+#endif /* NeedFunctionPrototypes */
+
+#ifndef NeedVarargsPrototypes
+#define NeedVarargsPrototypes 0
+#endif /* NeedVarargsPrototypes */
+
+#if NeedFunctionPrototypes
+
+#ifndef NeedNestedPrototypes
+#define NeedNestedPrototypes 1
+#endif /* NeedNestedPrototypes */
+
+#ifndef _Xconst
+#define _Xconst const
+#endif /* _Xconst */
+
+#ifndef NeedWidePrototypes
+#ifdef NARROWPROTO
+#define NeedWidePrototypes 0
+#else
+#define NeedWidePrototypes 1		/* default to make interropt. easier */
+#endif
+#endif /* NeedWidePrototypes */
+
+#endif /* NeedFunctionPrototypes */
+
+#ifdef __cplusplus
+#define _XFUNCPROTOBEGIN extern "C" {
+#define _XFUNCPROTOEND }
+#endif
+
+#ifndef _XFUNCPROTOBEGIN
+#define _XFUNCPROTOBEGIN
+#define _XFUNCPROTOEND
+#endif /* _XFUNCPROTOBEGIN */
+
+#endif /* _XFUNCPROTO_H_ */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/Xlib.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/Xlib.h
new file mode 100644
index 00000000..667bdc77
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/Xlib.h
@@ -0,0 +1,1205 @@
+/* $XConsortium: Xlib.h,v 11.221 93/07/02 14:13:28 gildea Exp $ */
+/*
+ * Copyright 1985, 1986, 1987, 1991 by the Massachusetts Institute of Technology
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising
+ * or publicity pertaining to distribution of the software without specific,
+ * written prior permission. M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * X Window System is a Trademark of MIT.
+ *
+ */
+
+
+/*
+ *	Xlib.h - Header definition and support file for the C subroutine
+ *	interface library (Xlib) to the X Window System Protocol (V11).
+ *	Structures and symbols starting with "_" are private to the library.
+ */
+#ifndef _XLIB_H_
+#define _XLIB_H_
+
+#define XlibSpecificationRelease 5
+
+#if !defined(MAC_OSX_TK)
+#   include <X11/X.h>
+#endif
+#ifdef MAC_OSX_TK
+#   include <X11/X.h>
+#   define Cursor XCursor
+#   define Region XRegion
+#endif
+
+/* applications should not depend on these two headers being included! */
+#include <X11/Xfuncproto.h>
+
+#ifndef X_WCHAR
+#ifdef X_NOT_STDC_ENV
+#define X_WCHAR
+#endif
+#endif
+
+#ifndef X_WCHAR
+#include <stddef.h>
+#else
+/* replace this with #include or typedef appropriate for your system */
+typedef unsigned long wchar_t;
+#endif
+
+typedef char *XPointer;
+
+#define Bool int
+#if defined(MAC_OSX_TK)
+/* Use define rather than typedef, since may need to undefine this later */
+#define Status int
+#else
+typedef int Status;
+#endif
+#define True 1
+#define False 0
+
+#define QueuedAlready 0
+#define QueuedAfterReading 1
+#define QueuedAfterFlush 2
+
+#define ConnectionNumber(dpy) 	((dpy)->fd)
+#define RootWindow(dpy, scr) 	(((dpy)->screens[(scr)]).root)
+#define DefaultScreen(dpy) 	((dpy)->default_screen)
+#define DefaultRootWindow(dpy) 	(((dpy)->screens[(dpy)->default_screen]).root)
+#define DefaultVisual(dpy, scr) (((dpy)->screens[(scr)]).root_visual)
+#define DefaultGC(dpy, scr) 	(((dpy)->screens[(scr)]).default_gc)
+#define BlackPixel(dpy, scr) 	(((dpy)->screens[(scr)]).black_pixel)
+#define WhitePixel(dpy, scr) 	(((dpy)->screens[(scr)]).white_pixel)
+#define AllPlanes 		((unsigned long)~0L)
+#define QLength(dpy) 		((dpy)->qlen)
+#define DisplayWidth(dpy, scr) 	(((dpy)->screens[(scr)]).width)
+#define DisplayHeight(dpy, scr) (((dpy)->screens[(scr)]).height)
+#define DisplayWidthMM(dpy, scr)(((dpy)->screens[(scr)]).mwidth)
+#define DisplayHeightMM(dpy, scr)(((dpy)->screens[(scr)]).mheight)
+#define DisplayPlanes(dpy, scr) (((dpy)->screens[(scr)]).root_depth)
+#define DisplayCells(dpy, scr) 	(DefaultVisual((dpy), (scr))->map_entries)
+#define ScreenCount(dpy) 	((dpy)->nscreens)
+#define ServerVendor(dpy) 	((dpy)->vendor)
+#define ProtocolVersion(dpy) 	((dpy)->proto_major_version)
+#define ProtocolRevision(dpy) 	((dpy)->proto_minor_version)
+#define VendorRelease(dpy) 	((dpy)->release)
+#define DisplayString(dpy) 	((dpy)->display_name)
+#define DefaultDepth(dpy, scr) 	(((dpy)->screens[(scr)]).root_depth)
+#define DefaultColormap(dpy, scr)(((dpy)->screens[(scr)]).cmap)
+#define BitmapUnit(dpy) 	((dpy)->bitmap_unit)
+#define BitmapBitOrder(dpy) 	((dpy)->bitmap_bit_order)
+#define BitmapPad(dpy) 		((dpy)->bitmap_pad)
+#define ImageByteOrder(dpy) 	((dpy)->byte_order)
+#define NextRequest(dpy)	((dpy)->request + 1)
+#define LastKnownRequestProcessed(dpy)	((dpy)->request)
+
+/* macros for screen oriented applications (toolkit) */
+#define ScreenOfDisplay(dpy, scr)(&((dpy)->screens[(scr)]))
+#define DefaultScreenOfDisplay(dpy) (&((dpy)->screens[(dpy)->default_screen]))
+#define DisplayOfScreen(s)	((s)->display)
+#define RootWindowOfScreen(s)	((s)->root)
+#define BlackPixelOfScreen(s)	((s)->black_pixel)
+#define WhitePixelOfScreen(s)	((s)->white_pixel)
+#define DefaultColormapOfScreen(s)((s)->cmap)
+#define DefaultDepthOfScreen(s)	((s)->root_depth)
+#define DefaultGCOfScreen(s)	((s)->default_gc)
+#define DefaultVisualOfScreen(s)((s)->root_visual)
+#define WidthOfScreen(s)	((s)->width)
+#define HeightOfScreen(s)	((s)->height)
+#define WidthMMOfScreen(s)	((s)->mwidth)
+#define HeightMMOfScreen(s)	((s)->mheight)
+#define PlanesOfScreen(s)	((s)->root_depth)
+#define CellsOfScreen(s)	(DefaultVisualOfScreen((s))->map_entries)
+#define MinCmapsOfScreen(s)	((s)->min_maps)
+#define MaxCmapsOfScreen(s)	((s)->max_maps)
+#define DoesSaveUnders(s)	((s)->save_unders)
+#define DoesBackingStore(s)	((s)->backing_store)
+#define EventMaskOfScreen(s)	((s)->root_input_mask)
+
+/*
+ * Extensions need a way to hang private data on some structures.
+ */
+typedef struct _XExtData {
+	int number;		/* number returned by XRegisterExtension */
+	struct _XExtData *next;	/* next item on list of data for structure */
+	int (*free_private)();	/* called to free private storage */
+	XPointer private_data;	/* data private to this extension. */
+} XExtData;
+
+/*
+ * This file contains structures used by the extension mechanism.
+ */
+typedef struct {		/* public to extension, cannot be changed */
+	int extension;		/* extension number */
+	int major_opcode;	/* major op-code assigned by server */
+	int first_event;	/* first event number for the extension */
+	int first_error;	/* first error number for the extension */
+} XExtCodes;
+
+/*
+ * Data structure for retrieving info about pixmap formats.
+ */
+
+typedef struct {
+    int depth;
+    int bits_per_pixel;
+    int scanline_pad;
+} XPixmapFormatValues;
+
+
+/*
+ * Data structure for setting graphics context.
+ */
+typedef struct {
+	int function;		/* logical operation */
+	unsigned long plane_mask;/* plane mask */
+	unsigned long foreground;/* foreground pixel */
+	unsigned long background;/* background pixel */
+	int line_width;		/* line width */
+	int line_style;	 	/* LineSolid, LineOnOffDash, LineDoubleDash */
+	int cap_style;	  	/* CapNotLast, CapButt,
+				   CapRound, CapProjecting */
+	int join_style;	 	/* JoinMiter, JoinRound, JoinBevel */
+	int fill_style;	 	/* FillSolid, FillTiled,
+				   FillStippled, FillOpaeueStippled */
+	int fill_rule;	  	/* EvenOddRule, WindingRule */
+	int arc_mode;		/* ArcChord, ArcPieSlice */
+	Pixmap tile;		/* tile pixmap for tiling operations */
+	Pixmap stipple;		/* stipple 1 plane pixmap for stipping */
+	int ts_x_origin;	/* offset for tile or stipple operations */
+	int ts_y_origin;
+        Font font;	        /* default text font for text operations */
+	int subwindow_mode;     /* ClipByChildren, IncludeInferiors */
+	Bool graphics_exposures;/* boolean, should exposures be generated */
+	int clip_x_origin;	/* origin for clipping */
+	int clip_y_origin;
+	Pixmap clip_mask;	/* bitmap clipping; other calls for rects */
+	int dash_offset;	/* patterned/dashed line information */
+	char dashes;
+} XGCValues;
+
+/*
+ * Graphics context.  The contents of this structure are implementation
+ * dependent.  A GC should be treated as opaque by application code.
+ */
+
+typedef XGCValues *GC;
+
+/*
+ * Visual structure; contains information about colormapping possible.
+ */
+typedef struct {
+	XExtData *ext_data;	/* hook for extension to hang data */
+	VisualID visualid;	/* visual id of this visual */
+#if defined(__cplusplus) || defined(c_plusplus)
+	int c_class;		/* C++ class of screen (monochrome, etc.) */
+#else
+	int class;		/* class of screen (monochrome, etc.) */
+#endif
+	unsigned long red_mask, green_mask, blue_mask;	/* mask values */
+	int bits_per_rgb;	/* log base 2 of distinct color values */
+	int map_entries;	/* color map entries */
+} Visual;
+
+/*
+ * Depth structure; contains information for each possible depth.
+ */
+typedef struct {
+	int depth;		/* this depth (Z) of the depth */
+	int nvisuals;		/* number of Visual types at this depth */
+	Visual *visuals;	/* list of visuals possible at this depth */
+} Depth;
+
+/*
+ * Information about the screen.  The contents of this structure are
+ * implementation dependent.  A Screen should be treated as opaque
+ * by application code.
+ */
+typedef struct {
+	XExtData *ext_data;	/* hook for extension to hang data */
+	struct _XDisplay *display;/* back pointer to display structure */
+	Window root;		/* Root window id. */
+	int width, height;	/* width and height of screen */
+	int mwidth, mheight;	/* width and height of  in millimeters */
+	int ndepths;		/* number of depths possible */
+	Depth *depths;		/* list of allowable depths on the screen */
+	int root_depth;		/* bits per pixel */
+	Visual *root_visual;	/* root visual */
+	GC default_gc;		/* GC for the root root visual */
+	Colormap cmap;		/* default color map */
+	unsigned long white_pixel;
+	unsigned long black_pixel;	/* White and Black pixel values */
+	int max_maps, min_maps;	/* max and min color maps */
+	int backing_store;	/* Never, WhenMapped, Always */
+	Bool save_unders;
+	long root_input_mask;	/* initial root input mask */
+} Screen;
+
+/*
+ * Format structure; describes ZFormat data the screen will understand.
+ */
+typedef struct {
+	XExtData *ext_data;	/* hook for extension to hang data */
+	int depth;		/* depth of this image format */
+	int bits_per_pixel;	/* bits/pixel at this depth */
+	int scanline_pad;	/* scanline must padded to this multiple */
+} ScreenFormat;
+
+/*
+ * Data structure for setting window attributes.
+ */
+typedef struct {
+    Pixmap background_pixmap;	/* background or None or ParentRelative */
+    unsigned long background_pixel;	/* background pixel */
+    Pixmap border_pixmap;	/* border of the window */
+    unsigned long border_pixel;	/* border pixel value */
+    int bit_gravity;		/* one of bit gravity values */
+    int win_gravity;		/* one of the window gravity values */
+    int backing_store;		/* NotUseful, WhenMapped, Always */
+    unsigned long backing_planes;/* planes to be preseved if possible */
+    unsigned long backing_pixel;/* value to use in restoring planes */
+    Bool save_under;		/* should bits under be saved? (popups) */
+    long event_mask;		/* set of events that should be saved */
+    long do_not_propagate_mask;	/* set of events that should not propagate */
+    Bool override_redirect;	/* boolean value for override-redirect */
+    Colormap colormap;		/* color map to be associated with window */
+    Cursor cursor;		/* cursor to be displayed (or None) */
+} XSetWindowAttributes;
+
+typedef struct {
+    int x, y;			/* location of window */
+    int width, height;		/* width and height of window */
+    int border_width;		/* border width of window */
+    int depth;          	/* depth of window */
+    Visual *visual;		/* the associated visual structure */
+    Window root;        	/* root of screen containing window */
+#if defined(__cplusplus) || defined(c_plusplus)
+    int c_class;		/* C++ InputOutput, InputOnly*/
+#else
+    int class;			/* InputOutput, InputOnly*/
+#endif
+    int bit_gravity;		/* one of bit gravity values */
+    int win_gravity;		/* one of the window gravity values */
+    int backing_store;		/* NotUseful, WhenMapped, Always */
+    unsigned long backing_planes;/* planes to be preserved if possible */
+    unsigned long backing_pixel;/* value to be used when restoring planes */
+    Bool save_under;		/* boolean, should bits under be saved? */
+    Colormap colormap;		/* color map to be associated with window */
+    Bool map_installed;		/* boolean, is color map currently installed*/
+    int map_state;		/* IsUnmapped, IsUnviewable, IsViewable */
+    long all_event_masks;	/* set of events all people have interest in*/
+    long your_event_mask;	/* my event mask */
+    long do_not_propagate_mask; /* set of events that should not propagate */
+    Bool override_redirect;	/* boolean value for override-redirect */
+    Screen *screen;		/* back pointer to correct screen */
+} XWindowAttributes;
+
+/*
+ * Data structure for host setting; getting routines.
+ *
+ */
+
+typedef struct {
+	int family;		/* for example FamilyInternet */
+	int length;		/* length of address, in bytes */
+	char *address;		/* pointer to where to find the bytes */
+} XHostAddress;
+
+/*
+ * Data structure for "image" data, used by image manipulation routines.
+ */
+typedef struct _XImage {
+    int width, height;		/* size of image */
+    int xoffset;		/* number of pixels offset in X direction */
+    int format;			/* XYBitmap, XYPixmap, ZPixmap */
+    char *data;			/* pointer to image data */
+    int byte_order;		/* data byte order, LSBFirst, MSBFirst */
+    int bitmap_unit;		/* quant. of scanline 8, 16, 32 */
+    int bitmap_bit_order;	/* LSBFirst, MSBFirst */
+    int bitmap_pad;		/* 8, 16, 32 either XY or ZPixmap */
+    int depth;			/* depth of image */
+    int bytes_per_line;		/* accelarator to next line */
+    int bits_per_pixel;		/* bits per pixel (ZPixmap) */
+    unsigned long red_mask;	/* bits in z arrangment */
+    unsigned long green_mask;
+    unsigned long blue_mask;
+    XPointer obdata;		/* hook for the object routines to hang on */
+    struct funcs {		/* image manipulation routines */
+	struct _XImage *(*create_image)();
+#if NeedFunctionPrototypes
+	int (*destroy_image)        (struct _XImage *);
+	unsigned long (*get_pixel)  (struct _XImage *, int, int);
+	int (*put_pixel)            (struct _XImage *, int, int, unsigned long);
+	struct _XImage *(*sub_image)(struct _XImage *, int, int, unsigned int, unsigned int);
+	int (*add_pixel)            (struct _XImage *, long);
+#else
+	int (*destroy_image)();
+	unsigned long (*get_pixel)();
+	int (*put_pixel)();
+	struct _XImage *(*sub_image)();
+	int (*add_pixel)();
+#endif
+	} f;
+} XImage;
+
+/*
+ * Data structure for XReconfigureWindow
+ */
+typedef struct {
+    int x, y;
+    int width, height;
+    int border_width;
+    Window sibling;
+    int stack_mode;
+} XWindowChanges;
+
+/*
+ * Data structure used by color operations
+ */
+typedef struct {
+	unsigned long pixel;
+	unsigned short red, green, blue;
+	char flags;  /* do_red, do_green, do_blue */
+	char pad;
+} XColor;
+
+/*
+ * Data structures for graphics operations.  On most machines, these are
+ * congruent with the wire protocol structures, so reformatting the data
+ * can be avoided on these architectures.
+ */
+typedef struct {
+    short x1, y1, x2, y2;
+} XSegment;
+
+typedef struct {
+    short x, y;
+} XPoint;
+
+typedef struct {
+    short x, y;
+    unsigned short width, height;
+} XRectangle;
+
+typedef struct {
+    short x, y;
+    unsigned short width, height;
+    short angle1, angle2;
+} XArc;
+
+
+/* Data structure for XChangeKeyboardControl */
+
+typedef struct {
+        int key_click_percent;
+        int bell_percent;
+        int bell_pitch;
+        int bell_duration;
+        int led;
+        int led_mode;
+        int key;
+        int auto_repeat_mode;   /* On, Off, Default */
+} XKeyboardControl;
+
+/* Data structure for XGetKeyboardControl */
+
+typedef struct {
+        int key_click_percent;
+	int bell_percent;
+	unsigned int bell_pitch, bell_duration;
+	unsigned long led_mask;
+	int global_auto_repeat;
+	char auto_repeats[32];
+} XKeyboardState;
+
+/* Data structure for XGetMotionEvents.  */
+
+typedef struct {
+        Time time;
+	short x, y;
+} XTimeCoord;
+
+/* Data structure for X{Set,Get}ModifierMapping */
+
+typedef struct {
+ 	int max_keypermod;	/* The server's max # of keys per modifier */
+ 	KeyCode *modifiermap;	/* An 8 by max_keypermod array of modifiers */
+} XModifierKeymap;
+
+
+/*
+ * Display datatype maintaining display specific data.
+ * The contents of this structure are implementation dependent.
+ * A Display should be treated as opaque by application code.
+ */
+typedef struct _XDisplay {
+	XExtData *ext_data;	/* hook for extension to hang data */
+	struct _XFreeFuncs *free_funcs; /* internal free functions */
+	int fd;			/* Network socket. */
+	int conn_checker;         /* ugly thing used by _XEventsQueued */
+	int proto_major_version;/* maj. version of server's X protocol */
+	int proto_minor_version;/* minor version of servers X protocol */
+	char *vendor;		/* vendor of the server hardware */
+        XID resource_base;	/* resource ID base */
+	XID resource_mask;	/* resource ID mask bits */
+	XID resource_id;	/* allocator current ID */
+	int resource_shift;	/* allocator shift to correct bits */
+	XID (*resource_alloc)(); /* allocator function */
+	int byte_order;		/* screen byte order, LSBFirst, MSBFirst */
+	int bitmap_unit;	/* padding and data requirements */
+	int bitmap_pad;		/* padding requirements on bitmaps */
+	int bitmap_bit_order;	/* LeastSignificant or MostSignificant */
+	int nformats;		/* number of pixmap formats in list */
+	ScreenFormat *pixmap_format;	/* pixmap format list */
+	int vnumber;		/* Xlib's X protocol version number. */
+	int release;		/* release of the server */
+	struct _XSQEvent *head, *tail;	/* Input event queue. */
+	int qlen;		/* Length of input event queue */
+	unsigned long request;	/* sequence number of last request. */
+	char *last_req;		/* beginning of last request, or dummy */
+	char *buffer;		/* Output buffer starting address. */
+	char *bufptr;		/* Output buffer index pointer. */
+	char *bufmax;		/* Output buffer maximum+1 address. */
+	unsigned max_request_size; /* maximum number 32 bit words in request*/
+	struct _XrmHashBucketRec *db;
+	int (*synchandler)();	/* Synchronization handler */
+	char *display_name;	/* "host:display" string used on this connect*/
+	int default_screen;	/* default screen for operations */
+	int nscreens;		/* number of screens on this server*/
+	Screen *screens;	/* pointer to list of screens */
+	unsigned long motion_buffer;	/* size of motion buffer */
+	unsigned long flags;	/* internal connection flags */
+	int min_keycode;	/* minimum defined keycode */
+	int max_keycode;	/* maximum defined keycode */
+	KeySym *keysyms;	/* This server's keysyms */
+	XModifierKeymap *modifiermap;	/* This server's modifier keymap */
+	int keysyms_per_keycode;/* number of rows */
+	char *xdefaults;	/* contents of defaults from server */
+	char *scratch_buffer;	/* place to hang scratch buffer */
+	unsigned long scratch_length;	/* length of scratch buffer */
+	int ext_number;		/* extension number on this display */
+	struct _XExten *ext_procs; /* extensions initialized on this display */
+	/*
+	 * the following can be fixed size, as the protocol defines how
+	 * much address space is available.
+	 * While this could be done using the extension vector, there
+	 * may be MANY events processed, so a search through the extension
+	 * list to find the right procedure for each event might be
+	 * expensive if many extensions are being used.
+	 */
+	Bool (*event_vec[128])();  /* vector for wire to event */
+	Status (*wire_vec[128])(); /* vector for event to wire */
+	KeySym lock_meaning;	   /* for XLookupString */
+	struct _XLockInfo *lock;   /* multi-thread state, display lock */
+	struct _XInternalAsync *async_handlers; /* for internal async */
+	unsigned long bigreq_size; /* max size of big requests */
+	struct _XLockPtrs *lock_fns; /* pointers to threads functions */
+	/* things above this line should not move, for binary compatibility */
+	struct _XKeytrans *key_bindings; /* for XLookupString */
+	Font cursor_font;	   /* for XCreateFontCursor */
+	struct _XDisplayAtoms *atoms; /* for XInternAtom */
+	unsigned int mode_switch;  /* keyboard group modifiers */
+	struct _XContextDB *context_db; /* context database */
+	Bool (**error_vec)();      /* vector for wire to error */
+	/*
+	 * Xcms information
+	 */
+	struct {
+	   XPointer defaultCCCs;  /* pointer to an array of default XcmsCCC */
+	   XPointer clientCmaps;  /* pointer to linked list of XcmsCmapRec */
+	   XPointer perVisualIntensityMaps;
+				  /* linked list of XcmsIntensityMap */
+	} cms;
+	struct _XIMFilter *im_filters;
+	struct _XSQEvent *qfree; /* unallocated event queue elements */
+	unsigned long next_event_serial_num; /* inserted into next queue elt */
+	int (*savedsynchandler)(); /* user synchandler when Xlib usurps */
+} Display;
+
+#if NeedFunctionPrototypes	/* prototypes require event type definitions */
+#undef _XEVENT_
+#endif
+#ifndef _XEVENT_
+
+#define XMaxTransChars 4
+
+/*
+ * Definitions of specific events.
+ */
+typedef struct {
+	int type;		/* of event */
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;	        /* "event" window it is reported relative to */
+	Window root;	        /* root window that the event occured on */
+	Window subwindow;	/* child window */
+	Time time;		/* milliseconds */
+	int x, y;		/* pointer x, y coordinates in event window */
+	int x_root, y_root;	/* coordinates relative to root */
+	unsigned int state;	/* key or button mask */
+	unsigned int keycode;	/* detail */
+	Bool same_screen;	/* same screen flag */
+        char trans_chars[XMaxTransChars];
+				/* translated characters */
+	int nbytes;
+} XKeyEvent;
+typedef XKeyEvent XKeyPressedEvent;
+typedef XKeyEvent XKeyReleasedEvent;
+
+typedef struct {
+	int type;		/* of event */
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;	        /* "event" window it is reported relative to */
+	Window root;	        /* root window that the event occured on */
+	Window subwindow;	/* child window */
+	Time time;		/* milliseconds */
+	int x, y;		/* pointer x, y coordinates in event window */
+	int x_root, y_root;	/* coordinates relative to root */
+	unsigned int state;	/* key or button mask */
+	unsigned int button;	/* detail */
+	Bool same_screen;	/* same screen flag */
+} XButtonEvent;
+typedef XButtonEvent XButtonPressedEvent;
+typedef XButtonEvent XButtonReleasedEvent;
+
+typedef struct {
+	int type;		/* of event */
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;	        /* "event" window reported relative to */
+	Window root;	        /* root window that the event occured on */
+	Window subwindow;	/* child window */
+	Time time;		/* milliseconds */
+	int x, y;		/* pointer x, y coordinates in event window */
+	int x_root, y_root;	/* coordinates relative to root */
+	unsigned int state;	/* key or button mask */
+	char is_hint;		/* detail */
+	Bool same_screen;	/* same screen flag */
+} XMotionEvent;
+typedef XMotionEvent XPointerMovedEvent;
+
+typedef struct {
+	int type;		/* of event */
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;	        /* "event" window reported relative to */
+	Window root;	        /* root window that the event occured on */
+	Window subwindow;	/* child window */
+	Time time;		/* milliseconds */
+	int x, y;		/* pointer x, y coordinates in event window */
+	int x_root, y_root;	/* coordinates relative to root */
+	int mode;		/* NotifyNormal, NotifyGrab, NotifyUngrab */
+	int detail;
+	/*
+	 * NotifyAncestor, NotifyVirtual, NotifyInferior,
+	 * NotifyNonlinear,NotifyNonlinearVirtual
+	 */
+	Bool same_screen;	/* same screen flag */
+	Bool focus;		/* boolean focus */
+	unsigned int state;	/* key or button mask */
+} XCrossingEvent;
+typedef XCrossingEvent XEnterWindowEvent;
+typedef XCrossingEvent XLeaveWindowEvent;
+
+typedef struct {
+	int type;		/* FocusIn or FocusOut */
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;		/* window of event */
+	int mode;		/* NotifyNormal, NotifyGrab, NotifyUngrab */
+	int detail;
+	/*
+	 * NotifyAncestor, NotifyVirtual, NotifyInferior,
+	 * NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer,
+	 * NotifyPointerRoot, NotifyDetailNone
+	 */
+} XFocusChangeEvent;
+typedef XFocusChangeEvent XFocusInEvent;
+typedef XFocusChangeEvent XFocusOutEvent;
+
+/* generated on EnterWindow and FocusIn  when KeyMapState selected */
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;
+	char key_vector[32];
+} XKeymapEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;
+	int x, y;
+	int width, height;
+	int count;		/* if non-zero, at least this many more */
+} XExposeEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Drawable drawable;
+	int x, y;
+	int width, height;
+	int count;		/* if non-zero, at least this many more */
+	int major_code;		/* core is CopyArea or CopyPlane */
+	int minor_code;		/* not defined in the core */
+} XGraphicsExposeEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Drawable drawable;
+	int major_code;		/* core is CopyArea or CopyPlane */
+	int minor_code;		/* not defined in the core */
+} XNoExposeEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;
+	int state;		/* Visibility state */
+} XVisibilityEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window parent;		/* parent of the window */
+	Window window;		/* window id of window created */
+	int x, y;		/* window location */
+	int width, height;	/* size of window */
+	int border_width;	/* border width */
+	Bool override_redirect;	/* creation should be overridden */
+} XCreateWindowEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window event;
+	Window window;
+} XDestroyWindowEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window event;
+	Window window;
+	Bool from_configure;
+} XUnmapEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window event;
+	Window window;
+	Bool override_redirect;	/* boolean, is override set... */
+} XMapEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window parent;
+	Window window;
+} XMapRequestEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window event;
+	Window window;
+	Window parent;
+	int x, y;
+	Bool override_redirect;
+} XReparentEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window event;
+	Window window;
+	int x, y;
+	int width, height;
+	int border_width;
+	Window above;
+	Bool override_redirect;
+} XConfigureEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window event;
+	Window window;
+	int x, y;
+} XGravityEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;
+	int width, height;
+} XResizeRequestEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window parent;
+	Window window;
+	int x, y;
+	int width, height;
+	int border_width;
+	Window above;
+	int detail;		/* Above, Below, TopIf, BottomIf, Opposite */
+	unsigned long value_mask;
+} XConfigureRequestEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window event;
+	Window window;
+	int place;		/* PlaceOnTop, PlaceOnBottom */
+} XCirculateEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window parent;
+	Window window;
+	int place;		/* PlaceOnTop, PlaceOnBottom */
+} XCirculateRequestEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;
+	Atom atom;
+	Time time;
+	int state;		/* NewValue, Deleted */
+} XPropertyEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;
+	Atom selection;
+	Time time;
+} XSelectionClearEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window owner;
+	Window requestor;
+	Atom selection;
+	Atom target;
+	Atom property;
+	Time time;
+} XSelectionRequestEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window requestor;
+	Atom selection;
+	Atom target;
+	Atom property;		/* ATOM or None */
+	Time time;
+} XSelectionEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;
+	Colormap colormap;	/* COLORMAP or None */
+#if defined(__cplusplus) || defined(c_plusplus)
+	Bool c_new;		/* C++ */
+#else
+	Bool new;
+#endif
+	int state;		/* ColormapInstalled, ColormapUninstalled */
+} XColormapEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;
+	Atom message_type;
+	int format;
+	union {
+		char b[20];
+		short s[10];
+		long l[5];
+		} data;
+} XClientMessageEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;		/* unused */
+	int request;		/* one of MappingModifier, MappingKeyboard,
+				   MappingPointer */
+	int first_keycode;	/* first keycode */
+	int count;		/* defines range of change w. first_keycode*/
+} XMappingEvent;
+
+typedef struct {
+	int type;
+	Display *display;	/* Display the event was read from */
+	XID resourceid;		/* resource id */
+	unsigned long serial;	/* serial number of failed request */
+	unsigned char error_code;	/* error code of failed request */
+	unsigned char request_code;	/* Major op-code of failed request */
+	unsigned char minor_code;	/* Minor op-code of failed request */
+} XErrorEvent;
+
+typedef struct {
+	int type;
+	unsigned long serial;	/* # of last request processed by server */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;/* Display the event was read from */
+	Window window;	/* window on which event was requested in event mask */
+} XAnyEvent;
+
+/*
+ * this union is defined so Xlib can always use the same sized
+ * event structure internally, to avoid memory fragmentation.
+ */
+typedef union _XEvent {
+        int type;		/* must not be changed; first element */
+	XAnyEvent xany;
+	XKeyEvent xkey;
+	XButtonEvent xbutton;
+	XMotionEvent xmotion;
+	XCrossingEvent xcrossing;
+	XFocusChangeEvent xfocus;
+	XExposeEvent xexpose;
+	XGraphicsExposeEvent xgraphicsexpose;
+	XNoExposeEvent xnoexpose;
+	XVisibilityEvent xvisibility;
+	XCreateWindowEvent xcreatewindow;
+	XDestroyWindowEvent xdestroywindow;
+	XUnmapEvent xunmap;
+	XMapEvent xmap;
+	XMapRequestEvent xmaprequest;
+	XReparentEvent xreparent;
+	XConfigureEvent xconfigure;
+	XGravityEvent xgravity;
+	XResizeRequestEvent xresizerequest;
+	XConfigureRequestEvent xconfigurerequest;
+	XCirculateEvent xcirculate;
+	XCirculateRequestEvent xcirculaterequest;
+	XPropertyEvent xproperty;
+	XSelectionClearEvent xselectionclear;
+	XSelectionRequestEvent xselectionrequest;
+	XSelectionEvent xselection;
+	XColormapEvent xcolormap;
+	XClientMessageEvent xclient;
+	XMappingEvent xmapping;
+	XErrorEvent xerror;
+	XKeymapEvent xkeymap;
+	long pad[24];
+} XEvent;
+#endif
+
+#define XAllocID(dpy) ((*(dpy)->resource_alloc)((dpy)))
+
+/*
+ * per character font metric information.
+ */
+typedef struct {
+    short	lbearing;	/* origin to left edge of raster */
+    short	rbearing;	/* origin to right edge of raster */
+    short	width;		/* advance to next char's origin */
+    short	ascent;		/* baseline to top edge of raster */
+    short	descent;	/* baseline to bottom edge of raster */
+    unsigned short attributes;	/* per char flags (not predefined) */
+} XCharStruct;
+
+/*
+ * To allow arbitrary information with fonts, there are additional properties
+ * returned.
+ */
+typedef struct {
+    Atom name;
+    unsigned long card32;
+} XFontProp;
+
+typedef struct {
+    XExtData	*ext_data;	/* hook for extension to hang data */
+    Font        fid;            /* Font id for this font */
+    unsigned	direction;	/* hint about direction the font is painted */
+    unsigned	min_char_or_byte2;/* first character */
+    unsigned	max_char_or_byte2;/* last character */
+    unsigned	min_byte1;	/* first row that exists */
+    unsigned	max_byte1;	/* last row that exists */
+    Bool	all_chars_exist;/* flag if all characters have non-zero size*/
+    unsigned	default_char;	/* char to print for undefined character */
+    int         n_properties;   /* how many properties there are */
+    XFontProp	*properties;	/* pointer to array of additional properties*/
+    XCharStruct	min_bounds;	/* minimum bounds over all existing char*/
+    XCharStruct	max_bounds;	/* maximum bounds over all existing char*/
+    XCharStruct	*per_char;	/* first_char to last_char information */
+    int		ascent;		/* log. extent above baseline for spacing */
+    int		descent;	/* log. descent below baseline for spacing */
+} XFontStruct;
+
+/*
+ * PolyText routines take these as arguments.
+ */
+typedef struct {
+    char *chars;		/* pointer to string */
+    int nchars;			/* number of characters */
+    int delta;			/* delta between strings */
+    Font font;			/* font to print it in, None don't change */
+} XTextItem;
+
+typedef struct {		/* normal 16 bit characters are two bytes */
+    unsigned char byte1;
+    unsigned char byte2;
+} XChar2b;
+
+typedef struct {
+    XChar2b *chars;		/* two byte characters */
+    int nchars;			/* number of characters */
+    int delta;			/* delta between strings */
+    Font font;			/* font to print it in, None don't change */
+} XTextItem16;
+
+
+typedef union { Display *display;
+		GC gc;
+		Visual *visual;
+		Screen *screen;
+		ScreenFormat *pixmap_format;
+		XFontStruct *font; } XEDataObject;
+
+typedef struct {
+    XRectangle      max_ink_extent;
+    XRectangle      max_logical_extent;
+} XFontSetExtents;
+
+typedef struct _XFontSet *XFontSet;
+
+typedef struct {
+    char           *chars;
+    int             nchars;
+    int             delta;
+    XFontSet        font_set;
+} XmbTextItem;
+
+typedef struct {
+    wchar_t        *chars;
+    int             nchars;
+    int             delta;
+    XFontSet        font_set;
+} XwcTextItem;
+
+typedef void (*XIMProc)();
+
+typedef struct _XIM *XIM;
+typedef struct _XIC *XIC;
+
+typedef unsigned long XIMStyle;
+
+typedef struct {
+    unsigned short count_styles;
+    XIMStyle *supported_styles;
+} XIMStyles;
+
+#define XIMPreeditArea		0x0001L
+#define XIMPreeditCallbacks	0x0002L
+#define XIMPreeditPosition	0x0004L
+#define XIMPreeditNothing	0x0008L
+#define XIMPreeditNone		0x0010L
+#define XIMStatusArea		0x0100L
+#define XIMStatusCallbacks	0x0200L
+#define XIMStatusNothing	0x0400L
+#define XIMStatusNone		0x0800L
+
+#define XNVaNestedList "XNVaNestedList"
+#define XNClientWindow "clientWindow"
+#define XNInputStyle "inputStyle"
+#define XNFocusWindow "focusWindow"
+#define XNResourceName "resourceName"
+#define XNResourceClass "resourceClass"
+#define XNGeometryCallback "geometryCallback"
+#define XNFilterEvents "filterEvents"
+#define XNPreeditStartCallback "preeditStartCallback"
+#define XNPreeditDoneCallback "preeditDoneCallback"
+#define XNPreeditDrawCallback "preeditDrawCallback"
+#define XNPreeditCaretCallback "preeditCaretCallback"
+#define XNPreeditAttributes "preeditAttributes"
+#define XNStatusStartCallback "statusStartCallback"
+#define XNStatusDoneCallback "statusDoneCallback"
+#define XNStatusDrawCallback "statusDrawCallback"
+#define XNStatusAttributes "statusAttributes"
+#define XNArea "area"
+#define XNAreaNeeded "areaNeeded"
+#define XNSpotLocation "spotLocation"
+#define XNColormap "colorMap"
+#define XNStdColormap "stdColorMap"
+#define XNForeground "foreground"
+#define XNBackground "background"
+#define XNBackgroundPixmap "backgroundPixmap"
+#define XNFontSet "fontSet"
+#define XNLineSpace "lineSpace"
+#define XNCursor "cursor"
+
+#define XBufferOverflow		-1
+#define XLookupNone		1
+#define XLookupChars		2
+#define XLookupKeySym		3
+#define XLookupBoth		4
+
+#if NeedFunctionPrototypes
+typedef void *XVaNestedList;
+#else
+typedef XPointer XVaNestedList;
+#endif
+
+typedef struct {
+    XPointer client_data;
+    XIMProc callback;
+} XIMCallback;
+
+typedef unsigned long XIMFeedback;
+
+#define XIMReverse	1
+#define XIMUnderline	(1<<1)
+#define XIMHighlight	(1<<2)
+#define XIMPrimary 	(1<<5)
+#define XIMSecondary	(1<<6)
+#define XIMTertiary 	(1<<7)
+
+typedef struct _XIMText {
+    unsigned short length;
+    XIMFeedback *feedback;
+    Bool encoding_is_wchar;
+    union {
+	char *multi_byte;
+	wchar_t *wide_char;
+    } string;
+} XIMText;
+
+typedef struct _XIMPreeditDrawCallbackStruct {
+    int caret;		/* Cursor offset within pre-edit string */
+    int chg_first;	/* Starting change position */
+    int chg_length;	/* Length of the change in character count */
+    XIMText *text;
+} XIMPreeditDrawCallbackStruct;
+
+typedef enum {
+    XIMForwardChar, XIMBackwardChar,
+    XIMForwardWord, XIMBackwardWord,
+    XIMCaretUp, XIMCaretDown,
+    XIMNextLine, XIMPreviousLine,
+    XIMLineStart, XIMLineEnd,
+    XIMAbsolutePosition,
+    XIMDontChange
+} XIMCaretDirection;
+
+typedef enum {
+    XIMIsInvisible,	/* Disable caret feedback */
+    XIMIsPrimary,	/* UI defined caret feedback */
+    XIMIsSecondary	/* UI defined caret feedback */
+} XIMCaretStyle;
+
+typedef struct _XIMPreeditCaretCallbackStruct {
+    int position;		 /* Caret offset within pre-edit string */
+    XIMCaretDirection direction; /* Caret moves direction */
+    XIMCaretStyle style;	 /* Feedback of the caret */
+} XIMPreeditCaretCallbackStruct;
+
+typedef enum {
+    XIMTextType,
+    XIMBitmapType
+} XIMStatusDataType;
+
+typedef struct _XIMStatusDrawCallbackStruct {
+    XIMStatusDataType type;
+    union {
+	XIMText *text;
+	Pixmap  bitmap;
+    } data;
+} XIMStatusDrawCallbackStruct;
+
+typedef int (*XErrorHandler) (	    /* WARNING, this type not in Xlib spec */
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    XErrorEvent*	/* error_event */
+#endif
+);
+
+_XFUNCPROTOBEGIN
+
+
+
+#include "tkIntXlibDecls.h"
+
+_XFUNCPROTOEND
+
+#if defined(MAC_OSX_TK)
+#   undef Cursor
+#   undef Region
+#endif
+
+#endif /* _XLIB_H_ */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/Xutil.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/Xutil.h
new file mode 100644
index 00000000..58124b04
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/Xutil.h
@@ -0,0 +1,855 @@
+/* $XConsortium: Xutil.h,v 11.73 91/07/30 16:21:37 rws Exp $ */
+
+/***********************************************************
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital or MIT not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+#ifndef _XUTIL_H_
+#define _XUTIL_H_
+
+/* You must include <X11/Xlib.h> before including this file */
+
+#if defined(MAC_OSX_TK)
+#   define Region XRegion
+#endif
+
+/*
+ * Bitmask returned by XParseGeometry().  Each bit tells if the corresponding
+ * value (x, y, width, height) was found in the parsed string.
+ */
+#define NoValue		0x0000
+#define XValue  	0x0001
+#define YValue		0x0002
+#define WidthValue  	0x0004
+#define HeightValue  	0x0008
+#define AllValues 	0x000F
+#define XNegative 	0x0010
+#define YNegative 	0x0020
+
+/*
+ * new version containing base_width, base_height, and win_gravity fields;
+ * used with WM_NORMAL_HINTS.
+ */
+typedef struct {
+    	long flags;	/* marks which fields in this structure are defined */
+	int x, y;		/* obsolete for new window mgrs, but clients */
+	int width, height;	/* should set so old wm's don't mess up */
+	int min_width, min_height;
+	int max_width, max_height;
+    	int width_inc, height_inc;
+	struct {
+		int x;	/* numerator */
+		int y;	/* denominator */
+	} min_aspect, max_aspect;
+	int base_width, base_height;		/* added by ICCCM version 1 */
+	int win_gravity;			/* added by ICCCM version 1 */
+} XSizeHints;
+
+/*
+ * The next block of definitions are for window manager properties that
+ * clients and applications use for communication.
+ */
+
+/* flags argument in size hints */
+#define USPosition	(1L << 0) /* user specified x, y */
+#define USSize		(1L << 1) /* user specified width, height */
+
+#define PPosition	(1L << 2) /* program specified position */
+#define PSize		(1L << 3) /* program specified size */
+#define PMinSize	(1L << 4) /* program specified minimum size */
+#define PMaxSize	(1L << 5) /* program specified maximum size */
+#define PResizeInc	(1L << 6) /* program specified resize increments */
+#define PAspect		(1L << 7) /* program specified min and max aspect ratios */
+#define PBaseSize	(1L << 8) /* program specified base for incrementing */
+#define PWinGravity	(1L << 9) /* program specified window gravity */
+
+/* obsolete */
+#define PAllHints (PPosition|PSize|PMinSize|PMaxSize|PResizeInc|PAspect)
+
+
+
+typedef struct {
+	long flags;	/* marks which fields in this structure are defined */
+	Bool input;	/* does this application rely on the window manager to
+			get keyboard input? */
+	int initial_state;	/* see below */
+	Pixmap icon_pixmap;	/* pixmap to be used as icon */
+	Window icon_window; 	/* window to be used as icon */
+	int icon_x, icon_y; 	/* initial position of icon */
+	Pixmap icon_mask;	/* icon mask bitmap */
+	XID window_group;	/* id of related window group */
+	/* this structure may be extended in the future */
+} XWMHints;
+
+/* definition for flags of XWMHints */
+
+#define InputHint 		(1L << 0)
+#define StateHint 		(1L << 1)
+#define IconPixmapHint		(1L << 2)
+#define IconWindowHint		(1L << 3)
+#define IconPositionHint 	(1L << 4)
+#define IconMaskHint		(1L << 5)
+#define WindowGroupHint		(1L << 6)
+#define AllHints (InputHint|StateHint|IconPixmapHint|IconWindowHint| \
+IconPositionHint|IconMaskHint|WindowGroupHint)
+
+/* definitions for initial window state */
+#define WithdrawnState 0	/* for windows that are not mapped */
+#define NormalState 1	/* most applications want to start this way */
+#define IconicState 3	/* application wants to start as an icon */
+
+/*
+ * Obsolete states no longer defined by ICCCM
+ */
+#define DontCareState 0	/* don't know or care */
+#define ZoomState 2	/* application wants to start zoomed */
+#define InactiveState 4	/* application believes it is seldom used; */
+			/* some wm's may put it on inactive menu */
+
+
+/*
+ * new structure for manipulating TEXT properties; used with WM_NAME,
+ * WM_ICON_NAME, WM_CLIENT_MACHINE, and WM_COMMAND.
+ */
+typedef struct {
+    unsigned char *value;		/* same as Property routines */
+    Atom encoding;			/* prop type */
+    int format;				/* prop data format: 8, 16, or 32 */
+    unsigned long nitems;		/* number of data items in value */
+} XTextProperty;
+
+#define XNoMemory -1
+#define XLocaleNotSupported -2
+#define XConverterNotFound -3
+
+typedef enum {
+    XStringStyle,		/* STRING */
+    XCompoundTextStyle,		/* COMPOUND_TEXT */
+    XTextStyle,			/* text in owner's encoding (current locale)*/
+    XStdICCTextStyle		/* STRING, else COMPOUND_TEXT */
+} XICCEncodingStyle;
+
+typedef struct {
+	int min_width, min_height;
+	int max_width, max_height;
+	int width_inc, height_inc;
+} XIconSize;
+
+typedef struct {
+	char *res_name;
+	char *res_class;
+} XClassHint;
+
+/*
+ * These macros are used to give some sugar to the image routines so that
+ * naive people are more comfortable with them.
+ */
+#define XDestroyImage(ximage) \
+	((*((ximage)->f.destroy_image))((ximage)))
+#define XGetPixel(ximage, x, y) \
+	((*((ximage)->f.get_pixel))((ximage), (x), (y)))
+#define XPutPixel(ximage, x, y, pixel) \
+	((*((ximage)->f.put_pixel))((ximage), (x), (y), (pixel)))
+#define XSubImage(ximage, x, y, width, height)  \
+	((*((ximage)->f.sub_image))((ximage), (x), (y), (width), (height)))
+#define XAddPixel(ximage, value) \
+	((*((ximage)->f.add_pixel))((ximage), (value)))
+
+/*
+ * Compose sequence status structure, used in calling XLookupString.
+ */
+typedef struct _XComposeStatus {
+    XPointer compose_ptr;	/* state table pointer */
+    int chars_matched;		/* match state */
+} XComposeStatus;
+
+/*
+ * Keysym macros, used on Keysyms to test for classes of symbols
+ */
+#define IsKeypadKey(keysym) \
+  (((unsigned)(keysym) >= XK_KP_Space) && ((unsigned)(keysym) <= XK_KP_Equal))
+
+#define IsCursorKey(keysym) \
+  (((unsigned)(keysym) >= XK_Home)     && ((unsigned)(keysym) <  XK_Select))
+
+#define IsPFKey(keysym) \
+  (((unsigned)(keysym) >= XK_KP_F1)     && ((unsigned)(keysym) <= XK_KP_F4))
+
+#define IsFunctionKey(keysym) \
+  (((unsigned)(keysym) >= XK_F1)       && ((unsigned)(keysym) <= XK_F35))
+
+#define IsMiscFunctionKey(keysym) \
+  (((unsigned)(keysym) >= XK_Select)   && ((unsigned)(keysym) <= XK_Break))
+
+#define IsModifierKey(keysym) \
+  ((((unsigned)(keysym) >= XK_Shift_L) && ((unsigned)(keysym) <= XK_Hyper_R)) \
+   || ((unsigned)(keysym) == XK_Mode_switch) \
+   || ((unsigned)(keysym) == XK_Num_Lock))
+/*
+ * opaque reference to Region data type
+ */
+typedef struct _XRegion *Region;
+
+/* Return values from XRectInRegion() */
+
+#define RectangleOut 0
+#define RectangleIn  1
+#define RectanglePart 2
+
+
+/*
+ * Information used by the visual utility routines to find desired visual
+ * type from the many visuals a display may support.
+ */
+
+typedef struct {
+  Visual *visual;
+  VisualID visualid;
+  int screen;
+  int depth;
+#if defined(__cplusplus) || defined(c_plusplus)
+  int c_class;					/* C++ */
+#else
+  int class;
+#endif
+  unsigned long red_mask;
+  unsigned long green_mask;
+  unsigned long blue_mask;
+  int colormap_size;
+  int bits_per_rgb;
+} XVisualInfo;
+
+#define VisualNoMask		0x0
+#define VisualIDMask 		0x1
+#define VisualScreenMask	0x2
+#define VisualDepthMask		0x4
+#define VisualClassMask		0x8
+#define VisualRedMaskMask	0x10
+#define VisualGreenMaskMask	0x20
+#define VisualBlueMaskMask	0x40
+#define VisualColormapSizeMask	0x80
+#define VisualBitsPerRGBMask	0x100
+#define VisualAllMask		0x1FF
+
+/*
+ * This defines a window manager property that clients may use to
+ * share standard color maps of type RGB_COLOR_MAP:
+ */
+typedef struct {
+	Colormap colormap;
+	unsigned long red_max;
+	unsigned long red_mult;
+	unsigned long green_max;
+	unsigned long green_mult;
+	unsigned long blue_max;
+	unsigned long blue_mult;
+	unsigned long base_pixel;
+	VisualID visualid;		/* added by ICCCM version 1 */
+	XID killid;			/* added by ICCCM version 1 */
+} XStandardColormap;
+
+#define ReleaseByFreeingColormap ((XID) 1L)  /* for killid field above */
+
+
+/*
+ * return codes for XReadBitmapFile and XWriteBitmapFile
+ */
+#define BitmapSuccess		0
+#define BitmapOpenFailed 	1
+#define BitmapFileInvalid 	2
+#define BitmapNoMemory		3
+
+/****************************************************************
+ *
+ * Context Management
+ *
+ ****************************************************************/
+
+
+/* Associative lookup table return codes */
+
+#define XCSUCCESS 0	/* No error. */
+#define XCNOMEM   1    /* Out of memory */
+#define XCNOENT   2    /* No entry in table */
+
+typedef int XContext;
+
+#define XUniqueContext()       ((XContext) XrmUniqueQuark())
+#define XStringToContext(string)   ((XContext) XrmStringToQuark(string))
+
+_XFUNCPROTOBEGIN
+
+/* The following declarations are alphabetized. */
+
+extern XClassHint *XAllocClassHint (
+#if NeedFunctionPrototypes
+    void
+#endif
+);
+
+extern XIconSize *XAllocIconSize (
+#if NeedFunctionPrototypes
+    void
+#endif
+);
+
+extern XSizeHints *XAllocSizeHints (
+#if NeedFunctionPrototypes
+    void
+#endif
+);
+
+extern XStandardColormap *XAllocStandardColormap (
+#if NeedFunctionPrototypes
+    void
+#endif
+);
+
+extern XWMHints *XAllocWMHints (
+#if NeedFunctionPrototypes
+    void
+#endif
+);
+
+extern void XClipBox(
+#if NeedFunctionPrototypes
+    Region		/* r */,
+    XRectangle*		/* rect_return */
+#endif
+);
+
+extern Region XCreateRegion(
+#if NeedFunctionPrototypes
+    void
+#endif
+);
+
+extern char *XDefaultString(
+#if NeedFunctionPrototypes
+    void
+#endif
+);
+
+extern int XDeleteContext(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    XID			/* rid */,
+    XContext		/* context */
+#endif
+);
+
+extern void XDestroyRegion(
+#if NeedFunctionPrototypes
+    Region		/* r */
+#endif
+);
+
+extern Bool XEmptyRegion(
+#if NeedFunctionPrototypes
+    Region		/* r */
+#endif
+);
+
+extern Bool XEqualRegion(
+#if NeedFunctionPrototypes
+    Region		/* r1 */,
+    Region		/* r2 */
+#endif
+);
+
+extern int XFindContext(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    XID			/* rid */,
+    XContext		/* context */,
+    XPointer*		/* data_return */
+#endif
+);
+
+extern Status XGetClassHint(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XClassHint*		/* class_hints_return */
+#endif
+);
+
+extern Status XGetIconSizes(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XIconSize**		/* size_list_return */,
+    int*		/* count_return */
+#endif
+);
+
+extern Status XGetNormalHints(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XSizeHints*		/* hints_return */
+#endif
+);
+
+extern Status XGetRGBColormaps(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XStandardColormap** /* stdcmap_return */,
+    int*		/* count_return */,
+    Atom		/* property */
+#endif
+);
+
+extern Status XGetSizeHints(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XSizeHints*		/* hints_return */,
+    Atom		/* property */
+#endif
+);
+
+extern Status XGetStandardColormap(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XStandardColormap*	/* colormap_return */,
+    Atom		/* property */
+#endif
+);
+
+extern Status XGetTextProperty(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* window */,
+    XTextProperty*	/* text_prop_return */,
+    Atom		/* property */
+#endif
+);
+
+
+extern Status XGetWMClientMachine(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XTextProperty*	/* text_prop_return */
+#endif
+);
+
+extern XWMHints *XGetWMHints(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */
+#endif
+);
+
+extern Status XGetWMIconName(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XTextProperty*	/* text_prop_return */
+#endif
+);
+
+extern Status XGetWMName(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XTextProperty*	/* text_prop_return */
+#endif
+);
+
+extern Status XGetWMNormalHints(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XSizeHints*		/* hints_return */,
+    long*		/* supplied_return */
+#endif
+);
+
+extern Status XGetWMSizeHints(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XSizeHints*		/* hints_return */,
+    long*		/* supplied_return */,
+    Atom		/* property */
+#endif
+);
+
+extern Status XGetZoomHints(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XSizeHints*		/* zhints_return */
+#endif
+);
+
+extern void XIntersectRegion(
+#if NeedFunctionPrototypes
+    Region		/* sra */,
+    Region		/* srb */,
+    Region		/* dr_return */
+#endif
+);
+
+extern int XLookupString(
+#if NeedFunctionPrototypes
+    XKeyEvent*		/* event_struct */,
+    char*		/* buffer_return */,
+    int			/* bytes_buffer */,
+    KeySym*		/* keysym_return */,
+    XComposeStatus*	/* status_in_out */
+#endif
+);
+
+extern Status XMatchVisualInfo(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    int			/* screen */,
+    int			/* depth */,
+    int			/* class */,
+    XVisualInfo*	/* vinfo_return */
+#endif
+);
+
+extern void XOffsetRegion(
+#if NeedFunctionPrototypes
+    Region		/* r */,
+    int			/* dx */,
+    int			/* dy */
+#endif
+);
+
+extern Bool XPointInRegion(
+#if NeedFunctionPrototypes
+    Region		/* r */,
+    int			/* x */,
+    int			/* y */
+#endif
+);
+
+extern Region XPolygonRegion(
+#if NeedFunctionPrototypes
+    XPoint*		/* points */,
+    int			/* n */,
+    int			/* fill_rule */
+#endif
+);
+
+extern int XRectInRegion(
+#if NeedFunctionPrototypes
+    Region		/* r */,
+    int			/* x */,
+    int			/* y */,
+    unsigned int	/* width */,
+    unsigned int	/* height */
+#endif
+);
+
+extern int XSaveContext(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    XID			/* rid */,
+    XContext		/* context */,
+    _Xconst char*	/* data */
+#endif
+);
+
+extern void XSetClassHint(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XClassHint*		/* class_hints */
+#endif
+);
+
+extern void XSetIconSizes(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XIconSize*		/* size_list */,
+    int			/* count */
+#endif
+);
+
+extern void XSetNormalHints(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XSizeHints*		/* hints */
+#endif
+);
+
+extern void XSetRGBColormaps(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XStandardColormap*	/* stdcmaps */,
+    int			/* count */,
+    Atom		/* property */
+#endif
+);
+
+extern void XSetSizeHints(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XSizeHints*		/* hints */,
+    Atom		/* property */
+#endif
+);
+
+extern void XSetStandardProperties(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    _Xconst char*	/* window_name */,
+    _Xconst char*	/* icon_name */,
+    Pixmap		/* icon_pixmap */,
+    char**		/* argv */,
+    int			/* argc */,
+    XSizeHints*		/* hints */
+#endif
+);
+
+extern void XSetTextProperty(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XTextProperty*	/* text_prop */,
+    Atom		/* property */
+#endif
+);
+
+extern void XSetWMHints(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XWMHints*		/* wm_hints */
+#endif
+);
+
+extern void XSetWMIconName(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XTextProperty*	/* text_prop */
+#endif
+);
+
+extern void XSetWMName(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XTextProperty*	/* text_prop */
+#endif
+);
+
+extern void XSetWMNormalHints(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XSizeHints*		/* hints */
+#endif
+);
+
+extern void XSetWMProperties(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XTextProperty*	/* window_name */,
+    XTextProperty*	/* icon_name */,
+    char**		/* argv */,
+    int			/* argc */,
+    XSizeHints*		/* normal_hints */,
+    XWMHints*		/* wm_hints */,
+    XClassHint*		/* class_hints */
+#endif
+);
+
+extern void XmbSetWMProperties(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    _Xconst char*	/* window_name */,
+    _Xconst char*	/* icon_name */,
+    char**		/* argv */,
+    int			/* argc */,
+    XSizeHints*		/* normal_hints */,
+    XWMHints*		/* wm_hints */,
+    XClassHint*		/* class_hints */
+#endif
+);
+
+extern void XSetWMSizeHints(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XSizeHints*		/* hints */,
+    Atom		/* property */
+#endif
+);
+
+extern void XSetRegion(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    GC			/* gc */,
+    Region		/* r */
+#endif
+);
+
+extern void XSetStandardColormap(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XStandardColormap*	/* colormap */,
+    Atom		/* property */
+#endif
+);
+
+extern void XSetZoomHints(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    Window		/* w */,
+    XSizeHints*		/* zhints */
+#endif
+);
+
+extern void XShrinkRegion(
+#if NeedFunctionPrototypes
+    Region		/* r */,
+    int			/* dx */,
+    int			/* dy */
+#endif
+);
+
+extern void XSubtractRegion(
+#if NeedFunctionPrototypes
+    Region		/* sra */,
+    Region		/* srb */,
+    Region		/* dr_return */
+#endif
+);
+
+extern int XmbTextListToTextProperty(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    char**		/* list */,
+    int			/* count */,
+    XICCEncodingStyle	/* style */,
+    XTextProperty*	/* text_prop_return */
+#endif
+);
+
+extern int XwcTextListToTextProperty(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    wchar_t**		/* list */,
+    int			/* count */,
+    XICCEncodingStyle	/* style */,
+    XTextProperty*	/* text_prop_return */
+#endif
+);
+
+extern void XwcFreeStringList(
+#if NeedFunctionPrototypes
+    wchar_t**		/* list */
+#endif
+);
+
+extern Status XTextPropertyToStringList(
+#if NeedFunctionPrototypes
+    XTextProperty*	/* text_prop */,
+    char***		/* list_return */,
+    int*		/* count_return */
+#endif
+);
+
+extern int XmbTextPropertyToTextList(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    XTextProperty*	/* text_prop */,
+    char***		/* list_return */,
+    int*		/* count_return */
+#endif
+);
+
+extern int XwcTextPropertyToTextList(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    XTextProperty*	/* text_prop */,
+    wchar_t***		/* list_return */,
+    int*		/* count_return */
+#endif
+);
+
+extern void XUnionRectWithRegion(
+#if NeedFunctionPrototypes
+    XRectangle*		/* rectangle */,
+    Region		/* src_region */,
+    Region		/* dest_region_return */
+#endif
+);
+
+extern void XUnionRegion(
+#if NeedFunctionPrototypes
+    Region		/* sra */,
+    Region		/* srb */,
+    Region		/* dr_return */
+#endif
+);
+
+extern int XWMGeometry(
+#if NeedFunctionPrototypes
+    Display*		/* display */,
+    int			/* screen_number */,
+    _Xconst char*	/* user_geometry */,
+    _Xconst char*	/* default_geometry */,
+    unsigned int	/* border_width */,
+    XSizeHints*		/* hints */,
+    int*		/* x_return */,
+    int*		/* y_return */,
+    int*		/* width_return */,
+    int*		/* height_return */,
+    int*		/* gravity_return */
+#endif
+);
+
+extern void XXorRegion(
+#if NeedFunctionPrototypes
+    Region		/* sra */,
+    Region		/* srb */,
+    Region		/* dr_return */
+#endif
+);
+
+_XFUNCPROTOEND
+
+#if defined(MAC_OSX_TK)
+#   undef Region
+#endif
+
+#endif /* _XUTIL_H_ */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/cursorfont.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/cursorfont.h
new file mode 100644
index 00000000..617274fa
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/cursorfont.h
@@ -0,0 +1,79 @@
+/* $XConsortium: cursorfont.h,v 1.2 88/09/06 16:44:27 jim Exp $ */
+#define XC_num_glyphs 154
+#define XC_X_cursor 0
+#define XC_arrow 2
+#define XC_based_arrow_down 4
+#define XC_based_arrow_up 6
+#define XC_boat 8
+#define XC_bogosity 10
+#define XC_bottom_left_corner 12
+#define XC_bottom_right_corner 14
+#define XC_bottom_side 16
+#define XC_bottom_tee 18
+#define XC_box_spiral 20
+#define XC_center_ptr 22
+#define XC_circle 24
+#define XC_clock 26
+#define XC_coffee_mug 28
+#define XC_cross 30
+#define XC_cross_reverse 32
+#define XC_crosshair 34
+#define XC_diamond_cross 36
+#define XC_dot 38
+#define XC_dotbox 40
+#define XC_double_arrow 42
+#define XC_draft_large 44
+#define XC_draft_small 46
+#define XC_draped_box 48
+#define XC_exchange 50
+#define XC_fleur 52
+#define XC_gobbler 54
+#define XC_gumby 56
+#define XC_hand1 58
+#define XC_hand2 60
+#define XC_heart 62
+#define XC_icon 64
+#define XC_iron_cross 66
+#define XC_left_ptr 68
+#define XC_left_side 70
+#define XC_left_tee 72
+#define XC_leftbutton 74
+#define XC_ll_angle 76
+#define XC_lr_angle 78
+#define XC_man 80
+#define XC_middlebutton 82
+#define XC_mouse 84
+#define XC_pencil 86
+#define XC_pirate 88
+#define XC_plus 90
+#define XC_question_arrow 92
+#define XC_right_ptr 94
+#define XC_right_side 96
+#define XC_right_tee 98
+#define XC_rightbutton 100
+#define XC_rtl_logo 102
+#define XC_sailboat 104
+#define XC_sb_down_arrow 106
+#define XC_sb_h_double_arrow 108
+#define XC_sb_left_arrow 110
+#define XC_sb_right_arrow 112
+#define XC_sb_up_arrow 114
+#define XC_sb_v_double_arrow 116
+#define XC_shuttle 118
+#define XC_sizing 120
+#define XC_spider 122
+#define XC_spraycan 124
+#define XC_star 126
+#define XC_target 128
+#define XC_tcross 130
+#define XC_top_left_arrow 132
+#define XC_top_left_corner 134
+#define XC_top_right_corner 136
+#define XC_top_side 138
+#define XC_top_tee 140
+#define XC_trek 142
+#define XC_ul_angle 144
+#define XC_umbrella 146
+#define XC_ur_angle 148
+#define XC_watch 150
+#define XC_xterm 152
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/keysym.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/keysym.h
new file mode 100644
index 00000000..550b76db
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/keysym.h
@@ -0,0 +1,35 @@
+/* $XConsortium: keysym.h,v 1.13 91/03/13 20:09:49 rws Exp $ */
+
+/***********************************************************
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital or MIT not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+/* default keysyms */
+#define XK_MISCELLANY
+#define XK_LATIN1
+#define XK_LATIN2
+#define XK_LATIN3
+#define XK_LATIN4
+#define XK_GREEK
+
+#include <X11/keysymdef.h>
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/keysymdef.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/keysymdef.h
new file mode 100644
index 00000000..b22d41b3
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/keysymdef.h
@@ -0,0 +1,1169 @@
+/* $XConsortium: keysymdef.h,v 1.15 93/04/02 10:57:36 rws Exp $ */
+
+/***********************************************************
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital or MIT not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+#define XK_VoidSymbol		0xFFFFFF	/* void symbol */
+
+#ifdef XK_MISCELLANY
+/*
+ * TTY Functions, cleverly chosen to map to ascii, for convenience of
+ * programming, but could have been arbitrary (at the cost of lookup
+ * tables in client code.
+ */
+
+#define XK_BackSpace		0xFF08	/* back space, back char */
+#define XK_Tab			0xFF09
+#define XK_Linefeed		0xFF0A	/* Linefeed, LF */
+#define XK_Clear		0xFF0B
+#define XK_Return		0xFF0D	/* Return, enter */
+#define XK_Pause		0xFF13	/* Pause, hold */
+#define XK_Scroll_Lock		0xFF14
+#define XK_Sys_Req		0xFF15
+#define XK_Escape		0xFF1B
+#define XK_Delete		0xFFFF	/* Delete, rubout */
+
+
+
+/* International & multi-key character composition */
+
+#define XK_Multi_key		0xFF20  /* Multi-key character compose */
+
+/* Japanese keyboard support */
+
+#define XK_Kanji		0xFF21	/* Kanji, Kanji convert */
+#define XK_Muhenkan		0xFF22  /* Cancel Conversion */
+#define XK_Henkan_Mode		0xFF23  /* Start/Stop Conversion */
+#define XK_Henkan		0xFF23  /* Alias for Henkan_Mode */
+#define XK_Romaji		0xFF24  /* to Romaji */
+#define XK_Hiragana		0xFF25  /* to Hiragana */
+#define XK_Katakana		0xFF26  /* to Katakana */
+#define XK_Hiragana_Katakana	0xFF27  /* Hiragana/Katakana toggle */
+#define XK_Zenkaku		0xFF28  /* to Zenkaku */
+#define XK_Hankaku		0xFF29  /* to Hankaku */
+#define XK_Zenkaku_Hankaku	0xFF2A  /* Zenkaku/Hankaku toggle */
+#define XK_Touroku		0xFF2B  /* Add to Dictionary */
+#define XK_Massyo		0xFF2C  /* Delete from Dictionary */
+#define XK_Kana_Lock		0xFF2D  /* Kana Lock */
+#define XK_Kana_Shift		0xFF2E  /* Kana Shift */
+#define XK_Eisu_Shift		0xFF2F  /* Alphanumeric Shift */
+#define XK_Eisu_toggle		0xFF30  /* Alphanumeric toggle */
+
+/* Cursor control & motion */
+
+#define XK_Home			0xFF50
+#define XK_Left			0xFF51	/* Move left, left arrow */
+#define XK_Up			0xFF52	/* Move up, up arrow */
+#define XK_Right		0xFF53	/* Move right, right arrow */
+#define XK_Down			0xFF54	/* Move down, down arrow */
+#define XK_Prior		0xFF55	/* Prior, previous */
+#define XK_Page_Up		0xFF55
+#define XK_Next			0xFF56	/* Next */
+#define XK_Page_Down		0xFF56
+#define XK_End			0xFF57	/* EOL */
+#define XK_Begin		0xFF58	/* BOL */
+
+/* Special Windows keyboard keys */
+
+#define XK_Win_L		0xFF5B	/* Left-hand Windows */
+#define XK_Win_R		0xFF5C	/* Right-hand Windows */
+#define XK_App			0xFF5D	/* Menu key */
+
+/* Misc Functions */
+
+#define XK_Select		0xFF60	/* Select, mark */
+#define XK_Print		0xFF61
+#define XK_Execute		0xFF62	/* Execute, run, do */
+#define XK_Insert		0xFF63	/* Insert, insert here */
+#define XK_Undo			0xFF65	/* Undo, oops */
+#define XK_Redo			0xFF66	/* redo, again */
+#define XK_Menu			0xFF67
+#define XK_Find			0xFF68	/* Find, search */
+#define XK_Cancel		0xFF69	/* Cancel, stop, abort, exit */
+#define XK_Help			0xFF6A	/* Help, ? */
+#define XK_Break		0xFF6B
+#define XK_Mode_switch		0xFF7E	/* Character set switch */
+#define XK_script_switch        0xFF7E  /* Alias for mode_switch */
+#define XK_Num_Lock		0xFF7F
+
+/* Keypad Functions, keypad numbers cleverly chosen to map to ascii */
+
+#define XK_KP_Space		0xFF80	/* space */
+#define XK_KP_Tab		0xFF89
+#define XK_KP_Enter		0xFF8D	/* enter */
+#define XK_KP_F1		0xFF91	/* PF1, KP_A, ... */
+#define XK_KP_F2		0xFF92
+#define XK_KP_F3		0xFF93
+#define XK_KP_F4		0xFF94
+#define XK_KP_Home		0xFF95
+#define XK_KP_Left		0xFF96
+#define XK_KP_Up		0xFF97
+#define XK_KP_Right		0xFF98
+#define XK_KP_Down		0xFF99
+#define XK_KP_Prior		0xFF9A
+#define XK_KP_Page_Up		0xFF9A
+#define XK_KP_Next		0xFF9B
+#define XK_KP_Page_Down		0xFF9B
+#define XK_KP_End		0xFF9C
+#define XK_KP_Begin		0xFF9D
+#define XK_KP_Insert		0xFF9E
+#define XK_KP_Delete		0xFF9F
+#define XK_KP_Equal		0xFFBD	/* equals */
+#define XK_KP_Multiply		0xFFAA
+#define XK_KP_Add		0xFFAB
+#define XK_KP_Separator		0xFFAC	/* separator, often comma */
+#define XK_KP_Subtract		0xFFAD
+#define XK_KP_Decimal		0xFFAE
+#define XK_KP_Divide		0xFFAF
+
+#define XK_KP_0			0xFFB0
+#define XK_KP_1			0xFFB1
+#define XK_KP_2			0xFFB2
+#define XK_KP_3			0xFFB3
+#define XK_KP_4			0xFFB4
+#define XK_KP_5			0xFFB5
+#define XK_KP_6			0xFFB6
+#define XK_KP_7			0xFFB7
+#define XK_KP_8			0xFFB8
+#define XK_KP_9			0xFFB9
+
+
+
+/*
+ * Auxilliary Functions; note the duplicate definitions for left and right
+ * function keys;  Sun keyboards and a few other manufactures have such
+ * function key groups on the left and/or right sides of the keyboard.
+ * We've not found a keyboard with more than 35 function keys total.
+ */
+
+#define XK_F1			0xFFBE
+#define XK_F2			0xFFBF
+#define XK_F3			0xFFC0
+#define XK_F4			0xFFC1
+#define XK_F5			0xFFC2
+#define XK_F6			0xFFC3
+#define XK_F7			0xFFC4
+#define XK_F8			0xFFC5
+#define XK_F9			0xFFC6
+#define XK_F10			0xFFC7
+#define XK_F11			0xFFC8
+#define XK_L1			0xFFC8
+#define XK_F12			0xFFC9
+#define XK_L2			0xFFC9
+#define XK_F13			0xFFCA
+#define XK_L3			0xFFCA
+#define XK_F14			0xFFCB
+#define XK_L4			0xFFCB
+#define XK_F15			0xFFCC
+#define XK_L5			0xFFCC
+#define XK_F16			0xFFCD
+#define XK_L6			0xFFCD
+#define XK_F17			0xFFCE
+#define XK_L7			0xFFCE
+#define XK_F18			0xFFCF
+#define XK_L8			0xFFCF
+#define XK_F19			0xFFD0
+#define XK_L9			0xFFD0
+#define XK_F20			0xFFD1
+#define XK_L10			0xFFD1
+#define XK_F21			0xFFD2
+#define XK_R1			0xFFD2
+#define XK_F22			0xFFD3
+#define XK_R2			0xFFD3
+#define XK_F23			0xFFD4
+#define XK_R3			0xFFD4
+#define XK_F24			0xFFD5
+#define XK_R4			0xFFD5
+#define XK_F25			0xFFD6
+#define XK_R5			0xFFD6
+#define XK_F26			0xFFD7
+#define XK_R6			0xFFD7
+#define XK_F27			0xFFD8
+#define XK_R7			0xFFD8
+#define XK_F28			0xFFD9
+#define XK_R8			0xFFD9
+#define XK_F29			0xFFDA
+#define XK_R9			0xFFDA
+#define XK_F30			0xFFDB
+#define XK_R10			0xFFDB
+#define XK_F31			0xFFDC
+#define XK_R11			0xFFDC
+#define XK_F32			0xFFDD
+#define XK_R12			0xFFDD
+#define XK_F33			0xFFDE
+#define XK_R13			0xFFDE
+#define XK_F34			0xFFDF
+#define XK_R14			0xFFDF
+#define XK_F35			0xFFE0
+#define XK_R15			0xFFE0
+
+/* Modifiers */
+
+#define XK_Shift_L		0xFFE1	/* Left shift */
+#define XK_Shift_R		0xFFE2	/* Right shift */
+#define XK_Control_L		0xFFE3	/* Left control */
+#define XK_Control_R		0xFFE4	/* Right control */
+#define XK_Caps_Lock		0xFFE5	/* Caps lock */
+#define XK_Shift_Lock		0xFFE6	/* Shift lock */
+
+#define XK_Meta_L		0xFFE7	/* Left meta */
+#define XK_Meta_R		0xFFE8	/* Right meta */
+#define XK_Alt_L		0xFFE9	/* Left alt */
+#define XK_Alt_R		0xFFEA	/* Right alt */
+#define XK_Super_L		0xFFEB	/* Left super */
+#define XK_Super_R		0xFFEC	/* Right super */
+#define XK_Hyper_L		0xFFED	/* Left hyper */
+#define XK_Hyper_R		0xFFEE	/* Right hyper */
+#endif /* XK_MISCELLANY */
+
+/*
+ *  Latin 1
+ *  Byte 3 = 0
+ */
+#ifdef XK_LATIN1
+#define XK_space               0x020
+#define XK_exclam              0x021
+#define XK_quotedbl            0x022
+#define XK_numbersign          0x023
+#define XK_dollar              0x024
+#define XK_percent             0x025
+#define XK_ampersand           0x026
+#define XK_apostrophe          0x027
+#define XK_quoteright          0x027	/* deprecated */
+#define XK_parenleft           0x028
+#define XK_parenright          0x029
+#define XK_asterisk            0x02a
+#define XK_plus                0x02b
+#define XK_comma               0x02c
+#define XK_minus               0x02d
+#define XK_period              0x02e
+#define XK_slash               0x02f
+#define XK_0                   0x030
+#define XK_1                   0x031
+#define XK_2                   0x032
+#define XK_3                   0x033
+#define XK_4                   0x034
+#define XK_5                   0x035
+#define XK_6                   0x036
+#define XK_7                   0x037
+#define XK_8                   0x038
+#define XK_9                   0x039
+#define XK_colon               0x03a
+#define XK_semicolon           0x03b
+#define XK_less                0x03c
+#define XK_equal               0x03d
+#define XK_greater             0x03e
+#define XK_question            0x03f
+#define XK_at                  0x040
+#define XK_A                   0x041
+#define XK_B                   0x042
+#define XK_C                   0x043
+#define XK_D                   0x044
+#define XK_E                   0x045
+#define XK_F                   0x046
+#define XK_G                   0x047
+#define XK_H                   0x048
+#define XK_I                   0x049
+#define XK_J                   0x04a
+#define XK_K                   0x04b
+#define XK_L                   0x04c
+#define XK_M                   0x04d
+#define XK_N                   0x04e
+#define XK_O                   0x04f
+#define XK_P                   0x050
+#define XK_Q                   0x051
+#define XK_R                   0x052
+#define XK_S                   0x053
+#define XK_T                   0x054
+#define XK_U                   0x055
+#define XK_V                   0x056
+#define XK_W                   0x057
+#define XK_X                   0x058
+#define XK_Y                   0x059
+#define XK_Z                   0x05a
+#define XK_bracketleft         0x05b
+#define XK_backslash           0x05c
+#define XK_bracketright        0x05d
+#define XK_asciicircum         0x05e
+#define XK_underscore          0x05f
+#define XK_grave               0x060
+#define XK_quoteleft           0x060	/* deprecated */
+#define XK_a                   0x061
+#define XK_b                   0x062
+#define XK_c                   0x063
+#define XK_d                   0x064
+#define XK_e                   0x065
+#define XK_f                   0x066
+#define XK_g                   0x067
+#define XK_h                   0x068
+#define XK_i                   0x069
+#define XK_j                   0x06a
+#define XK_k                   0x06b
+#define XK_l                   0x06c
+#define XK_m                   0x06d
+#define XK_n                   0x06e
+#define XK_o                   0x06f
+#define XK_p                   0x070
+#define XK_q                   0x071
+#define XK_r                   0x072
+#define XK_s                   0x073
+#define XK_t                   0x074
+#define XK_u                   0x075
+#define XK_v                   0x076
+#define XK_w                   0x077
+#define XK_x                   0x078
+#define XK_y                   0x079
+#define XK_z                   0x07a
+#define XK_braceleft           0x07b
+#define XK_bar                 0x07c
+#define XK_braceright          0x07d
+#define XK_asciitilde          0x07e
+
+#define XK_nobreakspace        0x0a0
+#define XK_exclamdown          0x0a1
+#define XK_cent        	       0x0a2
+#define XK_sterling            0x0a3
+#define XK_currency            0x0a4
+#define XK_yen                 0x0a5
+#define XK_brokenbar           0x0a6
+#define XK_section             0x0a7
+#define XK_diaeresis           0x0a8
+#define XK_copyright           0x0a9
+#define XK_ordfeminine         0x0aa
+#define XK_guillemotleft       0x0ab	/* left angle quotation mark */
+#define XK_notsign             0x0ac
+#define XK_hyphen              0x0ad
+#define XK_registered          0x0ae
+#define XK_macron              0x0af
+#define XK_degree              0x0b0
+#define XK_plusminus           0x0b1
+#define XK_twosuperior         0x0b2
+#define XK_threesuperior       0x0b3
+#define XK_acute               0x0b4
+#define XK_mu                  0x0b5
+#define XK_paragraph           0x0b6
+#define XK_periodcentered      0x0b7
+#define XK_cedilla             0x0b8
+#define XK_onesuperior         0x0b9
+#define XK_masculine           0x0ba
+#define XK_guillemotright      0x0bb	/* right angle quotation mark */
+#define XK_onequarter          0x0bc
+#define XK_onehalf             0x0bd
+#define XK_threequarters       0x0be
+#define XK_questiondown        0x0bf
+#define XK_Agrave              0x0c0
+#define XK_Aacute              0x0c1
+#define XK_Acircumflex         0x0c2
+#define XK_Atilde              0x0c3
+#define XK_Adiaeresis          0x0c4
+#define XK_Aring               0x0c5
+#define XK_AE                  0x0c6
+#define XK_Ccedilla            0x0c7
+#define XK_Egrave              0x0c8
+#define XK_Eacute              0x0c9
+#define XK_Ecircumflex         0x0ca
+#define XK_Ediaeresis          0x0cb
+#define XK_Igrave              0x0cc
+#define XK_Iacute              0x0cd
+#define XK_Icircumflex         0x0ce
+#define XK_Idiaeresis          0x0cf
+#define XK_ETH                 0x0d0
+#define XK_Eth                 0x0d0	/* deprecated */
+#define XK_Ntilde              0x0d1
+#define XK_Ograve              0x0d2
+#define XK_Oacute              0x0d3
+#define XK_Ocircumflex         0x0d4
+#define XK_Otilde              0x0d5
+#define XK_Odiaeresis          0x0d6
+#define XK_multiply            0x0d7
+#define XK_Ooblique            0x0d8
+#define XK_Ugrave              0x0d9
+#define XK_Uacute              0x0da
+#define XK_Ucircumflex         0x0db
+#define XK_Udiaeresis          0x0dc
+#define XK_Yacute              0x0dd
+#define XK_THORN               0x0de
+#define XK_Thorn               0x0de	/* deprecated */
+#define XK_ssharp              0x0df
+#define XK_agrave              0x0e0
+#define XK_aacute              0x0e1
+#define XK_acircumflex         0x0e2
+#define XK_atilde              0x0e3
+#define XK_adiaeresis          0x0e4
+#define XK_aring               0x0e5
+#define XK_ae                  0x0e6
+#define XK_ccedilla            0x0e7
+#define XK_egrave              0x0e8
+#define XK_eacute              0x0e9
+#define XK_ecircumflex         0x0ea
+#define XK_ediaeresis          0x0eb
+#define XK_igrave              0x0ec
+#define XK_iacute              0x0ed
+#define XK_icircumflex         0x0ee
+#define XK_idiaeresis          0x0ef
+#define XK_eth                 0x0f0
+#define XK_ntilde              0x0f1
+#define XK_ograve              0x0f2
+#define XK_oacute              0x0f3
+#define XK_ocircumflex         0x0f4
+#define XK_otilde              0x0f5
+#define XK_odiaeresis          0x0f6
+#define XK_division            0x0f7
+#define XK_oslash              0x0f8
+#define XK_ugrave              0x0f9
+#define XK_uacute              0x0fa
+#define XK_ucircumflex         0x0fb
+#define XK_udiaeresis          0x0fc
+#define XK_yacute              0x0fd
+#define XK_thorn               0x0fe
+#define XK_ydiaeresis          0x0ff
+#endif /* XK_LATIN1 */
+
+/*
+ *   Latin 2
+ *   Byte 3 = 1
+ */
+
+#ifdef XK_LATIN2
+#define XK_Aogonek             0x1a1
+#define XK_breve               0x1a2
+#define XK_Lstroke             0x1a3
+#define XK_Lcaron              0x1a5
+#define XK_Sacute              0x1a6
+#define XK_Scaron              0x1a9
+#define XK_Scedilla            0x1aa
+#define XK_Tcaron              0x1ab
+#define XK_Zacute              0x1ac
+#define XK_Zcaron              0x1ae
+#define XK_Zabovedot           0x1af
+#define XK_aogonek             0x1b1
+#define XK_ogonek              0x1b2
+#define XK_lstroke             0x1b3
+#define XK_lcaron              0x1b5
+#define XK_sacute              0x1b6
+#define XK_caron               0x1b7
+#define XK_scaron              0x1b9
+#define XK_scedilla            0x1ba
+#define XK_tcaron              0x1bb
+#define XK_zacute              0x1bc
+#define XK_doubleacute         0x1bd
+#define XK_zcaron              0x1be
+#define XK_zabovedot           0x1bf
+#define XK_Racute              0x1c0
+#define XK_Abreve              0x1c3
+#define XK_Lacute              0x1c5
+#define XK_Cacute              0x1c6
+#define XK_Ccaron              0x1c8
+#define XK_Eogonek             0x1ca
+#define XK_Ecaron              0x1cc
+#define XK_Dcaron              0x1cf
+#define XK_Dstroke             0x1d0
+#define XK_Nacute              0x1d1
+#define XK_Ncaron              0x1d2
+#define XK_Odoubleacute        0x1d5
+#define XK_Rcaron              0x1d8
+#define XK_Uring               0x1d9
+#define XK_Udoubleacute        0x1db
+#define XK_Tcedilla            0x1de
+#define XK_racute              0x1e0
+#define XK_abreve              0x1e3
+#define XK_lacute              0x1e5
+#define XK_cacute              0x1e6
+#define XK_ccaron              0x1e8
+#define XK_eogonek             0x1ea
+#define XK_ecaron              0x1ec
+#define XK_dcaron              0x1ef
+#define XK_dstroke             0x1f0
+#define XK_nacute              0x1f1
+#define XK_ncaron              0x1f2
+#define XK_odoubleacute        0x1f5
+#define XK_udoubleacute        0x1fb
+#define XK_rcaron              0x1f8
+#define XK_uring               0x1f9
+#define XK_tcedilla            0x1fe
+#define XK_abovedot            0x1ff
+#endif /* XK_LATIN2 */
+
+/*
+ *   Latin 3
+ *   Byte 3 = 2
+ */
+
+#ifdef XK_LATIN3
+#define XK_Hstroke             0x2a1
+#define XK_Hcircumflex         0x2a6
+#define XK_Iabovedot           0x2a9
+#define XK_Gbreve              0x2ab
+#define XK_Jcircumflex         0x2ac
+#define XK_hstroke             0x2b1
+#define XK_hcircumflex         0x2b6
+#define XK_idotless            0x2b9
+#define XK_gbreve              0x2bb
+#define XK_jcircumflex         0x2bc
+#define XK_Cabovedot           0x2c5
+#define XK_Ccircumflex         0x2c6
+#define XK_Gabovedot           0x2d5
+#define XK_Gcircumflex         0x2d8
+#define XK_Ubreve              0x2dd
+#define XK_Scircumflex         0x2de
+#define XK_cabovedot           0x2e5
+#define XK_ccircumflex         0x2e6
+#define XK_gabovedot           0x2f5
+#define XK_gcircumflex         0x2f8
+#define XK_ubreve              0x2fd
+#define XK_scircumflex         0x2fe
+#endif /* XK_LATIN3 */
+
+
+/*
+ *   Latin 4
+ *   Byte 3 = 3
+ */
+
+#ifdef XK_LATIN4
+#define XK_kra                 0x3a2
+#define XK_kappa               0x3a2	/* deprecated */
+#define XK_Rcedilla            0x3a3
+#define XK_Itilde              0x3a5
+#define XK_Lcedilla            0x3a6
+#define XK_Emacron             0x3aa
+#define XK_Gcedilla            0x3ab
+#define XK_Tslash              0x3ac
+#define XK_rcedilla            0x3b3
+#define XK_itilde              0x3b5
+#define XK_lcedilla            0x3b6
+#define XK_emacron             0x3ba
+#define XK_gcedilla            0x3bb
+#define XK_tslash              0x3bc
+#define XK_ENG                 0x3bd
+#define XK_eng                 0x3bf
+#define XK_Amacron             0x3c0
+#define XK_Iogonek             0x3c7
+#define XK_Eabovedot           0x3cc
+#define XK_Imacron             0x3cf
+#define XK_Ncedilla            0x3d1
+#define XK_Omacron             0x3d2
+#define XK_Kcedilla            0x3d3
+#define XK_Uogonek             0x3d9
+#define XK_Utilde              0x3dd
+#define XK_Umacron             0x3de
+#define XK_amacron             0x3e0
+#define XK_iogonek             0x3e7
+#define XK_eabovedot           0x3ec
+#define XK_imacron             0x3ef
+#define XK_ncedilla            0x3f1
+#define XK_omacron             0x3f2
+#define XK_kcedilla            0x3f3
+#define XK_uogonek             0x3f9
+#define XK_utilde              0x3fd
+#define XK_umacron             0x3fe
+#endif /* XK_LATIN4 */
+
+/*
+ * Katakana
+ * Byte 3 = 4
+ */
+
+#ifdef XK_KATAKANA
+#define XK_overline				       0x47e
+#define XK_kana_fullstop                               0x4a1
+#define XK_kana_openingbracket                         0x4a2
+#define XK_kana_closingbracket                         0x4a3
+#define XK_kana_comma                                  0x4a4
+#define XK_kana_conjunctive                            0x4a5
+#define XK_kana_middledot                              0x4a5  /* deprecated */
+#define XK_kana_WO                                     0x4a6
+#define XK_kana_a                                      0x4a7
+#define XK_kana_i                                      0x4a8
+#define XK_kana_u                                      0x4a9
+#define XK_kana_e                                      0x4aa
+#define XK_kana_o                                      0x4ab
+#define XK_kana_ya                                     0x4ac
+#define XK_kana_yu                                     0x4ad
+#define XK_kana_yo                                     0x4ae
+#define XK_kana_tsu                                    0x4af
+#define XK_kana_tu                                     0x4af  /* deprecated */
+#define XK_prolongedsound                              0x4b0
+#define XK_kana_A                                      0x4b1
+#define XK_kana_I                                      0x4b2
+#define XK_kana_U                                      0x4b3
+#define XK_kana_E                                      0x4b4
+#define XK_kana_O                                      0x4b5
+#define XK_kana_KA                                     0x4b6
+#define XK_kana_KI                                     0x4b7
+#define XK_kana_KU                                     0x4b8
+#define XK_kana_KE                                     0x4b9
+#define XK_kana_KO                                     0x4ba
+#define XK_kana_SA                                     0x4bb
+#define XK_kana_SHI                                    0x4bc
+#define XK_kana_SU                                     0x4bd
+#define XK_kana_SE                                     0x4be
+#define XK_kana_SO                                     0x4bf
+#define XK_kana_TA                                     0x4c0
+#define XK_kana_CHI                                    0x4c1
+#define XK_kana_TI                                     0x4c1  /* deprecated */
+#define XK_kana_TSU                                    0x4c2
+#define XK_kana_TU                                     0x4c2  /* deprecated */
+#define XK_kana_TE                                     0x4c3
+#define XK_kana_TO                                     0x4c4
+#define XK_kana_NA                                     0x4c5
+#define XK_kana_NI                                     0x4c6
+#define XK_kana_NU                                     0x4c7
+#define XK_kana_NE                                     0x4c8
+#define XK_kana_NO                                     0x4c9
+#define XK_kana_HA                                     0x4ca
+#define XK_kana_HI                                     0x4cb
+#define XK_kana_FU                                     0x4cc
+#define XK_kana_HU                                     0x4cc  /* deprecated */
+#define XK_kana_HE                                     0x4cd
+#define XK_kana_HO                                     0x4ce
+#define XK_kana_MA                                     0x4cf
+#define XK_kana_MI                                     0x4d0
+#define XK_kana_MU                                     0x4d1
+#define XK_kana_ME                                     0x4d2
+#define XK_kana_MO                                     0x4d3
+#define XK_kana_YA                                     0x4d4
+#define XK_kana_YU                                     0x4d5
+#define XK_kana_YO                                     0x4d6
+#define XK_kana_RA                                     0x4d7
+#define XK_kana_RI                                     0x4d8
+#define XK_kana_RU                                     0x4d9
+#define XK_kana_RE                                     0x4da
+#define XK_kana_RO                                     0x4db
+#define XK_kana_WA                                     0x4dc
+#define XK_kana_N                                      0x4dd
+#define XK_voicedsound                                 0x4de
+#define XK_semivoicedsound                             0x4df
+#define XK_kana_switch          0xFF7E  /* Alias for mode_switch */
+#endif /* XK_KATAKANA */
+
+/*
+ *  Arabic
+ *  Byte 3 = 5
+ */
+
+#ifdef XK_ARABIC
+#define XK_Arabic_comma                                0x5ac
+#define XK_Arabic_semicolon                            0x5bb
+#define XK_Arabic_question_mark                        0x5bf
+#define XK_Arabic_hamza                                0x5c1
+#define XK_Arabic_maddaonalef                          0x5c2
+#define XK_Arabic_hamzaonalef                          0x5c3
+#define XK_Arabic_hamzaonwaw                           0x5c4
+#define XK_Arabic_hamzaunderalef                       0x5c5
+#define XK_Arabic_hamzaonyeh                           0x5c6
+#define XK_Arabic_alef                                 0x5c7
+#define XK_Arabic_beh                                  0x5c8
+#define XK_Arabic_tehmarbuta                           0x5c9
+#define XK_Arabic_teh                                  0x5ca
+#define XK_Arabic_theh                                 0x5cb
+#define XK_Arabic_jeem                                 0x5cc
+#define XK_Arabic_hah                                  0x5cd
+#define XK_Arabic_khah                                 0x5ce
+#define XK_Arabic_dal                                  0x5cf
+#define XK_Arabic_thal                                 0x5d0
+#define XK_Arabic_ra                                   0x5d1
+#define XK_Arabic_zain                                 0x5d2
+#define XK_Arabic_seen                                 0x5d3
+#define XK_Arabic_sheen                                0x5d4
+#define XK_Arabic_sad                                  0x5d5
+#define XK_Arabic_dad                                  0x5d6
+#define XK_Arabic_tah                                  0x5d7
+#define XK_Arabic_zah                                  0x5d8
+#define XK_Arabic_ain                                  0x5d9
+#define XK_Arabic_ghain                                0x5da
+#define XK_Arabic_tatweel                              0x5e0
+#define XK_Arabic_feh                                  0x5e1
+#define XK_Arabic_qaf                                  0x5e2
+#define XK_Arabic_kaf                                  0x5e3
+#define XK_Arabic_lam                                  0x5e4
+#define XK_Arabic_meem                                 0x5e5
+#define XK_Arabic_noon                                 0x5e6
+#define XK_Arabic_ha                                   0x5e7
+#define XK_Arabic_heh                                  0x5e7  /* deprecated */
+#define XK_Arabic_waw                                  0x5e8
+#define XK_Arabic_alefmaksura                          0x5e9
+#define XK_Arabic_yeh                                  0x5ea
+#define XK_Arabic_fathatan                             0x5eb
+#define XK_Arabic_dammatan                             0x5ec
+#define XK_Arabic_kasratan                             0x5ed
+#define XK_Arabic_fatha                                0x5ee
+#define XK_Arabic_damma                                0x5ef
+#define XK_Arabic_kasra                                0x5f0
+#define XK_Arabic_shadda                               0x5f1
+#define XK_Arabic_sukun                                0x5f2
+#define XK_Arabic_switch        0xFF7E  /* Alias for mode_switch */
+#endif /* XK_ARABIC */
+
+/*
+ * Cyrillic
+ * Byte 3 = 6
+ */
+#ifdef XK_CYRILLIC
+#define XK_Serbian_dje                                 0x6a1
+#define XK_Macedonia_gje                               0x6a2
+#define XK_Cyrillic_io                                 0x6a3
+#define XK_Ukrainian_ie                                0x6a4
+#define XK_Ukranian_je                                 0x6a4  /* deprecated */
+#define XK_Macedonia_dse                               0x6a5
+#define XK_Ukrainian_i                                 0x6a6
+#define XK_Ukranian_i                                  0x6a6  /* deprecated */
+#define XK_Ukrainian_yi                                0x6a7
+#define XK_Ukranian_yi                                 0x6a7  /* deprecated */
+#define XK_Cyrillic_je                                 0x6a8
+#define XK_Serbian_je                                  0x6a8  /* deprecated */
+#define XK_Cyrillic_lje                                0x6a9
+#define XK_Serbian_lje                                 0x6a9  /* deprecated */
+#define XK_Cyrillic_nje                                0x6aa
+#define XK_Serbian_nje                                 0x6aa  /* deprecated */
+#define XK_Serbian_tshe                                0x6ab
+#define XK_Macedonia_kje                               0x6ac
+#define XK_Byelorussian_shortu                         0x6ae
+#define XK_Cyrillic_dzhe                               0x6af
+#define XK_Serbian_dze                                 0x6af  /* deprecated */
+#define XK_numerosign                                  0x6b0
+#define XK_Serbian_DJE                                 0x6b1
+#define XK_Macedonia_GJE                               0x6b2
+#define XK_Cyrillic_IO                                 0x6b3
+#define XK_Ukrainian_IE                                0x6b4
+#define XK_Ukranian_JE                                 0x6b4  /* deprecated */
+#define XK_Macedonia_DSE                               0x6b5
+#define XK_Ukrainian_I                                 0x6b6
+#define XK_Ukranian_I                                  0x6b6  /* deprecated */
+#define XK_Ukrainian_YI                                0x6b7
+#define XK_Ukranian_YI                                 0x6b7  /* deprecated */
+#define XK_Cyrillic_JE                                 0x6b8
+#define XK_Serbian_JE                                  0x6b8  /* deprecated */
+#define XK_Cyrillic_LJE                                0x6b9
+#define XK_Serbian_LJE                                 0x6b9  /* deprecated */
+#define XK_Cyrillic_NJE                                0x6ba
+#define XK_Serbian_NJE                                 0x6ba  /* deprecated */
+#define XK_Serbian_TSHE                                0x6bb
+#define XK_Macedonia_KJE                               0x6bc
+#define XK_Byelorussian_SHORTU                         0x6be
+#define XK_Cyrillic_DZHE                               0x6bf
+#define XK_Serbian_DZE                                 0x6bf  /* deprecated */
+#define XK_Cyrillic_yu                                 0x6c0
+#define XK_Cyrillic_a                                  0x6c1
+#define XK_Cyrillic_be                                 0x6c2
+#define XK_Cyrillic_tse                                0x6c3
+#define XK_Cyrillic_de                                 0x6c4
+#define XK_Cyrillic_ie                                 0x6c5
+#define XK_Cyrillic_ef                                 0x6c6
+#define XK_Cyrillic_ghe                                0x6c7
+#define XK_Cyrillic_ha                                 0x6c8
+#define XK_Cyrillic_i                                  0x6c9
+#define XK_Cyrillic_shorti                             0x6ca
+#define XK_Cyrillic_ka                                 0x6cb
+#define XK_Cyrillic_el                                 0x6cc
+#define XK_Cyrillic_em                                 0x6cd
+#define XK_Cyrillic_en                                 0x6ce
+#define XK_Cyrillic_o                                  0x6cf
+#define XK_Cyrillic_pe                                 0x6d0
+#define XK_Cyrillic_ya                                 0x6d1
+#define XK_Cyrillic_er                                 0x6d2
+#define XK_Cyrillic_es                                 0x6d3
+#define XK_Cyrillic_te                                 0x6d4
+#define XK_Cyrillic_u                                  0x6d5
+#define XK_Cyrillic_zhe                                0x6d6
+#define XK_Cyrillic_ve                                 0x6d7
+#define XK_Cyrillic_softsign                           0x6d8
+#define XK_Cyrillic_yeru                               0x6d9
+#define XK_Cyrillic_ze                                 0x6da
+#define XK_Cyrillic_sha                                0x6db
+#define XK_Cyrillic_e                                  0x6dc
+#define XK_Cyrillic_shcha                              0x6dd
+#define XK_Cyrillic_che                                0x6de
+#define XK_Cyrillic_hardsign                           0x6df
+#define XK_Cyrillic_YU                                 0x6e0
+#define XK_Cyrillic_A                                  0x6e1
+#define XK_Cyrillic_BE                                 0x6e2
+#define XK_Cyrillic_TSE                                0x6e3
+#define XK_Cyrillic_DE                                 0x6e4
+#define XK_Cyrillic_IE                                 0x6e5
+#define XK_Cyrillic_EF                                 0x6e6
+#define XK_Cyrillic_GHE                                0x6e7
+#define XK_Cyrillic_HA                                 0x6e8
+#define XK_Cyrillic_I                                  0x6e9
+#define XK_Cyrillic_SHORTI                             0x6ea
+#define XK_Cyrillic_KA                                 0x6eb
+#define XK_Cyrillic_EL                                 0x6ec
+#define XK_Cyrillic_EM                                 0x6ed
+#define XK_Cyrillic_EN                                 0x6ee
+#define XK_Cyrillic_O                                  0x6ef
+#define XK_Cyrillic_PE                                 0x6f0
+#define XK_Cyrillic_YA                                 0x6f1
+#define XK_Cyrillic_ER                                 0x6f2
+#define XK_Cyrillic_ES                                 0x6f3
+#define XK_Cyrillic_TE                                 0x6f4
+#define XK_Cyrillic_U                                  0x6f5
+#define XK_Cyrillic_ZHE                                0x6f6
+#define XK_Cyrillic_VE                                 0x6f7
+#define XK_Cyrillic_SOFTSIGN                           0x6f8
+#define XK_Cyrillic_YERU                               0x6f9
+#define XK_Cyrillic_ZE                                 0x6fa
+#define XK_Cyrillic_SHA                                0x6fb
+#define XK_Cyrillic_E                                  0x6fc
+#define XK_Cyrillic_SHCHA                              0x6fd
+#define XK_Cyrillic_CHE                                0x6fe
+#define XK_Cyrillic_HARDSIGN                           0x6ff
+#endif /* XK_CYRILLIC */
+
+/*
+ * Greek
+ * Byte 3 = 7
+ */
+
+#ifdef XK_GREEK
+#define XK_Greek_ALPHAaccent                           0x7a1
+#define XK_Greek_EPSILONaccent                         0x7a2
+#define XK_Greek_ETAaccent                             0x7a3
+#define XK_Greek_IOTAaccent                            0x7a4
+#define XK_Greek_IOTAdiaeresis                         0x7a5
+#define XK_Greek_OMICRONaccent                         0x7a7
+#define XK_Greek_UPSILONaccent                         0x7a8
+#define XK_Greek_UPSILONdieresis                       0x7a9
+#define XK_Greek_OMEGAaccent                           0x7ab
+#define XK_Greek_accentdieresis                        0x7ae
+#define XK_Greek_horizbar                              0x7af
+#define XK_Greek_alphaaccent                           0x7b1
+#define XK_Greek_epsilonaccent                         0x7b2
+#define XK_Greek_etaaccent                             0x7b3
+#define XK_Greek_iotaaccent                            0x7b4
+#define XK_Greek_iotadieresis                          0x7b5
+#define XK_Greek_iotaaccentdieresis                    0x7b6
+#define XK_Greek_omicronaccent                         0x7b7
+#define XK_Greek_upsilonaccent                         0x7b8
+#define XK_Greek_upsilondieresis                       0x7b9
+#define XK_Greek_upsilonaccentdieresis                 0x7ba
+#define XK_Greek_omegaaccent                           0x7bb
+#define XK_Greek_ALPHA                                 0x7c1
+#define XK_Greek_BETA                                  0x7c2
+#define XK_Greek_GAMMA                                 0x7c3
+#define XK_Greek_DELTA                                 0x7c4
+#define XK_Greek_EPSILON                               0x7c5
+#define XK_Greek_ZETA                                  0x7c6
+#define XK_Greek_ETA                                   0x7c7
+#define XK_Greek_THETA                                 0x7c8
+#define XK_Greek_IOTA                                  0x7c9
+#define XK_Greek_KAPPA                                 0x7ca
+#define XK_Greek_LAMDA                                 0x7cb
+#define XK_Greek_LAMBDA                                0x7cb
+#define XK_Greek_MU                                    0x7cc
+#define XK_Greek_NU                                    0x7cd
+#define XK_Greek_XI                                    0x7ce
+#define XK_Greek_OMICRON                               0x7cf
+#define XK_Greek_PI                                    0x7d0
+#define XK_Greek_RHO                                   0x7d1
+#define XK_Greek_SIGMA                                 0x7d2
+#define XK_Greek_TAU                                   0x7d4
+#define XK_Greek_UPSILON                               0x7d5
+#define XK_Greek_PHI                                   0x7d6
+#define XK_Greek_CHI                                   0x7d7
+#define XK_Greek_PSI                                   0x7d8
+#define XK_Greek_OMEGA                                 0x7d9
+#define XK_Greek_alpha                                 0x7e1
+#define XK_Greek_beta                                  0x7e2
+#define XK_Greek_gamma                                 0x7e3
+#define XK_Greek_delta                                 0x7e4
+#define XK_Greek_epsilon                               0x7e5
+#define XK_Greek_zeta                                  0x7e6
+#define XK_Greek_eta                                   0x7e7
+#define XK_Greek_theta                                 0x7e8
+#define XK_Greek_iota                                  0x7e9
+#define XK_Greek_kappa                                 0x7ea
+#define XK_Greek_lamda                                 0x7eb
+#define XK_Greek_lambda                                0x7eb
+#define XK_Greek_mu                                    0x7ec
+#define XK_Greek_nu                                    0x7ed
+#define XK_Greek_xi                                    0x7ee
+#define XK_Greek_omicron                               0x7ef
+#define XK_Greek_pi                                    0x7f0
+#define XK_Greek_rho                                   0x7f1
+#define XK_Greek_sigma                                 0x7f2
+#define XK_Greek_finalsmallsigma                       0x7f3
+#define XK_Greek_tau                                   0x7f4
+#define XK_Greek_upsilon                               0x7f5
+#define XK_Greek_phi                                   0x7f6
+#define XK_Greek_chi                                   0x7f7
+#define XK_Greek_psi                                   0x7f8
+#define XK_Greek_omega                                 0x7f9
+#define XK_Greek_switch         0xFF7E  /* Alias for mode_switch */
+#endif /* XK_GREEK */
+
+/*
+ * Technical
+ * Byte 3 = 8
+ */
+
+#ifdef XK_TECHNICAL
+#define XK_leftradical                                 0x8a1
+#define XK_topleftradical                              0x8a2
+#define XK_horizconnector                              0x8a3
+#define XK_topintegral                                 0x8a4
+#define XK_botintegral                                 0x8a5
+#define XK_vertconnector                               0x8a6
+#define XK_topleftsqbracket                            0x8a7
+#define XK_botleftsqbracket                            0x8a8
+#define XK_toprightsqbracket                           0x8a9
+#define XK_botrightsqbracket                           0x8aa
+#define XK_topleftparens                               0x8ab
+#define XK_botleftparens                               0x8ac
+#define XK_toprightparens                              0x8ad
+#define XK_botrightparens                              0x8ae
+#define XK_leftmiddlecurlybrace                        0x8af
+#define XK_rightmiddlecurlybrace                       0x8b0
+#define XK_topleftsummation                            0x8b1
+#define XK_botleftsummation                            0x8b2
+#define XK_topvertsummationconnector                   0x8b3
+#define XK_botvertsummationconnector                   0x8b4
+#define XK_toprightsummation                           0x8b5
+#define XK_botrightsummation                           0x8b6
+#define XK_rightmiddlesummation                        0x8b7
+#define XK_lessthanequal                               0x8bc
+#define XK_notequal                                    0x8bd
+#define XK_greaterthanequal                            0x8be
+#define XK_integral                                    0x8bf
+#define XK_therefore                                   0x8c0
+#define XK_variation                                   0x8c1
+#define XK_infinity                                    0x8c2
+#define XK_nabla                                       0x8c5
+#define XK_approximate                                 0x8c8
+#define XK_similarequal                                0x8c9
+#define XK_ifonlyif                                    0x8cd
+#define XK_implies                                     0x8ce
+#define XK_identical                                   0x8cf
+#define XK_radical                                     0x8d6
+#define XK_includedin                                  0x8da
+#define XK_includes                                    0x8db
+#define XK_intersection                                0x8dc
+#define XK_union                                       0x8dd
+#define XK_logicaland                                  0x8de
+#define XK_logicalor                                   0x8df
+#define XK_partialderivative                           0x8ef
+#define XK_function                                    0x8f6
+#define XK_leftarrow                                   0x8fb
+#define XK_uparrow                                     0x8fc
+#define XK_rightarrow                                  0x8fd
+#define XK_downarrow                                   0x8fe
+#endif /* XK_TECHNICAL */
+
+/*
+ *  Special
+ *  Byte 3 = 9
+ */
+
+#ifdef XK_SPECIAL
+#define XK_blank                                       0x9df
+#define XK_soliddiamond                                0x9e0
+#define XK_checkerboard                                0x9e1
+#define XK_ht                                          0x9e2
+#define XK_ff                                          0x9e3
+#define XK_cr                                          0x9e4
+#define XK_lf                                          0x9e5
+#define XK_nl                                          0x9e8
+#define XK_vt                                          0x9e9
+#define XK_lowrightcorner                              0x9ea
+#define XK_uprightcorner                               0x9eb
+#define XK_upleftcorner                                0x9ec
+#define XK_lowleftcorner                               0x9ed
+#define XK_crossinglines                               0x9ee
+#define XK_horizlinescan1                              0x9ef
+#define XK_horizlinescan3                              0x9f0
+#define XK_horizlinescan5                              0x9f1
+#define XK_horizlinescan7                              0x9f2
+#define XK_horizlinescan9                              0x9f3
+#define XK_leftt                                       0x9f4
+#define XK_rightt                                      0x9f5
+#define XK_bott                                        0x9f6
+#define XK_topt                                        0x9f7
+#define XK_vertbar                                     0x9f8
+#endif /* XK_SPECIAL */
+
+/*
+ *  Publishing
+ *  Byte 3 = a
+ */
+
+#ifdef XK_PUBLISHING
+#define XK_emspace                                     0xaa1
+#define XK_enspace                                     0xaa2
+#define XK_em3space                                    0xaa3
+#define XK_em4space                                    0xaa4
+#define XK_digitspace                                  0xaa5
+#define XK_punctspace                                  0xaa6
+#define XK_thinspace                                   0xaa7
+#define XK_hairspace                                   0xaa8
+#define XK_emdash                                      0xaa9
+#define XK_endash                                      0xaaa
+#define XK_signifblank                                 0xaac
+#define XK_ellipsis                                    0xaae
+#define XK_doubbaselinedot                             0xaaf
+#define XK_onethird                                    0xab0
+#define XK_twothirds                                   0xab1
+#define XK_onefifth                                    0xab2
+#define XK_twofifths                                   0xab3
+#define XK_threefifths                                 0xab4
+#define XK_fourfifths                                  0xab5
+#define XK_onesixth                                    0xab6
+#define XK_fivesixths                                  0xab7
+#define XK_careof                                      0xab8
+#define XK_figdash                                     0xabb
+#define XK_leftanglebracket                            0xabc
+#define XK_decimalpoint                                0xabd
+#define XK_rightanglebracket                           0xabe
+#define XK_marker                                      0xabf
+#define XK_oneeighth                                   0xac3
+#define XK_threeeighths                                0xac4
+#define XK_fiveeighths                                 0xac5
+#define XK_seveneighths                                0xac6
+#define XK_trademark                                   0xac9
+#define XK_signaturemark                               0xaca
+#define XK_trademarkincircle                           0xacb
+#define XK_leftopentriangle                            0xacc
+#define XK_rightopentriangle                           0xacd
+#define XK_emopencircle                                0xace
+#define XK_emopenrectangle                             0xacf
+#define XK_leftsinglequotemark                         0xad0
+#define XK_rightsinglequotemark                        0xad1
+#define XK_leftdoublequotemark                         0xad2
+#define XK_rightdoublequotemark                        0xad3
+#define XK_prescription                                0xad4
+#define XK_minutes                                     0xad6
+#define XK_seconds                                     0xad7
+#define XK_latincross                                  0xad9
+#define XK_hexagram                                    0xada
+#define XK_filledrectbullet                            0xadb
+#define XK_filledlefttribullet                         0xadc
+#define XK_filledrighttribullet                        0xadd
+#define XK_emfilledcircle                              0xade
+#define XK_emfilledrect                                0xadf
+#define XK_enopencircbullet                            0xae0
+#define XK_enopensquarebullet                          0xae1
+#define XK_openrectbullet                              0xae2
+#define XK_opentribulletup                             0xae3
+#define XK_opentribulletdown                           0xae4
+#define XK_openstar                                    0xae5
+#define XK_enfilledcircbullet                          0xae6
+#define XK_enfilledsqbullet                            0xae7
+#define XK_filledtribulletup                           0xae8
+#define XK_filledtribulletdown                         0xae9
+#define XK_leftpointer                                 0xaea
+#define XK_rightpointer                                0xaeb
+#define XK_club                                        0xaec
+#define XK_diamond                                     0xaed
+#define XK_heart                                       0xaee
+#define XK_maltesecross                                0xaf0
+#define XK_dagger                                      0xaf1
+#define XK_doubledagger                                0xaf2
+#define XK_checkmark                                   0xaf3
+#define XK_ballotcross                                 0xaf4
+#define XK_musicalsharp                                0xaf5
+#define XK_musicalflat                                 0xaf6
+#define XK_malesymbol                                  0xaf7
+#define XK_femalesymbol                                0xaf8
+#define XK_telephone                                   0xaf9
+#define XK_telephonerecorder                           0xafa
+#define XK_phonographcopyright                         0xafb
+#define XK_caret                                       0xafc
+#define XK_singlelowquotemark                          0xafd
+#define XK_doublelowquotemark                          0xafe
+#define XK_cursor                                      0xaff
+#endif /* XK_PUBLISHING */
+
+/*
+ *  APL
+ *  Byte 3 = b
+ */
+
+#ifdef XK_APL
+#define XK_leftcaret                                   0xba3
+#define XK_rightcaret                                  0xba6
+#define XK_downcaret                                   0xba8
+#define XK_upcaret                                     0xba9
+#define XK_overbar                                     0xbc0
+#define XK_downtack                                    0xbc2
+#define XK_upshoe                                      0xbc3
+#define XK_downstile                                   0xbc4
+#define XK_underbar                                    0xbc6
+#define XK_jot                                         0xbca
+#define XK_quad                                        0xbcc
+#define XK_uptack                                      0xbce
+#define XK_circle                                      0xbcf
+#define XK_upstile                                     0xbd3
+#define XK_downshoe                                    0xbd6
+#define XK_rightshoe                                   0xbd8
+#define XK_leftshoe                                    0xbda
+#define XK_lefttack                                    0xbdc
+#define XK_righttack                                   0xbfc
+#endif /* XK_APL */
+
+/*
+ * Hebrew
+ * Byte 3 = c
+ */
+
+#ifdef XK_HEBREW
+#define XK_hebrew_doublelowline                        0xcdf
+#define XK_hebrew_aleph                                0xce0
+#define XK_hebrew_bet                                  0xce1
+#define XK_hebrew_beth                                 0xce1  /* deprecated */
+#define XK_hebrew_gimel                                0xce2
+#define XK_hebrew_gimmel                               0xce2  /* deprecated */
+#define XK_hebrew_dalet                                0xce3
+#define XK_hebrew_daleth                               0xce3  /* deprecated */
+#define XK_hebrew_he                                   0xce4
+#define XK_hebrew_waw                                  0xce5
+#define XK_hebrew_zain                                 0xce6
+#define XK_hebrew_zayin                                0xce6  /* deprecated */
+#define XK_hebrew_chet                                 0xce7
+#define XK_hebrew_het                                  0xce7  /* deprecated */
+#define XK_hebrew_tet                                  0xce8
+#define XK_hebrew_teth                                 0xce8  /* deprecated */
+#define XK_hebrew_yod                                  0xce9
+#define XK_hebrew_finalkaph                            0xcea
+#define XK_hebrew_kaph                                 0xceb
+#define XK_hebrew_lamed                                0xcec
+#define XK_hebrew_finalmem                             0xced
+#define XK_hebrew_mem                                  0xcee
+#define XK_hebrew_finalnun                             0xcef
+#define XK_hebrew_nun                                  0xcf0
+#define XK_hebrew_samech                               0xcf1
+#define XK_hebrew_samekh                               0xcf1  /* deprecated */
+#define XK_hebrew_ayin                                 0xcf2
+#define XK_hebrew_finalpe                              0xcf3
+#define XK_hebrew_pe                                   0xcf4
+#define XK_hebrew_finalzade                            0xcf5
+#define XK_hebrew_finalzadi                            0xcf5  /* deprecated */
+#define XK_hebrew_zade                                 0xcf6
+#define XK_hebrew_zadi                                 0xcf6  /* deprecated */
+#define XK_hebrew_qoph                                 0xcf7
+#define XK_hebrew_kuf                                  0xcf7  /* deprecated */
+#define XK_hebrew_resh                                 0xcf8
+#define XK_hebrew_shin                                 0xcf9
+#define XK_hebrew_taw                                  0xcfa
+#define XK_hebrew_taf                                  0xcfa  /* deprecated */
+#define XK_Hebrew_switch        0xFF7E  /* Alias for mode_switch */
+#endif /* XK_HEBREW */
+
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/tkIntXlibDecls.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/tkIntXlibDecls.h
new file mode 100644
index 00000000..6ac7ccbd
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/X11/tkIntXlibDecls.h
@@ -0,0 +1,1279 @@
+/*
+ * tkIntXlibDecls.h --
+ *
+ *	This file contains the declarations for all platform dependent
+ *	unsupported functions that are exported by the Tk library.  These
+ *	interfaces are not guaranteed to remain the same between
+ *	versions.  Use at your own risk.
+ *
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ * All rights reserved.
+ */
+
+#ifndef _TKINTXLIBDECLS
+#define _TKINTXLIBDECLS
+
+/*
+ * WARNING: This file is automatically generated by the tools/genStubs.tcl
+ * script.  Any modifications to the function declarations below should be made
+ * in the generic/tkInt.decls script.
+ */
+
+#ifndef _TCL
+#   include <tcl.h>
+#endif
+
+#include "X11/Xutil.h"
+
+#ifdef BUILD_tk
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
+#endif
+
+typedef int (*XAfterFunction) (	    /* WARNING, this type not in Xlib spec */
+    Display*		/* display */
+);
+
+/* !BEGIN!: Do not edit below this line. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+/* 0 */
+EXTERN int		XSetDashes(Display *display, GC gc, int dash_offset,
+				_Xconst char *dash_list, int n);
+/* 1 */
+EXTERN XModifierKeymap * XGetModifierMapping(Display *d);
+/* 2 */
+EXTERN XImage *		XCreateImage(Display *d, Visual *v, unsigned int ui1,
+				int i1, int i2, char *cp, unsigned int ui2,
+				unsigned int ui3, int i3, int i4);
+/* 3 */
+EXTERN XImage *		XGetImage(Display *d, Drawable dr, int i1, int i2,
+				unsigned int ui1, unsigned int ui2,
+				unsigned long ul, int i3);
+/* 4 */
+EXTERN char *		XGetAtomName(Display *d, Atom a);
+/* 5 */
+EXTERN char *		XKeysymToString(KeySym k);
+/* 6 */
+EXTERN Colormap		XCreateColormap(Display *d, Window w, Visual *v,
+				int i);
+/* 7 */
+EXTERN Cursor		XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
+				XColor *x1, XColor *x2, unsigned int ui1,
+				unsigned int ui2);
+/* 8 */
+EXTERN Cursor		XCreateGlyphCursor(Display *d, Font f1, Font f2,
+				unsigned int ui1, unsigned int ui2,
+				XColor _Xconst *x1, XColor _Xconst *x2);
+/* 9 */
+EXTERN GContext		XGContextFromGC(GC g);
+/* 10 */
+EXTERN XHostAddress *	XListHosts(Display *d, int *i, Bool *b);
+/* 11 */
+EXTERN KeySym		XKeycodeToKeysym(Display *d, unsigned int k, int i);
+/* 12 */
+EXTERN KeySym		XStringToKeysym(_Xconst char *c);
+/* 13 */
+EXTERN Window		XRootWindow(Display *d, int i);
+/* 14 */
+EXTERN XErrorHandler	XSetErrorHandler(XErrorHandler x);
+/* 15 */
+EXTERN Status		XIconifyWindow(Display *d, Window w, int i);
+/* 16 */
+EXTERN Status		XWithdrawWindow(Display *d, Window w, int i);
+/* 17 */
+EXTERN Status		XGetWMColormapWindows(Display *d, Window w,
+				Window **wpp, int *ip);
+/* 18 */
+EXTERN Status		XAllocColor(Display *d, Colormap c, XColor *xp);
+/* 19 */
+EXTERN int		XBell(Display *d, int i);
+/* 20 */
+EXTERN int		XChangeProperty(Display *d, Window w, Atom a1,
+				Atom a2, int i1, int i2,
+				_Xconst unsigned char *c, int i3);
+/* 21 */
+EXTERN int		XChangeWindowAttributes(Display *d, Window w,
+				unsigned long ul, XSetWindowAttributes *x);
+/* 22 */
+EXTERN int		XClearWindow(Display *d, Window w);
+/* 23 */
+EXTERN int		XConfigureWindow(Display *d, Window w,
+				unsigned int i, XWindowChanges *x);
+/* 24 */
+EXTERN int		XCopyArea(Display *d, Drawable dr1, Drawable dr2,
+				GC g, int i1, int i2, unsigned int ui1,
+				unsigned int ui2, int i3, int i4);
+/* 25 */
+EXTERN int		XCopyPlane(Display *d, Drawable dr1, Drawable dr2,
+				GC g, int i1, int i2, unsigned int ui1,
+				unsigned int ui2, int i3, int i4,
+				unsigned long ul);
+/* 26 */
+EXTERN Pixmap		XCreateBitmapFromData(Display *display, Drawable d,
+				_Xconst char *data, unsigned int width,
+				unsigned int height);
+/* 27 */
+EXTERN int		XDefineCursor(Display *d, Window w, Cursor c);
+/* 28 */
+EXTERN int		XDeleteProperty(Display *d, Window w, Atom a);
+/* 29 */
+EXTERN int		XDestroyWindow(Display *d, Window w);
+/* 30 */
+EXTERN int		XDrawArc(Display *d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2,
+				int i3, int i4);
+/* 31 */
+EXTERN int		XDrawLines(Display *d, Drawable dr, GC g, XPoint *x,
+				int i1, int i2);
+/* 32 */
+EXTERN int		XDrawRectangle(Display *d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2);
+/* 33 */
+EXTERN int		XFillArc(Display *d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2,
+				int i3, int i4);
+/* 34 */
+EXTERN int		XFillPolygon(Display *d, Drawable dr, GC g,
+				XPoint *x, int i1, int i2, int i3);
+/* 35 */
+EXTERN int		XFillRectangles(Display *d, Drawable dr, GC g,
+				XRectangle *x, int i);
+/* 36 */
+EXTERN int		XForceScreenSaver(Display *d, int i);
+/* 37 */
+EXTERN int		XFreeColormap(Display *d, Colormap c);
+/* 38 */
+EXTERN int		XFreeColors(Display *d, Colormap c,
+				unsigned long *ulp, int i, unsigned long ul);
+/* 39 */
+EXTERN int		XFreeCursor(Display *d, Cursor c);
+/* 40 */
+EXTERN int		XFreeModifiermap(XModifierKeymap *x);
+/* 41 */
+EXTERN Status		XGetGeometry(Display *d, Drawable dr, Window *w,
+				int *i1, int *i2, unsigned int *ui1,
+				unsigned int *ui2, unsigned int *ui3,
+				unsigned int *ui4);
+/* 42 */
+EXTERN int		XGetInputFocus(Display *d, Window *w, int *i);
+/* 43 */
+EXTERN int		XGetWindowProperty(Display *d, Window w, Atom a1,
+				long l1, long l2, Bool b, Atom a2, Atom *ap,
+				int *ip, unsigned long *ulp1,
+				unsigned long *ulp2, unsigned char **cpp);
+/* 44 */
+EXTERN Status		XGetWindowAttributes(Display *d, Window w,
+				XWindowAttributes *x);
+/* 45 */
+EXTERN int		XGrabKeyboard(Display *d, Window w, Bool b, int i1,
+				int i2, Time t);
+/* 46 */
+EXTERN int		XGrabPointer(Display *d, Window w1, Bool b,
+				unsigned int ui, int i1, int i2, Window w2,
+				Cursor c, Time t);
+/* 47 */
+EXTERN KeyCode		XKeysymToKeycode(Display *d, KeySym k);
+/* 48 */
+EXTERN Status		XLookupColor(Display *d, Colormap c1,
+				_Xconst char *c2, XColor *x1, XColor *x2);
+/* 49 */
+EXTERN int		XMapWindow(Display *d, Window w);
+/* 50 */
+EXTERN int		XMoveResizeWindow(Display *d, Window w, int i1,
+				int i2, unsigned int ui1, unsigned int ui2);
+/* 51 */
+EXTERN int		XMoveWindow(Display *d, Window w, int i1, int i2);
+/* 52 */
+EXTERN int		XNextEvent(Display *d, XEvent *x);
+/* 53 */
+EXTERN int		XPutBackEvent(Display *d, XEvent *x);
+/* 54 */
+EXTERN int		XQueryColors(Display *d, Colormap c, XColor *x,
+				int i);
+/* 55 */
+EXTERN Bool		XQueryPointer(Display *d, Window w1, Window *w2,
+				Window *w3, int *i1, int *i2, int *i3,
+				int *i4, unsigned int *ui);
+/* 56 */
+EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
+				Window *w3, Window **w4, unsigned int *ui);
+/* 57 */
+EXTERN int		XRaiseWindow(Display *d, Window w);
+/* 58 */
+EXTERN int		XRefreshKeyboardMapping(XMappingEvent *x);
+/* 59 */
+EXTERN int		XResizeWindow(Display *d, Window w, unsigned int ui1,
+				unsigned int ui2);
+/* 60 */
+EXTERN int		XSelectInput(Display *d, Window w, long l);
+/* 61 */
+EXTERN Status		XSendEvent(Display *d, Window w, Bool b, long l,
+				XEvent *x);
+/* 62 */
+EXTERN int		XSetCommand(Display *d, Window w, char **c, int i);
+/* 63 */
+EXTERN int		XSetIconName(Display *d, Window w, _Xconst char *c);
+/* 64 */
+EXTERN int		XSetInputFocus(Display *d, Window w, int i, Time t);
+/* 65 */
+EXTERN int		XSetSelectionOwner(Display *d, Atom a, Window w,
+				Time t);
+/* 66 */
+EXTERN int		XSetWindowBackground(Display *d, Window w,
+				unsigned long ul);
+/* 67 */
+EXTERN int		XSetWindowBackgroundPixmap(Display *d, Window w,
+				Pixmap p);
+/* 68 */
+EXTERN int		XSetWindowBorder(Display *d, Window w,
+				unsigned long ul);
+/* 69 */
+EXTERN int		XSetWindowBorderPixmap(Display *d, Window w,
+				Pixmap p);
+/* 70 */
+EXTERN int		XSetWindowBorderWidth(Display *d, Window w,
+				unsigned int ui);
+/* 71 */
+EXTERN int		XSetWindowColormap(Display *d, Window w, Colormap c);
+/* 72 */
+EXTERN Bool		XTranslateCoordinates(Display *d, Window w1,
+				Window w2, int i1, int i2, int *i3, int *i4,
+				Window *w3);
+/* 73 */
+EXTERN int		XUngrabKeyboard(Display *d, Time t);
+/* 74 */
+EXTERN int		XUngrabPointer(Display *d, Time t);
+/* 75 */
+EXTERN int		XUnmapWindow(Display *d, Window w);
+/* 76 */
+EXTERN int		XWindowEvent(Display *d, Window w, long l, XEvent *x);
+/* 77 */
+EXTERN void		XDestroyIC(XIC x);
+/* 78 */
+EXTERN Bool		XFilterEvent(XEvent *x, Window w);
+/* 79 */
+EXTERN int		XmbLookupString(XIC xi, XKeyPressedEvent *xk,
+				char *c, int i, KeySym *k, Status *s);
+/* 80 */
+EXTERN int		TkPutImage(unsigned long *colors, int ncolors,
+				Display *display, Drawable d, GC gc,
+				XImage *image, int src_x, int src_y,
+				int dest_x, int dest_y, unsigned int width,
+				unsigned int height);
+/* Slot 81 is reserved */
+/* 82 */
+EXTERN Status		XParseColor(Display *display, Colormap map,
+				_Xconst char *spec, XColor *colorPtr);
+/* 83 */
+EXTERN GC		XCreateGC(Display *display, Drawable d,
+				unsigned long valuemask, XGCValues *values);
+/* 84 */
+EXTERN int		XFreeGC(Display *display, GC gc);
+/* 85 */
+EXTERN Atom		XInternAtom(Display *display,
+				_Xconst char *atom_name, Bool only_if_exists);
+/* 86 */
+EXTERN int		XSetBackground(Display *display, GC gc,
+				unsigned long foreground);
+/* 87 */
+EXTERN int		XSetForeground(Display *display, GC gc,
+				unsigned long foreground);
+/* 88 */
+EXTERN int		XSetClipMask(Display *display, GC gc, Pixmap pixmap);
+/* 89 */
+EXTERN int		XSetClipOrigin(Display *display, GC gc,
+				int clip_x_origin, int clip_y_origin);
+/* 90 */
+EXTERN int		XSetTSOrigin(Display *display, GC gc,
+				int ts_x_origin, int ts_y_origin);
+/* 91 */
+EXTERN int		XChangeGC(Display *d, GC gc, unsigned long mask,
+				XGCValues *values);
+/* 92 */
+EXTERN int		XSetFont(Display *display, GC gc, Font font);
+/* 93 */
+EXTERN int		XSetArcMode(Display *display, GC gc, int arc_mode);
+/* 94 */
+EXTERN int		XSetStipple(Display *display, GC gc, Pixmap stipple);
+/* 95 */
+EXTERN int		XSetFillRule(Display *display, GC gc, int fill_rule);
+/* 96 */
+EXTERN int		XSetFillStyle(Display *display, GC gc,
+				int fill_style);
+/* 97 */
+EXTERN int		XSetFunction(Display *display, GC gc, int function);
+/* 98 */
+EXTERN int		XSetLineAttributes(Display *display, GC gc,
+				unsigned int line_width, int line_style,
+				int cap_style, int join_style);
+/* 99 */
+EXTERN int		_XInitImageFuncPtrs(XImage *image);
+/* 100 */
+EXTERN XIC		XCreateIC(XIM xim, ...);
+/* 101 */
+EXTERN XVisualInfo *	XGetVisualInfo(Display *display, long vinfo_mask,
+				XVisualInfo *vinfo_template,
+				int *nitems_return);
+/* 102 */
+EXTERN void		XSetWMClientMachine(Display *display, Window w,
+				XTextProperty *text_prop);
+/* 103 */
+EXTERN Status		XStringListToTextProperty(char **list, int count,
+				XTextProperty *text_prop_return);
+/* 104 */
+EXTERN int		XDrawLine(Display *d, Drawable dr, GC g, int x1,
+				int y1, int x2, int y2);
+/* 105 */
+EXTERN int		XWarpPointer(Display *d, Window s, Window dw, int sx,
+				int sy, unsigned int sw, unsigned int sh,
+				int dx, int dy);
+/* 106 */
+EXTERN int		XFillRectangle(Display *display, Drawable d, GC gc,
+				int x, int y, unsigned int width,
+				unsigned int height);
+/* 107 */
+EXTERN int		XFlush(Display *display);
+/* 108 */
+EXTERN int		XGrabServer(Display *display);
+/* 109 */
+EXTERN int		XUngrabServer(Display *display);
+/* 110 */
+EXTERN int		XFree(void *data);
+/* 111 */
+EXTERN int		XNoOp(Display *display);
+/* 112 */
+EXTERN XAfterFunction	XSynchronize(Display *display, Bool onoff);
+/* 113 */
+EXTERN int		XSync(Display *display, Bool discard);
+/* 114 */
+EXTERN VisualID		XVisualIDFromVisual(Visual *visual);
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+/* 0 */
+EXTERN int		XSetDashes(Display *display, GC gc, int dash_offset,
+				_Xconst char *dash_list, int n);
+/* 1 */
+EXTERN XModifierKeymap * XGetModifierMapping(Display *d);
+/* 2 */
+EXTERN XImage *		XCreateImage(Display *d, Visual *v, unsigned int ui1,
+				int i1, int i2, char *cp, unsigned int ui2,
+				unsigned int ui3, int i3, int i4);
+/* 3 */
+EXTERN XImage *		XGetImage(Display *d, Drawable dr, int i1, int i2,
+				unsigned int ui1, unsigned int ui2,
+				unsigned long ul, int i3);
+/* 4 */
+EXTERN char *		XGetAtomName(Display *d, Atom a);
+/* 5 */
+EXTERN char *		XKeysymToString(KeySym k);
+/* 6 */
+EXTERN Colormap		XCreateColormap(Display *d, Window w, Visual *v,
+				int i);
+/* 7 */
+EXTERN GContext		XGContextFromGC(GC g);
+/* 8 */
+EXTERN KeySym		XKeycodeToKeysym(Display *d, KeyCode k, int i);
+/* 9 */
+EXTERN KeySym		XStringToKeysym(_Xconst char *c);
+/* 10 */
+EXTERN Window		XRootWindow(Display *d, int i);
+/* 11 */
+EXTERN XErrorHandler	XSetErrorHandler(XErrorHandler x);
+/* 12 */
+EXTERN Status		XAllocColor(Display *d, Colormap c, XColor *xp);
+/* 13 */
+EXTERN int		XBell(Display *d, int i);
+/* 14 */
+EXTERN void		XChangeProperty(Display *d, Window w, Atom a1,
+				Atom a2, int i1, int i2,
+				_Xconst unsigned char *c, int i3);
+/* 15 */
+EXTERN void		XChangeWindowAttributes(Display *d, Window w,
+				unsigned long ul, XSetWindowAttributes *x);
+/* 16 */
+EXTERN void		XConfigureWindow(Display *d, Window w,
+				unsigned int i, XWindowChanges *x);
+/* 17 */
+EXTERN void		XCopyArea(Display *d, Drawable dr1, Drawable dr2,
+				GC g, int i1, int i2, unsigned int ui1,
+				unsigned int ui2, int i3, int i4);
+/* 18 */
+EXTERN void		XCopyPlane(Display *d, Drawable dr1, Drawable dr2,
+				GC g, int i1, int i2, unsigned int ui1,
+				unsigned int ui2, int i3, int i4,
+				unsigned long ul);
+/* 19 */
+EXTERN Pixmap		XCreateBitmapFromData(Display *display, Drawable d,
+				_Xconst char *data, unsigned int width,
+				unsigned int height);
+/* 20 */
+EXTERN int		XDefineCursor(Display *d, Window w, Cursor c);
+/* 21 */
+EXTERN void		XDestroyWindow(Display *d, Window w);
+/* 22 */
+EXTERN void		XDrawArc(Display *d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2,
+				int i3, int i4);
+/* 23 */
+EXTERN int		XDrawLines(Display *d, Drawable dr, GC g, XPoint *x,
+				int i1, int i2);
+/* 24 */
+EXTERN void		XDrawRectangle(Display *d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2);
+/* 25 */
+EXTERN void		XFillArc(Display *d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2,
+				int i3, int i4);
+/* 26 */
+EXTERN void		XFillPolygon(Display *d, Drawable dr, GC g,
+				XPoint *x, int i1, int i2, int i3);
+/* 27 */
+EXTERN int		XFillRectangles(Display *d, Drawable dr, GC g,
+				XRectangle *x, int i);
+/* 28 */
+EXTERN int		XFreeColormap(Display *d, Colormap c);
+/* 29 */
+EXTERN int		XFreeColors(Display *d, Colormap c,
+				unsigned long *ulp, int i, unsigned long ul);
+/* 30 */
+EXTERN int		XFreeModifiermap(XModifierKeymap *x);
+/* 31 */
+EXTERN Status		XGetGeometry(Display *d, Drawable dr, Window *w,
+				int *i1, int *i2, unsigned int *ui1,
+				unsigned int *ui2, unsigned int *ui3,
+				unsigned int *ui4);
+/* 32 */
+EXTERN int		XGetWindowProperty(Display *d, Window w, Atom a1,
+				long l1, long l2, Bool b, Atom a2, Atom *ap,
+				int *ip, unsigned long *ulp1,
+				unsigned long *ulp2, unsigned char **cpp);
+/* 33 */
+EXTERN int		XGrabKeyboard(Display *d, Window w, Bool b, int i1,
+				int i2, Time t);
+/* 34 */
+EXTERN int		XGrabPointer(Display *d, Window w1, Bool b,
+				unsigned int ui, int i1, int i2, Window w2,
+				Cursor c, Time t);
+/* 35 */
+EXTERN KeyCode		XKeysymToKeycode(Display *d, KeySym k);
+/* 36 */
+EXTERN void		XMapWindow(Display *d, Window w);
+/* 37 */
+EXTERN void		XMoveResizeWindow(Display *d, Window w, int i1,
+				int i2, unsigned int ui1, unsigned int ui2);
+/* 38 */
+EXTERN void		XMoveWindow(Display *d, Window w, int i1, int i2);
+/* 39 */
+EXTERN Bool		XQueryPointer(Display *d, Window w1, Window *w2,
+				Window *w3, int *i1, int *i2, int *i3,
+				int *i4, unsigned int *ui);
+/* 40 */
+EXTERN void		XRaiseWindow(Display *d, Window w);
+/* 41 */
+EXTERN void		XRefreshKeyboardMapping(XMappingEvent *x);
+/* 42 */
+EXTERN void		XResizeWindow(Display *d, Window w, unsigned int ui1,
+				unsigned int ui2);
+/* 43 */
+EXTERN void		XSelectInput(Display *d, Window w, long l);
+/* 44 */
+EXTERN Status		XSendEvent(Display *d, Window w, Bool b, long l,
+				XEvent *x);
+/* 45 */
+EXTERN void		XSetIconName(Display *d, Window w, _Xconst char *c);
+/* 46 */
+EXTERN void		XSetInputFocus(Display *d, Window w, int i, Time t);
+/* 47 */
+EXTERN int		XSetSelectionOwner(Display *d, Atom a, Window w,
+				Time t);
+/* 48 */
+EXTERN void		XSetWindowBackground(Display *d, Window w,
+				unsigned long ul);
+/* 49 */
+EXTERN void		XSetWindowBackgroundPixmap(Display *d, Window w,
+				Pixmap p);
+/* 50 */
+EXTERN void		XSetWindowBorder(Display *d, Window w,
+				unsigned long ul);
+/* 51 */
+EXTERN void		XSetWindowBorderPixmap(Display *d, Window w,
+				Pixmap p);
+/* 52 */
+EXTERN void		XSetWindowBorderWidth(Display *d, Window w,
+				unsigned int ui);
+/* 53 */
+EXTERN void		XSetWindowColormap(Display *d, Window w, Colormap c);
+/* 54 */
+EXTERN void		XUngrabKeyboard(Display *d, Time t);
+/* 55 */
+EXTERN int		XUngrabPointer(Display *d, Time t);
+/* 56 */
+EXTERN void		XUnmapWindow(Display *d, Window w);
+/* 57 */
+EXTERN int		TkPutImage(unsigned long *colors, int ncolors,
+				Display *display, Drawable d, GC gc,
+				XImage *image, int src_x, int src_y,
+				int dest_x, int dest_y, unsigned int width,
+				unsigned int height);
+/* 58 */
+EXTERN Status		XParseColor(Display *display, Colormap map,
+				_Xconst char *spec, XColor *colorPtr);
+/* 59 */
+EXTERN GC		XCreateGC(Display *display, Drawable d,
+				unsigned long valuemask, XGCValues *values);
+/* 60 */
+EXTERN int		XFreeGC(Display *display, GC gc);
+/* 61 */
+EXTERN Atom		XInternAtom(Display *display,
+				_Xconst char *atom_name, Bool only_if_exists);
+/* 62 */
+EXTERN int		XSetBackground(Display *display, GC gc,
+				unsigned long foreground);
+/* 63 */
+EXTERN int		XSetForeground(Display *display, GC gc,
+				unsigned long foreground);
+/* 64 */
+EXTERN int		XSetClipMask(Display *display, GC gc, Pixmap pixmap);
+/* 65 */
+EXTERN int		XSetClipOrigin(Display *display, GC gc,
+				int clip_x_origin, int clip_y_origin);
+/* 66 */
+EXTERN int		XSetTSOrigin(Display *display, GC gc,
+				int ts_x_origin, int ts_y_origin);
+/* 67 */
+EXTERN int		XChangeGC(Display *d, GC gc, unsigned long mask,
+				XGCValues *values);
+/* 68 */
+EXTERN int		XSetFont(Display *display, GC gc, Font font);
+/* 69 */
+EXTERN int		XSetArcMode(Display *display, GC gc, int arc_mode);
+/* 70 */
+EXTERN int		XSetStipple(Display *display, GC gc, Pixmap stipple);
+/* 71 */
+EXTERN int		XSetFillRule(Display *display, GC gc, int fill_rule);
+/* 72 */
+EXTERN int		XSetFillStyle(Display *display, GC gc,
+				int fill_style);
+/* 73 */
+EXTERN int		XSetFunction(Display *display, GC gc, int function);
+/* 74 */
+EXTERN int		XSetLineAttributes(Display *display, GC gc,
+				unsigned int line_width, int line_style,
+				int cap_style, int join_style);
+/* 75 */
+EXTERN int		_XInitImageFuncPtrs(XImage *image);
+/* 76 */
+EXTERN XIC		XCreateIC(void);
+/* 77 */
+EXTERN XVisualInfo *	XGetVisualInfo(Display *display, long vinfo_mask,
+				XVisualInfo *vinfo_template,
+				int *nitems_return);
+/* 78 */
+EXTERN void		XSetWMClientMachine(Display *display, Window w,
+				XTextProperty *text_prop);
+/* 79 */
+EXTERN Status		XStringListToTextProperty(char **list, int count,
+				XTextProperty *text_prop_return);
+/* 80 */
+EXTERN void		XDrawSegments(Display *display, Drawable d, GC gc,
+				XSegment *segments, int nsegments);
+/* 81 */
+EXTERN void		XForceScreenSaver(Display *display, int mode);
+/* 82 */
+EXTERN int		XDrawLine(Display *d, Drawable dr, GC g, int x1,
+				int y1, int x2, int y2);
+/* 83 */
+EXTERN int		XFillRectangle(Display *display, Drawable d, GC gc,
+				int x, int y, unsigned int width,
+				unsigned int height);
+/* 84 */
+EXTERN void		XClearWindow(Display *d, Window w);
+/* 85 */
+EXTERN void		XDrawPoint(Display *display, Drawable d, GC gc,
+				int x, int y);
+/* 86 */
+EXTERN void		XDrawPoints(Display *display, Drawable d, GC gc,
+				XPoint *points, int npoints, int mode);
+/* 87 */
+EXTERN int		XWarpPointer(Display *display, Window src_w,
+				Window dest_w, int src_x, int src_y,
+				unsigned int src_width,
+				unsigned int src_height, int dest_x,
+				int dest_y);
+/* 88 */
+EXTERN void		XQueryColor(Display *display, Colormap colormap,
+				XColor *def_in_out);
+/* 89 */
+EXTERN void		XQueryColors(Display *display, Colormap colormap,
+				XColor *defs_in_out, int ncolors);
+/* 90 */
+EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
+				Window *w3, Window **w4, unsigned int *ui);
+/* 91 */
+EXTERN int		XSync(Display *display, Bool flag);
+#endif /* AQUA */
+
+typedef struct TkIntXlibStubs {
+    int magic;
+    void *hooks;
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+    int (*xSetDashes) (Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 0 */
+    XModifierKeymap * (*xGetModifierMapping) (Display *d); /* 1 */
+    XImage * (*xCreateImage) (Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */
+    XImage * (*xGetImage) (Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3); /* 3 */
+    char * (*xGetAtomName) (Display *d, Atom a); /* 4 */
+    char * (*xKeysymToString) (KeySym k); /* 5 */
+    Colormap (*xCreateColormap) (Display *d, Window w, Visual *v, int i); /* 6 */
+    Cursor (*xCreatePixmapCursor) (Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2); /* 7 */
+    Cursor (*xCreateGlyphCursor) (Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, XColor _Xconst *x2); /* 8 */
+    GContext (*xGContextFromGC) (GC g); /* 9 */
+    XHostAddress * (*xListHosts) (Display *d, int *i, Bool *b); /* 10 */
+    KeySym (*xKeycodeToKeysym) (Display *d, unsigned int k, int i); /* 11 */
+    KeySym (*xStringToKeysym) (_Xconst char *c); /* 12 */
+    Window (*xRootWindow) (Display *d, int i); /* 13 */
+    XErrorHandler (*xSetErrorHandler) (XErrorHandler x); /* 14 */
+    Status (*xIconifyWindow) (Display *d, Window w, int i); /* 15 */
+    Status (*xWithdrawWindow) (Display *d, Window w, int i); /* 16 */
+    Status (*xGetWMColormapWindows) (Display *d, Window w, Window **wpp, int *ip); /* 17 */
+    Status (*xAllocColor) (Display *d, Colormap c, XColor *xp); /* 18 */
+    int (*xBell) (Display *d, int i); /* 19 */
+    int (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 20 */
+    int (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 21 */
+    int (*xClearWindow) (Display *d, Window w); /* 22 */
+    int (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 23 */
+    int (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 24 */
+    int (*xCopyPlane) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul); /* 25 */
+    Pixmap (*xCreateBitmapFromData) (Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 26 */
+    int (*xDefineCursor) (Display *d, Window w, Cursor c); /* 27 */
+    int (*xDeleteProperty) (Display *d, Window w, Atom a); /* 28 */
+    int (*xDestroyWindow) (Display *d, Window w); /* 29 */
+    int (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 30 */
+    int (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 31 */
+    int (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 32 */
+    int (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 33 */
+    int (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 34 */
+    int (*xFillRectangles) (Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 35 */
+    int (*xForceScreenSaver) (Display *d, int i); /* 36 */
+    int (*xFreeColormap) (Display *d, Colormap c); /* 37 */
+    int (*xFreeColors) (Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 38 */
+    int (*xFreeCursor) (Display *d, Cursor c); /* 39 */
+    int (*xFreeModifiermap) (XModifierKeymap *x); /* 40 */
+    Status (*xGetGeometry) (Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4); /* 41 */
+    int (*xGetInputFocus) (Display *d, Window *w, int *i); /* 42 */
+    int (*xGetWindowProperty) (Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp); /* 43 */
+    Status (*xGetWindowAttributes) (Display *d, Window w, XWindowAttributes *x); /* 44 */
+    int (*xGrabKeyboard) (Display *d, Window w, Bool b, int i1, int i2, Time t); /* 45 */
+    int (*xGrabPointer) (Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t); /* 46 */
+    KeyCode (*xKeysymToKeycode) (Display *d, KeySym k); /* 47 */
+    Status (*xLookupColor) (Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2); /* 48 */
+    int (*xMapWindow) (Display *d, Window w); /* 49 */
+    int (*xMoveResizeWindow) (Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 50 */
+    int (*xMoveWindow) (Display *d, Window w, int i1, int i2); /* 51 */
+    int (*xNextEvent) (Display *d, XEvent *x); /* 52 */
+    int (*xPutBackEvent) (Display *d, XEvent *x); /* 53 */
+    int (*xQueryColors) (Display *d, Colormap c, XColor *x, int i); /* 54 */
+    Bool (*xQueryPointer) (Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui); /* 55 */
+    Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 56 */
+    int (*xRaiseWindow) (Display *d, Window w); /* 57 */
+    int (*xRefreshKeyboardMapping) (XMappingEvent *x); /* 58 */
+    int (*xResizeWindow) (Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 59 */
+    int (*xSelectInput) (Display *d, Window w, long l); /* 60 */
+    Status (*xSendEvent) (Display *d, Window w, Bool b, long l, XEvent *x); /* 61 */
+    int (*xSetCommand) (Display *d, Window w, char **c, int i); /* 62 */
+    int (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 63 */
+    int (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 64 */
+    int (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 65 */
+    int (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 66 */
+    int (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 67 */
+    int (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 68 */
+    int (*xSetWindowBorderPixmap) (Display *d, Window w, Pixmap p); /* 69 */
+    int (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 70 */
+    int (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 71 */
+    Bool (*xTranslateCoordinates) (Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3); /* 72 */
+    int (*xUngrabKeyboard) (Display *d, Time t); /* 73 */
+    int (*xUngrabPointer) (Display *d, Time t); /* 74 */
+    int (*xUnmapWindow) (Display *d, Window w); /* 75 */
+    int (*xWindowEvent) (Display *d, Window w, long l, XEvent *x); /* 76 */
+    void (*xDestroyIC) (XIC x); /* 77 */
+    Bool (*xFilterEvent) (XEvent *x, Window w); /* 78 */
+    int (*xmbLookupString) (XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s); /* 79 */
+    int (*tkPutImage) (unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height); /* 80 */
+    void (*reserved81)(void);
+    Status (*xParseColor) (Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 82 */
+    GC (*xCreateGC) (Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 83 */
+    int (*xFreeGC) (Display *display, GC gc); /* 84 */
+    Atom (*xInternAtom) (Display *display, _Xconst char *atom_name, Bool only_if_exists); /* 85 */
+    int (*xSetBackground) (Display *display, GC gc, unsigned long foreground); /* 86 */
+    int (*xSetForeground) (Display *display, GC gc, unsigned long foreground); /* 87 */
+    int (*xSetClipMask) (Display *display, GC gc, Pixmap pixmap); /* 88 */
+    int (*xSetClipOrigin) (Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 89 */
+    int (*xSetTSOrigin) (Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 90 */
+    int (*xChangeGC) (Display *d, GC gc, unsigned long mask, XGCValues *values); /* 91 */
+    int (*xSetFont) (Display *display, GC gc, Font font); /* 92 */
+    int (*xSetArcMode) (Display *display, GC gc, int arc_mode); /* 93 */
+    int (*xSetStipple) (Display *display, GC gc, Pixmap stipple); /* 94 */
+    int (*xSetFillRule) (Display *display, GC gc, int fill_rule); /* 95 */
+    int (*xSetFillStyle) (Display *display, GC gc, int fill_style); /* 96 */
+    int (*xSetFunction) (Display *display, GC gc, int function); /* 97 */
+    int (*xSetLineAttributes) (Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 98 */
+    int (*_XInitImageFuncPtrs) (XImage *image); /* 99 */
+    XIC (*xCreateIC) (XIM xim, ...); /* 100 */
+    XVisualInfo * (*xGetVisualInfo) (Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 101 */
+    void (*xSetWMClientMachine) (Display *display, Window w, XTextProperty *text_prop); /* 102 */
+    Status (*xStringListToTextProperty) (char **list, int count, XTextProperty *text_prop_return); /* 103 */
+    int (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 104 */
+    int (*xWarpPointer) (Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy); /* 105 */
+    int (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 106 */
+    int (*xFlush) (Display *display); /* 107 */
+    int (*xGrabServer) (Display *display); /* 108 */
+    int (*xUngrabServer) (Display *display); /* 109 */
+    int (*xFree) (void *data); /* 110 */
+    int (*xNoOp) (Display *display); /* 111 */
+    XAfterFunction (*xSynchronize) (Display *display, Bool onoff); /* 112 */
+    int (*xSync) (Display *display, Bool discard); /* 113 */
+    VisualID (*xVisualIDFromVisual) (Visual *visual); /* 114 */
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    int (*xSetDashes) (Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 0 */
+    XModifierKeymap * (*xGetModifierMapping) (Display *d); /* 1 */
+    XImage * (*xCreateImage) (Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */
+    XImage * (*xGetImage) (Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3); /* 3 */
+    char * (*xGetAtomName) (Display *d, Atom a); /* 4 */
+    char * (*xKeysymToString) (KeySym k); /* 5 */
+    Colormap (*xCreateColormap) (Display *d, Window w, Visual *v, int i); /* 6 */
+    GContext (*xGContextFromGC) (GC g); /* 7 */
+    KeySym (*xKeycodeToKeysym) (Display *d, KeyCode k, int i); /* 8 */
+    KeySym (*xStringToKeysym) (_Xconst char *c); /* 9 */
+    Window (*xRootWindow) (Display *d, int i); /* 10 */
+    XErrorHandler (*xSetErrorHandler) (XErrorHandler x); /* 11 */
+    Status (*xAllocColor) (Display *d, Colormap c, XColor *xp); /* 12 */
+    int (*xBell) (Display *d, int i); /* 13 */
+    void (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 14 */
+    void (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 15 */
+    void (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 16 */
+    void (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 17 */
+    void (*xCopyPlane) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul); /* 18 */
+    Pixmap (*xCreateBitmapFromData) (Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 19 */
+    int (*xDefineCursor) (Display *d, Window w, Cursor c); /* 20 */
+    void (*xDestroyWindow) (Display *d, Window w); /* 21 */
+    void (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 22 */
+    int (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 23 */
+    void (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 24 */
+    void (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 25 */
+    void (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 26 */
+    int (*xFillRectangles) (Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 27 */
+    int (*xFreeColormap) (Display *d, Colormap c); /* 28 */
+    int (*xFreeColors) (Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 29 */
+    int (*xFreeModifiermap) (XModifierKeymap *x); /* 30 */
+    Status (*xGetGeometry) (Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4); /* 31 */
+    int (*xGetWindowProperty) (Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp); /* 32 */
+    int (*xGrabKeyboard) (Display *d, Window w, Bool b, int i1, int i2, Time t); /* 33 */
+    int (*xGrabPointer) (Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t); /* 34 */
+    KeyCode (*xKeysymToKeycode) (Display *d, KeySym k); /* 35 */
+    void (*xMapWindow) (Display *d, Window w); /* 36 */
+    void (*xMoveResizeWindow) (Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 37 */
+    void (*xMoveWindow) (Display *d, Window w, int i1, int i2); /* 38 */
+    Bool (*xQueryPointer) (Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui); /* 39 */
+    void (*xRaiseWindow) (Display *d, Window w); /* 40 */
+    void (*xRefreshKeyboardMapping) (XMappingEvent *x); /* 41 */
+    void (*xResizeWindow) (Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 42 */
+    void (*xSelectInput) (Display *d, Window w, long l); /* 43 */
+    Status (*xSendEvent) (Display *d, Window w, Bool b, long l, XEvent *x); /* 44 */
+    void (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 45 */
+    void (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 46 */
+    int (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 47 */
+    void (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 48 */
+    void (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 49 */
+    void (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 50 */
+    void (*xSetWindowBorderPixmap) (Display *d, Window w, Pixmap p); /* 51 */
+    void (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 52 */
+    void (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 53 */
+    void (*xUngrabKeyboard) (Display *d, Time t); /* 54 */
+    int (*xUngrabPointer) (Display *d, Time t); /* 55 */
+    void (*xUnmapWindow) (Display *d, Window w); /* 56 */
+    int (*tkPutImage) (unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height); /* 57 */
+    Status (*xParseColor) (Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 58 */
+    GC (*xCreateGC) (Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 59 */
+    int (*xFreeGC) (Display *display, GC gc); /* 60 */
+    Atom (*xInternAtom) (Display *display, _Xconst char *atom_name, Bool only_if_exists); /* 61 */
+    int (*xSetBackground) (Display *display, GC gc, unsigned long foreground); /* 62 */
+    int (*xSetForeground) (Display *display, GC gc, unsigned long foreground); /* 63 */
+    int (*xSetClipMask) (Display *display, GC gc, Pixmap pixmap); /* 64 */
+    int (*xSetClipOrigin) (Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 65 */
+    int (*xSetTSOrigin) (Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 66 */
+    int (*xChangeGC) (Display *d, GC gc, unsigned long mask, XGCValues *values); /* 67 */
+    int (*xSetFont) (Display *display, GC gc, Font font); /* 68 */
+    int (*xSetArcMode) (Display *display, GC gc, int arc_mode); /* 69 */
+    int (*xSetStipple) (Display *display, GC gc, Pixmap stipple); /* 70 */
+    int (*xSetFillRule) (Display *display, GC gc, int fill_rule); /* 71 */
+    int (*xSetFillStyle) (Display *display, GC gc, int fill_style); /* 72 */
+    int (*xSetFunction) (Display *display, GC gc, int function); /* 73 */
+    int (*xSetLineAttributes) (Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 74 */
+    int (*_XInitImageFuncPtrs) (XImage *image); /* 75 */
+    XIC (*xCreateIC) (void); /* 76 */
+    XVisualInfo * (*xGetVisualInfo) (Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 77 */
+    void (*xSetWMClientMachine) (Display *display, Window w, XTextProperty *text_prop); /* 78 */
+    Status (*xStringListToTextProperty) (char **list, int count, XTextProperty *text_prop_return); /* 79 */
+    void (*xDrawSegments) (Display *display, Drawable d, GC gc, XSegment *segments, int nsegments); /* 80 */
+    void (*xForceScreenSaver) (Display *display, int mode); /* 81 */
+    int (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 82 */
+    int (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 83 */
+    void (*xClearWindow) (Display *d, Window w); /* 84 */
+    void (*xDrawPoint) (Display *display, Drawable d, GC gc, int x, int y); /* 85 */
+    void (*xDrawPoints) (Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode); /* 86 */
+    int (*xWarpPointer) (Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y); /* 87 */
+    void (*xQueryColor) (Display *display, Colormap colormap, XColor *def_in_out); /* 88 */
+    void (*xQueryColors) (Display *display, Colormap colormap, XColor *defs_in_out, int ncolors); /* 89 */
+    Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 90 */
+    int (*xSync) (Display *display, Bool flag); /* 91 */
+#endif /* AQUA */
+} TkIntXlibStubs;
+
+extern const TkIntXlibStubs *tkIntXlibStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_TK_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#define XSetDashes \
+	(tkIntXlibStubsPtr->xSetDashes) /* 0 */
+#define XGetModifierMapping \
+	(tkIntXlibStubsPtr->xGetModifierMapping) /* 1 */
+#define XCreateImage \
+	(tkIntXlibStubsPtr->xCreateImage) /* 2 */
+#define XGetImage \
+	(tkIntXlibStubsPtr->xGetImage) /* 3 */
+#define XGetAtomName \
+	(tkIntXlibStubsPtr->xGetAtomName) /* 4 */
+#define XKeysymToString \
+	(tkIntXlibStubsPtr->xKeysymToString) /* 5 */
+#define XCreateColormap \
+	(tkIntXlibStubsPtr->xCreateColormap) /* 6 */
+#define XCreatePixmapCursor \
+	(tkIntXlibStubsPtr->xCreatePixmapCursor) /* 7 */
+#define XCreateGlyphCursor \
+	(tkIntXlibStubsPtr->xCreateGlyphCursor) /* 8 */
+#define XGContextFromGC \
+	(tkIntXlibStubsPtr->xGContextFromGC) /* 9 */
+#define XListHosts \
+	(tkIntXlibStubsPtr->xListHosts) /* 10 */
+#define XKeycodeToKeysym \
+	(tkIntXlibStubsPtr->xKeycodeToKeysym) /* 11 */
+#define XStringToKeysym \
+	(tkIntXlibStubsPtr->xStringToKeysym) /* 12 */
+#define XRootWindow \
+	(tkIntXlibStubsPtr->xRootWindow) /* 13 */
+#define XSetErrorHandler \
+	(tkIntXlibStubsPtr->xSetErrorHandler) /* 14 */
+#define XIconifyWindow \
+	(tkIntXlibStubsPtr->xIconifyWindow) /* 15 */
+#define XWithdrawWindow \
+	(tkIntXlibStubsPtr->xWithdrawWindow) /* 16 */
+#define XGetWMColormapWindows \
+	(tkIntXlibStubsPtr->xGetWMColormapWindows) /* 17 */
+#define XAllocColor \
+	(tkIntXlibStubsPtr->xAllocColor) /* 18 */
+#define XBell \
+	(tkIntXlibStubsPtr->xBell) /* 19 */
+#define XChangeProperty \
+	(tkIntXlibStubsPtr->xChangeProperty) /* 20 */
+#define XChangeWindowAttributes \
+	(tkIntXlibStubsPtr->xChangeWindowAttributes) /* 21 */
+#define XClearWindow \
+	(tkIntXlibStubsPtr->xClearWindow) /* 22 */
+#define XConfigureWindow \
+	(tkIntXlibStubsPtr->xConfigureWindow) /* 23 */
+#define XCopyArea \
+	(tkIntXlibStubsPtr->xCopyArea) /* 24 */
+#define XCopyPlane \
+	(tkIntXlibStubsPtr->xCopyPlane) /* 25 */
+#define XCreateBitmapFromData \
+	(tkIntXlibStubsPtr->xCreateBitmapFromData) /* 26 */
+#define XDefineCursor \
+	(tkIntXlibStubsPtr->xDefineCursor) /* 27 */
+#define XDeleteProperty \
+	(tkIntXlibStubsPtr->xDeleteProperty) /* 28 */
+#define XDestroyWindow \
+	(tkIntXlibStubsPtr->xDestroyWindow) /* 29 */
+#define XDrawArc \
+	(tkIntXlibStubsPtr->xDrawArc) /* 30 */
+#define XDrawLines \
+	(tkIntXlibStubsPtr->xDrawLines) /* 31 */
+#define XDrawRectangle \
+	(tkIntXlibStubsPtr->xDrawRectangle) /* 32 */
+#define XFillArc \
+	(tkIntXlibStubsPtr->xFillArc) /* 33 */
+#define XFillPolygon \
+	(tkIntXlibStubsPtr->xFillPolygon) /* 34 */
+#define XFillRectangles \
+	(tkIntXlibStubsPtr->xFillRectangles) /* 35 */
+#define XForceScreenSaver \
+	(tkIntXlibStubsPtr->xForceScreenSaver) /* 36 */
+#define XFreeColormap \
+	(tkIntXlibStubsPtr->xFreeColormap) /* 37 */
+#define XFreeColors \
+	(tkIntXlibStubsPtr->xFreeColors) /* 38 */
+#define XFreeCursor \
+	(tkIntXlibStubsPtr->xFreeCursor) /* 39 */
+#define XFreeModifiermap \
+	(tkIntXlibStubsPtr->xFreeModifiermap) /* 40 */
+#define XGetGeometry \
+	(tkIntXlibStubsPtr->xGetGeometry) /* 41 */
+#define XGetInputFocus \
+	(tkIntXlibStubsPtr->xGetInputFocus) /* 42 */
+#define XGetWindowProperty \
+	(tkIntXlibStubsPtr->xGetWindowProperty) /* 43 */
+#define XGetWindowAttributes \
+	(tkIntXlibStubsPtr->xGetWindowAttributes) /* 44 */
+#define XGrabKeyboard \
+	(tkIntXlibStubsPtr->xGrabKeyboard) /* 45 */
+#define XGrabPointer \
+	(tkIntXlibStubsPtr->xGrabPointer) /* 46 */
+#define XKeysymToKeycode \
+	(tkIntXlibStubsPtr->xKeysymToKeycode) /* 47 */
+#define XLookupColor \
+	(tkIntXlibStubsPtr->xLookupColor) /* 48 */
+#define XMapWindow \
+	(tkIntXlibStubsPtr->xMapWindow) /* 49 */
+#define XMoveResizeWindow \
+	(tkIntXlibStubsPtr->xMoveResizeWindow) /* 50 */
+#define XMoveWindow \
+	(tkIntXlibStubsPtr->xMoveWindow) /* 51 */
+#define XNextEvent \
+	(tkIntXlibStubsPtr->xNextEvent) /* 52 */
+#define XPutBackEvent \
+	(tkIntXlibStubsPtr->xPutBackEvent) /* 53 */
+#define XQueryColors \
+	(tkIntXlibStubsPtr->xQueryColors) /* 54 */
+#define XQueryPointer \
+	(tkIntXlibStubsPtr->xQueryPointer) /* 55 */
+#define XQueryTree \
+	(tkIntXlibStubsPtr->xQueryTree) /* 56 */
+#define XRaiseWindow \
+	(tkIntXlibStubsPtr->xRaiseWindow) /* 57 */
+#define XRefreshKeyboardMapping \
+	(tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 58 */
+#define XResizeWindow \
+	(tkIntXlibStubsPtr->xResizeWindow) /* 59 */
+#define XSelectInput \
+	(tkIntXlibStubsPtr->xSelectInput) /* 60 */
+#define XSendEvent \
+	(tkIntXlibStubsPtr->xSendEvent) /* 61 */
+#define XSetCommand \
+	(tkIntXlibStubsPtr->xSetCommand) /* 62 */
+#define XSetIconName \
+	(tkIntXlibStubsPtr->xSetIconName) /* 63 */
+#define XSetInputFocus \
+	(tkIntXlibStubsPtr->xSetInputFocus) /* 64 */
+#define XSetSelectionOwner \
+	(tkIntXlibStubsPtr->xSetSelectionOwner) /* 65 */
+#define XSetWindowBackground \
+	(tkIntXlibStubsPtr->xSetWindowBackground) /* 66 */
+#define XSetWindowBackgroundPixmap \
+	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 67 */
+#define XSetWindowBorder \
+	(tkIntXlibStubsPtr->xSetWindowBorder) /* 68 */
+#define XSetWindowBorderPixmap \
+	(tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 69 */
+#define XSetWindowBorderWidth \
+	(tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 70 */
+#define XSetWindowColormap \
+	(tkIntXlibStubsPtr->xSetWindowColormap) /* 71 */
+#define XTranslateCoordinates \
+	(tkIntXlibStubsPtr->xTranslateCoordinates) /* 72 */
+#define XUngrabKeyboard \
+	(tkIntXlibStubsPtr->xUngrabKeyboard) /* 73 */
+#define XUngrabPointer \
+	(tkIntXlibStubsPtr->xUngrabPointer) /* 74 */
+#define XUnmapWindow \
+	(tkIntXlibStubsPtr->xUnmapWindow) /* 75 */
+#define XWindowEvent \
+	(tkIntXlibStubsPtr->xWindowEvent) /* 76 */
+#define XDestroyIC \
+	(tkIntXlibStubsPtr->xDestroyIC) /* 77 */
+#define XFilterEvent \
+	(tkIntXlibStubsPtr->xFilterEvent) /* 78 */
+#define XmbLookupString \
+	(tkIntXlibStubsPtr->xmbLookupString) /* 79 */
+#define TkPutImage \
+	(tkIntXlibStubsPtr->tkPutImage) /* 80 */
+/* Slot 81 is reserved */
+#define XParseColor \
+	(tkIntXlibStubsPtr->xParseColor) /* 82 */
+#define XCreateGC \
+	(tkIntXlibStubsPtr->xCreateGC) /* 83 */
+#define XFreeGC \
+	(tkIntXlibStubsPtr->xFreeGC) /* 84 */
+#define XInternAtom \
+	(tkIntXlibStubsPtr->xInternAtom) /* 85 */
+#define XSetBackground \
+	(tkIntXlibStubsPtr->xSetBackground) /* 86 */
+#define XSetForeground \
+	(tkIntXlibStubsPtr->xSetForeground) /* 87 */
+#define XSetClipMask \
+	(tkIntXlibStubsPtr->xSetClipMask) /* 88 */
+#define XSetClipOrigin \
+	(tkIntXlibStubsPtr->xSetClipOrigin) /* 89 */
+#define XSetTSOrigin \
+	(tkIntXlibStubsPtr->xSetTSOrigin) /* 90 */
+#define XChangeGC \
+	(tkIntXlibStubsPtr->xChangeGC) /* 91 */
+#define XSetFont \
+	(tkIntXlibStubsPtr->xSetFont) /* 92 */
+#define XSetArcMode \
+	(tkIntXlibStubsPtr->xSetArcMode) /* 93 */
+#define XSetStipple \
+	(tkIntXlibStubsPtr->xSetStipple) /* 94 */
+#define XSetFillRule \
+	(tkIntXlibStubsPtr->xSetFillRule) /* 95 */
+#define XSetFillStyle \
+	(tkIntXlibStubsPtr->xSetFillStyle) /* 96 */
+#define XSetFunction \
+	(tkIntXlibStubsPtr->xSetFunction) /* 97 */
+#define XSetLineAttributes \
+	(tkIntXlibStubsPtr->xSetLineAttributes) /* 98 */
+#define _XInitImageFuncPtrs \
+	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 99 */
+#define XCreateIC \
+	(tkIntXlibStubsPtr->xCreateIC) /* 100 */
+#define XGetVisualInfo \
+	(tkIntXlibStubsPtr->xGetVisualInfo) /* 101 */
+#define XSetWMClientMachine \
+	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 102 */
+#define XStringListToTextProperty \
+	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 103 */
+#define XDrawLine \
+	(tkIntXlibStubsPtr->xDrawLine) /* 104 */
+#define XWarpPointer \
+	(tkIntXlibStubsPtr->xWarpPointer) /* 105 */
+#define XFillRectangle \
+	(tkIntXlibStubsPtr->xFillRectangle) /* 106 */
+#define XFlush \
+	(tkIntXlibStubsPtr->xFlush) /* 107 */
+#define XGrabServer \
+	(tkIntXlibStubsPtr->xGrabServer) /* 108 */
+#define XUngrabServer \
+	(tkIntXlibStubsPtr->xUngrabServer) /* 109 */
+#define XFree \
+	(tkIntXlibStubsPtr->xFree) /* 110 */
+#define XNoOp \
+	(tkIntXlibStubsPtr->xNoOp) /* 111 */
+#define XSynchronize \
+	(tkIntXlibStubsPtr->xSynchronize) /* 112 */
+#define XSync \
+	(tkIntXlibStubsPtr->xSync) /* 113 */
+#define XVisualIDFromVisual \
+	(tkIntXlibStubsPtr->xVisualIDFromVisual) /* 114 */
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+#define XSetDashes \
+	(tkIntXlibStubsPtr->xSetDashes) /* 0 */
+#define XGetModifierMapping \
+	(tkIntXlibStubsPtr->xGetModifierMapping) /* 1 */
+#define XCreateImage \
+	(tkIntXlibStubsPtr->xCreateImage) /* 2 */
+#define XGetImage \
+	(tkIntXlibStubsPtr->xGetImage) /* 3 */
+#define XGetAtomName \
+	(tkIntXlibStubsPtr->xGetAtomName) /* 4 */
+#define XKeysymToString \
+	(tkIntXlibStubsPtr->xKeysymToString) /* 5 */
+#define XCreateColormap \
+	(tkIntXlibStubsPtr->xCreateColormap) /* 6 */
+#define XGContextFromGC \
+	(tkIntXlibStubsPtr->xGContextFromGC) /* 7 */
+#define XKeycodeToKeysym \
+	(tkIntXlibStubsPtr->xKeycodeToKeysym) /* 8 */
+#define XStringToKeysym \
+	(tkIntXlibStubsPtr->xStringToKeysym) /* 9 */
+#define XRootWindow \
+	(tkIntXlibStubsPtr->xRootWindow) /* 10 */
+#define XSetErrorHandler \
+	(tkIntXlibStubsPtr->xSetErrorHandler) /* 11 */
+#define XAllocColor \
+	(tkIntXlibStubsPtr->xAllocColor) /* 12 */
+#define XBell \
+	(tkIntXlibStubsPtr->xBell) /* 13 */
+#define XChangeProperty \
+	(tkIntXlibStubsPtr->xChangeProperty) /* 14 */
+#define XChangeWindowAttributes \
+	(tkIntXlibStubsPtr->xChangeWindowAttributes) /* 15 */
+#define XConfigureWindow \
+	(tkIntXlibStubsPtr->xConfigureWindow) /* 16 */
+#define XCopyArea \
+	(tkIntXlibStubsPtr->xCopyArea) /* 17 */
+#define XCopyPlane \
+	(tkIntXlibStubsPtr->xCopyPlane) /* 18 */
+#define XCreateBitmapFromData \
+	(tkIntXlibStubsPtr->xCreateBitmapFromData) /* 19 */
+#define XDefineCursor \
+	(tkIntXlibStubsPtr->xDefineCursor) /* 20 */
+#define XDestroyWindow \
+	(tkIntXlibStubsPtr->xDestroyWindow) /* 21 */
+#define XDrawArc \
+	(tkIntXlibStubsPtr->xDrawArc) /* 22 */
+#define XDrawLines \
+	(tkIntXlibStubsPtr->xDrawLines) /* 23 */
+#define XDrawRectangle \
+	(tkIntXlibStubsPtr->xDrawRectangle) /* 24 */
+#define XFillArc \
+	(tkIntXlibStubsPtr->xFillArc) /* 25 */
+#define XFillPolygon \
+	(tkIntXlibStubsPtr->xFillPolygon) /* 26 */
+#define XFillRectangles \
+	(tkIntXlibStubsPtr->xFillRectangles) /* 27 */
+#define XFreeColormap \
+	(tkIntXlibStubsPtr->xFreeColormap) /* 28 */
+#define XFreeColors \
+	(tkIntXlibStubsPtr->xFreeColors) /* 29 */
+#define XFreeModifiermap \
+	(tkIntXlibStubsPtr->xFreeModifiermap) /* 30 */
+#define XGetGeometry \
+	(tkIntXlibStubsPtr->xGetGeometry) /* 31 */
+#define XGetWindowProperty \
+	(tkIntXlibStubsPtr->xGetWindowProperty) /* 32 */
+#define XGrabKeyboard \
+	(tkIntXlibStubsPtr->xGrabKeyboard) /* 33 */
+#define XGrabPointer \
+	(tkIntXlibStubsPtr->xGrabPointer) /* 34 */
+#define XKeysymToKeycode \
+	(tkIntXlibStubsPtr->xKeysymToKeycode) /* 35 */
+#define XMapWindow \
+	(tkIntXlibStubsPtr->xMapWindow) /* 36 */
+#define XMoveResizeWindow \
+	(tkIntXlibStubsPtr->xMoveResizeWindow) /* 37 */
+#define XMoveWindow \
+	(tkIntXlibStubsPtr->xMoveWindow) /* 38 */
+#define XQueryPointer \
+	(tkIntXlibStubsPtr->xQueryPointer) /* 39 */
+#define XRaiseWindow \
+	(tkIntXlibStubsPtr->xRaiseWindow) /* 40 */
+#define XRefreshKeyboardMapping \
+	(tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 41 */
+#define XResizeWindow \
+	(tkIntXlibStubsPtr->xResizeWindow) /* 42 */
+#define XSelectInput \
+	(tkIntXlibStubsPtr->xSelectInput) /* 43 */
+#define XSendEvent \
+	(tkIntXlibStubsPtr->xSendEvent) /* 44 */
+#define XSetIconName \
+	(tkIntXlibStubsPtr->xSetIconName) /* 45 */
+#define XSetInputFocus \
+	(tkIntXlibStubsPtr->xSetInputFocus) /* 46 */
+#define XSetSelectionOwner \
+	(tkIntXlibStubsPtr->xSetSelectionOwner) /* 47 */
+#define XSetWindowBackground \
+	(tkIntXlibStubsPtr->xSetWindowBackground) /* 48 */
+#define XSetWindowBackgroundPixmap \
+	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 49 */
+#define XSetWindowBorder \
+	(tkIntXlibStubsPtr->xSetWindowBorder) /* 50 */
+#define XSetWindowBorderPixmap \
+	(tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 51 */
+#define XSetWindowBorderWidth \
+	(tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 52 */
+#define XSetWindowColormap \
+	(tkIntXlibStubsPtr->xSetWindowColormap) /* 53 */
+#define XUngrabKeyboard \
+	(tkIntXlibStubsPtr->xUngrabKeyboard) /* 54 */
+#define XUngrabPointer \
+	(tkIntXlibStubsPtr->xUngrabPointer) /* 55 */
+#define XUnmapWindow \
+	(tkIntXlibStubsPtr->xUnmapWindow) /* 56 */
+#define TkPutImage \
+	(tkIntXlibStubsPtr->tkPutImage) /* 57 */
+#define XParseColor \
+	(tkIntXlibStubsPtr->xParseColor) /* 58 */
+#define XCreateGC \
+	(tkIntXlibStubsPtr->xCreateGC) /* 59 */
+#define XFreeGC \
+	(tkIntXlibStubsPtr->xFreeGC) /* 60 */
+#define XInternAtom \
+	(tkIntXlibStubsPtr->xInternAtom) /* 61 */
+#define XSetBackground \
+	(tkIntXlibStubsPtr->xSetBackground) /* 62 */
+#define XSetForeground \
+	(tkIntXlibStubsPtr->xSetForeground) /* 63 */
+#define XSetClipMask \
+	(tkIntXlibStubsPtr->xSetClipMask) /* 64 */
+#define XSetClipOrigin \
+	(tkIntXlibStubsPtr->xSetClipOrigin) /* 65 */
+#define XSetTSOrigin \
+	(tkIntXlibStubsPtr->xSetTSOrigin) /* 66 */
+#define XChangeGC \
+	(tkIntXlibStubsPtr->xChangeGC) /* 67 */
+#define XSetFont \
+	(tkIntXlibStubsPtr->xSetFont) /* 68 */
+#define XSetArcMode \
+	(tkIntXlibStubsPtr->xSetArcMode) /* 69 */
+#define XSetStipple \
+	(tkIntXlibStubsPtr->xSetStipple) /* 70 */
+#define XSetFillRule \
+	(tkIntXlibStubsPtr->xSetFillRule) /* 71 */
+#define XSetFillStyle \
+	(tkIntXlibStubsPtr->xSetFillStyle) /* 72 */
+#define XSetFunction \
+	(tkIntXlibStubsPtr->xSetFunction) /* 73 */
+#define XSetLineAttributes \
+	(tkIntXlibStubsPtr->xSetLineAttributes) /* 74 */
+#define _XInitImageFuncPtrs \
+	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 75 */
+#define XCreateIC \
+	(tkIntXlibStubsPtr->xCreateIC) /* 76 */
+#define XGetVisualInfo \
+	(tkIntXlibStubsPtr->xGetVisualInfo) /* 77 */
+#define XSetWMClientMachine \
+	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 78 */
+#define XStringListToTextProperty \
+	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 79 */
+#define XDrawSegments \
+	(tkIntXlibStubsPtr->xDrawSegments) /* 80 */
+#define XForceScreenSaver \
+	(tkIntXlibStubsPtr->xForceScreenSaver) /* 81 */
+#define XDrawLine \
+	(tkIntXlibStubsPtr->xDrawLine) /* 82 */
+#define XFillRectangle \
+	(tkIntXlibStubsPtr->xFillRectangle) /* 83 */
+#define XClearWindow \
+	(tkIntXlibStubsPtr->xClearWindow) /* 84 */
+#define XDrawPoint \
+	(tkIntXlibStubsPtr->xDrawPoint) /* 85 */
+#define XDrawPoints \
+	(tkIntXlibStubsPtr->xDrawPoints) /* 86 */
+#define XWarpPointer \
+	(tkIntXlibStubsPtr->xWarpPointer) /* 87 */
+#define XQueryColor \
+	(tkIntXlibStubsPtr->xQueryColor) /* 88 */
+#define XQueryColors \
+	(tkIntXlibStubsPtr->xQueryColors) /* 89 */
+#define XQueryTree \
+	(tkIntXlibStubsPtr->xQueryTree) /* 90 */
+#define XSync \
+	(tkIntXlibStubsPtr->xSync) /* 91 */
+#endif /* AQUA */
+
+#endif /* defined(USE_TK_STUBS) */
+
+/* !END!: Do not edit above this line. */
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
+#endif /* _TKINTXLIBDECLS */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tcl.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tcl.h
new file mode 100644
index 00000000..297b42c1
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tcl.h
@@ -0,0 +1,2652 @@
+/*
+ * tcl.h --
+ *
+ *	This header file describes the externally-visible facilities of the
+ *	Tcl interpreter.
+ *
+ * Copyright (c) 1987-1994 The Regents of the University of California.
+ * Copyright (c) 1993-1996 Lucent Technologies.
+ * Copyright (c) 1994-1998 Sun Microsystems, Inc.
+ * Copyright (c) 1998-2000 by Scriptics Corporation.
+ * Copyright (c) 2002 by Kevin B. Kenny.  All rights reserved.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#ifndef _TCL
+#define _TCL
+
+/*
+ * For C++ compilers, use extern "C"
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The following defines are used to indicate the various release levels.
+ */
+
+#define TCL_ALPHA_RELEASE	0
+#define TCL_BETA_RELEASE	1
+#define TCL_FINAL_RELEASE	2
+
+/*
+ * When version numbers change here, must also go into the following files and
+ * update the version numbers:
+ *
+ * library/init.tcl	(1 LOC patch)
+ * unix/configure.in	(2 LOC Major, 2 LOC minor, 1 LOC patch)
+ * win/configure.in	(as above)
+ * win/tcl.m4		(not patchlevel)
+ * win/makefile.bc	(not patchlevel) 2 LOC
+ * README		(sections 0 and 2, with and without separator)
+ * macosx/Tcl.pbproj/project.pbxproj (not patchlevel) 1 LOC
+ * macosx/Tcl.pbproj/default.pbxuser (not patchlevel) 1 LOC
+ * macosx/Tcl.xcode/project.pbxproj (not patchlevel) 2 LOC
+ * macosx/Tcl.xcode/default.pbxuser (not patchlevel) 1 LOC
+ * macosx/Tcl-Common.xcconfig (not patchlevel) 1 LOC
+ * win/README		(not patchlevel) (sections 0 and 2)
+ * unix/tcl.spec	(1 LOC patch)
+ * tools/tcl.hpj.in	(not patchlevel, for windows installer)
+ */
+
+#define TCL_MAJOR_VERSION   8
+#define TCL_MINOR_VERSION   6
+#define TCL_RELEASE_LEVEL   TCL_FINAL_RELEASE
+#define TCL_RELEASE_SERIAL  4
+
+#define TCL_VERSION	    "8.6"
+#define TCL_PATCH_LEVEL	    "8.6.4"
+
+/*
+ *----------------------------------------------------------------------------
+ * The following definitions set up the proper options for Windows compilers.
+ * We use this method because there is no autoconf equivalent.
+ */
+
+#ifdef _WIN32
+#   ifndef __WIN32__
+#	define __WIN32__
+#   endif
+#   ifndef WIN32
+#	define WIN32
+#   endif
+#endif
+
+/*
+ * Utility macros: STRINGIFY takes an argument and wraps it in "" (double
+ * quotation marks), JOIN joins two arguments.
+ */
+
+#ifndef STRINGIFY
+#  define STRINGIFY(x) STRINGIFY1(x)
+#  define STRINGIFY1(x) #x
+#endif
+#ifndef JOIN
+#  define JOIN(a,b) JOIN1(a,b)
+#  define JOIN1(a,b) a##b
+#endif
+
+/*
+ * A special definition used to allow this header file to be included from
+ * windows resource files so that they can obtain version information.
+ * RC_INVOKED is defined by default by the windows RC tool.
+ *
+ * Resource compilers don't like all the C stuff, like typedefs and function
+ * declarations, that occur below, so block them out.
+ */
+
+#ifndef RC_INVOKED
+
+/*
+ * Special macro to define mutexes, that doesn't do anything if we are not
+ * using threads.
+ */
+
+#ifdef TCL_THREADS
+#define TCL_DECLARE_MUTEX(name) static Tcl_Mutex name;
+#else
+#define TCL_DECLARE_MUTEX(name)
+#endif
+
+/*
+ * Tcl's public routine Tcl_FSSeek() uses the values SEEK_SET, SEEK_CUR, and
+ * SEEK_END, all #define'd by stdio.h .
+ *
+ * Also, many extensions need stdio.h, and they've grown accustomed to tcl.h
+ * providing it for them rather than #include-ing it themselves as they
+ * should, so also for their sake, we keep the #include to be consistent with
+ * prior Tcl releases.
+ */
+
+#include <stdio.h>
+
+/*
+ *----------------------------------------------------------------------------
+ * Support for functions with a variable number of arguments.
+ *
+ * The following TCL_VARARGS* macros are to support old extensions
+ * written for older versions of Tcl where the macros permitted
+ * support for the varargs.h system as well as stdarg.h .
+ *
+ * New code should just directly be written to use stdarg.h conventions.
+ */
+
+#include <stdarg.h>
+#ifndef TCL_NO_DEPRECATED
+#    define TCL_VARARGS(type, name) (type name, ...)
+#    define TCL_VARARGS_DEF(type, name) (type name, ...)
+#    define TCL_VARARGS_START(type, name, list) (va_start(list, name), name)
+#endif
+#if defined(__GNUC__) && (__GNUC__ > 2)
+#   define TCL_FORMAT_PRINTF(a,b) __attribute__ ((__format__ (__printf__, a, b)))
+#else
+#   define TCL_FORMAT_PRINTF(a,b)
+#endif
+
+/*
+ * Allow a part of Tcl's API to be explicitly marked as deprecated.
+ *
+ * Used to make TIP 330/336 generate moans even if people use the
+ * compatibility macros. Change your code, guys! We won't support you forever.
+ */
+
+#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
+#   if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))
+#	define TCL_DEPRECATED_API(msg)	__attribute__ ((__deprecated__ (msg)))
+#   else
+#	define TCL_DEPRECATED_API(msg)	__attribute__ ((__deprecated__))
+#   endif
+#else
+#   define TCL_DEPRECATED_API(msg)	/* nothing portable */
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * Macros used to declare a function to be exported by a DLL. Used by Windows,
+ * maps to no-op declarations on non-Windows systems. The default build on
+ * windows is for a DLL, which causes the DLLIMPORT and DLLEXPORT macros to be
+ * nonempty. To build a static library, the macro STATIC_BUILD should be
+ * defined.
+ *
+ * Note: when building static but linking dynamically to MSVCRT we must still
+ *       correctly decorate the C library imported function.  Use CRTIMPORT
+ *       for this purpose.  _DLL is defined by the compiler when linking to
+ *       MSVCRT.
+ */
+
+#if (defined(_WIN32) && (defined(_MSC_VER) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0550)) || defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined(__declspec))))
+#   define HAVE_DECLSPEC 1
+#   ifdef STATIC_BUILD
+#       define DLLIMPORT
+#       define DLLEXPORT
+#       ifdef _DLL
+#           define CRTIMPORT __declspec(dllimport)
+#       else
+#           define CRTIMPORT
+#       endif
+#   else
+#       define DLLIMPORT __declspec(dllimport)
+#       define DLLEXPORT __declspec(dllexport)
+#       define CRTIMPORT __declspec(dllimport)
+#   endif
+#else
+#   define DLLIMPORT
+#   if defined(__GNUC__) && __GNUC__ > 3
+#       define DLLEXPORT __attribute__ ((visibility("default")))
+#   else
+#       define DLLEXPORT
+#   endif
+#   define CRTIMPORT
+#endif
+
+/*
+ * These macros are used to control whether functions are being declared for
+ * import or export. If a function is being declared while it is being built
+ * to be included in a shared library, then it should have the DLLEXPORT
+ * storage class. If is being declared for use by a module that is going to
+ * link against the shared library, then it should have the DLLIMPORT storage
+ * class. If the symbol is beind declared for a static build or for use from a
+ * stub library, then the storage class should be empty.
+ *
+ * The convention is that a macro called BUILD_xxxx, where xxxx is the name of
+ * a library we are building, is set on the compile line for sources that are
+ * to be placed in the library. When this macro is set, the storage class will
+ * be set to DLLEXPORT. At the end of the header file, the storage class will
+ * be reset to DLLIMPORT.
+ */
+
+#undef TCL_STORAGE_CLASS
+#ifdef BUILD_tcl
+#   define TCL_STORAGE_CLASS DLLEXPORT
+#else
+#   ifdef USE_TCL_STUBS
+#      define TCL_STORAGE_CLASS
+#   else
+#      define TCL_STORAGE_CLASS DLLIMPORT
+#   endif
+#endif
+
+/*
+ * The following _ANSI_ARGS_ macro is to support old extensions
+ * written for older versions of Tcl where it permitted support
+ * for compilers written in the pre-prototype era of C.
+ *
+ * New code should use prototypes.
+ */
+
+#ifndef TCL_NO_DEPRECATED
+#   undef _ANSI_ARGS_
+#   define _ANSI_ARGS_(x)	x
+#endif
+
+/*
+ * Definitions that allow this header file to be used either with or without
+ * ANSI C features.
+ */
+
+#ifndef INLINE
+#   define INLINE
+#endif
+
+#ifdef NO_CONST
+#   ifndef const
+#      define const
+#   endif
+#endif
+#ifndef CONST
+#   define CONST const
+#endif
+
+#ifdef USE_NON_CONST
+#   ifdef USE_COMPAT_CONST
+#      error define at most one of USE_NON_CONST and USE_COMPAT_CONST
+#   endif
+#   define CONST84
+#   define CONST84_RETURN
+#else
+#   ifdef USE_COMPAT_CONST
+#      define CONST84
+#      define CONST84_RETURN const
+#   else
+#      define CONST84 const
+#      define CONST84_RETURN const
+#   endif
+#endif
+
+#ifndef CONST86
+#      define CONST86 CONST84
+#endif
+
+/*
+ * Make sure EXTERN isn't defined elsewhere.
+ */
+
+#ifdef EXTERN
+#   undef EXTERN
+#endif /* EXTERN */
+
+#ifdef __cplusplus
+#   define EXTERN extern "C" TCL_STORAGE_CLASS
+#else
+#   define EXTERN extern TCL_STORAGE_CLASS
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * The following code is copied from winnt.h. If we don't replicate it here,
+ * then <windows.h> can't be included after tcl.h, since tcl.h also defines
+ * VOID. This block is skipped under Cygwin and Mingw.
+ */
+
+#if defined(_WIN32) && !defined(HAVE_WINNT_IGNORE_VOID)
+#ifndef VOID
+#define VOID void
+typedef char CHAR;
+typedef short SHORT;
+typedef long LONG;
+#endif
+#endif /* _WIN32 && !HAVE_WINNT_IGNORE_VOID */
+
+/*
+ * Macro to use instead of "void" for arguments that must have type "void *"
+ * in ANSI C; maps them to type "char *" in non-ANSI systems.
+ */
+
+#ifndef __VXWORKS__
+#   ifndef NO_VOID
+#	define VOID void
+#   else
+#	define VOID char
+#   endif
+#endif
+
+/*
+ * Miscellaneous declarations.
+ */
+
+#ifndef _CLIENTDATA
+#   ifndef NO_VOID
+	typedef void *ClientData;
+#   else
+	typedef int *ClientData;
+#   endif
+#   define _CLIENTDATA
+#endif
+
+/*
+ * Darwin specific configure overrides (to support fat compiles, where
+ * configure runs only once for multiple architectures):
+ */
+
+#ifdef __APPLE__
+#   ifdef __LP64__
+#	undef TCL_WIDE_INT_TYPE
+#	define TCL_WIDE_INT_IS_LONG 1
+#	define TCL_CFG_DO64BIT 1
+#    else /* !__LP64__ */
+#	define TCL_WIDE_INT_TYPE long long
+#	undef TCL_WIDE_INT_IS_LONG
+#	undef TCL_CFG_DO64BIT
+#    endif /* __LP64__ */
+#    undef HAVE_STRUCT_STAT64
+#endif /* __APPLE__ */
+
+/*
+ * Define Tcl_WideInt to be a type that is (at least) 64-bits wide, and define
+ * Tcl_WideUInt to be the unsigned variant of that type (assuming that where
+ * we have one, we can have the other.)
+ *
+ * Also defines the following macros:
+ * TCL_WIDE_INT_IS_LONG - if wide ints are really longs (i.e. we're on a real
+ *	64-bit system.)
+ * Tcl_WideAsLong - forgetful converter from wideInt to long.
+ * Tcl_LongAsWide - sign-extending converter from long to wideInt.
+ * Tcl_WideAsDouble - converter from wideInt to double.
+ * Tcl_DoubleAsWide - converter from double to wideInt.
+ *
+ * The following invariant should hold for any long value 'longVal':
+ *	longVal == Tcl_WideAsLong(Tcl_LongAsWide(longVal))
+ *
+ * Note on converting between Tcl_WideInt and strings. This implementation (in
+ * tclObj.c) depends on the function
+ * sprintf(...,"%" TCL_LL_MODIFIER "d",...).
+ */
+
+#if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG)
+#   if defined(_WIN32)
+#      define TCL_WIDE_INT_TYPE __int64
+#      ifdef __BORLANDC__
+#         define TCL_LL_MODIFIER	"L"
+#      else /* __BORLANDC__ */
+#         define TCL_LL_MODIFIER	"I64"
+#      endif /* __BORLANDC__ */
+#   elif defined(__GNUC__)
+#      define TCL_WIDE_INT_TYPE long long
+#      define TCL_LL_MODIFIER	"ll"
+#   else /* ! _WIN32 && ! __GNUC__ */
+/*
+ * Don't know what platform it is and configure hasn't discovered what is
+ * going on for us. Try to guess...
+ */
+#      include <limits.h>
+#      if (INT_MAX < LONG_MAX)
+#         define TCL_WIDE_INT_IS_LONG	1
+#      else
+#         define TCL_WIDE_INT_TYPE long long
+#      endif
+#   endif /* _WIN32 */
+#endif /* !TCL_WIDE_INT_TYPE & !TCL_WIDE_INT_IS_LONG */
+#ifdef TCL_WIDE_INT_IS_LONG
+#   undef TCL_WIDE_INT_TYPE
+#   define TCL_WIDE_INT_TYPE	long
+#endif /* TCL_WIDE_INT_IS_LONG */
+
+typedef TCL_WIDE_INT_TYPE		Tcl_WideInt;
+typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
+
+#ifdef TCL_WIDE_INT_IS_LONG
+#   define Tcl_WideAsLong(val)		((long)(val))
+#   define Tcl_LongAsWide(val)		((long)(val))
+#   define Tcl_WideAsDouble(val)	((double)((long)(val)))
+#   define Tcl_DoubleAsWide(val)	((long)((double)(val)))
+#   ifndef TCL_LL_MODIFIER
+#      define TCL_LL_MODIFIER		"l"
+#   endif /* !TCL_LL_MODIFIER */
+#else /* TCL_WIDE_INT_IS_LONG */
+/*
+ * The next short section of defines are only done when not running on Windows
+ * or some other strange platform.
+ */
+#   ifndef TCL_LL_MODIFIER
+#      define TCL_LL_MODIFIER		"ll"
+#   endif /* !TCL_LL_MODIFIER */
+#   define Tcl_WideAsLong(val)		((long)((Tcl_WideInt)(val)))
+#   define Tcl_LongAsWide(val)		((Tcl_WideInt)((long)(val)))
+#   define Tcl_WideAsDouble(val)	((double)((Tcl_WideInt)(val)))
+#   define Tcl_DoubleAsWide(val)	((Tcl_WideInt)((double)(val)))
+#endif /* TCL_WIDE_INT_IS_LONG */
+
+#if defined(_WIN32)
+#   ifdef __BORLANDC__
+	typedef struct stati64 Tcl_StatBuf;
+#   elif defined(_WIN64)
+	typedef struct __stat64 Tcl_StatBuf;
+#   elif (defined(_MSC_VER) && (_MSC_VER < 1400)) || defined(_USE_32BIT_TIME_T)
+	typedef struct _stati64	Tcl_StatBuf;
+#   else
+	typedef struct _stat32i64 Tcl_StatBuf;
+#   endif /* _MSC_VER < 1400 */
+#elif defined(__CYGWIN__)
+    typedef struct {
+	dev_t st_dev;
+	unsigned short st_ino;
+	unsigned short st_mode;
+	short st_nlink;
+	short st_uid;
+	short st_gid;
+	/* Here is a 2-byte gap */
+	dev_t st_rdev;
+	/* Here is a 4-byte gap */
+	long long st_size;
+	struct {long tv_sec;} st_atim;
+	struct {long tv_sec;} st_mtim;
+	struct {long tv_sec;} st_ctim;
+	/* Here is a 4-byte gap */
+    } Tcl_StatBuf;
+#elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__)
+    typedef struct stat64 Tcl_StatBuf;
+#else
+    typedef struct stat Tcl_StatBuf;
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * Data structures defined opaquely in this module. The definitions below just
+ * provide dummy types. A few fields are made visible in Tcl_Interp
+ * structures, namely those used for returning a string result from commands.
+ * Direct access to the result field is discouraged in Tcl 8.0. The
+ * interpreter result is either an object or a string, and the two values are
+ * kept consistent unless some C code sets interp->result directly.
+ * Programmers should use either the function Tcl_GetObjResult() or
+ * Tcl_GetStringResult() to read the interpreter's result. See the SetResult
+ * man page for details.
+ *
+ * Note: any change to the Tcl_Interp definition below must be mirrored in the
+ * "real" definition in tclInt.h.
+ *
+ * Note: Tcl_ObjCmdProc functions do not directly set result and freeProc.
+ * Instead, they set a Tcl_Obj member in the "real" structure that can be
+ * accessed with Tcl_GetObjResult() and Tcl_SetObjResult().
+ */
+
+typedef struct Tcl_Interp
+#ifndef TCL_NO_DEPRECATED
+{
+    /* TIP #330: Strongly discourage extensions from using the string
+     * result. */
+#ifdef USE_INTERP_RESULT
+    char *result TCL_DEPRECATED_API("use Tcl_GetStringResult/Tcl_SetResult");
+				/* If the last command returned a string
+				 * result, this points to it. */
+    void (*freeProc) (char *blockPtr)
+	    TCL_DEPRECATED_API("use Tcl_GetStringResult/Tcl_SetResult");
+				/* Zero means the string result is statically
+				 * allocated. TCL_DYNAMIC means it was
+				 * allocated with ckalloc and should be freed
+				 * with ckfree. Other values give the address
+				 * of function to invoke to free the result.
+				 * Tcl_Eval must free it before executing next
+				 * command. */
+#else
+    char *resultDontUse; /* Don't use in extensions! */
+    void (*freeProcDontUse) (char *); /* Don't use in extensions! */
+#endif
+#ifdef USE_INTERP_ERRORLINE
+    int errorLine TCL_DEPRECATED_API("use Tcl_GetErrorLine/Tcl_SetErrorLine");
+				/* When TCL_ERROR is returned, this gives the
+				 * line number within the command where the
+				 * error occurred (1 if first line). */
+#else
+    int errorLineDontUse; /* Don't use in extensions! */
+#endif
+}
+#endif /* TCL_NO_DEPRECATED */
+Tcl_Interp;
+
+typedef struct Tcl_AsyncHandler_ *Tcl_AsyncHandler;
+typedef struct Tcl_Channel_ *Tcl_Channel;
+typedef struct Tcl_ChannelTypeVersion_ *Tcl_ChannelTypeVersion;
+typedef struct Tcl_Command_ *Tcl_Command;
+typedef struct Tcl_Condition_ *Tcl_Condition;
+typedef struct Tcl_Dict_ *Tcl_Dict;
+typedef struct Tcl_EncodingState_ *Tcl_EncodingState;
+typedef struct Tcl_Encoding_ *Tcl_Encoding;
+typedef struct Tcl_Event Tcl_Event;
+typedef struct Tcl_InterpState_ *Tcl_InterpState;
+typedef struct Tcl_LoadHandle_ *Tcl_LoadHandle;
+typedef struct Tcl_Mutex_ *Tcl_Mutex;
+typedef struct Tcl_Pid_ *Tcl_Pid;
+typedef struct Tcl_RegExp_ *Tcl_RegExp;
+typedef struct Tcl_ThreadDataKey_ *Tcl_ThreadDataKey;
+typedef struct Tcl_ThreadId_ *Tcl_ThreadId;
+typedef struct Tcl_TimerToken_ *Tcl_TimerToken;
+typedef struct Tcl_Trace_ *Tcl_Trace;
+typedef struct Tcl_Var_ *Tcl_Var;
+typedef struct Tcl_ZLibStream_ *Tcl_ZlibStream;
+
+/*
+ *----------------------------------------------------------------------------
+ * Definition of the interface to functions implementing threads. A function
+ * following this definition is given to each call of 'Tcl_CreateThread' and
+ * will be called as the main fuction of the new thread created by that call.
+ */
+
+#if defined _WIN32
+typedef unsigned (__stdcall Tcl_ThreadCreateProc) (ClientData clientData);
+#else
+typedef void (Tcl_ThreadCreateProc) (ClientData clientData);
+#endif
+
+/*
+ * Threading function return types used for abstracting away platform
+ * differences when writing a Tcl_ThreadCreateProc. See the NewThread function
+ * in generic/tclThreadTest.c for it's usage.
+ */
+
+#if defined _WIN32
+#   define Tcl_ThreadCreateType		unsigned __stdcall
+#   define TCL_THREAD_CREATE_RETURN	return 0
+#else
+#   define Tcl_ThreadCreateType		void
+#   define TCL_THREAD_CREATE_RETURN
+#endif
+
+/*
+ * Definition of values for default stacksize and the possible flags to be
+ * given to Tcl_CreateThread.
+ */
+
+#define TCL_THREAD_STACK_DEFAULT (0)    /* Use default size for stack. */
+#define TCL_THREAD_NOFLAGS	 (0000) /* Standard flags, default
+					 * behaviour. */
+#define TCL_THREAD_JOINABLE	 (0001) /* Mark the thread as joinable. */
+
+/*
+ * Flag values passed to Tcl_StringCaseMatch.
+ */
+
+#define TCL_MATCH_NOCASE	(1<<0)
+
+/*
+ * Flag values passed to Tcl_GetRegExpFromObj.
+ */
+
+#define	TCL_REG_BASIC		000000	/* BREs (convenience). */
+#define	TCL_REG_EXTENDED	000001	/* EREs. */
+#define	TCL_REG_ADVF		000002	/* Advanced features in EREs. */
+#define	TCL_REG_ADVANCED	000003	/* AREs (which are also EREs). */
+#define	TCL_REG_QUOTE		000004	/* No special characters, none. */
+#define	TCL_REG_NOCASE		000010	/* Ignore case. */
+#define	TCL_REG_NOSUB		000020	/* Don't care about subexpressions. */
+#define	TCL_REG_EXPANDED	000040	/* Expanded format, white space &
+					 * comments. */
+#define	TCL_REG_NLSTOP		000100  /* \n doesn't match . or [^ ] */
+#define	TCL_REG_NLANCH		000200  /* ^ matches after \n, $ before. */
+#define	TCL_REG_NEWLINE		000300  /* Newlines are line terminators. */
+#define	TCL_REG_CANMATCH	001000  /* Report details on partial/limited
+					 * matches. */
+
+/*
+ * Flags values passed to Tcl_RegExpExecObj.
+ */
+
+#define	TCL_REG_NOTBOL	0001	/* Beginning of string does not match ^.  */
+#define	TCL_REG_NOTEOL	0002	/* End of string does not match $. */
+
+/*
+ * Structures filled in by Tcl_RegExpInfo. Note that all offset values are
+ * relative to the start of the match string, not the beginning of the entire
+ * string.
+ */
+
+typedef struct Tcl_RegExpIndices {
+    long start;			/* Character offset of first character in
+				 * match. */
+    long end;			/* Character offset of first character after
+				 * the match. */
+} Tcl_RegExpIndices;
+
+typedef struct Tcl_RegExpInfo {
+    int nsubs;			/* Number of subexpressions in the compiled
+				 * expression. */
+    Tcl_RegExpIndices *matches;	/* Array of nsubs match offset pairs. */
+    long extendStart;		/* The offset at which a subsequent match
+				 * might begin. */
+    long reserved;		/* Reserved for later use. */
+} Tcl_RegExpInfo;
+
+/*
+ * Picky compilers complain if this typdef doesn't appear before the struct's
+ * reference in tclDecls.h.
+ */
+
+typedef Tcl_StatBuf *Tcl_Stat_;
+typedef struct stat *Tcl_OldStat_;
+
+/*
+ *----------------------------------------------------------------------------
+ * When a TCL command returns, the interpreter contains a result from the
+ * command. Programmers are strongly encouraged to use one of the functions
+ * Tcl_GetObjResult() or Tcl_GetStringResult() to read the interpreter's
+ * result. See the SetResult man page for details. Besides this result, the
+ * command function returns an integer code, which is one of the following:
+ *
+ * TCL_OK		Command completed normally; the interpreter's result
+ *			contains the command's result.
+ * TCL_ERROR		The command couldn't be completed successfully; the
+ *			interpreter's result describes what went wrong.
+ * TCL_RETURN		The command requests that the current function return;
+ *			the interpreter's result contains the function's
+ *			return value.
+ * TCL_BREAK		The command requests that the innermost loop be
+ *			exited; the interpreter's result is meaningless.
+ * TCL_CONTINUE		Go on to the next iteration of the current loop; the
+ *			interpreter's result is meaningless.
+ */
+
+#define TCL_OK			0
+#define TCL_ERROR		1
+#define TCL_RETURN		2
+#define TCL_BREAK		3
+#define TCL_CONTINUE		4
+
+#define TCL_RESULT_SIZE		200
+
+/*
+ *----------------------------------------------------------------------------
+ * Flags to control what substitutions are performed by Tcl_SubstObj():
+ */
+
+#define TCL_SUBST_COMMANDS	001
+#define TCL_SUBST_VARIABLES	002
+#define TCL_SUBST_BACKSLASHES	004
+#define TCL_SUBST_ALL		007
+
+/*
+ * Argument descriptors for math function callbacks in expressions:
+ */
+
+typedef enum {
+    TCL_INT, TCL_DOUBLE, TCL_EITHER, TCL_WIDE_INT
+} Tcl_ValueType;
+
+typedef struct Tcl_Value {
+    Tcl_ValueType type;		/* Indicates intValue or doubleValue is valid,
+				 * or both. */
+    long intValue;		/* Integer value. */
+    double doubleValue;		/* Double-precision floating value. */
+    Tcl_WideInt wideValue;	/* Wide (min. 64-bit) integer value. */
+} Tcl_Value;
+
+/*
+ * Forward declaration of Tcl_Obj to prevent an error when the forward
+ * reference to Tcl_Obj is encountered in the function types declared below.
+ */
+
+struct Tcl_Obj;
+
+/*
+ *----------------------------------------------------------------------------
+ * Function types defined by Tcl:
+ */
+
+typedef int (Tcl_AppInitProc) (Tcl_Interp *interp);
+typedef int (Tcl_AsyncProc) (ClientData clientData, Tcl_Interp *interp,
+	int code);
+typedef void (Tcl_ChannelProc) (ClientData clientData, int mask);
+typedef void (Tcl_CloseProc) (ClientData data);
+typedef void (Tcl_CmdDeleteProc) (ClientData clientData);
+typedef int (Tcl_CmdProc) (ClientData clientData, Tcl_Interp *interp,
+	int argc, CONST84 char *argv[]);
+typedef void (Tcl_CmdTraceProc) (ClientData clientData, Tcl_Interp *interp,
+	int level, char *command, Tcl_CmdProc *proc,
+	ClientData cmdClientData, int argc, CONST84 char *argv[]);
+typedef int (Tcl_CmdObjTraceProc) (ClientData clientData, Tcl_Interp *interp,
+	int level, const char *command, Tcl_Command commandInfo, int objc,
+	struct Tcl_Obj *const *objv);
+typedef void (Tcl_CmdObjTraceDeleteProc) (ClientData clientData);
+typedef void (Tcl_DupInternalRepProc) (struct Tcl_Obj *srcPtr,
+	struct Tcl_Obj *dupPtr);
+typedef int (Tcl_EncodingConvertProc) (ClientData clientData, const char *src,
+	int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst,
+	int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr);
+typedef void (Tcl_EncodingFreeProc) (ClientData clientData);
+typedef int (Tcl_EventProc) (Tcl_Event *evPtr, int flags);
+typedef void (Tcl_EventCheckProc) (ClientData clientData, int flags);
+typedef int (Tcl_EventDeleteProc) (Tcl_Event *evPtr, ClientData clientData);
+typedef void (Tcl_EventSetupProc) (ClientData clientData, int flags);
+typedef void (Tcl_ExitProc) (ClientData clientData);
+typedef void (Tcl_FileProc) (ClientData clientData, int mask);
+typedef void (Tcl_FileFreeProc) (ClientData clientData);
+typedef void (Tcl_FreeInternalRepProc) (struct Tcl_Obj *objPtr);
+typedef void (Tcl_FreeProc) (char *blockPtr);
+typedef void (Tcl_IdleProc) (ClientData clientData);
+typedef void (Tcl_InterpDeleteProc) (ClientData clientData,
+	Tcl_Interp *interp);
+typedef int (Tcl_MathProc) (ClientData clientData, Tcl_Interp *interp,
+	Tcl_Value *args, Tcl_Value *resultPtr);
+typedef void (Tcl_NamespaceDeleteProc) (ClientData clientData);
+typedef int (Tcl_ObjCmdProc) (ClientData clientData, Tcl_Interp *interp,
+	int objc, struct Tcl_Obj *const *objv);
+typedef int (Tcl_PackageInitProc) (Tcl_Interp *interp);
+typedef int (Tcl_PackageUnloadProc) (Tcl_Interp *interp, int flags);
+typedef void (Tcl_PanicProc) (const char *format, ...);
+typedef void (Tcl_TcpAcceptProc) (ClientData callbackData, Tcl_Channel chan,
+	char *address, int port);
+typedef void (Tcl_TimerProc) (ClientData clientData);
+typedef int (Tcl_SetFromAnyProc) (Tcl_Interp *interp, struct Tcl_Obj *objPtr);
+typedef void (Tcl_UpdateStringProc) (struct Tcl_Obj *objPtr);
+typedef char * (Tcl_VarTraceProc) (ClientData clientData, Tcl_Interp *interp,
+	CONST84 char *part1, CONST84 char *part2, int flags);
+typedef void (Tcl_CommandTraceProc) (ClientData clientData, Tcl_Interp *interp,
+	const char *oldName, const char *newName, int flags);
+typedef void (Tcl_CreateFileHandlerProc) (int fd, int mask, Tcl_FileProc *proc,
+	ClientData clientData);
+typedef void (Tcl_DeleteFileHandlerProc) (int fd);
+typedef void (Tcl_AlertNotifierProc) (ClientData clientData);
+typedef void (Tcl_ServiceModeHookProc) (int mode);
+typedef ClientData (Tcl_InitNotifierProc) (void);
+typedef void (Tcl_FinalizeNotifierProc) (ClientData clientData);
+typedef void (Tcl_MainLoopProc) (void);
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure represents a type of object, which is a particular
+ * internal representation for an object plus a set of functions that provide
+ * standard operations on objects of that type.
+ */
+
+typedef struct Tcl_ObjType {
+    const char *name;		/* Name of the type, e.g. "int". */
+    Tcl_FreeInternalRepProc *freeIntRepProc;
+				/* Called to free any storage for the type's
+				 * internal rep. NULL if the internal rep does
+				 * not need freeing. */
+    Tcl_DupInternalRepProc *dupIntRepProc;
+				/* Called to create a new object as a copy of
+				 * an existing object. */
+    Tcl_UpdateStringProc *updateStringProc;
+				/* Called to update the string rep from the
+				 * type's internal representation. */
+    Tcl_SetFromAnyProc *setFromAnyProc;
+				/* Called to convert the object's internal rep
+				 * to this type. Frees the internal rep of the
+				 * old type. Returns TCL_ERROR on failure. */
+} Tcl_ObjType;
+
+/*
+ * One of the following structures exists for each object in the Tcl system.
+ * An object stores a value as either a string, some internal representation,
+ * or both.
+ */
+
+typedef struct Tcl_Obj {
+    int refCount;		/* When 0 the object will be freed. */
+    char *bytes;		/* This points to the first byte of the
+				 * object's string representation. The array
+				 * must be followed by a null byte (i.e., at
+				 * offset length) but may also contain
+				 * embedded null characters. The array's
+				 * storage is allocated by ckalloc. NULL means
+				 * the string rep is invalid and must be
+				 * regenerated from the internal rep.  Clients
+				 * should use Tcl_GetStringFromObj or
+				 * Tcl_GetString to get a pointer to the byte
+				 * array as a readonly value. */
+    int length;			/* The number of bytes at *bytes, not
+				 * including the terminating null. */
+    const Tcl_ObjType *typePtr;	/* Denotes the object's type. Always
+				 * corresponds to the type of the object's
+				 * internal rep. NULL indicates the object has
+				 * no internal rep (has no type). */
+    union {			/* The internal representation: */
+	long longValue;		/*   - an long integer value. */
+	double doubleValue;	/*   - a double-precision floating value. */
+	void *otherValuePtr;	/*   - another, type-specific value. */
+	Tcl_WideInt wideValue;	/*   - a long long value. */
+	struct {		/*   - internal rep as two pointers. */
+	    void *ptr1;
+	    void *ptr2;
+	} twoPtrValue;
+	struct {		/*   - internal rep as a pointer and a long,
+				 *     the main use of which is a bignum's
+				 *     tightly packed fields, where the alloc,
+				 *     used and signum flags are packed into a
+				 *     single word with everything else hung
+				 *     off the pointer. */
+	    void *ptr;
+	    unsigned long value;
+	} ptrAndLongRep;
+    } internalRep;
+} Tcl_Obj;
+
+/*
+ * Macros to increment and decrement a Tcl_Obj's reference count, and to test
+ * whether an object is shared (i.e. has reference count > 1). Note: clients
+ * should use Tcl_DecrRefCount() when they are finished using an object, and
+ * should never call TclFreeObj() directly. TclFreeObj() is only defined and
+ * made public in tcl.h to support Tcl_DecrRefCount's macro definition.
+ */
+
+void		Tcl_IncrRefCount(Tcl_Obj *objPtr);
+void		Tcl_DecrRefCount(Tcl_Obj *objPtr);
+int		Tcl_IsShared(Tcl_Obj *objPtr);
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure contains the state needed by Tcl_SaveResult. No-one
+ * outside of Tcl should access any of these fields. This structure is
+ * typically allocated on the stack.
+ */
+
+typedef struct Tcl_SavedResult {
+    char *result;
+    Tcl_FreeProc *freeProc;
+    Tcl_Obj *objResultPtr;
+    char *appendResult;
+    int appendAvl;
+    int appendUsed;
+    char resultSpace[TCL_RESULT_SIZE+1];
+} Tcl_SavedResult;
+
+/*
+ *----------------------------------------------------------------------------
+ * The following definitions support Tcl's namespace facility. Note: the first
+ * five fields must match exactly the fields in a Namespace structure (see
+ * tclInt.h).
+ */
+
+typedef struct Tcl_Namespace {
+    char *name;			/* The namespace's name within its parent
+				 * namespace. This contains no ::'s. The name
+				 * of the global namespace is "" although "::"
+				 * is an synonym. */
+    char *fullName;		/* The namespace's fully qualified name. This
+				 * starts with ::. */
+    ClientData clientData;	/* Arbitrary value associated with this
+				 * namespace. */
+    Tcl_NamespaceDeleteProc *deleteProc;
+				/* Function invoked when deleting the
+				 * namespace to, e.g., free clientData. */
+    struct Tcl_Namespace *parentPtr;
+				/* Points to the namespace that contains this
+				 * one. NULL if this is the global
+				 * namespace. */
+} Tcl_Namespace;
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure represents a call frame, or activation record. A
+ * call frame defines a naming context for a procedure call: its local scope
+ * (for local variables) and its namespace scope (used for non-local
+ * variables; often the global :: namespace). A call frame can also define the
+ * naming context for a namespace eval or namespace inscope command: the
+ * namespace in which the command's code should execute. The Tcl_CallFrame
+ * structures exist only while procedures or namespace eval/inscope's are
+ * being executed, and provide a Tcl call stack.
+ *
+ * A call frame is initialized and pushed using Tcl_PushCallFrame and popped
+ * using Tcl_PopCallFrame. Storage for a Tcl_CallFrame must be provided by the
+ * Tcl_PushCallFrame caller, and callers typically allocate them on the C call
+ * stack for efficiency. For this reason, Tcl_CallFrame is defined as a
+ * structure and not as an opaque token. However, most Tcl_CallFrame fields
+ * are hidden since applications should not access them directly; others are
+ * declared as "dummyX".
+ *
+ * WARNING!! The structure definition must be kept consistent with the
+ * CallFrame structure in tclInt.h. If you change one, change the other.
+ */
+
+typedef struct Tcl_CallFrame {
+    Tcl_Namespace *nsPtr;
+    int dummy1;
+    int dummy2;
+    void *dummy3;
+    void *dummy4;
+    void *dummy5;
+    int dummy6;
+    void *dummy7;
+    void *dummy8;
+    int dummy9;
+    void *dummy10;
+    void *dummy11;
+    void *dummy12;
+    void *dummy13;
+} Tcl_CallFrame;
+
+/*
+ *----------------------------------------------------------------------------
+ * Information about commands that is returned by Tcl_GetCommandInfo and
+ * passed to Tcl_SetCommandInfo. objProc is an objc/objv object-based command
+ * function while proc is a traditional Tcl argc/argv string-based function.
+ * Tcl_CreateObjCommand and Tcl_CreateCommand ensure that both objProc and
+ * proc are non-NULL and can be called to execute the command. However, it may
+ * be faster to call one instead of the other. The member isNativeObjectProc
+ * is set to 1 if an object-based function was registered by
+ * Tcl_CreateObjCommand, and to 0 if a string-based function was registered by
+ * Tcl_CreateCommand. The other function is typically set to a compatibility
+ * wrapper that does string-to-object or object-to-string argument conversions
+ * then calls the other function.
+ */
+
+typedef struct Tcl_CmdInfo {
+    int isNativeObjectProc;	/* 1 if objProc was registered by a call to
+				 * Tcl_CreateObjCommand; 0 otherwise.
+				 * Tcl_SetCmdInfo does not modify this
+				 * field. */
+    Tcl_ObjCmdProc *objProc;	/* Command's object-based function. */
+    ClientData objClientData;	/* ClientData for object proc. */
+    Tcl_CmdProc *proc;		/* Command's string-based function. */
+    ClientData clientData;	/* ClientData for string proc. */
+    Tcl_CmdDeleteProc *deleteProc;
+				/* Function to call when command is
+				 * deleted. */
+    ClientData deleteData;	/* Value to pass to deleteProc (usually the
+				 * same as clientData). */
+    Tcl_Namespace *namespacePtr;/* Points to the namespace that contains this
+				 * command. Note that Tcl_SetCmdInfo will not
+				 * change a command's namespace; use
+				 * TclRenameCommand or Tcl_Eval (of 'rename')
+				 * to do that. */
+} Tcl_CmdInfo;
+
+/*
+ *----------------------------------------------------------------------------
+ * The structure defined below is used to hold dynamic strings. The only
+ * fields that clients should use are string and length, accessible via the
+ * macros Tcl_DStringValue and Tcl_DStringLength.
+ */
+
+#define TCL_DSTRING_STATIC_SIZE 200
+typedef struct Tcl_DString {
+    char *string;		/* Points to beginning of string: either
+				 * staticSpace below or a malloced array. */
+    int length;			/* Number of non-NULL characters in the
+				 * string. */
+    int spaceAvl;		/* Total number of bytes available for the
+				 * string and its terminating NULL char. */
+    char staticSpace[TCL_DSTRING_STATIC_SIZE];
+				/* Space to use in common case where string is
+				 * small. */
+} Tcl_DString;
+
+#define Tcl_DStringLength(dsPtr) ((dsPtr)->length)
+#define Tcl_DStringValue(dsPtr) ((dsPtr)->string)
+#define Tcl_DStringTrunc Tcl_DStringSetLength
+
+/*
+ * Definitions for the maximum number of digits of precision that may be
+ * specified in the "tcl_precision" variable, and the number of bytes of
+ * buffer space required by Tcl_PrintDouble.
+ */
+
+#define TCL_MAX_PREC		17
+#define TCL_DOUBLE_SPACE	(TCL_MAX_PREC+10)
+
+/*
+ * Definition for a number of bytes of buffer space sufficient to hold the
+ * string representation of an integer in base 10 (assuming the existence of
+ * 64-bit integers).
+ */
+
+#define TCL_INTEGER_SPACE	24
+
+/*
+ * Flag values passed to Tcl_ConvertElement.
+ * TCL_DONT_USE_BRACES forces it not to enclose the element in braces, but to
+ *	use backslash quoting instead.
+ * TCL_DONT_QUOTE_HASH disables the default quoting of the '#' character. It
+ *	is safe to leave the hash unquoted when the element is not the first
+ *	element of a list, and this flag can be used by the caller to indicate
+ *	that condition.
+ */
+
+#define TCL_DONT_USE_BRACES	1
+#define TCL_DONT_QUOTE_HASH	8
+
+/*
+ * Flag that may be passed to Tcl_GetIndexFromObj to force it to disallow
+ * abbreviated strings.
+ */
+
+#define TCL_EXACT	1
+
+/*
+ *----------------------------------------------------------------------------
+ * Flag values passed to Tcl_RecordAndEval, Tcl_EvalObj, Tcl_EvalObjv.
+ * WARNING: these bit choices must not conflict with the bit choices for
+ * evalFlag bits in tclInt.h!
+ *
+ * Meanings:
+ *	TCL_NO_EVAL:		Just record this command
+ *	TCL_EVAL_GLOBAL:	Execute script in global namespace
+ *	TCL_EVAL_DIRECT:	Do not compile this script
+ *	TCL_EVAL_INVOKE:	Magical Tcl_EvalObjv mode for aliases/ensembles
+ *				o Run in iPtr->lookupNsPtr or global namespace
+ *				o Cut out of error traces
+ *				o Don't reset the flags controlling ensemble
+ *				  error message rewriting.
+ *	TCL_CANCEL_UNWIND:	Magical Tcl_CancelEval mode that causes the
+ *				stack for the script in progress to be
+ *				completely unwound.
+ *	TCL_EVAL_NOERR:	Do no exception reporting at all, just return
+ *				as the caller will report.
+ */
+
+#define TCL_NO_EVAL		0x010000
+#define TCL_EVAL_GLOBAL		0x020000
+#define TCL_EVAL_DIRECT		0x040000
+#define TCL_EVAL_INVOKE		0x080000
+#define TCL_CANCEL_UNWIND	0x100000
+#define TCL_EVAL_NOERR          0x200000
+
+/*
+ * Special freeProc values that may be passed to Tcl_SetResult (see the man
+ * page for details):
+ */
+
+#define TCL_VOLATILE		((Tcl_FreeProc *) 1)
+#define TCL_STATIC		((Tcl_FreeProc *) 0)
+#define TCL_DYNAMIC		((Tcl_FreeProc *) 3)
+
+/*
+ * Flag values passed to variable-related functions.
+ * WARNING: these bit choices must not conflict with the bit choice for
+ * TCL_CANCEL_UNWIND, above.
+ */
+
+#define TCL_GLOBAL_ONLY		 1
+#define TCL_NAMESPACE_ONLY	 2
+#define TCL_APPEND_VALUE	 4
+#define TCL_LIST_ELEMENT	 8
+#define TCL_TRACE_READS		 0x10
+#define TCL_TRACE_WRITES	 0x20
+#define TCL_TRACE_UNSETS	 0x40
+#define TCL_TRACE_DESTROYED	 0x80
+#define TCL_INTERP_DESTROYED	 0x100
+#define TCL_LEAVE_ERR_MSG	 0x200
+#define TCL_TRACE_ARRAY		 0x800
+#ifndef TCL_REMOVE_OBSOLETE_TRACES
+/* Required to support old variable/vdelete/vinfo traces. */
+#define TCL_TRACE_OLD_STYLE	 0x1000
+#endif
+/* Indicate the semantics of the result of a trace. */
+#define TCL_TRACE_RESULT_DYNAMIC 0x8000
+#define TCL_TRACE_RESULT_OBJECT  0x10000
+
+/*
+ * Flag values for ensemble commands.
+ */
+
+#define TCL_ENSEMBLE_PREFIX 0x02/* Flag value to say whether to allow
+				 * unambiguous prefixes of commands or to
+				 * require exact matches for command names. */
+
+/*
+ * Flag values passed to command-related functions.
+ */
+
+#define TCL_TRACE_RENAME	0x2000
+#define TCL_TRACE_DELETE	0x4000
+
+#define TCL_ALLOW_INLINE_COMPILATION 0x20000
+
+/*
+ * The TCL_PARSE_PART1 flag is deprecated and has no effect. The part1 is now
+ * always parsed whenever the part2 is NULL. (This is to avoid a common error
+ * when converting code to use the new object based APIs and forgetting to
+ * give the flag)
+ */
+
+#ifndef TCL_NO_DEPRECATED
+#   define TCL_PARSE_PART1	0x400
+#endif
+
+/*
+ * Types for linked variables:
+ */
+
+#define TCL_LINK_INT		1
+#define TCL_LINK_DOUBLE		2
+#define TCL_LINK_BOOLEAN	3
+#define TCL_LINK_STRING		4
+#define TCL_LINK_WIDE_INT	5
+#define TCL_LINK_CHAR		6
+#define TCL_LINK_UCHAR		7
+#define TCL_LINK_SHORT		8
+#define TCL_LINK_USHORT		9
+#define TCL_LINK_UINT		10
+#define TCL_LINK_LONG		11
+#define TCL_LINK_ULONG		12
+#define TCL_LINK_FLOAT		13
+#define TCL_LINK_WIDE_UINT	14
+#define TCL_LINK_READ_ONLY	0x80
+
+/*
+ *----------------------------------------------------------------------------
+ * Forward declarations of Tcl_HashTable and related types.
+ */
+
+typedef struct Tcl_HashKeyType Tcl_HashKeyType;
+typedef struct Tcl_HashTable Tcl_HashTable;
+typedef struct Tcl_HashEntry Tcl_HashEntry;
+
+typedef unsigned (Tcl_HashKeyProc) (Tcl_HashTable *tablePtr, void *keyPtr);
+typedef int (Tcl_CompareHashKeysProc) (void *keyPtr, Tcl_HashEntry *hPtr);
+typedef Tcl_HashEntry * (Tcl_AllocHashEntryProc) (Tcl_HashTable *tablePtr,
+	void *keyPtr);
+typedef void (Tcl_FreeHashEntryProc) (Tcl_HashEntry *hPtr);
+
+/*
+ * This flag controls whether the hash table stores the hash of a key, or
+ * recalculates it. There should be no reason for turning this flag off as it
+ * is completely binary and source compatible unless you directly access the
+ * bucketPtr member of the Tcl_HashTableEntry structure. This member has been
+ * removed and the space used to store the hash value.
+ */
+
+#ifndef TCL_HASH_KEY_STORE_HASH
+#   define TCL_HASH_KEY_STORE_HASH 1
+#endif
+
+/*
+ * Structure definition for an entry in a hash table. No-one outside Tcl
+ * should access any of these fields directly; use the macros defined below.
+ */
+
+struct Tcl_HashEntry {
+    Tcl_HashEntry *nextPtr;	/* Pointer to next entry in this hash bucket,
+				 * or NULL for end of chain. */
+    Tcl_HashTable *tablePtr;	/* Pointer to table containing entry. */
+#if TCL_HASH_KEY_STORE_HASH
+    void *hash;			/* Hash value, stored as pointer to ensure
+				 * that the offsets of the fields in this
+				 * structure are not changed. */
+#else
+    Tcl_HashEntry **bucketPtr;	/* Pointer to bucket that points to first
+				 * entry in this entry's chain: used for
+				 * deleting the entry. */
+#endif
+    ClientData clientData;	/* Application stores something here with
+				 * Tcl_SetHashValue. */
+    union {			/* Key has one of these forms: */
+	char *oneWordValue;	/* One-word value for key. */
+	Tcl_Obj *objPtr;	/* Tcl_Obj * key value. */
+	int words[1];		/* Multiple integer words for key. The actual
+				 * size will be as large as necessary for this
+				 * table's keys. */
+	char string[1];		/* String for key. The actual size will be as
+				 * large as needed to hold the key. */
+    } key;			/* MUST BE LAST FIELD IN RECORD!! */
+};
+
+/*
+ * Flags used in Tcl_HashKeyType.
+ *
+ * TCL_HASH_KEY_RANDOMIZE_HASH -
+ *				There are some things, pointers for example
+ *				which don't hash well because they do not use
+ *				the lower bits. If this flag is set then the
+ *				hash table will attempt to rectify this by
+ *				randomising the bits and then using the upper
+ *				N bits as the index into the table.
+ * TCL_HASH_KEY_SYSTEM_HASH -	If this flag is set then all memory internally
+ *                              allocated for the hash table that is not for an
+ *                              entry will use the system heap.
+ */
+
+#define TCL_HASH_KEY_RANDOMIZE_HASH 0x1
+#define TCL_HASH_KEY_SYSTEM_HASH    0x2
+
+/*
+ * Structure definition for the methods associated with a hash table key type.
+ */
+
+#define TCL_HASH_KEY_TYPE_VERSION 1
+struct Tcl_HashKeyType {
+    int version;		/* Version of the table. If this structure is
+				 * extended in future then the version can be
+				 * used to distinguish between different
+				 * structures. */
+    int flags;			/* Flags, see above for details. */
+    Tcl_HashKeyProc *hashKeyProc;
+				/* Calculates a hash value for the key. If
+				 * this is NULL then the pointer itself is
+				 * used as a hash value. */
+    Tcl_CompareHashKeysProc *compareKeysProc;
+				/* Compares two keys and returns zero if they
+				 * do not match, and non-zero if they do. If
+				 * this is NULL then the pointers are
+				 * compared. */
+    Tcl_AllocHashEntryProc *allocEntryProc;
+				/* Called to allocate memory for a new entry,
+				 * i.e. if the key is a string then this could
+				 * allocate a single block which contains
+				 * enough space for both the entry and the
+				 * string. Only the key field of the allocated
+				 * Tcl_HashEntry structure needs to be filled
+				 * in. If something else needs to be done to
+				 * the key, i.e. incrementing a reference
+				 * count then that should be done by this
+				 * function. If this is NULL then Tcl_Alloc is
+				 * used to allocate enough space for a
+				 * Tcl_HashEntry and the key pointer is
+				 * assigned to key.oneWordValue. */
+    Tcl_FreeHashEntryProc *freeEntryProc;
+				/* Called to free memory associated with an
+				 * entry. If something else needs to be done
+				 * to the key, i.e. decrementing a reference
+				 * count then that should be done by this
+				 * function. If this is NULL then Tcl_Free is
+				 * used to free the Tcl_HashEntry. */
+};
+
+/*
+ * Structure definition for a hash table.  Must be in tcl.h so clients can
+ * allocate space for these structures, but clients should never access any
+ * fields in this structure.
+ */
+
+#define TCL_SMALL_HASH_TABLE 4
+struct Tcl_HashTable {
+    Tcl_HashEntry **buckets;	/* Pointer to bucket array. Each element
+				 * points to first entry in bucket's hash
+				 * chain, or NULL. */
+    Tcl_HashEntry *staticBuckets[TCL_SMALL_HASH_TABLE];
+				/* Bucket array used for small tables (to
+				 * avoid mallocs and frees). */
+    int numBuckets;		/* Total number of buckets allocated at
+				 * **bucketPtr. */
+    int numEntries;		/* Total number of entries present in
+				 * table. */
+    int rebuildSize;		/* Enlarge table when numEntries gets to be
+				 * this large. */
+    int downShift;		/* Shift count used in hashing function.
+				 * Designed to use high-order bits of
+				 * randomized keys. */
+    int mask;			/* Mask value used in hashing function. */
+    int keyType;		/* Type of keys used in this table. It's
+				 * either TCL_CUSTOM_KEYS, TCL_STRING_KEYS,
+				 * TCL_ONE_WORD_KEYS, or an integer giving the
+				 * number of ints that is the size of the
+				 * key. */
+    Tcl_HashEntry *(*findProc) (Tcl_HashTable *tablePtr, const char *key);
+    Tcl_HashEntry *(*createProc) (Tcl_HashTable *tablePtr, const char *key,
+	    int *newPtr);
+    const Tcl_HashKeyType *typePtr;
+				/* Type of the keys used in the
+				 * Tcl_HashTable. */
+};
+
+/*
+ * Structure definition for information used to keep track of searches through
+ * hash tables:
+ */
+
+typedef struct Tcl_HashSearch {
+    Tcl_HashTable *tablePtr;	/* Table being searched. */
+    int nextIndex;		/* Index of next bucket to be enumerated after
+				 * present one. */
+    Tcl_HashEntry *nextEntryPtr;/* Next entry to be enumerated in the current
+				 * bucket. */
+} Tcl_HashSearch;
+
+/*
+ * Acceptable key types for hash tables:
+ *
+ * TCL_STRING_KEYS:		The keys are strings, they are copied into the
+ *				entry.
+ * TCL_ONE_WORD_KEYS:		The keys are pointers, the pointer is stored
+ *				in the entry.
+ * TCL_CUSTOM_TYPE_KEYS:	The keys are arbitrary types which are copied
+ *				into the entry.
+ * TCL_CUSTOM_PTR_KEYS:		The keys are pointers to arbitrary types, the
+ *				pointer is stored in the entry.
+ *
+ * While maintaining binary compatability the above have to be distinct values
+ * as they are used to differentiate between old versions of the hash table
+ * which don't have a typePtr and new ones which do. Once binary compatability
+ * is discarded in favour of making more wide spread changes TCL_STRING_KEYS
+ * can be the same as TCL_CUSTOM_TYPE_KEYS, and TCL_ONE_WORD_KEYS can be the
+ * same as TCL_CUSTOM_PTR_KEYS because they simply determine how the key is
+ * accessed from the entry and not the behaviour.
+ */
+
+#define TCL_STRING_KEYS		(0)
+#define TCL_ONE_WORD_KEYS	(1)
+#define TCL_CUSTOM_TYPE_KEYS	(-2)
+#define TCL_CUSTOM_PTR_KEYS	(-1)
+
+/*
+ * Structure definition for information used to keep track of searches through
+ * dictionaries. These fields should not be accessed by code outside
+ * tclDictObj.c
+ */
+
+typedef struct {
+    void *next;			/* Search position for underlying hash
+				 * table. */
+    int epoch;			/* Epoch marker for dictionary being searched,
+				 * or -1 if search has terminated. */
+    Tcl_Dict dictionaryPtr;	/* Reference to dictionary being searched. */
+} Tcl_DictSearch;
+
+/*
+ *----------------------------------------------------------------------------
+ * Flag values to pass to Tcl_DoOneEvent to disable searches for some kinds of
+ * events:
+ */
+
+#define TCL_DONT_WAIT		(1<<1)
+#define TCL_WINDOW_EVENTS	(1<<2)
+#define TCL_FILE_EVENTS		(1<<3)
+#define TCL_TIMER_EVENTS	(1<<4)
+#define TCL_IDLE_EVENTS		(1<<5)	/* WAS 0x10 ???? */
+#define TCL_ALL_EVENTS		(~TCL_DONT_WAIT)
+
+/*
+ * The following structure defines a generic event for the Tcl event system.
+ * These are the things that are queued in calls to Tcl_QueueEvent and
+ * serviced later by Tcl_DoOneEvent. There can be many different kinds of
+ * events with different fields, corresponding to window events, timer events,
+ * etc. The structure for a particular event consists of a Tcl_Event header
+ * followed by additional information specific to that event.
+ */
+
+struct Tcl_Event {
+    Tcl_EventProc *proc;	/* Function to call to service this event. */
+    struct Tcl_Event *nextPtr;	/* Next in list of pending events, or NULL. */
+};
+
+/*
+ * Positions to pass to Tcl_QueueEvent:
+ */
+
+typedef enum {
+    TCL_QUEUE_TAIL, TCL_QUEUE_HEAD, TCL_QUEUE_MARK
+} Tcl_QueuePosition;
+
+/*
+ * Values to pass to Tcl_SetServiceMode to specify the behavior of notifier
+ * event routines.
+ */
+
+#define TCL_SERVICE_NONE 0
+#define TCL_SERVICE_ALL 1
+
+/*
+ * The following structure keeps is used to hold a time value, either as an
+ * absolute time (the number of seconds from the epoch) or as an elapsed time.
+ * On Unix systems the epoch is Midnight Jan 1, 1970 GMT.
+ */
+
+typedef struct Tcl_Time {
+    long sec;			/* Seconds. */
+    long usec;			/* Microseconds. */
+} Tcl_Time;
+
+typedef void (Tcl_SetTimerProc) (CONST86 Tcl_Time *timePtr);
+typedef int (Tcl_WaitForEventProc) (CONST86 Tcl_Time *timePtr);
+
+/*
+ * TIP #233 (Virtualized Time)
+ */
+
+typedef void (Tcl_GetTimeProc)   (Tcl_Time *timebuf, ClientData clientData);
+typedef void (Tcl_ScaleTimeProc) (Tcl_Time *timebuf, ClientData clientData);
+
+/*
+ *----------------------------------------------------------------------------
+ * Bits to pass to Tcl_CreateFileHandler and Tcl_CreateChannelHandler to
+ * indicate what sorts of events are of interest:
+ */
+
+#define TCL_READABLE		(1<<1)
+#define TCL_WRITABLE		(1<<2)
+#define TCL_EXCEPTION		(1<<3)
+
+/*
+ * Flag values to pass to Tcl_OpenCommandChannel to indicate the disposition
+ * of the stdio handles. TCL_STDIN, TCL_STDOUT, TCL_STDERR, are also used in
+ * Tcl_GetStdChannel.
+ */
+
+#define TCL_STDIN		(1<<1)
+#define TCL_STDOUT		(1<<2)
+#define TCL_STDERR		(1<<3)
+#define TCL_ENFORCE_MODE	(1<<4)
+
+/*
+ * Bits passed to Tcl_DriverClose2Proc to indicate which side of a channel
+ * should be closed.
+ */
+
+#define TCL_CLOSE_READ		(1<<1)
+#define TCL_CLOSE_WRITE		(1<<2)
+
+/*
+ * Value to use as the closeProc for a channel that supports the close2Proc
+ * interface.
+ */
+
+#define TCL_CLOSE2PROC		((Tcl_DriverCloseProc *) 1)
+
+/*
+ * Channel version tag. This was introduced in 8.3.2/8.4.
+ */
+
+#define TCL_CHANNEL_VERSION_1	((Tcl_ChannelTypeVersion) 0x1)
+#define TCL_CHANNEL_VERSION_2	((Tcl_ChannelTypeVersion) 0x2)
+#define TCL_CHANNEL_VERSION_3	((Tcl_ChannelTypeVersion) 0x3)
+#define TCL_CHANNEL_VERSION_4	((Tcl_ChannelTypeVersion) 0x4)
+#define TCL_CHANNEL_VERSION_5	((Tcl_ChannelTypeVersion) 0x5)
+
+/*
+ * TIP #218: Channel Actions, Ids for Tcl_DriverThreadActionProc.
+ */
+
+#define TCL_CHANNEL_THREAD_INSERT (0)
+#define TCL_CHANNEL_THREAD_REMOVE (1)
+
+/*
+ * Typedefs for the various operations in a channel type:
+ */
+
+typedef int	(Tcl_DriverBlockModeProc) (ClientData instanceData, int mode);
+typedef int	(Tcl_DriverCloseProc) (ClientData instanceData,
+			Tcl_Interp *interp);
+typedef int	(Tcl_DriverClose2Proc) (ClientData instanceData,
+			Tcl_Interp *interp, int flags);
+typedef int	(Tcl_DriverInputProc) (ClientData instanceData, char *buf,
+			int toRead, int *errorCodePtr);
+typedef int	(Tcl_DriverOutputProc) (ClientData instanceData,
+			CONST84 char *buf, int toWrite, int *errorCodePtr);
+typedef int	(Tcl_DriverSeekProc) (ClientData instanceData, long offset,
+			int mode, int *errorCodePtr);
+typedef int	(Tcl_DriverSetOptionProc) (ClientData instanceData,
+			Tcl_Interp *interp, const char *optionName,
+			const char *value);
+typedef int	(Tcl_DriverGetOptionProc) (ClientData instanceData,
+			Tcl_Interp *interp, CONST84 char *optionName,
+			Tcl_DString *dsPtr);
+typedef void	(Tcl_DriverWatchProc) (ClientData instanceData, int mask);
+typedef int	(Tcl_DriverGetHandleProc) (ClientData instanceData,
+			int direction, ClientData *handlePtr);
+typedef int	(Tcl_DriverFlushProc) (ClientData instanceData);
+typedef int	(Tcl_DriverHandlerProc) (ClientData instanceData,
+			int interestMask);
+typedef Tcl_WideInt (Tcl_DriverWideSeekProc) (ClientData instanceData,
+			Tcl_WideInt offset, int mode, int *errorCodePtr);
+/*
+ * TIP #218, Channel Thread Actions
+ */
+typedef void	(Tcl_DriverThreadActionProc) (ClientData instanceData,
+			int action);
+/*
+ * TIP #208, File Truncation (etc.)
+ */
+typedef int	(Tcl_DriverTruncateProc) (ClientData instanceData,
+			Tcl_WideInt length);
+
+/*
+ * struct Tcl_ChannelType:
+ *
+ * One such structure exists for each type (kind) of channel. It collects
+ * together in one place all the functions that are part of the specific
+ * channel type.
+ *
+ * It is recommend that the Tcl_Channel* functions are used to access elements
+ * of this structure, instead of direct accessing.
+ */
+
+typedef struct Tcl_ChannelType {
+    const char *typeName;	/* The name of the channel type in Tcl
+				 * commands. This storage is owned by channel
+				 * type. */
+    Tcl_ChannelTypeVersion version;
+				/* Version of the channel type. */
+    Tcl_DriverCloseProc *closeProc;
+				/* Function to call to close the channel, or
+				 * TCL_CLOSE2PROC if the close2Proc should be
+				 * used instead. */
+    Tcl_DriverInputProc *inputProc;
+				/* Function to call for input on channel. */
+    Tcl_DriverOutputProc *outputProc;
+				/* Function to call for output on channel. */
+    Tcl_DriverSeekProc *seekProc;
+				/* Function to call to seek on the channel.
+				 * May be NULL. */
+    Tcl_DriverSetOptionProc *setOptionProc;
+				/* Set an option on a channel. */
+    Tcl_DriverGetOptionProc *getOptionProc;
+				/* Get an option from a channel. */
+    Tcl_DriverWatchProc *watchProc;
+				/* Set up the notifier to watch for events on
+				 * this channel. */
+    Tcl_DriverGetHandleProc *getHandleProc;
+				/* Get an OS handle from the channel or NULL
+				 * if not supported. */
+    Tcl_DriverClose2Proc *close2Proc;
+				/* Function to call to close the channel if
+				 * the device supports closing the read &
+				 * write sides independently. */
+    Tcl_DriverBlockModeProc *blockModeProc;
+				/* Set blocking mode for the raw channel. May
+				 * be NULL. */
+    /*
+     * Only valid in TCL_CHANNEL_VERSION_2 channels or later.
+     */
+    Tcl_DriverFlushProc *flushProc;
+				/* Function to call to flush a channel. May be
+				 * NULL. */
+    Tcl_DriverHandlerProc *handlerProc;
+				/* Function to call to handle a channel event.
+				 * This will be passed up the stacked channel
+				 * chain. */
+    /*
+     * Only valid in TCL_CHANNEL_VERSION_3 channels or later.
+     */
+    Tcl_DriverWideSeekProc *wideSeekProc;
+				/* Function to call to seek on the channel
+				 * which can handle 64-bit offsets. May be
+				 * NULL, and must be NULL if seekProc is
+				 * NULL. */
+    /*
+     * Only valid in TCL_CHANNEL_VERSION_4 channels or later.
+     * TIP #218, Channel Thread Actions.
+     */
+    Tcl_DriverThreadActionProc *threadActionProc;
+				/* Function to call to notify the driver of
+				 * thread specific activity for a channel. May
+				 * be NULL. */
+    /*
+     * Only valid in TCL_CHANNEL_VERSION_5 channels or later.
+     * TIP #208, File Truncation.
+     */
+    Tcl_DriverTruncateProc *truncateProc;
+				/* Function to call to truncate the underlying
+				 * file to a particular length. May be NULL if
+				 * the channel does not support truncation. */
+} Tcl_ChannelType;
+
+/*
+ * The following flags determine whether the blockModeProc above should set
+ * the channel into blocking or nonblocking mode. They are passed as arguments
+ * to the blockModeProc function in the above structure.
+ */
+
+#define TCL_MODE_BLOCKING	0	/* Put channel into blocking mode. */
+#define TCL_MODE_NONBLOCKING	1	/* Put channel into nonblocking
+					 * mode. */
+
+/*
+ *----------------------------------------------------------------------------
+ * Enum for different types of file paths.
+ */
+
+typedef enum Tcl_PathType {
+    TCL_PATH_ABSOLUTE,
+    TCL_PATH_RELATIVE,
+    TCL_PATH_VOLUME_RELATIVE
+} Tcl_PathType;
+
+/*
+ * The following structure is used to pass glob type data amongst the various
+ * glob routines and Tcl_FSMatchInDirectory.
+ */
+
+typedef struct Tcl_GlobTypeData {
+    int type;			/* Corresponds to bcdpfls as in 'find -t'. */
+    int perm;			/* Corresponds to file permissions. */
+    Tcl_Obj *macType;		/* Acceptable Mac type. */
+    Tcl_Obj *macCreator;	/* Acceptable Mac creator. */
+} Tcl_GlobTypeData;
+
+/*
+ * Type and permission definitions for glob command.
+ */
+
+#define TCL_GLOB_TYPE_BLOCK		(1<<0)
+#define TCL_GLOB_TYPE_CHAR		(1<<1)
+#define TCL_GLOB_TYPE_DIR		(1<<2)
+#define TCL_GLOB_TYPE_PIPE		(1<<3)
+#define TCL_GLOB_TYPE_FILE		(1<<4)
+#define TCL_GLOB_TYPE_LINK		(1<<5)
+#define TCL_GLOB_TYPE_SOCK		(1<<6)
+#define TCL_GLOB_TYPE_MOUNT		(1<<7)
+
+#define TCL_GLOB_PERM_RONLY		(1<<0)
+#define TCL_GLOB_PERM_HIDDEN		(1<<1)
+#define TCL_GLOB_PERM_R			(1<<2)
+#define TCL_GLOB_PERM_W			(1<<3)
+#define TCL_GLOB_PERM_X			(1<<4)
+
+/*
+ * Flags for the unload callback function.
+ */
+
+#define TCL_UNLOAD_DETACH_FROM_INTERPRETER	(1<<0)
+#define TCL_UNLOAD_DETACH_FROM_PROCESS		(1<<1)
+
+/*
+ * Typedefs for the various filesystem operations:
+ */
+
+typedef int (Tcl_FSStatProc) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+typedef int (Tcl_FSAccessProc) (Tcl_Obj *pathPtr, int mode);
+typedef Tcl_Channel (Tcl_FSOpenFileChannelProc) (Tcl_Interp *interp,
+	Tcl_Obj *pathPtr, int mode, int permissions);
+typedef int (Tcl_FSMatchInDirectoryProc) (Tcl_Interp *interp, Tcl_Obj *result,
+	Tcl_Obj *pathPtr, const char *pattern, Tcl_GlobTypeData *types);
+typedef Tcl_Obj * (Tcl_FSGetCwdProc) (Tcl_Interp *interp);
+typedef int (Tcl_FSChdirProc) (Tcl_Obj *pathPtr);
+typedef int (Tcl_FSLstatProc) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+typedef int (Tcl_FSCreateDirectoryProc) (Tcl_Obj *pathPtr);
+typedef int (Tcl_FSDeleteFileProc) (Tcl_Obj *pathPtr);
+typedef int (Tcl_FSCopyDirectoryProc) (Tcl_Obj *srcPathPtr,
+	Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr);
+typedef int (Tcl_FSCopyFileProc) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr);
+typedef int (Tcl_FSRemoveDirectoryProc) (Tcl_Obj *pathPtr, int recursive,
+	Tcl_Obj **errorPtr);
+typedef int (Tcl_FSRenameFileProc) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr);
+typedef void (Tcl_FSUnloadFileProc) (Tcl_LoadHandle loadHandle);
+typedef Tcl_Obj * (Tcl_FSListVolumesProc) (void);
+/* We have to declare the utime structure here. */
+struct utimbuf;
+typedef int (Tcl_FSUtimeProc) (Tcl_Obj *pathPtr, struct utimbuf *tval);
+typedef int (Tcl_FSNormalizePathProc) (Tcl_Interp *interp, Tcl_Obj *pathPtr,
+	int nextCheckpoint);
+typedef int (Tcl_FSFileAttrsGetProc) (Tcl_Interp *interp, int index,
+	Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef);
+typedef const char *CONST86 * (Tcl_FSFileAttrStringsProc) (Tcl_Obj *pathPtr,
+	Tcl_Obj **objPtrRef);
+typedef int (Tcl_FSFileAttrsSetProc) (Tcl_Interp *interp, int index,
+	Tcl_Obj *pathPtr, Tcl_Obj *objPtr);
+typedef Tcl_Obj * (Tcl_FSLinkProc) (Tcl_Obj *pathPtr, Tcl_Obj *toPtr,
+	int linkType);
+typedef int (Tcl_FSLoadFileProc) (Tcl_Interp *interp, Tcl_Obj *pathPtr,
+	Tcl_LoadHandle *handlePtr, Tcl_FSUnloadFileProc **unloadProcPtr);
+typedef int (Tcl_FSPathInFilesystemProc) (Tcl_Obj *pathPtr,
+	ClientData *clientDataPtr);
+typedef Tcl_Obj * (Tcl_FSFilesystemPathTypeProc) (Tcl_Obj *pathPtr);
+typedef Tcl_Obj * (Tcl_FSFilesystemSeparatorProc) (Tcl_Obj *pathPtr);
+typedef void (Tcl_FSFreeInternalRepProc) (ClientData clientData);
+typedef ClientData (Tcl_FSDupInternalRepProc) (ClientData clientData);
+typedef Tcl_Obj * (Tcl_FSInternalToNormalizedProc) (ClientData clientData);
+typedef ClientData (Tcl_FSCreateInternalRepProc) (Tcl_Obj *pathPtr);
+
+typedef struct Tcl_FSVersion_ *Tcl_FSVersion;
+
+/*
+ *----------------------------------------------------------------------------
+ * Data structures related to hooking into the filesystem
+ */
+
+/*
+ * Filesystem version tag.  This was introduced in 8.4.
+ */
+
+#define TCL_FILESYSTEM_VERSION_1	((Tcl_FSVersion) 0x1)
+
+/*
+ * struct Tcl_Filesystem:
+ *
+ * One such structure exists for each type (kind) of filesystem. It collects
+ * together in one place all the functions that are part of the specific
+ * filesystem. Tcl always accesses the filesystem through one of these
+ * structures.
+ *
+ * Not all entries need be non-NULL; any which are NULL are simply ignored.
+ * However, a complete filesystem should provide all of these functions. The
+ * explanations in the structure show the importance of each function.
+ */
+
+typedef struct Tcl_Filesystem {
+    const char *typeName;	/* The name of the filesystem. */
+    int structureLength;	/* Length of this structure, so future binary
+				 * compatibility can be assured. */
+    Tcl_FSVersion version;	/* Version of the filesystem type. */
+    Tcl_FSPathInFilesystemProc *pathInFilesystemProc;
+				/* Function to check whether a path is in this
+				 * filesystem. This is the most important
+				 * filesystem function. */
+    Tcl_FSDupInternalRepProc *dupInternalRepProc;
+				/* Function to duplicate internal fs rep. May
+				 * be NULL (but then fs is less efficient). */
+    Tcl_FSFreeInternalRepProc *freeInternalRepProc;
+				/* Function to free internal fs rep. Must be
+				 * implemented if internal representations
+				 * need freeing, otherwise it can be NULL. */
+    Tcl_FSInternalToNormalizedProc *internalToNormalizedProc;
+				/* Function to convert internal representation
+				 * to a normalized path. Only required if the
+				 * fs creates pure path objects with no
+				 * string/path representation. */
+    Tcl_FSCreateInternalRepProc *createInternalRepProc;
+				/* Function to create a filesystem-specific
+				 * internal representation. May be NULL if
+				 * paths have no internal representation, or
+				 * if the Tcl_FSPathInFilesystemProc for this
+				 * filesystem always immediately creates an
+				 * internal representation for paths it
+				 * accepts. */
+    Tcl_FSNormalizePathProc *normalizePathProc;
+				/* Function to normalize a path.  Should be
+				 * implemented for all filesystems which can
+				 * have multiple string representations for
+				 * the same path object. */
+    Tcl_FSFilesystemPathTypeProc *filesystemPathTypeProc;
+				/* Function to determine the type of a path in
+				 * this filesystem. May be NULL. */
+    Tcl_FSFilesystemSeparatorProc *filesystemSeparatorProc;
+				/* Function to return the separator
+				 * character(s) for this filesystem. Must be
+				 * implemented. */
+    Tcl_FSStatProc *statProc;	/* Function to process a 'Tcl_FSStat()' call.
+				 * Must be implemented for any reasonable
+				 * filesystem. */
+    Tcl_FSAccessProc *accessProc;
+				/* Function to process a 'Tcl_FSAccess()'
+				 * call. Must be implemented for any
+				 * reasonable filesystem. */
+    Tcl_FSOpenFileChannelProc *openFileChannelProc;
+				/* Function to process a
+				 * 'Tcl_FSOpenFileChannel()' call. Must be
+				 * implemented for any reasonable
+				 * filesystem. */
+    Tcl_FSMatchInDirectoryProc *matchInDirectoryProc;
+				/* Function to process a
+				 * 'Tcl_FSMatchInDirectory()'.  If not
+				 * implemented, then glob and recursive copy
+				 * functionality will be lacking in the
+				 * filesystem. */
+    Tcl_FSUtimeProc *utimeProc;	/* Function to process a 'Tcl_FSUtime()' call.
+				 * Required to allow setting (not reading) of
+				 * times with 'file mtime', 'file atime' and
+				 * the open-r/open-w/fcopy implementation of
+				 * 'file copy'. */
+    Tcl_FSLinkProc *linkProc;	/* Function to process a 'Tcl_FSLink()' call.
+				 * Should be implemented only if the
+				 * filesystem supports links (reading or
+				 * creating). */
+    Tcl_FSListVolumesProc *listVolumesProc;
+				/* Function to list any filesystem volumes
+				 * added by this filesystem. Should be
+				 * implemented only if the filesystem adds
+				 * volumes at the head of the filesystem. */
+    Tcl_FSFileAttrStringsProc *fileAttrStringsProc;
+				/* Function to list all attributes strings
+				 * which are valid for this filesystem. If not
+				 * implemented the filesystem will not support
+				 * the 'file attributes' command. This allows
+				 * arbitrary additional information to be
+				 * attached to files in the filesystem. */
+    Tcl_FSFileAttrsGetProc *fileAttrsGetProc;
+				/* Function to process a
+				 * 'Tcl_FSFileAttrsGet()' call, used by 'file
+				 * attributes'. */
+    Tcl_FSFileAttrsSetProc *fileAttrsSetProc;
+				/* Function to process a
+				 * 'Tcl_FSFileAttrsSet()' call, used by 'file
+				 * attributes'.  */
+    Tcl_FSCreateDirectoryProc *createDirectoryProc;
+				/* Function to process a
+				 * 'Tcl_FSCreateDirectory()' call. Should be
+				 * implemented unless the FS is read-only. */
+    Tcl_FSRemoveDirectoryProc *removeDirectoryProc;
+				/* Function to process a
+				 * 'Tcl_FSRemoveDirectory()' call. Should be
+				 * implemented unless the FS is read-only. */
+    Tcl_FSDeleteFileProc *deleteFileProc;
+				/* Function to process a 'Tcl_FSDeleteFile()'
+				 * call. Should be implemented unless the FS
+				 * is read-only. */
+    Tcl_FSCopyFileProc *copyFileProc;
+				/* Function to process a 'Tcl_FSCopyFile()'
+				 * call. If not implemented Tcl will fall back
+				 * on open-r, open-w and fcopy as a copying
+				 * mechanism, for copying actions initiated in
+				 * Tcl (not C). */
+    Tcl_FSRenameFileProc *renameFileProc;
+				/* Function to process a 'Tcl_FSRenameFile()'
+				 * call. If not implemented, Tcl will fall
+				 * back on a copy and delete mechanism, for
+				 * rename actions initiated in Tcl (not C). */
+    Tcl_FSCopyDirectoryProc *copyDirectoryProc;
+				/* Function to process a
+				 * 'Tcl_FSCopyDirectory()' call. If not
+				 * implemented, Tcl will fall back on a
+				 * recursive create-dir, file copy mechanism,
+				 * for copying actions initiated in Tcl (not
+				 * C). */
+    Tcl_FSLstatProc *lstatProc;	/* Function to process a 'Tcl_FSLstat()' call.
+				 * If not implemented, Tcl will attempt to use
+				 * the 'statProc' defined above instead. */
+    Tcl_FSLoadFileProc *loadFileProc;
+				/* Function to process a 'Tcl_FSLoadFile()'
+				 * call. If not implemented, Tcl will fall
+				 * back on a copy to native-temp followed by a
+				 * Tcl_FSLoadFile on that temporary copy. */
+    Tcl_FSGetCwdProc *getCwdProc;
+				/* Function to process a 'Tcl_FSGetCwd()'
+				 * call. Most filesystems need not implement
+				 * this. It will usually only be called once,
+				 * if 'getcwd' is called before 'chdir'. May
+				 * be NULL. */
+    Tcl_FSChdirProc *chdirProc;	/* Function to process a 'Tcl_FSChdir()' call.
+				 * If filesystems do not implement this, it
+				 * will be emulated by a series of directory
+				 * access checks. Otherwise, virtual
+				 * filesystems which do implement it need only
+				 * respond with a positive return result if
+				 * the dirName is a valid directory in their
+				 * filesystem. They need not remember the
+				 * result, since that will be automatically
+				 * remembered for use by GetCwd. Real
+				 * filesystems should carry out the correct
+				 * action (i.e. call the correct system
+				 * 'chdir' api). If not implemented, then 'cd'
+				 * and 'pwd' will fail inside the
+				 * filesystem. */
+} Tcl_Filesystem;
+
+/*
+ * The following definitions are used as values for the 'linkAction' flag to
+ * Tcl_FSLink, or the linkProc of any filesystem. Any combination of flags can
+ * be given. For link creation, the linkProc should create a link which
+ * matches any of the types given.
+ *
+ * TCL_CREATE_SYMBOLIC_LINK -	Create a symbolic or soft link.
+ * TCL_CREATE_HARD_LINK -	Create a hard link.
+ */
+
+#define TCL_CREATE_SYMBOLIC_LINK	0x01
+#define TCL_CREATE_HARD_LINK		0x02
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure represents the Notifier functions that you can
+ * override with the Tcl_SetNotifier call.
+ */
+
+typedef struct Tcl_NotifierProcs {
+    Tcl_SetTimerProc *setTimerProc;
+    Tcl_WaitForEventProc *waitForEventProc;
+    Tcl_CreateFileHandlerProc *createFileHandlerProc;
+    Tcl_DeleteFileHandlerProc *deleteFileHandlerProc;
+    Tcl_InitNotifierProc *initNotifierProc;
+    Tcl_FinalizeNotifierProc *finalizeNotifierProc;
+    Tcl_AlertNotifierProc *alertNotifierProc;
+    Tcl_ServiceModeHookProc *serviceModeHookProc;
+} Tcl_NotifierProcs;
+
+/*
+ *----------------------------------------------------------------------------
+ * The following data structures and declarations are for the new Tcl parser.
+ *
+ * For each word of a command, and for each piece of a word such as a variable
+ * reference, one of the following structures is created to describe the
+ * token.
+ */
+
+typedef struct Tcl_Token {
+    int type;			/* Type of token, such as TCL_TOKEN_WORD; see
+				 * below for valid types. */
+    const char *start;		/* First character in token. */
+    int size;			/* Number of bytes in token. */
+    int numComponents;		/* If this token is composed of other tokens,
+				 * this field tells how many of them there are
+				 * (including components of components, etc.).
+				 * The component tokens immediately follow
+				 * this one. */
+} Tcl_Token;
+
+/*
+ * Type values defined for Tcl_Token structures. These values are defined as
+ * mask bits so that it's easy to check for collections of types.
+ *
+ * TCL_TOKEN_WORD -		The token describes one word of a command,
+ *				from the first non-blank character of the word
+ *				(which may be " or {) up to but not including
+ *				the space, semicolon, or bracket that
+ *				terminates the word. NumComponents counts the
+ *				total number of sub-tokens that make up the
+ *				word. This includes, for example, sub-tokens
+ *				of TCL_TOKEN_VARIABLE tokens.
+ * TCL_TOKEN_SIMPLE_WORD -	This token is just like TCL_TOKEN_WORD except
+ *				that the word is guaranteed to consist of a
+ *				single TCL_TOKEN_TEXT sub-token.
+ * TCL_TOKEN_TEXT -		The token describes a range of literal text
+ *				that is part of a word. NumComponents is
+ *				always 0.
+ * TCL_TOKEN_BS -		The token describes a backslash sequence that
+ *				must be collapsed. NumComponents is always 0.
+ * TCL_TOKEN_COMMAND -		The token describes a command whose result
+ *				must be substituted into the word. The token
+ *				includes the enclosing brackets. NumComponents
+ *				is always 0.
+ * TCL_TOKEN_VARIABLE -		The token describes a variable substitution,
+ *				including the dollar sign, variable name, and
+ *				array index (if there is one) up through the
+ *				right parentheses. NumComponents tells how
+ *				many additional tokens follow to represent the
+ *				variable name. The first token will be a
+ *				TCL_TOKEN_TEXT token that describes the
+ *				variable name. If the variable is an array
+ *				reference then there will be one or more
+ *				additional tokens, of type TCL_TOKEN_TEXT,
+ *				TCL_TOKEN_BS, TCL_TOKEN_COMMAND, and
+ *				TCL_TOKEN_VARIABLE, that describe the array
+ *				index; numComponents counts the total number
+ *				of nested tokens that make up the variable
+ *				reference, including sub-tokens of
+ *				TCL_TOKEN_VARIABLE tokens.
+ * TCL_TOKEN_SUB_EXPR -		The token describes one subexpression of an
+ *				expression, from the first non-blank character
+ *				of the subexpression up to but not including
+ *				the space, brace, or bracket that terminates
+ *				the subexpression. NumComponents counts the
+ *				total number of following subtokens that make
+ *				up the subexpression; this includes all
+ *				subtokens for any nested TCL_TOKEN_SUB_EXPR
+ *				tokens. For example, a numeric value used as a
+ *				primitive operand is described by a
+ *				TCL_TOKEN_SUB_EXPR token followed by a
+ *				TCL_TOKEN_TEXT token. A binary subexpression
+ *				is described by a TCL_TOKEN_SUB_EXPR token
+ *				followed by the TCL_TOKEN_OPERATOR token for
+ *				the operator, then TCL_TOKEN_SUB_EXPR tokens
+ *				for the left then the right operands.
+ * TCL_TOKEN_OPERATOR -		The token describes one expression operator.
+ *				An operator might be the name of a math
+ *				function such as "abs". A TCL_TOKEN_OPERATOR
+ *				token is always preceeded by one
+ *				TCL_TOKEN_SUB_EXPR token for the operator's
+ *				subexpression, and is followed by zero or more
+ *				TCL_TOKEN_SUB_EXPR tokens for the operator's
+ *				operands. NumComponents is always 0.
+ * TCL_TOKEN_EXPAND_WORD -	This token is just like TCL_TOKEN_WORD except
+ *				that it marks a word that began with the
+ *				literal character prefix "{*}". This word is
+ *				marked to be expanded - that is, broken into
+ *				words after substitution is complete.
+ */
+
+#define TCL_TOKEN_WORD		1
+#define TCL_TOKEN_SIMPLE_WORD	2
+#define TCL_TOKEN_TEXT		4
+#define TCL_TOKEN_BS		8
+#define TCL_TOKEN_COMMAND	16
+#define TCL_TOKEN_VARIABLE	32
+#define TCL_TOKEN_SUB_EXPR	64
+#define TCL_TOKEN_OPERATOR	128
+#define TCL_TOKEN_EXPAND_WORD	256
+
+/*
+ * Parsing error types. On any parsing error, one of these values will be
+ * stored in the error field of the Tcl_Parse structure defined below.
+ */
+
+#define TCL_PARSE_SUCCESS		0
+#define TCL_PARSE_QUOTE_EXTRA		1
+#define TCL_PARSE_BRACE_EXTRA		2
+#define TCL_PARSE_MISSING_BRACE		3
+#define TCL_PARSE_MISSING_BRACKET	4
+#define TCL_PARSE_MISSING_PAREN		5
+#define TCL_PARSE_MISSING_QUOTE		6
+#define TCL_PARSE_MISSING_VAR_BRACE	7
+#define TCL_PARSE_SYNTAX		8
+#define TCL_PARSE_BAD_NUMBER		9
+
+/*
+ * A structure of the following type is filled in by Tcl_ParseCommand. It
+ * describes a single command parsed from an input string.
+ */
+
+#define NUM_STATIC_TOKENS 20
+
+typedef struct Tcl_Parse {
+    const char *commentStart;	/* Pointer to # that begins the first of one
+				 * or more comments preceding the command. */
+    int commentSize;		/* Number of bytes in comments (up through
+				 * newline character that terminates the last
+				 * comment). If there were no comments, this
+				 * field is 0. */
+    const char *commandStart;	/* First character in first word of
+				 * command. */
+    int commandSize;		/* Number of bytes in command, including first
+				 * character of first word, up through the
+				 * terminating newline, close bracket, or
+				 * semicolon. */
+    int numWords;		/* Total number of words in command. May be
+				 * 0. */
+    Tcl_Token *tokenPtr;	/* Pointer to first token representing the
+				 * words of the command. Initially points to
+				 * staticTokens, but may change to point to
+				 * malloc-ed space if command exceeds space in
+				 * staticTokens. */
+    int numTokens;		/* Total number of tokens in command. */
+    int tokensAvailable;	/* Total number of tokens available at
+				 * *tokenPtr. */
+    int errorType;		/* One of the parsing error types defined
+				 * above. */
+
+    /*
+     * The fields below are intended only for the private use of the parser.
+     * They should not be used by functions that invoke Tcl_ParseCommand.
+     */
+
+    const char *string;		/* The original command string passed to
+				 * Tcl_ParseCommand. */
+    const char *end;		/* Points to the character just after the last
+				 * one in the command string. */
+    Tcl_Interp *interp;		/* Interpreter to use for error reporting, or
+				 * NULL. */
+    const char *term;		/* Points to character in string that
+				 * terminated most recent token. Filled in by
+				 * ParseTokens. If an error occurs, points to
+				 * beginning of region where the error
+				 * occurred (e.g. the open brace if the close
+				 * brace is missing). */
+    int incomplete;		/* This field is set to 1 by Tcl_ParseCommand
+				 * if the command appears to be incomplete.
+				 * This information is used by
+				 * Tcl_CommandComplete. */
+    Tcl_Token staticTokens[NUM_STATIC_TOKENS];
+				/* Initial space for tokens for command. This
+				 * space should be large enough to accommodate
+				 * most commands; dynamic space is allocated
+				 * for very large commands that don't fit
+				 * here. */
+} Tcl_Parse;
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure represents a user-defined encoding. It collects
+ * together all the functions that are used by the specific encoding.
+ */
+
+typedef struct Tcl_EncodingType {
+    const char *encodingName;	/* The name of the encoding, e.g. "euc-jp".
+				 * This name is the unique key for this
+				 * encoding type. */
+    Tcl_EncodingConvertProc *toUtfProc;
+				/* Function to convert from external encoding
+				 * into UTF-8. */
+    Tcl_EncodingConvertProc *fromUtfProc;
+				/* Function to convert from UTF-8 into
+				 * external encoding. */
+    Tcl_EncodingFreeProc *freeProc;
+				/* If non-NULL, function to call when this
+				 * encoding is deleted. */
+    ClientData clientData;	/* Arbitrary value associated with encoding
+				 * type. Passed to conversion functions. */
+    int nullSize;		/* Number of zero bytes that signify
+				 * end-of-string in this encoding. This number
+				 * is used to determine the source string
+				 * length when the srcLen argument is
+				 * negative. Must be 1 or 2. */
+} Tcl_EncodingType;
+
+/*
+ * The following definitions are used as values for the conversion control
+ * flags argument when converting text from one character set to another:
+ *
+ * TCL_ENCODING_START -		Signifies that the source buffer is the first
+ *				block in a (potentially multi-block) input
+ *				stream. Tells the conversion function to reset
+ *				to an initial state and perform any
+ *				initialization that needs to occur before the
+ *				first byte is converted. If the source buffer
+ *				contains the entire input stream to be
+ *				converted, this flag should be set.
+ * TCL_ENCODING_END -		Signifies that the source buffer is the last
+ *				block in a (potentially multi-block) input
+ *				stream. Tells the conversion routine to
+ *				perform any finalization that needs to occur
+ *				after the last byte is converted and then to
+ *				reset to an initial state. If the source
+ *				buffer contains the entire input stream to be
+ *				converted, this flag should be set.
+ * TCL_ENCODING_STOPONERROR -	If set, then the converter will return
+ *				immediately upon encountering an invalid byte
+ *				sequence or a source character that has no
+ *				mapping in the target encoding. If clear, then
+ *				the converter will skip the problem,
+ *				substituting one or more "close" characters in
+ *				the destination buffer and then continue to
+ *				convert the source.
+ * TCL_ENCODING_NO_TERMINATE - 	If set, Tcl_ExternalToUtf will not append a
+ *				terminating NUL byte.  Knowing that it will
+ *				not need space to do so, it will fill all
+ *				dstLen bytes with encoded UTF-8 content, as
+ *				other circumstances permit.  If clear, the
+ *				default behavior is to reserve a byte in
+ *				the dst space for NUL termination, and to
+ *				append the NUL byte.
+ * TCL_ENCODING_CHAR_LIMIT -	If set and dstCharsPtr is not NULL, then
+ *				Tcl_ExternalToUtf takes the initial value
+ *				of *dstCharsPtr is taken as a limit of the
+ *				maximum number of chars to produce in the
+ *				encoded UTF-8 content.  Otherwise, the 
+ *				number of chars produced is controlled only
+ *				by other limiting factors.
+ */
+
+#define TCL_ENCODING_START		0x01
+#define TCL_ENCODING_END		0x02
+#define TCL_ENCODING_STOPONERROR	0x04
+#define TCL_ENCODING_NO_TERMINATE	0x08
+#define TCL_ENCODING_CHAR_LIMIT		0x10
+
+/*
+ * The following definitions are the error codes returned by the conversion
+ * routines:
+ *
+ * TCL_OK -			All characters were converted.
+ * TCL_CONVERT_NOSPACE -	The output buffer would not have been large
+ *				enough for all of the converted data; as many
+ *				characters as could fit were converted though.
+ * TCL_CONVERT_MULTIBYTE -	The last few bytes in the source string were
+ *				the beginning of a multibyte sequence, but
+ *				more bytes were needed to complete this
+ *				sequence. A subsequent call to the conversion
+ *				routine should pass the beginning of this
+ *				unconverted sequence plus additional bytes
+ *				from the source stream to properly convert the
+ *				formerly split-up multibyte sequence.
+ * TCL_CONVERT_SYNTAX -		The source stream contained an invalid
+ *				character sequence. This may occur if the
+ *				input stream has been damaged or if the input
+ *				encoding method was misidentified. This error
+ *				is reported only if TCL_ENCODING_STOPONERROR
+ *				was specified.
+ * TCL_CONVERT_UNKNOWN -	The source string contained a character that
+ *				could not be represented in the target
+ *				encoding. This error is reported only if
+ *				TCL_ENCODING_STOPONERROR was specified.
+ */
+
+#define TCL_CONVERT_MULTIBYTE	(-1)
+#define TCL_CONVERT_SYNTAX	(-2)
+#define TCL_CONVERT_UNKNOWN	(-3)
+#define TCL_CONVERT_NOSPACE	(-4)
+
+/*
+ * The maximum number of bytes that are necessary to represent a single
+ * Unicode character in UTF-8. The valid values should be 3, 4 or 6
+ * (or perhaps 1 if we want to support a non-unicode enabled core). If 3 or
+ * 4, then Tcl_UniChar must be 2-bytes in size (UCS-2) (the default). If 6,
+ * then Tcl_UniChar must be 4-bytes in size (UCS-4). At this time UCS-2 mode
+ * is the default and recommended mode. UCS-4 is experimental and not
+ * recommended. It works for the core, but most extensions expect UCS-2.
+ */
+
+#ifndef TCL_UTF_MAX
+#define TCL_UTF_MAX		3
+#endif
+
+/*
+ * This represents a Unicode character. Any changes to this should also be
+ * reflected in regcustom.h.
+ */
+
+#if TCL_UTF_MAX > 4
+    /*
+     * unsigned int isn't 100% accurate as it should be a strict 4-byte value
+     * (perhaps wchar_t). 64-bit systems may have troubles. The size of this
+     * value must be reflected correctly in regcustom.h and
+     * in tclEncoding.c.
+     * XXX: Tcl is currently UCS-2 and planning UTF-16 for the Unicode
+     * XXX: string rep that Tcl_UniChar represents.  Changing the size
+     * XXX: of Tcl_UniChar is /not/ supported.
+     */
+typedef unsigned int Tcl_UniChar;
+#else
+typedef unsigned short Tcl_UniChar;
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * TIP #59: The following structure is used in calls 'Tcl_RegisterConfig' to
+ * provide the system with the embedded configuration data.
+ */
+
+typedef struct Tcl_Config {
+    const char *key;		/* Configuration key to register. ASCII
+				 * encoded, thus UTF-8. */
+    const char *value;		/* The value associated with the key. System
+				 * encoding. */
+} Tcl_Config;
+
+/*
+ *----------------------------------------------------------------------------
+ * Flags for TIP#143 limits, detailing which limits are active in an
+ * interpreter. Used for Tcl_{Add,Remove}LimitHandler type argument.
+ */
+
+#define TCL_LIMIT_COMMANDS	0x01
+#define TCL_LIMIT_TIME		0x02
+
+/*
+ * Structure containing information about a limit handler to be called when a
+ * command- or time-limit is exceeded by an interpreter.
+ */
+
+typedef void (Tcl_LimitHandlerProc) (ClientData clientData, Tcl_Interp *interp);
+typedef void (Tcl_LimitHandlerDeleteProc) (ClientData clientData);
+
+/*
+ *----------------------------------------------------------------------------
+ * Override definitions for libtommath.
+ */
+
+typedef struct mp_int mp_int;
+#define MP_INT_DECLARED
+typedef unsigned int mp_digit;
+#define MP_DIGIT_DECLARED
+
+/*
+ *----------------------------------------------------------------------------
+ * Definitions needed for Tcl_ParseArgvObj routines.
+ * Based on tkArgv.c.
+ * Modifications from the original are copyright (c) Sam Bromley 2006
+ */
+
+typedef struct {
+    int type;			/* Indicates the option type; see below. */
+    const char *keyStr;		/* The key string that flags the option in the
+				 * argv array. */
+    void *srcPtr;		/* Value to be used in setting dst; usage
+				 * depends on type.*/
+    void *dstPtr;		/* Address of value to be modified; usage
+				 * depends on type.*/
+    const char *helpStr;	/* Documentation message describing this
+				 * option. */
+    ClientData clientData;	/* Word to pass to function callbacks. */
+} Tcl_ArgvInfo;
+
+/*
+ * Legal values for the type field of a Tcl_ArgInfo: see the user
+ * documentation for details.
+ */
+
+#define TCL_ARGV_CONSTANT	15
+#define TCL_ARGV_INT		16
+#define TCL_ARGV_STRING		17
+#define TCL_ARGV_REST		18
+#define TCL_ARGV_FLOAT		19
+#define TCL_ARGV_FUNC		20
+#define TCL_ARGV_GENFUNC	21
+#define TCL_ARGV_HELP		22
+#define TCL_ARGV_END		23
+
+/*
+ * Types of callback functions for the TCL_ARGV_FUNC and TCL_ARGV_GENFUNC
+ * argument types:
+ */
+
+typedef int (Tcl_ArgvFuncProc)(ClientData clientData, Tcl_Obj *objPtr,
+	void *dstPtr);
+typedef int (Tcl_ArgvGenFuncProc)(ClientData clientData, Tcl_Interp *interp,
+	int objc, Tcl_Obj *const *objv, void *dstPtr);
+
+/*
+ * Shorthand for commonly used argTable entries.
+ */
+
+#define TCL_ARGV_AUTO_HELP \
+    {TCL_ARGV_HELP,	"-help",	NULL,	NULL, \
+	    "Print summary of command-line options and abort", NULL}
+#define TCL_ARGV_AUTO_REST \
+    {TCL_ARGV_REST,	"--",		NULL,	NULL, \
+	    "Marks the end of the options", NULL}
+#define TCL_ARGV_TABLE_END \
+    {TCL_ARGV_END, NULL, NULL, NULL, NULL, NULL}
+
+/*
+ *----------------------------------------------------------------------------
+ * Definitions needed for Tcl_Zlib routines. [TIP #234]
+ *
+ * Constants for the format flags describing what sort of data format is
+ * desired/expected for the Tcl_ZlibDeflate, Tcl_ZlibInflate and
+ * Tcl_ZlibStreamInit functions.
+ */
+
+#define TCL_ZLIB_FORMAT_RAW	1
+#define TCL_ZLIB_FORMAT_ZLIB	2
+#define TCL_ZLIB_FORMAT_GZIP	4
+#define TCL_ZLIB_FORMAT_AUTO	8
+
+/*
+ * Constants that describe whether the stream is to operate in compressing or
+ * decompressing mode.
+ */
+
+#define TCL_ZLIB_STREAM_DEFLATE	16
+#define TCL_ZLIB_STREAM_INFLATE	32
+
+/*
+ * Constants giving compression levels. Use of TCL_ZLIB_COMPRESS_DEFAULT is
+ * recommended.
+ */
+
+#define TCL_ZLIB_COMPRESS_NONE	0
+#define TCL_ZLIB_COMPRESS_FAST	1
+#define TCL_ZLIB_COMPRESS_BEST	9
+#define TCL_ZLIB_COMPRESS_DEFAULT (-1)
+
+/*
+ * Constants for types of flushing, used with Tcl_ZlibFlush.
+ */
+
+#define TCL_ZLIB_NO_FLUSH	0
+#define TCL_ZLIB_FLUSH		2
+#define TCL_ZLIB_FULLFLUSH	3
+#define TCL_ZLIB_FINALIZE	4
+
+/*
+ *----------------------------------------------------------------------------
+ * Definitions needed for the Tcl_LoadFile function. [TIP #416]
+ */
+
+#define TCL_LOAD_GLOBAL 1
+#define TCL_LOAD_LAZY 2
+
+/*
+ *----------------------------------------------------------------------------
+ * Single public declaration for NRE.
+ */
+
+typedef int (Tcl_NRPostProc) (ClientData data[], Tcl_Interp *interp,
+				int result);
+
+/*
+ *----------------------------------------------------------------------------
+ * The following constant is used to test for older versions of Tcl in the
+ * stubs tables.
+ *
+ * Jan Nijtman's plus patch uses 0xFCA1BACF, so we need to pick a different
+ * value since the stubs tables don't match.
+ */
+
+#define TCL_STUB_MAGIC		((int) 0xFCA3BACF)
+
+/*
+ * The following function is required to be defined in all stubs aware
+ * extensions. The function is actually implemented in the stub library, not
+ * the main Tcl library, although there is a trivial implementation in the
+ * main library in case an extension is statically linked into an application.
+ */
+
+const char *		Tcl_InitStubs(Tcl_Interp *interp, const char *version,
+			    int exact);
+const char *		TclTomMathInitializeStubs(Tcl_Interp *interp,
+			    const char *version, int epoch, int revision);
+
+/*
+ * When not using stubs, make it a macro.
+ */
+
+#ifndef USE_TCL_STUBS
+#define Tcl_InitStubs(interp, version, exact) \
+    Tcl_PkgInitStubsCheck(interp, version, exact)
+#endif
+
+/*
+ * TODO - tommath stubs export goes here!
+ */
+
+/*
+ * Public functions that are not accessible via the stubs table.
+ * Tcl_GetMemoryInfo is needed for AOLserver. [Bug 1868171]
+ */
+
+#define Tcl_Main(argc, argv, proc) Tcl_MainEx(argc, argv, proc, \
+	    ((Tcl_CreateInterp)()))
+EXTERN void		Tcl_MainEx(int argc, char **argv,
+			    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
+EXTERN const char *	Tcl_PkgInitStubsCheck(Tcl_Interp *interp,
+			    const char *version, int exact);
+EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
+
+/*
+ *----------------------------------------------------------------------------
+ * Include the public function declarations that are accessible via the stubs
+ * table.
+ */
+
+#include "tclDecls.h"
+
+/*
+ * Include platform specific public function declarations that are accessible
+ * via the stubs table. Make all TclOO symbols MODULE_SCOPE (which only
+ * has effect on building it as a shared library). See ticket [3010352].
+ */
+
+#if defined(BUILD_tcl)
+#   undef TCLAPI
+#   define TCLAPI MODULE_SCOPE
+#endif
+
+#include "tclPlatDecls.h"
+
+/*
+ *----------------------------------------------------------------------------
+ * The following declarations either map ckalloc and ckfree to malloc and
+ * free, or they map them to functions with all sorts of debugging hooks
+ * defined in tclCkalloc.c.
+ */
+
+#ifdef TCL_MEM_DEBUG
+
+#   define ckalloc(x) \
+    ((void *) Tcl_DbCkalloc((unsigned)(x), __FILE__, __LINE__))
+#   define ckfree(x) \
+    Tcl_DbCkfree((char *)(x), __FILE__, __LINE__)
+#   define ckrealloc(x,y) \
+    ((void *) Tcl_DbCkrealloc((char *)(x), (unsigned)(y), __FILE__, __LINE__))
+#   define attemptckalloc(x) \
+    ((void *) Tcl_AttemptDbCkalloc((unsigned)(x), __FILE__, __LINE__))
+#   define attemptckrealloc(x,y) \
+    ((void *) Tcl_AttemptDbCkrealloc((char *)(x), (unsigned)(y), __FILE__, __LINE__))
+
+#else /* !TCL_MEM_DEBUG */
+
+/*
+ * If we are not using the debugging allocator, we should call the Tcl_Alloc,
+ * et al. routines in order to guarantee that every module is using the same
+ * memory allocator both inside and outside of the Tcl library.
+ */
+
+#   define ckalloc(x) \
+    ((void *) Tcl_Alloc((unsigned)(x)))
+#   define ckfree(x) \
+    Tcl_Free((char *)(x))
+#   define ckrealloc(x,y) \
+    ((void *) Tcl_Realloc((char *)(x), (unsigned)(y)))
+#   define attemptckalloc(x) \
+    ((void *) Tcl_AttemptAlloc((unsigned)(x)))
+#   define attemptckrealloc(x,y) \
+    ((void *) Tcl_AttemptRealloc((char *)(x), (unsigned)(y)))
+#   undef  Tcl_InitMemory
+#   define Tcl_InitMemory(x)
+#   undef  Tcl_DumpActiveMemory
+#   define Tcl_DumpActiveMemory(x)
+#   undef  Tcl_ValidateAllMemory
+#   define Tcl_ValidateAllMemory(x,y)
+
+#endif /* !TCL_MEM_DEBUG */
+
+#ifdef TCL_MEM_DEBUG
+#   define Tcl_IncrRefCount(objPtr) \
+	Tcl_DbIncrRefCount(objPtr, __FILE__, __LINE__)
+#   define Tcl_DecrRefCount(objPtr) \
+	Tcl_DbDecrRefCount(objPtr, __FILE__, __LINE__)
+#   define Tcl_IsShared(objPtr) \
+	Tcl_DbIsShared(objPtr, __FILE__, __LINE__)
+#else
+#   define Tcl_IncrRefCount(objPtr) \
+	++(objPtr)->refCount
+    /*
+     * Use do/while0 idiom for optimum correctness without compiler warnings.
+     * http://c2.com/cgi/wiki?TrivialDoWhileLoop
+     */
+#   define Tcl_DecrRefCount(objPtr) \
+	do { \
+	    Tcl_Obj *_objPtr = (objPtr); \
+	    if (--(_objPtr)->refCount <= 0) { \
+		TclFreeObj(_objPtr); \
+	    } \
+	} while(0)
+#   define Tcl_IsShared(objPtr) \
+	((objPtr)->refCount > 1)
+#endif
+
+/*
+ * Macros and definitions that help to debug the use of Tcl objects. When
+ * TCL_MEM_DEBUG is defined, the Tcl_New declarations are overridden to call
+ * debugging versions of the object creation functions.
+ */
+
+#ifdef TCL_MEM_DEBUG
+#  undef  Tcl_NewBignumObj
+#  define Tcl_NewBignumObj(val) \
+     Tcl_DbNewBignumObj(val, __FILE__, __LINE__)
+#  undef  Tcl_NewBooleanObj
+#  define Tcl_NewBooleanObj(val) \
+     Tcl_DbNewBooleanObj(val, __FILE__, __LINE__)
+#  undef  Tcl_NewByteArrayObj
+#  define Tcl_NewByteArrayObj(bytes, len) \
+     Tcl_DbNewByteArrayObj(bytes, len, __FILE__, __LINE__)
+#  undef  Tcl_NewDoubleObj
+#  define Tcl_NewDoubleObj(val) \
+     Tcl_DbNewDoubleObj(val, __FILE__, __LINE__)
+#  undef  Tcl_NewIntObj
+#  define Tcl_NewIntObj(val) \
+     Tcl_DbNewLongObj(val, __FILE__, __LINE__)
+#  undef  Tcl_NewListObj
+#  define Tcl_NewListObj(objc, objv) \
+     Tcl_DbNewListObj(objc, objv, __FILE__, __LINE__)
+#  undef  Tcl_NewLongObj
+#  define Tcl_NewLongObj(val) \
+     Tcl_DbNewLongObj(val, __FILE__, __LINE__)
+#  undef  Tcl_NewObj
+#  define Tcl_NewObj() \
+     Tcl_DbNewObj(__FILE__, __LINE__)
+#  undef  Tcl_NewStringObj
+#  define Tcl_NewStringObj(bytes, len) \
+     Tcl_DbNewStringObj(bytes, len, __FILE__, __LINE__)
+#  undef  Tcl_NewWideIntObj
+#  define Tcl_NewWideIntObj(val) \
+     Tcl_DbNewWideIntObj(val, __FILE__, __LINE__)
+#endif /* TCL_MEM_DEBUG */
+
+/*
+ *----------------------------------------------------------------------------
+ * Macros for clients to use to access fields of hash entries:
+ */
+
+#define Tcl_GetHashValue(h) ((h)->clientData)
+#define Tcl_SetHashValue(h, value) ((h)->clientData = (ClientData) (value))
+#define Tcl_GetHashKey(tablePtr, h) \
+	((void *) (((tablePtr)->keyType == TCL_ONE_WORD_KEYS || \
+		    (tablePtr)->keyType == TCL_CUSTOM_PTR_KEYS) \
+		   ? (h)->key.oneWordValue \
+		   : (h)->key.string))
+
+/*
+ * Macros to use for clients to use to invoke find and create functions for
+ * hash tables:
+ */
+
+#undef  Tcl_FindHashEntry
+#define Tcl_FindHashEntry(tablePtr, key) \
+	(*((tablePtr)->findProc))(tablePtr, (const char *)(key))
+#undef  Tcl_CreateHashEntry
+#define Tcl_CreateHashEntry(tablePtr, key, newPtr) \
+	(*((tablePtr)->createProc))(tablePtr, (const char *)(key), newPtr)
+
+/*
+ *----------------------------------------------------------------------------
+ * Macros that eliminate the overhead of the thread synchronization functions
+ * when compiling without thread support.
+ */
+
+#ifndef TCL_THREADS
+#undef  Tcl_MutexLock
+#define Tcl_MutexLock(mutexPtr)
+#undef  Tcl_MutexUnlock
+#define Tcl_MutexUnlock(mutexPtr)
+#undef  Tcl_MutexFinalize
+#define Tcl_MutexFinalize(mutexPtr)
+#undef  Tcl_ConditionNotify
+#define Tcl_ConditionNotify(condPtr)
+#undef  Tcl_ConditionWait
+#define Tcl_ConditionWait(condPtr, mutexPtr, timePtr)
+#undef  Tcl_ConditionFinalize
+#define Tcl_ConditionFinalize(condPtr)
+#endif /* TCL_THREADS */
+
+/*
+ *----------------------------------------------------------------------------
+ * Deprecated Tcl functions:
+ */
+
+#ifndef TCL_NO_DEPRECATED
+/*
+ * These function have been renamed. The old names are deprecated, but we
+ * define these macros for backwards compatibilty.
+ */
+
+#   define Tcl_Ckalloc		Tcl_Alloc
+#   define Tcl_Ckfree		Tcl_Free
+#   define Tcl_Ckrealloc	Tcl_Realloc
+#   define Tcl_Return		Tcl_SetResult
+#   define Tcl_TildeSubst	Tcl_TranslateFileName
+#   define panic		Tcl_Panic
+#   define panicVA		Tcl_PanicVA
+#endif /* !TCL_NO_DEPRECATED */
+
+/*
+ *----------------------------------------------------------------------------
+ * Convenience declaration of Tcl_AppInit for backwards compatibility. This
+ * function is not *implemented* by the tcl library, so the storage class is
+ * neither DLLEXPORT nor DLLIMPORT.
+ */
+
+extern Tcl_AppInitProc Tcl_AppInit;
+
+#endif /* RC_INVOKED */
+
+/*
+ * end block for C++
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _TCL */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tclDecls.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tclDecls.h
new file mode 100644
index 00000000..91c0add2
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tclDecls.h
@@ -0,0 +1,3917 @@
+/*
+ * tclDecls.h --
+ *
+ *	Declarations of functions in the platform independent public Tcl API.
+ *
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#ifndef _TCLDECLS
+#define _TCLDECLS
+
+#undef TCL_STORAGE_CLASS
+#ifdef BUILD_tcl
+#   define TCL_STORAGE_CLASS DLLEXPORT
+#else
+#   ifdef USE_TCL_STUBS
+#      define TCL_STORAGE_CLASS
+#   else
+#      define TCL_STORAGE_CLASS DLLIMPORT
+#   endif
+#endif
+
+/*
+ * WARNING: This file is automatically generated by the tools/genStubs.tcl
+ * script.  Any modifications to the function declarations below should be made
+ * in the generic/tcl.decls script.
+ */
+
+/* !BEGIN!: Do not edit below this line. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+/* 0 */
+EXTERN int		Tcl_PkgProvideEx(Tcl_Interp *interp,
+				const char *name, const char *version,
+				const void *clientData);
+/* 1 */
+EXTERN CONST84_RETURN char * Tcl_PkgRequireEx(Tcl_Interp *interp,
+				const char *name, const char *version,
+				int exact, void *clientDataPtr);
+/* 2 */
+EXTERN void		Tcl_Panic(const char *format, ...) TCL_FORMAT_PRINTF(1, 2);
+/* 3 */
+EXTERN char *		Tcl_Alloc(unsigned int size);
+/* 4 */
+EXTERN void		Tcl_Free(char *ptr);
+/* 5 */
+EXTERN char *		Tcl_Realloc(char *ptr, unsigned int size);
+/* 6 */
+EXTERN char *		Tcl_DbCkalloc(unsigned int size, const char *file,
+				int line);
+/* 7 */
+EXTERN void		Tcl_DbCkfree(char *ptr, const char *file, int line);
+/* 8 */
+EXTERN char *		Tcl_DbCkrealloc(char *ptr, unsigned int size,
+				const char *file, int line);
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+/* 9 */
+EXTERN void		Tcl_CreateFileHandler(int fd, int mask,
+				Tcl_FileProc *proc, ClientData clientData);
+#endif /* UNIX */
+#ifdef MAC_OSX_TCL /* MACOSX */
+/* 9 */
+EXTERN void		Tcl_CreateFileHandler(int fd, int mask,
+				Tcl_FileProc *proc, ClientData clientData);
+#endif /* MACOSX */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+/* 10 */
+EXTERN void		Tcl_DeleteFileHandler(int fd);
+#endif /* UNIX */
+#ifdef MAC_OSX_TCL /* MACOSX */
+/* 10 */
+EXTERN void		Tcl_DeleteFileHandler(int fd);
+#endif /* MACOSX */
+/* 11 */
+EXTERN void		Tcl_SetTimer(const Tcl_Time *timePtr);
+/* 12 */
+EXTERN void		Tcl_Sleep(int ms);
+/* 13 */
+EXTERN int		Tcl_WaitForEvent(const Tcl_Time *timePtr);
+/* 14 */
+EXTERN int		Tcl_AppendAllObjTypes(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
+/* 15 */
+EXTERN void		Tcl_AppendStringsToObj(Tcl_Obj *objPtr, ...);
+/* 16 */
+EXTERN void		Tcl_AppendToObj(Tcl_Obj *objPtr, const char *bytes,
+				int length);
+/* 17 */
+EXTERN Tcl_Obj *	Tcl_ConcatObj(int objc, Tcl_Obj *const objv[]);
+/* 18 */
+EXTERN int		Tcl_ConvertToType(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, const Tcl_ObjType *typePtr);
+/* 19 */
+EXTERN void		Tcl_DbDecrRefCount(Tcl_Obj *objPtr, const char *file,
+				int line);
+/* 20 */
+EXTERN void		Tcl_DbIncrRefCount(Tcl_Obj *objPtr, const char *file,
+				int line);
+/* 21 */
+EXTERN int		Tcl_DbIsShared(Tcl_Obj *objPtr, const char *file,
+				int line);
+/* 22 */
+EXTERN Tcl_Obj *	Tcl_DbNewBooleanObj(int boolValue, const char *file,
+				int line);
+/* 23 */
+EXTERN Tcl_Obj *	Tcl_DbNewByteArrayObj(const unsigned char *bytes,
+				int length, const char *file, int line);
+/* 24 */
+EXTERN Tcl_Obj *	Tcl_DbNewDoubleObj(double doubleValue,
+				const char *file, int line);
+/* 25 */
+EXTERN Tcl_Obj *	Tcl_DbNewListObj(int objc, Tcl_Obj *const *objv,
+				const char *file, int line);
+/* 26 */
+EXTERN Tcl_Obj *	Tcl_DbNewLongObj(long longValue, const char *file,
+				int line);
+/* 27 */
+EXTERN Tcl_Obj *	Tcl_DbNewObj(const char *file, int line);
+/* 28 */
+EXTERN Tcl_Obj *	Tcl_DbNewStringObj(const char *bytes, int length,
+				const char *file, int line);
+/* 29 */
+EXTERN Tcl_Obj *	Tcl_DuplicateObj(Tcl_Obj *objPtr);
+/* 30 */
+EXTERN void		TclFreeObj(Tcl_Obj *objPtr);
+/* 31 */
+EXTERN int		Tcl_GetBoolean(Tcl_Interp *interp, const char *src,
+				int *boolPtr);
+/* 32 */
+EXTERN int		Tcl_GetBooleanFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *boolPtr);
+/* 33 */
+EXTERN unsigned char *	Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr,
+				int *lengthPtr);
+/* 34 */
+EXTERN int		Tcl_GetDouble(Tcl_Interp *interp, const char *src,
+				double *doublePtr);
+/* 35 */
+EXTERN int		Tcl_GetDoubleFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, double *doublePtr);
+/* 36 */
+EXTERN int		Tcl_GetIndexFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr,
+				CONST84 char *const *tablePtr,
+				const char *msg, int flags, int *indexPtr);
+/* 37 */
+EXTERN int		Tcl_GetInt(Tcl_Interp *interp, const char *src,
+				int *intPtr);
+/* 38 */
+EXTERN int		Tcl_GetIntFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *intPtr);
+/* 39 */
+EXTERN int		Tcl_GetLongFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, long *longPtr);
+/* 40 */
+EXTERN CONST86 Tcl_ObjType * Tcl_GetObjType(const char *typeName);
+/* 41 */
+EXTERN char *		Tcl_GetStringFromObj(Tcl_Obj *objPtr, int *lengthPtr);
+/* 42 */
+EXTERN void		Tcl_InvalidateStringRep(Tcl_Obj *objPtr);
+/* 43 */
+EXTERN int		Tcl_ListObjAppendList(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Obj *elemListPtr);
+/* 44 */
+EXTERN int		Tcl_ListObjAppendElement(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Obj *objPtr);
+/* 45 */
+EXTERN int		Tcl_ListObjGetElements(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, int *objcPtr,
+				Tcl_Obj ***objvPtr);
+/* 46 */
+EXTERN int		Tcl_ListObjIndex(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, int index,
+				Tcl_Obj **objPtrPtr);
+/* 47 */
+EXTERN int		Tcl_ListObjLength(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, int *lengthPtr);
+/* 48 */
+EXTERN int		Tcl_ListObjReplace(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, int first, int count,
+				int objc, Tcl_Obj *const objv[]);
+/* 49 */
+EXTERN Tcl_Obj *	Tcl_NewBooleanObj(int boolValue);
+/* 50 */
+EXTERN Tcl_Obj *	Tcl_NewByteArrayObj(const unsigned char *bytes,
+				int length);
+/* 51 */
+EXTERN Tcl_Obj *	Tcl_NewDoubleObj(double doubleValue);
+/* 52 */
+EXTERN Tcl_Obj *	Tcl_NewIntObj(int intValue);
+/* 53 */
+EXTERN Tcl_Obj *	Tcl_NewListObj(int objc, Tcl_Obj *const objv[]);
+/* 54 */
+EXTERN Tcl_Obj *	Tcl_NewLongObj(long longValue);
+/* 55 */
+EXTERN Tcl_Obj *	Tcl_NewObj(void);
+/* 56 */
+EXTERN Tcl_Obj *	Tcl_NewStringObj(const char *bytes, int length);
+/* 57 */
+EXTERN void		Tcl_SetBooleanObj(Tcl_Obj *objPtr, int boolValue);
+/* 58 */
+EXTERN unsigned char *	Tcl_SetByteArrayLength(Tcl_Obj *objPtr, int length);
+/* 59 */
+EXTERN void		Tcl_SetByteArrayObj(Tcl_Obj *objPtr,
+				const unsigned char *bytes, int length);
+/* 60 */
+EXTERN void		Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue);
+/* 61 */
+EXTERN void		Tcl_SetIntObj(Tcl_Obj *objPtr, int intValue);
+/* 62 */
+EXTERN void		Tcl_SetListObj(Tcl_Obj *objPtr, int objc,
+				Tcl_Obj *const objv[]);
+/* 63 */
+EXTERN void		Tcl_SetLongObj(Tcl_Obj *objPtr, long longValue);
+/* 64 */
+EXTERN void		Tcl_SetObjLength(Tcl_Obj *objPtr, int length);
+/* 65 */
+EXTERN void		Tcl_SetStringObj(Tcl_Obj *objPtr, const char *bytes,
+				int length);
+/* 66 */
+EXTERN void		Tcl_AddErrorInfo(Tcl_Interp *interp,
+				const char *message);
+/* 67 */
+EXTERN void		Tcl_AddObjErrorInfo(Tcl_Interp *interp,
+				const char *message, int length);
+/* 68 */
+EXTERN void		Tcl_AllowExceptions(Tcl_Interp *interp);
+/* 69 */
+EXTERN void		Tcl_AppendElement(Tcl_Interp *interp,
+				const char *element);
+/* 70 */
+EXTERN void		Tcl_AppendResult(Tcl_Interp *interp, ...);
+/* 71 */
+EXTERN Tcl_AsyncHandler	 Tcl_AsyncCreate(Tcl_AsyncProc *proc,
+				ClientData clientData);
+/* 72 */
+EXTERN void		Tcl_AsyncDelete(Tcl_AsyncHandler async);
+/* 73 */
+EXTERN int		Tcl_AsyncInvoke(Tcl_Interp *interp, int code);
+/* 74 */
+EXTERN void		Tcl_AsyncMark(Tcl_AsyncHandler async);
+/* 75 */
+EXTERN int		Tcl_AsyncReady(void);
+/* 76 */
+EXTERN void		Tcl_BackgroundError(Tcl_Interp *interp);
+/* 77 */
+EXTERN char		Tcl_Backslash(const char *src, int *readPtr);
+/* 78 */
+EXTERN int		Tcl_BadChannelOption(Tcl_Interp *interp,
+				const char *optionName,
+				const char *optionList);
+/* 79 */
+EXTERN void		Tcl_CallWhenDeleted(Tcl_Interp *interp,
+				Tcl_InterpDeleteProc *proc,
+				ClientData clientData);
+/* 80 */
+EXTERN void		Tcl_CancelIdleCall(Tcl_IdleProc *idleProc,
+				ClientData clientData);
+/* 81 */
+EXTERN int		Tcl_Close(Tcl_Interp *interp, Tcl_Channel chan);
+/* 82 */
+EXTERN int		Tcl_CommandComplete(const char *cmd);
+/* 83 */
+EXTERN char *		Tcl_Concat(int argc, CONST84 char *const *argv);
+/* 84 */
+EXTERN int		Tcl_ConvertElement(const char *src, char *dst,
+				int flags);
+/* 85 */
+EXTERN int		Tcl_ConvertCountedElement(const char *src,
+				int length, char *dst, int flags);
+/* 86 */
+EXTERN int		Tcl_CreateAlias(Tcl_Interp *slave,
+				const char *slaveCmd, Tcl_Interp *target,
+				const char *targetCmd, int argc,
+				CONST84 char *const *argv);
+/* 87 */
+EXTERN int		Tcl_CreateAliasObj(Tcl_Interp *slave,
+				const char *slaveCmd, Tcl_Interp *target,
+				const char *targetCmd, int objc,
+				Tcl_Obj *const objv[]);
+/* 88 */
+EXTERN Tcl_Channel	Tcl_CreateChannel(const Tcl_ChannelType *typePtr,
+				const char *chanName,
+				ClientData instanceData, int mask);
+/* 89 */
+EXTERN void		Tcl_CreateChannelHandler(Tcl_Channel chan, int mask,
+				Tcl_ChannelProc *proc, ClientData clientData);
+/* 90 */
+EXTERN void		Tcl_CreateCloseHandler(Tcl_Channel chan,
+				Tcl_CloseProc *proc, ClientData clientData);
+/* 91 */
+EXTERN Tcl_Command	Tcl_CreateCommand(Tcl_Interp *interp,
+				const char *cmdName, Tcl_CmdProc *proc,
+				ClientData clientData,
+				Tcl_CmdDeleteProc *deleteProc);
+/* 92 */
+EXTERN void		Tcl_CreateEventSource(Tcl_EventSetupProc *setupProc,
+				Tcl_EventCheckProc *checkProc,
+				ClientData clientData);
+/* 93 */
+EXTERN void		Tcl_CreateExitHandler(Tcl_ExitProc *proc,
+				ClientData clientData);
+/* 94 */
+EXTERN Tcl_Interp *	Tcl_CreateInterp(void);
+/* 95 */
+EXTERN void		Tcl_CreateMathFunc(Tcl_Interp *interp,
+				const char *name, int numArgs,
+				Tcl_ValueType *argTypes, Tcl_MathProc *proc,
+				ClientData clientData);
+/* 96 */
+EXTERN Tcl_Command	Tcl_CreateObjCommand(Tcl_Interp *interp,
+				const char *cmdName, Tcl_ObjCmdProc *proc,
+				ClientData clientData,
+				Tcl_CmdDeleteProc *deleteProc);
+/* 97 */
+EXTERN Tcl_Interp *	Tcl_CreateSlave(Tcl_Interp *interp,
+				const char *slaveName, int isSafe);
+/* 98 */
+EXTERN Tcl_TimerToken	Tcl_CreateTimerHandler(int milliseconds,
+				Tcl_TimerProc *proc, ClientData clientData);
+/* 99 */
+EXTERN Tcl_Trace	Tcl_CreateTrace(Tcl_Interp *interp, int level,
+				Tcl_CmdTraceProc *proc,
+				ClientData clientData);
+/* 100 */
+EXTERN void		Tcl_DeleteAssocData(Tcl_Interp *interp,
+				const char *name);
+/* 101 */
+EXTERN void		Tcl_DeleteChannelHandler(Tcl_Channel chan,
+				Tcl_ChannelProc *proc, ClientData clientData);
+/* 102 */
+EXTERN void		Tcl_DeleteCloseHandler(Tcl_Channel chan,
+				Tcl_CloseProc *proc, ClientData clientData);
+/* 103 */
+EXTERN int		Tcl_DeleteCommand(Tcl_Interp *interp,
+				const char *cmdName);
+/* 104 */
+EXTERN int		Tcl_DeleteCommandFromToken(Tcl_Interp *interp,
+				Tcl_Command command);
+/* 105 */
+EXTERN void		Tcl_DeleteEvents(Tcl_EventDeleteProc *proc,
+				ClientData clientData);
+/* 106 */
+EXTERN void		Tcl_DeleteEventSource(Tcl_EventSetupProc *setupProc,
+				Tcl_EventCheckProc *checkProc,
+				ClientData clientData);
+/* 107 */
+EXTERN void		Tcl_DeleteExitHandler(Tcl_ExitProc *proc,
+				ClientData clientData);
+/* 108 */
+EXTERN void		Tcl_DeleteHashEntry(Tcl_HashEntry *entryPtr);
+/* 109 */
+EXTERN void		Tcl_DeleteHashTable(Tcl_HashTable *tablePtr);
+/* 110 */
+EXTERN void		Tcl_DeleteInterp(Tcl_Interp *interp);
+/* 111 */
+EXTERN void		Tcl_DetachPids(int numPids, Tcl_Pid *pidPtr);
+/* 112 */
+EXTERN void		Tcl_DeleteTimerHandler(Tcl_TimerToken token);
+/* 113 */
+EXTERN void		Tcl_DeleteTrace(Tcl_Interp *interp, Tcl_Trace trace);
+/* 114 */
+EXTERN void		Tcl_DontCallWhenDeleted(Tcl_Interp *interp,
+				Tcl_InterpDeleteProc *proc,
+				ClientData clientData);
+/* 115 */
+EXTERN int		Tcl_DoOneEvent(int flags);
+/* 116 */
+EXTERN void		Tcl_DoWhenIdle(Tcl_IdleProc *proc,
+				ClientData clientData);
+/* 117 */
+EXTERN char *		Tcl_DStringAppend(Tcl_DString *dsPtr,
+				const char *bytes, int length);
+/* 118 */
+EXTERN char *		Tcl_DStringAppendElement(Tcl_DString *dsPtr,
+				const char *element);
+/* 119 */
+EXTERN void		Tcl_DStringEndSublist(Tcl_DString *dsPtr);
+/* 120 */
+EXTERN void		Tcl_DStringFree(Tcl_DString *dsPtr);
+/* 121 */
+EXTERN void		Tcl_DStringGetResult(Tcl_Interp *interp,
+				Tcl_DString *dsPtr);
+/* 122 */
+EXTERN void		Tcl_DStringInit(Tcl_DString *dsPtr);
+/* 123 */
+EXTERN void		Tcl_DStringResult(Tcl_Interp *interp,
+				Tcl_DString *dsPtr);
+/* 124 */
+EXTERN void		Tcl_DStringSetLength(Tcl_DString *dsPtr, int length);
+/* 125 */
+EXTERN void		Tcl_DStringStartSublist(Tcl_DString *dsPtr);
+/* 126 */
+EXTERN int		Tcl_Eof(Tcl_Channel chan);
+/* 127 */
+EXTERN CONST84_RETURN char * Tcl_ErrnoId(void);
+/* 128 */
+EXTERN CONST84_RETURN char * Tcl_ErrnoMsg(int err);
+/* 129 */
+EXTERN int		Tcl_Eval(Tcl_Interp *interp, const char *script);
+/* 130 */
+EXTERN int		Tcl_EvalFile(Tcl_Interp *interp,
+				const char *fileName);
+/* 131 */
+EXTERN int		Tcl_EvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr);
+/* 132 */
+EXTERN void		Tcl_EventuallyFree(ClientData clientData,
+				Tcl_FreeProc *freeProc);
+/* 133 */
+EXTERN void		Tcl_Exit(int status);
+/* 134 */
+EXTERN int		Tcl_ExposeCommand(Tcl_Interp *interp,
+				const char *hiddenCmdToken,
+				const char *cmdName);
+/* 135 */
+EXTERN int		Tcl_ExprBoolean(Tcl_Interp *interp, const char *expr,
+				int *ptr);
+/* 136 */
+EXTERN int		Tcl_ExprBooleanObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *ptr);
+/* 137 */
+EXTERN int		Tcl_ExprDouble(Tcl_Interp *interp, const char *expr,
+				double *ptr);
+/* 138 */
+EXTERN int		Tcl_ExprDoubleObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, double *ptr);
+/* 139 */
+EXTERN int		Tcl_ExprLong(Tcl_Interp *interp, const char *expr,
+				long *ptr);
+/* 140 */
+EXTERN int		Tcl_ExprLongObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				long *ptr);
+/* 141 */
+EXTERN int		Tcl_ExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				Tcl_Obj **resultPtrPtr);
+/* 142 */
+EXTERN int		Tcl_ExprString(Tcl_Interp *interp, const char *expr);
+/* 143 */
+EXTERN void		Tcl_Finalize(void);
+/* 144 */
+EXTERN void		Tcl_FindExecutable(const char *argv0);
+/* 145 */
+EXTERN Tcl_HashEntry *	Tcl_FirstHashEntry(Tcl_HashTable *tablePtr,
+				Tcl_HashSearch *searchPtr);
+/* 146 */
+EXTERN int		Tcl_Flush(Tcl_Channel chan);
+/* 147 */
+EXTERN void		Tcl_FreeResult(Tcl_Interp *interp);
+/* 148 */
+EXTERN int		Tcl_GetAlias(Tcl_Interp *interp,
+				const char *slaveCmd,
+				Tcl_Interp **targetInterpPtr,
+				CONST84 char **targetCmdPtr, int *argcPtr,
+				CONST84 char ***argvPtr);
+/* 149 */
+EXTERN int		Tcl_GetAliasObj(Tcl_Interp *interp,
+				const char *slaveCmd,
+				Tcl_Interp **targetInterpPtr,
+				CONST84 char **targetCmdPtr, int *objcPtr,
+				Tcl_Obj ***objv);
+/* 150 */
+EXTERN ClientData	Tcl_GetAssocData(Tcl_Interp *interp,
+				const char *name,
+				Tcl_InterpDeleteProc **procPtr);
+/* 151 */
+EXTERN Tcl_Channel	Tcl_GetChannel(Tcl_Interp *interp,
+				const char *chanName, int *modePtr);
+/* 152 */
+EXTERN int		Tcl_GetChannelBufferSize(Tcl_Channel chan);
+/* 153 */
+EXTERN int		Tcl_GetChannelHandle(Tcl_Channel chan, int direction,
+				ClientData *handlePtr);
+/* 154 */
+EXTERN ClientData	Tcl_GetChannelInstanceData(Tcl_Channel chan);
+/* 155 */
+EXTERN int		Tcl_GetChannelMode(Tcl_Channel chan);
+/* 156 */
+EXTERN CONST84_RETURN char * Tcl_GetChannelName(Tcl_Channel chan);
+/* 157 */
+EXTERN int		Tcl_GetChannelOption(Tcl_Interp *interp,
+				Tcl_Channel chan, const char *optionName,
+				Tcl_DString *dsPtr);
+/* 158 */
+EXTERN CONST86 Tcl_ChannelType * Tcl_GetChannelType(Tcl_Channel chan);
+/* 159 */
+EXTERN int		Tcl_GetCommandInfo(Tcl_Interp *interp,
+				const char *cmdName, Tcl_CmdInfo *infoPtr);
+/* 160 */
+EXTERN CONST84_RETURN char * Tcl_GetCommandName(Tcl_Interp *interp,
+				Tcl_Command command);
+/* 161 */
+EXTERN int		Tcl_GetErrno(void);
+/* 162 */
+EXTERN CONST84_RETURN char * Tcl_GetHostName(void);
+/* 163 */
+EXTERN int		Tcl_GetInterpPath(Tcl_Interp *askInterp,
+				Tcl_Interp *slaveInterp);
+/* 164 */
+EXTERN Tcl_Interp *	Tcl_GetMaster(Tcl_Interp *interp);
+/* 165 */
+EXTERN const char *	Tcl_GetNameOfExecutable(void);
+/* 166 */
+EXTERN Tcl_Obj *	Tcl_GetObjResult(Tcl_Interp *interp);
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+/* 167 */
+EXTERN int		Tcl_GetOpenFile(Tcl_Interp *interp,
+				const char *chanID, int forWriting,
+				int checkUsage, ClientData *filePtr);
+#endif /* UNIX */
+#ifdef MAC_OSX_TCL /* MACOSX */
+/* 167 */
+EXTERN int		Tcl_GetOpenFile(Tcl_Interp *interp,
+				const char *chanID, int forWriting,
+				int checkUsage, ClientData *filePtr);
+#endif /* MACOSX */
+/* 168 */
+EXTERN Tcl_PathType	Tcl_GetPathType(const char *path);
+/* 169 */
+EXTERN int		Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr);
+/* 170 */
+EXTERN int		Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr);
+/* 171 */
+EXTERN int		Tcl_GetServiceMode(void);
+/* 172 */
+EXTERN Tcl_Interp *	Tcl_GetSlave(Tcl_Interp *interp,
+				const char *slaveName);
+/* 173 */
+EXTERN Tcl_Channel	Tcl_GetStdChannel(int type);
+/* 174 */
+EXTERN CONST84_RETURN char * Tcl_GetStringResult(Tcl_Interp *interp);
+/* 175 */
+EXTERN CONST84_RETURN char * Tcl_GetVar(Tcl_Interp *interp,
+				const char *varName, int flags);
+/* 176 */
+EXTERN CONST84_RETURN char * Tcl_GetVar2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
+				int flags);
+/* 177 */
+EXTERN int		Tcl_GlobalEval(Tcl_Interp *interp,
+				const char *command);
+/* 178 */
+EXTERN int		Tcl_GlobalEvalObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
+/* 179 */
+EXTERN int		Tcl_HideCommand(Tcl_Interp *interp,
+				const char *cmdName,
+				const char *hiddenCmdToken);
+/* 180 */
+EXTERN int		Tcl_Init(Tcl_Interp *interp);
+/* 181 */
+EXTERN void		Tcl_InitHashTable(Tcl_HashTable *tablePtr,
+				int keyType);
+/* 182 */
+EXTERN int		Tcl_InputBlocked(Tcl_Channel chan);
+/* 183 */
+EXTERN int		Tcl_InputBuffered(Tcl_Channel chan);
+/* 184 */
+EXTERN int		Tcl_InterpDeleted(Tcl_Interp *interp);
+/* 185 */
+EXTERN int		Tcl_IsSafe(Tcl_Interp *interp);
+/* 186 */
+EXTERN char *		Tcl_JoinPath(int argc, CONST84 char *const *argv,
+				Tcl_DString *resultPtr);
+/* 187 */
+EXTERN int		Tcl_LinkVar(Tcl_Interp *interp, const char *varName,
+				char *addr, int type);
+/* Slot 188 is reserved */
+/* 189 */
+EXTERN Tcl_Channel	Tcl_MakeFileChannel(ClientData handle, int mode);
+/* 190 */
+EXTERN int		Tcl_MakeSafe(Tcl_Interp *interp);
+/* 191 */
+EXTERN Tcl_Channel	Tcl_MakeTcpClientChannel(ClientData tcpSocket);
+/* 192 */
+EXTERN char *		Tcl_Merge(int argc, CONST84 char *const *argv);
+/* 193 */
+EXTERN Tcl_HashEntry *	Tcl_NextHashEntry(Tcl_HashSearch *searchPtr);
+/* 194 */
+EXTERN void		Tcl_NotifyChannel(Tcl_Channel channel, int mask);
+/* 195 */
+EXTERN Tcl_Obj *	Tcl_ObjGetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
+				Tcl_Obj *part2Ptr, int flags);
+/* 196 */
+EXTERN Tcl_Obj *	Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
+				Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr,
+				int flags);
+/* 197 */
+EXTERN Tcl_Channel	Tcl_OpenCommandChannel(Tcl_Interp *interp, int argc,
+				CONST84 char **argv, int flags);
+/* 198 */
+EXTERN Tcl_Channel	Tcl_OpenFileChannel(Tcl_Interp *interp,
+				const char *fileName, const char *modeString,
+				int permissions);
+/* 199 */
+EXTERN Tcl_Channel	Tcl_OpenTcpClient(Tcl_Interp *interp, int port,
+				const char *address, const char *myaddr,
+				int myport, int async);
+/* 200 */
+EXTERN Tcl_Channel	Tcl_OpenTcpServer(Tcl_Interp *interp, int port,
+				const char *host,
+				Tcl_TcpAcceptProc *acceptProc,
+				ClientData callbackData);
+/* 201 */
+EXTERN void		Tcl_Preserve(ClientData data);
+/* 202 */
+EXTERN void		Tcl_PrintDouble(Tcl_Interp *interp, double value,
+				char *dst);
+/* 203 */
+EXTERN int		Tcl_PutEnv(const char *assignment);
+/* 204 */
+EXTERN CONST84_RETURN char * Tcl_PosixError(Tcl_Interp *interp);
+/* 205 */
+EXTERN void		Tcl_QueueEvent(Tcl_Event *evPtr,
+				Tcl_QueuePosition position);
+/* 206 */
+EXTERN int		Tcl_Read(Tcl_Channel chan, char *bufPtr, int toRead);
+/* 207 */
+EXTERN void		Tcl_ReapDetachedProcs(void);
+/* 208 */
+EXTERN int		Tcl_RecordAndEval(Tcl_Interp *interp,
+				const char *cmd, int flags);
+/* 209 */
+EXTERN int		Tcl_RecordAndEvalObj(Tcl_Interp *interp,
+				Tcl_Obj *cmdPtr, int flags);
+/* 210 */
+EXTERN void		Tcl_RegisterChannel(Tcl_Interp *interp,
+				Tcl_Channel chan);
+/* 211 */
+EXTERN void		Tcl_RegisterObjType(const Tcl_ObjType *typePtr);
+/* 212 */
+EXTERN Tcl_RegExp	Tcl_RegExpCompile(Tcl_Interp *interp,
+				const char *pattern);
+/* 213 */
+EXTERN int		Tcl_RegExpExec(Tcl_Interp *interp, Tcl_RegExp regexp,
+				const char *text, const char *start);
+/* 214 */
+EXTERN int		Tcl_RegExpMatch(Tcl_Interp *interp, const char *text,
+				const char *pattern);
+/* 215 */
+EXTERN void		Tcl_RegExpRange(Tcl_RegExp regexp, int index,
+				CONST84 char **startPtr,
+				CONST84 char **endPtr);
+/* 216 */
+EXTERN void		Tcl_Release(ClientData clientData);
+/* 217 */
+EXTERN void		Tcl_ResetResult(Tcl_Interp *interp);
+/* 218 */
+EXTERN int		Tcl_ScanElement(const char *src, int *flagPtr);
+/* 219 */
+EXTERN int		Tcl_ScanCountedElement(const char *src, int length,
+				int *flagPtr);
+/* 220 */
+EXTERN int		Tcl_SeekOld(Tcl_Channel chan, int offset, int mode);
+/* 221 */
+EXTERN int		Tcl_ServiceAll(void);
+/* 222 */
+EXTERN int		Tcl_ServiceEvent(int flags);
+/* 223 */
+EXTERN void		Tcl_SetAssocData(Tcl_Interp *interp,
+				const char *name, Tcl_InterpDeleteProc *proc,
+				ClientData clientData);
+/* 224 */
+EXTERN void		Tcl_SetChannelBufferSize(Tcl_Channel chan, int sz);
+/* 225 */
+EXTERN int		Tcl_SetChannelOption(Tcl_Interp *interp,
+				Tcl_Channel chan, const char *optionName,
+				const char *newValue);
+/* 226 */
+EXTERN int		Tcl_SetCommandInfo(Tcl_Interp *interp,
+				const char *cmdName,
+				const Tcl_CmdInfo *infoPtr);
+/* 227 */
+EXTERN void		Tcl_SetErrno(int err);
+/* 228 */
+EXTERN void		Tcl_SetErrorCode(Tcl_Interp *interp, ...);
+/* 229 */
+EXTERN void		Tcl_SetMaxBlockTime(const Tcl_Time *timePtr);
+/* 230 */
+EXTERN void		Tcl_SetPanicProc(Tcl_PanicProc *panicProc);
+/* 231 */
+EXTERN int		Tcl_SetRecursionLimit(Tcl_Interp *interp, int depth);
+/* 232 */
+EXTERN void		Tcl_SetResult(Tcl_Interp *interp, char *result,
+				Tcl_FreeProc *freeProc);
+/* 233 */
+EXTERN int		Tcl_SetServiceMode(int mode);
+/* 234 */
+EXTERN void		Tcl_SetObjErrorCode(Tcl_Interp *interp,
+				Tcl_Obj *errorObjPtr);
+/* 235 */
+EXTERN void		Tcl_SetObjResult(Tcl_Interp *interp,
+				Tcl_Obj *resultObjPtr);
+/* 236 */
+EXTERN void		Tcl_SetStdChannel(Tcl_Channel channel, int type);
+/* 237 */
+EXTERN CONST84_RETURN char * Tcl_SetVar(Tcl_Interp *interp,
+				const char *varName, const char *newValue,
+				int flags);
+/* 238 */
+EXTERN CONST84_RETURN char * Tcl_SetVar2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
+				const char *newValue, int flags);
+/* 239 */
+EXTERN CONST84_RETURN char * Tcl_SignalId(int sig);
+/* 240 */
+EXTERN CONST84_RETURN char * Tcl_SignalMsg(int sig);
+/* 241 */
+EXTERN void		Tcl_SourceRCFile(Tcl_Interp *interp);
+/* 242 */
+EXTERN int		Tcl_SplitList(Tcl_Interp *interp,
+				const char *listStr, int *argcPtr,
+				CONST84 char ***argvPtr);
+/* 243 */
+EXTERN void		Tcl_SplitPath(const char *path, int *argcPtr,
+				CONST84 char ***argvPtr);
+/* 244 */
+EXTERN void		Tcl_StaticPackage(Tcl_Interp *interp,
+				const char *pkgName,
+				Tcl_PackageInitProc *initProc,
+				Tcl_PackageInitProc *safeInitProc);
+/* 245 */
+EXTERN int		Tcl_StringMatch(const char *str, const char *pattern);
+/* 246 */
+EXTERN int		Tcl_TellOld(Tcl_Channel chan);
+/* 247 */
+EXTERN int		Tcl_TraceVar(Tcl_Interp *interp, const char *varName,
+				int flags, Tcl_VarTraceProc *proc,
+				ClientData clientData);
+/* 248 */
+EXTERN int		Tcl_TraceVar2(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags,
+				Tcl_VarTraceProc *proc,
+				ClientData clientData);
+/* 249 */
+EXTERN char *		Tcl_TranslateFileName(Tcl_Interp *interp,
+				const char *name, Tcl_DString *bufferPtr);
+/* 250 */
+EXTERN int		Tcl_Ungets(Tcl_Channel chan, const char *str,
+				int len, int atHead);
+/* 251 */
+EXTERN void		Tcl_UnlinkVar(Tcl_Interp *interp,
+				const char *varName);
+/* 252 */
+EXTERN int		Tcl_UnregisterChannel(Tcl_Interp *interp,
+				Tcl_Channel chan);
+/* 253 */
+EXTERN int		Tcl_UnsetVar(Tcl_Interp *interp, const char *varName,
+				int flags);
+/* 254 */
+EXTERN int		Tcl_UnsetVar2(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags);
+/* 255 */
+EXTERN void		Tcl_UntraceVar(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_VarTraceProc *proc,
+				ClientData clientData);
+/* 256 */
+EXTERN void		Tcl_UntraceVar2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
+				int flags, Tcl_VarTraceProc *proc,
+				ClientData clientData);
+/* 257 */
+EXTERN void		Tcl_UpdateLinkedVar(Tcl_Interp *interp,
+				const char *varName);
+/* 258 */
+EXTERN int		Tcl_UpVar(Tcl_Interp *interp, const char *frameName,
+				const char *varName, const char *localName,
+				int flags);
+/* 259 */
+EXTERN int		Tcl_UpVar2(Tcl_Interp *interp, const char *frameName,
+				const char *part1, const char *part2,
+				const char *localName, int flags);
+/* 260 */
+EXTERN int		Tcl_VarEval(Tcl_Interp *interp, ...);
+/* 261 */
+EXTERN ClientData	Tcl_VarTraceInfo(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_VarTraceProc *procPtr,
+				ClientData prevClientData);
+/* 262 */
+EXTERN ClientData	Tcl_VarTraceInfo2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
+				int flags, Tcl_VarTraceProc *procPtr,
+				ClientData prevClientData);
+/* 263 */
+EXTERN int		Tcl_Write(Tcl_Channel chan, const char *s, int slen);
+/* 264 */
+EXTERN void		Tcl_WrongNumArgs(Tcl_Interp *interp, int objc,
+				Tcl_Obj *const objv[], const char *message);
+/* 265 */
+EXTERN int		Tcl_DumpActiveMemory(const char *fileName);
+/* 266 */
+EXTERN void		Tcl_ValidateAllMemory(const char *file, int line);
+/* 267 */
+EXTERN void		Tcl_AppendResultVA(Tcl_Interp *interp,
+				va_list argList);
+/* 268 */
+EXTERN void		Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr,
+				va_list argList);
+/* 269 */
+EXTERN char *		Tcl_HashStats(Tcl_HashTable *tablePtr);
+/* 270 */
+EXTERN CONST84_RETURN char * Tcl_ParseVar(Tcl_Interp *interp,
+				const char *start, CONST84 char **termPtr);
+/* 271 */
+EXTERN CONST84_RETURN char * Tcl_PkgPresent(Tcl_Interp *interp,
+				const char *name, const char *version,
+				int exact);
+/* 272 */
+EXTERN CONST84_RETURN char * Tcl_PkgPresentEx(Tcl_Interp *interp,
+				const char *name, const char *version,
+				int exact, void *clientDataPtr);
+/* 273 */
+EXTERN int		Tcl_PkgProvide(Tcl_Interp *interp, const char *name,
+				const char *version);
+/* 274 */
+EXTERN CONST84_RETURN char * Tcl_PkgRequire(Tcl_Interp *interp,
+				const char *name, const char *version,
+				int exact);
+/* 275 */
+EXTERN void		Tcl_SetErrorCodeVA(Tcl_Interp *interp,
+				va_list argList);
+/* 276 */
+EXTERN int		Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList);
+/* 277 */
+EXTERN Tcl_Pid		Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options);
+/* 278 */
+EXTERN void		Tcl_PanicVA(const char *format, va_list argList);
+/* 279 */
+EXTERN void		Tcl_GetVersion(int *major, int *minor,
+				int *patchLevel, int *type);
+/* 280 */
+EXTERN void		Tcl_InitMemory(Tcl_Interp *interp);
+/* 281 */
+EXTERN Tcl_Channel	Tcl_StackChannel(Tcl_Interp *interp,
+				const Tcl_ChannelType *typePtr,
+				ClientData instanceData, int mask,
+				Tcl_Channel prevChan);
+/* 282 */
+EXTERN int		Tcl_UnstackChannel(Tcl_Interp *interp,
+				Tcl_Channel chan);
+/* 283 */
+EXTERN Tcl_Channel	Tcl_GetStackedChannel(Tcl_Channel chan);
+/* 284 */
+EXTERN void		Tcl_SetMainLoop(Tcl_MainLoopProc *proc);
+/* Slot 285 is reserved */
+/* 286 */
+EXTERN void		Tcl_AppendObjToObj(Tcl_Obj *objPtr,
+				Tcl_Obj *appendObjPtr);
+/* 287 */
+EXTERN Tcl_Encoding	Tcl_CreateEncoding(const Tcl_EncodingType *typePtr);
+/* 288 */
+EXTERN void		Tcl_CreateThreadExitHandler(Tcl_ExitProc *proc,
+				ClientData clientData);
+/* 289 */
+EXTERN void		Tcl_DeleteThreadExitHandler(Tcl_ExitProc *proc,
+				ClientData clientData);
+/* 290 */
+EXTERN void		Tcl_DiscardResult(Tcl_SavedResult *statePtr);
+/* 291 */
+EXTERN int		Tcl_EvalEx(Tcl_Interp *interp, const char *script,
+				int numBytes, int flags);
+/* 292 */
+EXTERN int		Tcl_EvalObjv(Tcl_Interp *interp, int objc,
+				Tcl_Obj *const objv[], int flags);
+/* 293 */
+EXTERN int		Tcl_EvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags);
+/* 294 */
+EXTERN void		Tcl_ExitThread(int status);
+/* 295 */
+EXTERN int		Tcl_ExternalToUtf(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				int srcLen, int flags,
+				Tcl_EncodingState *statePtr, char *dst,
+				int dstLen, int *srcReadPtr,
+				int *dstWrotePtr, int *dstCharsPtr);
+/* 296 */
+EXTERN char *		Tcl_ExternalToUtfDString(Tcl_Encoding encoding,
+				const char *src, int srcLen,
+				Tcl_DString *dsPtr);
+/* 297 */
+EXTERN void		Tcl_FinalizeThread(void);
+/* 298 */
+EXTERN void		Tcl_FinalizeNotifier(ClientData clientData);
+/* 299 */
+EXTERN void		Tcl_FreeEncoding(Tcl_Encoding encoding);
+/* 300 */
+EXTERN Tcl_ThreadId	Tcl_GetCurrentThread(void);
+/* 301 */
+EXTERN Tcl_Encoding	Tcl_GetEncoding(Tcl_Interp *interp, const char *name);
+/* 302 */
+EXTERN CONST84_RETURN char * Tcl_GetEncodingName(Tcl_Encoding encoding);
+/* 303 */
+EXTERN void		Tcl_GetEncodingNames(Tcl_Interp *interp);
+/* 304 */
+EXTERN int		Tcl_GetIndexFromObjStruct(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, const void *tablePtr,
+				int offset, const char *msg, int flags,
+				int *indexPtr);
+/* 305 */
+EXTERN void *		Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr,
+				int size);
+/* 306 */
+EXTERN Tcl_Obj *	Tcl_GetVar2Ex(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags);
+/* 307 */
+EXTERN ClientData	Tcl_InitNotifier(void);
+/* 308 */
+EXTERN void		Tcl_MutexLock(Tcl_Mutex *mutexPtr);
+/* 309 */
+EXTERN void		Tcl_MutexUnlock(Tcl_Mutex *mutexPtr);
+/* 310 */
+EXTERN void		Tcl_ConditionNotify(Tcl_Condition *condPtr);
+/* 311 */
+EXTERN void		Tcl_ConditionWait(Tcl_Condition *condPtr,
+				Tcl_Mutex *mutexPtr, const Tcl_Time *timePtr);
+/* 312 */
+EXTERN int		Tcl_NumUtfChars(const char *src, int length);
+/* 313 */
+EXTERN int		Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
+				int charsToRead, int appendFlag);
+/* 314 */
+EXTERN void		Tcl_RestoreResult(Tcl_Interp *interp,
+				Tcl_SavedResult *statePtr);
+/* 315 */
+EXTERN void		Tcl_SaveResult(Tcl_Interp *interp,
+				Tcl_SavedResult *statePtr);
+/* 316 */
+EXTERN int		Tcl_SetSystemEncoding(Tcl_Interp *interp,
+				const char *name);
+/* 317 */
+EXTERN Tcl_Obj *	Tcl_SetVar2Ex(Tcl_Interp *interp, const char *part1,
+				const char *part2, Tcl_Obj *newValuePtr,
+				int flags);
+/* 318 */
+EXTERN void		Tcl_ThreadAlert(Tcl_ThreadId threadId);
+/* 319 */
+EXTERN void		Tcl_ThreadQueueEvent(Tcl_ThreadId threadId,
+				Tcl_Event *evPtr, Tcl_QueuePosition position);
+/* 320 */
+EXTERN Tcl_UniChar	Tcl_UniCharAtIndex(const char *src, int index);
+/* 321 */
+EXTERN Tcl_UniChar	Tcl_UniCharToLower(int ch);
+/* 322 */
+EXTERN Tcl_UniChar	Tcl_UniCharToTitle(int ch);
+/* 323 */
+EXTERN Tcl_UniChar	Tcl_UniCharToUpper(int ch);
+/* 324 */
+EXTERN int		Tcl_UniCharToUtf(int ch, char *buf);
+/* 325 */
+EXTERN CONST84_RETURN char * Tcl_UtfAtIndex(const char *src, int index);
+/* 326 */
+EXTERN int		Tcl_UtfCharComplete(const char *src, int length);
+/* 327 */
+EXTERN int		Tcl_UtfBackslash(const char *src, int *readPtr,
+				char *dst);
+/* 328 */
+EXTERN CONST84_RETURN char * Tcl_UtfFindFirst(const char *src, int ch);
+/* 329 */
+EXTERN CONST84_RETURN char * Tcl_UtfFindLast(const char *src, int ch);
+/* 330 */
+EXTERN CONST84_RETURN char * Tcl_UtfNext(const char *src);
+/* 331 */
+EXTERN CONST84_RETURN char * Tcl_UtfPrev(const char *src, const char *start);
+/* 332 */
+EXTERN int		Tcl_UtfToExternal(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				int srcLen, int flags,
+				Tcl_EncodingState *statePtr, char *dst,
+				int dstLen, int *srcReadPtr,
+				int *dstWrotePtr, int *dstCharsPtr);
+/* 333 */
+EXTERN char *		Tcl_UtfToExternalDString(Tcl_Encoding encoding,
+				const char *src, int srcLen,
+				Tcl_DString *dsPtr);
+/* 334 */
+EXTERN int		Tcl_UtfToLower(char *src);
+/* 335 */
+EXTERN int		Tcl_UtfToTitle(char *src);
+/* 336 */
+EXTERN int		Tcl_UtfToUniChar(const char *src, Tcl_UniChar *chPtr);
+/* 337 */
+EXTERN int		Tcl_UtfToUpper(char *src);
+/* 338 */
+EXTERN int		Tcl_WriteChars(Tcl_Channel chan, const char *src,
+				int srcLen);
+/* 339 */
+EXTERN int		Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr);
+/* 340 */
+EXTERN char *		Tcl_GetString(Tcl_Obj *objPtr);
+/* 341 */
+EXTERN CONST84_RETURN char * Tcl_GetDefaultEncodingDir(void);
+/* 342 */
+EXTERN void		Tcl_SetDefaultEncodingDir(const char *path);
+/* 343 */
+EXTERN void		Tcl_AlertNotifier(ClientData clientData);
+/* 344 */
+EXTERN void		Tcl_ServiceModeHook(int mode);
+/* 345 */
+EXTERN int		Tcl_UniCharIsAlnum(int ch);
+/* 346 */
+EXTERN int		Tcl_UniCharIsAlpha(int ch);
+/* 347 */
+EXTERN int		Tcl_UniCharIsDigit(int ch);
+/* 348 */
+EXTERN int		Tcl_UniCharIsLower(int ch);
+/* 349 */
+EXTERN int		Tcl_UniCharIsSpace(int ch);
+/* 350 */
+EXTERN int		Tcl_UniCharIsUpper(int ch);
+/* 351 */
+EXTERN int		Tcl_UniCharIsWordChar(int ch);
+/* 352 */
+EXTERN int		Tcl_UniCharLen(const Tcl_UniChar *uniStr);
+/* 353 */
+EXTERN int		Tcl_UniCharNcmp(const Tcl_UniChar *ucs,
+				const Tcl_UniChar *uct,
+				unsigned long numChars);
+/* 354 */
+EXTERN char *		Tcl_UniCharToUtfDString(const Tcl_UniChar *uniStr,
+				int uniLength, Tcl_DString *dsPtr);
+/* 355 */
+EXTERN Tcl_UniChar *	Tcl_UtfToUniCharDString(const char *src, int length,
+				Tcl_DString *dsPtr);
+/* 356 */
+EXTERN Tcl_RegExp	Tcl_GetRegExpFromObj(Tcl_Interp *interp,
+				Tcl_Obj *patObj, int flags);
+/* 357 */
+EXTERN Tcl_Obj *	Tcl_EvalTokens(Tcl_Interp *interp,
+				Tcl_Token *tokenPtr, int count);
+/* 358 */
+EXTERN void		Tcl_FreeParse(Tcl_Parse *parsePtr);
+/* 359 */
+EXTERN void		Tcl_LogCommandInfo(Tcl_Interp *interp,
+				const char *script, const char *command,
+				int length);
+/* 360 */
+EXTERN int		Tcl_ParseBraces(Tcl_Interp *interp,
+				const char *start, int numBytes,
+				Tcl_Parse *parsePtr, int append,
+				CONST84 char **termPtr);
+/* 361 */
+EXTERN int		Tcl_ParseCommand(Tcl_Interp *interp,
+				const char *start, int numBytes, int nested,
+				Tcl_Parse *parsePtr);
+/* 362 */
+EXTERN int		Tcl_ParseExpr(Tcl_Interp *interp, const char *start,
+				int numBytes, Tcl_Parse *parsePtr);
+/* 363 */
+EXTERN int		Tcl_ParseQuotedString(Tcl_Interp *interp,
+				const char *start, int numBytes,
+				Tcl_Parse *parsePtr, int append,
+				CONST84 char **termPtr);
+/* 364 */
+EXTERN int		Tcl_ParseVarName(Tcl_Interp *interp,
+				const char *start, int numBytes,
+				Tcl_Parse *parsePtr, int append);
+/* 365 */
+EXTERN char *		Tcl_GetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr);
+/* 366 */
+EXTERN int		Tcl_Chdir(const char *dirName);
+/* 367 */
+EXTERN int		Tcl_Access(const char *path, int mode);
+/* 368 */
+EXTERN int		Tcl_Stat(const char *path, struct stat *bufPtr);
+/* 369 */
+EXTERN int		Tcl_UtfNcmp(const char *s1, const char *s2,
+				unsigned long n);
+/* 370 */
+EXTERN int		Tcl_UtfNcasecmp(const char *s1, const char *s2,
+				unsigned long n);
+/* 371 */
+EXTERN int		Tcl_StringCaseMatch(const char *str,
+				const char *pattern, int nocase);
+/* 372 */
+EXTERN int		Tcl_UniCharIsControl(int ch);
+/* 373 */
+EXTERN int		Tcl_UniCharIsGraph(int ch);
+/* 374 */
+EXTERN int		Tcl_UniCharIsPrint(int ch);
+/* 375 */
+EXTERN int		Tcl_UniCharIsPunct(int ch);
+/* 376 */
+EXTERN int		Tcl_RegExpExecObj(Tcl_Interp *interp,
+				Tcl_RegExp regexp, Tcl_Obj *textObj,
+				int offset, int nmatches, int flags);
+/* 377 */
+EXTERN void		Tcl_RegExpGetInfo(Tcl_RegExp regexp,
+				Tcl_RegExpInfo *infoPtr);
+/* 378 */
+EXTERN Tcl_Obj *	Tcl_NewUnicodeObj(const Tcl_UniChar *unicode,
+				int numChars);
+/* 379 */
+EXTERN void		Tcl_SetUnicodeObj(Tcl_Obj *objPtr,
+				const Tcl_UniChar *unicode, int numChars);
+/* 380 */
+EXTERN int		Tcl_GetCharLength(Tcl_Obj *objPtr);
+/* 381 */
+EXTERN Tcl_UniChar	Tcl_GetUniChar(Tcl_Obj *objPtr, int index);
+/* 382 */
+EXTERN Tcl_UniChar *	Tcl_GetUnicode(Tcl_Obj *objPtr);
+/* 383 */
+EXTERN Tcl_Obj *	Tcl_GetRange(Tcl_Obj *objPtr, int first, int last);
+/* 384 */
+EXTERN void		Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr,
+				const Tcl_UniChar *unicode, int length);
+/* 385 */
+EXTERN int		Tcl_RegExpMatchObj(Tcl_Interp *interp,
+				Tcl_Obj *textObj, Tcl_Obj *patternObj);
+/* 386 */
+EXTERN void		Tcl_SetNotifier(Tcl_NotifierProcs *notifierProcPtr);
+/* 387 */
+EXTERN Tcl_Mutex *	Tcl_GetAllocMutex(void);
+/* 388 */
+EXTERN int		Tcl_GetChannelNames(Tcl_Interp *interp);
+/* 389 */
+EXTERN int		Tcl_GetChannelNamesEx(Tcl_Interp *interp,
+				const char *pattern);
+/* 390 */
+EXTERN int		Tcl_ProcObjCmd(ClientData clientData,
+				Tcl_Interp *interp, int objc,
+				Tcl_Obj *const objv[]);
+/* 391 */
+EXTERN void		Tcl_ConditionFinalize(Tcl_Condition *condPtr);
+/* 392 */
+EXTERN void		Tcl_MutexFinalize(Tcl_Mutex *mutex);
+/* 393 */
+EXTERN int		Tcl_CreateThread(Tcl_ThreadId *idPtr,
+				Tcl_ThreadCreateProc *proc,
+				ClientData clientData, int stackSize,
+				int flags);
+/* 394 */
+EXTERN int		Tcl_ReadRaw(Tcl_Channel chan, char *dst,
+				int bytesToRead);
+/* 395 */
+EXTERN int		Tcl_WriteRaw(Tcl_Channel chan, const char *src,
+				int srcLen);
+/* 396 */
+EXTERN Tcl_Channel	Tcl_GetTopChannel(Tcl_Channel chan);
+/* 397 */
+EXTERN int		Tcl_ChannelBuffered(Tcl_Channel chan);
+/* 398 */
+EXTERN CONST84_RETURN char * Tcl_ChannelName(
+				const Tcl_ChannelType *chanTypePtr);
+/* 399 */
+EXTERN Tcl_ChannelTypeVersion Tcl_ChannelVersion(
+				const Tcl_ChannelType *chanTypePtr);
+/* 400 */
+EXTERN Tcl_DriverBlockModeProc * Tcl_ChannelBlockModeProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 401 */
+EXTERN Tcl_DriverCloseProc * Tcl_ChannelCloseProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 402 */
+EXTERN Tcl_DriverClose2Proc * Tcl_ChannelClose2Proc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 403 */
+EXTERN Tcl_DriverInputProc * Tcl_ChannelInputProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 404 */
+EXTERN Tcl_DriverOutputProc * Tcl_ChannelOutputProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 405 */
+EXTERN Tcl_DriverSeekProc * Tcl_ChannelSeekProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 406 */
+EXTERN Tcl_DriverSetOptionProc * Tcl_ChannelSetOptionProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 407 */
+EXTERN Tcl_DriverGetOptionProc * Tcl_ChannelGetOptionProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 408 */
+EXTERN Tcl_DriverWatchProc * Tcl_ChannelWatchProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 409 */
+EXTERN Tcl_DriverGetHandleProc * Tcl_ChannelGetHandleProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 410 */
+EXTERN Tcl_DriverFlushProc * Tcl_ChannelFlushProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 411 */
+EXTERN Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 412 */
+EXTERN int		Tcl_JoinThread(Tcl_ThreadId threadId, int *result);
+/* 413 */
+EXTERN int		Tcl_IsChannelShared(Tcl_Channel channel);
+/* 414 */
+EXTERN int		Tcl_IsChannelRegistered(Tcl_Interp *interp,
+				Tcl_Channel channel);
+/* 415 */
+EXTERN void		Tcl_CutChannel(Tcl_Channel channel);
+/* 416 */
+EXTERN void		Tcl_SpliceChannel(Tcl_Channel channel);
+/* 417 */
+EXTERN void		Tcl_ClearChannelHandlers(Tcl_Channel channel);
+/* 418 */
+EXTERN int		Tcl_IsChannelExisting(const char *channelName);
+/* 419 */
+EXTERN int		Tcl_UniCharNcasecmp(const Tcl_UniChar *ucs,
+				const Tcl_UniChar *uct,
+				unsigned long numChars);
+/* 420 */
+EXTERN int		Tcl_UniCharCaseMatch(const Tcl_UniChar *uniStr,
+				const Tcl_UniChar *uniPattern, int nocase);
+/* 421 */
+EXTERN Tcl_HashEntry *	Tcl_FindHashEntry(Tcl_HashTable *tablePtr,
+				const void *key);
+/* 422 */
+EXTERN Tcl_HashEntry *	Tcl_CreateHashEntry(Tcl_HashTable *tablePtr,
+				const void *key, int *newPtr);
+/* 423 */
+EXTERN void		Tcl_InitCustomHashTable(Tcl_HashTable *tablePtr,
+				int keyType, const Tcl_HashKeyType *typePtr);
+/* 424 */
+EXTERN void		Tcl_InitObjHashTable(Tcl_HashTable *tablePtr);
+/* 425 */
+EXTERN ClientData	Tcl_CommandTraceInfo(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_CommandTraceProc *procPtr,
+				ClientData prevClientData);
+/* 426 */
+EXTERN int		Tcl_TraceCommand(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_CommandTraceProc *proc,
+				ClientData clientData);
+/* 427 */
+EXTERN void		Tcl_UntraceCommand(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_CommandTraceProc *proc,
+				ClientData clientData);
+/* 428 */
+EXTERN char *		Tcl_AttemptAlloc(unsigned int size);
+/* 429 */
+EXTERN char *		Tcl_AttemptDbCkalloc(unsigned int size,
+				const char *file, int line);
+/* 430 */
+EXTERN char *		Tcl_AttemptRealloc(char *ptr, unsigned int size);
+/* 431 */
+EXTERN char *		Tcl_AttemptDbCkrealloc(char *ptr, unsigned int size,
+				const char *file, int line);
+/* 432 */
+EXTERN int		Tcl_AttemptSetObjLength(Tcl_Obj *objPtr, int length);
+/* 433 */
+EXTERN Tcl_ThreadId	Tcl_GetChannelThread(Tcl_Channel channel);
+/* 434 */
+EXTERN Tcl_UniChar *	Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr,
+				int *lengthPtr);
+/* 435 */
+EXTERN int		Tcl_GetMathFuncInfo(Tcl_Interp *interp,
+				const char *name, int *numArgsPtr,
+				Tcl_ValueType **argTypesPtr,
+				Tcl_MathProc **procPtr,
+				ClientData *clientDataPtr);
+/* 436 */
+EXTERN Tcl_Obj *	Tcl_ListMathFuncs(Tcl_Interp *interp,
+				const char *pattern);
+/* 437 */
+EXTERN Tcl_Obj *	Tcl_SubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags);
+/* 438 */
+EXTERN int		Tcl_DetachChannel(Tcl_Interp *interp,
+				Tcl_Channel channel);
+/* 439 */
+EXTERN int		Tcl_IsStandardChannel(Tcl_Channel channel);
+/* 440 */
+EXTERN int		Tcl_FSCopyFile(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr);
+/* 441 */
+EXTERN int		Tcl_FSCopyDirectory(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr);
+/* 442 */
+EXTERN int		Tcl_FSCreateDirectory(Tcl_Obj *pathPtr);
+/* 443 */
+EXTERN int		Tcl_FSDeleteFile(Tcl_Obj *pathPtr);
+/* 444 */
+EXTERN int		Tcl_FSLoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
+				const char *sym1, const char *sym2,
+				Tcl_PackageInitProc **proc1Ptr,
+				Tcl_PackageInitProc **proc2Ptr,
+				Tcl_LoadHandle *handlePtr,
+				Tcl_FSUnloadFileProc **unloadProcPtr);
+/* 445 */
+EXTERN int		Tcl_FSMatchInDirectory(Tcl_Interp *interp,
+				Tcl_Obj *result, Tcl_Obj *pathPtr,
+				const char *pattern, Tcl_GlobTypeData *types);
+/* 446 */
+EXTERN Tcl_Obj *	Tcl_FSLink(Tcl_Obj *pathPtr, Tcl_Obj *toPtr,
+				int linkAction);
+/* 447 */
+EXTERN int		Tcl_FSRemoveDirectory(Tcl_Obj *pathPtr,
+				int recursive, Tcl_Obj **errorPtr);
+/* 448 */
+EXTERN int		Tcl_FSRenameFile(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr);
+/* 449 */
+EXTERN int		Tcl_FSLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+/* 450 */
+EXTERN int		Tcl_FSUtime(Tcl_Obj *pathPtr, struct utimbuf *tval);
+/* 451 */
+EXTERN int		Tcl_FSFileAttrsGet(Tcl_Interp *interp, int index,
+				Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef);
+/* 452 */
+EXTERN int		Tcl_FSFileAttrsSet(Tcl_Interp *interp, int index,
+				Tcl_Obj *pathPtr, Tcl_Obj *objPtr);
+/* 453 */
+EXTERN const char *CONST86 * Tcl_FSFileAttrStrings(Tcl_Obj *pathPtr,
+				Tcl_Obj **objPtrRef);
+/* 454 */
+EXTERN int		Tcl_FSStat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+/* 455 */
+EXTERN int		Tcl_FSAccess(Tcl_Obj *pathPtr, int mode);
+/* 456 */
+EXTERN Tcl_Channel	Tcl_FSOpenFileChannel(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr, const char *modeString,
+				int permissions);
+/* 457 */
+EXTERN Tcl_Obj *	Tcl_FSGetCwd(Tcl_Interp *interp);
+/* 458 */
+EXTERN int		Tcl_FSChdir(Tcl_Obj *pathPtr);
+/* 459 */
+EXTERN int		Tcl_FSConvertToPathType(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
+/* 460 */
+EXTERN Tcl_Obj *	Tcl_FSJoinPath(Tcl_Obj *listObj, int elements);
+/* 461 */
+EXTERN Tcl_Obj *	Tcl_FSSplitPath(Tcl_Obj *pathPtr, int *lenPtr);
+/* 462 */
+EXTERN int		Tcl_FSEqualPaths(Tcl_Obj *firstPtr,
+				Tcl_Obj *secondPtr);
+/* 463 */
+EXTERN Tcl_Obj *	Tcl_FSGetNormalizedPath(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
+/* 464 */
+EXTERN Tcl_Obj *	Tcl_FSJoinToPath(Tcl_Obj *pathPtr, int objc,
+				Tcl_Obj *const objv[]);
+/* 465 */
+EXTERN ClientData	Tcl_FSGetInternalRep(Tcl_Obj *pathPtr,
+				const Tcl_Filesystem *fsPtr);
+/* 466 */
+EXTERN Tcl_Obj *	Tcl_FSGetTranslatedPath(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
+/* 467 */
+EXTERN int		Tcl_FSEvalFile(Tcl_Interp *interp, Tcl_Obj *fileName);
+/* 468 */
+EXTERN Tcl_Obj *	Tcl_FSNewNativePath(
+				const Tcl_Filesystem *fromFilesystem,
+				ClientData clientData);
+/* 469 */
+EXTERN const void *	Tcl_FSGetNativePath(Tcl_Obj *pathPtr);
+/* 470 */
+EXTERN Tcl_Obj *	Tcl_FSFileSystemInfo(Tcl_Obj *pathPtr);
+/* 471 */
+EXTERN Tcl_Obj *	Tcl_FSPathSeparator(Tcl_Obj *pathPtr);
+/* 472 */
+EXTERN Tcl_Obj *	Tcl_FSListVolumes(void);
+/* 473 */
+EXTERN int		Tcl_FSRegister(ClientData clientData,
+				const Tcl_Filesystem *fsPtr);
+/* 474 */
+EXTERN int		Tcl_FSUnregister(const Tcl_Filesystem *fsPtr);
+/* 475 */
+EXTERN ClientData	Tcl_FSData(const Tcl_Filesystem *fsPtr);
+/* 476 */
+EXTERN const char *	Tcl_FSGetTranslatedStringPath(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
+/* 477 */
+EXTERN CONST86 Tcl_Filesystem * Tcl_FSGetFileSystemForPath(Tcl_Obj *pathPtr);
+/* 478 */
+EXTERN Tcl_PathType	Tcl_FSGetPathType(Tcl_Obj *pathPtr);
+/* 479 */
+EXTERN int		Tcl_OutputBuffered(Tcl_Channel chan);
+/* 480 */
+EXTERN void		Tcl_FSMountsChanged(const Tcl_Filesystem *fsPtr);
+/* 481 */
+EXTERN int		Tcl_EvalTokensStandard(Tcl_Interp *interp,
+				Tcl_Token *tokenPtr, int count);
+/* 482 */
+EXTERN void		Tcl_GetTime(Tcl_Time *timeBuf);
+/* 483 */
+EXTERN Tcl_Trace	Tcl_CreateObjTrace(Tcl_Interp *interp, int level,
+				int flags, Tcl_CmdObjTraceProc *objProc,
+				ClientData clientData,
+				Tcl_CmdObjTraceDeleteProc *delProc);
+/* 484 */
+EXTERN int		Tcl_GetCommandInfoFromToken(Tcl_Command token,
+				Tcl_CmdInfo *infoPtr);
+/* 485 */
+EXTERN int		Tcl_SetCommandInfoFromToken(Tcl_Command token,
+				const Tcl_CmdInfo *infoPtr);
+/* 486 */
+EXTERN Tcl_Obj *	Tcl_DbNewWideIntObj(Tcl_WideInt wideValue,
+				const char *file, int line);
+/* 487 */
+EXTERN int		Tcl_GetWideIntFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_WideInt *widePtr);
+/* 488 */
+EXTERN Tcl_Obj *	Tcl_NewWideIntObj(Tcl_WideInt wideValue);
+/* 489 */
+EXTERN void		Tcl_SetWideIntObj(Tcl_Obj *objPtr,
+				Tcl_WideInt wideValue);
+/* 490 */
+EXTERN Tcl_StatBuf *	Tcl_AllocStatBuf(void);
+/* 491 */
+EXTERN Tcl_WideInt	Tcl_Seek(Tcl_Channel chan, Tcl_WideInt offset,
+				int mode);
+/* 492 */
+EXTERN Tcl_WideInt	Tcl_Tell(Tcl_Channel chan);
+/* 493 */
+EXTERN Tcl_DriverWideSeekProc * Tcl_ChannelWideSeekProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 494 */
+EXTERN int		Tcl_DictObjPut(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+				Tcl_Obj *keyPtr, Tcl_Obj *valuePtr);
+/* 495 */
+EXTERN int		Tcl_DictObjGet(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+				Tcl_Obj *keyPtr, Tcl_Obj **valuePtrPtr);
+/* 496 */
+EXTERN int		Tcl_DictObjRemove(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, Tcl_Obj *keyPtr);
+/* 497 */
+EXTERN int		Tcl_DictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+				int *sizePtr);
+/* 498 */
+EXTERN int		Tcl_DictObjFirst(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, Tcl_DictSearch *searchPtr,
+				Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr,
+				int *donePtr);
+/* 499 */
+EXTERN void		Tcl_DictObjNext(Tcl_DictSearch *searchPtr,
+				Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr,
+				int *donePtr);
+/* 500 */
+EXTERN void		Tcl_DictObjDone(Tcl_DictSearch *searchPtr);
+/* 501 */
+EXTERN int		Tcl_DictObjPutKeyList(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, int keyc,
+				Tcl_Obj *const *keyv, Tcl_Obj *valuePtr);
+/* 502 */
+EXTERN int		Tcl_DictObjRemoveKeyList(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, int keyc,
+				Tcl_Obj *const *keyv);
+/* 503 */
+EXTERN Tcl_Obj *	Tcl_NewDictObj(void);
+/* 504 */
+EXTERN Tcl_Obj *	Tcl_DbNewDictObj(const char *file, int line);
+/* 505 */
+EXTERN void		Tcl_RegisterConfig(Tcl_Interp *interp,
+				const char *pkgName,
+				const Tcl_Config *configuration,
+				const char *valEncoding);
+/* 506 */
+EXTERN Tcl_Namespace *	Tcl_CreateNamespace(Tcl_Interp *interp,
+				const char *name, ClientData clientData,
+				Tcl_NamespaceDeleteProc *deleteProc);
+/* 507 */
+EXTERN void		Tcl_DeleteNamespace(Tcl_Namespace *nsPtr);
+/* 508 */
+EXTERN int		Tcl_AppendExportList(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, Tcl_Obj *objPtr);
+/* 509 */
+EXTERN int		Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+				const char *pattern, int resetListFirst);
+/* 510 */
+EXTERN int		Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+				const char *pattern, int allowOverwrite);
+/* 511 */
+EXTERN int		Tcl_ForgetImport(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, const char *pattern);
+/* 512 */
+EXTERN Tcl_Namespace *	Tcl_GetCurrentNamespace(Tcl_Interp *interp);
+/* 513 */
+EXTERN Tcl_Namespace *	Tcl_GetGlobalNamespace(Tcl_Interp *interp);
+/* 514 */
+EXTERN Tcl_Namespace *	Tcl_FindNamespace(Tcl_Interp *interp,
+				const char *name,
+				Tcl_Namespace *contextNsPtr, int flags);
+/* 515 */
+EXTERN Tcl_Command	Tcl_FindCommand(Tcl_Interp *interp, const char *name,
+				Tcl_Namespace *contextNsPtr, int flags);
+/* 516 */
+EXTERN Tcl_Command	Tcl_GetCommandFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
+/* 517 */
+EXTERN void		Tcl_GetCommandFullName(Tcl_Interp *interp,
+				Tcl_Command command, Tcl_Obj *objPtr);
+/* 518 */
+EXTERN int		Tcl_FSEvalFileEx(Tcl_Interp *interp,
+				Tcl_Obj *fileName, const char *encodingName);
+/* 519 */
+EXTERN Tcl_ExitProc *	Tcl_SetExitProc(Tcl_ExitProc *proc);
+/* 520 */
+EXTERN void		Tcl_LimitAddHandler(Tcl_Interp *interp, int type,
+				Tcl_LimitHandlerProc *handlerProc,
+				ClientData clientData,
+				Tcl_LimitHandlerDeleteProc *deleteProc);
+/* 521 */
+EXTERN void		Tcl_LimitRemoveHandler(Tcl_Interp *interp, int type,
+				Tcl_LimitHandlerProc *handlerProc,
+				ClientData clientData);
+/* 522 */
+EXTERN int		Tcl_LimitReady(Tcl_Interp *interp);
+/* 523 */
+EXTERN int		Tcl_LimitCheck(Tcl_Interp *interp);
+/* 524 */
+EXTERN int		Tcl_LimitExceeded(Tcl_Interp *interp);
+/* 525 */
+EXTERN void		Tcl_LimitSetCommands(Tcl_Interp *interp,
+				int commandLimit);
+/* 526 */
+EXTERN void		Tcl_LimitSetTime(Tcl_Interp *interp,
+				Tcl_Time *timeLimitPtr);
+/* 527 */
+EXTERN void		Tcl_LimitSetGranularity(Tcl_Interp *interp, int type,
+				int granularity);
+/* 528 */
+EXTERN int		Tcl_LimitTypeEnabled(Tcl_Interp *interp, int type);
+/* 529 */
+EXTERN int		Tcl_LimitTypeExceeded(Tcl_Interp *interp, int type);
+/* 530 */
+EXTERN void		Tcl_LimitTypeSet(Tcl_Interp *interp, int type);
+/* 531 */
+EXTERN void		Tcl_LimitTypeReset(Tcl_Interp *interp, int type);
+/* 532 */
+EXTERN int		Tcl_LimitGetCommands(Tcl_Interp *interp);
+/* 533 */
+EXTERN void		Tcl_LimitGetTime(Tcl_Interp *interp,
+				Tcl_Time *timeLimitPtr);
+/* 534 */
+EXTERN int		Tcl_LimitGetGranularity(Tcl_Interp *interp, int type);
+/* 535 */
+EXTERN Tcl_InterpState	Tcl_SaveInterpState(Tcl_Interp *interp, int status);
+/* 536 */
+EXTERN int		Tcl_RestoreInterpState(Tcl_Interp *interp,
+				Tcl_InterpState state);
+/* 537 */
+EXTERN void		Tcl_DiscardInterpState(Tcl_InterpState state);
+/* 538 */
+EXTERN int		Tcl_SetReturnOptions(Tcl_Interp *interp,
+				Tcl_Obj *options);
+/* 539 */
+EXTERN Tcl_Obj *	Tcl_GetReturnOptions(Tcl_Interp *interp, int result);
+/* 540 */
+EXTERN int		Tcl_IsEnsemble(Tcl_Command token);
+/* 541 */
+EXTERN Tcl_Command	Tcl_CreateEnsemble(Tcl_Interp *interp,
+				const char *name,
+				Tcl_Namespace *namespacePtr, int flags);
+/* 542 */
+EXTERN Tcl_Command	Tcl_FindEnsemble(Tcl_Interp *interp,
+				Tcl_Obj *cmdNameObj, int flags);
+/* 543 */
+EXTERN int		Tcl_SetEnsembleSubcommandList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *subcmdList);
+/* 544 */
+EXTERN int		Tcl_SetEnsembleMappingDict(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *mapDict);
+/* 545 */
+EXTERN int		Tcl_SetEnsembleUnknownHandler(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *unknownList);
+/* 546 */
+EXTERN int		Tcl_SetEnsembleFlags(Tcl_Interp *interp,
+				Tcl_Command token, int flags);
+/* 547 */
+EXTERN int		Tcl_GetEnsembleSubcommandList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **subcmdListPtr);
+/* 548 */
+EXTERN int		Tcl_GetEnsembleMappingDict(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **mapDictPtr);
+/* 549 */
+EXTERN int		Tcl_GetEnsembleUnknownHandler(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **unknownListPtr);
+/* 550 */
+EXTERN int		Tcl_GetEnsembleFlags(Tcl_Interp *interp,
+				Tcl_Command token, int *flagsPtr);
+/* 551 */
+EXTERN int		Tcl_GetEnsembleNamespace(Tcl_Interp *interp,
+				Tcl_Command token,
+				Tcl_Namespace **namespacePtrPtr);
+/* 552 */
+EXTERN void		Tcl_SetTimeProc(Tcl_GetTimeProc *getProc,
+				Tcl_ScaleTimeProc *scaleProc,
+				ClientData clientData);
+/* 553 */
+EXTERN void		Tcl_QueryTimeProc(Tcl_GetTimeProc **getProc,
+				Tcl_ScaleTimeProc **scaleProc,
+				ClientData *clientData);
+/* 554 */
+EXTERN Tcl_DriverThreadActionProc * Tcl_ChannelThreadActionProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 555 */
+EXTERN Tcl_Obj *	Tcl_NewBignumObj(mp_int *value);
+/* 556 */
+EXTERN Tcl_Obj *	Tcl_DbNewBignumObj(mp_int *value, const char *file,
+				int line);
+/* 557 */
+EXTERN void		Tcl_SetBignumObj(Tcl_Obj *obj, mp_int *value);
+/* 558 */
+EXTERN int		Tcl_GetBignumFromObj(Tcl_Interp *interp,
+				Tcl_Obj *obj, mp_int *value);
+/* 559 */
+EXTERN int		Tcl_TakeBignumFromObj(Tcl_Interp *interp,
+				Tcl_Obj *obj, mp_int *value);
+/* 560 */
+EXTERN int		Tcl_TruncateChannel(Tcl_Channel chan,
+				Tcl_WideInt length);
+/* 561 */
+EXTERN Tcl_DriverTruncateProc * Tcl_ChannelTruncateProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 562 */
+EXTERN void		Tcl_SetChannelErrorInterp(Tcl_Interp *interp,
+				Tcl_Obj *msg);
+/* 563 */
+EXTERN void		Tcl_GetChannelErrorInterp(Tcl_Interp *interp,
+				Tcl_Obj **msg);
+/* 564 */
+EXTERN void		Tcl_SetChannelError(Tcl_Channel chan, Tcl_Obj *msg);
+/* 565 */
+EXTERN void		Tcl_GetChannelError(Tcl_Channel chan, Tcl_Obj **msg);
+/* 566 */
+EXTERN int		Tcl_InitBignumFromDouble(Tcl_Interp *interp,
+				double initval, mp_int *toInit);
+/* 567 */
+EXTERN Tcl_Obj *	Tcl_GetNamespaceUnknownHandler(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr);
+/* 568 */
+EXTERN int		Tcl_SetNamespaceUnknownHandler(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, Tcl_Obj *handlerPtr);
+/* 569 */
+EXTERN int		Tcl_GetEncodingFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_Encoding *encodingPtr);
+/* 570 */
+EXTERN Tcl_Obj *	Tcl_GetEncodingSearchPath(void);
+/* 571 */
+EXTERN int		Tcl_SetEncodingSearchPath(Tcl_Obj *searchPath);
+/* 572 */
+EXTERN const char *	Tcl_GetEncodingNameFromEnvironment(
+				Tcl_DString *bufPtr);
+/* 573 */
+EXTERN int		Tcl_PkgRequireProc(Tcl_Interp *interp,
+				const char *name, int objc,
+				Tcl_Obj *const objv[], void *clientDataPtr);
+/* 574 */
+EXTERN void		Tcl_AppendObjToErrorInfo(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
+/* 575 */
+EXTERN void		Tcl_AppendLimitedToObj(Tcl_Obj *objPtr,
+				const char *bytes, int length, int limit,
+				const char *ellipsis);
+/* 576 */
+EXTERN Tcl_Obj *	Tcl_Format(Tcl_Interp *interp, const char *format,
+				int objc, Tcl_Obj *const objv[]);
+/* 577 */
+EXTERN int		Tcl_AppendFormatToObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, const char *format,
+				int objc, Tcl_Obj *const objv[]);
+/* 578 */
+EXTERN Tcl_Obj *	Tcl_ObjPrintf(const char *format, ...) TCL_FORMAT_PRINTF(1, 2);
+/* 579 */
+EXTERN void		Tcl_AppendPrintfToObj(Tcl_Obj *objPtr,
+				const char *format, ...) TCL_FORMAT_PRINTF(2, 3);
+/* 580 */
+EXTERN int		Tcl_CancelEval(Tcl_Interp *interp,
+				Tcl_Obj *resultObjPtr, ClientData clientData,
+				int flags);
+/* 581 */
+EXTERN int		Tcl_Canceled(Tcl_Interp *interp, int flags);
+/* 582 */
+EXTERN int		Tcl_CreatePipe(Tcl_Interp *interp,
+				Tcl_Channel *rchan, Tcl_Channel *wchan,
+				int flags);
+/* 583 */
+EXTERN Tcl_Command	Tcl_NRCreateCommand(Tcl_Interp *interp,
+				const char *cmdName, Tcl_ObjCmdProc *proc,
+				Tcl_ObjCmdProc *nreProc,
+				ClientData clientData,
+				Tcl_CmdDeleteProc *deleteProc);
+/* 584 */
+EXTERN int		Tcl_NREvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags);
+/* 585 */
+EXTERN int		Tcl_NREvalObjv(Tcl_Interp *interp, int objc,
+				Tcl_Obj *const objv[], int flags);
+/* 586 */
+EXTERN int		Tcl_NRCmdSwap(Tcl_Interp *interp, Tcl_Command cmd,
+				int objc, Tcl_Obj *const objv[], int flags);
+/* 587 */
+EXTERN void		Tcl_NRAddCallback(Tcl_Interp *interp,
+				Tcl_NRPostProc *postProcPtr,
+				ClientData data0, ClientData data1,
+				ClientData data2, ClientData data3);
+/* 588 */
+EXTERN int		Tcl_NRCallObjProc(Tcl_Interp *interp,
+				Tcl_ObjCmdProc *objProc,
+				ClientData clientData, int objc,
+				Tcl_Obj *const objv[]);
+/* 589 */
+EXTERN unsigned		Tcl_GetFSDeviceFromStat(const Tcl_StatBuf *statPtr);
+/* 590 */
+EXTERN unsigned		Tcl_GetFSInodeFromStat(const Tcl_StatBuf *statPtr);
+/* 591 */
+EXTERN unsigned		Tcl_GetModeFromStat(const Tcl_StatBuf *statPtr);
+/* 592 */
+EXTERN int		Tcl_GetLinkCountFromStat(const Tcl_StatBuf *statPtr);
+/* 593 */
+EXTERN int		Tcl_GetUserIdFromStat(const Tcl_StatBuf *statPtr);
+/* 594 */
+EXTERN int		Tcl_GetGroupIdFromStat(const Tcl_StatBuf *statPtr);
+/* 595 */
+EXTERN int		Tcl_GetDeviceTypeFromStat(const Tcl_StatBuf *statPtr);
+/* 596 */
+EXTERN Tcl_WideInt	Tcl_GetAccessTimeFromStat(const Tcl_StatBuf *statPtr);
+/* 597 */
+EXTERN Tcl_WideInt	Tcl_GetModificationTimeFromStat(
+				const Tcl_StatBuf *statPtr);
+/* 598 */
+EXTERN Tcl_WideInt	Tcl_GetChangeTimeFromStat(const Tcl_StatBuf *statPtr);
+/* 599 */
+EXTERN Tcl_WideUInt	Tcl_GetSizeFromStat(const Tcl_StatBuf *statPtr);
+/* 600 */
+EXTERN Tcl_WideUInt	Tcl_GetBlocksFromStat(const Tcl_StatBuf *statPtr);
+/* 601 */
+EXTERN unsigned		Tcl_GetBlockSizeFromStat(const Tcl_StatBuf *statPtr);
+/* 602 */
+EXTERN int		Tcl_SetEnsembleParameterList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *paramList);
+/* 603 */
+EXTERN int		Tcl_GetEnsembleParameterList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **paramListPtr);
+/* 604 */
+EXTERN int		Tcl_ParseArgsObjv(Tcl_Interp *interp,
+				const Tcl_ArgvInfo *argTable, int *objcPtr,
+				Tcl_Obj *const *objv, Tcl_Obj ***remObjv);
+/* 605 */
+EXTERN int		Tcl_GetErrorLine(Tcl_Interp *interp);
+/* 606 */
+EXTERN void		Tcl_SetErrorLine(Tcl_Interp *interp, int lineNum);
+/* 607 */
+EXTERN void		Tcl_TransferResult(Tcl_Interp *sourceInterp,
+				int result, Tcl_Interp *targetInterp);
+/* 608 */
+EXTERN int		Tcl_InterpActive(Tcl_Interp *interp);
+/* 609 */
+EXTERN void		Tcl_BackgroundException(Tcl_Interp *interp, int code);
+/* 610 */
+EXTERN int		Tcl_ZlibDeflate(Tcl_Interp *interp, int format,
+				Tcl_Obj *data, int level,
+				Tcl_Obj *gzipHeaderDictObj);
+/* 611 */
+EXTERN int		Tcl_ZlibInflate(Tcl_Interp *interp, int format,
+				Tcl_Obj *data, int buffersize,
+				Tcl_Obj *gzipHeaderDictObj);
+/* 612 */
+EXTERN unsigned int	Tcl_ZlibCRC32(unsigned int crc,
+				const unsigned char *buf, int len);
+/* 613 */
+EXTERN unsigned int	Tcl_ZlibAdler32(unsigned int adler,
+				const unsigned char *buf, int len);
+/* 614 */
+EXTERN int		Tcl_ZlibStreamInit(Tcl_Interp *interp, int mode,
+				int format, int level, Tcl_Obj *dictObj,
+				Tcl_ZlibStream *zshandle);
+/* 615 */
+EXTERN Tcl_Obj *	Tcl_ZlibStreamGetCommandName(Tcl_ZlibStream zshandle);
+/* 616 */
+EXTERN int		Tcl_ZlibStreamEof(Tcl_ZlibStream zshandle);
+/* 617 */
+EXTERN int		Tcl_ZlibStreamChecksum(Tcl_ZlibStream zshandle);
+/* 618 */
+EXTERN int		Tcl_ZlibStreamPut(Tcl_ZlibStream zshandle,
+				Tcl_Obj *data, int flush);
+/* 619 */
+EXTERN int		Tcl_ZlibStreamGet(Tcl_ZlibStream zshandle,
+				Tcl_Obj *data, int count);
+/* 620 */
+EXTERN int		Tcl_ZlibStreamClose(Tcl_ZlibStream zshandle);
+/* 621 */
+EXTERN int		Tcl_ZlibStreamReset(Tcl_ZlibStream zshandle);
+/* 622 */
+EXTERN void		Tcl_SetStartupScript(Tcl_Obj *path,
+				const char *encoding);
+/* 623 */
+EXTERN Tcl_Obj *	Tcl_GetStartupScript(const char **encodingPtr);
+/* 624 */
+EXTERN int		Tcl_CloseEx(Tcl_Interp *interp, Tcl_Channel chan,
+				int flags);
+/* 625 */
+EXTERN int		Tcl_NRExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				Tcl_Obj *resultPtr);
+/* 626 */
+EXTERN int		Tcl_NRSubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags);
+/* 627 */
+EXTERN int		Tcl_LoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
+				const char *const symv[], int flags,
+				void *procPtrs, Tcl_LoadHandle *handlePtr);
+/* 628 */
+EXTERN void *		Tcl_FindSymbol(Tcl_Interp *interp,
+				Tcl_LoadHandle handle, const char *symbol);
+/* 629 */
+EXTERN int		Tcl_FSUnloadFile(Tcl_Interp *interp,
+				Tcl_LoadHandle handlePtr);
+/* 630 */
+EXTERN void		Tcl_ZlibStreamSetCompressionDictionary(
+				Tcl_ZlibStream zhandle,
+				Tcl_Obj *compressionDictionaryObj);
+
+typedef struct {
+    const struct TclPlatStubs *tclPlatStubs;
+    const struct TclIntStubs *tclIntStubs;
+    const struct TclIntPlatStubs *tclIntPlatStubs;
+} TclStubHooks;
+
+typedef struct TclStubs {
+    int magic;
+    const TclStubHooks *hooks;
+
+    int (*tcl_PkgProvideEx) (Tcl_Interp *interp, const char *name, const char *version, const void *clientData); /* 0 */
+    CONST84_RETURN char * (*tcl_PkgRequireEx) (Tcl_Interp *interp, const char *name, const char *version, int exact, void *clientDataPtr); /* 1 */
+    void (*tcl_Panic) (const char *format, ...) TCL_FORMAT_PRINTF(1, 2); /* 2 */
+    char * (*tcl_Alloc) (unsigned int size); /* 3 */
+    void (*tcl_Free) (char *ptr); /* 4 */
+    char * (*tcl_Realloc) (char *ptr, unsigned int size); /* 5 */
+    char * (*tcl_DbCkalloc) (unsigned int size, const char *file, int line); /* 6 */
+    void (*tcl_DbCkfree) (char *ptr, const char *file, int line); /* 7 */
+    char * (*tcl_DbCkrealloc) (char *ptr, unsigned int size, const char *file, int line); /* 8 */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+    void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, ClientData clientData); /* 9 */
+#endif /* UNIX */
+#if defined(_WIN32) /* WIN */
+    void (*reserved9)(void);
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+    void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, ClientData clientData); /* 9 */
+#endif /* MACOSX */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+    void (*tcl_DeleteFileHandler) (int fd); /* 10 */
+#endif /* UNIX */
+#if defined(_WIN32) /* WIN */
+    void (*reserved10)(void);
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+    void (*tcl_DeleteFileHandler) (int fd); /* 10 */
+#endif /* MACOSX */
+    void (*tcl_SetTimer) (const Tcl_Time *timePtr); /* 11 */
+    void (*tcl_Sleep) (int ms); /* 12 */
+    int (*tcl_WaitForEvent) (const Tcl_Time *timePtr); /* 13 */
+    int (*tcl_AppendAllObjTypes) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 14 */
+    void (*tcl_AppendStringsToObj) (Tcl_Obj *objPtr, ...); /* 15 */
+    void (*tcl_AppendToObj) (Tcl_Obj *objPtr, const char *bytes, int length); /* 16 */
+    Tcl_Obj * (*tcl_ConcatObj) (int objc, Tcl_Obj *const objv[]); /* 17 */
+    int (*tcl_ConvertToType) (Tcl_Interp *interp, Tcl_Obj *objPtr, const Tcl_ObjType *typePtr); /* 18 */
+    void (*tcl_DbDecrRefCount) (Tcl_Obj *objPtr, const char *file, int line); /* 19 */
+    void (*tcl_DbIncrRefCount) (Tcl_Obj *objPtr, const char *file, int line); /* 20 */
+    int (*tcl_DbIsShared) (Tcl_Obj *objPtr, const char *file, int line); /* 21 */
+    Tcl_Obj * (*tcl_DbNewBooleanObj) (int boolValue, const char *file, int line); /* 22 */
+    Tcl_Obj * (*tcl_DbNewByteArrayObj) (const unsigned char *bytes, int length, const char *file, int line); /* 23 */
+    Tcl_Obj * (*tcl_DbNewDoubleObj) (double doubleValue, const char *file, int line); /* 24 */
+    Tcl_Obj * (*tcl_DbNewListObj) (int objc, Tcl_Obj *const *objv, const char *file, int line); /* 25 */
+    Tcl_Obj * (*tcl_DbNewLongObj) (long longValue, const char *file, int line); /* 26 */
+    Tcl_Obj * (*tcl_DbNewObj) (const char *file, int line); /* 27 */
+    Tcl_Obj * (*tcl_DbNewStringObj) (const char *bytes, int length, const char *file, int line); /* 28 */
+    Tcl_Obj * (*tcl_DuplicateObj) (Tcl_Obj *objPtr); /* 29 */
+    void (*tclFreeObj) (Tcl_Obj *objPtr); /* 30 */
+    int (*tcl_GetBoolean) (Tcl_Interp *interp, const char *src, int *boolPtr); /* 31 */
+    int (*tcl_GetBooleanFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *boolPtr); /* 32 */
+    unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 33 */
+    int (*tcl_GetDouble) (Tcl_Interp *interp, const char *src, double *doublePtr); /* 34 */
+    int (*tcl_GetDoubleFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, double *doublePtr); /* 35 */
+    int (*tcl_GetIndexFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, CONST84 char *const *tablePtr, const char *msg, int flags, int *indexPtr); /* 36 */
+    int (*tcl_GetInt) (Tcl_Interp *interp, const char *src, int *intPtr); /* 37 */
+    int (*tcl_GetIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *intPtr); /* 38 */
+    int (*tcl_GetLongFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, long *longPtr); /* 39 */
+    CONST86 Tcl_ObjType * (*tcl_GetObjType) (const char *typeName); /* 40 */
+    char * (*tcl_GetStringFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 41 */
+    void (*tcl_InvalidateStringRep) (Tcl_Obj *objPtr); /* 42 */
+    int (*tcl_ListObjAppendList) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Obj *elemListPtr); /* 43 */
+    int (*tcl_ListObjAppendElement) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Obj *objPtr); /* 44 */
+    int (*tcl_ListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, int *objcPtr, Tcl_Obj ***objvPtr); /* 45 */
+    int (*tcl_ListObjIndex) (Tcl_Interp *interp, Tcl_Obj *listPtr, int index, Tcl_Obj **objPtrPtr); /* 46 */
+    int (*tcl_ListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, int *lengthPtr); /* 47 */
+    int (*tcl_ListObjReplace) (Tcl_Interp *interp, Tcl_Obj *listPtr, int first, int count, int objc, Tcl_Obj *const objv[]); /* 48 */
+    Tcl_Obj * (*tcl_NewBooleanObj) (int boolValue); /* 49 */
+    Tcl_Obj * (*tcl_NewByteArrayObj) (const unsigned char *bytes, int length); /* 50 */
+    Tcl_Obj * (*tcl_NewDoubleObj) (double doubleValue); /* 51 */
+    Tcl_Obj * (*tcl_NewIntObj) (int intValue); /* 52 */
+    Tcl_Obj * (*tcl_NewListObj) (int objc, Tcl_Obj *const objv[]); /* 53 */
+    Tcl_Obj * (*tcl_NewLongObj) (long longValue); /* 54 */
+    Tcl_Obj * (*tcl_NewObj) (void); /* 55 */
+    Tcl_Obj * (*tcl_NewStringObj) (const char *bytes, int length); /* 56 */
+    void (*tcl_SetBooleanObj) (Tcl_Obj *objPtr, int boolValue); /* 57 */
+    unsigned char * (*tcl_SetByteArrayLength) (Tcl_Obj *objPtr, int length); /* 58 */
+    void (*tcl_SetByteArrayObj) (Tcl_Obj *objPtr, const unsigned char *bytes, int length); /* 59 */
+    void (*tcl_SetDoubleObj) (Tcl_Obj *objPtr, double doubleValue); /* 60 */
+    void (*tcl_SetIntObj) (Tcl_Obj *objPtr, int intValue); /* 61 */
+    void (*tcl_SetListObj) (Tcl_Obj *objPtr, int objc, Tcl_Obj *const objv[]); /* 62 */
+    void (*tcl_SetLongObj) (Tcl_Obj *objPtr, long longValue); /* 63 */
+    void (*tcl_SetObjLength) (Tcl_Obj *objPtr, int length); /* 64 */
+    void (*tcl_SetStringObj) (Tcl_Obj *objPtr, const char *bytes, int length); /* 65 */
+    void (*tcl_AddErrorInfo) (Tcl_Interp *interp, const char *message); /* 66 */
+    void (*tcl_AddObjErrorInfo) (Tcl_Interp *interp, const char *message, int length); /* 67 */
+    void (*tcl_AllowExceptions) (Tcl_Interp *interp); /* 68 */
+    void (*tcl_AppendElement) (Tcl_Interp *interp, const char *element); /* 69 */
+    void (*tcl_AppendResult) (Tcl_Interp *interp, ...); /* 70 */
+    Tcl_AsyncHandler (*tcl_AsyncCreate) (Tcl_AsyncProc *proc, ClientData clientData); /* 71 */
+    void (*tcl_AsyncDelete) (Tcl_AsyncHandler async); /* 72 */
+    int (*tcl_AsyncInvoke) (Tcl_Interp *interp, int code); /* 73 */
+    void (*tcl_AsyncMark) (Tcl_AsyncHandler async); /* 74 */
+    int (*tcl_AsyncReady) (void); /* 75 */
+    void (*tcl_BackgroundError) (Tcl_Interp *interp); /* 76 */
+    char (*tcl_Backslash) (const char *src, int *readPtr); /* 77 */
+    int (*tcl_BadChannelOption) (Tcl_Interp *interp, const char *optionName, const char *optionList); /* 78 */
+    void (*tcl_CallWhenDeleted) (Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, ClientData clientData); /* 79 */
+    void (*tcl_CancelIdleCall) (Tcl_IdleProc *idleProc, ClientData clientData); /* 80 */
+    int (*tcl_Close) (Tcl_Interp *interp, Tcl_Channel chan); /* 81 */
+    int (*tcl_CommandComplete) (const char *cmd); /* 82 */
+    char * (*tcl_Concat) (int argc, CONST84 char *const *argv); /* 83 */
+    int (*tcl_ConvertElement) (const char *src, char *dst, int flags); /* 84 */
+    int (*tcl_ConvertCountedElement) (const char *src, int length, char *dst, int flags); /* 85 */
+    int (*tcl_CreateAlias) (Tcl_Interp *slave, const char *slaveCmd, Tcl_Interp *target, const char *targetCmd, int argc, CONST84 char *const *argv); /* 86 */
+    int (*tcl_CreateAliasObj) (Tcl_Interp *slave, const char *slaveCmd, Tcl_Interp *target, const char *targetCmd, int objc, Tcl_Obj *const objv[]); /* 87 */
+    Tcl_Channel (*tcl_CreateChannel) (const Tcl_ChannelType *typePtr, const char *chanName, ClientData instanceData, int mask); /* 88 */
+    void (*tcl_CreateChannelHandler) (Tcl_Channel chan, int mask, Tcl_ChannelProc *proc, ClientData clientData); /* 89 */
+    void (*tcl_CreateCloseHandler) (Tcl_Channel chan, Tcl_CloseProc *proc, ClientData clientData); /* 90 */
+    Tcl_Command (*tcl_CreateCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_CmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc); /* 91 */
+    void (*tcl_CreateEventSource) (Tcl_EventSetupProc *setupProc, Tcl_EventCheckProc *checkProc, ClientData clientData); /* 92 */
+    void (*tcl_CreateExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 93 */
+    Tcl_Interp * (*tcl_CreateInterp) (void); /* 94 */
+    void (*tcl_CreateMathFunc) (Tcl_Interp *interp, const char *name, int numArgs, Tcl_ValueType *argTypes, Tcl_MathProc *proc, ClientData clientData); /* 95 */
+    Tcl_Command (*tcl_CreateObjCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc); /* 96 */
+    Tcl_Interp * (*tcl_CreateSlave) (Tcl_Interp *interp, const char *slaveName, int isSafe); /* 97 */
+    Tcl_TimerToken (*tcl_CreateTimerHandler) (int milliseconds, Tcl_TimerProc *proc, ClientData clientData); /* 98 */
+    Tcl_Trace (*tcl_CreateTrace) (Tcl_Interp *interp, int level, Tcl_CmdTraceProc *proc, ClientData clientData); /* 99 */
+    void (*tcl_DeleteAssocData) (Tcl_Interp *interp, const char *name); /* 100 */
+    void (*tcl_DeleteChannelHandler) (Tcl_Channel chan, Tcl_ChannelProc *proc, ClientData clientData); /* 101 */
+    void (*tcl_DeleteCloseHandler) (Tcl_Channel chan, Tcl_CloseProc *proc, ClientData clientData); /* 102 */
+    int (*tcl_DeleteCommand) (Tcl_Interp *interp, const char *cmdName); /* 103 */
+    int (*tcl_DeleteCommandFromToken) (Tcl_Interp *interp, Tcl_Command command); /* 104 */
+    void (*tcl_DeleteEvents) (Tcl_EventDeleteProc *proc, ClientData clientData); /* 105 */
+    void (*tcl_DeleteEventSource) (Tcl_EventSetupProc *setupProc, Tcl_EventCheckProc *checkProc, ClientData clientData); /* 106 */
+    void (*tcl_DeleteExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 107 */
+    void (*tcl_DeleteHashEntry) (Tcl_HashEntry *entryPtr); /* 108 */
+    void (*tcl_DeleteHashTable) (Tcl_HashTable *tablePtr); /* 109 */
+    void (*tcl_DeleteInterp) (Tcl_Interp *interp); /* 110 */
+    void (*tcl_DetachPids) (int numPids, Tcl_Pid *pidPtr); /* 111 */
+    void (*tcl_DeleteTimerHandler) (Tcl_TimerToken token); /* 112 */
+    void (*tcl_DeleteTrace) (Tcl_Interp *interp, Tcl_Trace trace); /* 113 */
+    void (*tcl_DontCallWhenDeleted) (Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, ClientData clientData); /* 114 */
+    int (*tcl_DoOneEvent) (int flags); /* 115 */
+    void (*tcl_DoWhenIdle) (Tcl_IdleProc *proc, ClientData clientData); /* 116 */
+    char * (*tcl_DStringAppend) (Tcl_DString *dsPtr, const char *bytes, int length); /* 117 */
+    char * (*tcl_DStringAppendElement) (Tcl_DString *dsPtr, const char *element); /* 118 */
+    void (*tcl_DStringEndSublist) (Tcl_DString *dsPtr); /* 119 */
+    void (*tcl_DStringFree) (Tcl_DString *dsPtr); /* 120 */
+    void (*tcl_DStringGetResult) (Tcl_Interp *interp, Tcl_DString *dsPtr); /* 121 */
+    void (*tcl_DStringInit) (Tcl_DString *dsPtr); /* 122 */
+    void (*tcl_DStringResult) (Tcl_Interp *interp, Tcl_DString *dsPtr); /* 123 */
+    void (*tcl_DStringSetLength) (Tcl_DString *dsPtr, int length); /* 124 */
+    void (*tcl_DStringStartSublist) (Tcl_DString *dsPtr); /* 125 */
+    int (*tcl_Eof) (Tcl_Channel chan); /* 126 */
+    CONST84_RETURN char * (*tcl_ErrnoId) (void); /* 127 */
+    CONST84_RETURN char * (*tcl_ErrnoMsg) (int err); /* 128 */
+    int (*tcl_Eval) (Tcl_Interp *interp, const char *script); /* 129 */
+    int (*tcl_EvalFile) (Tcl_Interp *interp, const char *fileName); /* 130 */
+    int (*tcl_EvalObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 131 */
+    void (*tcl_EventuallyFree) (ClientData clientData, Tcl_FreeProc *freeProc); /* 132 */
+    void (*tcl_Exit) (int status); /* 133 */
+    int (*tcl_ExposeCommand) (Tcl_Interp *interp, const char *hiddenCmdToken, const char *cmdName); /* 134 */
+    int (*tcl_ExprBoolean) (Tcl_Interp *interp, const char *expr, int *ptr); /* 135 */
+    int (*tcl_ExprBooleanObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *ptr); /* 136 */
+    int (*tcl_ExprDouble) (Tcl_Interp *interp, const char *expr, double *ptr); /* 137 */
+    int (*tcl_ExprDoubleObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, double *ptr); /* 138 */
+    int (*tcl_ExprLong) (Tcl_Interp *interp, const char *expr, long *ptr); /* 139 */
+    int (*tcl_ExprLongObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, long *ptr); /* 140 */
+    int (*tcl_ExprObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Obj **resultPtrPtr); /* 141 */
+    int (*tcl_ExprString) (Tcl_Interp *interp, const char *expr); /* 142 */
+    void (*tcl_Finalize) (void); /* 143 */
+    void (*tcl_FindExecutable) (const char *argv0); /* 144 */
+    Tcl_HashEntry * (*tcl_FirstHashEntry) (Tcl_HashTable *tablePtr, Tcl_HashSearch *searchPtr); /* 145 */
+    int (*tcl_Flush) (Tcl_Channel chan); /* 146 */
+    void (*tcl_FreeResult) (Tcl_Interp *interp); /* 147 */
+    int (*tcl_GetAlias) (Tcl_Interp *interp, const char *slaveCmd, Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr, int *argcPtr, CONST84 char ***argvPtr); /* 148 */
+    int (*tcl_GetAliasObj) (Tcl_Interp *interp, const char *slaveCmd, Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr, int *objcPtr, Tcl_Obj ***objv); /* 149 */
+    ClientData (*tcl_GetAssocData) (Tcl_Interp *interp, const char *name, Tcl_InterpDeleteProc **procPtr); /* 150 */
+    Tcl_Channel (*tcl_GetChannel) (Tcl_Interp *interp, const char *chanName, int *modePtr); /* 151 */
+    int (*tcl_GetChannelBufferSize) (Tcl_Channel chan); /* 152 */
+    int (*tcl_GetChannelHandle) (Tcl_Channel chan, int direction, ClientData *handlePtr); /* 153 */
+    ClientData (*tcl_GetChannelInstanceData) (Tcl_Channel chan); /* 154 */
+    int (*tcl_GetChannelMode) (Tcl_Channel chan); /* 155 */
+    CONST84_RETURN char * (*tcl_GetChannelName) (Tcl_Channel chan); /* 156 */
+    int (*tcl_GetChannelOption) (Tcl_Interp *interp, Tcl_Channel chan, const char *optionName, Tcl_DString *dsPtr); /* 157 */
+    CONST86 Tcl_ChannelType * (*tcl_GetChannelType) (Tcl_Channel chan); /* 158 */
+    int (*tcl_GetCommandInfo) (Tcl_Interp *interp, const char *cmdName, Tcl_CmdInfo *infoPtr); /* 159 */
+    CONST84_RETURN char * (*tcl_GetCommandName) (Tcl_Interp *interp, Tcl_Command command); /* 160 */
+    int (*tcl_GetErrno) (void); /* 161 */
+    CONST84_RETURN char * (*tcl_GetHostName) (void); /* 162 */
+    int (*tcl_GetInterpPath) (Tcl_Interp *askInterp, Tcl_Interp *slaveInterp); /* 163 */
+    Tcl_Interp * (*tcl_GetMaster) (Tcl_Interp *interp); /* 164 */
+    const char * (*tcl_GetNameOfExecutable) (void); /* 165 */
+    Tcl_Obj * (*tcl_GetObjResult) (Tcl_Interp *interp); /* 166 */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+    int (*tcl_GetOpenFile) (Tcl_Interp *interp, const char *chanID, int forWriting, int checkUsage, ClientData *filePtr); /* 167 */
+#endif /* UNIX */
+#if defined(_WIN32) /* WIN */
+    void (*reserved167)(void);
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+    int (*tcl_GetOpenFile) (Tcl_Interp *interp, const char *chanID, int forWriting, int checkUsage, ClientData *filePtr); /* 167 */
+#endif /* MACOSX */
+    Tcl_PathType (*tcl_GetPathType) (const char *path); /* 168 */
+    int (*tcl_Gets) (Tcl_Channel chan, Tcl_DString *dsPtr); /* 169 */
+    int (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 170 */
+    int (*tcl_GetServiceMode) (void); /* 171 */
+    Tcl_Interp * (*tcl_GetSlave) (Tcl_Interp *interp, const char *slaveName); /* 172 */
+    Tcl_Channel (*tcl_GetStdChannel) (int type); /* 173 */
+    CONST84_RETURN char * (*tcl_GetStringResult) (Tcl_Interp *interp); /* 174 */
+    CONST84_RETURN char * (*tcl_GetVar) (Tcl_Interp *interp, const char *varName, int flags); /* 175 */
+    CONST84_RETURN char * (*tcl_GetVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags); /* 176 */
+    int (*tcl_GlobalEval) (Tcl_Interp *interp, const char *command); /* 177 */
+    int (*tcl_GlobalEvalObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 178 */
+    int (*tcl_HideCommand) (Tcl_Interp *interp, const char *cmdName, const char *hiddenCmdToken); /* 179 */
+    int (*tcl_Init) (Tcl_Interp *interp); /* 180 */
+    void (*tcl_InitHashTable) (Tcl_HashTable *tablePtr, int keyType); /* 181 */
+    int (*tcl_InputBlocked) (Tcl_Channel chan); /* 182 */
+    int (*tcl_InputBuffered) (Tcl_Channel chan); /* 183 */
+    int (*tcl_InterpDeleted) (Tcl_Interp *interp); /* 184 */
+    int (*tcl_IsSafe) (Tcl_Interp *interp); /* 185 */
+    char * (*tcl_JoinPath) (int argc, CONST84 char *const *argv, Tcl_DString *resultPtr); /* 186 */
+    int (*tcl_LinkVar) (Tcl_Interp *interp, const char *varName, char *addr, int type); /* 187 */
+    void (*reserved188)(void);
+    Tcl_Channel (*tcl_MakeFileChannel) (ClientData handle, int mode); /* 189 */
+    int (*tcl_MakeSafe) (Tcl_Interp *interp); /* 190 */
+    Tcl_Channel (*tcl_MakeTcpClientChannel) (ClientData tcpSocket); /* 191 */
+    char * (*tcl_Merge) (int argc, CONST84 char *const *argv); /* 192 */
+    Tcl_HashEntry * (*tcl_NextHashEntry) (Tcl_HashSearch *searchPtr); /* 193 */
+    void (*tcl_NotifyChannel) (Tcl_Channel channel, int mask); /* 194 */
+    Tcl_Obj * (*tcl_ObjGetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags); /* 195 */
+    Tcl_Obj * (*tcl_ObjSetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, int flags); /* 196 */
+    Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp *interp, int argc, CONST84 char **argv, int flags); /* 197 */
+    Tcl_Channel (*tcl_OpenFileChannel) (Tcl_Interp *interp, const char *fileName, const char *modeString, int permissions); /* 198 */
+    Tcl_Channel (*tcl_OpenTcpClient) (Tcl_Interp *interp, int port, const char *address, const char *myaddr, int myport, int async); /* 199 */
+    Tcl_Channel (*tcl_OpenTcpServer) (Tcl_Interp *interp, int port, const char *host, Tcl_TcpAcceptProc *acceptProc, ClientData callbackData); /* 200 */
+    void (*tcl_Preserve) (ClientData data); /* 201 */
+    void (*tcl_PrintDouble) (Tcl_Interp *interp, double value, char *dst); /* 202 */
+    int (*tcl_PutEnv) (const char *assignment); /* 203 */
+    CONST84_RETURN char * (*tcl_PosixError) (Tcl_Interp *interp); /* 204 */
+    void (*tcl_QueueEvent) (Tcl_Event *evPtr, Tcl_QueuePosition position); /* 205 */
+    int (*tcl_Read) (Tcl_Channel chan, char *bufPtr, int toRead); /* 206 */
+    void (*tcl_ReapDetachedProcs) (void); /* 207 */
+    int (*tcl_RecordAndEval) (Tcl_Interp *interp, const char *cmd, int flags); /* 208 */
+    int (*tcl_RecordAndEvalObj) (Tcl_Interp *interp, Tcl_Obj *cmdPtr, int flags); /* 209 */
+    void (*tcl_RegisterChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 210 */
+    void (*tcl_RegisterObjType) (const Tcl_ObjType *typePtr); /* 211 */
+    Tcl_RegExp (*tcl_RegExpCompile) (Tcl_Interp *interp, const char *pattern); /* 212 */
+    int (*tcl_RegExpExec) (Tcl_Interp *interp, Tcl_RegExp regexp, const char *text, const char *start); /* 213 */
+    int (*tcl_RegExpMatch) (Tcl_Interp *interp, const char *text, const char *pattern); /* 214 */
+    void (*tcl_RegExpRange) (Tcl_RegExp regexp, int index, CONST84 char **startPtr, CONST84 char **endPtr); /* 215 */
+    void (*tcl_Release) (ClientData clientData); /* 216 */
+    void (*tcl_ResetResult) (Tcl_Interp *interp); /* 217 */
+    int (*tcl_ScanElement) (const char *src, int *flagPtr); /* 218 */
+    int (*tcl_ScanCountedElement) (const char *src, int length, int *flagPtr); /* 219 */
+    int (*tcl_SeekOld) (Tcl_Channel chan, int offset, int mode); /* 220 */
+    int (*tcl_ServiceAll) (void); /* 221 */
+    int (*tcl_ServiceEvent) (int flags); /* 222 */
+    void (*tcl_SetAssocData) (Tcl_Interp *interp, const char *name, Tcl_InterpDeleteProc *proc, ClientData clientData); /* 223 */
+    void (*tcl_SetChannelBufferSize) (Tcl_Channel chan, int sz); /* 224 */
+    int (*tcl_SetChannelOption) (Tcl_Interp *interp, Tcl_Channel chan, const char *optionName, const char *newValue); /* 225 */
+    int (*tcl_SetCommandInfo) (Tcl_Interp *interp, const char *cmdName, const Tcl_CmdInfo *infoPtr); /* 226 */
+    void (*tcl_SetErrno) (int err); /* 227 */
+    void (*tcl_SetErrorCode) (Tcl_Interp *interp, ...); /* 228 */
+    void (*tcl_SetMaxBlockTime) (const Tcl_Time *timePtr); /* 229 */
+    void (*tcl_SetPanicProc) (Tcl_PanicProc *panicProc); /* 230 */
+    int (*tcl_SetRecursionLimit) (Tcl_Interp *interp, int depth); /* 231 */
+    void (*tcl_SetResult) (Tcl_Interp *interp, char *result, Tcl_FreeProc *freeProc); /* 232 */
+    int (*tcl_SetServiceMode) (int mode); /* 233 */
+    void (*tcl_SetObjErrorCode) (Tcl_Interp *interp, Tcl_Obj *errorObjPtr); /* 234 */
+    void (*tcl_SetObjResult) (Tcl_Interp *interp, Tcl_Obj *resultObjPtr); /* 235 */
+    void (*tcl_SetStdChannel) (Tcl_Channel channel, int type); /* 236 */
+    CONST84_RETURN char * (*tcl_SetVar) (Tcl_Interp *interp, const char *varName, const char *newValue, int flags); /* 237 */
+    CONST84_RETURN char * (*tcl_SetVar2) (Tcl_Interp *interp, const char *part1, const char *part2, const char *newValue, int flags); /* 238 */
+    CONST84_RETURN char * (*tcl_SignalId) (int sig); /* 239 */
+    CONST84_RETURN char * (*tcl_SignalMsg) (int sig); /* 240 */
+    void (*tcl_SourceRCFile) (Tcl_Interp *interp); /* 241 */
+    int (*tcl_SplitList) (Tcl_Interp *interp, const char *listStr, int *argcPtr, CONST84 char ***argvPtr); /* 242 */
+    void (*tcl_SplitPath) (const char *path, int *argcPtr, CONST84 char ***argvPtr); /* 243 */
+    void (*tcl_StaticPackage) (Tcl_Interp *interp, const char *pkgName, Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc); /* 244 */
+    int (*tcl_StringMatch) (const char *str, const char *pattern); /* 245 */
+    int (*tcl_TellOld) (Tcl_Channel chan); /* 246 */
+    int (*tcl_TraceVar) (Tcl_Interp *interp, const char *varName, int flags, Tcl_VarTraceProc *proc, ClientData clientData); /* 247 */
+    int (*tcl_TraceVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *proc, ClientData clientData); /* 248 */
+    char * (*tcl_TranslateFileName) (Tcl_Interp *interp, const char *name, Tcl_DString *bufferPtr); /* 249 */
+    int (*tcl_Ungets) (Tcl_Channel chan, const char *str, int len, int atHead); /* 250 */
+    void (*tcl_UnlinkVar) (Tcl_Interp *interp, const char *varName); /* 251 */
+    int (*tcl_UnregisterChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 252 */
+    int (*tcl_UnsetVar) (Tcl_Interp *interp, const char *varName, int flags); /* 253 */
+    int (*tcl_UnsetVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags); /* 254 */
+    void (*tcl_UntraceVar) (Tcl_Interp *interp, const char *varName, int flags, Tcl_VarTraceProc *proc, ClientData clientData); /* 255 */
+    void (*tcl_UntraceVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *proc, ClientData clientData); /* 256 */
+    void (*tcl_UpdateLinkedVar) (Tcl_Interp *interp, const char *varName); /* 257 */
+    int (*tcl_UpVar) (Tcl_Interp *interp, const char *frameName, const char *varName, const char *localName, int flags); /* 258 */
+    int (*tcl_UpVar2) (Tcl_Interp *interp, const char *frameName, const char *part1, const char *part2, const char *localName, int flags); /* 259 */
+    int (*tcl_VarEval) (Tcl_Interp *interp, ...); /* 260 */
+    ClientData (*tcl_VarTraceInfo) (Tcl_Interp *interp, const char *varName, int flags, Tcl_VarTraceProc *procPtr, ClientData prevClientData); /* 261 */
+    ClientData (*tcl_VarTraceInfo2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *procPtr, ClientData prevClientData); /* 262 */
+    int (*tcl_Write) (Tcl_Channel chan, const char *s, int slen); /* 263 */
+    void (*tcl_WrongNumArgs) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], const char *message); /* 264 */
+    int (*tcl_DumpActiveMemory) (const char *fileName); /* 265 */
+    void (*tcl_ValidateAllMemory) (const char *file, int line); /* 266 */
+    void (*tcl_AppendResultVA) (Tcl_Interp *interp, va_list argList); /* 267 */
+    void (*tcl_AppendStringsToObjVA) (Tcl_Obj *objPtr, va_list argList); /* 268 */
+    char * (*tcl_HashStats) (Tcl_HashTable *tablePtr); /* 269 */
+    CONST84_RETURN char * (*tcl_ParseVar) (Tcl_Interp *interp, const char *start, CONST84 char **termPtr); /* 270 */
+    CONST84_RETURN char * (*tcl_PkgPresent) (Tcl_Interp *interp, const char *name, const char *version, int exact); /* 271 */
+    CONST84_RETURN char * (*tcl_PkgPresentEx) (Tcl_Interp *interp, const char *name, const char *version, int exact, void *clientDataPtr); /* 272 */
+    int (*tcl_PkgProvide) (Tcl_Interp *interp, const char *name, const char *version); /* 273 */
+    CONST84_RETURN char * (*tcl_PkgRequire) (Tcl_Interp *interp, const char *name, const char *version, int exact); /* 274 */
+    void (*tcl_SetErrorCodeVA) (Tcl_Interp *interp, va_list argList); /* 275 */
+    int (*tcl_VarEvalVA) (Tcl_Interp *interp, va_list argList); /* 276 */
+    Tcl_Pid (*tcl_WaitPid) (Tcl_Pid pid, int *statPtr, int options); /* 277 */
+    void (*tcl_PanicVA) (const char *format, va_list argList); /* 278 */
+    void (*tcl_GetVersion) (int *major, int *minor, int *patchLevel, int *type); /* 279 */
+    void (*tcl_InitMemory) (Tcl_Interp *interp); /* 280 */
+    Tcl_Channel (*tcl_StackChannel) (Tcl_Interp *interp, const Tcl_ChannelType *typePtr, ClientData instanceData, int mask, Tcl_Channel prevChan); /* 281 */
+    int (*tcl_UnstackChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 282 */
+    Tcl_Channel (*tcl_GetStackedChannel) (Tcl_Channel chan); /* 283 */
+    void (*tcl_SetMainLoop) (Tcl_MainLoopProc *proc); /* 284 */
+    void (*reserved285)(void);
+    void (*tcl_AppendObjToObj) (Tcl_Obj *objPtr, Tcl_Obj *appendObjPtr); /* 286 */
+    Tcl_Encoding (*tcl_CreateEncoding) (const Tcl_EncodingType *typePtr); /* 287 */
+    void (*tcl_CreateThreadExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 288 */
+    void (*tcl_DeleteThreadExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 289 */
+    void (*tcl_DiscardResult) (Tcl_SavedResult *statePtr); /* 290 */
+    int (*tcl_EvalEx) (Tcl_Interp *interp, const char *script, int numBytes, int flags); /* 291 */
+    int (*tcl_EvalObjv) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], int flags); /* 292 */
+    int (*tcl_EvalObjEx) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 293 */
+    void (*tcl_ExitThread) (int status); /* 294 */
+    int (*tcl_ExternalToUtf) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 295 */
+    char * (*tcl_ExternalToUtfDString) (Tcl_Encoding encoding, const char *src, int srcLen, Tcl_DString *dsPtr); /* 296 */
+    void (*tcl_FinalizeThread) (void); /* 297 */
+    void (*tcl_FinalizeNotifier) (ClientData clientData); /* 298 */
+    void (*tcl_FreeEncoding) (Tcl_Encoding encoding); /* 299 */
+    Tcl_ThreadId (*tcl_GetCurrentThread) (void); /* 300 */
+    Tcl_Encoding (*tcl_GetEncoding) (Tcl_Interp *interp, const char *name); /* 301 */
+    CONST84_RETURN char * (*tcl_GetEncodingName) (Tcl_Encoding encoding); /* 302 */
+    void (*tcl_GetEncodingNames) (Tcl_Interp *interp); /* 303 */
+    int (*tcl_GetIndexFromObjStruct) (Tcl_Interp *interp, Tcl_Obj *objPtr, const void *tablePtr, int offset, const char *msg, int flags, int *indexPtr); /* 304 */
+    void * (*tcl_GetThreadData) (Tcl_ThreadDataKey *keyPtr, int size); /* 305 */
+    Tcl_Obj * (*tcl_GetVar2Ex) (Tcl_Interp *interp, const char *part1, const char *part2, int flags); /* 306 */
+    ClientData (*tcl_InitNotifier) (void); /* 307 */
+    void (*tcl_MutexLock) (Tcl_Mutex *mutexPtr); /* 308 */
+    void (*tcl_MutexUnlock) (Tcl_Mutex *mutexPtr); /* 309 */
+    void (*tcl_ConditionNotify) (Tcl_Condition *condPtr); /* 310 */
+    void (*tcl_ConditionWait) (Tcl_Condition *condPtr, Tcl_Mutex *mutexPtr, const Tcl_Time *timePtr); /* 311 */
+    int (*tcl_NumUtfChars) (const char *src, int length); /* 312 */
+    int (*tcl_ReadChars) (Tcl_Channel channel, Tcl_Obj *objPtr, int charsToRead, int appendFlag); /* 313 */
+    void (*tcl_RestoreResult) (Tcl_Interp *interp, Tcl_SavedResult *statePtr); /* 314 */
+    void (*tcl_SaveResult) (Tcl_Interp *interp, Tcl_SavedResult *statePtr); /* 315 */
+    int (*tcl_SetSystemEncoding) (Tcl_Interp *interp, const char *name); /* 316 */
+    Tcl_Obj * (*tcl_SetVar2Ex) (Tcl_Interp *interp, const char *part1, const char *part2, Tcl_Obj *newValuePtr, int flags); /* 317 */
+    void (*tcl_ThreadAlert) (Tcl_ThreadId threadId); /* 318 */
+    void (*tcl_ThreadQueueEvent) (Tcl_ThreadId threadId, Tcl_Event *evPtr, Tcl_QueuePosition position); /* 319 */
+    Tcl_UniChar (*tcl_UniCharAtIndex) (const char *src, int index); /* 320 */
+    Tcl_UniChar (*tcl_UniCharToLower) (int ch); /* 321 */
+    Tcl_UniChar (*tcl_UniCharToTitle) (int ch); /* 322 */
+    Tcl_UniChar (*tcl_UniCharToUpper) (int ch); /* 323 */
+    int (*tcl_UniCharToUtf) (int ch, char *buf); /* 324 */
+    CONST84_RETURN char * (*tcl_UtfAtIndex) (const char *src, int index); /* 325 */
+    int (*tcl_UtfCharComplete) (const char *src, int length); /* 326 */
+    int (*tcl_UtfBackslash) (const char *src, int *readPtr, char *dst); /* 327 */
+    CONST84_RETURN char * (*tcl_UtfFindFirst) (const char *src, int ch); /* 328 */
+    CONST84_RETURN char * (*tcl_UtfFindLast) (const char *src, int ch); /* 329 */
+    CONST84_RETURN char * (*tcl_UtfNext) (const char *src); /* 330 */
+    CONST84_RETURN char * (*tcl_UtfPrev) (const char *src, const char *start); /* 331 */
+    int (*tcl_UtfToExternal) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 332 */
+    char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, const char *src, int srcLen, Tcl_DString *dsPtr); /* 333 */
+    int (*tcl_UtfToLower) (char *src); /* 334 */
+    int (*tcl_UtfToTitle) (char *src); /* 335 */
+    int (*tcl_UtfToUniChar) (const char *src, Tcl_UniChar *chPtr); /* 336 */
+    int (*tcl_UtfToUpper) (char *src); /* 337 */
+    int (*tcl_WriteChars) (Tcl_Channel chan, const char *src, int srcLen); /* 338 */
+    int (*tcl_WriteObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 339 */
+    char * (*tcl_GetString) (Tcl_Obj *objPtr); /* 340 */
+    CONST84_RETURN char * (*tcl_GetDefaultEncodingDir) (void); /* 341 */
+    void (*tcl_SetDefaultEncodingDir) (const char *path); /* 342 */
+    void (*tcl_AlertNotifier) (ClientData clientData); /* 343 */
+    void (*tcl_ServiceModeHook) (int mode); /* 344 */
+    int (*tcl_UniCharIsAlnum) (int ch); /* 345 */
+    int (*tcl_UniCharIsAlpha) (int ch); /* 346 */
+    int (*tcl_UniCharIsDigit) (int ch); /* 347 */
+    int (*tcl_UniCharIsLower) (int ch); /* 348 */
+    int (*tcl_UniCharIsSpace) (int ch); /* 349 */
+    int (*tcl_UniCharIsUpper) (int ch); /* 350 */
+    int (*tcl_UniCharIsWordChar) (int ch); /* 351 */
+    int (*tcl_UniCharLen) (const Tcl_UniChar *uniStr); /* 352 */
+    int (*tcl_UniCharNcmp) (const Tcl_UniChar *ucs, const Tcl_UniChar *uct, unsigned long numChars); /* 353 */
+    char * (*tcl_UniCharToUtfDString) (const Tcl_UniChar *uniStr, int uniLength, Tcl_DString *dsPtr); /* 354 */
+    Tcl_UniChar * (*tcl_UtfToUniCharDString) (const char *src, int length, Tcl_DString *dsPtr); /* 355 */
+    Tcl_RegExp (*tcl_GetRegExpFromObj) (Tcl_Interp *interp, Tcl_Obj *patObj, int flags); /* 356 */
+    Tcl_Obj * (*tcl_EvalTokens) (Tcl_Interp *interp, Tcl_Token *tokenPtr, int count); /* 357 */
+    void (*tcl_FreeParse) (Tcl_Parse *parsePtr); /* 358 */
+    void (*tcl_LogCommandInfo) (Tcl_Interp *interp, const char *script, const char *command, int length); /* 359 */
+    int (*tcl_ParseBraces) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr, int append, CONST84 char **termPtr); /* 360 */
+    int (*tcl_ParseCommand) (Tcl_Interp *interp, const char *start, int numBytes, int nested, Tcl_Parse *parsePtr); /* 361 */
+    int (*tcl_ParseExpr) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr); /* 362 */
+    int (*tcl_ParseQuotedString) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr, int append, CONST84 char **termPtr); /* 363 */
+    int (*tcl_ParseVarName) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr, int append); /* 364 */
+    char * (*tcl_GetCwd) (Tcl_Interp *interp, Tcl_DString *cwdPtr); /* 365 */
+    int (*tcl_Chdir) (const char *dirName); /* 366 */
+    int (*tcl_Access) (const char *path, int mode); /* 367 */
+    int (*tcl_Stat) (const char *path, struct stat *bufPtr); /* 368 */
+    int (*tcl_UtfNcmp) (const char *s1, const char *s2, unsigned long n); /* 369 */
+    int (*tcl_UtfNcasecmp) (const char *s1, const char *s2, unsigned long n); /* 370 */
+    int (*tcl_StringCaseMatch) (const char *str, const char *pattern, int nocase); /* 371 */
+    int (*tcl_UniCharIsControl) (int ch); /* 372 */
+    int (*tcl_UniCharIsGraph) (int ch); /* 373 */
+    int (*tcl_UniCharIsPrint) (int ch); /* 374 */
+    int (*tcl_UniCharIsPunct) (int ch); /* 375 */
+    int (*tcl_RegExpExecObj) (Tcl_Interp *interp, Tcl_RegExp regexp, Tcl_Obj *textObj, int offset, int nmatches, int flags); /* 376 */
+    void (*tcl_RegExpGetInfo) (Tcl_RegExp regexp, Tcl_RegExpInfo *infoPtr); /* 377 */
+    Tcl_Obj * (*tcl_NewUnicodeObj) (const Tcl_UniChar *unicode, int numChars); /* 378 */
+    void (*tcl_SetUnicodeObj) (Tcl_Obj *objPtr, const Tcl_UniChar *unicode, int numChars); /* 379 */
+    int (*tcl_GetCharLength) (Tcl_Obj *objPtr); /* 380 */
+    Tcl_UniChar (*tcl_GetUniChar) (Tcl_Obj *objPtr, int index); /* 381 */
+    Tcl_UniChar * (*tcl_GetUnicode) (Tcl_Obj *objPtr); /* 382 */
+    Tcl_Obj * (*tcl_GetRange) (Tcl_Obj *objPtr, int first, int last); /* 383 */
+    void (*tcl_AppendUnicodeToObj) (Tcl_Obj *objPtr, const Tcl_UniChar *unicode, int length); /* 384 */
+    int (*tcl_RegExpMatchObj) (Tcl_Interp *interp, Tcl_Obj *textObj, Tcl_Obj *patternObj); /* 385 */
+    void (*tcl_SetNotifier) (Tcl_NotifierProcs *notifierProcPtr); /* 386 */
+    Tcl_Mutex * (*tcl_GetAllocMutex) (void); /* 387 */
+    int (*tcl_GetChannelNames) (Tcl_Interp *interp); /* 388 */
+    int (*tcl_GetChannelNamesEx) (Tcl_Interp *interp, const char *pattern); /* 389 */
+    int (*tcl_ProcObjCmd) (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 390 */
+    void (*tcl_ConditionFinalize) (Tcl_Condition *condPtr); /* 391 */
+    void (*tcl_MutexFinalize) (Tcl_Mutex *mutex); /* 392 */
+    int (*tcl_CreateThread) (Tcl_ThreadId *idPtr, Tcl_ThreadCreateProc *proc, ClientData clientData, int stackSize, int flags); /* 393 */
+    int (*tcl_ReadRaw) (Tcl_Channel chan, char *dst, int bytesToRead); /* 394 */
+    int (*tcl_WriteRaw) (Tcl_Channel chan, const char *src, int srcLen); /* 395 */
+    Tcl_Channel (*tcl_GetTopChannel) (Tcl_Channel chan); /* 396 */
+    int (*tcl_ChannelBuffered) (Tcl_Channel chan); /* 397 */
+    CONST84_RETURN char * (*tcl_ChannelName) (const Tcl_ChannelType *chanTypePtr); /* 398 */
+    Tcl_ChannelTypeVersion (*tcl_ChannelVersion) (const Tcl_ChannelType *chanTypePtr); /* 399 */
+    Tcl_DriverBlockModeProc * (*tcl_ChannelBlockModeProc) (const Tcl_ChannelType *chanTypePtr); /* 400 */
+    Tcl_DriverCloseProc * (*tcl_ChannelCloseProc) (const Tcl_ChannelType *chanTypePtr); /* 401 */
+    Tcl_DriverClose2Proc * (*tcl_ChannelClose2Proc) (const Tcl_ChannelType *chanTypePtr); /* 402 */
+    Tcl_DriverInputProc * (*tcl_ChannelInputProc) (const Tcl_ChannelType *chanTypePtr); /* 403 */
+    Tcl_DriverOutputProc * (*tcl_ChannelOutputProc) (const Tcl_ChannelType *chanTypePtr); /* 404 */
+    Tcl_DriverSeekProc * (*tcl_ChannelSeekProc) (const Tcl_ChannelType *chanTypePtr); /* 405 */
+    Tcl_DriverSetOptionProc * (*tcl_ChannelSetOptionProc) (const Tcl_ChannelType *chanTypePtr); /* 406 */
+    Tcl_DriverGetOptionProc * (*tcl_ChannelGetOptionProc) (const Tcl_ChannelType *chanTypePtr); /* 407 */
+    Tcl_DriverWatchProc * (*tcl_ChannelWatchProc) (const Tcl_ChannelType *chanTypePtr); /* 408 */
+    Tcl_DriverGetHandleProc * (*tcl_ChannelGetHandleProc) (const Tcl_ChannelType *chanTypePtr); /* 409 */
+    Tcl_DriverFlushProc * (*tcl_ChannelFlushProc) (const Tcl_ChannelType *chanTypePtr); /* 410 */
+    Tcl_DriverHandlerProc * (*tcl_ChannelHandlerProc) (const Tcl_ChannelType *chanTypePtr); /* 411 */
+    int (*tcl_JoinThread) (Tcl_ThreadId threadId, int *result); /* 412 */
+    int (*tcl_IsChannelShared) (Tcl_Channel channel); /* 413 */
+    int (*tcl_IsChannelRegistered) (Tcl_Interp *interp, Tcl_Channel channel); /* 414 */
+    void (*tcl_CutChannel) (Tcl_Channel channel); /* 415 */
+    void (*tcl_SpliceChannel) (Tcl_Channel channel); /* 416 */
+    void (*tcl_ClearChannelHandlers) (Tcl_Channel channel); /* 417 */
+    int (*tcl_IsChannelExisting) (const char *channelName); /* 418 */
+    int (*tcl_UniCharNcasecmp) (const Tcl_UniChar *ucs, const Tcl_UniChar *uct, unsigned long numChars); /* 419 */
+    int (*tcl_UniCharCaseMatch) (const Tcl_UniChar *uniStr, const Tcl_UniChar *uniPattern, int nocase); /* 420 */
+    Tcl_HashEntry * (*tcl_FindHashEntry) (Tcl_HashTable *tablePtr, const void *key); /* 421 */
+    Tcl_HashEntry * (*tcl_CreateHashEntry) (Tcl_HashTable *tablePtr, const void *key, int *newPtr); /* 422 */
+    void (*tcl_InitCustomHashTable) (Tcl_HashTable *tablePtr, int keyType, const Tcl_HashKeyType *typePtr); /* 423 */
+    void (*tcl_InitObjHashTable) (Tcl_HashTable *tablePtr); /* 424 */
+    ClientData (*tcl_CommandTraceInfo) (Tcl_Interp *interp, const char *varName, int flags, Tcl_CommandTraceProc *procPtr, ClientData prevClientData); /* 425 */
+    int (*tcl_TraceCommand) (Tcl_Interp *interp, const char *varName, int flags, Tcl_CommandTraceProc *proc, ClientData clientData); /* 426 */
+    void (*tcl_UntraceCommand) (Tcl_Interp *interp, const char *varName, int flags, Tcl_CommandTraceProc *proc, ClientData clientData); /* 427 */
+    char * (*tcl_AttemptAlloc) (unsigned int size); /* 428 */
+    char * (*tcl_AttemptDbCkalloc) (unsigned int size, const char *file, int line); /* 429 */
+    char * (*tcl_AttemptRealloc) (char *ptr, unsigned int size); /* 430 */
+    char * (*tcl_AttemptDbCkrealloc) (char *ptr, unsigned int size, const char *file, int line); /* 431 */
+    int (*tcl_AttemptSetObjLength) (Tcl_Obj *objPtr, int length); /* 432 */
+    Tcl_ThreadId (*tcl_GetChannelThread) (Tcl_Channel channel); /* 433 */
+    Tcl_UniChar * (*tcl_GetUnicodeFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 434 */
+    int (*tcl_GetMathFuncInfo) (Tcl_Interp *interp, const char *name, int *numArgsPtr, Tcl_ValueType **argTypesPtr, Tcl_MathProc **procPtr, ClientData *clientDataPtr); /* 435 */
+    Tcl_Obj * (*tcl_ListMathFuncs) (Tcl_Interp *interp, const char *pattern); /* 436 */
+    Tcl_Obj * (*tcl_SubstObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 437 */
+    int (*tcl_DetachChannel) (Tcl_Interp *interp, Tcl_Channel channel); /* 438 */
+    int (*tcl_IsStandardChannel) (Tcl_Channel channel); /* 439 */
+    int (*tcl_FSCopyFile) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr); /* 440 */
+    int (*tcl_FSCopyDirectory) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr); /* 441 */
+    int (*tcl_FSCreateDirectory) (Tcl_Obj *pathPtr); /* 442 */
+    int (*tcl_FSDeleteFile) (Tcl_Obj *pathPtr); /* 443 */
+    int (*tcl_FSLoadFile) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *sym1, const char *sym2, Tcl_PackageInitProc **proc1Ptr, Tcl_PackageInitProc **proc2Ptr, Tcl_LoadHandle *handlePtr, Tcl_FSUnloadFileProc **unloadProcPtr); /* 444 */
+    int (*tcl_FSMatchInDirectory) (Tcl_Interp *interp, Tcl_Obj *result, Tcl_Obj *pathPtr, const char *pattern, Tcl_GlobTypeData *types); /* 445 */
+    Tcl_Obj * (*tcl_FSLink) (Tcl_Obj *pathPtr, Tcl_Obj *toPtr, int linkAction); /* 446 */
+    int (*tcl_FSRemoveDirectory) (Tcl_Obj *pathPtr, int recursive, Tcl_Obj **errorPtr); /* 447 */
+    int (*tcl_FSRenameFile) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr); /* 448 */
+    int (*tcl_FSLstat) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf); /* 449 */
+    int (*tcl_FSUtime) (Tcl_Obj *pathPtr, struct utimbuf *tval); /* 450 */
+    int (*tcl_FSFileAttrsGet) (Tcl_Interp *interp, int index, Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef); /* 451 */
+    int (*tcl_FSFileAttrsSet) (Tcl_Interp *interp, int index, Tcl_Obj *pathPtr, Tcl_Obj *objPtr); /* 452 */
+    const char *CONST86 * (*tcl_FSFileAttrStrings) (Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef); /* 453 */
+    int (*tcl_FSStat) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf); /* 454 */
+    int (*tcl_FSAccess) (Tcl_Obj *pathPtr, int mode); /* 455 */
+    Tcl_Channel (*tcl_FSOpenFileChannel) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *modeString, int permissions); /* 456 */
+    Tcl_Obj * (*tcl_FSGetCwd) (Tcl_Interp *interp); /* 457 */
+    int (*tcl_FSChdir) (Tcl_Obj *pathPtr); /* 458 */
+    int (*tcl_FSConvertToPathType) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 459 */
+    Tcl_Obj * (*tcl_FSJoinPath) (Tcl_Obj *listObj, int elements); /* 460 */
+    Tcl_Obj * (*tcl_FSSplitPath) (Tcl_Obj *pathPtr, int *lenPtr); /* 461 */
+    int (*tcl_FSEqualPaths) (Tcl_Obj *firstPtr, Tcl_Obj *secondPtr); /* 462 */
+    Tcl_Obj * (*tcl_FSGetNormalizedPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 463 */
+    Tcl_Obj * (*tcl_FSJoinToPath) (Tcl_Obj *pathPtr, int objc, Tcl_Obj *const objv[]); /* 464 */
+    ClientData (*tcl_FSGetInternalRep) (Tcl_Obj *pathPtr, const Tcl_Filesystem *fsPtr); /* 465 */
+    Tcl_Obj * (*tcl_FSGetTranslatedPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 466 */
+    int (*tcl_FSEvalFile) (Tcl_Interp *interp, Tcl_Obj *fileName); /* 467 */
+    Tcl_Obj * (*tcl_FSNewNativePath) (const Tcl_Filesystem *fromFilesystem, ClientData clientData); /* 468 */
+    const void * (*tcl_FSGetNativePath) (Tcl_Obj *pathPtr); /* 469 */
+    Tcl_Obj * (*tcl_FSFileSystemInfo) (Tcl_Obj *pathPtr); /* 470 */
+    Tcl_Obj * (*tcl_FSPathSeparator) (Tcl_Obj *pathPtr); /* 471 */
+    Tcl_Obj * (*tcl_FSListVolumes) (void); /* 472 */
+    int (*tcl_FSRegister) (ClientData clientData, const Tcl_Filesystem *fsPtr); /* 473 */
+    int (*tcl_FSUnregister) (const Tcl_Filesystem *fsPtr); /* 474 */
+    ClientData (*tcl_FSData) (const Tcl_Filesystem *fsPtr); /* 475 */
+    const char * (*tcl_FSGetTranslatedStringPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 476 */
+    CONST86 Tcl_Filesystem * (*tcl_FSGetFileSystemForPath) (Tcl_Obj *pathPtr); /* 477 */
+    Tcl_PathType (*tcl_FSGetPathType) (Tcl_Obj *pathPtr); /* 478 */
+    int (*tcl_OutputBuffered) (Tcl_Channel chan); /* 479 */
+    void (*tcl_FSMountsChanged) (const Tcl_Filesystem *fsPtr); /* 480 */
+    int (*tcl_EvalTokensStandard) (Tcl_Interp *interp, Tcl_Token *tokenPtr, int count); /* 481 */
+    void (*tcl_GetTime) (Tcl_Time *timeBuf); /* 482 */
+    Tcl_Trace (*tcl_CreateObjTrace) (Tcl_Interp *interp, int level, int flags, Tcl_CmdObjTraceProc *objProc, ClientData clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 483 */
+    int (*tcl_GetCommandInfoFromToken) (Tcl_Command token, Tcl_CmdInfo *infoPtr); /* 484 */
+    int (*tcl_SetCommandInfoFromToken) (Tcl_Command token, const Tcl_CmdInfo *infoPtr); /* 485 */
+    Tcl_Obj * (*tcl_DbNewWideIntObj) (Tcl_WideInt wideValue, const char *file, int line); /* 486 */
+    int (*tcl_GetWideIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideInt *widePtr); /* 487 */
+    Tcl_Obj * (*tcl_NewWideIntObj) (Tcl_WideInt wideValue); /* 488 */
+    void (*tcl_SetWideIntObj) (Tcl_Obj *objPtr, Tcl_WideInt wideValue); /* 489 */
+    Tcl_StatBuf * (*tcl_AllocStatBuf) (void); /* 490 */
+    Tcl_WideInt (*tcl_Seek) (Tcl_Channel chan, Tcl_WideInt offset, int mode); /* 491 */
+    Tcl_WideInt (*tcl_Tell) (Tcl_Channel chan); /* 492 */
+    Tcl_DriverWideSeekProc * (*tcl_ChannelWideSeekProc) (const Tcl_ChannelType *chanTypePtr); /* 493 */
+    int (*tcl_DictObjPut) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr, Tcl_Obj *valuePtr); /* 494 */
+    int (*tcl_DictObjGet) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr, Tcl_Obj **valuePtrPtr); /* 495 */
+    int (*tcl_DictObjRemove) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr); /* 496 */
+    int (*tcl_DictObjSize) (Tcl_Interp *interp, Tcl_Obj *dictPtr, int *sizePtr); /* 497 */
+    int (*tcl_DictObjFirst) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_DictSearch *searchPtr, Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr, int *donePtr); /* 498 */
+    void (*tcl_DictObjNext) (Tcl_DictSearch *searchPtr, Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr, int *donePtr); /* 499 */
+    void (*tcl_DictObjDone) (Tcl_DictSearch *searchPtr); /* 500 */
+    int (*tcl_DictObjPutKeyList) (Tcl_Interp *interp, Tcl_Obj *dictPtr, int keyc, Tcl_Obj *const *keyv, Tcl_Obj *valuePtr); /* 501 */
+    int (*tcl_DictObjRemoveKeyList) (Tcl_Interp *interp, Tcl_Obj *dictPtr, int keyc, Tcl_Obj *const *keyv); /* 502 */
+    Tcl_Obj * (*tcl_NewDictObj) (void); /* 503 */
+    Tcl_Obj * (*tcl_DbNewDictObj) (const char *file, int line); /* 504 */
+    void (*tcl_RegisterConfig) (Tcl_Interp *interp, const char *pkgName, const Tcl_Config *configuration, const char *valEncoding); /* 505 */
+    Tcl_Namespace * (*tcl_CreateNamespace) (Tcl_Interp *interp, const char *name, ClientData clientData, Tcl_NamespaceDeleteProc *deleteProc); /* 506 */
+    void (*tcl_DeleteNamespace) (Tcl_Namespace *nsPtr); /* 507 */
+    int (*tcl_AppendExportList) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *objPtr); /* 508 */
+    int (*tcl_Export) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern, int resetListFirst); /* 509 */
+    int (*tcl_Import) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern, int allowOverwrite); /* 510 */
+    int (*tcl_ForgetImport) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern); /* 511 */
+    Tcl_Namespace * (*tcl_GetCurrentNamespace) (Tcl_Interp *interp); /* 512 */
+    Tcl_Namespace * (*tcl_GetGlobalNamespace) (Tcl_Interp *interp); /* 513 */
+    Tcl_Namespace * (*tcl_FindNamespace) (Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags); /* 514 */
+    Tcl_Command (*tcl_FindCommand) (Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags); /* 515 */
+    Tcl_Command (*tcl_GetCommandFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 516 */
+    void (*tcl_GetCommandFullName) (Tcl_Interp *interp, Tcl_Command command, Tcl_Obj *objPtr); /* 517 */
+    int (*tcl_FSEvalFileEx) (Tcl_Interp *interp, Tcl_Obj *fileName, const char *encodingName); /* 518 */
+    Tcl_ExitProc * (*tcl_SetExitProc) (Tcl_ExitProc *proc); /* 519 */
+    void (*tcl_LimitAddHandler) (Tcl_Interp *interp, int type, Tcl_LimitHandlerProc *handlerProc, ClientData clientData, Tcl_LimitHandlerDeleteProc *deleteProc); /* 520 */
+    void (*tcl_LimitRemoveHandler) (Tcl_Interp *interp, int type, Tcl_LimitHandlerProc *handlerProc, ClientData clientData); /* 521 */
+    int (*tcl_LimitReady) (Tcl_Interp *interp); /* 522 */
+    int (*tcl_LimitCheck) (Tcl_Interp *interp); /* 523 */
+    int (*tcl_LimitExceeded) (Tcl_Interp *interp); /* 524 */
+    void (*tcl_LimitSetCommands) (Tcl_Interp *interp, int commandLimit); /* 525 */
+    void (*tcl_LimitSetTime) (Tcl_Interp *interp, Tcl_Time *timeLimitPtr); /* 526 */
+    void (*tcl_LimitSetGranularity) (Tcl_Interp *interp, int type, int granularity); /* 527 */
+    int (*tcl_LimitTypeEnabled) (Tcl_Interp *interp, int type); /* 528 */
+    int (*tcl_LimitTypeExceeded) (Tcl_Interp *interp, int type); /* 529 */
+    void (*tcl_LimitTypeSet) (Tcl_Interp *interp, int type); /* 530 */
+    void (*tcl_LimitTypeReset) (Tcl_Interp *interp, int type); /* 531 */
+    int (*tcl_LimitGetCommands) (Tcl_Interp *interp); /* 532 */
+    void (*tcl_LimitGetTime) (Tcl_Interp *interp, Tcl_Time *timeLimitPtr); /* 533 */
+    int (*tcl_LimitGetGranularity) (Tcl_Interp *interp, int type); /* 534 */
+    Tcl_InterpState (*tcl_SaveInterpState) (Tcl_Interp *interp, int status); /* 535 */
+    int (*tcl_RestoreInterpState) (Tcl_Interp *interp, Tcl_InterpState state); /* 536 */
+    void (*tcl_DiscardInterpState) (Tcl_InterpState state); /* 537 */
+    int (*tcl_SetReturnOptions) (Tcl_Interp *interp, Tcl_Obj *options); /* 538 */
+    Tcl_Obj * (*tcl_GetReturnOptions) (Tcl_Interp *interp, int result); /* 539 */
+    int (*tcl_IsEnsemble) (Tcl_Command token); /* 540 */
+    Tcl_Command (*tcl_CreateEnsemble) (Tcl_Interp *interp, const char *name, Tcl_Namespace *namespacePtr, int flags); /* 541 */
+    Tcl_Command (*tcl_FindEnsemble) (Tcl_Interp *interp, Tcl_Obj *cmdNameObj, int flags); /* 542 */
+    int (*tcl_SetEnsembleSubcommandList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *subcmdList); /* 543 */
+    int (*tcl_SetEnsembleMappingDict) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *mapDict); /* 544 */
+    int (*tcl_SetEnsembleUnknownHandler) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *unknownList); /* 545 */
+    int (*tcl_SetEnsembleFlags) (Tcl_Interp *interp, Tcl_Command token, int flags); /* 546 */
+    int (*tcl_GetEnsembleSubcommandList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **subcmdListPtr); /* 547 */
+    int (*tcl_GetEnsembleMappingDict) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **mapDictPtr); /* 548 */
+    int (*tcl_GetEnsembleUnknownHandler) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **unknownListPtr); /* 549 */
+    int (*tcl_GetEnsembleFlags) (Tcl_Interp *interp, Tcl_Command token, int *flagsPtr); /* 550 */
+    int (*tcl_GetEnsembleNamespace) (Tcl_Interp *interp, Tcl_Command token, Tcl_Namespace **namespacePtrPtr); /* 551 */
+    void (*tcl_SetTimeProc) (Tcl_GetTimeProc *getProc, Tcl_ScaleTimeProc *scaleProc, ClientData clientData); /* 552 */
+    void (*tcl_QueryTimeProc) (Tcl_GetTimeProc **getProc, Tcl_ScaleTimeProc **scaleProc, ClientData *clientData); /* 553 */
+    Tcl_DriverThreadActionProc * (*tcl_ChannelThreadActionProc) (const Tcl_ChannelType *chanTypePtr); /* 554 */
+    Tcl_Obj * (*tcl_NewBignumObj) (mp_int *value); /* 555 */
+    Tcl_Obj * (*tcl_DbNewBignumObj) (mp_int *value, const char *file, int line); /* 556 */
+    void (*tcl_SetBignumObj) (Tcl_Obj *obj, mp_int *value); /* 557 */
+    int (*tcl_GetBignumFromObj) (Tcl_Interp *interp, Tcl_Obj *obj, mp_int *value); /* 558 */
+    int (*tcl_TakeBignumFromObj) (Tcl_Interp *interp, Tcl_Obj *obj, mp_int *value); /* 559 */
+    int (*tcl_TruncateChannel) (Tcl_Channel chan, Tcl_WideInt length); /* 560 */
+    Tcl_DriverTruncateProc * (*tcl_ChannelTruncateProc) (const Tcl_ChannelType *chanTypePtr); /* 561 */
+    void (*tcl_SetChannelErrorInterp) (Tcl_Interp *interp, Tcl_Obj *msg); /* 562 */
+    void (*tcl_GetChannelErrorInterp) (Tcl_Interp *interp, Tcl_Obj **msg); /* 563 */
+    void (*tcl_SetChannelError) (Tcl_Channel chan, Tcl_Obj *msg); /* 564 */
+    void (*tcl_GetChannelError) (Tcl_Channel chan, Tcl_Obj **msg); /* 565 */
+    int (*tcl_InitBignumFromDouble) (Tcl_Interp *interp, double initval, mp_int *toInit); /* 566 */
+    Tcl_Obj * (*tcl_GetNamespaceUnknownHandler) (Tcl_Interp *interp, Tcl_Namespace *nsPtr); /* 567 */
+    int (*tcl_SetNamespaceUnknownHandler) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *handlerPtr); /* 568 */
+    int (*tcl_GetEncodingFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Encoding *encodingPtr); /* 569 */
+    Tcl_Obj * (*tcl_GetEncodingSearchPath) (void); /* 570 */
+    int (*tcl_SetEncodingSearchPath) (Tcl_Obj *searchPath); /* 571 */
+    const char * (*tcl_GetEncodingNameFromEnvironment) (Tcl_DString *bufPtr); /* 572 */
+    int (*tcl_PkgRequireProc) (Tcl_Interp *interp, const char *name, int objc, Tcl_Obj *const objv[], void *clientDataPtr); /* 573 */
+    void (*tcl_AppendObjToErrorInfo) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 574 */
+    void (*tcl_AppendLimitedToObj) (Tcl_Obj *objPtr, const char *bytes, int length, int limit, const char *ellipsis); /* 575 */
+    Tcl_Obj * (*tcl_Format) (Tcl_Interp *interp, const char *format, int objc, Tcl_Obj *const objv[]); /* 576 */
+    int (*tcl_AppendFormatToObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, const char *format, int objc, Tcl_Obj *const objv[]); /* 577 */
+    Tcl_Obj * (*tcl_ObjPrintf) (const char *format, ...) TCL_FORMAT_PRINTF(1, 2); /* 578 */
+    void (*tcl_AppendPrintfToObj) (Tcl_Obj *objPtr, const char *format, ...) TCL_FORMAT_PRINTF(2, 3); /* 579 */
+    int (*tcl_CancelEval) (Tcl_Interp *interp, Tcl_Obj *resultObjPtr, ClientData clientData, int flags); /* 580 */
+    int (*tcl_Canceled) (Tcl_Interp *interp, int flags); /* 581 */
+    int (*tcl_CreatePipe) (Tcl_Interp *interp, Tcl_Channel *rchan, Tcl_Channel *wchan, int flags); /* 582 */
+    Tcl_Command (*tcl_NRCreateCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc *proc, Tcl_ObjCmdProc *nreProc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc); /* 583 */
+    int (*tcl_NREvalObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 584 */
+    int (*tcl_NREvalObjv) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], int flags); /* 585 */
+    int (*tcl_NRCmdSwap) (Tcl_Interp *interp, Tcl_Command cmd, int objc, Tcl_Obj *const objv[], int flags); /* 586 */
+    void (*tcl_NRAddCallback) (Tcl_Interp *interp, Tcl_NRPostProc *postProcPtr, ClientData data0, ClientData data1, ClientData data2, ClientData data3); /* 587 */
+    int (*tcl_NRCallObjProc) (Tcl_Interp *interp, Tcl_ObjCmdProc *objProc, ClientData clientData, int objc, Tcl_Obj *const objv[]); /* 588 */
+    unsigned (*tcl_GetFSDeviceFromStat) (const Tcl_StatBuf *statPtr); /* 589 */
+    unsigned (*tcl_GetFSInodeFromStat) (const Tcl_StatBuf *statPtr); /* 590 */
+    unsigned (*tcl_GetModeFromStat) (const Tcl_StatBuf *statPtr); /* 591 */
+    int (*tcl_GetLinkCountFromStat) (const Tcl_StatBuf *statPtr); /* 592 */
+    int (*tcl_GetUserIdFromStat) (const Tcl_StatBuf *statPtr); /* 593 */
+    int (*tcl_GetGroupIdFromStat) (const Tcl_StatBuf *statPtr); /* 594 */
+    int (*tcl_GetDeviceTypeFromStat) (const Tcl_StatBuf *statPtr); /* 595 */
+    Tcl_WideInt (*tcl_GetAccessTimeFromStat) (const Tcl_StatBuf *statPtr); /* 596 */
+    Tcl_WideInt (*tcl_GetModificationTimeFromStat) (const Tcl_StatBuf *statPtr); /* 597 */
+    Tcl_WideInt (*tcl_GetChangeTimeFromStat) (const Tcl_StatBuf *statPtr); /* 598 */
+    Tcl_WideUInt (*tcl_GetSizeFromStat) (const Tcl_StatBuf *statPtr); /* 599 */
+    Tcl_WideUInt (*tcl_GetBlocksFromStat) (const Tcl_StatBuf *statPtr); /* 600 */
+    unsigned (*tcl_GetBlockSizeFromStat) (const Tcl_StatBuf *statPtr); /* 601 */
+    int (*tcl_SetEnsembleParameterList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *paramList); /* 602 */
+    int (*tcl_GetEnsembleParameterList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **paramListPtr); /* 603 */
+    int (*tcl_ParseArgsObjv) (Tcl_Interp *interp, const Tcl_ArgvInfo *argTable, int *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv); /* 604 */
+    int (*tcl_GetErrorLine) (Tcl_Interp *interp); /* 605 */
+    void (*tcl_SetErrorLine) (Tcl_Interp *interp, int lineNum); /* 606 */
+    void (*tcl_TransferResult) (Tcl_Interp *sourceInterp, int result, Tcl_Interp *targetInterp); /* 607 */
+    int (*tcl_InterpActive) (Tcl_Interp *interp); /* 608 */
+    void (*tcl_BackgroundException) (Tcl_Interp *interp, int code); /* 609 */
+    int (*tcl_ZlibDeflate) (Tcl_Interp *interp, int format, Tcl_Obj *data, int level, Tcl_Obj *gzipHeaderDictObj); /* 610 */
+    int (*tcl_ZlibInflate) (Tcl_Interp *interp, int format, Tcl_Obj *data, int buffersize, Tcl_Obj *gzipHeaderDictObj); /* 611 */
+    unsigned int (*tcl_ZlibCRC32) (unsigned int crc, const unsigned char *buf, int len); /* 612 */
+    unsigned int (*tcl_ZlibAdler32) (unsigned int adler, const unsigned char *buf, int len); /* 613 */
+    int (*tcl_ZlibStreamInit) (Tcl_Interp *interp, int mode, int format, int level, Tcl_Obj *dictObj, Tcl_ZlibStream *zshandle); /* 614 */
+    Tcl_Obj * (*tcl_ZlibStreamGetCommandName) (Tcl_ZlibStream zshandle); /* 615 */
+    int (*tcl_ZlibStreamEof) (Tcl_ZlibStream zshandle); /* 616 */
+    int (*tcl_ZlibStreamChecksum) (Tcl_ZlibStream zshandle); /* 617 */
+    int (*tcl_ZlibStreamPut) (Tcl_ZlibStream zshandle, Tcl_Obj *data, int flush); /* 618 */
+    int (*tcl_ZlibStreamGet) (Tcl_ZlibStream zshandle, Tcl_Obj *data, int count); /* 619 */
+    int (*tcl_ZlibStreamClose) (Tcl_ZlibStream zshandle); /* 620 */
+    int (*tcl_ZlibStreamReset) (Tcl_ZlibStream zshandle); /* 621 */
+    void (*tcl_SetStartupScript) (Tcl_Obj *path, const char *encoding); /* 622 */
+    Tcl_Obj * (*tcl_GetStartupScript) (const char **encodingPtr); /* 623 */
+    int (*tcl_CloseEx) (Tcl_Interp *interp, Tcl_Channel chan, int flags); /* 624 */
+    int (*tcl_NRExprObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Obj *resultPtr); /* 625 */
+    int (*tcl_NRSubstObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 626 */
+    int (*tcl_LoadFile) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *const symv[], int flags, void *procPtrs, Tcl_LoadHandle *handlePtr); /* 627 */
+    void * (*tcl_FindSymbol) (Tcl_Interp *interp, Tcl_LoadHandle handle, const char *symbol); /* 628 */
+    int (*tcl_FSUnloadFile) (Tcl_Interp *interp, Tcl_LoadHandle handlePtr); /* 629 */
+    void (*tcl_ZlibStreamSetCompressionDictionary) (Tcl_ZlibStream zhandle, Tcl_Obj *compressionDictionaryObj); /* 630 */
+} TclStubs;
+
+extern const TclStubs *tclStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_TCL_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+#define Tcl_PkgProvideEx \
+	(tclStubsPtr->tcl_PkgProvideEx) /* 0 */
+#define Tcl_PkgRequireEx \
+	(tclStubsPtr->tcl_PkgRequireEx) /* 1 */
+#define Tcl_Panic \
+	(tclStubsPtr->tcl_Panic) /* 2 */
+#define Tcl_Alloc \
+	(tclStubsPtr->tcl_Alloc) /* 3 */
+#define Tcl_Free \
+	(tclStubsPtr->tcl_Free) /* 4 */
+#define Tcl_Realloc \
+	(tclStubsPtr->tcl_Realloc) /* 5 */
+#define Tcl_DbCkalloc \
+	(tclStubsPtr->tcl_DbCkalloc) /* 6 */
+#define Tcl_DbCkfree \
+	(tclStubsPtr->tcl_DbCkfree) /* 7 */
+#define Tcl_DbCkrealloc \
+	(tclStubsPtr->tcl_DbCkrealloc) /* 8 */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+#define Tcl_CreateFileHandler \
+	(tclStubsPtr->tcl_CreateFileHandler) /* 9 */
+#endif /* UNIX */
+#ifdef MAC_OSX_TCL /* MACOSX */
+#define Tcl_CreateFileHandler \
+	(tclStubsPtr->tcl_CreateFileHandler) /* 9 */
+#endif /* MACOSX */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+#define Tcl_DeleteFileHandler \
+	(tclStubsPtr->tcl_DeleteFileHandler) /* 10 */
+#endif /* UNIX */
+#ifdef MAC_OSX_TCL /* MACOSX */
+#define Tcl_DeleteFileHandler \
+	(tclStubsPtr->tcl_DeleteFileHandler) /* 10 */
+#endif /* MACOSX */
+#define Tcl_SetTimer \
+	(tclStubsPtr->tcl_SetTimer) /* 11 */
+#define Tcl_Sleep \
+	(tclStubsPtr->tcl_Sleep) /* 12 */
+#define Tcl_WaitForEvent \
+	(tclStubsPtr->tcl_WaitForEvent) /* 13 */
+#define Tcl_AppendAllObjTypes \
+	(tclStubsPtr->tcl_AppendAllObjTypes) /* 14 */
+#define Tcl_AppendStringsToObj \
+	(tclStubsPtr->tcl_AppendStringsToObj) /* 15 */
+#define Tcl_AppendToObj \
+	(tclStubsPtr->tcl_AppendToObj) /* 16 */
+#define Tcl_ConcatObj \
+	(tclStubsPtr->tcl_ConcatObj) /* 17 */
+#define Tcl_ConvertToType \
+	(tclStubsPtr->tcl_ConvertToType) /* 18 */
+#define Tcl_DbDecrRefCount \
+	(tclStubsPtr->tcl_DbDecrRefCount) /* 19 */
+#define Tcl_DbIncrRefCount \
+	(tclStubsPtr->tcl_DbIncrRefCount) /* 20 */
+#define Tcl_DbIsShared \
+	(tclStubsPtr->tcl_DbIsShared) /* 21 */
+#define Tcl_DbNewBooleanObj \
+	(tclStubsPtr->tcl_DbNewBooleanObj) /* 22 */
+#define Tcl_DbNewByteArrayObj \
+	(tclStubsPtr->tcl_DbNewByteArrayObj) /* 23 */
+#define Tcl_DbNewDoubleObj \
+	(tclStubsPtr->tcl_DbNewDoubleObj) /* 24 */
+#define Tcl_DbNewListObj \
+	(tclStubsPtr->tcl_DbNewListObj) /* 25 */
+#define Tcl_DbNewLongObj \
+	(tclStubsPtr->tcl_DbNewLongObj) /* 26 */
+#define Tcl_DbNewObj \
+	(tclStubsPtr->tcl_DbNewObj) /* 27 */
+#define Tcl_DbNewStringObj \
+	(tclStubsPtr->tcl_DbNewStringObj) /* 28 */
+#define Tcl_DuplicateObj \
+	(tclStubsPtr->tcl_DuplicateObj) /* 29 */
+#define TclFreeObj \
+	(tclStubsPtr->tclFreeObj) /* 30 */
+#define Tcl_GetBoolean \
+	(tclStubsPtr->tcl_GetBoolean) /* 31 */
+#define Tcl_GetBooleanFromObj \
+	(tclStubsPtr->tcl_GetBooleanFromObj) /* 32 */
+#define Tcl_GetByteArrayFromObj \
+	(tclStubsPtr->tcl_GetByteArrayFromObj) /* 33 */
+#define Tcl_GetDouble \
+	(tclStubsPtr->tcl_GetDouble) /* 34 */
+#define Tcl_GetDoubleFromObj \
+	(tclStubsPtr->tcl_GetDoubleFromObj) /* 35 */
+#define Tcl_GetIndexFromObj \
+	(tclStubsPtr->tcl_GetIndexFromObj) /* 36 */
+#define Tcl_GetInt \
+	(tclStubsPtr->tcl_GetInt) /* 37 */
+#define Tcl_GetIntFromObj \
+	(tclStubsPtr->tcl_GetIntFromObj) /* 38 */
+#define Tcl_GetLongFromObj \
+	(tclStubsPtr->tcl_GetLongFromObj) /* 39 */
+#define Tcl_GetObjType \
+	(tclStubsPtr->tcl_GetObjType) /* 40 */
+#define Tcl_GetStringFromObj \
+	(tclStubsPtr->tcl_GetStringFromObj) /* 41 */
+#define Tcl_InvalidateStringRep \
+	(tclStubsPtr->tcl_InvalidateStringRep) /* 42 */
+#define Tcl_ListObjAppendList \
+	(tclStubsPtr->tcl_ListObjAppendList) /* 43 */
+#define Tcl_ListObjAppendElement \
+	(tclStubsPtr->tcl_ListObjAppendElement) /* 44 */
+#define Tcl_ListObjGetElements \
+	(tclStubsPtr->tcl_ListObjGetElements) /* 45 */
+#define Tcl_ListObjIndex \
+	(tclStubsPtr->tcl_ListObjIndex) /* 46 */
+#define Tcl_ListObjLength \
+	(tclStubsPtr->tcl_ListObjLength) /* 47 */
+#define Tcl_ListObjReplace \
+	(tclStubsPtr->tcl_ListObjReplace) /* 48 */
+#define Tcl_NewBooleanObj \
+	(tclStubsPtr->tcl_NewBooleanObj) /* 49 */
+#define Tcl_NewByteArrayObj \
+	(tclStubsPtr->tcl_NewByteArrayObj) /* 50 */
+#define Tcl_NewDoubleObj \
+	(tclStubsPtr->tcl_NewDoubleObj) /* 51 */
+#define Tcl_NewIntObj \
+	(tclStubsPtr->tcl_NewIntObj) /* 52 */
+#define Tcl_NewListObj \
+	(tclStubsPtr->tcl_NewListObj) /* 53 */
+#define Tcl_NewLongObj \
+	(tclStubsPtr->tcl_NewLongObj) /* 54 */
+#define Tcl_NewObj \
+	(tclStubsPtr->tcl_NewObj) /* 55 */
+#define Tcl_NewStringObj \
+	(tclStubsPtr->tcl_NewStringObj) /* 56 */
+#define Tcl_SetBooleanObj \
+	(tclStubsPtr->tcl_SetBooleanObj) /* 57 */
+#define Tcl_SetByteArrayLength \
+	(tclStubsPtr->tcl_SetByteArrayLength) /* 58 */
+#define Tcl_SetByteArrayObj \
+	(tclStubsPtr->tcl_SetByteArrayObj) /* 59 */
+#define Tcl_SetDoubleObj \
+	(tclStubsPtr->tcl_SetDoubleObj) /* 60 */
+#define Tcl_SetIntObj \
+	(tclStubsPtr->tcl_SetIntObj) /* 61 */
+#define Tcl_SetListObj \
+	(tclStubsPtr->tcl_SetListObj) /* 62 */
+#define Tcl_SetLongObj \
+	(tclStubsPtr->tcl_SetLongObj) /* 63 */
+#define Tcl_SetObjLength \
+	(tclStubsPtr->tcl_SetObjLength) /* 64 */
+#define Tcl_SetStringObj \
+	(tclStubsPtr->tcl_SetStringObj) /* 65 */
+#define Tcl_AddErrorInfo \
+	(tclStubsPtr->tcl_AddErrorInfo) /* 66 */
+#define Tcl_AddObjErrorInfo \
+	(tclStubsPtr->tcl_AddObjErrorInfo) /* 67 */
+#define Tcl_AllowExceptions \
+	(tclStubsPtr->tcl_AllowExceptions) /* 68 */
+#define Tcl_AppendElement \
+	(tclStubsPtr->tcl_AppendElement) /* 69 */
+#define Tcl_AppendResult \
+	(tclStubsPtr->tcl_AppendResult) /* 70 */
+#define Tcl_AsyncCreate \
+	(tclStubsPtr->tcl_AsyncCreate) /* 71 */
+#define Tcl_AsyncDelete \
+	(tclStubsPtr->tcl_AsyncDelete) /* 72 */
+#define Tcl_AsyncInvoke \
+	(tclStubsPtr->tcl_AsyncInvoke) /* 73 */
+#define Tcl_AsyncMark \
+	(tclStubsPtr->tcl_AsyncMark) /* 74 */
+#define Tcl_AsyncReady \
+	(tclStubsPtr->tcl_AsyncReady) /* 75 */
+#define Tcl_BackgroundError \
+	(tclStubsPtr->tcl_BackgroundError) /* 76 */
+#define Tcl_Backslash \
+	(tclStubsPtr->tcl_Backslash) /* 77 */
+#define Tcl_BadChannelOption \
+	(tclStubsPtr->tcl_BadChannelOption) /* 78 */
+#define Tcl_CallWhenDeleted \
+	(tclStubsPtr->tcl_CallWhenDeleted) /* 79 */
+#define Tcl_CancelIdleCall \
+	(tclStubsPtr->tcl_CancelIdleCall) /* 80 */
+#define Tcl_Close \
+	(tclStubsPtr->tcl_Close) /* 81 */
+#define Tcl_CommandComplete \
+	(tclStubsPtr->tcl_CommandComplete) /* 82 */
+#define Tcl_Concat \
+	(tclStubsPtr->tcl_Concat) /* 83 */
+#define Tcl_ConvertElement \
+	(tclStubsPtr->tcl_ConvertElement) /* 84 */
+#define Tcl_ConvertCountedElement \
+	(tclStubsPtr->tcl_ConvertCountedElement) /* 85 */
+#define Tcl_CreateAlias \
+	(tclStubsPtr->tcl_CreateAlias) /* 86 */
+#define Tcl_CreateAliasObj \
+	(tclStubsPtr->tcl_CreateAliasObj) /* 87 */
+#define Tcl_CreateChannel \
+	(tclStubsPtr->tcl_CreateChannel) /* 88 */
+#define Tcl_CreateChannelHandler \
+	(tclStubsPtr->tcl_CreateChannelHandler) /* 89 */
+#define Tcl_CreateCloseHandler \
+	(tclStubsPtr->tcl_CreateCloseHandler) /* 90 */
+#define Tcl_CreateCommand \
+	(tclStubsPtr->tcl_CreateCommand) /* 91 */
+#define Tcl_CreateEventSource \
+	(tclStubsPtr->tcl_CreateEventSource) /* 92 */
+#define Tcl_CreateExitHandler \
+	(tclStubsPtr->tcl_CreateExitHandler) /* 93 */
+#define Tcl_CreateInterp \
+	(tclStubsPtr->tcl_CreateInterp) /* 94 */
+#define Tcl_CreateMathFunc \
+	(tclStubsPtr->tcl_CreateMathFunc) /* 95 */
+#define Tcl_CreateObjCommand \
+	(tclStubsPtr->tcl_CreateObjCommand) /* 96 */
+#define Tcl_CreateSlave \
+	(tclStubsPtr->tcl_CreateSlave) /* 97 */
+#define Tcl_CreateTimerHandler \
+	(tclStubsPtr->tcl_CreateTimerHandler) /* 98 */
+#define Tcl_CreateTrace \
+	(tclStubsPtr->tcl_CreateTrace) /* 99 */
+#define Tcl_DeleteAssocData \
+	(tclStubsPtr->tcl_DeleteAssocData) /* 100 */
+#define Tcl_DeleteChannelHandler \
+	(tclStubsPtr->tcl_DeleteChannelHandler) /* 101 */
+#define Tcl_DeleteCloseHandler \
+	(tclStubsPtr->tcl_DeleteCloseHandler) /* 102 */
+#define Tcl_DeleteCommand \
+	(tclStubsPtr->tcl_DeleteCommand) /* 103 */
+#define Tcl_DeleteCommandFromToken \
+	(tclStubsPtr->tcl_DeleteCommandFromToken) /* 104 */
+#define Tcl_DeleteEvents \
+	(tclStubsPtr->tcl_DeleteEvents) /* 105 */
+#define Tcl_DeleteEventSource \
+	(tclStubsPtr->tcl_DeleteEventSource) /* 106 */
+#define Tcl_DeleteExitHandler \
+	(tclStubsPtr->tcl_DeleteExitHandler) /* 107 */
+#define Tcl_DeleteHashEntry \
+	(tclStubsPtr->tcl_DeleteHashEntry) /* 108 */
+#define Tcl_DeleteHashTable \
+	(tclStubsPtr->tcl_DeleteHashTable) /* 109 */
+#define Tcl_DeleteInterp \
+	(tclStubsPtr->tcl_DeleteInterp) /* 110 */
+#define Tcl_DetachPids \
+	(tclStubsPtr->tcl_DetachPids) /* 111 */
+#define Tcl_DeleteTimerHandler \
+	(tclStubsPtr->tcl_DeleteTimerHandler) /* 112 */
+#define Tcl_DeleteTrace \
+	(tclStubsPtr->tcl_DeleteTrace) /* 113 */
+#define Tcl_DontCallWhenDeleted \
+	(tclStubsPtr->tcl_DontCallWhenDeleted) /* 114 */
+#define Tcl_DoOneEvent \
+	(tclStubsPtr->tcl_DoOneEvent) /* 115 */
+#define Tcl_DoWhenIdle \
+	(tclStubsPtr->tcl_DoWhenIdle) /* 116 */
+#define Tcl_DStringAppend \
+	(tclStubsPtr->tcl_DStringAppend) /* 117 */
+#define Tcl_DStringAppendElement \
+	(tclStubsPtr->tcl_DStringAppendElement) /* 118 */
+#define Tcl_DStringEndSublist \
+	(tclStubsPtr->tcl_DStringEndSublist) /* 119 */
+#define Tcl_DStringFree \
+	(tclStubsPtr->tcl_DStringFree) /* 120 */
+#define Tcl_DStringGetResult \
+	(tclStubsPtr->tcl_DStringGetResult) /* 121 */
+#define Tcl_DStringInit \
+	(tclStubsPtr->tcl_DStringInit) /* 122 */
+#define Tcl_DStringResult \
+	(tclStubsPtr->tcl_DStringResult) /* 123 */
+#define Tcl_DStringSetLength \
+	(tclStubsPtr->tcl_DStringSetLength) /* 124 */
+#define Tcl_DStringStartSublist \
+	(tclStubsPtr->tcl_DStringStartSublist) /* 125 */
+#define Tcl_Eof \
+	(tclStubsPtr->tcl_Eof) /* 126 */
+#define Tcl_ErrnoId \
+	(tclStubsPtr->tcl_ErrnoId) /* 127 */
+#define Tcl_ErrnoMsg \
+	(tclStubsPtr->tcl_ErrnoMsg) /* 128 */
+#define Tcl_Eval \
+	(tclStubsPtr->tcl_Eval) /* 129 */
+#define Tcl_EvalFile \
+	(tclStubsPtr->tcl_EvalFile) /* 130 */
+#define Tcl_EvalObj \
+	(tclStubsPtr->tcl_EvalObj) /* 131 */
+#define Tcl_EventuallyFree \
+	(tclStubsPtr->tcl_EventuallyFree) /* 132 */
+#define Tcl_Exit \
+	(tclStubsPtr->tcl_Exit) /* 133 */
+#define Tcl_ExposeCommand \
+	(tclStubsPtr->tcl_ExposeCommand) /* 134 */
+#define Tcl_ExprBoolean \
+	(tclStubsPtr->tcl_ExprBoolean) /* 135 */
+#define Tcl_ExprBooleanObj \
+	(tclStubsPtr->tcl_ExprBooleanObj) /* 136 */
+#define Tcl_ExprDouble \
+	(tclStubsPtr->tcl_ExprDouble) /* 137 */
+#define Tcl_ExprDoubleObj \
+	(tclStubsPtr->tcl_ExprDoubleObj) /* 138 */
+#define Tcl_ExprLong \
+	(tclStubsPtr->tcl_ExprLong) /* 139 */
+#define Tcl_ExprLongObj \
+	(tclStubsPtr->tcl_ExprLongObj) /* 140 */
+#define Tcl_ExprObj \
+	(tclStubsPtr->tcl_ExprObj) /* 141 */
+#define Tcl_ExprString \
+	(tclStubsPtr->tcl_ExprString) /* 142 */
+#define Tcl_Finalize \
+	(tclStubsPtr->tcl_Finalize) /* 143 */
+#define Tcl_FindExecutable \
+	(tclStubsPtr->tcl_FindExecutable) /* 144 */
+#define Tcl_FirstHashEntry \
+	(tclStubsPtr->tcl_FirstHashEntry) /* 145 */
+#define Tcl_Flush \
+	(tclStubsPtr->tcl_Flush) /* 146 */
+#define Tcl_FreeResult \
+	(tclStubsPtr->tcl_FreeResult) /* 147 */
+#define Tcl_GetAlias \
+	(tclStubsPtr->tcl_GetAlias) /* 148 */
+#define Tcl_GetAliasObj \
+	(tclStubsPtr->tcl_GetAliasObj) /* 149 */
+#define Tcl_GetAssocData \
+	(tclStubsPtr->tcl_GetAssocData) /* 150 */
+#define Tcl_GetChannel \
+	(tclStubsPtr->tcl_GetChannel) /* 151 */
+#define Tcl_GetChannelBufferSize \
+	(tclStubsPtr->tcl_GetChannelBufferSize) /* 152 */
+#define Tcl_GetChannelHandle \
+	(tclStubsPtr->tcl_GetChannelHandle) /* 153 */
+#define Tcl_GetChannelInstanceData \
+	(tclStubsPtr->tcl_GetChannelInstanceData) /* 154 */
+#define Tcl_GetChannelMode \
+	(tclStubsPtr->tcl_GetChannelMode) /* 155 */
+#define Tcl_GetChannelName \
+	(tclStubsPtr->tcl_GetChannelName) /* 156 */
+#define Tcl_GetChannelOption \
+	(tclStubsPtr->tcl_GetChannelOption) /* 157 */
+#define Tcl_GetChannelType \
+	(tclStubsPtr->tcl_GetChannelType) /* 158 */
+#define Tcl_GetCommandInfo \
+	(tclStubsPtr->tcl_GetCommandInfo) /* 159 */
+#define Tcl_GetCommandName \
+	(tclStubsPtr->tcl_GetCommandName) /* 160 */
+#define Tcl_GetErrno \
+	(tclStubsPtr->tcl_GetErrno) /* 161 */
+#define Tcl_GetHostName \
+	(tclStubsPtr->tcl_GetHostName) /* 162 */
+#define Tcl_GetInterpPath \
+	(tclStubsPtr->tcl_GetInterpPath) /* 163 */
+#define Tcl_GetMaster \
+	(tclStubsPtr->tcl_GetMaster) /* 164 */
+#define Tcl_GetNameOfExecutable \
+	(tclStubsPtr->tcl_GetNameOfExecutable) /* 165 */
+#define Tcl_GetObjResult \
+	(tclStubsPtr->tcl_GetObjResult) /* 166 */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+#define Tcl_GetOpenFile \
+	(tclStubsPtr->tcl_GetOpenFile) /* 167 */
+#endif /* UNIX */
+#ifdef MAC_OSX_TCL /* MACOSX */
+#define Tcl_GetOpenFile \
+	(tclStubsPtr->tcl_GetOpenFile) /* 167 */
+#endif /* MACOSX */
+#define Tcl_GetPathType \
+	(tclStubsPtr->tcl_GetPathType) /* 168 */
+#define Tcl_Gets \
+	(tclStubsPtr->tcl_Gets) /* 169 */
+#define Tcl_GetsObj \
+	(tclStubsPtr->tcl_GetsObj) /* 170 */
+#define Tcl_GetServiceMode \
+	(tclStubsPtr->tcl_GetServiceMode) /* 171 */
+#define Tcl_GetSlave \
+	(tclStubsPtr->tcl_GetSlave) /* 172 */
+#define Tcl_GetStdChannel \
+	(tclStubsPtr->tcl_GetStdChannel) /* 173 */
+#define Tcl_GetStringResult \
+	(tclStubsPtr->tcl_GetStringResult) /* 174 */
+#define Tcl_GetVar \
+	(tclStubsPtr->tcl_GetVar) /* 175 */
+#define Tcl_GetVar2 \
+	(tclStubsPtr->tcl_GetVar2) /* 176 */
+#define Tcl_GlobalEval \
+	(tclStubsPtr->tcl_GlobalEval) /* 177 */
+#define Tcl_GlobalEvalObj \
+	(tclStubsPtr->tcl_GlobalEvalObj) /* 178 */
+#define Tcl_HideCommand \
+	(tclStubsPtr->tcl_HideCommand) /* 179 */
+#define Tcl_Init \
+	(tclStubsPtr->tcl_Init) /* 180 */
+#define Tcl_InitHashTable \
+	(tclStubsPtr->tcl_InitHashTable) /* 181 */
+#define Tcl_InputBlocked \
+	(tclStubsPtr->tcl_InputBlocked) /* 182 */
+#define Tcl_InputBuffered \
+	(tclStubsPtr->tcl_InputBuffered) /* 183 */
+#define Tcl_InterpDeleted \
+	(tclStubsPtr->tcl_InterpDeleted) /* 184 */
+#define Tcl_IsSafe \
+	(tclStubsPtr->tcl_IsSafe) /* 185 */
+#define Tcl_JoinPath \
+	(tclStubsPtr->tcl_JoinPath) /* 186 */
+#define Tcl_LinkVar \
+	(tclStubsPtr->tcl_LinkVar) /* 187 */
+/* Slot 188 is reserved */
+#define Tcl_MakeFileChannel \
+	(tclStubsPtr->tcl_MakeFileChannel) /* 189 */
+#define Tcl_MakeSafe \
+	(tclStubsPtr->tcl_MakeSafe) /* 190 */
+#define Tcl_MakeTcpClientChannel \
+	(tclStubsPtr->tcl_MakeTcpClientChannel) /* 191 */
+#define Tcl_Merge \
+	(tclStubsPtr->tcl_Merge) /* 192 */
+#define Tcl_NextHashEntry \
+	(tclStubsPtr->tcl_NextHashEntry) /* 193 */
+#define Tcl_NotifyChannel \
+	(tclStubsPtr->tcl_NotifyChannel) /* 194 */
+#define Tcl_ObjGetVar2 \
+	(tclStubsPtr->tcl_ObjGetVar2) /* 195 */
+#define Tcl_ObjSetVar2 \
+	(tclStubsPtr->tcl_ObjSetVar2) /* 196 */
+#define Tcl_OpenCommandChannel \
+	(tclStubsPtr->tcl_OpenCommandChannel) /* 197 */
+#define Tcl_OpenFileChannel \
+	(tclStubsPtr->tcl_OpenFileChannel) /* 198 */
+#define Tcl_OpenTcpClient \
+	(tclStubsPtr->tcl_OpenTcpClient) /* 199 */
+#define Tcl_OpenTcpServer \
+	(tclStubsPtr->tcl_OpenTcpServer) /* 200 */
+#define Tcl_Preserve \
+	(tclStubsPtr->tcl_Preserve) /* 201 */
+#define Tcl_PrintDouble \
+	(tclStubsPtr->tcl_PrintDouble) /* 202 */
+#define Tcl_PutEnv \
+	(tclStubsPtr->tcl_PutEnv) /* 203 */
+#define Tcl_PosixError \
+	(tclStubsPtr->tcl_PosixError) /* 204 */
+#define Tcl_QueueEvent \
+	(tclStubsPtr->tcl_QueueEvent) /* 205 */
+#define Tcl_Read \
+	(tclStubsPtr->tcl_Read) /* 206 */
+#define Tcl_ReapDetachedProcs \
+	(tclStubsPtr->tcl_ReapDetachedProcs) /* 207 */
+#define Tcl_RecordAndEval \
+	(tclStubsPtr->tcl_RecordAndEval) /* 208 */
+#define Tcl_RecordAndEvalObj \
+	(tclStubsPtr->tcl_RecordAndEvalObj) /* 209 */
+#define Tcl_RegisterChannel \
+	(tclStubsPtr->tcl_RegisterChannel) /* 210 */
+#define Tcl_RegisterObjType \
+	(tclStubsPtr->tcl_RegisterObjType) /* 211 */
+#define Tcl_RegExpCompile \
+	(tclStubsPtr->tcl_RegExpCompile) /* 212 */
+#define Tcl_RegExpExec \
+	(tclStubsPtr->tcl_RegExpExec) /* 213 */
+#define Tcl_RegExpMatch \
+	(tclStubsPtr->tcl_RegExpMatch) /* 214 */
+#define Tcl_RegExpRange \
+	(tclStubsPtr->tcl_RegExpRange) /* 215 */
+#define Tcl_Release \
+	(tclStubsPtr->tcl_Release) /* 216 */
+#define Tcl_ResetResult \
+	(tclStubsPtr->tcl_ResetResult) /* 217 */
+#define Tcl_ScanElement \
+	(tclStubsPtr->tcl_ScanElement) /* 218 */
+#define Tcl_ScanCountedElement \
+	(tclStubsPtr->tcl_ScanCountedElement) /* 219 */
+#define Tcl_SeekOld \
+	(tclStubsPtr->tcl_SeekOld) /* 220 */
+#define Tcl_ServiceAll \
+	(tclStubsPtr->tcl_ServiceAll) /* 221 */
+#define Tcl_ServiceEvent \
+	(tclStubsPtr->tcl_ServiceEvent) /* 222 */
+#define Tcl_SetAssocData \
+	(tclStubsPtr->tcl_SetAssocData) /* 223 */
+#define Tcl_SetChannelBufferSize \
+	(tclStubsPtr->tcl_SetChannelBufferSize) /* 224 */
+#define Tcl_SetChannelOption \
+	(tclStubsPtr->tcl_SetChannelOption) /* 225 */
+#define Tcl_SetCommandInfo \
+	(tclStubsPtr->tcl_SetCommandInfo) /* 226 */
+#define Tcl_SetErrno \
+	(tclStubsPtr->tcl_SetErrno) /* 227 */
+#define Tcl_SetErrorCode \
+	(tclStubsPtr->tcl_SetErrorCode) /* 228 */
+#define Tcl_SetMaxBlockTime \
+	(tclStubsPtr->tcl_SetMaxBlockTime) /* 229 */
+#define Tcl_SetPanicProc \
+	(tclStubsPtr->tcl_SetPanicProc) /* 230 */
+#define Tcl_SetRecursionLimit \
+	(tclStubsPtr->tcl_SetRecursionLimit) /* 231 */
+#define Tcl_SetResult \
+	(tclStubsPtr->tcl_SetResult) /* 232 */
+#define Tcl_SetServiceMode \
+	(tclStubsPtr->tcl_SetServiceMode) /* 233 */
+#define Tcl_SetObjErrorCode \
+	(tclStubsPtr->tcl_SetObjErrorCode) /* 234 */
+#define Tcl_SetObjResult \
+	(tclStubsPtr->tcl_SetObjResult) /* 235 */
+#define Tcl_SetStdChannel \
+	(tclStubsPtr->tcl_SetStdChannel) /* 236 */
+#define Tcl_SetVar \
+	(tclStubsPtr->tcl_SetVar) /* 237 */
+#define Tcl_SetVar2 \
+	(tclStubsPtr->tcl_SetVar2) /* 238 */
+#define Tcl_SignalId \
+	(tclStubsPtr->tcl_SignalId) /* 239 */
+#define Tcl_SignalMsg \
+	(tclStubsPtr->tcl_SignalMsg) /* 240 */
+#define Tcl_SourceRCFile \
+	(tclStubsPtr->tcl_SourceRCFile) /* 241 */
+#define Tcl_SplitList \
+	(tclStubsPtr->tcl_SplitList) /* 242 */
+#define Tcl_SplitPath \
+	(tclStubsPtr->tcl_SplitPath) /* 243 */
+#define Tcl_StaticPackage \
+	(tclStubsPtr->tcl_StaticPackage) /* 244 */
+#define Tcl_StringMatch \
+	(tclStubsPtr->tcl_StringMatch) /* 245 */
+#define Tcl_TellOld \
+	(tclStubsPtr->tcl_TellOld) /* 246 */
+#define Tcl_TraceVar \
+	(tclStubsPtr->tcl_TraceVar) /* 247 */
+#define Tcl_TraceVar2 \
+	(tclStubsPtr->tcl_TraceVar2) /* 248 */
+#define Tcl_TranslateFileName \
+	(tclStubsPtr->tcl_TranslateFileName) /* 249 */
+#define Tcl_Ungets \
+	(tclStubsPtr->tcl_Ungets) /* 250 */
+#define Tcl_UnlinkVar \
+	(tclStubsPtr->tcl_UnlinkVar) /* 251 */
+#define Tcl_UnregisterChannel \
+	(tclStubsPtr->tcl_UnregisterChannel) /* 252 */
+#define Tcl_UnsetVar \
+	(tclStubsPtr->tcl_UnsetVar) /* 253 */
+#define Tcl_UnsetVar2 \
+	(tclStubsPtr->tcl_UnsetVar2) /* 254 */
+#define Tcl_UntraceVar \
+	(tclStubsPtr->tcl_UntraceVar) /* 255 */
+#define Tcl_UntraceVar2 \
+	(tclStubsPtr->tcl_UntraceVar2) /* 256 */
+#define Tcl_UpdateLinkedVar \
+	(tclStubsPtr->tcl_UpdateLinkedVar) /* 257 */
+#define Tcl_UpVar \
+	(tclStubsPtr->tcl_UpVar) /* 258 */
+#define Tcl_UpVar2 \
+	(tclStubsPtr->tcl_UpVar2) /* 259 */
+#define Tcl_VarEval \
+	(tclStubsPtr->tcl_VarEval) /* 260 */
+#define Tcl_VarTraceInfo \
+	(tclStubsPtr->tcl_VarTraceInfo) /* 261 */
+#define Tcl_VarTraceInfo2 \
+	(tclStubsPtr->tcl_VarTraceInfo2) /* 262 */
+#define Tcl_Write \
+	(tclStubsPtr->tcl_Write) /* 263 */
+#define Tcl_WrongNumArgs \
+	(tclStubsPtr->tcl_WrongNumArgs) /* 264 */
+#define Tcl_DumpActiveMemory \
+	(tclStubsPtr->tcl_DumpActiveMemory) /* 265 */
+#define Tcl_ValidateAllMemory \
+	(tclStubsPtr->tcl_ValidateAllMemory) /* 266 */
+#define Tcl_AppendResultVA \
+	(tclStubsPtr->tcl_AppendResultVA) /* 267 */
+#define Tcl_AppendStringsToObjVA \
+	(tclStubsPtr->tcl_AppendStringsToObjVA) /* 268 */
+#define Tcl_HashStats \
+	(tclStubsPtr->tcl_HashStats) /* 269 */
+#define Tcl_ParseVar \
+	(tclStubsPtr->tcl_ParseVar) /* 270 */
+#define Tcl_PkgPresent \
+	(tclStubsPtr->tcl_PkgPresent) /* 271 */
+#define Tcl_PkgPresentEx \
+	(tclStubsPtr->tcl_PkgPresentEx) /* 272 */
+#define Tcl_PkgProvide \
+	(tclStubsPtr->tcl_PkgProvide) /* 273 */
+#define Tcl_PkgRequire \
+	(tclStubsPtr->tcl_PkgRequire) /* 274 */
+#define Tcl_SetErrorCodeVA \
+	(tclStubsPtr->tcl_SetErrorCodeVA) /* 275 */
+#define Tcl_VarEvalVA \
+	(tclStubsPtr->tcl_VarEvalVA) /* 276 */
+#define Tcl_WaitPid \
+	(tclStubsPtr->tcl_WaitPid) /* 277 */
+#define Tcl_PanicVA \
+	(tclStubsPtr->tcl_PanicVA) /* 278 */
+#define Tcl_GetVersion \
+	(tclStubsPtr->tcl_GetVersion) /* 279 */
+#define Tcl_InitMemory \
+	(tclStubsPtr->tcl_InitMemory) /* 280 */
+#define Tcl_StackChannel \
+	(tclStubsPtr->tcl_StackChannel) /* 281 */
+#define Tcl_UnstackChannel \
+	(tclStubsPtr->tcl_UnstackChannel) /* 282 */
+#define Tcl_GetStackedChannel \
+	(tclStubsPtr->tcl_GetStackedChannel) /* 283 */
+#define Tcl_SetMainLoop \
+	(tclStubsPtr->tcl_SetMainLoop) /* 284 */
+/* Slot 285 is reserved */
+#define Tcl_AppendObjToObj \
+	(tclStubsPtr->tcl_AppendObjToObj) /* 286 */
+#define Tcl_CreateEncoding \
+	(tclStubsPtr->tcl_CreateEncoding) /* 287 */
+#define Tcl_CreateThreadExitHandler \
+	(tclStubsPtr->tcl_CreateThreadExitHandler) /* 288 */
+#define Tcl_DeleteThreadExitHandler \
+	(tclStubsPtr->tcl_DeleteThreadExitHandler) /* 289 */
+#define Tcl_DiscardResult \
+	(tclStubsPtr->tcl_DiscardResult) /* 290 */
+#define Tcl_EvalEx \
+	(tclStubsPtr->tcl_EvalEx) /* 291 */
+#define Tcl_EvalObjv \
+	(tclStubsPtr->tcl_EvalObjv) /* 292 */
+#define Tcl_EvalObjEx \
+	(tclStubsPtr->tcl_EvalObjEx) /* 293 */
+#define Tcl_ExitThread \
+	(tclStubsPtr->tcl_ExitThread) /* 294 */
+#define Tcl_ExternalToUtf \
+	(tclStubsPtr->tcl_ExternalToUtf) /* 295 */
+#define Tcl_ExternalToUtfDString \
+	(tclStubsPtr->tcl_ExternalToUtfDString) /* 296 */
+#define Tcl_FinalizeThread \
+	(tclStubsPtr->tcl_FinalizeThread) /* 297 */
+#define Tcl_FinalizeNotifier \
+	(tclStubsPtr->tcl_FinalizeNotifier) /* 298 */
+#define Tcl_FreeEncoding \
+	(tclStubsPtr->tcl_FreeEncoding) /* 299 */
+#define Tcl_GetCurrentThread \
+	(tclStubsPtr->tcl_GetCurrentThread) /* 300 */
+#define Tcl_GetEncoding \
+	(tclStubsPtr->tcl_GetEncoding) /* 301 */
+#define Tcl_GetEncodingName \
+	(tclStubsPtr->tcl_GetEncodingName) /* 302 */
+#define Tcl_GetEncodingNames \
+	(tclStubsPtr->tcl_GetEncodingNames) /* 303 */
+#define Tcl_GetIndexFromObjStruct \
+	(tclStubsPtr->tcl_GetIndexFromObjStruct) /* 304 */
+#define Tcl_GetThreadData \
+	(tclStubsPtr->tcl_GetThreadData) /* 305 */
+#define Tcl_GetVar2Ex \
+	(tclStubsPtr->tcl_GetVar2Ex) /* 306 */
+#define Tcl_InitNotifier \
+	(tclStubsPtr->tcl_InitNotifier) /* 307 */
+#define Tcl_MutexLock \
+	(tclStubsPtr->tcl_MutexLock) /* 308 */
+#define Tcl_MutexUnlock \
+	(tclStubsPtr->tcl_MutexUnlock) /* 309 */
+#define Tcl_ConditionNotify \
+	(tclStubsPtr->tcl_ConditionNotify) /* 310 */
+#define Tcl_ConditionWait \
+	(tclStubsPtr->tcl_ConditionWait) /* 311 */
+#define Tcl_NumUtfChars \
+	(tclStubsPtr->tcl_NumUtfChars) /* 312 */
+#define Tcl_ReadChars \
+	(tclStubsPtr->tcl_ReadChars) /* 313 */
+#define Tcl_RestoreResult \
+	(tclStubsPtr->tcl_RestoreResult) /* 314 */
+#define Tcl_SaveResult \
+	(tclStubsPtr->tcl_SaveResult) /* 315 */
+#define Tcl_SetSystemEncoding \
+	(tclStubsPtr->tcl_SetSystemEncoding) /* 316 */
+#define Tcl_SetVar2Ex \
+	(tclStubsPtr->tcl_SetVar2Ex) /* 317 */
+#define Tcl_ThreadAlert \
+	(tclStubsPtr->tcl_ThreadAlert) /* 318 */
+#define Tcl_ThreadQueueEvent \
+	(tclStubsPtr->tcl_ThreadQueueEvent) /* 319 */
+#define Tcl_UniCharAtIndex \
+	(tclStubsPtr->tcl_UniCharAtIndex) /* 320 */
+#define Tcl_UniCharToLower \
+	(tclStubsPtr->tcl_UniCharToLower) /* 321 */
+#define Tcl_UniCharToTitle \
+	(tclStubsPtr->tcl_UniCharToTitle) /* 322 */
+#define Tcl_UniCharToUpper \
+	(tclStubsPtr->tcl_UniCharToUpper) /* 323 */
+#define Tcl_UniCharToUtf \
+	(tclStubsPtr->tcl_UniCharToUtf) /* 324 */
+#define Tcl_UtfAtIndex \
+	(tclStubsPtr->tcl_UtfAtIndex) /* 325 */
+#define Tcl_UtfCharComplete \
+	(tclStubsPtr->tcl_UtfCharComplete) /* 326 */
+#define Tcl_UtfBackslash \
+	(tclStubsPtr->tcl_UtfBackslash) /* 327 */
+#define Tcl_UtfFindFirst \
+	(tclStubsPtr->tcl_UtfFindFirst) /* 328 */
+#define Tcl_UtfFindLast \
+	(tclStubsPtr->tcl_UtfFindLast) /* 329 */
+#define Tcl_UtfNext \
+	(tclStubsPtr->tcl_UtfNext) /* 330 */
+#define Tcl_UtfPrev \
+	(tclStubsPtr->tcl_UtfPrev) /* 331 */
+#define Tcl_UtfToExternal \
+	(tclStubsPtr->tcl_UtfToExternal) /* 332 */
+#define Tcl_UtfToExternalDString \
+	(tclStubsPtr->tcl_UtfToExternalDString) /* 333 */
+#define Tcl_UtfToLower \
+	(tclStubsPtr->tcl_UtfToLower) /* 334 */
+#define Tcl_UtfToTitle \
+	(tclStubsPtr->tcl_UtfToTitle) /* 335 */
+#define Tcl_UtfToUniChar \
+	(tclStubsPtr->tcl_UtfToUniChar) /* 336 */
+#define Tcl_UtfToUpper \
+	(tclStubsPtr->tcl_UtfToUpper) /* 337 */
+#define Tcl_WriteChars \
+	(tclStubsPtr->tcl_WriteChars) /* 338 */
+#define Tcl_WriteObj \
+	(tclStubsPtr->tcl_WriteObj) /* 339 */
+#define Tcl_GetString \
+	(tclStubsPtr->tcl_GetString) /* 340 */
+#define Tcl_GetDefaultEncodingDir \
+	(tclStubsPtr->tcl_GetDefaultEncodingDir) /* 341 */
+#define Tcl_SetDefaultEncodingDir \
+	(tclStubsPtr->tcl_SetDefaultEncodingDir) /* 342 */
+#define Tcl_AlertNotifier \
+	(tclStubsPtr->tcl_AlertNotifier) /* 343 */
+#define Tcl_ServiceModeHook \
+	(tclStubsPtr->tcl_ServiceModeHook) /* 344 */
+#define Tcl_UniCharIsAlnum \
+	(tclStubsPtr->tcl_UniCharIsAlnum) /* 345 */
+#define Tcl_UniCharIsAlpha \
+	(tclStubsPtr->tcl_UniCharIsAlpha) /* 346 */
+#define Tcl_UniCharIsDigit \
+	(tclStubsPtr->tcl_UniCharIsDigit) /* 347 */
+#define Tcl_UniCharIsLower \
+	(tclStubsPtr->tcl_UniCharIsLower) /* 348 */
+#define Tcl_UniCharIsSpace \
+	(tclStubsPtr->tcl_UniCharIsSpace) /* 349 */
+#define Tcl_UniCharIsUpper \
+	(tclStubsPtr->tcl_UniCharIsUpper) /* 350 */
+#define Tcl_UniCharIsWordChar \
+	(tclStubsPtr->tcl_UniCharIsWordChar) /* 351 */
+#define Tcl_UniCharLen \
+	(tclStubsPtr->tcl_UniCharLen) /* 352 */
+#define Tcl_UniCharNcmp \
+	(tclStubsPtr->tcl_UniCharNcmp) /* 353 */
+#define Tcl_UniCharToUtfDString \
+	(tclStubsPtr->tcl_UniCharToUtfDString) /* 354 */
+#define Tcl_UtfToUniCharDString \
+	(tclStubsPtr->tcl_UtfToUniCharDString) /* 355 */
+#define Tcl_GetRegExpFromObj \
+	(tclStubsPtr->tcl_GetRegExpFromObj) /* 356 */
+#define Tcl_EvalTokens \
+	(tclStubsPtr->tcl_EvalTokens) /* 357 */
+#define Tcl_FreeParse \
+	(tclStubsPtr->tcl_FreeParse) /* 358 */
+#define Tcl_LogCommandInfo \
+	(tclStubsPtr->tcl_LogCommandInfo) /* 359 */
+#define Tcl_ParseBraces \
+	(tclStubsPtr->tcl_ParseBraces) /* 360 */
+#define Tcl_ParseCommand \
+	(tclStubsPtr->tcl_ParseCommand) /* 361 */
+#define Tcl_ParseExpr \
+	(tclStubsPtr->tcl_ParseExpr) /* 362 */
+#define Tcl_ParseQuotedString \
+	(tclStubsPtr->tcl_ParseQuotedString) /* 363 */
+#define Tcl_ParseVarName \
+	(tclStubsPtr->tcl_ParseVarName) /* 364 */
+#define Tcl_GetCwd \
+	(tclStubsPtr->tcl_GetCwd) /* 365 */
+#define Tcl_Chdir \
+	(tclStubsPtr->tcl_Chdir) /* 366 */
+#define Tcl_Access \
+	(tclStubsPtr->tcl_Access) /* 367 */
+#define Tcl_Stat \
+	(tclStubsPtr->tcl_Stat) /* 368 */
+#define Tcl_UtfNcmp \
+	(tclStubsPtr->tcl_UtfNcmp) /* 369 */
+#define Tcl_UtfNcasecmp \
+	(tclStubsPtr->tcl_UtfNcasecmp) /* 370 */
+#define Tcl_StringCaseMatch \
+	(tclStubsPtr->tcl_StringCaseMatch) /* 371 */
+#define Tcl_UniCharIsControl \
+	(tclStubsPtr->tcl_UniCharIsControl) /* 372 */
+#define Tcl_UniCharIsGraph \
+	(tclStubsPtr->tcl_UniCharIsGraph) /* 373 */
+#define Tcl_UniCharIsPrint \
+	(tclStubsPtr->tcl_UniCharIsPrint) /* 374 */
+#define Tcl_UniCharIsPunct \
+	(tclStubsPtr->tcl_UniCharIsPunct) /* 375 */
+#define Tcl_RegExpExecObj \
+	(tclStubsPtr->tcl_RegExpExecObj) /* 376 */
+#define Tcl_RegExpGetInfo \
+	(tclStubsPtr->tcl_RegExpGetInfo) /* 377 */
+#define Tcl_NewUnicodeObj \
+	(tclStubsPtr->tcl_NewUnicodeObj) /* 378 */
+#define Tcl_SetUnicodeObj \
+	(tclStubsPtr->tcl_SetUnicodeObj) /* 379 */
+#define Tcl_GetCharLength \
+	(tclStubsPtr->tcl_GetCharLength) /* 380 */
+#define Tcl_GetUniChar \
+	(tclStubsPtr->tcl_GetUniChar) /* 381 */
+#define Tcl_GetUnicode \
+	(tclStubsPtr->tcl_GetUnicode) /* 382 */
+#define Tcl_GetRange \
+	(tclStubsPtr->tcl_GetRange) /* 383 */
+#define Tcl_AppendUnicodeToObj \
+	(tclStubsPtr->tcl_AppendUnicodeToObj) /* 384 */
+#define Tcl_RegExpMatchObj \
+	(tclStubsPtr->tcl_RegExpMatchObj) /* 385 */
+#define Tcl_SetNotifier \
+	(tclStubsPtr->tcl_SetNotifier) /* 386 */
+#define Tcl_GetAllocMutex \
+	(tclStubsPtr->tcl_GetAllocMutex) /* 387 */
+#define Tcl_GetChannelNames \
+	(tclStubsPtr->tcl_GetChannelNames) /* 388 */
+#define Tcl_GetChannelNamesEx \
+	(tclStubsPtr->tcl_GetChannelNamesEx) /* 389 */
+#define Tcl_ProcObjCmd \
+	(tclStubsPtr->tcl_ProcObjCmd) /* 390 */
+#define Tcl_ConditionFinalize \
+	(tclStubsPtr->tcl_ConditionFinalize) /* 391 */
+#define Tcl_MutexFinalize \
+	(tclStubsPtr->tcl_MutexFinalize) /* 392 */
+#define Tcl_CreateThread \
+	(tclStubsPtr->tcl_CreateThread) /* 393 */
+#define Tcl_ReadRaw \
+	(tclStubsPtr->tcl_ReadRaw) /* 394 */
+#define Tcl_WriteRaw \
+	(tclStubsPtr->tcl_WriteRaw) /* 395 */
+#define Tcl_GetTopChannel \
+	(tclStubsPtr->tcl_GetTopChannel) /* 396 */
+#define Tcl_ChannelBuffered \
+	(tclStubsPtr->tcl_ChannelBuffered) /* 397 */
+#define Tcl_ChannelName \
+	(tclStubsPtr->tcl_ChannelName) /* 398 */
+#define Tcl_ChannelVersion \
+	(tclStubsPtr->tcl_ChannelVersion) /* 399 */
+#define Tcl_ChannelBlockModeProc \
+	(tclStubsPtr->tcl_ChannelBlockModeProc) /* 400 */
+#define Tcl_ChannelCloseProc \
+	(tclStubsPtr->tcl_ChannelCloseProc) /* 401 */
+#define Tcl_ChannelClose2Proc \
+	(tclStubsPtr->tcl_ChannelClose2Proc) /* 402 */
+#define Tcl_ChannelInputProc \
+	(tclStubsPtr->tcl_ChannelInputProc) /* 403 */
+#define Tcl_ChannelOutputProc \
+	(tclStubsPtr->tcl_ChannelOutputProc) /* 404 */
+#define Tcl_ChannelSeekProc \
+	(tclStubsPtr->tcl_ChannelSeekProc) /* 405 */
+#define Tcl_ChannelSetOptionProc \
+	(tclStubsPtr->tcl_ChannelSetOptionProc) /* 406 */
+#define Tcl_ChannelGetOptionProc \
+	(tclStubsPtr->tcl_ChannelGetOptionProc) /* 407 */
+#define Tcl_ChannelWatchProc \
+	(tclStubsPtr->tcl_ChannelWatchProc) /* 408 */
+#define Tcl_ChannelGetHandleProc \
+	(tclStubsPtr->tcl_ChannelGetHandleProc) /* 409 */
+#define Tcl_ChannelFlushProc \
+	(tclStubsPtr->tcl_ChannelFlushProc) /* 410 */
+#define Tcl_ChannelHandlerProc \
+	(tclStubsPtr->tcl_ChannelHandlerProc) /* 411 */
+#define Tcl_JoinThread \
+	(tclStubsPtr->tcl_JoinThread) /* 412 */
+#define Tcl_IsChannelShared \
+	(tclStubsPtr->tcl_IsChannelShared) /* 413 */
+#define Tcl_IsChannelRegistered \
+	(tclStubsPtr->tcl_IsChannelRegistered) /* 414 */
+#define Tcl_CutChannel \
+	(tclStubsPtr->tcl_CutChannel) /* 415 */
+#define Tcl_SpliceChannel \
+	(tclStubsPtr->tcl_SpliceChannel) /* 416 */
+#define Tcl_ClearChannelHandlers \
+	(tclStubsPtr->tcl_ClearChannelHandlers) /* 417 */
+#define Tcl_IsChannelExisting \
+	(tclStubsPtr->tcl_IsChannelExisting) /* 418 */
+#define Tcl_UniCharNcasecmp \
+	(tclStubsPtr->tcl_UniCharNcasecmp) /* 419 */
+#define Tcl_UniCharCaseMatch \
+	(tclStubsPtr->tcl_UniCharCaseMatch) /* 420 */
+#define Tcl_FindHashEntry \
+	(tclStubsPtr->tcl_FindHashEntry) /* 421 */
+#define Tcl_CreateHashEntry \
+	(tclStubsPtr->tcl_CreateHashEntry) /* 422 */
+#define Tcl_InitCustomHashTable \
+	(tclStubsPtr->tcl_InitCustomHashTable) /* 423 */
+#define Tcl_InitObjHashTable \
+	(tclStubsPtr->tcl_InitObjHashTable) /* 424 */
+#define Tcl_CommandTraceInfo \
+	(tclStubsPtr->tcl_CommandTraceInfo) /* 425 */
+#define Tcl_TraceCommand \
+	(tclStubsPtr->tcl_TraceCommand) /* 426 */
+#define Tcl_UntraceCommand \
+	(tclStubsPtr->tcl_UntraceCommand) /* 427 */
+#define Tcl_AttemptAlloc \
+	(tclStubsPtr->tcl_AttemptAlloc) /* 428 */
+#define Tcl_AttemptDbCkalloc \
+	(tclStubsPtr->tcl_AttemptDbCkalloc) /* 429 */
+#define Tcl_AttemptRealloc \
+	(tclStubsPtr->tcl_AttemptRealloc) /* 430 */
+#define Tcl_AttemptDbCkrealloc \
+	(tclStubsPtr->tcl_AttemptDbCkrealloc) /* 431 */
+#define Tcl_AttemptSetObjLength \
+	(tclStubsPtr->tcl_AttemptSetObjLength) /* 432 */
+#define Tcl_GetChannelThread \
+	(tclStubsPtr->tcl_GetChannelThread) /* 433 */
+#define Tcl_GetUnicodeFromObj \
+	(tclStubsPtr->tcl_GetUnicodeFromObj) /* 434 */
+#define Tcl_GetMathFuncInfo \
+	(tclStubsPtr->tcl_GetMathFuncInfo) /* 435 */
+#define Tcl_ListMathFuncs \
+	(tclStubsPtr->tcl_ListMathFuncs) /* 436 */
+#define Tcl_SubstObj \
+	(tclStubsPtr->tcl_SubstObj) /* 437 */
+#define Tcl_DetachChannel \
+	(tclStubsPtr->tcl_DetachChannel) /* 438 */
+#define Tcl_IsStandardChannel \
+	(tclStubsPtr->tcl_IsStandardChannel) /* 439 */
+#define Tcl_FSCopyFile \
+	(tclStubsPtr->tcl_FSCopyFile) /* 440 */
+#define Tcl_FSCopyDirectory \
+	(tclStubsPtr->tcl_FSCopyDirectory) /* 441 */
+#define Tcl_FSCreateDirectory \
+	(tclStubsPtr->tcl_FSCreateDirectory) /* 442 */
+#define Tcl_FSDeleteFile \
+	(tclStubsPtr->tcl_FSDeleteFile) /* 443 */
+#define Tcl_FSLoadFile \
+	(tclStubsPtr->tcl_FSLoadFile) /* 444 */
+#define Tcl_FSMatchInDirectory \
+	(tclStubsPtr->tcl_FSMatchInDirectory) /* 445 */
+#define Tcl_FSLink \
+	(tclStubsPtr->tcl_FSLink) /* 446 */
+#define Tcl_FSRemoveDirectory \
+	(tclStubsPtr->tcl_FSRemoveDirectory) /* 447 */
+#define Tcl_FSRenameFile \
+	(tclStubsPtr->tcl_FSRenameFile) /* 448 */
+#define Tcl_FSLstat \
+	(tclStubsPtr->tcl_FSLstat) /* 449 */
+#define Tcl_FSUtime \
+	(tclStubsPtr->tcl_FSUtime) /* 450 */
+#define Tcl_FSFileAttrsGet \
+	(tclStubsPtr->tcl_FSFileAttrsGet) /* 451 */
+#define Tcl_FSFileAttrsSet \
+	(tclStubsPtr->tcl_FSFileAttrsSet) /* 452 */
+#define Tcl_FSFileAttrStrings \
+	(tclStubsPtr->tcl_FSFileAttrStrings) /* 453 */
+#define Tcl_FSStat \
+	(tclStubsPtr->tcl_FSStat) /* 454 */
+#define Tcl_FSAccess \
+	(tclStubsPtr->tcl_FSAccess) /* 455 */
+#define Tcl_FSOpenFileChannel \
+	(tclStubsPtr->tcl_FSOpenFileChannel) /* 456 */
+#define Tcl_FSGetCwd \
+	(tclStubsPtr->tcl_FSGetCwd) /* 457 */
+#define Tcl_FSChdir \
+	(tclStubsPtr->tcl_FSChdir) /* 458 */
+#define Tcl_FSConvertToPathType \
+	(tclStubsPtr->tcl_FSConvertToPathType) /* 459 */
+#define Tcl_FSJoinPath \
+	(tclStubsPtr->tcl_FSJoinPath) /* 460 */
+#define Tcl_FSSplitPath \
+	(tclStubsPtr->tcl_FSSplitPath) /* 461 */
+#define Tcl_FSEqualPaths \
+	(tclStubsPtr->tcl_FSEqualPaths) /* 462 */
+#define Tcl_FSGetNormalizedPath \
+	(tclStubsPtr->tcl_FSGetNormalizedPath) /* 463 */
+#define Tcl_FSJoinToPath \
+	(tclStubsPtr->tcl_FSJoinToPath) /* 464 */
+#define Tcl_FSGetInternalRep \
+	(tclStubsPtr->tcl_FSGetInternalRep) /* 465 */
+#define Tcl_FSGetTranslatedPath \
+	(tclStubsPtr->tcl_FSGetTranslatedPath) /* 466 */
+#define Tcl_FSEvalFile \
+	(tclStubsPtr->tcl_FSEvalFile) /* 467 */
+#define Tcl_FSNewNativePath \
+	(tclStubsPtr->tcl_FSNewNativePath) /* 468 */
+#define Tcl_FSGetNativePath \
+	(tclStubsPtr->tcl_FSGetNativePath) /* 469 */
+#define Tcl_FSFileSystemInfo \
+	(tclStubsPtr->tcl_FSFileSystemInfo) /* 470 */
+#define Tcl_FSPathSeparator \
+	(tclStubsPtr->tcl_FSPathSeparator) /* 471 */
+#define Tcl_FSListVolumes \
+	(tclStubsPtr->tcl_FSListVolumes) /* 472 */
+#define Tcl_FSRegister \
+	(tclStubsPtr->tcl_FSRegister) /* 473 */
+#define Tcl_FSUnregister \
+	(tclStubsPtr->tcl_FSUnregister) /* 474 */
+#define Tcl_FSData \
+	(tclStubsPtr->tcl_FSData) /* 475 */
+#define Tcl_FSGetTranslatedStringPath \
+	(tclStubsPtr->tcl_FSGetTranslatedStringPath) /* 476 */
+#define Tcl_FSGetFileSystemForPath \
+	(tclStubsPtr->tcl_FSGetFileSystemForPath) /* 477 */
+#define Tcl_FSGetPathType \
+	(tclStubsPtr->tcl_FSGetPathType) /* 478 */
+#define Tcl_OutputBuffered \
+	(tclStubsPtr->tcl_OutputBuffered) /* 479 */
+#define Tcl_FSMountsChanged \
+	(tclStubsPtr->tcl_FSMountsChanged) /* 480 */
+#define Tcl_EvalTokensStandard \
+	(tclStubsPtr->tcl_EvalTokensStandard) /* 481 */
+#define Tcl_GetTime \
+	(tclStubsPtr->tcl_GetTime) /* 482 */
+#define Tcl_CreateObjTrace \
+	(tclStubsPtr->tcl_CreateObjTrace) /* 483 */
+#define Tcl_GetCommandInfoFromToken \
+	(tclStubsPtr->tcl_GetCommandInfoFromToken) /* 484 */
+#define Tcl_SetCommandInfoFromToken \
+	(tclStubsPtr->tcl_SetCommandInfoFromToken) /* 485 */
+#define Tcl_DbNewWideIntObj \
+	(tclStubsPtr->tcl_DbNewWideIntObj) /* 486 */
+#define Tcl_GetWideIntFromObj \
+	(tclStubsPtr->tcl_GetWideIntFromObj) /* 487 */
+#define Tcl_NewWideIntObj \
+	(tclStubsPtr->tcl_NewWideIntObj) /* 488 */
+#define Tcl_SetWideIntObj \
+	(tclStubsPtr->tcl_SetWideIntObj) /* 489 */
+#define Tcl_AllocStatBuf \
+	(tclStubsPtr->tcl_AllocStatBuf) /* 490 */
+#define Tcl_Seek \
+	(tclStubsPtr->tcl_Seek) /* 491 */
+#define Tcl_Tell \
+	(tclStubsPtr->tcl_Tell) /* 492 */
+#define Tcl_ChannelWideSeekProc \
+	(tclStubsPtr->tcl_ChannelWideSeekProc) /* 493 */
+#define Tcl_DictObjPut \
+	(tclStubsPtr->tcl_DictObjPut) /* 494 */
+#define Tcl_DictObjGet \
+	(tclStubsPtr->tcl_DictObjGet) /* 495 */
+#define Tcl_DictObjRemove \
+	(tclStubsPtr->tcl_DictObjRemove) /* 496 */
+#define Tcl_DictObjSize \
+	(tclStubsPtr->tcl_DictObjSize) /* 497 */
+#define Tcl_DictObjFirst \
+	(tclStubsPtr->tcl_DictObjFirst) /* 498 */
+#define Tcl_DictObjNext \
+	(tclStubsPtr->tcl_DictObjNext) /* 499 */
+#define Tcl_DictObjDone \
+	(tclStubsPtr->tcl_DictObjDone) /* 500 */
+#define Tcl_DictObjPutKeyList \
+	(tclStubsPtr->tcl_DictObjPutKeyList) /* 501 */
+#define Tcl_DictObjRemoveKeyList \
+	(tclStubsPtr->tcl_DictObjRemoveKeyList) /* 502 */
+#define Tcl_NewDictObj \
+	(tclStubsPtr->tcl_NewDictObj) /* 503 */
+#define Tcl_DbNewDictObj \
+	(tclStubsPtr->tcl_DbNewDictObj) /* 504 */
+#define Tcl_RegisterConfig \
+	(tclStubsPtr->tcl_RegisterConfig) /* 505 */
+#define Tcl_CreateNamespace \
+	(tclStubsPtr->tcl_CreateNamespace) /* 506 */
+#define Tcl_DeleteNamespace \
+	(tclStubsPtr->tcl_DeleteNamespace) /* 507 */
+#define Tcl_AppendExportList \
+	(tclStubsPtr->tcl_AppendExportList) /* 508 */
+#define Tcl_Export \
+	(tclStubsPtr->tcl_Export) /* 509 */
+#define Tcl_Import \
+	(tclStubsPtr->tcl_Import) /* 510 */
+#define Tcl_ForgetImport \
+	(tclStubsPtr->tcl_ForgetImport) /* 511 */
+#define Tcl_GetCurrentNamespace \
+	(tclStubsPtr->tcl_GetCurrentNamespace) /* 512 */
+#define Tcl_GetGlobalNamespace \
+	(tclStubsPtr->tcl_GetGlobalNamespace) /* 513 */
+#define Tcl_FindNamespace \
+	(tclStubsPtr->tcl_FindNamespace) /* 514 */
+#define Tcl_FindCommand \
+	(tclStubsPtr->tcl_FindCommand) /* 515 */
+#define Tcl_GetCommandFromObj \
+	(tclStubsPtr->tcl_GetCommandFromObj) /* 516 */
+#define Tcl_GetCommandFullName \
+	(tclStubsPtr->tcl_GetCommandFullName) /* 517 */
+#define Tcl_FSEvalFileEx \
+	(tclStubsPtr->tcl_FSEvalFileEx) /* 518 */
+#define Tcl_SetExitProc \
+	(tclStubsPtr->tcl_SetExitProc) /* 519 */
+#define Tcl_LimitAddHandler \
+	(tclStubsPtr->tcl_LimitAddHandler) /* 520 */
+#define Tcl_LimitRemoveHandler \
+	(tclStubsPtr->tcl_LimitRemoveHandler) /* 521 */
+#define Tcl_LimitReady \
+	(tclStubsPtr->tcl_LimitReady) /* 522 */
+#define Tcl_LimitCheck \
+	(tclStubsPtr->tcl_LimitCheck) /* 523 */
+#define Tcl_LimitExceeded \
+	(tclStubsPtr->tcl_LimitExceeded) /* 524 */
+#define Tcl_LimitSetCommands \
+	(tclStubsPtr->tcl_LimitSetCommands) /* 525 */
+#define Tcl_LimitSetTime \
+	(tclStubsPtr->tcl_LimitSetTime) /* 526 */
+#define Tcl_LimitSetGranularity \
+	(tclStubsPtr->tcl_LimitSetGranularity) /* 527 */
+#define Tcl_LimitTypeEnabled \
+	(tclStubsPtr->tcl_LimitTypeEnabled) /* 528 */
+#define Tcl_LimitTypeExceeded \
+	(tclStubsPtr->tcl_LimitTypeExceeded) /* 529 */
+#define Tcl_LimitTypeSet \
+	(tclStubsPtr->tcl_LimitTypeSet) /* 530 */
+#define Tcl_LimitTypeReset \
+	(tclStubsPtr->tcl_LimitTypeReset) /* 531 */
+#define Tcl_LimitGetCommands \
+	(tclStubsPtr->tcl_LimitGetCommands) /* 532 */
+#define Tcl_LimitGetTime \
+	(tclStubsPtr->tcl_LimitGetTime) /* 533 */
+#define Tcl_LimitGetGranularity \
+	(tclStubsPtr->tcl_LimitGetGranularity) /* 534 */
+#define Tcl_SaveInterpState \
+	(tclStubsPtr->tcl_SaveInterpState) /* 535 */
+#define Tcl_RestoreInterpState \
+	(tclStubsPtr->tcl_RestoreInterpState) /* 536 */
+#define Tcl_DiscardInterpState \
+	(tclStubsPtr->tcl_DiscardInterpState) /* 537 */
+#define Tcl_SetReturnOptions \
+	(tclStubsPtr->tcl_SetReturnOptions) /* 538 */
+#define Tcl_GetReturnOptions \
+	(tclStubsPtr->tcl_GetReturnOptions) /* 539 */
+#define Tcl_IsEnsemble \
+	(tclStubsPtr->tcl_IsEnsemble) /* 540 */
+#define Tcl_CreateEnsemble \
+	(tclStubsPtr->tcl_CreateEnsemble) /* 541 */
+#define Tcl_FindEnsemble \
+	(tclStubsPtr->tcl_FindEnsemble) /* 542 */
+#define Tcl_SetEnsembleSubcommandList \
+	(tclStubsPtr->tcl_SetEnsembleSubcommandList) /* 543 */
+#define Tcl_SetEnsembleMappingDict \
+	(tclStubsPtr->tcl_SetEnsembleMappingDict) /* 544 */
+#define Tcl_SetEnsembleUnknownHandler \
+	(tclStubsPtr->tcl_SetEnsembleUnknownHandler) /* 545 */
+#define Tcl_SetEnsembleFlags \
+	(tclStubsPtr->tcl_SetEnsembleFlags) /* 546 */
+#define Tcl_GetEnsembleSubcommandList \
+	(tclStubsPtr->tcl_GetEnsembleSubcommandList) /* 547 */
+#define Tcl_GetEnsembleMappingDict \
+	(tclStubsPtr->tcl_GetEnsembleMappingDict) /* 548 */
+#define Tcl_GetEnsembleUnknownHandler \
+	(tclStubsPtr->tcl_GetEnsembleUnknownHandler) /* 549 */
+#define Tcl_GetEnsembleFlags \
+	(tclStubsPtr->tcl_GetEnsembleFlags) /* 550 */
+#define Tcl_GetEnsembleNamespace \
+	(tclStubsPtr->tcl_GetEnsembleNamespace) /* 551 */
+#define Tcl_SetTimeProc \
+	(tclStubsPtr->tcl_SetTimeProc) /* 552 */
+#define Tcl_QueryTimeProc \
+	(tclStubsPtr->tcl_QueryTimeProc) /* 553 */
+#define Tcl_ChannelThreadActionProc \
+	(tclStubsPtr->tcl_ChannelThreadActionProc) /* 554 */
+#define Tcl_NewBignumObj \
+	(tclStubsPtr->tcl_NewBignumObj) /* 555 */
+#define Tcl_DbNewBignumObj \
+	(tclStubsPtr->tcl_DbNewBignumObj) /* 556 */
+#define Tcl_SetBignumObj \
+	(tclStubsPtr->tcl_SetBignumObj) /* 557 */
+#define Tcl_GetBignumFromObj \
+	(tclStubsPtr->tcl_GetBignumFromObj) /* 558 */
+#define Tcl_TakeBignumFromObj \
+	(tclStubsPtr->tcl_TakeBignumFromObj) /* 559 */
+#define Tcl_TruncateChannel \
+	(tclStubsPtr->tcl_TruncateChannel) /* 560 */
+#define Tcl_ChannelTruncateProc \
+	(tclStubsPtr->tcl_ChannelTruncateProc) /* 561 */
+#define Tcl_SetChannelErrorInterp \
+	(tclStubsPtr->tcl_SetChannelErrorInterp) /* 562 */
+#define Tcl_GetChannelErrorInterp \
+	(tclStubsPtr->tcl_GetChannelErrorInterp) /* 563 */
+#define Tcl_SetChannelError \
+	(tclStubsPtr->tcl_SetChannelError) /* 564 */
+#define Tcl_GetChannelError \
+	(tclStubsPtr->tcl_GetChannelError) /* 565 */
+#define Tcl_InitBignumFromDouble \
+	(tclStubsPtr->tcl_InitBignumFromDouble) /* 566 */
+#define Tcl_GetNamespaceUnknownHandler \
+	(tclStubsPtr->tcl_GetNamespaceUnknownHandler) /* 567 */
+#define Tcl_SetNamespaceUnknownHandler \
+	(tclStubsPtr->tcl_SetNamespaceUnknownHandler) /* 568 */
+#define Tcl_GetEncodingFromObj \
+	(tclStubsPtr->tcl_GetEncodingFromObj) /* 569 */
+#define Tcl_GetEncodingSearchPath \
+	(tclStubsPtr->tcl_GetEncodingSearchPath) /* 570 */
+#define Tcl_SetEncodingSearchPath \
+	(tclStubsPtr->tcl_SetEncodingSearchPath) /* 571 */
+#define Tcl_GetEncodingNameFromEnvironment \
+	(tclStubsPtr->tcl_GetEncodingNameFromEnvironment) /* 572 */
+#define Tcl_PkgRequireProc \
+	(tclStubsPtr->tcl_PkgRequireProc) /* 573 */
+#define Tcl_AppendObjToErrorInfo \
+	(tclStubsPtr->tcl_AppendObjToErrorInfo) /* 574 */
+#define Tcl_AppendLimitedToObj \
+	(tclStubsPtr->tcl_AppendLimitedToObj) /* 575 */
+#define Tcl_Format \
+	(tclStubsPtr->tcl_Format) /* 576 */
+#define Tcl_AppendFormatToObj \
+	(tclStubsPtr->tcl_AppendFormatToObj) /* 577 */
+#define Tcl_ObjPrintf \
+	(tclStubsPtr->tcl_ObjPrintf) /* 578 */
+#define Tcl_AppendPrintfToObj \
+	(tclStubsPtr->tcl_AppendPrintfToObj) /* 579 */
+#define Tcl_CancelEval \
+	(tclStubsPtr->tcl_CancelEval) /* 580 */
+#define Tcl_Canceled \
+	(tclStubsPtr->tcl_Canceled) /* 581 */
+#define Tcl_CreatePipe \
+	(tclStubsPtr->tcl_CreatePipe) /* 582 */
+#define Tcl_NRCreateCommand \
+	(tclStubsPtr->tcl_NRCreateCommand) /* 583 */
+#define Tcl_NREvalObj \
+	(tclStubsPtr->tcl_NREvalObj) /* 584 */
+#define Tcl_NREvalObjv \
+	(tclStubsPtr->tcl_NREvalObjv) /* 585 */
+#define Tcl_NRCmdSwap \
+	(tclStubsPtr->tcl_NRCmdSwap) /* 586 */
+#define Tcl_NRAddCallback \
+	(tclStubsPtr->tcl_NRAddCallback) /* 587 */
+#define Tcl_NRCallObjProc \
+	(tclStubsPtr->tcl_NRCallObjProc) /* 588 */
+#define Tcl_GetFSDeviceFromStat \
+	(tclStubsPtr->tcl_GetFSDeviceFromStat) /* 589 */
+#define Tcl_GetFSInodeFromStat \
+	(tclStubsPtr->tcl_GetFSInodeFromStat) /* 590 */
+#define Tcl_GetModeFromStat \
+	(tclStubsPtr->tcl_GetModeFromStat) /* 591 */
+#define Tcl_GetLinkCountFromStat \
+	(tclStubsPtr->tcl_GetLinkCountFromStat) /* 592 */
+#define Tcl_GetUserIdFromStat \
+	(tclStubsPtr->tcl_GetUserIdFromStat) /* 593 */
+#define Tcl_GetGroupIdFromStat \
+	(tclStubsPtr->tcl_GetGroupIdFromStat) /* 594 */
+#define Tcl_GetDeviceTypeFromStat \
+	(tclStubsPtr->tcl_GetDeviceTypeFromStat) /* 595 */
+#define Tcl_GetAccessTimeFromStat \
+	(tclStubsPtr->tcl_GetAccessTimeFromStat) /* 596 */
+#define Tcl_GetModificationTimeFromStat \
+	(tclStubsPtr->tcl_GetModificationTimeFromStat) /* 597 */
+#define Tcl_GetChangeTimeFromStat \
+	(tclStubsPtr->tcl_GetChangeTimeFromStat) /* 598 */
+#define Tcl_GetSizeFromStat \
+	(tclStubsPtr->tcl_GetSizeFromStat) /* 599 */
+#define Tcl_GetBlocksFromStat \
+	(tclStubsPtr->tcl_GetBlocksFromStat) /* 600 */
+#define Tcl_GetBlockSizeFromStat \
+	(tclStubsPtr->tcl_GetBlockSizeFromStat) /* 601 */
+#define Tcl_SetEnsembleParameterList \
+	(tclStubsPtr->tcl_SetEnsembleParameterList) /* 602 */
+#define Tcl_GetEnsembleParameterList \
+	(tclStubsPtr->tcl_GetEnsembleParameterList) /* 603 */
+#define Tcl_ParseArgsObjv \
+	(tclStubsPtr->tcl_ParseArgsObjv) /* 604 */
+#define Tcl_GetErrorLine \
+	(tclStubsPtr->tcl_GetErrorLine) /* 605 */
+#define Tcl_SetErrorLine \
+	(tclStubsPtr->tcl_SetErrorLine) /* 606 */
+#define Tcl_TransferResult \
+	(tclStubsPtr->tcl_TransferResult) /* 607 */
+#define Tcl_InterpActive \
+	(tclStubsPtr->tcl_InterpActive) /* 608 */
+#define Tcl_BackgroundException \
+	(tclStubsPtr->tcl_BackgroundException) /* 609 */
+#define Tcl_ZlibDeflate \
+	(tclStubsPtr->tcl_ZlibDeflate) /* 610 */
+#define Tcl_ZlibInflate \
+	(tclStubsPtr->tcl_ZlibInflate) /* 611 */
+#define Tcl_ZlibCRC32 \
+	(tclStubsPtr->tcl_ZlibCRC32) /* 612 */
+#define Tcl_ZlibAdler32 \
+	(tclStubsPtr->tcl_ZlibAdler32) /* 613 */
+#define Tcl_ZlibStreamInit \
+	(tclStubsPtr->tcl_ZlibStreamInit) /* 614 */
+#define Tcl_ZlibStreamGetCommandName \
+	(tclStubsPtr->tcl_ZlibStreamGetCommandName) /* 615 */
+#define Tcl_ZlibStreamEof \
+	(tclStubsPtr->tcl_ZlibStreamEof) /* 616 */
+#define Tcl_ZlibStreamChecksum \
+	(tclStubsPtr->tcl_ZlibStreamChecksum) /* 617 */
+#define Tcl_ZlibStreamPut \
+	(tclStubsPtr->tcl_ZlibStreamPut) /* 618 */
+#define Tcl_ZlibStreamGet \
+	(tclStubsPtr->tcl_ZlibStreamGet) /* 619 */
+#define Tcl_ZlibStreamClose \
+	(tclStubsPtr->tcl_ZlibStreamClose) /* 620 */
+#define Tcl_ZlibStreamReset \
+	(tclStubsPtr->tcl_ZlibStreamReset) /* 621 */
+#define Tcl_SetStartupScript \
+	(tclStubsPtr->tcl_SetStartupScript) /* 622 */
+#define Tcl_GetStartupScript \
+	(tclStubsPtr->tcl_GetStartupScript) /* 623 */
+#define Tcl_CloseEx \
+	(tclStubsPtr->tcl_CloseEx) /* 624 */
+#define Tcl_NRExprObj \
+	(tclStubsPtr->tcl_NRExprObj) /* 625 */
+#define Tcl_NRSubstObj \
+	(tclStubsPtr->tcl_NRSubstObj) /* 626 */
+#define Tcl_LoadFile \
+	(tclStubsPtr->tcl_LoadFile) /* 627 */
+#define Tcl_FindSymbol \
+	(tclStubsPtr->tcl_FindSymbol) /* 628 */
+#define Tcl_FSUnloadFile \
+	(tclStubsPtr->tcl_FSUnloadFile) /* 629 */
+#define Tcl_ZlibStreamSetCompressionDictionary \
+	(tclStubsPtr->tcl_ZlibStreamSetCompressionDictionary) /* 630 */
+
+#endif /* defined(USE_TCL_STUBS) */
+
+/* !END!: Do not edit above this line. */
+
+#if defined(USE_TCL_STUBS)
+#   undef Tcl_CreateInterp
+#   undef Tcl_FindExecutable
+#   undef Tcl_GetStringResult
+#   undef Tcl_Init
+#   undef Tcl_SetPanicProc
+#   undef Tcl_SetVar
+#   undef Tcl_ObjSetVar2
+#   undef Tcl_StaticPackage
+#   undef TclFSGetNativePath
+#   define Tcl_CreateInterp() (tclStubsPtr->tcl_CreateInterp())
+#   define Tcl_GetStringResult(interp) (tclStubsPtr->tcl_GetStringResult(interp))
+#   define Tcl_Init(interp) (tclStubsPtr->tcl_Init(interp))
+#   define Tcl_SetPanicProc(proc) (tclStubsPtr->tcl_SetPanicProc(proc))
+#   define Tcl_SetVar(interp, varName, newValue, flags) \
+	    (tclStubsPtr->tcl_SetVar(interp, varName, newValue, flags))
+#   define Tcl_ObjSetVar2(interp, part1, part2, newValue, flags) \
+	    (tclStubsPtr->tcl_ObjSetVar2(interp, part1, part2, newValue, flags))
+#endif
+
+#if defined(_WIN32) && defined(UNICODE)
+#   define Tcl_FindExecutable(arg) ((Tcl_FindExecutable)((const char *)(arg)))
+#   define Tcl_MainEx Tcl_MainExW
+    EXTERN void Tcl_MainExW(int argc, wchar_t **argv,
+	    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
+#endif
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
+#undef Tcl_SeekOld
+#undef Tcl_TellOld
+
+#undef Tcl_PkgPresent
+#define Tcl_PkgPresent(interp, name, version, exact) \
+	Tcl_PkgPresentEx(interp, name, version, exact, NULL)
+#undef Tcl_PkgProvide
+#define Tcl_PkgProvide(interp, name, version) \
+	Tcl_PkgProvideEx(interp, name, version, NULL)
+#undef Tcl_PkgRequire
+#define Tcl_PkgRequire(interp, name, version, exact) \
+	Tcl_PkgRequireEx(interp, name, version, exact, NULL)
+#undef Tcl_GetIndexFromObj
+#define Tcl_GetIndexFromObj(interp, objPtr, tablePtr, msg, flags, indexPtr) \
+	Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, \
+	sizeof(char *), msg, flags, indexPtr)
+#undef Tcl_NewBooleanObj
+#define Tcl_NewBooleanObj(boolValue) \
+	Tcl_NewIntObj((boolValue)!=0)
+#undef Tcl_DbNewBooleanObj
+#define Tcl_DbNewBooleanObj(boolValue, file, line) \
+	Tcl_DbNewLongObj((boolValue)!=0, file, line)
+#undef Tcl_SetBooleanObj
+#define Tcl_SetBooleanObj(objPtr, boolValue) \
+	Tcl_SetIntObj((objPtr), (boolValue)!=0)
+#undef Tcl_SetVar
+#define Tcl_SetVar(interp, varName, newValue, flags) \
+	Tcl_SetVar2(interp, varName, NULL, newValue, flags)
+#undef Tcl_UnsetVar
+#define Tcl_UnsetVar(interp, varName, flags) \
+	Tcl_UnsetVar2(interp, varName, NULL, flags)
+#undef Tcl_GetVar
+#define Tcl_GetVar(interp, varName, flags) \
+	Tcl_GetVar2(interp, varName, NULL, flags)
+#undef Tcl_TraceVar
+#define Tcl_TraceVar(interp, varName, flags, proc, clientData) \
+	Tcl_TraceVar2(interp, varName, NULL, flags, proc, clientData)
+#undef Tcl_UntraceVar
+#define Tcl_UntraceVar(interp, varName, flags, proc, clientData) \
+	Tcl_UntraceVar2(interp, varName, NULL, flags, proc, clientData)
+#undef Tcl_VarTraceInfo
+#define Tcl_VarTraceInfo(interp, varName, flags, proc, prevClientData) \
+	Tcl_VarTraceInfo2(interp, varName, NULL, flags, proc, prevClientData)
+#undef Tcl_UpVar
+#define Tcl_UpVar(interp, frameName, varName, localName, flags) \
+	Tcl_UpVar2(interp, frameName, varName, NULL, localName, flags)
+
+#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+#   if defined(__CYGWIN__) && defined(TCL_WIDE_INT_IS_LONG)
+/* On Cygwin64, long is 64-bit while on Win64 long is 32-bit. Therefore
+ * we have to make sure that all stub entries on Cygwin64 follow the
+ * Win64 signature. Cygwin64 stubbed extensions cannot use those stub
+ * entries any more, they should use the 64-bit alternatives where
+ * possible. Tcl 9 must find a better solution, but that cannot be done
+ * without introducing a binary incompatibility.
+ */
+#	undef Tcl_DbNewLongObj
+#	undef Tcl_GetLongFromObj
+#	undef Tcl_NewLongObj
+#	undef Tcl_SetLongObj
+#	undef Tcl_ExprLong
+#	undef Tcl_ExprLongObj
+#	undef Tcl_UniCharNcmp
+#	undef Tcl_UtfNcmp
+#	undef Tcl_UtfNcasecmp
+#	undef Tcl_UniCharNcasecmp
+#	define Tcl_DbNewLongObj ((Tcl_Obj*(*)(long,const char*,int))Tcl_DbNewWideIntObj)
+#	define Tcl_GetLongFromObj ((int(*)(Tcl_Interp*,Tcl_Obj*,long*))Tcl_GetWideIntFromObj)
+#	define Tcl_NewLongObj ((Tcl_Obj*(*)(long))Tcl_NewWideIntObj)
+#	define Tcl_SetLongObj ((void(*)(Tcl_Obj*,long))Tcl_SetWideIntObj)
+#	define Tcl_ExprLong TclExprLong
+	static inline int TclExprLong(Tcl_Interp *interp, const char *string, long *ptr){
+	    int intValue;
+	    int result = tclStubsPtr->tcl_ExprLong(interp, string, (long *)&intValue);
+	    if (result == TCL_OK) *ptr = (long)intValue;
+	    return result;
+	}
+#	define Tcl_ExprLongObj TclExprLongObj
+	static inline int TclExprLongObj(Tcl_Interp *interp, Tcl_Obj *obj, long *ptr){
+	    int intValue;
+	    int result = tclStubsPtr->tcl_ExprLongObj(interp, obj, (long *)&intValue);
+	    if (result == TCL_OK) *ptr = (long)intValue;
+	    return result;
+	}
+#	define Tcl_UniCharNcmp(ucs,uct,n) \
+		((int(*)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned int))tclStubsPtr->tcl_UniCharNcmp)(ucs,uct,(unsigned int)(n))
+#	define Tcl_UtfNcmp(s1,s2,n) \
+		((int(*)(const char*,const char*,unsigned int))tclStubsPtr->tcl_UtfNcmp)(s1,s2,(unsigned int)(n))
+#	define Tcl_UtfNcasecmp(s1,s2,n) \
+		((int(*)(const char*,const char*,unsigned int))tclStubsPtr->tcl_UtfNcasecmp)(s1,s2,(unsigned int)(n))
+#	define Tcl_UniCharNcasecmp(ucs,uct,n) \
+		((int(*)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned int))tclStubsPtr->tcl_UniCharNcasecmp)(ucs,uct,(unsigned int)(n))
+#   endif
+#endif
+
+/*
+ * Deprecated Tcl procedures:
+ */
+
+#undef Tcl_EvalObj
+#define Tcl_EvalObj(interp,objPtr) \
+    Tcl_EvalObjEx((interp),(objPtr),0)
+#undef Tcl_GlobalEvalObj
+#define Tcl_GlobalEvalObj(interp,objPtr) \
+    Tcl_EvalObjEx((interp),(objPtr),TCL_EVAL_GLOBAL)
+
+#endif /* _TCLDECLS */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tclPlatDecls.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tclPlatDecls.h
new file mode 100644
index 00000000..abc8ee81
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tclPlatDecls.h
@@ -0,0 +1,122 @@
+/*
+ * tclPlatDecls.h --
+ *
+ *	Declarations of platform specific Tcl APIs.
+ *
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ * All rights reserved.
+ */
+
+#ifndef _TCLPLATDECLS
+#define _TCLPLATDECLS
+
+#undef TCL_STORAGE_CLASS
+#ifdef BUILD_tcl
+#   define TCL_STORAGE_CLASS DLLEXPORT
+#else
+#   ifdef USE_TCL_STUBS
+#      define TCL_STORAGE_CLASS
+#   else
+#      define TCL_STORAGE_CLASS DLLIMPORT
+#   endif
+#endif
+
+/*
+ * WARNING: This file is automatically generated by the tools/genStubs.tcl
+ * script.  Any modifications to the function declarations below should be made
+ * in the generic/tcl.decls script.
+ */
+
+/*
+ * TCHAR is needed here for win32, so if it is not defined yet do it here.
+ * This way, we don't need to include <tchar.h> just for one define.
+ */
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(_TCHAR_DEFINED)
+#   if defined(_UNICODE)
+	typedef wchar_t TCHAR;
+#   else
+	typedef char TCHAR;
+#   endif
+#   define _TCHAR_DEFINED
+#endif
+
+/* !BEGIN!: Do not edit below this line. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+/* 0 */
+EXTERN TCHAR *		Tcl_WinUtfToTChar(const char *str, int len,
+				Tcl_DString *dsPtr);
+/* 1 */
+EXTERN char *		Tcl_WinTCharToUtf(const TCHAR *str, int len,
+				Tcl_DString *dsPtr);
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+/* 0 */
+EXTERN int		Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp,
+				const char *bundleName, int hasResourceFile,
+				int maxPathLen, char *libraryPath);
+/* 1 */
+EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
+				Tcl_Interp *interp, const char *bundleName,
+				const char *bundleVersion,
+				int hasResourceFile, int maxPathLen,
+				char *libraryPath);
+#endif /* MACOSX */
+
+typedef struct TclPlatStubs {
+    int magic;
+    void *hooks;
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+    TCHAR * (*tcl_WinUtfToTChar) (const char *str, int len, Tcl_DString *dsPtr); /* 0 */
+    char * (*tcl_WinTCharToUtf) (const TCHAR *str, int len, Tcl_DString *dsPtr); /* 1 */
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+    int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, const char *bundleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */
+    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath); /* 1 */
+#endif /* MACOSX */
+} TclPlatStubs;
+
+extern const TclPlatStubs *tclPlatStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_TCL_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#define Tcl_WinUtfToTChar \
+	(tclPlatStubsPtr->tcl_WinUtfToTChar) /* 0 */
+#define Tcl_WinTCharToUtf \
+	(tclPlatStubsPtr->tcl_WinTCharToUtf) /* 1 */
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+#define Tcl_MacOSXOpenBundleResources \
+	(tclPlatStubsPtr->tcl_MacOSXOpenBundleResources) /* 0 */
+#define Tcl_MacOSXOpenVersionedBundleResources \
+	(tclPlatStubsPtr->tcl_MacOSXOpenVersionedBundleResources) /* 1 */
+#endif /* MACOSX */
+
+#endif /* defined(USE_TCL_STUBS) */
+
+/* !END!: Do not edit above this line. */
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
+#endif /* _TCLPLATDECLS */
+
+
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tk.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tk.h
new file mode 100644
index 00000000..4a655a49
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tk.h
@@ -0,0 +1,1619 @@
+/*
+ * tk.h --
+ *
+ *	Declarations for Tk-related things that are visible outside of the Tk
+ *	module itself.
+ *
+ * Copyright (c) 1989-1994 The Regents of the University of California.
+ * Copyright (c) 1994 The Australian National University.
+ * Copyright (c) 1994-1998 Sun Microsystems, Inc.
+ * Copyright (c) 1998-2000 Ajuba Solutions.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#ifndef _TK
+#define _TK
+
+#include <tcl.h>
+#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 6)
+#	error Tk 8.6 must be compiled with tcl.h from Tcl 8.6 or better
+#endif
+
+#ifndef CONST84
+#   define CONST84 const
+#   define CONST84_RETURN const
+#endif
+#ifndef CONST86
+#   define CONST86 CONST84
+#endif
+#ifndef EXTERN
+#   define EXTERN extern TCL_STORAGE_CLASS
+#endif
+
+/*
+ * Utility macros: STRINGIFY takes an argument and wraps it in "" (double
+ * quotation marks), JOIN joins two arguments.
+ */
+
+#ifndef STRINGIFY
+#  define STRINGIFY(x) STRINGIFY1(x)
+#  define STRINGIFY1(x) #x
+#endif
+#ifndef JOIN
+#  define JOIN(a,b) JOIN1(a,b)
+#  define JOIN1(a,b) a##b
+#endif
+
+/*
+ * For C++ compilers, use extern "C"
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * When version numbers change here, you must also go into the following files
+ * and update the version numbers:
+ *
+ * library/tk.tcl	(1 LOC patch)
+ * unix/configure.in	(2 LOC Major, 2 LOC minor, 1 LOC patch)
+ * win/configure.in	(as above)
+ * README		(sections 0 and 1)
+ * macosx/Tk-Common.xcconfig (not patchlevel) 1 LOC
+ * win/README		(not patchlevel)
+ * unix/README		(not patchlevel)
+ * unix/tk.spec		(1 LOC patch)
+ * win/tcl.m4		(not patchlevel)
+ *
+ * You may also need to update some of these files when the numbers change for
+ * the version of Tcl that this release of Tk is compiled against.
+ */
+
+#define TK_MAJOR_VERSION	8
+#define TK_MINOR_VERSION	6
+#define TK_RELEASE_LEVEL	TCL_FINAL_RELEASE
+#define TK_RELEASE_SERIAL	4
+
+#define TK_VERSION		"8.6"
+#define TK_PATCH_LEVEL		"8.6.4"
+
+/*
+ * A special definition used to allow this header file to be included from
+ * windows or mac resource files so that they can obtain version information.
+ * RC_INVOKED is defined by default by the windows RC tool and manually set
+ * for macintosh.
+ *
+ * Resource compilers don't like all the C stuff, like typedefs and procedure
+ * declarations, that occur below, so block them out.
+ */
+
+#ifndef RC_INVOKED
+
+#ifndef _XLIB_H
+#   include <X11/Xlib.h>
+#   ifdef MAC_OSX_TK
+#	include <X11/X.h>
+#   endif
+#endif
+#ifdef __STDC__
+#   include <stddef.h>
+#endif
+
+#ifdef BUILD_tk
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS	DLLEXPORT
+#endif
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Decide whether or not to use input methods.
+ */
+
+#ifdef XNQueryInputStyle
+#define TK_USE_INPUT_METHODS
+#endif
+
+/*
+ * Dummy types that are used by clients:
+ */
+
+typedef struct Tk_BindingTable_ *Tk_BindingTable;
+typedef struct Tk_Canvas_ *Tk_Canvas;
+typedef struct Tk_Cursor_ *Tk_Cursor;
+typedef struct Tk_ErrorHandler_ *Tk_ErrorHandler;
+typedef struct Tk_Font_ *Tk_Font;
+typedef struct Tk_Image__ *Tk_Image;
+typedef struct Tk_ImageMaster_ *Tk_ImageMaster;
+typedef struct Tk_OptionTable_ *Tk_OptionTable;
+typedef struct Tk_PostscriptInfo_ *Tk_PostscriptInfo;
+typedef struct Tk_TextLayout_ *Tk_TextLayout;
+typedef struct Tk_Window_ *Tk_Window;
+typedef struct Tk_3DBorder_ *Tk_3DBorder;
+typedef struct Tk_Style_ *Tk_Style;
+typedef struct Tk_StyleEngine_ *Tk_StyleEngine;
+typedef struct Tk_StyledElement_ *Tk_StyledElement;
+
+/*
+ * Additional types exported to clients.
+ */
+
+typedef const char *Tk_Uid;
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * The enum below defines the valid types for Tk configuration options as
+ * implemented by Tk_InitOptions, Tk_SetOptions, etc.
+ */
+
+typedef enum {
+    TK_OPTION_BOOLEAN,
+    TK_OPTION_INT,
+    TK_OPTION_DOUBLE,
+    TK_OPTION_STRING,
+    TK_OPTION_STRING_TABLE,
+    TK_OPTION_COLOR,
+    TK_OPTION_FONT,
+    TK_OPTION_BITMAP,
+    TK_OPTION_BORDER,
+    TK_OPTION_RELIEF,
+    TK_OPTION_CURSOR,
+    TK_OPTION_JUSTIFY,
+    TK_OPTION_ANCHOR,
+    TK_OPTION_SYNONYM,
+    TK_OPTION_PIXELS,
+    TK_OPTION_WINDOW,
+    TK_OPTION_END,
+    TK_OPTION_CUSTOM,
+    TK_OPTION_STYLE
+} Tk_OptionType;
+
+/*
+ * Structures of the following type are used by widgets to specify their
+ * configuration options. Typically each widget has a static array of these
+ * structures, where each element of the array describes a single
+ * configuration option. The array is passed to Tk_CreateOptionTable.
+ */
+
+typedef struct Tk_OptionSpec {
+    Tk_OptionType type;		/* Type of option, such as TK_OPTION_COLOR;
+				 * see definitions above. Last option in table
+				 * must have type TK_OPTION_END. */
+    const char *optionName;	/* Name used to specify option in Tcl
+				 * commands. */
+    const char *dbName;		/* Name for option in option database. */
+    const char *dbClass;	/* Class for option in database. */
+    const char *defValue;	/* Default value for option if not specified
+				 * in command line, the option database, or
+				 * the system. */
+    int objOffset;		/* Where in record to store a Tcl_Obj * that
+				 * holds the value of this option, specified
+				 * as an offset in bytes from the start of the
+				 * record. Use the Tk_Offset macro to generate
+				 * values for this. -1 means don't store the
+				 * Tcl_Obj in the record. */
+    int internalOffset;		/* Where in record to store the internal
+				 * representation of the value of this option,
+				 * such as an int or XColor *. This field is
+				 * specified as an offset in bytes from the
+				 * start of the record. Use the Tk_Offset
+				 * macro to generate values for it. -1 means
+				 * don't store the internal representation in
+				 * the record. */
+    int flags;			/* Any combination of the values defined
+				 * below. */
+    const void *clientData;	/* An alternate place to put option-specific
+				 * data. Used for the monochrome default value
+				 * for colors, etc. */
+    int typeMask;		/* An arbitrary bit mask defined by the class
+				 * manager; typically bits correspond to
+				 * certain kinds of options such as all those
+				 * that require a redisplay when they change.
+				 * Tk_SetOptions returns the bit-wise OR of
+				 * the typeMasks of all options that were
+				 * changed. */
+} Tk_OptionSpec;
+
+/*
+ * Flag values for Tk_OptionSpec structures. These flags are shared by
+ * Tk_ConfigSpec structures, so be sure to coordinate any changes carefully.
+ */
+
+#define TK_OPTION_NULL_OK		(1 << 0)
+#define TK_OPTION_DONT_SET_DEFAULT	(1 << 3)
+
+/*
+ * The following structure and function types are used by TK_OPTION_CUSTOM
+ * options; the structure holds pointers to the functions needed by the Tk
+ * option config code to handle a custom option.
+ */
+
+typedef int (Tk_CustomOptionSetProc) (ClientData clientData,
+	Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj **value, char *widgRec,
+	int offset, char *saveInternalPtr, int flags);
+typedef Tcl_Obj *(Tk_CustomOptionGetProc) (ClientData clientData,
+	Tk_Window tkwin, char *widgRec, int offset);
+typedef void (Tk_CustomOptionRestoreProc) (ClientData clientData,
+	Tk_Window tkwin, char *internalPtr, char *saveInternalPtr);
+typedef void (Tk_CustomOptionFreeProc) (ClientData clientData, Tk_Window tkwin,
+	char *internalPtr);
+
+typedef struct Tk_ObjCustomOption {
+    const char *name;		/* Name of the custom option. */
+    Tk_CustomOptionSetProc *setProc;
+				/* Function to use to set a record's option
+				 * value from a Tcl_Obj */
+    Tk_CustomOptionGetProc *getProc;
+				/* Function to use to get a Tcl_Obj
+				 * representation from an internal
+				 * representation of an option. */
+    Tk_CustomOptionRestoreProc *restoreProc;
+				/* Function to use to restore a saved value
+				 * for the internal representation. */
+    Tk_CustomOptionFreeProc *freeProc;
+				/* Function to use to free the internal
+				 * representation of an option. */
+    ClientData clientData;	/* Arbitrary one-word value passed to the
+				 * handling procs. */
+} Tk_ObjCustomOption;
+
+/*
+ * Macro to use to fill in "offset" fields of the Tk_OptionSpec structure.
+ * Computes number of bytes from beginning of structure to a given field.
+ */
+
+#ifdef offsetof
+#define Tk_Offset(type, field) ((int) offsetof(type, field))
+#else
+#define Tk_Offset(type, field) ((int) ((char *) &((type *) 0)->field))
+#endif
+
+/*
+ * The following two structures are used for error handling. When config
+ * options are being modified, the old values are saved in a Tk_SavedOptions
+ * structure. If an error occurs, then the contents of the structure can be
+ * used to restore all of the old values. The contents of this structure are
+ * for the private use Tk. No-one outside Tk should ever read or write any of
+ * the fields of these structures.
+ */
+
+typedef struct Tk_SavedOption {
+    struct TkOption *optionPtr;	/* Points to information that describes the
+				 * option. */
+    Tcl_Obj *valuePtr;		/* The old value of the option, in the form of
+				 * a Tcl object; may be NULL if the value was
+				 * not saved as an object. */
+    double internalForm;	/* The old value of the option, in some
+				 * internal representation such as an int or
+				 * (XColor *). Valid only if the field
+				 * optionPtr->specPtr->objOffset is < 0. The
+				 * space must be large enough to accommodate a
+				 * double, a long, or a pointer; right now it
+				 * looks like a double (i.e., 8 bytes) is big
+				 * enough. Also, using a double guarantees
+				 * that the field is properly aligned for
+				 * storing large values. */
+} Tk_SavedOption;
+
+#ifdef TCL_MEM_DEBUG
+#   define TK_NUM_SAVED_OPTIONS 2
+#else
+#   define TK_NUM_SAVED_OPTIONS 20
+#endif
+
+typedef struct Tk_SavedOptions {
+    char *recordPtr;		/* The data structure in which to restore
+				 * configuration options. */
+    Tk_Window tkwin;		/* Window associated with recordPtr; needed to
+				 * restore certain options. */
+    int numItems;		/* The number of valid items in items field. */
+    Tk_SavedOption items[TK_NUM_SAVED_OPTIONS];
+				/* Items used to hold old values. */
+    struct Tk_SavedOptions *nextPtr;
+				/* Points to next structure in list; needed if
+				 * too many options changed to hold all the
+				 * old values in a single structure. NULL
+				 * means no more structures. */
+} Tk_SavedOptions;
+
+/*
+ * Structure used to describe application-specific configuration options:
+ * indicates procedures to call to parse an option and to return a text string
+ * describing an option. THESE ARE DEPRECATED; PLEASE USE THE NEW STRUCTURES
+ * LISTED ABOVE.
+ */
+
+/*
+ * This is a temporary flag used while tkObjConfig and new widgets are in
+ * development.
+ */
+
+#ifndef __NO_OLD_CONFIG
+
+typedef int (Tk_OptionParseProc) (ClientData clientData, Tcl_Interp *interp,
+	Tk_Window tkwin, CONST84 char *value, char *widgRec, int offset);
+typedef CONST86 char *(Tk_OptionPrintProc) (ClientData clientData,
+	Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr);
+
+typedef struct Tk_CustomOption {
+    Tk_OptionParseProc *parseProc;
+				/* Procedure to call to parse an option and
+				 * store it in converted form. */
+    Tk_OptionPrintProc *printProc;
+				/* Procedure to return a printable string
+				 * describing an existing option. */
+    ClientData clientData;	/* Arbitrary one-word value used by option
+				 * parser: passed to parseProc and
+				 * printProc. */
+} Tk_CustomOption;
+
+/*
+ * Structure used to specify information for Tk_ConfigureWidget. Each
+ * structure gives complete information for one option, including how the
+ * option is specified on the command line, where it appears in the option
+ * database, etc.
+ */
+
+typedef struct Tk_ConfigSpec {
+    int type;			/* Type of option, such as TK_CONFIG_COLOR;
+				 * see definitions below. Last option in table
+				 * must have type TK_CONFIG_END. */
+    CONST86 char *argvName;	/* Switch used to specify option in argv. NULL
+				 * means this spec is part of a group. */
+    Tk_Uid dbName;		/* Name for option in option database. */
+    Tk_Uid dbClass;		/* Class for option in database. */
+    Tk_Uid defValue;		/* Default value for option if not specified
+				 * in command line or database. */
+    int offset;			/* Where in widget record to store value; use
+				 * Tk_Offset macro to generate values for
+				 * this. */
+    int specFlags;		/* Any combination of the values defined
+				 * below; other bits are used internally by
+				 * tkConfig.c. */
+    CONST86 Tk_CustomOption *customPtr;
+				/* If type is TK_CONFIG_CUSTOM then this is a
+				 * pointer to info about how to parse and
+				 * print the option. Otherwise it is
+				 * irrelevant. */
+} Tk_ConfigSpec;
+
+/*
+ * Type values for Tk_ConfigSpec structures. See the user documentation for
+ * details.
+ */
+
+typedef enum {
+    TK_CONFIG_BOOLEAN, TK_CONFIG_INT, TK_CONFIG_DOUBLE, TK_CONFIG_STRING,
+    TK_CONFIG_UID, TK_CONFIG_COLOR, TK_CONFIG_FONT, TK_CONFIG_BITMAP,
+    TK_CONFIG_BORDER, TK_CONFIG_RELIEF, TK_CONFIG_CURSOR,
+    TK_CONFIG_ACTIVE_CURSOR, TK_CONFIG_JUSTIFY, TK_CONFIG_ANCHOR,
+    TK_CONFIG_SYNONYM, TK_CONFIG_CAP_STYLE, TK_CONFIG_JOIN_STYLE,
+    TK_CONFIG_PIXELS, TK_CONFIG_MM, TK_CONFIG_WINDOW, TK_CONFIG_CUSTOM,
+    TK_CONFIG_END
+} Tk_ConfigTypes;
+
+/*
+ * Possible values for flags argument to Tk_ConfigureWidget:
+ */
+
+#define TK_CONFIG_ARGV_ONLY	1
+#define TK_CONFIG_OBJS		0x80
+
+/*
+ * Possible flag values for Tk_ConfigSpec structures. Any bits at or above
+ * TK_CONFIG_USER_BIT may be used by clients for selecting certain entries.
+ * Before changing any values here, coordinate with tkOldConfig.c
+ * (internal-use-only flags are defined there).
+ */
+
+#define TK_CONFIG_NULL_OK		(1 << 0)
+#define TK_CONFIG_COLOR_ONLY		(1 << 1)
+#define TK_CONFIG_MONO_ONLY		(1 << 2)
+#define TK_CONFIG_DONT_SET_DEFAULT	(1 << 3)
+#define TK_CONFIG_OPTION_SPECIFIED      (1 << 4)
+#define TK_CONFIG_USER_BIT		0x100
+#endif /* __NO_OLD_CONFIG */
+
+/*
+ * Structure used to specify how to handle argv options.
+ */
+
+typedef struct {
+    CONST86 char *key;		/* The key string that flags the option in the
+				 * argv array. */
+    int type;			/* Indicates option type; see below. */
+    char *src;			/* Value to be used in setting dst; usage
+				 * depends on type. */
+    char *dst;			/* Address of value to be modified; usage
+				 * depends on type. */
+    CONST86 char *help;		/* Documentation message describing this
+				 * option. */
+} Tk_ArgvInfo;
+
+/*
+ * Legal values for the type field of a Tk_ArgvInfo: see the user
+ * documentation for details.
+ */
+
+#define TK_ARGV_CONSTANT		15
+#define TK_ARGV_INT			16
+#define TK_ARGV_STRING			17
+#define TK_ARGV_UID			18
+#define TK_ARGV_REST			19
+#define TK_ARGV_FLOAT			20
+#define TK_ARGV_FUNC			21
+#define TK_ARGV_GENFUNC			22
+#define TK_ARGV_HELP			23
+#define TK_ARGV_CONST_OPTION		24
+#define TK_ARGV_OPTION_VALUE		25
+#define TK_ARGV_OPTION_NAME_VALUE	26
+#define TK_ARGV_END			27
+
+/*
+ * Flag bits for passing to Tk_ParseArgv:
+ */
+
+#define TK_ARGV_NO_DEFAULTS		0x1
+#define TK_ARGV_NO_LEFTOVERS		0x2
+#define TK_ARGV_NO_ABBREV		0x4
+#define TK_ARGV_DONT_SKIP_FIRST_ARG	0x8
+
+/*
+ * Enumerated type for describing actions to be taken in response to a
+ * restrictProc established by Tk_RestrictEvents.
+ */
+
+typedef enum {
+    TK_DEFER_EVENT, TK_PROCESS_EVENT, TK_DISCARD_EVENT
+} Tk_RestrictAction;
+
+/*
+ * Priority levels to pass to Tk_AddOption:
+ */
+
+#define TK_WIDGET_DEFAULT_PRIO	20
+#define TK_STARTUP_FILE_PRIO	40
+#define TK_USER_DEFAULT_PRIO	60
+#define TK_INTERACTIVE_PRIO	80
+#define TK_MAX_PRIO		100
+
+/*
+ * Relief values returned by Tk_GetRelief:
+ */
+
+#define TK_RELIEF_NULL		-1
+#define TK_RELIEF_FLAT		0
+#define TK_RELIEF_GROOVE	1
+#define TK_RELIEF_RAISED	2
+#define TK_RELIEF_RIDGE		3
+#define TK_RELIEF_SOLID		4
+#define TK_RELIEF_SUNKEN	5
+
+/*
+ * "Which" argument values for Tk_3DBorderGC:
+ */
+
+#define TK_3D_FLAT_GC		1
+#define TK_3D_LIGHT_GC		2
+#define TK_3D_DARK_GC		3
+
+/*
+ * Special EnterNotify/LeaveNotify "mode" for use in events generated by
+ * tkShare.c. Pick a high enough value that it's unlikely to conflict with
+ * existing values (like NotifyNormal) or any new values defined in the
+ * future.
+ */
+
+#define TK_NOTIFY_SHARE		20
+
+/*
+ * Enumerated type for describing a point by which to anchor something:
+ */
+
+typedef enum {
+    TK_ANCHOR_N, TK_ANCHOR_NE, TK_ANCHOR_E, TK_ANCHOR_SE,
+    TK_ANCHOR_S, TK_ANCHOR_SW, TK_ANCHOR_W, TK_ANCHOR_NW,
+    TK_ANCHOR_CENTER
+} Tk_Anchor;
+
+/*
+ * Enumerated type for describing a style of justification:
+ */
+
+typedef enum {
+    TK_JUSTIFY_LEFT, TK_JUSTIFY_RIGHT, TK_JUSTIFY_CENTER
+} Tk_Justify;
+
+/*
+ * The following structure is used by Tk_GetFontMetrics() to return
+ * information about the properties of a Tk_Font.
+ */
+
+typedef struct Tk_FontMetrics {
+    int ascent;			/* The amount in pixels that the tallest
+				 * letter sticks up above the baseline, plus
+				 * any extra blank space added by the designer
+				 * of the font. */
+    int descent;		/* The largest amount in pixels that any
+				 * letter sticks below the baseline, plus any
+				 * extra blank space added by the designer of
+				 * the font. */
+    int linespace;		/* The sum of the ascent and descent. How far
+				 * apart two lines of text in the same font
+				 * should be placed so that none of the
+				 * characters in one line overlap any of the
+				 * characters in the other line. */
+} Tk_FontMetrics;
+
+/*
+ * Flags passed to Tk_MeasureChars:
+ */
+
+#define TK_WHOLE_WORDS		1
+#define TK_AT_LEAST_ONE		2
+#define TK_PARTIAL_OK		4
+
+/*
+ * Flags passed to Tk_ComputeTextLayout:
+ */
+
+#define TK_IGNORE_TABS		8
+#define TK_IGNORE_NEWLINES	16
+
+/*
+ * Widget class procedures used to implement platform specific widget
+ * behavior.
+ */
+
+typedef Window (Tk_ClassCreateProc) (Tk_Window tkwin, Window parent,
+	ClientData instanceData);
+typedef void (Tk_ClassWorldChangedProc) (ClientData instanceData);
+typedef void (Tk_ClassModalProc) (Tk_Window tkwin, XEvent *eventPtr);
+
+typedef struct Tk_ClassProcs {
+    unsigned int size;
+    Tk_ClassWorldChangedProc *worldChangedProc;
+				/* Procedure to invoke when the widget needs
+				 * to respond in some way to a change in the
+				 * world (font changes, etc.) */
+    Tk_ClassCreateProc *createProc;
+				/* Procedure to invoke when the platform-
+				 * dependent window needs to be created. */
+    Tk_ClassModalProc *modalProc;
+				/* Procedure to invoke after all bindings on a
+				 * widget have been triggered in order to
+				 * handle a modal loop. */
+} Tk_ClassProcs;
+
+/*
+ * Simple accessor for Tk_ClassProcs structure. Checks that the structure is
+ * not NULL, then checks the size field and returns either the requested
+ * field, if present, or NULL if the structure is too small to have the field
+ * (or NULL if the structure is NULL).
+ *
+ * A more general version of this function may be useful if other
+ * size-versioned structure pop up in the future:
+ *
+ *	#define Tk_GetField(name, who, which) \
+ *	    (((who) == NULL) ? NULL :
+ *	    (((who)->size <= Tk_Offset(name, which)) ? NULL :(name)->which))
+ */
+
+#define Tk_GetClassProc(procs, which) \
+    (((procs) == NULL) ? NULL : \
+    (((procs)->size <= Tk_Offset(Tk_ClassProcs, which)) ? NULL:(procs)->which))
+
+/*
+ * Each geometry manager (the packer, the placer, etc.) is represented by a
+ * structure of the following form, which indicates procedures to invoke in
+ * the geometry manager to carry out certain functions.
+ */
+
+typedef void (Tk_GeomRequestProc) (ClientData clientData, Tk_Window tkwin);
+typedef void (Tk_GeomLostSlaveProc) (ClientData clientData, Tk_Window tkwin);
+
+typedef struct Tk_GeomMgr {
+    const char *name;		/* Name of the geometry manager (command used
+				 * to invoke it, or name of widget class that
+				 * allows embedded widgets). */
+    Tk_GeomRequestProc *requestProc;
+				/* Procedure to invoke when a slave's
+				 * requested geometry changes. */
+    Tk_GeomLostSlaveProc *lostSlaveProc;
+				/* Procedure to invoke when a slave is taken
+				 * away from one geometry manager by another.
+				 * NULL means geometry manager doesn't care
+				 * when slaves are lost. */
+} Tk_GeomMgr;
+
+/*
+ * Result values returned by Tk_GetScrollInfo:
+ */
+
+#define TK_SCROLL_MOVETO	1
+#define TK_SCROLL_PAGES		2
+#define TK_SCROLL_UNITS		3
+#define TK_SCROLL_ERROR		4
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Extensions to the X event set
+ *
+ *----------------------------------------------------------------------
+ */
+
+#define VirtualEvent	    (MappingNotify + 1)
+#define ActivateNotify	    (MappingNotify + 2)
+#define DeactivateNotify    (MappingNotify + 3)
+#define MouseWheelEvent     (MappingNotify + 4)
+#define TK_LASTEVENT	    (MappingNotify + 5)
+
+#define MouseWheelMask	    (1L << 28)
+#define ActivateMask	    (1L << 29)
+#define VirtualEventMask    (1L << 30)
+
+/*
+ * A virtual event shares most of its fields with the XKeyEvent and
+ * XButtonEvent structures. 99% of the time a virtual event will be an
+ * abstraction of a key or button event, so this structure provides the most
+ * information to the user. The only difference is the changing of the detail
+ * field for a virtual event so that it holds the name of the virtual event
+ * being triggered.
+ *
+ * When using this structure, you should ensure that you zero out all the
+ * fields first using memset() or bzero().
+ */
+
+typedef struct {
+    int type;
+    unsigned long serial;	/* # of last request processed by server. */
+    Bool send_event;		/* True if this came from a SendEvent
+				 * request. */
+    Display *display;		/* Display the event was read from. */
+    Window event;		/* Window on which event was requested. */
+    Window root;		/* Root window that the event occured on. */
+    Window subwindow;		/* Child window. */
+    Time time;			/* Milliseconds. */
+    int x, y;			/* Pointer x, y coordinates in event
+				 * window. */
+    int x_root, y_root;		/* Coordinates relative to root. */
+    unsigned int state;		/* Key or button mask */
+    Tk_Uid name;		/* Name of virtual event. */
+    Bool same_screen;		/* Same screen flag. */
+    Tcl_Obj *user_data;		/* Application-specific data reference; Tk
+				 * will decrement the reference count *once*
+				 * when it has finished processing the
+				 * event. */
+} XVirtualEvent;
+
+typedef struct {
+    int type;
+    unsigned long serial;	/* # of last request processed by server. */
+    Bool send_event;		/* True if this came from a SendEvent
+				 * request. */
+    Display *display;		/* Display the event was read from. */
+    Window window;		/* Window in which event occurred. */
+} XActivateDeactivateEvent;
+typedef XActivateDeactivateEvent XActivateEvent;
+typedef XActivateDeactivateEvent XDeactivateEvent;
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Macros for querying Tk_Window structures. See the manual entries for
+ * documentation.
+ *
+ *----------------------------------------------------------------------
+ */
+
+#define Tk_Display(tkwin)	(((Tk_FakeWin *) (tkwin))->display)
+#define Tk_ScreenNumber(tkwin)	(((Tk_FakeWin *) (tkwin))->screenNum)
+#define Tk_Screen(tkwin) \
+    (ScreenOfDisplay(Tk_Display(tkwin), Tk_ScreenNumber(tkwin)))
+#define Tk_Depth(tkwin)		(((Tk_FakeWin *) (tkwin))->depth)
+#define Tk_Visual(tkwin)	(((Tk_FakeWin *) (tkwin))->visual)
+#define Tk_WindowId(tkwin)	(((Tk_FakeWin *) (tkwin))->window)
+#define Tk_PathName(tkwin) 	(((Tk_FakeWin *) (tkwin))->pathName)
+#define Tk_Name(tkwin)		(((Tk_FakeWin *) (tkwin))->nameUid)
+#define Tk_Class(tkwin) 	(((Tk_FakeWin *) (tkwin))->classUid)
+#define Tk_X(tkwin)		(((Tk_FakeWin *) (tkwin))->changes.x)
+#define Tk_Y(tkwin)		(((Tk_FakeWin *) (tkwin))->changes.y)
+#define Tk_Width(tkwin)		(((Tk_FakeWin *) (tkwin))->changes.width)
+#define Tk_Height(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->changes.height)
+#define Tk_Changes(tkwin)	(&((Tk_FakeWin *) (tkwin))->changes)
+#define Tk_Attributes(tkwin)	(&((Tk_FakeWin *) (tkwin))->atts)
+#define Tk_IsEmbedded(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->flags & TK_EMBEDDED)
+#define Tk_IsContainer(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->flags & TK_CONTAINER)
+#define Tk_IsMapped(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->flags & TK_MAPPED)
+#define Tk_IsTopLevel(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->flags & TK_TOP_LEVEL)
+#define Tk_HasWrapper(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->flags & TK_HAS_WRAPPER)
+#define Tk_WinManaged(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->flags & TK_WIN_MANAGED)
+#define Tk_TopWinHierarchy(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->flags & TK_TOP_HIERARCHY)
+#define Tk_IsManageable(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->flags & TK_WM_MANAGEABLE)
+#define Tk_ReqWidth(tkwin)	(((Tk_FakeWin *) (tkwin))->reqWidth)
+#define Tk_ReqHeight(tkwin)	(((Tk_FakeWin *) (tkwin))->reqHeight)
+/* Tk_InternalBorderWidth is deprecated */
+#define Tk_InternalBorderWidth(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->internalBorderLeft)
+#define Tk_InternalBorderLeft(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->internalBorderLeft)
+#define Tk_InternalBorderRight(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->internalBorderRight)
+#define Tk_InternalBorderTop(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->internalBorderTop)
+#define Tk_InternalBorderBottom(tkwin) \
+    (((Tk_FakeWin *) (tkwin))->internalBorderBottom)
+#define Tk_MinReqWidth(tkwin)	(((Tk_FakeWin *) (tkwin))->minReqWidth)
+#define Tk_MinReqHeight(tkwin)	(((Tk_FakeWin *) (tkwin))->minReqHeight)
+#define Tk_Parent(tkwin)	(((Tk_FakeWin *) (tkwin))->parentPtr)
+#define Tk_Colormap(tkwin)	(((Tk_FakeWin *) (tkwin))->atts.colormap)
+
+/*
+ * The structure below is needed by the macros above so that they can access
+ * the fields of a Tk_Window. The fields not needed by the macros are declared
+ * as "dummyX". The structure has its own type in order to prevent apps from
+ * accessing Tk_Window fields except using official macros. WARNING!! The
+ * structure definition must be kept consistent with the TkWindow structure in
+ * tkInt.h. If you change one, then change the other. See the declaration in
+ * tkInt.h for documentation on what the fields are used for internally.
+ */
+
+typedef struct Tk_FakeWin {
+    Display *display;
+    char *dummy1;		/* dispPtr */
+    int screenNum;
+    Visual *visual;
+    int depth;
+    Window window;
+    char *dummy2;		/* childList */
+    char *dummy3;		/* lastChildPtr */
+    Tk_Window parentPtr;	/* parentPtr */
+    char *dummy4;		/* nextPtr */
+    char *dummy5;		/* mainPtr */
+    char *pathName;
+    Tk_Uid nameUid;
+    Tk_Uid classUid;
+    XWindowChanges changes;
+    unsigned int dummy6;	/* dirtyChanges */
+    XSetWindowAttributes atts;
+    unsigned long dummy7;	/* dirtyAtts */
+    unsigned int flags;
+    char *dummy8;		/* handlerList */
+#ifdef TK_USE_INPUT_METHODS
+    XIC dummy9;			/* inputContext */
+#endif /* TK_USE_INPUT_METHODS */
+    ClientData *dummy10;	/* tagPtr */
+    int dummy11;		/* numTags */
+    int dummy12;		/* optionLevel */
+    char *dummy13;		/* selHandlerList */
+    char *dummy14;		/* geomMgrPtr */
+    ClientData dummy15;		/* geomData */
+    int reqWidth, reqHeight;
+    int internalBorderLeft;
+    char *dummy16;		/* wmInfoPtr */
+    char *dummy17;		/* classProcPtr */
+    ClientData dummy18;		/* instanceData */
+    char *dummy19;		/* privatePtr */
+    int internalBorderRight;
+    int internalBorderTop;
+    int internalBorderBottom;
+    int minReqWidth;
+    int minReqHeight;
+    char *dummy20;		/* geometryMaster */
+} Tk_FakeWin;
+
+/*
+ * Flag values for TkWindow (and Tk_FakeWin) structures are:
+ *
+ * TK_MAPPED:			1 means window is currently mapped,
+ *				0 means unmapped.
+ * TK_TOP_LEVEL:		1 means this is a top-level widget.
+ * TK_ALREADY_DEAD:		1 means the window is in the process of
+ *				being destroyed already.
+ * TK_NEED_CONFIG_NOTIFY:	1 means that the window has been reconfigured
+ *				before it was made to exist. At the time of
+ *				making it exist a ConfigureNotify event needs
+ *				to be generated.
+ * TK_GRAB_FLAG:		Used to manage grabs. See tkGrab.c for details
+ * TK_CHECKED_IC:		1 means we've already tried to get an input
+ *				context for this window; if the ic field is
+ *				NULL it means that there isn't a context for
+ *				the field.
+ * TK_DONT_DESTROY_WINDOW:	1 means that Tk_DestroyWindow should not
+ *				invoke XDestroyWindow to destroy this widget's
+ *				X window. The flag is set when the window has
+ *				already been destroyed elsewhere (e.g. by
+ *				another application) or when it will be
+ *				destroyed later (e.g. by destroying its parent)
+ * TK_WM_COLORMAP_WINDOW:	1 means that this window has at some time
+ *				appeared in the WM_COLORMAP_WINDOWS property
+ *				for its toplevel, so we have to remove it from
+ *				that property if the window is deleted and the
+ *				toplevel isn't.
+ * TK_EMBEDDED:			1 means that this window (which must be a
+ *				toplevel) is not a free-standing window but
+ *				rather is embedded in some other application.
+ * TK_CONTAINER:		1 means that this window is a container, and
+ *				that some other application (either in this
+ *				process or elsewhere) may be embedding itself
+ *				inside the window.
+ * TK_BOTH_HALVES:		1 means that this window is used for
+ *				application embedding (either as container or
+ *				embedded application), and both the containing
+ *				and embedded halves are associated with
+ *				windows in this particular process.
+ * TK_WRAPPER:			1 means that this window is the extra wrapper
+ *				window created around a toplevel to hold the
+ *				menubar under Unix. See tkUnixWm.c for more
+ *				information.
+ * TK_REPARENTED:		1 means that this window has been reparented
+ *				so that as far as the window system is
+ *				concerned it isn't a child of its Tk parent.
+ *				Initially this is used only for special Unix
+ *				menubar windows.
+ * TK_ANONYMOUS_WINDOW:		1 means that this window has no name, and is
+ *				thus not accessible from Tk.
+ * TK_HAS_WRAPPER		1 means that this window has a wrapper window
+ * TK_WIN_MANAGED		1 means that this window is a child of the root
+ *				window, and is managed by the window manager.
+ * TK_TOP_HIERARCHY		1 means this window is at the top of a physical
+ *				window hierarchy within this process, i.e. the
+ *				window's parent either doesn't exist or is not
+ *				owned by this Tk application.
+ * TK_PROP_PROPCHANGE		1 means that PropertyNotify events in the
+ *				window's children should propagate up to this
+ *				window.
+ * TK_WM_MANAGEABLE		1 marks a window as capable of being converted
+ *				into a toplevel using [wm manage].
+ */
+
+#define TK_MAPPED		1
+#define TK_TOP_LEVEL		2
+#define TK_ALREADY_DEAD		4
+#define TK_NEED_CONFIG_NOTIFY	8
+#define TK_GRAB_FLAG		0x10
+#define TK_CHECKED_IC		0x20
+#define TK_DONT_DESTROY_WINDOW	0x40
+#define TK_WM_COLORMAP_WINDOW	0x80
+#define TK_EMBEDDED		0x100
+#define TK_CONTAINER		0x200
+#define TK_BOTH_HALVES		0x400
+#define TK_WRAPPER		0x1000
+#define TK_REPARENTED		0x2000
+#define TK_ANONYMOUS_WINDOW	0x4000
+#define TK_HAS_WRAPPER		0x8000
+#define TK_WIN_MANAGED		0x10000
+#define TK_TOP_HIERARCHY	0x20000
+#define TK_PROP_PROPCHANGE	0x40000
+#define TK_WM_MANAGEABLE	0x80000
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Procedure prototypes and structures used for defining new canvas items:
+ *
+ *----------------------------------------------------------------------
+ */
+
+typedef enum {
+    TK_STATE_NULL = -1, TK_STATE_ACTIVE, TK_STATE_DISABLED,
+    TK_STATE_NORMAL, TK_STATE_HIDDEN
+} Tk_State;
+
+typedef struct Tk_SmoothMethod {
+    CONST86 char *name;
+    int (*coordProc) (Tk_Canvas canvas, double *pointPtr, int numPoints,
+	    int numSteps, XPoint xPoints[], double dblPoints[]);
+    void (*postscriptProc) (Tcl_Interp *interp, Tk_Canvas canvas,
+	    double *coordPtr, int numPoints, int numSteps);
+} Tk_SmoothMethod;
+
+/*
+ * For each item in a canvas widget there exists one record with the following
+ * structure. Each actual item is represented by a record with the following
+ * stuff at its beginning, plus additional type-specific stuff after that.
+ */
+
+#define TK_TAG_SPACE 3
+
+typedef struct Tk_Item {
+    int id;			/* Unique identifier for this item (also
+				 * serves as first tag for item). */
+    struct Tk_Item *nextPtr;	/* Next in display list of all items in this
+				 * canvas. Later items in list are drawn on
+				 * top of earlier ones. */
+    Tk_Uid staticTagSpace[TK_TAG_SPACE];
+				/* Built-in space for limited # of tags. */
+    Tk_Uid *tagPtr;		/* Pointer to array of tags. Usually points to
+				 * staticTagSpace, but may point to malloc-ed
+				 * space if there are lots of tags. */
+    int tagSpace;		/* Total amount of tag space available at
+				 * tagPtr. */
+    int numTags;		/* Number of tag slots actually used at
+				 * *tagPtr. */
+    struct Tk_ItemType *typePtr;/* Table of procedures that implement this
+				 * type of item. */
+    int x1, y1, x2, y2;		/* Bounding box for item, in integer canvas
+				 * units. Set by item-specific code and
+				 * guaranteed to contain every pixel drawn in
+				 * item. Item area includes x1 and y1 but not
+				 * x2 and y2. */
+    struct Tk_Item *prevPtr;	/* Previous in display list of all items in
+				 * this canvas. Later items in list are drawn
+				 * just below earlier ones. */
+    Tk_State state;		/* State of item. */
+    char *reserved1;		/* reserved for future use */
+    int redraw_flags;		/* Some flags used in the canvas */
+
+    /*
+     *------------------------------------------------------------------
+     * Starting here is additional type-specific stuff; see the declarations
+     * for individual types to see what is part of each type. The actual space
+     * below is determined by the "itemInfoSize" of the type's Tk_ItemType
+     * record.
+     *------------------------------------------------------------------
+     */
+} Tk_Item;
+
+/*
+ * Flag bits for canvases (redraw_flags):
+ *
+ * TK_ITEM_STATE_DEPENDANT -	1 means that object needs to be redrawn if the
+ *				canvas state changes.
+ * TK_ITEM_DONT_REDRAW - 	1 means that the object redraw is already been
+ *				prepared, so the general canvas code doesn't
+ *				need to do that any more.
+ */
+
+#define TK_ITEM_STATE_DEPENDANT		1
+#define TK_ITEM_DONT_REDRAW		2
+
+/*
+ * Records of the following type are used to describe a type of item (e.g.
+ * lines, circles, etc.) that can form part of a canvas widget.
+ */
+
+#ifdef USE_OLD_CANVAS
+typedef int	(Tk_ItemCreateProc)(Tcl_Interp *interp, Tk_Canvas canvas,
+		    Tk_Item *itemPtr, int argc, char **argv);
+typedef int	(Tk_ItemConfigureProc)(Tcl_Interp *interp, Tk_Canvas canvas,
+		    Tk_Item *itemPtr, int argc, char **argv, int flags);
+typedef int	(Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas,
+		    Tk_Item *itemPtr, int argc, char **argv);
+#else
+typedef int	(Tk_ItemCreateProc)(Tcl_Interp *interp, Tk_Canvas canvas,
+		    Tk_Item *itemPtr, int argc, Tcl_Obj *const objv[]);
+typedef int	(Tk_ItemConfigureProc)(Tcl_Interp *interp, Tk_Canvas canvas,
+		    Tk_Item *itemPtr, int argc, Tcl_Obj *const objv[],
+		    int flags);
+typedef int	(Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas,
+		    Tk_Item *itemPtr, int argc, Tcl_Obj *const argv[]);
+#endif /* USE_OLD_CANVAS */
+typedef void	(Tk_ItemDeleteProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    Display *display);
+typedef void	(Tk_ItemDisplayProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    Display *display, Drawable dst, int x, int y, int width,
+		    int height);
+typedef double	(Tk_ItemPointProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    double *pointPtr);
+typedef int	(Tk_ItemAreaProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    double *rectPtr);
+typedef int	(Tk_ItemPostscriptProc)(Tcl_Interp *interp, Tk_Canvas canvas,
+		    Tk_Item *itemPtr, int prepass);
+typedef void	(Tk_ItemScaleProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    double originX, double originY, double scaleX,
+		    double scaleY);
+typedef void	(Tk_ItemTranslateProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    double deltaX, double deltaY);
+#ifdef USE_OLD_CANVAS
+typedef int	(Tk_ItemIndexProc)(Tcl_Interp *interp, Tk_Canvas canvas,
+		    Tk_Item *itemPtr, char *indexString, int *indexPtr);
+#else
+typedef int	(Tk_ItemIndexProc)(Tcl_Interp *interp, Tk_Canvas canvas,
+		    Tk_Item *itemPtr, Tcl_Obj *indexString, int *indexPtr);
+#endif /* USE_OLD_CANVAS */
+typedef void	(Tk_ItemCursorProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    int index);
+typedef int	(Tk_ItemSelectionProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    int offset, char *buffer, int maxBytes);
+#ifdef USE_OLD_CANVAS
+typedef void	(Tk_ItemInsertProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    int beforeThis, char *string);
+#else
+typedef void	(Tk_ItemInsertProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    int beforeThis, Tcl_Obj *string);
+#endif /* USE_OLD_CANVAS */
+typedef void	(Tk_ItemDCharsProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    int first, int last);
+
+#ifndef __NO_OLD_CONFIG
+
+typedef struct Tk_ItemType {
+    CONST86 char *name;		/* The name of this type of item, such as
+				 * "line". */
+    int itemSize;		/* Total amount of space needed for item's
+				 * record. */
+    Tk_ItemCreateProc *createProc;
+				/* Procedure to create a new item of this
+				 * type. */
+    CONST86 Tk_ConfigSpec *configSpecs; /* Pointer to array of configuration specs for
+				 * this type. Used for returning configuration
+				 * info. */
+    Tk_ItemConfigureProc *configProc;
+				/* Procedure to call to change configuration
+				 * options. */
+    Tk_ItemCoordProc *coordProc;/* Procedure to call to get and set the item's
+				 * coordinates. */
+    Tk_ItemDeleteProc *deleteProc;
+				/* Procedure to delete existing item of this
+				 * type. */
+    Tk_ItemDisplayProc *displayProc;
+				/* Procedure to display items of this type. */
+    int alwaysRedraw;		/* Non-zero means displayProc should be called
+				 * even when the item has been moved
+				 * off-screen. */
+    Tk_ItemPointProc *pointProc;/* Computes distance from item to a given
+				 * point. */
+    Tk_ItemAreaProc *areaProc;	/* Computes whether item is inside, outside,
+				 * or overlapping an area. */
+    Tk_ItemPostscriptProc *postscriptProc;
+				/* Procedure to write a Postscript description
+				 * for items of this type. */
+    Tk_ItemScaleProc *scaleProc;/* Procedure to rescale items of this type. */
+    Tk_ItemTranslateProc *translateProc;
+				/* Procedure to translate items of this
+				 * type. */
+    Tk_ItemIndexProc *indexProc;/* Procedure to determine index of indicated
+				 * character. NULL if item doesn't support
+				 * indexing. */
+    Tk_ItemCursorProc *icursorProc;
+				/* Procedure to set insert cursor posn to just
+				 * before a given position. */
+    Tk_ItemSelectionProc *selectionProc;
+				/* Procedure to return selection (in STRING
+				 * format) when it is in this item. */
+    Tk_ItemInsertProc *insertProc;
+				/* Procedure to insert something into an
+				 * item. */
+    Tk_ItemDCharsProc *dCharsProc;
+				/* Procedure to delete characters from an
+				 * item. */
+    struct Tk_ItemType *nextPtr;/* Used to link types together into a list. */
+    char *reserved1;		/* Reserved for future extension. */
+    int reserved2;		/* Carefully compatible with */
+    char *reserved3;		/* Jan Nijtmans dash patch */
+    char *reserved4;
+} Tk_ItemType;
+
+/*
+ * Flag (used in the alwaysRedraw field) to say whether an item supports
+ * point-level manipulation like the line and polygon items.
+ */
+
+#define TK_MOVABLE_POINTS	2
+
+#endif /* __NO_OLD_CONFIG */
+
+/*
+ * The following structure provides information about the selection and the
+ * insertion cursor. It is needed by only a few items, such as those that
+ * display text. It is shared by the generic canvas code and the item-specific
+ * code, but most of the fields should be written only by the canvas generic
+ * code.
+ */
+
+typedef struct Tk_CanvasTextInfo {
+    Tk_3DBorder selBorder;	/* Border and background for selected
+				 * characters. Read-only to items.*/
+    int selBorderWidth;		/* Width of border around selection. Read-only
+				 * to items. */
+    XColor *selFgColorPtr;	/* Foreground color for selected text.
+				 * Read-only to items. */
+    Tk_Item *selItemPtr;	/* Pointer to selected item. NULL means
+				 * selection isn't in this canvas. Writable by
+				 * items. */
+    int selectFirst;		/* Character index of first selected
+				 * character. Writable by items. */
+    int selectLast;		/* Character index of last selected character.
+				 * Writable by items. */
+    Tk_Item *anchorItemPtr;	/* Item corresponding to "selectAnchor": not
+				 * necessarily selItemPtr. Read-only to
+				 * items. */
+    int selectAnchor;		/* Character index of fixed end of selection
+				 * (i.e. "select to" operation will use this
+				 * as one end of the selection). Writable by
+				 * items. */
+    Tk_3DBorder insertBorder;	/* Used to draw vertical bar for insertion
+				 * cursor. Read-only to items. */
+    int insertWidth;		/* Total width of insertion cursor. Read-only
+				 * to items. */
+    int insertBorderWidth;	/* Width of 3-D border around insert cursor.
+				 * Read-only to items. */
+    Tk_Item *focusItemPtr;	/* Item that currently has the input focus, or
+				 * NULL if no such item. Read-only to items. */
+    int gotFocus;		/* Non-zero means that the canvas widget has
+				 * the input focus. Read-only to items.*/
+    int cursorOn;		/* Non-zero means that an insertion cursor
+				 * should be displayed in focusItemPtr.
+				 * Read-only to items.*/
+} Tk_CanvasTextInfo;
+
+/*
+ * Structures used for Dashing and Outline.
+ */
+
+typedef struct Tk_Dash {
+    int number;
+    union {
+	char *pt;
+	char array[sizeof(char *)];
+    } pattern;
+} Tk_Dash;
+
+typedef struct Tk_TSOffset {
+    int flags;			/* Flags; see below for possible values */
+    int xoffset;		/* x offset */
+    int yoffset;		/* y offset */
+} Tk_TSOffset;
+
+/*
+ * Bit fields in Tk_Offset->flags:
+ */
+
+#define TK_OFFSET_INDEX		1
+#define TK_OFFSET_RELATIVE	2
+#define TK_OFFSET_LEFT		4
+#define TK_OFFSET_CENTER	8
+#define TK_OFFSET_RIGHT		16
+#define TK_OFFSET_TOP		32
+#define TK_OFFSET_MIDDLE	64
+#define TK_OFFSET_BOTTOM	128
+
+typedef struct Tk_Outline {
+    GC gc;			/* Graphics context. */
+    double width;		/* Width of outline. */
+    double activeWidth;		/* Width of outline. */
+    double disabledWidth;	/* Width of outline. */
+    int offset;			/* Dash offset. */
+    Tk_Dash dash;		/* Dash pattern. */
+    Tk_Dash activeDash;		/* Dash pattern if state is active. */
+    Tk_Dash disabledDash;	/* Dash pattern if state is disabled. */
+    void *reserved1;		/* Reserved for future expansion. */
+    void *reserved2;
+    void *reserved3;
+    Tk_TSOffset tsoffset;	/* Stipple offset for outline. */
+    XColor *color;		/* Outline color. */
+    XColor *activeColor;	/* Outline color if state is active. */
+    XColor *disabledColor;	/* Outline color if state is disabled. */
+    Pixmap stipple;		/* Outline Stipple pattern. */
+    Pixmap activeStipple;	/* Outline Stipple pattern if state is
+				 * active. */
+    Pixmap disabledStipple;	/* Outline Stipple pattern if state is
+				 * disabled. */
+} Tk_Outline;
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Procedure prototypes and structures used for managing images:
+ *
+ *----------------------------------------------------------------------
+ */
+
+typedef struct Tk_ImageType Tk_ImageType;
+#ifdef USE_OLD_IMAGE
+typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, char *name, int argc,
+	char **argv, Tk_ImageType *typePtr, Tk_ImageMaster master,
+	ClientData *masterDataPtr);
+#else
+typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, CONST86 char *name, int objc,
+	Tcl_Obj *const objv[], CONST86 Tk_ImageType *typePtr, Tk_ImageMaster master,
+	ClientData *masterDataPtr);
+#endif /* USE_OLD_IMAGE */
+typedef ClientData (Tk_ImageGetProc) (Tk_Window tkwin, ClientData masterData);
+typedef void (Tk_ImageDisplayProc) (ClientData instanceData, Display *display,
+	Drawable drawable, int imageX, int imageY, int width, int height,
+	int drawableX, int drawableY);
+typedef void (Tk_ImageFreeProc) (ClientData instanceData, Display *display);
+typedef void (Tk_ImageDeleteProc) (ClientData masterData);
+typedef void (Tk_ImageChangedProc) (ClientData clientData, int x, int y,
+	int width, int height, int imageWidth, int imageHeight);
+typedef int (Tk_ImagePostscriptProc) (ClientData clientData,
+	Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psinfo,
+	int x, int y, int width, int height, int prepass);
+
+/*
+ * The following structure represents a particular type of image (bitmap, xpm
+ * image, etc.). It provides information common to all images of that type,
+ * such as the type name and a collection of procedures in the image manager
+ * that respond to various events. Each image manager is represented by one of
+ * these structures.
+ */
+
+struct Tk_ImageType {
+    CONST86 char *name;		/* Name of image type. */
+    Tk_ImageCreateProc *createProc;
+				/* Procedure to call to create a new image of
+				 * this type. */
+    Tk_ImageGetProc *getProc;	/* Procedure to call the first time
+				 * Tk_GetImage is called in a new way (new
+				 * visual or screen). */
+    Tk_ImageDisplayProc *displayProc;
+				/* Call to draw image, in response to
+				 * Tk_RedrawImage calls. */
+    Tk_ImageFreeProc *freeProc;	/* Procedure to call whenever Tk_FreeImage is
+				 * called to release an instance of an
+				 * image. */
+    Tk_ImageDeleteProc *deleteProc;
+				/* Procedure to call to delete image. It will
+				 * not be called until after freeProc has been
+				 * called for each instance of the image. */
+    Tk_ImagePostscriptProc *postscriptProc;
+				/* Procedure to call to produce postscript
+				 * output for the image. */
+    struct Tk_ImageType *nextPtr;
+				/* Next in list of all image types currently
+				 * known. Filled in by Tk, not by image
+				 * manager. */
+    char *reserved;		/* reserved for future expansion */
+};
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Additional definitions used to manage images of type "photo".
+ *
+ *----------------------------------------------------------------------
+ */
+
+/*
+ * The following type is used to identify a particular photo image to be
+ * manipulated:
+ */
+
+typedef void *Tk_PhotoHandle;
+
+/*
+ * The following structure describes a block of pixels in memory:
+ */
+
+typedef struct Tk_PhotoImageBlock {
+    unsigned char *pixelPtr;	/* Pointer to the first pixel. */
+    int width;			/* Width of block, in pixels. */
+    int height;			/* Height of block, in pixels. */
+    int pitch;			/* Address difference between corresponding
+				 * pixels in successive lines. */
+    int pixelSize;		/* Address difference between successive
+				 * pixels in the same line. */
+    int offset[4];		/* Address differences between the red, green,
+				 * blue and alpha components of the pixel and
+				 * the pixel as a whole. */
+} Tk_PhotoImageBlock;
+
+/*
+ * The following values control how blocks are combined into photo images when
+ * the alpha component of a pixel is not 255, a.k.a. the compositing rule.
+ */
+
+#define TK_PHOTO_COMPOSITE_OVERLAY	0
+#define TK_PHOTO_COMPOSITE_SET		1
+
+/*
+ * Procedure prototypes and structures used in reading and writing photo
+ * images:
+ */
+
+typedef struct Tk_PhotoImageFormat Tk_PhotoImageFormat;
+#ifdef USE_OLD_IMAGE
+typedef int (Tk_ImageFileMatchProc) (Tcl_Channel chan, char *fileName,
+	char *formatString, int *widthPtr, int *heightPtr);
+typedef int (Tk_ImageStringMatchProc) (char *string, char *formatString,
+	int *widthPtr, int *heightPtr);
+typedef int (Tk_ImageFileReadProc) (Tcl_Interp *interp, Tcl_Channel chan,
+	char *fileName, char *formatString, Tk_PhotoHandle imageHandle,
+	int destX, int destY, int width, int height, int srcX, int srcY);
+typedef int (Tk_ImageStringReadProc) (Tcl_Interp *interp, char *string,
+	char *formatString, Tk_PhotoHandle imageHandle, int destX, int destY,
+	int width, int height, int srcX, int srcY);
+typedef int (Tk_ImageFileWriteProc) (Tcl_Interp *interp, char *fileName,
+	char *formatString, Tk_PhotoImageBlock *blockPtr);
+typedef int (Tk_ImageStringWriteProc) (Tcl_Interp *interp,
+	Tcl_DString *dataPtr, char *formatString, Tk_PhotoImageBlock *blockPtr);
+#else
+typedef int (Tk_ImageFileMatchProc) (Tcl_Channel chan, const char *fileName,
+	Tcl_Obj *format, int *widthPtr, int *heightPtr, Tcl_Interp *interp);
+typedef int (Tk_ImageStringMatchProc) (Tcl_Obj *dataObj, Tcl_Obj *format,
+	int *widthPtr, int *heightPtr, Tcl_Interp *interp);
+typedef int (Tk_ImageFileReadProc) (Tcl_Interp *interp, Tcl_Channel chan,
+	const char *fileName, Tcl_Obj *format, Tk_PhotoHandle imageHandle,
+	int destX, int destY, int width, int height, int srcX, int srcY);
+typedef int (Tk_ImageStringReadProc) (Tcl_Interp *interp, Tcl_Obj *dataObj,
+	Tcl_Obj *format, Tk_PhotoHandle imageHandle, int destX, int destY,
+	int width, int height, int srcX, int srcY);
+typedef int (Tk_ImageFileWriteProc) (Tcl_Interp *interp, const char *fileName,
+	Tcl_Obj *format, Tk_PhotoImageBlock *blockPtr);
+typedef int (Tk_ImageStringWriteProc) (Tcl_Interp *interp, Tcl_Obj *format,
+	Tk_PhotoImageBlock *blockPtr);
+#endif /* USE_OLD_IMAGE */
+
+/*
+ * The following structure represents a particular file format for storing
+ * images (e.g., PPM, GIF, JPEG, etc.). It provides information to allow image
+ * files of that format to be recognized and read into a photo image.
+ */
+
+struct Tk_PhotoImageFormat {
+    CONST86 char *name;		/* Name of image file format */
+    Tk_ImageFileMatchProc *fileMatchProc;
+				/* Procedure to call to determine whether an
+				 * image file matches this format. */
+    Tk_ImageStringMatchProc *stringMatchProc;
+				/* Procedure to call to determine whether the
+				 * data in a string matches this format. */
+    Tk_ImageFileReadProc *fileReadProc;
+				/* Procedure to call to read data from an
+				 * image file into a photo image. */
+    Tk_ImageStringReadProc *stringReadProc;
+				/* Procedure to call to read data from a
+				 * string into a photo image. */
+    Tk_ImageFileWriteProc *fileWriteProc;
+				/* Procedure to call to write data from a
+				 * photo image to a file. */
+    Tk_ImageStringWriteProc *stringWriteProc;
+				/* Procedure to call to obtain a string
+				 * representation of the data in a photo
+				 * image.*/
+    struct Tk_PhotoImageFormat *nextPtr;
+				/* Next in list of all photo image formats
+				 * currently known. Filled in by Tk, not by
+				 * image format handler. */
+};
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Procedure prototypes and structures used for managing styles:
+ *
+ *----------------------------------------------------------------------
+ */
+
+/*
+ * Style support version tag.
+ */
+
+#define TK_STYLE_VERSION_1      0x1
+#define TK_STYLE_VERSION        TK_STYLE_VERSION_1
+
+/*
+ * The following structures and prototypes are used as static templates to
+ * declare widget elements.
+ */
+
+typedef void (Tk_GetElementSizeProc) (ClientData clientData, char *recordPtr,
+	const Tk_OptionSpec **optionsPtr, Tk_Window tkwin, int width,
+	int height, int inner, int *widthPtr, int *heightPtr);
+typedef void (Tk_GetElementBoxProc) (ClientData clientData, char *recordPtr,
+	const Tk_OptionSpec **optionsPtr, Tk_Window tkwin, int x, int y,
+	int width, int height, int inner, int *xPtr, int *yPtr, int *widthPtr,
+	int *heightPtr);
+typedef int (Tk_GetElementBorderWidthProc) (ClientData clientData,
+	char *recordPtr, const Tk_OptionSpec **optionsPtr, Tk_Window tkwin);
+typedef void (Tk_DrawElementProc) (ClientData clientData, char *recordPtr,
+	const Tk_OptionSpec **optionsPtr, Tk_Window tkwin, Drawable d, int x,
+	int y, int width, int height, int state);
+
+typedef struct Tk_ElementOptionSpec {
+    char *name;			/* Name of the required option. */
+    Tk_OptionType type;		/* Accepted option type. TK_OPTION_END means
+				 * any. */
+} Tk_ElementOptionSpec;
+
+typedef struct Tk_ElementSpec {
+    int version;		/* Version of the style support. */
+    char *name;			/* Name of element. */
+    Tk_ElementOptionSpec *options;
+				/* List of required options. Last one's name
+				 * must be NULL. */
+    Tk_GetElementSizeProc *getSize;
+				/* Compute the external (resp. internal) size
+				 * of the element from its desired internal
+				 * (resp. external) size. */
+    Tk_GetElementBoxProc *getBox;
+				/* Compute the inscribed or bounding boxes
+				 * within a given area. */
+    Tk_GetElementBorderWidthProc *getBorderWidth;
+				/* Return the element's internal border width.
+				 * Mostly useful for widgets. */
+    Tk_DrawElementProc *draw;	/* Draw the element in the given bounding
+				 * box. */
+} Tk_ElementSpec;
+
+/*
+ * Element state flags. Can be OR'ed.
+ */
+
+#define TK_ELEMENT_STATE_ACTIVE         1<<0
+#define TK_ELEMENT_STATE_DISABLED       1<<1
+#define TK_ELEMENT_STATE_FOCUS          1<<2
+#define TK_ELEMENT_STATE_PRESSED        1<<3
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * The definitions below provide backward compatibility for functions and
+ * types related to event handling that used to be in Tk but have moved to
+ * Tcl.
+ *
+ *----------------------------------------------------------------------
+ */
+
+#define TK_READABLE		TCL_READABLE
+#define TK_WRITABLE		TCL_WRITABLE
+#define TK_EXCEPTION		TCL_EXCEPTION
+
+#define TK_DONT_WAIT		TCL_DONT_WAIT
+#define TK_X_EVENTS		TCL_WINDOW_EVENTS
+#define TK_WINDOW_EVENTS	TCL_WINDOW_EVENTS
+#define TK_FILE_EVENTS		TCL_FILE_EVENTS
+#define TK_TIMER_EVENTS		TCL_TIMER_EVENTS
+#define TK_IDLE_EVENTS		TCL_IDLE_EVENTS
+#define TK_ALL_EVENTS		TCL_ALL_EVENTS
+
+#define Tk_IdleProc		Tcl_IdleProc
+#define Tk_FileProc		Tcl_FileProc
+#define Tk_TimerProc		Tcl_TimerProc
+#define Tk_TimerToken		Tcl_TimerToken
+
+#define Tk_BackgroundError	Tcl_BackgroundError
+#define Tk_CancelIdleCall	Tcl_CancelIdleCall
+#define Tk_CreateFileHandler	Tcl_CreateFileHandler
+#define Tk_CreateTimerHandler	Tcl_CreateTimerHandler
+#define Tk_DeleteFileHandler	Tcl_DeleteFileHandler
+#define Tk_DeleteTimerHandler	Tcl_DeleteTimerHandler
+#define Tk_DoOneEvent		Tcl_DoOneEvent
+#define Tk_DoWhenIdle		Tcl_DoWhenIdle
+#define Tk_Sleep		Tcl_Sleep
+
+/* Additional stuff that has moved to Tcl: */
+
+#define Tk_EventuallyFree	Tcl_EventuallyFree
+#define Tk_FreeProc		Tcl_FreeProc
+#define Tk_Preserve		Tcl_Preserve
+#define Tk_Release		Tcl_Release
+
+/* Removed Tk_Main, use macro instead */
+#if defined(_WIN32) || defined(__CYGWIN__)
+#define Tk_Main(argc, argv, proc) Tk_MainEx(argc, argv, proc, \
+	(Tcl_FindExecutable(0), (Tcl_CreateInterp)()))
+#else
+#define Tk_Main(argc, argv, proc) Tk_MainEx(argc, argv, proc, \
+	(Tcl_FindExecutable(argv[0]), (Tcl_CreateInterp)()))
+#endif
+const char *		Tk_InitStubs(Tcl_Interp *interp, const char *version,
+				int exact);
+EXTERN const char *	Tk_PkgInitStubsCheck(Tcl_Interp *interp,
+				const char *version, int exact);
+
+#ifndef USE_TK_STUBS
+#define Tk_InitStubs(interp, version, exact) \
+    Tk_PkgInitStubsCheck(interp, version, exact)
+#endif /* USE_TK_STUBS */
+
+#define Tk_InitImageArgs(interp, argc, argv) /**/
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Additional procedure types defined by Tk.
+ *
+ *----------------------------------------------------------------------
+ */
+
+typedef int (Tk_ErrorProc) (ClientData clientData, XErrorEvent *errEventPtr);
+typedef void (Tk_EventProc) (ClientData clientData, XEvent *eventPtr);
+typedef int (Tk_GenericProc) (ClientData clientData, XEvent *eventPtr);
+typedef int (Tk_ClientMessageProc) (Tk_Window tkwin, XEvent *eventPtr);
+typedef int (Tk_GetSelProc) (ClientData clientData, Tcl_Interp *interp,
+	CONST86 char *portion);
+typedef void (Tk_LostSelProc) (ClientData clientData);
+typedef Tk_RestrictAction (Tk_RestrictProc) (ClientData clientData,
+	XEvent *eventPtr);
+typedef int (Tk_SelectionProc) (ClientData clientData, int offset,
+	char *buffer, int maxBytes);
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Platform independent exported procedures and variables.
+ *
+ *----------------------------------------------------------------------
+ */
+
+#include "tkDecls.h"
+
+#ifdef USE_OLD_IMAGE
+#undef Tk_CreateImageType
+#define Tk_CreateImageType		Tk_CreateOldImageType
+#undef Tk_CreatePhotoImageFormat
+#define Tk_CreatePhotoImageFormat	Tk_CreateOldPhotoImageFormat
+#endif /* USE_OLD_IMAGE */
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Allow users to say that they don't want to alter their source to add extra
+ * arguments to Tk_PhotoPutBlock() et al; DO NOT DEFINE THIS WHEN BUILDING TK.
+ *
+ * This goes after the inclusion of the stubbed-decls so that the declarations
+ * of what is actually there can be correct.
+ */
+
+#ifdef USE_COMPOSITELESS_PHOTO_PUT_BLOCK
+#   ifdef Tk_PhotoPutBlock
+#	undef Tk_PhotoPutBlock
+#   endif
+#   define Tk_PhotoPutBlock		Tk_PhotoPutBlock_NoComposite
+#   ifdef Tk_PhotoPutZoomedBlock
+#	undef Tk_PhotoPutZoomedBlock
+#   endif
+#   define Tk_PhotoPutZoomedBlock	Tk_PhotoPutZoomedBlock_NoComposite
+#   define USE_PANIC_ON_PHOTO_ALLOC_FAILURE
+#else /* !USE_COMPOSITELESS_PHOTO_PUT_BLOCK */
+#   ifdef USE_PANIC_ON_PHOTO_ALLOC_FAILURE
+#	ifdef Tk_PhotoPutBlock
+#	    undef Tk_PhotoPutBlock
+#	endif
+#	define Tk_PhotoPutBlock		Tk_PhotoPutBlock_Panic
+#	ifdef Tk_PhotoPutZoomedBlock
+#	    undef Tk_PhotoPutZoomedBlock
+#	endif
+#	define Tk_PhotoPutZoomedBlock	Tk_PhotoPutZoomedBlock_Panic
+#   endif /* USE_PANIC_ON_PHOTO_ALLOC_FAILURE */
+#endif /* USE_COMPOSITELESS_PHOTO_PUT_BLOCK */
+#ifdef USE_PANIC_ON_PHOTO_ALLOC_FAILURE
+#   ifdef Tk_PhotoExpand
+#	undef Tk_PhotoExpand
+#   endif
+#   define Tk_PhotoExpand		Tk_PhotoExpand_Panic
+#   ifdef Tk_PhotoSetSize
+#	undef Tk_PhotoSetSize
+#   endif
+#   define Tk_PhotoSetSize		Tk_PhotoSetSize_Panic
+#endif /* USE_PANIC_ON_PHOTO_ALLOC_FAILURE */
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
+#endif /* RC_INVOKED */
+
+/*
+ * end block for C++
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _TK */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tkDecls.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tkDecls.h
new file mode 100644
index 00000000..64c32cd2
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tkDecls.h
@@ -0,0 +1,1733 @@
+/*
+ * tkDecls.h --
+ *
+ *	Declarations of functions in the platform independent public Tcl API.
+ *
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#ifndef _TKDECLS
+#define _TKDECLS
+
+#ifdef BUILD_tk
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
+#endif
+
+/*
+ * WARNING: This file is automatically generated by the tools/genStubs.tcl
+ * script.  Any modifications to the function declarations below should be made
+ * in the generic/tk.decls script.
+ */
+
+/* !BEGIN!: Do not edit below this line. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+/* 0 */
+EXTERN void		Tk_MainLoop(void);
+/* 1 */
+EXTERN XColor *		Tk_3DBorderColor(Tk_3DBorder border);
+/* 2 */
+EXTERN GC		Tk_3DBorderGC(Tk_Window tkwin, Tk_3DBorder border,
+				int which);
+/* 3 */
+EXTERN void		Tk_3DHorizontalBevel(Tk_Window tkwin,
+				Drawable drawable, Tk_3DBorder border, int x,
+				int y, int width, int height, int leftIn,
+				int rightIn, int topBevel, int relief);
+/* 4 */
+EXTERN void		Tk_3DVerticalBevel(Tk_Window tkwin,
+				Drawable drawable, Tk_3DBorder border, int x,
+				int y, int width, int height, int leftBevel,
+				int relief);
+/* 5 */
+EXTERN void		Tk_AddOption(Tk_Window tkwin, const char *name,
+				const char *value, int priority);
+/* 6 */
+EXTERN void		Tk_BindEvent(Tk_BindingTable bindingTable,
+				XEvent *eventPtr, Tk_Window tkwin,
+				int numObjects, ClientData *objectPtr);
+/* 7 */
+EXTERN void		Tk_CanvasDrawableCoords(Tk_Canvas canvas, double x,
+				double y, short *drawableXPtr,
+				short *drawableYPtr);
+/* 8 */
+EXTERN void		Tk_CanvasEventuallyRedraw(Tk_Canvas canvas, int x1,
+				int y1, int x2, int y2);
+/* 9 */
+EXTERN int		Tk_CanvasGetCoord(Tcl_Interp *interp,
+				Tk_Canvas canvas, const char *str,
+				double *doublePtr);
+/* 10 */
+EXTERN Tk_CanvasTextInfo * Tk_CanvasGetTextInfo(Tk_Canvas canvas);
+/* 11 */
+EXTERN int		Tk_CanvasPsBitmap(Tcl_Interp *interp,
+				Tk_Canvas canvas, Pixmap bitmap, int x,
+				int y, int width, int height);
+/* 12 */
+EXTERN int		Tk_CanvasPsColor(Tcl_Interp *interp,
+				Tk_Canvas canvas, XColor *colorPtr);
+/* 13 */
+EXTERN int		Tk_CanvasPsFont(Tcl_Interp *interp, Tk_Canvas canvas,
+				Tk_Font font);
+/* 14 */
+EXTERN void		Tk_CanvasPsPath(Tcl_Interp *interp, Tk_Canvas canvas,
+				double *coordPtr, int numPoints);
+/* 15 */
+EXTERN int		Tk_CanvasPsStipple(Tcl_Interp *interp,
+				Tk_Canvas canvas, Pixmap bitmap);
+/* 16 */
+EXTERN double		Tk_CanvasPsY(Tk_Canvas canvas, double y);
+/* 17 */
+EXTERN void		Tk_CanvasSetStippleOrigin(Tk_Canvas canvas, GC gc);
+/* 18 */
+EXTERN int		Tk_CanvasTagsParseProc(ClientData clientData,
+				Tcl_Interp *interp, Tk_Window tkwin,
+				const char *value, char *widgRec, int offset);
+/* 19 */
+EXTERN CONST86 char *	Tk_CanvasTagsPrintProc(ClientData clientData,
+				Tk_Window tkwin, char *widgRec, int offset,
+				Tcl_FreeProc **freeProcPtr);
+/* 20 */
+EXTERN Tk_Window	Tk_CanvasTkwin(Tk_Canvas canvas);
+/* 21 */
+EXTERN void		Tk_CanvasWindowCoords(Tk_Canvas canvas, double x,
+				double y, short *screenXPtr,
+				short *screenYPtr);
+/* 22 */
+EXTERN void		Tk_ChangeWindowAttributes(Tk_Window tkwin,
+				unsigned long valueMask,
+				XSetWindowAttributes *attsPtr);
+/* 23 */
+EXTERN int		Tk_CharBbox(Tk_TextLayout layout, int index,
+				int *xPtr, int *yPtr, int *widthPtr,
+				int *heightPtr);
+/* 24 */
+EXTERN void		Tk_ClearSelection(Tk_Window tkwin, Atom selection);
+/* 25 */
+EXTERN int		Tk_ClipboardAppend(Tcl_Interp *interp,
+				Tk_Window tkwin, Atom target, Atom format,
+				const char *buffer);
+/* 26 */
+EXTERN int		Tk_ClipboardClear(Tcl_Interp *interp,
+				Tk_Window tkwin);
+/* 27 */
+EXTERN int		Tk_ConfigureInfo(Tcl_Interp *interp, Tk_Window tkwin,
+				const Tk_ConfigSpec *specs, char *widgRec,
+				const char *argvName, int flags);
+/* 28 */
+EXTERN int		Tk_ConfigureValue(Tcl_Interp *interp,
+				Tk_Window tkwin, const Tk_ConfigSpec *specs,
+				char *widgRec, const char *argvName,
+				int flags);
+/* 29 */
+EXTERN int		Tk_ConfigureWidget(Tcl_Interp *interp,
+				Tk_Window tkwin, const Tk_ConfigSpec *specs,
+				int argc, CONST84 char **argv, char *widgRec,
+				int flags);
+/* 30 */
+EXTERN void		Tk_ConfigureWindow(Tk_Window tkwin,
+				unsigned int valueMask,
+				XWindowChanges *valuePtr);
+/* 31 */
+EXTERN Tk_TextLayout	Tk_ComputeTextLayout(Tk_Font font, const char *str,
+				int numChars, int wrapLength,
+				Tk_Justify justify, int flags, int *widthPtr,
+				int *heightPtr);
+/* 32 */
+EXTERN Tk_Window	Tk_CoordsToWindow(int rootX, int rootY,
+				Tk_Window tkwin);
+/* 33 */
+EXTERN unsigned long	Tk_CreateBinding(Tcl_Interp *interp,
+				Tk_BindingTable bindingTable,
+				ClientData object, const char *eventStr,
+				const char *script, int append);
+/* 34 */
+EXTERN Tk_BindingTable	Tk_CreateBindingTable(Tcl_Interp *interp);
+/* 35 */
+EXTERN Tk_ErrorHandler	Tk_CreateErrorHandler(Display *display, int errNum,
+				int request, int minorCode,
+				Tk_ErrorProc *errorProc,
+				ClientData clientData);
+/* 36 */
+EXTERN void		Tk_CreateEventHandler(Tk_Window token,
+				unsigned long mask, Tk_EventProc *proc,
+				ClientData clientData);
+/* 37 */
+EXTERN void		Tk_CreateGenericHandler(Tk_GenericProc *proc,
+				ClientData clientData);
+/* 38 */
+EXTERN void		Tk_CreateImageType(const Tk_ImageType *typePtr);
+/* 39 */
+EXTERN void		Tk_CreateItemType(Tk_ItemType *typePtr);
+/* 40 */
+EXTERN void		Tk_CreatePhotoImageFormat(
+				const Tk_PhotoImageFormat *formatPtr);
+/* 41 */
+EXTERN void		Tk_CreateSelHandler(Tk_Window tkwin, Atom selection,
+				Atom target, Tk_SelectionProc *proc,
+				ClientData clientData, Atom format);
+/* 42 */
+EXTERN Tk_Window	Tk_CreateWindow(Tcl_Interp *interp, Tk_Window parent,
+				const char *name, const char *screenName);
+/* 43 */
+EXTERN Tk_Window	Tk_CreateWindowFromPath(Tcl_Interp *interp,
+				Tk_Window tkwin, const char *pathName,
+				const char *screenName);
+/* 44 */
+EXTERN int		Tk_DefineBitmap(Tcl_Interp *interp, const char *name,
+				const void *source, int width, int height);
+/* 45 */
+EXTERN void		Tk_DefineCursor(Tk_Window window, Tk_Cursor cursor);
+/* 46 */
+EXTERN void		Tk_DeleteAllBindings(Tk_BindingTable bindingTable,
+				ClientData object);
+/* 47 */
+EXTERN int		Tk_DeleteBinding(Tcl_Interp *interp,
+				Tk_BindingTable bindingTable,
+				ClientData object, const char *eventStr);
+/* 48 */
+EXTERN void		Tk_DeleteBindingTable(Tk_BindingTable bindingTable);
+/* 49 */
+EXTERN void		Tk_DeleteErrorHandler(Tk_ErrorHandler handler);
+/* 50 */
+EXTERN void		Tk_DeleteEventHandler(Tk_Window token,
+				unsigned long mask, Tk_EventProc *proc,
+				ClientData clientData);
+/* 51 */
+EXTERN void		Tk_DeleteGenericHandler(Tk_GenericProc *proc,
+				ClientData clientData);
+/* 52 */
+EXTERN void		Tk_DeleteImage(Tcl_Interp *interp, const char *name);
+/* 53 */
+EXTERN void		Tk_DeleteSelHandler(Tk_Window tkwin, Atom selection,
+				Atom target);
+/* 54 */
+EXTERN void		Tk_DestroyWindow(Tk_Window tkwin);
+/* 55 */
+EXTERN CONST84_RETURN char * Tk_DisplayName(Tk_Window tkwin);
+/* 56 */
+EXTERN int		Tk_DistanceToTextLayout(Tk_TextLayout layout, int x,
+				int y);
+/* 57 */
+EXTERN void		Tk_Draw3DPolygon(Tk_Window tkwin, Drawable drawable,
+				Tk_3DBorder border, XPoint *pointPtr,
+				int numPoints, int borderWidth,
+				int leftRelief);
+/* 58 */
+EXTERN void		Tk_Draw3DRectangle(Tk_Window tkwin,
+				Drawable drawable, Tk_3DBorder border, int x,
+				int y, int width, int height,
+				int borderWidth, int relief);
+/* 59 */
+EXTERN void		Tk_DrawChars(Display *display, Drawable drawable,
+				GC gc, Tk_Font tkfont, const char *source,
+				int numBytes, int x, int y);
+/* 60 */
+EXTERN void		Tk_DrawFocusHighlight(Tk_Window tkwin, GC gc,
+				int width, Drawable drawable);
+/* 61 */
+EXTERN void		Tk_DrawTextLayout(Display *display,
+				Drawable drawable, GC gc,
+				Tk_TextLayout layout, int x, int y,
+				int firstChar, int lastChar);
+/* 62 */
+EXTERN void		Tk_Fill3DPolygon(Tk_Window tkwin, Drawable drawable,
+				Tk_3DBorder border, XPoint *pointPtr,
+				int numPoints, int borderWidth,
+				int leftRelief);
+/* 63 */
+EXTERN void		Tk_Fill3DRectangle(Tk_Window tkwin,
+				Drawable drawable, Tk_3DBorder border, int x,
+				int y, int width, int height,
+				int borderWidth, int relief);
+/* 64 */
+EXTERN Tk_PhotoHandle	Tk_FindPhoto(Tcl_Interp *interp,
+				const char *imageName);
+/* 65 */
+EXTERN Font		Tk_FontId(Tk_Font font);
+/* 66 */
+EXTERN void		Tk_Free3DBorder(Tk_3DBorder border);
+/* 67 */
+EXTERN void		Tk_FreeBitmap(Display *display, Pixmap bitmap);
+/* 68 */
+EXTERN void		Tk_FreeColor(XColor *colorPtr);
+/* 69 */
+EXTERN void		Tk_FreeColormap(Display *display, Colormap colormap);
+/* 70 */
+EXTERN void		Tk_FreeCursor(Display *display, Tk_Cursor cursor);
+/* 71 */
+EXTERN void		Tk_FreeFont(Tk_Font f);
+/* 72 */
+EXTERN void		Tk_FreeGC(Display *display, GC gc);
+/* 73 */
+EXTERN void		Tk_FreeImage(Tk_Image image);
+/* 74 */
+EXTERN void		Tk_FreeOptions(const Tk_ConfigSpec *specs,
+				char *widgRec, Display *display,
+				int needFlags);
+/* 75 */
+EXTERN void		Tk_FreePixmap(Display *display, Pixmap pixmap);
+/* 76 */
+EXTERN void		Tk_FreeTextLayout(Tk_TextLayout textLayout);
+/* 77 */
+EXTERN void		Tk_FreeXId(Display *display, XID xid);
+/* 78 */
+EXTERN GC		Tk_GCForColor(XColor *colorPtr, Drawable drawable);
+/* 79 */
+EXTERN void		Tk_GeometryRequest(Tk_Window tkwin, int reqWidth,
+				int reqHeight);
+/* 80 */
+EXTERN Tk_3DBorder	Tk_Get3DBorder(Tcl_Interp *interp, Tk_Window tkwin,
+				Tk_Uid colorName);
+/* 81 */
+EXTERN void		Tk_GetAllBindings(Tcl_Interp *interp,
+				Tk_BindingTable bindingTable,
+				ClientData object);
+/* 82 */
+EXTERN int		Tk_GetAnchor(Tcl_Interp *interp, const char *str,
+				Tk_Anchor *anchorPtr);
+/* 83 */
+EXTERN CONST84_RETURN char * Tk_GetAtomName(Tk_Window tkwin, Atom atom);
+/* 84 */
+EXTERN CONST84_RETURN char * Tk_GetBinding(Tcl_Interp *interp,
+				Tk_BindingTable bindingTable,
+				ClientData object, const char *eventStr);
+/* 85 */
+EXTERN Pixmap		Tk_GetBitmap(Tcl_Interp *interp, Tk_Window tkwin,
+				const char *str);
+/* 86 */
+EXTERN Pixmap		Tk_GetBitmapFromData(Tcl_Interp *interp,
+				Tk_Window tkwin, const void *source,
+				int width, int height);
+/* 87 */
+EXTERN int		Tk_GetCapStyle(Tcl_Interp *interp, const char *str,
+				int *capPtr);
+/* 88 */
+EXTERN XColor *		Tk_GetColor(Tcl_Interp *interp, Tk_Window tkwin,
+				Tk_Uid name);
+/* 89 */
+EXTERN XColor *		Tk_GetColorByValue(Tk_Window tkwin, XColor *colorPtr);
+/* 90 */
+EXTERN Colormap		Tk_GetColormap(Tcl_Interp *interp, Tk_Window tkwin,
+				const char *str);
+/* 91 */
+EXTERN Tk_Cursor	Tk_GetCursor(Tcl_Interp *interp, Tk_Window tkwin,
+				Tk_Uid str);
+/* 92 */
+EXTERN Tk_Cursor	Tk_GetCursorFromData(Tcl_Interp *interp,
+				Tk_Window tkwin, const char *source,
+				const char *mask, int width, int height,
+				int xHot, int yHot, Tk_Uid fg, Tk_Uid bg);
+/* 93 */
+EXTERN Tk_Font		Tk_GetFont(Tcl_Interp *interp, Tk_Window tkwin,
+				const char *str);
+/* 94 */
+EXTERN Tk_Font		Tk_GetFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
+/* 95 */
+EXTERN void		Tk_GetFontMetrics(Tk_Font font,
+				Tk_FontMetrics *fmPtr);
+/* 96 */
+EXTERN GC		Tk_GetGC(Tk_Window tkwin, unsigned long valueMask,
+				XGCValues *valuePtr);
+/* 97 */
+EXTERN Tk_Image		Tk_GetImage(Tcl_Interp *interp, Tk_Window tkwin,
+				const char *name,
+				Tk_ImageChangedProc *changeProc,
+				ClientData clientData);
+/* 98 */
+EXTERN ClientData	Tk_GetImageMasterData(Tcl_Interp *interp,
+				const char *name,
+				CONST86 Tk_ImageType **typePtrPtr);
+/* 99 */
+EXTERN Tk_ItemType *	Tk_GetItemTypes(void);
+/* 100 */
+EXTERN int		Tk_GetJoinStyle(Tcl_Interp *interp, const char *str,
+				int *joinPtr);
+/* 101 */
+EXTERN int		Tk_GetJustify(Tcl_Interp *interp, const char *str,
+				Tk_Justify *justifyPtr);
+/* 102 */
+EXTERN int		Tk_GetNumMainWindows(void);
+/* 103 */
+EXTERN Tk_Uid		Tk_GetOption(Tk_Window tkwin, const char *name,
+				const char *className);
+/* 104 */
+EXTERN int		Tk_GetPixels(Tcl_Interp *interp, Tk_Window tkwin,
+				const char *str, int *intPtr);
+/* 105 */
+EXTERN Pixmap		Tk_GetPixmap(Display *display, Drawable d, int width,
+				int height, int depth);
+/* 106 */
+EXTERN int		Tk_GetRelief(Tcl_Interp *interp, const char *name,
+				int *reliefPtr);
+/* 107 */
+EXTERN void		Tk_GetRootCoords(Tk_Window tkwin, int *xPtr,
+				int *yPtr);
+/* 108 */
+EXTERN int		Tk_GetScrollInfo(Tcl_Interp *interp, int argc,
+				CONST84 char **argv, double *dblPtr,
+				int *intPtr);
+/* 109 */
+EXTERN int		Tk_GetScreenMM(Tcl_Interp *interp, Tk_Window tkwin,
+				const char *str, double *doublePtr);
+/* 110 */
+EXTERN int		Tk_GetSelection(Tcl_Interp *interp, Tk_Window tkwin,
+				Atom selection, Atom target,
+				Tk_GetSelProc *proc, ClientData clientData);
+/* 111 */
+EXTERN Tk_Uid		Tk_GetUid(const char *str);
+/* 112 */
+EXTERN Visual *		Tk_GetVisual(Tcl_Interp *interp, Tk_Window tkwin,
+				const char *str, int *depthPtr,
+				Colormap *colormapPtr);
+/* 113 */
+EXTERN void		Tk_GetVRootGeometry(Tk_Window tkwin, int *xPtr,
+				int *yPtr, int *widthPtr, int *heightPtr);
+/* 114 */
+EXTERN int		Tk_Grab(Tcl_Interp *interp, Tk_Window tkwin,
+				int grabGlobal);
+/* 115 */
+EXTERN void		Tk_HandleEvent(XEvent *eventPtr);
+/* 116 */
+EXTERN Tk_Window	Tk_IdToWindow(Display *display, Window window);
+/* 117 */
+EXTERN void		Tk_ImageChanged(Tk_ImageMaster master, int x, int y,
+				int width, int height, int imageWidth,
+				int imageHeight);
+/* 118 */
+EXTERN int		Tk_Init(Tcl_Interp *interp);
+/* 119 */
+EXTERN Atom		Tk_InternAtom(Tk_Window tkwin, const char *name);
+/* 120 */
+EXTERN int		Tk_IntersectTextLayout(Tk_TextLayout layout, int x,
+				int y, int width, int height);
+/* 121 */
+EXTERN void		Tk_MaintainGeometry(Tk_Window slave,
+				Tk_Window master, int x, int y, int width,
+				int height);
+/* 122 */
+EXTERN Tk_Window	Tk_MainWindow(Tcl_Interp *interp);
+/* 123 */
+EXTERN void		Tk_MakeWindowExist(Tk_Window tkwin);
+/* 124 */
+EXTERN void		Tk_ManageGeometry(Tk_Window tkwin,
+				const Tk_GeomMgr *mgrPtr,
+				ClientData clientData);
+/* 125 */
+EXTERN void		Tk_MapWindow(Tk_Window tkwin);
+/* 126 */
+EXTERN int		Tk_MeasureChars(Tk_Font tkfont, const char *source,
+				int numBytes, int maxPixels, int flags,
+				int *lengthPtr);
+/* 127 */
+EXTERN void		Tk_MoveResizeWindow(Tk_Window tkwin, int x, int y,
+				int width, int height);
+/* 128 */
+EXTERN void		Tk_MoveWindow(Tk_Window tkwin, int x, int y);
+/* 129 */
+EXTERN void		Tk_MoveToplevelWindow(Tk_Window tkwin, int x, int y);
+/* 130 */
+EXTERN CONST84_RETURN char * Tk_NameOf3DBorder(Tk_3DBorder border);
+/* 131 */
+EXTERN CONST84_RETURN char * Tk_NameOfAnchor(Tk_Anchor anchor);
+/* 132 */
+EXTERN CONST84_RETURN char * Tk_NameOfBitmap(Display *display, Pixmap bitmap);
+/* 133 */
+EXTERN CONST84_RETURN char * Tk_NameOfCapStyle(int cap);
+/* 134 */
+EXTERN CONST84_RETURN char * Tk_NameOfColor(XColor *colorPtr);
+/* 135 */
+EXTERN CONST84_RETURN char * Tk_NameOfCursor(Display *display,
+				Tk_Cursor cursor);
+/* 136 */
+EXTERN CONST84_RETURN char * Tk_NameOfFont(Tk_Font font);
+/* 137 */
+EXTERN CONST84_RETURN char * Tk_NameOfImage(Tk_ImageMaster imageMaster);
+/* 138 */
+EXTERN CONST84_RETURN char * Tk_NameOfJoinStyle(int join);
+/* 139 */
+EXTERN CONST84_RETURN char * Tk_NameOfJustify(Tk_Justify justify);
+/* 140 */
+EXTERN CONST84_RETURN char * Tk_NameOfRelief(int relief);
+/* 141 */
+EXTERN Tk_Window	Tk_NameToWindow(Tcl_Interp *interp,
+				const char *pathName, Tk_Window tkwin);
+/* 142 */
+EXTERN void		Tk_OwnSelection(Tk_Window tkwin, Atom selection,
+				Tk_LostSelProc *proc, ClientData clientData);
+/* 143 */
+EXTERN int		Tk_ParseArgv(Tcl_Interp *interp, Tk_Window tkwin,
+				int *argcPtr, CONST84 char **argv,
+				const Tk_ArgvInfo *argTable, int flags);
+/* 144 */
+EXTERN void		Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle,
+				Tk_PhotoImageBlock *blockPtr, int x, int y,
+				int width, int height);
+/* 145 */
+EXTERN void		Tk_PhotoPutZoomedBlock_NoComposite(
+				Tk_PhotoHandle handle,
+				Tk_PhotoImageBlock *blockPtr, int x, int y,
+				int width, int height, int zoomX, int zoomY,
+				int subsampleX, int subsampleY);
+/* 146 */
+EXTERN int		Tk_PhotoGetImage(Tk_PhotoHandle handle,
+				Tk_PhotoImageBlock *blockPtr);
+/* 147 */
+EXTERN void		Tk_PhotoBlank(Tk_PhotoHandle handle);
+/* 148 */
+EXTERN void		Tk_PhotoExpand_Panic(Tk_PhotoHandle handle,
+				int width, int height);
+/* 149 */
+EXTERN void		Tk_PhotoGetSize(Tk_PhotoHandle handle, int *widthPtr,
+				int *heightPtr);
+/* 150 */
+EXTERN void		Tk_PhotoSetSize_Panic(Tk_PhotoHandle handle,
+				int width, int height);
+/* 151 */
+EXTERN int		Tk_PointToChar(Tk_TextLayout layout, int x, int y);
+/* 152 */
+EXTERN int		Tk_PostscriptFontName(Tk_Font tkfont,
+				Tcl_DString *dsPtr);
+/* 153 */
+EXTERN void		Tk_PreserveColormap(Display *display,
+				Colormap colormap);
+/* 154 */
+EXTERN void		Tk_QueueWindowEvent(XEvent *eventPtr,
+				Tcl_QueuePosition position);
+/* 155 */
+EXTERN void		Tk_RedrawImage(Tk_Image image, int imageX,
+				int imageY, int width, int height,
+				Drawable drawable, int drawableX,
+				int drawableY);
+/* 156 */
+EXTERN void		Tk_ResizeWindow(Tk_Window tkwin, int width,
+				int height);
+/* 157 */
+EXTERN int		Tk_RestackWindow(Tk_Window tkwin, int aboveBelow,
+				Tk_Window other);
+/* 158 */
+EXTERN Tk_RestrictProc * Tk_RestrictEvents(Tk_RestrictProc *proc,
+				ClientData arg, ClientData *prevArgPtr);
+/* 159 */
+EXTERN int		Tk_SafeInit(Tcl_Interp *interp);
+/* 160 */
+EXTERN const char *	Tk_SetAppName(Tk_Window tkwin, const char *name);
+/* 161 */
+EXTERN void		Tk_SetBackgroundFromBorder(Tk_Window tkwin,
+				Tk_3DBorder border);
+/* 162 */
+EXTERN void		Tk_SetClass(Tk_Window tkwin, const char *className);
+/* 163 */
+EXTERN void		Tk_SetGrid(Tk_Window tkwin, int reqWidth,
+				int reqHeight, int gridWidth, int gridHeight);
+/* 164 */
+EXTERN void		Tk_SetInternalBorder(Tk_Window tkwin, int width);
+/* 165 */
+EXTERN void		Tk_SetWindowBackground(Tk_Window tkwin,
+				unsigned long pixel);
+/* 166 */
+EXTERN void		Tk_SetWindowBackgroundPixmap(Tk_Window tkwin,
+				Pixmap pixmap);
+/* 167 */
+EXTERN void		Tk_SetWindowBorder(Tk_Window tkwin,
+				unsigned long pixel);
+/* 168 */
+EXTERN void		Tk_SetWindowBorderWidth(Tk_Window tkwin, int width);
+/* 169 */
+EXTERN void		Tk_SetWindowBorderPixmap(Tk_Window tkwin,
+				Pixmap pixmap);
+/* 170 */
+EXTERN void		Tk_SetWindowColormap(Tk_Window tkwin,
+				Colormap colormap);
+/* 171 */
+EXTERN int		Tk_SetWindowVisual(Tk_Window tkwin, Visual *visual,
+				int depth, Colormap colormap);
+/* 172 */
+EXTERN void		Tk_SizeOfBitmap(Display *display, Pixmap bitmap,
+				int *widthPtr, int *heightPtr);
+/* 173 */
+EXTERN void		Tk_SizeOfImage(Tk_Image image, int *widthPtr,
+				int *heightPtr);
+/* 174 */
+EXTERN int		Tk_StrictMotif(Tk_Window tkwin);
+/* 175 */
+EXTERN void		Tk_TextLayoutToPostscript(Tcl_Interp *interp,
+				Tk_TextLayout layout);
+/* 176 */
+EXTERN int		Tk_TextWidth(Tk_Font font, const char *str,
+				int numBytes);
+/* 177 */
+EXTERN void		Tk_UndefineCursor(Tk_Window window);
+/* 178 */
+EXTERN void		Tk_UnderlineChars(Display *display,
+				Drawable drawable, GC gc, Tk_Font tkfont,
+				const char *source, int x, int y,
+				int firstByte, int lastByte);
+/* 179 */
+EXTERN void		Tk_UnderlineTextLayout(Display *display,
+				Drawable drawable, GC gc,
+				Tk_TextLayout layout, int x, int y,
+				int underline);
+/* 180 */
+EXTERN void		Tk_Ungrab(Tk_Window tkwin);
+/* 181 */
+EXTERN void		Tk_UnmaintainGeometry(Tk_Window slave,
+				Tk_Window master);
+/* 182 */
+EXTERN void		Tk_UnmapWindow(Tk_Window tkwin);
+/* 183 */
+EXTERN void		Tk_UnsetGrid(Tk_Window tkwin);
+/* 184 */
+EXTERN void		Tk_UpdatePointer(Tk_Window tkwin, int x, int y,
+				int state);
+/* 185 */
+EXTERN Pixmap		Tk_AllocBitmapFromObj(Tcl_Interp *interp,
+				Tk_Window tkwin, Tcl_Obj *objPtr);
+/* 186 */
+EXTERN Tk_3DBorder	Tk_Alloc3DBorderFromObj(Tcl_Interp *interp,
+				Tk_Window tkwin, Tcl_Obj *objPtr);
+/* 187 */
+EXTERN XColor *		Tk_AllocColorFromObj(Tcl_Interp *interp,
+				Tk_Window tkwin, Tcl_Obj *objPtr);
+/* 188 */
+EXTERN Tk_Cursor	Tk_AllocCursorFromObj(Tcl_Interp *interp,
+				Tk_Window tkwin, Tcl_Obj *objPtr);
+/* 189 */
+EXTERN Tk_Font		Tk_AllocFontFromObj(Tcl_Interp *interp,
+				Tk_Window tkwin, Tcl_Obj *objPtr);
+/* 190 */
+EXTERN Tk_OptionTable	Tk_CreateOptionTable(Tcl_Interp *interp,
+				const Tk_OptionSpec *templatePtr);
+/* 191 */
+EXTERN void		Tk_DeleteOptionTable(Tk_OptionTable optionTable);
+/* 192 */
+EXTERN void		Tk_Free3DBorderFromObj(Tk_Window tkwin,
+				Tcl_Obj *objPtr);
+/* 193 */
+EXTERN void		Tk_FreeBitmapFromObj(Tk_Window tkwin,
+				Tcl_Obj *objPtr);
+/* 194 */
+EXTERN void		Tk_FreeColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
+/* 195 */
+EXTERN void		Tk_FreeConfigOptions(char *recordPtr,
+				Tk_OptionTable optionToken, Tk_Window tkwin);
+/* 196 */
+EXTERN void		Tk_FreeSavedOptions(Tk_SavedOptions *savePtr);
+/* 197 */
+EXTERN void		Tk_FreeCursorFromObj(Tk_Window tkwin,
+				Tcl_Obj *objPtr);
+/* 198 */
+EXTERN void		Tk_FreeFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
+/* 199 */
+EXTERN Tk_3DBorder	Tk_Get3DBorderFromObj(Tk_Window tkwin,
+				Tcl_Obj *objPtr);
+/* 200 */
+EXTERN int		Tk_GetAnchorFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tk_Anchor *anchorPtr);
+/* 201 */
+EXTERN Pixmap		Tk_GetBitmapFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
+/* 202 */
+EXTERN XColor *		Tk_GetColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
+/* 203 */
+EXTERN Tk_Cursor	Tk_GetCursorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
+/* 204 */
+EXTERN Tcl_Obj *	Tk_GetOptionInfo(Tcl_Interp *interp, char *recordPtr,
+				Tk_OptionTable optionTable, Tcl_Obj *namePtr,
+				Tk_Window tkwin);
+/* 205 */
+EXTERN Tcl_Obj *	Tk_GetOptionValue(Tcl_Interp *interp,
+				char *recordPtr, Tk_OptionTable optionTable,
+				Tcl_Obj *namePtr, Tk_Window tkwin);
+/* 206 */
+EXTERN int		Tk_GetJustifyFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tk_Justify *justifyPtr);
+/* 207 */
+EXTERN int		Tk_GetMMFromObj(Tcl_Interp *interp, Tk_Window tkwin,
+				Tcl_Obj *objPtr, double *doublePtr);
+/* 208 */
+EXTERN int		Tk_GetPixelsFromObj(Tcl_Interp *interp,
+				Tk_Window tkwin, Tcl_Obj *objPtr,
+				int *intPtr);
+/* 209 */
+EXTERN int		Tk_GetReliefFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *resultPtr);
+/* 210 */
+EXTERN int		Tk_GetScrollInfoObj(Tcl_Interp *interp, int objc,
+				Tcl_Obj *const objv[], double *dblPtr,
+				int *intPtr);
+/* 211 */
+EXTERN int		Tk_InitOptions(Tcl_Interp *interp, char *recordPtr,
+				Tk_OptionTable optionToken, Tk_Window tkwin);
+/* 212 */
+EXTERN void		Tk_MainEx(int argc, char **argv,
+				Tcl_AppInitProc *appInitProc,
+				Tcl_Interp *interp);
+/* 213 */
+EXTERN void		Tk_RestoreSavedOptions(Tk_SavedOptions *savePtr);
+/* 214 */
+EXTERN int		Tk_SetOptions(Tcl_Interp *interp, char *recordPtr,
+				Tk_OptionTable optionTable, int objc,
+				Tcl_Obj *const objv[], Tk_Window tkwin,
+				Tk_SavedOptions *savePtr, int *maskPtr);
+/* 215 */
+EXTERN void		Tk_InitConsoleChannels(Tcl_Interp *interp);
+/* 216 */
+EXTERN int		Tk_CreateConsoleWindow(Tcl_Interp *interp);
+/* 217 */
+EXTERN void		Tk_CreateSmoothMethod(Tcl_Interp *interp,
+				const Tk_SmoothMethod *method);
+/* Slot 218 is reserved */
+/* Slot 219 is reserved */
+/* 220 */
+EXTERN int		Tk_GetDash(Tcl_Interp *interp, const char *value,
+				Tk_Dash *dash);
+/* 221 */
+EXTERN void		Tk_CreateOutline(Tk_Outline *outline);
+/* 222 */
+EXTERN void		Tk_DeleteOutline(Display *display,
+				Tk_Outline *outline);
+/* 223 */
+EXTERN int		Tk_ConfigOutlineGC(XGCValues *gcValues,
+				Tk_Canvas canvas, Tk_Item *item,
+				Tk_Outline *outline);
+/* 224 */
+EXTERN int		Tk_ChangeOutlineGC(Tk_Canvas canvas, Tk_Item *item,
+				Tk_Outline *outline);
+/* 225 */
+EXTERN int		Tk_ResetOutlineGC(Tk_Canvas canvas, Tk_Item *item,
+				Tk_Outline *outline);
+/* 226 */
+EXTERN int		Tk_CanvasPsOutline(Tk_Canvas canvas, Tk_Item *item,
+				Tk_Outline *outline);
+/* 227 */
+EXTERN void		Tk_SetTSOrigin(Tk_Window tkwin, GC gc, int x, int y);
+/* 228 */
+EXTERN int		Tk_CanvasGetCoordFromObj(Tcl_Interp *interp,
+				Tk_Canvas canvas, Tcl_Obj *obj,
+				double *doublePtr);
+/* 229 */
+EXTERN void		Tk_CanvasSetOffset(Tk_Canvas canvas, GC gc,
+				Tk_TSOffset *offset);
+/* 230 */
+EXTERN void		Tk_DitherPhoto(Tk_PhotoHandle handle, int x, int y,
+				int width, int height);
+/* 231 */
+EXTERN int		Tk_PostscriptBitmap(Tcl_Interp *interp,
+				Tk_Window tkwin, Tk_PostscriptInfo psInfo,
+				Pixmap bitmap, int startX, int startY,
+				int width, int height);
+/* 232 */
+EXTERN int		Tk_PostscriptColor(Tcl_Interp *interp,
+				Tk_PostscriptInfo psInfo, XColor *colorPtr);
+/* 233 */
+EXTERN int		Tk_PostscriptFont(Tcl_Interp *interp,
+				Tk_PostscriptInfo psInfo, Tk_Font font);
+/* 234 */
+EXTERN int		Tk_PostscriptImage(Tk_Image image,
+				Tcl_Interp *interp, Tk_Window tkwin,
+				Tk_PostscriptInfo psinfo, int x, int y,
+				int width, int height, int prepass);
+/* 235 */
+EXTERN void		Tk_PostscriptPath(Tcl_Interp *interp,
+				Tk_PostscriptInfo psInfo, double *coordPtr,
+				int numPoints);
+/* 236 */
+EXTERN int		Tk_PostscriptStipple(Tcl_Interp *interp,
+				Tk_Window tkwin, Tk_PostscriptInfo psInfo,
+				Pixmap bitmap);
+/* 237 */
+EXTERN double		Tk_PostscriptY(double y, Tk_PostscriptInfo psInfo);
+/* 238 */
+EXTERN int		Tk_PostscriptPhoto(Tcl_Interp *interp,
+				Tk_PhotoImageBlock *blockPtr,
+				Tk_PostscriptInfo psInfo, int width,
+				int height);
+/* 239 */
+EXTERN void		Tk_CreateClientMessageHandler(
+				Tk_ClientMessageProc *proc);
+/* 240 */
+EXTERN void		Tk_DeleteClientMessageHandler(
+				Tk_ClientMessageProc *proc);
+/* 241 */
+EXTERN Tk_Window	Tk_CreateAnonymousWindow(Tcl_Interp *interp,
+				Tk_Window parent, const char *screenName);
+/* 242 */
+EXTERN void		Tk_SetClassProcs(Tk_Window tkwin,
+				const Tk_ClassProcs *procs,
+				ClientData instanceData);
+/* 243 */
+EXTERN void		Tk_SetInternalBorderEx(Tk_Window tkwin, int left,
+				int right, int top, int bottom);
+/* 244 */
+EXTERN void		Tk_SetMinimumRequestSize(Tk_Window tkwin,
+				int minWidth, int minHeight);
+/* 245 */
+EXTERN void		Tk_SetCaretPos(Tk_Window tkwin, int x, int y,
+				int height);
+/* 246 */
+EXTERN void		Tk_PhotoPutBlock_Panic(Tk_PhotoHandle handle,
+				Tk_PhotoImageBlock *blockPtr, int x, int y,
+				int width, int height, int compRule);
+/* 247 */
+EXTERN void		Tk_PhotoPutZoomedBlock_Panic(Tk_PhotoHandle handle,
+				Tk_PhotoImageBlock *blockPtr, int x, int y,
+				int width, int height, int zoomX, int zoomY,
+				int subsampleX, int subsampleY, int compRule);
+/* 248 */
+EXTERN int		Tk_CollapseMotionEvents(Display *display,
+				int collapse);
+/* 249 */
+EXTERN Tk_StyleEngine	Tk_RegisterStyleEngine(const char *name,
+				Tk_StyleEngine parent);
+/* 250 */
+EXTERN Tk_StyleEngine	Tk_GetStyleEngine(const char *name);
+/* 251 */
+EXTERN int		Tk_RegisterStyledElement(Tk_StyleEngine engine,
+				Tk_ElementSpec *templatePtr);
+/* 252 */
+EXTERN int		Tk_GetElementId(const char *name);
+/* 253 */
+EXTERN Tk_Style		Tk_CreateStyle(const char *name,
+				Tk_StyleEngine engine, ClientData clientData);
+/* 254 */
+EXTERN Tk_Style		Tk_GetStyle(Tcl_Interp *interp, const char *name);
+/* 255 */
+EXTERN void		Tk_FreeStyle(Tk_Style style);
+/* 256 */
+EXTERN const char *	Tk_NameOfStyle(Tk_Style style);
+/* 257 */
+EXTERN Tk_Style		Tk_AllocStyleFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
+/* 258 */
+EXTERN Tk_Style		Tk_GetStyleFromObj(Tcl_Obj *objPtr);
+/* 259 */
+EXTERN void		Tk_FreeStyleFromObj(Tcl_Obj *objPtr);
+/* 260 */
+EXTERN Tk_StyledElement	 Tk_GetStyledElement(Tk_Style style, int elementId,
+				Tk_OptionTable optionTable);
+/* 261 */
+EXTERN void		Tk_GetElementSize(Tk_Style style,
+				Tk_StyledElement element, char *recordPtr,
+				Tk_Window tkwin, int width, int height,
+				int inner, int *widthPtr, int *heightPtr);
+/* 262 */
+EXTERN void		Tk_GetElementBox(Tk_Style style,
+				Tk_StyledElement element, char *recordPtr,
+				Tk_Window tkwin, int x, int y, int width,
+				int height, int inner, int *xPtr, int *yPtr,
+				int *widthPtr, int *heightPtr);
+/* 263 */
+EXTERN int		Tk_GetElementBorderWidth(Tk_Style style,
+				Tk_StyledElement element, char *recordPtr,
+				Tk_Window tkwin);
+/* 264 */
+EXTERN void		Tk_DrawElement(Tk_Style style,
+				Tk_StyledElement element, char *recordPtr,
+				Tk_Window tkwin, Drawable d, int x, int y,
+				int width, int height, int state);
+/* 265 */
+EXTERN int		Tk_PhotoExpand(Tcl_Interp *interp,
+				Tk_PhotoHandle handle, int width, int height);
+/* 266 */
+EXTERN int		Tk_PhotoPutBlock(Tcl_Interp *interp,
+				Tk_PhotoHandle handle,
+				Tk_PhotoImageBlock *blockPtr, int x, int y,
+				int width, int height, int compRule);
+/* 267 */
+EXTERN int		Tk_PhotoPutZoomedBlock(Tcl_Interp *interp,
+				Tk_PhotoHandle handle,
+				Tk_PhotoImageBlock *blockPtr, int x, int y,
+				int width, int height, int zoomX, int zoomY,
+				int subsampleX, int subsampleY, int compRule);
+/* 268 */
+EXTERN int		Tk_PhotoSetSize(Tcl_Interp *interp,
+				Tk_PhotoHandle handle, int width, int height);
+/* 269 */
+EXTERN long		Tk_GetUserInactiveTime(Display *dpy);
+/* 270 */
+EXTERN void		Tk_ResetUserInactiveTime(Display *dpy);
+/* 271 */
+EXTERN Tcl_Interp *	Tk_Interp(Tk_Window tkwin);
+/* 272 */
+EXTERN void		Tk_CreateOldImageType(const Tk_ImageType *typePtr);
+/* 273 */
+EXTERN void		Tk_CreateOldPhotoImageFormat(
+				const Tk_PhotoImageFormat *formatPtr);
+
+typedef struct {
+    const struct TkPlatStubs *tkPlatStubs;
+    const struct TkIntStubs *tkIntStubs;
+    const struct TkIntPlatStubs *tkIntPlatStubs;
+    const struct TkIntXlibStubs *tkIntXlibStubs;
+} TkStubHooks;
+
+typedef struct TkStubs {
+    int magic;
+    const TkStubHooks *hooks;
+
+    void (*tk_MainLoop) (void); /* 0 */
+    XColor * (*tk_3DBorderColor) (Tk_3DBorder border); /* 1 */
+    GC (*tk_3DBorderGC) (Tk_Window tkwin, Tk_3DBorder border, int which); /* 2 */
+    void (*tk_3DHorizontalBevel) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftIn, int rightIn, int topBevel, int relief); /* 3 */
+    void (*tk_3DVerticalBevel) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftBevel, int relief); /* 4 */
+    void (*tk_AddOption) (Tk_Window tkwin, const char *name, const char *value, int priority); /* 5 */
+    void (*tk_BindEvent) (Tk_BindingTable bindingTable, XEvent *eventPtr, Tk_Window tkwin, int numObjects, ClientData *objectPtr); /* 6 */
+    void (*tk_CanvasDrawableCoords) (Tk_Canvas canvas, double x, double y, short *drawableXPtr, short *drawableYPtr); /* 7 */
+    void (*tk_CanvasEventuallyRedraw) (Tk_Canvas canvas, int x1, int y1, int x2, int y2); /* 8 */
+    int (*tk_CanvasGetCoord) (Tcl_Interp *interp, Tk_Canvas canvas, const char *str, double *doublePtr); /* 9 */
+    Tk_CanvasTextInfo * (*tk_CanvasGetTextInfo) (Tk_Canvas canvas); /* 10 */
+    int (*tk_CanvasPsBitmap) (Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height); /* 11 */
+    int (*tk_CanvasPsColor) (Tcl_Interp *interp, Tk_Canvas canvas, XColor *colorPtr); /* 12 */
+    int (*tk_CanvasPsFont) (Tcl_Interp *interp, Tk_Canvas canvas, Tk_Font font); /* 13 */
+    void (*tk_CanvasPsPath) (Tcl_Interp *interp, Tk_Canvas canvas, double *coordPtr, int numPoints); /* 14 */
+    int (*tk_CanvasPsStipple) (Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap); /* 15 */
+    double (*tk_CanvasPsY) (Tk_Canvas canvas, double y); /* 16 */
+    void (*tk_CanvasSetStippleOrigin) (Tk_Canvas canvas, GC gc); /* 17 */
+    int (*tk_CanvasTagsParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 18 */
+    CONST86 char * (*tk_CanvasTagsPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 19 */
+    Tk_Window (*tk_CanvasTkwin) (Tk_Canvas canvas); /* 20 */
+    void (*tk_CanvasWindowCoords) (Tk_Canvas canvas, double x, double y, short *screenXPtr, short *screenYPtr); /* 21 */
+    void (*tk_ChangeWindowAttributes) (Tk_Window tkwin, unsigned long valueMask, XSetWindowAttributes *attsPtr); /* 22 */
+    int (*tk_CharBbox) (Tk_TextLayout layout, int index, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr); /* 23 */
+    void (*tk_ClearSelection) (Tk_Window tkwin, Atom selection); /* 24 */
+    int (*tk_ClipboardAppend) (Tcl_Interp *interp, Tk_Window tkwin, Atom target, Atom format, const char *buffer); /* 25 */
+    int (*tk_ClipboardClear) (Tcl_Interp *interp, Tk_Window tkwin); /* 26 */
+    int (*tk_ConfigureInfo) (Tcl_Interp *interp, Tk_Window tkwin, const Tk_ConfigSpec *specs, char *widgRec, const char *argvName, int flags); /* 27 */
+    int (*tk_ConfigureValue) (Tcl_Interp *interp, Tk_Window tkwin, const Tk_ConfigSpec *specs, char *widgRec, const char *argvName, int flags); /* 28 */
+    int (*tk_ConfigureWidget) (Tcl_Interp *interp, Tk_Window tkwin, const Tk_ConfigSpec *specs, int argc, CONST84 char **argv, char *widgRec, int flags); /* 29 */
+    void (*tk_ConfigureWindow) (Tk_Window tkwin, unsigned int valueMask, XWindowChanges *valuePtr); /* 30 */
+    Tk_TextLayout (*tk_ComputeTextLayout) (Tk_Font font, const char *str, int numChars, int wrapLength, Tk_Justify justify, int flags, int *widthPtr, int *heightPtr); /* 31 */
+    Tk_Window (*tk_CoordsToWindow) (int rootX, int rootY, Tk_Window tkwin); /* 32 */
+    unsigned long (*tk_CreateBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr, const char *script, int append); /* 33 */
+    Tk_BindingTable (*tk_CreateBindingTable) (Tcl_Interp *interp); /* 34 */
+    Tk_ErrorHandler (*tk_CreateErrorHandler) (Display *display, int errNum, int request, int minorCode, Tk_ErrorProc *errorProc, ClientData clientData); /* 35 */
+    void (*tk_CreateEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData); /* 36 */
+    void (*tk_CreateGenericHandler) (Tk_GenericProc *proc, ClientData clientData); /* 37 */
+    void (*tk_CreateImageType) (const Tk_ImageType *typePtr); /* 38 */
+    void (*tk_CreateItemType) (Tk_ItemType *typePtr); /* 39 */
+    void (*tk_CreatePhotoImageFormat) (const Tk_PhotoImageFormat *formatPtr); /* 40 */
+    void (*tk_CreateSelHandler) (Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc *proc, ClientData clientData, Atom format); /* 41 */
+    Tk_Window (*tk_CreateWindow) (Tcl_Interp *interp, Tk_Window parent, const char *name, const char *screenName); /* 42 */
+    Tk_Window (*tk_CreateWindowFromPath) (Tcl_Interp *interp, Tk_Window tkwin, const char *pathName, const char *screenName); /* 43 */
+    int (*tk_DefineBitmap) (Tcl_Interp *interp, const char *name, const void *source, int width, int height); /* 44 */
+    void (*tk_DefineCursor) (Tk_Window window, Tk_Cursor cursor); /* 45 */
+    void (*tk_DeleteAllBindings) (Tk_BindingTable bindingTable, ClientData object); /* 46 */
+    int (*tk_DeleteBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr); /* 47 */
+    void (*tk_DeleteBindingTable) (Tk_BindingTable bindingTable); /* 48 */
+    void (*tk_DeleteErrorHandler) (Tk_ErrorHandler handler); /* 49 */
+    void (*tk_DeleteEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData); /* 50 */
+    void (*tk_DeleteGenericHandler) (Tk_GenericProc *proc, ClientData clientData); /* 51 */
+    void (*tk_DeleteImage) (Tcl_Interp *interp, const char *name); /* 52 */
+    void (*tk_DeleteSelHandler) (Tk_Window tkwin, Atom selection, Atom target); /* 53 */
+    void (*tk_DestroyWindow) (Tk_Window tkwin); /* 54 */
+    CONST84_RETURN char * (*tk_DisplayName) (Tk_Window tkwin); /* 55 */
+    int (*tk_DistanceToTextLayout) (Tk_TextLayout layout, int x, int y); /* 56 */
+    void (*tk_Draw3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief); /* 57 */
+    void (*tk_Draw3DRectangle) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief); /* 58 */
+    void (*tk_DrawChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int numBytes, int x, int y); /* 59 */
+    void (*tk_DrawFocusHighlight) (Tk_Window tkwin, GC gc, int width, Drawable drawable); /* 60 */
+    void (*tk_DrawTextLayout) (Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int firstChar, int lastChar); /* 61 */
+    void (*tk_Fill3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief); /* 62 */
+    void (*tk_Fill3DRectangle) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief); /* 63 */
+    Tk_PhotoHandle (*tk_FindPhoto) (Tcl_Interp *interp, const char *imageName); /* 64 */
+    Font (*tk_FontId) (Tk_Font font); /* 65 */
+    void (*tk_Free3DBorder) (Tk_3DBorder border); /* 66 */
+    void (*tk_FreeBitmap) (Display *display, Pixmap bitmap); /* 67 */
+    void (*tk_FreeColor) (XColor *colorPtr); /* 68 */
+    void (*tk_FreeColormap) (Display *display, Colormap colormap); /* 69 */
+    void (*tk_FreeCursor) (Display *display, Tk_Cursor cursor); /* 70 */
+    void (*tk_FreeFont) (Tk_Font f); /* 71 */
+    void (*tk_FreeGC) (Display *display, GC gc); /* 72 */
+    void (*tk_FreeImage) (Tk_Image image); /* 73 */
+    void (*tk_FreeOptions) (const Tk_ConfigSpec *specs, char *widgRec, Display *display, int needFlags); /* 74 */
+    void (*tk_FreePixmap) (Display *display, Pixmap pixmap); /* 75 */
+    void (*tk_FreeTextLayout) (Tk_TextLayout textLayout); /* 76 */
+    void (*tk_FreeXId) (Display *display, XID xid); /* 77 */
+    GC (*tk_GCForColor) (XColor *colorPtr, Drawable drawable); /* 78 */
+    void (*tk_GeometryRequest) (Tk_Window tkwin, int reqWidth, int reqHeight); /* 79 */
+    Tk_3DBorder (*tk_Get3DBorder) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid colorName); /* 80 */
+    void (*tk_GetAllBindings) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object); /* 81 */
+    int (*tk_GetAnchor) (Tcl_Interp *interp, const char *str, Tk_Anchor *anchorPtr); /* 82 */
+    CONST84_RETURN char * (*tk_GetAtomName) (Tk_Window tkwin, Atom atom); /* 83 */
+    CONST84_RETURN char * (*tk_GetBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr); /* 84 */
+    Pixmap (*tk_GetBitmap) (Tcl_Interp *interp, Tk_Window tkwin, const char *str); /* 85 */
+    Pixmap (*tk_GetBitmapFromData) (Tcl_Interp *interp, Tk_Window tkwin, const void *source, int width, int height); /* 86 */
+    int (*tk_GetCapStyle) (Tcl_Interp *interp, const char *str, int *capPtr); /* 87 */
+    XColor * (*tk_GetColor) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name); /* 88 */
+    XColor * (*tk_GetColorByValue) (Tk_Window tkwin, XColor *colorPtr); /* 89 */
+    Colormap (*tk_GetColormap) (Tcl_Interp *interp, Tk_Window tkwin, const char *str); /* 90 */
+    Tk_Cursor (*tk_GetCursor) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid str); /* 91 */
+    Tk_Cursor (*tk_GetCursorFromData) (Tcl_Interp *interp, Tk_Window tkwin, const char *source, const char *mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg); /* 92 */
+    Tk_Font (*tk_GetFont) (Tcl_Interp *interp, Tk_Window tkwin, const char *str); /* 93 */
+    Tk_Font (*tk_GetFontFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 94 */
+    void (*tk_GetFontMetrics) (Tk_Font font, Tk_FontMetrics *fmPtr); /* 95 */
+    GC (*tk_GetGC) (Tk_Window tkwin, unsigned long valueMask, XGCValues *valuePtr); /* 96 */
+    Tk_Image (*tk_GetImage) (Tcl_Interp *interp, Tk_Window tkwin, const char *name, Tk_ImageChangedProc *changeProc, ClientData clientData); /* 97 */
+    ClientData (*tk_GetImageMasterData) (Tcl_Interp *interp, const char *name, CONST86 Tk_ImageType **typePtrPtr); /* 98 */
+    Tk_ItemType * (*tk_GetItemTypes) (void); /* 99 */
+    int (*tk_GetJoinStyle) (Tcl_Interp *interp, const char *str, int *joinPtr); /* 100 */
+    int (*tk_GetJustify) (Tcl_Interp *interp, const char *str, Tk_Justify *justifyPtr); /* 101 */
+    int (*tk_GetNumMainWindows) (void); /* 102 */
+    Tk_Uid (*tk_GetOption) (Tk_Window tkwin, const char *name, const char *className); /* 103 */
+    int (*tk_GetPixels) (Tcl_Interp *interp, Tk_Window tkwin, const char *str, int *intPtr); /* 104 */
+    Pixmap (*tk_GetPixmap) (Display *display, Drawable d, int width, int height, int depth); /* 105 */
+    int (*tk_GetRelief) (Tcl_Interp *interp, const char *name, int *reliefPtr); /* 106 */
+    void (*tk_GetRootCoords) (Tk_Window tkwin, int *xPtr, int *yPtr); /* 107 */
+    int (*tk_GetScrollInfo) (Tcl_Interp *interp, int argc, CONST84 char **argv, double *dblPtr, int *intPtr); /* 108 */
+    int (*tk_GetScreenMM) (Tcl_Interp *interp, Tk_Window tkwin, const char *str, double *doublePtr); /* 109 */
+    int (*tk_GetSelection) (Tcl_Interp *interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc *proc, ClientData clientData); /* 110 */
+    Tk_Uid (*tk_GetUid) (const char *str); /* 111 */
+    Visual * (*tk_GetVisual) (Tcl_Interp *interp, Tk_Window tkwin, const char *str, int *depthPtr, Colormap *colormapPtr); /* 112 */
+    void (*tk_GetVRootGeometry) (Tk_Window tkwin, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr); /* 113 */
+    int (*tk_Grab) (Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal); /* 114 */
+    void (*tk_HandleEvent) (XEvent *eventPtr); /* 115 */
+    Tk_Window (*tk_IdToWindow) (Display *display, Window window); /* 116 */
+    void (*tk_ImageChanged) (Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight); /* 117 */
+    int (*tk_Init) (Tcl_Interp *interp); /* 118 */
+    Atom (*tk_InternAtom) (Tk_Window tkwin, const char *name); /* 119 */
+    int (*tk_IntersectTextLayout) (Tk_TextLayout layout, int x, int y, int width, int height); /* 120 */
+    void (*tk_MaintainGeometry) (Tk_Window slave, Tk_Window master, int x, int y, int width, int height); /* 121 */
+    Tk_Window (*tk_MainWindow) (Tcl_Interp *interp); /* 122 */
+    void (*tk_MakeWindowExist) (Tk_Window tkwin); /* 123 */
+    void (*tk_ManageGeometry) (Tk_Window tkwin, const Tk_GeomMgr *mgrPtr, ClientData clientData); /* 124 */
+    void (*tk_MapWindow) (Tk_Window tkwin); /* 125 */
+    int (*tk_MeasureChars) (Tk_Font tkfont, const char *source, int numBytes, int maxPixels, int flags, int *lengthPtr); /* 126 */
+    void (*tk_MoveResizeWindow) (Tk_Window tkwin, int x, int y, int width, int height); /* 127 */
+    void (*tk_MoveWindow) (Tk_Window tkwin, int x, int y); /* 128 */
+    void (*tk_MoveToplevelWindow) (Tk_Window tkwin, int x, int y); /* 129 */
+    CONST84_RETURN char * (*tk_NameOf3DBorder) (Tk_3DBorder border); /* 130 */
+    CONST84_RETURN char * (*tk_NameOfAnchor) (Tk_Anchor anchor); /* 131 */
+    CONST84_RETURN char * (*tk_NameOfBitmap) (Display *display, Pixmap bitmap); /* 132 */
+    CONST84_RETURN char * (*tk_NameOfCapStyle) (int cap); /* 133 */
+    CONST84_RETURN char * (*tk_NameOfColor) (XColor *colorPtr); /* 134 */
+    CONST84_RETURN char * (*tk_NameOfCursor) (Display *display, Tk_Cursor cursor); /* 135 */
+    CONST84_RETURN char * (*tk_NameOfFont) (Tk_Font font); /* 136 */
+    CONST84_RETURN char * (*tk_NameOfImage) (Tk_ImageMaster imageMaster); /* 137 */
+    CONST84_RETURN char * (*tk_NameOfJoinStyle) (int join); /* 138 */
+    CONST84_RETURN char * (*tk_NameOfJustify) (Tk_Justify justify); /* 139 */
+    CONST84_RETURN char * (*tk_NameOfRelief) (int relief); /* 140 */
+    Tk_Window (*tk_NameToWindow) (Tcl_Interp *interp, const char *pathName, Tk_Window tkwin); /* 141 */
+    void (*tk_OwnSelection) (Tk_Window tkwin, Atom selection, Tk_LostSelProc *proc, ClientData clientData); /* 142 */
+    int (*tk_ParseArgv) (Tcl_Interp *interp, Tk_Window tkwin, int *argcPtr, CONST84 char **argv, const Tk_ArgvInfo *argTable, int flags); /* 143 */
+    void (*tk_PhotoPutBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height); /* 144 */
+    void (*tk_PhotoPutZoomedBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY); /* 145 */
+    int (*tk_PhotoGetImage) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr); /* 146 */
+    void (*tk_PhotoBlank) (Tk_PhotoHandle handle); /* 147 */
+    void (*tk_PhotoExpand_Panic) (Tk_PhotoHandle handle, int width, int height); /* 148 */
+    void (*tk_PhotoGetSize) (Tk_PhotoHandle handle, int *widthPtr, int *heightPtr); /* 149 */
+    void (*tk_PhotoSetSize_Panic) (Tk_PhotoHandle handle, int width, int height); /* 150 */
+    int (*tk_PointToChar) (Tk_TextLayout layout, int x, int y); /* 151 */
+    int (*tk_PostscriptFontName) (Tk_Font tkfont, Tcl_DString *dsPtr); /* 152 */
+    void (*tk_PreserveColormap) (Display *display, Colormap colormap); /* 153 */
+    void (*tk_QueueWindowEvent) (XEvent *eventPtr, Tcl_QueuePosition position); /* 154 */
+    void (*tk_RedrawImage) (Tk_Image image, int imageX, int imageY, int width, int height, Drawable drawable, int drawableX, int drawableY); /* 155 */
+    void (*tk_ResizeWindow) (Tk_Window tkwin, int width, int height); /* 156 */
+    int (*tk_RestackWindow) (Tk_Window tkwin, int aboveBelow, Tk_Window other); /* 157 */
+    Tk_RestrictProc * (*tk_RestrictEvents) (Tk_RestrictProc *proc, ClientData arg, ClientData *prevArgPtr); /* 158 */
+    int (*tk_SafeInit) (Tcl_Interp *interp); /* 159 */
+    const char * (*tk_SetAppName) (Tk_Window tkwin, const char *name); /* 160 */
+    void (*tk_SetBackgroundFromBorder) (Tk_Window tkwin, Tk_3DBorder border); /* 161 */
+    void (*tk_SetClass) (Tk_Window tkwin, const char *className); /* 162 */
+    void (*tk_SetGrid) (Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight); /* 163 */
+    void (*tk_SetInternalBorder) (Tk_Window tkwin, int width); /* 164 */
+    void (*tk_SetWindowBackground) (Tk_Window tkwin, unsigned long pixel); /* 165 */
+    void (*tk_SetWindowBackgroundPixmap) (Tk_Window tkwin, Pixmap pixmap); /* 166 */
+    void (*tk_SetWindowBorder) (Tk_Window tkwin, unsigned long pixel); /* 167 */
+    void (*tk_SetWindowBorderWidth) (Tk_Window tkwin, int width); /* 168 */
+    void (*tk_SetWindowBorderPixmap) (Tk_Window tkwin, Pixmap pixmap); /* 169 */
+    void (*tk_SetWindowColormap) (Tk_Window tkwin, Colormap colormap); /* 170 */
+    int (*tk_SetWindowVisual) (Tk_Window tkwin, Visual *visual, int depth, Colormap colormap); /* 171 */
+    void (*tk_SizeOfBitmap) (Display *display, Pixmap bitmap, int *widthPtr, int *heightPtr); /* 172 */
+    void (*tk_SizeOfImage) (Tk_Image image, int *widthPtr, int *heightPtr); /* 173 */
+    int (*tk_StrictMotif) (Tk_Window tkwin); /* 174 */
+    void (*tk_TextLayoutToPostscript) (Tcl_Interp *interp, Tk_TextLayout layout); /* 175 */
+    int (*tk_TextWidth) (Tk_Font font, const char *str, int numBytes); /* 176 */
+    void (*tk_UndefineCursor) (Tk_Window window); /* 177 */
+    void (*tk_UnderlineChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int x, int y, int firstByte, int lastByte); /* 178 */
+    void (*tk_UnderlineTextLayout) (Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline); /* 179 */
+    void (*tk_Ungrab) (Tk_Window tkwin); /* 180 */
+    void (*tk_UnmaintainGeometry) (Tk_Window slave, Tk_Window master); /* 181 */
+    void (*tk_UnmapWindow) (Tk_Window tkwin); /* 182 */
+    void (*tk_UnsetGrid) (Tk_Window tkwin); /* 183 */
+    void (*tk_UpdatePointer) (Tk_Window tkwin, int x, int y, int state); /* 184 */
+    Pixmap (*tk_AllocBitmapFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 185 */
+    Tk_3DBorder (*tk_Alloc3DBorderFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 186 */
+    XColor * (*tk_AllocColorFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 187 */
+    Tk_Cursor (*tk_AllocCursorFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 188 */
+    Tk_Font (*tk_AllocFontFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 189 */
+    Tk_OptionTable (*tk_CreateOptionTable) (Tcl_Interp *interp, const Tk_OptionSpec *templatePtr); /* 190 */
+    void (*tk_DeleteOptionTable) (Tk_OptionTable optionTable); /* 191 */
+    void (*tk_Free3DBorderFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 192 */
+    void (*tk_FreeBitmapFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 193 */
+    void (*tk_FreeColorFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 194 */
+    void (*tk_FreeConfigOptions) (char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 195 */
+    void (*tk_FreeSavedOptions) (Tk_SavedOptions *savePtr); /* 196 */
+    void (*tk_FreeCursorFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 197 */
+    void (*tk_FreeFontFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 198 */
+    Tk_3DBorder (*tk_Get3DBorderFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 199 */
+    int (*tk_GetAnchorFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Anchor *anchorPtr); /* 200 */
+    Pixmap (*tk_GetBitmapFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 201 */
+    XColor * (*tk_GetColorFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 202 */
+    Tk_Cursor (*tk_GetCursorFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 203 */
+    Tcl_Obj * (*tk_GetOptionInfo) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin); /* 204 */
+    Tcl_Obj * (*tk_GetOptionValue) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin); /* 205 */
+    int (*tk_GetJustifyFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Justify *justifyPtr); /* 206 */
+    int (*tk_GetMMFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, double *doublePtr); /* 207 */
+    int (*tk_GetPixelsFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, int *intPtr); /* 208 */
+    int (*tk_GetReliefFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr); /* 209 */
+    int (*tk_GetScrollInfoObj) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], double *dblPtr, int *intPtr); /* 210 */
+    int (*tk_InitOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 211 */
+    void (*tk_MainEx) (int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); /* 212 */
+    void (*tk_RestoreSavedOptions) (Tk_SavedOptions *savePtr); /* 213 */
+    int (*tk_SetOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *const objv[], Tk_Window tkwin, Tk_SavedOptions *savePtr, int *maskPtr); /* 214 */
+    void (*tk_InitConsoleChannels) (Tcl_Interp *interp); /* 215 */
+    int (*tk_CreateConsoleWindow) (Tcl_Interp *interp); /* 216 */
+    void (*tk_CreateSmoothMethod) (Tcl_Interp *interp, const Tk_SmoothMethod *method); /* 217 */
+    void (*reserved218)(void);
+    void (*reserved219)(void);
+    int (*tk_GetDash) (Tcl_Interp *interp, const char *value, Tk_Dash *dash); /* 220 */
+    void (*tk_CreateOutline) (Tk_Outline *outline); /* 221 */
+    void (*tk_DeleteOutline) (Display *display, Tk_Outline *outline); /* 222 */
+    int (*tk_ConfigOutlineGC) (XGCValues *gcValues, Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline); /* 223 */
+    int (*tk_ChangeOutlineGC) (Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline); /* 224 */
+    int (*tk_ResetOutlineGC) (Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline); /* 225 */
+    int (*tk_CanvasPsOutline) (Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline); /* 226 */
+    void (*tk_SetTSOrigin) (Tk_Window tkwin, GC gc, int x, int y); /* 227 */
+    int (*tk_CanvasGetCoordFromObj) (Tcl_Interp *interp, Tk_Canvas canvas, Tcl_Obj *obj, double *doublePtr); /* 228 */
+    void (*tk_CanvasSetOffset) (Tk_Canvas canvas, GC gc, Tk_TSOffset *offset); /* 229 */
+    void (*tk_DitherPhoto) (Tk_PhotoHandle handle, int x, int y, int width, int height); /* 230 */
+    int (*tk_PostscriptBitmap) (Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap, int startX, int startY, int width, int height); /* 231 */
+    int (*tk_PostscriptColor) (Tcl_Interp *interp, Tk_PostscriptInfo psInfo, XColor *colorPtr); /* 232 */
+    int (*tk_PostscriptFont) (Tcl_Interp *interp, Tk_PostscriptInfo psInfo, Tk_Font font); /* 233 */
+    int (*tk_PostscriptImage) (Tk_Image image, Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psinfo, int x, int y, int width, int height, int prepass); /* 234 */
+    void (*tk_PostscriptPath) (Tcl_Interp *interp, Tk_PostscriptInfo psInfo, double *coordPtr, int numPoints); /* 235 */
+    int (*tk_PostscriptStipple) (Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap); /* 236 */
+    double (*tk_PostscriptY) (double y, Tk_PostscriptInfo psInfo); /* 237 */
+    int (*tk_PostscriptPhoto) (Tcl_Interp *interp, Tk_PhotoImageBlock *blockPtr, Tk_PostscriptInfo psInfo, int width, int height); /* 238 */
+    void (*tk_CreateClientMessageHandler) (Tk_ClientMessageProc *proc); /* 239 */
+    void (*tk_DeleteClientMessageHandler) (Tk_ClientMessageProc *proc); /* 240 */
+    Tk_Window (*tk_CreateAnonymousWindow) (Tcl_Interp *interp, Tk_Window parent, const char *screenName); /* 241 */
+    void (*tk_SetClassProcs) (Tk_Window tkwin, const Tk_ClassProcs *procs, ClientData instanceData); /* 242 */
+    void (*tk_SetInternalBorderEx) (Tk_Window tkwin, int left, int right, int top, int bottom); /* 243 */
+    void (*tk_SetMinimumRequestSize) (Tk_Window tkwin, int minWidth, int minHeight); /* 244 */
+    void (*tk_SetCaretPos) (Tk_Window tkwin, int x, int y, int height); /* 245 */
+    void (*tk_PhotoPutBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule); /* 246 */
+    void (*tk_PhotoPutZoomedBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 247 */
+    int (*tk_CollapseMotionEvents) (Display *display, int collapse); /* 248 */
+    Tk_StyleEngine (*tk_RegisterStyleEngine) (const char *name, Tk_StyleEngine parent); /* 249 */
+    Tk_StyleEngine (*tk_GetStyleEngine) (const char *name); /* 250 */
+    int (*tk_RegisterStyledElement) (Tk_StyleEngine engine, Tk_ElementSpec *templatePtr); /* 251 */
+    int (*tk_GetElementId) (const char *name); /* 252 */
+    Tk_Style (*tk_CreateStyle) (const char *name, Tk_StyleEngine engine, ClientData clientData); /* 253 */
+    Tk_Style (*tk_GetStyle) (Tcl_Interp *interp, const char *name); /* 254 */
+    void (*tk_FreeStyle) (Tk_Style style); /* 255 */
+    const char * (*tk_NameOfStyle) (Tk_Style style); /* 256 */
+    Tk_Style (*tk_AllocStyleFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 257 */
+    Tk_Style (*tk_GetStyleFromObj) (Tcl_Obj *objPtr); /* 258 */
+    void (*tk_FreeStyleFromObj) (Tcl_Obj *objPtr); /* 259 */
+    Tk_StyledElement (*tk_GetStyledElement) (Tk_Style style, int elementId, Tk_OptionTable optionTable); /* 260 */
+    void (*tk_GetElementSize) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int width, int height, int inner, int *widthPtr, int *heightPtr); /* 261 */
+    void (*tk_GetElementBox) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int x, int y, int width, int height, int inner, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr); /* 262 */
+    int (*tk_GetElementBorderWidth) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin); /* 263 */
+    void (*tk_DrawElement) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, Drawable d, int x, int y, int width, int height, int state); /* 264 */
+    int (*tk_PhotoExpand) (Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height); /* 265 */
+    int (*tk_PhotoPutBlock) (Tcl_Interp *interp, Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule); /* 266 */
+    int (*tk_PhotoPutZoomedBlock) (Tcl_Interp *interp, Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 267 */
+    int (*tk_PhotoSetSize) (Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height); /* 268 */
+    long (*tk_GetUserInactiveTime) (Display *dpy); /* 269 */
+    void (*tk_ResetUserInactiveTime) (Display *dpy); /* 270 */
+    Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */
+    void (*tk_CreateOldImageType) (const Tk_ImageType *typePtr); /* 272 */
+    void (*tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat *formatPtr); /* 273 */
+} TkStubs;
+
+extern const TkStubs *tkStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_TK_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+#define Tk_MainLoop \
+	(tkStubsPtr->tk_MainLoop) /* 0 */
+#define Tk_3DBorderColor \
+	(tkStubsPtr->tk_3DBorderColor) /* 1 */
+#define Tk_3DBorderGC \
+	(tkStubsPtr->tk_3DBorderGC) /* 2 */
+#define Tk_3DHorizontalBevel \
+	(tkStubsPtr->tk_3DHorizontalBevel) /* 3 */
+#define Tk_3DVerticalBevel \
+	(tkStubsPtr->tk_3DVerticalBevel) /* 4 */
+#define Tk_AddOption \
+	(tkStubsPtr->tk_AddOption) /* 5 */
+#define Tk_BindEvent \
+	(tkStubsPtr->tk_BindEvent) /* 6 */
+#define Tk_CanvasDrawableCoords \
+	(tkStubsPtr->tk_CanvasDrawableCoords) /* 7 */
+#define Tk_CanvasEventuallyRedraw \
+	(tkStubsPtr->tk_CanvasEventuallyRedraw) /* 8 */
+#define Tk_CanvasGetCoord \
+	(tkStubsPtr->tk_CanvasGetCoord) /* 9 */
+#define Tk_CanvasGetTextInfo \
+	(tkStubsPtr->tk_CanvasGetTextInfo) /* 10 */
+#define Tk_CanvasPsBitmap \
+	(tkStubsPtr->tk_CanvasPsBitmap) /* 11 */
+#define Tk_CanvasPsColor \
+	(tkStubsPtr->tk_CanvasPsColor) /* 12 */
+#define Tk_CanvasPsFont \
+	(tkStubsPtr->tk_CanvasPsFont) /* 13 */
+#define Tk_CanvasPsPath \
+	(tkStubsPtr->tk_CanvasPsPath) /* 14 */
+#define Tk_CanvasPsStipple \
+	(tkStubsPtr->tk_CanvasPsStipple) /* 15 */
+#define Tk_CanvasPsY \
+	(tkStubsPtr->tk_CanvasPsY) /* 16 */
+#define Tk_CanvasSetStippleOrigin \
+	(tkStubsPtr->tk_CanvasSetStippleOrigin) /* 17 */
+#define Tk_CanvasTagsParseProc \
+	(tkStubsPtr->tk_CanvasTagsParseProc) /* 18 */
+#define Tk_CanvasTagsPrintProc \
+	(tkStubsPtr->tk_CanvasTagsPrintProc) /* 19 */
+#define Tk_CanvasTkwin \
+	(tkStubsPtr->tk_CanvasTkwin) /* 20 */
+#define Tk_CanvasWindowCoords \
+	(tkStubsPtr->tk_CanvasWindowCoords) /* 21 */
+#define Tk_ChangeWindowAttributes \
+	(tkStubsPtr->tk_ChangeWindowAttributes) /* 22 */
+#define Tk_CharBbox \
+	(tkStubsPtr->tk_CharBbox) /* 23 */
+#define Tk_ClearSelection \
+	(tkStubsPtr->tk_ClearSelection) /* 24 */
+#define Tk_ClipboardAppend \
+	(tkStubsPtr->tk_ClipboardAppend) /* 25 */
+#define Tk_ClipboardClear \
+	(tkStubsPtr->tk_ClipboardClear) /* 26 */
+#define Tk_ConfigureInfo \
+	(tkStubsPtr->tk_ConfigureInfo) /* 27 */
+#define Tk_ConfigureValue \
+	(tkStubsPtr->tk_ConfigureValue) /* 28 */
+#define Tk_ConfigureWidget \
+	(tkStubsPtr->tk_ConfigureWidget) /* 29 */
+#define Tk_ConfigureWindow \
+	(tkStubsPtr->tk_ConfigureWindow) /* 30 */
+#define Tk_ComputeTextLayout \
+	(tkStubsPtr->tk_ComputeTextLayout) /* 31 */
+#define Tk_CoordsToWindow \
+	(tkStubsPtr->tk_CoordsToWindow) /* 32 */
+#define Tk_CreateBinding \
+	(tkStubsPtr->tk_CreateBinding) /* 33 */
+#define Tk_CreateBindingTable \
+	(tkStubsPtr->tk_CreateBindingTable) /* 34 */
+#define Tk_CreateErrorHandler \
+	(tkStubsPtr->tk_CreateErrorHandler) /* 35 */
+#define Tk_CreateEventHandler \
+	(tkStubsPtr->tk_CreateEventHandler) /* 36 */
+#define Tk_CreateGenericHandler \
+	(tkStubsPtr->tk_CreateGenericHandler) /* 37 */
+#define Tk_CreateImageType \
+	(tkStubsPtr->tk_CreateImageType) /* 38 */
+#define Tk_CreateItemType \
+	(tkStubsPtr->tk_CreateItemType) /* 39 */
+#define Tk_CreatePhotoImageFormat \
+	(tkStubsPtr->tk_CreatePhotoImageFormat) /* 40 */
+#define Tk_CreateSelHandler \
+	(tkStubsPtr->tk_CreateSelHandler) /* 41 */
+#define Tk_CreateWindow \
+	(tkStubsPtr->tk_CreateWindow) /* 42 */
+#define Tk_CreateWindowFromPath \
+	(tkStubsPtr->tk_CreateWindowFromPath) /* 43 */
+#define Tk_DefineBitmap \
+	(tkStubsPtr->tk_DefineBitmap) /* 44 */
+#define Tk_DefineCursor \
+	(tkStubsPtr->tk_DefineCursor) /* 45 */
+#define Tk_DeleteAllBindings \
+	(tkStubsPtr->tk_DeleteAllBindings) /* 46 */
+#define Tk_DeleteBinding \
+	(tkStubsPtr->tk_DeleteBinding) /* 47 */
+#define Tk_DeleteBindingTable \
+	(tkStubsPtr->tk_DeleteBindingTable) /* 48 */
+#define Tk_DeleteErrorHandler \
+	(tkStubsPtr->tk_DeleteErrorHandler) /* 49 */
+#define Tk_DeleteEventHandler \
+	(tkStubsPtr->tk_DeleteEventHandler) /* 50 */
+#define Tk_DeleteGenericHandler \
+	(tkStubsPtr->tk_DeleteGenericHandler) /* 51 */
+#define Tk_DeleteImage \
+	(tkStubsPtr->tk_DeleteImage) /* 52 */
+#define Tk_DeleteSelHandler \
+	(tkStubsPtr->tk_DeleteSelHandler) /* 53 */
+#define Tk_DestroyWindow \
+	(tkStubsPtr->tk_DestroyWindow) /* 54 */
+#define Tk_DisplayName \
+	(tkStubsPtr->tk_DisplayName) /* 55 */
+#define Tk_DistanceToTextLayout \
+	(tkStubsPtr->tk_DistanceToTextLayout) /* 56 */
+#define Tk_Draw3DPolygon \
+	(tkStubsPtr->tk_Draw3DPolygon) /* 57 */
+#define Tk_Draw3DRectangle \
+	(tkStubsPtr->tk_Draw3DRectangle) /* 58 */
+#define Tk_DrawChars \
+	(tkStubsPtr->tk_DrawChars) /* 59 */
+#define Tk_DrawFocusHighlight \
+	(tkStubsPtr->tk_DrawFocusHighlight) /* 60 */
+#define Tk_DrawTextLayout \
+	(tkStubsPtr->tk_DrawTextLayout) /* 61 */
+#define Tk_Fill3DPolygon \
+	(tkStubsPtr->tk_Fill3DPolygon) /* 62 */
+#define Tk_Fill3DRectangle \
+	(tkStubsPtr->tk_Fill3DRectangle) /* 63 */
+#define Tk_FindPhoto \
+	(tkStubsPtr->tk_FindPhoto) /* 64 */
+#define Tk_FontId \
+	(tkStubsPtr->tk_FontId) /* 65 */
+#define Tk_Free3DBorder \
+	(tkStubsPtr->tk_Free3DBorder) /* 66 */
+#define Tk_FreeBitmap \
+	(tkStubsPtr->tk_FreeBitmap) /* 67 */
+#define Tk_FreeColor \
+	(tkStubsPtr->tk_FreeColor) /* 68 */
+#define Tk_FreeColormap \
+	(tkStubsPtr->tk_FreeColormap) /* 69 */
+#define Tk_FreeCursor \
+	(tkStubsPtr->tk_FreeCursor) /* 70 */
+#define Tk_FreeFont \
+	(tkStubsPtr->tk_FreeFont) /* 71 */
+#define Tk_FreeGC \
+	(tkStubsPtr->tk_FreeGC) /* 72 */
+#define Tk_FreeImage \
+	(tkStubsPtr->tk_FreeImage) /* 73 */
+#define Tk_FreeOptions \
+	(tkStubsPtr->tk_FreeOptions) /* 74 */
+#define Tk_FreePixmap \
+	(tkStubsPtr->tk_FreePixmap) /* 75 */
+#define Tk_FreeTextLayout \
+	(tkStubsPtr->tk_FreeTextLayout) /* 76 */
+#define Tk_FreeXId \
+	(tkStubsPtr->tk_FreeXId) /* 77 */
+#define Tk_GCForColor \
+	(tkStubsPtr->tk_GCForColor) /* 78 */
+#define Tk_GeometryRequest \
+	(tkStubsPtr->tk_GeometryRequest) /* 79 */
+#define Tk_Get3DBorder \
+	(tkStubsPtr->tk_Get3DBorder) /* 80 */
+#define Tk_GetAllBindings \
+	(tkStubsPtr->tk_GetAllBindings) /* 81 */
+#define Tk_GetAnchor \
+	(tkStubsPtr->tk_GetAnchor) /* 82 */
+#define Tk_GetAtomName \
+	(tkStubsPtr->tk_GetAtomName) /* 83 */
+#define Tk_GetBinding \
+	(tkStubsPtr->tk_GetBinding) /* 84 */
+#define Tk_GetBitmap \
+	(tkStubsPtr->tk_GetBitmap) /* 85 */
+#define Tk_GetBitmapFromData \
+	(tkStubsPtr->tk_GetBitmapFromData) /* 86 */
+#define Tk_GetCapStyle \
+	(tkStubsPtr->tk_GetCapStyle) /* 87 */
+#define Tk_GetColor \
+	(tkStubsPtr->tk_GetColor) /* 88 */
+#define Tk_GetColorByValue \
+	(tkStubsPtr->tk_GetColorByValue) /* 89 */
+#define Tk_GetColormap \
+	(tkStubsPtr->tk_GetColormap) /* 90 */
+#define Tk_GetCursor \
+	(tkStubsPtr->tk_GetCursor) /* 91 */
+#define Tk_GetCursorFromData \
+	(tkStubsPtr->tk_GetCursorFromData) /* 92 */
+#define Tk_GetFont \
+	(tkStubsPtr->tk_GetFont) /* 93 */
+#define Tk_GetFontFromObj \
+	(tkStubsPtr->tk_GetFontFromObj) /* 94 */
+#define Tk_GetFontMetrics \
+	(tkStubsPtr->tk_GetFontMetrics) /* 95 */
+#define Tk_GetGC \
+	(tkStubsPtr->tk_GetGC) /* 96 */
+#define Tk_GetImage \
+	(tkStubsPtr->tk_GetImage) /* 97 */
+#define Tk_GetImageMasterData \
+	(tkStubsPtr->tk_GetImageMasterData) /* 98 */
+#define Tk_GetItemTypes \
+	(tkStubsPtr->tk_GetItemTypes) /* 99 */
+#define Tk_GetJoinStyle \
+	(tkStubsPtr->tk_GetJoinStyle) /* 100 */
+#define Tk_GetJustify \
+	(tkStubsPtr->tk_GetJustify) /* 101 */
+#define Tk_GetNumMainWindows \
+	(tkStubsPtr->tk_GetNumMainWindows) /* 102 */
+#define Tk_GetOption \
+	(tkStubsPtr->tk_GetOption) /* 103 */
+#define Tk_GetPixels \
+	(tkStubsPtr->tk_GetPixels) /* 104 */
+#define Tk_GetPixmap \
+	(tkStubsPtr->tk_GetPixmap) /* 105 */
+#define Tk_GetRelief \
+	(tkStubsPtr->tk_GetRelief) /* 106 */
+#define Tk_GetRootCoords \
+	(tkStubsPtr->tk_GetRootCoords) /* 107 */
+#define Tk_GetScrollInfo \
+	(tkStubsPtr->tk_GetScrollInfo) /* 108 */
+#define Tk_GetScreenMM \
+	(tkStubsPtr->tk_GetScreenMM) /* 109 */
+#define Tk_GetSelection \
+	(tkStubsPtr->tk_GetSelection) /* 110 */
+#define Tk_GetUid \
+	(tkStubsPtr->tk_GetUid) /* 111 */
+#define Tk_GetVisual \
+	(tkStubsPtr->tk_GetVisual) /* 112 */
+#define Tk_GetVRootGeometry \
+	(tkStubsPtr->tk_GetVRootGeometry) /* 113 */
+#define Tk_Grab \
+	(tkStubsPtr->tk_Grab) /* 114 */
+#define Tk_HandleEvent \
+	(tkStubsPtr->tk_HandleEvent) /* 115 */
+#define Tk_IdToWindow \
+	(tkStubsPtr->tk_IdToWindow) /* 116 */
+#define Tk_ImageChanged \
+	(tkStubsPtr->tk_ImageChanged) /* 117 */
+#define Tk_Init \
+	(tkStubsPtr->tk_Init) /* 118 */
+#define Tk_InternAtom \
+	(tkStubsPtr->tk_InternAtom) /* 119 */
+#define Tk_IntersectTextLayout \
+	(tkStubsPtr->tk_IntersectTextLayout) /* 120 */
+#define Tk_MaintainGeometry \
+	(tkStubsPtr->tk_MaintainGeometry) /* 121 */
+#define Tk_MainWindow \
+	(tkStubsPtr->tk_MainWindow) /* 122 */
+#define Tk_MakeWindowExist \
+	(tkStubsPtr->tk_MakeWindowExist) /* 123 */
+#define Tk_ManageGeometry \
+	(tkStubsPtr->tk_ManageGeometry) /* 124 */
+#define Tk_MapWindow \
+	(tkStubsPtr->tk_MapWindow) /* 125 */
+#define Tk_MeasureChars \
+	(tkStubsPtr->tk_MeasureChars) /* 126 */
+#define Tk_MoveResizeWindow \
+	(tkStubsPtr->tk_MoveResizeWindow) /* 127 */
+#define Tk_MoveWindow \
+	(tkStubsPtr->tk_MoveWindow) /* 128 */
+#define Tk_MoveToplevelWindow \
+	(tkStubsPtr->tk_MoveToplevelWindow) /* 129 */
+#define Tk_NameOf3DBorder \
+	(tkStubsPtr->tk_NameOf3DBorder) /* 130 */
+#define Tk_NameOfAnchor \
+	(tkStubsPtr->tk_NameOfAnchor) /* 131 */
+#define Tk_NameOfBitmap \
+	(tkStubsPtr->tk_NameOfBitmap) /* 132 */
+#define Tk_NameOfCapStyle \
+	(tkStubsPtr->tk_NameOfCapStyle) /* 133 */
+#define Tk_NameOfColor \
+	(tkStubsPtr->tk_NameOfColor) /* 134 */
+#define Tk_NameOfCursor \
+	(tkStubsPtr->tk_NameOfCursor) /* 135 */
+#define Tk_NameOfFont \
+	(tkStubsPtr->tk_NameOfFont) /* 136 */
+#define Tk_NameOfImage \
+	(tkStubsPtr->tk_NameOfImage) /* 137 */
+#define Tk_NameOfJoinStyle \
+	(tkStubsPtr->tk_NameOfJoinStyle) /* 138 */
+#define Tk_NameOfJustify \
+	(tkStubsPtr->tk_NameOfJustify) /* 139 */
+#define Tk_NameOfRelief \
+	(tkStubsPtr->tk_NameOfRelief) /* 140 */
+#define Tk_NameToWindow \
+	(tkStubsPtr->tk_NameToWindow) /* 141 */
+#define Tk_OwnSelection \
+	(tkStubsPtr->tk_OwnSelection) /* 142 */
+#define Tk_ParseArgv \
+	(tkStubsPtr->tk_ParseArgv) /* 143 */
+#define Tk_PhotoPutBlock_NoComposite \
+	(tkStubsPtr->tk_PhotoPutBlock_NoComposite) /* 144 */
+#define Tk_PhotoPutZoomedBlock_NoComposite \
+	(tkStubsPtr->tk_PhotoPutZoomedBlock_NoComposite) /* 145 */
+#define Tk_PhotoGetImage \
+	(tkStubsPtr->tk_PhotoGetImage) /* 146 */
+#define Tk_PhotoBlank \
+	(tkStubsPtr->tk_PhotoBlank) /* 147 */
+#define Tk_PhotoExpand_Panic \
+	(tkStubsPtr->tk_PhotoExpand_Panic) /* 148 */
+#define Tk_PhotoGetSize \
+	(tkStubsPtr->tk_PhotoGetSize) /* 149 */
+#define Tk_PhotoSetSize_Panic \
+	(tkStubsPtr->tk_PhotoSetSize_Panic) /* 150 */
+#define Tk_PointToChar \
+	(tkStubsPtr->tk_PointToChar) /* 151 */
+#define Tk_PostscriptFontName \
+	(tkStubsPtr->tk_PostscriptFontName) /* 152 */
+#define Tk_PreserveColormap \
+	(tkStubsPtr->tk_PreserveColormap) /* 153 */
+#define Tk_QueueWindowEvent \
+	(tkStubsPtr->tk_QueueWindowEvent) /* 154 */
+#define Tk_RedrawImage \
+	(tkStubsPtr->tk_RedrawImage) /* 155 */
+#define Tk_ResizeWindow \
+	(tkStubsPtr->tk_ResizeWindow) /* 156 */
+#define Tk_RestackWindow \
+	(tkStubsPtr->tk_RestackWindow) /* 157 */
+#define Tk_RestrictEvents \
+	(tkStubsPtr->tk_RestrictEvents) /* 158 */
+#define Tk_SafeInit \
+	(tkStubsPtr->tk_SafeInit) /* 159 */
+#define Tk_SetAppName \
+	(tkStubsPtr->tk_SetAppName) /* 160 */
+#define Tk_SetBackgroundFromBorder \
+	(tkStubsPtr->tk_SetBackgroundFromBorder) /* 161 */
+#define Tk_SetClass \
+	(tkStubsPtr->tk_SetClass) /* 162 */
+#define Tk_SetGrid \
+	(tkStubsPtr->tk_SetGrid) /* 163 */
+#define Tk_SetInternalBorder \
+	(tkStubsPtr->tk_SetInternalBorder) /* 164 */
+#define Tk_SetWindowBackground \
+	(tkStubsPtr->tk_SetWindowBackground) /* 165 */
+#define Tk_SetWindowBackgroundPixmap \
+	(tkStubsPtr->tk_SetWindowBackgroundPixmap) /* 166 */
+#define Tk_SetWindowBorder \
+	(tkStubsPtr->tk_SetWindowBorder) /* 167 */
+#define Tk_SetWindowBorderWidth \
+	(tkStubsPtr->tk_SetWindowBorderWidth) /* 168 */
+#define Tk_SetWindowBorderPixmap \
+	(tkStubsPtr->tk_SetWindowBorderPixmap) /* 169 */
+#define Tk_SetWindowColormap \
+	(tkStubsPtr->tk_SetWindowColormap) /* 170 */
+#define Tk_SetWindowVisual \
+	(tkStubsPtr->tk_SetWindowVisual) /* 171 */
+#define Tk_SizeOfBitmap \
+	(tkStubsPtr->tk_SizeOfBitmap) /* 172 */
+#define Tk_SizeOfImage \
+	(tkStubsPtr->tk_SizeOfImage) /* 173 */
+#define Tk_StrictMotif \
+	(tkStubsPtr->tk_StrictMotif) /* 174 */
+#define Tk_TextLayoutToPostscript \
+	(tkStubsPtr->tk_TextLayoutToPostscript) /* 175 */
+#define Tk_TextWidth \
+	(tkStubsPtr->tk_TextWidth) /* 176 */
+#define Tk_UndefineCursor \
+	(tkStubsPtr->tk_UndefineCursor) /* 177 */
+#define Tk_UnderlineChars \
+	(tkStubsPtr->tk_UnderlineChars) /* 178 */
+#define Tk_UnderlineTextLayout \
+	(tkStubsPtr->tk_UnderlineTextLayout) /* 179 */
+#define Tk_Ungrab \
+	(tkStubsPtr->tk_Ungrab) /* 180 */
+#define Tk_UnmaintainGeometry \
+	(tkStubsPtr->tk_UnmaintainGeometry) /* 181 */
+#define Tk_UnmapWindow \
+	(tkStubsPtr->tk_UnmapWindow) /* 182 */
+#define Tk_UnsetGrid \
+	(tkStubsPtr->tk_UnsetGrid) /* 183 */
+#define Tk_UpdatePointer \
+	(tkStubsPtr->tk_UpdatePointer) /* 184 */
+#define Tk_AllocBitmapFromObj \
+	(tkStubsPtr->tk_AllocBitmapFromObj) /* 185 */
+#define Tk_Alloc3DBorderFromObj \
+	(tkStubsPtr->tk_Alloc3DBorderFromObj) /* 186 */
+#define Tk_AllocColorFromObj \
+	(tkStubsPtr->tk_AllocColorFromObj) /* 187 */
+#define Tk_AllocCursorFromObj \
+	(tkStubsPtr->tk_AllocCursorFromObj) /* 188 */
+#define Tk_AllocFontFromObj \
+	(tkStubsPtr->tk_AllocFontFromObj) /* 189 */
+#define Tk_CreateOptionTable \
+	(tkStubsPtr->tk_CreateOptionTable) /* 190 */
+#define Tk_DeleteOptionTable \
+	(tkStubsPtr->tk_DeleteOptionTable) /* 191 */
+#define Tk_Free3DBorderFromObj \
+	(tkStubsPtr->tk_Free3DBorderFromObj) /* 192 */
+#define Tk_FreeBitmapFromObj \
+	(tkStubsPtr->tk_FreeBitmapFromObj) /* 193 */
+#define Tk_FreeColorFromObj \
+	(tkStubsPtr->tk_FreeColorFromObj) /* 194 */
+#define Tk_FreeConfigOptions \
+	(tkStubsPtr->tk_FreeConfigOptions) /* 195 */
+#define Tk_FreeSavedOptions \
+	(tkStubsPtr->tk_FreeSavedOptions) /* 196 */
+#define Tk_FreeCursorFromObj \
+	(tkStubsPtr->tk_FreeCursorFromObj) /* 197 */
+#define Tk_FreeFontFromObj \
+	(tkStubsPtr->tk_FreeFontFromObj) /* 198 */
+#define Tk_Get3DBorderFromObj \
+	(tkStubsPtr->tk_Get3DBorderFromObj) /* 199 */
+#define Tk_GetAnchorFromObj \
+	(tkStubsPtr->tk_GetAnchorFromObj) /* 200 */
+#define Tk_GetBitmapFromObj \
+	(tkStubsPtr->tk_GetBitmapFromObj) /* 201 */
+#define Tk_GetColorFromObj \
+	(tkStubsPtr->tk_GetColorFromObj) /* 202 */
+#define Tk_GetCursorFromObj \
+	(tkStubsPtr->tk_GetCursorFromObj) /* 203 */
+#define Tk_GetOptionInfo \
+	(tkStubsPtr->tk_GetOptionInfo) /* 204 */
+#define Tk_GetOptionValue \
+	(tkStubsPtr->tk_GetOptionValue) /* 205 */
+#define Tk_GetJustifyFromObj \
+	(tkStubsPtr->tk_GetJustifyFromObj) /* 206 */
+#define Tk_GetMMFromObj \
+	(tkStubsPtr->tk_GetMMFromObj) /* 207 */
+#define Tk_GetPixelsFromObj \
+	(tkStubsPtr->tk_GetPixelsFromObj) /* 208 */
+#define Tk_GetReliefFromObj \
+	(tkStubsPtr->tk_GetReliefFromObj) /* 209 */
+#define Tk_GetScrollInfoObj \
+	(tkStubsPtr->tk_GetScrollInfoObj) /* 210 */
+#define Tk_InitOptions \
+	(tkStubsPtr->tk_InitOptions) /* 211 */
+#define Tk_MainEx \
+	(tkStubsPtr->tk_MainEx) /* 212 */
+#define Tk_RestoreSavedOptions \
+	(tkStubsPtr->tk_RestoreSavedOptions) /* 213 */
+#define Tk_SetOptions \
+	(tkStubsPtr->tk_SetOptions) /* 214 */
+#define Tk_InitConsoleChannels \
+	(tkStubsPtr->tk_InitConsoleChannels) /* 215 */
+#define Tk_CreateConsoleWindow \
+	(tkStubsPtr->tk_CreateConsoleWindow) /* 216 */
+#define Tk_CreateSmoothMethod \
+	(tkStubsPtr->tk_CreateSmoothMethod) /* 217 */
+/* Slot 218 is reserved */
+/* Slot 219 is reserved */
+#define Tk_GetDash \
+	(tkStubsPtr->tk_GetDash) /* 220 */
+#define Tk_CreateOutline \
+	(tkStubsPtr->tk_CreateOutline) /* 221 */
+#define Tk_DeleteOutline \
+	(tkStubsPtr->tk_DeleteOutline) /* 222 */
+#define Tk_ConfigOutlineGC \
+	(tkStubsPtr->tk_ConfigOutlineGC) /* 223 */
+#define Tk_ChangeOutlineGC \
+	(tkStubsPtr->tk_ChangeOutlineGC) /* 224 */
+#define Tk_ResetOutlineGC \
+	(tkStubsPtr->tk_ResetOutlineGC) /* 225 */
+#define Tk_CanvasPsOutline \
+	(tkStubsPtr->tk_CanvasPsOutline) /* 226 */
+#define Tk_SetTSOrigin \
+	(tkStubsPtr->tk_SetTSOrigin) /* 227 */
+#define Tk_CanvasGetCoordFromObj \
+	(tkStubsPtr->tk_CanvasGetCoordFromObj) /* 228 */
+#define Tk_CanvasSetOffset \
+	(tkStubsPtr->tk_CanvasSetOffset) /* 229 */
+#define Tk_DitherPhoto \
+	(tkStubsPtr->tk_DitherPhoto) /* 230 */
+#define Tk_PostscriptBitmap \
+	(tkStubsPtr->tk_PostscriptBitmap) /* 231 */
+#define Tk_PostscriptColor \
+	(tkStubsPtr->tk_PostscriptColor) /* 232 */
+#define Tk_PostscriptFont \
+	(tkStubsPtr->tk_PostscriptFont) /* 233 */
+#define Tk_PostscriptImage \
+	(tkStubsPtr->tk_PostscriptImage) /* 234 */
+#define Tk_PostscriptPath \
+	(tkStubsPtr->tk_PostscriptPath) /* 235 */
+#define Tk_PostscriptStipple \
+	(tkStubsPtr->tk_PostscriptStipple) /* 236 */
+#define Tk_PostscriptY \
+	(tkStubsPtr->tk_PostscriptY) /* 237 */
+#define Tk_PostscriptPhoto \
+	(tkStubsPtr->tk_PostscriptPhoto) /* 238 */
+#define Tk_CreateClientMessageHandler \
+	(tkStubsPtr->tk_CreateClientMessageHandler) /* 239 */
+#define Tk_DeleteClientMessageHandler \
+	(tkStubsPtr->tk_DeleteClientMessageHandler) /* 240 */
+#define Tk_CreateAnonymousWindow \
+	(tkStubsPtr->tk_CreateAnonymousWindow) /* 241 */
+#define Tk_SetClassProcs \
+	(tkStubsPtr->tk_SetClassProcs) /* 242 */
+#define Tk_SetInternalBorderEx \
+	(tkStubsPtr->tk_SetInternalBorderEx) /* 243 */
+#define Tk_SetMinimumRequestSize \
+	(tkStubsPtr->tk_SetMinimumRequestSize) /* 244 */
+#define Tk_SetCaretPos \
+	(tkStubsPtr->tk_SetCaretPos) /* 245 */
+#define Tk_PhotoPutBlock_Panic \
+	(tkStubsPtr->tk_PhotoPutBlock_Panic) /* 246 */
+#define Tk_PhotoPutZoomedBlock_Panic \
+	(tkStubsPtr->tk_PhotoPutZoomedBlock_Panic) /* 247 */
+#define Tk_CollapseMotionEvents \
+	(tkStubsPtr->tk_CollapseMotionEvents) /* 248 */
+#define Tk_RegisterStyleEngine \
+	(tkStubsPtr->tk_RegisterStyleEngine) /* 249 */
+#define Tk_GetStyleEngine \
+	(tkStubsPtr->tk_GetStyleEngine) /* 250 */
+#define Tk_RegisterStyledElement \
+	(tkStubsPtr->tk_RegisterStyledElement) /* 251 */
+#define Tk_GetElementId \
+	(tkStubsPtr->tk_GetElementId) /* 252 */
+#define Tk_CreateStyle \
+	(tkStubsPtr->tk_CreateStyle) /* 253 */
+#define Tk_GetStyle \
+	(tkStubsPtr->tk_GetStyle) /* 254 */
+#define Tk_FreeStyle \
+	(tkStubsPtr->tk_FreeStyle) /* 255 */
+#define Tk_NameOfStyle \
+	(tkStubsPtr->tk_NameOfStyle) /* 256 */
+#define Tk_AllocStyleFromObj \
+	(tkStubsPtr->tk_AllocStyleFromObj) /* 257 */
+#define Tk_GetStyleFromObj \
+	(tkStubsPtr->tk_GetStyleFromObj) /* 258 */
+#define Tk_FreeStyleFromObj \
+	(tkStubsPtr->tk_FreeStyleFromObj) /* 259 */
+#define Tk_GetStyledElement \
+	(tkStubsPtr->tk_GetStyledElement) /* 260 */
+#define Tk_GetElementSize \
+	(tkStubsPtr->tk_GetElementSize) /* 261 */
+#define Tk_GetElementBox \
+	(tkStubsPtr->tk_GetElementBox) /* 262 */
+#define Tk_GetElementBorderWidth \
+	(tkStubsPtr->tk_GetElementBorderWidth) /* 263 */
+#define Tk_DrawElement \
+	(tkStubsPtr->tk_DrawElement) /* 264 */
+#define Tk_PhotoExpand \
+	(tkStubsPtr->tk_PhotoExpand) /* 265 */
+#define Tk_PhotoPutBlock \
+	(tkStubsPtr->tk_PhotoPutBlock) /* 266 */
+#define Tk_PhotoPutZoomedBlock \
+	(tkStubsPtr->tk_PhotoPutZoomedBlock) /* 267 */
+#define Tk_PhotoSetSize \
+	(tkStubsPtr->tk_PhotoSetSize) /* 268 */
+#define Tk_GetUserInactiveTime \
+	(tkStubsPtr->tk_GetUserInactiveTime) /* 269 */
+#define Tk_ResetUserInactiveTime \
+	(tkStubsPtr->tk_ResetUserInactiveTime) /* 270 */
+#define Tk_Interp \
+	(tkStubsPtr->tk_Interp) /* 271 */
+#define Tk_CreateOldImageType \
+	(tkStubsPtr->tk_CreateOldImageType) /* 272 */
+#define Tk_CreateOldPhotoImageFormat \
+	(tkStubsPtr->tk_CreateOldPhotoImageFormat) /* 273 */
+
+#endif /* defined(USE_TK_STUBS) */
+
+/* !END!: Do not edit above this line. */
+
+/* Functions that don't belong in the stub table */
+#undef Tk_MainEx
+#undef Tk_Init
+#undef Tk_SafeInit
+#undef Tk_CreateConsoleWindow
+
+#if defined(_WIN32) && defined(UNICODE)
+#   define Tk_MainEx Tk_MainExW
+    EXTERN void Tk_MainExW(int argc, wchar_t **argv,
+	    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
+#endif
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
+#endif /* _TKDECLS */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tkPlatDecls.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tkPlatDecls.h
new file mode 100644
index 00000000..1e69c883
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.6/tkPlatDecls.h
@@ -0,0 +1,176 @@
+/*
+ * tkPlatDecls.h --
+ *
+ *	Declarations of functions in the platform-specific public Tcl API.
+ *
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#ifndef _TKPLATDECLS
+#define _TKPLATDECLS
+
+#ifdef BUILD_tk
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
+#endif
+
+/*
+ * WARNING: This file is automatically generated by the tools/genStubs.tcl
+ * script.  Any modifications to the function declarations below should be made
+ * in the generic/tk.decls script.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* !BEGIN!: Do not edit below this line. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+/* 0 */
+EXTERN Window		Tk_AttachHWND(Tk_Window tkwin, HWND hwnd);
+/* 1 */
+EXTERN HINSTANCE	Tk_GetHINSTANCE(void);
+/* 2 */
+EXTERN HWND		Tk_GetHWND(Window window);
+/* 3 */
+EXTERN Tk_Window	Tk_HWNDToWindow(HWND hwnd);
+/* 4 */
+EXTERN void		Tk_PointerEvent(HWND hwnd, int x, int y);
+/* 5 */
+EXTERN int		Tk_TranslateWinEvent(HWND hwnd, UINT message,
+				WPARAM wParam, LPARAM lParam,
+				LRESULT *result);
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+/* 0 */
+EXTERN void		Tk_MacOSXSetEmbedHandler(
+				Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr,
+				Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr,
+				Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr,
+				Tk_MacOSXEmbedGetClipProc *getClipProc,
+				Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc);
+/* 1 */
+EXTERN void		Tk_MacOSXTurnOffMenus(void);
+/* 2 */
+EXTERN void		Tk_MacOSXTkOwnsCursor(int tkOwnsIt);
+/* 3 */
+EXTERN void		TkMacOSXInitMenus(Tcl_Interp *interp);
+/* 4 */
+EXTERN void		TkMacOSXInitAppleEvents(Tcl_Interp *interp);
+/* 5 */
+EXTERN void		TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y,
+				int width, int height, int flags);
+/* 6 */
+EXTERN void		TkMacOSXInvalClipRgns(Tk_Window tkwin);
+/* 7 */
+EXTERN void *		TkMacOSXGetDrawablePort(Drawable drawable);
+/* 8 */
+EXTERN void *		TkMacOSXGetRootControl(Drawable drawable);
+/* 9 */
+EXTERN void		Tk_MacOSXSetupTkNotifier(void);
+/* 10 */
+EXTERN int		Tk_MacOSXIsAppInFront(void);
+#endif /* AQUA */
+
+typedef struct TkPlatStubs {
+    int magic;
+    void *hooks;
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+    Window (*tk_AttachHWND) (Tk_Window tkwin, HWND hwnd); /* 0 */
+    HINSTANCE (*tk_GetHINSTANCE) (void); /* 1 */
+    HWND (*tk_GetHWND) (Window window); /* 2 */
+    Tk_Window (*tk_HWNDToWindow) (HWND hwnd); /* 3 */
+    void (*tk_PointerEvent) (HWND hwnd, int x, int y); /* 4 */
+    int (*tk_TranslateWinEvent) (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result); /* 5 */
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void (*tk_MacOSXSetEmbedHandler) (Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); /* 0 */
+    void (*tk_MacOSXTurnOffMenus) (void); /* 1 */
+    void (*tk_MacOSXTkOwnsCursor) (int tkOwnsIt); /* 2 */
+    void (*tkMacOSXInitMenus) (Tcl_Interp *interp); /* 3 */
+    void (*tkMacOSXInitAppleEvents) (Tcl_Interp *interp); /* 4 */
+    void (*tkGenWMConfigureEvent) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 5 */
+    void (*tkMacOSXInvalClipRgns) (Tk_Window tkwin); /* 6 */
+    void * (*tkMacOSXGetDrawablePort) (Drawable drawable); /* 7 */
+    void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
+    void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
+    int (*tk_MacOSXIsAppInFront) (void); /* 10 */
+#endif /* AQUA */
+} TkPlatStubs;
+
+extern const TkPlatStubs *tkPlatStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_TK_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#define Tk_AttachHWND \
+	(tkPlatStubsPtr->tk_AttachHWND) /* 0 */
+#define Tk_GetHINSTANCE \
+	(tkPlatStubsPtr->tk_GetHINSTANCE) /* 1 */
+#define Tk_GetHWND \
+	(tkPlatStubsPtr->tk_GetHWND) /* 2 */
+#define Tk_HWNDToWindow \
+	(tkPlatStubsPtr->tk_HWNDToWindow) /* 3 */
+#define Tk_PointerEvent \
+	(tkPlatStubsPtr->tk_PointerEvent) /* 4 */
+#define Tk_TranslateWinEvent \
+	(tkPlatStubsPtr->tk_TranslateWinEvent) /* 5 */
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+#define Tk_MacOSXSetEmbedHandler \
+	(tkPlatStubsPtr->tk_MacOSXSetEmbedHandler) /* 0 */
+#define Tk_MacOSXTurnOffMenus \
+	(tkPlatStubsPtr->tk_MacOSXTurnOffMenus) /* 1 */
+#define Tk_MacOSXTkOwnsCursor \
+	(tkPlatStubsPtr->tk_MacOSXTkOwnsCursor) /* 2 */
+#define TkMacOSXInitMenus \
+	(tkPlatStubsPtr->tkMacOSXInitMenus) /* 3 */
+#define TkMacOSXInitAppleEvents \
+	(tkPlatStubsPtr->tkMacOSXInitAppleEvents) /* 4 */
+#define TkGenWMConfigureEvent \
+	(tkPlatStubsPtr->tkGenWMConfigureEvent) /* 5 */
+#define TkMacOSXInvalClipRgns \
+	(tkPlatStubsPtr->tkMacOSXInvalClipRgns) /* 6 */
+#define TkMacOSXGetDrawablePort \
+	(tkPlatStubsPtr->tkMacOSXGetDrawablePort) /* 7 */
+#define TkMacOSXGetRootControl \
+	(tkPlatStubsPtr->tkMacOSXGetRootControl) /* 8 */
+#define Tk_MacOSXSetupTkNotifier \
+	(tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 9 */
+#define Tk_MacOSXIsAppInFront \
+	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
+#endif /* AQUA */
+
+#endif /* defined(USE_TK_STUBS) */
+
+/* !END!: Do not edit above this line. */
+
+#ifdef __cplusplus
+}
+#endif
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
+#endif /* _TKPLATDECLS */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.7/tcl.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.7/tcl.h
new file mode 100644
index 00000000..2f1f7935
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.7/tcl.h
@@ -0,0 +1,2710 @@
+/*
+ * tcl.h --
+ *
+ *	This header file describes the externally-visible facilities of the
+ *	Tcl interpreter.
+ *
+ * Copyright (c) 1987-1994 The Regents of the University of California.
+ * Copyright (c) 1993-1996 Lucent Technologies.
+ * Copyright (c) 1994-1998 Sun Microsystems, Inc.
+ * Copyright (c) 1998-2000 by Scriptics Corporation.
+ * Copyright (c) 2002 by Kevin B. Kenny.  All rights reserved.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#ifndef _TCL
+#define _TCL
+
+/*
+ * For C++ compilers, use extern "C"
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The following defines are used to indicate the various release levels.
+ */
+
+#define TCL_ALPHA_RELEASE	0
+#define TCL_BETA_RELEASE	1
+#define TCL_FINAL_RELEASE	2
+
+/*
+ * When version numbers change here, must also go into the following files and
+ * update the version numbers:
+ *
+ * library/init.tcl	(1 LOC patch)
+ * unix/configure.ac	(2 LOC Major, 2 LOC minor, 1 LOC patch)
+ * win/configure.ac	(as above)
+ * win/tcl.m4		(not patchlevel)
+ * README		(sections 0 and 2, with and without separator)
+ * macosx/Tcl-Common.xcconfig (not patchlevel) 1 LOC
+ * win/README		(not patchlevel) (sections 0 and 2)
+ * unix/tcl.spec	(1 LOC patch)
+ */
+
+#if !defined(TCL_MAJOR_VERSION)
+#   define TCL_MAJOR_VERSION   8
+#endif
+#if TCL_MAJOR_VERSION != 8
+#   error "This header-file is for Tcl 8 only"
+#endif
+#define TCL_MINOR_VERSION   7
+#define TCL_RELEASE_LEVEL   TCL_ALPHA_RELEASE
+#define TCL_RELEASE_SERIAL  6
+
+#define TCL_VERSION	    "8.7"
+#define TCL_PATCH_LEVEL	    "8.7a6"
+
+#if !defined(TCL_NO_DEPRECATED) || defined(RC_INVOKED)
+/*
+ *----------------------------------------------------------------------------
+ * The following definitions set up the proper options for Windows compilers.
+ * We use this method because there is no autoconf equivalent.
+ */
+
+#ifdef _WIN32
+#   ifndef __WIN32__
+#	define __WIN32__
+#   endif
+#   ifndef WIN32
+#	define WIN32
+#   endif
+#endif
+
+/*
+ * Utility macros: STRINGIFY takes an argument and wraps it in "" (double
+ * quotation marks), JOIN joins two arguments.
+ */
+
+#ifndef STRINGIFY
+#  define STRINGIFY(x) STRINGIFY1(x)
+#  define STRINGIFY1(x) #x
+#endif
+#ifndef JOIN
+#  define JOIN(a,b) JOIN1(a,b)
+#  define JOIN1(a,b) a##b
+#endif
+
+#ifndef TCL_THREADS
+#   define TCL_THREADS 1
+#endif
+#endif /* !TCL_NO_DEPRECATED */
+
+/*
+ * A special definition used to allow this header file to be included from
+ * windows resource files so that they can obtain version information.
+ * RC_INVOKED is defined by default by the windows RC tool.
+ *
+ * Resource compilers don't like all the C stuff, like typedefs and function
+ * declarations, that occur below, so block them out.
+ */
+
+#ifndef RC_INVOKED
+
+/*
+ * Special macro to define mutexes.
+ */
+
+#define TCL_DECLARE_MUTEX(name) static Tcl_Mutex name;
+
+/*
+ * Tcl's public routine Tcl_FSSeek() uses the values SEEK_SET, SEEK_CUR, and
+ * SEEK_END, all #define'd by stdio.h .
+ *
+ * Also, many extensions need stdio.h, and they've grown accustomed to tcl.h
+ * providing it for them rather than #include-ing it themselves as they
+ * should, so also for their sake, we keep the #include to be consistent with
+ * prior Tcl releases.
+ */
+
+#include <stdio.h>
+#include <stddef.h>
+
+/*
+ *----------------------------------------------------------------------------
+ * Support for functions with a variable number of arguments.
+ *
+ * The following TCL_VARARGS* macros are to support old extensions
+ * written for older versions of Tcl where the macros permitted
+ * support for the varargs.h system as well as stdarg.h .
+ *
+ * New code should just directly be written to use stdarg.h conventions.
+ */
+
+#include <stdarg.h>
+#ifndef TCL_NO_DEPRECATED
+#    define TCL_VARARGS(type, name) (type name, ...)
+#    define TCL_VARARGS_DEF(type, name) (type name, ...)
+#    define TCL_VARARGS_START(type, name, list) (va_start(list, name), name)
+#endif /* !TCL_NO_DEPRECATED */
+#if defined(__GNUC__) && (__GNUC__ > 2)
+#   if defined(_WIN32) && defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO
+#	define TCL_FORMAT_PRINTF(a,b) __attribute__ ((__format__ (__MINGW_PRINTF_FORMAT, a, b)))
+#   else
+#	define TCL_FORMAT_PRINTF(a,b) __attribute__ ((__format__ (__printf__, a, b)))
+#   endif
+#   define TCL_NORETURN __attribute__ ((noreturn))
+#   define TCL_NOINLINE __attribute__ ((noinline))
+#   if defined(BUILD_tcl) || defined(BUILD_tk)
+#	define TCL_NORETURN1 __attribute__ ((noreturn))
+#   else
+#	define TCL_NORETURN1 /* nothing */
+#   endif
+#else
+#   define TCL_FORMAT_PRINTF(a,b)
+#   if defined(_MSC_VER)
+#	define TCL_NORETURN _declspec(noreturn)
+#	define TCL_NOINLINE __declspec(noinline)
+#   else
+#	define TCL_NORETURN /* nothing */
+#	define TCL_NOINLINE /* nothing */
+#   endif
+#   define TCL_NORETURN1 /* nothing */
+#endif
+
+/*
+ * Allow a part of Tcl's API to be explicitly marked as deprecated.
+ *
+ * Used to make TIP 330/336 generate moans even if people use the
+ * compatibility macros. Change your code, guys! We won't support you forever.
+ */
+
+#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
+#   if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))
+#	define TCL_DEPRECATED_API(msg)	__attribute__ ((__deprecated__ (msg)))
+#   else
+#	define TCL_DEPRECATED_API(msg)	__attribute__ ((__deprecated__))
+#   endif
+#else
+#   define TCL_DEPRECATED_API(msg)	/* nothing portable */
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * Macros used to declare a function to be exported by a DLL. Used by Windows,
+ * maps to no-op declarations on non-Windows systems. The default build on
+ * windows is for a DLL, which causes the DLLIMPORT and DLLEXPORT macros to be
+ * nonempty. To build a static library, the macro STATIC_BUILD should be
+ * defined.
+ *
+ * Note: when building static but linking dynamically to MSVCRT we must still
+ *       correctly decorate the C library imported function.  Use CRTIMPORT
+ *       for this purpose.  _DLL is defined by the compiler when linking to
+ *       MSVCRT.
+ */
+
+#ifdef _WIN32
+#   ifdef STATIC_BUILD
+#       define DLLIMPORT
+#       define DLLEXPORT
+#       ifdef _DLL
+#           define CRTIMPORT __declspec(dllimport)
+#       else
+#           define CRTIMPORT
+#       endif
+#   else
+#       define DLLIMPORT __declspec(dllimport)
+#       define DLLEXPORT __declspec(dllexport)
+#       define CRTIMPORT __declspec(dllimport)
+#   endif
+#else
+#   define DLLIMPORT
+#   if defined(__GNUC__) && __GNUC__ > 3
+#       define DLLEXPORT __attribute__ ((visibility("default")))
+#   else
+#       define DLLEXPORT
+#   endif
+#   define CRTIMPORT
+#endif
+
+/*
+ * These macros are used to control whether functions are being declared for
+ * import or export. If a function is being declared while it is being built
+ * to be included in a shared library, then it should have the DLLEXPORT
+ * storage class. If is being declared for use by a module that is going to
+ * link against the shared library, then it should have the DLLIMPORT storage
+ * class. If the symbol is being declared for a static build or for use from a
+ * stub library, then the storage class should be empty.
+ *
+ * The convention is that a macro called BUILD_xxxx, where xxxx is the name of
+ * a library we are building, is set on the compile line for sources that are
+ * to be placed in the library. When this macro is set, the storage class will
+ * be set to DLLEXPORT. At the end of the header file, the storage class will
+ * be reset to DLLIMPORT.
+ */
+
+#undef TCL_STORAGE_CLASS
+#ifdef BUILD_tcl
+#   define TCL_STORAGE_CLASS DLLEXPORT
+#else
+#   ifdef USE_TCL_STUBS
+#      define TCL_STORAGE_CLASS
+#   else
+#      define TCL_STORAGE_CLASS DLLIMPORT
+#   endif
+#endif
+
+/*
+ * The following _ANSI_ARGS_ macro is to support old extensions
+ * written for older versions of Tcl where it permitted support
+ * for compilers written in the pre-prototype era of C.
+ *
+ * New code should use prototypes.
+ */
+
+#ifndef TCL_NO_DEPRECATED
+#   undef _ANSI_ARGS_
+#   define _ANSI_ARGS_(x)	x
+
+/*
+ * Definitions that allow this header file to be used either with or without
+ * ANSI C features.
+ */
+
+#ifndef INLINE
+#   define INLINE
+#endif
+#ifndef CONST
+#   define CONST const
+#endif
+
+#endif /* !TCL_NO_DEPRECATED */
+
+#ifndef CONST86
+#      define CONST86 const
+#endif
+
+/*
+ * Make sure EXTERN isn't defined elsewhere.
+ */
+
+#ifdef EXTERN
+#   undef EXTERN
+#endif /* EXTERN */
+
+#ifdef __cplusplus
+#   define EXTERN extern "C" TCL_STORAGE_CLASS
+#else
+#   define EXTERN extern TCL_STORAGE_CLASS
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * The following code is copied from winnt.h. If we don't replicate it here,
+ * then <windows.h> can't be included after tcl.h, since tcl.h also defines
+ * VOID. This block is skipped under Cygwin and Mingw.
+ */
+
+#ifndef TCL_NO_DEPRECATED
+#if defined(_WIN32)
+#ifndef VOID
+#define VOID void
+typedef char CHAR;
+typedef short SHORT;
+typedef long LONG;
+#endif
+#endif /* _WIN32 */
+
+/*
+ * Macro to use instead of "void" for arguments that must have type "void *"
+ * in ANSI C; maps them to type "char *" in non-ANSI systems.
+ */
+
+#ifndef __VXWORKS__
+#   define VOID void
+#endif
+#endif /* !TCL_NO_DEPRECATED */
+
+/*
+ * Miscellaneous declarations.
+ */
+
+typedef void *ClientData;
+
+/*
+ * Darwin specific configure overrides (to support fat compiles, where
+ * configure runs only once for multiple architectures):
+ */
+
+#ifdef __APPLE__
+#   ifdef __LP64__
+#	define TCL_WIDE_INT_IS_LONG 1
+#	define TCL_CFG_DO64BIT 1
+#    else /* !__LP64__ */
+#	undef TCL_WIDE_INT_IS_LONG
+#	undef TCL_CFG_DO64BIT
+#    endif /* __LP64__ */
+#    undef HAVE_STRUCT_STAT64
+#endif /* __APPLE__ */
+
+/* Cross-compiling 32-bit on a 64-bit platform? Then our
+ * configure script does the wrong thing. Correct that here.
+ */
+#if defined(__GNUC__) && !defined(_WIN32) && !defined(__LP64__)
+#   undef TCL_WIDE_INT_IS_LONG
+#endif
+
+/*
+ * Define Tcl_WideInt to be a type that is (at least) 64-bits wide, and define
+ * Tcl_WideUInt to be the unsigned variant of that type (assuming that where
+ * we have one, we can have the other.)
+ *
+ * Also defines the following macros:
+ * TCL_WIDE_INT_IS_LONG - if wide ints are really longs (i.e. we're on a
+ *	LP64 system such as modern Solaris or Linux ... not including Win64)
+ * Tcl_WideAsLong - forgetful converter from wideInt to long.
+ * Tcl_LongAsWide - sign-extending converter from long to wideInt.
+ * Tcl_WideAsDouble - converter from wideInt to double.
+ * Tcl_DoubleAsWide - converter from double to wideInt.
+ *
+ * The following invariant should hold for any long value 'longVal':
+ *	longVal == Tcl_WideAsLong(Tcl_LongAsWide(longVal))
+ */
+
+#if !defined(TCL_WIDE_INT_TYPE) && !defined(TCL_WIDE_INT_IS_LONG) && !defined(_WIN32) && !defined(__GNUC__)
+/*
+ * Don't know what platform it is and configure hasn't discovered what is
+ * going on for us. Try to guess...
+ */
+#   include <limits.h>
+#   if defined(LLONG_MAX) && (LLONG_MAX == LONG_MAX)
+#	define TCL_WIDE_INT_IS_LONG	1
+#   endif
+#endif
+
+#ifndef TCL_WIDE_INT_TYPE
+#   define TCL_WIDE_INT_TYPE		long long
+#endif /* !TCL_WIDE_INT_TYPE */
+
+typedef TCL_WIDE_INT_TYPE		Tcl_WideInt;
+typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
+
+#ifndef TCL_LL_MODIFIER
+#   if defined(_WIN32) && (!defined(__USE_MINGW_ANSI_STDIO) || !__USE_MINGW_ANSI_STDIO)
+#	define TCL_LL_MODIFIER	"I64"
+#   else
+#	define TCL_LL_MODIFIER	"ll"
+#   endif
+#endif /* !TCL_LL_MODIFIER */
+#ifndef TCL_Z_MODIFIER
+#   if defined(__GNUC__) && !defined(_WIN32)
+#	define TCL_Z_MODIFIER	"z"
+#   elif defined(_WIN64)
+#	define TCL_Z_MODIFIER	TCL_LL_MODIFIER
+#   else
+#	define TCL_Z_MODIFIER	""
+#   endif
+#endif /* !TCL_Z_MODIFIER */
+#ifndef TCL_T_MODIFIER
+#   if defined(__GNUC__) && !defined(_WIN32)
+#	define TCL_T_MODIFIER	"t"
+#   elif defined(_WIN64)
+#	define TCL_T_MODIFIER	TCL_LL_MODIFIER
+#   else
+#	define TCL_T_MODIFIER	TCL_Z_MODIFIER
+#   endif
+#endif /* !TCL_T_MODIFIER */
+
+#define Tcl_WideAsLong(val)	((long)((Tcl_WideInt)(val)))
+#define Tcl_LongAsWide(val)	((Tcl_WideInt)((long)(val)))
+#define Tcl_WideAsDouble(val)	((double)((Tcl_WideInt)(val)))
+#define Tcl_DoubleAsWide(val)	((Tcl_WideInt)((double)(val)))
+
+#if TCL_MAJOR_VERSION < 9
+    typedef int Tcl_Size;
+#   define TCL_SIZE_MAX ((int)(((unsigned int)-1)>>1))
+#   define TCL_SIZE_MODIFIER ""
+#else
+    typedef ptrdiff_t Tcl_Size;
+#   define TCL_SIZE_MAX ((ptrdiff_t)(((size_t)-1)>>1))
+#   define TCL_SIZE_MODIFIER TCL_T_MODIFIER
+#endif /* TCL_MAJOR_VERSION */
+
+#ifdef _WIN32
+#   if TCL_MAJOR_VERSION > 8 || defined(_WIN64) || defined(_USE_64BIT_TIME_T)
+	typedef struct __stat64 Tcl_StatBuf;
+#   elif defined(_USE_32BIT_TIME_T)
+	typedef struct _stati64	Tcl_StatBuf;
+#   else
+	typedef struct _stat32i64 Tcl_StatBuf;
+#   endif
+#elif defined(__CYGWIN__)
+    typedef struct {
+	unsigned st_dev;
+	unsigned short st_ino;
+	unsigned short st_mode;
+	short st_nlink;
+	short st_uid;
+	short st_gid;
+	/* Here is a 2-byte gap */
+	unsigned st_rdev;
+	/* Here is a 4-byte gap */
+	long long st_size;
+	struct {long tv_sec;} st_atim;
+	struct {long tv_sec;} st_mtim;
+	struct {long tv_sec;} st_ctim;
+    } Tcl_StatBuf;
+#elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__) \
+	&& (!defined(_FILE_OFFSET_BITS) || _FILE_OFFSET_BITS != 64) \
+	&& (!defined(_TIME_BITS) || _TIME_BITS != 64)
+    typedef struct stat64 Tcl_StatBuf;
+#else
+    typedef struct stat Tcl_StatBuf;
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * Data structures defined opaquely in this module. The definitions below just
+ * provide dummy types. A few fields are made visible in Tcl_Interp
+ * structures, namely those used for returning a string result from commands.
+ * Direct access to the result field is discouraged in Tcl 8.0. The
+ * interpreter result is either an object or a string, and the two values are
+ * kept consistent unless some C code sets interp->result directly.
+ * Programmers should use either the function Tcl_GetObjResult() or
+ * Tcl_GetStringResult() to read the interpreter's result. See the SetResult
+ * man page for details.
+ *
+ * Note: any change to the Tcl_Interp definition below must be mirrored in the
+ * "real" definition in tclInt.h.
+ *
+ * Note: Tcl_ObjCmdProc functions do not directly set result and freeProc.
+ * Instead, they set a Tcl_Obj member in the "real" structure that can be
+ * accessed with Tcl_GetObjResult() and Tcl_SetObjResult().
+ */
+
+typedef struct Tcl_Interp
+#ifndef TCL_NO_DEPRECATED
+{
+    /* TIP #330: Strongly discourage extensions from using the string
+     * result. */
+    char *resultDontUse; /* Don't use in extensions! */
+    void (*freeProcDontUse) (char *); /* Don't use in extensions! */
+    int errorLineDontUse; /* Don't use in extensions! */
+}
+#endif /* !TCL_NO_DEPRECATED */
+Tcl_Interp;
+
+typedef struct Tcl_AsyncHandler_ *Tcl_AsyncHandler;
+typedef struct Tcl_Channel_ *Tcl_Channel;
+typedef struct Tcl_ChannelTypeVersion_ *Tcl_ChannelTypeVersion;
+typedef struct Tcl_Command_ *Tcl_Command;
+typedef struct Tcl_Condition_ *Tcl_Condition;
+typedef struct Tcl_Dict_ *Tcl_Dict;
+typedef struct Tcl_EncodingState_ *Tcl_EncodingState;
+typedef struct Tcl_Encoding_ *Tcl_Encoding;
+typedef struct Tcl_Event Tcl_Event;
+typedef struct Tcl_InterpState_ *Tcl_InterpState;
+typedef struct Tcl_LoadHandle_ *Tcl_LoadHandle;
+typedef struct Tcl_Mutex_ *Tcl_Mutex;
+typedef struct Tcl_Pid_ *Tcl_Pid;
+typedef struct Tcl_RegExp_ *Tcl_RegExp;
+typedef struct Tcl_ThreadDataKey_ *Tcl_ThreadDataKey;
+typedef struct Tcl_ThreadId_ *Tcl_ThreadId;
+typedef struct Tcl_TimerToken_ *Tcl_TimerToken;
+typedef struct Tcl_Trace_ *Tcl_Trace;
+typedef struct Tcl_Var_ *Tcl_Var;
+typedef struct Tcl_ZLibStream_ *Tcl_ZlibStream;
+
+/*
+ *----------------------------------------------------------------------------
+ * Definition of the interface to functions implementing threads. A function
+ * following this definition is given to each call of 'Tcl_CreateThread' and
+ * will be called as the main fuction of the new thread created by that call.
+ */
+
+#if defined _WIN32
+typedef unsigned (__stdcall Tcl_ThreadCreateProc) (void *clientData);
+#else
+typedef void (Tcl_ThreadCreateProc) (void *clientData);
+#endif
+
+/*
+ * Threading function return types used for abstracting away platform
+ * differences when writing a Tcl_ThreadCreateProc. See the NewThread function
+ * in generic/tclThreadTest.c for it's usage.
+ */
+
+#if defined _WIN32
+#   define Tcl_ThreadCreateType		unsigned __stdcall
+#   define TCL_THREAD_CREATE_RETURN	return 0
+#else
+#   define Tcl_ThreadCreateType		void
+#   define TCL_THREAD_CREATE_RETURN
+#endif
+
+/*
+ * Definition of values for default stacksize and the possible flags to be
+ * given to Tcl_CreateThread.
+ */
+
+#define TCL_THREAD_STACK_DEFAULT (0)    /* Use default size for stack. */
+#define TCL_THREAD_NOFLAGS	 (0000) /* Standard flags, default
+					 * behaviour. */
+#define TCL_THREAD_JOINABLE	 (0001) /* Mark the thread as joinable. */
+
+/*
+ * Flag values passed to Tcl_StringCaseMatch.
+ */
+
+#define TCL_MATCH_NOCASE	(1<<0)
+
+/*
+ * Flag values passed to Tcl_GetRegExpFromObj.
+ */
+
+#define	TCL_REG_BASIC		000000	/* BREs (convenience). */
+#define	TCL_REG_EXTENDED	000001	/* EREs. */
+#define	TCL_REG_ADVF		000002	/* Advanced features in EREs. */
+#define	TCL_REG_ADVANCED	000003	/* AREs (which are also EREs). */
+#define	TCL_REG_QUOTE		000004	/* No special characters, none. */
+#define	TCL_REG_NOCASE		000010	/* Ignore case. */
+#define	TCL_REG_NOSUB		000020	/* Don't care about subexpressions. */
+#define	TCL_REG_EXPANDED	000040	/* Expanded format, white space &
+					 * comments. */
+#define	TCL_REG_NLSTOP		000100  /* \n doesn't match . or [^ ] */
+#define	TCL_REG_NLANCH		000200  /* ^ matches after \n, $ before. */
+#define	TCL_REG_NEWLINE		000300  /* Newlines are line terminators. */
+#define	TCL_REG_CANMATCH	001000  /* Report details on partial/limited
+					 * matches. */
+
+/*
+ * Flags values passed to Tcl_RegExpExecObj.
+ */
+
+#define	TCL_REG_NOTBOL	0001	/* Beginning of string does not match ^.  */
+#define	TCL_REG_NOTEOL	0002	/* End of string does not match $. */
+
+/*
+ * Structures filled in by Tcl_RegExpInfo. Note that all offset values are
+ * relative to the start of the match string, not the beginning of the entire
+ * string.
+ */
+
+typedef struct Tcl_RegExpIndices {
+#if TCL_MAJOR_VERSION > 8
+    Tcl_Size start;			/* Character offset of first character in
+				 * match. */
+    Tcl_Size end;			/* Character offset of first character after
+				 * the match. */
+#else
+    long start;
+    long end;
+#endif
+} Tcl_RegExpIndices;
+
+typedef struct Tcl_RegExpInfo {
+    Tcl_Size nsubs;			/* Number of subexpressions in the compiled
+				 * expression. */
+    Tcl_RegExpIndices *matches;	/* Array of nsubs match offset pairs. */
+#if TCL_MAJOR_VERSION > 8
+    Tcl_Size extendStart;		/* The offset at which a subsequent match
+				 * might begin. */
+#else
+    long extendStart;
+    long reserved;		/* Reserved for later use. */
+#endif
+} Tcl_RegExpInfo;
+
+/*
+ * Picky compilers complain if this typdef doesn't appear before the struct's
+ * reference in tclDecls.h.
+ */
+
+typedef Tcl_StatBuf *Tcl_Stat_;
+typedef struct stat *Tcl_OldStat_;
+
+/*
+ *----------------------------------------------------------------------------
+ * When a TCL command returns, the interpreter contains a result from the
+ * command. Programmers are strongly encouraged to use one of the functions
+ * Tcl_GetObjResult() or Tcl_GetStringResult() to read the interpreter's
+ * result. See the SetResult man page for details. Besides this result, the
+ * command function returns an integer code, which is one of the following:
+ *
+ * TCL_OK		Command completed normally; the interpreter's result
+ *			contains the command's result.
+ * TCL_ERROR		The command couldn't be completed successfully; the
+ *			interpreter's result describes what went wrong.
+ * TCL_RETURN		The command requests that the current function return;
+ *			the interpreter's result contains the function's
+ *			return value.
+ * TCL_BREAK		The command requests that the innermost loop be
+ *			exited; the interpreter's result is meaningless.
+ * TCL_CONTINUE		Go on to the next iteration of the current loop; the
+ *			interpreter's result is meaningless.
+ */
+
+#define TCL_OK			0
+#define TCL_ERROR		1
+#define TCL_RETURN		2
+#define TCL_BREAK		3
+#define TCL_CONTINUE		4
+
+#ifndef TCL_NO_DEPRECATED
+#define TCL_RESULT_SIZE		200
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * Flags to control what substitutions are performed by Tcl_SubstObj():
+ */
+
+#define TCL_SUBST_COMMANDS	001
+#define TCL_SUBST_VARIABLES	002
+#define TCL_SUBST_BACKSLASHES	004
+#define TCL_SUBST_ALL		007
+
+/*
+ * Argument descriptors for math function callbacks in expressions:
+ */
+
+#ifndef TCL_NO_DEPRECATED
+typedef enum {
+    TCL_INT, TCL_DOUBLE, TCL_EITHER, TCL_WIDE_INT
+} Tcl_ValueType;
+
+typedef struct Tcl_Value {
+    Tcl_ValueType type;		/* Indicates intValue or doubleValue is valid,
+				 * or both. */
+    long intValue;		/* Integer value. */
+    double doubleValue;		/* Double-precision floating value. */
+    Tcl_WideInt wideValue;	/* Wide (min. 64-bit) integer value. */
+} Tcl_Value;
+#else
+#define Tcl_ValueType void /* Just enough to prevent compilation error in Tcl */
+#define Tcl_Value void /* Just enough to prevent compilation error in Tcl */
+#endif
+
+/*
+ * Forward declaration of Tcl_Obj to prevent an error when the forward
+ * reference to Tcl_Obj is encountered in the function types declared below.
+ */
+
+struct Tcl_Obj;
+
+/*
+ *----------------------------------------------------------------------------
+ * Function types defined by Tcl:
+ */
+
+typedef int (Tcl_AppInitProc) (Tcl_Interp *interp);
+typedef int (Tcl_AsyncProc) (void *clientData, Tcl_Interp *interp,
+	int code);
+typedef void (Tcl_ChannelProc) (void *clientData, int mask);
+typedef void (Tcl_CloseProc) (void *data);
+typedef void (Tcl_CmdDeleteProc) (void *clientData);
+typedef int (Tcl_CmdProc) (void *clientData, Tcl_Interp *interp,
+	int argc, const char *argv[]);
+typedef void (Tcl_CmdTraceProc) (void *clientData, Tcl_Interp *interp,
+	int level, char *command, Tcl_CmdProc *proc,
+	void *cmdClientData, int argc, const char *argv[]);
+typedef int (Tcl_CmdObjTraceProc) (void *clientData, Tcl_Interp *interp,
+	int level, const char *command, Tcl_Command commandInfo, int objc,
+	struct Tcl_Obj *const *objv);
+#define Tcl_CmdObjTraceProc2 Tcl_CmdObjTraceProc
+typedef void (Tcl_CmdObjTraceDeleteProc) (void *clientData);
+typedef void (Tcl_DupInternalRepProc) (struct Tcl_Obj *srcPtr,
+	struct Tcl_Obj *dupPtr);
+typedef int (Tcl_EncodingConvertProc) (void *clientData, const char *src,
+	int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst,
+	int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr);
+typedef void (Tcl_EncodingFreeProc) (void *clientData);
+typedef int (Tcl_EventProc) (Tcl_Event *evPtr, int flags);
+typedef void (Tcl_EventCheckProc) (void *clientData, int flags);
+typedef int (Tcl_EventDeleteProc) (Tcl_Event *evPtr, void *clientData);
+typedef void (Tcl_EventSetupProc) (void *clientData, int flags);
+typedef void (Tcl_ExitProc) (void *clientData);
+typedef void (Tcl_FileProc) (void *clientData, int mask);
+typedef void (Tcl_FileFreeProc) (void *clientData);
+typedef void (Tcl_FreeInternalRepProc) (struct Tcl_Obj *objPtr);
+typedef void (Tcl_FreeProc) (char *blockPtr);
+typedef void (Tcl_IdleProc) (void *clientData);
+typedef void (Tcl_InterpDeleteProc) (void *clientData,
+	Tcl_Interp *interp);
+typedef int (Tcl_MathProc) (void *clientData, Tcl_Interp *interp,
+	Tcl_Value *args, Tcl_Value *resultPtr);
+typedef void (Tcl_NamespaceDeleteProc) (void *clientData);
+typedef int (Tcl_ObjCmdProc) (void *clientData, Tcl_Interp *interp,
+	int objc, struct Tcl_Obj *const *objv);
+#define Tcl_ObjCmdProc2 Tcl_ObjCmdProc
+typedef int (Tcl_LibraryInitProc) (Tcl_Interp *interp);
+typedef int (Tcl_LibraryUnloadProc) (Tcl_Interp *interp, int flags);
+typedef void (Tcl_PanicProc) (const char *format, ...);
+typedef void (Tcl_TcpAcceptProc) (void *callbackData, Tcl_Channel chan,
+	char *address, int port);
+typedef void (Tcl_TimerProc) (void *clientData);
+typedef int (Tcl_SetFromAnyProc) (Tcl_Interp *interp, struct Tcl_Obj *objPtr);
+typedef void (Tcl_UpdateStringProc) (struct Tcl_Obj *objPtr);
+typedef char * (Tcl_VarTraceProc) (void *clientData, Tcl_Interp *interp,
+	const char *part1, const char *part2, int flags);
+typedef void (Tcl_CommandTraceProc) (void *clientData, Tcl_Interp *interp,
+	const char *oldName, const char *newName, int flags);
+typedef void (Tcl_CreateFileHandlerProc) (int fd, int mask, Tcl_FileProc *proc,
+	void *clientData);
+typedef void (Tcl_DeleteFileHandlerProc) (int fd);
+typedef void (Tcl_AlertNotifierProc) (void *clientData);
+typedef void (Tcl_ServiceModeHookProc) (int mode);
+typedef void *(Tcl_InitNotifierProc) (void);
+typedef void (Tcl_FinalizeNotifierProc) (void *clientData);
+typedef void (Tcl_MainLoopProc) (void);
+
+#ifndef TCL_NO_DEPRECATED
+#   define Tcl_PackageInitProc Tcl_LibraryInitProc
+#   define Tcl_PackageUnloadProc Tcl_LibraryUnloadProc
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure represents a type of object, which is a particular
+ * internal representation for an object plus a set of functions that provide
+ * standard operations on objects of that type.
+ */
+
+typedef struct Tcl_ObjType {
+    const char *name;		/* Name of the type, e.g. "int". */
+    Tcl_FreeInternalRepProc *freeIntRepProc;
+				/* Called to free any storage for the type's
+				 * internal rep. NULL if the internal rep does
+				 * not need freeing. */
+    Tcl_DupInternalRepProc *dupIntRepProc;
+				/* Called to create a new object as a copy of
+				 * an existing object. */
+    Tcl_UpdateStringProc *updateStringProc;
+				/* Called to update the string rep from the
+				 * type's internal representation. */
+    Tcl_SetFromAnyProc *setFromAnyProc;
+				/* Called to convert the object's internal rep
+				 * to this type. Frees the internal rep of the
+				 * old type. Returns TCL_ERROR on failure. */
+} Tcl_ObjType;
+#define TCL_OBJTYPE_V0 /* just empty */
+
+/*
+ * The following structure stores an internal representation (internalrep) for
+ * a Tcl value. An internalrep is associated with an Tcl_ObjType when both
+ * are stored in the same Tcl_Obj.  The routines of the Tcl_ObjType govern
+ * the handling of the internalrep.
+ */
+
+typedef union Tcl_ObjInternalRep {	/* The internal representation: */
+    long longValue;		/*   - an long integer value. */
+    double doubleValue;		/*   - a double-precision floating value. */
+    void *otherValuePtr;	/*   - another, type-specific value, */
+				/*     not used internally any more. */
+    Tcl_WideInt wideValue;	/*   - an integer value >= 64bits */
+    struct {			/*   - internal rep as two pointers. */
+	void *ptr1;
+	void *ptr2;
+    } twoPtrValue;
+    struct {			/*   - internal rep as a pointer and a long, */
+	void *ptr;		/*     not used internally any more. */
+	unsigned long value;
+    } ptrAndLongRep;
+} Tcl_ObjInternalRep;
+
+/*
+ * One of the following structures exists for each object in the Tcl system.
+ * An object stores a value as either a string, some internal representation,
+ * or both.
+ */
+
+typedef struct Tcl_Obj {
+    Tcl_Size refCount;		/* When 0 the object will be freed. */
+    char *bytes;		/* This points to the first byte of the
+				 * object's string representation. The array
+				 * must be followed by a null byte (i.e., at
+				 * offset length) but may also contain
+				 * embedded null characters. The array's
+				 * storage is allocated by ckalloc. NULL means
+				 * the string rep is invalid and must be
+				 * regenerated from the internal rep.  Clients
+				 * should use Tcl_GetStringFromObj or
+				 * Tcl_GetString to get a pointer to the byte
+				 * array as a readonly value. */
+    Tcl_Size length;		/* The number of bytes at *bytes, not
+				 * including the terminating null. */
+    const Tcl_ObjType *typePtr;	/* Denotes the object's type. Always
+				 * corresponds to the type of the object's
+				 * internal rep. NULL indicates the object has
+				 * no internal rep (has no type). */
+    Tcl_ObjInternalRep internalRep;	/* The internal representation: */
+} Tcl_Obj;
+
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure contains the state needed by Tcl_SaveResult. No-one
+ * outside of Tcl should access any of these fields. This structure is
+ * typically allocated on the stack.
+ */
+
+#ifndef TCL_NO_DEPRECATED
+typedef struct Tcl_SavedResult {
+    char *result;
+    Tcl_FreeProc *freeProc;
+    Tcl_Obj *objResultPtr;
+    char *appendResult;
+    int appendAvl;
+    int appendUsed;
+    char resultSpace[200+1];
+} Tcl_SavedResult;
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * The following definitions support Tcl's namespace facility. Note: the first
+ * five fields must match exactly the fields in a Namespace structure (see
+ * tclInt.h).
+ */
+
+typedef struct Tcl_Namespace {
+    char *name;			/* The namespace's name within its parent
+				 * namespace. This contains no ::'s. The name
+				 * of the global namespace is "" although "::"
+				 * is an synonym. */
+    char *fullName;		/* The namespace's fully qualified name. This
+				 * starts with ::. */
+    void *clientData;	/* Arbitrary value associated with this
+				 * namespace. */
+    Tcl_NamespaceDeleteProc *deleteProc;
+				/* Function invoked when deleting the
+				 * namespace to, e.g., free clientData. */
+    struct Tcl_Namespace *parentPtr;
+				/* Points to the namespace that contains this
+				 * one. NULL if this is the global
+				 * namespace. */
+} Tcl_Namespace;
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure represents a call frame, or activation record. A
+ * call frame defines a naming context for a procedure call: its local scope
+ * (for local variables) and its namespace scope (used for non-local
+ * variables; often the global :: namespace). A call frame can also define the
+ * naming context for a namespace eval or namespace inscope command: the
+ * namespace in which the command's code should execute. The Tcl_CallFrame
+ * structures exist only while procedures or namespace eval/inscope's are
+ * being executed, and provide a Tcl call stack.
+ *
+ * A call frame is initialized and pushed using Tcl_PushCallFrame and popped
+ * using Tcl_PopCallFrame. Storage for a Tcl_CallFrame must be provided by the
+ * Tcl_PushCallFrame caller, and callers typically allocate them on the C call
+ * stack for efficiency. For this reason, Tcl_CallFrame is defined as a
+ * structure and not as an opaque token. However, most Tcl_CallFrame fields
+ * are hidden since applications should not access them directly; others are
+ * declared as "dummyX".
+ *
+ * WARNING!! The structure definition must be kept consistent with the
+ * CallFrame structure in tclInt.h. If you change one, change the other.
+ */
+
+typedef struct Tcl_CallFrame {
+    Tcl_Namespace *nsPtr;
+    int dummy1;
+    Tcl_Size dummy2;
+    void *dummy3;
+    void *dummy4;
+    void *dummy5;
+    Tcl_Size dummy6;
+    void *dummy7;
+    void *dummy8;
+    Tcl_Size dummy9;
+    void *dummy10;
+    void *dummy11;
+    void *dummy12;
+    void *dummy13;
+} Tcl_CallFrame;
+
+/*
+ *----------------------------------------------------------------------------
+ * Information about commands that is returned by Tcl_GetCommandInfo and
+ * passed to Tcl_SetCommandInfo. objProc is an objc/objv object-based command
+ * function while proc is a traditional Tcl argc/argv string-based function.
+ * Tcl_CreateObjCommand and Tcl_CreateCommand ensure that both objProc and
+ * proc are non-NULL and can be called to execute the command. However, it may
+ * be faster to call one instead of the other. The member isNativeObjectProc
+ * is set to 1 if an object-based function was registered by
+ * Tcl_CreateObjCommand, and to 0 if a string-based function was registered by
+ * Tcl_CreateCommand. The other function is typically set to a compatibility
+ * wrapper that does string-to-object or object-to-string argument conversions
+ * then calls the other function.
+ */
+
+typedef struct Tcl_CmdInfo {
+    int isNativeObjectProc;	/* 1 if objProc was registered by a call to
+				 * Tcl_CreateObjCommand; 2 if objProc was registered by
+				 * a call to Tcl_CreateObjCommand2; 0 otherwise.
+				 * Tcl_SetCmdInfo does not modify this field. */
+    Tcl_ObjCmdProc *objProc;	/* Command's object-based function. */
+    void *objClientData;	/* ClientData for object proc. */
+    Tcl_CmdProc *proc;		/* Command's string-based function. */
+    void *clientData;	/* ClientData for string proc. */
+    Tcl_CmdDeleteProc *deleteProc;
+				/* Function to call when command is
+				 * deleted. */
+    void *deleteData;	/* Value to pass to deleteProc (usually the
+				 * same as clientData). */
+    Tcl_Namespace *namespacePtr;/* Points to the namespace that contains this
+				 * command. Note that Tcl_SetCmdInfo will not
+				 * change a command's namespace; use
+				 * TclRenameCommand or Tcl_Eval (of 'rename')
+				 * to do that. */
+    Tcl_ObjCmdProc2 *objProc2;	/* Not used in Tcl 8.7. */
+    void *objClientData2;	/* Not used in Tcl 8.7. */
+} Tcl_CmdInfo;
+
+/*
+ *----------------------------------------------------------------------------
+ * The structure defined below is used to hold dynamic strings. The only
+ * fields that clients should use are string and length, accessible via the
+ * macros Tcl_DStringValue and Tcl_DStringLength.
+ */
+
+#define TCL_DSTRING_STATIC_SIZE 200
+typedef struct Tcl_DString {
+    char *string;		/* Points to beginning of string: either
+				 * staticSpace below or a malloced array. */
+    Tcl_Size length;		/* Number of non-NULL characters in the
+				 * string. */
+    Tcl_Size spaceAvl;		/* Total number of bytes available for the
+				 * string and its terminating NULL char. */
+    char staticSpace[TCL_DSTRING_STATIC_SIZE];
+				/* Space to use in common case where string is
+				 * small. */
+} Tcl_DString;
+
+#define Tcl_DStringLength(dsPtr) ((dsPtr)->length)
+#define Tcl_DStringValue(dsPtr) ((dsPtr)->string)
+#ifndef TCL_NO_DEPRECATED
+#   define Tcl_DStringTrunc Tcl_DStringSetLength
+#endif
+
+/*
+ * Definitions for the maximum number of digits of precision that may be
+ * produced by Tcl_PrintDouble, and the number of bytes of buffer space
+ * required by Tcl_PrintDouble.
+ */
+
+#define TCL_MAX_PREC		17
+#define TCL_DOUBLE_SPACE	(TCL_MAX_PREC+10)
+
+/*
+ * Definition for a number of bytes of buffer space sufficient to hold the
+ * string representation of an integer in base 10 (assuming the existence of
+ * 64-bit integers).
+ */
+
+#define TCL_INTEGER_SPACE	(3*(int)sizeof(Tcl_WideInt))
+
+/*
+ *----------------------------------------------------------------------------
+ * Type values returned by Tcl_GetNumberFromObj
+ *	TCL_NUMBER_INT		Representation is a Tcl_WideInt
+ *	TCL_NUMBER_BIG		Representation is an mp_int
+ *	TCL_NUMBER_DOUBLE	Representation is a double
+ *	TCL_NUMBER_NAN		Value is NaN.
+ */
+
+#define TCL_NUMBER_INT          2
+#define TCL_NUMBER_BIG          3
+#define TCL_NUMBER_DOUBLE       4
+#define TCL_NUMBER_NAN          5
+
+/*
+ * Flag values passed to Tcl_ConvertElement.
+ * TCL_DONT_USE_BRACES forces it not to enclose the element in braces, but to
+ *	use backslash quoting instead.
+ * TCL_DONT_QUOTE_HASH disables the default quoting of the '#' character. It
+ *	is safe to leave the hash unquoted when the element is not the first
+ *	element of a list, and this flag can be used by the caller to indicate
+ *	that condition.
+ */
+
+#define TCL_DONT_USE_BRACES	1
+#define TCL_DONT_QUOTE_HASH	8
+
+/*
+ * Flags that may be passed to Tcl_GetIndexFromObj.
+ * TCL_EXACT disallows abbreviated strings.
+ * TCL_NULL_OK allows the empty string or NULL to return TCL_OK.
+ *      The returned value will be -1;
+ * TCL_INDEX_TEMP_TABLE disallows caching of lookups. A possible use case is
+ *      a table that will not live long enough to make it worthwhile.
+ */
+
+#define TCL_EXACT		1
+#define TCL_NULL_OK		32
+#define TCL_INDEX_TEMP_TABLE	64
+
+/*
+ * Flags that may be passed to Tcl_UniCharToUtf.
+ * TCL_COMBINE Combine surrogates (default in Tcl 8.x)
+ */
+
+#if TCL_MAJOR_VERSION > 8
+#    define TCL_COMBINE		0x1000000
+#else
+#    define TCL_COMBINE		0
+#endif
+/*
+ *----------------------------------------------------------------------------
+ * Flag values passed to Tcl_RecordAndEval, Tcl_EvalObj, Tcl_EvalObjv.
+ * WARNING: these bit choices must not conflict with the bit choices for
+ * evalFlag bits in tclInt.h!
+ *
+ * Meanings:
+ *	TCL_NO_EVAL:		Just record this command
+ *	TCL_EVAL_GLOBAL:	Execute script in global namespace
+ *	TCL_EVAL_DIRECT:	Do not compile this script
+ *	TCL_EVAL_INVOKE:	Magical Tcl_EvalObjv mode for aliases/ensembles
+ *				o Run in iPtr->lookupNsPtr or global namespace
+ *				o Cut out of error traces
+ *				o Don't reset the flags controlling ensemble
+ *				  error message rewriting.
+ *	TCL_CANCEL_UNWIND:	Magical Tcl_CancelEval mode that causes the
+ *				stack for the script in progress to be
+ *				completely unwound.
+ *	TCL_EVAL_NOERR:	Do no exception reporting at all, just return
+ *				as the caller will report.
+ */
+
+#define TCL_NO_EVAL		0x010000
+#define TCL_EVAL_GLOBAL		0x020000
+#define TCL_EVAL_DIRECT		0x040000
+#define TCL_EVAL_INVOKE		0x080000
+#define TCL_CANCEL_UNWIND	0x100000
+#define TCL_EVAL_NOERR          0x200000
+
+/*
+ * Special freeProc values that may be passed to Tcl_SetResult (see the man
+ * page for details):
+ */
+
+#define TCL_VOLATILE		((Tcl_FreeProc *) 1)
+#define TCL_STATIC		((Tcl_FreeProc *) 0)
+#define TCL_DYNAMIC		((Tcl_FreeProc *) 3)
+
+/*
+ * Flag values passed to variable-related functions.
+ * WARNING: these bit choices must not conflict with the bit choice for
+ * TCL_CANCEL_UNWIND, above.
+ */
+
+#define TCL_GLOBAL_ONLY		 1
+#define TCL_NAMESPACE_ONLY	 2
+#define TCL_APPEND_VALUE	 4
+#define TCL_LIST_ELEMENT	 8
+#define TCL_TRACE_READS		 0x10
+#define TCL_TRACE_WRITES	 0x20
+#define TCL_TRACE_UNSETS	 0x40
+#define TCL_TRACE_DESTROYED	 0x80
+
+#ifndef TCL_NO_DEPRECATED
+#define TCL_INTERP_DESTROYED	 0x100
+#endif
+
+#define TCL_LEAVE_ERR_MSG	 0x200
+#define TCL_TRACE_ARRAY		 0x800
+#ifndef TCL_NO_DEPRECATED
+/* Required to support old variable/vdelete/vinfo traces. */
+#define TCL_TRACE_OLD_STYLE	 0x1000
+#endif
+/* Indicate the semantics of the result of a trace. */
+#define TCL_TRACE_RESULT_DYNAMIC 0x8000
+#define TCL_TRACE_RESULT_OBJECT  0x10000
+
+/*
+ * Flag values for ensemble commands.
+ */
+
+#define TCL_ENSEMBLE_PREFIX 0x02/* Flag value to say whether to allow
+				 * unambiguous prefixes of commands or to
+				 * require exact matches for command names. */
+
+/*
+ * Flag values passed to command-related functions.
+ */
+
+#define TCL_TRACE_RENAME	0x2000
+#define TCL_TRACE_DELETE	0x4000
+
+#define TCL_ALLOW_INLINE_COMPILATION 0x20000
+
+/*
+ * The TCL_PARSE_PART1 flag is deprecated and has no effect. The part1 is now
+ * always parsed whenever the part2 is NULL. (This is to avoid a common error
+ * when converting code to use the new object based APIs and forgetting to
+ * give the flag)
+ */
+
+#ifndef TCL_NO_DEPRECATED
+#   define TCL_PARSE_PART1	0x400
+#endif
+
+/*
+ * Types for linked variables:
+ */
+
+#define TCL_LINK_INT		1
+#define TCL_LINK_DOUBLE		2
+#define TCL_LINK_BOOLEAN	3
+#define TCL_LINK_STRING		4
+#define TCL_LINK_WIDE_INT	5
+#define TCL_LINK_CHAR		6
+#define TCL_LINK_UCHAR		7
+#define TCL_LINK_SHORT		8
+#define TCL_LINK_USHORT		9
+#define TCL_LINK_UINT		10
+#if defined(TCL_WIDE_INT_IS_LONG) || defined(_WIN32) || defined(__CYGWIN__)
+#define TCL_LINK_LONG		((sizeof(long) != sizeof(int)) ? TCL_LINK_WIDE_INT : TCL_LINK_INT)
+#define TCL_LINK_ULONG		((sizeof(long) != sizeof(int)) ? TCL_LINK_WIDE_UINT : TCL_LINK_UINT)
+#else
+#define TCL_LINK_LONG		11
+#define TCL_LINK_ULONG		12
+#endif
+#define TCL_LINK_FLOAT		13
+#define TCL_LINK_WIDE_UINT	14
+#define TCL_LINK_CHARS		15
+#define TCL_LINK_BINARY		16
+#define TCL_LINK_READ_ONLY	0x80
+
+/*
+ *----------------------------------------------------------------------------
+ * Forward declarations of Tcl_HashTable and related types.
+ */
+
+#ifndef TCL_HASH_TYPE
+#if TCL_MAJOR_VERSION > 8
+#  define TCL_HASH_TYPE size_t
+#else
+#  define TCL_HASH_TYPE unsigned
+#endif
+#endif
+
+typedef struct Tcl_HashKeyType Tcl_HashKeyType;
+typedef struct Tcl_HashTable Tcl_HashTable;
+typedef struct Tcl_HashEntry Tcl_HashEntry;
+
+typedef TCL_HASH_TYPE (Tcl_HashKeyProc) (Tcl_HashTable *tablePtr, void *keyPtr);
+typedef int (Tcl_CompareHashKeysProc) (void *keyPtr, Tcl_HashEntry *hPtr);
+typedef Tcl_HashEntry * (Tcl_AllocHashEntryProc) (Tcl_HashTable *tablePtr,
+	void *keyPtr);
+typedef void (Tcl_FreeHashEntryProc) (Tcl_HashEntry *hPtr);
+
+/*
+ * Structure definition for an entry in a hash table. No-one outside Tcl
+ * should access any of these fields directly; use the macros defined below.
+ */
+
+struct Tcl_HashEntry {
+    Tcl_HashEntry *nextPtr;	/* Pointer to next entry in this hash bucket,
+				 * or NULL for end of chain. */
+    Tcl_HashTable *tablePtr;	/* Pointer to table containing entry. */
+    void *hash;			/* Hash value, stored as pointer to ensure
+				 * that the offsets of the fields in this
+				 * structure are not changed. */
+    void *clientData;	/* Application stores something here with
+				 * Tcl_SetHashValue. */
+    union {			/* Key has one of these forms: */
+	char *oneWordValue;	/* One-word value for key. */
+	Tcl_Obj *objPtr;	/* Tcl_Obj * key value. */
+	int words[1];		/* Multiple integer words for key. The actual
+				 * size will be as large as necessary for this
+				 * table's keys. */
+	char string[1];		/* String for key. The actual size will be as
+				 * large as needed to hold the key. */
+    } key;			/* MUST BE LAST FIELD IN RECORD!! */
+};
+
+/*
+ * Flags used in Tcl_HashKeyType.
+ *
+ * TCL_HASH_KEY_RANDOMIZE_HASH -
+ *				There are some things, pointers for example
+ *				which don't hash well because they do not use
+ *				the lower bits. If this flag is set then the
+ *				hash table will attempt to rectify this by
+ *				randomising the bits and then using the upper
+ *				N bits as the index into the table.
+ * TCL_HASH_KEY_SYSTEM_HASH -	If this flag is set then all memory internally
+ *                              allocated for the hash table that is not for an
+ *                              entry will use the system heap.
+ */
+
+#define TCL_HASH_KEY_RANDOMIZE_HASH 0x1
+#define TCL_HASH_KEY_SYSTEM_HASH    0x2
+
+/*
+ * Structure definition for the methods associated with a hash table key type.
+ */
+
+#define TCL_HASH_KEY_TYPE_VERSION 1
+struct Tcl_HashKeyType {
+    int version;		/* Version of the table. If this structure is
+				 * extended in future then the version can be
+				 * used to distinguish between different
+				 * structures. */
+    int flags;			/* Flags, see above for details. */
+    Tcl_HashKeyProc *hashKeyProc;
+				/* Calculates a hash value for the key. If
+				 * this is NULL then the pointer itself is
+				 * used as a hash value. */
+    Tcl_CompareHashKeysProc *compareKeysProc;
+				/* Compares two keys and returns zero if they
+				 * do not match, and non-zero if they do. If
+				 * this is NULL then the pointers are
+				 * compared. */
+    Tcl_AllocHashEntryProc *allocEntryProc;
+				/* Called to allocate memory for a new entry,
+				 * i.e. if the key is a string then this could
+				 * allocate a single block which contains
+				 * enough space for both the entry and the
+				 * string. Only the key field of the allocated
+				 * Tcl_HashEntry structure needs to be filled
+				 * in. If something else needs to be done to
+				 * the key, i.e. incrementing a reference
+				 * count then that should be done by this
+				 * function. If this is NULL then Tcl_Alloc is
+				 * used to allocate enough space for a
+				 * Tcl_HashEntry and the key pointer is
+				 * assigned to key.oneWordValue. */
+    Tcl_FreeHashEntryProc *freeEntryProc;
+				/* Called to free memory associated with an
+				 * entry. If something else needs to be done
+				 * to the key, i.e. decrementing a reference
+				 * count then that should be done by this
+				 * function. If this is NULL then Tcl_Free is
+				 * used to free the Tcl_HashEntry. */
+};
+
+/*
+ * Structure definition for a hash table.  Must be in tcl.h so clients can
+ * allocate space for these structures, but clients should never access any
+ * fields in this structure.
+ */
+
+#define TCL_SMALL_HASH_TABLE 4
+struct Tcl_HashTable {
+    Tcl_HashEntry **buckets;	/* Pointer to bucket array. Each element
+				 * points to first entry in bucket's hash
+				 * chain, or NULL. */
+    Tcl_HashEntry *staticBuckets[TCL_SMALL_HASH_TABLE];
+				/* Bucket array used for small tables (to
+				 * avoid mallocs and frees). */
+    Tcl_Size numBuckets;		/* Total number of buckets allocated at
+				 * **bucketPtr. */
+    Tcl_Size numEntries;		/* Total number of entries present in
+				 * table. */
+    Tcl_Size rebuildSize;		/* Enlarge table when numEntries gets to be
+				 * this large. */
+#if TCL_MAJOR_VERSION > 8
+    size_t mask;		/* Mask value used in hashing function. */
+#endif
+    int downShift;		/* Shift count used in hashing function.
+				 * Designed to use high-order bits of
+				 * randomized keys. */
+#if TCL_MAJOR_VERSION < 9
+    int mask;		/* Mask value used in hashing function. */
+#endif
+    int keyType;		/* Type of keys used in this table. It's
+				 * either TCL_CUSTOM_KEYS, TCL_STRING_KEYS,
+				 * TCL_ONE_WORD_KEYS, or an integer giving the
+				 * number of ints that is the size of the
+				 * key. */
+    Tcl_HashEntry *(*findProc) (Tcl_HashTable *tablePtr, const char *key);
+    Tcl_HashEntry *(*createProc) (Tcl_HashTable *tablePtr, const char *key,
+	    int *newPtr);
+    const Tcl_HashKeyType *typePtr;
+				/* Type of the keys used in the
+				 * Tcl_HashTable. */
+};
+
+/*
+ * Structure definition for information used to keep track of searches through
+ * hash tables:
+ */
+
+typedef struct Tcl_HashSearch {
+    Tcl_HashTable *tablePtr;	/* Table being searched. */
+    Tcl_Size nextIndex;		/* Index of next bucket to be enumerated after
+				 * present one. */
+    Tcl_HashEntry *nextEntryPtr;/* Next entry to be enumerated in the current
+				 * bucket. */
+} Tcl_HashSearch;
+
+/*
+ * Acceptable key types for hash tables:
+ *
+ * TCL_STRING_KEYS:		The keys are strings, they are copied into the
+ *				entry.
+ * TCL_ONE_WORD_KEYS:		The keys are pointers, the pointer is stored
+ *				in the entry.
+ * TCL_CUSTOM_TYPE_KEYS:	The keys are arbitrary types which are copied
+ *				into the entry.
+ * TCL_CUSTOM_PTR_KEYS:		The keys are pointers to arbitrary types, the
+ *				pointer is stored in the entry.
+ *
+ * While maintaining binary compatibility the above have to be distinct values
+ * as they are used to differentiate between old versions of the hash table
+ * which don't have a typePtr and new ones which do. Once binary compatibility
+ * is discarded in favour of making more wide spread changes TCL_STRING_KEYS
+ * can be the same as TCL_CUSTOM_TYPE_KEYS, and TCL_ONE_WORD_KEYS can be the
+ * same as TCL_CUSTOM_PTR_KEYS because they simply determine how the key is
+ * accessed from the entry and not the behaviour.
+ */
+
+#define TCL_STRING_KEYS		(0)
+#define TCL_ONE_WORD_KEYS	(1)
+#define TCL_CUSTOM_TYPE_KEYS	(-2)
+#define TCL_CUSTOM_PTR_KEYS	(-1)
+
+/*
+ * Structure definition for information used to keep track of searches through
+ * dictionaries. These fields should not be accessed by code outside
+ * tclDictObj.c
+ */
+
+typedef struct {
+    void *next;			/* Search position for underlying hash
+				 * table. */
+    TCL_HASH_TYPE epoch; 	/* Epoch marker for dictionary being searched,
+				 * or 0 if search has terminated. */
+    Tcl_Dict dictionaryPtr;	/* Reference to dictionary being searched. */
+} Tcl_DictSearch;
+
+/*
+ *----------------------------------------------------------------------------
+ * Flag values to pass to Tcl_DoOneEvent to disable searches for some kinds of
+ * events:
+ */
+
+#define TCL_DONT_WAIT		(1<<1)
+#define TCL_WINDOW_EVENTS	(1<<2)
+#define TCL_FILE_EVENTS		(1<<3)
+#define TCL_TIMER_EVENTS	(1<<4)
+#define TCL_IDLE_EVENTS		(1<<5)	/* WAS 0x10 ???? */
+#define TCL_ALL_EVENTS		(~TCL_DONT_WAIT)
+
+/*
+ * The following structure defines a generic event for the Tcl event system.
+ * These are the things that are queued in calls to Tcl_QueueEvent and
+ * serviced later by Tcl_DoOneEvent. There can be many different kinds of
+ * events with different fields, corresponding to window events, timer events,
+ * etc. The structure for a particular event consists of a Tcl_Event header
+ * followed by additional information specific to that event.
+ */
+
+struct Tcl_Event {
+    Tcl_EventProc *proc;	/* Function to call to service this event. */
+    struct Tcl_Event *nextPtr;	/* Next in list of pending events, or NULL. */
+};
+
+/*
+ * Positions to pass to Tcl_QueueEvent/Tcl_ThreadQueueEvent:
+ */
+
+typedef enum {
+    TCL_QUEUE_TAIL, TCL_QUEUE_HEAD, TCL_QUEUE_MARK,
+	    TCL_QUEUE_ALERT_IF_EMPTY=4
+} Tcl_QueuePosition;
+
+/*
+ * Values to pass to Tcl_SetServiceMode to specify the behavior of notifier
+ * event routines.
+ */
+
+#define TCL_SERVICE_NONE 0
+#define TCL_SERVICE_ALL 1
+
+/*
+ * The following structure keeps is used to hold a time value, either as an
+ * absolute time (the number of seconds from the epoch) or as an elapsed time.
+ * On Unix systems the epoch is Midnight Jan 1, 1970 GMT.
+ */
+
+typedef struct Tcl_Time {
+    long sec;			/* Seconds. */
+    long usec;			/* Microseconds. */
+} Tcl_Time;
+
+typedef void (Tcl_SetTimerProc) (CONST86 Tcl_Time *timePtr);
+typedef int (Tcl_WaitForEventProc) (CONST86 Tcl_Time *timePtr);
+
+/*
+ * TIP #233 (Virtualized Time)
+ */
+
+typedef void (Tcl_GetTimeProc)   (Tcl_Time *timebuf, void *clientData);
+typedef void (Tcl_ScaleTimeProc) (Tcl_Time *timebuf, void *clientData);
+
+/*
+ *----------------------------------------------------------------------------
+ * Bits to pass to Tcl_CreateFileHandler and Tcl_CreateChannelHandler to
+ * indicate what sorts of events are of interest:
+ */
+
+#define TCL_READABLE		(1<<1)
+#define TCL_WRITABLE		(1<<2)
+#define TCL_EXCEPTION		(1<<3)
+
+/*
+ * Flag values to pass to Tcl_OpenCommandChannel to indicate the disposition
+ * of the stdio handles. TCL_STDIN, TCL_STDOUT, TCL_STDERR, are also used in
+ * Tcl_GetStdChannel.
+ */
+
+#define TCL_STDIN		(1<<1)
+#define TCL_STDOUT		(1<<2)
+#define TCL_STDERR		(1<<3)
+#define TCL_ENFORCE_MODE	(1<<4)
+
+/*
+ * Bits passed to Tcl_DriverClose2Proc to indicate which side of a channel
+ * should be closed.
+ */
+
+#define TCL_CLOSE_READ		(1<<1)
+#define TCL_CLOSE_WRITE		(1<<2)
+
+/*
+ * Value to use as the closeProc for a channel that supports the close2Proc
+ * interface.
+ */
+
+#if TCL_MAJOR_VERSION > 8
+#   define TCL_CLOSE2PROC		NULL
+#else
+#   define TCL_CLOSE2PROC		((Tcl_DriverCloseProc *)(void *)(size_t)1)
+#endif
+
+/*
+ * Channel version tag. This was introduced in 8.3.2/8.4.
+ */
+
+#ifndef TCL_NO_DEPRECATED
+#define TCL_CHANNEL_VERSION_1	((Tcl_ChannelTypeVersion) 0x1)
+#define TCL_CHANNEL_VERSION_2	((Tcl_ChannelTypeVersion) 0x2)
+#define TCL_CHANNEL_VERSION_3	((Tcl_ChannelTypeVersion) 0x3)
+#define TCL_CHANNEL_VERSION_4	((Tcl_ChannelTypeVersion) 0x4)
+#endif
+#define TCL_CHANNEL_VERSION_5	((Tcl_ChannelTypeVersion) 0x5)
+
+/*
+ * TIP #218: Channel Actions, Ids for Tcl_DriverThreadActionProc.
+ */
+
+#define TCL_CHANNEL_THREAD_INSERT (0)
+#define TCL_CHANNEL_THREAD_REMOVE (1)
+
+/*
+ * Typedefs for the various operations in a channel type:
+ */
+
+typedef int	(Tcl_DriverBlockModeProc) (void *instanceData, int mode);
+typedef int	(Tcl_DriverCloseProc) (void *instanceData,
+			Tcl_Interp *interp);
+typedef int	(Tcl_DriverClose2Proc) (void *instanceData,
+			Tcl_Interp *interp, int flags);
+typedef int	(Tcl_DriverInputProc) (void *instanceData, char *buf,
+			int toRead, int *errorCodePtr);
+typedef int	(Tcl_DriverOutputProc) (void *instanceData,
+			const char *buf, int toWrite, int *errorCodePtr);
+typedef int	(Tcl_DriverSeekProc) (void *instanceData, long offset,
+			int mode, int *errorCodePtr);
+typedef int	(Tcl_DriverSetOptionProc) (void *instanceData,
+			Tcl_Interp *interp, const char *optionName,
+			const char *value);
+typedef int	(Tcl_DriverGetOptionProc) (void *instanceData,
+			Tcl_Interp *interp, const char *optionName,
+			Tcl_DString *dsPtr);
+typedef void	(Tcl_DriverWatchProc) (void *instanceData, int mask);
+typedef int	(Tcl_DriverGetHandleProc) (void *instanceData,
+			int direction, void **handlePtr);
+typedef int	(Tcl_DriverFlushProc) (void *instanceData);
+typedef int	(Tcl_DriverHandlerProc) (void *instanceData,
+			int interestMask);
+typedef long long (Tcl_DriverWideSeekProc) (void *instanceData,
+			long long offset, int mode, int *errorCodePtr);
+/*
+ * TIP #218, Channel Thread Actions
+ */
+typedef void	(Tcl_DriverThreadActionProc) (void *instanceData,
+			int action);
+/*
+ * TIP #208, File Truncation (etc.)
+ */
+typedef int	(Tcl_DriverTruncateProc) (void *instanceData,
+			long long length);
+
+/*
+ * struct Tcl_ChannelType:
+ *
+ * One such structure exists for each type (kind) of channel. It collects
+ * together in one place all the functions that are part of the specific
+ * channel type.
+ *
+ * It is recommend that the Tcl_Channel* functions are used to access elements
+ * of this structure, instead of direct accessing.
+ */
+
+typedef struct Tcl_ChannelType {
+    const char *typeName;	/* The name of the channel type in Tcl
+				 * commands. This storage is owned by channel
+				 * type. */
+    Tcl_ChannelTypeVersion version;
+				/* Version of the channel type. */
+    Tcl_DriverCloseProc *closeProc;
+				/* Function to call to close the channel, or
+				 * NULL or TCL_CLOSE2PROC if the close2Proc should be
+				 * used instead. */
+    Tcl_DriverInputProc *inputProc;
+				/* Function to call for input on channel. */
+    Tcl_DriverOutputProc *outputProc;
+				/* Function to call for output on channel. */
+    Tcl_DriverSeekProc *seekProc;
+				/* Function to call to seek on the channel.
+				 * May be NULL. */
+    Tcl_DriverSetOptionProc *setOptionProc;
+				/* Set an option on a channel. */
+    Tcl_DriverGetOptionProc *getOptionProc;
+				/* Get an option from a channel. */
+    Tcl_DriverWatchProc *watchProc;
+				/* Set up the notifier to watch for events on
+				 * this channel. */
+    Tcl_DriverGetHandleProc *getHandleProc;
+				/* Get an OS handle from the channel or NULL
+				 * if not supported. */
+    Tcl_DriverClose2Proc *close2Proc;
+				/* Function to call to close the channel if
+				 * the device supports closing the read &
+				 * write sides independently. */
+    Tcl_DriverBlockModeProc *blockModeProc;
+				/* Set blocking mode for the raw channel. May
+				 * be NULL. */
+    /*
+     * Only valid in TCL_CHANNEL_VERSION_2 channels or later.
+     */
+    Tcl_DriverFlushProc *flushProc;
+				/* Function to call to flush a channel. May be
+				 * NULL. */
+    Tcl_DriverHandlerProc *handlerProc;
+				/* Function to call to handle a channel event.
+				 * This will be passed up the stacked channel
+				 * chain. */
+    /*
+     * Only valid in TCL_CHANNEL_VERSION_3 channels or later.
+     */
+    Tcl_DriverWideSeekProc *wideSeekProc;
+				/* Function to call to seek on the channel
+				 * which can handle 64-bit offsets. May be
+				 * NULL, and must be NULL if seekProc is
+				 * NULL. */
+    /*
+     * Only valid in TCL_CHANNEL_VERSION_4 channels or later.
+     * TIP #218, Channel Thread Actions.
+     */
+    Tcl_DriverThreadActionProc *threadActionProc;
+				/* Function to call to notify the driver of
+				 * thread specific activity for a channel. May
+				 * be NULL. */
+    /*
+     * Only valid in TCL_CHANNEL_VERSION_5 channels or later.
+     * TIP #208, File Truncation.
+     */
+    Tcl_DriverTruncateProc *truncateProc;
+				/* Function to call to truncate the underlying
+				 * file to a particular length. May be NULL if
+				 * the channel does not support truncation. */
+} Tcl_ChannelType;
+
+/*
+ * The following flags determine whether the blockModeProc above should set
+ * the channel into blocking or nonblocking mode. They are passed as arguments
+ * to the blockModeProc function in the above structure.
+ */
+
+#define TCL_MODE_BLOCKING	0	/* Put channel into blocking mode. */
+#define TCL_MODE_NONBLOCKING	1	/* Put channel into nonblocking
+					 * mode. */
+
+/*
+ *----------------------------------------------------------------------------
+ * Enum for different types of file paths.
+ */
+
+typedef enum Tcl_PathType {
+    TCL_PATH_ABSOLUTE,
+    TCL_PATH_RELATIVE,
+    TCL_PATH_VOLUME_RELATIVE
+} Tcl_PathType;
+
+/*
+ * The following structure is used to pass glob type data amongst the various
+ * glob routines and Tcl_FSMatchInDirectory.
+ */
+
+typedef struct Tcl_GlobTypeData {
+    int type;			/* Corresponds to bcdpfls as in 'find -t'. */
+    int perm;			/* Corresponds to file permissions. */
+    Tcl_Obj *macType;		/* Acceptable Mac type. */
+    Tcl_Obj *macCreator;	/* Acceptable Mac creator. */
+} Tcl_GlobTypeData;
+
+/*
+ * Type and permission definitions for glob command.
+ */
+
+#define TCL_GLOB_TYPE_BLOCK		(1<<0)
+#define TCL_GLOB_TYPE_CHAR		(1<<1)
+#define TCL_GLOB_TYPE_DIR		(1<<2)
+#define TCL_GLOB_TYPE_PIPE		(1<<3)
+#define TCL_GLOB_TYPE_FILE		(1<<4)
+#define TCL_GLOB_TYPE_LINK		(1<<5)
+#define TCL_GLOB_TYPE_SOCK		(1<<6)
+#define TCL_GLOB_TYPE_MOUNT		(1<<7)
+
+#define TCL_GLOB_PERM_RONLY		(1<<0)
+#define TCL_GLOB_PERM_HIDDEN		(1<<1)
+#define TCL_GLOB_PERM_R			(1<<2)
+#define TCL_GLOB_PERM_W			(1<<3)
+#define TCL_GLOB_PERM_X			(1<<4)
+
+/*
+ * Flags for the unload callback function.
+ */
+
+#define TCL_UNLOAD_DETACH_FROM_INTERPRETER	(1<<0)
+#define TCL_UNLOAD_DETACH_FROM_PROCESS		(1<<1)
+
+/*
+ * Typedefs for the various filesystem operations:
+ */
+
+typedef int (Tcl_FSStatProc) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+typedef int (Tcl_FSAccessProc) (Tcl_Obj *pathPtr, int mode);
+typedef Tcl_Channel (Tcl_FSOpenFileChannelProc) (Tcl_Interp *interp,
+	Tcl_Obj *pathPtr, int mode, int permissions);
+typedef int (Tcl_FSMatchInDirectoryProc) (Tcl_Interp *interp, Tcl_Obj *result,
+	Tcl_Obj *pathPtr, const char *pattern, Tcl_GlobTypeData *types);
+typedef Tcl_Obj * (Tcl_FSGetCwdProc) (Tcl_Interp *interp);
+typedef int (Tcl_FSChdirProc) (Tcl_Obj *pathPtr);
+typedef int (Tcl_FSLstatProc) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+typedef int (Tcl_FSCreateDirectoryProc) (Tcl_Obj *pathPtr);
+typedef int (Tcl_FSDeleteFileProc) (Tcl_Obj *pathPtr);
+typedef int (Tcl_FSCopyDirectoryProc) (Tcl_Obj *srcPathPtr,
+	Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr);
+typedef int (Tcl_FSCopyFileProc) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr);
+typedef int (Tcl_FSRemoveDirectoryProc) (Tcl_Obj *pathPtr, int recursive,
+	Tcl_Obj **errorPtr);
+typedef int (Tcl_FSRenameFileProc) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr);
+typedef void (Tcl_FSUnloadFileProc) (Tcl_LoadHandle loadHandle);
+typedef Tcl_Obj * (Tcl_FSListVolumesProc) (void);
+/* We have to declare the utime structure here. */
+struct utimbuf;
+typedef int (Tcl_FSUtimeProc) (Tcl_Obj *pathPtr, struct utimbuf *tval);
+typedef int (Tcl_FSNormalizePathProc) (Tcl_Interp *interp, Tcl_Obj *pathPtr,
+	int nextCheckpoint);
+typedef int (Tcl_FSFileAttrsGetProc) (Tcl_Interp *interp, int index,
+	Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef);
+typedef const char *CONST86 * (Tcl_FSFileAttrStringsProc) (Tcl_Obj *pathPtr,
+	Tcl_Obj **objPtrRef);
+typedef int (Tcl_FSFileAttrsSetProc) (Tcl_Interp *interp, int index,
+	Tcl_Obj *pathPtr, Tcl_Obj *objPtr);
+typedef Tcl_Obj * (Tcl_FSLinkProc) (Tcl_Obj *pathPtr, Tcl_Obj *toPtr,
+	int linkType);
+typedef int (Tcl_FSLoadFileProc) (Tcl_Interp *interp, Tcl_Obj *pathPtr,
+	Tcl_LoadHandle *handlePtr, Tcl_FSUnloadFileProc **unloadProcPtr);
+typedef int (Tcl_FSPathInFilesystemProc) (Tcl_Obj *pathPtr,
+	void **clientDataPtr);
+typedef Tcl_Obj * (Tcl_FSFilesystemPathTypeProc) (Tcl_Obj *pathPtr);
+typedef Tcl_Obj * (Tcl_FSFilesystemSeparatorProc) (Tcl_Obj *pathPtr);
+typedef void (Tcl_FSFreeInternalRepProc) (void *clientData);
+typedef void *(Tcl_FSDupInternalRepProc) (void *clientData);
+typedef Tcl_Obj * (Tcl_FSInternalToNormalizedProc) (void *clientData);
+typedef void *(Tcl_FSCreateInternalRepProc) (Tcl_Obj *pathPtr);
+
+typedef struct Tcl_FSVersion_ *Tcl_FSVersion;
+
+/*
+ *----------------------------------------------------------------------------
+ * Data structures related to hooking into the filesystem
+ */
+
+/*
+ * Filesystem version tag.  This was introduced in 8.4.
+ */
+
+#define TCL_FILESYSTEM_VERSION_1	((Tcl_FSVersion) 0x1)
+
+/*
+ * struct Tcl_Filesystem:
+ *
+ * One such structure exists for each type (kind) of filesystem. It collects
+ * together the functions that form the interface for a particulr the
+ * filesystem. Tcl always accesses the filesystem through one of these
+ * structures.
+ *
+ * Not all entries need be non-NULL; any which are NULL are simply ignored.
+ * However, a complete filesystem should provide all of these functions. The
+ * explanations in the structure show the importance of each function.
+ */
+
+typedef struct Tcl_Filesystem {
+    const char *typeName;	/* The name of the filesystem. */
+    Tcl_Size structureLength;	/* Length of this structure, so future binary
+				 * compatibility can be assured. */
+    Tcl_FSVersion version;	/* Version of the filesystem type. */
+    Tcl_FSPathInFilesystemProc *pathInFilesystemProc;
+				/* Determines whether the pathname is in this
+				 * filesystem. This is the most important
+				 * filesystem function. */
+    Tcl_FSDupInternalRepProc *dupInternalRepProc;
+				/* Duplicates the internal handle of the node.
+				 * If it is NULL, the filesystem is less
+				 * performant. */
+    Tcl_FSFreeInternalRepProc *freeInternalRepProc;
+				/* Frees the internal handle of the node.  NULL
+				 * only if there is no need to free resources
+				 * used for the internal handle. */
+    Tcl_FSInternalToNormalizedProc *internalToNormalizedProc;
+				/* Converts the internal handle to a normalized
+				 * path.  NULL if the filesystem creates nodes
+				 * having no pathname. */
+    Tcl_FSCreateInternalRepProc *createInternalRepProc;
+				/* Creates an internal handle for a pathname.
+				 * May be NULL if pathnames have no internal
+				 * handle or if pathInFilesystemProc always
+				 * immediately creates an internal
+				 * representation for pathnames in the
+				 * filesystem. */
+    Tcl_FSNormalizePathProc *normalizePathProc;
+				/* Normalizes a path.  Should be implemented if
+				 * the filesystems supports multiple paths to
+				 * the same node. */
+    Tcl_FSFilesystemPathTypeProc *filesystemPathTypeProc;
+				/* Determines the type of a path in this
+				 * filesystem. May be NULL. */
+    Tcl_FSFilesystemSeparatorProc *filesystemSeparatorProc;
+				/* Produces the separator character(s) for this
+				 * filesystem. Must not be NULL. */
+    Tcl_FSStatProc *statProc;	/* Called by 'Tcl_FSStat()'.  Provided by any
+				 * reasonable filesystem. */
+    Tcl_FSAccessProc *accessProc;
+				/* Called by 'Tcl_FSAccess()'.  Implemented by
+				 * any reasonable filesystem. */
+    Tcl_FSOpenFileChannelProc *openFileChannelProc;
+				/* Called by 'Tcl_FSOpenFileChannel()'.
+				 * Provided by any reasonable filesystem. */
+    Tcl_FSMatchInDirectoryProc *matchInDirectoryProc;
+				/* Called by 'Tcl_FSMatchInDirectory()'.  NULL
+				 * if the filesystem does not support glob or
+				 * recursive copy. */
+    Tcl_FSUtimeProc *utimeProc;	/* Called by 'Tcl_FSUtime()', by 'file
+				 *  mtime' to set (not read) times, 'file
+				 *  atime', and the open-r/open-w/fcopy variant
+				 *  of 'file copy'. */
+    Tcl_FSLinkProc *linkProc;	/* Called by 'Tcl_FSLink()'. NULL if reading or
+				 *  creating links is not supported. */
+    Tcl_FSListVolumesProc *listVolumesProc;
+				/* Lists filesystem volumes added by this
+				 * filesystem. NULL if the filesystem does not
+				 * use volumes. */
+    Tcl_FSFileAttrStringsProc *fileAttrStringsProc;
+				/* List all valid attributes strings.  NULL if
+				 * the filesystem does not support the 'file
+				 * attributes' command.  Can be used to attach
+				 * arbitrary additional data to files in a
+				 * filesystem. */
+    Tcl_FSFileAttrsGetProc *fileAttrsGetProc;
+				/* Called by 'Tcl_FSFileAttrsGet()' and by
+				 * 'file attributes'. */
+    Tcl_FSFileAttrsSetProc *fileAttrsSetProc;
+				/* Called by 'Tcl_FSFileAttrsSet()' and by
+				 * 'file attributes'.  */
+    Tcl_FSCreateDirectoryProc *createDirectoryProc;
+				/* Called by 'Tcl_FSCreateDirectory()'.  May be
+				 * NULL if the filesystem is read-only. */
+    Tcl_FSRemoveDirectoryProc *removeDirectoryProc;
+				/* Called by 'Tcl_FSRemoveDirectory()'.  May be
+				 * NULL if the filesystem is read-only. */
+    Tcl_FSDeleteFileProc *deleteFileProc;
+				/* Called by 'Tcl_FSDeleteFile()' May be NULL
+				 * if the filesystem is is read-only. */
+    Tcl_FSCopyFileProc *copyFileProc;
+				/* Called by 'Tcl_FSCopyFile()'.  If NULL, for
+				 * a copy operation at the script level (not
+				 * C) Tcl uses open-r, open-w and fcopy. */
+    Tcl_FSRenameFileProc *renameFileProc;
+				/* Called by 'Tcl_FSRenameFile()'. If NULL, for
+				 * a rename operation at the script level (not
+				 * C) Tcl performs a copy operation followed
+				 * by a delete operation. */
+    Tcl_FSCopyDirectoryProc *copyDirectoryProc;
+				/* Called by 'Tcl_FSCopyDirectory()'. If NULL,
+				 * for a copy operation at the script level
+				 * (not C) Tcl recursively creates directories
+				 * and copies files. */
+    Tcl_FSLstatProc *lstatProc;	/* Called by 'Tcl_FSLstat()'. If NULL, Tcl
+				 * attempts to use 'statProc' instead. */
+    Tcl_FSLoadFileProc *loadFileProc;
+				/* Called by 'Tcl_FSLoadFile()'. If NULL, Tcl
+				 * performs a copy to a temporary file in the
+				 * native filesystem and then calls
+				 * Tcl_FSLoadFile() on that temporary copy. */
+    Tcl_FSGetCwdProc *getCwdProc;
+				/* Called by 'Tcl_FSGetCwd()'.  Normally NULL.
+				 * Usually only called once:  If 'getcwd' is
+				 * called before 'chdir' is ever called. */
+    Tcl_FSChdirProc *chdirProc;	/* Called by 'Tcl_FSChdir()'.  For a virtual
+				 * filesystem, chdirProc just returns zero
+				 * (success) if the pathname is a valid
+				 * directory, and some other value otherwise.
+				 * For A real filesystem, chdirProc performs
+				 * the correct action, e.g.  calls the system
+				 * 'chdir' function. If not implemented, then
+				 * 'cd' and 'pwd' fail for a pathname in this
+				 * filesystem. On success Tcl stores the
+				 * pathname for use by GetCwd.  If NULL, Tcl
+				 * performs records the pathname as the new
+				 * current directory if it passes a series of
+				 * directory access checks. */
+} Tcl_Filesystem;
+
+/*
+ * The following definitions are used as values for the 'linkAction' flag to
+ * Tcl_FSLink, or the linkProc of any filesystem. Any combination of flags can
+ * be given. For link creation, the linkProc should create a link which
+ * matches any of the types given.
+ *
+ * TCL_CREATE_SYMBOLIC_LINK -	Create a symbolic or soft link.
+ * TCL_CREATE_HARD_LINK -	Create a hard link.
+ */
+
+#define TCL_CREATE_SYMBOLIC_LINK	0x01
+#define TCL_CREATE_HARD_LINK		0x02
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure represents the Notifier functions that you can
+ * override with the Tcl_SetNotifier call.
+ */
+
+typedef struct Tcl_NotifierProcs {
+    Tcl_SetTimerProc *setTimerProc;
+    Tcl_WaitForEventProc *waitForEventProc;
+    Tcl_CreateFileHandlerProc *createFileHandlerProc;
+    Tcl_DeleteFileHandlerProc *deleteFileHandlerProc;
+    Tcl_InitNotifierProc *initNotifierProc;
+    Tcl_FinalizeNotifierProc *finalizeNotifierProc;
+    Tcl_AlertNotifierProc *alertNotifierProc;
+    Tcl_ServiceModeHookProc *serviceModeHookProc;
+} Tcl_NotifierProcs;
+
+/*
+ *----------------------------------------------------------------------------
+ * The following data structures and declarations are for the new Tcl parser.
+ *
+ * For each word of a command, and for each piece of a word such as a variable
+ * reference, one of the following structures is created to describe the
+ * token.
+ */
+
+typedef struct Tcl_Token {
+    int type;			/* Type of token, such as TCL_TOKEN_WORD; see
+				 * below for valid types. */
+    const char *start;		/* First character in token. */
+    Tcl_Size size;			/* Number of bytes in token. */
+    Tcl_Size numComponents;		/* If this token is composed of other tokens,
+				 * this field tells how many of them there are
+				 * (including components of components, etc.).
+				 * The component tokens immediately follow
+				 * this one. */
+} Tcl_Token;
+
+/*
+ * Type values defined for Tcl_Token structures. These values are defined as
+ * mask bits so that it's easy to check for collections of types.
+ *
+ * TCL_TOKEN_WORD -		The token describes one word of a command,
+ *				from the first non-blank character of the word
+ *				(which may be " or {) up to but not including
+ *				the space, semicolon, or bracket that
+ *				terminates the word. NumComponents counts the
+ *				total number of sub-tokens that make up the
+ *				word. This includes, for example, sub-tokens
+ *				of TCL_TOKEN_VARIABLE tokens.
+ * TCL_TOKEN_SIMPLE_WORD -	This token is just like TCL_TOKEN_WORD except
+ *				that the word is guaranteed to consist of a
+ *				single TCL_TOKEN_TEXT sub-token.
+ * TCL_TOKEN_TEXT -		The token describes a range of literal text
+ *				that is part of a word. NumComponents is
+ *				always 0.
+ * TCL_TOKEN_BS -		The token describes a backslash sequence that
+ *				must be collapsed. NumComponents is always 0.
+ * TCL_TOKEN_COMMAND -		The token describes a command whose result
+ *				must be substituted into the word. The token
+ *				includes the enclosing brackets. NumComponents
+ *				is always 0.
+ * TCL_TOKEN_VARIABLE -		The token describes a variable substitution,
+ *				including the dollar sign, variable name, and
+ *				array index (if there is one) up through the
+ *				right parentheses. NumComponents tells how
+ *				many additional tokens follow to represent the
+ *				variable name. The first token will be a
+ *				TCL_TOKEN_TEXT token that describes the
+ *				variable name. If the variable is an array
+ *				reference then there will be one or more
+ *				additional tokens, of type TCL_TOKEN_TEXT,
+ *				TCL_TOKEN_BS, TCL_TOKEN_COMMAND, and
+ *				TCL_TOKEN_VARIABLE, that describe the array
+ *				index; numComponents counts the total number
+ *				of nested tokens that make up the variable
+ *				reference, including sub-tokens of
+ *				TCL_TOKEN_VARIABLE tokens.
+ * TCL_TOKEN_SUB_EXPR -		The token describes one subexpression of an
+ *				expression, from the first non-blank character
+ *				of the subexpression up to but not including
+ *				the space, brace, or bracket that terminates
+ *				the subexpression. NumComponents counts the
+ *				total number of following subtokens that make
+ *				up the subexpression; this includes all
+ *				subtokens for any nested TCL_TOKEN_SUB_EXPR
+ *				tokens. For example, a numeric value used as a
+ *				primitive operand is described by a
+ *				TCL_TOKEN_SUB_EXPR token followed by a
+ *				TCL_TOKEN_TEXT token. A binary subexpression
+ *				is described by a TCL_TOKEN_SUB_EXPR token
+ *				followed by the TCL_TOKEN_OPERATOR token for
+ *				the operator, then TCL_TOKEN_SUB_EXPR tokens
+ *				for the left then the right operands.
+ * TCL_TOKEN_OPERATOR -		The token describes one expression operator.
+ *				An operator might be the name of a math
+ *				function such as "abs". A TCL_TOKEN_OPERATOR
+ *				token is always preceded by one
+ *				TCL_TOKEN_SUB_EXPR token for the operator's
+ *				subexpression, and is followed by zero or more
+ *				TCL_TOKEN_SUB_EXPR tokens for the operator's
+ *				operands. NumComponents is always 0.
+ * TCL_TOKEN_EXPAND_WORD -	This token is just like TCL_TOKEN_WORD except
+ *				that it marks a word that began with the
+ *				literal character prefix "{*}". This word is
+ *				marked to be expanded - that is, broken into
+ *				words after substitution is complete.
+ */
+
+#define TCL_TOKEN_WORD		1
+#define TCL_TOKEN_SIMPLE_WORD	2
+#define TCL_TOKEN_TEXT		4
+#define TCL_TOKEN_BS		8
+#define TCL_TOKEN_COMMAND	16
+#define TCL_TOKEN_VARIABLE	32
+#define TCL_TOKEN_SUB_EXPR	64
+#define TCL_TOKEN_OPERATOR	128
+#define TCL_TOKEN_EXPAND_WORD	256
+
+/*
+ * Parsing error types. On any parsing error, one of these values will be
+ * stored in the error field of the Tcl_Parse structure defined below.
+ */
+
+#define TCL_PARSE_SUCCESS		0
+#define TCL_PARSE_QUOTE_EXTRA		1
+#define TCL_PARSE_BRACE_EXTRA		2
+#define TCL_PARSE_MISSING_BRACE		3
+#define TCL_PARSE_MISSING_BRACKET	4
+#define TCL_PARSE_MISSING_PAREN		5
+#define TCL_PARSE_MISSING_QUOTE		6
+#define TCL_PARSE_MISSING_VAR_BRACE	7
+#define TCL_PARSE_SYNTAX		8
+#define TCL_PARSE_BAD_NUMBER		9
+
+/*
+ * A structure of the following type is filled in by Tcl_ParseCommand. It
+ * describes a single command parsed from an input string.
+ */
+
+#define NUM_STATIC_TOKENS 20
+
+typedef struct Tcl_Parse {
+    const char *commentStart;	/* Pointer to # that begins the first of one
+				 * or more comments preceding the command. */
+    Tcl_Size commentSize;		/* Number of bytes in comments (up through
+				 * newline character that terminates the last
+				 * comment). If there were no comments, this
+				 * field is 0. */
+    const char *commandStart;	/* First character in first word of
+				 * command. */
+    Tcl_Size commandSize;		/* Number of bytes in command, including first
+				 * character of first word, up through the
+				 * terminating newline, close bracket, or
+				 * semicolon. */
+    Tcl_Size numWords;		/* Total number of words in command. May be
+				 * 0. */
+    Tcl_Token *tokenPtr;	/* Pointer to first token representing the
+				 * words of the command. Initially points to
+				 * staticTokens, but may change to point to
+				 * malloc-ed space if command exceeds space in
+				 * staticTokens. */
+    Tcl_Size numTokens;		/* Total number of tokens in command. */
+    Tcl_Size tokensAvailable;	/* Total number of tokens available at
+				 * *tokenPtr. */
+    int errorType;		/* One of the parsing error types defined
+				 * above. */
+#if TCL_MAJOR_VERSION > 8
+    int incomplete;		/* This field is set to 1 by Tcl_ParseCommand
+				 * if the command appears to be incomplete.
+				 * This information is used by
+				 * Tcl_CommandComplete. */
+#endif
+
+    /*
+     * The fields below are intended only for the private use of the parser.
+     * They should not be used by functions that invoke Tcl_ParseCommand.
+     */
+
+    const char *string;		/* The original command string passed to
+				 * Tcl_ParseCommand. */
+    const char *end;		/* Points to the character just after the last
+				 * one in the command string. */
+    Tcl_Interp *interp;		/* Interpreter to use for error reporting, or
+				 * NULL. */
+    const char *term;		/* Points to character in string that
+				 * terminated most recent token. Filled in by
+				 * ParseTokens. If an error occurs, points to
+				 * beginning of region where the error
+				 * occurred (e.g. the open brace if the close
+				 * brace is missing). */
+#if TCL_MAJOR_VERSION < 9
+    int incomplete;
+#endif
+    Tcl_Token staticTokens[NUM_STATIC_TOKENS];
+				/* Initial space for tokens for command. This
+				 * space should be large enough to accommodate
+				 * most commands; dynamic space is allocated
+				 * for very large commands that don't fit
+				 * here. */
+} Tcl_Parse;
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure represents a user-defined encoding. It collects
+ * together all the functions that are used by the specific encoding.
+ */
+
+typedef struct Tcl_EncodingType {
+    const char *encodingName;	/* The name of the encoding, e.g. "euc-jp".
+				 * This name is the unique key for this
+				 * encoding type. */
+    Tcl_EncodingConvertProc *toUtfProc;
+				/* Function to convert from external encoding
+				 * into UTF-8. */
+    Tcl_EncodingConvertProc *fromUtfProc;
+				/* Function to convert from UTF-8 into
+				 * external encoding. */
+    Tcl_EncodingFreeProc *freeProc;
+				/* If non-NULL, function to call when this
+				 * encoding is deleted. */
+    void *clientData;	/* Arbitrary value associated with encoding
+				 * type. Passed to conversion functions. */
+    Tcl_Size nullSize;		/* Number of zero bytes that signify
+				 * end-of-string in this encoding. This number
+				 * is used to determine the source string
+				 * length when the srcLen argument is
+				 * negative. Must be 1, 2, or 4. */
+} Tcl_EncodingType;
+
+/*
+ * The following definitions are used as values for the conversion control
+ * flags argument when converting text from one character set to another:
+ *
+ * TCL_ENCODING_START -		Signifies that the source buffer is the first
+ *				block in a (potentially multi-block) input
+ *				stream. Tells the conversion function to reset
+ *				to an initial state and perform any
+ *				initialization that needs to occur before the
+ *				first byte is converted. If the source buffer
+ *				contains the entire input stream to be
+ *				converted, this flag should be set.
+ * TCL_ENCODING_END -		Signifies that the source buffer is the last
+ *				block in a (potentially multi-block) input
+ *				stream. Tells the conversion routine to
+ *				perform any finalization that needs to occur
+ *				after the last byte is converted and then to
+ *				reset to an initial state. If the source
+ *				buffer contains the entire input stream to be
+ *				converted, this flag should be set.
+ * TCL_ENCODING_STOPONERROR -	If set, the converter returns immediately upon
+ *				encountering an invalid byte sequence or a
+ *				source character that has no mapping in the
+ *				target encoding. If clear, the converter
+ *				substitutes the problematic character(s) with
+ *				one or more "close" characters in the
+ *				destination buffer and then continues to
+ *				convert the source. Only for Tcl 8.x.
+ * TCL_ENCODING_NO_TERMINATE - 	If set, Tcl_ExternalToUtf does not append a
+ *				terminating NUL byte.  Since it does not need
+ *				an extra byte for a terminating NUL, it fills
+ *				all dstLen bytes with encoded UTF-8 content if
+ *				needed.  If clear, a byte is reserved in the
+ *				dst space for NUL termination, and a
+ *				terminating NUL is appended.
+ * TCL_ENCODING_CHAR_LIMIT -	If set and dstCharsPtr is not NULL, then
+ *				Tcl_ExternalToUtf takes the initial value of
+ *				*dstCharsPtr as a limit of the maximum number
+ *				of chars to produce in the encoded UTF-8
+ *				content.  Otherwise, the number of chars
+ *				produced is controlled only by other limiting
+ *				factors.
+ * TCL_ENCODING_PROFILE_* -	Mutually exclusive encoding profile ids. Note
+ *				these are bit masks.
+ *
+ * NOTE: THESE BIT DEFINITIONS SHOULD NOT OVERLAP WITH INTERNAL USE BITS
+ * DEFINED IN tclEncoding.c (ENCODING_INPUT et al). Be cognizant of this
+ * when adding bits.
+ */
+
+#define TCL_ENCODING_START		0x01
+#define TCL_ENCODING_END		0x02
+#define TCL_ENCODING_STOPONERROR	0x04
+#define TCL_ENCODING_NO_TERMINATE	0x08
+#define TCL_ENCODING_CHAR_LIMIT		0x10
+/* Internal use bits, do not define bits in this space. See above comment */
+#define TCL_ENCODING_INTERNAL_USE_MASK  0xFF00
+/*
+ * Reserve top byte for profile values (disjoint, not a mask). In case of
+ * changes, ensure ENCODING_PROFILE_* macros in tclInt.h are modified if
+ * necessary.
+ */
+#define TCL_ENCODING_PROFILE_TCL8     0x01000000
+#define TCL_ENCODING_PROFILE_STRICT   0x02000000
+#define TCL_ENCODING_PROFILE_REPLACE  0x03000000
+#define TCL_ENCODING_PROFILE_DEFAULT  TCL_ENCODING_PROFILE_TCL8
+
+/*
+ * The following definitions are the error codes returned by the conversion
+ * routines:
+ *
+ * TCL_OK -			All characters were converted.
+ * TCL_CONVERT_NOSPACE -	The output buffer would not have been large
+ *				enough for all of the converted data; as many
+ *				characters as could fit were converted though.
+ * TCL_CONVERT_MULTIBYTE -	The last few bytes in the source string were
+ *				the beginning of a multibyte sequence, but
+ *				more bytes were needed to complete this
+ *				sequence. A subsequent call to the conversion
+ *				routine should pass the beginning of this
+ *				unconverted sequence plus additional bytes
+ *				from the source stream to properly convert the
+ *				formerly split-up multibyte sequence.
+ * TCL_CONVERT_SYNTAX -		The source stream contained an invalid
+ *				character sequence. This may occur if the
+ *				input stream has been damaged or if the input
+ *				encoding method was misidentified. This error
+ *				is reported only if TCL_ENCODING_STOPONERROR
+ *				was specified.
+ * TCL_CONVERT_UNKNOWN -	The source string contained a character that
+ *				could not be represented in the target
+ *				encoding. This error is reported only if
+ *				TCL_ENCODING_STOPONERROR was specified.
+ */
+
+#define TCL_CONVERT_MULTIBYTE	(-1)
+#define TCL_CONVERT_SYNTAX	(-2)
+#define TCL_CONVERT_UNKNOWN	(-3)
+#define TCL_CONVERT_NOSPACE	(-4)
+
+/*
+ * The maximum number of bytes that are necessary to represent a single
+ * Unicode character in UTF-8. The valid values are 3 and 4. If > 3,
+ * then Tcl_UniChar must be 4-bytes in size (UCS-4) (the default for the
+ * Tcl core). If == 3, then Tcl_UniChar must be 2-bytes in size (UTF-16).
+ */
+
+#ifndef TCL_UTF_MAX
+#   ifdef BUILD_tcl
+#	define TCL_UTF_MAX		4
+#   else
+#	define TCL_UTF_MAX		3
+#   endif
+#endif
+
+/*
+ * This represents a Unicode character. Any changes to this should also be
+ * reflected in regcustom.h.
+ */
+
+#if TCL_UTF_MAX == 4
+    /*
+     * int isn't 100% accurate as it should be a strict 4-byte value
+     * (perhaps int32_t). ILP64/SILP64 systems may have troubles. The
+     * size of this value must be reflected correctly in regcustom.h.
+     */
+typedef int Tcl_UniChar;
+#elif TCL_UTF_MAX == 3 && !defined(BUILD_tcl)
+typedef unsigned short Tcl_UniChar;
+#else
+#   error "This TCL_UTF_MAX value is not supported"
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * TIP #59: The following structure is used in calls 'Tcl_RegisterConfig' to
+ * provide the system with the embedded configuration data.
+ */
+
+typedef struct Tcl_Config {
+    const char *key;		/* Configuration key to register. ASCII
+				 * encoded, thus UTF-8. */
+    const char *value;		/* The value associated with the key. System
+				 * encoding. */
+} Tcl_Config;
+
+/*
+ *----------------------------------------------------------------------------
+ * Flags for TIP#143 limits, detailing which limits are active in an
+ * interpreter. Used for Tcl_{Add,Remove}LimitHandler type argument.
+ */
+
+#define TCL_LIMIT_COMMANDS	0x01
+#define TCL_LIMIT_TIME		0x02
+
+/*
+ * Structure containing information about a limit handler to be called when a
+ * command- or time-limit is exceeded by an interpreter.
+ */
+
+typedef void (Tcl_LimitHandlerProc) (void *clientData, Tcl_Interp *interp);
+typedef void (Tcl_LimitHandlerDeleteProc) (void *clientData);
+
+#if 0
+/*
+ *----------------------------------------------------------------------------
+ * We would like to provide an anonymous structure "mp_int" here, which is
+ * compatible with libtommath's "mp_int", but without duplicating anything
+ * from <tommath.h> or including <tommath.h> here. But the libtommath project
+ * didn't honor our request. See: <https://github.com/libtom/libtommath/pull/473>
+ *
+ * That's why this part is commented out, and we are using (void *) in
+ * various API's in stead of the more correct (mp_int *).
+ */
+
+#ifndef MP_INT_DECLARED
+#define MP_INT_DECLARED
+typedef struct mp_int mp_int;
+#endif
+
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * Definitions needed for Tcl_ParseArgvObj routines.
+ * Based on tkArgv.c.
+ * Modifications from the original are copyright (c) Sam Bromley 2006
+ */
+
+typedef struct {
+    int type;			/* Indicates the option type; see below. */
+    const char *keyStr;		/* The key string that flags the option in the
+				 * argv array. */
+    void *srcPtr;		/* Value to be used in setting dst; usage
+				 * depends on type.*/
+    void *dstPtr;		/* Address of value to be modified; usage
+				 * depends on type.*/
+    const char *helpStr;	/* Documentation message describing this
+				 * option. */
+    void *clientData;	/* Word to pass to function callbacks. */
+} Tcl_ArgvInfo;
+
+/*
+ * Legal values for the type field of a Tcl_ArgInfo: see the user
+ * documentation for details.
+ */
+
+#define TCL_ARGV_CONSTANT	15
+#define TCL_ARGV_INT		16
+#define TCL_ARGV_STRING		17
+#define TCL_ARGV_REST		18
+#define TCL_ARGV_FLOAT		19
+#define TCL_ARGV_FUNC		20
+#define TCL_ARGV_GENFUNC	21
+#define TCL_ARGV_HELP		22
+#define TCL_ARGV_END		23
+
+/*
+ * Types of callback functions for the TCL_ARGV_FUNC and TCL_ARGV_GENFUNC
+ * argument types:
+ */
+
+typedef int (Tcl_ArgvFuncProc)(void *clientData, Tcl_Obj *objPtr,
+	void *dstPtr);
+typedef int (Tcl_ArgvGenFuncProc)(void *clientData, Tcl_Interp *interp,
+	int objc, Tcl_Obj *const *objv, void *dstPtr);
+
+/*
+ * Shorthand for commonly used argTable entries.
+ */
+
+#define TCL_ARGV_AUTO_HELP \
+    {TCL_ARGV_HELP,	"-help",	NULL,	NULL, \
+	    "Print summary of command-line options and abort", NULL}
+#define TCL_ARGV_AUTO_REST \
+    {TCL_ARGV_REST,	"--",		NULL,	NULL, \
+	    "Marks the end of the options", NULL}
+#define TCL_ARGV_TABLE_END \
+    {TCL_ARGV_END, NULL, NULL, NULL, NULL, NULL}
+
+/*
+ *----------------------------------------------------------------------------
+ * Definitions needed for Tcl_Zlib routines. [TIP #234]
+ *
+ * Constants for the format flags describing what sort of data format is
+ * desired/expected for the Tcl_ZlibDeflate, Tcl_ZlibInflate and
+ * Tcl_ZlibStreamInit functions.
+ */
+
+#define TCL_ZLIB_FORMAT_RAW	1
+#define TCL_ZLIB_FORMAT_ZLIB	2
+#define TCL_ZLIB_FORMAT_GZIP	4
+#define TCL_ZLIB_FORMAT_AUTO	8
+
+/*
+ * Constants that describe whether the stream is to operate in compressing or
+ * decompressing mode.
+ */
+
+#define TCL_ZLIB_STREAM_DEFLATE	16
+#define TCL_ZLIB_STREAM_INFLATE	32
+
+/*
+ * Constants giving compression levels. Use of TCL_ZLIB_COMPRESS_DEFAULT is
+ * recommended.
+ */
+
+#define TCL_ZLIB_COMPRESS_NONE	0
+#define TCL_ZLIB_COMPRESS_FAST	1
+#define TCL_ZLIB_COMPRESS_BEST	9
+#define TCL_ZLIB_COMPRESS_DEFAULT (-1)
+
+/*
+ * Constants for types of flushing, used with Tcl_ZlibFlush.
+ */
+
+#define TCL_ZLIB_NO_FLUSH	0
+#define TCL_ZLIB_FLUSH		2
+#define TCL_ZLIB_FULLFLUSH	3
+#define TCL_ZLIB_FINALIZE	4
+
+/*
+ *----------------------------------------------------------------------------
+ * Definitions needed for the Tcl_LoadFile function. [TIP #416]
+ */
+
+#define TCL_LOAD_GLOBAL 1
+#define TCL_LOAD_LAZY 2
+
+/*
+ *----------------------------------------------------------------------------
+ * Definitions needed for the Tcl_OpenTcpServerEx function. [TIP #456]
+ */
+#define TCL_TCPSERVER_REUSEADDR (1<<0)
+#define TCL_TCPSERVER_REUSEPORT (1<<1)
+
+/*
+ * Constants for special Tcl_Size-typed values, see TIP #494
+ */
+
+#define TCL_IO_FAILURE	((Tcl_Size)-1)
+#define TCL_AUTO_LENGTH	((Tcl_Size)-1)
+#define TCL_INDEX_NONE  ((Tcl_Size)-1)
+
+/*
+ *----------------------------------------------------------------------------
+ * Single public declaration for NRE.
+ */
+
+typedef int (Tcl_NRPostProc) (void *data[], Tcl_Interp *interp,
+				int result);
+
+/*
+ *----------------------------------------------------------------------------
+ * The following constant is used to test for older versions of Tcl in the
+ * stubs tables.
+ */
+
+#if TCL_MAJOR_VERSION > 8
+#   define TCL_STUB_MAGIC		((int) 0xFCA3BACB + (int) sizeof(void *))
+#else
+#   define TCL_STUB_MAGIC		((int) 0xFCA3BACF)
+#endif
+
+/*
+ * The following function is required to be defined in all stubs aware
+ * extensions. The function is actually implemented in the stub library, not
+ * the main Tcl library, although there is a trivial implementation in the
+ * main library in case an extension is statically linked into an application.
+ */
+
+const char *		Tcl_InitStubs(Tcl_Interp *interp, const char *version,
+			    int exact, int magic);
+const char *		TclTomMathInitializeStubs(Tcl_Interp *interp,
+			    const char *version, int epoch, int revision);
+#if defined(_WIN32)
+    TCL_NORETURN void Tcl_ConsolePanic(const char *format, ...);
+#else
+#   define Tcl_ConsolePanic ((Tcl_PanicProc *)NULL)
+#endif
+
+#ifdef USE_TCL_STUBS
+# if TCL_UTF_MAX < 4
+#   define Tcl_InitStubs(interp, version, exact) \
+	(Tcl_InitStubs)(interp, version, \
+	    (exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), \
+	    TCL_STUB_MAGIC)
+# else
+#   define Tcl_InitStubs(interp, version, exact) \
+	(Tcl_InitStubs)(interp, TCL_PATCH_LEVEL, \
+	    (exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), \
+	    TCL_STUB_MAGIC)
+# endif
+#else
+#   define Tcl_InitStubs(interp, version, exact) \
+	Tcl_PkgInitStubsCheck(interp, version, \
+		(exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16))
+#endif
+
+/*
+ * Public functions that are not accessible via the stubs table.
+ * Tcl_GetMemoryInfo is needed for AOLserver. [Bug 1868171]
+ */
+
+#define Tcl_Main(argc, argv, proc) Tcl_MainEx(argc, argv, proc, \
+	    ((Tcl_SetPanicProc(Tcl_ConsolePanic), Tcl_CreateInterp)()))
+EXTERN void		Tcl_MainEx(Tcl_Size argc, char **argv,
+			    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
+EXTERN const char *	Tcl_PkgInitStubsCheck(Tcl_Interp *interp,
+			    const char *version, int exact);
+EXTERN const char *	Tcl_InitSubsystems(void);
+EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
+EXTERN const char *	Tcl_SetPreInitScript(const char *string);
+#ifndef TCL_NO_DEPRECATED
+#   define Tcl_StaticPackage Tcl_StaticLibrary
+#endif
+#ifdef _WIN32
+EXTERN const char *TclZipfs_AppHook(int *argc, wchar_t ***argv);
+#else
+EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv);
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * Include the public function declarations that are accessible via the stubs
+ * table.
+ */
+
+#include "tclDecls.h"
+
+/*
+ * Include platform specific public function declarations that are accessible
+ * via the stubs table. Make all TclOO symbols MODULE_SCOPE (which only
+ * has effect on building it as a shared library). See ticket [3010352].
+ */
+
+#if defined(BUILD_tcl)
+#   undef TCLAPI
+#   define TCLAPI MODULE_SCOPE
+#endif
+
+#include "tclPlatDecls.h"
+
+/*
+ *----------------------------------------------------------------------------
+ * The following declarations either map ckalloc and ckfree to malloc and
+ * free, or they map them to functions with all sorts of debugging hooks
+ * defined in tclCkalloc.c.
+ */
+
+#ifdef TCL_MEM_DEBUG
+
+#   define ckalloc(x) \
+    ((void *) Tcl_DbCkalloc((unsigned)(x), __FILE__, __LINE__))
+#   define ckfree(x) \
+    Tcl_DbCkfree((char *)(x), __FILE__, __LINE__)
+#   define ckrealloc(x,y) \
+    ((void *) Tcl_DbCkrealloc((char *)(x), (unsigned)(y), __FILE__, __LINE__))
+#   define attemptckalloc(x) \
+    ((void *) Tcl_AttemptDbCkalloc((unsigned)(x), __FILE__, __LINE__))
+#   define attemptckrealloc(x,y) \
+    ((void *) Tcl_AttemptDbCkrealloc((char *)(x), (unsigned)(y), __FILE__, __LINE__))
+
+#else /* !TCL_MEM_DEBUG */
+
+/*
+ * If we are not using the debugging allocator, we should call the Tcl_Alloc,
+ * et al. routines in order to guarantee that every module is using the same
+ * memory allocator both inside and outside of the Tcl library.
+ */
+
+#   define ckalloc(x) \
+    ((void *) Tcl_Alloc((unsigned)(x)))
+#   define ckfree(x) \
+    Tcl_Free((char *)(x))
+#   define ckrealloc(x,y) \
+    ((void *) Tcl_Realloc((char *)(x), (unsigned)(y)))
+#   define attemptckalloc(x) \
+    ((void *) Tcl_AttemptAlloc((unsigned)(x)))
+#   define attemptckrealloc(x,y) \
+    ((void *) Tcl_AttemptRealloc((char *)(x), (unsigned)(y)))
+#   undef  Tcl_InitMemory
+#   define Tcl_InitMemory(x)
+#   undef  Tcl_DumpActiveMemory
+#   define Tcl_DumpActiveMemory(x)
+#   undef  Tcl_ValidateAllMemory
+#   define Tcl_ValidateAllMemory(x,y)
+
+#endif /* !TCL_MEM_DEBUG */
+
+#ifdef TCL_MEM_DEBUG
+#   undef Tcl_IncrRefCount
+#   define Tcl_IncrRefCount(objPtr) \
+	Tcl_DbIncrRefCount(objPtr, __FILE__, __LINE__)
+#   undef Tcl_DecrRefCount
+#   define Tcl_DecrRefCount(objPtr) \
+	Tcl_DbDecrRefCount(objPtr, __FILE__, __LINE__)
+#   undef Tcl_IsShared
+#   define Tcl_IsShared(objPtr) \
+	Tcl_DbIsShared(objPtr, __FILE__, __LINE__)
+#else
+#   undef Tcl_IncrRefCount
+#   define Tcl_IncrRefCount(objPtr) \
+	++(objPtr)->refCount
+    /*
+     * Use do/while0 idiom for optimum correctness without compiler warnings.
+     * https://wiki.c2.com/?TrivialDoWhileLoop
+     */
+#   undef Tcl_DecrRefCount
+#   define Tcl_DecrRefCount(objPtr) \
+	do { \
+	    Tcl_Obj *_objPtr = (objPtr); \
+	    if (_objPtr->refCount-- <= 1) { \
+		TclFreeObj(_objPtr); \
+	    } \
+	} while(0)
+#   undef Tcl_IsShared
+#   define Tcl_IsShared(objPtr) \
+	((objPtr)->refCount > 1)
+#endif
+
+/*
+ * Macros and definitions that help to debug the use of Tcl objects. When
+ * TCL_MEM_DEBUG is defined, the Tcl_New declarations are overridden to call
+ * debugging versions of the object creation functions.
+ */
+
+#ifdef TCL_MEM_DEBUG
+#  undef  Tcl_NewBignumObj
+#  define Tcl_NewBignumObj(val) \
+     Tcl_DbNewBignumObj(val, __FILE__, __LINE__)
+#  undef  Tcl_NewBooleanObj
+#  define Tcl_NewBooleanObj(val) \
+     Tcl_DbNewWideIntObj((val)!=0, __FILE__, __LINE__)
+#  undef  Tcl_NewByteArrayObj
+#  define Tcl_NewByteArrayObj(bytes, len) \
+     Tcl_DbNewByteArrayObj(bytes, len, __FILE__, __LINE__)
+#  undef  Tcl_NewDoubleObj
+#  define Tcl_NewDoubleObj(val) \
+     Tcl_DbNewDoubleObj(val, __FILE__, __LINE__)
+#  undef  Tcl_NewListObj
+#  define Tcl_NewListObj(objc, objv) \
+     Tcl_DbNewListObj(objc, objv, __FILE__, __LINE__)
+#  undef  Tcl_NewObj
+#  define Tcl_NewObj() \
+     Tcl_DbNewObj(__FILE__, __LINE__)
+#  undef  Tcl_NewStringObj
+#  define Tcl_NewStringObj(bytes, len) \
+     Tcl_DbNewStringObj(bytes, len, __FILE__, __LINE__)
+#  undef  Tcl_NewWideIntObj
+#  define Tcl_NewWideIntObj(val) \
+     Tcl_DbNewWideIntObj(val, __FILE__, __LINE__)
+#endif /* TCL_MEM_DEBUG */
+
+/*
+ *----------------------------------------------------------------------------
+ * Macros for clients to use to access fields of hash entries:
+ */
+
+#define Tcl_GetHashValue(h) ((h)->clientData)
+#define Tcl_SetHashValue(h, value) ((h)->clientData = (void *)(value))
+#define Tcl_GetHashKey(tablePtr, h) \
+	((void *) (((tablePtr)->keyType == TCL_ONE_WORD_KEYS || \
+		    (tablePtr)->keyType == TCL_CUSTOM_PTR_KEYS) \
+		   ? (h)->key.oneWordValue \
+		   : (h)->key.string))
+
+/*
+ * Macros to use for clients to use to invoke find and create functions for
+ * hash tables:
+ */
+
+#undef  Tcl_FindHashEntry
+#define Tcl_FindHashEntry(tablePtr, key) \
+	(*((tablePtr)->findProc))(tablePtr, (const char *)(key))
+#undef  Tcl_CreateHashEntry
+#define Tcl_CreateHashEntry(tablePtr, key, newPtr) \
+	(*((tablePtr)->createProc))(tablePtr, (const char *)(key), newPtr)
+
+/*
+ *----------------------------------------------------------------------------
+ * Deprecated Tcl functions:
+ */
+
+#ifndef TCL_NO_DEPRECATED
+/*
+ * These function have been renamed. The old names are deprecated, but we
+ * define these macros for backwards compatibility.
+ */
+
+#   define Tcl_Ckalloc		Tcl_Alloc
+#   define Tcl_Ckfree		Tcl_Free
+#   define Tcl_Ckrealloc	Tcl_Realloc
+#   define Tcl_Return		Tcl_SetResult
+#   define Tcl_TildeSubst	Tcl_TranslateFileName
+#if !defined(__APPLE__) /* On OSX, there is a conflict with "mach/mach.h" */
+#   define panic		Tcl_Panic
+#endif
+#   define panicVA		Tcl_PanicVA
+
+/*
+ *----------------------------------------------------------------------------
+ * Convenience declaration of Tcl_AppInit for backwards compatibility. This
+ * function is not *implemented* by the tcl library, so the storage class is
+ * neither DLLEXPORT nor DLLIMPORT.
+ */
+
+extern Tcl_AppInitProc Tcl_AppInit;
+
+#endif /* !TCL_NO_DEPRECATED */
+
+#endif /* RC_INVOKED */
+
+/*
+ * end block for C++
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _TCL */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.7/tclDecls.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.7/tclDecls.h
new file mode 100644
index 00000000..0fe582ee
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.7/tclDecls.h
@@ -0,0 +1,4460 @@
+/*
+ * tclDecls.h --
+ *
+ *	Declarations of functions in the platform independent public Tcl API.
+ *
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#ifndef _TCLDECLS
+#define _TCLDECLS
+
+#include <stddef.h> /* for size_t */
+
+#ifdef TCL_NO_DEPRECATED
+#   define Tcl_SavedResult void
+#endif /* TCL_NO_DEPRECATED */
+
+#undef TCL_STORAGE_CLASS
+#ifdef BUILD_tcl
+#   define TCL_STORAGE_CLASS DLLEXPORT
+#else
+#   ifdef USE_TCL_STUBS
+#      define TCL_STORAGE_CLASS
+#   else
+#      define TCL_STORAGE_CLASS DLLIMPORT
+#   endif
+#endif
+
+#if !defined(BUILD_tcl)
+# define TCL_DEPRECATED(msg) EXTERN TCL_DEPRECATED_API(msg)
+#elif defined(TCL_NO_DEPRECATED)
+# define TCL_DEPRECATED(msg) MODULE_SCOPE
+#else
+# define TCL_DEPRECATED(msg) EXTERN
+#endif
+
+
+/*
+ * WARNING: This file is automatically generated by the tools/genStubs.tcl
+ * script.  Any modifications to the function declarations below should be made
+ * in the generic/tcl.decls script.
+ */
+
+/* !BEGIN!: Do not edit below this line. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+/* 0 */
+EXTERN int		Tcl_PkgProvideEx(Tcl_Interp *interp,
+				const char *name, const char *version,
+				const void *clientData);
+/* 1 */
+EXTERN const char *	Tcl_PkgRequireEx(Tcl_Interp *interp,
+				const char *name, const char *version,
+				int exact, void *clientDataPtr);
+/* 2 */
+EXTERN TCL_NORETURN void Tcl_Panic(const char *format, ...) TCL_FORMAT_PRINTF(1, 2);
+/* 3 */
+EXTERN char *		Tcl_Alloc(TCL_HASH_TYPE size);
+/* 4 */
+EXTERN void		Tcl_Free(char *ptr);
+/* 5 */
+EXTERN char *		Tcl_Realloc(char *ptr, TCL_HASH_TYPE size);
+/* 6 */
+EXTERN char *		Tcl_DbCkalloc(TCL_HASH_TYPE size, const char *file,
+				int line);
+/* 7 */
+EXTERN void		Tcl_DbCkfree(char *ptr, const char *file, int line);
+/* 8 */
+EXTERN char *		Tcl_DbCkrealloc(char *ptr, TCL_HASH_TYPE size,
+				const char *file, int line);
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+/* 9 */
+EXTERN void		Tcl_CreateFileHandler(int fd, int mask,
+				Tcl_FileProc *proc, void *clientData);
+#endif /* UNIX */
+#ifdef MAC_OSX_TCL /* MACOSX */
+/* 9 */
+EXTERN void		Tcl_CreateFileHandler(int fd, int mask,
+				Tcl_FileProc *proc, void *clientData);
+#endif /* MACOSX */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+/* 10 */
+EXTERN void		Tcl_DeleteFileHandler(int fd);
+#endif /* UNIX */
+#ifdef MAC_OSX_TCL /* MACOSX */
+/* 10 */
+EXTERN void		Tcl_DeleteFileHandler(int fd);
+#endif /* MACOSX */
+/* 11 */
+EXTERN void		Tcl_SetTimer(const Tcl_Time *timePtr);
+/* 12 */
+EXTERN void		Tcl_Sleep(int ms);
+/* 13 */
+EXTERN int		Tcl_WaitForEvent(const Tcl_Time *timePtr);
+/* 14 */
+EXTERN int		Tcl_AppendAllObjTypes(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
+/* 15 */
+EXTERN void		Tcl_AppendStringsToObj(Tcl_Obj *objPtr, ...);
+/* 16 */
+EXTERN void		Tcl_AppendToObj(Tcl_Obj *objPtr, const char *bytes,
+				Tcl_Size length);
+/* 17 */
+EXTERN Tcl_Obj *	Tcl_ConcatObj(Tcl_Size objc, Tcl_Obj *const objv[]);
+/* 18 */
+EXTERN int		Tcl_ConvertToType(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, const Tcl_ObjType *typePtr);
+/* 19 */
+EXTERN void		Tcl_DbDecrRefCount(Tcl_Obj *objPtr, const char *file,
+				int line);
+/* 20 */
+EXTERN void		Tcl_DbIncrRefCount(Tcl_Obj *objPtr, const char *file,
+				int line);
+/* 21 */
+EXTERN int		Tcl_DbIsShared(Tcl_Obj *objPtr, const char *file,
+				int line);
+/* 22 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+Tcl_Obj *		Tcl_DbNewBooleanObj(int intValue, const char *file,
+				int line);
+/* 23 */
+EXTERN Tcl_Obj *	Tcl_DbNewByteArrayObj(const unsigned char *bytes,
+				Tcl_Size numBytes, const char *file,
+				int line);
+/* 24 */
+EXTERN Tcl_Obj *	Tcl_DbNewDoubleObj(double doubleValue,
+				const char *file, int line);
+/* 25 */
+EXTERN Tcl_Obj *	Tcl_DbNewListObj(Tcl_Size objc, Tcl_Obj *const *objv,
+				const char *file, int line);
+/* 26 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+Tcl_Obj *		Tcl_DbNewLongObj(long longValue, const char *file,
+				int line);
+/* 27 */
+EXTERN Tcl_Obj *	Tcl_DbNewObj(const char *file, int line);
+/* 28 */
+EXTERN Tcl_Obj *	Tcl_DbNewStringObj(const char *bytes,
+				Tcl_Size length, const char *file, int line);
+/* 29 */
+EXTERN Tcl_Obj *	Tcl_DuplicateObj(Tcl_Obj *objPtr);
+/* 30 */
+EXTERN void		TclFreeObj(Tcl_Obj *objPtr);
+/* 31 */
+EXTERN int		Tcl_GetBoolean(Tcl_Interp *interp, const char *src,
+				int *intPtr);
+/* 32 */
+EXTERN int		Tcl_GetBooleanFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *intPtr);
+/* 33 */
+EXTERN unsigned char *	Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr,
+				Tcl_Size *numBytesPtr);
+/* 34 */
+EXTERN int		Tcl_GetDouble(Tcl_Interp *interp, const char *src,
+				double *doublePtr);
+/* 35 */
+EXTERN int		Tcl_GetDoubleFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, double *doublePtr);
+/* 36 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+int			Tcl_GetIndexFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, const char *const *tablePtr,
+				const char *msg, int flags, int *indexPtr);
+/* 37 */
+EXTERN int		Tcl_GetInt(Tcl_Interp *interp, const char *src,
+				int *intPtr);
+/* 38 */
+EXTERN int		Tcl_GetIntFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *intPtr);
+/* 39 */
+EXTERN int		Tcl_GetLongFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, long *longPtr);
+/* 40 */
+EXTERN CONST86 Tcl_ObjType * Tcl_GetObjType(const char *typeName);
+/* 41 */
+EXTERN char *		Tcl_GetStringFromObj(Tcl_Obj *objPtr, int *lengthPtr);
+/* 42 */
+EXTERN void		Tcl_InvalidateStringRep(Tcl_Obj *objPtr);
+/* 43 */
+EXTERN int		Tcl_ListObjAppendList(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Obj *elemListPtr);
+/* 44 */
+EXTERN int		Tcl_ListObjAppendElement(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Obj *objPtr);
+/* 45 */
+EXTERN int		Tcl_ListObjGetElements(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, int *objcPtr,
+				Tcl_Obj ***objvPtr);
+/* 46 */
+EXTERN int		Tcl_ListObjIndex(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Size index,
+				Tcl_Obj **objPtrPtr);
+/* 47 */
+EXTERN int		Tcl_ListObjLength(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, int *lengthPtr);
+/* 48 */
+EXTERN int		Tcl_ListObjReplace(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Size first,
+				Tcl_Size count, Tcl_Size objc,
+				Tcl_Obj *const objv[]);
+/* 49 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+Tcl_Obj *		Tcl_NewBooleanObj(int intValue);
+/* 50 */
+EXTERN Tcl_Obj *	Tcl_NewByteArrayObj(const unsigned char *bytes,
+				Tcl_Size numBytes);
+/* 51 */
+EXTERN Tcl_Obj *	Tcl_NewDoubleObj(double doubleValue);
+/* 52 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+Tcl_Obj *		Tcl_NewIntObj(int intValue);
+/* 53 */
+EXTERN Tcl_Obj *	Tcl_NewListObj(Tcl_Size objc, Tcl_Obj *const objv[]);
+/* 54 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+Tcl_Obj *		Tcl_NewLongObj(long longValue);
+/* 55 */
+EXTERN Tcl_Obj *	Tcl_NewObj(void);
+/* 56 */
+EXTERN Tcl_Obj *	Tcl_NewStringObj(const char *bytes, Tcl_Size length);
+/* 57 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+void			Tcl_SetBooleanObj(Tcl_Obj *objPtr, int intValue);
+/* 58 */
+EXTERN unsigned char *	Tcl_SetByteArrayLength(Tcl_Obj *objPtr,
+				Tcl_Size numBytes);
+/* 59 */
+EXTERN void		Tcl_SetByteArrayObj(Tcl_Obj *objPtr,
+				const unsigned char *bytes,
+				Tcl_Size numBytes);
+/* 60 */
+EXTERN void		Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue);
+/* 61 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+void			Tcl_SetIntObj(Tcl_Obj *objPtr, int intValue);
+/* 62 */
+EXTERN void		Tcl_SetListObj(Tcl_Obj *objPtr, Tcl_Size objc,
+				Tcl_Obj *const objv[]);
+/* 63 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+void			Tcl_SetLongObj(Tcl_Obj *objPtr, long longValue);
+/* 64 */
+EXTERN void		Tcl_SetObjLength(Tcl_Obj *objPtr, Tcl_Size length);
+/* 65 */
+EXTERN void		Tcl_SetStringObj(Tcl_Obj *objPtr, const char *bytes,
+				Tcl_Size length);
+/* 66 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+void			Tcl_AddErrorInfo(Tcl_Interp *interp,
+				const char *message);
+/* 67 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+void			Tcl_AddObjErrorInfo(Tcl_Interp *interp,
+				const char *message, Tcl_Size length);
+/* 68 */
+EXTERN void		Tcl_AllowExceptions(Tcl_Interp *interp);
+/* 69 */
+EXTERN void		Tcl_AppendElement(Tcl_Interp *interp,
+				const char *element);
+/* 70 */
+EXTERN void		Tcl_AppendResult(Tcl_Interp *interp, ...);
+/* 71 */
+EXTERN Tcl_AsyncHandler	 Tcl_AsyncCreate(Tcl_AsyncProc *proc,
+				void *clientData);
+/* 72 */
+EXTERN void		Tcl_AsyncDelete(Tcl_AsyncHandler async);
+/* 73 */
+EXTERN int		Tcl_AsyncInvoke(Tcl_Interp *interp, int code);
+/* 74 */
+EXTERN void		Tcl_AsyncMark(Tcl_AsyncHandler async);
+/* 75 */
+EXTERN int		Tcl_AsyncReady(void);
+/* 76 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+void			Tcl_BackgroundError(Tcl_Interp *interp);
+/* 77 */
+TCL_DEPRECATED("Use Tcl_UtfBackslash")
+char			Tcl_Backslash(const char *src, int *readPtr);
+/* 78 */
+EXTERN int		Tcl_BadChannelOption(Tcl_Interp *interp,
+				const char *optionName,
+				const char *optionList);
+/* 79 */
+EXTERN void		Tcl_CallWhenDeleted(Tcl_Interp *interp,
+				Tcl_InterpDeleteProc *proc, void *clientData);
+/* 80 */
+EXTERN void		Tcl_CancelIdleCall(Tcl_IdleProc *idleProc,
+				void *clientData);
+/* 81 */
+EXTERN int		Tcl_Close(Tcl_Interp *interp, Tcl_Channel chan);
+/* 82 */
+EXTERN int		Tcl_CommandComplete(const char *cmd);
+/* 83 */
+EXTERN char *		Tcl_Concat(Tcl_Size argc, const char *const *argv);
+/* 84 */
+EXTERN Tcl_Size		Tcl_ConvertElement(const char *src, char *dst,
+				int flags);
+/* 85 */
+EXTERN Tcl_Size		Tcl_ConvertCountedElement(const char *src,
+				Tcl_Size length, char *dst, int flags);
+/* 86 */
+EXTERN int		Tcl_CreateAlias(Tcl_Interp *childInterp,
+				const char *childCmd, Tcl_Interp *target,
+				const char *targetCmd, Tcl_Size argc,
+				const char *const *argv);
+/* 87 */
+EXTERN int		Tcl_CreateAliasObj(Tcl_Interp *childInterp,
+				const char *childCmd, Tcl_Interp *target,
+				const char *targetCmd, Tcl_Size objc,
+				Tcl_Obj *const objv[]);
+/* 88 */
+EXTERN Tcl_Channel	Tcl_CreateChannel(const Tcl_ChannelType *typePtr,
+				const char *chanName, void *instanceData,
+				int mask);
+/* 89 */
+EXTERN void		Tcl_CreateChannelHandler(Tcl_Channel chan, int mask,
+				Tcl_ChannelProc *proc, void *clientData);
+/* 90 */
+EXTERN void		Tcl_CreateCloseHandler(Tcl_Channel chan,
+				Tcl_CloseProc *proc, void *clientData);
+/* 91 */
+EXTERN Tcl_Command	Tcl_CreateCommand(Tcl_Interp *interp,
+				const char *cmdName, Tcl_CmdProc *proc,
+				void *clientData,
+				Tcl_CmdDeleteProc *deleteProc);
+/* 92 */
+EXTERN void		Tcl_CreateEventSource(Tcl_EventSetupProc *setupProc,
+				Tcl_EventCheckProc *checkProc,
+				void *clientData);
+/* 93 */
+EXTERN void		Tcl_CreateExitHandler(Tcl_ExitProc *proc,
+				void *clientData);
+/* 94 */
+EXTERN Tcl_Interp *	Tcl_CreateInterp(void);
+/* 95 */
+TCL_DEPRECATED("")
+void			Tcl_CreateMathFunc(Tcl_Interp *interp,
+				const char *name, int numArgs,
+				Tcl_ValueType *argTypes, Tcl_MathProc *proc,
+				void *clientData);
+/* 96 */
+EXTERN Tcl_Command	Tcl_CreateObjCommand(Tcl_Interp *interp,
+				const char *cmdName, Tcl_ObjCmdProc *proc,
+				void *clientData,
+				Tcl_CmdDeleteProc *deleteProc);
+/* 97 */
+EXTERN Tcl_Interp *	Tcl_CreateChild(Tcl_Interp *interp, const char *name,
+				int isSafe);
+/* 98 */
+EXTERN Tcl_TimerToken	Tcl_CreateTimerHandler(int milliseconds,
+				Tcl_TimerProc *proc, void *clientData);
+/* 99 */
+EXTERN Tcl_Trace	Tcl_CreateTrace(Tcl_Interp *interp, Tcl_Size level,
+				Tcl_CmdTraceProc *proc, void *clientData);
+/* 100 */
+EXTERN void		Tcl_DeleteAssocData(Tcl_Interp *interp,
+				const char *name);
+/* 101 */
+EXTERN void		Tcl_DeleteChannelHandler(Tcl_Channel chan,
+				Tcl_ChannelProc *proc, void *clientData);
+/* 102 */
+EXTERN void		Tcl_DeleteCloseHandler(Tcl_Channel chan,
+				Tcl_CloseProc *proc, void *clientData);
+/* 103 */
+EXTERN int		Tcl_DeleteCommand(Tcl_Interp *interp,
+				const char *cmdName);
+/* 104 */
+EXTERN int		Tcl_DeleteCommandFromToken(Tcl_Interp *interp,
+				Tcl_Command command);
+/* 105 */
+EXTERN void		Tcl_DeleteEvents(Tcl_EventDeleteProc *proc,
+				void *clientData);
+/* 106 */
+EXTERN void		Tcl_DeleteEventSource(Tcl_EventSetupProc *setupProc,
+				Tcl_EventCheckProc *checkProc,
+				void *clientData);
+/* 107 */
+EXTERN void		Tcl_DeleteExitHandler(Tcl_ExitProc *proc,
+				void *clientData);
+/* 108 */
+EXTERN void		Tcl_DeleteHashEntry(Tcl_HashEntry *entryPtr);
+/* 109 */
+EXTERN void		Tcl_DeleteHashTable(Tcl_HashTable *tablePtr);
+/* 110 */
+EXTERN void		Tcl_DeleteInterp(Tcl_Interp *interp);
+/* 111 */
+EXTERN void		Tcl_DetachPids(Tcl_Size numPids, Tcl_Pid *pidPtr);
+/* 112 */
+EXTERN void		Tcl_DeleteTimerHandler(Tcl_TimerToken token);
+/* 113 */
+EXTERN void		Tcl_DeleteTrace(Tcl_Interp *interp, Tcl_Trace trace);
+/* 114 */
+EXTERN void		Tcl_DontCallWhenDeleted(Tcl_Interp *interp,
+				Tcl_InterpDeleteProc *proc, void *clientData);
+/* 115 */
+EXTERN int		Tcl_DoOneEvent(int flags);
+/* 116 */
+EXTERN void		Tcl_DoWhenIdle(Tcl_IdleProc *proc, void *clientData);
+/* 117 */
+EXTERN char *		Tcl_DStringAppend(Tcl_DString *dsPtr,
+				const char *bytes, Tcl_Size length);
+/* 118 */
+EXTERN char *		Tcl_DStringAppendElement(Tcl_DString *dsPtr,
+				const char *element);
+/* 119 */
+EXTERN void		Tcl_DStringEndSublist(Tcl_DString *dsPtr);
+/* 120 */
+EXTERN void		Tcl_DStringFree(Tcl_DString *dsPtr);
+/* 121 */
+EXTERN void		Tcl_DStringGetResult(Tcl_Interp *interp,
+				Tcl_DString *dsPtr);
+/* 122 */
+EXTERN void		Tcl_DStringInit(Tcl_DString *dsPtr);
+/* 123 */
+EXTERN void		Tcl_DStringResult(Tcl_Interp *interp,
+				Tcl_DString *dsPtr);
+/* 124 */
+EXTERN void		Tcl_DStringSetLength(Tcl_DString *dsPtr,
+				Tcl_Size length);
+/* 125 */
+EXTERN void		Tcl_DStringStartSublist(Tcl_DString *dsPtr);
+/* 126 */
+EXTERN int		Tcl_Eof(Tcl_Channel chan);
+/* 127 */
+EXTERN const char *	Tcl_ErrnoId(void);
+/* 128 */
+EXTERN const char *	Tcl_ErrnoMsg(int err);
+/* 129 */
+EXTERN int		Tcl_Eval(Tcl_Interp *interp, const char *script);
+/* 130 */
+EXTERN int		Tcl_EvalFile(Tcl_Interp *interp,
+				const char *fileName);
+/* 131 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+int			Tcl_EvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr);
+/* 132 */
+EXTERN void		Tcl_EventuallyFree(void *clientData,
+				Tcl_FreeProc *freeProc);
+/* 133 */
+EXTERN TCL_NORETURN void Tcl_Exit(int status);
+/* 134 */
+EXTERN int		Tcl_ExposeCommand(Tcl_Interp *interp,
+				const char *hiddenCmdToken,
+				const char *cmdName);
+/* 135 */
+EXTERN int		Tcl_ExprBoolean(Tcl_Interp *interp, const char *expr,
+				int *ptr);
+/* 136 */
+EXTERN int		Tcl_ExprBooleanObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *ptr);
+/* 137 */
+EXTERN int		Tcl_ExprDouble(Tcl_Interp *interp, const char *expr,
+				double *ptr);
+/* 138 */
+EXTERN int		Tcl_ExprDoubleObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, double *ptr);
+/* 139 */
+EXTERN int		Tcl_ExprLong(Tcl_Interp *interp, const char *expr,
+				long *ptr);
+/* 140 */
+EXTERN int		Tcl_ExprLongObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				long *ptr);
+/* 141 */
+EXTERN int		Tcl_ExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				Tcl_Obj **resultPtrPtr);
+/* 142 */
+EXTERN int		Tcl_ExprString(Tcl_Interp *interp, const char *expr);
+/* 143 */
+EXTERN void		Tcl_Finalize(void);
+/* 144 */
+EXTERN const char *	Tcl_FindExecutable(const char *argv0);
+/* 145 */
+EXTERN Tcl_HashEntry *	Tcl_FirstHashEntry(Tcl_HashTable *tablePtr,
+				Tcl_HashSearch *searchPtr);
+/* 146 */
+EXTERN int		Tcl_Flush(Tcl_Channel chan);
+/* 147 */
+TCL_DEPRECATED("see TIP #559. Use Tcl_ResetResult")
+void			Tcl_FreeResult(Tcl_Interp *interp);
+/* 148 */
+EXTERN int		Tcl_GetAlias(Tcl_Interp *interp,
+				const char *childCmd,
+				Tcl_Interp **targetInterpPtr,
+				const char **targetCmdPtr, int *argcPtr,
+				const char ***argvPtr);
+/* 149 */
+EXTERN int		Tcl_GetAliasObj(Tcl_Interp *interp,
+				const char *childCmd,
+				Tcl_Interp **targetInterpPtr,
+				const char **targetCmdPtr, int *objcPtr,
+				Tcl_Obj ***objv);
+/* 150 */
+EXTERN void *		Tcl_GetAssocData(Tcl_Interp *interp,
+				const char *name,
+				Tcl_InterpDeleteProc **procPtr);
+/* 151 */
+EXTERN Tcl_Channel	Tcl_GetChannel(Tcl_Interp *interp,
+				const char *chanName, int *modePtr);
+/* 152 */
+EXTERN Tcl_Size		Tcl_GetChannelBufferSize(Tcl_Channel chan);
+/* 153 */
+EXTERN int		Tcl_GetChannelHandle(Tcl_Channel chan, int direction,
+				void **handlePtr);
+/* 154 */
+EXTERN void *		Tcl_GetChannelInstanceData(Tcl_Channel chan);
+/* 155 */
+EXTERN int		Tcl_GetChannelMode(Tcl_Channel chan);
+/* 156 */
+EXTERN const char *	Tcl_GetChannelName(Tcl_Channel chan);
+/* 157 */
+EXTERN int		Tcl_GetChannelOption(Tcl_Interp *interp,
+				Tcl_Channel chan, const char *optionName,
+				Tcl_DString *dsPtr);
+/* 158 */
+EXTERN CONST86 Tcl_ChannelType * Tcl_GetChannelType(Tcl_Channel chan);
+/* 159 */
+EXTERN int		Tcl_GetCommandInfo(Tcl_Interp *interp,
+				const char *cmdName, Tcl_CmdInfo *infoPtr);
+/* 160 */
+EXTERN const char *	Tcl_GetCommandName(Tcl_Interp *interp,
+				Tcl_Command command);
+/* 161 */
+EXTERN int		Tcl_GetErrno(void);
+/* 162 */
+EXTERN const char *	Tcl_GetHostName(void);
+/* 163 */
+EXTERN int		Tcl_GetInterpPath(Tcl_Interp *interp,
+				Tcl_Interp *childInterp);
+/* 164 */
+EXTERN Tcl_Interp *	Tcl_GetParent(Tcl_Interp *interp);
+/* 165 */
+EXTERN const char *	Tcl_GetNameOfExecutable(void);
+/* 166 */
+EXTERN Tcl_Obj *	Tcl_GetObjResult(Tcl_Interp *interp);
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+/* 167 */
+EXTERN int		Tcl_GetOpenFile(Tcl_Interp *interp,
+				const char *chanID, int forWriting,
+				int checkUsage, void **filePtr);
+#endif /* UNIX */
+#ifdef MAC_OSX_TCL /* MACOSX */
+/* 167 */
+EXTERN int		Tcl_GetOpenFile(Tcl_Interp *interp,
+				const char *chanID, int forWriting,
+				int checkUsage, void **filePtr);
+#endif /* MACOSX */
+/* 168 */
+EXTERN Tcl_PathType	Tcl_GetPathType(const char *path);
+/* 169 */
+EXTERN Tcl_Size		Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr);
+/* 170 */
+EXTERN Tcl_Size		Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr);
+/* 171 */
+EXTERN int		Tcl_GetServiceMode(void);
+/* 172 */
+EXTERN Tcl_Interp *	Tcl_GetChild(Tcl_Interp *interp, const char *name);
+/* 173 */
+EXTERN Tcl_Channel	Tcl_GetStdChannel(int type);
+/* 174 */
+EXTERN const char *	Tcl_GetStringResult(Tcl_Interp *interp);
+/* 175 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+const char *		Tcl_GetVar(Tcl_Interp *interp, const char *varName,
+				int flags);
+/* 176 */
+EXTERN const char *	Tcl_GetVar2(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags);
+/* 177 */
+EXTERN int		Tcl_GlobalEval(Tcl_Interp *interp,
+				const char *command);
+/* 178 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+int			Tcl_GlobalEvalObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
+/* 179 */
+EXTERN int		Tcl_HideCommand(Tcl_Interp *interp,
+				const char *cmdName,
+				const char *hiddenCmdToken);
+/* 180 */
+EXTERN int		Tcl_Init(Tcl_Interp *interp);
+/* 181 */
+EXTERN void		Tcl_InitHashTable(Tcl_HashTable *tablePtr,
+				int keyType);
+/* 182 */
+EXTERN int		Tcl_InputBlocked(Tcl_Channel chan);
+/* 183 */
+EXTERN int		Tcl_InputBuffered(Tcl_Channel chan);
+/* 184 */
+EXTERN int		Tcl_InterpDeleted(Tcl_Interp *interp);
+/* 185 */
+EXTERN int		Tcl_IsSafe(Tcl_Interp *interp);
+/* 186 */
+EXTERN char *		Tcl_JoinPath(Tcl_Size argc, const char *const *argv,
+				Tcl_DString *resultPtr);
+/* 187 */
+EXTERN int		Tcl_LinkVar(Tcl_Interp *interp, const char *varName,
+				void *addr, int type);
+/* Slot 188 is reserved */
+/* 189 */
+EXTERN Tcl_Channel	Tcl_MakeFileChannel(void *handle, int mode);
+/* 190 */
+TCL_DEPRECATED("")
+int			Tcl_MakeSafe(Tcl_Interp *interp);
+/* 191 */
+EXTERN Tcl_Channel	Tcl_MakeTcpClientChannel(void *tcpSocket);
+/* 192 */
+EXTERN char *		Tcl_Merge(Tcl_Size argc, const char *const *argv);
+/* 193 */
+EXTERN Tcl_HashEntry *	Tcl_NextHashEntry(Tcl_HashSearch *searchPtr);
+/* 194 */
+EXTERN void		Tcl_NotifyChannel(Tcl_Channel channel, int mask);
+/* 195 */
+EXTERN Tcl_Obj *	Tcl_ObjGetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
+				Tcl_Obj *part2Ptr, int flags);
+/* 196 */
+EXTERN Tcl_Obj *	Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
+				Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr,
+				int flags);
+/* 197 */
+EXTERN Tcl_Channel	Tcl_OpenCommandChannel(Tcl_Interp *interp,
+				Tcl_Size argc, const char **argv, int flags);
+/* 198 */
+EXTERN Tcl_Channel	Tcl_OpenFileChannel(Tcl_Interp *interp,
+				const char *fileName, const char *modeString,
+				int permissions);
+/* 199 */
+EXTERN Tcl_Channel	Tcl_OpenTcpClient(Tcl_Interp *interp, int port,
+				const char *address, const char *myaddr,
+				int myport, int flags);
+/* 200 */
+EXTERN Tcl_Channel	Tcl_OpenTcpServer(Tcl_Interp *interp, int port,
+				const char *host,
+				Tcl_TcpAcceptProc *acceptProc,
+				void *callbackData);
+/* 201 */
+EXTERN void		Tcl_Preserve(void *data);
+/* 202 */
+EXTERN void		Tcl_PrintDouble(Tcl_Interp *interp, double value,
+				char *dst);
+/* 203 */
+EXTERN int		Tcl_PutEnv(const char *assignment);
+/* 204 */
+EXTERN const char *	Tcl_PosixError(Tcl_Interp *interp);
+/* 205 */
+EXTERN void		Tcl_QueueEvent(Tcl_Event *evPtr, int position);
+/* 206 */
+EXTERN Tcl_Size		Tcl_Read(Tcl_Channel chan, char *bufPtr,
+				Tcl_Size toRead);
+/* 207 */
+EXTERN void		Tcl_ReapDetachedProcs(void);
+/* 208 */
+EXTERN int		Tcl_RecordAndEval(Tcl_Interp *interp,
+				const char *cmd, int flags);
+/* 209 */
+EXTERN int		Tcl_RecordAndEvalObj(Tcl_Interp *interp,
+				Tcl_Obj *cmdPtr, int flags);
+/* 210 */
+EXTERN void		Tcl_RegisterChannel(Tcl_Interp *interp,
+				Tcl_Channel chan);
+/* 211 */
+EXTERN void		Tcl_RegisterObjType(const Tcl_ObjType *typePtr);
+/* 212 */
+EXTERN Tcl_RegExp	Tcl_RegExpCompile(Tcl_Interp *interp,
+				const char *pattern);
+/* 213 */
+EXTERN int		Tcl_RegExpExec(Tcl_Interp *interp, Tcl_RegExp regexp,
+				const char *text, const char *start);
+/* 214 */
+EXTERN int		Tcl_RegExpMatch(Tcl_Interp *interp, const char *text,
+				const char *pattern);
+/* 215 */
+EXTERN void		Tcl_RegExpRange(Tcl_RegExp regexp, Tcl_Size index,
+				const char **startPtr, const char **endPtr);
+/* 216 */
+EXTERN void		Tcl_Release(void *clientData);
+/* 217 */
+EXTERN void		Tcl_ResetResult(Tcl_Interp *interp);
+/* 218 */
+EXTERN Tcl_Size		Tcl_ScanElement(const char *src, int *flagPtr);
+/* 219 */
+EXTERN Tcl_Size		Tcl_ScanCountedElement(const char *src,
+				Tcl_Size length, int *flagPtr);
+/* 220 */
+TCL_DEPRECATED("")
+int			Tcl_SeekOld(Tcl_Channel chan, int offset, int mode);
+/* 221 */
+EXTERN int		Tcl_ServiceAll(void);
+/* 222 */
+EXTERN int		Tcl_ServiceEvent(int flags);
+/* 223 */
+EXTERN void		Tcl_SetAssocData(Tcl_Interp *interp,
+				const char *name, Tcl_InterpDeleteProc *proc,
+				void *clientData);
+/* 224 */
+EXTERN void		Tcl_SetChannelBufferSize(Tcl_Channel chan,
+				Tcl_Size sz);
+/* 225 */
+EXTERN int		Tcl_SetChannelOption(Tcl_Interp *interp,
+				Tcl_Channel chan, const char *optionName,
+				const char *newValue);
+/* 226 */
+EXTERN int		Tcl_SetCommandInfo(Tcl_Interp *interp,
+				const char *cmdName,
+				const Tcl_CmdInfo *infoPtr);
+/* 227 */
+EXTERN void		Tcl_SetErrno(int err);
+/* 228 */
+EXTERN void		Tcl_SetErrorCode(Tcl_Interp *interp, ...);
+/* 229 */
+EXTERN void		Tcl_SetMaxBlockTime(const Tcl_Time *timePtr);
+/* 230 */
+EXTERN const char *	Tcl_SetPanicProc(
+				TCL_NORETURN1 Tcl_PanicProc *panicProc);
+/* 231 */
+EXTERN Tcl_Size		Tcl_SetRecursionLimit(Tcl_Interp *interp,
+				Tcl_Size depth);
+/* 232 */
+EXTERN void		Tcl_SetResult(Tcl_Interp *interp, char *result,
+				Tcl_FreeProc *freeProc);
+/* 233 */
+EXTERN int		Tcl_SetServiceMode(int mode);
+/* 234 */
+EXTERN void		Tcl_SetObjErrorCode(Tcl_Interp *interp,
+				Tcl_Obj *errorObjPtr);
+/* 235 */
+EXTERN void		Tcl_SetObjResult(Tcl_Interp *interp,
+				Tcl_Obj *resultObjPtr);
+/* 236 */
+EXTERN void		Tcl_SetStdChannel(Tcl_Channel channel, int type);
+/* 237 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+const char *		Tcl_SetVar(Tcl_Interp *interp, const char *varName,
+				const char *newValue, int flags);
+/* 238 */
+EXTERN const char *	Tcl_SetVar2(Tcl_Interp *interp, const char *part1,
+				const char *part2, const char *newValue,
+				int flags);
+/* 239 */
+EXTERN const char *	Tcl_SignalId(int sig);
+/* 240 */
+EXTERN const char *	Tcl_SignalMsg(int sig);
+/* 241 */
+EXTERN void		Tcl_SourceRCFile(Tcl_Interp *interp);
+/* 242 */
+EXTERN int		Tcl_SplitList(Tcl_Interp *interp,
+				const char *listStr, int *argcPtr,
+				const char ***argvPtr);
+/* 243 */
+EXTERN void		Tcl_SplitPath(const char *path, int *argcPtr,
+				const char ***argvPtr);
+/* 244 */
+EXTERN void		Tcl_StaticLibrary(Tcl_Interp *interp,
+				const char *prefix,
+				Tcl_LibraryInitProc *initProc,
+				Tcl_LibraryInitProc *safeInitProc);
+/* 245 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+int			Tcl_StringMatch(const char *str, const char *pattern);
+/* 246 */
+TCL_DEPRECATED("")
+int			Tcl_TellOld(Tcl_Channel chan);
+/* 247 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+int			Tcl_TraceVar(Tcl_Interp *interp, const char *varName,
+				int flags, Tcl_VarTraceProc *proc,
+				void *clientData);
+/* 248 */
+EXTERN int		Tcl_TraceVar2(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags,
+				Tcl_VarTraceProc *proc, void *clientData);
+/* 249 */
+EXTERN char *		Tcl_TranslateFileName(Tcl_Interp *interp,
+				const char *name, Tcl_DString *bufferPtr);
+/* 250 */
+EXTERN Tcl_Size		Tcl_Ungets(Tcl_Channel chan, const char *str,
+				Tcl_Size len, int atHead);
+/* 251 */
+EXTERN void		Tcl_UnlinkVar(Tcl_Interp *interp,
+				const char *varName);
+/* 252 */
+EXTERN int		Tcl_UnregisterChannel(Tcl_Interp *interp,
+				Tcl_Channel chan);
+/* 253 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+int			Tcl_UnsetVar(Tcl_Interp *interp, const char *varName,
+				int flags);
+/* 254 */
+EXTERN int		Tcl_UnsetVar2(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags);
+/* 255 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+void			Tcl_UntraceVar(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_VarTraceProc *proc, void *clientData);
+/* 256 */
+EXTERN void		Tcl_UntraceVar2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
+				int flags, Tcl_VarTraceProc *proc,
+				void *clientData);
+/* 257 */
+EXTERN void		Tcl_UpdateLinkedVar(Tcl_Interp *interp,
+				const char *varName);
+/* 258 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+int			Tcl_UpVar(Tcl_Interp *interp, const char *frameName,
+				const char *varName, const char *localName,
+				int flags);
+/* 259 */
+EXTERN int		Tcl_UpVar2(Tcl_Interp *interp, const char *frameName,
+				const char *part1, const char *part2,
+				const char *localName, int flags);
+/* 260 */
+EXTERN int		Tcl_VarEval(Tcl_Interp *interp, ...);
+/* 261 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+void *			Tcl_VarTraceInfo(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_VarTraceProc *procPtr,
+				void *prevClientData);
+/* 262 */
+EXTERN void *		Tcl_VarTraceInfo2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
+				int flags, Tcl_VarTraceProc *procPtr,
+				void *prevClientData);
+/* 263 */
+EXTERN Tcl_Size		Tcl_Write(Tcl_Channel chan, const char *s,
+				Tcl_Size slen);
+/* 264 */
+EXTERN void		Tcl_WrongNumArgs(Tcl_Interp *interp, Tcl_Size objc,
+				Tcl_Obj *const objv[], const char *message);
+/* 265 */
+EXTERN int		Tcl_DumpActiveMemory(const char *fileName);
+/* 266 */
+EXTERN void		Tcl_ValidateAllMemory(const char *file, int line);
+/* 267 */
+TCL_DEPRECATED("see TIP #422")
+void			Tcl_AppendResultVA(Tcl_Interp *interp,
+				va_list argList);
+/* 268 */
+TCL_DEPRECATED("see TIP #422")
+void			Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr,
+				va_list argList);
+/* 269 */
+EXTERN char *		Tcl_HashStats(Tcl_HashTable *tablePtr);
+/* 270 */
+EXTERN const char *	Tcl_ParseVar(Tcl_Interp *interp, const char *start,
+				const char **termPtr);
+/* 271 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+const char *		Tcl_PkgPresent(Tcl_Interp *interp, const char *name,
+				const char *version, int exact);
+/* 272 */
+EXTERN const char *	Tcl_PkgPresentEx(Tcl_Interp *interp,
+				const char *name, const char *version,
+				int exact, void *clientDataPtr);
+/* 273 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+int			Tcl_PkgProvide(Tcl_Interp *interp, const char *name,
+				const char *version);
+/* 274 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+const char *		Tcl_PkgRequire(Tcl_Interp *interp, const char *name,
+				const char *version, int exact);
+/* 275 */
+TCL_DEPRECATED("see TIP #422")
+void			Tcl_SetErrorCodeVA(Tcl_Interp *interp,
+				va_list argList);
+/* 276 */
+TCL_DEPRECATED("see TIP #422")
+int			Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList);
+/* 277 */
+EXTERN Tcl_Pid		Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options);
+/* 278 */
+TCL_DEPRECATED("see TIP #422")
+TCL_NORETURN void	Tcl_PanicVA(const char *format, va_list argList);
+/* 279 */
+EXTERN void		Tcl_GetVersion(int *major, int *minor,
+				int *patchLevel, int *type);
+/* 280 */
+EXTERN void		Tcl_InitMemory(Tcl_Interp *interp);
+/* 281 */
+EXTERN Tcl_Channel	Tcl_StackChannel(Tcl_Interp *interp,
+				const Tcl_ChannelType *typePtr,
+				void *instanceData, int mask,
+				Tcl_Channel prevChan);
+/* 282 */
+EXTERN int		Tcl_UnstackChannel(Tcl_Interp *interp,
+				Tcl_Channel chan);
+/* 283 */
+EXTERN Tcl_Channel	Tcl_GetStackedChannel(Tcl_Channel chan);
+/* 284 */
+EXTERN void		Tcl_SetMainLoop(Tcl_MainLoopProc *proc);
+/* Slot 285 is reserved */
+/* 286 */
+EXTERN void		Tcl_AppendObjToObj(Tcl_Obj *objPtr,
+				Tcl_Obj *appendObjPtr);
+/* 287 */
+EXTERN Tcl_Encoding	Tcl_CreateEncoding(const Tcl_EncodingType *typePtr);
+/* 288 */
+EXTERN void		Tcl_CreateThreadExitHandler(Tcl_ExitProc *proc,
+				void *clientData);
+/* 289 */
+EXTERN void		Tcl_DeleteThreadExitHandler(Tcl_ExitProc *proc,
+				void *clientData);
+/* 290 */
+TCL_DEPRECATED("Use Tcl_DiscardInterpState")
+void			Tcl_DiscardResult(Tcl_SavedResult *statePtr);
+/* 291 */
+EXTERN int		Tcl_EvalEx(Tcl_Interp *interp, const char *script,
+				Tcl_Size numBytes, int flags);
+/* 292 */
+EXTERN int		Tcl_EvalObjv(Tcl_Interp *interp, Tcl_Size objc,
+				Tcl_Obj *const objv[], int flags);
+/* 293 */
+EXTERN int		Tcl_EvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags);
+/* 294 */
+EXTERN TCL_NORETURN void Tcl_ExitThread(int status);
+/* 295 */
+EXTERN int		Tcl_ExternalToUtf(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				Tcl_Size srcLen, int flags,
+				Tcl_EncodingState *statePtr, char *dst,
+				Tcl_Size dstLen, int *srcReadPtr,
+				int *dstWrotePtr, int *dstCharsPtr);
+/* 296 */
+EXTERN char *		Tcl_ExternalToUtfDString(Tcl_Encoding encoding,
+				const char *src, Tcl_Size srcLen,
+				Tcl_DString *dsPtr);
+/* 297 */
+EXTERN void		Tcl_FinalizeThread(void);
+/* 298 */
+EXTERN void		Tcl_FinalizeNotifier(void *clientData);
+/* 299 */
+EXTERN void		Tcl_FreeEncoding(Tcl_Encoding encoding);
+/* 300 */
+EXTERN Tcl_ThreadId	Tcl_GetCurrentThread(void);
+/* 301 */
+EXTERN Tcl_Encoding	Tcl_GetEncoding(Tcl_Interp *interp, const char *name);
+/* 302 */
+EXTERN const char *	Tcl_GetEncodingName(Tcl_Encoding encoding);
+/* 303 */
+EXTERN void		Tcl_GetEncodingNames(Tcl_Interp *interp);
+/* 304 */
+EXTERN int		Tcl_GetIndexFromObjStruct(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, const void *tablePtr,
+				Tcl_Size offset, const char *msg, int flags,
+				void *indexPtr);
+/* 305 */
+EXTERN void *		Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr,
+				Tcl_Size size);
+/* 306 */
+EXTERN Tcl_Obj *	Tcl_GetVar2Ex(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags);
+/* 307 */
+EXTERN void *		Tcl_InitNotifier(void);
+/* 308 */
+EXTERN void		Tcl_MutexLock(Tcl_Mutex *mutexPtr);
+/* 309 */
+EXTERN void		Tcl_MutexUnlock(Tcl_Mutex *mutexPtr);
+/* 310 */
+EXTERN void		Tcl_ConditionNotify(Tcl_Condition *condPtr);
+/* 311 */
+EXTERN void		Tcl_ConditionWait(Tcl_Condition *condPtr,
+				Tcl_Mutex *mutexPtr, const Tcl_Time *timePtr);
+/* 312 */
+EXTERN Tcl_Size		Tcl_NumUtfChars(const char *src, Tcl_Size length);
+/* 313 */
+EXTERN Tcl_Size		Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
+				Tcl_Size charsToRead, int appendFlag);
+/* 314 */
+TCL_DEPRECATED("Use Tcl_RestoreInterpState")
+void			Tcl_RestoreResult(Tcl_Interp *interp,
+				Tcl_SavedResult *statePtr);
+/* 315 */
+TCL_DEPRECATED("Use Tcl_SaveInterpState")
+void			Tcl_SaveResult(Tcl_Interp *interp,
+				Tcl_SavedResult *statePtr);
+/* 316 */
+EXTERN int		Tcl_SetSystemEncoding(Tcl_Interp *interp,
+				const char *name);
+/* 317 */
+EXTERN Tcl_Obj *	Tcl_SetVar2Ex(Tcl_Interp *interp, const char *part1,
+				const char *part2, Tcl_Obj *newValuePtr,
+				int flags);
+/* 318 */
+EXTERN void		Tcl_ThreadAlert(Tcl_ThreadId threadId);
+/* 319 */
+EXTERN void		Tcl_ThreadQueueEvent(Tcl_ThreadId threadId,
+				Tcl_Event *evPtr, int position);
+/* 320 */
+EXTERN int		Tcl_UniCharAtIndex(const char *src, Tcl_Size index);
+/* 321 */
+EXTERN int		Tcl_UniCharToLower(int ch);
+/* 322 */
+EXTERN int		Tcl_UniCharToTitle(int ch);
+/* 323 */
+EXTERN int		Tcl_UniCharToUpper(int ch);
+/* 324 */
+EXTERN Tcl_Size		Tcl_UniCharToUtf(int ch, char *buf);
+/* 325 */
+EXTERN const char *	Tcl_UtfAtIndex(const char *src, Tcl_Size index);
+/* 326 */
+EXTERN int		TclUtfCharComplete(const char *src, Tcl_Size length);
+/* 327 */
+EXTERN Tcl_Size		Tcl_UtfBackslash(const char *src, int *readPtr,
+				char *dst);
+/* 328 */
+EXTERN const char *	Tcl_UtfFindFirst(const char *src, int ch);
+/* 329 */
+EXTERN const char *	Tcl_UtfFindLast(const char *src, int ch);
+/* 330 */
+EXTERN const char *	TclUtfNext(const char *src);
+/* 331 */
+EXTERN const char *	TclUtfPrev(const char *src, const char *start);
+/* 332 */
+EXTERN int		Tcl_UtfToExternal(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				Tcl_Size srcLen, int flags,
+				Tcl_EncodingState *statePtr, char *dst,
+				Tcl_Size dstLen, int *srcReadPtr,
+				int *dstWrotePtr, int *dstCharsPtr);
+/* 333 */
+EXTERN char *		Tcl_UtfToExternalDString(Tcl_Encoding encoding,
+				const char *src, Tcl_Size srcLen,
+				Tcl_DString *dsPtr);
+/* 334 */
+EXTERN Tcl_Size		Tcl_UtfToLower(char *src);
+/* 335 */
+EXTERN Tcl_Size		Tcl_UtfToTitle(char *src);
+/* 336 */
+EXTERN Tcl_Size		Tcl_UtfToChar16(const char *src,
+				unsigned short *chPtr);
+/* 337 */
+EXTERN Tcl_Size		Tcl_UtfToUpper(char *src);
+/* 338 */
+EXTERN Tcl_Size		Tcl_WriteChars(Tcl_Channel chan, const char *src,
+				Tcl_Size srcLen);
+/* 339 */
+EXTERN Tcl_Size		Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr);
+/* 340 */
+EXTERN char *		Tcl_GetString(Tcl_Obj *objPtr);
+/* 341 */
+TCL_DEPRECATED("Use Tcl_GetEncodingSearchPath")
+const char *		Tcl_GetDefaultEncodingDir(void);
+/* 342 */
+TCL_DEPRECATED("Use Tcl_SetEncodingSearchPath")
+void			Tcl_SetDefaultEncodingDir(const char *path);
+/* 343 */
+EXTERN void		Tcl_AlertNotifier(void *clientData);
+/* 344 */
+EXTERN void		Tcl_ServiceModeHook(int mode);
+/* 345 */
+EXTERN int		Tcl_UniCharIsAlnum(int ch);
+/* 346 */
+EXTERN int		Tcl_UniCharIsAlpha(int ch);
+/* 347 */
+EXTERN int		Tcl_UniCharIsDigit(int ch);
+/* 348 */
+EXTERN int		Tcl_UniCharIsLower(int ch);
+/* 349 */
+EXTERN int		Tcl_UniCharIsSpace(int ch);
+/* 350 */
+EXTERN int		Tcl_UniCharIsUpper(int ch);
+/* 351 */
+EXTERN int		Tcl_UniCharIsWordChar(int ch);
+/* 352 */
+EXTERN Tcl_Size		Tcl_Char16Len(const unsigned short *uniStr);
+/* 353 */
+TCL_DEPRECATED("Use Tcl_UtfNcmp")
+int			Tcl_UniCharNcmp(const unsigned short *ucs,
+				const unsigned short *uct,
+				unsigned long numChars);
+/* 354 */
+EXTERN char *		Tcl_Char16ToUtfDString(const unsigned short *uniStr,
+				Tcl_Size uniLength, Tcl_DString *dsPtr);
+/* 355 */
+EXTERN unsigned short *	 Tcl_UtfToChar16DString(const char *src,
+				Tcl_Size length, Tcl_DString *dsPtr);
+/* 356 */
+EXTERN Tcl_RegExp	Tcl_GetRegExpFromObj(Tcl_Interp *interp,
+				Tcl_Obj *patObj, int flags);
+/* 357 */
+TCL_DEPRECATED("Use Tcl_EvalTokensStandard")
+Tcl_Obj *		Tcl_EvalTokens(Tcl_Interp *interp,
+				Tcl_Token *tokenPtr, Tcl_Size count);
+/* 358 */
+EXTERN void		Tcl_FreeParse(Tcl_Parse *parsePtr);
+/* 359 */
+EXTERN void		Tcl_LogCommandInfo(Tcl_Interp *interp,
+				const char *script, const char *command,
+				Tcl_Size length);
+/* 360 */
+EXTERN int		Tcl_ParseBraces(Tcl_Interp *interp,
+				const char *start, Tcl_Size numBytes,
+				Tcl_Parse *parsePtr, int append,
+				const char **termPtr);
+/* 361 */
+EXTERN int		Tcl_ParseCommand(Tcl_Interp *interp,
+				const char *start, Tcl_Size numBytes,
+				int nested, Tcl_Parse *parsePtr);
+/* 362 */
+EXTERN int		Tcl_ParseExpr(Tcl_Interp *interp, const char *start,
+				Tcl_Size numBytes, Tcl_Parse *parsePtr);
+/* 363 */
+EXTERN int		Tcl_ParseQuotedString(Tcl_Interp *interp,
+				const char *start, Tcl_Size numBytes,
+				Tcl_Parse *parsePtr, int append,
+				const char **termPtr);
+/* 364 */
+EXTERN int		Tcl_ParseVarName(Tcl_Interp *interp,
+				const char *start, Tcl_Size numBytes,
+				Tcl_Parse *parsePtr, int append);
+/* 365 */
+EXTERN char *		Tcl_GetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr);
+/* 366 */
+EXTERN int		Tcl_Chdir(const char *dirName);
+/* 367 */
+EXTERN int		Tcl_Access(const char *path, int mode);
+/* 368 */
+EXTERN int		Tcl_Stat(const char *path, struct stat *bufPtr);
+/* 369 */
+EXTERN int		Tcl_UtfNcmp(const char *s1, const char *s2,
+				unsigned long n);
+/* 370 */
+EXTERN int		Tcl_UtfNcasecmp(const char *s1, const char *s2,
+				unsigned long n);
+/* 371 */
+EXTERN int		Tcl_StringCaseMatch(const char *str,
+				const char *pattern, int nocase);
+/* 372 */
+EXTERN int		Tcl_UniCharIsControl(int ch);
+/* 373 */
+EXTERN int		Tcl_UniCharIsGraph(int ch);
+/* 374 */
+EXTERN int		Tcl_UniCharIsPrint(int ch);
+/* 375 */
+EXTERN int		Tcl_UniCharIsPunct(int ch);
+/* 376 */
+EXTERN int		Tcl_RegExpExecObj(Tcl_Interp *interp,
+				Tcl_RegExp regexp, Tcl_Obj *textObj,
+				Tcl_Size offset, Tcl_Size nmatches,
+				int flags);
+/* 377 */
+EXTERN void		Tcl_RegExpGetInfo(Tcl_RegExp regexp,
+				Tcl_RegExpInfo *infoPtr);
+/* 378 */
+EXTERN Tcl_Obj *	Tcl_NewUnicodeObj(const unsigned short *unicode,
+				Tcl_Size numChars);
+/* 379 */
+EXTERN void		Tcl_SetUnicodeObj(Tcl_Obj *objPtr,
+				const unsigned short *unicode,
+				Tcl_Size numChars);
+/* 380 */
+EXTERN Tcl_Size		Tcl_GetCharLength(Tcl_Obj *objPtr);
+/* 381 */
+EXTERN int		Tcl_GetUniChar(Tcl_Obj *objPtr, Tcl_Size index);
+/* 382 */
+TCL_DEPRECATED("No longer in use, changed to macro")
+unsigned short *	Tcl_GetUnicode(Tcl_Obj *objPtr);
+/* 383 */
+EXTERN Tcl_Obj *	Tcl_GetRange(Tcl_Obj *objPtr, Tcl_Size first,
+				Tcl_Size last);
+/* 384 */
+EXTERN void		Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr,
+				const unsigned short *unicode,
+				Tcl_Size length);
+/* 385 */
+EXTERN int		Tcl_RegExpMatchObj(Tcl_Interp *interp,
+				Tcl_Obj *textObj, Tcl_Obj *patternObj);
+/* 386 */
+EXTERN void		Tcl_SetNotifier(
+				const Tcl_NotifierProcs *notifierProcPtr);
+/* 387 */
+EXTERN Tcl_Mutex *	Tcl_GetAllocMutex(void);
+/* 388 */
+EXTERN int		Tcl_GetChannelNames(Tcl_Interp *interp);
+/* 389 */
+EXTERN int		Tcl_GetChannelNamesEx(Tcl_Interp *interp,
+				const char *pattern);
+/* 390 */
+EXTERN int		Tcl_ProcObjCmd(void *clientData, Tcl_Interp *interp,
+				Tcl_Size objc, Tcl_Obj *const objv[]);
+/* 391 */
+EXTERN void		Tcl_ConditionFinalize(Tcl_Condition *condPtr);
+/* 392 */
+EXTERN void		Tcl_MutexFinalize(Tcl_Mutex *mutex);
+/* 393 */
+EXTERN int		Tcl_CreateThread(Tcl_ThreadId *idPtr,
+				Tcl_ThreadCreateProc *proc, void *clientData,
+				TCL_HASH_TYPE stackSize, int flags);
+/* 394 */
+EXTERN Tcl_Size		Tcl_ReadRaw(Tcl_Channel chan, char *dst,
+				Tcl_Size bytesToRead);
+/* 395 */
+EXTERN Tcl_Size		Tcl_WriteRaw(Tcl_Channel chan, const char *src,
+				Tcl_Size srcLen);
+/* 396 */
+EXTERN Tcl_Channel	Tcl_GetTopChannel(Tcl_Channel chan);
+/* 397 */
+EXTERN int		Tcl_ChannelBuffered(Tcl_Channel chan);
+/* 398 */
+EXTERN const char *	Tcl_ChannelName(const Tcl_ChannelType *chanTypePtr);
+/* 399 */
+EXTERN Tcl_ChannelTypeVersion Tcl_ChannelVersion(
+				const Tcl_ChannelType *chanTypePtr);
+/* 400 */
+EXTERN Tcl_DriverBlockModeProc * Tcl_ChannelBlockModeProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 401 */
+TCL_DEPRECATED("Use Tcl_ChannelClose2Proc")
+Tcl_DriverCloseProc *	Tcl_ChannelCloseProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 402 */
+EXTERN Tcl_DriverClose2Proc * Tcl_ChannelClose2Proc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 403 */
+EXTERN Tcl_DriverInputProc * Tcl_ChannelInputProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 404 */
+EXTERN Tcl_DriverOutputProc * Tcl_ChannelOutputProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 405 */
+TCL_DEPRECATED("Use Tcl_ChannelWideSeekProc")
+Tcl_DriverSeekProc *	Tcl_ChannelSeekProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 406 */
+EXTERN Tcl_DriverSetOptionProc * Tcl_ChannelSetOptionProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 407 */
+EXTERN Tcl_DriverGetOptionProc * Tcl_ChannelGetOptionProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 408 */
+EXTERN Tcl_DriverWatchProc * Tcl_ChannelWatchProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 409 */
+EXTERN Tcl_DriverGetHandleProc * Tcl_ChannelGetHandleProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 410 */
+EXTERN Tcl_DriverFlushProc * Tcl_ChannelFlushProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 411 */
+EXTERN Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 412 */
+EXTERN int		Tcl_JoinThread(Tcl_ThreadId threadId, int *result);
+/* 413 */
+EXTERN int		Tcl_IsChannelShared(Tcl_Channel channel);
+/* 414 */
+EXTERN int		Tcl_IsChannelRegistered(Tcl_Interp *interp,
+				Tcl_Channel channel);
+/* 415 */
+EXTERN void		Tcl_CutChannel(Tcl_Channel channel);
+/* 416 */
+EXTERN void		Tcl_SpliceChannel(Tcl_Channel channel);
+/* 417 */
+EXTERN void		Tcl_ClearChannelHandlers(Tcl_Channel channel);
+/* 418 */
+EXTERN int		Tcl_IsChannelExisting(const char *channelName);
+/* 419 */
+TCL_DEPRECATED("Use Tcl_UtfNcasecmp")
+int			Tcl_UniCharNcasecmp(const unsigned short *ucs,
+				const unsigned short *uct,
+				unsigned long numChars);
+/* 420 */
+TCL_DEPRECATED("Use Tcl_StringCaseMatch")
+int			Tcl_UniCharCaseMatch(const unsigned short *uniStr,
+				const unsigned short *uniPattern, int nocase);
+/* 421 */
+EXTERN Tcl_HashEntry *	Tcl_FindHashEntry(Tcl_HashTable *tablePtr,
+				const void *key);
+/* 422 */
+EXTERN Tcl_HashEntry *	Tcl_CreateHashEntry(Tcl_HashTable *tablePtr,
+				const void *key, int *newPtr);
+/* 423 */
+EXTERN void		Tcl_InitCustomHashTable(Tcl_HashTable *tablePtr,
+				int keyType, const Tcl_HashKeyType *typePtr);
+/* 424 */
+EXTERN void		Tcl_InitObjHashTable(Tcl_HashTable *tablePtr);
+/* 425 */
+EXTERN void *		Tcl_CommandTraceInfo(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_CommandTraceProc *procPtr,
+				void *prevClientData);
+/* 426 */
+EXTERN int		Tcl_TraceCommand(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_CommandTraceProc *proc, void *clientData);
+/* 427 */
+EXTERN void		Tcl_UntraceCommand(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_CommandTraceProc *proc, void *clientData);
+/* 428 */
+EXTERN char *		Tcl_AttemptAlloc(TCL_HASH_TYPE size);
+/* 429 */
+EXTERN char *		Tcl_AttemptDbCkalloc(TCL_HASH_TYPE size,
+				const char *file, int line);
+/* 430 */
+EXTERN char *		Tcl_AttemptRealloc(char *ptr, TCL_HASH_TYPE size);
+/* 431 */
+EXTERN char *		Tcl_AttemptDbCkrealloc(char *ptr, TCL_HASH_TYPE size,
+				const char *file, int line);
+/* 432 */
+EXTERN int		Tcl_AttemptSetObjLength(Tcl_Obj *objPtr,
+				Tcl_Size length);
+/* 433 */
+EXTERN Tcl_ThreadId	Tcl_GetChannelThread(Tcl_Channel channel);
+/* 434 */
+EXTERN unsigned short *	 Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr,
+				int *lengthPtr);
+/* 435 */
+TCL_DEPRECATED("")
+int			Tcl_GetMathFuncInfo(Tcl_Interp *interp,
+				const char *name, int *numArgsPtr,
+				Tcl_ValueType **argTypesPtr,
+				Tcl_MathProc **procPtr, void **clientDataPtr);
+/* 436 */
+TCL_DEPRECATED("")
+Tcl_Obj *		Tcl_ListMathFuncs(Tcl_Interp *interp,
+				const char *pattern);
+/* 437 */
+EXTERN Tcl_Obj *	Tcl_SubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags);
+/* 438 */
+EXTERN int		Tcl_DetachChannel(Tcl_Interp *interp,
+				Tcl_Channel channel);
+/* 439 */
+EXTERN int		Tcl_IsStandardChannel(Tcl_Channel channel);
+/* 440 */
+EXTERN int		Tcl_FSCopyFile(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr);
+/* 441 */
+EXTERN int		Tcl_FSCopyDirectory(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr);
+/* 442 */
+EXTERN int		Tcl_FSCreateDirectory(Tcl_Obj *pathPtr);
+/* 443 */
+EXTERN int		Tcl_FSDeleteFile(Tcl_Obj *pathPtr);
+/* 444 */
+EXTERN int		Tcl_FSLoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
+				const char *sym1, const char *sym2,
+				Tcl_LibraryInitProc **proc1Ptr,
+				Tcl_LibraryInitProc **proc2Ptr,
+				Tcl_LoadHandle *handlePtr,
+				Tcl_FSUnloadFileProc **unloadProcPtr);
+/* 445 */
+EXTERN int		Tcl_FSMatchInDirectory(Tcl_Interp *interp,
+				Tcl_Obj *result, Tcl_Obj *pathPtr,
+				const char *pattern, Tcl_GlobTypeData *types);
+/* 446 */
+EXTERN Tcl_Obj *	Tcl_FSLink(Tcl_Obj *pathPtr, Tcl_Obj *toPtr,
+				int linkAction);
+/* 447 */
+EXTERN int		Tcl_FSRemoveDirectory(Tcl_Obj *pathPtr,
+				int recursive, Tcl_Obj **errorPtr);
+/* 448 */
+EXTERN int		Tcl_FSRenameFile(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr);
+/* 449 */
+EXTERN int		Tcl_FSLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+/* 450 */
+EXTERN int		Tcl_FSUtime(Tcl_Obj *pathPtr, struct utimbuf *tval);
+/* 451 */
+EXTERN int		Tcl_FSFileAttrsGet(Tcl_Interp *interp, int index,
+				Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef);
+/* 452 */
+EXTERN int		Tcl_FSFileAttrsSet(Tcl_Interp *interp, int index,
+				Tcl_Obj *pathPtr, Tcl_Obj *objPtr);
+/* 453 */
+EXTERN const char *CONST86 * Tcl_FSFileAttrStrings(Tcl_Obj *pathPtr,
+				Tcl_Obj **objPtrRef);
+/* 454 */
+EXTERN int		Tcl_FSStat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+/* 455 */
+EXTERN int		Tcl_FSAccess(Tcl_Obj *pathPtr, int mode);
+/* 456 */
+EXTERN Tcl_Channel	Tcl_FSOpenFileChannel(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr, const char *modeString,
+				int permissions);
+/* 457 */
+EXTERN Tcl_Obj *	Tcl_FSGetCwd(Tcl_Interp *interp);
+/* 458 */
+EXTERN int		Tcl_FSChdir(Tcl_Obj *pathPtr);
+/* 459 */
+EXTERN int		Tcl_FSConvertToPathType(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
+/* 460 */
+EXTERN Tcl_Obj *	Tcl_FSJoinPath(Tcl_Obj *listObj, Tcl_Size elements);
+/* 461 */
+EXTERN Tcl_Obj *	Tcl_FSSplitPath(Tcl_Obj *pathPtr, int *lenPtr);
+/* 462 */
+EXTERN int		Tcl_FSEqualPaths(Tcl_Obj *firstPtr,
+				Tcl_Obj *secondPtr);
+/* 463 */
+EXTERN Tcl_Obj *	Tcl_FSGetNormalizedPath(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
+/* 464 */
+EXTERN Tcl_Obj *	Tcl_FSJoinToPath(Tcl_Obj *pathPtr, Tcl_Size objc,
+				Tcl_Obj *const objv[]);
+/* 465 */
+EXTERN void *		Tcl_FSGetInternalRep(Tcl_Obj *pathPtr,
+				const Tcl_Filesystem *fsPtr);
+/* 466 */
+EXTERN Tcl_Obj *	Tcl_FSGetTranslatedPath(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
+/* 467 */
+EXTERN int		Tcl_FSEvalFile(Tcl_Interp *interp, Tcl_Obj *fileName);
+/* 468 */
+EXTERN Tcl_Obj *	Tcl_FSNewNativePath(
+				const Tcl_Filesystem *fromFilesystem,
+				void *clientData);
+/* 469 */
+EXTERN const void *	Tcl_FSGetNativePath(Tcl_Obj *pathPtr);
+/* 470 */
+EXTERN Tcl_Obj *	Tcl_FSFileSystemInfo(Tcl_Obj *pathPtr);
+/* 471 */
+EXTERN Tcl_Obj *	Tcl_FSPathSeparator(Tcl_Obj *pathPtr);
+/* 472 */
+EXTERN Tcl_Obj *	Tcl_FSListVolumes(void);
+/* 473 */
+EXTERN int		Tcl_FSRegister(void *clientData,
+				const Tcl_Filesystem *fsPtr);
+/* 474 */
+EXTERN int		Tcl_FSUnregister(const Tcl_Filesystem *fsPtr);
+/* 475 */
+EXTERN void *		Tcl_FSData(const Tcl_Filesystem *fsPtr);
+/* 476 */
+EXTERN const char *	Tcl_FSGetTranslatedStringPath(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
+/* 477 */
+EXTERN CONST86 Tcl_Filesystem * Tcl_FSGetFileSystemForPath(Tcl_Obj *pathPtr);
+/* 478 */
+EXTERN Tcl_PathType	Tcl_FSGetPathType(Tcl_Obj *pathPtr);
+/* 479 */
+EXTERN int		Tcl_OutputBuffered(Tcl_Channel chan);
+/* 480 */
+EXTERN void		Tcl_FSMountsChanged(const Tcl_Filesystem *fsPtr);
+/* 481 */
+EXTERN int		Tcl_EvalTokensStandard(Tcl_Interp *interp,
+				Tcl_Token *tokenPtr, Tcl_Size count);
+/* 482 */
+EXTERN void		Tcl_GetTime(Tcl_Time *timeBuf);
+/* 483 */
+EXTERN Tcl_Trace	Tcl_CreateObjTrace(Tcl_Interp *interp,
+				Tcl_Size level, int flags,
+				Tcl_CmdObjTraceProc *objProc,
+				void *clientData,
+				Tcl_CmdObjTraceDeleteProc *delProc);
+/* 484 */
+EXTERN int		Tcl_GetCommandInfoFromToken(Tcl_Command token,
+				Tcl_CmdInfo *infoPtr);
+/* 485 */
+EXTERN int		Tcl_SetCommandInfoFromToken(Tcl_Command token,
+				const Tcl_CmdInfo *infoPtr);
+/* 486 */
+EXTERN Tcl_Obj *	Tcl_DbNewWideIntObj(Tcl_WideInt wideValue,
+				const char *file, int line);
+/* 487 */
+EXTERN int		Tcl_GetWideIntFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_WideInt *widePtr);
+/* 488 */
+EXTERN Tcl_Obj *	Tcl_NewWideIntObj(Tcl_WideInt wideValue);
+/* 489 */
+EXTERN void		Tcl_SetWideIntObj(Tcl_Obj *objPtr,
+				Tcl_WideInt wideValue);
+/* 490 */
+EXTERN Tcl_StatBuf *	Tcl_AllocStatBuf(void);
+/* 491 */
+EXTERN long long	Tcl_Seek(Tcl_Channel chan, long long offset,
+				int mode);
+/* 492 */
+EXTERN long long	Tcl_Tell(Tcl_Channel chan);
+/* 493 */
+EXTERN Tcl_DriverWideSeekProc * Tcl_ChannelWideSeekProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 494 */
+EXTERN int		Tcl_DictObjPut(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+				Tcl_Obj *keyPtr, Tcl_Obj *valuePtr);
+/* 495 */
+EXTERN int		Tcl_DictObjGet(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+				Tcl_Obj *keyPtr, Tcl_Obj **valuePtrPtr);
+/* 496 */
+EXTERN int		Tcl_DictObjRemove(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, Tcl_Obj *keyPtr);
+/* 497 */
+EXTERN int		Tcl_DictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+				int *sizePtr);
+/* 498 */
+EXTERN int		Tcl_DictObjFirst(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, Tcl_DictSearch *searchPtr,
+				Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr,
+				int *donePtr);
+/* 499 */
+EXTERN void		Tcl_DictObjNext(Tcl_DictSearch *searchPtr,
+				Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr,
+				int *donePtr);
+/* 500 */
+EXTERN void		Tcl_DictObjDone(Tcl_DictSearch *searchPtr);
+/* 501 */
+EXTERN int		Tcl_DictObjPutKeyList(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, Tcl_Size keyc,
+				Tcl_Obj *const *keyv, Tcl_Obj *valuePtr);
+/* 502 */
+EXTERN int		Tcl_DictObjRemoveKeyList(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, Tcl_Size keyc,
+				Tcl_Obj *const *keyv);
+/* 503 */
+EXTERN Tcl_Obj *	Tcl_NewDictObj(void);
+/* 504 */
+EXTERN Tcl_Obj *	Tcl_DbNewDictObj(const char *file, int line);
+/* 505 */
+EXTERN void		Tcl_RegisterConfig(Tcl_Interp *interp,
+				const char *pkgName,
+				const Tcl_Config *configuration,
+				const char *valEncoding);
+/* 506 */
+EXTERN Tcl_Namespace *	Tcl_CreateNamespace(Tcl_Interp *interp,
+				const char *name, void *clientData,
+				Tcl_NamespaceDeleteProc *deleteProc);
+/* 507 */
+EXTERN void		Tcl_DeleteNamespace(Tcl_Namespace *nsPtr);
+/* 508 */
+EXTERN int		Tcl_AppendExportList(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, Tcl_Obj *objPtr);
+/* 509 */
+EXTERN int		Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+				const char *pattern, int resetListFirst);
+/* 510 */
+EXTERN int		Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+				const char *pattern, int allowOverwrite);
+/* 511 */
+EXTERN int		Tcl_ForgetImport(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, const char *pattern);
+/* 512 */
+EXTERN Tcl_Namespace *	Tcl_GetCurrentNamespace(Tcl_Interp *interp);
+/* 513 */
+EXTERN Tcl_Namespace *	Tcl_GetGlobalNamespace(Tcl_Interp *interp);
+/* 514 */
+EXTERN Tcl_Namespace *	Tcl_FindNamespace(Tcl_Interp *interp,
+				const char *name,
+				Tcl_Namespace *contextNsPtr, int flags);
+/* 515 */
+EXTERN Tcl_Command	Tcl_FindCommand(Tcl_Interp *interp, const char *name,
+				Tcl_Namespace *contextNsPtr, int flags);
+/* 516 */
+EXTERN Tcl_Command	Tcl_GetCommandFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
+/* 517 */
+EXTERN void		Tcl_GetCommandFullName(Tcl_Interp *interp,
+				Tcl_Command command, Tcl_Obj *objPtr);
+/* 518 */
+EXTERN int		Tcl_FSEvalFileEx(Tcl_Interp *interp,
+				Tcl_Obj *fileName, const char *encodingName);
+/* 519 */
+EXTERN Tcl_ExitProc *	Tcl_SetExitProc(TCL_NORETURN1 Tcl_ExitProc *proc);
+/* 520 */
+EXTERN void		Tcl_LimitAddHandler(Tcl_Interp *interp, int type,
+				Tcl_LimitHandlerProc *handlerProc,
+				void *clientData,
+				Tcl_LimitHandlerDeleteProc *deleteProc);
+/* 521 */
+EXTERN void		Tcl_LimitRemoveHandler(Tcl_Interp *interp, int type,
+				Tcl_LimitHandlerProc *handlerProc,
+				void *clientData);
+/* 522 */
+EXTERN int		Tcl_LimitReady(Tcl_Interp *interp);
+/* 523 */
+EXTERN int		Tcl_LimitCheck(Tcl_Interp *interp);
+/* 524 */
+EXTERN int		Tcl_LimitExceeded(Tcl_Interp *interp);
+/* 525 */
+EXTERN void		Tcl_LimitSetCommands(Tcl_Interp *interp,
+				Tcl_Size commandLimit);
+/* 526 */
+EXTERN void		Tcl_LimitSetTime(Tcl_Interp *interp,
+				Tcl_Time *timeLimitPtr);
+/* 527 */
+EXTERN void		Tcl_LimitSetGranularity(Tcl_Interp *interp, int type,
+				int granularity);
+/* 528 */
+EXTERN int		Tcl_LimitTypeEnabled(Tcl_Interp *interp, int type);
+/* 529 */
+EXTERN int		Tcl_LimitTypeExceeded(Tcl_Interp *interp, int type);
+/* 530 */
+EXTERN void		Tcl_LimitTypeSet(Tcl_Interp *interp, int type);
+/* 531 */
+EXTERN void		Tcl_LimitTypeReset(Tcl_Interp *interp, int type);
+/* 532 */
+EXTERN int		Tcl_LimitGetCommands(Tcl_Interp *interp);
+/* 533 */
+EXTERN void		Tcl_LimitGetTime(Tcl_Interp *interp,
+				Tcl_Time *timeLimitPtr);
+/* 534 */
+EXTERN int		Tcl_LimitGetGranularity(Tcl_Interp *interp, int type);
+/* 535 */
+EXTERN Tcl_InterpState	Tcl_SaveInterpState(Tcl_Interp *interp, int status);
+/* 536 */
+EXTERN int		Tcl_RestoreInterpState(Tcl_Interp *interp,
+				Tcl_InterpState state);
+/* 537 */
+EXTERN void		Tcl_DiscardInterpState(Tcl_InterpState state);
+/* 538 */
+EXTERN int		Tcl_SetReturnOptions(Tcl_Interp *interp,
+				Tcl_Obj *options);
+/* 539 */
+EXTERN Tcl_Obj *	Tcl_GetReturnOptions(Tcl_Interp *interp, int result);
+/* 540 */
+EXTERN int		Tcl_IsEnsemble(Tcl_Command token);
+/* 541 */
+EXTERN Tcl_Command	Tcl_CreateEnsemble(Tcl_Interp *interp,
+				const char *name,
+				Tcl_Namespace *namespacePtr, int flags);
+/* 542 */
+EXTERN Tcl_Command	Tcl_FindEnsemble(Tcl_Interp *interp,
+				Tcl_Obj *cmdNameObj, int flags);
+/* 543 */
+EXTERN int		Tcl_SetEnsembleSubcommandList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *subcmdList);
+/* 544 */
+EXTERN int		Tcl_SetEnsembleMappingDict(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *mapDict);
+/* 545 */
+EXTERN int		Tcl_SetEnsembleUnknownHandler(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *unknownList);
+/* 546 */
+EXTERN int		Tcl_SetEnsembleFlags(Tcl_Interp *interp,
+				Tcl_Command token, int flags);
+/* 547 */
+EXTERN int		Tcl_GetEnsembleSubcommandList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **subcmdListPtr);
+/* 548 */
+EXTERN int		Tcl_GetEnsembleMappingDict(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **mapDictPtr);
+/* 549 */
+EXTERN int		Tcl_GetEnsembleUnknownHandler(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **unknownListPtr);
+/* 550 */
+EXTERN int		Tcl_GetEnsembleFlags(Tcl_Interp *interp,
+				Tcl_Command token, int *flagsPtr);
+/* 551 */
+EXTERN int		Tcl_GetEnsembleNamespace(Tcl_Interp *interp,
+				Tcl_Command token,
+				Tcl_Namespace **namespacePtrPtr);
+/* 552 */
+EXTERN void		Tcl_SetTimeProc(Tcl_GetTimeProc *getProc,
+				Tcl_ScaleTimeProc *scaleProc,
+				void *clientData);
+/* 553 */
+EXTERN void		Tcl_QueryTimeProc(Tcl_GetTimeProc **getProc,
+				Tcl_ScaleTimeProc **scaleProc,
+				void **clientData);
+/* 554 */
+EXTERN Tcl_DriverThreadActionProc * Tcl_ChannelThreadActionProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 555 */
+EXTERN Tcl_Obj *	Tcl_NewBignumObj(void *value);
+/* 556 */
+EXTERN Tcl_Obj *	Tcl_DbNewBignumObj(void *value, const char *file,
+				int line);
+/* 557 */
+EXTERN void		Tcl_SetBignumObj(Tcl_Obj *obj, void *value);
+/* 558 */
+EXTERN int		Tcl_GetBignumFromObj(Tcl_Interp *interp,
+				Tcl_Obj *obj, void *value);
+/* 559 */
+EXTERN int		Tcl_TakeBignumFromObj(Tcl_Interp *interp,
+				Tcl_Obj *obj, void *value);
+/* 560 */
+EXTERN int		Tcl_TruncateChannel(Tcl_Channel chan,
+				long long length);
+/* 561 */
+EXTERN Tcl_DriverTruncateProc * Tcl_ChannelTruncateProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 562 */
+EXTERN void		Tcl_SetChannelErrorInterp(Tcl_Interp *interp,
+				Tcl_Obj *msg);
+/* 563 */
+EXTERN void		Tcl_GetChannelErrorInterp(Tcl_Interp *interp,
+				Tcl_Obj **msg);
+/* 564 */
+EXTERN void		Tcl_SetChannelError(Tcl_Channel chan, Tcl_Obj *msg);
+/* 565 */
+EXTERN void		Tcl_GetChannelError(Tcl_Channel chan, Tcl_Obj **msg);
+/* 566 */
+EXTERN int		Tcl_InitBignumFromDouble(Tcl_Interp *interp,
+				double initval, void *toInit);
+/* 567 */
+EXTERN Tcl_Obj *	Tcl_GetNamespaceUnknownHandler(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr);
+/* 568 */
+EXTERN int		Tcl_SetNamespaceUnknownHandler(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, Tcl_Obj *handlerPtr);
+/* 569 */
+EXTERN int		Tcl_GetEncodingFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_Encoding *encodingPtr);
+/* 570 */
+EXTERN Tcl_Obj *	Tcl_GetEncodingSearchPath(void);
+/* 571 */
+EXTERN int		Tcl_SetEncodingSearchPath(Tcl_Obj *searchPath);
+/* 572 */
+EXTERN const char *	Tcl_GetEncodingNameFromEnvironment(
+				Tcl_DString *bufPtr);
+/* 573 */
+EXTERN int		Tcl_PkgRequireProc(Tcl_Interp *interp,
+				const char *name, Tcl_Size objc,
+				Tcl_Obj *const objv[], void *clientDataPtr);
+/* 574 */
+EXTERN void		Tcl_AppendObjToErrorInfo(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
+/* 575 */
+EXTERN void		Tcl_AppendLimitedToObj(Tcl_Obj *objPtr,
+				const char *bytes, Tcl_Size length,
+				Tcl_Size limit, const char *ellipsis);
+/* 576 */
+EXTERN Tcl_Obj *	Tcl_Format(Tcl_Interp *interp, const char *format,
+				Tcl_Size objc, Tcl_Obj *const objv[]);
+/* 577 */
+EXTERN int		Tcl_AppendFormatToObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, const char *format,
+				Tcl_Size objc, Tcl_Obj *const objv[]);
+/* 578 */
+EXTERN Tcl_Obj *	Tcl_ObjPrintf(const char *format, ...) TCL_FORMAT_PRINTF(1, 2);
+/* 579 */
+EXTERN void		Tcl_AppendPrintfToObj(Tcl_Obj *objPtr,
+				const char *format, ...) TCL_FORMAT_PRINTF(2, 3);
+/* 580 */
+EXTERN int		Tcl_CancelEval(Tcl_Interp *interp,
+				Tcl_Obj *resultObjPtr, void *clientData,
+				int flags);
+/* 581 */
+EXTERN int		Tcl_Canceled(Tcl_Interp *interp, int flags);
+/* 582 */
+EXTERN int		Tcl_CreatePipe(Tcl_Interp *interp,
+				Tcl_Channel *rchan, Tcl_Channel *wchan,
+				int flags);
+/* 583 */
+EXTERN Tcl_Command	Tcl_NRCreateCommand(Tcl_Interp *interp,
+				const char *cmdName, Tcl_ObjCmdProc *proc,
+				Tcl_ObjCmdProc *nreProc, void *clientData,
+				Tcl_CmdDeleteProc *deleteProc);
+/* 584 */
+EXTERN int		Tcl_NREvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags);
+/* 585 */
+EXTERN int		Tcl_NREvalObjv(Tcl_Interp *interp, Tcl_Size objc,
+				Tcl_Obj *const objv[], int flags);
+/* 586 */
+EXTERN int		Tcl_NRCmdSwap(Tcl_Interp *interp, Tcl_Command cmd,
+				Tcl_Size objc, Tcl_Obj *const objv[],
+				int flags);
+/* 587 */
+EXTERN void		Tcl_NRAddCallback(Tcl_Interp *interp,
+				Tcl_NRPostProc *postProcPtr, void *data0,
+				void *data1, void *data2, void *data3);
+/* 588 */
+EXTERN int		Tcl_NRCallObjProc(Tcl_Interp *interp,
+				Tcl_ObjCmdProc *objProc, void *clientData,
+				Tcl_Size objc, Tcl_Obj *const objv[]);
+/* 589 */
+EXTERN unsigned		Tcl_GetFSDeviceFromStat(const Tcl_StatBuf *statPtr);
+/* 590 */
+EXTERN unsigned		Tcl_GetFSInodeFromStat(const Tcl_StatBuf *statPtr);
+/* 591 */
+EXTERN unsigned		Tcl_GetModeFromStat(const Tcl_StatBuf *statPtr);
+/* 592 */
+EXTERN int		Tcl_GetLinkCountFromStat(const Tcl_StatBuf *statPtr);
+/* 593 */
+EXTERN int		Tcl_GetUserIdFromStat(const Tcl_StatBuf *statPtr);
+/* 594 */
+EXTERN int		Tcl_GetGroupIdFromStat(const Tcl_StatBuf *statPtr);
+/* 595 */
+EXTERN int		Tcl_GetDeviceTypeFromStat(const Tcl_StatBuf *statPtr);
+/* 596 */
+EXTERN long long	Tcl_GetAccessTimeFromStat(const Tcl_StatBuf *statPtr);
+/* 597 */
+EXTERN long long	Tcl_GetModificationTimeFromStat(
+				const Tcl_StatBuf *statPtr);
+/* 598 */
+EXTERN long long	Tcl_GetChangeTimeFromStat(const Tcl_StatBuf *statPtr);
+/* 599 */
+EXTERN unsigned long long Tcl_GetSizeFromStat(const Tcl_StatBuf *statPtr);
+/* 600 */
+EXTERN unsigned long long Tcl_GetBlocksFromStat(const Tcl_StatBuf *statPtr);
+/* 601 */
+EXTERN unsigned		Tcl_GetBlockSizeFromStat(const Tcl_StatBuf *statPtr);
+/* 602 */
+EXTERN int		Tcl_SetEnsembleParameterList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *paramList);
+/* 603 */
+EXTERN int		Tcl_GetEnsembleParameterList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **paramListPtr);
+/* 604 */
+EXTERN int		Tcl_ParseArgsObjv(Tcl_Interp *interp,
+				const Tcl_ArgvInfo *argTable, int *objcPtr,
+				Tcl_Obj *const *objv, Tcl_Obj ***remObjv);
+/* 605 */
+EXTERN int		Tcl_GetErrorLine(Tcl_Interp *interp);
+/* 606 */
+EXTERN void		Tcl_SetErrorLine(Tcl_Interp *interp, int lineNum);
+/* 607 */
+EXTERN void		Tcl_TransferResult(Tcl_Interp *sourceInterp,
+				int code, Tcl_Interp *targetInterp);
+/* 608 */
+EXTERN int		Tcl_InterpActive(Tcl_Interp *interp);
+/* 609 */
+EXTERN void		Tcl_BackgroundException(Tcl_Interp *interp, int code);
+/* 610 */
+EXTERN int		Tcl_ZlibDeflate(Tcl_Interp *interp, int format,
+				Tcl_Obj *data, int level,
+				Tcl_Obj *gzipHeaderDictObj);
+/* 611 */
+EXTERN int		Tcl_ZlibInflate(Tcl_Interp *interp, int format,
+				Tcl_Obj *data, Tcl_Size buffersize,
+				Tcl_Obj *gzipHeaderDictObj);
+/* 612 */
+EXTERN unsigned int	Tcl_ZlibCRC32(unsigned int crc,
+				const unsigned char *buf, Tcl_Size len);
+/* 613 */
+EXTERN unsigned int	Tcl_ZlibAdler32(unsigned int adler,
+				const unsigned char *buf, Tcl_Size len);
+/* 614 */
+EXTERN int		Tcl_ZlibStreamInit(Tcl_Interp *interp, int mode,
+				int format, int level, Tcl_Obj *dictObj,
+				Tcl_ZlibStream *zshandle);
+/* 615 */
+EXTERN Tcl_Obj *	Tcl_ZlibStreamGetCommandName(Tcl_ZlibStream zshandle);
+/* 616 */
+EXTERN int		Tcl_ZlibStreamEof(Tcl_ZlibStream zshandle);
+/* 617 */
+EXTERN int		Tcl_ZlibStreamChecksum(Tcl_ZlibStream zshandle);
+/* 618 */
+EXTERN int		Tcl_ZlibStreamPut(Tcl_ZlibStream zshandle,
+				Tcl_Obj *data, int flush);
+/* 619 */
+EXTERN int		Tcl_ZlibStreamGet(Tcl_ZlibStream zshandle,
+				Tcl_Obj *data, Tcl_Size count);
+/* 620 */
+EXTERN int		Tcl_ZlibStreamClose(Tcl_ZlibStream zshandle);
+/* 621 */
+EXTERN int		Tcl_ZlibStreamReset(Tcl_ZlibStream zshandle);
+/* 622 */
+EXTERN void		Tcl_SetStartupScript(Tcl_Obj *path,
+				const char *encoding);
+/* 623 */
+EXTERN Tcl_Obj *	Tcl_GetStartupScript(const char **encodingPtr);
+/* 624 */
+EXTERN int		Tcl_CloseEx(Tcl_Interp *interp, Tcl_Channel chan,
+				int flags);
+/* 625 */
+EXTERN int		Tcl_NRExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				Tcl_Obj *resultPtr);
+/* 626 */
+EXTERN int		Tcl_NRSubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags);
+/* 627 */
+EXTERN int		Tcl_LoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
+				const char *const symv[], int flags,
+				void *procPtrs, Tcl_LoadHandle *handlePtr);
+/* 628 */
+EXTERN void *		Tcl_FindSymbol(Tcl_Interp *interp,
+				Tcl_LoadHandle handle, const char *symbol);
+/* 629 */
+EXTERN int		Tcl_FSUnloadFile(Tcl_Interp *interp,
+				Tcl_LoadHandle handlePtr);
+/* 630 */
+EXTERN void		Tcl_ZlibStreamSetCompressionDictionary(
+				Tcl_ZlibStream zhandle,
+				Tcl_Obj *compressionDictionaryObj);
+/* 631 */
+EXTERN Tcl_Channel	Tcl_OpenTcpServerEx(Tcl_Interp *interp,
+				const char *service, const char *host,
+				unsigned int flags, int backlog,
+				Tcl_TcpAcceptProc *acceptProc,
+				void *callbackData);
+/* 632 */
+EXTERN int		TclZipfs_Mount(Tcl_Interp *interp,
+				const char *zipname, const char *mountPoint,
+				const char *passwd);
+/* 633 */
+EXTERN int		TclZipfs_Unmount(Tcl_Interp *interp,
+				const char *mountPoint);
+/* 634 */
+EXTERN Tcl_Obj *	TclZipfs_TclLibrary(void);
+/* 635 */
+EXTERN int		TclZipfs_MountBuffer(Tcl_Interp *interp,
+				const void *data, size_t datalen,
+				const char *mountPoint, int copy);
+/* 636 */
+EXTERN void		Tcl_FreeInternalRep(Tcl_Obj *objPtr);
+/* 637 */
+EXTERN char *		Tcl_InitStringRep(Tcl_Obj *objPtr, const char *bytes,
+				TCL_HASH_TYPE numBytes);
+/* 638 */
+EXTERN Tcl_ObjInternalRep * Tcl_FetchInternalRep(Tcl_Obj *objPtr,
+				const Tcl_ObjType *typePtr);
+/* 639 */
+EXTERN void		Tcl_StoreInternalRep(Tcl_Obj *objPtr,
+				const Tcl_ObjType *typePtr,
+				const Tcl_ObjInternalRep *irPtr);
+/* 640 */
+EXTERN int		Tcl_HasStringRep(Tcl_Obj *objPtr);
+/* 641 */
+EXTERN void		Tcl_IncrRefCount(Tcl_Obj *objPtr);
+/* 642 */
+EXTERN void		Tcl_DecrRefCount(Tcl_Obj *objPtr);
+/* 643 */
+EXTERN int		Tcl_IsShared(Tcl_Obj *objPtr);
+/* 644 */
+EXTERN int		Tcl_LinkArray(Tcl_Interp *interp,
+				const char *varName, void *addr, int type,
+				Tcl_Size size);
+/* 645 */
+EXTERN int		Tcl_GetIntForIndex(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_Size endValue,
+				Tcl_Size *indexPtr);
+/* 646 */
+EXTERN Tcl_Size		Tcl_UtfToUniChar(const char *src, int *chPtr);
+/* 647 */
+EXTERN char *		Tcl_UniCharToUtfDString(const int *uniStr,
+				Tcl_Size uniLength, Tcl_DString *dsPtr);
+/* 648 */
+EXTERN int *		Tcl_UtfToUniCharDString(const char *src,
+				Tcl_Size length, Tcl_DString *dsPtr);
+/* 649 */
+EXTERN unsigned char *	Tcl_GetBytesFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *numBytesPtr);
+/* Slot 650 is reserved */
+/* Slot 651 is reserved */
+/* Slot 652 is reserved */
+/* Slot 653 is reserved */
+/* 654 */
+EXTERN int		Tcl_UtfCharComplete(const char *src, Tcl_Size length);
+/* 655 */
+EXTERN const char *	Tcl_UtfNext(const char *src);
+/* 656 */
+EXTERN const char *	Tcl_UtfPrev(const char *src, const char *start);
+/* 657 */
+EXTERN int		Tcl_UniCharIsUnicode(int ch);
+/* 658 */
+EXTERN int		Tcl_ExternalToUtfDStringEx(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				Tcl_Size srcLen, int flags,
+				Tcl_DString *dsPtr,
+				Tcl_Size *errorLocationPtr);
+/* 659 */
+EXTERN int		Tcl_UtfToExternalDStringEx(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				Tcl_Size srcLen, int flags,
+				Tcl_DString *dsPtr,
+				Tcl_Size *errorLocationPtr);
+/* 660 */
+EXTERN int		Tcl_AsyncMarkFromSignal(Tcl_AsyncHandler async,
+				int sigNumber);
+/* Slot 661 is reserved */
+/* Slot 662 is reserved */
+/* Slot 663 is reserved */
+/* Slot 664 is reserved */
+/* Slot 665 is reserved */
+/* Slot 666 is reserved */
+/* Slot 667 is reserved */
+/* 668 */
+EXTERN Tcl_Size		Tcl_UniCharLen(const int *uniStr);
+/* 669 */
+EXTERN Tcl_Size		TclNumUtfChars(const char *src, Tcl_Size length);
+/* 670 */
+EXTERN Tcl_Size		TclGetCharLength(Tcl_Obj *objPtr);
+/* 671 */
+EXTERN const char *	TclUtfAtIndex(const char *src, Tcl_Size index);
+/* 672 */
+EXTERN Tcl_Obj *	TclGetRange(Tcl_Obj *objPtr, Tcl_Size first,
+				Tcl_Size last);
+/* 673 */
+EXTERN int		TclGetUniChar(Tcl_Obj *objPtr, Tcl_Size index);
+/* 674 */
+EXTERN int		Tcl_GetBool(Tcl_Interp *interp, const char *src,
+				int flags, char *charPtr);
+/* 675 */
+EXTERN int		Tcl_GetBoolFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int flags, char *charPtr);
+/* Slot 676 is reserved */
+/* Slot 677 is reserved */
+/* Slot 678 is reserved */
+/* Slot 679 is reserved */
+/* 680 */
+EXTERN int		Tcl_GetNumberFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, void **clientDataPtr,
+				int *typePtr);
+/* 681 */
+EXTERN int		Tcl_GetNumber(Tcl_Interp *interp, const char *bytes,
+				Tcl_Size numBytes, void **clientDataPtr,
+				int *typePtr);
+/* 682 */
+EXTERN int		Tcl_RemoveChannelMode(Tcl_Interp *interp,
+				Tcl_Channel chan, int mode);
+/* 683 */
+EXTERN Tcl_Size		Tcl_GetEncodingNulLength(Tcl_Encoding encoding);
+/* 684 */
+EXTERN int		Tcl_GetWideUIntFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr);
+/* 685 */
+EXTERN Tcl_Obj *	Tcl_DStringToObj(Tcl_DString *dsPtr);
+/* Slot 686 is reserved */
+/* Slot 687 is reserved */
+/* 688 */
+EXTERN void		TclUnusedStubEntry(void);
+
+typedef struct {
+    const struct TclPlatStubs *tclPlatStubs;
+    const struct TclIntStubs *tclIntStubs;
+    const struct TclIntPlatStubs *tclIntPlatStubs;
+} TclStubHooks;
+
+typedef struct TclStubs {
+    int magic;
+    const TclStubHooks *hooks;
+
+    int (*tcl_PkgProvideEx) (Tcl_Interp *interp, const char *name, const char *version, const void *clientData); /* 0 */
+    const char * (*tcl_PkgRequireEx) (Tcl_Interp *interp, const char *name, const char *version, int exact, void *clientDataPtr); /* 1 */
+    TCL_NORETURN1 void (*tcl_Panic) (const char *format, ...) TCL_FORMAT_PRINTF(1, 2); /* 2 */
+    char * (*tcl_Alloc) (TCL_HASH_TYPE size); /* 3 */
+    void (*tcl_Free) (char *ptr); /* 4 */
+    char * (*tcl_Realloc) (char *ptr, TCL_HASH_TYPE size); /* 5 */
+    char * (*tcl_DbCkalloc) (TCL_HASH_TYPE size, const char *file, int line); /* 6 */
+    void (*tcl_DbCkfree) (char *ptr, const char *file, int line); /* 7 */
+    char * (*tcl_DbCkrealloc) (char *ptr, TCL_HASH_TYPE size, const char *file, int line); /* 8 */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+    void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, void *clientData); /* 9 */
+#endif /* UNIX */
+#if defined(_WIN32) /* WIN */
+    void (*reserved9)(void);
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+    void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, void *clientData); /* 9 */
+#endif /* MACOSX */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+    void (*tcl_DeleteFileHandler) (int fd); /* 10 */
+#endif /* UNIX */
+#if defined(_WIN32) /* WIN */
+    void (*reserved10)(void);
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+    void (*tcl_DeleteFileHandler) (int fd); /* 10 */
+#endif /* MACOSX */
+    void (*tcl_SetTimer) (const Tcl_Time *timePtr); /* 11 */
+    void (*tcl_Sleep) (int ms); /* 12 */
+    int (*tcl_WaitForEvent) (const Tcl_Time *timePtr); /* 13 */
+    int (*tcl_AppendAllObjTypes) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 14 */
+    void (*tcl_AppendStringsToObj) (Tcl_Obj *objPtr, ...); /* 15 */
+    void (*tcl_AppendToObj) (Tcl_Obj *objPtr, const char *bytes, Tcl_Size length); /* 16 */
+    Tcl_Obj * (*tcl_ConcatObj) (Tcl_Size objc, Tcl_Obj *const objv[]); /* 17 */
+    int (*tcl_ConvertToType) (Tcl_Interp *interp, Tcl_Obj *objPtr, const Tcl_ObjType *typePtr); /* 18 */
+    void (*tcl_DbDecrRefCount) (Tcl_Obj *objPtr, const char *file, int line); /* 19 */
+    void (*tcl_DbIncrRefCount) (Tcl_Obj *objPtr, const char *file, int line); /* 20 */
+    int (*tcl_DbIsShared) (Tcl_Obj *objPtr, const char *file, int line); /* 21 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") Tcl_Obj * (*tcl_DbNewBooleanObj) (int intValue, const char *file, int line); /* 22 */
+    Tcl_Obj * (*tcl_DbNewByteArrayObj) (const unsigned char *bytes, Tcl_Size numBytes, const char *file, int line); /* 23 */
+    Tcl_Obj * (*tcl_DbNewDoubleObj) (double doubleValue, const char *file, int line); /* 24 */
+    Tcl_Obj * (*tcl_DbNewListObj) (Tcl_Size objc, Tcl_Obj *const *objv, const char *file, int line); /* 25 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") Tcl_Obj * (*tcl_DbNewLongObj) (long longValue, const char *file, int line); /* 26 */
+    Tcl_Obj * (*tcl_DbNewObj) (const char *file, int line); /* 27 */
+    Tcl_Obj * (*tcl_DbNewStringObj) (const char *bytes, Tcl_Size length, const char *file, int line); /* 28 */
+    Tcl_Obj * (*tcl_DuplicateObj) (Tcl_Obj *objPtr); /* 29 */
+    void (*tclFreeObj) (Tcl_Obj *objPtr); /* 30 */
+    int (*tcl_GetBoolean) (Tcl_Interp *interp, const char *src, int *intPtr); /* 31 */
+    int (*tcl_GetBooleanFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *intPtr); /* 32 */
+    unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj *objPtr, Tcl_Size *numBytesPtr); /* 33 */
+    int (*tcl_GetDouble) (Tcl_Interp *interp, const char *src, double *doublePtr); /* 34 */
+    int (*tcl_GetDoubleFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, double *doublePtr); /* 35 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") int (*tcl_GetIndexFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, const char *const *tablePtr, const char *msg, int flags, int *indexPtr); /* 36 */
+    int (*tcl_GetInt) (Tcl_Interp *interp, const char *src, int *intPtr); /* 37 */
+    int (*tcl_GetIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *intPtr); /* 38 */
+    int (*tcl_GetLongFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, long *longPtr); /* 39 */
+    CONST86 Tcl_ObjType * (*tcl_GetObjType) (const char *typeName); /* 40 */
+    char * (*tcl_GetStringFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 41 */
+    void (*tcl_InvalidateStringRep) (Tcl_Obj *objPtr); /* 42 */
+    int (*tcl_ListObjAppendList) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Obj *elemListPtr); /* 43 */
+    int (*tcl_ListObjAppendElement) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Obj *objPtr); /* 44 */
+    int (*tcl_ListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, int *objcPtr, Tcl_Obj ***objvPtr); /* 45 */
+    int (*tcl_ListObjIndex) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Size index, Tcl_Obj **objPtrPtr); /* 46 */
+    int (*tcl_ListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, int *lengthPtr); /* 47 */
+    int (*tcl_ListObjReplace) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Size first, Tcl_Size count, Tcl_Size objc, Tcl_Obj *const objv[]); /* 48 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") Tcl_Obj * (*tcl_NewBooleanObj) (int intValue); /* 49 */
+    Tcl_Obj * (*tcl_NewByteArrayObj) (const unsigned char *bytes, Tcl_Size numBytes); /* 50 */
+    Tcl_Obj * (*tcl_NewDoubleObj) (double doubleValue); /* 51 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") Tcl_Obj * (*tcl_NewIntObj) (int intValue); /* 52 */
+    Tcl_Obj * (*tcl_NewListObj) (Tcl_Size objc, Tcl_Obj *const objv[]); /* 53 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") Tcl_Obj * (*tcl_NewLongObj) (long longValue); /* 54 */
+    Tcl_Obj * (*tcl_NewObj) (void); /* 55 */
+    Tcl_Obj * (*tcl_NewStringObj) (const char *bytes, Tcl_Size length); /* 56 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") void (*tcl_SetBooleanObj) (Tcl_Obj *objPtr, int intValue); /* 57 */
+    unsigned char * (*tcl_SetByteArrayLength) (Tcl_Obj *objPtr, Tcl_Size numBytes); /* 58 */
+    void (*tcl_SetByteArrayObj) (Tcl_Obj *objPtr, const unsigned char *bytes, Tcl_Size numBytes); /* 59 */
+    void (*tcl_SetDoubleObj) (Tcl_Obj *objPtr, double doubleValue); /* 60 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") void (*tcl_SetIntObj) (Tcl_Obj *objPtr, int intValue); /* 61 */
+    void (*tcl_SetListObj) (Tcl_Obj *objPtr, Tcl_Size objc, Tcl_Obj *const objv[]); /* 62 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") void (*tcl_SetLongObj) (Tcl_Obj *objPtr, long longValue); /* 63 */
+    void (*tcl_SetObjLength) (Tcl_Obj *objPtr, Tcl_Size length); /* 64 */
+    void (*tcl_SetStringObj) (Tcl_Obj *objPtr, const char *bytes, Tcl_Size length); /* 65 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") void (*tcl_AddErrorInfo) (Tcl_Interp *interp, const char *message); /* 66 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") void (*tcl_AddObjErrorInfo) (Tcl_Interp *interp, const char *message, Tcl_Size length); /* 67 */
+    void (*tcl_AllowExceptions) (Tcl_Interp *interp); /* 68 */
+    void (*tcl_AppendElement) (Tcl_Interp *interp, const char *element); /* 69 */
+    void (*tcl_AppendResult) (Tcl_Interp *interp, ...); /* 70 */
+    Tcl_AsyncHandler (*tcl_AsyncCreate) (Tcl_AsyncProc *proc, void *clientData); /* 71 */
+    void (*tcl_AsyncDelete) (Tcl_AsyncHandler async); /* 72 */
+    int (*tcl_AsyncInvoke) (Tcl_Interp *interp, int code); /* 73 */
+    void (*tcl_AsyncMark) (Tcl_AsyncHandler async); /* 74 */
+    int (*tcl_AsyncReady) (void); /* 75 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") void (*tcl_BackgroundError) (Tcl_Interp *interp); /* 76 */
+    TCL_DEPRECATED_API("Use Tcl_UtfBackslash") char (*tcl_Backslash) (const char *src, int *readPtr); /* 77 */
+    int (*tcl_BadChannelOption) (Tcl_Interp *interp, const char *optionName, const char *optionList); /* 78 */
+    void (*tcl_CallWhenDeleted) (Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, void *clientData); /* 79 */
+    void (*tcl_CancelIdleCall) (Tcl_IdleProc *idleProc, void *clientData); /* 80 */
+    int (*tcl_Close) (Tcl_Interp *interp, Tcl_Channel chan); /* 81 */
+    int (*tcl_CommandComplete) (const char *cmd); /* 82 */
+    char * (*tcl_Concat) (Tcl_Size argc, const char *const *argv); /* 83 */
+    Tcl_Size (*tcl_ConvertElement) (const char *src, char *dst, int flags); /* 84 */
+    Tcl_Size (*tcl_ConvertCountedElement) (const char *src, Tcl_Size length, char *dst, int flags); /* 85 */
+    int (*tcl_CreateAlias) (Tcl_Interp *childInterp, const char *childCmd, Tcl_Interp *target, const char *targetCmd, Tcl_Size argc, const char *const *argv); /* 86 */
+    int (*tcl_CreateAliasObj) (Tcl_Interp *childInterp, const char *childCmd, Tcl_Interp *target, const char *targetCmd, Tcl_Size objc, Tcl_Obj *const objv[]); /* 87 */
+    Tcl_Channel (*tcl_CreateChannel) (const Tcl_ChannelType *typePtr, const char *chanName, void *instanceData, int mask); /* 88 */
+    void (*tcl_CreateChannelHandler) (Tcl_Channel chan, int mask, Tcl_ChannelProc *proc, void *clientData); /* 89 */
+    void (*tcl_CreateCloseHandler) (Tcl_Channel chan, Tcl_CloseProc *proc, void *clientData); /* 90 */
+    Tcl_Command (*tcl_CreateCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_CmdProc *proc, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 91 */
+    void (*tcl_CreateEventSource) (Tcl_EventSetupProc *setupProc, Tcl_EventCheckProc *checkProc, void *clientData); /* 92 */
+    void (*tcl_CreateExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 93 */
+    Tcl_Interp * (*tcl_CreateInterp) (void); /* 94 */
+    TCL_DEPRECATED_API("") void (*tcl_CreateMathFunc) (Tcl_Interp *interp, const char *name, int numArgs, Tcl_ValueType *argTypes, Tcl_MathProc *proc, void *clientData); /* 95 */
+    Tcl_Command (*tcl_CreateObjCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc *proc, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 96 */
+    Tcl_Interp * (*tcl_CreateChild) (Tcl_Interp *interp, const char *name, int isSafe); /* 97 */
+    Tcl_TimerToken (*tcl_CreateTimerHandler) (int milliseconds, Tcl_TimerProc *proc, void *clientData); /* 98 */
+    Tcl_Trace (*tcl_CreateTrace) (Tcl_Interp *interp, Tcl_Size level, Tcl_CmdTraceProc *proc, void *clientData); /* 99 */
+    void (*tcl_DeleteAssocData) (Tcl_Interp *interp, const char *name); /* 100 */
+    void (*tcl_DeleteChannelHandler) (Tcl_Channel chan, Tcl_ChannelProc *proc, void *clientData); /* 101 */
+    void (*tcl_DeleteCloseHandler) (Tcl_Channel chan, Tcl_CloseProc *proc, void *clientData); /* 102 */
+    int (*tcl_DeleteCommand) (Tcl_Interp *interp, const char *cmdName); /* 103 */
+    int (*tcl_DeleteCommandFromToken) (Tcl_Interp *interp, Tcl_Command command); /* 104 */
+    void (*tcl_DeleteEvents) (Tcl_EventDeleteProc *proc, void *clientData); /* 105 */
+    void (*tcl_DeleteEventSource) (Tcl_EventSetupProc *setupProc, Tcl_EventCheckProc *checkProc, void *clientData); /* 106 */
+    void (*tcl_DeleteExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 107 */
+    void (*tcl_DeleteHashEntry) (Tcl_HashEntry *entryPtr); /* 108 */
+    void (*tcl_DeleteHashTable) (Tcl_HashTable *tablePtr); /* 109 */
+    void (*tcl_DeleteInterp) (Tcl_Interp *interp); /* 110 */
+    void (*tcl_DetachPids) (Tcl_Size numPids, Tcl_Pid *pidPtr); /* 111 */
+    void (*tcl_DeleteTimerHandler) (Tcl_TimerToken token); /* 112 */
+    void (*tcl_DeleteTrace) (Tcl_Interp *interp, Tcl_Trace trace); /* 113 */
+    void (*tcl_DontCallWhenDeleted) (Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, void *clientData); /* 114 */
+    int (*tcl_DoOneEvent) (int flags); /* 115 */
+    void (*tcl_DoWhenIdle) (Tcl_IdleProc *proc, void *clientData); /* 116 */
+    char * (*tcl_DStringAppend) (Tcl_DString *dsPtr, const char *bytes, Tcl_Size length); /* 117 */
+    char * (*tcl_DStringAppendElement) (Tcl_DString *dsPtr, const char *element); /* 118 */
+    void (*tcl_DStringEndSublist) (Tcl_DString *dsPtr); /* 119 */
+    void (*tcl_DStringFree) (Tcl_DString *dsPtr); /* 120 */
+    void (*tcl_DStringGetResult) (Tcl_Interp *interp, Tcl_DString *dsPtr); /* 121 */
+    void (*tcl_DStringInit) (Tcl_DString *dsPtr); /* 122 */
+    void (*tcl_DStringResult) (Tcl_Interp *interp, Tcl_DString *dsPtr); /* 123 */
+    void (*tcl_DStringSetLength) (Tcl_DString *dsPtr, Tcl_Size length); /* 124 */
+    void (*tcl_DStringStartSublist) (Tcl_DString *dsPtr); /* 125 */
+    int (*tcl_Eof) (Tcl_Channel chan); /* 126 */
+    const char * (*tcl_ErrnoId) (void); /* 127 */
+    const char * (*tcl_ErrnoMsg) (int err); /* 128 */
+    int (*tcl_Eval) (Tcl_Interp *interp, const char *script); /* 129 */
+    int (*tcl_EvalFile) (Tcl_Interp *interp, const char *fileName); /* 130 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") int (*tcl_EvalObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 131 */
+    void (*tcl_EventuallyFree) (void *clientData, Tcl_FreeProc *freeProc); /* 132 */
+    TCL_NORETURN1 void (*tcl_Exit) (int status); /* 133 */
+    int (*tcl_ExposeCommand) (Tcl_Interp *interp, const char *hiddenCmdToken, const char *cmdName); /* 134 */
+    int (*tcl_ExprBoolean) (Tcl_Interp *interp, const char *expr, int *ptr); /* 135 */
+    int (*tcl_ExprBooleanObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *ptr); /* 136 */
+    int (*tcl_ExprDouble) (Tcl_Interp *interp, const char *expr, double *ptr); /* 137 */
+    int (*tcl_ExprDoubleObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, double *ptr); /* 138 */
+    int (*tcl_ExprLong) (Tcl_Interp *interp, const char *expr, long *ptr); /* 139 */
+    int (*tcl_ExprLongObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, long *ptr); /* 140 */
+    int (*tcl_ExprObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Obj **resultPtrPtr); /* 141 */
+    int (*tcl_ExprString) (Tcl_Interp *interp, const char *expr); /* 142 */
+    void (*tcl_Finalize) (void); /* 143 */
+    TCL_DEPRECATED_API("Don't use this function in a stub-enabled extension") const char * (*tcl_FindExecutable) (const char *argv0); /* 144 */
+    Tcl_HashEntry * (*tcl_FirstHashEntry) (Tcl_HashTable *tablePtr, Tcl_HashSearch *searchPtr); /* 145 */
+    int (*tcl_Flush) (Tcl_Channel chan); /* 146 */
+    TCL_DEPRECATED_API("see TIP #559. Use Tcl_ResetResult") void (*tcl_FreeResult) (Tcl_Interp *interp); /* 147 */
+    int (*tcl_GetAlias) (Tcl_Interp *interp, const char *childCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, int *argcPtr, const char ***argvPtr); /* 148 */
+    int (*tcl_GetAliasObj) (Tcl_Interp *interp, const char *childCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, int *objcPtr, Tcl_Obj ***objv); /* 149 */
+    void * (*tcl_GetAssocData) (Tcl_Interp *interp, const char *name, Tcl_InterpDeleteProc **procPtr); /* 150 */
+    Tcl_Channel (*tcl_GetChannel) (Tcl_Interp *interp, const char *chanName, int *modePtr); /* 151 */
+    Tcl_Size (*tcl_GetChannelBufferSize) (Tcl_Channel chan); /* 152 */
+    int (*tcl_GetChannelHandle) (Tcl_Channel chan, int direction, void **handlePtr); /* 153 */
+    void * (*tcl_GetChannelInstanceData) (Tcl_Channel chan); /* 154 */
+    int (*tcl_GetChannelMode) (Tcl_Channel chan); /* 155 */
+    const char * (*tcl_GetChannelName) (Tcl_Channel chan); /* 156 */
+    int (*tcl_GetChannelOption) (Tcl_Interp *interp, Tcl_Channel chan, const char *optionName, Tcl_DString *dsPtr); /* 157 */
+    CONST86 Tcl_ChannelType * (*tcl_GetChannelType) (Tcl_Channel chan); /* 158 */
+    int (*tcl_GetCommandInfo) (Tcl_Interp *interp, const char *cmdName, Tcl_CmdInfo *infoPtr); /* 159 */
+    const char * (*tcl_GetCommandName) (Tcl_Interp *interp, Tcl_Command command); /* 160 */
+    int (*tcl_GetErrno) (void); /* 161 */
+    const char * (*tcl_GetHostName) (void); /* 162 */
+    int (*tcl_GetInterpPath) (Tcl_Interp *interp, Tcl_Interp *childInterp); /* 163 */
+    Tcl_Interp * (*tcl_GetParent) (Tcl_Interp *interp); /* 164 */
+    const char * (*tcl_GetNameOfExecutable) (void); /* 165 */
+    Tcl_Obj * (*tcl_GetObjResult) (Tcl_Interp *interp); /* 166 */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+    int (*tcl_GetOpenFile) (Tcl_Interp *interp, const char *chanID, int forWriting, int checkUsage, void **filePtr); /* 167 */
+#endif /* UNIX */
+#if defined(_WIN32) /* WIN */
+    void (*reserved167)(void);
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+    int (*tcl_GetOpenFile) (Tcl_Interp *interp, const char *chanID, int forWriting, int checkUsage, void **filePtr); /* 167 */
+#endif /* MACOSX */
+    Tcl_PathType (*tcl_GetPathType) (const char *path); /* 168 */
+    Tcl_Size (*tcl_Gets) (Tcl_Channel chan, Tcl_DString *dsPtr); /* 169 */
+    Tcl_Size (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 170 */
+    int (*tcl_GetServiceMode) (void); /* 171 */
+    Tcl_Interp * (*tcl_GetChild) (Tcl_Interp *interp, const char *name); /* 172 */
+    Tcl_Channel (*tcl_GetStdChannel) (int type); /* 173 */
+    const char * (*tcl_GetStringResult) (Tcl_Interp *interp); /* 174 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") const char * (*tcl_GetVar) (Tcl_Interp *interp, const char *varName, int flags); /* 175 */
+    const char * (*tcl_GetVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags); /* 176 */
+    int (*tcl_GlobalEval) (Tcl_Interp *interp, const char *command); /* 177 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") int (*tcl_GlobalEvalObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 178 */
+    int (*tcl_HideCommand) (Tcl_Interp *interp, const char *cmdName, const char *hiddenCmdToken); /* 179 */
+    int (*tcl_Init) (Tcl_Interp *interp); /* 180 */
+    void (*tcl_InitHashTable) (Tcl_HashTable *tablePtr, int keyType); /* 181 */
+    int (*tcl_InputBlocked) (Tcl_Channel chan); /* 182 */
+    int (*tcl_InputBuffered) (Tcl_Channel chan); /* 183 */
+    int (*tcl_InterpDeleted) (Tcl_Interp *interp); /* 184 */
+    int (*tcl_IsSafe) (Tcl_Interp *interp); /* 185 */
+    char * (*tcl_JoinPath) (Tcl_Size argc, const char *const *argv, Tcl_DString *resultPtr); /* 186 */
+    int (*tcl_LinkVar) (Tcl_Interp *interp, const char *varName, void *addr, int type); /* 187 */
+    void (*reserved188)(void);
+    Tcl_Channel (*tcl_MakeFileChannel) (void *handle, int mode); /* 189 */
+    TCL_DEPRECATED_API("") int (*tcl_MakeSafe) (Tcl_Interp *interp); /* 190 */
+    Tcl_Channel (*tcl_MakeTcpClientChannel) (void *tcpSocket); /* 191 */
+    char * (*tcl_Merge) (Tcl_Size argc, const char *const *argv); /* 192 */
+    Tcl_HashEntry * (*tcl_NextHashEntry) (Tcl_HashSearch *searchPtr); /* 193 */
+    void (*tcl_NotifyChannel) (Tcl_Channel channel, int mask); /* 194 */
+    Tcl_Obj * (*tcl_ObjGetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags); /* 195 */
+    Tcl_Obj * (*tcl_ObjSetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, int flags); /* 196 */
+    Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp *interp, Tcl_Size argc, const char **argv, int flags); /* 197 */
+    Tcl_Channel (*tcl_OpenFileChannel) (Tcl_Interp *interp, const char *fileName, const char *modeString, int permissions); /* 198 */
+    Tcl_Channel (*tcl_OpenTcpClient) (Tcl_Interp *interp, int port, const char *address, const char *myaddr, int myport, int flags); /* 199 */
+    Tcl_Channel (*tcl_OpenTcpServer) (Tcl_Interp *interp, int port, const char *host, Tcl_TcpAcceptProc *acceptProc, void *callbackData); /* 200 */
+    void (*tcl_Preserve) (void *data); /* 201 */
+    void (*tcl_PrintDouble) (Tcl_Interp *interp, double value, char *dst); /* 202 */
+    int (*tcl_PutEnv) (const char *assignment); /* 203 */
+    const char * (*tcl_PosixError) (Tcl_Interp *interp); /* 204 */
+    void (*tcl_QueueEvent) (Tcl_Event *evPtr, int position); /* 205 */
+    Tcl_Size (*tcl_Read) (Tcl_Channel chan, char *bufPtr, Tcl_Size toRead); /* 206 */
+    void (*tcl_ReapDetachedProcs) (void); /* 207 */
+    int (*tcl_RecordAndEval) (Tcl_Interp *interp, const char *cmd, int flags); /* 208 */
+    int (*tcl_RecordAndEvalObj) (Tcl_Interp *interp, Tcl_Obj *cmdPtr, int flags); /* 209 */
+    void (*tcl_RegisterChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 210 */
+    void (*tcl_RegisterObjType) (const Tcl_ObjType *typePtr); /* 211 */
+    Tcl_RegExp (*tcl_RegExpCompile) (Tcl_Interp *interp, const char *pattern); /* 212 */
+    int (*tcl_RegExpExec) (Tcl_Interp *interp, Tcl_RegExp regexp, const char *text, const char *start); /* 213 */
+    int (*tcl_RegExpMatch) (Tcl_Interp *interp, const char *text, const char *pattern); /* 214 */
+    void (*tcl_RegExpRange) (Tcl_RegExp regexp, Tcl_Size index, const char **startPtr, const char **endPtr); /* 215 */
+    void (*tcl_Release) (void *clientData); /* 216 */
+    void (*tcl_ResetResult) (Tcl_Interp *interp); /* 217 */
+    Tcl_Size (*tcl_ScanElement) (const char *src, int *flagPtr); /* 218 */
+    Tcl_Size (*tcl_ScanCountedElement) (const char *src, Tcl_Size length, int *flagPtr); /* 219 */
+    TCL_DEPRECATED_API("") int (*tcl_SeekOld) (Tcl_Channel chan, int offset, int mode); /* 220 */
+    int (*tcl_ServiceAll) (void); /* 221 */
+    int (*tcl_ServiceEvent) (int flags); /* 222 */
+    void (*tcl_SetAssocData) (Tcl_Interp *interp, const char *name, Tcl_InterpDeleteProc *proc, void *clientData); /* 223 */
+    void (*tcl_SetChannelBufferSize) (Tcl_Channel chan, Tcl_Size sz); /* 224 */
+    int (*tcl_SetChannelOption) (Tcl_Interp *interp, Tcl_Channel chan, const char *optionName, const char *newValue); /* 225 */
+    int (*tcl_SetCommandInfo) (Tcl_Interp *interp, const char *cmdName, const Tcl_CmdInfo *infoPtr); /* 226 */
+    void (*tcl_SetErrno) (int err); /* 227 */
+    void (*tcl_SetErrorCode) (Tcl_Interp *interp, ...); /* 228 */
+    void (*tcl_SetMaxBlockTime) (const Tcl_Time *timePtr); /* 229 */
+    TCL_DEPRECATED_API("Don't use this function in a stub-enabled extension") const char * (*tcl_SetPanicProc) (TCL_NORETURN1 Tcl_PanicProc *panicProc); /* 230 */
+    Tcl_Size (*tcl_SetRecursionLimit) (Tcl_Interp *interp, Tcl_Size depth); /* 231 */
+    void (*tcl_SetResult) (Tcl_Interp *interp, char *result, Tcl_FreeProc *freeProc); /* 232 */
+    int (*tcl_SetServiceMode) (int mode); /* 233 */
+    void (*tcl_SetObjErrorCode) (Tcl_Interp *interp, Tcl_Obj *errorObjPtr); /* 234 */
+    void (*tcl_SetObjResult) (Tcl_Interp *interp, Tcl_Obj *resultObjPtr); /* 235 */
+    void (*tcl_SetStdChannel) (Tcl_Channel channel, int type); /* 236 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") const char * (*tcl_SetVar) (Tcl_Interp *interp, const char *varName, const char *newValue, int flags); /* 237 */
+    const char * (*tcl_SetVar2) (Tcl_Interp *interp, const char *part1, const char *part2, const char *newValue, int flags); /* 238 */
+    const char * (*tcl_SignalId) (int sig); /* 239 */
+    const char * (*tcl_SignalMsg) (int sig); /* 240 */
+    void (*tcl_SourceRCFile) (Tcl_Interp *interp); /* 241 */
+    int (*tcl_SplitList) (Tcl_Interp *interp, const char *listStr, int *argcPtr, const char ***argvPtr); /* 242 */
+    void (*tcl_SplitPath) (const char *path, int *argcPtr, const char ***argvPtr); /* 243 */
+    TCL_DEPRECATED_API("Don't use this function in a stub-enabled extension") void (*tcl_StaticLibrary) (Tcl_Interp *interp, const char *prefix, Tcl_LibraryInitProc *initProc, Tcl_LibraryInitProc *safeInitProc); /* 244 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") int (*tcl_StringMatch) (const char *str, const char *pattern); /* 245 */
+    TCL_DEPRECATED_API("") int (*tcl_TellOld) (Tcl_Channel chan); /* 246 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") int (*tcl_TraceVar) (Tcl_Interp *interp, const char *varName, int flags, Tcl_VarTraceProc *proc, void *clientData); /* 247 */
+    int (*tcl_TraceVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *proc, void *clientData); /* 248 */
+    char * (*tcl_TranslateFileName) (Tcl_Interp *interp, const char *name, Tcl_DString *bufferPtr); /* 249 */
+    Tcl_Size (*tcl_Ungets) (Tcl_Channel chan, const char *str, Tcl_Size len, int atHead); /* 250 */
+    void (*tcl_UnlinkVar) (Tcl_Interp *interp, const char *varName); /* 251 */
+    int (*tcl_UnregisterChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 252 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") int (*tcl_UnsetVar) (Tcl_Interp *interp, const char *varName, int flags); /* 253 */
+    int (*tcl_UnsetVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags); /* 254 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") void (*tcl_UntraceVar) (Tcl_Interp *interp, const char *varName, int flags, Tcl_VarTraceProc *proc, void *clientData); /* 255 */
+    void (*tcl_UntraceVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *proc, void *clientData); /* 256 */
+    void (*tcl_UpdateLinkedVar) (Tcl_Interp *interp, const char *varName); /* 257 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") int (*tcl_UpVar) (Tcl_Interp *interp, const char *frameName, const char *varName, const char *localName, int flags); /* 258 */
+    int (*tcl_UpVar2) (Tcl_Interp *interp, const char *frameName, const char *part1, const char *part2, const char *localName, int flags); /* 259 */
+    int (*tcl_VarEval) (Tcl_Interp *interp, ...); /* 260 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") void * (*tcl_VarTraceInfo) (Tcl_Interp *interp, const char *varName, int flags, Tcl_VarTraceProc *procPtr, void *prevClientData); /* 261 */
+    void * (*tcl_VarTraceInfo2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *procPtr, void *prevClientData); /* 262 */
+    Tcl_Size (*tcl_Write) (Tcl_Channel chan, const char *s, Tcl_Size slen); /* 263 */
+    void (*tcl_WrongNumArgs) (Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[], const char *message); /* 264 */
+    int (*tcl_DumpActiveMemory) (const char *fileName); /* 265 */
+    void (*tcl_ValidateAllMemory) (const char *file, int line); /* 266 */
+    TCL_DEPRECATED_API("see TIP #422") void (*tcl_AppendResultVA) (Tcl_Interp *interp, va_list argList); /* 267 */
+    TCL_DEPRECATED_API("see TIP #422") void (*tcl_AppendStringsToObjVA) (Tcl_Obj *objPtr, va_list argList); /* 268 */
+    char * (*tcl_HashStats) (Tcl_HashTable *tablePtr); /* 269 */
+    const char * (*tcl_ParseVar) (Tcl_Interp *interp, const char *start, const char **termPtr); /* 270 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") const char * (*tcl_PkgPresent) (Tcl_Interp *interp, const char *name, const char *version, int exact); /* 271 */
+    const char * (*tcl_PkgPresentEx) (Tcl_Interp *interp, const char *name, const char *version, int exact, void *clientDataPtr); /* 272 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") int (*tcl_PkgProvide) (Tcl_Interp *interp, const char *name, const char *version); /* 273 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") const char * (*tcl_PkgRequire) (Tcl_Interp *interp, const char *name, const char *version, int exact); /* 274 */
+    TCL_DEPRECATED_API("see TIP #422") void (*tcl_SetErrorCodeVA) (Tcl_Interp *interp, va_list argList); /* 275 */
+    TCL_DEPRECATED_API("see TIP #422") int (*tcl_VarEvalVA) (Tcl_Interp *interp, va_list argList); /* 276 */
+    Tcl_Pid (*tcl_WaitPid) (Tcl_Pid pid, int *statPtr, int options); /* 277 */
+    TCL_DEPRECATED_API("see TIP #422") TCL_NORETURN1 void (*tcl_PanicVA) (const char *format, va_list argList); /* 278 */
+    void (*tcl_GetVersion) (int *major, int *minor, int *patchLevel, int *type); /* 279 */
+    void (*tcl_InitMemory) (Tcl_Interp *interp); /* 280 */
+    Tcl_Channel (*tcl_StackChannel) (Tcl_Interp *interp, const Tcl_ChannelType *typePtr, void *instanceData, int mask, Tcl_Channel prevChan); /* 281 */
+    int (*tcl_UnstackChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 282 */
+    Tcl_Channel (*tcl_GetStackedChannel) (Tcl_Channel chan); /* 283 */
+    void (*tcl_SetMainLoop) (Tcl_MainLoopProc *proc); /* 284 */
+    void (*reserved285)(void);
+    void (*tcl_AppendObjToObj) (Tcl_Obj *objPtr, Tcl_Obj *appendObjPtr); /* 286 */
+    Tcl_Encoding (*tcl_CreateEncoding) (const Tcl_EncodingType *typePtr); /* 287 */
+    void (*tcl_CreateThreadExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 288 */
+    void (*tcl_DeleteThreadExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 289 */
+    TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void (*tcl_DiscardResult) (Tcl_SavedResult *statePtr); /* 290 */
+    int (*tcl_EvalEx) (Tcl_Interp *interp, const char *script, Tcl_Size numBytes, int flags); /* 291 */
+    int (*tcl_EvalObjv) (Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[], int flags); /* 292 */
+    int (*tcl_EvalObjEx) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 293 */
+    TCL_NORETURN1 void (*tcl_ExitThread) (int status); /* 294 */
+    int (*tcl_ExternalToUtf) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 295 */
+    char * (*tcl_ExternalToUtfDString) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr); /* 296 */
+    void (*tcl_FinalizeThread) (void); /* 297 */
+    void (*tcl_FinalizeNotifier) (void *clientData); /* 298 */
+    void (*tcl_FreeEncoding) (Tcl_Encoding encoding); /* 299 */
+    Tcl_ThreadId (*tcl_GetCurrentThread) (void); /* 300 */
+    Tcl_Encoding (*tcl_GetEncoding) (Tcl_Interp *interp, const char *name); /* 301 */
+    const char * (*tcl_GetEncodingName) (Tcl_Encoding encoding); /* 302 */
+    void (*tcl_GetEncodingNames) (Tcl_Interp *interp); /* 303 */
+    int (*tcl_GetIndexFromObjStruct) (Tcl_Interp *interp, Tcl_Obj *objPtr, const void *tablePtr, Tcl_Size offset, const char *msg, int flags, void *indexPtr); /* 304 */
+    void * (*tcl_GetThreadData) (Tcl_ThreadDataKey *keyPtr, Tcl_Size size); /* 305 */
+    Tcl_Obj * (*tcl_GetVar2Ex) (Tcl_Interp *interp, const char *part1, const char *part2, int flags); /* 306 */
+    void * (*tcl_InitNotifier) (void); /* 307 */
+    void (*tcl_MutexLock) (Tcl_Mutex *mutexPtr); /* 308 */
+    void (*tcl_MutexUnlock) (Tcl_Mutex *mutexPtr); /* 309 */
+    void (*tcl_ConditionNotify) (Tcl_Condition *condPtr); /* 310 */
+    void (*tcl_ConditionWait) (Tcl_Condition *condPtr, Tcl_Mutex *mutexPtr, const Tcl_Time *timePtr); /* 311 */
+    Tcl_Size (*tcl_NumUtfChars) (const char *src, Tcl_Size length); /* 312 */
+    Tcl_Size (*tcl_ReadChars) (Tcl_Channel channel, Tcl_Obj *objPtr, Tcl_Size charsToRead, int appendFlag); /* 313 */
+    TCL_DEPRECATED_API("Use Tcl_RestoreInterpState") void (*tcl_RestoreResult) (Tcl_Interp *interp, Tcl_SavedResult *statePtr); /* 314 */
+    TCL_DEPRECATED_API("Use Tcl_SaveInterpState") void (*tcl_SaveResult) (Tcl_Interp *interp, Tcl_SavedResult *statePtr); /* 315 */
+    int (*tcl_SetSystemEncoding) (Tcl_Interp *interp, const char *name); /* 316 */
+    Tcl_Obj * (*tcl_SetVar2Ex) (Tcl_Interp *interp, const char *part1, const char *part2, Tcl_Obj *newValuePtr, int flags); /* 317 */
+    void (*tcl_ThreadAlert) (Tcl_ThreadId threadId); /* 318 */
+    void (*tcl_ThreadQueueEvent) (Tcl_ThreadId threadId, Tcl_Event *evPtr, int position); /* 319 */
+    int (*tcl_UniCharAtIndex) (const char *src, Tcl_Size index); /* 320 */
+    int (*tcl_UniCharToLower) (int ch); /* 321 */
+    int (*tcl_UniCharToTitle) (int ch); /* 322 */
+    int (*tcl_UniCharToUpper) (int ch); /* 323 */
+    Tcl_Size (*tcl_UniCharToUtf) (int ch, char *buf); /* 324 */
+    const char * (*tcl_UtfAtIndex) (const char *src, Tcl_Size index); /* 325 */
+    int (*tclUtfCharComplete) (const char *src, Tcl_Size length); /* 326 */
+    Tcl_Size (*tcl_UtfBackslash) (const char *src, int *readPtr, char *dst); /* 327 */
+    const char * (*tcl_UtfFindFirst) (const char *src, int ch); /* 328 */
+    const char * (*tcl_UtfFindLast) (const char *src, int ch); /* 329 */
+    const char * (*tclUtfNext) (const char *src); /* 330 */
+    const char * (*tclUtfPrev) (const char *src, const char *start); /* 331 */
+    int (*tcl_UtfToExternal) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 332 */
+    char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr); /* 333 */
+    Tcl_Size (*tcl_UtfToLower) (char *src); /* 334 */
+    Tcl_Size (*tcl_UtfToTitle) (char *src); /* 335 */
+    Tcl_Size (*tcl_UtfToChar16) (const char *src, unsigned short *chPtr); /* 336 */
+    Tcl_Size (*tcl_UtfToUpper) (char *src); /* 337 */
+    Tcl_Size (*tcl_WriteChars) (Tcl_Channel chan, const char *src, Tcl_Size srcLen); /* 338 */
+    Tcl_Size (*tcl_WriteObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 339 */
+    char * (*tcl_GetString) (Tcl_Obj *objPtr); /* 340 */
+    TCL_DEPRECATED_API("Use Tcl_GetEncodingSearchPath") const char * (*tcl_GetDefaultEncodingDir) (void); /* 341 */
+    TCL_DEPRECATED_API("Use Tcl_SetEncodingSearchPath") void (*tcl_SetDefaultEncodingDir) (const char *path); /* 342 */
+    void (*tcl_AlertNotifier) (void *clientData); /* 343 */
+    void (*tcl_ServiceModeHook) (int mode); /* 344 */
+    int (*tcl_UniCharIsAlnum) (int ch); /* 345 */
+    int (*tcl_UniCharIsAlpha) (int ch); /* 346 */
+    int (*tcl_UniCharIsDigit) (int ch); /* 347 */
+    int (*tcl_UniCharIsLower) (int ch); /* 348 */
+    int (*tcl_UniCharIsSpace) (int ch); /* 349 */
+    int (*tcl_UniCharIsUpper) (int ch); /* 350 */
+    int (*tcl_UniCharIsWordChar) (int ch); /* 351 */
+    Tcl_Size (*tcl_Char16Len) (const unsigned short *uniStr); /* 352 */
+    TCL_DEPRECATED_API("Use Tcl_UtfNcmp") int (*tcl_UniCharNcmp) (const unsigned short *ucs, const unsigned short *uct, unsigned long numChars); /* 353 */
+    char * (*tcl_Char16ToUtfDString) (const unsigned short *uniStr, Tcl_Size uniLength, Tcl_DString *dsPtr); /* 354 */
+    unsigned short * (*tcl_UtfToChar16DString) (const char *src, Tcl_Size length, Tcl_DString *dsPtr); /* 355 */
+    Tcl_RegExp (*tcl_GetRegExpFromObj) (Tcl_Interp *interp, Tcl_Obj *patObj, int flags); /* 356 */
+    TCL_DEPRECATED_API("Use Tcl_EvalTokensStandard") Tcl_Obj * (*tcl_EvalTokens) (Tcl_Interp *interp, Tcl_Token *tokenPtr, Tcl_Size count); /* 357 */
+    void (*tcl_FreeParse) (Tcl_Parse *parsePtr); /* 358 */
+    void (*tcl_LogCommandInfo) (Tcl_Interp *interp, const char *script, const char *command, Tcl_Size length); /* 359 */
+    int (*tcl_ParseBraces) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 360 */
+    int (*tcl_ParseCommand) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, int nested, Tcl_Parse *parsePtr); /* 361 */
+    int (*tcl_ParseExpr) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr); /* 362 */
+    int (*tcl_ParseQuotedString) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 363 */
+    int (*tcl_ParseVarName) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr, int append); /* 364 */
+    char * (*tcl_GetCwd) (Tcl_Interp *interp, Tcl_DString *cwdPtr); /* 365 */
+    int (*tcl_Chdir) (const char *dirName); /* 366 */
+    int (*tcl_Access) (const char *path, int mode); /* 367 */
+    int (*tcl_Stat) (const char *path, struct stat *bufPtr); /* 368 */
+    int (*tcl_UtfNcmp) (const char *s1, const char *s2, unsigned long n); /* 369 */
+    int (*tcl_UtfNcasecmp) (const char *s1, const char *s2, unsigned long n); /* 370 */
+    int (*tcl_StringCaseMatch) (const char *str, const char *pattern, int nocase); /* 371 */
+    int (*tcl_UniCharIsControl) (int ch); /* 372 */
+    int (*tcl_UniCharIsGraph) (int ch); /* 373 */
+    int (*tcl_UniCharIsPrint) (int ch); /* 374 */
+    int (*tcl_UniCharIsPunct) (int ch); /* 375 */
+    int (*tcl_RegExpExecObj) (Tcl_Interp *interp, Tcl_RegExp regexp, Tcl_Obj *textObj, Tcl_Size offset, Tcl_Size nmatches, int flags); /* 376 */
+    void (*tcl_RegExpGetInfo) (Tcl_RegExp regexp, Tcl_RegExpInfo *infoPtr); /* 377 */
+    Tcl_Obj * (*tcl_NewUnicodeObj) (const unsigned short *unicode, Tcl_Size numChars); /* 378 */
+    void (*tcl_SetUnicodeObj) (Tcl_Obj *objPtr, const unsigned short *unicode, Tcl_Size numChars); /* 379 */
+    Tcl_Size (*tcl_GetCharLength) (Tcl_Obj *objPtr); /* 380 */
+    int (*tcl_GetUniChar) (Tcl_Obj *objPtr, Tcl_Size index); /* 381 */
+    TCL_DEPRECATED_API("No longer in use, changed to macro") unsigned short * (*tcl_GetUnicode) (Tcl_Obj *objPtr); /* 382 */
+    Tcl_Obj * (*tcl_GetRange) (Tcl_Obj *objPtr, Tcl_Size first, Tcl_Size last); /* 383 */
+    void (*tcl_AppendUnicodeToObj) (Tcl_Obj *objPtr, const unsigned short *unicode, Tcl_Size length); /* 384 */
+    int (*tcl_RegExpMatchObj) (Tcl_Interp *interp, Tcl_Obj *textObj, Tcl_Obj *patternObj); /* 385 */
+    void (*tcl_SetNotifier) (const Tcl_NotifierProcs *notifierProcPtr); /* 386 */
+    Tcl_Mutex * (*tcl_GetAllocMutex) (void); /* 387 */
+    int (*tcl_GetChannelNames) (Tcl_Interp *interp); /* 388 */
+    int (*tcl_GetChannelNamesEx) (Tcl_Interp *interp, const char *pattern); /* 389 */
+    int (*tcl_ProcObjCmd) (void *clientData, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]); /* 390 */
+    void (*tcl_ConditionFinalize) (Tcl_Condition *condPtr); /* 391 */
+    void (*tcl_MutexFinalize) (Tcl_Mutex *mutex); /* 392 */
+    int (*tcl_CreateThread) (Tcl_ThreadId *idPtr, Tcl_ThreadCreateProc *proc, void *clientData, TCL_HASH_TYPE stackSize, int flags); /* 393 */
+    Tcl_Size (*tcl_ReadRaw) (Tcl_Channel chan, char *dst, Tcl_Size bytesToRead); /* 394 */
+    Tcl_Size (*tcl_WriteRaw) (Tcl_Channel chan, const char *src, Tcl_Size srcLen); /* 395 */
+    Tcl_Channel (*tcl_GetTopChannel) (Tcl_Channel chan); /* 396 */
+    int (*tcl_ChannelBuffered) (Tcl_Channel chan); /* 397 */
+    const char * (*tcl_ChannelName) (const Tcl_ChannelType *chanTypePtr); /* 398 */
+    Tcl_ChannelTypeVersion (*tcl_ChannelVersion) (const Tcl_ChannelType *chanTypePtr); /* 399 */
+    Tcl_DriverBlockModeProc * (*tcl_ChannelBlockModeProc) (const Tcl_ChannelType *chanTypePtr); /* 400 */
+    TCL_DEPRECATED_API("Use Tcl_ChannelClose2Proc") Tcl_DriverCloseProc * (*tcl_ChannelCloseProc) (const Tcl_ChannelType *chanTypePtr); /* 401 */
+    Tcl_DriverClose2Proc * (*tcl_ChannelClose2Proc) (const Tcl_ChannelType *chanTypePtr); /* 402 */
+    Tcl_DriverInputProc * (*tcl_ChannelInputProc) (const Tcl_ChannelType *chanTypePtr); /* 403 */
+    Tcl_DriverOutputProc * (*tcl_ChannelOutputProc) (const Tcl_ChannelType *chanTypePtr); /* 404 */
+    TCL_DEPRECATED_API("Use Tcl_ChannelWideSeekProc") Tcl_DriverSeekProc * (*tcl_ChannelSeekProc) (const Tcl_ChannelType *chanTypePtr); /* 405 */
+    Tcl_DriverSetOptionProc * (*tcl_ChannelSetOptionProc) (const Tcl_ChannelType *chanTypePtr); /* 406 */
+    Tcl_DriverGetOptionProc * (*tcl_ChannelGetOptionProc) (const Tcl_ChannelType *chanTypePtr); /* 407 */
+    Tcl_DriverWatchProc * (*tcl_ChannelWatchProc) (const Tcl_ChannelType *chanTypePtr); /* 408 */
+    Tcl_DriverGetHandleProc * (*tcl_ChannelGetHandleProc) (const Tcl_ChannelType *chanTypePtr); /* 409 */
+    Tcl_DriverFlushProc * (*tcl_ChannelFlushProc) (const Tcl_ChannelType *chanTypePtr); /* 410 */
+    Tcl_DriverHandlerProc * (*tcl_ChannelHandlerProc) (const Tcl_ChannelType *chanTypePtr); /* 411 */
+    int (*tcl_JoinThread) (Tcl_ThreadId threadId, int *result); /* 412 */
+    int (*tcl_IsChannelShared) (Tcl_Channel channel); /* 413 */
+    int (*tcl_IsChannelRegistered) (Tcl_Interp *interp, Tcl_Channel channel); /* 414 */
+    void (*tcl_CutChannel) (Tcl_Channel channel); /* 415 */
+    void (*tcl_SpliceChannel) (Tcl_Channel channel); /* 416 */
+    void (*tcl_ClearChannelHandlers) (Tcl_Channel channel); /* 417 */
+    int (*tcl_IsChannelExisting) (const char *channelName); /* 418 */
+    TCL_DEPRECATED_API("Use Tcl_UtfNcasecmp") int (*tcl_UniCharNcasecmp) (const unsigned short *ucs, const unsigned short *uct, unsigned long numChars); /* 419 */
+    TCL_DEPRECATED_API("Use Tcl_StringCaseMatch") int (*tcl_UniCharCaseMatch) (const unsigned short *uniStr, const unsigned short *uniPattern, int nocase); /* 420 */
+    Tcl_HashEntry * (*tcl_FindHashEntry) (Tcl_HashTable *tablePtr, const void *key); /* 421 */
+    Tcl_HashEntry * (*tcl_CreateHashEntry) (Tcl_HashTable *tablePtr, const void *key, int *newPtr); /* 422 */
+    void (*tcl_InitCustomHashTable) (Tcl_HashTable *tablePtr, int keyType, const Tcl_HashKeyType *typePtr); /* 423 */
+    void (*tcl_InitObjHashTable) (Tcl_HashTable *tablePtr); /* 424 */
+    void * (*tcl_CommandTraceInfo) (Tcl_Interp *interp, const char *varName, int flags, Tcl_CommandTraceProc *procPtr, void *prevClientData); /* 425 */
+    int (*tcl_TraceCommand) (Tcl_Interp *interp, const char *varName, int flags, Tcl_CommandTraceProc *proc, void *clientData); /* 426 */
+    void (*tcl_UntraceCommand) (Tcl_Interp *interp, const char *varName, int flags, Tcl_CommandTraceProc *proc, void *clientData); /* 427 */
+    char * (*tcl_AttemptAlloc) (TCL_HASH_TYPE size); /* 428 */
+    char * (*tcl_AttemptDbCkalloc) (TCL_HASH_TYPE size, const char *file, int line); /* 429 */
+    char * (*tcl_AttemptRealloc) (char *ptr, TCL_HASH_TYPE size); /* 430 */
+    char * (*tcl_AttemptDbCkrealloc) (char *ptr, TCL_HASH_TYPE size, const char *file, int line); /* 431 */
+    int (*tcl_AttemptSetObjLength) (Tcl_Obj *objPtr, Tcl_Size length); /* 432 */
+    Tcl_ThreadId (*tcl_GetChannelThread) (Tcl_Channel channel); /* 433 */
+    unsigned short * (*tcl_GetUnicodeFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 434 */
+    TCL_DEPRECATED_API("") int (*tcl_GetMathFuncInfo) (Tcl_Interp *interp, const char *name, int *numArgsPtr, Tcl_ValueType **argTypesPtr, Tcl_MathProc **procPtr, void **clientDataPtr); /* 435 */
+    TCL_DEPRECATED_API("") Tcl_Obj * (*tcl_ListMathFuncs) (Tcl_Interp *interp, const char *pattern); /* 436 */
+    Tcl_Obj * (*tcl_SubstObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 437 */
+    int (*tcl_DetachChannel) (Tcl_Interp *interp, Tcl_Channel channel); /* 438 */
+    int (*tcl_IsStandardChannel) (Tcl_Channel channel); /* 439 */
+    int (*tcl_FSCopyFile) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr); /* 440 */
+    int (*tcl_FSCopyDirectory) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr); /* 441 */
+    int (*tcl_FSCreateDirectory) (Tcl_Obj *pathPtr); /* 442 */
+    int (*tcl_FSDeleteFile) (Tcl_Obj *pathPtr); /* 443 */
+    int (*tcl_FSLoadFile) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *sym1, const char *sym2, Tcl_LibraryInitProc **proc1Ptr, Tcl_LibraryInitProc **proc2Ptr, Tcl_LoadHandle *handlePtr, Tcl_FSUnloadFileProc **unloadProcPtr); /* 444 */
+    int (*tcl_FSMatchInDirectory) (Tcl_Interp *interp, Tcl_Obj *result, Tcl_Obj *pathPtr, const char *pattern, Tcl_GlobTypeData *types); /* 445 */
+    Tcl_Obj * (*tcl_FSLink) (Tcl_Obj *pathPtr, Tcl_Obj *toPtr, int linkAction); /* 446 */
+    int (*tcl_FSRemoveDirectory) (Tcl_Obj *pathPtr, int recursive, Tcl_Obj **errorPtr); /* 447 */
+    int (*tcl_FSRenameFile) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr); /* 448 */
+    int (*tcl_FSLstat) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf); /* 449 */
+    int (*tcl_FSUtime) (Tcl_Obj *pathPtr, struct utimbuf *tval); /* 450 */
+    int (*tcl_FSFileAttrsGet) (Tcl_Interp *interp, int index, Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef); /* 451 */
+    int (*tcl_FSFileAttrsSet) (Tcl_Interp *interp, int index, Tcl_Obj *pathPtr, Tcl_Obj *objPtr); /* 452 */
+    const char *CONST86 * (*tcl_FSFileAttrStrings) (Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef); /* 453 */
+    int (*tcl_FSStat) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf); /* 454 */
+    int (*tcl_FSAccess) (Tcl_Obj *pathPtr, int mode); /* 455 */
+    Tcl_Channel (*tcl_FSOpenFileChannel) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *modeString, int permissions); /* 456 */
+    Tcl_Obj * (*tcl_FSGetCwd) (Tcl_Interp *interp); /* 457 */
+    int (*tcl_FSChdir) (Tcl_Obj *pathPtr); /* 458 */
+    int (*tcl_FSConvertToPathType) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 459 */
+    Tcl_Obj * (*tcl_FSJoinPath) (Tcl_Obj *listObj, Tcl_Size elements); /* 460 */
+    Tcl_Obj * (*tcl_FSSplitPath) (Tcl_Obj *pathPtr, int *lenPtr); /* 461 */
+    int (*tcl_FSEqualPaths) (Tcl_Obj *firstPtr, Tcl_Obj *secondPtr); /* 462 */
+    Tcl_Obj * (*tcl_FSGetNormalizedPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 463 */
+    Tcl_Obj * (*tcl_FSJoinToPath) (Tcl_Obj *pathPtr, Tcl_Size objc, Tcl_Obj *const objv[]); /* 464 */
+    void * (*tcl_FSGetInternalRep) (Tcl_Obj *pathPtr, const Tcl_Filesystem *fsPtr); /* 465 */
+    Tcl_Obj * (*tcl_FSGetTranslatedPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 466 */
+    int (*tcl_FSEvalFile) (Tcl_Interp *interp, Tcl_Obj *fileName); /* 467 */
+    Tcl_Obj * (*tcl_FSNewNativePath) (const Tcl_Filesystem *fromFilesystem, void *clientData); /* 468 */
+    const void * (*tcl_FSGetNativePath) (Tcl_Obj *pathPtr); /* 469 */
+    Tcl_Obj * (*tcl_FSFileSystemInfo) (Tcl_Obj *pathPtr); /* 470 */
+    Tcl_Obj * (*tcl_FSPathSeparator) (Tcl_Obj *pathPtr); /* 471 */
+    Tcl_Obj * (*tcl_FSListVolumes) (void); /* 472 */
+    int (*tcl_FSRegister) (void *clientData, const Tcl_Filesystem *fsPtr); /* 473 */
+    int (*tcl_FSUnregister) (const Tcl_Filesystem *fsPtr); /* 474 */
+    void * (*tcl_FSData) (const Tcl_Filesystem *fsPtr); /* 475 */
+    const char * (*tcl_FSGetTranslatedStringPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 476 */
+    CONST86 Tcl_Filesystem * (*tcl_FSGetFileSystemForPath) (Tcl_Obj *pathPtr); /* 477 */
+    Tcl_PathType (*tcl_FSGetPathType) (Tcl_Obj *pathPtr); /* 478 */
+    int (*tcl_OutputBuffered) (Tcl_Channel chan); /* 479 */
+    void (*tcl_FSMountsChanged) (const Tcl_Filesystem *fsPtr); /* 480 */
+    int (*tcl_EvalTokensStandard) (Tcl_Interp *interp, Tcl_Token *tokenPtr, Tcl_Size count); /* 481 */
+    void (*tcl_GetTime) (Tcl_Time *timeBuf); /* 482 */
+    Tcl_Trace (*tcl_CreateObjTrace) (Tcl_Interp *interp, Tcl_Size level, int flags, Tcl_CmdObjTraceProc *objProc, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 483 */
+    int (*tcl_GetCommandInfoFromToken) (Tcl_Command token, Tcl_CmdInfo *infoPtr); /* 484 */
+    int (*tcl_SetCommandInfoFromToken) (Tcl_Command token, const Tcl_CmdInfo *infoPtr); /* 485 */
+    Tcl_Obj * (*tcl_DbNewWideIntObj) (Tcl_WideInt wideValue, const char *file, int line); /* 486 */
+    int (*tcl_GetWideIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideInt *widePtr); /* 487 */
+    Tcl_Obj * (*tcl_NewWideIntObj) (Tcl_WideInt wideValue); /* 488 */
+    void (*tcl_SetWideIntObj) (Tcl_Obj *objPtr, Tcl_WideInt wideValue); /* 489 */
+    Tcl_StatBuf * (*tcl_AllocStatBuf) (void); /* 490 */
+    long long (*tcl_Seek) (Tcl_Channel chan, long long offset, int mode); /* 491 */
+    long long (*tcl_Tell) (Tcl_Channel chan); /* 492 */
+    Tcl_DriverWideSeekProc * (*tcl_ChannelWideSeekProc) (const Tcl_ChannelType *chanTypePtr); /* 493 */
+    int (*tcl_DictObjPut) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr, Tcl_Obj *valuePtr); /* 494 */
+    int (*tcl_DictObjGet) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr, Tcl_Obj **valuePtrPtr); /* 495 */
+    int (*tcl_DictObjRemove) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr); /* 496 */
+    int (*tcl_DictObjSize) (Tcl_Interp *interp, Tcl_Obj *dictPtr, int *sizePtr); /* 497 */
+    int (*tcl_DictObjFirst) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_DictSearch *searchPtr, Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr, int *donePtr); /* 498 */
+    void (*tcl_DictObjNext) (Tcl_DictSearch *searchPtr, Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr, int *donePtr); /* 499 */
+    void (*tcl_DictObjDone) (Tcl_DictSearch *searchPtr); /* 500 */
+    int (*tcl_DictObjPutKeyList) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Size keyc, Tcl_Obj *const *keyv, Tcl_Obj *valuePtr); /* 501 */
+    int (*tcl_DictObjRemoveKeyList) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Size keyc, Tcl_Obj *const *keyv); /* 502 */
+    Tcl_Obj * (*tcl_NewDictObj) (void); /* 503 */
+    Tcl_Obj * (*tcl_DbNewDictObj) (const char *file, int line); /* 504 */
+    void (*tcl_RegisterConfig) (Tcl_Interp *interp, const char *pkgName, const Tcl_Config *configuration, const char *valEncoding); /* 505 */
+    Tcl_Namespace * (*tcl_CreateNamespace) (Tcl_Interp *interp, const char *name, void *clientData, Tcl_NamespaceDeleteProc *deleteProc); /* 506 */
+    void (*tcl_DeleteNamespace) (Tcl_Namespace *nsPtr); /* 507 */
+    int (*tcl_AppendExportList) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *objPtr); /* 508 */
+    int (*tcl_Export) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern, int resetListFirst); /* 509 */
+    int (*tcl_Import) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern, int allowOverwrite); /* 510 */
+    int (*tcl_ForgetImport) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern); /* 511 */
+    Tcl_Namespace * (*tcl_GetCurrentNamespace) (Tcl_Interp *interp); /* 512 */
+    Tcl_Namespace * (*tcl_GetGlobalNamespace) (Tcl_Interp *interp); /* 513 */
+    Tcl_Namespace * (*tcl_FindNamespace) (Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags); /* 514 */
+    Tcl_Command (*tcl_FindCommand) (Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags); /* 515 */
+    Tcl_Command (*tcl_GetCommandFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 516 */
+    void (*tcl_GetCommandFullName) (Tcl_Interp *interp, Tcl_Command command, Tcl_Obj *objPtr); /* 517 */
+    int (*tcl_FSEvalFileEx) (Tcl_Interp *interp, Tcl_Obj *fileName, const char *encodingName); /* 518 */
+    TCL_DEPRECATED_API("Don't use this function in a stub-enabled extension") Tcl_ExitProc * (*tcl_SetExitProc) (TCL_NORETURN1 Tcl_ExitProc *proc); /* 519 */
+    void (*tcl_LimitAddHandler) (Tcl_Interp *interp, int type, Tcl_LimitHandlerProc *handlerProc, void *clientData, Tcl_LimitHandlerDeleteProc *deleteProc); /* 520 */
+    void (*tcl_LimitRemoveHandler) (Tcl_Interp *interp, int type, Tcl_LimitHandlerProc *handlerProc, void *clientData); /* 521 */
+    int (*tcl_LimitReady) (Tcl_Interp *interp); /* 522 */
+    int (*tcl_LimitCheck) (Tcl_Interp *interp); /* 523 */
+    int (*tcl_LimitExceeded) (Tcl_Interp *interp); /* 524 */
+    void (*tcl_LimitSetCommands) (Tcl_Interp *interp, Tcl_Size commandLimit); /* 525 */
+    void (*tcl_LimitSetTime) (Tcl_Interp *interp, Tcl_Time *timeLimitPtr); /* 526 */
+    void (*tcl_LimitSetGranularity) (Tcl_Interp *interp, int type, int granularity); /* 527 */
+    int (*tcl_LimitTypeEnabled) (Tcl_Interp *interp, int type); /* 528 */
+    int (*tcl_LimitTypeExceeded) (Tcl_Interp *interp, int type); /* 529 */
+    void (*tcl_LimitTypeSet) (Tcl_Interp *interp, int type); /* 530 */
+    void (*tcl_LimitTypeReset) (Tcl_Interp *interp, int type); /* 531 */
+    int (*tcl_LimitGetCommands) (Tcl_Interp *interp); /* 532 */
+    void (*tcl_LimitGetTime) (Tcl_Interp *interp, Tcl_Time *timeLimitPtr); /* 533 */
+    int (*tcl_LimitGetGranularity) (Tcl_Interp *interp, int type); /* 534 */
+    Tcl_InterpState (*tcl_SaveInterpState) (Tcl_Interp *interp, int status); /* 535 */
+    int (*tcl_RestoreInterpState) (Tcl_Interp *interp, Tcl_InterpState state); /* 536 */
+    void (*tcl_DiscardInterpState) (Tcl_InterpState state); /* 537 */
+    int (*tcl_SetReturnOptions) (Tcl_Interp *interp, Tcl_Obj *options); /* 538 */
+    Tcl_Obj * (*tcl_GetReturnOptions) (Tcl_Interp *interp, int result); /* 539 */
+    int (*tcl_IsEnsemble) (Tcl_Command token); /* 540 */
+    Tcl_Command (*tcl_CreateEnsemble) (Tcl_Interp *interp, const char *name, Tcl_Namespace *namespacePtr, int flags); /* 541 */
+    Tcl_Command (*tcl_FindEnsemble) (Tcl_Interp *interp, Tcl_Obj *cmdNameObj, int flags); /* 542 */
+    int (*tcl_SetEnsembleSubcommandList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *subcmdList); /* 543 */
+    int (*tcl_SetEnsembleMappingDict) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *mapDict); /* 544 */
+    int (*tcl_SetEnsembleUnknownHandler) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *unknownList); /* 545 */
+    int (*tcl_SetEnsembleFlags) (Tcl_Interp *interp, Tcl_Command token, int flags); /* 546 */
+    int (*tcl_GetEnsembleSubcommandList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **subcmdListPtr); /* 547 */
+    int (*tcl_GetEnsembleMappingDict) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **mapDictPtr); /* 548 */
+    int (*tcl_GetEnsembleUnknownHandler) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **unknownListPtr); /* 549 */
+    int (*tcl_GetEnsembleFlags) (Tcl_Interp *interp, Tcl_Command token, int *flagsPtr); /* 550 */
+    int (*tcl_GetEnsembleNamespace) (Tcl_Interp *interp, Tcl_Command token, Tcl_Namespace **namespacePtrPtr); /* 551 */
+    void (*tcl_SetTimeProc) (Tcl_GetTimeProc *getProc, Tcl_ScaleTimeProc *scaleProc, void *clientData); /* 552 */
+    void (*tcl_QueryTimeProc) (Tcl_GetTimeProc **getProc, Tcl_ScaleTimeProc **scaleProc, void **clientData); /* 553 */
+    Tcl_DriverThreadActionProc * (*tcl_ChannelThreadActionProc) (const Tcl_ChannelType *chanTypePtr); /* 554 */
+    Tcl_Obj * (*tcl_NewBignumObj) (void *value); /* 555 */
+    Tcl_Obj * (*tcl_DbNewBignumObj) (void *value, const char *file, int line); /* 556 */
+    void (*tcl_SetBignumObj) (Tcl_Obj *obj, void *value); /* 557 */
+    int (*tcl_GetBignumFromObj) (Tcl_Interp *interp, Tcl_Obj *obj, void *value); /* 558 */
+    int (*tcl_TakeBignumFromObj) (Tcl_Interp *interp, Tcl_Obj *obj, void *value); /* 559 */
+    int (*tcl_TruncateChannel) (Tcl_Channel chan, long long length); /* 560 */
+    Tcl_DriverTruncateProc * (*tcl_ChannelTruncateProc) (const Tcl_ChannelType *chanTypePtr); /* 561 */
+    void (*tcl_SetChannelErrorInterp) (Tcl_Interp *interp, Tcl_Obj *msg); /* 562 */
+    void (*tcl_GetChannelErrorInterp) (Tcl_Interp *interp, Tcl_Obj **msg); /* 563 */
+    void (*tcl_SetChannelError) (Tcl_Channel chan, Tcl_Obj *msg); /* 564 */
+    void (*tcl_GetChannelError) (Tcl_Channel chan, Tcl_Obj **msg); /* 565 */
+    int (*tcl_InitBignumFromDouble) (Tcl_Interp *interp, double initval, void *toInit); /* 566 */
+    Tcl_Obj * (*tcl_GetNamespaceUnknownHandler) (Tcl_Interp *interp, Tcl_Namespace *nsPtr); /* 567 */
+    int (*tcl_SetNamespaceUnknownHandler) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *handlerPtr); /* 568 */
+    int (*tcl_GetEncodingFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Encoding *encodingPtr); /* 569 */
+    Tcl_Obj * (*tcl_GetEncodingSearchPath) (void); /* 570 */
+    int (*tcl_SetEncodingSearchPath) (Tcl_Obj *searchPath); /* 571 */
+    const char * (*tcl_GetEncodingNameFromEnvironment) (Tcl_DString *bufPtr); /* 572 */
+    int (*tcl_PkgRequireProc) (Tcl_Interp *interp, const char *name, Tcl_Size objc, Tcl_Obj *const objv[], void *clientDataPtr); /* 573 */
+    void (*tcl_AppendObjToErrorInfo) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 574 */
+    void (*tcl_AppendLimitedToObj) (Tcl_Obj *objPtr, const char *bytes, Tcl_Size length, Tcl_Size limit, const char *ellipsis); /* 575 */
+    Tcl_Obj * (*tcl_Format) (Tcl_Interp *interp, const char *format, Tcl_Size objc, Tcl_Obj *const objv[]); /* 576 */
+    int (*tcl_AppendFormatToObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, const char *format, Tcl_Size objc, Tcl_Obj *const objv[]); /* 577 */
+    Tcl_Obj * (*tcl_ObjPrintf) (const char *format, ...) TCL_FORMAT_PRINTF(1, 2); /* 578 */
+    void (*tcl_AppendPrintfToObj) (Tcl_Obj *objPtr, const char *format, ...) TCL_FORMAT_PRINTF(2, 3); /* 579 */
+    int (*tcl_CancelEval) (Tcl_Interp *interp, Tcl_Obj *resultObjPtr, void *clientData, int flags); /* 580 */
+    int (*tcl_Canceled) (Tcl_Interp *interp, int flags); /* 581 */
+    int (*tcl_CreatePipe) (Tcl_Interp *interp, Tcl_Channel *rchan, Tcl_Channel *wchan, int flags); /* 582 */
+    Tcl_Command (*tcl_NRCreateCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc *proc, Tcl_ObjCmdProc *nreProc, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 583 */
+    int (*tcl_NREvalObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 584 */
+    int (*tcl_NREvalObjv) (Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[], int flags); /* 585 */
+    int (*tcl_NRCmdSwap) (Tcl_Interp *interp, Tcl_Command cmd, Tcl_Size objc, Tcl_Obj *const objv[], int flags); /* 586 */
+    void (*tcl_NRAddCallback) (Tcl_Interp *interp, Tcl_NRPostProc *postProcPtr, void *data0, void *data1, void *data2, void *data3); /* 587 */
+    int (*tcl_NRCallObjProc) (Tcl_Interp *interp, Tcl_ObjCmdProc *objProc, void *clientData, Tcl_Size objc, Tcl_Obj *const objv[]); /* 588 */
+    unsigned (*tcl_GetFSDeviceFromStat) (const Tcl_StatBuf *statPtr); /* 589 */
+    unsigned (*tcl_GetFSInodeFromStat) (const Tcl_StatBuf *statPtr); /* 590 */
+    unsigned (*tcl_GetModeFromStat) (const Tcl_StatBuf *statPtr); /* 591 */
+    int (*tcl_GetLinkCountFromStat) (const Tcl_StatBuf *statPtr); /* 592 */
+    int (*tcl_GetUserIdFromStat) (const Tcl_StatBuf *statPtr); /* 593 */
+    int (*tcl_GetGroupIdFromStat) (const Tcl_StatBuf *statPtr); /* 594 */
+    int (*tcl_GetDeviceTypeFromStat) (const Tcl_StatBuf *statPtr); /* 595 */
+    long long (*tcl_GetAccessTimeFromStat) (const Tcl_StatBuf *statPtr); /* 596 */
+    long long (*tcl_GetModificationTimeFromStat) (const Tcl_StatBuf *statPtr); /* 597 */
+    long long (*tcl_GetChangeTimeFromStat) (const Tcl_StatBuf *statPtr); /* 598 */
+    unsigned long long (*tcl_GetSizeFromStat) (const Tcl_StatBuf *statPtr); /* 599 */
+    unsigned long long (*tcl_GetBlocksFromStat) (const Tcl_StatBuf *statPtr); /* 600 */
+    unsigned (*tcl_GetBlockSizeFromStat) (const Tcl_StatBuf *statPtr); /* 601 */
+    int (*tcl_SetEnsembleParameterList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *paramList); /* 602 */
+    int (*tcl_GetEnsembleParameterList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **paramListPtr); /* 603 */
+    int (*tcl_ParseArgsObjv) (Tcl_Interp *interp, const Tcl_ArgvInfo *argTable, int *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv); /* 604 */
+    int (*tcl_GetErrorLine) (Tcl_Interp *interp); /* 605 */
+    void (*tcl_SetErrorLine) (Tcl_Interp *interp, int lineNum); /* 606 */
+    void (*tcl_TransferResult) (Tcl_Interp *sourceInterp, int code, Tcl_Interp *targetInterp); /* 607 */
+    int (*tcl_InterpActive) (Tcl_Interp *interp); /* 608 */
+    void (*tcl_BackgroundException) (Tcl_Interp *interp, int code); /* 609 */
+    int (*tcl_ZlibDeflate) (Tcl_Interp *interp, int format, Tcl_Obj *data, int level, Tcl_Obj *gzipHeaderDictObj); /* 610 */
+    int (*tcl_ZlibInflate) (Tcl_Interp *interp, int format, Tcl_Obj *data, Tcl_Size buffersize, Tcl_Obj *gzipHeaderDictObj); /* 611 */
+    unsigned int (*tcl_ZlibCRC32) (unsigned int crc, const unsigned char *buf, Tcl_Size len); /* 612 */
+    unsigned int (*tcl_ZlibAdler32) (unsigned int adler, const unsigned char *buf, Tcl_Size len); /* 613 */
+    int (*tcl_ZlibStreamInit) (Tcl_Interp *interp, int mode, int format, int level, Tcl_Obj *dictObj, Tcl_ZlibStream *zshandle); /* 614 */
+    Tcl_Obj * (*tcl_ZlibStreamGetCommandName) (Tcl_ZlibStream zshandle); /* 615 */
+    int (*tcl_ZlibStreamEof) (Tcl_ZlibStream zshandle); /* 616 */
+    int (*tcl_ZlibStreamChecksum) (Tcl_ZlibStream zshandle); /* 617 */
+    int (*tcl_ZlibStreamPut) (Tcl_ZlibStream zshandle, Tcl_Obj *data, int flush); /* 618 */
+    int (*tcl_ZlibStreamGet) (Tcl_ZlibStream zshandle, Tcl_Obj *data, Tcl_Size count); /* 619 */
+    int (*tcl_ZlibStreamClose) (Tcl_ZlibStream zshandle); /* 620 */
+    int (*tcl_ZlibStreamReset) (Tcl_ZlibStream zshandle); /* 621 */
+    void (*tcl_SetStartupScript) (Tcl_Obj *path, const char *encoding); /* 622 */
+    Tcl_Obj * (*tcl_GetStartupScript) (const char **encodingPtr); /* 623 */
+    int (*tcl_CloseEx) (Tcl_Interp *interp, Tcl_Channel chan, int flags); /* 624 */
+    int (*tcl_NRExprObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Obj *resultPtr); /* 625 */
+    int (*tcl_NRSubstObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 626 */
+    int (*tcl_LoadFile) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *const symv[], int flags, void *procPtrs, Tcl_LoadHandle *handlePtr); /* 627 */
+    void * (*tcl_FindSymbol) (Tcl_Interp *interp, Tcl_LoadHandle handle, const char *symbol); /* 628 */
+    int (*tcl_FSUnloadFile) (Tcl_Interp *interp, Tcl_LoadHandle handlePtr); /* 629 */
+    void (*tcl_ZlibStreamSetCompressionDictionary) (Tcl_ZlibStream zhandle, Tcl_Obj *compressionDictionaryObj); /* 630 */
+    Tcl_Channel (*tcl_OpenTcpServerEx) (Tcl_Interp *interp, const char *service, const char *host, unsigned int flags, int backlog, Tcl_TcpAcceptProc *acceptProc, void *callbackData); /* 631 */
+    int (*tclZipfs_Mount) (Tcl_Interp *interp, const char *zipname, const char *mountPoint, const char *passwd); /* 632 */
+    int (*tclZipfs_Unmount) (Tcl_Interp *interp, const char *mountPoint); /* 633 */
+    Tcl_Obj * (*tclZipfs_TclLibrary) (void); /* 634 */
+    int (*tclZipfs_MountBuffer) (Tcl_Interp *interp, const void *data, size_t datalen, const char *mountPoint, int copy); /* 635 */
+    void (*tcl_FreeInternalRep) (Tcl_Obj *objPtr); /* 636 */
+    char * (*tcl_InitStringRep) (Tcl_Obj *objPtr, const char *bytes, TCL_HASH_TYPE numBytes); /* 637 */
+    Tcl_ObjInternalRep * (*tcl_FetchInternalRep) (Tcl_Obj *objPtr, const Tcl_ObjType *typePtr); /* 638 */
+    void (*tcl_StoreInternalRep) (Tcl_Obj *objPtr, const Tcl_ObjType *typePtr, const Tcl_ObjInternalRep *irPtr); /* 639 */
+    int (*tcl_HasStringRep) (Tcl_Obj *objPtr); /* 640 */
+    void (*tcl_IncrRefCount) (Tcl_Obj *objPtr); /* 641 */
+    void (*tcl_DecrRefCount) (Tcl_Obj *objPtr); /* 642 */
+    int (*tcl_IsShared) (Tcl_Obj *objPtr); /* 643 */
+    int (*tcl_LinkArray) (Tcl_Interp *interp, const char *varName, void *addr, int type, Tcl_Size size); /* 644 */
+    int (*tcl_GetIntForIndex) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Size endValue, Tcl_Size *indexPtr); /* 645 */
+    Tcl_Size (*tcl_UtfToUniChar) (const char *src, int *chPtr); /* 646 */
+    char * (*tcl_UniCharToUtfDString) (const int *uniStr, Tcl_Size uniLength, Tcl_DString *dsPtr); /* 647 */
+    int * (*tcl_UtfToUniCharDString) (const char *src, Tcl_Size length, Tcl_DString *dsPtr); /* 648 */
+    unsigned char * (*tcl_GetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *numBytesPtr); /* 649 */
+    void (*reserved650)(void);
+    void (*reserved651)(void);
+    void (*reserved652)(void);
+    void (*reserved653)(void);
+    int (*tcl_UtfCharComplete) (const char *src, Tcl_Size length); /* 654 */
+    const char * (*tcl_UtfNext) (const char *src); /* 655 */
+    const char * (*tcl_UtfPrev) (const char *src, const char *start); /* 656 */
+    int (*tcl_UniCharIsUnicode) (int ch); /* 657 */
+    int (*tcl_ExternalToUtfDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 658 */
+    int (*tcl_UtfToExternalDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 659 */
+    int (*tcl_AsyncMarkFromSignal) (Tcl_AsyncHandler async, int sigNumber); /* 660 */
+    void (*reserved661)(void);
+    void (*reserved662)(void);
+    void (*reserved663)(void);
+    void (*reserved664)(void);
+    void (*reserved665)(void);
+    void (*reserved666)(void);
+    void (*reserved667)(void);
+    Tcl_Size (*tcl_UniCharLen) (const int *uniStr); /* 668 */
+    Tcl_Size (*tclNumUtfChars) (const char *src, Tcl_Size length); /* 669 */
+    Tcl_Size (*tclGetCharLength) (Tcl_Obj *objPtr); /* 670 */
+    const char * (*tclUtfAtIndex) (const char *src, Tcl_Size index); /* 671 */
+    Tcl_Obj * (*tclGetRange) (Tcl_Obj *objPtr, Tcl_Size first, Tcl_Size last); /* 672 */
+    int (*tclGetUniChar) (Tcl_Obj *objPtr, Tcl_Size index); /* 673 */
+    int (*tcl_GetBool) (Tcl_Interp *interp, const char *src, int flags, char *charPtr); /* 674 */
+    int (*tcl_GetBoolFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, char *charPtr); /* 675 */
+    void (*reserved676)(void);
+    void (*reserved677)(void);
+    void (*reserved678)(void);
+    void (*reserved679)(void);
+    int (*tcl_GetNumberFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, void **clientDataPtr, int *typePtr); /* 680 */
+    int (*tcl_GetNumber) (Tcl_Interp *interp, const char *bytes, Tcl_Size numBytes, void **clientDataPtr, int *typePtr); /* 681 */
+    int (*tcl_RemoveChannelMode) (Tcl_Interp *interp, Tcl_Channel chan, int mode); /* 682 */
+    Tcl_Size (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */
+    int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 684 */
+    Tcl_Obj * (*tcl_DStringToObj) (Tcl_DString *dsPtr); /* 685 */
+    void (*reserved686)(void);
+    void (*reserved687)(void);
+    void (*tclUnusedStubEntry) (void); /* 688 */
+} TclStubs;
+
+extern const TclStubs *tclStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_TCL_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+#define Tcl_PkgProvideEx \
+	(tclStubsPtr->tcl_PkgProvideEx) /* 0 */
+#define Tcl_PkgRequireEx \
+	(tclStubsPtr->tcl_PkgRequireEx) /* 1 */
+#define Tcl_Panic \
+	(tclStubsPtr->tcl_Panic) /* 2 */
+#define Tcl_Alloc \
+	(tclStubsPtr->tcl_Alloc) /* 3 */
+#define Tcl_Free \
+	(tclStubsPtr->tcl_Free) /* 4 */
+#define Tcl_Realloc \
+	(tclStubsPtr->tcl_Realloc) /* 5 */
+#define Tcl_DbCkalloc \
+	(tclStubsPtr->tcl_DbCkalloc) /* 6 */
+#define Tcl_DbCkfree \
+	(tclStubsPtr->tcl_DbCkfree) /* 7 */
+#define Tcl_DbCkrealloc \
+	(tclStubsPtr->tcl_DbCkrealloc) /* 8 */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+#define Tcl_CreateFileHandler \
+	(tclStubsPtr->tcl_CreateFileHandler) /* 9 */
+#endif /* UNIX */
+#ifdef MAC_OSX_TCL /* MACOSX */
+#define Tcl_CreateFileHandler \
+	(tclStubsPtr->tcl_CreateFileHandler) /* 9 */
+#endif /* MACOSX */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+#define Tcl_DeleteFileHandler \
+	(tclStubsPtr->tcl_DeleteFileHandler) /* 10 */
+#endif /* UNIX */
+#ifdef MAC_OSX_TCL /* MACOSX */
+#define Tcl_DeleteFileHandler \
+	(tclStubsPtr->tcl_DeleteFileHandler) /* 10 */
+#endif /* MACOSX */
+#define Tcl_SetTimer \
+	(tclStubsPtr->tcl_SetTimer) /* 11 */
+#define Tcl_Sleep \
+	(tclStubsPtr->tcl_Sleep) /* 12 */
+#define Tcl_WaitForEvent \
+	(tclStubsPtr->tcl_WaitForEvent) /* 13 */
+#define Tcl_AppendAllObjTypes \
+	(tclStubsPtr->tcl_AppendAllObjTypes) /* 14 */
+#define Tcl_AppendStringsToObj \
+	(tclStubsPtr->tcl_AppendStringsToObj) /* 15 */
+#define Tcl_AppendToObj \
+	(tclStubsPtr->tcl_AppendToObj) /* 16 */
+#define Tcl_ConcatObj \
+	(tclStubsPtr->tcl_ConcatObj) /* 17 */
+#define Tcl_ConvertToType \
+	(tclStubsPtr->tcl_ConvertToType) /* 18 */
+#define Tcl_DbDecrRefCount \
+	(tclStubsPtr->tcl_DbDecrRefCount) /* 19 */
+#define Tcl_DbIncrRefCount \
+	(tclStubsPtr->tcl_DbIncrRefCount) /* 20 */
+#define Tcl_DbIsShared \
+	(tclStubsPtr->tcl_DbIsShared) /* 21 */
+#define Tcl_DbNewBooleanObj \
+	(tclStubsPtr->tcl_DbNewBooleanObj) /* 22 */
+#define Tcl_DbNewByteArrayObj \
+	(tclStubsPtr->tcl_DbNewByteArrayObj) /* 23 */
+#define Tcl_DbNewDoubleObj \
+	(tclStubsPtr->tcl_DbNewDoubleObj) /* 24 */
+#define Tcl_DbNewListObj \
+	(tclStubsPtr->tcl_DbNewListObj) /* 25 */
+#define Tcl_DbNewLongObj \
+	(tclStubsPtr->tcl_DbNewLongObj) /* 26 */
+#define Tcl_DbNewObj \
+	(tclStubsPtr->tcl_DbNewObj) /* 27 */
+#define Tcl_DbNewStringObj \
+	(tclStubsPtr->tcl_DbNewStringObj) /* 28 */
+#define Tcl_DuplicateObj \
+	(tclStubsPtr->tcl_DuplicateObj) /* 29 */
+#define TclFreeObj \
+	(tclStubsPtr->tclFreeObj) /* 30 */
+#define Tcl_GetBoolean \
+	(tclStubsPtr->tcl_GetBoolean) /* 31 */
+#define Tcl_GetBooleanFromObj \
+	(tclStubsPtr->tcl_GetBooleanFromObj) /* 32 */
+#define Tcl_GetByteArrayFromObj \
+	(tclStubsPtr->tcl_GetByteArrayFromObj) /* 33 */
+#define Tcl_GetDouble \
+	(tclStubsPtr->tcl_GetDouble) /* 34 */
+#define Tcl_GetDoubleFromObj \
+	(tclStubsPtr->tcl_GetDoubleFromObj) /* 35 */
+#define Tcl_GetIndexFromObj \
+	(tclStubsPtr->tcl_GetIndexFromObj) /* 36 */
+#define Tcl_GetInt \
+	(tclStubsPtr->tcl_GetInt) /* 37 */
+#define Tcl_GetIntFromObj \
+	(tclStubsPtr->tcl_GetIntFromObj) /* 38 */
+#define Tcl_GetLongFromObj \
+	(tclStubsPtr->tcl_GetLongFromObj) /* 39 */
+#define Tcl_GetObjType \
+	(tclStubsPtr->tcl_GetObjType) /* 40 */
+#define Tcl_GetStringFromObj \
+	(tclStubsPtr->tcl_GetStringFromObj) /* 41 */
+#define Tcl_InvalidateStringRep \
+	(tclStubsPtr->tcl_InvalidateStringRep) /* 42 */
+#define Tcl_ListObjAppendList \
+	(tclStubsPtr->tcl_ListObjAppendList) /* 43 */
+#define Tcl_ListObjAppendElement \
+	(tclStubsPtr->tcl_ListObjAppendElement) /* 44 */
+#define Tcl_ListObjGetElements \
+	(tclStubsPtr->tcl_ListObjGetElements) /* 45 */
+#define Tcl_ListObjIndex \
+	(tclStubsPtr->tcl_ListObjIndex) /* 46 */
+#define Tcl_ListObjLength \
+	(tclStubsPtr->tcl_ListObjLength) /* 47 */
+#define Tcl_ListObjReplace \
+	(tclStubsPtr->tcl_ListObjReplace) /* 48 */
+#define Tcl_NewBooleanObj \
+	(tclStubsPtr->tcl_NewBooleanObj) /* 49 */
+#define Tcl_NewByteArrayObj \
+	(tclStubsPtr->tcl_NewByteArrayObj) /* 50 */
+#define Tcl_NewDoubleObj \
+	(tclStubsPtr->tcl_NewDoubleObj) /* 51 */
+#define Tcl_NewIntObj \
+	(tclStubsPtr->tcl_NewIntObj) /* 52 */
+#define Tcl_NewListObj \
+	(tclStubsPtr->tcl_NewListObj) /* 53 */
+#define Tcl_NewLongObj \
+	(tclStubsPtr->tcl_NewLongObj) /* 54 */
+#define Tcl_NewObj \
+	(tclStubsPtr->tcl_NewObj) /* 55 */
+#define Tcl_NewStringObj \
+	(tclStubsPtr->tcl_NewStringObj) /* 56 */
+#define Tcl_SetBooleanObj \
+	(tclStubsPtr->tcl_SetBooleanObj) /* 57 */
+#define Tcl_SetByteArrayLength \
+	(tclStubsPtr->tcl_SetByteArrayLength) /* 58 */
+#define Tcl_SetByteArrayObj \
+	(tclStubsPtr->tcl_SetByteArrayObj) /* 59 */
+#define Tcl_SetDoubleObj \
+	(tclStubsPtr->tcl_SetDoubleObj) /* 60 */
+#define Tcl_SetIntObj \
+	(tclStubsPtr->tcl_SetIntObj) /* 61 */
+#define Tcl_SetListObj \
+	(tclStubsPtr->tcl_SetListObj) /* 62 */
+#define Tcl_SetLongObj \
+	(tclStubsPtr->tcl_SetLongObj) /* 63 */
+#define Tcl_SetObjLength \
+	(tclStubsPtr->tcl_SetObjLength) /* 64 */
+#define Tcl_SetStringObj \
+	(tclStubsPtr->tcl_SetStringObj) /* 65 */
+#define Tcl_AddErrorInfo \
+	(tclStubsPtr->tcl_AddErrorInfo) /* 66 */
+#define Tcl_AddObjErrorInfo \
+	(tclStubsPtr->tcl_AddObjErrorInfo) /* 67 */
+#define Tcl_AllowExceptions \
+	(tclStubsPtr->tcl_AllowExceptions) /* 68 */
+#define Tcl_AppendElement \
+	(tclStubsPtr->tcl_AppendElement) /* 69 */
+#define Tcl_AppendResult \
+	(tclStubsPtr->tcl_AppendResult) /* 70 */
+#define Tcl_AsyncCreate \
+	(tclStubsPtr->tcl_AsyncCreate) /* 71 */
+#define Tcl_AsyncDelete \
+	(tclStubsPtr->tcl_AsyncDelete) /* 72 */
+#define Tcl_AsyncInvoke \
+	(tclStubsPtr->tcl_AsyncInvoke) /* 73 */
+#define Tcl_AsyncMark \
+	(tclStubsPtr->tcl_AsyncMark) /* 74 */
+#define Tcl_AsyncReady \
+	(tclStubsPtr->tcl_AsyncReady) /* 75 */
+#define Tcl_BackgroundError \
+	(tclStubsPtr->tcl_BackgroundError) /* 76 */
+#define Tcl_Backslash \
+	(tclStubsPtr->tcl_Backslash) /* 77 */
+#define Tcl_BadChannelOption \
+	(tclStubsPtr->tcl_BadChannelOption) /* 78 */
+#define Tcl_CallWhenDeleted \
+	(tclStubsPtr->tcl_CallWhenDeleted) /* 79 */
+#define Tcl_CancelIdleCall \
+	(tclStubsPtr->tcl_CancelIdleCall) /* 80 */
+#define Tcl_Close \
+	(tclStubsPtr->tcl_Close) /* 81 */
+#define Tcl_CommandComplete \
+	(tclStubsPtr->tcl_CommandComplete) /* 82 */
+#define Tcl_Concat \
+	(tclStubsPtr->tcl_Concat) /* 83 */
+#define Tcl_ConvertElement \
+	(tclStubsPtr->tcl_ConvertElement) /* 84 */
+#define Tcl_ConvertCountedElement \
+	(tclStubsPtr->tcl_ConvertCountedElement) /* 85 */
+#define Tcl_CreateAlias \
+	(tclStubsPtr->tcl_CreateAlias) /* 86 */
+#define Tcl_CreateAliasObj \
+	(tclStubsPtr->tcl_CreateAliasObj) /* 87 */
+#define Tcl_CreateChannel \
+	(tclStubsPtr->tcl_CreateChannel) /* 88 */
+#define Tcl_CreateChannelHandler \
+	(tclStubsPtr->tcl_CreateChannelHandler) /* 89 */
+#define Tcl_CreateCloseHandler \
+	(tclStubsPtr->tcl_CreateCloseHandler) /* 90 */
+#define Tcl_CreateCommand \
+	(tclStubsPtr->tcl_CreateCommand) /* 91 */
+#define Tcl_CreateEventSource \
+	(tclStubsPtr->tcl_CreateEventSource) /* 92 */
+#define Tcl_CreateExitHandler \
+	(tclStubsPtr->tcl_CreateExitHandler) /* 93 */
+#define Tcl_CreateInterp \
+	(tclStubsPtr->tcl_CreateInterp) /* 94 */
+#define Tcl_CreateMathFunc \
+	(tclStubsPtr->tcl_CreateMathFunc) /* 95 */
+#define Tcl_CreateObjCommand \
+	(tclStubsPtr->tcl_CreateObjCommand) /* 96 */
+#define Tcl_CreateChild \
+	(tclStubsPtr->tcl_CreateChild) /* 97 */
+#define Tcl_CreateTimerHandler \
+	(tclStubsPtr->tcl_CreateTimerHandler) /* 98 */
+#define Tcl_CreateTrace \
+	(tclStubsPtr->tcl_CreateTrace) /* 99 */
+#define Tcl_DeleteAssocData \
+	(tclStubsPtr->tcl_DeleteAssocData) /* 100 */
+#define Tcl_DeleteChannelHandler \
+	(tclStubsPtr->tcl_DeleteChannelHandler) /* 101 */
+#define Tcl_DeleteCloseHandler \
+	(tclStubsPtr->tcl_DeleteCloseHandler) /* 102 */
+#define Tcl_DeleteCommand \
+	(tclStubsPtr->tcl_DeleteCommand) /* 103 */
+#define Tcl_DeleteCommandFromToken \
+	(tclStubsPtr->tcl_DeleteCommandFromToken) /* 104 */
+#define Tcl_DeleteEvents \
+	(tclStubsPtr->tcl_DeleteEvents) /* 105 */
+#define Tcl_DeleteEventSource \
+	(tclStubsPtr->tcl_DeleteEventSource) /* 106 */
+#define Tcl_DeleteExitHandler \
+	(tclStubsPtr->tcl_DeleteExitHandler) /* 107 */
+#define Tcl_DeleteHashEntry \
+	(tclStubsPtr->tcl_DeleteHashEntry) /* 108 */
+#define Tcl_DeleteHashTable \
+	(tclStubsPtr->tcl_DeleteHashTable) /* 109 */
+#define Tcl_DeleteInterp \
+	(tclStubsPtr->tcl_DeleteInterp) /* 110 */
+#define Tcl_DetachPids \
+	(tclStubsPtr->tcl_DetachPids) /* 111 */
+#define Tcl_DeleteTimerHandler \
+	(tclStubsPtr->tcl_DeleteTimerHandler) /* 112 */
+#define Tcl_DeleteTrace \
+	(tclStubsPtr->tcl_DeleteTrace) /* 113 */
+#define Tcl_DontCallWhenDeleted \
+	(tclStubsPtr->tcl_DontCallWhenDeleted) /* 114 */
+#define Tcl_DoOneEvent \
+	(tclStubsPtr->tcl_DoOneEvent) /* 115 */
+#define Tcl_DoWhenIdle \
+	(tclStubsPtr->tcl_DoWhenIdle) /* 116 */
+#define Tcl_DStringAppend \
+	(tclStubsPtr->tcl_DStringAppend) /* 117 */
+#define Tcl_DStringAppendElement \
+	(tclStubsPtr->tcl_DStringAppendElement) /* 118 */
+#define Tcl_DStringEndSublist \
+	(tclStubsPtr->tcl_DStringEndSublist) /* 119 */
+#define Tcl_DStringFree \
+	(tclStubsPtr->tcl_DStringFree) /* 120 */
+#define Tcl_DStringGetResult \
+	(tclStubsPtr->tcl_DStringGetResult) /* 121 */
+#define Tcl_DStringInit \
+	(tclStubsPtr->tcl_DStringInit) /* 122 */
+#define Tcl_DStringResult \
+	(tclStubsPtr->tcl_DStringResult) /* 123 */
+#define Tcl_DStringSetLength \
+	(tclStubsPtr->tcl_DStringSetLength) /* 124 */
+#define Tcl_DStringStartSublist \
+	(tclStubsPtr->tcl_DStringStartSublist) /* 125 */
+#define Tcl_Eof \
+	(tclStubsPtr->tcl_Eof) /* 126 */
+#define Tcl_ErrnoId \
+	(tclStubsPtr->tcl_ErrnoId) /* 127 */
+#define Tcl_ErrnoMsg \
+	(tclStubsPtr->tcl_ErrnoMsg) /* 128 */
+#define Tcl_Eval \
+	(tclStubsPtr->tcl_Eval) /* 129 */
+#define Tcl_EvalFile \
+	(tclStubsPtr->tcl_EvalFile) /* 130 */
+#define Tcl_EvalObj \
+	(tclStubsPtr->tcl_EvalObj) /* 131 */
+#define Tcl_EventuallyFree \
+	(tclStubsPtr->tcl_EventuallyFree) /* 132 */
+#define Tcl_Exit \
+	(tclStubsPtr->tcl_Exit) /* 133 */
+#define Tcl_ExposeCommand \
+	(tclStubsPtr->tcl_ExposeCommand) /* 134 */
+#define Tcl_ExprBoolean \
+	(tclStubsPtr->tcl_ExprBoolean) /* 135 */
+#define Tcl_ExprBooleanObj \
+	(tclStubsPtr->tcl_ExprBooleanObj) /* 136 */
+#define Tcl_ExprDouble \
+	(tclStubsPtr->tcl_ExprDouble) /* 137 */
+#define Tcl_ExprDoubleObj \
+	(tclStubsPtr->tcl_ExprDoubleObj) /* 138 */
+#define Tcl_ExprLong \
+	(tclStubsPtr->tcl_ExprLong) /* 139 */
+#define Tcl_ExprLongObj \
+	(tclStubsPtr->tcl_ExprLongObj) /* 140 */
+#define Tcl_ExprObj \
+	(tclStubsPtr->tcl_ExprObj) /* 141 */
+#define Tcl_ExprString \
+	(tclStubsPtr->tcl_ExprString) /* 142 */
+#define Tcl_Finalize \
+	(tclStubsPtr->tcl_Finalize) /* 143 */
+#define Tcl_FindExecutable \
+	(tclStubsPtr->tcl_FindExecutable) /* 144 */
+#define Tcl_FirstHashEntry \
+	(tclStubsPtr->tcl_FirstHashEntry) /* 145 */
+#define Tcl_Flush \
+	(tclStubsPtr->tcl_Flush) /* 146 */
+#define Tcl_FreeResult \
+	(tclStubsPtr->tcl_FreeResult) /* 147 */
+#define Tcl_GetAlias \
+	(tclStubsPtr->tcl_GetAlias) /* 148 */
+#define Tcl_GetAliasObj \
+	(tclStubsPtr->tcl_GetAliasObj) /* 149 */
+#define Tcl_GetAssocData \
+	(tclStubsPtr->tcl_GetAssocData) /* 150 */
+#define Tcl_GetChannel \
+	(tclStubsPtr->tcl_GetChannel) /* 151 */
+#define Tcl_GetChannelBufferSize \
+	(tclStubsPtr->tcl_GetChannelBufferSize) /* 152 */
+#define Tcl_GetChannelHandle \
+	(tclStubsPtr->tcl_GetChannelHandle) /* 153 */
+#define Tcl_GetChannelInstanceData \
+	(tclStubsPtr->tcl_GetChannelInstanceData) /* 154 */
+#define Tcl_GetChannelMode \
+	(tclStubsPtr->tcl_GetChannelMode) /* 155 */
+#define Tcl_GetChannelName \
+	(tclStubsPtr->tcl_GetChannelName) /* 156 */
+#define Tcl_GetChannelOption \
+	(tclStubsPtr->tcl_GetChannelOption) /* 157 */
+#define Tcl_GetChannelType \
+	(tclStubsPtr->tcl_GetChannelType) /* 158 */
+#define Tcl_GetCommandInfo \
+	(tclStubsPtr->tcl_GetCommandInfo) /* 159 */
+#define Tcl_GetCommandName \
+	(tclStubsPtr->tcl_GetCommandName) /* 160 */
+#define Tcl_GetErrno \
+	(tclStubsPtr->tcl_GetErrno) /* 161 */
+#define Tcl_GetHostName \
+	(tclStubsPtr->tcl_GetHostName) /* 162 */
+#define Tcl_GetInterpPath \
+	(tclStubsPtr->tcl_GetInterpPath) /* 163 */
+#define Tcl_GetParent \
+	(tclStubsPtr->tcl_GetParent) /* 164 */
+#define Tcl_GetNameOfExecutable \
+	(tclStubsPtr->tcl_GetNameOfExecutable) /* 165 */
+#define Tcl_GetObjResult \
+	(tclStubsPtr->tcl_GetObjResult) /* 166 */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
+#define Tcl_GetOpenFile \
+	(tclStubsPtr->tcl_GetOpenFile) /* 167 */
+#endif /* UNIX */
+#ifdef MAC_OSX_TCL /* MACOSX */
+#define Tcl_GetOpenFile \
+	(tclStubsPtr->tcl_GetOpenFile) /* 167 */
+#endif /* MACOSX */
+#define Tcl_GetPathType \
+	(tclStubsPtr->tcl_GetPathType) /* 168 */
+#define Tcl_Gets \
+	(tclStubsPtr->tcl_Gets) /* 169 */
+#define Tcl_GetsObj \
+	(tclStubsPtr->tcl_GetsObj) /* 170 */
+#define Tcl_GetServiceMode \
+	(tclStubsPtr->tcl_GetServiceMode) /* 171 */
+#define Tcl_GetChild \
+	(tclStubsPtr->tcl_GetChild) /* 172 */
+#define Tcl_GetStdChannel \
+	(tclStubsPtr->tcl_GetStdChannel) /* 173 */
+#define Tcl_GetStringResult \
+	(tclStubsPtr->tcl_GetStringResult) /* 174 */
+#define Tcl_GetVar \
+	(tclStubsPtr->tcl_GetVar) /* 175 */
+#define Tcl_GetVar2 \
+	(tclStubsPtr->tcl_GetVar2) /* 176 */
+#define Tcl_GlobalEval \
+	(tclStubsPtr->tcl_GlobalEval) /* 177 */
+#define Tcl_GlobalEvalObj \
+	(tclStubsPtr->tcl_GlobalEvalObj) /* 178 */
+#define Tcl_HideCommand \
+	(tclStubsPtr->tcl_HideCommand) /* 179 */
+#define Tcl_Init \
+	(tclStubsPtr->tcl_Init) /* 180 */
+#define Tcl_InitHashTable \
+	(tclStubsPtr->tcl_InitHashTable) /* 181 */
+#define Tcl_InputBlocked \
+	(tclStubsPtr->tcl_InputBlocked) /* 182 */
+#define Tcl_InputBuffered \
+	(tclStubsPtr->tcl_InputBuffered) /* 183 */
+#define Tcl_InterpDeleted \
+	(tclStubsPtr->tcl_InterpDeleted) /* 184 */
+#define Tcl_IsSafe \
+	(tclStubsPtr->tcl_IsSafe) /* 185 */
+#define Tcl_JoinPath \
+	(tclStubsPtr->tcl_JoinPath) /* 186 */
+#define Tcl_LinkVar \
+	(tclStubsPtr->tcl_LinkVar) /* 187 */
+/* Slot 188 is reserved */
+#define Tcl_MakeFileChannel \
+	(tclStubsPtr->tcl_MakeFileChannel) /* 189 */
+#define Tcl_MakeSafe \
+	(tclStubsPtr->tcl_MakeSafe) /* 190 */
+#define Tcl_MakeTcpClientChannel \
+	(tclStubsPtr->tcl_MakeTcpClientChannel) /* 191 */
+#define Tcl_Merge \
+	(tclStubsPtr->tcl_Merge) /* 192 */
+#define Tcl_NextHashEntry \
+	(tclStubsPtr->tcl_NextHashEntry) /* 193 */
+#define Tcl_NotifyChannel \
+	(tclStubsPtr->tcl_NotifyChannel) /* 194 */
+#define Tcl_ObjGetVar2 \
+	(tclStubsPtr->tcl_ObjGetVar2) /* 195 */
+#define Tcl_ObjSetVar2 \
+	(tclStubsPtr->tcl_ObjSetVar2) /* 196 */
+#define Tcl_OpenCommandChannel \
+	(tclStubsPtr->tcl_OpenCommandChannel) /* 197 */
+#define Tcl_OpenFileChannel \
+	(tclStubsPtr->tcl_OpenFileChannel) /* 198 */
+#define Tcl_OpenTcpClient \
+	(tclStubsPtr->tcl_OpenTcpClient) /* 199 */
+#define Tcl_OpenTcpServer \
+	(tclStubsPtr->tcl_OpenTcpServer) /* 200 */
+#define Tcl_Preserve \
+	(tclStubsPtr->tcl_Preserve) /* 201 */
+#define Tcl_PrintDouble \
+	(tclStubsPtr->tcl_PrintDouble) /* 202 */
+#define Tcl_PutEnv \
+	(tclStubsPtr->tcl_PutEnv) /* 203 */
+#define Tcl_PosixError \
+	(tclStubsPtr->tcl_PosixError) /* 204 */
+#define Tcl_QueueEvent \
+	(tclStubsPtr->tcl_QueueEvent) /* 205 */
+#define Tcl_Read \
+	(tclStubsPtr->tcl_Read) /* 206 */
+#define Tcl_ReapDetachedProcs \
+	(tclStubsPtr->tcl_ReapDetachedProcs) /* 207 */
+#define Tcl_RecordAndEval \
+	(tclStubsPtr->tcl_RecordAndEval) /* 208 */
+#define Tcl_RecordAndEvalObj \
+	(tclStubsPtr->tcl_RecordAndEvalObj) /* 209 */
+#define Tcl_RegisterChannel \
+	(tclStubsPtr->tcl_RegisterChannel) /* 210 */
+#define Tcl_RegisterObjType \
+	(tclStubsPtr->tcl_RegisterObjType) /* 211 */
+#define Tcl_RegExpCompile \
+	(tclStubsPtr->tcl_RegExpCompile) /* 212 */
+#define Tcl_RegExpExec \
+	(tclStubsPtr->tcl_RegExpExec) /* 213 */
+#define Tcl_RegExpMatch \
+	(tclStubsPtr->tcl_RegExpMatch) /* 214 */
+#define Tcl_RegExpRange \
+	(tclStubsPtr->tcl_RegExpRange) /* 215 */
+#define Tcl_Release \
+	(tclStubsPtr->tcl_Release) /* 216 */
+#define Tcl_ResetResult \
+	(tclStubsPtr->tcl_ResetResult) /* 217 */
+#define Tcl_ScanElement \
+	(tclStubsPtr->tcl_ScanElement) /* 218 */
+#define Tcl_ScanCountedElement \
+	(tclStubsPtr->tcl_ScanCountedElement) /* 219 */
+#define Tcl_SeekOld \
+	(tclStubsPtr->tcl_SeekOld) /* 220 */
+#define Tcl_ServiceAll \
+	(tclStubsPtr->tcl_ServiceAll) /* 221 */
+#define Tcl_ServiceEvent \
+	(tclStubsPtr->tcl_ServiceEvent) /* 222 */
+#define Tcl_SetAssocData \
+	(tclStubsPtr->tcl_SetAssocData) /* 223 */
+#define Tcl_SetChannelBufferSize \
+	(tclStubsPtr->tcl_SetChannelBufferSize) /* 224 */
+#define Tcl_SetChannelOption \
+	(tclStubsPtr->tcl_SetChannelOption) /* 225 */
+#define Tcl_SetCommandInfo \
+	(tclStubsPtr->tcl_SetCommandInfo) /* 226 */
+#define Tcl_SetErrno \
+	(tclStubsPtr->tcl_SetErrno) /* 227 */
+#define Tcl_SetErrorCode \
+	(tclStubsPtr->tcl_SetErrorCode) /* 228 */
+#define Tcl_SetMaxBlockTime \
+	(tclStubsPtr->tcl_SetMaxBlockTime) /* 229 */
+#define Tcl_SetPanicProc \
+	(tclStubsPtr->tcl_SetPanicProc) /* 230 */
+#define Tcl_SetRecursionLimit \
+	(tclStubsPtr->tcl_SetRecursionLimit) /* 231 */
+#define Tcl_SetResult \
+	(tclStubsPtr->tcl_SetResult) /* 232 */
+#define Tcl_SetServiceMode \
+	(tclStubsPtr->tcl_SetServiceMode) /* 233 */
+#define Tcl_SetObjErrorCode \
+	(tclStubsPtr->tcl_SetObjErrorCode) /* 234 */
+#define Tcl_SetObjResult \
+	(tclStubsPtr->tcl_SetObjResult) /* 235 */
+#define Tcl_SetStdChannel \
+	(tclStubsPtr->tcl_SetStdChannel) /* 236 */
+#define Tcl_SetVar \
+	(tclStubsPtr->tcl_SetVar) /* 237 */
+#define Tcl_SetVar2 \
+	(tclStubsPtr->tcl_SetVar2) /* 238 */
+#define Tcl_SignalId \
+	(tclStubsPtr->tcl_SignalId) /* 239 */
+#define Tcl_SignalMsg \
+	(tclStubsPtr->tcl_SignalMsg) /* 240 */
+#define Tcl_SourceRCFile \
+	(tclStubsPtr->tcl_SourceRCFile) /* 241 */
+#define Tcl_SplitList \
+	(tclStubsPtr->tcl_SplitList) /* 242 */
+#define Tcl_SplitPath \
+	(tclStubsPtr->tcl_SplitPath) /* 243 */
+#define Tcl_StaticLibrary \
+	(tclStubsPtr->tcl_StaticLibrary) /* 244 */
+#define Tcl_StringMatch \
+	(tclStubsPtr->tcl_StringMatch) /* 245 */
+#define Tcl_TellOld \
+	(tclStubsPtr->tcl_TellOld) /* 246 */
+#define Tcl_TraceVar \
+	(tclStubsPtr->tcl_TraceVar) /* 247 */
+#define Tcl_TraceVar2 \
+	(tclStubsPtr->tcl_TraceVar2) /* 248 */
+#define Tcl_TranslateFileName \
+	(tclStubsPtr->tcl_TranslateFileName) /* 249 */
+#define Tcl_Ungets \
+	(tclStubsPtr->tcl_Ungets) /* 250 */
+#define Tcl_UnlinkVar \
+	(tclStubsPtr->tcl_UnlinkVar) /* 251 */
+#define Tcl_UnregisterChannel \
+	(tclStubsPtr->tcl_UnregisterChannel) /* 252 */
+#define Tcl_UnsetVar \
+	(tclStubsPtr->tcl_UnsetVar) /* 253 */
+#define Tcl_UnsetVar2 \
+	(tclStubsPtr->tcl_UnsetVar2) /* 254 */
+#define Tcl_UntraceVar \
+	(tclStubsPtr->tcl_UntraceVar) /* 255 */
+#define Tcl_UntraceVar2 \
+	(tclStubsPtr->tcl_UntraceVar2) /* 256 */
+#define Tcl_UpdateLinkedVar \
+	(tclStubsPtr->tcl_UpdateLinkedVar) /* 257 */
+#define Tcl_UpVar \
+	(tclStubsPtr->tcl_UpVar) /* 258 */
+#define Tcl_UpVar2 \
+	(tclStubsPtr->tcl_UpVar2) /* 259 */
+#define Tcl_VarEval \
+	(tclStubsPtr->tcl_VarEval) /* 260 */
+#define Tcl_VarTraceInfo \
+	(tclStubsPtr->tcl_VarTraceInfo) /* 261 */
+#define Tcl_VarTraceInfo2 \
+	(tclStubsPtr->tcl_VarTraceInfo2) /* 262 */
+#define Tcl_Write \
+	(tclStubsPtr->tcl_Write) /* 263 */
+#define Tcl_WrongNumArgs \
+	(tclStubsPtr->tcl_WrongNumArgs) /* 264 */
+#define Tcl_DumpActiveMemory \
+	(tclStubsPtr->tcl_DumpActiveMemory) /* 265 */
+#define Tcl_ValidateAllMemory \
+	(tclStubsPtr->tcl_ValidateAllMemory) /* 266 */
+#define Tcl_AppendResultVA \
+	(tclStubsPtr->tcl_AppendResultVA) /* 267 */
+#define Tcl_AppendStringsToObjVA \
+	(tclStubsPtr->tcl_AppendStringsToObjVA) /* 268 */
+#define Tcl_HashStats \
+	(tclStubsPtr->tcl_HashStats) /* 269 */
+#define Tcl_ParseVar \
+	(tclStubsPtr->tcl_ParseVar) /* 270 */
+#define Tcl_PkgPresent \
+	(tclStubsPtr->tcl_PkgPresent) /* 271 */
+#define Tcl_PkgPresentEx \
+	(tclStubsPtr->tcl_PkgPresentEx) /* 272 */
+#define Tcl_PkgProvide \
+	(tclStubsPtr->tcl_PkgProvide) /* 273 */
+#define Tcl_PkgRequire \
+	(tclStubsPtr->tcl_PkgRequire) /* 274 */
+#define Tcl_SetErrorCodeVA \
+	(tclStubsPtr->tcl_SetErrorCodeVA) /* 275 */
+#define Tcl_VarEvalVA \
+	(tclStubsPtr->tcl_VarEvalVA) /* 276 */
+#define Tcl_WaitPid \
+	(tclStubsPtr->tcl_WaitPid) /* 277 */
+#define Tcl_PanicVA \
+	(tclStubsPtr->tcl_PanicVA) /* 278 */
+#define Tcl_GetVersion \
+	(tclStubsPtr->tcl_GetVersion) /* 279 */
+#define Tcl_InitMemory \
+	(tclStubsPtr->tcl_InitMemory) /* 280 */
+#define Tcl_StackChannel \
+	(tclStubsPtr->tcl_StackChannel) /* 281 */
+#define Tcl_UnstackChannel \
+	(tclStubsPtr->tcl_UnstackChannel) /* 282 */
+#define Tcl_GetStackedChannel \
+	(tclStubsPtr->tcl_GetStackedChannel) /* 283 */
+#define Tcl_SetMainLoop \
+	(tclStubsPtr->tcl_SetMainLoop) /* 284 */
+/* Slot 285 is reserved */
+#define Tcl_AppendObjToObj \
+	(tclStubsPtr->tcl_AppendObjToObj) /* 286 */
+#define Tcl_CreateEncoding \
+	(tclStubsPtr->tcl_CreateEncoding) /* 287 */
+#define Tcl_CreateThreadExitHandler \
+	(tclStubsPtr->tcl_CreateThreadExitHandler) /* 288 */
+#define Tcl_DeleteThreadExitHandler \
+	(tclStubsPtr->tcl_DeleteThreadExitHandler) /* 289 */
+#define Tcl_DiscardResult \
+	(tclStubsPtr->tcl_DiscardResult) /* 290 */
+#define Tcl_EvalEx \
+	(tclStubsPtr->tcl_EvalEx) /* 291 */
+#define Tcl_EvalObjv \
+	(tclStubsPtr->tcl_EvalObjv) /* 292 */
+#define Tcl_EvalObjEx \
+	(tclStubsPtr->tcl_EvalObjEx) /* 293 */
+#define Tcl_ExitThread \
+	(tclStubsPtr->tcl_ExitThread) /* 294 */
+#define Tcl_ExternalToUtf \
+	(tclStubsPtr->tcl_ExternalToUtf) /* 295 */
+#define Tcl_ExternalToUtfDString \
+	(tclStubsPtr->tcl_ExternalToUtfDString) /* 296 */
+#define Tcl_FinalizeThread \
+	(tclStubsPtr->tcl_FinalizeThread) /* 297 */
+#define Tcl_FinalizeNotifier \
+	(tclStubsPtr->tcl_FinalizeNotifier) /* 298 */
+#define Tcl_FreeEncoding \
+	(tclStubsPtr->tcl_FreeEncoding) /* 299 */
+#define Tcl_GetCurrentThread \
+	(tclStubsPtr->tcl_GetCurrentThread) /* 300 */
+#define Tcl_GetEncoding \
+	(tclStubsPtr->tcl_GetEncoding) /* 301 */
+#define Tcl_GetEncodingName \
+	(tclStubsPtr->tcl_GetEncodingName) /* 302 */
+#define Tcl_GetEncodingNames \
+	(tclStubsPtr->tcl_GetEncodingNames) /* 303 */
+#define Tcl_GetIndexFromObjStruct \
+	(tclStubsPtr->tcl_GetIndexFromObjStruct) /* 304 */
+#define Tcl_GetThreadData \
+	(tclStubsPtr->tcl_GetThreadData) /* 305 */
+#define Tcl_GetVar2Ex \
+	(tclStubsPtr->tcl_GetVar2Ex) /* 306 */
+#define Tcl_InitNotifier \
+	(tclStubsPtr->tcl_InitNotifier) /* 307 */
+#define Tcl_MutexLock \
+	(tclStubsPtr->tcl_MutexLock) /* 308 */
+#define Tcl_MutexUnlock \
+	(tclStubsPtr->tcl_MutexUnlock) /* 309 */
+#define Tcl_ConditionNotify \
+	(tclStubsPtr->tcl_ConditionNotify) /* 310 */
+#define Tcl_ConditionWait \
+	(tclStubsPtr->tcl_ConditionWait) /* 311 */
+#define Tcl_NumUtfChars \
+	(tclStubsPtr->tcl_NumUtfChars) /* 312 */
+#define Tcl_ReadChars \
+	(tclStubsPtr->tcl_ReadChars) /* 313 */
+#define Tcl_RestoreResult \
+	(tclStubsPtr->tcl_RestoreResult) /* 314 */
+#define Tcl_SaveResult \
+	(tclStubsPtr->tcl_SaveResult) /* 315 */
+#define Tcl_SetSystemEncoding \
+	(tclStubsPtr->tcl_SetSystemEncoding) /* 316 */
+#define Tcl_SetVar2Ex \
+	(tclStubsPtr->tcl_SetVar2Ex) /* 317 */
+#define Tcl_ThreadAlert \
+	(tclStubsPtr->tcl_ThreadAlert) /* 318 */
+#define Tcl_ThreadQueueEvent \
+	(tclStubsPtr->tcl_ThreadQueueEvent) /* 319 */
+#define Tcl_UniCharAtIndex \
+	(tclStubsPtr->tcl_UniCharAtIndex) /* 320 */
+#define Tcl_UniCharToLower \
+	(tclStubsPtr->tcl_UniCharToLower) /* 321 */
+#define Tcl_UniCharToTitle \
+	(tclStubsPtr->tcl_UniCharToTitle) /* 322 */
+#define Tcl_UniCharToUpper \
+	(tclStubsPtr->tcl_UniCharToUpper) /* 323 */
+#define Tcl_UniCharToUtf \
+	(tclStubsPtr->tcl_UniCharToUtf) /* 324 */
+#define Tcl_UtfAtIndex \
+	(tclStubsPtr->tcl_UtfAtIndex) /* 325 */
+#define TclUtfCharComplete \
+	(tclStubsPtr->tclUtfCharComplete) /* 326 */
+#define Tcl_UtfBackslash \
+	(tclStubsPtr->tcl_UtfBackslash) /* 327 */
+#define Tcl_UtfFindFirst \
+	(tclStubsPtr->tcl_UtfFindFirst) /* 328 */
+#define Tcl_UtfFindLast \
+	(tclStubsPtr->tcl_UtfFindLast) /* 329 */
+#define TclUtfNext \
+	(tclStubsPtr->tclUtfNext) /* 330 */
+#define TclUtfPrev \
+	(tclStubsPtr->tclUtfPrev) /* 331 */
+#define Tcl_UtfToExternal \
+	(tclStubsPtr->tcl_UtfToExternal) /* 332 */
+#define Tcl_UtfToExternalDString \
+	(tclStubsPtr->tcl_UtfToExternalDString) /* 333 */
+#define Tcl_UtfToLower \
+	(tclStubsPtr->tcl_UtfToLower) /* 334 */
+#define Tcl_UtfToTitle \
+	(tclStubsPtr->tcl_UtfToTitle) /* 335 */
+#define Tcl_UtfToChar16 \
+	(tclStubsPtr->tcl_UtfToChar16) /* 336 */
+#define Tcl_UtfToUpper \
+	(tclStubsPtr->tcl_UtfToUpper) /* 337 */
+#define Tcl_WriteChars \
+	(tclStubsPtr->tcl_WriteChars) /* 338 */
+#define Tcl_WriteObj \
+	(tclStubsPtr->tcl_WriteObj) /* 339 */
+#define Tcl_GetString \
+	(tclStubsPtr->tcl_GetString) /* 340 */
+#define Tcl_GetDefaultEncodingDir \
+	(tclStubsPtr->tcl_GetDefaultEncodingDir) /* 341 */
+#define Tcl_SetDefaultEncodingDir \
+	(tclStubsPtr->tcl_SetDefaultEncodingDir) /* 342 */
+#define Tcl_AlertNotifier \
+	(tclStubsPtr->tcl_AlertNotifier) /* 343 */
+#define Tcl_ServiceModeHook \
+	(tclStubsPtr->tcl_ServiceModeHook) /* 344 */
+#define Tcl_UniCharIsAlnum \
+	(tclStubsPtr->tcl_UniCharIsAlnum) /* 345 */
+#define Tcl_UniCharIsAlpha \
+	(tclStubsPtr->tcl_UniCharIsAlpha) /* 346 */
+#define Tcl_UniCharIsDigit \
+	(tclStubsPtr->tcl_UniCharIsDigit) /* 347 */
+#define Tcl_UniCharIsLower \
+	(tclStubsPtr->tcl_UniCharIsLower) /* 348 */
+#define Tcl_UniCharIsSpace \
+	(tclStubsPtr->tcl_UniCharIsSpace) /* 349 */
+#define Tcl_UniCharIsUpper \
+	(tclStubsPtr->tcl_UniCharIsUpper) /* 350 */
+#define Tcl_UniCharIsWordChar \
+	(tclStubsPtr->tcl_UniCharIsWordChar) /* 351 */
+#define Tcl_Char16Len \
+	(tclStubsPtr->tcl_Char16Len) /* 352 */
+#define Tcl_UniCharNcmp \
+	(tclStubsPtr->tcl_UniCharNcmp) /* 353 */
+#define Tcl_Char16ToUtfDString \
+	(tclStubsPtr->tcl_Char16ToUtfDString) /* 354 */
+#define Tcl_UtfToChar16DString \
+	(tclStubsPtr->tcl_UtfToChar16DString) /* 355 */
+#define Tcl_GetRegExpFromObj \
+	(tclStubsPtr->tcl_GetRegExpFromObj) /* 356 */
+#define Tcl_EvalTokens \
+	(tclStubsPtr->tcl_EvalTokens) /* 357 */
+#define Tcl_FreeParse \
+	(tclStubsPtr->tcl_FreeParse) /* 358 */
+#define Tcl_LogCommandInfo \
+	(tclStubsPtr->tcl_LogCommandInfo) /* 359 */
+#define Tcl_ParseBraces \
+	(tclStubsPtr->tcl_ParseBraces) /* 360 */
+#define Tcl_ParseCommand \
+	(tclStubsPtr->tcl_ParseCommand) /* 361 */
+#define Tcl_ParseExpr \
+	(tclStubsPtr->tcl_ParseExpr) /* 362 */
+#define Tcl_ParseQuotedString \
+	(tclStubsPtr->tcl_ParseQuotedString) /* 363 */
+#define Tcl_ParseVarName \
+	(tclStubsPtr->tcl_ParseVarName) /* 364 */
+#define Tcl_GetCwd \
+	(tclStubsPtr->tcl_GetCwd) /* 365 */
+#define Tcl_Chdir \
+	(tclStubsPtr->tcl_Chdir) /* 366 */
+#define Tcl_Access \
+	(tclStubsPtr->tcl_Access) /* 367 */
+#define Tcl_Stat \
+	(tclStubsPtr->tcl_Stat) /* 368 */
+#define Tcl_UtfNcmp \
+	(tclStubsPtr->tcl_UtfNcmp) /* 369 */
+#define Tcl_UtfNcasecmp \
+	(tclStubsPtr->tcl_UtfNcasecmp) /* 370 */
+#define Tcl_StringCaseMatch \
+	(tclStubsPtr->tcl_StringCaseMatch) /* 371 */
+#define Tcl_UniCharIsControl \
+	(tclStubsPtr->tcl_UniCharIsControl) /* 372 */
+#define Tcl_UniCharIsGraph \
+	(tclStubsPtr->tcl_UniCharIsGraph) /* 373 */
+#define Tcl_UniCharIsPrint \
+	(tclStubsPtr->tcl_UniCharIsPrint) /* 374 */
+#define Tcl_UniCharIsPunct \
+	(tclStubsPtr->tcl_UniCharIsPunct) /* 375 */
+#define Tcl_RegExpExecObj \
+	(tclStubsPtr->tcl_RegExpExecObj) /* 376 */
+#define Tcl_RegExpGetInfo \
+	(tclStubsPtr->tcl_RegExpGetInfo) /* 377 */
+#define Tcl_NewUnicodeObj \
+	(tclStubsPtr->tcl_NewUnicodeObj) /* 378 */
+#define Tcl_SetUnicodeObj \
+	(tclStubsPtr->tcl_SetUnicodeObj) /* 379 */
+#define Tcl_GetCharLength \
+	(tclStubsPtr->tcl_GetCharLength) /* 380 */
+#define Tcl_GetUniChar \
+	(tclStubsPtr->tcl_GetUniChar) /* 381 */
+#define Tcl_GetUnicode \
+	(tclStubsPtr->tcl_GetUnicode) /* 382 */
+#define Tcl_GetRange \
+	(tclStubsPtr->tcl_GetRange) /* 383 */
+#define Tcl_AppendUnicodeToObj \
+	(tclStubsPtr->tcl_AppendUnicodeToObj) /* 384 */
+#define Tcl_RegExpMatchObj \
+	(tclStubsPtr->tcl_RegExpMatchObj) /* 385 */
+#define Tcl_SetNotifier \
+	(tclStubsPtr->tcl_SetNotifier) /* 386 */
+#define Tcl_GetAllocMutex \
+	(tclStubsPtr->tcl_GetAllocMutex) /* 387 */
+#define Tcl_GetChannelNames \
+	(tclStubsPtr->tcl_GetChannelNames) /* 388 */
+#define Tcl_GetChannelNamesEx \
+	(tclStubsPtr->tcl_GetChannelNamesEx) /* 389 */
+#define Tcl_ProcObjCmd \
+	(tclStubsPtr->tcl_ProcObjCmd) /* 390 */
+#define Tcl_ConditionFinalize \
+	(tclStubsPtr->tcl_ConditionFinalize) /* 391 */
+#define Tcl_MutexFinalize \
+	(tclStubsPtr->tcl_MutexFinalize) /* 392 */
+#define Tcl_CreateThread \
+	(tclStubsPtr->tcl_CreateThread) /* 393 */
+#define Tcl_ReadRaw \
+	(tclStubsPtr->tcl_ReadRaw) /* 394 */
+#define Tcl_WriteRaw \
+	(tclStubsPtr->tcl_WriteRaw) /* 395 */
+#define Tcl_GetTopChannel \
+	(tclStubsPtr->tcl_GetTopChannel) /* 396 */
+#define Tcl_ChannelBuffered \
+	(tclStubsPtr->tcl_ChannelBuffered) /* 397 */
+#define Tcl_ChannelName \
+	(tclStubsPtr->tcl_ChannelName) /* 398 */
+#define Tcl_ChannelVersion \
+	(tclStubsPtr->tcl_ChannelVersion) /* 399 */
+#define Tcl_ChannelBlockModeProc \
+	(tclStubsPtr->tcl_ChannelBlockModeProc) /* 400 */
+#define Tcl_ChannelCloseProc \
+	(tclStubsPtr->tcl_ChannelCloseProc) /* 401 */
+#define Tcl_ChannelClose2Proc \
+	(tclStubsPtr->tcl_ChannelClose2Proc) /* 402 */
+#define Tcl_ChannelInputProc \
+	(tclStubsPtr->tcl_ChannelInputProc) /* 403 */
+#define Tcl_ChannelOutputProc \
+	(tclStubsPtr->tcl_ChannelOutputProc) /* 404 */
+#define Tcl_ChannelSeekProc \
+	(tclStubsPtr->tcl_ChannelSeekProc) /* 405 */
+#define Tcl_ChannelSetOptionProc \
+	(tclStubsPtr->tcl_ChannelSetOptionProc) /* 406 */
+#define Tcl_ChannelGetOptionProc \
+	(tclStubsPtr->tcl_ChannelGetOptionProc) /* 407 */
+#define Tcl_ChannelWatchProc \
+	(tclStubsPtr->tcl_ChannelWatchProc) /* 408 */
+#define Tcl_ChannelGetHandleProc \
+	(tclStubsPtr->tcl_ChannelGetHandleProc) /* 409 */
+#define Tcl_ChannelFlushProc \
+	(tclStubsPtr->tcl_ChannelFlushProc) /* 410 */
+#define Tcl_ChannelHandlerProc \
+	(tclStubsPtr->tcl_ChannelHandlerProc) /* 411 */
+#define Tcl_JoinThread \
+	(tclStubsPtr->tcl_JoinThread) /* 412 */
+#define Tcl_IsChannelShared \
+	(tclStubsPtr->tcl_IsChannelShared) /* 413 */
+#define Tcl_IsChannelRegistered \
+	(tclStubsPtr->tcl_IsChannelRegistered) /* 414 */
+#define Tcl_CutChannel \
+	(tclStubsPtr->tcl_CutChannel) /* 415 */
+#define Tcl_SpliceChannel \
+	(tclStubsPtr->tcl_SpliceChannel) /* 416 */
+#define Tcl_ClearChannelHandlers \
+	(tclStubsPtr->tcl_ClearChannelHandlers) /* 417 */
+#define Tcl_IsChannelExisting \
+	(tclStubsPtr->tcl_IsChannelExisting) /* 418 */
+#define Tcl_UniCharNcasecmp \
+	(tclStubsPtr->tcl_UniCharNcasecmp) /* 419 */
+#define Tcl_UniCharCaseMatch \
+	(tclStubsPtr->tcl_UniCharCaseMatch) /* 420 */
+#define Tcl_FindHashEntry \
+	(tclStubsPtr->tcl_FindHashEntry) /* 421 */
+#define Tcl_CreateHashEntry \
+	(tclStubsPtr->tcl_CreateHashEntry) /* 422 */
+#define Tcl_InitCustomHashTable \
+	(tclStubsPtr->tcl_InitCustomHashTable) /* 423 */
+#define Tcl_InitObjHashTable \
+	(tclStubsPtr->tcl_InitObjHashTable) /* 424 */
+#define Tcl_CommandTraceInfo \
+	(tclStubsPtr->tcl_CommandTraceInfo) /* 425 */
+#define Tcl_TraceCommand \
+	(tclStubsPtr->tcl_TraceCommand) /* 426 */
+#define Tcl_UntraceCommand \
+	(tclStubsPtr->tcl_UntraceCommand) /* 427 */
+#define Tcl_AttemptAlloc \
+	(tclStubsPtr->tcl_AttemptAlloc) /* 428 */
+#define Tcl_AttemptDbCkalloc \
+	(tclStubsPtr->tcl_AttemptDbCkalloc) /* 429 */
+#define Tcl_AttemptRealloc \
+	(tclStubsPtr->tcl_AttemptRealloc) /* 430 */
+#define Tcl_AttemptDbCkrealloc \
+	(tclStubsPtr->tcl_AttemptDbCkrealloc) /* 431 */
+#define Tcl_AttemptSetObjLength \
+	(tclStubsPtr->tcl_AttemptSetObjLength) /* 432 */
+#define Tcl_GetChannelThread \
+	(tclStubsPtr->tcl_GetChannelThread) /* 433 */
+#define Tcl_GetUnicodeFromObj \
+	(tclStubsPtr->tcl_GetUnicodeFromObj) /* 434 */
+#define Tcl_GetMathFuncInfo \
+	(tclStubsPtr->tcl_GetMathFuncInfo) /* 435 */
+#define Tcl_ListMathFuncs \
+	(tclStubsPtr->tcl_ListMathFuncs) /* 436 */
+#define Tcl_SubstObj \
+	(tclStubsPtr->tcl_SubstObj) /* 437 */
+#define Tcl_DetachChannel \
+	(tclStubsPtr->tcl_DetachChannel) /* 438 */
+#define Tcl_IsStandardChannel \
+	(tclStubsPtr->tcl_IsStandardChannel) /* 439 */
+#define Tcl_FSCopyFile \
+	(tclStubsPtr->tcl_FSCopyFile) /* 440 */
+#define Tcl_FSCopyDirectory \
+	(tclStubsPtr->tcl_FSCopyDirectory) /* 441 */
+#define Tcl_FSCreateDirectory \
+	(tclStubsPtr->tcl_FSCreateDirectory) /* 442 */
+#define Tcl_FSDeleteFile \
+	(tclStubsPtr->tcl_FSDeleteFile) /* 443 */
+#define Tcl_FSLoadFile \
+	(tclStubsPtr->tcl_FSLoadFile) /* 444 */
+#define Tcl_FSMatchInDirectory \
+	(tclStubsPtr->tcl_FSMatchInDirectory) /* 445 */
+#define Tcl_FSLink \
+	(tclStubsPtr->tcl_FSLink) /* 446 */
+#define Tcl_FSRemoveDirectory \
+	(tclStubsPtr->tcl_FSRemoveDirectory) /* 447 */
+#define Tcl_FSRenameFile \
+	(tclStubsPtr->tcl_FSRenameFile) /* 448 */
+#define Tcl_FSLstat \
+	(tclStubsPtr->tcl_FSLstat) /* 449 */
+#define Tcl_FSUtime \
+	(tclStubsPtr->tcl_FSUtime) /* 450 */
+#define Tcl_FSFileAttrsGet \
+	(tclStubsPtr->tcl_FSFileAttrsGet) /* 451 */
+#define Tcl_FSFileAttrsSet \
+	(tclStubsPtr->tcl_FSFileAttrsSet) /* 452 */
+#define Tcl_FSFileAttrStrings \
+	(tclStubsPtr->tcl_FSFileAttrStrings) /* 453 */
+#define Tcl_FSStat \
+	(tclStubsPtr->tcl_FSStat) /* 454 */
+#define Tcl_FSAccess \
+	(tclStubsPtr->tcl_FSAccess) /* 455 */
+#define Tcl_FSOpenFileChannel \
+	(tclStubsPtr->tcl_FSOpenFileChannel) /* 456 */
+#define Tcl_FSGetCwd \
+	(tclStubsPtr->tcl_FSGetCwd) /* 457 */
+#define Tcl_FSChdir \
+	(tclStubsPtr->tcl_FSChdir) /* 458 */
+#define Tcl_FSConvertToPathType \
+	(tclStubsPtr->tcl_FSConvertToPathType) /* 459 */
+#define Tcl_FSJoinPath \
+	(tclStubsPtr->tcl_FSJoinPath) /* 460 */
+#define Tcl_FSSplitPath \
+	(tclStubsPtr->tcl_FSSplitPath) /* 461 */
+#define Tcl_FSEqualPaths \
+	(tclStubsPtr->tcl_FSEqualPaths) /* 462 */
+#define Tcl_FSGetNormalizedPath \
+	(tclStubsPtr->tcl_FSGetNormalizedPath) /* 463 */
+#define Tcl_FSJoinToPath \
+	(tclStubsPtr->tcl_FSJoinToPath) /* 464 */
+#define Tcl_FSGetInternalRep \
+	(tclStubsPtr->tcl_FSGetInternalRep) /* 465 */
+#define Tcl_FSGetTranslatedPath \
+	(tclStubsPtr->tcl_FSGetTranslatedPath) /* 466 */
+#define Tcl_FSEvalFile \
+	(tclStubsPtr->tcl_FSEvalFile) /* 467 */
+#define Tcl_FSNewNativePath \
+	(tclStubsPtr->tcl_FSNewNativePath) /* 468 */
+#define Tcl_FSGetNativePath \
+	(tclStubsPtr->tcl_FSGetNativePath) /* 469 */
+#define Tcl_FSFileSystemInfo \
+	(tclStubsPtr->tcl_FSFileSystemInfo) /* 470 */
+#define Tcl_FSPathSeparator \
+	(tclStubsPtr->tcl_FSPathSeparator) /* 471 */
+#define Tcl_FSListVolumes \
+	(tclStubsPtr->tcl_FSListVolumes) /* 472 */
+#define Tcl_FSRegister \
+	(tclStubsPtr->tcl_FSRegister) /* 473 */
+#define Tcl_FSUnregister \
+	(tclStubsPtr->tcl_FSUnregister) /* 474 */
+#define Tcl_FSData \
+	(tclStubsPtr->tcl_FSData) /* 475 */
+#define Tcl_FSGetTranslatedStringPath \
+	(tclStubsPtr->tcl_FSGetTranslatedStringPath) /* 476 */
+#define Tcl_FSGetFileSystemForPath \
+	(tclStubsPtr->tcl_FSGetFileSystemForPath) /* 477 */
+#define Tcl_FSGetPathType \
+	(tclStubsPtr->tcl_FSGetPathType) /* 478 */
+#define Tcl_OutputBuffered \
+	(tclStubsPtr->tcl_OutputBuffered) /* 479 */
+#define Tcl_FSMountsChanged \
+	(tclStubsPtr->tcl_FSMountsChanged) /* 480 */
+#define Tcl_EvalTokensStandard \
+	(tclStubsPtr->tcl_EvalTokensStandard) /* 481 */
+#define Tcl_GetTime \
+	(tclStubsPtr->tcl_GetTime) /* 482 */
+#define Tcl_CreateObjTrace \
+	(tclStubsPtr->tcl_CreateObjTrace) /* 483 */
+#define Tcl_GetCommandInfoFromToken \
+	(tclStubsPtr->tcl_GetCommandInfoFromToken) /* 484 */
+#define Tcl_SetCommandInfoFromToken \
+	(tclStubsPtr->tcl_SetCommandInfoFromToken) /* 485 */
+#define Tcl_DbNewWideIntObj \
+	(tclStubsPtr->tcl_DbNewWideIntObj) /* 486 */
+#define Tcl_GetWideIntFromObj \
+	(tclStubsPtr->tcl_GetWideIntFromObj) /* 487 */
+#define Tcl_NewWideIntObj \
+	(tclStubsPtr->tcl_NewWideIntObj) /* 488 */
+#define Tcl_SetWideIntObj \
+	(tclStubsPtr->tcl_SetWideIntObj) /* 489 */
+#define Tcl_AllocStatBuf \
+	(tclStubsPtr->tcl_AllocStatBuf) /* 490 */
+#define Tcl_Seek \
+	(tclStubsPtr->tcl_Seek) /* 491 */
+#define Tcl_Tell \
+	(tclStubsPtr->tcl_Tell) /* 492 */
+#define Tcl_ChannelWideSeekProc \
+	(tclStubsPtr->tcl_ChannelWideSeekProc) /* 493 */
+#define Tcl_DictObjPut \
+	(tclStubsPtr->tcl_DictObjPut) /* 494 */
+#define Tcl_DictObjGet \
+	(tclStubsPtr->tcl_DictObjGet) /* 495 */
+#define Tcl_DictObjRemove \
+	(tclStubsPtr->tcl_DictObjRemove) /* 496 */
+#define Tcl_DictObjSize \
+	(tclStubsPtr->tcl_DictObjSize) /* 497 */
+#define Tcl_DictObjFirst \
+	(tclStubsPtr->tcl_DictObjFirst) /* 498 */
+#define Tcl_DictObjNext \
+	(tclStubsPtr->tcl_DictObjNext) /* 499 */
+#define Tcl_DictObjDone \
+	(tclStubsPtr->tcl_DictObjDone) /* 500 */
+#define Tcl_DictObjPutKeyList \
+	(tclStubsPtr->tcl_DictObjPutKeyList) /* 501 */
+#define Tcl_DictObjRemoveKeyList \
+	(tclStubsPtr->tcl_DictObjRemoveKeyList) /* 502 */
+#define Tcl_NewDictObj \
+	(tclStubsPtr->tcl_NewDictObj) /* 503 */
+#define Tcl_DbNewDictObj \
+	(tclStubsPtr->tcl_DbNewDictObj) /* 504 */
+#define Tcl_RegisterConfig \
+	(tclStubsPtr->tcl_RegisterConfig) /* 505 */
+#define Tcl_CreateNamespace \
+	(tclStubsPtr->tcl_CreateNamespace) /* 506 */
+#define Tcl_DeleteNamespace \
+	(tclStubsPtr->tcl_DeleteNamespace) /* 507 */
+#define Tcl_AppendExportList \
+	(tclStubsPtr->tcl_AppendExportList) /* 508 */
+#define Tcl_Export \
+	(tclStubsPtr->tcl_Export) /* 509 */
+#define Tcl_Import \
+	(tclStubsPtr->tcl_Import) /* 510 */
+#define Tcl_ForgetImport \
+	(tclStubsPtr->tcl_ForgetImport) /* 511 */
+#define Tcl_GetCurrentNamespace \
+	(tclStubsPtr->tcl_GetCurrentNamespace) /* 512 */
+#define Tcl_GetGlobalNamespace \
+	(tclStubsPtr->tcl_GetGlobalNamespace) /* 513 */
+#define Tcl_FindNamespace \
+	(tclStubsPtr->tcl_FindNamespace) /* 514 */
+#define Tcl_FindCommand \
+	(tclStubsPtr->tcl_FindCommand) /* 515 */
+#define Tcl_GetCommandFromObj \
+	(tclStubsPtr->tcl_GetCommandFromObj) /* 516 */
+#define Tcl_GetCommandFullName \
+	(tclStubsPtr->tcl_GetCommandFullName) /* 517 */
+#define Tcl_FSEvalFileEx \
+	(tclStubsPtr->tcl_FSEvalFileEx) /* 518 */
+#define Tcl_SetExitProc \
+	(tclStubsPtr->tcl_SetExitProc) /* 519 */
+#define Tcl_LimitAddHandler \
+	(tclStubsPtr->tcl_LimitAddHandler) /* 520 */
+#define Tcl_LimitRemoveHandler \
+	(tclStubsPtr->tcl_LimitRemoveHandler) /* 521 */
+#define Tcl_LimitReady \
+	(tclStubsPtr->tcl_LimitReady) /* 522 */
+#define Tcl_LimitCheck \
+	(tclStubsPtr->tcl_LimitCheck) /* 523 */
+#define Tcl_LimitExceeded \
+	(tclStubsPtr->tcl_LimitExceeded) /* 524 */
+#define Tcl_LimitSetCommands \
+	(tclStubsPtr->tcl_LimitSetCommands) /* 525 */
+#define Tcl_LimitSetTime \
+	(tclStubsPtr->tcl_LimitSetTime) /* 526 */
+#define Tcl_LimitSetGranularity \
+	(tclStubsPtr->tcl_LimitSetGranularity) /* 527 */
+#define Tcl_LimitTypeEnabled \
+	(tclStubsPtr->tcl_LimitTypeEnabled) /* 528 */
+#define Tcl_LimitTypeExceeded \
+	(tclStubsPtr->tcl_LimitTypeExceeded) /* 529 */
+#define Tcl_LimitTypeSet \
+	(tclStubsPtr->tcl_LimitTypeSet) /* 530 */
+#define Tcl_LimitTypeReset \
+	(tclStubsPtr->tcl_LimitTypeReset) /* 531 */
+#define Tcl_LimitGetCommands \
+	(tclStubsPtr->tcl_LimitGetCommands) /* 532 */
+#define Tcl_LimitGetTime \
+	(tclStubsPtr->tcl_LimitGetTime) /* 533 */
+#define Tcl_LimitGetGranularity \
+	(tclStubsPtr->tcl_LimitGetGranularity) /* 534 */
+#define Tcl_SaveInterpState \
+	(tclStubsPtr->tcl_SaveInterpState) /* 535 */
+#define Tcl_RestoreInterpState \
+	(tclStubsPtr->tcl_RestoreInterpState) /* 536 */
+#define Tcl_DiscardInterpState \
+	(tclStubsPtr->tcl_DiscardInterpState) /* 537 */
+#define Tcl_SetReturnOptions \
+	(tclStubsPtr->tcl_SetReturnOptions) /* 538 */
+#define Tcl_GetReturnOptions \
+	(tclStubsPtr->tcl_GetReturnOptions) /* 539 */
+#define Tcl_IsEnsemble \
+	(tclStubsPtr->tcl_IsEnsemble) /* 540 */
+#define Tcl_CreateEnsemble \
+	(tclStubsPtr->tcl_CreateEnsemble) /* 541 */
+#define Tcl_FindEnsemble \
+	(tclStubsPtr->tcl_FindEnsemble) /* 542 */
+#define Tcl_SetEnsembleSubcommandList \
+	(tclStubsPtr->tcl_SetEnsembleSubcommandList) /* 543 */
+#define Tcl_SetEnsembleMappingDict \
+	(tclStubsPtr->tcl_SetEnsembleMappingDict) /* 544 */
+#define Tcl_SetEnsembleUnknownHandler \
+	(tclStubsPtr->tcl_SetEnsembleUnknownHandler) /* 545 */
+#define Tcl_SetEnsembleFlags \
+	(tclStubsPtr->tcl_SetEnsembleFlags) /* 546 */
+#define Tcl_GetEnsembleSubcommandList \
+	(tclStubsPtr->tcl_GetEnsembleSubcommandList) /* 547 */
+#define Tcl_GetEnsembleMappingDict \
+	(tclStubsPtr->tcl_GetEnsembleMappingDict) /* 548 */
+#define Tcl_GetEnsembleUnknownHandler \
+	(tclStubsPtr->tcl_GetEnsembleUnknownHandler) /* 549 */
+#define Tcl_GetEnsembleFlags \
+	(tclStubsPtr->tcl_GetEnsembleFlags) /* 550 */
+#define Tcl_GetEnsembleNamespace \
+	(tclStubsPtr->tcl_GetEnsembleNamespace) /* 551 */
+#define Tcl_SetTimeProc \
+	(tclStubsPtr->tcl_SetTimeProc) /* 552 */
+#define Tcl_QueryTimeProc \
+	(tclStubsPtr->tcl_QueryTimeProc) /* 553 */
+#define Tcl_ChannelThreadActionProc \
+	(tclStubsPtr->tcl_ChannelThreadActionProc) /* 554 */
+#define Tcl_NewBignumObj \
+	(tclStubsPtr->tcl_NewBignumObj) /* 555 */
+#define Tcl_DbNewBignumObj \
+	(tclStubsPtr->tcl_DbNewBignumObj) /* 556 */
+#define Tcl_SetBignumObj \
+	(tclStubsPtr->tcl_SetBignumObj) /* 557 */
+#define Tcl_GetBignumFromObj \
+	(tclStubsPtr->tcl_GetBignumFromObj) /* 558 */
+#define Tcl_TakeBignumFromObj \
+	(tclStubsPtr->tcl_TakeBignumFromObj) /* 559 */
+#define Tcl_TruncateChannel \
+	(tclStubsPtr->tcl_TruncateChannel) /* 560 */
+#define Tcl_ChannelTruncateProc \
+	(tclStubsPtr->tcl_ChannelTruncateProc) /* 561 */
+#define Tcl_SetChannelErrorInterp \
+	(tclStubsPtr->tcl_SetChannelErrorInterp) /* 562 */
+#define Tcl_GetChannelErrorInterp \
+	(tclStubsPtr->tcl_GetChannelErrorInterp) /* 563 */
+#define Tcl_SetChannelError \
+	(tclStubsPtr->tcl_SetChannelError) /* 564 */
+#define Tcl_GetChannelError \
+	(tclStubsPtr->tcl_GetChannelError) /* 565 */
+#define Tcl_InitBignumFromDouble \
+	(tclStubsPtr->tcl_InitBignumFromDouble) /* 566 */
+#define Tcl_GetNamespaceUnknownHandler \
+	(tclStubsPtr->tcl_GetNamespaceUnknownHandler) /* 567 */
+#define Tcl_SetNamespaceUnknownHandler \
+	(tclStubsPtr->tcl_SetNamespaceUnknownHandler) /* 568 */
+#define Tcl_GetEncodingFromObj \
+	(tclStubsPtr->tcl_GetEncodingFromObj) /* 569 */
+#define Tcl_GetEncodingSearchPath \
+	(tclStubsPtr->tcl_GetEncodingSearchPath) /* 570 */
+#define Tcl_SetEncodingSearchPath \
+	(tclStubsPtr->tcl_SetEncodingSearchPath) /* 571 */
+#define Tcl_GetEncodingNameFromEnvironment \
+	(tclStubsPtr->tcl_GetEncodingNameFromEnvironment) /* 572 */
+#define Tcl_PkgRequireProc \
+	(tclStubsPtr->tcl_PkgRequireProc) /* 573 */
+#define Tcl_AppendObjToErrorInfo \
+	(tclStubsPtr->tcl_AppendObjToErrorInfo) /* 574 */
+#define Tcl_AppendLimitedToObj \
+	(tclStubsPtr->tcl_AppendLimitedToObj) /* 575 */
+#define Tcl_Format \
+	(tclStubsPtr->tcl_Format) /* 576 */
+#define Tcl_AppendFormatToObj \
+	(tclStubsPtr->tcl_AppendFormatToObj) /* 577 */
+#define Tcl_ObjPrintf \
+	(tclStubsPtr->tcl_ObjPrintf) /* 578 */
+#define Tcl_AppendPrintfToObj \
+	(tclStubsPtr->tcl_AppendPrintfToObj) /* 579 */
+#define Tcl_CancelEval \
+	(tclStubsPtr->tcl_CancelEval) /* 580 */
+#define Tcl_Canceled \
+	(tclStubsPtr->tcl_Canceled) /* 581 */
+#define Tcl_CreatePipe \
+	(tclStubsPtr->tcl_CreatePipe) /* 582 */
+#define Tcl_NRCreateCommand \
+	(tclStubsPtr->tcl_NRCreateCommand) /* 583 */
+#define Tcl_NREvalObj \
+	(tclStubsPtr->tcl_NREvalObj) /* 584 */
+#define Tcl_NREvalObjv \
+	(tclStubsPtr->tcl_NREvalObjv) /* 585 */
+#define Tcl_NRCmdSwap \
+	(tclStubsPtr->tcl_NRCmdSwap) /* 586 */
+#define Tcl_NRAddCallback \
+	(tclStubsPtr->tcl_NRAddCallback) /* 587 */
+#define Tcl_NRCallObjProc \
+	(tclStubsPtr->tcl_NRCallObjProc) /* 588 */
+#define Tcl_GetFSDeviceFromStat \
+	(tclStubsPtr->tcl_GetFSDeviceFromStat) /* 589 */
+#define Tcl_GetFSInodeFromStat \
+	(tclStubsPtr->tcl_GetFSInodeFromStat) /* 590 */
+#define Tcl_GetModeFromStat \
+	(tclStubsPtr->tcl_GetModeFromStat) /* 591 */
+#define Tcl_GetLinkCountFromStat \
+	(tclStubsPtr->tcl_GetLinkCountFromStat) /* 592 */
+#define Tcl_GetUserIdFromStat \
+	(tclStubsPtr->tcl_GetUserIdFromStat) /* 593 */
+#define Tcl_GetGroupIdFromStat \
+	(tclStubsPtr->tcl_GetGroupIdFromStat) /* 594 */
+#define Tcl_GetDeviceTypeFromStat \
+	(tclStubsPtr->tcl_GetDeviceTypeFromStat) /* 595 */
+#define Tcl_GetAccessTimeFromStat \
+	(tclStubsPtr->tcl_GetAccessTimeFromStat) /* 596 */
+#define Tcl_GetModificationTimeFromStat \
+	(tclStubsPtr->tcl_GetModificationTimeFromStat) /* 597 */
+#define Tcl_GetChangeTimeFromStat \
+	(tclStubsPtr->tcl_GetChangeTimeFromStat) /* 598 */
+#define Tcl_GetSizeFromStat \
+	(tclStubsPtr->tcl_GetSizeFromStat) /* 599 */
+#define Tcl_GetBlocksFromStat \
+	(tclStubsPtr->tcl_GetBlocksFromStat) /* 600 */
+#define Tcl_GetBlockSizeFromStat \
+	(tclStubsPtr->tcl_GetBlockSizeFromStat) /* 601 */
+#define Tcl_SetEnsembleParameterList \
+	(tclStubsPtr->tcl_SetEnsembleParameterList) /* 602 */
+#define Tcl_GetEnsembleParameterList \
+	(tclStubsPtr->tcl_GetEnsembleParameterList) /* 603 */
+#define Tcl_ParseArgsObjv \
+	(tclStubsPtr->tcl_ParseArgsObjv) /* 604 */
+#define Tcl_GetErrorLine \
+	(tclStubsPtr->tcl_GetErrorLine) /* 605 */
+#define Tcl_SetErrorLine \
+	(tclStubsPtr->tcl_SetErrorLine) /* 606 */
+#define Tcl_TransferResult \
+	(tclStubsPtr->tcl_TransferResult) /* 607 */
+#define Tcl_InterpActive \
+	(tclStubsPtr->tcl_InterpActive) /* 608 */
+#define Tcl_BackgroundException \
+	(tclStubsPtr->tcl_BackgroundException) /* 609 */
+#define Tcl_ZlibDeflate \
+	(tclStubsPtr->tcl_ZlibDeflate) /* 610 */
+#define Tcl_ZlibInflate \
+	(tclStubsPtr->tcl_ZlibInflate) /* 611 */
+#define Tcl_ZlibCRC32 \
+	(tclStubsPtr->tcl_ZlibCRC32) /* 612 */
+#define Tcl_ZlibAdler32 \
+	(tclStubsPtr->tcl_ZlibAdler32) /* 613 */
+#define Tcl_ZlibStreamInit \
+	(tclStubsPtr->tcl_ZlibStreamInit) /* 614 */
+#define Tcl_ZlibStreamGetCommandName \
+	(tclStubsPtr->tcl_ZlibStreamGetCommandName) /* 615 */
+#define Tcl_ZlibStreamEof \
+	(tclStubsPtr->tcl_ZlibStreamEof) /* 616 */
+#define Tcl_ZlibStreamChecksum \
+	(tclStubsPtr->tcl_ZlibStreamChecksum) /* 617 */
+#define Tcl_ZlibStreamPut \
+	(tclStubsPtr->tcl_ZlibStreamPut) /* 618 */
+#define Tcl_ZlibStreamGet \
+	(tclStubsPtr->tcl_ZlibStreamGet) /* 619 */
+#define Tcl_ZlibStreamClose \
+	(tclStubsPtr->tcl_ZlibStreamClose) /* 620 */
+#define Tcl_ZlibStreamReset \
+	(tclStubsPtr->tcl_ZlibStreamReset) /* 621 */
+#define Tcl_SetStartupScript \
+	(tclStubsPtr->tcl_SetStartupScript) /* 622 */
+#define Tcl_GetStartupScript \
+	(tclStubsPtr->tcl_GetStartupScript) /* 623 */
+#define Tcl_CloseEx \
+	(tclStubsPtr->tcl_CloseEx) /* 624 */
+#define Tcl_NRExprObj \
+	(tclStubsPtr->tcl_NRExprObj) /* 625 */
+#define Tcl_NRSubstObj \
+	(tclStubsPtr->tcl_NRSubstObj) /* 626 */
+#define Tcl_LoadFile \
+	(tclStubsPtr->tcl_LoadFile) /* 627 */
+#define Tcl_FindSymbol \
+	(tclStubsPtr->tcl_FindSymbol) /* 628 */
+#define Tcl_FSUnloadFile \
+	(tclStubsPtr->tcl_FSUnloadFile) /* 629 */
+#define Tcl_ZlibStreamSetCompressionDictionary \
+	(tclStubsPtr->tcl_ZlibStreamSetCompressionDictionary) /* 630 */
+#define Tcl_OpenTcpServerEx \
+	(tclStubsPtr->tcl_OpenTcpServerEx) /* 631 */
+#define TclZipfs_Mount \
+	(tclStubsPtr->tclZipfs_Mount) /* 632 */
+#define TclZipfs_Unmount \
+	(tclStubsPtr->tclZipfs_Unmount) /* 633 */
+#define TclZipfs_TclLibrary \
+	(tclStubsPtr->tclZipfs_TclLibrary) /* 634 */
+#define TclZipfs_MountBuffer \
+	(tclStubsPtr->tclZipfs_MountBuffer) /* 635 */
+#define Tcl_FreeInternalRep \
+	(tclStubsPtr->tcl_FreeInternalRep) /* 636 */
+#define Tcl_InitStringRep \
+	(tclStubsPtr->tcl_InitStringRep) /* 637 */
+#define Tcl_FetchInternalRep \
+	(tclStubsPtr->tcl_FetchInternalRep) /* 638 */
+#define Tcl_StoreInternalRep \
+	(tclStubsPtr->tcl_StoreInternalRep) /* 639 */
+#define Tcl_HasStringRep \
+	(tclStubsPtr->tcl_HasStringRep) /* 640 */
+#define Tcl_IncrRefCount \
+	(tclStubsPtr->tcl_IncrRefCount) /* 641 */
+#define Tcl_DecrRefCount \
+	(tclStubsPtr->tcl_DecrRefCount) /* 642 */
+#define Tcl_IsShared \
+	(tclStubsPtr->tcl_IsShared) /* 643 */
+#define Tcl_LinkArray \
+	(tclStubsPtr->tcl_LinkArray) /* 644 */
+#define Tcl_GetIntForIndex \
+	(tclStubsPtr->tcl_GetIntForIndex) /* 645 */
+#define Tcl_UtfToUniChar \
+	(tclStubsPtr->tcl_UtfToUniChar) /* 646 */
+#define Tcl_UniCharToUtfDString \
+	(tclStubsPtr->tcl_UniCharToUtfDString) /* 647 */
+#define Tcl_UtfToUniCharDString \
+	(tclStubsPtr->tcl_UtfToUniCharDString) /* 648 */
+#define Tcl_GetBytesFromObj \
+	(tclStubsPtr->tcl_GetBytesFromObj) /* 649 */
+/* Slot 650 is reserved */
+/* Slot 651 is reserved */
+/* Slot 652 is reserved */
+/* Slot 653 is reserved */
+#define Tcl_UtfCharComplete \
+	(tclStubsPtr->tcl_UtfCharComplete) /* 654 */
+#define Tcl_UtfNext \
+	(tclStubsPtr->tcl_UtfNext) /* 655 */
+#define Tcl_UtfPrev \
+	(tclStubsPtr->tcl_UtfPrev) /* 656 */
+#define Tcl_UniCharIsUnicode \
+	(tclStubsPtr->tcl_UniCharIsUnicode) /* 657 */
+#define Tcl_ExternalToUtfDStringEx \
+	(tclStubsPtr->tcl_ExternalToUtfDStringEx) /* 658 */
+#define Tcl_UtfToExternalDStringEx \
+	(tclStubsPtr->tcl_UtfToExternalDStringEx) /* 659 */
+#define Tcl_AsyncMarkFromSignal \
+	(tclStubsPtr->tcl_AsyncMarkFromSignal) /* 660 */
+/* Slot 661 is reserved */
+/* Slot 662 is reserved */
+/* Slot 663 is reserved */
+/* Slot 664 is reserved */
+/* Slot 665 is reserved */
+/* Slot 666 is reserved */
+/* Slot 667 is reserved */
+#define Tcl_UniCharLen \
+	(tclStubsPtr->tcl_UniCharLen) /* 668 */
+#define TclNumUtfChars \
+	(tclStubsPtr->tclNumUtfChars) /* 669 */
+#define TclGetCharLength \
+	(tclStubsPtr->tclGetCharLength) /* 670 */
+#define TclUtfAtIndex \
+	(tclStubsPtr->tclUtfAtIndex) /* 671 */
+#define TclGetRange \
+	(tclStubsPtr->tclGetRange) /* 672 */
+#define TclGetUniChar \
+	(tclStubsPtr->tclGetUniChar) /* 673 */
+#define Tcl_GetBool \
+	(tclStubsPtr->tcl_GetBool) /* 674 */
+#define Tcl_GetBoolFromObj \
+	(tclStubsPtr->tcl_GetBoolFromObj) /* 675 */
+/* Slot 676 is reserved */
+/* Slot 677 is reserved */
+/* Slot 678 is reserved */
+/* Slot 679 is reserved */
+#define Tcl_GetNumberFromObj \
+	(tclStubsPtr->tcl_GetNumberFromObj) /* 680 */
+#define Tcl_GetNumber \
+	(tclStubsPtr->tcl_GetNumber) /* 681 */
+#define Tcl_RemoveChannelMode \
+	(tclStubsPtr->tcl_RemoveChannelMode) /* 682 */
+#define Tcl_GetEncodingNulLength \
+	(tclStubsPtr->tcl_GetEncodingNulLength) /* 683 */
+#define Tcl_GetWideUIntFromObj \
+	(tclStubsPtr->tcl_GetWideUIntFromObj) /* 684 */
+#define Tcl_DStringToObj \
+	(tclStubsPtr->tcl_DStringToObj) /* 685 */
+/* Slot 686 is reserved */
+/* Slot 687 is reserved */
+#define TclUnusedStubEntry \
+	(tclStubsPtr->tclUnusedStubEntry) /* 688 */
+
+#endif /* defined(USE_TCL_STUBS) */
+
+/* !END!: Do not edit above this line. */
+
+#undef TclUnusedStubEntry
+
+#if defined(USE_TCL_STUBS)
+#   undef Tcl_CreateInterp
+#   undef Tcl_FindExecutable
+#   undef Tcl_GetStringResult
+#   undef Tcl_Init
+#   undef Tcl_SetPanicProc
+#   undef Tcl_SetExitProc
+#   undef Tcl_ObjSetVar2
+#   undef Tcl_StaticLibrary
+#   define Tcl_CreateInterp() (tclStubsPtr->tcl_CreateInterp())
+#   define Tcl_GetStringResult(interp) (tclStubsPtr->tcl_GetStringResult(interp))
+#   define Tcl_Init(interp) (tclStubsPtr->tcl_Init(interp))
+#   define Tcl_ObjSetVar2(interp, part1, part2, newValue, flags) \
+	    (tclStubsPtr->tcl_ObjSetVar2(interp, part1, part2, newValue, flags))
+#endif
+
+#if defined(_WIN32) && defined(UNICODE)
+#   if defined(TCL_NO_DEPRECATED)
+#	define Tcl_FindExecutable(arg) ((Tcl_FindExecutable)((const char *)(arg)))
+#   else
+#	define Tcl_FindExecutable(arg) ((void)((Tcl_FindExecutable)((const char *)(arg))))
+#	define Tcl_SetPanicProc(arg) ((void)((Tcl_SetPanicProc)(arg)))
+#   endif
+#   define Tcl_MainEx Tcl_MainExW
+    EXTERN void Tcl_MainExW(Tcl_Size argc, wchar_t **argv,
+	    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
+#elif !defined(TCL_NO_DEPRECATED)
+#   define Tcl_FindExecutable(arg) ((void)((Tcl_FindExecutable)(arg)))
+#   define Tcl_SetPanicProc(arg) ((void)((Tcl_SetPanicProc)(arg)))
+#endif
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
+#undef Tcl_SeekOld
+#undef Tcl_TellOld
+
+#undef Tcl_PkgPresent
+#define Tcl_PkgPresent(interp, name, version, exact) \
+	Tcl_PkgPresentEx(interp, name, version, exact, NULL)
+#undef Tcl_PkgProvide
+#define Tcl_PkgProvide(interp, name, version) \
+	Tcl_PkgProvideEx(interp, name, version, NULL)
+#undef Tcl_PkgRequire
+#define Tcl_PkgRequire(interp, name, version, exact) \
+	Tcl_PkgRequireEx(interp, name, version, exact, NULL)
+#undef Tcl_GetIndexFromObj
+#define Tcl_GetIndexFromObj(interp, objPtr, tablePtr, msg, flags, indexPtr) \
+	Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, \
+	sizeof(char *), msg, flags, indexPtr)
+#undef Tcl_NewBooleanObj
+#define Tcl_NewBooleanObj(intValue) \
+	Tcl_NewWideIntObj((intValue)!=0)
+#undef Tcl_DbNewBooleanObj
+#define Tcl_DbNewBooleanObj(intValue, file, line) \
+	Tcl_DbNewWideIntObj((intValue)!=0, file, line)
+#undef Tcl_SetBooleanObj
+#define Tcl_SetBooleanObj(objPtr, intValue) \
+	Tcl_SetWideIntObj(objPtr, (intValue)!=0)
+#undef Tcl_SetVar
+#define Tcl_SetVar(interp, varName, newValue, flags) \
+	Tcl_SetVar2(interp, varName, NULL, newValue, flags)
+#undef Tcl_UnsetVar
+#define Tcl_UnsetVar(interp, varName, flags) \
+	Tcl_UnsetVar2(interp, varName, NULL, flags)
+#undef Tcl_GetVar
+#define Tcl_GetVar(interp, varName, flags) \
+	Tcl_GetVar2(interp, varName, NULL, flags)
+#undef Tcl_TraceVar
+#define Tcl_TraceVar(interp, varName, flags, proc, clientData) \
+	Tcl_TraceVar2(interp, varName, NULL, flags, proc, clientData)
+#undef Tcl_UntraceVar
+#define Tcl_UntraceVar(interp, varName, flags, proc, clientData) \
+	Tcl_UntraceVar2(interp, varName, NULL, flags, proc, clientData)
+#undef Tcl_VarTraceInfo
+#define Tcl_VarTraceInfo(interp, varName, flags, proc, prevClientData) \
+	Tcl_VarTraceInfo2(interp, varName, NULL, flags, proc, prevClientData)
+#undef Tcl_UpVar
+#define Tcl_UpVar(interp, frameName, varName, localName, flags) \
+	Tcl_UpVar2(interp, frameName, varName, NULL, localName, flags)
+#undef Tcl_AddErrorInfo
+#define Tcl_AddErrorInfo(interp, message) \
+	Tcl_AppendObjToErrorInfo(interp, Tcl_NewStringObj(message, TCL_INDEX_NONE))
+#undef Tcl_AddObjErrorInfo
+#define Tcl_AddObjErrorInfo(interp, message, length) \
+	Tcl_AppendObjToErrorInfo(interp, Tcl_NewStringObj(message, length))
+#ifdef TCL_NO_DEPRECATED
+#undef Tcl_FreeResult
+#undef Tcl_AppendResultVA
+#undef Tcl_AppendStringsToObjVA
+#undef Tcl_SetErrorCodeVA
+#undef Tcl_VarEvalVA
+#undef Tcl_PanicVA
+#undef Tcl_GetStringResult
+#undef Tcl_GetDefaultEncodingDir
+#undef Tcl_SetDefaultEncodingDir
+#undef Tcl_UniCharNcmp
+#undef Tcl_EvalTokens
+#undef Tcl_UniCharNcasecmp
+#undef Tcl_UniCharCaseMatch
+#undef Tcl_GetMathFuncInfo
+#undef Tcl_ListMathFuncs
+#define Tcl_GetStringResult(interp) Tcl_GetString(Tcl_GetObjResult(interp))
+#undef Tcl_Eval
+#define Tcl_Eval(interp, objPtr) \
+	Tcl_EvalEx(interp, objPtr, TCL_INDEX_NONE, 0)
+#undef Tcl_GlobalEval
+#define Tcl_GlobalEval(interp, objPtr) \
+	Tcl_EvalEx(interp, objPtr, TCL_INDEX_NONE, TCL_EVAL_GLOBAL)
+#undef Tcl_SaveResult
+#undef Tcl_RestoreResult
+#undef Tcl_DiscardResult
+#undef Tcl_SetResult
+#define Tcl_SetResult(interp, result, freeProc) \
+	do { \
+	    const char *__result = result; \
+	    Tcl_FreeProc *__freeProc = freeProc; \
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(__result, TCL_INDEX_NONE)); \
+	    if (__result != NULL && __freeProc != NULL && __freeProc != TCL_VOLATILE) { \
+		if (__freeProc == TCL_DYNAMIC) { \
+		    ckfree((char *)__result); \
+		} else { \
+		    (*__freeProc)((char *)__result); \
+		} \
+	    } \
+	} while(0)
+#endif /* TCL_NO_DEPRECATED */
+
+#if defined(USE_TCL_STUBS)
+#   if defined(_WIN32) && defined(_WIN64)
+#	undef Tcl_GetTime
+/* Handle Win64 tk.dll being loaded in Cygwin64. */
+#	define Tcl_GetTime(t) \
+		do { \
+		    struct { \
+			Tcl_Time now; \
+			long long reserved; \
+		    } _t; \
+		    _t.reserved = -1; \
+		    tclStubsPtr->tcl_GetTime((&_t.now)); \
+		    if (_t.reserved != -1) { \
+			_t.now.usec = (long) _t.reserved; \
+		    } \
+		    *(t) = _t.now; \
+		} while (0)
+#   endif
+#   if defined(__CYGWIN__) && defined(TCL_WIDE_INT_IS_LONG)
+/* On Cygwin64, long is 64-bit while on Win64 long is 32-bit. Therefore
+ * we have to make sure that all stub entries on Cygwin64 follow the
+ * Win64 signature. Cygwin64 stubbed extensions cannot use those stub
+ * entries any more, they should use the 64-bit alternatives where
+ * possible. Tcl 9 must find a better solution, but that cannot be done
+ * without introducing a binary incompatibility.
+ */
+#	undef Tcl_GetLongFromObj
+#	undef Tcl_ExprLong
+#	undef Tcl_ExprLongObj
+#	undef Tcl_UniCharNcmp
+#	undef Tcl_UtfNcmp
+#	undef Tcl_UtfNcasecmp
+#	undef Tcl_UniCharNcasecmp
+#	define Tcl_GetLongFromObj ((int(*)(Tcl_Interp*,Tcl_Obj*,long*))Tcl_GetWideIntFromObj)
+#	define Tcl_ExprLong TclExprLong
+	static inline int TclExprLong(Tcl_Interp *interp, const char *string, long *ptr){
+	    int intValue;
+	    int result = tclStubsPtr->tcl_ExprLong(interp, string, (long *)&intValue);
+	    if (result == TCL_OK) *ptr = (long)intValue;
+	    return result;
+	}
+#	define Tcl_ExprLongObj TclExprLongObj
+	static inline int TclExprLongObj(Tcl_Interp *interp, Tcl_Obj *obj, long *ptr){
+	    int intValue;
+	    int result = tclStubsPtr->tcl_ExprLongObj(interp, obj, (long *)&intValue);
+	    if (result == TCL_OK) *ptr = (long)intValue;
+	    return result;
+	}
+#	define Tcl_UniCharNcmp(ucs,uct,n) \
+		((int(*)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned int))tclStubsPtr->tcl_UniCharNcmp)(ucs,uct,(unsigned int)(n))
+#	define Tcl_UtfNcmp(s1,s2,n) \
+		((int(*)(const char*,const char*,unsigned int))(void *)tclStubsPtr->tcl_UtfNcmp)(s1,s2,(unsigned int)(n))
+#	define Tcl_UtfNcasecmp(s1,s2,n) \
+		((int(*)(const char*,const char*,unsigned int))(void *)tclStubsPtr->tcl_UtfNcasecmp)(s1,s2,(unsigned int)(n))
+#	define Tcl_UniCharNcasecmp(ucs,uct,n) \
+		((int(*)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned int))(void *)tclStubsPtr->tcl_UniCharNcasecmp)(ucs,uct,(unsigned int)(n))
+#   endif
+#endif
+
+#undef Tcl_GetString
+#undef Tcl_GetUnicode
+#define Tcl_GetString(objPtr) \
+	Tcl_GetStringFromObj(objPtr, NULL)
+#define Tcl_GetUnicode(objPtr) \
+	Tcl_GetUnicodeFromObj(objPtr, NULL)
+#undef Tcl_GetIndexFromObjStruct
+#undef Tcl_GetBooleanFromObj
+#undef Tcl_GetBoolean
+#if defined(USE_TCL_STUBS)
+#define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
+	(tclStubsPtr->tcl_GetIndexFromObjStruct((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
+#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
+	(sizeof(*(boolPtr)) == sizeof(int) ? tclStubsPtr->tcl_GetBooleanFromObj(interp, objPtr, (int *)(boolPtr)) : \
+	Tcl_GetBoolFromObj(interp, objPtr, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
+#define Tcl_GetBoolean(interp, src, boolPtr) \
+	(sizeof(*(boolPtr)) == sizeof(int) ? tclStubsPtr->tcl_GetBoolean(interp, src, (int *)(boolPtr)) : \
+	Tcl_GetBool(interp, src, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
+#else
+#define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
+	((Tcl_GetIndexFromObjStruct)((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
+#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
+	(sizeof(*(boolPtr)) == sizeof(int) ? Tcl_GetBooleanFromObj(interp, objPtr, (int *)(boolPtr)) : \
+	Tcl_GetBoolFromObj(interp, objPtr, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
+#define Tcl_GetBoolean(interp, src, boolPtr) \
+	(sizeof(*(boolPtr)) == sizeof(int) ? Tcl_GetBoolean(interp, src, (int *)(boolPtr)) : \
+	Tcl_GetBool(interp, src, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
+#endif
+
+#undef Tcl_NewLongObj
+#define Tcl_NewLongObj(value) Tcl_NewWideIntObj((long)(value))
+#undef Tcl_NewIntObj
+#define Tcl_NewIntObj(value) Tcl_NewWideIntObj((int)(value))
+#undef Tcl_DbNewLongObj
+#define Tcl_DbNewLongObj(value, file, line) Tcl_DbNewWideIntObj((long)(value), file, line)
+#undef Tcl_SetIntObj
+#define Tcl_SetIntObj(objPtr, value)	Tcl_SetWideIntObj((objPtr), (int)(value))
+#undef Tcl_SetLongObj
+#define Tcl_SetLongObj(objPtr, value)	Tcl_SetWideIntObj((objPtr), (long)(value))
+#undef Tcl_BackgroundError
+#define Tcl_BackgroundError(interp)	Tcl_BackgroundException((interp), TCL_ERROR)
+#undef Tcl_StringMatch
+#define Tcl_StringMatch(str, pattern) Tcl_StringCaseMatch((str), (pattern), 0)
+
+#if TCL_UTF_MAX < 4
+#   undef Tcl_UniCharToUtfDString
+#   define Tcl_UniCharToUtfDString Tcl_Char16ToUtfDString
+#   undef Tcl_UtfToUniCharDString
+#   define Tcl_UtfToUniCharDString Tcl_UtfToChar16DString
+#   undef Tcl_UtfToUniChar
+#   define Tcl_UtfToUniChar Tcl_UtfToChar16
+#   undef Tcl_UniCharLen
+#   define Tcl_UniCharLen Tcl_Char16Len
+#elif !defined(BUILD_tcl)
+#   undef Tcl_NumUtfChars
+#   define Tcl_NumUtfChars TclNumUtfChars
+#   undef Tcl_GetCharLength
+#   define Tcl_GetCharLength TclGetCharLength
+#   undef Tcl_UtfAtIndex
+#   define Tcl_UtfAtIndex TclUtfAtIndex
+#   undef Tcl_GetRange
+#   define Tcl_GetRange TclGetRange
+#   undef Tcl_GetUniChar
+#   define Tcl_GetUniChar TclGetUniChar
+#endif
+#if defined(USE_TCL_STUBS)
+#   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
+		? (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))tclStubsPtr->tcl_UniCharToUtfDString \
+		: (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_Char16ToUtfDString)
+#   define Tcl_UtfToWCharDString (sizeof(wchar_t) != sizeof(short) \
+		? (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))tclStubsPtr->tcl_UtfToUniCharDString \
+		: (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))Tcl_UtfToChar16DString)
+#   define Tcl_UtfToWChar (sizeof(wchar_t) != sizeof(short) \
+		? (int (*)(const char *, wchar_t *))tclStubsPtr->tcl_UtfToUniChar \
+		: (int (*)(const char *, wchar_t *))Tcl_UtfToChar16)
+#   define Tcl_WCharLen (sizeof(wchar_t) != sizeof(short) \
+		? (Tcl_Size (*)(wchar_t *))tclStubsPtr->tcl_UniCharLen \
+		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
+#else /* !defined(USE_TCL_STUBS) */
+#   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
+		? (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_UniCharToUtfDString \
+		: (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_Char16ToUtfDString)
+#   define Tcl_UtfToWCharDString (sizeof(wchar_t) != sizeof(short) \
+		? (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))Tcl_UtfToUniCharDString \
+		: (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))Tcl_UtfToChar16DString)
+#   define Tcl_UtfToWChar (sizeof(wchar_t) != sizeof(short) \
+		? (int (*)(const char *, wchar_t *))Tcl_UtfToUniChar \
+		: (int (*)(const char *, wchar_t *))Tcl_UtfToChar16)
+#   define Tcl_WCharLen (sizeof(wchar_t) != sizeof(short) \
+		? (Tcl_Size (*)(wchar_t *))Tcl_UniCharLen \
+		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
+#endif /* defined(USE_TCL_STUBS) */
+
+/*
+ * Deprecated Tcl procedures:
+ */
+
+#ifdef TCL_NO_DEPRECATED
+#   undef Tcl_SavedResult
+#endif /* TCL_NO_DEPRECATED */
+#undef Tcl_EvalObj
+#define Tcl_EvalObj(interp, objPtr) \
+    Tcl_EvalObjEx(interp, objPtr, 0)
+#undef Tcl_GlobalEvalObj
+#define Tcl_GlobalEvalObj(interp, objPtr) \
+    Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL)
+
+#if defined(TCL_NO_DEPRECATED) && defined(USE_TCL_STUBS)
+#undef Tcl_Close
+#define Tcl_Close(interp, chan) Tcl_CloseEx(interp, chan, 0)
+#endif
+
+#undef TclUtfCharComplete
+#undef TclUtfNext
+#undef TclUtfPrev
+#if defined(USE_TCL_STUBS) && (TCL_UTF_MAX < 4) && !defined(TCL_NO_DEPRECATED)
+#   undef Tcl_UtfCharComplete
+#   undef Tcl_UtfNext
+#   undef Tcl_UtfPrev
+#   define Tcl_UtfCharComplete (tclStubsPtr->tclUtfCharComplete)
+#   define Tcl_UtfNext (tclStubsPtr->tclUtfNext)
+#   define Tcl_UtfPrev (tclStubsPtr->tclUtfPrev)
+#endif
+#define Tcl_CreateSlave Tcl_CreateChild
+#define Tcl_GetSlave Tcl_GetChild
+#define Tcl_GetMaster Tcl_GetParent
+
+#define Tcl_NRCallObjProc2 Tcl_NRCallObjProc
+#define Tcl_CreateObjCommand2 Tcl_CreateObjCommand
+#define Tcl_CreateObjTrace2 Tcl_CreateObjTrace
+#define Tcl_NRCreateCommand2 Tcl_NRCreateCommand
+
+/* TIP #660 */
+#define Tcl_GetSizeIntFromObj Tcl_GetIntFromObj
+
+#endif /* _TCLDECLS */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.7/tclPlatDecls.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.7/tclPlatDecls.h
new file mode 100644
index 00000000..8d1eee13
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl8.7/tclPlatDecls.h
@@ -0,0 +1,159 @@
+/*
+ * tclPlatDecls.h --
+ *
+ *	Declarations of platform specific Tcl APIs.
+ *
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ * All rights reserved.
+ */
+
+#ifndef _TCLPLATDECLS
+#define _TCLPLATDECLS
+
+#undef TCL_STORAGE_CLASS
+#ifdef BUILD_tcl
+#   define TCL_STORAGE_CLASS DLLEXPORT
+#else
+#   ifdef USE_TCL_STUBS
+#      define TCL_STORAGE_CLASS
+#   else
+#      define TCL_STORAGE_CLASS DLLIMPORT
+#   endif
+#endif
+
+/*
+ * WARNING: This file is automatically generated by the tools/genStubs.tcl
+ * script.  Any modifications to the function declarations below should be made
+ * in the generic/tcl.decls script.
+ */
+
+/*
+ * TCHAR is needed here for win32, so if it is not defined yet do it here.
+ * This way, we don't need to include <tchar.h> just for one define.
+ */
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(_TCHAR_DEFINED)
+#   if defined(_UNICODE)
+	typedef wchar_t TCHAR;
+#   else
+	typedef char TCHAR;
+#   endif
+#   define _TCHAR_DEFINED
+#endif
+
+#ifndef MODULE_SCOPE
+#   ifdef __cplusplus
+#	define MODULE_SCOPE extern "C"
+#   else
+#	define MODULE_SCOPE extern
+#   endif
+#endif
+
+/* !BEGIN!: Do not edit below this line. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+/* 0 */
+EXTERN TCHAR *		Tcl_WinUtfToTChar(const char *str, int len,
+				Tcl_DString *dsPtr);
+/* 1 */
+EXTERN char *		Tcl_WinTCharToUtf(const TCHAR *str, int len,
+				Tcl_DString *dsPtr);
+/* Slot 2 is reserved */
+/* 3 */
+EXTERN void		Tcl_WinConvertError(unsigned errCode);
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+/* 0 */
+EXTERN int		Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp,
+				const char *bundleName, int hasResourceFile,
+				Tcl_Size maxPathLen, char *libraryPath);
+/* 1 */
+EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
+				Tcl_Interp *interp, const char *bundleName,
+				const char *bundleVersion,
+				int hasResourceFile, Tcl_Size maxPathLen,
+				char *libraryPath);
+/* 2 */
+EXTERN void		Tcl_MacOSXNotifierAddRunLoopMode(
+				const void *runLoopMode);
+#endif /* MACOSX */
+
+typedef struct TclPlatStubs {
+    int magic;
+    void *hooks;
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+    TCHAR * (*tcl_WinUtfToTChar) (const char *str, int len, Tcl_DString *dsPtr); /* 0 */
+    char * (*tcl_WinTCharToUtf) (const TCHAR *str, int len, Tcl_DString *dsPtr); /* 1 */
+    void (*reserved2)(void);
+    void (*tcl_WinConvertError) (unsigned errCode); /* 3 */
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+    int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, const char *bundleName, int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath); /* 0 */
+    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath); /* 1 */
+    void (*tcl_MacOSXNotifierAddRunLoopMode) (const void *runLoopMode); /* 2 */
+#endif /* MACOSX */
+} TclPlatStubs;
+
+extern const TclPlatStubs *tclPlatStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_TCL_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#define Tcl_WinUtfToTChar \
+	(tclPlatStubsPtr->tcl_WinUtfToTChar) /* 0 */
+#define Tcl_WinTCharToUtf \
+	(tclPlatStubsPtr->tcl_WinTCharToUtf) /* 1 */
+/* Slot 2 is reserved */
+#define Tcl_WinConvertError \
+	(tclPlatStubsPtr->tcl_WinConvertError) /* 3 */
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+#define Tcl_MacOSXOpenBundleResources \
+	(tclPlatStubsPtr->tcl_MacOSXOpenBundleResources) /* 0 */
+#define Tcl_MacOSXOpenVersionedBundleResources \
+	(tclPlatStubsPtr->tcl_MacOSXOpenVersionedBundleResources) /* 1 */
+#define Tcl_MacOSXNotifierAddRunLoopMode \
+	(tclPlatStubsPtr->tcl_MacOSXNotifierAddRunLoopMode) /* 2 */
+#endif /* MACOSX */
+
+#endif /* defined(USE_TCL_STUBS) */
+
+/* !END!: Do not edit above this line. */
+
+#ifdef MAC_OSX_TCL /* MACOSX */
+#undef Tcl_MacOSXOpenBundleResources
+#define Tcl_MacOSXOpenBundleResources(a,b,c,d,e) Tcl_MacOSXOpenVersionedBundleResources(a,b,NULL,c,d,e)
+#endif
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
+#if defined(USE_TCL_STUBS) && (defined(_WIN32) || defined(__CYGWIN__))\
+	&& (defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8)
+#undef Tcl_WinUtfToTChar
+#undef Tcl_WinTCharToUtf
+#ifdef _WIN32
+#define Tcl_WinUtfToTChar(string, len, dsPtr) (Tcl_DStringInit(dsPtr), \
+		(TCHAR *)Tcl_UtfToChar16DString((string), (len), (dsPtr)))
+#define Tcl_WinTCharToUtf(string, len, dsPtr) (Tcl_DStringInit(dsPtr), \
+		(char *)Tcl_Char16ToUtfDString((const unsigned short *)(string), ((((len) + 2) >> 1) - 1), (dsPtr)))
+#endif
+#endif
+
+#endif /* _TCLPLATDECLS */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl9.0/tcl.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl9.0/tcl.h
new file mode 100644
index 00000000..0f532285
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl9.0/tcl.h
@@ -0,0 +1,2619 @@
+/*
+ * tcl.h --
+ *
+ *	This header file describes the externally-visible facilities of the
+ *	Tcl interpreter.
+ *
+ * Copyright (c) 1987-1994 The Regents of the University of California.
+ * Copyright (c) 1993-1996 Lucent Technologies.
+ * Copyright (c) 1994-1998 Sun Microsystems, Inc.
+ * Copyright (c) 1998-2000 by Scriptics Corporation.
+ * Copyright (c) 2002 by Kevin B. Kenny.  All rights reserved.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#ifndef _TCL
+#define _TCL
+
+/*
+ * For C++ compilers, use extern "C"
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The following defines are used to indicate the various release levels.
+ */
+
+#define TCL_ALPHA_RELEASE	0
+#define TCL_BETA_RELEASE	1
+#define TCL_FINAL_RELEASE	2
+
+/*
+ * When version numbers change here, must also go into the following files and
+ * update the version numbers:
+ *
+ * library/init.tcl	(1 LOC patch)
+ * unix/configure.ac	(2 LOC Major, 2 LOC minor, 1 LOC patch)
+ * win/configure.ac	(as above)
+ * win/tcl.m4		(not patchlevel)
+ * README.md		(sections 0 and 2, with and without separator)
+ * macosx/Tcl-Common.xcconfig (not patchlevel) 1 LOC
+ * win/README		(not patchlevel) (sections 0 and 2)
+ * unix/tcl.spec	(1 LOC patch)
+ */
+
+#if !defined(TCL_MAJOR_VERSION)
+#   define TCL_MAJOR_VERSION   9
+#endif
+#if TCL_MAJOR_VERSION == 9
+#   define TCL_MINOR_VERSION   0
+#   define TCL_RELEASE_LEVEL   TCL_BETA_RELEASE
+#   define TCL_RELEASE_SERIAL  1
+
+#   define TCL_VERSION	    "9.0"
+#   define TCL_PATCH_LEVEL	    "9.0b1"
+#endif /* TCL_MAJOR_VERSION */
+
+#if defined(RC_INVOKED)
+/*
+ * Utility macros: STRINGIFY takes an argument and wraps it in "" (double
+ * quotation marks), JOIN joins two arguments.
+ */
+
+#ifndef STRINGIFY
+#  define STRINGIFY(x) STRINGIFY1(x)
+#  define STRINGIFY1(x) #x
+#endif
+#ifndef JOIN
+#  define JOIN(a,b) JOIN1(a,b)
+#  define JOIN1(a,b) a##b
+#endif
+#endif /* RC_INVOKED */
+
+/*
+ * A special definition used to allow this header file to be included from
+ * windows resource files so that they can obtain version information.
+ * RC_INVOKED is defined by default by the windows RC tool.
+ *
+ * Resource compilers don't like all the C stuff, like typedefs and function
+ * declarations, that occur below, so block them out.
+ */
+
+#ifndef RC_INVOKED
+
+/*
+ * Special macro to define mutexes.
+ */
+
+#define TCL_DECLARE_MUTEX(name) static Tcl_Mutex name;
+
+/*
+ * Tcl's public routine Tcl_FSSeek() uses the values SEEK_SET, SEEK_CUR, and
+ * SEEK_END, all #define'd by stdio.h .
+ *
+ * Also, many extensions need stdio.h, and they've grown accustomed to tcl.h
+ * providing it for them rather than #include-ing it themselves as they
+ * should, so also for their sake, we keep the #include to be consistent with
+ * prior Tcl releases.
+ */
+
+#include <stdio.h>
+#include <stddef.h>
+
+#if defined(__GNUC__) && (__GNUC__ > 2)
+#   if defined(_WIN32) && defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO
+#	define TCL_FORMAT_PRINTF(a,b) __attribute__ ((__format__ (__MINGW_PRINTF_FORMAT, a, b)))
+#   else
+#	define TCL_FORMAT_PRINTF(a,b) __attribute__ ((__format__ (__printf__, a, b)))
+#   endif
+#   define TCL_NORETURN __attribute__ ((noreturn))
+#   define TCL_NOINLINE __attribute__ ((noinline))
+#   define TCL_NORETURN1 __attribute__ ((noreturn))
+#else
+#   define TCL_FORMAT_PRINTF(a,b)
+#   if defined(_MSC_VER)
+#	define TCL_NORETURN _declspec(noreturn)
+#	define TCL_NOINLINE __declspec(noinline)
+#   else
+#	define TCL_NORETURN /* nothing */
+#	define TCL_NOINLINE /* nothing */
+#   endif
+#   define TCL_NORETURN1 /* nothing */
+#endif
+
+/*
+ * Allow a part of Tcl's API to be explicitly marked as deprecated.
+ *
+ * Used to make TIP 330/336 generate moans even if people use the
+ * compatibility macros. Change your code, guys! We won't support you forever.
+ */
+
+#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
+#   if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))
+#	define TCL_DEPRECATED_API(msg)	__attribute__ ((__deprecated__ (msg)))
+#   else
+#	define TCL_DEPRECATED_API(msg)	__attribute__ ((__deprecated__))
+#   endif
+#else
+#   define TCL_DEPRECATED_API(msg)	/* nothing portable */
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * Macros used to declare a function to be exported by a DLL. Used by Windows,
+ * maps to no-op declarations on non-Windows systems. The default build on
+ * windows is for a DLL, which causes the DLLIMPORT and DLLEXPORT macros to be
+ * nonempty. To build a static library, the macro STATIC_BUILD should be
+ * defined.
+ *
+ * Note: when building static but linking dynamically to MSVCRT we must still
+ *       correctly decorate the C library imported function.  Use CRTIMPORT
+ *       for this purpose.  _DLL is defined by the compiler when linking to
+ *       MSVCRT.
+ */
+
+#ifdef _WIN32
+#   ifdef STATIC_BUILD
+#       define DLLIMPORT
+#       define DLLEXPORT
+#       ifdef _DLL
+#           define CRTIMPORT __declspec(dllimport)
+#       else
+#           define CRTIMPORT
+#       endif
+#   else
+#       define DLLIMPORT __declspec(dllimport)
+#       define DLLEXPORT __declspec(dllexport)
+#       define CRTIMPORT __declspec(dllimport)
+#   endif
+#else
+#   define DLLIMPORT
+#   if defined(__GNUC__) && __GNUC__ > 3
+#       define DLLEXPORT __attribute__ ((visibility("default")))
+#   else
+#       define DLLEXPORT
+#   endif
+#   define CRTIMPORT
+#endif
+
+/*
+ * These macros are used to control whether functions are being declared for
+ * import or export. If a function is being declared while it is being built
+ * to be included in a shared library, then it should have the DLLEXPORT
+ * storage class. If is being declared for use by a module that is going to
+ * link against the shared library, then it should have the DLLIMPORT storage
+ * class. If the symbol is being declared for a static build or for use from a
+ * stub library, then the storage class should be empty.
+ *
+ * The convention is that a macro called BUILD_xxxx, where xxxx is the name of
+ * a library we are building, is set on the compile line for sources that are
+ * to be placed in the library. When this macro is set, the storage class will
+ * be set to DLLEXPORT. At the end of the header file, the storage class will
+ * be reset to DLLIMPORT.
+ */
+
+#undef TCL_STORAGE_CLASS
+#ifdef BUILD_tcl
+#   define TCL_STORAGE_CLASS DLLEXPORT
+#else
+#   ifdef USE_TCL_STUBS
+#      define TCL_STORAGE_CLASS
+#   else
+#      define TCL_STORAGE_CLASS DLLIMPORT
+#   endif
+#endif
+
+#if !defined(CONST86) && !defined(TCL_NO_DEPRECATED)
+#      define CONST86 const
+#endif
+
+/*
+ * Make sure EXTERN isn't defined elsewhere.
+ */
+
+#ifdef EXTERN
+#   undef EXTERN
+#endif /* EXTERN */
+
+#ifdef __cplusplus
+#   define EXTERN extern "C" TCL_STORAGE_CLASS
+#else
+#   define EXTERN extern TCL_STORAGE_CLASS
+#endif
+
+/*
+ * Miscellaneous declarations.
+ */
+
+typedef void *ClientData;
+
+/*
+ * Darwin specific configure overrides (to support fat compiles, where
+ * configure runs only once for multiple architectures):
+ */
+
+#ifdef __APPLE__
+#   ifdef __LP64__
+#	define TCL_WIDE_INT_IS_LONG 1
+#	define TCL_CFG_DO64BIT 1
+#    else /* !__LP64__ */
+#	undef TCL_WIDE_INT_IS_LONG
+#	undef TCL_CFG_DO64BIT
+#    endif /* __LP64__ */
+#    undef HAVE_STRUCT_STAT64
+#endif /* __APPLE__ */
+
+/* Cross-compiling 32-bit on a 64-bit platform? Then our
+ * configure script does the wrong thing. Correct that here.
+ */
+#if defined(__GNUC__) && !defined(_WIN32) && !defined(__LP64__)
+#   undef TCL_WIDE_INT_IS_LONG
+#endif
+
+/*
+ * Define Tcl_WideInt to be a type that is (at least) 64-bits wide, and define
+ * Tcl_WideUInt to be the unsigned variant of that type (assuming that where
+ * we have one, we can have the other.)
+ *
+ * Also defines the following macros:
+ * TCL_WIDE_INT_IS_LONG - if wide ints are really longs (i.e. we're on a
+ *	LP64 system such as modern Solaris or Linux ... not including Win64)
+ * Tcl_WideAsLong - forgetful converter from wideInt to long.
+ * Tcl_LongAsWide - sign-extending converter from long to wideInt.
+ * Tcl_WideAsDouble - converter from wideInt to double.
+ * Tcl_DoubleAsWide - converter from double to wideInt.
+ *
+ * The following invariant should hold for any long value 'longVal':
+ *	longVal == Tcl_WideAsLong(Tcl_LongAsWide(longVal))
+ */
+
+#if !defined(TCL_WIDE_INT_TYPE) && !defined(TCL_WIDE_INT_IS_LONG) && !defined(_WIN32) && !defined(__GNUC__)
+/*
+ * Don't know what platform it is and configure hasn't discovered what is
+ * going on for us. Try to guess...
+ */
+#   include <limits.h>
+#   if defined(LLONG_MAX) && (LLONG_MAX == LONG_MAX)
+#	define TCL_WIDE_INT_IS_LONG	1
+#   endif
+#endif
+
+#ifndef TCL_WIDE_INT_TYPE
+#   define TCL_WIDE_INT_TYPE		long long
+#endif /* !TCL_WIDE_INT_TYPE */
+
+typedef TCL_WIDE_INT_TYPE		Tcl_WideInt;
+typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
+
+#ifndef TCL_LL_MODIFIER
+#   if defined(_WIN32) && (!defined(__USE_MINGW_ANSI_STDIO) || !__USE_MINGW_ANSI_STDIO)
+#	define TCL_LL_MODIFIER	"I64"
+#   else
+#	define TCL_LL_MODIFIER	"ll"
+#   endif
+#endif /* !TCL_LL_MODIFIER */
+#ifndef TCL_Z_MODIFIER
+#   if defined(__GNUC__) && !defined(_WIN32)
+#	define TCL_Z_MODIFIER	"z"
+#   elif defined(_WIN64)
+#	define TCL_Z_MODIFIER	TCL_LL_MODIFIER
+#   else
+#	define TCL_Z_MODIFIER	""
+#   endif
+#endif /* !TCL_Z_MODIFIER */
+#ifndef TCL_T_MODIFIER
+#   if defined(__GNUC__) && !defined(_WIN32)
+#	define TCL_T_MODIFIER	"t"
+#   elif defined(_WIN64)
+#	define TCL_T_MODIFIER	TCL_LL_MODIFIER
+#   else
+#	define TCL_T_MODIFIER	TCL_Z_MODIFIER
+#   endif
+#endif /* !TCL_T_MODIFIER */
+
+#define Tcl_WideAsLong(val)	((long)((Tcl_WideInt)(val)))
+#define Tcl_LongAsWide(val)	((Tcl_WideInt)((long)(val)))
+#define Tcl_WideAsDouble(val)	((double)((Tcl_WideInt)(val)))
+#define Tcl_DoubleAsWide(val)	((Tcl_WideInt)((double)(val)))
+
+#if TCL_MAJOR_VERSION < 9
+    typedef int Tcl_Size;
+#   define TCL_SIZE_MAX ((int)(((unsigned int)-1)>>1))
+#   define TCL_SIZE_MODIFIER ""
+#else
+    typedef ptrdiff_t Tcl_Size;
+#   define TCL_SIZE_MAX ((ptrdiff_t)(((size_t)-1)>>1))
+#   define TCL_SIZE_MODIFIER TCL_T_MODIFIER
+#endif /* TCL_MAJOR_VERSION */
+
+#ifdef _WIN32
+#   if TCL_MAJOR_VERSION > 8 || defined(_WIN64) || defined(_USE_64BIT_TIME_T)
+	typedef struct __stat64 Tcl_StatBuf;
+#   elif defined(_USE_32BIT_TIME_T)
+	typedef struct _stati64	Tcl_StatBuf;
+#   else
+	typedef struct _stat32i64 Tcl_StatBuf;
+#   endif
+#elif defined(__CYGWIN__)
+    typedef struct {
+	unsigned st_dev;
+	unsigned short st_ino;
+	unsigned short st_mode;
+	short st_nlink;
+	short st_uid;
+	short st_gid;
+	/* Here is a 2-byte gap */
+	unsigned st_rdev;
+	/* Here is a 4-byte gap */
+	long long st_size;
+	struct {long tv_sec;} st_atim;
+	struct {long tv_sec;} st_mtim;
+	struct {long tv_sec;} st_ctim;
+    } Tcl_StatBuf;
+#else
+    typedef struct stat Tcl_StatBuf;
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * Data structures defined opaquely in this module. The definitions below just
+ * provide dummy types.
+ */
+
+typedef struct Tcl_AsyncHandler_ *Tcl_AsyncHandler;
+typedef struct Tcl_Channel_ *Tcl_Channel;
+typedef struct Tcl_ChannelTypeVersion_ *Tcl_ChannelTypeVersion;
+typedef struct Tcl_Command_ *Tcl_Command;
+typedef struct Tcl_Condition_ *Tcl_Condition;
+typedef struct Tcl_Dict_ *Tcl_Dict;
+typedef struct Tcl_EncodingState_ *Tcl_EncodingState;
+typedef struct Tcl_Encoding_ *Tcl_Encoding;
+typedef struct Tcl_Event Tcl_Event;
+typedef struct Tcl_Interp Tcl_Interp;
+typedef struct Tcl_InterpState_ *Tcl_InterpState;
+typedef struct Tcl_LoadHandle_ *Tcl_LoadHandle;
+typedef struct Tcl_Mutex_ *Tcl_Mutex;
+typedef struct Tcl_Pid_ *Tcl_Pid;
+typedef struct Tcl_RegExp_ *Tcl_RegExp;
+typedef struct Tcl_ThreadDataKey_ *Tcl_ThreadDataKey;
+typedef struct Tcl_ThreadId_ *Tcl_ThreadId;
+typedef struct Tcl_TimerToken_ *Tcl_TimerToken;
+typedef struct Tcl_Trace_ *Tcl_Trace;
+typedef struct Tcl_Var_ *Tcl_Var;
+typedef struct Tcl_ZLibStream_ *Tcl_ZlibStream;
+
+/*
+ *----------------------------------------------------------------------------
+ * Definition of the interface to functions implementing threads. A function
+ * following this definition is given to each call of 'Tcl_CreateThread' and
+ * will be called as the main fuction of the new thread created by that call.
+ */
+
+#if defined _WIN32
+typedef unsigned (__stdcall Tcl_ThreadCreateProc) (void *clientData);
+#else
+typedef void (Tcl_ThreadCreateProc) (void *clientData);
+#endif
+
+/*
+ * Threading function return types used for abstracting away platform
+ * differences when writing a Tcl_ThreadCreateProc. See the NewThread function
+ * in generic/tclThreadTest.c for it's usage.
+ */
+
+#if defined _WIN32
+#   define Tcl_ThreadCreateType		unsigned __stdcall
+#   define TCL_THREAD_CREATE_RETURN	return 0
+#else
+#   define Tcl_ThreadCreateType		void
+#   define TCL_THREAD_CREATE_RETURN
+#endif
+
+/*
+ * Definition of values for default stacksize and the possible flags to be
+ * given to Tcl_CreateThread.
+ */
+
+#define TCL_THREAD_STACK_DEFAULT (0)    /* Use default size for stack. */
+#define TCL_THREAD_NOFLAGS	 (0000) /* Standard flags, default
+					 * behaviour. */
+#define TCL_THREAD_JOINABLE	 (0001) /* Mark the thread as joinable. */
+
+/*
+ * Flag values passed to Tcl_StringCaseMatch.
+ */
+
+#define TCL_MATCH_NOCASE	(1<<0)
+
+/*
+ * Flag values passed to Tcl_GetRegExpFromObj.
+ */
+
+#define	TCL_REG_BASIC		000000	/* BREs (convenience). */
+#define	TCL_REG_EXTENDED	000001	/* EREs. */
+#define	TCL_REG_ADVF		000002	/* Advanced features in EREs. */
+#define	TCL_REG_ADVANCED	000003	/* AREs (which are also EREs). */
+#define	TCL_REG_QUOTE		000004	/* No special characters, none. */
+#define	TCL_REG_NOCASE		000010	/* Ignore case. */
+#define	TCL_REG_NOSUB		000020	/* Don't care about subexpressions. */
+#define	TCL_REG_EXPANDED	000040	/* Expanded format, white space &
+					 * comments. */
+#define	TCL_REG_NLSTOP		000100  /* \n doesn't match . or [^ ] */
+#define	TCL_REG_NLANCH		000200  /* ^ matches after \n, $ before. */
+#define	TCL_REG_NEWLINE		000300  /* Newlines are line terminators. */
+#define	TCL_REG_CANMATCH	001000  /* Report details on partial/limited
+					 * matches. */
+
+/*
+ * Flags values passed to Tcl_RegExpExecObj.
+ */
+
+#define	TCL_REG_NOTBOL	0001	/* Beginning of string does not match ^.  */
+#define	TCL_REG_NOTEOL	0002	/* End of string does not match $. */
+
+/*
+ * Structures filled in by Tcl_RegExpInfo. Note that all offset values are
+ * relative to the start of the match string, not the beginning of the entire
+ * string.
+ */
+
+typedef struct Tcl_RegExpIndices {
+#if TCL_MAJOR_VERSION > 8
+    Tcl_Size start;			/* Character offset of first character in
+				 * match. */
+    Tcl_Size end;			/* Character offset of first character after
+				 * the match. */
+#else
+    long start;
+    long end;
+#endif
+} Tcl_RegExpIndices;
+
+typedef struct Tcl_RegExpInfo {
+    Tcl_Size nsubs;			/* Number of subexpressions in the compiled
+				 * expression. */
+    Tcl_RegExpIndices *matches;	/* Array of nsubs match offset pairs. */
+#if TCL_MAJOR_VERSION > 8
+    Tcl_Size extendStart;		/* The offset at which a subsequent match
+				 * might begin. */
+#else
+    long extendStart;
+    long reserved;		/* Reserved for later use. */
+#endif
+} Tcl_RegExpInfo;
+
+/*
+ * Picky compilers complain if this typdef doesn't appear before the struct's
+ * reference in tclDecls.h.
+ */
+
+typedef Tcl_StatBuf *Tcl_Stat_;
+typedef struct stat *Tcl_OldStat_;
+
+/*
+ *----------------------------------------------------------------------------
+ * When a TCL command returns, the interpreter contains a result from the
+ * command. Programmers are strongly encouraged to use one of the functions
+ * Tcl_GetObjResult() or Tcl_GetStringResult() to read the interpreter's
+ * result. See the SetResult man page for details. Besides this result, the
+ * command function returns an integer code, which is one of the following:
+ *
+ * TCL_OK		Command completed normally; the interpreter's result
+ *			contains the command's result.
+ * TCL_ERROR		The command couldn't be completed successfully; the
+ *			interpreter's result describes what went wrong.
+ * TCL_RETURN		The command requests that the current function return;
+ *			the interpreter's result contains the function's
+ *			return value.
+ * TCL_BREAK		The command requests that the innermost loop be
+ *			exited; the interpreter's result is meaningless.
+ * TCL_CONTINUE		Go on to the next iteration of the current loop; the
+ *			interpreter's result is meaningless.
+ */
+
+#define TCL_OK			0
+#define TCL_ERROR		1
+#define TCL_RETURN		2
+#define TCL_BREAK		3
+#define TCL_CONTINUE		4
+
+/*
+ *----------------------------------------------------------------------------
+ * Flags to control what substitutions are performed by Tcl_SubstObj():
+ */
+
+#define TCL_SUBST_COMMANDS	001
+#define TCL_SUBST_VARIABLES	002
+#define TCL_SUBST_BACKSLASHES	004
+#define TCL_SUBST_ALL		007
+
+/*
+ * Forward declaration of Tcl_Obj to prevent an error when the forward
+ * reference to Tcl_Obj is encountered in the function types declared below.
+ */
+
+struct Tcl_Obj;
+
+/*
+ *----------------------------------------------------------------------------
+ * Function types defined by Tcl:
+ */
+
+typedef int (Tcl_AppInitProc) (Tcl_Interp *interp);
+typedef int (Tcl_AsyncProc) (void *clientData, Tcl_Interp *interp,
+	int code);
+typedef void (Tcl_ChannelProc) (void *clientData, int mask);
+typedef void (Tcl_CloseProc) (void *data);
+typedef void (Tcl_CmdDeleteProc) (void *clientData);
+typedef int (Tcl_CmdProc) (void *clientData, Tcl_Interp *interp,
+	int argc, const char *argv[]);
+typedef void (Tcl_CmdTraceProc) (void *clientData, Tcl_Interp *interp,
+	int level, char *command, Tcl_CmdProc *proc,
+	void *cmdClientData, int argc, const char *argv[]);
+typedef int (Tcl_CmdObjTraceProc) (void *clientData, Tcl_Interp *interp,
+	int level, const char *command, Tcl_Command commandInfo, int objc,
+	struct Tcl_Obj *const *objv);
+typedef void (Tcl_CmdObjTraceDeleteProc) (void *clientData);
+typedef void (Tcl_DupInternalRepProc) (struct Tcl_Obj *srcPtr,
+	struct Tcl_Obj *dupPtr);
+typedef int (Tcl_EncodingConvertProc) (void *clientData, const char *src,
+	int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst,
+	int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr);
+typedef void (Tcl_EncodingFreeProc) (void *clientData);
+typedef int (Tcl_EventProc) (Tcl_Event *evPtr, int flags);
+typedef void (Tcl_EventCheckProc) (void *clientData, int flags);
+typedef int (Tcl_EventDeleteProc) (Tcl_Event *evPtr, void *clientData);
+typedef void (Tcl_EventSetupProc) (void *clientData, int flags);
+typedef void (Tcl_ExitProc) (void *clientData);
+typedef void (Tcl_FileProc) (void *clientData, int mask);
+typedef void (Tcl_FileFreeProc) (void *clientData);
+typedef void (Tcl_FreeInternalRepProc) (struct Tcl_Obj *objPtr);
+typedef void (Tcl_IdleProc) (void *clientData);
+typedef void (Tcl_InterpDeleteProc) (void *clientData,
+	Tcl_Interp *interp);
+typedef void (Tcl_NamespaceDeleteProc) (void *clientData);
+typedef int (Tcl_ObjCmdProc) (void *clientData, Tcl_Interp *interp,
+	int objc, struct Tcl_Obj *const *objv);
+#if TCL_MAJOR_VERSION > 8
+typedef int (Tcl_ObjCmdProc2) (void *clientData, Tcl_Interp *interp,
+	Tcl_Size objc, struct Tcl_Obj *const *objv);
+typedef int (Tcl_CmdObjTraceProc2) (void *clientData, Tcl_Interp *interp,
+	Tcl_Size level, const char *command, Tcl_Command commandInfo, Tcl_Size objc,
+	struct Tcl_Obj *const *objv);
+typedef void (Tcl_FreeProc) (void *blockPtr);
+#define Tcl_ExitProc Tcl_FreeProc
+#define Tcl_FileFreeProc Tcl_FreeProc
+#define Tcl_FileFreeProc Tcl_FreeProc
+#define Tcl_EncodingFreeProc Tcl_FreeProc
+#else
+#define Tcl_ObjCmdProc2 Tcl_ObjCmdProc
+#define Tcl_CmdObjTraceProc2 Tcl_CmdObjTraceProc
+typedef void (Tcl_FreeProc) (char *blockPtr);
+#endif
+typedef int (Tcl_LibraryInitProc) (Tcl_Interp *interp);
+typedef int (Tcl_LibraryUnloadProc) (Tcl_Interp *interp, int flags);
+typedef void (Tcl_PanicProc) (const char *format, ...);
+typedef void (Tcl_TcpAcceptProc) (void *callbackData, Tcl_Channel chan,
+	char *address, int port);
+typedef void (Tcl_TimerProc) (void *clientData);
+typedef int (Tcl_SetFromAnyProc) (Tcl_Interp *interp, struct Tcl_Obj *objPtr);
+typedef void (Tcl_UpdateStringProc) (struct Tcl_Obj *objPtr);
+typedef char * (Tcl_VarTraceProc) (void *clientData, Tcl_Interp *interp,
+	const char *part1, const char *part2, int flags);
+typedef void (Tcl_CommandTraceProc) (void *clientData, Tcl_Interp *interp,
+	const char *oldName, const char *newName, int flags);
+typedef void (Tcl_CreateFileHandlerProc) (int fd, int mask, Tcl_FileProc *proc,
+	void *clientData);
+typedef void (Tcl_DeleteFileHandlerProc) (int fd);
+typedef void (Tcl_AlertNotifierProc) (void *clientData);
+typedef void (Tcl_ServiceModeHookProc) (int mode);
+typedef void *(Tcl_InitNotifierProc) (void);
+typedef void (Tcl_FinalizeNotifierProc) (void *clientData);
+typedef void (Tcl_MainLoopProc) (void);
+
+/* Abstract List functions */
+typedef	      Tcl_Size	(Tcl_ObjTypeLengthProc)  (struct Tcl_Obj *listPtr);
+typedef		   int	(Tcl_ObjTypeIndexProc)   (Tcl_Interp *interp, struct Tcl_Obj *listPtr,
+                                             Tcl_Size index, struct Tcl_Obj** elemObj);
+typedef		   int	(Tcl_ObjTypeSliceProc)   (Tcl_Interp *interp, struct Tcl_Obj *listPtr,
+                                             Tcl_Size fromIdx, Tcl_Size toIdx,
+                                             struct Tcl_Obj **newObjPtr);
+typedef		   int	(Tcl_ObjTypeReverseProc) (Tcl_Interp *interp, struct Tcl_Obj *listPtr,
+					     struct Tcl_Obj **newObjPtr);
+typedef		   int	(Tcl_ObjTypeGetElements) (Tcl_Interp *interp, struct Tcl_Obj *listPtr,
+					     Tcl_Size *objcptr, struct Tcl_Obj ***objvptr);
+typedef	struct Tcl_Obj*	(Tcl_ObjTypeSetElement)  (Tcl_Interp *interp, struct Tcl_Obj *listPtr,
+                                             Tcl_Size indexCount,
+                                             struct Tcl_Obj *const indexArray[],
+                                             struct Tcl_Obj *valueObj);
+typedef            int  (Tcl_ObjTypeReplaceProc) (Tcl_Interp *interp, struct Tcl_Obj *listObj,
+                                             Tcl_Size first, Tcl_Size numToDelete,
+                                             Tcl_Size numToInsert,
+                                             struct Tcl_Obj *const insertObjs[]);
+typedef            int (Tcl_ObjTypeInOperatorProc) (Tcl_Interp *interp, struct Tcl_Obj *valueObj,
+                                             struct Tcl_Obj *listObj, int *boolResult);
+
+#ifndef TCL_NO_DEPRECATED
+#   define Tcl_PackageInitProc Tcl_LibraryInitProc
+#   define Tcl_PackageUnloadProc Tcl_LibraryUnloadProc
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure represents a type of object, which is a particular
+ * internal representation for an object plus a set of functions that provide
+ * standard operations on objects of that type.
+ */
+
+typedef struct Tcl_ObjType {
+    const char *name;		/* Name of the type, e.g. "int". */
+    Tcl_FreeInternalRepProc *freeIntRepProc;
+				/* Called to free any storage for the type's
+				 * internal rep. NULL if the internal rep does
+				 * not need freeing. */
+    Tcl_DupInternalRepProc *dupIntRepProc;
+				/* Called to create a new object as a copy of
+				 * an existing object. */
+    Tcl_UpdateStringProc *updateStringProc;
+				/* Called to update the string rep from the
+				 * type's internal representation. */
+    Tcl_SetFromAnyProc *setFromAnyProc;
+				/* Called to convert the object's internal rep
+				 * to this type. Frees the internal rep of the
+				 * old type. Returns TCL_ERROR on failure. */
+#if TCL_MAJOR_VERSION > 8
+    size_t version;
+
+    /* List emulation functions - ObjType Version 1 */
+    Tcl_ObjTypeLengthProc *lengthProc;	     /* Return the [llength] of the
+					     ** AbstractList */
+    Tcl_ObjTypeIndexProc *indexProc;	     /* Return a value (Tcl_Obj) for
+					     ** [lindex $al $index] */
+    Tcl_ObjTypeSliceProc *sliceProc;	     /* Return an AbstractList for
+					     ** [lrange $al $start $end] */
+    Tcl_ObjTypeReverseProc *reverseProc;     /* Return an AbstractList for
+					     ** [lreverse $al] */
+    Tcl_ObjTypeGetElements *getElementsProc; /* Return an objv[] of all elements in
+					     ** the list */
+    Tcl_ObjTypeSetElement *setElementProc;   /* Replace the element at the indicie
+					     ** with the given valueObj. */
+    Tcl_ObjTypeReplaceProc *replaceProc;     /* Replace subset with subset */
+    Tcl_ObjTypeInOperatorProc *inOperProc;   /* "in" and "ni" expr list
+                                             ** operation Determine if the given
+                                             ** string value matches an element in
+                                             ** the list */
+#endif
+} Tcl_ObjType;
+
+#if TCL_MAJOR_VERSION > 8
+#   define TCL_OBJTYPE_V0 0, \
+	   0,0,0,0,0,0,0,0 /* Pre-Tcl 9 */
+#   define TCL_OBJTYPE_V1(a) offsetof(Tcl_ObjType, indexProc), \
+	   a,0,0,0,0,0,0,0 /* Tcl 9 Version 1 */
+#   define TCL_OBJTYPE_V2(a,b,c,d,e,f,g,h) sizeof(Tcl_ObjType),  \
+	   a,b,c,d,e,f,g,h /* Tcl 9 - AbstractLists */
+#else
+#   define TCL_OBJTYPE_V0 /* just empty */
+#endif
+
+/*
+ * The following structure stores an internal representation (internalrep) for
+ * a Tcl value. An internalrep is associated with an Tcl_ObjType when both
+ * are stored in the same Tcl_Obj.  The routines of the Tcl_ObjType govern
+ * the handling of the internalrep.
+ */
+
+typedef union Tcl_ObjInternalRep {	/* The internal representation: */
+    long longValue;		/*   - an long integer value. */
+    double doubleValue;		/*   - a double-precision floating value. */
+    void *otherValuePtr;	/*   - another, type-specific value, */
+				/*     not used internally any more. */
+    Tcl_WideInt wideValue;	/*   - an integer value >= 64bits */
+    struct {			/*   - internal rep as two pointers. */
+	void *ptr1;
+	void *ptr2;
+    } twoPtrValue;
+    struct {			/*   - internal rep as a pointer and a long, */
+	void *ptr;		/*     not used internally any more. */
+	unsigned long value;
+    } ptrAndLongRep;
+} Tcl_ObjInternalRep;
+
+/*
+ * One of the following structures exists for each object in the Tcl system.
+ * An object stores a value as either a string, some internal representation,
+ * or both.
+ */
+
+typedef struct Tcl_Obj {
+    Tcl_Size refCount;		/* When 0 the object will be freed. */
+    char *bytes;		/* This points to the first byte of the
+				 * object's string representation. The array
+				 * must be followed by a null byte (i.e., at
+				 * offset length) but may also contain
+				 * embedded null characters. The array's
+				 * storage is allocated by Tcl_Alloc. NULL means
+				 * the string rep is invalid and must be
+				 * regenerated from the internal rep.  Clients
+				 * should use Tcl_GetStringFromObj or
+				 * Tcl_GetString to get a pointer to the byte
+				 * array as a readonly value. */
+    Tcl_Size length;		/* The number of bytes at *bytes, not
+				 * including the terminating null. */
+    const Tcl_ObjType *typePtr;	/* Denotes the object's type. Always
+				 * corresponds to the type of the object's
+				 * internal rep. NULL indicates the object has
+				 * no internal rep (has no type). */
+    Tcl_ObjInternalRep internalRep;	/* The internal representation: */
+} Tcl_Obj;
+
+
+/*
+ *----------------------------------------------------------------------------
+ * The following definitions support Tcl's namespace facility. Note: the first
+ * five fields must match exactly the fields in a Namespace structure (see
+ * tclInt.h).
+ */
+
+typedef struct Tcl_Namespace {
+    char *name;			/* The namespace's name within its parent
+				 * namespace. This contains no ::'s. The name
+				 * of the global namespace is "" although "::"
+				 * is an synonym. */
+    char *fullName;		/* The namespace's fully qualified name. This
+				 * starts with ::. */
+    void *clientData;	/* Arbitrary value associated with this
+				 * namespace. */
+    Tcl_NamespaceDeleteProc *deleteProc;
+				/* Function invoked when deleting the
+				 * namespace to, e.g., free clientData. */
+    struct Tcl_Namespace *parentPtr;
+				/* Points to the namespace that contains this
+				 * one. NULL if this is the global
+				 * namespace. */
+} Tcl_Namespace;
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure represents a call frame, or activation record. A
+ * call frame defines a naming context for a procedure call: its local scope
+ * (for local variables) and its namespace scope (used for non-local
+ * variables; often the global :: namespace). A call frame can also define the
+ * naming context for a namespace eval or namespace inscope command: the
+ * namespace in which the command's code should execute. The Tcl_CallFrame
+ * structures exist only while procedures or namespace eval/inscope's are
+ * being executed, and provide a Tcl call stack.
+ *
+ * A call frame is initialized and pushed using Tcl_PushCallFrame and popped
+ * using Tcl_PopCallFrame. Storage for a Tcl_CallFrame must be provided by the
+ * Tcl_PushCallFrame caller, and callers typically allocate them on the C call
+ * stack for efficiency. For this reason, Tcl_CallFrame is defined as a
+ * structure and not as an opaque token. However, most Tcl_CallFrame fields
+ * are hidden since applications should not access them directly; others are
+ * declared as "dummyX".
+ *
+ * WARNING!! The structure definition must be kept consistent with the
+ * CallFrame structure in tclInt.h. If you change one, change the other.
+ */
+
+typedef struct Tcl_CallFrame {
+    Tcl_Namespace *nsPtr;
+    int dummy1;
+    Tcl_Size dummy2;
+    void *dummy3;
+    void *dummy4;
+    void *dummy5;
+    Tcl_Size dummy6;
+    void *dummy7;
+    void *dummy8;
+    Tcl_Size dummy9;
+    void *dummy10;
+    void *dummy11;
+    void *dummy12;
+    void *dummy13;
+} Tcl_CallFrame;
+
+/*
+ *----------------------------------------------------------------------------
+ * Information about commands that is returned by Tcl_GetCommandInfo and
+ * passed to Tcl_SetCommandInfo. objProc is an objc/objv object-based command
+ * function while proc is a traditional Tcl argc/argv string-based function.
+ * Tcl_CreateObjCommand and Tcl_CreateCommand ensure that both objProc and
+ * proc are non-NULL and can be called to execute the command. However, it may
+ * be faster to call one instead of the other. The member isNativeObjectProc
+ * is set to 1 if an object-based function was registered by
+ * Tcl_CreateObjCommand, and to 0 if a string-based function was registered by
+ * Tcl_CreateCommand. The other function is typically set to a compatibility
+ * wrapper that does string-to-object or object-to-string argument conversions
+ * then calls the other function.
+ */
+
+typedef struct {
+    int isNativeObjectProc;	/* 1 if objProc was registered by a call to
+				 * Tcl_CreateObjCommand; 2 if objProc was registered by
+				 * a call to Tcl_CreateObjCommand2; 0 otherwise.
+				 * Tcl_SetCmdInfo does not modify this field. */
+    Tcl_ObjCmdProc *objProc;	/* Command's object-based function. */
+    void *objClientData;	/* ClientData for object proc. */
+    Tcl_CmdProc *proc;		/* Command's string-based function. */
+    void *clientData;	/* ClientData for string proc. */
+    Tcl_CmdDeleteProc *deleteProc;
+				/* Function to call when command is
+				 * deleted. */
+    void *deleteData;	/* Value to pass to deleteProc (usually the
+				 * same as clientData). */
+    Tcl_Namespace *namespacePtr;/* Points to the namespace that contains this
+				 * command. Note that Tcl_SetCmdInfo will not
+				 * change a command's namespace; use
+				 * TclRenameCommand or Tcl_Eval (of 'rename')
+				 * to do that. */
+    Tcl_ObjCmdProc2 *objProc2;	/* Command's object2-based function. */
+    void *objClientData2;	/* ClientData for object2 proc. */
+} Tcl_CmdInfo;
+
+/*
+ *----------------------------------------------------------------------------
+ * The structure defined below is used to hold dynamic strings. The only
+ * fields that clients should use are string and length, accessible via the
+ * macros Tcl_DStringValue and Tcl_DStringLength.
+ */
+
+#define TCL_DSTRING_STATIC_SIZE 200
+typedef struct Tcl_DString {
+    char *string;		/* Points to beginning of string: either
+				 * staticSpace below or a malloced array. */
+    Tcl_Size length;		/* Number of bytes in string excluding
+				 * terminating nul */
+    Tcl_Size spaceAvl;		/* Total number of bytes available for the
+				 * string and its terminating NULL char. */
+    char staticSpace[TCL_DSTRING_STATIC_SIZE];
+				/* Space to use in common case where string is
+				 * small. */
+} Tcl_DString;
+
+#define Tcl_DStringLength(dsPtr) ((dsPtr)->length)
+#define Tcl_DStringValue(dsPtr) ((dsPtr)->string)
+
+/*
+ * Definitions for the maximum number of digits of precision that may be
+ * produced by Tcl_PrintDouble, and the number of bytes of buffer space
+ * required by Tcl_PrintDouble.
+ */
+
+#define TCL_MAX_PREC		17
+#define TCL_DOUBLE_SPACE	(TCL_MAX_PREC+10)
+
+/*
+ * Definition for a number of bytes of buffer space sufficient to hold the
+ * string representation of an integer in base 10 (assuming the existence of
+ * 64-bit integers).
+ */
+
+#define TCL_INTEGER_SPACE	(3*(int)sizeof(Tcl_WideInt))
+
+/*
+ *----------------------------------------------------------------------------
+ * Type values returned by Tcl_GetNumberFromObj
+ *	TCL_NUMBER_INT		Representation is a Tcl_WideInt
+ *	TCL_NUMBER_BIG		Representation is an mp_int
+ *	TCL_NUMBER_DOUBLE	Representation is a double
+ *	TCL_NUMBER_NAN		Value is NaN.
+ */
+
+#define TCL_NUMBER_INT          2
+#define TCL_NUMBER_BIG          3
+#define TCL_NUMBER_DOUBLE       4
+#define TCL_NUMBER_NAN          5
+
+/*
+ * Flag values passed to Tcl_ConvertElement.
+ * TCL_DONT_USE_BRACES forces it not to enclose the element in braces, but to
+ *	use backslash quoting instead.
+ * TCL_DONT_QUOTE_HASH disables the default quoting of the '#' character. It
+ *	is safe to leave the hash unquoted when the element is not the first
+ *	element of a list, and this flag can be used by the caller to indicate
+ *	that condition.
+ */
+
+#define TCL_DONT_USE_BRACES	1
+#define TCL_DONT_QUOTE_HASH	8
+
+/*
+ * Flags that may be passed to Tcl_GetIndexFromObj.
+ * TCL_EXACT disallows abbreviated strings.
+ * TCL_NULL_OK allows the empty string or NULL to return TCL_OK.
+ *      The returned value will be -1;
+ * TCL_INDEX_TEMP_TABLE disallows caching of lookups. A possible use case is
+ *      a table that will not live long enough to make it worthwhile.
+ */
+
+#define TCL_EXACT		1
+#define TCL_NULL_OK		32
+#define TCL_INDEX_TEMP_TABLE	64
+
+/*
+ * Flags that may be passed to Tcl_UniCharToUtf.
+ * TCL_COMBINE Combine surrogates
+ */
+
+#if TCL_MAJOR_VERSION > 8
+#    define TCL_COMBINE		0x1000000
+#else
+#    define TCL_COMBINE		0
+#endif
+/*
+ *----------------------------------------------------------------------------
+ * Flag values passed to Tcl_RecordAndEval, Tcl_EvalObj, Tcl_EvalObjv.
+ * WARNING: these bit choices must not conflict with the bit choices for
+ * evalFlag bits in tclInt.h!
+ *
+ * Meanings:
+ *	TCL_NO_EVAL:		Just record this command
+ *	TCL_EVAL_GLOBAL:	Execute script in global namespace
+ *	TCL_EVAL_DIRECT:	Do not compile this script
+ *	TCL_EVAL_INVOKE:	Magical Tcl_EvalObjv mode for aliases/ensembles
+ *				o Run in iPtr->lookupNsPtr or global namespace
+ *				o Cut out of error traces
+ *				o Don't reset the flags controlling ensemble
+ *				  error message rewriting.
+ *	TCL_CANCEL_UNWIND:	Magical Tcl_CancelEval mode that causes the
+ *				stack for the script in progress to be
+ *				completely unwound.
+ *	TCL_EVAL_NOERR:	Do no exception reporting at all, just return
+ *				as the caller will report.
+ */
+
+#define TCL_NO_EVAL		0x010000
+#define TCL_EVAL_GLOBAL		0x020000
+#define TCL_EVAL_DIRECT		0x040000
+#define TCL_EVAL_INVOKE		0x080000
+#define TCL_CANCEL_UNWIND	0x100000
+#define TCL_EVAL_NOERR          0x200000
+
+/*
+ * Special freeProc values that may be passed to Tcl_SetResult (see the man
+ * page for details):
+ */
+
+#define TCL_VOLATILE		((Tcl_FreeProc *) 1)
+#define TCL_STATIC		((Tcl_FreeProc *) 0)
+#define TCL_DYNAMIC		((Tcl_FreeProc *) 3)
+
+/*
+ * Flag values passed to variable-related functions.
+ * WARNING: these bit choices must not conflict with the bit choice for
+ * TCL_CANCEL_UNWIND, above.
+ */
+
+#define TCL_GLOBAL_ONLY		 1
+#define TCL_NAMESPACE_ONLY	 2
+#define TCL_APPEND_VALUE	 4
+#define TCL_LIST_ELEMENT	 8
+#define TCL_TRACE_READS		 0x10
+#define TCL_TRACE_WRITES	 0x20
+#define TCL_TRACE_UNSETS	 0x40
+#define TCL_TRACE_DESTROYED	 0x80
+
+#define TCL_LEAVE_ERR_MSG	 0x200
+#define TCL_TRACE_ARRAY		 0x800
+/* Indicate the semantics of the result of a trace. */
+#define TCL_TRACE_RESULT_DYNAMIC 0x8000
+#define TCL_TRACE_RESULT_OBJECT  0x10000
+
+/*
+ * Flag values for ensemble commands.
+ */
+
+#define TCL_ENSEMBLE_PREFIX 0x02/* Flag value to say whether to allow
+				 * unambiguous prefixes of commands or to
+				 * require exact matches for command names. */
+
+/*
+ * Flag values passed to command-related functions.
+ */
+
+#define TCL_TRACE_RENAME	0x2000
+#define TCL_TRACE_DELETE	0x4000
+
+#define TCL_ALLOW_INLINE_COMPILATION 0x20000
+
+/*
+ * Types for linked variables:
+ */
+
+#define TCL_LINK_INT		1
+#define TCL_LINK_DOUBLE		2
+#define TCL_LINK_BOOLEAN	3
+#define TCL_LINK_STRING		4
+#define TCL_LINK_WIDE_INT	5
+#define TCL_LINK_CHAR		6
+#define TCL_LINK_UCHAR		7
+#define TCL_LINK_SHORT		8
+#define TCL_LINK_USHORT		9
+#define TCL_LINK_UINT		10
+#define TCL_LINK_LONG		((sizeof(long) != sizeof(int)) ? TCL_LINK_WIDE_INT : TCL_LINK_INT)
+#define TCL_LINK_ULONG		((sizeof(long) != sizeof(int)) ? TCL_LINK_WIDE_UINT : TCL_LINK_UINT)
+#define TCL_LINK_FLOAT		13
+#define TCL_LINK_WIDE_UINT	14
+#define TCL_LINK_CHARS		15
+#define TCL_LINK_BINARY		16
+#define TCL_LINK_READ_ONLY	0x80
+
+/*
+ *----------------------------------------------------------------------------
+ * Forward declarations of Tcl_HashTable and related types.
+ */
+
+#ifndef TCL_HASH_TYPE
+#if TCL_MAJOR_VERSION > 8
+#  define TCL_HASH_TYPE size_t
+#else
+#  define TCL_HASH_TYPE unsigned
+#endif
+#endif
+
+typedef struct Tcl_HashKeyType Tcl_HashKeyType;
+typedef struct Tcl_HashTable Tcl_HashTable;
+typedef struct Tcl_HashEntry Tcl_HashEntry;
+
+typedef TCL_HASH_TYPE (Tcl_HashKeyProc) (Tcl_HashTable *tablePtr, void *keyPtr);
+typedef int (Tcl_CompareHashKeysProc) (void *keyPtr, Tcl_HashEntry *hPtr);
+typedef Tcl_HashEntry * (Tcl_AllocHashEntryProc) (Tcl_HashTable *tablePtr,
+	void *keyPtr);
+typedef void (Tcl_FreeHashEntryProc) (Tcl_HashEntry *hPtr);
+
+/*
+ * Structure definition for an entry in a hash table. No-one outside Tcl
+ * should access any of these fields directly; use the macros defined below.
+ */
+
+struct Tcl_HashEntry {
+    Tcl_HashEntry *nextPtr;	/* Pointer to next entry in this hash bucket,
+				 * or NULL for end of chain. */
+    Tcl_HashTable *tablePtr;	/* Pointer to table containing entry. */
+    size_t hash;		/* Hash value. */
+    void *clientData;	/* Application stores something here with
+				 * Tcl_SetHashValue. */
+    union {			/* Key has one of these forms: */
+	char *oneWordValue;	/* One-word value for key. */
+	Tcl_Obj *objPtr;	/* Tcl_Obj * key value. */
+	int words[1];		/* Multiple integer words for key. The actual
+				 * size will be as large as necessary for this
+				 * table's keys. */
+	char string[1];		/* String for key. The actual size will be as
+				 * large as needed to hold the key. */
+    } key;			/* MUST BE LAST FIELD IN RECORD!! */
+};
+
+/*
+ * Flags used in Tcl_HashKeyType.
+ *
+ * TCL_HASH_KEY_RANDOMIZE_HASH -
+ *				There are some things, pointers for example
+ *				which don't hash well because they do not use
+ *				the lower bits. If this flag is set then the
+ *				hash table will attempt to rectify this by
+ *				randomising the bits and then using the upper
+ *				N bits as the index into the table.
+ * TCL_HASH_KEY_SYSTEM_HASH -	If this flag is set then all memory internally
+ *                              allocated for the hash table that is not for an
+ *                              entry will use the system heap.
+ */
+
+#define TCL_HASH_KEY_RANDOMIZE_HASH 0x1
+#define TCL_HASH_KEY_SYSTEM_HASH    0x2
+
+/*
+ * Structure definition for the methods associated with a hash table key type.
+ */
+
+#define TCL_HASH_KEY_TYPE_VERSION 1
+struct Tcl_HashKeyType {
+    int version;		/* Version of the table. If this structure is
+				 * extended in future then the version can be
+				 * used to distinguish between different
+				 * structures. */
+    int flags;			/* Flags, see above for details. */
+    Tcl_HashKeyProc *hashKeyProc;
+				/* Calculates a hash value for the key. If
+				 * this is NULL then the pointer itself is
+				 * used as a hash value. */
+    Tcl_CompareHashKeysProc *compareKeysProc;
+				/* Compares two keys and returns zero if they
+				 * do not match, and non-zero if they do. If
+				 * this is NULL then the pointers are
+				 * compared. */
+    Tcl_AllocHashEntryProc *allocEntryProc;
+				/* Called to allocate memory for a new entry,
+				 * i.e. if the key is a string then this could
+				 * allocate a single block which contains
+				 * enough space for both the entry and the
+				 * string. Only the key field of the allocated
+				 * Tcl_HashEntry structure needs to be filled
+				 * in. If something else needs to be done to
+				 * the key, i.e. incrementing a reference
+				 * count then that should be done by this
+				 * function. If this is NULL then Tcl_Alloc is
+				 * used to allocate enough space for a
+				 * Tcl_HashEntry and the key pointer is
+				 * assigned to key.oneWordValue. */
+    Tcl_FreeHashEntryProc *freeEntryProc;
+				/* Called to free memory associated with an
+				 * entry. If something else needs to be done
+				 * to the key, i.e. decrementing a reference
+				 * count then that should be done by this
+				 * function. If this is NULL then Tcl_Free is
+				 * used to free the Tcl_HashEntry. */
+};
+
+/*
+ * Structure definition for a hash table.  Must be in tcl.h so clients can
+ * allocate space for these structures, but clients should never access any
+ * fields in this structure.
+ */
+
+#define TCL_SMALL_HASH_TABLE 4
+struct Tcl_HashTable {
+    Tcl_HashEntry **buckets;	/* Pointer to bucket array. Each element
+				 * points to first entry in bucket's hash
+				 * chain, or NULL. */
+    Tcl_HashEntry *staticBuckets[TCL_SMALL_HASH_TABLE];
+				/* Bucket array used for small tables (to
+				 * avoid mallocs and frees). */
+    Tcl_Size numBuckets;		/* Total number of buckets allocated at
+				 * **bucketPtr. */
+    Tcl_Size numEntries;		/* Total number of entries present in
+				 * table. */
+    Tcl_Size rebuildSize;		/* Enlarge table when numEntries gets to be
+				 * this large. */
+#if TCL_MAJOR_VERSION > 8
+    size_t mask;		/* Mask value used in hashing function. */
+#endif
+    int downShift;		/* Shift count used in hashing function.
+				 * Designed to use high-order bits of
+				 * randomized keys. */
+#if TCL_MAJOR_VERSION < 9
+    int mask;		/* Mask value used in hashing function. */
+#endif
+    int keyType;		/* Type of keys used in this table. It's
+				 * either TCL_CUSTOM_KEYS, TCL_STRING_KEYS,
+				 * TCL_ONE_WORD_KEYS, or an integer giving the
+				 * number of ints that is the size of the
+				 * key. */
+    Tcl_HashEntry *(*findProc) (Tcl_HashTable *tablePtr, const char *key);
+    Tcl_HashEntry *(*createProc) (Tcl_HashTable *tablePtr, const char *key,
+	    int *newPtr);
+    const Tcl_HashKeyType *typePtr;
+				/* Type of the keys used in the
+				 * Tcl_HashTable. */
+};
+
+/*
+ * Structure definition for information used to keep track of searches through
+ * hash tables:
+ */
+
+typedef struct Tcl_HashSearch {
+    Tcl_HashTable *tablePtr;	/* Table being searched. */
+    Tcl_Size nextIndex;		/* Index of next bucket to be enumerated after
+				 * present one. */
+    Tcl_HashEntry *nextEntryPtr;/* Next entry to be enumerated in the current
+				 * bucket. */
+} Tcl_HashSearch;
+
+/*
+ * Acceptable key types for hash tables:
+ *
+ * TCL_STRING_KEYS:		The keys are strings, they are copied into the
+ *				entry.
+ * TCL_ONE_WORD_KEYS:		The keys are pointers, the pointer is stored
+ *				in the entry.
+ * TCL_CUSTOM_TYPE_KEYS:	The keys are arbitrary types which are copied
+ *				into the entry.
+ * TCL_CUSTOM_PTR_KEYS:		The keys are pointers to arbitrary types, the
+ *				pointer is stored in the entry.
+ *
+ * While maintaining binary compatibility the above have to be distinct values
+ * as they are used to differentiate between old versions of the hash table
+ * which don't have a typePtr and new ones which do. Once binary compatibility
+ * is discarded in favour of making more wide spread changes TCL_STRING_KEYS
+ * can be the same as TCL_CUSTOM_TYPE_KEYS, and TCL_ONE_WORD_KEYS can be the
+ * same as TCL_CUSTOM_PTR_KEYS because they simply determine how the key is
+ * accessed from the entry and not the behaviour.
+ */
+
+#define TCL_STRING_KEYS		(0)
+#define TCL_ONE_WORD_KEYS	(1)
+#define TCL_CUSTOM_TYPE_KEYS	(-2)
+#define TCL_CUSTOM_PTR_KEYS	(-1)
+
+/*
+ * Structure definition for information used to keep track of searches through
+ * dictionaries. These fields should not be accessed by code outside
+ * tclDictObj.c
+ */
+
+typedef struct {
+    void *next;			/* Search position for underlying hash
+				 * table. */
+    TCL_HASH_TYPE epoch; 	/* Epoch marker for dictionary being searched,
+				 * or 0 if search has terminated. */
+    Tcl_Dict dictionaryPtr;	/* Reference to dictionary being searched. */
+} Tcl_DictSearch;
+
+/*
+ *----------------------------------------------------------------------------
+ * Flag values to pass to Tcl_DoOneEvent to disable searches for some kinds of
+ * events:
+ */
+
+#define TCL_DONT_WAIT		(1<<1)
+#define TCL_WINDOW_EVENTS	(1<<2)
+#define TCL_FILE_EVENTS		(1<<3)
+#define TCL_TIMER_EVENTS	(1<<4)
+#define TCL_IDLE_EVENTS		(1<<5)	/* WAS 0x10 ???? */
+#define TCL_ALL_EVENTS		(~TCL_DONT_WAIT)
+
+/*
+ * The following structure defines a generic event for the Tcl event system.
+ * These are the things that are queued in calls to Tcl_QueueEvent and
+ * serviced later by Tcl_DoOneEvent. There can be many different kinds of
+ * events with different fields, corresponding to window events, timer events,
+ * etc. The structure for a particular event consists of a Tcl_Event header
+ * followed by additional information specific to that event.
+ */
+
+struct Tcl_Event {
+    Tcl_EventProc *proc;	/* Function to call to service this event. */
+    struct Tcl_Event *nextPtr;	/* Next in list of pending events, or NULL. */
+};
+
+/*
+ * Positions to pass to Tcl_QueueEvent/Tcl_ThreadQueueEvent:
+ */
+
+typedef enum {
+    TCL_QUEUE_TAIL, TCL_QUEUE_HEAD, TCL_QUEUE_MARK,
+	    TCL_QUEUE_ALERT_IF_EMPTY=4
+} Tcl_QueuePosition;
+
+/*
+ * Values to pass to Tcl_SetServiceMode to specify the behavior of notifier
+ * event routines.
+ */
+
+#define TCL_SERVICE_NONE 0
+#define TCL_SERVICE_ALL 1
+
+/*
+ * The following structure keeps is used to hold a time value, either as an
+ * absolute time (the number of seconds from the epoch) or as an elapsed time.
+ * On Unix systems the epoch is Midnight Jan 1, 1970 GMT.
+ */
+
+typedef struct Tcl_Time {
+#if TCL_MAJOR_VERSION > 8
+    long long sec;		/* Seconds. */
+#else
+    long sec;			/* Seconds. */
+#endif
+#if defined(_CYGWIN_) && TCL_MAJOR_VERSION > 8
+    int usec;			/* Microseconds. */
+#else
+    long usec;			/* Microseconds. */
+#endif
+} Tcl_Time;
+
+typedef void (Tcl_SetTimerProc) (const Tcl_Time *timePtr);
+typedef int (Tcl_WaitForEventProc) (const Tcl_Time *timePtr);
+
+/*
+ * TIP #233 (Virtualized Time)
+ */
+
+typedef void (Tcl_GetTimeProc)   (Tcl_Time *timebuf, void *clientData);
+typedef void (Tcl_ScaleTimeProc) (Tcl_Time *timebuf, void *clientData);
+
+/*
+ *----------------------------------------------------------------------------
+ * Bits to pass to Tcl_CreateFileHandler and Tcl_CreateChannelHandler to
+ * indicate what sorts of events are of interest:
+ */
+
+#define TCL_READABLE		(1<<1)
+#define TCL_WRITABLE		(1<<2)
+#define TCL_EXCEPTION		(1<<3)
+
+/*
+ * Flag values to pass to Tcl_OpenCommandChannel to indicate the disposition
+ * of the stdio handles. TCL_STDIN, TCL_STDOUT, TCL_STDERR, are also used in
+ * Tcl_GetStdChannel.
+ */
+
+#define TCL_STDIN		(1<<1)
+#define TCL_STDOUT		(1<<2)
+#define TCL_STDERR		(1<<3)
+#define TCL_ENFORCE_MODE	(1<<4)
+
+/*
+ * Bits passed to Tcl_DriverClose2Proc to indicate which side of a channel
+ * should be closed.
+ */
+
+#define TCL_CLOSE_READ		(1<<1)
+#define TCL_CLOSE_WRITE		(1<<2)
+
+/*
+ * Value to use as the closeProc for a channel that supports the close2Proc
+ * interface.
+ */
+
+#if TCL_MAJOR_VERSION > 8
+#   define TCL_CLOSE2PROC		NULL
+#else
+#   define TCL_CLOSE2PROC		((void *) 1)
+#endif
+
+/*
+ * Channel version tag. This was introduced in 8.3.2/8.4.
+ */
+
+#define TCL_CHANNEL_VERSION_5	((Tcl_ChannelTypeVersion) 0x5)
+
+/*
+ * TIP #218: Channel Actions, Ids for Tcl_DriverThreadActionProc.
+ */
+
+#define TCL_CHANNEL_THREAD_INSERT (0)
+#define TCL_CHANNEL_THREAD_REMOVE (1)
+
+/*
+ * Typedefs for the various operations in a channel type:
+ */
+
+typedef int	(Tcl_DriverBlockModeProc) (void *instanceData, int mode);
+typedef void Tcl_DriverCloseProc;
+typedef int	(Tcl_DriverClose2Proc) (void *instanceData,
+			Tcl_Interp *interp, int flags);
+typedef int	(Tcl_DriverInputProc) (void *instanceData, char *buf,
+			int toRead, int *errorCodePtr);
+typedef int	(Tcl_DriverOutputProc) (void *instanceData,
+			const char *buf, int toWrite, int *errorCodePtr);
+typedef void Tcl_DriverSeekProc;
+typedef int	(Tcl_DriverSetOptionProc) (void *instanceData,
+			Tcl_Interp *interp, const char *optionName,
+			const char *value);
+typedef int	(Tcl_DriverGetOptionProc) (void *instanceData,
+			Tcl_Interp *interp, const char *optionName,
+			Tcl_DString *dsPtr);
+typedef void	(Tcl_DriverWatchProc) (void *instanceData, int mask);
+typedef int	(Tcl_DriverGetHandleProc) (void *instanceData,
+			int direction, void **handlePtr);
+typedef int	(Tcl_DriverFlushProc) (void *instanceData);
+typedef int	(Tcl_DriverHandlerProc) (void *instanceData,
+			int interestMask);
+typedef long long (Tcl_DriverWideSeekProc) (void *instanceData,
+			long long offset, int mode, int *errorCodePtr);
+/*
+ * TIP #218, Channel Thread Actions
+ */
+typedef void	(Tcl_DriverThreadActionProc) (void *instanceData,
+			int action);
+/*
+ * TIP #208, File Truncation (etc.)
+ */
+typedef int	(Tcl_DriverTruncateProc) (void *instanceData,
+			long long length);
+
+/*
+ * struct Tcl_ChannelType:
+ *
+ * One such structure exists for each type (kind) of channel. It collects
+ * together in one place all the functions that are part of the specific
+ * channel type.
+ *
+ * It is recommend that the Tcl_Channel* functions are used to access elements
+ * of this structure, instead of direct accessing.
+ */
+
+typedef struct Tcl_ChannelType {
+    const char *typeName;	/* The name of the channel type in Tcl
+				 * commands. This storage is owned by channel
+				 * type. */
+    Tcl_ChannelTypeVersion version;
+				/* Version of the channel type. */
+    void *closeProc;		/* Not used any more. */
+    Tcl_DriverInputProc *inputProc;
+				/* Function to call for input on channel. */
+    Tcl_DriverOutputProc *outputProc;
+				/* Function to call for output on channel. */
+    void *seekProc;		/* Not used any more. */
+    Tcl_DriverSetOptionProc *setOptionProc;
+				/* Set an option on a channel. */
+    Tcl_DriverGetOptionProc *getOptionProc;
+				/* Get an option from a channel. */
+    Tcl_DriverWatchProc *watchProc;
+				/* Set up the notifier to watch for events on
+				 * this channel. */
+    Tcl_DriverGetHandleProc *getHandleProc;
+				/* Get an OS handle from the channel or NULL
+				 * if not supported. */
+    Tcl_DriverClose2Proc *close2Proc;
+				/* Function to call to close the channel if
+				 * the device supports closing the read &
+				 * write sides independently. */
+    Tcl_DriverBlockModeProc *blockModeProc;
+				/* Set blocking mode for the raw channel. May
+				 * be NULL. */
+    Tcl_DriverFlushProc *flushProc;
+				/* Function to call to flush a channel. May be
+				 * NULL. */
+    Tcl_DriverHandlerProc *handlerProc;
+				/* Function to call to handle a channel event.
+				 * This will be passed up the stacked channel
+				 * chain. */
+    Tcl_DriverWideSeekProc *wideSeekProc;
+				/* Function to call to seek on the channel
+				 * which can handle 64-bit offsets. May be
+				 * NULL, and must be NULL if seekProc is
+				 * NULL. */
+    Tcl_DriverThreadActionProc *threadActionProc;
+				/* Function to call to notify the driver of
+				 * thread specific activity for a channel. May
+				 * be NULL. */
+    Tcl_DriverTruncateProc *truncateProc;
+				/* Function to call to truncate the underlying
+				 * file to a particular length. May be NULL if
+				 * the channel does not support truncation. */
+} Tcl_ChannelType;
+
+/*
+ * The following flags determine whether the blockModeProc above should set
+ * the channel into blocking or nonblocking mode. They are passed as arguments
+ * to the blockModeProc function in the above structure.
+ */
+
+#define TCL_MODE_BLOCKING	0	/* Put channel into blocking mode. */
+#define TCL_MODE_NONBLOCKING	1	/* Put channel into nonblocking
+					 * mode. */
+
+/*
+ *----------------------------------------------------------------------------
+ * Enum for different types of file paths.
+ */
+
+typedef enum Tcl_PathType {
+    TCL_PATH_ABSOLUTE,
+    TCL_PATH_RELATIVE,
+    TCL_PATH_VOLUME_RELATIVE
+} Tcl_PathType;
+
+/*
+ * The following structure is used to pass glob type data amongst the various
+ * glob routines and Tcl_FSMatchInDirectory.
+ */
+
+typedef struct Tcl_GlobTypeData {
+    int type;			/* Corresponds to bcdpfls as in 'find -t'. */
+    int perm;			/* Corresponds to file permissions. */
+    Tcl_Obj *macType;		/* Acceptable Mac type. */
+    Tcl_Obj *macCreator;	/* Acceptable Mac creator. */
+} Tcl_GlobTypeData;
+
+/*
+ * Type and permission definitions for glob command.
+ */
+
+#define TCL_GLOB_TYPE_BLOCK		(1<<0)
+#define TCL_GLOB_TYPE_CHAR		(1<<1)
+#define TCL_GLOB_TYPE_DIR		(1<<2)
+#define TCL_GLOB_TYPE_PIPE		(1<<3)
+#define TCL_GLOB_TYPE_FILE		(1<<4)
+#define TCL_GLOB_TYPE_LINK		(1<<5)
+#define TCL_GLOB_TYPE_SOCK		(1<<6)
+#define TCL_GLOB_TYPE_MOUNT		(1<<7)
+
+#define TCL_GLOB_PERM_RONLY		(1<<0)
+#define TCL_GLOB_PERM_HIDDEN		(1<<1)
+#define TCL_GLOB_PERM_R			(1<<2)
+#define TCL_GLOB_PERM_W			(1<<3)
+#define TCL_GLOB_PERM_X			(1<<4)
+
+/*
+ * Flags for the unload callback function.
+ */
+
+#define TCL_UNLOAD_DETACH_FROM_INTERPRETER	(1<<0)
+#define TCL_UNLOAD_DETACH_FROM_PROCESS		(1<<1)
+
+/*
+ * Typedefs for the various filesystem operations:
+ */
+
+typedef int (Tcl_FSStatProc) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+typedef int (Tcl_FSAccessProc) (Tcl_Obj *pathPtr, int mode);
+typedef Tcl_Channel (Tcl_FSOpenFileChannelProc) (Tcl_Interp *interp,
+	Tcl_Obj *pathPtr, int mode, int permissions);
+typedef int (Tcl_FSMatchInDirectoryProc) (Tcl_Interp *interp, Tcl_Obj *result,
+	Tcl_Obj *pathPtr, const char *pattern, Tcl_GlobTypeData *types);
+typedef Tcl_Obj * (Tcl_FSGetCwdProc) (Tcl_Interp *interp);
+typedef int (Tcl_FSChdirProc) (Tcl_Obj *pathPtr);
+typedef int (Tcl_FSLstatProc) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+typedef int (Tcl_FSCreateDirectoryProc) (Tcl_Obj *pathPtr);
+typedef int (Tcl_FSDeleteFileProc) (Tcl_Obj *pathPtr);
+typedef int (Tcl_FSCopyDirectoryProc) (Tcl_Obj *srcPathPtr,
+	Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr);
+typedef int (Tcl_FSCopyFileProc) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr);
+typedef int (Tcl_FSRemoveDirectoryProc) (Tcl_Obj *pathPtr, int recursive,
+	Tcl_Obj **errorPtr);
+typedef int (Tcl_FSRenameFileProc) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr);
+typedef void (Tcl_FSUnloadFileProc) (Tcl_LoadHandle loadHandle);
+typedef Tcl_Obj * (Tcl_FSListVolumesProc) (void);
+/* We have to declare the utime structure here. */
+struct utimbuf;
+typedef int (Tcl_FSUtimeProc) (Tcl_Obj *pathPtr, struct utimbuf *tval);
+typedef int (Tcl_FSNormalizePathProc) (Tcl_Interp *interp, Tcl_Obj *pathPtr,
+	int nextCheckpoint);
+typedef int (Tcl_FSFileAttrsGetProc) (Tcl_Interp *interp, int index,
+	Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef);
+typedef const char *const * (Tcl_FSFileAttrStringsProc) (Tcl_Obj *pathPtr,
+	Tcl_Obj **objPtrRef);
+typedef int (Tcl_FSFileAttrsSetProc) (Tcl_Interp *interp, int index,
+	Tcl_Obj *pathPtr, Tcl_Obj *objPtr);
+typedef Tcl_Obj * (Tcl_FSLinkProc) (Tcl_Obj *pathPtr, Tcl_Obj *toPtr,
+	int linkType);
+typedef int (Tcl_FSLoadFileProc) (Tcl_Interp *interp, Tcl_Obj *pathPtr,
+	Tcl_LoadHandle *handlePtr, Tcl_FSUnloadFileProc **unloadProcPtr);
+typedef int (Tcl_FSPathInFilesystemProc) (Tcl_Obj *pathPtr,
+	void **clientDataPtr);
+typedef Tcl_Obj * (Tcl_FSFilesystemPathTypeProc) (Tcl_Obj *pathPtr);
+typedef Tcl_Obj * (Tcl_FSFilesystemSeparatorProc) (Tcl_Obj *pathPtr);
+#define Tcl_FSFreeInternalRepProc Tcl_FreeProc
+typedef void *(Tcl_FSDupInternalRepProc) (void *clientData);
+typedef Tcl_Obj * (Tcl_FSInternalToNormalizedProc) (void *clientData);
+typedef void *(Tcl_FSCreateInternalRepProc) (Tcl_Obj *pathPtr);
+
+typedef struct Tcl_FSVersion_ *Tcl_FSVersion;
+
+/*
+ *----------------------------------------------------------------------------
+ * Data structures related to hooking into the filesystem
+ */
+
+/*
+ * Filesystem version tag.  This was introduced in 8.4.
+ */
+
+#define TCL_FILESYSTEM_VERSION_1	((Tcl_FSVersion) 0x1)
+
+/*
+ * struct Tcl_Filesystem:
+ *
+ * One such structure exists for each type (kind) of filesystem. It collects
+ * together the functions that form the interface for a particulr the
+ * filesystem. Tcl always accesses the filesystem through one of these
+ * structures.
+ *
+ * Not all entries need be non-NULL; any which are NULL are simply ignored.
+ * However, a complete filesystem should provide all of these functions. The
+ * explanations in the structure show the importance of each function.
+ */
+
+typedef struct Tcl_Filesystem {
+    const char *typeName;	/* The name of the filesystem. */
+    Tcl_Size structureLength;	/* Length of this structure, so future binary
+				 * compatibility can be assured. */
+    Tcl_FSVersion version;	/* Version of the filesystem type. */
+    Tcl_FSPathInFilesystemProc *pathInFilesystemProc;
+				/* Determines whether the pathname is in this
+				 * filesystem. This is the most important
+				 * filesystem function. */
+    Tcl_FSDupInternalRepProc *dupInternalRepProc;
+				/* Duplicates the internal handle of the node.
+				 * If it is NULL, the filesystem is less
+				 * performant. */
+    Tcl_FSFreeInternalRepProc *freeInternalRepProc;
+				/* Frees the internal handle of the node.  NULL
+				 * only if there is no need to free resources
+				 * used for the internal handle. */
+    Tcl_FSInternalToNormalizedProc *internalToNormalizedProc;
+				/* Converts the internal handle to a normalized
+				 * path.  NULL if the filesystem creates nodes
+				 * having no pathname. */
+    Tcl_FSCreateInternalRepProc *createInternalRepProc;
+				/* Creates an internal handle for a pathname.
+				 * May be NULL if pathnames have no internal
+				 * handle or if pathInFilesystemProc always
+				 * immediately creates an internal
+				 * representation for pathnames in the
+				 * filesystem. */
+    Tcl_FSNormalizePathProc *normalizePathProc;
+				/* Normalizes a path.  Should be implemented if
+				 * the filesystems supports multiple paths to
+				 * the same node. */
+    Tcl_FSFilesystemPathTypeProc *filesystemPathTypeProc;
+				/* Determines the type of a path in this
+				 * filesystem. May be NULL. */
+    Tcl_FSFilesystemSeparatorProc *filesystemSeparatorProc;
+				/* Produces the separator character(s) for this
+				 * filesystem. Must not be NULL. */
+    Tcl_FSStatProc *statProc;	/* Called by 'Tcl_FSStat()'.  Provided by any
+				 * reasonable filesystem. */
+    Tcl_FSAccessProc *accessProc;
+				/* Called by 'Tcl_FSAccess()'.  Implemented by
+				 * any reasonable filesystem. */
+    Tcl_FSOpenFileChannelProc *openFileChannelProc;
+				/* Called by 'Tcl_FSOpenFileChannel()'.
+				 * Provided by any reasonable filesystem. */
+    Tcl_FSMatchInDirectoryProc *matchInDirectoryProc;
+				/* Called by 'Tcl_FSMatchInDirectory()'.  NULL
+				 * if the filesystem does not support glob or
+				 * recursive copy. */
+    Tcl_FSUtimeProc *utimeProc;	/* Called by 'Tcl_FSUtime()', by 'file
+				 *  mtime' to set (not read) times, 'file
+				 *  atime', and the open-r/open-w/fcopy variant
+				 *  of 'file copy'. */
+    Tcl_FSLinkProc *linkProc;	/* Called by 'Tcl_FSLink()'. NULL if reading or
+				 *  creating links is not supported. */
+    Tcl_FSListVolumesProc *listVolumesProc;
+				/* Lists filesystem volumes added by this
+				 * filesystem. NULL if the filesystem does not
+				 * use volumes. */
+    Tcl_FSFileAttrStringsProc *fileAttrStringsProc;
+				/* List all valid attributes strings.  NULL if
+				 * the filesystem does not support the 'file
+				 * attributes' command.  Can be used to attach
+				 * arbitrary additional data to files in a
+				 * filesystem. */
+    Tcl_FSFileAttrsGetProc *fileAttrsGetProc;
+				/* Called by 'Tcl_FSFileAttrsGet()' and by
+				 * 'file attributes'. */
+    Tcl_FSFileAttrsSetProc *fileAttrsSetProc;
+				/* Called by 'Tcl_FSFileAttrsSet()' and by
+				 * 'file attributes'.  */
+    Tcl_FSCreateDirectoryProc *createDirectoryProc;
+				/* Called by 'Tcl_FSCreateDirectory()'.  May be
+				 * NULL if the filesystem is read-only. */
+    Tcl_FSRemoveDirectoryProc *removeDirectoryProc;
+				/* Called by 'Tcl_FSRemoveDirectory()'.  May be
+				 * NULL if the filesystem is read-only. */
+    Tcl_FSDeleteFileProc *deleteFileProc;
+				/* Called by 'Tcl_FSDeleteFile()' May be NULL
+				 * if the filesystem is is read-only. */
+    Tcl_FSCopyFileProc *copyFileProc;
+				/* Called by 'Tcl_FSCopyFile()'.  If NULL, for
+				 * a copy operation at the script level (not
+				 * C) Tcl uses open-r, open-w and fcopy. */
+    Tcl_FSRenameFileProc *renameFileProc;
+				/* Called by 'Tcl_FSRenameFile()'. If NULL, for
+				 * a rename operation at the script level (not
+				 * C) Tcl performs a copy operation followed
+				 * by a delete operation. */
+    Tcl_FSCopyDirectoryProc *copyDirectoryProc;
+				/* Called by 'Tcl_FSCopyDirectory()'. If NULL,
+				 * for a copy operation at the script level
+				 * (not C) Tcl recursively creates directories
+				 * and copies files. */
+    Tcl_FSLstatProc *lstatProc;	/* Called by 'Tcl_FSLstat()'. If NULL, Tcl
+				 * attempts to use 'statProc' instead. */
+    Tcl_FSLoadFileProc *loadFileProc;
+				/* Called by 'Tcl_FSLoadFile()'. If NULL, Tcl
+				 * performs a copy to a temporary file in the
+				 * native filesystem and then calls
+				 * Tcl_FSLoadFile() on that temporary copy. */
+    Tcl_FSGetCwdProc *getCwdProc;
+				/* Called by 'Tcl_FSGetCwd()'.  Normally NULL.
+				 * Usually only called once:  If 'getcwd' is
+				 * called before 'chdir' is ever called. */
+    Tcl_FSChdirProc *chdirProc;	/* Called by 'Tcl_FSChdir()'.  For a virtual
+				 * filesystem, chdirProc just returns zero
+				 * (success) if the pathname is a valid
+				 * directory, and some other value otherwise.
+				 * For A real filesystem, chdirProc performs
+				 * the correct action, e.g.  calls the system
+				 * 'chdir' function. If not implemented, then
+				 * 'cd' and 'pwd' fail for a pathname in this
+				 * filesystem. On success Tcl stores the
+				 * pathname for use by GetCwd.  If NULL, Tcl
+				 * performs records the pathname as the new
+				 * current directory if it passes a series of
+				 * directory access checks. */
+} Tcl_Filesystem;
+
+/*
+ * The following definitions are used as values for the 'linkAction' flag to
+ * Tcl_FSLink, or the linkProc of any filesystem. Any combination of flags can
+ * be given. For link creation, the linkProc should create a link which
+ * matches any of the types given.
+ *
+ * TCL_CREATE_SYMBOLIC_LINK -	Create a symbolic or soft link.
+ * TCL_CREATE_HARD_LINK -	Create a hard link.
+ */
+
+#define TCL_CREATE_SYMBOLIC_LINK	0x01
+#define TCL_CREATE_HARD_LINK		0x02
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure represents the Notifier functions that you can
+ * override with the Tcl_SetNotifier call.
+ */
+
+typedef struct Tcl_NotifierProcs {
+    Tcl_SetTimerProc *setTimerProc;
+    Tcl_WaitForEventProc *waitForEventProc;
+    Tcl_CreateFileHandlerProc *createFileHandlerProc;
+    Tcl_DeleteFileHandlerProc *deleteFileHandlerProc;
+    Tcl_InitNotifierProc *initNotifierProc;
+    Tcl_FinalizeNotifierProc *finalizeNotifierProc;
+    Tcl_AlertNotifierProc *alertNotifierProc;
+    Tcl_ServiceModeHookProc *serviceModeHookProc;
+} Tcl_NotifierProcs;
+
+/*
+ *----------------------------------------------------------------------------
+ * The following data structures and declarations are for the new Tcl parser.
+ *
+ * For each word of a command, and for each piece of a word such as a variable
+ * reference, one of the following structures is created to describe the
+ * token.
+ */
+
+typedef struct Tcl_Token {
+    int type;			/* Type of token, such as TCL_TOKEN_WORD; see
+				 * below for valid types. */
+    const char *start;		/* First character in token. */
+    Tcl_Size size;			/* Number of bytes in token. */
+    Tcl_Size numComponents;		/* If this token is composed of other tokens,
+				 * this field tells how many of them there are
+				 * (including components of components, etc.).
+				 * The component tokens immediately follow
+				 * this one. */
+} Tcl_Token;
+
+/*
+ * Type values defined for Tcl_Token structures. These values are defined as
+ * mask bits so that it's easy to check for collections of types.
+ *
+ * TCL_TOKEN_WORD -		The token describes one word of a command,
+ *				from the first non-blank character of the word
+ *				(which may be " or {) up to but not including
+ *				the space, semicolon, or bracket that
+ *				terminates the word. NumComponents counts the
+ *				total number of sub-tokens that make up the
+ *				word. This includes, for example, sub-tokens
+ *				of TCL_TOKEN_VARIABLE tokens.
+ * TCL_TOKEN_SIMPLE_WORD -	This token is just like TCL_TOKEN_WORD except
+ *				that the word is guaranteed to consist of a
+ *				single TCL_TOKEN_TEXT sub-token.
+ * TCL_TOKEN_TEXT -		The token describes a range of literal text
+ *				that is part of a word. NumComponents is
+ *				always 0.
+ * TCL_TOKEN_BS -		The token describes a backslash sequence that
+ *				must be collapsed. NumComponents is always 0.
+ * TCL_TOKEN_COMMAND -		The token describes a command whose result
+ *				must be substituted into the word. The token
+ *				includes the enclosing brackets. NumComponents
+ *				is always 0.
+ * TCL_TOKEN_VARIABLE -		The token describes a variable substitution,
+ *				including the dollar sign, variable name, and
+ *				array index (if there is one) up through the
+ *				right parentheses. NumComponents tells how
+ *				many additional tokens follow to represent the
+ *				variable name. The first token will be a
+ *				TCL_TOKEN_TEXT token that describes the
+ *				variable name. If the variable is an array
+ *				reference then there will be one or more
+ *				additional tokens, of type TCL_TOKEN_TEXT,
+ *				TCL_TOKEN_BS, TCL_TOKEN_COMMAND, and
+ *				TCL_TOKEN_VARIABLE, that describe the array
+ *				index; numComponents counts the total number
+ *				of nested tokens that make up the variable
+ *				reference, including sub-tokens of
+ *				TCL_TOKEN_VARIABLE tokens.
+ * TCL_TOKEN_SUB_EXPR -		The token describes one subexpression of an
+ *				expression, from the first non-blank character
+ *				of the subexpression up to but not including
+ *				the space, brace, or bracket that terminates
+ *				the subexpression. NumComponents counts the
+ *				total number of following subtokens that make
+ *				up the subexpression; this includes all
+ *				subtokens for any nested TCL_TOKEN_SUB_EXPR
+ *				tokens. For example, a numeric value used as a
+ *				primitive operand is described by a
+ *				TCL_TOKEN_SUB_EXPR token followed by a
+ *				TCL_TOKEN_TEXT token. A binary subexpression
+ *				is described by a TCL_TOKEN_SUB_EXPR token
+ *				followed by the TCL_TOKEN_OPERATOR token for
+ *				the operator, then TCL_TOKEN_SUB_EXPR tokens
+ *				for the left then the right operands.
+ * TCL_TOKEN_OPERATOR -		The token describes one expression operator.
+ *				An operator might be the name of a math
+ *				function such as "abs". A TCL_TOKEN_OPERATOR
+ *				token is always preceded by one
+ *				TCL_TOKEN_SUB_EXPR token for the operator's
+ *				subexpression, and is followed by zero or more
+ *				TCL_TOKEN_SUB_EXPR tokens for the operator's
+ *				operands. NumComponents is always 0.
+ * TCL_TOKEN_EXPAND_WORD -	This token is just like TCL_TOKEN_WORD except
+ *				that it marks a word that began with the
+ *				literal character prefix "{*}". This word is
+ *				marked to be expanded - that is, broken into
+ *				words after substitution is complete.
+ */
+
+#define TCL_TOKEN_WORD		1
+#define TCL_TOKEN_SIMPLE_WORD	2
+#define TCL_TOKEN_TEXT		4
+#define TCL_TOKEN_BS		8
+#define TCL_TOKEN_COMMAND	16
+#define TCL_TOKEN_VARIABLE	32
+#define TCL_TOKEN_SUB_EXPR	64
+#define TCL_TOKEN_OPERATOR	128
+#define TCL_TOKEN_EXPAND_WORD	256
+
+/*
+ * Parsing error types. On any parsing error, one of these values will be
+ * stored in the error field of the Tcl_Parse structure defined below.
+ */
+
+#define TCL_PARSE_SUCCESS		0
+#define TCL_PARSE_QUOTE_EXTRA		1
+#define TCL_PARSE_BRACE_EXTRA		2
+#define TCL_PARSE_MISSING_BRACE		3
+#define TCL_PARSE_MISSING_BRACKET	4
+#define TCL_PARSE_MISSING_PAREN		5
+#define TCL_PARSE_MISSING_QUOTE		6
+#define TCL_PARSE_MISSING_VAR_BRACE	7
+#define TCL_PARSE_SYNTAX		8
+#define TCL_PARSE_BAD_NUMBER		9
+
+/*
+ * A structure of the following type is filled in by Tcl_ParseCommand. It
+ * describes a single command parsed from an input string.
+ */
+
+#define NUM_STATIC_TOKENS 20
+
+typedef struct Tcl_Parse {
+    const char *commentStart;	/* Pointer to # that begins the first of one
+				 * or more comments preceding the command. */
+    Tcl_Size commentSize;		/* Number of bytes in comments (up through
+				 * newline character that terminates the last
+				 * comment). If there were no comments, this
+				 * field is 0. */
+    const char *commandStart;	/* First character in first word of
+				 * command. */
+    Tcl_Size commandSize;		/* Number of bytes in command, including first
+				 * character of first word, up through the
+				 * terminating newline, close bracket, or
+				 * semicolon. */
+    Tcl_Size numWords;		/* Total number of words in command. May be
+				 * 0. */
+    Tcl_Token *tokenPtr;	/* Pointer to first token representing the
+				 * words of the command. Initially points to
+				 * staticTokens, but may change to point to
+				 * malloc-ed space if command exceeds space in
+				 * staticTokens. */
+    Tcl_Size numTokens;		/* Total number of tokens in command. */
+    Tcl_Size tokensAvailable;	/* Total number of tokens available at
+				 * *tokenPtr. */
+    int errorType;		/* One of the parsing error types defined
+				 * above. */
+#if TCL_MAJOR_VERSION > 8
+    int incomplete;		/* This field is set to 1 by Tcl_ParseCommand
+				 * if the command appears to be incomplete.
+				 * This information is used by
+				 * Tcl_CommandComplete. */
+#endif
+
+    /*
+     * The fields below are intended only for the private use of the parser.
+     * They should not be used by functions that invoke Tcl_ParseCommand.
+     */
+
+    const char *string;		/* The original command string passed to
+				 * Tcl_ParseCommand. */
+    const char *end;		/* Points to the character just after the last
+				 * one in the command string. */
+    Tcl_Interp *interp;		/* Interpreter to use for error reporting, or
+				 * NULL. */
+    const char *term;		/* Points to character in string that
+				 * terminated most recent token. Filled in by
+				 * ParseTokens. If an error occurs, points to
+				 * beginning of region where the error
+				 * occurred (e.g. the open brace if the close
+				 * brace is missing). */
+#if TCL_MAJOR_VERSION < 9
+    int incomplete;
+#endif
+    Tcl_Token staticTokens[NUM_STATIC_TOKENS];
+				/* Initial space for tokens for command. This
+				 * space should be large enough to accommodate
+				 * most commands; dynamic space is allocated
+				 * for very large commands that don't fit
+				 * here. */
+} Tcl_Parse;
+
+/*
+ *----------------------------------------------------------------------------
+ * The following structure represents a user-defined encoding. It collects
+ * together all the functions that are used by the specific encoding.
+ */
+
+typedef struct Tcl_EncodingType {
+    const char *encodingName;	/* The name of the encoding, e.g. "euc-jp".
+				 * This name is the unique key for this
+				 * encoding type. */
+    Tcl_EncodingConvertProc *toUtfProc;
+				/* Function to convert from external encoding
+				 * into UTF-8. */
+    Tcl_EncodingConvertProc *fromUtfProc;
+				/* Function to convert from UTF-8 into
+				 * external encoding. */
+    Tcl_FreeProc *freeProc;
+				/* If non-NULL, function to call when this
+				 * encoding is deleted. */
+    void *clientData;	/* Arbitrary value associated with encoding
+				 * type. Passed to conversion functions. */
+    Tcl_Size nullSize;		/* Number of zero bytes that signify
+				 * end-of-string in this encoding. This number
+				 * is used to determine the source string
+				 * length when the srcLen argument is
+				 * negative. Must be 1, 2, or 4. */
+} Tcl_EncodingType;
+
+/*
+ * The following definitions are used as values for the conversion control
+ * flags argument when converting text from one character set to another:
+ *
+ * TCL_ENCODING_START -		Signifies that the source buffer is the first
+ *				block in a (potentially multi-block) input
+ *				stream. Tells the conversion function to reset
+ *				to an initial state and perform any
+ *				initialization that needs to occur before the
+ *				first byte is converted. If the source buffer
+ *				contains the entire input stream to be
+ *				converted, this flag should be set.
+ * TCL_ENCODING_END -		Signifies that the source buffer is the last
+ *				block in a (potentially multi-block) input
+ *				stream. Tells the conversion routine to
+ *				perform any finalization that needs to occur
+ *				after the last byte is converted and then to
+ *				reset to an initial state. If the source
+ *				buffer contains the entire input stream to be
+ *				converted, this flag should be set.
+ * TCL_ENCODING_STOPONERROR -	Not used any more.
+ * TCL_ENCODING_NO_TERMINATE - 	If set, Tcl_ExternalToUtf does not append a
+ *				terminating NUL byte.  Since it does not need
+ *				an extra byte for a terminating NUL, it fills
+ *				all dstLen bytes with encoded UTF-8 content if
+ *				needed.  If clear, a byte is reserved in the
+ *				dst space for NUL termination, and a
+ *				terminating NUL is appended.
+ * TCL_ENCODING_CHAR_LIMIT -	If set and dstCharsPtr is not NULL, then
+ *				Tcl_ExternalToUtf takes the initial value of
+ *				*dstCharsPtr as a limit of the maximum number
+ *				of chars to produce in the encoded UTF-8
+ *				content.  Otherwise, the number of chars
+ *				produced is controlled only by other limiting
+ *				factors.
+ * TCL_ENCODING_PROFILE_* -	Mutually exclusive encoding profile ids. Note
+ *				these are bit masks.
+ *
+ * NOTE: THESE BIT DEFINITIONS SHOULD NOT OVERLAP WITH INTERNAL USE BITS
+ * DEFINED IN tclEncoding.c (ENCODING_INPUT et al). Be cognizant of this
+ * when adding bits.
+ */
+
+#define TCL_ENCODING_START		0x01
+#define TCL_ENCODING_END		0x02
+#if TCL_MAJOR_VERSION > 8
+#   define TCL_ENCODING_STOPONERROR	0x0 /* Not used any more */
+#else
+#   define TCL_ENCODING_STOPONERROR	0x04
+#endif
+#define TCL_ENCODING_NO_TERMINATE	0x08
+#define TCL_ENCODING_CHAR_LIMIT		0x10
+/* Internal use bits, do not define bits in this space. See above comment */
+#define TCL_ENCODING_INTERNAL_USE_MASK  0xFF00
+/*
+ * Reserve top byte for profile values (disjoint, not a mask). In case of
+ * changes, ensure ENCODING_PROFILE_* macros in tclInt.h are modified if
+ * necessary.
+ */
+#define TCL_ENCODING_PROFILE_STRICT   TCL_ENCODING_STOPONERROR
+#define TCL_ENCODING_PROFILE_TCL8     0x01000000
+#define TCL_ENCODING_PROFILE_REPLACE  0x02000000
+
+/*
+ * The following definitions are the error codes returned by the conversion
+ * routines:
+ *
+ * TCL_OK -			All characters were converted.
+ * TCL_CONVERT_NOSPACE -	The output buffer would not have been large
+ *				enough for all of the converted data; as many
+ *				characters as could fit were converted though.
+ * TCL_CONVERT_MULTIBYTE -	The last few bytes in the source string were
+ *				the beginning of a multibyte sequence, but
+ *				more bytes were needed to complete this
+ *				sequence. A subsequent call to the conversion
+ *				routine should pass the beginning of this
+ *				unconverted sequence plus additional bytes
+ *				from the source stream to properly convert the
+ *				formerly split-up multibyte sequence.
+ * TCL_CONVERT_SYNTAX -		The source stream contained an invalid
+ *				character sequence. This may occur if the
+ *				input stream has been damaged or if the input
+ *				encoding method was misidentified.
+ * TCL_CONVERT_UNKNOWN -	The source string contained a character that
+ *				could not be represented in the target
+ *				encoding.
+ */
+
+#define TCL_CONVERT_MULTIBYTE	(-1)
+#define TCL_CONVERT_SYNTAX	(-2)
+#define TCL_CONVERT_UNKNOWN	(-3)
+#define TCL_CONVERT_NOSPACE	(-4)
+
+/*
+ * The maximum number of bytes that are necessary to represent a single
+ * Unicode character in UTF-8. The valid values are 3 and 4. If > 3,
+ * then Tcl_UniChar must be 4-bytes in size (UCS-4) (the default). If == 3,
+ * then Tcl_UniChar must be 2-bytes in size (UTF-16). Since Tcl 9.0, UCS-4
+ * mode is the default and recommended mode.
+ */
+
+#ifndef TCL_UTF_MAX
+#   if TCL_MAJOR_VERSION > 8
+#	define TCL_UTF_MAX		4
+#   else
+#	define TCL_UTF_MAX		3
+#   endif
+#endif
+
+/*
+ * This represents a Unicode character. Any changes to this should also be
+ * reflected in regcustom.h.
+ */
+
+#if TCL_UTF_MAX == 4
+    /*
+     * int isn't 100% accurate as it should be a strict 4-byte value
+     * (perhaps int32_t). ILP64/SILP64 systems may have troubles. The
+     * size of this value must be reflected correctly in regcustom.h.
+     */
+typedef int Tcl_UniChar;
+#elif TCL_UTF_MAX == 3 && !defined(BUILD_tcl)
+typedef unsigned short Tcl_UniChar;
+#else
+#   error "This TCL_UTF_MAX value is not supported"
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * TIP #59: The following structure is used in calls 'Tcl_RegisterConfig' to
+ * provide the system with the embedded configuration data.
+ */
+
+typedef struct Tcl_Config {
+    const char *key;		/* Configuration key to register. ASCII
+				 * encoded, thus UTF-8. */
+    const char *value;		/* The value associated with the key. System
+				 * encoding. */
+} Tcl_Config;
+
+/*
+ *----------------------------------------------------------------------------
+ * Flags for TIP#143 limits, detailing which limits are active in an
+ * interpreter. Used for Tcl_{Add,Remove}LimitHandler type argument.
+ */
+
+#define TCL_LIMIT_COMMANDS	0x01
+#define TCL_LIMIT_TIME		0x02
+
+/*
+ * Structure containing information about a limit handler to be called when a
+ * command- or time-limit is exceeded by an interpreter.
+ */
+
+typedef void (Tcl_LimitHandlerProc) (void *clientData, Tcl_Interp *interp);
+#if TCL_MAJOR_VERSION > 8
+#define Tcl_LimitHandlerDeleteProc Tcl_FreeProc
+#else
+typedef void (Tcl_LimitHandlerDeleteProc) (void *clientData);
+#endif
+
+#if 0
+/*
+ *----------------------------------------------------------------------------
+ * We would like to provide an anonymous structure "mp_int" here, which is
+ * compatible with libtommath's "mp_int", but without duplicating anything
+ * from <tommath.h> or including <tommath.h> here. But the libtommath project
+ * didn't honor our request. See: <https://github.com/libtom/libtommath/pull/473>
+ *
+ * That's why this part is commented out, and we are using (void *) in
+ * various API's in stead of the more correct (mp_int *).
+ */
+
+#ifndef MP_INT_DECLARED
+#define MP_INT_DECLARED
+typedef struct mp_int mp_int;
+#endif
+
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * Definitions needed for Tcl_ParseArgvObj routines.
+ * Based on tkArgv.c.
+ * Modifications from the original are copyright (c) Sam Bromley 2006
+ */
+
+typedef struct {
+    int type;			/* Indicates the option type; see below. */
+    const char *keyStr;		/* The key string that flags the option in the
+				 * argv array. */
+    void *srcPtr;		/* Value to be used in setting dst; usage
+				 * depends on type.*/
+    void *dstPtr;		/* Address of value to be modified; usage
+				 * depends on type.*/
+    const char *helpStr;	/* Documentation message describing this
+				 * option. */
+    void *clientData;	/* Word to pass to function callbacks. */
+} Tcl_ArgvInfo;
+
+/*
+ * Legal values for the type field of a Tcl_ArgInfo: see the user
+ * documentation for details.
+ */
+
+#define TCL_ARGV_CONSTANT	15
+#define TCL_ARGV_INT		16
+#define TCL_ARGV_STRING		17
+#define TCL_ARGV_REST		18
+#define TCL_ARGV_FLOAT		19
+#define TCL_ARGV_FUNC		20
+#define TCL_ARGV_GENFUNC	21
+#define TCL_ARGV_HELP		22
+#define TCL_ARGV_END		23
+
+/*
+ * Types of callback functions for the TCL_ARGV_FUNC and TCL_ARGV_GENFUNC
+ * argument types:
+ */
+
+typedef int (Tcl_ArgvFuncProc)(void *clientData, Tcl_Obj *objPtr,
+	void *dstPtr);
+typedef int (Tcl_ArgvGenFuncProc)(void *clientData, Tcl_Interp *interp,
+	int objc, Tcl_Obj *const *objv, void *dstPtr);
+
+/*
+ * Shorthand for commonly used argTable entries.
+ */
+
+#define TCL_ARGV_AUTO_HELP \
+    {TCL_ARGV_HELP,	"-help",	NULL,	NULL, \
+	    "Print summary of command-line options and abort", NULL}
+#define TCL_ARGV_AUTO_REST \
+    {TCL_ARGV_REST,	"--",		NULL,	NULL, \
+	    "Marks the end of the options", NULL}
+#define TCL_ARGV_TABLE_END \
+    {TCL_ARGV_END, NULL, NULL, NULL, NULL, NULL}
+
+/*
+ *----------------------------------------------------------------------------
+ * Definitions needed for Tcl_Zlib routines. [TIP #234]
+ *
+ * Constants for the format flags describing what sort of data format is
+ * desired/expected for the Tcl_ZlibDeflate, Tcl_ZlibInflate and
+ * Tcl_ZlibStreamInit functions.
+ */
+
+#define TCL_ZLIB_FORMAT_RAW	1
+#define TCL_ZLIB_FORMAT_ZLIB	2
+#define TCL_ZLIB_FORMAT_GZIP	4
+#define TCL_ZLIB_FORMAT_AUTO	8
+
+/*
+ * Constants that describe whether the stream is to operate in compressing or
+ * decompressing mode.
+ */
+
+#define TCL_ZLIB_STREAM_DEFLATE	16
+#define TCL_ZLIB_STREAM_INFLATE	32
+
+/*
+ * Constants giving compression levels. Use of TCL_ZLIB_COMPRESS_DEFAULT is
+ * recommended.
+ */
+
+#define TCL_ZLIB_COMPRESS_NONE	0
+#define TCL_ZLIB_COMPRESS_FAST	1
+#define TCL_ZLIB_COMPRESS_BEST	9
+#define TCL_ZLIB_COMPRESS_DEFAULT (-1)
+
+/*
+ * Constants for types of flushing, used with Tcl_ZlibFlush.
+ */
+
+#define TCL_ZLIB_NO_FLUSH	0
+#define TCL_ZLIB_FLUSH		2
+#define TCL_ZLIB_FULLFLUSH	3
+#define TCL_ZLIB_FINALIZE	4
+
+/*
+ *----------------------------------------------------------------------------
+ * Definitions needed for the Tcl_LoadFile function. [TIP #416]
+ */
+
+#define TCL_LOAD_GLOBAL 1
+#define TCL_LOAD_LAZY 2
+
+/*
+ *----------------------------------------------------------------------------
+ * Definitions needed for the Tcl_OpenTcpServerEx function. [TIP #456]
+ */
+#define TCL_TCPSERVER_REUSEADDR (1<<0)
+#define TCL_TCPSERVER_REUSEPORT (1<<1)
+
+/*
+ * Constants for special Tcl_Size-typed values, see TIP #494
+ */
+
+#define TCL_IO_FAILURE	((Tcl_Size)-1)
+#define TCL_AUTO_LENGTH	((Tcl_Size)-1)
+#define TCL_INDEX_NONE  ((Tcl_Size)-1)
+
+/*
+ *----------------------------------------------------------------------------
+ * Single public declaration for NRE.
+ */
+
+typedef int (Tcl_NRPostProc) (void *data[], Tcl_Interp *interp,
+				int result);
+
+/*
+ *----------------------------------------------------------------------------
+ * The following constant is used to test for older versions of Tcl in the
+ * stubs tables.
+ */
+
+#if TCL_MAJOR_VERSION > 8
+#   define TCL_STUB_MAGIC		((int) 0xFCA3BACB + (int) sizeof(void *))
+#else
+#   define TCL_STUB_MAGIC		((int) 0xFCA3BACF)
+#endif
+
+/*
+ * The following function is required to be defined in all stubs aware
+ * extensions. The function is actually implemented in the stub library, not
+ * the main Tcl library, although there is a trivial implementation in the
+ * main library in case an extension is statically linked into an application.
+ */
+
+const char *		Tcl_InitStubs(Tcl_Interp *interp, const char *version,
+			    int exact, int magic);
+const char *		TclTomMathInitializeStubs(Tcl_Interp *interp,
+			    const char *version, int epoch, int revision);
+const char *		TclInitStubTable(const char *version);
+void *			TclStubCall(void *arg);
+#if defined(_WIN32)
+    TCL_NORETURN1 void Tcl_ConsolePanic(const char *format, ...);
+#else
+#   define Tcl_ConsolePanic NULL
+#endif
+
+#ifdef USE_TCL_STUBS
+#if TCL_MAJOR_VERSION < 9
+# if TCL_UTF_MAX < 4
+#   define Tcl_InitStubs(interp, version, exact) \
+	(Tcl_InitStubs)(interp, version, \
+	    (exact)|(TCL_MAJOR_VERSION<<8)|(0xFF<<16), \
+	    TCL_STUB_MAGIC)
+# else
+#   define Tcl_InitStubs(interp, version, exact) \
+	(Tcl_InitStubs)(interp, "8.7.0", \
+	    (exact)|(TCL_MAJOR_VERSION<<8)|(0xFF<<16), \
+	    TCL_STUB_MAGIC)
+# endif
+#elif TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE
+#   define Tcl_InitStubs(interp, version, exact) \
+	(Tcl_InitStubs)(interp, version, \
+	    (exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), \
+	    TCL_STUB_MAGIC)
+#else
+#   define Tcl_InitStubs(interp, version, exact) \
+	(Tcl_InitStubs)(interp, TCL_PATCH_LEVEL, \
+	    1|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), \
+	    TCL_STUB_MAGIC)
+#endif
+#else
+#if TCL_MAJOR_VERSION < 9
+#   error "Please define -DUSE_TCL_STUBS"
+#elif TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE
+#   define Tcl_InitStubs(interp, version, exact) \
+	Tcl_PkgInitStubsCheck(interp, version, \
+		(exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16))
+#else
+#   define Tcl_InitStubs(interp, version, exact) \
+	Tcl_PkgInitStubsCheck(interp, TCL_PATCH_LEVEL, \
+		1|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16))
+#endif
+#endif
+
+/*
+ * Public functions that are not accessible via the stubs table.
+ * Tcl_GetMemoryInfo is needed for AOLserver. [Bug 1868171]
+ */
+
+#define Tcl_Main(argc, argv, proc) Tcl_MainEx(argc, argv, proc, \
+	    ((Tcl_SetPanicProc(Tcl_ConsolePanic), Tcl_CreateInterp())))
+EXTERN TCL_NORETURN void Tcl_MainEx(Tcl_Size argc, char **argv,
+			    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
+EXTERN const char *	Tcl_PkgInitStubsCheck(Tcl_Interp *interp,
+			    const char *version, int exact);
+EXTERN const char *	Tcl_InitSubsystems(void);
+EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
+EXTERN const char *	Tcl_FindExecutable(const char *argv0);
+EXTERN const char *	Tcl_SetPreInitScript(const char *string);
+EXTERN const char *	Tcl_SetPanicProc(
+			    TCL_NORETURN1 Tcl_PanicProc *panicProc);
+EXTERN void		Tcl_StaticLibrary(Tcl_Interp *interp,
+			    const char *prefix,
+			    Tcl_LibraryInitProc *initProc,
+			    Tcl_LibraryInitProc *safeInitProc);
+#ifndef TCL_NO_DEPRECATED
+#   define Tcl_StaticPackage Tcl_StaticLibrary
+#endif
+EXTERN Tcl_ExitProc *Tcl_SetExitProc(TCL_NORETURN1 Tcl_ExitProc *proc);
+#ifdef _WIN32
+EXTERN const char *TclZipfs_AppHook(int *argc, wchar_t ***argv);
+#else
+EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv);
+#endif
+#if defined(_WIN32) && defined(UNICODE)
+#ifndef USE_TCL_STUBS
+#   define Tcl_FindExecutable(arg) ((Tcl_FindExecutable)((const char *)(arg)))
+#endif
+#   define Tcl_MainEx Tcl_MainExW
+    EXTERN TCL_NORETURN void Tcl_MainExW(Tcl_Size argc, wchar_t **argv,
+	    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
+#endif
+#if defined(USE_TCL_STUBS) && (TCL_MAJOR_VERSION > 8)
+#define Tcl_SetPanicProc(panicProc) \
+    TclInitStubTable(((const char *(*)(Tcl_PanicProc *))TclStubCall((void *)panicProc))(panicProc))
+#define Tcl_InitSubsystems() \
+    TclInitStubTable(((const char *(*)(void))TclStubCall((void *)1))())
+#define Tcl_FindExecutable(argv0) \
+    TclInitStubTable(((const char *(*)(const char *))TclStubCall((void *)2))(argv0))
+#define TclZipfs_AppHook(argcp, argvp) \
+	TclInitStubTable(((const char *(*)(int *, void *))TclStubCall((void *)3))(argcp, argvp))
+#define Tcl_MainExW(argc, argv, appInitProc, interp) \
+	(void)((const char *(*)(Tcl_Size, const void *, Tcl_AppInitProc *, Tcl_Interp *)) \
+	TclStubCall((void *)4))(argc, argv, appInitProc, interp)
+#if !defined(_WIN32) || !defined(UNICODE)
+#define Tcl_MainEx(argc, argv, appInitProc, interp) \
+	(void)((const char *(*)(Tcl_Size, const void *, Tcl_AppInitProc *, Tcl_Interp *)) \
+	TclStubCall((void *)5))(argc, argv, appInitProc, interp)
+#endif
+#define Tcl_StaticLibrary(interp, pkgName, initProc, safeInitProc) \
+	(void)((const char *(*)(Tcl_Interp *, const char *, Tcl_LibraryInitProc *, Tcl_LibraryInitProc *)) \
+	TclStubCall((void *)6))(interp, pkgName, initProc, safeInitProc)
+#define Tcl_SetExitProc(proc) \
+	((Tcl_ExitProc *(*)(Tcl_ExitProc *))TclStubCall((void *)7))(proc)
+#define Tcl_GetMemoryInfo(dsPtr) \
+	(void)((const char *(*)(Tcl_DString *))TclStubCall((void *)8))(dsPtr)
+#define Tcl_SetPreInitScript(string) \
+	((const char *(*)(const char *))TclStubCall((void *)9))(string)
+#endif
+
+/*
+ *----------------------------------------------------------------------------
+ * Include the public function declarations that are accessible via the stubs
+ * table.
+ */
+
+#include "tclDecls.h"
+
+/*
+ * Include platform specific public function declarations that are accessible
+ * via the stubs table. Make all TclOO symbols MODULE_SCOPE (which only
+ * has effect on building it as a shared library). See ticket [3010352].
+ */
+
+#if defined(BUILD_tcl)
+#   undef TCLAPI
+#   define TCLAPI MODULE_SCOPE
+#endif
+
+#include "tclPlatDecls.h"
+
+/*
+ *----------------------------------------------------------------------------
+ * The following declarations map ckalloc and ckfree to Tcl_Alloc and
+ * Tcl_Free for use in Tcl-8.x-compatible extensions.
+ */
+
+#ifndef BUILD_tcl
+#   define ckalloc Tcl_Alloc
+#   define attemptckalloc Tcl_AttemptAlloc
+#   ifdef _MSC_VER
+	/* Silence invalid C4090 warnings */
+#	define ckfree(a) Tcl_Free((void *)(a))
+#	define ckrealloc(a,b) Tcl_Realloc((void *)(a),(b))
+#	define attemptckrealloc(a,b) Tcl_AttemptRealloc((void *)(a),(b))
+#   else
+#	define ckfree Tcl_Free
+#	define ckrealloc Tcl_Realloc
+#	define attemptckrealloc Tcl_AttemptRealloc
+#   endif
+#endif
+
+#ifndef TCL_MEM_DEBUG
+
+/*
+ * If we are not using the debugging allocator, we should call the Tcl_Alloc,
+ * et al. routines in order to guarantee that every module is using the same
+ * memory allocator both inside and outside of the Tcl library.
+ */
+
+#   undef  Tcl_InitMemory
+#   define Tcl_InitMemory(x)
+#   undef  Tcl_DumpActiveMemory
+#   define Tcl_DumpActiveMemory(x)
+#   undef  Tcl_ValidateAllMemory
+#   define Tcl_ValidateAllMemory(x,y)
+
+#endif /* !TCL_MEM_DEBUG */
+
+#ifdef TCL_MEM_DEBUG
+#   undef Tcl_IncrRefCount
+#   define Tcl_IncrRefCount(objPtr) \
+	Tcl_DbIncrRefCount(objPtr, __FILE__, __LINE__)
+#   undef Tcl_DecrRefCount
+#   define Tcl_DecrRefCount(objPtr) \
+	Tcl_DbDecrRefCount(objPtr, __FILE__, __LINE__)
+#   undef Tcl_IsShared
+#   define Tcl_IsShared(objPtr) \
+	Tcl_DbIsShared(objPtr, __FILE__, __LINE__)
+/*
+ * Free the Obj by effectively doing:
+ *
+ *   Tcl_IncrRefCount(objPtr);
+ *   Tcl_DecrRefCount(objPtr);
+ *
+ * This will free the obj if there are no references to the obj.
+ */
+#   define Tcl_BounceRefCount(objPtr) \
+    TclBounceRefCount(objPtr, __FILE__, __LINE__)
+
+static inline void TclBounceRefCount(Tcl_Obj* objPtr, const char* fn, int line)
+{
+    if (objPtr) {
+        if ((objPtr)->refCount == 0) {
+            Tcl_DbDecrRefCount(objPtr, fn, line);
+	}
+    }
+}
+#else
+#   undef Tcl_IncrRefCount
+#   define Tcl_IncrRefCount(objPtr) \
+	((void)++(objPtr)->refCount)
+    /*
+     * Use do/while0 idiom for optimum correctness without compiler warnings.
+     * https://wiki.c2.com/?TrivialDoWhileLoop
+     */
+#   undef Tcl_DecrRefCount
+#   define Tcl_DecrRefCount(objPtr) \
+	do { \
+	    Tcl_Obj *_objPtr = (objPtr); \
+	    if (_objPtr->refCount-- <= 1) { \
+		TclFreeObj(_objPtr); \
+	    } \
+	} while(0)
+#   undef Tcl_IsShared
+#   define Tcl_IsShared(objPtr) \
+	((objPtr)->refCount > 1)
+
+/*
+ * Declare that obj will no longer be used or referenced.
+ * This will release the obj if there is no referece count,
+ * otherwise let it be.
+ */
+#   define Tcl_BounceRefCount(objPtr)     \
+    TclBounceRefCount(objPtr);
+
+static inline void TclBounceRefCount(Tcl_Obj* objPtr)
+{
+    if (objPtr) {
+        if ((objPtr)->refCount == 0) {
+            Tcl_DecrRefCount(objPtr);
+	}
+    }
+}
+
+#endif
+
+/*
+ * Macros and definitions that help to debug the use of Tcl objects. When
+ * TCL_MEM_DEBUG is defined, the Tcl_New declarations are overridden to call
+ * debugging versions of the object creation functions.
+ */
+
+#ifdef TCL_MEM_DEBUG
+#  undef  Tcl_NewBignumObj
+#  define Tcl_NewBignumObj(val) \
+     Tcl_DbNewBignumObj(val, __FILE__, __LINE__)
+#  undef  Tcl_NewBooleanObj
+#  define Tcl_NewBooleanObj(val) \
+     Tcl_DbNewWideIntObj((val)!=0, __FILE__, __LINE__)
+#  undef  Tcl_NewByteArrayObj
+#  define Tcl_NewByteArrayObj(bytes, len) \
+     Tcl_DbNewByteArrayObj(bytes, len, __FILE__, __LINE__)
+#  undef  Tcl_NewDoubleObj
+#  define Tcl_NewDoubleObj(val) \
+     Tcl_DbNewDoubleObj(val, __FILE__, __LINE__)
+#  undef  Tcl_NewListObj
+#  define Tcl_NewListObj(objc, objv) \
+     Tcl_DbNewListObj(objc, objv, __FILE__, __LINE__)
+#  undef  Tcl_NewObj
+#  define Tcl_NewObj() \
+     Tcl_DbNewObj(__FILE__, __LINE__)
+#  undef  Tcl_NewStringObj
+#  define Tcl_NewStringObj(bytes, len) \
+     Tcl_DbNewStringObj(bytes, len, __FILE__, __LINE__)
+#  undef  Tcl_NewWideIntObj
+#  define Tcl_NewWideIntObj(val) \
+     Tcl_DbNewWideIntObj(val, __FILE__, __LINE__)
+#endif /* TCL_MEM_DEBUG */
+
+/*
+ *----------------------------------------------------------------------------
+ * Macros for clients to use to access fields of hash entries:
+ */
+
+#define Tcl_GetHashValue(h) ((h)->clientData)
+#define Tcl_SetHashValue(h, value) ((h)->clientData = (void *)(value))
+#define Tcl_GetHashKey(tablePtr, h) \
+	((void *) (((tablePtr)->keyType == TCL_ONE_WORD_KEYS || \
+		    (tablePtr)->keyType == TCL_CUSTOM_PTR_KEYS) \
+		   ? (h)->key.oneWordValue \
+		   : (h)->key.string))
+
+/*
+ * Macros to use for clients to use to invoke find and create functions for
+ * hash tables:
+ */
+
+#undef  Tcl_FindHashEntry
+#define Tcl_FindHashEntry(tablePtr, key) \
+	(*((tablePtr)->findProc))(tablePtr, (const char *)(key))
+#undef  Tcl_CreateHashEntry
+#define Tcl_CreateHashEntry(tablePtr, key, newPtr) \
+	(*((tablePtr)->createProc))(tablePtr, (const char *)(key), newPtr)
+
+#endif /* RC_INVOKED */
+
+/*
+ * end block for C++
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _TCL */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl9.0/tclDecls.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl9.0/tclDecls.h
new file mode 100644
index 00000000..13d82a03
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl9.0/tclDecls.h
@@ -0,0 +1,4301 @@
+/*
+ * tclDecls.h --
+ *
+ *	Declarations of functions in the platform independent public Tcl API.
+ *
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#ifndef _TCLDECLS
+#define _TCLDECLS
+
+#include <stddef.h> /* for size_t */
+
+#undef TCL_STORAGE_CLASS
+#ifdef BUILD_tcl
+#   define TCL_STORAGE_CLASS DLLEXPORT
+#else
+#   ifdef USE_TCL_STUBS
+#      define TCL_STORAGE_CLASS
+#   else
+#      define TCL_STORAGE_CLASS DLLIMPORT
+#   endif
+#endif
+
+#if !defined(BUILD_tcl)
+# define TCL_DEPRECATED(msg) EXTERN TCL_DEPRECATED_API(msg)
+#elif defined(TCL_NO_DEPRECATED)
+# define TCL_DEPRECATED(msg) MODULE_SCOPE
+#else
+# define TCL_DEPRECATED(msg) EXTERN
+#endif
+
+
+/*
+ * WARNING: This file is automatically generated by the tools/genStubs.tcl
+ * script.  Any modifications to the function declarations below should be made
+ * in the generic/tcl.decls script.
+ */
+
+/* !BEGIN!: Do not edit below this line. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+/* 0 */
+EXTERN int		Tcl_PkgProvideEx(Tcl_Interp *interp,
+				const char *name, const char *version,
+				const void *clientData);
+/* 1 */
+EXTERN const char *	Tcl_PkgRequireEx(Tcl_Interp *interp,
+				const char *name, const char *version,
+				int exact, void *clientDataPtr);
+/* 2 */
+EXTERN TCL_NORETURN void Tcl_Panic(const char *format, ...) TCL_FORMAT_PRINTF(1, 2);
+/* 3 */
+EXTERN void *		Tcl_Alloc(TCL_HASH_TYPE size);
+/* 4 */
+EXTERN void		Tcl_Free(void *ptr);
+/* 5 */
+EXTERN void *		Tcl_Realloc(void *ptr, TCL_HASH_TYPE size);
+/* 6 */
+EXTERN void *		Tcl_DbCkalloc(TCL_HASH_TYPE size, const char *file,
+				int line);
+/* 7 */
+EXTERN void		Tcl_DbCkfree(void *ptr, const char *file, int line);
+/* 8 */
+EXTERN void *		Tcl_DbCkrealloc(void *ptr, TCL_HASH_TYPE size,
+				const char *file, int line);
+/* 9 */
+EXTERN void		Tcl_CreateFileHandler(int fd, int mask,
+				Tcl_FileProc *proc, void *clientData);
+/* 10 */
+EXTERN void		Tcl_DeleteFileHandler(int fd);
+/* 11 */
+EXTERN void		Tcl_SetTimer(const Tcl_Time *timePtr);
+/* 12 */
+EXTERN void		Tcl_Sleep(int ms);
+/* 13 */
+EXTERN int		Tcl_WaitForEvent(const Tcl_Time *timePtr);
+/* 14 */
+EXTERN int		Tcl_AppendAllObjTypes(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
+/* 15 */
+EXTERN void		Tcl_AppendStringsToObj(Tcl_Obj *objPtr, ...);
+/* 16 */
+EXTERN void		Tcl_AppendToObj(Tcl_Obj *objPtr, const char *bytes,
+				Tcl_Size length);
+/* 17 */
+EXTERN Tcl_Obj *	Tcl_ConcatObj(Tcl_Size objc, Tcl_Obj *const objv[]);
+/* 18 */
+EXTERN int		Tcl_ConvertToType(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, const Tcl_ObjType *typePtr);
+/* 19 */
+EXTERN void		Tcl_DbDecrRefCount(Tcl_Obj *objPtr, const char *file,
+				int line);
+/* 20 */
+EXTERN void		Tcl_DbIncrRefCount(Tcl_Obj *objPtr, const char *file,
+				int line);
+/* 21 */
+EXTERN int		Tcl_DbIsShared(Tcl_Obj *objPtr, const char *file,
+				int line);
+/* Slot 22 is reserved */
+/* 23 */
+EXTERN Tcl_Obj *	Tcl_DbNewByteArrayObj(const unsigned char *bytes,
+				Tcl_Size numBytes, const char *file,
+				int line);
+/* 24 */
+EXTERN Tcl_Obj *	Tcl_DbNewDoubleObj(double doubleValue,
+				const char *file, int line);
+/* 25 */
+EXTERN Tcl_Obj *	Tcl_DbNewListObj(Tcl_Size objc, Tcl_Obj *const *objv,
+				const char *file, int line);
+/* Slot 26 is reserved */
+/* 27 */
+EXTERN Tcl_Obj *	Tcl_DbNewObj(const char *file, int line);
+/* 28 */
+EXTERN Tcl_Obj *	Tcl_DbNewStringObj(const char *bytes,
+				Tcl_Size length, const char *file, int line);
+/* 29 */
+EXTERN Tcl_Obj *	Tcl_DuplicateObj(Tcl_Obj *objPtr);
+/* 30 */
+EXTERN void		TclFreeObj(Tcl_Obj *objPtr);
+/* 31 */
+EXTERN int		Tcl_GetBoolean(Tcl_Interp *interp, const char *src,
+				int *intPtr);
+/* 32 */
+EXTERN int		Tcl_GetBooleanFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *intPtr);
+/* 33 */
+EXTERN unsigned char *	Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr,
+				Tcl_Size *numBytesPtr);
+/* 34 */
+EXTERN int		Tcl_GetDouble(Tcl_Interp *interp, const char *src,
+				double *doublePtr);
+/* 35 */
+EXTERN int		Tcl_GetDoubleFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, double *doublePtr);
+/* Slot 36 is reserved */
+/* 37 */
+EXTERN int		Tcl_GetInt(Tcl_Interp *interp, const char *src,
+				int *intPtr);
+/* 38 */
+EXTERN int		Tcl_GetIntFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *intPtr);
+/* 39 */
+EXTERN int		Tcl_GetLongFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, long *longPtr);
+/* 40 */
+EXTERN const Tcl_ObjType * Tcl_GetObjType(const char *typeName);
+/* 41 */
+EXTERN char *		TclGetStringFromObj(Tcl_Obj *objPtr, void *lengthPtr);
+/* 42 */
+EXTERN void		Tcl_InvalidateStringRep(Tcl_Obj *objPtr);
+/* 43 */
+EXTERN int		Tcl_ListObjAppendList(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Obj *elemListPtr);
+/* 44 */
+EXTERN int		Tcl_ListObjAppendElement(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Obj *objPtr);
+/* 45 */
+EXTERN int		TclListObjGetElements(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, void *objcPtr,
+				Tcl_Obj ***objvPtr);
+/* 46 */
+EXTERN int		Tcl_ListObjIndex(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Size index,
+				Tcl_Obj **objPtrPtr);
+/* 47 */
+EXTERN int		TclListObjLength(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, void *lengthPtr);
+/* 48 */
+EXTERN int		Tcl_ListObjReplace(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Size first,
+				Tcl_Size count, Tcl_Size objc,
+				Tcl_Obj *const objv[]);
+/* Slot 49 is reserved */
+/* 50 */
+EXTERN Tcl_Obj *	Tcl_NewByteArrayObj(const unsigned char *bytes,
+				Tcl_Size numBytes);
+/* 51 */
+EXTERN Tcl_Obj *	Tcl_NewDoubleObj(double doubleValue);
+/* Slot 52 is reserved */
+/* 53 */
+EXTERN Tcl_Obj *	Tcl_NewListObj(Tcl_Size objc, Tcl_Obj *const objv[]);
+/* Slot 54 is reserved */
+/* 55 */
+EXTERN Tcl_Obj *	Tcl_NewObj(void);
+/* 56 */
+EXTERN Tcl_Obj *	Tcl_NewStringObj(const char *bytes, Tcl_Size length);
+/* Slot 57 is reserved */
+/* 58 */
+EXTERN unsigned char *	Tcl_SetByteArrayLength(Tcl_Obj *objPtr,
+				Tcl_Size numBytes);
+/* 59 */
+EXTERN void		Tcl_SetByteArrayObj(Tcl_Obj *objPtr,
+				const unsigned char *bytes,
+				Tcl_Size numBytes);
+/* 60 */
+EXTERN void		Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue);
+/* Slot 61 is reserved */
+/* 62 */
+EXTERN void		Tcl_SetListObj(Tcl_Obj *objPtr, Tcl_Size objc,
+				Tcl_Obj *const objv[]);
+/* Slot 63 is reserved */
+/* 64 */
+EXTERN void		Tcl_SetObjLength(Tcl_Obj *objPtr, Tcl_Size length);
+/* 65 */
+EXTERN void		Tcl_SetStringObj(Tcl_Obj *objPtr, const char *bytes,
+				Tcl_Size length);
+/* Slot 66 is reserved */
+/* Slot 67 is reserved */
+/* 68 */
+EXTERN void		Tcl_AllowExceptions(Tcl_Interp *interp);
+/* 69 */
+EXTERN void		Tcl_AppendElement(Tcl_Interp *interp,
+				const char *element);
+/* 70 */
+EXTERN void		Tcl_AppendResult(Tcl_Interp *interp, ...);
+/* 71 */
+EXTERN Tcl_AsyncHandler	 Tcl_AsyncCreate(Tcl_AsyncProc *proc,
+				void *clientData);
+/* 72 */
+EXTERN void		Tcl_AsyncDelete(Tcl_AsyncHandler async);
+/* 73 */
+EXTERN int		Tcl_AsyncInvoke(Tcl_Interp *interp, int code);
+/* 74 */
+EXTERN void		Tcl_AsyncMark(Tcl_AsyncHandler async);
+/* 75 */
+EXTERN int		Tcl_AsyncReady(void);
+/* Slot 76 is reserved */
+/* Slot 77 is reserved */
+/* 78 */
+EXTERN int		Tcl_BadChannelOption(Tcl_Interp *interp,
+				const char *optionName,
+				const char *optionList);
+/* 79 */
+EXTERN void		Tcl_CallWhenDeleted(Tcl_Interp *interp,
+				Tcl_InterpDeleteProc *proc, void *clientData);
+/* 80 */
+EXTERN void		Tcl_CancelIdleCall(Tcl_IdleProc *idleProc,
+				void *clientData);
+/* 81 */
+EXTERN int		Tcl_Close(Tcl_Interp *interp, Tcl_Channel chan);
+/* 82 */
+EXTERN int		Tcl_CommandComplete(const char *cmd);
+/* 83 */
+EXTERN char *		Tcl_Concat(Tcl_Size argc, const char *const *argv);
+/* 84 */
+EXTERN Tcl_Size		Tcl_ConvertElement(const char *src, char *dst,
+				int flags);
+/* 85 */
+EXTERN Tcl_Size		Tcl_ConvertCountedElement(const char *src,
+				Tcl_Size length, char *dst, int flags);
+/* 86 */
+EXTERN int		Tcl_CreateAlias(Tcl_Interp *childInterp,
+				const char *childCmd, Tcl_Interp *target,
+				const char *targetCmd, Tcl_Size argc,
+				const char *const *argv);
+/* 87 */
+EXTERN int		Tcl_CreateAliasObj(Tcl_Interp *childInterp,
+				const char *childCmd, Tcl_Interp *target,
+				const char *targetCmd, Tcl_Size objc,
+				Tcl_Obj *const objv[]);
+/* 88 */
+EXTERN Tcl_Channel	Tcl_CreateChannel(const Tcl_ChannelType *typePtr,
+				const char *chanName, void *instanceData,
+				int mask);
+/* 89 */
+EXTERN void		Tcl_CreateChannelHandler(Tcl_Channel chan, int mask,
+				Tcl_ChannelProc *proc, void *clientData);
+/* 90 */
+EXTERN void		Tcl_CreateCloseHandler(Tcl_Channel chan,
+				Tcl_CloseProc *proc, void *clientData);
+/* 91 */
+EXTERN Tcl_Command	Tcl_CreateCommand(Tcl_Interp *interp,
+				const char *cmdName, Tcl_CmdProc *proc,
+				void *clientData,
+				Tcl_CmdDeleteProc *deleteProc);
+/* 92 */
+EXTERN void		Tcl_CreateEventSource(Tcl_EventSetupProc *setupProc,
+				Tcl_EventCheckProc *checkProc,
+				void *clientData);
+/* 93 */
+EXTERN void		Tcl_CreateExitHandler(Tcl_ExitProc *proc,
+				void *clientData);
+/* 94 */
+EXTERN Tcl_Interp *	Tcl_CreateInterp(void);
+/* Slot 95 is reserved */
+/* 96 */
+EXTERN Tcl_Command	Tcl_CreateObjCommand(Tcl_Interp *interp,
+				const char *cmdName, Tcl_ObjCmdProc *proc,
+				void *clientData,
+				Tcl_CmdDeleteProc *deleteProc);
+/* 97 */
+EXTERN Tcl_Interp *	Tcl_CreateChild(Tcl_Interp *interp, const char *name,
+				int isSafe);
+/* 98 */
+EXTERN Tcl_TimerToken	Tcl_CreateTimerHandler(int milliseconds,
+				Tcl_TimerProc *proc, void *clientData);
+/* 99 */
+EXTERN Tcl_Trace	Tcl_CreateTrace(Tcl_Interp *interp, Tcl_Size level,
+				Tcl_CmdTraceProc *proc, void *clientData);
+/* 100 */
+EXTERN void		Tcl_DeleteAssocData(Tcl_Interp *interp,
+				const char *name);
+/* 101 */
+EXTERN void		Tcl_DeleteChannelHandler(Tcl_Channel chan,
+				Tcl_ChannelProc *proc, void *clientData);
+/* 102 */
+EXTERN void		Tcl_DeleteCloseHandler(Tcl_Channel chan,
+				Tcl_CloseProc *proc, void *clientData);
+/* 103 */
+EXTERN int		Tcl_DeleteCommand(Tcl_Interp *interp,
+				const char *cmdName);
+/* 104 */
+EXTERN int		Tcl_DeleteCommandFromToken(Tcl_Interp *interp,
+				Tcl_Command command);
+/* 105 */
+EXTERN void		Tcl_DeleteEvents(Tcl_EventDeleteProc *proc,
+				void *clientData);
+/* 106 */
+EXTERN void		Tcl_DeleteEventSource(Tcl_EventSetupProc *setupProc,
+				Tcl_EventCheckProc *checkProc,
+				void *clientData);
+/* 107 */
+EXTERN void		Tcl_DeleteExitHandler(Tcl_ExitProc *proc,
+				void *clientData);
+/* 108 */
+EXTERN void		Tcl_DeleteHashEntry(Tcl_HashEntry *entryPtr);
+/* 109 */
+EXTERN void		Tcl_DeleteHashTable(Tcl_HashTable *tablePtr);
+/* 110 */
+EXTERN void		Tcl_DeleteInterp(Tcl_Interp *interp);
+/* 111 */
+EXTERN void		Tcl_DetachPids(Tcl_Size numPids, Tcl_Pid *pidPtr);
+/* 112 */
+EXTERN void		Tcl_DeleteTimerHandler(Tcl_TimerToken token);
+/* 113 */
+EXTERN void		Tcl_DeleteTrace(Tcl_Interp *interp, Tcl_Trace trace);
+/* 114 */
+EXTERN void		Tcl_DontCallWhenDeleted(Tcl_Interp *interp,
+				Tcl_InterpDeleteProc *proc, void *clientData);
+/* 115 */
+EXTERN int		Tcl_DoOneEvent(int flags);
+/* 116 */
+EXTERN void		Tcl_DoWhenIdle(Tcl_IdleProc *proc, void *clientData);
+/* 117 */
+EXTERN char *		Tcl_DStringAppend(Tcl_DString *dsPtr,
+				const char *bytes, Tcl_Size length);
+/* 118 */
+EXTERN char *		Tcl_DStringAppendElement(Tcl_DString *dsPtr,
+				const char *element);
+/* 119 */
+EXTERN void		Tcl_DStringEndSublist(Tcl_DString *dsPtr);
+/* 120 */
+EXTERN void		Tcl_DStringFree(Tcl_DString *dsPtr);
+/* 121 */
+EXTERN void		Tcl_DStringGetResult(Tcl_Interp *interp,
+				Tcl_DString *dsPtr);
+/* 122 */
+EXTERN void		Tcl_DStringInit(Tcl_DString *dsPtr);
+/* 123 */
+EXTERN void		Tcl_DStringResult(Tcl_Interp *interp,
+				Tcl_DString *dsPtr);
+/* 124 */
+EXTERN void		Tcl_DStringSetLength(Tcl_DString *dsPtr,
+				Tcl_Size length);
+/* 125 */
+EXTERN void		Tcl_DStringStartSublist(Tcl_DString *dsPtr);
+/* 126 */
+EXTERN int		Tcl_Eof(Tcl_Channel chan);
+/* 127 */
+EXTERN const char *	Tcl_ErrnoId(void);
+/* 128 */
+EXTERN const char *	Tcl_ErrnoMsg(int err);
+/* Slot 129 is reserved */
+/* 130 */
+EXTERN int		Tcl_EvalFile(Tcl_Interp *interp,
+				const char *fileName);
+/* Slot 131 is reserved */
+/* 132 */
+EXTERN void		Tcl_EventuallyFree(void *clientData,
+				Tcl_FreeProc *freeProc);
+/* 133 */
+EXTERN TCL_NORETURN void Tcl_Exit(int status);
+/* 134 */
+EXTERN int		Tcl_ExposeCommand(Tcl_Interp *interp,
+				const char *hiddenCmdToken,
+				const char *cmdName);
+/* 135 */
+EXTERN int		Tcl_ExprBoolean(Tcl_Interp *interp, const char *expr,
+				int *ptr);
+/* 136 */
+EXTERN int		Tcl_ExprBooleanObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int *ptr);
+/* 137 */
+EXTERN int		Tcl_ExprDouble(Tcl_Interp *interp, const char *expr,
+				double *ptr);
+/* 138 */
+EXTERN int		Tcl_ExprDoubleObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, double *ptr);
+/* 139 */
+EXTERN int		Tcl_ExprLong(Tcl_Interp *interp, const char *expr,
+				long *ptr);
+/* 140 */
+EXTERN int		Tcl_ExprLongObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				long *ptr);
+/* 141 */
+EXTERN int		Tcl_ExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				Tcl_Obj **resultPtrPtr);
+/* 142 */
+EXTERN int		Tcl_ExprString(Tcl_Interp *interp, const char *expr);
+/* 143 */
+EXTERN void		Tcl_Finalize(void);
+/* Slot 144 is reserved */
+/* 145 */
+EXTERN Tcl_HashEntry *	Tcl_FirstHashEntry(Tcl_HashTable *tablePtr,
+				Tcl_HashSearch *searchPtr);
+/* 146 */
+EXTERN int		Tcl_Flush(Tcl_Channel chan);
+/* Slot 147 is reserved */
+/* 148 */
+EXTERN int		Tcl_GetAlias(Tcl_Interp *interp,
+				const char *childCmd,
+				Tcl_Interp **targetInterpPtr,
+				const char **targetCmdPtr, int *argcPtr,
+				const char ***argvPtr);
+/* 149 */
+EXTERN int		Tcl_GetAliasObj(Tcl_Interp *interp,
+				const char *childCmd,
+				Tcl_Interp **targetInterpPtr,
+				const char **targetCmdPtr, int *objcPtr,
+				Tcl_Obj ***objv);
+/* 150 */
+EXTERN void *		Tcl_GetAssocData(Tcl_Interp *interp,
+				const char *name,
+				Tcl_InterpDeleteProc **procPtr);
+/* 151 */
+EXTERN Tcl_Channel	Tcl_GetChannel(Tcl_Interp *interp,
+				const char *chanName, int *modePtr);
+/* 152 */
+EXTERN Tcl_Size		Tcl_GetChannelBufferSize(Tcl_Channel chan);
+/* 153 */
+EXTERN int		Tcl_GetChannelHandle(Tcl_Channel chan, int direction,
+				void **handlePtr);
+/* 154 */
+EXTERN void *		Tcl_GetChannelInstanceData(Tcl_Channel chan);
+/* 155 */
+EXTERN int		Tcl_GetChannelMode(Tcl_Channel chan);
+/* 156 */
+EXTERN const char *	Tcl_GetChannelName(Tcl_Channel chan);
+/* 157 */
+EXTERN int		Tcl_GetChannelOption(Tcl_Interp *interp,
+				Tcl_Channel chan, const char *optionName,
+				Tcl_DString *dsPtr);
+/* 158 */
+EXTERN const Tcl_ChannelType * Tcl_GetChannelType(Tcl_Channel chan);
+/* 159 */
+EXTERN int		Tcl_GetCommandInfo(Tcl_Interp *interp,
+				const char *cmdName, Tcl_CmdInfo *infoPtr);
+/* 160 */
+EXTERN const char *	Tcl_GetCommandName(Tcl_Interp *interp,
+				Tcl_Command command);
+/* 161 */
+EXTERN int		Tcl_GetErrno(void);
+/* 162 */
+EXTERN const char *	Tcl_GetHostName(void);
+/* 163 */
+EXTERN int		Tcl_GetInterpPath(Tcl_Interp *interp,
+				Tcl_Interp *childInterp);
+/* 164 */
+EXTERN Tcl_Interp *	Tcl_GetParent(Tcl_Interp *interp);
+/* 165 */
+EXTERN const char *	Tcl_GetNameOfExecutable(void);
+/* 166 */
+EXTERN Tcl_Obj *	Tcl_GetObjResult(Tcl_Interp *interp);
+/* 167 */
+EXTERN int		Tcl_GetOpenFile(Tcl_Interp *interp,
+				const char *chanID, int forWriting,
+				int checkUsage, void **filePtr);
+/* 168 */
+EXTERN Tcl_PathType	Tcl_GetPathType(const char *path);
+/* 169 */
+EXTERN Tcl_Size		Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr);
+/* 170 */
+EXTERN Tcl_Size		Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr);
+/* 171 */
+EXTERN int		Tcl_GetServiceMode(void);
+/* 172 */
+EXTERN Tcl_Interp *	Tcl_GetChild(Tcl_Interp *interp, const char *name);
+/* 173 */
+EXTERN Tcl_Channel	Tcl_GetStdChannel(int type);
+/* Slot 174 is reserved */
+/* Slot 175 is reserved */
+/* 176 */
+EXTERN const char *	Tcl_GetVar2(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags);
+/* Slot 177 is reserved */
+/* Slot 178 is reserved */
+/* 179 */
+EXTERN int		Tcl_HideCommand(Tcl_Interp *interp,
+				const char *cmdName,
+				const char *hiddenCmdToken);
+/* 180 */
+EXTERN int		Tcl_Init(Tcl_Interp *interp);
+/* 181 */
+EXTERN void		Tcl_InitHashTable(Tcl_HashTable *tablePtr,
+				int keyType);
+/* 182 */
+EXTERN int		Tcl_InputBlocked(Tcl_Channel chan);
+/* 183 */
+EXTERN int		Tcl_InputBuffered(Tcl_Channel chan);
+/* 184 */
+EXTERN int		Tcl_InterpDeleted(Tcl_Interp *interp);
+/* 185 */
+EXTERN int		Tcl_IsSafe(Tcl_Interp *interp);
+/* 186 */
+EXTERN char *		Tcl_JoinPath(Tcl_Size argc, const char *const *argv,
+				Tcl_DString *resultPtr);
+/* 187 */
+EXTERN int		Tcl_LinkVar(Tcl_Interp *interp, const char *varName,
+				void *addr, int type);
+/* Slot 188 is reserved */
+/* 189 */
+EXTERN Tcl_Channel	Tcl_MakeFileChannel(void *handle, int mode);
+/* Slot 190 is reserved */
+/* 191 */
+EXTERN Tcl_Channel	Tcl_MakeTcpClientChannel(void *tcpSocket);
+/* 192 */
+EXTERN char *		Tcl_Merge(Tcl_Size argc, const char *const *argv);
+/* 193 */
+EXTERN Tcl_HashEntry *	Tcl_NextHashEntry(Tcl_HashSearch *searchPtr);
+/* 194 */
+EXTERN void		Tcl_NotifyChannel(Tcl_Channel channel, int mask);
+/* 195 */
+EXTERN Tcl_Obj *	Tcl_ObjGetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
+				Tcl_Obj *part2Ptr, int flags);
+/* 196 */
+EXTERN Tcl_Obj *	Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
+				Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr,
+				int flags);
+/* 197 */
+EXTERN Tcl_Channel	Tcl_OpenCommandChannel(Tcl_Interp *interp,
+				Tcl_Size argc, const char **argv, int flags);
+/* 198 */
+EXTERN Tcl_Channel	Tcl_OpenFileChannel(Tcl_Interp *interp,
+				const char *fileName, const char *modeString,
+				int permissions);
+/* 199 */
+EXTERN Tcl_Channel	Tcl_OpenTcpClient(Tcl_Interp *interp, int port,
+				const char *address, const char *myaddr,
+				int myport, int flags);
+/* 200 */
+EXTERN Tcl_Channel	Tcl_OpenTcpServer(Tcl_Interp *interp, int port,
+				const char *host,
+				Tcl_TcpAcceptProc *acceptProc,
+				void *callbackData);
+/* 201 */
+EXTERN void		Tcl_Preserve(void *data);
+/* 202 */
+EXTERN void		Tcl_PrintDouble(Tcl_Interp *interp, double value,
+				char *dst);
+/* 203 */
+EXTERN int		Tcl_PutEnv(const char *assignment);
+/* 204 */
+EXTERN const char *	Tcl_PosixError(Tcl_Interp *interp);
+/* 205 */
+EXTERN void		Tcl_QueueEvent(Tcl_Event *evPtr, int position);
+/* 206 */
+EXTERN Tcl_Size		Tcl_Read(Tcl_Channel chan, char *bufPtr,
+				Tcl_Size toRead);
+/* 207 */
+EXTERN void		Tcl_ReapDetachedProcs(void);
+/* 208 */
+EXTERN int		Tcl_RecordAndEval(Tcl_Interp *interp,
+				const char *cmd, int flags);
+/* 209 */
+EXTERN int		Tcl_RecordAndEvalObj(Tcl_Interp *interp,
+				Tcl_Obj *cmdPtr, int flags);
+/* 210 */
+EXTERN void		Tcl_RegisterChannel(Tcl_Interp *interp,
+				Tcl_Channel chan);
+/* 211 */
+EXTERN void		Tcl_RegisterObjType(const Tcl_ObjType *typePtr);
+/* 212 */
+EXTERN Tcl_RegExp	Tcl_RegExpCompile(Tcl_Interp *interp,
+				const char *pattern);
+/* 213 */
+EXTERN int		Tcl_RegExpExec(Tcl_Interp *interp, Tcl_RegExp regexp,
+				const char *text, const char *start);
+/* 214 */
+EXTERN int		Tcl_RegExpMatch(Tcl_Interp *interp, const char *text,
+				const char *pattern);
+/* 215 */
+EXTERN void		Tcl_RegExpRange(Tcl_RegExp regexp, Tcl_Size index,
+				const char **startPtr, const char **endPtr);
+/* 216 */
+EXTERN void		Tcl_Release(void *clientData);
+/* 217 */
+EXTERN void		Tcl_ResetResult(Tcl_Interp *interp);
+/* 218 */
+EXTERN Tcl_Size		Tcl_ScanElement(const char *src, int *flagPtr);
+/* 219 */
+EXTERN Tcl_Size		Tcl_ScanCountedElement(const char *src,
+				Tcl_Size length, int *flagPtr);
+/* Slot 220 is reserved */
+/* 221 */
+EXTERN int		Tcl_ServiceAll(void);
+/* 222 */
+EXTERN int		Tcl_ServiceEvent(int flags);
+/* 223 */
+EXTERN void		Tcl_SetAssocData(Tcl_Interp *interp,
+				const char *name, Tcl_InterpDeleteProc *proc,
+				void *clientData);
+/* 224 */
+EXTERN void		Tcl_SetChannelBufferSize(Tcl_Channel chan,
+				Tcl_Size sz);
+/* 225 */
+EXTERN int		Tcl_SetChannelOption(Tcl_Interp *interp,
+				Tcl_Channel chan, const char *optionName,
+				const char *newValue);
+/* 226 */
+EXTERN int		Tcl_SetCommandInfo(Tcl_Interp *interp,
+				const char *cmdName,
+				const Tcl_CmdInfo *infoPtr);
+/* 227 */
+EXTERN void		Tcl_SetErrno(int err);
+/* 228 */
+EXTERN void		Tcl_SetErrorCode(Tcl_Interp *interp, ...);
+/* 229 */
+EXTERN void		Tcl_SetMaxBlockTime(const Tcl_Time *timePtr);
+/* Slot 230 is reserved */
+/* 231 */
+EXTERN Tcl_Size		Tcl_SetRecursionLimit(Tcl_Interp *interp,
+				Tcl_Size depth);
+/* Slot 232 is reserved */
+/* 233 */
+EXTERN int		Tcl_SetServiceMode(int mode);
+/* 234 */
+EXTERN void		Tcl_SetObjErrorCode(Tcl_Interp *interp,
+				Tcl_Obj *errorObjPtr);
+/* 235 */
+EXTERN void		Tcl_SetObjResult(Tcl_Interp *interp,
+				Tcl_Obj *resultObjPtr);
+/* 236 */
+EXTERN void		Tcl_SetStdChannel(Tcl_Channel channel, int type);
+/* Slot 237 is reserved */
+/* 238 */
+EXTERN const char *	Tcl_SetVar2(Tcl_Interp *interp, const char *part1,
+				const char *part2, const char *newValue,
+				int flags);
+/* 239 */
+EXTERN const char *	Tcl_SignalId(int sig);
+/* 240 */
+EXTERN const char *	Tcl_SignalMsg(int sig);
+/* 241 */
+EXTERN void		Tcl_SourceRCFile(Tcl_Interp *interp);
+/* 242 */
+EXTERN int		TclSplitList(Tcl_Interp *interp, const char *listStr,
+				void *argcPtr, const char ***argvPtr);
+/* 243 */
+EXTERN void		TclSplitPath(const char *path, void *argcPtr,
+				const char ***argvPtr);
+/* Slot 244 is reserved */
+/* Slot 245 is reserved */
+/* Slot 246 is reserved */
+/* Slot 247 is reserved */
+/* 248 */
+EXTERN int		Tcl_TraceVar2(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags,
+				Tcl_VarTraceProc *proc, void *clientData);
+/* 249 */
+EXTERN char *		Tcl_TranslateFileName(Tcl_Interp *interp,
+				const char *name, Tcl_DString *bufferPtr);
+/* 250 */
+EXTERN Tcl_Size		Tcl_Ungets(Tcl_Channel chan, const char *str,
+				Tcl_Size len, int atHead);
+/* 251 */
+EXTERN void		Tcl_UnlinkVar(Tcl_Interp *interp,
+				const char *varName);
+/* 252 */
+EXTERN int		Tcl_UnregisterChannel(Tcl_Interp *interp,
+				Tcl_Channel chan);
+/* Slot 253 is reserved */
+/* 254 */
+EXTERN int		Tcl_UnsetVar2(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags);
+/* Slot 255 is reserved */
+/* 256 */
+EXTERN void		Tcl_UntraceVar2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
+				int flags, Tcl_VarTraceProc *proc,
+				void *clientData);
+/* 257 */
+EXTERN void		Tcl_UpdateLinkedVar(Tcl_Interp *interp,
+				const char *varName);
+/* Slot 258 is reserved */
+/* 259 */
+EXTERN int		Tcl_UpVar2(Tcl_Interp *interp, const char *frameName,
+				const char *part1, const char *part2,
+				const char *localName, int flags);
+/* 260 */
+EXTERN int		Tcl_VarEval(Tcl_Interp *interp, ...);
+/* Slot 261 is reserved */
+/* 262 */
+EXTERN void *		Tcl_VarTraceInfo2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
+				int flags, Tcl_VarTraceProc *procPtr,
+				void *prevClientData);
+/* 263 */
+EXTERN Tcl_Size		Tcl_Write(Tcl_Channel chan, const char *s,
+				Tcl_Size slen);
+/* 264 */
+EXTERN void		Tcl_WrongNumArgs(Tcl_Interp *interp, Tcl_Size objc,
+				Tcl_Obj *const objv[], const char *message);
+/* 265 */
+EXTERN int		Tcl_DumpActiveMemory(const char *fileName);
+/* 266 */
+EXTERN void		Tcl_ValidateAllMemory(const char *file, int line);
+/* Slot 267 is reserved */
+/* Slot 268 is reserved */
+/* 269 */
+EXTERN char *		Tcl_HashStats(Tcl_HashTable *tablePtr);
+/* 270 */
+EXTERN const char *	Tcl_ParseVar(Tcl_Interp *interp, const char *start,
+				const char **termPtr);
+/* Slot 271 is reserved */
+/* 272 */
+EXTERN const char *	Tcl_PkgPresentEx(Tcl_Interp *interp,
+				const char *name, const char *version,
+				int exact, void *clientDataPtr);
+/* Slot 273 is reserved */
+/* Slot 274 is reserved */
+/* Slot 275 is reserved */
+/* Slot 276 is reserved */
+/* 277 */
+EXTERN Tcl_Pid		Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options);
+/* Slot 278 is reserved */
+/* 279 */
+EXTERN void		Tcl_GetVersion(int *major, int *minor,
+				int *patchLevel, int *type);
+/* 280 */
+EXTERN void		Tcl_InitMemory(Tcl_Interp *interp);
+/* 281 */
+EXTERN Tcl_Channel	Tcl_StackChannel(Tcl_Interp *interp,
+				const Tcl_ChannelType *typePtr,
+				void *instanceData, int mask,
+				Tcl_Channel prevChan);
+/* 282 */
+EXTERN int		Tcl_UnstackChannel(Tcl_Interp *interp,
+				Tcl_Channel chan);
+/* 283 */
+EXTERN Tcl_Channel	Tcl_GetStackedChannel(Tcl_Channel chan);
+/* 284 */
+EXTERN void		Tcl_SetMainLoop(Tcl_MainLoopProc *proc);
+/* Slot 285 is reserved */
+/* 286 */
+EXTERN void		Tcl_AppendObjToObj(Tcl_Obj *objPtr,
+				Tcl_Obj *appendObjPtr);
+/* 287 */
+EXTERN Tcl_Encoding	Tcl_CreateEncoding(const Tcl_EncodingType *typePtr);
+/* 288 */
+EXTERN void		Tcl_CreateThreadExitHandler(Tcl_ExitProc *proc,
+				void *clientData);
+/* 289 */
+EXTERN void		Tcl_DeleteThreadExitHandler(Tcl_ExitProc *proc,
+				void *clientData);
+/* Slot 290 is reserved */
+/* 291 */
+EXTERN int		Tcl_EvalEx(Tcl_Interp *interp, const char *script,
+				Tcl_Size numBytes, int flags);
+/* 292 */
+EXTERN int		Tcl_EvalObjv(Tcl_Interp *interp, Tcl_Size objc,
+				Tcl_Obj *const objv[], int flags);
+/* 293 */
+EXTERN int		Tcl_EvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags);
+/* 294 */
+EXTERN TCL_NORETURN void Tcl_ExitThread(int status);
+/* 295 */
+EXTERN int		Tcl_ExternalToUtf(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				Tcl_Size srcLen, int flags,
+				Tcl_EncodingState *statePtr, char *dst,
+				Tcl_Size dstLen, int *srcReadPtr,
+				int *dstWrotePtr, int *dstCharsPtr);
+/* 296 */
+EXTERN char *		Tcl_ExternalToUtfDString(Tcl_Encoding encoding,
+				const char *src, Tcl_Size srcLen,
+				Tcl_DString *dsPtr);
+/* 297 */
+EXTERN void		Tcl_FinalizeThread(void);
+/* 298 */
+EXTERN void		Tcl_FinalizeNotifier(void *clientData);
+/* 299 */
+EXTERN void		Tcl_FreeEncoding(Tcl_Encoding encoding);
+/* 300 */
+EXTERN Tcl_ThreadId	Tcl_GetCurrentThread(void);
+/* 301 */
+EXTERN Tcl_Encoding	Tcl_GetEncoding(Tcl_Interp *interp, const char *name);
+/* 302 */
+EXTERN const char *	Tcl_GetEncodingName(Tcl_Encoding encoding);
+/* 303 */
+EXTERN void		Tcl_GetEncodingNames(Tcl_Interp *interp);
+/* 304 */
+EXTERN int		Tcl_GetIndexFromObjStruct(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, const void *tablePtr,
+				Tcl_Size offset, const char *msg, int flags,
+				void *indexPtr);
+/* 305 */
+EXTERN void *		Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr,
+				Tcl_Size size);
+/* 306 */
+EXTERN Tcl_Obj *	Tcl_GetVar2Ex(Tcl_Interp *interp, const char *part1,
+				const char *part2, int flags);
+/* 307 */
+EXTERN void *		Tcl_InitNotifier(void);
+/* 308 */
+EXTERN void		Tcl_MutexLock(Tcl_Mutex *mutexPtr);
+/* 309 */
+EXTERN void		Tcl_MutexUnlock(Tcl_Mutex *mutexPtr);
+/* 310 */
+EXTERN void		Tcl_ConditionNotify(Tcl_Condition *condPtr);
+/* 311 */
+EXTERN void		Tcl_ConditionWait(Tcl_Condition *condPtr,
+				Tcl_Mutex *mutexPtr, const Tcl_Time *timePtr);
+/* 312 */
+EXTERN Tcl_Size		TclNumUtfChars(const char *src, Tcl_Size length);
+/* 313 */
+EXTERN Tcl_Size		Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
+				Tcl_Size charsToRead, int appendFlag);
+/* Slot 314 is reserved */
+/* Slot 315 is reserved */
+/* 316 */
+EXTERN int		Tcl_SetSystemEncoding(Tcl_Interp *interp,
+				const char *name);
+/* 317 */
+EXTERN Tcl_Obj *	Tcl_SetVar2Ex(Tcl_Interp *interp, const char *part1,
+				const char *part2, Tcl_Obj *newValuePtr,
+				int flags);
+/* 318 */
+EXTERN void		Tcl_ThreadAlert(Tcl_ThreadId threadId);
+/* 319 */
+EXTERN void		Tcl_ThreadQueueEvent(Tcl_ThreadId threadId,
+				Tcl_Event *evPtr, int position);
+/* 320 */
+EXTERN int		Tcl_UniCharAtIndex(const char *src, Tcl_Size index);
+/* 321 */
+EXTERN int		Tcl_UniCharToLower(int ch);
+/* 322 */
+EXTERN int		Tcl_UniCharToTitle(int ch);
+/* 323 */
+EXTERN int		Tcl_UniCharToUpper(int ch);
+/* 324 */
+EXTERN Tcl_Size		Tcl_UniCharToUtf(int ch, char *buf);
+/* 325 */
+EXTERN const char *	TclUtfAtIndex(const char *src, Tcl_Size index);
+/* 326 */
+EXTERN int		TclUtfCharComplete(const char *src, Tcl_Size length);
+/* 327 */
+EXTERN Tcl_Size		Tcl_UtfBackslash(const char *src, int *readPtr,
+				char *dst);
+/* 328 */
+EXTERN const char *	Tcl_UtfFindFirst(const char *src, int ch);
+/* 329 */
+EXTERN const char *	Tcl_UtfFindLast(const char *src, int ch);
+/* 330 */
+EXTERN const char *	TclUtfNext(const char *src);
+/* 331 */
+EXTERN const char *	TclUtfPrev(const char *src, const char *start);
+/* 332 */
+EXTERN int		Tcl_UtfToExternal(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				Tcl_Size srcLen, int flags,
+				Tcl_EncodingState *statePtr, char *dst,
+				Tcl_Size dstLen, int *srcReadPtr,
+				int *dstWrotePtr, int *dstCharsPtr);
+/* 333 */
+EXTERN char *		Tcl_UtfToExternalDString(Tcl_Encoding encoding,
+				const char *src, Tcl_Size srcLen,
+				Tcl_DString *dsPtr);
+/* 334 */
+EXTERN Tcl_Size		Tcl_UtfToLower(char *src);
+/* 335 */
+EXTERN Tcl_Size		Tcl_UtfToTitle(char *src);
+/* 336 */
+EXTERN Tcl_Size		Tcl_UtfToChar16(const char *src,
+				unsigned short *chPtr);
+/* 337 */
+EXTERN Tcl_Size		Tcl_UtfToUpper(char *src);
+/* 338 */
+EXTERN Tcl_Size		Tcl_WriteChars(Tcl_Channel chan, const char *src,
+				Tcl_Size srcLen);
+/* 339 */
+EXTERN Tcl_Size		Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr);
+/* 340 */
+EXTERN char *		Tcl_GetString(Tcl_Obj *objPtr);
+/* Slot 341 is reserved */
+/* Slot 342 is reserved */
+/* 343 */
+EXTERN void		Tcl_AlertNotifier(void *clientData);
+/* 344 */
+EXTERN void		Tcl_ServiceModeHook(int mode);
+/* 345 */
+EXTERN int		Tcl_UniCharIsAlnum(int ch);
+/* 346 */
+EXTERN int		Tcl_UniCharIsAlpha(int ch);
+/* 347 */
+EXTERN int		Tcl_UniCharIsDigit(int ch);
+/* 348 */
+EXTERN int		Tcl_UniCharIsLower(int ch);
+/* 349 */
+EXTERN int		Tcl_UniCharIsSpace(int ch);
+/* 350 */
+EXTERN int		Tcl_UniCharIsUpper(int ch);
+/* 351 */
+EXTERN int		Tcl_UniCharIsWordChar(int ch);
+/* 352 */
+EXTERN Tcl_Size		Tcl_Char16Len(const unsigned short *uniStr);
+/* Slot 353 is reserved */
+/* 354 */
+EXTERN char *		Tcl_Char16ToUtfDString(const unsigned short *uniStr,
+				Tcl_Size uniLength, Tcl_DString *dsPtr);
+/* 355 */
+EXTERN unsigned short *	 Tcl_UtfToChar16DString(const char *src,
+				Tcl_Size length, Tcl_DString *dsPtr);
+/* 356 */
+EXTERN Tcl_RegExp	Tcl_GetRegExpFromObj(Tcl_Interp *interp,
+				Tcl_Obj *patObj, int flags);
+/* Slot 357 is reserved */
+/* 358 */
+EXTERN void		Tcl_FreeParse(Tcl_Parse *parsePtr);
+/* 359 */
+EXTERN void		Tcl_LogCommandInfo(Tcl_Interp *interp,
+				const char *script, const char *command,
+				Tcl_Size length);
+/* 360 */
+EXTERN int		Tcl_ParseBraces(Tcl_Interp *interp,
+				const char *start, Tcl_Size numBytes,
+				Tcl_Parse *parsePtr, int append,
+				const char **termPtr);
+/* 361 */
+EXTERN int		Tcl_ParseCommand(Tcl_Interp *interp,
+				const char *start, Tcl_Size numBytes,
+				int nested, Tcl_Parse *parsePtr);
+/* 362 */
+EXTERN int		Tcl_ParseExpr(Tcl_Interp *interp, const char *start,
+				Tcl_Size numBytes, Tcl_Parse *parsePtr);
+/* 363 */
+EXTERN int		Tcl_ParseQuotedString(Tcl_Interp *interp,
+				const char *start, Tcl_Size numBytes,
+				Tcl_Parse *parsePtr, int append,
+				const char **termPtr);
+/* 364 */
+EXTERN int		Tcl_ParseVarName(Tcl_Interp *interp,
+				const char *start, Tcl_Size numBytes,
+				Tcl_Parse *parsePtr, int append);
+/* 365 */
+EXTERN char *		Tcl_GetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr);
+/* 366 */
+EXTERN int		Tcl_Chdir(const char *dirName);
+/* 367 */
+EXTERN int		Tcl_Access(const char *path, int mode);
+/* 368 */
+EXTERN int		Tcl_Stat(const char *path, struct stat *bufPtr);
+/* 369 */
+EXTERN int		Tcl_UtfNcmp(const char *s1, const char *s2, size_t n);
+/* 370 */
+EXTERN int		Tcl_UtfNcasecmp(const char *s1, const char *s2,
+				size_t n);
+/* 371 */
+EXTERN int		Tcl_StringCaseMatch(const char *str,
+				const char *pattern, int nocase);
+/* 372 */
+EXTERN int		Tcl_UniCharIsControl(int ch);
+/* 373 */
+EXTERN int		Tcl_UniCharIsGraph(int ch);
+/* 374 */
+EXTERN int		Tcl_UniCharIsPrint(int ch);
+/* 375 */
+EXTERN int		Tcl_UniCharIsPunct(int ch);
+/* 376 */
+EXTERN int		Tcl_RegExpExecObj(Tcl_Interp *interp,
+				Tcl_RegExp regexp, Tcl_Obj *textObj,
+				Tcl_Size offset, Tcl_Size nmatches,
+				int flags);
+/* 377 */
+EXTERN void		Tcl_RegExpGetInfo(Tcl_RegExp regexp,
+				Tcl_RegExpInfo *infoPtr);
+/* 378 */
+EXTERN Tcl_Obj *	Tcl_NewUnicodeObj(const Tcl_UniChar *unicode,
+				Tcl_Size numChars);
+/* 379 */
+EXTERN void		Tcl_SetUnicodeObj(Tcl_Obj *objPtr,
+				const Tcl_UniChar *unicode,
+				Tcl_Size numChars);
+/* 380 */
+EXTERN Tcl_Size		TclGetCharLength(Tcl_Obj *objPtr);
+/* 381 */
+EXTERN int		TclGetUniChar(Tcl_Obj *objPtr, Tcl_Size index);
+/* Slot 382 is reserved */
+/* 383 */
+EXTERN Tcl_Obj *	TclGetRange(Tcl_Obj *objPtr, Tcl_Size first,
+				Tcl_Size last);
+/* 384 */
+EXTERN void		Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr,
+				const Tcl_UniChar *unicode, Tcl_Size length);
+/* 385 */
+EXTERN int		Tcl_RegExpMatchObj(Tcl_Interp *interp,
+				Tcl_Obj *textObj, Tcl_Obj *patternObj);
+/* 386 */
+EXTERN void		Tcl_SetNotifier(
+				const Tcl_NotifierProcs *notifierProcPtr);
+/* 387 */
+EXTERN Tcl_Mutex *	Tcl_GetAllocMutex(void);
+/* 388 */
+EXTERN int		Tcl_GetChannelNames(Tcl_Interp *interp);
+/* 389 */
+EXTERN int		Tcl_GetChannelNamesEx(Tcl_Interp *interp,
+				const char *pattern);
+/* 390 */
+EXTERN int		Tcl_ProcObjCmd(void *clientData, Tcl_Interp *interp,
+				Tcl_Size objc, Tcl_Obj *const objv[]);
+/* 391 */
+EXTERN void		Tcl_ConditionFinalize(Tcl_Condition *condPtr);
+/* 392 */
+EXTERN void		Tcl_MutexFinalize(Tcl_Mutex *mutex);
+/* 393 */
+EXTERN int		Tcl_CreateThread(Tcl_ThreadId *idPtr,
+				Tcl_ThreadCreateProc *proc, void *clientData,
+				TCL_HASH_TYPE stackSize, int flags);
+/* 394 */
+EXTERN Tcl_Size		Tcl_ReadRaw(Tcl_Channel chan, char *dst,
+				Tcl_Size bytesToRead);
+/* 395 */
+EXTERN Tcl_Size		Tcl_WriteRaw(Tcl_Channel chan, const char *src,
+				Tcl_Size srcLen);
+/* 396 */
+EXTERN Tcl_Channel	Tcl_GetTopChannel(Tcl_Channel chan);
+/* 397 */
+EXTERN int		Tcl_ChannelBuffered(Tcl_Channel chan);
+/* 398 */
+EXTERN const char *	Tcl_ChannelName(const Tcl_ChannelType *chanTypePtr);
+/* 399 */
+EXTERN Tcl_ChannelTypeVersion Tcl_ChannelVersion(
+				const Tcl_ChannelType *chanTypePtr);
+/* 400 */
+EXTERN Tcl_DriverBlockModeProc * Tcl_ChannelBlockModeProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* Slot 401 is reserved */
+/* 402 */
+EXTERN Tcl_DriverClose2Proc * Tcl_ChannelClose2Proc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 403 */
+EXTERN Tcl_DriverInputProc * Tcl_ChannelInputProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 404 */
+EXTERN Tcl_DriverOutputProc * Tcl_ChannelOutputProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* Slot 405 is reserved */
+/* 406 */
+EXTERN Tcl_DriverSetOptionProc * Tcl_ChannelSetOptionProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 407 */
+EXTERN Tcl_DriverGetOptionProc * Tcl_ChannelGetOptionProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 408 */
+EXTERN Tcl_DriverWatchProc * Tcl_ChannelWatchProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 409 */
+EXTERN Tcl_DriverGetHandleProc * Tcl_ChannelGetHandleProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 410 */
+EXTERN Tcl_DriverFlushProc * Tcl_ChannelFlushProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 411 */
+EXTERN Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 412 */
+EXTERN int		Tcl_JoinThread(Tcl_ThreadId threadId, int *result);
+/* 413 */
+EXTERN int		Tcl_IsChannelShared(Tcl_Channel channel);
+/* 414 */
+EXTERN int		Tcl_IsChannelRegistered(Tcl_Interp *interp,
+				Tcl_Channel channel);
+/* 415 */
+EXTERN void		Tcl_CutChannel(Tcl_Channel channel);
+/* 416 */
+EXTERN void		Tcl_SpliceChannel(Tcl_Channel channel);
+/* 417 */
+EXTERN void		Tcl_ClearChannelHandlers(Tcl_Channel channel);
+/* 418 */
+EXTERN int		Tcl_IsChannelExisting(const char *channelName);
+/* Slot 419 is reserved */
+/* Slot 420 is reserved */
+/* Slot 421 is reserved */
+/* Slot 422 is reserved */
+/* 423 */
+EXTERN void		Tcl_InitCustomHashTable(Tcl_HashTable *tablePtr,
+				int keyType, const Tcl_HashKeyType *typePtr);
+/* 424 */
+EXTERN void		Tcl_InitObjHashTable(Tcl_HashTable *tablePtr);
+/* 425 */
+EXTERN void *		Tcl_CommandTraceInfo(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_CommandTraceProc *procPtr,
+				void *prevClientData);
+/* 426 */
+EXTERN int		Tcl_TraceCommand(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_CommandTraceProc *proc, void *clientData);
+/* 427 */
+EXTERN void		Tcl_UntraceCommand(Tcl_Interp *interp,
+				const char *varName, int flags,
+				Tcl_CommandTraceProc *proc, void *clientData);
+/* 428 */
+EXTERN void *		Tcl_AttemptAlloc(TCL_HASH_TYPE size);
+/* 429 */
+EXTERN void *		Tcl_AttemptDbCkalloc(TCL_HASH_TYPE size,
+				const char *file, int line);
+/* 430 */
+EXTERN void *		Tcl_AttemptRealloc(void *ptr, TCL_HASH_TYPE size);
+/* 431 */
+EXTERN void *		Tcl_AttemptDbCkrealloc(void *ptr, TCL_HASH_TYPE size,
+				const char *file, int line);
+/* 432 */
+EXTERN int		Tcl_AttemptSetObjLength(Tcl_Obj *objPtr,
+				Tcl_Size length);
+/* 433 */
+EXTERN Tcl_ThreadId	Tcl_GetChannelThread(Tcl_Channel channel);
+/* 434 */
+EXTERN Tcl_UniChar *	TclGetUnicodeFromObj(Tcl_Obj *objPtr,
+				void *lengthPtr);
+/* Slot 435 is reserved */
+/* Slot 436 is reserved */
+/* 437 */
+EXTERN Tcl_Obj *	Tcl_SubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags);
+/* 438 */
+EXTERN int		Tcl_DetachChannel(Tcl_Interp *interp,
+				Tcl_Channel channel);
+/* 439 */
+EXTERN int		Tcl_IsStandardChannel(Tcl_Channel channel);
+/* 440 */
+EXTERN int		Tcl_FSCopyFile(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr);
+/* 441 */
+EXTERN int		Tcl_FSCopyDirectory(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr);
+/* 442 */
+EXTERN int		Tcl_FSCreateDirectory(Tcl_Obj *pathPtr);
+/* 443 */
+EXTERN int		Tcl_FSDeleteFile(Tcl_Obj *pathPtr);
+/* 444 */
+EXTERN int		Tcl_FSLoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
+				const char *sym1, const char *sym2,
+				Tcl_LibraryInitProc **proc1Ptr,
+				Tcl_LibraryInitProc **proc2Ptr,
+				Tcl_LoadHandle *handlePtr,
+				Tcl_FSUnloadFileProc **unloadProcPtr);
+/* 445 */
+EXTERN int		Tcl_FSMatchInDirectory(Tcl_Interp *interp,
+				Tcl_Obj *result, Tcl_Obj *pathPtr,
+				const char *pattern, Tcl_GlobTypeData *types);
+/* 446 */
+EXTERN Tcl_Obj *	Tcl_FSLink(Tcl_Obj *pathPtr, Tcl_Obj *toPtr,
+				int linkAction);
+/* 447 */
+EXTERN int		Tcl_FSRemoveDirectory(Tcl_Obj *pathPtr,
+				int recursive, Tcl_Obj **errorPtr);
+/* 448 */
+EXTERN int		Tcl_FSRenameFile(Tcl_Obj *srcPathPtr,
+				Tcl_Obj *destPathPtr);
+/* 449 */
+EXTERN int		Tcl_FSLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+/* 450 */
+EXTERN int		Tcl_FSUtime(Tcl_Obj *pathPtr, struct utimbuf *tval);
+/* 451 */
+EXTERN int		Tcl_FSFileAttrsGet(Tcl_Interp *interp, int index,
+				Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef);
+/* 452 */
+EXTERN int		Tcl_FSFileAttrsSet(Tcl_Interp *interp, int index,
+				Tcl_Obj *pathPtr, Tcl_Obj *objPtr);
+/* 453 */
+EXTERN const char *const * Tcl_FSFileAttrStrings(Tcl_Obj *pathPtr,
+				Tcl_Obj **objPtrRef);
+/* 454 */
+EXTERN int		Tcl_FSStat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
+/* 455 */
+EXTERN int		Tcl_FSAccess(Tcl_Obj *pathPtr, int mode);
+/* 456 */
+EXTERN Tcl_Channel	Tcl_FSOpenFileChannel(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr, const char *modeString,
+				int permissions);
+/* 457 */
+EXTERN Tcl_Obj *	Tcl_FSGetCwd(Tcl_Interp *interp);
+/* 458 */
+EXTERN int		Tcl_FSChdir(Tcl_Obj *pathPtr);
+/* 459 */
+EXTERN int		Tcl_FSConvertToPathType(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
+/* 460 */
+EXTERN Tcl_Obj *	Tcl_FSJoinPath(Tcl_Obj *listObj, Tcl_Size elements);
+/* 461 */
+EXTERN Tcl_Obj *	TclFSSplitPath(Tcl_Obj *pathPtr, void *lenPtr);
+/* 462 */
+EXTERN int		Tcl_FSEqualPaths(Tcl_Obj *firstPtr,
+				Tcl_Obj *secondPtr);
+/* 463 */
+EXTERN Tcl_Obj *	Tcl_FSGetNormalizedPath(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
+/* 464 */
+EXTERN Tcl_Obj *	Tcl_FSJoinToPath(Tcl_Obj *pathPtr, Tcl_Size objc,
+				Tcl_Obj *const objv[]);
+/* 465 */
+EXTERN void *		Tcl_FSGetInternalRep(Tcl_Obj *pathPtr,
+				const Tcl_Filesystem *fsPtr);
+/* 466 */
+EXTERN Tcl_Obj *	Tcl_FSGetTranslatedPath(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
+/* 467 */
+EXTERN int		Tcl_FSEvalFile(Tcl_Interp *interp, Tcl_Obj *fileName);
+/* 468 */
+EXTERN Tcl_Obj *	Tcl_FSNewNativePath(
+				const Tcl_Filesystem *fromFilesystem,
+				void *clientData);
+/* 469 */
+EXTERN const void *	Tcl_FSGetNativePath(Tcl_Obj *pathPtr);
+/* 470 */
+EXTERN Tcl_Obj *	Tcl_FSFileSystemInfo(Tcl_Obj *pathPtr);
+/* 471 */
+EXTERN Tcl_Obj *	Tcl_FSPathSeparator(Tcl_Obj *pathPtr);
+/* 472 */
+EXTERN Tcl_Obj *	Tcl_FSListVolumes(void);
+/* 473 */
+EXTERN int		Tcl_FSRegister(void *clientData,
+				const Tcl_Filesystem *fsPtr);
+/* 474 */
+EXTERN int		Tcl_FSUnregister(const Tcl_Filesystem *fsPtr);
+/* 475 */
+EXTERN void *		Tcl_FSData(const Tcl_Filesystem *fsPtr);
+/* 476 */
+EXTERN const char *	Tcl_FSGetTranslatedStringPath(Tcl_Interp *interp,
+				Tcl_Obj *pathPtr);
+/* 477 */
+EXTERN const Tcl_Filesystem * Tcl_FSGetFileSystemForPath(Tcl_Obj *pathPtr);
+/* 478 */
+EXTERN Tcl_PathType	Tcl_FSGetPathType(Tcl_Obj *pathPtr);
+/* 479 */
+EXTERN int		Tcl_OutputBuffered(Tcl_Channel chan);
+/* 480 */
+EXTERN void		Tcl_FSMountsChanged(const Tcl_Filesystem *fsPtr);
+/* 481 */
+EXTERN int		Tcl_EvalTokensStandard(Tcl_Interp *interp,
+				Tcl_Token *tokenPtr, Tcl_Size count);
+/* 482 */
+EXTERN void		Tcl_GetTime(Tcl_Time *timeBuf);
+/* 483 */
+EXTERN Tcl_Trace	Tcl_CreateObjTrace(Tcl_Interp *interp,
+				Tcl_Size level, int flags,
+				Tcl_CmdObjTraceProc *objProc,
+				void *clientData,
+				Tcl_CmdObjTraceDeleteProc *delProc);
+/* 484 */
+EXTERN int		Tcl_GetCommandInfoFromToken(Tcl_Command token,
+				Tcl_CmdInfo *infoPtr);
+/* 485 */
+EXTERN int		Tcl_SetCommandInfoFromToken(Tcl_Command token,
+				const Tcl_CmdInfo *infoPtr);
+/* 486 */
+EXTERN Tcl_Obj *	Tcl_DbNewWideIntObj(Tcl_WideInt wideValue,
+				const char *file, int line);
+/* 487 */
+EXTERN int		Tcl_GetWideIntFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_WideInt *widePtr);
+/* 488 */
+EXTERN Tcl_Obj *	Tcl_NewWideIntObj(Tcl_WideInt wideValue);
+/* 489 */
+EXTERN void		Tcl_SetWideIntObj(Tcl_Obj *objPtr,
+				Tcl_WideInt wideValue);
+/* 490 */
+EXTERN Tcl_StatBuf *	Tcl_AllocStatBuf(void);
+/* 491 */
+EXTERN long long	Tcl_Seek(Tcl_Channel chan, long long offset,
+				int mode);
+/* 492 */
+EXTERN long long	Tcl_Tell(Tcl_Channel chan);
+/* 493 */
+EXTERN Tcl_DriverWideSeekProc * Tcl_ChannelWideSeekProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 494 */
+EXTERN int		Tcl_DictObjPut(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+				Tcl_Obj *keyPtr, Tcl_Obj *valuePtr);
+/* 495 */
+EXTERN int		Tcl_DictObjGet(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+				Tcl_Obj *keyPtr, Tcl_Obj **valuePtrPtr);
+/* 496 */
+EXTERN int		Tcl_DictObjRemove(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, Tcl_Obj *keyPtr);
+/* 497 */
+EXTERN int		TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+				void *sizePtr);
+/* 498 */
+EXTERN int		Tcl_DictObjFirst(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, Tcl_DictSearch *searchPtr,
+				Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr,
+				int *donePtr);
+/* 499 */
+EXTERN void		Tcl_DictObjNext(Tcl_DictSearch *searchPtr,
+				Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr,
+				int *donePtr);
+/* 500 */
+EXTERN void		Tcl_DictObjDone(Tcl_DictSearch *searchPtr);
+/* 501 */
+EXTERN int		Tcl_DictObjPutKeyList(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, Tcl_Size keyc,
+				Tcl_Obj *const *keyv, Tcl_Obj *valuePtr);
+/* 502 */
+EXTERN int		Tcl_DictObjRemoveKeyList(Tcl_Interp *interp,
+				Tcl_Obj *dictPtr, Tcl_Size keyc,
+				Tcl_Obj *const *keyv);
+/* 503 */
+EXTERN Tcl_Obj *	Tcl_NewDictObj(void);
+/* 504 */
+EXTERN Tcl_Obj *	Tcl_DbNewDictObj(const char *file, int line);
+/* 505 */
+EXTERN void		Tcl_RegisterConfig(Tcl_Interp *interp,
+				const char *pkgName,
+				const Tcl_Config *configuration,
+				const char *valEncoding);
+/* 506 */
+EXTERN Tcl_Namespace *	Tcl_CreateNamespace(Tcl_Interp *interp,
+				const char *name, void *clientData,
+				Tcl_NamespaceDeleteProc *deleteProc);
+/* 507 */
+EXTERN void		Tcl_DeleteNamespace(Tcl_Namespace *nsPtr);
+/* 508 */
+EXTERN int		Tcl_AppendExportList(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, Tcl_Obj *objPtr);
+/* 509 */
+EXTERN int		Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+				const char *pattern, int resetListFirst);
+/* 510 */
+EXTERN int		Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+				const char *pattern, int allowOverwrite);
+/* 511 */
+EXTERN int		Tcl_ForgetImport(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, const char *pattern);
+/* 512 */
+EXTERN Tcl_Namespace *	Tcl_GetCurrentNamespace(Tcl_Interp *interp);
+/* 513 */
+EXTERN Tcl_Namespace *	Tcl_GetGlobalNamespace(Tcl_Interp *interp);
+/* 514 */
+EXTERN Tcl_Namespace *	Tcl_FindNamespace(Tcl_Interp *interp,
+				const char *name,
+				Tcl_Namespace *contextNsPtr, int flags);
+/* 515 */
+EXTERN Tcl_Command	Tcl_FindCommand(Tcl_Interp *interp, const char *name,
+				Tcl_Namespace *contextNsPtr, int flags);
+/* 516 */
+EXTERN Tcl_Command	Tcl_GetCommandFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
+/* 517 */
+EXTERN void		Tcl_GetCommandFullName(Tcl_Interp *interp,
+				Tcl_Command command, Tcl_Obj *objPtr);
+/* 518 */
+EXTERN int		Tcl_FSEvalFileEx(Tcl_Interp *interp,
+				Tcl_Obj *fileName, const char *encodingName);
+/* Slot 519 is reserved */
+/* 520 */
+EXTERN void		Tcl_LimitAddHandler(Tcl_Interp *interp, int type,
+				Tcl_LimitHandlerProc *handlerProc,
+				void *clientData,
+				Tcl_LimitHandlerDeleteProc *deleteProc);
+/* 521 */
+EXTERN void		Tcl_LimitRemoveHandler(Tcl_Interp *interp, int type,
+				Tcl_LimitHandlerProc *handlerProc,
+				void *clientData);
+/* 522 */
+EXTERN int		Tcl_LimitReady(Tcl_Interp *interp);
+/* 523 */
+EXTERN int		Tcl_LimitCheck(Tcl_Interp *interp);
+/* 524 */
+EXTERN int		Tcl_LimitExceeded(Tcl_Interp *interp);
+/* 525 */
+EXTERN void		Tcl_LimitSetCommands(Tcl_Interp *interp,
+				Tcl_Size commandLimit);
+/* 526 */
+EXTERN void		Tcl_LimitSetTime(Tcl_Interp *interp,
+				Tcl_Time *timeLimitPtr);
+/* 527 */
+EXTERN void		Tcl_LimitSetGranularity(Tcl_Interp *interp, int type,
+				int granularity);
+/* 528 */
+EXTERN int		Tcl_LimitTypeEnabled(Tcl_Interp *interp, int type);
+/* 529 */
+EXTERN int		Tcl_LimitTypeExceeded(Tcl_Interp *interp, int type);
+/* 530 */
+EXTERN void		Tcl_LimitTypeSet(Tcl_Interp *interp, int type);
+/* 531 */
+EXTERN void		Tcl_LimitTypeReset(Tcl_Interp *interp, int type);
+/* 532 */
+EXTERN int		Tcl_LimitGetCommands(Tcl_Interp *interp);
+/* 533 */
+EXTERN void		Tcl_LimitGetTime(Tcl_Interp *interp,
+				Tcl_Time *timeLimitPtr);
+/* 534 */
+EXTERN int		Tcl_LimitGetGranularity(Tcl_Interp *interp, int type);
+/* 535 */
+EXTERN Tcl_InterpState	Tcl_SaveInterpState(Tcl_Interp *interp, int status);
+/* 536 */
+EXTERN int		Tcl_RestoreInterpState(Tcl_Interp *interp,
+				Tcl_InterpState state);
+/* 537 */
+EXTERN void		Tcl_DiscardInterpState(Tcl_InterpState state);
+/* 538 */
+EXTERN int		Tcl_SetReturnOptions(Tcl_Interp *interp,
+				Tcl_Obj *options);
+/* 539 */
+EXTERN Tcl_Obj *	Tcl_GetReturnOptions(Tcl_Interp *interp, int result);
+/* 540 */
+EXTERN int		Tcl_IsEnsemble(Tcl_Command token);
+/* 541 */
+EXTERN Tcl_Command	Tcl_CreateEnsemble(Tcl_Interp *interp,
+				const char *name,
+				Tcl_Namespace *namespacePtr, int flags);
+/* 542 */
+EXTERN Tcl_Command	Tcl_FindEnsemble(Tcl_Interp *interp,
+				Tcl_Obj *cmdNameObj, int flags);
+/* 543 */
+EXTERN int		Tcl_SetEnsembleSubcommandList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *subcmdList);
+/* 544 */
+EXTERN int		Tcl_SetEnsembleMappingDict(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *mapDict);
+/* 545 */
+EXTERN int		Tcl_SetEnsembleUnknownHandler(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *unknownList);
+/* 546 */
+EXTERN int		Tcl_SetEnsembleFlags(Tcl_Interp *interp,
+				Tcl_Command token, int flags);
+/* 547 */
+EXTERN int		Tcl_GetEnsembleSubcommandList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **subcmdListPtr);
+/* 548 */
+EXTERN int		Tcl_GetEnsembleMappingDict(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **mapDictPtr);
+/* 549 */
+EXTERN int		Tcl_GetEnsembleUnknownHandler(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **unknownListPtr);
+/* 550 */
+EXTERN int		Tcl_GetEnsembleFlags(Tcl_Interp *interp,
+				Tcl_Command token, int *flagsPtr);
+/* 551 */
+EXTERN int		Tcl_GetEnsembleNamespace(Tcl_Interp *interp,
+				Tcl_Command token,
+				Tcl_Namespace **namespacePtrPtr);
+/* 552 */
+EXTERN void		Tcl_SetTimeProc(Tcl_GetTimeProc *getProc,
+				Tcl_ScaleTimeProc *scaleProc,
+				void *clientData);
+/* 553 */
+EXTERN void		Tcl_QueryTimeProc(Tcl_GetTimeProc **getProc,
+				Tcl_ScaleTimeProc **scaleProc,
+				void **clientData);
+/* 554 */
+EXTERN Tcl_DriverThreadActionProc * Tcl_ChannelThreadActionProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 555 */
+EXTERN Tcl_Obj *	Tcl_NewBignumObj(void *value);
+/* 556 */
+EXTERN Tcl_Obj *	Tcl_DbNewBignumObj(void *value, const char *file,
+				int line);
+/* 557 */
+EXTERN void		Tcl_SetBignumObj(Tcl_Obj *obj, void *value);
+/* 558 */
+EXTERN int		Tcl_GetBignumFromObj(Tcl_Interp *interp,
+				Tcl_Obj *obj, void *value);
+/* 559 */
+EXTERN int		Tcl_TakeBignumFromObj(Tcl_Interp *interp,
+				Tcl_Obj *obj, void *value);
+/* 560 */
+EXTERN int		Tcl_TruncateChannel(Tcl_Channel chan,
+				long long length);
+/* 561 */
+EXTERN Tcl_DriverTruncateProc * Tcl_ChannelTruncateProc(
+				const Tcl_ChannelType *chanTypePtr);
+/* 562 */
+EXTERN void		Tcl_SetChannelErrorInterp(Tcl_Interp *interp,
+				Tcl_Obj *msg);
+/* 563 */
+EXTERN void		Tcl_GetChannelErrorInterp(Tcl_Interp *interp,
+				Tcl_Obj **msg);
+/* 564 */
+EXTERN void		Tcl_SetChannelError(Tcl_Channel chan, Tcl_Obj *msg);
+/* 565 */
+EXTERN void		Tcl_GetChannelError(Tcl_Channel chan, Tcl_Obj **msg);
+/* 566 */
+EXTERN int		Tcl_InitBignumFromDouble(Tcl_Interp *interp,
+				double initval, void *toInit);
+/* 567 */
+EXTERN Tcl_Obj *	Tcl_GetNamespaceUnknownHandler(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr);
+/* 568 */
+EXTERN int		Tcl_SetNamespaceUnknownHandler(Tcl_Interp *interp,
+				Tcl_Namespace *nsPtr, Tcl_Obj *handlerPtr);
+/* 569 */
+EXTERN int		Tcl_GetEncodingFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_Encoding *encodingPtr);
+/* 570 */
+EXTERN Tcl_Obj *	Tcl_GetEncodingSearchPath(void);
+/* 571 */
+EXTERN int		Tcl_SetEncodingSearchPath(Tcl_Obj *searchPath);
+/* 572 */
+EXTERN const char *	Tcl_GetEncodingNameFromEnvironment(
+				Tcl_DString *bufPtr);
+/* 573 */
+EXTERN int		Tcl_PkgRequireProc(Tcl_Interp *interp,
+				const char *name, Tcl_Size objc,
+				Tcl_Obj *const objv[], void *clientDataPtr);
+/* 574 */
+EXTERN void		Tcl_AppendObjToErrorInfo(Tcl_Interp *interp,
+				Tcl_Obj *objPtr);
+/* 575 */
+EXTERN void		Tcl_AppendLimitedToObj(Tcl_Obj *objPtr,
+				const char *bytes, Tcl_Size length,
+				Tcl_Size limit, const char *ellipsis);
+/* 576 */
+EXTERN Tcl_Obj *	Tcl_Format(Tcl_Interp *interp, const char *format,
+				Tcl_Size objc, Tcl_Obj *const objv[]);
+/* 577 */
+EXTERN int		Tcl_AppendFormatToObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, const char *format,
+				Tcl_Size objc, Tcl_Obj *const objv[]);
+/* 578 */
+EXTERN Tcl_Obj *	Tcl_ObjPrintf(const char *format, ...) TCL_FORMAT_PRINTF(1, 2);
+/* 579 */
+EXTERN void		Tcl_AppendPrintfToObj(Tcl_Obj *objPtr,
+				const char *format, ...) TCL_FORMAT_PRINTF(2, 3);
+/* 580 */
+EXTERN int		Tcl_CancelEval(Tcl_Interp *interp,
+				Tcl_Obj *resultObjPtr, void *clientData,
+				int flags);
+/* 581 */
+EXTERN int		Tcl_Canceled(Tcl_Interp *interp, int flags);
+/* 582 */
+EXTERN int		Tcl_CreatePipe(Tcl_Interp *interp,
+				Tcl_Channel *rchan, Tcl_Channel *wchan,
+				int flags);
+/* 583 */
+EXTERN Tcl_Command	Tcl_NRCreateCommand(Tcl_Interp *interp,
+				const char *cmdName, Tcl_ObjCmdProc *proc,
+				Tcl_ObjCmdProc *nreProc, void *clientData,
+				Tcl_CmdDeleteProc *deleteProc);
+/* 584 */
+EXTERN int		Tcl_NREvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags);
+/* 585 */
+EXTERN int		Tcl_NREvalObjv(Tcl_Interp *interp, Tcl_Size objc,
+				Tcl_Obj *const objv[], int flags);
+/* 586 */
+EXTERN int		Tcl_NRCmdSwap(Tcl_Interp *interp, Tcl_Command cmd,
+				Tcl_Size objc, Tcl_Obj *const objv[],
+				int flags);
+/* 587 */
+EXTERN void		Tcl_NRAddCallback(Tcl_Interp *interp,
+				Tcl_NRPostProc *postProcPtr, void *data0,
+				void *data1, void *data2, void *data3);
+/* 588 */
+EXTERN int		Tcl_NRCallObjProc(Tcl_Interp *interp,
+				Tcl_ObjCmdProc *objProc, void *clientData,
+				Tcl_Size objc, Tcl_Obj *const objv[]);
+/* 589 */
+EXTERN unsigned		Tcl_GetFSDeviceFromStat(const Tcl_StatBuf *statPtr);
+/* 590 */
+EXTERN unsigned		Tcl_GetFSInodeFromStat(const Tcl_StatBuf *statPtr);
+/* 591 */
+EXTERN unsigned		Tcl_GetModeFromStat(const Tcl_StatBuf *statPtr);
+/* 592 */
+EXTERN int		Tcl_GetLinkCountFromStat(const Tcl_StatBuf *statPtr);
+/* 593 */
+EXTERN int		Tcl_GetUserIdFromStat(const Tcl_StatBuf *statPtr);
+/* 594 */
+EXTERN int		Tcl_GetGroupIdFromStat(const Tcl_StatBuf *statPtr);
+/* 595 */
+EXTERN int		Tcl_GetDeviceTypeFromStat(const Tcl_StatBuf *statPtr);
+/* 596 */
+EXTERN long long	Tcl_GetAccessTimeFromStat(const Tcl_StatBuf *statPtr);
+/* 597 */
+EXTERN long long	Tcl_GetModificationTimeFromStat(
+				const Tcl_StatBuf *statPtr);
+/* 598 */
+EXTERN long long	Tcl_GetChangeTimeFromStat(const Tcl_StatBuf *statPtr);
+/* 599 */
+EXTERN unsigned long long Tcl_GetSizeFromStat(const Tcl_StatBuf *statPtr);
+/* 600 */
+EXTERN unsigned long long Tcl_GetBlocksFromStat(const Tcl_StatBuf *statPtr);
+/* 601 */
+EXTERN unsigned		Tcl_GetBlockSizeFromStat(const Tcl_StatBuf *statPtr);
+/* 602 */
+EXTERN int		Tcl_SetEnsembleParameterList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj *paramList);
+/* 603 */
+EXTERN int		Tcl_GetEnsembleParameterList(Tcl_Interp *interp,
+				Tcl_Command token, Tcl_Obj **paramListPtr);
+/* 604 */
+EXTERN int		TclParseArgsObjv(Tcl_Interp *interp,
+				const Tcl_ArgvInfo *argTable, void *objcPtr,
+				Tcl_Obj *const *objv, Tcl_Obj ***remObjv);
+/* 605 */
+EXTERN int		Tcl_GetErrorLine(Tcl_Interp *interp);
+/* 606 */
+EXTERN void		Tcl_SetErrorLine(Tcl_Interp *interp, int lineNum);
+/* 607 */
+EXTERN void		Tcl_TransferResult(Tcl_Interp *sourceInterp,
+				int code, Tcl_Interp *targetInterp);
+/* 608 */
+EXTERN int		Tcl_InterpActive(Tcl_Interp *interp);
+/* 609 */
+EXTERN void		Tcl_BackgroundException(Tcl_Interp *interp, int code);
+/* 610 */
+EXTERN int		Tcl_ZlibDeflate(Tcl_Interp *interp, int format,
+				Tcl_Obj *data, int level,
+				Tcl_Obj *gzipHeaderDictObj);
+/* 611 */
+EXTERN int		Tcl_ZlibInflate(Tcl_Interp *interp, int format,
+				Tcl_Obj *data, Tcl_Size buffersize,
+				Tcl_Obj *gzipHeaderDictObj);
+/* 612 */
+EXTERN unsigned int	Tcl_ZlibCRC32(unsigned int crc,
+				const unsigned char *buf, Tcl_Size len);
+/* 613 */
+EXTERN unsigned int	Tcl_ZlibAdler32(unsigned int adler,
+				const unsigned char *buf, Tcl_Size len);
+/* 614 */
+EXTERN int		Tcl_ZlibStreamInit(Tcl_Interp *interp, int mode,
+				int format, int level, Tcl_Obj *dictObj,
+				Tcl_ZlibStream *zshandle);
+/* 615 */
+EXTERN Tcl_Obj *	Tcl_ZlibStreamGetCommandName(Tcl_ZlibStream zshandle);
+/* 616 */
+EXTERN int		Tcl_ZlibStreamEof(Tcl_ZlibStream zshandle);
+/* 617 */
+EXTERN int		Tcl_ZlibStreamChecksum(Tcl_ZlibStream zshandle);
+/* 618 */
+EXTERN int		Tcl_ZlibStreamPut(Tcl_ZlibStream zshandle,
+				Tcl_Obj *data, int flush);
+/* 619 */
+EXTERN int		Tcl_ZlibStreamGet(Tcl_ZlibStream zshandle,
+				Tcl_Obj *data, Tcl_Size count);
+/* 620 */
+EXTERN int		Tcl_ZlibStreamClose(Tcl_ZlibStream zshandle);
+/* 621 */
+EXTERN int		Tcl_ZlibStreamReset(Tcl_ZlibStream zshandle);
+/* 622 */
+EXTERN void		Tcl_SetStartupScript(Tcl_Obj *path,
+				const char *encoding);
+/* 623 */
+EXTERN Tcl_Obj *	Tcl_GetStartupScript(const char **encodingPtr);
+/* 624 */
+EXTERN int		Tcl_CloseEx(Tcl_Interp *interp, Tcl_Channel chan,
+				int flags);
+/* 625 */
+EXTERN int		Tcl_NRExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				Tcl_Obj *resultPtr);
+/* 626 */
+EXTERN int		Tcl_NRSubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+				int flags);
+/* 627 */
+EXTERN int		Tcl_LoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
+				const char *const symv[], int flags,
+				void *procPtrs, Tcl_LoadHandle *handlePtr);
+/* 628 */
+EXTERN void *		Tcl_FindSymbol(Tcl_Interp *interp,
+				Tcl_LoadHandle handle, const char *symbol);
+/* 629 */
+EXTERN int		Tcl_FSUnloadFile(Tcl_Interp *interp,
+				Tcl_LoadHandle handlePtr);
+/* 630 */
+EXTERN void		Tcl_ZlibStreamSetCompressionDictionary(
+				Tcl_ZlibStream zhandle,
+				Tcl_Obj *compressionDictionaryObj);
+/* 631 */
+EXTERN Tcl_Channel	Tcl_OpenTcpServerEx(Tcl_Interp *interp,
+				const char *service, const char *host,
+				unsigned int flags, int backlog,
+				Tcl_TcpAcceptProc *acceptProc,
+				void *callbackData);
+/* 632 */
+EXTERN int		TclZipfs_Mount(Tcl_Interp *interp,
+				const char *zipname, const char *mountPoint,
+				const char *passwd);
+/* 633 */
+EXTERN int		TclZipfs_Unmount(Tcl_Interp *interp,
+				const char *mountPoint);
+/* 634 */
+EXTERN Tcl_Obj *	TclZipfs_TclLibrary(void);
+/* 635 */
+EXTERN int		TclZipfs_MountBuffer(Tcl_Interp *interp,
+				const void *data, size_t datalen,
+				const char *mountPoint, int copy);
+/* 636 */
+EXTERN void		Tcl_FreeInternalRep(Tcl_Obj *objPtr);
+/* 637 */
+EXTERN char *		Tcl_InitStringRep(Tcl_Obj *objPtr, const char *bytes,
+				TCL_HASH_TYPE numBytes);
+/* 638 */
+EXTERN Tcl_ObjInternalRep * Tcl_FetchInternalRep(Tcl_Obj *objPtr,
+				const Tcl_ObjType *typePtr);
+/* 639 */
+EXTERN void		Tcl_StoreInternalRep(Tcl_Obj *objPtr,
+				const Tcl_ObjType *typePtr,
+				const Tcl_ObjInternalRep *irPtr);
+/* 640 */
+EXTERN int		Tcl_HasStringRep(Tcl_Obj *objPtr);
+/* 641 */
+EXTERN void		Tcl_IncrRefCount(Tcl_Obj *objPtr);
+/* 642 */
+EXTERN void		Tcl_DecrRefCount(Tcl_Obj *objPtr);
+/* 643 */
+EXTERN int		Tcl_IsShared(Tcl_Obj *objPtr);
+/* 644 */
+EXTERN int		Tcl_LinkArray(Tcl_Interp *interp,
+				const char *varName, void *addr, int type,
+				Tcl_Size size);
+/* 645 */
+EXTERN int		Tcl_GetIntForIndex(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_Size endValue,
+				Tcl_Size *indexPtr);
+/* 646 */
+EXTERN Tcl_Size		Tcl_UtfToUniChar(const char *src, int *chPtr);
+/* 647 */
+EXTERN char *		Tcl_UniCharToUtfDString(const int *uniStr,
+				Tcl_Size uniLength, Tcl_DString *dsPtr);
+/* 648 */
+EXTERN int *		Tcl_UtfToUniCharDString(const char *src,
+				Tcl_Size length, Tcl_DString *dsPtr);
+/* 649 */
+EXTERN unsigned char *	TclGetBytesFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, void *numBytesPtr);
+/* 650 */
+EXTERN unsigned char *	Tcl_GetBytesFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_Size *numBytesPtr);
+/* 651 */
+EXTERN char *		Tcl_GetStringFromObj(Tcl_Obj *objPtr,
+				Tcl_Size *lengthPtr);
+/* 652 */
+EXTERN Tcl_UniChar *	Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr,
+				Tcl_Size *lengthPtr);
+/* 653 */
+EXTERN int		Tcl_GetSizeIntFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_Size *sizePtr);
+/* 654 */
+EXTERN int		Tcl_UtfCharComplete(const char *src, Tcl_Size length);
+/* 655 */
+EXTERN const char *	Tcl_UtfNext(const char *src);
+/* 656 */
+EXTERN const char *	Tcl_UtfPrev(const char *src, const char *start);
+/* 657 */
+EXTERN int		Tcl_UniCharIsUnicode(int ch);
+/* 658 */
+EXTERN int		Tcl_ExternalToUtfDStringEx(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				Tcl_Size srcLen, int flags,
+				Tcl_DString *dsPtr,
+				Tcl_Size *errorLocationPtr);
+/* 659 */
+EXTERN int		Tcl_UtfToExternalDStringEx(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				Tcl_Size srcLen, int flags,
+				Tcl_DString *dsPtr,
+				Tcl_Size *errorLocationPtr);
+/* 660 */
+EXTERN int		Tcl_AsyncMarkFromSignal(Tcl_AsyncHandler async,
+				int sigNumber);
+/* 661 */
+EXTERN int		Tcl_ListObjGetElements(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Size *objcPtr,
+				Tcl_Obj ***objvPtr);
+/* 662 */
+EXTERN int		Tcl_ListObjLength(Tcl_Interp *interp,
+				Tcl_Obj *listPtr, Tcl_Size *lengthPtr);
+/* 663 */
+EXTERN int		Tcl_DictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
+				Tcl_Size *sizePtr);
+/* 664 */
+EXTERN int		Tcl_SplitList(Tcl_Interp *interp,
+				const char *listStr, Tcl_Size *argcPtr,
+				const char ***argvPtr);
+/* 665 */
+EXTERN void		Tcl_SplitPath(const char *path, Tcl_Size *argcPtr,
+				const char ***argvPtr);
+/* 666 */
+EXTERN Tcl_Obj *	Tcl_FSSplitPath(Tcl_Obj *pathPtr, Tcl_Size *lenPtr);
+/* 667 */
+EXTERN int		Tcl_ParseArgsObjv(Tcl_Interp *interp,
+				const Tcl_ArgvInfo *argTable,
+				Tcl_Size *objcPtr, Tcl_Obj *const *objv,
+				Tcl_Obj ***remObjv);
+/* 668 */
+EXTERN Tcl_Size		Tcl_UniCharLen(const int *uniStr);
+/* 669 */
+EXTERN Tcl_Size		Tcl_NumUtfChars(const char *src, Tcl_Size length);
+/* 670 */
+EXTERN Tcl_Size		Tcl_GetCharLength(Tcl_Obj *objPtr);
+/* 671 */
+EXTERN const char *	Tcl_UtfAtIndex(const char *src, Tcl_Size index);
+/* 672 */
+EXTERN Tcl_Obj *	Tcl_GetRange(Tcl_Obj *objPtr, Tcl_Size first,
+				Tcl_Size last);
+/* 673 */
+EXTERN int		Tcl_GetUniChar(Tcl_Obj *objPtr, Tcl_Size index);
+/* 674 */
+EXTERN int		Tcl_GetBool(Tcl_Interp *interp, const char *src,
+				int flags, char *charPtr);
+/* 675 */
+EXTERN int		Tcl_GetBoolFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int flags, char *charPtr);
+/* 676 */
+EXTERN Tcl_Command	Tcl_CreateObjCommand2(Tcl_Interp *interp,
+				const char *cmdName, Tcl_ObjCmdProc2 *proc2,
+				void *clientData,
+				Tcl_CmdDeleteProc *deleteProc);
+/* 677 */
+EXTERN Tcl_Trace	Tcl_CreateObjTrace2(Tcl_Interp *interp,
+				Tcl_Size level, int flags,
+				Tcl_CmdObjTraceProc2 *objProc2,
+				void *clientData,
+				Tcl_CmdObjTraceDeleteProc *delProc);
+/* 678 */
+EXTERN Tcl_Command	Tcl_NRCreateCommand2(Tcl_Interp *interp,
+				const char *cmdName, Tcl_ObjCmdProc2 *proc,
+				Tcl_ObjCmdProc2 *nreProc2, void *clientData,
+				Tcl_CmdDeleteProc *deleteProc);
+/* 679 */
+EXTERN int		Tcl_NRCallObjProc2(Tcl_Interp *interp,
+				Tcl_ObjCmdProc2 *objProc2, void *clientData,
+				Tcl_Size objc, Tcl_Obj *const objv[]);
+/* 680 */
+EXTERN int		Tcl_GetNumberFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, void **clientDataPtr,
+				int *typePtr);
+/* 681 */
+EXTERN int		Tcl_GetNumber(Tcl_Interp *interp, const char *bytes,
+				Tcl_Size numBytes, void **clientDataPtr,
+				int *typePtr);
+/* 682 */
+EXTERN int		Tcl_RemoveChannelMode(Tcl_Interp *interp,
+				Tcl_Channel chan, int mode);
+/* 683 */
+EXTERN Tcl_Size		Tcl_GetEncodingNulLength(Tcl_Encoding encoding);
+/* 684 */
+EXTERN int		Tcl_GetWideUIntFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr);
+/* 685 */
+EXTERN Tcl_Obj *	Tcl_DStringToObj(Tcl_DString *dsPtr);
+/* Slot 686 is reserved */
+/* Slot 687 is reserved */
+/* 688 */
+EXTERN void		TclUnusedStubEntry(void);
+
+typedef struct {
+    const struct TclPlatStubs *tclPlatStubs;
+    const struct TclIntStubs *tclIntStubs;
+    const struct TclIntPlatStubs *tclIntPlatStubs;
+} TclStubHooks;
+
+typedef struct TclStubs {
+    int magic;
+    const TclStubHooks *hooks;
+
+    int (*tcl_PkgProvideEx) (Tcl_Interp *interp, const char *name, const char *version, const void *clientData); /* 0 */
+    const char * (*tcl_PkgRequireEx) (Tcl_Interp *interp, const char *name, const char *version, int exact, void *clientDataPtr); /* 1 */
+    TCL_NORETURN1 void (*tcl_Panic) (const char *format, ...) TCL_FORMAT_PRINTF(1, 2); /* 2 */
+    void * (*tcl_Alloc) (TCL_HASH_TYPE size); /* 3 */
+    void (*tcl_Free) (void *ptr); /* 4 */
+    void * (*tcl_Realloc) (void *ptr, TCL_HASH_TYPE size); /* 5 */
+    void * (*tcl_DbCkalloc) (TCL_HASH_TYPE size, const char *file, int line); /* 6 */
+    void (*tcl_DbCkfree) (void *ptr, const char *file, int line); /* 7 */
+    void * (*tcl_DbCkrealloc) (void *ptr, TCL_HASH_TYPE size, const char *file, int line); /* 8 */
+    void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, void *clientData); /* 9 */
+    void (*tcl_DeleteFileHandler) (int fd); /* 10 */
+    void (*tcl_SetTimer) (const Tcl_Time *timePtr); /* 11 */
+    void (*tcl_Sleep) (int ms); /* 12 */
+    int (*tcl_WaitForEvent) (const Tcl_Time *timePtr); /* 13 */
+    int (*tcl_AppendAllObjTypes) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 14 */
+    void (*tcl_AppendStringsToObj) (Tcl_Obj *objPtr, ...); /* 15 */
+    void (*tcl_AppendToObj) (Tcl_Obj *objPtr, const char *bytes, Tcl_Size length); /* 16 */
+    Tcl_Obj * (*tcl_ConcatObj) (Tcl_Size objc, Tcl_Obj *const objv[]); /* 17 */
+    int (*tcl_ConvertToType) (Tcl_Interp *interp, Tcl_Obj *objPtr, const Tcl_ObjType *typePtr); /* 18 */
+    void (*tcl_DbDecrRefCount) (Tcl_Obj *objPtr, const char *file, int line); /* 19 */
+    void (*tcl_DbIncrRefCount) (Tcl_Obj *objPtr, const char *file, int line); /* 20 */
+    int (*tcl_DbIsShared) (Tcl_Obj *objPtr, const char *file, int line); /* 21 */
+    void (*reserved22)(void);
+    Tcl_Obj * (*tcl_DbNewByteArrayObj) (const unsigned char *bytes, Tcl_Size numBytes, const char *file, int line); /* 23 */
+    Tcl_Obj * (*tcl_DbNewDoubleObj) (double doubleValue, const char *file, int line); /* 24 */
+    Tcl_Obj * (*tcl_DbNewListObj) (Tcl_Size objc, Tcl_Obj *const *objv, const char *file, int line); /* 25 */
+    void (*reserved26)(void);
+    Tcl_Obj * (*tcl_DbNewObj) (const char *file, int line); /* 27 */
+    Tcl_Obj * (*tcl_DbNewStringObj) (const char *bytes, Tcl_Size length, const char *file, int line); /* 28 */
+    Tcl_Obj * (*tcl_DuplicateObj) (Tcl_Obj *objPtr); /* 29 */
+    void (*tclFreeObj) (Tcl_Obj *objPtr); /* 30 */
+    int (*tcl_GetBoolean) (Tcl_Interp *interp, const char *src, int *intPtr); /* 31 */
+    int (*tcl_GetBooleanFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *intPtr); /* 32 */
+    unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj *objPtr, Tcl_Size *numBytesPtr); /* 33 */
+    int (*tcl_GetDouble) (Tcl_Interp *interp, const char *src, double *doublePtr); /* 34 */
+    int (*tcl_GetDoubleFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, double *doublePtr); /* 35 */
+    void (*reserved36)(void);
+    int (*tcl_GetInt) (Tcl_Interp *interp, const char *src, int *intPtr); /* 37 */
+    int (*tcl_GetIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *intPtr); /* 38 */
+    int (*tcl_GetLongFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, long *longPtr); /* 39 */
+    const Tcl_ObjType * (*tcl_GetObjType) (const char *typeName); /* 40 */
+    char * (*tclGetStringFromObj) (Tcl_Obj *objPtr, void *lengthPtr); /* 41 */
+    void (*tcl_InvalidateStringRep) (Tcl_Obj *objPtr); /* 42 */
+    int (*tcl_ListObjAppendList) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Obj *elemListPtr); /* 43 */
+    int (*tcl_ListObjAppendElement) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Obj *objPtr); /* 44 */
+    int (*tclListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, void *objcPtr, Tcl_Obj ***objvPtr); /* 45 */
+    int (*tcl_ListObjIndex) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Size index, Tcl_Obj **objPtrPtr); /* 46 */
+    int (*tclListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, void *lengthPtr); /* 47 */
+    int (*tcl_ListObjReplace) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Size first, Tcl_Size count, Tcl_Size objc, Tcl_Obj *const objv[]); /* 48 */
+    void (*reserved49)(void);
+    Tcl_Obj * (*tcl_NewByteArrayObj) (const unsigned char *bytes, Tcl_Size numBytes); /* 50 */
+    Tcl_Obj * (*tcl_NewDoubleObj) (double doubleValue); /* 51 */
+    void (*reserved52)(void);
+    Tcl_Obj * (*tcl_NewListObj) (Tcl_Size objc, Tcl_Obj *const objv[]); /* 53 */
+    void (*reserved54)(void);
+    Tcl_Obj * (*tcl_NewObj) (void); /* 55 */
+    Tcl_Obj * (*tcl_NewStringObj) (const char *bytes, Tcl_Size length); /* 56 */
+    void (*reserved57)(void);
+    unsigned char * (*tcl_SetByteArrayLength) (Tcl_Obj *objPtr, Tcl_Size numBytes); /* 58 */
+    void (*tcl_SetByteArrayObj) (Tcl_Obj *objPtr, const unsigned char *bytes, Tcl_Size numBytes); /* 59 */
+    void (*tcl_SetDoubleObj) (Tcl_Obj *objPtr, double doubleValue); /* 60 */
+    void (*reserved61)(void);
+    void (*tcl_SetListObj) (Tcl_Obj *objPtr, Tcl_Size objc, Tcl_Obj *const objv[]); /* 62 */
+    void (*reserved63)(void);
+    void (*tcl_SetObjLength) (Tcl_Obj *objPtr, Tcl_Size length); /* 64 */
+    void (*tcl_SetStringObj) (Tcl_Obj *objPtr, const char *bytes, Tcl_Size length); /* 65 */
+    void (*reserved66)(void);
+    void (*reserved67)(void);
+    void (*tcl_AllowExceptions) (Tcl_Interp *interp); /* 68 */
+    void (*tcl_AppendElement) (Tcl_Interp *interp, const char *element); /* 69 */
+    void (*tcl_AppendResult) (Tcl_Interp *interp, ...); /* 70 */
+    Tcl_AsyncHandler (*tcl_AsyncCreate) (Tcl_AsyncProc *proc, void *clientData); /* 71 */
+    void (*tcl_AsyncDelete) (Tcl_AsyncHandler async); /* 72 */
+    int (*tcl_AsyncInvoke) (Tcl_Interp *interp, int code); /* 73 */
+    void (*tcl_AsyncMark) (Tcl_AsyncHandler async); /* 74 */
+    int (*tcl_AsyncReady) (void); /* 75 */
+    void (*reserved76)(void);
+    void (*reserved77)(void);
+    int (*tcl_BadChannelOption) (Tcl_Interp *interp, const char *optionName, const char *optionList); /* 78 */
+    void (*tcl_CallWhenDeleted) (Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, void *clientData); /* 79 */
+    void (*tcl_CancelIdleCall) (Tcl_IdleProc *idleProc, void *clientData); /* 80 */
+    int (*tcl_Close) (Tcl_Interp *interp, Tcl_Channel chan); /* 81 */
+    int (*tcl_CommandComplete) (const char *cmd); /* 82 */
+    char * (*tcl_Concat) (Tcl_Size argc, const char *const *argv); /* 83 */
+    Tcl_Size (*tcl_ConvertElement) (const char *src, char *dst, int flags); /* 84 */
+    Tcl_Size (*tcl_ConvertCountedElement) (const char *src, Tcl_Size length, char *dst, int flags); /* 85 */
+    int (*tcl_CreateAlias) (Tcl_Interp *childInterp, const char *childCmd, Tcl_Interp *target, const char *targetCmd, Tcl_Size argc, const char *const *argv); /* 86 */
+    int (*tcl_CreateAliasObj) (Tcl_Interp *childInterp, const char *childCmd, Tcl_Interp *target, const char *targetCmd, Tcl_Size objc, Tcl_Obj *const objv[]); /* 87 */
+    Tcl_Channel (*tcl_CreateChannel) (const Tcl_ChannelType *typePtr, const char *chanName, void *instanceData, int mask); /* 88 */
+    void (*tcl_CreateChannelHandler) (Tcl_Channel chan, int mask, Tcl_ChannelProc *proc, void *clientData); /* 89 */
+    void (*tcl_CreateCloseHandler) (Tcl_Channel chan, Tcl_CloseProc *proc, void *clientData); /* 90 */
+    Tcl_Command (*tcl_CreateCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_CmdProc *proc, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 91 */
+    void (*tcl_CreateEventSource) (Tcl_EventSetupProc *setupProc, Tcl_EventCheckProc *checkProc, void *clientData); /* 92 */
+    void (*tcl_CreateExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 93 */
+    Tcl_Interp * (*tcl_CreateInterp) (void); /* 94 */
+    void (*reserved95)(void);
+    Tcl_Command (*tcl_CreateObjCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc *proc, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 96 */
+    Tcl_Interp * (*tcl_CreateChild) (Tcl_Interp *interp, const char *name, int isSafe); /* 97 */
+    Tcl_TimerToken (*tcl_CreateTimerHandler) (int milliseconds, Tcl_TimerProc *proc, void *clientData); /* 98 */
+    Tcl_Trace (*tcl_CreateTrace) (Tcl_Interp *interp, Tcl_Size level, Tcl_CmdTraceProc *proc, void *clientData); /* 99 */
+    void (*tcl_DeleteAssocData) (Tcl_Interp *interp, const char *name); /* 100 */
+    void (*tcl_DeleteChannelHandler) (Tcl_Channel chan, Tcl_ChannelProc *proc, void *clientData); /* 101 */
+    void (*tcl_DeleteCloseHandler) (Tcl_Channel chan, Tcl_CloseProc *proc, void *clientData); /* 102 */
+    int (*tcl_DeleteCommand) (Tcl_Interp *interp, const char *cmdName); /* 103 */
+    int (*tcl_DeleteCommandFromToken) (Tcl_Interp *interp, Tcl_Command command); /* 104 */
+    void (*tcl_DeleteEvents) (Tcl_EventDeleteProc *proc, void *clientData); /* 105 */
+    void (*tcl_DeleteEventSource) (Tcl_EventSetupProc *setupProc, Tcl_EventCheckProc *checkProc, void *clientData); /* 106 */
+    void (*tcl_DeleteExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 107 */
+    void (*tcl_DeleteHashEntry) (Tcl_HashEntry *entryPtr); /* 108 */
+    void (*tcl_DeleteHashTable) (Tcl_HashTable *tablePtr); /* 109 */
+    void (*tcl_DeleteInterp) (Tcl_Interp *interp); /* 110 */
+    void (*tcl_DetachPids) (Tcl_Size numPids, Tcl_Pid *pidPtr); /* 111 */
+    void (*tcl_DeleteTimerHandler) (Tcl_TimerToken token); /* 112 */
+    void (*tcl_DeleteTrace) (Tcl_Interp *interp, Tcl_Trace trace); /* 113 */
+    void (*tcl_DontCallWhenDeleted) (Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, void *clientData); /* 114 */
+    int (*tcl_DoOneEvent) (int flags); /* 115 */
+    void (*tcl_DoWhenIdle) (Tcl_IdleProc *proc, void *clientData); /* 116 */
+    char * (*tcl_DStringAppend) (Tcl_DString *dsPtr, const char *bytes, Tcl_Size length); /* 117 */
+    char * (*tcl_DStringAppendElement) (Tcl_DString *dsPtr, const char *element); /* 118 */
+    void (*tcl_DStringEndSublist) (Tcl_DString *dsPtr); /* 119 */
+    void (*tcl_DStringFree) (Tcl_DString *dsPtr); /* 120 */
+    void (*tcl_DStringGetResult) (Tcl_Interp *interp, Tcl_DString *dsPtr); /* 121 */
+    void (*tcl_DStringInit) (Tcl_DString *dsPtr); /* 122 */
+    void (*tcl_DStringResult) (Tcl_Interp *interp, Tcl_DString *dsPtr); /* 123 */
+    void (*tcl_DStringSetLength) (Tcl_DString *dsPtr, Tcl_Size length); /* 124 */
+    void (*tcl_DStringStartSublist) (Tcl_DString *dsPtr); /* 125 */
+    int (*tcl_Eof) (Tcl_Channel chan); /* 126 */
+    const char * (*tcl_ErrnoId) (void); /* 127 */
+    const char * (*tcl_ErrnoMsg) (int err); /* 128 */
+    void (*reserved129)(void);
+    int (*tcl_EvalFile) (Tcl_Interp *interp, const char *fileName); /* 130 */
+    void (*reserved131)(void);
+    void (*tcl_EventuallyFree) (void *clientData, Tcl_FreeProc *freeProc); /* 132 */
+    TCL_NORETURN1 void (*tcl_Exit) (int status); /* 133 */
+    int (*tcl_ExposeCommand) (Tcl_Interp *interp, const char *hiddenCmdToken, const char *cmdName); /* 134 */
+    int (*tcl_ExprBoolean) (Tcl_Interp *interp, const char *expr, int *ptr); /* 135 */
+    int (*tcl_ExprBooleanObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *ptr); /* 136 */
+    int (*tcl_ExprDouble) (Tcl_Interp *interp, const char *expr, double *ptr); /* 137 */
+    int (*tcl_ExprDoubleObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, double *ptr); /* 138 */
+    int (*tcl_ExprLong) (Tcl_Interp *interp, const char *expr, long *ptr); /* 139 */
+    int (*tcl_ExprLongObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, long *ptr); /* 140 */
+    int (*tcl_ExprObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Obj **resultPtrPtr); /* 141 */
+    int (*tcl_ExprString) (Tcl_Interp *interp, const char *expr); /* 142 */
+    void (*tcl_Finalize) (void); /* 143 */
+    void (*reserved144)(void);
+    Tcl_HashEntry * (*tcl_FirstHashEntry) (Tcl_HashTable *tablePtr, Tcl_HashSearch *searchPtr); /* 145 */
+    int (*tcl_Flush) (Tcl_Channel chan); /* 146 */
+    void (*reserved147)(void);
+    int (*tcl_GetAlias) (Tcl_Interp *interp, const char *childCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, int *argcPtr, const char ***argvPtr); /* 148 */
+    int (*tcl_GetAliasObj) (Tcl_Interp *interp, const char *childCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, int *objcPtr, Tcl_Obj ***objv); /* 149 */
+    void * (*tcl_GetAssocData) (Tcl_Interp *interp, const char *name, Tcl_InterpDeleteProc **procPtr); /* 150 */
+    Tcl_Channel (*tcl_GetChannel) (Tcl_Interp *interp, const char *chanName, int *modePtr); /* 151 */
+    Tcl_Size (*tcl_GetChannelBufferSize) (Tcl_Channel chan); /* 152 */
+    int (*tcl_GetChannelHandle) (Tcl_Channel chan, int direction, void **handlePtr); /* 153 */
+    void * (*tcl_GetChannelInstanceData) (Tcl_Channel chan); /* 154 */
+    int (*tcl_GetChannelMode) (Tcl_Channel chan); /* 155 */
+    const char * (*tcl_GetChannelName) (Tcl_Channel chan); /* 156 */
+    int (*tcl_GetChannelOption) (Tcl_Interp *interp, Tcl_Channel chan, const char *optionName, Tcl_DString *dsPtr); /* 157 */
+    const Tcl_ChannelType * (*tcl_GetChannelType) (Tcl_Channel chan); /* 158 */
+    int (*tcl_GetCommandInfo) (Tcl_Interp *interp, const char *cmdName, Tcl_CmdInfo *infoPtr); /* 159 */
+    const char * (*tcl_GetCommandName) (Tcl_Interp *interp, Tcl_Command command); /* 160 */
+    int (*tcl_GetErrno) (void); /* 161 */
+    const char * (*tcl_GetHostName) (void); /* 162 */
+    int (*tcl_GetInterpPath) (Tcl_Interp *interp, Tcl_Interp *childInterp); /* 163 */
+    Tcl_Interp * (*tcl_GetParent) (Tcl_Interp *interp); /* 164 */
+    const char * (*tcl_GetNameOfExecutable) (void); /* 165 */
+    Tcl_Obj * (*tcl_GetObjResult) (Tcl_Interp *interp); /* 166 */
+    int (*tcl_GetOpenFile) (Tcl_Interp *interp, const char *chanID, int forWriting, int checkUsage, void **filePtr); /* 167 */
+    Tcl_PathType (*tcl_GetPathType) (const char *path); /* 168 */
+    Tcl_Size (*tcl_Gets) (Tcl_Channel chan, Tcl_DString *dsPtr); /* 169 */
+    Tcl_Size (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 170 */
+    int (*tcl_GetServiceMode) (void); /* 171 */
+    Tcl_Interp * (*tcl_GetChild) (Tcl_Interp *interp, const char *name); /* 172 */
+    Tcl_Channel (*tcl_GetStdChannel) (int type); /* 173 */
+    void (*reserved174)(void);
+    void (*reserved175)(void);
+    const char * (*tcl_GetVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags); /* 176 */
+    void (*reserved177)(void);
+    void (*reserved178)(void);
+    int (*tcl_HideCommand) (Tcl_Interp *interp, const char *cmdName, const char *hiddenCmdToken); /* 179 */
+    int (*tcl_Init) (Tcl_Interp *interp); /* 180 */
+    void (*tcl_InitHashTable) (Tcl_HashTable *tablePtr, int keyType); /* 181 */
+    int (*tcl_InputBlocked) (Tcl_Channel chan); /* 182 */
+    int (*tcl_InputBuffered) (Tcl_Channel chan); /* 183 */
+    int (*tcl_InterpDeleted) (Tcl_Interp *interp); /* 184 */
+    int (*tcl_IsSafe) (Tcl_Interp *interp); /* 185 */
+    char * (*tcl_JoinPath) (Tcl_Size argc, const char *const *argv, Tcl_DString *resultPtr); /* 186 */
+    int (*tcl_LinkVar) (Tcl_Interp *interp, const char *varName, void *addr, int type); /* 187 */
+    void (*reserved188)(void);
+    Tcl_Channel (*tcl_MakeFileChannel) (void *handle, int mode); /* 189 */
+    void (*reserved190)(void);
+    Tcl_Channel (*tcl_MakeTcpClientChannel) (void *tcpSocket); /* 191 */
+    char * (*tcl_Merge) (Tcl_Size argc, const char *const *argv); /* 192 */
+    Tcl_HashEntry * (*tcl_NextHashEntry) (Tcl_HashSearch *searchPtr); /* 193 */
+    void (*tcl_NotifyChannel) (Tcl_Channel channel, int mask); /* 194 */
+    Tcl_Obj * (*tcl_ObjGetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags); /* 195 */
+    Tcl_Obj * (*tcl_ObjSetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, int flags); /* 196 */
+    Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp *interp, Tcl_Size argc, const char **argv, int flags); /* 197 */
+    Tcl_Channel (*tcl_OpenFileChannel) (Tcl_Interp *interp, const char *fileName, const char *modeString, int permissions); /* 198 */
+    Tcl_Channel (*tcl_OpenTcpClient) (Tcl_Interp *interp, int port, const char *address, const char *myaddr, int myport, int flags); /* 199 */
+    Tcl_Channel (*tcl_OpenTcpServer) (Tcl_Interp *interp, int port, const char *host, Tcl_TcpAcceptProc *acceptProc, void *callbackData); /* 200 */
+    void (*tcl_Preserve) (void *data); /* 201 */
+    void (*tcl_PrintDouble) (Tcl_Interp *interp, double value, char *dst); /* 202 */
+    int (*tcl_PutEnv) (const char *assignment); /* 203 */
+    const char * (*tcl_PosixError) (Tcl_Interp *interp); /* 204 */
+    void (*tcl_QueueEvent) (Tcl_Event *evPtr, int position); /* 205 */
+    Tcl_Size (*tcl_Read) (Tcl_Channel chan, char *bufPtr, Tcl_Size toRead); /* 206 */
+    void (*tcl_ReapDetachedProcs) (void); /* 207 */
+    int (*tcl_RecordAndEval) (Tcl_Interp *interp, const char *cmd, int flags); /* 208 */
+    int (*tcl_RecordAndEvalObj) (Tcl_Interp *interp, Tcl_Obj *cmdPtr, int flags); /* 209 */
+    void (*tcl_RegisterChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 210 */
+    void (*tcl_RegisterObjType) (const Tcl_ObjType *typePtr); /* 211 */
+    Tcl_RegExp (*tcl_RegExpCompile) (Tcl_Interp *interp, const char *pattern); /* 212 */
+    int (*tcl_RegExpExec) (Tcl_Interp *interp, Tcl_RegExp regexp, const char *text, const char *start); /* 213 */
+    int (*tcl_RegExpMatch) (Tcl_Interp *interp, const char *text, const char *pattern); /* 214 */
+    void (*tcl_RegExpRange) (Tcl_RegExp regexp, Tcl_Size index, const char **startPtr, const char **endPtr); /* 215 */
+    void (*tcl_Release) (void *clientData); /* 216 */
+    void (*tcl_ResetResult) (Tcl_Interp *interp); /* 217 */
+    Tcl_Size (*tcl_ScanElement) (const char *src, int *flagPtr); /* 218 */
+    Tcl_Size (*tcl_ScanCountedElement) (const char *src, Tcl_Size length, int *flagPtr); /* 219 */
+    void (*reserved220)(void);
+    int (*tcl_ServiceAll) (void); /* 221 */
+    int (*tcl_ServiceEvent) (int flags); /* 222 */
+    void (*tcl_SetAssocData) (Tcl_Interp *interp, const char *name, Tcl_InterpDeleteProc *proc, void *clientData); /* 223 */
+    void (*tcl_SetChannelBufferSize) (Tcl_Channel chan, Tcl_Size sz); /* 224 */
+    int (*tcl_SetChannelOption) (Tcl_Interp *interp, Tcl_Channel chan, const char *optionName, const char *newValue); /* 225 */
+    int (*tcl_SetCommandInfo) (Tcl_Interp *interp, const char *cmdName, const Tcl_CmdInfo *infoPtr); /* 226 */
+    void (*tcl_SetErrno) (int err); /* 227 */
+    void (*tcl_SetErrorCode) (Tcl_Interp *interp, ...); /* 228 */
+    void (*tcl_SetMaxBlockTime) (const Tcl_Time *timePtr); /* 229 */
+    void (*reserved230)(void);
+    Tcl_Size (*tcl_SetRecursionLimit) (Tcl_Interp *interp, Tcl_Size depth); /* 231 */
+    void (*reserved232)(void);
+    int (*tcl_SetServiceMode) (int mode); /* 233 */
+    void (*tcl_SetObjErrorCode) (Tcl_Interp *interp, Tcl_Obj *errorObjPtr); /* 234 */
+    void (*tcl_SetObjResult) (Tcl_Interp *interp, Tcl_Obj *resultObjPtr); /* 235 */
+    void (*tcl_SetStdChannel) (Tcl_Channel channel, int type); /* 236 */
+    void (*reserved237)(void);
+    const char * (*tcl_SetVar2) (Tcl_Interp *interp, const char *part1, const char *part2, const char *newValue, int flags); /* 238 */
+    const char * (*tcl_SignalId) (int sig); /* 239 */
+    const char * (*tcl_SignalMsg) (int sig); /* 240 */
+    void (*tcl_SourceRCFile) (Tcl_Interp *interp); /* 241 */
+    int (*tclSplitList) (Tcl_Interp *interp, const char *listStr, void *argcPtr, const char ***argvPtr); /* 242 */
+    void (*tclSplitPath) (const char *path, void *argcPtr, const char ***argvPtr); /* 243 */
+    void (*reserved244)(void);
+    void (*reserved245)(void);
+    void (*reserved246)(void);
+    void (*reserved247)(void);
+    int (*tcl_TraceVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *proc, void *clientData); /* 248 */
+    char * (*tcl_TranslateFileName) (Tcl_Interp *interp, const char *name, Tcl_DString *bufferPtr); /* 249 */
+    Tcl_Size (*tcl_Ungets) (Tcl_Channel chan, const char *str, Tcl_Size len, int atHead); /* 250 */
+    void (*tcl_UnlinkVar) (Tcl_Interp *interp, const char *varName); /* 251 */
+    int (*tcl_UnregisterChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 252 */
+    void (*reserved253)(void);
+    int (*tcl_UnsetVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags); /* 254 */
+    void (*reserved255)(void);
+    void (*tcl_UntraceVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *proc, void *clientData); /* 256 */
+    void (*tcl_UpdateLinkedVar) (Tcl_Interp *interp, const char *varName); /* 257 */
+    void (*reserved258)(void);
+    int (*tcl_UpVar2) (Tcl_Interp *interp, const char *frameName, const char *part1, const char *part2, const char *localName, int flags); /* 259 */
+    int (*tcl_VarEval) (Tcl_Interp *interp, ...); /* 260 */
+    void (*reserved261)(void);
+    void * (*tcl_VarTraceInfo2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *procPtr, void *prevClientData); /* 262 */
+    Tcl_Size (*tcl_Write) (Tcl_Channel chan, const char *s, Tcl_Size slen); /* 263 */
+    void (*tcl_WrongNumArgs) (Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[], const char *message); /* 264 */
+    int (*tcl_DumpActiveMemory) (const char *fileName); /* 265 */
+    void (*tcl_ValidateAllMemory) (const char *file, int line); /* 266 */
+    void (*reserved267)(void);
+    void (*reserved268)(void);
+    char * (*tcl_HashStats) (Tcl_HashTable *tablePtr); /* 269 */
+    const char * (*tcl_ParseVar) (Tcl_Interp *interp, const char *start, const char **termPtr); /* 270 */
+    void (*reserved271)(void);
+    const char * (*tcl_PkgPresentEx) (Tcl_Interp *interp, const char *name, const char *version, int exact, void *clientDataPtr); /* 272 */
+    void (*reserved273)(void);
+    void (*reserved274)(void);
+    void (*reserved275)(void);
+    void (*reserved276)(void);
+    Tcl_Pid (*tcl_WaitPid) (Tcl_Pid pid, int *statPtr, int options); /* 277 */
+    void (*reserved278)(void);
+    void (*tcl_GetVersion) (int *major, int *minor, int *patchLevel, int *type); /* 279 */
+    void (*tcl_InitMemory) (Tcl_Interp *interp); /* 280 */
+    Tcl_Channel (*tcl_StackChannel) (Tcl_Interp *interp, const Tcl_ChannelType *typePtr, void *instanceData, int mask, Tcl_Channel prevChan); /* 281 */
+    int (*tcl_UnstackChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 282 */
+    Tcl_Channel (*tcl_GetStackedChannel) (Tcl_Channel chan); /* 283 */
+    void (*tcl_SetMainLoop) (Tcl_MainLoopProc *proc); /* 284 */
+    void (*reserved285)(void);
+    void (*tcl_AppendObjToObj) (Tcl_Obj *objPtr, Tcl_Obj *appendObjPtr); /* 286 */
+    Tcl_Encoding (*tcl_CreateEncoding) (const Tcl_EncodingType *typePtr); /* 287 */
+    void (*tcl_CreateThreadExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 288 */
+    void (*tcl_DeleteThreadExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 289 */
+    void (*reserved290)(void);
+    int (*tcl_EvalEx) (Tcl_Interp *interp, const char *script, Tcl_Size numBytes, int flags); /* 291 */
+    int (*tcl_EvalObjv) (Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[], int flags); /* 292 */
+    int (*tcl_EvalObjEx) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 293 */
+    TCL_NORETURN1 void (*tcl_ExitThread) (int status); /* 294 */
+    int (*tcl_ExternalToUtf) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 295 */
+    char * (*tcl_ExternalToUtfDString) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr); /* 296 */
+    void (*tcl_FinalizeThread) (void); /* 297 */
+    void (*tcl_FinalizeNotifier) (void *clientData); /* 298 */
+    void (*tcl_FreeEncoding) (Tcl_Encoding encoding); /* 299 */
+    Tcl_ThreadId (*tcl_GetCurrentThread) (void); /* 300 */
+    Tcl_Encoding (*tcl_GetEncoding) (Tcl_Interp *interp, const char *name); /* 301 */
+    const char * (*tcl_GetEncodingName) (Tcl_Encoding encoding); /* 302 */
+    void (*tcl_GetEncodingNames) (Tcl_Interp *interp); /* 303 */
+    int (*tcl_GetIndexFromObjStruct) (Tcl_Interp *interp, Tcl_Obj *objPtr, const void *tablePtr, Tcl_Size offset, const char *msg, int flags, void *indexPtr); /* 304 */
+    void * (*tcl_GetThreadData) (Tcl_ThreadDataKey *keyPtr, Tcl_Size size); /* 305 */
+    Tcl_Obj * (*tcl_GetVar2Ex) (Tcl_Interp *interp, const char *part1, const char *part2, int flags); /* 306 */
+    void * (*tcl_InitNotifier) (void); /* 307 */
+    void (*tcl_MutexLock) (Tcl_Mutex *mutexPtr); /* 308 */
+    void (*tcl_MutexUnlock) (Tcl_Mutex *mutexPtr); /* 309 */
+    void (*tcl_ConditionNotify) (Tcl_Condition *condPtr); /* 310 */
+    void (*tcl_ConditionWait) (Tcl_Condition *condPtr, Tcl_Mutex *mutexPtr, const Tcl_Time *timePtr); /* 311 */
+    Tcl_Size (*tclNumUtfChars) (const char *src, Tcl_Size length); /* 312 */
+    Tcl_Size (*tcl_ReadChars) (Tcl_Channel channel, Tcl_Obj *objPtr, Tcl_Size charsToRead, int appendFlag); /* 313 */
+    void (*reserved314)(void);
+    void (*reserved315)(void);
+    int (*tcl_SetSystemEncoding) (Tcl_Interp *interp, const char *name); /* 316 */
+    Tcl_Obj * (*tcl_SetVar2Ex) (Tcl_Interp *interp, const char *part1, const char *part2, Tcl_Obj *newValuePtr, int flags); /* 317 */
+    void (*tcl_ThreadAlert) (Tcl_ThreadId threadId); /* 318 */
+    void (*tcl_ThreadQueueEvent) (Tcl_ThreadId threadId, Tcl_Event *evPtr, int position); /* 319 */
+    int (*tcl_UniCharAtIndex) (const char *src, Tcl_Size index); /* 320 */
+    int (*tcl_UniCharToLower) (int ch); /* 321 */
+    int (*tcl_UniCharToTitle) (int ch); /* 322 */
+    int (*tcl_UniCharToUpper) (int ch); /* 323 */
+    Tcl_Size (*tcl_UniCharToUtf) (int ch, char *buf); /* 324 */
+    const char * (*tclUtfAtIndex) (const char *src, Tcl_Size index); /* 325 */
+    int (*tclUtfCharComplete) (const char *src, Tcl_Size length); /* 326 */
+    Tcl_Size (*tcl_UtfBackslash) (const char *src, int *readPtr, char *dst); /* 327 */
+    const char * (*tcl_UtfFindFirst) (const char *src, int ch); /* 328 */
+    const char * (*tcl_UtfFindLast) (const char *src, int ch); /* 329 */
+    const char * (*tclUtfNext) (const char *src); /* 330 */
+    const char * (*tclUtfPrev) (const char *src, const char *start); /* 331 */
+    int (*tcl_UtfToExternal) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 332 */
+    char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr); /* 333 */
+    Tcl_Size (*tcl_UtfToLower) (char *src); /* 334 */
+    Tcl_Size (*tcl_UtfToTitle) (char *src); /* 335 */
+    Tcl_Size (*tcl_UtfToChar16) (const char *src, unsigned short *chPtr); /* 336 */
+    Tcl_Size (*tcl_UtfToUpper) (char *src); /* 337 */
+    Tcl_Size (*tcl_WriteChars) (Tcl_Channel chan, const char *src, Tcl_Size srcLen); /* 338 */
+    Tcl_Size (*tcl_WriteObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 339 */
+    char * (*tcl_GetString) (Tcl_Obj *objPtr); /* 340 */
+    void (*reserved341)(void);
+    void (*reserved342)(void);
+    void (*tcl_AlertNotifier) (void *clientData); /* 343 */
+    void (*tcl_ServiceModeHook) (int mode); /* 344 */
+    int (*tcl_UniCharIsAlnum) (int ch); /* 345 */
+    int (*tcl_UniCharIsAlpha) (int ch); /* 346 */
+    int (*tcl_UniCharIsDigit) (int ch); /* 347 */
+    int (*tcl_UniCharIsLower) (int ch); /* 348 */
+    int (*tcl_UniCharIsSpace) (int ch); /* 349 */
+    int (*tcl_UniCharIsUpper) (int ch); /* 350 */
+    int (*tcl_UniCharIsWordChar) (int ch); /* 351 */
+    Tcl_Size (*tcl_Char16Len) (const unsigned short *uniStr); /* 352 */
+    void (*reserved353)(void);
+    char * (*tcl_Char16ToUtfDString) (const unsigned short *uniStr, Tcl_Size uniLength, Tcl_DString *dsPtr); /* 354 */
+    unsigned short * (*tcl_UtfToChar16DString) (const char *src, Tcl_Size length, Tcl_DString *dsPtr); /* 355 */
+    Tcl_RegExp (*tcl_GetRegExpFromObj) (Tcl_Interp *interp, Tcl_Obj *patObj, int flags); /* 356 */
+    void (*reserved357)(void);
+    void (*tcl_FreeParse) (Tcl_Parse *parsePtr); /* 358 */
+    void (*tcl_LogCommandInfo) (Tcl_Interp *interp, const char *script, const char *command, Tcl_Size length); /* 359 */
+    int (*tcl_ParseBraces) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 360 */
+    int (*tcl_ParseCommand) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, int nested, Tcl_Parse *parsePtr); /* 361 */
+    int (*tcl_ParseExpr) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr); /* 362 */
+    int (*tcl_ParseQuotedString) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 363 */
+    int (*tcl_ParseVarName) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr, int append); /* 364 */
+    char * (*tcl_GetCwd) (Tcl_Interp *interp, Tcl_DString *cwdPtr); /* 365 */
+    int (*tcl_Chdir) (const char *dirName); /* 366 */
+    int (*tcl_Access) (const char *path, int mode); /* 367 */
+    int (*tcl_Stat) (const char *path, struct stat *bufPtr); /* 368 */
+    int (*tcl_UtfNcmp) (const char *s1, const char *s2, size_t n); /* 369 */
+    int (*tcl_UtfNcasecmp) (const char *s1, const char *s2, size_t n); /* 370 */
+    int (*tcl_StringCaseMatch) (const char *str, const char *pattern, int nocase); /* 371 */
+    int (*tcl_UniCharIsControl) (int ch); /* 372 */
+    int (*tcl_UniCharIsGraph) (int ch); /* 373 */
+    int (*tcl_UniCharIsPrint) (int ch); /* 374 */
+    int (*tcl_UniCharIsPunct) (int ch); /* 375 */
+    int (*tcl_RegExpExecObj) (Tcl_Interp *interp, Tcl_RegExp regexp, Tcl_Obj *textObj, Tcl_Size offset, Tcl_Size nmatches, int flags); /* 376 */
+    void (*tcl_RegExpGetInfo) (Tcl_RegExp regexp, Tcl_RegExpInfo *infoPtr); /* 377 */
+    Tcl_Obj * (*tcl_NewUnicodeObj) (const Tcl_UniChar *unicode, Tcl_Size numChars); /* 378 */
+    void (*tcl_SetUnicodeObj) (Tcl_Obj *objPtr, const Tcl_UniChar *unicode, Tcl_Size numChars); /* 379 */
+    Tcl_Size (*tclGetCharLength) (Tcl_Obj *objPtr); /* 380 */
+    int (*tclGetUniChar) (Tcl_Obj *objPtr, Tcl_Size index); /* 381 */
+    void (*reserved382)(void);
+    Tcl_Obj * (*tclGetRange) (Tcl_Obj *objPtr, Tcl_Size first, Tcl_Size last); /* 383 */
+    void (*tcl_AppendUnicodeToObj) (Tcl_Obj *objPtr, const Tcl_UniChar *unicode, Tcl_Size length); /* 384 */
+    int (*tcl_RegExpMatchObj) (Tcl_Interp *interp, Tcl_Obj *textObj, Tcl_Obj *patternObj); /* 385 */
+    void (*tcl_SetNotifier) (const Tcl_NotifierProcs *notifierProcPtr); /* 386 */
+    Tcl_Mutex * (*tcl_GetAllocMutex) (void); /* 387 */
+    int (*tcl_GetChannelNames) (Tcl_Interp *interp); /* 388 */
+    int (*tcl_GetChannelNamesEx) (Tcl_Interp *interp, const char *pattern); /* 389 */
+    int (*tcl_ProcObjCmd) (void *clientData, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]); /* 390 */
+    void (*tcl_ConditionFinalize) (Tcl_Condition *condPtr); /* 391 */
+    void (*tcl_MutexFinalize) (Tcl_Mutex *mutex); /* 392 */
+    int (*tcl_CreateThread) (Tcl_ThreadId *idPtr, Tcl_ThreadCreateProc *proc, void *clientData, TCL_HASH_TYPE stackSize, int flags); /* 393 */
+    Tcl_Size (*tcl_ReadRaw) (Tcl_Channel chan, char *dst, Tcl_Size bytesToRead); /* 394 */
+    Tcl_Size (*tcl_WriteRaw) (Tcl_Channel chan, const char *src, Tcl_Size srcLen); /* 395 */
+    Tcl_Channel (*tcl_GetTopChannel) (Tcl_Channel chan); /* 396 */
+    int (*tcl_ChannelBuffered) (Tcl_Channel chan); /* 397 */
+    const char * (*tcl_ChannelName) (const Tcl_ChannelType *chanTypePtr); /* 398 */
+    Tcl_ChannelTypeVersion (*tcl_ChannelVersion) (const Tcl_ChannelType *chanTypePtr); /* 399 */
+    Tcl_DriverBlockModeProc * (*tcl_ChannelBlockModeProc) (const Tcl_ChannelType *chanTypePtr); /* 400 */
+    void (*reserved401)(void);
+    Tcl_DriverClose2Proc * (*tcl_ChannelClose2Proc) (const Tcl_ChannelType *chanTypePtr); /* 402 */
+    Tcl_DriverInputProc * (*tcl_ChannelInputProc) (const Tcl_ChannelType *chanTypePtr); /* 403 */
+    Tcl_DriverOutputProc * (*tcl_ChannelOutputProc) (const Tcl_ChannelType *chanTypePtr); /* 404 */
+    void (*reserved405)(void);
+    Tcl_DriverSetOptionProc * (*tcl_ChannelSetOptionProc) (const Tcl_ChannelType *chanTypePtr); /* 406 */
+    Tcl_DriverGetOptionProc * (*tcl_ChannelGetOptionProc) (const Tcl_ChannelType *chanTypePtr); /* 407 */
+    Tcl_DriverWatchProc * (*tcl_ChannelWatchProc) (const Tcl_ChannelType *chanTypePtr); /* 408 */
+    Tcl_DriverGetHandleProc * (*tcl_ChannelGetHandleProc) (const Tcl_ChannelType *chanTypePtr); /* 409 */
+    Tcl_DriverFlushProc * (*tcl_ChannelFlushProc) (const Tcl_ChannelType *chanTypePtr); /* 410 */
+    Tcl_DriverHandlerProc * (*tcl_ChannelHandlerProc) (const Tcl_ChannelType *chanTypePtr); /* 411 */
+    int (*tcl_JoinThread) (Tcl_ThreadId threadId, int *result); /* 412 */
+    int (*tcl_IsChannelShared) (Tcl_Channel channel); /* 413 */
+    int (*tcl_IsChannelRegistered) (Tcl_Interp *interp, Tcl_Channel channel); /* 414 */
+    void (*tcl_CutChannel) (Tcl_Channel channel); /* 415 */
+    void (*tcl_SpliceChannel) (Tcl_Channel channel); /* 416 */
+    void (*tcl_ClearChannelHandlers) (Tcl_Channel channel); /* 417 */
+    int (*tcl_IsChannelExisting) (const char *channelName); /* 418 */
+    void (*reserved419)(void);
+    void (*reserved420)(void);
+    void (*reserved421)(void);
+    void (*reserved422)(void);
+    void (*tcl_InitCustomHashTable) (Tcl_HashTable *tablePtr, int keyType, const Tcl_HashKeyType *typePtr); /* 423 */
+    void (*tcl_InitObjHashTable) (Tcl_HashTable *tablePtr); /* 424 */
+    void * (*tcl_CommandTraceInfo) (Tcl_Interp *interp, const char *varName, int flags, Tcl_CommandTraceProc *procPtr, void *prevClientData); /* 425 */
+    int (*tcl_TraceCommand) (Tcl_Interp *interp, const char *varName, int flags, Tcl_CommandTraceProc *proc, void *clientData); /* 426 */
+    void (*tcl_UntraceCommand) (Tcl_Interp *interp, const char *varName, int flags, Tcl_CommandTraceProc *proc, void *clientData); /* 427 */
+    void * (*tcl_AttemptAlloc) (TCL_HASH_TYPE size); /* 428 */
+    void * (*tcl_AttemptDbCkalloc) (TCL_HASH_TYPE size, const char *file, int line); /* 429 */
+    void * (*tcl_AttemptRealloc) (void *ptr, TCL_HASH_TYPE size); /* 430 */
+    void * (*tcl_AttemptDbCkrealloc) (void *ptr, TCL_HASH_TYPE size, const char *file, int line); /* 431 */
+    int (*tcl_AttemptSetObjLength) (Tcl_Obj *objPtr, Tcl_Size length); /* 432 */
+    Tcl_ThreadId (*tcl_GetChannelThread) (Tcl_Channel channel); /* 433 */
+    Tcl_UniChar * (*tclGetUnicodeFromObj) (Tcl_Obj *objPtr, void *lengthPtr); /* 434 */
+    void (*reserved435)(void);
+    void (*reserved436)(void);
+    Tcl_Obj * (*tcl_SubstObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 437 */
+    int (*tcl_DetachChannel) (Tcl_Interp *interp, Tcl_Channel channel); /* 438 */
+    int (*tcl_IsStandardChannel) (Tcl_Channel channel); /* 439 */
+    int (*tcl_FSCopyFile) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr); /* 440 */
+    int (*tcl_FSCopyDirectory) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr); /* 441 */
+    int (*tcl_FSCreateDirectory) (Tcl_Obj *pathPtr); /* 442 */
+    int (*tcl_FSDeleteFile) (Tcl_Obj *pathPtr); /* 443 */
+    int (*tcl_FSLoadFile) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *sym1, const char *sym2, Tcl_LibraryInitProc **proc1Ptr, Tcl_LibraryInitProc **proc2Ptr, Tcl_LoadHandle *handlePtr, Tcl_FSUnloadFileProc **unloadProcPtr); /* 444 */
+    int (*tcl_FSMatchInDirectory) (Tcl_Interp *interp, Tcl_Obj *result, Tcl_Obj *pathPtr, const char *pattern, Tcl_GlobTypeData *types); /* 445 */
+    Tcl_Obj * (*tcl_FSLink) (Tcl_Obj *pathPtr, Tcl_Obj *toPtr, int linkAction); /* 446 */
+    int (*tcl_FSRemoveDirectory) (Tcl_Obj *pathPtr, int recursive, Tcl_Obj **errorPtr); /* 447 */
+    int (*tcl_FSRenameFile) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr); /* 448 */
+    int (*tcl_FSLstat) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf); /* 449 */
+    int (*tcl_FSUtime) (Tcl_Obj *pathPtr, struct utimbuf *tval); /* 450 */
+    int (*tcl_FSFileAttrsGet) (Tcl_Interp *interp, int index, Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef); /* 451 */
+    int (*tcl_FSFileAttrsSet) (Tcl_Interp *interp, int index, Tcl_Obj *pathPtr, Tcl_Obj *objPtr); /* 452 */
+    const char *const * (*tcl_FSFileAttrStrings) (Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef); /* 453 */
+    int (*tcl_FSStat) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf); /* 454 */
+    int (*tcl_FSAccess) (Tcl_Obj *pathPtr, int mode); /* 455 */
+    Tcl_Channel (*tcl_FSOpenFileChannel) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *modeString, int permissions); /* 456 */
+    Tcl_Obj * (*tcl_FSGetCwd) (Tcl_Interp *interp); /* 457 */
+    int (*tcl_FSChdir) (Tcl_Obj *pathPtr); /* 458 */
+    int (*tcl_FSConvertToPathType) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 459 */
+    Tcl_Obj * (*tcl_FSJoinPath) (Tcl_Obj *listObj, Tcl_Size elements); /* 460 */
+    Tcl_Obj * (*tclFSSplitPath) (Tcl_Obj *pathPtr, void *lenPtr); /* 461 */
+    int (*tcl_FSEqualPaths) (Tcl_Obj *firstPtr, Tcl_Obj *secondPtr); /* 462 */
+    Tcl_Obj * (*tcl_FSGetNormalizedPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 463 */
+    Tcl_Obj * (*tcl_FSJoinToPath) (Tcl_Obj *pathPtr, Tcl_Size objc, Tcl_Obj *const objv[]); /* 464 */
+    void * (*tcl_FSGetInternalRep) (Tcl_Obj *pathPtr, const Tcl_Filesystem *fsPtr); /* 465 */
+    Tcl_Obj * (*tcl_FSGetTranslatedPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 466 */
+    int (*tcl_FSEvalFile) (Tcl_Interp *interp, Tcl_Obj *fileName); /* 467 */
+    Tcl_Obj * (*tcl_FSNewNativePath) (const Tcl_Filesystem *fromFilesystem, void *clientData); /* 468 */
+    const void * (*tcl_FSGetNativePath) (Tcl_Obj *pathPtr); /* 469 */
+    Tcl_Obj * (*tcl_FSFileSystemInfo) (Tcl_Obj *pathPtr); /* 470 */
+    Tcl_Obj * (*tcl_FSPathSeparator) (Tcl_Obj *pathPtr); /* 471 */
+    Tcl_Obj * (*tcl_FSListVolumes) (void); /* 472 */
+    int (*tcl_FSRegister) (void *clientData, const Tcl_Filesystem *fsPtr); /* 473 */
+    int (*tcl_FSUnregister) (const Tcl_Filesystem *fsPtr); /* 474 */
+    void * (*tcl_FSData) (const Tcl_Filesystem *fsPtr); /* 475 */
+    const char * (*tcl_FSGetTranslatedStringPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 476 */
+    const Tcl_Filesystem * (*tcl_FSGetFileSystemForPath) (Tcl_Obj *pathPtr); /* 477 */
+    Tcl_PathType (*tcl_FSGetPathType) (Tcl_Obj *pathPtr); /* 478 */
+    int (*tcl_OutputBuffered) (Tcl_Channel chan); /* 479 */
+    void (*tcl_FSMountsChanged) (const Tcl_Filesystem *fsPtr); /* 480 */
+    int (*tcl_EvalTokensStandard) (Tcl_Interp *interp, Tcl_Token *tokenPtr, Tcl_Size count); /* 481 */
+    void (*tcl_GetTime) (Tcl_Time *timeBuf); /* 482 */
+    Tcl_Trace (*tcl_CreateObjTrace) (Tcl_Interp *interp, Tcl_Size level, int flags, Tcl_CmdObjTraceProc *objProc, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 483 */
+    int (*tcl_GetCommandInfoFromToken) (Tcl_Command token, Tcl_CmdInfo *infoPtr); /* 484 */
+    int (*tcl_SetCommandInfoFromToken) (Tcl_Command token, const Tcl_CmdInfo *infoPtr); /* 485 */
+    Tcl_Obj * (*tcl_DbNewWideIntObj) (Tcl_WideInt wideValue, const char *file, int line); /* 486 */
+    int (*tcl_GetWideIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideInt *widePtr); /* 487 */
+    Tcl_Obj * (*tcl_NewWideIntObj) (Tcl_WideInt wideValue); /* 488 */
+    void (*tcl_SetWideIntObj) (Tcl_Obj *objPtr, Tcl_WideInt wideValue); /* 489 */
+    Tcl_StatBuf * (*tcl_AllocStatBuf) (void); /* 490 */
+    long long (*tcl_Seek) (Tcl_Channel chan, long long offset, int mode); /* 491 */
+    long long (*tcl_Tell) (Tcl_Channel chan); /* 492 */
+    Tcl_DriverWideSeekProc * (*tcl_ChannelWideSeekProc) (const Tcl_ChannelType *chanTypePtr); /* 493 */
+    int (*tcl_DictObjPut) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr, Tcl_Obj *valuePtr); /* 494 */
+    int (*tcl_DictObjGet) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr, Tcl_Obj **valuePtrPtr); /* 495 */
+    int (*tcl_DictObjRemove) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr); /* 496 */
+    int (*tclDictObjSize) (Tcl_Interp *interp, Tcl_Obj *dictPtr, void *sizePtr); /* 497 */
+    int (*tcl_DictObjFirst) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_DictSearch *searchPtr, Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr, int *donePtr); /* 498 */
+    void (*tcl_DictObjNext) (Tcl_DictSearch *searchPtr, Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr, int *donePtr); /* 499 */
+    void (*tcl_DictObjDone) (Tcl_DictSearch *searchPtr); /* 500 */
+    int (*tcl_DictObjPutKeyList) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Size keyc, Tcl_Obj *const *keyv, Tcl_Obj *valuePtr); /* 501 */
+    int (*tcl_DictObjRemoveKeyList) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Size keyc, Tcl_Obj *const *keyv); /* 502 */
+    Tcl_Obj * (*tcl_NewDictObj) (void); /* 503 */
+    Tcl_Obj * (*tcl_DbNewDictObj) (const char *file, int line); /* 504 */
+    void (*tcl_RegisterConfig) (Tcl_Interp *interp, const char *pkgName, const Tcl_Config *configuration, const char *valEncoding); /* 505 */
+    Tcl_Namespace * (*tcl_CreateNamespace) (Tcl_Interp *interp, const char *name, void *clientData, Tcl_NamespaceDeleteProc *deleteProc); /* 506 */
+    void (*tcl_DeleteNamespace) (Tcl_Namespace *nsPtr); /* 507 */
+    int (*tcl_AppendExportList) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *objPtr); /* 508 */
+    int (*tcl_Export) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern, int resetListFirst); /* 509 */
+    int (*tcl_Import) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern, int allowOverwrite); /* 510 */
+    int (*tcl_ForgetImport) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern); /* 511 */
+    Tcl_Namespace * (*tcl_GetCurrentNamespace) (Tcl_Interp *interp); /* 512 */
+    Tcl_Namespace * (*tcl_GetGlobalNamespace) (Tcl_Interp *interp); /* 513 */
+    Tcl_Namespace * (*tcl_FindNamespace) (Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags); /* 514 */
+    Tcl_Command (*tcl_FindCommand) (Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags); /* 515 */
+    Tcl_Command (*tcl_GetCommandFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 516 */
+    void (*tcl_GetCommandFullName) (Tcl_Interp *interp, Tcl_Command command, Tcl_Obj *objPtr); /* 517 */
+    int (*tcl_FSEvalFileEx) (Tcl_Interp *interp, Tcl_Obj *fileName, const char *encodingName); /* 518 */
+    void (*reserved519)(void);
+    void (*tcl_LimitAddHandler) (Tcl_Interp *interp, int type, Tcl_LimitHandlerProc *handlerProc, void *clientData, Tcl_LimitHandlerDeleteProc *deleteProc); /* 520 */
+    void (*tcl_LimitRemoveHandler) (Tcl_Interp *interp, int type, Tcl_LimitHandlerProc *handlerProc, void *clientData); /* 521 */
+    int (*tcl_LimitReady) (Tcl_Interp *interp); /* 522 */
+    int (*tcl_LimitCheck) (Tcl_Interp *interp); /* 523 */
+    int (*tcl_LimitExceeded) (Tcl_Interp *interp); /* 524 */
+    void (*tcl_LimitSetCommands) (Tcl_Interp *interp, Tcl_Size commandLimit); /* 525 */
+    void (*tcl_LimitSetTime) (Tcl_Interp *interp, Tcl_Time *timeLimitPtr); /* 526 */
+    void (*tcl_LimitSetGranularity) (Tcl_Interp *interp, int type, int granularity); /* 527 */
+    int (*tcl_LimitTypeEnabled) (Tcl_Interp *interp, int type); /* 528 */
+    int (*tcl_LimitTypeExceeded) (Tcl_Interp *interp, int type); /* 529 */
+    void (*tcl_LimitTypeSet) (Tcl_Interp *interp, int type); /* 530 */
+    void (*tcl_LimitTypeReset) (Tcl_Interp *interp, int type); /* 531 */
+    int (*tcl_LimitGetCommands) (Tcl_Interp *interp); /* 532 */
+    void (*tcl_LimitGetTime) (Tcl_Interp *interp, Tcl_Time *timeLimitPtr); /* 533 */
+    int (*tcl_LimitGetGranularity) (Tcl_Interp *interp, int type); /* 534 */
+    Tcl_InterpState (*tcl_SaveInterpState) (Tcl_Interp *interp, int status); /* 535 */
+    int (*tcl_RestoreInterpState) (Tcl_Interp *interp, Tcl_InterpState state); /* 536 */
+    void (*tcl_DiscardInterpState) (Tcl_InterpState state); /* 537 */
+    int (*tcl_SetReturnOptions) (Tcl_Interp *interp, Tcl_Obj *options); /* 538 */
+    Tcl_Obj * (*tcl_GetReturnOptions) (Tcl_Interp *interp, int result); /* 539 */
+    int (*tcl_IsEnsemble) (Tcl_Command token); /* 540 */
+    Tcl_Command (*tcl_CreateEnsemble) (Tcl_Interp *interp, const char *name, Tcl_Namespace *namespacePtr, int flags); /* 541 */
+    Tcl_Command (*tcl_FindEnsemble) (Tcl_Interp *interp, Tcl_Obj *cmdNameObj, int flags); /* 542 */
+    int (*tcl_SetEnsembleSubcommandList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *subcmdList); /* 543 */
+    int (*tcl_SetEnsembleMappingDict) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *mapDict); /* 544 */
+    int (*tcl_SetEnsembleUnknownHandler) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *unknownList); /* 545 */
+    int (*tcl_SetEnsembleFlags) (Tcl_Interp *interp, Tcl_Command token, int flags); /* 546 */
+    int (*tcl_GetEnsembleSubcommandList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **subcmdListPtr); /* 547 */
+    int (*tcl_GetEnsembleMappingDict) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **mapDictPtr); /* 548 */
+    int (*tcl_GetEnsembleUnknownHandler) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **unknownListPtr); /* 549 */
+    int (*tcl_GetEnsembleFlags) (Tcl_Interp *interp, Tcl_Command token, int *flagsPtr); /* 550 */
+    int (*tcl_GetEnsembleNamespace) (Tcl_Interp *interp, Tcl_Command token, Tcl_Namespace **namespacePtrPtr); /* 551 */
+    void (*tcl_SetTimeProc) (Tcl_GetTimeProc *getProc, Tcl_ScaleTimeProc *scaleProc, void *clientData); /* 552 */
+    void (*tcl_QueryTimeProc) (Tcl_GetTimeProc **getProc, Tcl_ScaleTimeProc **scaleProc, void **clientData); /* 553 */
+    Tcl_DriverThreadActionProc * (*tcl_ChannelThreadActionProc) (const Tcl_ChannelType *chanTypePtr); /* 554 */
+    Tcl_Obj * (*tcl_NewBignumObj) (void *value); /* 555 */
+    Tcl_Obj * (*tcl_DbNewBignumObj) (void *value, const char *file, int line); /* 556 */
+    void (*tcl_SetBignumObj) (Tcl_Obj *obj, void *value); /* 557 */
+    int (*tcl_GetBignumFromObj) (Tcl_Interp *interp, Tcl_Obj *obj, void *value); /* 558 */
+    int (*tcl_TakeBignumFromObj) (Tcl_Interp *interp, Tcl_Obj *obj, void *value); /* 559 */
+    int (*tcl_TruncateChannel) (Tcl_Channel chan, long long length); /* 560 */
+    Tcl_DriverTruncateProc * (*tcl_ChannelTruncateProc) (const Tcl_ChannelType *chanTypePtr); /* 561 */
+    void (*tcl_SetChannelErrorInterp) (Tcl_Interp *interp, Tcl_Obj *msg); /* 562 */
+    void (*tcl_GetChannelErrorInterp) (Tcl_Interp *interp, Tcl_Obj **msg); /* 563 */
+    void (*tcl_SetChannelError) (Tcl_Channel chan, Tcl_Obj *msg); /* 564 */
+    void (*tcl_GetChannelError) (Tcl_Channel chan, Tcl_Obj **msg); /* 565 */
+    int (*tcl_InitBignumFromDouble) (Tcl_Interp *interp, double initval, void *toInit); /* 566 */
+    Tcl_Obj * (*tcl_GetNamespaceUnknownHandler) (Tcl_Interp *interp, Tcl_Namespace *nsPtr); /* 567 */
+    int (*tcl_SetNamespaceUnknownHandler) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *handlerPtr); /* 568 */
+    int (*tcl_GetEncodingFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Encoding *encodingPtr); /* 569 */
+    Tcl_Obj * (*tcl_GetEncodingSearchPath) (void); /* 570 */
+    int (*tcl_SetEncodingSearchPath) (Tcl_Obj *searchPath); /* 571 */
+    const char * (*tcl_GetEncodingNameFromEnvironment) (Tcl_DString *bufPtr); /* 572 */
+    int (*tcl_PkgRequireProc) (Tcl_Interp *interp, const char *name, Tcl_Size objc, Tcl_Obj *const objv[], void *clientDataPtr); /* 573 */
+    void (*tcl_AppendObjToErrorInfo) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 574 */
+    void (*tcl_AppendLimitedToObj) (Tcl_Obj *objPtr, const char *bytes, Tcl_Size length, Tcl_Size limit, const char *ellipsis); /* 575 */
+    Tcl_Obj * (*tcl_Format) (Tcl_Interp *interp, const char *format, Tcl_Size objc, Tcl_Obj *const objv[]); /* 576 */
+    int (*tcl_AppendFormatToObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, const char *format, Tcl_Size objc, Tcl_Obj *const objv[]); /* 577 */
+    Tcl_Obj * (*tcl_ObjPrintf) (const char *format, ...) TCL_FORMAT_PRINTF(1, 2); /* 578 */
+    void (*tcl_AppendPrintfToObj) (Tcl_Obj *objPtr, const char *format, ...) TCL_FORMAT_PRINTF(2, 3); /* 579 */
+    int (*tcl_CancelEval) (Tcl_Interp *interp, Tcl_Obj *resultObjPtr, void *clientData, int flags); /* 580 */
+    int (*tcl_Canceled) (Tcl_Interp *interp, int flags); /* 581 */
+    int (*tcl_CreatePipe) (Tcl_Interp *interp, Tcl_Channel *rchan, Tcl_Channel *wchan, int flags); /* 582 */
+    Tcl_Command (*tcl_NRCreateCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc *proc, Tcl_ObjCmdProc *nreProc, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 583 */
+    int (*tcl_NREvalObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 584 */
+    int (*tcl_NREvalObjv) (Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[], int flags); /* 585 */
+    int (*tcl_NRCmdSwap) (Tcl_Interp *interp, Tcl_Command cmd, Tcl_Size objc, Tcl_Obj *const objv[], int flags); /* 586 */
+    void (*tcl_NRAddCallback) (Tcl_Interp *interp, Tcl_NRPostProc *postProcPtr, void *data0, void *data1, void *data2, void *data3); /* 587 */
+    int (*tcl_NRCallObjProc) (Tcl_Interp *interp, Tcl_ObjCmdProc *objProc, void *clientData, Tcl_Size objc, Tcl_Obj *const objv[]); /* 588 */
+    unsigned (*tcl_GetFSDeviceFromStat) (const Tcl_StatBuf *statPtr); /* 589 */
+    unsigned (*tcl_GetFSInodeFromStat) (const Tcl_StatBuf *statPtr); /* 590 */
+    unsigned (*tcl_GetModeFromStat) (const Tcl_StatBuf *statPtr); /* 591 */
+    int (*tcl_GetLinkCountFromStat) (const Tcl_StatBuf *statPtr); /* 592 */
+    int (*tcl_GetUserIdFromStat) (const Tcl_StatBuf *statPtr); /* 593 */
+    int (*tcl_GetGroupIdFromStat) (const Tcl_StatBuf *statPtr); /* 594 */
+    int (*tcl_GetDeviceTypeFromStat) (const Tcl_StatBuf *statPtr); /* 595 */
+    long long (*tcl_GetAccessTimeFromStat) (const Tcl_StatBuf *statPtr); /* 596 */
+    long long (*tcl_GetModificationTimeFromStat) (const Tcl_StatBuf *statPtr); /* 597 */
+    long long (*tcl_GetChangeTimeFromStat) (const Tcl_StatBuf *statPtr); /* 598 */
+    unsigned long long (*tcl_GetSizeFromStat) (const Tcl_StatBuf *statPtr); /* 599 */
+    unsigned long long (*tcl_GetBlocksFromStat) (const Tcl_StatBuf *statPtr); /* 600 */
+    unsigned (*tcl_GetBlockSizeFromStat) (const Tcl_StatBuf *statPtr); /* 601 */
+    int (*tcl_SetEnsembleParameterList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *paramList); /* 602 */
+    int (*tcl_GetEnsembleParameterList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **paramListPtr); /* 603 */
+    int (*tclParseArgsObjv) (Tcl_Interp *interp, const Tcl_ArgvInfo *argTable, void *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv); /* 604 */
+    int (*tcl_GetErrorLine) (Tcl_Interp *interp); /* 605 */
+    void (*tcl_SetErrorLine) (Tcl_Interp *interp, int lineNum); /* 606 */
+    void (*tcl_TransferResult) (Tcl_Interp *sourceInterp, int code, Tcl_Interp *targetInterp); /* 607 */
+    int (*tcl_InterpActive) (Tcl_Interp *interp); /* 608 */
+    void (*tcl_BackgroundException) (Tcl_Interp *interp, int code); /* 609 */
+    int (*tcl_ZlibDeflate) (Tcl_Interp *interp, int format, Tcl_Obj *data, int level, Tcl_Obj *gzipHeaderDictObj); /* 610 */
+    int (*tcl_ZlibInflate) (Tcl_Interp *interp, int format, Tcl_Obj *data, Tcl_Size buffersize, Tcl_Obj *gzipHeaderDictObj); /* 611 */
+    unsigned int (*tcl_ZlibCRC32) (unsigned int crc, const unsigned char *buf, Tcl_Size len); /* 612 */
+    unsigned int (*tcl_ZlibAdler32) (unsigned int adler, const unsigned char *buf, Tcl_Size len); /* 613 */
+    int (*tcl_ZlibStreamInit) (Tcl_Interp *interp, int mode, int format, int level, Tcl_Obj *dictObj, Tcl_ZlibStream *zshandle); /* 614 */
+    Tcl_Obj * (*tcl_ZlibStreamGetCommandName) (Tcl_ZlibStream zshandle); /* 615 */
+    int (*tcl_ZlibStreamEof) (Tcl_ZlibStream zshandle); /* 616 */
+    int (*tcl_ZlibStreamChecksum) (Tcl_ZlibStream zshandle); /* 617 */
+    int (*tcl_ZlibStreamPut) (Tcl_ZlibStream zshandle, Tcl_Obj *data, int flush); /* 618 */
+    int (*tcl_ZlibStreamGet) (Tcl_ZlibStream zshandle, Tcl_Obj *data, Tcl_Size count); /* 619 */
+    int (*tcl_ZlibStreamClose) (Tcl_ZlibStream zshandle); /* 620 */
+    int (*tcl_ZlibStreamReset) (Tcl_ZlibStream zshandle); /* 621 */
+    void (*tcl_SetStartupScript) (Tcl_Obj *path, const char *encoding); /* 622 */
+    Tcl_Obj * (*tcl_GetStartupScript) (const char **encodingPtr); /* 623 */
+    int (*tcl_CloseEx) (Tcl_Interp *interp, Tcl_Channel chan, int flags); /* 624 */
+    int (*tcl_NRExprObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Obj *resultPtr); /* 625 */
+    int (*tcl_NRSubstObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 626 */
+    int (*tcl_LoadFile) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *const symv[], int flags, void *procPtrs, Tcl_LoadHandle *handlePtr); /* 627 */
+    void * (*tcl_FindSymbol) (Tcl_Interp *interp, Tcl_LoadHandle handle, const char *symbol); /* 628 */
+    int (*tcl_FSUnloadFile) (Tcl_Interp *interp, Tcl_LoadHandle handlePtr); /* 629 */
+    void (*tcl_ZlibStreamSetCompressionDictionary) (Tcl_ZlibStream zhandle, Tcl_Obj *compressionDictionaryObj); /* 630 */
+    Tcl_Channel (*tcl_OpenTcpServerEx) (Tcl_Interp *interp, const char *service, const char *host, unsigned int flags, int backlog, Tcl_TcpAcceptProc *acceptProc, void *callbackData); /* 631 */
+    int (*tclZipfs_Mount) (Tcl_Interp *interp, const char *zipname, const char *mountPoint, const char *passwd); /* 632 */
+    int (*tclZipfs_Unmount) (Tcl_Interp *interp, const char *mountPoint); /* 633 */
+    Tcl_Obj * (*tclZipfs_TclLibrary) (void); /* 634 */
+    int (*tclZipfs_MountBuffer) (Tcl_Interp *interp, const void *data, size_t datalen, const char *mountPoint, int copy); /* 635 */
+    void (*tcl_FreeInternalRep) (Tcl_Obj *objPtr); /* 636 */
+    char * (*tcl_InitStringRep) (Tcl_Obj *objPtr, const char *bytes, TCL_HASH_TYPE numBytes); /* 637 */
+    Tcl_ObjInternalRep * (*tcl_FetchInternalRep) (Tcl_Obj *objPtr, const Tcl_ObjType *typePtr); /* 638 */
+    void (*tcl_StoreInternalRep) (Tcl_Obj *objPtr, const Tcl_ObjType *typePtr, const Tcl_ObjInternalRep *irPtr); /* 639 */
+    int (*tcl_HasStringRep) (Tcl_Obj *objPtr); /* 640 */
+    void (*tcl_IncrRefCount) (Tcl_Obj *objPtr); /* 641 */
+    void (*tcl_DecrRefCount) (Tcl_Obj *objPtr); /* 642 */
+    int (*tcl_IsShared) (Tcl_Obj *objPtr); /* 643 */
+    int (*tcl_LinkArray) (Tcl_Interp *interp, const char *varName, void *addr, int type, Tcl_Size size); /* 644 */
+    int (*tcl_GetIntForIndex) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Size endValue, Tcl_Size *indexPtr); /* 645 */
+    Tcl_Size (*tcl_UtfToUniChar) (const char *src, int *chPtr); /* 646 */
+    char * (*tcl_UniCharToUtfDString) (const int *uniStr, Tcl_Size uniLength, Tcl_DString *dsPtr); /* 647 */
+    int * (*tcl_UtfToUniCharDString) (const char *src, Tcl_Size length, Tcl_DString *dsPtr); /* 648 */
+    unsigned char * (*tclGetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, void *numBytesPtr); /* 649 */
+    unsigned char * (*tcl_GetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Size *numBytesPtr); /* 650 */
+    char * (*tcl_GetStringFromObj) (Tcl_Obj *objPtr, Tcl_Size *lengthPtr); /* 651 */
+    Tcl_UniChar * (*tcl_GetUnicodeFromObj) (Tcl_Obj *objPtr, Tcl_Size *lengthPtr); /* 652 */
+    int (*tcl_GetSizeIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Size *sizePtr); /* 653 */
+    int (*tcl_UtfCharComplete) (const char *src, Tcl_Size length); /* 654 */
+    const char * (*tcl_UtfNext) (const char *src); /* 655 */
+    const char * (*tcl_UtfPrev) (const char *src, const char *start); /* 656 */
+    int (*tcl_UniCharIsUnicode) (int ch); /* 657 */
+    int (*tcl_ExternalToUtfDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 658 */
+    int (*tcl_UtfToExternalDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 659 */
+    int (*tcl_AsyncMarkFromSignal) (Tcl_AsyncHandler async, int sigNumber); /* 660 */
+    int (*tcl_ListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Size *objcPtr, Tcl_Obj ***objvPtr); /* 661 */
+    int (*tcl_ListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Size *lengthPtr); /* 662 */
+    int (*tcl_DictObjSize) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Size *sizePtr); /* 663 */
+    int (*tcl_SplitList) (Tcl_Interp *interp, const char *listStr, Tcl_Size *argcPtr, const char ***argvPtr); /* 664 */
+    void (*tcl_SplitPath) (const char *path, Tcl_Size *argcPtr, const char ***argvPtr); /* 665 */
+    Tcl_Obj * (*tcl_FSSplitPath) (Tcl_Obj *pathPtr, Tcl_Size *lenPtr); /* 666 */
+    int (*tcl_ParseArgsObjv) (Tcl_Interp *interp, const Tcl_ArgvInfo *argTable, Tcl_Size *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv); /* 667 */
+    Tcl_Size (*tcl_UniCharLen) (const int *uniStr); /* 668 */
+    Tcl_Size (*tcl_NumUtfChars) (const char *src, Tcl_Size length); /* 669 */
+    Tcl_Size (*tcl_GetCharLength) (Tcl_Obj *objPtr); /* 670 */
+    const char * (*tcl_UtfAtIndex) (const char *src, Tcl_Size index); /* 671 */
+    Tcl_Obj * (*tcl_GetRange) (Tcl_Obj *objPtr, Tcl_Size first, Tcl_Size last); /* 672 */
+    int (*tcl_GetUniChar) (Tcl_Obj *objPtr, Tcl_Size index); /* 673 */
+    int (*tcl_GetBool) (Tcl_Interp *interp, const char *src, int flags, char *charPtr); /* 674 */
+    int (*tcl_GetBoolFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, char *charPtr); /* 675 */
+    Tcl_Command (*tcl_CreateObjCommand2) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc2 *proc2, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 676 */
+    Tcl_Trace (*tcl_CreateObjTrace2) (Tcl_Interp *interp, Tcl_Size level, int flags, Tcl_CmdObjTraceProc2 *objProc2, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 677 */
+    Tcl_Command (*tcl_NRCreateCommand2) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc2 *proc, Tcl_ObjCmdProc2 *nreProc2, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 678 */
+    int (*tcl_NRCallObjProc2) (Tcl_Interp *interp, Tcl_ObjCmdProc2 *objProc2, void *clientData, Tcl_Size objc, Tcl_Obj *const objv[]); /* 679 */
+    int (*tcl_GetNumberFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, void **clientDataPtr, int *typePtr); /* 680 */
+    int (*tcl_GetNumber) (Tcl_Interp *interp, const char *bytes, Tcl_Size numBytes, void **clientDataPtr, int *typePtr); /* 681 */
+    int (*tcl_RemoveChannelMode) (Tcl_Interp *interp, Tcl_Channel chan, int mode); /* 682 */
+    Tcl_Size (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */
+    int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 684 */
+    Tcl_Obj * (*tcl_DStringToObj) (Tcl_DString *dsPtr); /* 685 */
+    void (*reserved686)(void);
+    void (*reserved687)(void);
+    void (*tclUnusedStubEntry) (void); /* 688 */
+} TclStubs;
+
+extern const TclStubs *tclStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_TCL_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+#define Tcl_PkgProvideEx \
+	(tclStubsPtr->tcl_PkgProvideEx) /* 0 */
+#define Tcl_PkgRequireEx \
+	(tclStubsPtr->tcl_PkgRequireEx) /* 1 */
+#define Tcl_Panic \
+	(tclStubsPtr->tcl_Panic) /* 2 */
+#define Tcl_Alloc \
+	(tclStubsPtr->tcl_Alloc) /* 3 */
+#define Tcl_Free \
+	(tclStubsPtr->tcl_Free) /* 4 */
+#define Tcl_Realloc \
+	(tclStubsPtr->tcl_Realloc) /* 5 */
+#define Tcl_DbCkalloc \
+	(tclStubsPtr->tcl_DbCkalloc) /* 6 */
+#define Tcl_DbCkfree \
+	(tclStubsPtr->tcl_DbCkfree) /* 7 */
+#define Tcl_DbCkrealloc \
+	(tclStubsPtr->tcl_DbCkrealloc) /* 8 */
+#define Tcl_CreateFileHandler \
+	(tclStubsPtr->tcl_CreateFileHandler) /* 9 */
+#define Tcl_DeleteFileHandler \
+	(tclStubsPtr->tcl_DeleteFileHandler) /* 10 */
+#define Tcl_SetTimer \
+	(tclStubsPtr->tcl_SetTimer) /* 11 */
+#define Tcl_Sleep \
+	(tclStubsPtr->tcl_Sleep) /* 12 */
+#define Tcl_WaitForEvent \
+	(tclStubsPtr->tcl_WaitForEvent) /* 13 */
+#define Tcl_AppendAllObjTypes \
+	(tclStubsPtr->tcl_AppendAllObjTypes) /* 14 */
+#define Tcl_AppendStringsToObj \
+	(tclStubsPtr->tcl_AppendStringsToObj) /* 15 */
+#define Tcl_AppendToObj \
+	(tclStubsPtr->tcl_AppendToObj) /* 16 */
+#define Tcl_ConcatObj \
+	(tclStubsPtr->tcl_ConcatObj) /* 17 */
+#define Tcl_ConvertToType \
+	(tclStubsPtr->tcl_ConvertToType) /* 18 */
+#define Tcl_DbDecrRefCount \
+	(tclStubsPtr->tcl_DbDecrRefCount) /* 19 */
+#define Tcl_DbIncrRefCount \
+	(tclStubsPtr->tcl_DbIncrRefCount) /* 20 */
+#define Tcl_DbIsShared \
+	(tclStubsPtr->tcl_DbIsShared) /* 21 */
+/* Slot 22 is reserved */
+#define Tcl_DbNewByteArrayObj \
+	(tclStubsPtr->tcl_DbNewByteArrayObj) /* 23 */
+#define Tcl_DbNewDoubleObj \
+	(tclStubsPtr->tcl_DbNewDoubleObj) /* 24 */
+#define Tcl_DbNewListObj \
+	(tclStubsPtr->tcl_DbNewListObj) /* 25 */
+/* Slot 26 is reserved */
+#define Tcl_DbNewObj \
+	(tclStubsPtr->tcl_DbNewObj) /* 27 */
+#define Tcl_DbNewStringObj \
+	(tclStubsPtr->tcl_DbNewStringObj) /* 28 */
+#define Tcl_DuplicateObj \
+	(tclStubsPtr->tcl_DuplicateObj) /* 29 */
+#define TclFreeObj \
+	(tclStubsPtr->tclFreeObj) /* 30 */
+#define Tcl_GetBoolean \
+	(tclStubsPtr->tcl_GetBoolean) /* 31 */
+#define Tcl_GetBooleanFromObj \
+	(tclStubsPtr->tcl_GetBooleanFromObj) /* 32 */
+#define Tcl_GetByteArrayFromObj \
+	(tclStubsPtr->tcl_GetByteArrayFromObj) /* 33 */
+#define Tcl_GetDouble \
+	(tclStubsPtr->tcl_GetDouble) /* 34 */
+#define Tcl_GetDoubleFromObj \
+	(tclStubsPtr->tcl_GetDoubleFromObj) /* 35 */
+/* Slot 36 is reserved */
+#define Tcl_GetInt \
+	(tclStubsPtr->tcl_GetInt) /* 37 */
+#define Tcl_GetIntFromObj \
+	(tclStubsPtr->tcl_GetIntFromObj) /* 38 */
+#define Tcl_GetLongFromObj \
+	(tclStubsPtr->tcl_GetLongFromObj) /* 39 */
+#define Tcl_GetObjType \
+	(tclStubsPtr->tcl_GetObjType) /* 40 */
+#define TclGetStringFromObj \
+	(tclStubsPtr->tclGetStringFromObj) /* 41 */
+#define Tcl_InvalidateStringRep \
+	(tclStubsPtr->tcl_InvalidateStringRep) /* 42 */
+#define Tcl_ListObjAppendList \
+	(tclStubsPtr->tcl_ListObjAppendList) /* 43 */
+#define Tcl_ListObjAppendElement \
+	(tclStubsPtr->tcl_ListObjAppendElement) /* 44 */
+#define TclListObjGetElements \
+	(tclStubsPtr->tclListObjGetElements) /* 45 */
+#define Tcl_ListObjIndex \
+	(tclStubsPtr->tcl_ListObjIndex) /* 46 */
+#define TclListObjLength \
+	(tclStubsPtr->tclListObjLength) /* 47 */
+#define Tcl_ListObjReplace \
+	(tclStubsPtr->tcl_ListObjReplace) /* 48 */
+/* Slot 49 is reserved */
+#define Tcl_NewByteArrayObj \
+	(tclStubsPtr->tcl_NewByteArrayObj) /* 50 */
+#define Tcl_NewDoubleObj \
+	(tclStubsPtr->tcl_NewDoubleObj) /* 51 */
+/* Slot 52 is reserved */
+#define Tcl_NewListObj \
+	(tclStubsPtr->tcl_NewListObj) /* 53 */
+/* Slot 54 is reserved */
+#define Tcl_NewObj \
+	(tclStubsPtr->tcl_NewObj) /* 55 */
+#define Tcl_NewStringObj \
+	(tclStubsPtr->tcl_NewStringObj) /* 56 */
+/* Slot 57 is reserved */
+#define Tcl_SetByteArrayLength \
+	(tclStubsPtr->tcl_SetByteArrayLength) /* 58 */
+#define Tcl_SetByteArrayObj \
+	(tclStubsPtr->tcl_SetByteArrayObj) /* 59 */
+#define Tcl_SetDoubleObj \
+	(tclStubsPtr->tcl_SetDoubleObj) /* 60 */
+/* Slot 61 is reserved */
+#define Tcl_SetListObj \
+	(tclStubsPtr->tcl_SetListObj) /* 62 */
+/* Slot 63 is reserved */
+#define Tcl_SetObjLength \
+	(tclStubsPtr->tcl_SetObjLength) /* 64 */
+#define Tcl_SetStringObj \
+	(tclStubsPtr->tcl_SetStringObj) /* 65 */
+/* Slot 66 is reserved */
+/* Slot 67 is reserved */
+#define Tcl_AllowExceptions \
+	(tclStubsPtr->tcl_AllowExceptions) /* 68 */
+#define Tcl_AppendElement \
+	(tclStubsPtr->tcl_AppendElement) /* 69 */
+#define Tcl_AppendResult \
+	(tclStubsPtr->tcl_AppendResult) /* 70 */
+#define Tcl_AsyncCreate \
+	(tclStubsPtr->tcl_AsyncCreate) /* 71 */
+#define Tcl_AsyncDelete \
+	(tclStubsPtr->tcl_AsyncDelete) /* 72 */
+#define Tcl_AsyncInvoke \
+	(tclStubsPtr->tcl_AsyncInvoke) /* 73 */
+#define Tcl_AsyncMark \
+	(tclStubsPtr->tcl_AsyncMark) /* 74 */
+#define Tcl_AsyncReady \
+	(tclStubsPtr->tcl_AsyncReady) /* 75 */
+/* Slot 76 is reserved */
+/* Slot 77 is reserved */
+#define Tcl_BadChannelOption \
+	(tclStubsPtr->tcl_BadChannelOption) /* 78 */
+#define Tcl_CallWhenDeleted \
+	(tclStubsPtr->tcl_CallWhenDeleted) /* 79 */
+#define Tcl_CancelIdleCall \
+	(tclStubsPtr->tcl_CancelIdleCall) /* 80 */
+#define Tcl_Close \
+	(tclStubsPtr->tcl_Close) /* 81 */
+#define Tcl_CommandComplete \
+	(tclStubsPtr->tcl_CommandComplete) /* 82 */
+#define Tcl_Concat \
+	(tclStubsPtr->tcl_Concat) /* 83 */
+#define Tcl_ConvertElement \
+	(tclStubsPtr->tcl_ConvertElement) /* 84 */
+#define Tcl_ConvertCountedElement \
+	(tclStubsPtr->tcl_ConvertCountedElement) /* 85 */
+#define Tcl_CreateAlias \
+	(tclStubsPtr->tcl_CreateAlias) /* 86 */
+#define Tcl_CreateAliasObj \
+	(tclStubsPtr->tcl_CreateAliasObj) /* 87 */
+#define Tcl_CreateChannel \
+	(tclStubsPtr->tcl_CreateChannel) /* 88 */
+#define Tcl_CreateChannelHandler \
+	(tclStubsPtr->tcl_CreateChannelHandler) /* 89 */
+#define Tcl_CreateCloseHandler \
+	(tclStubsPtr->tcl_CreateCloseHandler) /* 90 */
+#define Tcl_CreateCommand \
+	(tclStubsPtr->tcl_CreateCommand) /* 91 */
+#define Tcl_CreateEventSource \
+	(tclStubsPtr->tcl_CreateEventSource) /* 92 */
+#define Tcl_CreateExitHandler \
+	(tclStubsPtr->tcl_CreateExitHandler) /* 93 */
+#define Tcl_CreateInterp \
+	(tclStubsPtr->tcl_CreateInterp) /* 94 */
+/* Slot 95 is reserved */
+#define Tcl_CreateObjCommand \
+	(tclStubsPtr->tcl_CreateObjCommand) /* 96 */
+#define Tcl_CreateChild \
+	(tclStubsPtr->tcl_CreateChild) /* 97 */
+#define Tcl_CreateTimerHandler \
+	(tclStubsPtr->tcl_CreateTimerHandler) /* 98 */
+#define Tcl_CreateTrace \
+	(tclStubsPtr->tcl_CreateTrace) /* 99 */
+#define Tcl_DeleteAssocData \
+	(tclStubsPtr->tcl_DeleteAssocData) /* 100 */
+#define Tcl_DeleteChannelHandler \
+	(tclStubsPtr->tcl_DeleteChannelHandler) /* 101 */
+#define Tcl_DeleteCloseHandler \
+	(tclStubsPtr->tcl_DeleteCloseHandler) /* 102 */
+#define Tcl_DeleteCommand \
+	(tclStubsPtr->tcl_DeleteCommand) /* 103 */
+#define Tcl_DeleteCommandFromToken \
+	(tclStubsPtr->tcl_DeleteCommandFromToken) /* 104 */
+#define Tcl_DeleteEvents \
+	(tclStubsPtr->tcl_DeleteEvents) /* 105 */
+#define Tcl_DeleteEventSource \
+	(tclStubsPtr->tcl_DeleteEventSource) /* 106 */
+#define Tcl_DeleteExitHandler \
+	(tclStubsPtr->tcl_DeleteExitHandler) /* 107 */
+#define Tcl_DeleteHashEntry \
+	(tclStubsPtr->tcl_DeleteHashEntry) /* 108 */
+#define Tcl_DeleteHashTable \
+	(tclStubsPtr->tcl_DeleteHashTable) /* 109 */
+#define Tcl_DeleteInterp \
+	(tclStubsPtr->tcl_DeleteInterp) /* 110 */
+#define Tcl_DetachPids \
+	(tclStubsPtr->tcl_DetachPids) /* 111 */
+#define Tcl_DeleteTimerHandler \
+	(tclStubsPtr->tcl_DeleteTimerHandler) /* 112 */
+#define Tcl_DeleteTrace \
+	(tclStubsPtr->tcl_DeleteTrace) /* 113 */
+#define Tcl_DontCallWhenDeleted \
+	(tclStubsPtr->tcl_DontCallWhenDeleted) /* 114 */
+#define Tcl_DoOneEvent \
+	(tclStubsPtr->tcl_DoOneEvent) /* 115 */
+#define Tcl_DoWhenIdle \
+	(tclStubsPtr->tcl_DoWhenIdle) /* 116 */
+#define Tcl_DStringAppend \
+	(tclStubsPtr->tcl_DStringAppend) /* 117 */
+#define Tcl_DStringAppendElement \
+	(tclStubsPtr->tcl_DStringAppendElement) /* 118 */
+#define Tcl_DStringEndSublist \
+	(tclStubsPtr->tcl_DStringEndSublist) /* 119 */
+#define Tcl_DStringFree \
+	(tclStubsPtr->tcl_DStringFree) /* 120 */
+#define Tcl_DStringGetResult \
+	(tclStubsPtr->tcl_DStringGetResult) /* 121 */
+#define Tcl_DStringInit \
+	(tclStubsPtr->tcl_DStringInit) /* 122 */
+#define Tcl_DStringResult \
+	(tclStubsPtr->tcl_DStringResult) /* 123 */
+#define Tcl_DStringSetLength \
+	(tclStubsPtr->tcl_DStringSetLength) /* 124 */
+#define Tcl_DStringStartSublist \
+	(tclStubsPtr->tcl_DStringStartSublist) /* 125 */
+#define Tcl_Eof \
+	(tclStubsPtr->tcl_Eof) /* 126 */
+#define Tcl_ErrnoId \
+	(tclStubsPtr->tcl_ErrnoId) /* 127 */
+#define Tcl_ErrnoMsg \
+	(tclStubsPtr->tcl_ErrnoMsg) /* 128 */
+/* Slot 129 is reserved */
+#define Tcl_EvalFile \
+	(tclStubsPtr->tcl_EvalFile) /* 130 */
+/* Slot 131 is reserved */
+#define Tcl_EventuallyFree \
+	(tclStubsPtr->tcl_EventuallyFree) /* 132 */
+#define Tcl_Exit \
+	(tclStubsPtr->tcl_Exit) /* 133 */
+#define Tcl_ExposeCommand \
+	(tclStubsPtr->tcl_ExposeCommand) /* 134 */
+#define Tcl_ExprBoolean \
+	(tclStubsPtr->tcl_ExprBoolean) /* 135 */
+#define Tcl_ExprBooleanObj \
+	(tclStubsPtr->tcl_ExprBooleanObj) /* 136 */
+#define Tcl_ExprDouble \
+	(tclStubsPtr->tcl_ExprDouble) /* 137 */
+#define Tcl_ExprDoubleObj \
+	(tclStubsPtr->tcl_ExprDoubleObj) /* 138 */
+#define Tcl_ExprLong \
+	(tclStubsPtr->tcl_ExprLong) /* 139 */
+#define Tcl_ExprLongObj \
+	(tclStubsPtr->tcl_ExprLongObj) /* 140 */
+#define Tcl_ExprObj \
+	(tclStubsPtr->tcl_ExprObj) /* 141 */
+#define Tcl_ExprString \
+	(tclStubsPtr->tcl_ExprString) /* 142 */
+#define Tcl_Finalize \
+	(tclStubsPtr->tcl_Finalize) /* 143 */
+/* Slot 144 is reserved */
+#define Tcl_FirstHashEntry \
+	(tclStubsPtr->tcl_FirstHashEntry) /* 145 */
+#define Tcl_Flush \
+	(tclStubsPtr->tcl_Flush) /* 146 */
+/* Slot 147 is reserved */
+#define Tcl_GetAlias \
+	(tclStubsPtr->tcl_GetAlias) /* 148 */
+#define Tcl_GetAliasObj \
+	(tclStubsPtr->tcl_GetAliasObj) /* 149 */
+#define Tcl_GetAssocData \
+	(tclStubsPtr->tcl_GetAssocData) /* 150 */
+#define Tcl_GetChannel \
+	(tclStubsPtr->tcl_GetChannel) /* 151 */
+#define Tcl_GetChannelBufferSize \
+	(tclStubsPtr->tcl_GetChannelBufferSize) /* 152 */
+#define Tcl_GetChannelHandle \
+	(tclStubsPtr->tcl_GetChannelHandle) /* 153 */
+#define Tcl_GetChannelInstanceData \
+	(tclStubsPtr->tcl_GetChannelInstanceData) /* 154 */
+#define Tcl_GetChannelMode \
+	(tclStubsPtr->tcl_GetChannelMode) /* 155 */
+#define Tcl_GetChannelName \
+	(tclStubsPtr->tcl_GetChannelName) /* 156 */
+#define Tcl_GetChannelOption \
+	(tclStubsPtr->tcl_GetChannelOption) /* 157 */
+#define Tcl_GetChannelType \
+	(tclStubsPtr->tcl_GetChannelType) /* 158 */
+#define Tcl_GetCommandInfo \
+	(tclStubsPtr->tcl_GetCommandInfo) /* 159 */
+#define Tcl_GetCommandName \
+	(tclStubsPtr->tcl_GetCommandName) /* 160 */
+#define Tcl_GetErrno \
+	(tclStubsPtr->tcl_GetErrno) /* 161 */
+#define Tcl_GetHostName \
+	(tclStubsPtr->tcl_GetHostName) /* 162 */
+#define Tcl_GetInterpPath \
+	(tclStubsPtr->tcl_GetInterpPath) /* 163 */
+#define Tcl_GetParent \
+	(tclStubsPtr->tcl_GetParent) /* 164 */
+#define Tcl_GetNameOfExecutable \
+	(tclStubsPtr->tcl_GetNameOfExecutable) /* 165 */
+#define Tcl_GetObjResult \
+	(tclStubsPtr->tcl_GetObjResult) /* 166 */
+#define Tcl_GetOpenFile \
+	(tclStubsPtr->tcl_GetOpenFile) /* 167 */
+#define Tcl_GetPathType \
+	(tclStubsPtr->tcl_GetPathType) /* 168 */
+#define Tcl_Gets \
+	(tclStubsPtr->tcl_Gets) /* 169 */
+#define Tcl_GetsObj \
+	(tclStubsPtr->tcl_GetsObj) /* 170 */
+#define Tcl_GetServiceMode \
+	(tclStubsPtr->tcl_GetServiceMode) /* 171 */
+#define Tcl_GetChild \
+	(tclStubsPtr->tcl_GetChild) /* 172 */
+#define Tcl_GetStdChannel \
+	(tclStubsPtr->tcl_GetStdChannel) /* 173 */
+/* Slot 174 is reserved */
+/* Slot 175 is reserved */
+#define Tcl_GetVar2 \
+	(tclStubsPtr->tcl_GetVar2) /* 176 */
+/* Slot 177 is reserved */
+/* Slot 178 is reserved */
+#define Tcl_HideCommand \
+	(tclStubsPtr->tcl_HideCommand) /* 179 */
+#define Tcl_Init \
+	(tclStubsPtr->tcl_Init) /* 180 */
+#define Tcl_InitHashTable \
+	(tclStubsPtr->tcl_InitHashTable) /* 181 */
+#define Tcl_InputBlocked \
+	(tclStubsPtr->tcl_InputBlocked) /* 182 */
+#define Tcl_InputBuffered \
+	(tclStubsPtr->tcl_InputBuffered) /* 183 */
+#define Tcl_InterpDeleted \
+	(tclStubsPtr->tcl_InterpDeleted) /* 184 */
+#define Tcl_IsSafe \
+	(tclStubsPtr->tcl_IsSafe) /* 185 */
+#define Tcl_JoinPath \
+	(tclStubsPtr->tcl_JoinPath) /* 186 */
+#define Tcl_LinkVar \
+	(tclStubsPtr->tcl_LinkVar) /* 187 */
+/* Slot 188 is reserved */
+#define Tcl_MakeFileChannel \
+	(tclStubsPtr->tcl_MakeFileChannel) /* 189 */
+/* Slot 190 is reserved */
+#define Tcl_MakeTcpClientChannel \
+	(tclStubsPtr->tcl_MakeTcpClientChannel) /* 191 */
+#define Tcl_Merge \
+	(tclStubsPtr->tcl_Merge) /* 192 */
+#define Tcl_NextHashEntry \
+	(tclStubsPtr->tcl_NextHashEntry) /* 193 */
+#define Tcl_NotifyChannel \
+	(tclStubsPtr->tcl_NotifyChannel) /* 194 */
+#define Tcl_ObjGetVar2 \
+	(tclStubsPtr->tcl_ObjGetVar2) /* 195 */
+#define Tcl_ObjSetVar2 \
+	(tclStubsPtr->tcl_ObjSetVar2) /* 196 */
+#define Tcl_OpenCommandChannel \
+	(tclStubsPtr->tcl_OpenCommandChannel) /* 197 */
+#define Tcl_OpenFileChannel \
+	(tclStubsPtr->tcl_OpenFileChannel) /* 198 */
+#define Tcl_OpenTcpClient \
+	(tclStubsPtr->tcl_OpenTcpClient) /* 199 */
+#define Tcl_OpenTcpServer \
+	(tclStubsPtr->tcl_OpenTcpServer) /* 200 */
+#define Tcl_Preserve \
+	(tclStubsPtr->tcl_Preserve) /* 201 */
+#define Tcl_PrintDouble \
+	(tclStubsPtr->tcl_PrintDouble) /* 202 */
+#define Tcl_PutEnv \
+	(tclStubsPtr->tcl_PutEnv) /* 203 */
+#define Tcl_PosixError \
+	(tclStubsPtr->tcl_PosixError) /* 204 */
+#define Tcl_QueueEvent \
+	(tclStubsPtr->tcl_QueueEvent) /* 205 */
+#define Tcl_Read \
+	(tclStubsPtr->tcl_Read) /* 206 */
+#define Tcl_ReapDetachedProcs \
+	(tclStubsPtr->tcl_ReapDetachedProcs) /* 207 */
+#define Tcl_RecordAndEval \
+	(tclStubsPtr->tcl_RecordAndEval) /* 208 */
+#define Tcl_RecordAndEvalObj \
+	(tclStubsPtr->tcl_RecordAndEvalObj) /* 209 */
+#define Tcl_RegisterChannel \
+	(tclStubsPtr->tcl_RegisterChannel) /* 210 */
+#define Tcl_RegisterObjType \
+	(tclStubsPtr->tcl_RegisterObjType) /* 211 */
+#define Tcl_RegExpCompile \
+	(tclStubsPtr->tcl_RegExpCompile) /* 212 */
+#define Tcl_RegExpExec \
+	(tclStubsPtr->tcl_RegExpExec) /* 213 */
+#define Tcl_RegExpMatch \
+	(tclStubsPtr->tcl_RegExpMatch) /* 214 */
+#define Tcl_RegExpRange \
+	(tclStubsPtr->tcl_RegExpRange) /* 215 */
+#define Tcl_Release \
+	(tclStubsPtr->tcl_Release) /* 216 */
+#define Tcl_ResetResult \
+	(tclStubsPtr->tcl_ResetResult) /* 217 */
+#define Tcl_ScanElement \
+	(tclStubsPtr->tcl_ScanElement) /* 218 */
+#define Tcl_ScanCountedElement \
+	(tclStubsPtr->tcl_ScanCountedElement) /* 219 */
+/* Slot 220 is reserved */
+#define Tcl_ServiceAll \
+	(tclStubsPtr->tcl_ServiceAll) /* 221 */
+#define Tcl_ServiceEvent \
+	(tclStubsPtr->tcl_ServiceEvent) /* 222 */
+#define Tcl_SetAssocData \
+	(tclStubsPtr->tcl_SetAssocData) /* 223 */
+#define Tcl_SetChannelBufferSize \
+	(tclStubsPtr->tcl_SetChannelBufferSize) /* 224 */
+#define Tcl_SetChannelOption \
+	(tclStubsPtr->tcl_SetChannelOption) /* 225 */
+#define Tcl_SetCommandInfo \
+	(tclStubsPtr->tcl_SetCommandInfo) /* 226 */
+#define Tcl_SetErrno \
+	(tclStubsPtr->tcl_SetErrno) /* 227 */
+#define Tcl_SetErrorCode \
+	(tclStubsPtr->tcl_SetErrorCode) /* 228 */
+#define Tcl_SetMaxBlockTime \
+	(tclStubsPtr->tcl_SetMaxBlockTime) /* 229 */
+/* Slot 230 is reserved */
+#define Tcl_SetRecursionLimit \
+	(tclStubsPtr->tcl_SetRecursionLimit) /* 231 */
+/* Slot 232 is reserved */
+#define Tcl_SetServiceMode \
+	(tclStubsPtr->tcl_SetServiceMode) /* 233 */
+#define Tcl_SetObjErrorCode \
+	(tclStubsPtr->tcl_SetObjErrorCode) /* 234 */
+#define Tcl_SetObjResult \
+	(tclStubsPtr->tcl_SetObjResult) /* 235 */
+#define Tcl_SetStdChannel \
+	(tclStubsPtr->tcl_SetStdChannel) /* 236 */
+/* Slot 237 is reserved */
+#define Tcl_SetVar2 \
+	(tclStubsPtr->tcl_SetVar2) /* 238 */
+#define Tcl_SignalId \
+	(tclStubsPtr->tcl_SignalId) /* 239 */
+#define Tcl_SignalMsg \
+	(tclStubsPtr->tcl_SignalMsg) /* 240 */
+#define Tcl_SourceRCFile \
+	(tclStubsPtr->tcl_SourceRCFile) /* 241 */
+#define TclSplitList \
+	(tclStubsPtr->tclSplitList) /* 242 */
+#define TclSplitPath \
+	(tclStubsPtr->tclSplitPath) /* 243 */
+/* Slot 244 is reserved */
+/* Slot 245 is reserved */
+/* Slot 246 is reserved */
+/* Slot 247 is reserved */
+#define Tcl_TraceVar2 \
+	(tclStubsPtr->tcl_TraceVar2) /* 248 */
+#define Tcl_TranslateFileName \
+	(tclStubsPtr->tcl_TranslateFileName) /* 249 */
+#define Tcl_Ungets \
+	(tclStubsPtr->tcl_Ungets) /* 250 */
+#define Tcl_UnlinkVar \
+	(tclStubsPtr->tcl_UnlinkVar) /* 251 */
+#define Tcl_UnregisterChannel \
+	(tclStubsPtr->tcl_UnregisterChannel) /* 252 */
+/* Slot 253 is reserved */
+#define Tcl_UnsetVar2 \
+	(tclStubsPtr->tcl_UnsetVar2) /* 254 */
+/* Slot 255 is reserved */
+#define Tcl_UntraceVar2 \
+	(tclStubsPtr->tcl_UntraceVar2) /* 256 */
+#define Tcl_UpdateLinkedVar \
+	(tclStubsPtr->tcl_UpdateLinkedVar) /* 257 */
+/* Slot 258 is reserved */
+#define Tcl_UpVar2 \
+	(tclStubsPtr->tcl_UpVar2) /* 259 */
+#define Tcl_VarEval \
+	(tclStubsPtr->tcl_VarEval) /* 260 */
+/* Slot 261 is reserved */
+#define Tcl_VarTraceInfo2 \
+	(tclStubsPtr->tcl_VarTraceInfo2) /* 262 */
+#define Tcl_Write \
+	(tclStubsPtr->tcl_Write) /* 263 */
+#define Tcl_WrongNumArgs \
+	(tclStubsPtr->tcl_WrongNumArgs) /* 264 */
+#define Tcl_DumpActiveMemory \
+	(tclStubsPtr->tcl_DumpActiveMemory) /* 265 */
+#define Tcl_ValidateAllMemory \
+	(tclStubsPtr->tcl_ValidateAllMemory) /* 266 */
+/* Slot 267 is reserved */
+/* Slot 268 is reserved */
+#define Tcl_HashStats \
+	(tclStubsPtr->tcl_HashStats) /* 269 */
+#define Tcl_ParseVar \
+	(tclStubsPtr->tcl_ParseVar) /* 270 */
+/* Slot 271 is reserved */
+#define Tcl_PkgPresentEx \
+	(tclStubsPtr->tcl_PkgPresentEx) /* 272 */
+/* Slot 273 is reserved */
+/* Slot 274 is reserved */
+/* Slot 275 is reserved */
+/* Slot 276 is reserved */
+#define Tcl_WaitPid \
+	(tclStubsPtr->tcl_WaitPid) /* 277 */
+/* Slot 278 is reserved */
+#define Tcl_GetVersion \
+	(tclStubsPtr->tcl_GetVersion) /* 279 */
+#define Tcl_InitMemory \
+	(tclStubsPtr->tcl_InitMemory) /* 280 */
+#define Tcl_StackChannel \
+	(tclStubsPtr->tcl_StackChannel) /* 281 */
+#define Tcl_UnstackChannel \
+	(tclStubsPtr->tcl_UnstackChannel) /* 282 */
+#define Tcl_GetStackedChannel \
+	(tclStubsPtr->tcl_GetStackedChannel) /* 283 */
+#define Tcl_SetMainLoop \
+	(tclStubsPtr->tcl_SetMainLoop) /* 284 */
+/* Slot 285 is reserved */
+#define Tcl_AppendObjToObj \
+	(tclStubsPtr->tcl_AppendObjToObj) /* 286 */
+#define Tcl_CreateEncoding \
+	(tclStubsPtr->tcl_CreateEncoding) /* 287 */
+#define Tcl_CreateThreadExitHandler \
+	(tclStubsPtr->tcl_CreateThreadExitHandler) /* 288 */
+#define Tcl_DeleteThreadExitHandler \
+	(tclStubsPtr->tcl_DeleteThreadExitHandler) /* 289 */
+/* Slot 290 is reserved */
+#define Tcl_EvalEx \
+	(tclStubsPtr->tcl_EvalEx) /* 291 */
+#define Tcl_EvalObjv \
+	(tclStubsPtr->tcl_EvalObjv) /* 292 */
+#define Tcl_EvalObjEx \
+	(tclStubsPtr->tcl_EvalObjEx) /* 293 */
+#define Tcl_ExitThread \
+	(tclStubsPtr->tcl_ExitThread) /* 294 */
+#define Tcl_ExternalToUtf \
+	(tclStubsPtr->tcl_ExternalToUtf) /* 295 */
+#define Tcl_ExternalToUtfDString \
+	(tclStubsPtr->tcl_ExternalToUtfDString) /* 296 */
+#define Tcl_FinalizeThread \
+	(tclStubsPtr->tcl_FinalizeThread) /* 297 */
+#define Tcl_FinalizeNotifier \
+	(tclStubsPtr->tcl_FinalizeNotifier) /* 298 */
+#define Tcl_FreeEncoding \
+	(tclStubsPtr->tcl_FreeEncoding) /* 299 */
+#define Tcl_GetCurrentThread \
+	(tclStubsPtr->tcl_GetCurrentThread) /* 300 */
+#define Tcl_GetEncoding \
+	(tclStubsPtr->tcl_GetEncoding) /* 301 */
+#define Tcl_GetEncodingName \
+	(tclStubsPtr->tcl_GetEncodingName) /* 302 */
+#define Tcl_GetEncodingNames \
+	(tclStubsPtr->tcl_GetEncodingNames) /* 303 */
+#define Tcl_GetIndexFromObjStruct \
+	(tclStubsPtr->tcl_GetIndexFromObjStruct) /* 304 */
+#define Tcl_GetThreadData \
+	(tclStubsPtr->tcl_GetThreadData) /* 305 */
+#define Tcl_GetVar2Ex \
+	(tclStubsPtr->tcl_GetVar2Ex) /* 306 */
+#define Tcl_InitNotifier \
+	(tclStubsPtr->tcl_InitNotifier) /* 307 */
+#define Tcl_MutexLock \
+	(tclStubsPtr->tcl_MutexLock) /* 308 */
+#define Tcl_MutexUnlock \
+	(tclStubsPtr->tcl_MutexUnlock) /* 309 */
+#define Tcl_ConditionNotify \
+	(tclStubsPtr->tcl_ConditionNotify) /* 310 */
+#define Tcl_ConditionWait \
+	(tclStubsPtr->tcl_ConditionWait) /* 311 */
+#define TclNumUtfChars \
+	(tclStubsPtr->tclNumUtfChars) /* 312 */
+#define Tcl_ReadChars \
+	(tclStubsPtr->tcl_ReadChars) /* 313 */
+/* Slot 314 is reserved */
+/* Slot 315 is reserved */
+#define Tcl_SetSystemEncoding \
+	(tclStubsPtr->tcl_SetSystemEncoding) /* 316 */
+#define Tcl_SetVar2Ex \
+	(tclStubsPtr->tcl_SetVar2Ex) /* 317 */
+#define Tcl_ThreadAlert \
+	(tclStubsPtr->tcl_ThreadAlert) /* 318 */
+#define Tcl_ThreadQueueEvent \
+	(tclStubsPtr->tcl_ThreadQueueEvent) /* 319 */
+#define Tcl_UniCharAtIndex \
+	(tclStubsPtr->tcl_UniCharAtIndex) /* 320 */
+#define Tcl_UniCharToLower \
+	(tclStubsPtr->tcl_UniCharToLower) /* 321 */
+#define Tcl_UniCharToTitle \
+	(tclStubsPtr->tcl_UniCharToTitle) /* 322 */
+#define Tcl_UniCharToUpper \
+	(tclStubsPtr->tcl_UniCharToUpper) /* 323 */
+#define Tcl_UniCharToUtf \
+	(tclStubsPtr->tcl_UniCharToUtf) /* 324 */
+#define TclUtfAtIndex \
+	(tclStubsPtr->tclUtfAtIndex) /* 325 */
+#define TclUtfCharComplete \
+	(tclStubsPtr->tclUtfCharComplete) /* 326 */
+#define Tcl_UtfBackslash \
+	(tclStubsPtr->tcl_UtfBackslash) /* 327 */
+#define Tcl_UtfFindFirst \
+	(tclStubsPtr->tcl_UtfFindFirst) /* 328 */
+#define Tcl_UtfFindLast \
+	(tclStubsPtr->tcl_UtfFindLast) /* 329 */
+#define TclUtfNext \
+	(tclStubsPtr->tclUtfNext) /* 330 */
+#define TclUtfPrev \
+	(tclStubsPtr->tclUtfPrev) /* 331 */
+#define Tcl_UtfToExternal \
+	(tclStubsPtr->tcl_UtfToExternal) /* 332 */
+#define Tcl_UtfToExternalDString \
+	(tclStubsPtr->tcl_UtfToExternalDString) /* 333 */
+#define Tcl_UtfToLower \
+	(tclStubsPtr->tcl_UtfToLower) /* 334 */
+#define Tcl_UtfToTitle \
+	(tclStubsPtr->tcl_UtfToTitle) /* 335 */
+#define Tcl_UtfToChar16 \
+	(tclStubsPtr->tcl_UtfToChar16) /* 336 */
+#define Tcl_UtfToUpper \
+	(tclStubsPtr->tcl_UtfToUpper) /* 337 */
+#define Tcl_WriteChars \
+	(tclStubsPtr->tcl_WriteChars) /* 338 */
+#define Tcl_WriteObj \
+	(tclStubsPtr->tcl_WriteObj) /* 339 */
+#define Tcl_GetString \
+	(tclStubsPtr->tcl_GetString) /* 340 */
+/* Slot 341 is reserved */
+/* Slot 342 is reserved */
+#define Tcl_AlertNotifier \
+	(tclStubsPtr->tcl_AlertNotifier) /* 343 */
+#define Tcl_ServiceModeHook \
+	(tclStubsPtr->tcl_ServiceModeHook) /* 344 */
+#define Tcl_UniCharIsAlnum \
+	(tclStubsPtr->tcl_UniCharIsAlnum) /* 345 */
+#define Tcl_UniCharIsAlpha \
+	(tclStubsPtr->tcl_UniCharIsAlpha) /* 346 */
+#define Tcl_UniCharIsDigit \
+	(tclStubsPtr->tcl_UniCharIsDigit) /* 347 */
+#define Tcl_UniCharIsLower \
+	(tclStubsPtr->tcl_UniCharIsLower) /* 348 */
+#define Tcl_UniCharIsSpace \
+	(tclStubsPtr->tcl_UniCharIsSpace) /* 349 */
+#define Tcl_UniCharIsUpper \
+	(tclStubsPtr->tcl_UniCharIsUpper) /* 350 */
+#define Tcl_UniCharIsWordChar \
+	(tclStubsPtr->tcl_UniCharIsWordChar) /* 351 */
+#define Tcl_Char16Len \
+	(tclStubsPtr->tcl_Char16Len) /* 352 */
+/* Slot 353 is reserved */
+#define Tcl_Char16ToUtfDString \
+	(tclStubsPtr->tcl_Char16ToUtfDString) /* 354 */
+#define Tcl_UtfToChar16DString \
+	(tclStubsPtr->tcl_UtfToChar16DString) /* 355 */
+#define Tcl_GetRegExpFromObj \
+	(tclStubsPtr->tcl_GetRegExpFromObj) /* 356 */
+/* Slot 357 is reserved */
+#define Tcl_FreeParse \
+	(tclStubsPtr->tcl_FreeParse) /* 358 */
+#define Tcl_LogCommandInfo \
+	(tclStubsPtr->tcl_LogCommandInfo) /* 359 */
+#define Tcl_ParseBraces \
+	(tclStubsPtr->tcl_ParseBraces) /* 360 */
+#define Tcl_ParseCommand \
+	(tclStubsPtr->tcl_ParseCommand) /* 361 */
+#define Tcl_ParseExpr \
+	(tclStubsPtr->tcl_ParseExpr) /* 362 */
+#define Tcl_ParseQuotedString \
+	(tclStubsPtr->tcl_ParseQuotedString) /* 363 */
+#define Tcl_ParseVarName \
+	(tclStubsPtr->tcl_ParseVarName) /* 364 */
+#define Tcl_GetCwd \
+	(tclStubsPtr->tcl_GetCwd) /* 365 */
+#define Tcl_Chdir \
+	(tclStubsPtr->tcl_Chdir) /* 366 */
+#define Tcl_Access \
+	(tclStubsPtr->tcl_Access) /* 367 */
+#define Tcl_Stat \
+	(tclStubsPtr->tcl_Stat) /* 368 */
+#define Tcl_UtfNcmp \
+	(tclStubsPtr->tcl_UtfNcmp) /* 369 */
+#define Tcl_UtfNcasecmp \
+	(tclStubsPtr->tcl_UtfNcasecmp) /* 370 */
+#define Tcl_StringCaseMatch \
+	(tclStubsPtr->tcl_StringCaseMatch) /* 371 */
+#define Tcl_UniCharIsControl \
+	(tclStubsPtr->tcl_UniCharIsControl) /* 372 */
+#define Tcl_UniCharIsGraph \
+	(tclStubsPtr->tcl_UniCharIsGraph) /* 373 */
+#define Tcl_UniCharIsPrint \
+	(tclStubsPtr->tcl_UniCharIsPrint) /* 374 */
+#define Tcl_UniCharIsPunct \
+	(tclStubsPtr->tcl_UniCharIsPunct) /* 375 */
+#define Tcl_RegExpExecObj \
+	(tclStubsPtr->tcl_RegExpExecObj) /* 376 */
+#define Tcl_RegExpGetInfo \
+	(tclStubsPtr->tcl_RegExpGetInfo) /* 377 */
+#define Tcl_NewUnicodeObj \
+	(tclStubsPtr->tcl_NewUnicodeObj) /* 378 */
+#define Tcl_SetUnicodeObj \
+	(tclStubsPtr->tcl_SetUnicodeObj) /* 379 */
+#define TclGetCharLength \
+	(tclStubsPtr->tclGetCharLength) /* 380 */
+#define TclGetUniChar \
+	(tclStubsPtr->tclGetUniChar) /* 381 */
+/* Slot 382 is reserved */
+#define TclGetRange \
+	(tclStubsPtr->tclGetRange) /* 383 */
+#define Tcl_AppendUnicodeToObj \
+	(tclStubsPtr->tcl_AppendUnicodeToObj) /* 384 */
+#define Tcl_RegExpMatchObj \
+	(tclStubsPtr->tcl_RegExpMatchObj) /* 385 */
+#define Tcl_SetNotifier \
+	(tclStubsPtr->tcl_SetNotifier) /* 386 */
+#define Tcl_GetAllocMutex \
+	(tclStubsPtr->tcl_GetAllocMutex) /* 387 */
+#define Tcl_GetChannelNames \
+	(tclStubsPtr->tcl_GetChannelNames) /* 388 */
+#define Tcl_GetChannelNamesEx \
+	(tclStubsPtr->tcl_GetChannelNamesEx) /* 389 */
+#define Tcl_ProcObjCmd \
+	(tclStubsPtr->tcl_ProcObjCmd) /* 390 */
+#define Tcl_ConditionFinalize \
+	(tclStubsPtr->tcl_ConditionFinalize) /* 391 */
+#define Tcl_MutexFinalize \
+	(tclStubsPtr->tcl_MutexFinalize) /* 392 */
+#define Tcl_CreateThread \
+	(tclStubsPtr->tcl_CreateThread) /* 393 */
+#define Tcl_ReadRaw \
+	(tclStubsPtr->tcl_ReadRaw) /* 394 */
+#define Tcl_WriteRaw \
+	(tclStubsPtr->tcl_WriteRaw) /* 395 */
+#define Tcl_GetTopChannel \
+	(tclStubsPtr->tcl_GetTopChannel) /* 396 */
+#define Tcl_ChannelBuffered \
+	(tclStubsPtr->tcl_ChannelBuffered) /* 397 */
+#define Tcl_ChannelName \
+	(tclStubsPtr->tcl_ChannelName) /* 398 */
+#define Tcl_ChannelVersion \
+	(tclStubsPtr->tcl_ChannelVersion) /* 399 */
+#define Tcl_ChannelBlockModeProc \
+	(tclStubsPtr->tcl_ChannelBlockModeProc) /* 400 */
+/* Slot 401 is reserved */
+#define Tcl_ChannelClose2Proc \
+	(tclStubsPtr->tcl_ChannelClose2Proc) /* 402 */
+#define Tcl_ChannelInputProc \
+	(tclStubsPtr->tcl_ChannelInputProc) /* 403 */
+#define Tcl_ChannelOutputProc \
+	(tclStubsPtr->tcl_ChannelOutputProc) /* 404 */
+/* Slot 405 is reserved */
+#define Tcl_ChannelSetOptionProc \
+	(tclStubsPtr->tcl_ChannelSetOptionProc) /* 406 */
+#define Tcl_ChannelGetOptionProc \
+	(tclStubsPtr->tcl_ChannelGetOptionProc) /* 407 */
+#define Tcl_ChannelWatchProc \
+	(tclStubsPtr->tcl_ChannelWatchProc) /* 408 */
+#define Tcl_ChannelGetHandleProc \
+	(tclStubsPtr->tcl_ChannelGetHandleProc) /* 409 */
+#define Tcl_ChannelFlushProc \
+	(tclStubsPtr->tcl_ChannelFlushProc) /* 410 */
+#define Tcl_ChannelHandlerProc \
+	(tclStubsPtr->tcl_ChannelHandlerProc) /* 411 */
+#define Tcl_JoinThread \
+	(tclStubsPtr->tcl_JoinThread) /* 412 */
+#define Tcl_IsChannelShared \
+	(tclStubsPtr->tcl_IsChannelShared) /* 413 */
+#define Tcl_IsChannelRegistered \
+	(tclStubsPtr->tcl_IsChannelRegistered) /* 414 */
+#define Tcl_CutChannel \
+	(tclStubsPtr->tcl_CutChannel) /* 415 */
+#define Tcl_SpliceChannel \
+	(tclStubsPtr->tcl_SpliceChannel) /* 416 */
+#define Tcl_ClearChannelHandlers \
+	(tclStubsPtr->tcl_ClearChannelHandlers) /* 417 */
+#define Tcl_IsChannelExisting \
+	(tclStubsPtr->tcl_IsChannelExisting) /* 418 */
+/* Slot 419 is reserved */
+/* Slot 420 is reserved */
+/* Slot 421 is reserved */
+/* Slot 422 is reserved */
+#define Tcl_InitCustomHashTable \
+	(tclStubsPtr->tcl_InitCustomHashTable) /* 423 */
+#define Tcl_InitObjHashTable \
+	(tclStubsPtr->tcl_InitObjHashTable) /* 424 */
+#define Tcl_CommandTraceInfo \
+	(tclStubsPtr->tcl_CommandTraceInfo) /* 425 */
+#define Tcl_TraceCommand \
+	(tclStubsPtr->tcl_TraceCommand) /* 426 */
+#define Tcl_UntraceCommand \
+	(tclStubsPtr->tcl_UntraceCommand) /* 427 */
+#define Tcl_AttemptAlloc \
+	(tclStubsPtr->tcl_AttemptAlloc) /* 428 */
+#define Tcl_AttemptDbCkalloc \
+	(tclStubsPtr->tcl_AttemptDbCkalloc) /* 429 */
+#define Tcl_AttemptRealloc \
+	(tclStubsPtr->tcl_AttemptRealloc) /* 430 */
+#define Tcl_AttemptDbCkrealloc \
+	(tclStubsPtr->tcl_AttemptDbCkrealloc) /* 431 */
+#define Tcl_AttemptSetObjLength \
+	(tclStubsPtr->tcl_AttemptSetObjLength) /* 432 */
+#define Tcl_GetChannelThread \
+	(tclStubsPtr->tcl_GetChannelThread) /* 433 */
+#define TclGetUnicodeFromObj \
+	(tclStubsPtr->tclGetUnicodeFromObj) /* 434 */
+/* Slot 435 is reserved */
+/* Slot 436 is reserved */
+#define Tcl_SubstObj \
+	(tclStubsPtr->tcl_SubstObj) /* 437 */
+#define Tcl_DetachChannel \
+	(tclStubsPtr->tcl_DetachChannel) /* 438 */
+#define Tcl_IsStandardChannel \
+	(tclStubsPtr->tcl_IsStandardChannel) /* 439 */
+#define Tcl_FSCopyFile \
+	(tclStubsPtr->tcl_FSCopyFile) /* 440 */
+#define Tcl_FSCopyDirectory \
+	(tclStubsPtr->tcl_FSCopyDirectory) /* 441 */
+#define Tcl_FSCreateDirectory \
+	(tclStubsPtr->tcl_FSCreateDirectory) /* 442 */
+#define Tcl_FSDeleteFile \
+	(tclStubsPtr->tcl_FSDeleteFile) /* 443 */
+#define Tcl_FSLoadFile \
+	(tclStubsPtr->tcl_FSLoadFile) /* 444 */
+#define Tcl_FSMatchInDirectory \
+	(tclStubsPtr->tcl_FSMatchInDirectory) /* 445 */
+#define Tcl_FSLink \
+	(tclStubsPtr->tcl_FSLink) /* 446 */
+#define Tcl_FSRemoveDirectory \
+	(tclStubsPtr->tcl_FSRemoveDirectory) /* 447 */
+#define Tcl_FSRenameFile \
+	(tclStubsPtr->tcl_FSRenameFile) /* 448 */
+#define Tcl_FSLstat \
+	(tclStubsPtr->tcl_FSLstat) /* 449 */
+#define Tcl_FSUtime \
+	(tclStubsPtr->tcl_FSUtime) /* 450 */
+#define Tcl_FSFileAttrsGet \
+	(tclStubsPtr->tcl_FSFileAttrsGet) /* 451 */
+#define Tcl_FSFileAttrsSet \
+	(tclStubsPtr->tcl_FSFileAttrsSet) /* 452 */
+#define Tcl_FSFileAttrStrings \
+	(tclStubsPtr->tcl_FSFileAttrStrings) /* 453 */
+#define Tcl_FSStat \
+	(tclStubsPtr->tcl_FSStat) /* 454 */
+#define Tcl_FSAccess \
+	(tclStubsPtr->tcl_FSAccess) /* 455 */
+#define Tcl_FSOpenFileChannel \
+	(tclStubsPtr->tcl_FSOpenFileChannel) /* 456 */
+#define Tcl_FSGetCwd \
+	(tclStubsPtr->tcl_FSGetCwd) /* 457 */
+#define Tcl_FSChdir \
+	(tclStubsPtr->tcl_FSChdir) /* 458 */
+#define Tcl_FSConvertToPathType \
+	(tclStubsPtr->tcl_FSConvertToPathType) /* 459 */
+#define Tcl_FSJoinPath \
+	(tclStubsPtr->tcl_FSJoinPath) /* 460 */
+#define TclFSSplitPath \
+	(tclStubsPtr->tclFSSplitPath) /* 461 */
+#define Tcl_FSEqualPaths \
+	(tclStubsPtr->tcl_FSEqualPaths) /* 462 */
+#define Tcl_FSGetNormalizedPath \
+	(tclStubsPtr->tcl_FSGetNormalizedPath) /* 463 */
+#define Tcl_FSJoinToPath \
+	(tclStubsPtr->tcl_FSJoinToPath) /* 464 */
+#define Tcl_FSGetInternalRep \
+	(tclStubsPtr->tcl_FSGetInternalRep) /* 465 */
+#define Tcl_FSGetTranslatedPath \
+	(tclStubsPtr->tcl_FSGetTranslatedPath) /* 466 */
+#define Tcl_FSEvalFile \
+	(tclStubsPtr->tcl_FSEvalFile) /* 467 */
+#define Tcl_FSNewNativePath \
+	(tclStubsPtr->tcl_FSNewNativePath) /* 468 */
+#define Tcl_FSGetNativePath \
+	(tclStubsPtr->tcl_FSGetNativePath) /* 469 */
+#define Tcl_FSFileSystemInfo \
+	(tclStubsPtr->tcl_FSFileSystemInfo) /* 470 */
+#define Tcl_FSPathSeparator \
+	(tclStubsPtr->tcl_FSPathSeparator) /* 471 */
+#define Tcl_FSListVolumes \
+	(tclStubsPtr->tcl_FSListVolumes) /* 472 */
+#define Tcl_FSRegister \
+	(tclStubsPtr->tcl_FSRegister) /* 473 */
+#define Tcl_FSUnregister \
+	(tclStubsPtr->tcl_FSUnregister) /* 474 */
+#define Tcl_FSData \
+	(tclStubsPtr->tcl_FSData) /* 475 */
+#define Tcl_FSGetTranslatedStringPath \
+	(tclStubsPtr->tcl_FSGetTranslatedStringPath) /* 476 */
+#define Tcl_FSGetFileSystemForPath \
+	(tclStubsPtr->tcl_FSGetFileSystemForPath) /* 477 */
+#define Tcl_FSGetPathType \
+	(tclStubsPtr->tcl_FSGetPathType) /* 478 */
+#define Tcl_OutputBuffered \
+	(tclStubsPtr->tcl_OutputBuffered) /* 479 */
+#define Tcl_FSMountsChanged \
+	(tclStubsPtr->tcl_FSMountsChanged) /* 480 */
+#define Tcl_EvalTokensStandard \
+	(tclStubsPtr->tcl_EvalTokensStandard) /* 481 */
+#define Tcl_GetTime \
+	(tclStubsPtr->tcl_GetTime) /* 482 */
+#define Tcl_CreateObjTrace \
+	(tclStubsPtr->tcl_CreateObjTrace) /* 483 */
+#define Tcl_GetCommandInfoFromToken \
+	(tclStubsPtr->tcl_GetCommandInfoFromToken) /* 484 */
+#define Tcl_SetCommandInfoFromToken \
+	(tclStubsPtr->tcl_SetCommandInfoFromToken) /* 485 */
+#define Tcl_DbNewWideIntObj \
+	(tclStubsPtr->tcl_DbNewWideIntObj) /* 486 */
+#define Tcl_GetWideIntFromObj \
+	(tclStubsPtr->tcl_GetWideIntFromObj) /* 487 */
+#define Tcl_NewWideIntObj \
+	(tclStubsPtr->tcl_NewWideIntObj) /* 488 */
+#define Tcl_SetWideIntObj \
+	(tclStubsPtr->tcl_SetWideIntObj) /* 489 */
+#define Tcl_AllocStatBuf \
+	(tclStubsPtr->tcl_AllocStatBuf) /* 490 */
+#define Tcl_Seek \
+	(tclStubsPtr->tcl_Seek) /* 491 */
+#define Tcl_Tell \
+	(tclStubsPtr->tcl_Tell) /* 492 */
+#define Tcl_ChannelWideSeekProc \
+	(tclStubsPtr->tcl_ChannelWideSeekProc) /* 493 */
+#define Tcl_DictObjPut \
+	(tclStubsPtr->tcl_DictObjPut) /* 494 */
+#define Tcl_DictObjGet \
+	(tclStubsPtr->tcl_DictObjGet) /* 495 */
+#define Tcl_DictObjRemove \
+	(tclStubsPtr->tcl_DictObjRemove) /* 496 */
+#define TclDictObjSize \
+	(tclStubsPtr->tclDictObjSize) /* 497 */
+#define Tcl_DictObjFirst \
+	(tclStubsPtr->tcl_DictObjFirst) /* 498 */
+#define Tcl_DictObjNext \
+	(tclStubsPtr->tcl_DictObjNext) /* 499 */
+#define Tcl_DictObjDone \
+	(tclStubsPtr->tcl_DictObjDone) /* 500 */
+#define Tcl_DictObjPutKeyList \
+	(tclStubsPtr->tcl_DictObjPutKeyList) /* 501 */
+#define Tcl_DictObjRemoveKeyList \
+	(tclStubsPtr->tcl_DictObjRemoveKeyList) /* 502 */
+#define Tcl_NewDictObj \
+	(tclStubsPtr->tcl_NewDictObj) /* 503 */
+#define Tcl_DbNewDictObj \
+	(tclStubsPtr->tcl_DbNewDictObj) /* 504 */
+#define Tcl_RegisterConfig \
+	(tclStubsPtr->tcl_RegisterConfig) /* 505 */
+#define Tcl_CreateNamespace \
+	(tclStubsPtr->tcl_CreateNamespace) /* 506 */
+#define Tcl_DeleteNamespace \
+	(tclStubsPtr->tcl_DeleteNamespace) /* 507 */
+#define Tcl_AppendExportList \
+	(tclStubsPtr->tcl_AppendExportList) /* 508 */
+#define Tcl_Export \
+	(tclStubsPtr->tcl_Export) /* 509 */
+#define Tcl_Import \
+	(tclStubsPtr->tcl_Import) /* 510 */
+#define Tcl_ForgetImport \
+	(tclStubsPtr->tcl_ForgetImport) /* 511 */
+#define Tcl_GetCurrentNamespace \
+	(tclStubsPtr->tcl_GetCurrentNamespace) /* 512 */
+#define Tcl_GetGlobalNamespace \
+	(tclStubsPtr->tcl_GetGlobalNamespace) /* 513 */
+#define Tcl_FindNamespace \
+	(tclStubsPtr->tcl_FindNamespace) /* 514 */
+#define Tcl_FindCommand \
+	(tclStubsPtr->tcl_FindCommand) /* 515 */
+#define Tcl_GetCommandFromObj \
+	(tclStubsPtr->tcl_GetCommandFromObj) /* 516 */
+#define Tcl_GetCommandFullName \
+	(tclStubsPtr->tcl_GetCommandFullName) /* 517 */
+#define Tcl_FSEvalFileEx \
+	(tclStubsPtr->tcl_FSEvalFileEx) /* 518 */
+/* Slot 519 is reserved */
+#define Tcl_LimitAddHandler \
+	(tclStubsPtr->tcl_LimitAddHandler) /* 520 */
+#define Tcl_LimitRemoveHandler \
+	(tclStubsPtr->tcl_LimitRemoveHandler) /* 521 */
+#define Tcl_LimitReady \
+	(tclStubsPtr->tcl_LimitReady) /* 522 */
+#define Tcl_LimitCheck \
+	(tclStubsPtr->tcl_LimitCheck) /* 523 */
+#define Tcl_LimitExceeded \
+	(tclStubsPtr->tcl_LimitExceeded) /* 524 */
+#define Tcl_LimitSetCommands \
+	(tclStubsPtr->tcl_LimitSetCommands) /* 525 */
+#define Tcl_LimitSetTime \
+	(tclStubsPtr->tcl_LimitSetTime) /* 526 */
+#define Tcl_LimitSetGranularity \
+	(tclStubsPtr->tcl_LimitSetGranularity) /* 527 */
+#define Tcl_LimitTypeEnabled \
+	(tclStubsPtr->tcl_LimitTypeEnabled) /* 528 */
+#define Tcl_LimitTypeExceeded \
+	(tclStubsPtr->tcl_LimitTypeExceeded) /* 529 */
+#define Tcl_LimitTypeSet \
+	(tclStubsPtr->tcl_LimitTypeSet) /* 530 */
+#define Tcl_LimitTypeReset \
+	(tclStubsPtr->tcl_LimitTypeReset) /* 531 */
+#define Tcl_LimitGetCommands \
+	(tclStubsPtr->tcl_LimitGetCommands) /* 532 */
+#define Tcl_LimitGetTime \
+	(tclStubsPtr->tcl_LimitGetTime) /* 533 */
+#define Tcl_LimitGetGranularity \
+	(tclStubsPtr->tcl_LimitGetGranularity) /* 534 */
+#define Tcl_SaveInterpState \
+	(tclStubsPtr->tcl_SaveInterpState) /* 535 */
+#define Tcl_RestoreInterpState \
+	(tclStubsPtr->tcl_RestoreInterpState) /* 536 */
+#define Tcl_DiscardInterpState \
+	(tclStubsPtr->tcl_DiscardInterpState) /* 537 */
+#define Tcl_SetReturnOptions \
+	(tclStubsPtr->tcl_SetReturnOptions) /* 538 */
+#define Tcl_GetReturnOptions \
+	(tclStubsPtr->tcl_GetReturnOptions) /* 539 */
+#define Tcl_IsEnsemble \
+	(tclStubsPtr->tcl_IsEnsemble) /* 540 */
+#define Tcl_CreateEnsemble \
+	(tclStubsPtr->tcl_CreateEnsemble) /* 541 */
+#define Tcl_FindEnsemble \
+	(tclStubsPtr->tcl_FindEnsemble) /* 542 */
+#define Tcl_SetEnsembleSubcommandList \
+	(tclStubsPtr->tcl_SetEnsembleSubcommandList) /* 543 */
+#define Tcl_SetEnsembleMappingDict \
+	(tclStubsPtr->tcl_SetEnsembleMappingDict) /* 544 */
+#define Tcl_SetEnsembleUnknownHandler \
+	(tclStubsPtr->tcl_SetEnsembleUnknownHandler) /* 545 */
+#define Tcl_SetEnsembleFlags \
+	(tclStubsPtr->tcl_SetEnsembleFlags) /* 546 */
+#define Tcl_GetEnsembleSubcommandList \
+	(tclStubsPtr->tcl_GetEnsembleSubcommandList) /* 547 */
+#define Tcl_GetEnsembleMappingDict \
+	(tclStubsPtr->tcl_GetEnsembleMappingDict) /* 548 */
+#define Tcl_GetEnsembleUnknownHandler \
+	(tclStubsPtr->tcl_GetEnsembleUnknownHandler) /* 549 */
+#define Tcl_GetEnsembleFlags \
+	(tclStubsPtr->tcl_GetEnsembleFlags) /* 550 */
+#define Tcl_GetEnsembleNamespace \
+	(tclStubsPtr->tcl_GetEnsembleNamespace) /* 551 */
+#define Tcl_SetTimeProc \
+	(tclStubsPtr->tcl_SetTimeProc) /* 552 */
+#define Tcl_QueryTimeProc \
+	(tclStubsPtr->tcl_QueryTimeProc) /* 553 */
+#define Tcl_ChannelThreadActionProc \
+	(tclStubsPtr->tcl_ChannelThreadActionProc) /* 554 */
+#define Tcl_NewBignumObj \
+	(tclStubsPtr->tcl_NewBignumObj) /* 555 */
+#define Tcl_DbNewBignumObj \
+	(tclStubsPtr->tcl_DbNewBignumObj) /* 556 */
+#define Tcl_SetBignumObj \
+	(tclStubsPtr->tcl_SetBignumObj) /* 557 */
+#define Tcl_GetBignumFromObj \
+	(tclStubsPtr->tcl_GetBignumFromObj) /* 558 */
+#define Tcl_TakeBignumFromObj \
+	(tclStubsPtr->tcl_TakeBignumFromObj) /* 559 */
+#define Tcl_TruncateChannel \
+	(tclStubsPtr->tcl_TruncateChannel) /* 560 */
+#define Tcl_ChannelTruncateProc \
+	(tclStubsPtr->tcl_ChannelTruncateProc) /* 561 */
+#define Tcl_SetChannelErrorInterp \
+	(tclStubsPtr->tcl_SetChannelErrorInterp) /* 562 */
+#define Tcl_GetChannelErrorInterp \
+	(tclStubsPtr->tcl_GetChannelErrorInterp) /* 563 */
+#define Tcl_SetChannelError \
+	(tclStubsPtr->tcl_SetChannelError) /* 564 */
+#define Tcl_GetChannelError \
+	(tclStubsPtr->tcl_GetChannelError) /* 565 */
+#define Tcl_InitBignumFromDouble \
+	(tclStubsPtr->tcl_InitBignumFromDouble) /* 566 */
+#define Tcl_GetNamespaceUnknownHandler \
+	(tclStubsPtr->tcl_GetNamespaceUnknownHandler) /* 567 */
+#define Tcl_SetNamespaceUnknownHandler \
+	(tclStubsPtr->tcl_SetNamespaceUnknownHandler) /* 568 */
+#define Tcl_GetEncodingFromObj \
+	(tclStubsPtr->tcl_GetEncodingFromObj) /* 569 */
+#define Tcl_GetEncodingSearchPath \
+	(tclStubsPtr->tcl_GetEncodingSearchPath) /* 570 */
+#define Tcl_SetEncodingSearchPath \
+	(tclStubsPtr->tcl_SetEncodingSearchPath) /* 571 */
+#define Tcl_GetEncodingNameFromEnvironment \
+	(tclStubsPtr->tcl_GetEncodingNameFromEnvironment) /* 572 */
+#define Tcl_PkgRequireProc \
+	(tclStubsPtr->tcl_PkgRequireProc) /* 573 */
+#define Tcl_AppendObjToErrorInfo \
+	(tclStubsPtr->tcl_AppendObjToErrorInfo) /* 574 */
+#define Tcl_AppendLimitedToObj \
+	(tclStubsPtr->tcl_AppendLimitedToObj) /* 575 */
+#define Tcl_Format \
+	(tclStubsPtr->tcl_Format) /* 576 */
+#define Tcl_AppendFormatToObj \
+	(tclStubsPtr->tcl_AppendFormatToObj) /* 577 */
+#define Tcl_ObjPrintf \
+	(tclStubsPtr->tcl_ObjPrintf) /* 578 */
+#define Tcl_AppendPrintfToObj \
+	(tclStubsPtr->tcl_AppendPrintfToObj) /* 579 */
+#define Tcl_CancelEval \
+	(tclStubsPtr->tcl_CancelEval) /* 580 */
+#define Tcl_Canceled \
+	(tclStubsPtr->tcl_Canceled) /* 581 */
+#define Tcl_CreatePipe \
+	(tclStubsPtr->tcl_CreatePipe) /* 582 */
+#define Tcl_NRCreateCommand \
+	(tclStubsPtr->tcl_NRCreateCommand) /* 583 */
+#define Tcl_NREvalObj \
+	(tclStubsPtr->tcl_NREvalObj) /* 584 */
+#define Tcl_NREvalObjv \
+	(tclStubsPtr->tcl_NREvalObjv) /* 585 */
+#define Tcl_NRCmdSwap \
+	(tclStubsPtr->tcl_NRCmdSwap) /* 586 */
+#define Tcl_NRAddCallback \
+	(tclStubsPtr->tcl_NRAddCallback) /* 587 */
+#define Tcl_NRCallObjProc \
+	(tclStubsPtr->tcl_NRCallObjProc) /* 588 */
+#define Tcl_GetFSDeviceFromStat \
+	(tclStubsPtr->tcl_GetFSDeviceFromStat) /* 589 */
+#define Tcl_GetFSInodeFromStat \
+	(tclStubsPtr->tcl_GetFSInodeFromStat) /* 590 */
+#define Tcl_GetModeFromStat \
+	(tclStubsPtr->tcl_GetModeFromStat) /* 591 */
+#define Tcl_GetLinkCountFromStat \
+	(tclStubsPtr->tcl_GetLinkCountFromStat) /* 592 */
+#define Tcl_GetUserIdFromStat \
+	(tclStubsPtr->tcl_GetUserIdFromStat) /* 593 */
+#define Tcl_GetGroupIdFromStat \
+	(tclStubsPtr->tcl_GetGroupIdFromStat) /* 594 */
+#define Tcl_GetDeviceTypeFromStat \
+	(tclStubsPtr->tcl_GetDeviceTypeFromStat) /* 595 */
+#define Tcl_GetAccessTimeFromStat \
+	(tclStubsPtr->tcl_GetAccessTimeFromStat) /* 596 */
+#define Tcl_GetModificationTimeFromStat \
+	(tclStubsPtr->tcl_GetModificationTimeFromStat) /* 597 */
+#define Tcl_GetChangeTimeFromStat \
+	(tclStubsPtr->tcl_GetChangeTimeFromStat) /* 598 */
+#define Tcl_GetSizeFromStat \
+	(tclStubsPtr->tcl_GetSizeFromStat) /* 599 */
+#define Tcl_GetBlocksFromStat \
+	(tclStubsPtr->tcl_GetBlocksFromStat) /* 600 */
+#define Tcl_GetBlockSizeFromStat \
+	(tclStubsPtr->tcl_GetBlockSizeFromStat) /* 601 */
+#define Tcl_SetEnsembleParameterList \
+	(tclStubsPtr->tcl_SetEnsembleParameterList) /* 602 */
+#define Tcl_GetEnsembleParameterList \
+	(tclStubsPtr->tcl_GetEnsembleParameterList) /* 603 */
+#define TclParseArgsObjv \
+	(tclStubsPtr->tclParseArgsObjv) /* 604 */
+#define Tcl_GetErrorLine \
+	(tclStubsPtr->tcl_GetErrorLine) /* 605 */
+#define Tcl_SetErrorLine \
+	(tclStubsPtr->tcl_SetErrorLine) /* 606 */
+#define Tcl_TransferResult \
+	(tclStubsPtr->tcl_TransferResult) /* 607 */
+#define Tcl_InterpActive \
+	(tclStubsPtr->tcl_InterpActive) /* 608 */
+#define Tcl_BackgroundException \
+	(tclStubsPtr->tcl_BackgroundException) /* 609 */
+#define Tcl_ZlibDeflate \
+	(tclStubsPtr->tcl_ZlibDeflate) /* 610 */
+#define Tcl_ZlibInflate \
+	(tclStubsPtr->tcl_ZlibInflate) /* 611 */
+#define Tcl_ZlibCRC32 \
+	(tclStubsPtr->tcl_ZlibCRC32) /* 612 */
+#define Tcl_ZlibAdler32 \
+	(tclStubsPtr->tcl_ZlibAdler32) /* 613 */
+#define Tcl_ZlibStreamInit \
+	(tclStubsPtr->tcl_ZlibStreamInit) /* 614 */
+#define Tcl_ZlibStreamGetCommandName \
+	(tclStubsPtr->tcl_ZlibStreamGetCommandName) /* 615 */
+#define Tcl_ZlibStreamEof \
+	(tclStubsPtr->tcl_ZlibStreamEof) /* 616 */
+#define Tcl_ZlibStreamChecksum \
+	(tclStubsPtr->tcl_ZlibStreamChecksum) /* 617 */
+#define Tcl_ZlibStreamPut \
+	(tclStubsPtr->tcl_ZlibStreamPut) /* 618 */
+#define Tcl_ZlibStreamGet \
+	(tclStubsPtr->tcl_ZlibStreamGet) /* 619 */
+#define Tcl_ZlibStreamClose \
+	(tclStubsPtr->tcl_ZlibStreamClose) /* 620 */
+#define Tcl_ZlibStreamReset \
+	(tclStubsPtr->tcl_ZlibStreamReset) /* 621 */
+#define Tcl_SetStartupScript \
+	(tclStubsPtr->tcl_SetStartupScript) /* 622 */
+#define Tcl_GetStartupScript \
+	(tclStubsPtr->tcl_GetStartupScript) /* 623 */
+#define Tcl_CloseEx \
+	(tclStubsPtr->tcl_CloseEx) /* 624 */
+#define Tcl_NRExprObj \
+	(tclStubsPtr->tcl_NRExprObj) /* 625 */
+#define Tcl_NRSubstObj \
+	(tclStubsPtr->tcl_NRSubstObj) /* 626 */
+#define Tcl_LoadFile \
+	(tclStubsPtr->tcl_LoadFile) /* 627 */
+#define Tcl_FindSymbol \
+	(tclStubsPtr->tcl_FindSymbol) /* 628 */
+#define Tcl_FSUnloadFile \
+	(tclStubsPtr->tcl_FSUnloadFile) /* 629 */
+#define Tcl_ZlibStreamSetCompressionDictionary \
+	(tclStubsPtr->tcl_ZlibStreamSetCompressionDictionary) /* 630 */
+#define Tcl_OpenTcpServerEx \
+	(tclStubsPtr->tcl_OpenTcpServerEx) /* 631 */
+#define TclZipfs_Mount \
+	(tclStubsPtr->tclZipfs_Mount) /* 632 */
+#define TclZipfs_Unmount \
+	(tclStubsPtr->tclZipfs_Unmount) /* 633 */
+#define TclZipfs_TclLibrary \
+	(tclStubsPtr->tclZipfs_TclLibrary) /* 634 */
+#define TclZipfs_MountBuffer \
+	(tclStubsPtr->tclZipfs_MountBuffer) /* 635 */
+#define Tcl_FreeInternalRep \
+	(tclStubsPtr->tcl_FreeInternalRep) /* 636 */
+#define Tcl_InitStringRep \
+	(tclStubsPtr->tcl_InitStringRep) /* 637 */
+#define Tcl_FetchInternalRep \
+	(tclStubsPtr->tcl_FetchInternalRep) /* 638 */
+#define Tcl_StoreInternalRep \
+	(tclStubsPtr->tcl_StoreInternalRep) /* 639 */
+#define Tcl_HasStringRep \
+	(tclStubsPtr->tcl_HasStringRep) /* 640 */
+#define Tcl_IncrRefCount \
+	(tclStubsPtr->tcl_IncrRefCount) /* 641 */
+#define Tcl_DecrRefCount \
+	(tclStubsPtr->tcl_DecrRefCount) /* 642 */
+#define Tcl_IsShared \
+	(tclStubsPtr->tcl_IsShared) /* 643 */
+#define Tcl_LinkArray \
+	(tclStubsPtr->tcl_LinkArray) /* 644 */
+#define Tcl_GetIntForIndex \
+	(tclStubsPtr->tcl_GetIntForIndex) /* 645 */
+#define Tcl_UtfToUniChar \
+	(tclStubsPtr->tcl_UtfToUniChar) /* 646 */
+#define Tcl_UniCharToUtfDString \
+	(tclStubsPtr->tcl_UniCharToUtfDString) /* 647 */
+#define Tcl_UtfToUniCharDString \
+	(tclStubsPtr->tcl_UtfToUniCharDString) /* 648 */
+#define TclGetBytesFromObj \
+	(tclStubsPtr->tclGetBytesFromObj) /* 649 */
+#define Tcl_GetBytesFromObj \
+	(tclStubsPtr->tcl_GetBytesFromObj) /* 650 */
+#define Tcl_GetStringFromObj \
+	(tclStubsPtr->tcl_GetStringFromObj) /* 651 */
+#define Tcl_GetUnicodeFromObj \
+	(tclStubsPtr->tcl_GetUnicodeFromObj) /* 652 */
+#define Tcl_GetSizeIntFromObj \
+	(tclStubsPtr->tcl_GetSizeIntFromObj) /* 653 */
+#define Tcl_UtfCharComplete \
+	(tclStubsPtr->tcl_UtfCharComplete) /* 654 */
+#define Tcl_UtfNext \
+	(tclStubsPtr->tcl_UtfNext) /* 655 */
+#define Tcl_UtfPrev \
+	(tclStubsPtr->tcl_UtfPrev) /* 656 */
+#define Tcl_UniCharIsUnicode \
+	(tclStubsPtr->tcl_UniCharIsUnicode) /* 657 */
+#define Tcl_ExternalToUtfDStringEx \
+	(tclStubsPtr->tcl_ExternalToUtfDStringEx) /* 658 */
+#define Tcl_UtfToExternalDStringEx \
+	(tclStubsPtr->tcl_UtfToExternalDStringEx) /* 659 */
+#define Tcl_AsyncMarkFromSignal \
+	(tclStubsPtr->tcl_AsyncMarkFromSignal) /* 660 */
+#define Tcl_ListObjGetElements \
+	(tclStubsPtr->tcl_ListObjGetElements) /* 661 */
+#define Tcl_ListObjLength \
+	(tclStubsPtr->tcl_ListObjLength) /* 662 */
+#define Tcl_DictObjSize \
+	(tclStubsPtr->tcl_DictObjSize) /* 663 */
+#define Tcl_SplitList \
+	(tclStubsPtr->tcl_SplitList) /* 664 */
+#define Tcl_SplitPath \
+	(tclStubsPtr->tcl_SplitPath) /* 665 */
+#define Tcl_FSSplitPath \
+	(tclStubsPtr->tcl_FSSplitPath) /* 666 */
+#define Tcl_ParseArgsObjv \
+	(tclStubsPtr->tcl_ParseArgsObjv) /* 667 */
+#define Tcl_UniCharLen \
+	(tclStubsPtr->tcl_UniCharLen) /* 668 */
+#define Tcl_NumUtfChars \
+	(tclStubsPtr->tcl_NumUtfChars) /* 669 */
+#define Tcl_GetCharLength \
+	(tclStubsPtr->tcl_GetCharLength) /* 670 */
+#define Tcl_UtfAtIndex \
+	(tclStubsPtr->tcl_UtfAtIndex) /* 671 */
+#define Tcl_GetRange \
+	(tclStubsPtr->tcl_GetRange) /* 672 */
+#define Tcl_GetUniChar \
+	(tclStubsPtr->tcl_GetUniChar) /* 673 */
+#define Tcl_GetBool \
+	(tclStubsPtr->tcl_GetBool) /* 674 */
+#define Tcl_GetBoolFromObj \
+	(tclStubsPtr->tcl_GetBoolFromObj) /* 675 */
+#define Tcl_CreateObjCommand2 \
+	(tclStubsPtr->tcl_CreateObjCommand2) /* 676 */
+#define Tcl_CreateObjTrace2 \
+	(tclStubsPtr->tcl_CreateObjTrace2) /* 677 */
+#define Tcl_NRCreateCommand2 \
+	(tclStubsPtr->tcl_NRCreateCommand2) /* 678 */
+#define Tcl_NRCallObjProc2 \
+	(tclStubsPtr->tcl_NRCallObjProc2) /* 679 */
+#define Tcl_GetNumberFromObj \
+	(tclStubsPtr->tcl_GetNumberFromObj) /* 680 */
+#define Tcl_GetNumber \
+	(tclStubsPtr->tcl_GetNumber) /* 681 */
+#define Tcl_RemoveChannelMode \
+	(tclStubsPtr->tcl_RemoveChannelMode) /* 682 */
+#define Tcl_GetEncodingNulLength \
+	(tclStubsPtr->tcl_GetEncodingNulLength) /* 683 */
+#define Tcl_GetWideUIntFromObj \
+	(tclStubsPtr->tcl_GetWideUIntFromObj) /* 684 */
+#define Tcl_DStringToObj \
+	(tclStubsPtr->tcl_DStringToObj) /* 685 */
+/* Slot 686 is reserved */
+/* Slot 687 is reserved */
+#define TclUnusedStubEntry \
+	(tclStubsPtr->tclUnusedStubEntry) /* 688 */
+
+#endif /* defined(USE_TCL_STUBS) */
+
+/* !END!: Do not edit above this line. */
+
+#undef TclUnusedStubEntry
+
+#ifdef _WIN32
+#   undef Tcl_CreateFileHandler
+#   undef Tcl_DeleteFileHandler
+#   undef Tcl_GetOpenFile
+#endif
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
+#define Tcl_PkgPresent(interp, name, version, exact) \
+	Tcl_PkgPresentEx(interp, name, version, exact, NULL)
+#define Tcl_PkgProvide(interp, name, version) \
+	Tcl_PkgProvideEx(interp, name, version, NULL)
+#define Tcl_PkgRequire(interp, name, version, exact) \
+	Tcl_PkgRequireEx(interp, name, version, exact, NULL)
+#define Tcl_GetIndexFromObj(interp, objPtr, tablePtr, msg, flags, indexPtr) \
+	Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, \
+	sizeof(char *), msg, flags, indexPtr)
+#define Tcl_NewBooleanObj(intValue) \
+	Tcl_NewWideIntObj((intValue)!=0)
+#define Tcl_DbNewBooleanObj(intValue, file, line) \
+	Tcl_DbNewWideIntObj((intValue)!=0, file, line)
+#define Tcl_SetBooleanObj(objPtr, intValue) \
+	Tcl_SetWideIntObj(objPtr, (intValue)!=0)
+#define Tcl_SetVar(interp, varName, newValue, flags) \
+	Tcl_SetVar2(interp, varName, NULL, newValue, flags)
+#define Tcl_UnsetVar(interp, varName, flags) \
+	Tcl_UnsetVar2(interp, varName, NULL, flags)
+#define Tcl_GetVar(interp, varName, flags) \
+	Tcl_GetVar2(interp, varName, NULL, flags)
+#define Tcl_TraceVar(interp, varName, flags, proc, clientData) \
+	Tcl_TraceVar2(interp, varName, NULL, flags, proc, clientData)
+#define Tcl_UntraceVar(interp, varName, flags, proc, clientData) \
+	Tcl_UntraceVar2(interp, varName, NULL, flags, proc, clientData)
+#define Tcl_VarTraceInfo(interp, varName, flags, proc, prevClientData) \
+	Tcl_VarTraceInfo2(interp, varName, NULL, flags, proc, prevClientData)
+#define Tcl_UpVar(interp, frameName, varName, localName, flags) \
+	Tcl_UpVar2(interp, frameName, varName, NULL, localName, flags)
+#define Tcl_AddErrorInfo(interp, message) \
+	Tcl_AppendObjToErrorInfo(interp, Tcl_NewStringObj(message, -1))
+#define Tcl_AddObjErrorInfo(interp, message, length) \
+	Tcl_AppendObjToErrorInfo(interp, Tcl_NewStringObj(message, length))
+#define Tcl_Eval(interp, objPtr) \
+	Tcl_EvalEx(interp, objPtr, TCL_INDEX_NONE, 0)
+#define Tcl_GlobalEval(interp, objPtr) \
+	Tcl_EvalEx(interp, objPtr, TCL_INDEX_NONE, TCL_EVAL_GLOBAL)
+#define Tcl_GetStringResult(interp) Tcl_GetString(Tcl_GetObjResult(interp))
+#define Tcl_SetResult(interp, result, freeProc) \
+	do { \
+	    const char *__result = result; \
+	    Tcl_FreeProc *__freeProc = freeProc; \
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(__result, -1)); \
+	    if (__result != NULL && __freeProc != NULL && __freeProc != TCL_VOLATILE) { \
+		if (__freeProc == TCL_DYNAMIC) { \
+		    Tcl_Free((char *)__result); \
+		} else { \
+		    (*__freeProc)((char *)__result); \
+		} \
+	    } \
+	} while(0)
+
+#if defined(USE_TCL_STUBS)
+#   if defined(_WIN32) && defined(_WIN64) && TCL_MAJOR_VERSION < 9
+#	undef Tcl_GetTime
+/* Handle Win64 tk.dll being loaded in Cygwin64 (only needed for Tcl 8). */
+#	define Tcl_GetTime(t) \
+		do { \
+		    struct { \
+			Tcl_Time now; \
+			long long reserved; \
+		    } _t; \
+		    _t.reserved = -1; \
+		    tclStubsPtr->tcl_GetTime((&_t.now)); \
+		    if (_t.reserved != -1) { \
+			_t.now.usec = (long) _t.reserved; \
+		    } \
+		    *(t) = _t.now; \
+		} while (0)
+#   endif
+#   if defined(__CYGWIN__) && defined(TCL_WIDE_INT_IS_LONG)
+/* On Cygwin64, long is 64-bit while on Win64 long is 32-bit. Therefore
+ * we have to make sure that all stub entries on Cygwin64 follow the
+ * Win64 signature. Cygwin64 stubbed extensions cannot use those stub
+ * entries any more, they should use the 64-bit alternatives where
+ * possible. Tcl 9 must find a better solution, but that cannot be done
+ * without introducing a binary incompatibility.
+ */
+#	undef Tcl_GetLongFromObj
+#	undef Tcl_ExprLong
+#	undef Tcl_ExprLongObj
+#	define Tcl_GetLongFromObj ((int(*)(Tcl_Interp*,Tcl_Obj*,long*))Tcl_GetWideIntFromObj)
+#	define Tcl_ExprLong TclExprLong
+	static inline int TclExprLong(Tcl_Interp *interp, const char *string, long *ptr){
+	    int intValue;
+	    int result = tclStubsPtr->tcl_ExprLong(interp, string, (long *)&intValue);
+	    if (result == TCL_OK) *ptr = (long)intValue;
+	    return result;
+	}
+#	define Tcl_ExprLongObj TclExprLongObj
+	static inline int TclExprLongObj(Tcl_Interp *interp, Tcl_Obj *obj, long *ptr){
+	    int intValue;
+	    int result = tclStubsPtr->tcl_ExprLongObj(interp, obj, (long *)&intValue);
+	    if (result == TCL_OK) *ptr = (long)intValue;
+	    return result;
+	}
+#   endif
+#endif
+
+#undef Tcl_GetString
+#undef Tcl_GetUnicode
+#define Tcl_GetString(objPtr) \
+	Tcl_GetStringFromObj(objPtr, (Tcl_Size *)NULL)
+#define Tcl_GetUnicode(objPtr) \
+	Tcl_GetUnicodeFromObj(objPtr, (Tcl_Size *)NULL)
+#undef Tcl_GetIndexFromObjStruct
+#undef Tcl_GetBooleanFromObj
+#undef Tcl_GetBoolean
+#ifdef __GNUC__
+	/* If this gives: "error: size of array ‘_bool_Var’ is negative", it means that sizeof(*boolPtr)>sizeof(int), which is not allowed */
+#   define TCLBOOLWARNING(boolPtr) ({__attribute__((unused)) char _bool_Var[sizeof(*(boolPtr)) > sizeof(int) ? -1 : 1];}),
+#else
+#   define TCLBOOLWARNING(boolPtr)
+#endif
+#if defined(USE_TCL_STUBS)
+#define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
+	(tclStubsPtr->tcl_GetIndexFromObjStruct((interp), (objPtr), (tablePtr), (offset), (msg), \
+		(flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
+#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
+	(TCLBOOLWARNING(boolPtr)(sizeof(*(boolPtr)) >= sizeof(int) && (TCL_MAJOR_VERSION == 8)) ? tclStubsPtr->tcl_GetBooleanFromObj(interp, objPtr, (int *)(boolPtr)) : \
+	Tcl_GetBoolFromObj(interp, objPtr, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
+#define Tcl_GetBoolean(interp, src, boolPtr) \
+	(TCLBOOLWARNING(boolPtr)(sizeof(*(boolPtr)) >= sizeof(int) && (TCL_MAJOR_VERSION == 8)) ? tclStubsPtr->tcl_GetBoolean(interp, src, (int *)(boolPtr)) : \
+	Tcl_GetBool(interp, src, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
+#else
+#define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
+	((Tcl_GetIndexFromObjStruct)((interp), (objPtr), (tablePtr), (offset), (msg), \
+		(flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
+#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
+	(TCLBOOLWARNING(boolPtr)(sizeof(*(boolPtr)) >= sizeof(int) && (TCL_MAJOR_VERSION == 8)) ? Tcl_GetBooleanFromObj(interp, objPtr, (int *)(boolPtr)) : \
+	Tcl_GetBoolFromObj(interp, objPtr, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
+#define Tcl_GetBoolean(interp, src, boolPtr) \
+	(TCLBOOLWARNING(boolPtr)(sizeof(*(boolPtr)) >= sizeof(int) && (TCL_MAJOR_VERSION == 8)) ? Tcl_GetBoolean(interp, src, (int *)(boolPtr)) : \
+	Tcl_GetBool(interp, src, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
+#endif
+
+#ifdef TCL_MEM_DEBUG
+#   undef Tcl_Alloc
+#   define Tcl_Alloc(x) \
+    (Tcl_DbCkalloc((x), __FILE__, __LINE__))
+#   undef Tcl_Free
+#   define Tcl_Free(x) \
+    Tcl_DbCkfree((x), __FILE__, __LINE__)
+#   undef Tcl_Realloc
+#   define Tcl_Realloc(x,y) \
+    (Tcl_DbCkrealloc((x), (y), __FILE__, __LINE__))
+#   undef Tcl_AttemptAlloc
+#   define Tcl_AttemptAlloc(x) \
+    (Tcl_AttemptDbCkalloc((x), __FILE__, __LINE__))
+#   undef Tcl_AttemptRealloc
+#   define Tcl_AttemptRealloc(x,y) \
+    (Tcl_AttemptDbCkrealloc((x), (y), __FILE__, __LINE__))
+#endif /* !TCL_MEM_DEBUG */
+
+#define Tcl_NewLongObj(value) Tcl_NewWideIntObj((long)(value))
+#define Tcl_NewIntObj(value) Tcl_NewWideIntObj((int)(value))
+#define Tcl_DbNewLongObj(value, file, line) Tcl_DbNewWideIntObj((long)(value), file, line)
+#define Tcl_SetIntObj(objPtr, value)	Tcl_SetWideIntObj((objPtr), (int)(value))
+#define Tcl_SetLongObj(objPtr, value)	Tcl_SetWideIntObj((objPtr), (long)(value))
+#define Tcl_BackgroundError(interp)	Tcl_BackgroundException((interp), TCL_ERROR)
+#define Tcl_StringMatch(str, pattern) Tcl_StringCaseMatch((str), (pattern), 0)
+
+#if TCL_UTF_MAX < 4
+#   undef Tcl_UniCharToUtfDString
+#   define Tcl_UniCharToUtfDString Tcl_Char16ToUtfDString
+#   undef Tcl_UtfToUniCharDString
+#   define Tcl_UtfToUniCharDString Tcl_UtfToChar16DString
+#   undef Tcl_UtfToUniChar
+#   define Tcl_UtfToUniChar Tcl_UtfToChar16
+#   undef Tcl_UniCharLen
+#   define Tcl_UniCharLen Tcl_Char16Len
+#   undef Tcl_UniCharToUtf
+#   if defined(USE_TCL_STUBS)
+#	define Tcl_UniCharToUtf(c, p) \
+		(tclStubsPtr->tcl_UniCharToUtf((c)|TCL_COMBINE, (p)))
+#   else
+#	define Tcl_UniCharToUtf(c, p) \
+		((Tcl_UniCharToUtf)((c)|TCL_COMBINE, (p)))
+#   endif
+#if !defined(BUILD_tcl)
+#   undef Tcl_NumUtfChars
+#   define Tcl_NumUtfChars TclNumUtfChars
+#   undef Tcl_GetCharLength
+#   define Tcl_GetCharLength TclGetCharLength
+#   undef Tcl_UtfAtIndex
+#   define Tcl_UtfAtIndex TclUtfAtIndex
+#   undef Tcl_GetRange
+#   define Tcl_GetRange TclGetRange
+#   undef Tcl_GetUniChar
+#   define Tcl_GetUniChar TclGetUniChar
+#endif
+#endif
+#if defined(USE_TCL_STUBS)
+#   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
+		? (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))tclStubsPtr->tcl_UniCharToUtfDString \
+		: (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_Char16ToUtfDString)
+#   define Tcl_UtfToWCharDString (sizeof(wchar_t) != sizeof(short) \
+		? (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))tclStubsPtr->tcl_UtfToUniCharDString \
+		: (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))Tcl_UtfToChar16DString)
+#   define Tcl_UtfToWChar (sizeof(wchar_t) != sizeof(short) \
+		? (Tcl_Size (*)(const char *, wchar_t *))tclStubsPtr->tcl_UtfToUniChar \
+		: (Tcl_Size (*)(const char *, wchar_t *))Tcl_UtfToChar16)
+#   define Tcl_WCharLen (sizeof(wchar_t) != sizeof(short) \
+		? (Tcl_Size (*)(wchar_t *))tclStubsPtr->tcl_UniCharLen \
+		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
+#else
+#   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
+		? (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_UniCharToUtfDString \
+		: (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_Char16ToUtfDString)
+#   define Tcl_UtfToWCharDString (sizeof(wchar_t) != sizeof(short) \
+		? (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))Tcl_UtfToUniCharDString \
+		: (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))Tcl_UtfToChar16DString)
+#   define Tcl_UtfToWChar (sizeof(wchar_t) != sizeof(short) \
+		? (Tcl_Size (*)(const char *, wchar_t *))Tcl_UtfToUniChar \
+		: (Tcl_Size (*)(const char *, wchar_t *))Tcl_UtfToChar16)
+#   define Tcl_WCharLen (sizeof(wchar_t) != sizeof(short) \
+		? (Tcl_Size (*)(wchar_t *))Tcl_UniCharLen \
+		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
+#endif
+
+/*
+ * Deprecated Tcl procedures:
+ */
+
+#define Tcl_EvalObj(interp, objPtr) \
+    Tcl_EvalObjEx(interp, objPtr, 0)
+#define Tcl_GlobalEvalObj(interp, objPtr) \
+    Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL)
+
+#if TCL_MAJOR_VERSION > 8
+#   undef Tcl_Close
+#   define Tcl_Close(interp, chan) Tcl_CloseEx(interp, chan, 0)
+#endif
+
+#undef TclUtfCharComplete
+#undef TclUtfNext
+#undef TclUtfPrev
+#ifndef TCL_NO_DEPRECATED
+#   define Tcl_CreateSlave Tcl_CreateChild
+#   define Tcl_GetSlave Tcl_GetChild
+#   define Tcl_GetMaster Tcl_GetParent
+#endif
+
+#ifdef USE_TCL_STUBS
+    /* Protect those 10 functions, make them useless through the stub table */
+#   undef TclGetStringFromObj
+#   undef TclGetBytesFromObj
+#   undef TclGetUnicodeFromObj
+#   undef TclListObjGetElements
+#   undef TclListObjLength
+#   undef TclDictObjSize
+#   undef TclSplitList
+#   undef TclSplitPath
+#   undef TclFSSplitPath
+#   undef TclParseArgsObjv
+#endif
+
+#if TCL_MAJOR_VERSION < 9
+    /* TIP #627 for 8.7 */
+#   undef Tcl_CreateObjCommand2
+#   define Tcl_CreateObjCommand2 Tcl_CreateObjCommand
+#   undef Tcl_CreateObjTrace2
+#   define Tcl_CreateObjTrace2 Tcl_CreateObjTrace
+#   undef Tcl_NRCreateCommand2
+#   define Tcl_NRCreateCommand2 Tcl_NRCreateCommand
+#   undef Tcl_NRCallObjProc2
+#   define Tcl_NRCallObjProc2 Tcl_NRCallObjProc
+    /* TIP #660 for 8.7 */
+#   undef Tcl_GetSizeIntFromObj
+#   define Tcl_GetSizeIntFromObj Tcl_GetIntFromObj
+
+#   undef Tcl_GetBytesFromObj
+#   define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
+	    tclStubsPtr->tclGetBytesFromObj((interp), (objPtr), (sizePtr))
+#   undef Tcl_GetStringFromObj
+#   define Tcl_GetStringFromObj(objPtr, sizePtr) \
+	    tclStubsPtr->tclGetStringFromObj((objPtr), (sizePtr))
+#   undef Tcl_GetUnicodeFromObj
+#   define Tcl_GetUnicodeFromObj(objPtr, sizePtr) \
+	    tclStubsPtr->tclGetUnicodeFromObj((objPtr), (sizePtr))
+#   undef Tcl_ListObjGetElements
+#   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) \
+	    tclStubsPtr->tclListObjGetElements((interp), (listPtr), (objcPtr), (objvPtr))
+#   undef Tcl_ListObjLength
+#   define Tcl_ListObjLength(interp, listPtr, lengthPtr) \
+	    tclStubsPtr->tclListObjLength((interp), (listPtr), (lengthPtr))
+#   undef Tcl_DictObjSize
+#   define Tcl_DictObjSize(interp, dictPtr, sizePtr) \
+	    tclStubsPtr->tclDictObjSize((interp), (dictPtr), (sizePtr))
+#   undef Tcl_SplitList
+#   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) \
+	    tclStubsPtr->tclSplitList((interp), (listStr), (argcPtr), (argvPtr))
+#   undef Tcl_SplitPath
+#   define Tcl_SplitPath(path, argcPtr, argvPtr) \
+	    tclStubsPtr->tclSplitPath((path), (argcPtr), (argvPtr))
+#   undef Tcl_FSSplitPath
+#   define Tcl_FSSplitPath(pathPtr, lenPtr) \
+	    tclStubsPtr->tclFSSplitPath((pathPtr), (lenPtr))
+#   undef Tcl_ParseArgsObjv
+#   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) \
+	    tclStubsPtr->tclParseArgsObjv((interp), (argTable), (objcPtr), (objv), (remObjv))
+#elif defined(TCL_8_API)
+#   undef Tcl_GetByteArrayFromObj
+#   undef Tcl_GetBytesFromObj
+#   undef Tcl_GetStringFromObj
+#   undef Tcl_GetUnicodeFromObj
+#   undef Tcl_ListObjGetElements
+#   undef Tcl_ListObjLength
+#   undef Tcl_DictObjSize
+#   undef Tcl_SplitList
+#   undef Tcl_SplitPath
+#   undef Tcl_FSSplitPath
+#   undef Tcl_ParseArgsObjv
+#   if !defined(USE_TCL_STUBS)
+#	define Tcl_GetByteArrayFromObj(objPtr, sizePtr) (sizeof(*(sizePtr)) <= sizeof(int) ? \
+		TclGetBytesFromObj(NULL, (objPtr), (sizePtr)) : \
+		(Tcl_GetBytesFromObj)(NULL, (objPtr), (Tcl_Size *)(void *)(sizePtr)))
+#	define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) (sizeof(*(sizePtr)) <= sizeof(int) ? \
+		TclGetBytesFromObj((interp), (objPtr), (sizePtr)) : \
+		(Tcl_GetBytesFromObj)((interp), (objPtr), (Tcl_Size *)(void *)(sizePtr)))
+#	define Tcl_GetStringFromObj(objPtr, sizePtr) (sizeof(*(sizePtr)) <= sizeof(int) ? \
+		TclGetStringFromObj((objPtr), (sizePtr)) : \
+		(Tcl_GetStringFromObj)((objPtr), (Tcl_Size *)(void *)(sizePtr)))
+#	define Tcl_GetUnicodeFromObj(objPtr, sizePtr) (sizeof(*(sizePtr)) <= sizeof(int) ? \
+		TclGetUnicodeFromObj((objPtr), (sizePtr)) : \
+		(Tcl_GetUnicodeFromObj)((objPtr), (Tcl_Size *)(void *)(sizePtr)))
+#	define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) <= sizeof(int) ? \
+		TclListObjGetElements((interp), (listPtr), (objcPtr), (objvPtr)) : \
+		(Tcl_ListObjGetElements)((interp), (listPtr), (Tcl_Size *)(void *)(objcPtr), (objvPtr)))
+#	define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) <= sizeof(int) ? \
+		TclListObjLength((interp), (listPtr), (lengthPtr)) : \
+		(Tcl_ListObjLength)((interp), (listPtr), (Tcl_Size *)(void *)(lengthPtr)))
+#	define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) <= sizeof(int) ? \
+		TclDictObjSize((interp), (dictPtr), (sizePtr)) : \
+		(Tcl_DictObjSize)((interp), (dictPtr), (Tcl_Size *)(void *)(sizePtr)))
+#	define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) <= sizeof(int) ? \
+		TclSplitList((interp), (listStr), (argcPtr), (argvPtr)) : \
+		(Tcl_SplitList)((interp), (listStr), (Tcl_Size *)(void *)(argcPtr), (argvPtr)))
+#	define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) <= sizeof(int) ? \
+		TclSplitPath((path), (argcPtr), (argvPtr)) : \
+		(Tcl_SplitPath)((path), (Tcl_Size *)(void *)(argcPtr), (argvPtr)))
+#	define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) <= sizeof(int) ? \
+		TclFSSplitPath((pathPtr), (lenPtr)) : \
+		(Tcl_FSSplitPath)((pathPtr), (Tcl_Size *)(void *)(lenPtr)))
+#	define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) <= sizeof(int) ? \
+		TclParseArgsObjv((interp), (argTable), (objcPtr), (objv), (remObjv)) : \
+		(Tcl_ParseArgsObjv)((interp), (argTable), (Tcl_Size *)(void *)(objcPtr), (objv), (remObjv)))
+#   elif !defined(BUILD_tcl)
+#	define Tcl_GetByteArrayFromObj(objPtr, sizePtr) (sizeof(*(sizePtr)) <= sizeof(int) ? \
+		tclStubsPtr->tclGetBytesFromObj(NULL, (objPtr), (sizePtr)) : \
+		tclStubsPtr->tcl_GetBytesFromObj(NULL, (objPtr), (Tcl_Size *)(void *)(sizePtr)))
+#	define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) (sizeof(*(sizePtr)) <= sizeof(int) ? \
+		tclStubsPtr->tclGetBytesFromObj((interp), (objPtr), (sizePtr)) : \
+		tclStubsPtr->tcl_GetBytesFromObj((interp), (objPtr), (Tcl_Size *)(void *)(sizePtr)))
+#	define Tcl_GetStringFromObj(objPtr, sizePtr) (sizeof(*(sizePtr)) <= sizeof(int) ? \
+		tclStubsPtr->tclGetStringFromObj((objPtr), (sizePtr)) : \
+		tclStubsPtr->tcl_GetStringFromObj((objPtr), (Tcl_Size *)(void *)(sizePtr)))
+#	define Tcl_GetUnicodeFromObj(objPtr, sizePtr) (sizeof(*(sizePtr)) <= sizeof(int) ? \
+		tclStubsPtr->tclGetUnicodeFromObj((objPtr), (sizePtr)) : \
+		tclStubsPtr->tcl_GetUnicodeFromObj((objPtr), (Tcl_Size *)(void *)(sizePtr)))
+#	define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) <= sizeof(int) ? \
+		tclStubsPtr->tclListObjGetElements((interp), (listPtr), (objcPtr), (objvPtr)) : \
+		tclStubsPtr->tcl_ListObjGetElements((interp), (listPtr), (Tcl_Size *)(void *)(objcPtr), (objvPtr)))
+#	define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) <= sizeof(int) ? \
+		tclStubsPtr->tclListObjLength((interp), (listPtr), (lengthPtr)) : \
+		tclStubsPtr->tcl_ListObjLength((interp), (listPtr), (Tcl_Size *)(void *)(lengthPtr)))
+#	define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) <= sizeof(int) ? \
+		tclStubsPtr->tclDictObjSize((interp), (dictPtr), (sizePtr)) : \
+		tclStubsPtr->tcl_DictObjSize((interp), (dictPtr), (Tcl_Size *)(void *)(sizePtr)))
+#	define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) <= sizeof(int) ? \
+		tclStubsPtr->tclSplitList((interp), (listStr), (argcPtr), (argvPtr)) : \
+		tclStubsPtr->tcl_SplitList((interp), (listStr), (Tcl_Size *)(void *)(argcPtr), (argvPtr)))
+#	define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) <= sizeof(int) ? \
+		tclStubsPtr->tclSplitPath((path), (argcPtr), (argvPtr)) : \
+		tclStubsPtr->tcl_SplitPath((path), (Tcl_Size *)(void *)(argcPtr), (argvPtr)))
+#	define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) <= sizeof(int) ? \
+		tclStubsPtr->tclFSSplitPath((pathPtr), (lenPtr)) : \
+		tclStubsPtr->tcl_FSSplitPath((pathPtr), (Tcl_Size *)(void *)(lenPtr)))
+#	define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) <= sizeof(int) ? \
+		tclStubsPtr->tclParseArgsObjv((interp), (argTable), (objcPtr), (objv), (remObjv)) : \
+		tclStubsPtr->tcl_ParseArgsObjv((interp), (argTable), (Tcl_Size *)(void *)(objcPtr), (objv), (remObjv)))
+#   endif /* defined(USE_TCL_STUBS) */
+#else /* !defined(TCL_8_API) */
+#   undef Tcl_GetByteArrayFromObj
+#   define Tcl_GetByteArrayFromObj(objPtr, sizePtr) \
+	   Tcl_GetBytesFromObj(NULL, (objPtr), (sizePtr))
+#endif /* defined(TCL_8_API) */
+
+#endif /* _TCLDECLS */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl9.0/tclPlatDecls.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl9.0/tclPlatDecls.h
new file mode 100644
index 00000000..b8243d2f
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tcl9.0/tclPlatDecls.h
@@ -0,0 +1,228 @@
+/*
+ * tclPlatDecls.h --
+ *
+ *	Declarations of platform specific Tcl APIs.
+ *
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ * All rights reserved.
+ */
+
+#ifndef _TCLPLATDECLS
+#define _TCLPLATDECLS
+
+#undef TCL_STORAGE_CLASS
+#ifdef BUILD_tcl
+#   define TCL_STORAGE_CLASS DLLEXPORT
+#else
+#   ifdef USE_TCL_STUBS
+#      define TCL_STORAGE_CLASS
+#   else
+#      define TCL_STORAGE_CLASS DLLIMPORT
+#   endif
+#endif
+
+/*
+ * WARNING: This file is automatically generated by the tools/genStubs.tcl
+ * script.  Any modifications to the function declarations below should be made
+ * in the generic/tcl.decls script.
+ */
+
+/*
+ * TCHAR is needed here for win32, so if it is not defined yet do it here.
+ * This way, we don't need to include <tchar.h> just for one define.
+ */
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(_TCHAR_DEFINED)
+#   if defined(_UNICODE)
+	typedef wchar_t TCHAR;
+#   else
+	typedef char TCHAR;
+#   endif
+#   define _TCHAR_DEFINED
+#endif
+
+#ifndef MODULE_SCOPE
+#   ifdef __cplusplus
+#	define MODULE_SCOPE extern "C"
+#   else
+#	define MODULE_SCOPE extern
+#   endif
+#endif
+
+#if TCL_MAJOR_VERSION < 9
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+/* 0 */
+EXTERN TCHAR *		Tcl_WinUtfToTChar(const char *str, int len,
+				Tcl_DString *dsPtr);
+/* 1 */
+EXTERN char *		Tcl_WinTCharToUtf(const TCHAR *str, int len,
+				Tcl_DString *dsPtr);
+/* Slot 2 is reserved */
+/* 3 */
+EXTERN void		Tcl_WinConvertError(unsigned errCode);
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+/* 0 */
+EXTERN int		Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp,
+				const char *bundleName, int hasResourceFile,
+				Tcl_Size maxPathLen, char *libraryPath);
+/* 1 */
+EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
+				Tcl_Interp *interp, const char *bundleName,
+				const char *bundleVersion,
+				int hasResourceFile, Tcl_Size maxPathLen,
+				char *libraryPath);
+/* 2 */
+EXTERN void		Tcl_MacOSXNotifierAddRunLoopMode(
+				const void *runLoopMode);
+#endif /* MACOSX */
+
+typedef struct TclPlatStubs {
+    int magic;
+    void *hooks;
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+    TCHAR * (*tcl_WinUtfToTChar) (const char *str, int len, Tcl_DString *dsPtr); /* 0 */
+    char * (*tcl_WinTCharToUtf) (const TCHAR *str, int len, Tcl_DString *dsPtr); /* 1 */
+    void (*reserved2)(void);
+    void (*tcl_WinConvertError) (unsigned errCode); /* 3 */
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+    int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, const char *bundleName, int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath); /* 0 */
+    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath); /* 1 */
+    void (*tcl_MacOSXNotifierAddRunLoopMode) (const void *runLoopMode); /* 2 */
+#endif /* MACOSX */
+} TclPlatStubs;
+
+extern const TclPlatStubs *tclPlatStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_TCL_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#define Tcl_WinUtfToTChar \
+	(tclPlatStubsPtr->tcl_WinUtfToTChar) /* 0 */
+#define Tcl_WinTCharToUtf \
+	(tclPlatStubsPtr->tcl_WinTCharToUtf) /* 1 */
+/* Slot 2 is reserved */
+#define Tcl_WinConvertError \
+	(tclPlatStubsPtr->tcl_WinConvertError) /* 3 */
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+#define Tcl_MacOSXOpenBundleResources \
+	(tclPlatStubsPtr->tcl_MacOSXOpenBundleResources) /* 0 */
+#define Tcl_MacOSXOpenVersionedBundleResources \
+	(tclPlatStubsPtr->tcl_MacOSXOpenVersionedBundleResources) /* 1 */
+#define Tcl_MacOSXNotifierAddRunLoopMode \
+	(tclPlatStubsPtr->tcl_MacOSXNotifierAddRunLoopMode) /* 2 */
+#endif /* MACOSX */
+
+#endif /* defined(USE_TCL_STUBS) */
+
+#else /* TCL_MAJOR_VERSION > 8 */
+
+/* !BEGIN!: Do not edit below this line. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+/* Slot 0 is reserved */
+/* 1 */
+EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
+				Tcl_Interp *interp, const char *bundleName,
+				const char *bundleVersion,
+				int hasResourceFile, Tcl_Size maxPathLen,
+				char *libraryPath);
+/* 2 */
+EXTERN void		Tcl_MacOSXNotifierAddRunLoopMode(
+				const void *runLoopMode);
+/* 3 */
+EXTERN void		Tcl_WinConvertError(unsigned errCode);
+
+typedef struct TclPlatStubs {
+    int magic;
+    void *hooks;
+
+    void (*reserved0)(void);
+    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath); /* 1 */
+    void (*tcl_MacOSXNotifierAddRunLoopMode) (const void *runLoopMode); /* 2 */
+    void (*tcl_WinConvertError) (unsigned errCode); /* 3 */
+} TclPlatStubs;
+
+extern const TclPlatStubs *tclPlatStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_TCL_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+/* Slot 0 is reserved */
+#define Tcl_MacOSXOpenVersionedBundleResources \
+	(tclPlatStubsPtr->tcl_MacOSXOpenVersionedBundleResources) /* 1 */
+#define Tcl_MacOSXNotifierAddRunLoopMode \
+	(tclPlatStubsPtr->tcl_MacOSXNotifierAddRunLoopMode) /* 2 */
+#define Tcl_WinConvertError \
+	(tclPlatStubsPtr->tcl_WinConvertError) /* 3 */
+
+#endif /* defined(USE_TCL_STUBS) */
+
+/* !END!: Do not edit above this line. */
+
+#endif /* TCL_MAJOR_VERSION */
+
+#ifdef MAC_OSX_TCL /* MACOSX */
+#undef Tcl_MacOSXOpenBundleResources
+#define Tcl_MacOSXOpenBundleResources(a,b,c,d,e) Tcl_MacOSXOpenVersionedBundleResources(a,b,NULL,c,d,e)
+#endif
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
+#ifdef _WIN32
+#   undef Tcl_CreateFileHandler
+#   undef Tcl_DeleteFileHandler
+#   undef Tcl_GetOpenFile
+#endif
+#ifndef MAC_OSX_TCL
+#   undef Tcl_MacOSXOpenVersionedBundleResources
+#   undef Tcl_MacOSXNotifierAddRunLoopMode
+#endif
+
+#if defined(USE_TCL_STUBS) && (defined(_WIN32) || defined(__CYGWIN__))\
+	&& (defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8)
+#undef Tcl_WinUtfToTChar
+#undef Tcl_WinTCharToUtf
+#ifdef _WIN32
+#define Tcl_WinUtfToTChar(string, len, dsPtr) (Tcl_DStringInit(dsPtr), \
+		(TCHAR *)Tcl_UtfToChar16DString((string), (len), (dsPtr)))
+#define Tcl_WinTCharToUtf(string, len, dsPtr) (Tcl_DStringInit(dsPtr), \
+		(char *)Tcl_Char16ToUtfDString((const unsigned short *)(string), ((((len) + 2) >> 1) - 1), (dsPtr)))
+#endif
+#endif
+
+#endif /* _TCLPLATDECLS */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tclAppInit.c b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tclAppInit.c
new file mode 100644
index 00000000..fd4bc5af
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tclAppInit.c
@@ -0,0 +1,179 @@
+/*
+ * tclAppInit.c --
+ *
+ *	Provides a default version of the main program and Tcl_AppInit
+ *	function for Tcl applications (without Tk).
+ *
+ * Copyright (c) 1993 The Regents of the University of California.
+ * Copyright (c) 1994-1997 Sun Microsystems, Inc.
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS: @(#) $Id: tclAppInit.c 1325 2007-03-29 07:27:33Z jcw $
+ */
+
+#include "tcl.h"
+
+#ifdef TCL_TEST
+
+#include "tclInt.h"
+
+extern Tcl_PackageInitProc	Procbodytest_Init;
+extern Tcl_PackageInitProc	Procbodytest_SafeInit;
+extern Tcl_PackageInitProc	TclObjTest_Init;
+extern Tcl_PackageInitProc	Tcltest_Init;
+
+#endif /* TCL_TEST */
+
+#ifdef TCL_XT_TEST
+extern void		XtToolkitInitialize _ANSI_ARGS_((void));
+extern int		Tclxttest_Init _ANSI_ARGS_((Tcl_Interp *interp));
+#endif
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * main --
+ *
+ *	This is the main program for the application.
+ *
+ * Results:
+ *	None: Tcl_Main never returns here, so this function never returns
+ *	either.
+ *
+ * Side effects:
+ *	Whatever the application does.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+main(argc, argv)
+    int argc;			/* Number of command-line arguments. */
+    char **argv;		/* Values of command-line arguments. */
+{
+    /*
+     * The following #if block allows you to change the AppInit function by
+     * using a #define of TCL_LOCAL_APPINIT instead of rewriting this entire
+     * file. The #if checks for that #define and uses Tcl_AppInit if it does
+     * not exist.
+     */
+
+#ifndef TCL_LOCAL_APPINIT
+#define TCL_LOCAL_APPINIT Tcl_AppInit
+#endif
+    extern int TCL_LOCAL_APPINIT _ANSI_ARGS_((Tcl_Interp *interp));
+
+    /*
+     * The following #if block allows you to change how Tcl finds the startup
+     * script, prime the library or encoding paths, fiddle with the argv,
+     * etc., without needing to rewrite Tcl_Main()
+     */
+
+#ifdef TCL_LOCAL_MAIN_HOOK
+    extern int TCL_LOCAL_MAIN_HOOK _ANSI_ARGS_((int *argc, char ***argv));
+#endif
+
+#ifdef TCL_XT_TEST
+    XtToolkitInitialize();
+#endif
+
+#ifdef TCL_LOCAL_MAIN_HOOK
+    TCL_LOCAL_MAIN_HOOK(&argc, &argv);
+#endif
+
+    Tcl_Main(argc, argv, TCL_LOCAL_APPINIT);
+
+    return 0;			/* Needed only to prevent compiler warning. */
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Tcl_AppInit --
+ *
+ *	This function performs application-specific initialization. Most
+ *	applications, especially those that incorporate additional packages,
+ *	will have their own version of this function.
+ *
+ * Results:
+ *	Returns a standard Tcl completion code, and leaves an error message in
+ *	the interp's result if an error occurs.
+ *
+ * Side effects:
+ *	Depends on the startup script.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+Tcl_AppInit(interp)
+    Tcl_Interp *interp;		/* Interpreter for application. */
+{
+    if (Tcl_Init(interp) == TCL_ERROR) {
+	return TCL_ERROR;
+    }
+
+#ifdef TCL_TEST
+#ifdef TCL_XT_TEST
+    if (Tclxttest_Init(interp) == TCL_ERROR) {
+	return TCL_ERROR;
+    }
+#endif
+    if (Tcltest_Init(interp) == TCL_ERROR) {
+	return TCL_ERROR;
+    }
+    Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init,
+	    (Tcl_PackageInitProc *) NULL);
+    if (TclObjTest_Init(interp) == TCL_ERROR) {
+	return TCL_ERROR;
+    }
+    if (Procbodytest_Init(interp) == TCL_ERROR) {
+	return TCL_ERROR;
+    }
+    Tcl_StaticPackage(interp, "procbodytest", Procbodytest_Init,
+	    Procbodytest_SafeInit);
+#endif /* TCL_TEST */
+
+    /*
+     * Call the init functions for included packages. Each call should look
+     * like this:
+     *
+     * if (Mod_Init(interp) == TCL_ERROR) {
+     *     return TCL_ERROR;
+     * }
+     *
+     * where "Mod" is the name of the module. (Dynamically-loadable packages
+     * should have the same entry-point name.)
+     */
+
+    /*
+     * Call Tcl_CreateCommand for application-specific commands, if they
+     * weren't already created by the init functions called above.
+     */
+
+    /*
+     * Specify a user-specific startup file to invoke if the application is
+     * run interactively. Typically the startup file is "~/.apprc" where "app"
+     * is the name of the application. If this line is deleted then no user-
+     * specific startup file will be run under any conditions.
+     */
+
+#ifdef DJGPP
+    Tcl_SetVar(interp, "tcl_rcFileName", "~/tclsh.rc", TCL_GLOBAL_ONLY);
+#else
+    Tcl_SetVar(interp, "tcl_rcFileName", "~/.tclshrc", TCL_GLOBAL_ONLY);
+#endif
+
+    return TCL_OK;
+}
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tclpre9compat.h b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tclpre9compat.h
new file mode 100644
index 00000000..50421772
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tclpre9compat.h
@@ -0,0 +1,73 @@
+#ifndef CRITCL_TCL9_COMPAT_H
+#define CRITCL_TCL9_COMPAT_H
+
+/* Disable the macros making us believe that everything is hunky-dory on compilation, and then
+ * reward us with runtime crashes for being a sucker to have believed them.
+ */
+#define TCL_NO_DEPRECATED
+
+#include "tcl.h"
+
+/*
+ * - - -- --- ----- -------- ------------- ---------------------
+ * Check for support of the `Tcl_Size` typdef and associated definitions.
+ * It was introduced in Tcl 8.7 and 9, and we need backward compatibility
+ * definitions for 8.6.
+ */
+
+#ifndef TCL_SIZE_MAX
+    #include <limits.h>
+    #define TCL_SIZE_MAX INT_MAX
+
+    #ifndef Tcl_Size
+        typedef int Tcl_Size;
+    #endif
+
+    /* TIP #494 constants, for 8.6 too */
+    #define TCL_IO_FAILURE   ((Tcl_Size)-1)
+    #define TCL_AUTO_LENGTH  ((Tcl_Size)-1)
+    #define TCL_INDEX_NONE   ((Tcl_Size)-1)
+
+    #define TCL_SIZE_MODIFIER ""
+    #define Tcl_GetSizeIntFromObj Tcl_GetIntFromObj
+    #define Tcl_NewSizeIntObj     Tcl_NewIntObj
+#else
+    #define Tcl_NewSizeIntObj     Tcl_NewWideIntObj
+#endif
+
+#define TCL_SIZE_FMT "%" TCL_SIZE_MODIFIER "d"
+
+/*
+ * - - -- --- ----- -------- ------------- ---------------------
+ * Critcl (3.2.1+) emits the command creation API using Tcl_Size by default.
+ * Map this to the older int-based API when compiling against Tcl 8.x or older.
+ *
+ * Further map use of `Tcl_GetBytesFromObj` to the old `Tcl_GetByteArrayFromObj`.
+ * This loses the interp argument, and the ability to return NULL.
+ */
+
+#if TCL_MAJOR_VERSION <= 8
+#define Tcl_CreateObjCommand2 Tcl_CreateObjCommand
+#define Tcl_GetBytesFromObj(interp,obj,sizeptr) Tcl_GetByteArrayFromObj(obj,sizeptr)
+#endif
+
+/*
+ * - - -- --- ----- -------- ------------- ---------------------
+ */
+
+#ifndef CONST
+#define CONST const
+#endif
+
+#ifndef CONST84
+#define CONST84 const
+#endif
+
+#ifndef CONST86
+#define CONST86 const
+#endif
+
+/*
+ * - - -- --- ----- -------- ------------- ---------------------
+ */
+#endif /* CRITCL_TCL9_COMPAT_H */
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tkstubs.c b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tkstubs.c
new file mode 100644
index 00000000..a4f3f27e
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tkstubs.c
@@ -0,0 +1,24 @@
+
+#if USE_TK_STUBS
+
+    const TkStubs *tkStubsPtr;
+    const struct TkPlatStubs *tkPlatStubsPtr;
+    const struct TkIntStubs *tkIntStubsPtr;
+    const struct TkIntPlatStubs *tkIntPlatStubsPtr;
+    const struct TkIntXlibStubs *tkIntXlibStubsPtr;
+
+  static int
+  MyInitTkStubs (Tcl_Interp *ip)
+  {
+    if (Tcl_PkgRequireEx(ip, "Tk", "8.1", 0, (ClientData*) &tkStubsPtr) == NULL)      return 0;
+    if (tkStubsPtr == NULL || tkStubsPtr->hooks == NULL) {
+      Tcl_SetResult(ip, "This extension requires Tk stubs-support.", TCL_STATIC);
+      return 0;
+    }
+    tkPlatStubsPtr = tkStubsPtr->hooks->tkPlatStubs;
+    tkIntStubsPtr = tkStubsPtr->hooks->tkIntStubs;
+    tkIntPlatStubsPtr = tkStubsPtr->hooks->tkIntPlatStubs;
+    tkIntXlibStubsPtr = tkStubsPtr->hooks->tkIntXlibStubs;
+    return 1;
+  }
+#endif
diff --git a/src/vfs/critcl.vfs/lib/critcl/critcl_c/tkstubs_noconst.c b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tkstubs_noconst.c
new file mode 100644
index 00000000..36a0f7b8
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/critcl_c/tkstubs_noconst.c
@@ -0,0 +1,27 @@
+
+#if USE_TK_STUBS
+    /* Pre 8.6 two of the variables are not declared const.
+     * Prevent mismatch with tkDecls.h
+     */
+
+          TkStubs *tkStubsPtr;
+    const struct TkPlatStubs *tkPlatStubsPtr;
+    const struct TkIntStubs *tkIntStubsPtr;
+    const struct TkIntPlatStubs *tkIntPlatStubsPtr;
+          struct TkIntXlibStubs *tkIntXlibStubsPtr;
+
+  static int
+  MyInitTkStubs (Tcl_Interp *ip)
+  {
+    if (Tcl_PkgRequireEx(ip, "Tk", "8.1", 0, (ClientData*) &tkStubsPtr) == NULL)      return 0;
+    if (tkStubsPtr == NULL || tkStubsPtr->hooks == NULL) {
+      Tcl_SetResult(ip, "This extension requires Tk stubs-support.", TCL_STATIC);
+      return 0;
+    }
+    tkPlatStubsPtr = tkStubsPtr->hooks->tkPlatStubs;
+    tkIntStubsPtr = tkStubsPtr->hooks->tkIntStubs;
+    tkIntPlatStubsPtr = tkStubsPtr->hooks->tkIntPlatStubs;
+    tkIntXlibStubsPtr = tkStubsPtr->hooks->tkIntXlibStubs;
+    return 1;
+  }
+#endif
diff --git a/src/vfs/critcl.vfs/lib/critcl/license.terms b/src/vfs/critcl.vfs/lib/critcl/license.terms
new file mode 100644
index 00000000..16e6bdf7
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/license.terms
@@ -0,0 +1,40 @@
+This software is copyrighted by Jean-Claude Wippler, Steve Landers,
+and other parties.
+
+The following terms apply to all files associated with the software
+unless explicitly disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal 
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license. 
diff --git a/src/vfs/critcl.vfs/lib/critcl/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/critcl/pkgIndex.tcl
new file mode 100644
index 00000000..e3fa617d
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critcl/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+package ifneeded critcl 3.2.1 [list source [file join $dir critcl.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/critclf/Config b/src/vfs/critcl.vfs/lib/critclf/Config
new file mode 100644
index 00000000..7b7e566a
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critclf/Config
@@ -0,0 +1,9 @@
+# Fortran-specific flags
+#
+fcompile        g95 -c
+fversion        g95 -v
+flink           g95 -shared
+finclude        -I
+foutput         -o $outfile
+foptimize       -O2
+fextra_cflags   -DFTN_UNDERSCORE -D__unix
diff --git a/src/vfs/critcl.vfs/lib/critclf/critclf.tcl b/src/vfs/critcl.vfs/lib/critclf/critclf.tcl
new file mode 100644
index 00000000..4b739b72
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critclf/critclf.tcl
@@ -0,0 +1,524 @@
+# critclf.tcl --
+#     Fortran version of Critcl
+#
+package require Tcl 8.6 9
+package provide critclf 0.3
+package require critcl 3.2
+package require wrapfort
+
+namespace eval critcl {
+
+    #
+    # Public procedures
+    #
+    namespace export fproc
+
+    variable fsrc   ;# File with Fortran source code
+
+    variable ftype  ;# Fortran types
+    set ftype(integer)       "integer :: VNAME"
+    set ftype(integer-array) "integer :: size__VNAME; integer, dimension(SIZE) :: VNAME"
+    set ftype(real)          "real(kind=kind(1.0d0)) :: VNAME"
+    set ftype(real-array)    "integer :: size__VNAME; real, dimension(SIZE) :: VNAME"
+    set ftype(double)        "real(kind=kind(1.0d0)) :: VNAME"
+    set ftype(double-array)  "integer :: size__VNAME; real(kind=kind(1.0d0)), dimension(SIZE) :: VNAME"
+
+    #
+    # Private namespaces for convenience:
+    # - Store the configuration parameters
+    # - Re-read the configuration file
+    #
+    namespace eval v {
+        variable fconfigvars {fcompile fversion finclude flink foutput
+                              foptimize fextra_cflags}
+        set configvars [concat $configvars $fconfigvars]
+    }
+    namespace eval c [list
+        foreach var $v::fconfigvars {
+            variable $var
+        }
+    ]
+    readconfig $configfile
+}
+
+
+# Femit, Femitln, Cmdemit --
+#     Store Fortran and C code in a private variable for later reference
+#
+# Arguments:
+#     s            Fragment of Fortran code to be stored
+#
+# Result:
+#     None
+#
+proc ::critcl::Femit {s} {
+    append v::fcode($v::curr) $s
+}
+
+proc ::critcl::Femitln {{s ""}} {
+    Femit "$s\n"
+}
+
+proc ::critcl::Cmdemit {s} {
+    append v::cmdcode($v::curr) $s
+}
+
+
+# Fdefine --
+#     Register the new command for later use
+#
+# Arguments:
+#     name         Name of the new command
+#     args         Argument list and body
+#
+# Result:
+#     None
+#
+proc ::critcl::Fdefine {name args} {
+    set v::curr [md5_hex "$name $args"]
+    set file [file normalize [info script]]
+
+    set ns [uplevel 2 namespace current]
+    if {$ns == "::"} { set ns "" } else { append ns :: }
+
+    set ::auto_index($ns$name) [list [namespace current]::fbuild $file]
+
+    lappend v::code($file,list) $name $v::curr
+}
+
+
+
+# FortCall --
+#     Generate a fragment of C to call the Fortran routine
+#
+# Arguments:
+#     name         Name of the Fortran subroutine
+#     carguments   List of arguments (already in C form)
+#
+# Result:
+#     C code fragment
+#
+# Note:
+#     Will probably need to be revised
+#
+proc ::critcl::FortCall {name carguments} {
+
+    return "    $name\( [join $carguments ,] );"
+
+}
+
+
+# FortDeclaration --
+#     Generate a proper Fortran declaration
+#
+# Arguments:
+#     type         Type of the variable
+#     vname        Name of the variable
+#     data         Additional information
+#
+# Result:
+#     Fortran declaration
+#
+proc ::critcl::FortDeclaration {type vname data} {
+    variable ftype
+
+    if { [string match "*-array" $type] } {
+        set size [string map {"size(" "size__" ")" ""} [lindex $data 1]]
+        return [string map [list VNAME $vname SIZE $size] $ftype($type)]
+    } else {
+        return [string map [list VNAME $vname] $ftype($type)]
+    }
+}
+
+
+# fproc --
+#     Generate the Tcl/C wrapper for a command written in Fortran
+#
+# Arguments:
+#     name         Name of the Fortran subroutine and Tcl command
+#     arguments    Description of the arguments
+#     body         Body of the Fortran subroutine
+#
+# Result:
+#     None
+#
+# Note:
+#     This relies for the most part on Wrapfort for the actual
+#     generation of the source code
+#
+proc ::critcl::fproc {name arguments body} {
+
+    ::Wrapfort::incritcl 1
+
+    Fdefine $name $arguments $body
+
+    Femit "subroutine $name\( &\n    "
+
+    set farglist   {}
+    set fdecls     {}
+    set carglist   {}
+    set carguments {}
+    foreach {type vname data} $arguments {
+        set role [lindex $data 0]
+
+        switch -- $role {
+            "input"  -
+            "output" -
+            "result" {
+                lappend fdecls [FortDeclaration $type $vname $data]
+                if { ! [string match "*-array" $type] } {
+                    lappend farglist $vname
+                    lappend carglist "&$vname"
+                } else {
+                    lappend farglist "$vname, size__$vname"
+                    lappend carglist "$vname, &size__$vname"
+                    set carguments [concat $carguments "integer size__$vname {assign size($vname)}"]
+                }
+            }
+        }
+        if { $type == "external" } {
+            lappend farglist $vname
+            lappend carglist "$vname"
+        }
+    }
+
+    Femitln "[join $farglist ",&\n    "])"
+    Femitln "    [join $fdecls "\n    "]"
+    Femitln $body ;# TODO: use statements
+    Femitln "end subroutine $name"
+
+    ::Wrapfort::fproc $name $name \
+        [concat $arguments $carguments code [list {Call the routine}] \
+            [list [FortCall $name $carglist]]]
+
+    ::Wrapfort::incritcl 0
+}
+
+
+# fexternal --
+#     Generate the C wrapper for a Tcl command to be called as an
+#     external function in Fortran
+#
+# Arguments:
+#     name         Name of the Fortran interface
+#     arguments    Description of the arguments and the surrounding code
+#
+# Result:
+#     None
+#
+# Note:
+#     This relies for the most part on Wrapfort for the actual
+#     generation of the source code
+#
+proc ::critcl::fexternal {name arguments} {
+
+    ::Wrapfort::incritcl 1
+    ::Wrapfort::fexternal $name $arguments
+    ::Wrapfort::incritcl 0
+
+}
+
+
+# fcompile --
+#     Compile the generated Fortran code
+#
+# Arguments:
+#     file         Name of the Fortran source file
+#     src          Complete source code
+#     lfd          Log file
+#     obj          Name of the object file
+#
+# Result:
+#     None
+#
+proc ::critcl::fcompile {file src fopts lfd obj} {
+    variable run
+    set cmdline "$c::fcompile $fopts"
+    set outfile $obj
+    append cmdline " [subst $c::foutput] $src"
+    if {$v::options(language) != ""} {
+        # Allow the compiler to determine the type of file
+        # otherwise it will try to compile the libs
+        append cmdline " -x none"
+    }
+    if {!$option::debug_symbols} {
+        append cmdline " $c::foptimize"
+    }
+    puts $lfd $cmdline
+    set v::failed 0
+    interp transfer {} $lfd $run
+    if {[catch {
+        interp eval $run "exec $cmdline 2>@ $lfd"
+        interp transfer $run $lfd {}
+        if {!$v::options(keepsrc) && $src ne $file} { file delete $src }
+        puts $lfd "$obj: [file size $obj] bytes"
+    } err]} {
+        puts $err
+        interp transfer $run $lfd {}
+        puts $lfd "ERROR while compiling code in $file:"
+        puts $lfd $err
+        incr v::failed
+    }
+}
+
+
+# fbuild --
+#     Build the library
+#
+# Arguments:
+#     file         Name of the library
+#     load         When completed, load the library (or not)
+#     prefix       Prefix for the name of the library
+#     silent       Suppress error message (or not)
+#
+# Result:
+#     None
+#
+proc ::critcl::fbuild {{file ""} {load 1} {prefix {}} {silent ""}} {
+    if {$file eq ""} {
+        set link 1
+        set file [file normalize [info script]]
+    } else {
+        set link 0
+    }
+
+    # each unique set of cmds is compiled into a separate extension
+    # ??
+    set digest [md5_hex "$file $v::code($file,list)"]
+
+    set cache $v::cache
+    set cache [file normalize $cache]
+
+    set base [file join $cache ${v::prefix}_$digest]
+    set libfile $base
+
+    # the compiled library will be saved for permanent use if the outdir
+    # option is set (in which case rebuilds will no longer be automatic)
+    if {$v::options(outdir) != ""} {
+      set odir [file join [file dirname $file] $v::options(outdir)]
+      set oroot [file root [file tail $file]]
+      set libfile [file normalize [file join $odir $oroot]]
+      file mkdir $odir
+    }
+    # get the settings for this file into local variables
+    foreach x {hdrs srcs libs init ext} {
+      set $x [append v::code($file,$x) ""] ;# make sure it exists
+    }
+
+    # modify the output file name if debugging symbols are requested
+    if {$option::debug_symbols} {
+        append libfile _g
+    }
+
+    # choose distinct suffix so switching between them causes a rebuild
+    switch -- $v::options(combine) {
+        ""         -
+        dynamic    { append libfile _pic$c::object }
+        static     { append libfile _stub$c::object }
+        standalone { append libfile $c::object }
+    }
+
+    # the init proc name takes a capitalized prefix from the package name
+    set ininame stdin ;# in case it's called interactively
+    regexp {^\w+} [file tail $file] ininame
+    set pkgname $ininame
+    set ininame [string totitle $ininame]
+    if {$prefix != {}} {
+        set pkgname "${prefix}_$pkgname"
+        set ininame "${prefix}_$ininame"
+    }
+
+    # the shared library we hope to produce
+    set target $base$c::sharedlibext
+    if {$v::options(force) || ![file exists $target]} {
+        file mkdir $cache
+
+        set log [file join $cache [pid].log]
+        set lfd [open $log w]
+        puts $lfd "\n[clock format [clock seconds]] - $file"
+
+        ::Wrapfort::incritcl 1
+        ::Wrapfort::fsource $pkgname $base.c
+        ::Wrapfort::incritcl 0
+        set ffile   [open ${base}_f.f90 w]
+        set cmdfile [open $::Wrapfort::tclfname w]
+        set fd      [open ${base}.c w]
+        set names   {}
+
+      puts $fd "/* Generated by critcl on [clock format [clock seconds]]
+ * source: $file
+ * binary: $libfile
+ */"
+      foreach {name digest} $v::code($file,list) {
+          if {[info exists v::code($digest)]} {
+              puts $fd $v::code($digest)
+          }
+          if {[info exists v::fcode($digest)]} {
+              puts $ffile $v::fcode($digest)
+          }
+          if {[info exists v::cmdcode($digest)]} {
+              puts $cmdfile $v::cmdcode($digest)
+          }
+      }
+      close $fd
+      close $cmdfile
+      close $ffile
+
+      set copts [list]
+      if {$v::options(language) != ""} {
+        lappend fopts -x $v::options(language)
+      }
+      if {$v::options(I) != ""} {
+        lappend copts $c::include$v:::options(I)
+      }
+      lappend copts $c::include$cache
+
+      set fopts [list]
+      if {$v::options(language) != ""} {
+        lappend fopts -x $v::options(language)
+      }
+      if {$v::options(I) != ""} {
+        lappend fopts $c::finclude$v:::options(I)
+      }
+      lappend fopts $c::finclude$cache
+      set copies {}
+      foreach x $hdrs {
+        if {[string index $x 0] == "-"} {
+          lappend copts $x
+        } else {
+          set copy [file join $cache [file tail $x]]
+          file delete $copy
+          file copy $x $copy
+          lappend copies $copy
+        }
+      }
+
+      fcompile $file ${base}_f.f90 $fopts $lfd $libfile
+      append copts " $c::fextra_cflags"
+
+      set c::compile "gcc -c -fPIC"
+      set c::cflags ""
+      set c::threadflags ""
+      set c::output "-o \$outfile"
+      set c::optimize "-O"
+      set c::link_release ""
+      set c::ldoutput ""
+      set copts " $c::fextra_cflags"
+      file copy -force [file join $::Wrapfort::wrapdir "wrapfort_lib.c"] [file dirname $base]
+      compile $file $::Wrapfort::pkgfname $copts $lfd ${base}_c$c::object
+      lappend v::objs ${base}_c$c::object
+
+      if { !$v::options(keepsrc) } {
+          # file delete $::Wrapfort::tclfname -- AM: this does not work yet!
+          #                                          the file remains open somewhere?
+          # file delete $base.c
+      }
+
+      foreach src $srcs {
+          set tail [file tail $src]
+          set srcbase [file rootname [file tail $src]]
+          if {[file dirname $base] ne [file dirname $src]} {
+              set srcbase [file tail [file dirname $src]]_$srcbase
+          }
+          set obj [file join [file normalize $cache] ${srcbase}$c::object]
+          compile $src $src $copts $lfd $obj
+          lappend v::objs $obj
+      }
+      if {($load || $link) && !$v::failed} {
+        set cmdline $c::flink
+        if {[llength $v::preload]} {
+            append cmdline " $c::link_preload"
+        }
+        set outfile $target
+        if {[string length [set ldout [subst $c::ldoutput]]] == 0} {
+            set ldout [subst $c::output]
+        }
+        if {$option::debug_symbols} {
+            append cmdline " $c::link_debug $ldout"
+        } else {
+            append cmdline " $c::strip $c::link_release $ldout"
+        }
+        if {[string match "win32-*-cl" [Platform]]} {
+            regsub -all -- {-l(\S+)} $libs {\1.lib} libs
+        }
+        append cmdline " $libfile "
+#AM     if {[string match "win32-*-cl" [Platform]]} {
+#           set f [open [set rsp [file join $cache link.fil]] w]
+#           puts $f [join $v::objs \n]
+#           close $f
+#           append cmdline @$rsp
+#       } else {}
+            append cmdline [join [lsort -unique $v::objs]]
+#      {}
+        append cmdline " $libs $v::ldflags"
+        puts $lfd "\n$cmdline"
+        variable run
+        interp transfer {} $lfd $run
+        if {[catch {
+            interp eval $run "exec $cmdline 2>@ $lfd"
+            interp transfer $run $lfd {}
+            puts $lfd "$target: [file size $target] bytes"
+        } err]} {
+            interp transfer $run $lfd {}
+            puts $lfd "ERROR while linking $target:"
+            incr v::failed
+        }
+        if {!$v::failed && [llength $v::preload]} {
+            # compile preload if necessary
+            set outfile [file join [file dirname $base] \
+                            preload$c::sharedlibext]
+            if {![file readable $outfile]} {
+                set src [file join $v::cache preload.c]
+                set obj [file join $v::cache preload.o]
+                compile $src $src $copts $lfd $obj
+                set cmdline "$c::link $obj $c::strip [subst $c::output]"
+                puts $lfd "\n$cmdline"
+                interp transfer {} $lfd $run
+                if {[catch {
+                    interp eval $run "exec $cmdline 2>@ $lfd"
+                    interp transfer $run $lfd {}
+                    puts $lfd "$outfile: [file size $target] bytes"
+                } err]} {
+                    interp transfer $run $lfd {}
+                    puts $lfd "ERROR while linking $outfile:"
+                    incr v::failed
+                }
+            }
+        }
+      }
+      # read build log
+      close $lfd
+      set lfd [open $log]
+      set msgs [read $lfd]
+      close $lfd
+      file delete -force $log
+      # append to critcl log
+      set log [file join $cache $v::prefix.log]
+      set lfd [open $log a]
+      puts $lfd $msgs
+      close $lfd
+      foreach x $copies { file delete $x }
+    }
+
+    if {$v::failed} {
+      if {$silent == ""} {
+        puts stderr $msgs
+        puts stderr "critcl build failed ($file)"
+      }
+    } elseif {$load} {
+        load $target $ininame
+    }
+
+    foreach {name digest} $v::code($file,list) {
+      if {$name != "" && [info exists v::code($digest)]} {
+        unset v::code($digest)
+      }
+    }
+    foreach x {hdrs srcs init} {
+      array unset v::code $file,$x
+    }
+    if {$link} {
+      return [list $target $ininame]
+    }
+    return [list $libfile $ininame]
+}
diff --git a/src/vfs/critcl.vfs/lib/critclf/idx_wrap.tcl b/src/vfs/critcl.vfs/lib/critclf/idx_wrap.tcl
new file mode 100644
index 00000000..b14488c0
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critclf/idx_wrap.tcl
@@ -0,0 +1,6 @@
+# Package index file for PKGNAME
+#
+if { [package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded PKGNAME 1.0 [list load [file join $dir PKGNAME.dll]]
+
+# Note: add support for other platforms!
diff --git a/src/vfs/critcl.vfs/lib/critclf/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/critclf/pkgIndex.tcl
new file mode 100644
index 00000000..5da4c2f4
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critclf/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+package ifneeded critclf  0.3 [list source [file join $dir critclf.tcl]]
+package ifneeded wrapfort 0.3 [list source [file join $dir wrapfort.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/critclf/pkg_wrap.c b/src/vfs/critcl.vfs/lib/critclf/pkg_wrap.c
new file mode 100644
index 00000000..faa24bb0
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critclf/pkg_wrap.c
@@ -0,0 +1,122 @@
+/* Simple wrapper
+*/
+/* Include files
+*/
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#include <limits.h>
+#include <float.h>
+
+#include "tcl.h"
+
+#define EXPORT_FUNC __declspec(dllexport)
+
+EXPORT_FUNC int PKGINIT_Init( Tcl_Interp *interp ) ;
+
+#include "wrapfort_lib.c"
+
+static Tcl_Interp *saved_interp; /* TODO: allow several interpreters! */
+
+#if defined(__unix)
+#define __stdcall
+#endif
+#include "FILENAME"
+
+
+#ifdef CRITCLF
+TclStubs *tclStubsPtr;
+TclPlatStubs *tclPlatStubsPtr;
+struct TclIntStubs *tclIntStubsPtr;
+struct TclIntPlatStubs *tclIntPlatStubsPtr;
+
+static int
+MyInitTclStubs (Tcl_Interp *ip)
+{
+    typedef struct {
+        char *result;
+        Tcl_FreeProc *freeProc;
+        int errorLine;
+        TclStubs *stubTable;
+    } HeadOfInterp;
+
+    HeadOfInterp *hoi = (HeadOfInterp*) ip;
+
+    if (hoi->stubTable == NULL || hoi->stubTable->magic != TCL_STUB_MAGIC) {
+        ip->result = "This extension requires stubs-support.";
+        ip->freeProc = TCL_STATIC;
+        return 0;
+    }
+
+    tclStubsPtr = hoi->stubTable;
+
+    if (Tcl_PkgRequire(ip, "Tcl", "8.1", 0) == NULL) {
+        tclStubsPtr = NULL;
+        return 0;
+    }
+
+    if (tclStubsPtr->hooks != NULL) {
+        tclPlatStubsPtr = tclStubsPtr->hooks->tclPlatStubs;
+        tclIntStubsPtr = tclStubsPtr->hooks->tclIntStubs;
+        tclIntPlatStubsPtr = tclStubsPtr->hooks->tclIntPlatStubs;
+    }
+
+    return 1;
+}
+#endif
+
+int PKGINIT_Init( Tcl_Interp *interp )
+{
+   int retcode ;
+   int error   ;
+
+/* Register the Fortran logical values
+*/
+/* TODO
+   ftcl_init_log( &ftcl_true, &ftcl_false ) ;
+*/
+
+/* Initialise the stubs
+*/
+#ifdef USE_TCL_STUBS
+#ifndef CRITCLF
+    if (Tcl_InitStubs(interp, "8.0", 0) == NULL) {
+       return TCL_ERROR;
+    }
+#else
+    if (MyInitTclStubs(interp) == 0) {
+       return TCL_ERROR;
+    }
+#endif
+#endif
+
+
+/* Inquire about the package's version
+*/
+    if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL)
+    {
+       if (TCL_VERSION[0] == '7')
+       {
+          if (Tcl_PkgRequire(interp, "Tcl", "8.0", 0) == NULL)
+          {
+             return TCL_ERROR;
+          }
+       }
+    }
+
+    if (Tcl_PkgProvide(interp, "PKGNAME", "1.0") != TCL_OK)
+    {
+       return TCL_ERROR;
+    }
+
+/* Register the package's commands
+*/
+   retcode = TCL_OK ;
+
+#include "TCLFNAME"
+
+   return retcode ;
+}
+
+/* End of file ftempl.c */
diff --git a/src/vfs/critcl.vfs/lib/critclf/wrapfort.code b/src/vfs/critcl.vfs/lib/critclf/wrapfort.code
new file mode 100644
index 00000000..eaf6c6fa
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critclf/wrapfort.code
@@ -0,0 +1,325 @@
+# Nog te doen:
+# error-handling (onerror)
+# meerdere interpreters
+
+
+# wrapfort.code --
+#     Code fragments (templates) for generating a wrapper
+#
+array set ctype {void void real float double double integer long logical long string "char *"
+                 integer-array  long real-array  float double-array  double
+                 integer-vector long real-vector float double-vector double
+                 integer-matrix long real-matrix float double-matrix double}
+
+set header "
+/* Wrapper for ROUTINE - Tcl-command CMDNAME */
+#ifdef FTN_UNDERSCORE
+#   define ROUTINE ROUTINE_
+#endif
+#ifdef FTN_ALL_CAPS
+#   define ROUTINE ALLCAPS
+#endif
+void __stdcall ROUTINE(); /* Important! */
+static int c__ROUTINE( ClientData client_data, Tcl_Interp *interp,
+                       Tcl_Size objc, struct Tcl_Obj * CONST objv\[\] ) {
+    int _rc_ = TCL_OK ;"
+
+set declaration(integer)        {    long NAME;}
+set declaration(real)           {    float NAME;}
+set declaration(double)         {    double NAME;}
+set declaration(string)         {    char NAME[80]; int length__NAME;}
+set declaration(logical)        {    long NAME;}
+set declaration(integer-vector) {    long *NAME; int size__NAME;}
+set declaration(integer-array)  {    long *NAME; int size__NAME;}
+set declaration(integer-matrix) {    long *NAME; int size_inner__NAME, size_outer__NAME;}
+set declaration(real-vector)    {    float *NAME; int size__NAME;}
+set declaration(real-array)     {    float *NAME; int size__NAME;}
+set declaration(real-matrix)    {    float *NAME; int size_inner__NAME, size_outer__NAME;}
+set declaration(double-vector)  {    double *NAME; int size__NAME;}
+set declaration(double-array)   {    double *NAME; int size__NAME;}
+set declaration(double-matrix)  {    double *NAME; int size_inner__NAME, size_outer__NAME;}
+
+set initialisation(check)     {
+    if ( objc != COUNT ) {
+        Tcl_SetResult( interp, "Wrong number of arguments", NULL );
+        return TCL_ERROR;
+    }}
+
+set initialisation(integer)     {
+    if ( Tcl_GetLongFromObj( interp, objv[COUNT], &NAME ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Argument COUNT must be integer", NULL );
+        return TCL_ERROR;
+    }}
+
+set initialisation(integer-array)     {
+    if ( WrapCopyIntListToArray( interp, objv[COUNT], &NAME, &size__NAME ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Argument COUNT must be a list of integers", NULL );
+        return TCL_ERROR;
+    }}
+
+set initialisation(real)     {
+    {
+        double value;
+        if ( Tcl_GetDoubleFromObj( interp, objv[COUNT], &value ) != TCL_OK ) {
+            Tcl_SetResult( interp, "Argument COUNT must be a double precision real", NULL );
+            return TCL_ERROR;
+        } else {
+            NAME = (float) value;
+        }
+    }}
+
+set initialisation(real-array)     {
+    if ( WrapCopyDoubleListToRealArray( interp, objv[COUNT], &NAME, &size__NAME ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Argument COUNT must be a list of double precision reals", NULL );
+        return TCL_ERROR;
+    }}
+
+set initialisation(double)     {
+    if ( Tcl_GetDoubleFromObj( interp, objv[COUNT], &NAME ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Argument COUNT must be a double precision real", NULL );
+        return TCL_ERROR;
+    }}
+
+set initialisation(double-array)     {
+    if ( WrapCopyDoubleListToArray( interp, objv[COUNT], &NAME, &size__NAME ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Argument COUNT must be a list of double precision reals", NULL );
+        return TCL_ERROR;
+    }}
+
+set initialisation(external)   {
+    saved_interp = interp ;
+    if ( NAME_tclprocs == NULL ) {
+        NAME_tclprocs = Tcl_NewListObj( 0, NULL );
+        Tcl_IncrRefCount(NAME_tclprocs);
+    }
+    if ( Tcl_ListObjAppendElement( interp, NAME_tclprocs, objv[COUNT]) != TCL_OK ) {
+        Tcl_SetResult( interp, "Name of Tcl command could not be stored for later use", NULL );
+        return TCL_ERROR;
+    }}
+
+#
+# TODO!
+#
+set initialisation(string)     {
+    if ( Tcl_GetDoubleFromObj( interp, objv[COUNT], &NAME ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Argument COUNT must be a double precision real", NULL );
+        return TCL_ERROR;
+    }}
+
+set cleanup(close)   "    return _rc_;
+}"
+
+set cleanup(integer)        "/* Nothing to be done for: NAME */"
+set cleanup(integer-array)  "    free(NAME);"
+set cleanup(integer-vector) "    free(NAME);"
+set cleanup(integer-matrix) "    free(NAME);"
+set cleanup(real)           "/* Nothing to be done for: NAME */"
+set cleanup(real-array)     "    free(NAME);"
+set cleanup(real-vector)    "    free(NAME);"
+set cleanup(real-matrix)    "    free(NAME);"
+set cleanup(double)         "/* Nothing to be done for: NAME */"
+set cleanup(double-array)   "    free(NAME);"
+set cleanup(double-vector)  "    free(NAME);"
+set cleanup(double-matrix)  "    free(NAME);"
+
+set cleanup(external)       {
+   {int length ;
+    if ( Tcl_ListObjLength( interp, NAME_tclprocs, &length ) != TCL_OK ||
+         Tcl_ListObjReplace( interp, NAME_tclprocs, length-1, length-1, 0, NULL ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Argument COUNT could not be cleaned up", NULL );
+        return TCL_ERROR;
+    }
+   }
+}
+
+set result(integer)  {
+    Tcl_SetObjResult( interp, Tcl_NewLongObj(NAME) ) ;
+}
+set result(real)  {
+    Tcl_SetObjResult( interp, Tcl_NewDoubleObj((double)NAME) ) ;
+}
+set result(double)  {
+    Tcl_SetObjResult( interp, Tcl_NewDoubleObj(NAME) ) ;
+}
+set result(integer-array)  {
+    {
+        Tcl_Obj *result;
+        if ( WrapCopyIntArrayToList( interp, NAME, size__NAME, &result ) != TCL_OK ) {
+            Tcl_SetResult( interp, "Can not copy array to Tcl result", NULL );
+            return TCL_ERROR;
+        } else {
+            Tcl_SetObjResult( interp, result ) ;
+        }
+    }}
+set result(real-array)  {
+    {
+        Tcl_Obj *result;
+        if ( WrapCopyRealArrayToDoubleList( interp, NAME, size__NAME, &result ) != TCL_OK ) {
+            Tcl_SetResult( interp, "Can not copy array to Tcl result", NULL );
+            return TCL_ERROR;
+        } else {
+            Tcl_SetObjResult( interp, result ) ;
+        }
+    }}
+set result(double-array)  {
+    {
+        Tcl_Obj *result;
+        if ( WrapCopyDoubleArrayToList( interp, NAME, size__NAME, &result ) != TCL_OK ) {
+            Tcl_SetResult( interp, "Can not copy array to Tcl result", NULL );
+            return TCL_ERROR;
+        } else {
+            Tcl_SetObjResult( interp, result ) ;
+        }
+    }}
+
+#
+# Second part: Fortran calling Tcl
+#
+
+set fheader(start) {
+/* Wrapper for the NAME interface */
+#ifdef FTN_UNDERSCORE
+#   define NAME NAME_
+#endif
+#ifdef FTN_ALL_CAPS
+#   define NAME ALLCAPS
+#endif
+static Tcl_Obj *NAME_tclprocs ;
+TYPE __stdcall NAME (}
+
+set fheader(end)   ") \{"
+
+set fdeclaration(integer)             {    long *NAME}
+set fdeclaration(real)                {    float *NAME}
+set fdeclaration(double)              {    double *NAME}
+set fdeclaration(integer-array)       {    long *NAME}
+set fdeclaration(real-array)          {    float *NAME}
+set fdeclaration(double-array)        {    double *NAME}
+set fdeclaration(integer-vector)      {    long *NAME}
+set fdeclaration(real-vector)         {    float *NAME}
+set fdeclaration(double-vector)       {    double *NAME}
+set fdeclaration(integer-matrix)      {    long *NAME}
+set fdeclaration(real-matrix)         {    float *NAME}
+set fdeclaration(double-matrix)       {    double *NAME}
+
+set fdeclaration(length)              {    int size__NAME = *SIZE;}
+
+set fdecl_result(integer)             {    long NAME;}
+set fdecl_result(real)                {    float NAME;}
+set fdecl_result(double)              {    double NAME;}
+
+set finitialisation(start)             {
+    Tcl_Obj    *objv[NOARGS]    ;
+    Tcl_Size    objc   = NOARGS ;
+    int         error           ;
+    Tcl_Size    length          ;
+    Tcl_Interp *interp = saved_interp ;
+
+    if ( Tcl_ListObjLength( interp, NAME_tclprocs, &length ) != TCL_OK ||
+         Tcl_ListObjIndex( interp, NAME_tclprocs, length-1, &objv[0] ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Could not retrieve proc name", NULL );
+        return DUMMY;
+    }
+}
+set finitialisation(integer)           {    objv[IDX] = Tcl_NewLongObj(*NAME);
+    Tcl_IncrRefCount(objv[IDX]);}
+set finitialisation(real)              {    objv[IDX] = Tcl_NewDoubleObj((double)*NAME);
+    Tcl_IncrRefCount(objv[IDX]);}
+set finitialisation(double)            {    objv[IDX] = Tcl_NewDoubleObj(*NAME);
+    Tcl_IncrRefCount(objv[IDX]);}
+
+set finitialisation(integer-array)  {
+    if ( WrapCopyIntArrayToList( interp, NAME, size__NAME, &objv[IDX] ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Can not copy array to argument IDX", NULL );
+        /* TODO: clean-up! */
+        return TCL_ERROR;
+    }
+    Tcl_IncrRefCount(objv[IDX]);}
+
+set finitialisation(real-array)  {
+    if ( WrapCopyRealArrayToDoubleList( interp, NAME, size__NAME, &objv[IDX] ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Can not copy array to argument IDX", NULL );
+        /* TODO: clean-up! */
+        return TCL_ERROR;
+    }
+    Tcl_IncrRefCount(objv[IDX]);}
+
+set finitialisation(double-array)  {
+    if ( WrapCopyDoubleArrayToList( interp, NAME, size__NAME, &objv[IDX] ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Can not copy array to argument IDX", NULL );
+        /* TODO: clean-up! */
+        return TCL_ERROR;
+    }
+    Tcl_IncrRefCount(objv[IDX]);}
+
+set finitialisation(integer-vector) $finitialisation(integer-array)
+set finitialisation(real-vector)    $finitialisation(real-array)
+set finitialisation(double-vector)  $finitialisation(double-array)
+
+set frunproc {
+    {int _i_;
+    for ( _i_ = 0; _i_ < objc; _i_ ++ ) {
+        Tcl_IncrRefCount(objv[_i_]);
+    }
+    error = 0 ;
+    if ( Tcl_EvalObjv( interp, objc, objv, 0 ) != TCL_OK ) {
+        error = 1 ;
+    }
+    for ( _i_ = 0; _i_ < objc; _i_ ++ ) {
+        Tcl_DecrRefCount(objv[_i_]);
+    }}
+}
+set fresult(integer)        {
+   if ( Tcl_GetLongFromObj( interp, Tcl_GetObjResult(interp), &NAME ) != TCL_OK ) {
+        Tcl_AppendResult( interp, "Could not retrieve integer result", NULL ) ;
+   }
+}
+set fresult(real)           {
+  {double dbl ;
+   if ( Tcl_GetDoubleFromObj( interp, Tcl_GetObjResult(interp), &dbl ) != TCL_OK ) {
+        Tcl_AppendResult( interp, "Could not retrieve real result", NULL ) ;
+       NAME = 0.0f ;
+   } else {
+       NAME = (float) dbl ;
+   }
+  }
+}
+set fresult(double)         {
+   if ( Tcl_GetDoubleFromObj( interp, Tcl_GetObjResult(interp), &NAME ) != TCL_OK ) {
+        Tcl_AppendResult( interp, "Could not retrieve double result", NULL ) ;
+   }
+}
+
+set fresult(integer-array)     {
+    if ( WrapCopyIntListIntoExistingArray( interp, Tcl_GetObjResult(interp), NAME, size__NAME ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Result of Tcl proc must be a list of integers", NULL );
+        return TCL_ERROR;
+    }}
+
+set fresult(real-array)     {
+    if ( WrapCopyDoubleListIntoExistingRealArray( interp, Tcl_GetObjResult(interp), NAME, size__NAME ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Result of Tcl proc must be a list of double precision reals", NULL );
+        return TCL_ERROR;
+    }}
+
+set fresult(double-array)     {
+    if ( WrapCopyDoubleListIntoExistingArray( interp, Tcl_GetObjResult(interp), NAME, size__NAME ) != TCL_OK ) {
+        Tcl_SetResult( interp, "Result of Tcl proc must be a list of double precision reals", NULL );
+        return TCL_ERROR;
+    }}
+
+set ferror {
+    if ( error != 0 ) {
+        ERROR
+    }}
+
+set fcleanup(integer)       {    Tcl_DecrRefCount(objv[IDX]);}
+set fcleanup(real)          {    Tcl_DecrRefCount(objv[IDX]);}
+set fcleanup(double)        {    Tcl_DecrRefCount(objv[IDX]);}
+set fcleanup(integer-array) {    Tcl_DecrRefCount(objv[IDX]);}
+set fcleanup(real-array)    {    Tcl_DecrRefCount(objv[IDX]);}
+set fcleanup(double-array)  {    Tcl_DecrRefCount(objv[IDX]);}
+
+set freturn(integer)        {    return NAME;}
+set freturn(real)           {    return NAME;}
+set freturn(double)         {    return NAME;}
diff --git a/src/vfs/critcl.vfs/lib/critclf/wrapfort.tcl b/src/vfs/critcl.vfs/lib/critclf/wrapfort.tcl
new file mode 100644
index 00000000..d344048e
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critclf/wrapfort.tcl
@@ -0,0 +1,744 @@
+# wrapfort.tcl --
+#     Utility for quickly wrapping Fortran (77) routines
+#
+#     TODO:
+#     - Fortran functions are not covered yet (void __stdcall ...)
+#
+
+package require Tcl 8.6 9
+package provide wrapfort 0.3
+
+# Wrapfort --
+#     Namespace which holds all relevant information and procedures
+#
+namespace eval ::Wrapfort {
+    variable srcout          ;# Handle to the output file
+    variable incritcl 0      ;# Interaction with Critcl
+    variable tclfname        ;# C file with Tcl_CreateCommand()
+    variable pkgfname        ;# C file to compile
+
+    variable header          ;# Template for routine header
+    variable routines        ;# List of routines to be registered
+    variable declaration     ;# Array containing the declaration templates
+    variable initialisation  ;# Array containing the initialisation templates
+    variable cleanup         ;# Array containing the templates for clean up code
+    variable result          ;# Array containing the templates for result code
+
+    variable fheader         ;# Template for Tcl proc wrapper, called from Fortran
+    variable fdeclaration    ;# Array containing the declaration templates
+    variable finitialisation ;# Array containing the initialisation templates
+    variable fcleanup        ;# Array containing the templates for clean up code
+    variable fresult         ;# Array containing the templates for result code
+
+    variable ref_interfaces  ;# List of referenced interfaces
+    variable dfn_interfaces  ;# List of defined interfaces
+
+    set ref_interfaces {}
+    set dfn_interfaces {}
+
+    namespace export fproc fsource fexternal
+
+    variable wrapdir [file dirname [info script]] ;# Directory containing auxiliary files
+
+    source [file join $wrapdir "wrapfort.code"]
+}
+
+
+# incritcl --
+#     Set the parameter that determines whether used via Critcl
+#
+# Arguments:
+#     in              If true, called via Critcl, otherwise standalone
+#
+proc ::Wrapfort::incritcl {in} {
+    variable incritcl
+
+    set incritcl $in
+
+}
+
+
+# Output --
+#     Write the C code fragments
+#
+# Arguments:
+#     code            Code to be written to file or stored in a variable
+#
+proc ::Wrapfort::Output {code} {
+    variable incritcl
+    variable srcout
+
+    if { ! $incritcl } {
+        puts $srcout $code
+    } else {
+        ::critcl::Emitln $code
+    }
+}
+proc ::Wrapfort::Output2 {code} {
+    variable incritcl
+    variable cmdout
+
+    if { ! $incritcl } {
+        puts $cmdout $code
+    } else {
+	return -code error "Cmdemit does not exist!!"
+        ::critcl::Cmdemit $code
+    }
+}
+
+
+# fsource --
+#     Open the source file
+#
+# Arguments:
+#     pkgname         Name of the package
+#     filename        Name of the file to write
+#
+proc ::Wrapfort::fsource {pkgname filename} {
+    variable srcout
+    variable cmdout
+    variable wrapdir
+    variable tclfname
+    variable pkgfname
+    variable incritcl
+
+    set srcout [open $filename w]
+    set cmdout [open [file join [file dirname $filename] "tcl_[file tail $filename]"] w]
+
+    #
+    # The template files
+    #
+    set infile   [open [file join $wrapdir "pkg_wrap.c"]]
+    set pkgfname [file join [file dirname $filename] "pkg_[file tail $filename]"]
+    set tclfname [file join [file dirname $filename] "tcl_[file tail $filename]"]
+
+    set contents [string map [list PKGNAME $pkgname \
+        PKGINIT [string totitle $pkgname] FILENAME $filename TCLFNAME $tclfname] \
+        [read $infile]]
+
+    set outfile  [open $pkgfname w]
+    if { $incritcl } {
+        puts $outfile "#define CRITCLF"
+    }
+    puts -nonewline $outfile $contents
+    close $outfile
+    close $infile
+
+    set infile  [open [file join $wrapdir "idx_wrap.tcl"]]
+    set outfile [open "pkgIndex.tcl" w]
+    set contents [string map [list PKGNAME $pkgname] [read $infile]]
+    puts -nonewline $outfile $contents
+    close $outfile
+    close $infile
+}
+
+
+# fproc --
+#     Procedure to drive the generation of the wrapper code
+#
+# Arguments:
+#     cmdname         Name of the corresponding Tcl command
+#     froutine        Name of the Fortran routine/function that is to be wrapped
+#     arglist         Description of the argument list and local
+#                     variables, as well as specific code
+#
+proc ::Wrapfort::fproc {cmdname routine arglist} {
+    #
+    # Check any external interfaces
+    #
+    ExternalInterfaces $arglist
+
+    #
+    # The generation occurs in stages
+    #
+    WriteTclCreateCommand $cmdname $routine
+    WriteRoutineHeader    $cmdname $routine $arglist
+
+    WriteDeclarations   $arglist
+    WriteInitialisation $arglist
+    WriteBody           $arglist
+    WriteResultCode     $arglist
+    WriteCleanup        $arglist
+}
+
+
+# ExternalInterfaces --
+#     Check and update the lists of external interfaces
+#
+# Arguments:
+#     arglist         Argument list for the Fortran routine
+# Result:
+#     None
+#
+# Side effects:
+#     Updates the list ref_interfaces. May throw
+#     an error
+#
+proc ::Wrapfort::ExternalInterfaces {arglist} {
+    variable ref_interfaces
+    variable dfn_interfaces
+
+    foreach {type name specs} $arglist {
+        if { $type == "external" } {
+            if { [lsearch $ref_interfaces $name] >= 0 } {
+                return -code error "Interface $name already referenced!"
+            } else {
+                lappend ref_interfaces $name
+            }
+            if { [lsearch $dfn_interfaces $name] < 0 } {
+                return -code error "Interface $name has not been defined yet!"
+            }
+        }
+    }
+}
+
+
+# WriteTclCreateCommand --
+#     Write the Tcl_CreateObjCommand line to register the command
+#
+# Arguments:
+#     cmdname         Name of the corresponding Tcl command
+#     routine         Name of the C routine/function that will be created
+# Result:
+#     None
+#
+# Side effects:
+#     Writes a piece of the code to the second file
+#
+proc ::Wrapfort::WriteTclCreateCommand {cmdname routine} {
+
+    Output2 [string map [list CMDNAME $cmdname ROUTINE $routine] \
+        "    Tcl_CreateObjCommand2( interp, \"CMDNAME\", c__ROUTINE, NULL, NULL );"]
+}
+
+
+# WriteRoutineHeader --
+#     Write the header for the routine/function
+#
+# Arguments:
+#     cmdname         Name of the corresponding Tcl command
+#     routine         Name of the C routine/function that will be created
+#     arglist         Description of the argument list and local
+#                     variables, as well as specific code
+# Result:
+#     None
+#
+# Side effects:
+#     Writes a piece of the code to file, also stores the command
+#     and routine names for later use.
+#
+proc ::Wrapfort::WriteRoutineHeader {cmdname routine arglist} {
+    variable routines
+    variable header
+    variable external_decl
+
+    lappend routines [list $cmdname $routine]
+
+    Output [string map [list ROUTINE $routine ALLCAPS [string toupper $routine] \
+                             CMDNAME $cmdname] $header]
+}
+
+
+# WriteInitialisation --
+#     Write the initialisation code for the routine
+#
+# Arguments:
+#     arglist         Description of the argument list and local
+#                     variables, as well as specific code
+# Result:
+#     None
+#
+# Side effects:
+#     Writes a piece of the code to file
+#
+proc ::Wrapfort::WriteInitialisation {arglist} {
+    variable initialisation
+
+    #
+    # First count the arguments
+    #
+    set count 1
+    foreach {type name specs} $arglist {
+        switch -- $type {
+            "integer" - "real" - "double" - "string" - "logical" -
+            "integer-vector" - "real-vector" - "double-vector" -
+            "integer-array"  - "real-array"  - "double-array"  -
+            "integer-matrix" - "real-matrix" - "double-matrix" {
+                if { [lindex $specs 0] == "input" } {
+                    incr count
+                }
+            }
+            "external" {
+                incr count
+            }
+        }
+    }
+
+    Output [string map [list COUNT $count] $initialisation(check)]
+
+    #
+    # Then handle the arguments
+    #
+    set count 1
+    foreach {type name specs} $arglist {
+        switch -- $type {
+            "integer" - "real" - "double" - "string" - "logical" -
+            "integer-vector" - "real-vector" - "double-vector" -
+            "integer-array"  - "real-array"  - "double-array"  -
+            "integer-matrix" - "real-matrix" - "double-matrix" {
+                if { [lindex $specs 0] == "input"} {
+                    Output [string map [list NAME $name COUNT $count] \
+                    $initialisation($type)]
+                }
+            }
+            "external" {
+                Output [string map [list NAME $name COUNT $count] \
+                    $initialisation($type)]
+            }
+        }
+        if { [lindex $specs 0] != "result" } {
+            incr count
+        }
+    }
+
+    #
+    # Finally handle the local variables
+    #
+    foreach {type name specs} $arglist {
+        switch -- $type {
+            "integer" - "double" - "string" - "logical" -
+            "integer-vector" - "real-vector" - "double-vector" -
+            "integer-array"  - "real-array"  - "double-array"  -
+            "integer-matrix" - "real-matrix" - "double-matrix" {
+                if { [lindex $specs 0] != "input"} {
+                    #
+                    # TODO: Requires more code!
+                    #
+                    Output "[MakeInitCode $type $name $specs]"
+                }
+            }
+        }
+    }
+}
+
+
+# MakeInitCode --
+#     Make the code to initialise the given variable
+#
+# Arguments:
+#     type            Type of the variable
+#     name            Name of the variable
+#     specs           Specification of how to initialise the variable
+# Result:
+#     Fragment of C code to initialise the variable
+#
+proc ::Wrapfort::MakeInitCode {type name specs} {
+
+    # For the moment: just replace size() by the hidden C variable
+
+    if { [lindex $specs 0] == "assign" } {
+        regsub -all {size\((.+)\)} [lrange $specs 1 end] {size__\1} ccode
+        return "    $name = $ccode ;"
+    } elseif { [lindex $specs 0] == "allocate" } {
+        set ctype [DetermineCType $type]
+
+        regsub -all {size\((.+)\)} [lrange $specs 1 end] {size__\1} ccode
+        return "    $name = ($ctype *) ckalloc(sizeof($ctype)*($ccode)) ;
+    size__$name = $ccode;"
+    } elseif { [lindex $specs 0] == "result" && [string match "*-array" $type] } {
+        set ctype [DetermineCType $type]
+
+        regsub -all {size\((.+)\)} [lrange $specs 1 end] {size__\1} ccode
+        return "    $name = ($ctype *) ckalloc(sizeof($ctype)*($ccode)) ;
+    size__$name = $ccode;"
+    } else {
+        return "    /* No initialisation for $name ($specs) */"
+    }
+}
+
+
+# WriteDeclarations --
+#     Extract the definitions and declarations from the list and
+#     write to the source file
+#
+# Arguments:
+#     arglist         Description of the argument list and local
+#                     variables, as well as specific code
+# Result:
+#     None
+#
+# Side effects:
+#     Writes a piece of the code to file
+#
+proc ::Wrapfort::WriteDeclarations {arglist} {
+    variable srcout
+    variable declaration
+
+    foreach {type name specs} $arglist {
+        switch -- $type {
+            "integer" - "double" - "real" - "string" - "logical" -
+            "integer-vector" - "real-vector" - "double-vector" -
+            "integer-array"  - "real-array"  - "double-array"  -
+            "integer-matrix" - "real-matrix" - "double-matrix" {
+                Output [string map [list NAME $name] $declaration($type)]
+            }
+            "code" - "external" {
+                continue  ;# Just skip those at this stage
+            }
+            default {
+                return -code error "Unknown keyword/type: $type"
+            }
+        }
+    }
+}
+
+
+# WriteBody --
+#     Write the literal code that may appear as type "code"
+#
+# Arguments:
+#     arglist         Description of the argument list and local
+#                     variables, as well as specific code
+# Result:
+#     None
+#
+# Side effects:
+#     Writes a piece of the code to file
+#
+proc ::Wrapfort::WriteBody {arglist} {
+    variable srcout
+
+    foreach {type name specs} $arglist {
+        switch -- $type {
+            "code" {
+                Output $specs
+            }
+        }
+    }
+}
+
+
+# WriteResultCode --
+#     Write the code to pass on the results
+#
+# Arguments:
+#     arglist         Description of the argument list and local
+#                     variables, as well as specific code
+# Result:
+#     None
+#
+# Side effects:
+#     Writes a piece of the code to file
+#
+proc ::Wrapfort::WriteResultCode {arglist} {
+    variable result
+    variable srcout
+
+    set count 0
+    foreach {type name specs} $arglist {
+        switch -- [lindex $specs 0] {
+            "result" {
+                Output [string map [list NAME $name] $result($type)]
+            }
+        }
+    }
+}
+
+
+# WriteCleanup --
+#     Write the code to clean up before returning
+#
+# Arguments:
+#     arglist         Description of the argument list and local
+#                     variables, as well as specific code
+# Result:
+#     None
+#
+# Side effects:
+#     Writes a piece of the code to file
+#
+proc ::Wrapfort::WriteCleanup {arglist} {
+    variable cleanup
+    variable srcout
+
+    set count 0
+    foreach {type name specs} $arglist {
+        switch -- $type {
+            "integer" - "real" - "double" - "string" - "logical" -
+            "integer-vector" - "real-vector" - "double-vector" -
+            "integer-array"  - "real-array"  - "double-array"  -
+            "integer-matrix" - "real-matrix" - "double-matrix" - "external" {
+                Output [string map [list NAME $name] $cleanup($type)]
+            }
+        }
+    }
+
+    Output $cleanup(close)
+}
+
+
+# fexternal --
+#     Procedure to generate a wrapper for a Tcl procedure
+#
+# Arguments:
+#     interface       Name of the Fortran interface
+#     arglist         Description of the arguments on the Fortran and Tcl side
+#
+proc ::Wrapfort::fexternal {interface arglist} {
+
+    set data(onerror) {}
+    array set data $arglist
+
+    #
+    # Check that the calling Fortran routine has already been defined!
+    #
+    CheckCallingRoutine $interface
+
+    #
+    # The generation occurs in stages
+    #
+    FortranWriteRoutineHeader  $interface $data(fortran)
+
+    FortranWriteInitialisation $interface $data(fortran) $data(toproc)
+    FortranWriteResultCode     $interface $data(fortran) $data(toproc) $data(onerror)
+    FortranWriteCleanup        $interface $data(fortran) $data(toproc)
+}
+
+
+# CheckCallingRoutine --
+#     Check if the calling Fortran routine has already been defined
+#
+# Arguments:
+#     name            Name of the interface
+# Result:
+#     None
+#
+# Side effects:
+#     Updates the list dfn_interfaces. May throw an error
+#
+proc ::Wrapfort::CheckCallingRoutine {name} {
+    variable ref_interfaces
+    variable dfn_interfaces
+
+    if { [lsearch $dfn_interfaces $name] >= 0 } {
+         return -code error "Interface $name has already been defined!"
+    }
+
+    lappend dfn_interfaces $name
+}
+
+
+# FortranWriteRoutineHeader --
+#     Write the header for the wrapper routine
+#
+# Arguments:
+#     interface       Name of the Fortran interface
+#     arglist         Description of the arguments on the Fortran side
+#
+proc ::Wrapfort::FortranWriteRoutineHeader {interface arglist} {
+    variable srcout
+    variable fheader
+    variable fdeclaration
+
+    set ftype [DetermineFunctionType $arglist]
+
+    Output "[string map [list TYPE $ftype NAME $interface \
+                              ALLCAPS [string toupper $interface]] $fheader(start)]"
+
+    set arguments {}
+    foreach {type var specs} $arglist {
+        if { [lindex $specs 0] != "result" } {
+            lappend arguments "[string map [list NAME $var] $fdeclaration($type)]"
+        }
+    }
+    Output [join $arguments ",\n"]
+    Output $fheader(end)
+
+    #
+    # Local declarations we need
+    #
+    foreach {type var specs} $arglist {
+        if { [string match "*-array" $type] } {
+            set size [lindex $specs 1]
+            Output "[string map [list SIZE $size NAME $var] $fdeclaration(length)]"
+        }
+    }
+}
+
+
+# DetermineFunctionType --
+#     Determine the type of the C wrapper
+#
+# Arguments:
+#     arglist         Description of the arguments on the Fortran side
+#
+proc ::Wrapfort::DetermineFunctionType {arglist} {
+    variable ctype
+
+    set functiontype "void"
+
+    foreach {type name specs} $arglist {
+         if { [lindex $specs 0] == "result" } {
+             set functiontype $type
+             break
+         }
+    }
+    return $ctype($functiontype)
+}
+
+
+# DetermineCType --
+#     Determine the C type that corresponds to the given type
+#
+# Arguments:
+#     type            Type of the variable in the interface definition
+#
+proc ::Wrapfort::DetermineCType {type} {
+    variable ctype
+
+    return $ctype($type)
+}
+
+
+# ReturnDummyValue --
+#     Determine the correct dummy return value (if any)
+#
+# Arguments:
+#     arglist         Description of the arguments on the Fortran side
+#
+proc ::Wrapfort::ReturnDummyValue {arglist} {
+
+    set dummy [DetermineFunctionType $arglist]
+
+    if { $dummy == "void" } {
+        set dummy ""
+    } else {
+        set dummy "($dummy) 0"
+    }
+    return $dummy
+}
+
+
+# FortranWriteInitialisation --
+#     Write the initialisation part of the wrapper routine
+#
+# Arguments:
+#     interface       Name of the Fortran interface
+#     fortargs        Description of the arguments on the Fortran side
+#     tclargs         Description of the arguments on the Tcl side
+#
+proc ::Wrapfort::FortranWriteInitialisation {interface fortargs tclargs} {
+    variable srcout
+    variable finitialisation
+    variable fdecl_result
+
+    foreach {type name specs} $fortargs {
+         if { [lindex $specs 0] == "result" } {
+            Output "[string map [list NAME $name] \
+                     $fdecl_result($type)]"
+         }
+    }
+
+    set noargs [NumberArguments $tclargs]
+    Output "[string map [list NOARGS $noargs NAME $interface \
+        DUMMY [ReturnDummyValue $fortargs]] $finitialisation(start)]"
+
+    set idx 1
+    foreach {var role} $tclargs {
+        if { $role != "result" } {
+            set pos  [lsearch $fortargs $var]
+            set type [lindex  $fortargs [expr {$pos-1}]]
+            Output "[string map [list NAME $var IDX $idx] $finitialisation($type)]"
+            incr idx
+        }
+    }
+}
+
+
+# NumberArguments --
+#     Determine the number of arguments to be passed to the Tcl proc
+#
+# Arguments:
+#     arglist         Description of the arguments on the Tcl side
+#
+proc ::Wrapfort::NumberArguments {arglist} {
+
+    set number 1
+    foreach {name role} $arglist {
+        if { $role != "result" } {
+            incr number
+        }
+    }
+    return $number
+}
+
+
+# FortranWriteResultCode --
+#     Write the part for calling the Tcl proc and handling the result
+#
+# Arguments:
+#     interface       Name of the Fortran interface
+#     fortargs        Description of the arguments on the Fortran side
+#     tclargs         Description of the arguments on the Tcl side
+#     errorhandling   Error handling code
+#
+proc ::Wrapfort::FortranWriteResultCode {interface fortargs tclargs errorhandling} {
+    variable srcout
+    variable frunproc
+    variable fresult
+    variable ferror
+
+    Output $frunproc
+
+    foreach {var role} $tclargs {
+        if { $role == "result" } {
+            set pos  [lsearch $fortargs $var]
+            set type [lindex  $fortargs [expr {$pos-1}]]
+            Output "[string map [list NAME $var] $fresult($type)]"
+        }
+    }
+   #foreach {type var specs} $fortargs {
+   #    if { [lindex $specs 0] == "result" } {
+   #        Output "[string map [list NAME $var] $fresult($type)]"
+   #    }
+   #}
+
+   Output [string map [list ERROR $errorhandling] $ferror]
+}
+
+
+# FortranWriteCleanup --
+#     Write the cleanup code
+#
+# Arguments:
+#     interface       Name of the Fortran interface
+#     fortargs        Description of the arguments on the Fortran side
+#     tclargs         Description of the arguments on the Tcl side
+#
+proc ::Wrapfort::FortranWriteCleanup {interface fortargs tclargs} {
+    variable srcout
+    variable fcleanup
+    variable freturn
+
+    set idx 1
+    foreach {var role} $tclargs {
+        if { $role != "result" } {
+            set pos  [lsearch $fortargs $var]
+            set type [lindex  $fortargs [expr {$pos-1}]]
+            Output "[string map [list NAME $var IDX $idx] $fcleanup($type)]"
+            incr idx
+        }
+    }
+
+    set ftype [DetermineFunctionType $fortargs]
+
+    if { $ftype != "void" } {
+        foreach {type var specs} $fortargs {
+            if { [lindex $specs 0] == "result" } {
+                Output "[string map [list NAME $var] $freturn($type)]"
+            }
+        }
+    }
+
+    Output "\}"
+}
diff --git a/src/vfs/critcl.vfs/lib/critclf/wrapfort_libf.f90 b/src/vfs/critcl.vfs/lib/critclf/wrapfort_libf.f90
new file mode 100644
index 00000000..70952683
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/critclf/wrapfort_libf.f90
@@ -0,0 +1,31 @@
+! wrapfort_libf.f90
+!     Auxiliary Fortran routines for Wrapfort
+!
+
+! fort_set_logical --
+!     Set a logical value (from C to Fortran)
+!
+! Arguments:
+!     var           Variable to be set
+!     clog          Set to true (if /= 0), to false (if 0)
+!
+subroutine fort_set_logical( var, clog )
+    logical :: var
+    integer :: clog
+
+    var = clog .ne. 0
+end subroutine fort_set_logical
+
+! fort_get_logical --
+!     Get a logical value (from Fortran to C)
+!
+! Arguments:
+!     var           Variable to be set
+!     log           Set to 1 (if true), to 0 (if false)
+!
+subroutine fort_get_logical( var, flog )
+    integer :: var
+    logical :: flog
+
+    var = merge(1,0,flog)
+end subroutine fort_get_logical
diff --git a/src/vfs/critcl.vfs/lib/md5/md5.tcl b/src/vfs/critcl.vfs/lib/md5/md5.tcl
new file mode 100644
index 00000000..9825263d
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/md5/md5.tcl
@@ -0,0 +1,451 @@
+##################################################
+#
+# md5.tcl - MD5 in Tcl
+# Author: Don Libes <libes@nist.gov>, July 1999
+# Version 1.2.0
+#
+# MD5  defined by RFC 1321, "The MD5 Message-Digest Algorithm"
+# HMAC defined by RFC 2104, "Keyed-Hashing for Message Authentication"
+#
+# Most of the comments below come right out of RFC 1321; That's why
+# they have such peculiar numbers.  In addition, I have retained
+# original syntax, bugs in documentation (yes, really), etc. from the
+# RFC.  All remaining bugs are mine.
+#
+# HMAC implementation by D. J. Hagberg <dhagberg@millibits.com> and
+# is based on C code in RFC 2104.
+#
+# For more info, see: http://expect.nist.gov/md5pure
+#
+# - Don
+#
+# Modified by Miguel Sofer to use inlines and simple variables
+##################################################
+
+package require Tcl 8.6 9
+namespace eval ::md5 {}
+
+if {![catch {package require Trf 2.0}]} {
+    # Trf is available, so implement the functionality provided here
+    # in terms of calls to Trf for speed.
+
+    proc ::md5::md5 {msg} {
+	string tolower [::hex -mode encode [::md5 $msg]]
+    }
+
+    # hmac: hash for message authentication
+
+    # MD5 of Trf and MD5 as defined by this package have slightly
+    # different results. Trf returns the digest in binary, here we get
+    # it as hex-string. In the computation of the HMAC the latter
+    # requires back conversion into binary in some places. With Trf we
+    # can use omit these.
+
+    proc ::md5::hmac {key text} {
+	# if key is longer than 64 bytes, reset it to MD5(key).  If shorter,
+	# pad it out with null (\x00) chars.
+	set keyLen [string length $key]
+	if {$keyLen > 64} {
+	    #old: set key [binary format H32 [md5 $key]]
+	    set key [::md5 $key]
+	    set keyLen [string length $key]
+	}
+
+	# ensure the key is padded out to 64 chars with nulls.
+	set padLen [expr {64 - $keyLen}]
+	append key [binary format "a$padLen" {}]
+
+	# Split apart the key into a list of 16 little-endian words
+	binary scan $key i16 blocks
+
+	# XOR key with ipad and opad values
+	set k_ipad {}
+	set k_opad {}
+	foreach i $blocks {
+	    append k_ipad [binary format i [expr {$i ^ 0x36363636}]]
+	    append k_opad [binary format i [expr {$i ^ 0x5c5c5c5c}]]
+	}
+
+	# Perform inner md5, appending its results to the outer key
+	append k_ipad $text
+	#old: append k_opad [binary format H* [md5 $k_ipad]]
+	append k_opad [::md5 $k_ipad]
+
+	# Perform outer md5
+	#old: md5 $k_opad
+	string tolower [::hex -mode encode [::md5 $k_opad]]
+    }
+
+} else {
+    # Without Trf use the all-tcl implementation by Don Libes.
+
+    # T will be inlined after the definition of md5body
+
+    # test md5
+    #
+    # This proc is not necessary during runtime and may be omitted if you
+    # are simply inserting this file into a production program.
+    #
+    proc ::md5::test {} {
+	foreach {msg expected} {
+	    ""
+	    "d41d8cd98f00b204e9800998ecf8427e"
+	    "a"
+	    "0cc175b9c0f1b6a831c399e269772661"
+	    "abc"
+	    "900150983cd24fb0d6963f7d28e17f72"
+	    "message digest"
+	    "f96b697d7cb7938d525a2f31aaf161d0"
+	    "abcdefghijklmnopqrstuvwxyz"
+	    "c3fcd3d76192e4007dfb496cca67e13b"
+	    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+	    "d174ab98d277d9f5a5611c2c9f419d9f"
+	    "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+	    "57edf4a22be3c955ac49da2e2107b67a"
+	} {
+	    puts "testing: md5 \"$msg\""
+	    set computed [md5 $msg]
+	    puts "expected: $expected"
+	    puts "computed: $computed"
+	    if {0 != [string compare $computed $expected]} {
+		puts "FAILED"
+	    } else {
+		puts "SUCCEEDED"
+	    }
+	}
+    }
+
+    # time md5
+    #
+    # This proc is not necessary during runtime and may be omitted if you
+    # are simply inserting this file into a production program.
+    #
+    proc ::md5::time {} {
+	foreach len {10 50 100 500 1000 5000 10000} {
+	    set time [::time {md5 [format %$len.0s ""]} 100]
+	    regexp -- "\[0-9]*" $time msec
+	    puts "input length $len: [expr {$msec/1000}] milliseconds per interation"
+	}
+    }
+
+    #
+    # We just define the body of md5pure::md5 here; later we
+    # regsub to inline a few function calls for speed
+    #
+
+    set ::md5::md5body {
+
+	#
+	# 3.1 Step 1. Append Padding Bits
+	#
+
+	set msgLen [string length $msg]
+
+	set padLen [expr {56 - $msgLen%64}]
+	if {$msgLen % 64 > 56} {
+	    incr padLen 64
+	}
+
+	# pad even if no padding required
+	if {$padLen == 0} {
+	    incr padLen 64
+	}
+
+	# append single 1b followed by 0b's
+	append msg [binary format "a$padLen" \200]
+
+	#
+	# 3.2 Step 2. Append Length
+	#
+
+	# RFC doesn't say whether to use little- or big-endian
+	# code demonstrates little-endian
+	# This step limits our input to size 2^32b or 2^24B
+	append msg [binary format "i1i1" [expr {8*$msgLen}] 0]
+
+	#
+	# 3.3 Step 3. Initialize MD Buffer
+	#
+
+	set A [expr 0x67452301]
+	set B [expr 0xefcdab89]
+	set C [expr 0x98badcfe]
+	set D [expr 0x10325476]
+
+	#
+	# 3.4 Step 4. Process Message in 16-Word Blocks
+	#
+
+	# process each 16-word block
+	# RFC doesn't say whether to use little- or big-endian
+	# code says little-endian
+	binary scan $msg i* blocks
+
+	# loop over the message taking 16 blocks at a time
+
+	foreach {X0 X1 X2 X3 X4 X5 X6 X7 X8 X9 X10 X11 X12 X13 X14 X15} $blocks {
+
+	    # Save A as AA, B as BB, C as CC, and D as DD.
+	    set AA $A
+	    set BB $B
+	    set CC $C
+	    set DD $D
+
+	    # Round 1.
+	    # Let [abcd k s i] denote the operation
+	    #      a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s).
+	    # [ABCD  0  7  1]  [DABC  1 12  2]  [CDAB  2 17  3]  [BCDA  3 22  4]
+	    set A [expr {$B + [<<< [expr {$A + [F $B $C $D] + $X0  + $T01}]  7]}]
+	    set D [expr {$A + [<<< [expr {$D + [F $A $B $C] + $X1  + $T02}] 12]}]
+	    set C [expr {$D + [<<< [expr {$C + [F $D $A $B] + $X2  + $T03}] 17]}]
+	    set B [expr {$C + [<<< [expr {$B + [F $C $D $A] + $X3  + $T04}] 22]}]
+	    # [ABCD  4  7  5]  [DABC  5 12  6]  [CDAB  6 17  7]  [BCDA  7 22  8]
+	    set A [expr {$B + [<<< [expr {$A + [F $B $C $D] + $X4  + $T05}]  7]}]
+	    set D [expr {$A + [<<< [expr {$D + [F $A $B $C] + $X5  + $T06}] 12]}]
+	    set C [expr {$D + [<<< [expr {$C + [F $D $A $B] + $X6  + $T07}] 17]}]
+	    set B [expr {$C + [<<< [expr {$B + [F $C $D $A] + $X7  + $T08}] 22]}]
+	    # [ABCD  8  7  9]  [DABC  9 12 10]  [CDAB 10 17 11]  [BCDA 11 22 12]
+	    set A [expr {$B + [<<< [expr {$A + [F $B $C $D] + $X8  + $T09}]  7]}]
+	    set D [expr {$A + [<<< [expr {$D + [F $A $B $C] + $X9  + $T10}] 12]}]
+	    set C [expr {$D + [<<< [expr {$C + [F $D $A $B] + $X10 + $T11}] 17]}]
+	    set B [expr {$C + [<<< [expr {$B + [F $C $D $A] + $X11 + $T12}] 22]}]
+	    # [ABCD 12  7 13]  [DABC 13 12 14]  [CDAB 14 17 15]  [BCDA 15 22 16]
+	    set A [expr {$B + [<<< [expr {$A + [F $B $C $D] + $X12 + $T13}]  7]}]
+	    set D [expr {$A + [<<< [expr {$D + [F $A $B $C] + $X13 + $T14}] 12]}]
+	    set C [expr {$D + [<<< [expr {$C + [F $D $A $B] + $X14 + $T15}] 17]}]
+	    set B [expr {$C + [<<< [expr {$B + [F $C $D $A] + $X15 + $T16}] 22]}]
+
+	    # Round 2.
+	    # Let [abcd k s i] denote the operation
+	    #      a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s).
+	    # Do the following 16 operations.
+	    # [ABCD  1  5 17]  [DABC  6  9 18]  [CDAB 11 14 19]  [BCDA  0 20 20]
+	    set A [expr {$B + [<<< [expr {$A + [G $B $C $D] + $X1  + $T17}]  5]}]
+	    set D [expr {$A + [<<< [expr {$D + [G $A $B $C] + $X6  + $T18}]  9]}]
+	    set C [expr {$D + [<<< [expr {$C + [G $D $A $B] + $X11 + $T19}] 14]}]
+	    set B [expr {$C + [<<< [expr {$B + [G $C $D $A] + $X0  + $T20}] 20]}]
+	    # [ABCD  5  5 21]  [DABC 10  9 22]  [CDAB 15 14 23]  [BCDA  4 20 24]
+	    set A [expr {$B + [<<< [expr {$A + [G $B $C $D] + $X5  + $T21}]  5]}]
+	    set D [expr {$A + [<<< [expr {$D + [G $A $B $C] + $X10 + $T22}]  9]}]
+	    set C [expr {$D + [<<< [expr {$C + [G $D $A $B] + $X15 + $T23}] 14]}]
+	    set B [expr {$C + [<<< [expr {$B + [G $C $D $A] + $X4  + $T24}] 20]}]
+	    # [ABCD  9  5 25]  [DABC 14  9 26]  [CDAB  3 14 27]  [BCDA  8 20 28]
+	    set A [expr {$B + [<<< [expr {$A + [G $B $C $D] + $X9  + $T25}]  5]}]
+	    set D [expr {$A + [<<< [expr {$D + [G $A $B $C] + $X14 + $T26}]  9]}]
+	    set C [expr {$D + [<<< [expr {$C + [G $D $A $B] + $X3  + $T27}] 14]}]
+	    set B [expr {$C + [<<< [expr {$B + [G $C $D $A] + $X8  + $T28}] 20]}]
+	    # [ABCD 13  5 29]  [DABC  2  9 30]  [CDAB  7 14 31]  [BCDA 12 20 32]
+	    set A [expr {$B + [<<< [expr {$A + [G $B $C $D] + $X13 + $T29}]  5]}]
+	    set D [expr {$A + [<<< [expr {$D + [G $A $B $C] + $X2  + $T30}]  9]}]
+	    set C [expr {$D + [<<< [expr {$C + [G $D $A $B] + $X7  + $T31}] 14]}]
+	    set B [expr {$C + [<<< [expr {$B + [G $C $D $A] + $X12 + $T32}] 20]}]
+
+	    # Round 3.
+	    # Let [abcd k s t] [sic] denote the operation
+	    #     a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s).
+	    # Do the following 16 operations.
+	    # [ABCD  5  4 33]  [DABC  8 11 34]  [CDAB 11 16 35]  [BCDA 14 23 36]
+	    set A [expr {$B + [<<< [expr {$A + [H $B $C $D] + $X5  + $T33}]  4]}]
+	    set D [expr {$A + [<<< [expr {$D + [H $A $B $C] + $X8  + $T34}] 11]}]
+	    set C [expr {$D + [<<< [expr {$C + [H $D $A $B] + $X11 + $T35}] 16]}]
+	    set B [expr {$C + [<<< [expr {$B + [H $C $D $A] + $X14 + $T36}] 23]}]
+	    # [ABCD  1  4 37]  [DABC  4 11 38]  [CDAB  7 16 39]  [BCDA 10 23 40]
+	    set A [expr {$B + [<<< [expr {$A + [H $B $C $D] + $X1  + $T37}]  4]}]
+	    set D [expr {$A + [<<< [expr {$D + [H $A $B $C] + $X4  + $T38}] 11]}]
+	    set C [expr {$D + [<<< [expr {$C + [H $D $A $B] + $X7  + $T39}] 16]}]
+	    set B [expr {$C + [<<< [expr {$B + [H $C $D $A] + $X10 + $T40}] 23]}]
+	    # [ABCD 13  4 41]  [DABC  0 11 42]  [CDAB  3 16 43]  [BCDA  6 23 44]
+	    set A [expr {$B + [<<< [expr {$A + [H $B $C $D] + $X13 + $T41}]  4]}]
+	    set D [expr {$A + [<<< [expr {$D + [H $A $B $C] + $X0  + $T42}] 11]}]
+	    set C [expr {$D + [<<< [expr {$C + [H $D $A $B] + $X3  + $T43}] 16]}]
+	    set B [expr {$C + [<<< [expr {$B + [H $C $D $A] + $X6  + $T44}] 23]}]
+	    # [ABCD  9  4 45]  [DABC 12 11 46]  [CDAB 15 16 47]  [BCDA  2 23 48]
+	    set A [expr {$B + [<<< [expr {$A + [H $B $C $D] + $X9  + $T45}]  4]}]
+	    set D [expr {$A + [<<< [expr {$D + [H $A $B $C] + $X12 + $T46}] 11]}]
+	    set C [expr {$D + [<<< [expr {$C + [H $D $A $B] + $X15 + $T47}] 16]}]
+	    set B [expr {$C + [<<< [expr {$B + [H $C $D $A] + $X2  + $T48}] 23]}]
+
+	    # Round 4.
+	    # Let [abcd k s t] [sic] denote the operation
+	    #     a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s).
+	    # Do the following 16 operations.
+	    # [ABCD  0  6 49]  [DABC  7 10 50]  [CDAB 14 15 51]  [BCDA  5 21 52]
+	    set A [expr {$B + [<<< [expr {$A + [I $B $C $D] + $X0  + $T49}]  6]}]
+	    set D [expr {$A + [<<< [expr {$D + [I $A $B $C] + $X7  + $T50}] 10]}]
+	    set C [expr {$D + [<<< [expr {$C + [I $D $A $B] + $X14 + $T51}] 15]}]
+	    set B [expr {$C + [<<< [expr {$B + [I $C $D $A] + $X5  + $T52}] 21]}]
+	    # [ABCD 12  6 53]  [DABC  3 10 54]  [CDAB 10 15 55]  [BCDA  1 21 56]
+	    set A [expr {$B + [<<< [expr {$A + [I $B $C $D] + $X12 + $T53}]  6]}]
+	    set D [expr {$A + [<<< [expr {$D + [I $A $B $C] + $X3  + $T54}] 10]}]
+	    set C [expr {$D + [<<< [expr {$C + [I $D $A $B] + $X10 + $T55}] 15]}]
+	    set B [expr {$C + [<<< [expr {$B + [I $C $D $A] + $X1  + $T56}] 21]}]
+	    # [ABCD  8  6 57]  [DABC 15 10 58]  [CDAB  6 15 59]  [BCDA 13 21 60]
+	    set A [expr {$B + [<<< [expr {$A + [I $B $C $D] + $X8  + $T57}]  6]}]
+	    set D [expr {$A + [<<< [expr {$D + [I $A $B $C] + $X15 + $T58}] 10]}]
+	    set C [expr {$D + [<<< [expr {$C + [I $D $A $B] + $X6  + $T59}] 15]}]
+	    set B [expr {$C + [<<< [expr {$B + [I $C $D $A] + $X13 + $T60}] 21]}]
+	    # [ABCD  4  6 61]  [DABC 11 10 62]  [CDAB  2 15 63]  [BCDA  9 21 64]
+	    set A [expr {$B + [<<< [expr {$A + [I $B $C $D] + $X4  + $T61}]  6]}]
+	    set D [expr {$A + [<<< [expr {$D + [I $A $B $C] + $X11 + $T62}] 10]}]
+	    set C [expr {$D + [<<< [expr {$C + [I $D $A $B] + $X2  + $T63}] 15]}]
+	    set B [expr {$C + [<<< [expr {$B + [I $C $D $A] + $X9  + $T64}] 21]}]
+
+	    # Then perform the following additions. (That is increment each
+	    #   of the four registers by the value it had before this block
+	    #   was started.)
+	    incr A $AA
+	    incr B $BB
+	    incr C $CC
+	    incr D $DD
+	}
+	# 3.5 Step 5. Output
+
+	# ... begin with the low-order byte of A, and end with the high-order byte
+	# of D.
+
+	return [bytes $A][bytes $B][bytes $C][bytes $D]
+    }
+
+    #
+    # Here we inline/regsub the functions F, G, H, I and <<<
+    #
+
+    namespace eval ::md5 {
+	#proc md5pure::F {x y z} {expr {(($x & $y) | ((~$x) & $z))}}
+	regsub -all -- {\[ *F +(\$.) +(\$.) +(\$.) *\]} $md5body {((\1 \& \2) | ((~\1) \& \3))} md5body
+
+	#proc md5pure::G {x y z} {expr {(($x & $z) | ($y & (~$z)))}}
+	regsub -all -- {\[ *G +(\$.) +(\$.) +(\$.) *\]} $md5body {((\1 \& \3) | (\2 \& (~\3)))} md5body
+
+	#proc md5pure::H {x y z} {expr {$x ^ $y ^ $z}}
+	regsub -all -- {\[ *H +(\$.) +(\$.) +(\$.) *\]} $md5body {(\1 ^ \2 ^ \3)} md5body
+
+	#proc md5pure::I {x y z} {expr {$y ^ ($x | (~$z))}}
+	regsub -all -- {\[ *I +(\$.) +(\$.) +(\$.) *\]} $md5body {(\2 ^ (\1 | (~\3)))} md5body
+
+	# bitwise left-rotate
+	if {0} {
+	    proc md5pure::<<< {x i} {
+		# This works by bitwise-ORing together right piece and left
+		# piece so that the (original) right piece becomes the left
+		# piece and vice versa.
+		#
+		# The (original) right piece is a simple left shift.
+		# The (original) left piece should be a simple right shift
+		# but Tcl does sign extension on right shifts so we
+		# shift it 1 bit, mask off the sign, and finally shift
+		# it the rest of the way.
+
+		# expr {($x << $i) | ((($x >> 1) & 0x7fffffff) >> (31-$i))}
+
+		#
+		# New version, faster when inlining
+		# We replace inline (computing at compile time):
+		#   R$i -> (32 - $i)
+		#   S$i -> (0x7fffffff >> (31-$i))
+		#
+
+		expr { ($x << $i) | (($x >> R$i) & S$i)}
+	    }
+	}
+	# inline <<<
+	regsub -all -- {\[ *<<< +\[ *expr +({[^\}]*})\] +([0-9]+) *\]} $md5body {(([set x [expr \1]] << \2) |  (($x >> R\2) \& S\2))} md5body
+
+	# now replace the R and S
+	set map {}
+	foreach i {
+	    7 12 17 22
+	    5  9 14 20
+	    4 11 16 23
+	    6 10 15 21
+	} {
+	    lappend map R$i [expr {32 - $i}] S$i [expr {0x7fffffff >> (31-$i)}]
+	}
+
+	# inline the values of T
+	foreach \
+		tName {
+	    T01 T02 T03 T04 T05 T06 T07 T08 T09 T10
+	    T11 T12 T13 T14 T15 T16 T17 T18 T19 T20
+	    T21 T22 T23 T24 T25 T26 T27 T28 T29 T30
+	    T31 T32 T33 T34 T35 T36 T37 T38 T39 T40
+	    T41 T42 T43 T44 T45 T46 T47 T48 T49 T50
+	    T51 T52 T53 T54 T55 T56 T57 T58 T59 T60
+	    T61 T62 T63 T64 } \
+		tVal {
+	    0xd76aa478 0xe8c7b756 0x242070db 0xc1bdceee
+	    0xf57c0faf 0x4787c62a 0xa8304613 0xfd469501
+	    0x698098d8 0x8b44f7af 0xffff5bb1 0x895cd7be
+	    0x6b901122 0xfd987193 0xa679438e 0x49b40821
+
+	    0xf61e2562 0xc040b340 0x265e5a51 0xe9b6c7aa
+	    0xd62f105d 0x2441453  0xd8a1e681 0xe7d3fbc8
+	    0x21e1cde6 0xc33707d6 0xf4d50d87 0x455a14ed
+	    0xa9e3e905 0xfcefa3f8 0x676f02d9 0x8d2a4c8a
+
+	    0xfffa3942 0x8771f681 0x6d9d6122 0xfde5380c
+	    0xa4beea44 0x4bdecfa9 0xf6bb4b60 0xbebfbc70
+	    0x289b7ec6 0xeaa127fa 0xd4ef3085 0x4881d05
+	    0xd9d4d039 0xe6db99e5 0x1fa27cf8 0xc4ac5665
+
+	    0xf4292244 0x432aff97 0xab9423a7 0xfc93a039
+	    0x655b59c3 0x8f0ccc92 0xffeff47d 0x85845dd1
+	    0x6fa87e4f 0xfe2ce6e0 0xa3014314 0x4e0811a1
+	    0xf7537e82 0xbd3af235 0x2ad7d2bb 0xeb86d391
+	} {
+	    lappend map \$$tName $tVal
+	}
+	set md5body [string map $map $md5body]
+
+
+	# Finally, define the proc
+	proc md5 {msg} $md5body
+
+	# unset auxiliary variables
+	unset md5body tName tVal map
+    }
+
+    proc ::md5::byte0 {i} {expr {0xff & $i}}
+    proc ::md5::byte1 {i} {expr {(0xff00 & $i) >> 8}}
+    proc ::md5::byte2 {i} {expr {(0xff0000 & $i) >> 16}}
+    proc ::md5::byte3 {i} {expr {((0xff000000 & $i) >> 24) & 0xff}}
+
+    proc ::md5::bytes {i} {
+	format %0.2x%0.2x%0.2x%0.2x [byte0 $i] [byte1 $i] [byte2 $i] [byte3 $i]
+    }
+
+    # hmac: hash for message authentication
+    proc ::md5::hmac {key text} {
+	# if key is longer than 64 bytes, reset it to MD5(key).  If shorter,
+	# pad it out with null (\x00) chars.
+	set keyLen [string length $key]
+	if {$keyLen > 64} {
+	    set key [binary format H32 [md5 $key]]
+	    set keyLen [string length $key]
+	}
+
+	# ensure the key is padded out to 64 chars with nulls.
+	set padLen [expr {64 - $keyLen}]
+	append key [binary format "a$padLen" {}]
+
+	# Split apart the key into a list of 16 little-endian words
+	binary scan $key i16 blocks
+
+	# XOR key with ipad and opad values
+	set k_ipad {}
+	set k_opad {}
+	foreach i $blocks {
+	    append k_ipad [binary format i [expr {$i ^ 0x36363636}]]
+	    append k_opad [binary format i [expr {$i ^ 0x5c5c5c5c}]]
+	}
+
+	# Perform inner md5, appending its results to the outer key
+	append k_ipad $text
+	append k_opad [binary format H* [md5 $k_ipad]]
+
+	# Perform outer md5
+	md5 $k_opad
+    }
+}
+
+package provide md5 1.5
diff --git a/src/vfs/critcl.vfs/lib/md5/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/md5/pkgIndex.tcl
new file mode 100644
index 00000000..cad668fa
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/md5/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+package ifneeded md5 1.5 [list source [file join $dir md5.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/stubs_container/container.tcl b/src/vfs/critcl.vfs/lib/stubs_container/container.tcl
new file mode 100644
index 00000000..89293e1e
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_container/container.tcl
@@ -0,0 +1,385 @@
+# -*- tcl -*-
+# STUBS handling -- Container.
+#
+# (c) 2011,2022-2023 Andreas Kupries http://wiki.tcl.tk/andreas%20kupries
+
+# A stubs table is represented by a dictionary value.
+# A container is a variable holding a stubs table value.
+
+# stubs table dictionary keys
+#
+# library --
+#
+#	The name of the entire library.  This value is used to compute
+#	the USE_*_STUB_PROCS macro and the name of the init file.
+#
+# interfaces --
+#
+#	A dictionary indexed by interface name that is used to maintain
+#	the set of valid interfaces. The value is empty.
+#
+# scspec --
+#
+#	Storage class specifier for external function declarations.
+#	Normally "EXTERN", may be set to something like XYZAPI
+#
+# epoch, revision --
+#
+#	The epoch and revision numbers of the interface currently being defined.
+#   (@@@TODO: should be an array mapping interface names -> numbers)
+#
+# hooks --
+#
+#	A dictionary indexed by interface name that contains the set of
+#	subinterfaces that should be defined for a given interface.
+#
+# stubs --
+#
+#	This three dimensional dictionary is indexed first by interface
+#	name, second by platform name, and third by a numeric
+#	offset. Each numeric offset contains the C function
+#	specification that should be used for the given entry in the
+#	table. The specification consists of a list in the form returned
+#	by ParseDecl in the stubs reader package, i.e.
+#
+#	decl      = list (return-type fun-name arguments)
+#	arguments = void | list (arg-info ...)
+#	arg-info  = list (type name ?array?)
+#	array = '[]'
+#
+# last --
+#
+#	This two dimensional dictionary is indexed first by interface name,
+#	and second by platform name. The associated entry contains the
+#	largest numeric offset used for a given interface/platform
+#	combo.
+
+# # ## ### ##### ######## #############
+## Requisites
+
+package require Tcl 8.6 9
+
+namespace eval ::stubs::container {}
+
+# # ## ### ##### ######## #############
+## Implementation.
+
+proc ::stubs::container::new {} {
+    return {
+	library    "UNKNOWN"
+	interfaces {}
+	hooks      {}
+	stubs      {}
+	last       {}
+	scspec     "EXTERN"
+	epoch      {}
+	revision   0
+    }
+}
+
+# Methods to incrementally fill the container with data. Strongly
+# related to the API commands of the stubs reader package.
+
+proc ::stubs::container::library {tablevar name} {
+    upvar 1 $tablevar t
+    dict set t library $name
+    return
+}
+
+proc ::stubs::container::interface {tablevar name} {
+    upvar 1 $tablevar t
+    if {[dict exists $t interfaces $name]} {
+	return -code error "Duplicate declaration of interface \"$name\""
+    }
+    dict set t interfaces $name {}
+    return
+}
+
+proc ::stubs::container::scspec {tablevar value} {
+    upvar 1 $tablevar t
+    dict set t scspec $value
+    return
+}
+
+proc ::stubs::container::epoch {tablevar value} {
+    upvar 1 $tablevar t
+
+    if {![string is integer -strict $value]} {
+	return -code error "Expected integer for epoch, but got \"$value\""
+    }
+
+    dict set t epoch $value
+    return
+}
+
+proc ::stubs::container::hooks {tablevar interface names} {
+    upvar 1 $tablevar t
+    dict set t hooks $interface $names
+    return
+}
+
+proc ::stubs::container::declare {tablevar interface index platforms decl} {
+    variable legalplatforms
+    upvar 1 $tablevar t
+
+    #puts "DECLARE ($interface $index) \[$platforms\] =\n\t'[join $decl "'\n\t'"]'"
+
+    if {![dict exists $t interfaces $interface]} {
+	return -code error "Unknown interface \"$interface\""
+    }
+    if {![string is integer -strict $index]} {
+	return -code error "Bad index \"$index\", expected integer"
+    }
+
+    # legal platform codes
+    # - unix, win, macosx, x11, aqua
+
+    # Check for duplicate declarations, then add the declaration and
+    # bump the lastNum counter if necessary.
+
+    foreach platform $platforms {
+	if {![dict exists $legalplatforms $platform]} {
+	    set expected [linsert [join [lsort -dict [dict keys $legalplatforms]] {, }] end-1 or]
+	    return -code error "Bad platform \"$platform\", expected one of $expected"
+	}
+
+	set key $interface,$platform,$index
+	if {[dict exists $t stubs $key]} {
+	    return -code error \
+		"Duplicate entry: declare $interface $index $platforms $decl"
+	}
+    }
+
+    if {![llength $decl]} return
+
+    dict incr t revision
+
+    foreach platform $platforms {
+	set group $interface,$platform
+	set key   $interface,$platform,$index
+
+	dict set t stubs $key $decl
+	if {![dict exists $t last $group] ||
+	    ($index > [dict get $t last $group])} {
+	    dict set t last $group $index
+	}
+    }
+    return
+}
+
+# # ## ### ##### ######## #############
+# Testing methods.
+
+proc ::stubs::container::library? {table} {
+    return [dict get $table library]
+}
+
+proc ::stubs::container::hooks? {table interface} {
+    if {![dict exists $table interfaces $interface]} {
+	return -code error "Unknown interface \"$interface\""
+    }
+    return [dict exists $table hooks $interface]
+}
+
+proc ::stubs::container::slot? {table interface platform at} {
+    if {![dict exists $table interfaces $interface]} {
+	return -code error "Unknown interface \"$interface\""
+    }
+    return [dict exists $table stubs $interface,$platform,$at]
+}
+
+proc ::stubs::container::scspec? {table} {
+    return [dict get $table scspec]
+}
+
+proc ::stubs::container::revision? {table} {
+    return [dict get $table revision]
+}
+
+proc ::stubs::container::epoch? {table} {
+    return [dict get $table epoch]
+}
+
+# # ## ### ##### ######## #############
+# Accessor methods.
+
+proc ::stubs::container::interfaces {table} {
+    return [dict keys [dict get $table interfaces]]
+}
+
+proc ::stubs::container::hooksof {table interface} {
+    if {![dict exists $table interfaces $interface]} {
+	return -code error "Unknown interface \"$interface\""
+    }
+    if {![dict exists $table hooks $interface]} {
+	return {}
+    }
+    return [dict get $table hooks $interface]
+}
+
+proc ::stubs::container::platforms {table interface} {
+    if {![dict exists $table interfaces $interface]} {
+	return -code error "Unknown interface \"$interface\""
+    }
+    set res {}
+    #checker exclude warnArgWrite
+    dict with table {
+	#checker -scope block exclude warnUndefinedVar
+	# 'last' is dict element.
+	foreach k [dict keys $last $interface,*] {
+	    lappend res [lindex [split $k ,] end]
+	}
+    }
+    return $res
+}
+
+proc ::stubs::container::lastof {table interface {platform {}}} {
+    if {![dict exists $table interfaces $interface]} {
+	return -code error "Unknown interface \"$interface\""
+    }
+    if {[llength [info level 0]] == 4} {
+	set key $interface,$platform
+	if {![dict exists $table last $key]} {
+	    return -1
+	}
+	return [dict get $table last $key]
+    }
+
+    set res {}
+    #checker exclude warnArgWrite
+    dict with table {
+	#checker -scope block exclude warnUndefinedVar
+	# 'last' is dict element.
+	foreach k [dict keys $last $interface,*] {
+	    lappend res [dict get $last $k]
+	}
+    }
+    return $res
+}
+
+proc ::stubs::container::slotplatforms {table interface at} {
+    if {![dict exists $table interfaces $interface]} {
+	return -code error "Unknown interface \"$interface\""
+    }
+    set res {}
+    #checker exclude warnArgWrite
+    dict with table {
+	#checker -scope block exclude warnUndefinedVar
+	# 'stubs' is dict element.
+	foreach k [dict keys $stubs $interface,*,$at] {
+	    lappend res [lindex [split $k ,] 1]
+	}
+    }
+    return $res
+}
+
+proc ::stubs::container::slot {table interface platform at} {
+    if {![dict exists $table interfaces $interface]} {
+	return -code error "Unknown interface \"$interface\""
+    }
+    if {![dict exists $table stubs $interface,$platform,$at]} {
+	return -code error "Unknown slot \"$platform,$at\""
+    }
+    return [dict get $table stubs $interface,$platform,$at]
+}
+
+# # ## ### ##### ######## #############
+## Serialize, also nicely formatted for readability.
+
+proc ::stubs::container::print {table} {
+
+    lappend lines "stubs [list [library? $table]] \{"
+    lappend lines "    scspec   [list [scspec? $table]]"
+    lappend lines "    epoch    [list [epoch? $table]]"
+    lappend lines "    revision [list [revision? $table]]"
+
+    foreach if [interfaces $table] {
+	lappend lines "    interface [list $if] \{"
+	lappend lines "        hooks [list [hooksof $table $if]]"
+
+	set n -1
+	foreach l [lastof $table $if] {
+	    if {$l > $n} { set n $l }
+	}
+	# n = max lastof for the interface.
+
+	for {set at 0} {$at <= $n} {incr at} {
+
+	    set pl [slotplatforms $table $if $at]
+	    if {![llength $pl]} continue
+
+	    foreach p $pl {
+		lappend d $p [slot $table $if $p $at]
+		#puts  |[lindex $d end-1]|[lindex $d end]|
+	    }
+	    # d = list of decls for the slot, per platform.
+	    # invert and collapse...
+
+	    foreach {d plist} [Invert $d] {
+		#puts |$d|
+		#puts <$plist>
+
+		# d = list (rtype fname arguments)
+		# arguments = list (argdef)
+		# argdef = list (atype aname arrayflag)
+		#        | list (atype aname)
+		#        | list (atype)
+
+		lassign $d rtype fname fargs
+
+		lappend lines "        declare $at [list $plist] \{"
+		lappend lines "            function [list $fname]"
+		lappend lines "            return [list $rtype]"
+		foreach a $fargs {
+		    lappend lines "            argument [list $a]"
+		}
+		lappend lines "        \}"
+	    }
+	}
+
+	lappend lines "    \}"
+    }
+
+    lappend lines "\}"
+
+    return [join $lines \n]
+}
+
+proc ::stubs::container::Invert {dict} {
+    # input       dict : key -> list(value)
+    # result is a dict : value -> list(key)
+
+    array set res {}
+    foreach {k v} $dict {
+	lappend res($v) $k
+    }
+    #parray res
+    set final {}
+    foreach k [lsort -dict [array names res]] {
+	lappend final $k [lsort -dict $res($k)]
+    }
+    return $final
+}
+
+# # ## ### ##### ######## #############
+## API
+
+namespace eval ::stubs::container {
+    variable legalplatforms {
+	generic .
+	unix    .
+	win     .
+	macosx  .
+	x11     .
+	aqua    .
+    }
+
+    namespace export \
+	new library interface scspec epoch hooks declare \
+	library? hooks? slot? scspec? revision? epoch? \
+	interfaces hooksof platforms lastof slotplatforms slot
+}
+
+# # ## ### #####
+package provide stubs::container 1.1.1
+return
diff --git a/src/vfs/critcl.vfs/lib/stubs_container/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/stubs_container/pkgIndex.tcl
new file mode 100644
index 00000000..59882706
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_container/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+#checker -scope global exclude warnUndefinedVar
+package ifneeded stubs::container 1.1.1 [list source [file join $dir container.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/stubs_gen_decl/gen_decl.tcl b/src/vfs/critcl.vfs/lib/stubs_gen_decl/gen_decl.tcl
new file mode 100644
index 00000000..613778da
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_gen_decl/gen_decl.tcl
@@ -0,0 +1,118 @@
+# -*- tcl -*-
+# STUBS handling -- Code generation: Writing declarations.
+#
+# (c) 2011,2022-2023 Andreas Kupries http://wiki.tcl.tk/andreas%20kupries
+
+# A stubs table is represented by a dictionary value.
+# A gen is a variable holding a stubs table value.
+
+# # ## ### ##### ######## #############
+## Requisites
+
+package require Tcl 8.6 9
+package require stubs::gen
+package require stubs::container
+
+namespace eval ::stubs::gen::decl::g {
+    namespace import ::stubs::gen::*
+}
+
+namespace eval ::stubs::gen::decl::c {
+    namespace import ::stubs::container::*
+}
+
+# # ## ### ##### ######## #############
+## Implementation.
+
+proc ::stubs::gen::decl::gen {table name} {
+    set text "\n/*\n * Exported function declarations:\n */\n\n"
+    append text [g::forall $table $name [list [namespace current]::Make $table] 0]
+    return $text
+}
+
+# # ## ### #####
+## Internal helpers.
+
+proc ::stubs::gen::decl::Make {table name decl index} {
+    #puts "DECL($name $index) = |$decl|"
+
+    lassign $decl rtype fname args
+
+    append text "/* $index */\n"
+
+    set    line  "[c::scspec? $table] $rtype"
+    set    count [expr {2 - ([string length $line] / 8)}]
+    append line [string range "\t\t\t" 0 $count]
+
+    set pad [expr {24 - [string length $line]}]
+    if {$pad <= 0} {
+	append line " "
+	set pad 0
+    }
+
+    if {![llength $args]} {
+	append text $line $fname ";\n"
+	return $text
+    }
+
+    set arg1 [lindex $args 0]
+    switch -exact -- $arg1 {
+	void {
+	    append text $line $fname "(void)"
+	}
+	TCL_VARARGS {
+	    append line $fname
+	    append text [MakeArgs $line $pad [lrange $args 1 end] ", ..."]
+	}
+	default {
+	    append line $fname
+	    append text [MakeArgs $line $pad $args]
+	}
+    }
+    append text ";\n"
+    return $text
+}
+
+proc ::stubs::gen::decl::MakeArgs {line pad arguments {suffix {}}} {
+    #checker -scope local exclude warnArgWrite
+    set text ""
+    set sep "("
+    foreach arg $arguments {
+	append line $sep
+	set next {}
+
+	lassign $arg atype aname aind
+
+	append next $atype
+	if {[string index $next end] ne "*"} {
+	    append next " "
+	}
+	append next $aname $aind
+
+	if {([string length $line] + [string length $next] + $pad) > 76} {
+	    append text [string trimright $line] \n
+	    set line "\t\t\t\t"
+	    set pad 28
+	}
+	append line $next
+	set sep ", "
+    }
+    append line "$suffix)"
+
+    if {[lindex $arguments end] eq "{const char *} format"} {
+	# TCL_VARARGS case... arguments list already shrunken.
+	set n [llength $arguments]
+	append line " TCL_FORMAT_PRINTF(" $n ", " [expr {$n + 1}] ")"
+    }
+
+    return $text$line
+}
+
+# # ## ### #####
+namespace eval ::stubs::gen::decl {
+    namespace export gen
+}
+
+# # ## ### #####
+package provide stubs::gen::decl 1.1.1
+return
diff --git a/src/vfs/critcl.vfs/lib/stubs_gen_decl/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/stubs_gen_decl/pkgIndex.tcl
new file mode 100644
index 00000000..4550dede
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_gen_decl/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+#checker -scope global exclude warnUndefinedVar
+package ifneeded stubs::gen::decl 1.1.1 [list source [file join $dir gen_decl.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/stubs_gen_header/gen_header.tcl b/src/vfs/critcl.vfs/lib/stubs_gen_header/gen_header.tcl
new file mode 100644
index 00000000..22722e70
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_gen_header/gen_header.tcl
@@ -0,0 +1,110 @@
+# -*- tcl -*-
+# STUBS handling -- Code generation: Writing the stub headers.
+#
+# (c) 2011,2022-2023 Andreas Kupries http://wiki.tcl.tk/andreas%20kupries
+
+# A stubs table is represented by a dictionary value.
+# A gen is a variable holding a stubs table value.
+
+# # ## ### ##### ######## #############
+## Requisites
+
+package require Tcl 8.6 9
+package require stubs::gen
+package require stubs::container
+package require stubs::gen::slot
+package require stubs::gen::macro
+package require stubs::gen::decl
+
+namespace eval ::stubs::gen::header::g {
+    namespace import ::stubs::gen::*
+}
+namespace eval ::stubs::gen::header::c {
+    namespace import ::stubs::container::*
+}
+namespace eval ::stubs::gen::header::s {
+    namespace import ::stubs::gen::slot::*
+}
+namespace eval ::stubs::gen::header::m {
+    namespace import ::stubs::gen::macro::*
+}
+namespace eval ::stubs::gen::header::d {
+    namespace import ::stubs::gen::decl::*
+}
+
+# # ## ### ##### ######## #############
+## Implementation.
+
+proc ::stubs::gen::header::multiline {{flag 1}} {
+    return [m::multiline $flag]
+}
+
+proc ::stubs::gen::header::gen {table name} {
+    set capName [g::cap $name]
+
+    set epoch [c::epoch? $table]
+    if {$epoch ne ""} {
+	set CAPName [string toupper $name]
+	append text "\n"
+	append text "#define ${CAPName}_STUBS_EPOCH $epoch\n"
+	append text "#define ${CAPName}_STUBS_REVISION [c::revision? $table]\n"
+    }
+
+    # declarations...
+    append text [d::gen $table $name]
+
+    if {[c::hooks? $table $name]} {
+	append text "\ntypedef struct ${capName}StubHooks {\n"
+	foreach hook [c::hooksof $table $name] {
+	    set capHook [g::cap $hook]
+	    append text "    const struct ${capHook}Stubs *${hook}Stubs;\n"
+	}
+	append text "} ${capName}StubHooks;\n"
+    }
+
+    # stub table type definition, including field definitions aka slots...
+    append text "\ntypedef struct ${capName}Stubs {\n"
+    append text "    int magic;\n"
+    if {$epoch ne ""} {
+	append text "    int epoch;\n"
+	append text "    int revision;\n"
+    }
+    append text "    const struct ${capName}StubHooks *hooks;\n\n"
+    append text [s::gen $table $name]
+    append text "} ${capName}Stubs;\n"
+
+    # stub table global variable
+    append text "\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n"
+    append text "extern const ${capName}Stubs *${name}StubsPtr;\n"
+    append text "#ifdef __cplusplus\n}\n#endif\n"
+
+    # last, the series of macros for stub users which will route
+    # function calls through the table.
+    append text [m::gen $table $name]
+
+    return $text
+}
+
+proc ::stubs::gen::header::rewrite@ {basedir table name} {
+    rewrite [path $basedir $name] $table $name
+}
+
+proc ::stubs::gen::header::rewrite {path table name} {
+    g::rewrite $path [gen $table $name]
+}
+
+proc ::stubs::gen::header::path {basedir name} {
+    return [file join $basedir ${name}Decls.h]
+}
+
+# # ## ### #####
+## Internal helpers.
+
+# # ## ### #####
+namespace eval ::stubs::gen::header {
+    namespace export gen multiline rewrite@ rewrite path
+}
+
+# # ## ### ##### ######## #############
+package provide stubs::gen::header 1.1.1
+return
diff --git a/src/vfs/critcl.vfs/lib/stubs_gen_header/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/stubs_gen_header/pkgIndex.tcl
new file mode 100644
index 00000000..715e1e76
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_gen_header/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+#checker -scope global exclude warnUndefinedVar
+package ifneeded stubs::gen::header 1.1.1 [list source [file join $dir gen_header.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/stubs_gen_init/gen_init.tcl b/src/vfs/critcl.vfs/lib/stubs_gen_init/gen_init.tcl
new file mode 100644
index 00000000..5877c8d3
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_gen_init/gen_init.tcl
@@ -0,0 +1,188 @@
+# -*- tcl -*-
+# STUBS handling -- Code generation: Writing the initialization code for EXPORTers.
+#
+# (c) 2011,2022-2023 Andreas Kupries http://wiki.tcl.tk/andreas%20kupries
+
+# A stubs table is represented by a dictionary value.
+# A gen is a variable holding a stubs table value.
+
+# # ## ### ##### ######## #############
+## Requisites
+
+package require Tcl 8.6 9
+package require stubs::gen
+package require stubs::container
+
+namespace eval ::stubs::gen::init::g {
+    namespace import ::stubs::gen::*
+}
+
+namespace eval ::stubs::gen::init::c {
+    namespace import ::stubs::container::*
+}
+
+# # ## ### ##### ######## #############
+## Implementation.
+
+proc ::stubs::gen::init::gen {table} {
+    # Assuming that dependencies only go one level deep, we need to
+    # emit all of the leaves first to avoid needing forward
+    # declarations.
+
+    set leaves {}
+    set roots  {}
+
+    foreach name [lsort [c::interfaces $table]] {
+	if {[c::hooks? $table $name]} {
+	    lappend roots $name
+	} else {
+	    lappend leaves $name
+	}
+    }
+
+    set text {}
+    foreach name $leaves {
+	append text [Emit $table $name]
+    }
+    foreach name $roots {
+	append text [Emit $table $name]
+    }
+
+    return $text
+}
+
+proc ::stubs::gen::init::make@ {basedir table} {
+    make [path $basedir $table] $table
+}
+
+proc ::stubs::gen::init::make {path table} {
+    variable template
+
+    set c [open $path w]
+    puts -nonewline $c \
+	[string map \
+	     [list @@ [string map {:: _} [c::library? $table]]] \
+	     $template]
+    close $c
+
+    rewrite $path $table
+    return
+}
+
+proc ::stubs::gen::init::rewrite@ {basedir table} {
+    rewrite [path $basedir $table] $table
+    return
+}
+
+proc ::stubs::gen::init::rewrite {path table} {
+    g::rewrite $path [gen $table]
+    return
+}
+
+proc ::stubs::gen::init::path {basedir table} {
+    return [file join $basedir [c::library? $table]StubInit.c]
+}
+
+# # ## ### #####
+## Internal helpers.
+
+proc ::stubs::gen::init::Emit {table name} {
+    # See tcllib/textutil as well.
+    set capName [g::cap $name]
+
+    if {[c::hooks? $table $name]} {
+	append text "\nstatic const ${capName}StubHooks ${name}StubHooks = \{\n"
+	set sep "    "
+	foreach sub [c::hooksof $table $name] {
+	    append text $sep "&${sub}Stubs"
+	    set sep ",\n    "
+	}
+	append text "\n\};\n"
+    }
+
+    # Check if this interface is a hook for some other interface.
+    # TODO: Make this a container API command.
+    set root 1
+    foreach intf [c::interfaces $table] {
+	if {[c::hooks? $table $intf] &&
+	    ([lsearch -exact [c::hooksof $table $intf] $name] >= 0)} {
+	    set root 0
+	    break
+	}
+    }
+
+    # Hooks are local to the file.
+    append text "\n"
+    if {!$root} {
+	append text "static "
+    }
+    append text "const ${capName}Stubs ${name}Stubs = \{\n"
+    append text "    TCL_STUB_MAGIC,\n"
+
+    if {[c::epoch? $table] ne ""} {
+	set CAPName [string toupper $name]
+	append text "    ${CAPName}_STUBS_EPOCH,\n"
+	append text "    ${CAPName}_STUBS_REVISION,\n"
+    }
+
+    if {[c::hooks? $table $name]} {
+	append text "    &${name}StubHooks,\n"
+    } else {
+	append text "    0,\n"
+    }
+
+    append text [g::forall $table $name [namespace current]::Make 1 \
+		     "    0, /* @@ */\n"]
+
+    append text "\};\n"
+    return $text
+}
+
+# Make --
+#
+#	Generate the prototype for a function.
+#
+# Arguments:
+#	name	The interface name.
+#	decl	The function declaration.
+#	index	The slot index for this function.
+#
+# Results:
+#	Returns the formatted declaration string.
+
+proc ::stubs::gen::init::Make {name decl index} {
+    #puts "INIT($name $index) = |$decl|"
+
+    lassign $decl rtype fname args
+
+    if {![llength $args]} {
+	append text "    &$fname, /* $index */\n"
+    } else {
+	append text "    $fname, /* $index */\n"
+    }
+    return $text
+}
+
+# # ## ### #####
+namespace eval ::stubs::gen::init {
+    #checker exclude warnShadowVar
+    variable template [string map {{	} {}} {
+	/* @@StubsInit.c
+	 *
+	 * The contents of this file are automatically generated
+	 * from the @@.decls file.
+	 *
+	 */
+
+	#include "@@.h"
+
+	/* !BEGIN!: Do not edit below this line. */
+	/* !END!: Do not edit above this line. */
+    }]
+
+    namespace export gen make@ make rewrite@ rewrite path
+}
+
+# # ## ### ##### ######## #############
+package provide stubs::gen::init 1.1.1
+return
diff --git a/src/vfs/critcl.vfs/lib/stubs_gen_init/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/stubs_gen_init/pkgIndex.tcl
new file mode 100644
index 00000000..023aae2e
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_gen_init/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+#checker -scope global exclude warnUndefinedVar
+package ifneeded stubs::gen::init 1.1.1 [list source [file join $dir gen_init.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/stubs_gen_lib/gen_lib.tcl b/src/vfs/critcl.vfs/lib/stubs_gen_lib/gen_lib.tcl
new file mode 100644
index 00000000..1b2bb374
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_gen_lib/gen_lib.tcl
@@ -0,0 +1,214 @@
+# -*- tcl -*-
+# STUBS handling -- Code generation: Writing the initialization code for IMPORTers.
+#
+# (c) 2011,2022-2023 Andreas Kupries http://wiki.tcl.tk/andreas%20kupries
+
+# A stubs table is represented by a dictionary value.
+# A gen is a variable holding a stubs table value.
+
+# # ## ### ##### ######## #############
+## Requisites
+
+package require Tcl 8.6 9
+package require stubs::gen
+package require stubs::container
+
+namespace eval ::stubs::gen::lib::g {
+    namespace import ::stubs::gen::*
+}
+
+namespace eval ::stubs::gen::lib::c {
+    namespace import ::stubs::container::*
+}
+
+# # ## ### ##### ######## #############
+## Implementation.
+
+proc ::stubs::gen::lib::gen {table} {
+    # Assuming that dependencies only go one level deep, we need to
+    # emit all of the leaves first to avoid needing forward
+    # declarations.
+
+    variable template
+
+    # Assuming that dependencies only go one level deep, we emit all
+    # of the leaves first to avoid needing forward declarations.
+
+    set leaves {}
+    set roots  {}
+
+    foreach name [lsort [c::interfaces $table]] {
+	if {[c::hooks? $table $name]} {
+	    lappend roots $name
+	} else {
+	    lappend leaves $name
+	}
+    }
+
+    set headers   {}
+    set variables {}
+    set hooks     {}
+
+    foreach name [concat $leaves $roots] {
+	set capName [g::cap $name]
+
+	# POLISH - format the variables code block aligned using
+	# maxlength of interface names.
+	lappend headers   "\#include \"${name}Decls.h\""
+	lappend variables "const ${capName}Stubs* ${name}StubsPtr;"
+
+	# Check if this is a hook. If yes it needs additional setup.
+	set parent [Parent $table $name]
+	if {$parent eq ""} continue
+	lappend hooks "    ${name}StubsPtr = ${parent}StubsPtr->hooks->${name}Stubs;"
+    }
+
+    set pname   [c::library? $table] ; # FUTURE: May be separate from the library
+    #                                    namespaces!
+    set name    [string map {:: _} [c::library? $table]]
+    set capName [g::cap $name]
+    set upName  [string toupper $name]
+
+    set headers   [Block $headers]
+    set variables [Block $variables]
+    set hooks     [Block $hooks]
+
+    return [string map \
+		[list \
+		     @PKG@     $pname \
+		     @@        $name  \
+		     @UP@      $upName \
+		     @CAP@     $capName \
+		     @HEADERS@ $headers  \
+		     @VARS@    $variables \
+		     @HOOKS@   $hooks    \
+		    ] $template]
+    return $text
+}
+
+proc ::stubs::gen::lib::Block {list} {
+    if {![llength $list]} { return "" }
+    return \n[join $list \n]\n
+}
+
+proc ::stubs::gen::lib::make@ {basedir table} {
+    make [path $basedir [c::library? $table]] $table
+}
+
+proc ::stubs::gen::lib::make {path table} {
+    set c [open $path w]
+    puts -nonewline $c [gen $table]
+    close $c
+    return
+}
+
+proc ::stubs::gen::lib::path {basedir name} {
+    return [file join $basedir ${name}StubLib.c]
+}
+
+# # ## ### #####
+## Internal helpers.
+
+proc ::stubs::gen::lib::Parent {table name} {
+    # Check if this interface is a hook for some other interface.
+    # TODO: Make this a container API command.
+    foreach intf [c::interfaces $table] {
+	if {[c::hooks? $table $intf] &&
+	    ([lsearch -exact [c::hooksof $table $intf] $name] >= 0)} {
+	    return $intf
+	}
+    }
+    return ""
+}
+
+# # ## ### #####
+namespace eval ::stubs::gen::lib {
+    #checker exclude warnShadowVar
+    variable template [string map {{
+	} {
+}} {
+	/*
+	 * @@StubLib.c --
+	 *
+	 * Stub object that will be statically linked into extensions that wish
+	 * to access @@.
+	 */
+
+	/*
+	 * We need to ensure that we use the stub macros so that this file contains
+	 * no references to any of the stub functions.  This will make it possible
+	 * to build an extension that references @CAP@_InitStubs but doesn't end up
+	 * including the rest of the stub functions.
+	 */
+
+	#ifndef USE_TCL_STUBS
+	#define USE_TCL_STUBS
+	#endif
+	#undef  USE_TCL_STUB_PROCS
+
+	#include <tcl.h>
+
+	#ifndef USE_@UP@_STUBS
+	#define USE_@UP@_STUBS
+	#endif
+	#undef  USE_@UP@_STUB_PROCS
+	@HEADERS@
+	/*
+	 * Ensure that @CAP@_InitStubs is built as an exported symbol.  The other stub
+	 * functions should be built as non-exported symbols.
+	 */
+
+	#undef  TCL_STORAGE_CLASS
+	#define TCL_STORAGE_CLASS DLLEXPORT
+	@VARS@
+	
+	/*
+	 *----------------------------------------------------------------------
+	 *
+	 * @CAP@_InitStubs --
+	 *
+	 * Checks that the correct version of @CAP@ is loaded and that it
+	 * supports stubs. It then initialises the stub table pointers.
+	 *
+	 * Results:
+	 *  The actual version of @CAP@ that satisfies the request, or
+	 *  NULL to indicate that an error occurred.
+	 *
+	 * Side effects:
+	 *  Sets the stub table pointers.
+	 *
+	 *----------------------------------------------------------------------
+	 */
+
+	#ifdef @CAP@_InitStubs
+	#undef @CAP@_InitStubs
+	#endif
+
+	char *
+	@CAP@_InitStubs(Tcl_Interp *interp, CONST char *version, int exact)
+	{
+	    CONST char *actualVersion;
+
+	    actualVersion = Tcl_PkgRequireEx(interp, "@PKG@", version,
+					     exact, (ClientData *) &@@StubsPtr);
+	    if (!actualVersion) {
+		return NULL;
+	    }
+
+	    if (!@@StubsPtr) {
+		Tcl_SetResult(interp,
+			      "This implementation of @CAP@ does not support stubs",
+			      TCL_STATIC);
+		return NULL;
+	    }
+	    @HOOKS@
+	    return (char*) actualVersion;
+	}
+    }]
+
+    namespace export gen make@ make rewrite@ rewrite path
+}
+
+# # ## ### ##### ######## #############
+package provide stubs::gen::lib 1.1.1
+return
diff --git a/src/vfs/critcl.vfs/lib/stubs_gen_lib/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/stubs_gen_lib/pkgIndex.tcl
new file mode 100644
index 00000000..4f38729e
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_gen_lib/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+#checker -scope global exclude warnUndefinedVar
+package ifneeded stubs::gen::lib 1.1.1 [list source [file join $dir gen_lib.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/stubs_gen_macro/gen_macro.tcl b/src/vfs/critcl.vfs/lib/stubs_gen_macro/gen_macro.tcl
new file mode 100644
index 00000000..a4ff1d0e
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_gen_macro/gen_macro.tcl
@@ -0,0 +1,73 @@
+# -*- tcl -*-
+# STUBS handling -- Code generation: Writing the stub macros.
+#
+# (c) 2011,2022-2023 Andreas Kupries http://wiki.tcl.tk/andreas%20kupries
+
+# A stubs table is represented by a dictionary value.
+# A gen is a variable holding a stubs table value.
+
+# # ## ### ##### ######## #############
+## Requisites
+
+package require Tcl 8.6 9
+package require stubs::gen
+package require stubs::container
+
+namespace eval ::stubs::gen::macro::g {
+    namespace import ::stubs::gen::*
+}
+
+namespace eval ::stubs::gen::macro::c {
+    namespace import ::stubs::container::*
+}
+
+# # ## ### ##### ######## #############
+## Implementation.
+
+proc ::stubs::gen::macro::multiline {{flag 1}} {
+    variable multiline $flag
+    return $flag
+}
+
+proc ::stubs::gen::macro::gen {table name} {
+    set upName [string toupper [string map {:: _} [c::library? $table]]]
+    set sguard "defined(USE_${upName}_STUBS)"
+
+    append text "\n#if $sguard\n"
+    append text "\n/*\n * Inline function declarations:\n */\n\n"
+    append text [g::forall $table $name [namespace current]::Make 0]
+    append text "\n#endif /* $sguard */\n"
+    return $text
+}
+
+# # ## ### #####
+## Internal helpers.
+
+proc ::stubs::gen::macro::Make {name decl index} {
+    variable multiline
+    #puts "MACRO($name $index) = |$decl|"
+
+    lassign $decl rtype fname args
+
+    set capName [g::uncap $fname]
+
+    append text "#define $fname "
+    if {$multiline} { append text "\\\n\t" }
+    append text "("
+    if {![llength $args]} { append text "*" }
+    append text "${name}StubsPtr->$capName)"
+    append text " /* $index */\n"
+    return $text
+}
+
+# # ## ### #####
+namespace eval ::stubs::gen::macro {
+    #checker exclude warnShadowVar
+    variable multiline 1
+
+    namespace export gen multiline
+}
+
+# # ## ### ##### ######## #############
+package provide stubs::gen::macro 1.1.1
+return
diff --git a/src/vfs/critcl.vfs/lib/stubs_gen_macro/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/stubs_gen_macro/pkgIndex.tcl
new file mode 100644
index 00000000..14a52db7
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_gen_macro/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+#checker -scope global exclude warnUndefinedVar
+package ifneeded stubs::gen::macro 1.1.1 [list source [file join $dir gen_macro.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/stubs_gen_slot/gen_slot.tcl b/src/vfs/critcl.vfs/lib/stubs_gen_slot/gen_slot.tcl
new file mode 100644
index 00000000..caad7b51
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_gen_slot/gen_slot.tcl
@@ -0,0 +1,95 @@
+# -*- tcl -*-
+# STUBS handling -- Code generation: Writing SLOT code.
+#
+# (c) 2011,2022-2023 Andreas Kupries http://wiki.tcl.tk/andreas%20kupries
+
+# # ## ### ##### ######## #############
+## Requisites
+
+package require Tcl 8.6 9
+package require stubs::gen
+
+namespace eval ::stubs::gen::slot::g {
+    namespace import ::stubs::gen::*
+}
+
+# # ## ### ##### ######## #############
+## Implementation.
+
+proc ::stubs::gen::slot::gen {table name} {
+    return [g::forall $table $name [namespace current]::Make 1 \
+		"    void (*reserved@@)(void);\n"]
+}
+
+# # ## ### #####
+## Internal helpers.
+
+proc ::stubs::gen::slot::Make {name decl index} {
+    #puts "SLOT($name $index) = |$decl|"
+
+    lassign $decl rtype fname args
+
+    set capName [g::uncap $fname]
+
+    set text "    "
+    if {![llength $args]} {
+	append text $rtype " *" $capName "; /* $index */\n"
+	return $text
+    }
+
+    if {[string range $rtype end-7 end] eq "CALLBACK"} {
+	append text \
+	    [string trim [string range $rtype 0 end-8]] \
+	    " (CALLBACK *" $capName ") "
+    } else {
+	append text $rtype " (*" $capName ") "
+    }
+
+    set arg1 [lindex $args 0]
+    switch -exact -- $arg1 {
+	void {
+	    append text "(void)"
+	}
+	TCL_VARARGS {
+	    append text [MakeArgs [lrange $args 1 end] ", ..."]
+	}
+	default {
+	    append text [MakeArgs $args]
+	}
+    }
+
+    append text "; /* $index */\n"
+    return $text
+}
+
+proc ::stubs::gen::slot::MakeArgs {arguments {suffix {}}} {
+    set text ""
+    set sep "("
+    foreach arg $arguments {
+	lassign $arg atype aname aind
+	append text $sep $atype
+	if {[string index $text end] ne "*"} {
+	    append text " "
+	}
+	append text $aname $aind
+	set sep ", "
+    }
+    append text "$suffix)"
+
+    if {[lindex $arguments end] eq "\{const char *\} format"} {
+	# TCL_VARARGS case... arguments list already shrunken.
+	set n [llength $arguments]
+	append text " TCL_FORMAT_PRINTF(" $n ", " [expr {$n + 1}] ")"
+    }
+
+    return $text
+}
+
+# # ## ### #####
+namespace eval ::stubs::gen::slot {
+    namespace export gen
+}
+
+# # ## ### #####
+package provide stubs::gen::slot 1.1.1
+return
diff --git a/src/vfs/critcl.vfs/lib/stubs_gen_slot/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/stubs_gen_slot/pkgIndex.tcl
new file mode 100644
index 00000000..f73a4e10
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_gen_slot/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+#checker -scope global exclude warnUndefinedVar
+package ifneeded stubs::gen::slot 1.1.1 [list source [file join $dir gen_slot.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/stubs_genframe/genframe.tcl b/src/vfs/critcl.vfs/lib/stubs_genframe/genframe.tcl
new file mode 100644
index 00000000..d0fcbf6a
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_genframe/genframe.tcl
@@ -0,0 +1,418 @@
+# -*- tcl -*-
+# STUBS handling -- Code generation framework.
+#
+# (c) 2011,2022-2023 Andreas Kupries http://wiki.tcl.tk/andreas%20kupries
+
+# A stubs table is represented by a dictionary value.
+# A gen is a variable holding a stubs table value.
+
+# # ## ### ##### ######## #############
+## Requisites
+
+package require Tcl 8.6 9
+package require stubs::container
+
+namespace eval ::stubs::gen::c {
+    namespace import ::stubs::container::*
+}
+
+# # ## ### ##### ######## #############
+## Implementation.
+
+proc ::stubs::gen::warn {cmdprefix} {
+    variable warnCmd $cmdprefix
+    return
+}
+
+proc ::stubs::gen::uncap {text} {
+    return [string tolower [string index $text 0]][string range $text 1 end]
+}
+
+proc ::stubs::gen::cap {text} {
+    return [string toupper [string index $text 0]][string range $text 1 end]
+}
+
+proc ::stubs::gen::forall {table name emitCmd onAll {skipString {}}} {
+    if {$skipString eq {}} {
+	#checker exclude warnArgWrite
+	set skipString "/* Slot @@ is reserved */\n"
+    }
+
+    set platforms [c::platforms $table $name]
+
+    if {[lsearch -exact $platforms "generic"] >= 0} {
+	# Emit integrated stubs block
+	set lastNum [MAX [c::lastof $table $name]]
+
+	for {set i 0} {$i <= $lastNum} {incr i} {
+
+	    set slots [c::slotplatforms $table $name $i]
+	    set emit 0
+	    if {[lsearch -exact $slots "generic"] >= 0} {
+		if {[llength $slots] > 1} {
+		    WARN {conflicting generic and platform entries: $name $i}
+		}
+
+		append text [CALL generic $i]
+		set emit 1
+
+	    } elseif {[llength $slots] > 0} {
+
+		array set slot {unix 0 x11 0 win 0 macosx 0 aqua 0}
+		foreach s $slots { set slot($s) 1 }
+		# "aqua", "macosx" and "x11" are special cases:
+		# "macosx" implies "unix", "aqua" implies "macosx" and "x11"
+		# implies "unix", so we need to be careful not to emit
+		# duplicate stubs entries:
+		if {($slot(unix) && $slot(macosx)) ||
+		    (($slot(unix) || $slot(macosx)) &&
+		     ($slot(x11)  || $slot(aqua)))} {
+		    WARN {conflicting platform entries: $name $i}
+		}
+		## unix ##
+		set temp {}
+		set plat unix
+		if {!$slot(aqua) && !$slot(x11)} {
+		    if {$slot($plat)} {
+			append temp [CALL $plat $i]
+		    } elseif {$onAll} {
+			append temp [SKIP]
+		    }
+		}
+		if {$temp ne ""} {
+		    append text [AddPlatformGuard $plat $temp]
+		    set emit 1
+		}
+		## x11 ##
+		set temp {}
+		set plat x11
+		if {!$slot(unix) && !$slot(macosx)} {
+		    if {$slot($plat)} {
+			append temp [CALL $plat $i]
+		    } elseif {$onAll} {
+			append temp [SKIP]
+		    }
+		}
+		if {$temp ne ""} {
+		    append text [AddPlatformGuard $plat $temp]
+		    set emit 1
+		}
+		## win ##
+		set temp {}
+		set plat win
+		if {$slot($plat)} {
+		    append temp [CALL $plat $i]
+		} elseif {$onAll} {
+		    append temp [SKIP]
+		}
+		if {$temp ne ""} {
+		    append text [AddPlatformGuard $plat $temp]
+		    set emit 1
+		}
+		## macosx ##
+		set temp {}
+		set plat macosx
+		if {!$slot(aqua) && !$slot(x11)} {
+		    if {$slot($plat)} {
+			append temp [CALL $plat $i]
+		    } elseif {$slot(unix)} {
+			append temp [CALL unix $i]
+		    } elseif {$onAll} {
+			append temp [SKIP]
+		    }
+		}
+		if {$temp ne ""} {
+		    append text [AddPlatformGuard $plat $temp]
+		    set emit 1
+		}
+		## aqua ##
+		set temp {}
+		set plat aqua
+		if {!$slot(unix) && !$slot(macosx)} {
+		    if {[string range $skipString 0 1] ne "/*"} {
+			# The code previously had a bug here causing
+			# it to erroneously generate both a unix entry
+			# and an aqua entry for a given stubs table
+			# slot. To preserve backwards compatibility,
+			# generate a dummy stubs entry before every
+			# aqua entry (note that this breaks the
+			# correspondence between emitted entry number
+			# and actual position of the entry in the
+			# stubs table, e.g.  TkIntStubs entry 113 for
+			# aqua is in fact at position 114 in the
+			# table, entry 114 at position 116 etc).
+			append temp [SKIP]
+			CHOP temp
+			append temp " /*\
+				Dummy entry for stubs table backwards\
+				compatibility */\n"
+		    }
+		    if {$slot($plat)} {
+			append temp [CALL $plat $i]
+		    } elseif {$onAll} {
+			append temp [SKIP]
+		    }
+		}
+		if {$temp ne ""} {
+		    append text [AddPlatformGuard $plat $temp]
+		    set emit 1
+		}
+	    }
+	    if {!$emit} {
+		append text [SKIP]
+	    }
+	}
+    } else {
+	# Emit separate stubs blocks per platform
+	array set block {unix 0 x11 0 win 0 macosx 0 aqua 0}
+	foreach s $platforms { set block($s) 1 }
+
+	## unix ##
+	if {$block(unix) && !$block(x11)} {
+	    set temp {}
+	    set plat unix
+
+	    # (1) put into helper method
+	    set lastNum [c::lastof $table $name $plat]
+	    for {set i 0} {$i <= $lastNum} {incr i} {
+		if {[c::slot? $table $name $plat $i]} {
+		    append temp [CALL $plat $i]
+		} else {
+		    append temp [SKIP]
+		}
+	    }
+	    append text [AddPlatformGuard $plat $temp]
+	}
+	## win ##
+	if {$block(win)} {
+	    set temp {}
+	    set plat win
+
+	    # (1) put into helper method
+	    set lastNum [c::lastof $table $name $plat]
+	    for {set i 0} {$i <= $lastNum} {incr i} {
+		if {[c::slot? $table $name $plat $i]} {
+		    append temp [CALL $plat $i]
+		} else {
+		    append temp [SKIP]
+		}
+	    }
+	    append text [AddPlatformGuard $plat $temp]
+	}
+	## macosx ##
+	if {$block(macosx) && !$block(aqua) && !$block(x11)} {
+	    set temp {}
+	    set lastNum [MAX [list \
+				  [c::lastof $table $name unix] \
+				  [c::lastof $table $name macosx]]]
+
+	    for {set i 0} {$i <= $lastNum} {incr i} {
+		set emit 0
+		foreach plat {unix macosx} {
+		    if {[c::slot? $table $name $plat $i]} {
+			append temp [CALL $plat $i]
+			set emit 1
+			break
+		    }
+		}
+		if {!$emit} {
+		    append temp [SKIP]
+		}
+	    }
+	    append text [AddPlatformGuard macosx $temp]
+	}
+	## aqua ##
+	if {$block(aqua)} {
+	    set temp {}
+	    set lastNum [MAX [list \
+				  [c::lastof $table $name unix] \
+				  [c::lastof $table $name macosx] \
+				  [c::lastof $table $name aqua]]]
+
+	    for {set i 0} {$i <= $lastNum} {incr i} {
+		set emit 0
+		foreach plat {unix macosx aqua} {
+		    if {[c::slot? $table $name $plat $i]} {
+			append temp [CALL $plat $i]
+			set emit 1
+			break
+		    }
+		}
+		if {!$emit} {
+		    append temp [SKIP]
+		}
+	    }
+	    append text [AddPlatformGuard aqua $temp]
+	}
+	## x11 ##
+	if {$block(x11)} {
+	    set temp {}
+	    set lastNum [MAX [list \
+				  [c::lastof $table $name unix] \
+				  [c::lastof $table $name macosx] \
+				  [c::lastof $table $name x11]]]
+
+	    for {set i 0} {$i <= $lastNum} {incr i} {
+		set emit 0
+		foreach plat {unix macosx x11} {
+		    if {[c::slot? $table $name $plat $i]} {
+			if {$plat ne "macosx"} {
+			    append temp [CALL $plat $i]
+			} else {
+			    append temp [AddPlatformGuard $plat \
+					     [CALL $plat $i] \
+					     [SKIP]]
+			}
+			set emit 1
+			break
+		    }
+		}
+		if {!$emit} {
+		    append temp [SKIP]
+		}
+	    }
+	    append text [AddPlatformGuard x11 $temp]
+	}
+    }
+
+    return $text
+}
+
+proc ::stubs::gen::rewrite {path newcode} {
+    if {![file exists $path]} {
+	return -code error "Cannot find file: $path"
+    }
+
+    set in  [open ${path}     r]
+    set out [open ${path}.new w]
+
+    # Hardwired use of unix line-endings in the output.
+    fconfigure $out -translation lf
+
+    # Copy the file header before the code section.
+    while {![eof $in]} {
+	set line [gets $in]
+	if {[string match "*!BEGIN!*" $line]} break
+	puts $out $line
+    }
+
+    puts $out "/* !BEGIN!: Do not edit below this line. */"
+
+    # Insert the new code.
+    puts $out $newcode
+
+    # Skip over the input until the end of the code section.
+    while {![eof $in]} {
+	set line [gets $in]
+	if {[string match "*!END!*" $line]} break
+    }
+
+    # Copy the trailer after the code section. This can be done fast,
+    # as searching is not required anymore.
+    puts $out "/* !END!: Do not edit above this line. */"
+    puts -nonewline $out [read $in]
+
+    # Close and commit to the changes (atomic rename).
+    close $in
+    close $out
+    file rename -force -- ${path}.new ${path}
+    return
+}
+
+# # ## ### #####
+## Internal helpers.
+
+proc ::stubs::gen::CALL {platform index} {
+    upvar 1 table table name name emitCmd emitCmd
+    set decl [c::slot $table $name $platform $index]
+    return [uplevel \#0 [linsert $emitCmd end $name $decl $index]]
+}
+
+proc ::stubs::gen::WARN {text} {
+    variable warnCmd
+    if {$warnCmd eq {}} return
+    return [uplevel \#0 [linsert $warnCmd end [uplevel 1 [list ::subst $text]]]]
+}
+
+proc ::stubs::gen::SKIP {} {
+    upvar 1 skipString skipString i i
+    #puts stderr SKIP/$i/[string map [list {$i} $i] $skipString]
+    return [string map [list @@ $i] $skipString]
+}
+
+proc ::stubs::gen::CHOP {textvar} {
+    upvar 1 $textvar text
+    set text [string range $text 0 end-1]
+    return
+}
+
+proc ::stubs::gen::AddPlatformGuard {platform iftext {elsetext {}}} {
+    variable guard_begin
+    variable guard_else
+    variable guard_end
+
+    set prefix [expr {![info exists guard_begin($platform)] ? "" : $guard_begin($platform)}]
+    set middle [expr {![info exists guard_else($platform)]  ? "" : $guard_else($platform)}]
+    set suffix [expr {![info exists guard_end($platform)]   ? "" : $guard_end($platform)}]
+
+    return $prefix$iftext[expr {($elsetext eq "")
+				? ""
+				: "$middle$elsetext"}]$suffix
+}
+
+if {[package vsatisfies [package present Tcl] 8.5]} {
+    #checker exclude warnRedefine
+    proc ::stubs::gen::MAX {list} {
+	return [tcl::mathfunc::max {*}$list]
+    }
+} else {
+    #checker exclude warnRedefine
+    proc ::stubs::gen::MAX {list} {
+	set max {}
+	foreach a $list {
+	    if {($max ne {}) && ($max >= $a)} continue
+	    set max $a
+	}
+	return $a
+    }
+}
+
+# # ## ### #####
+
+namespace eval ::stubs::gen {
+    #checker -scope block exclude warnShadowVar
+    variable guard_begin
+    variable guard_else
+    variable guard_end
+
+    array set guard_begin {
+	win    "#ifdef __WIN32__ /* WIN */\n"
+	unix   "#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */\n"
+	macosx "#ifdef MAC_OSX_TCL /* MACOSX */\n"
+	aqua   "#ifdef MAC_OSX_TK /* AQUA */\n"
+	x11    "#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */\n"
+    }
+    array set guard_else {
+	win    "#else /* WIN */\n"
+	unix   "#else /* UNIX */\n"
+	macosx "#else /* MACOSX */\n"
+	aqua   "#else /* AQUA */\n"
+	x11    "#else /* X11 */\n"
+    }
+    array set guard_end {
+	win    "#endif /* WIN */\n"
+	unix   "#endif /* UNIX */\n"
+	macosx "#endif /* MACOSX */\n"
+	aqua   "#endif /* AQUA */\n"
+	x11    "#endif /* X11 */\n"
+    }
+
+    # Default command to report conflict and other warnings.
+    variable warnCmd {puts stderr}
+
+    namespace export forall rewrite warn cap uncap
+}
+
+# # ## ### #####
+package provide stubs::gen 1.1.1
+return
diff --git a/src/vfs/critcl.vfs/lib/stubs_genframe/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/stubs_genframe/pkgIndex.tcl
new file mode 100644
index 00000000..1a177ee6
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_genframe/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+#checker -scope global exclude warnUndefinedVar
+package ifneeded stubs::gen 1.1.1 [list source [file join $dir genframe.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/stubs_reader/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/stubs_reader/pkgIndex.tcl
new file mode 100644
index 00000000..93cbb83d
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_reader/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+#checker -scope global exclude warnUndefinedVar
+package ifneeded stubs::reader 1.1.1 [list source [file join $dir reader.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/stubs_reader/reader.tcl b/src/vfs/critcl.vfs/lib/stubs_reader/reader.tcl
new file mode 100644
index 00000000..1e46c23a
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_reader/reader.tcl
@@ -0,0 +1,245 @@
+# -*- tcl -*-
+# STUBS handling -- Reader.
+#
+# (c) 2011,2022-2023 Andreas Kupries http://wiki.tcl.tk/andreas%20kupries
+
+# # ## ### ##### ######## #############
+## Requisites
+
+package require Tcl 8.6 9
+package require stubs::container
+
+# A stubs table is represented by a dictionary value.
+# A container is a variable holding a stubs table value.
+
+namespace eval ::stubs::reader::c {
+    namespace import ::stubs::container::*
+}
+
+# # ## ### ##### ######## #############
+## Implementation.
+
+proc ::stubs::reader::file {tablevar path} {
+    upvar 1 $tablevar table
+
+    set chan [open $path r]
+    set text [read $chan]
+    close $chan
+
+    text table $text
+    return
+}
+
+proc ::stubs::reader::text {tablevar text} {
+    variable current
+    variable table
+
+    upvar 1 $tablevar t
+
+    set sandbox [interp create -safe]
+
+    interp alias $sandbox library   {} ::stubs::reader::P_library
+    interp alias $sandbox interface {} ::stubs::reader::P_interface
+    interp alias $sandbox scspec    {} ::stubs::reader::P_scspec
+    interp alias $sandbox epoch     {} ::stubs::reader::P_epoch
+    interp alias $sandbox hooks     {} ::stubs::reader::P_hooks
+    interp alias $sandbox declare   {} ::stubs::reader::P_declare
+    interp alias $sandbox export    {} ::stubs::reader::P_export
+
+    set current UNKNOWN
+    set table $t
+
+    set ::errorCode {}
+    set ::errorInfo {}
+
+    if {![set code [catch {
+	$sandbox eval $text
+    } res]]} {
+	set t $table
+    }
+
+    interp delete $sandbox
+    unset table
+
+    return -code $code -errorcode $::errorCode -errorinfo $::errorInfo \
+	$res
+}
+
+# READER API methods. These are called when sourcing a .decls
+# file, or evaluating a .decls string. They forward to the
+# attached container after pre-processing arguments and merging in
+# state information (current interface).
+
+proc ::stubs::reader::P_library {name} {
+    variable table
+    c::library table $name
+    return
+}
+
+proc ::stubs::reader::P_interface {name} {
+    variable table
+    variable current
+
+    set current $name
+    c::interface table $name
+    return
+}
+
+proc ::stubs::reader::P_scspec {value} {
+    variable table
+    c::scspec table $value
+    return
+}
+
+proc ::stubs::reader::P_epoch {value} {
+    variable table
+    c::epoch table $value
+    return
+}
+
+proc ::stubs::reader::P_hooks {names} {
+    variable table
+    variable current
+
+    c::hooks table $current $names
+    return
+}
+
+proc ::stubs::reader::P_declare {index args} {
+    variable table
+    variable current
+
+    switch -exact [llength $args] {
+	1 {
+	    # syntax: declare AT DECL
+	    set platforms [list generic]
+	    set decl [lindex $args 0]
+	}
+	2 {
+	    # syntax: declare AT PLATFORMS DECL
+	    lassign $args platforms decl
+	}
+	default {
+	    return -code error \
+		"wrong \# args: expected 'index ?platforms? decl"
+	}
+    }
+
+    c::declare table $current $index $platforms [ParseDecl $decl]
+    return
+}
+
+proc ::stubs::reader::P_export {decl} {
+    variable table
+    variable current
+
+    # Ignore.
+    return
+}
+
+# Support methods for parsing a C declaration into its constituent
+# pieces.
+
+# ParseDecl --
+#
+#	Parse a C function declaration into its component parts.
+#
+# Arguments:
+#	decl	The function declaration.
+#
+# Results:
+#	Returns a list of the form {returnType name arguments}.  The arguments
+#	element consists of a list of type/name pairs, or a single
+#	element "void".  If the function declaration is malformed
+#	then an error is displayed and the return value is {}.
+
+proc ::stubs::reader::ParseDecl {decl} {
+    #checker exclude warnArgWrite
+    regsub -all "\[ \t\n\]+" [string trim $decl] " " decl
+    #puts "PARSE ($decl)"
+
+    if {![regexp {^(.*)\((.*)\)$} $decl --> prefix arguments]} {
+	set prefix    $decl
+	set arguments {}
+    }
+
+    set prefix [string trim $prefix]
+    if {![regexp {^(.+[ ][*]*)([^ *]+)$} $prefix --> rtype fname]} {
+	return -code error "Bad return type: $decl"
+    }
+
+    set rtype [string trim $rtype]
+    if {$arguments eq ""} {
+	return [list $rtype $fname {void}]
+    }
+
+    foreach arg [split $arguments ,] {
+	lappend argumentList [string trim $arg]
+    }
+
+    if {[lindex $argumentList end] eq "..."} {
+	set arguments TCL_VARARGS
+	foreach arg [lrange $argumentList 0 end-1] {
+	    set argInfo [ParseArg $arg]
+	    set arity [llength $argInfo]
+	    if {(2 <= $arity) && ($arity <= 3)} {
+		lappend arguments $argInfo
+	    } else {
+		return -code error "Bad argument: '$arg' in '$decl'"
+	    }
+	}
+    } else {
+	set arguments {}
+	foreach arg $argumentList {
+	    set argInfo [ParseArg $arg]
+	    if {$argInfo eq "void"} {
+		lappend arguments "void"
+		break
+	    }
+	    set arity [llength $argInfo]
+	    if {(2 <= $arity) && ($arity <= 3)} {
+		lappend arguments $argInfo
+	    } else {
+		return -code error "Bad argument: '$arg' in '$decl'"
+	    }
+	}
+    }
+    return [list $rtype $fname $arguments]
+}
+
+# ParseArg --
+#
+#	This function parses a function argument into a type and name.
+#
+# Arguments:
+#	arg	The argument to parse.
+#
+# Results:
+#	Returns a list of type and name with an optional third array
+#	indicator.  If the argument is malformed, returns "".
+
+proc ::stubs::reader::ParseArg {arg} {
+    if {![regexp {^(.+[ ][*]*)([^][ *]+)(\[\])?$} $arg all type name array]} {
+	if {$arg eq "void"} {
+	    return $arg
+	} else {
+	    return
+	}
+    }
+    set result [list [string trim $type] $name]
+    if {$array ne ""} {
+	lappend result $array
+    }
+    return $result
+}
+
+# # ## ### ##### ######## #############
+## API
+
+namespace eval ::stubs::reader {
+    namespace export file text
+}
+
+# # ## ### #####
+package provide stubs::reader 1.1.1
+return
diff --git a/src/vfs/critcl.vfs/lib/stubs_writer/pkgIndex.tcl b/src/vfs/critcl.vfs/lib/stubs_writer/pkgIndex.tcl
new file mode 100644
index 00000000..96f9a40a
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_writer/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.6 9]} {return}
+#checker -scope global exclude warnUndefinedVar
+package ifneeded stubs::writer 1.1.1 [list source [file join $dir writer.tcl]]
diff --git a/src/vfs/critcl.vfs/lib/stubs_writer/writer.tcl b/src/vfs/critcl.vfs/lib/stubs_writer/writer.tcl
new file mode 100644
index 00000000..ba20076f
--- /dev/null
+++ b/src/vfs/critcl.vfs/lib/stubs_writer/writer.tcl
@@ -0,0 +1,120 @@
+# -*- tcl -*-
+# STUBS handling -- Write stubs table as .decls file
+#
+# (c) 2011,2022-2023 Andreas Kupries http://wiki.tcl.tk/andreas%20kupries
+
+# A stubs table is represented by a dictionary value.
+# A container is a variable holding a stubs table value.
+
+# # ## ### ##### ######## #############
+## Requisites
+
+package require Tcl 8.6 9
+package require stubs::gen
+package require stubs::container
+
+namespace eval ::stubs::writer::g {
+    namespace import ::stubs::gen::*
+}
+
+namespace eval ::stubs::writer::c {
+    namespace import ::stubs::container::*
+}
+
+# # ## ### ##### ######## #############
+## Implementation.
+
+proc ::stubs::writer::gen {table} {
+
+    set defaults [c::new]
+    set dscspec [c::scspec?   $defaults]
+    set depoch  [c::epoch?    $defaults]
+
+    set name   [c::library?  $table]
+    set scspec [c::scspec?   $table]
+    set epoch  [c::epoch?    $table]
+    set rev    [c::revision? $table]
+
+    lappend lines "\# ${name}.decls -- -*- tcl -*-"
+    lappend lines "\#"
+    lappend lines "\#\tThis file contains the declarations for all public functions"
+    lappend lines "\#\tthat are exported by the \"${name}\" library via its stubs table."
+    lappend lines "\#"
+
+    lappend lines ""
+    lappend lines "library   [list $name]"
+
+    if {($scspec ne $dscspec) ||
+	($epoch  ne $depoch )} {
+	if {$scspec ne $dscspec} {
+	    lappend lines "scspec    [list $scspec]"
+	}
+	if {$epoch  ne $depoch } {
+	    lappend lines "epoch     [list $epoch]"
+	    lappend lines "revision  [list $rev]"
+	}
+    }
+
+    foreach if [c::interfaces $table] {
+	lappend lines ""
+	lappend lines "interface [list $if]"
+
+	if {[c::hooks? $table $if]} {
+	    lappend lines "hooks [list [c::hooksof $table $if]]"
+	}
+	lappend lines \
+	    [g::forall $table $if \
+		 [list [namespace current]::Make $table] \
+		 0]
+    }
+
+    lappend lines "\# END $name"
+
+    return [join $lines \n]
+}
+
+# # ## ### #####
+## Internal helpers.
+
+proc ::stubs::writer::Make {table if decl index} {
+    #puts |---------------------------------------
+    #puts |$if|$index|$decl|
+
+    lassign $decl rtype fname arguments
+    if {[llength $arguments]} {
+	# what about the third piece of info, array flag?! ...
+
+	set suffix {}
+	foreach a $arguments {
+	    if {$a eq "void"} {
+		lappend ax $a
+	    } elseif {$a eq "TCL_VARARGS"} {
+		set suffix ", ..."
+	    } else {
+		lassign $a atype aname aflag
+		# aflag either "", or "[]".
+		lappend ax "$atype $aname$aflag"
+		#puts \t|$atype|$aname|$aflag|
+	    }
+	}
+	set ax [join $ax {, }]$suffix
+    } else {
+	set ax void
+    }
+    set cdecl     "\n    $rtype $fname ($ax)\n"
+    set platforms [c::slotplatforms $table $if $index]
+
+    lappend lines ""
+    lappend lines "declare $index [list $platforms] \{$cdecl\}"
+
+    return [join $lines \n]\n
+}
+
+# # ## ### #####
+namespace eval ::stubs::writer {
+    namespace export gen
+}
+
+# # ## ### #####
+package provide stubs::writer 1.1.1
+return
diff --git a/src/vfs/critcl.vfs/license.terms b/src/vfs/critcl.vfs/license.terms
new file mode 100644
index 00000000..9dbd87fe
--- /dev/null
+++ b/src/vfs/critcl.vfs/license.terms
@@ -0,0 +1,40 @@
+This software is copyrighted by Jean-Claude Wippler, Steve Landers
+other parties.
+
+The following terms apply to all files associated with the software
+unless explicitly disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal 
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license. 
diff --git a/src/vfs/critcl.vfs/main.tcl b/src/vfs/critcl.vfs/main.tcl
new file mode 100644
index 00000000..4c290c87
--- /dev/null
+++ b/src/vfs/critcl.vfs/main.tcl
@@ -0,0 +1,20 @@
+if {![catch {
+  # Kit related main:
+  package require starkit
+}]} {
+  if {[starkit::startup] == "sourced"} return
+} else {
+  # Direct invoke without kit (sourced/debug/dev-edition), assume
+  # relative location of the required packages:
+  lappend ::auto_path [file join [file dirname [info script]] lib]
+}
+package require critcl::app 3
+if {[lindex $::argv 0] eq "tclsh"} {
+    puts stdout "Attempting to drop into tclsh shell.."
+    set ::tcl_interactive 1
+    puts "stdin: [chan configure stdin]"
+    set ::tclsh(dorepl) 1
+} else {
+    #puts [package ifneeded critcl [package require critcl::app 3]]
+    critcl::app::main $argv
+}
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.0 b/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.0
new file mode 100644
index 00000000..47529dd0
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.0
@@ -0,0 +1,17 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__command0 "::command"
+static int
+tcl__command0_actual(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+return TCL_OK;
+}
+
+static int
+tcl__command0(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+  int _rv;
+  critcl_trace_cmd_args (ns__command0, objc, objv);
+  _rv = tcl__command0_actual (clientdata, interp, objc, objv);
+  return critcl_trace_cmd_result (_rv, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.1 b/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.1
new file mode 100644
index 00000000..ff2d06e9
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.1
@@ -0,0 +1,17 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__command0 "::command"
+static int
+tcl__command0_actual(ClientData CD, Tcl_Interp *IP, Tcl_Size OC, Tcl_Obj *CONST OV[])
+{
+return TCL_OK;
+}
+
+static int
+tcl__command0(ClientData CD, Tcl_Interp *IP, Tcl_Size OC, Tcl_Obj *CONST OV[])
+{
+  int _rv;
+  critcl_trace_cmd_args (ns__command0, OC, OV);
+  _rv = tcl__command0_actual (CD, IP, OC, OV);
+  return critcl_trace_cmd_result (_rv, IP);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.2 b/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.2
new file mode 100644
index 00000000..b54e6f31
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.2
@@ -0,0 +1,16 @@
+/* ---------------------------------------------------------------------- */
+
+static int
+snafu_actual(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+return TCL_OK;
+}
+
+static int
+snafu(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+  int _rv;
+  critcl_trace_cmd_args ("snafu", objc, objv);
+  _rv = snafu_actual (clientdata, interp, objc, objv);
+  return critcl_trace_cmd_result (_rv, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.3 b/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.3
new file mode 100644
index 00000000..afedaa70
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.3
@@ -0,0 +1,17 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__the_command_max0 "::the::command+max"
+static int
+tcl__the_command_max0_actual(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+return TCL_OK;
+}
+
+static int
+tcl__the_command_max0(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+  int _rv;
+  critcl_trace_cmd_args (ns__the_command_max0, objc, objv);
+  _rv = tcl__the_command_max0_actual (clientdata, interp, objc, objv);
+  return critcl_trace_cmd_result (_rv, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.4 b/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.4
new file mode 100644
index 00000000..47529dd0
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.4
@@ -0,0 +1,17 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__command0 "::command"
+static int
+tcl__command0_actual(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+return TCL_OK;
+}
+
+static int
+tcl__command0(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+  int _rv;
+  critcl_trace_cmd_args (ns__command0, objc, objv);
+  _rv = tcl__command0_actual (clientdata, interp, objc, objv);
+  return critcl_trace_cmd_result (_rv, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.5 b/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.5
new file mode 100644
index 00000000..47529dd0
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand-trace/2.5
@@ -0,0 +1,17 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__command0 "::command"
+static int
+tcl__command0_actual(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+return TCL_OK;
+}
+
+static int
+tcl__command0(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+  int _rv;
+  critcl_trace_cmd_args (ns__command0, objc, objv);
+  _rv = tcl__command0_actual (clientdata, interp, objc, objv);
+  return critcl_trace_cmd_result (_rv, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand-trace/3.0 b/src/vfs/critcl.vfs/test/assets/ccommand-trace/3.0
new file mode 100644
index 00000000..aea8ff12
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand-trace/3.0
@@ -0,0 +1,19 @@
+*#define ns__command0 "::command"
+static int
+tcl__command0_actual(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv\[\])
+{
+return TCL_OK;
+}
+
+static int
+tcl__command0(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv\[\])
+{
+  int _rv;
+  critcl_trace_cmd_args (ns__command0, objc, objv);
+  _rv = tcl__command0_actual (clientdata, interp, objc, objv);
+  return critcl_trace_cmd_result (_rv, interp);
+}
+*
+Fake_Init*
+*Tcl_CreateObjCommand2(interp, ns__command0, tcl__command0, NULL, NULL);
+*
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand-trace/3.4 b/src/vfs/critcl.vfs/test/assets/ccommand-trace/3.4
new file mode 100644
index 00000000..e9729f59
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand-trace/3.4
@@ -0,0 +1,19 @@
+*#define ns__command0 "::command"
+static int
+tcl__command0_actual(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv\[\])
+{
+return TCL_OK;
+}
+
+static int
+tcl__command0(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv\[\])
+{
+  int _rv;
+  critcl_trace_cmd_args (ns__command0, objc, objv);
+  _rv = tcl__command0_actual (clientdata, interp, objc, objv);
+  return critcl_trace_cmd_result (_rv, interp);
+}
+*
+Fake_Init*
+*Tcl_CreateObjCommand2(interp, ns__command0, tcl__command0, NULL, DELE);
+*
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand-trace/3.5 b/src/vfs/critcl.vfs/test/assets/ccommand-trace/3.5
new file mode 100644
index 00000000..78e21b07
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand-trace/3.5
@@ -0,0 +1,19 @@
+*#define ns__command0 "::command"
+static int
+tcl__command0_actual(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv\[\])
+{
+return TCL_OK;
+}
+
+static int
+tcl__command0(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv\[\])
+{
+  int _rv;
+  critcl_trace_cmd_args (ns__command0, objc, objv);
+  _rv = tcl__command0_actual (clientdata, interp, objc, objv);
+  return critcl_trace_cmd_result (_rv, interp);
+}
+*
+Fake_Init*
+*Tcl_CreateObjCommand2(interp, ns__command0, tcl__command0, ABC, NULL);
+*
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand/2.0 b/src/vfs/critcl.vfs/test/assets/ccommand/2.0
new file mode 100644
index 00000000..02e19590
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand/2.0
@@ -0,0 +1,8 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__command0 "::command"
+static int
+tcl__command0(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand/2.1 b/src/vfs/critcl.vfs/test/assets/ccommand/2.1
new file mode 100644
index 00000000..dd2d7ab8
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand/2.1
@@ -0,0 +1,8 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__command0 "::command"
+static int
+tcl__command0(ClientData CD, Tcl_Interp *IP, Tcl_Size OC, Tcl_Obj *CONST OV[])
+{
+return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand/2.2 b/src/vfs/critcl.vfs/test/assets/ccommand/2.2
new file mode 100644
index 00000000..df424313
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand/2.2
@@ -0,0 +1,7 @@
+/* ---------------------------------------------------------------------- */
+
+static int
+snafu(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand/2.3 b/src/vfs/critcl.vfs/test/assets/ccommand/2.3
new file mode 100644
index 00000000..e1644243
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand/2.3
@@ -0,0 +1,8 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__the_command_max0 "::the::command+max"
+static int
+tcl__the_command_max0(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand/3.0 b/src/vfs/critcl.vfs/test/assets/ccommand/3.0
new file mode 100644
index 00000000..15ccc9e0
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand/3.0
@@ -0,0 +1,10 @@
+*#define ns__command0 "::command"
+static int
+tcl__command0(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv\[\])
+{
+return TCL_OK;
+}
+*
+Fake_Init*
+*Tcl_CreateObjCommand2(interp, ns__command0, tcl__command0, NULL, NULL);
+*
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand/3.4 b/src/vfs/critcl.vfs/test/assets/ccommand/3.4
new file mode 100644
index 00000000..07b4c717
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand/3.4
@@ -0,0 +1,10 @@
+*#define ns__command0 "::command"
+static int
+tcl__command0(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv\[\])
+{
+return TCL_OK;
+}
+*
+Fake_Init*
+*Tcl_CreateObjCommand2(interp, ns__command0, tcl__command0, NULL, DELE);
+*
diff --git a/src/vfs/critcl.vfs/test/assets/ccommand/3.5 b/src/vfs/critcl.vfs/test/assets/ccommand/3.5
new file mode 100644
index 00000000..2e53e4ec
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/ccommand/3.5
@@ -0,0 +1,10 @@
+*#define ns__command0 "::command"
+static int
+tcl__command0(ClientData clientdata, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *CONST objv\[\])
+{
+return TCL_OK;
+}
+*
+Fake_Init*
+*Tcl_CreateObjCommand2(interp, ns__command0, tcl__command0, ABC, NULL);
+*
diff --git a/src/vfs/critcl.vfs/test/assets/cconst-trace/2.0 b/src/vfs/critcl.vfs/test/assets/cconst-trace/2.0
new file mode 100644
index 00000000..a2f9e39f
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cconst-trace/2.0
@@ -0,0 +1,22 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__alpha0 "::alpha"
+
+static int
+tcl__alpha0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  critcl_trace_cmd_args (ns__alpha0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Const - - -- --- ----- -------- */
+  rv = 1;
+
+  /* (bool return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cconst-trace/2.1 b/src/vfs/critcl.vfs/test/assets/cconst-trace/2.1
new file mode 100644
index 00000000..e35f700a
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cconst-trace/2.1
@@ -0,0 +1,22 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__alpha0 "::alpha"
+
+static int
+tcl__alpha0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  critcl_trace_cmd_args (ns__alpha0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Const - - -- --- ----- -------- */
+  rv = FOO;
+
+  /* (bool return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cconst-trace/2.2 b/src/vfs/critcl.vfs/test/assets/cconst-trace/2.2
new file mode 100644
index 00000000..817957b5
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cconst-trace/2.2
@@ -0,0 +1,22 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__alpha0 "::alpha"
+
+static int
+tcl__alpha0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  critcl_trace_cmd_args (ns__alpha0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Const - - -- --- ----- -------- */
+  rv = foo();
+
+  /* (bool return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cconst-trace/2.3 b/src/vfs/critcl.vfs/test/assets/cconst-trace/2.3
new file mode 100644
index 00000000..7c1d7483
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cconst-trace/2.3
@@ -0,0 +1,22 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__the_alpha0 "::the::alpha"
+
+static int
+tcl__the_alpha0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  critcl_trace_cmd_args (ns__the_alpha0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Const - - -- --- ----- -------- */
+  rv = 0;
+
+  /* (bool return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cconst/2.0 b/src/vfs/critcl.vfs/test/assets/cconst/2.0
new file mode 100644
index 00000000..ec316d85
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cconst/2.0
@@ -0,0 +1,20 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__alpha0 "::alpha"
+
+static int
+tcl__alpha0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Const - - -- --- ----- -------- */
+  rv = 1;
+
+  /* (bool return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cconst/2.1 b/src/vfs/critcl.vfs/test/assets/cconst/2.1
new file mode 100644
index 00000000..77685dfa
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cconst/2.1
@@ -0,0 +1,20 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__alpha0 "::alpha"
+
+static int
+tcl__alpha0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Const - - -- --- ----- -------- */
+  rv = FOO;
+
+  /* (bool return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cconst/2.2 b/src/vfs/critcl.vfs/test/assets/cconst/2.2
new file mode 100644
index 00000000..a41bd8f4
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cconst/2.2
@@ -0,0 +1,20 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__alpha0 "::alpha"
+
+static int
+tcl__alpha0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Const - - -- --- ----- -------- */
+  rv = foo();
+
+  /* (bool return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cconst/2.3 b/src/vfs/critcl.vfs/test/assets/cconst/2.3
new file mode 100644
index 00000000..be39cb03
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cconst/2.3
@@ -0,0 +1,20 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__the_alpha0 "::the::alpha"
+
+static int
+tcl__the_alpha0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Const - - -- --- ----- -------- */
+  rv = 0;
+
+  /* (bool return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cdata-trace/2.0 b/src/vfs/critcl.vfs/test/assets/cdata-trace/2.0
new file mode 100644
index 00000000..1291ece7
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cdata-trace/2.0
@@ -0,0 +1,21 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__alpha0 "::alpha"
+static int
+tcl__alpha0_actual(ClientData dummy, Tcl_Interp *ip, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+static char script[4] = {
+        98,101,116,97,
+  };
+  Tcl_SetByteArrayObj(Tcl_GetObjResult(ip), (unsigned char*) script, 4);
+  return TCL_OK;
+}
+
+static int
+tcl__alpha0(ClientData dummy, Tcl_Interp *ip, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+  int _rv;
+  critcl_trace_cmd_args (ns__alpha0, objc, objv);
+  _rv = tcl__alpha0_actual (dummy, ip, objc, objv);
+  return critcl_trace_cmd_result (_rv, ip);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cdata-trace/2.1 b/src/vfs/critcl.vfs/test/assets/cdata-trace/2.1
new file mode 100644
index 00000000..04532cf7
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cdata-trace/2.1
@@ -0,0 +1,21 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__alpha_x0 "::alpha-x"
+static int
+tcl__alpha_x0_actual(ClientData dummy, Tcl_Interp *ip, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+static char script[4] = {
+        98,101,116,97,
+  };
+  Tcl_SetByteArrayObj(Tcl_GetObjResult(ip), (unsigned char*) script, 4);
+  return TCL_OK;
+}
+
+static int
+tcl__alpha_x0(ClientData dummy, Tcl_Interp *ip, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+  int _rv;
+  critcl_trace_cmd_args (ns__alpha_x0, objc, objv);
+  _rv = tcl__alpha_x0_actual (dummy, ip, objc, objv);
+  return critcl_trace_cmd_result (_rv, ip);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cdata-trace/2.2 b/src/vfs/critcl.vfs/test/assets/cdata-trace/2.2
new file mode 100644
index 00000000..233d28ce
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cdata-trace/2.2
@@ -0,0 +1,21 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__the_alpha0 "::the::alpha"
+static int
+tcl__the_alpha0_actual(ClientData dummy, Tcl_Interp *ip, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+static char script[4] = {
+        98,101,116,97,
+  };
+  Tcl_SetByteArrayObj(Tcl_GetObjResult(ip), (unsigned char*) script, 4);
+  return TCL_OK;
+}
+
+static int
+tcl__the_alpha0(ClientData dummy, Tcl_Interp *ip, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+  int _rv;
+  critcl_trace_cmd_args (ns__the_alpha0, objc, objv);
+  _rv = tcl__the_alpha0_actual (dummy, ip, objc, objv);
+  return critcl_trace_cmd_result (_rv, ip);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cdata/2.0 b/src/vfs/critcl.vfs/test/assets/cdata/2.0
new file mode 100644
index 00000000..4d270b1a
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cdata/2.0
@@ -0,0 +1,12 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__alpha0 "::alpha"
+static int
+tcl__alpha0(ClientData dummy, Tcl_Interp *ip, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+static char script[4] = {
+        98,101,116,97,
+  };
+  Tcl_SetByteArrayObj(Tcl_GetObjResult(ip), (unsigned char*) script, 4);
+  return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cdata/2.1 b/src/vfs/critcl.vfs/test/assets/cdata/2.1
new file mode 100644
index 00000000..d1df2fa8
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cdata/2.1
@@ -0,0 +1,12 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__alpha_x0 "::alpha-x"
+static int
+tcl__alpha_x0(ClientData dummy, Tcl_Interp *ip, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+static char script[4] = {
+        98,101,116,97,
+  };
+  Tcl_SetByteArrayObj(Tcl_GetObjResult(ip), (unsigned char*) script, 4);
+  return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cdata/2.2 b/src/vfs/critcl.vfs/test/assets/cdata/2.2
new file mode 100644
index 00000000..2833a7b7
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cdata/2.2
@@ -0,0 +1,12 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__the_alpha0 "::the::alpha"
+static int
+tcl__the_alpha0(ClientData dummy, Tcl_Interp *ip, Tcl_Size objc, Tcl_Obj *CONST objv[])
+{
+static char script[4] = {
+        98,101,116,97,
+  };
+  Tcl_SetByteArrayObj(Tcl_GetObjResult(ip), (unsigned char*) script, 4);
+  return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.0 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.0
new file mode 100644
index 00000000..8b0424f7
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.0
@@ -0,0 +1,25 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0()
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0();
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.1 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.1
new file mode 100644
index 00000000..f1463dbd
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.1
@@ -0,0 +1,25 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__the_aproc0 "::the::aproc"
+static void c__the_aproc0()
+{
+
+}
+
+static int
+tcl__the_aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  critcl_trace_cmd_args (ns__the_aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__the_aproc0();
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.10 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.10
new file mode 100644
index 00000000..9b0090b4
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.10
@@ -0,0 +1,59 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int has_x, int x, int y, int z)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _has_x = 0;
+  int _x;
+  int _y;
+  int _z;
+  int idx_;
+  int argc_;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if ((oc < 3) || (4 < oc)) {
+    Tcl_WrongNumArgs(interp, 1, ov, "?x? y z");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  idx_  = 1;
+  argc_ = oc - 1;
+
+  /* (int x, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 2) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+    idx_++;
+    argc_--;
+    _has_x = 1;
+  } else {
+    _x = -1;
+  }
+
+
+  /* (int y) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_y) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+  idx_++;
+  argc_--;
+
+
+  /* (int z) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_z) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_has_x, _x, _y, _z);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.11 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.11
new file mode 100644
index 00000000..dd548abe
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.11
@@ -0,0 +1,53 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x, int y, int has_z, int z)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+  int _y;
+  int _has_z = 0;
+  int _z;
+  int idx_;
+  int argc_;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if ((oc < 3) || (4 < oc)) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x y ?z?");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+
+  /* (int y) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[2], &_y) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+
+  idx_  = 3;
+  argc_ = oc - 3;
+
+  /* (int z, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 0) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_z) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+    _has_z = 1;
+  } else {
+    _z = -1;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x, _y, _has_z, _z);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.12 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.12
new file mode 100644
index 00000000..99be1fdb
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.12
@@ -0,0 +1,56 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x, int has_y, int y, int z)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+  int _has_y = 0;
+  int _y;
+  int _z;
+  int idx_;
+  int argc_;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if ((oc < 3) || (4 < oc)) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x ?y? z");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+
+  idx_  = 2;
+  argc_ = oc - 2;
+
+  /* (int y, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 1) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_y) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+    idx_++;
+    argc_--;
+    _has_y = 1;
+  } else {
+    _y = -1;
+  }
+
+
+  /* (int z) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_z) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x, _has_y, _y, _z);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.13 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.13
new file mode 100644
index 00000000..e6879887
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.13
@@ -0,0 +1,61 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_int
+#define CRITCL_variadic_int
+
+	    /* NOTE: Array 'v' is allocated on the heap. The argument
+	    // release code is used to free it after the worker
+	    // function returned. Depending on type and what is done
+	    // by the worker it may have to make copies of the data.
+	    */
+
+	    typedef struct critcl_variadic_int {
+		Tcl_Obj** o; /* Original object array */
+		int       c; /* Element count */
+		int*   v; /* Allocated array of the elements */
+	    } critcl_variadic_int;
+
+	    static int
+	    _critcl_variadic_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+			{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+		return TCL_OK;
+	    }
+	
+#endif /* CRITCL_variadic_int _________ */
+
+static void c__aproc0(critcl_variadic_int args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_variadic_int _args;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+  /* (int args, ...) - - -- --- ----- -------- */
+	{
+	int src, dst, leftovers = (oc-1);
+	    _args.c = leftovers;
+	    _args.v = (int*) ((!leftovers) ? 0 : ckalloc (leftovers * sizeof (int)));
+	    _args.o = (Tcl_Obj**) &ov[1];
+	    for (src = 1, dst = 0; leftovers > 0; dst++, src++, leftovers--) {
+	       if (_critcl_variadic_int_item (interp, ov[src], &(_args.v[dst])) != TCL_OK) {
+		   ckfree ((char*) _args.v); /* Cleanup partial work */
+		   return critcl_trace_cmd_result (TCL_ERROR, interp);
+	       }
+	    } }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_args);
+
+  /* (Release: int args, ...) - - -- --- ----- -------- */
+	    if (_args.c) { ckfree ((char*) _args.v); }
+	
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.14 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.14
new file mode 100644
index 00000000..f32000c9
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.14
@@ -0,0 +1,36 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_object
+#define CRITCL_variadic_object
+
+	typedef struct critcl_variadic_object {
+	    int             c;
+	    Tcl_Obj* const* v;
+	} critcl_variadic_object;
+    
+#endif /* CRITCL_variadic_object _________ */
+
+static void c__aproc0(critcl_variadic_object args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_variadic_object _args;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+  /* (object args, ...) - - -- --- ----- -------- */
+	{
+	_args.c = (oc-1);
+	_args.v = &ov[1]; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_args);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.15 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.15
new file mode 100644
index 00000000..f0ee9f3f
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.15
@@ -0,0 +1,79 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_int
+#define CRITCL_variadic_int
+
+	    /* NOTE: Array 'v' is allocated on the heap. The argument
+	    // release code is used to free it after the worker
+	    // function returned. Depending on type and what is done
+	    // by the worker it may have to make copies of the data.
+	    */
+
+	    typedef struct critcl_variadic_int {
+		Tcl_Obj** o; /* Original object array */
+		int       c; /* Element count */
+		int*   v; /* Allocated array of the elements */
+	    } critcl_variadic_int;
+
+	    static int
+	    _critcl_variadic_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+			{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+		return TCL_OK;
+	    }
+	
+#endif /* CRITCL_variadic_int _________ */
+
+static void c__aproc0(int x, int y, critcl_variadic_int args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+  int _y;
+  critcl_variadic_int _args;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc < 3) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x y ?args...?");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+
+  /* (int y) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[2], &_y) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+
+  /* (int args, ...) - - -- --- ----- -------- */
+	{
+	int src, dst, leftovers = (oc-3);
+	    _args.c = leftovers;
+	    _args.v = (int*) ((!leftovers) ? 0 : ckalloc (leftovers * sizeof (int)));
+	    _args.o = (Tcl_Obj**) &ov[3];
+	    for (src = 3, dst = 0; leftovers > 0; dst++, src++, leftovers--) {
+	       if (_critcl_variadic_int_item (interp, ov[src], &(_args.v[dst])) != TCL_OK) {
+		   ckfree ((char*) _args.v); /* Cleanup partial work */
+		   return critcl_trace_cmd_result (TCL_ERROR, interp);
+	       }
+	    } }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x, _y, _args);
+
+  /* (Release: int args, ...) - - -- --- ----- -------- */
+	    if (_args.c) { ckfree ((char*) _args.v); }
+	
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.16 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.16
new file mode 100644
index 00000000..4bfea16b
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.16
@@ -0,0 +1,94 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_int
+#define CRITCL_variadic_int
+
+	    /* NOTE: Array 'v' is allocated on the heap. The argument
+	    // release code is used to free it after the worker
+	    // function returned. Depending on type and what is done
+	    // by the worker it may have to make copies of the data.
+	    */
+
+	    typedef struct critcl_variadic_int {
+		Tcl_Obj** o; /* Original object array */
+		int       c; /* Element count */
+		int*   v; /* Allocated array of the elements */
+	    } critcl_variadic_int;
+
+	    static int
+	    _critcl_variadic_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+			{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+		return TCL_OK;
+	    }
+	
+#endif /* CRITCL_variadic_int _________ */
+
+static void c__aproc0(int has_x, int x, int has_y, int y, critcl_variadic_int args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _has_x = 0;
+  int _x;
+  int _has_y = 0;
+  int _y;
+  critcl_variadic_int _args;
+  int idx_;
+  int argc_;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+  idx_  = 1;
+  argc_ = oc - 1;
+
+  /* (int x, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 1) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+    idx_++;
+    argc_--;
+    _has_x = 1;
+  } else {
+    _x = -1;
+  }
+
+
+  /* (int y, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 1) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_y) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+    idx_++;
+    argc_--;
+    _has_y = 1;
+  } else {
+    _y = -1;
+  }
+
+
+  /* (int args, ...) - - -- --- ----- -------- */
+	{
+	int src, dst, leftovers = argc_;
+	    _args.c = leftovers;
+	    _args.v = (int*) ((!leftovers) ? 0 : ckalloc (leftovers * sizeof (int)));
+	    _args.o = (Tcl_Obj**) &ov[idx_];
+	    for (src = idx_, dst = 0; leftovers > 0; dst++, src++, leftovers--) {
+	       if (_critcl_variadic_int_item (interp, ov[src], &(_args.v[dst])) != TCL_OK) {
+		   ckfree ((char*) _args.v); /* Cleanup partial work */
+		   return critcl_trace_cmd_result (TCL_ERROR, interp);
+	       }
+	    } }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_has_x, _x, _has_y, _y, _args);
+
+  /* (Release: int args, ...) - - -- --- ----- -------- */
+	    if (_args.c) { ckfree ((char*) _args.v); }
+	
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.17 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.17
new file mode 100644
index 00000000..bb4c1efb
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.17
@@ -0,0 +1,92 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_int
+#define CRITCL_variadic_int
+
+	    /* NOTE: Array 'v' is allocated on the heap. The argument
+	    // release code is used to free it after the worker
+	    // function returned. Depending on type and what is done
+	    // by the worker it may have to make copies of the data.
+	    */
+
+	    typedef struct critcl_variadic_int {
+		Tcl_Obj** o; /* Original object array */
+		int       c; /* Element count */
+		int*   v; /* Allocated array of the elements */
+	    } critcl_variadic_int;
+
+	    static int
+	    _critcl_variadic_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+			{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+		return TCL_OK;
+	    }
+	
+#endif /* CRITCL_variadic_int _________ */
+
+static void c__aproc0(int x, int has_y, int y, critcl_variadic_int args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+  int _has_y = 0;
+  int _y;
+  critcl_variadic_int _args;
+  int idx_;
+  int argc_;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc < 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x ?y? ?args...?");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+
+  idx_  = 2;
+  argc_ = oc - 2;
+
+  /* (int y, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 1) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_y) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+    idx_++;
+    argc_--;
+    _has_y = 1;
+  } else {
+    _y = -1;
+  }
+
+
+  /* (int args, ...) - - -- --- ----- -------- */
+	{
+	int src, dst, leftovers = argc_;
+	    _args.c = leftovers;
+	    _args.v = (int*) ((!leftovers) ? 0 : ckalloc (leftovers * sizeof (int)));
+	    _args.o = (Tcl_Obj**) &ov[idx_];
+	    for (src = idx_, dst = 0; leftovers > 0; dst++, src++, leftovers--) {
+	       if (_critcl_variadic_int_item (interp, ov[src], &(_args.v[dst])) != TCL_OK) {
+		   ckfree ((char*) _args.v); /* Cleanup partial work */
+		   return critcl_trace_cmd_result (TCL_ERROR, interp);
+	       }
+	    } }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x, _has_y, _y, _args);
+
+  /* (Release: int args, ...) - - -- --- ----- -------- */
+	    if (_args.c) { ckfree ((char*) _args.v); }
+	
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.18 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.18
new file mode 100644
index 00000000..1bdeafcb
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.18
@@ -0,0 +1,95 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_int
+#define CRITCL_variadic_int
+
+	    /* NOTE: Array 'v' is allocated on the heap. The argument
+	    // release code is used to free it after the worker
+	    // function returned. Depending on type and what is done
+	    // by the worker it may have to make copies of the data.
+	    */
+
+	    typedef struct critcl_variadic_int {
+		Tcl_Obj** o; /* Original object array */
+		int       c; /* Element count */
+		int*   v; /* Allocated array of the elements */
+	    } critcl_variadic_int;
+
+	    static int
+	    _critcl_variadic_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+			{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+		return TCL_OK;
+	    }
+	
+#endif /* CRITCL_variadic_int _________ */
+
+static void c__aproc0(int has_x, int x, int y, critcl_variadic_int args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _has_x = 0;
+  int _x;
+  int _y;
+  critcl_variadic_int _args;
+  int idx_;
+  int argc_;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc < 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "?x? y ?args...?");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  idx_  = 1;
+  argc_ = oc - 1;
+
+  /* (int x, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 2) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+    idx_++;
+    argc_--;
+    _has_x = 1;
+  } else {
+    _x = -1;
+  }
+
+
+  /* (int y) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_y) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+  idx_++;
+  argc_--;
+
+
+  /* (int args, ...) - - -- --- ----- -------- */
+	{
+	int src, dst, leftovers = argc_;
+	    _args.c = leftovers;
+	    _args.v = (int*) ((!leftovers) ? 0 : ckalloc (leftovers * sizeof (int)));
+	    _args.o = (Tcl_Obj**) &ov[idx_];
+	    for (src = idx_, dst = 0; leftovers > 0; dst++, src++, leftovers--) {
+	       if (_critcl_variadic_int_item (interp, ov[src], &(_args.v[dst])) != TCL_OK) {
+		   ckfree ((char*) _args.v); /* Cleanup partial work */
+		   return critcl_trace_cmd_result (TCL_ERROR, interp);
+	       }
+	    } }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_has_x, _x, _y, _args);
+
+  /* (Release: int args, ...) - - -- --- ----- -------- */
+	    if (_args.c) { ckfree ((char*) _args.v); }
+	
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.2 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.2
new file mode 100644
index 00000000..82cb8dc7
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.2
@@ -0,0 +1,25 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc_beta0 "::aproc+beta"
+static void c__aproc_beta0()
+{
+
+}
+
+static int
+tcl__aproc_beta0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  critcl_trace_cmd_args (ns__aproc_beta0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc_beta0();
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.3 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.3
new file mode 100644
index 00000000..2994b8c1
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.3
@@ -0,0 +1,24 @@
+/* ---------------------------------------------------------------------- */
+
+static void c_snafu()
+{
+
+}
+
+static int
+snafu(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  critcl_trace_cmd_args ("snafu", oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c_snafu();
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.4 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.4
new file mode 100644
index 00000000..d1852734
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.4
@@ -0,0 +1,25 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(ClientData clientdata)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(cd);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.5 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.5
new file mode 100644
index 00000000..dc97e723
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.5
@@ -0,0 +1,25 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0()
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 4) {
+    Tcl_WrongNumArgs(interp, 4, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0();
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.6 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.6
new file mode 100644
index 00000000..5ac0ecf9
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.6
@@ -0,0 +1,30 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int anargument)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _anargument;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "anargument");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int anargument) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_anargument) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_anargument);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.7 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.7
new file mode 100644
index 00000000..8263bd9f
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.7
@@ -0,0 +1,41 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int has_anargument, int anargument)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _has_anargument = 0;
+  int _anargument;
+  int idx_;
+  int argc_;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if ((oc < 1) || (2 < oc)) {
+    Tcl_WrongNumArgs(interp, 1, ov, "?anargument?");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  idx_  = 1;
+  argc_ = oc - 1;
+
+  /* (int anargument, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 0) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_anargument) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+    _has_anargument = 1;
+  } else {
+    _anargument = -1;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_has_anargument, _anargument);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.8 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.8
new file mode 100644
index 00000000..b952d9ff
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.8
@@ -0,0 +1,64 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int has_x, int x, int y, int has_z, int z)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _has_x = 0;
+  int _x;
+  int _y;
+  int _has_z = 0;
+  int _z;
+  int idx_;
+  int argc_;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if ((oc < 2) || (4 < oc)) {
+    Tcl_WrongNumArgs(interp, 1, ov, "?x? y ?z?");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  idx_  = 1;
+  argc_ = oc - 1;
+
+  /* (int x, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 1) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+    idx_++;
+    argc_--;
+    _has_x = 1;
+  } else {
+    _x = -1;
+  }
+
+
+  /* (int y) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_y) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+  idx_++;
+  argc_--;
+
+
+  /* (int z, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 0) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_z) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+    _has_z = 1;
+  } else {
+    _z = -1;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_has_x, _x, _y, _has_z, _z);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/2.9 b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.9
new file mode 100644
index 00000000..075c79b8
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/2.9
@@ -0,0 +1,26 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static int c__aproc0()
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (int return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.0 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.0
new file mode 100644
index 00000000..8b0424f7
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.0
@@ -0,0 +1,25 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0()
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0();
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.1 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.1
new file mode 100644
index 00000000..944150dc
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.1
@@ -0,0 +1,25 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static int c__aproc0()
+{
+return TCL_OK;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (ok return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (rv, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.10 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.10
new file mode 100644
index 00000000..f167497a
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.10
@@ -0,0 +1,26 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static char* c__aproc0()
+{
+return alloc_string("bar");
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  char* rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (dstring return) - - -- --- ----- -------- */
+	Tcl_SetResult (interp, rv, TCL_DYNAMIC);
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.11 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.11
new file mode 100644
index 00000000..29d8d38b
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.11
@@ -0,0 +1,28 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static Tcl_Obj* c__aproc0()
+{
+return Tcl_NewIntObj(0);
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Obj* rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (object return) - - -- --- ----- -------- */
+	if (rv == NULL) { return critcl_trace_cmd_result (TCL_ERROR, interp); }
+	Tcl_SetObjResult(interp, rv);
+	Tcl_DecrRefCount(rv);
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.12 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.12
new file mode 100644
index 00000000..9649549b
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.12
@@ -0,0 +1,28 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static Tcl_Channel c__aproc0()
+{
+return Tcl_OpenFileChannel (interp, "/tmp", "r", 0);
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Channel rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (new-channel return) - - -- --- ----- -------- */
+	if (rv == NULL) { return critcl_trace_cmd_result (TCL_ERROR, interp); }
+	Tcl_RegisterChannel (interp, rv);
+	Tcl_SetObjResult (interp, Tcl_NewStringObj (Tcl_GetChannelName (rv), -1));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.13 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.13
new file mode 100644
index 00000000..141f6220
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.13
@@ -0,0 +1,27 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static Tcl_Channel c__aproc0()
+{
+return Tcl_GetStdChannel (0);
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Channel rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (known-channel return) - - -- --- ----- -------- */
+	if (rv == NULL) { return critcl_trace_cmd_result (TCL_ERROR, interp); }
+	Tcl_SetObjResult (interp, Tcl_NewStringObj (Tcl_GetChannelName (rv), -1));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.14 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.14
new file mode 100644
index 00000000..70f12497
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.14
@@ -0,0 +1,29 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static Tcl_Channel c__aproc0()
+{
+return 0;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Channel rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (return-channel return) - - -- --- ----- -------- */
+	if (rv == NULL) { return critcl_trace_cmd_result (TCL_ERROR, interp); }
+	Tcl_RegisterChannel (interp, rv);
+	Tcl_UnregisterChannel(NULL, rv);
+	Tcl_SetObjResult (interp, Tcl_NewStringObj (Tcl_GetChannelName (rv), -1));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.2 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.2
new file mode 100644
index 00000000..52c67ff1
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.2
@@ -0,0 +1,26 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static int c__aproc0()
+{
+return 0;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (int return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.3 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.3
new file mode 100644
index 00000000..3fecc52a
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.3
@@ -0,0 +1,26 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static int c__aproc0()
+{
+return 1;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (bool return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.4 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.4
new file mode 100644
index 00000000..a3be87c1
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.4
@@ -0,0 +1,26 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static int c__aproc0()
+{
+return 1;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (boolean return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.5 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.5
new file mode 100644
index 00000000..a6b0bede
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.5
@@ -0,0 +1,26 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static long c__aproc0()
+{
+return 1;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  long rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (long return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewLongObj(rv));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.6 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.6
new file mode 100644
index 00000000..1b837558
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.6
@@ -0,0 +1,26 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static Tcl_WideInt c__aproc0()
+{
+return 1;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_WideInt rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (wideint return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(rv));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.7 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.7
new file mode 100644
index 00000000..03cff08a
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.7
@@ -0,0 +1,26 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static double c__aproc0()
+{
+return 0.;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  double rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (double return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewDoubleObj(rv));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.8 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.8
new file mode 100644
index 00000000..9ca60720
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.8
@@ -0,0 +1,26 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static float c__aproc0()
+{
+return 0.;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  float rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (float return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewDoubleObj(rv));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/3.9 b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.9
new file mode 100644
index 00000000..c0b660e8
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/3.9
@@ -0,0 +1,26 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static char* c__aproc0()
+{
+return "foo";
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  char* rv;
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (vstring return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(rv, -1));
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.0-int b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.0-int
new file mode 100644
index 00000000..a6af880c
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.0-int
@@ -0,0 +1,30 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.1-bool b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.1-bool
new file mode 100644
index 00000000..72d53b7b
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.1-bool
@@ -0,0 +1,30 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (bool x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetBooleanFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.10-object b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.10-object
new file mode 100644
index 00000000..0ea50c92
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.10-object
@@ -0,0 +1,30 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(Tcl_Obj* x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Obj* _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (object x) - - -- --- ----- -------- */
+	{
+	_x = ov[1]; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.12-bytes b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.12-bytes
new file mode 100644
index 00000000..a70d3761
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.12-bytes
@@ -0,0 +1,44 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_bytes
+#define CRITCL_bytes
+
+	typedef struct critcl_bytes {
+	    Tcl_Obj*             o;
+	    const unsigned char* s;
+	    Tcl_Size             len;
+	} critcl_bytes;
+    
+#endif /* CRITCL_bytes _________ */
+
+static void c__aproc0(critcl_bytes x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_bytes _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (bytes x) - - -- --- ----- -------- */
+	{
+	/* Raw binary string _with_ length information */
+	_x.s = Tcl_GetBytesFromObj(interp, ov[1], &(_x.len));
+	if (_x.s == NULL) return critcl_trace_cmd_result (TCL_ERROR, interp);
+	_x.o = ov[1]; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.13-channel b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.13-channel
new file mode 100644
index 00000000..aca9eab2
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.13-channel
@@ -0,0 +1,32 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(Tcl_Channel x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Channel _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (channel x) - - -- --- ----- -------- */
+	{
+	int mode;
+	_x = Tcl_GetChannel(interp, Tcl_GetString (ov[1]), &mode);
+	if (_x == NULL) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.14-unshared-channel b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.14-unshared-channel
new file mode 100644
index 00000000..ada00a56
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.14-unshared-channel
@@ -0,0 +1,36 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(Tcl_Channel x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Channel _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (unshared-channel x) - - -- --- ----- -------- */
+	{
+	int mode;
+	_x = Tcl_GetChannel(interp, Tcl_GetString (ov[1]), &mode);
+	if (_x == NULL) return critcl_trace_cmd_result (TCL_ERROR, interp);
+	if (Tcl_IsChannelShared (_x)) {
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("channel is shared", -1));
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.15-take-channel b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.15-take-channel
new file mode 100644
index 00000000..f45fa106
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.15-take-channel
@@ -0,0 +1,59 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(Tcl_Channel x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Channel _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (take-channel x) - - -- --- ----- -------- */
+	{
+	int mode;
+	_x = Tcl_GetChannel(interp, Tcl_GetString (ov[1]), &mode);
+	if (_x == NULL) return critcl_trace_cmd_result (TCL_ERROR, interp);
+	if (Tcl_IsChannelShared (_x)) {
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("channel is shared", -1));
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	}
+	{
+	    /* Disable event processing for the channel, both by
+	     * removing any registered handler, and forcing interest
+	     * to none. This also disables the processing of pending
+	     * events which are ready to fire for the given
+	     * channel. If we do not do this, events will hit the
+	     * detached channel and potentially wreck havoc on our
+	     * memory and eventually badly hurt us...
+	     */
+	    Tcl_DriverWatchProc *watchProc;
+	    Tcl_ClearChannelHandlers(_x);
+	    watchProc = Tcl_ChannelWatchProc(Tcl_GetChannelType(_x));
+	    if (watchProc) {
+		(*watchProc)(Tcl_GetChannelInstanceData(_x), 0);
+	    }
+	    /* Next some fiddling with the reference count to prevent
+	     * the unregistration from killing it. We basically record
+	     * it as globally known before removing it from the
+	     * current interpreter
+	     */
+	    Tcl_RegisterChannel((Tcl_Interp *) NULL, _x);
+	    Tcl_UnregisterChannel(interp, _x);
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.16-vobject b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.16-vobject
new file mode 100644
index 00000000..f32000c9
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.16-vobject
@@ -0,0 +1,36 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_object
+#define CRITCL_variadic_object
+
+	typedef struct critcl_variadic_object {
+	    int             c;
+	    Tcl_Obj* const* v;
+	} critcl_variadic_object;
+    
+#endif /* CRITCL_variadic_object _________ */
+
+static void c__aproc0(critcl_variadic_object args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_variadic_object _args;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+  /* (object args, ...) - - -- --- ----- -------- */
+	{
+	_args.c = (oc-1);
+	_args.v = &ov[1]; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_args);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.17-vint b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.17-vint
new file mode 100644
index 00000000..e6879887
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.17-vint
@@ -0,0 +1,61 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_int
+#define CRITCL_variadic_int
+
+	    /* NOTE: Array 'v' is allocated on the heap. The argument
+	    // release code is used to free it after the worker
+	    // function returned. Depending on type and what is done
+	    // by the worker it may have to make copies of the data.
+	    */
+
+	    typedef struct critcl_variadic_int {
+		Tcl_Obj** o; /* Original object array */
+		int       c; /* Element count */
+		int*   v; /* Allocated array of the elements */
+	    } critcl_variadic_int;
+
+	    static int
+	    _critcl_variadic_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+			{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+		return TCL_OK;
+	    }
+	
+#endif /* CRITCL_variadic_int _________ */
+
+static void c__aproc0(critcl_variadic_int args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_variadic_int _args;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+  /* (int args, ...) - - -- --- ----- -------- */
+	{
+	int src, dst, leftovers = (oc-1);
+	    _args.c = leftovers;
+	    _args.v = (int*) ((!leftovers) ? 0 : ckalloc (leftovers * sizeof (int)));
+	    _args.o = (Tcl_Obj**) &ov[1];
+	    for (src = 1, dst = 0; leftovers > 0; dst++, src++, leftovers--) {
+	       if (_critcl_variadic_int_item (interp, ov[src], &(_args.v[dst])) != TCL_OK) {
+		   ckfree ((char*) _args.v); /* Cleanup partial work */
+		   return critcl_trace_cmd_result (TCL_ERROR, interp);
+	       }
+	    } }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_args);
+
+  /* (Release: int args, ...) - - -- --- ----- -------- */
+	    if (_args.c) { ckfree ((char*) _args.v); }
+	
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.2-long b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.2-long
new file mode 100644
index 00000000..5c345a0e
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.2-long
@@ -0,0 +1,30 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(long x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  long _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (long x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetLongFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.3-wideint b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.3-wideint
new file mode 100644
index 00000000..dc7c6489
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.3-wideint
@@ -0,0 +1,30 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(Tcl_WideInt x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_WideInt _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (wideint x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetWideIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.4-double b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.4-double
new file mode 100644
index 00000000..a29dd23c
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.4-double
@@ -0,0 +1,30 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(double x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  double _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (double x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetDoubleFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.5-float b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.5-float
new file mode 100644
index 00000000..e9c6cbd5
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.5-float
@@ -0,0 +1,32 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(float x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  float _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (float x) - - -- --- ----- -------- */
+	{
+	double t;
+	if (Tcl_GetDoubleFromObj(interp, ov[1], &t) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp);
+	_x = (float) t; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.6-int_gt_0 b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.6-int_gt_0
new file mode 100644
index 00000000..16aadd69
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.6-int_gt_0
@@ -0,0 +1,36 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int > 0 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+	/* Range check, assert (x > 0) */
+	if (!(_x > 0)) {
+	    Tcl_AppendResult (interp, "expected int > 0, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.7-char_ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.7-char_
new file mode 100644
index 00000000..277b5d0d
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.7-char_
@@ -0,0 +1,30 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(const char* x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  const char* _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (char* x) - - -- --- ----- -------- */
+	{
+	_x = Tcl_GetString(ov[1]); }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.8-pstring b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.8-pstring
new file mode 100644
index 00000000..6c8d00b2
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.8-pstring
@@ -0,0 +1,42 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_pstring
+#define CRITCL_pstring
+
+	typedef struct critcl_pstring {
+	    Tcl_Obj*    o;
+	    const char* s;
+	    Tcl_Size    len;
+	} critcl_pstring;
+    
+#endif /* CRITCL_pstring _________ */
+
+static void c__aproc0(critcl_pstring x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_pstring _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (pstring x) - - -- --- ----- -------- */
+	{
+	_x.s = Tcl_GetStringFromObj(ov[1], &(_x.len));
+	_x.o = ov[1]; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/4.9-list b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.9-list
new file mode 100644
index 00000000..30132bb8
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/4.9-list
@@ -0,0 +1,43 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list
+#define CRITCL_list
+
+	typedef struct critcl_list {
+	    Tcl_Obj*        o;
+	    Tcl_Obj* const* v;
+	    Tcl_Size        c;
+	} critcl_list;
+    
+#endif /* CRITCL_list _________ */
+
+static void c__aproc0(critcl_list x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (list x) - - -- --- ----- -------- */
+	{
+	if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+		    &(_x.c), (Tcl_Obj***) &(_x.v)) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp);
+	_x.o = ov[1]; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/5.x b/src/vfs/critcl.vfs/test/assets/cproc-trace/5.x
new file mode 100644
index 00000000..6fdc038f
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/5.x
@@ -0,0 +1,36 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x, int y)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+  int _y;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 3) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x y");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+
+  /* (int y) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[2], &_y) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x, _y);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/6.0-int_gt_4 b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.0-int_gt_4
new file mode 100644
index 00000000..806ae43e
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.0-int_gt_4
@@ -0,0 +1,36 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int > 4 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+	/* Range check, assert (x > 4) */
+	if (!(_x > 4)) {
+	    Tcl_AppendResult (interp, "expected int > 4, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/6.1-int_gt_4_le_8 b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.1-int_gt_4_le_8
new file mode 100644
index 00000000..7c9ba4d7
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.1-int_gt_4_le_8
@@ -0,0 +1,41 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int > 4 <= 8 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+	/* Range check, assert (x > 4) */
+	if (!(_x > 4)) {
+	    Tcl_AppendResult (interp, "expected int > 4 <= 8, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	}
+	/* Range check, assert (x <= 8) */
+	if (!(_x <= 8)) {
+	    Tcl_AppendResult (interp, "expected int > 4 <= 8, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/6.10-int== b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.10-int==
new file mode 100644
index 00000000..0e2ad02f
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.10-int==
@@ -0,0 +1,69 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list_int
+#define CRITCL_list_int
+
+	/* NOTE: Array 'v' is allocated on the heap. The argument
+	// release code is used to free it after the worker
+	// function returned. Depending on type and what is done
+	// by the worker it may have to make copies of the data.
+	*/
+
+	typedef struct critcl_list_int {
+	    Tcl_Obj* o; /* Original list object, for pass-through cases */
+	    Tcl_Size c; /* Element count */
+	    int*  v; /* Allocated array of the elements */
+	} critcl_list_int;
+
+	static int
+	_critcl_list_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+	    	{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+	    return TCL_OK;
+	}
+    
+#endif /* CRITCL_list_int _________ */
+
+static void c__aproc0(critcl_list_int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list_int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (list_int_any x) - - -- --- ----- -------- */
+	{
+	int k;
+	    Tcl_Obj** el;
+	    if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+			&(_x.c), &el) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp);
+	    _x.o = ov[1];
+	
+	_x.v = (int*) ((!_x.c) ? 0 : ckalloc (_x.c * sizeof (int)));
+	for (k = 0; k < _x.c; k++) {
+	    if (_critcl_list_int_item (interp, el[k], &(_x.v[k])) != TCL_OK) {
+		ckfree ((char*) _x.v); /* Cleanup partial work */
+		return critcl_trace_cmd_result (TCL_ERROR, interp);
+	    }
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (Release: list_int_any x) - - -- --- ----- -------- */
+	if (_x.c) { ckfree ((char*) _x.v); }
+    
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/6.11-int=2= b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.11-int=2=
new file mode 100644
index 00000000..b4e13af9
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.11-int=2=
@@ -0,0 +1,74 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list_int
+#define CRITCL_list_int
+
+	/* NOTE: Array 'v' is allocated on the heap. The argument
+	// release code is used to free it after the worker
+	// function returned. Depending on type and what is done
+	// by the worker it may have to make copies of the data.
+	*/
+
+	typedef struct critcl_list_int {
+	    Tcl_Obj* o; /* Original list object, for pass-through cases */
+	    Tcl_Size c; /* Element count */
+	    int*  v; /* Allocated array of the elements */
+	} critcl_list_int;
+
+	static int
+	_critcl_list_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+	    	{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+	    return TCL_OK;
+	}
+    
+#endif /* CRITCL_list_int _________ */
+
+static void c__aproc0(critcl_list_int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list_int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (list_int_2 x) - - -- --- ----- -------- */
+	{
+	int k;
+	    Tcl_Obj** el;
+	    if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+			&(_x.c), &el) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp);
+	    _x.o = ov[1];
+	
+	/* Size check, assert (length (list) == 2) */
+	if (_x.c != 2) {
+	    Tcl_AppendResult (interp, "Expected a list of 2", NULL);
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	}
+	_x.v = (int*) ((!_x.c) ? 0 : ckalloc (_x.c * sizeof (int)));
+	for (k = 0; k < _x.c; k++) {
+	    if (_critcl_list_int_item (interp, el[k], &(_x.v[k])) != TCL_OK) {
+		ckfree ((char*) _x.v); /* Cleanup partial work */
+		return critcl_trace_cmd_result (TCL_ERROR, interp);
+	    }
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (Release: list_int_2 x) - - -- --- ----- -------- */
+	if (_x.c) { ckfree ((char*) _x.v); }
+    
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/6.2-int_lt_8 b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.2-int_lt_8
new file mode 100644
index 00000000..1a3e6cc6
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.2-int_lt_8
@@ -0,0 +1,36 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int < 8 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+	/* Range check, assert (x < 8) */
+	if (!(_x < 8)) {
+	    Tcl_AppendResult (interp, "expected int < 8, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/6.3-int_lt_8_ge_4 b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.3-int_lt_8_ge_4
new file mode 100644
index 00000000..fa1259dd
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.3-int_lt_8_ge_4
@@ -0,0 +1,41 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int >= 4 < 8 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+	/* Range check, assert (x >= 4) */
+	if (!(_x >= 4)) {
+	    Tcl_AppendResult (interp, "expected int >= 4 < 8, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	}
+	/* Range check, assert (x < 8) */
+	if (!(_x < 8)) {
+	    Tcl_AppendResult (interp, "expected int >= 4 < 8, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/6.4-int_gt_2_ge_4 b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.4-int_gt_2_ge_4
new file mode 100644
index 00000000..9fddf371
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.4-int_gt_2_ge_4
@@ -0,0 +1,36 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int >= 4 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+	/* Range check, assert (x >= 4) */
+	if (!(_x >= 4)) {
+	    Tcl_AppendResult (interp, "expected int >= 4, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/6.5-int_lt_2_lt_4_lt_6 b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.5-int_lt_2_lt_4_lt_6
new file mode 100644
index 00000000..eb1e13ea
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.5-int_lt_2_lt_4_lt_6
@@ -0,0 +1,36 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int < 2 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+	/* Range check, assert (x < 2) */
+	if (!(_x < 2)) {
+	    Tcl_AppendResult (interp, "expected int < 2, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/6.6-int_lt_2_le_4 b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.6-int_lt_2_le_4
new file mode 100644
index 00000000..eb1e13ea
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.6-int_lt_2_le_4
@@ -0,0 +1,36 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (int < 2 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp); }
+	/* Range check, assert (x < 2) */
+	if (!(_x < 2)) {
+	    Tcl_AppendResult (interp, "expected int < 2, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/6.7-=2= b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.7-=2=
new file mode 100644
index 00000000..fe527e29
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.7-=2=
@@ -0,0 +1,53 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list_obj_2
+#define CRITCL_list_obj_2
+#ifndef CRITCL_list
+#define CRITCL_list
+
+	typedef struct critcl_list {
+	    Tcl_Obj*        o;
+	    Tcl_Obj* const* v;
+	    Tcl_Size        c;
+	} critcl_list;
+    
+#endif /* CRITCL_list _________ */
+
+#endif /* CRITCL_list_obj_2 _________ */
+
+static void c__aproc0(critcl_list x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (list_obj_2 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+		    &(_x.c), (Tcl_Obj***) &(_x.v)) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp);
+	_x.o = ov[1]; }
+	/* Size check, assert (length (list) == 2) */
+	if (_x.c != 2) {
+	    Tcl_AppendResult (interp, "Expected a list of 2", NULL);
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/6.8-==int b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.8-==int
new file mode 100644
index 00000000..0e2ad02f
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.8-==int
@@ -0,0 +1,69 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list_int
+#define CRITCL_list_int
+
+	/* NOTE: Array 'v' is allocated on the heap. The argument
+	// release code is used to free it after the worker
+	// function returned. Depending on type and what is done
+	// by the worker it may have to make copies of the data.
+	*/
+
+	typedef struct critcl_list_int {
+	    Tcl_Obj* o; /* Original list object, for pass-through cases */
+	    Tcl_Size c; /* Element count */
+	    int*  v; /* Allocated array of the elements */
+	} critcl_list_int;
+
+	static int
+	_critcl_list_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+	    	{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+	    return TCL_OK;
+	}
+    
+#endif /* CRITCL_list_int _________ */
+
+static void c__aproc0(critcl_list_int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list_int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (list_int_any x) - - -- --- ----- -------- */
+	{
+	int k;
+	    Tcl_Obj** el;
+	    if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+			&(_x.c), &el) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp);
+	    _x.o = ov[1];
+	
+	_x.v = (int*) ((!_x.c) ? 0 : ckalloc (_x.c * sizeof (int)));
+	for (k = 0; k < _x.c; k++) {
+	    if (_critcl_list_int_item (interp, el[k], &(_x.v[k])) != TCL_OK) {
+		ckfree ((char*) _x.v); /* Cleanup partial work */
+		return critcl_trace_cmd_result (TCL_ERROR, interp);
+	    }
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (Release: list_int_any x) - - -- --- ----- -------- */
+	if (_x.c) { ckfree ((char*) _x.v); }
+    
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/6.9-=2=int b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.9-=2=int
new file mode 100644
index 00000000..b4e13af9
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/6.9-=2=int
@@ -0,0 +1,74 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list_int
+#define CRITCL_list_int
+
+	/* NOTE: Array 'v' is allocated on the heap. The argument
+	// release code is used to free it after the worker
+	// function returned. Depending on type and what is done
+	// by the worker it may have to make copies of the data.
+	*/
+
+	typedef struct critcl_list_int {
+	    Tcl_Obj* o; /* Original list object, for pass-through cases */
+	    Tcl_Size c; /* Element count */
+	    int*  v; /* Allocated array of the elements */
+	} critcl_list_int;
+
+	static int
+	_critcl_list_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+	    	{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+	    return TCL_OK;
+	}
+    
+#endif /* CRITCL_list_int _________ */
+
+static void c__aproc0(critcl_list_int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list_int _x;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (list_int_2 x) - - -- --- ----- -------- */
+	{
+	int k;
+	    Tcl_Obj** el;
+	    if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+			&(_x.c), &el) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp);
+	    _x.o = ov[1];
+	
+	/* Size check, assert (length (list) == 2) */
+	if (_x.c != 2) {
+	    Tcl_AppendResult (interp, "Expected a list of 2", NULL);
+	    return critcl_trace_cmd_result (TCL_ERROR, interp);
+	}
+	_x.v = (int*) ((!_x.c) ? 0 : ckalloc (_x.c * sizeof (int)));
+	for (k = 0; k < _x.c; k++) {
+	    if (_critcl_list_int_item (interp, el[k], &(_x.v[k])) != TCL_OK) {
+		ckfree ((char*) _x.v); /* Cleanup partial work */
+		return critcl_trace_cmd_result (TCL_ERROR, interp);
+	    }
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (Release: list_int_2 x) - - -- --- ----- -------- */
+	if (_x.c) { ckfree ((char*) _x.v); }
+    
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc-trace/7.0 b/src/vfs/critcl.vfs/test/assets/cproc-trace/7.0
new file mode 100644
index 00000000..59790cc6
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc-trace/7.0
@@ -0,0 +1,69 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list_int
+#define CRITCL_list_int
+
+	/* NOTE: Array 'v' is allocated on the heap. The argument
+	// release code is used to free it after the worker
+	// function returned. Depending on type and what is done
+	// by the worker it may have to make copies of the data.
+	*/
+
+	typedef struct critcl_list_int {
+	    Tcl_Obj* o; /* Original list object, for pass-through cases */
+	    Tcl_Size c; /* Element count */
+	    int*  v; /* Allocated array of the elements */
+	} critcl_list_int;
+
+	static int
+	_critcl_list_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+	    	{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+	    return TCL_OK;
+	}
+    
+#endif /* CRITCL_list_int _________ */
+
+static void c__aproc0(critcl_list_int a)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list_int _a;
+
+  critcl_trace_cmd_args (ns__aproc0, oc, ov);
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "a");
+    return critcl_trace_cmd_result (TCL_ERROR, interp);
+  }
+
+  /* (list_int_any a) - - -- --- ----- -------- */
+	{
+	int k;
+	    Tcl_Obj** el;
+	    if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+			&(_a.c), &el) != TCL_OK) return critcl_trace_cmd_result (TCL_ERROR, interp);
+	    _a.o = ov[1];
+	
+	_a.v = (int*) ((!_a.c) ? 0 : ckalloc (_a.c * sizeof (int)));
+	for (k = 0; k < _a.c; k++) {
+	    if (_critcl_list_int_item (interp, el[k], &(_a.v[k])) != TCL_OK) {
+		ckfree ((char*) _a.v); /* Cleanup partial work */
+		return critcl_trace_cmd_result (TCL_ERROR, interp);
+	    }
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_a);
+
+  /* (Release: list_int_any a) - - -- --- ----- -------- */
+	if (_a.c) { ckfree ((char*) _a.v); }
+    
+  /* (void return) - - -- --- ----- -------- */
+	return critcl_trace_cmd_result (TCL_OK, interp);
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.0 b/src/vfs/critcl.vfs/test/assets/cproc/2.0
new file mode 100644
index 00000000..450a60de
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.0
@@ -0,0 +1,23 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0()
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0();
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.1 b/src/vfs/critcl.vfs/test/assets/cproc/2.1
new file mode 100644
index 00000000..5008aecd
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.1
@@ -0,0 +1,23 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__the_aproc0 "::the::aproc"
+static void c__the_aproc0()
+{
+
+}
+
+static int
+tcl__the_aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__the_aproc0();
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.10 b/src/vfs/critcl.vfs/test/assets/cproc/2.10
new file mode 100644
index 00000000..b0c5e777
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.10
@@ -0,0 +1,57 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int has_x, int x, int y, int z)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _has_x = 0;
+  int _x;
+  int _y;
+  int _z;
+  int idx_;
+  int argc_;
+
+  if ((oc < 3) || (4 < oc)) {
+    Tcl_WrongNumArgs(interp, 1, ov, "?x? y z");
+    return TCL_ERROR;
+  }
+
+  idx_  = 1;
+  argc_ = oc - 1;
+
+  /* (int x, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 2) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_x) != TCL_OK) return TCL_ERROR; }
+    idx_++;
+    argc_--;
+    _has_x = 1;
+  } else {
+    _x = -1;
+  }
+
+
+  /* (int y) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_y) != TCL_OK) return TCL_ERROR; }
+
+  idx_++;
+  argc_--;
+
+
+  /* (int z) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_z) != TCL_OK) return TCL_ERROR; }
+
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_has_x, _x, _y, _z);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.11 b/src/vfs/critcl.vfs/test/assets/cproc/2.11
new file mode 100644
index 00000000..69dd018c
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.11
@@ -0,0 +1,51 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x, int y, int has_z, int z)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+  int _y;
+  int _has_z = 0;
+  int _z;
+  int idx_;
+  int argc_;
+
+  if ((oc < 3) || (4 < oc)) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x y ?z?");
+    return TCL_ERROR;
+  }
+
+  /* (int x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+
+
+  /* (int y) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[2], &_y) != TCL_OK) return TCL_ERROR; }
+
+
+  idx_  = 3;
+  argc_ = oc - 3;
+
+  /* (int z, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 0) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_z) != TCL_OK) return TCL_ERROR; }
+    _has_z = 1;
+  } else {
+    _z = -1;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x, _y, _has_z, _z);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.12 b/src/vfs/critcl.vfs/test/assets/cproc/2.12
new file mode 100644
index 00000000..b2cf4ca8
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.12
@@ -0,0 +1,54 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x, int has_y, int y, int z)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+  int _has_y = 0;
+  int _y;
+  int _z;
+  int idx_;
+  int argc_;
+
+  if ((oc < 3) || (4 < oc)) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x ?y? z");
+    return TCL_ERROR;
+  }
+
+  /* (int x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+
+
+  idx_  = 2;
+  argc_ = oc - 2;
+
+  /* (int y, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 1) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_y) != TCL_OK) return TCL_ERROR; }
+    idx_++;
+    argc_--;
+    _has_y = 1;
+  } else {
+    _y = -1;
+  }
+
+
+  /* (int z) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_z) != TCL_OK) return TCL_ERROR; }
+
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x, _has_y, _y, _z);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.13 b/src/vfs/critcl.vfs/test/assets/cproc/2.13
new file mode 100644
index 00000000..11002abf
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.13
@@ -0,0 +1,59 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_int
+#define CRITCL_variadic_int
+
+	    /* NOTE: Array 'v' is allocated on the heap. The argument
+	    // release code is used to free it after the worker
+	    // function returned. Depending on type and what is done
+	    // by the worker it may have to make copies of the data.
+	    */
+
+	    typedef struct critcl_variadic_int {
+		Tcl_Obj** o; /* Original object array */
+		int       c; /* Element count */
+		int*   v; /* Allocated array of the elements */
+	    } critcl_variadic_int;
+
+	    static int
+	    _critcl_variadic_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+			{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+		return TCL_OK;
+	    }
+	
+#endif /* CRITCL_variadic_int _________ */
+
+static void c__aproc0(critcl_variadic_int args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_variadic_int _args;
+  /* (int args, ...) - - -- --- ----- -------- */
+	{
+	int src, dst, leftovers = (oc-1);
+	    _args.c = leftovers;
+	    _args.v = (int*) ((!leftovers) ? 0 : ckalloc (leftovers * sizeof (int)));
+	    _args.o = (Tcl_Obj**) &ov[1];
+	    for (src = 1, dst = 0; leftovers > 0; dst++, src++, leftovers--) {
+	       if (_critcl_variadic_int_item (interp, ov[src], &(_args.v[dst])) != TCL_OK) {
+		   ckfree ((char*) _args.v); /* Cleanup partial work */
+		   return TCL_ERROR;
+	       }
+	    } }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_args);
+
+  /* (Release: int args, ...) - - -- --- ----- -------- */
+	    if (_args.c) { ckfree ((char*) _args.v); }
+	
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.14 b/src/vfs/critcl.vfs/test/assets/cproc/2.14
new file mode 100644
index 00000000..cd774177
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.14
@@ -0,0 +1,34 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_object
+#define CRITCL_variadic_object
+
+	typedef struct critcl_variadic_object {
+	    int             c;
+	    Tcl_Obj* const* v;
+	} critcl_variadic_object;
+    
+#endif /* CRITCL_variadic_object _________ */
+
+static void c__aproc0(critcl_variadic_object args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_variadic_object _args;
+  /* (object args, ...) - - -- --- ----- -------- */
+	{
+	_args.c = (oc-1);
+	_args.v = &ov[1]; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_args);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.15 b/src/vfs/critcl.vfs/test/assets/cproc/2.15
new file mode 100644
index 00000000..bca5def4
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.15
@@ -0,0 +1,77 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_int
+#define CRITCL_variadic_int
+
+	    /* NOTE: Array 'v' is allocated on the heap. The argument
+	    // release code is used to free it after the worker
+	    // function returned. Depending on type and what is done
+	    // by the worker it may have to make copies of the data.
+	    */
+
+	    typedef struct critcl_variadic_int {
+		Tcl_Obj** o; /* Original object array */
+		int       c; /* Element count */
+		int*   v; /* Allocated array of the elements */
+	    } critcl_variadic_int;
+
+	    static int
+	    _critcl_variadic_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+			{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+		return TCL_OK;
+	    }
+	
+#endif /* CRITCL_variadic_int _________ */
+
+static void c__aproc0(int x, int y, critcl_variadic_int args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+  int _y;
+  critcl_variadic_int _args;
+
+  if (oc < 3) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x y ?args...?");
+    return TCL_ERROR;
+  }
+
+  /* (int x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+
+
+  /* (int y) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[2], &_y) != TCL_OK) return TCL_ERROR; }
+
+
+  /* (int args, ...) - - -- --- ----- -------- */
+	{
+	int src, dst, leftovers = (oc-3);
+	    _args.c = leftovers;
+	    _args.v = (int*) ((!leftovers) ? 0 : ckalloc (leftovers * sizeof (int)));
+	    _args.o = (Tcl_Obj**) &ov[3];
+	    for (src = 3, dst = 0; leftovers > 0; dst++, src++, leftovers--) {
+	       if (_critcl_variadic_int_item (interp, ov[src], &(_args.v[dst])) != TCL_OK) {
+		   ckfree ((char*) _args.v); /* Cleanup partial work */
+		   return TCL_ERROR;
+	       }
+	    } }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x, _y, _args);
+
+  /* (Release: int args, ...) - - -- --- ----- -------- */
+	    if (_args.c) { ckfree ((char*) _args.v); }
+	
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.16 b/src/vfs/critcl.vfs/test/assets/cproc/2.16
new file mode 100644
index 00000000..06cbbf62
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.16
@@ -0,0 +1,92 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_int
+#define CRITCL_variadic_int
+
+	    /* NOTE: Array 'v' is allocated on the heap. The argument
+	    // release code is used to free it after the worker
+	    // function returned. Depending on type and what is done
+	    // by the worker it may have to make copies of the data.
+	    */
+
+	    typedef struct critcl_variadic_int {
+		Tcl_Obj** o; /* Original object array */
+		int       c; /* Element count */
+		int*   v; /* Allocated array of the elements */
+	    } critcl_variadic_int;
+
+	    static int
+	    _critcl_variadic_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+			{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+		return TCL_OK;
+	    }
+	
+#endif /* CRITCL_variadic_int _________ */
+
+static void c__aproc0(int has_x, int x, int has_y, int y, critcl_variadic_int args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _has_x = 0;
+  int _x;
+  int _has_y = 0;
+  int _y;
+  critcl_variadic_int _args;
+  int idx_;
+  int argc_;
+  idx_  = 1;
+  argc_ = oc - 1;
+
+  /* (int x, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 1) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_x) != TCL_OK) return TCL_ERROR; }
+    idx_++;
+    argc_--;
+    _has_x = 1;
+  } else {
+    _x = -1;
+  }
+
+
+  /* (int y, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 1) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_y) != TCL_OK) return TCL_ERROR; }
+    idx_++;
+    argc_--;
+    _has_y = 1;
+  } else {
+    _y = -1;
+  }
+
+
+  /* (int args, ...) - - -- --- ----- -------- */
+	{
+	int src, dst, leftovers = argc_;
+	    _args.c = leftovers;
+	    _args.v = (int*) ((!leftovers) ? 0 : ckalloc (leftovers * sizeof (int)));
+	    _args.o = (Tcl_Obj**) &ov[idx_];
+	    for (src = idx_, dst = 0; leftovers > 0; dst++, src++, leftovers--) {
+	       if (_critcl_variadic_int_item (interp, ov[src], &(_args.v[dst])) != TCL_OK) {
+		   ckfree ((char*) _args.v); /* Cleanup partial work */
+		   return TCL_ERROR;
+	       }
+	    } }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_has_x, _x, _has_y, _y, _args);
+
+  /* (Release: int args, ...) - - -- --- ----- -------- */
+	    if (_args.c) { ckfree ((char*) _args.v); }
+	
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.17 b/src/vfs/critcl.vfs/test/assets/cproc/2.17
new file mode 100644
index 00000000..2a1bc289
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.17
@@ -0,0 +1,90 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_int
+#define CRITCL_variadic_int
+
+	    /* NOTE: Array 'v' is allocated on the heap. The argument
+	    // release code is used to free it after the worker
+	    // function returned. Depending on type and what is done
+	    // by the worker it may have to make copies of the data.
+	    */
+
+	    typedef struct critcl_variadic_int {
+		Tcl_Obj** o; /* Original object array */
+		int       c; /* Element count */
+		int*   v; /* Allocated array of the elements */
+	    } critcl_variadic_int;
+
+	    static int
+	    _critcl_variadic_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+			{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+		return TCL_OK;
+	    }
+	
+#endif /* CRITCL_variadic_int _________ */
+
+static void c__aproc0(int x, int has_y, int y, critcl_variadic_int args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+  int _has_y = 0;
+  int _y;
+  critcl_variadic_int _args;
+  int idx_;
+  int argc_;
+
+  if (oc < 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x ?y? ?args...?");
+    return TCL_ERROR;
+  }
+
+  /* (int x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+
+
+  idx_  = 2;
+  argc_ = oc - 2;
+
+  /* (int y, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 1) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_y) != TCL_OK) return TCL_ERROR; }
+    idx_++;
+    argc_--;
+    _has_y = 1;
+  } else {
+    _y = -1;
+  }
+
+
+  /* (int args, ...) - - -- --- ----- -------- */
+	{
+	int src, dst, leftovers = argc_;
+	    _args.c = leftovers;
+	    _args.v = (int*) ((!leftovers) ? 0 : ckalloc (leftovers * sizeof (int)));
+	    _args.o = (Tcl_Obj**) &ov[idx_];
+	    for (src = idx_, dst = 0; leftovers > 0; dst++, src++, leftovers--) {
+	       if (_critcl_variadic_int_item (interp, ov[src], &(_args.v[dst])) != TCL_OK) {
+		   ckfree ((char*) _args.v); /* Cleanup partial work */
+		   return TCL_ERROR;
+	       }
+	    } }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x, _has_y, _y, _args);
+
+  /* (Release: int args, ...) - - -- --- ----- -------- */
+	    if (_args.c) { ckfree ((char*) _args.v); }
+	
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.18 b/src/vfs/critcl.vfs/test/assets/cproc/2.18
new file mode 100644
index 00000000..244352ec
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.18
@@ -0,0 +1,93 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_int
+#define CRITCL_variadic_int
+
+	    /* NOTE: Array 'v' is allocated on the heap. The argument
+	    // release code is used to free it after the worker
+	    // function returned. Depending on type and what is done
+	    // by the worker it may have to make copies of the data.
+	    */
+
+	    typedef struct critcl_variadic_int {
+		Tcl_Obj** o; /* Original object array */
+		int       c; /* Element count */
+		int*   v; /* Allocated array of the elements */
+	    } critcl_variadic_int;
+
+	    static int
+	    _critcl_variadic_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+			{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+		return TCL_OK;
+	    }
+	
+#endif /* CRITCL_variadic_int _________ */
+
+static void c__aproc0(int has_x, int x, int y, critcl_variadic_int args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _has_x = 0;
+  int _x;
+  int _y;
+  critcl_variadic_int _args;
+  int idx_;
+  int argc_;
+
+  if (oc < 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "?x? y ?args...?");
+    return TCL_ERROR;
+  }
+
+  idx_  = 1;
+  argc_ = oc - 1;
+
+  /* (int x, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 2) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_x) != TCL_OK) return TCL_ERROR; }
+    idx_++;
+    argc_--;
+    _has_x = 1;
+  } else {
+    _x = -1;
+  }
+
+
+  /* (int y) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_y) != TCL_OK) return TCL_ERROR; }
+
+  idx_++;
+  argc_--;
+
+
+  /* (int args, ...) - - -- --- ----- -------- */
+	{
+	int src, dst, leftovers = argc_;
+	    _args.c = leftovers;
+	    _args.v = (int*) ((!leftovers) ? 0 : ckalloc (leftovers * sizeof (int)));
+	    _args.o = (Tcl_Obj**) &ov[idx_];
+	    for (src = idx_, dst = 0; leftovers > 0; dst++, src++, leftovers--) {
+	       if (_critcl_variadic_int_item (interp, ov[src], &(_args.v[dst])) != TCL_OK) {
+		   ckfree ((char*) _args.v); /* Cleanup partial work */
+		   return TCL_ERROR;
+	       }
+	    } }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_has_x, _x, _y, _args);
+
+  /* (Release: int args, ...) - - -- --- ----- -------- */
+	    if (_args.c) { ckfree ((char*) _args.v); }
+	
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.2 b/src/vfs/critcl.vfs/test/assets/cproc/2.2
new file mode 100644
index 00000000..197ca330
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.2
@@ -0,0 +1,23 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc_beta0 "::aproc+beta"
+static void c__aproc_beta0()
+{
+
+}
+
+static int
+tcl__aproc_beta0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc_beta0();
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.3 b/src/vfs/critcl.vfs/test/assets/cproc/2.3
new file mode 100644
index 00000000..68defb12
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.3
@@ -0,0 +1,22 @@
+/* ---------------------------------------------------------------------- */
+
+static void c_snafu()
+{
+
+}
+
+static int
+snafu(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c_snafu();
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.4 b/src/vfs/critcl.vfs/test/assets/cproc/2.4
new file mode 100644
index 00000000..d909b478
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.4
@@ -0,0 +1,23 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(ClientData clientdata)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(cd);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.5 b/src/vfs/critcl.vfs/test/assets/cproc/2.5
new file mode 100644
index 00000000..02f0f49b
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.5
@@ -0,0 +1,23 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0()
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  if (oc != 4) {
+    Tcl_WrongNumArgs(interp, 4, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0();
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.6 b/src/vfs/critcl.vfs/test/assets/cproc/2.6
new file mode 100644
index 00000000..13c61ae9
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.6
@@ -0,0 +1,28 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int anargument)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _anargument;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "anargument");
+    return TCL_ERROR;
+  }
+
+  /* (int anargument) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_anargument) != TCL_OK) return TCL_ERROR; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_anargument);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.7 b/src/vfs/critcl.vfs/test/assets/cproc/2.7
new file mode 100644
index 00000000..efdb5ab9
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.7
@@ -0,0 +1,39 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int has_anargument, int anargument)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _has_anargument = 0;
+  int _anargument;
+  int idx_;
+  int argc_;
+
+  if ((oc < 1) || (2 < oc)) {
+    Tcl_WrongNumArgs(interp, 1, ov, "?anargument?");
+    return TCL_ERROR;
+  }
+
+  idx_  = 1;
+  argc_ = oc - 1;
+
+  /* (int anargument, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 0) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_anargument) != TCL_OK) return TCL_ERROR; }
+    _has_anargument = 1;
+  } else {
+    _anargument = -1;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_has_anargument, _anargument);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.8 b/src/vfs/critcl.vfs/test/assets/cproc/2.8
new file mode 100644
index 00000000..b3f644ca
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.8
@@ -0,0 +1,62 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int has_x, int x, int y, int has_z, int z)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _has_x = 0;
+  int _x;
+  int _y;
+  int _has_z = 0;
+  int _z;
+  int idx_;
+  int argc_;
+
+  if ((oc < 2) || (4 < oc)) {
+    Tcl_WrongNumArgs(interp, 1, ov, "?x? y ?z?");
+    return TCL_ERROR;
+  }
+
+  idx_  = 1;
+  argc_ = oc - 1;
+
+  /* (int x, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 1) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_x) != TCL_OK) return TCL_ERROR; }
+    idx_++;
+    argc_--;
+    _has_x = 1;
+  } else {
+    _x = -1;
+  }
+
+
+  /* (int y) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_y) != TCL_OK) return TCL_ERROR; }
+
+  idx_++;
+  argc_--;
+
+
+  /* (int z, optional, default -1) - - -- --- ----- -------- */
+  if (argc_ > 0) {
+	{
+	if (Tcl_GetIntFromObj(interp, ov[idx_], &_z) != TCL_OK) return TCL_ERROR; }
+    _has_z = 1;
+  } else {
+    _z = -1;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_has_x, _x, _y, _has_z, _z);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/2.9 b/src/vfs/critcl.vfs/test/assets/cproc/2.9
new file mode 100644
index 00000000..cd0db2ff
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/2.9
@@ -0,0 +1,24 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static int c__aproc0()
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (int return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.0 b/src/vfs/critcl.vfs/test/assets/cproc/3.0
new file mode 100644
index 00000000..450a60de
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.0
@@ -0,0 +1,23 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0()
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0();
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.1 b/src/vfs/critcl.vfs/test/assets/cproc/3.1
new file mode 100644
index 00000000..931b5ecf
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.1
@@ -0,0 +1,23 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static int c__aproc0()
+{
+return TCL_OK;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (ok return) - - -- --- ----- -------- */
+	return rv;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.10 b/src/vfs/critcl.vfs/test/assets/cproc/3.10
new file mode 100644
index 00000000..e450477e
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.10
@@ -0,0 +1,24 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static char* c__aproc0()
+{
+return alloc_string("bar");
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  char* rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (dstring return) - - -- --- ----- -------- */
+	Tcl_SetResult (interp, rv, TCL_DYNAMIC);
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.11 b/src/vfs/critcl.vfs/test/assets/cproc/3.11
new file mode 100644
index 00000000..57f122e4
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.11
@@ -0,0 +1,26 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static Tcl_Obj* c__aproc0()
+{
+return Tcl_NewIntObj(0);
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Obj* rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (object return) - - -- --- ----- -------- */
+	if (rv == NULL) { return TCL_ERROR; }
+	Tcl_SetObjResult(interp, rv);
+	Tcl_DecrRefCount(rv);
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.12 b/src/vfs/critcl.vfs/test/assets/cproc/3.12
new file mode 100644
index 00000000..f34279ce
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.12
@@ -0,0 +1,26 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static Tcl_Channel c__aproc0()
+{
+return Tcl_OpenFileChannel (interp, "/tmp", "r", 0);
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Channel rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (new-channel return) - - -- --- ----- -------- */
+	if (rv == NULL) { return TCL_ERROR; }
+	Tcl_RegisterChannel (interp, rv);
+	Tcl_SetObjResult (interp, Tcl_NewStringObj (Tcl_GetChannelName (rv), -1));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.13 b/src/vfs/critcl.vfs/test/assets/cproc/3.13
new file mode 100644
index 00000000..4ddb6e46
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.13
@@ -0,0 +1,25 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static Tcl_Channel c__aproc0()
+{
+return Tcl_GetStdChannel (0);
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Channel rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (known-channel return) - - -- --- ----- -------- */
+	if (rv == NULL) { return TCL_ERROR; }
+	Tcl_SetObjResult (interp, Tcl_NewStringObj (Tcl_GetChannelName (rv), -1));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.14 b/src/vfs/critcl.vfs/test/assets/cproc/3.14
new file mode 100644
index 00000000..b208d516
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.14
@@ -0,0 +1,27 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static Tcl_Channel c__aproc0()
+{
+return 0;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Channel rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (return-channel return) - - -- --- ----- -------- */
+	if (rv == NULL) { return TCL_ERROR; }
+	Tcl_RegisterChannel (interp, rv);
+	Tcl_UnregisterChannel(NULL, rv);
+	Tcl_SetObjResult (interp, Tcl_NewStringObj (Tcl_GetChannelName (rv), -1));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.2 b/src/vfs/critcl.vfs/test/assets/cproc/3.2
new file mode 100644
index 00000000..b1d51444
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.2
@@ -0,0 +1,24 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static int c__aproc0()
+{
+return 0;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (int return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.3 b/src/vfs/critcl.vfs/test/assets/cproc/3.3
new file mode 100644
index 00000000..aefbefd9
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.3
@@ -0,0 +1,24 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static int c__aproc0()
+{
+return 1;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (bool return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.4 b/src/vfs/critcl.vfs/test/assets/cproc/3.4
new file mode 100644
index 00000000..683fba95
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.4
@@ -0,0 +1,24 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static int c__aproc0()
+{
+return 1;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (boolean return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.5 b/src/vfs/critcl.vfs/test/assets/cproc/3.5
new file mode 100644
index 00000000..7c09887f
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.5
@@ -0,0 +1,24 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static long c__aproc0()
+{
+return 1;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  long rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (long return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewLongObj(rv));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.6 b/src/vfs/critcl.vfs/test/assets/cproc/3.6
new file mode 100644
index 00000000..18870d7e
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.6
@@ -0,0 +1,24 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static Tcl_WideInt c__aproc0()
+{
+return 1;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_WideInt rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (wideint return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(rv));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.7 b/src/vfs/critcl.vfs/test/assets/cproc/3.7
new file mode 100644
index 00000000..8d195a4e
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.7
@@ -0,0 +1,24 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static double c__aproc0()
+{
+return 0.;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  double rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (double return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewDoubleObj(rv));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.8 b/src/vfs/critcl.vfs/test/assets/cproc/3.8
new file mode 100644
index 00000000..53df6d74
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.8
@@ -0,0 +1,24 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static float c__aproc0()
+{
+return 0.;
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  float rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (float return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewDoubleObj(rv));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/3.9 b/src/vfs/critcl.vfs/test/assets/cproc/3.9
new file mode 100644
index 00000000..a30750f8
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/3.9
@@ -0,0 +1,24 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static char* c__aproc0()
+{
+return "foo";
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  char* rv;
+  if (oc != 1) {
+    Tcl_WrongNumArgs(interp, 1, ov, NULL);
+    return TCL_ERROR;
+  }
+
+  /* Call - - -- --- ----- -------- */
+  rv = c__aproc0();
+
+  /* (vstring return) - - -- --- ----- -------- */
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(rv, -1));
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.0-int b/src/vfs/critcl.vfs/test/assets/cproc/4.0-int
new file mode 100644
index 00000000..59c5c18a
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.0-int
@@ -0,0 +1,28 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (int x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.1-bool b/src/vfs/critcl.vfs/test/assets/cproc/4.1-bool
new file mode 100644
index 00000000..52b3782a
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.1-bool
@@ -0,0 +1,28 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (bool x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetBooleanFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.10-object b/src/vfs/critcl.vfs/test/assets/cproc/4.10-object
new file mode 100644
index 00000000..9f48f57a
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.10-object
@@ -0,0 +1,28 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(Tcl_Obj* x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Obj* _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (object x) - - -- --- ----- -------- */
+	{
+	_x = ov[1]; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.12-bytes b/src/vfs/critcl.vfs/test/assets/cproc/4.12-bytes
new file mode 100644
index 00000000..7345802e
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.12-bytes
@@ -0,0 +1,42 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_bytes
+#define CRITCL_bytes
+
+	typedef struct critcl_bytes {
+	    Tcl_Obj*             o;
+	    const unsigned char* s;
+	    Tcl_Size             len;
+	} critcl_bytes;
+    
+#endif /* CRITCL_bytes _________ */
+
+static void c__aproc0(critcl_bytes x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_bytes _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (bytes x) - - -- --- ----- -------- */
+	{
+	/* Raw binary string _with_ length information */
+	_x.s = Tcl_GetBytesFromObj(interp, ov[1], &(_x.len));
+	if (_x.s == NULL) return TCL_ERROR;
+	_x.o = ov[1]; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.13-channel b/src/vfs/critcl.vfs/test/assets/cproc/4.13-channel
new file mode 100644
index 00000000..48291f59
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.13-channel
@@ -0,0 +1,30 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(Tcl_Channel x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Channel _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (channel x) - - -- --- ----- -------- */
+	{
+	int mode;
+	_x = Tcl_GetChannel(interp, Tcl_GetString (ov[1]), &mode);
+	if (_x == NULL) return TCL_ERROR; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.14-unshared-channel b/src/vfs/critcl.vfs/test/assets/cproc/4.14-unshared-channel
new file mode 100644
index 00000000..d3ad2179
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.14-unshared-channel
@@ -0,0 +1,34 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(Tcl_Channel x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Channel _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (unshared-channel x) - - -- --- ----- -------- */
+	{
+	int mode;
+	_x = Tcl_GetChannel(interp, Tcl_GetString (ov[1]), &mode);
+	if (_x == NULL) return TCL_ERROR;
+	if (Tcl_IsChannelShared (_x)) {
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("channel is shared", -1));
+	    return TCL_ERROR;
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.15-take-channel b/src/vfs/critcl.vfs/test/assets/cproc/4.15-take-channel
new file mode 100644
index 00000000..b27de153
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.15-take-channel
@@ -0,0 +1,57 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(Tcl_Channel x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_Channel _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (take-channel x) - - -- --- ----- -------- */
+	{
+	int mode;
+	_x = Tcl_GetChannel(interp, Tcl_GetString (ov[1]), &mode);
+	if (_x == NULL) return TCL_ERROR;
+	if (Tcl_IsChannelShared (_x)) {
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("channel is shared", -1));
+	    return TCL_ERROR;
+	}
+	{
+	    /* Disable event processing for the channel, both by
+	     * removing any registered handler, and forcing interest
+	     * to none. This also disables the processing of pending
+	     * events which are ready to fire for the given
+	     * channel. If we do not do this, events will hit the
+	     * detached channel and potentially wreck havoc on our
+	     * memory and eventually badly hurt us...
+	     */
+	    Tcl_DriverWatchProc *watchProc;
+	    Tcl_ClearChannelHandlers(_x);
+	    watchProc = Tcl_ChannelWatchProc(Tcl_GetChannelType(_x));
+	    if (watchProc) {
+		(*watchProc)(Tcl_GetChannelInstanceData(_x), 0);
+	    }
+	    /* Next some fiddling with the reference count to prevent
+	     * the unregistration from killing it. We basically record
+	     * it as globally known before removing it from the
+	     * current interpreter
+	     */
+	    Tcl_RegisterChannel((Tcl_Interp *) NULL, _x);
+	    Tcl_UnregisterChannel(interp, _x);
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.16-vobject b/src/vfs/critcl.vfs/test/assets/cproc/4.16-vobject
new file mode 100644
index 00000000..cd774177
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.16-vobject
@@ -0,0 +1,34 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_object
+#define CRITCL_variadic_object
+
+	typedef struct critcl_variadic_object {
+	    int             c;
+	    Tcl_Obj* const* v;
+	} critcl_variadic_object;
+    
+#endif /* CRITCL_variadic_object _________ */
+
+static void c__aproc0(critcl_variadic_object args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_variadic_object _args;
+  /* (object args, ...) - - -- --- ----- -------- */
+	{
+	_args.c = (oc-1);
+	_args.v = &ov[1]; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_args);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.17-vint b/src/vfs/critcl.vfs/test/assets/cproc/4.17-vint
new file mode 100644
index 00000000..11002abf
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.17-vint
@@ -0,0 +1,59 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+
+#ifndef CRITCL_variadic_int
+#define CRITCL_variadic_int
+
+	    /* NOTE: Array 'v' is allocated on the heap. The argument
+	    // release code is used to free it after the worker
+	    // function returned. Depending on type and what is done
+	    // by the worker it may have to make copies of the data.
+	    */
+
+	    typedef struct critcl_variadic_int {
+		Tcl_Obj** o; /* Original object array */
+		int       c; /* Element count */
+		int*   v; /* Allocated array of the elements */
+	    } critcl_variadic_int;
+
+	    static int
+	    _critcl_variadic_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+			{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+		return TCL_OK;
+	    }
+	
+#endif /* CRITCL_variadic_int _________ */
+
+static void c__aproc0(critcl_variadic_int args)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_variadic_int _args;
+  /* (int args, ...) - - -- --- ----- -------- */
+	{
+	int src, dst, leftovers = (oc-1);
+	    _args.c = leftovers;
+	    _args.v = (int*) ((!leftovers) ? 0 : ckalloc (leftovers * sizeof (int)));
+	    _args.o = (Tcl_Obj**) &ov[1];
+	    for (src = 1, dst = 0; leftovers > 0; dst++, src++, leftovers--) {
+	       if (_critcl_variadic_int_item (interp, ov[src], &(_args.v[dst])) != TCL_OK) {
+		   ckfree ((char*) _args.v); /* Cleanup partial work */
+		   return TCL_ERROR;
+	       }
+	    } }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_args);
+
+  /* (Release: int args, ...) - - -- --- ----- -------- */
+	    if (_args.c) { ckfree ((char*) _args.v); }
+	
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.2-long b/src/vfs/critcl.vfs/test/assets/cproc/4.2-long
new file mode 100644
index 00000000..f843876e
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.2-long
@@ -0,0 +1,28 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(long x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  long _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (long x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetLongFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.3-wideint b/src/vfs/critcl.vfs/test/assets/cproc/4.3-wideint
new file mode 100644
index 00000000..8e2ccaef
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.3-wideint
@@ -0,0 +1,28 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(Tcl_WideInt x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  Tcl_WideInt _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (wideint x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetWideIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.4-double b/src/vfs/critcl.vfs/test/assets/cproc/4.4-double
new file mode 100644
index 00000000..bba66692
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.4-double
@@ -0,0 +1,28 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(double x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  double _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (double x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetDoubleFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.5-float b/src/vfs/critcl.vfs/test/assets/cproc/4.5-float
new file mode 100644
index 00000000..cad74f80
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.5-float
@@ -0,0 +1,30 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(float x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  float _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (float x) - - -- --- ----- -------- */
+	{
+	double t;
+	if (Tcl_GetDoubleFromObj(interp, ov[1], &t) != TCL_OK) return TCL_ERROR;
+	_x = (float) t; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.6-int_gt_0 b/src/vfs/critcl.vfs/test/assets/cproc/4.6-int_gt_0
new file mode 100644
index 00000000..8d3b970b
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.6-int_gt_0
@@ -0,0 +1,34 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (int > 0 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+	/* Range check, assert (x > 0) */
+	if (!(_x > 0)) {
+	    Tcl_AppendResult (interp, "expected int > 0, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return TCL_ERROR;
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.7-char_ b/src/vfs/critcl.vfs/test/assets/cproc/4.7-char_
new file mode 100644
index 00000000..e920757f
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.7-char_
@@ -0,0 +1,28 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(const char* x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  const char* _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (char* x) - - -- --- ----- -------- */
+	{
+	_x = Tcl_GetString(ov[1]); }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.8-pstring b/src/vfs/critcl.vfs/test/assets/cproc/4.8-pstring
new file mode 100644
index 00000000..6b3cd324
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.8-pstring
@@ -0,0 +1,40 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_pstring
+#define CRITCL_pstring
+
+	typedef struct critcl_pstring {
+	    Tcl_Obj*    o;
+	    const char* s;
+	    Tcl_Size    len;
+	} critcl_pstring;
+    
+#endif /* CRITCL_pstring _________ */
+
+static void c__aproc0(critcl_pstring x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_pstring _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (pstring x) - - -- --- ----- -------- */
+	{
+	_x.s = Tcl_GetStringFromObj(ov[1], &(_x.len));
+	_x.o = ov[1]; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/4.9-list b/src/vfs/critcl.vfs/test/assets/cproc/4.9-list
new file mode 100644
index 00000000..64fd346d
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/4.9-list
@@ -0,0 +1,41 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list
+#define CRITCL_list
+
+	typedef struct critcl_list {
+	    Tcl_Obj*        o;
+	    Tcl_Obj* const* v;
+	    Tcl_Size        c;
+	} critcl_list;
+    
+#endif /* CRITCL_list _________ */
+
+static void c__aproc0(critcl_list x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (list x) - - -- --- ----- -------- */
+	{
+	if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+		    &(_x.c), (Tcl_Obj***) &(_x.v)) != TCL_OK) return TCL_ERROR;
+	_x.o = ov[1]; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/5.x b/src/vfs/critcl.vfs/test/assets/cproc/5.x
new file mode 100644
index 00000000..5801d4d5
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/5.x
@@ -0,0 +1,34 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x, int y)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+  int _y;
+
+  if (oc != 3) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x y");
+    return TCL_ERROR;
+  }
+
+  /* (int x) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+
+
+  /* (int y) - - -- --- ----- -------- */
+	{
+	if (Tcl_GetIntFromObj(interp, ov[2], &_y) != TCL_OK) return TCL_ERROR; }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x, _y);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/6.0-int_gt_4 b/src/vfs/critcl.vfs/test/assets/cproc/6.0-int_gt_4
new file mode 100644
index 00000000..7843641f
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/6.0-int_gt_4
@@ -0,0 +1,34 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (int > 4 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+	/* Range check, assert (x > 4) */
+	if (!(_x > 4)) {
+	    Tcl_AppendResult (interp, "expected int > 4, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return TCL_ERROR;
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/6.1-int_gt_4_le_8 b/src/vfs/critcl.vfs/test/assets/cproc/6.1-int_gt_4_le_8
new file mode 100644
index 00000000..99a8c431
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/6.1-int_gt_4_le_8
@@ -0,0 +1,39 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (int > 4 <= 8 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+	/* Range check, assert (x > 4) */
+	if (!(_x > 4)) {
+	    Tcl_AppendResult (interp, "expected int > 4 <= 8, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return TCL_ERROR;
+	}
+	/* Range check, assert (x <= 8) */
+	if (!(_x <= 8)) {
+	    Tcl_AppendResult (interp, "expected int > 4 <= 8, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return TCL_ERROR;
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/6.10-int== b/src/vfs/critcl.vfs/test/assets/cproc/6.10-int==
new file mode 100644
index 00000000..c83e1510
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/6.10-int==
@@ -0,0 +1,67 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list_int
+#define CRITCL_list_int
+
+	/* NOTE: Array 'v' is allocated on the heap. The argument
+	// release code is used to free it after the worker
+	// function returned. Depending on type and what is done
+	// by the worker it may have to make copies of the data.
+	*/
+
+	typedef struct critcl_list_int {
+	    Tcl_Obj* o; /* Original list object, for pass-through cases */
+	    Tcl_Size c; /* Element count */
+	    int*  v; /* Allocated array of the elements */
+	} critcl_list_int;
+
+	static int
+	_critcl_list_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+	    	{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+	    return TCL_OK;
+	}
+    
+#endif /* CRITCL_list_int _________ */
+
+static void c__aproc0(critcl_list_int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list_int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (list_int_any x) - - -- --- ----- -------- */
+	{
+	int k;
+	    Tcl_Obj** el;
+	    if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+			&(_x.c), &el) != TCL_OK) return TCL_ERROR;
+	    _x.o = ov[1];
+	
+	_x.v = (int*) ((!_x.c) ? 0 : ckalloc (_x.c * sizeof (int)));
+	for (k = 0; k < _x.c; k++) {
+	    if (_critcl_list_int_item (interp, el[k], &(_x.v[k])) != TCL_OK) {
+		ckfree ((char*) _x.v); /* Cleanup partial work */
+		return TCL_ERROR;
+	    }
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (Release: list_int_any x) - - -- --- ----- -------- */
+	if (_x.c) { ckfree ((char*) _x.v); }
+    
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/6.11-int=2= b/src/vfs/critcl.vfs/test/assets/cproc/6.11-int=2=
new file mode 100644
index 00000000..93fc9768
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/6.11-int=2=
@@ -0,0 +1,72 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list_int
+#define CRITCL_list_int
+
+	/* NOTE: Array 'v' is allocated on the heap. The argument
+	// release code is used to free it after the worker
+	// function returned. Depending on type and what is done
+	// by the worker it may have to make copies of the data.
+	*/
+
+	typedef struct critcl_list_int {
+	    Tcl_Obj* o; /* Original list object, for pass-through cases */
+	    Tcl_Size c; /* Element count */
+	    int*  v; /* Allocated array of the elements */
+	} critcl_list_int;
+
+	static int
+	_critcl_list_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+	    	{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+	    return TCL_OK;
+	}
+    
+#endif /* CRITCL_list_int _________ */
+
+static void c__aproc0(critcl_list_int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list_int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (list_int_2 x) - - -- --- ----- -------- */
+	{
+	int k;
+	    Tcl_Obj** el;
+	    if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+			&(_x.c), &el) != TCL_OK) return TCL_ERROR;
+	    _x.o = ov[1];
+	
+	/* Size check, assert (length (list) == 2) */
+	if (_x.c != 2) {
+	    Tcl_AppendResult (interp, "Expected a list of 2", NULL);
+	    return TCL_ERROR;
+	}
+	_x.v = (int*) ((!_x.c) ? 0 : ckalloc (_x.c * sizeof (int)));
+	for (k = 0; k < _x.c; k++) {
+	    if (_critcl_list_int_item (interp, el[k], &(_x.v[k])) != TCL_OK) {
+		ckfree ((char*) _x.v); /* Cleanup partial work */
+		return TCL_ERROR;
+	    }
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (Release: list_int_2 x) - - -- --- ----- -------- */
+	if (_x.c) { ckfree ((char*) _x.v); }
+    
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/6.2-int_lt_8 b/src/vfs/critcl.vfs/test/assets/cproc/6.2-int_lt_8
new file mode 100644
index 00000000..918d611d
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/6.2-int_lt_8
@@ -0,0 +1,34 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (int < 8 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+	/* Range check, assert (x < 8) */
+	if (!(_x < 8)) {
+	    Tcl_AppendResult (interp, "expected int < 8, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return TCL_ERROR;
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/6.3-int_lt_8_ge_4 b/src/vfs/critcl.vfs/test/assets/cproc/6.3-int_lt_8_ge_4
new file mode 100644
index 00000000..d68a9636
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/6.3-int_lt_8_ge_4
@@ -0,0 +1,39 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (int >= 4 < 8 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+	/* Range check, assert (x >= 4) */
+	if (!(_x >= 4)) {
+	    Tcl_AppendResult (interp, "expected int >= 4 < 8, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return TCL_ERROR;
+	}
+	/* Range check, assert (x < 8) */
+	if (!(_x < 8)) {
+	    Tcl_AppendResult (interp, "expected int >= 4 < 8, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return TCL_ERROR;
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/6.4-int_gt_2_ge_4 b/src/vfs/critcl.vfs/test/assets/cproc/6.4-int_gt_2_ge_4
new file mode 100644
index 00000000..f2b267f5
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/6.4-int_gt_2_ge_4
@@ -0,0 +1,34 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (int >= 4 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+	/* Range check, assert (x >= 4) */
+	if (!(_x >= 4)) {
+	    Tcl_AppendResult (interp, "expected int >= 4, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return TCL_ERROR;
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/6.5-int_lt_2_lt_4_lt_6 b/src/vfs/critcl.vfs/test/assets/cproc/6.5-int_lt_2_lt_4_lt_6
new file mode 100644
index 00000000..0ffb820e
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/6.5-int_lt_2_lt_4_lt_6
@@ -0,0 +1,34 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (int < 2 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+	/* Range check, assert (x < 2) */
+	if (!(_x < 2)) {
+	    Tcl_AppendResult (interp, "expected int < 2, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return TCL_ERROR;
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/6.6-int_lt_2_le_4 b/src/vfs/critcl.vfs/test/assets/cproc/6.6-int_lt_2_le_4
new file mode 100644
index 00000000..0ffb820e
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/6.6-int_lt_2_le_4
@@ -0,0 +1,34 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+static void c__aproc0(int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (int < 2 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_GetIntFromObj(interp, ov[1], &_x) != TCL_OK) return TCL_ERROR; }
+	/* Range check, assert (x < 2) */
+	if (!(_x < 2)) {
+	    Tcl_AppendResult (interp, "expected int < 2, but got \"", Tcl_GetString (ov[1]), "\"", NULL);
+	    return TCL_ERROR;
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/6.7-=2= b/src/vfs/critcl.vfs/test/assets/cproc/6.7-=2=
new file mode 100644
index 00000000..8e018cdd
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/6.7-=2=
@@ -0,0 +1,51 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list_obj_2
+#define CRITCL_list_obj_2
+#ifndef CRITCL_list
+#define CRITCL_list
+
+	typedef struct critcl_list {
+	    Tcl_Obj*        o;
+	    Tcl_Obj* const* v;
+	    Tcl_Size        c;
+	} critcl_list;
+    
+#endif /* CRITCL_list _________ */
+
+#endif /* CRITCL_list_obj_2 _________ */
+
+static void c__aproc0(critcl_list x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (list_obj_2 x) - - -- --- ----- -------- */
+	{
+	{
+	if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+		    &(_x.c), (Tcl_Obj***) &(_x.v)) != TCL_OK) return TCL_ERROR;
+	_x.o = ov[1]; }
+	/* Size check, assert (length (list) == 2) */
+	if (_x.c != 2) {
+	    Tcl_AppendResult (interp, "Expected a list of 2", NULL);
+	    return TCL_ERROR;
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/6.8-==int b/src/vfs/critcl.vfs/test/assets/cproc/6.8-==int
new file mode 100644
index 00000000..c83e1510
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/6.8-==int
@@ -0,0 +1,67 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list_int
+#define CRITCL_list_int
+
+	/* NOTE: Array 'v' is allocated on the heap. The argument
+	// release code is used to free it after the worker
+	// function returned. Depending on type and what is done
+	// by the worker it may have to make copies of the data.
+	*/
+
+	typedef struct critcl_list_int {
+	    Tcl_Obj* o; /* Original list object, for pass-through cases */
+	    Tcl_Size c; /* Element count */
+	    int*  v; /* Allocated array of the elements */
+	} critcl_list_int;
+
+	static int
+	_critcl_list_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+	    	{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+	    return TCL_OK;
+	}
+    
+#endif /* CRITCL_list_int _________ */
+
+static void c__aproc0(critcl_list_int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list_int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (list_int_any x) - - -- --- ----- -------- */
+	{
+	int k;
+	    Tcl_Obj** el;
+	    if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+			&(_x.c), &el) != TCL_OK) return TCL_ERROR;
+	    _x.o = ov[1];
+	
+	_x.v = (int*) ((!_x.c) ? 0 : ckalloc (_x.c * sizeof (int)));
+	for (k = 0; k < _x.c; k++) {
+	    if (_critcl_list_int_item (interp, el[k], &(_x.v[k])) != TCL_OK) {
+		ckfree ((char*) _x.v); /* Cleanup partial work */
+		return TCL_ERROR;
+	    }
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (Release: list_int_any x) - - -- --- ----- -------- */
+	if (_x.c) { ckfree ((char*) _x.v); }
+    
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/6.9-=2=int b/src/vfs/critcl.vfs/test/assets/cproc/6.9-=2=int
new file mode 100644
index 00000000..93fc9768
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/6.9-=2=int
@@ -0,0 +1,72 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list_int
+#define CRITCL_list_int
+
+	/* NOTE: Array 'v' is allocated on the heap. The argument
+	// release code is used to free it after the worker
+	// function returned. Depending on type and what is done
+	// by the worker it may have to make copies of the data.
+	*/
+
+	typedef struct critcl_list_int {
+	    Tcl_Obj* o; /* Original list object, for pass-through cases */
+	    Tcl_Size c; /* Element count */
+	    int*  v; /* Allocated array of the elements */
+	} critcl_list_int;
+
+	static int
+	_critcl_list_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+	    	{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+	    return TCL_OK;
+	}
+    
+#endif /* CRITCL_list_int _________ */
+
+static void c__aproc0(critcl_list_int x)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list_int _x;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "x");
+    return TCL_ERROR;
+  }
+
+  /* (list_int_2 x) - - -- --- ----- -------- */
+	{
+	int k;
+	    Tcl_Obj** el;
+	    if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+			&(_x.c), &el) != TCL_OK) return TCL_ERROR;
+	    _x.o = ov[1];
+	
+	/* Size check, assert (length (list) == 2) */
+	if (_x.c != 2) {
+	    Tcl_AppendResult (interp, "Expected a list of 2", NULL);
+	    return TCL_ERROR;
+	}
+	_x.v = (int*) ((!_x.c) ? 0 : ckalloc (_x.c * sizeof (int)));
+	for (k = 0; k < _x.c; k++) {
+	    if (_critcl_list_int_item (interp, el[k], &(_x.v[k])) != TCL_OK) {
+		ckfree ((char*) _x.v); /* Cleanup partial work */
+		return TCL_ERROR;
+	    }
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_x);
+
+  /* (Release: list_int_2 x) - - -- --- ----- -------- */
+	if (_x.c) { ckfree ((char*) _x.v); }
+    
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/cproc/7.0 b/src/vfs/critcl.vfs/test/assets/cproc/7.0
new file mode 100644
index 00000000..b46f8b35
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/cproc/7.0
@@ -0,0 +1,67 @@
+/* ---------------------------------------------------------------------- */
+
+#define ns__aproc0 "::aproc"
+#ifndef CRITCL_list_int
+#define CRITCL_list_int
+
+	/* NOTE: Array 'v' is allocated on the heap. The argument
+	// release code is used to free it after the worker
+	// function returned. Depending on type and what is done
+	// by the worker it may have to make copies of the data.
+	*/
+
+	typedef struct critcl_list_int {
+	    Tcl_Obj* o; /* Original list object, for pass-through cases */
+	    Tcl_Size c; /* Element count */
+	    int*  v; /* Allocated array of the elements */
+	} critcl_list_int;
+
+	static int
+	_critcl_list_int_item (Tcl_Interp* interp, Tcl_Obj* src, int* dst) {
+	    	{
+	if (Tcl_GetIntFromObj(interp, src, dst) != TCL_OK) return TCL_ERROR; }
+	    return TCL_OK;
+	}
+    
+#endif /* CRITCL_list_int _________ */
+
+static void c__aproc0(critcl_list_int a)
+{
+
+}
+
+static int
+tcl__aproc0(ClientData cd, Tcl_Interp *interp, Tcl_Size oc, Tcl_Obj *CONST ov[])
+{
+  critcl_list_int _a;
+
+  if (oc != 2) {
+    Tcl_WrongNumArgs(interp, 1, ov, "a");
+    return TCL_ERROR;
+  }
+
+  /* (list_int_any a) - - -- --- ----- -------- */
+	{
+	int k;
+	    Tcl_Obj** el;
+	    if (Tcl_ListObjGetElements (interp, ov[1], /* OK tcl9 */
+			&(_a.c), &el) != TCL_OK) return TCL_ERROR;
+	    _a.o = ov[1];
+	
+	_a.v = (int*) ((!_a.c) ? 0 : ckalloc (_a.c * sizeof (int)));
+	for (k = 0; k < _a.c; k++) {
+	    if (_critcl_list_int_item (interp, el[k], &(_a.v[k])) != TCL_OK) {
+		ckfree ((char*) _a.v); /* Cleanup partial work */
+		return TCL_ERROR;
+	    }
+	} }
+
+  /* Call - - -- --- ----- -------- */
+  c__aproc0(_a);
+
+  /* (Release: list_int_any a) - - -- --- ----- -------- */
+	if (_a.c) { ckfree ((char*) _a.v); }
+    
+  /* (void return) - - -- --- ----- -------- */
+	return TCL_OK;
+}
diff --git a/src/vfs/critcl.vfs/test/assets/def-2.0 b/src/vfs/critcl.vfs/test/assets/def-2.0
new file mode 100644
index 00000000..03aefe72
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/def-2.0
@@ -0,0 +1,2 @@
+
+#define foo 333
diff --git a/src/vfs/critcl.vfs/test/assets/undef-2.0 b/src/vfs/critcl.vfs/test/assets/undef-2.0
new file mode 100644
index 00000000..7053c3ed
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/assets/undef-2.0
@@ -0,0 +1,2 @@
+
+#undef foo
diff --git a/src/vfs/critcl.vfs/test/attic/basic.tcl b/src/vfs/critcl.vfs/test/attic/basic.tcl
new file mode 100644
index 00000000..3e6f4ff6
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/attic/basic.tcl
@@ -0,0 +1,12 @@
+package require critcl 3.2
+
+critcl::cproc add {int x int y} int {
+    return x + y;
+}
+
+critcl::cproc cube {int x} int {
+    return x * x * x;
+}
+
+puts stderr "add 1 + 2 = [add 1 2]"
+puts stderr "cube 2 = [cube 2]"
diff --git a/src/vfs/critcl.vfs/test/attic/basic.tst b/src/vfs/critcl.vfs/test/attic/basic.tst
new file mode 100644
index 00000000..5da405a5
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/attic/basic.tst
@@ -0,0 +1,7 @@
+package require tcltest
+namespace import tcltest::*
+
+test basic "Basic compile + go" -body {
+    puts stderr "exec = [info nameofexecutable]"
+    puts stderr "prog = $starkit::topdir"
+}
diff --git a/src/vfs/critcl.vfs/test/attic/c++direct-1.tcl b/src/vfs/critcl.vfs/test/attic/c++direct-1.tcl
new file mode 100644
index 00000000..e75b4c9d
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/attic/c++direct-1.tcl
@@ -0,0 +1,70 @@
+package require critcl 3.2
+
+critcl::config language c++
+critcl::clibraries -lstdc++
+
+namespace eval testing {
+    critcl::ccode {
+	class Counter {
+	    public:
+		Counter(int startValue=0);
+		Counter operator++();
+		void set( int newValue);
+		void reset();
+		int value() const;
+	    private:
+		int count;
+		int resetValue;
+	};
+
+	Counter::Counter(int startValue) : count(startValue),
+			resetValue(startValue) {}
+	Counter Counter::operator++() {
+	    count++;
+	}
+
+	void Counter::set(int newValue) {
+	    count=newValue;
+	}
+
+	void Counter::reset() {
+	    count=resetValue;
+	}
+
+	int Counter::value() const {
+	    return count;
+	}
+    }
+
+    critcl::c++command counter Counter { {} {int start_value} } {
+	void set {int new_value}
+	void reset {}
+        void {incr operator++} {}
+	int value {}
+    }
+
+}
+
+if 1 {
+	testing::counter p 10
+	puts "Initial Counter:  [p value]"
+	p incr
+	p incr
+	p incr
+	puts "Counter after 3 increments: [p value]"
+	p set 20
+	puts "Counter after set to 20: [p value]"
+	p reset
+	puts "Counter after reset: [p value]"
+
+	testing::counter d
+	puts "Initial Counter:  [d value]"
+	d incr
+	d incr
+	d incr
+	puts "Counter after 3 increments: [d value]"
+	d set 20
+	puts "Counter after set to 20: [d value]"
+	d reset
+	puts "Counter after reset: [d value]"
+}
diff --git a/src/vfs/critcl.vfs/test/attic/c++direct-2.tcl b/src/vfs/critcl.vfs/test/attic/c++direct-2.tcl
new file mode 100644
index 00000000..6de83745
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/attic/c++direct-2.tcl
@@ -0,0 +1,29 @@
+package require critcl 3.2
+
+critcl::config language c++
+critcl::clibraries -lstdc++
+
+critcl::ccode {
+    class A {
+	int val;
+    public:
+	A() : val (123) {}
+	int value() const { return val; }
+        operator int() { return val; }
+        int operator |(int o) { return val|o; }
+        int operator &(int o) { return val&o; }
+    };
+}
+
+critcl::c++command tst A {} {
+    int value {}
+    int {int {operator int}} {}
+    int {or {operator |}} {int}
+    int {and {operator &}} {int}
+}
+
+tst A
+puts "tst = [A value]"
+puts "tst = [A int]"
+puts "tst = [A or 0xf]"
+puts "tst = [A and 0xf]"
diff --git a/src/vfs/critcl.vfs/test/attic/c++indirect.tcl b/src/vfs/critcl.vfs/test/attic/c++indirect.tcl
new file mode 100644
index 00000000..4135b90b
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/attic/c++indirect.tcl
@@ -0,0 +1,20 @@
+package require critcl 3.2
+
+critcl::config language c++
+critcl::clibraries -lstdc++
+
+critcl::ccode {
+    class A {
+      int value;
+    public:
+      A() : value (123) {}
+      operator int() const { return value; }
+    };
+}
+
+critcl::cproc tryplus {} int {
+	A var;
+	return var;
+}
+
+puts "tryplus = [tryplus]"
diff --git a/src/vfs/critcl.vfs/test/attic/fbasic.tcl b/src/vfs/critcl.vfs/test/attic/fbasic.tcl
new file mode 100644
index 00000000..209d8720
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/attic/fbasic.tcl
@@ -0,0 +1 @@
+# Basic test for Critclf
diff --git a/src/vfs/critcl.vfs/test/bitmap.test b/src/vfs/critcl.vfs/test/bitmap.test
new file mode 100644
index 00000000..6c1f2667
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/bitmap.test
@@ -0,0 +1,69 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# bitmap.test
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+    useLocal lib/stubs_reader/reader.tcl       stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl   stubs::gen
+    useLocal lib/critcl/critcl.tcl             critcl
+    useLocal lib/critcl-iassoc/iassoc.tcl      critcl::iassoc
+
+    localcache-setup
+}
+testing {
+    useLocal lib/critcl-bitmap/bitmap.tcl critcl::bitmap
+}
+
+# -------------------------------------------------------------------------
+##
+
+test bitmap-mode-tcl-1.0 {critcl-bitmap} -setup {
+    make-demo TL {
+        critcl::bitmap::def demo {
+            global 1
+            exact  2
+            filler 4
+        }
+
+        critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* flags} int {
+            int mask;
+            demo_encode (ip, flags, &mask);
+            return mask;
+        }
+        critcl::cproc decode {Tcl_Interp* ip int mask} object {
+            Tcl_Obj* res = demo_decode (ip, mask);
+            Tcl_IncrRefCount (res);
+            return res;
+        }
+        # Encode hidden in the argtype.
+        critcl::cproc xencode {Tcl_Interp* ip demo flags} int {
+            return flags;
+        }
+        # Decode hidden in the resultype
+        critcl::cproc xdecode {Tcl_Interp* ip int mask} demo {
+            return mask;
+        }
+    }
+} -body {
+    res!
+    res+ [encode {exact filler}]
+    res+ [lsort -dict [decode 5]]
+    res+ [xencode global]
+    res+ [lsort -dict [xdecode 6]]
+    res?
+} -result {6 {{filler global}} 1 {{exact filler}}}
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/cache.test b/src/vfs/critcl.vfs/test/cache.test
new file mode 100644
index 00000000..86d3f9c0
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/cache.test
@@ -0,0 +1,67 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# cache.test
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+    useLocal lib/stubs_reader/reader.tcl       stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl   stubs::gen
+
+    # Helper procedures
+    useLocalFile test/support/crit_utils.tcl
+}
+testing {
+    useLocal lib/critcl/critcl.tcl critcl
+}
+
+overrides
+
+# -------------------------------------------------------------------------
+## cache syntax
+
+test critcl-cache-1.0.7 {cache, wrong\#args, too many} -constraints tcl9 -body {
+    critcl::cache C X
+} -returnCodes error -result {wrong # args: should be "critcl::cache ?dir?"}
+
+test critcl-cache-1.0.6 {cache, wrong\#args, too many} -constraints tcl8.6plus -body {
+    critcl::cache C X
+} -returnCodes error -result {wrong # args: should be "critcl::cache ?dir?"}
+
+test critcl-cache-1.0.5 {cache, wrong\#args, too many} -constraints tcl8.5 -body {
+    critcl::cache C X
+} -returnCodes error -result {wrong # args: should be "critcl::cache ?dir?"}
+
+test critcl-cache-1.0.4 {cache, wrong\#args, too many} -constraints tcl8.4 -body {
+    critcl::cache C X
+} -returnCodes error -result {wrong # args: should be "critcl::cache ?dir?"}
+
+# -------------------------------------------------------------------------
+##
+
+test critcl-cache-2.0 {cache, default, home directory} -body {
+    # Note file join below is to not fail because of \ vs / separators
+    critcl::cache
+} -match glob -result [file dirname [file normalize [file join $::env(HOME) .critcl * _dummy_]]]
+
+test critcl-cache-2.1 {cache, redirecting cache} -setup {
+    set here [critcl::cache]
+} -body {
+    critcl::cache $env(HOME)/FOO
+} -cleanup {
+    critcl::cache $here
+    unset here
+} -match glob -result [file dirname [file normalize [file join $::env(HOME) FOO _dummy_]]]
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/callback.test b/src/vfs/critcl.vfs/test/callback.test
new file mode 100644
index 00000000..48ce1760
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/callback.test
@@ -0,0 +1,85 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# critcl_callback.test
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl  stubs::container
+    useLocal lib/stubs_reader/reader.tcl        stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl    stubs::gen
+
+    useLocal lib/critcl/critcl.tcl critcl
+}
+
+# -------------------------------------------------------------------------
+## The critcl::callback package provides only stubs.
+## To test this we create some basic commands linking the functions
+## into the Tcl level.
+
+testing {
+    # Must be installed
+    package require critcl::callback
+
+    puts *\t[join [info loaded] \n*\t]
+    puts -\t[critcl::This]
+    puts -\t[file dirname [file dirname [info library]]]/include/*
+    puts -\t[file dirname [file dirname [info nameofexecutable]]]/include/*
+
+    # Access to the stubs include files
+    critcl::cheaders [file dirname [file dirname [info library]]]/include/*
+    critcl::cheaders [file dirname [file dirname [info nameofexecutable]]]/include/*
+
+    critcl::api import critcl::callback 1
+
+    critcl::ccode {
+        static critcl_callback_p cb = 0;
+    }
+
+    critcl::cproc cb-make {Tcl_Interp* interp Tcl_Obj* args} void {
+        cb = critcl_callback_new (interp, args.c, args.v, 2);
+        critcl_callback_extend (cb, Tcl_NewStringObj("xyz", -1));
+    }
+
+    critcl::cproc cb-call {Tcl_Obj* value} void {
+        critcl_callback_invoke (cb, 1, &value);
+    }
+
+    critcl::cproc cb-done {} void {
+        critcl_callback_destroy (cb);
+    }
+
+    puts -\tLoaded=[critcl::load]
+    puts *\t[join [info loaded] \n*\t]
+}
+
+# -------------------------------------------------------------------------
+## 
+
+test critcl-callback-1.0.0 {callback} -setup {
+    proc ::record {args} { lappend ::trace $args }
+    cb-make record
+} -cleanup {
+    cb-done
+    unset ::trace
+} -body {
+    cb-call 1
+    cb-call a
+    cb-call 22
+    cb-call bbb
+    set ::trace
+} -result {{xyz 1} {xyz a} {xyz 22} {xyz bbb}}
+
+# -------------------------------------------------------------------------
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/ccommand-trace.test b/src/vfs/critcl.vfs/test/ccommand-trace.test
new file mode 100644
index 00000000..54122cd7
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/ccommand-trace.test
@@ -0,0 +1,19 @@
+# critcl::ccommand -- Testing with trace code.
+# -------------------------------------------------------------------------
+# Setup
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+useLocalFile test/support/crit_utils.tcl
+
+# -------------------------------------------------------------------------
+
+trace-do ccommand
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/ccommand.test b/src/vfs/critcl.vfs/test/ccommand.test
new file mode 100644
index 00000000..da400611
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/ccommand.test
@@ -0,0 +1,19 @@
+# critcl::ccommand -- Regular tests
+# -------------------------------------------------------------------------
+# Setup
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+useLocalFile test/support/crit_utils.tcl
+
+# -------------------------------------------------------------------------
+
+do ccommand
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/cconst-trace.test b/src/vfs/critcl.vfs/test/cconst-trace.test
new file mode 100644
index 00000000..5d89fdf7
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/cconst-trace.test
@@ -0,0 +1,19 @@
+# critcl::cconst -- Testing with trace code.
+# -------------------------------------------------------------------------
+# Setup
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+useLocalFile test/support/crit_utils.tcl
+
+# -------------------------------------------------------------------------
+
+trace-do cconst
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/cconst.test b/src/vfs/critcl.vfs/test/cconst.test
new file mode 100644
index 00000000..81e18f89
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/cconst.test
@@ -0,0 +1,19 @@
+# critcl::cconst -- Regular tests
+# -------------------------------------------------------------------------
+# Setup
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+useLocalFile test/support/crit_utils.tcl
+
+# -------------------------------------------------------------------------
+
+do cconst
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/cdata-trace.test b/src/vfs/critcl.vfs/test/cdata-trace.test
new file mode 100644
index 00000000..385a88e8
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/cdata-trace.test
@@ -0,0 +1,19 @@
+# critcl::cdata -- Testing with trace code.
+# -------------------------------------------------------------------------
+# Setup
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+useLocalFile test/support/crit_utils.tcl
+
+# -------------------------------------------------------------------------
+
+trace-do cdata
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/cdata.test b/src/vfs/critcl.vfs/test/cdata.test
new file mode 100644
index 00000000..dd9570ca
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/cdata.test
@@ -0,0 +1,19 @@
+# critcl::cdata -- Regular tests
+# -------------------------------------------------------------------------
+# Setup
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+useLocalFile test/support/crit_utils.tcl
+
+# -------------------------------------------------------------------------
+
+do cdata
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/class.test b/src/vfs/critcl.vfs/test/class.test
new file mode 100644
index 00000000..e9864dfe
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/class.test
@@ -0,0 +1,390 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# class.test
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+    useLocal lib/stubs_reader/reader.tcl       stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl   stubs::gen
+    useLocal lib/critcl/critcl.tcl             critcl
+    useLocal lib/critcl-util/util.tcl          critcl::util
+    #useLocal lib/critcl-iassoc/iassoc.tcl      critcl::iassoc
+    #useLocal lib/critcl-literals/literals.tcl  critcl::literals
+
+    localcache-setup
+}
+testing {
+    useLocal lib/critcl-class/class.tcl critcl::class
+}
+
+proc SETUP {} {
+    make-demo TL {
+	critcl::class::define ::queuec {
+	    constructor {
+		if (objc > 0) {
+		    Tcl_AppendResult (interp, "wrong#args for constructor, expected none", NULL);
+		    goto error;
+		}
+	    }
+
+	    method_introspection
+
+	    # # ## ### ##### ######## ############# #####################
+	    insvariable Tcl_Obj* unget {
+		List object holding unget'ted elements.
+	    } {
+		instance->unget  = Tcl_NewListObj (0,NULL);
+		Tcl_IncrRefCount (instance->unget);
+	    } {
+		Tcl_DecrRefCount (instance->unget);
+	    }
+
+	    # # ## ### ##### ######## ############# #####################
+	    insvariable Tcl_Obj* queue {
+		List object holding the main queue.
+	    } {
+		instance->queue  = Tcl_NewListObj (0,NULL);
+		Tcl_IncrRefCount (instance->queue);
+	    } {
+		Tcl_DecrRefCount (instance->queue);
+	    }
+
+	    # # ## ### ##### ######## ############# #####################
+	    insvariable Tcl_Obj* append {
+		List object holding new elements
+	    } {
+		instance->append = Tcl_NewListObj (0,NULL);
+		Tcl_IncrRefCount (instance->append);
+	    } {
+		Tcl_DecrRefCount (instance->append);
+	    }
+
+	    # # ## ### ##### ######## ############# #####################
+	    insvariable Tcl_Size at {
+		Index of next element to return from the main queue.
+		(variable: queue).
+	    } {
+		instance->at = 0;
+	    } ; # no need for a destructor
+
+	    # # ## ### ##### ######## ############# #####################
+	    method clear proc {} void {
+		/*
+		* Delete and recreate the queue memory. A combination of delete/new,
+		* except the main structure is left unchanged
+		*/
+
+		Tcl_DecrRefCount (instance->unget);
+		Tcl_DecrRefCount (instance->queue);
+		Tcl_DecrRefCount (instance->append);
+
+		instance->at     = 0;
+		instance->unget  = Tcl_NewListObj (0,NULL);
+		instance->queue  = Tcl_NewListObj (0,NULL);
+		instance->append = Tcl_NewListObj (0,NULL);
+
+		Tcl_IncrRefCount (instance->unget);
+		Tcl_IncrRefCount (instance->queue);
+		Tcl_IncrRefCount (instance->append);
+	    }
+
+	    # # ## ### ##### ######## ############# #####################
+	    method get  as QueueRetrieve 1
+	    method peek as QueueRetrieve 0
+
+	    # # ## ### ##### ######## ############# #####################
+	    method put command {
+		item... = objv[2]...
+	    } {
+		Tcl_Size i;
+
+		if (objc < 3) {
+		    Tcl_WrongNumArgs (interp, 2, objv, "item ?item ...?");
+		    return TCL_ERROR;
+		}
+
+		for (i = 2; i < objc; i++) {
+		    Tcl_ListObjAppendElement (interp, instance->append, objv[i]);
+		}
+
+		return TCL_OK;
+	    }
+
+	    # # ## ### ##### ######## ############# #####################
+	    method size proc {} wideint {
+		return QueueSize (instance, NULL, NULL, NULL);
+	    }
+
+	    # # ## ### ##### ######## ############# #####################
+	    method unget proc {Tcl_Obj* item} ok {
+		if (instance->at == 0) {
+		    /* Need the unget stack */
+		    Tcl_ListObjAppendElement (interp, instance->unget, item);
+		} else {
+		    /*
+		    * We have room in the return buffer, so splice directly instead of
+		    * using the unget stack.
+		    */
+
+		    Tcl_Size queuec = 0;
+		    Tcl_ListObjLength (NULL, instance->queue,  &queuec);
+
+		    instance->at --;
+		    Tcl_ListObjReplace (interp, instance->queue, instance->at, 1, 1, &item);
+		}
+
+		return TCL_OK;
+	    }
+
+	    # # ## ### ##### ######## ############# #####################
+	    support {
+		static Tcl_Size
+		QueueSize (@instancetype@ q, Tcl_Size* u, Tcl_Size* r, Tcl_Size* a)
+		{
+		    Tcl_Size ungetc  = 0;
+		    Tcl_Size queuec  = 0;
+		    Tcl_Size appendc = 0;
+
+		    Tcl_ListObjLength (NULL, q->unget,  &ungetc);
+		    Tcl_ListObjLength (NULL, q->queue,  &queuec);
+		    Tcl_ListObjLength (NULL, q->append, &appendc);
+
+		    if (u) *u = ungetc;
+		    if (r) *r = queuec;
+		    if (a) *a = appendc;
+
+		    return ungetc + queuec + appendc - q->at;
+		}
+
+		static void
+		QueueShift (@instancetype@ q)
+		{
+		    Tcl_Size queuec = 0;
+		    Tcl_Size appendc = 0;
+
+		    /* The queue is not done yet, no shift */
+		    Tcl_ListObjLength (NULL, q->queue, &queuec);
+		    if (q->at < queuec) return;
+
+		    /* The queue is done, however there is nothing
+		    * to shift into it, so we don't
+		    */
+		    Tcl_ListObjLength (NULL, q->append, &appendc);
+		    if (!appendc) return;
+
+		    q->at = 0;
+		    Tcl_DecrRefCount (q->queue);
+		    q->queue  = q->append;
+		    q->append = Tcl_NewListObj (0,NULL);
+		    Tcl_IncrRefCount (q->append);
+		}
+
+		static int
+		QueueRetrieve (@instancetype@  instance,
+			       Tcl_Interp*     interp,
+			       Tcl_Size        objc,
+			       Tcl_Obj* CONST* objv,
+			       int             get)
+		{
+		    /* Syntax: queue peek|get ?n?
+		    *	       [0]  [1]       [2]
+		    */
+
+		    Tcl_Size  listc = 0, n = 1;
+		    Tcl_Obj** listv;
+		    Tcl_Obj*  r;
+		    Tcl_Size  ungetc;
+		    Tcl_Size  queuec;
+		    Tcl_Size  appendc;
+
+		    if ((objc != 2) && (objc != 3)) {
+			Tcl_WrongNumArgs (interp, 2, objv, "?n?");
+			return TCL_ERROR;
+		    }
+
+		    if (objc == 3) {
+			if (Tcl_GetIntFromObj(interp, objv[2], &n) != TCL_OK) {
+			    return TCL_ERROR;
+			} else if (n < 1) {
+			    Tcl_AppendResult (interp, "invalid item count ",
+					      Tcl_GetString (objv[2]),
+					      NULL);
+			    return TCL_ERROR;
+			}
+		    }
+
+		    if (n > QueueSize(instance, &ungetc, &queuec, &appendc)) {
+			Tcl_AppendResult (interp,
+					  "insufficient items in queue to fill request",
+					  NULL);
+			return TCL_ERROR;
+		    }
+
+		    /* 1. We have item on the unget stack
+		    *    a. Enough to satisfy request.
+		    *    b. Not enough.
+		    * 2. We have items in the return buffer.
+		    *    a. Enough to satisfy request.
+		    *    b. Not enough.
+		    * 3. We have items in the append buffer.
+		    *    a. Enough to satisfy request.
+		    *    b. Not enough.
+		    *
+		    * Case 3. can assume 2b, because an empty return buffer will be filled
+		    * from the append buffer before looking at either. Case 3. cannot happen
+		    * for n==1, the return buffer will contain at least one element.
+		    *
+		    * We distinguish between single and multi-element requests.
+		    *
+		    * XXX AK optimizations - If we can return everything from a single
+		    * buffer, be it queue, or append, just return the buffer object, do not
+		    * create something new.
+		    */
+
+		    if (n == 1) {
+			if (ungetc) {
+			    /* Pull from unget stack */
+			    Tcl_ListObjGetElements (interp, instance->unget, &listc, &listv);
+			    r = listv [listc-1];
+			    Tcl_SetObjResult (interp, r);
+			    if (get) {
+				/* XXX AK : Should maintain max size info, and proper index, for discard. */
+				Tcl_ListObjReplace (interp, instance->unget, listc-1, 1, 0, NULL);
+			    }
+			} else {
+			    QueueShift (instance);
+			    Tcl_ListObjGetElements (interp, instance->queue, &listc, &listv);
+			    r = listv [instance->at];
+			    Tcl_SetObjResult (interp, r);
+			    /*
+			    * Note: Doing the SetObj now is important. It increments the
+			    * refcount of 'r', allowing it to survive if the 'QueueShift' below
+			    * kills the internal list (instance->queue) holding it.
+			    */
+			    if (get) {
+				instance->at ++;
+				QueueShift (instance);
+			    }
+			}
+		    } else {
+			/*
+			* Allocate buffer for result, then fill it using the various data
+			* sources.
+			*/
+
+			Tcl_Size i = 0, j;
+			Tcl_Obj** resv = (Tcl_Obj**) ckalloc (n * sizeof (Tcl_Obj*));
+
+			if (ungetc) {
+			    Tcl_ListObjGetElements (interp, instance->unget, &listc, &listv);
+			    /*
+			    * Note how we are iterating backward in listv. unget is managed
+			    * as a stack, avoiding mem-copy operations and both push and pop.
+			    */
+			    for (j = listc-1;
+				 j >= 0 && i < n;
+				 j--, i++) {
+					    resv[i] = listv[j];
+					    Tcl_IncrRefCount (resv[i]);
+					}
+			    if (get) {
+				/* XXX AK : Should maintain max size info, and proper index, for discard. */
+				Tcl_ListObjReplace (interp, instance->unget, j, i, 0, NULL);
+				/* XXX CHECK index calcs. */
+			    }
+			}
+			if (i < n) {
+			    QueueShift (instance);
+			    Tcl_ListObjGetElements (interp, instance->queue, &listc, &listv);
+			    for (j = instance->at;
+				 j < listc && i < n;
+				 j++, i++) {
+					    resv[i] = listv[j];
+					    Tcl_IncrRefCount (resv[i]);
+					}
+
+			    if (get) {
+				instance->at = j;
+				QueueShift (instance);
+			    } else if (i < n) {
+				/* XX */
+				Tcl_ListObjGetElements (interp, instance->append, &listc, &listv);
+				for (j = 0;
+				     j < listc && i < n;
+				     j++, i++) {
+						resv[i] = listv[j];
+						Tcl_IncrRefCount (resv[i]);
+					    }
+			    }
+			}
+
+			/*
+			* This can happen if and only if we have to pull data from append,
+			* and get is set. Without get XX would have run and filled the result
+			* to completion.
+			*/
+
+			if (i < n) {
+			    QueueShift (instance);
+			    Tcl_ListObjGetElements (interp, instance->queue, &listc, &listv);
+			    for (j = instance->at;
+				 j < listc && i < n;
+				 j++, i++) {
+					    resv[i] = listv[j];
+					    Tcl_IncrRefCount (resv[i]);
+					}
+			    instance->at = j;
+			    QueueShift (instance);
+			}
+
+			r = Tcl_NewListObj (n, resv);
+			Tcl_SetObjResult (interp, r);
+
+			for (i=0;i<n;i++) {
+					   Tcl_DecrRefCount (resv[i]);
+				       }
+			ckfree((char*)resv);
+		    }
+
+		    return TCL_OK;
+		}
+	    }
+	}
+    }
+}
+
+# -------------------------------------------------------------------------
+##
+
+test class-1.0 {critcl-class, basic, defaults} -setup {
+    SETUP
+    res!
+} -body {
+    res+ [queuec create Q]
+    res+ [Q size]
+    res+ [Q clear]
+    res+ [Q put a b c]
+    res+ [Q peek 2]
+    res+ [Q get 2]
+    res+ [Q size]
+    res+ [Q clear]
+    res+ [Q size]
+    res+ [Q destroy]
+    res?
+} -cleanup {
+    res!
+} -result {::Q 0 {{}} {{}} {{a b}} {{a b}} 1 {{}} 0 {{}}}
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/cproc-rt.test b/src/vfs/critcl.vfs/test/cproc-rt.test
new file mode 100644
index 00000000..99f669dd
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/cproc-rt.test
@@ -0,0 +1,232 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# cproc-rt.test
+##
+# cproc examples to verify actual execution.
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+    useLocal lib/stubs_reader/reader.tcl       stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl   stubs::gen
+}
+testing {
+    useLocal lib/critcl/critcl.tcl            critcl
+    localcache-setup
+}
+
+# -------------------------------------------------------------------------
+## Basic cproc test
+
+test cproc-rt-1.0 {critcl, cproc, runtime} -setup {
+    make-demo TL {
+        critcl::ccode {
+            static void plus (Tcl_Interp* ip, int x) {
+                int r; char buf [60];
+                sprintf(buf, "::lappend ::result %d", x);
+                r = Tcl_Eval (ip, buf);
+                /* fprintf (stdout, "plus = %d, '%s'\n", r, buf);fflush(stdout); */
+            }
+            #define PLUS plus (ip, a); plus (ip, b); plus (ip, c); plus (ip, d)
+        }
+        critcl::cproc oargs_head   {Tcl_Interp* ip  int {a 1} int {b 2} int c     int d}     void { PLUS; }
+        critcl::cproc oargs_tail   {Tcl_Interp* ip  int a     int b     int {c 1} int {d 2}} void { PLUS; }
+        critcl::cproc oargs_middle {Tcl_Interp* ip  int a     int {b 1} int {c 2} int d}     void { PLUS; }
+    }
+} -body {
+    res!
+    foreach a {
+        {6 7}
+        {6 7 8}
+        {6 7 8 9}
+    } {
+        oargs_head   {*}$a
+        oargs_middle {*}$a
+        oargs_tail   {*}$a
+    }
+    res?
+} -result {1 2 6 7 6 1 2 7 6 7 1 2 6 2 7 8 6 7 2 8 6 7 8 2 6 7 8 9 6 7 8 9 6 7 8 9}
+
+# -------------------------------------------------------------------------
+## Tests over most argument and result types.
+## Ignoring: int*, double*, float* (all deprecated), bytearray (to be deprecated)
+
+set n 0
+foreach {type rtype good goodres body bad errmsg} {
+    int       -             0      -      -                      x     {expected integer but got "x"}
+    {int > 0} int           1      -      -                      0     {expected int > 0, but got "0"}
+    bool      -             true   1      -                      x     {expected boolean value but got "x"}
+    long      -             0      -      -                      x     {expected integer but got "x"}
+    wideint   -             0      -      -                      x     {expected integer but got "x"}
+    double    -             0      0.0    -                      x     {expected floating-point number but got "x"}
+    float     -             0      0.0    -                      x     {expected floating-point number but got "x"}
+    char*     -             x      -      -                      -     n/a
+    pstring   char*         x      -      {return x.s}           -     n/a
+    pstring   object        x      -      {I (x.o); return x.o}  -     n/a
+    bytes     object        \x01   -      {I (x.o); return x.o}  -     n/a
+    list      object        {x y}  -      {I (x.o); return x.o}  {{}a} {list element in braces followed by "a" instead of space}
+    object    -             x      -      {I (x);   return x}    -     n/a
+    pstring   object0       x      -      {return x.o}           -     n/a
+    bytes     object0       \x01   -      {return x.o}           -     n/a
+    list      object0       {x y}  -      {return x.o}           {{}a} {list element in braces followed by "a" instead of space}
+    object    object0       x      -      -                      -     n/a
+    channel   known-channel stdin serial0 -                      x     {can not find channel named "x"}
+} {
+    # Note how the object results have to incr the refcount of the
+    # argument so that the result converter can decr it safely. And
+    # for object0 we must not, as the result converter doesn't decr.
+    #
+    # Bad combinations
+    if 0 {
+        # No string terminator in BA char* return allows random bytes into Tcl result.
+        bytes     char*         \x01   -     -    {return x.s}
+        # rtype `string` considers result dynamic, pstring's field `.s` is really not.
+        pstring   string        x      -     -    {return x.s}
+    }
+
+    if {$goodres eq "-"} { set goodres $good }
+    if {$rtype   eq "-"} { set rtype   $type }
+    if {$body    eq "-"} { set body    {return x} }
+
+    #puts _____________________$type/$rtype/_good/$good/$goodres ; flush stdout
+    test cproc-rt-2.$n.0-$type "critcl, cproc, runtime, $type/$rtype, good input" -setup {
+        #puts ______________________________//setup/$type/$rtype/$body ; flush stdout
+        make-demo TL [string map [list @a $type @r $rtype @b $body] {
+            critcl::ccode {
+                #define I(o) Tcl_IncrRefCount (o)
+                /* #define RC(o) { fprintf (stdout, "RC %p ~ %d\n", o, o->refCount); fflush (stdout); } */
+            }
+            critcl::cproc pass {{@a} x} @r { @b; }
+        }]
+        #puts ______________________________//setup/done/$good/$goodres ; flush stdout
+    } -body {
+        #puts ______________________________//run/$good/$goodres ; flush stdout
+        pass $good
+    } -result $goodres
+    #puts ______________________________//ran/$good/$goodres ; flush stdout
+
+    if {$bad eq "-"} continue
+
+    #puts _____________________$type/_bad/$bad ; flush stdout
+
+    # argument validation, trigger error paths
+    test cproc-rt-2.$n.1-$type "critcl, cproc, runtime, $type, bad input" -setup {
+        #puts ______________________________//setup/$type ; flush stdout
+        make-demo TL [string map [list @a $type @r $rtype @b $body] {
+            critcl::cproc pass {{@a} x} void { }
+        }]
+        #puts ______________________________//setup/done ; flush stdout
+    } -body {
+        #puts ______________________________//run ; flush stdout
+        pass $bad
+    } -returnCodes error -result $errmsg
+
+    incr n
+}
+unset n
+
+# -------------------------------------------------------------------------
+# Special return types: void, ok, new-channel
+
+test cproc-rt-3.0-void "critcl, cproc, runtime, void result" -setup {
+    make-demo TL {
+        critcl::cproc pass {} void { }
+    }
+} -body {
+    pass
+} -result {}
+
+test cproc-rt-3.1.0-ok-pass "critcl, cproc, runtime, ok pass result" -setup {
+    make-demo TL {
+        critcl::cproc pass {} ok { return TCL_OK; }
+    }
+} -body {
+    pass
+} -result {}
+
+test cproc-rt-3.1.1-ok-fail "critcl, cproc, runtime, ok fail result" -setup {
+    make-demo TL {
+        critcl::cproc pass {} ok { return TCL_ERROR; }
+    }
+} -body {
+    pass
+} -returnCodes error -result {}
+
+test cproc-rt-3.2-new-channel "critcl, cproc, runtime, channel result" -setup {
+    make-demo TL {
+        critcl::cproc pass {} new-channel { return Tcl_OpenFileChannel (0, "cproc-new-channel", "a", 0); }
+    }
+} -cleanup {
+    close $c
+    unset c
+    file delete cproc-new-channel
+} -body {
+    set c [pass]
+} -result {file*} -match glob
+
+# -------------------------------------------------------------------------
+# Special argument and return types II: unshared-channel, take-channel, return-channel
+
+test cproc-rt-3.3.0-unshared-channel "critcl, cproc, runtime, unshared channel ok" -setup {
+    make-demo TL {
+        critcl::cproc pass {unshared-channel x} known-channel { return x; }
+    }
+} -cleanup {
+    close $c
+    unset c
+    file delete cproc-new-channel
+} -body {
+    set c [pass [open cproc-new-channel w]]
+} -result {file*} -match glob
+
+test cproc-rt-3.3.1-unshared-channel "critcl, cproc, runtime, unshared channel fail" -setup {
+    make-demo TL {
+        critcl::cproc pass {unshared-channel x} known-channel { return x; }
+    }
+} -body {
+    pass stdin
+} -returnCodes error -result {channel is shared}
+
+test cproc-rt-3.4-take-channel "critcl, cproc, runtime, take & return channel" -setup {
+    make-demo TL {
+        critcl::cproc pass {take-channel x} return-channel { return x; }
+    }
+} -cleanup {
+    close $c
+    unset c
+    file delete cproc-new-channel
+} -body {
+    set c [pass [open cproc-new-channel w]]
+} -result {file*} -match glob
+
+# -------------------------------------------------------------------------
+# Generated argument types: variadics.
+
+test cproc-rt-4.0.0-vint "critcl, cproc, runtime, variadic int, ok" -setup {
+    make-demo TL {
+        critcl::cproc pass {int args} int { return args.c; }
+    }
+} -body {
+    pass 1 2 3 4 5
+} -result 5
+
+test cproc-rt-4.0.1-vint "critcl, cproc, runtime, variadic int, fail" -setup {
+    make-demo TL {
+        critcl::cproc pass {int args} int { return args.c; }
+    }
+} -body {
+    pass 1 2 a 4 5
+} -returnCodes error -result {expected integer but got "a"}
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/cproc-trace.test b/src/vfs/critcl.vfs/test/cproc-trace.test
new file mode 100644
index 00000000..f628b6b2
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/cproc-trace.test
@@ -0,0 +1,19 @@
+# critcl::cproc -- Testing with trace code.
+# -------------------------------------------------------------------------
+# Setup
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+useLocalFile test/support/crit_utils.tcl
+
+# -------------------------------------------------------------------------
+
+trace-do cproc
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/cproc.test b/src/vfs/critcl.vfs/test/cproc.test
new file mode 100644
index 00000000..84da4eab
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/cproc.test
@@ -0,0 +1,19 @@
+# critcl::cproc -- Regular tests
+# -------------------------------------------------------------------------
+# Setup
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+useLocalFile test/support/crit_utils.tcl
+
+# -------------------------------------------------------------------------
+
+do cproc
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/emap.test b/src/vfs/critcl.vfs/test/emap.test
new file mode 100644
index 00000000..0fbe9382
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/emap.test
@@ -0,0 +1,326 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# emap.test
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+    useLocal lib/stubs_reader/reader.tcl       stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl   stubs::gen
+    useLocal lib/critcl/critcl.tcl             critcl
+    useLocal lib/critcl-iassoc/iassoc.tcl      critcl::iassoc
+
+    localcache-setup
+}
+testing {
+    useLocal lib/critcl-emap/emap.tcl critcl::emap
+}
+
+proc exE {args} {
+    list [catch {
+        uplevel 1 $args
+    } msg] [set msg]
+}
+
+# -------------------------------------------------------------------------
+##
+
+test emap-mode-tcl-1.0 {critcl-emap, mode: tcl (default)} -setup {
+    make-demo TL {
+        critcl::ccode {
+            #define STATE_INIT 0
+            #define STATE_MIX  1
+            #define STATE_DONE 2
+        }
+        critcl::emap::def demo {
+            init STATE_INIT
+            mix  STATE_MIX
+            done STATE_DONE
+        }
+        critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* state} int {
+            int scode;
+            if (demo_encode (ip, state, &scode) != TCL_OK) return -1;
+            return scode;
+        }
+        critcl::cproc decode {Tcl_Interp* ip int scode} object {
+            Tcl_Obj* res = demo_decode (ip, scode);
+            if (res) { Tcl_IncrRefCount (res); }
+            return res;
+        }
+        # Encode hidden in the argtype.
+        critcl::cproc xencode {Tcl_Interp* ip demo state} int {
+            return state;
+        }
+        # Decode hidden in the resultype
+        critcl::cproc xdecode {Tcl_Interp* ip int state} demo {
+            return state;
+        }
+    }
+} -body {
+    res!
+    res+ [encode  mix]
+    res+ [xencode done]
+    res+ [decode  0]
+    res+ [xdecode 1]
+    res+ [encode  foo]
+    res+ [exE xencode bar]
+    res+ [exE xdecode -2]
+    res?
+} -result {1 2 init mix -1 {{1 {bad demo "bar": must be done, init, or mix}}} {{1 {Invalid demo state code -2}}}}
+
+test emap-mode-tcl-1.1 {critcl-emap, mode: tcl (default) +nocase} -setup {
+    make-demo TL {
+        critcl::ccode {
+            #define STATE_INIT 0
+            #define STATE_MIX  1
+            #define STATE_DONE 2
+        }
+        critcl::emap::def demo {
+            init STATE_INIT
+            mix  STATE_MIX
+            done STATE_DONE
+        } -nocase
+
+        critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* state} int {
+            int scode;
+            if (demo_encode (ip, state, &scode) != TCL_OK) {
+                return -1;
+            }
+            return scode;
+        }
+        # Encode hidden in the argtype.
+        critcl::cproc xencode {Tcl_Interp* ip demo state} int {
+            return state;
+        }
+    }
+} -body {
+    res!
+    res+ [encode  MIX]
+    res+ [xencode INIT]
+    res?
+} -result {1 0}
+
+test emap-mode-tcl-1.2 {critcl-emap, mode: tcl (default), int/direct} -setup {
+    make-demo TL {
+        critcl::emap::def demo {
+            init  0
+            mix   1
+            done  2
+        }
+        critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* state} int {
+            int scode;
+            if (demo_encode (ip, state, &scode) != TCL_OK) return -1;
+            return scode;
+        }
+        critcl::cproc decode {Tcl_Interp* ip int scode} object {
+            Tcl_Obj* res = demo_decode (ip, scode);
+            if (res) { Tcl_IncrRefCount (res); }
+            return res;
+        }
+        # Encode hidden in the argtype.
+        critcl::cproc xencode {Tcl_Interp* ip demo state} int {
+            return state;
+        }
+        # Decode hidden in the resultype
+        critcl::cproc xdecode {Tcl_Interp* ip int state} demo {
+            return state;
+        }
+    }
+} -body {
+    res!
+    res+ [encode  mix]
+    res+ [xencode done]
+    res+ [decode  0]
+    res+ [xdecode 1]
+    res+ [encode  foo]
+    res+ [exE xencode bar]
+    res+ [exE xdecode -2]
+    res?
+} -result {1 2 init mix -1 {{1 {bad demo "bar": must be done, init, or mix}}} {{1 {Invalid demo state code -2}}}}
+
+# -------------------------------------------------------------------------
+##
+
+test emap-mode-c-1.0 {critcl-emap, mode: c} -setup {
+    make-demo TL {
+        critcl::ccode {
+            #define STATE_INIT 0
+            #define STATE_MIX  1
+            #define STATE_DONE 2
+        }
+        critcl::emap::def demo {
+            init STATE_INIT
+            mix  STATE_MIX
+            done STATE_DONE
+        } -mode c
+        critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* state} int {
+            return demo_encode_cstr (Tcl_GetString(state));
+        }
+        critcl::cproc decode {Tcl_Interp* ip int scode} object {
+            Tcl_Obj* res = Tcl_NewStringObj (demo_decode_cstr (scode), -1);
+            if (res) { Tcl_IncrRefCount (res); }
+            return res;
+        }
+    }
+} -body {
+    res!
+    res+ [encode mix]
+    res+ [encode foo]
+    res+ [decode 0]
+    res+ [decode 55]
+    res?
+} -result {1 -1 init {{}}}
+
+test emap-mode-c-1.2 {critcl-emap, mode: c, int/direct} -setup {
+    make-demo TL {
+        critcl::emap::def demo {
+            init 0
+            mix  1
+            done 2
+        } -mode c
+        critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* state} int {
+            return demo_encode_cstr (Tcl_GetString(state));
+        }
+        critcl::cproc decode {Tcl_Interp* ip int scode} object {
+            Tcl_Obj* res = Tcl_NewStringObj (demo_decode_cstr (scode), -1);
+            if (res) { Tcl_IncrRefCount (res); }
+            return res;
+        }
+    }
+} -body {
+    res!
+    res+ [encode mix]
+    res+ [encode foo]
+    res+ [decode 0]
+    res+ [decode 55]
+    res?
+} -result {1 -1 init {{}}}
+
+# -------------------------------------------------------------------------
+##
+
+test emap-mode-tcl+c-1.0 {critcl-emap, mode: tcl+c} -setup {
+    make-demo TL {
+        critcl::ccode {
+            #define STATE_INIT 0
+            #define STATE_MIX  1
+            #define STATE_DONE 2
+        }
+        critcl::emap::def demo {
+            init STATE_INIT
+            mix  STATE_MIX
+            done STATE_DONE
+        } -mode {c tcl}
+        # Add -nocase as last argument for case-insensitive Tcl strings.
+        critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* state} int {
+            return demo_encode_cstr (Tcl_GetString(state));
+        }
+        critcl::cproc decode {Tcl_Interp* ip int scode} object {
+            Tcl_Obj* res = Tcl_NewStringObj (demo_decode_cstr (scode), -1);
+            if (res) { Tcl_IncrRefCount (res); }
+            return res;
+        }
+        # Encode hidden in the argtype.
+        critcl::cproc xencode {Tcl_Interp* ip demo state} int {
+            return state;
+        }
+        # Decode hidden in the resultype
+        critcl::cproc xdecode {Tcl_Interp* ip int state} demo {
+            return state;
+        }
+    }
+} -body {
+    res!
+    res+ [encode  mix]  ;# 1
+    res+ [xencode done] ;# 2
+    res+ [decode  0]    ;# init
+    res+ [xdecode 1]    ;# mix
+    res+ [encode  foo]  ;# -1
+    res+ [decode  55]
+    res+ [exE xencode bar]
+    res+ [exE xdecode -2]
+    res?
+} -result {1 2 init mix -1 {{}} {{1 {bad demo "bar": must be done, init, or mix}}} {{1 {Invalid demo state code -2}}}}
+
+test emap-mode-tcl+c-1.2 {critcl-emap, mode: tcl+c, int/direct} -setup {
+    make-demo TL {
+        critcl::emap::def demo {
+            init 0
+            mix  1
+            done 2
+        } -mode {c tcl}
+        # Add -nocase as last argument for case-insensitive Tcl strings.
+        critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* state} int {
+            return demo_encode_cstr (Tcl_GetString(state));
+        }
+        critcl::cproc decode {Tcl_Interp* ip int scode} object {
+            Tcl_Obj* res = Tcl_NewStringObj (demo_decode_cstr (scode), -1);
+            if (res) { Tcl_IncrRefCount (res); }
+            return res;
+        }
+        # Encode hidden in the argtype.
+        critcl::cproc xencode {Tcl_Interp* ip demo state} int {
+            return state;
+        }
+        # Decode hidden in the resultype
+        critcl::cproc xdecode {Tcl_Interp* ip int state} demo {
+            return state;
+        }
+    }
+} -body {
+    res!
+    res+ [encode  mix]  ;# 1
+    res+ [xencode done] ;# 2
+    res+ [decode  0]    ;# init
+    res+ [xdecode 1]    ;# mix
+    res+ [encode  foo]  ;# -1
+    res+ [decode  55]
+    res+ [exE xencode bar]
+    res+ [exE xdecode -2]
+    res?
+} -result {1 2 init mix -1 {{}} {{1 {bad demo "bar": must be done, init, or mix}}} {{1 {Invalid demo state code -2}}}}
+
+# -------------------------------------------------------------------------
+## Notes:
+# * `+list` is a decoder extension
+# * `-nocase` OTOH is an encoder tweak. No need to test here.
+
+test emap-mode-tcl+list-1.0 {critcl-emap, mode: +list (implies tcl)} -setup {
+    make-demo TL {
+        critcl::ccode {
+            #define STATE_INIT 0
+            #define STATE_MIX  1
+            #define STATE_DONE 2
+        }
+        critcl::emap::def demo {
+            init STATE_INIT
+            mix  STATE_MIX
+            done STATE_DONE
+        } -mode +list
+        critcl::cproc decode-list {Tcl_Interp* ip int args} object {
+            Tcl_Obj* res = demo_decode_list (ip, args.c, args.v);
+            if (res) { Tcl_IncrRefCount (res); }
+            return res;
+        }
+    }
+} -body {
+    res!
+    res+ [decode-list 2 0 1 0 0 1 2]
+    res+ [decode-list]
+    res+ [exE decode-list 0 3]
+    res?
+} -result {{{done init mix init init mix done}} {{}} {{1 {Invalid demo state code 3}}}}
+
+# -------------------------------------------------------------------------
+rename exE {}
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/enum.test b/src/vfs/critcl.vfs/test/enum.test
new file mode 100644
index 00000000..8c48f06e
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/enum.test
@@ -0,0 +1,99 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# enum.test
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+    useLocal lib/stubs_reader/reader.tcl       stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl   stubs::gen
+
+    useLocal lib/critcl/critcl.tcl             critcl
+    useLocal lib/critcl-iassoc/iassoc.tcl      critcl::iassoc
+    useLocal lib/critcl-literals/literals.tcl  critcl::literals
+
+    localcache-setup
+}
+testing {
+    useLocal lib/critcl-enum/enum.tcl critcl::enum
+}
+
+# -------------------------------------------------------------------------
+##
+
+test enum-mode-tcl+list-1.0 {critcl-enum, mode: +list} -setup {
+    make-demo TL {
+        critcl::enum::def demo {
+            E_global global
+            E_exact  exact
+            E_filler filler
+        } +list
+
+        critcl::cproc decode {Tcl_Interp* ip int args} object {
+            Tcl_Obj* res = demo_ToObjList (ip, args.c, args.v);
+            Tcl_IncrRefCount (res);
+            return res;
+        }
+    }
+} -body {
+    decode 1 0 2
+} -result {exact global filler}
+
+test enum-mode-tcl-1.0 {critcl-enum, mode: tcl} -setup {
+    make-demo TL {
+        critcl::enum::def demo {
+            E_global global
+            E_exact  exact
+            E_filler filler
+        }
+
+        critcl::cproc encode {Tcl_Interp* ip Tcl_Obj* str} int {
+            int val;
+            demo_GetFromObj (ip, str, 0, &val);
+            return val;
+        }
+
+        critcl::cproc decode {Tcl_Interp* ip int val} object {
+            Tcl_Obj* res = demo_ToObj (ip, val);
+            Tcl_IncrRefCount (res);
+            return res;
+        }
+
+        # Encode hidden in the argtype.
+        critcl::cproc xencode {Tcl_Interp* ip demo str} int {
+            return str;
+        }
+
+        # Encode hidden in the argtype.
+        critcl::cproc xencode-p {Tcl_Interp* ip demo-prefix str} int {
+            return str;
+        }
+
+        # Decode hidden in the resultype
+        critcl::cproc xdecode {Tcl_Interp* ip int val} demo {
+            return val;
+        }
+    }
+} -body {
+    res!
+    res+ [encode    exact]
+    res+ [xencode   filler]
+    res+ [xencode-p glob]
+    res+ [xencode   glob]
+    res+ [decode  2]
+    res+ [xdecode 0]
+    res?
+} -result {1 2 0 0 filler global}
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/iassoc.test b/src/vfs/critcl.vfs/test/iassoc.test
new file mode 100644
index 00000000..35e94687
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/iassoc.test
@@ -0,0 +1,56 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# iassoc.test
+##
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+    useLocal lib/stubs_reader/reader.tcl       stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl   stubs::gen
+    useLocal lib/critcl/critcl.tcl             critcl
+
+    localcache-setup
+}
+testing {
+    useLocal lib/critcl-iassoc/iassoc.tcl     critcl::iassoc
+}
+
+# -------------------------------------------------------------------------
+##
+
+test iassoc-counter-1.0 {critcl::iassoc - per-interp counter} -setup {
+    make-demo TL {
+        critcl::iassoc::def icounter {int base} {
+            int counter; /* The counter variable */
+        } {
+            data->counter = base;
+        } {
+            /* Nothing to release */
+        }
+        critcl::cproc icounter {Tcl_Interp* interp int base} int {
+            icounter_data d = icounter (interp, base);
+            d->counter ++;
+            return d->counter;
+        }
+    }
+} -body {
+    res!
+    res+ [icounter 4]
+    res+ [icounter 0]
+    res+ [icounter -1]
+    res?
+} -result {5 6 7}
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/literals.test b/src/vfs/critcl.vfs/test/literals.test
new file mode 100644
index 00000000..5337a68c
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/literals.test
@@ -0,0 +1,130 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# enum.test
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+    useLocal lib/stubs_reader/reader.tcl       stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl   stubs::gen
+
+    useLocal lib/critcl/critcl.tcl             critcl
+    useLocal lib/critcl-iassoc/iassoc.tcl      critcl::iassoc
+
+    localcache-setup
+}
+testing {
+    useLocal lib/critcl-literals/literals.tcl critcl::literals
+}
+
+# -------------------------------------------------------------------------
+##
+
+test literals-mode-tcl-1.0 {critcl-literals, mode: tcl (default)} -setup {
+    make-demo TL {
+        critcl::literals::def demo {
+            here  "here"
+            comes "comes"
+            the   "the"
+            sun   "sun"
+        }
+
+        critcl::cproc str {Tcl_Interp* ip int code} object {
+            Tcl_Obj* res = demo (ip, code);
+            Tcl_IncrRefCount (res);
+            return res;
+        }
+
+        # Conversion hidden in the result-type
+        critcl::cproc xstr {Tcl_Interp* ip int code} demo {
+            return code;
+        }
+    }
+} -body {
+    res!
+    res+ [str 1]
+    res+ [xstr 2]
+    res?
+} -result {comes the}
+
+test literals-mode-c-1.0 {critcl-literals, mode: c (alone)} -setup {
+    make-demo TL {
+        critcl::literals::def demo {
+            here  "here"
+            comes "comes"
+            the   "the"
+            sun   "sun"
+        } c
+
+        critcl::cproc str {Tcl_Interp* ip int code} object {
+            Tcl_Obj* res = Tcl_NewStringObj (demo_cstr (code), -1);
+            Tcl_IncrRefCount (res);
+            return res;
+        }
+    }
+} -body {
+    str 3
+} -result sun
+
+test literals-mode-c+tcl-1.0 {critcl-literals, mode: c + tcl} -setup {
+    make-demo TL {
+        critcl::literals::def demo {
+            here  "here"
+            comes "comes"
+            the   "the"
+            sun   "sun"
+        } {c tcl}
+
+        critcl::cproc str {Tcl_Interp* ip int code} object {
+            Tcl_Obj* res = demo (ip, code);
+            Tcl_IncrRefCount (res);
+            return res;
+        }
+
+        critcl::cproc cstr {Tcl_Interp* ip int code} object {
+            Tcl_Obj* res = Tcl_NewStringObj (demo_cstr (code), -1);
+            Tcl_IncrRefCount (res);
+            return res;
+        }
+    }
+} -body {
+    res!
+    res+ [str 1]
+    res+ [cstr 2]
+    res?
+} -result {comes the}
+
+test literals-mode-+list-1.0 {critcl-literals, mode: +list (tcl implied)} -setup {
+    make-demo TL {
+        critcl::literals::def demo {
+            here  "here"
+            comes "comes"
+            the   "the"
+            sun   "sun"
+        } +list
+
+        critcl::cproc strs {Tcl_Interp* ip int args} object {
+            Tcl_Obj* res = demo_list (ip, args.c, args.v);
+            Tcl_IncrRefCount (res);
+            return res;
+        }
+    }
+} -body {
+    res!
+    res+ [strs 2]
+    res+ [strs 3 0 1]
+    res?
+} -result {the {{sun here comes}}}
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/md5.test b/src/vfs/critcl.vfs/test/md5.test
new file mode 100644
index 00000000..ccd34a76
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/md5.test
@@ -0,0 +1,62 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# md5.test
+##
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+    useLocal lib/stubs_reader/reader.tcl       stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl   stubs::gen
+    useLocal lib/critcl/critcl.tcl             critcl
+
+    localcache-setup
+}
+testing {
+    useLocal lib/critcl-md5c/md5c.tcl critcl_md5c
+}
+
+# -------------------------------------------------------------------------
+##
+
+test critcl-md5c-1.0.0 {md5c, wrong\#args, not enough} -body {
+    md5c
+} -returnCodes error -result {wrong # args: should be "md5c data ?context?"}
+
+test critcl-md5c-1.0.1 {md5c, wrong\#args, too many} -body {
+    md5c STR CTX X
+} -returnCodes error -result {wrong # args: should be "md5c data ?context?"}
+
+# -------------------------------------------------------------------------
+## md5c values
+
+foreach {n expected msg} {
+    0 "d41d8cd98f00b204e9800998ecf8427e" ""
+    1 "0cc175b9c0f1b6a831c399e269772661" "a"
+    2 "900150983cd24fb0d6963f7d28e17f72" "abc"
+    3 "f96b697d7cb7938d525a2f31aaf161d0" "message digest"
+    4 "c3fcd3d76192e4007dfb496cca67e13b" "abcdefghijklmnopqrstuvwxyz"
+    5 "d174ab98d277d9f5a5611c2c9f419d9f" "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+    6 "57edf4a22be3c955ac49da2e2107b67a" "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+    7 "020c3dd6931f7e94ecc99a1f4e4c53e2" "a\$apr1\$a"
+    8 "e859a53f19b3351aaed08583d74e44bf" "\u0000\u0001\u00FF"
+    9 "b63a87afa20522f50750e71f0eaf8e85" "\u0000\u0001\u01FF"
+} {
+    test critcl-md5c-2.0.$n "md5c, msg:($msg)" -body {
+        binary scan [md5c [encoding convertto utf-8 $msg]] H* computed
+        set computed
+    } -result $expected
+}
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/stubs_container.test b/src/vfs/critcl.vfs/test/stubs_container.test
new file mode 100644
index 00000000..32b0b6c3
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/stubs_container.test
@@ -0,0 +1,736 @@
+# stubs_container.test -*- tcl -*-
+
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+testing {
+    useLocal lib/stubs_container/container.tcl stubs::container
+}
+
+# -------------------------------------------------------------------------
+# new
+
+test stubs-container-1.0 {new, wrong\#args} -setup {
+} -body {
+    stubs::container::new X
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::new"}
+
+test stubs-container-1.1 {new} -setup {
+    set T [stubs::container::new]
+} -body {
+    lappend R [stubs::container::library?   $T]
+    lappend R [stubs::container::interfaces $T]
+    lappend R [stubs::container::scspec?    $T]
+    lappend R [stubs::container::epoch?     $T]
+    lappend R [stubs::container::revision?  $T]
+    set R
+} -cleanup {
+    unset T R
+} -result {UNKNOWN {} EXTERN {} 0}
+
+# -------------------------------------------------------------------------
+# library, library?
+
+test stubs-container-2.0 {library, wrong\#args} -setup {
+} -body {
+    stubs::container::library
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::library tablevar name"}
+
+test stubs-container-2.1 {library, wrong\#args} -setup {
+} -body {
+    stubs::container::library T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::library tablevar name"}
+
+test stubs-container-2.2 {library, wrong\#args} -setup {
+} -body {
+    stubs::container::library T x y
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::library tablevar name"}
+
+test stubs-container-2.3 {library?, wrong\#args} -setup {
+} -body {
+    stubs::container::library?
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::library? table"}
+
+test stubs-container-2.4 {library?, wrong\#args} -setup {
+} -body {
+    stubs::container::library? T X
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::library? table"}
+
+test stubs-container-2.5 {library, set/get} -setup {
+    set T [stubs::container::new]
+} -body {
+    lappend R [stubs::container::library?   $T]
+    stubs::container::library T TEST
+    lappend R [stubs::container::library?   $T]
+    set R
+} -cleanup {
+    unset T R
+} -result {UNKNOWN TEST}
+
+# -------------------------------------------------------------------------
+# scspec, scspec?
+
+test stubs-container-3.0 {scspec, wrong\#args} -setup {
+} -body {
+    stubs::container::scspec
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::scspec tablevar value"}
+
+test stubs-container-3.1 {scspec, wrong\#args} -setup {
+} -body {
+    stubs::container::scspec T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::scspec tablevar value"}
+
+test stubs-container-3.2 {scspec, wrong\#args} -setup {
+} -body {
+    stubs::container::scspec T x y
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::scspec tablevar value"}
+
+test stubs-container-3.3 {scspec?, wrong\#args} -setup {
+} -body {
+    stubs::container::scspec?
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::scspec? table"}
+
+test stubs-container-3.4 {scspec?, wrong\#args} -setup {
+} -body {
+    stubs::container::scspec? T X
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::scspec? table"}
+
+test stubs-container-3.5 {scspec, set/get} -setup {
+    set T [stubs::container::new]
+} -body {
+    lappend R [stubs::container::scspec?   $T]
+    stubs::container::scspec T TEST
+    lappend R [stubs::container::scspec?   $T]
+    set R
+} -cleanup {
+    unset T R
+} -result {EXTERN TEST}
+
+# -------------------------------------------------------------------------
+# epoch, epoch?
+
+test stubs-container-4.0 {epoch, wrong\#args} -setup {
+} -body {
+    stubs::container::epoch
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::epoch tablevar value"}
+
+test stubs-container-4.1 {epoch, wrong\#args} -setup {
+} -body {
+    stubs::container::epoch T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::epoch tablevar value"}
+
+test stubs-container-4.2 {epoch, wrong\#args} -setup {
+} -body {
+    stubs::container::epoch T x y
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::epoch tablevar value"}
+
+test stubs-container-4.3 {epoch?, wrong\#args} -setup {
+} -body {
+    stubs::container::epoch?
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::epoch? table"}
+
+test stubs-container-4.4 {epoch?, wrong\#args} -setup {
+} -body {
+    stubs::container::epoch? T X
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::epoch? table"}
+
+test stubs-container-4.5 {epoch, set/get, bad value, not integer} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::container::epoch T TEST
+} -cleanup {
+    unset T
+} -returnCodes error -result {Expected integer for epoch, but got "TEST"}
+
+test stubs-container-4.6 {epoch, set/get} -setup {
+    set T [stubs::container::new]
+} -body {
+    lappend R [stubs::container::epoch?   $T]
+    stubs::container::epoch T 42
+    lappend R [stubs::container::epoch?   $T]
+    set R
+} -cleanup {
+    unset T R
+} -result {{} 42}
+
+# -------------------------------------------------------------------------
+# interface, interfaces
+
+test stubs-container-5.0 {interface, wrong\#args} -setup {
+} -body {
+    stubs::container::interface
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::interface tablevar name"}
+
+test stubs-container-5.1 {interface, wrong\#args} -setup {
+} -body {
+    stubs::container::interface T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::interface tablevar name"}
+
+test stubs-container-5.2 {interface, wrong\#args} -setup {
+} -body {
+    stubs::container::interface T x y
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::interface tablevar name"}
+
+test stubs-container-5.3 {interfaces, wrong\#args} -setup {
+} -body {
+    stubs::container::interfaces
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::interfaces table"}
+
+test stubs-container-5.4 {interfaces, wrong\#args} -setup {
+} -body {
+    stubs::container::interfaces T X
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::interfaces table"}
+
+test stubs-container-5.5 {interface(s), set/get} -setup {
+    set T [stubs::container::new]
+} -body {
+    lappend R [stubs::container::interfaces   $T]
+    stubs::container::interface T TEST
+    lappend R [stubs::container::interfaces   $T]
+    stubs::container::interface T FOO
+    lappend R [lsort -dict [stubs::container::interfaces $T]]
+    set R
+} -cleanup {
+    unset T R
+} -result {{} TEST {FOO TEST}}
+
+test stubs-container-5.6 {interface, duplicate declaration} -setup {
+    set T [stubs::container::new]
+    stubs::container::interface T A
+} -body {
+    stubs::container::interface T A
+} -cleanup {
+    unset T
+} -returnCodes error -result {Duplicate declaration of interface "A"}
+
+# -------------------------------------------------------------------------
+# hooks, hooks?, hooksof
+
+test stubs-container-6.0 {hooks, wrong\#args} -setup {
+} -body {
+    stubs::container::hooks
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::hooks tablevar interface names"}
+
+test stubs-container-6.1 {hooks, wrong\#args} -setup {
+} -body {
+    stubs::container::hooks T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::hooks tablevar interface names"}
+
+test stubs-container-6.2 {hooks, wrong\#args} -setup {
+} -body {
+    stubs::container::hooks T x
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::hooks tablevar interface names"}
+
+test stubs-container-6.3 {hooks, wrong\#args} -setup {
+} -body {
+    stubs::container::hooks T x y z
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::hooks tablevar interface names"}
+
+test stubs-container-6.4 {hooksof, wrong\#args} -setup {
+} -body {
+    stubs::container::hooksof
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::hooksof table interface"}
+
+test stubs-container-6.5 {hooksof, wrong\#args} -setup {
+} -body {
+    stubs::container::hooksof T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::hooksof table interface"}
+
+test stubs-container-6.6 {hooksof, wrong\#args} -setup {
+} -body {
+    stubs::container::hooksof T x y
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::hooksof table interface"}
+
+test stubs-container-6.7 {hooks?, wrong\#args} -setup {
+} -body {
+    stubs::container::hooks?
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::hooks? table interface"}
+
+test stubs-container-6.8 {hooks?, wrong\#args} -setup {
+} -body {
+    stubs::container::hooks? T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::hooks? table interface"}
+
+test stubs-container-6.9 {hooks?, wrong\#args} -setup {
+} -body {
+    stubs::container::hooks? T x y
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::hooks? table interface"}
+
+test stubs-container-6.10 {hooks, hooksof, hooks?, set/get} -setup {
+    set T [stubs::container::new]
+    stubs::container::interface T A
+    stubs::container::interface T B
+    stubs::container::hooks T A {B C}
+} -body {
+    lappend R [stubs::container::hooks?  $T A]
+    lappend R [stubs::container::hooks?  $T B]
+    lappend R [stubs::container::hooksof $T A]
+    lappend R [stubs::container::hooksof $T B]
+    set R
+} -cleanup {
+    unset T R
+} -result {1 0 {B C} {}}
+
+test stubs-container-6.11 {hooksof, unknown interface} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::container::hooksof $T A
+} -cleanup {
+    unset T
+} -returnCodes error -result {Unknown interface "A"}
+
+test stubs-container-6.12 {hooks?, unknown interface} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::container::hooks? $T A
+} -cleanup {
+    unset T
+} -returnCodes error -result {Unknown interface "A"}
+
+# -------------------------------------------------------------------------
+# platforms
+
+test stubs-container-7.0 {platforms, wrong\#args} -setup {
+} -body {
+    stubs::container::platforms
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::platforms table interface"}
+
+test stubs-container-7.1 {platforms, wrong\#args} -setup {
+} -body {
+    stubs::container::platforms T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::platforms table interface"}
+
+test stubs-container-7.2 {platforms, wrong\#args} -setup {
+} -body {
+    stubs::container::platforms T x y
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::platforms table interface"}
+
+test stubs-container-7.3 {platforms} -setup {
+    set T [stubs::container::new]
+    stubs::container::interface T A
+    stubs::container::interface T B
+    stubs::container::declare   T B 5 generic _foo_
+} -body {
+    lappend R [stubs::container::platforms $T A]
+    lappend R [stubs::container::platforms $T B]
+    set R
+} -cleanup {
+    unset T R
+} -result {{} generic}
+
+test stubs-container-7.4 {platforms, unknown interface} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::container::platforms $T A
+} -cleanup {
+    unset T
+} -returnCodes error -result {Unknown interface "A"}
+
+# -------------------------------------------------------------------------
+# lastof
+
+test stubs-container-8.0 {lastof, wrong\#args} -setup {
+} -body {
+    stubs::container::lastof
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::lastof table interface ?platform?"}
+
+test stubs-container-8.1 {lastof, wrong\#args} -setup {
+} -body {
+    stubs::container::lastof T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::lastof table interface ?platform?"}
+
+test stubs-container-8.2 {lastof, wrong\#args} -setup {
+} -body {
+    stubs::container::lastof T x y z a
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::lastof table interface ?platform?"}
+
+test stubs-container-8.3 {lastof, all} -setup {
+    set T [stubs::container::new]
+    stubs::container::interface T A
+    stubs::container::interface T B
+    stubs::container::declare   T B 5 generic _foo_
+} -body {
+    lappend R [stubs::container::lastof $T A] ; # note empty          list!
+    lappend R [stubs::container::lastof $T B] ; # note single element list!
+    set R
+} -cleanup {
+    unset T R
+} -result {{} 5}
+
+test stubs-container-8.3.1 {lastof, all} -setup {
+    set T [stubs::container::new]
+    stubs::container::interface T A
+    stubs::container::interface T B
+    stubs::container::declare   T B 5 generic _bogus_
+    stubs::container::declare   T B 7 aqua    _bogus_
+} -body {
+    lappend R              [stubs::container::lastof $T A]  ; # note empty list!
+    lappend R [lsort -dict [stubs::container::lastof $T B]] ; # note list!
+    set R
+} -cleanup {
+    unset T R
+} -result {{} {5 7}}
+
+test stubs-container-8.4 {lastof, by platform} -setup {
+    set T [stubs::container::new]
+    stubs::container::interface T A
+    stubs::container::interface T B
+    stubs::container::declare   T B 5 generic _foo_
+} -body {
+    lappend R [stubs::container::lastof $T A generic]
+    lappend R [stubs::container::lastof $T B generic]
+    set R
+} -cleanup {
+    unset T R
+} -result {-1 5}
+
+test stubs-container-8.5 {lastof, unknown interface} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::container::lastof $T A
+} -cleanup {
+    unset T
+} -returnCodes error -result {Unknown interface "A"}
+
+# -------------------------------------------------------------------------
+# slot?
+
+test stubs-container-9.0 {slot?, wrong\#args} -setup {
+} -body {
+    stubs::container::slot?
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slot? table interface platform at"}
+
+test stubs-container-9.1 {slot?, wrong\#args} -setup {
+} -body {
+    stubs::container::slot? T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slot? table interface platform at"}
+
+test stubs-container-9.2 {slot?, wrong\#args} -setup {
+} -body {
+    stubs::container::slot? T x
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slot? table interface platform at"}
+
+test stubs-container-9.3 {slot?, wrong\#args} -setup {
+} -body {
+    stubs::container::slot? T x y
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slot? table interface platform at"}
+
+test stubs-container-9.4 {slot?, wrong\#args} -setup {
+} -body {
+    stubs::container::slot? T x y z a
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slot? table interface platform at"}
+
+test stubs-container-9.5 {slot?, unknown interface} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::container::slot? $T A y z
+} -cleanup {
+    unset T
+} -returnCodes error -result {Unknown interface "A"}
+
+test stubs-container-9.6 {slot?, unknown platform, slot} -setup {
+    set T [stubs::container::new]
+    stubs::container::interface T A
+} -body {
+    stubs::container::slot? $T A y z
+} -cleanup {
+    unset T
+} -result 0
+
+test stubs-container-9.7 {slot?} -setup {
+    set T [stubs::container::new]
+    stubs::container::interface T A
+    stubs::container::declare   T A 5 generic _foo_
+} -body {
+    stubs::container::slot? $T A generic 5
+} -cleanup {
+    unset T
+} -result 1
+
+# -------------------------------------------------------------------------
+# slot
+
+test stubs-container-10.0 {slot, wrong\#args} -setup {
+} -body {
+    stubs::container::slot
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slot table interface platform at"}
+
+test stubs-container-10.1 {slot, wrong\#args} -setup {
+} -body {
+    stubs::container::slot T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slot table interface platform at"}
+
+test stubs-container-10.2 {slot, wrong\#args} -setup {
+} -body {
+    stubs::container::slot T x
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slot table interface platform at"}
+
+test stubs-container-10.3 {slot, wrong\#args} -setup {
+} -body {
+    stubs::container::slot T x y
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slot table interface platform at"}
+
+test stubs-container-10.4 {slot, wrong\#args} -setup {
+} -body {
+    stubs::container::slot T x y z a
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slot table interface platform at"}
+
+test stubs-container-10.5 {slot, unknown interface} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::container::slot $T A y z
+} -cleanup {
+    unset T
+} -returnCodes error -result {Unknown interface "A"}
+
+test stubs-container-10.6 {slot, unknown platform, slot} -setup {
+    set T [stubs::container::new]
+    stubs::container::interface T A
+} -body {
+    stubs::container::slot $T A y z
+} -cleanup {
+    unset T
+} -returnCodes error -result {Unknown slot "y,z"}
+
+test stubs-container-10.7 {slot} -setup {
+    set T [stubs::container::new]
+    stubs::container::interface T A
+    stubs::container::declare   T A 5 generic _foo_
+} -body {
+    stubs::container::slot $T A generic 5
+} -cleanup {
+    unset T
+} -result _foo_
+
+# -------------------------------------------------------------------------
+# slotplatforms
+
+test stubs-container-11.0 {slotplatforms, wrong\#args} -setup {
+} -body {
+    stubs::container::slotplatforms
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slotplatforms table interface at"}
+
+test stubs-container-11.1 {slotplatforms, wrong\#args} -setup {
+} -body {
+    stubs::container::slotplatforms T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slotplatforms table interface at"}
+
+test stubs-container-11.2 {slotplatforms, wrong\#args} -setup {
+} -body {
+    stubs::container::slotplatforms T x
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slotplatforms table interface at"}
+
+test stubs-container-11.3 {slotplatforms, wrong\#args} -setup {
+} -body {
+    stubs::container::slotplatforms T x y a
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::slotplatforms table interface at"}
+
+test stubs-container-11.4 {slotplatforms, unknown interface} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::container::slotplatforms $T A y
+} -cleanup {
+    unset T
+} -returnCodes error -result {Unknown interface "A"}
+
+test stubs-container-11.5 {slotplatforms, unknown slot} -setup {
+    set T [stubs::container::new]
+    stubs::container::interface T A
+    stubs::container::declare   T A 5 generic _foo_
+} -body {
+    stubs::container::slotplatforms $T A 4
+} -cleanup {
+    unset T
+} -result {}
+
+test stubs-container-11.6 {slotplatforms} -setup {
+    set T [stubs::container::new]
+    stubs::container::interface T A
+    stubs::container::declare   T A 5 generic _foo_
+} -body {
+    stubs::container::slotplatforms $T A 5
+} -cleanup {
+    unset T
+} -result generic
+
+# -------------------------------------------------------------------------
+## Representation overview, basics.
+
+test stubs-container-12.0 {print, wrong\#args} -setup {
+} -body {
+    stubs::container::print
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::print table"}
+
+test stubs-container-12.1 {print, wrong\#args} -setup {
+} -body {
+    stubs::container::print T x
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::container::print table"}
+
+test stubs-container-12.2 {print, empty} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::container::print $T
+} -cleanup {
+    unset T
+} -result {stubs UNKNOWN {
+    scspec   EXTERN
+    epoch    {}
+    revision 0
+}}
+
+test stubs-container-12.3 {print, global settings} -setup {
+    set T [stubs::container::new]
+    stubs::container::library T TEST
+    stubs::container::scspec  T ZEXTERN
+    stubs::container::epoch   T 1
+} -body {
+    stubs::container::print $T
+} -cleanup {
+    unset T
+} -result {stubs TEST {
+    scspec   ZEXTERN
+    epoch    1
+    revision 0
+}}
+
+test stubs-container-12.4 {print, interface} -setup {
+    set T [stubs::container::new]
+    stubs::container::library   T TEST
+    stubs::container::scspec    T ZEXTERN
+    stubs::container::epoch     T 1
+    stubs::container::interface T A
+} -body {
+    stubs::container::print $T
+} -cleanup {
+    unset T
+} -result {stubs TEST {
+    scspec   ZEXTERN
+    epoch    1
+    revision 0
+    interface A {
+        hooks {}
+    }
+}}
+
+test stubs-container-12.5 {print, interface with hooks} -setup {
+    set T [stubs::container::new]
+    stubs::container::library   T TEST
+    stubs::container::scspec    T ZEXTERN
+    stubs::container::epoch     T 1
+    stubs::container::interface T A
+    stubs::container::interface T B
+    stubs::container::interface T C
+    stubs::container::hooks     T A {B C}
+} -body {
+    stubs::container::print $T
+} -cleanup {
+    unset T
+} -result {stubs TEST {
+    scspec   ZEXTERN
+    epoch    1
+    revision 0
+    interface A {
+        hooks {B C}
+    }
+    interface B {
+        hooks {}
+    }
+    interface C {
+        hooks {}
+    }
+}}
+
+test stubs-container-12.6 {print, declarations} -setup {
+    set T [stubs::container::new]
+    stubs::container::library   T TEST
+    stubs::container::scspec    T ZEXTERN
+    stubs::container::epoch     T 1
+    stubs::container::interface T A
+    stubs::container::declare   T A 5 generic _bar_
+    stubs::container::declare   T A 5 {x11 aqua} _foo_
+} -body {
+    stubs::container::print $T
+} -cleanup {
+    unset T
+} -result {stubs TEST {
+    scspec   ZEXTERN
+    epoch    1
+    revision 2
+    interface A {
+        hooks {}
+        declare 5 generic {
+            function {}
+            return _bar_
+        }
+        declare 5 {aqua x11} {
+            function {}
+            return _foo_
+        }
+    }
+}}
+
+# -------------------------------------------------------------------------
+
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/stubs_reader.test b/src/vfs/critcl.vfs/test/stubs_reader.test
new file mode 100644
index 00000000..94d681dd
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/stubs_reader.test
@@ -0,0 +1,222 @@
+# stubs_reader.test -*- tcl -*-
+
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+}
+testing {
+    useLocal lib/stubs_reader/reader.tcl stubs::reader
+}
+
+# -------------------------------------------------------------------------
+# file
+
+test stubs-reader-1.0 {file, wrong\#args} -setup {
+} -body {
+    stubs::reader::file
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::reader::file tablevar path"}
+
+test stubs-reader-1.1 {file, wrong\#args} -setup {
+} -body {
+    stubs::reader::file T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::reader::file tablevar path"}
+
+test stubs-reader-1.2 {file, wrong\#args} -setup {
+} -body {
+    stubs::reader::file T x y
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::reader::file tablevar path"}
+
+# -------------------------------------------------------------------------
+# text
+
+test stubs-reader-2.0 {text, wrong\#args} -setup {
+} -body {
+    stubs::reader::text
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::reader::text tablevar text"}
+
+test stubs-reader-2.1 {text, wrong\#args} -setup {
+} -body {
+    stubs::reader::text T
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::reader::text tablevar text"}
+
+test stubs-reader-2.2 {text, wrong\#args} -setup {
+} -body {
+    stubs::reader::text T x y
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::reader::text tablevar text"}
+
+# -------------------------------------------------------------------------
+## Representation overview for lots of declarations.
+
+test stubs-reader-3.0 {text, empty} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::reader::text T {}
+    stubs::container::print $T
+} -cleanup {
+    unset T
+} -result {stubs UNKNOWN {
+    scspec   EXTERN
+    epoch    {}
+    revision 0
+}}
+
+test stubs-reader-3.1 {text, basic types} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::reader::text T {
+        library buf
+        interface buf
+        hooks {bufInt memchan}
+        declare 0 generic {
+            int Buf_IsInitialized (Tcl_Interp *interp)
+        }
+    }
+    stubs::container::print $T
+} -cleanup {
+    unset T
+} -result {stubs buf {
+    scspec   EXTERN
+    epoch    {}
+    revision 1
+    interface buf {
+        hooks {bufInt memchan}
+        declare 0 generic {
+            function Buf_IsInitialized
+            return int
+            argument {{Tcl_Interp *} interp}
+        }
+    }
+}}
+
+test stubs-reader-3.2 {text, void} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::reader::text T {
+        library buf
+        interface buf
+        hooks {bufInt memchan}
+        declare 0 generic {
+            int Buf_IsInitialized (void)
+        }
+    }
+    stubs::container::print $T
+} -cleanup {
+    unset T
+} -result {stubs buf {
+    scspec   EXTERN
+    epoch    {}
+    revision 1
+    interface buf {
+        hooks {bufInt memchan}
+        declare 0 generic {
+            function Buf_IsInitialized
+            return int
+            argument void
+        }
+    }
+}}
+
+test stubs-reader-3.3 {text, void via missing arguments} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::reader::text T {
+        library buf
+        interface buf
+        hooks {bufInt memchan}
+        declare 0 generic {
+            int Buf_IsInitialized ()
+        }
+    }
+    stubs::container::print $T
+} -cleanup {
+    unset T
+} -result {stubs buf {
+    scspec   EXTERN
+    epoch    {}
+    revision 1
+    interface buf {
+        hooks {bufInt memchan}
+        declare 0 generic {
+            function Buf_IsInitialized
+            return int
+            argument void
+        }
+    }
+}}
+
+test stubs-reader-3.4 {text, var-args function} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::reader::text T {
+        library tcl
+        interface tcl
+        declare 2 {
+            void Tcl_Panic(const char *format, ...)
+        }
+    }
+    stubs::container::print $T
+} -cleanup {
+    unset T
+} -result {stubs tcl {
+    scspec   EXTERN
+    epoch    {}
+    revision 1
+    interface tcl {
+        hooks {}
+        declare 2 generic {
+            function Tcl_Panic
+            return void
+            argument TCL_VARARGS
+            argument {{const char *} format}
+        }
+    }
+}}
+
+test stubs-reader-3.5 {text, array-flag} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::reader::text T {
+        library tcl
+        interface tcl
+	declare 17 {
+	    Tcl_Obj *Tcl_ConcatObj(Tcl_Size objc, Tcl_Obj *const objv[])
+	}
+    }
+    stubs::container::print $T
+} -cleanup {
+    unset T
+} -result {stubs tcl {
+    scspec   EXTERN
+    epoch    {}
+    revision 1
+    interface tcl {
+        hooks {}
+        declare 17 generic {
+            function Tcl_ConcatObj
+            return {Tcl_Obj *}
+            argument {Tcl_Size objc}
+            argument {{Tcl_Obj *const} objv {[]}}
+        }
+    }
+}}
+
+# -------------------------------------------------------------------------
+
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/stubs_writer.test b/src/vfs/critcl.vfs/test/stubs_writer.test
new file mode 100644
index 00000000..da7fa183
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/stubs_writer.test
@@ -0,0 +1,211 @@
+# stubs_writer.test -*- tcl -*-
+
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+    useLocal lib/stubs_reader/reader.tcl       stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl   stubs::gen
+}
+testing {
+    useLocal lib/stubs_writer/writer.tcl stubs::writer
+}
+
+# -------------------------------------------------------------------------
+# gen
+
+test stubs-writer-1.0 {gen, wrong\#args} -setup {
+} -body {
+    stubs::writer::gen
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::writer::gen table"}
+
+test stubs-writer-1.1 {gen, wrong\#args} -setup {
+} -body {
+    stubs::writer::gen T x
+} -cleanup {
+} -returnCodes error -result {wrong # args: should be "stubs::writer::gen table"}
+
+# -------------------------------------------------------------------------
+## Representation overview for lots of declarations.
+
+test stubs-writer-2.0 {text, empty} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::reader::text T {}
+    stubs::writer::gen $T
+} -cleanup {
+    unset T
+} -result {# UNKNOWN.decls -- -*- tcl -*-
+#
+#	This file contains the declarations for all public functions
+#	that are exported by the "UNKNOWN" library via its stubs table.
+#
+
+library   UNKNOWN
+# END UNKNOWN}
+
+test stubs-writer-2.1 {text, basic types} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::reader::text T {
+        library buf
+        interface buf
+        hooks {bufInt memchan}
+        declare 0 generic {
+            int Buf_IsInitialized (Tcl_Interp *interp)
+        }
+    }
+    stubs::writer::gen $T
+} -cleanup {
+    unset T
+} -result {# buf.decls -- -*- tcl -*-
+#
+#	This file contains the declarations for all public functions
+#	that are exported by the "buf" library via its stubs table.
+#
+
+library   buf
+
+interface buf
+hooks {bufInt memchan}
+
+declare 0 generic {
+    int Buf_IsInitialized (Tcl_Interp * interp)
+}
+
+# END buf}
+
+test stubs-writer-2.2 {text, void} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::reader::text T {
+        library buf
+        interface buf
+        hooks {bufInt memchan}
+        declare 0 generic {
+            int Buf_IsInitialized (void)
+        }
+    }
+    stubs::writer::gen $T
+} -cleanup {
+    unset T
+} -result {# buf.decls -- -*- tcl -*-
+#
+#	This file contains the declarations for all public functions
+#	that are exported by the "buf" library via its stubs table.
+#
+
+library   buf
+
+interface buf
+hooks {bufInt memchan}
+
+declare 0 generic {
+    int Buf_IsInitialized (void)
+}
+
+# END buf}
+
+test stubs-writer-2.3 {text, void via missing arguments} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::reader::text T {
+        library buf
+        interface buf
+        hooks {bufInt memchan}
+        declare 0 generic {
+            int Buf_IsInitialized ()
+        }
+    }
+    stubs::writer::gen $T
+} -cleanup {
+    unset T
+} -result {# buf.decls -- -*- tcl -*-
+#
+#	This file contains the declarations for all public functions
+#	that are exported by the "buf" library via its stubs table.
+#
+
+library   buf
+
+interface buf
+hooks {bufInt memchan}
+
+declare 0 generic {
+    int Buf_IsInitialized (void)
+}
+
+# END buf}
+
+test stubs-writer-2.4 {text, var-args function} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::reader::text T {
+        library tcl
+        interface tcl
+        declare 0 {
+            void Tcl_Panic(const char *format, ...)
+        }
+    }
+    stubs::writer::gen $T
+} -cleanup {
+    unset T
+} -result {# tcl.decls -- -*- tcl -*-
+#
+#	This file contains the declarations for all public functions
+#	that are exported by the "tcl" library via its stubs table.
+#
+
+library   tcl
+
+interface tcl
+
+declare 0 generic {
+    void Tcl_Panic (const char * format, ...)
+}
+
+# END tcl}
+
+test stubs-writer-2.5 {text, array-flag} -setup {
+    set T [stubs::container::new]
+} -body {
+    stubs::reader::text T {
+        library tcl
+        interface tcl
+	declare 0 {
+	    Tcl_Obj *Tcl_ConcatObj(Tcl_Size objc, Tcl_Obj *const objv[])
+	}
+    }
+    stubs::writer::gen $T
+} -cleanup {
+    unset T
+} -result {# tcl.decls -- -*- tcl -*-
+#
+#	This file contains the declarations for all public functions
+#	that are exported by the "tcl" library via its stubs table.
+#
+
+library   tcl
+
+interface tcl
+
+declare 0 generic {
+    Tcl_Obj * Tcl_ConcatObj (Tcl_Size objc, Tcl_Obj *const objv[])
+}
+
+# END tcl}
+
+# -------------------------------------------------------------------------
+
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/suites/ccommand.test b/src/vfs/critcl.vfs/test/suites/ccommand.test
new file mode 100644
index 00000000..6666aedb
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/suites/ccommand.test
@@ -0,0 +1,124 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# critcl::ccommand
+# -- Core tests.
+#    Used via ccommand.test and ccommand-trace.test
+# -- Parameters
+#    (1) suffix  ('' | '-trace')
+#        This parameter affects test naming and directory holding the
+#        expected results.
+# -------------------------------------------------------------------------
+# Parameter validation
+
+global suffix
+if {![info exists suffix]} {
+    error "Missing parameter 'suffix'. Please define as either empty string, or '-trace'"
+} elseif {($suffix ne "") && ($suffix ne "-trace")} {
+    error "Bad value '$suffix' for parameter 'suffix'. Please define as either empty string, or '-trace'"
+}
+
+# -------------------------------------------------------------------------
+# Setup
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+    useLocal lib/stubs_reader/reader.tcl       stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl   stubs::gen
+}
+
+testing {
+    useLocal lib/critcl/critcl.tcl critcl
+}
+
+overrides
+on-traced-on
+
+# -------------------------------------------------------------------------
+## ccommand syntax
+
+test critcl-ccommand${suffix}-1.0.7 {ccommand, wrong\#args} -constraints tcl9 -body {
+    critcl::ccommand
+} -returnCodes error -result {wrong # args: should be "critcl::ccommand name anames ?arg ...?"}
+
+test critcl-ccommand${suffix}-1.0.6 {ccommand, wrong\#args} -constraints tcl8.6plus -body {
+    critcl::ccommand
+} -returnCodes error -result {wrong # args: should be "critcl::ccommand name anames ?arg ...?"}
+
+test critcl-ccommand${suffix}-1.0.5 {ccommand, wrong\#args} -constraints tcl8.5 -body {
+    critcl::ccommand
+} -returnCodes error -result {wrong # args: should be "critcl::ccommand name anames ..."}
+
+test critcl-ccommand${suffix}-1.0.4 {ccommand, wrong\#args} -constraints tcl8.4 -body {
+    critcl::ccommand
+} -returnCodes error -result {wrong # args: should be "critcl::ccommand name anames args"}
+
+# -------------------------------------------------------------------------
+## Go through the various knobs we can use to configure the definition and output
+
+test critcl-ccommand${suffix}-2.0 {ccommand, defaults} -body {
+    get critcl::ccommand command {} {
+        return TCL_OK;
+    }
+} -result [viewFile [localPath test/assets/ccommand${suffix}/2.0]]
+
+test critcl-ccommand${suffix}-2.1 {ccommand, custom arguments} -body {
+    get critcl::ccommand command {CD IP OC OV} {
+        return TCL_OK;
+    }
+} -result [viewFile [localPath test/assets/ccommand${suffix}/2.1]]
+
+test critcl-ccommand${suffix}-2.2 {ccommand, -cname (custom C name)} -body {
+    get critcl::ccommand snafu {} {
+        return TCL_OK;
+    } -cname 1
+} -result [viewFile [localPath test/assets/ccommand${suffix}/2.2]]
+
+test critcl-ccommand${suffix}-2.3 {ccommand, namespaced name, and Tcl vs C} -body {
+    get critcl::ccommand the::command+max {} {
+        return TCL_OK;
+    }
+} -result [viewFile [localPath test/assets/ccommand${suffix}/2.3]]
+
+test critcl-ccommand${suffix}-2.4 {ccommand, -delproc} -body {
+    get critcl::ccommand command {} {
+        return TCL_OK;
+    } -delproc DELE
+} -result [viewFile [localPath test/assets/ccommand${suffix}/2.0]]
+
+test critcl-ccommand${suffix}-2.5 {ccommand, -clientdata} -body {
+    get critcl::ccommand command {} {
+        return TCL_OK;
+    } -clientdata ABC
+} -result [viewFile [localPath test/assets/ccommand${suffix}/2.0]]
+
+# -------------------------------------------------------------------------
+## Full builds.
+
+test critcl-ccommand${suffix}-3.0 {ccommand, defaults} -setup setup -body {
+    critcl::ccommand command {} { return TCL_OK; }
+    critcl::cbuild [the-file]
+    inspect v*.c
+} -cleanup cleanup -match glob \
+    -result [viewFile [localPath test/assets/ccommand${suffix}/3.0]]
+
+test critcl-ccommand${suffix}-3.4 {ccommand, -delproc} -setup setup -body {
+    critcl::ccommand command {} { return TCL_OK; } -delproc DELE
+    critcl::cbuild [the-file]
+    inspect v*.c
+} -cleanup cleanup -match glob \
+    -result [viewFile [localPath test/assets/ccommand${suffix}/3.4]]
+
+test critcl-ccommand${suffix}-3.5 {ccommand, -clientdata} -setup setup -body {
+    critcl::ccommand command {} { return TCL_OK; } -clientdata ABC
+    critcl::cbuild [the-file]
+    inspect v*.c
+} -cleanup cleanup -match glob \
+    -result [viewFile [localPath test/assets/ccommand${suffix}/3.5]]
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/suites/cconst.test b/src/vfs/critcl.vfs/test/suites/cconst.test
new file mode 100644
index 00000000..c50249b3
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/suites/cconst.test
@@ -0,0 +1,91 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# critcl::cconst
+# -- Core tests.
+#    Used via cconst.test and cconst-trace.test
+# -- Parameters
+#    (1) suffix  ('' | '-trace')
+#        This parameter affects test naming and directory holding the
+#        expected results.
+# -------------------------------------------------------------------------
+# Parameter validation
+
+global suffix
+if {![info exists suffix]} {
+    error "Missing parameter 'suffix'. Please define as either empty string, or '-trace'"
+} elseif {($suffix ne "") && ($suffix ne "-trace")} {
+    error "Bad value '$suffix' for parameter 'suffix'. Please define as either empty string, or '-trace'"
+}
+
+# -------------------------------------------------------------------------
+# Setup
+
+support {
+    useLocal lib/stubs_container/container.tcl  stubs::container
+    useLocal lib/stubs_reader/reader.tcl        stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl    stubs::gen
+}
+testing {
+    useLocal lib/critcl/critcl.tcl  critcl
+}
+
+# Note: The next command does not influence the standard argument-
+# and result-types.
+#critcl::config lines 0
+overrides
+on-traced-on
+
+# -------------------------------------------------------------------------
+## cconst syntax
+
+test critcl-cconst${suffix}-1.0 {cconst, wrong args, not enough} -setup {
+} -body {
+    critcl::cconst
+} -returnCodes error -result {wrong # args: should be "critcl::cconst name rtype rvalue"}
+
+test critcl-cconst${suffix}-1.1 {cconst, wrong args, not enough} -setup {
+} -body {
+    critcl::cconst N
+} -returnCodes error -result {wrong # args: should be "critcl::cconst name rtype rvalue"}
+
+test critcl-cconst${suffix}-1.2 {cconst, wrong args, not enough} -setup {
+} -body {
+    critcl::cconst N T
+} -returnCodes error -result {wrong # args: should be "critcl::cconst name rtype rvalue"}
+
+test critcl-cconst${suffix}-1.3 {cconst, wrong args, too many} -setup {
+} -body {
+    critcl::cconst N T R X
+} -returnCodes error -result {wrong # args: should be "critcl::cconst name rtype rvalue"}
+
+test critcl-cconst${suffix}-1.4 {cconst, bad result type (void)} -setup {
+} -body {
+    critcl::cconst N void T
+} -returnCodes error -result {Constants cannot be of type "void"}
+
+# -------------------------------------------------------------------------
+## Go through the various knobs we can use to configure the definition and output
+
+test critcl-cconst${suffix}-2.0 {cconst, bool, fixed value} -body {
+    get critcl::cconst alpha bool 1
+} -result [viewFile [localPath test/assets/cconst${suffix}/2.0]]
+
+test critcl-cconst${suffix}-2.1 {cconst, bool, define} -body {
+    get critcl::cconst alpha bool FOO
+} -result [viewFile [localPath test/assets/cconst${suffix}/2.1]]
+
+test critcl-cconst${suffix}-2.2 {cconst, bool, function} -body {
+    get critcl::cconst alpha bool foo()
+} -result [viewFile [localPath test/assets/cconst${suffix}/2.2]]
+
+test critcl-cconst${suffix}-2.3 {cconst, namespaced name} -body {
+    get critcl::cconst the::alpha bool 0
+} -result [viewFile [localPath test/assets/cconst${suffix}/2.3]]
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/suites/cdata.test b/src/vfs/critcl.vfs/test/suites/cdata.test
new file mode 100644
index 00000000..bd21ac9f
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/suites/cdata.test
@@ -0,0 +1,74 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# critcl::cdata
+# -- Core tests.
+#    Used via cdata.test and cdata-trace.test
+# -- Parameters
+#    (1) suffix  ('' | '-trace')
+#        This parameter affects test naming and directory holding the
+#        expected results.
+# -------------------------------------------------------------------------
+# Parameter validation
+
+global suffix
+if {![info exists suffix]} {
+    error "Missing parameter 'suffix'. Please define as either empty string, or '-trace'"
+} elseif {($suffix ne "") && ($suffix ne "-trace")} {
+    error "Bad value '$suffix' for parameter 'suffix'. Please define as either empty string, or '-trace'"
+}
+
+# -------------------------------------------------------------------------
+# Setup
+
+support {
+    useLocal lib/stubs_container/container.tcl  stubs::container
+    useLocal lib/stubs_reader/reader.tcl        stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl    stubs::gen
+}
+testing {
+    useLocal lib/critcl/critcl.tcl  critcl
+}
+
+overrides
+on-traced-on
+
+# -------------------------------------------------------------------------
+## cdata syntax
+
+test critcl-cdata${suffix}-1.0 {cdata, wrong args, not enough} -setup {
+} -body {
+    critcl::cdata
+} -returnCodes error -result {wrong # args: should be "critcl::cdata name data"}
+
+test critcl-cdata${suffix}-1.1 {cdata, wrong args, not enough} -setup {
+} -body {
+    critcl::cdata N
+} -returnCodes error -result {wrong # args: should be "critcl::cdata name data"}
+
+test critcl-cdata${suffix}-1.2 {cdata, wrong args, too many} -setup {
+} -body {
+    critcl::cdata N D X
+} -returnCodes error -result {wrong # args: should be "critcl::cdata name data"}
+
+# -------------------------------------------------------------------------
+## Go through the various knobs we can use to configure the definition and output
+
+test critcl-cdata${suffix}-2.0 {cdata, defaults} -body {
+    get critcl::cdata alpha beta
+} -result [viewFile [localPath test/assets/cdata${suffix}/2.0]]
+
+test critcl-cdata${suffix}-2.1 {cdata, Tcl vs C identifiers} -body {
+    get critcl::cdata alpha-x beta
+} -result [viewFile [localPath test/assets/cdata${suffix}/2.1]]
+
+test critcl-cdata${suffix}-2.2 {cdata, namespaced name} -body {
+    get critcl::cdata the::alpha beta
+} -result [viewFile [localPath test/assets/cdata${suffix}/2.2]]
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/suites/cproc.test b/src/vfs/critcl.vfs/test/suites/cproc.test
new file mode 100644
index 00000000..671fbf4e
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/suites/cproc.test
@@ -0,0 +1,372 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# critcl::cproc
+# -- Core tests.
+#    Used via cproc.test and cproc-trace.test
+# -- Parameters
+#    (1) suffix  ('' | '-trace')
+#        This parameter affects test naming and directory holding the
+#        expected results.
+# -------------------------------------------------------------------------
+# Parameter validation
+
+global suffix
+if {![info exists suffix]} {
+    error "Missing parameter 'suffix'. Please define as either empty string, or '-trace'"
+} elseif {($suffix ne "") && ($suffix ne "-trace")} {
+    error "Bad value '$suffix' for parameter 'suffix'. Please define as either empty string, or '-trace'"
+}
+
+# -------------------------------------------------------------------------
+# Setup
+
+support {
+    useLocal lib/stubs_container/container.tcl  stubs::container
+    useLocal lib/stubs_reader/reader.tcl        stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl    stubs::gen
+}
+testing {
+    useLocal lib/critcl/critcl.tcl  critcl
+}
+
+# Note: The next command does not influence the standard argument-
+# and result-types.
+overrides
+#critcl::config lines 0
+on-traced-on
+
+# -------------------------------------------------------------------------
+## cproc syntax
+
+test critcl-cproc${suffix}-1.0.7 {cproc, wrong\#args} -constraints tcl9 -body {
+    critcl::cproc
+} -returnCodes error -result {wrong # args: should be "critcl::cproc name adefs rtype ?body? ?arg ...?"}
+
+test critcl-cproc${suffix}-1.0.6 {cproc, wrong\#args} -constraints tcl8.6plus -body {
+    critcl::cproc
+} -returnCodes error -result {wrong # args: should be "critcl::cproc name adefs rtype ?body? ?arg ...?"}
+
+test critcl-cproc${suffix}-1.0.5 {cproc, wrong\#args} -constraints tcl8.5 -body {
+    critcl::cproc
+} -returnCodes error -result {wrong # args: should be "critcl::cproc name adefs rtype ?body? ..."}
+
+test critcl-cproc${suffix}-1.0.4 {cproc, wrong\#args} -constraints tcl8.4 -body {
+    critcl::cproc
+} -returnCodes error -result {wrong # args: should be "critcl::cproc name adefs rtype ?body? args"}
+
+# -------------------------------------------------------------------------
+## Go through the various knobs we can use to configure the definition and output
+
+test critcl-cproc${suffix}-2.0 {cproc, simple name} -body {
+    get critcl::cproc aproc {} void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.0]]
+
+test critcl-cproc${suffix}-2.1 {cproc, namespaced name} -body {
+    get critcl::cproc the::aproc {} void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.1]]
+
+test critcl-cproc${suffix}-2.2 {cproc, Tcl vs C identifiers} -body {
+    get critcl::cproc aproc+beta {} void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.2]]
+
+test critcl-cproc${suffix}-2.3 {cproc, custom C name} -body {
+    get critcl::cproc snafu {} void {} -cname 1
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.3]]
+
+test critcl-cproc${suffix}-2.4 {cproc, client data} -body {
+    get critcl::cproc aproc {} void {} -pass-cdata 1
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.4]]
+
+test critcl-cproc${suffix}-2.5 {cproc, client data} -body {
+    get critcl::cproc aproc {} void {} -arg-offset 3
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.5]]
+
+test critcl-cproc${suffix}-2.6 {cproc, int argument} -body {
+    get critcl::cproc aproc {
+        int anargument
+    } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.6]]
+
+test critcl-cproc${suffix}-2.7 {cproc, optional int argument} -body {
+    get critcl::cproc aproc {
+        int {anargument -1}
+    } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.7]]
+
+test critcl-cproc${suffix}-2.8 {cproc, optional args, freely mixed} -body {
+    get critcl::cproc aproc {
+        int {x -1}
+        int y
+        int {z -1}
+    } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.8]]
+
+test critcl-cproc${suffix}-2.9 {cproc, int result} -body {
+    get critcl::cproc aproc {} int {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.9]]
+
+test critcl-cproc${suffix}-2.10 {cproc, optional args} -body {
+    get critcl::cproc aproc {
+        int {x -1}
+        int y
+        int z
+    } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.10]]
+
+test critcl-cproc${suffix}-2.11 {cproc, optional args} -body {
+    get critcl::cproc aproc {
+        int x
+        int y
+        int {z -1}
+    } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.11]]
+
+test critcl-cproc${suffix}-2.12 {cproc, optional args} -body {
+    get critcl::cproc aproc {
+        int x
+        int {y -1}
+        int z
+    } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.12]]
+
+test critcl-cproc${suffix}-2.13 {cproc, variadic int argument} -body {
+    get critcl::cproc aproc {
+        int args
+    } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.13]]
+
+test critcl-cproc${suffix}-2.14 {cproc, variadic Tcl_Obj* argument} -body {
+    get critcl::cproc aproc {
+        object args
+    } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.14]]
+
+test critcl-cproc${suffix}-2.15 {cproc, variadic int argument, required in front} -body {
+    get critcl::cproc aproc {
+        int x
+        int y
+        int args
+    } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.15]]
+
+test critcl-cproc${suffix}-2.16 {cproc, variadic int argument, optional in front} -body {
+    get critcl::cproc aproc {
+        int {x -1}
+        int {y -1}
+        int args
+    } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.16]]
+
+test critcl-cproc${suffix}-2.17 {cproc, variadic int argument, mix required/optional in front} -body {
+    get critcl::cproc aproc {
+        int x
+        int {y -1}
+        int args
+    } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.17]]
+
+test critcl-cproc${suffix}-2.18 {cproc, variadic int argument, mix optional/required in front} -body {
+    get critcl::cproc aproc {
+        int {x -1}
+        int y
+        int args
+    } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/2.18]]
+
+# -------------------------------------------------------------------------
+# Vary the result type of the function. Covers all builtin result types.
+
+test critcl-cproc${suffix}-3.0 {cproc, void result} -body {
+    get critcl::cproc aproc {} void { }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.0]]
+
+test critcl-cproc${suffix}-3.1 {cproc, Tcl-code result} -body {
+    get critcl::cproc aproc {} ok { return TCL_OK; }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.1]]
+
+test critcl-cproc${suffix}-3.2 {cproc, int result} -body {
+    get critcl::cproc aproc {} int { return 0; }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.2]]
+
+test critcl-cproc${suffix}-3.3 {cproc, bool result} -body {
+    get critcl::cproc aproc {} bool { return 1; }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.3]]
+
+test critcl-cproc${suffix}-3.4 {cproc, boolean result} -body {
+    get critcl::cproc aproc {} boolean { return 1; }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.4]]
+
+test critcl-cproc${suffix}-3.5 {cproc, long result} -body {
+    get critcl::cproc aproc {} long { return 1; }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.5]]
+
+test critcl-cproc${suffix}-3.6 {cproc, wideint result} -body {
+    get critcl::cproc aproc {} wideint { return 1; }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.6]]
+
+test critcl-cproc${suffix}-3.7 {cproc, double result} -body {
+    get critcl::cproc aproc {} double { return 0.; }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.7]]
+
+test critcl-cproc${suffix}-3.8 {cproc, float result} -body {
+    get critcl::cproc aproc {} float { return 0.; }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.8]]
+
+test critcl-cproc${suffix}-3.9 {cproc, vstring result} -body {
+    get critcl::cproc aproc {} vstring { return "foo"; }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.9]]
+
+test critcl-cproc${suffix}-3.10 {cproc, dstring result} -body {
+    get critcl::cproc aproc {} dstring { return alloc_string("bar"); }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.10]]
+
+test critcl-cproc${suffix}-3.11 {cproc, object result} -body {
+    get critcl::cproc aproc {} object { return Tcl_NewIntObj(0); }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.11]]
+
+test critcl-cproc${suffix}-3.12 {cproc, channel result, new} -body {
+    get critcl::cproc aproc {} new-channel {
+        return Tcl_OpenFileChannel (interp, "/tmp", "r", 0);
+    }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.12]]
+
+test critcl-cproc${suffix}-3.13 {cproc, channel result, known} -body {
+    get critcl::cproc aproc {} known-channel {
+        return Tcl_GetStdChannel (0);
+    }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.13]]
+
+test critcl-cproc${suffix}-3.14 {cproc, channel result, return a taken channel} -body {
+    get critcl::cproc aproc {} return-channel {
+        return 0;
+    }
+} -result [viewFile [localPath test/assets/cproc${suffix}/3.14]]
+
+
+# -------------------------------------------------------------------------
+# Vary argument types of the function. Cover all (sensible) builtin result types.
+# Not covered: int*, float*, double* (all deprecated)
+
+set n 0
+foreach type {
+    int
+    bool
+    long
+    wideint
+    double
+    float
+    {int > 0}
+    char*
+    pstring
+    list
+    object
+    --bytearray--
+    bytes
+    channel
+    unshared-channel
+    take-channel
+} {
+    # allow marking of types as gone.
+    # allows us to keep the numbers of all tests when types go away.
+    # no need to renumber all the files for types after the removed type.
+    # and new types can reuse the slot in the future
+
+    if {![string match "--*--" $type]} {
+        set td [string map {{ } _ > gt * _} $type]
+        test critcl-cproc${suffix}-4.${n}-$td "cproc, $type argument" -body {
+            get critcl::cproc aproc [list $type x] void { }
+        } -result [viewFile [localPath test/assets/cproc${suffix}/4.${n}-$td]]
+        unset td
+    }
+    incr n
+}
+
+test critcl-cproc${suffix}-4.${n}-vobject "cproc, variadic Tcl_Obj* argument" -body {
+    get critcl::cproc aproc {object args} void { }
+} -result [viewFile [localPath test/assets/cproc${suffix}/4.${n}-vobject]]
+incr n
+
+test critcl-cproc${suffix}-4.${n}-vint "cproc, variadic int argument" -body {
+    get critcl::cproc aproc {int args} void { }
+} -result [viewFile [localPath test/assets/cproc${suffix}/4.${n}-vint]]
+
+unset n
+
+# -------------------------------------------------------------------------
+# Test the various derived types:
+# - Extended limited scalars
+# - List types (length-limited, with base type, both)
+
+## TODO: Bad types to demonstrate error checking and messages
+
+set n 0
+foreach type {
+    {int > 4}
+    {int > 4 <= 8}
+    {int < 8}
+    {int < 8 >= 4}
+    {int > 2 >= 4}
+    {int < 2 < 4 < 6}
+    {int < 2 <= 4}
+    {[2]}
+    {[]int}
+    {[2]int}
+    {int[]}
+    {int[2]}
+} {
+    set td [string map {
+        \[ = \] =
+        { } _
+        >= ge > gt
+        <= le < lt
+    } $type]
+    set rpath  [localPath test/assets/cproc${suffix}/6.${n}-$td]
+    set result ">> missing: $rpath"
+    if {[file exists $rpath]} { set result [viewFile $rpath] }
+    
+    test critcl-cproc${suffix}-6.${n}-$td "cproc, $type argument" -body {
+        get critcl::cproc aproc [list $type x] void { }
+    } -result $result
+
+    incr n ; unset td rpath result
+}
+unset n
+
+# -------------------------------------------------------------------------
+# Special list syntax, with indicator tailing the argument name, instead of attached to the type.
+
+set rpath  [localPath test/assets/cproc${suffix}/7.0]
+set result ">> missing: $rpath"
+if {[file exists $rpath]} { set result [viewFile $rpath] }
+
+test critcl-cproc${suffix}-7.0 "cproc, `int x[]` argument" -body {
+    get critcl::cproc aproc {int a[]} void { }
+} -result $result
+
+unset rpath result
+
+# -------------------------------------------------------------------------
+## Mistakenly entered C syntax - Normalize to working syntax
+
+test critcl-cproc${suffix}-5.0 {cproc, mistaken C argument syntax, lone comma} -body {
+    get critcl::cproc aproc { int x , int y } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/5.x]]
+
+test critcl-cproc${suffix}-5.1 {cproc, mistaken C argument syntax, trailing comma} -body {
+    get critcl::cproc aproc { int x, int y } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/5.x]]
+
+test critcl-cproc${suffix}-5.2 {cproc, mistaken C argument syntax, leading comma} -body {
+    get critcl::cproc aproc { int x ,int y } void {}
+} -result [viewFile [localPath test/assets/cproc${suffix}/5.x]]
+
+# -------------------------------------------------------------------------
+## XXX TODO one to multiple arguments
+## XXX TODO ...
+
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/support/crit_utils.tcl b/src/vfs/critcl.vfs/test/support/crit_utils.tcl
new file mode 100644
index 00000000..f97ac97e
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/support/crit_utils.tcl
@@ -0,0 +1,98 @@
+## -*- tcl -*-
+# -------------------------------------------------------------------------
+
+proc do {suite} {
+    global suffix
+    set suffix ""
+    uplevel 1 [list source [file join [file dirname [info script]] suites ${suite}.test]]
+}
+
+proc trace-do {suite} {
+    global suffix
+    set suffix "-trace"
+    uplevel 1 [list source [file join [file dirname [info script]] suites ${suite}.test]]
+
+    # Stop tracing code injection for the files coming after this one,
+    # and reset the marker.
+    critcl::config trace 0
+    #unset ::critcl::v::__trace__
+}
+
+proc on-traced-on {} {
+    global suffix
+    if {$suffix eq {}} return
+    # Activate trace injection. Run a dummy cproc, in a collection
+    # environment, to get the once-only generated code out of the way.
+    uplevel 1 {useLocal lib/critcl-cutil/cutil.tcl critcl::cutil}
+    critcl::config trace 1
+    uplevel 1 {critcl::collect { critcl::cproc __ {} void {}}}
+    return
+}
+
+proc get {args} {
+    set t [string trim [critcl::collect $args]]
+    #regsub -all -- {#line \d+ } $t {#line XX } t
+    return $t
+}
+
+proc setup {} {
+    critcl::fastuuid                     ;# no md5, counter, reset
+    set critcl::v::this FAKE             ;# fake a file-name
+    critcl::cache [localPath test/CACHE] ;# choose cache
+    return
+}
+
+proc the-file {} {
+    return $critcl::v::this
+}
+
+proc cleanup {} {
+    unset critcl::v::this
+    unset critcl::v::code
+    unset critcl::v::delproc
+    unset critcl::v::clientdata
+    file delete -force -- [localPath test/CACHE]
+    return
+}
+
+proc inspect {pattern} {
+    viewFile [lindex [glob -directory [critcl::cache] $pattern] 0]
+}
+
+proc overrides {} {
+    critcl::fastuuid         ;# no md5, use counter
+    critcl::config lines   0 ;# no #line, mostly
+    critcl::config keepsrc 1 ;# keep sources in cache
+
+    # Disable actual compilation
+    proc ::critcl::Compile {tclfile origin cfile obj} {
+    }
+
+    proc ::critcl::Link {file} {
+    }
+
+    proc ::critcl::ExecWithLogging {cmdline okmsg errmsg} {
+    }
+
+    proc ::critcl::Exec {cmdline} {
+    }
+
+    proc ::critcl::Load {file} {
+    }
+}
+
+
+tcltest::customMatch glob-check G
+proc G {p s} {
+    set map [list \n \\n \t \\t { } \\s]
+    set buf {}
+    foreach c [split $p {}] {
+        append buf $c
+        if {![string match ${buf}* $s]} {
+	    puts FAIL|[string map $map ${buf}*]|
+        }
+    }
+    return 1
+}
+
+# -------------------------------------------------------------------------
diff --git a/src/vfs/critcl.vfs/test/support/testutilities.tcl b/src/vfs/critcl.vfs/test/support/testutilities.tcl
new file mode 100644
index 00000000..a18f9218
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/support/testutilities.tcl
@@ -0,0 +1,708 @@
+# -*- tcl -*-
+# Testsuite utilities / boilerplate
+
+# Copyright (c) 2006-2024, Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#                                          <andreas.kupries@gmail.com>
+
+set auto_path [linsert $auto_path 0 \
+    [file join [file dirname [file dirname [file dirname [info script]]]] lib]]
+
+namespace eval ::testutils {
+    variable version 1.2
+    variable self    [file dirname [file join [pwd] [info script]]]
+    variable selfdir [file dirname $self]
+    variable tag     ""
+    variable theEnv      ; # Saved environment.
+    variable cache   {}  ; # Path to local critcl cache.
+}
+
+# ### ### ### ######### ######### #########
+## Commands for common functions and boilerplate actions required by
+## many testsuites of Tcllib modules and packages in a central place
+## for easier maintenance.
+
+# ### ### ### ######### ######### #########
+## Declare the minimal version of Tcl required to run the package
+## tested by this testsuite, and its dependencies.
+
+proc testsNeedTcl {args} {
+    # This command ensures that a minimum version of Tcl is used to
+    # run the tests in the calling testsuite. If the minimum is not
+    # met by the active interpreter we forcibly bail out of the
+    # testsuite calling the command. The command has to be called
+    # immediately after loading the utilities.
+
+    if {[package vsatisfies [package provide Tcl] {*}$args]} return
+
+    puts "    Aborting the tests found in \"[file tail [info script]]\""
+    puts "    Requiring at least Tcl $version, have [package present Tcl]."
+
+    # This causes a 'return' in the calling scope.
+    return -code return
+}
+
+# ### ### ### ######### ######### #########
+## Declare the minimum version of Tcltest required to run the
+## testsuite.
+
+proc testsNeedTcltest {version} {
+    # This command ensure that a minimum version of the Tcltest
+    # support package is used to run the tests in the calling
+    # testsuite. If the minimum is not met by the loaded package we
+    # forcibly bail out of the testsuite calling the command. The
+    # command has to be called after loading the utilities. The only
+    # command allowed to come before it is 'textNeedTcl' above.
+
+    # Note that this command will try to load a suitable version of
+    # Tcltest if the package has not been loaded yet.
+
+    if {[lsearch [namespace children] ::tcltest] == -1} {
+	if {![catch {
+	    package require tcltest $version
+	}]} {
+	    namespace import -force ::tcltest::*
+	    InitializeTclTest
+	    return
+	}
+    } elseif {[package vcompare [package present tcltest] $version] >= 0} {
+	InitializeTclTest
+	return
+    }
+
+    puts "    Aborting the tests found in [file tail [info script]]."
+    puts "    Requiring at least tcltest $version, have [package present tcltest]"
+
+    # This causes a 'return' in the calling scope.
+    return -code return
+}
+
+proc testsNeed {name version} {
+    # This command ensures that a minimum version of package <name> is
+    # used to run the tests in the calling testsuite. If the minimum
+    # is not met by the active interpreter we forcibly bail out of the
+    # testsuite calling the command. The command has to be called
+    # immediately after loading the utilities.
+
+    if {[package vsatisfies [package provide $name] $version]} return
+
+    puts "    Aborting the tests found in \"[file tail [info script]]\""
+    puts "    Requiring at least $name $version, have [package present $name]."
+
+    # This causes a 'return' in the calling scope.
+    return -code return
+}
+
+# ### ### ### ######### ######### #########
+
+## Save/restore the environment, for testsuites which have to
+## manipulate it to (1) either achieve the effects they test
+## for/against, or (2) to shield themselves against manipulation by
+## the environment. We have examples for both in 'fileutil' (1), and
+## 'doctools' (2).
+##
+## Saving is done automatically at the beginning of a test file,
+## through this module. Restoration is done semi-automatically.  We
+## __cannot__ hook into the tcltest cleanup hook It is already used by
+## all.tcl to transfer the information from the slave doing the actual
+## tests to the master. Here the hook is only an alias, and
+## unmodifiable. We create a new cleanup command which runs both our
+## environment cleanup, and the regular one. All .test files are
+## modified to use the new cleanup.
+
+proc ::testutils::SaveEnvironment {} {
+    global env
+    variable theEnv [array get env]
+    return
+}
+
+proc ::testutils::RestoreEnvironment {} {
+    global env
+    variable theEnv
+    variable cache
+    foreach k [array names env] {
+	unset env($k)
+    }
+    array set env $theEnv
+    #
+    if {$cache eq {}} return
+    #puts "Cache remove $cache"
+    file delete -force $cache
+    return
+}
+
+proc testsuiteCleanup {} {
+    ::testutils::RestoreEnvironment
+    ::tcltest::cleanupTests
+    return
+}
+
+proc array_unset {a {pattern *}} {
+    upvar 1 $a array
+    foreach k [array names array $pattern] {
+	unset array($k)
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Newer versions of the Tcltest support package for testsuite provide
+## various features which make the creation and maintenance of
+## testsuites much easier. I consider it important to have these
+## features even if an older version of Tcltest is loaded. To this end
+## we now provide emulations and implementations, conditional on the
+## version of Tcltest found to be active.
+
+# ### ### ### ######### ######### #########
+## Easy definition and initialization of test constraints.
+
+proc InitializeTclTest {} {
+    global tcltestinit
+    if {[info exists tcltestinit] && $tcltestinit} return
+    set tcltestinit 1
+
+    if {![package vsatisfies [package provide tcltest] 2.0]} {
+	# Tcltest 2.0+ provides a documented public API to define and
+	# initialize a test constraint. For earlier versions of the
+	# package the user has to directly set a non-public undocumented
+	# variable in the package's namespace. We create a command doing
+	# this and emulating the public API.
+
+	proc ::tcltest::testConstraint {c args} {
+	    variable testConstraints
+	    if {[llength $args] < 1} {
+		if {[info exists testConstraints($c)]} {
+		    return $testConstraints($c)
+		} else {
+		    return {}
+		}
+	    } else {
+		set testConstraints($c) [lindex $args 0]
+	    }
+	    return
+	}
+
+	namespace eval ::tcltest {
+	    namespace export testConstraint
+	}
+	uplevel \#0 {namespace import -force ::tcltest::*}
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Define a set of standard constraints
+
+    ::tcltest::testConstraint tcl8.3only \
+	[expr {![package vsatisfies [package provide Tcl] 8.4]}]
+
+    ::tcltest::testConstraint tcl8.3plus \
+	[expr {[package vsatisfies [package provide Tcl] 8.3]}]
+
+    ::tcltest::testConstraint tcl8.4plus \
+	[expr {[package vsatisfies [package provide Tcl] 8.4]}]
+
+    ::tcltest::testConstraint tcl8.5plus \
+	[expr {[package vsatisfies [package provide Tcl] 8.5]}]
+
+    ::tcltest::testConstraint tcl8.6plus \
+	[expr {[package vsatisfies [package provide Tcl] 8.6]}]
+
+    ::tcltest::testConstraint tcl9 \
+	[expr {[package vsatisfies [package provide Tcl] 9]}]
+
+    ::tcltest::testConstraint tcl8.4minus \
+	[expr {![package vsatisfies [package provide Tcl] 8.5]}]
+
+    ::tcltest::testConstraint tcl8.5 \
+	[expr {
+	       [ tcltest::testConstraint tcl8.5plus] &&
+	       ![tcltest::testConstraint tcl8.6plus]
+	   }]
+
+    ::tcltest::testConstraint tcl8.4 \
+	[expr {
+	       [ tcltest::testConstraint tcl8.4plus] &&
+	       ![tcltest::testConstraint tcl8.5plus]
+	   }]
+
+    # ### ### ### ######### ######### #########
+    ## Cross-version code for the generation of the error messages created
+    ## by Tcl procedures when called with the wrong number of arguments,
+    ## either too many, or not enough.
+
+    if {[package vsatisfies [package provide Tcl] 8.6]} {
+	# 8.6+
+	proc ::tcltest::wrongNumArgs {functionName argList missingIndex} {
+	    if {[string match args [lindex $argList end]]} {
+		set argList [lreplace $argList end end ?arg ...?]
+	    }
+	    if {$argList != {}} {set argList " $argList"}
+	    set msg "wrong # args: should be \"$functionName$argList\""
+	    return $msg
+	}
+
+	proc ::tcltest::tooManyArgs {functionName argList} {
+	    # create a different message for functions with no args
+	    if {[llength $argList]} {
+		if {[string match args [lindex $argList end]]} {
+		    set argList [lreplace $argList end end ?arg ...?]
+		}
+		set msg "wrong # args: should be \"$functionName $argList\""
+	    } else {
+		set msg "wrong # args: should be \"$functionName\""
+	    }
+	    return $msg
+	}
+    } elseif {[package vsatisfies [package provide Tcl] 8.5]} {
+	# 8.5
+	proc ::tcltest::wrongNumArgs {functionName argList missingIndex} {
+	    if {[string match args [lindex $argList end]]} {
+		set argList [lreplace $argList end end ...]
+	    }
+	    if {$argList != {}} {set argList " $argList"}
+	    set msg "wrong # args: should be \"$functionName$argList\""
+	    return $msg
+	}
+
+	proc ::tcltest::tooManyArgs {functionName argList} {
+	    # create a different message for functions with no args
+	    if {[llength $argList]} {
+		if {[string match args [lindex $argList end]]} {
+		    set argList [lreplace $argList end end ...]
+		}
+		set msg "wrong # args: should be \"$functionName $argList\""
+	    } else {
+		set msg "wrong # args: should be \"$functionName\""
+	    }
+	    return $msg
+	}
+    } elseif {[package vsatisfies [package provide Tcl] 8.4]} {
+	# 8.4+
+	proc ::tcltest::wrongNumArgs {functionName argList missingIndex} {
+	    if {$argList != {}} {set argList " $argList"}
+	    set msg "wrong # args: should be \"$functionName$argList\""
+	    return $msg
+	}
+
+	proc ::tcltest::tooManyArgs {functionName argList} {
+	    # create a different message for functions with no args
+	    if {[llength $argList]} {
+		set msg "wrong # args: should be \"$functionName $argList\""
+	    } else {
+		set msg "wrong # args: should be \"$functionName\""
+	    }
+	    return $msg
+	}
+    } else {
+	# 8.2+
+	proc ::tcltest::wrongNumArgs {functionName argList missingIndex} {
+	    set msg "no value given for parameter "
+	    append msg "\"[lindex $argList $missingIndex]\" to "
+	    append msg "\"$functionName\""
+	    return $msg
+	}
+
+	proc ::tcltest::tooManyArgs {functionName argList} {
+	    set msg "called \"$functionName\" with too many arguments"
+	    return $msg
+	}
+    }
+
+    # ### ### ### ######### ######### #########
+    ## tclTest::makeFile result API changed for 2.0
+
+    if {![package vsatisfies [package provide tcltest] 2.0]} {
+
+	# The 'makeFile' in Tcltest 1.0 returns a list of all the
+	# paths generated so far, whereas the 'makeFile' in 2.0+
+	# returns only the path of the newly generated file. We
+	# standardize on the more useful behaviour of 2.0+. If 1.x is
+	# present we have to create an emulation layer to get the
+	# wanted result.
+
+	# 1.0 is not fully correctly described. If the file was
+	# created before no list is returned at all. We force things
+	# by adding a line to the old procedure which makes the result
+	# unconditional (the name of the file/dir created).
+
+	# The same change applies to 'makeDirectory'
+
+	if {![llength [info commands ::tcltest::makeFile_1]]} {
+	    # Marker first.
+	    proc ::tcltest::makeFile_1 {args} {}
+
+	    # Extend procedures with command to return the required
+	    # full name.
+	    proc ::tcltest::makeFile {contents name} \
+		[info body ::tcltest::makeFile]\n[list set fullName]
+
+	    proc ::tcltest::makeDirectory {name} \
+		[info body ::tcltest::makeDirectory]\n[list set fullName]
+
+	    # Re-export
+	    namespace eval ::tcltest {
+		namespace export makeFile makeDirectory
+	    }
+	    uplevel \#0 {namespace import -force ::tcltest::*}
+	}
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Extended functionality, creation of binary temp. files.
+    ## Also creation of paths for temp. files
+
+    proc ::tcltest::makeBinaryFile {data f} {
+	set path [makeFile {} $f]
+	set ch   [open $path w]
+	fconfigure $ch -translation binary
+	puts -nonewline $ch $data
+	close $ch
+	return $path
+    }
+
+    proc ::tcltest::tempPath {path} {
+	variable temporaryDirectory
+	return [file join $temporaryDirectory $path]
+    }
+
+    namespace eval ::tcltest {
+	namespace export wrongNumArgs tooManyArgs
+	namespace export makeBinaryFile tempPath
+    }
+    uplevel \#0 {namespace import -force ::tcltest::*}
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Commands to load files from various locations within the local
+## package, and the loading of local packages. None of them goes
+## through the auto-loader, nor the regular package management, to
+## avoid contamination of the testsuite by packages and code outside
+## of the package under test.
+
+proc localcache-setup {} {
+    variable ::testutils::cache [selfPath tmp.[pid].[clock seconds]]
+    #puts "Cache assign $cache"
+    file mkdir $cache
+    critcl::cache $cache
+    critcl::fastuuid
+    return
+}
+
+proc localPath {fname} {
+    return [file join $::tcltest::testsDirectory $fname]
+}
+
+proc selfPath {fname} {
+    return [file join $::testutils::selfdir $fname]
+}
+
+proc useLocalFile {fname} {
+    return [uplevel 1 [list source [localPath $fname]]]
+}
+
+proc useSelfFile {fname} {
+    return [uplevel 1 [list source [selfPath $fname]]]
+}
+
+proc use {fname pname args} {
+    set nsname ::$pname
+    if {[llength $args]} {set nsname [lindex $args 0]}
+
+    package forget $pname
+    catch {namespace delete $nsname}
+
+    if {[catch {
+	uplevel 1 [list useSelfFile $fname]
+    } msg]} {
+	puts "    Aborting the tests found in \"[file tail [info script]]\""
+	puts "    Error in [file tail $fname]: $msg"
+	return -code error ""
+    }
+
+    puts "$::testutils::tag [list $pname] [package present $pname]"
+    return
+}
+
+proc useKeep {fname pname args} {
+    set nsname ::$pname
+    if {[llength $args]} {set nsname [lindex $args 0]}
+
+    package forget $pname
+
+    # Keep = Keep the existing namespace of the package.
+    #      = Do not delete it. This is required if the
+    #        namespace contains commands created by a
+    #        binary package, like 'tcllibc'. They cannot
+    #        be re-created.
+    ##
+    ## catch {namespace delete $nsname}
+
+    if {[catch {
+	uplevel 1 [list useSelfFile $fname]
+    } msg]} {
+	puts "    Aborting the tests found in \"[file tail [info script]]\""
+	puts "    Error in [file tail $fname]: $msg"
+	return -code error ""
+    }
+
+    puts "$::testutils::tag [list $pname] [package present $pname]"
+    return
+}
+
+proc useLocal {fname pname args} {
+    set nsname ::$pname
+    if {[llength $args]} {set nsname [lindex $args 0]}
+
+    package forget $pname
+    catch {namespace delete $nsname}
+
+    if {[catch {
+	uplevel 1 [list useLocalFile $fname]
+    } msg]} {
+	puts "    Aborting the tests found in \"[file tail [info script]]\""
+	puts "    Error in [file tail $fname]: $msg"
+	return -code error ""
+    }
+
+    puts "$::testutils::tag [list $pname] [package present $pname]"
+    return
+}
+
+proc useLocalKeep {fname pname args} {
+    set nsname ::$pname
+    if {[llength $args]} {set nsname [lindex $args 0]}
+
+    package forget $pname
+
+    # Keep = Keep the existing namespace of the package.
+    #      = Do not delete it. This is required if the
+    #        namespace contains commands created by a
+    #        binary package, like 'tcllibc'. They cannot
+    #        be re-created.
+    ##
+    ## catch {namespace delete $nsname}
+
+    if {[catch {
+	uplevel 1 [list useLocalFile $fname]
+    } msg]} {
+	puts "    Aborting the tests found in \"[file tail [info script]]\""
+	puts "    Error in [file tail $fname]: $msg"
+	return -code error ""
+    }
+
+    puts "$::testutils::tag [list $pname] [package present $pname]"
+    return
+}
+
+proc useAccel {acc fname pname args} {
+    set use [expr {$acc ? "useKeep" : "use"}]
+    uplevel 1 [linsert $args 0 $use $fname $pname]
+}
+
+proc support {script} {
+    InitializeTclTest
+    set ::testutils::tag "-"
+    if {[catch {
+	uplevel 1 $script
+    } msg]} {
+	set prefix "SETUP Error (Support): "
+	puts $prefix[join [split $::errorInfo \n] "\n$prefix"]
+
+	return -code return
+    }
+    return
+}
+
+proc testing {script} {
+    InitializeTclTest
+    set ::testutils::tag "*"
+    if {[catch {
+	uplevel 1 $script
+    } msg]} {
+	set prefix "SETUP Error (Testing): "
+	puts $prefix[join [split $::errorInfo \n] "\n$prefix"]
+
+	return -code return
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## General utilities
+
+# - dictsort -
+#
+#  Sort a dictionary by its keys. I.e. reorder the contents of the
+#  dictionary so that in its list representation the keys are found in
+#  ascending alphabetical order. In other words, this command creates
+#  a canonical list representation of the input dictionary, suitable
+#  for direct comparison.
+#
+# Arguments:
+#	dict:	The dictionary to sort.
+#
+# Result:
+#	The canonical representation of the dictionary.
+
+proc dictsort {dict} {
+    array set a $dict
+    set out [list]
+    foreach key [lsort [array names a]] {
+	lappend out $key $a($key)
+    }
+    return $out
+}
+
+# ### ### ### ######### ######### #########
+## Putting strings together, if they cannot be expressed easily as one
+## string due to quoting problems.
+
+proc cat {args} {
+    return [join $args ""]
+}
+
+# ### ### ### ######### ######### #########
+## Mini-logging facility, can also be viewed as an accumulator for
+## complex results.
+#
+# res!      : clear accumulator.
+# res+      : add arguments to accumulator.
+# res?      : query contents of accumulator.
+# res?lines : query accumulator and format as
+#             multiple lines, one per list element.
+
+proc res! {} {
+    variable result {}
+    return
+}
+
+proc res+ {args} {
+    variable result
+    lappend  result $args
+    return
+}
+
+proc res? {} {
+    variable result
+    return  $result
+}
+
+proc res?lines {} {
+    return [join [res?] \n]
+}
+
+# ### ### ### ######### ######### #########
+## Helper commands to deal with packages
+## which have multiple implementations, i.e.
+## their pure Tcl base line and one or more
+## accelerators. We are assuming a specific
+## API for accessing the data about available
+## accelerators, switching between them, etc.
+
+# == Assumed API ==
+#
+# KnownImplementations --
+#   Returns list of all known implementations.
+#
+# Implementations --
+#   Returns list of activated implementations.
+#   A subset of 'KnownImplementations'
+#
+# Names --
+#   Returns dict mapping all known implementations
+#   to human-readable strings for output during a
+#   test run
+#
+# LoadAccelerator accel --
+#   Tries to make the implementation named
+#   'accel' available for use. Result is boolean.
+#   True indicates a successful activation.
+#
+# SwitchTo accel --
+#   Activate the implementation named 'accel'.
+#   The empty string disables all implementations.
+
+proc TestAccelInit {namespace} {
+    # Disable all implementations ... Base state.
+    ${namespace}::SwitchTo {}
+
+    # List the implementations.
+    array set map [${namespace}::Names]
+    foreach e [${namespace}::KnownImplementations] {
+	if {[${namespace}::LoadAccelerator $e]} {
+	    puts "> $map($e)"
+	}
+    }
+    return
+}
+
+proc TestAccelDo {namespace var script} {
+    upvar 1 $var impl
+    foreach impl [${namespace}::Implementations] {
+	${namespace}::SwitchTo $impl
+	uplevel 1 $script
+    }
+    return
+}
+
+proc TestAccelExit {namespace} {
+    # Reset the system to a fully inactive state.
+    ${namespace}::SwitchTo {}
+    return
+}
+
+# ### ### ### ######### ######### #########
+##
+
+proc TestFiles {pattern} {
+    if {[package vsatisfies [package provide Tcl] 8.3]} {
+	# 8.3+ -directory ok
+	set flist [glob -nocomplain -directory $::tcltest::testsDirectory $pattern]
+    } else {
+	# 8.2 or less, no -directory
+	set flist [glob -nocomplain [file join $::tcltest::testsDirectory $pattern]]
+    }
+    foreach f [lsort -dict $flist] {
+	uplevel 1 [list source $f]
+    }
+    return
+}
+
+proc TestFilesGlob {pattern} {
+    if {[package vsatisfies [package provide Tcl] 8.3]} {
+	# 8.3+ -directory ok
+	set flist [glob -nocomplain -directory $::tcltest::testsDirectory $pattern]
+    } else {
+	# 8.2 or less, no -directory
+	set flist [glob -nocomplain [file join $::tcltest::testsDirectory $pattern]]
+    }
+    return [lsort -dict $flist]
+}
+
+# ### ### ### ######### ######### #########
+##
+
+proc make-demo {name script} {
+    variable ::testutils::cache
+    set saved [info script]
+    set scache $cache
+    set cache {}
+    info script $name
+    critcl::meta name $name
+    critcl::config lines 0
+    critcl::config keepsrc 1
+    uplevel 1 $script
+    critcl::load
+    info script $saved
+    set cache $scache
+    return
+}
+
+# ### ### ### ######### ######### #########
+##
+
+::testutils::SaveEnvironment
+
+# ### ### ### ######### ######### #########
+package provide testutils $testutils::version
+puts "- testutils [package present testutils]"
+return
diff --git a/src/vfs/critcl.vfs/test/util_def.test b/src/vfs/critcl.vfs/test/util_def.test
new file mode 100644
index 00000000..574ca4d7
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/util_def.test
@@ -0,0 +1,100 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# critcl_util_def.test
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+    useLocal lib/stubs_reader/reader.tcl       stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl   stubs::gen
+
+    useLocal lib/critcl/critcl.tcl critcl
+
+    # Helper procedures
+    useLocalFile test/support/crit_utils.tcl
+}
+testing {
+    useLocal lib/critcl-util/util.tcl critcl::util
+}
+
+overrides
+
+# -------------------------------------------------------------------------
+## util::def syntax
+
+test critcl-util-def-1.0.7 {util-def, wrong\#args, not enough} -constraints tcl9 -body {
+    critcl::util::def
+} -returnCodes error -result {wrong # args: should be "critcl::util::def configfile define ?value?"}
+
+test critcl-util-def-1.0.6 {util-def, wrong\#args, not enough} -constraints tcl8.6plus -body {
+    critcl::util::def
+} -returnCodes error -result {wrong # args: should be "critcl::util::def configfile define ?value?"}
+
+test critcl-util-def-1.0.5 {util-def, wrong\#args, not enough} -constraints tcl8.5 -body {
+    critcl::util::def
+} -returnCodes error -result {wrong # args: should be "critcl::util::def configfile define ?value?"}
+
+test critcl-util-def-1.0.4 {util-def, wrong\#args, not enough} -constraints tcl8.4 -body {
+    critcl::util::def
+} -returnCodes error -result {wrong # args: should be "critcl::util::def configfile define ?value?"}
+
+test critcl-util-def-1.1.7 {util-def, wrong\#args, not enough} -constraints tcl9 -body {
+    critcl::util::def C
+} -returnCodes error -result {wrong # args: should be "critcl::util::def configfile define ?value?"}
+
+test critcl-util-def-1.1.6 {util-def, wrong\#args, not enough} -constraints tcl8.6plus -body {
+    critcl::util::def C
+} -returnCodes error -result {wrong # args: should be "critcl::util::def configfile define ?value?"}
+
+test critcl-util-def-1.1.5 {util-def, wrong\#args, not enough} -constraints tcl8.5 -body {
+    critcl::util::def C
+} -returnCodes error -result {wrong # args: should be "critcl::util::def configfile define ?value?"}
+
+test critcl-util-def-1.1.4 {util-def, wrong\#args, not enough} -constraints tcl8.4 -body {
+    critcl::util::def C
+} -returnCodes error -result {wrong # args: should be "critcl::util::def configfile define ?value?"}
+
+test critcl-util-def-1.2.7 {util-def, wrong\#args, too many} -constraints tcl9 -body {
+    critcl::util::def C D V X
+} -returnCodes error -result {wrong # args: should be "critcl::util::def configfile define ?value?"}
+
+test critcl-util-def-1.2.6 {util-def, wrong\#args, too many} -constraints tcl8.6plus -body {
+    critcl::util::def C D V X
+} -returnCodes error -result {wrong # args: should be "critcl::util::def configfile define ?value?"}
+
+test critcl-util-def-1.2.5 {util-def, wrong\#args, too many} -constraints tcl8.5 -body {
+    critcl::util::def C D V X
+} -returnCodes error -result {wrong # args: should be "critcl::util::def configfile define ?value?"}
+
+test critcl-util-def-1.2.4 {util-def, wrong\#args, too many} -constraints tcl8.4 -body {
+    critcl::util::def C D V X
+} -returnCodes error -result {wrong # args: should be "critcl::util::def configfile define ?value?"}
+
+# -------------------------------------------------------------------------
+##
+
+test critcl-util-def-2.0 {util-def} -setup {
+    set here [critcl::cache]
+    file mkdir    $env(HOME)/.critcl-tests-[pid]
+    critcl::cache $env(HOME)/.critcl-tests-[pid]
+} -body {
+    critcl::util::def C foo 333
+    inspect C
+} -cleanup {
+    critcl::cache $here
+    unset here
+    file delete -force $env(HOME)/.critcl-tests-[pid]
+} -result [viewFile [localPath test/assets/def-2.0]]
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/critcl.vfs/test/util_undef.test b/src/vfs/critcl.vfs/test/util_undef.test
new file mode 100644
index 00000000..63d075cf
--- /dev/null
+++ b/src/vfs/critcl.vfs/test/util_undef.test
@@ -0,0 +1,64 @@
+# -*- tcl -*-
+# -------------------------------------------------------------------------
+# critcl_util_undef.test
+# -------------------------------------------------------------------------
+
+source [file join [file dirname [info script]] support testutilities.tcl]
+
+testsNeedTcl     8.6 9
+testsNeedTcltest 2
+
+support {
+    useLocal lib/stubs_container/container.tcl stubs::container
+    useLocal lib/stubs_reader/reader.tcl       stubs::reader
+    useLocal lib/stubs_genframe/genframe.tcl   stubs::gen
+
+    useLocal lib/critcl/critcl.tcl critcl
+
+    # Helper procedures
+    useLocalFile test/support/crit_utils.tcl
+}
+testing {
+    useLocal lib/critcl-util/util.tcl critcl::util
+}
+
+overrides
+
+# -------------------------------------------------------------------------
+## util::undef syntax
+
+test critcl-util-undef-1.0 {util-undef, wrong\#args, not enough} -body {
+    critcl::util::undef
+} -returnCodes error -result {wrong # args: should be "critcl::util::undef configfile define"}
+
+test critcl-util-undef-1.1 {util-undef, wrong\#args, not enough} -body {
+    critcl::util::undef C
+} -returnCodes error -result {wrong # args: should be "critcl::util::undef configfile define"}
+
+test critcl-util-undef-1.2 {util-undef, wrong\#args, too many} -body {
+    critcl::util::undef C D X
+} -returnCodes error -result {wrong # args: should be "critcl::util::undef configfile define"}
+
+# -------------------------------------------------------------------------
+##
+
+test critcl-util-undef-2.0 {util-undef} -setup {
+    set here [critcl::cache]
+    file mkdir    $env(HOME)/.critcl-tests-[pid]
+    critcl::cache $env(HOME)/.critcl-tests-[pid]
+} -body {
+    critcl::util::undef C foo
+    inspect C
+} -cleanup {
+    critcl::cache $here
+    unset here
+    file delete -force $env(HOME)/.critcl-tests-[pid]
+} -result [viewFile [localPath test/assets/undef-2.0]]
+
+# -------------------------------------------------------------------------
+testsuiteCleanup
+
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/sqlite3.40.0/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/sqlite3.40.0/pkgIndex.tcl
new file mode 100644
index 00000000..a94b1327
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/sqlite3.40.0/pkgIndex.tcl
@@ -0,0 +1,12 @@
+# -*- tcl -*-
+# Tcl package index file, version 1.1
+#
+# Note sqlite*3* init specifically
+#
+if {[package vsatisfies [package provide Tcl] 9.0-]} {
+    package ifneeded sqlite3 3.40.0 \
+	    [list load [file join $dir tcl9sqlite3400.dll] Sqlite3]
+} else {
+    package ifneeded sqlite3 3.40.0 \
+	    [list load [file join $dir sqlite3400.dll] Sqlite3]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/sqlite3.40.0/sqlite3400.dll b/src/vfs/punk86.vfs/lib_tcl8/sqlite3.40.0/sqlite3400.dll
new file mode 100644
index 00000000..a57ed2eb
Binary files /dev/null and b/src/vfs/punk86.vfs/lib_tcl8/sqlite3.40.0/sqlite3400.dll differ
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tclcsv2.3/csv.tcl b/src/vfs/punk86.vfs/lib_tcl8/tclcsv2.3/csv.tcl
new file mode 100644
index 00000000..4d3bd55d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tclcsv2.3/csv.tcl
@@ -0,0 +1,366 @@
+#
+# Copyright (c) 2015, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file license.terms for license
+#
+
+namespace eval tclcsv {
+    variable script_dir
+    set script_dir [file dirname [info script]]
+}
+
+# Like _sniff above but only considers delimiters
+proc tclcsv::_sniff {chan delimiters} {
+    set seek_pos [chan tell $chan]
+    if {$seek_pos == -1} {
+        error "Channel is not seekable"
+    }
+
+    # TBD - what if delimiters or quotes is empty?
+    # TBD - what if no rows ?
+
+    set escapes [list \\ ""]
+    set quotes [list \" ']
+    set combinations {}
+    foreach delimiter $delimiters {
+        unset -nocomplain width_frequencies
+        try {
+            set nrows 0
+            while {[gets $chan line] >= 0} {
+                if {$line eq ""} continue
+                set row [split $line $delimiter]
+                set n [llength $row]
+                incr width_frequencies($n)
+                incr nrows
+                if {$nrows > 100} break
+            }
+        } finally {
+            chan seek $chan $seek_pos
+        }
+        if {![info exists width_frequencies]} continue
+        set sorted_frequencies [lsort -stride 2 -decreasing -integer -index 1 [array get width_frequencies]]
+        set mode [lindex $sorted_frequencies 0]
+        # Fraction of the occurences where the mode frequency occurs
+        set mode_frac [expr {[lindex $sorted_frequencies 1] / double($nrows)}]
+        lappend combinations [list $delimiter $mode $mode_frac]
+    }
+
+    # Sort the candidates such that
+    #   - those where the mode fraction is higher are preferred under
+    #     the assumption that the more lines that have the same number
+    #     of occurences of that character, the greater the likelihood
+    #     that character is the delimiter
+    #   - those where the mode is higher is preferred under the assumption
+    #     that greater occurences of a character within a line are
+    #     less likely to be by chance
+    set comparator {
+        {a b} {
+            lassign $a adelim amode afrac
+            lassign $b bdelim bmode bfrac
+
+            #return [expr {(sqrt($amode)*$afrac) > (sqrt($bmode)*$bfrac)}]
+            set aweight [expr {(sqrt($amode)*$afrac)}]
+            set bweight [expr {(sqrt($bmode)*$bfrac)}]
+            if {$aweight > $bweight} {
+                return 1
+            } elseif {$aweight < $bweight} {
+                return -1
+            } else {
+                return 0
+            }
+        }
+    }
+    set winner [lindex [lsort -decreasing -command [list apply $comparator]  $combinations] 0]
+    set delimiter [lindex $winner 0]
+    set nfields [lindex $winner 1]
+
+    # We have picked a delimiter. Now figure out whether
+    # quotes are in use. By default " is assumed to be the quote char
+    # If we find sufficient number of fields beginning with and ending
+    # with ' then we assume that is the quote character.
+    # Along the way we also check if
+    #   - initial spaces are to be skipped
+    #   - quotes are doubled
+    #   - an escape character is in use
+    #   - comment character
+    try {
+        set nrows 0
+        while {[gets $chan line] >= 0} {
+            if {$line eq ""} continue
+            set row [split $line $delimiter]
+            set n [llength $row]
+            if {$n == $nfields} {
+                lappend good $row
+            } elseif {$n < $nfields} {
+                lappend short $row
+            } else {
+                lappend long $row
+            }
+            incr nrows
+            if {$nrows > 100} break
+        }
+        set ngood [llength $good]
+        if {$ngood == 0} {
+            error "Failed to find lines with expected number of fields"
+        }
+        foreach row $good {
+            set findex 0
+            set doublequotecount 0
+            set singlequotecount 0
+            foreach field $row {
+                # Check for quotes
+                if {[regexp {^\s*".*"$} $field]} {
+                    incr doublequotecount
+                } elseif {[regexp {^\s*'.*'$} $field]} {
+                    incr singlequotecount
+                }
+                # Keep track of leading spaces per column
+                if {[string index $field 0] eq " "} {
+                    incr nspaces($findex)
+                }
+                incr findex
+            }
+            if {$singlequotecount > $doublequotecount} {
+                set quotechar '
+            } else {
+                # Note even though double quote is the default do not
+                # explicitly mark as such unless we have actually seen it
+                if {$doublequotecount > 0} {
+                    set quotechar \"
+                }
+            }
+        }
+
+        # Check if quotes are doubled
+        if {[info exists quotechar]} {
+            set ch $quotechar
+        } else {
+            set ch \"; # Default quote char
+        }
+
+        foreach row $good {
+            foreach field $row {
+                # TBD - how to check if quotes are doubled?
+                if {[regexp "\\s*${ch}\[^${ch}\]*${ch}${ch}" $field]} {
+                    incr doublequote
+                } elseif {[regexp "\\s*${ch}\[^${ch}\]*(\[^\[:alnum:\]\])${ch}" $field -> esc]} {
+                    incr esc_chars($esc)
+                }
+            }
+            if {(![info exists doublequote]) && [info exists esc_chars]} {
+                set esc_list [lsort -decreasing -integer -stride 2 -index 1 [array get esc_chars]]
+                set escape [lindex $esc_list 0]
+            }
+        }
+
+        # If every column that had a field beginning with a space also
+        # had all fields in that column beginning with a space then
+        # we assume leading spaces are to be skipped.
+        if {[info exists nspaces]} {
+            set skipleadingspace 1
+            foreach {col space_count} [array get nspaces] {
+                if {$space_count != $ngood} {
+                    set skipleadingspace 0
+                    break
+                }
+            }
+        }
+        # If the bulk of short lines begin with the same character,
+        # assume it is the comment character
+        if {[info exists short]} {
+            foreach row $short {
+                set line [string trim [join $row $delimiter]]
+                incr comment([string index $line 0])
+            }
+            set nshort [llength $short]
+            foreach {ch count} [array get comment] {
+                if {[expr {double($count)/$nshort}] > 0.8} {
+                    set commentchar $ch
+                    break
+                }
+            }
+        }
+
+        # TBD - perhaps long lines can also be used since long lines
+        # can result from delimiters embedded within quotes
+
+    } finally {
+        chan seek $chan $seek_pos
+    }
+
+    set dialect [list -delimiter $delimiter]
+    if {[info exists skipleadingspace]} {
+        lappend dialect -skipleadingspace $skipleadingspace
+    }
+    if {[info exists quotechar]} {
+        lappend dialect -quote $quotechar
+    }
+    if {[info exists commentchar]} {
+        lappend dialect -comment $commentchar
+    }
+    if {[info exists doublequote]} {
+        lappend dialect -doublequote 1
+    } else {
+        if {[info exists escape]} {
+            lappend dialect -escape $escape
+        }
+    }
+
+
+    return $dialect
+}
+
+proc tclcsv::sniff_header {args} {
+    if {[llength $args] == 0} {
+        error "wrong # args: should be \"sniff_header ?options? channel\""
+    }
+    set chan [lindex $args end]
+
+    set seek_pos [chan tell $chan]
+    if {$seek_pos == -1} {
+        error "Channel is not seekable"
+    }
+
+    try {
+        set rows [csv_read {*}[lrange $args 0 end-1] -nrows 100 $chan]
+        if {[llength $rows] < 2} {
+            error "Insufficient rows in CSV data to sniff headers."
+        }
+        set width [llength [lindex $rows 0]]
+        set types {}
+        for {set findex 0} {$findex < $width} {incr findex} {
+            dict set types $findex type unknown
+            dict set types $findex length [string length [lindex $rows 1 $findex]]
+        }
+        foreach row [lrange $rows 1 end] {
+            if {[llength $row] != $width} continue
+            for {set findex 0} {$findex < $width} {incr findex} {
+                set val [lindex $row $findex]
+                if {[string length $val] != [dict get $types $findex length]} {
+                    dict set types $findex length -1
+                }
+                set field_type [dict get $types $findex type]
+                if {$field_type eq "string"} continue
+                # Note values starting with 0 treated as strings (eg. zip codes)
+                # Exceptions are 0 and 0.something
+                if {[string index $val 0] eq "0" &&
+                    [string length $val] > 1 &&
+                    [string index $val 1] ne "."} {
+                    dict set types $findex type string
+                    continue
+                }
+                if {$field_type eq "real"} {
+                    if {![string is double -strict $val]} {
+                        dict set types $findex type string
+                    }
+                    continue
+                }
+                # field_type is integer or unknown. Our check for
+                # integer is not [string is wide] because we want to
+                # treat as decimal numbers and not parse as octals or hex
+                if {[regexp {^\d+$} $val]} {
+                    dict set types $findex type integer
+                } elseif {[string is double -strict $val]} {
+                    dict set types $findex type real
+                } else {
+                    dict set types $findex type string
+                }
+            }
+        }
+    } finally {
+        chan seek $chan $seek_pos
+    }
+
+    # If we could determine that any one column was a non-string type
+    # (integer or real) but the header field for that column is not
+    # of that type, we immediately conclude the first row is a header.
+    # In addition, in the case of columns that are of fixed width,
+    # we take a vote, where every time the field in first row of the
+    # fixed width column is of a different width we raise the probability
+    # of header existence and if of the same width, we lower the probability.
+    set probably_header 0
+    set row [lindex $rows 0]
+    for {set findex 0} {$findex < $width} {incr findex} {
+        set field [lindex $row $findex]
+        set type [dict get $types $findex type]
+        if {($type eq "integer" && ![string is wide -strict $field]) ||
+            ($type eq "real" && ![string is double -strict $field])
+        } {
+            # The type of the first row field is different. Assume header
+            set probably_header 1
+            break
+        }
+        set len [dict get $types $findex length]
+        if {$len >= 0} {
+            if {$len == [string length $field]} {
+                incr probably_header -1
+            } else {
+                incr probably_header 1
+            }
+        }
+    }
+
+    set field_types {}
+    for {set findex 0} {$findex < $width} {incr findex} {
+        set type [dict get $types $findex type]
+        # $type can be unknown if the loop above did a continue right
+        # at the top for every line
+        if {$type eq "unknown"} {
+            set type string
+        }
+        lappend field_types $type
+    }
+
+    if {$probably_header > 0} {
+        return [list $field_types $row]
+    } else {
+        return [list $field_types]
+    }
+}
+
+proc tclcsv::dialect {dialect {direction read}} {
+    variable dialects
+    set dialects [dict create]
+    dict set dialects excel [list \
+                                 -delimiter , \
+                                 -quote \" \
+                                 -doublequote 1 \
+                                 -skipleadingspace 0]
+    dict set dialects excel-tab [dict merge [dict get $dialects excel] [list -delimiter \t]]
+    proc [namespace current]::dialect {dialect {direction read}} {
+        variable dialects
+        set opts [dict get $dialects $dialect]
+        if {$direction eq "write"} {
+            # Remove options not understood by writes
+            dict unset opts -skipleadingspace
+        }
+        return $opts
+    }
+    return [dialect $dialect $direction]
+}
+
+proc tclcsv::sniff {args} {
+    if {[llength $args] == 0} {
+        error "wrong # args: should be \"sniff ?options? channel\""
+    }
+    set chan [lindex $args end]
+
+    array set opts [dict merge [dict create \
+                              -delimiters [list "," ";" ":" "\t"] \
+                              ] \
+                  [lrange $args 0 end-1]]
+
+    return [_sniff $chan $opts(-delimiters)]
+}
+
+proc tclcsv::dialectpicker args {
+    variable script_dir
+    uplevel #0 {package require Tk; package require snit}
+    uplevel #0 [list source [file join $script_dir widgets.tcl]]
+    uplevel 1 tclcsv::dialectpicker $args
+}
+
+namespace eval tclcsv {
+    namespace export csv_read csv_write sniff sniff_header dialect
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tclcsv2.3/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tclcsv2.3/pkgIndex.tcl
new file mode 100644
index 00000000..718878cc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tclcsv2.3/pkgIndex.tcl
@@ -0,0 +1,6 @@
+#
+# Tcl package index file
+#
+package ifneeded tclcsv 2.3 \
+    "[list load [file join $dir tclcsv23.dll] tclcsv] ;
+        [list source [file join $dir csv.tcl]]"
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tclcsv2.3/tclcsv23.dll b/src/vfs/punk86.vfs/lib_tcl8/tclcsv2.3/tclcsv23.dll
new file mode 100644
index 00000000..f46c1c81
Binary files /dev/null and b/src/vfs/punk86.vfs/lib_tcl8/tclcsv2.3/tclcsv23.dll differ
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tclcsv2.3/widgets.tcl b/src/vfs/punk86.vfs/lib_tcl8/tclcsv2.3/widgets.tcl
new file mode 100644
index 00000000..33c8b210
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tclcsv2.3/widgets.tcl
@@ -0,0 +1,890 @@
+#
+# Copyright (c) 2015, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file license.terms for license
+#
+
+package require msgcat
+
+namespace eval tclcsv {
+    namespace import ::msgcat::*
+    # critcl TEA install does not copy message files. So for now
+    # keep root strings here.
+    ::msgcat::mcmset "" {
+        encoding_l     "Character encoding"
+
+        header_line_l  "First line contains a header"
+        skip_empty_l   "Skip lines that are empty"
+        quote_doubled_l "Quotes are represented by doubling"
+        ignore_leading_space_l "Ignore leading space in fields"
+
+        delimiter_char_l Delimiter
+        comment_char_l "Comment character"
+        quote_char_l   "Quote character"
+        escape_char_l  "Escape character"
+
+        none_l         None
+        space_l        Space
+        tab_l          Tab
+        hash_l         "Hash (#)"
+        semicolon_l    "Semicolon (;)"
+        comma_l        Comma
+        dquote_l       "Double quote (\")"
+        squote_l       "Single quote (')"
+        backslash_l    "Backslash (\)"
+        other_l        Other
+
+        include_l      Include
+        heading_l      Heading
+        type_l         Type
+    }
+}
+# TBD ::msgcat::mcload [file join [file dirname [info script]] msgs]
+
+namespace eval tclcsv::sframe {
+    # sframe.tcl - from http://wiki.tcl.tk/9223
+    # Paul Walton
+    # Create a ttk-compatible, scrollable frame widget.
+    #   Usage:
+    #       sframe new <path> ?-toplevel true?  ?-anchor nsew?
+    #       -> <path>
+    #
+    #       sframe content <path>
+    #       -> <path of child frame where the content should go>
+
+    namespace ensemble create
+    namespace export *
+
+    # Create a scrollable frame or window.
+    proc new {path args} {
+        # Use the ttk theme's background for the canvas and toplevel
+        set bg [ttk::style lookup TFrame -background]
+        if { [ttk::style theme use] eq "aqua" } {
+            # Use a specific color on the aqua theme as 'ttk::style lookup' is not accurate.
+            set bg "#e9e9e9"
+        }
+
+        # Create the main frame or toplevel.
+        if { [dict exists $args -toplevel]  &&  [dict get $args -toplevel] } {
+            toplevel $path  -bg $bg
+        } else {
+            ttk::frame $path
+        }
+
+        # Create a scrollable canvas with scrollbars which will always be the same size as the main frame.
+        set canvas [canvas $path.canvas -bg $bg -bd 0 -highlightthickness 0 -yscrollcommand [list $path.scrolly set] -xscrollcommand [list $path.scrollx set]]
+        ttk::scrollbar $path.scrolly -orient vertical   -command [list $canvas yview]
+        ttk::scrollbar $path.scrollx -orient horizontal -command [list $canvas xview]
+
+        # Create a container frame which will always be the same size as the canvas or content, whichever is greater.
+        # This allows the child content frame to be properly packed and also is a surefire way to use the proper ttk background.
+        set container [ttk::frame $canvas.container]
+        pack propagate $container 0
+
+        # Create the content frame. Its size will be determined by its contents. This is useful for determining if the
+        # scrollbars need to be shown.
+        set content [ttk::frame $container.content]
+
+        # Pack the content frame and place the container as a canvas item.
+        set anchor "n"
+        if { [dict exists $args -anchor] } {
+            set anchor [dict get $args -anchor]
+        }
+        pack $content -anchor $anchor
+        $canvas create window 0 0 -window $container -anchor nw
+
+        # Grid the scrollable canvas sans scrollbars within the main frame.
+        grid $canvas   -row 0 -column 0 -sticky nsew
+        grid rowconfigure    $path 0 -weight 1
+        grid columnconfigure $path 0 -weight 1
+
+        # Make adjustments when the sframe is resized or the contents change size.
+        bind $path.canvas <Expose> [list [namespace current]::resize $path]
+
+        # Mousewheel bindings for scrolling.
+        bind [winfo toplevel $path] <MouseWheel>       [list +[namespace current] scroll $path yview %W %D]
+        bind [winfo toplevel $path] <Shift-MouseWheel> [list +[namespace current] scroll $path xview %W %D]
+
+        return $path
+    }
+
+
+    # Given the toplevel path of an sframe widget, return the path of the child frame suitable for content.
+    proc content {path} {
+        return $path.canvas.container.content
+    }
+
+
+    # Make adjustments when the the sframe is resized or the contents change size.
+    proc resize {path} {
+        set canvas    $path.canvas
+        set container $canvas.container
+        set content   $container.content
+
+        # Set the size of the container. At a minimum use the same width & height as the canvas.
+        set width  [winfo width $canvas]
+        set height [winfo height $canvas]
+
+        # If the requested width or height of the content frame is greater then use that width or height.
+        if { [winfo reqwidth $content] > $width } {
+            set width [winfo reqwidth $content]
+        }
+        if { [winfo reqheight $content] > $height } {
+            set height [winfo reqheight $content]
+        }
+        $container configure  -width $width  -height $height
+
+        # Configure the canvas's scroll region to match the height and width of the container.
+        $canvas configure -scrollregion [list 0 0 $width $height]
+
+        # Show or hide the scrollbars as necessary.
+        # Horizontal scrolling.
+        if { [winfo reqwidth $content] > [winfo width $canvas] } {
+            grid $path.scrollx  -row 1 -column 0 -sticky ew
+        } else {
+            grid forget $path.scrollx
+        }
+        # Vertical scrolling.
+        if { [winfo reqheight $content] > [winfo height $canvas] } {
+            grid $path.scrolly  -row 0 -column 1 -sticky ns
+        } else {
+            grid forget $path.scrolly
+        }
+        return
+    }
+
+
+    # Handle mousewheel scrolling.
+    proc scroll {path view W D} {
+        if { [winfo exists $path.canvas]  &&  [string match $path.canvas* $W] } {
+            $path.canvas $view scroll [expr {-$D}] units
+        }
+        return
+    }
+}
+
+#------------------------------------------------------------------------------
+# Copied from Csaba Nemethi's tablelist package
+# tablelist::strRange
+#
+# Gets the largest initial (for alignment = left or center) or final (for
+# alignment = right) range of characters from str whose width, when displayed
+# in the given font, is no greater than pixels decremented by the width of
+# snipStr.  Returns a string obtained from this substring by appending (for
+# alignment = left or center) or prepending (for alignment = right) (part of)
+# snipStr to it.
+#------------------------------------------------------------------------------
+proc tclcsv::fit_text {win str font pixels alignment snipStr} {
+    if {$pixels < 0} {
+        return ""
+    }
+
+    set width [font measure $font -displayof $win $str]
+    if {$width <= $pixels} {
+        return $str
+    }
+
+    set snipWidth [font measure $font -displayof $win $snipStr]
+    if {$pixels <= $snipWidth} {
+        set str $snipStr
+        set snipStr ""
+    } else {
+        incr pixels -$snipWidth
+    }
+
+    if {[string compare $alignment "right"] == 0} {
+        set idx [expr {[string length $str]*($width - $pixels)/$width}]
+        set subStr [string range $str $idx end]
+        set width [font measure $font -displayof $win $subStr]
+        if {$width < $pixels} {
+            while 1 {
+                incr idx -1
+                set subStr [string range $str $idx end]
+                set width [font measure $font -displayof $win $subStr]
+                if {$width > $pixels} {
+                    incr idx
+                    set subStr [string range $str $idx end]
+                    return $snipStr$subStr
+                } elseif {$width == $pixels} {
+                    return $snipStr$subStr
+                }
+            }
+        } elseif {$width == $pixels} {
+            return $snipStr$subStr
+        } else {
+            while 1 {
+                incr idx
+                set subStr [string range $str $idx end]
+                set width [font measure $font -displayof $win $subStr]
+                if {$width <= $pixels} {
+                    return $snipStr$subStr
+                }
+            }
+        }
+
+    } else {
+        set idx [expr {[string length $str]*$pixels/$width - 1}]
+        set subStr [string range $str 0 $idx]
+        set width [font measure $font -displayof $win $subStr]
+        if {$width < $pixels} {
+            while 1 {
+                incr idx
+                set subStr [string range $str 0 $idx]
+                set width [font measure $font -displayof $win $subStr]
+                if {$width > $pixels} {
+                    incr idx -1
+                    set subStr [string range $str 0 $idx]
+                    return $subStr$snipStr
+                } elseif {$width == $pixels} {
+                    return $subStr$snipStr
+                }
+            }
+        } elseif {$width == $pixels} {
+            return $subStr$snipStr
+        } else {
+            while 1 {
+                incr idx -1
+                set subStr [string range $str 0 $idx]
+                set width [font measure $font -displayof $win $subStr]
+                if {$width <= $pixels} {
+                    return $subStr$snipStr
+                }
+            }
+        }
+    }
+}
+
+#
+# And finally, my own code
+
+# format text in a label, truncating and adding ellipsis as necessary.
+# Also show "" as <empty> for better visual display
+proc tclcsv::format_label {win text {align left} {font TkDefaultFont}} {
+    # Window has not been mapped yet.
+    if {$text eq ""} {
+        set text <empty>
+    }
+    set nchars [string length $text]
+    if {$nchars > 10} {
+        set nchars 10
+        set width [font measure $font -displayof $win [string repeat a $nchars]]
+        set text [fit_text $win $text $font $width $align \u2026]; # Ellipsis
+    }
+    $win configure -text $text
+}
+
+# A megawidget to permit various options for parsing CSV to be configured
+snit::widget tclcsv::dialectpicker {
+    hulltype ttk::frame
+
+    #
+    # Options related to parsing the CSV. These can be specified by the
+    # caller to initialize the settings for reading CSV data. They can
+    # then be changed interactively by the user through the various
+    # displayed widgets which are attached to them via -textvariable or
+    # -variable
+
+    # File encoding
+    option -encoding -default utf-8 -readonly 1 -configuremethod SetOptEncoding
+
+    # Special character settings
+    option -delimiter -default \t -configuremethod SetOptDelimiter -readonly 1
+    option -comment -default "" -configuremethod SetOptCharPicker -readonly 1
+    option -escape -default "" -configuremethod SetOptCharPicker -readonly 1
+    option -quote -default \" -configuremethod SetOptCharPicker -readonly 1
+    # Holds the "Other" entry content for specifying special characters
+    # Array indexed by option
+    variable _other;   # Array contents of "Other" entry boxes indexed by option
+
+    option -skipblanklines -default 1 -readonly 1
+    option -skipleadingspace -default 0 -readonly 1
+    option -doublequote -default 1 -readonly 1
+    option -headerpresent -default 0 -readonly 1
+
+    #
+    # The three main data frames containing the options, the special
+    # character configuration and the sample data
+    variable _optf;            # Option frame
+    variable _charf;           # Character picker frame
+    variable _dataf;           # Data frame
+
+
+    # If specified, the column metadata widgets are displayed
+    # (name, type etc.). The value must be a dictionary keyed by a
+    # data type token, with nested keys align and display (both optional)
+    option -columntypes -default "" -readonly 1 -configuremethod SetOptColumnTypes
+    # Array mapping display strings to column type tokens
+    variable _column_type_display_to_token
+
+    # Stores display strings of column types. Array indexed by col number
+    variable _column_type_display_strings
+
+    # Stores information whether a column is included or not and column heading,
+    # Only used if caller specified the -columntypes option
+    # Arrays indexed by column number
+    variable _included_columns
+    variable _column_headings
+
+    # Store state information about the channel we are reading from
+    # path - path to file - ONLY PRESENT IF PASSED IN PATH INSTEAD OF CHANNEL
+    # name - channel name
+    # original_position - original seek position
+    # original_encoding - encoding to be restored
+    variable _channel
+
+    variable _max_data_lines 6; # How many sample lines to read
+    variable _num_data_lines;    # Number actually read
+    variable _data_grid_first_data_row; # First row that contains actual values
+    variable _data_grid_first_data_col; # First col that contains actual values
+
+    constructor {args} {
+        if {[llength $args] == 0} {
+            error "wrong # args: should be \"dialectpicker ?options? channel\""
+        }
+        set chan [lindex $args end]
+        set args [lrange $args 0 end-1]
+
+        $hull configure -borderwidth 0
+
+        array set _included_columns {}
+
+        # Init channel and remember original settings for restoring in
+        # destructor
+        $self ChanInit $chan
+
+        # The three main frames
+        set _optf [ttk::frame $win.f-opt -padding 4]
+        set _charf [ttk::frame $win.f-char]
+        set _dataf [tclcsv::sframe new $win.f-data -anchor w]
+
+        # File character encoding
+        ttk::frame $_optf.f-encoding
+        ttk::label $_optf.f-encoding.l -text [mc encoding_l]
+        ttk::combobox $_optf.f-encoding.cb -textvariable [myvar options(-encoding)] -values [lsort [encoding names]] -state readonly
+        bind $_optf.f-encoding.cb <<ComboboxSelected>> [mymethod Redisplay]
+        pack $_optf.f-encoding.l $_optf.f-encoding.cb -side left -fill both -expand n
+        # Data processing objects
+        foreach {opt text} {
+            -headerpresent header_line_l
+            -doublequote quote_doubled_l
+            -skipblanklines skip_empty_l
+            -skipleadingspace ignore_leading_space_l
+        } {
+            ttk::checkbutton $_optf.cb$opt -variable [myvar options($opt)] -text [mc $text] -command [mymethod Redisplay]
+        }
+
+        # Delimiter selection
+        set delimiterf [$self MakeCharPickerFrame -delimiter delimiter_char_l \
+                            [list tab_l \t space_l { } comma_l , semicolon_l ";"] \
+                            \t]
+
+        # Comment char
+        set commentf [$self MakeCharPickerFrame -comment comment_char_l  \
+                          [list none_l "" hash_l "#"]]
+
+        # Quote char
+        set quotef [$self MakeCharPickerFrame -quote quote_char_l \
+                          [list none_l "" dquote_l "\"" squote_l "'"] \"]
+
+        # Escape char
+        set escapef [$self MakeCharPickerFrame -escape escape_char_l \
+                          [list none_l "" backslash_l "\\"]]
+
+        # Start laying out the widgets
+
+        # Options
+        grid $_optf.f-encoding - -sticky ew
+        grid $_optf.cb-headerpresent $_optf.cb-skipblanklines -sticky ew
+        grid $_optf.cb-doublequote $_optf.cb-skipleadingspace -sticky ew
+        grid columnconfigure $_optf all -weight 1 -uniform width
+
+        pack $_optf -fill none -expand n -pady 4 -anchor w
+
+        # Special characters
+        grid $delimiterf $commentf $quotef $escapef -padx 2 -pady 2 -sticky news
+        grid columnconfigure $_charf all -uniform width -weight 1
+        pack $_charf -fill none -expand n -pady 4 -anchor w
+
+        # Sample data frame
+        pack [ttk::separator $win.sep] -fill x -expand n -pady 4
+        pack $_dataf -fill both -expand y -anchor nw
+
+        $self configurelist $args
+
+        $self Redisplay
+    }
+
+    destructor {
+        # Restore channel to its initial state if it is still open
+        if {[info exists _channel(name)] &&
+            $_channel(name) in [chan names]} {
+            if {[info exists _channel(path)]} {
+                # We opened the channel ourselves so close it.
+                close $_channel(name)
+            } else {
+                chan configure $_channel(name) -encoding $_channel(original_encoding)
+                chan seek $_channel(name) $_channel(original_position)
+            }
+        }
+    }
+
+    # -columntypes option handler
+    method SetOptColumnTypes {opt val} {
+        # Make sure the types returned by sniff_header are included
+        if {![dict exists $val string]} {
+            dict set val string {display String align left}
+        }
+        if {![dict exists $val real]} {
+            dict set val real {display {Real number} align right}
+        }
+        if {![dict exists $val integer]} {
+            dict set val integer {display Integer align right}
+        }
+        set options(-columntypes) $val
+
+        dict for {tok meta} $options(-columntypes) {
+            # Fill in any display strings that are not set
+            if {![dict exists $meta display] ||
+                [dict get $meta display] eq ""} {
+                dict set options(-columntypes) $tok display $tok
+            }
+            # Likewise, fill in alignment
+            if {![dict exists $meta align] ||
+                [dict get $meta align] ni {left right center centre}} {
+                dict set options(-columntypes) $tok align left
+            }
+
+            # Build map of display strings to tokens
+            set _column_type_display_to_token([dict get $options(-columntypes) $tok display]) $tok
+        }
+    }
+
+    # -encoding handler
+    method SetOptEncoding {opt val} {
+        if {$val ni [encoding names]} {
+            error "Unknown encoding \"$val\"."
+        }
+        set options($opt) $val
+        $_optf.cb-encoding set $options(-encoding)
+    }
+
+    # -delimiter handler. Unlike other special characters this cannot be ""
+    method SetOptDelimiter {opt val} {
+        if {[string length $val] != 1} {
+            error "Invalid value for option $opt. Must be a single character."
+        }
+        if {$val in [list \t { } "," ";"]} {
+            set options($opt) $val
+        } else {
+            set _other($opt) $val
+            set options($opt) "other"
+        }
+    }
+
+    # Handler for special character related option.
+    method SetOptCharPicker {opt val} {
+        if {[string length $val] > 1} {
+            error "Invalid value for option $opt. Must be a single character or the empty string."
+        }
+        set predefs [dict create \
+                         -comment [list # ""] \
+                         -quote [list \" ' ""] \
+                         -escape [list \\ ""]]
+        if {$val in [dict get $predefs $opt]} {
+            set options($opt) $val
+        } else {
+            set _other($opt) $val
+            set options($opt) "other"
+        }
+    }
+
+    # Creates a "Other" entry widget $e that enforces max one character
+    # and is tied to a set of radio buttons
+    # $opt is the associated option.
+    method MakeCharPickerEntry {opt {default_rb_value {}}} {
+        set e $_charf.f${opt}.e-other
+        ttk::entry $e -textvariable [myvar _other($opt)] -width 2 -validate all -validatecommand [mymethod ValidateCharPickerEntry %d $opt %s %P $default_rb_value]
+        return $e
+    }
+
+    # Validation callback for the "Other" entry fields. Ensures no more
+    # than one char and also configures radio buttons based on content
+    method ValidateCharPickerEntry {validation_type opt old new {default_rb_value {}}} {
+        if {$validation_type == -1} {
+            # Revalidation
+        } else {
+            # Prevalidation
+            # Don't allow more than one char in field
+            if {[string length $new] > 1} {
+                return 0
+            }
+        }
+        if {[string length $new] == 0} {
+            if {$options($opt) eq "other"} {
+                # "Other" radio selected and empty field, reset radio button
+                # We used to reset to the default button but that does not work
+                # well when changing the content of the Other entry field
+                if {0} {
+                    set options($opt) $default_rb_value
+                }
+            }
+        } else {
+            set options($opt) "other"
+        }
+        after idle after 0 [mymethod Redisplay]
+        return 1
+    }
+
+    # Make a labelled frame containing the radiobuttons for selecting
+    # characters used for special purposes.
+    method MakeCharPickerFrame {opt title rblist {default_rb_value {}}} {
+        set f [ttk::labelframe $_charf.f$opt -text [mc $title]]
+        set rbi -1
+        foreach {label value} $rblist {
+            set w [ttk::radiobutton $f.rb[incr rbi] -text [mc $label] -value $value -variable [myvar options($opt)] -command [mymethod Redisplay]]
+            grid $w - -sticky ew
+        }
+        set w [ttk::radiobutton $f.rb-other -text Other -value "other" -variable [myvar options($opt)] -command [mymethod Redisplay]]
+        set e [$self MakeCharPickerEntry $opt $default_rb_value]
+        grid $w $e -sticky w
+        grid columnconfigure $f all -uniform width
+        return $f
+    }
+
+    # Called when entire display has to be redone, for example when the
+    # delimiter is changed
+    method Redisplay {} {
+        if {$options(-delimiter) eq "other" &&
+            (![info exists _other(-delimiter)] || $_other(-delimiter) eq "")} {
+            focus $_charf.f-delimiter.e-other
+            return
+        }
+
+        set rows [$self ChanRead]
+        set nrows [llength $rows]
+        # Find the max number of columns
+        set ncols 0
+        foreach row $rows {
+            if {[llength $row] > $ncols} {
+                set ncols [llength $row]
+            }
+        }
+        set f [tclcsv::sframe content $_dataf]
+        destroy {*}[winfo children $f]
+        array unset _included_columns *
+
+        if {$nrows == 0 || $ncols == 0} {
+            grid [ttk::label $f.l-nodata -text "No data to display"] -sticky nw
+            return
+        }
+
+        if {[dict size $options(-columntypes)]} {
+            set _data_grid_first_data_row 4
+            set _data_grid_first_data_col 1
+            grid [ttk::label $f.l-colname -text [mc heading_l]] -sticky ew -padx 1 -row 1 -column 0
+            grid [ttk::label $f.l-coltype -text [mc type_l]] -sticky ew -padx 1 -row 2 -column 0
+            grid [ttk::separator $f.sep-0 -orient horizontal] -sticky ew -padx 1 -row 3 -column 0 -pady 4
+        } else {
+            set _data_grid_first_data_row 2
+            set _data_grid_first_data_col 0
+        }
+        set grid_col $_data_grid_first_data_col
+        set type_display_strings [$self ColumnTypeDisplayStrings]
+        for {set j 0} {$j < $ncols} {incr j; incr grid_col} {
+            # Widget for whether to include the column when reading data
+            set _included_columns($j) 1
+            set cb [ttk::checkbutton $f.cb-colinc-$j -text [mc include_l] -variable [myvar _included_columns($j)] -command [mymethod IncludeColumn $j]]
+            grid $cb -sticky ew -padx 1 -row 0 -column $grid_col
+
+            if {[dict size $options(-columntypes)]} {
+                # Entry boxes for column heading
+                set e [ttk::entry $f.e-heading-$j -textvariable [myvar _column_headings($j)]]
+                grid $e -sticky ew -padx 1 -row 1 -column $grid_col
+
+                # Widget for specifying type of the column (for alignment)
+                set combo [ttk::combobox $f.cb-type-$j -width 8 -textvariable [myvar _column_type_display_strings($j)] -values $type_display_strings -state readonly]
+                bind $combo <<ComboboxSelected>> [mymethod ChangeColumnType $j]
+                grid $combo -sticky ew -padx 1 -row 2 -column $grid_col
+
+            }
+            # Separate the meta fields from data
+            grid [ttk::separator $f.sep-$grid_col -orient horizontal] -sticky ew -padx 1 -row [expr {$_data_grid_first_data_row-1}] -column $grid_col -pady 4
+        }
+
+        # grid_row tracks the row in the display widget
+        # i tracks the data row index
+        set grid_row $_data_grid_first_data_row
+        set grid_col $_data_grid_first_data_col
+        set i 0
+        if {$options(-headerpresent)} {
+            # If we are displaying the column metadata, the header
+            # (or its substitute) is displayed there so won't display it here.
+            # Instead fill in the column meta header entries if they are
+            # not defined or are empty.
+            if {[dict size $options(-columntypes)]} {
+                for {set j 0} {$j < $ncols} {incr j; incr grid_col} {
+                    if {![info exists _column_headings($j)] ||
+                        $_column_headings($j) eq ""} {
+                        set _column_headings($j) [lindex $rows $i $j]
+                    }
+                }
+            } else {
+                for {set j 0} {$j < $ncols} {incr j; incr grid_col} {
+                    set l [ttk::label $f.l-$grid_row-$j -font [list {*}[font configure TkDefaultFont] -weight bold]]
+                    tclcsv::format_label $l [lindex $rows $i $j]
+                    grid $l -row $grid_row -column $grid_col -sticky ew -padx 1
+                }
+                incr grid_row
+            }
+            incr i; # Skip first line of data
+        }
+        for {} {$i < $nrows} {incr i; incr grid_row} {
+            set grid_col $_data_grid_first_data_col
+            for {set j 0} {$j < $ncols} {incr j; incr grid_col} {
+                if {[$self ColumnAlignment $j] eq "right"} {
+                    set anchor e
+                } else {
+                    set anchor w
+                }
+                set l [ttk::label $f.l-$grid_row-$j -background white -anchor $anchor]
+                tclcsv::format_label $l [lindex $rows $i $j]
+                grid $l -row $grid_row -column $grid_col -sticky ew -padx 1
+            }
+        }
+        after 0 after idle [list tclcsv::sframe resize $_dataf]
+        return
+    }
+
+    method DataGridRowIndexStart {} {
+        return $_data_grid_first_data_row
+    }
+
+    method DataGridRowIndexLimit {} {
+        # The last data grid row depends on whether a header is marked
+        # present and if it is displayed as part of column metadata
+        # in the "Heading" line
+        set first [$self DataGridRowIndexStart]
+        set limit [expr {$first + $_num_data_lines}]
+        if {[dict size $options(-columntypes)] && $options(-headerpresent)} {
+            incr limit -1
+        }
+        return $limit
+    }
+
+    # Handler when user clicks on the include column checkboxes
+    method IncludeColumn {ci} {
+        set f [tclcsv::sframe content $_dataf]
+        set ri [$self DataGridRowIndexStart]
+        set limit [$self DataGridRowIndexLimit]
+        if {$_included_columns($ci)} {
+            while {$ri < $limit} {
+                $f.l-$ri-$ci configure -state enabled
+                incr ri
+            }
+        } else {
+            while {$ri < $limit} {
+                $f.l-$ri-$ci configure -state disabled
+                incr ri
+            }
+        }
+        return
+    }
+
+    # Handler for changing a column's type. Changes the sample alignment
+    method ChangeColumnType {ci} {
+        set f [tclcsv::sframe content $_dataf]
+        set ri [$self DataGridRowIndexStart]
+        set limit [$self DataGridRowIndexLimit]
+        if {[$self ColumnAlignment $ci] eq "right"} {
+            set anchor e
+        } else {
+            set anchor w
+        }
+        while {$ri < $limit} {
+            $f.l-$ri-$ci configure -anchor $anchor
+            incr ri
+        }
+        return
+    }
+
+    # Constructs the list of display strings corresponding to column
+    # type tokens.
+    method ColumnTypeDisplayStrings {} {
+        set l {}
+        # Note we do not just get the keys from _column_type_display_to_token
+        # because that would be in random order
+        dict for {key meta} $options(-columntypes) {
+            lappend l [dict get $meta display]
+        }
+        return $l
+    }
+
+    # Returns the alignment for a column (left or right)
+    method ColumnAlignment {ci} {
+        if {[info exists _column_type_display_strings($ci)]} {
+            set display $_column_type_display_strings($ci)
+            set coltype $_column_type_display_to_token($display)
+            return [dict get $options(-columntypes) $coltype align]
+        }
+        return "left"
+    }
+
+    # Save the channel settings and initialize it. Sniffs likely
+    # CSV format
+    method ChanInit {chan} {
+        # See if we were passed in a channel or a path
+        if {$chan ni [chan names]} {
+            # Not a channel. Presume it is a file.
+            set _channel(path) $chan
+            set chan [open $chan r]
+        }
+
+        set _channel(original_encoding) [chan configure $chan -encoding]
+        set _channel(original_position)  [chan tell $chan]
+        if {$_channel(original_position) == -1} {
+            error "Channel does not support seeking."
+        }
+        set _channel(name) $chan
+
+        # Guess the format of the CSV
+        array set options [tclcsv::sniff $chan]
+        if {[llength [tclcsv::sniff_header $chan]] > 1} {
+            set options(-headerpresent) 1
+        } else {
+            set options(-headerpresent) 0
+        }
+        # Note above setting will be overwritten by options passed by app
+
+        return
+    }
+
+    # Parse CSV from the channel based on the current option settings.
+    # Sets up the header and type by sniffing the channel
+    method ChanRead {} {
+        set opts [$self CollectCsvOptions]
+        if {[dict get $opts -delimiter] eq ""} {
+            error "Delimiter must be specified."
+        }
+
+        lappend opts -nrows $_max_data_lines
+
+        # Rewind the file to where we started from
+        chan seek $_channel(name) $_channel(original_position)
+        chan configure $_channel(name) -encoding $options(-encoding)
+
+        # Figure out the header if necessary but only overwrite existing
+        # headers if number of columns has changed
+        if {[dict size $options(-columntypes)]} {
+            set headers [tclcsv::sniff_header {*}$opts $_channel(name)]
+            set types [lindex $headers 0]
+            if {![info exists _column_type_display_strings] ||
+                [array size _column_type_display_strings] != [llength $types]} {
+                array unset _column_type_display_strings *
+                for {set i 0} {$i < [llength $types]} {incr i} {
+                    set coltype [lindex $types $i]
+                    set _column_type_display_strings($i) [dict get $options(-columntypes) $coltype display]
+                }
+            }
+            if {[llength $headers] > 1} {
+                set headings [lindex $headers 1]
+                if {![info exists _column_headings] ||
+                    [array size _column_headings] != [llength $headings]} {
+                    array unset _column_headings *
+                    for {set i 0} {$i < [llength $headings]} {incr i} {
+                        set _column_headings($i) [lindex $headings $i]
+                    }
+                }
+            }
+        }
+        set rows [tclcsv::csv_read {*}$opts $_channel(name)]
+        chan seek $_channel(name) $_channel(original_position)
+        set _num_data_lines [llength $rows]
+        return $rows
+    }
+
+    method CollectCsvOptions {} {
+        foreach opt {-delimiter -comment -escape -quote -skipleadingspace -skipblanklines -doublequote} {
+            if {$options($opt) ne "other"} {
+                lappend opts $opt $options($opt)
+            } elseif {[info exists _other($opt)]} {
+                lappend opts $opt $_other($opt)
+            } else {
+                lappend opts $opt ""
+            }
+        }
+        return $opts
+    }
+
+    # Returns the channel
+    method channel {} {
+        return $_channel(name)
+    }
+
+    # Returns the current setting of -encoding
+    method encoding {} {
+        # Not part of dialectsettings because that can be passed directly
+        # to csv_read
+        return $options(-encoding)
+    }
+
+    # Returns the settings related to the CSV dialect and fields to be
+    # included. Can be passed
+    # to cvs_read
+    method dialect {} {
+        set opts [$self CollectCsvOptions]
+        if {[dict get $opts -delimiter] eq ""} {
+            dict unset opts -delimiter
+        }
+        if {$options(-headerpresent)} {
+            lappend opts -startline 1
+        }
+        set ncols [array size _included_columns]
+        set included {}
+        for {set i 0} {$i < $ncols} {incr i} {
+            if {[info exists _included_columns($i)] && $_included_columns($i)} {
+                lappend included $i
+            }
+        }
+        if {[llength $included] == 0} {
+            # Exclude all
+            lappend opts -excludefields [lsort -integer [array names _included_columns]]
+        } elseif {[llength $included] != $ncols} {
+            # Only subset of columns included
+            lappend opts -includefields $included
+        }
+        return $opts
+    }
+
+    # Returns the current settings related to column types and names
+    method columnsettings {} {
+        if {[dict size $options(-columntypes)] == 0} {
+            error "Option -columntypes was not specified."
+        }
+        set ncols [array size _included_columns]
+        set header {}
+        for {set i 0} {$i < $ncols} {incr i} {
+            # Note some rows may have extra fields so always check if
+            # corresponding array entry actually exists
+
+            if {![info exists _included_columns($i)] ||
+                !$_included_columns($i)} {
+                continue;       # Skip this columns
+            }
+            if {[info exists _column_headings($i)] && $_column_headings($i) ne ""} {
+                set heading $_column_headings($i)
+            } else {
+                set heading "Column_$i"
+            }
+            if {[info exists _column_type_display_strings($i)]} {
+                set display $_column_type_display_strings($i)
+                set type $_column_type_display_to_token($display)
+            } else {
+                set type "string"
+            }
+            lappend header [list heading $heading type $type]
+        }
+        return $header
+    }
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/d_config.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/d_config.tcl
new file mode 100644
index 00000000..29de11d7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/d_config.tcl
@@ -0,0 +1,10 @@
+# (c) 2022 Andreas Kupries
+# Error wrapper for deprecated package
+# Deprecated:
+# - doctools::config
+# Replacement:
+# - struct::map
+
+error "The package doctools::config is stage 2 deprecated. Use struct::map instead."
+package provide doctools::config 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/d_paths.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/d_paths.tcl
new file mode 100644
index 00000000..3a1f44a8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/d_paths.tcl
@@ -0,0 +1,10 @@
+# (c) 2019 Andreas Kupries
+# Redirection wrapper for deprecated package
+# Deprecated:
+# - doctools::paths
+# Replacement:
+# - fileutil::paths
+
+error "The package doctools::paths is stage 2 deprecated. Use fileutil::paths instead."
+package provide doctools::paths 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/p_config.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/p_config.tcl
new file mode 100644
index 00000000..df9f3b40
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/p_config.tcl
@@ -0,0 +1,10 @@
+# (c) 2019 Andreas Kupries
+# Redirection wrapper for deprecated package
+# Deprecated:
+# - configuration
+# Replacement:
+# - struct::map
+
+error "The package configuration is stage 2 deprecated. Use struct::map instead."
+package provide configuration 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/p_paths.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/p_paths.tcl
new file mode 100644
index 00000000..91edabed
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/p_paths.tcl
@@ -0,0 +1,9 @@
+# (c) 2019 Andreas Kupries
+# Redirection wrapper for deprecated package
+# Deprecated:
+# - paths
+# Replacement:
+# - fileutil::paths
+
+error "The package paths is stage 2 deprecated. Use fileutil::paths instead."
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/pkgIndex.tcl
new file mode 100644
index 00000000..8875dbb8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/0compatibility/pkgIndex.tcl
@@ -0,0 +1,29 @@
+# Compatibility wrapper for deprecated packages.
+##
+# Stages
+# [D1] Next Release   - Noted deprecated, with redirection wrappers
+# [D2] Release After  - Wrappers become Blockers, throwing error noting redirection
+# [D3] Release Beyond - All removed.
+##
+# Currently in deprecation
+# - D1 doctools::path	(doctools2base)
+# - D1 doctools::config	(doctools2base)
+# - D1 configuration	(pt)
+# - D1 paths		(pt)
+#
+# :Attention:
+# - Original    `doctools::paths`     Tcl 8.4 required
+#   Replacement `fileutilutil::paths` Tcl 8.5 required!
+
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+
+package ifneeded configuration    1   [list source [file join $dir p_config.tcl]]
+package ifneeded doctools::config 0.1 [list source [file join $dir d_config.tcl]]
+package ifneeded doctools::paths  0.1 [list source [file join $dir d_paths.tcl]]
+package ifneeded paths            1   [list source [file join $dir p_paths.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+
+
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/aes/aes.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/aes/aes.tcl
new file mode 100644
index 00000000..6a1849bd
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/aes/aes.tcl
@@ -0,0 +1,625 @@
+# aes.tcl - 
+#
+# Copyright (c) 2005 Thorsten Schloermann
+# Copyright (c) 2005 Pat Thoyts <patthoyts@users.sourceforge.net>
+# Copyright (c) 2013 Andreas Kupries
+#
+# A Tcl implementation of the Advanced Encryption Standard (US FIPS PUB 197)
+#
+# AES is a block cipher with a block size of 128 bits and a variable
+# key size of 128, 192 or 256 bits.
+# The algorithm works on each block as a 4x4 state array. There are 4 steps
+# in each round:
+#   SubBytes    a non-linear substitution step using a predefined S-box
+#   ShiftRows   cyclic transposition of rows in the state matrix
+#   MixColumns  transformation upon columns in the state matrix
+#   AddRoundKey application of round specific sub-key
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.5
+
+namespace eval ::aes {
+    variable uid
+    if {![info exists uid]} { set uid 0 }
+
+    namespace export aes
+
+    # constants
+
+    # S-box
+    variable sbox {
+        0x63 0x7c 0x77 0x7b 0xf2 0x6b 0x6f 0xc5 0x30 0x01 0x67 0x2b 0xfe 0xd7 0xab 0x76
+        0xca 0x82 0xc9 0x7d 0xfa 0x59 0x47 0xf0 0xad 0xd4 0xa2 0xaf 0x9c 0xa4 0x72 0xc0
+        0xb7 0xfd 0x93 0x26 0x36 0x3f 0xf7 0xcc 0x34 0xa5 0xe5 0xf1 0x71 0xd8 0x31 0x15
+        0x04 0xc7 0x23 0xc3 0x18 0x96 0x05 0x9a 0x07 0x12 0x80 0xe2 0xeb 0x27 0xb2 0x75
+        0x09 0x83 0x2c 0x1a 0x1b 0x6e 0x5a 0xa0 0x52 0x3b 0xd6 0xb3 0x29 0xe3 0x2f 0x84
+        0x53 0xd1 0x00 0xed 0x20 0xfc 0xb1 0x5b 0x6a 0xcb 0xbe 0x39 0x4a 0x4c 0x58 0xcf
+        0xd0 0xef 0xaa 0xfb 0x43 0x4d 0x33 0x85 0x45 0xf9 0x02 0x7f 0x50 0x3c 0x9f 0xa8
+        0x51 0xa3 0x40 0x8f 0x92 0x9d 0x38 0xf5 0xbc 0xb6 0xda 0x21 0x10 0xff 0xf3 0xd2
+        0xcd 0x0c 0x13 0xec 0x5f 0x97 0x44 0x17 0xc4 0xa7 0x7e 0x3d 0x64 0x5d 0x19 0x73
+        0x60 0x81 0x4f 0xdc 0x22 0x2a 0x90 0x88 0x46 0xee 0xb8 0x14 0xde 0x5e 0x0b 0xdb
+        0xe0 0x32 0x3a 0x0a 0x49 0x06 0x24 0x5c 0xc2 0xd3 0xac 0x62 0x91 0x95 0xe4 0x79
+        0xe7 0xc8 0x37 0x6d 0x8d 0xd5 0x4e 0xa9 0x6c 0x56 0xf4 0xea 0x65 0x7a 0xae 0x08
+        0xba 0x78 0x25 0x2e 0x1c 0xa6 0xb4 0xc6 0xe8 0xdd 0x74 0x1f 0x4b 0xbd 0x8b 0x8a
+        0x70 0x3e 0xb5 0x66 0x48 0x03 0xf6 0x0e 0x61 0x35 0x57 0xb9 0x86 0xc1 0x1d 0x9e
+        0xe1 0xf8 0x98 0x11 0x69 0xd9 0x8e 0x94 0x9b 0x1e 0x87 0xe9 0xce 0x55 0x28 0xdf
+        0x8c 0xa1 0x89 0x0d 0xbf 0xe6 0x42 0x68 0x41 0x99 0x2d 0x0f 0xb0 0x54 0xbb 0x16
+    }
+    # inverse S-box
+    variable xobs {
+        0x52 0x09 0x6a 0xd5 0x30 0x36 0xa5 0x38 0xbf 0x40 0xa3 0x9e 0x81 0xf3 0xd7 0xfb
+        0x7c 0xe3 0x39 0x82 0x9b 0x2f 0xff 0x87 0x34 0x8e 0x43 0x44 0xc4 0xde 0xe9 0xcb
+        0x54 0x7b 0x94 0x32 0xa6 0xc2 0x23 0x3d 0xee 0x4c 0x95 0x0b 0x42 0xfa 0xc3 0x4e
+        0x08 0x2e 0xa1 0x66 0x28 0xd9 0x24 0xb2 0x76 0x5b 0xa2 0x49 0x6d 0x8b 0xd1 0x25
+        0x72 0xf8 0xf6 0x64 0x86 0x68 0x98 0x16 0xd4 0xa4 0x5c 0xcc 0x5d 0x65 0xb6 0x92
+        0x6c 0x70 0x48 0x50 0xfd 0xed 0xb9 0xda 0x5e 0x15 0x46 0x57 0xa7 0x8d 0x9d 0x84
+        0x90 0xd8 0xab 0x00 0x8c 0xbc 0xd3 0x0a 0xf7 0xe4 0x58 0x05 0xb8 0xb3 0x45 0x06
+        0xd0 0x2c 0x1e 0x8f 0xca 0x3f 0x0f 0x02 0xc1 0xaf 0xbd 0x03 0x01 0x13 0x8a 0x6b
+        0x3a 0x91 0x11 0x41 0x4f 0x67 0xdc 0xea 0x97 0xf2 0xcf 0xce 0xf0 0xb4 0xe6 0x73
+        0x96 0xac 0x74 0x22 0xe7 0xad 0x35 0x85 0xe2 0xf9 0x37 0xe8 0x1c 0x75 0xdf 0x6e
+        0x47 0xf1 0x1a 0x71 0x1d 0x29 0xc5 0x89 0x6f 0xb7 0x62 0x0e 0xaa 0x18 0xbe 0x1b
+        0xfc 0x56 0x3e 0x4b 0xc6 0xd2 0x79 0x20 0x9a 0xdb 0xc0 0xfe 0x78 0xcd 0x5a 0xf4
+        0x1f 0xdd 0xa8 0x33 0x88 0x07 0xc7 0x31 0xb1 0x12 0x10 0x59 0x27 0x80 0xec 0x5f
+        0x60 0x51 0x7f 0xa9 0x19 0xb5 0x4a 0x0d 0x2d 0xe5 0x7a 0x9f 0x93 0xc9 0x9c 0xef
+        0xa0 0xe0 0x3b 0x4d 0xae 0x2a 0xf5 0xb0 0xc8 0xeb 0xbb 0x3c 0x83 0x53 0x99 0x61
+        0x17 0x2b 0x04 0x7e 0xba 0x77 0xd6 0x26 0xe1 0x69 0x14 0x63 0x55 0x21 0x0c 0x7d
+    }
+}
+
+# aes::Init --
+#
+#	Initialise our AES state and calculate the key schedule. An initialization
+#	vector is maintained in the state for modes that require one. The key must
+#	be binary data of the correct size and the IV must be 16 bytes.
+#
+#	Nk: columns of the key-array
+#	Nr: number of rounds (depends on key-length)
+#	Nb: columns of the text-block, is always 4 in AES
+#
+proc ::aes::Init {mode key iv} {
+    switch -exact -- $mode {
+        ecb - cbc { }
+        cfb - ofb {
+            return -code error "$mode mode not implemented"
+        }
+        default {
+            return -code error "invalid mode \"$mode\":\
+                must be one of ecb or cbc."
+        }
+    }
+
+    set size [expr {[string length $key] << 3}]
+    switch -exact -- $size {
+        128 {set Nk 4; set Nr 10; set Nb 4}
+        192 {set Nk 6; set Nr 12; set Nb 4}
+        256 {set Nk 8; set Nr 14; set Nb 4}
+        default {
+            return -code error "invalid key size \"$size\":\
+                must be one of 128, 192 or 256."
+        }
+    }
+
+    variable uid
+    set Key [namespace current]::[incr uid]
+    upvar #0 $Key state
+    if {[binary scan $iv Iu4 state(I)] != 1} {
+        return -code error "invalid initialization vector: must be 16 bytes"
+    }
+    array set state [list M $mode K $key Nk $Nk Nr $Nr Nb $Nb W {}]
+    ExpandKey $Key
+    return $Key
+}
+
+# aes::Reset --
+#
+#	Reset the initialization vector for the specified key. This permits the
+#	key to be reused for encryption or decryption without the expense of
+#	re-calculating the key schedule.
+#
+proc ::aes::Reset {Key iv} {
+    upvar #0 $Key state
+    if {[binary scan $iv Iu4 state(I)] != 1} {
+        return -code error "invalid initialization vector: must be 16 bytes"
+    }
+    return
+}
+    
+# aes::Final --
+#
+#	Clean up the key state
+#
+proc ::aes::Final {Key} {
+    # FRINK: nocheck
+    unset $Key
+}
+
+# -------------------------------------------------------------------------
+
+# 5.1 Cipher:  Encipher a single block of 128 bits.
+proc ::aes::EncryptBlock {Key block} {
+    upvar #0 $Key state
+    if {[binary scan $block Iu4 data] != 1} {
+        return -code error "invalid block size: blocks must be 16 bytes"
+    }
+
+    if {$state(M) eq {cbc}} {
+        # Loop unrolled.
+        lassign $data     d0 d1 d2 d3
+        lassign $state(I) s0 s1 s2 s3
+        set data [list \
+                      [expr {$d0 ^ $s0}] \
+                      [expr {$d1 ^ $s1}] \
+                      [expr {$d2 ^ $s2}] \
+                      [expr {$d3 ^ $s3}] ]
+    }
+
+    set data [AddRoundKey $Key 0 $data]
+    for {set n 1} {$n < $state(Nr)} {incr n} {
+        set data [AddRoundKey $Key $n [MixColumns [ShiftRows [SubBytes $data]]]]
+    }
+    set data [AddRoundKey $Key $n [ShiftRows [SubBytes $data]]]
+
+    # Bug 2993029:
+    # Force all elements of data into the 32bit range.
+    # Loop unrolled
+    set res [Clamp32 $data]
+
+    set state(I) $res
+    binary format Iu4 $res
+}
+
+# 5.3: Inverse Cipher: Decipher a single 128 bit block.
+proc ::aes::DecryptBlock {Key block} {
+    upvar #0 $Key state
+    if {[binary scan $block Iu4 data] != 1} {
+        return -code error "invalid block size: block must be 16 bytes"
+    }
+    set iv $data
+
+    set n $state(Nr)
+    set data [AddRoundKey $Key $state(Nr) $data]
+    for {incr n -1} {$n > 0} {incr n -1} {
+        set data [InvMixColumns [AddRoundKey $Key $n [InvSubBytes [InvShiftRows $data]]]]
+    }
+    set data [AddRoundKey $Key $n [InvSubBytes [InvShiftRows $data]]]
+    
+    if {$state(M) eq {cbc}} {
+        lassign $data     d0 d1 d2 d3
+        lassign $state(I) s0 s1 s2 s3
+        set data [list \
+                      [expr {($d0 ^ $s0) & 0xffffffff}] \
+                      [expr {($d1 ^ $s1) & 0xffffffff}] \
+                      [expr {($d2 ^ $s2) & 0xffffffff}] \
+                      [expr {($d3 ^ $s3) & 0xffffffff}] ]
+    } else {
+        # Bug 2993029:
+        # The integrated clamping we see above only happens for CBC mode.
+        set data [Clamp32 $data]
+    }
+
+    set state(I) $iv
+    binary format Iu4 $data
+}
+
+proc ::aes::Clamp32 {data} {
+    # Force all elements into 32bit range.
+    lassign $data d0 d1 d2 d3
+    list \
+        [expr {$d0 & 0xffffffff}] \
+        [expr {$d1 & 0xffffffff}] \
+        [expr {$d2 & 0xffffffff}] \
+        [expr {$d3 & 0xffffffff}]
+}
+
+# 5.2: KeyExpansion
+proc ::aes::ExpandKey {Key} {
+    upvar #0 $Key state
+    set Rcon [list 0x00000000 0x01000000 0x02000000 0x04000000 0x08000000 \
+                   0x10000000 0x20000000 0x40000000 0x80000000 0x1b000000 \
+                   0x36000000 0x6c000000 0xd8000000 0xab000000 0x4d000000]
+    # Split the key into Nk big-endian words
+    binary scan $state(K) I* W
+    set max [expr {$state(Nb) * ($state(Nr) + 1)}]
+    set i $state(Nk)
+    set h [expr {$i - 1}]
+    set j 0
+    for {} {$i < $max} {incr i; incr h; incr j} {
+        set temp [lindex $W $h]
+        if {($i % $state(Nk)) == 0} {
+            set sub [SubWord [RotWord $temp]]
+            set rc [lindex $Rcon [expr {$i/$state(Nk)}]]
+            set temp [expr {$sub ^ $rc}]
+        } elseif {$state(Nk) > 6 && ($i % $state(Nk)) == 4} { 
+            set temp [SubWord $temp]
+        }
+        lappend W [expr {[lindex $W $j] ^ $temp}]
+    }
+    set state(W) $W
+}
+
+# 5.2: Key Expansion: Apply S-box to each byte in the 32 bit word
+proc ::aes::SubWord {w} {
+    variable sbox
+    set s3 [lindex $sbox [expr {($w >> 24) & 255}]]
+    set s2 [lindex $sbox [expr {($w >> 16) & 255}]]
+    set s1 [lindex $sbox [expr {($w >> 8 ) & 255}]]
+    set s0 [lindex $sbox [expr { $w        & 255}]]
+    return [expr {($s3 << 24) | ($s2 << 16) | ($s1 << 8) | $s0}]
+}
+
+proc ::aes::InvSubWord {w} {
+    variable xobs
+    set s3 [lindex $xobs [expr {($w >> 24) & 255}]]
+    set s2 [lindex $xobs [expr {($w >> 16) & 255}]]
+    set s1 [lindex $xobs [expr {($w >> 8 ) & 255}]]
+    set s0 [lindex $xobs [expr { $w        & 255}]]
+    return [expr {($s3 << 24) | ($s2 << 16) | ($s1 << 8) | $s0}]
+}
+
+# 5.2: Key Expansion: Rotate a 32bit word by 8 bits
+proc ::aes::RotWord {w} {
+    return [expr {(($w << 8) | (($w >> 24) & 0xff)) & 0xffffffff}]
+}
+
+# 5.1.1: SubBytes() Transformation
+proc ::aes::SubBytes {words} {
+    lassign $words w0 w1 w2 w3
+    list [SubWord $w0] [SubWord $w1] [SubWord $w2] [SubWord $w3]
+}
+
+# 5.3.2: InvSubBytes() Transformation
+proc ::aes::InvSubBytes {words} {
+    lassign $words w0 w1 w2 w3
+    list [InvSubWord $w0] [InvSubWord $w1] [InvSubWord $w2] [InvSubWord $w3]
+}
+
+# 5.1.2: ShiftRows() Transformation
+proc ::aes::ShiftRows {words} {
+    for {set n0 0} {$n0 < 4} {incr n0} {
+        set n1 [expr {($n0 + 1) % 4}]
+        set n2 [expr {($n0 + 2) % 4}]
+        set n3 [expr {($n0 + 3) % 4}]
+        lappend r [expr {(  [lindex $words $n0] & 0xff000000)
+                         | ([lindex $words $n1] & 0x00ff0000)
+                         | ([lindex $words $n2] & 0x0000ff00)
+                         | ([lindex $words $n3] & 0x000000ff)
+                     }]
+    }
+    return $r
+}
+
+
+# 5.3.1: InvShiftRows() Transformation
+proc ::aes::InvShiftRows {words} {
+    for {set n0 0} {$n0 < 4} {incr n0} {
+        set n1 [expr {($n0 + 1) % 4}]
+        set n2 [expr {($n0 + 2) % 4}]
+        set n3 [expr {($n0 + 3) % 4}]
+        lappend r [expr {(  [lindex $words $n0] & 0xff000000)
+                         | ([lindex $words $n3] & 0x00ff0000)
+                         | ([lindex $words $n2] & 0x0000ff00)
+                         | ([lindex $words $n1] & 0x000000ff)
+                     }]
+    }
+    return $r
+}
+
+# 5.1.3: MixColumns() Transformation
+proc ::aes::MixColumns {words} {
+    set r {}
+    foreach w $words {
+        set r0 [expr {(($w >> 24) & 255)}]
+        set r1 [expr {(($w >> 16) & 255)}]
+        set r2 [expr {(($w >> 8 ) & 255)}]
+        set r3 [expr {( $w        & 255)}]
+
+        set s0 [expr {[GFMult2 $r0] ^ [GFMult3 $r1] ^ $r2 ^ $r3}]
+        set s1 [expr {$r0 ^ [GFMult2 $r1] ^ [GFMult3 $r2] ^ $r3}]
+        set s2 [expr {$r0 ^ $r1 ^ [GFMult2 $r2] ^ [GFMult3 $r3]}]
+        set s3 [expr {[GFMult3 $r0] ^ $r1 ^ $r2 ^ [GFMult2 $r3]}]
+
+        lappend r [expr {($s0 << 24) | ($s1 << 16) | ($s2 << 8) | $s3}]
+    }
+    return $r
+}
+
+# 5.3.3: InvMixColumns() Transformation
+proc ::aes::InvMixColumns {words} {
+    set r {}
+    foreach w $words {
+        set r0 [expr {(($w >> 24) & 255)}]
+        set r1 [expr {(($w >> 16) & 255)}]
+        set r2 [expr {(($w >> 8 ) & 255)}]
+        set r3 [expr {( $w        & 255)}]
+
+        set s0 [expr {[GFMult0e $r0] ^ [GFMult0b $r1] ^ [GFMult0d $r2] ^ [GFMult09 $r3]}]
+        set s1 [expr {[GFMult09 $r0] ^ [GFMult0e $r1] ^ [GFMult0b $r2] ^ [GFMult0d $r3]}]
+        set s2 [expr {[GFMult0d $r0] ^ [GFMult09 $r1] ^ [GFMult0e $r2] ^ [GFMult0b $r3]}]
+        set s3 [expr {[GFMult0b $r0] ^ [GFMult0d $r1] ^ [GFMult09 $r2] ^ [GFMult0e $r3]}]
+
+        lappend r [expr {($s0 << 24) | ($s1 << 16) | ($s2 << 8) | $s3}]
+    }
+    return $r
+}
+
+# 5.1.4: AddRoundKey() Transformation
+proc ::aes::AddRoundKey {Key round words} {
+    upvar #0 $Key state
+    set r {}
+    set n [expr {$round * $state(Nb)}]
+    foreach w $words {
+        lappend r [expr {$w ^ [lindex $state(W) $n]}]
+        incr n
+    }
+    return $r
+}
+    
+# -------------------------------------------------------------------------
+# ::aes::GFMult*
+#
+#	some needed functions for multiplication in a Galois-field
+#
+proc ::aes::GFMult2 {number} {
+    # this is a tabular representation of xtime (multiplication by 2)
+    # it is used instead of calculation to prevent timing attacks
+    set xtime {
+        0x00 0x02 0x04 0x06 0x08 0x0a 0x0c 0x0e 0x10 0x12 0x14 0x16 0x18 0x1a 0x1c 0x1e
+        0x20 0x22 0x24 0x26 0x28 0x2a 0x2c 0x2e 0x30 0x32 0x34 0x36 0x38 0x3a 0x3c 0x3e 
+        0x40 0x42 0x44 0x46 0x48 0x4a 0x4c 0x4e 0x50 0x52 0x54 0x56 0x58 0x5a 0x5c 0x5e
+        0x60 0x62 0x64 0x66 0x68 0x6a 0x6c 0x6e 0x70 0x72 0x74 0x76 0x78 0x7a 0x7c 0x7e 
+        0x80 0x82 0x84 0x86 0x88 0x8a 0x8c 0x8e 0x90 0x92 0x94 0x96 0x98 0x9a 0x9c 0x9e 
+        0xa0 0xa2 0xa4 0xa6 0xa8 0xaa 0xac 0xae 0xb0 0xb2 0xb4 0xb6 0xb8 0xba 0xbc 0xbe 
+        0xc0 0xc2 0xc4 0xc6 0xc8 0xca 0xcc 0xce 0xd0 0xd2 0xd4 0xd6 0xd8 0xda 0xdc 0xde 
+        0xe0 0xe2 0xe4 0xe6 0xe8 0xea 0xec 0xee 0xf0 0xf2 0xf4 0xf6 0xf8 0xfa 0xfc 0xfe 
+        0x1b 0x19 0x1f 0x1d 0x13 0x11 0x17 0x15 0x0b 0x09 0x0f 0x0d 0x03 0x01 0x07 0x05 
+        0x3b 0x39 0x3f 0x3d 0x33 0x31 0x37 0x35 0x2b 0x29 0x2f 0x2d 0x23 0x21 0x27 0x25 
+        0x5b 0x59 0x5f 0x5d 0x53 0x51 0x57 0x55 0x4b 0x49 0x4f 0x4d 0x43 0x41 0x47 0x45 
+        0x7b 0x79 0x7f 0x7d 0x73 0x71 0x77 0x75 0x6b 0x69 0x6f 0x6d 0x63 0x61 0x67 0x65 
+        0x9b 0x99 0x9f 0x9d 0x93 0x91 0x97 0x95 0x8b 0x89 0x8f 0x8d 0x83 0x81 0x87 0x85 
+        0xbb 0xb9 0xbf 0xbd 0xb3 0xb1 0xb7 0xb5 0xab 0xa9 0xaf 0xad 0xa3 0xa1 0xa7 0xa5 
+        0xdb 0xd9 0xdf 0xdd 0xd3 0xd1 0xd7 0xd5 0xcb 0xc9 0xcf 0xcd 0xc3 0xc1 0xc7 0xc5 
+        0xfb 0xf9 0xff 0xfd 0xf3 0xf1 0xf7 0xf5 0xeb 0xe9 0xef 0xed 0xe3 0xe1 0xe7 0xe5
+    }
+    lindex $xtime $number
+}
+
+proc ::aes::GFMult3 {number} {
+    # multliply by 2 (via GFMult2) and add the number again on the result (via XOR)
+    expr {$number ^ [GFMult2 $number]}
+}
+
+proc ::aes::GFMult09 {number} {
+    # 09 is: (02*02*02) + 01
+    expr {[GFMult2 [GFMult2 [GFMult2 $number]]] ^ $number}
+}
+
+proc ::aes::GFMult0b {number} {
+    # 0b is: (02*02*02) + 02 + 01
+    #return [expr [GFMult2 [GFMult2 [GFMult2 $number]]] ^ [GFMult2 $number] ^ $number]
+    #set g0 [GFMult2 $number]
+    expr {[GFMult09 $number] ^ [GFMult2 $number]}
+}
+
+proc ::aes::GFMult0d {number} {
+    # 0d is: (02*02*02) + (02*02) + 01
+    set temp [GFMult2 [GFMult2 $number]]
+    expr {[GFMult2 $temp] ^ ($temp ^ $number)}
+}
+
+proc ::aes::GFMult0e {number} {
+    # 0e is: (02*02*02) + (02*02) + 02
+    set temp [GFMult2 [GFMult2 $number]]
+    expr {[GFMult2 $temp] ^ ($temp ^ [GFMult2 $number])}
+}
+
+# -------------------------------------------------------------------------
+
+# aes::Encrypt --
+#
+#	Encrypt a blocks of plain text and returns blocks of cipher text.
+#	The input data must be a multiple of the block size (16).
+#
+proc ::aes::Encrypt {Key data} {
+    set len [string length $data]
+    if {($len % 16) != 0} {
+        return -code error "invalid block size: AES requires 16 byte blocks"
+    }
+
+    set result {}
+    for {set i 0} {$i < $len} {incr i 1} {
+        set block [string range $data $i [incr i 15]]
+        append result [EncryptBlock $Key $block]
+    }
+    return $result
+}
+
+# aes::Decrypt --
+#
+#	Decrypt blocks of cipher text and returns blocks of plain text.
+#	The input data must be a multiple of the block size (16).
+#
+proc ::aes::Decrypt {Key data} {
+    set len [string length $data]
+    if {($len % 16) != 0} {
+        return -code error "invalid block size: AES requires 16 byte blocks"
+    }
+
+    set result {}
+    for {set i 0} {$i < $len} {incr i 1} {
+        set block [string range $data $i [incr i 15]]
+        append result [DecryptBlock $Key $block]
+    }
+    return $result
+}
+
+# -------------------------------------------------------------------------
+# chan event handler for chunked file reading.
+#
+proc ::aes::Chunk {Key in {out {}} {chunksize 4096}} {
+    upvar #0 $Key state
+
+    #puts ||CHUNK.X||i=$in|o=$out|c=$chunksize|eof=[eof $in]
+    
+    if {[eof $in]} {
+        chan event $in readable {}
+        set state(reading) 0
+    }
+
+    set data [read $in $chunksize]
+
+    #puts ||CHUNK.R||i=$in|o=$out|c=$chunksize|eof=[eof $in]||[string length $data]||$data||
+
+    # Do nothing when data was read at all.
+    if {$data eq {}} return
+
+    if {[eof $in]} {
+        #puts CHUNK.Z
+        set data [Pad $data 16]
+    }
+
+    #puts ||CHUNK.P||i=$in|o=$out|c=$chunksize|eof=[eof $in]||[string length $data]||$data||
+    
+    if {$out eq {}} {
+        append state(output) [$state(cmd) $Key $data]
+    } else {
+        puts -nonewline $out [$state(cmd) $Key $data]
+    }
+}
+
+proc ::aes::SetOneOf {lst item} {
+    set ndx [lsearch -glob $lst "${item}*"]
+    if {$ndx == -1} {
+        set err [join $lst ", "]
+        return -code error "invalid mode \"$item\": must be one of $err"
+    }
+    lindex $lst $ndx
+}
+
+proc ::aes::CheckSize {what size thing} {
+    if {[string length $thing] != $size} {
+        return -code error "invalid value for $what: must be $size bytes long"
+    }
+    return $thing
+}
+
+proc ::aes::Pad {data blocksize {fill \0}} {
+    set len [string length $data]
+    if {$len == 0} {
+        set data [string repeat $fill $blocksize]
+    } elseif {($len % $blocksize) != 0} {
+        set pad [expr {$blocksize - ($len % $blocksize)}]
+        append data [string repeat $fill $pad]
+    }
+    return $data
+}
+
+proc ::aes::Pop {varname {nth 0}} {
+    upvar 1 $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+proc ::aes::aes {args} {
+    array set opts {-dir encrypt -mode cbc -key {} -in {} -out {} -chunksize 4096 -hex 0}
+    set opts(-iv) [string repeat \0 16]
+    set modes {ecb cbc}
+    set dirs {encrypt decrypt}
+    while {([llength $args] > 1) && [string match -* [set option [lindex $args 0]]]} {
+        switch -exact -- $option {
+            -mode      { set opts(-mode) [SetOneOf $modes [Pop args 1]] }
+            -dir       { set opts(-dir) [SetOneOf $dirs [Pop args 1]] }
+            -iv        { set opts(-iv) [CheckSize -iv 16 [Pop args 1]] }
+            -key       { set opts(-key) [Pop args 1] }
+            -in        { set opts(-in) [Pop args 1] }
+            -out       { set opts(-out) [Pop args 1] }
+            -chunksize { set opts(-chunksize) [Pop args 1] }
+            -hex       { set opts(-hex) 1 }
+            --         { Pop args ; break }
+            default {
+                set err [join [lsort [array names opts]] ", "]
+                return -code error "bad option \"$option\":\
+                    must be one of $err"
+            }
+        }
+        Pop args
+    }
+
+    if {$opts(-key) eq {}} {
+        return -code error "no key provided: the -key option is required"
+    }
+
+    set r {}
+    if {$opts(-in) eq {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong \# args:\
+                should be \"aes ?options...? -key keydata plaintext\""
+        }
+
+        set data [Pad [lindex $args 0] 16]
+        set Key [Init $opts(-mode) $opts(-key) $opts(-iv)]
+        if {[string equal $opts(-dir) "encrypt"]} {
+            set r [Encrypt $Key $data]
+        } else {
+            set r [Decrypt $Key $data]
+        }
+
+        if {$opts(-out) ne {}} {
+            puts -nonewline $opts(-out) $r
+            set r {}
+        }
+        Final $Key
+
+    } else {
+
+        if {[llength $args] != 0} {
+            return -code error "wrong \# args:\
+                should be \"aes ?options...? -key keydata -in channel\""
+        }
+
+        set Key [Init $opts(-mode) $opts(-key) $opts(-iv)]
+
+        set readcmd [list [namespace origin Chunk] \
+                         $Key $opts(-in) $opts(-out) \
+                         $opts(-chunksize)]
+
+        upvar 1 $Key state
+        set state(reading) 1
+        if {[string equal $opts(-dir) "encrypt"]} {
+            set state(cmd) Encrypt
+        } else {
+            set state(cmd) Decrypt
+        }
+        set state(output) ""
+        chan event $opts(-in) readable $readcmd
+        if {[info commands ::tkwait] != {}} {
+            tkwait variable [subst $Key](reading)
+        } else {
+            vwait [subst $Key](reading)
+        }
+        if {$opts(-out) == {}} {
+            set r $state(output)
+        }
+        Final $Key
+    }
+
+    if {$opts(-hex)} {
+        binary scan $r H* r
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+package provide aes 1.2.1
+
+# -------------------------------------------------------------------------
+# Local variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/aes/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/aes/pkgIndex.tcl
new file mode 100644
index 00000000..83cc80fe
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/aes/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded aes 1.2.1 [list source [file join $dir aes.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/amazon-s3/S3.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/amazon-s3/S3.tcl
new file mode 100644
index 00000000..dfdaf424
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/amazon-s3/S3.tcl
@@ -0,0 +1,1960 @@
+# S3.tcl
+#
+###Abstract
+# This presents an interface to Amazon's S3 service.
+# The Amazon S3 service allows for reliable storage
+# and retrieval of data via HTTP.
+#
+# Copyright (c) 2006,2008 Darren New. All Rights Reserved.
+#
+###Copyright
+# NO WARRANTIES OF ANY TYPE ARE PROVIDED.
+# COPYING OR USE INDEMNIFIES THE AUTHOR IN ALL WAYS.
+#
+# This software is licensed under essentially the same
+# terms as Tcl. See LICENSE.txt for the terms.
+#
+###Revision String
+# SCCS: %Z% %M% %I% %E% %U%
+#
+###Change history:
+# 0.7.2 - added -default-bucket.
+# 0.8.0 - fixed bug in getLocal using wrong prefix.
+#         Upgraded to Tcl 8.5 release version.
+# 1.0.0 - added SetAcl, GetAcl, and -acl keep option.
+#
+
+package require Tcl 8.5
+
+# This is by Darren New too.
+# It is a SAX package to format XML for easy retrieval.
+# It should be in the same distribution as S3.
+package require xsxp
+
+# These three are required to do the auth, so always require them.
+#    Note that package registry and package fileutil are required
+#    by the individual routines that need them. Grep for "package".
+package require sha1
+package require md5
+package require base64
+
+package provide S3 1.0.3
+
+namespace eval S3 {
+    variable config          ; # A dict holding the current configuration.
+    variable config_orig     ; # Holds configuration to "reset" back to.
+    variable debug 0         ; # Turns on or off S3::debug
+    variable debuglog 0      ; # Turns on or off debugging into a file
+    variable bgvar_counter 0 ; # Makes unique names for bgvars.
+
+    set config_orig [dict create \
+        -reset false \
+        -retries 3 \
+        -accesskeyid "" -secretaccesskey "" \
+	-service-access-point "s3.amazonaws.com" \
+        -slop-seconds 3 \
+	-use-tls false \
+        -bucket-prefix "TclS3" \
+	-default-compare "always" \
+	-default-separator "/" \
+	-default-acl "" \
+	-default-bucket "" \
+	]
+
+    set config $config_orig
+}
+
+# Internal, for development. Print a line, and maybe log it.
+proc S3::debuglogline {line} {
+    variable debuglog
+    puts $line
+    if {$debuglog} {
+	set x [open debuglog.txt a]
+	puts $x $line
+	close $x
+    }
+}
+
+# Internal, for development. Print debug info properly formatted.
+proc S3::debug {args} {
+    variable debug
+    variable debuglog
+    if {!$debug} return
+    set res ""
+    if {"-hex" == [lindex $args 0]} {
+	set str [lindex $args 1]
+	foreach ch [split $str {}] {
+	    scan $ch %c val
+	    append res [format %02x $val]
+	    append res " "
+	}
+	debuglogline $res
+	return
+    }
+    if {"-dict" == [lindex $args 0]} {
+	set dict [lindex $args 1]
+	debuglogline "DEBUG dict:"
+	foreach {key val} $dict {
+	    set val [string map [list \
+		\r \\r \n \\n \0 \\0 ] $val]
+	    debuglogline "$key=$val"
+	}
+	return
+    }
+    set x [string map [list \
+        \r \\r \n \\n \0 \\0 ] $args]
+    debuglogline "DEBUG: $x"
+}
+
+# Internal. Throws an error if keys have not been initialized.
+proc S3::checkinit {} {
+    variable config
+    set error "S3 must be initialized with -accesskeyid and -secretaccesskey before use"
+    set e1 {S3 usage -accesskeyid "S3 identification not initialized"}
+    set e2 {S3 usage -secretaccesskey "S3 identification not initialized"}
+    if {[dict get $config -accesskeyid] eq ""} {
+	error $error "" $e1
+    }
+    if {[dict get $config -secretaccesskey] eq ""} {
+	error $error "" $e2
+    }
+}
+
+# Internal. Calculates the Content-Type for a given file name.
+# Naturally returns application/octet-stream if anything goes wrong.
+proc S3::contenttype {fname} {
+    if {$::tcl_platform(platform) == "windows"} {
+	set extension [file extension $fname]
+	uplevel #0 package require registry
+	set key "\\\\HKEY_CLASSES_ROOT\\"
+	set key "HKEY_CLASSES_ROOT\\"
+	if {"." != [string index $extension 0]} {append key .}
+	append key $extension
+	set ct "application/octet-stream"
+	if {$extension != ""} {
+	    catch {set ct [registry get $key {Content Type}]} caught
+	}
+    } else {
+	# Assume something like Unix.
+	if {[file readable /etc/mime.types]} {
+	    set extension [string trim [file extension $fname] "."]
+	    set f [open /etc/mime.types r]
+	    while {-1 != [gets $f line] && ![info exists c]} {
+		set line [string trim $line]
+		if {[string match "#*" $line]} continue
+		if {0 == [string length $line]} continue
+		set items [split $line]
+		for {set i 1} {$i < [llength $items]} {incr i} {
+		    if {[lindex $items $i] eq $extension} {
+			set c [lindex $items 0]
+			break
+		    }
+		}
+	    }
+	    close $f
+	    if {![info exists c]} {
+		set ct "application/octet-stream"
+	    } else {
+		set ct [string trim $c]
+	    }
+	} else {
+	    # No /etc/mime.types here.
+	    if {[catch {exec file -i $fname} res]} {
+		set ct "application/octet-stream"
+	    } else {
+		set ct [string range $res [expr {1+[string first : $res]}] end]
+		if {-1 != [string first ";" $ct]} {
+		    set ct [string range $ct 0 [string first ";" $ct]]
+		}
+		set ct [string trim $ct "; "]
+	    }
+	}
+    }
+    return $ct
+}
+
+# Change current configuration. Not object-oriented, so only one
+# configuration is tracked per interpreter.
+proc S3::Configure {args} {
+    variable config
+    variable config_orig
+    if {[llength $args] == 0} {return $config}
+    if {[llength $args] == 1 && ![dict exists $config [lindex $args 0]]} {
+	error "Bad option \"[lindex $args 0]\": must be [join [dict keys $config] ,\  ]" "" [list S3 usage [lindex $args 0] "Bad option to config"]
+    }
+    if {[llength $args] == 1} {return [dict get $config [lindex $args 0]]}
+    if {[llength $args] % 2 != 0} {
+	error "Config args must be -name val -name val" "" [list S3 usage [lindex $args end] "Odd number of config args"]
+    }
+    set new $config
+    foreach {tag val} $args {
+	if {![dict exists $new $tag]} {
+	    error "Bad option \"$tag\": must be [join [dict keys $config] ,\  ]" "" [list S3 usage $tag "Bad option to config"]
+	}
+	dict set new $tag $val
+	if {$tag eq "-reset" && $val} {
+	    set new $config_orig
+	}
+    }
+    if {[dict get $config -use-tls]} {
+	error "TLS for S3 not yet implemented!" "" \
+	    [list S3 notyet -use-tls $config]
+    }
+    set config $new ; # Only update if all went well
+    return $config
+}
+
+# Suggest a unique bucket name based on usename and config info.
+proc S3::SuggestBucket {{usename ""}} {
+    checkinit
+    if {$usename eq ""} {set usename [::S3::Configure -bucket-prefix]}
+    if {$usename eq ""} {
+	error "S3::SuggestBucket requires name or -bucket-prefix set" \
+	"" [list S3 usage -bucket-prefix]
+    }
+    return $usename\.[::S3::Configure -accesskeyid]
+}
+
+# Calculate authorization token for REST interaction.
+# Doesn't work yet for "Expires" type headers. Hence, only for "REST".
+# We specifically don't call checkinit because it's called in all
+# callers and we don't want to throw an error inside here.
+# Caveat Emptor if you expect otherwise.
+# This is internal, but useful enough you might want to invoke it.
+proc S3::authREST {verb resource content-type headers args} {
+    if {[llength $args] != 0} {
+	set body [lindex $args 0] ; # we use [info exists] later
+    }
+    if {${content-type} != "" && [dict exists $headers content-type]} {
+	set content-type [dict get $headers content-type]
+    }
+    dict unset headers content-type
+    set verb [string toupper $verb]
+    if {[info exists body]} {
+	set content-md5 [::base64::encode [::md5::md5 $body]]
+	dict set headers content-md5 ${content-md5}
+	dict set headers content-length [string length $body]
+    } elseif {[dict exists $headers content-md5]} {
+	set content-md5 [dict get $headers content-md5]
+    } else {
+	set content-md5 ""
+    }
+    if {[dict exists $headers x-amz-date]} {
+	set date ""
+	dict unset headers date
+    } elseif {[dict exists $headers date]} {
+	set date [dict get $headers date]
+    } else {
+	set date [clock format [clock seconds] -gmt true -format \
+	    "%a, %d %b %Y %T %Z"]
+	dict set headers date $date
+    }
+    if {${content-type} != ""} {
+	dict set headers content-type ${content-type}
+    }
+    dict set headers host s3.amazonaws.com
+    set xamz ""
+    foreach key [lsort [dict keys $headers x-amz-*]] {
+	# Assume each is seen only once, for now, and is canonical already.
+        append xamz \n[string trim $key]:[string trim [dict get $headers $key]]
+    }
+    set xamz [string trim $xamz]
+    # Hmmm... Amazon lies. No \n after xamz if xamz is empty.
+    if {0 != [string length $xamz]} {append xamz \n}
+    set signthis \
+        "$verb\n${content-md5}\n${content-type}\n$date\n$xamz$resource"
+    S3::debug "Sign this:" $signthis ; S3::debug -hex $signthis
+    set sig [::sha1::hmac [S3::Configure -secretaccesskey] $signthis]
+    set sig [binary format H* $sig]
+    set sig [string trim [::base64::encode $sig]]
+    dict set headers authorization "AWS [S3::Configure -accesskeyid]:$sig"
+    return $headers
+}
+
+# Internal. Takes resource and parameters, tacks them together.
+# Useful enough you might want to invoke it yourself.
+proc S3::to_url {resource parameters} {
+    if {0 == [llength $parameters]} {return $resource}
+    if {-1 == [string first "?" $resource]} {
+	set front ?
+    } else {
+	set front &
+    }
+    foreach {key value} $parameters {
+	append resource $front $key "=" $value
+	set front &
+    }
+    return $resource
+}
+
+# Internal. Encode a URL, including utf-8 versions.
+# Useful enough you might want to invoke it yourself.
+proc S3::encode_url {orig} {
+    set res ""
+    set re {[-a-zA-Z0-9/.,_]}
+    foreach ch [split $orig ""] {
+	if {[regexp $re $ch]} {
+	    append res $ch
+	} else {
+	    foreach uch [split [encoding convertto utf-8 $ch] ""] {
+		append res "%"
+		binary scan $uch H2 hex
+		append res $hex
+	    }
+	}
+    }
+    if {$res ne $orig} {
+	S3::debug "URL Encoded:" $orig $res
+    }
+    return $res
+}
+
+# This is used internally to either queue an event-driven
+# item or to simply call the next routine, depending on
+# whether the current transaction is supposed to be running
+# in the background or not.
+proc S3::nextdo {routine thunk direction args} {
+    global errorCode
+    S3::debug "nextdo" $routine $thunk $direction $args
+    if {[dict get $thunk blocking]} {
+	return [S3::$routine $thunk]
+    } else {
+	if {[llength $args] == 2} {
+	    # fcopy failed!
+	    S3::fail $thunk "S3 fcopy failed: [lindex $args 1]" "" \
+		[list S3 socket $errorCode]
+	} else {
+	    fileevent [dict get $thunk S3chan] $direction \
+		[list S3::$routine $thunk]
+	    if {$direction == "writable"} {
+		fileevent [dict get $thunk S3chan] readable {}
+	    } else {
+		fileevent [dict get $thunk S3chan] writable {}
+	    }
+	}
+    }
+}
+
+# The proverbial It.  Do a REST call to Amazon S3 service.
+proc S3::REST {orig} {
+    variable config
+    checkinit
+    set EndPoint [dict get $config -service-access-point]
+
+    # Save the original stuff first.
+    set thunk [dict create orig $orig]
+
+    # Now add to thunk's top-level the important things
+    if {[dict exists $thunk orig resultvar]} {
+	dict set thunk blocking 0
+    } else {
+	dict set thunk blocking 1
+    }
+    if {[dict exists $thunk orig S3chan]} {
+	dict set thunk S3chan [dict get $thunk orig S3chan]
+    } elseif {[dict get $thunk blocking]} {
+	dict set thunk S3chan [socket $EndPoint 80]
+    } else {
+	dict set thunk S3chan [socket -async $EndPoint 80]
+    }
+    fconfigure [dict get $thunk S3chan] -translation binary -encoding binary
+
+    dict set thunk verb [dict get $thunk orig verb]
+    dict set thunk resource [S3::encode_url [dict get $thunk orig resource]]
+    if {[dict exists $orig rtype]} {
+	dict set thunk resource \
+	    [dict get $thunk resource]?[dict get $orig rtype]
+    }
+    if {[dict exists $orig headers]} {
+	dict set thunk headers [dict get $orig headers]
+    } else {
+	dict set thunk headers [dict create]
+    }
+    if {[dict exists $orig infile]} {
+	dict set thunk infile [dict get $orig infile]
+    }
+    if {[dict exists $orig content-type]} {
+	dict set thunk content-type [dict get $orig content-type]
+    } else {
+	if {[dict exists $thunk infile]} {
+	    set zz [dict get $thunk infile]
+	} else {
+	    set zz [dict get $thunk resource]
+	}
+	if {-1 != [string first "?" $zz]} {
+	    set zz [string range $zz 0 [expr {[string first "?" $zz]-1}]]
+	    set zz [string trim $zz]
+	}
+	if {$zz != ""} {
+	    catch {dict set thunk content-type [S3::contenttype $zz]}
+	} else {
+	    dict set thunk content-type application/octet-stream
+	    dict set thunk content-type ""
+	}
+    }
+    set p {}
+    if {[dict exist $thunk orig parameters]} {
+	set p [dict get $thunk orig parameters]
+    }
+    dict set thunk url [S3::to_url [dict get $thunk resource] $p]
+
+    if {[dict exists $thunk orig inbody]} {
+        dict set thunk headers [S3::authREST \
+            [dict get $thunk verb] [dict get $thunk resource] \
+            [dict get $thunk content-type] [dict get $thunk headers] \
+	    [dict get $thunk orig inbody] ]
+    } else {
+        dict set thunk headers [S3::authREST \
+            [dict get $thunk verb] [dict get $thunk resource] \
+            [dict get $thunk content-type] [dict get $thunk headers] ]
+    }
+    # Not the best place to put this code.
+    if {![info exists body] && [dict exists $thunk infile]} {
+	set size [file size [dict get $thunk infile]]
+	set x [dict get $thunk headers]
+	dict set x content-length $size
+	dict set thunk headers $x
+    }
+
+
+    # Ready to go!
+    return [S3::nextdo send_headers $thunk writable]
+}
+
+# Internal. Send the headers to Amazon. Might block if you have
+# really small socket buffers, but Amazon doesn't want
+# data that big anyway.
+proc S3::send_headers {thunk} {
+    S3::debug "Send-headers" $thunk
+    set s3 [dict get $thunk S3chan]
+    puts $s3 "[dict get $thunk verb] [dict get $thunk url] HTTP/1.0"
+    S3::debug ">> [dict get $thunk verb] [dict get $thunk url] HTTP/1.0"
+    foreach {key val} [dict get $thunk headers] {
+	puts $s3 "$key: $val"
+	S3::debug ">> $key: $val"
+    }
+    puts $s3 ""
+    flush $s3
+    return [S3::nextdo send_body $thunk writable]
+}
+
+# Internal. Send the body to Amazon.
+proc S3::send_body {thunk} {
+    global errorCode
+    set s3 [dict get $thunk S3chan]
+    if {[dict exists $thunk orig inbody]} {
+	# Send a string. Let's guess that even in non-blocking
+	# mode, this is small enough or Tcl's smart enough that
+	# we don't blow up the buffer.
+	puts -nonewline $s3 [dict get $thunk orig inbody]
+	flush $s3
+	return [S3::nextdo read_headers $thunk readable]
+    } elseif {![dict exists $thunk orig infile]} {
+	# No body, no file, so nothing more to do.
+	return [S3::nextdo read_headers $thunk readable]
+    } elseif {[dict get $thunk blocking]} {
+	# A blocking file copy. Still not too hard.
+	if {[catch {set inchan [open [dict get $thunk infile] r]} caught]} {
+	    S3::fail $thunk "S3 could not open infile - $caught" "" \
+		[list S3 local [dict get $thunk infile] $errorCode]
+	}
+	fconfigure $inchan -translation binary -encoding binary
+	fileevent $s3 readable {}
+	fileevent $s3 writable {}
+	if {[catch {fcopy $inchan $s3 ; flush $s3 ; close $inchan} caught]} {
+	    S3::fail $thunk "S3 could not copy infile - $caught" "" \
+		[list S3 local [dict get $thunk infile] $errorCode]
+	}
+	S3::nextdo read_headers $thunk readable
+    } else {
+	# The hard one. Background file copy.
+	fileevent $s3 readable {}
+	fileevent $s3 writable {}
+	if {[catch {set inchan [open [dict get $thunk infile] r]} caught]} {
+	    S3::fail $thunk "S3 could not open infile - $caught" "" \
+		[list S3 local [dict get $thunk infile] $errorCode]
+	}
+	fconfigure $inchan -buffering none -translation binary -encoding binary
+	fconfigure $s3 -buffering none -translation binary \
+	    -encoding binary -blocking 0 ; # Doesn't work without this?
+	dict set thunk inchan $inchan ; # So we can close it.
+        fcopy $inchan $s3 -command \
+	    [list S3::nextdo read_headers $thunk readable]
+    }
+}
+
+# Internal. The first line has come back. Grab out the
+# stuff we care about.
+proc S3::parse_status {thunk line} {
+    # Got the status line
+    S3::debug "<< $line"
+    dict set thunk httpstatusline [string trim $line]
+    dict set thunk outheaders [dict create]
+    regexp {^HTTP/1.. (...) (.*)$} $line junk code message
+    dict set thunk httpstatus $code
+    dict set thunk httpmessage [string trim $message]
+    return $thunk
+}
+
+# A line of header information has come back. Grab it.
+# This probably is unhappy with multiple lines for one
+# header.
+proc S3::parse_header {thunk line} {
+    # Got a header line. For now, assume no continuations.
+    S3::debug "<< $line"
+    set line [string trim $line]
+    set left [string range $line 0 [expr {[string first ":" $line]-1}]]
+    set right [string range $line [expr {[string first ":" $line]+1}] end]
+    set left [string trim [string tolower $left]]
+    set right [string trim $right]
+    dict set thunk outheaders $left $right
+    return $thunk
+}
+
+# I don't know if HTTP requires a blank line after the headers if
+# there's no body.
+
+# Internal. Read all the headers, and throw if we get EOF before
+# we get any headers at all.
+proc S3::read_headers {thunk} {
+    set s3 [dict get $thunk S3chan]
+    flush $s3
+    fconfigure $s3 -blocking [dict get $thunk blocking]
+    if {[dict get $thunk blocking]} {
+	# Blocking. Just read to a blank line. Otherwise,
+	# if we use nextdo here, we wind up nesting horribly.
+	# If we're not blocking, of course, we're returning
+	# to the event loop each time, so that's OK.
+	set count [gets $s3 line]
+	if {[eof $s3]} {
+	    S3::fail $thunk "S3 EOF during status line read" "" "S3 socket EOF"
+	}
+	set thunk [S3::parse_status $thunk $line]
+	while {[string trim $line] != ""} {
+	    set count [gets $s3 line]
+	    if {$count == -1 && 0 == [dict size [dict get $thunk outheaders]]} {
+		S3::fail $thunk "S3 EOF during headers read" "" "S3 socket EOF"
+	    }
+	    if {[string trim $line] != ""} {
+		set thunk [S3::parse_header $thunk $line]
+	    }
+	}
+	return [S3::nextdo read_body $thunk readable]
+    } else {
+	# Non-blocking, so we have to reenter for each line.
+	#  First, fix up the file handle, tho.
+	if {[dict exists $thunk inchan]} {
+	    close [dict get $thunk inchan]
+	    dict unset thunk inchan
+	}
+	# Now get one header.
+	set count [gets $s3 line]
+	if {[eof $s3]} {
+	    fileevent $s3 readable {}
+	    fileevent $s3 writable {}
+	    if {![dict exists $thunk httpstatusline]} {
+		S3::fail $thunk "S3 EOF during status line read" "" "S3 socket EOF"
+	    } elseif {0 == [dict size [dict get $thunk outheaders]]} {
+		S3::fail $thunk "S3 EOF during header read" "" "S3 socket EOF"
+	    }
+	}
+	if {$count < 0} return ; # Wait for a whole line
+	set line [string trim $line]
+	if {![dict exists $thunk httpstatus]} {
+	    set thunk [S3::parse_status $thunk $line]
+	    S3::nextdo read_headers $thunk readable ; # New thunk here.
+	} elseif {$line != ""} {
+	    set thunk [S3::parse_header $thunk $line]
+	    S3::nextdo read_headers $thunk readable ; # New thunk here.
+	} else {
+	    # Got an empty line. Switch to copying the body.
+	    S3::nextdo read_body $thunk readable
+	}
+    }
+}
+
+# Internal. Read the body of the response.
+proc S3::read_body {thunk} {
+    set s3 [dict get $thunk S3chan]
+    if {[dict get $thunk blocking]} {
+	# Easy. Just read it.
+	if {[dict exists $thunk orig outchan]} {
+	    fcopy $s3 [dict get $thunk orig outchan]
+	} else {
+	    set x [read $s3]
+	    dict set thunk outbody $x
+	    #S3::debug "Body: $x" -- Disable unconditional wasteful conversion to string
+	    #Need better debug system which does this only when active.
+	}
+	return [S3::nextdo all_done $thunk readable]
+    } else {
+	# Nonblocking mode.
+	if {[dict exists $thunk orig outchan]} {
+	    fileevent $s3 readable {}
+	    fileevent $s3 writable {}
+	    fcopy $s3 [dict get $thunk orig outchan] -command \
+	        [list S3::nextdo all_done $thunk readable]
+        } else {
+            dict append thunk outbody [read $s3]
+	    if {[eof $s3]} {
+		# We're done.
+		S3::nextdo all_done $thunk readable
+	    } else {
+		S3::nextdo read_body $thunk readable
+	    }
+	}
+    }
+}
+
+# Internal. Convenience function.
+proc S3::fail {thunk error errorInfo errorCode} {
+    S3::all_done $thunk $error $errorInfo $errorCode
+}
+
+# Internal. We're all done the transaction. Clean up everything,
+# potentially record errors, close channels, etc etc etc.
+proc S3::all_done {thunk {error ""} {errorInfo ""} {errorCode ""}} {
+    set s3 [dict get $thunk S3chan]
+    catch {
+	fileevent $s3 readable {}
+	fileevent $s3 writable {}
+    }
+    if {![dict exists $thunk orig S3chan]} {
+	catch {close $s3}
+    }
+    set res [dict get $thunk orig]
+    catch {
+	dict set res httpstatus [dict get $thunk httpstatus]
+	dict set res httpmessage [dict get $thunk httpmessage]
+	dict set res outheaders [dict get $thunk outheaders]
+    }
+    if {![dict exists $thunk orig outchan]} {
+	if {[dict exists $thunk outbody]} {
+	    dict set res outbody [dict get $thunk outbody]
+	} else {
+	    # Probably HTTP failure
+	    dict set rest outbody {}
+	}
+    }
+    if {$error ne ""} {
+	dict set res error $error
+	dict set res errorInfo $errorInfo
+	dict set res errorCode $errorCode
+    }
+    if {![dict get $thunk blocking]} {
+	after 0 [list uplevel #0 \
+	    [list set [dict get $thunk orig resultvar] $res]]
+    }
+    if {$error eq "" || ![dict get $thunk blocking] || \
+	([dict exists $thunk orig throwsocket] && \
+	    "return" == [dict get $thunk orig throwsocket])} {
+	return $res
+    } else {
+	error $error $errorInfo $errorCode
+    }
+}
+
+# Internal. Parse the lst and make sure it has only keys from the 'valid' list.
+# Used to parse arguments going into the higher-level functions.
+proc S3::parseargs1 {lst valid} {
+    if {[llength $lst] % 2 != 0} {
+	error "Option list must be even -name val pairs" \
+	    "" [list S3 usage [lindex $lst end] $lst]
+    }
+    foreach {key val} $lst {
+	# Sadly, lsearch applies -glob to the wrong thing for our needs
+	set found 0
+	foreach v $valid {
+	    if {[string match $v $key]} {set found 1 ; break}
+	}
+	if {!$found} {
+	    error "Option list has invalid -key" \
+		"" [list S3 usage $key $lst]
+	}
+    }
+    return $lst ; # It seems OK
+}
+
+# Internal. Create a variable for higher-level functions to vwait.
+proc S3::bgvar {} {
+    variable bgvar_counter
+    incr bgvar_counter
+    set name ::S3::bgvar$bgvar_counter
+    return $name
+}
+
+# Internal. Given a request and the arguments, run the S3::REST in
+# the foreground or the background as appropriate. Also, do retries
+# for internal errors.
+proc S3::maybebackground {req myargs} {
+    variable config
+    global errorCode errorInfo
+    set mytries [expr {1+[dict get $config -retries]}]
+    set delay 2000
+    dict set req throwsocket return
+    while {1} {
+	if {![dict exists $myargs -blocking] || [dict get $myargs -blocking]} {
+	    set dict [S3::REST $req]
+	} else {
+	    set res [bgvar]
+	    dict set req resultvar $res
+	    S3::REST $req
+	    vwait $res
+	    set dict [set $res]
+	    unset $res ; # clean up temps
+	}
+	if {[dict exists $dict error]} {
+	    set code [dict get $dict errorCode]
+	    if {"S3" != [lindex $code 0] || "socket" != [lindex $code 1]} {
+		error [dict get $dict error] \
+		    [dict get $dict errorInfo] \
+		    [dict get $dict errorCode]
+	    }
+	}
+	incr mytries -1
+	incr delay $delay ; if {20000 < $delay} {set delay 20000}
+	if {"500" ne [dict get $dict httpstatus] || $mytries <= 0} {
+	    return $dict
+	}
+	if {![dict exists $myargs -blocking] || [dict get $myargs -blocking]} {
+	    after $delay
+	} else {
+	    set timer [bgvar]
+	    after $delay [list set $timer 1]
+	    vwait $timer
+	    unset $timer
+	}
+    }
+}
+
+# Internal. Maybe throw an HTTP error if httpstatus not in 200 range.
+proc S3::throwhttp {dict} {
+    set hs [dict get $dict httpstatus]
+    if {![string match "2??" $hs]} {
+	error "S3 received non-OK HTTP result of $hs"  "" \
+	    [list S3 remote $hs $dict]
+    }
+}
+
+# Public. Returns the list of buckets for this user.
+proc S3::ListAllMyBuckets {args} {
+    checkinit ; # I know this gets done later.
+    set myargs [S3::parseargs1 $args {-blocking -parse-xml -result-type}]
+    if {![dict exists $myargs -result-type]} {
+	dict set myargs -result-type names
+    }
+    if {![dict exists $myargs -blocking]} {
+	dict set myargs -blocking true
+    }
+    set restype [dict get $myargs -result-type]
+    if {$restype eq "REST" && [dict exists $myargs -parse-xml]} {
+	error "Do not use REST with -parse-xml" "" \
+	    [list S3 usage -parse-xml $args]
+    }
+    if {![dict exists $myargs -parse-xml]} {
+	# We need to fetch the results.
+	set req [dict create verb GET resource /]
+	set dict [S3::maybebackground $req $myargs]
+	if {$restype eq "REST"} {
+	    return $dict ; #we're done!
+	}
+	S3::throwhttp $dict ; #make sure it worked.
+	set xml [dict get $dict outbody]
+    } else {
+	set xml [dict get $myargs -parse-xml]
+    }
+    # Here, we either already returned the dict, or the XML is in "xml".
+    if {$restype eq "xml"} {return $xml}
+    if {[catch {set pxml [::xsxp::parse $xml]}]} {
+	error "S3 invalid XML structure" "" [list S3 usage xml $xml]
+    }
+    if {$restype eq "pxml"} {return $pxml}
+    if {$restype eq "dict" || $restype eq "names"} {
+	set buckets [::xsxp::fetch $pxml "Buckets" %CHILDREN]
+	set names {} ; set dates {}
+	foreach bucket $buckets {
+	    lappend names [::xsxp::fetch $bucket "Name" %PCDATA]
+	    lappend dates [::xsxp::fetch $bucket "CreationDate" %PCDATA]
+	}
+	if {$restype eq "names"} {
+	    return $names
+	} else {
+	    return [dict create \
+		Owner/ID [::xsxp::fetch $pxml "Owner/ID" %PCDATA] \
+		Owner/DisplayName \
+		    [::xsxp::fetch $pxml "Owner/DisplayName" %PCDATA] \
+		Bucket/Name $names Bucket/Date $dates \
+	    ]
+	}
+    }
+    if {$restype eq "owner"} {
+	return [list [::xsxp::fetch $pxml Owner/ID %PCDATA] \
+	    [::xsxp::fetch $pxml Owner/DisplayName %PCDATA] ]
+    }
+    error "ListAllMyBuckets requires -result-type to be REST, xml, pxml, dict, owner, or names" "" [list S3 usage -result-type $args]
+}
+
+# Public. Create a bucket.
+proc S3::PutBucket {args} {
+    checkinit
+    set myargs [S3::parseargs1 $args {-blocking -bucket -acl}]
+    if {![dict exists $myargs -acl]} {
+	dict set myargs -acl [S3::Configure -default-acl]
+    }
+    if {![dict exists $myargs -bucket]} {
+	dict set myargs -bucket [S3::Configure -default-bucket]
+    }
+    dict set myargs -bucket [string trim [dict get $myargs -bucket] "/ "]
+    if {"" eq [dict exists $myargs -bucket]} {
+	error "PutBucket requires -bucket" "" [list S3 usage -bucket $args]
+    }
+
+    set req [dict create verb PUT resource /[dict get $myargs -bucket]]
+    if {[dict exists $myargs -acl]} {
+	dict set req headers [list x-amz-acl [dict get $myargs -acl]]
+    }
+    set dict [S3::maybebackground $req $myargs]
+    S3::throwhttp $dict
+    return "" ; # until we decide what to return.
+}
+
+# Public. Delete a bucket.
+proc S3::DeleteBucket {args} {
+    checkinit
+    set myargs [S3::parseargs1 $args {-blocking -bucket}]
+    if {![dict exists $myargs -bucket]} {
+	error "DeleteBucket requires -bucket" "" [list S3 usage -bucket $args]
+    }
+    dict set myargs -bucket [string trim [dict get $args -bucket] "/ "]
+
+    set req [dict create verb DELETE resource /[dict get $myargs -bucket]]
+    set dict [S3::maybebackground $req $myargs]
+    S3::throwhttp $dict
+    return "" ; # until we decide what to return.
+}
+
+# Internal. Suck out the one and only answer from the list, if needed.
+proc S3::firstif {list myargs} {
+    if {[dict exists $myargs -max-keys]} {
+	return [lindex $list 0]
+    } else {
+	return $list
+    }
+}
+
+# Public. Get the list of resources within a bucket.
+proc S3::GetBucket {args} {
+    checkinit
+    set myargs [S3::parseargs1 $args {
+	-bucket -blocking -parse-xml -max-keys
+	-result-type -prefix -delimiter
+	-TEST
+    }]
+    if {![dict exists $myargs -bucket]} {
+	dict set myargs -bucket [S3::Configure -default-bucket]
+    }
+    dict set myargs -bucket [string trim [dict get $myargs -bucket] "/ "]
+    if {"" eq [dict get $myargs -bucket]} {
+	error "GetBucket requires -bucket" "" [list S3 usage -bucket $args]
+    }
+    if {[dict get $myargs -bucket] eq ""} {
+	error "GetBucket requires -bucket nonempty" "" \
+	    [list S3 usage -bucket $args]
+    }
+    if {![dict exists $myargs -result-type]} {
+	dict set myargs -result-type names
+    }
+    if {[dict get $myargs -result-type] eq "REST" && \
+	    [dict exists $myargs "-parse-xml"]} {
+	error "GetBucket can't have -parse-xml with REST result" "" \
+	    [list S3 usage -parse-xml $args]
+    }
+    set req [dict create verb GET resource /[dict get $myargs -bucket]]
+    set parameters {}
+    # Now, just to make test cases easier...
+    if {[dict exists $myargs -TEST]} {
+	dict set parameters max-keys [dict get $myargs -TEST]
+    }
+    # Back to your regularly scheduled argument parsing
+    if {[dict exists $myargs -max-keys]} {
+	dict set parameters max-keys [dict get $myargs -max-keys]
+    }
+    if {[dict exists $myargs -prefix]} {
+	set p [dict get $myargs -prefix]
+	if {[string match "/*" $p]} {
+	    set p [string range $p 1 end]
+	}
+	dict set parameters prefix $p
+    }
+    if {[dict exists $myargs -delimiter]} {
+	dict set parameters delimiter [dict get $myargs -delimiter]
+    }
+    set nextmarker0 {} ; # We use this for -result-type dict.
+    if {![dict exists $myargs -parse-xml]} {
+	# Go fetch answers.
+	#   Current xaction in "0" vars, with accumulation in "L" vars.
+	#   Ultimate result of this loop is $RESTL, a list of REST results.
+	set RESTL [list]
+	while {1} {
+	    set req0 $req ; dict set req0 parameters $parameters
+	    set REST0 [S3::maybebackground $req0 $myargs]
+	    S3::throwhttp $REST0
+	    lappend RESTL $REST0
+	    if {[dict exists $myargs -max-keys]} {
+		# We were given a limit, so just return the answer.
+		break
+	    }
+	    set pxml0 [::xsxp::parse [dict get $REST0 outbody]]
+	    set trunc0 [expr "true" eq \
+		[::xsxp::fetch $pxml0 IsTruncated %PCDATA]]
+	    if {!$trunc0} {
+		# We've retrieved the final block, so go parse it.
+		set nextmarker0 "" ; # For later.
+		break
+	    }
+	    # Find the highest contents entry. (Would have been
+	    # easier if Amazon always supplied NextMarker.)
+	    set nextmarker0 {}
+	    foreach {only tag} {Contents Key CommonPrefixes Prefix} {
+		set only0 [::xsxp::only $pxml0 $only]
+		if {0 < [llength $only0]} {
+		    set k0 [::xsxp::fetch [lindex $only0 end] $tag %PCDATA]
+		    if {[string compare $nextmarker0 $k0] < 0} {
+			set nextmarker0 $k0
+		    }
+		}
+	    }
+	    if {$nextmarker0 eq ""} {error "Internal Error in S3 library"}
+	    # Here we have the next marker, so fetch the next REST
+	    dict set parameters marker $nextmarker0
+	    # Note - $nextmarker0 is used way down below again!
+	}
+	# OK, at this point, the caller did not provide the xml via -parse-xml
+	# And now we have a list of REST results. So let's process.
+	if {[dict get $myargs -result-type] eq "REST"} {
+	    return [S3::firstif $RESTL $myargs]
+	}
+	set xmlL [list]
+	foreach entry $RESTL {
+	    lappend xmlL [dict get $entry outbody]
+	}
+	unset RESTL ; # just to save memory
+    } else {
+	# Well, we've parsed out the XML from the REST,
+	# so we're ready for -parse-xml
+	set xmlL [list [dict get $myargs -parse-xml]]
+    }
+    if {[dict get $myargs -result-type] eq "xml"} {
+	return [S3::firstif $xmlL $myargs]
+    }
+    set pxmlL [list]
+    foreach xml $xmlL {
+	lappend pxmlL [::xsxp::parse $xml]
+    }
+    unset xmlL
+    if {[dict get $myargs -result-type] eq "pxml"} {
+	return [S3::firstif $pxmlL $myargs]
+    }
+    # Here, for result types of "names" and "dict",
+    # we need to actually parse out all the results.
+    if {[dict get $myargs -result-type] eq "names"} {
+	# The easy one.
+	set names [list]
+	foreach pxml $pxmlL {
+	    set con0 [::xsxp::only $pxml Contents]
+	    set con1 [::xsxp::only $pxml CommonPrefixes]
+	    lappend names {*}[concat [::xsxp::fetchall $con0 Key %PCDATA] \
+		[::xsxp::fetchall $con1 Prefix %PCDATA]]
+	}
+	return [lsort $names]
+    } elseif {[dict get $myargs -result-type] eq "dict"} {
+	# The harder one.
+	set last0 [lindex $pxmlL end]
+	set res [dict create]
+	foreach thing {Name Prefix Marker MaxKeys IsTruncated} {
+	    dict set res $thing [::xsxp::fetch $last0 $thing %PCDATA?]
+	}
+	dict set res NextMarker $nextmarker0 ; # From way up above.
+	set Prefix [list]
+	set names {Key LastModified ETag Size Owner/ID Owner/DisplayName StorageClass}
+	foreach name $names {set $name [list]}
+	foreach pxml $pxmlL {
+	    foreach tag [::xsxp::only $pxml CommonPrefixes] {
+		lappend Prefix [::xsxp::fetch $tag Prefix %PCDATA]
+	    }
+	    foreach tag [::xsxp::only $pxml Contents] {
+		foreach name $names {
+		    lappend $name [::xsxp::fetch $tag $name %PCDATA]
+		}
+	    }
+	}
+	dict set res CommonPrefixes/Prefix $Prefix
+	foreach name $names {dict set res $name [set $name]}
+	return $res
+    } else {
+	# The hardest one ;-)
+	error "GetBucket Invalid result type, must be REST, xml, pxml, names, or dict" "" [list S3 usage -result-type $args]
+    }
+}
+
+# Internal. Compare a resource to a file.
+# Returns 1 if they're different, 0 if they're the same.
+#   Note that using If-Modified-Since and/or If-Match,If-None-Match
+#   might wind up being more efficient than pulling the head
+#   and checking. However, this allows for slop, checking both
+#   the etag and the date, only generating local etag if the
+#   date and length indicate they're the same, and so on.
+# Direction is G or P for Get or Put.
+# Assumes the source always exists. Obviously, Get and Put will throw if not,
+# but not because of this.
+proc S3::compare {myargs direction} {
+    variable config
+    global errorInfo
+    set compare [dict get $myargs -compare]
+    if {$compare ni {always never exists missing newer date checksum different}} {
+	error "-compare must be always, never, exists, missing, newer, date, checksum, or different" "" \
+	    [list S3 usage -compare $myargs]
+    }
+    if {"never" eq $compare} {return 0}
+    if {"always" eq $compare} {return 1}
+    if {[dict exists $myargs -file] && [file exists [dict get $myargs -file]]} {
+	set local_exists 1
+    } else {
+	set local_exists 0
+    }
+    # Avoid hitting S3 if we don't need to.
+    if {$direction eq "G" && "exists" eq $compare} {return $local_exists}
+    if {$direction eq "G" && "missing" eq $compare} {
+	return [expr !$local_exists]
+    }
+    # We need to get the headers from the resource.
+    set req [dict create \
+	resource /[dict get $myargs -bucket]/[dict get $myargs -resource] \
+	verb HEAD ]
+    set res [S3::maybebackground $req $myargs]
+    set httpstatus [dict get $res httpstatus]
+    if {"404" eq $httpstatus} {
+	set remote_exists 0
+    } elseif {[string match "2??" $httpstatus]} {
+	set remote_exists 1
+    } else {
+	error "S3: Neither 404 or 2xx on conditional compare" "" \
+	    [list S3 remote $httpstatus $res]
+    }
+    if {$direction eq "P"} {
+	if {"exists" eq $compare} {return $remote_exists}
+	if {"missing" eq $compare} {return [expr {!$remote_exists}]}
+	if {!$remote_exists} {return 1}
+    } elseif {$direction eq "G"} {
+	# Actually already handled above, but it never hurts...
+	if {"exists" eq $compare} {return $local_exists}
+	if {"missing" eq $compare} {return [expr {!$local_exists}]}
+    }
+    set outheaders [dict get $res outheaders]
+    if {[dict exists $outheaders content-length]} {
+	set remote_length [dict get $outheaders content-length]
+    } else {
+	set remote_length -1
+    }
+    if {[dict exists $outheaders etag]} {
+	set remote_etag [string tolower \
+	    [string trim [dict get $outheaders etag] \"]]
+    } else {
+	set remote_etag "YYY"
+    }
+    if {[dict exists $outheaders last-modified]} {
+	set remote_date [clock scan [dict get $outheaders last-modified]]
+    } else {
+	set remote_date -1
+    }
+    if {[dict exists $myargs -content]} {
+	# Probably should work this out better...
+	#set local_length [string length [encoding convert-to utf-8 \
+	    #[dict get $myargs -content]]]
+	set local_length [string length [dict get $myargs -content]]
+    } elseif {$local_exists} {
+	if {[catch {file size [dict get $myargs -file]} local_length]} {
+	    error "S3: Couldn't stat [dict get $myargs -file]" "" \
+		[list S3 local $errorInfo]
+	}
+    } else {
+	set local_length -2
+    }
+    if {[dict exists $myargs -content]} {
+	set local_date [clock seconds]
+    } elseif {$local_exists} {
+	set local_date [file mtime [dict get $myargs -file]]
+	# Shouldn't throw, since [file size] worked.
+    } else {
+	set local_date -2
+    }
+    if {$direction eq "P"} {
+	if {"newer" eq $compare} {
+	    if {$remote_date < $local_date - [dict get $config -slop-seconds]} {
+		return 1 ; # Yes, local is newer
+	    } else {
+		return 0 ; # Older, or the same
+	    }
+	}
+    } elseif {$direction eq "G"} {
+	if {"newer" eq $compare} {
+	    if {$local_date < $remote_date - [dict get $config -slop-seconds]} {
+		return 1 ; # Yes, remote is later.
+	    } else {
+		return 0 ; # Local is older or same.
+	    }
+	}
+    }
+    if {[dict get $config -slop-seconds] <= abs($local_date - $remote_date)} {
+	set date_diff 1 ; # Difference is greater
+    } else {
+	set date_diff 0 ; # Difference negligible
+    }
+    if {"date" eq $compare} {return $date_diff}
+    if {"different" eq $compare && [dict exists $myargs -file] && $date_diff} {
+	return 1
+    }
+    # Date's the same, but we're also interested in content, so check the rest
+    # Only others to handle are checksum and different-with-matching-dates
+    if {$local_length != $remote_length} {return 1} ; #easy quick case
+    if {[dict exists $myargs -file] && $local_exists} {
+	if {[catch {
+	    # Maybe deal with making this backgroundable too?
+	    set local_etag [string tolower \
+		[::md5::md5 -hex -filename [dict get $myargs -file]]]
+	} caught]} {
+	    # Maybe you can stat but not read it?
+	    error "S3 could not hash file" "" \
+		[list S3 local [dict get $myargs -file] $errorInfo]
+	}
+    } elseif {[dict exists $myargs -content]} {
+	set local_etag [string tolower \
+	    [string tolower [::md5::md5 -hex [dict get $myargs -content]]]]
+    } else {
+	set local_etag "XXX"
+    }
+    # puts "local:  $local_etag\nremote: $remote_etag"
+    if {$local_etag eq $remote_etag} {return 0} {return 1}
+}
+
+# Internal. Calculates the ACL based on file permissions.
+proc S3::calcacl {myargs} {
+    # How would one work this under Windows, then?
+    # Silly way: invoke [exec cacls $filename],
+    # parse the result looking for Everyone:F or Everyone:R
+    # Messy security if someone replaces the cacls.exe or something.
+    error "S3 Not Yet Implemented" "" [list S3 notyet calcacl $myargs]
+    set result [S3::Configure -default-acl]
+    catch {
+	set chmod [file attributes [dict get $myargs -file] -permissions]
+	set chmod [expr {$chmod & 6}]
+	if {$chmod == 0} {set result private}
+	if {$chmod == 2} {set result public-write}
+	if {$chmod == 6} {set result public-read-write}
+    }
+}
+
+# Public. Put a resource into a bucket.
+proc S3::Put {args} {
+    checkinit
+    set myargs [S3::parseargs1 $args {
+	-bucket -blocking -file -content -resource -acl
+	-content-type -x-amz-meta-* -compare
+    }]
+    if {![dict exists $myargs -bucket]} {
+	dict set myargs -bucket [S3::Configure -default-bucket]
+    }
+    dict set myargs -bucket [string trim [dict get $myargs -bucket] "/ "]
+    if {"" eq [dict get $myargs -bucket]} {
+	error "Put requires -bucket" "" [list S3 usage -bucket $args]
+    }
+    if {![dict exists $myargs -blocking]} {
+	dict set myargs -blocking true
+    }
+    if {![dict exists $myargs -file] && ![dict exists $myargs -content]} {
+	error "Put requires -file or -content" "" [list S3 usage -file $args]
+    }
+    if {[dict exists $myargs -file] && [dict exists $myargs -content]} {
+	error "Put says -file, -content mutually exclusive" "" [list S3 usage -file $args]
+    }
+    if {![dict exists $myargs -resource]} {
+	error "Put requires -resource" "" [list S3 usage -resource $args]
+    }
+    if {![dict exists $myargs -compare]} {
+	dict set myargs -compare [S3::Configure -default-compare]
+    }
+    if {![dict exists $myargs -acl] && "" ne [S3::Configure -default-acl]} {
+	dict set myargs -acl [S3::Configure -default-acl]
+    }
+    if {[dict exists $myargs -file] && \
+	    "never" ne [dict get $myargs -compare] && \
+	    ![file exists [dict get $myargs -file]]} {
+	error "Put -file doesn't exist: [dict get $myargs -file]" \
+	    "" [list S3 usage -file $args]
+    }
+    # Clean up bucket, and take one leading slash (if any) off resource.
+    if {[string match "/*" [dict get $myargs -resource]]} {
+	dict set myargs -resource \
+	    [string range [dict get $myargs -resource] 1 end]
+    }
+    # See if we need to copy it.
+    set comp [S3::compare $myargs P]
+    if {!$comp} {return 0} ;  # skip it, then.
+
+    # Oookeydookey. At this point, we're actually going to send
+    # the file, so all we need to do is build the request array.
+    set req [dict create verb PUT \
+	resource /[dict get $myargs -bucket]/[dict get $myargs -resource]]
+    if {[dict exists $myargs -file]} {
+	dict set req infile [dict get $myargs -file]
+    } else {
+	dict set req inbody [dict get $myargs -content]
+    }
+    if {[dict exists $myargs -content-type]} {
+	dict set req content-type [dict get $myargs -content-type]
+    }
+    set headers {}
+    foreach xhead [dict keys $myargs -x-amz-meta-*] {
+	dict set headers [string range $xhead 1 end] [dict get $myargs $xhead]
+    }
+    set xmlacl "" ; # For calc and keep
+    if {[dict exists $myargs -acl]} {
+	if {[dict get $myargs -acl] eq "calc"} {
+	    # We could make this more complicated by
+	    # assigning it to xmlacl after building it.
+	    dict set myargs -acl [S3::calcacl $myargs]
+	} elseif {[dict get $myargs -acl] eq "keep"} {
+	    dict set myargs -acl [S3::Configure -default-acl]
+	    catch {
+		set xmlacl [S3::GetAcl \
+		    -bucket [dict get $myargs -bucket] \
+		    -resource [dict get $myargs -resource] \
+		    -blocking [dict get $myargs -blocking] \
+		    -result-type xml]
+	    }
+	}
+	dict set headers x-amz-acl [dict get $myargs -acl]
+    }
+    dict set req headers $headers
+    # That should do it.
+    set res [S3::maybebackground $req $myargs]
+    S3::throwhttp $res
+    if {"<" == [string index $xmlacl 0]} {
+	# Set the saved ACL back on the new object
+	S3::PutAcl \
+	    -bucket [dict get $myargs -bucket] \
+	    -resource [dict get $myargs -resource] \
+	    -blocking [dict get $myargs -blocking] \
+	    -acl $xmlacl
+    }
+    return 1 ; # Yep, we copied it!
+}
+
+# Public. Get a resource from a bucket.
+proc S3::Get {args} {
+    global errorCode
+    checkinit
+    set myargs [S3::parseargs1 $args {
+	-bucket -blocking -file -content -resource -timestamp
+	-headers -compare
+    }]
+    if {![dict exists $myargs -bucket]} {
+	dict set myargs -bucket [S3::Configure -default-bucket]
+    }
+    dict set myargs -bucket [string trim [dict get $myargs -bucket] "/ "]
+    if {"" eq [dict get $myargs -bucket]} {
+	error "Get requires -bucket" "" [list S3 usage -bucket $args]
+    }
+    if {![dict exists $myargs -file] && ![dict exists $myargs -content]} {
+	error "Get requires -file or -content" "" [list S3 usage -file $args]
+    }
+    if {[dict exists $myargs -file] && [dict exists $myargs -content]} {
+	error "Get says -file, -content mutually exclusive" "" [list S3 usage -file $args]
+    }
+    if {![dict exists $myargs -resource]} {
+	error "Get requires -resource" "" [list S3 usage -resource $args]
+    }
+    if {![dict exists $myargs -compare]} {
+	dict set myargs -compare [S3::Configure -default-compare]
+    }
+    # Clean up bucket, and take one leading slash (if any) off resource.
+    if {[string match "/*" [dict get $myargs -resource]]} {
+	dict set myargs -resource \
+	    [string range [dict get $myargs -resource] 1 end]
+    }
+    # See if we need to copy it.
+    if {"never" eq [dict get $myargs -compare]} {return 0}
+    if {[dict exists $myargs -content]} {
+	set comp 1
+    } else {
+	set comp [S3::compare $myargs G]
+    }
+    if {!$comp} {return 0} ;  # skip it, then.
+
+    # Oookeydookey. At this point, we're actually going to fetch
+    # the file, so all we need to do is build the request array.
+    set req [dict create verb GET \
+	resource /[dict get $myargs -bucket]/[dict get $myargs -resource]]
+    if {[dict exists $myargs -file]} {
+	set pre_exists [file exists [dict get $myargs -file]]
+	if {[catch {
+	    set x [open [dict get $myargs -file] w]
+	    fconfigure $x -translation binary -encoding binary
+	} caught]} {
+	    error "Get could not create file [dict get $myargs -file]" "" \
+		[list S3 local -file $errorCode]
+	}
+	dict set req outchan $x
+    }
+    # That should do it.
+    set res [S3::maybebackground $req $myargs]
+    if {[dict exists $req outchan]} {
+	catch {close [dict get $req outchan]}
+	if {![string match "2??" [dict get $res httpstatus]] && !$pre_exists} {
+	    catch {file delete -force -- [dict get $myargs -file]}
+	}
+    }
+    S3::throwhttp $res
+    if {[dict exists $myargs -headers]} {
+	uplevel 1 \
+	    [list set [dict get $myargs -headers] [dict get $res outheaders]]
+    }
+    if {[dict exists $myargs -content]} {
+	uplevel 1 \
+	    [list set [dict get $myargs -content] [dict get $res outbody]]
+    }
+    if {[dict exists $myargs -timestamp] && [dict exists $myargs -file]} {
+	if {"aws" eq [dict get $myargs -timestamp]} {
+	    catch {
+		set t [dict get $res outheaders last-modified]
+		set t [clock scan $t -gmt true]
+		file mtime [dict get $myargs -file] $t
+	    }
+	}
+    }
+    return 1 ; # Yep, we copied it!
+}
+
+# Public. Get information about a resource in a bucket.
+proc S3::Head {args} {
+    global errorCode
+    checkinit
+    set myargs [S3::parseargs1 $args {
+	-bucket -blocking -resource -headers -dict -status
+    }]
+    if {![dict exists $myargs -bucket]} {
+	dict set myargs -bucket [S3::Configure -default-bucket]
+    }
+    dict set myargs -bucket [string trim [dict get $myargs -bucket] "/ "]
+    if {"" eq [dict get $myargs -bucket]} {
+	error "Head requires -bucket" "" [list S3 usage -bucket $args]
+    }
+    if {![dict exists $myargs -resource]} {
+	error "Head requires -resource" "" [list S3 usage -resource $args]
+    }
+    # Clean up bucket, and take one leading slash (if any) off resource.
+    if {[string match "/*" [dict get $myargs -resource]]} {
+	dict set myargs -resource \
+	    [string range [dict get $myargs -resource] 1 end]
+    }
+    set req [dict create verb HEAD \
+	resource /[dict get $myargs -bucket]/[dict get $myargs -resource]]
+    set res [S3::maybebackground $req $myargs]
+    if {[dict exists $myargs -dict]} {
+	uplevel 1 \
+	    [list set [dict get $myargs -dict] $res]
+    }
+    if {[dict exists $myargs -headers]} {
+	uplevel 1 \
+	    [list set [dict get $myargs -headers] [dict get $res outheaders]]
+    }
+    if {[dict exists $myargs -status]} {
+	set x [list [dict get $res httpstatus] [dict get $res httpmessage]]
+	uplevel 1 \
+	    [list set [dict get $myargs -status] $x]
+    }
+    return [string match "2??" [dict get $res httpstatus]]
+}
+
+# Public. Get the full ACL from an object and parse it into something useful.
+proc S3::GetAcl {args} {
+    global errorCode
+    checkinit
+    set myargs [S3::parseargs1 $args {
+	-bucket -blocking -resource -result-type -parse-xml
+    }]
+    if {![dict exists $myargs -bucket]} {
+	dict set myargs -bucket [S3::Configure -default-bucket]
+    }
+    dict set myargs -bucket [string trim [dict get $myargs -bucket] "/ "]
+    if {![dict exists $myargs -result-type]} {
+	dict set myargs -result-type "dict"
+    }
+    set restype [dict get $myargs -result-type]
+    if {$restype eq "REST" && [dict exists $myargs -parse-xml]} {
+	error "Do not use REST with -parse-xml" "" \
+	    [list S3 usage -parse-xml $args]
+    }
+    if {![dict exists $myargs -parse-xml]} {
+	# We need to fetch the results.
+	if {"" eq [dict get $myargs -bucket]} {
+	    error "GetAcl requires -bucket" "" [list S3 usage -bucket $args]
+	}
+	if {![dict exists $myargs -resource]} {
+	    error "GetAcl requires -resource" "" [list S3 usage -resource $args]
+	}
+	# Clean up bucket, and take one leading slash (if any) off resource.
+	if {[string match "/*" [dict get $myargs -resource]]} {
+	    dict set myargs -resource \
+		[string range [dict get $myargs -resource] 1 end]
+	}
+	set req [dict create verb GET \
+	    resource /[dict get $myargs -bucket]/[dict get $myargs -resource] \
+	    rtype acl]
+	set dict [S3::maybebackground $req $myargs]
+	if {$restype eq "REST"} {
+	    return $dict ; #we're done!
+	}
+	S3::throwhttp $dict ; #make sure it worked.
+	set xml [dict get $dict outbody]
+    } else {
+	set xml [dict get $myargs -parse-xml]
+    }
+    if {[dict get $myargs -result-type] == "xml"} {
+	return $xml
+    }
+    set pxml [xsxp::parse $xml]
+    if {[dict get $myargs -result-type] == "pxml"} {
+	return $pxml
+    }
+    if {[dict get $myargs -result-type] == "dict"} {
+	array set resdict {}
+	set owner [xsxp::fetch $pxml Owner/ID %PCDATA]
+	set grants [xsxp::fetch $pxml AccessControlList %CHILDREN]
+	foreach grant $grants {
+	    set perm [xsxp::fetch $grant Permission %PCDATA]
+	    set id ""
+	    catch {set id [xsxp::fetch $grant Grantee/ID %PCDATA]}
+	    if {$id == ""} {
+		set id [xsxp::fetch $grant Grantee/URI %PCDATA]
+	    }
+	    lappend resdict($perm) $id
+	}
+	return [dict create owner $owner acl [array get resdict]]
+    }
+    error "GetAcl requires -result-type to be REST, xml, pxml or dict" "" [list S3 usage -result-type $args]
+}
+
+# Make one Grant thingie
+proc S3::engrant {who what} {
+    if {$who == "AuthenticatedUsers" || $who == "AllUsers"} {
+	set who http://acs.amazonaws.com/groups/global/$who
+    }
+    if {-1 != [string first "//" $who]} {
+	set type Group ; set tag URI
+    } elseif {-1 != [string first "@" $who]} {
+	set type AmazonCustomerByEmail ; set tag EmailAddress
+    } else {
+	set type CanonicalUser ; set tag ID
+    }
+    set who [string map {< &lt; > &gt; & &amp;} $who]
+    set what [string toupper $what]
+    set xml "<Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"$type\"><$tag>$who</$tag></Grantee>"
+    append xml "<Permission>$what</Permission></Grant>"
+    return $xml
+}
+
+# Make the owner header
+proc S3::enowner {owner} {
+    return "<AccessControlPolicy xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Owner><ID>$owner</ID></Owner><AccessControlList>"
+    return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<AccessControlPolicy xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Owner><ID>$owner</ID></Owner><AccessControlList>"
+}
+
+proc S3::endacl {} {
+    return "</AccessControlList></AccessControlPolicy>\n"
+}
+
+# Public. Set the ACL on an existing object.
+proc S3::PutAcl {args} {
+    global errorCode
+    checkinit
+    set myargs [S3::parseargs1 $args {
+	-bucket -blocking -resource -acl -owner
+    }]
+    if {![dict exists $myargs -bucket]} {
+	dict set myargs -bucket [S3::Configure -default-bucket]
+    }
+    dict set myargs -bucket [string trim [dict get $myargs -bucket] "/ "]
+    if {"" eq [dict get $myargs -bucket]} {
+	error "PutAcl requires -bucket" "" [list S3 usage -bucket $args]
+    }
+    if {![dict exists $myargs -resource]} {
+	error "PutAcl requires -resource" "" [list S3 usage -resource $args]
+    }
+    if {![dict exists $myargs -acl]} {
+	dict set myargs -acl [S3::Configure -default-acl]
+    }
+    dict set myargs -acl [string trim [dict get $myargs -acl]]
+    if {[dict get $myargs -acl] == ""} {
+	dict set myargs -acl [S3::Configure -default-acl]
+    }
+    if {[dict get $myargs -acl] == ""} {
+	error "PutAcl requires -acl" "" [list D3 usage -resource $args]
+    }
+    # Clean up bucket, and take one leading slash (if any) off resource.
+    if {[string match "/*" [dict get $myargs -resource]]} {
+	dict set myargs -resource \
+	    [string range [dict get $myargs -resource] 1 end]
+    }
+    # Now, figure out the XML to send.
+    set acl [dict get $myargs -acl]
+    set owner ""
+    if {"<" != [string index $acl 0] && ![dict exists $myargs -owner]} {
+	# Grab the owner off the resource
+	set req [dict create verb GET \
+	    resource /[dict get $myargs -bucket]/[dict get $myargs -resource] \
+	    rtype acl]
+	set dict [S3::maybebackground $req $myargs]
+	S3::throwhttp $dict ; #make sure it worked.
+	set xml [dict get $dict outbody]
+	set pxml [xsxp::parse $xml]
+	set owner [xsxp::fetch $pxml Owner/ID %PCDATA]
+    }
+    if {[dict exists $myargs -owner]} {
+	set owner [dict get $myargs -owner]
+    }
+    set xml [enowner $owner]
+    if {"" == $acl || "private" == $acl} {
+	append xml [engrant $owner FULL_CONTROL]
+	append xml [endacl]
+    } elseif {"public-read" == $acl} {
+	append xml [engrant $owner FULL_CONTROL]
+	append xml [engrant AllUsers READ]
+	append xml [endacl]
+    } elseif {"public-read-write" == $acl} {
+	append xml [engrant $owner FULL_CONTROL]
+	append xml [engrant AllUsers READ]
+	append xml [engrant AllUsers WRITE]
+	append xml [endacl]
+    } elseif {"authenticated-read" == $acl} {
+	append xml [engrant $owner FULL_CONTROL]
+	append xml [engrant AuthenticatedUsers READ]
+	append xml [endacl]
+    } elseif {"<" == [string index $acl 0]} {
+	set xml $acl
+    } elseif {[llength $acl] % 2 != 0} {
+	error "S3::PutAcl -acl must be xml, private, public-read, public-read-write, authenticated-read, or a dictionary" \
+	"" [list S3 usage -acl $acl]
+    } else {
+	# ACL in permission/ID-list format.
+	if {[dict exists $acl owner] && [dict exists $acl acl]} {
+	    set xml [S3::enowner [dict get $acl owner]]
+	    set acl [dict get $acl acl]
+	}
+	foreach perm {FULL_CONTROL READ READ_ACP WRITE WRITE_ACP} {
+	    if {[dict exists $acl $perm]} {
+		foreach id [dict get $acl $perm] {
+		    append xml [engrant $id $perm]
+		}
+	    }
+	}
+	append xml [endacl]
+    }
+    set req [dict create verb PUT \
+	resource /[dict get $myargs -bucket]/[dict get $myargs -resource] \
+	inbody $xml \
+	rtype acl]
+    set res [S3::maybebackground $req $myargs]
+    S3::throwhttp $res ; #make sure it worked.
+    return $xml
+}
+
+# Public. Delete a resource from a bucket.
+proc S3::Delete {args} {
+    global errorCode
+    checkinit
+    set myargs [S3::parseargs1 $args {
+	-bucket -blocking -resource -status
+    }]
+    if {![dict exists $myargs -bucket]} {
+	dict set myargs -bucket [S3::Configure -default-bucket]
+    }
+    dict set myargs -bucket [string trim [dict get $myargs -bucket] "/ "]
+    if {"" eq [dict get $myargs -bucket]} {
+	error "Delete requires -bucket" "" [list S3 usage -bucket $args]
+    }
+    if {![dict exists $myargs -resource]} {
+	error "Delete requires -resource" "" [list S3 usage -resource $args]
+    }
+    # Clean up bucket, and take one leading slash (if any) off resource.
+    if {[string match "/*" [dict get $myargs -resource]]} {
+	dict set myargs -resource \
+	    [string range [dict get $myargs -resource] 1 end]
+    }
+    set req [dict create verb DELETE \
+	resource /[dict get $myargs -bucket]/[dict get $myargs -resource]]
+    set res [S3::maybebackground $req $myargs]
+    if {[dict exists $myargs -status]} {
+	set x [list [dict get $res httpstatus] [dict get $res httpmessage]]
+	uplevel 1 \
+	    [list set [dict get $myargs -status] $x]
+    }
+    return [string match "2??" [dict get $res httpstatus]]
+}
+
+# Some helper routines for Push, Pull, and Sync
+
+# Internal. Filter for fileutil::find.
+proc S3::findfilter {dirs name} {
+    # In particular, skip links, devices, etc.
+    if {$dirs} {
+	return [expr {[file isdirectory $name] || [file isfile $name]}]
+    } else {
+	return [file isfile $name]
+    }
+}
+
+# Internal.  Get list of local files, appropriately trimmed.
+proc S3::getLocal {root dirs} {
+    # Thanks to Michael Cleverly for this first line...
+    set base [file normalize [file join [pwd] $root]]
+    if {![string match "*/" $base]} {
+	set base $base/
+    }
+    set files {} ; set bl [string length $base]
+    foreach file [fileutil::find $base [list S3::findfilter $dirs]] {
+	if {[file isdirectory $file]} {
+	    lappend files [string range $file $bl end]/
+	} else {
+	    lappend files [string range $file $bl end]
+	}
+    }
+    set files [lsort $files]
+    # At this point, $files is a sorted list of all the local files,
+    # with a trailing / on any directories included in the list.
+    return $files
+}
+
+# Internal. Get list of remote resources, appropriately trimmed.
+proc S3::getRemote {bucket prefix blocking} {
+    set prefix [string trim $prefix " /"]
+    if {0 != [string length $prefix]} {append prefix /}
+    set res [S3::GetBucket -bucket $bucket -prefix $prefix \
+	-result-type names -blocking $blocking]
+    set names {} ; set pl [string length $prefix]
+    foreach name $res {
+	lappend names [string range $name $pl end]
+    }
+    return [lsort $names]
+}
+
+# Internal. Create any directories we need to put the file in place.
+proc S3::makeDirs {directory suffix} {
+    set sofar {}
+    set nodes [split $suffix /]
+    set nodes [lrange $nodes 0 end-1]
+    foreach node $nodes {
+	lappend sofar $node
+	set tocheck [file join $directory {*}$sofar]
+	if {![file exists $tocheck]} {
+	    catch {file mkdir $tocheck}
+	}
+    }
+}
+
+# Internal. Default progress monitor for push, pull, toss.
+proc S3::ignore {args} {} ; # default progress monitor
+
+# Internal. For development and testing. Progress monitor.
+proc S3::printargs {args} {puts $args} ; # For testing.
+
+# Public. Send a local directory tree to S3.
+proc S3::Push {args} {
+    uplevel #0 package require fileutil
+    global errorCode errorInfo
+    checkinit
+    set myargs [S3::parseargs1 $args {
+	-bucket -blocking -prefix -directory
+	-compare -x-amz-meta-* -acl -delete -error -progress
+    }]
+    if {![dict exists $myargs -bucket]} {
+	dict set myargs -bucket [S3::Configure -default-bucket]
+    }
+    dict set myargs -bucket [string trim [dict get $myargs -bucket] "/ "]
+    if {"" eq [dict get $myargs -bucket]} {
+	error "Push requires -bucket" "" [list S3 usage -bucket $args]
+    }
+    if {![dict exists $myargs -directory]} {
+	error "Push requires -directory" "" [list S3 usage -directory $args]
+    }
+    # Set default values.
+    set defaults "
+    -acl \"[S3::Configure -default-acl]\"
+    -compare [S3::Configure -default-compare]
+    -prefix {} -delete 0 -error continue -progress ::S3::ignore -blocking 1"
+    foreach {key val} $defaults {
+	if {![dict exists $myargs $key]} {dict set myargs $key $val}
+    }
+    # Pull out arguments for convenience
+    foreach i {progress prefix directory bucket blocking} {
+	set $i [dict get $myargs -$i]
+    }
+    set prefix [string trimright $prefix /]
+    set meta [dict filter $myargs key x-amz-meta-*]
+    # We're readdy to roll here.
+    uplevel 1 [list {*}$progress args $myargs]
+    if {[catch {
+	set local [S3::getLocal $directory 0]
+    } caught]}  {
+	error "Push could not walk local directory - $caught" \
+	    $errorInfo $errorCode
+    }
+    uplevel 1 [list {*}$progress local $local]
+    if {[catch {
+	set remote [S3::getRemote $bucket $prefix $blocking]
+    } caught]} {
+	error "Push could not walk remote directory - $caught" \
+	    $errorInfo $errorCode
+    }
+    uplevel 1 [list {*}$progress remote $remote]
+    set result [dict create]
+    set result0 [dict create \
+	filescopied 0 bytescopied 0 compareskipped 0 \
+	errorskipped 0 filesdeleted 0 filesnotdeleted 0]
+    foreach suffix $local {
+	uplevel 1 [list {*}$progress copy $suffix start]
+	set err [catch {
+	    S3::Put -bucket $bucket -blocking $blocking \
+	    -file [file join $directory $suffix] \
+	    -resource $prefix/$suffix \
+	    -acl [dict get $myargs -acl] \
+	    {*}$meta \
+	    -compare [dict get $myargs -compare]} caught]
+	if {$err} {
+	    uplevel 1 [list {*}$progress copy $suffix $errorCode]
+	    dict incr result0 errorskipped
+	    dict set result $suffix $errorCode
+	    if {[dict get $myargs -error] eq "throw"} {
+		error "Push failed to Put - $caught" $errorInfo $errorCode
+	    } elseif {[dict get $myargs -error] eq "break"} {
+		break
+	    }
+	} else {
+	    if {$caught} {
+		uplevel 1 [list {*}$progress copy $suffix copied]
+		dict incr result0 filescopied
+		dict incr result0 bytescopied \
+		    [file size [file join $directory $suffix]]
+		dict set result $suffix copied
+	    } else {
+		uplevel 1 [list {*}$progress copy $suffix skipped]
+		dict incr result0 compareskipped
+		dict set result $suffix skipped
+	    }
+	}
+    }
+    # Now do deletes, if so desired
+    if {[dict get $myargs -delete]} {
+	foreach suffix $remote {
+	    if {$suffix ni $local} {
+		set err [catch {
+		    S3::Delete -bucket $bucket -blocking $blocking \
+			-resource $prefix/$suffix } caught]
+		if {$err} {
+		    uplevel 1 [list {*}$progress delete $suffix $errorCode]
+		    dict incr result0 filesnotdeleted
+		    dict set result $suffix notdeleted
+		} else {
+		    uplevel 1 [list {*}$progress delete $suffix {}]
+		    dict incr result0 filesdeleted
+		    dict set result $suffix deleted
+		}
+	    }
+	}
+    }
+    dict set result {} $result0
+    uplevel 1 [list {*}$progress finished $result]
+    return $result
+}
+
+# Public. Fetch a portion of a remote bucket into a local directory tree.
+proc S3::Pull {args} {
+    # This is waaaay to similar to Push for comfort.
+    # Fold it up later.
+    uplevel #0 package require fileutil
+    global errorCode errorInfo
+    checkinit
+    set myargs [S3::parseargs1 $args {
+	-bucket -blocking -prefix -directory
+	-compare -timestamp -delete -error -progress
+    }]
+    if {![dict exists $myargs -bucket]} {
+	dict set myargs -bucket [S3::Configure -default-bucket]
+    }
+    dict set myargs -bucket [string trim [dict get $myargs -bucket] "/ "]
+    if {"" eq [dict get $myargs -bucket]} {
+	error "Pull requires -bucket" "" [list S3 usage -bucket $args]
+    }
+    if {![dict exists $myargs -directory]} {
+	error "Pull requires -directory" "" [list S3 usage -directory $args]
+    }
+    # Set default values.
+    set defaults "
+    -timestamp now
+    -compare [S3::Configure -default-compare]
+    -prefix {} -delete 0 -error continue -progress ::S3::ignore -blocking 1"
+    foreach {key val} $defaults {
+	if {![dict exists $myargs $key]} {dict set myargs $key $val}
+    }
+    # Pull out arguments for convenience
+    foreach i {progress prefix directory bucket blocking} {
+	set $i [dict get $myargs -$i]
+    }
+    set prefix [string trimright $prefix /]
+    # We're readdy to roll here.
+    uplevel 1 [list {*}$progress args $myargs]
+    if {[catch {
+	set local [S3::getLocal $directory 1]
+    } caught]}  {
+	error "Pull could not walk local directory - $caught" \
+	    $errorInfo $errorCode
+    }
+    uplevel 1 [list {*}$progress local $local]
+    if {[catch {
+	set remote [S3::getRemote $bucket $prefix $blocking]
+    } caught]} {
+	error "Pull could not walk remote directory - $caught" \
+	    $errorInfo $errorCode
+    }
+    uplevel 1 [list {*}$progress remote $remote]
+    set result [dict create]
+    set result0 [dict create \
+	filescopied 0 bytescopied 0 compareskipped 0 \
+	errorskipped 0 filesdeleted 0 filesnotdeleted 0]
+    foreach suffix $remote {
+	uplevel 1 [list {*}$progress copy $suffix start]
+	set err [catch {
+	    S3::makeDirs $directory $suffix
+	    S3::Get -bucket $bucket -blocking $blocking \
+	    -file [file join $directory $suffix] \
+	    -resource $prefix/$suffix \
+	    -timestamp [dict get $myargs -timestamp] \
+	    -compare [dict get $myargs -compare]} caught]
+	if {$err} {
+	    uplevel 1 [list {*}$progress copy $suffix $errorCode]
+	    dict incr result0 errorskipped
+	    dict set result $suffix $errorCode
+	    if {[dict get $myargs -error] eq "throw"} {
+		error "Pull failed to Get - $caught" $errorInfo $errorCode
+	    } elseif {[dict get $myargs -error] eq "break"} {
+		break
+	    }
+	} else {
+	    if {$caught} {
+		uplevel 1 [list {*}$progress copy $suffix copied]
+		dict incr result0 filescopied
+		dict incr result0 bytescopied \
+		    [file size [file join $directory $suffix]]
+		dict set result $suffix copied
+	    } else {
+		uplevel 1 [list {*}$progress copy $suffix skipped]
+		dict incr result0 compareskipped
+		dict set result $suffix skipped
+	    }
+	}
+    }
+    # Now do deletes, if so desired
+    if {[dict get $myargs -delete]} {
+	foreach suffix [lsort -decreasing $local] {
+	    # Note, decreasing because we delete empty dirs
+	    if {[string match "*/" $suffix]} {
+		set f [file join $directory $suffix]
+		catch {file delete -- $f}
+		if {![file exists $f]} {
+		    uplevel 1 [list {*}$progress delete $suffix {}]
+		    dict set result $suffix deleted
+		    dict incr result0 filesdeleted
+		}
+	    } elseif {$suffix ni $remote} {
+		set err [catch {
+		    file delete [file join $directory $suffix]
+		} caught]
+		if {$err} {
+		    uplevel 1 [list {*}$progress delete $suffix $errorCode]
+		    dict incr result0 filesnotdeleted
+		    dict set result $suffix notdeleted
+		} else {
+		    uplevel 1 [list {*}$progress delete $suffix {}]
+		    dict incr result0 filesdeleted
+		    dict set result $suffix deleted
+		}
+	    }
+	}
+    }
+    dict set result {} $result0
+    uplevel 1 [list {*}$progress finished $result]
+    return $result
+}
+
+# Public. Delete a collection of resources with the same prefix.
+proc S3::Toss {args} {
+    # This is waaaay to similar to Push for comfort.
+    # Fold it up later.
+    global errorCode errorInfo
+    checkinit
+    set myargs [S3::parseargs1 $args {
+	-bucket -blocking -prefix
+	-error -progress
+    }]
+    if {![dict exists $myargs -bucket]} {
+	dict set myargs -bucket [S3::Configure -default-bucket]
+    }
+    dict set myargs -bucket [string trim [dict get $myargs -bucket] "/ "]
+    if {"" eq [dict get $myargs -bucket]} {
+	error "Toss requires -bucket" "" [list S3 usage -bucket $args]
+    }
+    if {![dict exists $myargs -prefix]} {
+	error "Toss requires -prefix" "" [list S3 usage -directory $args]
+    }
+    # Set default values.
+    set defaults "-error continue -progress ::S3::ignore -blocking 1"
+    foreach {key val} $defaults {
+	if {![dict exists $myargs $key]} {dict set myargs $key $val}
+    }
+    # Pull out arguments for convenience
+    foreach i {progress prefix bucket blocking} {
+	set $i [dict get $myargs -$i]
+    }
+    set prefix [string trimright $prefix /]
+    # We're readdy to roll here.
+    uplevel 1 [list {*}$progress args $myargs]
+    if {[catch {
+	set remote [S3::getRemote $bucket $prefix $blocking]
+    } caught]} {
+	error "Toss could not walk remote bucket - $caught" \
+	    $errorInfo $errorCode
+    }
+    uplevel 1 [list {*}$progress remote $remote]
+    set result [dict create]
+    set result0 [dict create \
+	filescopied 0 bytescopied 0 compareskipped 0 \
+	errorskipped 0 filesdeleted 0 filesnotdeleted 0]
+    # Now do deletes
+    foreach suffix $remote {
+	set err [catch {
+	    S3::Delete -bucket $bucket -blocking $blocking \
+		-resource $prefix/$suffix } caught]
+	if {$err} {
+	    uplevel 1 [list {*}$progress delete $suffix $errorCode]
+	    dict incr result0 filesnotdeleted
+	    dict set result $suffix notdeleted
+	} else {
+	    uplevel 1 [list {*}$progress delete $suffix {}]
+	    dict incr result0 filesdeleted
+	    dict set result $suffix deleted
+	}
+    }
+    dict set result {} $result0
+    uplevel 1 [list {*}$progress finished $result]
+    return $result
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/amazon-s3/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/amazon-s3/pkgIndex.tcl
new file mode 100644
index 00000000..1d4f1972
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/amazon-s3/pkgIndex.tcl
@@ -0,0 +1,9 @@
+# pkgIndex.tcl --
+# Copyright (c) 2006 Darren New
+# This is for the Amazon S3 web service packages.
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+
+package ifneeded xsxp 1.0   [list source [file join $dir xsxp.tcl]]
+package ifneeded S3   1.0.3 [list source [file join $dir S3.tcl]]
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/amazon-s3/xsxp.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/amazon-s3/xsxp.tcl
new file mode 100644
index 00000000..1b588de6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/amazon-s3/xsxp.tcl
@@ -0,0 +1,254 @@
+# xsxp.tcl --
+#
+###Abstract
+# Extremely Simple XML Parser
+#
+# This is pretty lame, but I needed something like this for S3,
+# and at the time, TclDOM would not work with the new 8.5 Tcl
+# due to version number problems.
+#
+# In addition, this is a pure-value implementation. There is no
+# garbage to clean up in the event of a thrown error, for example.
+# This simplifies the code for sufficiently small XML documents,
+# which is what Amazon's S3 guarantees.
+#
+###Copyright
+# Copyright (c) 2006 Darren New.
+# All Rights Reserved.
+# NO WARRANTIES OF ANY TYPE ARE PROVIDED.
+# COPYING OR USE INDEMNIFIES THE AUTHOR IN ALL WAYS.
+# See the license terms in LICENSE.txt
+#
+###Revision String
+# SCCS: %Z% %M% %I% %E% %U%
+
+# xsxp::parse $xml
+# Returns a parsed XML, or PXML. A pxml is a list.
+# The first element is the name of the tag.
+# The second element is a list of name/value pairs of the
+# associated attribues, if any.
+# The third thru final values are recursively PXML values.
+# If the first element (element zero, that is) is "%PCDATA",
+# then the attributes will be emtpy and the third element
+# will be the text of the element.
+
+# xsxp::fetch $pxml $path ?$part?
+# $pxml is a parsed XML, as returned from xsxp::parse.
+# $path is a list of elements. Each element is the name of
+# a child to look up, optionally followed by a hash ("#")
+# and a string of digits. An emtpy list or an initial empty
+# element selects $pxml. If no hash sign is present, the
+# behavior is as if "#0" had been appended to that element.
+# An element of $path scans the children at the indicated
+# level for the n'th instance of a child whose tag matches
+# the part of the element before the hash sign. If an element
+# is simply "#" followed by digits, that indexed child is
+# selected, regardless of the tags in the children. So
+# an element of #3 will always select the fourth child
+# of the node under consideration.
+# $part defaults to %ALL. It can be one of the following:
+# %ALL - returns the entire selected element.
+# %TAGNAME - returns lindex 0 of the selected element.
+# %ATTRIBUTES - returns lindex 1 of the selected element.
+# %CHILDREN - returns lrange 2 through end of the selected element,
+#   resulting in a list of elements being returned.
+# %PCDATA - returns a concatenation of all the bodies of
+#   direct children of this node whose tag is %PCDATA.
+#   Throws an error if no such children are found. That
+#   is, part=%PCDATA means return the textual content found
+#   in that node but not its children nodes.
+# %PCDATA? - like %PCDATA, but returns an empty string if
+#   no PCDATA is found.
+
+# xsxp::fetchall $pxml_list $path ?$part?
+# Iterates over each PXML in $pxml_list, selecting the indicated
+# path from it, building a new list with the selected data, and
+# returning that new list. For example, $pxml_list might be
+# the %CHILDREN of a particular element, and the $path and $part
+# might select from each child a sub-element in which we're interested.
+
+# xsxp::only $pxml $tagname
+# Iterates over the direct children of $pxml and selects  only
+# those with $tagname as their tag. Returns a list of matching
+# elements.
+
+# xsxp::prettyprint $pxml
+# Outputs to stdout a nested-list notation of the parsed XML.
+
+package require xml
+package provide xsxp 1.0
+
+namespace eval xsxp {
+
+    variable Stack
+    variable Cur
+
+    proc Characterdatacommand {characterdata} {
+	variable Cur
+	# puts "characterdatacommand $characterdata"
+	set x [list %PCDATA {} $characterdata]
+	lappend Cur $x
+    }
+
+    proc Elementstartcommand {name attlist args} {
+	# puts "elementstart $name {$attlist} $args"
+	variable Stack
+	variable Cur
+	lappend Stack $Cur
+	set Cur [list $name $attlist]
+    }
+
+    proc Elementendcommand {args} {
+	# puts "elementend $args"
+	variable Stack
+	variable Cur
+	set x [lindex $Stack end]
+	lappend x $Cur
+	set Cur $x
+	set Stack [lrange $Stack 0 end-1]
+    }
+
+    proc parse {xml} {
+	variable Cur
+	variable Stack
+	set Cur {}
+	set Stack {}
+	set parser [::xml::parser \
+	    -characterdatacommand [namespace code Characterdatacommand] \
+	    -elementstartcommand [namespace code Elementstartcommand] \
+	    -elementendcommand [namespace code Elementendcommand] \
+	    -ignorewhitespace 1 -final 1
+        ]
+	$parser parse $xml
+	$parser free
+	# The following line is needed because the close of the last element
+	# appends the outermost element to the item on the top of the stack.
+	# Since there's nothing on the top of the stack at the close of the
+	# last element, we append the current element to an empty list.
+	# In essence, since we don't really have a terminating condition
+	# on the recursion, an empty stack is still treated like an element.
+	set Cur [lindex $Cur 0]
+        set Cur [Normalize $Cur]
+        return $Cur
+    }
+
+    proc Normalize {pxml} {
+	# This iterates over pxml recursively, finding entries that
+	# start with multiple %PCDATA elements, and coalesces their
+	# content, so if an element contains only %PCDATA, it is
+	# guaranteed to have only one child.
+	# Not really necessary, given definition of part=%PCDATA
+	# However, it makes pretty-prints nicer (for AWS at least)
+	# and ends up with smaller lists. I have no idea why they
+	# would put quotes around an MD5 hash in hex, tho.
+	set dupl 1
+	while {$dupl} {
+	    set first [lindex $pxml 2]
+	    set second [lindex $pxml 3]
+	    if {[lindex $first 0] eq "%PCDATA" && [lindex $second 0] eq "%PCDATA"} {
+		set repl [list %PCDATA {} [lindex $first 2][lindex $second 2]]
+		set pxml [lreplace $pxml 2 3 $repl]
+	    } else {
+		set dupl 0
+		for {set i 2} {$i < [llength $pxml]} {incr i} {
+		    set pxml [lreplace $pxml $i $i [Normalize [lindex $pxml $i]]]
+		}
+	    }
+	}
+	return $pxml
+    }
+
+    proc prettyprint {pxml {chan stdout} {indent 0}} {
+	puts -nonewline $chan [string repeat "  " $indent]
+	if {[lindex $pxml 0] eq "%PCDATA"} {
+	    puts $chan "%PCDATA: [lindex $pxml 2]"
+	    return
+	}
+	puts -nonewline $chan "[lindex $pxml 0]"
+	foreach {name val} [lindex $pxml 1] {
+	    puts -nonewline $chan " $name='$val'"
+	}
+	puts $chan ""
+	foreach node [lrange $pxml 2 end] {
+	    prettyprint $node $chan [expr $indent+1]
+	}
+    }
+
+    proc fetch {pxml path {part %ALL}} {
+	set path [string trim $path /]
+	if {-1 != [string first / $path]} {
+	    set path [split $path /]
+	}
+	foreach element $path {
+	    if {$pxml eq ""} {return ""}
+	    foreach {tag count} [split $element #] {
+		if {$tag ne ""} {
+		    if {$count eq ""} {set count 0}
+		    set pxml [lrange $pxml 2 end]
+		    while {0 <= $count && 0 != [llength $pxml]} {
+			if {$tag eq [lindex $pxml 0 0]} {
+			    incr count -1
+			    if {$count < 0} {
+				# We're done. Go on to next element.
+				set pxml [lindex $pxml 0]
+			    } else {
+				# Not done yet. Throw this away.
+				set pxml [lrange $pxml 1 end]
+			    }
+			} else {
+			    # Not what we want.
+			    set pxml [lrange $pxml 1 end]
+			}
+		    }
+		} else { # tag eq ""
+		    if {$count eq ""} {
+			# Just select whole $pxml
+		    } else {
+			set pxml [lindex $pxml [expr {2+$count}]]
+		    }
+		}
+		break
+	    } ; # done the foreach [split] loop
+	} ; # done all the elements.
+	if {$part eq "%ALL"} {return $pxml}
+	if {$part eq "%ATTRIBUTES"} {return [lindex $pxml 1]}
+	if {$part eq "%TAGNAME"} {return [lindex $pxml 0]}
+	if {$part eq "%CHILDREN"} {return [lrange $pxml 2 end]}
+	if {$part eq "%PCDATA" || $part eq "%PCDATA?"} {
+	    set res "" ; set found 0
+	    foreach elem [lrange $pxml 2 end] {
+		if {"%PCDATA" eq [lindex $elem 0]} {
+		    append res [lindex $elem 2]
+		    set found 1
+		}
+	    }
+	    if {$found || $part eq "%PCDATA?"} {
+		return $res
+	    } else {
+		error "xsxp::fetch did not find requested PCDATA"
+	    }
+	}
+	return $pxml ; # Don't know what he's after
+    }
+
+    proc only {pxml tag} {
+	set res {}
+	foreach element [lrange $pxml 2 end] {
+	    if {[lindex $element 0] eq $tag} {
+		lappend res $element
+	    }
+	}
+	return $res
+    }
+
+    proc fetchall {pxml_list path {part %ALL}} {
+	set res [list]
+	foreach pxml $pxml_list {
+	    lappend res [fetch $pxml $path $part]
+	}
+	return $res
+    }
+}
+
+namespace export xsxp parse prettyprint fetch
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/asn/asn.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/asn/asn.tcl
new file mode 100644
index 00000000..cca460af
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/asn/asn.tcl
@@ -0,0 +1,1580 @@
+#-----------------------------------------------------------------------------
+#   Copyright (C) 1999-2004 Jochen C. Loewer (loewerj@web.de)
+#   Copyright (C) 2004-2011 Michael Schlenker (mic42@users.sourceforge.net)
+#-----------------------------------------------------------------------------
+#   
+#   A partial ASN decoder/encoder implementation in plain Tcl. 
+#
+#   See ASN.1 (X.680) and BER (X.690).
+#   See 'asn_ber_intro.txt' in this directory.
+#
+#   This software is copyrighted by Jochen C. Loewer (loewerj@web.de). The 
+#   following terms apply to all files associated with the software unless 
+#   explicitly disclaimed in individual files.
+#
+#   The authors hereby grant permission to use, copy, modify, distribute,
+#   and license this software and its documentation for any purpose, provided
+#   that existing copyright notices are retained in all copies and that this
+#   notice is included verbatim in any distributions. No written agreement,
+#   license, or royalty fee is required for any of the authorized uses.
+#   Modifications to this software may be copyrighted by their authors
+#   and need not follow the licensing terms described here, provided that
+#   the new terms are clearly indicated on the first page of each file where
+#   they apply.
+#  
+#   IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+#   FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+#   ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+#   DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+#   POSSIBILITY OF SUCH DAMAGE.
+#
+#   THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+#   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+#   FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+#   IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+#   NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+#   MODIFICATIONS.
+#
+#   written by Jochen Loewer
+#   3 June, 1999
+#
+#   $Id: asn.tcl,v 1.20 2011/01/05 22:33:33 mic42 Exp $
+#
+#-----------------------------------------------------------------------------
+
+# needed for using wide()
+package require Tcl 8.4
+
+namespace eval asn {
+    # Encoder commands
+    namespace export \
+        asnSequence \
+	asnSequenceFromList \
+        asnSet \
+	asnSetFromList \
+        asnApplicationConstr \
+        asnApplication \
+	asnContext\
+	asnContextConstr\
+        asnChoice \
+        asnChoiceConstr \
+        asnInteger \
+        asnEnumeration \
+        asnBoolean \
+        asnOctetString \
+        asnNull	   \
+	asnUTCTime \
+	asnNumericString \
+        asnPrintableString \
+        asnIA5String\
+	asnBMPString\
+	asnUTF8String\
+        asnBitString \
+        asnObjectIdentifer 
+        
+    # Decoder commands
+    namespace export \
+        asnGetResponse \
+        asnGetInteger \
+        asnGetEnumeration \
+        asnGetOctetString \
+        asnGetSequence \
+        asnGetSet \
+        asnGetApplication \
+	asnGetNumericString \
+        asnGetPrintableString \
+        asnGetIA5String \
+	asnGetBMPString \
+	asnGetUTF8String \
+        asnGetObjectIdentifier \
+        asnGetBoolean \
+        asnGetUTCTime \
+        asnGetBitString \
+        asnGetContext 
+    
+    # general BER utility commands    
+    namespace export \
+        asnPeekByte  \
+        asnGetLength \
+        asnRetag     \
+	asnPeekTag   \
+	asnTag	     
+        
+}
+
+#-----------------------------------------------------------------------------
+# Implementation notes:
+#
+# See the 'asn_ber_intro.txt' in this directory for an introduction
+# into BER/DER encoding of ASN.1 information. Bibliography information
+#
+#   A Layman's Guide to a Subset of ASN.1, BER, and DER
+#
+#   An RSA Laboratories Technical Note
+#   Burton S. Kaliski Jr.
+#   Revised November 1, 1993
+#
+#   Supersedes June 3, 1991 version, which was also published as
+#   NIST/OSI Implementors' Workshop document SEC-SIG-91-17.
+#   PKCS documents are available by electronic mail to
+#   <pkcs@rsa.com>.
+#
+#   Copyright (C) 1991-1993 RSA Laboratories, a division of RSA
+#   Data Security, Inc. License to copy this document is granted
+#   provided that it is identified as "RSA Data Security, Inc.
+#   Public-Key Cryptography Standards (PKCS)" in all material
+#   mentioning or referencing this document.
+#   003-903015-110-000-000
+#
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# asnLength : Encode some length data. Helper command.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnLength {len} {
+    
+    if {$len < 0} {
+        return -code error "Negative length octet requested"
+    }
+    if {$len < 128} {
+        # short form: ISO X.690 8.1.3.4 
+        return [binary format c $len]
+    }
+    # long form: ISO X.690 8.1.3.5
+    # try to use a minimal encoding, 
+    # even if not required by BER, but it is required by DER
+    # take care for signed vs. unsigned issues
+    if {$len < 256  } {
+        return [binary format H2c 81 [expr {$len - 256}]]
+    }
+    if {$len < 32769} {
+        # two octet signed value
+        return [binary format H2S 82 $len]
+    }
+    if {$len < 65536} {
+        return [binary format H2S 82 [expr {$len - 65536}]]
+    }
+    if {$len < 8388608} {
+        # three octet signed value    
+        return [binary format H2cS 83 [expr {$len >> 16}] [expr {($len & 0xFFFF) - 65536}]] 
+    }    
+    if {$len < 16777216} {
+        # three octet signed value    
+        return [binary format H2cS 83 [expr {($len >> 16) -256}] [expr {($len & 0xFFFF) -65536}]] 
+    }
+    if {$len < 2147483649} { 
+        # four octet signed value
+        return [binary format H2I 84 $len]
+    }
+    if {$len < 4294967296} {
+        # four octet unsigned value
+        return [binary format H2I 84 [expr {$len - 4294967296}]]
+    }
+    if {$len < 1099511627776} {
+        # five octet unsigned value
+        return [binary format H2 85][string range [binary format W $len] 3 end]  
+    }
+    if {$len < 281474976710656} {
+        # six octet unsigned value
+        return [binary format H2 86][string range [binary format W $len] 2 end]
+    }
+    if {$len < 72057594037927936} {
+        # seven octet value
+        return [binary format H2 87][string range [binary format W $len] 1 end]
+    }
+    
+    # must be a 64-bit wide signed value
+    return [binary format H2W 88 $len] 
+}
+
+#-----------------------------------------------------------------------------
+# asnSequence : Assumes that the arguments are already ASN encoded.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnSequence {args} {
+    asnSequenceFromList $args
+}
+
+proc ::asn::asnSequenceFromList {lst} {
+    # The sequence tag is 0x30. The length is arbitrary and thus full
+    # length coding is required. The arguments have to be BER encoded
+    # already. Constructed value, definite-length encoding.
+
+    set out ""
+    foreach part $lst {
+        append out $part
+    }
+    set len [string length $out]
+    return [binary format H2a*a$len 30 [asnLength $len] $out]
+}
+
+
+#-----------------------------------------------------------------------------
+# asnSet : Assumes that the arguments are already ASN encoded.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnSet {args} {
+    asnSetFromList $args
+}
+
+proc ::asn::asnSetFromList {lst} {
+    # The set tag is 0x31. The length is arbitrary and thus full
+    # length coding is required. The arguments have to be BER encoded
+    # already.
+
+    set out ""
+    foreach part $lst {
+        append out $part
+    }
+    set len [string length $out]
+    return [binary format H2a*a$len 31 [asnLength $len] $out]
+}
+
+
+#-----------------------------------------------------------------------------
+# asnApplicationConstr
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnApplicationConstr {appNumber args} {
+    # Packs the arguments into a constructed value with application tag.
+
+    set out ""
+    foreach part $args {
+        append out $part
+    }
+    set code [expr {0x060 + $appNumber}]
+    set len  [string length $out]
+    return [binary format ca*a$len $code [asnLength $len] $out]
+}
+
+#-----------------------------------------------------------------------------
+# asnApplication
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnApplication {appNumber data} {
+    # Packs the arguments into a constructed value with application tag.
+
+    set code [expr {0x040 + $appNumber}]
+    set len  [string length $data]
+    return [binary format ca*a$len $code [asnLength $len] $data]
+}
+
+#-----------------------------------------------------------------------------
+# asnContextConstr
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnContextConstr {contextNumber args} {
+    # Packs the arguments into a constructed value with application tag.
+
+    set out ""
+    foreach part $args {
+        append out $part
+    }
+    set code [expr {0x0A0 + $contextNumber}]
+    set len  [string length $out]
+    return [binary format ca*a$len $code [asnLength $len] $out]
+}
+
+#-----------------------------------------------------------------------------
+# asnContext
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnContext {contextNumber data} {
+    # Packs the arguments into a constructed value with application tag.
+    set code [expr {0x080 + $contextNumber}]
+    set len  [string length $data]
+    return [binary format ca*a$len $code [asnLength $len] $data]
+}
+#-----------------------------------------------------------------------------
+# asnChoice
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnChoice {appNumber args} {
+    # Packs the arguments into a choice construction.
+
+    set out ""
+    foreach part $args {
+        append out $part
+    }
+    set code [expr {0x080 + $appNumber}]
+    set len  [string length $out]
+    return [binary format ca*a$len $code [asnLength $len] $out]
+}
+
+#-----------------------------------------------------------------------------
+# asnChoiceConstr
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnChoiceConstr {appNumber args} {
+    # Packs the arguments into a choice construction.
+
+    set out ""
+    foreach part $args {
+        append out $part
+    }
+    set code [expr {0x0A0 + $appNumber}]
+    set len  [string length $out]
+    return [binary format ca*a$len $code [asnLength $len] $out]
+}
+
+#-----------------------------------------------------------------------------
+# asnInteger : Encode integer value.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnInteger {number} {
+    asnIntegerOrEnum 02 $number
+}
+
+#-----------------------------------------------------------------------------
+# asnEnumeration : Encode enumeration value.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnEnumeration {number} {
+    asnIntegerOrEnum 0a $number
+}
+
+#-----------------------------------------------------------------------------
+# asnIntegerOrEnum : Common code for Integers and Enumerations
+#                    No Bignum version, as we do not expect large Enums.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnIntegerOrEnum {tag number} {
+    # The integer tag is 0x02 , the Enum Tag 0x0a otherwise identical. 
+    # The length is 1, 2, 3, or 4, coded in a
+    # single byte. This can be done directly, no need to go through
+    # asnLength. The value itself is written in big-endian.
+
+    # Known bug/issue: The command cannot handle very wide integers, i.e.
+    # anything above 8 bytes length. Use asnBignumInteger for those.
+    
+    # check if we really have an int
+    set num $number
+    incr num
+    
+    if {($number >= -128) && ($number < 128)} {
+        return [binary format H2H2c $tag 01 $number]
+    }
+    if {($number >= -32768) && ($number < 32768)} {
+        return [binary format H2H2S $tag 02 $number]
+    }
+    if {($number >= -8388608) && ($number < 8388608)} {
+        set numberb [expr {$number & 0xFFFF}]
+        set numbera [expr {($number >> 16) & 0xFF}]
+        return [binary format H2H2cS $tag 03 $numbera $numberb]
+    }
+    if {($number >= -2147483648) && ($number < 2147483648)} {
+        return [binary format H2H2I $tag 04 $number]
+    }
+    if {($number >= -549755813888) && ($number < 549755813888)} {
+        set numberb [expr {$number & 0xFFFFFFFF}]
+        set numbera [expr {($number >> 32) & 0xFF}]
+        return [binary format H2H2cI $tag 05 $numbera $numberb]
+    }
+    if {($number >= -140737488355328) && ($number < 140737488355328)} {
+        set numberb [expr {$number & 0xFFFFFFFF}]
+        set numbera [expr {($number >> 32) & 0xFFFF}]
+        return [binary format H2H2SI $tag 06 $numbera $numberb]        
+    }
+    if {($number >= -36028797018963968) && ($number < 36028797018963968)} {
+        set numberc [expr {$number & 0xFFFFFFFF}]
+        set numberb [expr {($number >> 32) & 0xFFFF}]
+        set numbera [expr {($number >> 48) & 0xFF}]
+        return [binary format H2H2cSI $tag 07 $numbera $numberb $numberc]        
+    }    
+    if {($number >= -9223372036854775808) && ($number <= 9223372036854775807)} {
+        return [binary format H2H2W $tag 08 $number]
+    }
+    return -code error "Integer value to large to encode, use asnBigInteger" 
+}
+
+#-----------------------------------------------------------------------------
+# asnBigInteger : Encode a long integer value using math::bignum
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnBigInteger {bignum} {
+    # require math::bignum only if it is used
+    package require math::bignum
+    
+    # this is a hack to check for bignum...
+    if {[llength $bignum] < 2 || ([lindex $bignum 0] ne "bignum")} {
+        return -code error "expected math::bignum value got \"$bignum\""
+    }
+    if {[math::bignum::sign $bignum]} {
+        # generate two's complement form
+        set bits [math::bignum::bits $bignum]
+        set padding [expr {$bits % 8}]
+        set len [expr {int(ceil($bits / 8.0))}]
+        if {$padding == 0} {
+            # we need a complete extra byte for the sign
+            # unless this is a base 2 multiple
+            set test [math::bignum::fromstr 0]
+            math::bignum::setbit test [expr {$bits-1}]
+            if {[math::bignum::ne [math::bignum::abs $bignum] $test]} {
+                incr len
+            }
+        }
+        set exp [math::bignum::pow \
+		    [math::bignum::fromstr 256] \
+		    [math::bignum::fromstr $len]]
+        set bignum [math::bignum::add $bignum $exp]
+        set hex [math::bignum::tostr $bignum 16]
+    } else {
+        set bits [math::bignum::bits $bignum]
+        if {($bits % 8) == 0 && $bits > 0} {
+            set pad "00"
+        } else {
+            set pad ""
+        }
+        set hex $pad[math::bignum::tostr $bignum 16]
+    }
+    if {[string length $hex]%2} {
+        set hex "0$hex"
+    }
+    set octets [expr {(([string length $hex]+1)/2)}]
+    return [binary format H2a*H* 02 [asnLength $octets] $hex]   
+}
+
+
+#-----------------------------------------------------------------------------
+# asnBoolean : Encode a boolean value.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnBoolean {bool} {
+    # The boolean tag is 0x01. The length is always 1, coded in
+    # a single byte. This can be done directly, no need to go through
+    # asnLength. The value itself is written in big-endian.
+
+    return [binary format H2H2c 01 01 [expr {$bool ? 0x0FF : 0x0}]]
+}
+
+#-----------------------------------------------------------------------------
+# asnOctetString : Encode a string of arbitrary bytes
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnOctetString {string} {
+    # The octet tag is 0x04. The length is arbitrary, so we need
+    # 'asnLength' for full coding of the length.
+
+    set len [string length $string]
+    return [binary format H2a*a$len 04 [asnLength $len] $string]
+}
+
+#-----------------------------------------------------------------------------
+# asnNull : Encode a null value
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnNull {} {
+    # Null has only one valid encoding
+    return \x05\x00
+}
+
+#-----------------------------------------------------------------------------
+# asnBitstring : Encode a Bit String value
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnBitString {bitstring} {
+    # The bit string tag is 0x03.
+    # Bit strings can be either simple or constructed
+    # we always use simple encoding
+    
+    set bitlen [string length $bitstring]
+    set padding [expr {(8 - ($bitlen % 8)) % 8}]
+    set len [expr {($bitlen / 8) + 1}]
+    if {$padding != 0} { incr len }
+
+    return [binary format H2a*cB* 03 [asnLength $len] $padding $bitstring]    
+}
+
+#-----------------------------------------------------------------------------
+# asnUTCTime : Encode an UTC time string
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnUTCTime {UTCtimestring} {
+    # the utc time tag is 0x17.
+    # 
+    # BUG: we do not check the string for well formedness
+    
+    set ascii [encoding convertto ascii $UTCtimestring]
+    set len [string length $ascii]
+    return [binary format H2a*a* 17 [asnLength $len] $ascii]
+}
+
+#-----------------------------------------------------------------------------
+# asnPrintableString : Encode a printable string
+#-----------------------------------------------------------------------------
+namespace eval asn {
+    variable nonPrintableChars {[^ A-Za-z0-9'()+,.:/?=-]}
+}	
+proc ::asn::asnPrintableString {string} {
+    # the printable string tag is 0x13
+    variable nonPrintableChars
+    # it is basically a restricted ascii string
+    if {[regexp $nonPrintableChars $string ]} {
+        return -code error "Illegal character in PrintableString."
+    }
+    
+    # check characters
+    set ascii [encoding convertto ascii $string]
+    return [asnEncodeString 13 $ascii]
+}
+
+#-----------------------------------------------------------------------------
+# asnIA5String : Encode an Ascii String
+#-----------------------------------------------------------------------------
+proc ::asn::asnIA5String {string} {
+    # the IA5 string tag is 0x16
+    # check for extended charachers
+    if {[string length $string]!=[string bytelength $string]} {
+	return -code error "Illegal character in IA5String"
+    }
+    set ascii [encoding convertto ascii $string]
+    return [asnEncodeString 16 $ascii]
+}
+
+#-----------------------------------------------------------------------------
+# asnNumericString : Encode a Numeric String type
+#-----------------------------------------------------------------------------
+namespace eval asn {
+    variable nonNumericChars {[^0-9 ]}
+}
+proc ::asn::asnNumericString {string} {
+    # the Numeric String type has tag 0x12
+    variable nonNumericChars
+    if {[regexp $nonNumericChars $string]} {
+        return -code error "Illegal character in Numeric String."
+    }
+    
+    return [asnEncodeString 12 $string]
+}
+#----------------------------------------------------------------------
+# asnBMPString: Encode a Tcl string as Basic Multinligval (UCS2) string
+#-----------------------------------------------------------------------
+proc asn::asnBMPString  {string} {
+    if {$::tcl_platform(byteOrder) eq "littleEndian"} {
+	set bytes ""
+	foreach {lo hi} [split [encoding convertto unicode $string] ""] {
+	    append bytes $hi $lo
+	}	
+    } else {
+	set bytes [encoding convertto unicode $string]
+    }
+    return [asnEncodeString 1e $bytes]
+}	
+#---------------------------------------------------------------------------
+# asnUTF8String: encode tcl string as UTF8 String
+#----------------------------------------------------------------------------
+proc asn::asnUTF8String {string} {
+    return [asnEncodeString 0c [encoding convertto utf-8 $string]]
+}
+#-----------------------------------------------------------------------------
+# asnEncodeString : Encode an RestrictedCharacter String
+#-----------------------------------------------------------------------------
+proc ::asn::asnEncodeString {tag string} {
+    set len [string length $string]
+    return [binary format H2a*a$len $tag [asnLength $len] $string]    
+}
+
+#-----------------------------------------------------------------------------
+# asnObjectIdentifier : Encode an Object Identifier value
+#-----------------------------------------------------------------------------
+proc ::asn::asnObjectIdentifier {oid} {
+    # the object identifier tag is 0x06
+    
+    if {[llength $oid] < 2} {
+        return -code error "OID must have at least two subidentifiers."
+    }
+    
+    # basic check that it is valid
+    foreach identifier $oid {
+        if {$identifier < 0} {
+            return -code error \
+		"Malformed OID. Identifiers must be positive Integers."
+        }
+    }
+    
+    if {[lindex $oid 0] > 2} {
+            return -code error "First subidentifier must be 0,1 or 2"
+    }
+    if {[lindex $oid 1] > 39} {
+            return -code error \
+		"Second subidentifier must be between 0 and 39"
+    }
+    
+    # handle the special cases directly
+    switch [llength $oid] {
+        2  {  return [binary format H2H2c 06 01 \
+		[expr {[lindex $oid 0]*40+[lindex $oid 1]}]] }
+        default {
+              # This can probably be written much shorter. 
+              # Just a first try that works...
+              #
+              set octets [binary format c \
+		[expr {[lindex $oid 0]*40+[lindex $oid 1]}]]
+              foreach identifier [lrange $oid 2 end] {
+                  set d 128
+                  if {$identifier < 128} {
+                    set subidentifier [list $identifier]
+                  } else {  
+                    set subidentifier [list]
+                    # find the largest divisor
+                    
+                    while {($identifier / $d) >= 128} { 
+			set d [expr {$d * 128}] 
+		    }
+                    # and construct the subidentifiers
+                    set remainder $identifier
+                    while {$d >= 128} {
+                        set coefficient [expr {($remainder / $d) | 0x80}]
+                        set remainder [expr {$remainder % $d}]
+                        set d [expr {$d / 128}]
+                        lappend subidentifier $coefficient
+                    }
+                    lappend subidentifier $remainder
+                  }
+                  append octets [binary format c* $subidentifier]
+              }
+              return [binary format H2a*a* 06 \
+		      [asnLength [string length $octets]] $octets]
+        }
+    }
+
+}
+
+#-----------------------------------------------------------------------------
+# asnGetResponse : Read a ASN response from a channel.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetResponse {sock data_var} {
+    upvar 1 $data_var data
+
+    # We expect a sequence here (tag 0x30). The code below is an
+    # inlined replica of 'asnGetSequence', modified for reading from a
+    # channel instead of a string.
+
+    set tag [read $sock 1]
+
+    if {$tag == "\x30"} {
+    # The following code is a replica of 'asnGetLength', modified
+    # for reading the bytes from the channel instead of a string.
+
+        set len1 [read $sock 1]
+        binary scan $len1 c num
+        set length [expr {($num + 0x100) % 0x100}]
+
+        if {$length  >= 0x080} {
+        # The byte the read is not the length, but a prefix, and
+        # the lower nibble tells us how many bytes follow.
+
+            set len_length  [expr {$length & 0x7f}]
+
+        # BUG: We should not perform the value extraction for an
+        # BUG: improper length. It wastes cycles, and here it can
+        # BUG: cause us trouble, reading more data than there is
+        # BUG: on the channel. Depending on the channel
+        # BUG: configuration an attacker can induce us to block,
+        # BUG: causing a denial of service.
+            set lengthBytes [read $sock $len_length]
+
+            switch $len_length {
+                1 {
+            binary scan $lengthBytes     c length 
+            set length [expr {($length + 0x100) % 0x100}]
+                }
+                2 { binary scan $lengthBytes     S length }
+                3 { binary scan \x00$lengthBytes I length }
+                4 { binary scan $lengthBytes     I length }
+                default {
+                    return -code error \
+			"length information too long ($len_length)"
+                }
+            }
+        }
+
+    # Now that the length is known we get the remainder,
+    # i.e. payload, and construct proper in-memory BER encoded
+    # sequence.
+
+        set rest [read $sock $length]
+        set data [binary format aa*a$length $tag [asnLength $length] $rest]
+    }  else {
+    # Generate an error message if the data is not a sequence as
+    # we expected.
+
+        set tag_hex ""
+        binary scan $tag H2 tag_hex
+        return -code error "unknown start tag [string length $tag] $tag_hex"
+    }
+}
+
+if {[package vsatisfies [package present Tcl] 8.5.0]} {
+##############################################################################
+# Code for 8.5
+##############################################################################
+#-----------------------------------------------------------------------------
+# asnGetByte (8.5 version) : Retrieve a single byte from the data (unsigned)
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetByte {data_var byte_var} {
+    upvar 1 $data_var data $byte_var byte
+    
+    binary scan [string index $data 0] cu byte
+    set data [string range $data 1 end]
+
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnPeekByte (8.5 version) : Retrieve a single byte from the data (unsigned) 
+#               without removing it.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnPeekByte {data_var byte_var {offset 0}} {
+    upvar 1 $data_var data $byte_var byte
+    
+    binary scan [string index $data $offset] cu byte
+
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnGetLength (8.5 version) : Decode an ASN length value (See notes)
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetLength {data_var length_var} {
+    upvar 1 $data_var data  $length_var length
+
+    asnGetByte data length
+    if {$length == 0x080} {
+        return -code error "Indefinite length BER encoding not yet supported"
+    }
+    if {$length > 0x080} {
+    # The retrieved byte is a prefix value, and the integer in the
+    # lower nibble tells us how many bytes were used to encode the
+    # length data following immediately after this prefix.
+
+        set len_length [expr {$length & 0x7f}]
+        
+        if {[string length $data] < $len_length} {
+            return -code error \
+		"length information invalid, not enough octets left" 
+        }
+        
+        asnGetBytes data $len_length lengthBytes
+
+        switch $len_length {
+            1 { binary scan $lengthBytes     cu length }
+            2 { binary scan $lengthBytes     Su length }
+            3 { binary scan \x00$lengthBytes Iu length }
+            4 { binary scan $lengthBytes     Iu length }
+            default {                
+                binary scan $lengthBytes H* hexstr
+		scan $hexstr %llx length
+            }
+        }
+    }
+    return
+}
+
+} else {
+##############################################################################
+# Code for Tcl 8.4
+##############################################################################
+#-----------------------------------------------------------------------------
+# asnGetByte : Retrieve a single byte from the data (unsigned)
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetByte {data_var byte_var} {
+    upvar 1 $data_var data $byte_var byte
+    
+    binary scan [string index $data 0] c byte
+    set byte [expr {($byte + 0x100) % 0x100}]  
+    set data [string range $data 1 end]
+
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnPeekByte : Retrieve a single byte from the data (unsigned) 
+#               without removing it.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnPeekByte {data_var byte_var {offset 0}} {
+    upvar 1 $data_var data $byte_var byte
+    
+    binary scan [string index $data $offset] c byte
+    set byte [expr {($byte + 0x100) % 0x100}]  
+
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnGetLength : Decode an ASN length value (See notes)
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetLength {data_var length_var} {
+    upvar 1 $data_var data  $length_var length
+
+    asnGetByte data length
+    if {$length == 0x080} {
+        return -code error "Indefinite length BER encoding not yet supported"
+    }
+    if {$length > 0x080} {
+    # The retrieved byte is a prefix value, and the integer in the
+    # lower nibble tells us how many bytes were used to encode the
+    # length data following immediately after this prefix.
+
+        set len_length [expr {$length & 0x7f}]
+        
+        if {[string length $data] < $len_length} {
+            return -code error \
+		"length information invalid, not enough octets left" 
+        }
+        
+        asnGetBytes data $len_length lengthBytes
+
+        switch $len_length {
+            1 {
+        # Efficiently coded data will not go through this
+        # path, as small length values can be coded directly,
+        # without a prefix.
+
+            binary scan $lengthBytes     c length 
+            set length [expr {($length + 0x100) % 0x100}]
+            }
+            2 { binary scan $lengthBytes     S length 
+            set length [expr {($length + 0x10000) % 0x10000}]
+            }
+            3 { binary scan \x00$lengthBytes I length 
+            set length [expr {($length + 0x1000000) % 0x1000000}]
+            }
+            4 { binary scan $lengthBytes     I length 
+            set length [expr {(wide($length) + 0x100000000) % 0x100000000}]
+            }
+            default {                
+                binary scan $lengthBytes H* hexstr
+                # skip leading zeros which are allowed by BER
+                set hexlen [string trimleft $hexstr 0] 
+                # check if it fits into a 64-bit signed integer
+                if {[string length $hexlen] > 16} {
+                    return -code error -errorcode {ARITH IOVERFLOW 
+                            {Length value too large for normal use, try asnGetBigLength}} \
+			    "Length value to large"
+                } elseif {  [string length $hexlen] == 16 \
+			&& ([string index $hexlen 0] & 0x8)} { 
+                    # check most significant bit, if set we need bignum
+                    return -code error -errorcode {ARITH IOVERFLOW 
+                            {Length value too large for normal use, try asnGetBigLength}} \
+			    "Length value to large"
+                } else {
+                    scan $hexstr "%lx" length
+                }
+            }
+        }
+    }
+    return
+}
+
+} 
+
+#-----------------------------------------------------------------------------
+# asnRetag: Remove an explicit tag with the real newTag
+#
+#-----------------------------------------------------------------------------
+proc ::asn::asnRetag {data_var newTag} {
+    upvar 1 $data_var data 
+    set tag ""
+    set type ""
+    set len [asnPeekTag data tag type dummy]	
+    asnGetBytes data $len tagbytes
+    set data [binary format c* $newTag]$data
+}
+
+#-----------------------------------------------------------------------------
+# asnGetBytes : Retrieve a block of 'length' bytes from the data.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetBytes {data_var length bytes_var} {
+    upvar 1 $data_var data  $bytes_var bytes
+
+    incr length -1
+    set bytes [string range $data 0 $length]
+    incr length
+    set data [string range $data $length end]
+
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnPeekTag : Decode the tag value
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnPeekTag {data_var tag_var tagtype_var constr_var} {
+    upvar 1 $data_var data $tag_var tag $tagtype_var tagtype $constr_var constr
+    
+    set type 0	
+    set offset 0
+    asnPeekByte data type $offset
+    # check if we have a simple tag, < 31, which fits in one byte
+     
+    set tval [expr {$type & 0x1f}]
+    if {$tval == 0x1f} {
+	# long tag, max 64-bit with Tcl 8.4, unlimited with 8.5 bignum
+	asnPeekByte data tagbyte [incr offset]
+	set tval [expr {wide($tagbyte & 0x7f)}]
+	while {($tagbyte & 0x80)} {
+	    asnPeekByte data tagbyte [incr offset] 
+	    set tval [expr {($tval << 7) + ($tagbyte & 0x7f)}]
+	}
+    } 
+
+    set tagtype [lindex {UNIVERSAL APPLICATION CONTEXT PRIVATE} \
+	[expr {($type & 0xc0) >>6}]]
+    set tag $tval
+    set constr [expr {($type & 0x20) > 0}]
+
+    return [incr offset]	
+}
+
+#-----------------------------------------------------------------------------
+# asnTag : Build a tag value
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnTag {tagnumber {class UNIVERSAL} {tagstyle P}} {
+    set first 0
+    if {$tagnumber < 31} {
+	# encode everything in one byte
+	set first $tagnumber	
+	set bytes [list]
+    } else {
+	# multi-byte tag
+	set first 31
+	set bytes [list [expr {$tagnumber & 0x7f}]]
+	set tagnumber [expr {$tagnumber >> 7}]
+	while {$tagnumber > 0} {
+	    lappend bytes [expr {($tagnumber & 0x7f)+0x80}]
+	    set tagnumber [expr {$tagnumber >>7}]	
+	}
+
+    }
+    
+    if {$tagstyle eq "C" || $tagstyle == 1 } {incr first 32}
+    switch -glob -- $class {
+	U* {		    ;# UNIVERSAL } 
+	A* { incr first 64  ;# APPLICATION }
+	C* { incr first 128 ;# CONTEXT }
+	P* { incr first 192 ;# PRIVATE }
+	default {
+	    return -code error "Unknown tag class \"$class\""
+	}	
+    }
+    if {[llength $bytes] > 0} {
+	# long tag
+	set rbytes [list]
+	for {set i [expr {[llength $bytes]-1}]} {$i >= 0} {incr i -1} {
+	    lappend rbytes [lindex $bytes $i]
+	}
+	return [binary format cc* $first $rbytes ]
+    } 
+    return [binary format c $first]
+}
+
+
+
+#-----------------------------------------------------------------------------
+# asnGetBigLength : Retrieve a length that can not be represented in 63-bit
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetBigLength {data_var biglength_var} {
+
+    # Does any real world code really need this? 
+    # If we encounter this, we are doomed to fail anyway, 
+    # (there would be an Exabyte inside the data_var, )
+    #
+    # So i implement it just for completeness.
+    # 
+    package require math::bignum
+    
+    upvar 1 $data_var data  $biglength_var length
+
+    asnGetByte data length
+    if {$length == 0x080} {
+        return -code error "Indefinite length BER encoding not yet supported"
+    }
+    if {$length > 0x080} {
+    # The retrieved byte is a prefix value, and the integer in the
+    # lower nibble tells us how many bytes were used to encode the
+    # length data following immediately after this prefix.
+
+        set len_length [expr {$length & 0x7f}]
+        
+        if {[string length $data] < $len_length} {
+            return -code error \
+		"length information invalid, not enough octets left" 
+        }
+        
+        asnGetBytes data $len_length lengthBytes
+        binary scan $lengthBytes H* hexlen
+        set length [math::bignum::fromstr $hexlen 16]
+    }
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnGetInteger : Retrieve integer.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetInteger {data_var int_var} {
+    # Tag is 0x02. 
+
+    upvar 1 $data_var data $int_var int
+
+    asnGetByte   data tag
+
+    if {$tag != 0x02} {
+        return -code error \
+            [format "Expected Integer (0x02), but got %02x" $tag]
+    }
+
+    asnGetLength data len
+    asnGetBytes  data $len integerBytes
+
+    set int ?
+
+    switch $len {
+        1 { binary scan $integerBytes     c int }
+        2 { binary scan $integerBytes     S int }
+        3 { 
+            # check for negative int and pad 
+            scan [string index $integerBytes 0] %c byte
+            if {$byte & 128} {
+                binary scan \xff$integerBytes I int
+            } else {
+                binary scan \x00$integerBytes I int 
+            }
+          }
+        4 { binary scan $integerBytes     I int }
+        5 -
+        6 -
+        7 -
+        8 {
+            # check for negative int and pad
+            scan [string index $integerBytes 0] %c byte
+            if {$byte & 128} {
+                set pad [string repeat \xff [expr {8-$len}]]
+            } else {
+                set pad [string repeat \x00 [expr {8-$len}]]
+            }
+            binary scan $pad$integerBytes W int 
+        }
+        default {
+        # Too long, or prefix coding was used.
+            return -code error "length information too long"
+        }
+    }
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnGetBigInteger : Retrieve a big integer.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetBigInteger {data_var bignum_var} {
+	# require math::bignum only if it is used
+	package require math::bignum
+
+	# Tag is 0x02. We expect that the length of the integer is coded with
+	# maximal efficiency, i.e. without a prefix 0x81 prefix. If a prefix
+	# is used this decoder will fail.
+
+	upvar $data_var data $bignum_var bignum
+
+	asnGetByte   data tag
+
+	if {$tag != 0x02} {
+		return -code error \
+			[format "Expected Integer (0x02), but got %02x" $tag]
+	}
+
+	asnGetLength data len
+	asnGetBytes  data $len integerBytes
+
+	binary scan [string index $integerBytes 0] H* hex_head
+	set head [expr 0x$hex_head]
+	set replacement_head [expr {$head & 0x7f}]
+	set integerBytes [string replace $integerBytes 0 0 [format %c $replacement_head]]
+
+	binary scan $integerBytes H* hex
+
+	set bignum [math::bignum::fromstr $hex 16]
+
+	if {($head >> 7) && 1} {
+		set bigsub [math::bignum::pow [::math::bignum::fromstr 2] [::math::bignum::fromstr [expr {($len * 8) - 1}]]]
+		set bignum [math::bignum::sub $bignum $bigsub]
+	}
+
+	return $bignum
+}
+
+
+
+
+#-----------------------------------------------------------------------------
+# asnGetEnumeration : Retrieve an enumeration id
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetEnumeration {data_var enum_var} {
+    # This is like 'asnGetInteger', except for a different tag.
+
+    upvar 1 $data_var data $enum_var enum
+
+    asnGetByte   data tag
+
+    if {$tag != 0x0a} {
+        return -code error \
+            [format "Expected Enumeration (0x0a), but got %02x" $tag]
+    }
+
+    asnGetLength data len
+    asnGetBytes  data $len integerBytes
+    set enum ?
+
+    switch $len {
+        1 { binary scan $integerBytes     c enum }
+        2 { binary scan $integerBytes     S enum }
+        3 { binary scan \x00$integerBytes I enum }
+        4 { binary scan $integerBytes     I enum }
+        default {
+            return -code error "length information too long"
+        }
+    }
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnGetOctetString : Retrieve arbitrary string.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetOctetString {data_var string_var} {
+    # Here we need the full decoder for length data.
+
+    upvar 1 $data_var data $string_var string
+    
+    asnGetByte data tag
+    if {$tag != 0x04} { 
+        return -code error \
+            [format "Expected Octet String (0x04), but got %02x" $tag]
+    }
+    asnGetLength data length
+    asnGetBytes  data $length temp
+    set string $temp
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnGetSequence : Retrieve Sequence data for further decoding.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetSequence {data_var sequence_var} {
+    # Here we need the full decoder for length data.
+
+    upvar 1 $data_var data $sequence_var sequence
+
+    asnGetByte data tag
+    if {$tag != 0x030} { 
+        return -code error \
+            [format "Expected Sequence (0x30), but got %02x" $tag]
+    }    
+    asnGetLength data length
+    asnGetBytes  data $length temp
+    set sequence $temp
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnGetSet : Retrieve Set data for further decoding.
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetSet {data_var set_var} {
+    # Here we need the full decoder for length data.
+
+    upvar 1 $data_var data $set_var set
+
+    asnGetByte data tag
+    if {$tag != 0x031} { 
+        return -code error \
+            [format "Expected Set (0x31), but got %02x" $tag]
+    }    
+    asnGetLength data length
+    asnGetBytes  data $length temp
+    set set $temp
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnGetApplication
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetApplication {data_var appNumber_var {content_var {}} {encodingType_var {}} } {
+    upvar 1 $data_var data $appNumber_var appNumber
+
+    asnGetByte   data tag
+    asnGetLength data length
+
+    if {($tag & 0xC0) != 0x40} {
+        return -code error \
+            [format "Expected Application, but got %02x" $tag]
+    }    
+    if {$encodingType_var != {}} {
+	upvar 1 $encodingType_var encodingType
+	set encodingType [expr {($tag & 0x20) > 0}]
+    }
+    set appNumber [expr {$tag & 0x1F}]
+	if {[string length $content_var]} {
+		upvar 1 $content_var content
+		asnGetBytes data $length content
+	}	
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnGetBoolean: decode a boolean value
+#-----------------------------------------------------------------------------
+
+proc asn::asnGetBoolean {data_var bool_var} {
+    upvar 1 $data_var data $bool_var bool
+
+    asnGetByte data tag
+    if {$tag != 0x01} {
+        return -code error \
+            [format "Expected Boolean (0x01), but got %02x" $tag]
+    }
+
+    asnGetLength data length
+    asnGetByte data byte
+    set bool [expr {$byte == 0 ? 0 : 1}]    
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnGetUTCTime: Extract an UTC Time string from the data. Returns a string
+#                representing an UTC Time.
+#
+#-----------------------------------------------------------------------------
+
+proc asn::asnGetUTCTime {data_var utc_var} {
+    upvar 1 $data_var data $utc_var utc
+
+    asnGetByte data tag
+    if {$tag != 0x17} {
+        return -code error \
+            [format "Expected UTCTime (0x17), but got %02x" $tag]
+    }
+
+    asnGetLength data length
+    asnGetBytes data $length bytes
+    
+    # this should be ascii, make it explicit
+    set bytes [encoding convertfrom ascii $bytes]
+    binary scan $bytes a* utc
+    
+    return
+}
+
+
+#-----------------------------------------------------------------------------
+# asnGetBitString: Extract a Bit String value (a string of 0/1s) from the
+#                  ASN.1 data.
+#
+#-----------------------------------------------------------------------------
+
+proc asn::asnGetBitString {data_var bitstring_var} {
+    upvar 1 $data_var data $bitstring_var bitstring
+
+    asnGetByte data tag
+    if {$tag != 0x03} {
+        return -code error \
+            [format "Expected Bit String (0x03), but got %02x" $tag]
+    }
+    
+    asnGetLength data length
+    # get the number of padding bits used at the end
+    asnGetByte data padding
+    incr length -1
+    asnGetBytes data $length bytes
+    binary scan $bytes B* bits
+    
+    # cut off the padding bits
+    set bits [string range $bits 0 end-$padding]
+    set bitstring $bits
+}
+
+#-----------------------------------------------------------------------------
+# asnGetObjectIdentifier: Decode an ASN.1 Object Identifier (OID) into
+#                         a Tcl list of integers.
+#-----------------------------------------------------------------------------
+
+proc asn::asnGetObjectIdentifier {data_var oid_var} {
+      upvar 1 $data_var data $oid_var oid
+
+      asnGetByte data tag
+      if {$tag != 0x06} {
+        return -code error \
+            [format "Expected Object Identifier (0x06), but got %02x" $tag]  
+      }
+      asnGetLength data length
+      
+      # the first byte encodes the OID parts in position 0 and 1
+      asnGetByte data val
+      set oid [expr {$val / 40}]
+      lappend oid [expr {$val % 40}]
+      incr length -1
+      
+      # the next bytes encode the remaining parts of the OID
+      set bytes [list]
+      set incomplete 0
+      while {$length} {
+        asnGetByte data octet
+        incr length -1
+        if {$octet < 128} {
+            set oidval $octet
+            set mult 128
+            foreach byte $bytes {
+                if {$byte != {}} {
+                incr oidval [expr {$mult*$byte}]    
+                set mult [expr {$mult*128}]
+                }
+            }
+            lappend oid $oidval
+            set bytes [list]
+            set incomplete 0
+        } else {
+            set byte [expr {$octet-128}]
+            set bytes [concat [list $byte] $bytes]
+            set incomplete 1
+        }                      
+      }
+      if {$incomplete} {
+        return -code error "OID Data is incomplete, not enough octets."
+      }
+      return
+}
+
+#-----------------------------------------------------------------------------
+# asnGetContext: Decode an explicit context tag 
+#
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetContext {data_var contextNumber_var {content_var {}} {encodingType_var {}}} {
+    upvar 1 $data_var data $contextNumber_var contextNumber 
+    
+    asnGetByte   data tag
+    asnGetLength data length
+
+    if {($tag & 0xC0) != 0x80} {
+        return -code error \
+            [format "Expected Context, but got %02x" $tag]
+    }    
+    if {$encodingType_var != {}} { 
+	upvar 1 $encodingType_var encodingType 
+	set encodingType [expr {($tag & 0x20) > 0}]
+    }
+    set contextNumber [expr {$tag & 0x1F}]
+	if {[string length $content_var]} {
+		upvar 1 $content_var content
+		asnGetBytes data $length content
+	}	
+    return
+}
+
+
+#-----------------------------------------------------------------------------
+# asnGetNumericString: Decode a Numeric String from the data
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetNumericString {data_var print_var} {
+    upvar 1 $data_var data $print_var print
+
+    asnGetByte data tag
+    if {$tag != 0x12} {
+        return -code error \
+            [format "Expected Numeric String (0x12), but got %02x" $tag]  
+    }
+    asnGetLength data length 
+    asnGetBytes data $length string
+    set print [encoding convertfrom ascii $string]
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnGetPrintableString: Decode a Printable String from the data
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetPrintableString {data_var print_var} {
+    upvar 1 $data_var data $print_var print
+
+    asnGetByte data tag
+    if {$tag != 0x13} {
+        return -code error \
+            [format "Expected Printable String (0x13), but got %02x" $tag]  
+    }
+    asnGetLength data length 
+    asnGetBytes data $length string
+    set print [encoding convertfrom ascii $string]
+    return
+}
+
+#-----------------------------------------------------------------------------
+# asnGetIA5String: Decode a IA5(ASCII) String from the data
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetIA5String {data_var print_var} {
+    upvar 1 $data_var data $print_var print
+
+    asnGetByte data tag
+    if {$tag != 0x16} {
+        return -code error \
+            [format "Expected IA5 String (0x16), but got %02x" $tag]  
+    }
+    asnGetLength data length 
+    asnGetBytes data $length string
+    set print [encoding convertfrom ascii $string]
+    return
+}
+#------------------------------------------------------------------------
+# asnGetBMPString: Decode Basic Multiningval (UCS2 string) from data
+#------------------------------------------------------------------------
+proc asn::asnGetBMPString {data_var print_var} {
+    upvar 1 $data_var data $print_var print
+    asnGetByte data tag
+    if {$tag != 0x1e} {
+        return -code error \
+            [format "Expected BMP String (0x1e), but got %02x" $tag]  
+    }
+    asnGetLength data length 
+	asnGetBytes data $length string
+	if {$::tcl_platform(byteOrder) eq "littleEndian"} {
+		set str2 ""
+		foreach {hi lo} [split $string ""] {
+			append str2 $lo $hi
+		}
+	} else {
+		set str2 $string
+	}
+	set print [encoding convertfrom unicode $str2]
+	return
+}	
+#------------------------------------------------------------------------
+# asnGetUTF8String: Decode UTF8 string from data
+#------------------------------------------------------------------------
+proc asn::asnGetUTF8String {data_var print_var} {
+    upvar 1 $data_var data $print_var print
+    asnGetByte data tag
+    if {$tag != 0x0c} {
+        return -code error \
+            [format "Expected UTF8 String (0x0c), but got %02x" $tag]  
+    }
+    asnGetLength data length 
+	asnGetBytes data $length string
+	#there should be some error checking to see if input is
+	#properly-formatted utf8
+	set print [encoding convertfrom utf-8 $string]
+	
+	return
+}	
+#-----------------------------------------------------------------------------
+# asnGetNull: decode a NULL value
+#-----------------------------------------------------------------------------
+
+proc ::asn::asnGetNull {data_var} {
+    upvar 1 $data_var data 
+
+    asnGetByte data tag
+    if {$tag != 0x05} {
+        return -code error \
+            [format "Expected NULL (0x05), but got %02x" $tag]
+    }
+
+    asnGetLength data length
+    asnGetBytes data $length bytes
+    
+    # we do not check the null data, all bytes must be 0x00
+    
+    return
+}
+
+#----------------------------------------------------------------------------
+# MultiType string routines
+#----------------------------------------------------------------------------
+
+namespace eval asn {
+	variable stringTypes
+	array set stringTypes {
+		12 NumericString 
+		13 PrintableString 
+		16 IA5String 
+		1e BMPString 
+		0c UTF8String 
+		14 T61String
+		15 VideotexString
+		1a VisibleString
+		1b GeneralString
+		1c UniversalString
+	}	
+	variable defaultStringType UTF8
+}	
+#---------------------------------------------------------------------------
+# asnGetString - get readable string automatically detecting its type
+#---------------------------------------------------------------------------
+proc ::asn::asnGetString {data_var print_var {type_var {}}} {
+	variable stringTypes
+	upvar 1 $data_var data $print_var print
+	asnPeekByte data tag
+	set tag [format %02x $tag]
+	if {![info exists stringTypes($tag)]} {
+		return -code error "Expected one of string types, but got $tag"
+	}
+	asnGet$stringTypes($tag) data print
+	if {[string length $type_var]} {
+		upvar $type_var type
+		set type $stringTypes($tag)
+	}	
+}
+#---------------------------------------------------------------------
+# defaultStringType - set or query default type for unrestricted strings
+#---------------------------------------------------------------------
+proc ::asn::defaultStringType {{type {}}} {
+	variable defaultStringType
+	if {![string length $type]} {
+		return $defaultStringType
+	}
+	if {$type ne "BMP" && $type ne "UTF8"} {
+		return -code error "Invalid default string type. Should be one of BMP, UTF8"
+	}
+	set defaultStringType $type
+	return
+}	
+
+#---------------------------------------------------------------------------
+# asnString - encode readable string into most restricted type possible
+#---------------------------------------------------------------------------
+
+proc ::asn::asnString {string} {
+	variable nonPrintableChars
+	variable nonNumericChars
+	if {[string length $string]!=[string bytelength $string]} {
+	# There are non-ascii character
+		variable defaultStringType
+		return [asn${defaultStringType}String $string]
+	} elseif {![regexp $nonNumericChars $string]} {
+		return [asnNumericString $string]
+	} elseif {![regexp $nonPrintableChars $string]} {
+		return [asnPrintableString $string]
+	} else {
+		return [asnIA5String $string]
+	}	
+}
+
+#-----------------------------------------------------------------------------
+package provide asn 0.8.4
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/asn/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/asn/pkgIndex.tcl
new file mode 100644
index 00000000..3cbafd63
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/asn/pkgIndex.tcl
@@ -0,0 +1,4 @@
+# Tcl package index file, version 1.1
+
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded asn 0.8.4 [list source [file join $dir asn.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32.tcl
new file mode 100644
index 00000000..dd731149
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32.tcl
@@ -0,0 +1,182 @@
+# -*- tcl -*-
+# This code is hereby put into the public domain.
+# ### ### ### ######### ######### #########
+## Overview
+# Base32 encoding and decoding of small strings.
+#
+# Management code for switching between Tcl and C accelerated
+# implementations.
+#
+# RCS: @(#) $Id: base32.tcl,v 1.2 2006/10/13 05:39:49 andreas_kupries Exp $
+
+# @mdgen EXCLUDE: base32_c.tcl
+
+package require Tcl 8.4
+
+namespace eval ::base32 {}
+
+# ### ### ### ######### ######### #########
+## Management of base32 std implementations.
+
+# ::base32::LoadAccelerator --
+#
+#	Loads a named implementation, if possible.
+#
+# Arguments:
+#	key	Name of the implementation to load.
+#
+# Results:
+#	A boolean flag. True if the implementation
+#	was successfully loaded; and False otherwise.
+
+proc ::base32::LoadAccelerator {key} {
+    variable accel
+    set isok 0
+    switch -exact -- $key {
+	critcl {
+	    # Critcl implementation of base32 requires Tcl 8.4.
+	    if {![package vsatisfies [package provide Tcl] 8.4]} {return 0}
+	    if {[catch {package require tcllibc}]} {return 0}
+	    set isok [llength [info commands ::base32::critcl_encode]]
+	}
+	tcl {
+	    variable selfdir
+	    if {[catch {source [file join $selfdir base32_tcl.tcl]}]} {return 0}
+	    set isok [llength [info commands ::base32::tcl_encode]]
+	}
+        default {
+            return -code error "invalid accelerator $key:\
+                must be one of [join [KnownImplementations] {, }]"
+        }
+    }
+    set accel($key) $isok
+    return $isok
+}
+
+# ::base32::SwitchTo --
+#
+#	Activates a loaded named implementation.
+#
+# Arguments:
+#	key	Name of the implementation to activate.
+#
+# Results:
+#	None.
+
+proc ::base32::SwitchTo {key} {
+    variable accel
+    variable loaded
+
+    if {[string equal $key $loaded]} {
+	# No change, nothing to do.
+	return
+    } elseif {![string equal $key ""]} {
+	# Validate the target implementation of the switch.
+
+	if {![info exists accel($key)]} {
+	    return -code error "Unable to activate unknown implementation \"$key\""
+	} elseif {![info exists accel($key)] || !$accel($key)} {
+	    return -code error "Unable to activate missing implementation \"$key\""
+	}
+    }
+
+    # Deactivate the previous implementation, if there was any.
+
+    if {![string equal $loaded ""]} {
+	foreach c {encode decode} {
+	    rename ::base32::$c ::base32::${loaded}_$c
+	}
+    }
+
+    # Activate the new implementation, if there is any.
+
+    if {![string equal $key ""]} {
+	foreach c {encode decode} {
+	    rename ::base32::${key}_$c ::base32::$c
+	}
+    }
+
+    # Remember the active implementation, for deactivation by future
+    # switches.
+
+    set loaded $key
+    return
+}
+
+# ::base32::Implementations --
+#
+#	Determines which implementations are
+#	present, i.e. loaded.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys.
+
+proc ::base32::Implementations {} {
+    variable accel
+    set res {}
+    foreach n [array names accel] {
+	if {!$accel($n)} continue
+	lappend res $n
+    }
+    return $res
+}
+
+# ::base32::KnownImplementations --
+#
+#	Determines which implementations are known
+#	as possible implementations.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys. In the order
+#	of preference, most prefered first.
+
+proc ::base32::KnownImplementations {} {
+    return {critcl tcl}
+}
+
+proc ::base32::Names {} {
+    return {
+	critcl {tcllibc based}
+	tcl    {pure Tcl}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Data structures.
+
+namespace eval ::base32 {
+    variable  selfdir [file dirname [info script]]
+    variable  loaded  {}
+
+    variable  accel
+    array set accel   {tcl 0 critcl 0}
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Choose an implementation,
+## most prefered first. Loads only one of the
+## possible implementations. And activates it.
+
+namespace eval ::base32 {
+    variable e
+    foreach e [KnownImplementations] {
+	if {[LoadAccelerator $e]} {
+	    SwitchTo $e
+	    break
+	}
+    }
+    unset e
+
+    namespace export encode decode
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide base32 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32_c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32_c.tcl
new file mode 100644
index 00000000..333d73b4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32_c.tcl
@@ -0,0 +1,253 @@
+# base32c.tcl --
+#
+#       Implementation of a base32 (std) de/encoder for Tcl.
+#
+# Public domain
+#
+# RCS: @(#) $Id: base32_c.tcl,v 1.3 2008/01/28 22:58:18 andreas_kupries Exp $
+
+package require critcl
+package require Tcl 8.4
+
+namespace eval ::base32 {
+    # Supporting code for the main command.
+    catch {
+	#critcl::cheaders -g
+	#critcl::debug memory symbols
+    }
+
+    # Main commands, encoder & decoder
+
+    critcl::ccommand critcl_encode {dummy interp objc objv} {
+      /* Syntax -*- c -*-
+       * critcl_encode string
+       */
+
+      unsigned char* buf;
+      int           nbuf;
+
+      unsigned char* out;
+      unsigned char* at;
+      int           nout;
+
+      /*
+       * The array used for encoding
+       */                     /* 123456789 123456789 123456789 12 */
+      static const char map[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+
+#define USAGEE "bitstring"
+
+      if (objc != 2) {
+        Tcl_WrongNumArgs (interp, 1, objv, USAGEE);
+        return TCL_ERROR;
+      }
+
+      buf  = Tcl_GetByteArrayFromObj (objv[1], &nbuf);
+      nout = ((nbuf+4)/5)*8;
+      out  = (unsigned char*) Tcl_Alloc (nout*sizeof(char));
+
+      for (at = out; nbuf >= 5; nbuf -= 5, buf += 5) {
+	*(at++) = map [         (buf[0]>>3)                ];
+	*(at++) = map [ 0x1f & ((buf[0]<<2) | (buf[1]>>6)) ];
+	*(at++) = map [ 0x1f &  (buf[1]>>1)                ];
+	*(at++) = map [ 0x1f & ((buf[1]<<4) | (buf[2]>>4)) ];
+	*(at++) = map [ 0x1f & ((buf[2]<<1) | (buf[3]>>7)) ];
+	*(at++) = map [ 0x1f &  (buf[3]>>2)                ];
+	*(at++) = map [ 0x1f & ((buf[3]<<3) | (buf[4]>>5)) ];
+	*(at++) = map [ 0x1f &  (buf[4])                   ];
+      }
+      if (nbuf > 0) {
+	/* Process partials at end. */
+	switch (nbuf) {
+	case 1:
+	  /* |01234567|		 2, padding 6
+	   *  xxxxx
+	   *       xxx 00
+	   */
+
+	  *(at++) = map [        (buf[0]>>3) ];
+	  *(at++) = map [ 0x1f & (buf[0]<<2) ];
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  break;
+	case 2: /* x3/=4 */
+	  /* |01234567|01234567|	 4, padding 4
+	   *  xxxxx
+	   *       xxx xx
+	   *             xxxxx
+	   *                  x 0000
+	   */
+
+	  *(at++) = map [         (buf[0]>>3)                ];
+	  *(at++) = map [ 0x1f & ((buf[0]<<2) | (buf[1]>>6)) ];
+	  *(at++) = map [ 0x1f &  (buf[1]>>1)                ];
+	  *(at++) = map [ 0x1f &  (buf[1]<<4)                ];
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  break;
+	case 3:
+	  /* |01234567|01234567|01234567|	 5, padding 3
+	   *  xxxxx
+	   *       xxx xx
+	   *             xxxxx
+	   *                  x xxxx
+	   *                        xxxx 0
+	   */
+
+	  *(at++) = map [         (buf[0]>>3)                ];
+	  *(at++) = map [ 0x1f & ((buf[0]<<2) | (buf[1]>>6)) ];
+	  *(at++) = map [ 0x1f &  (buf[1]>>1)                ];
+	  *(at++) = map [ 0x1f & ((buf[1]<<4) | (buf[2]>>4)) ];
+	  *(at++) = map [ 0x1f &  (buf[2]<<1)                ];
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  break;
+	case 4:
+	  /* |01234567|01234567|01234567|012334567|	 7, padding 1
+	   *  xxxxx
+	   *       xxx xx
+	   *             xxxxx
+	   *                  x xxxx
+	   *                        xxxx
+	   *                             xxxxx
+	   *                                  xxxx 0
+	   */
+
+	  *(at++) = map [         (buf[0]>>3)                ];
+	  *(at++) = map [ 0x1f & ((buf[0]<<2) | (buf[1]>>6)) ];
+	  *(at++) = map [ 0x1f &  (buf[1]>>1)                ];
+	  *(at++) = map [ 0x1f & ((buf[1]<<4) | (buf[2]>>4)) ];
+	  *(at++) = map [ 0x1f & ((buf[2]<<1) | (buf[3]>>7)) ];
+	  *(at++) = map [ 0x1f &  (buf[3]>>2)                ];
+	  *(at++) = map [ 0x1f &  (buf[3]<<3)                ];
+	  *(at++) = '=';
+	  break;
+	}
+      }
+
+      Tcl_SetObjResult (interp, Tcl_NewStringObj ((char*)out, nout));
+      Tcl_Free ((char*) out);
+      return TCL_OK;
+    }
+
+
+    critcl::ccommand critcl_decode {dummy interp objc objv} {
+      /* Syntax -*- c -*-
+       * critcl_decode estring
+       */
+
+      unsigned char* buf;
+      int           nbuf;
+
+      unsigned char* out;
+      unsigned char* at;
+      unsigned char  x [8];
+      int           nout;
+
+      int i, j, a, pad, nx;
+
+      /*
+       * An array for translating single base-32 characters into a value.
+       * Disallowed input characters have a value of 64.  Upper and lower
+       * case is the same. Only 128 chars, as everything above char(127)
+       * is 64.
+       */
+      static const char map [] = {
+	/* \00 */ 64, 64, 64, 64, 64, 64, 64, 64,  64, 64, 64, 64, 64, 64, 64, 64, 
+	/* DLE */ 64, 64, 64, 64, 64, 64, 64, 64,  64, 64, 64, 64, 64, 64, 64, 64, 
+	/* SPC */ 64, 64, 64, 64, 64, 64, 64, 64,  64, 64, 64, 64, 64, 64, 64, 64, 
+	/* '0' */ 64, 64, 26, 27, 28, 29, 30, 31,  64, 64, 64, 64, 64, 64, 64, 64, 
+	/* '@' */ 64,  0,  1,  2,  3,  4,  5,  6,   7,  8,  9, 10, 11, 12, 13, 14,
+	/* 'P' */ 15, 16, 17, 18, 19, 20, 21, 22,  23, 24, 25, 64, 64, 64, 64, 64,
+	/* '`' */ 64,  0,  1,  2,  3,  4,  5,  6,   7,  8,  9, 10, 11, 12, 13, 14,
+	/* 'p' */ 15, 16, 17, 18, 19, 20, 21, 22,  23, 24, 25, 64, 64, 64, 64, 64
+      };
+
+#define USAGED "estring"
+
+      if (objc != 2) {
+        Tcl_WrongNumArgs (interp, 1, objv, USAGED);
+        return TCL_ERROR;
+      }
+
+      buf = (unsigned char*) Tcl_GetStringFromObj (objv[1], &nbuf);
+
+      if (nbuf % 8) {
+	Tcl_SetObjResult (interp, Tcl_NewStringObj ("Length is not a multiple of 8", -1));
+        return TCL_ERROR;
+      }
+
+      nout = (nbuf/8)*5 *TCL_UTF_MAX;
+      out  = (unsigned char*) Tcl_Alloc (nout*sizeof(char));
+
+#define HIGH(x) (((x) & 0x80) != 0)
+#define BADC(x) ((x) == 64)
+#define BADCHAR(a,j) (HIGH ((a)) || BADC (x [(j)] = map [(a)]))
+
+      for (pad = 0, i=0, at = out; i < nbuf; i += 8, buf += 8){
+	for (j=0; j < 8; j++){
+	  a = buf [j];
+
+	  if (a == '=') {
+	    x[j] = 0;
+	    pad++;
+	    continue;
+	  } else if (pad) {
+	    char     msg [120];
+	    sprintf (msg,
+		     "Invalid character at index %d: \"=\" (padding found in the middle of the input)",
+		     j-1);
+	    Tcl_Free ((char*) out);
+	    Tcl_SetObjResult (interp, Tcl_NewStringObj (msg, -1));
+	    return TCL_ERROR;
+	  }
+
+	  if (BADCHAR (a,j)) {
+	    char     msg [100];
+	    sprintf (msg,"Invalid character at index %d: \"%c\"",j,a);
+	    Tcl_Free ((char*) out);
+	    Tcl_SetObjResult (interp, Tcl_NewStringObj (msg, -1));
+	    return TCL_ERROR;
+	  }
+	}
+
+	*(at++) = (x[0]<<3) | (x[1]>>2)            ;
+	*(at++) = (x[1]<<6) | (x[2]<<1) | (x[3]>>4);
+	*(at++) = (x[3]<<4) | (x[4]>>1)            ;
+	*(at++) = (x[4]<<7) | (x[5]<<2) | (x[6]>>3);
+	*(at++) = (x[6]<<5) | x[7]                 ;
+      }
+
+      if (pad) {
+	if (pad == 1) {
+	  at -= 1;
+	} else if (pad == 3) {
+	  at -= 2;
+	} else if (pad == 4) {
+	  at -= 3;
+	} else if (pad == 6) {
+	  at -= 4;
+	} else {
+	  char     msg [100];
+	  sprintf (msg,"Invalid padding of length %d",pad);
+	  Tcl_Free ((char*) out);
+	  Tcl_SetObjResult (interp, Tcl_NewStringObj (msg, -1));
+	  return TCL_ERROR;
+	}
+      }
+
+      Tcl_SetObjResult (interp, Tcl_NewByteArrayObj (out, at-out));
+      Tcl_Free ((char*) out);
+      return TCL_OK;
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32_tcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32_tcl.tcl
new file mode 100644
index 00000000..a8d50335
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32_tcl.tcl
@@ -0,0 +1,73 @@
+# -*- tcl -*-
+# This code is hereby put into the public domain.
+# ### ### ### ######### ######### #########
+## Overview
+# Base32 encoding and decoding of small strings.
+
+# ### ### ### ######### ######### #########
+## Notes
+
+# A binary string is split into groups of 5 bits (2^5 == 32), and each
+# group is converted into a printable character as is specified in RFC
+# 3548.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require  base32::core
+namespace eval ::base32 {}
+
+# ### ### ### ######### ######### #########
+## API & Implementation
+
+proc ::base32::tcl_encode {bitstring} {
+    variable forward
+
+    binary scan $bitstring B* bits
+    set len [string length $bits]
+    set rem [expr {$len % 5}]
+    if {$rem} {append bits =/$rem}
+    #puts "($bitstring) => <$bits>"
+
+    return [string map $forward $bits]
+}
+
+proc ::base32::tcl_decode {estring} {
+    variable backward
+    variable invalid
+
+    if {![core::valid $estring $invalid msg]} {
+	return -code error $msg
+    }
+    #puts "I<$estring>"
+    #puts "M<[string map $backward $estring]>"
+
+    return [binary format B* [string map $backward [string toupper $estring]]]
+}
+
+# ### ### ### ######### ######### #########
+## Data structures
+
+namespace eval ::base32 {
+    # Initialize the maps
+    variable forward
+    variable backward
+    variable invalid
+
+    core::define {
+	0 A    9 J   18 S   27 3
+	1 B   10 K   19 T   28 4
+	2 C   11 L   20 U   29 5
+	3 D   12 M   21 V   30 6
+	4 E   13 N   22 W   31 7
+	5 F   14 O   23 X
+	6 G   15 P   24 Y
+	7 H   16 Q   25 Z
+	8 I   17 R   26 2
+    } forward backward invalid ; # {}
+    # puts ///$forward///
+    # puts ///$backward///
+}
+
+# ### ### ### ######### ######### #########
+## Ok
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32core.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32core.tcl
new file mode 100644
index 00000000..aaf7fc87
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32core.tcl
@@ -0,0 +1,134 @@
+# -*- tcl -*-
+# This code is hereby put into the public domain.
+# ### ### ### ######### ######### #########
+#= Overview
+
+# Fundamental handling of base32 conversion tables. Expansion of a
+# basic mapping into a full mapping and its inverse mapping.
+
+# ### ### ### ######### ######### #########
+#= Requisites
+
+namespace eval ::base32::core {}
+
+# ### ### ### ######### ######### #########
+#= API & Implementation
+
+proc ::base32::core::define {map fv bv iv} {
+    variable bits
+    upvar 1 $fv forward $bv backward $iv invalid
+
+    # bytes - bits - padding  - tail       | bits - padding  - tail
+    # 0     -  0   - ""       - "xxxxxxxx" | 0    - ""       - ""
+    # 1     -  8   - "======" - "xx======" | 3    - "======" - "x======"
+    # 2     - 16   - "===="   - "xxxx====" | 1    - "===="   - "x===="
+    # 3     - 24   - "==="    - "xxxxx===" | 4    - "==="    - "x==="
+    # 4     - 32   - "="      - "xxxxxxx=" | 2    - "="      - "x="
+
+    array set _ $bits
+
+    set invalid  "\[^="
+    set forward  {}
+    set btmp     {}
+
+    foreach {code char} $map {
+	set b $_($code)
+
+	append invalid [string tolower $char][string toupper $char]
+
+	# 5 bit remainder
+	lappend forward    $b $char
+	lappend btmp [list $char $b]
+
+	# 4 bit remainder
+	if {$code%2} continue
+	set b [string range $b 0 end-1]
+	lappend forward    ${b}=/4    ${char}===
+	lappend btmp [list ${char}=== $b]
+
+	# 3 bit remainder
+	if {$code%4} continue
+	set b [string range $b 0 end-1]
+	lappend forward    ${b}=/3       ${char}======
+	lappend btmp [list ${char}====== $b]
+
+	# 2 bit remainder
+	if {$code%8} continue
+	set b [string range $b 0 end-1]
+	lappend forward    ${b}=/2  ${char}=
+	lappend btmp [list ${char}= $b]
+
+	# 1 bit remainder
+	if {$code%16} continue
+	set b [string range $b 0 end-1]
+	lappend forward    ${b}=/1     ${char}====
+	lappend btmp [list ${char}==== $b]
+    }
+
+    set backward {}
+    foreach item [lsort -index 0 -decreasing $btmp] {
+	foreach {c b} $item break
+	lappend backward $c $b
+    }
+
+    append invalid "\]"
+    return
+}
+
+proc ::base32::core::valid {estring pattern mv} {
+    upvar 1 $mv message
+
+    if {[string length $estring] % 8} {
+	set message "Length is not a multiple of 8"
+	return 0
+    } elseif {[regexp -indices $pattern $estring where]} {
+	foreach {s e} $where break
+	set message "Invalid character at index $s: \"[string index $estring $s]\""
+	return 0
+    } elseif {[regexp {(=+)$} $estring -> pad]} {
+	set padlen [string length $pad]
+	if {
+	    ($padlen != 6) &&
+	    ($padlen != 4) &&
+	    ($padlen != 3) &&
+	    ($padlen != 1)
+	} {
+	    set message "Invalid padding of length $padlen"
+	    return 0
+	}
+    }
+
+    # Remove the brackets and ^= from the pattern, to construct the
+    # class of valid characters which must not follow the padding.
+
+    set badp "=\[[string range $pattern 3 end-1]\]"
+    if {[regexp -indices $badp $estring where]} {
+	foreach {s e} $where break
+	set message "Invalid character at index $s: \"[string index $estring $s]\" (padding found in the middle of the input)"
+	return 0
+    }
+    return 1
+}
+
+# ### ### ### ######### ######### #########
+## Data structures
+
+namespace eval ::base32::core {
+    namespace export define valid
+
+    variable bits {
+	 0 00000	 1 00001	 2 00010	 3 00011
+	 4 00100	 5 00101	 6 00110	 7 00111
+	 8 01000	 9 01001	10 01010	11 01011
+	12 01100	13 01101	14 01110	15 01111
+	16 10000	17 10001	18 10010	19 10011
+	20 10100	21 10101	22 10110	23 10111
+	24 11000	25 11001	26 11010	27 11011
+	28 11100	29 11101	30 11110	31 11111
+    }
+}
+
+# ### ### ### ######### ######### #########
+#= Registration
+
+package provide base32::core 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32hex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32hex.tcl
new file mode 100644
index 00000000..6611c4c9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32hex.tcl
@@ -0,0 +1,182 @@
+# -*- tcl -*-
+# This code is hereby put into the public domain.
+# ### ### ### ######### ######### #########
+## Overview
+# Base32 encoding and decoding of small strings.
+#
+# Management code for switching between Tcl and C accelerated
+# implementations.
+#
+# RCS: @(#) $Id: base32hex.tcl,v 1.3 2008/03/22 23:46:42 andreas_kupries Exp $
+
+# @mdgen EXCLUDE: base32hex_c.tcl
+
+package require Tcl 8.4
+
+namespace eval ::base32::hex {}
+
+# ### ### ### ######### ######### #########
+## Management of base32 std implementations.
+
+# ::base32::hex::LoadAccelerator --
+#
+#	Loads a named implementation, if possible.
+#
+# Arguments:
+#	key	Name of the implementation to load.
+#
+# Results:
+#	A boolean flag. True if the implementation
+#	was successfully loaded; and False otherwise.
+
+proc ::base32::hex::LoadAccelerator {key} {
+    variable accel
+    set isok 0
+    switch -exact -- $key {
+	critcl {
+	    # Critcl implementation of base32 requires Tcl 8.4.
+	    if {![package vsatisfies [package provide Tcl] 8.4]} {return 0}
+	    if {[catch {package require tcllibc}]} {return 0}
+	    set isok [llength [info commands ::base32::hex::critcl_encode]]
+	}
+	tcl {
+	    variable selfdir
+	    if {[catch {source [file join $selfdir base32hex_tcl.tcl]}]} {return 0}
+	    set isok [llength [info commands ::base32::hex::tcl_encode]]
+	}
+        default {
+            return -code error "invalid accelerator $key:\
+                must be one of [join [KnownImplementations] {, }]"
+        }
+    }
+    set accel($key) $isok
+    return $isok
+}
+
+# ::base32::hex::SwitchTo --
+#
+#	Activates a loaded named implementation.
+#
+# Arguments:
+#	key	Name of the implementation to activate.
+#
+# Results:
+#	None.
+
+proc ::base32::hex::SwitchTo {key} {
+    variable accel
+    variable loaded
+
+    if {[string equal $key $loaded]} {
+	# No change, nothing to do.
+	return
+    } elseif {![string equal $key ""]} {
+	# Validate the target implementation of the switch.
+
+	if {![info exists accel($key)]} {
+	    return -code error "Unable to activate unknown implementation \"$key\""
+	} elseif {![info exists accel($key)] || !$accel($key)} {
+	    return -code error "Unable to activate missing implementation \"$key\""
+	}
+    }
+
+    # Deactivate the previous implementation, if there was any.
+
+    if {![string equal $loaded ""]} {
+	foreach c {encode decode} {
+	    rename ::base32::hex::$c ::base32::hex::${loaded}_$c
+	}
+    }
+
+    # Activate the new implementation, if there is any.
+
+    if {![string equal $key ""]} {
+	foreach c {encode decode} {
+	    rename ::base32::hex::${key}_$c ::base32::hex::$c
+	}
+    }
+
+    # Remember the active implementation, for deactivation by future
+    # switches.
+
+    set loaded $key
+    return
+}
+
+# ::base32::hex::Implementations --
+#
+#	Determines which implementations are
+#	present, i.e. loaded.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys.
+
+proc ::base32::hex::Implementations {} {
+    variable accel
+    set res {}
+    foreach n [array names accel] {
+	if {!$accel($n)} continue
+	lappend res $n
+    }
+    return $res
+}
+
+# ::base32::hex::KnownImplementations --
+#
+#	Determines which implementations are known
+#	as possible implementations.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys. In the order
+#	of preference, most prefered first.
+
+proc ::base32::hex::KnownImplementations {} {
+    return {critcl tcl}
+}
+
+proc ::base32::hex::Names {} {
+    return {
+	critcl {tcllibc based}
+	tcl    {pure Tcl}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Data structures.
+
+namespace eval ::base32::hex {
+    variable  selfdir [file dirname [info script]]
+    variable  loaded  {}
+
+    variable  accel
+    array set accel   {tcl 0 critcl 0}
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Choose an implementation,
+## most prefered first. Loads only one of the
+## possible implementations. And activates it.
+
+namespace eval ::base32::hex {
+    variable e
+    foreach e [KnownImplementations] {
+	if {[LoadAccelerator $e]} {
+	    SwitchTo $e
+	    break
+	}
+    }
+    unset e
+
+    namespace export encode decode
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide base32::hex 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32hex_c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32hex_c.tcl
new file mode 100644
index 00000000..5466463c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32hex_c.tcl
@@ -0,0 +1,253 @@
+# base32hexc.tcl --
+#
+#       Implementation of a base32 (extended hex) de/encoder for Tcl.
+#
+# Public domain
+#
+# RCS: @(#) $Id: base32hex_c.tcl,v 1.3 2008/01/28 22:58:18 andreas_kupries Exp $
+
+package require critcl
+package require Tcl 8.4
+
+namespace eval ::base32::hex {
+    # Supporting code for the main command.
+    catch {
+	#critcl::cheaders -g
+	#critcl::debug memory symbols
+    }
+
+    # Main commands, encoder & decoder
+
+    critcl::ccommand critcl_encode {dummy interp objc objv} {
+      /* Syntax -*- c -*-
+       * critcl_encode string
+       */
+
+      unsigned char* buf;
+      int           nbuf;
+
+      unsigned char* out;
+      unsigned char* at;
+      int           nout;
+
+      /*
+       * The array used for encoding
+       */                     /* 123456789 123456789 123456789 12 */
+      static const char map[] = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
+
+#define USAGEE "bitstring"
+
+      if (objc != 2) {
+        Tcl_WrongNumArgs (interp, 1, objv, USAGEE);
+        return TCL_ERROR;
+      }
+
+      buf  = Tcl_GetByteArrayFromObj (objv[1], &nbuf);
+      nout = ((nbuf+4)/5)*8;
+      out  = (unsigned char*) Tcl_Alloc (nout*sizeof(char));
+
+      for (at = out; nbuf >= 5; nbuf -= 5, buf += 5) {
+	*(at++) = map [         (buf[0]>>3)                ];
+	*(at++) = map [ 0x1f & ((buf[0]<<2) | (buf[1]>>6)) ];
+	*(at++) = map [ 0x1f &  (buf[1]>>1)                ];
+	*(at++) = map [ 0x1f & ((buf[1]<<4) | (buf[2]>>4)) ];
+	*(at++) = map [ 0x1f & ((buf[2]<<1) | (buf[3]>>7)) ];
+	*(at++) = map [ 0x1f &  (buf[3]>>2)                ];
+	*(at++) = map [ 0x1f & ((buf[3]<<3) | (buf[4]>>5)) ];
+	*(at++) = map [ 0x1f &  (buf[4])                   ];
+      }
+      if (nbuf > 0) {
+	/* Process partials at end. */
+	switch (nbuf) {
+	case 1:
+	  /* |01234567|		 2, padding 6
+	   *  xxxxx
+	   *       xxx 00
+	   */
+
+	  *(at++) = map [        (buf[0]>>3) ];
+	  *(at++) = map [ 0x1f & (buf[0]<<2) ];
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  break;
+	case 2: /* x3/=4 */
+	  /* |01234567|01234567|	 4, padding 4
+	   *  xxxxx
+	   *       xxx xx
+	   *             xxxxx
+	   *                  x 0000
+	   */
+
+	  *(at++) = map [         (buf[0]>>3)                ];
+	  *(at++) = map [ 0x1f & ((buf[0]<<2) | (buf[1]>>6)) ];
+	  *(at++) = map [ 0x1f &  (buf[1]>>1)                ];
+	  *(at++) = map [ 0x1f &  (buf[1]<<4)                ];
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  break;
+	case 3:
+	  /* |01234567|01234567|01234567|	 5, padding 3
+	   *  xxxxx
+	   *       xxx xx
+	   *             xxxxx
+	   *                  x xxxx
+	   *                        xxxx 0
+	   */
+
+	  *(at++) = map [         (buf[0]>>3)                ];
+	  *(at++) = map [ 0x1f & ((buf[0]<<2) | (buf[1]>>6)) ];
+	  *(at++) = map [ 0x1f &  (buf[1]>>1)                ];
+	  *(at++) = map [ 0x1f & ((buf[1]<<4) | (buf[2]>>4)) ];
+	  *(at++) = map [ 0x1f &  (buf[2]<<1)                ];
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  *(at++) = '=';
+	  break;
+	case 4:
+	  /* |01234567|01234567|01234567|012334567|	 7, padding 1
+	   *  xxxxx
+	   *       xxx xx
+	   *             xxxxx
+	   *                  x xxxx
+	   *                        xxxx
+	   *                             xxxxx
+	   *                                  xxxx 0
+	   */
+
+	  *(at++) = map [         (buf[0]>>3)                ];
+	  *(at++) = map [ 0x1f & ((buf[0]<<2) | (buf[1]>>6)) ];
+	  *(at++) = map [ 0x1f &  (buf[1]>>1)                ];
+	  *(at++) = map [ 0x1f & ((buf[1]<<4) | (buf[2]>>4)) ];
+	  *(at++) = map [ 0x1f & ((buf[2]<<1) | (buf[3]>>7)) ];
+	  *(at++) = map [ 0x1f &  (buf[3]>>2)                ];
+	  *(at++) = map [ 0x1f &  (buf[3]<<3)                ];
+	  *(at++) = '=';
+	  break;
+	}
+      }
+
+      Tcl_SetObjResult (interp, Tcl_NewStringObj ((char*)out, nout));
+      Tcl_Free ((char*) out);
+      return TCL_OK;
+    }
+
+
+    critcl::ccommand critcl_decode {dummy interp objc objv} {
+      /* Syntax -*- c -*-
+       * critcl_decode estring
+       */
+
+      unsigned char* buf;
+      int           nbuf;
+
+      unsigned char* out;
+      unsigned char* at;
+      unsigned char  x [8];
+      int           nout;
+
+      int i, j, a, pad, nx;
+
+      /*
+       * An array for translating single base-32 characters into a value.
+       * Disallowed input characters have a value of 64.  Upper and lower
+       * case is the same. Only 128 chars, as everything above char(127)
+       * is 64.
+       */
+      static const char map [] = {
+	/* \00 */ 64, 64, 64, 64, 64, 64, 64, 64,  64, 64, 64, 64, 64, 64, 64, 64, 
+	/* DLE */ 64, 64, 64, 64, 64, 64, 64, 64,  64, 64, 64, 64, 64, 64, 64, 64, 
+	/* SPC */ 64, 64, 64, 64, 64, 64, 64, 64,  64, 64, 64, 64, 64, 64, 64, 64, 
+	/* '0' */  0,  1,  2,  3,  4,  5,  6,  7,   8,  9, 64, 64, 64, 64, 64, 64, 
+	/* '@' */ 64, 10, 11, 12, 13, 14, 15, 16,  17, 18, 19, 20, 21, 22, 23, 24,
+	/* 'P' */ 25, 26, 27, 28, 29, 30, 31, 64,  64, 64, 64, 64, 64, 64, 64, 64,
+	/* '`' */ 64, 10, 11, 12, 13, 14, 15, 16,  17, 18, 19, 20, 21, 22, 23, 24,
+	/* 'p' */ 25, 26, 27, 28, 29, 30, 31, 64,  64, 64, 64, 64, 64, 64, 64, 64
+      };
+
+#define USAGED "estring"
+
+      if (objc != 2) {
+        Tcl_WrongNumArgs (interp, 1, objv, USAGED);
+        return TCL_ERROR;
+      }
+
+      buf = (unsigned char*) Tcl_GetStringFromObj (objv[1], &nbuf);
+
+      if (nbuf % 8) {
+	Tcl_SetObjResult (interp, Tcl_NewStringObj ("Length is not a multiple of 8", -1));
+        return TCL_ERROR;
+      }
+
+      nout = (nbuf/8)*5 *TCL_UTF_MAX;
+      out  = (unsigned char*) Tcl_Alloc (nout*sizeof(char));
+
+#define HIGH(x) (((x) & 0x80) != 0)
+#define BADC(x) ((x) == 64)
+#define BADCHAR(a,j) (HIGH ((a)) || BADC (x [(j)] = map [(a)]))
+
+      for (pad = 0, i=0, at = out; i < nbuf; i += 8, buf += 8){
+	for (j=0; j < 8; j++){
+	  a = buf [j];
+
+	  if (a == '=') {
+	    x[j] = 0;
+	    pad++;
+	    continue;
+	  } else if (pad) {
+	    char     msg [120];
+	    sprintf (msg,
+		     "Invalid character at index %d: \"=\" (padding found in the middle of the input)",
+		     j-1);
+	    Tcl_Free ((char*) out);
+	    Tcl_SetObjResult (interp, Tcl_NewStringObj (msg, -1));
+	    return TCL_ERROR;
+	  }
+
+	  if (BADCHAR (a,j)) {
+	    char     msg [100];
+	    sprintf (msg,"Invalid character at index %d: \"%c\"",j,a);
+	    Tcl_Free ((char*) out);
+	    Tcl_SetObjResult (interp, Tcl_NewStringObj (msg, -1));
+	    return TCL_ERROR;
+	  }
+	}
+
+	*(at++) = (x[0]<<3) | (x[1]>>2)            ;
+	*(at++) = (x[1]<<6) | (x[2]<<1) | (x[3]>>4);
+	*(at++) = (x[3]<<4) | (x[4]>>1)            ;
+	*(at++) = (x[4]<<7) | (x[5]<<2) | (x[6]>>3);
+	*(at++) = (x[6]<<5) | x[7]                 ;
+      }
+
+      if (pad) {
+	if (pad == 1) {
+	  at -= 1;
+	} else if (pad == 3) {
+	  at -= 2;
+	} else if (pad == 4) {
+	  at -= 3;
+	} else if (pad == 6) {
+	  at -= 4;
+	} else {
+	  char     msg [100];
+	  sprintf (msg,"Invalid padding of length %d",pad);
+	  Tcl_Free ((char*) out);
+	  Tcl_SetObjResult (interp, Tcl_NewStringObj (msg, -1));
+	  return TCL_ERROR;
+	}
+      }
+
+      Tcl_SetObjResult (interp, Tcl_NewByteArrayObj (out, at-out));
+      Tcl_Free ((char*) out);
+      return TCL_OK;
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32hex_tcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32hex_tcl.tcl
new file mode 100644
index 00000000..f406bc6d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/base32hex_tcl.tcl
@@ -0,0 +1,79 @@
+# -*- tcl -*-
+# This code is hereby put into the public domain.
+# ### ### ### ######### ######### #########
+## Overview
+# Base32 encoding and decoding of small strings.
+
+# ### ### ### ######### ######### #########
+## Notes
+
+# A binary string is split into groups of 5 bits (2^5 == 32), and each
+# group is converted into a printable character as is specified in RFC
+# 3548 for the extended hex encoding.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require  base32::core
+namespace eval ::base32::hex {}
+
+# ### ### ### ######### ######### #########
+## API & Implementation
+
+proc ::base32::hex::tcl_encode {bitstring} {
+    variable forward
+
+    binary scan $bitstring B* bits
+    set len [string length $bits]
+    set rem [expr {$len % 5}]
+    if {$rem} {append bits =/$rem}
+    #puts "($bitstring) => <$bits>"
+
+    return [string map $forward $bits]
+}
+
+proc ::base32::hex::tcl_decode {estring} {
+    variable backward
+    variable invalid
+
+    if {![core::valid $estring $invalid msg]} {
+	return -code error $msg
+    }
+    #puts "I<$estring>"
+    #puts "M<[string map $backward $estring]>"
+
+    return [binary format B* [string map $backward [string toupper $estring]]]
+}
+
+# ### ### ### ######### ######### #########
+## Data structures
+
+namespace eval ::base32::hex {
+    namespace eval core {
+	namespace import ::base32::core::define
+	namespace import ::base32::core::valid
+    }
+
+    namespace export encode decode
+    # Initialize the maps
+    variable forward
+    variable backward
+    variable invalid
+
+    core::define {
+	0 0    9 9        18 I   27 R
+	1 1   10 A        19 J   28 S
+	2 2   11 B        20 K   29 T
+	3 3   12 C        21 L   30 U
+	4 4   13 D        22 M   31 V
+	5 5   14 E        23 N
+	6 6   15 F        24 O
+	7 7        16 G   25 P
+	8 8        17 H   26 Q
+    } forward backward invalid ; # {}
+    # puts ///$forward///
+    # puts ///$backward///
+}
+
+# ### ### ### ######### ######### #########
+## Ok
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/pkgIndex.tcl
new file mode 100644
index 00000000..3bccaa7e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base32/pkgIndex.tcl
@@ -0,0 +1,4 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} return
+package ifneeded base32       0.1 [list source [file join $dir base32.tcl]]
+package ifneeded base32::hex  0.1 [list source [file join $dir base32hex.tcl]]
+package ifneeded base32::core 0.1 [list source [file join $dir base32core.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/ascii85.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/ascii85.tcl
new file mode 100644
index 00000000..e05e3430
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/ascii85.tcl
@@ -0,0 +1,271 @@
+# ascii85.tcl --
+#
+# Encode/Decode ascii85 for a string
+#
+# Copyright (c) Emiliano Gavilan
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.4
+
+namespace eval ascii85 {
+    namespace export encode encodefile decode
+    # default values for encode options
+    variable options
+    array set options [list -wrapchar \n -maxlen 76]
+}
+
+# ::ascii85::encode --
+#
+#   Ascii85 encode a given string.
+#
+# Arguments:
+#   args    ?-maxlen maxlen? ?-wrapchar wrapchar? string
+#
+#   If maxlen is 0, the output is not wrapped.
+#
+# Results:
+#   A Ascii85 encoded version of $string, wrapped at $maxlen characters
+#   by $wrapchar.
+
+proc ascii85::encode {args} {
+    variable options
+
+    set alen [llength $args]
+    if {$alen != 1 && $alen != 3 && $alen != 5} {
+        return -code error "wrong # args:\
+            should be \"[lindex [info level 0] 0]\
+            ?-maxlen maxlen?\
+            ?-wrapchar wrapchar? string\""
+    }
+
+    set data [lindex $args end]
+    array set opts [array get options]
+    array set opts [lrange $args 0 end-1]
+    foreach key [array names opts] {
+        if {[lsearch -exact [array names options] $key] == -1} {
+            return -code error "unknown option \"$key\":\
+                must be -maxlen or -wrapchar"
+        }
+    }
+
+    if {![string is integer -strict $opts(-maxlen)]
+        || $opts(-maxlen) < 0} {
+        return -code error "expected positive integer but got\
+            \"$opts(-maxlen)\""
+    }
+
+    # perform this check early
+    if {[string length $data] == 0} {
+        return ""
+    }
+
+    # shorten the names
+    set ml $opts(-maxlen)
+    set wc $opts(-wrapchar)
+
+    # if maxlen is zero, don't wrap the output
+    if {$ml == 0} {
+        set wc ""
+    }
+
+    set encoded {}
+
+    binary scan $data c* X
+    set len      [llength $X]
+    set rest     [expr {$len % 4}]
+    set lastidx  [expr {$len - $rest - 1}]
+
+    foreach {b1 b2 b3 b4} [lrange $X 0 $lastidx] {
+        # calculate the 32 bit value
+        # this is an inlined version of the [encode4bytes] proc
+        # included here for performance reasons
+        set val [expr {
+            (  (($b1 & 0xff) << 24)
+              |(($b2 & 0xff) << 16)
+              |(($b3 & 0xff) << 8)
+              | ($b4 & 0xff)
+            ) & 0xffffffff }]
+
+        if {$val == 0} {
+            # four \0 bytes encodes as "z" instead of "!!!!!"
+            append current "z"
+        } else {
+            # no magic numbers here.
+            # 52200625 -> 85 ** 4
+            # 614125   -> 85 ** 3
+            # 7225     -> 85 ** 2
+            append current [binary format ccccc \
+                [expr { ( $val / 52200625) + 33 }] \
+                [expr { (($val % 52200625) / 614125) + 33 }] \
+                [expr { (($val % 614125) / 7225) + 33 }] \
+                [expr { (($val % 7225) / 85) + 33 }] \
+                [expr { ( $val % 85) + 33 }]]
+        }
+
+        if {[string length $current] >= $ml} {
+            append encoded [string range $current 0 [expr {$ml - 1}]] $wc
+            set current    [string range $current $ml end]
+        }
+    }
+
+    if { $rest } {
+        # there are remaining bytes.
+        # pad with \0 and encode not using the "z" convention.
+        # finally, add ($rest + 1) chars.
+        set val 0
+        foreach {b1 b2 b3 b4} [pad [lrange $X [incr lastidx] end] 4 0] break
+        append current [string range [encode4bytes $b1 $b2 $b3 $b4] 0 $rest]
+    }
+    append encoded [regsub -all -- ".{$ml}" $current "&$wc"]
+
+    return $encoded
+}
+
+proc ascii85::encode4bytes {b1 b2 b3 b4} {
+    set val [expr {
+        (  (($b1 & 0xff) << 24)
+          |(($b2 & 0xff) << 16)
+          |(($b3 & 0xff) << 8)
+          | ($b4 & 0xff)
+        ) & 0xffffffff }]
+    return [binary format ccccc \
+            [expr { ( $val / 52200625) + 33 }] \
+            [expr { (($val % 52200625) / 614125) + 33 }] \
+            [expr { (($val % 614125) / 7225) + 33 }] \
+            [expr { (($val % 7225) / 85) + 33 }] \
+            [expr { ( $val % 85) + 33 }]]
+}
+
+# ::ascii85::encodefile --
+#
+#   Ascii85 encode the contents of a file using default values
+#   for maxlen and wrapchar parameters.
+#
+# Arguments:
+#   fname    The name of the file to encode.
+#
+# Results:
+#   An Ascii85 encoded version of the contents of the file.
+#   This is a convenience command
+
+proc ascii85::encodefile {fname} {
+    set fd [open $fname]
+    fconfigure $fd -encoding binary -translation binary
+    return [encode [read $fd]][close $fd]
+}
+
+# ::ascii85::decode --
+#
+#   Ascii85 decode a given string.
+#
+# Arguments:
+#   string      The string to decode.
+# Leading spaces and tabs are removed, along with trailing newlines
+#
+# Results:
+#   The decoded value.
+
+proc ascii85::decode {data} {
+    # get rid of leading spaces/tabs and trailing newlines
+    set data [string map [list \n {} \t {} { } {}] $data]
+    set len [string length $data]
+
+    # perform this ckeck early
+    if {! $len} {
+        return ""
+    }
+
+    set decoded {}
+    set count 0
+    set group [list]
+    binary scan $data c* X
+
+    foreach char $X {
+        # we must check that every char is in the allowed range
+        if {$char < 33 || $char > 117 } {
+            # "z" is an exception
+            if {$char == 122} {
+                if {$count == 0} {
+                    # if a "z" char appears at the beggining of a group,
+                    # it decodes as four null bytes
+                    append decoded \x00\x00\x00\x00
+                    continue
+                } else {
+                    # if not, is an error
+                    return -code error \
+                        "error decoding data: \"z\" char misplaced"
+                }
+            }
+            # char is not in range and not a "z" at the beggining of a group
+            return -code error \
+                "error decoding data: chars outside the allowed range"
+        }
+
+        lappend group $char
+        incr count
+        if {$count == 5} {
+            # this is an inlined version of the [decode5chars] proc
+            # included here for performance reasons
+            set val [expr {
+                ([lindex $group 0] - 33) * wide(52200625) +
+                ([lindex $group 1] - 33) * 614125 +
+                ([lindex $group 2] - 33) * 7225 +
+                ([lindex $group 3] - 33) * 85 +
+                ([lindex $group 4] - 33) }]
+            if {$val > 0xffffffff} {
+                return -code error "error decoding data: decoded group overflow"
+            } else {
+                append decoded [binary format I $val]
+                incr count -5
+                set group [list]
+            }
+        }
+    }
+
+    set len [llength $group]
+    switch -- $len {
+        0 {
+            # all input has been consumed
+            # do nothing
+        }
+        1 {
+            # a single char is a condition error, there should be at least 2
+            return -code error \
+                "error decoding data: trailing char"
+        }
+        default {
+            # pad with "u"s, decode and add ($len - 1) bytes
+            append decoded [string range \
+                    [decode5chars [pad $group 5 122]] \
+                    0 \
+                    [expr {$len - 2}]]
+        }
+    }
+
+    return $decoded
+}
+
+proc ascii85::decode5chars {group} {
+    set val [expr {
+        ([lindex $group 0] - 33) * wide(52200625) +
+        ([lindex $group 1] - 33) * 614125 +
+        ([lindex $group 2] - 33) * 7225 +
+        ([lindex $group 3] - 33) * 85 +
+        ([lindex $group 4] - 33) }]
+    if {$val > 0xffffffff} {
+        return -code error "error decoding data: decoded group overflow"
+    }
+
+    return [binary format I $val]
+}
+
+proc ascii85::pad {chars len padchar} {
+    while {[llength $chars] < $len} {
+        lappend chars $padchar
+    }
+
+    return $chars
+}
+
+package provide ascii85 1.0
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/base64.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/base64.tcl
new file mode 100644
index 00000000..fa52c1c3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/base64.tcl
@@ -0,0 +1,410 @@
+# base64.tcl --
+#
+# Encode/Decode base64 for a string
+# Stephen Uhler / Brent Welch (c) 1997 Sun Microsystems
+# The decoder was done for exmh by Chris Garrigues
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# Version 1.0   implemented Base64_Encode, Base64_Decode
+# Version 2.0   uses the base64 namespace
+# Version 2.1   fixes various decode bugs and adds options to encode
+# Version 2.2   is much faster, Tcl8.0 compatible
+# Version 2.2.1 bugfixes
+# Version 2.2.2 bugfixes
+# Version 2.3   bugfixes and extended to support Trf
+# Version 2.4.x bugfixes
+
+# @mdgen EXCLUDE: base64c.tcl
+
+package require Tcl 8.2
+namespace eval ::base64 {
+    namespace export encode decode
+}
+
+package provide base64 2.5
+
+if {[package vsatisfies [package require Tcl] 8.6]} {
+    proc ::base64::encode {args} {
+	binary encode base64 -maxlen 76 {*}$args
+    }
+
+    proc ::base64::decode {string} {
+	# Tcllib is strict with respect to end of input, yet lax for
+	# invalid characters outside of that.
+	regsub -all -- {[^ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/]} $string {} string
+	binary decode base64 -strict $string
+    }
+
+    return
+}
+
+if {![catch {package require Trf 2.0}]} {
+    # Trf is available, so implement the functionality provided here
+    # in terms of calls to Trf for speed.
+
+    # ::base64::encode --
+    #
+    #	Base64 encode a given string.
+    #
+    # Arguments:
+    #	args	?-maxlen maxlen? ?-wrapchar wrapchar? string
+    #
+    #		If maxlen is 0, the output is not wrapped.
+    #
+    # Results:
+    #	A Base64 encoded version of $string, wrapped at $maxlen characters
+    #	by $wrapchar.
+
+    proc ::base64::encode {args} {
+	# Set the default wrapchar and maximum line length to match
+	# the settings for MIME encoding (RFC 3548, RFC 2045). These
+	# are the settings used by Trf as well. Various RFCs allow for
+	# different wrapping characters and wraplengths, so these may
+	# be overridden by command line options.
+	set wrapchar "\n"
+	set maxlen 76
+
+	if { [llength $args] == 0 } {
+	    error "wrong # args: should be \"[lindex [info level 0] 0]\
+		    ?-maxlen maxlen? ?-wrapchar wrapchar? string\""
+	}
+
+	set optionStrings [list "-maxlen" "-wrapchar"]
+	for {set i 0} {$i < [llength $args] - 1} {incr i} {
+	    set arg [lindex $args $i]
+	    set index [lsearch -glob $optionStrings "${arg}*"]
+	    if { $index == -1 } {
+		error "unknown option \"$arg\": must be -maxlen or -wrapchar"
+	    }
+	    incr i
+	    if { $i >= [llength $args] - 1 } {
+		error "value for \"$arg\" missing"
+	    }
+	    set val [lindex $args $i]
+
+	    # The name of the variable to assign the value to is extracted
+	    # from the list of known options, all of which have an
+	    # associated variable of the same name as the option without
+	    # a leading "-". The [string range] command is used to strip
+	    # of the leading "-" from the name of the option.
+	    #
+	    # FRINK: nocheck
+	    set [string range [lindex $optionStrings $index] 1 end] $val
+	}
+
+	# [string is] requires Tcl8.2; this works with 8.0 too
+	if {[catch {expr {$maxlen % 2}}]} {
+	    return -code error "expected integer but got \"$maxlen\""
+	} elseif {$maxlen < 0} {
+	    return -code error "expected positive integer but got \"$maxlen\""
+	}
+
+	set string [lindex $args end]
+	set result [::base64 -mode encode -- $string]
+
+	# Trf's encoder implicitly uses the settings -maxlen 76,
+	# -wrapchar \n for its output. We may have to reflow this for
+	# the settings chosen by the user. A second difference is that
+	# Trf closes the output with the wrap char sequence,
+	# always. The code here doesn't. Therefore 'trimright' is
+	# needed in the fast cases.
+
+	if {($maxlen == 76) && [string equal $wrapchar \n]} {
+	    # Both maxlen and wrapchar are identical to Trf's
+	    # settings. This is the super-fast case, because nearly
+	    # nothing has to be done. Only thing to do is strip a
+	    # terminating wrapchar.
+	    set result [string trimright $result]
+	} elseif {$maxlen == 76} {
+	    # wrapchar has to be different here, length is the
+	    # same. We can use 'string map' to transform the wrap
+	    # information.
+	    set result [string map [list \n $wrapchar] \
+			    [string trimright $result]]
+	} elseif {$maxlen == 0} {
+	    # Have to reflow the output to no wrapping. Another fast
+	    # case using only 'string map'. 'trimright' is not needed
+	    # here.
+
+	    set result [string map [list \n ""] $result]
+	} else {
+	    # Have to reflow the output from 76 to the chosen maxlen,
+	    # and possibly change the wrap sequence as well.
+
+	    # Note: After getting rid of the old wrap sequence we
+	    # extract the relevant segments from the string without
+	    # modifying the string. Modification, i.e. removal of the
+	    # processed part, means 'shifting down characters in
+	    # memory', making the algorithm O(n^2). By avoiding the
+	    # modification we stay in O(n).
+
+	    set result [string map [list \n ""] $result]
+	    set l [expr {[string length $result]-$maxlen}]
+	    for {set off 0} {$off < $l} {incr off $maxlen} {
+		append res [string range $result $off [expr {$off+$maxlen-1}]] $wrapchar
+	    }
+	    append res [string range $result $off end]
+	    set result $res
+	}
+
+	return $result
+    }
+
+    # ::base64::decode --
+    #
+    #	Base64 decode a given string.
+    #
+    # Arguments:
+    #	string	The string to decode.  Characters not in the base64
+    #		alphabet are ignored (e.g., newlines)
+    #
+    # Results:
+    #	The decoded value.
+
+    proc ::base64::decode {string} {
+	regsub -all {\s} $string {} string
+	::base64 -mode decode -- $string
+    }
+
+} else {
+    # Without Trf use a pure tcl implementation
+
+    namespace eval base64 {
+	variable base64 {}
+	variable base64_en {}
+
+	# We create the auxiliary array base64_tmp, it will be unset later.
+	variable base64_tmp
+	variable i
+
+	set i 0
+	foreach char {A B C D E F G H I J K L M N O P Q R S T U V W X Y Z \
+		a b c d e f g h i j k l m n o p q r s t u v w x y z \
+		0 1 2 3 4 5 6 7 8 9 + /} {
+	    set base64_tmp($char) $i
+	    lappend base64_en $char
+	    incr i
+	}
+
+	#
+	# Create base64 as list: to code for instance C<->3, specify
+	# that [lindex $base64 67] be 3 (C is 67 in ascii); non-coded
+	# ascii chars get a {}. we later use the fact that lindex on a
+	# non-existing index returns {}, and that [expr {} < 0] is true
+	#
+
+	# the last ascii char is 'z'
+	variable char
+	variable len
+	variable val
+
+	scan z %c len
+	for {set i 0} {$i <= $len} {incr i} {
+	    set char [format %c $i]
+	    set val {}
+	    if {[info exists base64_tmp($char)]} {
+		set val $base64_tmp($char)
+	    } else {
+		set val {}
+	    }
+	    lappend base64 $val
+	}
+
+	# code the character "=" as -1; used to signal end of message
+	scan = %c i
+	set base64 [lreplace $base64 $i $i -1]
+
+	# remove unneeded variables
+	unset base64_tmp i char len val
+
+	namespace export encode decode
+    }
+
+    # ::base64::encode --
+    #
+    #	Base64 encode a given string.
+    #
+    # Arguments:
+    #	args	?-maxlen maxlen? ?-wrapchar wrapchar? string
+    #
+    #		If maxlen is 0, the output is not wrapped.
+    #
+    # Results:
+    #	A Base64 encoded version of $string, wrapped at $maxlen characters
+    #	by $wrapchar.
+
+    proc ::base64::encode {args} {
+	set base64_en $::base64::base64_en
+
+	# Set the default wrapchar and maximum line length to match
+	# the settings for MIME encoding (RFC 3548, RFC 2045). These
+	# are the settings used by Trf as well. Various RFCs allow for
+	# different wrapping characters and wraplengths, so these may
+	# be overridden by command line options.
+	set wrapchar "\n"
+	set maxlen 76
+
+	if { [llength $args] == 0 } {
+	    error "wrong # args: should be \"[lindex [info level 0] 0]\
+		    ?-maxlen maxlen? ?-wrapchar wrapchar? string\""
+	}
+
+	set optionStrings [list "-maxlen" "-wrapchar"]
+	for {set i 0} {$i < [llength $args] - 1} {incr i} {
+	    set arg [lindex $args $i]
+	    set index [lsearch -glob $optionStrings "${arg}*"]
+	    if { $index == -1 } {
+		error "unknown option \"$arg\": must be -maxlen or -wrapchar"
+	    }
+	    incr i
+	    if { $i >= [llength $args] - 1 } {
+		error "value for \"$arg\" missing"
+	    }
+	    set val [lindex $args $i]
+
+	    # The name of the variable to assign the value to is extracted
+	    # from the list of known options, all of which have an
+	    # associated variable of the same name as the option without
+	    # a leading "-". The [string range] command is used to strip
+	    # of the leading "-" from the name of the option.
+	    #
+	    # FRINK: nocheck
+	    set [string range [lindex $optionStrings $index] 1 end] $val
+	}
+
+	# [string is] requires Tcl8.2; this works with 8.0 too
+	if {[catch {expr {$maxlen % 2}}]} {
+	    return -code error "expected integer but got \"$maxlen\""
+	} elseif {$maxlen < 0} {
+	    return -code error "expected positive integer but got \"$maxlen\""
+	}
+
+	set string [lindex $args end]
+
+	set result {}
+	set state 0
+	set length 0
+
+
+	# Process the input bytes 3-by-3
+
+	binary scan $string c* X
+
+	foreach {x y z} $X {
+	    ADD [lindex $base64_en [expr {($x >>2) & 0x3F}]]
+	    if {$y != {}} {
+		ADD [lindex $base64_en [expr {(($x << 4) & 0x30) | (($y >> 4) & 0xF)}]]
+		if {$z != {}} {
+		    ADD [lindex $base64_en [expr {(($y << 2) & 0x3C) | (($z >> 6) & 0x3)}]]
+		    ADD [lindex $base64_en [expr {($z & 0x3F)}]]
+		} else {
+		    set state 2
+		    break
+		}
+	    } else {
+		set state 1
+		break
+	    }
+	}
+	if {$state == 1} {
+	    ADD [lindex $base64_en [expr {(($x << 4) & 0x30)}]]
+	    ADD =
+	    ADD =
+	} elseif {$state == 2} {
+	    ADD [lindex $base64_en [expr {(($y << 2) & 0x3C)}]]
+	    ADD =
+	}
+	return $result
+    }
+
+    proc ::base64::ADD {x} {
+	# The line length check is always done before appending so
+	# that we don't get an extra newline if the output is a
+	# multiple of $maxlen chars long.
+
+	upvar 1 maxlen maxlen length length result result wrapchar wrapchar
+	if {$maxlen && $length >= $maxlen} {
+	    append result $wrapchar
+	    set length 0
+	}
+	append result $x
+	incr length
+	return
+    }
+
+    # ::base64::decode --
+    #
+    #	Base64 decode a given string.
+    #
+    # Arguments:
+    #	string	The string to decode.  Characters not in the base64
+    #		alphabet are ignored (e.g., newlines)
+    #
+    # Results:
+    #	The decoded value.
+
+    proc ::base64::decode {string} {
+	if {[string length $string] == 0} {return ""}
+
+	set base64 $::base64::base64
+	set output "" ; # Fix for [Bug 821126]
+	set nums {}
+
+	binary scan $string c* X
+	lappend X 61 ;# force a terminator
+	foreach x $X {
+	    set bits [lindex $base64 $x]
+	    if {$bits >= 0} {
+		if {[llength [lappend nums $bits]] == 4} {
+		    foreach {v w z y} $nums break
+		    set a [expr {($v << 2) | ($w >> 4)}]
+		    set b [expr {(($w & 0xF) << 4) | ($z >> 2)}]
+		    set c [expr {(($z & 0x3) << 6) | $y}]
+		    append output [binary format ccc $a $b $c]
+		    set nums {}
+		}
+	    } elseif {$bits == -1} {
+		# = indicates end of data.  Output whatever chars are
+		# left, if any.
+		if {![llength $nums]} break
+		# The encoding algorithm dictates that we can only
+		# have 1 or 2 padding characters.  If x=={}, we must
+		# (*) have 12 bits of input (enough for 1 8-bit
+		# output).  If x!={}, we have 18 bits of input (enough
+		# for 2 8-bit outputs).
+		#
+		# (*) If we don't then the input is broken (bug 2976290).
+
+		foreach {v w z} $nums break
+
+		# Bug 2976290
+		if {$w == {}} {
+		    return -code error "Not enough data to process padding"
+		}
+
+		set a [expr {($v << 2) | (($w & 0x30) >> 4)}]
+		if {$z == {}} {
+		    append output [binary format c $a ]
+		} else {
+		    set b [expr {(($w & 0xF) << 4) | (($z & 0x3C) >> 2)}]
+		    append output [binary format cc $a $b]
+		}
+		break
+	    } else {
+		# RFC 2045 says that line breaks and other characters not part
+		# of the Base64 alphabet must be ignored, and that the decoder
+		# can optionally emit a warning or reject the message.  We opt
+		# not to do so, but to just ignore the character.
+		continue
+	    }
+	}
+	return $output
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+return
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/base64c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/base64c.tcl
new file mode 100644
index 00000000..29e501df
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/base64c.tcl
@@ -0,0 +1,19 @@
+# base64c - Copyright (C) 2003 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# This package is a place-holder for the critcl enhanced code present in
+# the tcllib base64 module.
+#
+# Normally this code will become part of the tcllibc library.
+#
+
+# @sak notprovided base64c
+package require critcl
+package provide base64c 0.1.0
+
+namespace eval ::base64c {
+    variable base64c_rcsid {$Id: base64c.tcl,v 1.5 2008/03/25 07:15:35 andreas_kupries Exp $}
+
+    critcl::ccode {
+        /* no code required in this file */
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/pkgIndex.tcl
new file mode 100644
index 00000000..c8528f59
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded base64   2.5 [list source [file join $dir base64.tcl]]
+package ifneeded uuencode 1.1.5 [list source [file join $dir uuencode.tcl]]
+package ifneeded yencode  1.1.3 [list source [file join $dir yencode.tcl]]
+package ifneeded ascii85  1.0   [list source [file join $dir ascii85.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/uuencode.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/uuencode.tcl
new file mode 100644
index 00000000..5e26422d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/uuencode.tcl
@@ -0,0 +1,335 @@
+# uuencode - Copyright (C) 2002 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# Provide a Tcl only implementation of uuencode and uudecode.
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2;                # tcl minimum version
+
+# Try and get some compiled helper package.
+if {[catch {package require tcllibc}]} {
+    catch {package require Trf}
+}
+
+namespace eval ::uuencode {
+    namespace export encode decode uuencode uudecode
+}
+
+proc ::uuencode::Enc {c} {
+    return [format %c [expr {($c != 0) ? (($c & 0x3f) + 0x20) : 0x60}]]
+}
+
+proc ::uuencode::Encode {s} {
+    set r {}
+    binary scan $s c* d
+    foreach {c1 c2 c3} $d {
+        if {$c1 == {}} {set c1 0}
+        if {$c2 == {}} {set c2 0}
+        if {$c3 == {}} {set c3 0}
+        append r [Enc [expr {$c1 >> 2}]]
+        append r [Enc [expr {(($c1 << 4) & 060) | (($c2 >> 4) & 017)}]]
+        append r [Enc [expr {(($c2 << 2) & 074) | (($c3 >> 6) & 003)}]]
+        append r [Enc [expr {($c3 & 077)}]]
+    }
+    return $r
+}
+
+
+proc ::uuencode::Decode {s} {
+    if {[string length $s] == 0} {return ""}
+    set r {}
+    binary scan [pad $s] c* d
+
+    foreach {c0 c1 c2 c3} $d {
+        append r [format %c [expr {((($c0-0x20)&0x3F) << 2) & 0xFF
+                                   | ((($c1-0x20)&0x3F) >> 4) & 0xFF}]]
+        append r [format %c [expr {((($c1-0x20)&0x3F) << 4) & 0xFF
+                                   | ((($c2-0x20)&0x3F) >> 2) & 0xFF}]]
+        append r [format %c [expr {((($c2-0x20)&0x3F) << 6) & 0xFF
+                                   | (($c3-0x20)&0x3F) & 0xFF}]]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# C coded version of the Encode/Decode functions for base64c package.
+# -------------------------------------------------------------------------
+if {[package provide critcl] != {}} {
+    namespace eval ::uuencode {
+        critcl::ccode {
+            #include <string.h>
+            static unsigned char Enc(unsigned char c) {
+                return (c != 0) ? ((c & 0x3f) + 0x20) : 0x60;
+            }
+        }
+        critcl::ccommand CEncode {dummy interp objc objv} {
+            Tcl_Obj *inputPtr, *resultPtr;
+            int len, rlen, xtra;
+            unsigned char *input, *p, *r;
+
+            if (objc !=  2) {
+                Tcl_WrongNumArgs(interp, 1, objv, "data");
+                return TCL_ERROR;
+            }
+
+            inputPtr = objv[1];
+            input = Tcl_GetByteArrayFromObj(inputPtr, &len);
+            if ((xtra = (3 - (len % 3))) != 3) {
+                if (Tcl_IsShared(inputPtr))
+                    inputPtr = Tcl_DuplicateObj(inputPtr);
+                input = Tcl_SetByteArrayLength(inputPtr, len + xtra);
+                memset(input + len, 0, xtra);
+                len += xtra;
+            }
+
+            rlen = (len / 3) * 4;
+            resultPtr = Tcl_NewObj();
+            r = Tcl_SetByteArrayLength(resultPtr, rlen);
+            memset(r, 0, rlen);
+
+            for (p = input; p < input + len; p += 3) {
+                char a, b, c;
+                a = *p; b = *(p+1), c = *(p+2);
+                *r++ = Enc(a >> 2);
+                *r++ = Enc(((a << 4) & 060) | ((b >> 4) & 017));
+                *r++ = Enc(((b << 2) & 074) | ((c >> 6) & 003));
+                *r++ = Enc(c & 077);
+            }
+            Tcl_SetObjResult(interp, resultPtr);
+            return TCL_OK;
+        }
+
+        critcl::ccommand CDecode {dummy interp objc objv} {
+            Tcl_Obj *inputPtr, *resultPtr;
+            int len, rlen, xtra;
+            unsigned char *input, *p, *r;
+
+            if (objc !=  2) {
+                Tcl_WrongNumArgs(interp, 1, objv, "data");
+                return TCL_ERROR;
+            }
+
+            /* if input is not mod 4, extend it with nuls */
+            inputPtr = objv[1];
+            input = Tcl_GetByteArrayFromObj(inputPtr, &len);
+            if ((xtra = (4 - (len % 4))) != 4) {
+                if (Tcl_IsShared(inputPtr))
+                    inputPtr = Tcl_DuplicateObj(inputPtr);
+                input = Tcl_SetByteArrayLength(inputPtr, len + xtra);
+                memset(input + len, 0, xtra);
+                len += xtra;
+            }
+
+            /* output will be 1/3 smaller than input and a multiple of 3 */
+            rlen = (len / 4) * 3;
+            resultPtr = Tcl_NewObj();
+            r = Tcl_SetByteArrayLength(resultPtr, rlen);
+            memset(r, 0, rlen);
+
+            for (p = input; p < input + len; p += 4) {
+                char a, b, c, d;
+                a = *p; b = *(p+1), c = *(p+2), d = *(p+3);
+                *r++ = (((a - 0x20) & 0x3f) << 2) | (((b - 0x20) & 0x3f) >> 4);
+                *r++ = (((b - 0x20) & 0x3f) << 4) | (((c - 0x20) & 0x3f) >> 2);
+                *r++ = (((c - 0x20) & 0x3f) << 6) | (((d - 0x20) & 0x3f) );
+            }
+            Tcl_SetObjResult(interp, resultPtr);
+            return TCL_OK;
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Permit more tolerant decoding of invalid input strings by padding to
+#  a multiple of 4 bytes with nulls.
+# Result:
+#  Returns the input string - possibly padded with uuencoded null chars.
+#
+proc ::uuencode::pad {s} {
+    if {[set mod [expr {[string length $s] % 4}]] != 0} {
+        append s [string repeat "`" [expr {4 - $mod}]]
+    }
+    return $s
+}
+
+# -------------------------------------------------------------------------
+
+# If the Trf package is available then we shall use this by default but the
+# Tcllib implementations are always visible if needed (ie: for testing)
+if {[info commands ::uuencode::CDecode] != {}} {
+    # tcllib critcl package
+    interp alias {} ::uuencode::encode {} ::uuencode::CEncode
+    interp alias {} ::uuencode::decode {} ::uuencode::CDecode
+} elseif {[package provide Trf] != {}} {
+    proc ::uuencode::encode {s} {
+        return [::uuencode -mode encode -- $s]
+    }
+    proc ::uuencode::decode {s} {
+        return [::uuencode -mode decode -- [pad $s]]
+    }
+} else {
+    # pure-tcl then
+    interp alias {} ::uuencode::encode {} ::uuencode::Encode
+    interp alias {} ::uuencode::decode {} ::uuencode::Decode
+}
+
+# -------------------------------------------------------------------------
+
+proc ::uuencode::uuencode {args} {
+    array set opts {mode 0644 filename {} name {}}
+    set wrongargs "wrong \# args: should be\
+            \"uuencode ?-name string? ?-mode octal?\
+            (-file filename | ?--? string)\""
+    while {[string match -* [lindex $args 0]]} {
+        switch -glob -- [lindex $args 0] {
+            -f* {
+                if {[llength $args] < 2} {
+                    return -code error $wrongargs
+                }
+                set opts(filename) [lindex $args 1]
+                set args [lreplace $args 0 0]
+            }
+            -m* {
+                if {[llength $args] < 2} {
+                    return -code error $wrongargs
+                }
+                set opts(mode) [lindex $args 1]
+                set args [lreplace $args 0 0]
+            }
+            -n* {
+                if {[llength $args] < 2} {
+                    return -code error $wrongargs
+                }
+                set opts(name) [lindex $args 1]
+                set args [lreplace $args 0 0]
+            }
+            -- {
+                set args [lreplace $args 0 0]
+                break
+            }
+            default {
+                return -code error "bad option [lindex $args 0]:\
+                      must be -file, -mode, or -name"
+            }
+        }
+        set args [lreplace $args 0 0]
+    }
+
+    if {$opts(name) == {}} {
+        set opts(name) $opts(filename)
+    }
+    if {$opts(name) == {}} {
+        set opts(name) "data.dat"
+    }
+
+    if {$opts(filename) != {}} {
+        set f [open $opts(filename) r]
+        fconfigure $f -translation binary
+        set data [read $f]
+        close $f
+    } else {
+        if {[llength $args] != 1} {
+            return -code error $wrongargs
+        }
+        set data [lindex $args 0]
+    }
+
+    set r {}
+    append r [format "begin %o %s" $opts(mode) $opts(name)] "\n"
+    for {set n 0} {$n < [string length $data]} {incr n 45} {
+        set s [string range $data $n [expr {$n + 44}]]
+        append r [Enc [string length $s]]
+        append r [encode $s] "\n"
+    }
+    append r "`\nend"
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Perform uudecoding of a file or data. A file may contain more than one
+#  encoded data section so the result is a list where each element is a
+#  three element list of the provided filename, the suggested mode and the
+#  data itself.
+#
+proc ::uuencode::uudecode {args} {
+    array set opts {mode 0644 filename {}}
+    set wrongargs "wrong \# args: should be \"uudecode (-file filename | ?--? string)\""
+    while {[string match -* [lindex $args 0]]} {
+        switch -glob -- [lindex $args 0] {
+            -f* {
+                if {[llength $args] < 2} {
+                    return -code error $wrongargs
+                }
+                set opts(filename) [lindex $args 1]
+                set args [lreplace $args 0 0]
+            }
+            -- {
+                set args [lreplace $args 0 0]
+                break
+            }
+            default {
+                return -code error "bad option [lindex $args 0]:\
+                      must be -file"
+            }
+        }
+        set args [lreplace $args 0 0]
+    }
+
+    if {$opts(filename) != {}} {
+        set f [open $opts(filename) r]
+        set data [read $f]
+        close $f
+    } else {
+        if {[llength $args] != 1} {
+            return -code error $wrongargs
+        }
+        set data [lindex $args 0]
+    }
+
+    set state false
+    set result {}
+
+    foreach {line} [split $data "\n"] {
+        switch -exact -- $state {
+            false {
+                if {[regexp {^begin ([0-7]+) ([^\s]*)} $line \
+                         -> opts(mode) opts(name)]} {
+                    set state true
+                    set r {}
+                }
+            }
+
+            true {
+                if {[string match "end" $line]} {
+                    set state false
+                    lappend result [list $opts(name) $opts(mode) $r]
+                } else {
+                    scan $line %c c
+                    set n [expr {($c - 0x21)}]
+                    append r [string range \
+                                  [decode [string range $line 1 end]] 0 $n]
+                }
+            }
+        }
+    }
+
+    return $result
+}
+
+# -------------------------------------------------------------------------
+
+package provide uuencode 1.1.5
+
+# -------------------------------------------------------------------------
+#
+# Local variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/yencode.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/yencode.tcl
new file mode 100644
index 00000000..0d4554c0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/base64/yencode.tcl
@@ -0,0 +1,307 @@
+# yencode.tcl - Copyright (C) 2002 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# Provide a Tcl only implementation of yEnc encoding algorithm
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+# FUTURE: Rework to allow switching between the tcl/critcl implementations.
+
+package require Tcl 8.2;                # tcl minimum version
+catch {package require crc32};          # tcllib 1.1
+catch {package require tcllibc};        # critcl enhancements for tcllib
+
+namespace eval ::yencode {
+    namespace export encode decode yencode ydecode
+}
+
+# -------------------------------------------------------------------------
+
+proc ::yencode::Encode {s} {
+    set r {}
+    binary scan $s c* d
+    foreach {c} $d {
+        set v [expr {($c + 42) % 256}]
+        if {$v == 0x00 || $v == 0x09 || $v == 0x0A
+            || $v == 0x0D || $v == 0x3D} {
+            append r "="
+            set v [expr {($v + 64) % 256}]
+        }
+        append r [format %c $v]
+    }
+    return $r
+}
+
+proc ::yencode::Decode {s} {
+    if {[string length $s] == 0} {return ""}
+    set r {}
+    set esc 0
+    binary scan $s c* d
+    foreach c $d {
+        if {$c == 61 && $esc == 0} {
+            set esc 1
+            continue
+        }
+        set v [expr {($c - 42) % 256}]
+        if {$esc} {
+            set v [expr {($v - 64) % 256}]
+            set esc 0
+        }
+        append r [format %c $v]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# C coded versions for critcl built base64c package
+# -------------------------------------------------------------------------
+
+if {[package provide critcl] != {}} {
+    namespace eval ::yencode {
+        critcl::ccode {
+            #include <string.h>
+        }
+        critcl::ccommand CEncode {dummy interp objc objv} {
+            Tcl_Obj *inputPtr, *resultPtr;
+            int len, rlen, xtra;
+            unsigned char *input, *p, *r, v;
+
+            if (objc !=  2) {
+                Tcl_WrongNumArgs(interp, 1, objv, "data");
+                return TCL_ERROR;
+            }
+
+            /* fetch the input data */
+            inputPtr = objv[1];
+            input = Tcl_GetByteArrayFromObj(inputPtr, &len);
+
+            /* calculate the length of the encoded result */
+            rlen = len;
+            for (p = input; p < input + len; p++) {
+                v = (*p + 42) % 256;
+                if (v == 0 || v == 9 || v == 0x0A || v == 0x0D || v == 0x3D)
+                   rlen++;
+            }
+
+            /* allocate the output buffer */
+            resultPtr = Tcl_NewObj();
+            r = Tcl_SetByteArrayLength(resultPtr, rlen);
+
+            /* encode the input */
+            for (p = input; p < input + len; p++) {
+                v = (*p + 42) % 256;
+                if (v == 0 || v == 9 || v == 0x0A || v == 0x0D || v == 0x3D) {
+                    *r++ = '=';
+                    v = (v + 64) % 256;
+                }
+                *r++ = v;
+            }
+            Tcl_SetObjResult(interp, resultPtr);
+            return TCL_OK;
+        }
+
+        critcl::ccommand CDecode {dummy interp objc objv} {
+            Tcl_Obj *inputPtr, *resultPtr;
+            int len, rlen, esc;
+            unsigned char *input, *p, *r, v;
+
+            if (objc !=  2) {
+                Tcl_WrongNumArgs(interp, 1, objv, "data");
+                return TCL_ERROR;
+            }
+
+            /* fetch the input data */
+            inputPtr = objv[1];
+            input = Tcl_GetByteArrayFromObj(inputPtr, &len);
+
+            /* allocate the output buffer */
+            resultPtr = Tcl_NewObj();
+            r = Tcl_SetByteArrayLength(resultPtr, len);
+
+            /* encode the input */
+            for (p = input, esc = 0, rlen = 0; p < input + len; p++) {
+                if (*p == 61 && esc == 0) {
+                    esc = 1;
+                    continue;
+                }
+                v = (*p - 42) % 256;
+                if (esc) {
+                    v = (v - 64) % 256;
+                    esc = 0;
+                }
+                *r++ = v;
+                rlen++;
+            }
+            Tcl_SetByteArrayLength(resultPtr, rlen);
+            Tcl_SetObjResult(interp, resultPtr);
+            return TCL_OK;
+        }
+    }
+}
+
+if {[info commands ::yencode::CEncode] != {}} {
+    interp alias {} ::yencode::encode {} ::yencode::CEncode
+    interp alias {} ::yencode::decode {} ::yencode::CDecode
+} else {
+    interp alias {} ::yencode::encode {} ::yencode::Encode
+    interp alias {} ::yencode::decode {} ::yencode::Decode
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::yencode::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+proc ::yencode::yencode {args} {
+    array set opts {mode 0644 filename {} name {} line 128 crc32 1}
+    while {[string match -* [lindex $args 0]]} {
+        switch -glob -- [lindex $args 0] {
+            -f* { set opts(filename) [Pop args 1] }
+            -m* { set opts(mode) [Pop args 1] }
+            -n* { set opts(name) [Pop args 1] }
+            -l* { set opts(line) [Pop args 1] }
+            -c* { set opts(crc32) [Pop args 1] }
+            --  { Pop args ; break }
+            default {
+                set options [join [lsort [array names opts]] ", -"]
+                return -code error "bad option [lindex $args 0]:\
+                      must be -$options"
+            }
+        }
+        Pop args
+    }
+
+    if {$opts(name) == {}} {
+        set opts(name) $opts(filename)
+    }
+    if {$opts(name) == {}} {
+        set opts(name) "data.dat"
+    }
+    if {! [string is boolean $opts(crc32)]} {
+        return -code error "bad option -crc32: argument must be true or false"
+    }
+
+    if {$opts(filename) != {}} {
+        set f [open $opts(filename) r]
+        fconfigure $f -translation binary
+        set data [read $f]
+        close $f
+    } else {
+        if {[llength $args] != 1} {
+            return -code error "wrong \# args: should be\
+                  \"yencode ?options? -file name | data\""
+        }
+        set data [lindex $args 0]
+    }
+
+    set opts(size) [string length $data]
+
+    set r {}
+    append r [format "=ybegin line=%d size=%d name=%s" \
+                  $opts(line) $opts(size) $opts(name)] "\n"
+
+    set ndx 0
+    while {$ndx < $opts(size)} {
+        set pln [string range $data $ndx [expr {$ndx + $opts(line) - 1}]]
+        set enc [encode $pln]
+        incr ndx [string length $pln]
+        append r $enc "\r\n"
+    }
+
+    append r [format "=yend size=%d" $ndx]
+    if {$opts(crc32)} {
+        append r " crc32=" [crc::crc32 -format %x $data]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Perform ydecoding of a file or data. A file may contain more than one
+#  encoded data section so the result is a list where each element is a
+#  three element list of the provided filename, the file size and the
+#  data itself.
+#
+proc ::yencode::ydecode {args} {
+    array set opts {mode 0644 filename {} name default.bin}
+    while {[string match -* [lindex $args 0]]} {
+        switch -glob -- [lindex $args 0] {
+            -f* { set opts(filename) [Pop args 1] }
+            -- { Pop args ; break; }
+            default {
+                set options [join [lsort [array names opts]] ", -"]
+                return -code error "bad option [lindex $args 0]:\
+                      must be -$opts"
+            }
+        }
+        Pop args
+    }
+
+    if {$opts(filename) != {}} {
+        set f [open $opts(filename) r]
+        set data [read $f]
+        close $f
+    } else {
+        if {[llength $args] != 1} {
+            return -code error "wrong \# args: should be\
+                  \"ydecode ?options? -file name | data\""
+        }
+        set data [lindex $args 0]
+    }
+
+    set state false
+    set result {}
+
+    foreach {line} [split $data "\n"] {
+        set line [string trimright $line "\r\n"]
+        switch -exact -- $state {
+            false {
+                if {[string match "=ybegin*" $line]} {
+                    regexp {line=(\d+)} $line -> opts(line)
+                    regexp {size=(\d+)} $line -> opts(size)
+                    regexp {name=(\d+)} $line -> opts(name)
+
+                    if {$opts(name) == {}} {
+                        set opts(name) default.bin
+                    }
+
+                    set state true
+                    set r {}
+                }
+            }
+
+            true {
+                if {[string match "=yend*" $line]} {
+                    set state false
+                    lappend result [list $opts(name) $opts(size) $r]
+                } else {
+                    append r [decode $line]
+                }
+            }
+        }
+    }
+
+    return $result
+}
+
+# -------------------------------------------------------------------------
+
+package provide yencode 1.1.3
+
+# -------------------------------------------------------------------------
+#
+# Local variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bee/bee.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bee/bee.tcl
new file mode 100644
index 00000000..6eb53c06
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bee/bee.tcl
@@ -0,0 +1,990 @@
+# bee.tcl --
+#
+#	BitTorrent Bee de- and encoder.
+#
+# Copyright (c) 2004 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# See the file license.terms.
+
+package require Tcl 8.4
+
+namespace eval ::bee {
+    # Encoder commands
+    namespace export \
+	    encodeString encodeNumber \
+	    encodeListArgs encodeList \
+	    encodeDictArgs encodeDict
+
+    # Decoder commands.
+    namespace export \
+	    decode \
+	    decodeChannel \
+	    decodeCancel \
+	    decodePush
+
+    # Channel decoders, reference to state information, keyed by
+    # channel handle.
+
+    variable  bee
+    array set bee {}
+
+    # Counter for generation of names for the state variables.
+
+    variable count 0
+
+    # State information for the channel decoders.
+
+    # stateN, with N an integer number counting from 0 on up.
+    # ...(chan)   Handle of channel the decoder is for.
+    # ...(cmd)    Command prefix, completion callback
+    # ...(exact)  Boolean flag, set for exact processing.
+    # ...(read)   Buffer for new characters to process.
+    # ...(type)   Type of current value (integer, string, list, dict)
+    # ...(value)  Buffer for assembling the current value.
+    # ...(pend)   Stack of pending 'value' buffers, for nested
+    #             containers.
+    # ...(state)  Current state of the decoding state machine.
+
+    # States of the finite automaton ...
+    # intro  - One char, type of value, or 'e' as stop of container.
+    # signum - sign or digit, for integer.
+    # idigit - digit, for integer, or 'e' as stop
+    # ldigit - digit, for length of string, or :
+    # data   - string data, 'get' characters.
+    # Containers via 'pend'.
+
+    #Debugging help, nesting level
+    #variable X 0
+}
+
+
+# ::bee::encodeString --
+#
+#	Encode a string to bee-format.
+#
+# Arguments:
+#	string	The string to encode.
+#
+# Results:
+#	The bee-encoded form of the string.
+
+proc ::bee::encodeString {string} {
+    return "[string length $string]:$string"
+}
+
+
+# ::bee::encodeNumber --
+#
+#	Encode an integer number to bee-format.
+#
+# Arguments:
+#	num	The integer number to encode.
+#
+# Results:
+#	The bee-encoded form of the integer number.
+
+proc ::bee::encodeNumber {num} {
+    if {![string is integer -strict $num]} {
+	return -code error "Expected integer number, got \"$num\""
+    }
+
+    # The reformatting deals with hex, octal and other tcl
+    # representation of the value. In other words we normalize the
+    # string representation of the input value.
+
+    set num [format %d $num]
+    return "i${num}e"
+}
+
+
+# ::bee::encodeList --
+#
+#	Encode a list of bee-coded values to bee-format.
+#
+# Arguments:
+#	list	The list to encode.
+#
+# Results:
+#	The bee-encoded form of the list.
+
+proc ::bee::encodeList {list} {
+    return "l[join $list ""]e"
+}
+
+
+# ::bee::encodeListArgs --
+#
+#	Encode a variable list of bee-coded values to bee-format.
+#
+# Arguments:
+#	args	The values to encode.
+#
+# Results:
+#	The bee-encoded form of the list of values.
+
+proc ::bee::encodeListArgs {args} {
+    return [encodeList $args]
+}
+
+
+# ::bee::encodeDict --
+#
+#	Encode a dictionary of keys and bee-coded values to bee-format.
+#
+# Arguments:
+#	dict	The dictionary to encode.
+#
+# Results:
+#	The bee-encoded form of the dictionary.
+
+proc ::bee::encodeDict {dict} {
+    if {([llength $dict] % 2) == 1} {
+	return -code error "Expected even number of elements, got \"[llength $dict]\""
+    }
+    set temp [list]
+    foreach {k v} $dict {
+	lappend temp [list $k $v]
+    }
+    set res "d"
+    foreach item [lsort -index 0 $temp] {
+	foreach {k v} $item break
+	append res [encodeString $k]$v
+    }
+    append res "e"
+    return $res
+}
+
+
+# ::bee::encodeDictArgs --
+#
+#	Encode a variable dictionary of keys and bee-coded values to bee-format.
+#
+# Arguments:
+#	args	The keys and values to encode.
+#
+# Results:
+#	The bee-encoded form of the dictionary.
+
+proc ::bee::encodeDictArgs {args} {
+    return [encodeDict $args]
+}
+
+
+# ::bee::decode --
+#
+#	Decode a bee-encoded value and returns the embedded tcl
+#	value. For containers this recurses into the contained value.
+#
+# Arguments:
+#	value	The string containing the bee-encoded value to decode.
+#	evar	Optional. If set the name of the variable to store the
+#		index of the first character after the decoded value to.
+#	start	Optional. If set the index of the first character of the
+#		value to decode. Defaults to 0, i.e. the beginning of the
+#		string.
+#
+# Results:
+#	The tcl value embedded in the encoded string.
+
+proc ::bee::decode {value {evar {}} {start 0}} {
+    #variable X
+    #puts -nonewline "[string repeat "    " $X]decode @$start" ; flush stdout
+
+    if {$evar ne ""} {upvar 1 $evar end} else {set end _}
+
+    if {[string length $value] < ($start+2)} {
+	# This checked that the 'start' index is still in the string,
+	# and the end of the value most likely as well. Note that each
+	# encoded value consists of at least two characters (the
+	# bracketing characters for integer, list, and dict, and for
+	# string at least one digit length and the colon).
+
+	#puts \t[string length $value]\ <\ ($start+2)
+	return -code error "String not large enough for value"
+    }
+
+    set type [string index $value $start]
+
+    #puts -nonewline " $type=" ; flush stdout
+
+    if {$type eq "i"} {
+	# Extract integer
+	#puts -nonewline integer ; flush stdout
+
+	incr start ; # Skip over intro 'i'.
+	set end [string first e $value $start]
+	if {$end < 0} {
+	    return -code error "End of integer number not found"
+	}
+	incr end -1 ; # Get last character before closing 'e'.
+	set num [string range $value $start $end]
+	if {
+	    [regexp {^-0+$} $num] ||
+	    ![string is integer -strict $num] ||
+	    (([string length $num] > 1) && [string match 0* $num])
+	} {
+	    return -code error "Expected integer number, got \"$num\""
+	}
+	incr end 2 ; # Step after closing 'e' to the beginning of
+	# ........ ; # the next bee-value behind the current one.
+
+	#puts " ($num) @$end"
+	return $num
+
+    } elseif {($type eq "l") || ($type eq "d")} {
+	#puts -nonewline $type\n ; flush stdout
+
+	# Extract list or dictionary, recursively each contained
+	# element. From the perspective of the decoder this is the
+	# same, the tcl representation of both is a list, and for a
+	# dictionary keys and values are also already in the correct
+	# order.
+
+	set result [list]
+	incr start ; # Step over intro 'e' to beginning of the first
+	# ........ ; # contained value, or behind the container (if
+	# ........ ; # empty).
+
+	set end $start
+	#incr X
+	while {[string index $value $start] ne "e"} {
+	    lappend result [decode $value end $start]
+	    set start $end
+	}
+	#incr X -1
+	incr end
+
+	#puts "[string repeat "    " $X]($result) @$end"
+
+	if {$type eq "d" && ([llength $result] % 2 == 1)} {
+	    return -code error "Dictionary has to be of even length"
+	}
+	return $result
+
+    } elseif {[string match {[0-9]} $type]} {
+	#puts -nonewline string ; flush stdout
+
+	# Extract string. First the length, bounded by a colon, then
+	# the appropriate number of characters.
+
+	set end [string first : $value $start]
+	if {$end < 0} {
+	    return -code error "End of string length not found"
+	}
+	incr end -1
+	set length [string range $value $start $end]
+	incr end 2 ;# Skip to beginning of the string after the colon
+
+	if {![string is integer -strict $length]} {
+	    return -code error "Expected integer number for string length, got \"$length\""
+	} elseif {$length < 0} {
+	    # This cannot happen. To happen "-" has to be first character,
+	    # and this is caught as unknown bee-type.
+	    return -code error "Illegal negative string length"
+	} elseif {($end + $length) > [string length $value]} {
+	    return -code error "String not large enough for value"
+	}
+
+	#puts -nonewline \[$length\] ; flush stdout
+	if {$length > 0} {
+	    set  start $end
+	    incr end $length
+	    incr end -1
+	    set result [string range $value $start $end]
+	    incr end
+	} else {
+	    set result ""
+	}
+
+	#puts " ($result) @$end"
+	return $result
+
+    } else {
+	return -code error "Unknown bee-type \"$type\""
+    }
+}
+
+# ::bee::decodeIndices --
+#
+#	Similar to 'decode', but does not return the decoded tcl values,
+#	but a structure containing the start- and end-indices for all
+#	values in the structure.
+#
+# Arguments:
+#	value	The string containing the bee-encoded value to decode.
+#	evar	Optional. If set the name of the variable to store the
+#		index of the first character after the decoded value to.
+#	start	Optional. If set the index of the first character of the
+#		value to decode. Defaults to 0, i.e. the beginning of the
+#		string.
+#
+# Results:
+#	The structure of the value, with indices and types for all
+#	contained elements.
+
+proc ::bee::decodeIndices {value {evar {}} {start 0}} {
+    #variable X
+    #puts -nonewline "[string repeat "    " $X]decode @$start" ; flush stdout
+
+    if {$evar ne ""} {upvar 1 $evar end} else {set end _}
+
+    if {[string length $value] < ($start+2)} {
+	# This checked that the 'start' index is still in the string,
+	# and the end of the value most likely as well. Note that each
+	# encoded value consists of at least two characters (the
+	# bracketing characters for integer, list, and dict, and for
+	# string at least one digit length and the colon).
+
+	#puts \t[string length $value]\ <\ ($start+2)
+	return -code error "String not large enough for value"
+    }
+
+    set type [string index $value $start]
+
+    #puts -nonewline " $type=" ; flush stdout
+
+    if {$type eq "i"} {
+	# Extract integer
+	#puts -nonewline integer ; flush stdout
+
+	set begin $start
+
+	incr start ; # Skip over intro 'i'.
+	set end [string first e $value $start]
+	if {$end < 0} {
+	    return -code error "End of integer number not found"
+	}
+	incr end -1 ; # Get last character before closing 'e'.
+	set num [string range $value $start $end]
+	if {
+	    [regexp {^-0+$} $num] ||
+	    ![string is integer -strict $num] ||
+	    (([string length $num] > 1) && [string match 0* $num])
+	} {
+	    return -code error "Expected integer number, got \"$num\""
+	}
+	incr end
+	set stop $end
+	incr end 1 ; # Step after closing 'e' to the beginning of
+	# ........ ; # the next bee-value behind the current one.
+
+	#puts " ($num) @$end"
+	return [list integer $begin $stop]
+
+    } elseif {$type eq "l"} {
+	#puts -nonewline $type\n ; flush stdout
+
+	# Extract list, recursively each contained element.
+
+	set result [list]
+
+	lappend result list $start @
+
+	incr start ; # Step over intro 'e' to beginning of the first
+	# ........ ; # contained value, or behind the container (if
+	# ........ ; # empty).
+
+	set end $start
+	#incr X
+
+	set contained [list]
+	while {[string index $value $start] ne "e"} {
+	    lappend contained [decodeIndices $value end $start]
+	    set start $end
+	}
+	lappend result $contained
+	#incr X -1
+	set stop $end
+	incr end
+
+	#puts "[string repeat "    " $X]($result) @$end"
+
+	return [lreplace $result 2 2 $stop]
+
+    } elseif {($type eq "l") || ($type eq "d")} {
+	#puts -nonewline $type\n ; flush stdout
+
+	# Extract dictionary, recursively each contained element.
+
+	set result [list]
+
+	lappend result dict $start @
+
+	incr start ; # Step over intro 'e' to beginning of the first
+	# ........ ; # contained value, or behind the container (if
+	# ........ ; # empty).
+
+	set end $start
+	set atkey 1
+	#incr X
+
+	set contained [list]
+	set val       [list]
+	while {[string index $value $start] ne "e"} {
+	    if {$atkey} {
+		lappend contained [decode $value {} $start]
+		lappend val       [decodeIndices $value end $start]
+		set atkey 0
+	    } else {
+		lappend val       [decodeIndices $value end $start]
+		lappend contained $val
+		set val [list]
+		set atkey 1
+	    }
+	    set start $end
+	}
+	lappend result $contained
+	#incr X -1
+	set stop $end
+	incr end
+
+	#puts "[string repeat "    " $X]($result) @$end"
+
+	if {[llength $result] % 2 == 1} {
+	    return -code error "Dictionary has to be of even length"
+	}
+	return [lreplace $result 2 2 $stop]
+
+    } elseif {[string match {[0-9]} $type]} {
+	#puts -nonewline string ; flush stdout
+
+	# Extract string. First the length, bounded by a colon, then
+	# the appropriate number of characters.
+
+	set end [string first : $value $start]
+	if {$end < 0} {
+	    return -code error "End of string length not found"
+	}
+	incr end -1
+	set length [string range $value $start $end]
+	incr end 2 ;# Skip to beginning of the string after the colon
+
+	if {![string is integer -strict $length]} {
+	    return -code error "Expected integer number for string length, got \"$length\""
+	} elseif {$length < 0} {
+	    # This cannot happen. To happen "-" has to be first character,
+	    # and this is caught as unknown bee-type.
+	    return -code error "Illegal negative string length"
+	} elseif {($end + $length) > [string length $value]} {
+	    return -code error "String not large enough for value"
+	}
+
+	#puts -nonewline \[$length\] ; flush stdout
+	incr end -1
+	if {$length > 0} {
+	    incr end $length
+	    set stop $end
+	} else {
+	    set stop $end
+	}
+	incr end
+
+	#puts " ($result) @$end"
+	return [list string $start $stop]
+
+    } else {
+	return -code error "Unknown bee-type \"$type\""
+    }
+}
+
+
+# ::bee::decodeChannel --
+#
+#	Attach decoder for a bee-value to a channel. See the
+#	documentation for details.
+#
+# Arguments:
+#	chan			Channel to attach to.
+#	-command cmdprefix	Completion callback. Required.
+#	-exact			Keep running after completion.
+#	-prefix data		Seed for decode buffer.
+#
+# Results:
+#	A token to use when referring to the decoder.
+#	For example when canceling it.
+
+proc ::bee::decodeChannel {chan args} {
+    variable bee
+    if {[info exists bee($chan)]} {
+	return -code error "bee-Decoder already active for channel"
+    }
+
+    # Create state and token.
+
+    variable  count
+    variable  [set st state$count]
+    array set $st {}
+    set       bee($chan) $st
+    upvar 0  $st state
+    incr count
+
+    # Initialize the decoder state, process the options. When
+    # encountering errors here destroy the half-baked state before
+    # throwing the message.
+
+    set       state(chan) $chan
+    array set state {
+	exact  0
+	type   ?
+	read   {}
+	value  {}
+	pend   {}
+	state  intro
+	get    1
+    }
+
+    while {[llength $args]} {
+	set option [lindex $args 0]
+	set args [lrange $args 1 end]
+	if {$option eq "-command"} {
+	    if {![llength $args]} {
+		unset bee($chan)
+		unset state
+		return -code error "Missing value for option -command."
+	    }
+	    set state(cmd) [lindex $args 0]
+	    set args       [lrange $args 1 end]
+
+	} elseif {$option eq "-prefix"} {
+	    if {![llength $args]} {
+		unset bee($chan)
+		unset state
+		return -code error "Missing value for option -prefix."
+	    }
+	    set state(read) [lindex $args 0]
+	    set args        [lrange $args 1 end]
+
+	} elseif {$option eq "-exact"} {
+	    set state(exact) 1
+	} else {
+	    unset bee($chan)
+	    unset state
+	    return -code error "Illegal option \"$option\",\
+		    expected \"-command\", \"-prefix\", or \"-keep\""
+	}
+    }
+
+    if {![info exists state(cmd)]} {
+	unset bee($chan)
+	unset state
+	return -code error "Missing required completion callback."
+    }
+
+    # Set up the processing of incoming data.
+
+    fileevent $chan readable [list ::bee::Process $chan $bee($chan)]
+
+    # Return the name of the state array as token.
+    return $bee($chan)
+}
+
+# ::bee::Parse --
+#
+#	Internal helper. Fileevent handler for a decoder.
+#	Parses input and handles both error and eof conditions.
+#
+# Arguments:
+#	token	The decoder to run on its input.
+#
+# Results:
+#	None.
+
+proc ::bee::Process {chan token} {
+    if {[catch {Parse $token} msg]} {
+	# Something failed. Destroy and report.
+	Command $token error $msg
+	return
+    }
+
+    if {[eof $chan]} {
+	# Having data waiting, either in the input queue, or in the
+	# output stack (of nested containers) is a failure. Report
+	# this instead of the eof.
+
+	variable $token
+	upvar 0  $token state
+
+	if {
+	    [string length $state(read)] ||
+	    [llength       $state(pend)] ||
+	    [string length $state(value)] ||
+	    ($state(state) ne "intro")
+	} {
+	    Command $token error "Incomplete value at end of channel"
+	} else {
+	    Command $token eof
+	}
+    }
+    return
+}
+
+# ::bee::Parse --
+#
+#	Internal helper. Reading from the channel and parsing the input.
+#	Uses a hardwired state machine.
+#
+# Arguments:
+#	token	The decoder to run on its input.
+#
+# Results:
+#	None.
+
+proc ::bee::Parse {token} {
+    variable $token
+    upvar 0  $token state
+    upvar 0  state(state) current
+    upvar 0  state(read)  input
+    upvar 0  state(type)  type
+    upvar 0  state(value) value
+    upvar 0  state(pend)  pend
+    upvar 0  state(exact) exact
+    upvar 0  state(get)   get
+    set chan $state(chan)
+
+    #puts Parse/$current
+
+    if {!$exact} {
+	# Add all waiting characters to the buffer so that we can process as
+	# much as is possible in one go.
+	append input [read $chan]
+    } else {
+	# Exact reading. Usually one character, but when in the data
+	# section for a string value we know for how many characters
+	# we are looking for.
+
+	append input [read $chan $get]
+    }
+
+    # We got nothing, do nothing.
+    if {![string length $input]} return
+
+
+    if {$current eq "data"} {
+	# String data, this can be done faster, as we read longer
+	# sequences of characters for this.
+	set l [string length $input]
+	if {$l < $get} {
+	    # Not enough, wait for more.
+	    append value $input
+	    incr get -$l
+	    return
+	} elseif {$l == $get} {
+	    # Got all, exactly. Prepare state machine for next value.
+
+	    if {[Complete $token $value$input]} return
+
+	    set current intro
+	    set get 1
+	    set value ""
+	    set input ""
+
+	    return
+	} else {
+	    # Got more than required (only for !exact).
+
+	    incr get -1
+	    if {[Complete $token $value[string range $input 0 $get]]} {return}
+
+	    incr get
+	    set input [string range $input $get end]
+	    set get 1
+	    set value ""
+	    set current intro
+	    # This now falls into the loop below.
+	}
+    }
+
+    set where 0
+    set n [string length $input]
+
+    #puts Parse/$n
+
+    while {$where < $n} {
+	# Hardwired state machine. Get current character.
+	set ch [string index $input $where]
+
+	#puts Parse/@$where/$current/$ch/
+	if {$current eq "intro"} {
+	    # First character of a value.
+
+	    if {$ch eq "i"} {
+		# Begin reading integer.
+		set type    integer
+		set current signum
+	    } elseif {$ch eq "l"} {
+		# Begin a list.
+		set type list
+		lappend pend list {}
+		#set current intro
+
+	    } elseif {$ch eq "d"} {
+		# Begin a dictionary.
+		set type dict
+		lappend pend dict {}
+		#set current intro
+
+	    } elseif {$ch eq "e"} {
+		# Close a container. Throw an error if there is no
+		# container to close.
+
+		if {![llength $pend]} {
+		    return -code error "End of container outside of container."
+		}
+
+		set v    [lindex $pend end]
+		set t    [lindex $pend end-1]
+		set pend [lrange $pend 0 end-2]
+
+		if {$t eq "dict" && ([llength $v] % 2 == 1)} {
+		    return -code error "Dictionary has to be of even length"
+		}
+
+		if {[Complete $token $v]} {return}
+		set current intro
+
+	    } elseif {[string match {[0-9]} $ch]} {
+		# Begin reading a string, length section first.
+		set type    string
+		set current ldigit
+		set value   $ch
+
+	    } else {
+		# Unknown type. Throw error.
+		return -code error "Unknown bee-type \"$ch\""
+	    }
+
+	    # To next character.
+	    incr where
+	} elseif {$current eq "signum"} {
+	    # Integer number, a minus sign, or a digit.
+	    if {[string match {[-0-9]} $ch]} {
+		append value $ch
+		set current idigit
+	    } else {
+		return -code error "Syntax error in integer,\
+			expected sign or digit, got \"$ch\""
+	    }
+	    incr where
+
+	} elseif {$current eq "idigit"} {
+	    # Integer number, digit or closing 'e'.
+
+	    if {[string match {[-0-9]} $ch]} {
+		append value $ch
+	    } elseif {$ch eq "e"} {
+		# Integer closes. Validate and report.
+		#puts validate
+		if {
+		    [regexp {^-0+$} $value] ||
+		    ![string is integer -strict $value] ||
+		    (([string length $value] > 1) && [string match 0* $value])
+		} {
+		    return -code error "Expected integer number, got \"$value\""
+		}
+
+		if {[Complete $token $value]} {return}
+		set value ""
+		set current intro
+	    } else {
+		return -code error "Syntax error in integer,\
+			expected digit, or 'e', got \"$ch\""
+	    }
+	    incr where
+
+	} elseif {$current eq "ldigit"} {
+	    # String, length section, digit, or :
+
+	    if {[string match {[-0-9]} $ch]} {
+		append value $ch
+
+	    } elseif {$ch eq ":"} {
+		# Length section closes, validate,
+		# then perform data processing.
+
+		set num $value
+		if {
+		    [regexp {^-0+$} $num] ||
+		    ![string is integer -strict $num] ||
+		    (([string length $num] > 1) && [string match 0* $num])
+		} {
+		    return -code error "Expected integer number as string length, got \"$num\""
+		}
+
+		set value ""
+
+		# We may have already part of the data in
+		# memory. Process that piece before looking for more.
+
+		incr where
+		set have [expr {$n - $where}]
+		if {$num < $have} {
+		    # More than enough in the buffer.
+
+		    set  end $where
+		    incr end $num
+		    incr end -1
+
+		    if {[Complete $token [string range $input $where $end]]} {return}
+
+		    set where   $end ;# Further processing behind the string.
+		    set current intro
+
+		} elseif {$num == $have} {
+		    # Just enough. 
+
+		    if {[Complete $token [string range $input $where end]]} {return}
+
+		    set where   $n
+		    set current intro
+		} else {
+		    # Not enough. Initialize value with the data we
+		    # have (after the colon) and stop processing for
+		    # now.
+
+		    set value   [string range $input $where end]
+		    set current data
+		    set get     $num
+		    set input   ""
+		    return
+		}
+	    } else {
+		return -code error "Syntax error in string length,\
+			expected digit, or ':', got \"$ch\""
+	    }
+	    incr where
+	} else {
+	    # unknown state = internal error
+	    return -code error "Unknown decoder state \"$current\", internal error"
+	}
+    }
+
+    set input ""
+    return
+}
+
+# ::bee::Command --
+#
+#	Internal helper. Runs the decoder command callback.
+#
+# Arguments:
+#	token	The decoder invoking its callback
+#	how	Which method to invoke (value, error, eof)
+#	args	Arguments for the method.
+#
+# Results:
+#	A boolean flag. Set if further processing has to stop.
+
+proc ::bee::Command {token how args} {
+    variable $token
+    upvar 0  $token state
+
+    #puts Report/$token/$how/$args/
+
+    set cmd  $state(cmd)
+    set chan $state(chan)
+
+    # We catch the fileevents because they will fail when this is
+    # called from the 'Close'. The channel will already be gone in
+    # that case.
+
+    set stop 0
+    if {($how eq "error") || ($how eq "eof")} {
+	variable bee
+
+	set stop 1
+	fileevent $chan readable {}
+	unset bee($chan)
+	unset state
+
+	if {$how eq "eof"} {
+	    #puts \tclosing/$chan
+	    close $chan
+	}
+    }
+
+    lappend cmd $how $token
+    foreach a $args {lappend cmd $a}
+    uplevel #0 $cmd
+
+    if {![info exists state]} {
+	# The decoder token was killed by the callback, stop
+	# processing.
+	set stop 1
+    }
+
+    #puts /$stop/[file channels]
+    return $stop
+}
+
+# ::bee::Complete --
+#
+#	Internal helper. Reports a completed value.
+#
+# Arguments:
+#	token	The decoder reporting the value.
+#	value	The value to report.
+#
+# Results:
+#	A boolean flag. Set if further processing has to stop.
+
+proc ::bee::Complete {token value} {
+    variable $token
+    upvar 0  $token state
+    upvar 0   state(pend) pend
+
+    if {[llength $pend]} {
+	# The value is part of a container. Add the value to its end
+	# and keep processing.
+
+	set pend [lreplace $pend end end \
+		[linsert [lindex $pend end] end \
+		$value]]
+
+	# Don't stop.
+	return 0
+    }
+
+    # The value is at the top, report it. The callback determines if
+    # we keep processing.
+
+    return [Command $token value $value]
+}
+
+# ::bee::decodeCancel --
+#
+#	Destroys the decoder referenced by the token.
+#
+# Arguments:
+#	token	The decoder to destroy.
+#
+# Results:
+#	None.
+
+proc ::bee::decodeCancel {token} {
+    variable bee
+    variable $token
+    upvar 0  $token state
+    unset bee($state(chan))
+    unset state
+    return
+}
+
+# ::bee::decodePush --
+#
+#	Push data into the decoder input buffer.
+#
+# Arguments:
+#	token	The decoder to extend.
+#	string	The characters to add.
+#
+# Results:
+#	None.
+
+proc ::bee::decodePush {token string} {
+    variable $token
+    upvar 0  $token state
+    append state(read) $string
+    return
+}
+
+
+package provide bee 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bee/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bee/pkgIndex.tcl
new file mode 100644
index 00000000..e95dedfc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bee/pkgIndex.tcl
@@ -0,0 +1,4 @@
+# Tcl package index file, version 1.1
+
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded bee 0.1 [list source [file join $dir bee.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/bench.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/bench.tcl
new file mode 100644
index 00000000..461afbcf
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/bench.tcl
@@ -0,0 +1,553 @@
+# bench.tcl --
+#
+#	Management of benchmarks.
+#
+# Copyright (c) 2005-2008 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# library derived from runbench.tcl application (C) Jeff Hobbs.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: bench.tcl,v 1.14 2008/10/08 03:30:48 andreas_kupries Exp $
+
+# ### ### ### ######### ######### ######### ###########################
+## Requisites - Packages and namespace for the commands and data.
+
+package require Tcl 8.2
+package require logger
+package require csv
+package require struct::matrix
+package require report
+
+namespace eval ::bench      {}
+namespace eval ::bench::out {}
+
+# @mdgen OWNER: libbench.tcl
+
+# ### ### ### ######### ######### ######### ###########################
+## Public API - Benchmark execution
+
+# ::bench::run --
+#
+#	Run a series of benchmarks.
+#
+# Arguments:
+#	...
+#
+# Results:
+#	Dictionary.
+
+proc ::bench::run {args} {
+    log::debug [linsert $args 0 ::bench::run]
+
+    # -errors  0|1         default 1, propagate errors in benchmarks
+    # -threads <num>       default 0, no threads, #threads to use
+    # -match  <pattern>    only run tests matching this pattern
+    # -rmatch <pattern>    only run tests matching this pattern
+    # -iters  <num>        default 1000, max#iterations for any benchmark
+    # -pkgdir <dir>        Defaults to nothing, regular bench invokation.
+
+    # interps - dict (path -> version)
+    # files   - list (of files)
+
+    # Process arguments ......................................
+    # Defaults first, then overides by the user
+
+    set errors  1    ; # Propagate errors
+    set threads 0    ; # Do not use threads
+    set match   {}   ; # Do not exclude benchmarks based on glob pattern
+    set rmatch  {}   ; # Do not exclude benchmarks based on regex pattern
+    set iters   1000 ; # Limit #iterations for any benchmark
+    set pkgdirs {}   ; # List of dirs to put in front of auto_path in the
+                       # bench interpreters. Default: nothing.
+
+    while {[string match "-*" [set opt [lindex $args 0]]]} {
+	set val [lindex $args 1]
+	switch -exact -- $opt {
+	    -errors {
+		if {![string is boolean -strict $val]} {
+		    return -code error "Expected boolean, got \"$val\""
+		}
+		set errors $val
+	    }
+	    -threads {
+		if {![string is int -strict $val] || ($val < 0)} {
+		    return -code error "Expected int >= 0, got \"$val\""
+		}
+		set threads [lindex $args 1]
+	    }
+	    -match {
+		set match [lindex $args 1]
+	    }
+	    -rmatch {
+		set rmatch [lindex $args 1]
+	    }
+	    -iters {
+		if {![string is int -strict $val] || ($val <= 0)} {
+		    return -code error "Expected int > 0, got \"$val\""
+		}
+		set iters   [lindex $args 1]
+	    }
+	    -pkgdir {
+		CheckPkgDirArg  $val
+		lappend pkgdirs $val
+	    }
+	    default {
+		return -code error "Unknown option \"$opt\", should -errors, -threads, -match, -rmatch, or -iters"
+	    }
+	}
+	set args [lrange $args 2 end]
+    }
+    if {[llength $args] != 2} {
+	return -code error "wrong\#args, should be: ?options? interp files"
+    }
+    foreach {interps files} $args break
+
+    # Run the benchmarks .....................................
+
+    array set DATA {}
+
+    if {![llength $pkgdirs]} {
+	# No user specified package directories => Simple run.
+	foreach {ip ver} $interps {
+	    Invoke $ip $ver {} ;# DATA etc passed via upvar.
+	}
+    } else {
+	# User specified package directories.
+	foreach {ip ver} $interps {
+	    foreach pkgdir $pkgdirs {
+		Invoke $ip $ver $pkgdir ;# DATA etc passed via upvar.
+	    }
+	}
+    }
+
+    # Benchmark data ... Structure, dict (key -> value)
+    #
+    # Key          || Value
+    # ============ ++ =========================================
+    # interp IP    -> Version. Shell IP was used to run benchmarks. IP is
+    #                 the path to the shell.
+    #
+    # desc DESC    -> "". DESC is description of an executed benchmark.
+    #
+    # usec DESC IP -> Result. Result of benchmark DESC when run by the
+    #                 shell IP. Usually time in microseconds, but can be
+    #                 a special code as well (ERR, BAD_RES).
+    # ============ ++ =========================================
+
+    return [array get DATA]
+}
+
+# ::bench::locate --
+#
+#	Locate interpreters on the pathlist, based on a pattern.
+#
+# Arguments:
+#	...
+#
+# Results:
+#	List of paths.
+
+proc ::bench::locate {pattern paths} {
+    # Cache of executables already found.
+    array set var {}
+    set res {}
+
+    foreach path $paths {
+	foreach ip [glob -nocomplain [file join $path $pattern]] {
+	    if {[package vsatisfies [package provide Tcl] 8.4]} {
+		set ip [file normalize $ip]
+	    }
+
+	    # Follow soft-links to the actual executable.
+	    while {[string equal link [file type $ip]]} {
+		set link [file readlink $ip]
+		if {[string match relative [file pathtype $link]]} {
+		    set ip [file join [file dirname $ip] $link]
+		} else {
+		    set ip $link
+		}
+	    }
+
+	    if {
+		[file executable $ip] && ![info exists var($ip)]
+	    } {
+		if {[catch {exec $ip << "exit"} dummy]} {
+		    log::debug "$ip: $dummy"
+		    continue
+		}
+		set var($ip) .
+		lappend res $ip
+	    }
+	}
+    }
+
+    return $res
+}
+
+# ::bench::versions --
+#
+#	Take list of interpreters, find their versions.
+#	Removes all interps for which it cannot do so.
+#
+# Arguments:
+#	List of interpreters (paths)
+#
+# Results:
+#	dictionary: interpreter -> version.
+
+proc ::bench::versions {interps} {
+    set res {}
+    foreach ip $interps {
+	if {[catch {
+	    exec $ip << {puts [info patchlevel] ; exit}
+	} patchlevel]} {
+	    log::debug "$ip: $patchlevel"
+	    continue
+	}
+
+	lappend res [list $patchlevel $ip]
+    }
+
+    # -uniq 8.4-ism, replaced with use of array.
+    array set tmp {}
+    set resx {}
+    foreach item [lsort -dictionary -decreasing -index 0 $res] {
+	foreach {p ip} $item break
+	if {[info exists tmp($p)]} continue
+	set tmp($p) .
+	lappend resx $ip $p
+    }
+
+    return $resx
+}
+
+# ::bench::merge --
+#
+#	Take the data of several benchmark runs and merge them into
+#	one data set.
+#
+# Arguments:
+#	One or more data sets to merge
+#
+# Results:
+#	The merged data set.
+
+proc ::bench::merge {args} {
+    if {[llength $args] == 1} {
+	return [lindex $args 0]
+    }
+
+    array set DATA {}
+    foreach data $args {
+	array set DATA $data
+    }
+    return [array get DATA]
+}
+
+# ::bench::norm --
+#
+#	Normalize the time data in the dataset, using one of the
+#	columns as reference.
+#
+# Arguments:
+#	Data to normalize
+#	Index of reference column
+#
+# Results:
+#	The normalized data set.
+
+proc ::bench::norm {data col} {
+
+    if {![string is integer -strict $col]} {
+	return -code error "Ref.column: Expected integer, but got \"$col\""
+    }
+    if {$col < 1} {
+	return -code error "Ref.column out of bounds"
+    }
+
+    array set DATA $data
+    set ipkeys [array names DATA interp*]
+
+    if {$col > [llength $ipkeys]} {
+	return -code error "Ref.column out of bounds"
+    }
+    incr col -1
+    set refip [lindex [lindex [lsort -dict $ipkeys] $col] 1]
+
+    foreach key [array names DATA] {
+	if {[string match "desc*"   $key]} continue
+	if {[string match "interp*" $key]} continue
+
+	foreach {_ desc ip} $key break
+	if {[string equal $ip $refip]}      continue
+
+	set v $DATA($key)
+	if {![string is double -strict $v]} continue
+
+	if {![info exists DATA([list usec $desc $refip])]} {
+	    # We cannot normalize, we do not keep the time value.
+	    # The row will be shown, empty.
+	    set DATA($key) ""
+	    continue
+	}
+	set vref $DATA([list usec $desc $refip])
+
+	if {![string is double -strict $vref]} continue
+
+	set DATA($key) [expr {$v/double($vref)}]
+    }
+
+    foreach key [array names DATA [list * $refip]] {
+	if {![string is double -strict $DATA($key)]} continue
+	set DATA($key) 1
+    }
+
+    return [array get DATA]
+}
+
+# ::bench::edit --
+#
+#	Change the 'path' of an interp to a user-defined value.
+#
+# Arguments:
+#	Data to edit
+#	Index of column to change
+#	The value replacing the current path
+#
+# Results:
+#	The changed data set.
+
+proc ::bench::edit {data col new} {
+
+    if {![string is integer -strict $col]} {
+	return -code error "Ref.column: Expected integer, but got \"$col\""
+    }
+    if {$col < 1} {
+	return -code error "Ref.column out of bounds"
+    }
+
+    array set DATA $data
+    set ipkeys [array names DATA interp*]
+
+    if {$col > [llength $ipkeys]} {
+	return -code error "Ref.column out of bounds"
+    }
+    incr col -1
+    set refip [lindex [lindex [lsort -dict $ipkeys] $col] 1]
+
+    if {[string equal $new $refip]} {
+	# No change, quick return
+	return $data
+    }
+
+    set refkey [list interp $refip]
+    set DATA([list interp $new]) $DATA($refkey)
+    unset                         DATA($refkey)
+
+    foreach key [array names DATA [list * $refip]] {
+	if {![string equal [lindex $key 0] "usec"]} continue
+	foreach {__ desc ip} $key break
+	set DATA([list usec $desc $new]) $DATA($key)
+	unset                             DATA($key)
+    }
+
+    return [array get DATA]
+}
+
+# ::bench::del --
+#
+#	Remove the data for an interp.
+#
+# Arguments:
+#	Data to edit
+#	Index of column to remove
+#
+# Results:
+#	The changed data set.
+
+proc ::bench::del {data col} {
+
+    if {![string is integer -strict $col]} {
+	return -code error "Ref.column: Expected integer, but got \"$col\""
+    }
+    if {$col < 1} {
+	return -code error "Ref.column out of bounds"
+    }
+
+    array set DATA $data
+    set ipkeys [array names DATA interp*]
+
+    if {$col > [llength $ipkeys]} {
+	return -code error "Ref.column out of bounds"
+    }
+    incr col -1
+    set refip [lindex [lindex [lsort -dict $ipkeys] $col] 1]
+
+    unset DATA([list interp $refip])
+
+    # Do not use 'array unset'. Keep 8.2 clean.
+    foreach key [array names DATA [list * $refip]] {
+	if {![string equal [lindex $key 0] "usec"]} continue
+	unset DATA($key)
+    }
+
+    return [array get DATA]
+}
+
+# ### ### ### ######### ######### ######### ###########################
+## Public API - Result formatting.
+
+# ::bench::out::raw --
+#
+#	Format the result of a benchmark run.
+#	Style: Raw data.
+#
+# Arguments:
+#	DATA dict
+#
+# Results:
+#	String containing the formatted DATA.
+
+proc ::bench::out::raw {data} {
+    return $data
+}
+
+# ### ### ### ######### ######### ######### ###########################
+## Internal commands
+
+proc ::bench::CheckPkgDirArg {path {expected {}}} {
+    # Allow empty string, special.
+    if {![string length $path]} return
+
+    if {![file isdirectory $path]} {
+	return -code error \
+	    "The path \"$path\" is not a directory."
+    }
+    if {![file readable $path]} {
+	return -code error \
+	    "The path \"$path\" is not readable."
+    }
+}
+
+proc ::bench::Invoke {ip ver pkgdir} {
+    variable self
+    # Import remainder of the current configuration/settings.
+
+    upvar 1 DATA DATA match match rmatch rmatch \
+	iters iters errors errors threads threads \
+	files files
+
+    if {[string length $pkgdir]} {
+	log::info "Benchmark $ver ($pkgdir) $ip"
+	set idstr "$ip ($pkgdir)"
+    } else {
+	log::info "Benchmark $ver $ip"
+	set idstr $ip
+    }
+
+    set DATA([list interp $idstr]) $ver
+
+    set cmd [list $ip [file join $self libbench.tcl] \
+		 -match   $match   \
+		 -rmatch  $rmatch  \
+		 -iters   $iters   \
+		 -interp  $ip      \
+		 -errors  $errors  \
+		 -threads $threads \
+		 -pkgdir  $pkgdir  \
+		]
+
+    # Determine elapsed time per file, logged.
+    set start [clock seconds]
+
+    array set tmp {}
+
+    if {$threads} {
+	foreach f $files { lappend cmd $f }
+	if {[catch {
+	    close [Process [open |$cmd r+]]
+	} output]} {
+	    if {$errors} {
+		error $::errorInfo
+	    }
+	}
+    } else {
+	foreach file $files {
+	    log::info [file tail $file]
+	    if {[catch {
+		close [Process [open |[linsert $cmd end $file] r+]]
+	    } output]} {
+		if {$errors} {
+		    error $::errorInfo
+		} else {
+		    continue
+		}
+	    }
+	}
+    }
+
+    foreach desc [array names tmp] {
+	set DATA([list desc $desc]) {}
+	set DATA([list usec $desc $idstr]) $tmp($desc)
+    }
+
+    unset tmp
+    set elapsed [expr {[clock seconds] - $start}]
+
+    set hour [expr {$elapsed / 3600}]
+    set min  [expr {$elapsed / 60}]
+    set sec  [expr {$elapsed % 60}]
+    log::info " [format %.2d:%.2d:%.2d $hour $min $sec] elapsed"
+    return
+}
+
+
+proc ::bench::Process {pipe} {
+    while {1} {
+	if {[eof  $pipe]} break
+	if {[gets $pipe line] < 0} break
+	# AK: FUTURE: Log all lines?!
+	#puts |$line|
+	set line [string trim $line]
+	if {[string equal $line ""]} continue
+
+	Result
+	Feedback
+	# Unknown lines are printed. Future: Callback?!
+	log::info $line
+    }
+    return $pipe
+}
+
+proc ::bench::Result {} {
+    upvar 1 line line
+    if {[lindex $line 0] ne "RESULT"} return
+    upvar 2 tmp tmp
+    foreach {_ desc result} $line break
+    set tmp($desc) $result
+    return -code continue
+}
+
+proc ::bench::Feedback {} {
+    upvar 1 line line
+    if {[lindex $line 0] ne "LOG"} return
+    # AK: Future - Run through callback?!
+    log::info [lindex $line 1]
+    return -code continue
+}
+
+# ### ### ### ######### ######### ######### ###########################
+## Initialize internal data structures.
+
+namespace eval ::bench {
+    variable self [file join [pwd] [file dirname [info script]]]
+
+    logger::init bench
+    logger::import -force -all -namespace log bench
+}
+
+# ### ### ### ######### ######### ######### ###########################
+## Ready to run
+
+package provide bench 0.4
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/bench_read.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/bench_read.tcl
new file mode 100644
index 00000000..7cebb7bd
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/bench_read.tcl
@@ -0,0 +1,162 @@
+# bench_read.tcl --
+#
+#	Management of benchmarks, reading results in various formats.
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# library derived from runbench.tcl application (C) Jeff Hobbs.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: bench_read.tcl,v 1.3 2006/06/13 23:20:30 andreas_kupries Exp $
+
+# ### ### ### ######### ######### ######### ###########################
+## Requisites - Packages and namespace for the commands and data.
+
+package require Tcl 8.2
+package require csv
+
+namespace eval ::bench::in {}
+
+# ### ### ### ######### ######### ######### ###########################
+## Public API - Result reading
+
+# ::bench::in::read --
+#
+#	Read a bench result in any of the raw/csv/text formats
+#
+# Arguments:
+#	path to file to read
+#
+# Results:
+#	DATA dictionary, internal representation of the bench results.
+
+proc ::bench::in::read {file} {
+
+    set f [open $file r]
+    set head [gets $f]
+
+    if {![string match "# -\\*- tcl -\\*- bench/*" $head]} {
+	return -code error "Bad file format, not a benchmark file"
+    } else {
+	regexp {bench/(.*)$} $head -> format
+
+	switch -exact -- $format {
+	    raw - csv - text {
+		set res [RD$format $f]
+	    }
+	    default {
+		return -code error "Bad format \"$val\", expected text, csv, or raw"
+	    }
+	}
+    }
+    close $f
+    return $res
+}
+
+# ### ### ### ######### ######### ######### ###########################
+## Internal commands
+
+proc ::bench::in::RDraw {chan} {
+    return [string trimright [::read $chan]]
+}
+
+proc ::bench::in::RDcsv {chan} {
+    # Lines                                     Format
+    # First line is number of interpreters #n.  int
+    # Next to 1+n is interpreter data.          id,ver,path
+    # Beyond is benchmark results.              id,desc,res1,...,res#n
+
+    array set DATA {}
+
+    # #Interp ...
+
+    set nip [lindex [csv::split [gets $chan]] 0]
+
+    # Interp data ...
+
+    set iplist {}
+    for {set i 0} {$i < $nip} {incr i} {
+	foreach {__ ver ip} [csv::split [gets $chan]] break
+
+	set DATA([list interp $ip]) $ver
+	lappend iplist $ip
+    }
+
+    # Benchmark data ...
+
+    while {[gets $chan line] >= 0} {
+	set line [string trim $line]
+	if {$line == {}} break
+	set line [csv::split $line]
+	set desc [lindex $line 1]
+
+	set DATA([list desc $desc]) {}
+	foreach val [lrange $line 2 end] ip $iplist {
+	    if {$val == {}} continue
+	    set DATA([list usec $desc $ip]) $val
+	}
+    }
+
+    return [array get DATA]
+}
+
+proc ::bench::in::RDtext {chan} {
+    array set DATA {}
+
+    # Interp data ...
+
+    # Empty line     - ignore
+    # "id: ver path" - interp data.
+    # Empty line     - separator before benchmark data.
+
+    set n 0
+    set iplist {}
+    while {[gets $chan line] >= 0} {
+	set line [string trim $line]
+	if {$line == {}} {
+	    incr n
+	    if {$n == 2} break
+	    continue
+	}
+
+	regexp {[^:]+: ([^ ]+) (.*)$} $line -> ver ip
+	set DATA([list interp $ip]) $ver
+	lappend iplist $ip
+    }
+
+    # Benchmark data ...
+
+    # '---' -> Ignore.
+    # '|' column separators. Remove spaces around it. Then treat line
+    # as CSV data with a particular separator.
+    # Ignore the INTERP line.
+
+    while {[gets $chan line] >= 0} {
+	set line [string trim $line]
+	if {$line == {}}                     continue
+	if {[string match "+---*"    $line]} continue
+	if {[string match "*INTERP*" $line]} continue
+
+	regsub -all "\\| +" $line {|} line
+	regsub -all " +\\|" $line {|} line
+	set line [csv::split [string trim $line |] |]
+	set desc [lindex $line 1]
+
+	set DATA([list desc $desc]) {}
+	foreach val [lrange $line 2 end] ip $iplist {
+	    if {$val == {}} continue
+	    set DATA([list usec $desc $ip]) $val
+	}
+    }
+
+    return [array get DATA]
+}
+
+# ### ### ### ######### ######### ######### ###########################
+## Initialize internal data structures.
+
+# ### ### ### ######### ######### ######### ###########################
+## Ready to run
+
+package provide bench::in 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/bench_wcsv.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/bench_wcsv.tcl
new file mode 100644
index 00000000..cb3d4c59
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/bench_wcsv.tcl
@@ -0,0 +1,101 @@
+# bench_wtext.tcl --
+#
+#	Management of benchmarks, formatted text.
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# library derived from runbench.tcl application (C) Jeff Hobbs.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: bench_wcsv.tcl,v 1.4 2007/01/21 23:29:06 andreas_kupries Exp $
+
+# ### ### ### ######### ######### ######### ###########################
+## Requisites - Packages and namespace for the commands and data.
+
+package require Tcl 8.2
+package require csv
+
+namespace eval ::bench::out {}
+
+# ### ### ### ######### ######### ######### ###########################
+## Public API - Benchmark execution
+
+# ### ### ### ######### ######### ######### ###########################
+## Public API - Result formatting.
+
+# ::bench::out::csv --
+#
+#	Format the result of a benchmark run.
+#	Style: CSV
+#
+# Arguments:
+#	DATA dict
+#
+# Results:
+#	String containing the formatted DATA.
+
+proc ::bench::out::csv {data} {
+    array set DATA $data
+    set CSV {}
+
+    # 1st record:              #shells
+    # 2nd record to #shells+1: Interpreter data (id, version, path)
+    # #shells+2 to end:        Benchmark data (id,desc,result1,...,result#shells)
+
+    # --- --- ----
+    # #interpreters used
+
+    set ipkeys [array names DATA interp*]
+    lappend CSV [csv::join [list [llength $ipkeys]]]
+
+    # --- --- ----
+    # Table 1: Interpreter information.
+
+    set n 1
+    set iplist {}
+    foreach key [lsort -dict $ipkeys] {
+	set ip [lindex $key 1]
+	lappend CSV [csv::join [list $n $DATA($key) $ip]]
+	set DATA($key) $n
+	incr n
+	lappend iplist $ip
+    }
+
+    # --- --- ----
+    # Table 2: Benchmark information
+
+    set dlist {}
+    foreach key [lsort -dict -index 1 [array names DATA desc*]] {
+	lappend dlist [lindex $key 1]
+    }
+
+    set n 1
+    foreach desc $dlist { 
+	set record {}
+	lappend record $n
+	lappend record $desc
+	foreach ip $iplist {
+	    if {[catch {
+		lappend record $DATA([list usec $desc $ip])
+	    }]} {
+		lappend record {}
+	    }
+	}
+	lappend CSV [csv::join $record]
+	incr n
+    }
+
+    return [join $CSV \n]
+}
+
+# ### ### ### ######### ######### ######### ###########################
+## Internal commands
+
+# ### ### ### ######### ######### ######### ###########################
+## Initialize internal data structures.
+
+# ### ### ### ######### ######### ######### ###########################
+## Ready to run
+
+package provide bench::out::csv 0.1.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/bench_wtext.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/bench_wtext.tcl
new file mode 100644
index 00000000..aaa4100a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/bench_wtext.tcl
@@ -0,0 +1,165 @@
+# bench_wtext.tcl --
+#
+#	Management of benchmarks, formatted text.
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# library derived from runbench.tcl application (C) Jeff Hobbs.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: bench_wtext.tcl,v 1.4 2007/01/21 23:29:06 andreas_kupries Exp $
+
+# ### ### ### ######### ######### ######### ###########################
+## Requisites - Packages and namespace for the commands and data.
+
+package require Tcl 8.2
+package require struct::matrix
+package require report
+
+namespace eval ::bench::out {}
+
+# ### ### ### ######### ######### ######### ###########################
+## Public API - Result formatting.
+
+# ::bench::out::text --
+#
+#	Format the result of a benchmark run.
+#	Style: TEXT
+#
+#	General structure like CSV, but nicely formatted and aligned
+#	columns.
+#
+# Arguments:
+#	DATA dict
+#
+# Results:
+#	String containing the formatted DATA.
+
+proc ::bench::out::text {data} {
+    array set DATA $data
+    set LINES {}
+
+    # 1st line to #shells: Interpreter data (id, version, path)
+    # #shells+1 to end:    Benchmark data (id,desc,result1,...,result#shells)
+
+    lappend LINES {}
+
+    # --- --- ----
+    # Table 1: Interpreter information.
+
+    set ipkeys [array names DATA interp*]
+    set n 1
+    set iplist {}
+    set vlen 0
+    foreach key [lsort -dict $ipkeys] {
+	lappend iplist [lindex $key 1]
+	incr n
+	set l [string length $DATA($key)]
+	if {$l > $vlen} {set vlen $l}
+    }
+    set idlen [string length $n]
+
+    set dlist {}
+    set n 1
+    foreach key [lsort -dict -index 1 [array names DATA desc*]] {
+	lappend dlist [lindex $key 1]
+	incr n
+    }
+    set didlen [string length $n]
+
+    set n 1
+    set record [list "" INTERP]
+    foreach ip $iplist {
+	set v $DATA([list interp $ip])
+	lappend LINES " [PADL $idlen $n]: [PADR $vlen $v] $ip"
+	lappend record $n
+	incr n
+    }
+
+    lappend LINES {}
+
+    # --- --- ----
+    # Table 2: Benchmark information
+
+    set m [struct::matrix m]
+    $m add columns [expr {2 + [llength $iplist]}]
+    $m add row $record
+
+    set n 1
+    foreach desc $dlist { 
+	set     record [list $n]
+	lappend record $desc
+
+	foreach ip $iplist {
+	    if {[catch {
+		set val $DATA([list usec $desc $ip])
+	    }]} {
+		set val {}
+	    }
+	    if {[string is double -strict $val]} {
+		lappend record [format %.2f $val]
+	    } else {
+		lappend record [format %s   $val]
+	    }
+	}
+	$m add row $record
+	incr n
+    }
+
+    ::report::defstyle simpletable {} {
+	data	set [split "[string repeat "| "   [columns]]|"]
+	top	set [split "[string repeat "+ - " [columns]]+"]
+	bottom	set [top get]
+	top	enable
+	bottom	enable
+
+	set c [columns]
+	justify 0 right
+	pad 0 both
+
+	if {$c > 1} {
+	    justify 1 left
+	    pad 1 both
+	}
+	for {set i 2} {$i < $c} {incr i} {
+	    justify $i right
+	    pad $i both
+	}
+    }
+    ::report::defstyle captionedtable {{n 1}} {
+	simpletable
+	topdata   set [data get]
+	topcapsep set [top get]
+	topcapsep enable
+	tcaption $n
+    }
+
+    set r [report::report r [$m columns] style captionedtable]
+    lappend LINES [$m format 2string $r]
+    $m destroy
+    $r destroy
+
+    return [join $LINES \n]
+}
+
+# ### ### ### ######### ######### ######### ###########################
+## Internal commands
+
+proc ::bench::out::PADL {max str} {
+    format "%${max}s" $str
+    #return "[PAD $max $str]$str"
+}
+
+proc ::bench::out::PADR {max str} {
+    format "%-${max}s" $str
+    #return "$str[PAD $max $str]"
+}
+
+# ### ### ### ######### ######### ######### ###########################
+## Initialize internal data structures.
+
+# ### ### ### ######### ######### ######### ###########################
+## Ready to run
+
+package provide bench::out::text 0.1.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/libbench.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/libbench.tcl
new file mode 100644
index 00000000..ebf9f716
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/libbench.tcl
@@ -0,0 +1,561 @@
+# -*- tcl -*-
+# libbench.tcl ?(<option> <value>)...? <benchFile>...
+#
+# This file has to have code that works in any version of Tcl that
+# the user would want to benchmark.
+#
+# RCS: @(#) $Id: libbench.tcl,v 1.4 2008/07/02 23:34:06 andreas_kupries Exp $
+#
+# Copyright (c) 2000-2001 Jeffrey Hobbs.
+# Copyright (c) 2007      Andreas Kupries
+#
+
+# This code provides the supporting commands for the execution of a
+# benchmark files. It is actually an application and is exec'd by the
+# management code.
+
+# Options:
+# -help				Print usage message.
+# -rmatch <regexp-pattern>	Run only tests whose description matches the pattern.
+# -match  <glob-pattern>	Run only tests whose description matches the pattern.
+# -interp <name>		Name of the interp running the benchmarks.
+# -thread <num>                 Invoke threaded benchmarks, number of threads to use.
+# -errors <boolean>             Throw errors, or not.
+
+# Note: If both -match and -rmatch are specified then _both_
+# apply. I.e. a benchmark will be run if and only if it matches both
+# patterns.
+
+# Application activity and results are communicated to the highlevel
+# management via text written to stdout. Each line written is a list
+# and has one of the following forms:
+#
+# __THREADED <version>     - Indicates threaded mode, and version
+#                            of package Thread in use.
+#
+# Sourcing {<desc>: <res>} - Benchmark <desc> has started.
+#                            <res> is the result from executing
+#                            it once (compilation of body.)
+#
+# Sourcing <file>          - Benchmark file <file> starts execution.
+#
+# <desc> <res>             - Result of a benchmark.
+#
+# The above implies that no benchmark may use the strings 'Sourcing'
+# or '__THREADED' as their description.
+
+# We will put our data into these named globals.
+
+global BENCH bench
+
+# 'BENCH' contents:
+#
+# - ERRORS  : Boolean flag. If set benchmark output mismatches are
+#             reported by throwing an error. Otherwise they are simply
+#             listed as BAD_RES. Default true. Can be set/reset via
+#             option -errors.
+#
+# - MATCH   : Match pattern, see -match, default empty, aka everything
+#             matches.
+#
+# - RMATCH  : Match pattern, see -rmatch, default empty, aka
+#             everything matches.
+#
+# - OUTFILE : Name of output file, default is special value "stdout".
+# - OUTFID  : Channel for output.
+#
+# The outfile cannot be set by the caller, thus output is always
+# written to stdout.
+#
+# - FILES   : List of benchmark files to run.
+#
+# - ITERS   : Number of iterations to run a benchmark body, default
+#             1000. Can be overridden by the individual benchmarks.
+#
+# - THREADS : Number of threads to use. 0 signals no threading.
+#             Limited to number of files if there are less files than
+#             requested threads.
+#
+# - EXIT    : Boolean flag. True when appplication is run by wish, for
+#             special exit processing. ... Actually always true.
+#
+# - INTERP  : Name of the interpreter running the benchmarks. Is the
+#             executable running this code. Can be overridden via the
+#             command line option -interp.
+#
+# - uniqid  : Counter for 'bench_tmpfile' to generate unique names of
+#             tmp files.
+#
+# - us      : Thread id of main thread.
+#
+# - inuse   : Number of threads active, present and relevant only in
+#             threaded mode.
+#
+# - file    : Currently executed benchmark file. Relevant only in
+#             non-threaded mode.
+
+#
+# 'bench' contents.
+
+# Benchmark results, mapping from the benchmark descriptions to their
+# results. Usually time in microseconds, but the following special
+# values can occur:
+#
+# - BAD_RES    - Result from benchmark body does not match expectations.
+# - ERR        - Benchmark body aborted with an error.
+# - Any string - Forced by error code 666 to pass to management.
+
+#
+# We claim all procedures starting with bench*
+#
+
+# bench_tmpfile --
+#
+#   Return a temp file name that can be modified at will
+#
+# Arguments:
+#   None
+#
+# Results:
+#   Returns file name
+#
+proc bench_tmpfile {} {
+    global tcl_platform env BENCH
+    if {![info exists BENCH(uniqid)]} { set BENCH(uniqid) 0 }
+    set base "tclbench[incr BENCH(uniqid)].dat"
+    if {[info exists tcl_platform(platform)]} {
+	if {$tcl_platform(platform) == "unix"} {
+	    return "/tmp/$base"
+	} elseif {$tcl_platform(platform) == "windows"} {
+	    return [file join $env(TEMP) $base]
+	} else {
+	    return $base
+	}
+    } else {
+	# The Good Ol' Days (?) when only Unix support existed
+	return "/tmp/$base"
+    }
+}
+
+# bench_rm --
+#
+#   Remove a file silently (no complaining)
+#
+# Arguments:
+#   args	Files to delete
+#
+# Results:
+#   Returns nothing
+#
+proc bench_rm {args} {
+    foreach file $args {
+	if {[info tclversion] > 7.4} {
+	    catch {file delete $file}
+	} else {
+	    catch {exec /bin/rm $file}
+	}
+    }
+}
+
+proc bench_puts {args} {
+    eval [linsert $args 0 FEEDBACK]
+    return
+}
+
+# bench --
+#
+#   Main bench procedure.
+#   The bench test is expected to exit cleanly.  If an error occurs,
+#   it will be thrown all the way up.  A bench proc may return the
+#   special code 666, which says take the string as the bench value.
+#   This is usually used for N/A feature situations.
+#
+# Arguments:
+#
+#   -pre	script to run before main timed body
+#   -body	script to run as main timed body
+#   -post	script to run after main timed body
+#   -ipre	script to run before timed body, per iteration of the body.
+#   -ipost	script to run after timed body, per iteration of the body.
+#   -desc	message text
+#   -iterations	<#>
+#
+# Note:
+#
+#   Using -ipre and/or -ipost will cause us to compute the average
+#   time ourselves, i.e. 'time body 1' n times. Required to ensure
+#   that prefix/post operation are executed, yet not timed themselves.
+#
+# Results:
+#
+#   Returns nothing
+#
+# Side effects:
+#
+#   Sets up data in bench global array
+#
+proc bench {args} {
+    global BENCH bench errorInfo errorCode
+
+    # -pre script
+    # -body script
+    # -desc msg
+    # -post script
+    # -ipre script
+    # -ipost script
+    # -iterations <#>
+    array set opts {
+	-pre	{}
+	-body	{}
+	-desc	{}
+	-post	{}
+	-ipre	{}
+	-ipost	{}
+    }
+    set opts(-iter) $BENCH(ITERS)
+    while {[llength $args]} {
+	set key [lindex $args 0]
+	switch -glob -- $key {
+	    -res*	{ set opts(-res)  [lindex $args 1] }
+	    -pr*	{ set opts(-pre)  [lindex $args 1] }
+	    -po*	{ set opts(-post) [lindex $args 1] }
+	    -ipr*	{ set opts(-ipre)  [lindex $args 1] }
+	    -ipo*	{ set opts(-ipost) [lindex $args 1] }
+	    -bo*	{ set opts(-body) [lindex $args 1] }
+	    -de*	{ set opts(-desc) [lindex $args 1] }
+	    -it*	{
+		# Only change the iterations when it is smaller than
+		# the requested default
+		set val [lindex $args 1]
+		if {$opts(-iter) > $val} { set opts(-iter) $val }
+	    }
+	    default {
+		error "unknown option $key"
+	    }
+	}
+	set args [lreplace $args 0 1]
+    }
+
+    FEEDBACK "Running <$opts(-desc)>"
+
+    if {($BENCH(MATCH) != "") && ![string match $BENCH(MATCH) $opts(-desc)]} {
+	return
+    }
+    if {($BENCH(RMATCH) != "") && ![regexp $BENCH(RMATCH) $opts(-desc)]} {
+	return
+    }
+    if {$opts(-pre) != ""} {
+	uplevel \#0 $opts(-pre)
+    }
+    if {$opts(-body) != ""} {
+	# always run it once to remove compile phase confusion
+	if {$opts(-ipre) != ""} {
+	    uplevel \#0 $opts(-ipre)
+	}
+	set code [catch {uplevel \#0 $opts(-body)} res]
+	if {$opts(-ipost) != ""} {
+	    uplevel \#0 $opts(-ipost)
+	}
+	if {!$code && [info exists opts(-res)] \
+		&& [string compare $opts(-res) $res]} {
+	    if {$BENCH(ERRORS)} {
+		return -code error "Result was:\n$res\nResult\
+			should have been:\n$opts(-res)"
+	    } else {
+		set res "BAD_RES"
+	    }
+	    #set bench($opts(-desc)) $res
+	    RESULT $opts(-desc) $res
+	} else {
+	    if {($opts(-ipre) != "") || ($opts(-ipost) != "")} {
+		# We do the averaging on our own, to allow untimed
+		# pre/post execution per iteration. We catch and
+		# handle problems in the pre/post code as if
+		# everything was executed as one block (like it would
+		# be in the other path). We are using floating point
+		# to avoid integer overflow, easily happening when
+		# accumulating a high number (iterations) of large
+		# integers (microseconds).
+
+		set total 0.0
+		for {set i 0} {$i < $opts(-iter)} {incr i} {
+		    set code 0
+		    if {$opts(-ipre) != ""} {
+			set code [catch {uplevel \#0 $opts(-ipre)} res]
+			if {$code} break
+		    }
+		    set code [catch {uplevel \#0 [list time $opts(-body) 1]} res]
+		    if {$code} break
+		    set total [expr {$total + [lindex $res 0]}]
+		    if {$opts(-ipost) != ""} {
+			set code [catch {uplevel \#0 $opts(-ipost)} res]
+			if {$code} break
+		    }
+		}
+		if {!$code} {
+		    set res [list [expr {int ($total/$opts(-iter))}] microseconds per iteration]
+		}
+	    } else {
+		set code [catch {uplevel \#0 \
+			[list time $opts(-body) $opts(-iter)]} res]
+	    }
+	    if {!$BENCH(THREADS)} {
+		if {$code == 0} {
+		    # Get just the microseconds value from the time result
+		    set res [lindex $res 0]
+		} elseif {$code != 666} {
+		    # A 666 result code means pass it through to the bench
+		    # suite. Otherwise throw errors all the way out, unless
+		    # we specified not to throw errors (option -errors 0 to
+		    # libbench).
+		    if {$BENCH(ERRORS)} {
+			return -code $code -errorinfo $errorInfo \
+				-errorcode $errorCode
+		    } else {
+			set res "ERR"
+		    }
+		}
+		#set bench($opts(-desc)) $res
+		RESULT $opts(-desc) $res
+	    } else {
+		# Threaded runs report back asynchronously
+		thread::send $BENCH(us) \
+			[list thread_report $opts(-desc) $code $res]
+	    }
+	}
+    }
+    if {($opts(-post) != "") && [catch {uplevel \#0 $opts(-post)} err] \
+	    && $BENCH(ERRORS)} {
+	return -code error "post code threw error:\n$err"
+    }
+    return
+}
+
+proc RESULT {desc time} {
+    global BENCH
+    puts $BENCH(OUTFID) [list RESULT $desc $time]
+    return
+}
+
+proc FEEDBACK {text} {
+    global BENCH
+    puts $BENCH(OUTFID) [list LOG $text]
+    return
+}
+
+
+proc usage {} {
+    set me [file tail [info script]]
+    puts stderr "Usage: $me ?options?\
+	    \n\t-help			# print out this message\
+	    \n\t-rmatch <regexp>	# only run tests matching this pattern\
+	    \n\t-match <glob>		# only run tests matching this pattern\
+	    \n\t-interp	<name>		# name of interp (tries to get it right)\
+	    \n\t-thread	<num>		# number of threads to use\
+	    \n\tfileList		# files to benchmark"
+    exit 1
+}
+
+#
+# Process args
+#
+if {[catch {set BENCH(INTERP) [info nameofexec]}]} {
+    set BENCH(INTERP) $argv0
+}
+foreach {var val} {
+	ERRORS		1
+	MATCH		{}
+	RMATCH		{}
+	OUTFILE		stdout
+	FILES		{}
+	ITERS		1000
+	THREADS		0
+        PKGDIR          {}
+	EXIT		"[info exists tk_version]"
+} {
+    if {![info exists BENCH($var)]} {
+	set BENCH($var) [subst $val]
+    }
+}
+set BENCH(EXIT) 1
+
+if {[llength $argv]} {
+    while {[llength $argv]} {
+	set key [lindex $argv 0]
+	switch -glob -- $key {
+	    -help*	{ usage }
+	    -err*	{ set BENCH(ERRORS)  [lindex $argv 1] }
+	    -int*	{ set BENCH(INTERP)  [lindex $argv 1] }
+	    -rmat*	{ set BENCH(RMATCH)  [lindex $argv 1] }
+	    -mat*	{ set BENCH(MATCH)   [lindex $argv 1] }
+	    -iter*	{ set BENCH(ITERS)   [lindex $argv 1] }
+	    -thr*	{ set BENCH(THREADS) [lindex $argv 1] }
+            -pkg*       { set BENCH(PKGDIR)  [lindex $argv 1] }
+	    default {
+		foreach arg $argv {
+		    if {![file exists $arg]} { usage }
+		    lappend BENCH(FILES) $arg
+		}
+		break
+	    }
+	}
+	set argv [lreplace $argv 0 1]
+    }
+}
+
+if {[string length $BENCH(PKGDIR)]} {
+    set auto_path [linsert $auto_path 0 $BENCH(PKGDIR)]
+}
+
+if {$BENCH(THREADS)} {
+    # We have to be able to load threads if we want to use threads, and
+    # we don't want to create more threads than we have files.
+    if {[catch {package require Thread}]} {
+	set BENCH(THREADS) 0
+    } elseif {[llength $BENCH(FILES)] < $BENCH(THREADS)} {
+	set BENCH(THREADS) [llength $BENCH(FILES)]
+    }
+}
+
+rename exit exit.true
+proc exit args {
+    error "called \"exit $args\" in benchmark test"
+}
+
+if {[string compare $BENCH(OUTFILE) stdout]} {
+    set BENCH(OUTFID) [open $BENCH(OUTFILE) w]
+} else {
+    set BENCH(OUTFID) stdout
+}
+
+#
+# Everything that gets output must be in pairwise format, because
+# the data will be collected in via an 'array set'.
+#
+
+if {$BENCH(THREADS)} {
+    # Each file must run in it's own thread because of all the extra
+    # header stuff they have.
+    #set DEBUG 1
+    proc thread_one {{id 0}} {
+	global BENCH
+	set file [lindex $BENCH(FILES) 0]
+	set BENCH(FILES) [lrange $BENCH(FILES) 1 end]
+	if {[file exists $file]} {
+	    incr BENCH(inuse)
+	    FEEDBACK [list Sourcing $file]
+	    if {$id} {
+		set them $id
+	    } else {
+		set them [thread::create]
+		thread::send -async $them { load {} Thread }
+		thread::send -async $them \
+			[list array set BENCH [array get BENCH]]
+		thread::send -async $them \
+			[list proc bench_tmpfile {} [info body bench_tmpfile]]
+		thread::send -async $them \
+			[list proc bench_rm {args} [info body bench_rm]]
+		thread::send -async $them \
+			[list proc bench {args} [info body bench]]
+	    }
+	    if {[info exists ::DEBUG]} {
+		FEEDBACK "SEND [clock seconds] thread $them $file INUSE\
+		$BENCH(inuse) of $BENCH(THREADS)"
+	    }
+	    thread::send -async $them [list source $file]
+	    thread::send -async $them \
+		    [list thread::send $BENCH(us) [list thread_ready $them]]
+	    #thread::send -async $them { thread::unwind }
+	}
+    }
+
+    proc thread_em {} {
+	global BENCH
+	while {[llength $BENCH(FILES)]} {
+	    if {[info exists ::DEBUG]} {
+		FEEDBACK "THREAD ONE [lindex $BENCH(FILES) 0]"
+	    }
+	    thread_one
+	    if {$BENCH(inuse) >= $BENCH(THREADS)} {
+		break
+	    }
+	}
+    }
+
+    proc thread_ready {id} {
+	global BENCH
+
+	incr BENCH(inuse) -1
+	if {[llength $BENCH(FILES)]} {
+	    if {[info exists ::DEBUG]} {
+		FEEDBACK "SEND ONE [clock seconds] thread $id"
+	    }
+	    thread_one $id
+	} else {
+	    if {[info exists ::DEBUG]} {
+		FEEDBACK "UNWIND thread $id"
+	    }
+	    thread::send -async $id { thread::unwind }
+	}
+    }
+
+    proc thread_report {desc code res} {
+	global BENCH bench errorInfo errorCode
+
+	if {$code == 0} {
+	    # Get just the microseconds value from the time result
+	    set res [lindex $res 0]
+	} elseif {$code != 666} {
+	    # A 666 result code means pass it through to the bench suite.
+	    # Otherwise throw errors all the way out, unless we specified
+	    # not to throw errors (option -errors 0 to libbench).
+	    if {$BENCH(ERRORS)} {
+		return -code $code -errorinfo $errorInfo \
+			-errorcode $errorCode
+	    } else {
+		set res "ERR"
+	    }
+	}
+	#set bench($desc) $res
+	RESULT $desc $res
+    }
+
+    proc thread_finish {{delay 4000}} {
+	global BENCH bench
+	set val [expr {[llength [thread::names]] > 1}]
+	#set val [expr {$BENCH(inuse)}]
+	if {$val} {
+	    after $delay [info level 0]
+	} else {
+	    if {0} {foreach desc [array names bench] {
+		RESULT $desc $bench($desc)
+	    }}
+	    if {$BENCH(EXIT)} {
+		exit.true ; # needed for Tk tests
+	    }
+	}
+    }
+
+    set BENCH(us) [thread::id]
+    set BENCH(inuse) 0 ; # num threads in use
+    FEEDBACK [list __THREADED [package provide Thread]]
+
+    thread_em
+    thread_finish
+    vwait forever
+} else {
+    foreach BENCH(file) $BENCH(FILES) {
+	if {[file exists $BENCH(file)]} {
+	    FEEDBACK [list Sourcing $BENCH(file)]
+	    source $BENCH(file)
+	}
+    }
+
+    if {0} {foreach desc [array names bench] {
+	RESULT $desc $bench($desc)
+    }}
+
+    if {$BENCH(EXIT)} {
+	exit.true ; # needed for Tk tests
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/pkgIndex.tcl
new file mode 100644
index 00000000..e9b25f90
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bench/pkgIndex.tcl
@@ -0,0 +1,7 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {
+    return
+}
+package ifneeded bench            0.4 [list source [file join $dir bench.tcl]]
+package ifneeded bench::out::text 0.1.2 [list source [file join $dir bench_wtext.tcl]]
+package ifneeded bench::out::csv  0.1.2 [list source [file join $dir bench_wcsv.tcl]]
+package ifneeded bench::in        0.1   [list source [file join $dir bench_read.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bibtex/bibtex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bibtex/bibtex.tcl
new file mode 100644
index 00000000..ecc46d96
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bibtex/bibtex.tcl
@@ -0,0 +1,501 @@
+#####
+#
+# "BibTeX parser"
+# http://wiki.tcl.tk/13719
+#
+# Tcl code harvested on:   7 Mar 2005, 23:55 GMT
+# Wiki page last updated: ???
+#
+#####
+
+# bibtex.tcl --
+#
+#      A basic parser for BibTeX bibliography databases.
+#
+# Copyright (c) 2005 Neil Madden.
+# Copyright (c) 2005 Andreas Kupries.
+# License: Tcl/BSD style.
+
+### NOTES
+###
+### Need commands to introspect parser state. Especially the string
+### map (for testing of 'addStrings', should be useful in general as
+### well).
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+package require cmdline
+
+# ### ### ### ######### ######### #########
+## Implementation: Public API
+
+namespace eval ::bibtex {}
+
+# bibtex::parse --
+#
+#	Parse a bibtex file.
+#
+# parse ?options? ?bibtex?
+
+proc ::bibtex::parse {args} {
+    variable data
+    variable id
+
+    # Argument processing
+    if {[llength $args] < 1} {
+	set err "[lindex [info level 0] 0] ?options? ?bibtex?"
+	return -code error "wrong # args: should be \"$err\""
+    }
+
+    array set state {}
+    GetOptions $args state
+
+    # Initialize the parser state from the options, fill in default
+    # values, and handle the input according the specified mode.
+
+    set token bibtex[incr id]
+    foreach {k v} [array get state] {
+	set data($token,$k) $v
+    }
+
+    if {$state(stream)} {
+	# Text not in memory
+	if {!$state(bg)} {
+	    # Text from a channel, no async processing. We read everything
+	    # into memory and the handle it as before.
+
+	    set blockmode [fconfigure $state(-channel) -blocking]
+	    fconfigure $state(-channel) -blocking 1
+	    set data($token,buffer) [read $state(-channel)]
+	    fconfigure $state(-channel) -blocking $blockmode
+
+	    # Tell upcoming processing that the text is in memory.
+	    set state(stream) 0
+	} else {
+	    # Text from a channel, and processing is async. Create an
+	    # event handler for the incoming data.
+
+	    set data($token,done) 0
+	    fileevent $state(-channel) readable \
+		    [list ::bibtex::ReadChan $token]
+
+	    # Initialize the parser internal result buffer if we use plain
+	    # -command, and not the SAX api.
+	    if {!$state(sax)} {
+		set data($token,result) {}
+	    }
+	}
+    }
+
+    # Initialize the string mappings (none known), and the result
+    # accumulator.
+    set data($token,strings) {}
+    set data($token,result)  {}
+
+    if {!$state(stream)} {
+	ParseRecords $token 1
+	if {$state(sax)} {
+	    set result $token
+	} else {
+	    set result $data($token,result)
+	    destroy $token
+	}
+	return $result
+    }
+
+    # Assert: Processing is in background.
+    return $token
+}
+
+# Cleanup a parser, cancelling any callbacks etc.
+
+proc ::bibtex::destroy {token} {
+    variable data
+
+    if {![info exists data($token,stream)]} {
+	return -code error "Illegal bibtex parser \"$token\""
+    }
+    if {$data($token,stream)} {
+	fileevent $data($token,-channel) readable {}
+    }
+
+    array unset data $token,*
+    return
+}
+
+
+proc ::bibtex::wait {token} {
+    variable data
+
+    if {![info exists data($token,stream)]} {
+	return -code error "Illegal bibtex parser \"$token\""
+    }
+    vwait ::bibtex::data($token,done)
+    return
+}
+
+# bibtex::addStrings --
+#
+#	Add strings to the map for a particular parser. All strings are
+#	expanded at parse time.
+
+proc ::bibtex::addStrings {token strings} {
+    variable data
+    eval [linsert $strings 0 lappend data($token,strings)]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Implementation: Private utility routines
+
+proc ::bibtex::AddRecord {token type key recdata} {
+    variable data
+    lappend  data($token,result) [list $type $key $recdata]
+    return
+}
+
+proc ::bibtex::GetOptions {argv statevar} {
+    upvar 1 $statevar state
+
+    # Basic processing of the argument list
+    # and the options found therein.
+
+    set opts [lrange [::cmdline::GetOptionDefaults {
+	{command.arg              {}}
+	{channel.arg              {}}
+	{recordcommand.arg        {}}
+	{preamblecommand.arg      {}}
+	{stringcommand.arg        {}}
+	{commentcommand.arg       {}}
+	{progresscommand.arg      {}}
+	{casesensitivestrings.arg {}}
+    } result] 2 end] ;# Remove ? and help.
+
+    set argc [llength $argv]
+    while {[set err [::cmdline::getopt argv $opts opt arg]]} {
+	if {$err < 0} {
+	    set olist ""
+	    foreach o [lsort $opts] {
+		if {[string match *.arg $o]} {
+		    set o [string range $o 0 end-4]
+		}
+		lappend olist -$o
+	    }
+	    return -code error "bad option \"$opt\",\
+		    should be one of\
+		    [linsert [join $olist ", "] end-1 or]"
+	}
+	set state(-$opt) $arg
+    }
+
+    # Check the information gained so far
+    # for inconsistencies and/or missing
+    # pieces.
+
+    set sax [expr {
+	[info exists state(-recordcommand)]   ||
+	[info exists state(-preamblecommand)] ||
+	[info exists state(-stringcommand)]   ||
+	[info exists state(-commentcommand)]  ||
+	[info exists state(-progresscommand)]
+    }] ; # {}
+
+    set bg [info exists state(-command)]
+
+    if {$sax && $bg} {
+	# Sax callbacks and channel completion callback exclude each
+	# other.
+	return -code error "The options -command and -TYPEcommand exclude each other"
+    }
+
+    set stream [info exists state(-channel)]
+
+    if {$stream} {
+	# Channel is present, a text is not allowed.
+	if {[llength $argv]} {
+	    return -code error "Option -channel and text exclude each other"
+	}
+
+	# The channel has to exist as well.
+	if {[lsearch -exact [file channels] $state(-channel)] < 0} {
+	    return -code error "Illegal channel handle \"$state(-channel)\""
+	}
+    } else {
+	# Channel is not present, we have to have a text, and only
+	# exactly one. And a general -command callback is not allowed.
+
+	if {![llength $argv]} {
+	    return -code error "Neither -channel nor text specified"
+	} elseif {[llength $argv] > 1} {
+	    return -code error "wrong # args: [lindex [info level 1] 0] ?options? ?bibtex?"
+	}
+
+	# Channel completion callback is not allowed if we are not
+	# reading from a channel.
+
+	if {$bg} {
+	    return -code error "Option -command and text exclude each other"
+	}
+
+	set state(buffer) [lindex $argv 0]
+    }
+
+    set state(stream) $stream
+    set state(sax)    $sax
+    set state(bg)     [expr {$sax || $bg}]
+
+    if {![info exists state(-stringcommand)]} {
+	set state(-stringcommand) [list ::bibtex::addStrings]
+    }
+    if {![info exists state(-recordcommand)] && (!$sax)} {
+	set state(-recordcommand) [list ::bibtex::AddRecord]
+    }
+    if {[info exists state(-casesensitivestrings)] &&
+	$state(-casesensitivestrings)
+    } {
+	set state(casesensitivestrings) 1
+    } else {
+	set state(casesensitivestrings) 0
+    }
+    return
+}
+
+proc ::bibtex::Callback {token type args} {
+    variable data
+
+    #puts stdout "Callback ($token $type ($args))"
+
+    if {[info exists data($token,-${type}command)]} {
+	eval $data($token,-${type}command) [linsert $args 0 $token]
+    }
+    return
+}
+
+proc ::bibtex::ReadChan {token} {
+    variable data
+
+    # Read the waiting characters into our buffer and process
+    # them. The records are saved either through a user supplied
+    # record callback, or the standard callback for our non-sax
+    # processing.
+
+    set    chan $data($token,-channel)
+    append data($token,buffer) [read $chan]
+
+    if {[eof $chan]} {
+	# Final processing. In non-SAX mode we have to deliver the
+	# completed result before destroying the parser.
+
+	ParseRecords $token 1
+	set data($token,done) 1
+	if {!$data($token,sax)} {
+	    Callback $token {} $data($token,result)
+	}
+	return
+    }
+
+    # Processing of partial data.
+
+    ParseRecords $token 0
+    return
+}
+
+proc ::bibtex::Tidy {str} {
+    return [string tolower [string trim $str]]
+}
+
+proc ::bibtex::ParseRecords {token eof} {
+    # A rough BibTeX grammar (case-insensitive):
+    #
+    # Database      ::= (Junk '@' Entry)*
+    # Junk          ::= .*?
+    # Entry         ::= Record
+    #               |   Comment
+    #               |   String
+    #               |   Preamble
+    # Comment       ::= "comment" [^\n]* \n         -- ignored
+    # String        ::= "string" '{' Field* '}'
+    # Preamble      ::= "preamble" '{' .* '}'       -- (balanced)
+    # Record        ::= Type '{' Key ',' Field* '}'
+    #               |   Type '(' Key ',' Field* ')' -- not handled
+    # Type          ::= Name
+    # Key           ::= Name
+    # Field         ::= Name '=' Value
+    # Name          ::= [^\s\"#%'(){}]*
+    # Value         ::= [0-9]+
+    #               |   '"' ([^'"']|\\'"')* '"'
+    #               |   '{' .* '}'                  -- (balanced)
+
+    # " - Fixup emacs hilit confusion from the grammar above.
+    variable data
+    set bibtex $data($token,buffer)
+
+    # Split at each @ character which is at the beginning of a line,
+    # modulo whitespace. This is a heuristic to distinguish the @'s
+    # starting a new record from the @'s occuring inside a record, as
+    # part of email addresses. Empty pices at beginning or end are
+    # stripped before the split.
+
+    regsub -line -all {^[\n\r\f\t ]*@} $bibtex \000 bibtex
+    set db [split [string trim $bibtex \000] \000]
+
+    if {$eof} {
+	set total [llength $db]
+	set step  [expr {double($total) / 100.0}]
+	set istep [expr {$step > 1 ? int($step) : 1}]
+	set count 0
+    } else {
+	if {[llength $db] < 2} {
+	    # Nothing to process, or data which ay be incomplete.
+	    return
+	}
+
+	set data($token,buffer) [lindex $db end]
+	set db                  [lrange $db 0 end-1]
+
+	# Fake progress meter.
+	set count -1
+    }
+
+    foreach block $db {
+	if {$count < 0} {
+	    Callback $token progress -1
+	} elseif {([incr count] % $istep) == 0} {
+	    Callback $token progress [expr {int($count / $step)}]
+	}
+	if {[regexp -nocase {\s*comment([^\n])*\n(.*)} $block \
+		-> cmnt rest]} {
+	    # Are @comments blocks, or just 1 line?
+	    # Does anyone care?
+	    Callback $token comment $cmnt
+
+	} elseif {[regexp -nocase {^\s*string[^\{]*\{(.*)\}[^\}]*} \
+		$block -> rest]} {
+	    # string macro defs
+	    if {$data($token,casesensitivestrings)} {
+		Callback $token string [ParseString $rest]
+	    } else {
+		Callback $token string [ParseBlock $rest]
+	    }
+	} elseif {[regexp -nocase {\s*preamble[^\{]*\{(.*)\}[^\}]*} \
+		$block -> rest]} {
+	    Callback $token preamble $rest
+
+	} elseif {[regexp {([^\{]+)\{([^,]*),(.*)\}[^\}]*} \
+		$block -> type key rest]} {
+	    # Do any @string mappings
+	    if {$data($token,casesensitivestrings)} {
+		# puts $data($token,strings)
+		set rest [string map $data($token,strings) $rest]
+	    } else {
+		set rest [string map -nocase $data($token,strings) $rest]
+	    }
+	    Callback $token record [Tidy $type] [string trim $key] \
+		    [ParseBlock $rest]
+	} else {
+	    ## FUTURE: Use a logger.
+	    puts stderr "Skipping: $block"
+	}
+    }
+}
+
+proc ::bibtex::ParseString {block} {
+    regexp {(\S+)[^=]*=(.*)} $block -> key rest
+    return [list $key $rest]
+}
+
+proc ::bibtex::ParseBlock {block} {
+    set ret   [list]
+    set index 0
+    while {
+	[regexp -start $index -indices -- \
+	     {(\S+)\s*=(.*)} $block -> key rest]
+    } {
+	foreach {ks ke} $key break
+	set k [Tidy [string range $block $ks $ke]]
+	foreach {rs re} $rest break
+	foreach {v index} \
+		[ParseBibString $rs [string range $block $rs $re]] \
+		break
+	lappend ret $k $v
+    }
+    return $ret
+}
+
+proc ::bibtex::ParseBibString {index str} {
+    set count 0
+    set retstr ""
+    set escape 0
+    set string 0
+    foreach char [split $str ""] {
+	incr index
+	if {$escape} {
+	    set escape 0
+	} else {
+	    if {$char eq "\{"} {
+		incr count
+		continue
+	    } elseif {$char eq "\}"} {
+		incr count -1
+		if {$count < 0} {incr index -1; break}
+		continue
+	    } elseif {$char eq ","} {
+		if {$count == 0} break
+	    } elseif {$char eq "\\"} {
+		set escape 1
+		continue
+	    } elseif {$char eq "\""} {
+	        # Handling the case where str is surrounded by
+	        # quotation marks instead of braces (as some journals
+	        # may, perhaps erroneously, print some field. e.g.:
+	        # https://www.epj.org/)
+	        if {$count == 0} {
+	            incr count
+	        } elseif {$count == 1} {
+ 	            incr count -1
+ 	        }
+		continue
+	    }
+	    # else: Nothing
+	}
+	append retstr $char
+    }
+    regsub -all {\s+} $retstr { } retstr
+    return [list [string trim $retstr] $index]
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Package configuration and state.
+
+namespace eval bibtex {
+    # Counter for the generation of parser tokens.
+    variable id 0
+
+    # State of all parsers. Keys for each parser are prefixed with the
+    # parser token.
+    variable  data
+    array set data {}
+
+    # Keys and their meaning (listed without token prefix)
+    ##
+    # buffer
+    # eof
+    # channel    <-\/- Difference ?
+    # strings      |
+    # -async       |
+    # -blocksize   |
+    # -channel   <-/
+    # -recordcommand   -- callback for each record
+    # -preamblecommand -- callback for @preamble blocks
+    # -stringcommand   -- callback for @string macros
+    # -commentcommand  -- callback for @comment blocks
+    # -progresscommand -- callback to indicate progress of parse
+    ##
+}
+
+# ### ### ### ######### ######### #########
+## Ready to go
+package provide bibtex 0.7
+# EOF
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bibtex/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bibtex/pkgIndex.tcl
new file mode 100644
index 00000000..2f01ef43
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/bibtex/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded bibtex 0.7 [list source [file join $dir bibtex.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/blowfish/blowfish.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/blowfish/blowfish.tcl
new file mode 100644
index 00000000..0c9e1aa9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/blowfish/blowfish.tcl
@@ -0,0 +1,755 @@
+# blowfish.tcl - 
+#
+#   Pure-Tcl implementation of the Blowfish algorithm.
+#
+#   See http://www.schneier.com/blowfish.html for information about the
+#   Blowfish algorithm.
+#
+#   The implementation is derived from Paul Kocher's implementation,
+#   available at http://www.schneier.com/blowfish-download.html
+#
+# Copyright (C) 2004 Frank Pilhofer
+# Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+#
+
+package require Tcl 8.2
+
+namespace eval blowfish {
+    variable uid
+    if {![info exists uid]} { set uid 0 }
+
+    variable  accel
+    array set accel {trf 0}
+
+    namespace export blowfish
+
+    variable ORIG_P {
+        0x243F6A88 0x85A308D3 0x13198A2E 0x03707344
+        0xA4093822 0x299F31D0 0x082EFA98 0xEC4E6C89
+        0x452821E6 0x38D01377 0xBE5466CF 0x34E90C6C
+        0xC0AC29B7 0xC97C50DD 0x3F84D5B5 0xB5470917
+        0x9216D5D9 0x8979FB1B
+    }
+
+    variable ORIG_S {
+        0xD1310BA6 0x98DFB5AC 0x2FFD72DB 0xD01ADFB7
+        0xB8E1AFED 0x6A267E96 0xBA7C9045 0xF12C7F99
+        0x24A19947 0xB3916CF7 0x0801F2E2 0x858EFC16
+        0x636920D8 0x71574E69 0xA458FEA3 0xF4933D7E
+        0x0D95748F 0x728EB658 0x718BCD58 0x82154AEE
+        0x7B54A41D 0xC25A59B5 0x9C30D539 0x2AF26013
+        0xC5D1B023 0x286085F0 0xCA417918 0xB8DB38EF
+        0x8E79DCB0 0x603A180E 0x6C9E0E8B 0xB01E8A3E
+        0xD71577C1 0xBD314B27 0x78AF2FDA 0x55605C60
+        0xE65525F3 0xAA55AB94 0x57489862 0x63E81440
+        0x55CA396A 0x2AAB10B6 0xB4CC5C34 0x1141E8CE
+        0xA15486AF 0x7C72E993 0xB3EE1411 0x636FBC2A
+        0x2BA9C55D 0x741831F6 0xCE5C3E16 0x9B87931E
+        0xAFD6BA33 0x6C24CF5C 0x7A325381 0x28958677
+        0x3B8F4898 0x6B4BB9AF 0xC4BFE81B 0x66282193
+        0x61D809CC 0xFB21A991 0x487CAC60 0x5DEC8032
+        0xEF845D5D 0xE98575B1 0xDC262302 0xEB651B88
+        0x23893E81 0xD396ACC5 0x0F6D6FF3 0x83F44239
+        0x2E0B4482 0xA4842004 0x69C8F04A 0x9E1F9B5E
+        0x21C66842 0xF6E96C9A 0x670C9C61 0xABD388F0
+        0x6A51A0D2 0xD8542F68 0x960FA728 0xAB5133A3
+        0x6EEF0B6C 0x137A3BE4 0xBA3BF050 0x7EFB2A98
+        0xA1F1651D 0x39AF0176 0x66CA593E 0x82430E88
+        0x8CEE8619 0x456F9FB4 0x7D84A5C3 0x3B8B5EBE
+        0xE06F75D8 0x85C12073 0x401A449F 0x56C16AA6
+        0x4ED3AA62 0x363F7706 0x1BFEDF72 0x429B023D
+        0x37D0D724 0xD00A1248 0xDB0FEAD3 0x49F1C09B
+        0x075372C9 0x80991B7B 0x25D479D8 0xF6E8DEF7
+        0xE3FE501A 0xB6794C3B 0x976CE0BD 0x04C006BA
+        0xC1A94FB6 0x409F60C4 0x5E5C9EC2 0x196A2463
+        0x68FB6FAF 0x3E6C53B5 0x1339B2EB 0x3B52EC6F
+        0x6DFC511F 0x9B30952C 0xCC814544 0xAF5EBD09
+        0xBEE3D004 0xDE334AFD 0x660F2807 0x192E4BB3
+        0xC0CBA857 0x45C8740F 0xD20B5F39 0xB9D3FBDB
+        0x5579C0BD 0x1A60320A 0xD6A100C6 0x402C7279
+        0x679F25FE 0xFB1FA3CC 0x8EA5E9F8 0xDB3222F8
+        0x3C7516DF 0xFD616B15 0x2F501EC8 0xAD0552AB
+        0x323DB5FA 0xFD238760 0x53317B48 0x3E00DF82
+        0x9E5C57BB 0xCA6F8CA0 0x1A87562E 0xDF1769DB
+        0xD542A8F6 0x287EFFC3 0xAC6732C6 0x8C4F5573
+        0x695B27B0 0xBBCA58C8 0xE1FFA35D 0xB8F011A0
+        0x10FA3D98 0xFD2183B8 0x4AFCB56C 0x2DD1D35B
+        0x9A53E479 0xB6F84565 0xD28E49BC 0x4BFB9790
+        0xE1DDF2DA 0xA4CB7E33 0x62FB1341 0xCEE4C6E8
+        0xEF20CADA 0x36774C01 0xD07E9EFE 0x2BF11FB4
+        0x95DBDA4D 0xAE909198 0xEAAD8E71 0x6B93D5A0
+        0xD08ED1D0 0xAFC725E0 0x8E3C5B2F 0x8E7594B7
+        0x8FF6E2FB 0xF2122B64 0x8888B812 0x900DF01C
+        0x4FAD5EA0 0x688FC31C 0xD1CFF191 0xB3A8C1AD
+        0x2F2F2218 0xBE0E1777 0xEA752DFE 0x8B021FA1
+        0xE5A0CC0F 0xB56F74E8 0x18ACF3D6 0xCE89E299
+        0xB4A84FE0 0xFD13E0B7 0x7CC43B81 0xD2ADA8D9
+        0x165FA266 0x80957705 0x93CC7314 0x211A1477
+        0xE6AD2065 0x77B5FA86 0xC75442F5 0xFB9D35CF
+        0xEBCDAF0C 0x7B3E89A0 0xD6411BD3 0xAE1E7E49
+        0x00250E2D 0x2071B35E 0x226800BB 0x57B8E0AF
+        0x2464369B 0xF009B91E 0x5563911D 0x59DFA6AA
+        0x78C14389 0xD95A537F 0x207D5BA2 0x02E5B9C5
+        0x83260376 0x6295CFA9 0x11C81968 0x4E734A41
+        0xB3472DCA 0x7B14A94A 0x1B510052 0x9A532915
+        0xD60F573F 0xBC9BC6E4 0x2B60A476 0x81E67400
+        0x08BA6FB5 0x571BE91F 0xF296EC6B 0x2A0DD915
+        0xB6636521 0xE7B9F9B6 0xFF34052E 0xC5855664
+        0x53B02D5D 0xA99F8FA1 0x08BA4799 0x6E85076A
+        0x4B7A70E9 0xB5B32944 0xDB75092E 0xC4192623
+        0xAD6EA6B0 0x49A7DF7D 0x9CEE60B8 0x8FEDB266
+        0xECAA8C71 0x699A17FF 0x5664526C 0xC2B19EE1
+        0x193602A5 0x75094C29 0xA0591340 0xE4183A3E
+        0x3F54989A 0x5B429D65 0x6B8FE4D6 0x99F73FD6
+        0xA1D29C07 0xEFE830F5 0x4D2D38E6 0xF0255DC1
+        0x4CDD2086 0x8470EB26 0x6382E9C6 0x021ECC5E
+        0x09686B3F 0x3EBAEFC9 0x3C971814 0x6B6A70A1
+        0x687F3584 0x52A0E286 0xB79C5305 0xAA500737
+        0x3E07841C 0x7FDEAE5C 0x8E7D44EC 0x5716F2B8
+        0xB03ADA37 0xF0500C0D 0xF01C1F04 0x0200B3FF
+        0xAE0CF51A 0x3CB574B2 0x25837A58 0xDC0921BD
+        0xD19113F9 0x7CA92FF6 0x94324773 0x22F54701
+        0x3AE5E581 0x37C2DADC 0xC8B57634 0x9AF3DDA7
+        0xA9446146 0x0FD0030E 0xECC8C73E 0xA4751E41
+        0xE238CD99 0x3BEA0E2F 0x3280BBA1 0x183EB331
+        0x4E548B38 0x4F6DB908 0x6F420D03 0xF60A04BF
+        0x2CB81290 0x24977C79 0x5679B072 0xBCAF89AF
+        0xDE9A771F 0xD9930810 0xB38BAE12 0xDCCF3F2E
+        0x5512721F 0x2E6B7124 0x501ADDE6 0x9F84CD87
+        0x7A584718 0x7408DA17 0xBC9F9ABC 0xE94B7D8C
+        0xEC7AEC3A 0xDB851DFA 0x63094366 0xC464C3D2
+        0xEF1C1847 0x3215D908 0xDD433B37 0x24C2BA16
+        0x12A14D43 0x2A65C451 0x50940002 0x133AE4DD
+        0x71DFF89E 0x10314E55 0x81AC77D6 0x5F11199B
+        0x043556F1 0xD7A3C76B 0x3C11183B 0x5924A509
+        0xF28FE6ED 0x97F1FBFA 0x9EBABF2C 0x1E153C6E
+        0x86E34570 0xEAE96FB1 0x860E5E0A 0x5A3E2AB3
+        0x771FE71C 0x4E3D06FA 0x2965DCB9 0x99E71D0F
+        0x803E89D6 0x5266C825 0x2E4CC978 0x9C10B36A
+        0xC6150EBA 0x94E2EA78 0xA5FC3C53 0x1E0A2DF4
+        0xF2F74EA7 0x361D2B3D 0x1939260F 0x19C27960
+        0x5223A708 0xF71312B6 0xEBADFE6E 0xEAC31F66
+        0xE3BC4595 0xA67BC883 0xB17F37D1 0x018CFF28
+        0xC332DDEF 0xBE6C5AA5 0x65582185 0x68AB9802
+        0xEECEA50F 0xDB2F953B 0x2AEF7DAD 0x5B6E2F84
+        0x1521B628 0x29076170 0xECDD4775 0x619F1510
+        0x13CCA830 0xEB61BD96 0x0334FE1E 0xAA0363CF
+        0xB5735C90 0x4C70A239 0xD59E9E0B 0xCBAADE14
+        0xEECC86BC 0x60622CA7 0x9CAB5CAB 0xB2F3846E
+        0x648B1EAF 0x19BDF0CA 0xA02369B9 0x655ABB50
+        0x40685A32 0x3C2AB4B3 0x319EE9D5 0xC021B8F7
+        0x9B540B19 0x875FA099 0x95F7997E 0x623D7DA8
+        0xF837889A 0x97E32D77 0x11ED935F 0x16681281
+        0x0E358829 0xC7E61FD6 0x96DEDFA1 0x7858BA99
+        0x57F584A5 0x1B227263 0x9B83C3FF 0x1AC24696
+        0xCDB30AEB 0x532E3054 0x8FD948E4 0x6DBC3128
+        0x58EBF2EF 0x34C6FFEA 0xFE28ED61 0xEE7C3C73
+        0x5D4A14D9 0xE864B7E3 0x42105D14 0x203E13E0
+        0x45EEE2B6 0xA3AAABEA 0xDB6C4F15 0xFACB4FD0
+        0xC742F442 0xEF6ABBB5 0x654F3B1D 0x41CD2105
+        0xD81E799E 0x86854DC7 0xE44B476A 0x3D816250
+        0xCF62A1F2 0x5B8D2646 0xFC8883A0 0xC1C7B6A3
+        0x7F1524C3 0x69CB7492 0x47848A0B 0x5692B285
+        0x095BBF00 0xAD19489D 0x1462B174 0x23820E00
+        0x58428D2A 0x0C55F5EA 0x1DADF43E 0x233F7061
+        0x3372F092 0x8D937E41 0xD65FECF1 0x6C223BDB
+        0x7CDE3759 0xCBEE7460 0x4085F2A7 0xCE77326E
+        0xA6078084 0x19F8509E 0xE8EFD855 0x61D99735
+        0xA969A7AA 0xC50C06C2 0x5A04ABFC 0x800BCADC
+        0x9E447A2E 0xC3453484 0xFDD56705 0x0E1E9EC9
+        0xDB73DBD3 0x105588CD 0x675FDA79 0xE3674340
+        0xC5C43465 0x713E38D8 0x3D28F89E 0xF16DFF20
+        0x153E21E7 0x8FB03D4A 0xE6E39F2B 0xDB83ADF7
+        0xE93D5A68 0x948140F7 0xF64C261C 0x94692934
+        0x411520F7 0x7602D4F7 0xBCF46B2E 0xD4A20068
+        0xD4082471 0x3320F46A 0x43B7D4B7 0x500061AF
+        0x1E39F62E 0x97244546 0x14214F74 0xBF8B8840
+        0x4D95FC1D 0x96B591AF 0x70F4DDD3 0x66A02F45
+        0xBFBC09EC 0x03BD9785 0x7FAC6DD0 0x31CB8504
+        0x96EB27B3 0x55FD3941 0xDA2547E6 0xABCA0A9A
+        0x28507825 0x530429F4 0x0A2C86DA 0xE9B66DFB
+        0x68DC1462 0xD7486900 0x680EC0A4 0x27A18DEE
+        0x4F3FFEA2 0xE887AD8C 0xB58CE006 0x7AF4D6B6
+        0xAACE1E7C 0xD3375FEC 0xCE78A399 0x406B2A42
+        0x20FE9E35 0xD9F385B9 0xEE39D7AB 0x3B124E8B
+        0x1DC9FAF7 0x4B6D1856 0x26A36631 0xEAE397B2
+        0x3A6EFA74 0xDD5B4332 0x6841E7F7 0xCA7820FB
+        0xFB0AF54E 0xD8FEB397 0x454056AC 0xBA489527
+        0x55533A3A 0x20838D87 0xFE6BA9B7 0xD096954B
+        0x55A867BC 0xA1159A58 0xCCA92963 0x99E1DB33
+        0xA62A4A56 0x3F3125F9 0x5EF47E1C 0x9029317C
+        0xFDF8E802 0x04272F70 0x80BB155C 0x05282CE3
+        0x95C11548 0xE4C66D22 0x48C1133F 0xC70F86DC
+        0x07F9C9EE 0x41041F0F 0x404779A4 0x5D886E17
+        0x325F51EB 0xD59BC0D1 0xF2BCC18F 0x41113564
+        0x257B7834 0x602A9C60 0xDFF8E8A3 0x1F636C1B
+        0x0E12B4C2 0x02E1329E 0xAF664FD1 0xCAD18115
+        0x6B2395E0 0x333E92E1 0x3B240B62 0xEEBEB922
+        0x85B2A20E 0xE6BA0D99 0xDE720C8C 0x2DA2F728
+        0xD0127845 0x95B794FD 0x647D0862 0xE7CCF5F0
+        0x5449A36F 0x877D48FA 0xC39DFD27 0xF33E8D1E
+        0x0A476341 0x992EFF74 0x3A6F6EAB 0xF4F8FD37
+        0xA812DC60 0xA1EBDDF8 0x991BE14C 0xDB6E6B0D
+        0xC67B5510 0x6D672C37 0x2765D43B 0xDCD0E804
+        0xF1290DC7 0xCC00FFA3 0xB5390F92 0x690FED0B
+        0x667B9FFB 0xCEDB7D9C 0xA091CF0B 0xD9155EA3
+        0xBB132F88 0x515BAD24 0x7B9479BF 0x763BD6EB
+        0x37392EB3 0xCC115979 0x8026E297 0xF42E312D
+        0x6842ADA7 0xC66A2B3B 0x12754CCC 0x782EF11C
+        0x6A124237 0xB79251E7 0x06A1BBE6 0x4BFB6350
+        0x1A6B1018 0x11CAEDFA 0x3D25BDD8 0xE2E1C3C9
+        0x44421659 0x0A121386 0xD90CEC6E 0xD5ABEA2A
+        0x64AF674E 0xDA86A85F 0xBEBFE988 0x64E4C3FE
+        0x9DBC8057 0xF0F7C086 0x60787BF8 0x6003604D
+        0xD1FD8346 0xF6381FB0 0x7745AE04 0xD736FCCC
+        0x83426B33 0xF01EAB71 0xB0804187 0x3C005E5F
+        0x77A057BE 0xBDE8AE24 0x55464299 0xBF582E61
+        0x4E58F48F 0xF2DDFDA2 0xF474EF38 0x8789BDC2
+        0x5366F9C3 0xC8B38E74 0xB475F255 0x46FCD9B9
+        0x7AEB2661 0x8B1DDF84 0x846A0E79 0x915F95E2
+        0x466E598E 0x20B45770 0x8CD55591 0xC902DE4C
+        0xB90BACE1 0xBB8205D0 0x11A86248 0x7574A99E
+        0xB77F19B6 0xE0A9DC09 0x662D09A1 0xC4324633
+        0xE85A1F02 0x09F0BE8C 0x4A99A025 0x1D6EFE10
+        0x1AB93D1D 0x0BA5A4DF 0xA186F20F 0x2868F169
+        0xDCB7DA83 0x573906FE 0xA1E2CE9B 0x4FCD7F52
+        0x50115E01 0xA70683FA 0xA002B5C4 0x0DE6D027
+        0x9AF88C27 0x773F8641 0xC3604C06 0x61A806B5
+        0xF0177A28 0xC0F586E0 0x006058AA 0x30DC7D62
+        0x11E69ED7 0x2338EA63 0x53C2DD94 0xC2C21634
+        0xBBCBEE56 0x90BCB6DE 0xEBFC7DA1 0xCE591D76
+        0x6F05E409 0x4B7C0188 0x39720A3D 0x7C927C24
+        0x86E3725F 0x724D9DB9 0x1AC15BB4 0xD39EB8FC
+        0xED545578 0x08FCA5B5 0xD83D7CD3 0x4DAD0FC4
+        0x1E50EF5E 0xB161E6F8 0xA28514D9 0x6C51133C
+        0x6FD5C7E7 0x56E14EC4 0x362ABFCE 0xDDC6C837
+        0xD79A3234 0x92638212 0x670EFA8E 0x406000E0
+        0x3A39CE37 0xD3FAF5CF 0xABC27737 0x5AC52D1B
+        0x5CB0679E 0x4FA33742 0xD3822740 0x99BC9BBE
+        0xD5118E9D 0xBF0F7315 0xD62D1C7E 0xC700C47B
+        0xB78C1B6B 0x21A19045 0xB26EB1BE 0x6A366EB4
+        0x5748AB2F 0xBC946E79 0xC6A376D2 0x6549C2C8
+        0x530FF8EE 0x468DDE7D 0xD5730A1D 0x4CD04DC6
+        0x2939BBDB 0xA9BA4650 0xAC9526E8 0xBE5EE304
+        0xA1FAD5F0 0x6A2D519A 0x63EF8CE2 0x9A86EE22
+        0xC089C2B8 0x43242EF6 0xA51E03AA 0x9CF2D0A4
+        0x83C061BA 0x9BE96A4D 0x8FE51550 0xBA645BD6
+        0x2826A2F9 0xA73A3AE1 0x4BA99586 0xEF5562E9
+        0xC72FEFD3 0xF752F7DA 0x3F046F69 0x77FA0A59
+        0x80E4A915 0x87B08601 0x9B09E6AD 0x3B3EE593
+        0xE990FD5A 0x9E34D797 0x2CF0B7D9 0x022B8B51
+        0x96D5AC3A 0x017DA67D 0xD1CF3ED6 0x7C7D2D28
+        0x1F9F25CF 0xADF2B89B 0x5AD6B472 0x5A88F54C
+        0xE029AC71 0xE019A5E6 0x47B0ACFD 0xED93FA9B
+        0xE8D3C48D 0x283B57CC 0xF8D56629 0x79132E28
+        0x785F0191 0xED756055 0xF7960E44 0xE3D35E8C
+        0x15056DD4 0x88F46DBA 0x03A16125 0x0564F0BD
+        0xC3EB9E15 0x3C9057A2 0x97271AEC 0xA93A072A
+        0x1B3F6D9B 0x1E6321F5 0xF59C66FB 0x26DCF319
+        0x7533D928 0xB155FDF5 0x03563482 0x8ABA3CBB
+        0x28517711 0xC20AD9F8 0xABCC5167 0xCCAD925F
+        0x4DE81751 0x3830DC8E 0x379D5862 0x9320F991
+        0xEA7A90C2 0xFB3E7BCE 0x5121CE64 0x774FBE32
+        0xA8B6E37E 0xC3293D46 0x48DE5369 0x6413E680
+        0xA2AE0810 0xDD6DB224 0x69852DFD 0x09072166
+        0xB39A460A 0x6445C0DD 0x586CDECF 0x1C20C8AE
+        0x5BBEF7DD 0x1B588D40 0xCCD2017F 0x6BB4E3BB
+        0xDDA26A7E 0x3A59FF45 0x3E350A44 0xBCB4CDD5
+        0x72EACEA8 0xFA6484BB 0x8D6612AE 0xBF3C6F47
+        0xD29BE463 0x542F5D9E 0xAEC2771B 0xF64E6370
+        0x740E0D8D 0xE75B1357 0xF8721671 0xAF537D5D
+        0x4040CB08 0x4EB4E2CC 0x34D2466A 0x0115AF84
+        0xE1B00428 0x95983A1D 0x06B89FB4 0xCE6EA048
+        0x6F3F3B82 0x3520AB82 0x011A1D4B 0x277227F8
+        0x611560B1 0xE7933FDC 0xBB3A792B 0x344525BD
+        0xA08839E1 0x51CE794B 0x2F32C9B7 0xA01FBAC9
+        0xE01CC87E 0xBCC7D1F6 0xCF0111C3 0xA1E8AAC7
+        0x1A908749 0xD44FBD9A 0xD0DADECB 0xD50ADA38
+        0x0339C32A 0xC6913667 0x8DF9317C 0xE0B12B4F
+        0xF79E59B7 0x43F5BB3A 0xF2D519FF 0x27D9459C
+        0xBF97222C 0x15E6FC2A 0x0F91FC71 0x9B941525
+        0xFAE59361 0xCEB69CEB 0xC2A86459 0x12BAA8D1
+        0xB6C1075E 0xE3056A0C 0x10D25065 0xCB03A442
+        0xE0EC6E0E 0x1698DB3B 0x4C98A0BE 0x3278E964
+        0x9F1F9532 0xE0D392DF 0xD3A0342B 0x8971F21E
+        0x1B0A7441 0x4BA3348C 0xC5BE7120 0xC37632D8
+        0xDF359F8D 0x9B992F2E 0xE60B6F47 0x0FE3F11D
+        0xE54CDA54 0x1EDAD891 0xCE6279CF 0xCD3E7E6F
+        0x1618B166 0xFD2C1D05 0x848FD2C5 0xF6FB2299
+        0xF523F357 0xA6327623 0x93A83531 0x56CCCD02
+        0xACF08162 0x5A75EBB5 0x6E163697 0x88D273CC
+        0xDE966292 0x81B949D0 0x4C50901B 0x71C65614
+        0xE6C6C7BD 0x327A140A 0x45E1D006 0xC3F27B9A
+        0xC9AA53FD 0x62A80F00 0xBB25BFE2 0x35BDD2F6
+        0x71126905 0xB2040222 0xB6CBCF7C 0xCD769C2B
+        0x53113EC0 0x1640E3D3 0x38ABBD60 0x2547ADF0
+        0xBA38209C 0xF746CE76 0x77AFA1C5 0x20756060
+        0x85CBFE4E 0x8AE88DD8 0x7AAAF9B0 0x4CF9AA7E
+        0x1948C25C 0x02FB8A8C 0x01C36AE4 0xD6EBE1F9
+        0x90D4F869 0xA65CDEA0 0x3F09252D 0xC208E69F
+        0xB74E6132 0xCE77E25B 0x578FDFE3 0x3AC372E6
+    }
+}
+
+proc ::blowfish::intEncrypt {P S xl xr} {
+    for {set i 0} {$i < 16} {incr i} {
+        set xl [expr {$xl ^ [lindex $P $i]}]
+
+        set S0a [lindex $S [expr { ($xl >> 24) & 0xff}]]
+        set S1b [lindex $S [expr {(($xl >> 16) & 0xff) + 256}]]
+        set S2c [lindex $S [expr {(($xl >>  8) & 0xff) + 512}]]
+        set S3d [lindex $S [expr { ($xl        & 0xff) + 768}]]
+        set xr [expr {(((($S0a + $S1b) ^ $S2c) + $S3d) & 0xffffffff) ^ $xr}]
+
+        set temp $xl ; set xl $xr ; set xr $temp
+    }
+
+    set temp $xl ; set xl $xr ; set xr $temp
+    return [list [expr {$xl ^ [lindex $P 17]}] [expr {$xr ^ [lindex $P 16]}]]
+}
+
+proc ::blowfish::intDecrypt {P S xl xr} {
+    for {set i 17} {$i > 1} {incr i -1} {
+        set xl [expr {$xl ^ [lindex $P $i]}]
+
+        set S0a [lindex $S [expr { ($xl >> 24) & 0xff}]]
+        set S1b [lindex $S [expr {(($xl >> 16) & 0xff) + 256}]]
+        set S2c [lindex $S [expr {(($xl >>  8) & 0xff) + 512}]]
+        set S3d [lindex $S [expr { ($xl        & 0xff) + 768}]]
+        set xr [expr {(((($S0a + $S1b) ^ $S2c) + $S3d) & 0xffffffff) ^ $xr}]
+
+        set temp $xl ; set xl $xr ; set xr $temp
+    }
+    
+    set temp $xl ; set xl $xr ; set xr $temp
+    return [list [expr {$xl ^ [lindex $P 0]}] [expr {$xr ^ [lindex $P 1]}]]
+}
+
+proc ::blowfish::Init {mode key iv} {
+    variable ORIG_S
+    variable ORIG_P
+    variable uid
+
+    set S $ORIG_S
+    set P [list]
+    
+    set kl [string length $key]
+    binary scan $key c* kc
+    
+    set j 0
+    for {set i 0} {$i < 18} {incr i} {
+        set data 0
+        for {set k 0} {$k < 4} {incr k} {
+            set data [expr {(($data << 8) | ([lindex $kc $j] & 0xff)) & 0xffffffff}]
+            if {[incr j] >= $kl} {
+                set j 0
+            }
+        }
+        set OPi [lindex $ORIG_P $i]
+        lappend P [expr {$OPi ^ $data}]
+    }
+    
+    set datal 0
+    set datar 0
+    
+    for {set i 0} {$i < 18} {incr i} {
+        set ed [intEncrypt $P $S $datal $datar]
+        set datal [lindex $ed 0]
+        set datar [lindex $ed 1]
+        set P [lreplace $P $i [incr i] $datal $datar]
+    }
+    
+    for {set i 0} {$i < 4} {incr i} {
+        for {set j 0} {$j < 256} {incr j 2} {
+            set ed [intEncrypt $P $S $datal $datar]
+            set datal [lindex $ed 0]
+            set datar [lindex $ed 1]
+            set t [expr {$i * 256 + $j}]
+            set S [lreplace $S $t [incr t] $datal $datar]
+        }
+    }
+
+    set token [namespace current]::[incr uid]
+    variable $token
+    upvar #0 $token state
+    array set state [list P $P S $S M $mode I $iv]
+    return $token
+}
+
+proc ::blowfish::Reset {token iv} {
+    upvar #0 $token state
+    set state(I) $iv
+    return
+}
+
+proc ::blowfish::Final {token} {
+    # PRAGMA: nocheck
+    variable $token
+    unset $token
+}
+
+proc ::blowfish::EncryptBlock {token block} {
+    upvar #0 $token state
+    if {[binary scan $block II xl xr] != 2} {
+        error "block must be 8 bytes"
+    }
+    set xl [expr {$xl & 0xffffffff}]
+    set xr [expr {$xr & 0xffffffff}]
+    set d  [intEncrypt $state(P) $state(S) $xl $xr]
+    return [binary format I2 $d]
+}
+
+proc ::blowfish::Encrypt {Key data} {
+    upvar #0 $Key state
+    set P $state(P)
+    set S $state(S)
+    set cbc_mode [string equal "cbc" $state(M)]
+
+    if {[binary scan $state(I) II s0 s1] != 2} {
+        return -code error "invalid initialization vector: must be 8 bytes"
+    }
+
+    set len [string length $data]
+    if {($len % 8) != 0} {
+        return -code error "invalid block size: blocks must be 8 bytes"
+    }
+
+    set s0 [expr {$s0 & 0xffffffff}]
+    set s1 [expr {$s1 & 0xffffffff}]
+    
+    set result ""
+    for {set i 0} {$i < $len} {incr i 8} {
+        if {[binary scan $data @[set i]II xl xr] != 2} {
+            return -code error "oops"
+        }
+        if {$cbc_mode} {
+            set xl [expr {($xl & 0xffffffff) ^ $s0}]
+            set xr [expr {($xr & 0xffffffff) ^ $s1}]
+        }
+        set d  [intEncrypt $P $S $xl $xr]
+        if {$cbc_mode} {
+            set s0 [lindex $d 0]
+            set s1 [lindex $d 1]
+        }
+        append result [binary format I2 $d]
+    }
+    if {$cbc_mode} {
+        set state(I) [binary format II $s0 $s1]
+    }
+    return $result
+}
+
+proc ::blowfish::DecryptBlock {Key block} {
+    upvar #0 $Key state
+    if {[binary scan $block II xl xr] != 2} {
+        return -code error "invalid block size: block must be 8 bytes"
+    }
+    set xl [expr {$xl & 0xffffffff}]
+    set xr [expr {$xr & 0xffffffff}]
+    set d  [intDecrypt $state(P) $state(S) $xl $xr]
+    return [binary format I2 $d]
+}
+
+proc ::blowfish::Decrypt {token data} {
+    upvar #0 $token state
+    set P $state(P)
+    set S $state(S)
+    set cbc_mode [string equal "cbc" $state(M)]
+
+    if {[binary scan $state(I) II s0 s1] != 2} {
+        return -code error "initialization vector must be 8 bytes"
+    }
+
+    set len [string length $data]
+    if {($len % 8) != 0} {
+        return -code error "block size invalid"
+    }
+
+    set s0 [expr {$s0 & 0xffffffff}]
+    set s1 [expr {$s1 & 0xffffffff}]
+
+    set result ""
+    for {set i 0} {$i < $len} {incr i 8} {
+        if {[binary scan $data @[set i]II xl xr] != 2} {
+            error "oops"
+        }
+        set xl [expr {$xl & 0xffffffff}]
+        set xr [expr {$xr & 0xffffffff}]
+        set d  [intDecrypt $P $S $xl $xr]
+        if {$cbc_mode} {
+            set d0 [lindex $d 0]
+            set d1 [lindex $d 1]
+            set c0 [expr {$d0 ^ $s0}]
+            set c1 [expr {$d1 ^ $s1}]
+            set s0 $xl
+            set s1 $xr
+            append result [binary format II $c0 $c1]
+        } else {
+            append result [binary format I2 $d]
+        }
+    }
+    if {$cbc_mode} {
+        set state(I) [binary format II $s0 $s1]
+    }
+    return $result
+}
+
+
+# -------------------------------------------------------------------------
+# Fileevent handler for chunked file reading.
+#
+proc ::blowfish::Chunk {Key in {out {}} {chunksize 4096} {pad \0}} {
+    upvar #0 $Key state
+    
+    if {[eof $in]} {
+        fileevent $in readable {}
+        set state(reading) 0
+        set data $state(remainder)
+
+        # Only pad at the end of the stream.
+        if {[string length $pad] > 0} {
+            set data [Pad $data 8 $pad]
+        }
+    } else {
+        set data [read $in $chunksize]
+        #puts "Chunk: reading [string len $data] bytes"
+        set data $state(remainder)$data
+
+        # If data is not a multiple of 8, state(remainder) will hold
+        # excess bytes for the next round.
+        set pagedlen         [expr {([string length $data] / 8) * 8}]
+        set state(remainder) [string range $data $pagedlen end]
+        incr pagedlen        -1
+        set data             [string range $data 0 $pagedlen]
+    }
+
+    if {![string length $data]} return
+
+    if {[set code [catch {
+        set cipher [$state(cmd) $Key $data]
+    } msg]]} {
+        fileevent $in readable {}
+        set state(reading) 0
+        set state(err) [list $code $msg]
+        return
+    }
+    
+    if {$out == {}} {
+        append state(output) $cipher
+    } else {
+        puts -nonewline $out $cipher
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# LoadAccelerator --
+#
+#	This package can make use of a number of compiled extensions to
+#	accelerate the digest computation. This procedure manages the
+#	use of these extensions within the package. During normal usage
+#	this should not be called, but the test package manipulates the
+#	list of enabled accelerators.
+#
+proc ::blowfish::LoadAccelerator {name} {
+    variable accel
+    set r 0
+    switch -exact -- $name {
+        trf {
+            if {![catch {package require Trfcrypt}]} {
+                set block [string repeat \0 8]
+                set r [expr {![catch {::blowfish -dir enc -mode ecb -key $block $block} msg]}]
+            }
+        }
+        default {
+            return -code error "invalid accelerator package:\
+                must be one of [join [array names accel] {, }]"
+        }
+    }
+    set accel($name) $r
+}
+
+# -------------------------------------------------------------------------
+
+proc ::blowfish::Hex {data} {
+    binary scan $data H* r
+    return $r
+}
+
+proc ::blowfish::SetOneOf {lst item} {                
+    set ndx [lsearch -glob $lst "${item}*"]
+    if {$ndx == -1} {
+        set err [join $lst ", "]
+        return -code error "invalid mode \"$item\": must be one of $err"
+    }
+    return [lindex $lst $ndx]
+}
+
+proc ::blowfish::CheckSize {what size thing} {
+    if {[string length $thing] != $size} {
+        return -code error "invalid value for $what: must be $size bytes long"
+    }
+    return $thing
+}
+
+proc ::blowfish::CheckPad {char} {
+    if {[string length $char] > 1} {
+        return -code error "invalid value: should be a char or empty string"
+    }
+    return $char
+}
+
+proc ::blowfish::Pad {data blocksize {fill \0}} {
+    set len [string length $data]
+    if {$len == 0} {
+        # do not pad an empty string
+    } elseif {($len % $blocksize) != 0} {
+        set pad [expr {$blocksize - ($len % $blocksize)}]
+        append data [string repeat $fill $pad]
+    }
+    return $data
+}
+
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::blowfish::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+proc ::blowfish::blowfish {args} {
+    variable accel
+    array set opts {-dir encrypt -mode cbc -key {} -in {} -out {} -hex 0 -pad \0}
+    set opts(-chunksize) 4096
+    set opts(-iv) [string repeat \0 8]
+    set modes {ecb cbc}
+    set dirs  {encrypt decrypt}
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -exact -- $option {
+            -mode       { set opts(-mode) [SetOneOf $modes [Pop args 1]] }
+            -dir        { set opts(-dir) [SetOneOf $dirs [Pop args 1]] }
+            -iv         { set opts(-iv)  [CheckSize -iv 8 [Pop args 1]] }
+            -key        { set opts(-key) [Pop args 1] }
+            -in         { set opts(-in) [Pop args 1] }
+            -out        { set opts(-out) [Pop args 1] }
+            -chunksize  { set opts(-chunksize) [Pop args 1] }
+            -hex        { set opts(-hex) 1 }
+            -pad        { set opts(-pad) [CheckPad [Pop args 1]] }
+            --          { Pop args; break }
+            default {
+                if {[string length $opts(-in)] == 0 && [llength $args] == 1} break
+                set err [join [lsort [array names opts]] ", "]
+                return -code error "bad option \"$option\":\
+                    must be one of $err"
+            }
+        }
+        Pop args
+    }
+    
+    if {$opts(-key) == {}} {
+        return -code error "no key provided: the -key option is required"
+    }
+    
+    set r {}
+    if {$opts(-in) == {}} {
+        # Immediate data (plain text is argument).
+        
+        if {[llength $args] != 1} {
+            return -code error "wrong \# args:\
+                should be \"blowfish ?options...? -key keydata plaintext\""
+        }
+
+        set data [lindex $args 0]
+        if {[string length $opts(-pad)] > 0} {
+            set data [Pad [lindex $args 0] 8 $opts(-pad)]
+        }
+        if {$accel(trf)} {
+            set r [::blowfish -dir $opts(-dir) -mode $opts(-mode) \
+                       -key $opts(-key) -iv $opts(-iv) -- $data]
+        } else {
+            set Key [Init $opts(-mode) $opts(-key) $opts(-iv)]
+            if {[string equal $opts(-dir) "encrypt"]} {
+                set r [Encrypt $Key $data]
+            } else {
+                set r [Decrypt $Key $data]
+            }
+            Final $Key
+        }
+
+        if {$opts(-out) != {}} {
+            puts -nonewline $opts(-out) $r
+            set r {}
+        }
+        
+    } else {
+        # Channel data (plain text is read from a binary channel).
+        
+        if {[llength $args] != 0} {
+            return -code error "wrong \# args:\
+                should be \"blowfish ?options...? -key keydata -in channel\""
+        }
+        
+        set Key [Init $opts(-mode) $opts(-key) $opts(-iv)]
+        upvar $Key state
+        set state(reading) 1
+        if {[string equal $opts(-dir) "encrypt"]} {
+            set state(cmd) Encrypt
+        } else {
+            set state(cmd) Decrypt
+        }
+        set state(output) ""
+        set state(remainder) ""
+        fileevent $opts(-in) readable \
+            [list [namespace origin Chunk] \
+                 $Key $opts(-in) $opts(-out) $opts(-chunksize) $opts(-pad)]
+        if {[info commands ::tkwait] != {}} {
+            tkwait variable [subst $Key](reading)
+        } else {
+            vwait [subst $Key](reading)
+        }
+
+        if {[info exists state(err)]} {
+            foreach {code msg} $state(err) break
+            return -code $code $msg
+        }
+        
+        if {$opts(-out) == {}} {
+            set r $state(output)
+        }
+        Final $Key
+
+    }
+
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# Try and load a compiled extension to help.
+namespace eval ::blowfish {
+    variable e {}
+    foreach e {trf} {
+        if {[LoadAccelerator $e]} break
+    }
+    unset e
+}
+
+package provide blowfish 1.0.5
+
+# -------------------------------------------------------------------------
+#
+# Local Variables:
+# mode: tcl
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/blowfish/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/blowfish/pkgIndex.tcl
new file mode 100644
index 00000000..dd96b2df
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/blowfish/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded blowfish 1.0.5 [list source [file join $dir blowfish.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cache/async.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cache/async.tcl
new file mode 100644
index 00000000..9d3ec272
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cache/async.tcl
@@ -0,0 +1,185 @@
+## -*- tcl -*-
+# ### ### ### ######### ######### #########
+
+# Copyright (c) 2008 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# Aynchronous in-memory cache. Queries of the cache generate
+# asynchronous requests for data for unknown parts, with asynchronous
+# result return. Data found in the cache may return fully asynchronous
+# as well, or semi-synchronous. The latter meaning that the regular
+# callbacks are used, but invoked directly, and not decoupled through
+# events. The cache can be pre-filled synchronously.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4 ; #
+package require snit    ; # 
+
+# ### ### ### ######### ######### #########
+##
+
+snit::type cache::async {
+
+    # ### ### ### ######### ######### #########
+    ## Unknown methods and options are forwared to the object actually
+    ## providing the cached data, making the cache a proper facade for
+    ## it.
+
+    delegate method * to myprovider
+    delegate option * to myprovider
+
+    # ### ### ### ######### ######### #########
+    ## API 
+
+    option -full-async-results -default 1 -type snit::boolean
+
+    constructor {provider args} {
+	set myprovider $provider
+	$self configurelist $args
+	return
+    }
+
+    method get {key donecmd} {
+	# Register request
+	lappend mywaiting($key) $donecmd
+
+	# Check if the request can be satisfied from the cache. If yes
+	# then that is done.
+
+	if {[info exists mymiss($key)]} {
+	    $self NotifyUnset 1 $key
+	    return
+	} elseif {[info exists myhit($key)]} {
+	    $self NotifySet 1 $key
+	    return
+	}
+
+	# We have to ask our provider if there is data or
+	# not. however, if a request for this key is already in flight
+	# then we have to do nothing more. Our registration at the
+	# beginning ensures that we will get notified when the
+	# requested information comes back.
+
+	if {[llength $mywaiting($key)] > 1} return
+
+	# This is the first query for this key, ask the provider.
+
+	after idle [linsert $myprovider end get $key $self]
+	return
+    }
+
+    method clear {args} {
+	# Note: This method cannot interfere with async queries caused
+	# by 'get' invokations.  If the data is present, and now
+	# removed, all 'get' invokations before this call were
+	# satisfied from the cache and only invokations coming after
+	# it can trigger async queries of the provider. If the data is
+	# not present the state will not change, and queries in flight
+	# simply refill the cache as they would do anyway without the
+	# 'clear'.
+
+	if {![llength $args]} {
+	    array unset myhit  *
+	    array unset mymiss *
+	} elseif {[llength $args] == 1} {
+	    set key [lindex $args 0]
+	    unset -nocomplain  myhit($key)
+	    unset -nocomplain mymiss($key)
+	} else {
+	    WrongArgs ?key?
+	}
+	return
+    }
+
+    method exists {key} {
+	return [expr {[info exists myhit($key)] || [info exists mymiss($key)]}]
+    }
+
+    method set {key value} {
+	# Add data to the cache, and notify all outstanding queries.
+	# Nothing is done if the key is already known and has the same
+	# value.
+
+	# This is the method invoked by the provider in response to
+	# queries, and also the method to use to prefill the cache
+	# with data.
+
+	if {
+	    [info exists myhit($key)] &&
+	    ($value eq $myhit($key))
+	} return
+
+	set                myhit($key) $value
+	unset -nocomplain mymiss($key)
+	$self NotifySet 0 $key
+	return
+    }
+
+    method unset {key} {
+	# Add hole to the cache, and notify all outstanding queries.
+	# This is the method invoked by the provider in response to
+	# queries, and also the method to use to prefill the cache
+	# with holes.
+	unset -nocomplain myhit($key)
+	set              mymiss($key) .
+	$self NotifyUnset 0 $key
+	return
+    }
+
+    method NotifySet {found key} {
+	if {![info exists mywaiting($key)] || ![llength $mywaiting($key)]} return
+
+	set pending $mywaiting($key)
+	unset mywaiting($key)
+
+	set value $myhit($key)
+	if {$found && !$options(-full-async-results)} {
+	    foreach donecmd $pending {
+		uplevel \#0 [linsert $donecmd end set $key $value]
+	    }
+	} else {
+	    foreach donecmd $pending {
+		after idle [linsert $donecmd end set $key $value]
+	    }
+	}
+	return
+    }
+
+    method NotifyUnset {found key} {
+	if {![info exists mywaiting($key)] || ![llength $mywaiting($key)]} return
+
+	set pending $mywaiting($key)
+	unset mywaiting($key)
+
+	if {$found && !$options(-full-async-results)} {
+	    foreach donecmd $pending {
+		uplevel \#0 [linsert $donecmd end unset $key]
+	    }
+	} else {
+	    foreach donecmd $pending {
+		after idle [linsert $donecmd end unset $key]
+	    }
+	}
+	return
+    }
+
+    proc WrongArgs {expected} {
+	return -code error "wrong#args: Expected $expected"
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+
+    variable myprovider          ; # Command prefix providing the data to cache.
+    variable myhit     -array {} ; # Cache array mapping keys to values.
+    variable mymiss    -array {} ; # Cache array mapping keys to holes.
+    variable mywaiting -array {} ; # Map of keys pending to notifier commands.
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide cache::async 0.3.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cache/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cache/pkgIndex.tcl
new file mode 100644
index 00000000..add67d55
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cache/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded cache::async 0.3.1 [list source [file join $dir async.tcl]]
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clay/clay.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clay/clay.tcl
new file mode 100644
index 00000000..99442778
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clay/clay.tcl
@@ -0,0 +1,2224 @@
+###
+# clay.tcl
+#
+# Copyright (c) 2018 Sean Woods
+#
+# BSD License
+###
+# @@ Meta Begin
+# Package clay 0.8.6
+# Meta platform     tcl
+# Meta summary      A minimalist framework for complex TclOO development
+# Meta description  This package introduces the method "clay" to both oo::object
+# Meta description  and oo::class which facilitate complex interactions between objects
+# Meta description  and their ancestor and mixed in classes.
+# Meta category     TclOO
+# Meta subject      framework
+# Meta require      {Tcl 8.6}
+# Meta author       Sean Woods
+# Meta license      BSD
+# @@ Meta End
+
+###
+# Amalgamated package for clay
+# Do not edit directly, tweak the source in build/ and rerun
+# build.tcl
+###
+package provide clay 0.8.6
+namespace eval ::clay {}
+
+###
+# START: procs.tcl
+###
+namespace eval ::clay {
+}
+set ::clay::trace 0
+if {[info commands ::cron::object_destroy] eq {}} {
+  # Provide a noop if we aren't running with the cron scheduler
+  namespace eval ::cron {}
+  proc ::cron::object_destroy args {}
+}
+proc ::clay::PROC {name arglist body {ninja {}}} {
+  if {[info commands $name] ne {}} return
+  proc $name $arglist $body
+  eval $ninja
+}
+if {[info commands ::PROC] eq {}} {
+  namespace eval ::clay { namespace export PROC }
+  namespace eval :: { namespace import ::clay::PROC }
+}
+proc ::clay::_ancestors {resultvar class} {
+  upvar 1 $resultvar result
+  if {$class in $result} {
+    return
+  }
+  lappend result $class
+  foreach aclass [::info class superclasses $class] {
+    _ancestors result $aclass
+  }
+}
+proc ::clay::ancestors {args} {
+  set result {}
+  set queue  {}
+  set metaclasses {}
+
+  foreach class $args {
+    set ancestors($class) {}
+    _ancestors ancestors($class) $class
+  }
+  foreach class [lreverse $args] {
+    foreach aclass $ancestors($class) {
+      if {$aclass in $result} continue
+      set skip 0
+      foreach bclass $args {
+        if {$class eq $bclass} continue
+        if {$aclass in $ancestors($bclass)} {
+          set skip 1
+          break
+        }
+      }
+      if {$skip} continue
+      lappend result $aclass
+    }
+  }
+  foreach class [lreverse $args] {
+    foreach aclass $ancestors($class) {
+      if {$aclass in $result} continue
+      lappend result $aclass
+    }
+  }
+  ###
+  # Screen out classes that do not participate in clay
+  # interactions
+  ###
+  set output {}
+  foreach {item} $result {
+    if {[catch {$item clay noop} err]} {
+      continue
+    }
+    lappend output $item
+  }
+  return $output
+}
+proc ::clay::args_to_dict args {
+  if {[llength $args]==1} {
+    return [lindex $args 0]
+  }
+  return $args
+}
+proc ::clay::args_to_options args {
+  set result {}
+  foreach {var val} [args_to_dict {*}$args] {
+    lappend result [string trim $var -:] $val
+  }
+  return $result
+}
+proc ::clay::dynamic_arguments {ensemble method arglist args} {
+  set idx 0
+  set len [llength $args]
+  if {$len > [llength $arglist]} {
+    ###
+    # Catch if the user supplies too many arguments
+    ###
+    set dargs 0
+    if {[lindex $arglist end] ni {args dictargs}} {
+      return -code error -level 2 "Usage: $ensemble $method [string trim [dynamic_wrongargs_message $arglist]]"
+    }
+  }
+  foreach argdef $arglist {
+    if {$argdef eq "args"} {
+      ###
+      # Perform args processing in the style of tcl
+      ###
+      uplevel 1 [list set args [lrange $args $idx end]]
+      break
+    }
+    if {$argdef eq "dictargs"} {
+      ###
+      # Perform args processing in the style of tcl
+      ###
+      uplevel 1 [list set args [lrange $args $idx end]]
+      ###
+      # Perform args processing in the style of clay
+      ###
+      set dictargs [::clay::args_to_options {*}[lrange $args $idx end]]
+      uplevel 1 [list set dictargs $dictargs]
+      break
+    }
+    if {$idx > $len} {
+      ###
+      # Catch if the user supplies too few arguments
+      ###
+      if {[llength $argdef]==1} {
+        return -code error -level 2 "Usage: $ensemble $method [string trim [dynamic_wrongargs_message $arglist]]"
+      } else {
+        uplevel 1 [list set [lindex $argdef 0] [lindex $argdef 1]]
+      }
+    } else {
+      uplevel 1 [list set [lindex $argdef 0] [lindex $args $idx]]
+    }
+    incr idx
+  }
+}
+proc ::clay::dynamic_wrongargs_message {arglist} {
+  set result ""
+  set dargs 0
+  foreach argdef $arglist {
+    if {$argdef in {args dictargs}} {
+      set dargs 1
+      break
+    }
+    if {[llength $argdef]==1} {
+      append result " $argdef"
+    } else {
+      append result " ?[lindex $argdef 0]?"
+    }
+  }
+  if { $dargs } {
+    append result " ?option value?..."
+  }
+  return $result
+}
+proc ::clay::is_dict { d } {
+  # is it a dict, or can it be treated like one?
+  if {[catch {::dict size $d} err]} {
+    #::set ::errorInfo {}
+    return 0
+  }
+  return 1
+}
+proc ::clay::is_null value {
+  return [expr {$value in {{} NULL}}]
+}
+proc ::clay::leaf args {
+  set marker [string index [lindex $args end] end]
+  set result [path {*}${args}]
+  if {$marker eq "/"} {
+    return $result
+  }
+  return [list {*}[lrange $result 0 end-1] [string trim [string trim [lindex $result end]] /]]
+}
+proc ::clay::K {a b} {set a}
+if {[info commands ::K] eq {}} {
+  namespace eval ::clay { namespace export K }
+  namespace eval :: { namespace import ::clay::K }
+}
+proc ::clay::noop args {}
+if {[info commands ::noop] eq {}} {
+  namespace eval ::clay { namespace export noop }
+  namespace eval :: { namespace import ::clay::noop }
+}
+proc ::clay::cleanup {} {
+  set count 0
+  if {![info exists ::clay::idle_destroy]} return
+  set objlist $::clay::idle_destroy
+  set ::clay::idle_destroy {}
+  foreach obj $objlist {
+    if {![catch {$obj destroy}]} {
+      incr count
+    }
+  }
+  return $count
+}
+proc ::clay::object_create {objname {class {}}} {
+  #if {$::clay::trace>0} {
+  #  puts [list $objname CREATE]
+  #}
+}
+proc ::clay::object_rename {object newname} {
+  if {$::clay::trace>0} {
+    puts [list $object RENAME -> $newname]
+  }
+}
+proc ::clay::object_destroy args {
+  if {![info exists ::clay::idle_destroy]} {
+    set ::clay::idle_destroy {}
+  }
+  foreach objname $args {
+    if {$::clay::trace>0} {
+      puts [list $objname DESTROY]
+    }
+    ::cron::object_destroy $objname
+    if {$objname in $::clay::idle_destroy} continue
+    lappend ::clay::idle_destroy $objname
+  }
+}
+proc ::clay::path args {
+  set result {}
+  foreach item $args {
+    set item [string trim $item :./]
+    foreach subitem [split $item /] {
+      lappend result [string trim ${subitem}]/
+    }
+  }
+  return $result
+}
+proc ::clay::putb {buffername args} {
+  upvar 1 $buffername buffer
+  switch [llength $args] {
+    1 {
+      append buffer [lindex $args 0] \n
+    }
+    2 {
+      append buffer [string map {*}$args] \n
+    }
+    default {
+      error "usage: putb buffername ?map? string"
+    }
+  }
+}
+if {[info command ::putb] eq {}} {
+  namespace eval ::clay { namespace export putb }
+  namespace eval :: { namespace import ::clay::putb }
+}
+proc ::clay::script_path {} {
+  set path [file dirname [file join [pwd] [info script]]]
+  return $path
+}
+proc ::clay::NSNormalize qualname {
+  if {![string match ::* $qualname]} {
+    set qualname ::clay::classes::$qualname
+  }
+  regsub -all {::+} $qualname "::"
+}
+proc ::clay::uuid_generate args {
+  return [uuid generate]
+}
+namespace eval ::clay {
+  variable option_class {}
+  variable core_classes {::oo::class ::oo::object}
+}
+
+###
+# END: procs.tcl
+###
+###
+# START: core.tcl
+###
+package require Tcl 8.6 ;# try in pipeline.tcl. Possibly other things.
+if {[info commands irmmd5] eq {}} {
+  if {[catch {package require odielibc}]} {
+    package require md5 2
+  }
+}
+::namespace eval ::clay {
+}
+::namespace eval ::clay::classes {
+}
+::namespace eval ::clay::define {
+}
+::namespace eval ::clay::tree {
+}
+::namespace eval ::clay::dict {
+}
+::namespace eval ::clay::list {
+}
+::namespace eval ::clay::uuid {
+}
+if {![info exists ::clay::idle_destroy]} {
+  set ::clay::idle_destroy {}
+}
+
+###
+# END: core.tcl
+###
+###
+# START: uuid.tcl
+###
+namespace eval ::clay::uuid {
+    namespace export uuid
+}
+proc ::clay::uuid::generate_tcl_machinfo {} {
+  variable machinfo
+  if {[info exists machinfo]} {
+    return $machinfo
+  }
+  lappend machinfo [clock seconds]; # timestamp
+  lappend machinfo [clock clicks];  # system incrementing counter
+  lappend machinfo [info hostname]; # spatial unique id (poor)
+  lappend machinfo [pid];           # additional entropy
+  lappend machinfo [array get ::tcl_platform]
+
+  ###
+  # If we have /dev/urandom just stream 128 bits from that
+  ###
+  if {[file exists /dev/urandom]} {
+    set fin [open /dev/urandom r]
+    binary scan [read $fin 128] H* machinfo
+    close $fin
+  } elseif {[catch {package require nettool}]} {
+    # More spatial information -- better than hostname.
+    # bug 1150714: opening a server socket may raise a warning messagebox
+    #   with WinXP firewall, using ipconfig will return all IP addresses
+    #   including ipv6 ones if available. ipconfig is OK on win98+
+    if {[string equal $::tcl_platform(platform) "windows"]} {
+      catch {exec ipconfig} config
+      lappend machinfo $config
+    } else {
+      catch {
+          set s [socket -server void -myaddr [info hostname] 0]
+          ::clay::K [fconfigure $s -sockname] [close $s]
+      } r
+      lappend machinfo $r
+    }
+
+    if {[package provide Tk] != {}} {
+      lappend machinfo [winfo pointerxy .]
+      lappend machinfo [winfo id .]
+    }
+  } else {
+    ###
+    # If the nettool package works on this platform
+    # use the stream of hardware ids from it
+    ###
+    lappend machinfo {*}[::nettool::hwid_list]
+  }
+  return $machinfo
+}
+if {[info commands irmmd5] ne {}} {
+proc ::clay::uuid::generate {{type {}}} {
+    variable nextuuid
+    set s [irmmd5 "$type [incr nextuuid(type)] [generate_tcl_machinfo]"]
+    foreach {a b} {0 7 8 11 12 15 16 19 20 31} {
+         append r [string range $s $a $b] -
+     }
+     return [string tolower [string trimright $r -]]
+}
+proc ::clay::uuid::short {{type {}}} {
+  variable nextuuid
+  set r [irmmd5 "$type [incr nextuuid(type)] [generate_tcl_machinfo]"]
+  return [string range $r 0 16]
+}
+
+} else {
+package require md5 2
+proc ::clay::uuid::raw {{type {}}} {
+    variable nextuuid
+    set tok [md5::MD5Init]
+    md5::MD5Update $tok "$type [incr nextuuid($type)] [generate_tcl_machinfo]"
+    set r [md5::MD5Final $tok]
+    return $r
+    #return [::clay::uuid::tostring $r]
+}
+proc ::clay::uuid::generate {{type {}}} {
+    return [::clay::uuid::tostring [::clay::uuid::raw  $type]]
+}
+proc ::clay::uuid::short {{type {}}} {
+  set r [::clay::uuid::raw $type]
+  binary scan $r H* s
+  return [string range $s 0 16]
+}
+}
+proc ::clay::uuid::tostring {uuid} {
+    binary scan $uuid H* s
+    foreach {a b} {0 7 8 11 12 15 16 19 20 31} {
+        append r [string range $s $a $b] -
+    }
+    return [string tolower [string trimright $r -]]
+}
+proc ::clay::uuid::fromstring {uuid} {
+    return [binary format H* [string map {- {}} $uuid]]
+}
+proc ::clay::uuid::equal {left right} {
+    set l [fromstring $left]
+    set r [fromstring $right]
+    return [string equal $l $r]
+}
+proc ::clay::uuid {cmd args} {
+    switch -exact -- $cmd {
+        generate {
+           return [::clay::uuid::generate {*}$args]
+        }
+        short {
+          set uuid [::clay::uuid::short {*}$args]
+        }
+        equal {
+            tailcall ::clay::uuid::equal {*}$args
+        }
+        default {
+            return -code error "bad option \"$cmd\":\
+                must be generate or equal"
+        }
+    }
+}
+
+###
+# END: uuid.tcl
+###
+###
+# START: dict.tcl
+###
+::clay::PROC ::tcl::dict::getnull {dictionary args} {
+  if {[exists $dictionary {*}$args]} {
+    get $dictionary {*}$args
+  }
+} {
+  namespace ensemble configure dict -map [dict replace\
+      [namespace ensemble configure dict -map] getnull ::tcl::dict::getnull]
+}
+::clay::PROC ::tcl::dict::is_dict { d } {
+  # is it a dict, or can it be treated like one?
+  if {[catch {dict size $d} err]} {
+    #::set ::errorInfo {}
+    return 0
+  }
+  return 1
+} {
+  namespace ensemble configure dict -map [dict replace\
+      [namespace ensemble configure dict -map] is_dict ::tcl::dict::is_dict]
+}
+::clay::PROC ::tcl::dict::rmerge {args} {
+  ::set result [dict create . {}]
+  # Merge b into a, and handle nested dicts appropriately
+  ::foreach b $args {
+    for { k v } $b {
+      ::set field [string trim $k :/]
+      if {![::clay::tree::is_branch $b $k]} {
+        # Element names that end in ":" are assumed to be literals
+        set result $k $v
+      } elseif { [exists $result $k] } {
+        # key exists in a and b?  let's see if both values are dicts
+        # both are dicts, so merge the dicts
+        if { [is_dict [get $result $k]] && [is_dict $v] } {
+          set result $k [rmerge [get $result $k] $v]
+        } else {
+          set result $k $v
+        }
+      } else {
+        set result $k $v
+      }
+    }
+  }
+  return $result
+} {
+  namespace ensemble configure dict -map [dict replace\
+      [namespace ensemble configure dict -map] rmerge ::tcl::dict::rmerge]
+}
+::clay::PROC ::clay::tree::is_branch { dict path } {
+  set field [lindex $path end]
+  if {[string index $field end] eq ":"} {
+    return 0
+  }
+  if {[string index $field 0] eq "."} {
+    return 0
+  }
+  if {[string index $field end] eq "/"} {
+    return 1
+  }
+  return [dict exists $dict {*}$path .]
+}
+::clay::PROC ::clay::tree::print {dict} {
+  ::set result {}
+  ::set level -1
+  ::clay::tree::_dictputb $level result $dict
+  return $result
+}
+::clay::PROC ::clay::tree::_dictputb {level varname dict} {
+  upvar 1 $varname result
+  incr level
+  dict for {field value} $dict {
+    if {$field eq "."} continue
+    if {[clay::tree::is_branch $dict $field]} {
+      putb result "[string repeat "  " $level]$field \{"
+      _dictputb $level result $value
+      putb result "[string repeat "  " $level]\}"
+    } else {
+      putb result "[string repeat "  " $level][list $field $value]"
+    }
+  }
+}
+proc ::clay::tree::sanitize {dict} {
+  ::set result {}
+  ::set level -1
+  ::clay::tree::_sanitizeb {} result $dict
+  return $result
+}
+proc ::clay::tree::_sanitizeb {path varname dict} {
+  upvar 1 $varname result
+  dict for {field value} $dict {
+    if {$field eq "."} continue
+    if {[clay::tree::is_branch $dict $field]} {
+      _sanitizeb [list {*}$path $field] result $value
+    } else {
+      dict set result {*}$path $field $value
+    }
+  }
+}
+proc ::clay::tree::storage {rawpath} {
+  set isleafvar 0
+  set path {}
+  set tail [string index $rawpath end]
+  foreach element $rawpath {
+    set items [split [string trim $element /] /]
+    foreach item $items {
+      if {$item eq {}} continue
+      lappend path $item
+    }
+  }
+  return $path
+}
+proc ::clay::tree::dictset {varname args} {
+  upvar 1 $varname result
+  if {[llength $args] < 2} {
+    error "Usage: ?path...? path value"
+  } elseif {[llength $args]==2} {
+    set rawpath [lindex $args 0]
+  } else {
+    set rawpath  [lrange $args 0 end-1]
+  }
+  set value [lindex $args end]
+  set path [storage $rawpath]
+  set dot .
+  set one {}
+  dict set result $dot $one
+  set dpath {}
+  foreach item [lrange $path 0 end-1] {
+    set field $item
+    lappend dpath [string trim $item /]
+    dict set result {*}$dpath $dot $one
+  }
+  set field [lindex $rawpath end]
+  set ext   [string index $field end]
+  if {$ext eq {:} || ![dict is_dict $value]} {
+    dict set result {*}$path $value
+    return
+  }
+  if {$ext eq {/} && ![dict exists $result {*}$path $dot]} {
+    dict set result {*}$path $dot $one
+  }
+  if {[dict exists $result {*}$path $dot]} {
+    dict set result {*}$path [::clay::tree::merge [dict get $result {*}$path] $value]
+    return
+  }
+  dict set result {*}$path $value
+}
+proc ::clay::tree::dictmerge {varname args} {
+  upvar 1 $varname result
+  set dot .
+  set one {}
+  dict set result $dot $one
+  foreach dict $args {
+    dict for {f v} $dict {
+      set field [string trim $f /]
+      set bbranch [clay::tree::is_branch $dict $f]
+      if {![dict exists $result $field]} {
+        dict set result $field $v
+        if {$bbranch} {
+          dict set result $field [clay::tree::merge $v]
+        } else {
+          dict set result $field $v
+        }
+      } elseif {[dict exists $result $field $dot]} {
+        if {$bbranch} {
+          dict set result $field [clay::tree::merge [dict get $result $field] $v]
+        } else {
+          dict set result $field $v
+        }
+      }
+    }
+  }
+  return $result
+}
+proc ::clay::tree::merge {args} {
+  ###
+  # The result of a merge is always a dict with branches
+  ###
+  set dot .
+  set one {}
+  dict set result $dot $one
+  set argument 0
+  foreach b $args {
+    # Merge b into a, and handle nested dicts appropriately
+    if {![dict is_dict $b]} {
+      error "Element $b is not a dictionary"
+    }
+    dict for { k v } $b {
+      if {$k eq $dot} {
+        dict set result $dot $one
+        continue
+      }
+      set bbranch [is_branch $b $k]
+      set field [string trim $k /]
+      if { ![dict exists $result $field] } {
+        if {$bbranch} {
+          dict set result $field [merge $v]
+        } else {
+          dict set result $field $v
+        }
+      } else {
+        set abranch [dict exists $result $field $dot]
+        if {$abranch && $bbranch} {
+          dict set result $field [merge [dict get $result $field] $v]
+        } else {
+          dict set result $field $v
+          if {$bbranch} {
+            dict set result $field $dot $one
+          }
+        }
+      }
+    }
+  }
+  return $result
+}
+::clay::PROC ::tcl::dict::isnull {dictionary args} {
+  if {![exists $dictionary {*}$args]} {return 1}
+  return [expr {[get $dictionary {*}$args] in {{} NULL null}}]
+} {
+  namespace ensemble configure dict -map [dict replace\
+      [namespace ensemble configure dict -map] isnull ::tcl::dict::isnull]
+}
+
+###
+# END: dict.tcl
+###
+###
+# START: list.tcl
+###
+::clay::PROC ::clay::ladd {varname args} {
+  upvar 1 $varname var
+  if ![info exists var] {
+      set var {}
+  }
+  foreach item $args {
+    if {$item in $var} continue
+    lappend var $item
+  }
+  return $var
+}
+::clay::PROC ::clay::ldelete {varname args} {
+  upvar 1 $varname var
+  if ![info exists var] {
+      return
+  }
+  foreach item [lsort -unique $args] {
+    while {[set i [lsearch $var $item]]>=0} {
+      set var [lreplace $var $i $i]
+    }
+  }
+  return $var
+}
+::clay::PROC ::clay::lrandom list {
+  set len [llength $list]
+  set idx [expr int(rand()*$len)]
+  return [lindex $list $idx]
+}
+
+###
+# END: list.tcl
+###
+###
+# START: dictargs.tcl
+###
+namespace eval ::dictargs {
+}
+if {[info commands ::dictargs::parse] eq {}} {
+  proc ::dictargs::parse {argdef argdict} {
+    set result {}
+    dict for {field info} $argdef {
+      if {![string is alnum [string index $field 0]]} {
+        error "$field is not a simple variable name"
+      }
+      upvar 1 $field _var
+      set aliases {}
+      if {[dict exists $argdict $field]} {
+        set _var [dict get $argdict $field]
+        continue
+      }
+      if {[dict exists $info aliases:]} {
+        set found 0
+        foreach {name} [dict get $info aliases:] {
+          if {[dict exists $argdict $name]} {
+            set _var [dict get $argdict $name]
+            set found 1
+            break
+          }
+        }
+        if {$found} continue
+      }
+      if {[dict exists $info default:]} {
+        set _var [dict get $info default:]
+        continue
+      }
+      set mandatory 1
+      if {[dict exists $info mandatory:]} {
+        set mandatory [dict get $info mandatory:]
+      }
+      if {$mandatory} {
+        error "$field is required"
+      }
+    }
+  }
+}
+proc ::dictargs::proc {name argspec body} {
+  set result {}
+  append result "::dictargs::parse \{$argspec\} \$args" \;
+  append result $body
+  uplevel 1 [list ::proc $name [list [list args [list dictargs $argspec]]] $result]
+}
+proc ::dictargs::method {name argspec body} {
+  set class [lindex [::info level -1] 1]
+  set result {}
+  append result "::dictargs::parse \{$argspec\} \$args" \;
+  append result $body
+  oo::define $class method $name [list [list args [list dictargs $argspec]]] $result
+}
+
+###
+# END: dictargs.tcl
+###
+###
+# START: dialect.tcl
+###
+namespace eval ::clay::dialect {
+  namespace export create
+  foreach {flag test} {
+    tip470 {package vsatisfies [package provide Tcl] 8.7}
+  } {
+    if {![info exists ::clay::dialect::has($flag)]} {
+      set ::clay::dialect::has($flag) [eval $test]
+    }
+  }
+}
+proc ::clay::dialect::Push {class} {
+  ::variable class_stack
+  lappend class_stack $class
+}
+proc ::clay::dialect::Peek {} {
+  ::variable class_stack
+  return [lindex $class_stack end]
+}
+proc ::clay::dialect::Pop {} {
+  ::variable class_stack
+  set class_stack [lrange $class_stack 0 end-1]
+}
+if {$::clay::dialect::has(tip470)} {
+proc ::clay::dialect::current_class {} {
+  return [uplevel 1 self]
+}
+} else {
+proc ::clay::dialect::current_class {} {
+  tailcall Peek
+}
+}
+proc ::clay::dialect::create {name {parent ""}} {
+  variable has
+  set NSPACE [NSNormalize [uplevel 1 {namespace current}] $name]
+  ::namespace eval $NSPACE {::namespace eval define {}}
+  ###
+  # Build the "define" namespace
+  ###
+
+  if {$parent eq ""} {
+    ###
+    # With no "parent" language, begin with all of the keywords in
+    # oo::define
+    ###
+    foreach command [info commands ::oo::define::*] {
+      set procname [namespace tail $command]
+      interp alias {} ${NSPACE}::define::$procname {} \
+        ::clay::dialect::DefineThunk $procname
+    }
+    # Create an empty dynamic_methods proc
+    proc ${NSPACE}::dynamic_methods {class} {}
+    namespace eval $NSPACE {
+      ::namespace export dynamic_methods
+      ::namespace eval define {::namespace export *}
+    }
+    set ANCESTORS {}
+  } else {
+    ###
+    # If we have a parent language, that language already has the
+    # [oo::define] keywords as well as additional keywords and behaviors.
+    # We should begin with that
+    ###
+    set pnspace [NSNormalize [uplevel 1 {namespace current}] $parent]
+    apply [list parent {
+      ::namespace export dynamic_methods
+      ::namespace import -force ${parent}::dynamic_methods
+    } $NSPACE] $pnspace
+
+    apply [list parent {
+      ::namespace import -force ${parent}::define::*
+      ::namespace export *
+    } ${NSPACE}::define] $pnspace
+      set ANCESTORS [list ${pnspace}::object]
+  }
+  ###
+  # Build our dialect template functions
+  ###
+  proc ${NSPACE}::define {oclass args} [string map [list %NSPACE% $NSPACE] {
+  ###
+  # To facilitate library reloading, allow
+  # a dialect to create a class from DEFINE
+  ###
+  set class [::clay::dialect::NSNormalize [uplevel 1 {namespace current}] $oclass]
+    if {[info commands $class] eq {}} {
+      %NSPACE%::class create $class {*}${args}
+    } else {
+      ::clay::dialect::Define %NSPACE% $class {*}${args}
+    }
+}]
+  interp alias {} ${NSPACE}::define::current_class {} \
+    ::clay::dialect::current_class
+  interp alias {} ${NSPACE}::define::aliases {} \
+    ::clay::dialect::Aliases $NSPACE
+  interp alias {} ${NSPACE}::define::superclass {} \
+    ::clay::dialect::SuperClass $NSPACE
+
+  if {[info command ${NSPACE}::class] ne {}} {
+    ::rename ${NSPACE}::class {}
+  }
+  ###
+  # Build the metaclass for our language
+  ###
+  ::oo::class create ${NSPACE}::class {
+    superclass ::clay::dialect::MotherOfAllMetaClasses
+  }
+  # Wire up the create method to add in the extra argument we need; the
+  # MotherOfAllMetaClasses will know what to do with it.
+  ::oo::objdefine ${NSPACE}::class \
+    method create {name {definitionScript ""}} \
+      "next \$name [list ${NSPACE}::define] \$definitionScript"
+
+  ###
+  # Build the mother of all classes. Note that $ANCESTORS is already
+  # guaranteed to be a list in canonical form.
+  ###
+  uplevel #0 [string map [list %NSPACE% [list $NSPACE] %name% [list $name] %ANCESTORS% $ANCESTORS] {
+    %NSPACE%::class create %NSPACE%::object {
+     superclass %ANCESTORS%
+      # Put MOACish stuff in here
+    }
+  }]
+  if { "${NSPACE}::class" ni $::clay::dialect::core_classes } {
+    lappend ::clay::dialect::core_classes "${NSPACE}::class"
+  }
+  if { "${NSPACE}::object" ni $::clay::dialect::core_classes } {
+    lappend ::clay::dialect::core_classes "${NSPACE}::object"
+  }
+}
+proc ::clay::dialect::NSNormalize {namespace qualname} {
+  if {![string match ::* $qualname]} {
+    set qualname ${namespace}::$qualname
+  }
+  regsub -all {::+} $qualname "::"
+}
+proc ::clay::dialect::DefineThunk {target args} {
+  tailcall ::oo::define [Peek] $target {*}$args
+}
+proc ::clay::dialect::Canonical {namespace NSpace class} {
+  namespace upvar $namespace cname cname
+  #if {[string match ::* $class]} {
+  #  return $class
+  #}
+  if {[info exists cname($class)]} {
+    return $cname($class)
+  }
+  if {[info exists ::clay::dialect::cname($class)]} {
+    return $::clay::dialect::cname($class)
+  }
+  if {[info exists ::clay::dialect::cname(${NSpace}::${class})]} {
+    return $::clay::dialect::cname(${NSpace}::${class})
+  }
+  foreach item [list "${NSpace}::$class" "::$class"] {
+    if {[info commands $item] ne {}} {
+      return $item
+    }
+  }
+  return ${NSpace}::$class
+}
+proc ::clay::dialect::Define {namespace class args} {
+  Push $class
+  try {
+  	if {[llength $args]==1} {
+      namespace eval ${namespace}::define [lindex $args 0]
+    } else {
+      ${namespace}::define::[lindex $args 0] {*}[lrange $args 1 end]
+    }
+  	${namespace}::dynamic_methods $class
+  } finally {
+    Pop
+  }
+}
+proc ::clay::dialect::Aliases {namespace args} {
+  set class [Peek]
+  namespace upvar $namespace cname cname
+  set NSpace [join [lrange [split $class ::] 1 end-2] ::]
+  set cname($class) $class
+  foreach name $args {
+    set cname($name) $class
+    #set alias $name
+    set alias [NSNormalize $NSpace $name]
+    # Add a local metaclass reference
+    if {![info exists ::clay::dialect::cname($alias)]} {
+      lappend ::clay::dialect::aliases($class) $alias
+      ##
+      # Add a global reference, first come, first served
+      ##
+      set ::clay::dialect::cname($alias) $class
+    }
+  }
+}
+proc ::clay::dialect::SuperClass {namespace args} {
+  set class [Peek]
+  namespace upvar $namespace class_info class_info
+  dict set class_info($class) superclass 1
+  set ::clay::dialect::cname($class) $class
+  set NSpace [join [lrange [split $class ::] 1 end-2] ::]
+  set unique {}
+  foreach item $args {
+    set Item [Canonical $namespace $NSpace $item]
+    dict set unique $Item $item
+  }
+  set root ${namespace}::object
+  if {$class ne $root} {
+    dict set unique $root $root
+  }
+  tailcall ::oo::define $class superclass {*}[dict keys $unique]
+}
+if {[info command ::clay::dialect::MotherOfAllMetaClasses] eq {}} {
+::oo::class create ::clay::dialect::MotherOfAllMetaClasses {
+  superclass ::oo::class
+  constructor {define definitionScript} {
+    $define [self] {
+      superclass
+    }
+    $define [self] $definitionScript
+  }
+  method aliases {} {
+    if {[info exists ::clay::dialect::aliases([self])]} {
+      return $::clay::dialect::aliases([self])
+    }
+  }
+}
+}
+namespace eval ::clay::dialect {
+  variable core_classes {::oo::class ::oo::object}
+}
+
+###
+# END: dialect.tcl
+###
+###
+# START: metaclass.tcl
+###
+::clay::dialect::create ::clay
+proc ::clay::dynamic_methods class {
+  foreach command [info commands [namespace current]::dynamic_methods_*] {
+    $command $class
+  }
+}
+proc ::clay::dynamic_methods_class {thisclass} {
+  set methods {}
+  set mdata [$thisclass clay find class_typemethod]
+  foreach {method info} $mdata {
+    if {$method eq {.}} continue
+    set method [string trimright $method :/-]
+    if {$method in $methods} continue
+    lappend methods $method
+    set arglist [dict getnull $info arglist]
+    set body    [dict getnull $info body]
+    ::oo::objdefine $thisclass method $method $arglist $body
+  }
+}
+proc ::clay::define::Array {name {values {}}} {
+  set class [current_class]
+  set name [string trim $name :/]
+  $class clay branch array $name
+  dict for {var val} $values {
+    $class clay set array/ $name $var $val
+  }
+}
+proc ::clay::define::Delegate {name info} {
+  set class [current_class]
+  foreach {field value} $info {
+    $class clay set component/ [string trim $name :/]/ $field $value
+  }
+}
+proc ::clay::define::constructor {arglist rawbody} {
+  set body {
+my variable DestroyEvent
+set DestroyEvent 0
+::clay::object_create [self] [info object class [self]]
+# Initialize public variables and options
+my InitializePublic
+  }
+  append body $rawbody
+  set class [current_class]
+  ::oo::define $class constructor $arglist $body
+}
+proc ::clay::define::Class_Method {name arglist body} {
+  set class [current_class]
+  $class clay set class_typemethod/ [string trim $name :/] [dict create arglist $arglist body $body]
+}
+proc ::clay::define::class_method {name arglist body} {
+  set class [current_class]
+  $class clay set class_typemethod/ [string trim $name :/] [dict create arglist $arglist body $body]
+}
+proc ::clay::define::clay {args} {
+  set class [current_class]
+  if {[lindex $args 0] in "cget set branch"} {
+    $class clay {*}$args
+  } else {
+    $class clay set {*}$args
+  }
+}
+proc ::clay::define::destructor rawbody {
+  set body {
+# Run the destructor once and only once
+set self [self]
+my variable DestroyEvent
+if {$DestroyEvent} return
+set DestroyEvent 1
+}
+  append body $rawbody
+  ::oo::define [current_class] destructor $body
+}
+proc ::clay::define::Dict {name {values {}}} {
+  set class [current_class]
+  set name [string trim $name :/]
+  $class clay branch dict $name
+  foreach {var val} $values {
+    $class clay set dict/ $name/ $var $val
+  }
+}
+proc ::clay::define::Option {name args} {
+  set class [current_class]
+  set dictargs {default {}}
+  foreach {var val} [::clay::args_to_dict {*}$args] {
+    dict set dictargs [string trim $var -:/] $val
+  }
+  set name [string trimleft $name -]
+
+  ###
+  # Option Class handling
+  ###
+  set optclass [dict getnull $dictargs class]
+  if {$optclass ne {}} {
+    foreach {f v} [$class clay find option_class $optclass] {
+      if {![dict exists $dictargs $f]} {
+        dict set dictargs $f $v
+      }
+    }
+    if {$optclass eq "variable"} {
+      variable $name [dict getnull $dictargs default]
+    }
+  }
+  foreach {f v} $dictargs {
+    $class clay set option $name $f $v
+  }
+}
+proc ::clay::define::Method {name argstyle argspec body} {
+  set class [current_class]
+  set result {}
+  switch $argstyle {
+    dictargs {
+      append result "::dictargs::parse \{$argspec\} \$args" \;
+    }
+  }
+  append result $body
+  oo::define $class method $name [list [list args [list dictargs $argspec]]] $result
+}
+proc ::clay::define::Option_Class {name args} {
+  set class [current_class]
+  set dictargs {default {}}
+  set name [string trimleft $name -:]
+  foreach {f v} [::clay::args_to_dict {*}$args] {
+    $class clay set option_class $name [string trim $f -/:] $v
+  }
+}
+proc ::clay::define::Variable {name {default {}}} {
+  set class [current_class]
+  set name [string trimright $name :/]
+  $class clay set variable/ $name $default
+}
+
+###
+# END: metaclass.tcl
+###
+###
+# START: ensemble.tcl
+###
+::namespace eval ::clay::define {
+}
+proc ::clay::ensemble_methodbody {ensemble einfo} {
+  set default standard
+  set preamble {}
+  set eswitch {}
+  set Ensemble [string totitle $ensemble]
+  if {$Ensemble eq "."} continue
+  foreach {msubmethod minfo} [lsort -dictionary -stride 2 $einfo] {
+    if {$msubmethod eq "."} continue
+    if {![dict exists $minfo body:]} {
+      continue
+    }
+    set submethod [string trim $msubmethod :/-]
+    if {$submethod eq "default"} {
+      set default [dict get $minfo body:]
+    } else {
+      dict set eswitch $submethod [dict get $minfo body:]
+    }
+    if {[dict exists $submethod aliases:]} {
+      foreach alias [dict get $minfo aliases:] {
+        if {![dict exists $eswitch $alias]} {
+          dict set eswitch $alias [dict get $minfo body:]
+        }
+      }
+    }
+  }
+  set methodlist [lsort -dictionary [dict keys $eswitch]]
+  if {![dict exists $eswitch <list>]} {
+    dict set eswitch <list> {return $methodlist}
+  }
+  if {$default eq "standard"} {
+    set default "error \"unknown method $ensemble \$method. Valid: \$methodlist\""
+  }
+  dict set eswitch default $default
+  set mbody {}
+  append mbody \n [list set methodlist $methodlist]
+  append mbody \n "switch -- \$method \{$eswitch\}" \n
+  return $mbody
+}
+::proc ::clay::define::Ensemble {rawmethod args} {
+  if {[llength $args]==2} {
+    lassign $args argspec body
+    set argstyle tcl
+  } elseif {[llength $args]==3} {
+    lassign $args argstyle argspec body
+  } else {
+    error "Usage: Ensemble name ?argstyle? argspec body"
+  }
+  set class [current_class]
+  #if {$::clay::trace>2} {
+  #  puts [list $class Ensemble $rawmethod $argspec $body]
+  #}
+  set mlist [split $rawmethod "::"]
+  set ensemble [string trim [lindex $mlist 0] :/]
+  set method   [string trim [lindex $mlist 2] :/]
+  if {[string index $method 0] eq "_"} {
+    $class clay set method_ensemble $ensemble $method $body
+    return
+  }
+  set realmethod  [string totitle $ensemble]_${method}
+  set realbody {}
+  if {$argstyle eq "dictargs"} {
+    append realbody "::dictargs::parse \{$argspec\} \$args" \n
+  }
+  if {[$class clay exists method_ensemble $ensemble _preamble]} {
+    append realbody [$class clay get method_ensemble $ensemble _preamble] \n
+  }
+  append realbody $body
+  if {$method eq "default"} {
+    $class clay set method_ensemble $ensemble $method: "tailcall my $realmethod \$method {*}\$args"
+    if {$argstyle eq "dictargs"} {
+      oo::define $class method $realmethod [list method [list args $argspec]] $realbody
+    } else {
+      oo::define $class method $realmethod [list method {*}$argspec] $realbody
+    }
+  } else {
+    $class clay set method_ensemble $ensemble $method: "tailcall my $realmethod {*}\$args"
+    if {$argstyle eq "dictargs"} {
+      oo::define $class method $realmethod [list [list args $argspec]] $realbody
+    } else {
+      oo::define $class method $realmethod $argspec $realbody
+    }
+  }
+  if {$::clay::trace>2} {
+    puts [list $class clay set method_ensemble/ $ensemble [string trim $method :/]  ...]
+  }
+}
+
+###
+# END: ensemble.tcl
+###
+###
+# START: class.tcl
+###
+::oo::define ::clay::class {
+  method clay {submethod args} {
+    my variable clay
+    if {![info exists clay]} {
+      set clay {}
+    }
+    switch $submethod {
+      ancestors {
+        tailcall ::clay::ancestors [self]
+      }
+      branch {
+        set path [::clay::tree::storage $args]
+        if {![dict exists $clay {*}$path .]} {
+          dict set clay {*}$path . {}
+        }
+      }
+      exists {
+        if {![info exists clay]} {
+          return 0
+        }
+        set path [::clay::tree::storage $args]
+        if {[dict exists $clay {*}$path]} {
+          return 1
+        }
+        if {[dict exists $clay {*}[lrange $path 0 end-1] [lindex $path end]:]} {
+          return 1
+        }
+        return 0
+      }
+      dump {
+        return $clay
+      }
+      dget {
+         if {![info exists clay]} {
+          return {}
+        }
+        set path [::clay::tree::storage $args]
+        if {[dict exists $clay {*}$path]} {
+          return [dict get $clay {*}$path]
+        }
+        if {[dict exists $clay {*}[lrange $path 0 end-1] [lindex $path end]:]} {
+          return [dict get $clay {*}[lrange $path 0 end-1] [lindex $path end]:]
+        }
+        return {}
+      }
+      is_branch {
+        set path [::clay::tree::storage $args]
+        return [dict exists $clay {*}$path .]
+      }
+      getnull -
+      get {
+        if {![info exists clay]} {
+          return {}
+        }
+        set path [::clay::tree::storage $args]
+        if {[llength $path]==0} {
+          return $clay
+        }
+        if {[dict exists $clay {*}$path .]} {
+          return [::clay::tree::sanitize [dict get $clay {*}$path]]
+        }
+        if {[dict exists $clay {*}$path]} {
+          return [dict get $clay {*}$path]
+        }
+        if {[dict exists $clay {*}[lrange $path 0 end-1] [lindex $path end]:]} {
+          return [dict get $clay {*}[lrange $path 0 end-1] [lindex $path end]:]
+        }
+        return {}
+      }
+      find {
+        set path [::clay::tree::storage $args]
+        if {![info exists clay]} {
+          set clay {}
+        }
+        set clayorder [::clay::ancestors [self]]
+        set found 0
+        if {[llength $path]==0} {
+          set result [dict create . {}]
+          foreach class $clayorder {
+            ::clay::tree::dictmerge result [$class clay dump]
+          }
+          return [::clay::tree::sanitize $result]
+        }
+        foreach class $clayorder {
+          if {[$class clay exists {*}$path .]} {
+            # Found a branch break
+            set found 1
+            break
+          }
+          if {[$class clay exists {*}$path]} {
+            # Found a leaf. Return that value immediately
+            return [$class clay get {*}$path]
+          }
+          if {[dict exists $clay {*}[lrange $path 0 end-1] [lindex $path end]:]} {
+            return [dict get $clay {*}[lrange $path 0 end-1] [lindex $path end]:]
+          }
+        }
+        if {!$found} {
+          return {}
+        }
+        set result {}
+        # Leaf searches return one data field at a time
+        # Search in our local dict
+        # Search in the in our list of classes for an answer
+        foreach class [lreverse $clayorder] {
+          ::clay::tree::dictmerge result [$class clay dget {*}$path]
+        }
+        return [::clay::tree::sanitize $result]
+      }
+      merge {
+        foreach arg $args {
+          ::clay::tree::dictmerge clay {*}$arg
+        }
+      }
+      noop {
+        # Do nothing. Used as a sign of clay savviness
+      }
+      search {
+        foreach aclass [::clay::ancestors [self]] {
+          if {[$aclass clay exists {*}$args]} {
+            return [$aclass clay get {*}$args]
+          }
+        }
+      }
+      set {
+        ::clay::tree::dictset clay {*}$args
+      }
+      unset {
+        dict unset clay {*}$args
+      }
+      default {
+        dict $submethod clay {*}$args
+      }
+    }
+  }
+}
+
+###
+# END: class.tcl
+###
+###
+# START: object.tcl
+###
+::oo::define ::clay::object {
+  method clay {submethod args} {
+    my variable clay claycache clayorder config option_canonical
+    if {![info exists clay]} {set clay {}}
+    if {![info exists claycache]} {set claycache {}}
+    if {![info exists config]} {set config {}}
+    if {![info exists clayorder] || [llength $clayorder]==0} {
+      set clayorder {}
+      if {[dict exists $clay cascade]} {
+        dict for {f v} [dict get $clay cascade] {
+          if {$f eq "."} continue
+          if {[info commands $v] ne {}} {
+            lappend clayorder $v
+          }
+        }
+      }
+      lappend clayorder {*}[::clay::ancestors [info object class [self]] {*}[lreverse [info object mixins [self]]]]
+    }
+    switch $submethod {
+      ancestors {
+        return $clayorder
+      }
+      branch {
+        set path [::clay::tree::storage $args]
+        if {![dict exists $clay {*}$path .]} {
+          dict set clay {*}$path . {}
+        }
+      }
+      busy {
+        my variable clay_busy
+        if {[llength $args]} {
+          set clay_busy [string is true [lindex $args 0]]
+          set claycache {}
+        }
+        if {![info exists clay_busy]} {
+          set clay_busy 0
+        }
+        return $clay_busy
+      }
+      cache {
+        set path [lindex $args 0]
+        set value [lindex $args 1]
+        dict set claycache $path $value
+      }
+      cget {
+        # Leaf searches return one data field at a time
+        # Search in our local dict
+        if {[llength $args]==1} {
+          set field [string trim [lindex $args 0] -:/]
+          if {[info exists option_canonical($field)]} {
+            set field $option_canonical($field)
+          }
+          if {[dict exists $config $field]} {
+            return [dict get $config $field]
+          }
+        }
+        set path [::clay::tree::storage $args]
+        if {[dict exists $clay {*}$path]} {
+          return [dict get $clay {*}$path]
+        }
+        # Search in our local cache
+        if {[dict exists $claycache {*}$path]} {
+          if {[dict exists $claycache {*}$path .]} {
+            return [dict remove [dict get $claycache {*}$path] .]
+          } else {
+            return [dict get $claycache {*}$path]
+          }
+        }
+        # Search in the in our list of classes for an answer
+        foreach class $clayorder {
+          if {[$class clay exists {*}$path]} {
+            set value [$class clay get {*}$path]
+            dict set claycache {*}$path $value
+            return $value
+          }
+          if {[$class clay exists const {*}$path]} {
+            set value [$class clay get const {*}$path]
+            dict set claycache {*}$path $value
+            return $value
+          }
+          if {[$class clay exists option {*}$path default]} {
+            set value [$class clay get option {*}$path default]
+            dict set claycache {*}$path $value
+            return $value
+          }
+        }
+        return {}
+      }
+      delegate {
+        if {![dict exists $clay .delegate <class>]} {
+          dict set clay .delegate <class> [info object class [self]]
+        }
+        if {[llength $args]==0} {
+          return [dict get $clay .delegate]
+        }
+        if {[llength $args]==1} {
+          set stub <[string trim [lindex $args 0] <>]>
+          if {![dict exists $clay .delegate $stub]} {
+            return {}
+          }
+          return [dict get $clay .delegate $stub]
+        }
+        if {([llength $args] % 2)} {
+          error "Usage: delegate
+    OR
+    delegate stub
+    OR
+    delegate stub OBJECT ?stub OBJECT? ..."
+        }
+        foreach {stub object} $args {
+          set stub <[string trim $stub <>]>
+          dict set clay .delegate $stub $object
+          oo::objdefine [self] forward ${stub} $object
+          oo::objdefine [self] export ${stub}
+        }
+      }
+      dump {
+        # Do a full dump of clay data
+        set result {}
+        # Search in the in our list of classes for an answer
+        foreach class $clayorder {
+          ::clay::tree::dictmerge result [$class clay dump]
+        }
+        ::clay::tree::dictmerge result $clay
+        return $result
+      }
+      ensemble_map {
+        set path [::clay::tree::storage method_ensemble]
+        if {[dict exists $claycache {*}$path]} {
+          return [dict get $claycache {*}$path]
+        }
+        set emap {}
+        foreach class $clayorder {
+          if {![$class clay exists {*}$path .]} continue
+          dict for {ensemble einfo} [$class clay dget {*}$path] {
+            if {$ensemble eq "."} continue
+            dict for {method body} $einfo {
+              if {$method eq "."} continue
+              dict set emap $ensemble $method class: $class
+              dict set emap $ensemble $method body: $body
+            }
+          }
+        }
+        if {[dict exists $clay {*}$path]} {
+          dict for {ensemble einfo} [dict get $clay {*}$path] {
+            dict for {method body} $einfo {
+              if {$method eq "."} continue
+              dict set emap $ensemble $method class: $class
+              dict set emap $ensemble $method body: $body
+            }
+          }
+        }
+        dict set claycache {*}$path $emap
+        return $emap
+      }
+      eval {
+        set script [lindex $args 0]
+        set buffer {}
+        set thisline {}
+        foreach line [split $script \n] {
+          append thisline $line
+          if {![info complete $thisline]} {
+            append thisline \n
+            continue
+          }
+          set thisline [string trim $thisline]
+          if {[string index $thisline 0] eq "#"} continue
+          if {[string length $thisline]==0} continue
+          if {[lindex $thisline 0] eq "my"} {
+            # Line already calls out "my", accept verbatim
+            append buffer $thisline \n
+          } elseif {[string range $thisline 0 2] eq "::"} {
+            # Fully qualified commands accepted verbatim
+            append buffer $thisline \n
+          } elseif {
+            append buffer "my $thisline" \n
+          }
+          set thisline {}
+        }
+        eval $buffer
+      }
+      evolve -
+      initialize {
+        my InitializePublic
+      }
+      exists {
+        # Leaf searches return one data field at a time
+        # Search in our local dict
+        set path [::clay::tree::storage $args]
+        if {[dict exists $clay {*}$path]} {
+          return 1
+        }
+        # Search in our local cache
+        if {[dict exists $claycache {*}$path]} {
+          return 2
+        }
+        set count 2
+        # Search in the in our list of classes for an answer
+        foreach class $clayorder {
+          incr count
+          if {[$class clay exists {*}$path]} {
+            return $count
+          }
+        }
+        return 0
+      }
+      flush {
+        set claycache {}
+        set clayorder [::clay::ancestors [info object class [self]] {*}[lreverse [info object mixins [self]]]]
+      }
+      forward {
+        oo::objdefine [self] forward {*}$args
+      }
+      dget {
+        set path [::clay::tree::storage $args]
+        if {[llength $path]==0} {
+          # Do a full dump of clay data
+          set result {}
+          # Search in the in our list of classes for an answer
+          foreach class $clayorder {
+            ::clay::tree::dictmerge result [$class clay dump]
+          }
+          ::clay::tree::dictmerge result $clay
+          return $result
+        }
+        if {[dict exists $clay {*}$path] && ![dict exists $clay {*}$path .]} {
+          # Path is a leaf
+          return [dict get $clay {*}$path]
+        }
+        # Search in our local cache
+        if {[my clay search $path value isleaf]} {
+          return $value
+        }
+
+        set found 0
+        set branch [dict exists $clay {*}$path .]
+        foreach class $clayorder {
+          if {[$class clay exists {*}$path .]} {
+            set found 1
+            break
+          }
+          if {!$branch && [$class clay exists {*}$path]} {
+            set result [$class clay dget {*}$path]
+            my clay cache $path $result
+            return $result
+          }
+        }
+        # Path is a branch
+        set result [dict getnull $clay {*}$path]
+        foreach class $clayorder {
+          if {![$class clay exists {*}$path .]} continue
+          ::clay::tree::dictmerge result [$class clay dget {*}$path]
+        }
+        #if {[dict exists $clay {*}$path .]} {
+        #  ::clay::tree::dictmerge result
+        #}
+        my clay cache $path $result
+        return $result
+      }
+      getnull -
+      get {
+        set path [::clay::tree::storage $args]
+        if {[llength $path]==0} {
+          # Do a full dump of clay data
+          set result {}
+          # Search in the in our list of classes for an answer
+          foreach class $clayorder {
+            ::clay::tree::dictmerge result [$class clay dump]
+          }
+          ::clay::tree::dictmerge result $clay
+          return [::clay::tree::sanitize $result]
+        }
+        if {[dict exists $clay {*}$path] && ![dict exists $clay {*}$path .]} {
+          # Path is a leaf
+          return [dict get $clay {*}$path]
+        }
+        # Search in our local cache
+        if {[my clay search $path value isleaf]} {
+          if {!$isleaf} {
+            return [clay::tree::sanitize $value]
+          } else {
+            return $value
+          }
+        }
+        set found 0
+        set branch [dict exists $clay {*}$path .]
+        foreach class $clayorder {
+          if {[$class clay exists {*}$path .]} {
+            set found 1
+            break
+          }
+          if {!$branch && [$class clay exists {*}$path]} {
+            set result [$class clay dget {*}$path]
+            my clay cache $path $result
+            return $result
+          }
+        }
+        # Path is a branch
+        set result [dict getnull $clay {*}$path]
+        #foreach class [lreverse $clayorder] {
+        #  if {![$class clay exists {*}$path .]} continue
+        #  ::clay::tree::dictmerge result [$class clay dget {*}$path]
+        #}
+        foreach class $clayorder {
+          if {![$class clay exists {*}$path .]} continue
+          ::clay::tree::dictmerge result [$class clay dget {*}$path]
+        }
+        #if {[dict exists $clay {*}$path .]} {
+        #  ::clay::tree::dictmerge result [dict get $clay {*}$path]
+        #}
+        my clay cache $path $result
+        return [clay::tree::sanitize $result]
+      }
+      leaf {
+        # Leaf searches return one data field at a time
+        # Search in our local dict
+        set path [::clay::tree::storage $args]
+        if {[dict exists $clay {*}$path .]} {
+          return [clay::tree::sanitize [dict get $clay {*}$path]]
+        }
+        if {[dict exists $clay {*}$path]} {
+          return [dict get $clay {*}$path]
+        }
+        # Search in our local cache
+        if {[my clay search $path value isleaf]} {
+          if {!$isleaf} {
+            return [clay::tree::sanitize $value]
+          } else {
+            return $value
+          }
+        }
+        # Search in the in our list of classes for an answer
+        foreach class $clayorder {
+          if {[$class clay exists {*}$path]} {
+            set value [$class clay get {*}$path]
+            my clay cache $path $value
+            return $value
+          }
+        }
+      }
+      merge {
+        foreach arg $args {
+          ::clay::tree::dictmerge clay {*}$arg
+        }
+      }
+      mixin {
+        ###
+        # Mix in the class
+        ###
+        my clay flush
+        set prior  [info object mixins [self]]
+        set newmixin {}
+        foreach item $args {
+          lappend newmixin ::[string trimleft $item :]
+        }
+        set newmap $args
+        foreach class $prior {
+          if {$class ni $newmixin} {
+            set script [$class clay search mixin/ unmap-script]
+            if {[string length $script]} {
+              if {[catch $script err errdat]} {
+                puts stderr "[self] MIXIN ERROR POPPING $class:\n[dict get $errdat -errorinfo]"
+              }
+            }
+          }
+        }
+        ::oo::objdefine [self] mixin {*}$args
+        ###
+        # Build a compsite map of all ensembles defined by the object's current
+        # class as well as all of the classes being mixed in
+        ###
+        my InitializePublic
+        foreach class $newmixin {
+          if {$class ni $prior} {
+            set script [$class clay search mixin/ map-script]
+            if {[string length $script]} {
+              if {[catch $script err errdat]} {
+                puts stderr "[self] MIXIN ERROR PUSHING $class:\n[dict get $errdat -errorinfo]"
+              }
+            }
+          }
+        }
+        foreach class $newmixin {
+          set script [$class clay search mixin/ react-script]
+          if {[string length $script]} {
+            if {[catch $script err errdat]} {
+              puts stderr "[self] MIXIN ERROR PEEKING $class:\n[dict get $errdat -errorinfo]"
+            }
+            break
+          }
+        }
+      }
+      mixinmap {
+        if {![dict exists $clay .mixin]} {
+          dict set clay .mixin {}
+        }
+        if {[llength $args]==0} {
+          return [dict get $clay .mixin]
+        } elseif {[llength $args]==1} {
+          return [dict getnull $clay .mixin [lindex $args 0]]
+        } else {
+          dict for {slot classes} $args {
+            dict set clay .mixin $slot $classes
+          }
+          set classlist {}
+          dict for {item class} [dict get $clay .mixin] {
+            if {$class ne {}} {
+              lappend classlist $class
+            }
+          }
+          my clay mixin {*}[lreverse $classlist]
+        }
+      }
+      provenance {
+        if {[dict exists $clay {*}$args]} {
+          return self
+        }
+        foreach class $clayorder {
+          if {[$class clay exists {*}$args]} {
+            return $class
+          }
+        }
+        return {}
+      }
+      refcount {
+        my variable refcount
+        if {![info exists refcount]} {
+          return 0
+        }
+        return $refcount
+      }
+      refcount_incr {
+        my variable refcount
+        incr refcount
+      }
+      refcount_decr {
+        my variable refcount
+        incr refcount -1
+        if {$refcount <= 0} {
+          ::clay::object_destroy [self]
+        }
+      }
+      replace {
+        set clay [lindex $args 0]
+      }
+      search {
+        set path [lindex $args 0]
+        upvar 1 [lindex $args 1] value [lindex $args 2] isleaf
+        set isleaf [expr {![dict exists $claycache $path .]}]
+        if {[dict exists $claycache $path]} {
+          set value [dict get $claycache $path]
+          return 1
+        }
+        return 0
+      }
+      source {
+        source [lindex $args 0]
+      }
+      set {
+        #puts [list [self] clay SET {*}$args]
+        ::clay::tree::dictset clay {*}$args
+      }
+      default {
+        dict $submethod clay {*}$args
+      }
+    }
+  }
+  method InitializePublic {} {
+    my variable clayorder clay claycache config option_canonical clay_busy
+    if {[info exists clay_busy] && $clay_busy} {
+      # Avoid repeated calls to InitializePublic if we know that someone is
+      # going to invoke it at the end of whatever process is going on
+      return
+    }
+    set claycache {}
+    set clayorder [::clay::ancestors [info object class [self]] {*}[lreverse [info object mixins [self]]]]
+    if {![info exists clay]} {
+      set clay {}
+    }
+    if {![info exists config]} {
+      set config {}
+    }
+    dict for {var value} [my clay get variable] {
+      if { $var in {. clay} } continue
+      set var [string trim $var :/]
+      my variable $var
+      if {![info exists $var]} {
+        if {$::clay::trace>2} {puts [list initialize variable $var $value]}
+        set $var $value
+      }
+    }
+    dict for {var value} [my clay get dict/] {
+      if { $var in {. clay} } continue
+      set var [string trim $var :/]
+      my variable $var
+      if {![info exists $var]} {
+        set $var {}
+      }
+      foreach {f v} $value {
+        if {$f eq "."} continue
+        if {![dict exists ${var} $f]} {
+          if {$::clay::trace>2} {puts [list initialize dict $var $f $v]}
+          dict set ${var} $f $v
+        }
+      }
+    }
+    foreach {var value} [my clay get array/] {
+      if { $var in {. clay} } continue
+      set var [string trim $var :/]
+      if { $var eq {clay} } continue
+      my variable $var
+      if {![info exists $var]} { array set $var {} }
+      foreach {f v} $value {
+        if {![array exists ${var}($f)]} {
+          if {$f eq "."} continue
+          if {$::clay::trace>2} {puts [list initialize array $var\($f\) $v]}
+          set ${var}($f) $v
+        }
+      }
+    }
+    foreach {field info} [my clay get option/] {
+      if { $field in {. clay} } continue
+      set field [string trim $field -/:]
+      foreach alias [dict getnull $info aliases] {
+        set option_canonical($alias) $field
+      }
+      if {[dict exists $config $field]} continue
+      set getcmd [dict getnull $info default-command]
+      if {$getcmd ne {}} {
+        set value [{*}[string map [list %field% $field %self% [namespace which my]] $getcmd]]
+      } else {
+        set value [dict getnull $info default]
+      }
+      dict set config $field $value
+      set setcmd [dict getnull $info set-command]
+      if {$setcmd ne {}} {
+        {*}[string map [list %field% [list $field] %value% [list $value] %self% [namespace which my]] $setcmd]
+      }
+    }
+
+    foreach {ensemble einfo} [my clay ensemble_map] {
+      #if {[dict exists $einfo _body]} continue
+      if {$ensemble eq "."} continue
+      set body [::clay::ensemble_methodbody $ensemble $einfo]
+      if {$::clay::trace>2} {
+        set rawbody $body
+        set body {puts [list [self] <object> [self method]]}
+        append body \n $rawbody
+      }
+      oo::objdefine [self] method $ensemble {{method default} args} $body
+    }
+  }
+}
+::clay::object clay branch array
+::clay::object clay branch mixin
+::clay::object clay branch option
+::clay::object clay branch dict clay
+::clay::object clay set variable DestroyEvent 0
+
+###
+# END: object.tcl
+###
+###
+# START: event.tcl
+###
+if {[info commands ::cron::object_destroy] eq {}} {
+  # Provide a noop if we aren't running with the cron scheduler
+  namespace eval ::cron {}
+  proc ::cron::object_destroy args {}
+}
+::namespace eval ::clay::event {
+}
+proc ::clay::cleanup {} {
+  if {![info exists ::clay::idle_destroy]} return
+  foreach obj $::clay::idle_destroy {
+    if {[info commands $obj] ne {}} {
+      catch {$obj destroy}
+    }
+  }
+  set ::clay::idle_destroy {}
+}
+proc ::clay::object_create {objname {class {}}} {
+  #if {$::clay::trace>0} {
+  #  puts [list $objname CREATE]
+  #}
+}
+proc ::clay::object_rename {object newname} {
+  if {$::clay::trace>0} {
+    puts [list $object RENAME -> $newname]
+  }
+}
+proc ::clay::object_destroy args {
+  if {![info exists ::clay::idle_destroy]} {
+    set ::clay::idle_destroy {}
+  }
+  foreach objname $args {
+    if {$::clay::trace>0} {
+      puts [list $objname DESTROY]
+    }
+    ::cron::object_destroy $objname
+    if {$objname in $::clay::idle_destroy} continue
+    lappend ::clay::idle_destroy $objname
+  }
+}
+proc ::clay::event::cancel {self {task *}} {
+  variable timer_event
+  variable timer_script
+
+  foreach {id event} [array get timer_event $self:$task] {
+    ::after cancel $event
+    set timer_event($id) {}
+    set timer_script($id) {}
+  }
+}
+proc ::clay::event::generate {self event args} {
+  set wholist [Notification_list $self $event]
+  if {$wholist eq {}} return
+  set dictargs [::oo::meta::args_to_options {*}$args]
+  set info $dictargs
+  set strict 0
+  set debug 0
+  set sender $self
+  dict with dictargs {}
+  dict set info id     [::clay::event::nextid]
+  dict set info origin $self
+  dict set info sender $sender
+  dict set info rcpt   {}
+  foreach who $wholist {
+    catch {::clay::event::notify $who $self $event $info}
+  }
+}
+proc ::clay::event::nextid {} {
+  return "event#[format %0.8x [incr ::clay::event_count]]"
+}
+proc ::clay::event::Notification_list {self event {stackvar {}}} {
+  set notify_list {}
+  foreach {obj patternlist} [array get ::clay::object_subscribe] {
+    if {$obj eq $self} continue
+    if {$obj in $notify_list} continue
+    set match 0
+    foreach {objpat eventlist} $patternlist {
+      if {![string match $objpat $self]} continue
+      foreach eventpat $eventlist {
+        if {![string match $eventpat $event]} continue
+        set match 1
+        break
+      }
+      if {$match} {
+        break
+      }
+    }
+    if {$match} {
+      lappend notify_list $obj
+    }
+  }
+  return $notify_list
+}
+proc ::clay::event::notify {rcpt sender event eventinfo} {
+  if {[info commands $rcpt] eq {}} return
+  if {$::clay::trace} {
+    puts [list event notify rcpt $rcpt sender $sender event $event info $eventinfo]
+  }
+  $rcpt notify $event $sender $eventinfo
+}
+proc ::clay::event::process {self handle script} {
+  variable timer_event
+  variable timer_script
+
+  array unset timer_event $self:$handle
+  array unset timer_script $self:$handle
+
+  set err [catch {uplevel #0 $script} result errdat]
+  if $err {
+    puts "BGError: $self $handle $script
+ERR: $result
+[dict get $errdat -errorinfo]
+***"
+  }
+}
+proc ::clay::event::schedule {self handle interval script} {
+  variable timer_event
+  variable timer_script
+  if {$::clay::trace} {
+    puts [list $self schedule $handle $interval]
+  }
+  if {[info exists timer_event($self:$handle)]} {
+    if {$script eq $timer_script($self:$handle)} {
+      return
+    }
+    ::after cancel $timer_event($self:$handle)
+  }
+  set timer_script($self:$handle) $script
+  set timer_event($self:$handle) [::after $interval [list ::clay::event::process $self $handle $script]]
+}
+proc ::clay::event::subscribe {self who event} {
+  upvar #0 ::clay::object_subscribe($self) subscriptions
+  if {![info exists subscriptions]} {
+    set subscriptions {}
+  }
+  set match 0
+  foreach {objpat eventlist} $subscriptions {
+    if {![string match $objpat $who]} continue
+    foreach eventpat $eventlist {
+      if {[string match $eventpat $event]} {
+        # This rule already exists
+        return
+      }
+    }
+  }
+  dict lappend subscriptions $who $event
+}
+proc ::clay::event::unsubscribe {self args} {
+  upvar #0 ::clay::object_subscribe($self) subscriptions
+  if {![info exists subscriptions]} {
+    return
+  }
+  switch [llength $args] {
+    1 {
+      set event [lindex $args 0]
+      if {$event eq "*"} {
+        # Shortcut, if the
+        set subscriptions {}
+      } else {
+        set newlist {}
+        foreach {objpat eventlist} $subscriptions {
+          foreach eventpat $eventlist {
+            if {[string match $event $eventpat]} continue
+            dict lappend newlist $objpat $eventpat
+          }
+        }
+        set subscriptions $newlist
+      }
+    }
+    2 {
+      set who [lindex $args 0]
+      set event [lindex $args 1]
+      if {$who eq "*" && $event eq "*"} {
+        set subscriptions {}
+      } else {
+        set newlist {}
+        foreach {objpat eventlist} $subscriptions {
+          if {[string match $who $objpat]} {
+            foreach eventpat $eventlist {
+              if {[string match $event $eventpat]} continue
+              dict lappend newlist $objpat $eventpat
+            }
+          }
+        }
+        set subscriptions $newlist
+      }
+    }
+  }
+}
+
+###
+# END: event.tcl
+###
+###
+# START: singleton.tcl
+###
+proc ::clay::singleton {name script} {
+  if {[info commands $name] eq {}} {
+    ::clay::object create $name
+  }
+  oo::objdefine $name {
+method SingletonProcs {} {
+proc class class {
+  uplevel 1 "oo::objdefine \[self\] class $class"
+  my clay delegate class $class
+}
+proc clay args {
+  my clay {*}$args
+}
+proc Ensemble {rawmethod args} {
+  if {[llength $args]==2} {
+    lassign $args argspec body
+    set argstyle tcl
+  } elseif {[llength $args]==3} {
+    lassign $args argstyle argspec body
+  } else {
+    error "Usage: Ensemble name ?argstyle? argspec body"
+  }
+  set class [uplevel 1 self]
+  #if {$::clay::trace>2} {
+  #  puts [list $class Ensemble $rawmethod $argspec $body]
+  #}
+  set mlist [split $rawmethod "::"]
+  set ensemble [string trim [lindex $mlist 0] :/]
+  set method   [string trim [lindex $mlist 2] :/]
+  if {[string index $method 0] eq "_"} {
+    $class clay set method_ensemble $ensemble $method $body
+    return
+  }
+  set realmethod  [string totitle $ensemble]_${method}
+  set realbody {}
+  if {$argstyle eq "dictargs"} {
+    append realbody "::dictargs::parse \{$argspec\} \$args" \n
+  }
+  if {[$class clay exists method_ensemble $ensemble _preamble]} {
+    append realbody [$class clay get method_ensemble $ensemble _preamble] \n
+  }
+  append realbody $body
+  if {$method eq "default"} {
+    $class clay set method_ensemble $ensemble $method: "tailcall my $realmethod \$method {*}\$args"
+    if {$argstyle eq "dictargs"} {
+      oo::objdefine $class method $realmethod [list method [list args $argspec]] $realbody
+    } else {
+      oo::objdefine $class method $realmethod [list method {*}$argspec] $realbody
+    }
+  } else {
+    $class clay set method_ensemble $ensemble $method: "tailcall my $realmethod {*}\$args"
+    if {$argstyle eq "dictargs"} {
+      oo::objdefine $class method $realmethod [list [list args $argspec]] $realbody
+    } else {
+      oo::objdefine $class method $realmethod $argspec $realbody
+    }
+  }
+  if {$::clay::trace>2} {
+    puts [list $class clay set method_ensemble/ $ensemble [string trim $method :/]  ...]
+  }
+}
+proc method args {
+  uplevel 1 "oo::objdefine \[self\] method {*}$args"
+}
+}
+method script script {
+  my clay busy 1
+  my SingletonProcs
+  eval $script
+  my clay busy 0
+  my InitializePublic
+}
+}
+  $name script $script
+  return $name
+}
+
+###
+# END: singleton.tcl
+###
+
+namespace eval ::clay {
+  namespace export *
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clay/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clay/pkgIndex.tcl
new file mode 100644
index 00000000..587c4e37
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clay/pkgIndex.tcl
@@ -0,0 +1,15 @@
+# Tcl package index file, version 1.1
+# This file is generated by the "pkg_mkIndex" command
+# and sourced either when an application starts up or
+# by a "package unknown" script.  It invokes the
+# "package ifneeded" command to set up package-related
+# information so that packages will be loaded automatically
+# in response to "package require" commands.  When this
+# script is sourced, the variable $dir must contain the
+# full path name of this file's directory.
+
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+
+
+package ifneeded clay 0.8.6 [list source [file join $dir clay.tcl]]
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clock/iso8601.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clock/iso8601.tcl
new file mode 100644
index 00000000..c31df61c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clock/iso8601.tcl
@@ -0,0 +1,280 @@
+## -*- tcl -*-
+# # ## ### ##### ######## ############# #####################
+## Copyright (c) 2004 Kevin Kenny
+## Origin http://wiki.tcl.tk/13094
+## Modified for Tcl 8.5 only (eval -> {*}).
+
+# # ## ### ##### ######## ############# #####################
+## Requisites
+
+package require Tcl 8.5
+package provide clock::iso8601 0.1
+namespace eval ::clock::iso8601 {}
+
+# # ## ### ##### ######## ############# #####################
+## API
+
+# iso8601::parse_date --
+#
+#       Parse an ISO8601 date/time string in an unknown variant.
+#
+# Parameters:
+#       string -- String to parse
+#       args -- Arguments as for [clock scan]; may include any of
+#               the '-base', '-gmt', '-locale' or '-timezone options.
+#
+# Results:
+#       Returns the given date in seconds from the Posix epoch.
+
+proc ::clock::iso8601::parse_date { string args } {
+    variable DatePatterns
+    variable Repattern
+    foreach { regex interpretation } $DatePatterns {
+	if { [regexp "^$regex\$" $string] } {
+	    #puts A|$string|\t|$regex|\t|$interpretation|
+
+	    # For incomplete dates (month and/or day missing), we have
+	    # to set our own default values to overcome clock scan's
+	    # settings. We do this by switching to a different pattern
+	    # and extending the input properly for that pattern.
+
+	    if {[dict exists $Repattern $interpretation]} {
+		lassign [dict get $Repattern $interpretation] interpretation adjust modifier
+		{*}$modifier
+		# adjust irrelevant here, see parse_time for use.
+	    }
+
+	    #puts B|$string|\t|$regex|\t|$interpretation|
+	    return [clock scan $string -format $interpretation {*}$args]
+	}
+    }
+    return -code error "not an iso8601 date string"
+}
+
+# iso8601::parse_time --
+#
+#       Parse a point-in-time in ISO8601 format
+#
+# Parameters:
+#       string -- String to parse
+#       args -- Arguments as for [clock scan]; may include any of
+#               the '-base', '-gmt', '-locale' or '-timezone options.
+#
+# Results:
+#       Returns the given time in seconds from the Posix epoch.
+
+proc ::clock::iso8601::parse_time { string args } {
+    variable DatePatterns
+    variable Repattern
+    if {![MatchTime $string field]} {
+	return -code error "not an iso8601 time string"
+    }
+
+    #parray field
+    #puts A|$string|
+
+    set pattern {}
+    foreach {regex interpretation} $DatePatterns {
+	if {[Has $interpretation tstart]} {
+	    append pattern $interpretation
+	}
+    }
+
+    if {[dict exists $Repattern $pattern]} {
+	lassign [dict get $Repattern $pattern] interpretation adjust modifier
+	{*}$modifier
+	incr tstart $adjust
+    }
+
+    append pattern [Get T len]
+    incr tstart $len
+
+    if {[Has %H tstart]} {
+	append pattern %H [Get Hcolon len]
+	incr tstart $len
+
+	if {[Has %M tstart]} {
+	    append pattern %M [Get Mcolon len]
+	    incr tstart $len
+
+	    if {[Has %S tstart]} {
+		append pattern %S
+	    } else {
+		# No seconds, default to start of minute.
+		append pattern %S
+		Insert string $tstart 00
+	    }
+	} else {
+	    # No minutes, nor seconds, default to start of hour.
+	    append pattern %M%S
+	    Insert string $tstart 0000
+	}
+    } else {
+	# No time information, default to midnight.
+	append pattern %H%M%S
+	Insert string $tstart 000000
+    }
+    if {[Has %Z _]} {
+	append pattern %Z
+    }
+
+    #puts B|$string|\t|$pattern|
+    return [clock scan $string -format $pattern {*}$args]
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::clock::iso8601::Get {x lv} {
+    upvar 1 field field string string $lv len
+    lassign $field($x) s e
+    if {($s >= 0) && ($e >= 0)} {
+	set len [expr {$e - $s + 1}]
+	return [string range $string $s $e]
+    }
+    set len 0
+    return ""
+
+}
+
+proc ::clock::iso8601::Has {x nv} {
+    upvar 1 field field string string $nv next
+    lassign $field($x) s e
+    if {($s >= 0) && ($e >= 0)} {
+	set  next $e
+	incr next
+	return 1
+    }
+    return 0
+}
+
+proc ::clock::iso8601::Insert {sv index str} {
+    upvar 1 $sv string
+    append r [string range $string 0 ${index}-1]
+    append r $str
+    append r [string range $string $index end]
+    set string $r
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## State
+
+namespace eval ::clock::iso8601 {
+
+    namespace export parse_date parse_time
+    namespace ensemble create
+
+    # Enumerate the patterns that we recognize for an ISO8601 date as both
+    # the regexp patterns that match them and the [clock] patterns that scan
+    # them.
+
+    variable DatePatterns {
+	{\d\d\d\d-\d\d-\d\d}            {%Y-%m-%d}
+	{\d\d\d\d\d\d\d\d}              {%Y%m%d}
+	{\d\d\d\d-\d\d\d}               {%Y-%j}
+	{\d\d\d\d\d\d\d}                {%Y%j}
+	{\d\d-\d\d-\d\d}                {%y-%m-%d}
+	{\d\d\d\d-\d\d}                 {%Y-%m}
+	{\d\d\d\d\d\d}                  {%y%m%d}
+	{\d\d-\d\d\d}                   {%y-%j}
+	{\d\d\d\d\d}                    {%y%j}
+	{--\d\d-\d\d}                   {--%m-%d}
+	{--\d\d\d\d}                    {--%m%d}
+	{--\d\d\d}                      {--%j}
+	{---\d\d}                       {---%d}
+	{\d\d\d\d-W\d\d-\d}             {%G-W%V-%u}
+	{\d\d\d\dW\d\d\d}               {%GW%V%u}
+	{\d\d-W\d\d-\d}                 {%g-W%V-%u}
+	{\d\dW\d\d\d}                   {%gW%V%u}
+	{\d\d\d\d-W\d\d}                {%G-W%V}
+	{\d\d\d\dW\d\d}                 {%GW%V}
+	{-W\d\d-\d}                     {-W%V-%u}
+	{-W\d\d\d}                      {-W%V%u}
+	{-W-\d}                         {%u}
+	{\d\d\d\d}                      {%Y}
+    }
+
+    # Dictionary of the patterns requiring modifications to the input
+    # for proper month and/or day defaults.
+    variable Repattern {
+	%Y-%m  {%Y-%m-%d  3 {Insert string 7 -01}}
+	%Y     {%Y-%m-%d  5 {Insert string 4 -01-01}}
+	%G-W%V {%G-W%V-%u 1 {Insert string 8 -1}}
+	%GW%V  {%GW%V%u   1 {Insert string 6 1}}
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Initialization
+
+apply {{} {
+    # MatchTime -- (constructed procedure)
+    #
+    #   Match an ISO8601 date/time string and indicate how it matched.
+    #
+    # Parameters:
+    #   string -- String to match.
+    #   fieldArray -- Name of an array in caller's scope that will receive
+    #                 parsed fields of the time.
+    #
+    # Results:
+    #   Returns 1 if the time was scanned successfully, 0 otherwise.
+    #
+    # Side effects:
+    #   Initializes the field array.  The keys that are significant:
+    #           - Any date pattern in 'DatePatterns' indicates that the
+    #             corresponding value, if non-empty, contains a date string
+    #             in the given format.
+    #           - The patterns T, Hcolon, and Mcolon indicate a literal
+    #             T preceding the time, a colon following the hour, or
+    #             a colon following the minute.
+    #           - %H, %M, %S, and %Z indicate the presence of the
+    #             corresponding parts of the time.
+
+    variable DatePatterns
+
+    set cmd {regexp -indices -expanded -nocase -- {PATTERN} $timeString ->}
+    set re \(?:\(?:
+    set sep {}
+    foreach {regex interpretation} $DatePatterns {
+	append re $sep \( $regex \)
+	append cmd " " [list field($interpretation)]
+	set sep |
+    }
+    append re \) {(T|[[:space:]]+)} \)?
+    append cmd { field(T)}
+    append re {(\d\d)(?:(:?)(\d\d)(?:(:?)(\d\d)?))?}
+    append cmd { field(%H) field(Hcolon) } {field(%M) field(Mcolon) field(%S)}
+    append re {[[:space:]]*(Z|[-+]\d\d:?\d\d)?}
+    append cmd { field(%Z)}
+    set cmd [string map [list {{PATTERN}} [list $re]] \
+		 $cmd]
+
+    proc MatchTime { timeString fieldArray } "
+             upvar 1 \$fieldArray field
+             $cmd
+         "
+
+    #puts [info body MatchTime]
+
+} ::clock::iso8601}
+
+# # ## ### ##### ######## ############# #####################
+
+return
+# Usage examples, disabled.
+
+if { [info exists ::argv0] && ( $::argv0 eq [info script] ) } {
+    puts "::clock::iso8601::parse_date"
+    puts [::clock::iso8601::parse_date 1970-01-02 -timezone :UTC]
+    puts [::clock::iso8601::parse_date 1970-W01-5 -timezone :UTC]
+    puts [time {::clock::iso8601::parse_date 1970-01-02 -timezone :UTC} 1000]
+    puts [time {::clock::iso8601::parse_date 1970-W01-5 -timezone :UTC} 1000]
+    puts "::clock::iso8601::parse_time"
+    puts [clock format [::clock::iso8601::parse_time 2004-W33-2T18:52:24Z] \
+	      -format {%X %x %z} -locale system]
+    puts [clock format [::clock::iso8601::parse_time 18:52:24Z] \
+	      -format {%X %x %z} -locale system]
+    puts [time {::clock::iso8601::parse_time 2004-W33-2T18:52:24Z} 1000]
+    puts [time {::clock::iso8601::parse_time 18:52:24Z} 1000]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clock/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clock/pkgIndex.tcl
new file mode 100644
index 00000000..4ba5a8cf
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clock/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded clock::rfc2822 0.1 [list source [file join $dir rfc2822.tcl]]
+package ifneeded clock::iso8601 0.1 [list source [file join $dir iso8601.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clock/rfc2822.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clock/rfc2822.tcl
new file mode 100644
index 00000000..0dca9f49
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/clock/rfc2822.tcl
@@ -0,0 +1,214 @@
+## -*- tcl -*-
+# # ## ### ##### ######## ############# #####################
+## Copyright (c) 2004 Kevin Kenny
+## Origin http://wiki.tcl.tk/24074
+
+# # ## ### ##### ######## ############# #####################
+## Requisites
+
+package require Tcl 8.5
+package provide clock::rfc2822 0.1
+namespace eval ::clock::rfc2822 {}
+
+# # ## ### ##### ######## ############# #####################
+## API
+
+# ::clock::rfc2822::parse_date --
+#
+#       Parses a date expressed in RFC2822 format
+#
+# Parameters:
+#       date - The date to parse
+#
+# Results:
+#       Returns the date expressed in seconds from the Epoch, or throws
+#       an error if the date could not be parsed.
+
+proc ::clock::rfc2822::parse_date { date } {
+    variable datepats
+
+    # Strip comments and excess whitespace from the date field
+
+    regsub -all -expanded {
+        \(              # open parenthesis
+        (:?
+	 [^()[.\.]]     # character other than ()\
+	     |\\.       # or backslash escape
+	 )*             # any number of times
+        \)              # close paren
+    } $date {} date
+    set date [string trim $date]
+
+    # Match the patterns in order of preference, returning the first success
+
+    foreach {regexp pat} $datepats {
+        if { [regexp -nocase $regexp $date] } {
+            return [clock scan $date -format $pat]
+        }
+    }
+
+    return -code error -errorcode {CLOCK RFC2822 BADDATE} \
+        "expected an RFC2822 date, got \"$date\""
+}
+
+
+# # ## ### ##### ######## ############# #####################
+## Internals, transient, removed after initialization.
+
+# AddDatePat --
+#
+#       Internal procedure that adds a date pattern to the pattern list
+#
+# Parameters:
+#       wpat - Regexp pattern that matches the weekday
+#       wgrp - Format group that matches the weekday
+#       ypat - Regexp pattern that matches the year
+#       ygrp - Format group that matches the year
+#       mdpat - Regexp pattern that matches month and day
+#       mdgrp - Format group that matches month and day
+#       spat - Regexp pattern that matches the seconds of the minute
+#       sgrp - Format group that matches the seconds of the minute
+#       zpat - Regexp pattern that matches the time zone
+#       zgrp - Format group that matches the time zone
+#
+# Results:
+#       None
+#
+# Side effects:
+#       Adds a complete regexp and a complete [clock scan] pattern to
+#       'datepats'
+
+proc ::clock::rfc2822::AddDatePat { wpat wgrp ypat ygrp mdpat mdgrp
+				    spat sgrp zpat zgrp } {
+    variable datepats
+
+    set regexp {^[[:space:]]*}
+    set pat {}
+    append regexp $wpat $mdpat {[[:space:]]+} $ypat
+    append pat $wgrp $mdgrp $ygrp
+    append regexp {[[:space:]]+\d\d?:\d\d} $spat
+    append pat { %H:%M} $sgrp
+    append regexp $zpat
+    append pat $zgrp
+    append regexp {[[:space:]]*$}
+    lappend datepats $regexp $pat
+    return
+}
+
+# InitDatePats --
+#
+#       Internal procedure that initializes the set of date patterns
+# 	allowed in an RFC2822 date
+#
+# Parameters:
+#       permissible - 1 if erroneous (but common) time zones are to be
+#                     allowed, 0 if they are to be rejected
+#
+# Results:
+#       None.
+#
+# Side effects:
+
+proc ::clock::rfc2822::InitDatePats { permissible } {
+    # Produce formats for the observed variants of RFC 2822 dates.
+    # Permissible variants come first in the list; impermissible ones
+    # come later.
+
+    # The month and day may be "%b %d" or "%d %b"
+
+    foreach mdpat {{[[:alpha:]]+[[:space:]]+\d\d?}
+        {\d\d?[[:space:]]+[[:alpha:]]+}} \
+        mdgrp {{%b %d} {%d %b}} \
+        mdperm {0 1} {
+            # The year may be two digits, or four. Four digit year is
+            # done first.
+
+            foreach ypat {{\d\d\d\d} {\d\d}} ygrp {%Y %y} {
+                # The seconds of the minute may be provided, or
+                # omitted.
+
+                foreach spat {{:\d\d} {}} sgrp {:%S {}} {
+                    # The weekday may be provided or omitted. It is
+                    # common but impermissible to omit the comma after
+                    # the weekday name.
+
+                    foreach wpat {
+                        {(?:Mon|T(?:ue|hu)|Wed|Fri|S(?:at|un)),[[:space:]]+}
+                        {(?:Mon|T(?:ue|hu)|Wed|Fri|S(?:at|un))[[:space:]]+}
+                        {}
+                    } wgrp {
+                        {%a, }
+                        {%a }
+                        {}
+                    } wperm {
+                        1
+                        0
+                        1
+                    } {
+                        # Time zone is defined as +/- hhmm, or as a
+                        # named time zone.  Other common but buggy
+                        # formats are GMT+-hh:mm, a time zone name in
+                        # quotation marks, and complete omission of
+                        # the time zone.
+
+                        foreach zpat {
+                            {[[:space:]]+(?:[-+]\d\d\d\d|[[:alpha:]]+)}
+                            {[[:space:]]+GMT[-+]\d\d:?\d\d}
+                            {[[:space:]]+"[[:alpha:]]+"}
+                            {}
+                        } zgrp {
+                            { %Z}
+                            { GMT%Z}
+                            { "%Z"}
+                            {}
+                        } zperm {
+                            1
+                            0
+                            0
+                            0
+                        } {
+                            if { ($zperm && $wperm && $mdperm)
+                                 == $permissible } {
+                                AddDatePat $wpat $wgrp $ypat $ygrp \
+                                    $mdpat $mdgrp \
+                                    $spat $sgrp $zpat $zgrp
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## State
+
+namespace eval ::clock::rfc2822 {
+    namespace export parse_date
+    namespace ensemble create
+
+    variable datepats {}
+}
+
+# # ## ### ##### ######## ############# #####################
+# Initialize the date patterns
+
+namespace eval ::clock::rfc2822 {
+    InitDatePats 1
+    InitDatePats 0
+    rename AddDatePat {}
+    rename InitDatePats {}
+    #puts [join $datepats \n]
+}
+
+# # ## ### ##### ######## ############# #####################
+
+return
+# Usage example, disabled
+
+if {![info exists ::argv0] || [info script] ne $::argv0} return
+puts [clock format \
+          [::clock::rfc2822::parse_date {Mon(day), 23 Aug(ust) 2004 01:23:45 UT}]]
+puts [clock format \
+          [::clock::rfc2822::parse_date "Tue, Jul 21 2009 19:37:47 GMT-0400"]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cmdline/cmdline.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cmdline/cmdline.tcl
new file mode 100644
index 00000000..db82f7eb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cmdline/cmdline.tcl
@@ -0,0 +1,933 @@
+# cmdline.tcl --
+#
+#	This package provides a utility for parsing command line
+#	arguments that are processed by our various applications.
+#	It also includes a utility routine to determine the
+#	application name for use in command line errors.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+# Copyright (c) 2001-2015 by Andreas Kupries <andreas_kupries@users.sf.net>.
+# Copyright (c) 2003      by David N. Welton  <davidw@dedasys.com>
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.2
+package provide cmdline 1.5.2
+
+namespace eval ::cmdline {
+    namespace export getArgv0 getopt getKnownOpt getfiles getoptions \
+	    getKnownOptions usage
+}
+
+# ::cmdline::getopt --
+#
+#	The cmdline::getopt works in a fashion like the standard
+#	C based getopt function.  Given an option string and a
+#	pointer to an array or args this command will process the
+#	first argument and return info on how to proceed.
+#
+# Arguments:
+#	argvVar		Name of the argv list that you
+#			want to process.  If options are found the
+#			arg list is modified and the processed arguments
+#			are removed from the start of the list.
+#	optstring	A list of command options that the application
+#			will accept.  If the option ends in ".arg" the
+#			getopt routine will use the next argument as
+#			an argument to the option.  Otherwise the option
+#			is a boolean that is set to 1 if present.
+#	optVar		The variable pointed to by optVar
+#			contains the option that was found (without the
+#			leading '-' and without the .arg extension).
+#	valVar		Upon success, the variable pointed to by valVar
+#			contains the value for the specified option.
+#			This value comes from the command line for .arg
+#			options, otherwise the value is 1.
+#			If getopt fails, the valVar is filled with an
+#			error message.
+#
+# Results:
+# 	The getopt function returns 1 if an option was found, 0 if no more
+# 	options were found, and -1 if an error occurred.
+
+proc ::cmdline::getopt {argvVar optstring optVar valVar} {
+    upvar 1 $argvVar argsList
+    upvar 1 $optVar option
+    upvar 1 $valVar value
+
+    set result [getKnownOpt argsList $optstring option value]
+
+    if {$result < 0} {
+        # Collapse unknown-option error into any-other-error result.
+        set result -1
+    }
+    return $result
+}
+
+# ::cmdline::getKnownOpt --
+#
+#	The cmdline::getKnownOpt works in a fashion like the standard
+#	C based getopt function.  Given an option string and a
+#	pointer to an array or args this command will process the
+#	first argument and return info on how to proceed.
+#
+# Arguments:
+#	argvVar		Name of the argv list that you
+#			want to process.  If options are found the
+#			arg list is modified and the processed arguments
+#			are removed from the start of the list.  Note that
+#			unknown options and the args that follow them are
+#			left in this list.
+#	optstring	A list of command options that the application
+#			will accept.  If the option ends in ".arg" the
+#			getopt routine will use the next argument as
+#			an argument to the option.  Otherwise the option
+#			is a boolean that is set to 1 if present.
+#	optVar		The variable pointed to by optVar
+#			contains the option that was found (without the
+#			leading '-' and without the .arg extension).
+#	valVar		Upon success, the variable pointed to by valVar
+#			contains the value for the specified option.
+#			This value comes from the command line for .arg
+#			options, otherwise the value is 1.
+#			If getopt fails, the valVar is filled with an
+#			error message.
+#
+# Results:
+# 	The getKnownOpt function returns 1 if an option was found,
+#	0 if no more options were found, -1 if an unknown option was
+#	encountered, and -2 if any other error occurred.
+
+proc ::cmdline::getKnownOpt {argvVar optstring optVar valVar} {
+    upvar 1 $argvVar argsList
+    upvar 1 $optVar  option
+    upvar 1 $valVar  value
+
+    # default settings for a normal return
+    set value ""
+    set option ""
+    set result 0
+
+    # check if we're past the end of the args list
+    if {[llength $argsList] != 0} {
+
+	# if we got -- or an option that doesn't begin with -, return (skipping
+	# the --).  otherwise process the option arg.
+	switch -glob -- [set arg [lindex $argsList 0]] {
+	    "--" {
+		set argsList [lrange $argsList 1 end]
+	    }
+	    "--*" -
+	    "-*" {
+		set option [string range $arg 1 end]
+		if {[string equal [string range $option 0 0] "-"]} {
+		    set option [string range $arg 2 end]
+		}
+
+		# support for format: [-]-option=value
+		set idx [string first "=" $option 1]
+		if {$idx != -1} {
+		    set _val   [string range $option [expr {$idx+1}] end]
+		    set option [string range $option 0   [expr {$idx-1}]]
+		}
+
+		if {[lsearch -exact $optstring $option] != -1} {
+		    # Booleans are set to 1 when present
+		    set value 1
+		    set result 1
+		    set argsList [lrange $argsList 1 end]
+		} elseif {[lsearch -exact $optstring "$option.arg"] != -1} {
+		    set result 1
+		    set argsList [lrange $argsList 1 end]
+
+		    if {[info exists _val]} {
+			set value $_val
+		    } elseif {[llength $argsList]} {
+			set value [lindex $argsList 0]
+			set argsList [lrange $argsList 1 end]
+		    } else {
+			set value "Option \"$option\" requires an argument"
+			set result -2
+		    }
+		} else {
+		    # Unknown option.
+		    set value "Illegal option \"-$option\""
+		    set result -1
+		}
+	    }
+	    default {
+		# Skip ahead
+	    }
+	}
+    }
+
+    return $result
+}
+
+# ::cmdline::getoptions --
+#
+#	Process a set of command line options, filling in defaults
+#	for those not specified.  This also generates an error message
+#	that lists the allowed flags if an incorrect flag is specified.
+#
+# Arguments:
+#	argvVar		The name of the argument list, typically argv.
+#			We remove all known options and their args from it.
+#                       In other words, after the call to this command the
+#                       referenced variable contains only the non-options,
+#                       and unknown options.
+#	optlist		A list-of-lists where each element specifies an option
+#			in the form:
+#				(where flag takes no argument)
+#					flag comment
+#
+#				(or where flag takes an argument)
+#					flag default comment
+#
+#			If flag ends in ".arg" then the value is taken from the
+#			command line. Otherwise it is a boolean and appears in
+#			the result if present on the command line. If flag ends
+#			in ".secret", it will not be displayed in the usage.
+#	usage		Text to include in the usage display. Defaults to
+#			"options:"
+#
+# Results
+#	Name value pairs suitable for using with array set.
+#       A modified `argvVar`.
+
+proc ::cmdline::getoptions {argvVar optlist {usage options:}} {
+    upvar 1 $argvVar argv
+
+    set opts [GetOptionDefaults $optlist result]
+
+    set argc [llength $argv]
+    while {[set err [getopt argv $opts opt arg]]} {
+	if {$err < 0} {
+            set result(?) ""
+            break
+	}
+	set result($opt) $arg
+    }
+    if {[info exist result(?)] || [info exists result(help)]} {
+	Error [usage $optlist $usage] USAGE
+    }
+    return [array get result]
+}
+
+# ::cmdline::getKnownOptions --
+#
+#	Process a set of command line options, filling in defaults
+#	for those not specified.  This ignores unknown flags, but generates
+#	an error message that lists the correct usage if a known option
+#	is used incorrectly.
+#
+# Arguments:
+#	argvVar		The name of the argument list, typically argv.  This
+#			We remove all known options and their args from it.
+#                       In other words, after the call to this command the
+#                       referenced variable contains only the non-options,
+#                       and unknown options.
+#	optlist		A list-of-lists where each element specifies an option
+#			in the form:
+#				flag default comment
+#			If flag ends in ".arg" then the value is taken from the
+#			command line. Otherwise it is a boolean and appears in
+#			the result if present on the command line. If flag ends
+#			in ".secret", it will not be displayed in the usage.
+#	usage		Text to include in the usage display. Defaults to
+#			"options:"
+#
+# Results
+#	Name value pairs suitable for using with array set.
+#       A modified `argvVar`.
+
+proc ::cmdline::getKnownOptions {argvVar optlist {usage options:}} {
+    upvar 1 $argvVar argv
+
+    set opts [GetOptionDefaults $optlist result]
+
+    # As we encounter them, keep the unknown options and their
+    # arguments in this list.  Before we return from this procedure,
+    # we'll prepend these args to the argList so that the application
+    # doesn't lose them.
+
+    set unknownOptions [list]
+
+    set argc [llength $argv]
+    while {[set err [getKnownOpt argv $opts opt arg]]} {
+	if {$err == -1} {
+            # Unknown option.
+
+            # Skip over any non-option items that follow it.
+            # For now, add them to the list of unknownOptions.
+            lappend unknownOptions [lindex $argv 0]
+            set argv [lrange $argv 1 end]
+            while {([llength $argv] != 0) \
+                    && ![string match "-*" [lindex $argv 0]]} {
+                lappend unknownOptions [lindex $argv 0]
+                set argv [lrange $argv 1 end]
+            }
+	} elseif {$err == -2} {
+            set result(?) ""
+            break
+        } else {
+            set result($opt) $arg
+        }
+    }
+
+    # Before returning, prepend the any unknown args back onto the
+    # argList so that the application doesn't lose them.
+    set argv [concat $unknownOptions $argv]
+
+    if {[info exist result(?)] || [info exists result(help)]} {
+	Error [usage $optlist $usage] USAGE
+    }
+    return [array get result]
+}
+
+# ::cmdline::GetOptionDefaults --
+#
+#	This internal procedure processes the option list (that was passed to
+#	the getopt or getKnownOpt procedure).  The defaultArray gets an index
+#	for each option in the option list, the value of which is the option's
+#	default value.
+#
+# Arguments:
+#	optlist		A list-of-lists where each element specifies an option
+#			in the form:
+#				flag default comment
+#			If flag ends in ".arg" then the value is taken from the
+#			command line. Otherwise it is a boolean and appears in
+#			the result if present on the command line. If flag ends
+#			in ".secret", it will not be displayed in the usage.
+#	defaultArrayVar	The name of the array in which to put argument defaults.
+#
+# Results
+#	Name value pairs suitable for using with array set.
+
+proc ::cmdline::GetOptionDefaults {optlist defaultArrayVar} {
+    upvar 1 $defaultArrayVar result
+
+    set opts {? help}
+    foreach opt $optlist {
+	set name [lindex $opt 0]
+	if {[regsub -- {\.secret$} $name {} name] == 1} {
+	    # Need to hide this from the usage display and getopt
+	}
+	lappend opts $name
+	if {[regsub -- {\.arg$} $name {} name] == 1} {
+
+	    # Set defaults for those that take values.
+
+	    set default [lindex $opt 1]
+	    set result($name) $default
+	} else {
+	    # The default for booleans is false
+	    set result($name) 0
+	}
+    }
+    return $opts
+}
+
+# ::cmdline::usage --
+#
+#	Generate an error message that lists the allowed flags.
+#
+# Arguments:
+#	optlist		As for cmdline::getoptions
+#	usage		Text to include in the usage display. Defaults to
+#			"options:"
+#
+# Results
+#	A formatted usage message
+
+proc ::cmdline::usage {optlist {usage {options:}}} {
+    set str "[getArgv0] $usage\n"
+    set longest 20
+    set lines {}
+    foreach opt [concat $optlist \
+	     {{- "Forcibly stop option processing"} {help "Print this message"} {? "Print this message"}}] {
+	set name "-[lindex $opt 0]"
+	if {[regsub -- {\.secret$} $name {} name] == 1} {
+	    # Hidden option
+	    continue
+	}
+	if {[regsub -- {\.arg$} $name {} name] == 1} {
+	    append name " value"
+	    set desc "[lindex $opt 2] <[lindex $opt 1]>"
+	} else {
+	    set desc "[lindex $opt 1]"
+	}
+	set n [string length $name]
+	if {$n > $longest} { set longest $n }
+	# max not available before 8.5 - set longest [expr {max($longest, )}]
+	lappend lines $name $desc
+    }
+    foreach {name desc} $lines {
+	append str "[string trimright [format " %-*s %s" $longest $name $desc]]\n"
+    }
+
+    return $str
+}
+
+# ::cmdline::getfiles --
+#
+#	Given a list of file arguments from the command line, compute
+#	the set of valid files.  On windows, file globbing is performed
+#	on each argument.  On Unix, only file existence is tested.  If
+#	a file argument produces no valid files, a warning is optionally
+#	generated.
+#
+#	This code also uses the full path for each file.  If not
+#	given it prepends [pwd] to the filename.  This ensures that
+#	these files will never conflict with files in our zip file.
+#
+# Arguments:
+#	patterns	The file patterns specified by the user.
+#	quiet		If this flag is set, no warnings will be generated.
+#
+# Results:
+#	Returns the list of files that match the input patterns.
+
+proc ::cmdline::getfiles {patterns quiet} {
+    set result {}
+    if {$::tcl_platform(platform) == "windows"} {
+	foreach pattern $patterns {
+	    set pat [file join $pattern]
+	    set files [glob -nocomplain -- $pat]
+	    if {$files == {}} {
+		if {! $quiet} {
+		    puts stdout "warning: no files match \"$pattern\""
+		}
+	    } else {
+		foreach file $files {
+		    lappend result $file
+		}
+	    }
+	}
+    } else {
+	set result $patterns
+    }
+    set files {}
+    foreach file $result {
+	# Make file an absolute path so that we will never conflict
+	# with files that might be contained in our zip file.
+	set fullPath [file join [pwd] $file]
+
+	if {[file isfile $fullPath]} {
+	    lappend files $fullPath
+	} elseif {! $quiet} {
+	    puts stdout "warning: no files match \"$file\""
+	}
+    }
+    return $files
+}
+
+# ::cmdline::getArgv0 --
+#
+#	This command returns the "sanitized" version of argv0.  It will strip
+#	off the leading path and remove the ".bin" extensions that our apps
+#	use because they must be wrapped by a shell script.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	The application name that can be used in error messages.
+
+proc ::cmdline::getArgv0 {} {
+    global argv0
+
+    set name [file tail $argv0]
+    return [file rootname $name]
+}
+
+##
+# ### ### ### ######### ######### #########
+##
+# Now the typed versions of the above commands.
+##
+# ### ### ### ######### ######### #########
+##
+
+# typedCmdline.tcl --
+#
+#    This package provides a utility for parsing typed command
+#    line arguments that may be processed by various applications.
+#
+# Copyright (c) 2000 by Ross Palmer Mohn.
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: cmdline.tcl,v 1.28 2011/02/23 17:41:52 andreas_kupries Exp $
+
+namespace eval ::cmdline {
+    namespace export typedGetopt typedGetoptions typedUsage
+
+    # variable cmdline::charclasses --
+    #
+    #    Create regexp list of allowable character classes
+    #    from "string is" error message.
+    #
+    # Results:
+    #    String of character class names separated by "|" characters.
+
+    variable charclasses
+    #checker exclude badKey
+    catch {string is . .} charclasses
+    variable dummy
+    regexp      -- {must be (.+)$} $charclasses dummy charclasses
+    regsub -all -- {, (or )?}      $charclasses {|}   charclasses
+    unset dummy
+}
+
+# ::cmdline::typedGetopt --
+#
+#	The cmdline::typedGetopt works in a fashion like the standard
+#	C based getopt function.  Given an option string and a
+#	pointer to a list of args this command will process the
+#	first argument and return info on how to proceed. In addition,
+#	you may specify a type for the argument to each option.
+#
+# Arguments:
+#	argvVar		Name of the argv list that you want to process.
+#			If options are found, the arg list is modified
+#			and the processed arguments are removed from the
+#			start of the list.
+#
+#	optstring	A list of command options that the application
+#			will accept.  If the option ends in ".xxx", where
+#			xxx is any valid character class to the tcl
+#			command "string is", then typedGetopt routine will
+#			use the next argument as a typed argument to the
+#			option. The argument must match the specified
+#			character classes (e.g. integer, double, boolean,
+#			xdigit, etc.). Alternatively, you may specify
+#			".arg" for an untyped argument.
+#
+#	optVar		Upon success, the variable pointed to by optVar
+#			contains the option that was found (without the
+#			leading '-' and without the .xxx extension).  If
+#			typedGetopt fails the variable is set to the empty
+#			string. SOMETIMES! Different for each -value!
+#
+#	argVar		Upon success, the variable pointed to by argVar
+#			contains the argument for the specified option.
+#			If typedGetopt fails, the variable is filled with
+#			an error message.
+#
+# Argument type syntax:
+#	Option that takes no argument.
+#		foo
+#
+#	Option that takes a typeless argument.
+#		foo.arg
+#
+#	Option that takes a typed argument. Allowable types are all
+#	valid character classes to the tcl command "string is".
+#	Currently must be one of alnum, alpha, ascii, control,
+#	boolean, digit, double, false, graph, integer, lower, print,
+#	punct, space, true, upper, wordchar, or xdigit.
+#		foo.double
+#
+#	Option that takes an argument from a list.
+#		foo.(bar|blat)
+#
+# Argument quantifier syntax:
+#	Option that takes an optional argument.
+#		foo.arg?
+#
+#	Option that takes a list of arguments terminated by "--".
+#		foo.arg+
+#
+#	Option that takes an optional list of arguments terminated by "--".
+#		foo.arg*
+#
+#	Argument quantifiers work on all argument types, so, for
+#	example, the following is a valid option specification.
+#		foo.(bar|blat|blah)?
+#
+# Argument syntax miscellany:
+#	Options may be specified on the command line using a unique,
+#	shortened version of the option name. Given that program foo
+#	has an option list of {bar.alpha blah.arg blat.double},
+#	"foo -b fob" returns an error, but "foo -ba fob"
+#	successfully returns {bar fob}
+#
+# Results:
+#	The typedGetopt function returns one of the following:
+#	 1	a valid option was found
+#	 0	no more options found to process
+#	-1	invalid option
+#	-2	missing argument to a valid option
+#	-3	argument to a valid option does not match type
+#
+# Known Bugs:
+#	When using options which include special glob characters,
+#	you must use the exact option. Abbreviating it can cause
+#	an error in the "cmdline::prefixSearch" procedure.
+
+proc ::cmdline::typedGetopt {argvVar optstring optVar argVar} {
+    variable charclasses
+
+    upvar $argvVar argsList
+
+    upvar $optVar retvar
+    upvar $argVar optarg
+
+    # default settings for a normal return
+    set optarg ""
+    set retvar ""
+    set retval 0
+
+    # check if we're past the end of the args list
+    if {[llength $argsList] != 0} {
+
+        # if we got -- or an option that doesn't begin with -, return (skipping
+        # the --).  otherwise process the option arg.
+        switch -glob -- [set arg [lindex $argsList 0]] {
+            "--" {
+                set argsList [lrange $argsList 1 end]
+            }
+
+            "-*" {
+                # Create list of options without their argument extensions
+
+                set optstr ""
+                foreach str $optstring {
+                    lappend optstr [file rootname $str]
+                }
+
+                set _opt [string range $arg 1 end]
+
+                set i [prefixSearch $optstr [file rootname $_opt]]
+                if {$i != -1} {
+                    set opt [lindex $optstring $i]
+
+                    set quantifier "none"
+                    if {[regexp -- {\.[^.]+([?+*])$} $opt dummy quantifier]} {
+                        set opt [string range $opt 0 end-1]
+                    }
+
+                    if {[string first . $opt] == -1} {
+                        set retval 1
+                        set retvar $opt
+                        set argsList [lrange $argsList 1 end]
+
+                    } elseif {[regexp -- "\\.(arg|$charclasses)\$" $opt dummy charclass]
+                            || [regexp -- {\.\(([^)]+)\)} $opt dummy charclass]} {
+				if {[string equal arg $charclass]} {
+                            set type arg
+			} elseif {[regexp -- "^($charclasses)\$" $charclass]} {
+                            set type class
+                        } else {
+                            set type oneof
+                        }
+
+                        set argsList [lrange $argsList 1 end]
+                        set opt [file rootname $opt]
+
+                        while {1} {
+                            if {[llength $argsList] == 0
+                                    || [string equal "--" [lindex $argsList 0]]} {
+                                if {[string equal "--" [lindex $argsList 0]]} {
+                                    set argsList [lrange $argsList 1 end]
+                                }
+
+                                set oneof ""
+                                if {$type == "arg"} {
+                                    set charclass an
+                                } elseif {$type == "oneof"} {
+                                    set oneof ", one of $charclass"
+                                    set charclass an
+                                }
+
+                                if {$quantifier == "?"} {
+                                    set retval 1
+                                    set retvar $opt
+                                    set optarg ""
+                                } elseif {$quantifier == "+"} {
+                                    set retvar $opt
+                                    if {[llength $optarg] < 1} {
+                                        set retval -2
+                                        set optarg "Option requires at least one $charclass argument$oneof -- $opt"
+                                    } else {
+                                        set retval 1
+                                    }
+                                } elseif {$quantifier == "*"} {
+                                    set retval 1
+                                    set retvar $opt
+                                } else {
+                                    set optarg "Option requires $charclass argument$oneof -- $opt"
+                                    set retvar $opt
+                                    set retval -2
+                                }
+                                set quantifier ""
+                            } elseif {($type == "arg")
+                                    || (($type == "oneof")
+                                    && [string first "|[lindex $argsList 0]|" "|$charclass|"] != -1)
+                                    || (($type == "class")
+                                    && [string is $charclass [lindex $argsList 0]])} {
+                                set retval 1
+                                set retvar $opt
+                                lappend optarg [lindex $argsList 0]
+                                set argsList [lrange $argsList 1 end]
+                            } else {
+                                set oneof ""
+                                if {$type == "arg"} {
+                                    set charclass an
+                                } elseif {$type == "oneof"} {
+                                    set oneof ", one of $charclass"
+                                    set charclass an
+                                }
+                                set optarg "Option requires $charclass argument$oneof -- $opt"
+                                set retvar $opt
+                                set retval -3
+
+                                if {$quantifier == "?"} {
+                                    set retval 1
+                                    set optarg ""
+                                }
+                                set quantifier ""
+                            }
+                             if {![regexp -- {[+*]} $quantifier]} {
+                                break;
+                            }
+                        }
+                    } else {
+                        Error \
+			    "Illegal option type specification: must be one of $charclasses" \
+			    BAD OPTION TYPE
+                    }
+                } else {
+                    set optarg "Illegal option -- $_opt"
+                    set retvar $_opt
+                    set retval -1
+                }
+            }
+	    default {
+		# Skip ahead
+	    }
+        }
+    }
+
+    return $retval
+}
+
+# ::cmdline::typedGetoptions --
+#
+#	Process a set of command line options, filling in defaults
+#	for those not specified. This also generates an error message
+#	that lists the allowed options if an incorrect option is
+#	specified.
+#
+# Arguments:
+#	argvVar		The name of the argument list, typically argv
+#	optlist		A list-of-lists where each element specifies an option
+#			in the form:
+#
+#				option default comment
+#
+#			Options formatting is as described for the optstring
+#			argument of typedGetopt. Default is for optionally
+#			specifying a default value. Comment is for optionally
+#			specifying a comment for the usage display. The
+#			options "--", "-help", and "-?" are automatically included
+#			in optlist.
+#
+# Argument syntax miscellany:
+#	Options formatting and syntax is as described in typedGetopt.
+#	There are two additional suffixes that may be applied when
+#	passing options to typedGetoptions.
+#
+#	You may add ".multi" as a suffix to any option. For options
+#	that take an argument, this means that the option may be used
+#	more than once on the command line and that each additional
+#	argument will be appended to a list, which is then returned
+#	to the application.
+#		foo.double.multi
+#
+#	If a non-argument option is specified as ".multi", it is
+#	toggled on and off for each time it is used on the command
+#	line.
+#		foo.multi
+#
+#	If an option specification does not contain the ".multi"
+#	suffix, it is not an error to use an option more than once.
+#	In this case, the behavior for options with arguments is that
+#	the last argument is the one that will be returned. For
+#	options that do not take arguments, using them more than once
+#	has no additional effect.
+#
+#	Options may also be hidden from the usage display by
+#	appending the suffix ".secret" to any option specification.
+#	Please note that the ".secret" suffix must be the last suffix,
+#	after any argument type specification and ".multi" suffix.
+#		foo.xdigit.multi.secret
+#
+# Results
+#	Name value pairs suitable for using with array set.
+
+proc ::cmdline::typedGetoptions {argvVar optlist {usage options:}} {
+    variable charclasses
+
+    upvar 1 $argvVar argv
+
+    set opts {? help}
+    foreach opt $optlist {
+        set name [lindex $opt 0]
+        if {[regsub -- {\.secret$} $name {} name] == 1} {
+            # Remove this extension before passing to typedGetopt.
+        }
+        if {[regsub -- {\.multi$} $name {} name] == 1} {
+            # Remove this extension before passing to typedGetopt.
+
+            regsub -- {\..*$} $name {} temp
+            set multi($temp) 1
+        }
+        lappend opts $name
+        if {[regsub -- "\\.(arg|$charclasses|\\(.+).?\$" $name {} name] == 1} {
+            # Set defaults for those that take values.
+            # Booleans are set just by being present, or not
+
+            set dflt [lindex $opt 1]
+            if {$dflt != {}} {
+                set defaults($name) $dflt
+            }
+        }
+    }
+    set argc [llength $argv]
+    while {[set err [typedGetopt argv $opts opt arg]]} {
+        if {$err == 1} {
+            if {[info exists result($opt)]
+                    && [info exists multi($opt)]} {
+                # Toggle boolean options or append new arguments
+
+                if {$arg == ""} {
+                    unset result($opt)
+                } else {
+                    set result($opt) "$result($opt) $arg"
+                }
+            } else {
+                set result($opt) "$arg"
+            }
+        } elseif {($err == -1) || ($err == -3)} {
+            Error [typedUsage $optlist $usage] USAGE
+        } elseif {$err == -2 && ![info exists defaults($opt)]} {
+            Error [typedUsage $optlist $usage] USAGE
+        }
+    }
+    if {[info exists result(?)] || [info exists result(help)]} {
+        Error [typedUsage $optlist $usage] USAGE
+    }
+    foreach {opt dflt} [array get defaults] {
+        if {![info exists result($opt)]} {
+            set result($opt) $dflt
+        }
+    }
+    return [array get result]
+}
+
+# ::cmdline::typedUsage --
+#
+#	Generate an error message that lists the allowed flags,
+#	type of argument taken (if any), default value (if any),
+#	and an optional description.
+#
+# Arguments:
+#	optlist		As for cmdline::typedGetoptions
+#
+# Results
+#	A formatted usage message
+
+proc ::cmdline::typedUsage {optlist {usage {options:}}} {
+    variable charclasses
+
+    set str "[getArgv0] $usage\n"
+    set longest 20
+    set lines {}
+    foreach opt [concat $optlist \
+            {{help "Print this message"} {? "Print this message"}}] {
+        set name "-[lindex $opt 0]"
+        if {[regsub -- {\.secret$} $name {} name] == 1} {
+            # Hidden option
+	    continue
+	}
+
+	if {[regsub -- {\.multi$} $name {} name] == 1} {
+	    # Display something about multiple options
+	}
+
+	if {[regexp -- "\\.(arg|$charclasses)\$" $name dummy charclass] ||
+	    [regexp -- {\.\(([^)]+)\)} $opt dummy charclass]
+	} {
+	    regsub -- "\\..+\$" $name {} name
+	    append name " $charclass"
+	    set desc [lindex $opt 2]
+	    set default [lindex $opt 1]
+	    if {$default != ""} {
+		append desc " <$default>"
+	    }
+	} else {
+	    set desc [lindex $opt 1]
+	}
+	lappend accum $name $desc
+	set n [string length $name]
+	if {$n > $longest} { set longest $n }
+	# max not available before 8.5 - set longest [expr {max($longest, [string length $name])}]
+    }
+    foreach {name desc} $accum {
+	append str "[string trimright [format " %-*s %s" $longest $name $desc]]\n"
+    }
+    return $str
+}
+
+# ::cmdline::prefixSearch --
+#
+#	Search a Tcl list for a pattern; searches first for an exact match,
+#	and if that fails, for a unique prefix that matches the pattern
+#	(i.e, first "lsearch -exact", then "lsearch -glob $pattern*"
+#
+# Arguments:
+#	list		list of words
+#	pattern		word to search for
+#
+# Results:
+#	Index of found word is returned. If no exact match or
+#	unique short version is found then -1 is returned.
+
+proc ::cmdline::prefixSearch {list pattern} {
+    # Check for an exact match
+
+    if {[set pos [::lsearch -exact $list $pattern]] > -1} {
+        return $pos
+    }
+
+    # Check for a unique short version
+
+    set slist [lsort $list]
+    if {[set pos [::lsearch -glob $slist $pattern*]] > -1} {
+        # What if there is nothing for the check variable?
+
+        set check [lindex $slist [expr {$pos + 1}]]
+        if {[string first $pattern $check] != 0} {
+            return [::lsearch -exact $list [lindex $slist $pos]]
+        }
+    }
+    return -1
+}
+# ::cmdline::Error --
+#
+#	Internal helper to throw errors with a proper error-code attached.
+#
+# Arguments:
+#	message		text of the error message to throw.
+#	args		additional parts of the error code to use,
+#                       with CMDLINE as basic prefix added by this command.
+#
+# Results:
+#	An error is thrown, always.
+
+proc ::cmdline::Error {message args} {
+    return -code error -errorcode [linsert $args 0 CMDLINE] $message
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cmdline/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cmdline/pkgIndex.tcl
new file mode 100644
index 00000000..315d2361
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cmdline/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded cmdline 1.5.2 [list source [file join $dir cmdline.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/comm/comm.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/comm/comm.tcl
new file mode 100644
index 00000000..efecf1d4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/comm/comm.tcl
@@ -0,0 +1,1807 @@
+# comm.tcl --
+#
+#	socket-based 'send'ing of commands between interpreters.
+#
+# %%_OSF_FREE_COPYRIGHT_%%
+# Copyright (C) 1995-1998 The Open Group.   All Rights Reserved.
+# (Please see the file "comm.LICENSE" that accompanied this source,
+#  or http://www.opengroup.org/www/dist_client/caubweb/COPYRIGHT.free.html)
+# Copyright (c) 2003-2007 ActiveState Corporation
+#
+# This is the 'comm' package written by Jon Robert LoVerso, placed
+# into its own namespace during integration into tcllib.
+#
+# Note that the actual code was changed in several places (Reordered,
+# eval speedup)
+# 
+#	comm works just like Tk's send, except that it uses sockets.
+#	These commands work just like "send" and "winfo interps":
+#
+#		comm send ?-async? <id> <cmd> ?<arg> ...?
+#		comm interps
+#
+#	See the manual page comm.n for further details on this package.
+
+package require Tcl 8.5
+package require snit ; # comm::future objects.
+
+namespace eval ::comm {
+    namespace export comm comm_send
+
+    variable  comm
+    array set comm {}
+
+    if {![info exists comm(chans)]} {
+	array set comm {
+	    debug 0 chans {} localhost 127.0.0.1
+	    connecting,hook	1
+	    connected,hook	1
+	    incoming,hook	1
+	    eval,hook		1
+	    callback,hook	1
+	    reply,hook		1
+	    lost,hook		1
+	    offerVers		{3 2}
+	    acceptVers		{3 2}
+	    defVers		2
+	    defaultEncoding	"utf-8"
+	    defaultSilent   0
+	}
+	set comm(lastport) [expr {[pid] % 32768 + 9999}]
+	# fast check for acceptable versions
+	foreach comm(_x) $comm(acceptVers) {
+	    set comm($comm(_x),vers) 1
+	}
+	catch {unset comm(_x)}
+    }
+
+    # Class variables:
+    #	lastport		saves last default listening port allocated
+    #	debug			enable debug output
+    #	chans			list of allocated channels
+    #   future,fid,$fid         List of futures a specific peer is waiting for.
+    #
+    # Channel instance variables:
+    # comm()
+    #	$ch,port		listening port (our id)
+    #	$ch,socket		listening socket
+    #	$ch,socketcmd		command to use to create sockets.
+    #   $ch,silent      boolean to indicate whether to throw error on
+    #                   protocol negotiation failure
+    #	$ch,local		boolean to indicate if port is local
+    #	$ch,interp		interpreter to run received scripts in.
+    #				If not empty we own it! = We destroy it
+    #				with the channel
+    #	$ch,events		List of hoks to run in the 'interp', if defined
+    #	$ch,serial		next serial number for commands
+    #
+    #	$ch,hook,$hook		script for hook $hook
+    #
+    #	$ch,peers,$id		open connections to peers; ch,id=>fid
+    #	$ch,fids,$fid		reverse mapping for peers; ch,fid=>id
+    #	$ch,vers,$id		negotiated protocol version for id
+    #	$ch,pending,$id		list of outstanding send serial numbers for id
+    #
+    #	$ch,buf,$fid		buffer to collect incoming data
+    #	$ch,result,$serial	result value set here to wake up sender
+    #	$ch,return,$serial	return codes to go along with result
+
+    if {0} {
+	# Propagate result, code, and errorCode.  Can't just eval
+	# otherwise TCL_BREAK gets turned into TCL_ERROR.
+	global errorInfo errorCode
+	set code [catch [concat commSend $args] res]
+	return -code $code -errorinfo $errorInfo -errorcode $errorCode $res
+    }
+}
+
+# ::comm::comm_send --
+#
+#	Convenience command. Replaces Tk 'send' and 'winfo' with
+#	versions using the 'comm' variants. Multiple calls are
+#	allowed, only the first one will have an effect.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	None.
+
+proc ::comm::comm_send {} {
+    proc send {args} {
+	# Use pure lists to speed this up.
+	uplevel 1 [linsert $args 0 ::comm::comm send]
+    }
+    rename winfo tk_winfo
+    proc winfo {cmd args} {
+	if {![string match in* $cmd]} {
+	    # Use pure lists to speed this up ...
+	    return [uplevel 1 [linsert $args 0 tk_winfo $cmd]]
+	}
+	return [::comm::comm interps]
+    }
+    proc ::comm::comm_send {} {}
+}
+
+# ::comm::comm --
+#
+#	See documentation for public methods of "comm".
+#	This procedure is followed by the definition of
+#	the public methods themselves.
+#
+# Arguments:
+#	cmd	Invoked method
+#	args	Arguments to method.
+#
+# Results:
+#	As of the invoked method.
+
+proc ::comm::comm {cmd args} {
+    set method [info commands ::comm::comm_cmd_$cmd*]
+
+    if {[llength $method] == 1} {
+	set chan ::comm::comm; # passed to methods
+	return [uplevel 1 [linsert $args 0 $method $chan]]
+    } else {
+	foreach c [info commands ::comm::comm_cmd_*] {
+	    # remove ::comm::comm_cmd_
+	    lappend cmds [string range $c 17 end]
+	}
+        return -code error "unknown subcommand \"$cmd\":\
+		must be one of [join [lsort $cmds] {, }]"
+    }
+}
+
+proc ::comm::comm_cmd_connect {chan args} {
+    uplevel 1 [linsert $args 0 [namespace current]::commConnect $chan]
+}
+proc ::comm::comm_cmd_self {chan args} {
+    variable comm
+    return $comm($chan,port)
+}
+proc ::comm::comm_cmd_channels {chan args} {
+    variable comm
+    return $comm(chans)
+}
+proc ::comm::comm_cmd_configure {chan args} {
+    uplevel 1 [linsert $args 0 [namespace current]::commConfigure $chan 0]
+}
+proc ::comm::comm_cmd_ids {chan args} {
+    variable comm
+    set res $comm($chan,port)
+    foreach {i id} [array get comm $chan,fids,*] {lappend res $id}
+    return $res
+}
+interp alias {} ::comm::comm_cmd_interps {} ::comm::comm_cmd_ids
+proc ::comm::comm_cmd_remoteid {chan args} {
+    variable comm
+    if {[info exists comm($chan,remoteid)]} {
+	set comm($chan,remoteid)
+    } else {
+	return -code error "No remote commands processed yet"
+    }
+}
+proc ::comm::comm_cmd_debug {chan bool} {
+    variable comm
+    return [set comm(debug) [string is true -strict $bool]]
+}
+
+# ### ### ### ######### ######### #########
+## API: Setup async result generation for a remotely invoked command.
+
+# (future,fid,<fid>) -> list (future)
+# (current,async)    -> bool (default 0) 
+# (current,state)    -> list (chan fid cmd ser)
+
+proc ::comm::comm_cmd_return_async {chan} {
+    variable comm
+
+    if {![info exists comm(current,async)]} {
+	return -code error "No remote commands processed yet"
+    }
+    if {$comm(current,async)} {
+	# Return the same future which were generated by the first
+	# call.
+	return $comm(current,state)
+    }
+
+    foreach {cmdchan cmdfid cmd ser} $comm(current,state) break
+
+    # Assert that the channel performing the request and the channel
+    # the current command came in are identical. Panic if not.
+
+    if {![string equal $chan $cmdchan]} {
+	return -code error "Internal error: Trying to activate\
+		async return for a command on a different channel"
+    }
+
+    # Establish the future for the command and return a handle for
+    # it. Remember the outstanding futures for a peer, so that we can
+    # cancel them if the peer is lost before the promise implicit in
+    # the future is redeemed.
+
+    set future [::comm::future %AUTO% $chan $cmdfid $cmd $ser]
+
+    lappend comm(future,fid,$cmdfid) $future
+    set     comm(current,state)      $future
+
+    # Mark the current command as using async result return. We do
+    # this last to ensure that all errors in this method are reported
+    # through the regular channels.
+
+    set comm(current,async) 1
+
+    return $future
+}
+
+# hook --
+#
+#	Internal command. Implements 'comm hook'.
+#
+# Arguments:
+#	hook	hook to modify
+#	script	Script to add/remove to/from the hook
+#
+# Results:
+#	None.
+#
+proc ::comm::comm_cmd_hook {chan hook {script +}} {
+    variable comm
+    if {![info exists comm($hook,hook)]} {
+	return -code error "Unknown hook invoked"
+    }
+    if {!$comm($hook,hook)} {
+	return -code error "Unimplemented hook invoked"
+    }
+    if {[string equal + $script]} {
+	if {[catch {set comm($chan,hook,$hook)} ret]} {
+	    return
+	}
+	return $ret
+    }
+    if {[string match +* $script]} {
+	append comm($chan,hook,$hook) \n [string range $script 1 end]
+    } else {
+	set comm($chan,hook,$hook) $script
+    }
+    return
+}
+
+# abort --
+#
+#	Close down all peer connections.
+#	Implements the 'comm abort' method.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	None.
+
+proc ::comm::comm_cmd_abort {chan} {
+    variable comm
+
+    foreach pid [array names comm $chan,peers,*] {
+	commLostConn $chan $comm($pid) "Connection aborted by request"
+    }
+}
+
+# destroy --
+#
+#	Destroy the channel invoking it.
+#	Implements the 'comm destroy' method.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	None.
+#
+proc ::comm::comm_cmd_destroy {chan} {
+    variable comm
+    catch {close $comm($chan,socket)}
+    comm_cmd_abort $chan
+    if {$comm($chan,interp) != {}} {
+	interp delete $comm($chan,interp)
+    }
+    catch {unset comm($chan,port)}
+    catch {unset comm($chan,local)}
+    catch {unset comm($chan,silent)}
+    catch {unset comm($chan,interp)}
+    catch {unset comm($chan,events)}
+    catch {unset comm($chan,socket)}
+    catch {unset comm($chan,socketcmd)}
+    catch {unset comm($chan,remoteid)}
+    unset comm($chan,serial)
+    unset comm($chan,chan)
+    unset comm($chan,encoding)
+    unset comm($chan,listen)
+    # array unset would have been nicer, but is not available in
+    # 8.2/8.3
+    foreach pattern {hook,* interp,* vers,*} {
+	foreach k [array names comm $chan,$pattern] {unset comm($k)}
+    }
+    set pos [lsearch -exact $comm(chans) $chan]
+    set comm(chans) [lreplace $comm(chans) $pos $pos]
+    if {
+	![string equal ::comm::comm $chan] &&
+	![string equal [info proc $chan] ""]
+    } {
+	rename $chan {}
+    }
+    return
+}
+
+# shutdown --
+#
+#	Close down a peer connection.
+#	Implements the 'comm shutdown' method.
+#
+# Arguments:
+#	id	Reference to the remote interp
+#
+# Results:
+#	None.
+#
+proc ::comm::comm_cmd_shutdown {chan id} {
+    variable comm
+
+    if {[info exists comm($chan,peers,$id)]} {
+	commLostConn $chan $comm($chan,peers,$id) \
+	    "Connection shutdown by request"
+    }
+}
+
+# new --
+#
+#	Create a new comm channel/instance.
+#	Implements the 'comm new' method.
+#
+# Arguments:
+#	ch	Name of the new channel
+#	args	Configuration, in the form of -option value pairs.
+#
+# Results:
+#	None.
+#
+proc ::comm::comm_cmd_new {chan ch args} {
+    variable comm
+
+    if {[lsearch -exact $comm(chans) $ch] >= 0} {
+	return -code error "Already existing channel: $ch"
+    }
+    if {([llength $args] % 2) != 0} {
+	return -code error "Must have an even number of config arguments"
+    }
+    # ensure that the new channel name is fully qualified
+    set ch ::[string trimleft $ch :]
+    if {[string equal ::comm::comm $ch]} {
+	# allow comm to be recreated after destroy
+    } elseif {[string equal $ch [info commands $ch]]} {
+	return -code error "Already existing command: $ch"
+    } else {
+	# Create the new channel with fully qualified proc name
+	proc $ch {cmd args} {
+	    set method [info commands ::comm::comm_cmd_$cmd*]
+
+	    if {[llength $method] == 1} {
+		# this should work right even if aliased
+		# it is passed to methods to identify itself
+		set chan [namespace origin [lindex [info level 0] 0]]
+		return [uplevel 1 [linsert $args 0 $method $chan]]
+	    } else {
+		foreach c [info commands ::comm::comm_cmd_*] {
+		    # remove ::comm::comm_cmd_
+		    lappend cmds [string range $c 17 end]
+		}
+		return -code error "unknown subcommand \"$cmd\":\
+			must be one of [join [lsort $cmds] {, }]"
+	    }
+	}
+    }
+    lappend comm(chans) $ch
+    set chan $ch
+    set comm($chan,serial) 0
+    set comm($chan,chan)   $chan
+    set comm($chan,port)   0
+    set comm($chan,listen) 0
+    set comm($chan,socket) ""
+    set comm($chan,local)  1
+    set comm($chan,silent)   $comm(defaultSilent)
+    set comm($chan,encoding) $comm(defaultEncoding)
+    set comm($chan,interp)   {}
+    set comm($chan,events)   {}
+    set comm($chan,socketcmd) ::socket
+
+    if {[llength $args] > 0} {
+	if {[catch [linsert $args 0 commConfigure $chan 1] err]} {
+	    comm_cmd_destroy $chan
+	    return -code error $err
+	}
+    }
+    return $chan
+}
+
+# send --
+#
+#	Send command to a specified channel.
+#	Implements the 'comm send' method.
+#
+# Arguments:
+#	args	see inside
+#
+# Results:
+#	varies.
+#
+proc ::comm::comm_cmd_send {chan args} {
+    variable comm
+
+    set cmd send
+
+    # args = ?-async | -command command? id cmd ?arg arg ...?
+    set i 0
+    set opt [lindex $args $i]
+    if {[string equal -async $opt]} {
+	set cmd async
+	incr i
+    } elseif {[string equal -command $opt]} {
+	set cmd command
+	set callback [lindex $args [incr i]]
+	incr i
+    }
+    # args = id cmd ?arg arg ...?
+
+    set id [lindex $args $i]
+    incr i
+    set args [lrange $args $i end]
+
+    if {![info complete $args]} {
+	return -code error "Incomplete command"
+    }
+    if {![llength $args]} {
+	return -code error \
+		"wrong # args: should be \"send ?-async? id arg ?arg ...?\""
+    }
+    if {[catch {commConnect $chan $id} fid]} {
+	return -code error "Connect to remote failed: $fid"
+    }
+
+    set ser [incr comm($chan,serial)]
+    # This is unneeded - wraps from 2147483647 to -2147483648
+    ### if {$comm($chan,serial) == 0x7fffffff} {set comm($chan,serial) 0}
+
+    commDebug {puts stderr "<$chan> send <[list [list $cmd $ser $args]]>"}
+
+    # The double list assures that the command is a single list when read.
+    puts  $fid [list [list $cmd $ser $args]]
+    flush $fid
+
+    commDebug {puts stderr "<$chan> sent"}
+
+    # wait for reply if so requested
+
+    if {[string equal command $cmd]} {
+	# In this case, don't wait on the command result.  Set the callback
+	# in the return and that will be invoked by the result.
+	lappend comm($chan,pending,$id) [list $ser callback]
+	set comm($chan,return,$ser) $callback
+	return $ser
+    } elseif {[string equal send $cmd]} {
+	upvar 0 comm($chan,pending,$id) pending	;# shorter variable name
+
+	lappend pending $ser
+	set comm($chan,return,$ser) ""		;# we're waiting
+
+	commDebug {puts stderr "<$chan> --<<waiting $ser>>--"}
+	vwait ::comm::comm($chan,result,$ser)
+
+	# if connection was lost, pending is gone
+	if {[info exists pending]} {
+	    set pos [lsearch -exact $pending $ser]
+	    set pending [lreplace $pending $pos $pos]
+	}
+
+	commDebug {
+	    puts stderr "<$chan> result\
+		    <$comm($chan,return,$ser);$comm($chan,result,$ser)>"
+	}
+
+	array set return $comm($chan,return,$ser)
+	unset comm($chan,return,$ser)
+	set thisres $comm($chan,result,$ser)
+	unset comm($chan,result,$ser)
+	switch -- $return(-code) {
+	    "" - 0 {return $thisres}
+	    1 {
+		return  -code $return(-code) \
+			-errorinfo $return(-errorinfo) \
+			-errorcode $return(-errorcode) \
+			$thisres
+	    }
+	    default {return -code $return(-code) $thisres}
+	}
+    }
+}
+
+###############################################################################
+
+# ::comm::commDebug --
+#
+#	Internal command. Conditionally executes debugging
+#	statements. Currently this are only puts commands logging the
+#	various interactions. These could be replaced with calls into
+#	the 'log' module.
+#
+# Arguments:
+#	arg	Tcl script to execute.
+#
+# Results:
+#	None.
+
+proc ::comm::commDebug {cmd} {
+    variable comm
+    if {$comm(debug)} {
+	uplevel 1 $cmd
+    }
+}
+
+# ::comm::commConfVars --
+#
+#	Internal command. Used to declare configuration options.
+#
+# Arguments:
+#	v	Name of configuration option.
+#	t	Default value.
+#
+# Results:
+#	None.
+
+proc ::comm::commConfVars {v t} {
+    variable comm
+    set comm($v,var) $t
+    set comm(vars) {}
+    foreach c [array names comm *,var] {
+	lappend comm(vars) [lindex [split $c ,] 0]
+    }
+    return
+}
+::comm::commConfVars port     p
+::comm::commConfVars local    b
+::comm::commConfVars listen   b
+::comm::commConfVars socket   ro
+::comm::commConfVars socketcmd socketcmd
+::comm::commConfVars chan     ro
+::comm::commConfVars serial   ro
+::comm::commConfVars encoding enc
+::comm::commConfVars silent   b
+::comm::commConfVars interp   interp
+::comm::commConfVars events   ev
+
+# ::comm::commConfigure --
+#
+#	Internal command. Implements 'comm configure'.
+#
+# Arguments:
+#	force	Boolean flag. If set the socket is reinitialized.
+#	args	New configuration, as -option value pairs.
+#
+# Results:
+#	None.
+
+proc ::comm::commConfigure {chan {force 0} args} {
+    variable comm
+
+    # query
+    if {[llength $args] == 0} {
+	foreach v $comm(vars) {lappend res -$v $comm($chan,$v)}
+	return $res
+    } elseif {[llength $args] == 1} {
+	set arg [lindex $args 0]
+	set var [string range $arg 1 end]
+	if {![string match -* $arg] || ![info exists comm($var,var)]} {
+	    return -code error "Unknown configuration option: $arg"
+	}
+	return $comm($chan,$var)
+    }
+
+    # set
+    set opt 0
+    foreach arg $args {
+	incr opt
+	if {[info exists skip]} {unset skip; continue}
+	set var [string range $arg 1 end]
+	if {![string match -* $arg] || ![info exists comm($var,var)]} {
+	    return -code error "Unknown configuration option: $arg"
+	}
+	set optval [lindex $args $opt]
+	switch $comm($var,var) {
+	    ev {
+		if {![string equal  $optval ""]} {
+		    set err 0
+		    if {[catch {
+			foreach ev $optval {
+			    if {[lsearch -exact {connecting connected incoming eval callback reply lost} $ev] < 0} {
+				set err 1
+				break
+			    }
+			}
+		    }]} {
+			set err 1
+		    }
+		    if {$err} {
+			return -code error \
+				"Non-event to configuration option: -$var"
+		    }
+		}
+		# FRINK: nocheck
+		set $var $optval
+		set skip 1
+	    }
+	    interp {
+		if {
+		    ![string equal  $optval ""] &&
+		    ![interp exists $optval]
+		} {
+		    return -code error \
+			    "Non-interpreter to configuration option: -$var"
+		}
+		# FRINK: nocheck
+		set $var $optval
+		set skip 1
+	    }
+	    b {
+		# FRINK: nocheck
+		set $var [string is true -strict $optval]
+		set skip 1
+	    }
+	    v {
+		# FRINK: nocheck
+		set $var $optval
+		set skip 1
+	    }
+	    p {
+		if {
+		    ![string equal $optval ""] &&
+		    ![string is integer $optval]
+		} {
+		    return -code error \
+			"Non-port to configuration option: -$var"
+		}
+		# FRINK: nocheck
+		set $var $optval
+		set skip 1
+	    }
+	    i {
+		if {![string is integer $optval]} {
+		    return -code error \
+			"Non-integer to configuration option: -$var"
+		}
+		# FRINK: nocheck
+		set $var $optval
+		set skip 1
+	    }
+	    enc {
+		# to configure encodings, we will need to extend the
+		# protocol to allow for handshaked encoding changes
+		return -code error "encoding not configurable"
+		if {[lsearch -exact [encoding names] $optval] == -1} {
+		    return -code error \
+			"Unknown encoding to configuration option: -$var"
+		}
+		set $var $optval
+		set skip 1
+	    }
+	    ro {
+		return -code error "Readonly configuration option: -$var"
+	    }
+	    socketcmd {
+		if {$optval eq {}} {
+		    return -code error \
+			"Non-command to configuration option: -$var"
+		}
+
+		set $var $optval
+		set skip 1
+	    }
+	}
+    }
+    if {[info exists skip]} {
+	return -code error "Missing value for option: $arg"
+    }
+
+    foreach var {port listen local socketcmd} {
+	# FRINK: nocheck
+	if {[info exists $var] && [set $var] != $comm($chan,$var)} {
+	    incr force
+	    # FRINK: nocheck
+	    set comm($chan,$var) [set $var]
+	}
+    }
+
+    foreach var {silent interp events} {
+	# FRINK: nocheck
+	if {[info exists $var] && ([set $var] != $comm($chan,$var))} {
+	    # FRINK: nocheck
+	    set comm($chan,$var) [set ip [set $var]]
+	    if {[string equal $var "interp"] && ($ip != "")} {
+		# Interrogate the interp about its capabilities.
+		#
+		# Like: set, array set, uplevel present ?
+		# Or:   The above, hidden ?
+		#
+		# This is needed to decide how to execute hook scripts
+		# and regular scripts in this interpreter.
+		set comm($chan,interp,set)  [Capability $ip set]
+		set comm($chan,interp,aset) [Capability $ip array]
+		set comm($chan,interp,upl)  [Capability $ip uplevel]
+	    }
+	}
+    }
+
+    if {[info exists encoding] &&
+	![string equal $encoding $comm($chan,encoding)]} {
+	# This should not be entered yet
+	set comm($chan,encoding) $encoding
+	fconfigure $comm($chan,socket) -encoding $encoding
+	foreach {i sock} [array get comm $chan,peers,*] {
+	    fconfigure $sock -encoding $encoding
+	}
+    }
+
+    # do not re-init socket
+    if {!$force} {return ""}
+
+    # User is recycling object, possibly to change from local to !local
+    if {[info exists comm($chan,socket)]} {
+	comm_cmd_abort $chan
+	catch {close $comm($chan,socket)}
+	unset comm($chan,socket)
+    }
+
+    set comm($chan,socket) ""
+    if {!$comm($chan,listen)} {
+	set comm($chan,port) 0
+	return ""
+    }
+
+    if {[info exists port] && [string equal "" $comm($chan,port)]} {
+	set nport [incr comm(lastport)]
+    } else {
+	set userport 1
+	set nport $comm($chan,port)
+    }
+    while {1} {
+	set cmd [list $comm($chan,socketcmd) -server [list ::comm::commIncoming $chan]]
+	if {$comm($chan,local)} {
+	    lappend cmd -myaddr $comm(localhost)
+	}
+	lappend cmd $nport
+	if {![catch $cmd ret]} {
+	    break
+	}
+	if {[info exists userport] || ![string match "*already in use" $ret]} {
+	    # don't eradicate the class
+	    if {
+		![string equal ::comm::comm $chan] &&
+		![string equal [info proc $chan] ""]
+	    } {
+		rename $chan {}
+	    }
+	    return -code error $ret
+	}
+	set nport [incr comm(lastport)]
+    }
+    set comm($chan,socket) $ret
+    fconfigure $ret -translation lf -encoding $comm($chan,encoding)
+
+    # If port was 0, system allocated it for us
+    set comm($chan,port) [lindex [fconfigure $ret -sockname] 2]
+    return ""
+}
+
+# ::comm::Capability --
+#
+#	Internal command. Interogate an interp for
+#	the commands needed to execute regular and
+#	hook scripts.
+
+proc ::comm::Capability {interp cmd} {
+    if {[lsearch -exact [interp hidden $interp] $cmd] >= 0} {
+	# The command is present, although hidden.
+	return hidden
+    }
+
+    # The command is not a hidden command. Use info to determine if it
+    # is present as regular command. Note that the 'info' command
+    # itself might be hidden.
+
+    if {[catch {
+	set has [llength [interp eval $interp [list info commands $cmd]]]
+    }] && [catch {
+	set has [llength [interp invokehidden $interp info commands $cmd]]
+    }]} {
+	# Unable to interogate the interpreter in any way. Assume that
+	# the command is not present.
+	set has 0
+    }
+    return [expr {$has ? "ok" : "no"}]
+}
+
+# ::comm::commConnect --
+#
+#	Internal command. Called to connect to a remote interp
+#
+# Arguments:
+#	id	Specification of the location of the remote interp.
+#		A list containing either one or two elements.
+#		One element = port, host is localhost.
+#		Two elements = port and host, in this order.
+#
+# Results:
+#	fid	channel handle of the socket the connection goes through.
+
+proc ::comm::commConnect {chan id} {
+    variable comm
+
+    commDebug {puts stderr "<$chan> commConnect $id"}
+
+    # process connecting hook now
+    CommRunHook $chan connecting
+
+    if {[info exists comm($chan,peers,$id)]} {
+	return $comm($chan,peers,$id)
+    }
+    if {[lindex $id 0] == 0} {
+	return -code error "Remote comm is anonymous; cannot connect"
+    }
+
+    if {[llength $id] > 1} {
+	set host [lindex $id 1]
+    } else {
+	set host $comm(localhost)
+    }
+    set port [lindex $id 0]
+    set fid [$comm($chan,socketcmd) $host $port]
+
+    # process connected hook now
+    if {[catch {
+	CommRunHook $chan connected
+    } err]} {
+	global  errorInfo
+	set ei $errorInfo
+	close $fid
+	error $err $ei
+    }
+
+    # commit new connection
+    commNewConn $chan $id $fid
+
+    # send offered protocols versions and id to identify ourselves to remote
+    puts $fid [list $comm(offerVers) $comm($chan,port)]
+    set comm($chan,vers,$id) $comm(defVers)		;# default proto vers
+    flush  $fid
+    return $fid
+}
+
+# ::comm::commIncoming --
+#
+#	Internal command. Called for an incoming new connection.
+#	Handles connection setup and initialization.
+#
+# Arguments:
+#	chan	logical channel handling the connection.
+#	fid	channel handle of the socket running the connection.
+#	addr	ip address of the socket channel 'fid'
+#	remport	remote port for the socket channel 'fid'
+#
+# Results:
+#	None.
+
+proc ::comm::commIncoming {chan fid addr remport} {
+    variable comm
+
+    commDebug {puts stderr "<$chan> commIncoming $fid $addr $remport"}
+
+    # process incoming hook now
+    if {[catch {
+	CommRunHook $chan incoming
+    } err]} {
+	global errorInfo
+	set ei $errorInfo
+	close $fid
+	error $err $ei
+    }
+
+    # Wait for offered version, without blocking the entire system.
+    # Bug 3066872. For a Tcl 8.6 implementation consider use of
+    # coroutines to hide the CSP and properly handle everything
+    # event based.
+
+    fconfigure $fid -blocking 0
+    fileevent  $fid readable [list ::comm::commIncomingOffered $chan $fid $addr $remport]
+    return
+}
+
+proc ::comm::commIncomingOffered {chan fid addr remport} {
+    variable comm
+
+    # Check if we have a complete line.
+    if {[gets $fid protoline] < 0} {
+	#commDebug {puts stderr "commIncomingOffered: no data"}
+	if {[eof $fid]} {
+	    commDebug {puts stderr "commIncomingOffered: eof on fid=$fid"}
+	    catch {
+		close $fid
+	    }
+	}
+	return
+    }
+
+    # Protocol version line has been received, disable event handling
+    # again.
+    fileevent $fid readable {}
+    fconfigure $fid -blocking 1
+
+    # a list of offered proto versions is the first word of first line
+    # remote id is the second word of first line
+    # rest of first line is ignored
+
+    set offeredvers [lindex $protoline 0]
+    set remid       [lindex $protoline 1]
+
+    commDebug {puts stderr "<$chan> offered <$protoline>"}
+
+    # use the first supported version in the offered list
+    foreach v $offeredvers {
+	if {[info exists comm($v,vers)]} {
+	    set vers $v
+	    break
+	}
+    }
+    if {![info exists vers]} {
+	close $fid
+	if {[info exists comm($chan,silent)] && 
+	    [string is true -strict $comm($chan,silent)]} then return
+	error "Unknown offered protocols \"$protoline\" from $addr/$remport"
+    }
+
+    # If the remote host addr isn't our local host addr,
+    # then add it to the remote id.
+    if {[string equal [lindex [fconfigure $fid -sockname] 0] $addr]} {
+	set id $remid
+    } else {
+	set id [list $remid $addr]
+    }
+
+    # Detect race condition of two comms connecting to each other
+    # simultaneously.  It is OK when we are talking to ourselves.
+
+    if {[info exists comm($chan,peers,$id)] && $id != $comm($chan,port)} {
+
+	puts stderr "commIncoming race condition: $id"
+	puts stderr "peers=$comm($chan,peers,$id) port=$comm($chan,port)"
+
+	# To avoid the race, we really want to terminate one connection.
+	# However, both sides are committed to using it.
+	# commConnect needs to be synchronous and detect the close.
+	# close $fid
+	# return $comm($chan,peers,$id)
+    }
+
+    # Make a protocol response.  Avoid any temptation to use {$vers > 2}
+    # - this forces forwards compatibility issues on protocol versions
+    # that haven't been invented yet.  DON'T DO IT!  Instead, test for
+    # each supported version explicitly.  I.e., {$vers >2 && $vers < 5} is OK.
+
+    switch $vers {
+	3 {
+	    # Respond with the selected version number
+	    puts  $fid [list [list vers $vers]]
+	    flush $fid
+	}
+    }
+
+    # commit new connection
+    commNewConn $chan $id $fid
+    set comm($chan,vers,$id) $vers
+}
+
+# ::comm::commNewConn --
+#
+#	Internal command. Common new connection processing
+#
+# Arguments:
+#	id	Reference to the remote interp
+#	fid	channel handle of the socket running the connection.
+#
+# Results:
+#	None.
+
+proc ::comm::commNewConn {chan id fid} {
+    variable comm
+
+    commDebug {puts stderr "<$chan> commNewConn $id $fid"}
+
+    # There can be a race condition two where comms connect to each other
+    # simultaneously.  This code favors our outgoing connection.
+
+    if {[info exists comm($chan,peers,$id)]} {
+	# abort this connection, use the existing one
+	# close $fid
+	# return -code return $comm($chan,peers,$id)
+    } else {
+	set comm($chan,pending,$id) {}
+    	set comm($chan,peers,$id) $fid
+    }
+    set comm($chan,fids,$fid) $id
+    fconfigure $fid -translation lf -encoding $comm($chan,encoding) -blocking 0
+    fileevent $fid readable [list ::comm::commCollect $chan $fid]
+}
+
+# ::comm::commLostConn --
+#
+#	Internal command. Called to tidy up a lost connection,
+#	including aborting ongoing sends. Each send should clean
+#	themselves up in pending/result.
+#
+# Arguments:
+#	fid	Channel handle of the socket which got lost.
+#	reason	Message describing the reason of the loss.
+#
+# Results:
+#	reason
+
+proc ::comm::commLostConn {chan fid reason} {
+    variable comm
+
+    commDebug {puts stderr "<$chan> commLostConn $fid $reason"}
+
+    catch {close $fid}
+
+    set id $comm($chan,fids,$fid)
+
+    # Invoke the callbacks of all commands which have such and are
+    # still waiting for a response from the lost peer. Use an
+    # appropriate error.
+
+    foreach s $comm($chan,pending,$id) {
+	if {[string equal "callback" [lindex $s end]]} {
+	    set ser [lindex $s 0]
+	    if {[info exists comm($chan,return,$ser)]} {
+		set args [list -id       $id \
+			      -serial    $ser \
+			      -chan      $chan \
+			      -code      -1 \
+			      -errorcode NONE \
+			      -errorinfo "" \
+			      -result    $reason \
+			     ]
+		if {[catch {uplevel \#0 $comm($chan,return,$ser) $args} err]} {
+		    commBgerror $err
+		}
+	    }
+	} else {
+	    set comm($chan,return,$s) {-code error}
+	    set comm($chan,result,$s) $reason
+	}
+    }
+    unset comm($chan,pending,$id)
+    unset comm($chan,fids,$fid)
+    catch {unset comm($chan,peers,$id)}		;# race condition
+    catch {unset comm($chan,buf,$fid)}
+
+    # Cancel all outstanding futures for requests which were made by
+    # the lost peer, if there are any. This does not destroy
+    # them. They will stay around until the long-running operations
+    # they belong too kill them.
+
+    CancelFutures $fid
+
+    # process lost hook now
+    catch {CommRunHook $chan lost}
+
+    return $reason
+}
+
+proc ::comm::commBgerror {err} {
+    # SF Tcllib Patch #526499
+    # (See http://sourceforge.net/tracker/?func=detail&aid=526499&group_id=12883&atid=312883
+    #  for initial request and comments)
+    #
+    # Error in async call. Look for [bgerror] to report it. Same
+    # logic as in Tcl itself. Errors thrown by bgerror itself get
+    # reported to stderr.
+    if {[catch {bgerror $err} msg]} {
+	puts stderr "bgerror failed to handle background error."
+	puts stderr "    Original error: $err"
+	puts stderr "    Error in bgerror: $msg"
+	flush stderr
+    }
+}
+
+# CancelFutures: Mark futures associated with a comm channel as
+# expired, done when the connection to the peer has been lost. The
+# marked futures will not generate result anymore. They will also stay
+# around until destroyed by the script they belong to.
+
+proc ::comm::CancelFutures {fid} {
+    variable comm
+    if {![info exists comm(future,fid,$fid)]} return
+
+    commDebug {puts stderr "\tCanceling futures: [join $comm(future,fid,$fid) \
+                         "\n\t                 : "]"}
+
+    foreach future $comm(future,fid,$fid) {
+	$future Cancel
+    }
+
+    unset comm(future,fid,$fid)
+    return
+}
+
+###############################################################################
+
+# ::comm::commCollect --
+#
+#	Internal command. Called from the fileevent to read from fid
+#	and append to the buffer. This continues until we get a whole
+#	command, which we then invoke.
+#
+# Arguments:
+#	chan	logical channel collecting the data
+#	fid	channel handle of the socket we collect.
+#
+# Results:
+#	None.
+
+proc ::comm::commCollect {chan fid} {
+    variable comm
+    upvar #0 comm($chan,buf,$fid) data
+
+    # Tcl8 may return an error on read after a close
+    if {[catch {read $fid} nbuf] || [eof $fid]} {
+	commDebug {puts stderr "<$chan> collect/lost eof $fid = [eof $fid]"}
+	commDebug {puts stderr "<$chan> collect/lost nbuf = <$nbuf>"}
+	commDebug {puts stderr "<$chan> collect/lost [fconfigure $fid]"}
+
+	fileevent $fid readable {}		;# be safe
+	commLostConn $chan $fid "target application died or connection lost"
+	return
+    }
+    append data $nbuf
+
+    commDebug {puts stderr "<$chan> collect <$data>"}
+
+    # If data contains at least one complete command, we will
+    # be able to take off the first element, which is a list holding
+    # the command.  This is true even if data isn't a well-formed
+    # list overall, with unmatched open braces.  This works because
+    # each command in the protocol ends with a newline, thus allowing
+    # lindex and lreplace to work.
+    #
+    # This isn't true with Tcl8.0, which will return an error until
+    # the whole buffer is a valid list.  This is probably OK, although
+    # it could potentially cause a deadlock.
+
+    # [AK] Actually no. This breaks down if the sender shoves so much
+    # data at us so fast that the receiver runs into out of memory
+    # before the list is fully well-formed and thus able to be
+    # processed.
+
+    while {![catch {
+	set cmdrange [Word0 data]
+	# word0 is essentially the pre-8.0 'lindex <list> 0', getting
+	# the first word of a list, even if the remainder is not fully
+	# well-formed. Slight API change, we get the char indices the
+	# word is between, and a relative index to the remainder of
+	# the list.
+    }]} {
+	# Unpack the indices, then extract the word.
+	foreach {s e step} $cmdrange break
+	set cmd [string range $data $s $e]
+	commDebug {puts stderr "<$chan> cmd <$data>"}
+	if {[string equal "" $cmd]} break
+	if {[info complete $cmd]} {
+	    # The word is a command, step to the remainder of the
+	    # list, and delete the word we have processed.
+	    incr e $step
+	    set data [string range $data $e end]
+	    after idle \
+		    [list ::comm::commExec $chan $fid $comm($chan,fids,$fid) $cmd]
+	}
+    }
+}
+
+proc ::comm::Word0 {dv} {
+    upvar 1 $dv data
+
+    # data
+    #
+    # The string we expect to be either a full well-formed list, or a
+    # well-formed list until the end of the first word in the list,
+    # with non-wellformed data following after, i.e. an incomplete
+    # list with a complete first word.
+
+    if {[regexp -indices "^\\s*(\{)" $data -> bracerange]} {
+	# The word is brace-quoted, starting at index 'lindex
+	# bracerange 0'. We now have to find the closing brace,
+	# counting inner braces, ignoring quoted braces. We fail if
+	# there is no proper closing brace.
+
+	foreach {s e} $bracerange break
+	incr s ; # index of the first char after the brace.
+	incr e ; # same. but this is our running index.
+
+	set level 1
+	set max [string length $data]
+
+	while {$level} {
+	    # We are looking for the first regular or backslash-quoted
+	    # opening or closing brace in the string. If none is found
+	    # then the word is not complete, and we abort our search.
+
+	    # Bug 2972571: To avoid the bogus detection of
+	    # backslash-quoted braces we look for double-backslashes
+	    # as well and skip them. Without this a string like '{puts
+	    # \\}' will incorrectly find a \} at the end, missing the
+	    # end of the word.
+
+	    if {![regexp -indices -start $e {((\\\\)|([{}])|(\\[{}]))} $data -> any dbs regular quoted]} {
+		#                            ^^      ^      ^
+		#                            |\\     regular \quoted
+		#                            any
+		return -code error "no complete word found/1"
+	    }
+
+	    foreach {ds de} $dbs     break
+	    foreach {qs qe} $quoted  break
+	    foreach {rs re} $regular break
+
+	    if {$ds >= 0} {
+		# Skip double-backslashes ...
+		set  e $de
+		incr e
+		continue
+	    } elseif {$qs >= 0} {
+		# Skip quoted braces ...
+		set  e $qe
+		incr e
+		continue
+	    } elseif {$rs >= 0} {
+		# Step one nesting level in or out.
+		if {[string index $data $rs] eq "\{"} {
+		    incr level
+		} else {
+		    incr level -1
+		}
+		set  e $re
+		incr e
+		#puts @$e
+		continue
+	    } else {
+		return -code error "internal error"
+	    }
+	}
+
+	incr e -2 ; # index of character just before the brace.
+	return [list $s $e 2]
+
+    } elseif {[regexp -indices {^\s*(\S+)\s} $data -> wordrange]} {
+	# The word is a simple literal which ends at the next
+	# whitespace character. Note that there has to be a whitespace
+	# for us to recognize a word, for while there is no whitespace
+	# behind it in the buffer the word itself may be incomplete.
+
+	return [linsert $wordrange end 1]
+    }
+
+    return -code error "no complete word found/2"
+}
+
+# ::comm::commExec --
+#
+#	Internal command. Receives and executes a remote command,
+#	returning the result and/or error. Unknown protocol commands
+#	are silently discarded
+#
+# Arguments:
+#	chan		logical channel collecting the data
+#	fid		channel handle of the socket we collect.
+#	remoteid	id of the other side.
+#	buf		buffer containing the command to execute.
+#
+# Results:
+#	None.
+
+proc ::comm::commExec {chan fid remoteid buf} {
+    variable comm
+
+    # buffer should contain:
+    #	send  # {cmd}		execute cmd and send reply with serial #
+    #	async # {cmd}		execute cmd but send no reply
+    #	reply # {cmd}		execute cmd as reply to serial #
+
+    # these variables are documented in the hook interface
+    set cmd [lindex $buf 0]
+    set ser [lindex $buf 1]
+    set buf [lrange $buf 2 end]
+    set buffer [lindex $buf 0]
+
+    # Save remoteid for "comm remoteid".  This will only be valid
+    # if retrieved before any additional events occur on this channel.
+    # N.B. we could have already lost the connection to remote, making
+    # this id be purely informational!
+    set comm($chan,remoteid) [set id $remoteid]
+
+    # Save state for possible async result generation
+    AsyncPrepare $chan $fid $cmd $ser
+
+    commDebug {puts stderr "<$chan> exec <$cmd,$ser,$buf>"}
+
+    switch -- $cmd {
+	send - async - command {}
+	callback {
+	    if {![info exists comm($chan,return,$ser)]} {
+	        commDebug {puts stderr "<$chan> No one waiting for serial \"$ser\""}
+		return
+	    }
+
+	    # Decompose reply command to assure it only uses "return"
+	    # with no side effects.
+
+	    array set return {-code "" -errorinfo "" -errorcode ""}
+	    set ret [lindex $buffer end]
+	    set len [llength $buffer]
+	    incr len -2
+	    foreach {sw val} [lrange $buffer 1 $len] {
+		if {![info exists return($sw)]} continue
+		set return($sw) $val
+	    }
+
+	    catch {CommRunHook $chan callback}
+
+	    # this wakes up the sender
+	    commDebug {puts stderr "<$chan> --<<wakeup $ser>>--"}
+
+	    # the return holds the callback command
+	    # string map the optional %-subs
+	    set args [list -id       $id \
+			  -serial    $ser \
+			  -chan      $chan \
+			  -code      $return(-code) \
+			  -errorcode $return(-errorcode) \
+			  -errorinfo $return(-errorinfo) \
+			  -result    $ret \
+			 ]
+	    set code [catch {uplevel \#0 $comm($chan,return,$ser) $args} err]
+	    catch {unset comm($chan,return,$ser)}
+
+	    # remove pending serial
+	    upvar 0 comm($chan,pending,$id) pending
+	    if {[info exists pending]} {
+		set pos [lsearch -exact $pending [list $ser callback]]
+		if {$pos != -1} {
+		    set pending [lreplace $pending $pos $pos]
+		}
+	    }
+	    if {$code} {
+		commBgerror $err
+	    }
+	    return
+	}
+	reply {
+	    if {![info exists comm($chan,return,$ser)]} {
+	        commDebug {puts stderr "<$chan> No one waiting for serial \"$ser\""}
+		return
+	    }
+
+	    # Decompose reply command to assure it only uses "return"
+	    # with no side effects.
+
+	    array set return {-code "" -errorinfo "" -errorcode ""}
+	    set ret [lindex $buffer end]
+	    set len [llength $buffer]
+	    incr len -2
+	    foreach {sw val} [lrange $buffer 1 $len] {
+		if {![info exists return($sw)]} continue
+		set return($sw) $val
+	    }
+
+	    catch {CommRunHook $chan reply}
+
+	    # this wakes up the sender
+	    commDebug {puts stderr "<$chan> --<<wakeup $ser>>--"}
+	    set comm($chan,result,$ser) $ret
+	    set comm($chan,return,$ser) [array get return]
+	    return
+	}
+	vers {
+	    set ::comm::comm($chan,vers,$id) $ser
+	    return
+	}
+	default {
+	    commDebug {puts stderr "<$chan> unknown command; discard \"$cmd\""}
+	    return
+	}
+    }
+
+    # process eval hook now
+    set done 0
+    set err  0
+    if {[info exists comm($chan,hook,eval)]} {
+	set err [catch {CommRunHook $chan eval} ret]
+	commDebug {puts stderr "<$chan> eval hook res <$err,$ret>"}
+	switch $err {
+	    1 {
+		# error
+		set done 1
+	    }
+	    2 - 3 {
+		# return / break
+		set err 0
+		set done 1
+	    }
+	}
+    }
+
+    commDebug {puts stderr "<$chan> hook(eval) done=$done, err=$err"}
+
+    # exec command
+    if {!$done} {
+	commDebug {puts stderr "<$chan> exec ($buffer)"}
+
+	# Sadly, the uplevel needs to be in the catch to access the local
+	# variables buffer and ret.  These cannot simply be global because
+	# commExec is reentrant (i.e., they could be linked to an allocated
+	# serial number).
+
+	if {$comm($chan,interp) == {}} {
+	    # Main interpreter
+	    set thecmd [concat [list uplevel \#0] $buffer]
+	    set err    [catch $thecmd ret]
+	} else {
+	    # Redirect execution into the configured slave
+	    # interpreter. The exact command used depends on the
+	    # capabilities of the interpreter. A best effort is made
+	    # to execute the script in the global namespace.
+	    set interp $comm($chan,interp)
+
+	    if {$comm($chan,interp,upl) == "ok"} {
+		set thecmd [concat [list uplevel \#0] $buffer]
+		set err [catch {interp eval $interp $thecmd} ret]
+	    } elseif {$comm($chan,interp,aset) == "hidden"} {
+		set thecmd [linsert $buffer 0 interp invokehidden $interp uplevel \#0]
+		set err [catch $thecmd ret]
+	    } else {
+		set thecmd [concat [list interp eval $interp] $buffer]
+		set err [catch $thecmd ret]
+	    }
+	}
+    }
+
+    # Check and handle possible async result generation.
+    if {[AsyncCheck]} return
+
+    commSendReply $chan $fid $cmd $ser $err $ret
+    return
+}
+
+# ::comm::commSendReply --
+#
+#	Internal command. Executed to construct and send the reply
+#	for a command.
+#
+# Arguments:
+#	fid		channel handle of the socket we are replying to.
+#	cmd		The type of request (send, command) we are replying to.
+#	ser		Serial number of the request the reply is for.
+#	err		result code to place into the reply.
+#	ret		result value to place into the reply.
+#
+# Results:
+#	None.
+
+proc ::comm::commSendReply {chan fid cmd ser err ret} {
+    variable comm
+
+    commDebug {puts stderr "<$chan> res <$err,$ret> /$cmd"}
+
+    # The double list assures that the command is a single list when read.
+    if {[string equal send $cmd] || [string equal command $cmd]} {
+	# The catch here is just in case we lose the target.  Consider:
+	#	comm send $other comm send [comm self] exit
+	catch {
+	    set return [list return -code $err]
+	    # send error or result
+	    if {$err == 1} {
+		global errorInfo errorCode
+		lappend return -errorinfo $errorInfo -errorcode $errorCode
+	    }
+	    lappend return $ret
+	    if {[string equal send $cmd]} {
+		set reply reply
+	    } else {
+		set reply callback
+	    }
+	    puts  $fid [list [list $reply $ser $return]]
+	    flush $fid
+	}
+	commDebug {puts stderr "<$chan> reply sent"}
+    }
+
+    if {$err == 1} {
+	commBgerror $ret
+    }
+    commDebug {puts stderr "<$chan> exec complete"}
+    return
+}
+
+proc ::comm::CommRunHook {chan event} {
+    variable comm
+
+    # The documentation promises the hook scripts to have access to a
+    # number of internal variables. For a regular hook we simply
+    # execute it in the calling level to fulfill this. When the hook
+    # is redirected into an interpreter however we do a best-effort
+    # copying of the variable values into the interpreter. Best-effort
+    # because the 'set' command may not be available in the
+    # interpreter, not even hidden.
+
+    if {![info exists comm($chan,hook,$event)]} return
+    set cmd    $comm($chan,hook,$event)
+    set interp $comm($chan,interp)
+    commDebug {puts stderr "<$chan> hook($event) run <$cmd>"}
+
+    if {
+	($interp != {}) &&
+	([lsearch -exact $comm($chan,events) $event] >= 0)
+    } {
+	# Best-effort to copy the context into the interpreter for
+	# access by the hook script.
+	set vars   {
+	    addr buffer chan cmd fid host
+	    id port reason remport ret var
+	}
+
+	if {$comm($chan,interp,set) == "ok"} {
+	    foreach v $vars {
+		upvar 1 $v V
+		if {![info exists V]} continue
+		interp eval $interp [list set $v $V]
+	    }
+	} elseif {$comm($chan,interp,set) == "hidden"} {
+	    foreach v $vars {
+		upvar 1 $v V
+		if {![info exists V]} continue
+		interp invokehidden $interp set $v $V
+	    }
+	}
+	upvar 1 return AV
+	if {[info exists AV]} {
+	    if {$comm($chan,interp,aset) == "ok"} {
+		interp eval $interp [list array set return [array get AV]]
+	    } elseif {$comm($chan,interp,aset) == "hidden"} {
+		interp invokehidden $interp array set return [array get AV]
+	    }
+	}
+
+	commDebug {puts stderr "<$chan> /interp $interp"}
+	set code [catch {interp eval $interp $cmd} res options]
+    } else {
+	commDebug {puts stderr "<$chan> /main"}
+	set code [catch {uplevel 1 $cmd} res options]
+    }
+
+    # Perform the return code propagation promised
+    # to the hook scripts.
+    return -options $options -code $code $res
+}
+
+# ### ### ### ######### ######### #########
+## Hooks to link async return and future processing into the regular
+## system.
+
+# AsyncPrepare, AsyncCheck: Initialize state information for async
+# return upon start of a remote invokation, and checking the state for
+# async return.
+
+proc ::comm::AsyncPrepare {chan fid cmd ser} {
+    variable comm
+    set comm(current,async) 0
+    set comm(current,state) [list $chan $fid $cmd $ser]
+    return
+}
+
+proc ::comm::AsyncCheck {} {
+    # Check if the executed command notified us of an async return. If
+    # not we let the regular return processing handle the end of the
+    # script. Otherwise we stop the caller from proceeding, preventing
+    # a regular return.
+
+    variable comm
+    if {!$comm(current,async)} {return 0}
+    return 1
+}
+
+# FutureDone: Action taken by an uncanceled future to deliver the
+# generated result to the proper invoker. This also removes the future
+# from the list of pending futures for the comm channel.
+
+proc comm::FutureDone {future chan fid cmd sid rcode rvalue} {
+    variable comm
+    commSendReply $chan $fid $cmd $sid $rcode $rvalue
+
+    set pos [lsearch -exact $comm(future,fid,$fid) $future]
+    set comm(future,fid,$fid) [lreplace $comm(future,fid,$fid) $pos $pos]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Hooks to save command state across nested eventloops a remotely
+## invoked command may run before finally activating async result
+## generation.
+
+# DANGER !! We have to refer to comm internals using fully-qualified
+# names because the wrappers will execute in the global namespace
+# after their installation.
+
+proc ::comm::Vwait {varname} {
+    variable ::comm::comm
+
+    set hasstate [info exists comm(current,async)]
+    set hasremote 0
+    if {$hasstate} {
+	set chan     [lindex $comm(current,state) 0]
+	set async    $comm(current,async)
+	set state    $comm(current,state)
+	set hasremote [info exists comm($chan,remoteid)]
+	if {$hasremote} {
+	    set remoteid $comm($chan,remoteid)
+	}
+    }
+
+    set code [catch {uplevel 1 [list ::comm::VwaitOrig $varname]} res]
+
+    if {$hasstate} {
+	set comm(current,async)  $async
+	set comm(current,state)	 $state
+    }
+    if {$hasremote} {
+	set comm($chan,remoteid) $remoteid
+    }
+
+    return -code $code $res
+}
+
+proc ::comm::Update {args} {
+    variable ::comm::comm
+
+    set hasstate [info exists comm(current,async)]
+    set hasremote 0
+    if {$hasstate} {
+	set chan     [lindex $comm(current,state) 0]
+	set async    $comm(current,async)
+	set state    $comm(current,state)
+
+	set hasremote [info exists comm($chan,remoteid)]
+	if {$hasremote} {
+	    set remoteid $comm($chan,remoteid)
+	}
+    }
+
+    set code [catch {uplevel 1 [linsert $args 0 ::comm::UpdateOrig]} res]
+
+    if {$hasstate} {
+	set comm(current,async)  $async
+	set comm(current,state)	 $state
+    }
+    if {$hasremote} {
+	set comm($chan,remoteid) $remoteid
+    }
+
+    return -code $code $res
+}
+
+# Install the wrappers.
+
+proc ::comm::InitWrappers {} {
+    rename ::vwait       ::comm::VwaitOrig
+    rename ::comm::Vwait ::vwait
+
+    rename ::update       ::comm::UpdateOrig
+    rename ::comm::Update ::update
+
+    proc ::comm::InitWrappers {} {}
+    return
+}
+
+# ### ### ### ######### ######### #########
+## API: Future objects.
+
+snit::type comm::future {
+    option -command -default {}
+
+    constructor {chan fid cmd ser} {
+	set xfid  $fid
+	set xcmd  $cmd
+	set xser  $ser
+	set xchan $chan
+	return
+    }
+
+    destructor {
+	if {!$canceled} {
+	    return -code error \
+		    "Illegal attempt to destroy unresolved future \"$self\""
+	}
+    }
+
+    method return {args} {
+	# Syntax:             | 0
+	#       : -code x     | 2
+	#       : -code x val | 3
+	#       :         val | 4
+	# Allowing multiple -code settings, last one is taken.
+
+	set rcode  0
+	set rvalue {}
+
+	while {[lindex $args 0] == "-code"} {
+	    set rcode [lindex $args 1]
+	    set args  [lrange $args 2 end]
+	}
+	if {[llength $args] > 1} {
+	    return -code error "wrong\#args, expected \"?-code errcode? ?result?\""
+	}
+	if {[llength $args] == 1} {
+	    set rvalue [lindex $args 0]
+	}
+
+	if {!$canceled} {
+	    comm::FutureDone $self $xchan $xfid $xcmd $xser $rcode $rvalue
+	    set canceled 1
+	}
+	# assert: canceled == 1
+	$self destroy
+	return
+    }
+
+    variable xfid  {}
+    variable xcmd  {}
+    variable xser  {}
+    variable xchan {}
+    variable canceled 0
+
+    # Internal method for use by comm channels. Marks the future as
+    # expired, no peer to return a result back to.
+
+    method Cancel {} {
+	set canceled 1
+	if {![llength $options(-command)]} {return}
+	uplevel #0 [linsert $options(-command) end $self]
+	return
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Setup
+::comm::InitWrappers
+
+###############################################################################
+#
+# Finish creating "comm" using the default port for this interp.
+#
+
+if {![info exists ::comm::comm(comm,port)]} {
+    if {[string equal macintosh $tcl_platform(platform)]} {
+	::comm::comm new ::comm::comm -port 0 -local 0 -listen 1
+	set ::comm::comm(localhost) \
+	    [lindex [fconfigure $::comm::comm(::comm::comm,socket) -sockname] 0]
+	::comm::comm config -local 1
+    } else {
+	::comm::comm new ::comm::comm -port 0 -local 1 -listen 1
+    }
+}
+
+#eof
+package provide comm 4.7.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/comm/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/comm/pkgIndex.tcl
new file mode 100644
index 00000000..19d695df
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/comm/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded comm 4.7.1 [list source [file join $dir comm.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/ascaller.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/ascaller.tcl
new file mode 100644
index 00000000..6c864bb5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/ascaller.tcl
@@ -0,0 +1,72 @@
+# ascaller.tcl - 
+#
+#       A few utility procs that manage the evaluation of a command
+#	or a script in the context of a caller, taking care of all 
+#	the ugly details of proper return codes, errorcodes, and
+#	a good stack trace in ::errorInfo as appropriate.
+# -------------------------------------------------------------------------
+#
+# RCS: @(#) $Id: ascaller.tcl,v 1.3 2004/01/15 06:36:12 andreas_kupries Exp $
+
+namespace eval ::control {
+
+    proc CommandAsCaller {cmdVar resultVar {where {}} {codeVar code}} {
+	set x [expr {[string equal "" $where] 
+		? {} : [subst -nobackslashes {\n    ($where)}]}]
+	set script [subst -nobackslashes -nocommands {
+	    set $codeVar [catch {uplevel 1 $$cmdVar} $resultVar]
+	    if {$$codeVar > 1} {
+		return -code $$codeVar $$resultVar
+	    }
+	    if {$$codeVar == 1} {
+		if {[string equal {"uplevel 1 $$cmdVar"} \
+			[lindex [split [set ::errorInfo] \n] end]]} {
+		    set $codeVar [join \
+			    [lrange [split [set ::errorInfo] \n] 0 \
+			    end-[expr {4+[llength [split $$cmdVar \n]]}]] \n]
+		} else {
+		    set $codeVar [join \
+			    [lrange [split [set ::errorInfo] \n] 0 end-1] \n]
+		}
+		return -code error -errorcode [set ::errorCode] \
+			-errorinfo "$$codeVar$x" $$resultVar
+	    }
+	}]
+	return $script
+    }
+
+    proc BodyAsCaller {bodyVar resultVar codeVar {where {}}} {
+	set x [expr {[string equal "" $where]
+		? {} : [subst -nobackslashes -nocommands \
+		{\n    ($where[string map {{    ("uplevel"} {}} \
+		[lindex [split [set ::errorInfo] \n] end]]}]}]
+	set script [subst -nobackslashes -nocommands {
+	    set $codeVar [catch {uplevel 1 $$bodyVar} $resultVar]
+	    if {$$codeVar == 1} {
+		if {[string equal {"uplevel 1 $$bodyVar"} \
+			[lindex [split [set ::errorInfo] \n] end]]} {
+		    set ::errorInfo [join \
+			    [lrange [split [set ::errorInfo] \n] 0 end-2] \n]
+		} 
+		set $codeVar [join \
+			[lrange [split [set ::errorInfo] \n] 0 end-1] \n]
+		return -code error -errorcode [set ::errorCode] \
+			-errorinfo "$$codeVar$x" $$resultVar
+	    }
+	}]
+	return $script
+    }
+
+    proc ErrorInfoAsCaller {find replace} {
+	set info $::errorInfo
+	set i [string last "\n    (\"$find" $info]
+	if {$i == -1} {return $info}
+	set result [string range $info 0 [incr i 6]]	;# keep "\n    (\""
+	append result $replace			;# $find -> $replace
+	incr i [string length $find]
+	set j [string first ) $info [incr i]]	;# keep rest of parenthetical
+	append result [string range $info $i $j]
+        return $result
+    }
+
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/assert.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/assert.tcl
new file mode 100644
index 00000000..8aac408d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/assert.tcl
@@ -0,0 +1,91 @@
+# assert.tcl --
+#
+#	The [assert] command of the package "control".
+#
+# RCS: @(#) $Id: assert.tcl,v 1.3 2004/01/15 06:36:12 andreas_kupries Exp $
+
+namespace eval ::control {
+
+    namespace eval assert {
+	namespace export EnabledAssert DisabledAssert
+	variable CallbackCmd [list return -code error]
+
+	namespace import [namespace parent]::no-op
+	rename no-op DisabledAssert
+
+	proc EnabledAssert {expr args} {
+	    variable CallbackCmd
+
+	    set code [catch {uplevel 1 [list expr $expr]} res]
+	    if {$code} {
+		return -code $code $res
+	    }
+	    if {![string is boolean -strict $res]} {
+		return -code error "invalid boolean expression: $expr"
+	    }
+	    if {$res} {return}
+	    if {[llength $args]} {
+		set msg [join $args]
+	    } else {
+		set msg "assertion failed: $expr"
+	    }
+	    # Might want to catch this
+	    namespace eval :: $CallbackCmd [list $msg]
+	}
+
+	proc enabled {args} {
+	    set n [llength $args]
+	    if {$n > 1} {
+		return -code error "wrong # args: should be\
+			\"[lindex [info level 0] 0] ?boolean?\""
+	    }
+	    if {$n} {
+		set val [lindex $args 0]
+		if {![string is boolean -strict $val]} {
+		    return -code error "invalid boolean value: $val"
+		}
+		if {$val} {
+		    [namespace parent]::AssertSwitch Disabled Enabled
+		} else {
+		    [namespace parent]::AssertSwitch Enabled Disabled
+		}
+	    } else {
+		return [string equal [namespace origin EnabledAssert] \
+			[namespace origin [namespace parent]::assert]]
+	    }
+	    return ""
+	}
+
+	proc callback {args} {
+	    set n [llength $args]
+	    if {$n > 1} {
+		return -code error "wrong # args: should be\
+			\"[lindex [info level 0] 0] ?command?\""
+	    }
+	    if {$n} {
+	        return [variable CallbackCmd [lindex $args 0]]
+	    }
+	    variable CallbackCmd
+	    return $CallbackCmd
+	}
+
+    }
+
+    proc AssertSwitch {old new} {
+	if {[string equal [namespace origin assert] \
+		[namespace origin assert::${new}Assert]]} {return}
+	rename assert ${old}Assert
+	rename ${new}Assert assert
+    }
+
+    namespace import assert::DisabledAssert assert::EnabledAssert
+
+    # For indexer
+    proc assert args #
+    rename assert {}
+
+    # Initial default: disabled asserts
+    rename DisabledAssert assert
+
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/control.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/control.tcl
new file mode 100644
index 00000000..6cdf08a0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/control.tcl
@@ -0,0 +1,24 @@
+# control.tcl --
+#
+#	This is the main package provide script for the package
+#	"control".  It provides commands that govern the flow of
+#	control of a program.
+
+package require Tcl 8.2
+
+namespace eval ::control {
+    namespace export assert control do no-op rswitch
+
+    proc control {command args} {
+	# Need to add error handling here
+	namespace eval [list $command] $args
+    }
+
+    # Set up for auto-loading the commands
+    variable home [file join [pwd] [file dirname [info script]]]
+    if {[lsearch -exact $::auto_path $home] == -1} {
+	lappend ::auto_path $home
+    }
+
+    package provide [namespace tail [namespace current]] 0.1.3
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/do.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/do.tcl
new file mode 100644
index 00000000..aa5c1af5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/do.tcl
@@ -0,0 +1,81 @@
+# do.tcl --
+#
+#        Tcl implementation of a "do ... while|until" loop.
+#
+# Originally written for the "Texas Tcl Shootout" programming contest
+# at the 2000 Tcl Conference in Austin/Texas.
+#
+# Copyright (c) 2001 by Reinhard Max <Reinhard.Max@gmx.de>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: do.tcl,v 1.6 2004/01/15 06:36:12 andreas_kupries Exp $
+#
+namespace eval ::control {
+
+    proc do {body args} {
+
+	#
+	# Implements a "do body while|until test" loop
+	# 
+	# It is almost as fast as builtin "while" command for loops with
+	# more than just a few iterations.
+	#
+
+	set len [llength $args]
+	if {$len !=2 && $len != 0} {
+	    set proc [namespace current]::[lindex [info level 0] 0]
+	    return -code error "wrong # args: should be \"$proc body\" or \"$proc body \[until|while\] test\""
+	}
+	set test 0
+	foreach {whileOrUntil test} $args {
+	    switch -exact -- $whileOrUntil {
+		"while" {}
+		"until" { set test !($test) }
+		default {
+		    return -code error \
+			"bad option \"$whileOrUntil\": must be until, or while"
+		}
+	    }
+	    break
+	}
+
+	# the first invocation of the body
+	set code [catch { uplevel 1 $body } result]
+
+	# decide what to do upon the return code:
+	#
+	#               0 - the body executed successfully
+	#               1 - the body raised an error
+	#               2 - the body invoked [return]
+	#               3 - the body invoked [break]
+	#               4 - the body invoked [continue]
+	# everything else - return and pass on the results
+	#
+	switch -exact -- $code {
+	    0 {}
+	    1 {
+		return -errorinfo [ErrorInfoAsCaller uplevel do]  \
+		    -errorcode $::errorCode -code error $result
+	    }
+	    3 {
+		# FRINK: nocheck
+		return
+	    }
+	    4 {}
+	    default {
+		return -code $code $result
+	    }
+	}
+	# the rest of the loop
+	set code [catch {uplevel 1 [list while $test $body]} result]
+	if {$code == 1} {
+	    return -errorinfo [ErrorInfoAsCaller while do] \
+		-errorcode $::errorCode -code error $result
+	}
+	return -code $code $result
+	
+    }
+
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/no-op.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/no-op.tcl
new file mode 100644
index 00000000..2400303f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/no-op.tcl
@@ -0,0 +1,14 @@
+# no-op.tcl --
+#
+#	The [no-op] command of the package "control".
+#	It accepts any number of arguments and does nothing.
+#	It returns an empty string.
+#
+# RCS: @(#) $Id: no-op.tcl,v 1.2 2004/01/15 06:36:12 andreas_kupries Exp $
+
+namespace eval ::control {
+
+    proc no-op args {}
+
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/pkgIndex.tcl
new file mode 100644
index 00000000..3b432db7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded control 0.1.3 [list source [file join $dir control.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/tclIndex b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/tclIndex
new file mode 100644
index 00000000..614d932f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/control/tclIndex
@@ -0,0 +1,18 @@
+# Tcl autoload index file, version 2.0
+# This file is generated by the "auto_mkindex" command
+# and sourced to set up indexing information for one or
+# more commands.  Typically each line is a command that
+# sets an element in the auto_index array, where the
+# element name is the name of a command and the value is
+# a script that loads the command.
+
+set auto_index(::control::CommandAsCaller) [list source [file join $dir ascaller.tcl]]
+set auto_index(::control::BodyAsCaller) [list source [file join $dir ascaller.tcl]]
+set auto_index(::control::ErrorInfoAsCaller) [list source [file join $dir ascaller.tcl]]
+set auto_index(::control::assert::EnabledAssert) [list source [file join $dir assert.tcl]]
+set auto_index(::control::assert::enabled) [list source [file join $dir assert.tcl]]
+set auto_index(::control::assert::callback) [list source [file join $dir assert.tcl]]
+set auto_index(::control::AssertSwitch) [list source [file join $dir assert.tcl]]
+set auto_index(::control::assert) [list source [file join $dir assert.tcl]]
+set auto_index(::control::do) [list source [file join $dir do.tcl]]
+set auto_index(::control::no-op) [list source [file join $dir no-op.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/coroutine/coro_auto.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/coroutine/coro_auto.tcl
new file mode 100644
index 00000000..9fec0746
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/coroutine/coro_auto.tcl
@@ -0,0 +1,403 @@
+## -- Tcl Module -- -*- tcl -*-
+# # ## ### ##### ######## #############
+
+# @@ Meta Begin
+# Package coroutine::auto 1.2
+# Meta platform        tcl
+# Meta require         {Tcl 8.6}
+# Meta require         {coroutine 1.3}
+# Meta license         BSD
+# Meta as::author      {Andreas Kupries}
+# Meta as::origin      http://wiki.tcl.tk/21555
+# Meta summary         Coroutine Event and Channel Support
+# Meta description     Built on top of coroutine, this
+# Meta description     package intercepts various builtin
+# Meta description     commands to make the code using them
+# Meta description     coroutine-oblivious, i.e. able to run
+# Meta description     inside and outside of a coroutine
+# Meta description     without changes.
+# @@ Meta End
+
+# Copyright (c) 2009-2014 Andreas Kupries
+
+# # ## ### ##### ######## #############
+## Requisites, and ensemble setup.
+
+package require Tcl 8.6
+package require coroutine 1.3
+
+namespace eval ::coroutine::auto {}
+
+# # ## ### ##### ######## #############
+## API implementations. Uses the coroutine commands where
+## possible.
+
+proc ::coroutine::auto::wrap_global args {
+    if {[info coroutine] eq {}} {
+	tailcall ::coroutine::auto::core_global {*}$args
+    }
+
+    tailcall ::coroutine::util::global {*}$args
+}
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::auto::wrap_after {delay args} {
+    if {
+	([info coroutine] eq {}) ||
+	([llength $args] > 0)
+    } {
+	# We use the core builtin when called from either outside of a
+	# coroutine, or for an asynchronous delay.
+	tailcall ::coroutine::auto::core_after $delay {*}$args
+    }
+
+    # Inside of coroutine, and synchronous delay (args == {}).
+    tailcall ::coroutine::util::after $delay
+}
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::auto::wrap_exit {{status 0}} {
+    if {[info coroutine] eq {}} {
+	tailcall ::coroutine::auto::core_exit $status
+    }
+
+    tailcall ::coroutine::util::exit $status
+}
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::auto::wrap_vwait varname {
+    if {[info coroutine] eq {}} {
+	tailcall ::coroutine::auto::core_vwait $varname
+    }
+    tailcall ::coroutine::util::vwait $varname
+}
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::auto::wrap_update {{what {}}} {
+    if {[info coroutine] eq {}} {
+	tailcall ::coroutine::auto::core_update {*}$what
+    }
+
+    # This is a full re-implementation of mode (1), because the
+    # coroutine-aware part uses the builtin itself for some
+    # functionality, and this part cannot be taken as is.
+
+    if {$what eq {idletasks}} {
+        after idle [info coroutine]
+    } elseif {$what ne {}} {
+        # Force proper error message for bad call.
+        tailcall ::coroutine::auto::core_update $what
+    } else {
+        after 0 [info coroutine]
+    }
+    yield
+    return
+}
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::auto::wrap_gets args {
+    # Process arguments.
+    # Acceptable syntax:
+    # * gets CHAN ?VARNAME?
+
+    if {[info coroutine] eq {}} {
+	tailcall ::coroutine::auto::core_gets {*}$args
+    }
+
+    # This is a full re-implementation of mode (1), because the
+    # coroutine-aware part uses the builtin itself for some
+    # functionality, and this part cannot be taken as is.
+
+    if {[llength $args] == 2} {
+	# gets CHAN VARNAME
+	lassign $args chan varname
+        upvar 1 $varname line
+    } elseif {[llength $args] == 1} {
+	# gets CHAN
+	lassign $args chan
+    } else {
+	# not enough, or too many arguments (0, or > 2): Calling the
+	# builtin gets command with the bogus arguments gives us the
+	# necessary error with the proper message.
+	tailcall ::coroutine::auto::core_gets {*}$args
+    }
+
+    # Loop until we have a complete line. Yield to the event loop
+    # where necessary. During
+
+    while 1 {
+        set blocking [::chan configure $chan -blocking]
+        ::chan configure $chan -blocking 0
+
+	try {
+	    set result [::coroutine::auto::core_gets $chan line]
+	} on error {result opts} {
+            ::chan configure $chan -blocking $blocking
+            return -code $result -options $opts
+	}
+
+	if {[::chan blocked $chan]} {
+            ::chan event $chan readable [list [info coroutine]]
+            yield
+            ::chan event $chan readable {}
+        } else {
+            ::chan configure $chan -blocking $blocking
+
+            if {[llength $args] == 2} {
+                return $result
+            } else {
+                return $line
+            }
+        }
+    }
+}
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::auto::wrap_read args {
+    # Process arguments.
+    # Acceptable syntax:
+    # * read ?-nonewline ? CHAN
+    # * read               CHAN ?n?
+
+    if {[info coroutine] eq {}} {
+	tailcall ::coroutine::auto::core_read {*}$args
+    }
+
+    # This is a full re-implementation of mode (1), because the
+    # coroutine-aware part uses the builtin itself for some
+    # functionality, and this part cannot be taken as is.
+
+    if {[llength $args] > 2} {
+	# Calling the builtin read command with the bogus arguments
+	# gives us the necessary error with the proper message.
+	::coroutine::auto::core_read {*}$args
+	return
+    }
+
+    set total Inf ; # Number of characters to read. Here: Until eof.
+    set chop  no  ; # Boolean flag. Determines if we have to trim a
+    #               # \n from the end of the read string.
+
+    if {[llength $args] == 2} {
+	lassign $args a b
+	if {$a eq {-nonewline}} {
+	    set chan $b
+	    set chop yes
+	} else {
+	    lassign $args chan total
+	}
+    } else {
+	lassign $args chan
+    }
+
+    # Run the read loop. Yield to the event loop where
+    # necessary. Differentiate between loop until eof, and loop until
+    # n characters have been read (or eof reached).
+
+    set buf {}
+
+    if {$total eq {Inf}} {
+	# Loop until eof.
+
+	while 1 {
+	    set blocking [::chan configure $chan -blocking]
+	    ::chan configure $chan -blocking 0
+
+	    try {
+		set result [::coroutine::auto::core_read $chan]
+	    } on error {result opts} {
+		::chan configure $chan -blocking $blocking
+		return -code $result -options $opts
+	    }
+
+	    if {[::chan blocked $chan]} {
+		::chan event $chan readable [list [info coroutine]]
+		yield
+		::chan event $chan readable {}
+	    } else {
+		::chan configure $chan -blocking $blocking
+		append buf $result
+
+		if {[::chan eof $chan]} {
+		    ::chan close $chan
+		    break
+		}
+	    }
+	}
+    } else {
+	# Loop until total characters have been read, or eof found,
+	# whichever is first.
+
+	set left $total
+	while 1 {
+	    set blocking [::chan configure $chan -blocking]
+	    ::chan configure $chan -blocking 0
+
+	    try {
+		set result [::coroutine::auto::core_read $chan $left]
+	    } on error {result opts} {
+		::chan configure $chan -blocking $blocking
+		return -code $result -options $opts
+	    }
+
+	    if {[::chan blocked $chan]} {
+		::chan event $chan readable [list [info coroutine]]
+		yield
+		::chan event $chan readable {}
+	    } else {
+		::chan configure $chan -blocking $blocking
+		append buf $result
+		incr   left -[string length $result]
+
+		if {[::chan eof $chan]} {
+		    ::chan close $chan
+		    break
+		} elseif {!$left} {
+		    break
+		}
+	    }
+	}
+    }
+
+    if {$chop && [string index $buf end] eq "\n"} {
+	set buf [string range $buf 0 end-1]
+    }
+
+    return $buf
+}
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::auto::wrap_puts args {
+    # Process arguments.
+    # Acceptable syntax:
+    # * puts ?-nonewline? ?CHAN? string
+
+    if {[info coroutine] eq {}} {
+        tailcall ::coroutine::auto::core_puts {*}$args
+    }
+
+    # This is a full re-implementation of puts, because the
+    # coroutine-aware part uses the builtin itself for some
+    # functionality, and this part cannot be taken as is.
+
+    # Calling the builtin puts command with the bogus arguments
+    # gives us the necessary error with the proper message.
+
+    switch [llength $args] {
+        1 {
+            set ch stdout
+        }
+        2 {
+            set ch [lindex $args 0]
+            if {[string match {-*} $ch]} {
+                if {$ch ne {-nonewline}} {
+                    # Force proper error message for bad call
+                    tailcall ::coroutine::auto::core_puts {*}$args
+                }
+                set ch stdout
+            }
+        }
+        3 {
+            lassign $args opt ch
+            if {$opt ne {-nonewline}} {
+                # Force proper error message for bad call
+                tailcall ::coroutine::auto::core_puts {*}$args
+            }
+        }
+        default {
+            # Force proper error message for bad call
+            tailcall ::coroutine::auto::core_puts {*}$args
+        }
+    }
+        set blocking [::chan configure $ch -blocking]
+    ::chan event $ch writable [info coroutine]
+    yield
+    ::chan event $ch writable {}
+    try {
+        ::coroutine::auto::core_puts {*}$args
+    } on error {result opts} {
+        return -code $result -options $opts
+    } finally {
+        ::chan configure $ch -blocking $blocking
+    }
+    return
+}
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::auto::wrap_socket args {
+    # Process arguments.
+    # Acceptable syntax:
+    # * connect ?options? host port
+    # * connect -server command ?options? port
+
+    if {[info coroutine] eq {} || [lsearch -exact $args -server] >= 0} {
+        tailcall ::coroutine::auto::core_socket {*}$args
+    }
+
+    # This is a full re-implementation of socket, because the
+    # coroutine-aware part uses the builtin itself for some
+    # functionality, and this part cannot be taken as is.
+
+    set s [::coroutine::auto::core_socket -async {*}$args]
+    ::chan event $s writable [info coroutine]
+    while {[::chan configure $s -connecting]} {
+        yield
+    }
+    ::chan event $s writable {}
+    set errmsg [::chan configure $s -error]
+    if {$errmsg ne {}} {
+        ::chan close $s
+        error $errmsg
+    }
+    return $s
+}
+
+# # ## ### ##### ######## #############
+## Internal. Setup.
+
+::apply {{} {
+    # Replaces the builtin commands with coroutine-aware
+    # counterparts. We cannot use the coroutine commands directly,
+    # because the replacements have to use the saved builtin commands
+    # when called outside of a coroutine. And some (read, gets,
+    # update) even need full re-implementations, as they use the
+    # builtin command they replace themselves to implement their
+    # functionality.
+
+    foreach cmd {
+	global
+	exit
+	after
+	vwait
+	update
+        socket
+    } {
+	rename ::$cmd [namespace current]::core_$cmd
+	rename [namespace current]::wrap_$cmd ::$cmd
+    }
+
+    foreach cmd {
+	gets
+	read
+        puts
+    } {
+	rename ::tcl::chan::$cmd [namespace current]::core_$cmd
+	rename [namespace current]::wrap_$cmd ::tcl::chan::$cmd
+    }
+
+    return
+} ::coroutine::auto}
+
+# # ## ### ##### ######## #############
+## Ready
+
+package provide coroutine::auto 1.2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/coroutine/coroutine.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/coroutine/coroutine.tcl
new file mode 100644
index 00000000..dfb65413
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/coroutine/coroutine.tcl
@@ -0,0 +1,496 @@
+## -- Tcl Module -- -*- tcl -*-
+# # ## ### ##### ######## #############
+
+# @@ Meta Begin
+# Package coroutine 1.3
+# Meta platform        tcl
+# Meta require         {Tcl 8.6}
+# Meta license         BSD
+# Meta as::author      {Andreas Kupries}
+# Meta as::author      {Colin Macleod}
+# Meta as::author      {Colin McCormack}
+# Meta as::author      {Donal Fellows}
+# Meta as::author      {Kevin Kenny}
+# Meta as::author      {Neil Madden}
+# Meta as::author      {Peter Spjuth}
+# Meta as::origin      http://wiki.tcl.tk/21555
+# Meta summary         Coroutine Event and Channel Support
+# Meta description     This package provides coroutine-aware
+# Meta description     implementations of various event- and
+# Meta description     channel related commands. It can be
+# Meta description     in multiple modes: (1) Call the
+# Meta description     commands through their ensemble, in
+# Meta description     code which is explicitly written for
+# Meta description     use within coroutines. (2) Import
+# Meta description     the commands into a namespace, either
+# Meta description     directly, or through 'namespace path'.
+# Meta description     This allows the use from within code
+# Meta description     which is not coroutine-aware per se
+# Meta description     and restricted to specific namespaces.
+# Meta description     A more agressive form of making code
+# Meta description     coroutine-oblivious than (2) above is
+# Meta description     available through the package
+# Meta description     coroutine::auto, which intercepts
+# Meta description     the relevant builtin commands and changes
+# Meta description     their implementation dependending on the
+# Meta description     context they are run in, i.e. inside or
+# Meta description     outside of a coroutine.
+# @@ Meta End
+
+# Copyright (c) 2009,2014-2015 Andreas Kupries
+# Copyright (c) 2009 Colin Macleod
+# Copyright (c) 2009 Colin McCormack
+# Copyright (c) 2009 Donal Fellows
+# Copyright (c) 2009 Kevin Kenny
+# Copyright (c) 2009 Neil Madden
+# Copyright (c) 2009 Peter Spjuth
+
+## $Id: coroutine.tcl,v 1.2 2011/04/18 20:23:58 andreas_kupries Exp $
+# # ## ### ##### ######## #############
+## Requisites, and ensemble setup.
+
+package require Tcl 8.6
+
+namespace eval ::coroutine::util {
+
+    namespace export \
+	create global after exit vwait update gets read puts socket await
+
+    namespace ensemble create
+}
+
+# # ## ### ##### ######## #############
+## API. Spawn coroutines, automatic naming
+##      (like thread::create).
+
+proc ::coroutine::util::create {args} {
+    ::coroutine [ID] {*}$args
+}
+
+# # ## ### ##### ######## #############
+## API.
+#
+# global (coroutine globals (like thread global storage))
+# after  (synchronous).
+# exit
+# update ?idletasks? [1]
+# vwait
+# gets               [1]
+# read               [1]
+# puts               [1]
+# socket             [1]
+#
+# [1] These commands call on their builtin counterparts to get some of
+#     their functionality (like proper error messages for syntax errors).
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::util::global {args} {
+    # Frame #1 is the coroutine-specific stack frame at its
+    # bottom. Variables there are out of view of the main code, and
+    # can be made visible in the entire coroutine underneath.
+
+    # Ticket [bf8b80af]. Nothing needs to be done when the command is
+    # invoked by the main procedure of the coroutine. Such code
+    # already runs in frame #1, i.e. the variables are already in
+    # scope, automatically.
+    if {[info level] < 2} {
+	return
+    }
+
+    set cmd [list upvar #1]
+    foreach var $args {
+	lappend cmd $var $var
+    }
+    tailcall {*}$cmd
+}
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::util::after delay {
+    ::after $delay [list [info coroutine]]
+    yield
+    return
+}
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::util::exit {{status 0}} {
+    return -level [info level] $status
+}
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::util::vwait varname {
+    upvar 1 $varname var
+    set callback [list [namespace current]::VWaitTrace [info coroutine]]
+
+    # Step 1. Wait for a write to the variable, using a trace to
+    # restart the coroutine
+
+    trace add    variable var write $callback
+    yield
+    trace remove variable var write $callback
+
+    # Step 2. To prevent the next section of the coroutine code from
+    # running entirely within the variable trace (*) we now use an
+    # idle handler to defer it until the trace is definitely
+    # done. This trick by Peter Spjuth.
+    #
+    # (*) At this point we are in VWaitTrace running the coroutine.
+
+    ::after idle [list [info coroutine]]
+    yield
+    return
+}
+
+
+proc ::coroutine::util::VWaitTrace {coroutine args} {
+    $coroutine
+    return
+}
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::util::update {{what {}}} {
+    if {$what eq {idletasks}} {
+        ::after idle [list [info coroutine]]
+    } elseif {$what ne {}} {
+        # Force proper error message for bad call.
+        tailcall ::tcl::update $what
+    } else {
+        ::after 0 [list [info coroutine]]
+    }
+    yield
+    return
+}
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::util::gets args {
+    # Process arguments.
+    # Acceptable syntax:
+    # * gets CHAN ?VARNAME?
+
+    if {[llength $args] == 2} {
+	# gets CHAN VARNAME
+	lassign $args chan varname
+        upvar 1 $varname line
+    } elseif {[llength $args] == 1} {
+	# gets CHAN
+	lassign $args chan
+    } else {
+	# not enough, or too many arguments (0, or > 2): Calling the
+	# builtin gets command with the bogus arguments gives us the
+	# necessary error with the proper message.
+	tailcall ::chan gets {*}$args
+    }
+
+    # Loop until we have a complete line. Yield to the event loop
+    # where necessary. During
+    set blocking [::chan configure $chan -blocking]
+    set readable [::chan event $chan readable]
+    ::chan event $chan readable [list [info coroutine]]
+    ::chan configure $chan -blocking 0
+    try {
+	while 1 {
+	    try {
+		set result [::chan gets $chan line]
+	    } on error {result opts} {
+		return -code $result -options $opts
+	    }
+
+	    if {[::chan blocked $chan]} {
+		yield
+	    } else {
+		if {[llength $args] == 2} {
+		    return $result
+		} else {
+		    return $line
+		}
+	    }
+	}
+    } finally {
+	::chan configure $chan -blocking $blocking
+	::chan event $chan readable $readable
+    }
+}
+
+
+proc ::coroutine::util::gets_safety {chan limit varname {timeout 120000}} {
+    # Process arguments.
+    # Acceptable syntax:
+    # * gets CHAN ?VARNAME?
+
+    # Loop until we have a complete line. Yield to the event loop
+    # where necessary. During
+    upvar 1 $varname line
+    set blocking [::chan configure $chan -blocking]
+    ::chan configure $chan -blocking 0
+    set readable [::chan event $chan readable]
+    ::chan event $chan readable [list [info coroutine] readable]
+    try {
+	while 1 {
+	    if {[::chan pending input $chan] >= $limit} {
+		error {Too many notes, Mozart. Too many notes}
+	    }
+	    try {
+		set result [::chan gets $chan line]
+	    } on error {result opts} {
+		return -code $result -options $opts
+	    }
+
+	    if {[::chan blocked $chan]} {
+		set timeoutevent [::after $timeout [list [info coroutine] timeout]]
+		set event [yield]
+		if {$event eq {timeout}} {
+		  error {Connection Timed Out}
+		}
+		::after cancel $timeoutevent
+	    } else {
+		return $result
+	    }
+	}
+    } finally {
+	::chan configure $chan -blocking $blocking
+	::chan event $chan readable $readable
+    }
+}
+
+
+# - -- --- ----- -------- -------------
+
+proc ::coroutine::util::read args {
+    # Process arguments.
+    # Acceptable syntax:
+    # * read ?-nonewline ? CHAN
+    # * read               CHAN ?n?
+
+    if {[llength $args] > 2} {
+	# Calling the builtin read command with the bogus arguments
+	# gives us the necessary error with the proper message.
+	::chan read {*}$args
+	return
+    }
+
+    set total Inf ; # Number of characters to read. Here: Until eof.
+    set chop  no  ; # Boolean flag. Determines if we have to trim a
+    #               # \n from the end of the read string.
+
+    if {[llength $args] == 2} {
+	lassign $args a b
+	if {$a eq {-nonewline}} {
+	    set chan $b
+	    set chop yes
+	} else {
+	    lassign $args chan total
+	}
+    } else {
+	lassign $args chan
+    }
+
+    # Run the read loop. Yield to the event loop where
+    # necessary. Differentiate between loop until eof, and loop until
+    # n characters have been read (or eof reached).
+
+    set buf {}
+
+    set blocking [::chan configure $chan -blocking]
+    set readable [::chan event $chan readable]
+    ::chan event $chan readable [list [info coroutine]]
+    ::chan configure $chan -blocking 0
+    try {
+	if {$total eq {Inf}} {
+	    # Loop until eof.
+	    while 1 {
+		if {[::chan eof $chan]} {
+		    break
+		} elseif {[::chan blocked $chan]} {
+		    yield
+		}
+
+		try {
+		    set result [::chan read $chan]
+		} on error {result opts} {
+		    return -code $result -options $opts
+		} 
+		append buf $result
+	    }
+	} else {
+	    # Loop until total characters have been read, or eof found,
+	    # whichever is first.
+
+	    set left $total
+	    while 1 {
+		if {[::chan eof $chan]} {
+		    break
+		} elseif {[::chan blocked $chan]} {
+		    yield
+		}
+
+		try {
+		    set result [::chan read $chan $left]
+		} on error {result opts} {
+		    return -code $result -options $opts
+		}
+
+		append buf $result
+		incr left -[string length $result]
+		if {!$left} {
+		    break
+		}
+	    }
+	}
+    } finally {
+	::chan configure $chan -blocking $blocking
+	::chan event $chan readable $readable
+    }
+
+    if {$chop && [string index $buf end] eq "\n"} {
+	set buf [string range $buf 0 end-1]
+    }
+
+    return $buf
+}
+
+# - -- --- ----- -------- -------------
+
+## Yields until the channel is writable before actually writing, as
+## suggested by the documentation for non-blocking puts
+proc ::coroutine::util::puts args {
+    # Process arguments.
+    # Acceptable syntax:
+    # * puts ?-nonewline? ?CHAN? string
+
+    switch [llength $args] {
+        1 {
+            set ch stdout
+        }
+        2 {
+            set ch [lindex $args 0]
+            if {[string match {-*} $ch]} {
+                if {$ch ne {-nonewline}} {
+                    # Force proper error message for bad call
+                    tailcall ::chan puts {*}$args
+                }
+                set ch stdout
+            }
+        }
+        3 {
+            lassign $args opt ch
+            if {$opt ne {-nonewline}} {
+                # Force proper error message for bad call
+                tailcall ::chan puts {*}$args
+            }
+        }
+        default {
+            # Force proper error message for bad call
+            tailcall ::chan puts {*}$args
+        }
+    }
+    set blocking [::chan configure $ch -blocking]
+    ::chan event $ch writable [info coroutine]
+    yield
+    ::chan event $ch writable {}
+    try {
+        ::chan puts {*}$args
+    } on error {result opts} {
+        return -code $result -options $opts
+    } finally {
+        ::chan configure $ch -blocking $blocking
+    }
+    return
+}
+
+# - -- --- ----- -------- -------------
+## Does a non-blocking connect in the background and yields until finished.
+
+proc ::coroutine::util::socket args {
+    # Process arguments.
+    # Acceptable syntax:
+    # * socket ?options? host port
+
+    if {[lsearch -exact $args -server] >= 0} {
+        error "[namespace current]::socket cannot be used for server sockets."
+    }
+    set s [::socket -async {*}$args]
+    ::chan event $s writable [info coroutine]
+    while {[::chan configure $s -connecting]} {
+        yield
+    }
+    ::chan event $s writable {}
+    set errmsg [::chan configure $s -error]
+    if {$errmsg ne {}} {
+        ::chan close $s
+        error $errmsg
+    }
+    return $s
+}
+
+
+# - -- --- ----- -------- -------------
+## This goes beyond the builtin vwait, wait for multiple variables,
+## result is the name of the variable which was written.
+## This code mainly by Neil Madden.
+
+proc ::coroutine::util::await args {
+    set callback [list [namespace current]::AWaitSignal [info coroutine]]
+
+    # Step 1. Wait for a write to any of the variable, using a trace
+    # to restart the coroutine, and the variable written to is
+    # propagated into it.
+
+    foreach varName $args {
+        upvar 1 $varName var
+        trace add variable var write $callback
+    }
+
+    set choice [yield]
+
+    foreach varName $args {
+	#checker exclude warnShadowVar
+        upvar 1 $varName var
+        trace remove variable var write $callback
+    }
+
+    # Step 2. To prevent the next section of the coroutine code from
+    # running entirely within the variable trace (*) we now use an
+    # idle handler to defer it until the trace is definitely
+    # done. This trick by Peter Spjuth.
+    #
+    # (*) At this point we are in AWaitSignal running the coroutine.
+
+    ::after idle [list [info coroutine]]
+    yield
+
+    return $choice
+}
+
+
+proc ::coroutine::util::AWaitSignal {coroutine var index op} {
+    if {$op ne {write}} return
+    set fullvar $var
+    if {$index ne {}} {append fullvar ($index)}
+    $coroutine $fullvar
+}
+
+# # ## ### ##### ######## #############
+## Internal (package specific) commands
+
+proc ::coroutine::util::ID {} {
+    variable counter
+    return [namespace current]::C[incr counter]
+}
+
+# # ## ### ##### ######## #############
+## Internal (package specific) state
+
+namespace eval ::coroutine::util {
+    #checker exclude warnShadowVar
+    variable counter 0
+}
+
+# # ## ### ##### ######## #############
+## Ready
+package provide coroutine 1.3
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/coroutine/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/coroutine/pkgIndex.tcl
new file mode 100644
index 00000000..ef2759c8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/coroutine/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package provide Tcl] 8.6]} return
+package ifneeded coroutine       1.3   [
+    list source [file join $dir coroutine.tcl]]
+package ifneeded coroutine::auto 1.2 [
+    list source [file join $dir coro_auto.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/counter/counter.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/counter/counter.tcl
new file mode 100644
index 00000000..61aa3ff4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/counter/counter.tcl
@@ -0,0 +1,1265 @@
+# counter.tcl --
+#
+#   Procedures to manage simple counters and histograms.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: counter.tcl,v 1.23 2005/09/30 05:36:38 andreas_kupries Exp $
+
+package require Tcl 8.2
+
+namespace eval ::counter {
+
+    # Variables of name counter::T-$tagname
+    # are created as arrays to support each counter.
+
+    # Time-based histograms are kept in sync with each other,
+    # so these variables are shared among them.
+    # These base times record the time corresponding to the first bucket 
+    # of the per-minute, per-hour, and per-day time-based histograms.
+
+    variable startTime
+    variable minuteBase
+    variable hourBase
+    variable hourEnd
+    variable dayBase
+    variable hourIndex
+    variable dayIndex
+
+    # The time-based histogram uses an after event and a list
+    # of counters to do mergeing on.
+
+    variable tagsToMerge
+    if {![info exists tagsToMerge]} {
+    set tagsToMerge {}
+    }
+    variable mergeInterval
+
+    namespace export init reset count exists get names start stop
+    namespace export histHtmlDisplay histHtmlDisplayRow histHtmlDisplayBarChart
+}
+
+# ::counter::init --
+#
+#   Set up a counter.
+#
+# Arguments:
+#   tag The identifier for the counter.  Pass this to counter::count
+#   args    option values pairs that define characteristics of the counter:
+#       See the man page for definitons.
+#
+# Results:
+#   None.
+#
+# Side Effects:
+#   Initializes state about a counter.
+
+proc ::counter::init {tag args} {
+    upvar #0 counter::T-$tag counter
+    if {[info exists counter]} {
+    unset counter
+    }
+    set counter(N) 0    ;# Number of samples
+    set counter(total) 0
+    set counter(type) {}
+
+    # With an empty type the counter is a simple accumulator
+    # for which we can compute an average.  Here we loop through
+    # the args to determine what additional counter attributes
+    # we need to maintain in counter::count
+
+    foreach {option value} $args {
+    switch -- $option {
+        -timehist {
+        variable tagsToMerge
+        variable secsPerMinute
+        variable startTime
+        variable minuteBase
+        variable hourBase
+        variable dayBase
+        variable hourIndex
+        variable dayIndex
+
+        upvar #0 counter::H-$tag histogram
+        upvar #0 counter::Hour-$tag hourhist
+        upvar #0 counter::Day-$tag dayhist
+
+        # Clear the histograms.
+
+        for {set i 0} {$i < 60} {incr i} {
+            set histogram($i) 0
+        }
+        for {set i 0} {$i < 24} {incr i} {
+            set hourhist($i) 0
+        }
+        if {[info exists dayhist]} {
+            unset dayhist
+        }
+        set dayhist(0) 0
+
+        # Clear all-time high records
+
+        set counter(maxPerMinute) 0
+        set counter(maxPerHour) 0
+        set counter(maxPerDay) 0
+
+        # The value associated with -timehist is the number of seconds
+        # in each bucket.  Normally this is 60, but for
+        # testing, we compress minutes.  The value is limited at
+        # 60 because the per-minute buckets are accumulated into
+        # per-hour buckets later.
+
+        if {$value == "" || $value == 0 || $value > 60} {
+            set value 60
+        }
+
+        # Histogram state variables.
+        # All time-base histograms share the same bucket size
+        # and starting times to keep them all synchronized.
+        # So, we only initialize these parameters once.
+
+        if {![info exists secsPerMinute]} {
+            set secsPerMinute $value
+
+            set startTime [clock seconds]
+            set dayIndex 0
+
+            set dayStart [clock scan [clock format $startTime \
+                -format 00:00]]
+            
+            # Figure out what "hour" we are
+
+            set delta [expr {$startTime - $dayStart}]
+            set hourIndex [expr {$delta / ($secsPerMinute * 60)}]
+            set day [expr {$hourIndex / 24}]
+            set hourIndex [expr {$hourIndex % 24}]
+
+            set hourBase [expr {$dayStart + $day * $secsPerMinute * 60 * 24}]
+            set minuteBase [expr {$hourBase + $hourIndex * 60 * $secsPerMinute}]
+
+            set partialHour [expr {$startTime -
+            ($hourBase + $hourIndex * 60 * $secsPerMinute)}]
+            set secs [expr {(60 * $secsPerMinute) - $partialHour}]
+            if {$secs <= 0} {
+            set secs 1
+            }
+
+            # After the first timer, the event occurs once each "hour"
+
+            set mergeInterval [expr {60 * $secsPerMinute * 1000}]
+            after [expr {$secs * 1000}] [list counter::MergeHour $mergeInterval]
+        }
+        if {[lsearch $tagsToMerge $tag] < 0} {
+            lappend tagsToMerge $tag
+        }
+
+        # This records the last used slots in order to zero-out the
+        # buckets that are skipped during idle periods.
+
+        set counter(lastMinute) -1
+
+        # The following is referenced when bugs cause histogram
+        # hits outside the expect range (overflow and underflow)
+
+        set counter(bucketsize)  0
+        }
+        -group {
+        # Cluster a set of counters with a single total
+
+        upvar #0 counter::H-$tag histogram
+        if {[info exists histogram]} {
+            unset histogram
+        }
+        set counter(group) $value
+        }
+        -lastn {
+        # The lastN samples are kept if a vector to form a running average.
+
+        upvar #0 counter::V-$tag vector
+        set counter(lastn) $value
+        set counter(index) 0
+        if {[info exists vector]} {
+            unset vector
+        }
+        for {set i 0} {$i < $value} {incr i} {
+            set vector($i) 0
+        }
+        }
+        -hist {
+        # A value-based histogram with buckets for different values.
+
+        upvar #0 counter::H-$tag histogram
+        if {[info exists histogram]} {
+            unset histogram
+        }
+        set counter(bucketsize) $value
+        set counter(mult) 1
+        }
+        -hist2x {
+        upvar #0 counter::H-$tag histogram
+        if {[info exists histogram]} {
+            unset histogram
+        }
+        set counter(bucketsize) $value
+        set counter(mult) 2
+        }
+        -hist10x {
+        upvar #0 counter::H-$tag histogram
+        if {[info exists histogram]} {
+            unset histogram
+        }
+        set counter(bucketsize) $value
+        set counter(mult) 10
+        }
+        -histlog {
+        upvar #0 counter::H-$tag histogram
+        if {[info exists histogram]} {
+            unset histogram
+        }
+        set counter(bucketsize) $value
+        }
+        -simple {
+        # Useful when disabling predefined -timehist or -group counter
+        }
+        default {
+        return -code error "Unsupported option $option.\
+        Must be -timehist, -group, -lastn, -hist, -hist2x, -hist10x, -histlog, or -simple."
+        }
+    }
+    if {[string length $option]} {
+        # In case an option doesn't change the type, but
+        # this feature of the interface isn't used, etc.
+
+        lappend counter(type) $option
+    }
+    }
+
+    # Instead of supporting a counter that could have multiple attributes,
+    # we support a single type to make counting more efficient.
+
+    if {[llength $counter(type)] > 1} {
+    return -code error "Multiple type attributes not supported.  Use only one of\
+        -timehist, -group, -lastn, -hist, -hist2x, -hist10x, -histlog, -disabled."
+    }
+    return ""
+}
+
+# ::counter::reset --
+#
+#   Reset a counter.
+#
+# Arguments:
+#   tag The identifier for the counter.
+#
+# Results:
+#   None.
+#
+# Side Effects:
+#   Deletes the counter and calls counter::init again for it.
+
+proc ::counter::reset {tag args} {
+    upvar #0 counter::T-$tag counter
+
+    # Layer reset on top of init.  Here we figure out what
+    # we need to pass into the init procedure to recreate it.
+
+    switch -- $counter(type) {
+    ""  {
+        set args ""
+    }
+    -group {
+        upvar #0 counter::H-$tag histogram
+        if {[info exists histogram]} {
+        unset histogram
+        }
+        set args [list -group $counter(group)]
+    }
+    -lastn {
+        upvar #0 counter::V-$tag vector
+        if {[info exists vector]} {
+        unset vector
+        }
+        set args [list -lastn $counter(lastn)]
+    }
+    -hist -
+    -hist10x -
+    -histlog -
+    -hist2x {
+        upvar #0 counter::H-$tag histogram
+        if {[info exists histogram]} {
+        unset histogram
+        }
+        set args [list $counter(type) $counter(bucketsize)]
+    }
+    -timehist {
+        foreach h [list counter::H-$tag counter::Hour-$tag counter::Day-$tag] {
+        upvar #0 $h histogram
+        if {[info exists histogram]} {
+            unset histogram
+        }
+        }
+        set args [list -timehist $counter::secsPerMinute]
+    }
+    default {#ignore}
+    }
+    unset counter
+    eval {counter::init $tag} $args
+    set counter(resetDate) [clock seconds]
+    return ""
+}
+
+# ::counter::count --
+#
+#   Accumulate statistics.
+#
+# Arguments:
+#   tag The counter identifier.
+#   delta   The increment amount.  Defaults to 1.
+#   arg For -group types, this is the histogram index.
+#
+# Results:
+#   None
+#
+# Side Effects:
+#   Accumlate statistics.
+
+proc ::counter::count {tag {delta 1} args} {
+    upvar #0 counter::T-$tag counter
+    set counter(total) [expr {$counter(total) + $delta}]
+    incr counter(N)
+
+    # Instead of supporting a counter that could have multiple attributes,
+    # we support a single type to make counting a skosh more efficient.
+
+#    foreach option $counter(type) {
+    switch -- $counter(type) {
+        ""  {
+        # Simple counter
+        return
+        }
+        -group {
+        upvar #0 counter::H-$tag histogram
+        set subIndex [lindex $args 0]
+        if {![info exists histogram($subIndex)]} {
+            set histogram($subIndex) 0
+        }
+        set histogram($subIndex) [expr {$histogram($subIndex) + $delta}]
+        }
+        -lastn {
+        upvar #0 counter::V-$tag vector
+        set vector($counter(index)) $delta
+        set counter(index) [expr {($counter(index) +1)%$counter(lastn)}]
+        }
+        -hist {
+        upvar #0 counter::H-$tag histogram
+        set bucket [expr {int($delta / $counter(bucketsize))}]
+        if {![info exists histogram($bucket)]} {
+            set histogram($bucket) 0
+        }
+        incr histogram($bucket)
+        }
+        -hist10x -
+        -hist2x {
+        upvar #0 counter::H-$tag histogram
+        set bucket 0
+        for {set max $counter(bucketsize)} {$delta > $max} \
+            {set max [expr {$max * $counter(mult)}]} {
+            incr bucket
+        }
+        if {![info exists histogram($bucket)]} {
+            set histogram($bucket) 0
+        }
+        incr histogram($bucket)
+        }
+        -histlog {
+        upvar #0 counter::H-$tag histogram
+        set bucket [expr {int(log($delta)*$counter(bucketsize))}]
+        if {![info exists histogram($bucket)]} {
+            set histogram($bucket) 0
+        }
+        incr histogram($bucket)
+        }
+        -timehist {
+        upvar #0 counter::H-$tag histogram
+        variable minuteBase
+        variable secsPerMinute
+
+        set minute [expr {([clock seconds] - $minuteBase) / $secsPerMinute}]
+        if {$minute > 59} {
+            # this occurs while debugging if the process is
+            # stopped at a breakpoint too long.
+            set minute 59
+        }
+
+        # Initialize the current bucket and 
+        # clear any buckets we've skipped since the last sample.
+        
+        if {$minute != $counter(lastMinute)} {
+            set histogram($minute) 0
+            for {set i [expr {$counter(lastMinute)+1}]} \
+                {$i < $minute} \
+                {incr i} {
+            set histogram($i) 0
+            }
+            set counter(lastMinute) $minute
+        }
+        set histogram($minute) [expr {$histogram($minute) + $delta}]
+        }
+        default {#ignore}
+    }
+#   }
+    return
+}
+
+# ::counter::exists --
+#
+#   Return true if the counter exists.
+#
+# Arguments:
+#   tag The counter identifier.
+#
+# Results:
+#   1 if it has been defined.
+#
+# Side Effects:
+#   None.
+
+proc ::counter::exists {tag} {
+    upvar #0 counter::T-$tag counter
+    return [info exists counter]
+}
+
+# ::counter::get --
+#
+#   Return statistics.
+#
+# Arguments:
+#   tag The counter identifier.
+#   option  What statistic to get
+#   args    Needed by some options.
+#
+# Results:
+#   With no args, just the counter value.
+#
+# Side Effects:
+#   None.
+
+proc ::counter::get {tag {option -total} args} {
+    upvar #0 counter::T-$tag counter
+    switch -- $option {
+    -total {
+        return $counter(total)
+    }
+    -totalVar {
+        return ::counter::T-$tag\(total)
+    }
+    -N {
+        return $counter(N)
+    }
+    -avg {
+        if {$counter(N) == 0} {
+        return 0
+        } else {
+        return [expr {$counter(total) / double($counter(N))}]
+        }
+    }
+    -avgn {
+        if {$counter(type) != "-lastn"} {
+        return -code error "The -avgn option is only supported for -lastn counters."
+        }
+        upvar #0 counter::V-$tag vector
+        set sum 0
+        for {set i 0} {($i < $counter(N)) && ($i < $counter(lastn))} {incr i} {
+        set sum [expr {$sum + $vector($i)}]
+        }
+        if {$i == 0} {
+        return 0
+        } else {
+        return [expr {$sum / double($i)}]
+        }
+    }
+    -hist {
+        upvar #0 counter::H-$tag histogram
+        if {[llength $args]} {
+        # Return particular bucket
+        set bucket [lindex $args 0]
+        if {[info exists histogram($bucket)]} {
+            return $histogram($bucket)
+        } else {
+            return 0
+        }
+        } else {
+        # Dump the whole histogram
+
+        set result {}
+        if {$counter(type) == "-group"} {
+            set sort -dictionary
+        } else {
+            set sort -integer
+        }
+        foreach x [lsort $sort [array names histogram]] {
+            lappend result $x $histogram($x)
+        }
+        return $result
+        }
+    }
+    -histVar {
+        return ::counter::H-$tag
+    }
+    -histHour {
+        upvar #0 counter::Hour-$tag histogram
+        set result {}
+        foreach x [lsort -integer [array names histogram]] {
+        lappend result $x $histogram($x)
+        }
+        return $result
+    }
+    -histHourVar {
+        return ::counter::Hour-$tag
+    }
+    -histDay {
+        upvar #0 counter::Day-$tag histogram
+        set result {}
+        foreach x [lsort -integer [array names histogram]] {
+        lappend result $x $histogram($x)
+        }
+        return $result
+    }
+    -histDayVar {
+        return ::counter::Day-$tag
+    }
+    -maxPerMinute {
+        return $counter(maxPerMinute)
+    }
+    -maxPerHour {
+        return $counter(maxPerHour)
+    }
+    -maxPerDay {
+        return $counter(maxPerDay)
+    }
+    -resetDate {
+        if {[info exists counter(resetDate)]} {
+        return $counter(resetDate)
+        } else {
+        return ""
+        }
+    }
+    -all {
+        return [array get counter]
+    }
+    default {
+        return -code error "Invalid option $option.\
+        Should be -all, -total, -N, -avg, -avgn, -hist, -histHour,\
+        -histDay, -totalVar, -histVar, -histHourVar, -histDayVar -resetDate."
+    }
+    }
+}
+
+# ::counter::names --
+#
+#   Return the list of defined counters.
+#
+# Arguments:
+#   none
+#
+# Results:
+#   A list of counter tags.
+#
+# Side Effects:
+#   None.
+
+proc ::counter::names {} {
+    set result {}
+    foreach v [info vars ::counter::T-*] {
+    if {[info exists $v]} {
+        # Declared arrays might not exist, yet
+        # strip prefix from name
+        set v [string range $v [string length "::counter::T-"] end]
+        lappend result $v
+    }
+    }
+    return $result
+}
+
+# ::counter::MergeHour --
+#
+#   Sum the per-minute histogram into the next hourly bucket.
+#   On 24-hour boundaries, sum the hourly buckets into the next day bucket.
+#   This operates on all time-based histograms.
+#
+# Arguments:
+#   none
+#
+# Results:
+#   none
+#
+# Side Effects:
+#   See description.
+
+proc ::counter::MergeHour {interval} {
+    variable hourIndex
+    variable minuteBase
+    variable hourBase
+    variable tagsToMerge
+    variable secsPerMinute
+
+    after $interval [list counter::MergeHour $interval]
+    if {![info exists hourBase] || $hourIndex == 0} {
+    set hourBase $minuteBase
+    }
+    set minuteBase [clock seconds]
+
+    foreach tag $tagsToMerge {
+    upvar #0 counter::T-$tag counter
+    upvar #0 counter::H-$tag histogram
+    upvar #0 counter::Hour-$tag hourhist
+
+    # Clear any buckets we've skipped since the last sample.
+
+    for {set i [expr {$counter(lastMinute)+1}]} {$i < 60} {incr i} {
+        set histogram($i) 0
+    }
+    set counter(lastMinute) -1
+
+    # Accumulate into the next hour bucket.
+
+    set hourhist($hourIndex) 0
+    set max 0
+    foreach i [array names histogram] {
+        set hourhist($hourIndex) [expr {$hourhist($hourIndex) + $histogram($i)}]
+        if {$histogram($i) > $max} {
+        set max $histogram($i)
+        }
+    }
+    set perSec [expr {$max / $secsPerMinute}]
+    if {$perSec > $counter(maxPerMinute)} {
+        set counter(maxPerMinute) $perSec
+    }
+    }
+    set hourIndex [expr {($hourIndex + 1) % 24}]
+    if {$hourIndex == 0} {
+    counter::MergeDay
+    }
+
+}
+# ::counter::MergeDay --
+#
+#   Sum the per-minute histogram into the next hourly bucket.
+#   On 24-hour boundaries, sum the hourly buckets into the next day bucket.
+#   This operates on all time-based histograms.
+#
+# Arguments:
+#   none
+#
+# Results:
+#   none
+#
+# Side Effects:
+#   See description.
+
+proc ::counter::MergeDay {} {
+    variable dayIndex
+    variable dayBase
+    variable hourBase
+    variable tagsToMerge
+    variable secsPerMinute
+
+    # Save the hours histogram into a bucket for the last day
+    # counter(day,$day) is the starting time for that day bucket
+
+    if {![info exists dayBase]} {
+    set dayBase $hourBase
+    }
+    foreach tag $tagsToMerge {
+    upvar #0 counter::T-$tag counter
+    upvar #0 counter::Day-$tag dayhist
+    upvar #0 counter::Hour-$tag hourhist
+    set dayhist($dayIndex) 0
+    set max 0
+    for {set i 0} {$i < 24} {incr i} {
+        if {[info exists hourhist($i)]} {
+        set dayhist($dayIndex) [expr {$dayhist($dayIndex) + $hourhist($i)}]
+        if {$hourhist($i) > $max} { 
+            set max $hourhist($i) 
+        }
+        }
+    }
+    set perSec [expr {double($max) / ($secsPerMinute * 60)}]
+    if {$perSec > $counter(maxPerHour)} {
+        set counter(maxPerHour) $perSec
+    }
+    }
+    set perSec [expr {double($dayhist($dayIndex)) / ($secsPerMinute * 60 * 24)}]
+    if {$perSec > $counter(maxPerDay)} {
+    set counter(maxPerDay) $perSec
+    }
+    incr dayIndex
+}
+
+# ::counter::histHtmlDisplay --
+#
+#   Create an html display of the histogram.
+#
+# Arguments:
+#   tag The counter tag
+#   args    option, value pairs that affect the display:
+#       -title  Label to display above bar chart
+#       -unit   minutes, hours, or days select time-base histograms.
+#           Specify anything else for value-based histograms.
+#       -images URL of /images directory.
+#       -gif    Image for normal histogram bars
+#       -ongif  Image for the active histogram bar
+#       -max    Maximum number of value-based buckets to display
+#       -height Pixel height of the highest bar
+#       -width  Pixel width of each bar
+#       -skip   Buckets to skip when labeling value-based histograms
+#       -format Format used to display labels of buckets.
+#       -text   If 1, a text version of the histogram is dumped,
+#           otherwise a graphical one is generated.
+#
+# Results:
+#   HTML for the display as a complete table.
+#
+# Side Effects:
+#   None.
+
+proc ::counter::histHtmlDisplay {tag args} {
+    append result "<p>\n<table border=0 cellpadding=0 cellspacing=0>\n"
+    append result [eval {counter::histHtmlDisplayRow $tag} $args]
+    append result </table>
+    return $result
+}
+
+# ::counter::histHtmlDisplayRow --
+#
+#   Create an html display of the histogram.
+#
+# Arguments:
+#   See counter::histHtmlDisplay
+#
+# Results:
+#   HTML for the display.  Ths is one row of a 2-column table,
+#   the calling page must define the <table> tag.
+#
+# Side Effects:
+#   None.
+
+proc ::counter::histHtmlDisplayRow {tag args} {
+    upvar #0 counter::T-$tag counter
+    variable secsPerMinute
+    variable minuteBase
+    variable hourBase
+    variable dayBase
+    variable hourIndex
+    variable dayIndex
+
+    array set options [list \
+    -title  $tag \
+    -unit   "" \
+    -images /images \
+    -gif    Blue.gif \
+    -ongif  Red.gif \
+    -max    -1 \
+    -height 100 \
+    -width  4 \
+    -skip   4 \
+    -format %.2f \
+    -text   0
+    ]
+    array set options $args
+
+    # Support for self-posting pages that can clear counters.
+
+    append result "<!-- resetCounter [ncgi::value resetCounter] -->"
+    if {[ncgi::value resetCounter] == $tag} {
+    counter::reset $tag
+    return "<!-- Reset $tag counter -->"
+    }
+
+    switch -glob -- $options(-unit) {
+    min* {
+        upvar #0 counter::H-$tag histogram
+        set histname counter::H-$tag
+        if {![info exists minuteBase]} {
+        return "<!-- No time-based histograms defined -->"
+        }
+        set time $minuteBase
+        set secsForMax $secsPerMinute
+        set periodMax $counter(maxPerMinute)
+        set curIndex [expr {([clock seconds] - $minuteBase) / $secsPerMinute}]
+        set options(-max) 60
+        set options(-min) 0
+    }
+    hour* {
+        upvar #0 counter::Hour-$tag histogram
+        set histname counter::Hour-$tag
+        if {![info exists hourBase]} {
+        return "<!-- Hour merge has not occurred -->"
+        }
+        set time $hourBase
+        set secsForMax [expr {$secsPerMinute * 60}]
+        set periodMax $counter(maxPerHour)
+        set curIndex [expr {$hourIndex - 1}]
+        if {$curIndex < 0} {
+        set curIndex 23
+        }
+        set options(-max) 24
+        set options(-min) 0
+    }
+    day* {
+        upvar #0 counter::Day-$tag histogram
+        set histname counter::Day-$tag
+        if {![info exists dayBase]} {
+        return "<!-- Hour merge has not occurred -->"
+        }
+        set time $dayBase
+        set secsForMax [expr {$secsPerMinute * 60 * 24}]
+        set periodMax $counter(maxPerDay)
+        set curIndex dayIndex
+        set options(-max) $dayIndex
+        set options(-min) 0
+    }
+    default {
+        # Value-based histogram with arbitrary units.
+
+        upvar #0 counter::H-$tag histogram
+        set histname counter::H-$tag
+
+        set unit $options(-unit)
+        set curIndex ""
+        set time ""
+    }
+    }
+    if {! [info exists histogram]} {
+    return "<!-- $histname doesn't exist -->\n"
+    }
+
+    set max 0
+    set maxName 0
+    foreach {name value} [array get histogram] {
+    if {$value > $max} {
+        set max $value
+        set maxName $name
+    }
+    }
+
+    # Start 2-column HTML display.  A summary table at the left, the histogram on the right.
+
+    append result "<tr><td valign=top>\n"
+
+    append result "<table bgcolor=#EEEEEE>\n"
+    append result "<tr><td colspan=2 align=center>[html::font]<b>$options(-title)</b></font></td></tr>\n"
+    append result "<tr><td>[html::font]<b>Total</b></font></td>"
+    append result "<td>[html::font][format $options(-format) $counter(total)]</font></td></tr>\n"
+
+    if {[info exists secsForMax]} {
+
+    # Time-base histogram
+
+    set string {}
+    set t $secsForMax
+    set days [expr {$t / (60 * 60 * 24)}]
+    if {$days == 1} {
+        append string "1 Day "
+    } elseif {$days > 1} {
+        append string "$days Days "
+    }
+    set t [expr {$t - $days * (60 * 60 * 24)}]
+    set hours [expr {$t / (60 * 60)}]
+    if {$hours == 1} {
+        append string "1 Hour "
+    } elseif {$hours > 1} {
+        append string "$hours Hours "
+    }
+    set t [expr {$t - $hours * (60 * 60)}]
+    set mins [expr {$t / 60}]
+    if {$mins == 1} {
+        append string "1 Minute "
+    } elseif {$mins > 1} {
+        append string "$mins Minutes "
+    }
+    set t [expr {$t - $mins * 60}]
+    if {$t == 1} {
+        append string "1 Second "
+    } elseif {$t > 1} {
+        append string "$t Seconds "
+    }
+    append result "<tr><td>[html::font]<b>Bucket Size</b></font></td>"
+    append result "<td>[html::font]$string</font></td></tr>\n"
+
+    append result "<tr><td>[html::font]<b>Max Per Sec</b></font></td>"
+    append result "<td>[html::font][format %.2f [expr {$max/double($secsForMax)}]]</font></td></tr>\n"
+
+    if {$periodMax > 0} {
+        append result "<tr><td>[html::font]<b>Best Per Sec</b></font></td>"
+        append result "<td>[html::font][format %.2f $periodMax]</font></td></tr>\n"
+    }
+    append result "<tr><td>[html::font]<b>Starting Time</b></font></td>"
+    switch -glob -- $options(-unit) {
+        min* {
+        append result "<td>[html::font][clock format $time \
+            -format %k:%M:%S]</font></td></tr>\n"
+        }
+        hour* {
+        append result "<td>[html::font][clock format $time \
+            -format %k:%M:%S]</font></td></tr>\n"
+        }
+        day* {
+        append result "<td>[html::font][clock format $time \
+            -format "%b %d %k:%M"]</font></td></tr>\n"
+        }
+        default {#ignore}
+    }
+
+    } else {
+
+    # Value-base histogram
+
+    set ix [lsort -integer [array names histogram]]
+
+    set mode [expr {$counter(bucketsize) * $maxName}]
+    set first [expr {$counter(bucketsize) * [lindex $ix 0]}]
+    set last [expr {$counter(bucketsize) * [lindex $ix end]}]
+
+    append result "<tr><td>[html::font]<b>Average</b></font></td>"
+    append result "<td>[html::font][format $options(-format) [counter::get $tag -avg]]</font></td></tr>\n"
+
+    append result "<tr><td>[html::font]<b>Mode</b></font></td>"
+    append result "<td>[html::font]$mode</font></td></tr>\n"
+
+    append result "<tr><td>[html::font]<b>Minimum</b></font></td>"
+    append result "<td>[html::font]$first</font></td></tr>\n"
+
+    append result "<tr><td>[html::font]<b>Maximum</b></font></td>"
+    append result "<td>[html::font]$last</font></td></tr>\n"
+
+    append result "<tr><td>[html::font]<b>Unit</b></font></td>"
+    append result "<td>[html::font]$unit</font></td></tr>\n"
+
+    append result "<tr><td colspan=2 align=center>[html::font]<b>"
+    append result "<a href=[ncgi::urlStub]?resetCounter=$tag>Reset</a></td></tr>\n"
+
+    if {$options(-max) < 0} {
+        set options(-max) [lindex $ix end]
+    }
+    if {![info exists options(-min)]} {
+        set options(-min) [lindex $ix 0]
+    }
+    }
+
+    # End table nested inside left-hand column
+
+    append result </table>\n
+    append result </td>\n
+    append result "<td valign=bottom>\n"
+
+
+    # Display the histogram
+
+    if {$options(-text)} {
+    } else {
+    append result [eval \
+        {counter::histHtmlDisplayBarChart $tag histogram $max $curIndex $time} \
+        [array get options]]
+    }
+
+    # Close the right hand column, but leave our caller's table open.
+
+    append result </td></tr>\n
+
+    return $result
+}
+
+# ::counter::histHtmlDisplayBarChart --
+#
+#   Create an html display of the histogram.
+#
+# Arguments:
+#   tag     The counter tag.
+#   histVar     The name of the histogram array
+#   max     The maximum counter value in a histogram bucket.
+#   curIndex    The "current" histogram index, for time-base histograms.
+#   time        The base, or starting time, for the time-based histograms.
+#   args        The array get of the options passed into histHtmlDisplay
+#
+# Results:
+#   HTML for the bar chart.
+#
+# Side Effects:
+#   See description.
+
+proc ::counter::histHtmlDisplayBarChart {tag histVar max curIndex time args} {
+    upvar #0 counter::T-$tag counter
+    upvar 1 $histVar histogram
+    variable secsPerMinute
+    array set options $args
+
+    append result "<table cellpadding=0 cellspacing=0 bgcolor=#eeeeee><tr>\n"
+
+    set ix [lsort -integer [array names histogram]]
+
+    for {set t $options(-min)} {$t < $options(-max)} {incr t} {
+    if {![info exists histogram($t)]} {
+        set value 0
+    } else {
+        set value $histogram($t)
+    }
+    if {$max == 0 || $value == 0} {
+        set height 1
+    } else {
+        set percent [expr {round($value * 100.0 / $max)}]
+        set height [expr {$percent * $options(-height) / 100}]
+    }
+    if {$t == $curIndex} {
+        set img src=$options(-images)/$options(-ongif)
+    } else {
+        set img src=$options(-images)/$options(-gif)
+    }
+    append result "<td valign=bottom><img $img height=$height\
+        width=$options(-width) title=$value alt=$value></td>\n"
+    }
+    append result "</tr>"
+
+    # Count buckets outside the range requested
+
+    set overflow 0
+    set underflow 0
+    foreach t [lsort -integer [array names histogram]] {
+    if {($options(-max) > 0) && ($t > $options(-max))} {
+        incr overflow
+    }
+    if {($options(-min) >= 0) && ($t < $options(-min))} {
+        incr underflow
+    }
+    }
+
+    # Append a row of labels at the bottom.
+
+    set colors {black #CCCCCC}
+    set bgcolors {#CCCCCC black}
+    set colori 0
+    if {$counter(type) != "-timehist"} {
+
+    # Label each bucket with its value
+    # This is probably wrong for hist2x and hist10x
+
+    append result "<tr>"
+    set skip $options(-skip)
+    if {![info exists counter(mult)]} {
+        set counter(mult) 1
+    }
+
+    # These are tick marks
+
+    set img src=$options(-images)/$options(-gif)
+    append result "<tr>"
+    for {set i $options(-min)} {$i < $options(-max)} {incr i} {
+        if {(($i % $skip) == 0)} {
+        append result "<td valign=bottom><img $img height=3 \
+            width=1></td>\n"
+        } else {
+        append result "<td valign=bottom></td>"
+        }
+    }
+    append result </tr>
+
+    # These are the labels
+
+    append result "<tr>"
+    for {set i $options(-min)} {$i < $options(-max)} {incr i} {
+        if {$counter(type) == "-histlog"} {
+        if {[catch {expr {int(log($i) * $counter(bucketsize))}} x]} {
+            # Out-of-bounds
+            break
+        }
+        } else {
+        set x [expr {$i * $counter(bucketsize) * $counter(mult)}]
+        }
+        set label [format $options(-format) $x]
+        if {(($i % $skip) == 0)} {
+        set color [lindex $colors $colori]
+        set bg [lindex $bgcolors $colori]
+        set colori [expr {($colori+1) % 2}]
+        append result "<td colspan=$skip><font size=1 color=$color>$label</font></td>"
+        }
+    }
+    append result </tr>
+    } else {
+    switch -glob -- $options(-unit) {
+        min*    {
+        if {$secsPerMinute != 60} {
+            set format %k:%M:%S
+            set skip 12
+        } else {
+            set format %k:%M
+            set skip 4
+        }
+        set deltaT $secsPerMinute
+        set wrapDeltaT [expr {$secsPerMinute * -59}]
+        }
+        hour*   {
+        if {$secsPerMinute != 60} {
+            set format %k:%M
+            set skip 4
+        } else {
+            set format %k
+            set skip 2
+        }
+        set deltaT [expr {$secsPerMinute * 60}]
+        set wrapDeltaT [expr {$secsPerMinute * 60 * -23}]
+        }
+        day* {
+        if {$secsPerMinute != 60} {
+            set format "%m/%d %k:%M"
+            set skip 10
+        } else {
+            set format %k
+            set skip $options(-skip)
+        }
+        set deltaT [expr {$secsPerMinute * 60 * 24}]
+        set wrapDeltaT 0
+        }
+        default {#ignore}
+    }
+    # These are tick marks
+
+    set img src=$options(-images)/$options(-gif)
+    append result "<tr>"
+    foreach t [lsort -integer [array names histogram]] {
+        if {(($t % $skip) == 0)} {
+        append result "<td valign=bottom><img $img height=3 \
+            width=1></td>\n"
+        } else {
+        append result "<td valign=bottom></td>"
+        }
+    }
+    append result </tr>
+
+    set lastLabel ""
+    append result "<tr>"
+    foreach t [lsort -integer [array names histogram]] {
+
+        # Label each bucket with its time
+
+        set label [clock format $time -format $format]
+        if {(($t % $skip) == 0) && ($label != $lastLabel)} {
+        set color [lindex $colors $colori]
+        set bg [lindex $bgcolors $colori]
+        set colori [expr {($colori+1) % 2}]
+        append result "<td colspan=$skip><font size=1 color=$color>$label</font></td>"
+        set lastLabel $label
+        }
+        if {$t == $curIndex} {
+        incr time $wrapDeltaT
+        } else {
+        incr time $deltaT
+        }
+    }
+    append result </tr>\n
+    }
+    append result "</table>"
+    if {$underflow > 0} {
+    append result "<br>Skipped $underflow samples <\
+        [expr {$options(-min) * $counter(bucketsize)}]\n"
+    }
+    if {$overflow > 0} {
+    append result "<br>Skipped $overflow samples >\
+        [expr {$options(-max) * $counter(bucketsize)}]\n"
+    }
+    return $result
+}
+
+# ::counter::start --
+#
+#   Start an interval timer.  This should be pre-declared with
+#   type either -hist, -hist2x, or -hist20x
+#
+# Arguments:
+#   tag     The counter identifier.
+#   instance    There may be multiple intervals outstanding
+#           at any time.  This serves to distinquish them.
+#
+# Results:
+#   None
+#
+# Side Effects:
+#   Records the starting time for the instance of this interval.
+
+proc ::counter::start {tag instance} {
+    upvar #0 counter::Time-$tag time
+    # clock clicks can return negative values if the sign bit is set
+    # Here we turn it into a 31-bit counter because we only want
+    # relative differences
+    set msec [expr {[clock clicks -milliseconds] & 0x7FFFFFFF}]
+    set time($instance) [list $msec [clock seconds]]
+}
+
+# ::counter::stop --
+#
+#   Record an interval timer.
+#
+# Arguments:
+#   tag     The counter identifier.
+#   instance    There may be multiple intervals outstanding
+#           at any time.  This serves to distinquish them.
+#   func        An optional function used to massage the time
+#           stamp before putting into the histogram.
+#
+# Results:
+#   None
+#
+# Side Effects:
+#   Computes the current interval and adds it to the histogram.
+
+proc ::counter::stop {tag instance {func ::counter::Identity}} {
+    upvar #0 counter::Time-$tag time
+
+    if {![info exists time($instance)]} {
+	# Extra call. Ignore so we can debug error cases.
+	return
+    }
+    set msec [expr {[clock clicks -milliseconds] & 0x7FFFFFFF}]
+    set now [list $msec [clock seconds]]
+    set delMicros [expr {[lindex $now 0] - [lindex $time($instance) 0]}]
+    if {$delMicros < 0} {
+      # Microsecond counter wrapped.
+      set delMicros [expr {0x7FFFFFFF - [lindex $time($instance) 0] +
+                            [lindex $now 0]}]
+    }
+    set delSecond [expr {[lindex $now 1] - [lindex $time($instance) 1]}]
+    unset time($instance)
+
+    # It is quite possible that the millisecond counter is much
+    # larger than 1000, so we just use it unless our microsecond
+    # calculation is screwed up.
+
+    if {$delMicros >= 0} {
+      counter::count $tag [$func [expr {$delMicros / 1000.0}]]
+    } else {
+      counter::count $tag [$func $delSecond]
+    }
+}
+
+# ::counter::Identity --
+#
+#   Return its argument.  This is used as the default function
+#   to apply to an interval timer.
+#
+# Arguments:
+#   x       Some value.
+#
+# Results:
+#   $x
+#
+# Side Effects:
+#   None
+
+
+proc ::counter::Identity {x} {
+    return $x
+}
+
+package provide counter 2.0.4
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/counter/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/counter/pkgIndex.tcl
new file mode 100644
index 00000000..7ab2eb27
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/counter/pkgIndex.tcl
@@ -0,0 +1,12 @@
+# Tcl package index file, version 1.1
+# This file is generated by the "pkg_mkIndex" command
+# and sourced either when an application starts up or
+# by a "package unknown" script.  It invokes the
+# "package ifneeded" command to set up package-related
+# information so that packages will be loaded automatically
+# in response to "package require" commands.  When this
+# script is sourced, the variable $dir must contain the
+# full path name of this file's directory.
+
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded counter 2.0.4 [list source [file join $dir counter.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/cksum.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/cksum.tcl
new file mode 100644
index 00000000..6ff4e513
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/cksum.tcl
@@ -0,0 +1,200 @@
+# cksum.tcl - Copyright (C) 2002 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# Provides a Tcl only implementation of the unix cksum(1) command. This is
+# similar to the sum(1) command but the algorithm is better defined and
+# standardized across multiple platforms by POSIX 1003.2/D11.2
+#
+# This command has been verified against the cksum command from the GNU
+# textutils package version 2.0
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2;                # tcl minimum version
+
+namespace eval ::crc {
+    namespace export cksum
+
+    variable cksum_tbl [list 0x0 \
+           0x04C11DB7 0x09823B6E 0x0D4326D9 0x130476DC 0x17C56B6B \
+           0x1A864DB2 0x1E475005 0x2608EDB8 0x22C9F00F 0x2F8AD6D6 \
+           0x2B4BCB61 0x350C9B64 0x31CD86D3 0x3C8EA00A 0x384FBDBD \
+           0x4C11DB70 0x48D0C6C7 0x4593E01E 0x4152FDA9 0x5F15ADAC \
+           0x5BD4B01B 0x569796C2 0x52568B75 0x6A1936C8 0x6ED82B7F \
+           0x639B0DA6 0x675A1011 0x791D4014 0x7DDC5DA3 0x709F7B7A \
+           0x745E66CD 0x9823B6E0 0x9CE2AB57 0x91A18D8E 0x95609039 \
+           0x8B27C03C 0x8FE6DD8B 0x82A5FB52 0x8664E6E5 0xBE2B5B58 \
+           0xBAEA46EF 0xB7A96036 0xB3687D81 0xAD2F2D84 0xA9EE3033 \
+           0xA4AD16EA 0xA06C0B5D 0xD4326D90 0xD0F37027 0xDDB056FE \
+           0xD9714B49 0xC7361B4C 0xC3F706FB 0xCEB42022 0xCA753D95 \
+           0xF23A8028 0xF6FB9D9F 0xFBB8BB46 0xFF79A6F1 0xE13EF6F4 \
+           0xE5FFEB43 0xE8BCCD9A 0xEC7DD02D 0x34867077 0x30476DC0 \
+           0x3D044B19 0x39C556AE 0x278206AB 0x23431B1C 0x2E003DC5 \
+           0x2AC12072 0x128E9DCF 0x164F8078 0x1B0CA6A1 0x1FCDBB16 \
+           0x018AEB13 0x054BF6A4 0x0808D07D 0x0CC9CDCA 0x7897AB07 \
+           0x7C56B6B0 0x71159069 0x75D48DDE 0x6B93DDDB 0x6F52C06C \
+           0x6211E6B5 0x66D0FB02 0x5E9F46BF 0x5A5E5B08 0x571D7DD1 \
+           0x53DC6066 0x4D9B3063 0x495A2DD4 0x44190B0D 0x40D816BA \
+           0xACA5C697 0xA864DB20 0xA527FDF9 0xA1E6E04E 0xBFA1B04B \
+           0xBB60ADFC 0xB6238B25 0xB2E29692 0x8AAD2B2F 0x8E6C3698 \
+           0x832F1041 0x87EE0DF6 0x99A95DF3 0x9D684044 0x902B669D \
+           0x94EA7B2A 0xE0B41DE7 0xE4750050 0xE9362689 0xEDF73B3E \
+           0xF3B06B3B 0xF771768C 0xFA325055 0xFEF34DE2 0xC6BCF05F \
+           0xC27DEDE8 0xCF3ECB31 0xCBFFD686 0xD5B88683 0xD1799B34 \
+           0xDC3ABDED 0xD8FBA05A 0x690CE0EE 0x6DCDFD59 0x608EDB80 \
+           0x644FC637 0x7A089632 0x7EC98B85 0x738AAD5C 0x774BB0EB \
+           0x4F040D56 0x4BC510E1 0x46863638 0x42472B8F 0x5C007B8A \
+           0x58C1663D 0x558240E4 0x51435D53 0x251D3B9E 0x21DC2629 \
+           0x2C9F00F0 0x285E1D47 0x36194D42 0x32D850F5 0x3F9B762C \
+           0x3B5A6B9B 0x0315D626 0x07D4CB91 0x0A97ED48 0x0E56F0FF \
+           0x1011A0FA 0x14D0BD4D 0x19939B94 0x1D528623 0xF12F560E \
+           0xF5EE4BB9 0xF8AD6D60 0xFC6C70D7 0xE22B20D2 0xE6EA3D65 \
+           0xEBA91BBC 0xEF68060B 0xD727BBB6 0xD3E6A601 0xDEA580D8 \
+           0xDA649D6F 0xC423CD6A 0xC0E2D0DD 0xCDA1F604 0xC960EBB3 \
+           0xBD3E8D7E 0xB9FF90C9 0xB4BCB610 0xB07DABA7 0xAE3AFBA2 \
+           0xAAFBE615 0xA7B8C0CC 0xA379DD7B 0x9B3660C6 0x9FF77D71 \
+           0x92B45BA8 0x9675461F 0x8832161A 0x8CF30BAD 0x81B02D74 \
+           0x857130C3 0x5D8A9099 0x594B8D2E 0x5408ABF7 0x50C9B640 \
+           0x4E8EE645 0x4A4FFBF2 0x470CDD2B 0x43CDC09C 0x7B827D21 \
+           0x7F436096 0x7200464F 0x76C15BF8 0x68860BFD 0x6C47164A \
+           0x61043093 0x65C52D24 0x119B4BE9 0x155A565E 0x18197087 \
+           0x1CD86D30 0x029F3D35 0x065E2082 0x0B1D065B 0x0FDC1BEC \
+           0x3793A651 0x3352BBE6 0x3E119D3F 0x3AD08088 0x2497D08D \
+           0x2056CD3A 0x2D15EBE3 0x29D4F654 0xC5A92679 0xC1683BCE \
+           0xCC2B1D17 0xC8EA00A0 0xD6AD50A5 0xD26C4D12 0xDF2F6BCB \
+           0xDBEE767C 0xE3A1CBC1 0xE760D676 0xEA23F0AF 0xEEE2ED18 \
+           0xF0A5BD1D 0xF464A0AA 0xF9278673 0xFDE69BC4 0x89B8FD09 \
+           0x8D79E0BE 0x803AC667 0x84FBDBD0 0x9ABC8BD5 0x9E7D9662 \
+           0x933EB0BB 0x97FFAD0C 0xAFB010B1 0xAB710D06 0xA6322BDF \
+           0xA2F33668 0xBCB4666D 0xB8757BDA 0xB5365D03 0xB1F740B4 ]
+
+    variable uid
+    if {![info exists uid]} {set uid 0}
+}
+
+# crc::CksumInit -- 
+#
+#	Create and initialize a cksum context. This is cleaned up when we
+#	call CksumFinal to obtain the result.
+#
+proc ::crc::CksumInit {} {
+    variable uid
+    set token [namespace current]::[incr uid]
+    upvar #0 $token state
+    array set state {t 0 l 0}
+    return $token
+}
+
+proc ::crc::CksumUpdate {token data} {
+    variable cksum_tbl
+    upvar #0 $token state
+    set t $state(t)
+    binary scan $data c* r
+    foreach {n} $r {
+        set index [expr { (($t >> 24) ^ ($n & 0xFF)) & 0xFF }]
+        # Since the introduction of built-in bigInt support with Tcl
+        # 8.5, bit-shifting $t to the left no longer overflows,
+        # keeping it 32 bits long.  The value grows bigger and bigger
+        # instead - a severe hit on performance.  For this reason we
+        # do a bitwise AND against 0xFFFFFFFF at each step to keep the
+        # value within limits.
+        set t [expr {0xFFFFFFFF & (($t << 8) ^ [lindex $cksum_tbl $index])}]
+        incr state(l)
+    }
+    set state(t) $t
+    return
+}
+
+proc ::crc::CksumFinal {token} {
+    variable cksum_tbl
+    upvar #0 $token state
+    set t $state(t)
+    for {set i $state(l)} {$i > 0} {set i [expr {$i>>8}]} {
+        set index [expr {(($t >> 24) ^ $i) & 0xFF}]
+        set t [expr {0xFFFFFFFF & (($t << 8) ^ [lindex $cksum_tbl $index])}]
+    }
+    unset state
+    return [expr {~$t & 0xFFFFFFFF}]
+}
+
+# crc::Pop --
+#
+#	Pop the nth element off a list. Used in options processing.
+#
+proc ::crc::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# Description:
+#  Provide a Tcl equivalent of the unix cksum(1) command.
+# Options:
+#  -filename name  - return a checksum for the specified file.
+#  -format string  - return the checksum using this format string.
+#  -chunksize size - set the chunking read size
+#
+proc ::crc::cksum {args} {
+    array set opts [list -filename {} -channel {} -chunksize 4096 \
+                        -format %u -command {}]
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -file*   { set opts(-filename) [Pop args 1] }
+            -chan*   { set opts(-channel) [Pop args 1] }
+            -chunk*  { set opts(-chunksize) [Pop args 1] }
+            -for*    { set opts(-format)   [Pop args 1] }
+            -command { set opts(-command)  [Pop args 1] }
+            default {
+                if {[llength $args] == 1} { break }
+                if {[string compare $option "--"] == 0} { Pop args ; break }
+                set err [join [lsort [array names opts -*]] ", "]
+                return -code error "bad option \"option\": must be $err"
+            }
+        }
+        Pop args
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args: should be\
+                cksum ?-format string?\
+                -channel chan | -filename file | string"
+        }
+        set tok [CksumInit]
+        CksumUpdate $tok [lindex $args 0]
+        set r [CksumFinal $tok]
+    
+    } else {
+
+        set tok [CksumInit]
+        while {![eof $opts(-channel)]} {
+            CksumUpdate $tok [read $opts(-channel) $opts(-chunksize)]
+        }
+        set r [CksumFinal $tok]
+
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+
+    return [format $opts(-format) $r]
+}
+
+# -------------------------------------------------------------------------
+
+package provide cksum 1.1.4
+
+# -------------------------------------------------------------------------
+# Local variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/crc16.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/crc16.tcl
new file mode 100644
index 00000000..2d44fabe
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/crc16.tcl
@@ -0,0 +1,308 @@
+# crc16.tcl -- Copyright (C) 2002, 2017 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# Cyclic Redundancy Check - this is a Tcl implementation of a general
+# table-driven CRC implementation. This code should be able to generate
+# the lookup table and implement the correct algorithm for most types
+# of CRC. CRC-16, CRC-32 and the CCITT version of CRC-16. [1][2][3]
+# Most transmission CRCs use the CCITT polynomial (including X.25, SDLC
+# and Kermit).
+#
+# [1] http://www.microconsultants.com/tips/crc/crc.txt for the reference
+#     implementation
+# [2] http://www.embedded.com/internet/0001/0001connect.htm
+#     for another good discussion of why things are the way they are.
+# [3] "Numerical Recipes in C", Press WH et al. Chapter 20.
+#
+# Checks: a crc for the string "123456789" should give:
+#   CRC16:     0xBB3D
+#   CRC-CCITT: 0x29B1
+#   XMODEM:    0x31C3
+#   CRC-32:    0xCBF43926
+#
+# eg: crc::crc16 "123456789"
+#     crc::crc-ccitt "123456789"
+# or  crc::crc16 -file tclsh.exe
+#
+# Note:
+#  The CCITT CRC can very easily be checked for the accuracy of transmission
+#  as the CRC of the message plus the CRC values will be 0. That is:
+#   % set msg {123456789]
+#   % set crc [crc::crc-ccitt $msg]
+#   % crc::crc-ccitt $msg[binary format S $crc]
+#   0
+#
+#  The same is true of other CRCs but some operate in reverse bit order:
+#   % crc::crc16 $msg[binary format s [crc::crc16 $msg]]
+#   0
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+# @mdgen EXCLUDE: crcc.tcl
+
+package require Tcl 8.2;                # tcl minimum version
+
+namespace eval ::crc {
+    namespace export crc16 crc-ccitt crc-32
+
+    # Standard CRC generator polynomials.
+    variable polynomial
+    set polynomial(crc16) [expr {(1<<16) | (1<<15) | (1<<2) | 1}]
+    set polynomial(ccitt) [expr {(1<<16) | (1<<12) | (1<<5) | 1}]
+    set polynomial(crc32) [expr {(1<<32) | (1<<26) | (1<<23) | (1<<22)
+                                 | (1<<16) | (1<<12) | (1<<11) | (1<<10)
+                                 | (1<<8) | (1<<7) | (1<<5) | (1<<4)
+                                 | (1<<2) | (1<<1) | 1}]
+
+    # Array to hold the generated tables
+    variable table
+    if {![info exists table]} { array set table {}}
+
+    # calculate the sign bit for the current platform.
+    variable signbit
+    if {![info exists signbit]} {
+        if {[info exists tcl_platform(wordSize)]} {
+            set signbit [expr {1 << (8*$tcl_platform(wordSize)-1)}]
+        } else {
+            # Old Tcl. Find bit by shifting until wrap around to 0.
+            # With int() result limited to system word size the loop will end.
+            variable v
+            for {set v 1} {int($v) != 0} {set signbit $v; set v [expr {$v<<1}]} {}
+            unset v
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+# Generate a CRC lookup table.
+# This creates a CRC algorithm lookup table for a 'width' bits checksum
+# using the 'poly' polynomial for all values of an input byte.
+# Setting 'reflected' changes the bit order for input bytes.
+# Returns a list or 255 elements.
+#
+# CRC-32:      Crc_table 32 $crc::polynomial(crc32) 1
+# CRC-16:      Crc_table 16 $crc::polynomial(crc16) 1
+# CRC16/CCITT: Crc_table 16 $crc::polynomial(ccitt) 0
+#
+proc ::crc::Crc_table {width poly reflected} {
+    set tbl {}
+    if {$width < 32} {
+        set mask   [expr {(1 << $width) - 1}]
+        set topbit [expr {1 << ($width - 1)}]
+    } else {
+        set mask   0xffffffff
+        set topbit 0x80000000
+    }
+
+    for {set i 0} {$i < 256} {incr i} {
+        if {$reflected} {
+            set r [reflect $i 8]
+        } else {
+            set r $i
+        }
+        set r [expr {$r << ($width - 8)}]
+        for {set k 0} {$k < 8} {incr k} {
+            if {[expr {$r & $topbit}] != 0} {
+                set r [expr {($r << 1) ^ $poly}]
+            } else {
+                set r [expr {$r << 1}]
+            }
+        }
+        if {$reflected} {
+            set r [reflect $r $width]
+        }
+        lappend tbl [expr {$r & $mask}]
+    }
+    return $tbl
+}
+
+# -------------------------------------------------------------------------
+# Calculate the CRC checksum for the data in 's' using a precalculated
+# table.
+#  s the input data
+#  width - the width in bits of the CRC algorithm
+#  table - the name of the variable holding the calculated table
+#  init  - the start value (or the last CRC for sequential blocks)
+#  xorout - the final value may be XORd with this value
+#  reflected - a boolean indicating that the bit order is reversed.
+#              For hardware optimised CRC checks, the bits are handled
+#              in transmission order (ie: bit0, bit1, ..., bit7)
+proc ::crc::Crc {s width table {init 0} {xorout 0} {reflected 0}} {
+    upvar $table tbl
+    variable signbit
+    set signmask [expr {~$signbit>>7}]
+
+    if {$width < 32} {
+        set mask   [expr {(1 << $width) - 1}]
+        set rot    [expr {$width - 8}]
+    } else {
+        set mask   0xffffffff
+        set rot    24
+    }
+
+    set crc $init
+    binary scan $s c* data
+    foreach {datum} $data {
+        if {$reflected} {
+            set ndx [expr {($crc ^ $datum) & 0xFF}]
+            set lkp [lindex $tbl $ndx]
+            set crc [expr {($lkp ^ ($crc >> 8 & $signmask)) & $mask}]
+        } else {
+            set ndx [expr {(($crc >> $rot) ^ $datum) & 0xFF}]
+            set lkp [lindex $tbl $ndx]
+            set crc [expr {($lkp ^ ($crc << 8 & $signmask)) & $mask}]
+        }
+    }
+
+    return [expr {$crc ^ $xorout}]
+}
+
+# -------------------------------------------------------------------------
+# Reverse the bit ordering for 'b' bits of the input value 'v'
+proc ::crc::reflect {v b} {
+    set t $v
+    for {set i 0} {$i < $b} {incr i} {
+        set v [expr {($t & 1) ? ($v | (1<<(($b-1)-$i))) : ($v & ~(1<<(($b-1)-$i))) }]
+        set t [expr {$t >> 1}]
+    }
+    return $v
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::crc::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# Specialisation of the general crc procedure to perform the standard CRC16
+# checksum
+proc ::crc::CRC16 {s {seed 0}} {
+    variable table
+    if {![info exists table(crc16)]} {
+        variable polynomial
+        set table(crc16) [Crc_table 16 $polynomial(crc16) 1]
+    }
+
+    return [Crc $s 16 [namespace current]::table(crc16) $seed 0 1]
+}
+
+# -------------------------------------------------------------------------
+# Specialisation of the general crc procedure to perform the CCITT telecoms
+# flavour of the CRC16 checksum
+proc ::crc::CRC-CCITT {s {seed 0} {xor 0}} {
+    variable table
+    if {![info exists table(ccitt)]} {
+        variable polynomial
+        set table(ccitt) [Crc_table 16 $polynomial(ccitt) 0]
+    }
+
+    return [Crc $s 16 [namespace current]::table(ccitt) $seed $xor 0]
+}
+
+# -------------------------------------------------------------------------
+# Demostrates the parameters used for the 32 bit checksum CRC-32.
+# This can be used to show the algorithm is working right by comparison with
+# other crc32 implementations
+proc ::crc::CRC-32 {s {seed 0xFFFFFFFF}} {
+    variable table
+    if {![info exists table(crc32)]} {
+        variable polynomial
+        set table(crc32) [Crc_table 32 $polynomial(crc32) 1]
+    }
+
+    return [Crc $s 32 [namespace current]::table(crc32) $seed 0xFFFFFFFF 1]
+}
+
+# -------------------------------------------------------------------------
+# User level CRC command.
+proc ::crc::crc {args} {
+    array set opts [list filename {} channel {} chunksize 4096 \
+                        format %u  seed 0 \
+                        impl [namespace origin CRC16]]
+
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -fi*  { set opts(filename) [Pop args 1] }
+            -cha* { set opts(channel) [Pop args 1] }
+            -chu* { set opts(chunksize) [Pop args 1] }
+            -fo*  { set opts(format) [Pop args 1] }
+            -i*   { set opts(impl) [uplevel 1 namespace origin [Pop args 1]] }
+            -s*   { set opts(seed) [Pop args 1] }
+            default {
+                if {[llength $args] == 1} { break }
+                if {[string compare $option "--"] == 0} { Pop args; break }
+                set options [join [lsort [array names opts]] ", -"]
+                return -code error "bad option $option:\
+                       must be one of -$options or -- to indicate end of options"
+            }
+        }
+        Pop args
+    }
+
+    if {$opts(filename) != {}} {
+        set opts(channel) [open $opts(filename) r]
+        fconfigure $opts(channel) -translation binary
+    }
+
+    if {$opts(channel) != {}} {
+        set r $opts(seed)
+        set trans [fconfigure $opts(channel) -translation]
+        fconfigure $opts(channel) -translation binary
+        while {![eof $opts(channel)]} {
+            set chunk [read $opts(channel) $opts(chunksize)]
+            set r [$opts(impl) $chunk $r]
+        }
+        fconfigure $opts(channel) -translation $trans
+        if {$opts(filename) != {}} {
+            close $opts(channel)
+        }
+    } else {
+        if {[llength $args] != 1} {
+            return -code error "wrong \# args: should be\
+                   \"crc16 ?-format string? ?-seed value? ?-impl procname?\
+                   -file name | -- data\""
+        }
+        set r [$opts(impl) [lindex $args 0] $opts(seed)]
+    }
+    return [format $opts(format) $r]
+}
+
+# -------------------------------------------------------------------------
+# The user commands. See 'crc'
+#
+proc ::crc::crc16 {args} {
+    return [eval [list crc -impl [namespace origin CRC16]] $args]
+}
+
+proc ::crc::crc-ccitt {args} {
+    return [eval [list crc -impl [namespace origin CRC-CCITT] -seed 0xFFFF]\
+                $args]
+}
+
+proc ::crc::xmodem {args} {
+    return [eval [list crc -impl [namespace origin CRC-CCITT] -seed 0] $args]
+}
+
+proc ::crc::crc-32 {args} {
+    return [eval [list crc -impl [namespace origin CRC-32] -seed 0xFFFFFFFF]\
+                $args]
+}
+
+# -------------------------------------------------------------------------
+
+package provide crc16 1.1.4
+
+# -------------------------------------------------------------------------
+#
+# Local variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/crc32.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/crc32.tcl
new file mode 100644
index 00000000..eeef1f55
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/crc32.tcl
@@ -0,0 +1,383 @@
+# crc32.tcl -- Copyright (C) 2002 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# CRC32 Cyclic Redundancy Check. 
+# (for algorithm see http://www.rad.com/networks/1994/err_con/crc.htm)
+#
+# From http://mini.net/tcl/2259.tcl
+# Written by Wayland Augur and Pat Thoyts.
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2
+
+namespace eval ::crc {
+    variable  accel
+    array set accel {critcl 0 trf 0}
+
+    namespace export crc32
+
+    variable crc32_tbl [list 0x00000000 0x77073096 0xEE0E612C 0x990951BA \
+                           0x076DC419 0x706AF48F 0xE963A535 0x9E6495A3 \
+                           0x0EDB8832 0x79DCB8A4 0xE0D5E91E 0x97D2D988 \
+                           0x09B64C2B 0x7EB17CBD 0xE7B82D07 0x90BF1D91 \
+                           0x1DB71064 0x6AB020F2 0xF3B97148 0x84BE41DE \
+                           0x1ADAD47D 0x6DDDE4EB 0xF4D4B551 0x83D385C7 \
+                           0x136C9856 0x646BA8C0 0xFD62F97A 0x8A65C9EC \
+                           0x14015C4F 0x63066CD9 0xFA0F3D63 0x8D080DF5 \
+                           0x3B6E20C8 0x4C69105E 0xD56041E4 0xA2677172 \
+                           0x3C03E4D1 0x4B04D447 0xD20D85FD 0xA50AB56B \
+                           0x35B5A8FA 0x42B2986C 0xDBBBC9D6 0xACBCF940 \
+                           0x32D86CE3 0x45DF5C75 0xDCD60DCF 0xABD13D59 \
+                           0x26D930AC 0x51DE003A 0xC8D75180 0xBFD06116 \
+                           0x21B4F4B5 0x56B3C423 0xCFBA9599 0xB8BDA50F \
+                           0x2802B89E 0x5F058808 0xC60CD9B2 0xB10BE924 \
+                           0x2F6F7C87 0x58684C11 0xC1611DAB 0xB6662D3D \
+                           0x76DC4190 0x01DB7106 0x98D220BC 0xEFD5102A \
+                           0x71B18589 0x06B6B51F 0x9FBFE4A5 0xE8B8D433 \
+                           0x7807C9A2 0x0F00F934 0x9609A88E 0xE10E9818 \
+                           0x7F6A0DBB 0x086D3D2D 0x91646C97 0xE6635C01 \
+                           0x6B6B51F4 0x1C6C6162 0x856530D8 0xF262004E \
+                           0x6C0695ED 0x1B01A57B 0x8208F4C1 0xF50FC457 \
+                           0x65B0D9C6 0x12B7E950 0x8BBEB8EA 0xFCB9887C \
+                           0x62DD1DDF 0x15DA2D49 0x8CD37CF3 0xFBD44C65 \
+                           0x4DB26158 0x3AB551CE 0xA3BC0074 0xD4BB30E2 \
+                           0x4ADFA541 0x3DD895D7 0xA4D1C46D 0xD3D6F4FB \
+                           0x4369E96A 0x346ED9FC 0xAD678846 0xDA60B8D0 \
+                           0x44042D73 0x33031DE5 0xAA0A4C5F 0xDD0D7CC9 \
+                           0x5005713C 0x270241AA 0xBE0B1010 0xC90C2086 \
+                           0x5768B525 0x206F85B3 0xB966D409 0xCE61E49F \
+                           0x5EDEF90E 0x29D9C998 0xB0D09822 0xC7D7A8B4 \
+                           0x59B33D17 0x2EB40D81 0xB7BD5C3B 0xC0BA6CAD \
+                           0xEDB88320 0x9ABFB3B6 0x03B6E20C 0x74B1D29A \
+                           0xEAD54739 0x9DD277AF 0x04DB2615 0x73DC1683 \
+                           0xE3630B12 0x94643B84 0x0D6D6A3E 0x7A6A5AA8 \
+                           0xE40ECF0B 0x9309FF9D 0x0A00AE27 0x7D079EB1 \
+                           0xF00F9344 0x8708A3D2 0x1E01F268 0x6906C2FE \
+                           0xF762575D 0x806567CB 0x196C3671 0x6E6B06E7 \
+                           0xFED41B76 0x89D32BE0 0x10DA7A5A 0x67DD4ACC \
+                           0xF9B9DF6F 0x8EBEEFF9 0x17B7BE43 0x60B08ED5 \
+                           0xD6D6A3E8 0xA1D1937E 0x38D8C2C4 0x4FDFF252 \
+                           0xD1BB67F1 0xA6BC5767 0x3FB506DD 0x48B2364B \
+                           0xD80D2BDA 0xAF0A1B4C 0x36034AF6 0x41047A60 \
+                           0xDF60EFC3 0xA867DF55 0x316E8EEF 0x4669BE79 \
+                           0xCB61B38C 0xBC66831A 0x256FD2A0 0x5268E236 \
+                           0xCC0C7795 0xBB0B4703 0x220216B9 0x5505262F \
+                           0xC5BA3BBE 0xB2BD0B28 0x2BB45A92 0x5CB36A04 \
+                           0xC2D7FFA7 0xB5D0CF31 0x2CD99E8B 0x5BDEAE1D \
+                           0x9B64C2B0 0xEC63F226 0x756AA39C 0x026D930A \
+                           0x9C0906A9 0xEB0E363F 0x72076785 0x05005713 \
+                           0x95BF4A82 0xE2B87A14 0x7BB12BAE 0x0CB61B38 \
+                           0x92D28E9B 0xE5D5BE0D 0x7CDCEFB7 0x0BDBDF21 \
+                           0x86D3D2D4 0xF1D4E242 0x68DDB3F8 0x1FDA836E \
+                           0x81BE16CD 0xF6B9265B 0x6FB077E1 0x18B74777 \
+                           0x88085AE6 0xFF0F6A70 0x66063BCA 0x11010B5C \
+                           0x8F659EFF 0xF862AE69 0x616BFFD3 0x166CCF45 \
+                           0xA00AE278 0xD70DD2EE 0x4E048354 0x3903B3C2 \
+                           0xA7672661 0xD06016F7 0x4969474D 0x3E6E77DB \
+                           0xAED16A4A 0xD9D65ADC 0x40DF0B66 0x37D83BF0 \
+                           0xA9BCAE53 0xDEBB9EC5 0x47B2CF7F 0x30B5FFE9 \
+                           0xBDBDF21C 0xCABAC28A 0x53B39330 0x24B4A3A6 \
+                           0xBAD03605 0xCDD70693 0x54DE5729 0x23D967BF \
+                           0xB3667A2E 0xC4614AB8 0x5D681B02 0x2A6F2B94 \
+                           0xB40BBE37 0xC30C8EA1 0x5A05DF1B 0x2D02EF8D]
+
+    # calculate the sign bit for the current platform.
+    variable signbit
+    if {![info exists signbit]} {
+        if {[info exists tcl_platform(wordSize)]} {
+            set signbit [expr {1 << (8*$tcl_platform(wordSize)-1)}]
+        } else {
+            # Old Tcl. Find bit by shifting until wrap around to 0.
+            # With int() result limited to system word size the loop will end.
+            variable v
+            for {set v 1} {int($v) != 0} {set signbit $v; set v [expr {$v<<1}]} {}
+            unset v
+        }
+    }
+    
+    variable uid ; if {![info exists uid]} {set uid 0}
+}
+
+# -------------------------------------------------------------------------
+
+# crc::Crc32Init --
+#
+#	Create and initialize a crc32 context. This is cleaned up
+#	when we we call Crc32Final to obtain the result.
+#
+proc ::crc::Crc32Init {{seed 0xFFFFFFFF}} {
+    variable uid
+    variable accel
+    set token [namespace current]::[incr uid]
+    upvar #0 $token state
+    array set state [list sum $seed]
+    # If the initial seed is set to some other value we cannot use Trf.
+    if {$accel(trf) && $seed == 0xFFFFFFFF} {
+        set s {}
+        switch -exact -- $::tcl_platform(platform) {
+            windows { set s [open NUL w] }
+            unix    { set s [open /dev/null w] }
+        }
+        if {$s != {}} {
+            fconfigure $s -translation binary -buffering none
+            ::crc-zlib -attach $s -mode write \
+                -write-type variable \
+                -write-destination ${token}(trfwrite)
+            array set state [list trfread 0 trfwrite 0 trf $s]
+        }
+    }
+    return $token
+}
+
+# crc::Crc32Update --
+#
+#	This is called to add more data into the checksum. You may
+#	call this as many times as you require. Note that passing in
+#	"ABC" is equivalent to passing these letters in as separate
+#	calls -- hence this proc permits summing of chunked data.
+#
+#	If we have a C-based implementation available, then we will
+#	use it here in preference to the pure-Tcl implementation.
+#
+proc ::crc::Crc32Update {token data} {
+    variable accel
+    upvar #0 $token state
+    set sum $state(sum)
+    if {$accel(critcl)} {
+        set sum [Crc32_c $data $sum]
+    } elseif {[info exists state(trf)]} {
+        puts -nonewline $state(trf) $data
+        return
+    } else {
+        set sum [Crc32_tcl $data $sum]
+    }
+    set state(sum) [expr {$sum ^ 0xFFFFFFFF}]
+    return
+}
+
+# crc::Crc32Final -- 
+#
+#	This procedure is used to close the context and returns the
+#	checksum value. Once this procedure has been called the checksum
+#	context is freed and cannot be used again.  
+#
+proc ::crc::Crc32Final {token} {
+    upvar #0 $token state
+    if {[info exists state(trf)]} {
+        close $state(trf)
+        binary scan $state(trfwrite) i sum
+        set sum [expr {$sum & 0xFFFFFFFF}]
+    } else {
+        set sum [expr {($state(sum) ^ 0xFFFFFFFF) & 0xFFFFFFFF}]
+    }
+    unset state
+    return $sum
+}
+
+# crc::Crc32_tcl --
+#
+#	The pure-Tcl implementation of a table based CRC-32 checksum.
+#	The seed should always be 0xFFFFFFFF to begin with, but for
+#	successive chunks of data the seed should be set to the result
+#	of the last chunk.
+#
+proc ::crc::Crc32_tcl {data {seed 0xFFFFFFFF}} {
+    variable crc32_tbl
+    variable signbit
+    set signmask [expr {~$signbit>>7}]
+    set crcval $seed
+
+    binary scan $data c* nums
+    foreach {n} $nums {
+        set ndx [expr {($crcval ^ $n) & 0xFF}]
+        set lkp [lindex $crc32_tbl $ndx]
+        set crcval [expr {($lkp ^ ($crcval >> 8 & $signmask)) & 0xFFFFFFFF}]
+    }
+    
+    return [expr {$crcval ^ 0xFFFFFFFF}]
+}
+
+# crc::Crc32_c --
+#
+#	A C version of the CRC-32 code using the same table. This is
+#	designed to be compiled using critcl.
+#
+if {[package provide critcl] != {}} {
+    namespace eval ::crc {
+        critcl::ccommand Crc32_c {dummy interp objc objv} {
+            int r = TCL_OK;
+            unsigned long t = 0xFFFFFFFFL;
+
+            if (objc < 2 || objc > 3) {
+                Tcl_WrongNumArgs(interp, 1, objv, "data ?seed?");
+                return TCL_ERROR;
+            }
+            
+            if (objc == 3) {
+                r = Tcl_GetLongFromObj(interp, objv[2], (long *)&t);
+            }
+
+            if (r == TCL_OK) {
+                int cn, size, ndx;
+                unsigned char *data;
+                unsigned long lkp;
+                Tcl_Obj *tblPtr, *lkpPtr;
+
+                tblPtr = Tcl_GetVar2Ex(interp, "::crc::crc32_tbl", NULL,
+                                       TCL_LEAVE_ERR_MSG );
+                if (tblPtr == NULL) {
+                    r = TCL_ERROR;
+                }
+                if (r == TCL_OK) {
+                    data = Tcl_GetByteArrayFromObj(objv[1], &size);
+                }
+                for (cn = 0; r == TCL_OK && cn < size; cn++) {
+                    ndx = (t ^ data[cn]) & 0xFF;
+                    r = Tcl_ListObjIndex(interp, tblPtr, ndx, &lkpPtr);
+                    if (r == TCL_OK) {
+                        r = Tcl_GetLongFromObj(interp, lkpPtr, (long*) &lkp);
+                    }
+                    if (r == TCL_OK) {
+                        t = lkp ^ (t >> 8);
+                    }
+                }
+            }
+
+            if (r == TCL_OK) {
+                Tcl_SetObjResult(interp, Tcl_NewLongObj(t ^ 0xFFFFFFFF));
+            }
+            return r;
+        }
+    }
+}
+
+# LoadAccelerator --
+#
+#	This package can make use of a number of compiled extensions to
+#	accelerate the digest computation. This procedure manages the
+#	use of these extensions within the package. During normal usage
+#	this should not be called, but the test package manipulates the
+#	list of enabled accelerators.
+#
+proc ::crc::LoadAccelerator {name} {
+    variable accel
+    set r 0
+    switch -exact -- $name {
+        critcl {
+            if {![catch {package require tcllibc}]
+                || ![catch {package require crcc}]} {
+                set r [expr {[info commands ::crc::Crc32_c] != {}}]
+            }
+        }
+        trf {
+            if {![catch {package require Trf}]} {
+                set r [expr {![catch {::crc-zlib aa} msg]}]
+            }
+        }
+        default {
+            return -code error "invalid accelerator package:\
+                must be one of [join [array names accel] {, }]"
+        }
+    }
+    set accel($name) $r
+}
+
+# crc::Pop --
+#
+#	Pop the nth element off a list. Used in options processing.
+#
+proc ::crc::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# crc::crc32 --
+#
+#	Provide a Tcl implementation of a crc32 checksum similar to the
+#	cksum and sum unix commands.
+#
+# Options:
+#  -filename name - return a checksum for the specified file.
+#  -format string - return the checksum using this format string.
+#  -seed value    - seed the algorithm using value (default is 0xffffffff)
+#
+proc ::crc::crc32 {args} {
+    array set opts [list -filename {} -format %u -seed 0xffffffff \
+                        -channel {} -chunksize 4096 -timeout 30000]
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -file*  { set opts(-filename) [Pop args 1] }
+            -for*   { set opts(-format) [Pop args 1] }
+            -chan*  { set opts(-channel) [Pop args 1] }
+            -chunk* { set opts(-chunksize) [Pop args 1] }
+            -time*  { set opts(-timeout) [Pop args 1] }
+            -seed   { set opts(-seed) [Pop args 1] }
+            -impl*  { set junk [Pop args 1] }
+            default {
+                if {[llength $args] == 1} { break }
+                if {[string compare $option "--"] == 0} { Pop args; break }
+                set err [join [lsort [array names opts -*]] ", "]
+                return -code error "bad option \"$option\": must be $err"
+            }
+        }
+        Pop args
+    }
+
+    # If a file was given - open it
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+        
+        if {[llength $args] != 1} {
+            return -code error "wrong # args: should be \
+                 \"crc32 ?-format string? ?-seed value? \
+                 -channel chan | -file name | data\""
+        }
+        set tok [Crc32Init $opts(-seed)]
+        Crc32Update $tok [lindex $args 0]
+        set r [Crc32Final $tok]
+
+    } else {
+
+        set r $opts(-seed)
+        set tok [Crc32Init $opts(-seed)]
+        while {![eof $opts(-channel)]} {
+            Crc32Update $tok [read $opts(-channel) $opts(-chunksize)]
+        }
+        set r [Crc32Final $tok]
+
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+
+    return [format $opts(-format) $r]
+}
+
+# -------------------------------------------------------------------------
+
+# Try and load a compiled extension to help (note - trf is fastest)
+namespace eval ::crc {
+    variable e {}
+    foreach e {trf critcl} {
+        if {[LoadAccelerator $e]} break
+    }
+    unset e
+}
+
+package provide crc32 1.3.3
+
+# -------------------------------------------------------------------------
+#
+# Local variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/crcc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/crcc.tcl
new file mode 100644
index 00000000..a1b34a0d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/crcc.tcl
@@ -0,0 +1,22 @@
+# crcc.tcl - Copyright (C) 2002 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# Place holder for building a critcl C module for this tcllib module.
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+# $Id: crcc.tcl,v 1.4 2008/03/25 07:15:35 andreas_kupries Exp $
+
+package require critcl 
+
+namespace eval ::crc {
+    variable rcsid {$Id: crcc.tcl,v 1.4 2008/03/25 07:15:35 andreas_kupries Exp $}
+
+    critcl::ccode {
+        /* no code required in this file */
+    }
+}
+
+# @sak notprovided crcc
+package provide crcc 1.0.0
\ No newline at end of file
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/pkgIndex.tcl
new file mode 100644
index 00000000..2c0f1cd0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded cksum 1.1.4 [list source [file join $dir cksum.tcl]]
+package ifneeded crc16 1.1.4 [list source [file join $dir crc16.tcl]]
+package ifneeded crc32 1.3.3 [list source [file join $dir crc32.tcl]]
+package ifneeded sum   1.1.2 [list source [file join $dir sum.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/sum.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/sum.tcl
new file mode 100644
index 00000000..a35aa8f6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/crc/sum.tcl
@@ -0,0 +1,285 @@
+# sum.tcl - Copyright (C) 2002 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# Provides a Tcl only implementation of the unix sum(1) command. There are
+# a number of these and they use differing algorithms to get a checksum of
+# the input data. We provide two: one using the BSD algorithm and the other
+# using the SysV algorithm. More consistent results across multiple
+# implementations can be obtained by using cksum(1).
+#
+# These commands have been checked against the GNU sum program from the GNU
+# textutils package version 2.0 to ensure the same results.
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2;                # tcl minimum version
+
+catch {package require tcllibc};        # critcl enhancements to tcllib
+#catch {package require crcc};           # critcl enhanced crc module
+
+namespace eval ::crc {
+    namespace export sum
+
+    variable uid
+    if {![info exists uid]} {
+        set uid 0
+    }
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  The SysV algorithm is fairly naive. The byte values are summed and any
+#  overflow is discarded. The lowest 16 bits are returned as the checksum.
+# Notes:
+#  Input with the same content but different ordering will give the same 
+#  result.
+#
+proc ::crc::SumSysV {s {seed 0}} {
+    set t $seed
+    binary scan $s c* r
+    foreach n $r {
+        incr t [expr {$n & 0xFF}]
+    }
+
+    set t [expr {$t & 0xffffffff}]
+    set t [expr {($t & 0xffff) + ($t >> 16)}]
+    set t [expr {($t & 0xffff) + ($t >> 16)}]
+
+    return $t
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  This algorithm is similar to the SysV version but includes a bit rotation
+#  step which provides a dependency on the order of the data values.
+#
+proc ::crc::SumBsd {s {seed 0}} {
+    set t $seed
+    binary scan $s c* r
+    foreach n $r {
+        set t [expr {($t & 1) ? (($t >> 1) + 0x8000) : ($t >> 1)}]
+        set t [expr {($t + ($n & 0xFF)) & 0xFFFF}]
+    }
+    return $t
+}
+
+# -------------------------------------------------------------------------
+
+if {[package provide critcl] != {}} {
+    namespace eval ::crc {
+        critcl::ccommand SumSysV_c {dummy interp objc objv} {
+            int r = TCL_OK;
+            unsigned int t = 0;
+
+            if (objc < 2 || objc > 3) {
+                Tcl_WrongNumArgs(interp, 1, objv, "data ?seed?");
+                return TCL_ERROR;
+            }
+            
+            if (objc == 3)
+                r = Tcl_GetIntFromObj(interp, objv[2], (int *)&t);
+
+            if (r == TCL_OK) {
+                int cn, size;
+                unsigned char *data;
+
+                data = Tcl_GetByteArrayFromObj(objv[1], &size);
+                for (cn = 0; cn < size; cn++)
+                    t += data[cn];
+            }
+
+            t = t & 0xffffffffLU;
+            t = (t & 0xffff) + (t >> 16);
+            t = (t & 0xffff) + (t >> 16);
+
+            Tcl_SetObjResult(interp, Tcl_NewIntObj(t));
+            return r;
+        }
+
+        critcl::ccommand SumBsd_c {dummy interp objc objv} {
+            int r = TCL_OK;
+            unsigned int t = 0;
+
+            if (objc < 2 || objc > 3) {
+                Tcl_WrongNumArgs(interp, 1, objv, "data ?seed?");
+                return TCL_ERROR;
+            }
+            
+            if (objc == 3)
+                r = Tcl_GetIntFromObj(interp, objv[2], (int *)&t);
+
+            if (r == TCL_OK) {
+                int cn, size;
+                unsigned char *data;
+
+                data = Tcl_GetByteArrayFromObj(objv[1], &size);
+                for (cn = 0; cn < size; cn++) {
+                    t = (t & 1) ? ((t >> 1) + 0x8000) : (t >> 1);
+                    t = (t + data[cn]) & 0xFFFF;
+                }
+            }
+
+            Tcl_SetObjResult(interp, Tcl_NewIntObj(t & 0xFFFF));
+            return r;
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+# Switch from pure tcl to compiled if available.
+#
+if {[info commands ::crc::SumBsd_c] == {}} {
+    interp alias {} ::crc::sum-bsd  {} ::crc::SumBsd
+} else {
+    interp alias {} ::crc::sum-bsd  {} ::crc::SumBsd_c
+}
+
+if {[info commands ::crc::SumSysV_c] == {}} {
+    interp alias {} ::crc::sum-sysv {} ::crc::SumSysV
+} else {
+    interp alias {} ::crc::sum-sysv {} ::crc::SumSysV_c
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::crc::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# timeout handler for the chunked file handling
+# This avoids us waiting for ever
+#
+proc ::crc::SumTimeout {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+    set state(error) "operation timed out"
+    set state(reading) 0
+}
+
+# -------------------------------------------------------------------------
+# fileevent handler for chunked file handling.
+#
+proc ::crc::SumChunk {token channel} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+    
+    if {[eof $channel]} {
+        fileevent $channel readable {}
+        set state(reading) 0
+    }
+    
+    after cancel $state(after)
+    set state(after) [after $state(timeout) \
+                          [list [namespace origin SumTimeout] $token]]
+    set state(result) [$state(algorithm) \
+                           [read $channel $state(chunksize)] \
+                           $state(result)]
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Provide a Tcl equivalent of the unix sum(1) command. We default to the
+#  BSD algorithm and return a checkum for the input string unless a filename
+#  has been provided. Using sum on a file should give the same results as
+#  the unix sum command with equivalent algorithm.
+# Options:
+#  -bsd           - use the BSD algorithm to calculate the checksum (default)
+#  -sysv          - use the SysV algorithm to calculate the checksum
+#  -filename name - return a checksum for the specified file
+#  -format string - return the checksum using this format string
+#
+proc ::crc::sum {args} {
+    array set opts [list -filename {} -channel {} -chunksize 4096 \
+                        -timeout 30000 -bsd 1 -sysv 0 -format %u \
+                        algorithm [namespace origin sum-bsd]]
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -bsd    { set opts(-bsd) 1 ; set opts(-sysv) 0 }
+            -sysv   { set opts(-bsd) 0 ; set opts(-sysv) 1 }
+            -file*  { set opts(-filename) [Pop args 1] }
+            -for*   { set opts(-format) [Pop args 1] }
+            -chan*  { set opts(-channel) [Pop args 1] }
+            -chunk* { set opts(-chunksize) [Pop args 1] }
+            -time*  { set opts(-timeout) [Pop args 1] }
+            --      { Pop args ; break }
+            default {
+                set err [join [lsort [array names opts -*]] ", "]
+                return -code error "bad option $option:\
+                    must be one of $err"
+            }
+        }
+        Pop args
+    }
+
+    # Set the correct sum algorithm
+    if {$opts(-sysv)} {
+        set opts(algorithm) [namespace origin sum-sysv]
+    }
+
+    # If a file was given - open it for binary reading.
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args: should be \
+                 \"sum ?-bsd|-sysv? ?-format string? ?-chunksize size? \
+                 ?-timeout ms? -file name | -channel chan | data\""
+        }
+        set r [$opts(algorithm) [lindex $args 0]]
+
+    } else {
+
+        # Create a unique token for the event handling
+        variable uid
+        set token [namespace current]::[incr uid]
+        upvar #0 $token tok
+        array set tok [list reading 1 result 0 timeout $opts(-timeout) \
+                           chunksize $opts(-chunksize) \
+                           algorithm $opts(algorithm)]
+        set tok(after) [after $tok(timeout) \
+                            [list [namespace origin SumTimeout] $token]]
+
+        fileevent $opts(-channel) readable \
+            [list [namespace origin SumChunk] $token $opts(-channel)]
+        vwait [subst $token](reading)
+
+        # If we opened the channel we must close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+
+        # Extract the result or error message if there was a problem.
+        set r $tok(result)
+        if {[info exists tok(error)]} {
+            return -code error $tok(error)
+        }
+
+        unset tok
+    }
+
+    return [format $opts(-format) $r]
+}
+
+# -------------------------------------------------------------------------
+
+package provide sum 1.1.2
+
+# -------------------------------------------------------------------------    
+# Local Variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cron/cron.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cron/cron.tcl
new file mode 100644
index 00000000..030faf30
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cron/cron.tcl
@@ -0,0 +1,619 @@
+###
+# This file implements a process table
+# Instead of having individual components try to maintain their own timers
+# we centrally manage how often tasks should be kicked off here.
+###
+#
+# Author: Sean Woods (for T&E Solutions)
+package require Tcl 8.6 ;# See coroutine
+package require coroutine
+package require dicttool
+::namespace eval ::cron {}
+
+proc ::cron::task {command args} {
+  if {$::cron::trace > 1} {
+    puts [list ::cron::task $command $args]
+  }
+  variable processTable
+  switch $command {
+    TEMPLATE {
+      return [list object {} lastevent 0 lastrun 0 err 0 result {} \
+        running 0 coroutine {} scheduled 0 frequency 0 command {}]
+    }
+    delete {
+      unset -nocomplain ::cron::processTable([lindex $args 0])
+    }
+    exists {
+      return [::info exists ::cron::processTable([lindex $args 0])]
+    }
+    info {
+      set process [lindex $args 0]
+      if {![::info exists ::cron::processTable($process)]} {
+        error "Process $process does not exist"
+      }
+      return $::cron::processTable($process)
+    }
+    frequency {
+      set process [lindex $args 0]
+      set time [lindex $args 1]
+      if {![info exists ::cron::processTable($process)]} return
+      dict with ::cron::processTable($process) {
+        set now [clock_step [current_time]]
+        set frequency [expr {0+$time}]
+        if {$scheduled>($now+$time)} {
+          dict set ::cron::processTable($process) scheduled [expr {$now+$time}]
+        }
+      }
+    }
+    sleep {
+      set process [lindex $args 0]
+      set time [lindex $args 1]
+      if {![info exists ::cron::processTable($process)]} return
+      dict with ::cron::processTable($process) {
+        set now [clock_step [current_time]]
+        set frequency 0
+        set scheduled [expr {$now+$time}]
+      }
+    }
+    create -
+    set {
+      set process [lindex $args 0]
+      if {![::info exists ::cron::processTable($process)]} {
+        set ::cron::processTable($process) [task TEMPLATE]
+      }
+      if {[llength $args]==2} {
+        foreach {field value} [lindex $args 1] {
+          dict set ::cron::processTable($process) $field $value
+        }
+      } else {
+        foreach {field value} [lrange $args 1 end] {
+          dict set ::cron::processTable($process) $field $value
+        }
+      }
+    }
+  }
+}
+
+proc ::cron::at args {
+  if {$::cron::trace > 1} {
+    puts [list ::cron::at $args]
+  }
+  switch [llength $args] {
+    2 {
+      variable processuid
+      set process event#[incr processuid]
+      lassign $args timecode command
+    }
+    3 {
+      lassign $args process timecode command
+    }
+    default {
+      error "Usage: ?process? timecode command"
+    }
+  }
+  variable processTable
+  if {[string is integer -strict $timecode]} {
+    set scheduled [expr {$timecode*1000}]
+  } else {
+    set scheduled [expr {[clock scan $timecode]*1000}]
+  }
+  ::cron::task set $process \
+    frequency -1 \
+    command $command \
+    scheduled $scheduled \
+    coroutine {}
+
+  if {$::cron::trace > 1} {
+    puts [list ::cron::task info $process - > [::cron::task info $process]]
+  }
+  ::cron::wake NEW
+  return $process
+}
+
+proc ::cron::idle args {
+  if {$::cron::trace > 1} {
+    puts [list ::cron::idle $args]
+  }
+  switch [llength $args] {
+    2 {
+      variable processuid
+      set process event#[incr processuid]
+      lassign $args command
+    }
+    3 {
+      lassign $args process command
+    }
+    default {
+      error "Usage: ?process? timecode command"
+    }
+  }
+  ::cron::task set $process \
+    scheduled 0 \
+    frequency 0 \
+    command $command
+  ::cron::wake NEW
+  return $process
+}
+
+proc ::cron::in args {
+  if {$::cron::trace > 1} {
+    puts [list ::cron::in $args]
+  }
+  switch [llength $args] {
+    2 {
+      variable processuid
+      set process event#[incr processuid]
+      lassign $args timecode command
+    }
+    3 {
+      lassign $args process timecode command
+    }
+    default {
+      error "Usage: ?process? timecode command"
+    }
+  }
+  set now [clock_step [current_time]]
+  set scheduled [expr {$timecode*1000+$now}]
+  ::cron::task set $process \
+    frequency -1 \
+    command $command \
+    scheduled $scheduled
+  ::cron::wake NEW
+  return $process
+}
+
+proc ::cron::cancel {process} {
+  if {$::cron::trace > 1} {
+    puts [list ::cron::cancel $process]
+  }
+  ::cron::task delete $process
+}
+
+###
+# topic: 0776dccd7e84530fa6412e507c02487c
+###
+proc ::cron::every {process frequency command} {
+  if {$::cron::trace > 1} {
+    puts [list ::cron::every $process $frequency $command]
+  }
+  variable processTable
+  set mnow [clock_step [current_time]]
+  set frequency [expr {$frequency*1000}]
+  ::cron::task set $process \
+    frequency $frequency \
+    command $command \
+    scheduled [expr {$mnow + $frequency}]
+  ::cron::wake NEW
+}
+
+
+proc ::cron::object_coroutine {objname coroutine {info {}}} {
+  if {$::cron::trace > 1} {
+    puts [list ::cron::object_coroutine $objname $coroutine $info]
+  }
+  task set $coroutine \
+    {*}$info \
+    object $objname \
+    coroutine $coroutine
+
+  return $coroutine
+}
+
+# Notification that an object has been destroyed, and that
+# it should give up any toys associated with events
+proc ::cron::object_destroy {objname} {
+  if {$::cron::trace > 1} {
+    puts [list ::cron::object_destroy $objname]
+  }
+  variable processTable
+  set dat [array get processTable]
+  foreach {process info} $dat {
+    if {[dict exists $info object] && [dict get $info object] eq $objname} {
+      unset -nocomplain processTable($process)
+    }
+  }
+}
+
+###
+# topic: 97015814408714af539f35856f85bce6
+###
+proc ::cron::run process {
+  variable processTable
+  set mnow [clock_step [current_time]]
+  if {[dict exists processTable($process) scheduled] && [dict exists processTable($process) scheduled]>0} {
+    dict set processTable($process) scheduled [expr {$mnow-1000}]
+  } else {
+    dict set processTable($process) lastrun 0
+  }
+  ::cron::wake PROCESS
+}
+
+proc ::cron::clock_step timecode {
+  return [expr {$timecode-($timecode%1000)}]
+}
+
+proc ::cron::clock_delay {delay} {
+  set now [current_time]
+  set then [clock_step [expr {$delay+$now}]]
+  return [expr {$then-$now}]
+}
+
+# Sleep for X seconds, wake up at the top
+proc ::cron::clock_sleep {{sec 1} {offset 0}} {
+  set now [current_time]
+  set delay [expr {[clock_delay [expr {$sec*1000}]]+$offset}]
+  sleep $delay
+}
+
+proc ::cron::current_time {} {
+  if {$::cron::time < 0} {
+    return [clock milliseconds]
+  }
+  return $::cron::time
+}
+
+proc ::cron::clock_set newtime {
+  variable time
+  for {} {$time < $newtime} {incr time 100} {
+    uplevel #0 {::cron::do_one_event CLOCK_ADVANCE}
+  }
+  set time $newtime
+  uplevel #0 {::cron::do_one_event CLOCK_ADVANCE}
+}
+
+proc ::cron::once_in_a_while body {
+  set script {set _eventid_ $::cron::current_event}
+  append script $body
+  # Add a safety to allow this while to only execute once per call
+  append script {if {$_eventid_==$::cron::current_event} yield}
+  uplevel 1 [list while 1 $body]
+}
+
+proc ::cron::sleep ms {
+  if {$::cron::trace > 1} {
+    puts [list ::cron::sleep $ms [info coroutine]]
+  }
+
+  set coro [info coroutine]
+  # When the clock is being externally
+  # controlled, advance the clock when
+  # a sleep is called
+  variable time
+  if {$time >= 0 && $coro eq {}} {
+    ::cron::clock_set [expr {$time+$ms}]
+    return
+  }
+  if {$coro ne {}} {
+    set mnow [current_time]
+    set start $mnow
+    set end [expr {$start+$ms}]
+    set eventid $coro
+    if {$::cron::trace} {
+      puts "::cron::sleep $ms $coro"
+    }
+    # Mark as running
+    task set $eventid scheduled $end coroutine $coro running 1
+    ::cron::wake WAKE_IN_CORO
+    yield 2
+    while {$end >= $mnow} {
+      if {$::cron::trace} {
+        puts "::cron::sleep $ms $coro (loop)"
+      }
+      set mnow [current_time]
+      yield 2
+    }
+    # Mark as not running to resume idle computation
+    task set $eventid running 0
+    if {$::cron::trace} {
+      puts "/::cron::sleep $ms $coro"
+    }
+  } else {
+    set eventid [incr ::cron::eventcount]
+    set var ::cron::event_#$eventid
+    set $var 0
+    if {$::cron::trace} {
+      puts "::cron::sleep $ms $eventid waiting for $var"
+      ::after $ms "set $var 1 ; puts \"::cron::sleep - $eventid - FIRED\""
+    } else {
+      ::after $ms "set $var 1"
+    }
+    ::vwait $var
+    if {$::cron::trace} {
+      puts "/::cron::sleep $ms $eventid"
+    }
+    unset $var
+  }
+}
+
+###
+# topic: 21de7bb8db019f3a2fd5a6ae9b38fd55
+# description:
+#    Called once per second, and timed to ensure
+#    we run in roughly realtime
+###
+proc ::cron::runTasksCoro {} {
+  ###
+  # Do this forever
+  ###
+  variable processTable
+  variable processing
+  variable all_coroutines
+  variable coroutine_object
+  variable coroutine_busy
+  variable nextevent
+  variable current_event
+
+  while 1 {
+    incr current_event
+    set lastevent 0
+    set now [current_time]
+    # Wake me up in 5 minute intervals, just out of principle
+    set nextevent [expr {$now-($now % 300000) + 300000}]
+    set next_idle_event [expr {$now+250}]
+    if {$::cron::trace > 1} {
+      puts [list CRON TASK RUNNER nextevent $nextevent]
+    }
+    ###
+    # Determine what tasks to run this timestep
+    ###
+    set tasks {}
+    set cancellist {}
+    set nexttask {}
+
+    foreach {process} [lsort -dictionary [array names processTable]] {
+      dict with processTable($process) {
+        if {$::cron::trace > 1} {
+          puts [list CRON TASK RUNNER process $process frequency: $frequency scheduled: $scheduled]
+        }
+        if {$scheduled==0 && $frequency==0} {
+          set lastrun $now
+          set lastevent $now
+          lappend tasks $process
+        } else {
+          if { $scheduled <= $now } {
+            lappend tasks $process
+            if { $frequency < 0 } {
+              lappend cancellist $process
+            } elseif {$frequency==0} {
+              set scheduled 0
+              if {$::cron::trace > 1} {
+                puts [list CRON TASK RUNNER process $process demoted to idle]
+              }
+            } else {
+              set scheduled [clock_step [expr {$frequency+$lastrun}]]
+              if { $scheduled <= $now } {
+                set scheduled [clock_step [expr {$frequency+$now}]]
+              }
+              if {$::cron::trace > 1} {
+                puts [list CRON TASK RUNNER process $process rescheduled to $scheduled]
+              }
+            }
+            set lastrun $now
+          }
+          set lastevent $now
+        }
+      }
+    }
+    foreach task $tasks {
+      dict set processTable($task) lastrun $now
+      if {[dict exists processTable($task) foreground] && [dict set processTable($task) foreground]} continue
+      if {[dict exists processTable($task) running] && [dict set processTable($task) running]} continue
+      if {$::cron::trace > 2} {
+        puts [list RUNNING $task [task info $task]]
+      }
+      set coro [dict getnull $processTable($task) coroutine]
+      dict set processTable($task) running 1
+      set command [dict getnull $processTable($task) command]
+      if {$command eq {} && $coro eq {}} {
+        # Task has nothing to do. Slot it for destruction
+        lappend cancellist $task
+      } elseif {$coro ne {}} {
+        if {[info command $coro] eq {}} {
+          set object [dict get $processTable($task) object]
+          # Trigger coroutine again if a command was given
+          # If this coroutine is associated with an object, ensure
+          # the object still exists before invoking its method
+          if {$command eq {} || ($object ne {} && [info command $object] eq {})} {
+            lappend cancellist $task
+            dict set processTable($task) running 0
+            continue
+          }
+          if {$::cron::trace} {
+            puts [list RESTARTING $task - coroutine $coro - with $command]
+          }
+          ::coroutine $coro {*}$command
+        }
+        try $coro on return {} {
+          # Terminate the coroutine
+          lappend cancellist $task
+        } on break {} {
+          # Terminate the coroutine
+          lappend cancellist $task
+        } on error {errtxt errdat} {
+          # Coroutine encountered an error
+          lappend cancellist $task
+          puts "ERROR $coro"
+          set errorinfo [dict get $errdat -errorinfo]
+          if {[info exists coroutine_object($coro)] && $coroutine_object($coro) ne {}} {
+            catch {
+            puts "OBJECT: $coroutine_object($coro)"
+            puts "CLASS: [info object class $coroutine_object($coro)]"
+            }
+          }
+          puts "$errtxt"
+          puts ***
+          puts $errorinfo
+        } on continue {result opts} {
+          # Ignore continue
+          if { $result eq "done" } {
+            lappend cancellist $task
+          }
+        } on ok {result opts} {
+          if { $result eq "done" } {
+            lappend cancellist $task
+          }
+        }
+      } else {
+        dict with processTable($task) {
+          set err [catch {uplevel #0 $command} result errdat]
+          if $err {
+            puts "CRON TASK FAILURE:"
+            puts "PROCESS: $task"
+            puts $result
+            puts ***
+            puts [dict get $errdat -errorinfo]
+          }
+        }
+        yield 0
+      }
+      dict set processTable($task) running 0
+    }
+    foreach {task} $cancellist {
+      unset -nocomplain processTable($task)
+    }
+    foreach {process} [lsort -dictionary [array names processTable]] {
+      set scheduled 0
+      set frequency 0
+      dict with processTable($process) {
+        if {$scheduled==0 && $frequency==0} {
+          if {$next_idle_event < $nextevent} {
+            set nexttask $task
+            set nextevent $next_idle_event
+          }
+        } elseif {$scheduled < $nextevent} {
+          set nexttask $process
+          set nextevent $scheduled
+        }
+        set lastevent $now
+      }
+    }
+    foreach {eventid msec} [array get ::cron::coro_sleep] {
+      if {$msec < 0} continue
+      if {$msec<$nextevent} {
+        set nexttask "CORO $eventid"
+        set nextevent $scheduled
+      }
+    }
+    set delay [expr {$nextevent-$now}]
+    if {$delay <= 0} {
+      yield 0
+    } else {
+      if {$::cron::trace > 1} {
+        puts "NEXT EVENT $delay - NEXT TASK $nexttask"
+      }
+      yield $delay
+    }
+  }
+}
+
+proc ::cron::wake {{who ???}} {
+  ##
+  # Only triggered by cron jobs kicking off other cron jobs within
+  # the script body
+  ##
+  if {$::cron::trace} {
+    puts "::cron::wake $who"
+  }
+  if {$::cron::busy} {
+    return
+  }
+  after cancel $::cron::next_event
+  set ::cron::next_event [after idle [list ::cron::do_one_event $who]]
+}
+
+proc ::cron::do_one_event {{who ???}} {
+  if {$::cron::trace} {
+    puts "::cron::do_one_event $who"
+  }
+  after cancel $::cron::next_event
+  set now [current_time]
+  set ::cron::busy 1
+  while {$::cron::busy} {
+    if {[info command ::cron::COROUTINE] eq {}} {
+      ::coroutine ::cron::COROUTINE ::cron::runTasksCoro
+    }
+    set cron_delay [::cron::COROUTINE]
+    if {$cron_delay==0} {
+      if {[incr loops]>10} {
+        if {$::cron::trace} {
+          puts "Breaking out of 10 recursive loops"
+        }
+        set ::cron::wake_time 1000
+        break
+      }
+      set ::cron::wake_time 0
+      incr ::cron::loops(active)
+    } else {
+      set ::cron::busy 0
+      incr ::cron::loops(idle)
+    }
+  }
+  ###
+  # Try to get the event to fire off on the border of the
+  # nearest second
+  ###
+  if {$cron_delay < 10} {
+    set cron_delay 250
+  }
+  set ctime [current_time]
+  set next [expr {$ctime+$cron_delay}]
+  set ::cron::wake_time [expr {$next/1000}]
+  if {$::cron::trace} {
+    puts [list EVENT LOOP WILL WAKE IN $cron_delay ms next: [clock format $::cron::wake_time -format "%H:%M:%S"] active: $::cron::loops(active) idle: $::cron::loops(idle) woken_by: $who]
+  }
+  set ::cron::next_event [after $cron_delay {::cron::do_one_event TIMER}]
+}
+
+
+proc ::cron::main {} {
+  # Never launch from a coroutine
+  if {[info coroutine] ne {}} {
+    return
+  }
+  set ::cron::forever 1
+  while {$::cron::forever} {
+    ::after 120000 {set ::cron::forever 1}
+    # Call an update just to give the rest of the event loop a chance
+    incr ::cron::loops(main)
+    ::after cancel $::cron::next_event
+    set ::cron::next_event [::after idle {::cron::wake MAIN}]
+    set ::cron::forever 1
+    set ::cron::busy 0
+    ::vwait ::cron::forever
+    if {$::cron::trace} {
+      puts "MAIN LOOP CYCLE $::cron::loops(main)"
+    }
+  }
+}
+
+###
+# topic: 4a891d0caabc6e25fbec9514ea8104dd
+# description:
+#    This file implements a process table
+#    Instead of having individual components try to maintain their own timers
+#    we centrally manage how often tasks should be kicked off here.
+###
+namespace eval ::cron {
+  variable lastcall 0
+  variable processTable
+  variable busy 0
+  variable next_event {}
+  variable trace 0
+  variable current_event
+  variable time -1
+  if {![info exists current_event]} {
+    set current_event 0
+  }
+  if {![info exists ::cron::loops]} {
+    array set ::cron::loops {
+      active 0
+      main 0
+      idle 0
+      wake 0
+    }
+  }
+}
+
+::cron::wake STARTUP
+package provide cron 2.1
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cron/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cron/pkgIndex.tcl
new file mode 100644
index 00000000..0e99963e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/cron/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+package ifneeded cron 2.1 [list source [file join $dir cron.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/csv/csv.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/csv/csv.tcl
new file mode 100644
index 00000000..60f8133a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/csv/csv.tcl
@@ -0,0 +1,787 @@
+# csv.tcl --
+#
+#	Tcl implementations of CSV reader and writer
+#
+# Copyright (c) 2001      by Jeffrey Hobbs
+# Copyright (c) 2001-2013,2022 by Andreas Kupries <andreas.kupries@gmail.com>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.5
+package provide csv 0.9
+
+namespace eval ::csv {
+    namespace export join joinlist read2matrix read2queue report
+    namespace export split split2matrix split2queue writematrix writequeue
+}
+
+# ::csv::join --
+#
+#	Takes a list of values and generates a string in CSV format.
+#
+# Arguments:
+#	values	A list of the values to join
+#	sepChar	The separator character, defaults to comma
+#	delChar	The delimiter character, defaults to quote
+#	delMode	If set to 'always', values are always surrounded by delChar
+#
+# Results:
+#	A string containing the values in CSV format.
+
+proc ::csv::join {values {sepChar ,} {delChar \"} {delMode auto}} {
+    set out ""
+    set sep {}
+    foreach val $values {
+	if {($delMode eq "always") || [string match "*\[${delChar}$sepChar\r\n\]*" $val]} {
+	    append out $sep${delChar}[string map [list $delChar ${delChar}${delChar}] $val]${delChar}
+	} else {
+	    append out $sep${val}
+	}
+	set sep $sepChar
+    }
+    return $out
+}
+
+# ::csv::joinlist --
+#
+#	Takes a list of lists of values and generates a string in CSV
+#	format. Each item in the list is made into a single CSV
+#	formatted record in the final string, the records being
+#	separated by newlines.
+#
+# Arguments:
+#	values	A list of the lists of the values to join
+#	sepChar	The separator character, defaults to comma
+#	delChar	The delimiter character, defaults to quote
+#	delMode	If set to 'always', values are always surrounded by delChar
+#
+# Results:
+#	A string containing the values in CSV format, the records
+#	separated by newlines.
+
+proc ::csv::joinlist {values {sepChar ,} {delChar \"} {delMode auto}} {
+    set out ""
+    foreach record $values {
+	# note that this is ::csv::join
+	append out "[join $record $sepChar $delChar $delMode]\n"
+    }
+    return $out
+}
+
+# ::csv::joinmatrix --
+#
+#	Takes a matrix object following the API specified for the
+#	struct::matrix package. Each row of the matrix is converted
+#	into a single CSV formatted record in the final string, the
+#	records being separated by newlines.
+#
+# Arguments:
+#	matrix	Matrix object command.
+#	sepChar	The separator character, defaults to comma
+#	delChar	The delimiter character, defaults to quote
+#	delMode	If set to 'always', values are always surrounded by delChar
+#
+# Results:
+#	A string containing the values in CSV format, the records
+#	separated by newlines.
+
+proc ::csv::joinmatrix {matrix {sepChar ,} {delChar \"} {delMode auto}} {
+    return [joinlist [$matrix get rect 0 0 end end] $sepChar $delChar $delMode]
+}
+
+# ::csv::iscomplete --
+#
+#	A predicate checking if the argument is a complete csv record.
+#
+# Arguments
+#	data	The (partial) csv record to check.
+#
+# Results:
+#	A boolean flag indicating the completeness of the data. The
+#	result is true if the data is complete.
+
+proc ::csv::iscomplete {data} {
+    expr {1 - [regexp -all \" $data] % 2}
+}
+
+# ::csv::read2matrix --
+#
+#	A wrapper around "Split2matrix" reading CSV formatted
+#	lines from the specified channel and adding it to the given
+#	matrix.
+#
+# Arguments:
+#	m		The matrix to add the read data too.
+#	chan		The channel to read from.
+#	sepChar		The separator character, defaults to comma
+#	expand		The expansion mode. The default is none
+#
+# Results:
+#	A list of the values in 'line'.
+
+proc ::csv::read2matrix {args} {
+    # FR #481023
+    # See 'split2matrix' for the available expansion modes.
+
+    # Argument syntax:
+    #
+    #2)            chan m
+    #3)            chan m sepChar
+    #3) -alternate chan m
+    #4) -alternate chan m sepChar
+    #4)            chan m sepChar expand
+    #5) -alternate chan m sepChar expand
+
+    set alternate 0
+    set sepChar   ,
+    set expand    none
+
+    switch -exact -- [llength $args] {
+	2 {
+	    foreach {chan m} $args break
+	}
+	3 {
+	    foreach {a b c} $args break
+	    if {[string equal $a "-alternate"]} {
+		set alternate 1
+		set chan      $b
+		set m         $c
+	    } else {
+		set chan    $a
+		set m       $b
+		set sepChar $c
+	    }
+	}
+	4 {
+	    foreach {a b c d} $args break
+	    if {[string equal $a "-alternate"]} {
+		set alternate 1
+		set chan      $b
+		set m         $c
+		set sepChar   $d
+	    } else {
+		set chan    $a
+		set m       $b
+		set sepChar $c
+		set expand  $d
+	    }
+	}
+	5 {
+	    foreach {a b c d e} $args break
+	    if {![string equal $a "-alternate"]} {
+		return -code error "wrong#args: Should be ?-alternate? chan m ?separator? ?expand?"
+	    }
+	    set alternate 1
+
+	    set chan    $b
+	    set m       $c
+	    set sepChar $d
+	    set expand  $e
+	}
+	0 - 1 -
+	default {
+	    return -code error "wrong#args: Should be ?-alternate? chan m ?separator? ?expand?"
+	}
+    }
+
+    if {[string length $sepChar] < 1} {
+	return -code error "illegal separator character \"$sepChar\", is empty"
+    } elseif {[string length $sepChar] > 1} {
+	return -code error "illegal separator character \"$sepChar\", is a string"
+    }
+
+    set data ""
+    while {![eof $chan]} {
+	if {[gets $chan line] < 0} {continue}
+
+	# Why skip empty lines? They may be in data. Except if the
+	# buffer is empty, i.e. we are between records.
+	if {$line == {} && $data == {}} {continue}
+
+       append data $line
+       if {![iscomplete $data]} {
+           # Odd number of quotes - must have embedded newline
+           append data \n
+           continue
+       }
+
+       Split2matrix $alternate $m $data $sepChar $expand
+       set data ""
+    }
+    return
+}
+
+# ::csv::read2queue --
+#
+#	A wrapper around "::csv::split2queue" reading CSV formatted
+#	lines from the specified channel and adding it to the given
+#	queue.
+#
+# Arguments:
+#	q		The queue to add the read data too.
+#	chan		The channel to read from.
+#	sepChar		The separator character, defaults to comma
+#
+# Results:
+#	A list of the values in 'line'.
+
+proc ::csv::read2queue {args} {
+    # Argument syntax:
+    #
+    #2)            chan q
+    #3)            chan q sepChar
+    #3) -alternate chan q
+    #4) -alternate chan q sepChar
+
+    set alternate 0
+    set sepChar   ,
+
+    switch -exact -- [llength $args] {
+	2 {
+	    foreach {chan q} $args break
+	}
+	3 {
+	    foreach {a b c} $args break
+	    if {[string equal $a "-alternate"]} {
+		set alternate 1
+		set chan      $b
+		set q         $c
+	    } else {
+		set chan    $a
+		set q       $b
+		set sepChar $c
+	    }
+	}
+	4 {
+	    foreach {a b c d} $args break
+	    if {![string equal $a "-alternate"]} {
+		return -code error "wrong#args: Should be ?-alternate? chan q ?separator?"
+	    }
+	    set alternate 1
+	    set chan    $b
+	    set q       $c
+	    set sepChar $d
+	}
+	0 - 1 -
+	default {
+	    return -code error "wrong#args: Should be ?-alternate? chan q ?separator?"
+	}
+    }
+
+    if {[string length $sepChar] < 1} {
+	return -code error "illegal separator character \"$sepChar\", is empty"
+    } elseif {[string length $sepChar] > 1} {
+	return -code error "illegal separator character \"$sepChar\", is a string"
+    }
+
+    set data ""
+    while {![eof $chan]} {
+	if {[gets $chan line] < 0} {continue}
+
+	# Why skip empty lines? They may be in data. Except if the
+	# buffer is empty, i.e. we are between records.
+	if {$line == {} && $data == {}} {continue}
+
+	append data $line
+	if {![iscomplete $data]} {
+	    # Odd number of quotes - must have embedded newline
+	    append data \n
+	    continue
+	}
+
+	$q put [Split $alternate $data $sepChar]
+	set data ""
+    }
+    return
+}
+
+# ::csv::report --
+#
+#	A report command which can be used by the matrix methods
+#	"format-via" and "format2chan-via". For the latter this
+#	command delegates the work to "::csv::writematrix". "cmd" is
+#	expected to be either "printmatrix" or
+#	"printmatrix2channel". The channel argument, "chan", has to
+#	be present for the latter and must not be present for the first.
+#
+# Arguments:
+#	cmd		Either 'printmatrix' or 'printmatrix2channel'
+#	matrix		The matrix to format.
+#	args		0 (chan): The channel to write to
+#
+# Results:
+#	None for 'printmatrix2channel', else the CSV formatted string.
+
+proc ::csv::report {cmd matrix args} {
+    switch -exact -- $cmd {
+	printmatrix {
+	    if {[llength $args] > 0} {
+		return -code error "wrong # args:\
+			::csv::report printmatrix matrix"
+	    }
+	    return [joinlist [$matrix get rect 0 0 end end]]
+	}
+	printmatrix2channel {
+	    if {[llength $args] != 1} {
+		return -code error "wrong # args:\
+			::csv::report printmatrix2channel matrix chan"
+	    }
+	    writematrix $matrix [lindex $args 0]
+	    return ""
+	}
+	default {
+	    return -code error "Unknown method $cmd"
+	}
+    }
+}
+
+# ::csv::split --
+#
+#	Split a string according to the rules for CSV processing.
+#	This assumes that the string contains a single line of CSVs
+#
+# Arguments:
+#	line		The string to split
+#	sepChar		The separator character, defaults to comma
+#
+# Results:
+#	A list of the values in 'line'.
+
+proc ::csv::split {args} {
+    # Argument syntax:
+    #
+    # (1)            line
+    # (2)            line sepChar
+    # (2) -alternate line
+    # (3) -alternate line sepChar
+
+    # (3)            line sepChar delChar
+    # (4) -alternate line sepChar delChar
+
+    set alternate 0
+    set sepChar   ,
+    set delChar   \"
+
+    switch -exact -- [llength $args] {
+	1 {
+	    set line [lindex $args 0]
+	}
+	2 {
+	    foreach {a b} $args break
+	    if {[string equal $a "-alternate"]} {
+		set alternate 1
+		set line     $b
+	    } else {
+		set line    $a
+		set sepChar $b
+	    }
+	}
+	3 {
+	    foreach {a b c} $args break
+	    if {[string equal $a "-alternate"]} {
+	        set alternate 1
+		set line    $b
+		set sepChar $c
+	    } else {
+		set line    $a
+		set sepChar $b
+		set delChar $c
+            }
+	}
+	4 {
+	    foreach {a b c d} $args break
+	    if {![string equal $a "-alternate"]} {
+		return -code error "wrong#args: Should be ?-alternate? line ?separator? ?delimiter?"
+	    }
+	    set alternate 1
+	    set line    $b
+	    set sepChar $c
+	    set delChar $d
+	}
+	0 -
+	default {
+	    return -code error "wrong#args: Should be ?-alternate? line ?separator? ?delimiter?"
+	}
+    }
+
+    if {[string length $sepChar] < 1} {
+	return -code error "illegal separator character ${delChar}$sepChar${delChar}, is empty"
+    } elseif {[string length $sepChar] > 1} {
+	return -code error "illegal separator character ${delChar}$sepChar${delChar}, is a string"
+    }
+
+    if {[string length $delChar] < 1} {
+	return -code error "illegal separator character \"$delChar\", is empty"
+    } elseif {[string length $delChar] > 1} {
+	return -code error "illegal separator character \"$delChar\", is a string"
+    }
+
+    return [Split $alternate $line $sepChar $delChar]
+}
+
+proc ::csv::Split {alternate line sepChar {delChar \"}} {
+    # Protect the sepchar from special interpretation by
+    # the regex calls below.
+
+    set sepRE \[\[.${sepChar}.]]
+    set delRE \[\[.${delChar}.]]
+
+    if {$alternate} {
+	# The alternate syntax requires a different parser.
+	# A variation of the string map / regsub parser for the
+	# regular syntax was tried but does not handle embedded
+	# doubled " well (testcase csv-91.3 was 'knownBug', sole
+	# one, still a bug). Now we just tokenize the input into
+	# the primary parts (sep char, "'s and the rest) and then
+	# use an explicitly coded state machine (DFA) to parse
+	# and convert token sequences.
+
+	## puts 1->>$line<<
+	set line [string map [list \
+		$sepChar \0$sepChar\0 \
+		$delChar \0${delChar}\0 \
+		] $line]
+
+	## puts 2->>$line<<
+	set line [string map [list \0\0 \0] $line]
+	regsub "^\0" $line {} line
+	regsub "\0$" $line {} line
+
+	## puts 3->>$line<<
+
+	set val ""
+	set res ""
+	set state base
+
+	## puts 4->>[::split $line \0]
+	foreach token [::split $line \0] {
+
+	    ## puts "\t*= $state\t>>$token<<"
+	    switch -exact -- $state {
+		base {
+		    if {[string equal $token "${delChar}"]} {
+			set state qvalue
+			continue
+		    }
+		    if {[string equal $token $sepChar]} {
+			lappend res $val
+			set val ""
+			continue
+		    }
+		    append val $token
+		}
+		qvalue {
+		    if {[string equal $token "${delChar}"]} {
+			# May end value, may be a doubled "
+			set state endordouble
+			continue
+		    }
+		    append val $token
+		}
+		endordouble {
+		    if {[string equal $token "${delChar}"]} {
+			# Doubled ", append to current value
+			append val ${delChar}
+			set state qvalue
+			continue
+		    }
+		    # Last " was end of quoted value. Close it.
+		    # We expect current as $sepChar
+
+		    lappend res $val
+		    set          val ""
+		    set state base
+
+		    if {[string equal $token $sepChar]} {continue}
+
+		    # Undoubled " in middle of text. Just assume that
+		    # remainder is another qvalue.
+		    set state qvalue
+		}
+		default {
+		    return -code error "Internal error, illegal parsing state"
+		}
+	    }
+	}
+
+	## puts "/= $state\t>>$val<<"
+
+	lappend res $val
+
+	## puts 5->>$res<<
+	return $res
+    } else {
+	regsub -- "$sepRE${delRE}${delRE}$" $line $sepChar\0${delChar}${delChar}\0 line
+	regsub -- "^${delRE}${delRE}$sepRE" $line \0${delChar}${delChar}\0$sepChar line
+	regsub -all -- {(^${delChar}|${delChar}$)} $line \0 line
+
+	set line [string map [list \
+		$sepChar${delChar}${delChar}${delChar} $sepChar\0${delChar} \
+		${delChar}${delChar}${delChar}$sepChar ${delChar}\0$sepChar \
+		${delChar}${delChar}           ${delChar} \
+		${delChar}             \0 \
+		] $line]
+
+	set end 0
+	while {[regexp -indices -start $end -- {(\0)[^\0]*(\0)} $line \
+		-> start end]} {
+	    set start [lindex $start 0]
+	    set end   [lindex $end 0]
+	    set range [string range $line $start $end]
+	    if {[string first $sepChar $range] >= 0} {
+		set line [string replace $line $start $end \
+			[string map [list $sepChar \1] $range]]
+	    }
+	    incr end
+	}
+	set line [string map [list $sepChar \0 \1 $sepChar \0 {} ] $line]
+	return [::split $line \0]
+
+    }
+}
+
+# ::csv::split2matrix --
+#
+#	Split a string according to the rules for CSV processing.
+#	This assumes that the string contains a single line of CSVs.
+#	The resulting list of values is appended to the specified
+#	matrix, as a new row. The code assumes that the matrix provides
+#	the same interface as the queue provided by the 'struct'
+#	module of tcllib, "add row" in particular.
+#
+# Arguments:
+#	m		The matrix to write the resulting list to.
+#	line		The string to split
+#	sepChar		The separator character, defaults to comma
+#	expand		The expansion mode. The default is none
+#
+# Results:
+#	A list of the values in 'line', written to 'q'.
+
+proc ::csv::split2matrix {args} {
+    # FR #481023
+
+    # Argument syntax:
+    #
+    #2)            m line
+    #3)            m line sepChar
+    #3) -alternate m line
+    #4) -alternate m line sepChar
+    #4)            m line sepChar expand
+    #5) -alternate m line sepChar expand
+
+    set alternate 0
+    set sepChar   ,
+    set expand    none
+
+    switch -exact -- [llength $args] {
+	2 {
+	    foreach {m line} $args break
+	}
+	3 {
+	    foreach {a b c} $args break
+	    if {[string equal $a "-alternate"]} {
+		set alternate 1
+		set m         $b
+		set line      $c
+	    } else {
+		set m       $a
+		set line    $b
+		set sepChar $c
+	    }
+	}
+	4 {
+	    foreach {a b c d} $args break
+	    if {[string equal $a "-alternate"]} {
+		set alternate 1
+		set m         $b
+		set line      $c
+		set sepChar   $d
+	    } else {
+		set m       $a
+		set line    $b
+		set sepChar $c
+		set expand  $d
+	    }
+	}
+	4 {
+	    foreach {a b c d e} $args break
+	    if {![string equal $a "-alternate"]} {
+		return -code error "wrong#args: Should be ?-alternate? m line ?separator? ?expand?"
+	    }
+	    set alternate 1
+
+	    set m       $b
+	    set line    $c
+	    set sepChar $d
+	    set expand  $e
+	}
+	0 - 1 -
+	default {
+	    return -code error "wrong#args: Should be ?-alternate? m line ?separator? ?expand?"
+	}
+    }
+
+    if {[string length $sepChar] < 1} {
+	return -code error "illegal separator character \"$sepChar\", is empty"
+    } elseif {[string length $sepChar] > 1} {
+	return -code error "illegal separator character \"$sepChar\", is a string"
+    }
+
+    Split2matrix $alternate $m $line $sepChar $expand
+    return
+}
+
+proc ::csv::Split2matrix {alternate m line sepChar expand} {
+    set csv [Split $alternate $line $sepChar]
+
+    # Expansion modes
+    # - none  : default, behaviour of original implementation.
+    #           no expansion is done, lines are silently truncated
+    #           to the number of columns in the matrix.
+    #
+    # - empty : A matrix without columns is expanded to the number
+    #           of columns in the first line added to it. All
+    #           following lines are handled as if "mode == none"
+    #           was set.
+    #
+    # - auto  : Full auto-mode. The matrix is expanded as needed to
+    #           hold all columns of all lines.
+
+    switch -exact -- $expand {
+	none {}
+	empty {
+	    if {[$m columns] == 0} {
+		$m add columns [llength $csv]
+	    }
+	}
+	auto {
+	    if {[$m columns] < [llength $csv]} {
+		$m add columns [expr {[llength $csv] - [$m columns]}]
+	    }
+	}
+    }
+    $m add row $csv
+    return
+}
+
+# ::csv::split2queue --
+#
+#	Split a string according to the rules for CSV processing.
+#	This assumes that the string contains a single line of CSVs.
+#	The resulting list of values is appended to the specified
+#	queue, as a single item. IOW each item in the queue represents
+#	a single CSV record. The code assumes that the queue provides
+#	the same interface as the queue provided by the 'struct'
+#	module of tcllib, "put" in particular.
+#
+# Arguments:
+#	q		The queue to write the resulting list to.
+#	line		The string to split
+#	sepChar		The separator character, defaults to comma
+#
+# Results:
+#	A list of the values in 'line', written to 'q'.
+
+proc ::csv::split2queue {args} {
+    # Argument syntax:
+    #
+    #2)            q line
+    #3)            q line sepChar
+    #3) -alternate q line
+    #4) -alternate q line sepChar
+
+    set alternate 0
+    set sepChar   ,
+
+    switch -exact -- [llength $args] {
+	2 {
+	    foreach {q line} $args break
+	}
+	3 {
+	    foreach {a b c} $args break
+	    if {[string equal $a "-alternate"]} {
+		set alternate 1
+		set q         $b
+		set line      $c
+	    } else {
+		set q       $a
+		set line    $b
+		set sepChar $c
+	    }
+	}
+	4 {
+	    foreach {a b c d} $args break
+	    if {![string equal $a "-alternate"]} {
+		return -code error "wrong#args: Should be ?-alternate? q line ?separator?"
+	    }
+	    set alternate 1
+
+	    set q       $b
+	    set line    $c
+	    set sepChar $d
+	}
+	0 - 1 -
+	default {
+	    return -code error "wrong#args: Should be ?-alternate? q line ?separator?"
+	}
+    }
+
+    if {[string length $sepChar] < 1} {
+	return -code error "illegal separator character \"$sepChar\", is empty"
+    } elseif {[string length $sepChar] > 1} {
+	return -code error "illegal separator character \"$sepChar\", is a string"
+    }
+
+    $q put [Split $alternate $line $sepChar]
+    return
+}
+
+# ::csv::writematrix --
+#
+#	A wrapper around "::csv::join" taking the rows in a matrix and
+#	writing them as CSV formatted lines into the channel.
+#
+# Arguments:
+#	m		The matrix to take the data to write from.
+#	chan		The channel to write into.
+#	sepChar		The separator character, defaults to comma
+#
+# Results:
+#	None.
+
+proc ::csv::writematrix {m chan {sepChar ,} {delChar \"}} {
+    set n [$m rows]
+    for {set r 0} {$r < $n} {incr r} {
+	puts $chan [join [$m get row $r] $sepChar $delChar]
+    }
+
+    # Memory intensive alternative:
+    # puts $chan [joinlist [m get rect 0 0 end end] $sepChar $delChar]
+    return
+}
+
+# ::csv::writequeue --
+#
+#	A wrapper around "::csv::join" taking the rows in a queue and
+#	writing them as CSV formatted lines into the channel.
+#
+# Arguments:
+#	q		The queue to take the data to write from.
+#	chan		The channel to write into.
+#	sepChar		The separator character, defaults to comma
+#
+# Results:
+#	None.
+
+proc ::csv::writequeue {q chan {sepChar ,} {delChar \"}} {
+    while {[$q size] > 0} {
+	puts $chan [join [$q get] $sepChar $delChar]
+    }
+
+    # Memory intensive alternative:
+    # puts $chan [joinlist [$q get [$q size]] $sepChar $delChar]
+    return
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/csv/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/csv/pkgIndex.tcl
new file mode 100644
index 00000000..311aac9b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/csv/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded csv 0.9 [list source [file join $dir csv.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/caller.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/caller.tcl
new file mode 100644
index 00000000..e85a9f08
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/caller.tcl
@@ -0,0 +1,97 @@
+## -*- tcl -*-
+# ### ### ### ######### ######### #########
+
+## Utility command for use as debug prefix command to un-mangle snit
+## and TclOO method calls.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require debug
+
+namespace eval ::debug {
+    namespace export caller
+    namespace ensemble create
+}
+
+# ### ### ### ######### ######### #########
+## API & Implementation
+
+proc ::debug::caller {args} {
+    # For snit (type)methods, rework the command line to be more
+    # legible and in line with what the user would expect. To this end
+    # we pull the primary command out of the arguments, be it type or
+    # object, massage the command to match the original (type)method
+    # name, then resort and expand the words to match the call before
+    # the snit got its claws into it.
+
+    set a [lassign [info level -1] m]
+    regsub {.*Snit_} $m {} m
+
+    if {[string match ::oo::Obj*::my $m]} {
+	# TclOO call.
+	set m [uplevel 1 self]
+	return [list $m {*}[Filter $a $args]]
+    }
+    if {$m eq "my"} {
+	# TclOO call.
+	set m [uplevel 1 self]
+	return [list $m {*}[Filter $a $args]]
+    }
+
+    switch -glob -- $m {
+	htypemethod* {
+	    # primary = type, a = type
+	    set a [lassign $a primary]
+	    set m [string map {_ { }} [string range $m 11 end]]
+	}
+	typemethod* {
+	    # primary = type, a = type
+	    set a [lassign $a primary]
+	    set m [string range $m 10 end]
+	}
+	hmethod* {
+	    # primary = self, a = type selfns self win ...
+	    set a [lassign $a _ _ primary _]
+	    set m [string map {_ { }} [string range $m 7 end]]
+	}
+	method* {
+	    # primary = self, a = type selfns self win ...
+	    set a [lassign $a _ _ primary _]
+	    set m [string range $m 6 end]
+	}
+	destructor -
+	constructor {
+	    # primary = self, a = type selfns self win ...
+	    set a [lassign $a _ _ primary _]
+	}
+	typeconstructor {
+	    return [list {*}$a $m]
+	}
+	default {
+	    # Unknown
+	    return [list $m {*}[Filter $a $args]]
+	}
+    }
+    return [list $primary {*}$m {*}[Filter $a $args]]
+}
+
+proc ::debug::Filter {args droplist} {
+    if {[llength $droplist]} {
+	# Replace unwanted arguments with '*'. This is usually done
+	# for arguments which can be large Tcl values. These would
+	# screw up formatting and, to add insult to this injury, also
+	# repeat for each debug output in the same proc, method, etc.
+	foreach i [lsort -integer $droplist] {
+	    set args [lreplace $args $i $i *]
+	}
+    }
+    return $args
+}
+
+# ### ######### ###########################
+## Ready for use
+
+package provide debug::caller 1.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/debug.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/debug.tcl
new file mode 100644
index 00000000..4ce60808
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/debug.tcl
@@ -0,0 +1,306 @@
+# Debug - a debug narrative logger.
+# -- Colin McCormack / originally Wub server utilities
+#
+# Debugging areas of interest are represented by 'tokens' which have 
+# independantly settable levels of interest (an integer, higher is more detailed)
+#
+# Debug narrative is provided as a tcl script whose value is [subst]ed in the 
+# caller's scope if and only if the current level of interest matches or exceeds
+# the Debug call's level of detail.  This is useful, as one can place arbitrarily
+# complex narrative in code without unnecessarily evaluating it.
+#
+# TODO: potentially different streams for different areas of interest.
+# (currently only stderr is used.  there is some complexity in efficient
+# cross-threaded streams.)
+
+# # ## ### ##### ######## ############# #####################
+## Requisites
+
+package require Tcl 8.5
+
+namespace eval ::debug {
+    namespace export -clear \
+	define on off prefix suffix header trailer \
+	names 2array level setting parray pdict \
+	nl tab hexl
+    namespace ensemble create -subcommands {}
+}
+
+# # ## ### ##### ######## ############# #####################
+## API & Implementation
+
+proc ::debug::noop {args} {}
+
+proc ::debug::debug {tag message {level 1}} {
+    variable detail
+    if {$detail($tag) < $level} {
+	#puts stderr "$tag @@@ $detail($tag) >= $level"
+	return
+    }
+
+    variable prefix
+    variable suffix
+    variable header
+    variable trailer
+    variable fds
+
+    if {[info exists fds($tag)]} {
+	set fd $fds($tag)
+    } else {
+	set fd stderr
+    }
+
+    # Assemble the shown text from the user message and the various
+    # prefixes and suffices (global + per-tag).
+
+    set themessage ""
+    if {[info exists prefix(::)]}   { append themessage $prefix(::)   }
+    if {[info exists prefix($tag)]} { append themessage $prefix($tag) }
+    append themessage $message
+    if {[info exists suffix($tag)]} { append themessage $suffix($tag) }
+    if {[info exists suffix(::)]}   { append themessage $suffix(::)   }
+
+    # Resolve variables references and command invokations embedded
+    # into the message with plain text.
+    set code [catch {
+	set smessage [uplevel 1 [list ::subst -nobackslashes $themessage]]
+	set sheader  [uplevel 1 [list ::subst -nobackslashes $header]]
+	set strailer [uplevel 1 [list ::subst -nobackslashes $trailer]]
+    } __ eo]
+
+    # And dump an internal error if that resolution failed.
+    if {$code} {
+	if {[catch {
+	    set caller [info level -1]
+	}]} { set caller GLOBAL }
+	if {[string length $caller] >= 1000} {
+	    set caller "[string range $caller 0 200]...[string range $caller end-200 end]"
+	}
+	foreach line [split $caller \n] {
+	    puts -nonewline $fd "@@(DebugError from $tag ($eo): $line)"
+	}
+	return
+    }
+
+    # From here we have a good message to show. We only shorten it a
+    # bit if its a bit excessive in size.
+
+    if {[string length $smessage] > 4096} {
+	set head [string range $smessage 0 2048]
+	set tail [string range $smessage end-2048 end]
+	set smessage "${head}...(truncated)...$tail"
+    }
+
+    foreach line [split $smessage \n] {
+	puts $fd "$sheader$tag | $line$strailer"
+    }
+    return
+}
+
+# names - return names of debug tags
+proc ::debug::names {} {
+    variable detail
+    return [lsort [array names detail]]
+}
+
+proc ::debug::2array {} {
+    variable detail
+    set result {}
+    foreach n [lsort [array names detail]] {
+	if {[interp alias {} debug.$n] ne "::debug::noop"} {
+	    lappend result $n $detail($n)
+	} else {
+	    lappend result $n -$detail($n)
+	}
+    }
+    return $result
+}
+
+# level - set level and fd for tag
+proc ::debug::level {tag {level ""} {fd {}}} {
+    variable detail
+    # TODO: Force level >=0.
+    if {$level ne ""} {
+	set detail($tag) $level
+    }
+
+    if {![info exists detail($tag)]} {
+	set detail($tag) 1
+    }
+
+    variable fds
+    if {$fd ne {}} {
+	set fds($tag) $fd
+    }
+
+    return $detail($tag)
+}
+
+proc ::debug::header  {text} { variable header  $text }
+proc ::debug::trailer {text} { variable trailer $text }
+
+proc ::debug::define {tag} {
+    if {[interp alias {} debug.$tag] ne {}} return
+    off $tag
+    return
+}
+
+# Set a prefix/suffix to use for tag.
+# The global (tag-independent) prefix/suffix is adressed through tag '::'.
+# This works because colon (:) is an illegal character for user-specified tags.
+
+proc ::debug::prefix {tag {theprefix {}}} {
+    variable prefix
+    set prefix($tag) $theprefix
+
+    if {[interp alias {} debug.$tag] ne {}} return
+    off $tag
+    return
+}
+
+proc ::debug::suffix {tag {theprefix {}}} {
+    variable suffix
+    set suffix($tag) $theprefix
+
+    if {[interp alias {} debug.$tag] ne {}} return
+    off $tag
+    return
+}
+
+# turn on debugging for tag
+proc ::debug::on {tag {level ""} {fd {}}} {
+    variable active
+    set active($tag) 1
+    level $tag $level $fd
+    interp alias {} debug.$tag {} ::debug::debug $tag
+    return
+}
+
+# turn off debugging for tag
+proc ::debug::off {tag {level ""} {fd {}}} {
+    variable active
+    set active($tag) 1
+    level $tag $level $fd
+    interp alias {} debug.$tag {} ::debug::noop
+    return
+}
+
+proc ::debug::setting {args} {
+    if {[llength $args] == 1} {
+	set args [lindex $args 0]
+    }
+    set fd stderr
+    if {[llength $args] % 2} {
+	set fd   [lindex $args end]
+	set args [lrange $args 0 end-1]
+    }
+    foreach {tag level} $args {
+	if {$level > 0} {
+	    level $tag $level $fd
+	    interp alias {} debug.$tag {} ::debug::debug $tag
+	} else {
+	    level $tag [expr {-$level}] $fd
+	    interp alias {} debug.$tag {} ::debug::noop
+	}
+    }
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+## Convenience commands.
+# Format arrays and dicts as multi-line message.
+# Insert newlines and tabs.
+
+proc ::debug::nl  {} { return \n }
+proc ::debug::tab {} { return \t }
+
+proc ::debug::parray {a {pattern *}} {
+    upvar 1 $a array
+    if {![array exists array]} {
+	error "\"$a\" isn't an array"
+    }
+    pdict [array get array] $pattern
+}
+
+proc ::debug::pdict {dict {pattern *}} {
+    set maxl 0
+    set names [lsort -dict [dict keys $dict $pattern]]
+    foreach name $names {
+	if {[string length $name] > $maxl} {
+	    set maxl [string length $name]
+	}
+    }
+    set maxl [expr {$maxl + 2}]
+    set lines {}
+    foreach name $names {
+	set nameString [format (%s) $name]
+	lappend lines [format "%-*s = %s" \
+			   $maxl $nameString \
+			   [dict get $dict $name]]
+    }
+    return [join $lines \n]
+}
+
+proc ::debug::hexl {data {prefix {}}} {
+    set r {}
+
+    # Convert the data to hex and to characters.
+    binary scan $data H*@0a* hexa asciia
+
+    # Replace non-printing characters in the data with dots.
+    regsub -all -- {[^[:graph:] ]} $asciia {.} asciia
+
+    # Pad with spaces to a full multiple of 32/16.
+    set n [expr {[string length $hexa] % 32}]
+    if {$n < 32} { append hexa   [string repeat { } [expr {32-$n}]] }
+    #puts "pad H [expr {32-$n}]"
+
+    set n [expr {[string length $asciia] % 32}]
+    if {$n < 16} { append asciia [string repeat { } [expr {16-$n}]] }
+    #puts "pad A [expr {32-$n}]"
+
+    # Reassemble formatted, in groups of 16 bytes/characters.
+    # The hex part is handled in groups of 32 nibbles.
+    set addr 0
+    while {[string length $hexa]} {
+	# Get front group of 16 bytes each.
+	set hex    [string range $hexa   0 31]
+	set ascii  [string range $asciia 0 15]
+	# Prep for next iteration
+	set hexa   [string range $hexa   32 end]  
+	set asciia [string range $asciia 16 end]
+
+	# Convert the hex to pairs of hex digits
+	regsub -all -- {..} $hex {& } hex
+
+	# Add the hex and latin-1 data to the result buffer
+	append r $prefix [format %04x $addr] { | } $hex { |} $ascii |\n
+	incr addr 16
+    }
+
+    # And done
+    return $r
+}
+
+# # ## ### ##### ######## ############# #####################
+
+namespace eval debug {
+    variable detail     ; # map: TAG -> level of interest
+    variable prefix     ; # map: TAG -> message prefix to use
+    variable suffix     ; # map: TAG -> message suffix to use
+    variable fds        ; # map: TAG -> handle of open channel to log to.
+    variable header  {} ; # per-line heading, subst'ed
+    variable trailer {} ; # per-line ending, subst'ed
+
+    # Notes:
+    # - The tag '::' is reserved. "prefix" and "suffix" use it to store
+    #   the global message prefix / suffix.
+    # - prefix and suffix are applied per message.
+    # - header and trailer are per line. And should not generate multiple lines!
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide debug 1.0.6
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/heartbeat.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/heartbeat.tcl
new file mode 100644
index 00000000..a00ecd94
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/heartbeat.tcl
@@ -0,0 +1,68 @@
+# -*- tcl -*
+# Debug -- Heartbeat. Track operation of Tcl's eventloop.
+# -- Colin McCormack / originally Wub server utilities
+
+# # ## ### ##### ######## ############# #####################
+## Requisites
+
+package require Tcl 8.5
+package require debug
+
+namespace eval ::debug {
+    namespace export heartbeat
+    namespace ensemble create
+}
+
+# # ## ### ##### ######## ############# #####################
+## API & Implementation
+
+proc ::debug::heartbeat {{delta 500}} {
+    variable duration $delta
+    variable timer
+
+    if {$duration > 0} {
+	# stop a previous heartbeat before starting the next
+	catch { after cancel $timer }
+	on heartbeat
+	::debug::every $duration {
+	    debug.heartbeat {[::debug::pulse]}
+	}
+    } else {
+	catch { after cancel $timer }
+	off heartbeat
+    }
+}
+
+proc ::debug::every {ms body} {
+    eval $body
+    variable timer [after $ms [info level 0]]
+    return
+}
+
+proc ::debug::pulse {} {
+    variable duration
+    variable hbtimer
+    variable heartbeat
+
+    set now  [::tcl::clock::milliseconds]
+    set diff [expr {$now - $hbtimer - $duration}]
+
+    set hbtimer $now
+
+    return [list [incr heartbeat] $diff]
+}
+
+# # ## ### ##### ######## ############# #####################
+
+namespace eval ::debug {
+    variable duration  0 ; # milliseconds between heart-beats
+    variable heartbeat 0 ; # beat counter
+    variable hbtimer   [::tcl::clock::milliseconds]
+    variable timer
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide debug::heartbeat 1.0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/pkgIndex.tcl
new file mode 100644
index 00000000..065cc9e7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package require Tcl] 8.5]} return
+package ifneeded debug            1.0.6 [list source [file join $dir debug.tcl]]
+package ifneeded debug::heartbeat 1.0.1 [list source [file join $dir heartbeat.tcl]]
+package ifneeded debug::timestamp 1     [list source [file join $dir timestamp.tcl]]
+package ifneeded debug::caller    1.1   [list source [file join $dir caller.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/timestamp.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/timestamp.tcl
new file mode 100644
index 00000000..5fec019e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/debug/timestamp.tcl
@@ -0,0 +1,47 @@
+# -*- tcl -*
+# Debug -- Timestamps.
+# -- Colin McCormack / originally Wub server utilities
+#
+# Generate timestamps for debug messages.
+# The provided commands are for use in prefixes and headers.
+
+# # ## ### ##### ######## ############# #####################
+## Requisites
+
+package require Tcl 8.5
+package require debug
+
+namespace eval ::debug {
+    namespace export timestamp
+    namespace ensemble create
+}
+
+# # ## ### ##### ######## ############# #####################
+## API & Implementation
+
+proc ::debug::timestamp {} {
+    variable timestamp::delta
+    variable timestamp::baseline
+
+    set now [::tcl::clock::milliseconds]
+    if {$delta} {
+	set time "${now}-[expr {$now - $delta}]mS "
+    } else {
+	set time "${now}mS "
+    }
+    set delta $now
+    return $time
+}
+
+# # ## ### ##### ######## ############# #####################
+
+namespace eval ::debug::timestamp {
+    variable delta    0
+    variable baseline [::tcl::clock::milliseconds]
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide debug::timestamp 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/defer/defer.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/defer/defer.tcl
new file mode 100644
index 00000000..c8ea8bf3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/defer/defer.tcl
@@ -0,0 +1,120 @@
+#! /usr/bin/env tclsh
+
+# Copyright (c) 2017 Roy Keene
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a 
+# copy of this software and associated documentation files (the "Software"), 
+# to deal in the Software without restriction, including without limitation 
+# the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+# and/or sell copies of the Software, and to permit persons to whom the 
+# Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in 
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+# DEALINGS IN THE SOFTWARE.
+
+package require Tcl 8.6
+
+namespace eval ::defer {
+	namespace export defer
+
+	variable idVar "<defer>\n<trace variable>"
+}
+
+proc ::defer::with {args} {
+	if {[llength $args] == 1} {
+		set varlist [list]
+		set code [lindex $args 0]
+	} elseif {[llength $args] == 2} {
+		set varlist [lindex $args 0]
+		set code [lindex $args 1]
+	} else {
+		return -code error "wrong # args: defer::with ?varlist? script"
+	}
+
+	if {[info level] == 1} {
+		set global true
+	} else {
+		set global false
+	}
+
+	# We can't reliably handle cleanup from the global scope, don't let people
+	# register ineffective handlers for now
+	if {$global} {
+		return -code error "defer may not be used from the global scope"
+	}
+
+	# Generate an ID to un-defer if requested
+	set id [clock clicks]
+	for {set i 0} {$i < 5} {incr i} {
+		append id [expr rand()]
+	}
+
+	# If a list of variable names has been supplied, slurp up their values
+	# and add the appropriate script to set those variables in the lambda
+	## Generate a list of commands to create the variables
+	foreach var $varlist {
+		if {![uplevel 1 [list info exists $var]]} {
+			continue
+		}
+
+		if {[uplevel 1 [list array exists $var]]} {
+			set val [uplevel 1 [list array get $var]]
+			lappend codeSetVars [list unset -nocomplain $var]
+			lappend codeSetVars [list array set $var $val]
+		} else {
+			set val [uplevel 1 [list set $var]]
+			lappend codeSetVars [list set $var $val]
+		}
+	}
+
+	## Format the above commands in the structure of a Tcl command
+	if {[info exists codeSetVars]} {
+		set codeSetVars [join $codeSetVars "; "]
+		set code "${codeSetVars}; ${code}"
+	}
+
+	## Unset the "args" variable, which is just an artifact of the lambda
+	set code "# ${id}\nunset args; ${code}"
+
+	# Register our interest in a variable to monitor for it to disappear
+
+	uplevel 1 [list trace add variable $::defer::idVar unset [list apply [list args $code]]]
+
+	return $id
+}
+
+proc ::defer::defer {args} {
+	set code $args
+	tailcall ::defer::with $code
+}
+
+proc ::defer::autowith {script} {
+	tailcall ::defer::with [uplevel 1 {info vars}] $script
+}
+
+proc ::defer::cancel {args} {
+	set idList $args
+
+	set traces [uplevel 1 [list trace info variable $::defer::idVar]]
+
+	foreach trace $traces {
+		set action [lindex $trace 0]
+		set code   [lindex $trace 1]
+
+		foreach id $idList {
+			if {[string match "*# $id*" $code]} {
+				uplevel 1 [list trace remove variable $::defer::idVar $action $code]
+			}
+		}
+	}
+}
+
+package provide defer 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/defer/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/defer/pkgIndex.tcl
new file mode 100644
index 00000000..98d7e519
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/defer/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package provide Tcl] 8.6]} {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded defer 1 [list source [file join $dir defer.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/des/des.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/des/des.tcl
new file mode 100644
index 00000000..a2d0bd32
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/des/des.tcl
@@ -0,0 +1,272 @@
+# des.tcl - Copyright (C) 2005 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# Tcllib wrapper for the DES package. This wrapper provides the same 
+# programming API that tcllib uses for AES and Blowfish. We require a
+# DES implementation and use either TclDES or TclDESjr to get DES 
+# and/or 3DES
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2
+
+if {[catch {package require tclDES 1.0.0}]} {
+    package require tclDESjr 1.0.0
+}
+
+namespace eval DES {
+    variable uid
+    if {![info exists uid]} { set uid 0 }
+}
+
+proc ::DES::Init {mode key iv {weak 0}} {
+    variable uid
+    set Key [namespace current]::[incr uid]
+    upvar #0 $Key state
+    if {[string length $key] % 8 != 0} {
+        return -code error "invalid key length of\
+             [expr {[string length $key] * 8}] bits:\
+             DES requires 64 bit keys (56 bits plus parity bits)"
+    }
+    array set state [list M $mode I $iv K [des::keyset create $key $weak]]
+    return $Key
+}
+
+proc ::DES::Encrypt {Key data} {
+    upvar #0 $Key state
+    set iv $state(I)
+    set r [des::encrypt $state(K) $data $state(M) iv]
+    set state(I) $iv
+    return $r
+}
+
+proc ::DES::Decrypt {Key data} {
+    upvar #0 $Key state
+    set iv $state(I)
+    set r [des::decrypt $state(K) $data $state(M) iv]
+    set state(I) $iv
+    return $r
+}
+
+proc ::DES::Reset {Key iv} {
+    upvar #0 $Key state
+    set state(I) $iv
+    return
+}
+
+proc ::DES::Final {Key} {
+    upvar #0 $Key state
+    des::keyset destroy $state(K)
+    # FRINK: nocheck
+    unset $Key
+}
+# -------------------------------------------------------------------------
+
+# Backwards compatability - here we re-implement the DES 0.8 procs using the
+# current implementation.
+#
+# -- DO NOT USE THESE FUNCTIONS IN NEW CODE--
+#
+proc ::DES::GetKey {mode keydata keyvarname} {
+    set weak 1
+    switch -exact -- $mode {
+        -encrypt    { set dir encrypt ; set vnc 0 }
+        -encryptVNC { set dir encrypt ; set vnc 1 }
+        -decrypt    { set dir decrypt ; set vnc 0 }
+        -decryptVNC { set dir decrypt ; set vnc 1 }
+        default {
+            return -code error "invalid mode \"$mode\":\
+                must be one of -encrypt, -decrypt, -encryptVNC or -decryptVNC"
+        }
+    }
+    if {$vnc} { set keydata [ReverseBytes $keydata] }
+    upvar $keyvarname Key
+    set Key [Init ecb $keydata [string repeat \0 8] $weak]
+    upvar $Key state
+    array set state [list dir $dir]
+    return
+}
+
+proc ::DES::DesBlock {data keyvarname} {
+    upvar $keyvarname Key
+    upvar #0 $Key state
+    if {[string equal $state(dir) "encrypt"]} {
+        set r [Encrypt $Key $data]
+    } else {
+        set r [Decrypt $Key $data]
+    }
+    return $r
+}
+
+proc ::DES::ReverseBytes {data} {
+    binary scan $data b* bin
+    return [binary format B* $bin]
+}
+
+# -------------------------------------------------------------------------
+
+proc ::DES::SetOneOf {lst item} {
+    set ndx [lsearch -glob $lst "${item}*"]
+    if {$ndx == -1} {
+        set err [join $lst ", "]
+        return -code error "invalid mode \"$item\": must be one of $err"
+    }
+    return [lindex $lst $ndx]
+}
+
+proc ::DES::CheckSize {what size thing} {
+    if {[string length $thing] != $size} {
+        return -code error "invalid value for $what: must be $size bytes long"
+    }
+    return $thing
+}
+
+proc ::DES::Pad {data blocksize {fill \0}} {
+    set len [string length $data]
+    if {$len == 0} {
+        set data [string repeat $fill $blocksize]
+    } elseif {($len % $blocksize) != 0} {
+        set pad [expr {$blocksize - ($len % $blocksize)}]
+        append data [string repeat $fill $pad]
+    }
+    return $data
+}
+
+proc ::DES::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+proc ::DES::Hex {data} {
+    binary scan $data H* r
+    return $r 
+}
+
+proc ::DES::des {args} {
+    array set opts {
+        -dir encrypt -mode cbc -key {} -in {} -out {} -chunksize 4096 -hex 0 -weak 0 old 0
+    }
+    set blocksize 8
+    set opts(-iv) [string repeat \0 $blocksize]
+    set modes {ecb cbc cfb ofb}
+    set dirs {encrypt decrypt}
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -exact -- $option {
+            -mode      { 
+                set M [Pop args 1]
+                if {[catch {set mode [SetOneOf $modes $M]} err]} {
+                    if {[catch {SetOneOf {encode decode} $M}]} {
+                        return -code error $err
+                    } else {
+                        # someone is using the old interface, therefore ecb
+                        set mode ecb
+                        set opts(-weak) 1
+                        set opts(old) 1
+                        set opts(-dir) [expr {[string match en* $M] ? "encrypt" : "decrypt"}]
+                    }
+                }
+                set opts(-mode) $mode
+            }
+            -dir       { set opts(-dir) [SetOneOf $dirs [Pop args 1]] }
+            -iv        { set opts(-iv) [Pop args 1] }
+            -key       { set opts(-key) [Pop args 1] }
+            -in        { set opts(-in) [Pop args 1] }
+            -out       { set opts(-out) [Pop args 1] }
+            -chunksize { set opts(-chunksize) [Pop args 1] }
+            -hex       { set opts(-hex) 1 }
+            -weak      { set opts(-weak) 1 }
+            --         { Pop args ; break }
+            default {
+                set err [join [lsort [array names opts -*]] ", "]
+                return -code error "bad option \"$option\":\
+                    must be one of $err"
+            }
+        }
+        Pop args
+    }
+
+    if {$opts(-key) == {}} {
+        return -code error "no key provided: the -key option is required"
+    }
+
+    # pad the key if backwards compat required
+    if {$opts(old)} {
+        set pad [expr {8 - ([string length $opts(-key)] % 8)}]
+        if {$pad != 8} {
+            append opts(-key) [string repeat \0 $pad]
+        }
+    }
+
+    set r {}
+    if {$opts(-in) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong \# args:\
+                should be \"des ?options...? -key keydata plaintext\""
+        }
+
+        set data [Pad [lindex $args 0] $blocksize]
+        set Key [Init $opts(-mode) $opts(-key) $opts(-iv) $opts(-weak)]
+        if {[string equal $opts(-dir) "encrypt"]} {
+            set r [Encrypt $Key $data]
+        } else {
+            set r [Decrypt $Key $data]
+        }
+
+        if {$opts(-out) != {}} {
+            puts -nonewline $opts(-out) $r
+            set r {}
+        }
+        Final $Key
+
+    } else {
+
+        if {[llength $args] != 0} {
+            return -code error "wrong \# args:\
+                should be \"des ?options...? -key keydata -in channel\""
+        }
+
+        set Key [Init $opts(-mode) $opts(-key) $opts(-iv) $opts(-weak)]
+        upvar $Key state
+        set state(reading) 1
+        if {[string equal $opts(-dir) "encrypt"]} {
+            set state(cmd) Encrypt
+        } else {
+            set state(cmd) Decrypt
+        }
+        set state(output) ""
+        fileevent $opts(-in) readable \
+            [list [namespace origin Chunk] \
+                 $Key $opts(-in) $opts(-out) $opts(-chunksize)]
+        if {[info commands ::tkwait] != {}} {
+            tkwait variable [subst $Key](reading)
+        } else {
+            vwait [subst $Key](reading)
+        }
+        if {$opts(-out) == {}} {
+            set r $state(output)
+        }
+        Final $Key
+
+    }
+
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+package provide des 1.1.0
+
+# -------------------------------------------------------------------------
+#
+# Local variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/des/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/des/pkgIndex.tcl
new file mode 100644
index 00000000..a620cb7f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/des/pkgIndex.tcl
@@ -0,0 +1,7 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded des 1.1.0 [list source [file join $dir des.tcl]]
+package ifneeded tclDES 1.0.0 [list source [file join $dir tcldes.tcl]]
+package ifneeded tclDESjr 1.0.0 [list source [file join $dir tcldesjr.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/des/tcldes.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/des/tcldes.tcl
new file mode 100644
index 00000000..4b57d5fc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/des/tcldes.tcl
@@ -0,0 +1,1089 @@
+# des.tcl
+# $Revision: 1.1 $
+# $Date: 2005/09/26 09:16:59 $
+#
+# Port of Javascript implementation to Tcl 8.4 by Mac A. Cody,
+# October, 2002 - February, 2003
+# August, 2003 - Separated key set generation from encryption/decryption.
+#                Renamed "des" procedure to "block" to differentiate from the
+#                "stream" procedure used for CFB and OFB modes.
+#                Modified the "encrypt" and "decrypt" procedures to support
+#                CFB and OFB modes. Changed the procedure arguments.
+#                Added the "stream" procedure to support CFB and OFB modes.
+# June, 2004 - Corrected input vector bug in stream-mode processing.  Added
+#              support for feedback vector storage and management function.
+#              This enables a stream of data to be processed over several calls
+#              to the encryptor or decryptor.
+# September, 2004 - Added feedback vector to the CBC mode of operation to allow
+#                   a large data set to be processed over several calls to the
+#                   encryptor or decryptor.
+# October, 2004 - Added test for weak keys in the createKeys procedure.
+#
+# Paul Tero, July 2001
+# http://www.shopable.co.uk/des.html
+#
+# Optimised for performance with large blocks by Michael Hayworth,
+# November 2001, http://www.netdealing.com
+#
+# This software is copyrighted (c) 2003, 2004 by Mac A. Cody.  All rights
+# reserved.  The following terms apply to all files associated with
+# the software unless explicitly disclaimed in individual files or
+# directories.
+
+# The authors hereby grant permission to use, copy, modify, distribute,
+# and license this software for any purpose, provided that existing
+# copyright notices are retained in all copies and that this notice is
+# included verbatim in any distributions. No written agreement, license,
+# or royalty fee is required for any of the authorized uses.
+# Modifications to this software may be copyrighted by their authors and
+# need not follow the licensing terms described here, provided that the
+# new terms are clearly indicated on the first page of each file where
+# they apply.
+
+# IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+# FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+# ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+# DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+# IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+# NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+# MODIFICATIONS.
+
+# GOVERNMENT USE: If you are acquiring this software on behalf of the
+# U.S. government, the Government shall have only "Restricted Rights"
+# in the software and related documentation as defined in the Federal 
+# Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+# are acquiring the software on behalf of the Department of Defense, the
+# software shall be classified as "Commercial Computer Software" and the
+# Government shall have only "Restricted Rights" as defined in Clause
+# 252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+# authors grant the U.S. Government and others acting in its behalf
+# permission to use and distribute the software in accordance with the
+# terms specified in this license. 
+namespace eval des {
+    variable keysets
+    variable WeakKeysError
+    if {![info exists WeakKeysError]} { set WeakKeysError 1 }
+    set keysets(ndx) 1
+    # Produre: keyset - Create or destroy a keyset created from a 64-bit
+    #                   DES key or a 192-bit 3DES key.
+    # Inputs:
+    #   oper  : The operation to be performed.  This will be either "create"
+    #           (make a new keyset) or "destroy" (delete an existing keyset).
+    #           The meaning of the argument "value" depends of the operation
+    #           performed.  An error is generated if "oper" is not "create"
+    #           or "destroy".
+    #             
+    #   value : If the argument "oper" is "create", then "value" is the 64-bit
+    #           DES key or the 192-bit 3DES key.  (Note: The lsb of each byte
+    #           is ignored; odd parity is not required).  If the argument
+    #           "oper" is "destroy", then "value" is a handle to a keyset that
+    #           was created previously.
+    #
+    #   weak:   If true then weak keys are allowed. The default is to raise an
+    #           error when a weak key is seen.
+    # Output:
+    #   If the argument "oper" is "create", then the output is a handle to the
+    #   keyset stored in the des namespace.  If the argument "oper" is
+    #   "destroy", then nothing is returned.
+    proc keyset {oper value {weak 0}} {
+	variable keysets
+	set newset {}
+	switch -exact -- $oper {
+	    create {
+		# Create a new keyset handle.
+		set newset keyset$keysets(ndx)
+		# Create key set
+		set keysets($newset) [createKeys $value $weak]
+		# Never use that keyset handle index again.
+		incr keysets(ndx)
+	    }
+	    destroy {
+		# Determine if the keyset handle is valid.
+		if {[array names keysets $value] != {}} {
+		    # Delete the handle and corresponding keyset.
+                    unset keysets($value)
+		} else {
+		    error "The keyset handle \"$value\" is invalid!"
+		}
+	    }
+	    default {
+		error {The operator must be either "create" or "destroy".}
+	    }
+	}
+	return $newset
+    }
+
+    # Procedure: encrypt - Encryption front-end for the des procedure
+    # Inputs:
+    #   keyset  : Handle to an existing keyset.
+    #   message : String to be encrypted.
+    #   mode    : DES mode ecb (default), cbc, cfb, or ofb.
+    #   iv      : Name of the initialization vector used in CBC, CFB,
+    #             and OFB modes.
+    #   kbits   : Number of bits in a data block (default of 64).
+    # Output:
+    #   The encrypted data string.
+    proc encrypt {keyset message {mode ecb} {iv {}} {kbits 64}} {
+	switch -exact -- $mode {
+	    ecb {
+		return [block $keyset $message 1 0]
+	    }
+	    cbc -
+	    ofb -
+	    cfb {
+		# Is the initialization/feedback vector variable is valid?
+		if {[string length $iv] == 0} {
+		    error "An initialization variable must be specified."
+		} else {
+		    upvar $iv ivec
+		    if {![info exists ivec]} {
+			error "The variable $iv does not exist."
+		    }
+		}
+		switch -exact -- $mode {
+		    cbc {
+			return [block $keyset $message 1 1 ivec]
+		    }
+		    ofb {
+			return [stream $keyset $message 1 0 ivec $kbits]
+		    }
+		    cfb {
+			return [stream $keyset $message 1 1 ivec $kbits]
+		    }
+		}
+	    }
+	    default {
+		error {Mode must be ecb, cbc, cfb, or ofb.}
+	    }
+	}
+    }
+
+    # Procedure: decrypt - Decryption front-end for the des procedure
+    # Inputs:
+    #   keyset  : Handle to an existing keyset.
+    #   message : String to be decrypted.
+    #   mode    : DES mode ecb (default), cbc, cfb, or ofb.
+    #   iv      : Name of the initialization vector used in CBC, CFB,
+    #             and OFB modes.
+    #   kbits   : Number of bits in a data block (default of 64).
+    # Output:
+    #   The encrypted or decrypted data string.
+    proc decrypt {keyset message {mode ecb} {iv {}} {kbits 64}} {
+	switch -exact -- $mode {
+	    ecb {
+		return [block $keyset $message 0 0]
+	    }
+	    cbc -
+	    ofb -
+	    cfb {
+		# Is the initialization/feedback vector variable is valid?
+		if {[string length $iv] < 1} {
+		    error "An initialization variable must be specified."
+		} else {
+		    upvar $iv ivec
+		    if {![info exists ivec]} {
+			error "The variable $iv does not exist."
+		    }
+		}
+		switch -exact -- $mode {
+		    cbc {
+			return [block $keyset $message 0 1 ivec]
+		    }
+		    ofb {
+			return [stream $keyset $message 0 0 ivec $kbits]
+		    }
+		    cfb {
+			return [stream $keyset $message 0 1 ivec $kbits]
+		    }
+		}
+	    }
+	    default {
+		error {Mode must be ecb, cbc, cfb, or ofb.}
+	    }
+	}
+    }
+
+    variable spfunction1 [list 0x1010400 0 0x10000 0x1010404 0x1010004 0x10404 0x4 0x10000 0x400 0x1010400 0x1010404 0x400 0x1000404 0x1010004 0x1000000 0x4 0x404 0x1000400 0x1000400 0x10400 0x10400 0x1010000 0x1010000 0x1000404 0x10004 0x1000004 0x1000004 0x10004 0 0x404 0x10404 0x1000000 0x10000 0x1010404 0x4 0x1010000 0x1010400 0x1000000 0x1000000 0x400 0x1010004 0x10000 0x10400 0x1000004 0x400 0x4 0x1000404 0x10404 0x1010404 0x10004 0x1010000 0x1000404 0x1000004 0x404 0x10404 0x1010400 0x404 0x1000400 0x1000400 0 0x10004 0x10400 0 0x1010004];
+    variable spfunction2 [list 0x80108020 0x80008000 0x8000 0x108020 0x100000 0x20 0x80100020 0x80008020 0x80000020 0x80108020 0x80108000 0x80000000 0x80008000 0x100000 0x20 0x80100020 0x108000 0x100020 0x80008020 0 0x80000000 0x8000 0x108020 0x80100000 0x100020 0x80000020 0 0x108000 0x8020 0x80108000 0x80100000 0x8020 0 0x108020 0x80100020 0x100000 0x80008020 0x80100000 0x80108000 0x8000 0x80100000 0x80008000 0x20 0x80108020 0x108020 0x20 0x8000 0x80000000 0x8020 0x80108000 0x100000 0x80000020 0x100020 0x80008020 0x80000020 0x100020 0x108000 0 0x80008000 0x8020 0x80000000 0x80100020 0x80108020 0x108000];
+    variable spfunction3 [list 0x208 0x8020200 0 0x8020008 0x8000200 0 0x20208 0x8000200 0x20008 0x8000008 0x8000008 0x20000 0x8020208 0x20008 0x8020000 0x208 0x8000000 0x8 0x8020200 0x200 0x20200 0x8020000 0x8020008 0x20208 0x8000208 0x20200 0x20000 0x8000208 0x8 0x8020208 0x200 0x8000000 0x8020200 0x8000000 0x20008 0x208 0x20000 0x8020200 0x8000200 0 0x200 0x20008 0x8020208 0x8000200 0x8000008 0x200 0 0x8020008 0x8000208 0x20000 0x8000000 0x8020208 0x8 0x20208 0x20200 0x8000008 0x8020000 0x8000208 0x208 0x8020000 0x20208 0x8 0x8020008 0x20200];
+    variable spfunction4 [list 0x802001 0x2081 0x2081 0x80 0x802080 0x800081 0x800001 0x2001 0 0x802000 0x802000 0x802081 0x81 0 0x800080 0x800001 0x1 0x2000 0x800000 0x802001 0x80 0x800000 0x2001 0x2080 0x800081 0x1 0x2080 0x800080 0x2000 0x802080 0x802081 0x81 0x800080 0x800001 0x802000 0x802081 0x81 0 0 0x802000 0x2080 0x800080 0x800081 0x1 0x802001 0x2081 0x2081 0x80 0x802081 0x81 0x1 0x2000 0x800001 0x2001 0x802080 0x800081 0x2001 0x2080 0x800000 0x802001 0x80 0x800000 0x2000 0x802080];
+    variable spfunction5 [list 0x100 0x2080100 0x2080000 0x42000100 0x80000 0x100 0x40000000 0x2080000 0x40080100 0x80000 0x2000100 0x40080100 0x42000100 0x42080000 0x80100 0x40000000 0x2000000 0x40080000 0x40080000 0 0x40000100 0x42080100 0x42080100 0x2000100 0x42080000 0x40000100 0 0x42000000 0x2080100 0x2000000 0x42000000 0x80100 0x80000 0x42000100 0x100 0x2000000 0x40000000 0x2080000 0x42000100 0x40080100 0x2000100 0x40000000 0x42080000 0x2080100 0x40080100 0x100 0x2000000 0x42080000 0x42080100 0x80100 0x42000000 0x42080100 0x2080000 0 0x40080000 0x42000000 0x80100 0x2000100 0x40000100 0x80000 0 0x40080000 0x2080100 0x40000100];
+    variable spfunction6 [list 0x20000010 0x20400000 0x4000 0x20404010 0x20400000 0x10 0x20404010 0x400000 0x20004000 0x404010 0x400000 0x20000010 0x400010 0x20004000 0x20000000 0x4010 0 0x400010 0x20004010 0x4000 0x404000 0x20004010 0x10 0x20400010 0x20400010 0 0x404010 0x20404000 0x4010 0x404000 0x20404000 0x20000000 0x20004000 0x10 0x20400010 0x404000 0x20404010 0x400000 0x4010 0x20000010 0x400000 0x20004000 0x20000000 0x4010 0x20000010 0x20404010 0x404000 0x20400000 0x404010 0x20404000 0 0x20400010 0x10 0x4000 0x20400000 0x404010 0x4000 0x400010 0x20004010 0 0x20404000 0x20000000 0x400010 0x20004010];
+    variable spfunction7 [list 0x200000 0x4200002 0x4000802 0 0x800 0x4000802 0x200802 0x4200800 0x4200802 0x200000 0 0x4000002 0x2 0x4000000 0x4200002 0x802 0x4000800 0x200802 0x200002 0x4000800 0x4000002 0x4200000 0x4200800 0x200002 0x4200000 0x800 0x802 0x4200802 0x200800 0x2 0x4000000 0x200800 0x4000000 0x200800 0x200000 0x4000802 0x4000802 0x4200002 0x4200002 0x2 0x200002 0x4000000 0x4000800 0x200000 0x4200800 0x802 0x200802 0x4200800 0x802 0x4000002 0x4200802 0x4200000 0x200800 0 0x2 0x4200802 0 0x200802 0x4200000 0x800 0x4000002 0x4000800 0x800 0x200002];
+    variable spfunction8 [list 0x10001040 0x1000 0x40000 0x10041040 0x10000000 0x10001040 0x40 0x10000000 0x40040 0x10040000 0x10041040 0x41000 0x10041000 0x41040 0x1000 0x40 0x10040000 0x10000040 0x10001000 0x1040 0x41000 0x40040 0x10040040 0x10041000 0x1040 0 0 0x10040040 0x10000040 0x10001000 0x41040 0x40000 0x41040 0x40000 0x10041000 0x1000 0x40 0x10040040 0x1000 0x41040 0x10001000 0x40 0x10000040 0x10040000 0x10040040 0x10000000 0x40000 0x10001040 0 0x10041040 0x40040 0x10000040 0x10040000 0x10001000 0x10001040 0 0x10041040 0x41000 0x41000 0x1040 0x1040 0x40040 0x10000000 0x10041000];
+
+    variable desEncrypt {0 32 2}
+    variable desDecrypt {30 -2 -2}
+    variable des3Encrypt {0 32 2 62 30 -2 64 96 2}
+    variable des3Decrypt {94 62 -2 32 64 2 30 -2 -2}
+
+    # Procedure: block - DES ECB and CBC mode support
+    # Inputs:
+    #   keyset   : Handle to an existing keyset.
+    #   message  : String to be encrypted or decrypted (Note: For encryption,
+    #              the string is extended with null characters to an integral
+    #              multiple of eight bytes.  For decryption, the string length
+    #              must be an integral multiple of eight bytes.
+    #   encrypt  : Perform encryption (1) or decryption (0)
+    #   mode     : DES mode 1=CBC, 0=ECB (default).
+    #   iv       : Name of the variable containing the initialization vector
+    #              used in CBC mode.  The value must be 64 bits in length.
+    # Output:
+    #   The encrypted or decrypted data string.
+    proc block {keyset message encrypt {mode 0} {iv {}}} {
+	variable spfunction1
+	variable spfunction2
+	variable spfunction3
+	variable spfunction4
+	variable spfunction5
+	variable spfunction6
+	variable spfunction7
+	variable spfunction8
+	variable desEncrypt
+	variable desDecrypt
+	variable des3Encrypt
+	variable des3Decrypt
+	variable keysets
+
+	# Determine if the keyset handle is valid.
+	if {[array names keysets $keyset] != {}} {
+	    # Acquire the 16 or 48 subkeys we will need
+	    set keys $keysets($keyset)
+	} else {
+	    error "The keyset handle \"$keyset\" is invalid!"
+	}
+	set m 0
+	set cbcleft 0x00; set cbcleft2 0x00
+	set cbcright 0x00; set cbcright2 0x00
+	set len [string length $message];
+        if {$len == 0} {
+            return -code error "invalid message size: the message may not be empty"
+        }
+	set chunk 0;
+	# Set up the loops for single and triple des
+	set iterations [expr {[llength $keys] == 32 ? 3 : 9}];
+	if {$iterations == 3} {
+	    expr {$encrypt ? [set looping $desEncrypt] : \
+		      [set looping $desDecrypt]}
+	} else {
+	    expr {$encrypt ? [set looping $des3Encrypt] : \
+		      [set looping $des3Decrypt]}
+	}
+
+	# Pad the message out with null bytes.
+	append message "\0\0\0\0\0\0\0\0"
+
+	# Store the result here
+	set result {};
+	set tempresult {};
+
+	# CBC mode
+	if {$mode == 1} {
+	    # Is the initialization/feedback vector variable is valid?
+	    if {[string length $iv] < 1} {
+		error "An initialization variable must be specified."
+	    } else {
+		upvar $iv ivec
+		if {![info exists ivec]} {
+		    error "The variable $iv does not exist."
+		}
+                if {[string length $ivec] != 8} {
+                    return -code error "invalid initialization vector size:\
+                        the initialization vector must be 8 bytes"
+                }
+	    }
+	    # Use the input vector as the intial vector.
+	    binary scan $ivec H8H8 cbcleftTemp cbcrightTemp
+	    set cbcleft "0x$cbcleftTemp"
+	    set cbcright "0x$cbcrightTemp"
+	}
+
+	# Loop through each 64 bit chunk of the message
+	while {$m < $len} {
+	    binary scan $message x${m}H8H8 lefttemp righttemp
+	    set left {}
+	    append left "0x" $lefttemp
+	    set right {}
+	    append right "0x" $righttemp
+	    incr m 8
+
+	    #puts "Left start: $left";
+	    #puts "Right start: $right";
+	    # For Cipher Block Chaining mode, xor the
+	    # message with the previous result.
+	    if {$mode == 1} {
+		if {$encrypt} {
+		    set left [expr {$left ^ $cbcleft}]
+		    set right [expr {$right ^ $cbcright}]
+		} else {
+		    set cbcleft2 $cbcleft;
+		    set cbcright2 $cbcright;
+		    set cbcleft $left;
+		    set cbcright $right;
+		}
+	    }
+
+	    #puts "Left mode: $left";
+	    #puts "Right mode: $right";
+	    #puts "cbcleft: $cbcleft";
+	    #puts "cbcleft2: $cbcleft2";
+	    #puts "cbcright: $cbcright";
+	    #puts "cbcright2: $cbcright2";
+
+	    # First each 64 but chunk of the message
+	    # must be permuted according to IP.
+	    set temp [expr {(($left >> 4) ^ $right) & 0x0f0f0f0f}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 4)}];
+	    set temp [expr {(($left >> 16) ^ $right) & 0x0000ffff}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 16)}];
+	    set temp [expr {(($right >> 2) ^ $left) & 0x33333333}];
+	    set left [expr {$left ^ $temp}]
+	    set right [expr {$right ^ ($temp << 2)}];
+
+	    set temp [expr {(($right >> 8) ^ $left) & 0x00ff00ff}];
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 8)}];
+	    set temp [expr {(($left >> 1) ^ $right) & 0x55555555}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 1)}];
+
+	    set left [expr {((($left << 1) & 0xffffffff) | \
+				 (($left >> 31) & 0x00000001))}]; 
+	    set right [expr {((($right << 1) & 0xffffffff) | \
+				  (($right >> 31) & 0x00000001))}]; 
+
+	    #puts "Left IP: [format %x $left]";
+	    #puts "Right IP: [format %x $right]";
+
+	    # Do this either 1 or 3 times for each chunk of the message
+	    for {set j 0} {$j < $iterations} {incr j 3} {
+		set endloop [lindex $looping [expr {$j + 1}]];
+		set loopinc [lindex $looping [expr {$j + 2}]];
+
+		#puts "endloop: $endloop";
+		#puts "loopinc: $loopinc";
+
+		# Now go through and perform the encryption or decryption  
+		for {set i [lindex $looping $j]} \
+		    {$i != $endloop} {incr i $loopinc} {
+		    # For efficiency
+		    set right1 [expr {$right ^ [lindex $keys $i]}]; 
+		    set right2 [expr {((($right >> 4) & 0x0fffffff) | \
+					   (($right << 28) & 0xffffffff)) ^ \
+					  [lindex $keys [expr {$i + 1}]]}];
+ 
+		    # puts "right1: [format %x $right1]";
+		    # puts "right2: [format %x $right2]";
+
+		    # The result is attained by passing these
+		    # bytes through the S selection functions.
+		    set temp $left;
+		    set left $right;
+		    set right [expr {$temp ^ ([lindex $spfunction2 [expr {($right1 >> 24) & 0x3f}]] | \
+                                                  [lindex $spfunction4 [expr {($right1 >> 16) & 0x3f}]] | \
+                                                  [lindex $spfunction6 [expr {($right1 >>  8) & 0x3f}]] | \
+                                                  [lindex $spfunction8 [expr {$right1 & 0x3f}]] | \
+                                                  [lindex $spfunction1 [expr {($right2 >> 24) & 0x3f}]] | \
+                                                  [lindex $spfunction3 [expr {($right2 >> 16) & 0x3f}]] | \
+                                                  [lindex $spfunction5 [expr {($right2 >>  8) & 0x3f}]] | \
+						  [lindex $spfunction7 [expr {$right2 & 0x3f}]])}];
+ 
+		    # puts "Left iter: [format %x $left]";
+		    # puts "Right iter: [format %x $right]";
+
+		}
+		set temp $left;
+		set left $right;
+		set right $temp; # Unreverse left and right
+	    }; # For either 1 or 3 iterations
+
+	    #puts "Left Iterated: [format %x $left]";
+	    #puts "Right Iterated: [format %x $right]";
+
+	    # Move then each one bit to the right
+	    set left [expr {((($left >> 1) & 0x7fffffff) \
+				 | (($left << 31) & 0xffffffff))}]; 
+	    set right [expr {((($right >> 1) & 0x7fffffff) \
+				  | (($right << 31) & 0xffffffff))}]; 
+
+	    #puts "Left shifted: [format %x $left]";
+	    #puts "Right shifted: [format %x $right]";
+
+	    # Now perform IP-1, which is IP in the opposite direction
+	    set temp [expr {((($left >> 1) & 0x7fffffff) ^ $right) & 0x55555555}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 1)}];
+	    set temp [expr {((($right >> 8) & 0x00ffffff) ^ $left) & 0x00ff00ff}];
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 8)}];
+	    set temp [expr {((($right >> 2) & 0x3fffffff) ^ $left) & 0x33333333}]; 
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 2)}];
+	    set temp [expr {((($left >> 16) & 0x0000ffff) ^ $right) & 0x0000ffff}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 16)}];
+	    set temp [expr {((($left >> 4) & 0x0fffffff) ^ $right) & 0x0f0f0f0f}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 4)}];
+
+	    #puts "Left IP-1: [format %x $left]";
+	    #puts "Right IP-1: [format %x $right]";
+
+	    # For Cipher Block Chaining mode, xor
+	    # the message with the previous result.
+	    if {$mode == 1} {
+		if {$encrypt} {
+		    set cbcleft $left;
+		    set cbcright $right;
+		} else {
+		    set left [expr {$left ^ $cbcleft2}];
+		    set right [expr {$right ^ $cbcright2}];
+		}
+	    }
+
+	    append tempresult \
+		[binary format H16 [format %08x%08x $left $right]]
+
+	    #puts "Left final: [format %x $left]";
+	    #puts "Right final: [format %x $right]";
+
+	    incr chunk 8;
+	    if {$chunk == 512} {
+		append result $tempresult
+		set tempresult {};
+		set chunk 0;
+	    }
+	}; # For every 8 characters, or 64 bits in the message
+
+	if {$mode == 1} {
+	    if {$encrypt} {
+		# Save the left and right registers to the feedback vector.
+		set ivec [binary format H* \
+			      [format %08x $left][format %08x $right]]
+	    } else {
+		set ivec [binary format H* \
+			      [format %08x $cbcleft][format %08x $cbcright]]
+	    }
+	}
+
+	# Return the result as an array
+	return ${result}$tempresult
+    }; # End of block
+
+    # Procedure: stream - DES CFB and OFB mode support
+    # Inputs:
+    #   keyset   : Handle to an existing keyset.
+    #   message  : String to be encrypted or decrypted (Note: The length of the
+    #              string is dependent upon the value of kbits.  Remember that
+    #              the string is part of a stream of data, so it must be sized
+    #              properly for subsequent encryptions/decryptions to be
+    #              correct.  See the man page for correct message lengths for
+    #              values of kbits).
+    #   encrypt  : Perform encryption (1) or decryption (0)
+    #   mode     : DES mode 0=OFB, 1=CFB.
+    #   iv       : Name of variable containing the initialization vector.  The
+    #              value must be 64 bits in length with the first 64-L bits set
+    #              to zero.
+    #   kbits    : Number of bits in a data block (default of 64).
+    # Output:
+    #   The encrypted or decrypted data string.
+    proc stream {keyset message encrypt mode iv {kbits 64}} {
+	variable spfunction1
+	variable spfunction2
+	variable spfunction3
+	variable spfunction4
+	variable spfunction5
+	variable spfunction6
+	variable spfunction7
+	variable spfunction8
+	variable desEncrypt
+	variable des3Encrypt
+	variable keysets
+
+	# Determine if the keyset handle is valid.
+	if {[array names keysets $keyset] != {}} {
+	    # Acquire the 16 or 48 subkeys we will need.
+	    set keys $keysets($keyset)
+	} else {
+	    error "The keyset handle \"$keyset\" is invalid!"
+	}
+
+	# Is the initialization/feedback vector variable is valid?
+	if {[string length $iv] < 1} {
+	    error "An initialization variable must be specified."
+	} else {
+	    upvar $iv ivec
+	    if {![info exists ivec]} {
+		error "The variable $iv does not exist."
+	    }
+	}
+
+        # Determine if message length (in bits)
+	# is not an integral number of kbits.
+	set len [string length $message];
+        #puts "len: $len, kbits: $kbits"
+	if {($kbits < 1) || ($kbits > 64)} {
+	    error "The valid values of kbits are 1 through 64."
+        } elseif {($kbits % 8) != 0} {
+	    set blockSize [expr {$kbits + (8 - ($kbits % 8))}]
+	    set fail [expr {(($len * 8) / $blockSize) % $kbits}]
+	} else {
+	    set blockSize [expr {$kbits / 8}]
+	    set fail [expr {$len % $blockSize}]
+	}
+        if {$fail} {
+	    error "Data length (in bits) is not an integral number of kbits."
+	}
+
+	set m 0
+	set n 0
+	set chunk 0;
+	# Set up the loops for single and triple des
+	set iterations [expr {[llength $keys] == 32 ? 3 : 9}];
+	if {$iterations == 3} {
+	    set looping $desEncrypt
+	} else {
+	    set looping $des3Encrypt
+	}
+
+        # Set up shifting values.  Used for both CFB and OFB modes.
+        if {$kbits < 32} {
+	    # Only some bits from left output are needed.
+	    set kOutShift [expr {32 - $kbits}]
+	    set kOutMask [expr {0x7fffffff >> (31 - $kbits)}]
+	    # Determine number of message bytes needed per iteration.
+	    set msgBytes [expr {int(ceil(double($kbits) / 8.0))}]
+	    # Determine number of message bits needed per iteration.
+	    set msgBits [expr {$msgBytes * 8}]
+	    set msgBitsSub1 [expr {$msgBits - 1}]
+	    # Define bit caches.
+	    set bitCacheIn {}
+	    set bitCacheOut {}
+	    # Variable used to remove bits 0 through
+	    # kbits-1 in the input bit cache.
+	    set kbitsSub1 [expr {$kbits - 1}]
+	    # Variable used to remove leading dummy binary bits.
+	    set xbits [expr {32 - $kbits}]
+	} elseif {$kbits == 32} {
+	    # Only bits of left output are used.
+	    # Four messages bytes are needed per iteration.
+	    set msgBytes 4
+	    set xbits 32
+	} elseif {$kbits < 64} {
+	    # All bits from left output are needed.
+	    set kOutShiftLeft [expr {$kbits - 32}]
+	    # Some bits from right output are needed.
+	    set kOutShiftRight [expr {64 - $kbits}]
+	    set kOutMaskRight [expr {0x7fffffff >> (63 - $kbits)}]
+	    # Determine number of message bytes needed per iteration.
+	    set msgBytes [expr {int(ceil(double($kbits) / 8.0))}]
+	    # Determine number of message bits needed per iteration.
+	    set msgBits [expr {$msgBytes * 8}]
+	    set msgBitsSub1 [expr {$msgBits - 1}]
+	    # Define bit caches.
+	    set bitCacheIn {}
+	    set bitCacheOut {}
+	    # Variable used to remove bits 0 through
+	    # kbits-1 in the input bit cache.
+	    set kbitsSub1 [expr {$kbits - 1}]
+	    # Variable used to remove leading dummy binary bits.
+	    set xbits [expr {64 - $kbits}]
+	} else {
+	    # All 64 bits of output are used.
+	    # Eight messages bytes are needed per iteration.
+	    set msgBytes 8
+	    set xbits 0
+	}
+
+	# Store the result here
+	set result {}
+	set tempresult {}
+
+	# Set up the initialization vector bitstream
+	binary scan $ivec H8H8 leftTemp rightTemp
+	set left "0x$leftTemp"
+	set right "0x$rightTemp"
+        #puts "Retrieved Feedback vector: $fbvec"
+        #puts "Start: |$left| |$right|"
+	
+	# Loop through each 64 bit chunk of the message
+	while {$m < $len} {
+	    # puts "Left start: $left";
+	    # puts "Right start: $right";
+
+	    # First each 64 but chunk of the
+	    # message must be permuted according to IP.
+	    set temp [expr {(($left >> 4) ^ $right) & 0x0f0f0f0f}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 4)}];
+	    set temp [expr {(($left >> 16) ^ $right) & 0x0000ffff}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 16)}];
+	    set temp [expr {(($right >> 2) ^ $left) & 0x33333333}];
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 2)}];
+
+	    set temp [expr {(($right >> 8) ^ $left) & 0x00ff00ff}];
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 8)}];
+	    set temp [expr {(($left >> 1) ^ $right) & 0x55555555}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 1)}];
+
+	    set left [expr {((($left << 1) & 0xffffffff) | \
+				 (($left >> 31) & 0x00000001))}]; 
+	    set right [expr {((($right << 1) & 0xffffffff) | \
+				  (($right >> 31) & 0x00000001))}]; 
+
+	    #puts "Left IP: [format %x $left]";
+	    #puts "Right IP: [format %x $right]";
+
+	    # Do this either 1 or 3 times for each chunk of the message
+	    for {set j 0} {$j < $iterations} {incr j 3} {
+		set endloop [lindex $looping [expr {$j + 1}]];
+		set loopinc [lindex $looping [expr {$j + 2}]];
+
+		#puts "endloop: $endloop";
+		#puts "loopinc: $loopinc";
+
+		# Now go through and perform the encryption or decryption  
+		for {set i [lindex $looping $j]} \
+		    {$i != $endloop} {incr i $loopinc} {
+		    # For efficiency
+		    set right1 [expr {$right ^ [lindex $keys $i]}]; 
+		    set right2 [expr {((($right >> 4) & 0x0fffffff) | \
+					   (($right << 28) & 0xffffffff)) ^ \
+					  [lindex $keys [expr {$i + 1}]]}];
+ 
+		    # puts "right1: [format %x $right1]";
+		    # puts "right2: [format %x $right2]";
+
+		    # The result is attained by passing these
+		    # bytes through the S selection functions.
+		    set temp $left;
+		    set left $right;
+		    set right [expr {$temp ^ ([lindex $spfunction2 [expr {($right1 >> 24) & 0x3f}]] | \
+						  [lindex $spfunction4 [expr {($right1 >> 16) & 0x3f}]] | \
+						  [lindex $spfunction6 [expr {($right1 >>  8) & 0x3f}]] | \
+						  [lindex $spfunction8 [expr {$right1 & 0x3f}]] | \
+						  [lindex $spfunction1 [expr {($right2 >> 24) & 0x3f}]] | \
+						  [lindex $spfunction3 [expr {($right2 >> 16) & 0x3f}]] | \
+						  [lindex $spfunction5 [expr {($right2 >>  8) & 0x3f}]] | \
+						  [lindex $spfunction7 [expr {$right2 & 0x3f}]])}];
+ 
+		    # puts "Left iter: [format %x $left]";
+		    # puts "Right iter: [format %x $right]";
+
+		}
+		set temp $left;
+		set left $right;
+		set right $temp; # Unreverse left and right
+	    }; # For either 1 or 3 iterations
+
+	    #puts "Left Iterated: [format %x $left]";
+	    #puts "Right Iterated: [format %x $right]";
+
+	    # Move then each one bit to the right
+	    set left [expr {((($left >> 1) & 0x7fffffff) | \
+				 (($left << 31) & 0xffffffff))}]; 
+	    set right [expr {((($right >> 1) & 0x7fffffff) | \
+				  (($right << 31) & 0xffffffff))}]; 
+
+	    #puts "Left shifted: [format %x $left]";
+	    #puts "Right shifted: [format %x $right]";
+
+	    # Now perform IP-1, which is IP in the opposite direction
+	    set temp [expr {((($left >> 1) & 0x7fffffff) ^ $right) & 0x55555555}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 1)}];
+	    set temp [expr {((($right >> 8) & 0x00ffffff) ^ $left) & 0x00ff00ff}];
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 8)}];
+	    set temp [expr {((($right >> 2) & 0x3fffffff) ^ $left) & 0x33333333}]; 
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 2)}];
+	    set temp [expr {((($left >> 16) & 0x0000ffff) ^ $right) & 0x0000ffff}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 16)}];
+	    set temp [expr {((($left >> 4) & 0x0fffffff) ^ $right) & 0x0f0f0f0f}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 4)}];
+
+	    #puts "Left IP-1: [format %x $left]";
+	    #puts "Right IP-1: [format %x $right]";
+
+	    # Extract the "kbits" most significant bits from the output block.
+	    if {$kbits < 32} {
+		# Only some bits from left output are needed.
+		set kData [expr {($left >> $kOutShift) & $kOutMask}]
+		set newBits {}
+		# If necessary, copy message bytes into input bit cache.
+		if {([string length $bitCacheIn] < $kbits) && ($n < $len)} {
+		    if {$len - $n < $msgBytes} {
+			set lastBits [expr {($len - $n) * 8}]
+			###puts -nonewline [binary scan $message x${n}B$lastBits newBits]
+			binary scan $message x${n}B$lastBits newBits
+		    } else {
+			# Extract "msgBytes" whole bytes as bits
+			###puts -nonewline [binary scan $message x${n}B$msgBits newBits]
+			binary scan $message x${n}B$msgBits newBits
+		    }
+		    incr n $msgBytes
+		    #puts " $newBits  $n [expr {$len - $n}]"
+		    # Add the bits to the input bit cache.
+		    append bitCacheIn $newBits
+		}
+		#puts -nonewline "In bit cache: $bitCacheIn"
+		# Set up message data from input bit cache.
+		binary scan [binary format B32 [format %032s [string range $bitCacheIn 0 $kbitsSub1]]] H8 temp
+		set msgData "0x$temp"
+		# Mix message bits with crypto bits.
+		set mixData [expr {$msgData ^ $kData}]
+		# Discard collected bits from the input bit cache.
+		set bitCacheIn [string range $bitCacheIn $kbits end]
+		#puts "  After: $bitCacheIn"
+		# Convert back to a bit stream and append to the output bit cache.
+		# Only the lower kbits are wanted.
+		binary scan [binary format H8 [format %08x $mixData]] B32 msgOut
+		append bitCacheOut [string range $msgOut $xbits end]
+		#puts -nonewline "Out bit cache: $bitCacheOut"
+		# If there are sufficient bits, move bytes to the temporary holding string.
+		if {[string length $bitCacheOut] >= $msgBits} {
+		    append tempresult [binary format B$msgBits [string range $bitCacheOut 0 $msgBitsSub1]]
+		    set bitCacheOut [string range $bitCacheOut $msgBits end]
+                    #puts -nonewline "  After: $bitCacheOut"
+		    incr m $msgBytes
+		    ###puts "$m bytes output"
+		    incr chunk $msgBytes
+		}
+		#puts ""
+		# For CFB mode
+		if {$mode == 1} {
+		    if {$encrypt} {
+			set temp [expr {($right << $kbits) & 0xffffffff}]
+			set left [expr {(($left << $kbits) & 0xffffffff) | (($right >> $kOutShift) & $kOutMask)}]
+			set right [expr {$temp | $mixData}]
+		    } else {
+			set temp [expr {($right << $kbits) & 0xffffffff}]
+			set left [expr {(($left << $kbits) & 0xffffffff) | (($right >> $kOutShift) & $kOutMask)}]
+			set right [expr {$temp | $msgData}]
+		    }
+		}
+	    } elseif {$kbits == 32} {
+		# Only bits of left output are used.
+		set kData $left
+		# Four messages bytes are needed per iteration.
+		binary scan $message x${m}H8 temp
+		incr m 4
+		incr chunk 4
+		set msgData "0x$temp"
+		# Mix message bits with crypto bits.
+		set mixData [expr {$msgData ^ $kData}]
+		# Move bytes to the temporary holding string.
+		append tempresult [binary format H8 [format %08x $mixData]]
+		# For CFB mode
+		if {$mode == 1} {
+		    set left $right
+		    if {$encrypt} {
+			set right $mixData
+		    } else {
+			set right $msgData
+		    }
+		}
+	    } elseif {$kbits < 64} {
+		set kDataLeft [expr {($left >> $kOutShiftRight) & $kOutMaskRight}]
+		set temp [expr {($left << $kOutShiftLeft) & 0xffffffff}]
+		set kDataRight [expr {(($right >> $kOutShiftRight) & $kOutMaskRight) | $temp}]
+		# If necessary, copy message bytes into input bit cache.
+		if {([string length $bitCacheIn] < $kbits)  && ($n < $len)} {
+		    if {$len - $n < $msgBytes} {
+			set lastBits [expr {($len - $n) * 8}]
+			###puts -nonewline [binary scan $message x${n}B$lastBits newBits]
+			binary scan $message x${n}B$lastBits newBits
+		    } else {
+			# Extract "msgBytes" whole bytes as bits
+			###puts -nonewline [binary scan $message x${n}B$msgBits newBits]
+			binary scan $message x${n}B$msgBits newBits
+		    }
+		    incr n $msgBytes
+		    # Add the bits to the input bit cache.
+		    append bitCacheIn $newBits
+		}
+		# Set up message data from input bit cache.
+		# puts "Bits from cache: [set temp [string range $bitCacheIn 0 $kbitsSub1]]"
+		# puts "Length of bit string: [string length $temp]"
+		binary scan [binary format B64 [format %064s [string range $bitCacheIn 0 $kbitsSub1]]] H8H8 leftTemp rightTemp
+		set msgDataLeft "0x$leftTemp"
+		set msgDataRight "0x$rightTemp"
+		# puts "msgDataLeft: $msgDataLeft"
+		# puts "msgDataRight: $msgDataRight"
+		# puts "kDataLeft: [format 0x%08x $kDataLeft]"
+		# puts "kDataRight: [format 0x%08x $kDataRight]"
+		# Mix message bits with crypto bits.
+		set mixDataLeft [expr {$msgDataLeft ^ $kDataLeft}]
+		set mixDataRight [expr {$msgDataRight ^ $kDataRight}]
+		# puts "mixDataLeft: $mixDataLeft"
+		# puts "mixDataRight: $mixDataRight"
+		# puts "mixDataLeft: [format 0x%08x $mixDataLeft]"
+		# puts "mixDataRight: [format 0x%08x $mixDataRight]"
+		# Discard collected bits from the input bit cache.
+		set bitCacheIn [string range $bitCacheIn $kbits end]
+		# Convert back to a bit stream and
+		# append to the output bit cache.
+		# Only the lower kbits are wanted.
+		binary scan \
+		    [binary format H8H8 \
+			 [format %08x $mixDataLeft] \
+			 [format %08x $mixDataRight]] B64 msgOut
+		append bitCacheOut [string range $msgOut $xbits end]
+		# If there are sufficient bits, move
+		# bytes to the temporary holding string.
+		if {[string length $bitCacheOut] >= $msgBits} {
+		    append tempresult \
+			[binary format B$msgBits \
+			     [string range $bitCacheOut 0 $msgBitsSub1]]
+		    set bitCacheOut [string range $bitCacheOut $msgBits end]
+		    incr m $msgBytes
+		    incr chunk $msgBytes
+		}
+		# For CFB mode
+		if {$mode == 1} {
+		    if {$encrypt} {
+			set temp \
+			    [expr {($right << $kOutShiftRight) & 0xffffffff}]
+			set left [expr {$temp | $mixDataLeft}]
+			set right $mixDataRight
+		    } else {
+			set temp \
+			    [expr {($right << $kOutShiftRight) & 0xffffffff}]
+			set left [expr {$temp | $msgDataLeft}]
+			set right $msgDataRight
+		    }
+		}
+	    } else {
+		# All 64 bits of output are used.
+		set kDataLeft $left
+		set kDataRight $right
+		# Eight messages bytes are needed per iteration.
+		binary scan $message x${m}H8H8 leftTemp rightTemp
+		incr m 8
+		incr chunk 8
+		set msgDataLeft "0x$leftTemp"
+		set msgDataRight "0x$rightTemp"
+		# Mix message bits with crypto bits.
+		set mixDataLeft [expr {$msgDataLeft ^ $kDataLeft}]
+		set mixDataRight [expr {$msgDataRight ^ $kDataRight}]
+		# Move bytes to the temporary holding string.
+		append tempresult \
+		    [binary format H16 \
+			 [format %08x%08x $mixDataLeft $mixDataRight]]
+		# For CFB mode
+		if {$mode == 1} {
+		    if {$encrypt} {
+			set left $mixDataLeft
+			set right $mixDataRight
+		    } else {
+			set left $msgDataLeft
+			set right $msgDataRight
+		    }
+		}
+	    }
+
+	    #puts "Left final: [format %x $left]";
+	    #puts "Right final: [format %x $right]";
+
+	    if {$chunk >= 512} {
+		append result $tempresult
+		set tempresult {};
+		set chunk 0;
+	    }
+	}; # For every 8 characters, or 64 bits in the message
+        #puts "End: |[format 0x%08x $left]| |[format 0x%08x $right]|"
+	# Save the left and right registers to the feedback vector.
+	set ivec [binary format H* [format %08x $left][format %08x $right]]
+	#puts "Saved Feedback vector: $fbvectors($fbvector)"
+
+        append result $tempresult
+	if {[string length $result] > $len} {
+	    set result [string replace $result $len end]
+	}
+	# Return the result as an array
+	return $result
+    }; # End of stream
+
+    variable pc2bytes0 [list 0 0x4 0x20000000 0x20000004 0x10000 0x10004 0x20010000 0x20010004 0x200 0x204 0x20000200 0x20000204 0x10200 0x10204 0x20010200 0x20010204]
+    variable pc2bytes1 [list 0 0x1 0x100000 0x100001 0x4000000 0x4000001 0x4100000 0x4100001 0x100 0x101 0x100100 0x100101 0x4000100 0x4000101 0x4100100 0x4100101]
+    variable pc2bytes2 [list 0 0x8 0x800 0x808 0x1000000 0x1000008 0x1000800 0x1000808 0 0x8 0x800 0x808 0x1000000 0x1000008 0x1000800 0x1000808]
+    variable pc2bytes3 [list 0 0x200000 0x8000000 0x8200000 0x2000 0x202000 0x8002000 0x8202000 0x20000 0x220000 0x8020000 0x8220000 0x22000 0x222000 0x8022000 0x8222000]
+    variable pc2bytes4 [list 0 0x40000 0x10 0x40010 0 0x40000 0x10 0x40010 0x1000 0x41000 0x1010 0x41010 0x1000 0x41000 0x1010 0x41010]
+    variable pc2bytes5 [list 0 0x400 0x20 0x420 0 0x400 0x20 0x420 0x2000000 0x2000400 0x2000020 0x2000420 0x2000000 0x2000400 0x2000020 0x2000420]
+    variable pc2bytes6 [list 0 0x10000000 0x80000 0x10080000 0x2 0x10000002 0x80002 0x10080002 0 0x10000000 0x80000 0x10080000 0x2 0x10000002 0x80002 0x10080002]
+    variable pc2bytes7 [list 0 0x10000 0x800 0x10800 0x20000000 0x20010000 0x20000800 0x20010800 0x20000 0x30000 0x20800 0x30800 0x20020000 0x20030000 0x20020800 0x20030800]
+    variable pc2bytes8 [list 0 0x40000 0 0x40000 0x2 0x40002 0x2 0x40002 0x2000000 0x2040000 0x2000000 0x2040000 0x2000002 0x2040002 0x2000002 0x2040002]
+    variable pc2bytes9 [list 0 0x10000000 0x8 0x10000008 0 0x10000000 0x8 0x10000008 0x400 0x10000400 0x408 0x10000408 0x400 0x10000400 0x408 0x10000408]
+    variable pc2bytes10 [list 0 0x20 0 0x20 0x100000 0x100020 0x100000 0x100020 0x2000 0x2020 0x2000 0x2020 0x102000 0x102020 0x102000 0x102020]
+    variable pc2bytes11 [list 0 0x1000000 0x200 0x1000200 0x200000 0x1200000 0x200200 0x1200200 0x4000000 0x5000000 0x4000200 0x5000200 0x4200000 0x5200000 0x4200200 0x5200200]
+    variable pc2bytes12 [list 0 0x1000 0x8000000 0x8001000 0x80000 0x81000 0x8080000 0x8081000 0x10 0x1010 0x8000010 0x8001010 0x80010 0x81010 0x8080010 0x8081010]
+    variable pc2bytes13 [list 0 0x4 0x100 0x104 0 0x4 0x100 0x104 0x1 0x5 0x101 0x105 0x1 0x5 0x101 0x105]
+
+    # Now define the left shifts which need to be done
+    variable shifts {0  0  1  1  1  1  1  1  0  1  1  1  1  1  1  0};
+
+    # Procedure: createKeys
+    # Input:
+    #   key     : The 64-bit DES key or the 192-bit 3DES key
+    #             (Note: The lsb of each byte is ignored; odd parity
+    #             is not required).
+    #
+    #   weak:   If true then weak keys are allowed. The default is to raise an
+    #           error when a weak key is seen.
+    # Output:
+    # The 16 (DES) or 48 (3DES) subkeys.
+    proc createKeys {key {weak 0}} {
+	variable pc2bytes0
+	variable pc2bytes1
+	variable pc2bytes2
+	variable pc2bytes3
+	variable pc2bytes4
+	variable pc2bytes5
+	variable pc2bytes6
+	variable pc2bytes7
+	variable pc2bytes8
+	variable pc2bytes9
+	variable pc2bytes10
+	variable pc2bytes11
+	variable pc2bytes12
+	variable pc2bytes13
+	variable shifts
+
+	# How many iterations (1 for des, 3 for triple des)
+	set iterations [expr {([string length $key] >= 24) ? 3 : 1}];
+	# Stores the return keys
+	set keys {}
+	# Other variables
+	set lefttemp {}; set righttemp {}
+	set m 0
+	# Either 1 or 3 iterations
+	for {set j 0} {$j < $iterations} {incr j} {
+	    binary scan $key x${m}H8H8 lefttemp righttemp
+	    set left {}
+	    append left "0x" $lefttemp
+	    set right {}
+	    append right "0x" $righttemp
+	    incr m 8
+
+	    #puts "Left key: $left"
+	    #puts "Right key: $right"
+
+	    # Test for weak keys
+            if {! $weak} {
+                set maskedLeft [expr {$left & 0xfefefefe}]
+                set maskedRight [expr {$right & 0xfefefefe}]
+                if {($maskedLeft == 0x00000000) \
+                        && ($maskedRight == 0x00000000)} {
+                    error "Key [expr {$j + 1}] is weak!"
+                } elseif {($maskedLeft == 0x1e1e1e1e) \
+                              && ($maskedRight == 0x0e0e0e0e)} {
+                    error "Key [expr {$j + 1}] is weak!"
+                } elseif {($maskedLeft == 0xe0e0e0e0) \
+                              && ($maskedRight == 0xf0f0f0f0)} {
+                    error "Key [expr {$j + 1}] is weak!"
+                } elseif {($maskedLeft == 0xfefefefe) \
+                              && ($maskedRight == 0xfefefefe)} {
+                    error "Key [expr {$j + 1}] is weak!"
+                }
+            }
+
+	    set temp [expr {(($left >> 4) ^ $right) & 0x0f0f0f0f}]
+	    set right [expr {$right ^ $temp}]
+	    set left [expr {$left ^ ($temp << 4)}]
+	    set temp [expr {(($right >> 16) ^ $left) & 0x0000ffff}]
+	    set left [expr {$left ^ $temp}]
+	    set right [expr {$right ^ ($temp << 16)}]
+	    set temp [expr {(($left >> 2) ^ $right) & 0x33333333}]
+	    set right [expr {$right ^ $temp}]
+	    set left [expr {$left ^ ($temp << 2)}]
+	    set temp [expr {(($right >> 16) ^ $left) & 0x0000ffff}]
+	    set left [expr {$left ^ $temp}]
+	    set right [expr {$right ^ ($temp << 16)}]
+	    set temp [expr {(($left >> 1) ^ $right) & 0x55555555}]
+	    set right [expr {$right ^ $temp}]
+	    set left [expr {$left ^ ($temp << 1)}]
+	    set temp [expr {(($right >> 8) ^ $left) & 0x00ff00ff}]
+	    set left [expr {$left ^ $temp}]
+	    set right [expr {$right ^ ($temp << 8)}]
+	    set temp [expr {(($left >> 1) ^ $right) & 0x55555555}]
+	    set right [expr {$right ^ $temp}]
+	    set left [expr {$left ^ ($temp << 1)}]
+	    
+	    #puts "Left key PC1: [format %x $left]"
+	    #puts "Right key PC1: [format %x $right]"
+
+	    # The right side needs to be shifted and to get
+	    # the last four bits of the left side
+	    set temp [expr {($left << 8) | (($right >> 20) & 0x000000f0)}];
+	    # Left needs to be put upside down
+	    set left [expr {($right << 24) | (($right << 8) & 0x00ff0000) | \
+				(($right >> 8) & 0x0000ff00) \
+				| (($right >> 24) & 0x000000f0)}];
+	    set right $temp;
+
+	    #puts "Left key juggle: [format %x $left]"
+	    #puts "Right key juggle: [format %x $right]"
+
+	    # Now go through and perform these
+	    # shifts on the left and right keys.
+	    foreach i $shifts  {
+		# Shift the keys either one or two bits to the left.
+		if {$i} {
+		    set left [expr {($left << 2) \
+					| (($left >> 26) & 0x0000003f)}];
+		    set right [expr {($right << 2) \
+					 | (($right >> 26) & 0x0000003f)}];
+		} else {
+		    set left [expr {($left << 1) \
+					| (($left >> 27) & 0x0000001f)}];
+		    set right [expr {($right << 1) \
+					 | (($right >> 27) & 0x0000001f)}];
+		}
+		set left [expr {$left & 0xfffffff0}];
+		set right [expr {$right & 0xfffffff0}];
+
+		# Now apply PC-2, in such a way that E is easier when
+		# encrypting or decrypting this conversion will look like PC-2
+		# except only the last 6 bits of each byte are used rather than
+		# 48 consecutive bits and the order of lines will be according
+		# to how the S selection functions will be applied: S2, S4, S6,
+		# S8, S1, S3, S5, S7.
+		set lefttemp [expr {[lindex $pc2bytes0 [expr {($left >> 28) & 0x0000000f}]] | \
+					[lindex $pc2bytes1 [expr {($left >> 24) & 0x0000000f}]] | \
+					[lindex $pc2bytes2 [expr {($left >> 20) & 0x0000000f}]] | \
+					[lindex $pc2bytes3 [expr {($left >> 16) & 0x0000000f}]] | \
+					[lindex $pc2bytes4 [expr {($left >> 12) & 0x0000000f}]] | \
+					[lindex $pc2bytes5 [expr {($left >> 8) & 0x0000000f}]] | \
+					[lindex $pc2bytes6 [expr {($left >> 4) & 0x0000000f}]]}];
+		set righttemp [expr {[lindex $pc2bytes7 [expr {($right >> 28) & 0x0000000f}]] | \
+					 [lindex $pc2bytes8 [expr {($right >> 24) & 0x0000000f}]] | \
+					 [lindex $pc2bytes9 [expr {($right >> 20) & 0x0000000f}]] | \
+					 [lindex $pc2bytes10 [expr {($right >> 16) & 0x0000000f}]] | \
+					 [lindex $pc2bytes11 [expr {($right >> 12) & 0x0000000f}]] | \
+					 [lindex $pc2bytes12 [expr {($right >> 8) & 0x0000000f}]] | \
+					 [lindex $pc2bytes13 [expr {($right >> 4) & 0x0000000f}]]}];
+		set temp [expr {(($righttemp >> 16) ^ $lefttemp) & 0x0000ffff}];
+		lappend keys [expr {$lefttemp ^ $temp}];
+		lappend keys [expr {$righttemp ^ ($temp << 16)}];
+	    }
+	}; # For each iteration.
+	# Return the keys we've created.
+	return $keys;
+    }; # End of createKeys.
+}; # End of des namespace eval.
+
+package provide tclDES 1.0.0
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/des/tcldesjr.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/des/tcldesjr.tcl
new file mode 100644
index 00000000..a1775a7d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/des/tcldesjr.tcl
@@ -0,0 +1,1055 @@
+# desjr.tcl
+# $Revision: 1.1 $
+# $Date: 2005/09/26 09:16:59 $
+#
+# Port of Javascript implementation to Tcl 8.4 by Mac A. Cody,
+# 3DES functionality removed, February, 2003
+# July, 2003   - Separated key set generation from encryption/decryption.
+#                Renamed "des" procedure to "block" to differentiate from the
+#                "stream" procedure used for CFB and OFB modes.
+#                Modified the "encrypt" and "decrypt" procedures to support
+#                CFB and OFB modes. Changed the procedure arguments.
+# August, 2003 - Added the "stream" procedure to support CFB and OFB modes.
+# June, 2004 - Corrected input vector bug in stream-mode processing.  Added
+#              support for feedback vector storage and management function.
+#              This enables a stream of data to be processed over several calls
+#              to the encryptor or decryptor.
+# September, 2004 - Added feedback vector to the CBC mode of operation to allow
+#                   a large data set to be processed over several calls to the
+#                   encryptor or decryptor.
+# October, 2004 - Added test for weak keys in the createKeys procedure.
+#
+# Paul Tero, July 2001
+# http://www.shopable.co.uk/des.html
+#
+# Optimised for performance with large blocks by Michael Hayworth,
+# November 2001, http://www.netdealing.com
+#
+# This software is copyrighted (c) 2003, 2004 by Mac A. Cody.  All rights
+# reserved.  The following terms apply to all files associated with
+# the software unless explicitly disclaimed in individual files or
+# directories.
+
+# The authors hereby grant permission to use, copy, modify, distribute,
+# and license this software for any purpose, provided that existing
+# copyright notices are retained in all copies and that this notice is
+# included verbatim in any distributions. No written agreement, license,
+# or royalty fee is required for any of the authorized uses.
+# Modifications to this software may be copyrighted by their authors and
+# need not follow the licensing terms described here, provided that the
+# new terms are clearly indicated on the first page of each file where
+# they apply.
+
+# IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+# FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+# ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+# DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+# IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+# NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+# MODIFICATIONS.
+
+# GOVERNMENT USE: If you are acquiring this software on behalf of the
+# U.S. government, the Government shall have only "Restricted Rights"
+# in the software and related documentation as defined in the Federal 
+# Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+# are acquiring the software on behalf of the Department of Defense, the
+# software shall be classified as "Commercial Computer Software" and the
+# Government shall have only "Restricted Rights" as defined in Clause
+# 252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+# authors grant the U.S. Government and others acting in its behalf
+# permission to use and distribute the software in accordance with the
+# terms specified in this license. 
+namespace eval des {
+    variable keysets
+    set keysets(ndx) 1
+    # Produre: keyset - Create or destroy a keyset created
+    #                   from a 64-bit DES key.
+    # Inputs:
+    #   oper  : The operation to be performed.  This will be either "create"
+    #           (make a new keyset) or "destroy" (delete an existing keyset).
+    #           The meaning of the argument "value" depends of the operation
+    #           performed.  An error is generated if "oper" is not "create"
+    #           or "destroy".
+    #             
+    #   value : If the argument "oper" is "create", then "value" is the 64-bit
+    #           DES key.  (Note: The lsb of each byte is ignored; odd parity is
+    #           not required).  If the argument "oper" is "destroy", then
+    #           "value" is a handle to a keyset that was created previously.
+    #
+    #   weak:   If true then weak keys are allowed. The default is to raise an
+    #           error when a weak key is seen.
+    # Output:
+    #   If the argument "oper" is "create", then the output is a handle to the
+    #   keyset stored in the des namespace.  If the argument "oper" is
+    #   "destroy", then nothing is returned.
+    proc keyset {oper value {weak 0}} {
+	variable keysets
+	set newset {}
+	switch -exact -- $oper {
+	    create {
+		# Create a new keyset handle.
+		set newset keyset$keysets(ndx)
+		# Create key set
+		set keysets($newset) [createKeys $value $weak]
+		# Never use that keyset handle index again.
+		incr keysets(ndx)
+	    }
+	    destroy {
+		# Determine if the keyset handle is valid.
+		if {[array names keysets $value] != {}} {
+		    # Delete the handle and corresponding keyset.
+                    unset keysets($value)
+		} else {
+		    error "The keyset handle \"$value\" is invalid!"
+		}
+	    }
+	    default {
+		error {The operator must be either "create" or "destroy".}
+	    }
+	}
+	return $newset
+    }
+
+    # Procedure: encrypt - Encryption front-end for the des procedure
+    # Inputs:
+    #   keyset  : Handle to an existing keyset.
+    #   message : String to be encrypted.
+    #   mode    : DES mode ecb (default), cbc, cfb, or ofb.
+    #   iv      : Name of the initialization vector used in CBC, CFB,
+    #             and OFB modes.
+    #   kbits   : Number of bits in a data block (default of 64).
+    # Output:
+    #   The encrypted data string.
+    proc encrypt {keyset message {mode ecb} {iv {}} {kbits 64}} {
+	switch -exact -- $mode {
+	    ecb {
+		return [block $keyset $message 1 0]
+	    }
+	    cbc -
+	    ofb -
+	    cfb {
+		# Is the initialization/feedback vector variable is valid?
+		if {[string length $iv] == 0} {
+		    error "An initialization variable must be specified."
+		} else {
+		    upvar $iv ivec
+		    if {![info exists ivec]} {
+			error "The variable $iv does not exist."
+		    }
+		}
+		switch -exact -- $mode {
+		    cbc {
+			return [block $keyset $message 1 1 ivec]
+		    }
+		    ofb {
+			return [stream $keyset $message 1 0 ivec $kbits]
+		    }
+		    cfb {
+			return [stream $keyset $message 1 1 ivec $kbits]
+		    }
+		}
+	    }
+	    default {
+		error {Mode must be ecb, cbc, cfb, or ofb.}
+	    }
+	}
+    }
+
+    # Procedure: decrypt - Decryption front-end for the des procedure
+    # Inputs:
+    #   keyset  : Handle to an existing keyset.
+    #   message : String to be decrypted.
+    #   mode    : DES mode ecb (default), cbc, cfb, or ofb.
+    #   iv      : Name of the initialization vector used in CBC, CFB,
+    #             and OFB modes.
+    #   kbits   : Number of bits in a data block (default of 64).
+    # Output:
+    #   The encrypted or decrypted data string.
+    proc decrypt {keyset message {mode ecb} {iv {}} {kbits 64}} {
+	switch -exact -- $mode {
+	    ecb {
+		return [block $keyset $message 0 0]
+	    }
+	    cbc -
+	    ofb -
+	    cfb {
+		# Is the initialization/feedback vector variable is valid?
+		if {[string length $iv] < 1} {
+		    error "An initialization variable must be specified."
+		} else {
+		    upvar $iv ivec
+		    if {![info exists ivec]} {
+			error "The variable $iv does not exist."
+		    }
+		}
+		switch -exact -- $mode {
+		    cbc {
+			return [block $keyset $message 0 1 ivec]
+		    }
+		    ofb {
+			return [stream $keyset $message 0 0 ivec $kbits]
+		    }
+		    cfb {
+			return [stream $keyset $message 0 1 ivec $kbits]
+		    }
+		}
+	    }
+	    default {
+		error {Mode must be ecb, cbc, cfb, or ofb.}
+	    }
+	}
+    }
+
+    variable spfunction1 [list 0x1010400 0 0x10000 0x1010404 0x1010004 0x10404 0x4 0x10000 0x400 0x1010400 0x1010404 0x400 0x1000404 0x1010004 0x1000000 0x4 0x404 0x1000400 0x1000400 0x10400 0x10400 0x1010000 0x1010000 0x1000404 0x10004 0x1000004 0x1000004 0x10004 0 0x404 0x10404 0x1000000 0x10000 0x1010404 0x4 0x1010000 0x1010400 0x1000000 0x1000000 0x400 0x1010004 0x10000 0x10400 0x1000004 0x400 0x4 0x1000404 0x10404 0x1010404 0x10004 0x1010000 0x1000404 0x1000004 0x404 0x10404 0x1010400 0x404 0x1000400 0x1000400 0 0x10004 0x10400 0 0x1010004];
+    variable spfunction2 [list 0x80108020 0x80008000 0x8000 0x108020 0x100000 0x20 0x80100020 0x80008020 0x80000020 0x80108020 0x80108000 0x80000000 0x80008000 0x100000 0x20 0x80100020 0x108000 0x100020 0x80008020 0 0x80000000 0x8000 0x108020 0x80100000 0x100020 0x80000020 0 0x108000 0x8020 0x80108000 0x80100000 0x8020 0 0x108020 0x80100020 0x100000 0x80008020 0x80100000 0x80108000 0x8000 0x80100000 0x80008000 0x20 0x80108020 0x108020 0x20 0x8000 0x80000000 0x8020 0x80108000 0x100000 0x80000020 0x100020 0x80008020 0x80000020 0x100020 0x108000 0 0x80008000 0x8020 0x80000000 0x80100020 0x80108020 0x108000];
+    variable spfunction3 [list 0x208 0x8020200 0 0x8020008 0x8000200 0 0x20208 0x8000200 0x20008 0x8000008 0x8000008 0x20000 0x8020208 0x20008 0x8020000 0x208 0x8000000 0x8 0x8020200 0x200 0x20200 0x8020000 0x8020008 0x20208 0x8000208 0x20200 0x20000 0x8000208 0x8 0x8020208 0x200 0x8000000 0x8020200 0x8000000 0x20008 0x208 0x20000 0x8020200 0x8000200 0 0x200 0x20008 0x8020208 0x8000200 0x8000008 0x200 0 0x8020008 0x8000208 0x20000 0x8000000 0x8020208 0x8 0x20208 0x20200 0x8000008 0x8020000 0x8000208 0x208 0x8020000 0x20208 0x8 0x8020008 0x20200];
+    variable spfunction4 [list 0x802001 0x2081 0x2081 0x80 0x802080 0x800081 0x800001 0x2001 0 0x802000 0x802000 0x802081 0x81 0 0x800080 0x800001 0x1 0x2000 0x800000 0x802001 0x80 0x800000 0x2001 0x2080 0x800081 0x1 0x2080 0x800080 0x2000 0x802080 0x802081 0x81 0x800080 0x800001 0x802000 0x802081 0x81 0 0 0x802000 0x2080 0x800080 0x800081 0x1 0x802001 0x2081 0x2081 0x80 0x802081 0x81 0x1 0x2000 0x800001 0x2001 0x802080 0x800081 0x2001 0x2080 0x800000 0x802001 0x80 0x800000 0x2000 0x802080];
+    variable spfunction5 [list 0x100 0x2080100 0x2080000 0x42000100 0x80000 0x100 0x40000000 0x2080000 0x40080100 0x80000 0x2000100 0x40080100 0x42000100 0x42080000 0x80100 0x40000000 0x2000000 0x40080000 0x40080000 0 0x40000100 0x42080100 0x42080100 0x2000100 0x42080000 0x40000100 0 0x42000000 0x2080100 0x2000000 0x42000000 0x80100 0x80000 0x42000100 0x100 0x2000000 0x40000000 0x2080000 0x42000100 0x40080100 0x2000100 0x40000000 0x42080000 0x2080100 0x40080100 0x100 0x2000000 0x42080000 0x42080100 0x80100 0x42000000 0x42080100 0x2080000 0 0x40080000 0x42000000 0x80100 0x2000100 0x40000100 0x80000 0 0x40080000 0x2080100 0x40000100];
+    variable spfunction6 [list 0x20000010 0x20400000 0x4000 0x20404010 0x20400000 0x10 0x20404010 0x400000 0x20004000 0x404010 0x400000 0x20000010 0x400010 0x20004000 0x20000000 0x4010 0 0x400010 0x20004010 0x4000 0x404000 0x20004010 0x10 0x20400010 0x20400010 0 0x404010 0x20404000 0x4010 0x404000 0x20404000 0x20000000 0x20004000 0x10 0x20400010 0x404000 0x20404010 0x400000 0x4010 0x20000010 0x400000 0x20004000 0x20000000 0x4010 0x20000010 0x20404010 0x404000 0x20400000 0x404010 0x20404000 0 0x20400010 0x10 0x4000 0x20400000 0x404010 0x4000 0x400010 0x20004010 0 0x20404000 0x20000000 0x400010 0x20004010];
+    variable spfunction7 [list 0x200000 0x4200002 0x4000802 0 0x800 0x4000802 0x200802 0x4200800 0x4200802 0x200000 0 0x4000002 0x2 0x4000000 0x4200002 0x802 0x4000800 0x200802 0x200002 0x4000800 0x4000002 0x4200000 0x4200800 0x200002 0x4200000 0x800 0x802 0x4200802 0x200800 0x2 0x4000000 0x200800 0x4000000 0x200800 0x200000 0x4000802 0x4000802 0x4200002 0x4200002 0x2 0x200002 0x4000000 0x4000800 0x200000 0x4200800 0x802 0x200802 0x4200800 0x802 0x4000002 0x4200802 0x4200000 0x200800 0 0x2 0x4200802 0 0x200802 0x4200000 0x800 0x4000002 0x4000800 0x800 0x200002];
+    variable spfunction8 [list 0x10001040 0x1000 0x40000 0x10041040 0x10000000 0x10001040 0x40 0x10000000 0x40040 0x10040000 0x10041040 0x41000 0x10041000 0x41040 0x1000 0x40 0x10040000 0x10000040 0x10001000 0x1040 0x41000 0x40040 0x10040040 0x10041000 0x1040 0 0 0x10040040 0x10000040 0x10001000 0x41040 0x40000 0x41040 0x40000 0x10041000 0x1000 0x40 0x10040040 0x1000 0x41040 0x10001000 0x40 0x10000040 0x10040000 0x10040040 0x10000000 0x40000 0x10001040 0 0x10041040 0x40040 0x10000040 0x10040000 0x10001000 0x10001040 0 0x10041040 0x41000 0x41000 0x1040 0x1040 0x40040 0x10000000 0x10041000];
+
+    variable desEncrypt {0 32 2}
+    variable desDecrypt {30 -2 -2}
+
+    # Procedure: block - DES ECB and CBC mode support
+    # Inputs:
+    #   keyset   : Handle to an existing keyset.
+    #   message  : String to be encrypted or decrypted (Note: For encryption,
+    #              the string is extended with null characters to an integral
+    #              multiple of eight bytes.  For decryption, the string length
+    #              must be an integral multiple of eight bytes.
+    #   encrypt  : Perform encryption (1) or decryption (0)
+    #   mode     : DES mode 1=CBC, 0=ECB (default).
+    #   iv       : Name of the variable containing the initialization vector
+    #              used in CBC mode.  The value must be 64 bits in length.
+    # Output:
+    #   The encrypted or decrypted data string.
+    proc block {keyset message encrypt {mode 0} {iv {}}} {
+	variable spfunction1
+	variable spfunction2
+	variable spfunction3
+	variable spfunction4
+	variable spfunction5
+	variable spfunction6
+	variable spfunction7
+	variable spfunction8
+	variable desEncrypt
+	variable desDecrypt
+	variable keysets
+
+	# Determine if the keyset handle is valid.
+	if {[array names keysets $keyset] != {}} {
+	    # Acquire the 16 or 48 subkeys we will need
+	    set keys $keysets($keyset)
+	} else {
+	    error "The keyset handle \"$keyset\" is invalid!"
+	}
+	set m 0
+	set cbcleft 0x00; set cbcleft2 0x00
+	set cbcright 0x00; set cbcright2 0x00
+	set len [string length $message];
+        if {$len == 0} {
+            return -code error "invalid message size: the message may not be empty"
+        }
+	set chunk 0;
+	# Set up the loops for des
+	expr {$encrypt ? [set looping $desEncrypt] : [set looping $desDecrypt]}
+
+	# Pad the message out with null bytes.
+	append message "\0\0\0\0\0\0\0\0"
+
+	# Store the result here
+	set result {};
+	set tempresult {};
+
+	# CBC mode
+	if {$mode == 1} {
+	    # Is the initialization/feedback vector variable is valid?
+	    if {[string length $iv] < 1} {
+		error "An initialization variable must be specified."
+	    } else {
+		upvar $iv ivec
+		if {![info exists ivec]} {
+		    error "The variable $iv does not exist."
+		}
+                if {[string length $ivec] != 8} {
+                    return -code error "invalid initialization vector size:\
+                        the initialization vector must be 8 bytes"
+                }
+	    }
+	    # Use the input vector as the intial vector.
+	    binary scan $ivec H8H8 cbcleftTemp cbcrightTemp
+	    set cbcleft "0x$cbcleftTemp"
+	    set cbcright "0x$cbcrightTemp"
+	}
+
+	# Loop through each 64 bit chunk of the message
+	while {$m < $len} {
+	    binary scan $message x${m}H8H8 lefttemp righttemp
+	    set left {}
+	    append left "0x" $lefttemp
+	    set right {}
+	    append right "0x" $righttemp
+	    incr m 8
+
+	    #puts "Left start: $left";
+	    #puts "Right start: $right";
+	    # For Cipher Block Chaining mode, xor the
+	    # message with the previous result.
+	    if {$mode == 1} {
+		if {$encrypt} {
+		    set left [expr {$left ^ $cbcleft}]
+		    set right [expr {$right ^ $cbcright}]
+		} else {
+		    set cbcleft2 $cbcleft;
+		    set cbcright2 $cbcright;
+		    set cbcleft $left;
+		    set cbcright $right;
+		}
+	    }
+
+	    #puts "Left mode: $left";
+	    #puts "Right mode: $right";
+	    #puts "cbcleft: $cbcleft";
+	    #puts "cbcleft2: $cbcleft2";
+	    #puts "cbcright: $cbcright";
+	    #puts "cbcright2: $cbcright2";
+
+	    # First each 64 but chunk of the message
+	    # must be permuted according to IP.
+	    set temp [expr {(($left >> 4) ^ $right) & 0x0f0f0f0f}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 4)}];
+	    set temp [expr {(($left >> 16) ^ $right) & 0x0000ffff}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 16)}];
+	    set temp [expr {(($right >> 2) ^ $left) & 0x33333333}];
+	    set left [expr {$left ^ $temp}]
+	    set right [expr {$right ^ ($temp << 2)}];
+
+	    set temp [expr {(($right >> 8) ^ $left) & 0x00ff00ff}];
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 8)}];
+	    set temp [expr {(($left >> 1) ^ $right) & 0x55555555}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 1)}];
+
+	    set left [expr {((($left << 1) & 0xffffffff) | \
+				 (($left >> 31) & 0x00000001))}]; 
+	    set right [expr {((($right << 1) & 0xffffffff) | \
+				  (($right >> 31) & 0x00000001))}]; 
+
+	    #puts "Left IP: [format %x $left]";
+	    #puts "Right IP: [format %x $right]";
+
+	    # Do this 1 time for each chunk of the message.
+	    set endloop [lindex $looping 1];
+	    set loopinc [lindex $looping 2];
+
+	    #puts "endloop: $endloop";
+	    #puts "loopinc: $loopinc";
+
+	    # Now go through and perform the encryption or decryption. 
+	    for {set i [lindex $looping 0]} \
+		{$i != $endloop} {incr i $loopinc} {
+		# For efficiency
+		set right1 [expr {$right ^ [lindex $keys $i]}]; 
+		set right2 [expr {((($right >> 4) & 0x0fffffff) | \
+				       (($right << 28) & 0xffffffff)) ^ \
+				      [lindex $keys [expr {$i + 1}]]}];
+ 
+		# puts "right1: [format %x $right1]";
+		# puts "right2: [format %x $right2]";
+
+		# The result is attained by passing these
+		# bytes through the S selection functions.
+		set temp $left;
+		set left $right;
+		set right [expr {$temp ^ ([lindex $spfunction2 [expr {($right1 >> 24) & 0x3f}]] | \
+					      [lindex $spfunction4 [expr {($right1 >> 16) & 0x3f}]] | \
+					      [lindex $spfunction6 [expr {($right1 >>  8) & 0x3f}]] | \
+					      [lindex $spfunction8 [expr {$right1 & 0x3f}]] | \
+					      [lindex $spfunction1 [expr {($right2 >> 24) & 0x3f}]] | \
+					      [lindex $spfunction3 [expr {($right2 >> 16) & 0x3f}]] | \
+					      [lindex $spfunction5 [expr {($right2 >>  8) & 0x3f}]] | \
+					      [lindex $spfunction7 [expr {$right2 & 0x3f}]])}];
+ 
+		# puts "Left iter: [format %x $left]";
+		# puts "Right iter: [format %x $right]";
+		
+	    }
+	    set temp $left;
+	    set left $right;
+	    set right $temp; # Unreverse left and right.
+
+	    #puts "Left Iterated: [format %x $left]";
+	    #puts "Right Iterated: [format %x $right]";
+
+	    # Move then each one bit to the right
+	    set left [expr {((($left >> 1) & 0x7fffffff) \
+				 | (($left << 31) & 0xffffffff))}]; 
+	    set right [expr {((($right >> 1) & 0x7fffffff) \
+				  | (($right << 31) & 0xffffffff))}]; 
+
+	    #puts "Left shifted: [format %x $left]";
+	    #puts "Right shifted: [format %x $right]";
+
+	    # Now perform IP-1, which is IP in the opposite direction
+	    set temp [expr {((($left >> 1) & 0x7fffffff) ^ $right) & 0x55555555}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 1)}];
+	    set temp [expr {((($right >> 8) & 0x00ffffff) ^ $left) & 0x00ff00ff}];
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 8)}];
+	    set temp [expr {((($right >> 2) & 0x3fffffff) ^ $left) & 0x33333333}]; 
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 2)}];
+	    set temp [expr {((($left >> 16) & 0x0000ffff) ^ $right) & 0x0000ffff}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 16)}];
+	    set temp [expr {((($left >> 4) & 0x0fffffff) ^ $right) & 0x0f0f0f0f}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 4)}];
+
+	    #puts "Left IP-1: [format %x $left]";
+	    #puts "Right IP-1: [format %x $right]";
+
+	    # For Cipher Block Chaining mode, xor
+	    # the message with the previous result.
+	    if {$mode == 1} {
+		if {$encrypt} {
+		    set cbcleft $left;
+		    set cbcright $right;
+		} else {
+		    set left [expr {$left ^ $cbcleft2}];
+		    set right [expr {$right ^ $cbcright2}];
+		}
+	    }
+
+	    append tempresult \
+		[binary format H16 [format %08x%08x $left $right]]
+
+	    #puts "Left final: [format %x $left]";
+	    #puts "Right final: [format %x $right]";
+
+	    incr chunk 8;
+	    if {$chunk == 512} {
+		append result $tempresult
+		set tempresult {};
+		set chunk 0;
+	    }
+	}; # For every 8 characters, or 64 bits in the message
+
+	if {$mode == 1} {
+	    if {$encrypt} {
+		# Save the left and right registers to the feedback vector.
+		set ivec [binary format H* \
+			      [format %08x $left][format %08x $right]]
+	    } else {
+		set ivec [binary format H* \
+			      [format %08x $cbcleft][format %08x $cbcright]]
+	    }
+	}
+
+	# Return the result as an array
+	return ${result}$tempresult
+    }; # End of block
+
+    # Procedure: stream - DES CFB and OFB mode support
+    # Inputs:
+    #   keyset   : Handle to an existing keyset.
+    #   message  : String to be encrypted or decrypted (Note: The length of the
+    #              string is dependent upon the value of kbits.  Remember that
+    #              the string is part of a stream of data, so it must be sized
+    #              properly for subsequent encryptions/decryptions to be
+    #              correct.  See the man page for correct message lengths for
+    #              values of kbits).
+    #   encrypt  : Perform encryption (1) or decryption (0)
+    #   mode     : DES mode 0=OFB, 1=CFB.
+    #   iv       : Name of variable containing the initialization vector.  The
+    #              value must be 64 bits in length with the first 64-L bits set
+    #              to zero.
+    #   kbits    : Number of bits in a data block (default of 64).
+    # Output:
+    #   The encrypted or decrypted data string.
+    proc stream {keyset message encrypt mode iv {kbits 64}} {
+	variable spfunction1
+	variable spfunction2
+	variable spfunction3
+	variable spfunction4
+	variable spfunction5
+	variable spfunction6
+	variable spfunction7
+	variable spfunction8
+	variable desEncrypt
+	variable keysets
+
+	# Determine if the keyset handle is valid.
+	if {[array names keysets $keyset] != {}} {
+	    # Acquire the 16 subkeys we will need.
+	    set keys $keysets($keyset)
+	} else {
+	    error "The keyset handle \"$keyset\" is invalid!"
+	}
+
+	# Is the initialization/feedback vector variable is valid?
+	if {[string length $iv] < 1} {
+	    error "An initialization variable must be specified."
+	} else {
+	    upvar $iv ivec
+	    if {![info exists ivec]} {
+		error "The variable $iv does not exist."
+	    }
+	}
+
+        # Determine if message length (in bits)
+	# is not an integral number of kbits.
+	set len [string length $message];
+        #puts "len: $len, kbits: $kbits"
+	if {($kbits < 1) || ($kbits > 64)} {
+	    error "The valid values of kbits are 1 through 64."
+        } elseif {($kbits % 8) != 0} {
+	    set blockSize [expr {$kbits + (8 - ($kbits % 8))}]
+	    set fail [expr {(($len * 8) / $blockSize) % $kbits}]
+	} else {
+	    set blockSize [expr {$kbits / 8}]
+	    set fail [expr {$len % $blockSize}]
+	}
+        if {$fail} {
+	    error "Data length (in bits) is not an integral number of kbits."
+	}
+
+	set m 0
+	set n 0
+	set chunk 0;
+	# Set up the loops for des
+	set looping $desEncrypt
+
+        # Set up shifting values.  Used for both CFB and OFB modes.
+        if {$kbits < 32} {
+	    # Only some bits from left output are needed.
+	    set kOutShift [expr {32 - $kbits}]
+	    set kOutMask [expr {0x7fffffff >> (31 - $kbits)}]
+	    # Determine number of message bytes needed per iteration.
+	    set msgBytes [expr {int(ceil(double($kbits) / 8.0))}]
+	    # Determine number of message bits needed per iteration.
+	    set msgBits [expr {$msgBytes * 8}]
+	    set msgBitsSub1 [expr {$msgBits - 1}]
+	    # Define bit caches.
+	    set bitCacheIn {}
+	    set bitCacheOut {}
+	    # Variable used to remove bits 0 through
+	    # kbits-1 in the input bit cache.
+	    set kbitsSub1 [expr {$kbits - 1}]
+	    # Variable used to remove leading dummy binary bits.
+	    set xbits [expr {32 - $kbits}]
+	} elseif {$kbits == 32} {
+	    # Only bits of left output are used.
+	    # Four messages bytes are needed per iteration.
+	    set msgBytes 4
+	    set xbits 32
+	} elseif {$kbits < 64} {
+	    # All bits from left output are needed.
+	    set kOutShiftLeft [expr {$kbits - 32}]
+	    # Some bits from right output are needed.
+	    set kOutShiftRight [expr {64 - $kbits}]
+	    set kOutMaskRight [expr {0x7fffffff >> (63 - $kbits)}]
+	    # Determine number of message bytes needed per iteration.
+	    set msgBytes [expr {int(ceil(double($kbits) / 8.0))}]
+	    # Determine number of message bits needed per iteration.
+	    set msgBits [expr {$msgBytes * 8}]
+	    set msgBitsSub1 [expr {$msgBits - 1}]
+	    # Define bit caches.
+	    set bitCacheIn {}
+	    set bitCacheOut {}
+	    # Variable used to remove bits 0 through
+	    # kbits-1 in the input bit cache.
+	    set kbitsSub1 [expr {$kbits - 1}]
+	    # Variable used to remove leading dummy binary bits.
+	    set xbits [expr {64 - $kbits}]
+	} else {
+	    # All 64 bits of output are used.
+	    # Eight messages bytes are needed per iteration.
+	    set msgBytes 8
+	    set xbits 0
+	}
+
+	# Store the result here
+	set result {}
+	set tempresult {}
+
+	# Set up the initialization vector bitstream
+	binary scan $ivec H8H8 leftTemp rightTemp
+	set left "0x$leftTemp"
+	set right "0x$rightTemp"
+        #puts "Retrieved Feedback vector: $fbvec"
+        #puts "Start: |$left| |$right|"
+	
+	# Loop through each 64 bit chunk of the message
+	while {$m < $len} {
+	    # puts "Left start: $left";
+	    # puts "Right start: $right";
+
+	    # First each 64 but chunk of the
+	    # message must be permuted according to IP.
+	    set temp [expr {(($left >> 4) ^ $right) & 0x0f0f0f0f}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 4)}];
+	    set temp [expr {(($left >> 16) ^ $right) & 0x0000ffff}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 16)}];
+	    set temp [expr {(($right >> 2) ^ $left) & 0x33333333}];
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 2)}];
+
+	    set temp [expr {(($right >> 8) ^ $left) & 0x00ff00ff}];
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 8)}];
+	    set temp [expr {(($left >> 1) ^ $right) & 0x55555555}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 1)}];
+
+	    set left [expr {((($left << 1) & 0xffffffff) | \
+				 (($left >> 31) & 0x00000001))}]; 
+	    set right [expr {((($right << 1) & 0xffffffff) | \
+				  (($right >> 31) & 0x00000001))}]; 
+
+	    #puts "Left IP: [format %x $left]";
+	    #puts "Right IP: [format %x $right]";
+
+	    # Do this 1 time for each chunk of the message
+	    set endloop [lindex $looping 1];
+	    set loopinc [lindex $looping 2];
+
+	    # puts "endloop: $endloop";
+	    # puts "loopinc: $loopinc";
+
+	    # Now go through and perform the encryption or decryption  
+	    for {set i [lindex $looping 0]} \
+		{$i != $endloop} {incr i $loopinc} {
+		# For efficiency
+		set right1 [expr {$right ^ [lindex $keys $i]}]; 
+		set right2 [expr {((($right >> 4) & 0x0fffffff) | \
+				       (($right << 28) & 0xffffffff)) ^ \
+				      [lindex $keys [expr {$i + 1}]]}];
+ 
+		# puts "right1: [format %x $right1]";
+		# puts "right2: [format %x $right2]";
+
+		# The result is attained by passing these
+		# bytes through the S selection functions.
+		set temp $left;
+		set left $right;
+		set right [expr {$temp ^ ([lindex $spfunction2 [expr {($right1 >> 24) & 0x3f}]] | \
+					      [lindex $spfunction4 [expr {($right1 >> 16) & 0x3f}]] | \
+					      [lindex $spfunction6 [expr {($right1 >>  8) & 0x3f}]] | \
+					      [lindex $spfunction8 [expr {$right1 & 0x3f}]] | \
+					      [lindex $spfunction1 [expr {($right2 >> 24) & 0x3f}]] | \
+					      [lindex $spfunction3 [expr {($right2 >> 16) & 0x3f}]] | \
+					      [lindex $spfunction5 [expr {($right2 >>  8) & 0x3f}]] | \
+					      [lindex $spfunction7 [expr {$right2 & 0x3f}]])}];
+ 
+		# puts "Left iter: [format %x $left]";
+		# puts "Right iter: [format %x $right]";
+	    }
+	    set temp $left;
+	    set left $right;
+	    set right $temp; # Unreverse left and right
+
+	    #puts "Left Iterated: [format %x $left]";
+	    #puts "Right Iterated: [format %x $right]";
+
+	    # Move then each one bit to the right
+	    set left [expr {((($left >> 1) & 0x7fffffff) | \
+				 (($left << 31) & 0xffffffff))}]; 
+	    set right [expr {((($right >> 1) & 0x7fffffff) | \
+				  (($right << 31) & 0xffffffff))}]; 
+
+	    #puts "Left shifted: [format %x $left]";
+	    #puts "Right shifted: [format %x $right]";
+
+	    # Now perform IP-1, which is IP in the opposite direction
+	    set temp [expr {((($left >> 1) & 0x7fffffff) ^ $right) & 0x55555555}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 1)}];
+	    set temp [expr {((($right >> 8) & 0x00ffffff) ^ $left) & 0x00ff00ff}];
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 8)}];
+	    set temp [expr {((($right >> 2) & 0x3fffffff) ^ $left) & 0x33333333}]; 
+	    set left [expr {$left ^ $temp}];
+	    set right [expr {$right ^ ($temp << 2)}];
+	    set temp [expr {((($left >> 16) & 0x0000ffff) ^ $right) & 0x0000ffff}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 16)}];
+	    set temp [expr {((($left >> 4) & 0x0fffffff) ^ $right) & 0x0f0f0f0f}];
+	    set right [expr {$right ^ $temp}];
+	    set left [expr {$left ^ ($temp << 4)}];
+
+	    #puts "Left IP-1: [format %x $left]";
+	    #puts "Right IP-1: [format %x $right]";
+
+	    # Extract the "kbits" most significant bits from the output block.
+	    if {$kbits < 32} {
+		# Only some bits from left output are needed.
+		set kData [expr {($left >> $kOutShift) & $kOutMask}]
+		set newBits {}
+		# If necessary, copy message bytes into input bit cache.
+		if {([string length $bitCacheIn] < $kbits) && ($n < $len)} {
+		    if {$len - $n < $msgBytes} {
+			set lastBits [expr {($len - $n) * 8}]
+			###puts -nonewline [binary scan $message x${n}B$lastBits newBits]
+			binary scan $message x${n}B$lastBits newBits
+		    } else {
+			# Extract "msgBytes" whole bytes as bits
+			###puts -nonewline [binary scan $message x${n}B$msgBits newBits]
+			binary scan $message x${n}B$msgBits newBits
+		    }
+		    incr n $msgBytes
+		    #puts " $newBits  $n [expr {$len - $n}]"
+		    # Add the bits to the input bit cache.
+		    append bitCacheIn $newBits
+		}
+		#puts -nonewline "In bit cache: $bitCacheIn"
+		# Set up message data from input bit cache.
+		binary scan [binary format B32 [format %032s [string range $bitCacheIn 0 $kbitsSub1]]] H8 temp
+		set msgData "0x$temp"
+		# Mix message bits with crypto bits.
+		set mixData [expr {$msgData ^ $kData}]
+		# Discard collected bits from the input bit cache.
+		set bitCacheIn [string range $bitCacheIn $kbits end]
+		#puts "  After: $bitCacheIn"
+		# Convert back to a bit stream and append to the output bit cache.
+		# Only the lower kbits are wanted.
+		binary scan [binary format H8 [format %08x $mixData]] B32 msgOut
+		append bitCacheOut [string range $msgOut $xbits end]
+		#puts -nonewline "Out bit cache: $bitCacheOut"
+		# If there are sufficient bits, move bytes to the temporary holding string.
+		if {[string length $bitCacheOut] >= $msgBits} {
+		    append tempresult [binary format B$msgBits [string range $bitCacheOut 0 $msgBitsSub1]]
+		    set bitCacheOut [string range $bitCacheOut $msgBits end]
+                    #puts -nonewline "  After: $bitCacheOut"
+		    incr m $msgBytes
+		    ###puts "$m bytes output"
+		    incr chunk $msgBytes
+		}
+		#puts ""
+		# For CFB mode
+		if {$mode == 1} {
+		    if {$encrypt} {
+			set temp [expr {($right << $kbits) & 0xffffffff}]
+			set left [expr {(($left << $kbits) & 0xffffffff) | (($right >> $kOutShift) & $kOutMask)}]
+			set right [expr {$temp | $mixData}]
+		    } else {
+			set temp [expr {($right << $kbits) & 0xffffffff}]
+			set left [expr {(($left << $kbits) & 0xffffffff) | (($right >> $kOutShift) & $kOutMask)}]
+			set right [expr {$temp | $msgData}]
+		    }
+		}
+	    } elseif {$kbits == 32} {
+		# Only bits of left output are used.
+		set kData $left
+		# Four messages bytes are needed per iteration.
+		binary scan $message x${m}H8 temp
+		incr m 4
+		incr chunk 4
+		set msgData "0x$temp"
+		# Mix message bits with crypto bits.
+		set mixData [expr {$msgData ^ $kData}]
+		# Move bytes to the temporary holding string.
+		append tempresult [binary format H8 [format %08x $mixData]]
+		# For CFB mode
+		if {$mode == 1} {
+		    set left $right
+		    if {$encrypt} {
+			set right $mixData
+		    } else {
+			set right $msgData
+		    }
+		}
+	    } elseif {$kbits < 64} {
+		set kDataLeft [expr {($left >> $kOutShiftRight) & $kOutMaskRight}]
+		set temp [expr {($left << $kOutShiftLeft) & 0xffffffff}]
+		set kDataRight [expr {(($right >> $kOutShiftRight) & $kOutMaskRight) | $temp}]
+		# If necessary, copy message bytes into input bit cache.
+		if {([string length $bitCacheIn] < $kbits)  && ($n < $len)} {
+		    if {$len - $n < $msgBytes} {
+			set lastBits [expr {($len - $n) * 8}]
+			###puts -nonewline [binary scan $message x${n}B$lastBits newBits]
+			binary scan $message x${n}B$lastBits newBits
+		    } else {
+			# Extract "msgBytes" whole bytes as bits
+			###puts -nonewline [binary scan $message x${n}B$msgBits newBits]
+			binary scan $message x${n}B$msgBits newBits
+		    }
+		    incr n $msgBytes
+		    # Add the bits to the input bit cache.
+		    append bitCacheIn $newBits
+		}
+		# Set up message data from input bit cache.
+		# puts "Bits from cache: [set temp [string range $bitCacheIn 0 $kbitsSub1]]"
+		# puts "Length of bit string: [string length $temp]"
+		binary scan [binary format B64 [format %064s [string range $bitCacheIn 0 $kbitsSub1]]] H8H8 leftTemp rightTemp
+		set msgDataLeft "0x$leftTemp"
+		set msgDataRight "0x$rightTemp"
+		# puts "msgDataLeft: $msgDataLeft"
+		# puts "msgDataRight: $msgDataRight"
+		# puts "kDataLeft: [format 0x%08x $kDataLeft]"
+		# puts "kDataRight: [format 0x%08x $kDataRight]"
+		# Mix message bits with crypto bits.
+		set mixDataLeft [expr {$msgDataLeft ^ $kDataLeft}]
+		set mixDataRight [expr {$msgDataRight ^ $kDataRight}]
+		# puts "mixDataLeft: $mixDataLeft"
+		# puts "mixDataRight: $mixDataRight"
+		# puts "mixDataLeft: [format 0x%08x $mixDataLeft]"
+		# puts "mixDataRight: [format 0x%08x $mixDataRight]"
+		# Discard collected bits from the input bit cache.
+		set bitCacheIn [string range $bitCacheIn $kbits end]
+		# Convert back to a bit stream and
+		# append to the output bit cache.
+		# Only the lower kbits are wanted.
+		binary scan \
+		    [binary format H8H8 \
+			 [format %08x $mixDataLeft] \
+			 [format %08x $mixDataRight]] B64 msgOut
+		append bitCacheOut [string range $msgOut $xbits end]
+		# If there are sufficient bits, move
+		# bytes to the temporary holding string.
+		if {[string length $bitCacheOut] >= $msgBits} {
+		    append tempresult \
+			[binary format B$msgBits \
+			     [string range $bitCacheOut 0 $msgBitsSub1]]
+		    set bitCacheOut [string range $bitCacheOut $msgBits end]
+		    incr m $msgBytes
+		    incr chunk $msgBytes
+		}
+		# For CFB mode
+		if {$mode == 1} {
+		    if {$encrypt} {
+			set temp \
+			    [expr {($right << $kOutShiftRight) & 0xffffffff}]
+			set left [expr {$temp | $mixDataLeft}]
+			set right $mixDataRight
+		    } else {
+			set temp \
+			    [expr {($right << $kOutShiftRight) & 0xffffffff}]
+			set left [expr {$temp | $msgDataLeft}]
+			set right $msgDataRight
+		    }
+		}
+	    } else {
+		# All 64 bits of output are used.
+		set kDataLeft $left
+		set kDataRight $right
+		# Eight messages bytes are needed per iteration.
+		binary scan $message x${m}H8H8 leftTemp rightTemp
+		incr m 8
+		incr chunk 8
+		set msgDataLeft "0x$leftTemp"
+		set msgDataRight "0x$rightTemp"
+		# Mix message bits with crypto bits.
+		set mixDataLeft [expr {$msgDataLeft ^ $kDataLeft}]
+		set mixDataRight [expr {$msgDataRight ^ $kDataRight}]
+		# Move bytes to the temporary holding string.
+		append tempresult \
+		    [binary format H16 \
+			 [format %08x%08x $mixDataLeft $mixDataRight]]
+		# For CFB mode
+		if {$mode == 1} {
+		    if {$encrypt} {
+			set left $mixDataLeft
+			set right $mixDataRight
+		    } else {
+			set left $msgDataLeft
+			set right $msgDataRight
+		    }
+		}
+	    }
+
+	    #puts "Left final: [format %08x $left]";
+	    #puts "Right final: [format %08x $right]"
+
+	    if {$chunk >= 512} {
+		append result $tempresult
+		set tempresult {};
+		set chunk 0;
+	    }
+	}; # For every 8 characters, or 64 bits in the message
+        #puts "End: |[format 0x%08x $left]| |[format 0x%08x $right]|"
+	# Save the left and right registers to the feedback vector.
+	set ivec [binary format H* [format %08x $left][format %08x $right]]
+	#puts "Saved Feedback vector: $fbvectors($fbvector)"
+
+        append result $tempresult
+	if {[string length $result] > $len} {
+	    set result [string replace $result $len end]
+	}
+	# Return the result as an array
+	return $result
+    }; # End of stream
+
+    variable pc2bytes0 [list 0 0x4 0x20000000 0x20000004 0x10000 0x10004 0x20010000 0x20010004 0x200 0x204 0x20000200 0x20000204 0x10200 0x10204 0x20010200 0x20010204]
+    variable pc2bytes1 [list 0 0x1 0x100000 0x100001 0x4000000 0x4000001 0x4100000 0x4100001 0x100 0x101 0x100100 0x100101 0x4000100 0x4000101 0x4100100 0x4100101]
+    variable pc2bytes2 [list 0 0x8 0x800 0x808 0x1000000 0x1000008 0x1000800 0x1000808 0 0x8 0x800 0x808 0x1000000 0x1000008 0x1000800 0x1000808]
+    variable pc2bytes3 [list 0 0x200000 0x8000000 0x8200000 0x2000 0x202000 0x8002000 0x8202000 0x20000 0x220000 0x8020000 0x8220000 0x22000 0x222000 0x8022000 0x8222000]
+    variable pc2bytes4 [list 0 0x40000 0x10 0x40010 0 0x40000 0x10 0x40010 0x1000 0x41000 0x1010 0x41010 0x1000 0x41000 0x1010 0x41010]
+    variable pc2bytes5 [list 0 0x400 0x20 0x420 0 0x400 0x20 0x420 0x2000000 0x2000400 0x2000020 0x2000420 0x2000000 0x2000400 0x2000020 0x2000420]
+    variable pc2bytes6 [list 0 0x10000000 0x80000 0x10080000 0x2 0x10000002 0x80002 0x10080002 0 0x10000000 0x80000 0x10080000 0x2 0x10000002 0x80002 0x10080002]
+    variable pc2bytes7 [list 0 0x10000 0x800 0x10800 0x20000000 0x20010000 0x20000800 0x20010800 0x20000 0x30000 0x20800 0x30800 0x20020000 0x20030000 0x20020800 0x20030800]
+    variable pc2bytes8 [list 0 0x40000 0 0x40000 0x2 0x40002 0x2 0x40002 0x2000000 0x2040000 0x2000000 0x2040000 0x2000002 0x2040002 0x2000002 0x2040002]
+    variable pc2bytes9 [list 0 0x10000000 0x8 0x10000008 0 0x10000000 0x8 0x10000008 0x400 0x10000400 0x408 0x10000408 0x400 0x10000400 0x408 0x10000408]
+    variable pc2bytes10 [list 0 0x20 0 0x20 0x100000 0x100020 0x100000 0x100020 0x2000 0x2020 0x2000 0x2020 0x102000 0x102020 0x102000 0x102020]
+    variable pc2bytes11 [list 0 0x1000000 0x200 0x1000200 0x200000 0x1200000 0x200200 0x1200200 0x4000000 0x5000000 0x4000200 0x5000200 0x4200000 0x5200000 0x4200200 0x5200200]
+    variable pc2bytes12 [list 0 0x1000 0x8000000 0x8001000 0x80000 0x81000 0x8080000 0x8081000 0x10 0x1010 0x8000010 0x8001010 0x80010 0x81010 0x8080010 0x8081010]
+    variable pc2bytes13 [list 0 0x4 0x100 0x104 0 0x4 0x100 0x104 0x1 0x5 0x101 0x105 0x1 0x5 0x101 0x105]
+
+    # Now define the left shifts which need to be done
+    variable shifts {0  0  1  1  1  1  1  1  0  1  1  1  1  1  1  0};
+
+    # Procedure: createKeys
+    # Input:
+    #   key     : The 64-bit DES key (Note: The lsb of each byte
+    #             is ignored; odd parity is not required).
+    #
+    #   weak:   If true then weak keys are allowed. The default is to raise an
+    #           error when a weak key is seen.
+    # Output:
+    # The 16 (DES) subkeys.
+    proc createKeys {key {weak 0}} {
+	variable pc2bytes0
+	variable pc2bytes1
+	variable pc2bytes2
+	variable pc2bytes3
+	variable pc2bytes4
+	variable pc2bytes5
+	variable pc2bytes6
+	variable pc2bytes7
+	variable pc2bytes8
+	variable pc2bytes9
+	variable pc2bytes10
+	variable pc2bytes11
+	variable pc2bytes12
+	variable pc2bytes13
+	variable shifts
+
+	# Stores the return keys
+	set keys {}
+	# Other variables
+	set lefttemp {}; set righttemp {}
+	binary scan $key H8H8 lefttemp righttemp
+	set left {}
+	append left "0x" $lefttemp
+	set right {}
+	append right "0x" $righttemp
+
+	#puts "Left key: $left"
+	#puts "Right key: $right"
+
+	# Test for weak keys
+        if {! $weak} {
+            set maskedLeft [expr {$left & 0xfefefefe}]
+            set maskedRight [expr {$right & 0xfefefefe}]
+            if {($maskedLeft == 0x00000000) \
+                    && ($maskedRight == 0x00000000)} {
+                error "The key is weak!"
+            } elseif {($maskedLeft == 0x1e1e1e1e) \
+                          && ($maskedRight == 0x0e0e0e0e)} {
+                error "The key is weak!"
+            } elseif {($maskedLeft == 0xe0e0e0e0) \
+                          && ($maskedRight == 0xf0f0f0f0)} {
+                error "The key is weak!"
+            } elseif {($maskedLeft == 0xfefefefe) \
+                          && ($maskedRight == 0xfefefefe)} {
+                error "The key is weak!"
+            }
+        }
+
+	set temp [expr {(($left >> 4) ^ $right) & 0x0f0f0f0f}]
+	set right [expr {$right ^ $temp}]
+	set left [expr {$left ^ ($temp << 4)}]
+	set temp [expr {(($right >> 16) ^ $left) & 0x0000ffff}]
+	set left [expr {$left ^ $temp}]
+	set right [expr {$right ^ ($temp << 16)}]
+	set temp [expr {(($left >> 2) ^ $right) & 0x33333333}]
+	set right [expr {$right ^ $temp}]
+	set left [expr {$left ^ ($temp << 2)}]
+	set temp [expr {(($right >> 16) ^ $left) & 0x0000ffff}]
+	set left [expr {$left ^ $temp}]
+	set right [expr {$right ^ ($temp << 16)}]
+	set temp [expr {(($left >> 1) ^ $right) & 0x55555555}]
+	set right [expr {$right ^ $temp}]
+	set left [expr {$left ^ ($temp << 1)}]
+	set temp [expr {(($right >> 8) ^ $left) & 0x00ff00ff}]
+	set left [expr {$left ^ $temp}]
+	set right [expr {$right ^ ($temp << 8)}]
+	set temp [expr {(($left >> 1) ^ $right) & 0x55555555}]
+	set right [expr $right ^ $temp]
+	set left [expr {$left ^ ($temp << 1)}]
+	    
+	# puts "Left key PC1: [format %x $left]"
+	# puts "Right key PC1: [format %x $right]"
+
+	# The right side needs to be shifted and to get
+	# the last four bits of the left side
+	set temp [expr {($left << 8) | (($right >> 20) & 0x000000f0)}];
+	# Left needs to be put upside down
+	set left [expr {($right << 24) | (($right << 8) & 0x00ff0000) | \
+			    (($right >> 8) & 0x0000ff00) \
+			    | (($right >> 24) & 0x000000f0)}];
+	set right $temp;
+
+	#puts "Left key juggle: [format %x $left]"
+	#puts "Right key juggle: [format %x $right]"
+
+	# Now go through and perform these
+	# shifts on the left and right keys.
+	foreach i $shifts  {
+	    # Shift the keys either one or two bits to the left.
+	    if {$i} {
+		set left [expr {($left << 2) \
+				    | (($left >> 26) & 0x0000003f)}];
+		set right [expr {($right << 2) \
+				     | (($right >> 26) & 0x0000003f)}];
+	    } else {
+		set left [expr {($left << 1) \
+				    | (($left >> 27) & 0x0000001f)}];
+		set right [expr {($right << 1) \
+				     | (($right >> 27) & 0x0000001f)}];
+	    }
+	    set left [expr {$left & 0xfffffff0}];
+	    set right [expr {$right & 0xfffffff0}];
+
+	    # Now apply PC-2, in such a way that E is easier when encrypting or
+	    # decrypting this conversion will look like PC-2 except only the
+	    # last 6 bits of each byte are used rather than 48 consecutive bits
+	    # and the order of lines will be according to how the S selection
+	    # functions will be applied: S2, S4, S6, S8, S1, S3, S5, S7.
+	    set lefttemp [expr {[lindex $pc2bytes0 [expr {($left >> 28) & 0x0000000f}]] | \
+				    [lindex $pc2bytes1 [expr {($left >> 24) & 0x0000000f}]] | \
+				    [lindex $pc2bytes2 [expr {($left >> 20) & 0x0000000f}]] | \
+				    [lindex $pc2bytes3 [expr {($left >> 16) & 0x0000000f}]] | \
+				    [lindex $pc2bytes4 [expr {($left >> 12) & 0x0000000f}]] | \
+				    [lindex $pc2bytes5 [expr {($left >> 8) & 0x0000000f}]] | \
+				    [lindex $pc2bytes6 [expr {($left >> 4) & 0x0000000f}]]}];
+	    set righttemp [expr {[lindex $pc2bytes7 [expr {($right >> 28) & 0x0000000f}]] | \
+				     [lindex $pc2bytes8 [expr {($right >> 24) & 0x0000000f}]] | \
+				     [lindex $pc2bytes9 [expr {($right >> 20) & 0x0000000f}]] | \
+				     [lindex $pc2bytes10 [expr {($right >> 16) & 0x0000000f}]] | \
+				     [lindex $pc2bytes11 [expr {($right >> 12) & 0x0000000f}]] | \
+				     [lindex $pc2bytes12 [expr {($right >> 8) & 0x0000000f}]] | \
+				     [lindex $pc2bytes13 [expr {($right >> 4) & 0x0000000f}]]}];
+	    set temp [expr {(($righttemp >> 16) ^ $lefttemp) & 0x0000ffff}];
+	    lappend keys [expr {$lefttemp ^ $temp}];
+	    lappend keys [expr {$righttemp ^ ($temp << 16)}];
+	}
+	# Return the keys we've created.
+	return $keys;
+    }; # End of createKeys.
+}; # End of des namespace eval.
+
+package provide tclDESjr 1.0.0
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dicttool/dicttool.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dicttool/dicttool.tcl
new file mode 100644
index 00000000..5e3f384e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dicttool/dicttool.tcl
@@ -0,0 +1,155 @@
+###
+# This package enhances the stock dict implementation with some
+# creature comforts
+###
+if {[info commands ::ladd] eq {}} {
+  proc ladd {varname args} {
+    upvar 1 $varname var
+    if ![info exists var] {
+        set var {}
+    }
+    foreach item $args {
+      if {$item in $var} continue
+      lappend var $item
+    }
+    return $var
+  }
+}
+
+if {[info command ::ldelete] eq {}} {
+  proc ::ldelete {varname args} {
+    upvar 1 $varname var
+    if ![info exists var] {
+        return
+    }
+    foreach item [lsort -unique $args] {
+      while {[set i [lsearch $var $item]]>=0} {
+        set var [lreplace $var $i $i]
+      }
+    }
+    return $var
+  }  
+}
+
+if {[::info commands ::tcl::dict::getnull] eq {}} {
+  proc ::tcl::dict::getnull {dictionary args} {
+    if {[exists $dictionary {*}$args]} {
+      get $dictionary {*}$args
+    }
+  }
+  namespace ensemble configure dict -map [dict replace\
+      [namespace ensemble configure dict -map] getnull ::tcl::dict::getnull]
+}
+if {[::info commands ::tcl::dict::print] eq {}} {
+  ###
+  # Test if element is a dict
+  ###
+  proc ::tcl::dict::_putb {buffervar indent field value} {
+    ::upvar 1 $buffervar buffer
+    ::append buffer \n [::string repeat " " $indent] [::list $field] " "
+    if {[string index $field end] eq "/"} {
+      ::incr indent 2
+      ::append buffer "\{"
+      foreach item $value {
+        if [catch {
+        if {![is_dict $item]} {
+          ::append buffer \n [::string repeat " " $indent] [list $item]
+        } else {
+          ::append buffer \n "[::string repeat " " $indent]\{"
+          ::incr indent 2
+          foreach {sf sv} $item {
+            _putb buffer $indent $sf $sv
+          }
+          ::incr indent -2
+          ::append buffer \n "[::string repeat " " $indent]\}"          
+        }
+        } err] {
+          puts [list FAILED $indent $field $item]
+          puts $err
+          puts "$::errorInfo"
+        }
+      }
+      ::incr indent -2
+      ::append buffer \n [::string repeat " " $indent] "\}"
+    } elseif {[string index $field end] eq ":" || ![is_dict $value]} {
+      ::append buffer [::list $value]
+    } else {
+      ::incr indent 2
+      ::append buffer "\{"
+      foreach {f v} $value {
+        _putb buffer $indent $f $v
+      }
+      ::incr indent -2
+      ::append buffer \n [::string repeat " " $indent] "\}"
+    }
+  }
+  proc ::tcl::dict::print dict {
+    ::set buffer {}
+    ::foreach {field value} $dict {
+      _putb buffer 0 $field $value
+    }
+    return $buffer
+  }
+  
+  namespace ensemble configure dict -map [dict replace\
+      [namespace ensemble configure dict -map] print ::tcl::dict::print]
+}
+if {[::info commands ::tcl::dict::is_dict] eq {}} {
+  ###
+  # Test if element is a dict
+  ###
+  proc ::tcl::dict::is_dict { d } {
+    # is it a dict, or can it be treated like one?
+    if {[catch {dict size $d} err]} {
+      #::set ::errorInfo {}
+      return 0
+    }
+    return 1
+  }
+  namespace ensemble configure dict -map [dict replace\
+      [namespace ensemble configure dict -map] is_dict ::tcl::dict::is_dict]
+}
+if {[::info commands ::tcl::dict::rmerge] eq {}} {
+  ###
+  # title: A recursive form of dict merge
+  # description:
+  # A routine to recursively dig through dicts and merge
+  # adapted from http://stevehavelka.com/tcl-dict-operation-nested-merge/
+  ###
+  proc ::tcl::dict::rmerge {a args} {
+    ::set result $a
+    # Merge b into a, and handle nested dicts appropriately
+    ::foreach b $args {
+      for { k v } $b {
+        if {[string index $k end] eq ":"} {
+          # Element names that end in ":" are assumed to be literals
+          set result $k $v
+        } elseif { [dict exists $result $k] } {
+          # key exists in a and b?  let's see if both values are dicts
+          # both are dicts, so merge the dicts
+          if { [is_dict [get $result $k]] && [is_dict $v] } {
+            set result $k [rmerge [get $result $k] $v]
+          } else {  
+            set result $k $v
+          }
+        } else {
+          set result $k $v
+        }
+      }
+    }
+    return $result
+  }
+  namespace ensemble configure dict -map [dict replace\
+      [namespace ensemble configure dict -map] rmerge ::tcl::dict::rmerge]
+}
+
+if {[::info commands ::tcl::dict::isnull] eq {}} {
+  proc ::tcl::dict::isnull {dictionary args} {
+    if {![exists $dictionary {*}$args]} {return 1}
+    return [expr {[get $dictionary {*}$args] in {{} NULL null}}]
+  }
+  namespace ensemble configure dict -map [dict replace\
+      [namespace ensemble configure dict -map] isnull ::tcl::dict::isnull]
+}
+
+package provide dicttool 1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dicttool/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dicttool/pkgIndex.tcl
new file mode 100644
index 00000000..d0970cf7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dicttool/pkgIndex.tcl
@@ -0,0 +1,11 @@
+# Tcl package index file, version 1.1
+# This file is generated by the "pkg_mkIndex" command
+# and sourced either when an application starts up or
+# by a "package unknown" script.  It invokes the
+# "package ifneeded" command to set up package-related
+# information so that packages will be loaded automatically
+# in response to "package require" commands.  When this
+# script is sourced, the variable $dir must contain the
+# full path name of this file's directory.
+
+package ifneeded dicttool 1.1 [list source [file join $dir dicttool.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/dns.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/dns.tcl
new file mode 100644
index 00000000..316458bb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/dns.tcl
@@ -0,0 +1,1521 @@
+# dns.tcl - Copyright (C) 2002 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# Provide a Tcl only Domain Name Service client. See RFC 1034 and RFC 1035
+# for information about the DNS protocol. This should insulate Tcl scripts
+# from problems with using the system library resolver for slow name servers.
+#
+# This implementation uses TCP only for DNS queries. The protocol recommends
+# that UDP be used in these cases but Tcl does not include UDP sockets by
+# default. The package should be simple to extend to use a TclUDP extension
+# in the future.
+#
+# Support for SPF (http://spf.pobox.com/rfcs.html) will need updating
+# if or when the proposed draft becomes accepted.
+#
+# Support added for RFC1886 - DNS Extensions to support IP version 6
+# Support added for RFC2782 - DNS RR for specifying the location of services
+# Support added for RFC1995 - Incremental Zone Transfer in DNS
+# Support added for RFC7858 - DNS over Transport Layer Security
+#
+# TODO:
+#  - When using tcp we should make better use of the open connection and
+#    send multiple queries along the same connection.
+#
+#  - We must switch to using TCP for truncated UDP packets.
+#
+#  - Read RFC 2136 - dynamic updating of DNS
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2;                # tcl minimum version
+package require logger;                 # tcllib 1.3
+package require uri;                    # tcllib 1.1
+package require uri::urn;               # tcllib 1.2
+package require ip;                     # tcllib 1.7
+
+namespace eval ::dns {
+    namespace export configure resolve name address cname \
+        status reset wait cleanup errorcode
+
+    variable options
+    if {![info exists options]} {
+        array set options {
+            port       53
+            timeout    30000
+            protocol   tcp
+            search     {}
+            nameserver {localhost}
+            loglevel   warn
+            usetls     0
+            cafile     ""
+            cadir      ""
+        }
+        if {[file exists /etc/ssl/certs/ca-certificates.crt]} {
+            set options(cafile) /etc/ssl/certs/ca-certificates.crt
+        }
+        variable log [logger::init dns]
+        ${log}::setlevel $options(loglevel)
+    }
+
+    # We can use either ceptcl or tcludp for UDP support.
+    if {![catch {package require udp 1.0.4} msg]} { ;# tcludp 1.0.4+
+        # If TclUDP 1.0.4 or better is available, use it.
+        set options(protocol) udp
+    } else {
+        if {![catch {package require ceptcl} msg]} {
+            set options(protocol) udp
+        }
+    }
+
+    variable types
+    array set types {
+        A 1  NS 2  MD 3  MF 4  CNAME 5  SOA 6  MB 7  MG 8  MR 9
+        NULL 10  WKS 11  PTR 12  HINFO 13  MINFO 14  MX 15  TXT 16
+        SPF 16 AAAA 28 SRV 33 NAPTR 35 IXFR 251 AXFR 252 MAILB 253
+        MAILA 254
+        ANY 255 * 255
+    }
+
+    variable classes
+    array set classes { IN 1  CS 2  CH  3  HS 4  * 255}
+
+    variable uid
+    if {![info exists uid]} {
+        set uid 0
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Configure the DNS package. In particular the local nameserver will need
+#  to be set. With no options, returns a list of all current settings.
+#
+proc ::dns::configure {args} {
+    variable options
+    variable log
+
+    if {[llength $args] < 1} {
+        set r {}
+        foreach opt [lsort [array names options]] {
+            lappend r -$opt $options($opt)
+        }
+        return $r
+    }
+
+    set cget 0
+    if {[llength $args] == 1} {
+        set cget 1
+    }
+
+    while {[string match -* [lindex $args 0]]} {
+        switch -glob -- [lindex $args 0] {
+            -n* -
+            -ser* {
+                if {$cget} {
+                    return $options(nameserver)
+                } else {
+                    set options(nameserver) [Pop args 1]
+                }
+            }
+            -po*  {
+                if {$cget} {
+                    return $options(port)
+                } else {
+                    set options(port) [Pop args 1]
+                }
+            }
+            -ti*  {
+                if {$cget} {
+                    return $options(timeout)
+                } else {
+                    set options(timeout) [Pop args 1]
+                }
+            }
+            -pr*  {
+                if {$cget} {
+                    return $options(protocol)
+                } else {
+                    set proto [string tolower [Pop args 1]]
+                    if {[string compare udp $proto] == 0 \
+                            && [string compare tcp $proto] == 0} {
+                        return -code error "invalid protocol \"$proto\":\
+                            protocol must be either \"udp\" or \"tcp\""
+                    }
+                    set options(protocol) $proto
+                }
+            }
+            -sea* {
+                if {$cget} {
+                    return $options(search)
+                } else {
+                    set options(search) [Pop args 1]
+                }
+            }
+            -log* {
+                if {$cget} {
+                    return $options(loglevel)
+                } else {
+                    set options(loglevel) [Pop args 1]
+                    ${log}::setlevel $options(loglevel)
+                }
+            }
+            -cafile {
+                if {$cget} {
+                    return $options(cafile)
+                } else {
+                    set options(cafile) [Pop args 1]
+                }
+            }
+            -cadir {
+                if {$cget} {
+                    return $options(cadir)
+                } else {
+                    set options(cadir) [Pop args 1]
+                }
+            }
+            --    { Pop args ; break }
+            default {
+                set opts [join [lsort [array names options]] ", -"]
+                return -code error "bad option [lindex $args 0]:\
+                        must be one of -$opts"
+            }
+        }
+        Pop args
+    }
+
+    return
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Create a DNS query and send to the specified name server. Returns a token
+#  to be used to obtain any further information about this query.
+#
+proc ::dns::resolve {query args} {
+    variable uid
+    variable options
+    variable log
+
+    # get a guaranteed unique and non-present token id.
+    set id [incr uid]
+    while {[info exists [set token [namespace current]::$id]]} {
+        set id [incr uid]
+    }
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    # Setup token/state defaults.
+    set state(id)          $id
+    set state(query)       $query
+    set state(qdata)       ""
+    set state(opcode)      0;                   # 0 = query, 1 = inverse query.
+    set state(-type)       A;                   # DNS record type (A address)
+    set state(-class)      IN;                  # IN (internet address space)
+    set state(-recurse)    1;                   # Recursion Desired
+    set state(-command)    {};                  # asynchronous handler
+    set state(-timeout)    $options(timeout);   # connection timeout default.
+    set state(-nameserver) $options(nameserver);# default nameserver
+    set state(-port)       $options(port);      # default namerservers port
+    set state(-search)     $options(search);    # domain search list
+    set state(-protocol)   $options(protocol);  # which protocol udp/tcp
+    set state(-usetls)     $options(usetls);    # use RFC7858 privacy
+    set state(-cafile)     $options(cafile);    # certificate authority file
+    set state(-cadir)      $options(cadir);     # certificate authority dir
+
+    # Handle DNS URL's
+    if {[string match "dns:*" $query]} {
+        array set URI [uri::split $query]
+        foreach {opt value} [uri::split $query] {
+            if {$value != {} && [info exists state(-$opt)]} {
+                set state(-$opt) $value
+            }
+        }
+        set state(query) $URI(query)
+        ${log}::debug "parsed query: $query"
+    }
+
+    while {[string match -* [lindex $args 0]]} {
+        switch -glob -- [lindex $args 0] {
+            -n* - ns -
+            -ser* { set state(-nameserver) [Pop args 1] }
+            -po*  { set state(-port) [Pop args 1] }
+            -usetls { set state(-usetls) [Pop args 1] }
+            -cafile { set state(-cafile) [Pop args 1] }
+            -cadir { set state(-cadir) [Pop args 1] }
+            -ti*  { set state(-timeout) [Pop args 1] }
+            -co*  { set state(-command) [Pop args 1] }
+            -cl*  { set state(-class) [Pop args 1] }
+            -ty*  { set state(-type) [Pop args 1] }
+            -pr*  { set state(-protocol) [Pop args 1] }
+            -sea* { set state(-search) [Pop args 1] }
+            -re*  { set state(-recurse) [Pop args 1] }
+            -inv* { set state(opcode) 1 }
+            -status {set state(opcode) 2}
+            -data { set state(qdata) [Pop args 1] }
+            default {
+                set opts [join [lsort [array names state -*]] ", "]
+                return -code error "bad option [lindex $args 0]: \
+                        must be $opts"
+            }
+        }
+        Pop args
+    }
+
+    if {$state(-nameserver) == {}} {
+        return -code error "no nameserver specified"
+    }
+
+    if {$state(-usetls)} {
+        package require tls
+        set state(-protocol) "tcp"
+        if {$state(-port) == $options(port)} {
+            set state(-port) 853
+        }
+    }
+
+    if {$state(-protocol) == "udp"} {
+        if {[llength [package provide ceptcl]] == 0 \
+                && [llength [package provide udp]] == 0} {
+            return -code error "udp support is not available,\
+                get ceptcl or tcludp"
+        }
+    }
+
+    # Check for reverse lookups. IPv4 first, then IPv6.
+    if {[regexp {^(?:\d{0,3}\.){3}\d{0,3}$} $state(query)]} {
+        set addr [lreverse [split $state(query) .]]
+        lappend addr in-addr arpa
+        set state(query) [join $addr .]
+        set state(-type) PTR
+    } elseif {[string match {*:*} $state(query)]} {
+        set addr [ip::normalize $state(query)]
+        set addr [split [string reverse $addr] :]
+        set addr [join [split [join $addr ""] {}] .]
+        lappend addr ip6 arpa
+        set state(query) [join $addr .]
+        set state(-type) PTR
+    }
+
+    BuildMessage $token
+
+    if {$state(-protocol) == "tcp"} {
+        TcpTransmit $token
+    } else {
+        UdpTransmit $token
+    }
+    if {$state(-command) == {}} {
+        wait $token
+    }
+    return $token
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Return a list of domain names returned as results for the last query.
+#
+proc ::dns::name {token} {
+    set r {}
+    Flags $token flags
+    array set reply [Decode $token]
+
+    switch -exact -- $flags(opcode) {
+        0 {
+            # QUERY
+            foreach answer $reply(AN) {
+                array set AN $answer
+                if {![info exists AN(type)]} {set AN(type) {}}
+                switch -exact -- $AN(type) {
+                    MX - NS - PTR {
+                        if {[info exists AN(rdata)]} {lappend r $AN(rdata)}
+                    }
+                    default {
+                        if {[info exists AN(name)]} {
+                            lappend r $AN(name)
+                        }
+                    }
+                }
+            }
+        }
+
+        1 {
+            # IQUERY
+            foreach answer $reply(QD) {
+                array set QD $answer
+                lappend r $QD(name)
+            }
+        }
+        default {
+            return -code error "not supported for this query type"
+        }
+    }
+    return $r
+}
+
+# Description:
+#  Return a list of the IP addresses returned for this query.
+#
+proc ::dns::address {token} {
+    set r {}
+    array set reply [Decode $token]
+    foreach answer $reply(AN) {
+        array set AN $answer
+
+        if {[info exists AN(type)]} {
+            switch -exact -- $AN(type) {
+                "A" {
+                    lappend r $AN(rdata)
+                }
+                "AAAA" {
+                    lappend r $AN(rdata)
+                }
+            }
+        }
+    }
+    return $r
+}
+
+# Description:
+#  Return a list of all CNAME results returned for this query.
+#
+proc ::dns::cname {token} {
+    set r {}
+    array set reply [Decode $token]
+    foreach answer $reply(AN) {
+        array set AN $answer
+
+        if {[info exists AN(type)]} {
+            if {$AN(type) == "CNAME"} {
+                lappend r $AN(rdata)
+            }
+        }
+    }
+    return $r
+}
+
+# Description:
+#   Return the decoded answer records. This can be used for more complex
+#   queries where the answer isn't supported byb cname/address/name.
+proc ::dns::result {token args} {
+    array set reply [eval [linsert $args 0 Decode $token]]
+    return $reply(AN)
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Get the status of the request.
+#
+proc ::dns::status {token} {
+    upvar #0 $token state
+    return $state(status)
+}
+
+# Description:
+#  Get the error message. Empty if no error.
+#
+proc ::dns::error {token} {
+    upvar #0 $token state
+    if {[info exists state(error)]} {
+	return $state(error)
+    }
+    return ""
+}
+
+# Description
+#  Get the error code. This is 0 for a successful transaction.
+#
+proc ::dns::errorcode {token} {
+    upvar #0 $token state
+    set flags [Flags $token]
+    set ndx [lsearch -exact $flags errorcode]
+    incr ndx
+    return [lindex $flags $ndx]
+}
+
+# Description:
+#  Reset a connection with optional reason.
+#
+proc ::dns::reset {token {why reset} {errormsg {}}} {
+    upvar #0 $token state
+    set state(status) $why
+    if {[string length $errormsg] > 0 && ![info exists state(error)]} {
+        set state(error) $errormsg
+    }
+    catch {fileevent $state(sock) readable {}}
+    Finish $token
+}
+
+# Description:
+#  Wait for a request to complete and return the status.
+#
+proc ::dns::wait {token} {
+    upvar #0 $token state
+
+    if {$state(status) == "connect"} {
+        vwait [subst $token](status)
+    }
+
+    return $state(status)
+}
+
+# Description:
+#  Remove any state associated with this token.
+#
+proc ::dns::cleanup {token} {
+    upvar #0 $token state
+    if {[info exists state]} {
+        catch {close $state(sock)}
+        catch {after cancel $state(after)}
+        unset state
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Dump the raw data of the request and reply packets.
+#
+proc ::dns::dump {args} {
+    if {[llength $args] == 1} {
+        set type -reply
+        set token [lindex $args 0]
+    } elseif { [llength $args] == 2 } {
+        set type [lindex $args 0]
+        set token [lindex $args 1]
+    } else {
+        return -code error "wrong # args:\
+            should be \"dump ?option? methodName\""
+    }
+
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set result {}
+    switch -glob -- $type {
+        -qu*    -
+        -req*   {
+            set result [DumpMessage $state(request)]
+        }
+        -rep*   {
+            set result [DumpMessage $state(reply)]
+        }
+        default {
+            error "unrecognised option: must be one of \
+                    \"-query\", \"-request\" or \"-reply\""
+        }
+    }
+
+    return $result
+}
+
+# Description:
+#  Perform a hex dump of binary data.
+#
+proc ::dns::DumpMessage {data} {
+    set result {}
+    binary scan $data c* r
+    foreach c $r {
+        append result [format "%02x " [expr {$c & 0xff}]]
+    }
+    return $result
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Contruct a DNS query packet.
+#
+proc ::dns::BuildMessage {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+    variable types
+    variable classes
+    variable options
+
+    if {! [info exists types($state(-type))] } {
+        return -code error "invalid DNS query type"
+    }
+
+    if {! [info exists classes($state(-class))] } {
+        return -code error "invalid DNS query class"
+    }
+
+    set qdcount 0
+    set qsection {}
+    set nscount 0
+    set nsdata {}
+
+    # In theory we can send multiple queries. In practice, named doesn't
+    # appear to like that much. If it did work we'd do this:
+    #  foreach domain [linsert $options(search) 0 {}] ...
+
+
+    # Pack the query: QNAME QTYPE QCLASS
+    set qsection [PackName $state(query)]
+    append qsection [binary format SS \
+                         $types($state(-type))\
+                         $classes($state(-class))]
+    incr qdcount
+
+    if {[string length $state(qdata)] > 0} {
+        set nsdata [eval [linsert $state(qdata) 0 PackRecord]]
+        incr nscount
+    }
+
+    switch -exact -- $state(opcode) {
+        0 {
+            # QUERY
+            set state(request) [binary format SSSSSS $state(id) \
+                [expr {($state(opcode) << 11) | ($state(-recurse) << 8)}] \
+                                    $qdcount 0 $nscount 0]
+            append state(request) $qsection $nsdata
+        }
+        1 {
+            # IQUERY
+            set state(request) [binary format SSSSSS $state(id) \
+                [expr {($state(opcode) << 11) | ($state(-recurse) << 8)}] \
+                0 $qdcount 0 0 0]
+            append state(request) \
+                [binary format cSSI 0 \
+                     $types($state(-type)) $classes($state(-class)) 0]
+            switch -exact -- $state(-type) {
+                A {
+                    append state(request) \
+                        [binary format Sc4 4 [split $state(query) .]]
+                }
+                PTR {
+                    append state(request) \
+                        [binary format Sc4 4 [split $state(query) .]]
+                }
+                default {
+                    return -code error "inverse query not supported for this type"
+                }
+            }
+        }
+        default {
+            return -code error "operation not supported"
+        }
+    }
+
+    return
+}
+
+# Pack a human readable dns name into a DNS resource record format.
+proc ::dns::PackName {name} {
+    set data ""
+    foreach part [split [string trim $name .] .] {
+        set len [string length $part]
+        append data [binary format ca$len $len $part]
+    }
+    append data \x00
+    return $data
+}
+
+# Pack a character string - byte length prefixed
+proc ::dns::PackString {text} {
+    set len [string length $text]
+    set data [binary format ca$len $len $text]
+    return $data
+}
+
+# Pack up a single DNS resource record. See RFC1035: 3.2 for the format
+# of each type.
+# eg: PackRecord name wiki.tcl.tk type MX class IN rdata {10 mail.example.com}
+#
+proc ::dns::PackRecord {args} {
+    variable types
+    variable classes
+    array set rr {name "" type A class IN ttl 0 rdlength 0 rdata ""}
+    array set rr $args
+    set data [PackName $rr(name)]
+
+    switch -exact -- $rr(type) {
+        CNAME - MB - MD - MF - MG - MR - NS - PTR {
+            set rr(rdata) [PackName $rr(rdata)]
+        }
+        HINFO {
+            array set r {CPU {} OS {}}
+            array set r $rr(rdata)
+            set rr(rdata) [PackString $r(CPU)]
+            append rr(rdata) [PackString $r(OS)]
+        }
+        MINFO {
+            array set r {RMAILBX {} EMAILBX {}}
+            array set r $rr(rdata)
+            set rr(rdata) [PackString $r(RMAILBX)]
+            append rr(rdata) [PackString $r(EMAILBX)]
+        }
+        MX {
+            foreach {pref exch} $rr(rdata) break
+            set rr(rdata) [binary format S $pref]
+            append rr(rdata) [PackName $exch]
+        }
+        TXT {
+            set str $rr(rdata)
+            set len [string length [set str $rr(rdata)]]
+            set rr(rdata) ""
+            for {set n 0} {$n < $len} {incr n} {
+                set s [string range $str $n [incr n 253]]
+                append rr(rdata) [PackString $s]
+            }
+        }
+        NULL {}
+        SOA {
+            array set r {MNAME {} RNAME {}
+                SERIAL 0 REFRESH 0 RETRY 0 EXPIRE 0 MINIMUM 0}
+            array set r $rr(rdata)
+            set rr(rdata) [PackName $r(MNAME)]
+            append rr(rdata) [PackName $r(RNAME)]
+            append rr(rdata) [binary format IIIII $r(SERIAL) \
+                                  $r(REFRESH) $r(RETRY) $r(EXPIRE) $r(MINIMUM)]
+        }
+    }
+
+    # append the root label and the type flag and query class.
+    append data [binary format SSIS $types($rr(type)) \
+                     $classes($rr(class)) $rr(ttl) [string length $rr(rdata)]]
+    append data $rr(rdata)
+    return $data
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Transmit a DNS request over a tcp connection.
+#
+proc ::dns::TcpTransmit {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    # setup the timeout
+    if {$state(-timeout) > 0} {
+        set state(after) [after $state(-timeout) \
+                              [list [namespace origin reset] \
+                                   $token timeout\
+                                   "operation timed out"]]
+    }
+
+    # Sometimes DNS servers drop TCP requests. So it's better to
+    # use asynchronous connect
+    set s [socket -async $state(-nameserver) $state(-port)]
+    fileevent $s writable [list [namespace origin TcpConnected] $token $s]
+    set state(sock) $s
+    set state(status) connect
+
+    return $token
+}
+
+proc ::dns::TcpConnected {token s} {
+    variable $token
+    upvar 0 $token state
+
+    fileevent $s writable {}
+    if {[catch {fconfigure $s -peername}]} {
+	# TCP connection failed
+        Finish $token "can't connect to server"
+	return
+    }
+
+    if {$state(-usetls)} {
+        tls::import $s -server false -request 1 \
+            -cadir $state(-cadir) \
+            -cafile $state(-cafile) \
+            -ssl2 false -ssl3 false -tls1 true \
+            -command [list ::dns::TlsCallback $token]
+        if {[catch {tls::handshake $s} err]} {
+            Finish $token $err
+            return
+        }
+    }
+
+    fconfigure $s -blocking 0 -translation binary -buffering none
+
+    # For TCP the message must be prefixed with a 16bit length field.
+    set req [binary format S [string length $state(request)]]
+    append req $state(request)
+
+    fileevent $s readable [list [namespace current]::TcpEvent $token]
+    puts -nonewline $s $req
+}
+
+proc ::dns::TlsCallback {token cmd channel args} {
+    variable log
+    variable $token
+    upvar 0 $token state
+    switch -exact -- $cmd {
+        info {
+            foreach {major minor message} $args break
+            ${log}::debug "TLS: $major/$minor $message"
+        }
+        verify {
+            foreach {depth cert status error} $args break
+            lappend state(certChain) \
+                [list depth $depth status $status error $error cert $cert]
+            return $status
+        }
+        error {
+            return -code error "tls error: $args"
+        }
+        default {
+            return -code error "unexpected message type \"$cmd\" in TLS callback"
+        }
+    }
+    return 1
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Transmit a DNS request using UDP datagrams
+#
+# Note:
+#  This requires a UDP implementation that can transmit binary data.
+#  As yet I have been unable to test this myself and the tcludp package
+#  cannot do this.
+#
+proc ::dns::UdpTransmit {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    # setup the timeout
+    if {$state(-timeout) > 0} {
+        set state(after) [after $state(-timeout) \
+                              [list [namespace origin reset] \
+                                   $token timeout\
+                                  "operation timed out"]]
+    }
+
+    if {[llength [package provide ceptcl]] > 0} {
+        # using ceptcl
+        set state(sock) [cep -type datagram $state(-nameserver) $state(-port)]
+        fconfigure $state(sock) -blocking 0
+    } else {
+        # using tcludp
+        set state(sock) [udp_open]
+        udp_conf $state(sock) $state(-nameserver) $state(-port)
+    }
+    fconfigure $state(sock) -translation binary -buffering none
+    set state(status) connect
+    puts -nonewline $state(sock) $state(request)
+
+    fileevent $state(sock) readable [list [namespace current]::UdpEvent $token]
+
+    return $token
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Tidy up after a tcp transaction.
+#
+proc ::dns::Finish {token {errormsg ""}} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+    global errorInfo errorCode
+
+    if {[string length $errormsg] != 0} {
+	set state(error) $errormsg
+	set state(status) error
+    }
+    catch {close $state(sock)}
+    catch {after cancel $state(after)}
+    if {[info exists state(-command)] && $state(-command) != {}} {
+	if {[catch {
+            uplevel #0 [linsert $state(-command) end $token]
+        } err]} {
+	    if {[string length $errormsg] == 0} {
+		set state(error) [list $err $errorInfo $errorCode]
+		set state(status) error
+	    }
+	}
+        if {[info exists state(-command)]} {
+            unset state(-command)
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Handle end-of-file on a tcp connection.
+#
+proc ::dns::Eof {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+    set state(status) eof
+    Finish $token
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Process a DNS reply packet (protocol independent)
+#
+proc ::dns::Receive {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    binary scan $state(reply) SS id flags
+    set status [expr {$flags & 0x000F}]
+
+    switch -- $status {
+        0 {
+            set state(status) ok
+            Finish $token
+        }
+        1 { Finish $token "Format error - unable to interpret the query." }
+        2 { Finish $token "Server failure - internal server error." }
+        3 { Finish $token "Name Error - domain does not exist" }
+        4 { Finish $token "Not implemented - the query type is not available." }
+        5 { Finish $token "Refused - your request has been refused by the server." }
+        default {
+            Finish $token "unrecognised error code: $err"
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  file event handler for tcp socket. Wait for the reply data.
+#
+proc ::dns::TcpEvent {token} {
+    variable log
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+    set s $state(sock)
+
+    if {[eof $s]} {
+        Eof $token
+        return
+    }
+
+    set status [catch {read $state(sock)} result]
+    if {$status != 0} {
+        ${log}::debug "Event error: $result"
+        Finish $token "error reading data: $result"
+    } elseif { [string length $result] >= 0 } {
+        ${log}::debug "read [string length $result] bytes for $token"
+        if {[catch {
+            # Handle incomplete reads - check the size and keep reading.
+            if {![info exists state(size)]} {
+                binary scan $result S state(size)
+                set result [string range $result 2 end]
+            }
+            append state(reply) $result
+
+            # check the length and flags and chop off the tcp length prefix.
+            if {[string length $state(reply)] >= $state(size)} {
+                binary scan $result S id
+                set id [expr {$id & 0xFFFF}]
+                if {$id != [expr {$state(id) & 0xFFFF}]} {
+                    ${log}::error "received packed with incorrect id"
+                }
+                # bug #1158037 - doing this causes problems > 65535 requests!
+                #Receive [namespace current]::$id
+                Receive $token
+            } else {
+                ${log}::debug "Incomplete tcp read:\
+                   [string length $state(reply)] should be $state(size)"
+            }
+        } err]} {
+            Finish $token "Event error: $err"
+        }
+    } elseif { [eof $state(sock)] } {
+        Eof $token
+    } elseif { [fblocked $state(sock)] } {
+        ${log}::debug "Event blocked"
+    } else {
+        ${log}::critical "Event error: this can't happen!"
+        Finish $token "Event error: this can't happen!"
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  file event handler for udp sockets.
+proc ::dns::UdpEvent {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+    set s $state(sock)
+
+    set payload [read $state(sock)]
+    append state(reply) $payload
+
+    binary scan $payload S id
+    set id [expr {$id & 0xFFFF}]
+    if {$id != [expr {$state(id) & 0xFFFF}]} {
+        ${log}::error "received packed with incorrect id"
+    }
+    # bug #1158037 - doing this causes problems > 65535 requests!
+    #Receive [namespace current]::$id
+    Receive $token
+}
+
+# -------------------------------------------------------------------------
+
+proc ::dns::Flags {token {varname {}}} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    if {$varname != {}} {
+        upvar $varname flags
+    }
+
+    array set flags {query 0 opcode 0 authoritative 0 errorcode 0
+        truncated 0 recursion_desired 0 recursion_allowed 0}
+
+    binary scan $state(reply) SSSSSS mid hdr nQD nAN nNS nAR
+
+    set flags(response)           [expr {($hdr & 0x8000) >> 15}]
+    set flags(opcode)             [expr {($hdr & 0x7800) >> 11}]
+    set flags(authoritative)      [expr {($hdr & 0x0400) >> 10}]
+    set flags(truncated)          [expr {($hdr & 0x0200) >> 9}]
+    set flags(recursion_desired)  [expr {($hdr & 0x0100) >> 8}]
+    set flags(recursion_allowed)  [expr {($hdr & 0x0080) >> 7}]
+    set flags(errorcode)          [expr {($hdr & 0x000F)}]
+
+    return [array get flags]
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Decode a DNS packet (either query or response).
+#
+proc ::dns::Decode {token args} {
+    variable log
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    array set opts {-rdata 0 -query 0}
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -exact -- $option {
+            -rdata { set opts(-rdata) 1 }
+            -query { set opts(-query) 1 }
+            default {
+                return -code error "bad option \"$option\":\
+                    must be -rdata"
+            }
+        }
+        Pop args
+    }
+
+    if {$opts(-query)} {
+        binary scan $state(request) SSSSSSc* mid hdr nQD nAN nNS nAR data
+    } else {
+        binary scan $state(reply) SSSSSSc* mid hdr nQD nAN nNS nAR data
+    }
+
+    set fResponse      [expr {($hdr & 0x8000) >> 15}]
+    set fOpcode        [expr {($hdr & 0x7800) >> 11}]
+    set fAuthoritative [expr {($hdr & 0x0400) >> 10}]
+    set fTrunc         [expr {($hdr & 0x0200) >> 9}]
+    set fRecurse       [expr {($hdr & 0x0100) >> 8}]
+    set fCanRecurse    [expr {($hdr & 0x0080) >> 7}]
+    set fRCode         [expr {($hdr & 0x000F)}]
+    set flags ""
+
+    if {$fResponse} {set flags "QR"} else {set flags "Q"}
+    set opcodes [list QUERY IQUERY STATUS]
+    lappend flags [lindex $opcodes $fOpcode]
+    if {$fAuthoritative} {lappend flags "AA"}
+    if {$fTrunc} {lappend flags "TC"}
+    if {$fRecurse} {lappend flags "RD"}
+    if {$fCanRecurse} {lappend flags "RA"}
+
+    set info "ID: $mid\
+              Fl: [format 0x%02X [expr {$hdr & 0xFFFF}]] ($flags)\
+              NQ: $nQD\
+              NA: $nAN\
+              NS: $nNS\
+              AR: $nAR"
+    ${log}::debug $info
+
+    set ndx 12
+    set r {}
+    set QD [ReadQuestion $nQD $state(reply) ndx]
+    lappend r QD $QD
+    set AN [ReadAnswer $nAN $state(reply) ndx $opts(-rdata)]
+    lappend r AN $AN
+    set NS [ReadAnswer $nNS $state(reply) ndx $opts(-rdata)]
+    lappend r NS $NS
+    set AR [ReadAnswer $nAR $state(reply) ndx $opts(-rdata)]
+    lappend r AR $AR
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+proc ::dns::Expand {data} {
+    set r {}
+    binary scan $data c* d
+    foreach c $d {
+        lappend r [expr {$c & 0xFF}]
+    }
+    return $r
+}
+
+
+# -------------------------------------------------------------------------
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::dns::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Reverse a list. Code from http://wiki.tcl.tk/tcl/43
+#
+proc ::dns::lreverse {lst} {
+    set res {}
+    set i [llength $lst]
+    while {$i} {lappend res [lindex $lst [incr i -1]]}
+    return $res
+}
+
+# -------------------------------------------------------------------------
+
+proc ::dns::KeyOf {arrayname value {default {}}} {
+    upvar $arrayname array
+    set lst [array get array]
+    set ndx [lsearch -exact $lst $value]
+    if {$ndx != -1} {
+        incr ndx -1
+        set r [lindex $lst $ndx]
+    } else {
+        set r $default
+    }
+    return $r
+}
+
+
+# -------------------------------------------------------------------------
+# Read the question section from a DNS message. This always starts at index
+# 12 of a message but may be of variable length.
+#
+proc ::dns::ReadQuestion {nitems data indexvar} {
+    variable types
+    variable classes
+    upvar $indexvar index
+    set result {}
+
+    for {set cn 0} {$cn < $nitems} {incr cn} {
+        set r {}
+        lappend r name [ReadName data $index offset]
+        incr index $offset
+
+        # Read off QTYPE and QCLASS for this query.
+        set ndx $index
+        incr index 3
+        binary scan [string range $data $ndx $index] SS qtype qclass
+        set qtype [expr {$qtype & 0xFFFF}]
+        set qclass [expr {$qclass & 0xFFFF}]
+        incr index
+        lappend r type [KeyOf types $qtype $qtype] \
+                  class [KeyOf classes $qclass $qclass]
+        lappend result $r
+    }
+    return $result
+}
+
+# -------------------------------------------------------------------------
+
+# Read an answer section from a DNS message.
+#
+proc ::dns::ReadAnswer {nitems data indexvar {raw 0}} {
+    variable types
+    variable classes
+    upvar $indexvar index
+    set result {}
+
+    for {set cn 0} {$cn < $nitems} {incr cn} {
+        set r {}
+        lappend r name [ReadName data $index offset]
+        incr index $offset
+
+        # Read off TYPE, CLASS, TTL and RDLENGTH
+        binary scan [string range $data $index end] SSIS type class ttl rdlength
+
+        set type [expr {$type & 0xFFFF}]
+        set type [KeyOf types $type $type]
+
+        set class [expr {$class & 0xFFFF}]
+        set class [KeyOf classes $class $class]
+
+        set ttl [expr {$ttl & 0xFFFFFFFF}]
+        set rdlength [expr {$rdlength & 0xFFFF}]
+        incr index 10
+        set rdata [string range $data $index [expr {$index + $rdlength - 1}]]
+
+        if {! $raw} {
+            switch -- $type {
+                A {
+                    set rdata [join [Expand $rdata] .]
+                }
+                AAAA {
+                    set rdata [ip::contract [ip::ToString $rdata]]
+                }
+                NS - CNAME - PTR {
+                    set rdata [ReadName data $index off]
+                }
+                MX {
+                    binary scan $rdata S preference
+                    set exchange [ReadName data [expr {$index + 2}] off]
+                    set rdata [list $preference $exchange]
+                }
+                SRV {
+                    set x $index
+                    set rdata [list priority [ReadUShort data $x off]]
+                    incr x $off
+                    lappend rdata weight [ReadUShort data $x off]
+                    incr x $off
+                    lappend rdata port [ReadUShort data $x off]
+                    incr x $off
+                    lappend rdata target [ReadName data $x off]
+                }
+		NAPTR {
+		    set x $index
+		    set rdata [list order [ReadUShort data $x off]]
+		    incr x $off
+		    lappend rdata preference [ReadUShort data $x off]
+		    incr x $off
+		    lappend rdata flags [ReadString data $x off]
+		    incr x $off
+		    lappend rdata service [ReadString data $x off]
+		    incr x $off
+		    lappend rdata regex [ReadString data $x off]
+		    incr x $off
+		    set domain {}
+		    while {$x < $index + $rdlength} {
+			lappend domain [ReadString data $x off]
+			incr x $off
+		    }
+		    lappend rdata replacement [join $domain .]
+		}
+                TXT {
+		    set x $index
+		    set rdata ""
+		    while {$x < $index + $rdlength} {
+			append rdata [ReadString data $x off]
+			incr x $off
+		    }
+                }
+                SOA {
+                    set x $index
+                    set rdata [list MNAME [ReadName data $x off]]
+                    incr x $off
+                    lappend rdata RNAME [ReadName data $x off]
+                    incr x $off
+                    lappend rdata SERIAL [ReadULong data $x off]
+                    incr x $off
+                    lappend rdata REFRESH [ReadLong data $x off]
+                    incr x $off
+                    lappend rdata RETRY [ReadLong data $x off]
+                    incr x $off
+                    lappend rdata EXPIRE [ReadLong data $x off]
+                    incr x $off
+                    lappend rdata MINIMUM [ReadULong data $x off]
+                    incr x $off
+                }
+            }
+        }
+
+        incr index $rdlength
+        lappend r type $type class $class ttl $ttl rdlength $rdlength rdata $rdata
+        lappend result $r
+    }
+    return $result
+}
+
+
+# Read a 32bit integer from a DNS packet. These are compatible with
+# the ReadName proc. Additionally - ReadULong takes measures to ensure
+# the unsignedness of the value obtained.
+#
+proc ::dns::ReadLong {datavar index usedvar} {
+    upvar $datavar data
+    upvar $usedvar used
+    set r {}
+    set used 0
+    if {[binary scan $data @${index}I r]} {
+        set used 4
+    }
+    return $r
+}
+
+proc ::dns::ReadULong {datavar index usedvar} {
+    upvar $datavar data
+    upvar $usedvar used
+    set r {}
+    set used 0
+    if {[binary scan $data @${index}cccc b1 b2 b3 b4]} {
+        set used 4
+        # This gets us an unsigned value.
+        set r [expr {($b4 & 0xFF) + (($b3 & 0xFF) << 8)
+                     + (($b2 & 0xFF) << 16) + ($b1 << 24)}]
+    }
+    return $r
+}
+
+proc ::dns::ReadUShort {datavar index usedvar} {
+    upvar $datavar data
+    upvar $usedvar used
+    set r {}
+    set used 0
+    if {[binary scan [string range $data $index end] cc b1 b2]} {
+        set used 2
+        # This gets us an unsigned value.
+        set r [expr {(($b2 & 0xff) + (($b1 & 0xff) << 8)) & 0xffff}]
+    }
+    return $r
+}
+
+# Read off the NAME or QNAME element. This reads off each label in turn,
+# dereferencing pointer labels until we have finished. The length of data
+# used is passed back using the usedvar variable.
+#
+proc ::dns::ReadName {datavar index usedvar} {
+    upvar $datavar data
+    upvar $usedvar used
+    set startindex $index
+
+    set r {}
+    set len 1
+    set max [string length $data]
+
+    while {$len != 0 && $index < $max} {
+        # Read the label length (and preread the pointer offset)
+        binary scan [string range $data $index end] cc len lenb
+        set len [expr {$len & 0xFF}]
+        incr index
+
+        if {$len != 0} {
+            if {[expr {$len & 0xc0}]} {
+                binary scan [binary format cc [expr {$len & 0x3f}] [expr {$lenb & 0xff}]] S offset
+                incr index
+                lappend r [ReadName data $offset junk]
+                set len 0
+            } else {
+                lappend r [string range $data $index [expr {$index + $len - 1}]]
+                incr index $len
+            }
+        }
+    }
+    set used [expr {$index - $startindex}]
+    return [join $r .]
+}
+
+proc ::dns::ReadString {datavar index usedvar} {
+    upvar $datavar data
+    upvar $usedvar used
+    set startindex $index
+
+    set r {}
+
+    if {[binary scan [string range $data $index end] c len] == 1} {
+	set len [expr {$len & 0xFF}]
+	incr index
+
+	if {$len != 0} {
+	    set r [string range $data $index [expr {$index + $len - 1}]]
+	    incr index $len
+	}
+    }
+    set used [expr {$index - $startindex}]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# Support for finding the local nameservers
+#
+# For unix we can just parse the /etc/resolv.conf if it exists.
+# Of course, some unices use /etc/resolver and other things (NIS for instance)
+# On Windows, we can examine the Internet Explorer settings from the registry.
+#
+switch -exact $::tcl_platform(platform) {
+    windows {
+        proc ::dns::nameservers {} {
+            package require registry
+            set base {HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services}
+            set param "$base\\Tcpip\\Parameters"
+            set interfaces "$param\\Interfaces"
+            set nameservers {}
+            if {[string equal $::tcl_platform(os) "Windows NT"]} {
+                AppendRegistryValue $param NameServer nameservers
+                AppendRegistryValue $param DhcpNameServer nameservers
+                foreach i [registry keys $interfaces] {
+                    AppendRegistryValue "$interfaces\\$i" NameServer nameservers
+                    AppendRegistryValue "$interfaces\\$i" DhcpNameServer nameservers
+                }
+            } else {
+                set param "$base\\VxD\\MSTCP"
+                AppendRegistryValue $param NameServer nameservers
+            }
+            return $nameservers
+        }
+        proc ::dns::AppendRegistryValue {key val listName} {
+            upvar $listName lst
+            if {![catch {registry get $key $val} v]} {
+                foreach ns [split $v ", "] {
+                    if {[lsearch -exact $lst $ns] == -1} {
+                        lappend lst $ns
+                    }
+                }
+            }
+        }
+    }
+    unix {
+        proc ::dns::nameservers {} {
+            set nameservers {}
+            if {[file readable /etc/resolv.conf]} {
+                set f [open /etc/resolv.conf r]
+                while {![eof $f]} {
+                    gets $f line
+                    if {[regexp {^\s*nameserver\s+(.*)$} $line -> ns]} {
+                        lappend nameservers $ns
+                    }
+                }
+                close $f
+            }
+            if {[llength $nameservers] < 1} {
+                lappend nameservers 127.0.0.1
+            }
+            return $nameservers
+        }
+    }
+    default {
+        proc ::dns::nameservers {} {
+            return -code error "command not supported for this platform."
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+# Possible support for the DNS URL scheme.
+# Ref: http://www.ietf.org/internet-drafts/draft-josefsson-dns-url-04.txt
+# eg: dns:target?class=IN;type=A
+#     dns://nameserver/target?type=A
+#
+# URI quoting to be accounted for.
+#
+
+catch {
+    uri::register {dns} {
+        variable escape     [set [namespace parent [namespace current]]::basic::escape]
+        variable host       [set [namespace parent [namespace current]]::basic::host]
+        variable hostOrPort [set [namespace parent [namespace current]]::basic::hostOrPort]
+
+        variable class [string map {* \\\\*} \
+                       "class=([join [array names ::dns::classes] {|}])"]
+        variable type  [string map {* \\\\*} \
+                       "type=([join [array names ::dns::types] {|}])"]
+        variable classOrType "(?:${class}|${type})"
+        variable classOrTypeSpec "(?:${class}|${type})(?:;(?:${class}|${type}))?"
+
+        variable query "${host}(${classOrTypeSpec})?"
+        variable schemepart "(//${hostOrPort}/)?(${query})"
+        variable url "dns:$schemepart"
+    }
+}
+
+namespace eval ::uri {} ;# needed for pkg_mkIndex.
+
+proc ::uri::SplitDns {uri} {
+    upvar \#0 [namespace current]::dns::schemepart schemepart
+    upvar \#0 [namespace current]::dns::class classOrType
+    upvar \#0 [namespace current]::dns::class classRE
+    upvar \#0 [namespace current]::dns::type typeRE
+    upvar \#0 [namespace current]::dns::classOrTypeSpec classOrTypeSpec
+
+    array set parts {nameserver {} query {} class {} type {} port {}}
+
+    # validate the uri
+    if {[regexp -- $dns::schemepart $uri r] == 1} {
+
+        # deal with the optional class and type specifiers
+        if {[regexp -indices -- "${classOrTypeSpec}$" $uri range]} {
+            set spec [string range $uri [lindex $range 0] [lindex $range 1]]
+            set uri [string range $uri 0 [expr {[lindex $range 0] - 2}]]
+
+            if {[regexp -- "$classRE" $spec -> class]} {
+                set parts(class) $class
+            }
+            if {[regexp -- "$typeRE" $spec -> type]} {
+                set parts(type) $type
+            }
+        }
+
+        # Handle the nameserver specification
+        if {[string match "//*" $uri]} {
+            set uri [string range $uri 2 end]
+            array set tmp [GetUPHP uri]
+            set parts(nameserver) $tmp(host)
+            set parts(port) $tmp(port)
+        }
+
+        # what's left is the query domain name.
+        set parts(query) [string trimleft $uri /]
+    }
+
+    return [array get parts]
+}
+
+proc ::uri::JoinDns {args} {
+    array set parts {nameserver {} port {} query {} class {} type {}}
+    array set parts $args
+    set query [::uri::urn::quote $parts(query)]
+    if {$parts(type) != {}} {
+        append query "?type=$parts(type)"
+    }
+    if {$parts(class) != {}} {
+        if {$parts(type) == {}} {
+            append query "?class=$parts(class)"
+        } else {
+            append query ";class=$parts(class)"
+        }
+    }
+    if {$parts(nameserver) != {}} {
+        set ns "$parts(nameserver)"
+        if {$parts(port) != {}} {
+            append ns ":$parts(port)"
+        }
+        set query "//${ns}/${query}"
+    }
+    return "dns:$query"
+}
+
+# -------------------------------------------------------------------------
+
+catch {dns::configure -nameserver [lindex [dns::nameservers] 0]}
+
+package provide dns 1.5.0
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/ip.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/ip.tcl
new file mode 100644
index 00000000..4dae657b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/ip.tcl
@@ -0,0 +1,556 @@
+# ip.tcl - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# Internet address manipulation.
+#
+# RFC 3513: IPv6 addressing.
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+# @mdgen EXCLUDE: ipMoreC.tcl
+
+package require Tcl 8.2;                # tcl minimum version
+
+namespace eval ip {
+    namespace export is version normalize equal type contract mask collapse subtract
+    #catch {namespace ensemble create}
+
+    variable IPv4Ranges
+    if {![info exists IPv4Ranges]} {
+        array set IPv4Ranges {
+            0/8        private
+            10/8       private
+            127/8      private
+            172.16/12  private
+            192.168/16 private
+            223/8      reserved
+            224/3      reserved
+        }
+    }
+
+    variable IPv6Ranges
+    if {![info exists IPv6Ranges]} {
+        # RFC 3513: 2.4
+        # RFC 3056: 2
+        array set IPv6Ranges {
+            2002::/16 "6to4 unicast"
+            fe80::/10 "link local"
+            fec0::/10 "site local"
+            ff00::/8  "multicast"
+            ::/128    "unspecified"
+            ::1/128   "localhost"
+        }
+    }
+}
+
+proc ::ip::is {class ip} {
+    foreach {ip mask} [split $ip /] break
+    switch -exact -- $class {
+        ipv4 - IPv4 - 4 {
+            return [IPv4? $ip]
+        }
+        ipv6 - IPv6 - 6 {
+            return [IPv6? $ip]
+        }
+        default {
+            return -code error "bad class \"$class\": must be ipv4 or ipv6"
+        }
+    }
+}
+
+proc ::ip::version {ip} {
+    set version -1
+    if {[string equal $ip {}]} { return $version}
+    foreach {addr mask} [split $ip /] break
+    if {[IPv4? $addr]} {
+        set version 4
+    } elseif {[IPv6? $addr]} {
+        set version 6
+    }
+    return $version
+}
+
+proc ::ip::equal {lhs rhs} {
+    foreach {LHS LM} [SplitIp $lhs] break
+    foreach {RHS RM} [SplitIp $rhs] break
+    if {[set version [version $LHS]] != [version $RHS]} {
+        return -code error "type mismatch:\
+            cannot compare different address types"
+    }
+    if {$version == 4} {set fmt I} else {set fmt I4}
+    set LHS [Mask$version [Normalize $LHS $version] $LM]
+    set RHS [Mask$version [Normalize $RHS $version] $RM]
+    binary scan $LHS $fmt LLL
+    binary scan $RHS $fmt RRR
+    foreach L $LLL R $RRR {
+        if {$L != $R} {return 0}
+    }
+    return 1
+}
+
+proc ::ip::collapse {prefixlist} {
+    #puts **[llength $prefixlist]||$prefixlist
+
+    # Force mask parts into length notation for the following merge
+    # loop to work.
+    foreach ip $prefixlist {
+        foreach {addr mask} [SplitIp $ip] break
+        set nip $addr/[maskToLength [maskToInt $mask]]
+        #puts "prefix $ip = $nip"
+        lappend tmp $nip
+    }
+    set prefixlist $tmp
+
+    #puts @@[llength $prefixlist]||$prefixlist
+
+    set ret {}
+    set can_normalize_more 1
+    while {$can_normalize_more} {
+        set prefixlist [lsort -dict $prefixlist]
+
+        #puts ||[llength $prefixlist]||$prefixlist
+
+        set can_normalize_more 0
+
+        for {set idx 0} {$idx < [llength $prefixlist]} {incr idx} {
+            set nextidx [expr {$idx + 1}]
+
+            set item     [lindex $prefixlist $idx]
+            set nextitem [lindex $prefixlist $nextidx]
+
+            if {$nextitem eq ""} {
+                lappend ret $item
+                continue
+            }
+
+            set itemmask     [mask $item]
+            set nextitemmask [mask $nextitem]
+
+            set item [prefix $item]
+
+            if {$itemmask ne $nextitemmask} {
+                lappend ret $item/$itemmask
+                continue
+            }
+
+            set adjacentitem [intToString [nextNet $item $itemmask]]/$itemmask
+
+            if {$nextitem ne $adjacentitem} {
+                lappend ret $item/$itemmask
+                continue
+            }
+
+            set upmask [expr {$itemmask - 1}]
+            set upitem "$item/$upmask"
+
+            # Maybe just checking the llength of the result is enough ?
+            if {[reduceToAggregates [list $item $nextitem $upitem]] != [list $upitem]} {
+                lappend ret $item/$itemmask
+                continue
+            }
+
+            set can_normalize_more 1
+
+            incr idx
+            lappend ret $upitem
+        }
+
+	set prefixlist $ret
+        set ret {}
+    }
+
+    return $prefixlist
+}
+
+
+proc ::ip::normalize {ip {Ip4inIp6 0}} {
+    foreach {ip mask} [SplitIp $ip] break
+    set version [version $ip]
+    set s [ToString [Normalize $ip $version] $Ip4inIp6]
+    if {($version == 6 && $mask != 128) || ($version == 4 && $mask != 32)} {
+        append s /$mask
+    }
+    return $s
+}
+
+proc ::ip::contract {ip} {
+    foreach {ip mask} [SplitIp $ip] break
+    set version [version $ip]
+    set s [ToString [Normalize $ip $version]]
+    if {$version == 6} {
+        set r ""
+        foreach o [split $s :] {
+            append r [format %x: 0x$o]
+        }
+        set r [string trimright $r :]
+        regsub {(?:^|:)0(?::0)+(?::|$)} $r {::} r
+    } else {
+        set r [string trimright $s .0]
+    }
+    return $r
+}
+
+proc ::ip::subtract {hosts} {
+    set positives {}
+    set negatives {}
+
+    foreach host $hosts {
+        foreach {addr mask} [SplitIp $host] break
+        set host $addr/[maskToLength [maskToInt $mask]]
+
+	if {[string match "-*" $host]} {
+	    set host [string trimleft $host "-"]
+	    lappend negatives $host
+	} else {
+	    lappend positives $host
+	}
+    }
+
+    # Reduce to aggregates if needed
+    if {[llength $positives] > 1} {
+	set positives [reduceToAggregates $positives]
+    }
+
+    if {![llength $positives]} {
+	return {}
+    }
+
+    if {[llength $negatives] > 1} {
+	set negatives [reduceToAggregates $negatives]
+    }
+
+    if {![llength $negatives]} {
+	return $positives
+    }
+
+    # Remove positives that are cancelled out entirely
+    set new_positives {}
+    foreach positive $positives {
+	set found 0
+	foreach negative $negatives {
+            # Do we need the exact check, i.e. ==, or 'eq', or would
+            # checking the length of result == 1 be good enough?
+	    if {[reduceToAggregates [list $positive $negative]] == [list $negative]} {
+		set found 1
+		break
+	    }
+	}
+
+	if {!$found} {
+	    lappend new_positives $positive
+	}
+    }
+    set positives $new_positives
+
+    set retval {}
+    foreach positive $positives {
+	set negatives_found {}
+	foreach negative $negatives {
+	    if {[isOverlap $positive $negative]} {
+		lappend negatives_found $negative
+	    }
+	}
+
+	if {![llength $negatives_found]} {
+	    lappend retval $positive
+	    continue
+	}
+
+	# Convert the larger subnet
+	## Determine smallest subnet involved
+	set maxmask 0
+	foreach subnet [linsert $negatives 0 $positive] {
+	    set mask [mask $subnet]
+	    if {$mask > $maxmask} {
+		set maxmask $mask
+	    }
+	}
+
+	set positive_list [ExpandSubnet $positive $maxmask]
+	set negative_list {}
+	foreach negative $negatives_found {
+	    foreach negative_subnet [ExpandSubnet $negative $maxmask] {
+		lappend negative_list $negative_subnet
+	    }
+	}
+
+	foreach positive_sub $positive_list {
+	    if {[lsearch -exact $negative_list $positive_sub] < 0} {
+		lappend retval $positive_sub
+	    }
+	}
+    }
+
+    return $retval
+}
+
+proc ::ip::ExpandSubnet {subnet newmask} {
+    #set oldmask [maskToLength [maskToInt [mask $subnet]]]
+    set oldmask [mask $subnet]
+    set subnet  [prefix $subnet]
+
+    set numsubnets [expr {round(pow(2, ($newmask - $oldmask)))}]
+
+    set ret {}
+    for {set idx 0} {$idx < $numsubnets} {incr idx} {
+	lappend ret "${subnet}/${newmask}"
+	set subnet [intToString [nextNet $subnet $newmask]]
+    }
+
+    return $ret
+}
+
+# Returns an IP address prefix.
+# For instance:
+#  prefix 192.168.1.4/16 => 192.168.0.0
+#  prefix fec0::4/16     => fec0:0:0:0:0:0:0:0
+#  prefix fec0::4/ffff:: => fec0:0:0:0:0:0:0:0
+#
+proc ::ip::prefix {ip} {
+    foreach {addr mask} [SplitIp $ip] break
+    set version [version $addr]
+    set addr [Normalize $addr $version]
+    return [ToString [Mask$version $addr $mask]]
+}
+
+# Return the address type. For IPv4 this is one of private, reserved
+# or normal
+# For IPv6 it is one of site local, link local, multicast, unicast,
+# unspecified or loopback.
+proc ::ip::type {ip} {
+    set version [version $ip]
+    upvar [namespace current]::IPv${version}Ranges types
+    set ip [prefix $ip]
+    foreach prefix [array names types] {
+        set mask [mask $prefix]
+        if {[equal $ip/$mask $prefix]} {
+            return $types($prefix)
+        }
+    }
+    if {$version == 4} {
+        return "normal"
+    } else {
+        return "unicast"
+    }
+}
+
+proc ::ip::mask {ip} {
+    foreach {addr mask} [split $ip /] break
+    return $mask
+}
+
+# -------------------------------------------------------------------------
+
+# Returns true is the argument can be converted into an IPv4 address.
+#
+proc ::ip::IPv4? {ip} {
+    if {[string first : $ip] >= 0} {
+        return 0
+    }
+    if {[catch {Normalize4 $ip}]} {
+        return 0
+    }
+    return 1
+}
+
+proc ::ip::IPv6? {ip} {
+    set octets [split $ip :]
+    if {[llength $octets] < 3 || [llength $octets] > 8} {
+        return 0
+    }
+    set ndx 0
+    foreach octet $octets {
+        incr ndx
+        if {[string length $octet] < 1} continue
+        if {[regexp {^[a-fA-F\d]{1,4}$} $octet]} continue
+        if {$ndx >= [llength $octets] && [IPv4? $octet]} continue
+        if {$ndx == 2 && [lindex $octets 0] == 2002 && [IPv4? $octet]} continue
+        #"Invalid IPv6 address \"$ip\""
+        return 0
+    }
+    if {[regexp {^:[^:]} $ip]} {
+        #"Invalid ipv6 address \"$ip\" (starts with :)"
+        return 0
+    }
+    if {[regexp {[^:]:$} $ip]} {
+        # "Invalid IPv6 address \"$ip\" (ends with :)"
+        return 0
+    }
+    if {[regsub -all :: $ip "|" junk] > 1} {
+        # "Invalid IPv6 address \"$ip\" (more than one :: pattern)"
+        return 0
+    }
+    return 1
+}
+
+proc ::ip::Mask4 {ip {bits {}}} {
+    if {[string length $bits] < 1} { set bits 32 }
+    binary scan $ip I ipx
+    if {[string is integer $bits]} {
+        set mask [expr {(0xFFFFFFFF << (32 - $bits)) & 0xFFFFFFFF}]
+    } else {
+        binary scan [Normalize4 $bits] I mask
+    }
+    return [binary format I [expr {$ipx & $mask}]]
+}
+
+proc ::ip::Mask6 {ip {bits {}}} {
+    if {[string length $bits] < 1} { set bits 128 }
+    if {[string is integer $bits]} {
+        set mask [binary format B128 [string repeat 1 $bits]]
+    } else {
+        binary scan [Normalize6 $bits] I4 mask
+    }
+    binary scan $ip I4 Addr
+    binary scan $mask I4 Mask
+    foreach A $Addr M $Mask {
+        lappend r [expr {$A & $M}]
+    }
+    return [binary format I4 $r]
+}
+
+
+
+# A network address specification is an IPv4 address with an optional bitmask
+# Split an address specification into a IPv4 address and a network bitmask.
+# This doesn't validate the address portion.
+# If a spec with no mask is provided then the mask will be 32
+# (all bits significant).
+# Masks may be either integer number of significant bits or dotted-quad
+# notation.
+#
+proc ::ip::SplitIp {spec} {
+    set slash [string last / $spec]
+    if {$slash != -1} {
+        incr slash -1
+        set ip [string range $spec 0 $slash]
+        incr slash 2
+        set bits [string range $spec $slash end]
+    } else {
+        set ip $spec
+        if {[string length $ip] > 0 && [version $ip] == 6} {
+            set bits 128
+        } else {
+            set bits 32
+        }
+    }
+    return [list $ip $bits]
+}
+
+# Given an IP string from the user, convert to a normalized internal rep.
+# For IPv4 this is currently a hex string (0xHHHHHHHH).
+# For IPv6 this is a binary string or 16 chars.
+proc ::ip::Normalize {ip {version 0}} {
+    if {$version < 0} {
+        set version [version $ip]
+        if {$version < 0} {
+            return -code error "invalid address \"$ip\":\
+                value must be a valid IPv4 or IPv6 address"
+        }
+    }
+    return [Normalize$version $ip]
+}
+
+proc ::ip::Normalize4 {ip} {
+    set octets [split $ip .]
+    if {[llength $octets] > 4} {
+        return -code error "invalid ip address \"$ip\""
+    } elseif {[llength $octets] < 4} {
+        set octets [lrange [concat $octets 0 0 0] 0 3]
+    }
+    set normalized {}
+    foreach oct $octets {
+        set oct [scan $oct %d]
+        if {$oct < 0 || $oct > 255} {
+            return -code error "invalid ip address"
+        }
+        lappend normalized $oct
+    }
+    return [binary format c4 $normalized]
+}
+
+proc ::ip::Normalize6 {ip} {
+    set octets [split $ip :]
+    set ip4embed [string first . $ip]
+    set len [llength $octets]
+    if {$len < 0 || $len > 8} {
+        return -code error "invalid address: this is not an IPv6 address"
+    }
+    set result ""
+    for {set n 0} {$n < $len} {incr n} {
+        set octet [lindex $octets $n]
+        if {$octet == {}} {
+            if {$n == 0 || $n == ($len - 1)} {
+                set octet \0\0
+            } else {
+                set missing [expr {9 - $len}]
+                if {$ip4embed != -1} {incr missing -1}
+                set octet [string repeat \0\0 $missing]
+            }
+        } elseif {[string first . $octet] != -1} {
+            set octet [Normalize4 $octet]
+        } else {
+            set m [expr {4 - [string length $octet]}]
+            if {$m != 0} {
+                set octet [string repeat 0 $m]$octet
+            }
+            set octet [binary format H4 $octet]
+        }
+        append result $octet
+    }
+    if {[string length $result] != 16} {
+        return -code error "invalid address: \"$ip\" is not an IPv6 address"
+    }
+    return $result
+}
+
+
+# This will convert a full ipv4/ipv6 in binary format into a normal
+# expanded string rep.
+proc ::ip::ToString {bin {Ip4inIp6 0}} {
+    set len [string length $bin]
+    set r ""
+    if {$len == 4} {
+        binary scan $bin c4 octets
+        foreach octet $octets {
+            lappend r [expr {$octet & 0xff}]
+        }
+        return [join $r .]
+    } elseif {$len == 16} {
+        if {$Ip4inIp6 == 0} {
+            binary scan $bin H32 hex
+            for {set n 0} {$n < 32} {incr n} {
+                append r [string range $hex $n [incr n 3]]:
+            }
+            return [string trimright $r :]
+        } else {
+            binary scan $bin H24c4 hex octets
+            for {set n 0} {$n < 24} {incr n} {
+                append r [string range $hex $n [incr n 3]]:
+            }
+            foreach octet $octets {
+                append r [expr {$octet & 0xff}].
+            }
+            return [string trimright $r .]
+        }
+    } else {
+        return -code error "invalid binary address:\
+            argument is neither an IPv4 nor an IPv6 address"
+    }
+}
+
+# -------------------------------------------------------------------------
+# Load extended command set.
+
+source [file join [file dirname [info script]] ipMore.tcl]
+
+# -------------------------------------------------------------------------
+
+package provide ip 1.4
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/ipMore.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/ipMore.tcl
new file mode 100644
index 00000000..89445381
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/ipMore.tcl
@@ -0,0 +1,1293 @@
+#temporary home until this gets cleaned up for export to tcllib ip module
+
+##Library Header
+#
+# Copyright (c) 2005 Cisco Systems, Inc.
+#
+# Name:
+#       ipMore
+#
+# Purpose:
+#       Additional commands for the tcllib ip package.
+#
+# Author:
+#        Aamer Akhter / aakhter@cisco.com
+#
+# Support Alias:
+#       aakhter@cisco.com
+#
+# Usage:
+#       package require ip
+#       (The command are loaded from the regular package).
+#
+# Description:
+#       A detailed description of the functionality provided by the library.
+#
+# Requirements:
+#
+# Variables:
+#       namespace   ::ip
+#
+# Notes:
+#       1.
+#
+# Keywords:
+#
+#
+# Category:
+#
+#
+# End of Header
+
+package require msgcat
+
+# Try to load various C based accelerator packages for two of the
+# commands.
+
+if {[catch {package require ipMorec}]} {
+    catch {package require tcllibc}
+}
+
+if {[llength [info commands ::ip::prefixToNativec]]} {
+    # An accelerator is present, providing the C variants
+    interp alias {} ::ip::prefixToNative  {} ::ip::prefixToNativec
+    interp alias {} ::ip::isOverlapNative {} ::ip::isOverlapNativec
+} else {
+    # Link API to the Tcl variants, no accelerators are available.
+    interp alias {} ::ip::prefixToNative  {} ::ip::prefixToNativeTcl
+    interp alias {} ::ip::isOverlapNative {} ::ip::isOverlapNativeTcl
+}
+
+namespace eval ::ip {
+    ::msgcat::mcload [file join [file dirname [info script]] msgs]
+}
+
+if {![llength [info commands lassign]]} {
+    # Either an older tcl version, or tclx not loaded; have to use our
+    # internal lassign from http://wiki.tcl.tk/1530 by Schelte Bron
+
+    proc ::ip::lassign {values args} {
+        uplevel 1 [list foreach $args $values break]
+        lrange $values [llength $args] end
+    }
+}
+if {![llength [info commands lvarpop]]} {
+    # Define an emulation of Tclx's lvarpop if the command
+    # is not present already.
+
+    proc ::ip::lvarpop {upVar {index 0}} {
+	upvar $upVar list;
+	set top [lindex $list $index];
+	set list [concat [lrange $list 0 [expr $index - 1]] \
+		      [lrange $list [expr $index +1] end]];
+	return $top;
+    }
+}
+
+# Some additional aliases for backward compatability. Not
+# documented. The old names are from previous versions while at Cisco.
+#
+#               Old command name -->      Documented command name
+interp alias {} ::ip::ToInteger           {} ::ip::toInteger
+interp alias {} ::ip::ToHex               {} ::ip::toHex
+interp alias {} ::ip::MaskToInt           {} ::ip::maskToInt
+interp alias {} ::ip::MaskToLength        {} ::ip::maskToLength
+interp alias {} ::ip::LengthToMask        {} ::ip::lengthToMask
+interp alias {} ::ip::IpToLayer2Multicast {} ::ip::ipToLayer2Multicast
+interp alias {} ::ip::IpHostFromPrefix    {} ::ip::ipHostFromPrefix
+
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::prefixToNative
+#
+# Purpose:
+#        convert from dotted from to native (hex) form
+#
+# Synopsis:
+#       prefixToNative <prefix>
+#
+# Arguments:
+#        <prefix>
+#            string in the <ipaddr>/<mask> format
+#
+# Return Values:
+#        <prefix> in native format {<hexip> <hexmask>}
+#
+# Description:
+#
+# Examples:
+#   % ip::prefixToNative 1.1.1.0/24
+#   0x01010100 0xffffff00
+#
+# Sample Input:
+#
+# Sample Output:
+# Notes:
+#   fixed bug in C extension that modified
+#    calling context variable
+# See Also:
+#
+# End of Header
+
+proc ip::prefixToNativeTcl {prefix} {
+    set plist {}
+    foreach p $prefix {
+	set newPrefix [ip::toHex [ip::prefix $p]]
+	if {[string equal [set mask [ip::mask $p]] ""]} {
+	    set newMask 0xffffffff
+	} else {
+	    set newMask [format "0x%08x" [ip::maskToInt $mask]]
+	}
+	lappend plist [list $newPrefix $newMask]
+    }
+    if {[llength $plist]==1} {return [lindex $plist 0]}
+    return $plist
+}
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::nativeToPrefix
+#
+# Purpose:
+#        convert from native (hex) form to dotted form
+#
+# Synopsis:
+#       nativeToPrefix <nativeList>|<native> [-ipv4]
+#
+# Arguments:
+#        <nativeList>
+#            list of native form ip addresses native form is:
+#        <native>
+#            tcllist in format {<hexip> <hexmask>}
+#        -ipv4
+#            the provided native format addresses are in ipv4 format (default)
+#
+# Return Values:
+#        if nativeToPrefix is called with <native> a single (non-listified) address
+#            is returned
+#        if nativeToPrefix is called with a <nativeList> address list, then
+#            a list of addresses is returned
+#
+#        return form is: <ipaddr>/<mask>
+#
+# Description:
+#
+# Examples:
+#   % ip::nativeToPrefix {0x01010100 0xffffff00} -ipv4
+#   1.1.1.0/24
+#
+# Sample Input:
+#
+# Sample Output:
+
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::nativeToPrefix {nativeList args} {
+    set pList 1
+    set ipv4 1
+    while {[llength $args]} {
+	switch -- [lindex $args 0] {
+	    -ipv4 {set args [lrange $args 1 end]}
+	    default {
+		return -code error [msgcat::mc "option %s not supported" [lindex $args 0]]
+	    }
+	}
+    }
+
+    # if a single native element is passed eg {0x01010100 0xffffff00}
+    # instead of {{0x01010100 0xffffff00} {0x01010100 0xffffff00}...}
+    # then return a (non-list) single entry
+    if {[llength [lindex $nativeList 0]]==1} {set pList 0; set nativeList [list $nativeList]}
+    foreach native $nativeList {
+	lassign $native ip mask
+	if {[string equal $mask ""]} {set mask 32}
+	set pString ""
+	append pString [ip::ToString [binary format I [expr {$ip}]]]
+	append pString  "/"
+	append pString [ip::maskToLength $mask]
+	lappend rList $pString
+    }
+    # a multi (listified) entry was given
+    # return the listified entry
+    if {$pList} { return $rList }
+    return $pString
+}
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::intToString
+#
+# Purpose:
+#        convert from an integer/hex to dotted form
+#
+# Synopsis:
+#       intToString <integer/hex> [-ipv4]
+#
+# Arguments:
+#        <integer>
+#            ip address in integer form
+#        -ipv4
+#            the provided integer addresses is ipv4 (default)
+#
+# Return Values:
+#        ip address in dotted form
+#
+# Description:
+#
+# Examples:
+#       ip::intToString 4294967295
+#       255.255.255.255
+#
+# Sample Input:
+#
+# Sample Output:
+
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::intToString {int args} {
+    set ipv4 1
+    while {[llength $args]} {
+	switch -- [lindex $args 0] {
+	    -ipv4 {set args [lrange $args 1 end]}
+	    default {
+		return -code error [msgcat::mc "option %s not supported" [lindex $args 0]]
+	    }
+	}
+    }
+    return [ip::ToString [binary format I [expr {$int}]]]
+}
+
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::toInteger
+#
+# Purpose:
+#        convert dotted form ip to integer
+#
+# Synopsis:
+#       toInteger <ipaddr>
+#
+# Arguments:
+#        <ipaddr>
+#            decimal dotted form ip address
+#
+# Return Values:
+#        integer form of <ipaddr>
+#
+# Description:
+#
+# Examples:
+#   % ::ip::toInteger 1.1.1.0
+#   16843008
+#
+# Sample Input:
+#
+# Sample Output:
+
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::toInteger {ip} {
+    binary scan [ip::Normalize4 $ip] I out
+    return [format %lu [expr {$out & 0xffffffff}]]
+}
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::toHex
+#
+# Purpose:
+#        convert dotted form ip to hex
+#
+# Synopsis:
+#       toHex <ipaddr>
+#
+# Arguments:
+#        <ipaddr>
+#            decimal dotted from ip address
+#
+# Return Values:
+#        hex form of <ipaddr>
+#
+# Description:
+#
+# Examples:
+#   % ::ip::toHex 1.1.1.0
+#   0x01010100
+#
+# Sample Input:
+#
+# Sample Output:
+
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::toHex {ip} {
+    binary scan [ip::Normalize4 $ip] H8 out
+    return "0x$out"
+}
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::maskToInt
+#
+# Purpose:
+#        convert mask to integer
+#
+# Synopsis:
+#       maskToInt <mask>
+#
+# Arguments:
+#        <mask>
+#            mask in either dotted form or mask length form (255.255.255.0 or 24)
+#
+# Return Values:
+#        integer form of mask
+#
+# Description:
+#
+# Examples:
+#   ::ip::maskToInt 24
+#   4294967040
+#
+#
+# Sample Input:
+#
+# Sample Output:
+
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::maskToInt {mask} {
+    if {[string is integer -strict $mask]} {
+        set maskInt [expr {(0xFFFFFFFF << (32 - $mask))}]
+    } else {
+        binary scan [Normalize4 $mask] I maskInt
+    }
+    set maskInt [expr {$maskInt & 0xFFFFFFFF}]
+    return [format %u $maskInt]
+}
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::broadcastAddress
+#
+# Purpose:
+#        return broadcast address given prefix
+#
+# Synopsis:
+#       broadcastAddress <prefix> [-ipv4]
+#
+# Arguments:
+#        <prefix>
+#            route in the form of <ipaddr>/<mask> or native form {<hexip> <hexmask>}
+#        -ipv4
+#            the provided native format addresses are in ipv4 format (default)
+#            note: broadcast addresses are not valid in ipv6
+#
+#
+# Return Values:
+#        ipaddress of broadcast
+#
+# Description:
+#
+# Examples:
+#   ::ip::broadcastAddress 1.1.1.0/24
+#   1.1.1.255
+#
+#   ::ip::broadcastAddress {0x01010100 0xffffff00}
+#   0x010101ff
+#
+# Sample Input:
+#
+# Sample Output:
+
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::broadcastAddress {prefix args} {
+    set ipv4 1
+    while {[llength $args]} {
+	switch -- [lindex $args 0] {
+	    -ipv4 {set args [lrange $args 1 end]}
+	    default {
+		return -code error [msgcat::mc "option %s not supported" [lindex $args 0]]
+	    }
+	}
+    }
+    if {[llength $prefix] == 2} {
+	lassign $prefix net mask
+    } else {
+	set net [maskToInt [ip::prefix $prefix]]
+	set mask [maskToInt [ip::mask $prefix]]
+    }
+    set ba [expr {$net  | ((~$mask)&0xffffffff)}]
+
+    if {[llength $prefix]==2} {
+	return [format "0x%08x" $ba]
+    }
+    return [ToString [binary format I $ba]]
+}
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::maskToLength
+#
+# Purpose:
+#        converts dotted or integer form of mask to length
+#
+# Synopsis:
+#       maskToLength <dottedMask>|<integerMask>|<hexMask> [-ipv4]
+#
+# Arguments:
+#        <dottedMask>
+#        <integerMask>
+#        <hexMask>
+#            mask to convert to prefix length format (eg /24)
+#         -ipv4
+#            the provided integer/hex format masks are ipv4 (default)
+#
+# Return Values:
+#        prefix length
+#
+# Description:
+#
+# Examples:
+#   ::ip::maskToLength 0xffffff00 -ipv4
+#   24
+#
+#   % ::ip::maskToLength 255.255.255.0
+#   24
+#
+# Sample Input:
+#
+# Sample Output:
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::maskToLength {mask args} {
+    set ipv4 1
+    while {[llength $args]} {
+	switch -- [lindex $args 0] {
+	    -ipv4 {set args [lrange $args 1 end]}
+	    default {
+		return -code error [msgcat::mc "option %s not supported" [lindex $args 0]]
+	    }
+	}
+    }
+    #pick the fastest method for either format
+    if {[string is integer -strict $mask]} {
+	binary scan [binary format I [expr {$mask}]] B32 maskB
+	if {[regexp -all {^1+} $maskB ones]} {
+	    return [string length $ones]
+	} else {
+	    return 0
+	}
+    } else {
+	regexp {\/(.+)} $mask dumb mask
+	set prefix 0
+	foreach ipByte [split $mask {.}] {
+	    switch $ipByte {
+		255 {incr prefix 8; continue}
+		254 {incr prefix 7}
+		252 {incr prefix 6}
+		248 {incr prefix 5}
+		240 {incr prefix 4}
+		224 {incr prefix 3}
+		192 {incr prefix 2}
+		128 {incr prefix 1}
+		0   {}
+		default {
+		    return -code error [msgcat::mc "not an ip mask: %s" $mask]
+		}
+	    }
+	    break
+	}
+	return $prefix
+    }
+}
+
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::lengthToMask
+#
+# Purpose:
+#        converts mask length to dotted mask form
+#
+# Synopsis:
+#       lengthToMask <maskLength> [-ipv4]
+#
+# Arguments:
+#        <maskLength>
+#            mask length
+#        -ipv4
+#            the provided mask length is ipv4 (default)
+#
+# Return Values:
+#        mask in dotted form
+#
+# Description:
+#
+# Examples:
+#   ::ip::lengthToMask 24
+#   255.255.255.0
+#
+# Sample Input:
+#
+# Sample Output:
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::lengthToMask {masklen args} {
+    while {[llength $args]} {
+	switch -- [lindex $args 0] {
+	    -ipv4 {set args [lrange $args 1 end]}
+	    default {
+		return -code error [msgcat::mc "option %s not supported" [lindex $args 0]]
+	    }
+	}
+    }
+    # the fastest method is just to look
+    # thru an array
+    return $::ip::maskLenToDotted($masklen)
+}
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::nextNet
+#
+# Purpose:
+#        returns next an ipaddress in same position in next network
+#
+# Synopsis:
+#       nextNet <ipaddr> <mask> [<count>] [-ipv4]
+#
+# Arguments:
+#        <ipaddress>
+#            in hex/integer/dotted format
+#        <mask>
+#            mask in hex/integer/dotted/maskLen format
+#        <count>
+#            number of nets to skip over (default is 1)
+#        -ipv4
+#            the provided hex/integer addresses are in ipv4 format (default)
+#
+# Return Values:
+#        ipaddress in same position in next network in hex
+#
+# Description:
+#
+# Examples:
+#
+# Sample Input:
+#
+# Sample Output:
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::nextNet {prefix mask args} {
+    set count 1
+    while {[llength $args]} {
+	switch -- [lindex $args 0] {
+	    -ipv4 {set args [lrange $args 1 end]}
+	    default {
+		set count [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	}
+    }
+    if {![string is integer -strict $prefix]} {
+	set prefix [toInteger $prefix]
+    }
+    if {![string is integer -strict $mask] || ($mask < 33 && $mask > 0)} {
+	set mask [maskToInt $mask]
+    }
+    set prefix [expr {$prefix + ((($mask ^ 0xFFffFFff) + 1) * $count) }]
+    return [format "0x%08x" $prefix]
+}
+
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::isOverlap
+#
+# Purpose:
+#        checks to see if prefixes overlap
+#
+# Synopsis:
+#       isOverlap <prefix> <prefix1> <prefix2>...
+#
+# Arguments:
+#        <prefix>
+#            in form <ipaddr>/<mask> prefix to compare <prefixN> against
+#        <prefixN>
+#            in form <ipaddr>/<mask> prefixes to compare against
+#
+# Return Values:
+#        1 if there is an overlap
+#
+# Description:
+#
+# Examples:
+#        % ::ip::isOverlap 1.1.1.0/24 2.1.0.1/32
+#        0
+#
+#        ::ip::isOverlap 1.1.1.0/24 2.1.0.1/32 1.1.1.1/32
+#        1
+# Sample Input:
+#
+# Sample Output:
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::isOverlap {ip args} {
+    lassign [SplitIp $ip] ip1 mask1
+    set ip1int [toInteger $ip1]
+    set mask1int [maskToInt $mask1]
+
+    set overLap 0
+    foreach prefix $args {
+	lassign [SplitIp $prefix] ip2 mask2
+	set ip2int [toInteger $ip2]
+	set mask2int [maskToInt $mask2]
+	set mask1mask2 [expr {$mask1int & $mask2int}]
+	if {[expr {$ip1int & $mask1mask2}] ==  [expr {$ip2int & $mask1mask2}]} {
+	    set overLap 1
+	    break
+	}
+    }
+    return $overLap
+}
+
+
+#optimized overlap, that accepts native format
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::isOverlapNative
+#
+# Purpose:
+#        checks to see if prefixes overlap (optimized native form)
+#
+# Synopsis:
+#       isOverlap <hexipaddr> <hexmask> {{<hexipaddr1> <hexmask1>} {<hexipaddr2> <hexmask2>...}
+#
+# Arguments:
+#        -all
+#            return all overlaps rather than the first one
+#        -inline
+#            rather than returning index values, return the actual overlap prefixes
+#        <hexipaddr>
+#            ipaddress in hex/integer form
+#        <hexMask>
+#            mask in hex/integer form
+#        -ipv4
+#            the provided native format addresses are in ipv4 format (default)
+#
+# Return Values:
+#        non-zero if there is an overlap, value is element # in list with overlap
+#
+# Description:
+#        isOverlapNative is available both as a C extension and in a native tcl form
+#        if the extension is loaded (tried automatically), isOverlapNative will be
+#        linked to isOverlapNativeC. If an extension is not loaded, then isOverlapNative
+#        will be linked to the native tcl proc: ipOverlapNativeTcl.
+#
+# Examples:
+#        % ::ip::isOverlapNative 0x01010100 0xffffff00 {{0x02010001 0xffffffff}}
+#        0
+#
+#        %::ip::isOverlapNative 0x01010100 0xffffff00 {{0x02010001 0xffffffff} {0x01010101 0xffffffff}}
+#        2
+#
+# Sample Input:
+#
+# Sample Output:
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::isOverlapNativeTcl {args} {
+    set all 0
+    set inline 0
+    set notOverlap 0
+    set ipv4 1
+    foreach sw [lrange $args 0 end-3] {
+	switch -exact -- $sw {
+	    -all {
+		set all 1
+		set allList [list]
+	    }
+	    -inline {set inline 1}
+	    -ipv4 {}
+	}
+    }
+    set args [lassign [lrange $args end-2 end] ip1int mask1int prefixList]
+    if {$inline} {
+	set overLap [list]
+    } else {
+	set overLap 0
+    }
+    set count 0
+    foreach prefix $prefixList {
+	incr count
+	lassign $prefix ip2int mask2int
+	set mask1mask2 [expr {$mask1int & $mask2int}]
+	if {[expr {$ip1int & $mask1mask2}] ==  [expr {$ip2int & $mask1mask2}]} {
+	    if {$inline} {
+		set overLap [list $prefix]
+	    } else {
+		set overLap $count
+	    }
+	    if {$all} {
+		if {$inline} {
+		    lappend allList $prefix
+		} else {
+		    lappend allList $count
+		}
+	    } else {
+		break
+	    }
+	}
+    }
+    if {$all} {return $allList}
+    return $overLap
+}
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::ipToLayer2Multicast
+#
+# Purpose:
+#        converts ipv4 address to a layer 2 multicast address
+#
+# Synopsis:
+#       ipToLayer2Multicast <ipaddr>
+#
+# Arguments:
+#        <ipaddr>
+#            ipaddress in dotted form
+#
+# Return Values:
+#        mac address in xx.xx.xx.xx.xx.xx form
+#
+# Description:
+#
+# Examples:
+#        % ::ip::ipToLayer2Multicast 224.0.0.2
+#        01.00.5e.00.00.02
+# Sample Input:
+#
+# Sample Output:
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::ipToLayer2Multicast { ipaddr } {
+    regexp "\[0-9\]+\.(\[0-9\]+)\.(\[0-9\]+)\.(\[0-9\]+)" $ipaddr junk ip2 ip3 ip4
+    #remove MSB of 2nd octet of IP address for mcast L2 addr
+    set mac2 [expr {$ip2 & 127}]
+    return [format "01.00.5e.%02x.%02x.%02x" $mac2 $ip3 $ip4]
+}
+
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::ipHostFromPrefix
+#
+# Purpose:
+#        gives back a host address from a prefix
+#
+# Synopsis:
+#       ::ip::ipHostFromPrefix <prefix> [-exclude <list of prefixes>]
+#
+# Arguments:
+#        <prefix>
+#            prefix is <ipaddr>/<masklen>
+#        -exclude <list of prefixes>
+#            list if ipprefixes that host should not be in
+# Return Values:
+#        ip address
+#
+# Description:
+#
+# Examples:
+# %::ip::ipHostFromPrefix  1.1.1.5/24
+# 1.1.1.1
+#
+# %::ip::ipHostFromPrefix  1.1.1.1/32
+# 1.1.1.1
+#
+#
+# Sample Input:
+#
+# Sample Output:
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::ipHostFromPrefix { prefix args } {
+    set mask [mask $prefix]
+    set ipaddr [prefix $prefix]
+    if {[llength $args]} {
+	array set opts $args
+    } else {
+	if {$mask==32} {
+	    return $ipaddr
+	} else {
+	    return [intToString [expr {[toHex $ipaddr] + 1} ]]
+	}
+    }
+    set format {-ipv4}
+    # if we got here, then options were set
+    if {[info exists opts(-exclude)]} {
+	#basic algo is:
+	# 1. throw away prefixes that are less specific that $prefix
+	# 2. of remaining pfx, throw away prefixes that do not overlap
+	# 3. run reducetoAggregates on specific nets
+	# 4.
+
+	# 1. convert to hex format
+	set currHex [prefixToNative $prefix ]
+	set exclHex [prefixToNative $opts(-exclude) ]
+	# sort the prefixes by their mask, include the $prefix as a marker
+	#  so we know from where to throw away prefixes
+	set sortedPfx [lsort -integer -index 1 [concat [list $currHex]  $exclHex]]
+	# throw away prefixes that are less specific than $prefix
+	set specPfx [lrange $sortedPfx [expr {[lsearch -exact $sortedPfx $currHex] +1} ] end]
+
+	#2. throw away non-overlapping prefixes
+	set specPfx [isOverlapNative -all -inline \
+			 [lindex $currHex 0 ] \
+			 [lindex $currHex 1 ] \
+			 $specPfx ]
+	#3. run reduce aggregates
+	set specPfx [reduceToAggregates $specPfx]
+
+	#4 now have to pick an address that overlaps with $currHex but not with
+	#   $specPfx
+	# 4.1 find the largest prefix w/ most specific mask and go to the next net
+
+
+	# current ats tcl does not allow this in one command, so
+	#  for now just going to grab the last prefix (list is already sorted)
+	set sPfx [lindex $specPfx end]
+	set startPfx $sPfx
+	# add currHex to specPfx
+	set oChkPfx [concat $specPfx [list $currHex]]
+
+
+	set notcomplete 1
+	set overflow 0
+	while {$notcomplete} {
+	    #::ipMore::log::debug "doing nextnet on $sPfx"
+	    set nextNet [nextNet [lindex $sPfx 0] [lindex $sPfx 1]]
+	    #::ipMore::log::debug "trying $nextNet"
+	    if {$overflow && ($nextNet > $startPfx)} {
+		#we've gone thru the entire net and didn't find anything.
+		return -code error [msgcat::mc "ip host could not be found in %s" $prefix]
+		break
+	    }
+	    set oPfx [isOverlapNative -all -inline \
+			  $nextNet -1 \
+			  $oChkPfx
+		     ]
+	    switch -exact [llength $oPfx] {
+		0 {
+		    # no overlap at all. meaning we have gone beyond the bounds of
+		    # $currHex. need to overlap and try again
+		    #::ipMore::log::debug {ipHostFromPrefix: overlap done}
+		    set overflow 1
+		}
+		1 {
+		    #we've found what we're looking for. pick this address and exit
+		    return [intToString $nextNet]
+		}
+		default {
+		    # 2 or more overlaps, need to increment again
+		    set sPfx [lindex $oPfx 0]
+		}
+	    }
+	}
+    }
+}
+
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::reduceToAggregates
+#
+# Purpose:
+#        finds nets that overlap and filters out the more specifc nets
+#
+# Synopsis:
+#       ::ip::reduceToAggregates <prefixList>
+#
+# Arguments:
+#        <prefixList>
+#            prefixList a list in the from of
+#            is <ipaddr>/<masklen> or native format
+#
+# Return Values:
+#        non-overlapping ip prefixes
+#
+# Description:
+#
+# Examples:
+#
+#  % ::ip::reduceToAggregates {1.1.1.0/24 1.1.0.0/8  2.1.1.0/24 1.1.1.1/32 }
+#  1.0.0.0/8 2.1.1.0/24
+#
+# Sample Input:
+#
+# Sample Output:
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::reduceToAggregates { prefixList } {
+    #find out format of $prefixeList
+    set dotConv 0
+    if {[llength [lindex $prefixList 0]]==1} {
+	#format is dotted form convert all prefixes to native form
+	set prefixList [ip::prefixToNative $prefixList]
+	set dotConv 1
+    }
+
+    set nonOverLapping $prefixList
+    while {1==1} {
+	set overlapFound 0
+	set remaining $nonOverLapping
+	set nonOverLapping {}
+	while {[llength $remaining]} {
+	    set current [lvarpop remaining]
+	    set overLap [ip::isOverlapNative [lindex $current 0] [lindex $current 1] $remaining]
+	    if {$overLap} {
+		#there was a overlap find out which prefix has a the smaller mask, and keep that one
+		if {[lindex $current 1] > [lindex [lindex $remaining [expr {$overLap -1}]] 1]} {
+		    #current has more restrictive mask, throw that prefix away
+		    # keep other prefix
+		    lappend nonOverLapping [lindex $remaining [expr {$overLap -1}]]
+		} else {
+		    lappend nonOverLapping $current
+		}
+		lvarpop remaining [expr {$overLap -1}]
+		set overlapFound 1
+	    } else {
+		#no overlap, keep all prefixes, don't touch the stuff in
+		# remaining, it is needed for other overlap checking
+		lappend nonOverLapping $current
+	    }
+	}
+	if {$overlapFound==0} {break}
+    }
+    if {$dotConv} {return [nativeToPrefix $nonOverLapping]}
+    return $nonOverLapping
+}
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::longestPrefixMatch
+#
+# Purpose:
+#        given host IP finds longest prefix match from set of prefixes
+#
+# Synopsis:
+#       ::ip::longestPrefixMatch <ipaddr> <prefixList> [-ipv4]
+#
+# Arguments:
+#        <prefixList>
+#            is list of <ipaddr> in native or dotted form
+#        <ipaddr>
+#            ip address in <ipprefix> format, dotted form, or integer form
+#        -ipv4
+#            the provided integer format addresses are in ipv4 format (default)
+#
+# Return Values:
+#        <ipprefix> that is the most specific match to <ipaddr>
+#
+# Description:
+#
+# Examples:
+#        % ::ip::longestPrefixMatch 1.1.1.1 {1.1.1.0/24 1.0.0.0/8  2.1.1.0/24 1.1.1.0/28 }
+#        1.1.1.0/28
+#
+# Sample Input:
+#
+# Sample Output:
+# Notes:
+#
+# See Also:
+#
+# End of Header
+
+proc ::ip::longestPrefixMatch { ipaddr prefixList args} {
+    set ipv4 1
+    while {[llength $args]} {
+	switch -- [lindex $args 0] {
+	    -ipv4 {set args [lrange $args 1 end]}
+	    default {
+		return -code error [msgcat::mc "option %s not supported" [lindex $args 0]]
+	    }
+	}
+    }
+    #find out format of prefixes
+    set dotConv 0
+    if {[llength [lindex $prefixList 0]]==1} {
+	#format is dotted form convert all prefixes to native form
+	set prefixList [ip::prefixToNative $prefixList]
+	set dotConv 1
+    }
+    #sort so that most specific prefix is in the front
+    if {[llength [lindex [lindex $prefixList 0] 1]]} {
+	set prefixList [lsort -decreasing -integer -index 1 $prefixList]
+    } else {
+	set prefixList [list $prefixList]
+    }
+    if {![string is integer -strict $ipaddr]} {
+	set ipaddr [prefixToNative $ipaddr]
+    }
+    set best [ip::isOverlapNative -inline \
+		  [lindex $ipaddr 0] [lindex $ipaddr 1] $prefixList]
+    if {$dotConv && [llength $best]} {
+	return [nativeToPrefix $best]
+    }
+    return $best
+}
+
+##Procedure Header
+# Copyright (c) 2004 Cisco Systems, Inc.
+#
+# Name:
+#       ::ip::cmpDotIP
+#
+# Purpose:
+#        helper function for dotted ip address for use in lsort
+#
+# Synopsis:
+#       ::ip::cmpDotIP <ipaddr1> <ipaddr2>
+#
+# Arguments:
+#        <ipaddr1> <ipaddr2>
+#            prefix is in dotted ip address format
+#
+# Return Values:
+#        -1 if ipaddr1 is less that ipaddr2
+#         1 if ipaddr1 is more that ipaddr2
+#         0 if ipaddr1 and ipaddr2 are equal
+#
+# Description:
+#
+# Examples:
+#        % lsort -command ip::cmpDotIP {1.0.0.0 2.2.0.0 128.0.0.0 3.3.3.3}
+#        1.0.0.0 2.2.0.0 3.3.3.3 128.0.0.0
+#
+# Sample Input:
+#
+# Sample Output:
+# Notes:
+#
+# See Also:
+#
+# End of Header
+#            ip address in <ipprefix> format, dotted form, or integer form
+
+if {![package vsatisfies [package provide Tcl] 8.4]} {
+    # 8.3+
+    proc ip::cmpDotIP {ipaddr1 ipaddr2} {
+	# convert dotted to list of integers
+	set ipaddr1 [split $ipaddr1 .]
+	set ipaddr2 [split $ipaddr2 .]
+	foreach a $ipaddr1 b $ipaddr2 {
+	    #ipMore::log::debug "$ipInt1 $ipInt2"
+	    if { $a < $b}  {
+		return -1
+	    } elseif {$a >$b} {
+		return 1
+	    }
+	}
+	return 0
+    }
+} else {
+    # 8.4+
+    proc ip::cmpDotIP {ipaddr1 ipaddr2} {
+	# convert dotted to decimal
+	set ipInt1 [::ip::toHex $ipaddr1]
+	set ipInt2 [::ip::toHex $ipaddr2]
+	#ipMore::log::debug "$ipInt1 $ipInt2"
+	if { $ipInt1 < $ipInt2}  {
+	    return -1
+	} elseif {$ipInt1 >$ipInt2 } {
+	    return 1
+	} else {
+	    return 0
+	}
+    }
+}
+
+# Populate the array "maskLenToDotted" for fast lookups of mask to
+# dotted form.
+
+namespace eval ::ip {
+    variable maskLenToDotted
+    variable x
+
+    for {set x 0} {$x <33} {incr x} {
+	set maskLenToDotted($x) [intToString [maskToInt $x]]
+    }
+    unset x
+}
+
+##Procedure Header
+# Copyright (c) 2015 Martin Heinrich <martin.heinrich@frequentis.com>
+#
+# Name:
+#       ::ip::distance
+#
+# Purpose:
+#        Calculate integer distance between two IPv4 addresses (dotted form or int)
+#
+# Synopsis:
+#       distance <ipaddr1> <ipaddr2>
+#
+# Arguments:
+#        <ipaddr1>
+#        <ipaddr2>
+#            ip address
+#
+# Return Values:
+#        integer distance (addr2 - addr1)
+#
+# Description:
+#
+# Examples:
+#   % ::ip::distance 1.1.1.0 1.1.1.5
+#   5
+#
+# Sample Input:
+#
+# Sample Output:
+
+proc ::ip::distance {ip1 ip2} {
+    # use package ip for normalization
+    # XXX does not support ipv6
+    expr {[toInteger $ip2]-[toInteger $ip1]}
+}
+
+##Procedure Header
+# Copyright (c) 2015 Martin Heinrich <martin.heinrich@frequentis.com>
+#
+# Name:
+#       ::ip::nextIp
+#
+# Purpose:
+#        Increment the given IPv4 address by an offset.
+#        Complement to 'distance'.
+#
+# Synopsis:
+#       nextIp <ipaddr> ?<offset>?
+#
+# Arguments:
+#        <ipaddr>
+#            ip address
+#
+#        <offset>
+#            The integer to increment the address by.
+#            Default is 1.
+#
+# Return Values:
+#        The increment ip address.
+#
+# Description:
+#
+# Examples:
+#   % ::ip::nextIp 1.1.1.0 5
+#   1.1.1.5
+#
+# Sample Input:
+#
+# Sample Output:
+
+proc ::ip::nextIp {ip {offset 1}} {
+    set int [toInteger $ip]
+    incr int $offset
+    set prot {}
+    # TODO if ipv4 then set prot -ipv4, but
+    # XXX intToString has -ipv4, but never returns ipv6
+    intToString $int ;# 8.5-ism, avoid: {*}$prot
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/ipMoreC.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/ipMoreC.tcl
new file mode 100644
index 00000000..ab1418a1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/ipMoreC.tcl
@@ -0,0 +1,242 @@
+# Skip this for window and a specific version of Solaris
+#
+# This could do with an explanation -- why are we avoiding these platforms
+# and perhaps using critcl's platform::platform command might be better?
+#
+if {[string equal $::tcl_platform(platform) windows] ||
+    ([string equal $::tcl_platform(os)      SunOS] &&
+     [string equal $::tcl_platform(osVersion) 5.6])
+} {
+    # avoid warnings about nothing to compile
+    critcl::ccode {
+        /* nothing to do */
+    }
+    return
+}
+
+package require critcl;
+
+namespace eval ::ip {
+
+critcl::ccode {
+#include <stdlib.h>
+#include <stdio.h>
+#include <tcl.h>
+#include <inttypes.h>
+#include <arpa/inet.h>
+#include <string.h>
+#include <sys/socket.h>
+}
+
+critcl::ccommand prefixToNativec {clientData interp objc objv} {
+    int elemLen, maskLen, ipLen, mask;
+	int rval,convertListc,i;
+	Tcl_Obj **convertListv;
+	Tcl_Obj *listPtr,*returnPtr, *addrList;
+	char *stringIP, *slashPos, *stringMask;
+	char v4HEX[11];
+
+	uint32_t inaddr;
+	listPtr = NULL;
+
+	/* printf ("\n in prefixToNativeC"); */
+	/* printf ("\n objc = %d",objc); */
+
+	if (objc != 2) {
+		Tcl_WrongNumArgs(interp, 1, objv, "<ipaddress>/<mask>");
+		return TCL_ERROR;
+	}
+
+
+	if (Tcl_ListObjGetElements (interp, objv[1],
+								&convertListc, &convertListv) != TCL_OK) {
+		return TCL_ERROR;
+	}
+	returnPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
+	for (i = 0; i < convertListc; i++) {
+		/*  need to create a duplicate here because when we modify */
+		/*  the stringIP it'll mess up the original in the calling */
+		/*  context */
+		addrList = Tcl_DuplicateObj(convertListv[i]);
+		stringIP = Tcl_GetStringFromObj(addrList, &elemLen);
+		listPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
+		/* printf ("\n  ### %s ### string \n", stringIP); */
+		/*  split the ip address and mask */
+		slashPos = strchr(stringIP, (int) '/');
+		if (slashPos == NULL) {
+			/*  straight ip address without mask */
+			mask = 0xffffffff;
+			ipLen = strlen(stringIP);
+		} else {
+			/* ipaddress has the mask, handle the mask and seperate out the  */
+			/*  ip address */
+			/* printf ("\n ** %d ",(uintptr_t)slashPos); */
+			stringMask = slashPos +1;
+			maskLen =strlen(stringMask);
+			/* put mask in hex form */
+			if (maskLen < 3) {
+				mask = atoi(stringMask);
+				mask = (0xFFFFFFFF << (32 - mask)) & 0xFFFFFFFF;
+			} else {
+				/* mask is in dotted form */
+				if ((rval = inet_pton(AF_INET,stringMask,&mask)) < 1 ) {
+					Tcl_AddErrorInfo(interp, "\n    bad format encountered in mask conversion");
+					return TCL_ERROR;
+				}
+				mask = htonl(mask);
+			}
+			ipLen = (uintptr_t)slashPos  - (uintptr_t)stringIP;
+			/* divide the string into ip and mask portion */
+			*slashPos = '\0';
+			/* printf("\n %d %d %d %d", (uintptr_t)stringMask, maskLen, (uintptr_t)stringIP, ipLen); */
+		}
+		if ( (rval = inet_pton(AF_INET,stringIP,&inaddr)) < 1) {
+			Tcl_AddErrorInfo(interp,
+							 "\n    bad format encountered in ip conversion");
+			return TCL_ERROR;
+		};
+		inaddr = htonl(inaddr);
+		/* apply the mask the to the ip portion, just to make sure  */
+		/*  what we return is cleaned up */
+		inaddr = inaddr & mask;
+		sprintf(v4HEX,"0x%08X",inaddr);
+		/* printf ("\n\n ### %s",v4HEX); */
+		Tcl_ListObjAppendElement(interp, listPtr,
+								 Tcl_NewStringObj(v4HEX,-1));
+		sprintf(v4HEX,"0x%08X",mask);
+		Tcl_ListObjAppendElement(interp, listPtr,
+								 Tcl_NewStringObj(v4HEX,-1));
+		Tcl_ListObjAppendElement(interp, returnPtr, listPtr);
+		Tcl_DecrRefCount(addrList);
+	}
+
+	if (convertListc==1) {
+		Tcl_SetObjResult(interp,listPtr);
+	} else {
+		Tcl_SetObjResult(interp,returnPtr);
+	}
+
+	return TCL_OK;
+}
+
+critcl::ccommand isOverlapNativec {clientData interp objc objv} {
+        int i;
+        unsigned int ipaddr,ipMask, mask1mask2;
+        unsigned int ipaddr2,ipMask2;
+        int compareListc,comparePrefixMaskc;
+        int allSet,inlineSet,index;
+        Tcl_Obj **compareListv,**comparePrefixMaskv, *listPtr;
+        Tcl_Obj *result;
+    static CONST char *options[] = {
+                "-all",     "-inline", "-ipv4", NULL
+    };
+    enum options {
+		OVERLAP_ALL, OVERLAP_INLINE, OVERLAP_IPV4
+    };
+
+        allSet = 0;
+        inlineSet = 0;
+        listPtr = NULL;
+
+        /* printf ("\n objc = %d",objc); */
+        if (objc < 3) {
+                Tcl_WrongNumArgs(interp, 1, objv, "?options? <hexIP> <hexMask> <hexList>");
+                return TCL_ERROR;
+        }
+        for (i = 1; i < objc-3; i++) {
+           if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0, &index)
+                   != TCL_OK) {
+                   return TCL_ERROR;
+           }
+           switch (index) {
+           case OVERLAP_ALL:
+                   allSet = 1;
+                   /* printf ("\n all selected"); */
+                   break;
+           case OVERLAP_INLINE:
+                   inlineSet = 1;
+                   /* printf ("\n inline selected"); */
+                   break;
+		   case OVERLAP_IPV4:
+			   break;
+           }
+        }
+        /* options are parsed */
+
+        /* create return obj */
+        result = Tcl_GetObjResult (interp);
+
+        /* set ipaddr and ipmask */
+        Tcl_GetIntFromObj(interp,objv[objc-3],(int*)&ipaddr);
+        Tcl_GetIntFromObj(interp,objv[objc-2],(int*)&ipMask);
+
+        /* split the 3rd argument into <ipaddr> <mask> pairs */
+        if (Tcl_ListObjGetElements (interp, objv[objc-1], &compareListc, &compareListv) != TCL_OK) {
+                return TCL_ERROR;
+        }
+/*       printf("comparing %x/%x \n",ipaddr,ipMask); */
+
+        if (allSet || inlineSet) {
+                listPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
+        }
+
+        for (i = 0; i < compareListc; i++) {
+					    /* split the ipaddr2 and ipmask2  */
+                if (Tcl_ListObjGetElements (interp,
+					    compareListv[i],
+					    &comparePrefixMaskc,
+					    &comparePrefixMaskv) != TCL_OK) {
+		    return TCL_ERROR;
+                }
+                if (comparePrefixMaskc != 2) {
+		    Tcl_AddErrorInfo(interp,"need format {{<ipaddr> <mask>} {<ipad..}}");
+                        return TCL_ERROR;
+                }
+                Tcl_GetIntFromObj(interp,comparePrefixMaskv[0],(int*)&ipaddr2);
+                Tcl_GetIntFromObj(interp,comparePrefixMaskv[1],(int*)&ipMask2);
+/*               printf(" with %x/%x \n",ipaddr2,ipMask2); */
+                mask1mask2 = ipMask & ipMask2;
+/*               printf("  mask1mask2 %x \n",mask1mask2); */
+/*               printf("  ipaddr & mask1mask2  %x\n",ipaddr & mask1mask2); */
+/*               printf("  ipaddr2 & mask1mask2 %x\n",ipaddr2 & mask1mask2); */
+                if ((ipaddr & mask1mask2) == (ipaddr2 & mask1mask2)) {
+		    if (allSet) {
+			if (inlineSet) {
+			    Tcl_ListObjAppendElement(interp, listPtr,
+						     compareListv[i]);
+			} else {
+			    /* printf("\n appending %d",i+1); */
+			    Tcl_ListObjAppendElement(interp, listPtr,
+						     Tcl_NewIntObj(i+1));
+			};
+		    } else {
+			if (inlineSet) {
+			    Tcl_ListObjAppendElement(interp, listPtr,
+						     compareListv[i]);
+			    Tcl_SetObjResult(interp,listPtr);
+			} else {
+			    Tcl_SetIntObj (result, i+1);
+			}
+			return TCL_OK;
+		    };
+                };
+					};
+
+        if (allSet || inlineSet) {
+                Tcl_SetObjResult(interp, listPtr);
+                return TCL_OK;
+        } else {
+                Tcl_SetIntObj (result, 0);
+                return TCL_OK;
+        }
+        return TCL_OK;
+
+
+
+}
+
+
+}
+
+# @sak notprovided ipMorec
+package provide ipMorec 1.0
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/msgs/en.msg b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/msgs/en.msg
new file mode 100644
index 00000000..e6d1d9f0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/msgs/en.msg
@@ -0,0 +1,8 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+mcset en "option %s not supported"          "option %s not supported"
+mcset en "option %s not supported"	    "option %s not supported"
+mcset en "not an ip mask: %s"		    "not an ip mask: %s"
+mcset en "ip host could not be found in %s" "ip host could not be found in %s"
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/pkgIndex.tcl
new file mode 100644
index 00000000..04c53b01
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/pkgIndex.tcl
@@ -0,0 +1,7 @@
+# pkgIndex.tcl -
+
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded dns    1.5.0 [list source [file join $dir dns.tcl]]
+package ifneeded resolv 1.0.3 [list source [file join $dir resolv.tcl]]
+package ifneeded ip     1.4   [list source [file join $dir ip.tcl]]
+package ifneeded spf    1.1.1 [list source [file join $dir spf.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/resolv.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/resolv.tcl
new file mode 100644
index 00000000..b9763307
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/resolv.tcl
@@ -0,0 +1,249 @@
+# resolv.tcl - Copyright (c) 2002 Emmanuel Frecon <emmanuel@sics.se>
+#
+# Original Author --  Emmanuel Frecon - emmanuel@sics.se
+# Modified by Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+#  A super module on top of the dns module for host name resolution.
+#  There are two services provided on top of the regular Tcl library:
+#  Firstly, this module attempts to automatically discover the default
+#  DNS server that is setup on the machine that it is run on.  This
+#  server will be used in all further host resolutions.  Secondly, this
+#  module offers a rudimentary cache.  The cache is rudimentary since it
+#  has no expiration on host name resolutions, but this is probably
+#  enough for short lived applications.
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require dns 1.0;                # tcllib 1.3
+
+namespace eval ::resolv {
+    namespace export resolve init ignore hostname
+
+    variable R
+    if {![info exists R]} {
+        array set R {
+            initdone   0
+            dns        ""
+            dnsdefault ""
+            ourhost    ""
+            search     {}
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+# Command Name     --  ignore
+# Original Author  --  Emmanuel Frecon - emmanuel@sics.se
+#
+# Remove a host name resolution from the cache, if present, so that the
+# next resolution will query the DNS server again.
+#
+# Arguments:
+#    hostname	- Name of host to remove from the cache.
+#
+proc ::resolv::ignore { hostname } {
+    variable Cache
+    catch {unset Cache($hostname)}
+    return
+}
+
+# -------------------------------------------------------------------------
+# Command Name     --  init
+# Original Author  --  Emmanuel Frecon - emmanuel@sics.se
+#
+# Initialise this module with a known host name.  This host (not mandatory)
+# will become the default if the library was not able to find a DNS server.
+# This command can be called several times, its effect is double: actively
+# looking for the default DNS server setup on the running machine; and
+# emptying the host name resolution cache.
+#
+# Arguments:
+#    defaultdns	- Default DNS server
+#
+proc ::resolv::init { {defaultdns ""} {search {}}} {
+    variable R
+    variable Cache
+
+    # Clean the resolver cache
+    catch {unset Cache}
+
+    # Record the default DNS server and search list.
+    set R(dnsdefault) $defaultdns
+    set R(search) $search
+
+    # Now do some intelligent lookup.  We do this on the current
+    # hostname to get a chance to get back some (full) information on
+    # ourselves.  A previous version was using 127.0.0.1, not sure
+    # what is best.
+    set res [catch [list exec nslookup [info hostname]] lkup]
+    if { $res == 0 } {
+	set l [split $lkup]
+	set nl ""
+	foreach e $l {
+	    if { [string length $e] > 0 } {
+		lappend nl $e
+	    }
+	}
+
+        # Now, a lot of mixture to arrange so that hostname points at the
+        # DNS server that we should use for any further request.  This
+        # code is complex, but was actually tested behind a firewall
+        # during the SITI Winter Conference 2003.  There, strangly,
+        # nslookup returned an error but a DNS server was actually setup
+        # correctly...
+        set hostname ""
+	set len [llength $nl]
+	for { set i 0 } { $i < $len } { incr i } {
+	    set e [lindex $nl $i]
+	    if { [string match -nocase "*server*" $e] } {
+		set hostname [lindex $nl [expr {$i + 1}]]
+                if { [string match -nocase "UnKnown" $hostname] } {
+                    set hostname ""
+                }
+		break
+	    }
+	}
+
+	if { $hostname != "" } {
+	    set R(dns) $hostname
+	} else {
+            for { set i 0 } { $i < $len } { incr i } {
+                set e [lindex $nl $i]
+                if { [string match -nocase "*address*" $e] } {
+                    set hostname [lindex $nl [expr {$i + 1}]]
+                    break
+                }
+            }
+            if { $hostname != "" } {
+                set R(dns) $hostname
+            }
+	}
+    }
+
+    if {$R(dns) == ""} {
+        set R(dns) $R(dnsdefault)
+    }
+
+
+    # Start again to find our full name
+    set ourhost ""
+    if {$res == 0} {
+        set dot [string first "." [info hostname]]
+        if { $dot < 0 } {
+            for { set i 0 } { $i < $len } { incr i } {
+                set e [lindex $nl $i]
+                if { [string match -nocase "*name*" $e] } {
+                    set ourhost [lindex $nl [expr {$i + 1}]]
+                    break
+                }
+            }
+            if { $ourhost == "" } {
+                if { ! [regexp {\d+\.\d+\.\d+\.\d+} $hostname] } {
+                    set dot [string first "." $hostname]
+                    set ourhost [format "%s%s" [info hostname] \
+                                     [string range $hostname $dot end]]
+                }
+            }
+        } else {
+            set ourhost [info hostname]
+        }
+    }
+
+    if {$ourhost == ""} {
+        set R(ourhost) [info hostname]
+    } else {
+        set R(ourhost) $ourhost
+    }
+
+
+    set R(initdone) 1
+
+    return $R(dns)
+}
+
+# -------------------------------------------------------------------------
+# Command Name     --  resolve
+# Original Author  --  Emmanuel Frecon - emmanuel@sics.se
+#
+# Resolve a host name to an IP address.  This is a wrapping procedure around
+# the basic services of the dns library.
+#
+# Arguments:
+#    hostname	- Name of host
+#
+proc ::resolv::resolve { hostname } {
+    variable R
+    variable Cache
+
+    # Initialise if not already done. Auto initialisation cannot take
+    # any known DNS server (known to the caller)
+    if { ! $R(initdone) } { init }
+
+    # Check whether this is not simply a raw IP address. What about
+    # IPv6 ??
+    # - We don't have sockets in Tcl for IPv6 protocols - [PT]
+    #
+    if { [regexp {\d+\.\d+\.\d+\.\d+} $hostname] } {
+	return $hostname
+    }
+
+    # Look for hostname in the cache, if found return.
+    if { [array names ::resolv::Cache $hostname] != "" } {
+	return $::resolv::Cache($hostname)
+    }
+
+    # Scream if we don't have any DNS server setup, since we cannot do
+    # anything in that case.
+    if { $R(dns) == "" } {
+	return -code error "No dns server provided"
+    }
+
+    set R(retries) 0
+    set ip [Resolve $hostname]
+
+    # And store the result of resolution in our cache for further use.
+    set Cache($hostname) $ip
+
+    return $ip
+}
+
+# Description:
+#  Attempt to resolve hostname via DNS. If the name cannot be resolved then
+#  iterate through the search list appending each domain in turn until we
+#  get one that succeeds.
+#
+proc ::resolv::Resolve {hostname} {
+    variable R
+    set t [::dns::resolve $hostname -server $R(dns)]
+    ::dns::wait $t;                       # wait with event processing
+    set status [dns::status $t]
+    if {$status == "ok"} {
+        set ip [lindex [::dns::address $t] 0]
+        ::dns::cleanup $t
+    } elseif {$status == "error"
+              && [::dns::errorcode $t] == 3
+              && $R(retries) < [llength $R(search)]} {
+        ::dns::cleanup $t
+        set suffix [lindex $R(search) $R(retries)]
+        incr R(retries)
+        set new [lindex [split $hostname .] 0].[string trim $suffix .]
+        set ip [Resolve $new]
+    } else {
+        set err [dns::error $t]
+        ::dns::cleanup $t
+        return -code error "dns error: $err"
+    }
+    return $ip
+}
+
+# -------------------------------------------------------------------------
+
+package provide resolv 1.0.3
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/spf.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/spf.tcl
new file mode 100644
index 00000000..0a1eefba
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dns/spf.tcl
@@ -0,0 +1,528 @@
+# spf.tcl - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+#                         Sender Policy Framework
+#
+#    http://www.ietf.org/internet-drafts/draft-ietf-marid-protocol-00.txt
+#    http://spf.pobox.com/
+#
+# Some domains using SPF:
+#   pobox.org       - mx, a, ptr
+#   oxford.ac.uk    - include
+#   gnu.org         - ip4
+#   aol.com         - ip4, ptr
+#   sourceforge.net - mx, a
+#   altavista.com   - exists,  multiple TXT replies.
+#   oreilly.com     - mx, ptr, include
+#   motleyfool.com  - include (looping includes)
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2;                # tcl minimum version
+package require dns;                    # tcllib 1.3
+package require logger;                 # tcllib 1.3
+package require ip;                     # tcllib 1.7
+package require struct::list;           # tcllib 1.7
+package require uri::urn;               # tcllib 1.3
+
+namespace eval spf {
+    namespace export spf
+
+    variable uid
+    if {![info exists uid]} {set uid 0}
+
+    variable log
+    if {![info exists log]} {
+        set log [logger::init spf]
+        ${log}::setlevel warn
+        proc ${log}::stdoutcmd {level text} {
+            variable service
+            puts "\[[clock format [clock seconds] -format {%H:%M:%S}]\
+                $service $level\] $text"
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+# ip     : ip address of the connecting host
+# domain : the domain to match
+# sender : full sender email address
+#
+proc ::spf::spf {ip domain sender} {
+    variable log
+
+    # 3.3: Initial processing
+    # If the sender address has no local part, set it to postmaster
+    set addr [split $sender @]
+    if {[set len [llength $addr]] == 0} {
+        return -code error -errorcode permanent "invalid sender address"
+    } elseif {$len == 1} {
+        set sender "postmaster@$sender"
+    }
+
+    # 3.4: Record lookup
+    set spf [SPF $domain]
+    if {[string equal $spf none]} {
+        return $spf
+    }
+
+    return [Spf $ip $domain $sender $spf]
+}
+
+proc ::spf::Spf {ip domain sender spf} {
+    variable log
+
+    # 3.4.1: Matching Version
+    if {![regexp {^v=spf(\d)\s+} $spf -> version]} {
+        return none
+    }
+
+    ${log}::debug "$spf"
+
+    if {$version != 1} {
+        return -code error -errorcode permanent \
+            "version mismatch: we only understand SPF 1\
+            this domain has provided version \"$version\""
+    }
+
+    set result ?
+    set seen_domains $domain
+    set explanation {denied}
+
+    set directives [lrange [split $spf { }] 1 end]
+    foreach directive $directives {
+        set prefix [string range $directive 0 0]
+        if {[string equal $prefix "+"] || [string equal $prefix "-"]
+            || [string equal $prefix "?"] || [string equal $prefix "~"]} {
+            set directive [string range $directive 1 end]
+        } else {
+            set prefix "+"
+        }
+
+        set cmd [string tolower [lindex [split $directive {:/=}] 0]]
+        set param [string range $directive [string length $cmd] end]
+
+        if {[info commands ::spf::_$cmd] == {}} {
+            # 6.1 Unrecognised directives terminate processing
+            #     but unknown modifiers are ignored.
+            if {[string match "=*" $param]} {
+                continue
+            } else {
+                set result unknown
+                break
+            }
+        } else {
+            set r [catch {::spf::_$cmd $ip $domain $sender $param} res]
+            if {$r} {
+                if {$r == 2} {return $res};# deal with return -code return
+                if {[string equal $res "none"]
+                    || [string equal $res "error"]
+                    || [string equal $res "unknown"]} {
+                    return $res
+                }
+                return -code error "error in \"$cmd\": $res"
+            }
+            if {$res} { set result $prefix }
+        }
+
+        ${log}::debug "$prefix $cmd\($param) -> $result"
+        if {[string equal $result "+"]} break
+    }
+
+    return $result
+}
+
+proc ::spf::loglevel {level} {
+    variable log
+    ${log}::setlevel $level
+}
+
+# get a guaranteed unique and non-present token id.
+proc ::spf::create_token {} {
+    variable uid
+    set id [incr uid]
+    while {[info exists [set token [namespace current]::$id]]} {
+        set id [incr uid]
+    }
+    return $token
+}
+
+# -------------------------------------------------------------------------
+#
+#                      SPF MECHANISM HANDLERS
+#
+# -------------------------------------------------------------------------
+
+# 4.1:	The "all" mechanism is a test that always matches.  It is used as the
+#	rightmost mechanism in an SPF record to provide an explicit default
+#
+proc ::spf::_all {ip domain sender param} {
+    return 1
+}
+
+# 4.2:	The "include" mechanism triggers a recursive SPF query.
+#	The domain-spec is expanded as per section 8.
+proc ::spf::_include {ip domain sender param} {
+    variable log
+    upvar seen_domains Seen
+
+    if {![string equal [string range $param 0 0] ":"]} {
+        return -code error "dubious parameters for \"include\""
+    }
+    set r ?
+    set new_domain [Expand [string range $param 1 end] $ip $domain $sender]
+    if {[lsearch $Seen $new_domain] == -1} {
+        lappend Seen $new_domain
+        set spf [SPF $new_domain]
+        if {[string equal $spf none]} {
+            return $spf
+        }
+        set r [Spf $ip $new_domain $sender $spf]
+    }
+    return [string equal $r "+"]
+}
+
+# 4.4:	This mechanism matches if <ip> is one of the target's
+#	IP addresses.
+#	e.g: a:smtp.example.com a:mail.%{d} a
+#
+proc ::spf::_a {ip domain sender param} {
+    variable log
+    foreach {testdomain bits} [ip::SplitIp [string trimleft $param :]] {}
+    if {[string length $testdomain] < 1} {
+        set testdomain $domain
+    } else {
+        set testdomain [Expand $testdomain $ip $domain $sender]
+    }
+    ${log}::debug "  fetching A for $testdomain"
+    set dips [A $testdomain];           # get the IPs for the testdomain
+    foreach dip $dips {
+        ${log}::debug "  compare: ${ip}/${bits} with ${dip}/${bits}"
+        if {[ip::equal $ip/$bits $dip/$bits]} {
+            return 1
+        }
+    }
+    return 0
+}
+
+# 4.5: This mechanism matches if the <sending-host> is one of the MX hosts
+#      for a domain name.
+#
+proc ::spf::_mx {ip domain sender param} {
+    variable log
+    foreach {testdomain bits} [ip::SplitIp [string trimleft $param :]] {}
+    if {[string length $testdomain] < 1} {
+        set testdomain $domain
+    } else {
+        set testdomain [Expand $testdomain $ip $domain $sender]
+    }
+    ${log}::debug "  fetching MX for $testdomain"
+    set mxs [MX $testdomain]
+
+    foreach mx $mxs {
+        set mx [lindex $mx 1]
+        set mxips [A $mx]
+        foreach mxip $mxips {
+            ${log}::debug "  compare: ${ip}/${bits} with ${mxip}/${bits}"
+            if {[ip::equal $ip/$bits $mxip/$bits]} {
+                return 1
+            }
+        }
+    }
+    return 0
+}
+
+# 4.6: This mechanism tests if the <sending-host>'s name is within a
+#      particular domain.
+#
+proc ::spf::_ptr {ip domain sender param} {
+    variable log
+    set validnames {}
+    if {[catch { set names [PTR $ip] } msg]} {
+        ${log}::debug "  \"$ip\" $msg"
+        return 0
+    }
+    foreach name $names {
+        set addrs [A $name]
+        foreach addr $addrs {
+            if {[ip::equal $ip $addr]} {
+                lappend validnames $name
+                continue
+            }
+        }
+    }
+
+    ${log}::debug "  validnames: $validnames"
+    set testdomain [Expand [string trimleft $param :] $ip $domain $sender]
+    if {$testdomain == {}} {
+        set testdomain $domain
+    }
+    foreach name $validnames {
+        if {[string match "*$testdomain" $name]} {
+            return 1
+        }
+    }
+
+    return 0
+}
+
+# 4.7: These mechanisms test if the <sending-host> falls into a given IP
+#      network.
+#
+proc ::spf::_ip4 {ip domain sender param} {
+    variable log
+    foreach {network bits} [ip::SplitIp [string range $param 1 end]] {}
+    ${log}::debug "  compare ${ip}/${bits} to ${network}/${bits}"
+    if {[ip::equal $ip/$bits $network/$bits]} {
+        return 1
+    }
+    return 0
+}
+
+# 4.6: These mechanisms test if the <sending-host> falls into a given IP
+#      network.
+#
+proc ::spf::_ip6 {ip domain sender param} {
+    variable log
+    foreach {network bits} [ip::SplitIp [string range $param 1 end]] {}
+    ${log}::debug "  compare ${ip}/${bits} to ${network}/${bits}"
+    if {[ip::equal $ip/$bits $network/$bits]} {
+        return 1
+    }
+    return 0
+}
+
+# 4.7: This mechanism is used to construct an arbitrary host name that is
+#      used for a DNS A record query.  It allows for complicated schemes
+#      involving arbitrary parts of the mail envelope to determine what is
+#      legal.
+#
+proc ::spf::_exists {ip domain sender param} {
+    variable log
+    set testdomain [Expand [string range $param 1 end] $ip $domain $sender]
+    ${log}::debug "   checking existence of '$testdomain'"
+    if {[catch {A $testdomain}]} {
+        return 0
+    }
+    return 1
+}
+
+# 5.1: Redirected query
+#
+proc ::spf::_redirect {ip domain sender param} {
+    variable log
+    set new_domain [Expand [string range $param 1 end] $ip $domain $sender]
+    ${log}::debug ">> redirect to '$new_domain'"
+    set spf [SPF $new_domain]
+    if {![string equal $spf none]} {
+        set spf [Spf $ip $new_domain $sender $spf]
+    }
+    ${log}::debug "<< redirect returning '$spf'"
+    return -code return $spf
+}
+
+# 5.2: Explanation
+#
+proc ::spf::_exp {ip domain sender param} {
+    variable log
+    set new_domain [string range $param 1 end]
+    set exp [TXT $new_domain]
+    set exp [Expand $exp $ip $domain $sender]
+    ${log}::debug "exp expanded to \"$exp\""
+    # FIX ME: need to store this somehow.
+}
+
+# 5.3: Sender accreditation
+#
+proc ::spf::_accredit {ip domain sender param} {
+    variable log
+    set accredit [Expand [string range $param 1 end] $ip $domain $sender]
+    ${log}::debug "  accreditation '$accredit'"
+    # We are not using this at the moment.
+    return 0
+}
+
+
+# 7: Macro expansion
+#
+proc ::spf::Expand {txt ip domain sender} {
+    variable log
+    set re {%\{[[:alpha:]](?:\d+)?r?[\+\-\.,/_=]*\}}
+    set txt [string map {\[ \\\[ \] \\\]} $txt]
+    regsub -all $re $txt {[ExpandMacro & $ip $domain $sender]} cmd
+    set cmd [string map {%% % %_ \  %- %20} $cmd]
+    return [subst -novariables $cmd]
+}
+
+proc ::spf::ExpandMacro {macro ip domain sender} {
+    variable log
+    set re {%\{([[:alpha:]])(\d+)?(r)?([\+\-\.,/_=]*)\}}
+    set C {} ; set T {} ; set R {}; set D {}
+    set r [regexp $re $macro -> C T R D]
+    if {$R == {}} {set R 0} else {set R 1}
+    set res $macro
+    if {$r} {
+        set enc [string is upper $C]
+        switch -exact -- [string tolower $C] {
+            s { set res $sender }
+            l {
+                set addr [split $sender @]
+                if {[llength $addr] < 2} {
+                    set res postmaster
+                } else {
+                    set res [lindex $addr 0]
+                }
+            }
+            o {
+                set addr [split $sender @]
+                if {[llength $addr] < 2} {
+                    set res $sender
+                } else {
+                    set res [lindex $addr 1]
+                }
+            }
+            h - d { set res $domain }
+            i {
+                set res [ip::normalize $ip]
+                if {[ip::is ipv6 $res]} {
+                    # Convert 0000:0001 to 0.1
+                    set t {}
+                    binary scan [ip::Normalize $ip 6] c* octets
+                    foreach octet $octets {
+                        set hi [expr {($octet & 0xF0) >> 4}]
+                        set lo [expr {$octet & 0x0F}]
+                        lappend t [format %x $hi] [format %x $lo]
+                    }
+                    set res [join $t .]
+                }
+            }
+            v {
+                if {[ip::is ipv6 $ip]} {
+                    set res ip6
+                } else {
+                    set res "in-addr"
+                }
+            }
+            c {
+                set res [ip::normalize $ip]
+                if {[ip::is ipv6 $res]} {
+                    set res [ip::contract $res]
+                }
+            }
+            r {
+                set s [socket -server {} -myaddr [info host] 0]
+                set res [lindex [fconfigure $s -sockname] 1]
+                close $s
+            }
+            t { set res [clock seconds] }
+        }
+        if {$T != {} || $R || $D != {}} {
+            if {$D == {}} {set D .}
+            set res [split $res $D]
+            if {$R} {
+                set res [struct::list::Lreverse $res]
+            }
+            if {$T != {}} {
+                incr T -1
+                set res [join [lrange $res end-$T end] $D]
+            }
+            set res [join $res .]
+        }
+        if {$enc} {
+            # URI encode the result.
+            set res [uri::urn::quote $res]
+        }
+    }
+    return $res
+}
+
+# -------------------------------------------------------------------------
+#
+# DNS helper procedures.
+#
+# -------------------------------------------------------------------------
+
+proc ::spf::Resolve {domain type resultproc} {
+    if {[info commands $resultproc] == {}} {
+        return -code error "invalid arg: \"$resultproc\" must be a command"
+    }
+    set tok [dns::resolve $domain -type $type]
+    dns::wait $tok
+    set errorcode NONE
+    if {[string equal [dns::status $tok] "ok"]} {
+        set result [$resultproc $tok]
+        set code   ok
+    } else {
+        set result    [dns::error $tok]
+        set errorcode [dns::errorcode $tok]
+        set code      error
+    }
+    dns::cleanup $tok
+    return -code $code -errorcode $errorcode $result
+}
+
+# 3.4: Record lookup
+proc ::spf::SPF {domain} {
+    set txt ""
+    if {[catch {Resolve $domain SPF ::dns::result} spf]} {
+        set code $::errorCode
+        ${log}::debug "error fetching SPF record: $r"
+        switch -exact -- $code {
+            3 { return -code return [list - "Domain Does Not Exist"] }
+            2 { return -code error -errorcode temporary $spf }
+        }
+        set txt none
+    } else {
+        foreach res $spf {
+            set ndx [lsearch $res rdata]
+            incr ndx
+            if {$ndx != 0} {
+                append txt [string range [lindex $res $ndx] 1 end]
+            }
+        }
+    }
+    return $txt
+}
+
+proc ::spf::TXT {domain} {
+    set r [Resolve $domain TXT ::dns::result]
+    set txt ""
+    foreach res $r {
+        set ndx [lsearch $res rdata]
+        incr ndx
+        if {$ndx != 0} {
+            append txt [string range [lindex $res $ndx] 1 end]
+        }
+    }
+    return $txt
+}
+
+proc ::spf::A {name} {
+    return [Resolve $name A ::dns::address]
+}
+
+
+proc ::spf::AAAA {name} {
+    return [Resolve $name AAAA ::dns::address]
+}
+
+proc ::spf::PTR {addr} {
+    return [Resolve $addr A ::dns::name]
+}
+
+proc ::spf::MX {domain} {
+    set r [Resolve $domain MX ::dns::name]
+    return [lsort -index 0 $r]
+}
+
+
+# -------------------------------------------------------------------------
+
+package provide spf 1.1.1
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/docstrip/docstrip.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/docstrip/docstrip.tcl
new file mode 100644
index 00000000..fa6399bb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/docstrip/docstrip.tcl
@@ -0,0 +1,163 @@
+## 
+## This is the file `docstrip.tcl',
+## generated with the SAK utility
+## (sak docstrip/regen).
+## 
+## The original source files were:
+## 
+## tcldocstrip.dtx  (with options: `pkg')
+## 
+## In other words:
+## **************************************
+## * This Source is not the True Source *
+## **************************************
+## the true source is the file from which this one was generated.
+##
+package require Tcl 8.4
+package provide docstrip 1.2
+namespace eval docstrip {
+   namespace export extract sourcefrom
+}
+proc docstrip::extract {text terminals args} {
+   array set O {
+      -annotate 0
+      -metaprefix %%
+      -onerror throw
+      -trimlines 1
+   }
+   array set O $args
+   foreach t $terminals {set T($t) ""}
+   set stripped ""
+   set block_stack [list]
+   set offlevel 0
+   set verbatim 0
+   set lineno 0
+   foreach line [split $text \n] {
+      incr lineno
+      if {$O(-trimlines)} then {
+         set line [string trimright $line " "]
+      }
+      if {$verbatim} then {
+         if {$line eq $endverbline} then {
+            set verbatim 0
+            continue
+         } elseif {$offlevel} then {
+            continue
+         }
+         append stripped $line \n
+         if {$O(-annotate)>=1} then {append stripped {V "" ""} \n}
+      } else {
+         switch -glob -- $line %%* {
+            if {!$offlevel} then {
+               append stripped $O(-metaprefix)\
+                 [string range $line 2 end] \n
+               if {$O(-annotate)>=1} then {
+                  append stripped [list M %% $O(-metaprefix)] \n
+               }
+            }
+         } %<<* {
+            set endverbline "%[string range $line 3 end]"
+            set verbatim 1
+            continue
+         } %<* {
+            if {![
+               regexp -- {^%<([*/+-]?)([^>]*)>(.*)$} $line ""\
+                 modifier expression line
+            ]} then {
+               extract,error BADGUARD\
+                 "Malformed guard \"\n$line\n\""
+                 "Malformed guard on line $lineno"
+               continue
+            }
+            regsub -all -- {\\|\{|\}|\$|\[|\]| |;} $expression\
+              {\\&} E
+            regsub -all -- {,} $E {|} E
+            regsub -all -- {[^()|&!]+} $E {[info exists T(&)]} E
+            if {[catch {expr $E} val]} then {
+               extract,error EXPRERR\
+                 "Error in expression <$expression> ignored"\
+                 "docstrip: $val"
+               set val -1
+            }
+            switch -exact -- $modifier * {
+               lappend block_stack $expression
+               if {$offlevel || !$val} then {incr offlevel}
+               continue
+            } / {
+               if {![llength $block_stack]} then {
+                  extract,error SPURIOUS\
+                    "Spurious end block </$expression> ignored"\
+                    "Spurious end block </$expression>"
+               } else {
+                  if {[string compare $expression\
+                    [lindex $block_stack end]]} then {
+                     extract,error MISMATCH\
+                       "Found </$expression> instead of\
+                       </[lindex $block_stack end]>"
+                  }
+                  if {$offlevel} then {incr offlevel -1}
+                  set block_stack [lreplace $block_stack end end]
+               }
+               continue
+            } - {
+               if {$offlevel || $val} then {continue}
+               append stripped $line \n
+               if {$O(-annotate)>=1} then {
+                  append stripped [list - %<-${expression}> ""] \n
+               }
+            } default {
+               if {$offlevel || !$val} then {continue}
+               append stripped $line \n
+               if {$O(-annotate)>=1} then {
+                  append stripped\
+                    [list + %<${modifier}${expression}> ""] \n
+               }
+            }
+         } %* {continue}\
+         {\\endinput} {
+           break
+         } default {
+            if {$offlevel} then {continue}
+            append stripped $line \n
+            if {$O(-annotate)>=1} then {append stripped {. "" ""} \n}
+         }
+      }
+      if {$O(-annotate)>=2} then {append stripped $lineno \n}
+      if {$O(-annotate)>=3} then {append stripped $block_stack \n}
+   }
+   return $stripped
+}
+proc docstrip::extract,error {situation message {errmessage ""}} {
+   upvar 1 O(-onerror) onerror lineno lineno
+   switch -- [string tolower $onerror] "puts" {
+      puts stderr "docstrip: $message on line $lineno."
+   } "ignore" {} default {
+      if {$errmessage ne ""} then {
+         error $errmessage "" [list DOCSTRIP $situation $lineno]
+      } else {
+         error $message "" [list DOCSTRIP $situation $lineno]
+      }
+   }
+}
+proc docstrip::sourcefrom {name terminals args} {
+   set F [open $name r]
+   if {[llength $args]} then {
+      eval [linsert $args 0 fconfigure $F]
+   }
+   set text [read $F]
+   close $F
+   set oldscr [info script]
+   info script $name
+   set code [catch {
+      uplevel 1 [extract $text $terminals -metaprefix #]
+   } res]
+   info script $oldscr
+   if {$code == 1} then {
+      error $res $::errorInfo $::errorCode
+   } else {
+      return $res
+   }
+}
+## 
+## 
+## End of file `docstrip.tcl'.
\ No newline at end of file
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/docstrip/docstrip_util.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/docstrip/docstrip_util.tcl
new file mode 100644
index 00000000..b3a0009c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/docstrip/docstrip_util.tcl
@@ -0,0 +1,649 @@
+## 
+## This is the file `docstrip_util.tcl',
+## generated with the SAK utility
+## (sak docstrip/regen).
+## 
+## The original source files were:
+## 
+## tcldocstrip.dtx  (with options: `utilpkg')
+## 
+## In other words:
+## **************************************
+## * This Source is not the True Source *
+## **************************************
+## the true source is the file from which this one was generated.
+##
+package require Tcl 8.4
+package require docstrip 1.2
+package provide docstrip::util 1.3.1
+namespace eval docstrip::util {
+   namespace export ddt2man guard patch thefile\
+     packages_provided index_from_catalogue modules_from_catalogue\
+     classical_preamble classical_postamble
+}
+namespace eval docstrip::util {
+   namespace import [namespace parent]::extract
+}
+proc docstrip::util::fileoptions {args} {
+   variable filename
+   variable thefile [eval [list thefile $filename] $args]
+   variable fileoptions $args
+}
+proc docstrip::util::Report {item} {
+   variable Report_store
+   if {$Report_store} then {
+      variable Report
+      lappend Report $item
+   }
+   variable Report_cmd
+   eval [linsert $Report_cmd end $item]
+}
+proc docstrip::util::index_from_catalogue {dir pattern args} {
+   array set O {
+      -options ""
+      -sourceconf ""
+      -report 0
+      -reportcmd {puts stdout}
+      -RecursionDepth 0
+   }
+   array set O $args
+   if {$O(-RecursionDepth)==0} then {
+      variable Report {}  Report_store $O(-report) \
+        Report_cmd $O(-reportcmd)
+   }
+   set targetFn [file join $dir pkgIndex.tcl]
+   Report "Entries will go to: $targetFn"
+   if {![file exists $targetFn]} then {
+      Report "Generating empty index file."
+      set F [open $targetFn w]
+      puts $F {# Tcl package index file, version 1.1}
+      puts $F {# This file is generated by the "pkg_mkIndex" command}
+      puts $F {# and sourced either when an application starts up or}
+      puts $F {# by a "package unknown" script.  It invokes the}
+      puts $F {# "package ifneeded" command to set up package-related}
+      puts $F {# information so that packages will be loaded automatically}
+      puts $F {# in response to "package require" commands.  When this}
+      puts $F {# script is sourced, the variable $dir must contain the}
+      puts $F {# full path name of this file's directory.}
+      close $F
+   }
+   set c [interp create -safe]
+   $c eval {
+      proc unknown args {}
+   }
+   $c alias pkgProvide [namespace which PkgProvide]
+   $c alias pkgIndex [namespace which PkgIndex]
+   $c alias fileoptions [namespace which fileoptions]
+   variable PkgIndex ""
+   foreach fn [glob -nocomplain -directory $dir -tails $pattern] {
+      Report "Processing file: $fn"
+      variable filename [file join $dir $fn]
+      variable fileoptions $O(-sourceconf)
+      variable thefile [eval [list thefile $filename] $fileoptions]
+      set catalogue [extract $thefile\
+        [linsert $O(-options) 0 docstrip.tcl::catalogue]\
+        -metaprefix {#} -onerror puts]
+      $c eval $catalogue
+   }
+   interp delete $c
+   if {$PkgIndex ne ""} then {
+      set F [open $targetFn {WRONLY APPEND}]
+      set cmd [list docstrip::util::index_from_catalogue $dir $pattern]
+      if {$O(-options) ne ""} then {
+         lappend cmd -options $O(-options)
+      }
+      if {$O(-sourceconf) ne ""} then {
+         lappend cmd -sourceconf $O(-sourceconf)
+      }
+      puts $F "\n## Appendix generated by:\n##  $cmd$PkgIndex"
+      close $F
+   }
+   if {[info exists O(-recursein)]} then {
+      incr O(-RecursionDepth)
+      foreach fn [
+         glob -nocomplain -tails -types d -directory $dir\
+           $O(-recursein)
+      ] {
+         eval [list index_from_catalogue [file join $dir $fn] $pattern]\
+           [array get O]
+      }
+   }
+   if {$O(-RecursionDepth)==0 && $O(-report)} then {
+      return [join $Report \n]
+   }
+}
+proc docstrip::util::PkgProvide {pkg ver terminals} {
+   if {[catch {package vcompare 0 $ver}]} then {
+      Report "Malformed version number $ver given for package $pkg."
+      return
+   }
+   variable PkgIndex
+   variable filename
+   variable fileoptions
+   append PkgIndex \n [list package ifneeded $pkg $ver] { "}
+   append PkgIndex [string map {\\ {\\} \$ {\$} \[ {\[} \" {\"}}\
+     [list package provide $pkg $ver]] {; }
+   append PkgIndex {package require docstrip} {; }
+   append PkgIndex {[list docstrip::sourcefrom }\
+     {[file join $dir } [list [file tail $filename]] {] }\
+     [linsert $fileoptions 0 $terminals] {]"}
+}
+proc docstrip::util::PkgIndex {args} {
+   variable thefile
+   if {[catch {
+      packages_provided [extract $thefile $args -metaprefix {#}]
+   } res]} then {
+      if {[lindex $::errorCode 0] eq "DOCSTRIP"} then {
+         Report "Stripping error \"$res\"\nwhile indexing module\
+           <[join $args ,]>."
+      } else {
+         Report "Code evaluation error:\n  $res\nwhile indexing\
+           module <[join $args ,]>."
+      }
+   } else {
+      variable filename
+      variable PkgIndex
+      variable fileoptions
+      foreach {pkg ver} $res {
+         append PkgIndex \n [list package ifneeded $pkg $ver] { "}
+         append PkgIndex {package require docstrip} {; }
+         append PkgIndex {[list docstrip::sourcefrom }\
+           {[file join $dir } [list [file tail $filename]] {] }\
+           [linsert $fileoptions 0 $args] {]"}
+      }
+   }
+}
+proc docstrip::util::modules_from_catalogue {target source args} {
+   array set Opt {
+      -formatpostamble {classical_postamble {##}}
+      -formatpreamble  {classical_preamble {##}}
+      -options         {}
+      -postamble       {}
+      -preamble        { }
+      -sourceconf      {}
+      -report          1
+      -reportcmd       list
+   }
+   array set Opt $args
+   variable filename $source
+   variable fileoptions $Opt(-sourceconf)
+   variable thefile [eval [list thefile $source] $fileoptions]
+   variable Report {}  Report_store $Opt(-report) \
+     Report_cmd $Opt(-reportcmd)
+   set catalogue [extract $thefile\
+     [linsert $Opt(-options) 0 docstrip.tcl::catalogue]\
+     -metaprefix {#} -onerror puts]
+   set c [interp create -safe]
+   $c eval {
+      proc unknown args {}
+   }
+   $c alias pkgProvide\
+     [namespace which GenerateNamedPkg] $target\
+     [linsert $Opt(-formatpreamble) end $Opt(-preamble)]\
+     [linsert $Opt(-formatpostamble) end $Opt(-postamble)]
+   $c alias pkgIndex\
+     [namespace which GeneratePkg] $target\
+     [linsert $Opt(-formatpreamble) end $Opt(-preamble)]\
+     [linsert $Opt(-formatpostamble) end $Opt(-postamble)]
+   $c alias fileoptions [namespace which fileoptions]
+   $c eval $catalogue
+   interp delete $c
+   if {$Opt(-report)} then {return [join $Report \n]}
+}
+proc docstrip::util::GenerateNamedPkg\
+  {target preamblecmd postamblecmd name version terminals} {
+   variable thefile
+   if {[catch {
+      extract $thefile $terminals -metaprefix {#}
+   } text]} then {
+      Report "Stripping error \"$text\"\nwhile indexing module\
+        <[join $terminals ,]>."
+   } else {
+      variable filename
+      set module [format {%s-%s.tm}\
+        [string trim [string map {:: /} $name] /] $version]
+      set modL [file split $module]
+      file mkdir [file join $target [file dirname $module]]
+      set F [open [file join $target $module] w]
+      fconfigure $F -encoding utf-8
+      puts $F [eval $preamblecmd [list $module $filename $terminals]]
+      puts -nonewline $F $text
+      puts $F [eval $postamblecmd [list $module $filename $terminals]]
+      close $F
+      Report "Wrote $module"
+   }
+}
+proc docstrip::util::GeneratePkg {target preamblecmd postamblecmd args} {
+   variable thefile
+   if {[catch {
+      set text [extract $thefile $args -metaprefix {#}]
+      packages_provided $text
+   } res]} then {
+      if {[lindex $::errorCode 0] eq "DOCSTRIP"} then {
+         Report "Stripping error \"$res\"\nwhile indexing module\
+           <[join $args ,]>."
+      } else {
+         Report "Code evaluation error:\n  $res\nwhile indexing\
+           module <[join $args ,]>."
+      }
+   } elseif {![llength $res]} then {
+      Report "Found no package in module <[join $args ,]>."
+   } else {
+      variable filename
+      set module [format {%s-%s.tm}\
+        [string trim [string map {:: /} [lindex $res 0]] /]\
+        [lindex $res 1]]
+      set modL [file split $module]
+      file mkdir [file join $target [file dirname $module]]
+      set F [open [file join $target $module] w]
+      fconfigure $F -encoding utf-8
+      puts $F [eval $preamblecmd [list $module $filename $args]]
+      puts -nonewline $F $text
+      puts $F [eval $postamblecmd [list $module $filename $args]]
+      close $F
+      Report "Wrote $module"
+      foreach {pkg ver} [lreplace $res 0 1] {
+         set mod2 [format {%s-%s.tm}\
+           [string trim [string map {:: /} $pkg] /] $ver]
+         set mod2L [file split $mod2]
+         file mkdir [file join $target [file dirname $mod2]]
+         set common 0
+         foreach d1 $modL d2 $mod2L {
+            if {$d1 eq $d2} then {incr common} else {break}
+         }
+         set tail [lrange $modL $common end]
+         set script {[::info script]}
+         foreach d2 $mod2L {
+            if {[incr common -1] < 0} then {
+               set script "\[::file dirname $script\]"
+            }
+         }
+         set F [open [file join $target $mod2] w]
+         fconfigure $F -encoding utf-8
+         puts $F "::source -encoding utf-8 \[::file join $script $tail\]"
+         close $F
+         Report "Wrote redirect $mod2"
+      }
+   }
+}
+proc docstrip::util::classical_preamble {metaprefix message target args} {
+   set res {""}
+   lappend res " This is `$target',"
+   lappend res { generated by the docstrip::util package.}
+   lappend res {} { The original source files were:} {}
+   foreach {source terminals} $args {
+      set line " [file tail $source]"
+      if {[llength $terminals]} then {
+         append line { (with options: `} [join $terminals ,] {')}
+      }
+      lappend res $line
+   }
+   foreach line [split $message \n] {lappend res " $line"}
+   return $metaprefix[join $res "\n$metaprefix"]
+}
+proc docstrip::util::classical_postamble {metaprefix message target args} {
+   set res {}
+   foreach line [split $message \n] {lappend res " $line"}
+   lappend res {} " End of file `$target'."
+   return $metaprefix[join $res "\n$metaprefix"]
+}
+proc docstrip::util::packages_provided {text {setup ""}} {
+   set c [interp create -safe]
+   $c eval {
+      proc tclPkgUnknown args {}
+      package unknown tclPkgUnknown
+      proc unknown {args} {}
+      proc auto_import {args} {}
+   }
+   $c hide package
+   $c alias package [namespace which packages_provided,package] $c
+   eval $setup
+   set package_list {}
+   catch {$c eval $text}
+   interp delete $c
+   return $package_list
+}
+proc docstrip::util::packages_provided,package {interp subcmd args} {
+   switch -- $subcmd {
+      r - re - req - requ - requi - requir - require {
+         return
+      }
+      pro - prov - provi - provid - provide {
+         if {[llength $args] == 2} then {
+            uplevel 1 [list lappend package_list] $args
+         }
+      }
+   }
+   eval [list $interp invokehidden package $subcmd] $args
+}
+proc docstrip::util::ddt2man {text} {
+   set wascode 0
+   set verbatim 0
+   set res ""
+   foreach line [split $text \n] {
+      if {$verbatim} then {
+         if {$line eq $endverbline} then {
+            set verbatim 0
+         } else {
+            append res [string map {[ [lb] ] [rb]} $line] \n
+         }
+      } else {
+         switch -glob -- $line %%* {
+            if {$wacode} then {
+               append res {[example_end]} \n
+               set wascode 0
+            }
+            append res [string range $line 2 end] \n
+         } %<<* {
+            if {!$wascode} then {
+               append res {[example_begin]} \n
+               set wascode 1
+            }
+            set endverbline "%[string range $line 3 end]"
+            set verbatim 1
+         } %<* {
+            if {!$wascode} then {
+               append res {[example_begin]} \n
+               set wascode 1
+            }
+            set guard ""
+            regexp -- {(^%<[^>]*>)(.*)$} $line "" guard line
+            append res \[ [list emph $guard] \]\
+              [string map {[ [lb] ] [rb]} $line] \n
+         } %* {
+            if {$wascode} then {
+               append res {[example_end]} \n
+               set wascode 0
+            }
+            append res [string range $line 1 end] \n
+         } {\\endinput} {
+           break
+         } "" {
+            append res \n
+         } default {
+            if {!$wascode} then {
+               append res {[example_begin]} \n
+               set wascode 1
+            }
+            append res [string map {[ [lb] ] [rb]} $line] \n
+         }
+      }
+   }
+   if {$wascode} then {append res {[example_end]} \n}
+   return $res
+}
+proc docstrip::util::guards {subcmd text} {
+   set verbatim 0
+   set lineno 1
+   set badL {}
+   foreach line [split $text \n] {
+      if {$verbatim} then {
+         if {$line eq $endverbline} then {set verbatim 0}
+      } else {
+         switch -glob -- $line %<<* {
+            set endverbline "%[string range $line 3 end]"
+            set verbatim 1
+         } %<* {
+            if {![
+               regexp -- {^%<([*/+-]?)([^>]*)>(.*)$} $line ""\
+                 modifier expression line
+            ]} then {
+               lappend badL $lineno $line
+            } else {
+               if {$modifier eq ""} then {set modifier " "}
+               append E($expression) $modifier
+            }
+         }
+      }
+      incr lineno
+   }
+   if {$subcmd eq "rotten"} then {return $badL}
+   switch -- $subcmd "exprmods" {
+      return [array get E]
+   } "expressions" {
+      return [array names E]
+   } "exprerr" {
+      set res {}
+      foreach expr [array names E] {
+         regsub -all {[^()!,|&]+} $expr 0 e
+         regsub -all {,} $e {|} e
+         if {[catch {expr $e}]} then {lappend res $expr}
+      }
+      return $res
+   }
+   foreach name [array names E] {
+      set E($name) [string length $E($name)]
+   }
+   if {$subcmd eq "exprcounts"} then {return [array get E]}
+   foreach expr [array names E] {
+      foreach term [split $expr "()!,|&"] {
+         if {$term eq ""} then {continue}
+         if {![info exists T($term)]} then {set T($term) 0}
+         incr T($term) $E($expr)
+      }
+   }
+   switch -- $subcmd "counts" {
+      return [array get T]
+   } "names" {
+      return [array names T]
+   } default {
+      error "Unknown subcommand '$subcmd', must be one of:\
+        counts, exprcounts, expressions, exprmods, names, rotten"
+   }
+}
+proc docstrip::util::patch {sourcevar termL fromtext diff args} {
+   upvar 1 $sourcevar SL
+   array set O {-trimlines 1 -matching exact}
+   array set O $args
+   set cmd [list extract [join $SL \n]  $termL -annotate 2]
+   foreach opt {-metaprefix -trimlines} {
+      if {[info exists O($opt)]} then {lappend cmd $opt $O($opt)}
+   }
+   set EL [split [eval $cmd] \n]
+   lset EL end \n
+   set ptr 0
+   set lineno 1
+   set FL [list {}]
+   foreach line [split $fromtext \n] {
+      lappend FL $line
+      if {$O(-trimlines)} then {set line [string trimright $line " "]}
+      if {$line eq [lindex $EL $ptr]} then {
+         set lift($lineno) [lindex $EL [incr ptr]]
+         lset lift($lineno) 0 [expr { [lindex $EL [incr ptr]] - 1 }]
+         incr ptr
+      }
+      incr lineno
+   }
+   if {![array size lift]} then {
+      return -code error "The extract did not match any part of the\
+        fromtext. Check the list of terminals and the options"
+   }
+   set RL [list]
+   set log [list]
+   foreach hunk [lsort -decreasing -integer -index 0 $diff] {
+      set replL [list]
+      set l1 [lindex $hunk 0]
+      set repl {0 -1}
+      set matches 1
+      foreach {type line} [lindex $hunk 4] {
+         switch -glob -- $type {[0-]} {
+            switch -- $O(-matching) "exact" {
+               if {[lindex $FL $l1] ne $line} then {set matches 0}
+            } "nonspace" {
+               if {[regsub -all -- {\s} $line {}] ne\
+                 [regsub -all -- {\s} [lindex $FL $l1] {}]} then {
+                  set matches 0
+               }
+            } "anyspace" {
+               if {[regsub -all -- {\s+} $line { }] ne\
+                 [regsub -all -- {\s+} [lindex $FL $l1] { }]} then {
+                  set matches 0
+               }
+            }
+         }
+         switch -- $type synch {
+            if {[llength $repl]>2 ||\
+              [lindex $repl 1]-[lindex $repl 0]>=0} then {
+               lappend replL $repl
+            }
+            set repl [list $l1 [expr {$l1-1}]]
+         } + {
+            lappend repl $line
+         } - {
+            lset repl 1 $l1
+            incr l1
+         } 0 {
+            if {[llength $repl]>2 ||\
+              [lindex $repl 1]-[lindex $repl 0]>=0} then {
+               lappend replL $repl
+               set repl {0 -1}
+            }
+            lset repl 1 $l1
+            incr l1
+            lset repl 0 $l1
+         }
+      }
+      if {[llength $repl]>2 || [lindex $repl 1]-[lindex $repl 0]>=0}\
+      then {lappend replL $repl}
+      if {$matches} then {
+         lappend hunk [lsort -decreasing -integer -index 0 $replL]
+         lappend RL $hunk
+      } else {
+         lappend hunk "(-- did not match fromtext --)"
+         lappend log $hunk
+      }
+   }
+   foreach hunk $RL {
+      set applied 0
+      set misapplied 0
+      foreach repl [lindex $hunk 5] {
+         unset -nocomplain from to
+         for {set n [lindex $repl 1]} {$n>=[lindex $repl 0]}\
+           {incr n -1} {
+            if {![info exists lift($n)]} then {
+               incr misapplied
+               continue
+            } elseif {![info exists from]} then {
+               set to [lindex $lift($n) 0]
+               set from $to
+            } elseif {[lindex $lift($n) 0] == $from-1} then {
+               set from [lindex $lift($n) 0]
+            } else {
+               set SL [lreplace $SL $from $to]
+               set to [lindex $lift($n) 0]
+               set from $to
+            }
+            incr applied
+            set n0 $n
+         }
+         if {[info exists from]} then {
+            set sprefix [lindex $lift($n0) 1]
+            set eprefix [lindex $lift($n0) 2]
+         } elseif {[info exists lift([lindex $repl 0])]} then {
+            foreach {from sprefix eprefix} $lift([lindex $repl 0])\
+              break
+            set to [expr {$from-1}]
+         } else {
+            incr misapplied [llength [lrange $repl 2 end]]
+            continue
+         }
+         set eplen [string length $eprefix]
+         set epend [expr {$eplen-1}]
+         set cmd [list lreplace $SL $from $to]
+         foreach line [lrange $repl 2 end] {
+            if {$eprefix eq [string range $line 0 $epend]} then {
+               lappend cmd "$sprefix[string range $line $eplen end]"
+            } else {
+               lappend cmd $line
+            }
+            incr applied
+         }
+         set SL [eval $cmd]
+      }
+      if {$misapplied>0} then {
+         if {$applied>0} then {
+            lset hunk 5 "(-- was partially applied --)"
+         } else {
+            lset hunk 5 "(not applied)"
+         }
+         lappend log $hunk
+      }
+   }
+   set res ""
+   foreach hunk [lsort -index 0 -integer $log] {
+      foreach {start1 end1 start2 end2 lines msg} $hunk break
+      append res [format "@@ -%d,%d +%d,%d @@ %s\n"\
+        $start1 [expr {$end1-$start1+1}]\
+        $start2 [expr {$end2-$start2+1}] $msg]
+      foreach {type line} $lines {
+         switch -- $type 0 {
+            append res " " $line \n
+         } - - + {
+            append res $type $line \n
+         }
+      }
+   }
+   return $res
+}
+proc docstrip::util::thefile {fname args} {
+   set F [open $fname r]
+   if {[llength $args]} then {
+      if {[set code [
+         catch {eval [linsert $args 0 fconfigure $F]} res
+      ]]} then {
+         close $F
+         return -code $code -errorinfo $::errorInfo -errorcode\
+           $::errorCode
+      }
+   }
+   catch {read -nonewline $F} res
+   close $F
+   return $res
+}
+proc docstrip::util::import_unidiff {text {warnvar ""}} {
+   if {$warnvar ne ""} then {upvar 1 $warnvar warning}
+   set inheader 1
+   set res [list]
+   set lines [list]
+   set end2 "not an integer"
+   foreach line [split $text \n] {
+      if {$inheader && [regexp {^(---|\+\+\+)} $line]}\
+      then {continue}
+      switch -glob -- $line { *} {
+         lappend lines 0 [string range $line 1 end]
+      } {+*} {
+         lappend lines + [string range $line 1 end]
+      } {-*} {
+         lappend lines - [string range $line 1 end]
+      } @@* {
+         if {[string is integer $end2]} then {
+            lappend res [list $start1 $end1 $start2 $end2 $lines]
+         }
+         set len2 [set len1 ,1]
+         if {[
+            regexp {^@@ -([0-9]+)(,[0-9]+)? \+([0-9]+)(,[0-9]+)? @@}\
+              $line -> start1 len1 start2 len2
+         ] && [scan "$start1 $len1,1" {%d ,%d} start1 len1]==2 &&\
+              [scan "$start2 $len2,1" {%d ,%d} start2 len2]==2
+         } then {
+            set end1 [expr {$start1+$len1-1}]
+            set end2 [expr {$start2+$len2-1}]
+            set inheader 0
+         } else {
+            set end2 "not an integer"
+            append warning "Could not parse hunk header:  " $line \n
+         }
+         set lines [list]
+      } "" {
+      } default {
+         append warning "Could not parse line:  " $line \n
+      }
+   }
+   if {[string is integer $end2]} then {
+      lappend res [list $start1 $end1 $start2 $end2 $lines]
+   }
+   return $res
+}
+## 
+## 
+## End of file `docstrip_util.tcl'.
\ No newline at end of file
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/docstrip/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/docstrip/pkgIndex.tcl
new file mode 100644
index 00000000..2835539b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/docstrip/pkgIndex.tcl
@@ -0,0 +1,23 @@
+## 
+## This is the file `pkgIndex.tcl',
+## generated with the SAK utility
+## (sak docstrip/regen).
+## 
+## The original source files were:
+## 
+## tcldocstrip.dtx  (with options: `idx')
+## 
+## In other words:
+## **************************************
+## * This Source is not the True Source *
+## **************************************
+## the true source is the file from which this one was generated.
+##
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded docstrip 1.2\
+  [list source [file join $dir docstrip.tcl]]
+package ifneeded docstrip::util 1.3.1\
+  [list source [file join $dir docstrip_util.tcl]]
+## 
+## 
+## End of file `pkgIndex.tcl'.
\ No newline at end of file
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/api.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/api.tcl
new file mode 100644
index 00000000..79d55726
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/api.tcl
@@ -0,0 +1,31 @@
+# -*- tcl -*-
+# api.tcl -- API placeholders
+#
+# Copyright (c) 2001 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Copyright (c) 2002 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Copyright (c) 2003 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+################################################################
+# This file defines all commands expected from a formatter by the
+# doctools library. It is loaded into the formatter interpreter before
+# the code for a particular format is loaded. All commands defined
+# here return an error. This ensures the generation of errors if a
+# format forgets to define commands in the API.
+
+################################################################
+# Here it comes
+
+foreach __cmd {
+    initialize shutdown setup numpasses listvariables varset
+
+    manpage_begin moddesc titledesc manpage_end require description
+    section para list_begin list_end lst_item call bullet enum see_also
+    keywords example example_begin example_end nl arg cmd opt emph strong
+    comment sectref syscmd method option widget fun type package class var
+    file uri term const copyright category
+} {
+    proc fmt_$__cmd {args} [list return  "return -code error \"Unimplemented API command $__cmd\""]
+}
+unset __cmd
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/api_idx.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/api_idx.tcl
new file mode 100644
index 00000000..3ee553d3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/api_idx.tcl
@@ -0,0 +1,26 @@
+# -*- tcl -*-
+# api_idx.tcl -- API placeholders
+#
+# Copyright (c) 2003 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+################################################################
+# This file defines all commands expected from a docidx formatter by the
+# doctools library. It is loaded into the formatter interpreter before
+# the code for a particular docidx format is loaded. All commands defined
+# here return an error. This ensures the generation of errors if a
+# format forgets to define commands in the API.
+
+################################################################
+# Here it comes
+
+foreach __cmd {
+    idx_initialize idx_shutdown idx_setup idx_numpasses
+    idx_listvariables idx_varset
+    fmt_index_begin fmt_index_end fmt_key fmt_manpage fmt_url
+    fmt_comment fmt_plain_text
+} {
+    proc $__cmd {args} [list return  "return -code error \"Unimplemented API command $__cmd\""]
+}
+unset __cmd
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/api_toc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/api_toc.tcl
new file mode 100644
index 00000000..42398cfc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/api_toc.tcl
@@ -0,0 +1,26 @@
+# -*- tcl -*-
+# api_toc.tcl -- API placeholders
+#
+# Copyright (c) 2003 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+################################################################
+# This file defines all commands expected from a doctoc formatter by the
+# doctools library. It is loaded into the formatter interpreter before
+# the code for a particular doctoc format is loaded. All commands defined
+# here return an error. This ensures the generation of errors if a
+# format forgets to define commands in the API.
+
+################################################################
+# Here it comes
+
+foreach __cmd {
+    toc_initialize toc_shutdown toc_setup toc_numpasses
+    toc_listvariables toc_varset
+    fmt_toc_begin fmt_toc_end fmt_division_start fmt_division_end
+    fmt_item fmt_comment fmt_plain_text
+} {
+    proc $__cmd {args} [list return  "return -code error \"Unimplemented API command $__cmd\""]
+}
+unset __cmd
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/changelog.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/changelog.tcl
new file mode 100644
index 00000000..fd609361
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/changelog.tcl
@@ -0,0 +1,278 @@
+# changelog.tcl --
+#
+#	Handling of ChangeLog's.
+#
+# Copyright (c) 2003-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# FUTURE -- Expand pre-parsed log (nested lists) into flat structures
+# FUTURE --  => date/author/file/cref + cref/text
+# FUTURE -- I.e. relational/tabular structure, useable in table displays,
+# FUTURE -- sort by date, author, file to see aggregated changes
+# FUTURE --  => Connectivity to 'struct::matrix', Reports!
+
+
+package require Tcl 8.2
+package require textutil
+
+namespace eval ::doctools {}
+namespace eval ::doctools::changelog {
+    namespace export scan flatten merge toDoctools
+}
+
+proc ::doctools::changelog::flatten {entries} {
+    # Reformat the entries into a simpler structure.
+
+    set result {}
+    foreach entry $entries {
+	foreach {date user sections} $entry break
+	set f {}
+	set t {}
+	foreach sec $sections {
+	    foreach {files text} $sec break
+	    foreach file $files { lappend f $file }
+	    append t \n $text
+	}
+
+	set t [textutil::adjust::indent [textutil::adjust $t] "        "]
+	lappend result \
+	    "$date $user\n    [join $f ", "]:\n$t"
+    }
+
+    return $result
+}
+
+# ::doctools::changelog::scan --
+#
+#	Scan a ChangeLog generated by 'emacs' and extract the relevant information.
+#
+# Result
+#	List of entries. Each entry is a list of three elements. These
+#	are date, author, and commentary. The commentary is a list of
+#	sections. Each section is a list of two elements, a list of
+#	files, and the associated text.
+
+proc ::doctools::changelog::scan {text} {
+    set text [split $text \n]
+    set n    [llength $text]
+
+    set entries [list]
+    set clist [list]
+    set files [list]
+    set comment ""
+    set first 1
+
+    for {set i 0} {$i < $n} {incr i} {
+	set line [lindex $text $i]
+
+	if {[regexp "^\[^ \t\]" $line]} {
+	    # No whitespace at the front, start a new entry
+
+	    closeEntry
+
+	    # For the upcoming entry. Quick extraction first, string
+	    # based in case of failure.
+
+	    if {[catch {
+		set date    [string trim [lindex $line 0]]
+		set author  [string trim [lrange $line 1 end]]
+	    }]} {
+		set pos    [string first " " $line]
+		set date   [string trim [string range $line 0   $pos]]
+		set author [string trim [string range $line $pos end]]
+	    }
+	    continue
+	}
+
+	# Inside of an entry.
+
+	set line [string trim $line]
+
+	if {[string length $line] == 0} {
+	    # Next comment section
+	    closeSection
+	    continue
+	}
+
+	# Line is not empty. Split into file and comment parts,
+	# remember the data.
+
+	if {[string first "* " $line] == 0} {
+	    if {[regexp {^\* (.*):[ 	]} $line full fname]} {
+		set line [string range $line [string length $full] end]
+	    } elseif {[regexp {^\* (.*):$} $line full fname]} {
+		set line ""
+	    } else {
+		# There is no filename
+		set fname ""
+		set line [string range $line 2 end] ; # Get rid of "* ".
+	    }
+
+	    set detail ""
+	    while {[string first "(" $fname] >= 0} {
+		if {[regexp {\([^)]*\)} $fname detailx]} {
+		    regsub {\([^)]*\)} $fname {} fnameNew
+		} elseif {[regexp {\([^)]*} $fname detailx]} {
+		    regsub {\([^)]*} $fname {} fnameNew
+		} else {
+		    break
+		}
+		append detail " " $detailx
+		set fname [string trim $fnameNew]
+	    }
+	    if {$detail != {}} {set line "$detail $line"}
+	    if {$fname  != {}} {lappend files $fname}
+	}
+
+	append comment $line\n
+    }
+
+    closeEntry
+    return $entries
+}
+
+
+proc ::doctools::changelog::closeSection {} {
+    upvar 1 clist clist comment comment files files
+
+    if {
+	([string length $comment] > 0) ||
+	([llength $files] > 0)
+    } {
+	lappend clist   [list $files [string trim $comment]]
+	set     files   [list]
+	set     comment ""
+    }
+    return
+}
+
+proc ::doctools::changelog::closeEntry {} {
+    upvar 1 clist clist comment comment files files first first \
+	date date author author entries entries
+
+    if {!$first} {
+	closeSection
+	lappend entries [list $date $author $clist]
+    }
+    set first 0
+    set clist [list]
+    set files [list]
+    set comment ""
+    return
+}
+
+# ::doctools::changelog::merge --
+#
+#	Merge several preprocessed changelogs (see scan) into one structure.
+
+
+proc ::doctools::changelog::merge {args} {
+
+    if {[llength $args] == 0} {return {}}
+    if {[llength $args] == 1} {return [lindex $args 0]}
+
+    set res [list]
+    array set tmp {}
+
+    # Merge up ...
+
+    foreach entries $args {
+	foreach e $entries {
+	    foreach {date author comments} $e break
+	    if {![info exists tmp($date,$author)]} {
+		lappend res [list $date $author]
+		set tmp($date,$author) $comments
+	    } else {
+		foreach section $comments {
+		    lappend tmp($date,$author) $section
+		}
+	    }
+	}
+    }
+
+    # ... And construct the final result
+
+    set args $res
+    set res [list]
+    foreach key [lsort -decreasing $args] {
+	foreach {date author} $key break
+	lappend res [list $date $author $tmp($date,$author)]
+    }
+    return $res
+}
+
+
+# ::doctools::changelog::toDoctools --
+#
+#	Convert a preprocessed changelog log (see scan) into a doctools page.
+#
+# Arguments:
+#	evar, cvar, fvar: Name of the variables containing the preprocessed log.
+#
+# Results:
+#	A string containing a properly formatted ChangeLog.
+#
+
+proc ::doctools::changelog::q {text} {return "\[$text\]"}
+
+proc ::doctools::changelog::toDoctools {title module version entries} {
+
+    set     linebuffer [list]
+    lappend linebuffer [q "manpage_begin [list ${title}-changelog n $version]"]
+    lappend linebuffer [q "titledesc [list "$title ChangeLog"]"]
+    lappend linebuffer [q "moddesc [list $module]"]
+    lappend linebuffer [q description]
+    lappend linebuffer [q "list_begin definitions compact"]
+
+    foreach entry $entries {
+	foreach {date author commentary} $entry break
+
+	lappend linebuffer [q "lst_item \"[q "emph [list $date]"] -- [string map {{"} {\"} {\"} {\\\"}} $author]\""]
+
+	if {[llength $commentary] > 0} {
+	    lappend linebuffer [q nl]
+	}
+
+	foreach section $commentary {
+	    foreach {files text} $section break
+	    if {$text != {}} {
+		set text [string map {[ [lb] ] [rb]} [textutil::adjust $text]]
+	    }
+
+	    if {[llength $files] > 0} {
+		lappend linebuffer [q "list_begin definitions"]
+
+		foreach f $files {
+		    lappend linebuffer [q "lst_item [q "file [list $f]"]"]
+		}
+		if {$text != {}} {
+		    lappend linebuffer ""
+		    lappend linebuffer $text
+		    lappend linebuffer ""
+		}
+
+		lappend linebuffer [q list_end]
+	    } elseif {$text != {}} {
+		# No files
+		lappend linebuffer [q "list_begin bullet"]
+		lappend linebuffer [q bullet]
+		lappend linebuffer ""
+		lappend linebuffer $text
+		lappend linebuffer ""
+		lappend linebuffer [q list_end]
+	    }
+	}
+	lappend linebuffer [q nl]
+    }
+
+    lappend linebuffer [q list_end]
+    lappend linebuffer [q manpage_end]
+    return [join $linebuffer \n]
+}
+
+#------------------------------------
+# Module initialization
+
+package provide doctools::changelog 1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/checker.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/checker.tcl
new file mode 100644
index 00000000..c7eb0238
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/checker.tcl
@@ -0,0 +1,734 @@
+# -*- tcl -*-
+# checker.tcl
+#
+# Code used inside of a checker interpreter to ensure correct usage of
+# doctools formatting commands.
+#
+# Copyright (c) 2003-2014 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# L10N
+
+package require msgcat
+
+proc ::msgcat::mcunknown {locale code} {
+    return "unknown error code \"$code\" (for locale $locale)"
+}
+
+if {0} {
+    puts stderr "Locale [::msgcat::mcpreferences]"
+    foreach path [dt_search] {
+	puts stderr "Catalogs: [::msgcat::mcload $path] - $path"
+    }
+} else {
+    foreach path [dt_search] {
+	::msgcat::mcload $path
+    }
+}
+
+# State, and checker commands.
+# -------------------------------------------------------------
+#
+# Note that the code below assumes that a command XXX provided by the
+# formatter engine is accessible under the name 'fmt_XXX'.
+#
+# -------------------------------------------------------------
+
+global state lstctx lstitem
+
+# --------------+-----------------------+----------------------
+# state		| allowed commands	| new state (if any)
+# --------------+-----------------------+----------------------
+# all except	| arg cmd opt comment	|
+#  for "done"	| syscmd method option	|
+#		| widget fun type class	|
+#		| package var file uri	|
+#		| strong emph namespace	|
+# --------------+-----------------------+----------------------
+# manpage_begin	| manpage_begin		| header
+# --------------+-----------------------+----------------------
+# header	| moddesc titledesc	| header
+#		| copyright keywords	|
+#		| require see_also category |
+#		+-----------------------+-----------
+#		| description		| body
+# --------------+-----------------------+----------------------
+# body		| section para list_end	| body
+#		| list_begin lst_item	|
+#		| call bullet usage nl	|
+#		| example see_also	|
+#		| keywords sectref enum	|
+#		| arg_def cmd_def	|
+#		| opt_def tkoption_def	|
+#		| subsection category	|
+#		+-----------------------+-----------
+#		| example_begin		| example
+#		+-----------------------+-----------
+#		| manpage_end		| done
+# --------------+-----------------------+----------------------
+# example	| example_end		| body
+# --------------+-----------------------+----------------------
+# done		|			|
+# --------------+-----------------------+----------------------
+#
+# Additional checks
+# --------------------------------------+----------------------
+# list_begin/list_end			| Are allowed to nest.
+# --------------------------------------+----------------------
+#	section				| Not allowed in list context
+#
+#	arg_def				| Only in 'argument list'.
+#	cmd_def				| Only in 'command list'.
+#	nl para				| Only in list item context.
+#	opt_def				| Only in 'option list'.
+#	tkoption_def			| Only in 'tkoption list'.
+# 	def/call			| Only in 'definition list'.
+# 	enum				| Only in 'enum list'.
+# 	item/bullet			| Only in 'bullet list'.
+# --------------------------------------+----------------------
+
+# -------------------------------------------------------------
+# Helpers
+proc Error {code {text {}}} {
+    global state lstctx lstitem
+
+    # Problematic command with all arguments (we strip the "ck_" prefix!)
+    # -*- future -*- count lines of input, maintain history buffer, use
+    # -*- future -*- that to provide some context here.
+
+    set cmd  [lindex [info level 1] 0]
+    set args [lrange [info level 1] 1 end]
+    if {$args != {}} {append cmd " [join $args]"}
+
+    # Use a message catalog to map the error code into a legible message.
+    set msg [::msgcat::mc $code]
+
+    if {$text != {}} {
+	set msg [string map [list @ $text] $msg]
+    }
+    dt_error "Manpage error ($code), \"$cmd\" : ${msg}."
+    return
+}
+proc Warn {code args} {
+    global pass
+    if {$pass > 1} return
+    # Warnings only in the first pass!
+    set msg [::msgcat::mc $code]
+    foreach {off line col} [dt_where] break
+    set msg [eval [linsert $args 0 format $msg]]
+    set msg "In macro at line $line, column $col of file [dt_file]:\n$msg"
+    set msg [split $msg \n]
+    set prefix "DocTools Warning ($code): "
+    dt_warning "$prefix[join $msg "\n$prefix"]"
+    return
+}
+proc WarnX {code args} {
+    # Warnings only in the first pass!
+    set msg [::msgcat::mc $code]
+    foreach {off line col} [dt_where] break
+    set msg [eval [linsert $args 0 format $msg]]
+    set msg "In macro at line $line, column $col of file [dt_file]:\n$msg"
+    set msg [split $msg \n]
+    set prefix "DocTools Warning ($code): "
+    dt_warning "$prefix[join $msg "\n$prefix"]"
+    return
+}
+
+proc Is    {s} {global state ; return [string equal $state $s]}
+proc IsNot {s} {global state ; return [expr {![string equal $state $s]}]}
+proc Go    {s} {Log " >>\[$s\]" ; global state ; set state $s; return}
+proc LPush {l} {
+    global lstctx lstitem
+    set    lstctx [linsert $lstctx 0 $l $lstitem]
+    return
+}
+proc LPop {} {
+    global lstctx lstitem
+    set    lstitem [lindex $lstctx 1]
+    set    lstctx  [lrange $lstctx 2 end]
+    return
+}
+proc LSItem {} {global lstitem ; set lstitem 1}
+proc LIs  {l} {global lstctx ; string equal $l [lindex $lstctx 0]}
+proc LItem {} {global lstitem ; return $lstitem}
+proc LNest {} {
+    global lstctx
+    expr {[llength $lstctx] / 2}
+}
+proc LOpen {} {
+    global lstctx
+    expr {$lstctx != {}}
+}
+global    lmap ldmap
+array set lmap {
+    bullet   itemized    item     itemized
+    arg      arguments   args     arguments
+    opt      options     opts     options
+    cmd      commands    cmds     commands
+    enum     enumerated  tkoption tkoptions
+}
+array set ldmap {
+    bullet   . arg . cmd . tkoption . opt .
+}
+proc LMap {what} {
+    global lmap ldmap
+    if {![info exists lmap($what)]} {
+	return $what
+    }
+    if {[dt_deprecated] && [info exists ldmap($what)]} {
+	Warn depr_ltype $what $lmap($what)
+    }
+    return $lmap($what)
+}
+proc LValid {what} {
+    switch -exact -- $what {
+	arguments   -
+	commands    -
+	definitions -
+	enumerated  -
+	itemized    -
+	options     -
+	tkoptions   {return 1}
+	default     {return 0}
+    }
+}
+
+proc State {} {global state ; return $state}
+proc Enter {cmd} {Log "\[[State]\] $cmd"}
+
+#proc Log* {text} {puts -nonewline $text}
+#proc Log  {text} {puts            $text}
+proc Log* {text} {}
+proc Log  {text} {}
+
+
+# -------------------------------------------------------------
+# Framing
+proc ck_initialize {p} {
+    global state   ; set state manpage_begin
+    global lstctx  ; set lstctx [list]
+    global lstitem ; set lstitem 0
+    global sect
+    if {$p == 1} {
+	catch {unset sect}  ; set sect()  . ; unset sect()
+	catch {unset sectt} ; set sectt() . ; unset sectt()
+    }
+    global pass              ; set pass $p
+    global countersection    ; set countersection    0
+    global countersubsection ; set countersubsection 0
+    return
+}
+proc ck_complete {} {
+    if {[Is done]} {
+	if {![LOpen]} {
+	    return
+	} else {
+	    Error end/open/list
+	}
+    } elseif {[Is example]} {
+	Error end/open/example
+    } else {
+	Error end/open/mp
+    }
+    return
+}
+# -------------------------------------------------------------
+# Plain text
+proc plain_text {text} {
+    # Only in body, not between list_begin and first item.
+    # Ignore everything which is only whitespace ...
+
+    set redux [string map [list " " "" "\t" "" "\n" ""] $text]
+    if {$redux == {}} {return [fmt_plain_text $text]}
+    if {[IsNot body] && [IsNot example]} {Error body}
+    if {[LOpen] && ![LItem]} {Error nolisttxt}
+    return [fmt_plain_text $text]
+}
+
+# -------------------------------------------------------------
+# Variable handling ...
+
+proc vset {var args} {
+    switch -exact -- [llength $args] {
+	0 {
+	    # Retrieve contents of variable VAR
+	    upvar #0 __$var data
+	    if {![info exists data]} {
+		return -code error "can't read doc variable \"$var\": not set"
+	    }
+	    return $data
+	}
+	1 {
+	    # Set contents of variable VAR
+	    global __$var
+	    set    __$var [lindex $args 0]
+	    return "" ; # Empty string ! Nothing for output.
+	}
+	default {
+	    return -code error "wrong#args: set var ?value?"
+	}
+    }
+}
+
+# -------------------------------------------------------------
+# Formatting commands
+proc manpage_begin {title section version} {
+    Enter manpage_begin
+    if {[IsNot manpage_begin]} {Error mpbegin}
+    if {[string match {* *} $title]} {Error mptitle}
+    Go header
+    fmt_manpage_begin $title $section $version
+}
+proc moddesc {desc} {
+    Enter moddesc
+    if {[IsNot header]} {Error hdrcmd}
+    fmt_moddesc $desc
+}
+proc titledesc {desc} {
+    Enter titledesc
+    if {[IsNot header]} {Error hdrcmd}
+    fmt_titledesc $desc
+}
+proc copyright {text} {
+    Enter copyright
+    if {[IsNot header]} {Error hdrcmd}
+    fmt_copyright $text
+}
+proc manpage_end {} {
+    Enter manpage_end
+    if {[IsNot body]} {Error bodycmd}
+    Go done
+    fmt_manpage_end
+}
+proc require {pkg {version {}}} {
+    Enter require
+    if {[IsNot header]} {Error hdrcmd}
+    fmt_require $pkg $version
+}
+proc description {} {
+    Enter description
+    if {[IsNot header]} {Error hdrcmd}
+    Go body
+    fmt_description [Sectdef section Description description]
+}
+
+# Storage for (sub)section ids to enable checking for ambigous
+# identification. The ids on this level are logical names. The backends
+# are given physical names (via counters).
+global sect   ; # Map of logical -> physical ids
+global sectt  ; # Map of logical -> section title
+global sectci ; # Current section (id)
+global sectct ; # Current section (title)
+global countersection
+global countersubsection
+
+proc section {title {id {}}} {
+    global sect
+
+    Enter section
+    if {[IsNot body]} {Error bodycmd}
+    if {[LOpen]}      {Error nolistcmd}
+
+    fmt_section $title [Sectdef section $title $id]
+}
+proc subsection {title {id {}}} {
+    global sect
+
+    Enter subsection
+    if {[IsNot body]} {Error bodycmd}
+    if {[LOpen]}      {Error nolistcmd}
+
+    fmt_subsection $title [Sectdef subsection $title $id]
+}
+
+proc Sectdef {type title id} {
+    global sect sectt sectci sectct countersection countersubsection pass
+
+    # Compute a (sub)section id from the name (= section label/title)
+    # if the user did not provide their own id.
+    if {![string length $id]} {
+	if {$type == "section"} {
+	    set id [list $title]
+	} elseif {$type == "subsection"} {
+	    set id [list $sectci $title]
+	} else {
+	    error INTERNAL
+	}
+    }
+    # Check if the id is unambigous. Issue a warning if not. For
+    # sections we remember the now-current name and id for use by
+    # subsections.
+    if {$pass == 1} {
+	if {[info exists sect($id)]} {
+	    set msg $title
+	    if {$type == "subsection"} {
+		append msg " (in " $sectct ")"
+	    }
+	    Warn sectambig $msg
+	}
+	set sect($id) $type[incr counter$type]
+    }
+    set sectt($id) $title
+    if {$type == "section"} {
+	set sectci $id
+	set sectct $title
+    }
+    return $sect($id)
+}
+
+proc para {} {
+    Enter para
+    if {[IsNot body]} {Error bodycmd}
+    if {[LOpen]}      {
+	if {![LItem]} {Error nolisthdr}
+	fmt_nl
+    } else {
+	fmt_para
+    }
+}
+proc list_begin {what {hint {}}} {
+    Enter "list_begin $what $hint"
+    if {[IsNot body]}        {Error bodycmd}
+    if {[LOpen] && ![LItem]} {Error nolisthdr}
+    set what [LMap $what]
+    if {![LValid $what]}     {Error invalidlist $what}
+    set res [fmt_list_begin $what $hint]
+    LPush        $what
+    return $res
+}
+proc list_end {} {
+    Enter list_end
+    if {[IsNot body]} {Error bodycmd}
+    if {![LOpen]}     {Error listcmd}
+    LPop
+    fmt_list_end
+}
+
+# Deprecated command, and its common misspellings. Canon is 'def'.
+proc lst_item {{text {}}} {
+    if {[dt_deprecated]} {Warn depr_lstitem "\[lst_item\]"}
+    def $text
+}
+proc list_item {{text {}}} {
+    if {[dt_deprecated]} {Warn depr_lstitem "\[list_item\]"}
+    def $text
+}
+proc listitem  {{text {}}} {
+    if {[dt_deprecated]} {Warn depr_lstitem "\[listitem\]"}
+    def $text
+}
+proc lstitem   {{text {}}} {
+    if {[dt_deprecated]} {Warn depr_lstitem "\[lstitem\]"}
+    def $text
+}
+proc def {{text {}}} {
+    Enter def
+    if {[IsNot body]}       {Error bodycmd}
+    if {![LOpen]}           {Error listcmd}
+    if {![LIs definitions]} {Error deflist}
+    LSItem
+    fmt_lst_item $text
+}
+proc arg_def {type name {mode {}}} {
+    Enter arg_def
+    if {[IsNot body]}       {Error bodycmd}
+    if {![LOpen]}           {Error listcmd}
+    if {![LIs arguments]}   {Error arg_list}
+    LSItem
+    fmt_arg_def $type $name $mode
+}
+proc cmd_def {command} {
+    Enter cmd_def
+    if {[IsNot body]}       {Error bodycmd}
+    if {![LOpen]}           {Error listcmd}
+    if {![LIs commands]}    {Error cmd_list}
+    LSItem
+    fmt_cmd_def $command
+}
+proc opt_def {name {arg {}}} {
+    Enter opt_def
+    if {[IsNot body]}       {Error bodycmd}
+    if {![LOpen]}           {Error listcmd}
+    if {![LIs options]}     {Error opt_list}
+    LSItem
+    fmt_opt_def $name $arg
+}
+proc tkoption_def {name dbname dbclass} {
+    Enter tkoption_def
+    if {[IsNot body]}       {Error bodycmd}
+    if {![LOpen]}           {Error listcmd}
+    if {![LIs tkoptions]}   {Error tkoption_list}
+    LSItem
+    fmt_tkoption_def $name $dbname $dbclass
+}
+proc call {cmd args} {
+    Enter call
+    if {[IsNot body]}       {Error bodycmd}
+    if {![LOpen]}           {Error listcmd}
+    if {![LIs definitions]} {Error deflist}
+    LSItem
+    eval [linsert $args 0 fmt_call $cmd]
+}
+# Deprecated. Use 'item'
+proc bullet {} {
+    if {[dt_deprecated]} {Warn depr_bullet "\[bullet\]"}
+    item
+}
+proc item {} {
+    Enter item
+    if {[IsNot body]}    {Error bodycmd}
+    if {![LOpen]}        {Error listcmd}
+    if {![LIs itemized]} {Error bulletlist}
+    LSItem
+    fmt_bullet
+}
+proc enum {} {
+    Enter enum
+    if {[IsNot body]}      {Error bodycmd}
+    if {![LOpen]}          {Error listcmd}
+    if {![LIs enumerated]} {Error enumlist}
+    LSItem
+    fmt_enum
+}
+proc example {code} {
+    Enter example
+    return [example_begin][plain_text ${code}][example_end]
+}
+proc example_begin {} {
+    Enter example_begin
+    if {[IsNot body]}        {Error bodycmd}
+    if {[LOpen] && ![LItem]} {Error nolisthdr}
+    Go example
+    fmt_example_begin
+}
+proc example_end {} {
+    Enter example_end
+    if {[IsNot example]} {Error examplecmd}
+    Go body
+    fmt_example_end
+}
+proc see_also {args} {
+    Enter see_also
+    if {[Is done]} {Error nodonecmd}
+    # if {[IsNot body]} {Error bodycmd}
+    # if {[LOpen]}      {Error nolistcmd}
+    eval [linsert $args 0 fmt_see_also]
+}
+proc keywords {args} {
+    Enter keywords
+    if {[Is done]} {Error nodonecmd}
+    # if {[IsNot body]} {Error bodycmd}
+    # if {[LOpen]}      {Error nolistcmd}
+    eval [linsert $args 0 fmt_keywords]
+}
+proc category {text} {
+    Enter category
+    if {[Is done]} {Error nodonecmd}
+    # if {[IsNot body]} {Error bodycmd}
+    # if {[LOpen]}      {Error nolistcmd}
+    fmt_category $text
+}
+# nl - Deprecated
+proc nl {} {
+    if {[dt_deprecated]} {Warn depr_nl "\[nl\]"}
+    para
+}
+proc emph {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_emph $text
+}
+# strong - Deprecated
+proc strong {text} {
+    if {[dt_deprecated]} {Warn depr_strong "\[strong\]"}
+    emph $text
+}
+proc arg {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_arg $text
+}
+proc cmd {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_cmd $text
+}
+proc opt {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_opt $text
+}
+proc comment {text} {
+    if {[Is done]} {Error nodonecmd}
+    return ; #fmt_comment $text
+}
+proc sectref-external {title} {
+    if {[IsNot body]}        {Error bodycmd}
+    if {[LOpen] && ![LItem]} {Error nolisthdr}
+
+    fmt_sectref $title {}
+}
+proc sectref {id {title {}}} {
+    if {[IsNot body]}        {Error bodycmd}
+    if {[LOpen] && ![LItem]} {Error nolisthdr}
+
+    # syntax: id ?title?
+    # Check existence of referenced (sub)section.
+    global sect sectt sectci pass
+
+    # Two things are done.
+    # (1) Check that the id is known and determine the full id.
+    # (2) Determine physical id, and, if needed, the title.
+
+    if {[info exists sect($id)]} {
+	# Logical id, likely user-supplied, exists.
+	set pid $sect($id)
+	set fid $id
+    } else {
+	# Doesn't exist directly. Assume that the id is derived from a
+	# (sub)section title, search various combinations.
+
+	set fid [list $id]
+	if {[info exists sect($fid)]} {
+	    # Id was wrapped section title.
+	    set pid $sect($fid)
+	} else {
+	    # See if the id is the tail end of a subsection id.
+	    set ic [array names sect [list * $id]]
+	    if {![llength $ic]} {
+		# No, it is not. Give up.
+		if {$pass > 1 } { WarnX missingsect $id }
+		set pid {}
+	    } elseif {[llength $ic] == 1} {
+		# Yes, and it is unique. Take it.
+		set fid [lindex $ic 0]
+		set pid $sect($fid)
+	    } else {
+		# Yes, however it is ambigous. Issue warning, then
+		# select one of the possibilities. Prefer to keep the
+		# reference within the currenc section, otherwise,
+		# i.e. if we cannot do that, choose randomly.
+		if {$pass == 2} { WarnX sectambig $id }
+		set fid [list $sectci $id]
+		if {![info exists sect($fid)]} {
+		    # No candidate in current section, so chose
+		    # randomly.
+		    set fid [lindex $ic 0]
+		}
+		set pid $sect($fid)
+	    }
+	}
+    }
+
+    # If we have no text take the section title as text, if we
+    # can. Last fallback for text is the id.
+    if {$title == {}} {
+	if {$pid != {}} {
+	    set title $sectt($fid)
+	} else {
+	    set title $id
+	}
+    }
+
+    # Hand both chosen title and physical id to the backend for
+    # actual formatting.
+    fmt_sectref $title $pid
+}
+proc syscmd {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_syscmd $text
+}
+proc method {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_method $text
+}
+proc option {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_option $text
+}
+proc widget {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_widget $text
+}
+proc fun {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_fun $text
+}
+proc type {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_type $text
+}
+proc package {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_package $text
+}
+proc class {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_class $text
+}
+proc var {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_var $text
+}
+proc file {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_file $text
+}
+
+# Special case: We must not overwrite the builtin namespace command,
+# as it is required by the package "msgcat".
+proc _namespace {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_namespace $text
+}
+proc uri {text {label {}}} {
+    if {[Is done]} {Error nodonecmd}
+    # The label argument is left out when undefined so that we can
+    # control old formatters as well, if the input is not using uri
+    # labels.
+
+    if {$label == {}} {
+	fmt_uri $text
+    } else {
+	fmt_uri $text $label
+    }
+}
+proc image {text {label {}}} {
+    if {[Is done]} {Error nodonecmd}
+    # The label argument is left out when undefined so that we can
+    # control old formatters as well, if the input is not using uri
+    # labels.
+
+    if {$label == {}} {
+	fmt_image $text
+    } else {
+	fmt_image $text $label
+    }
+}
+proc manpage {text} {
+    if {[Is done]} {Error nodonecmd}
+    # The label argument is left out when undefined so that we can
+    # control old formatters as well, if the input is not using uri
+    # labels.
+
+    fmt_term $text
+    #fmt_manpage $text
+}
+proc usage {args} {
+    if {[Is done]} {Error nodonecmd}
+    eval fmt_usage $args
+}
+proc const {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_const $text
+}
+proc term {text} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_term $text
+}
+
+proc mdash {} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_mdash $text
+}
+proc ndash {} {
+    if {[Is done]} {Error nodonecmd}
+    fmt_ndash $text
+}
+
+# -------------------------------------------------------------
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/checker_idx.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/checker_idx.tcl
new file mode 100644
index 00000000..31b3104e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/checker_idx.tcl
@@ -0,0 +1,207 @@
+# -*- tcl -*-
+# checker_idx.tcl
+#
+# Code used inside of a checker interpreter to ensure correct usage of
+# docidx formatting commands.
+#
+# Copyright (c) 2003-2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# L10N
+
+package require msgcat
+
+proc ::msgcat::mcunknown {locale code} {
+    return "unknown error code \"$code\" (for locale $locale)"
+}
+
+if {0} {
+    puts stderr "Locale [::msgcat::mcpreferences]"
+    foreach path [dt_search] {
+	puts stderr "Catalogs: [::msgcat::mcload $path] - $path"
+    }
+} else {
+    foreach path [dt_search] {
+	::msgcat::mcload $path
+    }
+}
+
+# State, and checker commands.
+# -------------------------------------------------------------
+#
+# Note that the code below assumes that a command XXX provided by the
+# formatter engine is accessible under the name 'fmt_XXX'.
+#
+# -------------------------------------------------------------
+
+global state
+
+# State machine ... State centered
+# --------------+-----------------------+----------------------
+# state		| allowed commands	| new state (if any)
+# --------------+-----------------------+----------------------
+# all except	| include vset		|
+# ==============+=======================+======================
+# idx_begin	| idx_begin		| -> contents
+# --------------+-----------------------+----------------------
+# contents	| key			| -> ref_series
+# --------------+-----------------------+----------------------
+# ref_series	| manpage		| -> refkey_series
+#		| url			|
+# --------------+-----------------------+----------------------
+# refkey_series	| manpage		| -> refkey_series
+#		| url			|
+#		+-----------------------+-----------
+#		| key			| -> ref_series
+#		+-----------------------+-----------
+#		| idx_end		| -> done
+# --------------+-----------------------+----------------------
+
+# State machine, as above ... Command centered
+# --------------+-----------------------+----------------------
+# state		| allowed commands	| new state (if any)
+# --------------+-----------------------+----------------------
+# all except	| include vset		|
+# ==============+=======================+======================
+# idx_begin	| idx_begin		| -> contents
+# --------------+-----------------------+----------------------
+# contents	| key			| -> ref_series
+# refkey_series	|			|
+# --------------+-----------------------+----------------------
+# ref_series	| manpage		| -> refkey_series
+# refkey_series	|			|
+# --------------+-----------------------+----------------------
+# ref_series	| url			| -> refkey_series
+# refkey_series	|			|
+# --------------+-----------------------+----------------------
+# refkey_series	| idx_end		| -> done
+# --------------+-----------------------+----------------------
+
+# -------------------------------------------------------------
+# Helpers
+proc Error {code {text {}}} {
+    global state
+
+    # Problematic command with all arguments (we strip the "ck_" prefix!)
+    # -*- future -*- count lines of input, maintain history buffer, use
+    # -*- future -*- that to provide some context here.
+
+    set cmd  [lindex [info level 1] 0]
+    set args [lrange [info level 1] 1 end]
+    if {$args != {}} {append cmd " [join $args]"}
+
+    # Use a message catalog to map the error code into a legible message.
+    set msg [::msgcat::mc $code]
+
+    if {$text != {}} {
+	set msg [string map [list @ $text] $msg]
+    }
+
+    dt_error "IDX error ($code), \"$cmd\" : ${msg}."
+    return
+}
+proc Warn {code text} {
+    set msg [::msgcat::mc $code]
+    dt_warning "IDX warning ($code): [join [split [format $msg $text] \n] "\nIDX warning ($code): "]"
+    return
+}
+
+proc Is    {s} {global state ; return [string equal $state $s]}
+proc IsNot {s} {global state ; return [expr {![string equal $state $s]}]}
+proc Go    {s} {Log " >>\[$s\]" ; global state ; set state $s; return}
+proc Push  {s} {Log " //\[$s\]" ; global state stack ; lappend stack $state ; set state $s; return}
+proc Pop   {}  {Log* " pop" ;  global state stack ; set state [lindex $stack end] ; set stack [lrange $stack 0 end-1] ; Log " \\\\\[$state\]" ; return}
+proc State {} {global state ; return $state}
+
+proc Enter {cmd} {Log* "\[[State]\] $cmd"}
+
+#proc Log* {text} {puts -nonewline $text}
+#proc Log  {text} {puts            $text}
+proc Log* {text} {}
+proc Log  {text} {}
+
+# -------------------------------------------------------------
+# Framing
+proc ck_initialize {} {
+    global state   ; set state idx_begin
+    global stack   ; set stack [list]
+}
+proc ck_complete {} {
+    if {[Is done]} {
+	return
+    } else {
+	Error end/open/idx
+    }
+    return
+}
+# -------------------------------------------------------------
+# Plain text
+proc plain_text {text} {
+    # Ignore everything which is only whitespace ...
+    # Beyond that plain text is not allowed.
+
+    set redux [string map [list " " "" "\t" "" "\n" ""] $text]
+    if {$redux == {}} {return [fmt_plain_text $text]}
+    Error idx/plaintext
+    return ""
+}
+
+# -------------------------------------------------------------
+# Variable handling ...
+
+proc vset {var args} {
+    switch -exact -- [llength $args] {
+	0 {
+	    # Retrieve contents of variable VAR
+	    upvar #0 __$var data
+	    return $data
+	}
+	1 {
+	    # Set contents of variable VAR
+	    global __$var
+	    set    __$var [lindex $args 0]
+	    return "" ; # Empty string ! Nothing for output.
+	}
+	default {
+	    return -code error "wrong#args: set var ?value?"
+	}
+    }
+}
+
+# -------------------------------------------------------------
+# Formatting commands
+proc index_begin {label title} {
+    Enter index_begin
+    if {[IsNot idx_begin]} {Error idx/begincmd}
+    Go contents
+    fmt_index_begin $label $title
+}
+proc index_end {} {
+    Enter index_end
+    if {[IsNot refkey_series] && [IsNot contents]} {Error idx/endcmd}
+    Go done
+    fmt_index_end
+}
+proc key {text} {
+    Enter key
+    if {[IsNot contents] && [IsNot refkey_series]} {Error idx/keycmd}
+    Go ref_series
+    fmt_key $text
+}
+proc manpage {file label} {
+    Enter manpage
+    if {[IsNot ref_series] && [IsNot refkey_series]} {Error idx/manpagecmd}
+    Go refkey_series
+    fmt_manpage $file $label
+}
+proc url {url label} {
+    Enter url
+    if {[IsNot ref_series] && [IsNot refkey_series]} {Error idx/urlcmd}
+    Go refkey_series
+    fmt_url $url $label
+}
+proc comment {text} {
+    if {[Is done]} {Error idx/nodonecmd}
+    return ; #fmt_comment $text
+}
+
+# -------------------------------------------------------------
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/checker_toc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/checker_toc.tcl
new file mode 100644
index 00000000..6f646cb8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/checker_toc.tcl
@@ -0,0 +1,214 @@
+# -*- tcl -*-
+# checker_toc.tcl
+#
+# Code used inside of a checker interpreter to ensure correct usage of
+# doctoc formatting commands.
+#
+# Copyright (c) 2003-2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# L10N
+
+package require msgcat
+
+proc ::msgcat::mcunknown {locale code} {
+    return "unknown error code \"$code\" (for locale $locale)"
+}
+
+if {0} {
+    puts stderr "Locale [::msgcat::mcpreferences]"
+    foreach path [dt_search] {
+	puts stderr "Catalogs: [::msgcat::mcload $path] - $path"
+    }
+} else {
+    foreach path [dt_search] {
+	::msgcat::mcload $path
+    }
+}
+
+# State, and checker commands.
+# -------------------------------------------------------------
+#
+# Note that the code below assumes that a command XXX provided by the
+# formatter engine is accessible under the name 'fmt_XXX'.
+#
+# -------------------------------------------------------------
+
+global state
+
+# State machine ... State centered
+# --------------+-----------------------+----------------------
+# state		| allowed commands	| new state (if any)
+# --------------+-----------------------+----------------------
+# all except	| include vset		|
+# ==============+=======================+======================
+# toc_begin	| toc_begin		| -> contents
+# --------------+-----------------------+----------------------
+# contents	| item			| -> contents //
+#		+-----------------------+-----------
+#		| division_start	| -> end, PUSH division
+#		+-----------------------+-----------
+#		| toc_end		| -> done
+# --------------+-----------------------+----------------------
+# division	| item			| -> division //
+#		+-----------------------+-----------
+#		| division_start	| -> division, PUSH division
+#		+-----------------------+-----------
+#		| division_end		| POP (-> division / -> contents)
+# --------------+-----------------------+----------------------
+# end		| toc_end		| -> done
+#		+-----------------------+-----------
+#		| division_start	| PUSH division
+# --------------+-----------------------+----------------------
+
+# State machine, as above ... Command centered
+# --------------+-----------------------+----------------------
+# state		| allowed commands	| new state (if any)
+# --------------+-----------------------+----------------------
+# all except	| include vset		|
+# ==============+=======================+======================
+# toc_begin	| toc_begin		| -> contents
+# --------------+-----------------------+----------------------
+# contents	| item			| -> contents
+# division	|			| -> division
+# --------------+-----------------------+----------------------
+# contents	| division_start	| -> end, PUSH division
+# division	|			| -> division, PUSH division
+# end		|			| PUSH division
+# --------------+-----------------------+----------------------
+# division	| division_end		| POP (-> division / -> end)
+# --------------+-----------------------+----------------------
+# contents	| toc_end		| -> done
+# end		|			| -> done
+# --------------+-----------------------+----------------------
+
+# -------------------------------------------------------------
+# Helpers
+proc Error {code {text {}}} {
+    global state
+
+    # Problematic command with all arguments (we strip the "ck_" prefix!)
+    # -*- future -*- count lines of input, maintain history buffer, use
+    # -*- future -*- that to provide some context here.
+
+    set cmd  [lindex [info level 1] 0]
+    set args [lrange [info level 1] 1 end]
+    if {$args != {}} {append cmd " [join $args]"}
+
+    # Use a message catalog to map the error code into a legible message.
+    set msg [::msgcat::mc $code]
+
+    if {$text != {}} {
+	set msg [string map [list @ $text] $msg]
+    }
+
+    dt_error "TOC error ($code), \"$cmd\" : ${msg}."
+    return
+}
+proc Warn {code text} {
+    set msg [::msgcat::mc $code]
+    dt_warning "TOC warning ($code): [join [split [format $msg $text] \n] "\nTOC warning ($code): "]"
+    return
+}
+
+proc Is    {s} {global state ; return [string equal $state $s]}
+proc IsNot {s} {global state ; return [expr {![string equal $state $s]}]}
+proc Go    {s} {Log " ==\[$s\]" ; global state ; set state $s; return}
+proc Push  {s} {Log " >>\[$s\]" ; global state stack ; lappend stack $state ; set state $s; return}
+proc Pop   {}  {Log* " <<"     ;  global state stack ; set state [lindex $stack end] ; set stack [lrange $stack 0 end-1] ; Log " \\\\\[$state\]" ; return}
+proc State {} {global state stack ; return "$stack || $state"}
+
+proc Enter {cmd} {Log* "\n\[[State]\] $cmd"}
+
+proc Log* {args} {}
+proc Log  {args} {}
+#proc Log* {text} {puts -nonewline $text}
+#proc Log  {text} {puts            $text}
+
+# -------------------------------------------------------------
+# Framing
+proc ck_initialize {} {
+    global state   ; set state toc_begin
+    global stack   ; set stack [list]
+}
+proc ck_complete {} {
+    if {[Is done]} {
+	return
+    } else {
+	Error end/open/toc
+    }
+    return
+}
+# -------------------------------------------------------------
+# Plain text
+proc plain_text {text} {
+    # Ignore everything which is only whitespace ...
+    # Beyond that plain text is not allowed.
+
+    set redux [string map [list " " "" "\t" "" "\n" ""] $text]
+    if {$redux == {}} {return [fmt_plain_text $text]}
+    Error toc/plaintext
+    return ""
+}
+
+# -------------------------------------------------------------
+# Variable handling ...
+
+proc vset {var args} {
+    switch -exact -- [llength $args] {
+	0 {
+	    # Retrieve contents of variable VAR
+	    upvar #0 __$var data
+	    return $data
+	}
+	1 {
+	    # Set contents of variable VAR
+	    global __$var
+	    set    __$var [lindex $args 0]
+	    return "" ; # Empty string ! Nothing for output.
+	}
+	default {
+	    return -code error "wrong#args: set var ?value?"
+	}
+    }
+}
+
+# -------------------------------------------------------------
+# Formatting commands
+proc toc_begin {label title} {
+    Enter toc_begin
+    if {[IsNot toc_begin]} {Error toc/begincmd}
+    Go   end
+    Push contents
+    fmt_toc_begin $label $title
+}
+proc toc_end {} {
+    Enter toc_end
+    if {[IsNot end] && [IsNot contents]} {Error toc/endcmd}
+    Go done
+    fmt_toc_end
+}
+proc division_start {title {symfile {}}} {
+    Enter division_start
+    if {
+	[IsNot contents] && [IsNot end] && [IsNot division]
+    } {Error toc/sectcmd}
+    Push division
+    fmt_division_start $title $symfile
+}
+proc division_end {} {
+    Enter division_end
+    if {[IsNot division]} {Error toc/sectecmd [State]}
+    Pop
+    fmt_division_end
+}
+proc item {file label desc} {
+    Enter item
+    if {[IsNot contents] && [IsNot division]} { Error toc/itemcmd }
+    fmt_item $file $label $desc
+}
+proc comment {text} {
+    if {[Is done]} {Error toc/nodonecmd}
+    return ; #fmt_comment $text
+}
+
+# -------------------------------------------------------------
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/cvs.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/cvs.tcl
new file mode 100644
index 00000000..0d78bb47
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/cvs.tcl
@@ -0,0 +1,134 @@
+# cvs.tcl --
+#
+#	Handling of various cvs output formats.
+#
+# Copyright (c) 2003-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.2
+package require textutil
+
+namespace eval ::doctools {}
+namespace eval ::doctools::cvs {
+    namespace export scanLog toChangeLog
+}
+
+# ::doctools::cvs::scanLog --
+#
+#	Scan a log generated by 'cvs log' and extract the relevant information.
+#
+# Arguments:
+#	text	The text to scan
+#
+# Results:
+#	None.
+#
+# Sideeffects:
+#	None.
+#
+# Notes:
+#	Original location of code:	http://wiki.tcl.tk/3638
+#				aka	http://wiki.tcl.tk/log2changelog
+#	Original author unknown.
+#	Bugfix by TR / Torsten Reincke
+
+proc ::doctools::cvs::scanLog {text evar cvar fvar} {
+
+    set text [split $text \n]
+    set n    [llength $text]
+
+    upvar 1 $evar entries  ;    #set       entries  [list]
+    upvar 1 $cvar comments ;    #array set comments {}
+    upvar 1 $fvar files    ;    #array set files    {}
+
+    for {set i 0} {$i < $n} {incr i} {
+	set line [lindex $text $i]
+	switch -glob -- $line {
+	    "*Working file:*" {
+		regexp {Working file: (.*)} $line -> filename
+	    }
+	    "date:*" {
+		scan $line "date: %s %s author: %s" date time author
+		set author [string trim $author ";"]
+
+		# read the comment lines following date
+		set comment ""
+		incr i
+		set line [lindex $text $i]
+		# [TR]: use regexp here to see if log ends:
+		while {(![regexp "(-----*)|(=====*)" $line]) && ($i < $n)} {
+		    append comment $line "\n"
+		    incr i
+		    set line [lindex $text $i]
+		}
+
+		#  Store this date/author/comment
+		lappend entries [list $date $author]
+		lappend comments($date,$author) $comment
+		lappend files($date,$author,$comment) $filename
+	    }
+	}
+    }
+
+    return
+}
+
+
+# ::doctools::cvs::toChangeLog --
+
+#	Convert a preprocessed cvs log (see scanLog) into a Changelog
+#	suitable for emacs.
+#
+# Arguments:
+#	evar, cvar, fvar: Name of the variables containing the preprocessed log.
+#
+# Results:
+#	A string containing a properly formatted ChangeLog.
+#
+# Sideeffects:
+#	None.
+#
+# Notes:
+#	Original location of code:	http://wiki.tcl.tk/3638
+#				aka	http://wiki.tcl.tk/log2changelog
+#	Original author unknown.
+
+proc ::doctools::cvs::toChangeLog {evar cvar fvar} {
+    upvar 1 $evar entries $cvar comments $fvar files
+
+    set linebuffer [list]
+
+    foreach e [lsort -unique -decreasing $entries] {
+
+	#  print the date/author
+	foreach {date author} $e {break}
+	lappend linebuffer "$date $author"
+	lappend linebuffer ""
+
+	#  Find all the comments submitted this date/author
+
+	set clist [lsort -unique $comments($date,$author)]
+
+	foreach c $clist {
+	    #  Print all files for a given comment
+	    foreach f [lsort -unique $files($date,$author,$c)] {
+		lappend linebuffer "\t* $f:"
+	    }
+
+	    #  Format and print the comment
+
+	    lappend linebuffer [textutil::indent [textutil::undent $c] "\t  "]
+	    lappend linebuffer ""
+	    continue
+	}
+    }
+
+    return [join $linebuffer \n]
+}
+
+#------------------------------------
+# Module initialization
+
+package provide doctools::cvs 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/docidx.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/docidx.tcl
new file mode 100644
index 00000000..3b1a9ccd
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/docidx.tcl
@@ -0,0 +1,960 @@
+# docidx.tcl --
+#
+#	Implementation of docidx objects for Tcl.
+#
+# Copyright (c) 2003-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.2
+package require textutil::expander
+
+# @mdgen OWNER: api_idx.tcl
+# @mdgen OWNER: checker_idx.tcl
+# @mdgen OWNER: mpformats/*.tcl
+# @mdgen OWNER: mpformats/*.msg
+# @mdgen OWNER: mpformats/idx.*
+# @mdgen OWNER: mpformats/man.macros
+
+namespace eval ::doctools {}
+namespace eval ::doctools::idx {
+    # Data storage in the doctools::idx module
+    # -------------------------------
+    #
+    # One namespace per object, containing
+    #  1) A list of additional search paths for format definition files.
+    #     This list extends the list of standard paths known to the module.
+    #     The paths in the list are searched before the standard paths.
+    #  2) Configuration information
+    #     a) string:  The format to use when converting the input.
+    #  4) Name of the interpreter used to perform the syntax check of the
+    #     input (= allowed order of formatting commands).
+    #  5) Name of the interpreter containing the code coming from the format
+    #     definition file.
+    #  6) Name of the expander object used to interpret the input to convert.
+
+    # commands is the list of subcommands recognized by the docidx objects
+    variable commands [list		\
+	    "cget"			\
+	    "configure"			\
+	    "destroy"			\
+	    "format"			\
+	    "map"			\
+	    "search"			\
+	    "warnings"                  \
+	    "parameters"                \
+	    "setparam"                  \
+	    ]
+
+    # Only export the toplevel commands
+    namespace export new search help
+
+    # Global data
+
+    #  1) List of standard paths to look at when searching for a format
+    #     definition. Extensible.
+    #  2) Location of this file in the filesystem
+
+    variable paths [list]
+    variable here [file dirname [info script]]
+}
+
+# ::doctools::idx::search --
+#
+#	Extend the list of paths used when searching for format definition files.
+#
+# Arguments:
+#	path	Path to add to the list. The path has to exist, has to be a
+#               directory, and has to be readable.
+#
+# Results:
+#	None.
+#
+# Sideeffects:
+#	The specified path is added to the front of the list of search
+#	paths. This means that the new path is search before the
+#	standard paths set at module initialization time.
+
+proc ::doctools::idx::search {path} {
+    variable paths
+
+    if {![file exists      $path]} {return -code error "doctools::idx::search: path does not exist"}
+    if {![file isdirectory $path]} {return -code error "doctools::idx::search: path is not a directory"}
+    if {![file readable    $path]} {return -code error "doctools::idx::search: path cannot be read"}
+
+    set paths [linsert $paths 0 $path]
+    return
+}
+
+# ::doctools::idx::help --
+#
+#	Return a string containing short help
+#	regarding the existing formatting commands.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A string.
+
+proc ::doctools::idx::help {} {
+    return "formatting commands\n\
+	    * index_begin      - begin of index\n\
+	    * index_end        - end of index\n\
+	    * key              - begin of references for key\n\
+	    * manpage          - index reference to manpage\n\
+	    * url              - index reference to url\n\
+	    * vset             - set/get variable values\n\
+	    * include          - insert external file\n\
+	    * lb, rb           - left/right brackets\n\
+	    "
+}
+
+# ::doctools::idx::new --
+#
+#	Create a new docidx object with a given name. May configure the object.
+#
+# Arguments:
+#	name	Name of the docidx object.
+#	args	Options configuring the new object.
+#
+# Results:
+#	name	Name of the doctools created
+
+proc ::doctools::idx::new {name args} {
+        if { [llength [info commands ::$name]] } {
+	return -code error "command \"$name\" already exists, unable to create docidx object"
+    }
+    if {[llength $args] % 2 == 1} {
+	return -code error "wrong # args: doctools::new name ?opt val...??"
+    }
+
+    # The arguments seem to be ok, setup the namespace for the object
+
+    namespace eval ::doctools::idx::docidx$name {
+	variable paths      [list]
+	variable file       ""
+	variable format     ""
+	variable formatfile ""
+	variable format_ip  ""
+	variable chk_ip     ""
+	variable expander   "[namespace current]::ex"
+	variable ex_ok      0
+	variable msg        [list]
+	variable map ;      array set map {}
+	variable param      [list]
+    }
+
+    # Create the command to manipulate the object
+    #                 $name -> ::doctools::idx::DocIdxProc $name
+    interp alias {} ::$name {} ::doctools::idx::DocIdxProc $name
+
+    # If the name was followed by arguments use them to configure the
+    # object before returning its handle to the caller.
+
+    if {[llength $args] > 1} {
+	# Use linsert trick to make the command a pure list.
+	eval [linsert $args 0 _configure $name]
+    }
+    return $name
+}
+
+##########################
+# Private functions follow
+
+# ::doctools::idx::DocIdxProc --
+#
+#	Command that processes all docidx object commands.
+#	Dispatches any object command to the appropriate internal
+#	command implementing its functionality.
+#
+# Arguments:
+#	name	Name of the docidx object to manipulate.
+#	cmd	Subcommand to invoke.
+#	args	Arguments for subcommand.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::doctools::idx::DocIdxProc {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	error "wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+
+    if { [llength [info commands ::doctools::idx::_$cmd]] == 0 } {
+	variable commands
+	set optlist [join $commands ", "]
+	set optlist [linsert $optlist "end-1" "or"]
+	return -code error "bad option \"$cmd\": must be $optlist"
+    }
+    return [eval [list ::doctools::idx::_$cmd $name] $args]
+}
+
+##########################
+# Method implementations follow (these are also private commands)
+
+# ::doctools::idx::_cget --
+#
+#	Retrieve the current value of a particular option
+#
+# Arguments:
+#	name	Name of the docidx object to query
+#	option	Name of the option whose value we are asking for.
+#
+# Results:
+#	The value of the option
+
+proc ::doctools::idx::_cget {name option} {
+    _configure $name $option
+}
+
+# ::doctools::idx::_configure --
+#
+#	Configure a docidx object, or query its configuration.
+#
+# Arguments:
+#	name	Name of the docidx object to configure
+#	args	Options and their values.
+#
+# Results:
+#	None if configuring the object.
+#	A list of all options and their values if called without arguments.
+#	The value of one particular option if called with a single argument.
+
+proc ::doctools::idx::_configure {name args} {
+    if {[llength $args] == 0} {
+	# Retrieve the current configuration.
+
+	upvar #0 ::doctools::idx::docidx${name}::file    file
+	upvar #0 ::doctools::idx::docidx${name}::format  format
+
+	set     res [list]
+	lappend res -file       $file
+	lappend res -format     $format
+	return $res
+
+    } elseif {[llength $args] == 1} {
+	# Query the value of one particular option.
+
+	switch -exact -- [lindex $args 0] {
+	    -file {
+		upvar #0 ::doctools::idx::docidx${name}::file file
+		return $file
+	    }
+	    -format {
+		upvar #0 ::doctools::idx::docidx${name}::format format
+		return $format
+	    }
+	    default {
+		return -code error \
+			"doctools::idx::_configure: Unknown option \"[lindex $args 0]\", expected\
+			-file, or -format"
+	    }
+	}
+    } else {
+	# Reconfigure the object.
+
+	if {[llength $args] % 2 == 1} {
+	    return -code error "wrong # args: doctools::idx::_configure name ?opt val...??"
+	}
+
+	foreach {option value} $args {
+	    switch -exact -- $option {
+		-file {
+		    upvar #0 ::doctools::idx::docidx${name}::file file
+		    set file $value
+		}
+		-format {
+		    if {[catch {
+			set fmtfile [LookupFormat $name $value]
+			SetupFormatter $name $fmtfile
+			upvar #0 ::doctools::idx::docidx${name}::format format
+			set format $value
+		    } msg]} {
+			return -code error \
+			    -errorinfo $::errorInfo \
+			    "doctools::idx::_configure: -format: $msg"
+		    }
+		}
+		default {
+		    return -code error \
+			    "doctools::idx::_configure: Unknown option \"$option\", expected\
+			    -file, or -format"
+		}
+	    }
+	}
+    }
+    return ""
+}
+
+# ::doctools::idx::_destroy --
+#
+#	Destroy a docidx object, including its associated command and data storage.
+#
+# Arguments:
+#	name	Name of the docidx object to destroy.
+#
+# Results:
+#	None.
+
+proc ::doctools::idx::_destroy {name} {
+    # Check the object for sub objects which have to destroyed before
+    # the namespace is torn down.
+    namespace eval ::doctools::idx::docidx$name {
+	if {$format_ip != ""} {interp delete $format_ip}
+	if {$chk_ip    != ""} {interp delete $chk_ip}
+
+	# Expander objects have no delete/destroy method. This would
+	# be a leak if not for the fact that an expander object is a
+	# namespace, and we have arranged to make it a sub namespace of
+	# the docidx object. Therefore tearing down our object namespace
+	# also cleans up the expander object.
+	# if {$expander != ""} {$expander destroy}
+
+    }
+    namespace delete ::doctools::idx::docidx$name
+    interp alias {} ::$name {}
+    return
+}
+
+# ::doctools::idx::_map --
+#
+#	Add a mapping from symbolic to actual filename to the object.
+#
+# Arguments:
+#	name	Name of the docidx object to use
+#	sfname	Symbolic filename to map
+#	afname	Actual filename
+#
+# Results:
+#	None.
+
+proc ::doctools::idx::_map {name sfname afname} {
+    upvar #0 ::doctools::idx::docidx${name}::map map
+    set map($sfname) $afname
+    return
+}
+
+# ::doctools::idx::_format --
+#
+#	Convert some text in doctools format
+#	according to the configuration in the object.
+#
+# Arguments:
+#	name	Name of the docidx object to use
+#	text	Text to convert.
+#
+# Results:
+#	The conversion result.
+
+proc ::doctools::idx::_format {name text} {
+    upvar #0 ::doctools::idx::docidx${name}::format format
+    if {$format == ""} {
+	return -code error "$name: No format was specified"
+    }
+
+    upvar #0 ::doctools::idx::docidx${name}::format_ip format_ip
+    upvar #0 ::doctools::idx::docidx${name}::chk_ip    chk_ip
+    upvar #0 ::doctools::idx::docidx${name}::ex_ok     ex_ok
+    upvar #0 ::doctools::idx::docidx${name}::expander  expander
+    upvar #0 ::doctools::idx::docidx${name}::passes    passes
+    upvar #0 ::doctools::idx::docidx${name}::msg       warnings
+
+    if {!$ex_ok}       {SetupExpander  $name}
+    if {$chk_ip == ""} {SetupChecker   $name}
+    # assert (format_ip != "")
+
+    set warnings [list]
+    if {[catch {$format_ip eval idx_initialize}]} {
+	return -code error "Could not initialize engine"
+    }
+    set result ""
+
+    for {
+	set p $passes ; set n 1
+    } {
+	$p > 0
+    } {
+	incr p -1 ; incr n
+    } {
+	if {[catch {$format_ip eval [list idx_setup $n]}]} {
+	    catch {$format_ip eval idx_shutdown}
+	    return -code error "Could not initialize pass $n of engine"
+	}
+	$chk_ip eval ck_initialize
+
+	if {[catch {set result [$expander expand $text]} msg]} {
+	    catch {$format_ip eval idx_shutdown}
+	    # Filter for checker errors and reduce them to the essential message.
+
+	    if {![regexp {^Error in} $msg]}          {return -code error $msg}
+	    #set msg [join [lrange [split $msg \n] 2 end]]
+
+	    if {![regexp {^--> \(FmtError\) } $msg]} {return -code error "Docidx $msg"}
+	    set msg [lindex [split $msg \n] 0]
+	    regsub {^--> \(FmtError\) } $msg {} msg
+
+	    return -code error $msg
+	}
+
+	$chk_ip eval ck_complete
+    }
+
+    if {[catch {set result [$format_ip eval [list idx_postprocess $result]]}]} {
+	return -code error "Unable to post process final result"
+    }
+    if {[catch {$format_ip eval idx_shutdown}]} {
+	return -code error "Could not shut engine down"
+    }
+    return $result
+
+}
+
+# ::doctools::idx::_search --
+#
+#	Add a search path to the object.
+#
+# Arguments:
+#	name	Name of the docidx object to extend
+#	path	Search path to add.
+#
+# Results:
+#	None.
+
+proc ::doctools::idx::_search {name path} {
+    if {![file exists      $path]} {return -code error "$name search: path does not exist"}
+    if {![file isdirectory $path]} {return -code error "$name search: path is not a directory"}
+    if {![file readable    $path]} {return -code error "$name search: path cannot be read"}
+
+    upvar #0 ::doctools::idx::docidx${name}::paths paths
+    set paths [linsert $paths 0 $path]
+    return
+}
+
+# ::doctools::idx::_warnings --
+#
+#	Return the warning accumulated during the last invocation of 'format'.
+#
+# Arguments:
+#	name	Name of the docidx object to query
+#
+# Results:
+#	A list of warnings.
+
+proc ::doctools::idx::_warnings {name} {
+    upvar #0 ::doctools::idx::docidx${name}::msg msg
+    return $msg
+}
+
+# ::doctools::_parameters --
+#
+#	Returns a list containing the parameters provided
+#	by the selected formatting engine.
+#
+# Arguments:
+#	name	Name of the doctools object to query
+#
+# Results:
+#	A list of parameter names
+
+proc ::doctools::idx::_parameters {name} {
+    upvar #0 ::doctools::idx::docidx${name}::param param
+    return $param
+}
+
+# ::doctools::_setparam --
+#
+#	Set a named engine parameter to a value.
+#
+# Arguments:
+#	name	Name of the doctools object to query
+#	param	Name of the parameter to set.
+#	value	Value to set the parameter to.
+#
+# Results:
+#	None.
+
+proc ::doctools::idx::_setparam {name param value} {
+    upvar #0 ::doctools::idx::docidx${name}::format_ip format_ip
+
+    if {$format_ip == {}} {
+	return -code error \
+		"Unable to set parameters without a valid format"
+    }
+
+    $format_ip eval [list idx_varset $param $value]
+    return
+}
+
+##########################
+# Support commands
+
+# ::doctools::idx::LookupFormat --
+#
+#	Search a format definition file based upon its name
+#
+# Arguments:
+#	name	Name of the docidx object to use
+#	format	Name of the format to look for.
+#
+# Results:
+#	The file containing the format definition
+
+proc ::doctools::idx::LookupFormat {name format} {
+    # Order of searching
+    # 1) Is the name of the format an existing file ?
+    #    If yes, take this file.
+    # 2) Look for the file in the directories given to the object itself..
+    # 3) Look for the file in the standard directories of this package.
+
+    if {[file exists $format] && [file isfile $format]} {
+	return $format
+    }
+
+    upvar #0 ::doctools::idx::docidx${name}::paths opaths
+    foreach path $opaths {
+	set f [file join $path idx.$format]
+	if {[file exists $f] && [file isfile $f]} {
+	    return $f
+	}
+    }
+
+    variable paths
+    foreach path $paths {
+	set f [file join $path idx.$format]
+	if {[file exists $f] && [file isfile $f]} {
+	    return $f
+	}
+    }
+
+    return -code error "Unknown format \"$format\""
+}
+
+# ::doctools::idx::SetupFormatter --
+#
+#	Create and initializes an interpreter containing a
+#	formatting engine
+#
+# Arguments:
+#	name	Name of the docidx object to manipulate
+#	format	Name of file containing the code of the engine
+#
+# Results:
+#	None.
+
+proc ::doctools::idx::SetupFormatter {name format} {
+
+    # Create and initialize the interpreter first.
+    # Use a transient variable. Interrogate the
+    # engine and check its response. Bail out in
+    # case of errors. Only if we pass the checks
+    # we tear down the old engine and make the new
+    # one official.
+
+    variable here
+    set mpip [interp create -safe] ; # interpreter for the formatting engine
+    #set mpip [interp create] ; # interpreter for the formatting engine
+
+    $mpip invokehidden source [file join $here api_idx.tcl]
+    #$mpip eval [list source [file join $here api_idx.tcl]]
+    interp alias $mpip dt_source   {} ::doctools::idx::Source  $mpip [file dirname $format]
+    interp alias $mpip dt_read     {} ::doctools::idx::Read    $mpip [file dirname $format]
+    interp alias $mpip dt_package  {} ::doctools::idx::Package $mpip
+    interp alias $mpip file        {} ::doctools::idx::FileOp  $mpip
+    interp alias $mpip puts_stderr {} ::puts stderr
+    $mpip invokehidden source $format
+    #$mpip eval [list source $format]
+
+    # Check the engine for useability in doctools.
+
+    foreach api {
+	idx_numpasses
+	idx_initialize
+	idx_setup
+	idx_postprocess
+	idx_shutdown
+	idx_listvariables
+	idx_varset
+    } {
+	if {[$mpip eval [list info commands $api]] == {}} {
+	    interp delete $mpip
+	    error "$format error: API incomplete, cannot use this engine"
+	}
+    }
+    if {[catch {
+	set passes [$mpip eval idx_numpasses]
+    }]} {
+	interp delete $mpip
+	error "$format error: Unable to query for number of passes"
+    }
+    if {![string is integer $passes] || ($passes < 1)} {
+	interp delete $mpip
+	error "$format error: illegal number of passes \"$passes\""
+    }
+    if {[catch {
+	set parameters [$mpip eval idx_listvariables]
+    }]} {
+	interp delete $mpip
+	error "$format error: Unable to query for list of parameters"
+    }
+
+    # Passed the tests. Tear down existing engine,
+    # and checker. The latter is destroyed because
+    # of its aliases into the formatter, which are
+    # now invalid. It will be recreated during the
+    # next call of 'format'.
+
+    upvar #0 ::doctools::idx::docidx${name}::formatfile formatfile
+    upvar #0 ::doctools::idx::docidx${name}::format_ip  format_ip
+    upvar #0 ::doctools::idx::docidx${name}::chk_ip     chk_ip
+    upvar #0 ::doctools::idx::docidx${name}::expander   expander
+    upvar #0 ::doctools::idx::docidx${name}::passes     xpasses
+    upvar #0 ::doctools::idx::docidx${name}::param      xparam
+
+    if {$chk_ip != {}}    {interp delete $chk_ip}
+    if {$format_ip != {}} {interp delete $format_ip}
+
+    set chk_ip    ""
+    set format_ip ""
+
+    # Now link engine API into it.
+
+    interp alias $mpip dt_format    {} ::doctools::idx::GetFormat    $name
+    interp alias $mpip dt_user      {} ::doctools::idx::GetUser      $name
+    interp alias $mpip dt_fmap      {} ::doctools::idx::MapFile      $name
+
+    foreach cmd {cappend cget cis cname cpop cpush cset lb rb} {
+	interp alias $mpip ex_$cmd {} $expander $cmd
+    }
+
+    set format_ip  $mpip
+    set formatfile $format
+    set xpasses    $passes
+    set xparam     $parameters
+    return
+}
+
+# ::doctools::idx::SetupChecker --
+#
+#	Create and initializes an interpreter for checking the usage of
+#	docidx formatting commands
+#
+# Arguments:
+#	name	Name of the docidx object to manipulate
+#
+# Results:
+#	None.
+
+proc ::doctools::idx::SetupChecker {name} {
+    # Create an interpreter for checking the usage of docidx formatting commands
+    # and initialize it: Link it to the interpreter doing the formatting, the
+    # expander object and the configuration information. All of which
+    # is accessible through the token/handle (name of state/object array).
+
+    variable here
+
+    upvar #0 ::doctools::idx::docidx${name}::chk_ip    chk_ip
+    if {$chk_ip != ""} {return}
+
+    upvar #0 ::doctools::idx::docidx${name}::expander  expander
+    upvar #0 ::doctools::idx::docidx${name}::format_ip format_ip
+
+    set chk_ip [interp create] ; # interpreter hosting the formal format checker
+
+    # Make configuration available through command, then load the code base.
+
+    foreach {cmd ckcmd} {
+	dt_search     SearchPaths
+	dt_error      FmtError
+	dt_warning    FmtWarning
+    } {
+	interp alias $chk_ip $cmd {} ::doctools::idx::$ckcmd $name
+    }
+    $chk_ip eval [list source [file join $here checker_idx.tcl]]
+
+    # Simple expander commands are directly routed back into it, no
+    # checking required.
+
+    foreach cmd {cappend cget cis cname cpop cpush cset lb rb} {
+	interp alias $chk_ip $cmd {} $expander $cmd
+    }
+
+    # Link the formatter commands into the checker. We use the prefix
+    # 'fmt_' to distinguish them from the checking commands.
+
+    foreach cmd {
+	index_begin index_end key manpage url comment plain_text
+    } {
+	interp alias $chk_ip fmt_$cmd $format_ip fmt_$cmd
+    }
+    return
+}
+
+# ::doctools::idx::SetupExpander --
+#
+#	Create and initializes the expander for input
+#
+# Arguments:
+#	name	Name of the docidx object to manipulate
+#
+# Results:
+#	None.
+
+proc ::doctools::idx::SetupExpander {name} {
+    upvar #0 ::doctools::idx::docidx${name}::ex_ok    ex_ok
+    if {$ex_ok} {return}
+
+    upvar #0 ::doctools::idx::docidx${name}::expander expander
+    ::textutil::expander $expander
+    $expander evalcmd [list ::doctools::idx::Eval $name]
+    $expander textcmd plain_text
+    set ex_ok 1
+    return
+}
+
+# ::doctools::idx::SearchPaths --
+#
+#	API for checker. Returns list of search paths for format
+#	definitions. Used to look for message catalogs as well.
+#
+# Arguments:
+#	name	Name of the docidx object to query.
+#
+# Results:
+#	None.
+
+proc ::doctools::idx::SearchPaths {name} {
+    upvar #0 ::doctools::idx::docidx${name}::paths opaths
+    variable paths
+
+    set p $opaths
+    foreach s $paths {lappend p $s}
+    return $p
+}
+
+# ::doctools::idx::FmtError --
+#
+#	API for checker. Called when an error occurred.
+#
+# Arguments:
+#	name	Name of the docidx object to query.
+#	text	Error message
+#
+# Results:
+#	None.
+
+proc ::doctools::idx::FmtError {name text} {
+    return -code error "(FmtError) $text"
+}
+
+# ::doctools::idx::FmtWarning --
+#
+#	API for checker. Called when a warning was generated
+#
+# Arguments:
+#	name	Name of the docidx object
+#	text	Warning message
+#
+# Results:
+#	None.
+
+proc ::doctools::idx::FmtWarning {name text} {
+    upvar #0 ::doctools::idx::docidx${name}::msg msg
+    lappend msg $text
+    return
+}
+
+# ::doctools::idx::Eval --
+#
+#	API for expander. Routes the macro invocations
+#	into the checker interpreter
+#
+# Arguments:
+#	name	Name of the docidx object to query.
+#
+# Results:
+#	None.
+
+proc ::doctools::idx::Eval {name macro} {
+    upvar #0 ::doctools::idx::docidx${name}::chk_ip chk_ip
+
+    # Handle the [include] command directly
+    if {[string match include* $macro]} {
+	set macro [$chk_ip eval [list subst $macro]]
+	foreach {cmd filename} $macro break
+	return [ExpandInclude $name $filename]
+    }
+
+    return [$chk_ip eval $macro]
+}
+
+# ::doctools::idx::ExpandInclude --
+#
+#	Handle inclusion of files.
+#
+# Arguments:
+#	name	Name of the docidx object to query.
+#	path	Name of file to include and expand.
+#
+# Results:
+#	None.
+
+proc ::doctools::idx::ExpandInclude {name path} {
+    upvar #0 ::doctools::idx::docidx${name}::file file
+
+    set ipath [file normalize [file join [file dirname $file] $path]]
+    if {![file exists $ipath]} {
+	set ipath $path
+	if {![file exists $ipath]} {
+	    return -code error "Unable to fine include file \"$path\""
+	}
+    }
+
+    set    chan [open $ipath r]
+    set    text [read $chan]
+    close $chan
+
+    upvar #0 ::doctools::idx::docidx${name}::expander  expander
+
+    set saved $file
+    set file $ipath
+    set res [$expander expand $text]
+    set file $saved
+
+    return $res
+}
+
+# ::doctools::idx::GetUser --
+#
+#	API for formatter. Returns name of current user
+#
+# Arguments:
+#	name	Name of the docidx object to query.
+#
+# Results:
+#	String, name of current user.
+
+proc ::doctools::idx::GetUser {name} {
+    global  tcl_platform
+    return $tcl_platform(user)
+}
+
+# ::doctools::idx::GetFormat --
+#
+#	API for formatter. Returns format information
+#
+# Arguments:
+#	name	Name of the docidx object to query.
+#
+# Results:
+#	Format information
+
+proc ::doctools::idx::GetFormat {name} {
+    upvar #0 ::doctools::idx::docidx${name}::format format
+    return $format
+}
+
+# ::doctools::idx::MapFile --
+#
+#	API for formatter. Maps symbolic to actual filename in an
+#	index element. If no mapping is found it is assumed that
+#	the symbolic name is also the actual name.
+#
+# Arguments:
+#	name	Name of the docidx object to query.
+#	fname	Symbolic name of the file.
+#
+# Results:
+#	Actual name of the file.
+
+proc ::doctools::idx::MapFile {name fname} {
+    upvar #0 ::doctools::idx::docidx${name}::map map
+    if {[info exists map($fname)]} {
+	return $map($fname)
+    }
+    return $fname
+}
+
+# ::doctools::idx::Source --
+#
+#	API for formatter. Used by engine to ask for
+#	additional script files support it.
+#
+# Arguments:
+#	name	Name of the docidx object to change.
+#
+# Results:
+#	Boolean flag.
+
+proc ::doctools::idx::Source {ip path file} {
+    $ip invokehidden source [file join $path [file tail $file]]
+    #$ip eval [list source [file join $path [file tail $file]]]
+    return
+}
+
+proc ::doctools::idx::Read {ip path file} {
+    #puts stderr "$ip (read $path $file)"
+
+    return [read [set f [open [file join $path [file tail $file]]]]][close $f]
+}
+
+proc ::doctools::idx::FileOp {ip args} {
+    #puts stderr "$ip (file $args)"
+    # -- FUTURE -- disallow unsafe operations --
+
+    return [eval [linsert $args 0 file]]
+}
+
+proc ::doctools::idx::Package {ip pkg} {
+    #puts stderr "$ip package require $pkg"
+
+    set indexScript [Locate $pkg]
+
+    $ip expose source
+    $ip expose load
+    $ip eval		$indexScript
+    $ip hide   source
+    $ip hide   load
+    #$ip eval [list source [file join $path [file tail $file]]]
+    return
+}
+
+proc ::doctools::idx::Locate {p} {
+    # @mdgen NODEP: doctools::__undefined__
+    catch {package require doctools::__undefined__}
+
+    #puts stderr "auto_path = [join $::auto_path \n]"
+
+    # Check if requested package is in the list of loadable packages.
+    # Then get the highest possible version, and then the index script
+
+    if {[lsearch -exact [package names] $p] < 0} {
+	return -code error "Unknown package $p"
+    }
+
+    set v  [lindex [lsort -increasing [package versions $p]] end]
+
+    #puts stderr "Package $p = $v"
+
+    return [package ifneeded $p $v]
+}
+
+#------------------------------------
+# Module initialization
+
+namespace eval ::doctools::idx {
+    # Reverse order of searching. First to search is specified last.
+
+    # FOO/docidx.tcl
+    # => FOO/mpformats
+
+    #catch {search [file join $here                lib doctools mpformats]}
+    #catch {search [file join [file dirname $here] lib doctools mpformats]}
+    catch {search [file join $here                             mpformats]}
+}
+
+package provide doctools::idx 1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/doctoc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/doctoc.tcl
new file mode 100644
index 00000000..95c1126d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/doctoc.tcl
@@ -0,0 +1,966 @@
+# doctoc.tcl --
+#
+#	Implementation of doctoc objects for Tcl.
+#
+# Copyright (c) 2003-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.2
+package require textutil::expander
+
+# @mdgen OWNER: api_toc.tcl
+# @mdgen OWNER: checker_toc.tcl
+# @mdgen OWNER: mpformats/*.tcl
+# @mdgen OWNER: mpformats/*.msg
+# @mdgen OWNER: mpformats/toc.*
+# @mdgen OWNER: mpformats/man.macros
+
+namespace eval ::doctools {}
+namespace eval ::doctools::toc {
+    # Data storage in the doctools::toc module
+    # -------------------------------
+    #
+    # One namespace per object, containing
+    #  1) A list of additional search paths for format definition files.
+    #     This list extends the list of standard paths known to the module.
+    #     The paths in the list are searched before the standard paths.
+    #  2) Configuration information
+    #     a) string:  The format to use when converting the input.
+    #  4) Name of the interpreter used to perform the syntax check of the
+    #     input (= allowed order of formatting commands).
+    #  5) Name of the interpreter containing the code coming from the format
+    #     definition file.
+    #  6) Name of the expander object used to interpret the input to convert.
+
+    # commands is the list of subcommands recognized by the doctoc objects
+    variable commands [list		\
+	    "cget"			\
+	    "configure"			\
+	    "destroy"			\
+	    "format"			\
+	    "map"			\
+	    "search"			\
+	    "warnings"                  \
+	    "parameters"                \
+	    "setparam"                  \
+	    ]
+
+    # Only export the toplevel commands
+    namespace export new search help
+
+    # Global data
+
+    #  1) List of standard paths to look at when searching for a format
+    #     definition. Extensible.
+    #  2) Location of this file in the filesystem
+
+    variable paths [list]
+    variable here [file dirname [info script]]
+}
+
+# ::doctools::toc::search --
+#
+#	Extend the list of paths used when searching for format definition files.
+#
+# Arguments:
+#	path	Path to add to the list. The path has to exist, has to be a
+#               directory, and has to be readable.
+#
+# Results:
+#	None.
+#
+# Sideeffects:
+#	The specified path is added to the front of the list of search
+#	paths. This means that the new path is search before the
+#	standard paths set at module initialization time.
+
+proc ::doctools::toc::search {path} {
+    variable paths
+
+    if {![file exists      $path]} {return -code error "doctools::toc::search: path does not exist"}
+    if {![file isdirectory $path]} {return -code error "doctools::toc::search: path is not a directory"}
+    if {![file readable    $path]} {return -code error "doctools::toc::search: path cannot be read"}
+
+    set paths [linsert $paths 0 $path]
+    return
+}
+
+# ::doctools::toc::help --
+#
+#	Return a string containing short help
+#	regarding the existing formatting commands.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A string.
+
+proc ::doctools::toc::help {} {
+    return "formatting commands\n\
+	    * toc_begin      - begin of table of contents\n\
+	    * toc_end        - end of toc\n\
+	    * division_start - begin of toc division\n\
+	    * division_end   - end of toc division\n\
+	    * item           - toc element\n\
+	    * vset           - set/get variable values\n\
+	    * include        - insert external file\n\
+	    * lb, rb         - left/right brackets\n\
+	    "
+}
+
+# ::doctools::toc::new --
+#
+#	Create a new doctoc object with a given name. May configure the object.
+#
+# Arguments:
+#	name	Name of the doctoc object.
+#	args	Options configuring the new object.
+#
+# Results:
+#	name	Name of the doctools created
+
+proc ::doctools::toc::new {name args} {
+        if { [llength [info commands ::$name]] } {
+	return -code error "command \"$name\" already exists, unable to create doctoc object"
+    }
+    if {[llength $args] % 2 == 1} {
+	return -code error "wrong # args: doctools::new name ?opt val...??"
+    }
+
+    # The arguments seem to be ok, setup the namespace for the object
+
+    namespace eval ::doctools::toc::doctoc$name {
+	variable paths      [list]
+	variable file       ""
+	variable format     ""
+	variable formatfile ""
+	variable format_ip  ""
+	variable chk_ip     ""
+	variable expander   "[namespace current]::ex"
+	variable ex_ok      0
+	variable msg        [list]
+	variable map ;      array set map {}
+	variable param      [list]
+    }
+
+    # Create the command to manipulate the object
+    #                 $name -> ::doctools::toc::DocTocProc $name
+    interp alias {} ::$name {} ::doctools::toc::DocTocProc $name
+
+    # If the name was followed by arguments use them to configure the
+    # object before returning its handle to the caller.
+
+    if {[llength $args] > 1} {
+	# Use linsert trick to make the command a pure list.
+	eval [linsert $args 0 _configure $name]
+    }
+    return $name
+}
+
+##########################
+# Private functions follow
+
+# ::doctools::toc::DocTocProc --
+#
+#	Command that processes all doctoc object commands.
+#	Dispatches any object command to the appropriate internal
+#	command implementing its functionality.
+#
+# Arguments:
+#	name	Name of the doctoc object to manipulate.
+#	cmd	Subcommand to invoke.
+#	args	Arguments for subcommand.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::doctools::toc::DocTocProc {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	error "wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+
+    if { [llength [info commands ::doctools::toc::_$cmd]] == 0 } {
+	variable commands
+	set optlist [join $commands ", "]
+	set optlist [linsert $optlist "end-1" "or"]
+	return -code error "bad option \"$cmd\": must be $optlist"
+    }
+    return [eval [list ::doctools::toc::_$cmd $name] $args]
+}
+
+##########################
+# Method implementations follow (these are also private commands)
+
+# ::doctools::toc::_cget --
+#
+#	Retrieve the current value of a particular option
+#
+# Arguments:
+#	name	Name of the doctoc object to query
+#	option	Name of the option whose value we are asking for.
+#
+# Results:
+#	The value of the option
+
+proc ::doctools::toc::_cget {name option} {
+    _configure $name $option
+}
+
+# ::doctools::toc::_configure --
+#
+#	Configure a doctoc object, or query its configuration.
+#
+# Arguments:
+#	name	Name of the doctoc object to configure
+#	args	Options and their values.
+#
+# Results:
+#	None if configuring the object.
+#	A list of all options and their values if called without arguments.
+#	The value of one particular option if called with a single argument.
+
+proc ::doctools::toc::_configure {name args} {
+    if {[llength $args] == 0} {
+	# Retrieve the current configuration.
+
+	upvar #0 ::doctools::toc::doctoc${name}::file    file
+	upvar #0 ::doctools::toc::doctoc${name}::format  format
+
+	set     res [list]
+	lappend res -file       $file
+	lappend res -format     $format
+	return $res
+
+    } elseif {[llength $args] == 1} {
+	# Query the value of one particular option.
+
+	switch -exact -- [lindex $args 0] {
+	    -file {
+		upvar #0 ::doctools::toc::doctoc${name}::file file
+		return $file
+	    }
+	    -format {
+		upvar #0 ::doctools::toc::doctoc${name}::format format
+		return $format
+	    }
+	    default {
+		return -code error \
+			"doctools::toc::_configure: Unknown option \"[lindex $args 0]\", expected\
+			-file, or -format"
+	    }
+	}
+    } else {
+	# Reconfigure the object.
+
+	if {[llength $args] % 2 == 1} {
+	    return -code error "wrong # args: doctools::toc::_configure name ?opt val...??"
+	}
+
+	foreach {option value} $args {
+	    switch -exact -- $option {
+		-file {
+		    upvar #0 ::doctools::toc::doctoc${name}::file file
+		    set file $value
+		}
+		-format {
+		    if {[catch {
+			set fmtfile [LookupFormat $name $value]
+			SetupFormatter $name $fmtfile
+			upvar #0 ::doctools::toc::doctoc${name}::format format
+			set format $value
+		    } msg]} {
+			return -code error \
+			    -errorinfo $::errorInfo \
+			    "doctools::toc::_configure: -format: $msg"
+		    }
+		}
+		default {
+		    return -code error \
+			    "doctools::toc::_configure: Unknown option \"$option\", expected\
+			    -file, or -format"
+		}
+	    }
+	}
+    }
+    return ""
+}
+
+# ::doctools::toc::_destroy --
+#
+#	Destroy a doctoc object, including its associated command and data storage.
+#
+# Arguments:
+#	name	Name of the doctoc object to destroy.
+#
+# Results:
+#	None.
+
+proc ::doctools::toc::_destroy {name} {
+    # Check the object for sub objects which have to destroyed before
+    # the namespace is torn down.
+    namespace eval ::doctools::toc::doctoc$name {
+	if {$format_ip != ""} {interp delete $format_ip}
+	if {$chk_ip    != ""} {interp delete $chk_ip}
+
+	# Expander objects have no delete/destroy method. This would
+	# be a leak if not for the fact that an expander object is a
+	# namespace, and we have arranged to make it a sub namespace of
+	# the doctoc object. Therefore tearing down our object namespace
+	# also cleans up the expander object.
+	# if {$expander != ""} {$expander destroy}
+
+    }
+    namespace delete ::doctools::toc::doctoc$name
+    interp alias {} ::$name {}
+    return
+}
+
+# ::doctools::toc::_map --
+#
+#	Add a mapping from symbolic to actual filename to the object.
+#
+# Arguments:
+#	name	Name of the doctoc object to use
+#	sfname	Symbolic filename to map
+#	afname	Actual filename
+#
+# Results:
+#	None.
+
+proc ::doctools::toc::_map {name sfname afname} {
+    upvar #0 ::doctools::toc::doctoc${name}::map map
+    set map($sfname) $afname
+    return
+}
+
+# ::doctools::toc::_format --
+#
+#	Convert some text in doctools format
+#	according to the configuration in the object.
+#
+# Arguments:
+#	name	Name of the doctoc object to use
+#	text	Text to convert.
+#
+# Results:
+#	The conversion result.
+
+proc ::doctools::toc::_format {name text} {
+    upvar #0 ::doctools::toc::doctoc${name}::format format
+    if {$format == ""} {
+	return -code error "$name: No format was specified"
+    }
+
+    upvar #0 ::doctools::toc::doctoc${name}::format_ip format_ip
+    upvar #0 ::doctools::toc::doctoc${name}::chk_ip    chk_ip
+    upvar #0 ::doctools::toc::doctoc${name}::ex_ok     ex_ok
+    upvar #0 ::doctools::toc::doctoc${name}::expander  expander
+    upvar #0 ::doctools::toc::doctoc${name}::passes    passes
+    upvar #0 ::doctools::toc::doctoc${name}::msg       warnings
+
+    if {!$ex_ok}       {SetupExpander  $name}
+    if {$chk_ip == ""} {SetupChecker   $name}
+    # assert (format_ip != "")
+
+    set warnings [list]
+    if {[catch {$format_ip eval toc_initialize}]} {
+	return -code error "Could not initialize engine"
+    }
+    set result ""
+
+    for {
+	set p $passes ; set n 1
+    } {
+	$p > 0
+    } {
+	incr p -1 ; incr n
+    } {
+	if {[catch {$format_ip eval [list toc_setup $n]}]} {
+	    catch {$format_ip eval toc_shutdown}
+	    return -code error "Could not initialize pass $n of engine"
+	}
+	$chk_ip eval ck_initialize
+
+	if {[catch {set result [$expander expand $text]} msg]} {
+	    catch {$format_ip eval toc_shutdown}
+	    # Filter for checker errors and reduce them to the essential message.
+
+	    if {![regexp {^Error in} $msg]}          {return -code error $msg}
+	    #set msg [join [lrange [split $msg \n] 2 end]]
+
+	    if {![regexp {^--> \(FmtError\) } $msg]} {return -code error "Doctoc $msg"}
+	    set msg [lindex [split $msg \n] 0]
+	    regsub {^--> \(FmtError\) } $msg {} msg
+
+	    return -code error $msg
+	}
+
+	$chk_ip eval ck_complete
+    }
+
+    if {[catch {set result [$format_ip eval [list toc_postprocess $result]]}]} {
+	return -code error "Unable to post process final result"
+    }
+    if {[catch {$format_ip eval toc_shutdown}]} {
+	return -code error "Could not shut engine down"
+    }
+    return $result
+
+}
+
+# ::doctools::toc::_search --
+#
+#	Add a search path to the object.
+#
+# Arguments:
+#	name	Name of the doctoc object to extend
+#	path	Search path to add.
+#
+# Results:
+#	None.
+
+proc ::doctools::toc::_search {name path} {
+    if {![file exists      $path]} {return -code error "$name search: path does not exist"}
+    if {![file isdirectory $path]} {return -code error "$name search: path is not a directory"}
+    if {![file readable    $path]} {return -code error "$name search: path cannot be read"}
+
+    upvar #0 ::doctools::toc::doctoc${name}::paths paths
+    set paths [linsert $paths 0 $path]
+    return
+}
+
+# ::doctools::toc::_warnings --
+#
+#	Return the warning accumulated during the last invocation of 'format'.
+#
+# Arguments:
+#	name	Name of the doctoc object to query
+#
+# Results:
+#	A list of warnings.
+
+proc ::doctools::toc::_warnings {name} {
+    upvar #0 ::doctools::toc::doctoc${name}::msg msg
+    return $msg
+}
+
+# ::doctools::_parameters --
+#
+#	Returns a list containing the parameters provided
+#	by the selected formatting engine.
+#
+# Arguments:
+#	name	Name of the doctools object to query
+#
+# Results:
+#	A list of parameter names
+
+proc ::doctools::toc::_parameters {name} {
+    upvar #0 ::doctools::toc::doctoc${name}::param param
+    return $param
+}
+
+# ::doctools::_setparam --
+#
+#	Set a named engine parameter to a value.
+#
+# Arguments:
+#	name	Name of the doctools object to query
+#	param	Name of the parameter to set.
+#	value	Value to set the parameter to.
+#
+# Results:
+#	None.
+
+proc ::doctools::toc::_setparam {name param value} {
+    upvar #0 ::doctools::toc::doctoc${name}::format_ip format_ip
+
+    if {$format_ip == {}} {
+	return -code error \
+		"Unable to set parameters without a valid format"
+    }
+
+    $format_ip eval [list toc_varset $param $value]
+    return
+}
+
+##########################
+# Support commands
+
+# ::doctools::toc::LookupFormat --
+#
+#	Search a format definition file based upon its name
+#
+# Arguments:
+#	name	Name of the doctoc object to use
+#	format	Name of the format to look for.
+#
+# Results:
+#	The file containing the format definition
+
+proc ::doctools::toc::LookupFormat {name format} {
+    # Order of searching
+    # 1) Is the name of the format an existing file ?
+    #    If yes, take this file.
+    # 2) Look for the file in the directories given to the object itself..
+    # 3) Look for the file in the standard directories of this package.
+
+    if {[file exists $format] && [file isfile $format]} {
+	return $format
+    }
+
+    upvar #0 ::doctools::toc::doctoc${name}::paths opaths
+    foreach path $opaths {
+	set f [file join $path toc.$format]
+	if {[file exists $f] && [file isfile $f]} {
+	    return $f
+	}
+    }
+
+    variable paths
+    foreach path $paths {
+	set f [file join $path toc.$format]
+	if {[file exists $f] && [file isfile $f]} {
+	    return $f
+	}
+    }
+
+    return -code error "Unknown format \"$format\""
+}
+
+# ::doctools::toc::SetupFormatter --
+#
+#	Create and initializes an interpreter containing a
+#	formatting engine
+#
+# Arguments:
+#	name	Name of the doctoc object to manipulate
+#	format	Name of file containing the code of the engine
+#
+# Results:
+#	None.
+
+proc ::doctools::toc::SetupFormatter {name format} {
+
+    # Create and initialize the interpreter first.
+    # Use a transient variable. Interrogate the
+    # engine and check its response. Bail out in
+    # case of errors. Only if we pass the checks
+    # we tear down the old engine and make the new
+    # one official.
+
+    variable here
+    set mpip [interp create -safe] ; # interpreter for the formatting engine
+    #set mpip [interp create] ; # interpreter for the formatting engine
+
+    $mpip invokehidden source [file join $here api_toc.tcl]
+    #$mpip eval [list source [file join $here api_toc.tcl]]
+    interp alias $mpip dt_source   {} ::doctools::toc::Source  $mpip [file dirname $format]
+    interp alias $mpip dt_read     {} ::doctools::toc::Read    $mpip [file dirname $format]
+    interp alias $mpip dt_package  {} ::doctools::toc::Package $mpip
+    interp alias $mpip file        {} ::doctools::toc::FileOp  $mpip
+    interp alias $mpip puts_stderr {} ::puts stderr
+    $mpip invokehidden source $format
+    #$mpip eval [list source $format]
+
+    # Check the engine for useability in doctools.
+
+    foreach api {
+	toc_numpasses
+	toc_initialize
+	toc_setup
+	toc_postprocess
+	toc_shutdown
+	toc_listvariables
+	toc_varset
+    } {
+	if {[$mpip eval [list info commands $api]] == {}} {
+	    interp delete $mpip
+	    error "$format error: API incomplete, cannot use this engine"
+	}
+    }
+    if {[catch {
+	set passes [$mpip eval toc_numpasses]
+    }]} {
+	interp delete $mpip
+	error "$format error: Unable to query for number of passes"
+    }
+    if {![string is integer $passes] || ($passes < 1)} {
+	interp delete $mpip
+	error "$format error: illegal number of passes \"$passes\""
+    }
+    if {[catch {
+	set parameters [$mpip eval toc_listvariables]
+    }]} {
+	interp delete $mpip
+	error "$format error: Unable to query for list of parameters"
+    }
+
+    # Passed the tests. Tear down existing engine,
+    # and checker. The latter is destroyed because
+    # of its aliases into the formatter, which are
+    # now invalid. It will be recreated during the
+    # next call of 'format'.
+
+    upvar #0 ::doctools::toc::doctoc${name}::formatfile formatfile
+    upvar #0 ::doctools::toc::doctoc${name}::format_ip  format_ip
+    upvar #0 ::doctools::toc::doctoc${name}::chk_ip     chk_ip
+    upvar #0 ::doctools::toc::doctoc${name}::expander   expander
+    upvar #0 ::doctools::toc::doctoc${name}::passes     xpasses
+    upvar #0 ::doctools::toc::doctoc${name}::param      xparam
+
+    if {$chk_ip != {}}    {interp delete $chk_ip}
+    if {$format_ip != {}} {interp delete $format_ip}
+
+    set chk_ip    ""
+    set format_ip ""
+
+    # Now link engine API into it.
+
+    interp alias $mpip dt_format    {} ::doctools::toc::GetFormat    $name
+    interp alias $mpip dt_user      {} ::doctools::toc::GetUser      $name
+    interp alias $mpip dt_fmap      {} ::doctools::toc::MapFile      $name
+
+    foreach cmd {cappend cget cis cname cpop cpush cset lb rb} {
+	interp alias $mpip ex_$cmd {} $expander $cmd
+    }
+
+    set format_ip  $mpip
+    set formatfile $format
+    set xpasses    $passes
+    set xparam     $parameters
+    return
+}
+
+# ::doctools::toc::SetupChecker --
+#
+#	Create and initializes an interpreter for checking the usage of
+#	doctoc formatting commands
+#
+# Arguments:
+#	name	Name of the doctoc object to manipulate
+#
+# Results:
+#	None.
+
+proc ::doctools::toc::SetupChecker {name} {
+    # Create an interpreter for checking the usage of doctoc formatting commands
+    # and initialize it: Link it to the interpreter doing the formatting, the
+    # expander object and the configuration information. All of which
+    # is accessible through the token/handle (name of state/object array).
+
+    variable here
+
+    upvar #0 ::doctools::toc::doctoc${name}::chk_ip    chk_ip
+    if {$chk_ip != ""} {return}
+
+    upvar #0 ::doctools::toc::doctoc${name}::expander  expander
+    upvar #0 ::doctools::toc::doctoc${name}::format_ip format_ip
+
+    set chk_ip [interp create] ; # interpreter hosting the formal format checker
+
+    # Make configuration available through command, then load the code base.
+
+    foreach {cmd ckcmd} {
+	dt_search     SearchPaths
+	dt_error      FmtError
+	dt_warning    FmtWarning
+    } {
+	interp alias $chk_ip $cmd {} ::doctools::toc::$ckcmd $name
+    }
+    $chk_ip eval [list source [file join $here checker_toc.tcl]]
+
+    # Simple expander commands are directly routed back into it, no
+    # checking required.
+
+    foreach cmd {cappend cget cis cname cpop cpush cset lb rb} {
+	interp alias $chk_ip $cmd {} $expander $cmd
+    }
+
+    # Link the formatter commands into the checker. We use the prefix
+    # 'fmt_' to distinguish them from the checking commands.
+
+    foreach cmd {
+	toc_begin toc_end division_start division_end item
+	comment plain_text
+    } {
+	interp alias $chk_ip fmt_$cmd $format_ip fmt_$cmd
+    }
+    return
+}
+
+# ::doctools::toc::SetupExpander --
+#
+#	Create and initializes the expander for input
+#
+# Arguments:
+#	name	Name of the doctoc object to manipulate
+#
+# Results:
+#	None.
+
+proc ::doctools::toc::SetupExpander {name} {
+    upvar #0 ::doctools::toc::doctoc${name}::ex_ok    ex_ok
+    if {$ex_ok} {return}
+
+    upvar #0 ::doctools::toc::doctoc${name}::expander expander
+    ::textutil::expander $expander
+    $expander evalcmd [list ::doctools::toc::Eval $name]
+    $expander textcmd plain_text
+    set ex_ok 1
+    return
+}
+
+# ::doctools::toc::SearchPaths --
+#
+#	API for checker. Returns list of search paths for format
+#	definitions. Used to look for message catalogs as well.
+#
+# Arguments:
+#	name	Name of the doctoc object to query.
+#
+# Results:
+#	None.
+
+proc ::doctools::toc::SearchPaths {name} {
+    upvar #0 ::doctools::toc::doctoc${name}::paths opaths
+    variable paths
+
+    set p $opaths
+    foreach s $paths {lappend p $s}
+    return $p
+}
+
+# ::doctools::toc::FmtError --
+#
+#	API for checker. Called when an error occurred.
+#
+# Arguments:
+#	name	Name of the doctoc object to query.
+#	text	Error message
+#
+# Results:
+#	None.
+
+proc ::doctools::toc::FmtError {name text} {
+    return -code error "(FmtError) $text"
+}
+
+# ::doctools::toc::FmtWarning --
+#
+#	API for checker. Called when a warning was generated
+#
+# Arguments:
+#	name	Name of the doctoc object
+#	text	Warning message
+#
+# Results:
+#	None.
+
+proc ::doctools::toc::FmtWarning {name text} {
+    upvar #0 ::doctools::toc::doctoc${name}::msg msg
+    lappend msg $text
+    return
+}
+
+# ::doctools::toc::Eval --
+#
+#	API for expander. Routes the macro invocations
+#	into the checker interpreter
+#
+# Arguments:
+#	name	Name of the doctoc object to query.
+#
+# Results:
+#	None.
+
+proc ::doctools::toc::Eval {name macro} {
+    upvar #0 ::doctools::toc::doctoc${name}::chk_ip chk_ip
+
+    # Handle the [include] command directly
+    if {[string match include* $macro]} {
+	set macro [$chk_ip eval [list subst $macro]]
+	foreach {cmd filename} $macro break
+	return [ExpandInclude $name $filename]
+    }
+
+    return [$chk_ip eval $macro]
+}
+
+# ::doctools::toc::ExpandInclude --
+#
+#	Handle inclusion of files.
+#
+# Arguments:
+#	name	Name of the doctoc object to query.
+#	path	Name of file to include and expand.
+#
+# Results:
+#	None.
+
+proc ::doctools::toc::ExpandInclude {name path} {
+    # Look for the file relative to the directory of the
+    # main file we are converting. If that fails try to
+    # use the current working directory. Throw an error
+    # if the file couldn't be found.
+
+    upvar #0 ::doctools::toc::doctoc${name}::file file
+
+    set ipath [file normalize [file join [file dirname $file] $path]]
+    if {![file exists $ipath]} {
+	set ipath $path
+	if {![file exists $ipath]} {
+	    return -code error "Unable to fine include file \"$path\""
+	}
+    }
+
+    set    chan [open $ipath r]
+    set    text [read $chan]
+    close $chan
+
+    upvar #0 ::doctools::toc::doctoc${name}::expander  expander
+
+    set saved $file
+    set file $ipath
+    set res [$expander expand $text]
+    set file $saved
+
+    return $res
+}
+
+# ::doctools::toc::GetUser --
+#
+#	API for formatter. Returns name of current user
+#
+# Arguments:
+#	name	Name of the doctoc object to query.
+#
+# Results:
+#	String, name of current user.
+
+proc ::doctools::toc::GetUser {name} {
+    global  tcl_platform
+    return $tcl_platform(user)
+}
+
+# ::doctools::toc::GetFormat --
+#
+#	API for formatter. Returns format information
+#
+# Arguments:
+#	name	Name of the doctoc object to query.
+#
+# Results:
+#	Format information
+
+proc ::doctools::toc::GetFormat {name} {
+    upvar #0 ::doctools::toc::doctoc${name}::format format
+    return $format
+}
+
+# ::doctools::toc::MapFile --
+#
+#	API for formatter. Maps symbolic to actual filename in a toc
+#	item. If no mapping is found it is assumed that the symbolic
+#	name is also the actual name.
+#
+# Arguments:
+#	name	Name of the doctoc object to query.
+#	fname	Symbolic name of the file.
+#
+# Results:
+#	Actual name of the file.
+
+proc ::doctools::toc::MapFile {name fname} {
+    upvar #0 ::doctools::toc::doctoc${name}::map map
+    if {[info exists map($fname)]} {
+	return $map($fname)
+    }
+    return $fname
+}
+
+# ::doctools::toc::Source --
+#
+#	API for formatter. Used by engine to ask for
+#	additional script files support it.
+#
+# Arguments:
+#	name	Name of the doctoc object to change.
+#
+# Results:
+#	Boolean flag.
+
+proc ::doctools::toc::Source {ip path file} {
+    $ip invokehidden source [file join $path [file tail $file]]
+    #$ip eval [list source [file join $path [file tail $file]]]
+    return
+}
+
+proc ::doctools::toc::Read {ip path file} {
+    #puts stderr "$ip (read $path $file)"
+
+    return [read [set f [open [file join $path [file tail $file]]]]][close $f]
+}
+
+proc ::doctools::toc::FileOp {ip args} {
+    #puts stderr "$ip (file $args)"
+    # -- FUTURE -- disallow unsafe operations --
+
+    return [eval [linsert $args 0 file]]
+}
+
+proc ::doctools::toc::Package {ip pkg} {
+    #puts stderr "$ip package require $pkg"
+
+    set indexScript [Locate $pkg]
+
+    $ip expose source
+    $ip expose load
+    $ip eval		$indexScript
+    $ip hide   source
+    $ip hide   load
+    #$ip eval [list source [file join $path [file tail $file]]]
+    return
+}
+
+proc ::doctools::toc::Locate {p} {
+    # @mdgen NODEP: doctools::__undefined__
+    catch {package require doctools::__undefined__}
+
+    #puts stderr "auto_path = [join $::auto_path \n]"
+
+    # Check if requested package is in the list of loadable packages.
+    # Then get the highest possible version, and then the index script
+
+    if {[lsearch -exact [package names] $p] < 0} {
+	return -code error "Unknown package $p"
+    }
+
+    set v  [lindex [lsort -increasing [package versions $p]] end]
+
+    #puts stderr "Package $p = $v"
+
+    return [package ifneeded $p $v]
+}
+
+#------------------------------------
+# Module initialization
+
+namespace eval ::doctools::toc {
+    # Reverse order of searching. First to search is specified last.
+
+    # FOO/doctoc.tcl
+    # => FOO/mpformats
+
+    #catch {search [file join $here                lib doctools mpformats]}
+    #catch {search [file join [file dirname $here] lib doctools mpformats]}
+    catch {search [file join $here                             mpformats]}
+}
+
+package provide doctools::toc 1.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/doctools.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/doctools.tcl
new file mode 100644
index 00000000..198644b6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/doctools.tcl
@@ -0,0 +1,1361 @@
+# doctools.tcl --
+#
+#	Implementation of doctools objects for Tcl.
+#
+# Copyright (c) 2003-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.2
+package require textutil::expander
+
+# @mdgen OWNER: api.tcl
+# @mdgen OWNER: checker.tcl
+# @mdgen OWNER: mpformats/*.tcl
+# @mdgen OWNER: mpformats/*.msg
+# @mdgen OWNER: mpformats/fmt.*
+# @mdgen OWNER: mpformats/man.macros
+
+namespace eval ::doctools {
+    # Data storage in the doctools module
+    # -------------------------------
+    #
+    # One namespace per object, containing
+    #  1) A list of additional search paths for format definition files.
+    #     This list extends the list of standard paths known to the module.
+    #     The paths in the list are searched before the standard paths.
+    #  2) Configuration information
+    #     a) string:  The format to use when converting the input.
+    #     b) boolean: A flag telling us whether to warn when visual markup
+    #        is used in the input, or not.
+    #     c) File information associated with the input, if any.
+    #     d) Module information associated with the input, if any.
+    #     e) Copyright information, if any
+    #  4) Name of the interpreter used to perform the syntax check of the
+    #     input (= allowed order of formatting commands).
+    #  5) Name of the interpreter containing the code coming from the format
+    #     definition file.
+    #  6) Name of the expander object used to interpret the input to convert.
+
+    # commands is the list of subcommands recognized by the doctools objects
+    variable commands [list		\
+	    "cget"			\
+	    "configure"			\
+	    "destroy"			\
+	    "format"			\
+	    "map"			\
+	    "search"			\
+	    "warnings"                  \
+	    "parameters"                \
+	    "setparam"                  \
+	    ]
+
+    # Only export the toplevel commands
+    namespace export new search help
+
+    # Global data
+
+    #  1) List of standard paths to look at when searching for a format
+    #     definition. Extensible.
+    #  2) Location of this file in the filesystem
+
+    variable paths [list]
+    variable here [file dirname [info script]]
+}
+
+# ::doctools::search --
+#
+#	Extend the list of paths used when searching for format definition files.
+#
+# Arguments:
+#	path	Path to add to the list. The path has to exist, has to be a
+#               directory, and has to be readable.
+#
+# Results:
+#	None.
+#
+# Sideeffects:
+#	The specified path is added to the front of the list of search
+#	paths. This means that the new path is search before the
+#	standard paths set at module initialization time.
+
+proc ::doctools::search {path} {
+    variable paths
+
+    if {![file exists      $path]} {return -code error "doctools::search: path does not exist"}
+    if {![file isdirectory $path]} {return -code error "doctools::search: path is not a directory"}
+    if {![file readable    $path]} {return -code error "doctools::search: path cannot be read"}
+
+    set paths [linsert $paths 0 $path]
+    return
+}
+
+# ::doctools::help --
+#
+#	Return a string containing short help
+#	regarding the existing formatting commands.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A string.
+
+proc ::doctools::help {} {
+    return "formatting commands\n\
+	    * manpage_begin - begin of manpage\n\
+	    * moddesc       - module description\n\
+	    * titledesc     - manpage title\n\
+	    * copyright     - copyright assignment\n\
+	    * manpage_end   - end of manpage\n\
+	    * require       - package requirement\n\
+	    * description   - begin of manpage body\n\
+	    * section       - begin new section of body\n\
+	    * subsection    - begin new sub-section of body\n\
+	    * para          - begin new paragraph\n\
+	    * list_begin    - begin a list\n\
+	    * list_end      - end of a list\n\
+	    * lst_item      - begin item of definition list\n\
+	    * call          - command definition, adds to synopsis\n\
+	    * usage         - see above, without adding to synopsis\n\
+	    * bullet        - begin item in bulleted list\n\
+	    * enum          - begin item in enumerated list\n\
+	    * arg_def       - begin item in argument list\n\
+	    * cmd_def       - begin item in command list\n\
+	    * opt_def       - begin item in option list\n\
+	    * tkoption_def  - begin item in tkoption list\n\
+	    * example       - example block\n\
+	    * example_begin - begin example\n\
+	    * example_end   - end of example\n\
+	    * category      - category declaration\n\
+	    * see_also      - cross reference declaration\n\
+	    * keywords      - keyword declaration\n\
+	    * nl            - paragraph break in list items\n\
+	    * arg           - semantic markup - argument\n\
+	    * cmd           - semantic markup - command\n\
+	    * opt           - semantic markup - optional data\n\
+	    * comment       - semantic markup - comment\n\
+	    * sectref       - semantic markup - section reference\n\
+	    * syscmd        - semantic markup - system command\n\
+	    * method        - semantic markup - object method\n\
+	    * namespace     - semantic markup - namespace name\n\
+	    * option        - semantic markup - option\n\
+	    * widget        - semantic markup - widget\n\
+	    * fun           - semantic markup - function\n\
+	    * type          - semantic markup - data type\n\
+	    * package       - semantic markup - package\n\
+	    * class         - semantic markup - class\n\
+	    * var           - semantic markup - variable\n\
+	    * file          - semantic markup - file \n\
+	    * uri           - semantic markup - uri (optional label)\n\
+	    * term          - semantic markup - unspecific terminology\n\
+	    * const         - semantic markup - constant value\n\
+	    * emph          - emphasis\n\
+	    * strong        - emphasis, deprecated, usage is discouraged\n\
+	    "
+}
+
+# ::doctools::new --
+#
+#	Create a new doctools object with a given name. May configure the object.
+#
+# Arguments:
+#	name	Name of the doctools object.
+#	args	Options configuring the new object.
+#
+# Results:
+#	name	Name of the doctools created
+
+proc ::doctools::new {name args} {
+
+    if { [llength [info commands ::$name]] } {
+	return -code error "command \"$name\" already exists, unable to create doctools object"
+    }
+    if {[llength $args] % 2 == 1} {
+	return -code error "wrong # args: doctools::new name ?opt val...??"
+    }
+
+    # The arguments seem to be ok, setup the namespace for the object
+
+    namespace eval ::doctools::doctools$name {
+	variable paths      [list]
+	variable format     ""
+	variable formatfile ""
+	variable deprecated 0
+	variable file       ""
+	variable mainfile   ""
+	variable ibase      ""
+	variable module     ""
+	variable copyright  ""
+	variable format_ip  ""
+	variable chk_ip     ""
+	variable expander   "[namespace current]::ex"
+	variable ex_ok      0
+	variable msg        [list]
+	variable param      [list]
+	variable map ;      array set map {}
+    }
+
+    # Create the command to manipulate the object
+    #                 $name -> ::doctools::DoctoolsProc $name
+    interp alias {} ::$name {} ::doctools::DoctoolsProc $name
+
+    # If the name was followed by arguments use them to configure the
+    # object before returning its handle to the caller.
+
+    if {[llength $args] > 1} {
+	# Use linsert trick to make the command a pure list.
+	eval [linsert $args 0 _configure $name]
+    }
+    return $name
+}
+
+##########################
+# Private functions follow
+
+# ::doctools::DoctoolsProc --
+#
+#	Command that processes all doctools object commands.
+#	Dispatches any object command to the appropriate internal
+#	command implementing its functionality.
+#
+# Arguments:
+#	name	Name of the doctools object to manipulate.
+#	cmd	Subcommand to invoke.
+#	args	Arguments for subcommand.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::doctools::DoctoolsProc {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	error "wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+
+    if { [llength [info commands ::doctools::_$cmd]] == 0 } {
+	variable commands
+	set optlist [join $commands ", "]
+	set optlist [linsert $optlist "end-1" "or"]
+	return -code error "bad option \"$cmd\": must be $optlist"
+    }
+    return [eval [list ::doctools::_$cmd $name] $args]
+}
+
+##########################
+# Method implementations follow (these are also private commands)
+
+# ::doctools::_cget --
+#
+#	Retrieve the current value of a particular option
+#
+# Arguments:
+#	name	Name of the doctools object to query
+#	option	Name of the option whose value we are asking for.
+#
+# Results:
+#	The value of the option
+
+proc ::doctools::_cget {name option} {
+    _configure $name $option
+}
+
+# ::doctools::_configure --
+#
+#	Configure a doctools object, or query its configuration.
+#
+# Arguments:
+#	name	Name of the doctools object to configure
+#	args	Options and their values.
+#
+# Results:
+#	None if configuring the object.
+#	A list of all options and their values if called without arguments.
+#	The value of one particular option if called with a single argument.
+
+proc ::doctools::_configure {name args} {
+    upvar #0 ::doctools::doctools${name}::format_ip  format_ip
+    upvar #0 ::doctools::doctools${name}::chk_ip     chk_ip
+    upvar #0 ::doctools::doctools${name}::expander   expander
+    upvar #0 ::doctools::doctools${name}::passes     passes
+
+    if {[llength $args] == 0} {
+	# Retrieve the current configuration.
+
+	upvar #0 ::doctools::doctools${name}::file       file
+	upvar #0 ::doctools::doctools${name}::ibase      ibase
+	upvar #0 ::doctools::doctools${name}::module     module
+	upvar #0 ::doctools::doctools${name}::format     format
+	upvar #0 ::doctools::doctools${name}::copyright  copyright
+	upvar #0 ::doctools::doctools${name}::deprecated deprecated
+
+	set     res [list]
+	lappend res -file       $file
+	lappend res -ibase      $ibase
+	lappend res -module     $module
+	lappend res -format     $format
+	lappend res -copyright  $copyright
+	lappend res -deprecated $deprecated
+	return $res
+
+    } elseif {[llength $args] == 1} {
+	# Query the value of one particular option.
+
+	switch -exact -- [lindex $args 0] {
+	    -file {
+		upvar #0 ::doctools::doctools${name}::file file
+		return $file
+	    }
+	    -ibase {
+		upvar #0 ::doctools::doctools${name}::ibase ibase
+		return $ibase
+	    }
+	    -module {
+		upvar #0 ::doctools::doctools${name}::module module
+		return $module
+	    }
+	    -copyright {
+		upvar #0 ::doctools::doctools${name}::copyright copyright
+		return $copyright
+	    }
+	    -format {
+		upvar #0 ::doctools::doctools${name}::format format
+		return $format
+	    }
+	    -deprecated {
+		upvar #0 ::doctools::doctools${name}::deprecated deprecated
+		return $deprecated
+	    }
+	    default {
+		return -code error \
+			"doctools::_configure: Unknown option \"[lindex $args 0]\", expected\
+			-copyright, -file, -ibase, -module, -format, or -deprecated"
+	    }
+	}
+    } else {
+	# Reconfigure the object.
+
+	if {[llength $args] % 2 == 1} {
+	    return -code error "wrong # args: doctools::_configure name ?opt val...??"
+	}
+
+	foreach {option value} $args {
+	    switch -exact -- $option {
+		-file {
+		    upvar #0 ::doctools::doctools${name}::file     file
+		    upvar #0 ::doctools::doctools${name}::mainfile mfile
+		    set file  $value
+		    set mfile $value
+		}
+		-ibase {
+		    upvar #0 ::doctools::doctools${name}::ibase    ibase
+		    set ibase $value
+		}
+		-module {
+		    upvar #0 ::doctools::doctools${name}::module module
+		    set module $value
+		}
+		-copyright {
+		    upvar #0 ::doctools::doctools${name}::copyright copyright
+		    set copyright $value
+		}
+		-format {
+		    if {[catch {
+			set fmtfile [LookupFormat $name $value]
+			SetupFormatter $name $fmtfile
+			upvar #0 ::doctools::doctools${name}::format format
+			set format $value
+		    } msg]} {
+			return -code error \
+			    -errorinfo $::errorInfo \
+			    "doctools::_configure: -format: $msg"
+		    }
+		}
+		-deprecated {
+		    if {![string is boolean $value]} {
+			return -code error \
+				"doctools::_configure: -deprecated expected a boolean, got \"$value\""
+		    }
+		    upvar #0 ::doctools::doctools${name}::deprecated deprecated
+		    set deprecated $value
+		}
+		default {
+		    return -code error \
+			    "doctools::_configure: Unknown option \"$option\", expected\
+			    -copyright, -file, -ibase, -module, -format, or -deprecated"
+		}
+	    }
+	}
+    }
+    return ""
+}
+
+# ::doctools::_destroy --
+#
+#	Destroy a doctools object, including its associated command and data storage.
+#
+# Arguments:
+#	name	Name of the doctools object to destroy.
+#
+# Results:
+#	None.
+
+proc ::doctools::_destroy {name} {
+    # Check the object for sub objects which have to destroyed before
+    # the namespace is torn down.
+    namespace eval ::doctools::doctools$name {
+	if {$format_ip != ""} {interp delete $format_ip}
+	if {$chk_ip    != ""} {interp delete $chk_ip}
+
+	# Expander objects have no delete/destroy method. This would
+	# be a leak if not for the fact that an expander object is a
+	# namespace, and we have arranged to make it a sub namespace of
+	# the doctools object. Therefore tearing down our object namespace
+	# also cleans up the expander object.
+	# if {$expander != ""} {$expander destroy}
+
+    }
+    namespace delete ::doctools::doctools$name
+    interp alias {} ::$name {}
+    return
+}
+
+# ::doctools::_map --
+#
+#	Add a mapping from symbolic to actual filename to the object.
+#
+# Arguments:
+#	name	Name of the doctools object to use
+#	sfname	Symbolic filename to map
+#	afname	Actual filename
+#
+# Results:
+#	None.
+
+proc ::doctools::_map {name sfname afname} {
+    upvar #0 ::doctools::doctools${name}::map map
+    set map($sfname) $afname
+    return
+}
+
+# ::doctools::_img --
+#
+
+#	Add a mapping from symbolic to the actual image filenames to
+#	the object. Two actual paths! The path the image is found at
+#	in the input, and the path for where image is to be placed in
+#	the output.
+#
+# Arguments:
+#	name	Name of the doctools object to use
+#	sfname	Symbolic filename to map
+#	afnameo	Actual filename, origin
+#	afnamed	Actual filename, destination
+#
+# Results:
+#	None.
+
+proc ::doctools::_img {name sfname afnameo afnamed} {
+    upvar #0 ::doctools::doctools${name}::imap imap
+    set imap($sfname) [list $afnameo $afnamed]
+    return
+}
+
+# ::doctools::_format --
+#
+#	Convert some text in doctools format
+#	according to the configuration in the object.
+#
+# Arguments:
+#	name	Name of the doctools object to use
+#	text	Text to convert.
+#
+# Results:
+#	The conversion result.
+
+proc ::doctools::_format {name text} {
+    upvar #0 ::doctools::doctools${name}::format format
+    if {$format == ""} {
+	return -code error "$name: No format was specified"
+    }
+
+    upvar #0 ::doctools::doctools${name}::format_ip format_ip
+    upvar #0 ::doctools::doctools${name}::chk_ip    chk_ip
+    upvar #0 ::doctools::doctools${name}::ex_ok     ex_ok
+    upvar #0 ::doctools::doctools${name}::expander  expander
+    upvar #0 ::doctools::doctools${name}::passes    passes
+    upvar #0 ::doctools::doctools${name}::msg       warnings
+
+    if {!$ex_ok}       {SetupExpander  $name}
+    if {$chk_ip == ""} {SetupChecker   $name}
+    # assert (format_ip != "")
+
+    set warnings [list]
+    if {[catch {$format_ip eval fmt_initialize}]} {
+	return -code error -errorcode {DOCTOOLS ENGINE} \
+	    "Could not initialize engine"
+    }
+    set result ""
+
+    for {
+	set p $passes ; set n 1
+    } {
+	$p > 0
+    } {
+	incr p -1 ; incr n
+    } {
+	if {[catch {$format_ip eval [list fmt_setup $n]}]} {
+	    catch {$format_ip eval fmt_shutdown}
+	    return -code error -errorcode {DOCTOOLS ENGINE} \
+		"Could not initialize pass $n of engine"
+	}
+	$chk_ip eval ck_initialize $n
+
+	if {[catch {set result [$expander expand $text]} msg]} {
+	    catch {$format_ip eval fmt_shutdown}
+	    # Filter for checker errors and reduce them to the essential message.
+
+	    if {![regexp {^Error in} $msg]}          {
+		return -code error -errorcode {DOCTOOLS INPUT} $msg
+	    }
+	    #set msg [join [lrange [split $msg \n] 2 end]]
+
+	    if {![regexp {^--> \(FmtError\) } $msg]} {
+		return -code error -errorcode {DOCTOOLS INPUT} "Doctools $msg"
+	    }
+	    set msg [lindex [split $msg \n] 0]
+	    regsub {^--> \(FmtError\) } $msg {} msg
+
+	    return -code error -errorcode {DOCTOOLS INPUT} $msg
+	}
+
+	$chk_ip eval ck_complete
+    }
+
+    if {[catch {set result [$format_ip eval [list fmt_postprocess $result]]}]} {
+	return -code error -errorcode {DOCTOOLS ENGINE} \
+	    "Unable to post process final result"
+    }
+    if {[catch {$format_ip eval fmt_shutdown}]} {
+	return -code error -errorcode {DOCTOOLS ENGINE} \
+	    "Could not shut engine down"
+    }
+    return $result
+
+}
+
+# ::doctools::_search --
+#
+#	Add a search path to the object.
+#
+# Arguments:
+#	name	Name of the doctools object to extend
+#	path	Search path to add.
+#
+# Results:
+#	None.
+
+proc ::doctools::_search {name path} {
+    if {![file exists      $path]} {return -code error "$name search: path does not exist"}
+    if {![file isdirectory $path]} {return -code error "$name search: path is not a directory"}
+    if {![file readable    $path]} {return -code error "$name search: path cannot be read"}
+
+    upvar #0 ::doctools::doctools${name}::paths paths
+    set paths [linsert $paths 0 $path]
+    return
+}
+
+# ::doctools::_warnings --
+#
+#	Return the warning accumulated during the last invocation of 'format'.
+#
+# Arguments:
+#	name	Name of the doctools object to query
+#
+# Results:
+#	A list of warnings.
+
+proc ::doctools::_warnings {name} {
+    upvar #0 ::doctools::doctools${name}::msg msg
+    return $msg
+}
+
+# ::doctools::_parameters --
+#
+#	Returns a list containing the parameters provided
+#	by the selected formatting engine.
+#
+# Arguments:
+#	name	Name of the doctools object to query
+#
+# Results:
+#	A list of parameter names
+
+proc ::doctools::_parameters {name} {
+    upvar #0 ::doctools::doctools${name}::param param
+    return $param
+}
+
+# ::doctools::_setparam --
+#
+#	Set a named engine parameter to a value.
+#
+# Arguments:
+#	name	Name of the doctools object to query
+#	param	Name of the parameter to set.
+#	value	Value to set the parameter to.
+#
+# Results:
+#	None.
+
+proc ::doctools::_setparam {name param value} {
+    upvar #0 ::doctools::doctools${name}::format_ip format_ip
+
+    if {$format_ip == {}} {
+	return -code error \
+		"Unable to set parameters without a valid format"
+    }
+
+    $format_ip eval [list fmt_varset $param $value]
+    return
+}
+
+##########################
+# Support commands
+
+# ::doctools::LookupFormat --
+#
+#	Search a format definition file based upon its name
+#
+# Arguments:
+#	name	Name of the doctools object to use
+#	format	Name of the format to look for.
+#
+# Results:
+#	The file containing the format definition
+
+proc ::doctools::LookupFormat {name format} {
+    # Order of searching
+    # 1) Is the name of the format an existing file ?
+    #    If yes, take this file.
+    # 2) Look for the file in the directories given to the object itself..
+    # 3) Look for the file in the standard directories of this package.
+
+    if {[file exists $format] && [file isfile $format] } {
+      return $format
+    }
+
+    upvar #0 ::doctools::doctools${name}::paths opaths
+    foreach path $opaths {
+	set f [file join $path fmt.$format]
+	if {[file exists $f] && [file isfile $f]} {
+	    return $f
+	}
+    }
+
+    variable paths
+    foreach path $paths {
+	set f [file join $path fmt.$format]
+	if {[file exists $f] && [file isfile $f]} {
+	    return $f
+	}
+    }
+
+    return -code error "Unknown format \"$format\""
+}
+
+# ::doctools::SetupFormatter --
+#
+#	Create and initializes an interpreter containing a
+#	formatting engine
+#
+# Arguments:
+#	name	Name of the doctools object to manipulate
+#	format	Name of file containing the code of the engine
+#
+# Results:
+#	None.
+
+proc ::doctools::SetupFormatter {name format} {
+
+    # Create and initialize the interpreter first.
+    # Use a transient variable. Interrogate the
+    # engine and check its response. Bail out in
+    # case of errors. Only if we pass the checks
+    # we tear down the old engine and make the new
+    # one official.
+
+    variable here
+    set mpip [interp create -safe] ; # interpreter for the formatting engine
+    $mpip eval [list set auto_path $::auto_path]
+    #set mpip [interp create] ; # interpreter for the formatting engine
+
+    $mpip invokehidden source [file join $here api.tcl]
+    #$mpip eval [list source [file join $here api.tcl]]
+    interp alias $mpip dt_source   {} ::doctools::Source  $mpip [file dirname $format]
+    interp alias $mpip dt_read     {} ::doctools::Read    $mpip [file dirname $format]
+    interp alias $mpip dt_package  {} ::doctools::Package $mpip
+    interp alias $mpip file        {} ::doctools::FileOp  $mpip
+    interp alias $mpip puts_stderr {} ::puts stderr
+    interp alias $mpip puts_stdout {} ::puts stdout
+    $mpip invokehidden source $format
+    #$mpip eval [list source $format]
+
+    # Check the engine for useability in doctools.
+
+    foreach api {
+	fmt_numpasses
+	fmt_initialize
+	fmt_setup
+	fmt_postprocess
+	fmt_shutdown
+	fmt_listvariables
+	fmt_varset
+    } {
+	if {[$mpip eval [list info commands $api]] == {}} {
+	    interp delete $mpip
+	    error "$format error: API incomplete, cannot use this engine"
+	}
+    }
+    if {[catch {
+	set passes [$mpip eval fmt_numpasses]
+    }]} {
+	interp delete $mpip
+	error "$format error: Unable to query for number of passes"
+    }
+    if {![string is integer $passes] || ($passes < 1)} {
+	interp delete $mpip
+	error "$format error: illegal number of passes \"$passes\""
+    }
+    if {[catch {
+	set parameters [$mpip eval fmt_listvariables]
+    }]} {
+	interp delete $mpip
+	error "$format error: Unable to query for list of parameters"
+    }
+
+    # Passed the tests. Tear down existing engine,
+    # and checker. The latter is destroyed because
+    # of its aliases into the formatter, which are
+    # now invalid. It will be recreated during the
+    # next call of 'format'.
+
+    upvar #0 ::doctools::doctools${name}::formatfile formatfile
+    upvar #0 ::doctools::doctools${name}::format_ip  format_ip
+    upvar #0 ::doctools::doctools${name}::chk_ip     chk_ip
+    upvar #0 ::doctools::doctools${name}::expander   expander
+    upvar #0 ::doctools::doctools${name}::passes     xpasses
+    upvar #0 ::doctools::doctools${name}::param      xparam
+
+    if {$chk_ip != {}}    {interp delete $chk_ip}
+    if {$format_ip != {}} {interp delete $format_ip}
+
+    set chk_ip    ""
+    set format_ip ""
+
+    # Now link engine API into it.
+
+    interp alias $mpip dt_file      {} ::doctools::GetFile      $name
+    interp alias $mpip dt_mainfile  {} ::doctools::GetMainFile  $name
+    interp alias $mpip dt_fileid    {} ::doctools::GetFileId    $name
+    interp alias $mpip dt_ibase     {} ::doctools::GetIBase     $name
+    interp alias $mpip dt_module    {} ::doctools::GetModule    $name
+    interp alias $mpip dt_copyright {} ::doctools::GetCopyright $name
+    interp alias $mpip dt_format    {} ::doctools::GetFormat    $name
+    interp alias $mpip dt_user      {} ::doctools::GetUser      $name
+    interp alias $mpip dt_lnesting  {} ::doctools::ListLevel    $name
+    interp alias $mpip dt_fmap      {} ::doctools::MapFile      $name
+    interp alias $mpip dt_imgsrc    {} ::doctools::ImgSrc       $name
+    interp alias $mpip dt_imgdst    {} ::doctools::ImgDst       $name
+    interp alias $mpip dt_imgdata   {} ::doctools::ImgData      $name
+    interp alias $mpip file         {} ::doctools::FileCmd
+
+    foreach cmd {cappend cget cis cname cpop cpush ctopandclear cset lb rb} {
+	interp alias $mpip ex_$cmd {} $expander $cmd
+    }
+
+    set format_ip  $mpip
+    set formatfile $format
+    set xpasses    $passes
+    set xparam     $parameters
+    return
+}
+
+# ::doctools::SetupChecker --
+#
+#	Create and initializes an interpreter for checking the usage of
+#	doctools formatting commands
+#
+# Arguments:
+#	name	Name of the doctools object to manipulate
+#
+# Results:
+#	None.
+
+proc ::doctools::SetupChecker {name} {
+    # Create an interpreter for checking the usage of doctools formatting commands
+    # and initialize it: Link it to the interpreter doing the formatting, the
+    # expander object and the configuration information. All of which
+    # is accessible through the token/handle (name of state/object array).
+
+    variable here
+
+    upvar #0 ::doctools::doctools${name}::chk_ip    chk_ip
+    if {$chk_ip != ""} {return}
+
+    upvar #0 ::doctools::doctools${name}::expander  expander
+    upvar #0 ::doctools::doctools${name}::format_ip format_ip
+
+    set chk_ip [interp create] ; # interpreter hosting the formal format checker
+
+    # Make configuration available through command, then load the code base.
+
+    foreach {cmd ckcmd} {
+	dt_search     SearchPaths
+	dt_deprecated Deprecated
+	dt_error      FmtError
+	dt_warning    FmtWarning
+	dt_where      Where
+	dt_file       GetFile
+    } {
+	interp alias $chk_ip $cmd {} ::doctools::$ckcmd $name
+    }
+    $chk_ip eval [list source [file join $here checker.tcl]]
+
+    # Simple expander commands are directly routed back into it, no
+    # checking required.
+
+    foreach cmd {cappend cget cis cname cpop cpush ctopandclear cset lb rb} {
+	interp alias $chk_ip $cmd {} $expander $cmd
+    }
+
+    # Link the formatter commands into the checker. We use the prefix
+    # 'fmt_' to distinguish them from the checking commands.
+
+    foreach cmd {
+	manpage_begin moddesc titledesc copyright manpage_end require
+	description section para list_begin list_end lst_item call
+	bullet enum example example_begin example_end see_also
+	keywords nl arg cmd opt comment sectref syscmd method option
+	widget fun type package class var file uri usage term const
+	arg_def cmd_def opt_def tkoption_def emph strong plain_text
+	namespace subsection category image
+    } {
+	interp alias $chk_ip fmt_$cmd $format_ip fmt_$cmd
+    }
+    return
+}
+
+# ::doctools::SetupExpander --
+#
+#	Create and initializes the expander for input
+#
+# Arguments:
+#	name	Name of the doctools object to manipulate
+#
+# Results:
+#	None.
+
+proc ::doctools::SetupExpander {name} {
+    upvar #0 ::doctools::doctools${name}::ex_ok    ex_ok
+    if {$ex_ok} {return}
+
+    upvar #0 ::doctools::doctools${name}::expander expander
+    ::textutil::expander $expander
+    $expander evalcmd [list ::doctools::Eval $name]
+    $expander textcmd plain_text
+    set ex_ok 1
+    return
+}
+
+# ::doctools::SearchPaths --
+#
+#	API for checker. Returns list of search paths for format
+#	definitions. Used to look for message catalogs as well.
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#
+# Results:
+#	None.
+
+proc ::doctools::SearchPaths {name} {
+    upvar #0 ::doctools::doctools${name}::paths opaths
+    variable paths
+
+    set p $opaths
+    foreach s $paths {lappend p $s}
+    return $p
+}
+
+# ::doctools::Deprecated --
+#
+#	API for checker. Returns flag determining
+#	whether visual markup is warned against, or not.
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#
+# Results:
+#	None.
+
+proc ::doctools::Deprecated {name} {
+    upvar #0 ::doctools::doctools${name}::deprecated deprecated
+    return $deprecated
+}
+
+# ::doctools::FmtError --
+#
+#	API for checker. Called when an error occurred.
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#	text	Error message
+#
+# Results:
+#	None.
+
+proc ::doctools::FmtError {name text} {
+    return -code error "(FmtError) $text"
+}
+
+# ::doctools::FmtWarning --
+#
+#	API for checker. Called when a warning was generated
+#
+# Arguments:
+#	name	Name of the doctools object
+#	text	Warning message
+#
+# Results:
+#	None.
+
+proc ::doctools::FmtWarning {name text} {
+    upvar #0 ::doctools::doctools${name}::msg msg
+    lappend msg $text
+    return
+}
+
+# ::doctools::Where --
+#
+#	API for checker. Called when the current location is needed
+#
+# Arguments:
+#	name	Name of the doctools object
+#
+# Results:
+#	List containing offset, line, column
+
+proc ::doctools::Where {name} {
+    upvar #0 ::doctools::doctools${name}::expander expander
+    return [$expander where]
+}
+
+# ::doctools::Eval --
+#
+#	API for expander. Routes the macro invocations
+#	into the checker interpreter
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#
+# Results:
+#	None.
+
+proc ::doctools::Eval {name macro} {
+    upvar #0 ::doctools::doctools${name}::chk_ip chk_ip
+
+    #puts stderr "\t\t$name [lindex [split $macro] 0]"
+
+    # Handle the [include] command directly
+    if {[string match include* $macro]} {
+	set macro [$chk_ip eval [list subst $macro]]
+	foreach {cmd filename} $macro break
+	return [ExpandInclude $name $filename]
+    }
+
+    # Rewrite the [namespace] command before passing it on.
+    # "namespace" is a special command. The interpreter the validator
+    # resides in uses the package "msgcat", which in turn uses the
+    # builtin namespace. So the builtin cannot be simply
+    # overwritten. We use a different name.
+
+    if {[string match namespace* $macro]} {
+	set macro _$macro
+    }
+    return [$chk_ip eval $macro]
+}
+
+# ::doctools::ExpandInclude --
+#
+#	Handle inclusion of files.
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#	path	Name of file to include and expand.
+#
+# Results:
+#	None.
+
+proc ::doctools::ExpandInclude {name path} {
+    upvar #0 ::doctools::doctools${name}::file file
+    upvar #0 ::doctools::doctools${name}::ibase ibase
+
+    set savedi $ibase
+    set savedf $file
+
+    set base $ibase
+    if {$base eq {}} { set base $file }
+
+    set ipath [file normalize [file join [file dirname $base] $path]]
+    if {![file exists $ipath]} {
+	set ipath $path
+	if {![file exists $ipath]} {
+	    return -code error "Unable to find include file \"$path\""
+	}
+    }
+
+    set    chan [open $ipath r]
+    set    text [read $chan]
+    close $chan
+
+    upvar #0 ::doctools::doctools${name}::expander  expander
+
+    set ibase $ipath
+    set res [$expander expand $text]
+
+    set ibase $savedi
+    set file  $savedf
+
+    return $res
+}
+
+# ::doctools::GetUser --
+#
+#	API for formatter. Returns name of current user
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#
+# Results:
+#	String, name of current user.
+
+proc ::doctools::GetUser {name} {
+    global  tcl_platform
+    return $tcl_platform(user)
+}
+
+# ::doctools::GetFile --
+#
+#	API for formatter. Returns file information
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#
+# Results:
+#	File information
+
+proc ::doctools::GetFile {name} {
+
+    #puts stderr "GetFile $name"
+
+    upvar #0 ::doctools::doctools${name}::file file
+
+    #puts stderr "ok $file"
+    return $file
+}
+
+proc ::doctools::GetMainFile {name} {
+
+    #puts stderr "GetMainFile $name"
+
+    upvar #0 ::doctools::doctools${name}::mainfile mfile
+
+    #puts stderr "ok $mfile"
+    return $mfile
+}
+
+# ::doctools::GetFileId --
+#
+#	API for formatter. Returns file information (truncated to stem of filename)
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#
+# Results:
+#	File information
+
+proc ::doctools::GetFileId {name} {
+    return [file rootname [file tail [GetFile $name]]]
+}
+
+proc ::doctools::GetIBase {name} {
+    upvar #0 ::doctools::doctools${name}::file file
+    upvar #0 ::doctools::doctools${name}::ibase ibase
+
+    set base $ibase
+    if {$base eq {}} { set base $file }
+    return $base
+}
+
+# ::doctools::FileCmd --
+#
+#	API for formatter. Restricted implementation of file.
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#
+# Results:
+#	Module information
+
+proc ::doctools::FileCmd {cmd args} {
+    switch -exact -- $cmd {
+	split    {return [eval file split    $args]}
+	join     {return [eval file join     $args]}
+	tail     {return [eval file tail     $args]}
+	rootname {return [eval file rootname $args]}
+    }
+    return -code error "Illegal subcommand: $cmd $args"
+}
+
+# ::doctools::GetModule --
+#
+#	API for formatter. Returns module information
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#
+# Results:
+#	Module information
+
+proc ::doctools::GetModule {name} {
+    upvar #0 ::doctools::doctools${name}::module module
+    return   $module
+}
+
+# ::doctools::GetCopyright --
+#
+#	API for formatter. Returns copyright information
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#
+# Results:
+#	Copyright information
+
+proc ::doctools::GetCopyright {name} {
+    upvar #0 ::doctools::doctools${name}::copyright copyright
+    return   $copyright
+}
+
+# ::doctools::GetFormat --
+#
+#	API for formatter. Returns format information
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#
+# Results:
+#	Format information
+
+proc ::doctools::GetFormat {name} {
+    upvar #0 ::doctools::doctools${name}::format format
+    return $format
+}
+
+# ::doctools::ListLevel --
+#
+#	API for formatter. Returns number of open lists
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#
+# Results:
+#	Boolean flag.
+
+proc ::doctools::ListLevel {name} {
+    upvar #0 ::doctools::doctools${name}::chk_ip chk_ip
+    return [$chk_ip eval LNest]
+}
+
+# ::doctools::MapFile --
+#
+#	API for formatter. Maps symbolic to actual filename in a doctools
+#	item. If no mapping is found it is assumed that the symbolic name
+#	is also the actual name.
+#
+# Arguments:
+#	name	Name of the doctools object to query.
+#	fname	Symbolic name of the file.
+#
+# Results:
+#	Actual name of the file.
+
+proc ::doctools::MapFile {name fname} {
+    upvar #0 ::doctools::doctools${name}::map map
+
+    #parray map
+
+    if {[info exists map($fname)]} {
+	return $map($fname)
+    }
+    return $fname
+}
+
+# ::doctools::Img{Src,Dst} --
+#
+#	API for formatter. Maps symbolic to actual image in a doctools
+#	item. Returns nothing if no mapping is found.
+#
+# Arguments:
+#	name		Name of the doctools object to query.
+#	iname		Symbolic name of the image file.
+#	extensions	List of acceptable file extensions.
+#
+# Results:
+#	Actual name of the file.
+
+proc ::doctools::ImgData {name iname extensions} {
+
+    # The system searches for the image relative to the current input
+    # file, and the current main file
+
+    upvar #0 ::doctools::doctools${name}::imap imap
+
+    #parray imap
+
+    foreach e $extensions {
+	if {[info exists imap($iname.$e)]} {
+	    foreach {origin dest} $imap($iname.$e) break
+
+	    set f   [open $origin r]
+	    set img [read $f]
+	    close   $f
+
+	    return $img
+	}
+    }
+    return {}
+}
+
+proc ::doctools::ImgSrc {name iname extensions} {
+
+    # The system searches for the image relative to the current input
+    # file, and the current main file
+
+    upvar #0 ::doctools::doctools${name}::imap imap
+
+    #parray imap
+
+    foreach e $extensions {
+	if {[info exists imap($iname.$e)]} {
+	    foreach {origin dest} $imap($iname.$e) break
+	    return $origin
+	}
+    }
+    return {}
+}
+
+proc ::doctools::ImgDst {name iname extensions} {
+    # The system searches for the image relative to the current input
+    # file, and the current main file
+
+    upvar #0 ::doctools::doctools${name}::imap imap
+
+    #parray imap
+
+    foreach e $extensions {
+	if {[info exists imap($iname.$e)]} {
+	    foreach {origin dest} $imap($iname.$e) break
+	    file mkdir [file dirname $dest]
+	    file copy -force $origin $dest
+	    return $dest
+	}
+    }
+    return {}
+}
+
+# ::doctools::Source --
+#
+#	API for formatter. Used by engine to ask for
+#	additional script files support it.
+#
+# Arguments:
+#	name	Name of the doctools object to change.
+#
+# Results:
+#	Boolean flag.
+
+proc ::doctools::Source {ip path file} {
+    #puts stderr "$ip (source $path $file)"
+
+    $ip invokehidden source [file join $path [file tail $file]]
+    #$ip eval [list source [file join $path [file tail $file]]]
+    return
+}
+
+proc ::doctools::Read {ip path file} {
+    #puts stderr "$ip (read $path $file)"
+
+    return [read [set f [open [file join $path [file tail $file]]]]][close $f]
+}
+
+proc ::doctools::Locate {p} {
+    # @mdgen NODEP: doctools::__undefined__
+    catch {package require doctools::__undefined__}
+
+    #puts stderr "auto_path = [join $::auto_path \n]"
+
+    # Check if requested package is in the list of loadable packages.
+    # Then get the highest possible version, and then the index script
+
+    if {[lsearch -exact [package names] $p] < 0} {
+	return -code error "Unknown package $p"
+    }
+
+    set v  [lindex [lsort -increasing [package versions $p]] end]
+
+    #puts stderr "Package $p = $v"
+
+    return [package ifneeded $p $v]
+}
+
+proc ::doctools::FileOp {ip args} {
+    #puts stderr "$ip (file $args)"
+    # -- FUTURE -- disallow unsafe operations --
+
+    return [eval [linsert $args 0 file]]
+}
+
+proc ::doctools::Package {ip pkg} {
+    #puts stderr "$ip package require $pkg"
+
+    set indexScript [Locate $pkg]
+
+    $ip expose source
+    $ip expose load
+    $ip eval		$indexScript
+    $ip hide   source
+    $ip hide   load
+    #$ip eval [list source [file join $path [file tail $file]]]
+    return
+}
+
+#------------------------------------
+# Module initialization
+
+namespace eval ::doctools {
+    # Reverse order of searching. First to search is specified last.
+
+    # FOO/doctools.tcl
+    # => FOO/mpformats
+
+    #catch {search [file join $here                lib doctools mpformats]}
+    #catch {search [file join [file dirname $here] lib doctools mpformats]}
+    catch {search [file join $here                             mpformats]}
+}
+
+package provide doctools 1.5.6
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_common.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_common.tcl
new file mode 100644
index 00000000..6f80fd59
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_common.tcl
@@ -0,0 +1,316 @@
+# -*- tcl -*-
+#
+# _common.tcl
+#
+# (c) 2001 Andreas Kupries <andreas_kupries@sourceforge.net>
+# (c) 2002 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+################################################################
+# The code here contains general definitions for API functions and
+# state information. They are used by several formatters to simplify
+# their own code.
+
+global    state
+array set state {}
+
+proc fmt_initialize {} {
+    global    state
+    unset     state
+
+    set state(pass)   unknown ; # Not relevant before a pass
+    set state(begun)  unknown ; # is active
+    set state(mdesc)  {}      ; # Text, module desciption
+    #set state(tdesc) {}      ; # Text, title of manpage
+    set state(copyright) {}   ; # Text, copyright assignment (list)
+    return
+}
+
+proc fmt_shutdown      {}             {return}
+proc fmt_numpasses     {}             {return 2}
+proc fmt_postprocess   {text}         {return $text}
+proc fmt_plain_text    {text}         {return $text}
+proc fmt_listvariables {}             {return {}}
+proc fmt_varset        {varname text} {return}
+
+proc fmt_setup {n} {
+    # Called to setup a pass through the input.
+
+    global state
+    set    state(pass)  $n  ; # We are in pass 'n' through the text.
+    set    state(begun) 0   ; # No manpage_begin yet
+
+    if {$n == 1} {c_xref_init}
+
+    SetPassProcs $n
+    return
+}
+
+################################################################
+# Functions made available to the formatter to access the common
+# state managed here.
+
+proc c_inpass {} {global state ; return $state(pass)}
+
+proc c_begin {} {global state ; set     state(begun) 1 ; return}
+proc c_begun {} {global state ; return $state(begun)}
+
+proc c_get_module {}     {global state ; return $state(mdesc)}
+proc c_set_module {text} {global state ; set     state(mdesc) $text ; return}
+
+proc c_set_title {text} {global state ; set state(tdesc) $text ; return}
+proc c_get_title {} {
+    global state
+    if {![info exists state(tdesc)]} {
+	return $state(mdesc)
+    }
+    return $state(tdesc)
+}
+
+proc c_copyrightsymbol {} {return "(c)"}
+proc c_set_copyright {text} {global state ; lappend state(copyright) $text ; return}
+proc c_get_copyright {} {
+    return [join [c_get_copyright_r] \n]
+}
+proc c_get_copyright_r {} {
+    global state
+
+    set cc $state(copyright)
+    if {$cc == {}} {set cc [dt_copyright]}
+    if {$cc == {}} {return {}}
+
+    set stmts {}
+    set re {^Copyright +(?:\(c\)|\\\(co|&copy;)? *(.+)$}
+    foreach stmt $cc {
+	if { [string equal -nocase "public domain" [string trim $stmt]] } {
+            lappend stmts "Public domain"
+	} elseif { [regexp -nocase -- $re $stmt -> stmt] } {
+            lappend stmts $stmt
+	} else {
+            lappend stmts "Copyright [c_copyrightsymbol] $stmt"
+	}
+    }
+
+    return $stmts
+}
+
+proc c_provenance {} {
+    return "Generated from file '[file tail [dt_ibase]]' by tcllib/doctools with format '[dt_format]'"
+}
+
+################################################################
+# Manage pass-dependent procedure definitions.
+
+global PassProcs
+
+# pass $passNo procName procArgs { body  } --
+#	Specifies procedure definition for pass $n.
+#
+proc c_pass {pass proc arguments body} {
+    global  PassProcs
+    lappend PassProcs($pass) $proc $arguments $body
+}
+proc SetPassProcs {pass} {
+    global PassProcs
+    foreach {proc args body} $PassProcs($pass) {
+	proc $proc $args $body
+    }
+}
+
+
+################################################################
+# Manage a set of buffers to hold information between passes.
+# Each buffer holds a list of lines.
+
+global Buffers
+
+# holdBuffers buffer ? buffer ...? --
+#	Declare a list of hold buffers,
+#	to collect data in one pass and output it later.
+#
+proc c_holdBuffers {args} {
+    global Buffers
+    foreach arg $args {
+	set Buffers($arg) [list]
+    }
+}
+
+proc c_holdRemove {args} {
+    global Buffers
+    foreach arg $args {
+	catch {unset Buffers($arg)}
+    }
+    return
+}
+
+# hold buffer text --
+#	Append text to named buffer
+#
+proc c_hold {buffer entry} {
+    global  Buffers
+    lappend Buffers($buffer) $entry
+
+    #puts "$buffer -- $entry"
+    return
+}
+
+proc c_holding {buffer} {
+    global  Buffers
+    set l 0
+    catch {set l [llength $Buffers($buffer)]}
+    return $l
+}
+
+# held buffer --
+#	Returns current contents of named buffer and empty the buffer.
+#
+proc c_held {buffer} {
+    global Buffers
+    set content [join $Buffers($buffer) "\n"]
+    set Buffers($buffer) [list]
+    return $content
+}
+
+######################################################################
+# Nested counter
+
+global counters cnt
+set    counters [list]
+set    cnt 0
+
+proc c_cnext {} {global cnt ; incr cnt}
+proc c_cinit {} {
+    global counters cnt
+    set counters [linsert $counters 0 $cnt]
+    set cnt      0
+    return
+}
+proc c_creset {} {
+    global counters cnt
+    set cnt      [lindex $counters 0]
+    set counters [lrange $counters 1 end]
+    return
+}
+
+
+######################################################################
+# Utilities.
+#
+
+proc NOP {args} { }		;# do nothing
+proc NYI {{message {}}} {
+    return -code error [append message " Not Yet Implemented"]
+}
+
+######################################################################
+# Cross-reference tracking (for a single file).
+#
+global SectionNames	;# array mapping 'section name' to 'reference id'
+global SectionList      ;# List of sections, their ids, and levels, in
+set    SectionList {}   ;# order of definition.
+
+proc c_sections {} {
+    global SectionList
+    set    SectionList
+}
+
+proc c_sectionKnown {id} {
+    global SectionNames
+    info exists SectionNames($id)
+}
+
+# sectionId --
+#	Format section name as an XML ID.
+#
+proc c_sectionId {name} {
+    # Identical to '__sid' in checker.tcl
+    regsub -all {[ 	]+} [string tolower [string trim $name]] _ id
+    regsub -all {"} $id _ id ; # "
+    return $id
+}
+    
+# possibleReference text gi --
+#	Check if $text is a potential cross-reference;
+#	if so, format as a reference;
+#	otherwise format as a $gi element.
+#
+proc c_possibleReference {text gi {label {}}} {
+    global SectionNames
+    if {![string length $label]} {set label $text}
+    set id [c_sectionId $text]
+    if {[info exists SectionNames($id)]} {
+    	return "[startTag ref refid $id]$label[endTag ref]"
+    } else {
+    	return [wrap $label $gi]
+    }
+}
+
+proc c_newSection {name level location {id {}}} {
+    global SectionList SectionNames
+    if {$id == {}} {
+	set id [c_sectionId $name]
+    }
+    set SectionNames($id) .
+    set SectionList [linsert $SectionList $location $name $id $level]
+    return
+}
+
+proc c_clrSections {} {
+    global SectionList SectionNames
+    set    SectionList {}
+    catch {unset SectionNames}
+}
+
+######################################################################
+# Conversion specification.
+#
+# Two-pass processing.  The first pass collects text for the
+# SYNOPSIS, SEE ALSO, and KEYWORDS sections, and the second pass
+# produces output.
+#
+
+c_holdBuffers synopsis see_also keywords precomments category
+
+################################################################
+# Management of see-also and keyword cross-references
+
+proc c_xref_init {} {
+    global seealso  seealso__  ; set seealso  [list] ; catch {unset seealso__}  ; array set seealso__  {}
+    global keywords keywords__ ; set keywords [list] ; catch {unset keywords__} ; array set keywords__ {}
+    global category            ; set category ""
+}
+
+proc c_xref_seealso  {} {global seealso  ; return $seealso}
+proc c_xref_keywords {} {global keywords ; return $keywords}
+proc c_xref_category {} {global category ; return $category}
+
+c_pass 1 fmt_category {text} {
+    global category
+    set    category $text
+    return
+}
+
+c_pass 1 fmt_see_also {args} {
+    global seealso seealso__
+    foreach ref $args {
+	if {[info exists seealso__($ref)]} continue
+	lappend seealso $ref
+	set     seealso__($ref) .
+    }
+    return
+}
+
+c_pass 1 fmt_keywords {args} {
+    global keywords keywords__
+    foreach ref $args {
+	if {[info exists keywords__($ref)]} continue
+	lappend keywords $ref
+	set     keywords__($ref) .
+    }
+    return
+}
+
+c_pass 2 fmt_category {args} NOP
+c_pass 2 fmt_see_also {args} NOP
+c_pass 2 fmt_keywords {args} NOP
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_html.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_html.tcl
new file mode 100644
index 00000000..8999b6d4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_html.tcl
@@ -0,0 +1,199 @@
+# -*- tcl -*-
+# Copyright (c) 2001-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# Helper rules for the creation of the memchan website from the .exp files.
+# General formatting instructions ...
+#
+# htmlEscape text --
+#	Replaces HTML markup characters in $text with the
+#	appropriate entity references.
+#
+
+global textMap;
+set    textMap {
+    &    &amp;    <    &lt;     >    &gt;       
+    \xa0 &nbsp;   \xb0 &deg;    \xc0 &Agrave; \xd0 &ETH;    \xe0 &agrave; \xf0 &eth;
+    \xa1 &iexcl;  \xb1 &plusmn; \xc1 &Aacute; \xd1 &Ntilde; \xe1 &aacute; \xf1 &ntilde;
+    \xa2 &cent;	  \xb2 &sup2;   \xc2 &Acirc;  \xd2 &Ograve; \xe2 &acirc;  \xf2 &ograve;
+    \xa3 &pound;  \xb3 &sup3;   \xc3 &Atilde; \xd3 &Oacute; \xe3 &atilde; \xf3 &oacute;
+    \xa4 &curren; \xb4 &acute;  \xc4 &Auml;   \xd4 &Ocirc;  \xe4 &auml;   \xf4 &ocirc;
+    \xa5 &yen;	  \xb5 &micro;  \xc5 &Aring;  \xd5 &Otilde; \xe5 &aring;  \xf5 &otilde;
+    \xa6 &brvbar; \xb6 &para;   \xc6 &AElig;  \xd6 &Ouml;   \xe6 &aelig;  \xf6 &ouml;
+    \xa7 &sect;	  \xb7 &middot; \xc7 &Ccedil; \xd7 &times;  \xe7 &ccedil; \xf7 &divide;
+    \xa8 &uml;	  \xb8 &cedil;  \xc8 &Egrave; \xd8 &Oslash; \xe8 &egrave; \xf8 &oslash;
+    \xa9 &copy;	  \xb9 &sup1;   \xc9 &Eacute; \xd9 &Ugrave; \xe9 &eacute; \xf9 &ugrave;
+    \xaa &ordf;	  \xba &ordm;   \xca &Ecirc;  \xda &Uacute; \xea &ecirc;  \xfa &uacute;
+    \xab &laquo;  \xbb &raquo;  \xcb &Euml;   \xdb &Ucirc;  \xeb &euml;   \xfb &ucirc;
+    \xac &not;	  \xbc &frac14; \xcc &Igrave; \xdc &Uuml;   \xec &igrave; \xfc &uuml;
+    \xad &shy;	  \xbd &frac12; \xcd &Iacute; \xdd &Yacute; \xed &iacute; \xfd &yacute;
+    \xae &reg;	  \xbe &frac34; \xce &Icirc;  \xde &THORN;  \xee &icirc;  \xfe &thorn;
+    \xaf &hibar;  \xbf &iquest; \xcf &Iuml;   \xdf &szlig;  \xef &iuml;   \xff &yuml;
+    {"} &quot;
+} ; # " make the emacs highlighting code happy.
+
+# Handling of HTML delimiters in content:
+#
+# Plain text is initially passed through unescaped;
+# internally-generated markup is protected by preceding it with \1.
+# The final PostProcess step strips the escape character from
+# real markup and replaces markup characters from content
+# with entity references.
+#
+
+global   markupMap
+set      markupMap { {&} {\1&}  {<} {\1<}  {>} {\1>} {"} {\1"} } 
+global   finalMap
+set      finalMap $textMap
+lappend  finalMap {\1&} {&}  {\1<} {<}  {\1>} {>} {\1"} {"}
+
+
+proc htmlEscape {text} {
+    global textMap
+    return [string map $textMap $text]
+}
+
+proc fmt_postprocess {text} {
+    global finalMap
+
+    if 0 {
+	puts_stderr ____________________________________________________________
+	puts_stderr $text
+	puts_stderr ____________________________________________________________
+    }
+
+    # Put protected characters into their final form.
+    set text [string map $finalMap $text]
+    # Remove leading/trailing whitespace from paragraphs.
+    regsub -all "<p>\[\t\n \]*" $text {<p>} text
+    regsub -all "\[\t\n \]*</p>" $text {</p>} text
+    # Remove trailing linebreaks from paragraphs.
+    while {[regsub -all "<br>\[\t\n \]*</p>" $text {</p>} text]} continue
+    # Remove empty paragraphs
+    regsub -all "<p>\[\t\n \]*</p>" $text {} text
+    # Separate paragraphs
+    regsub -all "</p><p>" $text "</p>\n<p>" text
+    # Separate bigger structures
+    foreach outer {div p dl ul ol} {
+	foreach inner {div p dl ul ol} {
+	    regsub -all "</${outer}><${inner}"  $text "</${outer}>\n<${inner}"  text
+	    regsub -all "</${outer}></${inner}" $text "</${outer}>\n</${inner}" text
+	}
+    }
+    regsub -all "<li><dl"   $text "<li>\n<dl"  text
+    regsub -all "<li><ol"   $text "<li>\n<ol"  text
+    regsub -all "<li><ul"   $text "<li>\n<ul"  text
+    regsub -all "</dl></li" $text "</dl>\n</li" text
+    regsub -all "</ol></li" $text "</ol>\n</li" text
+    regsub -all "</ul></li" $text "</ul>\n</li" text
+    # Remove empty lines.
+    regsub -all "\n\n\n*" $text \n text
+
+    if 0 {
+	puts_stderr @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+	puts_stderr $text
+	puts_stderr @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    }
+
+    return [string trimleft $text]
+}
+
+# markup text --
+#	Protect markup characters in $text with \1.
+#	These will be stripped out in PostProcess.
+#
+proc markup {text} {
+    global markupMap
+    return [string map $markupMap $text]
+}
+
+proc use_bg {} {
+    set c [bgcolor]
+    #puts stderr "using $c"
+    if {$c == {}} {return ""}
+    return bgcolor=$c
+}
+
+proc MakeLink {l t} { link $l $t }
+
+proc nbsp   {}         {return [markup "&nbsp;"]}
+proc p      {}         {return [markup <p>]}
+proc ptop   {}         {return [markup "<p valign=top>"]}
+proc td     {}         {return [markup "<td [use_bg]>"]}
+proc trtop  {}         {return [markup "<tr valign=top [use_bg]>"]}
+proc tr     {}         {return [markup "<tr            [use_bg]>"]}
+proc sect   {s}        {return [markup <b>]$s[markup </b><br><hr>]}
+proc link   {text url} {return [markup "<a href=\"$url\">"]$text[markup </a>]}
+proc table  {}         {return [markup "<table [border] width=100% cellspacing=0 cellpadding=0>"]}
+proc btable {}         {return [markup "<table border=1 width=100% cellspacing=0 cellpadding=0>"]}
+proc stable {}         {return [markup "<table [border] cellspacing=0 cellpadding=0>"]}
+
+proc link   {text url} {return [markup "<a href=\"$url\">"]$text[markup </a>]}
+
+proc tcl_cmd {cmd} {return "[markup <b>]\[$cmd][markup </b>]"}
+proc wget    {url} {exec /usr/bin/wget -q -O - $url 2>/dev/null}
+
+proc url {tag text url} {
+    set body {
+	switch -exact -- $what {
+	    link {return {\1<a href="%url%"\1>%text%\1</a\1>}} ; ## TODO - markup
+	    text {return {%text%}}
+	    url  {return {%url%}}
+	}
+    }
+    proc $tag {{what link}} [string map [list %text% $text %url% $url] $body]
+}
+
+proc img {tag alt img} {
+    proc $tag {} [list return "\1<img alt=\"$alt\" src=\"$img\"\1>"]
+}
+
+proc imagelink {alt img} {
+    return [markup "<img alt=\"$alt\" src=\"$img\">"]
+}
+
+proc protect {text} {return [string map [list & "&amp;" < "&lt;" > "&gt;"] $text]}
+
+proc strong {text}       {tag_ strong $text}
+proc em     {text}       {tag_ em     $text}
+proc bold   {text class} {tag_ b      $text class $class}
+proc italic {text class} {tag_ i      $text class $class}
+proc span   {text class} {tag_ span   $text class $class}
+
+proc tag  {t} {return [markup <$t>]}
+proc taga {t av} {
+    # av = attribute value ...
+    set avt [list]
+    foreach {a v} $av {lappend avt "$a=\"$v\""}
+    return [markup "<$t [join $avt]>"]
+}
+proc tag/ {t} {return [markup </$t>]}
+proc tag_ {t block args} {
+    # args = key value ...
+    if {$args == {}} {return "[tag $t]$block[tag/ $t]"}
+    return "[taga $t $args]$block[tag/ $t]"
+}
+proc tag* {t args} {
+    if {[llength $args]} {
+	taga $t $args
+    } else {
+	tag $t
+    }
+}
+
+proc ht_comment {text}   {
+    return "[markup <]!-- [htmlEscape [join [split $text \n] "   -- "]]\n   --[markup >]"
+}
+
+# wrap content gi --
+#	Returns $content wrapped inside <$gi> ... </$gi> tags.
+#
+proc wrap {content gi} {
+    return "[tag $gi]${content}[tag/ $gi]"
+}
+proc startTag {x args} {if {[llength $args]} {taga $x $args} else {tag $x}}
+proc endTag   {x} {tag/ $x}
+
+
+proc anchor {name text} {
+    return [taga a [list name $name]]$text[tag/ a]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_idx_common.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_idx_common.tcl
new file mode 100644
index 00000000..ca0c4c0d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_idx_common.tcl
@@ -0,0 +1,31 @@
+# -*- tcl -*-
+#
+# _idx_common.tcl
+#
+# (c) 2003 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+################################################################
+# The code here contains general definitions for API functions and
+# state information. They are used by several formatters to simplify
+# their own code.
+
+proc idx_initialize    {}             {return}
+proc idx_shutdown      {}             {return}
+proc idx_numpasses     {}             {return 1}
+proc idx_postprocess   {text}         {return $text}
+proc idx_setup         {n}            {return}
+proc idx_listvariables {}             {return {}}
+proc idx_varset        {varname text} {return}
+
+
+proc fmt_plain_text  {text} {return $text}
+
+################################################################
+# Functions made available to the formatter to access the common
+# state managed here.
+
+proc c_provenance {} {
+    return "Generated by tcllib/doctools/idx with format '[dt_format]'"
+}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_markdown.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_markdown.tcl
new file mode 100644
index 00000000..ff07ddcd
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_markdown.tcl
@@ -0,0 +1,216 @@
+# -*- tcl -*-
+##
+# Support for markdown, overrides parts of coore text.
+#
+# Copyright (c) 2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+##
+# # ## ### ##### ########
+
+# # ## ### ##### ########
+## `markdown` formatting
+
+proc SectTitle {lb title} {
+    upvar 1 $lb lines
+    lappend lines "[Hash] $title"
+    return
+}
+
+proc SubsectTitle {lb title} {
+    upvar 1 $lb lines
+    lappend lines "[Hash][Hash] $title"
+    return
+}
+
+proc Sub3Title {lb title} {
+    upvar 1 $lb lines
+    lappend lines "[Hash][Hash][Hash] $title"
+    return
+}
+
+proc Sub4Title {lb title} {
+    upvar 1 $lb lines
+    lappend lines "[Hash][Hash][Hash][Hash] $title"
+    return
+}
+
+proc _Strong {text} { return [Undr][Undr]${text}[Undr][Undr] }
+proc _Em     {text} { return [Star]${text}[Star] }
+
+##
+# # ## ### ##### ########
+##
+
+set __comments 0
+
+proc MDCInit {} { global __comments ; set __comments 0 }
+
+proc MDComment {text} {
+    global __comments
+    Text "\n[OBrk]//[format %09d [incr __comments]][CBrk]: [Hash] [OPar]$text[CPar]"
+}
+
+proc MDCDone {} {
+    TextTrimLeadingSpace
+    CloseParagraph [Verbatim]
+}
+
+##
+# # ## ### ##### ########
+##
+
+proc MakeLink {l t} { ALink $t $l } ;# - xref - todo: consolidate
+
+proc ALink {dst label} { return "[OBrk]$label[CBrk][OPar]$dst[CPar]" }
+
+proc SetAnchor {text {name {}}} {
+    if {$name == {}} { set name [Anchor $text] }
+    return "<a name='$name'></a>$text"
+}
+
+proc Anchor {text} {
+    global kwid
+    if {[info exists kwid($text)]} {
+	return "$kwid($text)"
+    }
+    return [A $text]
+}
+
+proc A {text} {
+    set anchor [regsub -all {[^a-zA-Z0-9]} [string tolower $text] {_}]
+    set anchor [regsub -all {__+} $anchor [Undr]]
+    return $anchor
+}
+
+# Generate special code sequences for markdown command characters.  At
+# the end of the render the command sequences are converted to regular
+# final form whereas all unprotected special characters are quoted.
+
+proc Back {} { return "\1\\" }
+proc Tick {} { return "\1`" }
+proc Star {} { return "\1*" }
+proc Undr {} { return "\1_" }
+proc Hash {} { return "\1#" }
+proc Plus {} { return "\1+" }
+proc Dash {} { return "\1-" }
+proc Dot  {} { return "\1." }
+proc Bang {} { return "\1!" }
+proc OBra {} { return "\1\{" }
+proc CBra {} { return "\1\}" }
+proc OBrk {} { return "\1\[" }
+proc CBrk {} { return "\1\]" }
+proc OPar {} { return "\1(" }
+proc CPar {} { return "\1)" }
+proc VBar {} { return "\1|" }
+
+proc LB  {} { return "\1\n" }
+proc LB. {} { return "\1" }
+
+proc c_copyrightsymbol {} {return "&copy;"}
+
+# Modified bulleting
+
+DIB [list [Dash] [Star] [Plus]]
+DEB [list "1[Dot]" "1[CPar]"]
+
+proc Unmark {x} {
+    lappend map "\1\n" "  \n"
+    # Marked special characters are commands. Convert into regular
+    # form. Unmarked special characters need quoting.
+    lappend map \1\\ \\
+    lappend map \1`  `
+    lappend map \1*  *
+    lappend map \1_  _
+    lappend map \1#  "#"
+    lappend map \1+  +
+    lappend map \1-  -
+    lappend map \1.  .
+    lappend map \1!  !
+    lappend map \1\{ \{
+    lappend map \1\} \}
+    lappend map \1\[ \[
+    lappend map \1\] \]
+    lappend map \1(  (
+    lappend map \1)  )
+    lappend map \1|  |
+
+    lappend map \\ \\\\
+    lappend map `  \\`
+    lappend map *  \\*
+    lappend map _  \\_
+    lappend map "#" "\\#"
+    lappend map +  \\+
+    lappend map -  \\-
+    lappend map .  \\.
+    lappend map !  \\!
+    lappend map \{ \\\{
+    lappend map \} \\\}
+    lappend map \[ \\\[
+    lappend map \] \\\]
+    lappend map (  \\(
+    lappend map )  \\)
+    lappend map | "&#124;"
+
+    #puts_stderr ZZZ(($x))
+    set x [string map $map $x]
+
+    #puts_stderr ZZZ<<$x>>
+    set x
+}
+
+# Invert handling of special characters for text specified by the
+# user, i.e. engine parameters of some kind.
+#
+# Quoted special characters are unquoted, and unquoted special
+# characters get marked/protected.
+
+proc Mark {x} {
+    # Dequote non-special specials.
+    lappend map \\\\     \\
+    lappend map \\`	 `
+    lappend map \\*	 *
+    lappend map \\_	 _
+    lappend map "\\#"	 "#"
+    lappend map \\+	 +
+    lappend map \\-	 -
+    lappend map \\.	 .
+    lappend map \\!	 !
+    lappend map \\\{	 \{
+    lappend map \\\}	 \}
+    lappend map \\\[	 \[
+    lappend map \\\]	 \]
+    lappend map \\(	 (
+    lappend map \\)	 )
+    lappend map "&#124;" |
+
+    # Protect special specials
+    lappend map \\  \1\\
+    lappend map `   \1`
+    lappend map *   \1*
+    lappend map _   \1_
+    lappend map "#" \1#
+    lappend map +   \1+
+    lappend map -   \1-
+    lappend map .   \1.
+    lappend map !   \1!
+    lappend map \{  \1\{
+    lappend map \}  \1\}
+    lappend map \[  \1\[
+    lappend map \]  \1\]
+    lappend map (   \1(
+    lappend map )   \1)
+    lappend map |   \1|
+
+    #puts_stderr ZZZ(($x))
+    set x [string map $map $x]
+
+    #puts_stderr ZZZ<<$x>>
+    set x
+}
+
+rename PostProcess PostProcessT
+proc PostProcess {text} { Unmark [PostProcessT $text] }
+
+##
+# # ## ### ##### ########
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_nroff.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_nroff.tcl
new file mode 100644
index 00000000..257ce696
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_nroff.tcl
@@ -0,0 +1,182 @@
+# -*- tcl -*-
+#
+# -- nroff commands
+#
+# Copyright (c) 2003-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+################################################################
+# nroff specific commands
+#
+# All dot-commands (f.e. .PP) are returned with a leading \n\1,
+# enforcing that they are on a new line and will be protected as markup.
+# Any empty line created because of this is filtered out in the 
+# post-processing step.
+
+
+proc nr_lp      {}          {return \n\1.LP}
+proc nr_ta      {{text {}}} {return "\1.ta$text"}
+proc nr_bld     {}          {return \1\\fB}
+proc nr_bldt    {t}         {return "\n\1.B $t\n"}
+proc nr_ul      {}          {return \1\\fI}
+proc nr_rst     {}          {return \1\\fR}
+proc nr_p       {}          {return \n\1.PP\n}
+proc nr_comment {text}      {return "\1'\1\\\" [join [split $text \n] "\n\1'\1\\\" "]"} ; # "
+proc nr_enum    {num}       {nr_item " \[$num\]"}
+proc nr_item    {{text {}}} {return "\n\1.IP$text"}
+proc nr_vspace  {}          {return \n\1.sp\n}
+proc nr_blt     {text}      {return "\n\1.TP\n$text"}
+proc nr_bltn    {n text}    {return "\n\1.TP $n\n$text"}
+proc nr_in      {}          {return \n\1.RS}
+proc nr_out     {}          {return \n\1.RE}
+proc nr_nofill  {}          {return \n\1.nf}
+proc nr_fill    {}          {return \n\1.fi}
+proc nr_title   {text}      {return "\n\1.TH $text"}
+proc nr_include {file}      {return "\n\1.so $file"}
+proc nr_bolds   {}          {return \n\1.BS}
+proc nr_bolde   {}          {return \n\1.BE}
+proc nr_read    {fn}        {return [nroffMarkup [dt_read $fn]]}
+proc nr_cs      {}          {return \n\1.CS\n}
+proc nr_ce      {}          {return \n\1.CE\n}
+
+proc nr_section {name} {
+    if {![regexp {[ 	]} $name]} {
+	return "\n\1.SH [string toupper $name]"
+    }
+    return "\n\1.SH \"[string toupper $name]\""
+}
+proc nr_subsection {name}   {
+    if {![regexp {[ 	]} $name]} {
+	return "\n\1.SS [string toupper $name]"
+    }
+    return "\n\1.SS \"[string toupper $name]\""
+}
+
+
+################################################################
+
+# Handling of nroff special characters in content:
+#
+# Plain text is initially passed through unescaped;
+# internally-generated markup is protected by preceding it with \1.
+# The final PostProcess step strips the escape character from
+# real markup and replaces unadorned special characters in content
+# with proper escapes.
+#
+
+global   markupMap
+set      markupMap [list \
+	"\\"   "\1\\" \
+	"'"    "\1'" \
+	"."    "\1." \
+	"\\\\" "\\"]
+global   finalMap
+set      finalMap [list \
+	"\1\\" "\\" \
+	"\1'"  "'" \
+	"\1."  "." \
+        "."    "\\&." \
+	"\\"   "\\\\"]
+global   textMap
+set      textMap [list "\\" "\\\\"]
+
+
+proc nroffEscape {text} {
+    global textMap
+    return [string map $textMap $text]
+}
+
+# markup text --
+#	Protect markup characters in $text.
+#	These will be stripped out in PostProcess.
+#
+proc nroffMarkup {text} {
+    global markupMap
+    return [string map $markupMap $text]
+}
+
+proc nroff_postprocess {nroff} {
+    global finalMap
+
+    # Postprocessing final nroff text.
+    # - Strip empty lines out of the text
+    # - Remove leading and trailing whitespace from lines.
+    # - Exceptions to the above: Keep empty lines and leading
+    #   whitespace when in verbatim sections (no-fill-mode)
+
+    set nfMode   [list \1.nf \1.CS]	; # commands which start no-fill mode
+    set fiMode   [list \1.fi \1.CE]	; # commands which terminate no-fill mode
+    set lines    [list]         ; # Result buffer
+    set verbatim 0              ; # Automaton mode/state
+
+    foreach line [split $nroff "\n"] {
+	#puts_stderr |[expr {$verbatim ? "VERB" : "    "}]|$line|
+
+	if {!$verbatim} {
+	    # Normal lines, not in no-fill mode.
+
+	    if {[lsearch -exact $nfMode [split $line]] >= 0} {
+		# no-fill mode starts after this line.
+		set verbatim 1
+	    }
+
+	    # Ensure that empty lines are not added.
+	    # This also removes leading and trailing whitespace.
+
+	    if {![string length $line]} {continue}
+	    set line [string trim $line]
+	    if {![string length $line]} {continue}
+
+	    if {[regexp {^\x1\\f[BI]\.} $line]} {
+		# We found confusing formatting at the beginning of
+		# the current line. We lift this line up and attach it
+		# at the end of the last line to remove this
+		# irregularity. Note that the regexp has to look for
+		# the special 0x01 character as well to be sure that
+		# the sequence in question truly is formatting.
+		# [bug-3601370] Only lift & attach if last line is not
+		# a directive
+
+		set last  [lindex   $lines end]
+		if { ! [string match "\1.*" $last] } {
+		    #puts_stderr \tLIFT
+		    set lines [lreplace $lines end end]
+		    set line "$last $line"
+		}
+	    } elseif {[string match {[']*} $line]} {
+		# Apostrophes at the beginning of a line have to be
+		# quoted to prevent misinterpretation as comments.
+		# The true comments and are quoted with \1 already and
+		# will therefore not detected by the code here.
+		# puts_stderr \tQUOTE
+		set line \1\\$line
+	    } ; # We are not handling dots at the beginning of a line here.
+	    #   # We are handling them in the finalMap which will quote _all_
+	    #   # dots in a text with a zero-width escape (\&).
+	} else {
+	    # No-fill mode. We remove trailing whitespace, but keep
+	    # leading whitespace and empty lines.
+
+	    if {[lsearch -exact $fiMode [split $line]] >= 0} {
+		# Normal mode resumes after this line.
+		set verbatim 0
+	    }
+	    set line [string trimright $line]
+	}
+	lappend lines $line
+    }
+
+    set lines [join $lines "\n"]
+
+    # Now remove all superfluous .IP commands (empty paragraphs). The
+    # first identity mapping is present to avoid smashing a man macro
+    # definition.
+
+    lappend map	\n\1.IP\n\1.\1.\n  \n\1.IP\n\1.\1.\n
+    lappend map \n\1.IP\n\1.       \n\1.
+
+    set lines [string map $map $lines]
+
+    # Return the modified result buffer
+    return [string trim [string map $finalMap $lines]]\n
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text.tcl
new file mode 100644
index 00000000..67c73beb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text.tcl
@@ -0,0 +1,184 @@
+# -*- tcl -*-
+#
+# -- Core support for text engines.
+#
+# Copyright (c) 2003-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+
+################################################################
+
+if {0} {
+    catch {rename proc proc__} msg ; puts_stderr >>$msg
+    proc__ proc {cmd argl body} {
+	puts_stderr "proc $cmd $argl ..."
+	uplevel [list proc__ $cmd $argl $body]
+    }
+}
+
+dt_package textutil::string ; # for adjust
+dt_package textutil::repeat
+dt_package textutil::adjust
+
+if {0} {
+    puts_stderr ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    rename proc {}
+    rename proc__ proc
+    puts_stderr ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+}
+
+
+proc parray_stderr {a {pattern *}} {
+    upvar 1 $a array
+    if {![array exists array]} {
+        error "\"$a\" isn't an array"
+    }
+    set maxl 0
+    foreach name [lsort [array names array $pattern]] {
+        if {[string length $name] > $maxl} {
+            set maxl [string length $name]
+        }
+    }
+    set maxl [expr {$maxl + [string length $a] + 2}]
+    foreach name [lsort [array names array $pattern]] {
+        set nameString [format %s(%s) $a $name]
+        puts_stderr "    [format "%-*s = {%s}" $maxl $nameString $array($name)]"
+    }
+}
+
+# # ## ### ##### ########
+##
+
+dt_source _text_utils.tcl
+# Formatting utilities
+
+dt_source _text_margin.tcl
+# RMargin, LMI
+
+dt_source _text_state.tcl
+# On, Off, IsOff
+
+dt_source _text_para.tcl
+# Text, Text?, TextClear, TextPlain (-> IsOff)
+
+dt_source _text_cstack.tcl
+# ContextReset, ContextPush, ContextPop (-> CAttrCurrent, ContextSet)
+
+dt_source _text_ccore.tcl
+# ContextSetup, ContextSet, ContextNew, ContextCommit, CAttrName, CAttrCurrent,
+# CAttrRef, CAttrUnset, CAttrSet, CAttrAppend, CAttrIncr, CAttrGet, CAttrHas
+
+dt_source _text_bullets.tcl
+# DIB, IBullet (-> CAttrRef)
+# DEB, EBullet (-> CAttrRef)
+
+dt_source _text_dlist.tcl
+# DListClear, Section, Subsection, CloseParagraph (-> Text?, TextClear, CAttrCurrent)
+# PostProcess
+# - SECT    (-> SectTitle)
+# - SUBSECT (-> SubsectTitle)
+# - PARA (-> TEXT context accessors)
+
+# # ## ### ##### ########
+##
+
+proc TextInitialize {} {
+    DListClear
+    TextClear
+    ContextReset
+    Off
+    ContextSetup
+    
+    # Root context
+    ContextNew Base {
+	MarginReset
+	PrefixReset
+	WPrefixReset
+	VerbatimOff
+	ListNone
+	BulletReset
+	ItemReset
+	EnumReset
+    }
+    return
+}
+
+# # ## ### ##### ########
+## `text` formatting
+
+proc SectTitle {lb title} {
+    upvar 1 $lb lines
+    #lappend lines ""
+    lappend lines $title
+    lappend lines [RepeatM = $title]
+    return
+}
+
+proc SubsectTitle {lb title} {
+    upvar 1 $lb lines
+    #lappend lines ""
+    lappend lines $title
+    lappend lines [RepeatM - $title]
+    return
+}
+
+proc Strong {text} { SplitLine $text _Strong }
+proc Em     {text} { SplitLine $text _Em }
+
+proc _Strong {text} { return *${text}* }
+proc _Em     {text} { return _${text}_ }
+
+proc SplitLine {text cmd} {
+    #puts_stderr AAA/SLI=[string map [list \1 \\1 \t \\t { } \\s] <<[join [split $text \n] >>\n<<]>>]
+    if {![string match *\n* $text]} {
+	foreach {lead content} [LeadSplit $text] break
+	return ${lead}[uplevel 1 [list $cmd $content]]
+    }
+    set r {}   
+    foreach line [split $text \n] {
+	foreach {lead content} [LeadSplit $line] break
+	if {$content == {}} {
+	    lappend r {}
+	    continue
+	}
+	lappend r ${lead}[uplevel 1 [list $cmd $content]]
+    }
+    set text [string trimright [join $r \n]]\n
+    #puts_stderr AAA/SLE=[string map [list \1 \\1 \t \\t { } \\s] <<[join [split $text \n] >>\n<<]>>]
+    return $text
+}
+
+proc LeadSplit {line} {
+    regexp {^([ \t]*)(.*)([ \t]*)$} $line -> lead content _
+    list $lead $content
+}
+
+# # ## ### ##### ########
+## Bulleting
+#
+# itembullet  = index of the bullet to use in the next itemized list
+# enumbullet  = index of the bullet to use in the next enumerated list
+
+proc EnumReset {} { CAttrSet enumbullet 0 }
+proc ItemReset {} { CAttrSet itembullet 0 }
+
+# # ## ### ##### ########
+##
+
+proc text_plain_text  {text} { TextPlain   $text }
+proc text_postprocess {text} { PostProcess $text }
+
+#return
+
+# Debugging
+proc text_postprocess {text} {
+    if {[set code [catch {
+	PostProcess $text
+    } res]]} {
+	global errorInfo errorCode
+	puts_stderr
+	puts_stderr $errorCode
+	puts_stderr $errorInfo
+	return -code $code -errorinfo $errorInfo -errorcode $errorCode $msg
+    }
+    return $res
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_bullets.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_bullets.tcl
new file mode 100644
index 00000000..53d22e36
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_bullets.tcl
@@ -0,0 +1,30 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+# _text_bullets.tcl -- Bulleting configuration and use.
+
+global itembullets      ; set itembullets      {* - # @ ~ %}
+global enumbullets      ; set enumbullets      {[%] (%) <%>}
+
+proc IB  {}        { global itembullets ; return $itembullets      }
+proc EB  {}        { global enumbullets ; return $enumbullets      }
+proc DIB {bullets} { global itembullets ; set itembullets $bullets }
+proc DEB {bullets} { global enumbullets ; set enumbullets $bullets }
+
+proc NB {bullets countervar} {
+    upvar 1 $countervar counter
+    set bullet  [lindex $bullets $counter]
+    set counter [expr {($counter + 1) % [llength $bullets]}]
+    return $bullet
+}
+
+proc ItemBullet {countervar} { upvar 1 $countervar counter ; NB [IB] counter }
+proc EnumBullet {countervar} { upvar 1 $countervar counter ; NB [EB] counter }
+
+# xref current content
+proc IBullet {} { ItemBullet [CAttrRef itembullet] }
+proc EBullet {} { EnumBullet [CAttrRef enumbullet] }
+
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_ccore.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_ccore.tcl
new file mode 100644
index 00000000..c3af1d01
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_ccore.tcl
@@ -0,0 +1,141 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+# _text_ccore.tcl -- Management of current context, and database of all contexts
+
+global nextId      ; # Counter for context generation.
+global contextData ; # In-memory database of known contexts.
+global contextName ; # Map context handles to name.
+
+global currentHandle  ; # Handle of context in 'currentContext'.
+global currentContext ; # Current context, for direct access of all attributes
+
+# # ## ### ##### ########
+## Internals
+
+proc ContextCommit {} {
+    global contextData  currentHandle             currentContext
+    set    contextData($currentHandle) [array get currentContext]
+    return
+}
+
+proc NextId {} {
+    global nextId
+    set new $nextId
+    incr     nextId
+    return $new
+}
+
+# # ## ### ##### ########
+## Basic management
+
+proc ContextSetup {} {
+    global contextData ; unset -nocomplain contextData ; array set contextData {}
+    global contextName ; unset -nocomplain contextName ; array set contextName {}
+    global nextId ; set                                            nextId 0
+    
+    global currentHandle  ; set                                          currentHandle  {}
+    global currentContext ; unset -nocomplain currentContext ; array set currentContext {}
+    return
+}
+
+proc ContextSet {id} {
+    global    currentHandle currentContext contextData
+    set       currentHandle $id
+
+    #puts_stderr "--Set ($id) ([CAttrName $id])"
+
+    # Ensure that array is clean before setting hte new block of
+    # information.
+    unset     currentContext
+    array set currentContext $contextData($currentHandle)
+
+    #puts_stderr "--Set $contextData($currentHandle)"
+    return
+}
+
+proc ContextExists {id} {
+    global contextData
+    info exists contextData($id)
+}
+
+proc ContextNew {name script} {
+    global currentHandle contextName currentContext
+    set in [array get currentContext]
+    
+    set parentId  $currentHandle
+    set currentHandle [NextId]
+
+    #puts_stderr "ContextNew ${currentHandle}:($name) in ${parentId}:[CAttrName $parentId]"
+
+    CAttrAppend NAME   /${name}:$currentHandle
+    CAttrSet    parent $parentId
+    CAttrSet    id     $currentHandle
+    CAttrUnset  verbenv ;# Each context must have its own verbatim variant.
+    
+    # Customize the context - modifier commands
+    uplevel $script
+
+    # ContextCommit state for future use.
+    ContextCommit
+    set contextName($currentHandle) [CAttrGet NAME]
+    
+    return $currentHandle
+}
+
+# # ## ### ##### ########
+## Generic accessors
+
+proc CAttrName {{id {}}} {
+    global contextName
+    if {$id == {}} { global currentHandle ; set id $currentHandle }
+    if {![info exists contextName($id)]} { return <$id> }
+    return $contextName($id)
+}
+
+proc CAttrCurrent {} { global currentHandle ; return $currentHandle }
+
+proc CAttrSet    {key value}     { global currentContext ; set    currentContext($key) $value }
+proc CAttrAppend {key value}     { global currentContext ; append currentContext($key) $value }
+proc CAttrIncr   {key {value 1}} { global currentContext ; incr   currentContext($key) $value }
+proc CAttrGet    {key}           { global currentContext ; set currentContext($key) }
+proc CAttrHas    {key}           { global currentContext ; info exists currentContext($key) }
+proc CAttrUnset  {key}           { global currentContext ; catch { unset currentContext($key) } }
+proc CAttrRef    {key}           { return "::currentContext($key)" }
+
+# # ## ### ##### ########
+## Verbatim
+#
+# Attributes:
+# - verbatim    = flag if verbatim formatting requested, i.e. no paragraph reflow.
+# - verbenv     = if present, id of verbatim variant of this environment
+
+proc NewVerbatim {} {
+    return [ContextNew Verbatim { VerbatimOn }]
+}
+
+proc Verbatim {} {
+    if {![CAttrHas verbenv]} {
+	ContextPush
+	set verbenv [NewVerbatim]
+	ContextPop
+	# Remember the associated verbatim mode in the base
+	# environment and database.
+	CAttrSet verbenv $verbenv
+	ContextCommit
+    }
+    return [CAttrGet verbenv]
+}
+
+proc VerbatimOff {} { CAttrSet verbatim 0 }
+proc VerbatimOn  {} { CAttrSet verbatim 1 }
+proc Verbatim?   {} { CAttrGet verbatim }
+
+# # ## ### ##### ########
+
+proc Parent? {} { CAttrGet parent }
+
+# # ## ### ##### ########
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_cstack.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_cstack.tcl
new file mode 100644
index 00000000..6f644825
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_cstack.tcl
@@ -0,0 +1,31 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+# _text_cstack.tcl -- Stack of contexts and accessors
+
+global contexts ; set contexts {}
+
+################################################################
+# Management of the stack
+
+proc ContextReset {} { global contexts ; set contexts {} ; return }
+
+proc ContextPush {} {
+    global  contexts
+    lappend contexts [set id [CAttrCurrent]]
+
+    #puts_stderr "Push:[llength $contexts]>> [CAttrName $id]"
+    return
+}
+
+proc ContextPop {} {
+    global contexts
+    set id       [lindex $contexts end]
+    set contexts [lrange $contexts 0 end-1]
+
+    #puts_stderr "<<Pop:[llength $contexts]  [CAttrName $id]"
+    ContextSet   $id
+    return
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_dlist.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_dlist.tcl
new file mode 100644
index 00000000..9367ac5e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_dlist.tcl
@@ -0,0 +1,278 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+# _text_dlist.tcl -- Display list variables and accessors
+
+#
+# The engine maintains several data structures per document and pass.
+# Most important is an internal representation of the text better
+# suited to perform the final layouting, the display list. Elements of
+# the display list are lists containing 2 elements, an operation, and
+# its arguments, in this order. The arguments are a list again, its
+# contents are specific to the operation.
+#
+# The operations are:
+#
+# - SECT	Section.    Title.
+# - SUBSECT     Subsection. Title.
+# - PARA	Paragraph.  Context reference and text.
+#
+# The PARA operation is the workhorse of the engine, dooing all the
+# formatting, using the information in an "context" as the guide
+# for doing so. The contexts themselves are generated during the
+# second pass through the contents. They contain the information about
+# nesting (i.e. indentation), bulleting and the like.
+#
+
+# # ## ### ##### ########
+## State: Display list
+
+global __dlist
+
+# # ## ### ##### ########
+## Internal: Extend
+
+proc Store {op args} { global __dlist ; lappend __dlist [list $op $args] ; return}
+
+# Debugging ...
+#proc Store {op args} {puts_stderr "STO $op $args"; global __dlist; lappend __dlist [list $op $args]; return}
+
+# # ## ### ##### ########
+## API
+#
+# API Section		Add section
+# API Subsection	Add subsection
+# API CloseParagraph	Add paragraph using text and (current) env
+#                       Boolean result indicates if something was added, or not
+
+proc DListClear {} { global __dlist ; unset -nocomplain __dlist ; set __dlist {} }
+
+proc Section    {name} {Store SECT    $name ; return}
+proc Subsection {name} {Store SUBSECT $name ; return}
+
+proc CloseParagraph {{id {}}} {
+    set para [Text?]
+    if {$para == {}} { return 0 }
+    if {$id == {}} { set id [CAttrCurrent] }
+    if {![ContextExists $id]} {
+	error "Unknown context $id for paragraph"
+    }
+    Store PARA $id $para
+    #puts_stderr "CloseParagraph $id [CAttrName $id]"
+    #puts_stderr "  (($para))"
+    TextClear
+    return 1
+} 
+
+proc PostProcess {text} {
+    #puts_stderr XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+    #puts_stderr <<$text>>
+    #puts_stderr XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+    global __dlist
+    # The argument is not relevant. Access the display list, perform
+    # the final layouting and return its result.
+
+    set lines {}
+    array set state {lmargin 0 rmargin 0}
+    foreach cmd $__dlist {
+	lappend lines ""
+	foreach {op arguments} $cmd break
+	$op $arguments
+    }
+
+    #puts_stderr XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+    return [Compose lines]\n
+}
+
+# # ## ### ##### ########
+## PARA attributes
+#
+# Attributes
+# - bullet      = bullet (template) to use for (un)ordered lists.
+# - counter     = if present, item counter for enumeration list.
+# - listtype    = type of list, if any.
+# - lmargin     = left-indent, location of left margin for text.
+# - prefix      = prefix to use for all lines of the parapgraph.
+# - wspfx       = whitespace prefix for all but the first line of the paragraph.
+
+proc BulletReset  {} { CAttrSet bullet {} }
+proc ListNone     {} { CAttrSet listtype {} }
+proc MarginIn     {} { CAttrIncr lmargin [LMI] }
+proc MarginReset  {} { CAttrSet lmargin 0 }
+proc PrefixReset  {} { CAttrSet prefix {} }
+proc WPrefixReset {} { CAttrSet wspfx {} }
+
+proc Prefix!   {p} { CAttrSet prefix $p }
+proc Prefix+   {p} { CAttrAppend prefix $p }
+proc WPrefix!  {p} { CAttrSet wspfx  $p }
+
+proc Bullet?   {} { CAttrGet bullet }
+proc ListType? {} { CAttrGet listtype }
+proc Margin?   {} { CAttrGet lmargin }
+proc Prefix?   {} { CAttrGet prefix }
+proc WPrefix?  {} { CAttrGet wspfx }
+
+proc List! {type bullet wprefix} {
+
+    #puts_stderr L!(($type))
+    #puts_stderr L!(($bullet))[string length $bullet],[string length [DeIce $bullet]]
+    #puts_stderr L!(([Dots $wprefix]))
+    
+    CAttrSet listtype $type
+    CAttrSet bullet   $bullet
+    CAttrSet wspfx    $wprefix
+}
+
+proc EnumCounter {} {
+    if {![CAttrHas counter]} {
+	CAttrSet counter 1
+    } else {
+	CAttrIncr counter
+    }
+    ContextCommit	
+    #puts_stderr "Counter ... [CAttrName] => [CAttrGet counter]"
+    return [CAttrGet counter]
+}
+
+proc EnumId {} {
+    # Handling the enumeration counter.
+    #
+    # Special case: An example as first paragraph in an item has to
+    # use the counter in the context it is derived from to prevent
+    # miscounting.
+
+    #puts_stderr "EnumId: [CAttrName] | [CAttrName [Parent?]]"
+    
+    if {[Example?]} {
+	ContextPush
+	ContextSet [Parent?]
+	set n [EnumCounter]
+	ContextPop
+    } else {
+	set n [EnumCounter]
+    }
+    return $n
+}
+
+# # ## ### ##### ########
+## Hooks
+
+proc SECT {text} {
+    #puts_stderr "SECT $text"
+    #puts_stderr ""
+    # text is actually the list of arguments, having one element, the text.
+    upvar 1 lines lines
+    set text [lindex $text 0]
+    SectTitle lines $text
+    return
+}
+
+proc SUBSECT {text} {
+    #puts_stderr "SUBSECT $text"
+    #puts_stderr ""
+    # text is actually the list of arguments, having one element, the text.
+    upvar 1 lines lines
+    set text [lindex $text 0]
+    SubsectTitle lines $text
+    return
+}
+
+proc PARA {arguments} {
+    upvar lines lines
+
+    # Note. As the display list is processed at the very end we can
+    # reuse the current context and accessors to hold and query the
+    # context of each paragraph.
+    
+    foreach {env text} $arguments break
+    ContextSet $env
+
+    #puts_stderr "PARA $env [CAttrName $env]"
+    #parray_stderr ::currentContext ;# consider capsulation
+    #puts_stderr "    (($text))"
+    #puts_stderr ""
+
+    # Use the information in the referenced context to format the
+    # paragraph.
+
+    set lm    [Margin?]
+    set lt    [ListType?]
+    set blank [WPrefix?]
+    
+    if {[Verbatim?]} {
+	set text [Undent $text]
+	#puts_stderr "UN  (($text))"
+    } else {
+	set  plm $lm
+	incr plm [string length $blank]
+	set text [Reflow $text [RMargin $plm]]
+    }
+
+    # Now apply prefixes, (ws prefixes bulleting), at last indentation.
+
+    set p [Prefix?]
+    if {[string length $p]} {
+	set text [Indent $text $p]
+	#puts_stderr "IN  (($text))"
+    }
+
+    if {$lt != {}} {
+	switch -exact $lt {
+	    bullet {
+		# Indent for bullet, but not the first line. This is
+		# prefixed by the bullet itself.
+		set thebullet [Bullet?]
+	    }
+	    enum {
+		#puts_stderr EB
+
+		set n [EnumId]
+		set thebullet [string map [list % $n] [Bullet?]]
+
+		#puts_stderr "E $n | $thebullet |"
+	    }
+	}
+
+	set blank [WPrefix?]
+
+	#puts_stderr B.(($lt))
+	#puts_stderr B.(($thebullet))[string length $thebullet],[string length [DeIce $thebullet]]
+	#puts_stderr B.(([Dots $blank]))
+
+	if {[string length [DeIce $thebullet]] >= [string length $blank]} {
+	    # The item's bullet is longer than the space for indenting.
+	    # Put bullet and text on separate lines, indent text in full.
+
+	    #puts_stderr B.DROP
+
+	    set text "$thebullet\n[Indent $text $blank]"
+	} else {
+	    # The item's bullet fits into the space for
+	    # indenting. Make hanging indent of text and place the
+	    # bullet in front of the first line, with suitable partial
+	    # spacing.
+
+	    #puts_stderr B.SAME
+	    #puts_stderr B.(([Dots [ReHead $blank $thebullet]]))
+
+	    set text [Indent1 $text [ReHead $blank $thebullet] $blank]
+	}
+    }
+
+    if {$lm} {
+	#puts_stderr "LMA $lm"
+	set text [Indent $text [Blank $lm]]
+    }
+
+    #puts_stderr "FIN (($text))"
+    
+    lappend lines $text
+    return
+}
+
+# # ## ### ##### ########
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_margin.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_margin.tcl
new file mode 100644
index 00000000..96ac6abe
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_margin.tcl
@@ -0,0 +1,21 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+# _text_margin.tcl -- Margin control
+
+global lmarginIncrement ; set lmarginIncrement 4
+global rmarginThreshold ; set rmarginThreshold 20
+
+proc LMI {} { global lmarginIncrement ; return $lmarginIncrement }
+proc RMT {} { global rmarginThreshold ; return $rmarginThreshold }
+
+proc RMargin {indent} {
+    set rmt [RMT]
+    set rmargin [expr {80 - $indent}]
+    if {$rmargin < $rmt} { set rmargin $rmt }
+    return $rmargin
+}
+
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_para.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_para.tcl
new file mode 100644
index 00000000..e26e3243
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_para.tcl
@@ -0,0 +1,65 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+# _text_para.tcl -- Paragraph variables and accessors - Text accumulator
+
+# # ## ### ##### ########
+## State: Text buffer for paragraphs.
+
+global __currentp
+
+# # ## ### ##### ########
+## API
+
+proc Text {text} {
+    #puts_stderr "T++ (($text))"
+    global __currentp
+    append __currentp $text
+    return
+}
+proc Text?     {} { global __currentp ; return $__currentp }
+proc TextClear {} { global __currentp ; set __currentp "" }
+
+proc TextTrimLeadingSpace {} {
+    global __currentp
+    regsub {^([ \t\v\f]*\x01?\n)*} $__currentp {} __currentp
+    return
+}
+
+proc TextTrimTrailingSpace {} {
+    global __currentp
+    regsub {([ \t\v\f]*\x01?\n)*$} $__currentp {} __currentp
+    append __currentp \n
+    return
+}
+
+proc TextPlain {text} {
+    if  {[IsOff]} {return}
+
+    # Note: Whenever we get plain text it is possible that a macro for
+    # visual markup actually generated output before the expander got
+    # to the current text. This output was captured by the expander in
+    # its current context. Given the current organization of the
+    # engine we have to retrieve this formatted text from the expander
+    # or it will be lost. This is the purpose of the 'ctopandclear',
+    # which retrieves the data and also clears the capture buffer. The
+    # latter to prevent us from retrieving it again later, after the
+    # next macro added more data.
+
+    set text [ex_ctopandclear]$text
+
+    #puts_stderr "<<text_plain_text>>=<<[string map [list \t \\t { } \\s \n \\n \r \\r \v \\v \f \\f \1 \\1] $text]>>"
+
+    # ... TODO ... Handling of example => verbatim
+
+    if {[string length [string trim $text]] == 0} return
+
+    Text $text
+    return
+}
+
+##
+# # ## ### ##### ########
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_state.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_state.tcl
new file mode 100644
index 00000000..1ec7755a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_state.tcl
@@ -0,0 +1,22 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+# _text_state.tcl -- State variables and accessors
+
+# # ## ### ##### ########
+# State: Flag to suppress of plain text in some places.
+
+global __off
+
+# # ## ### ##### ########
+# API
+
+proc Off   {} { global __off ; set __off 1 ; return}
+proc On    {} { global __off ; set __off 0 ; TextClear ; return}
+proc IsOff {} { global __off ; return $__off }
+
+# Debugging ...
+#proc Off   {}        {puts_stderr OFF ; global __off ; set __off 1 ; return}
+#proc On    {}        {puts_stderr ON_ ; global __off ; set __off 0 ; TextClear ; return}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_utils.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_utils.tcl
new file mode 100644
index 00000000..c5c1f733
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_text_utils.tcl
@@ -0,0 +1,60 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+# _text_utils.tcl -- Text formatting utilities
+
+# # ## ### ##### ########
+## API
+
+proc Dots {x} { string map {{ } . {	} .} $x }
+
+proc Compose {lb} {
+    upvar 1 $lb linebuffer
+    return [string trimright [join $linebuffer \n]]
+}
+
+proc ReHead {line prefix} {
+    set n [string length [DeIce $prefix]]
+    incr n -1
+    string replace $line 0 $n $prefix
+}
+
+proc MaxLen {v s} {
+    upvar 1 $v max
+    set n [string length $s]
+    if {$n <= $max} return
+    set max $n
+}
+
+proc DeIce {x} { string map [list \1 {}] $x }
+
+proc BlankMargin {} { global lmarginIncrement ; Blank $lmarginIncrement }
+
+proc Repeat  {char n}      { textutil::repeat::strRepeat $char $n }
+proc Blank   {n}           { textutil::repeat::blank $n }
+proc RepeatM {char text}   { Repeat $char [string length [DeIce $text]] }
+proc BlankM  {text}        { Blank        [string length [DeIce $text]] }
+proc Undent  {text}        { textutil::adjust::undent $text }
+proc Reflow  {text maxlen} { textutil::adjust::adjust $text -length $maxlen }
+proc Indent  {text prefix} { textutil::adjust::indent $text $prefix }
+proc Indent1 {text p1 p}   { return "${p1}[textutil::adjust::indent $text $p 1]" }
+proc InFlow {text maxlen prefix1 prefix} {
+    # Reformats the paragraph `text` to keep line length under
+    # `maxlen` and then indents the result using `prefix1` and
+    # `prefix`.  `prefix1` is applied to the first line, and `prefix`
+    # to the remainder. The caller is responsible for ensuring that
+    # both prefixes have the same length.
+    Indent1 [Reflow $text $maxlen] $prefix1 $prefix
+}
+
+proc Provenance {} {
+    textutil::string::uncap [c_provenance]
+}
+
+# # ## ### ##### ########
+# Internals
+
+# # ## ### ##### ########
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_toc_common.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_toc_common.tcl
new file mode 100644
index 00000000..a6ee81d4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_toc_common.tcl
@@ -0,0 +1,31 @@
+# -*- tcl -*-
+#
+# _toc_common.tcl
+#
+# (c) 2003 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+################################################################
+# The code here contains general definitions for API functions and
+# state information. They are used by several formatters to simplify
+# their own code.
+
+proc toc_initialize    {}             {return}
+proc toc_shutdown      {}             {return}
+proc toc_numpasses     {}             {return 1}
+proc toc_postprocess   {text}         {return $text}
+proc toc_setup         {n}            {return}
+proc toc_listvariables {}             {return {}}
+proc toc_varset        {varname text} {return}
+
+
+proc fmt_plain_text  {text} {return $text}
+
+################################################################
+# Functions made available to the formatter to access the common
+# state managed here.
+
+proc c_provenance {} {
+    return "Generated by tcllib/doctools/toc with format '[dt_format]'"
+}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_xml.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_xml.tcl
new file mode 100644
index 00000000..923d4305
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_xml.tcl
@@ -0,0 +1,233 @@
+# -*- tcl -*-
+# [expand] utilities for generating XML.
+#
+# Copyright (C) 2001 Joe English <jenglish@sourceforge.net>.
+# Freely redistributable.
+#
+# Copyright (C) 2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+######################################################################
+
+# Handling XML delimiters in content:
+#
+# Plain text is initially passed through unescaped;
+# internally-generated markup is protected by preceding it with \1.
+# The final PostProcess step strips the escape character from
+# real markup and replaces markup characters from content
+# with entity references.
+#
+
+variable attvalMap { {&} &amp;  {<} &lt;  {>} &gt; {"} &quot; {'} &apos; } ; # "
+variable markupMap { {&} {\1&}  {<} {\1<}  {>} {\1>} }
+variable finalMap  { {\1&} {&}  {\1<} {<}  {\1>} {>}
+		     {&} &amp;  {<} &lt;   {>} &gt; }
+
+proc fmt_postprocess {text} {
+    variable finalMap
+    return [string trim [string map $finalMap $text]]\n
+}
+
+# markup text --
+#	Protect markup characters in $text with \1.
+#	These will be stripped out in PostProcess.
+#
+proc markup {text} {
+    variable markupMap
+    return [string map $markupMap $text]
+}
+
+# attlist { n1 v1 n2 v2 ... } --
+#	Return XML-formatted attribute list.
+#	Does *not* escape markup -- the result must be passed through
+#	[markup] before returning it to the expander.
+#
+proc attlist {nvpairs} {
+    variable attvalMap
+    if {[llength $nvpairs] == 1} { set nvpairs [lindex $nvpairs 0] }
+    set attlist ""
+    foreach {name value} $nvpairs {
+    	append attlist " $name='[string map $attvalMap $value]'"
+    }
+    return $attlist
+}
+
+# startTag gi ?attname attval ... ? --
+#	Return start-tag for element $gi with specified attributes.
+#
+proc startTag {gi args} {
+    return [markup "<$gi[attlist $args]>"]
+}
+
+# endTag gi --
+#	Return end-tag for element $gi.
+#
+proc endTag {gi} {
+    return [markup "</$gi>"]
+}
+
+# emptyElement gi ?attribute  value ... ?
+#	Return empty-element tag.
+#
+proc emptyElement {gi args} {
+    return [markup "<$gi[attlist $args]/>"]
+}
+
+# xmlComment text --
+#	Return XML comment declaration containing $text.
+#	NB: if $text includes the sequence "--", it will be mangled.
+#
+proc xmlComment {text} {
+    return [markup "<!-- [string map {-- { - - }} $text] -->"]
+}
+
+# wrap content gi --
+#	Returns $content wrapped inside <$gi> ... </$gi> tags.
+#
+proc wrap {content gi} {
+    return "[startTag $gi]${content}[endTag $gi]"
+}
+
+# wrap? content gi --
+#	Same as [wrap], but returns an empty string if $content is empty.
+#
+proc wrap? {content gi} {
+    if {![string length [string trim $content]]} { return "" }
+    return "[startTag $gi]${content}[endTag $gi]"
+}
+
+# wrapLines? content gi ? gi... ?
+#	Same as [wrap?], but separates entries with newlines
+#       and supports multiple nesting levels.
+#
+proc wrapLines? {content args} {
+    if {![string length $content]} { return "" }
+    foreach gi $args {
+	set content [join [list [startTag $gi] $content [endTag $gi]] "\n"]
+    }
+    return $content
+}
+
+# sequence args --
+#	Handy combinator.
+#
+proc sequence {args} { join $args "\n" }
+
+######################################################################
+# XML context management.
+#
+
+variable elementStack [list]
+
+# start gi ?attribute value ... ? --
+#	Return start-tag for element $gi
+#	As a side-effect, pushes $gi onto the element stack.
+#
+proc start {gi args} {
+    if {[llength $args] == 1} { set args [lindex $args 0] }
+    variable elementStack
+    lappend elementStack $gi
+    return [startTag $gi $args]
+}
+
+# xmlContext {gi1 ... giN} ?default?  --
+#	Pops elements off the element stack until one of
+#	the specified element types is found.
+#
+#	Returns: sequence of end-tags for each element popped.
+#
+#	If none of the specified elements are found, returns
+# 	a start-tag for $default.
+#
+proc xmlContext {gis {default {}}} {
+    variable elementStack
+    set origStack $elementStack
+    set endTags [list]
+    while {[llength $elementStack]} {
+	set current [lindex $elementStack end]
+	if {[lsearch $gis $current] >= 0} {
+	    return [join $endTags \n]
+	}
+	lappend endTags [endTag $current]
+	set elementStack [lreplace $elementStack end end]
+    }
+    # Not found:
+    set elementStack $origStack
+    if {![string length $default]} {
+    	set where "[join $elementStack /] - [info level 1]"
+	puts_stderr "Warning: Cannot start context $gis ($where)"
+    	set default [lindex $gis 0] 
+    }
+    lappend elementStack $default
+    return [startTag $default]
+}
+
+# end ? gi ? --
+#	Generate markup to close element $gi, including end-tags
+#	for any elements above it on the element stack.
+#
+#	If element name is omitted, closes the current element.
+#
+proc end {{gi {}}} {
+    variable elementStack
+    if {![string length $gi]} {
+    	set gi [lindex $elementStack end]
+    }
+    set prefix [xmlContext $gi]
+    set elementStack [lreplace $elementStack end end]
+    return [join [list $prefix [endTag $gi]] "\n"]
+}
+
+######################################################################
+# Utilities for multi-pass processing.
+#
+# Not really XML-related, but I find them handy.
+#
+
+variable PassProcs
+variable Buffers
+
+# pass $passNo procName procArgs { body  } --
+#	Specifies procedure definition for pass $n.
+#
+proc pass {pass proc arguments body} {
+    variable PassProcs
+    lappend PassProcs($pass) $proc $arguments $body
+}
+
+proc setPassProcs {pass} {
+    variable PassProcs
+    foreach {proc args body} $PassProcs($pass) {
+	proc $proc $args $body
+    }
+}
+
+# holdBuffers buffer ? buffer ...? --
+#	Declare a list of hold buffers,
+#	to collect data in one pass and output it later.
+#
+proc holdBuffers {args} {
+    variable Buffers
+    foreach arg $args {
+	set Buffers($arg) [list]
+    }
+}
+
+# hold buffer text --
+#	Append text to named buffer
+#
+proc hold {buffer entry} {
+    variable Buffers
+    lappend Buffers($buffer) $entry
+    return
+}
+
+# held buffer --
+#	Returns current contents of named buffer and empty the buffer.
+#
+proc held {buffer} {
+    variable Buffers
+    set content [join $Buffers($buffer) "\n"]
+    set Buffers($buffer) [list]
+    return $content
+}
+
+#*EOF*
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_xref.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_xref.tcl
new file mode 100644
index 00000000..7e2bd17b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/_xref.tcl
@@ -0,0 +1,129 @@
+# -*- tcl -*-
+##
+# Shared code for the management of cross-references between
+# documents. Origin in HTML. Other user: Markdown.
+#
+# Copyright (c) 2001,2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Hook:
+# - MakeLink {label target} - Format specific
+# - GetXref                 - Engine parameter access
+
+# # ## ### ##### ######## ############# #####################
+## API
+
+proc XrefInit {} {
+    global xref
+    foreach item [GetXref] {
+	foreach {pattern fname fragment} $item break
+	set fname_ref [dt_fmap $fname]
+	if {$fragment != {}} {append fname_ref #$fragment}
+	set xref($pattern) $fname_ref
+    }
+    proc XrefInit {} {}
+    return
+}
+
+proc XrefMatch {word args} {
+    global xref
+
+    foreach ext $args {
+	if {$ext != {}} {
+	    if {[info exists xref($ext,$word)]} {
+		return [XrefLink $xref($ext,$word) $word]
+	    }
+	}
+    }
+    if {[info exists xref($word)]} {
+	return [XrefLink $xref($word) $word]
+    }
+
+    # Convert the word to all-lower case and then try again.
+
+    set lword [string tolower $word]
+
+    foreach ext $args {
+	if {$ext != {}} {
+	    if {[info exists xref($ext,$lword)]} {
+		return [XrefLink $xref($ext,$lword) $word]
+	    }
+	}
+    }
+    if {[info exists xref($lword)]} {
+	return [XrefLink $xref($lword) $word]
+    }
+
+    return $word
+}
+
+proc XrefList {list {ext {}}} {
+    set res [list]
+    foreach w $list {lappend res [XrefMatch $w $ext]}
+    return $res
+}
+
+proc XrefLink {dest label} {
+    # Ensure that the link is properly done relative to this file!
+
+    set here [LinkHere]
+    set dest [LinkTo $dest $here]
+
+    if {[string equal $dest [lindex [file split $here] end]]} {
+	# Suppress self-referential links, i.e. links made from the
+	# current file to itself. Note that links to specific parts of
+	# the current file are not suppressed, only exact links.
+	return $label
+    }
+    return [MakeLink $label $dest]
+}
+
+# # ## ### ##### ######## ############# #####################
+## Internals
+
+proc LinkHere {} {
+    return [dt_fmap [dt_mainfile]]
+}
+
+proc LinkTo {dest here} {
+    # Ensure that the link is properly done relative to this file!
+
+    set save $dest
+
+    #puts_stderr "XrefLink $dest $label"
+
+    set here [file split $here]
+    set dest [file split $dest]
+
+    #puts_stderr "XrefLink < $here"
+    #puts_stderr "XrefLink > $dest"
+
+    while {[string equal [lindex $dest 0] [lindex $here 0]]} {
+	set dest [lrange $dest 1 end]
+	set here [lrange $here 1 end]
+	if {[llength $dest] == 0} {break}
+    }
+    set ul [llength $dest]
+    set hl [llength $here]
+
+    if {$ul == 0} {
+	set dest [lindex [file split $save] end]
+    } else {
+	while {$hl > 1} {
+	    set dest [linsert $dest 0 ..]
+	    incr hl -1
+	}
+	set dest [eval file join $dest]
+    }
+
+    #puts_stderr "XrefLink --> $dest"
+    return $dest
+}
+
+# # ## ### ##### ######## ############# #####################
+## State
+
+global xref ; array set xref {}
+
+##
+# # ## ### ##### ######## ############# #####################
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/c.msg b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/c.msg
new file mode 100644
index 00000000..d41b28ae
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/c.msg
@@ -0,0 +1,58 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+mcset c end/open/list    "End of manpage reached, \[list_end\] missing"
+mcset c end/open/example "End of manpage reached, \[example_end\] missing"
+mcset c end/open/mp	  "End of manpage reached, \[manpage_end\] missing"
+mcset c mpbegin          "Command must be first of manpage"
+mcset c mptitle          "Spaces not allowed in manpage title"
+mcset c hdrcmd           "Command not allowed outside of the header section"
+mcset c bodycmd          "Command not allowed outside of the body of the manpage"
+mcset c body             "Plain text not allowed outside of the body of the manpage"
+mcset c reqcmd           "Command not allowed outside of header or requirement section"
+mcset c invalidlist      "Invalid list type \"@\""
+mcset c nolistcmd        "Command not allowed inside of a list"
+mcset c nolisthdr        "Command not allowed between beginning of a list and its first item"
+mcset c nolisttxt        "Plain text not allowed between beginning of a list and its first item"
+mcset c listcmd          "Command not allowed outside of a list"
+mcset c deflist          "Command restricted to usage in definition lists"
+mcset c bulletlist       "Command restricted to usage in itemized lists"
+mcset c enumlist         "Command restricted to usage in enumerated lists"
+mcset c examplecmd       "Command allowed only to close example section"
+mcset c listcmd          "Command not allowed outside of a list"
+mcset c nodonecmd        "Command not allowed after \[manpage_end\]"
+mcset c arg_list         "Command restricted to usage in argument lists"
+mcset c cmd_list         "Command restricted to usage in command lists"
+mcset c opt_list         "Command restricted to usage in option lists"
+mcset c tkoption_list    "Command restricted to usage in tkoption lists"
+mcset c depr_strong      "Deprecated command \"%s\".\n\tPlease consider appropriate semantic markup or \[emph\] instead."
+mcset c depr_lstitem     "Deprecated command \"%s\".\n\tPlease use \[def\] instead."
+mcset c depr_nl          "Deprecated command \"%s\".\n\tPlease use \[para\] instead."
+mcset c depr_bullet      "Deprecated command \"%s\".\n\tPlease use \[item\] instead."
+mcset c depr_ltype       "Deprecated list type \"%s\".\n\tPlease use \"%s\" instead."
+mcset c sectambig        "(Sub)Section title \"%s\" causes ambiguous section references."
+mcset c missingsect      "Referred (Sub)Section \"%s\" is not known."
+
+# TOC messages
+
+mcset c end/open/toc  "\[toc_end\] missing."
+mcset c toc/plaintext "Plain text beyond whitespace is not allowed."
+mcset c toc/begincmd  "Command not allowed here."
+mcset c toc/endcmd    "Command not allowed here."
+mcset c toc/titlecmd  "Command not allowed here."
+mcset c toc/sectcmd   "Command not allowed here."
+mcset c toc/sectecmd  "Command not allowed here."
+mcset c toc/itemcmd   "Command not allowed here."
+mcset c toc/nodonecmd "Command not allowed after \[toc_end\]"
+
+# IDX messages
+
+mcset c end/open/idx   "\[index_end\] missing."
+mcset c idx/plaintext  "Plain text beyond whitespace is not allowed."
+mcset c idx/begincmd   "Command not allowed here."
+mcset c idx/endcmd     "Command not allowed here."
+mcset c idx/keycmd     "Command not allowed here."
+mcset c idx/manpagecmd "Command not allowed here."
+mcset c idx/urlcmd     "Command not allowed here."
+mcset c idx/nodonecmd  "Command not allowed after \[index_end\]"
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/de.msg b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/de.msg
new file mode 100644
index 00000000..8ba908c1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/de.msg
@@ -0,0 +1,54 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+mcset de end/open/list    "Dokument zu Ende, nicht alle Listen wurden geschlossen"
+mcset de end/open/example "Dokument zu Ende, das letzte Beispiel wurde nicht abgeschlossen"
+mcset de end/open/mp	  "Dokument zu Ende, es fehlt der Abschlussbefehl \[manpage_end\]"
+mcset de mpbegin          "Erwartete diesen Befehl als ersten in der Manpage"
+mcset de mptitle          "Der Manpage Titel darf keine Leerzeichen enthalten"
+mcset de hdrcmd           "Dieser Befehl ist ausserhalb des Headers nicht erlaubt"
+mcset de bodycmd          "Dieser Befehl darf nicht ausserhalb des Hauptteils der Manpage auftreten"
+mcset de body             "Text darf nicht ausserhalb des Hauptteils der Manpage auftreten"
+mcset de reqcmd           "Dieser Befehl ist ausserhalb von Header/Requirements nicht erlaubt"
+mcset de invalidlist      "Die Listenart \"@\" ist dem System nicht bekannt"
+mcset de nolistcmd        "Dieser Befehl ist innerhalb einer Liste nicht erlaubt"
+mcset de nolisthdr        "Dieser Befehl darf nicht zwischen dem Beginn einer Liste und ihrem ersten Unterpunkt benutzt werden"
+mcset de nolisttxt        "Text darf nicht zwischen dem Beginn einer Liste und ihrem ersten Unterpunkt benutzt werden"
+mcset de listcmd          "Dieser Befehl ist ausserhalb einer Liste nicht erlaubt"
+mcset de deflist          "Dieser Befehl darf nur in Definitions-Listen benutzt werden"
+mcset de bulletlist       "Dieser Befehl darf nur in ungeordneten Listen benutzt werden"
+mcset de enumlist         "Dieser Befehl darf nur in Aufz\xE4hlungs-Listen benutzt werden"
+mcset de examplecmd       "Dieser Befehl kann nur zum Schliessen eines Beispieles benutzt werden"
+mcset de listcmd          "Dieser Befehl ist ausserhalb einer Liste nicht erlaubt"
+mcset de nodonecmd        "Dieser Befehl ist nach Ausf\xFChrung von \[manpage_end\] nicht mehr erlaubt"
+mcset de arg_list         "Dieser Befehl darf nur in Argument-Listen benutzt werden"
+mcset de cmd_list         "Dieser Befehl darf nur in Befehls-Listen benutzt werden"
+mcset de opt_list         "Dieser Befehl darf nur in Options-Listen benutzt werden"
+mcset de tkoption_list    "Dieser Befehl darf nur in TkOptions-Listen benutzt werden"
+mcset de depr_strong      "Misbilligter Befehl \"%s\".\n\tBitte verwenden sie \[emph\] oder eine passende semantische Auszeichnung."
+mcset de depr_lstitem     "Misbilligter Befehl \"%s\".\n\tBitte verwenden sie \[def\]."
+mcset de depr_nl          "Misbilligter Befehl \"%s\".\n\tBitte verwenden sie \[para\]."
+mcset de depr_bullet      "Misbilligter Befehl \"%s\".\n\tBitte verwenden sie \[item\]."
+mcset de depr_ltype       "Misbilligte Listen-Art \"%s\".\n\tBitte verwenden sie \"%s\"."
+mcset de sectambig        "Die Kapitel\xFCberschrift \"%s\" ist nicht eindeutig, Referenzen k\xF6nnen falsch sein."
+mcset de missingsect      "Die Kapitel\xFCberschrift \"%s\" ist nicht bekannt."
+
+mcset de end/open/toc  "\[toc_end\] fehlt."
+mcset de toc/plaintext "Normaler Text ist (mit Ausnahme von reinem Leerraum) nicht erlaubt."
+mcset de toc/begincmd  "Dieser Befehl ist hier nicht erlaubt."
+mcset de toc/endcmd    "Dieser Befehl ist hier nicht erlaubt."
+mcset de toc/titlecmd  "Dieser Befehl ist hier nicht erlaubt."
+mcset de toc/sectcmd   "Dieser Befehl ist hier nicht erlaubt."
+mcset de toc/sectecmd  "Dieser Befehl ist hier nicht erlaubt."
+mcset de toc/itemcmd   "Dieser Befehl ist hier nicht erlaubt."
+mcset de toc/nodonecmd "Dieser Befehl ist nach \[toc_end\] nicht erlaubt."
+
+mcset de end/open/idx   "\[index_end\] fehlt."
+mcset de idx/plaintext  "Normaler Text ist (mit Ausnahme von reinem Leerraum) nicht erlaubt."
+mcset de idx/begincmd   "Dieser Befehl ist hier nicht erlaubt."
+mcset de idx/endcmd     "Dieser Befehl ist hier nicht erlaubt."
+mcset de idx/keycmd     "Dieser Befehl ist hier nicht erlaubt."
+mcset de idx/manpagecmd "Dieser Befehl ist hier nicht erlaubt."
+mcset de idx/urlcmd     "Dieser Befehl ist hier nicht erlaubt."
+mcset de idx/nodonecmd  "Dieser Befehl ist nach \[index_end\] nicht erlaubt."
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/en.msg b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/en.msg
new file mode 100644
index 00000000..bdc4c33a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/en.msg
@@ -0,0 +1,54 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+mcset en end/open/list    "End of manpage reached, \[list_end\] missing"
+mcset en end/open/example "End of manpage reached, \[example_end\] missing"
+mcset en end/open/mp	  "End of manpage reached, \[manpage_end\] missing"
+mcset en mpbegin          "Command must be first of manpage"
+mcset en mptitle          "Spaces not allowed in manpage title"
+mcset en hdrcmd           "Command not allowed outside of the header section"
+mcset en bodycmd          "Command not allowed outside of the body of the manpage"
+mcset en body             "Plain text not allowed outside of the body of the manpage"
+mcset en reqcmd           "Command not allowed outside of header or requirement section"
+mcset en invalidlist      "Invalid list type \"@\""
+mcset en nolistcmd        "Command not allowed inside of a list"
+mcset en nolisthdr        "Command not allowed between beginning of a list and its first item"
+mcset en nolisttxt        "Plain text not allowed between beginning of a list and its first item"
+mcset en listcmd          "Command not allowed outside of a list"
+mcset en deflist          "Command restricted to usage in definition lists"
+mcset en bulletlist       "Command restricted to usage in itemized lists"
+mcset en enumlist         "Command restricted to usage in enumerated lists"
+mcset en examplecmd       "Command allowed only to close example section"
+mcset en listcmd          "Command not allowed outside of a list"
+mcset en nodonecmd        "Command not allowed after \[manpage_end\]"
+mcset en arg_list         "Command restricted to usage in argument lists"
+mcset en cmd_list         "Command restricted to usage in command lists"
+mcset en opt_list         "Command restricted to usage in option lists"
+mcset en tkoption_list    "Command restricted to usage in tkoption lists"
+mcset en depr_strong      "Deprecated command \"%s\".\n\tPlease consider appropriate semantic markup or \[emph\] instead."
+mcset en depr_lstitem     "Deprecated command \"%s\".\n\tPlease use \[def\] instead."
+mcset en depr_nl          "Deprecated command \"%s\".\n\tPlease use \[para\] instead."
+mcset en depr_bullet      "Deprecated command \"%s\".\n\tPlease use \[item\] instead."
+mcset en depr_ltype       "Deprecated list type \"%s\".\n\tPlease use \"%s\" instead."
+mcset en sectambig        "(Sub)Section title \"%s\" causes ambiguous section references."
+mcset en missingsect      "Referred (Sub)Section \"%s\" is not known."
+
+mcset en end/open/toc  "\[toc_end\] missing."
+mcset en toc/plaintext "Plain text beyond whitespace is not allowed."
+mcset en toc/begincmd  "Command not allowed here."
+mcset en toc/endcmd    "Command not allowed here."
+mcset en toc/titlecmd  "Command not allowed here."
+mcset en toc/sectcmd   "Command not allowed here."
+mcset en toc/sectecmd  "Command not allowed here."
+mcset en toc/itemcmd   "Command not allowed here."
+mcset en toc/nodonecmd "Command not allowed after \[toc_end\]"
+
+mcset en end/open/idx   "\[index_end\] missing."
+mcset en idx/plaintext  "Plain text beyond whitespace is not allowed."
+mcset en idx/begincmd   "Command not allowed here."
+mcset en idx/endcmd     "Command not allowed here."
+mcset en idx/keycmd     "Command not allowed here."
+mcset en idx/manpagecmd "Command not allowed here."
+mcset en idx/urlcmd     "Command not allowed here."
+mcset en idx/nodonecmd  "Command not allowed after \[index_end\]"
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.desc b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.desc
new file mode 100644
index 00000000..19afb441
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.desc
@@ -0,0 +1,49 @@
+# -*- tcl -*-
+#
+# -- Extraction of meta information from a manpage (package
+#    description), and associating it with package names.
+#
+# Copyright (c) 2005 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+################################################################
+
+# Take the null format as a base and extend it a bit.
+dt_source fmt.null
+
+global    data
+array set data {}
+
+proc fmt_numpasses   {}     {return 1}
+proc fmt_postprocess {text} {
+    global data
+
+    # Title in required packages => This is the sole package.
+    # Otherwise dump everything required.
+
+    if {[lsearch -exact $data(require) $data(title)] >= 0} {
+	return [list $data(title) $data(shortdesc) $data(desc)]
+    } else {
+	set res {}
+	foreach p $data(require) {
+	    lappend res [list $p $data(shortdesc) $data(desc)]
+	}
+	return [join $res \n]
+    }
+}
+proc fmt_plain_text  {text} {return ""}
+proc fmt_setup       {n}    {return}
+
+proc fmt_manpage_begin {title section version} {
+    global data
+    set    data(title)     $title
+    set    data(require)   {}
+    set    data(desc)      ""
+    set    data(shortdesc) ""
+    return
+}
+
+proc fmt_moddesc   {desc} {global data ; set data(shortdesc) $desc}
+proc fmt_titledesc {desc} {global data ; set data(desc)      $desc}
+proc fmt_require   {p {v {}}} {global data ; lappend data(require) $p ; return}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.html b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.html
new file mode 100644
index 00000000..7bf259ed
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.html
@@ -0,0 +1,642 @@
+# -*- tcl -*-
+#
+# fmt.html
+#
+# Copyright (c) 2001-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# Definitions to convert a tcl based manpage definition into
+# a manpage based upon HTML markup.
+#
+################################################################
+################################################################
+
+dt_source _common.tcl   ; # Shared code
+dt_source _html.tcl     ; # HTML basic formatting
+dt_source _xref.tcl     ; # xref management
+
+global _in_example
+set    _in_example 0
+
+proc c_copyrightsymbol {} {return "[markup "&"]copy;"}
+
+proc bgcolor {} {return ""}
+proc border  {} {return 0}
+proc Year    {} {clock format [clock seconds] -format %Y}
+
+c_holdBuffers require synopsis
+
+################################################################
+## Backend for HTML markup
+
+# --------------------------------------------------------------
+# Handling of lists. Simplified, the global check of nesting and
+# legality of list commands allows us to throw away most of the
+# existing checks.
+
+global liststack ; # stack of list tags to use in list_end
+set    liststack {}
+
+proc lpush {t class} {
+    global  liststack 
+    lappend liststack [list [tag/ $t] [litc_getandclear]]
+    return [taga $t [list class $class]]
+}
+
+proc lpop {} {
+    global liststack
+    set t         [lindex   $liststack end]
+    set liststack [lreplace $liststack end end]
+    foreach {t l} $t break
+    litc_set $l
+    return $t
+}
+
+proc fmt_plain_text {text} {
+    global _in_example
+    if {$_in_example} {
+	set text [string map [list \\\\\n \\\n] $text]
+    }
+    return $text
+}
+
+################################################################
+# Formatting commands.
+
+c_pass 1 fmt_manpage_begin {title section version} {c_cinit ; c_clrSections ; return}
+c_pass 2 fmt_manpage_begin {title section version} {
+
+    global sec_is_open      ; set sec_is_open      0
+    global subsec_is_open   ; set subsec_is_open   0
+    global prev_litem_close ; set prev_litem_close {}
+    global para_is_open     ; set para_is_open     0
+    global liststack        ; set liststack        {}
+    global defaultstyle
+
+    XrefInit
+    c_cinit
+    set module      [dt_module]
+    set shortdesc   [c_get_module]
+    set description [c_get_title]
+    set copyright   [c_get_copyright]
+
+    set pagetitle "$title - $shortdesc"
+    
+    set hdr ""
+
+    if {![Get raw]} {
+	append  hdr [markup {<!DOCTYPE html>}]
+	append  hdr [tag html] [tag head] \n
+	append  hdr [tag_ title $pagetitle] \n
+
+	if {![Extend hdr ByParameter meta]} {
+	    # Insert standard CSS definitions.
+	    append hdr [tag_ style \
+			    "[markup <]!--${defaultstyle}--[markup >]" \
+			    type text/css] \n
+	}
+
+	append  hdr [tag/ head] \n
+	append  hdr [ht_comment [c_provenance]]\n
+	if {$copyright != {}} {
+	    append  hdr [ht_comment $copyright]\n
+	}
+	append  hdr [ht_comment "$title.$section"]
+	append  hdr \n\n
+	append  hdr [tag body]
+    }
+
+    Extend hdr ByParameter header \
+	@TITLE@ $pagetitle
+
+    append  hdr [tag* div class doctools] \n
+
+    set thetitle "[string trimleft $title :]($section) $version $module \"$shortdesc\""
+    append  hdr [tag_ h1 $thetitle class doctools_title] \n
+    append  hdr [fmt_section Name name] \n
+    append  hdr "[para_open] $title - $description"
+    return $hdr
+}
+
+c_pass 1 fmt_moddesc   {desc} {c_set_module $desc}
+c_pass 2 fmt_moddesc   {desc} NOP
+
+c_pass 1 fmt_titledesc {desc} {c_set_title $desc}
+c_pass 2 fmt_titledesc {desc} NOP
+
+c_pass 1 fmt_copyright {desc} {c_set_copyright $desc}
+c_pass 2 fmt_copyright {desc} NOP
+
+c_pass 1 fmt_manpage_end {} {c_creset ; return}
+c_pass 2 fmt_manpage_end {} {
+    c_creset
+    set res ""
+
+    set sa [c_xref_seealso]
+    set kw [c_xref_keywords]
+    set ca [c_xref_category]
+    set ct [c_get_copyright]
+
+    if {[llength $sa] > 0} {
+	append res [fmt_section {See Also} see-also] \n
+	append res [join [XrefList [lsort $sa] sa] ", "] \n
+    }
+    if {[llength $kw] > 0} {
+	append res [fmt_section Keywords keywords] \n
+	append res [join [XrefList [lsort $kw] kw] ", "] \n
+    }
+    if {$ca ne ""} {
+	append res [fmt_section Category category] \n
+	append res $ca \n
+    }
+    if {$ct != {}} {
+	append res [fmt_section Copyright copyright] \n
+	append res [join [split $ct \n] [tag br]\n] [tag br]\n
+    }
+
+   # Close last paragraph, subsection, and section.
+    append res [para_close][subsec_close][sec_close]
+
+    Extend res ByParameter footer
+
+    append res [tag/ div]
+    if {![Get raw]} {
+	append res [tag/ body] [tag/ html]
+    }
+    return $res
+}
+
+c_pass 1 fmt_section {name id} {c_newSection $name 1 end $id}
+c_pass 2 fmt_section {name id} {
+    return "[sec_open $id][tag_ h2 [anchor $id $name]]\n[para_open]"
+}
+
+c_pass 1 fmt_subsection {name id} {c_newSection $name 2 end $id}
+c_pass 2 fmt_subsection {name id} {
+    return "[subsec_open $id][tag_ h3 [anchor $id $name]]\n[para_open]"
+}
+
+# Para breaks inside and outside of lists are identical
+proc fmt_nl   {} {para_open}
+proc fmt_para {} {para_open}
+
+c_pass 2 fmt_require {pkg {version {}}} NOP
+c_pass 1 fmt_require {pkg {version {}}} {
+    if {$version != {}} { append pkg " " $version }
+    c_hold require [tag_ li "package require [bold $pkg pkgname]"]
+    return
+}
+
+c_pass 2 fmt_usage {cmd args} NOP
+c_pass 1 fmt_usage {cmd args} {
+    if {[llength $args]} {
+	set text "$cmd [join $args " "]"
+    } else {
+	set text $cmd
+    }
+    c_hold synopsis [tag_ li $text]
+    return
+}
+
+c_pass 1 fmt_call {cmd args} {
+    if {[llength $args]} {
+	set text "$cmd [join $args " "]"
+    } else {
+	set text $cmd
+    }
+    c_hold synopsis [tag_ li [link $text "#[c_cnext]"]]
+    return
+}
+c_pass 2 fmt_call {cmd args} {
+    if {[llength $args]} {
+	set text "$cmd [join $args " "]"
+    } else {
+	set text $cmd
+    }
+    return [fmt_lst_item [anchor [c_cnext] $text]]
+}
+
+c_pass 1 fmt_description {did} NOP
+c_pass 2 fmt_description {did} {
+    set result ""
+    set syn [c_held synopsis]
+    set req [c_held require]
+
+    # Create the TOC.
+
+    # Pass 1: We have a number of special sections which were not
+    #         listed explicitly in the document sources. Add them
+    #         now. Note the inverse order for the sections added
+    #         at the beginning.
+
+    c_newSection Description 1 0 $did
+    if {$syn != {} || $req != {}} {c_newSection Synopsis 1 0 synopsis}
+    c_newSection {Table Of Contents} 1 0 toc
+
+    if {[llength [c_xref_seealso]]  > 0} {c_newSection {See Also} 1 end see-also}
+    if {[llength [c_xref_keywords]] > 0} {c_newSection Keywords   1 end keywords}
+    if {[c_xref_category]         ne ""} {c_newSection Category   1 end category}
+    if {[c_get_copyright]         != {}} {c_newSection Copyright  1 end copyright}
+
+    set sections [c_sections]
+
+    # Pass 2: Generate the markup for the TOC, indenting the
+    #         links according to the level of each section.
+
+    append result [fmt_section {Table Of Contents} toc] [para_close] \n
+    append result [taga ul {class doctools_toc}] \n
+
+    set lastlevel 1
+    set close 0
+    foreach {name id level} $sections {
+	# level in {1,2}, 1 = section, 2 = subsection
+	if {$level == $lastlevel} {
+	    # Close previous item.
+	    if {$close} { append result [tag/ li] \n }
+	} elseif {$level > $lastlevel} {
+	    # Start list of subsections
+	    append result \n [tag ul] \n
+	} else { # level < lastlevel
+	    # End list of subsections, and of previous item (two
+	    # actually, the subsection, and the section item).
+	    append result [tag/ li] \n [tag/ ul] \n [tag/ li] \n
+	}
+	# Start entry
+	if {$level == 1} {
+	    append result [taga li {class doctools_section}]
+	} else {
+	    append result [taga li {class doctools_subsection}]
+	}
+	append result [link $name "#$id"]
+	set close 1
+
+	set lastlevel $level
+    }
+    if {$lastlevel > 1 } { append result [tag/ ul] \n }
+    if {$close}          { append result [tag/ li] \n }
+
+    append result [tag/ ul] \n
+
+    # Implicit sections coming after the TOC (Synopsis, then the
+    # description which starts the actual document). The other
+    # implicit sections are added at the end of the document and
+    # are generated by 'fmt_manpage_end' in the second pass.
+
+    if {$syn != {} || $req != {}} {
+	append result [fmt_section Synopsis synopsis] [para_close] [taga div {class doctools_synopsis}] \n
+	if {$req != {}} {
+	    append result [tag_ ul \n$req\n class doctools_requirements] \n
+	}
+	if {$syn != {}} {
+	    append result [tag_ ul \n$syn\n class doctools_syntax] \n
+	}
+	append result [tag/ div] \n
+    }
+    append result [fmt_section Description $did] \n
+    return $result
+}
+
+################################################################
+
+proc fmt_list_begin  {what {hint {}}} {
+    # NOTE: The hint is ignored. Use stylesheet definitions to modify
+    # item and general list spacing.
+    switch -exact -- $what {
+	enumerated  {set tag ol}
+	itemized    {set tag ul}
+	arguments -
+	commands  -
+	options   -
+	tkoptions -
+	definitions {set tag dl}
+    }
+    return [para_close][lpush $tag doctools_$what]
+}
+
+proc fmt_list_end {}        {
+    set res [para_close][litc_getandclear]\n[lpop][para_open]
+    return $res
+}
+proc fmt_lst_item {text}    {
+    set res [para_close][litc_getandclear]\n[tag_ dt $text]\n[tag dd][para_open]
+    litc_set [tag/ dd]
+    return $res
+}
+proc fmt_bullet {} {
+    set res [para_close][litc_getandclear]\n[tag li][para_open]
+    litc_set [tag/ li]
+    return $res
+}
+proc fmt_enum {} {
+    set res [para_close][litc_getandclear]\n[tag li][para_open]
+    litc_set [tag/ li]
+    return $res
+}
+
+proc fmt_cmd_def {command} {
+    fmt_lst_item [fmt_cmd $command]
+}
+proc fmt_arg_def {type name {mode {}}} {
+    set    text ""
+    append text $type " " [fmt_arg $name]
+    if {$mode != {}} {
+	append text " (" $mode ")"
+    }
+    fmt_lst_item $text
+}
+proc fmt_opt_def {name {arg {}}} {
+    set text [fmt_option $name]
+    if {$arg != {}} {append text " " $arg}
+    fmt_lst_item $text
+}
+proc fmt_tkoption_def {name dbname dbclass} {
+    set    text ""
+    append text "Command-Line Switch:\t[fmt_option $name][tag br]\n"
+    append text "Database Name:\t[bold $dbname optdbname][tag br]\n"
+    append text "Database Class:\t[bold $dbclass optdbclass][tag br]\n"
+    fmt_lst_item $text
+}
+
+################################################################
+
+proc fmt_example_begin {} {
+    global _in_example ; set _in_example 1
+    return [para_close]\n[tag* pre class doctools_example]
+}
+proc fmt_example_end   {} {
+    global _in_example ; set _in_example 0
+    return [tag/ pre]\n[para_open]
+}
+proc fmt_example {code} {
+    return "[fmt_example_begin][fmt_plain_text $code][fmt_example_end]"
+}
+
+################################################################
+
+proc fmt_arg  {text} { italic $text                arg }
+proc fmt_cmd  {text} { bold   [XrefMatch $text sa] cmd }
+proc fmt_emph {text} { em     $text }
+proc fmt_opt  {text} { span   "?$text?" opt }
+
+proc fmt_comment {text} {ht_comment $text}
+proc fmt_sectref {title {id {}}} {
+    if {$id == {}} { set id [c_sectionId $title] }
+
+    if {[c_sectionKnown $id]} {
+    	return [span [link $title "#$id"] sectref]
+    } else {
+	return [bold $title sectref]
+    }
+}
+
+proc fmt_syscmd  {text} {bold [XrefMatch $text sa] syscmd}
+proc fmt_method  {text} {bold $text method}
+proc fmt_option  {text} {bold $text option}
+proc fmt_widget  {text} {bold $text widget}
+proc fmt_fun     {text} {bold $text function}
+proc fmt_type    {text} {bold $text type}
+proc fmt_package {text} {bold [XrefMatch $text sa kw] package}
+proc fmt_class   {text} {bold $text class}
+proc fmt_var     {text} {bold $text variable}
+proc fmt_file    {text} {return "\"[bold $text file]\""}
+proc fmt_namespace     {text} {bold $text namespace}
+proc fmt_uri     {text {label {}}} {
+    if {$label == {}} {set label $text}
+    return [link $label $text]
+}
+
+proc fmt_image {text {label {}}} {
+    # text = symbolic name of the image.
+
+    set img [dt_imgdst $text {png gif jpg}]
+
+    if {$label eq {}} {
+	set label $text
+    }
+
+    if {$img ne {}} {
+	return [imagelink $label [LinkTo $img [LinkHere]]]
+    }
+
+    if {[regexp -- {^http://} $text] ||
+	[regexp -- {^ftp://}  $text]} {
+	return [imagelink $label $text]
+    }
+
+    #puts_stderr here:\t[LinkHere]
+    #puts_stderr dest:\t$img
+    #puts_stderr rela:\t[LinkTo $img [LinkHere]]
+    #puts_stderr
+
+    return [strong "Image: $label"]
+}
+
+proc fmt_term    {text} {italic [XrefMatch $text kw sa] term}
+proc fmt_const   {text} {bold $text const}
+
+proc fmt_mdash {} { return "[markup &]mdash;" }
+proc fmt_ndash {} { return "[markup &]ndash;" }
+
+################################################################
+
+global sec_is_open
+set    sec_is_open 0
+
+proc sec_open  {id} {
+    global sec_is_open
+    set res [para_close][subsec_close][sec_close][tag* div id $id class doctools_section]
+    set sec_is_open 1
+    return $res
+}
+
+proc sec_close {}   {
+    global sec_is_open
+    if {!$sec_is_open} {return ""}
+    set sec_is_open 0
+    return [tag/ div]\n
+}
+
+################################################################
+
+global subsec_is_open
+set    subsec_is_open 0
+
+proc subsec_open  {id} {
+    global subsec_is_open
+    set res [para_close][subsec_close][tag* div id $id class doctools_subsection]
+    set subsec_is_open 1
+    return $res
+}
+
+proc subsec_close {}   {
+    global subsec_is_open
+    if {!$subsec_is_open} {return ""}
+    set subsec_is_open 0
+    return [tag/ div]\n
+}
+
+################################################################
+
+# Piece of html to close the previous list element, if any.
+# Saved on the list stack
+
+global prev_litem_close
+set    prev_litem_close   {}
+
+proc litc_getandclear {} {
+    global prev_litem_close
+    set res $prev_litem_close
+    set prev_litem_close {}
+    return $res
+}
+
+proc litc_set {value} {
+    global prev_litem_close
+    set prev_litem_close $value
+    return
+}
+
+################################################################
+
+global para_is_open
+set    para_is_open 0
+
+proc para_open {} {
+    global para_is_open
+    set res [para_close][tag p]
+    set para_is_open 1
+    return $res
+}
+
+proc para_close {} {
+    global para_is_open
+    if {!$para_is_open} {return ""}
+    set para_is_open 0
+    return [tag/ p]
+}
+
+################################################################
+
+proc GetXref {} { Get xref } ;# xref access to engine parameters
+
+global    __var
+array set __var {
+    meta   {}
+    header {}
+    footer {}
+    xref   {}
+    raw    0
+}
+proc Get               {varname}      {global __var ; return $__var($varname)}
+proc fmt_listvariables {}             {global __var ; return [array names __var]}
+proc fmt_varset        {varname text} {
+    global __var
+    if {![info exists __var($varname)]} {return -code error "Unknown engine variable \"$varname\""}
+    set __var($varname) $text
+    return
+}
+
+# Engine parameter handling
+proc Extend {v _ by args} {
+    set html [Get $by]
+    if {$html == {}} { return 0 }
+    upvar 1 $v text
+    if {[llength $args]} {
+	set html [string map $args $html]
+    }
+    append text [markup $html] \n
+    return 1
+}
+
+global defaultstyle
+set    defaultstyle {
+    HTML {
+	background: 	#FFFFFF;
+	color: 		black;
+    }
+    BODY {
+	background: 	#FFFFFF;
+	color:	 	black;
+    }
+    DIV.doctools {
+	margin-left:	10%;
+	margin-right:	10%;
+    }
+    DIV.doctools H1,DIV.doctools H2 {
+	margin-left:	-5%;
+    }
+    H1, H2, H3, H4 {
+	margin-top: 	1em;
+	font-family:	sans-serif;
+	font-size:	large;
+	color:		#005A9C;
+	background: 	transparent;
+	text-align:		left;
+    }
+    H1.doctools_title {
+	text-align: center;
+    }
+    UL,OL {
+	margin-right: 0em;
+	margin-top: 3pt;
+	margin-bottom: 3pt;
+    }
+    UL LI {
+	list-style: disc;
+    }
+    OL LI {
+	list-style: decimal;
+    }
+    DT {
+	padding-top: 	1ex;
+    }
+    UL.doctools_toc,UL.doctools_toc UL, UL.doctools_toc UL UL {
+	font:		normal 12pt/14pt sans-serif;
+	list-style:	none;
+    }
+    LI.doctools_section, LI.doctools_subsection {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding: 	0em;
+    }
+    PRE {
+	display: 	block;
+	font-family:	monospace;
+	white-space:	pre;
+	margin:		0%;
+	padding-top:	0.5ex;
+	padding-bottom:	0.5ex;
+	padding-left:	1ex;
+	padding-right:	1ex;
+	width:		100%;
+    }
+    PRE.doctools_example {
+	color: 		black;
+	background: 	#f5dcb3;
+	border:		1px solid black;
+    }
+    UL.doctools_requirements LI, UL.doctools_syntax LI {
+	list-style: 	none;
+	margin-left: 	0em;
+	text-indent:	0em;
+	padding:	0em;
+    }
+    DIV.doctools_synopsis {
+	color: 		black;
+	background: 	#80ffff;
+	border:		1px solid black;
+	font-family:	serif;
+	margin-top: 	1em;
+	margin-bottom: 	1em;
+    }
+    UL.doctools_syntax {
+	margin-top: 	1em;
+	border-top:	1px solid black;
+    }
+    UL.doctools_requirements {
+	margin-bottom: 	1em;
+	border-bottom:	1px solid black;
+    }
+}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.latex b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.latex
new file mode 100644
index 00000000..443070d3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.latex
@@ -0,0 +1,431 @@
+# -*- tcl -*-
+# (c) 2001-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# [mpexpand] definitions to convert a tcl based manpage definition into
+# a manpage based upon LaTeX markup.
+#
+################################################################
+
+##
+## This engine needs a rewrite for a better handling
+## of characters special to TeX / LaTeX.
+##
+
+dt_source _common.tcl   ; # Shared code
+
+global _in_example
+set    _in_example 0
+
+global _has_images
+set    _has_images 0
+
+global _has_examples
+set    _has_examples 0
+
+# Called to handle plain text from the input
+proc fmt_plain_text {text} {
+    global _in_example
+    if {$_in_example} {	
+	lappend map \\\\\n \1\\textbackslash\n
+	lappend map \\\n   \1\\textbackslash\n	
+	set text [string map $map $text]
+	return $text
+    }
+    return [texEscape $text]
+}
+
+proc Year {} {clock format [clock seconds] -format %Y}
+
+c_holdBuffers require
+
+proc fmt_postprocess {text} {
+    # Trim trailing whitespace, for all lines.
+    regsub -all -- "\[ \t]+\n" $text "\n" text
+    # Strip superfluous line breaks
+    regsub -all -- "\n+" $text "\n" text
+    # Normalize paragraph breaks (subsume leading and traling whitespace)
+    regsub -all -- "\[\t \n]+\1@P" $text "\1@P" text
+    regsub -all -- "\1@P\[\t \n]+" $text "\1@P" text
+    # Insert the paragraph breaks, unify multiple adjacent breaks
+    regsub -all -- "(\1@P)+" $text "\n\n" text
+    # Finalize the protected special characters
+    return [string trimleft [string map {\1\\ \\ \1$ $} $text]]
+    #return $text
+}
+
+################################################################
+## Backend for LaTeX markup
+
+c_pass 1 fmt_manpage_begin {title section version} NOP
+c_pass 2 fmt_manpage_begin {title section version} {
+    global _has_images _has_examples
+
+    set module      [dt_module]
+    set shortdesc   [c_get_module]
+    set description [c_get_title]
+    set copyright   [c_get_copyright]
+
+    set     hdr ""
+    append  hdr [Comment [c_provenance]] \n
+    if {$copyright != {}} {
+	append  hdr [Comment $copyright] \n
+    }
+    append  hdr [Comment "$title.$section"] \n
+    append  hdr \n
+    append  hdr "\1\\documentclass\{article\}" \n
+
+    if {$_has_images} {
+	append hdr "\1\\usepackage{epsfig}" \n
+	append hdr "\1\\usepackage{epstopdf}" \n
+    }
+    if {$_has_examples} {
+	append hdr "\1\\usepackage{alltt}" \n
+    }
+
+    append  hdr "\1\\begin\{document\}" \n
+    append  hdr "\1\\author\{[dt_user]\}" \n
+
+    set    titletext ""
+    append titletext "$module / $title -- "
+    append titletext "$shortdesc : $description"
+
+    append  hdr "\1\\title\{[texEscape $titletext]\}" \n
+    append  hdr "\1\\maketitle" \n
+    return $hdr
+}
+
+c_pass 1 fmt_moddesc   {desc} {c_set_module $desc}
+c_pass 2 fmt_moddesc   {desc} NOP
+
+c_pass 1 fmt_titledesc {desc} {c_set_title $desc}
+c_pass 2 fmt_titledesc {desc} NOP
+
+c_pass 1 fmt_copyright {desc} {c_set_copyright [texEscape $desc]}
+c_pass 2 fmt_copyright {desc} NOP
+
+c_pass 1 fmt_manpage_end {} NOP
+c_pass 2 fmt_manpage_end {} {
+    set    res ""
+
+    set sa [c_xref_seealso]
+    set kw [c_xref_keywords]
+    set ca [c_xref_category]
+    set ct [c_get_copyright]
+
+    if {[llength $sa] > 0} {
+	set tmp {}
+	foreach x $sa {lappend tmp [texEscape $x]}
+	set sa $tmp
+
+	append res [fmt_section {See Also} see-also] \n
+	append res [join [lsort $sa] ", "] \n
+    }
+    if {[llength $kw] > 0} {
+	set tmp {}
+	foreach x $kw {lappend tmp [texEscape $x]}
+	set kw $tmp
+
+	append res [fmt_section Keywords keywords] \n
+	append res [join [lsort $kw] ", "] \n
+    }
+    if {$ca ne ""} {
+	set ca [texEscape $ca]
+
+	append res [fmt_section Category category] \n
+	append res $ca \n
+    }
+    if {$ct != {}} {
+	append res [fmt_section Copyright copyright] \n
+	append res \1\\begin\{flushleft\} \n
+	append res [join [split $ct \n] \1\\linebreak\n] \1\\linebreak\n
+	append res \1\\end\{flushleft\} \n
+    }
+    append  res "\1\\end\{document\}"
+    return $res
+}
+
+proc fmt_section    {name id} {return    "\1\\section\{[texEscape $name]\}\1\\label\{$id\}"}
+proc fmt_subsection {name id} {return "\1\\subsection\{[texEscape $name]\}\1\\label\{$id\}"}
+
+proc fmt_para   {} { return \1@P }
+proc fmt_nl     {} { return \1@P }
+
+c_pass 2 fmt_require {pkg {version {}}} NOP
+c_pass 1 fmt_require {pkg {version {}}} {
+    if {$version != {}} {
+	set res "package require [Bold "$pkg $version"]\n"
+    } else {
+	set res "package require [Bold $pkg]\n"
+    }
+    c_hold require $res
+    return
+}
+
+c_pass 2 fmt_usage {cmd args} NOP
+c_pass 1 fmt_usage {cmd args} {c_hold synopsis "\1\\item\[\] $cmd [join $args " "]"}
+
+c_pass 2 fmt_call {cmd args} {return "[fmt_lst_item "$cmd [join $args " "]"]"}
+c_pass 1 fmt_call {cmd args} {c_hold synopsis "\1\\item\[\] $cmd [join $args " "]"}
+
+c_pass 1 fmt_description {id} NOP
+c_pass 2 fmt_description {id} {
+    set res ""
+    set req [c_held require]
+    set syn [c_held synopsis]
+    if {$req != {} || $syn != {}} {
+	append res [fmt_section Synopsis synopsis]\n
+	if {$req != {}} {
+	    append res \1\\begin\{flushleft\} \n
+	    append res $req \n
+	    append res \1\\end\{flushleft\} \n
+	}
+	if {$syn != {}} {
+	    append res "\1\\begin\{itemize\}" \n
+	    append res ${syn} \n\n
+	    append res "\1\\end\{itemize\}" \n
+	}
+    }
+    append res [fmt_section Description $id]
+    return $res
+}
+
+################################################################
+
+global    list_state
+array set list_state {level -1}
+
+proc fmt_list_begin  {what {hint {}}} {
+    # ignoring hints
+    global list_state
+    incr list_state(level)
+    set  list_state(l,$list_state(level)) $what
+    set  list_state(l,$list_state(level),item) 0
+
+    switch -exact -- $what {
+	enumerated {
+	    return \1\\begin\{enumerate\}
+	}
+	itemized -
+	arguments -
+	options -
+	commands -
+	tkoptions -
+	definitions {
+	    return \1\\begin\{itemize\}
+	}
+	default {
+	    return -code error "Must not happen"
+	}
+    }
+}
+
+proc fmt_list_end {} {
+    global list_state
+
+    set what $list_state(l,$list_state(level))
+    set item $list_state(l,$list_state(level),item)
+
+    catch {unset list_state(l,$list_state(level))}
+    catch {unset list_state(l,$list_state(level),item)}
+
+    incr list_state(level) -1
+
+    switch -exact -- $what {
+	enumerated {
+	    return \1\\end\{enumerate\}
+	}
+	itemized -
+	arguments -
+	options -
+	commands -
+	tkoptions -
+	definitions {
+	    return \1\\end\{itemize\}
+	}
+	default {
+	    return -code error "Must not happen"
+	}
+    }
+}
+
+proc fmt_bullet {} {return "\n%\n\1\\item\n%\n"}
+proc fmt_enum   {} {return "\n%\n\1\\item\n%\n"}
+
+proc fmt_lst_item {text} {
+    global list_state
+
+    set item $list_state(l,$list_state(level),item)
+    set list_state(l,$list_state(level),item) 1
+
+    set text [texEscape $text]
+    return "\n%\n\1\\item\[\] $text\n%\n"
+}
+
+proc fmt_arg_def {type name {mode {}}} {
+    global list_state
+
+    set item $list_state(l,$list_state(level),item)
+    set list_state(l,$list_state(level),item) 1
+
+    set    text ""
+    append text [fmt_arg $name]
+    append text " $type"
+    if {$mode != {}} {append text " ($mode)"}
+    return "\n%\n\1\\item\[\] $text\n%\n"
+}
+
+proc fmt_cmd_def {command} {
+    global list_state
+
+    set item $list_state(l,$list_state(level),item)
+    set list_state(l,$list_state(level),item) 1
+
+    set text [fmt_cmd $command]
+    return "\n%\n\1\\item\[\] $text\n%\n"
+}
+
+proc fmt_opt_def {name {arg {}}} {
+    global list_state
+
+    set item $list_state(l,$list_state(level),item)
+    set list_state(l,$list_state(level),item) 1
+
+    set text [fmt_option $name]
+    if {$arg != {}} {append text " $arg"}
+    return "\n%\n\1\\item\[\] $text\n%\n"
+}
+
+proc fmt_tkoption_def {name dbname dbclass} {
+    global list_state
+
+    set item $list_state(l,$list_state(level),item)
+    set list_state(l,$list_state(level),item) 1
+
+    set    text ""
+    append text "Command-Line Switch:	[Bold $name]\\\\\n"
+    append text "Database Name:	[Bold $dbname]\\\\\n"
+    append text "Database Class:	[Bold $dbclass]\\\\\n"
+    return "\n%\n\1\\item\[\] $text\n%\n"
+}
+
+################################################################
+
+proc fmt_example_begin {} {
+    global _has_examples _in_example
+    set _has_examples 1
+    set    _in_example 1
+    return "\1\\begin{alltt}\n"
+}
+proc fmt_example_end   {} {
+    global _in_example
+    set    _in_example 0
+    return "\1\\end{alltt}\n"
+}
+# No mapping of special characters
+proc fmt_example {code} {
+    return [fmt_example_begin][fmt_plain_text $code][fmt_example_end]
+}
+
+proc fmt_arg    {text} {Underline $text}
+proc fmt_cmd    {text} {Bold      $text}
+proc fmt_emph   {text} {Italic    $text}
+proc fmt_opt    {text} {return   ?$text?}
+
+proc fmt_comment {text} {
+    set res [list]
+    foreach l [split $text \n] {
+	lappend res [Comment $l]
+    }
+    return [join $res \n]
+}
+proc fmt_sectref {text {label {}}} {
+    if {![string length $label]} {set label $text}
+    Bold "$text (\1\\ref\{$label\})"
+}
+proc fmt_syscmd  {text} {Bold $text}
+proc fmt_method  {text} {Bold $text}
+proc fmt_option  {text} {Bold $text}
+proc fmt_widget  {text} {Bold $text}
+proc fmt_fun     {text} {Bold $text}
+proc fmt_type    {text} {Bold $text}
+proc fmt_package {text} {Bold $text}
+proc fmt_class   {text} {Bold $text}
+proc fmt_var     {text} {Bold $text}
+proc fmt_file    {text} {return "\"[Italic $text]\""}
+proc fmt_namespace     {text} {Bold $text]}
+proc fmt_uri     {text {label {}}} {
+    if {$label == {}} {
+	# Without label we use the link directly as part of the text.
+	return [Underline $text]
+    } else {
+	# Label is used in the text, referred link is delegated into a
+	# footnote.
+	return "[Underline $label] \1\\footnote\{[texEscape $text]\}"
+    }
+}
+proc fmt_image {text {label {}}} {
+    global _has_images
+    # text = symbolic name of the image.
+
+    set img [dt_imgsrc $text {eps ps}]
+    if {$img eq {}} {
+	if {$label eq {}} {
+	    return [Underline "IMAGE: $text"]
+	} else {
+	    return [Underline "IMAGE: $text $label"]
+	}
+    }
+
+    set _has_images 1
+
+    return "\1\\begin{figure}\[htp\]\1\\includegraphics\[width=0.9\1\\textwidth\]{$img}\1\\end{figure}"
+}
+proc fmt_term    {text} {Italic $text}
+proc fmt_const   {text} {Bold $text}
+proc fmt_mdash {} { return " --- " }
+proc fmt_ndash {} { return " -- " }
+
+################################################################
+# latex specific commands
+
+proc Comment   {text} {return "% [join [split $text \n] "\n% "]"}
+proc Bold      {text} {return "\{\1\\bf [texEscape $text]\}"}
+proc Italic    {text} {return "\{\1\\it [texEscape $text]\}"}
+proc Underline {text} {return "\1\\underline\{[texEscape $text]\}"}
+
+################################################################
+
+proc texEscape {text} {
+    set x 0
+    if {[string match *%* $text]} {
+	#puts_stderr '$text'
+	set x 1
+    }
+
+    # Important: \1 protected sequences are left unchanged, they are already escaped.
+    set text [string map {
+        \1$\\backslash$ \1$\\backslash$ \1$<$ \1$<$ \1$>$ \1$>$
+	\1\\_ \1\\_
+	\1\\% \1\\%
+	\1\\^ \1\\^
+	\1\\$ \1\\$
+	\1\\# \1\\#
+	\1\\& \1\\&
+	\1\\ \1\\
+	\\ \1$\\backslash$
+	_ \1\\_
+	% \1\\%
+	^ \1\\^
+	$ \1\\$
+	< \1$<$
+	> \1$>$
+	# \1\\#
+	& \1\\&
+    } $text]
+    if {$x} {
+	#puts_stderr "==> '$text'"
+    }
+    return $text
+}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.list b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.list
new file mode 100644
index 00000000..15ed7f94
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.list
@@ -0,0 +1,52 @@
+# -*- tcl -*-
+#
+# -- Extraction of basic meta information (title section version) from a manpage.
+#
+# Copyright (c) 2001-2002 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Copyright (c) 2003     Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+################################################################
+
+# Take the null format as a base and extend it a bit.
+dt_source fmt.null
+
+global    data
+array set data {}
+
+proc fmt_numpasses   {}     {return 1}
+proc fmt_postprocess {text} {
+    global data
+    foreach key {seealso keywords} {
+	array set _ {}
+	foreach ref $data($key) {set _($ref) .}
+	set data($key) [array names _]
+	unset _
+    }
+    return [list manpage [array get data]]\n
+}
+proc fmt_plain_text  {text} {return ""}
+proc fmt_setup       {n}    {return}
+
+proc fmt_manpage_begin {title section version} {
+    global data
+    set    data(title)     $title
+    set    data(section)   $section
+    set    data(version)   $version
+    set    data(file)      [dt_file]
+    set    data(fid)       [dt_fileid]
+    set    data(module)    [dt_module]
+    set    data(desc)      ""
+    set    data(shortdesc) ""
+    set    data(keywords)  [list]
+    set    data(seealso)   [list]
+    set    data(category)  ""
+    return
+}
+
+proc fmt_moddesc   {desc} {global data ; set data(shortdesc) $desc}
+proc fmt_titledesc {desc} {global data ; set data(desc)      $desc}
+proc fmt_keywords  {args} {global data ; foreach ref $args {lappend data(keywords) $ref} ; return}
+proc fmt_see_also  {args} {global data ; foreach ref $args {lappend data(seealso)  $ref} ; return}
+proc fmt_category  {text} {global data ; set data(category) $text ; return}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.markdown b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.markdown
new file mode 100644
index 00000000..bf9ea7fe
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.markdown
@@ -0,0 +1,529 @@
+# -*- tcl -*-
+# Convert a doctools document into markdown formatted text
+#
+# Copyright (c) 2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Note: While markdown is a text format its intended target is HTML,
+# making its formatting nearer to that with the ability to set anchors
+# and refer to them, linkage in general.
+
+# Notes, Attention
+# - A number of characters are special to markdown. Such characters in
+#   user input are \-quoted to make them non-special to the markdown
+#   processor handling our generated document.
+#
+# - Exceptions are the special characters in verbatim code-blocks
+#   (indent 4), and in `...` sequences (verbatim inline). In such
+#   blocks they are not special and must not be quoted.
+#
+#   The generator currently only used verbatim blocks, for doctools
+#   examples. It does not use verbatim inlines.
+
+# # ## ### ##### ######## #############
+## Load shared code and modify it to our needs.
+
+dt_source _common.tcl
+dt_source _text.tcl
+dt_source fmt.text
+dt_source _markdown.tcl
+dt_source _xref.tcl
+
+# # ## ### ##### ########
+## Override crucial parts of the regular text formatter
+
+proc In? {} {
+    if {![CAttrHas mdindent]} {
+	CAttrSet mdindent ""
+    }
+    CAttrGet mdindent
+}
+
+proc In! {ws} {
+    CAttrSet mdindent $ws
+}
+
+proc Example {complex} {
+    if {![CAttrHas exenv$complex]} {
+	ContextPush
+	set exenv [NewExample $complex]
+	ContextPop
+	CAttrSet exenv$complex $exenv
+	ContextCommit
+    }
+    return [CAttrGet exenv$complex]
+}
+
+proc NewExample {complex} {
+    return [ContextNew Example$complex {
+	VerbatimOn
+	Example!
+	if {$complex} {
+	    # Block quote
+	    Prefix+ "> "
+	} else {
+	    # Code block
+	    Prefix+ "    "
+	}
+    }] ; # {}
+}
+
+proc NewUnorderedList {} {
+    # Itemized list - unordered list - bullet
+    # 1. Base context provides indentation.
+    # 2. First paragraph in a list item.
+    # 3. All other paragraphs.
+    ContextPush
+
+    #puts_stderr "UL [CAttrName]"
+    #puts_stderr "UL |[string map {{ } _} [In?]]|outer"
+
+    set base [ContextNew Itemized {
+	LC
+	set bullet "[In?]  [IBullet]"
+	set ws     "[BlankM $bullet] "
+	In! $ws
+    }] ; # {}
+
+    #puts_stderr "UL |[string map {{ } _} $bullet]|[string length $bullet]"
+    #puts_stderr "UL |[string map {{ } _} $ws]|[string length $ws]"
+
+    set first [ContextNew First {
+	List! bullet $bullet $ws
+    }] ; ContextSet $base ; # {}
+
+    set next [ContextNew Next {
+	WPrefix! $ws
+	Prefix!  $ws
+    }] ; ContextSet $base ; # {}
+
+    OUL $first $next
+    ContextCommit
+
+    ContextPop
+    ContextSet $base
+    return
+}
+
+proc NewOrderedList {} {
+    # Ordered list - enumeration - enum
+    # 1. Base context provides indentation.
+    # 2. First paragraph in a list item.
+    # 3. All other paragraphs.
+    ContextPush
+
+    #puts_stderr "OL [CAttrName]"
+    #puts_stderr "OL |[string map {{ } _} [In?]]|outer"
+
+    set base [ContextNew Enumerated {
+	LC
+	set bullet "[In?]  [EBullet]"
+	set ws     "[BlankM $bullet] "
+	In! $ws
+    }] ; # {}
+
+    #puts_stderr "OL |[string map {{ } _} $bullet]|[string length $bullet]"
+    #puts_stderr "OL |[string map {{ } _} $ws]|[string length $ws]"
+
+    set first [ContextNew First {
+	List! bullet $bullet $ws
+    }] ; ContextSet $base ; # {}
+
+    set next [ContextNew Next {
+	WPrefix! $ws
+	Prefix!  $ws
+    }] ; ContextSet $base ; # {}
+
+    OUL $first $next
+    ContextCommit
+
+    ContextPop
+    ContextSet $base
+    return
+}
+
+proc NewDefinitionList {} {
+    # Definition list - terms & definitions
+    # 1. Base context provides indentation.
+    # 2. Term context
+    # 3. Definition context
+    ContextPush
+
+    # Markdown has no native definition lists. We translate them into
+    # itemized lists, rendering the term part as the first paragraph
+    # of each entry, and the definition as all following.
+
+    #puts_stderr "DL [CAttrName]"
+    #puts_stderr "DL |[string map {{ } _} [In?]]|outer"
+
+    set base [ContextNew Definitions {
+	LC
+	set bullet "[In?]  [IBullet]"
+	set ws "[BlankM $bullet] "
+	In! $ws
+    }] ; # {}
+
+    #puts_stderr "DL |[string map {{ } _} $bullet]|[string length $bullet]"
+    #puts_stderr "DL |[string map {{ } _} $ws]|[string length $ws]"
+
+    set term [ContextNew Term {
+	List! bullet $bullet $ws
+	VerbatimOn
+    }] ; ContextSet $base ; # {}
+
+    set def [ContextNew Def {
+	WPrefix! $ws
+	Prefix!  $ws
+    }] ; ContextSet $base ; # {}
+
+    TD $term $def
+    ContextCommit
+
+    ContextPop
+    ContextSet $base
+    return
+}
+
+##
+# # ## ### ##### ########
+##
+
+c_pass 1 fmt_section {name id} { c_newSection $name 1 end $id }
+c_pass 2 fmt_section {name id} {
+    CloseParagraph
+    Section [SetAnchor $name $id]
+    return
+}
+
+c_pass 1 fmt_subsection {name id} { c_newSection $name 2 end $id }
+c_pass 2 fmt_subsection {name id} {
+    CloseParagraph
+    Subsection [SetAnchor $name $id]
+    return
+}
+
+proc fmt_sectref {title {id {}}} {
+    if {$id == {}} { set id [c_sectionId $title] }
+    if {[c_sectionKnown $id]} {
+    	return [ALink "[Hash]$id" $title]
+    } else {
+	return [Strong $title]
+    }
+}
+
+c_pass 1 fmt_usage {cmd args} {
+    set text [join [linsert $args 0 $cmd] " "]
+    c_hold synopsis "$text[LB.]"
+}
+
+c_pass 1 fmt_call  {cmd args} {
+    set text [join [linsert $args 0 $cmd] " "]
+    set dest "[Hash][c_cnext]"
+    c_hold synopsis "[MakeLink $text $dest][LB.]"
+}
+c_pass 2 fmt_call {cmd args} {
+    set text [join [linsert $args 0 $cmd] " "]
+    return [fmt_lst_item [SetAnchor $text [c_cnext]]]
+}
+
+c_pass 1 fmt_require {pkg {version {}}} {
+    set result "package require $pkg"
+    if {$version != {}} {append result " $version"}
+    c_hold require "$result  "
+    return
+}
+
+c_pass 2 fmt_tkoption_def {name dbname dbclass} {
+    set    text ""
+    append text "Command-Line Switch:\t[fmt_option $name][LB]"
+    append text "Database Name:\t[Strong $dbname][LB]"
+    append text "Database Class:\t[Strong $dbclass]\n"
+    fmt_lst_item $text
+}
+
+proc fmt_syscmd  {text} { Strong [XrefMatch $text sa] }
+proc fmt_package {text} { Strong [XrefMatch $text sa kw] }
+proc fmt_term    {text} { Em     [XrefMatch $text kw sa] }
+
+proc fmt_arg     {text} { Em     $text }
+proc fmt_cmd     {text} { Strong [XrefMatch $text sa] }
+proc fmt_method  {text} { Strong $text }
+proc fmt_option  {text} { Strong $text }
+
+proc fmt_uri {text {label {}}} {
+    if {$label == {}} { set label $text }
+    ALink $text $label
+}
+
+proc fmt_image {text {label {}}} {
+    # text = symbolic name of the image.
+
+    # formatting based on the available data ...
+
+    set img [dt_imgdst $text {png gif jpg}]
+    if {$img != {}} {
+	set img [LinkTo $img [LinkHere]]
+	if {$label != {}} {
+	    return "[Bang][OBrk][CBrk][OPar]$img \"$label\"[CPar]"
+	} else {
+	    return "[Bang][OBrk][CBrk][OPar]$img[CPar]"
+	}
+    }
+
+    set img [dt_imgdata $text {txt}]
+    if {$img != {}} {
+	# Show ASCII image like an example (code block => fixed font, no reflow)
+	# A label is shown as a pseudo-caption (paragraph after image).
+	fmt_example $img
+	if {$label != {}} {
+	    Text [Strong "IMAGE: $label"]
+	    CloseCurrent
+	}
+    }
+
+    return $img
+}
+
+c_pass 1 fmt_manpage_begin {title section version} {c_cinit ; c_clrSections ; return}
+c_pass 2 fmt_manpage_begin {title section version} {
+    Off
+    MDCInit
+    XrefInit
+    c_cinit
+
+    set module      [dt_module]
+    set shortdesc   [c_get_module]
+    set description [c_get_title]
+    set copyright   [c_get_copyright]
+    set pagetitle   "$title - $shortdesc"
+
+    MDComment  "$title - $shortdesc"
+    MDComment  [c_provenance]
+    if {$copyright != {}} {
+	# Note, multiple copyright clauses => multiple lines, comments
+	# are single-line => split for generation, strip MD markup for
+	# linebreaks, will be re-added when committing the complete
+	# comment block.
+	foreach line [split $copyright \n] {
+	    MDComment [string trimright $line " \t\1"]
+	}
+    }
+    MDComment  "[string trimleft $title :]($section) $version $module \"$shortdesc\""
+    MDCDone
+
+    Text [GetT header @TITLE@ $pagetitle]
+    CloseParagraph
+
+    Section NAME
+    Text "$title - $description"
+    CloseParagraph
+    return
+}
+
+c_pass 2 fmt_description {id} {
+    On
+    set syn [c_held synopsis]
+    set req [c_held require]
+
+    # Create the TOC.
+
+    # Pass 1: We have a number of special sections which were not
+    #         listed explicitly in the document sources. Add them
+    #         now. Note the inverse order for the sections added
+    #         at the beginning.
+
+    c_newSection Description 1 0 $id
+    if {$syn != {} || $req != {}} {c_newSection Synopsis 1 0 synopsis}
+    c_newSection {Table Of Contents} 1 0 toc
+
+    if {[llength [c_xref_seealso]]  > 0} {c_newSection {See Also} 1 end seealso}
+    if {[llength [c_xref_keywords]] > 0} {c_newSection Keywords   1 end keywords}
+    if {[c_xref_category]         ne ""} {c_newSection Category   1 end category}
+    if {[c_get_copyright]         != {}} {c_newSection Copyright  1 end copyright}
+
+    # Pass 2: Generate the markup for the TOC, indenting the
+    #         links according to the level of each section.
+
+    TOC
+
+    # Implicit sections coming after the TOC (Synopsis, then the
+    # description which starts the actual document). The other
+    # implicit sections are added at the end of the document and are
+    # generated by 'fmt_manpage_end' in the second pass.
+    
+    if {$syn != {} || $req != {}} {
+	Section [SetAnchor SYNOPSIS synopsis]
+	if {($req != {}) && ($syn != {})} {
+	    Text $req\n\n$syn
+	} else {
+	    if {$req != {}} {Text $req}
+	    if {$syn != {}} {Text $syn}
+	}
+	CloseParagraph [Verbatim]
+    }
+
+    Section [SetAnchor DESCRIPTION description]
+    return
+}
+
+c_pass 2 fmt_manpage_end {} {
+    set sa [c_xref_seealso]
+    set kw [c_xref_keywords]
+    set ca [c_xref_category]
+    set ct [c_get_copyright]
+
+    CloseParagraph
+    if {[llength $sa]} { Special {SEE ALSO} seealso   [join [XrefList [lsort $sa] sa] ", "] }
+    if {[llength $kw]} { Special KEYWORDS   keywords  [join [XrefList [lsort $kw] kw] ", "] }
+    if {$ca ne ""}     { Special CATEGORY   category  $ca            }
+    if {$ct != {}}     { Special COPYRIGHT  copyright $ct [Verbatim] }
+    return
+}
+
+proc Breaks {lines} {
+    set r {}
+    foreach line $lines { lappend r $line[LB] }
+    return $r
+}
+
+proc LeadSpaces {lines} {
+    set r {}
+    foreach line $lines { lappend r [LeadSpace $line] }
+    return $r
+}
+
+proc LeadSpace {line} {
+    # Split into leading and trailing whitespace, plus content
+    regexp {^([ \t]*)(.*)([ \t]*)$} $line -> lead content _
+    # Drop trailing spaces, make leading non-breaking, keep content (and inner spaces).
+    return [RepeatM "&nbsp;" $lead]$content
+}
+
+c_pass 2 fmt_example_end {} {
+    #puts_stderr "AAA/fmt_example_end"
+    # Flush markup from preceding commands into the text buffer.
+    TextPlain ""
+
+    TextTrimLeadingSpace
+
+    # Check for protected markdown markup in the input. If present
+    # this is a complex example with highlighted parts.
+    set complex [string match *\1* [Text?]]
+
+    #puts_stderr "AAA/fmt_example_end/$complex"
+    
+    # In examples (verbatim markup) markdown's special characters are
+    # no such by default, thus must not be quoted. Mark them as
+    # protected from quoting. Further look for and convert
+    # continuation lines protected from Tcl substitution into a
+    # regular continuation line.
+    set t [Text?]
+    set t [string map [list \\\\\n \\\n] $t]
+    if {$complex} {
+	# Process for block quote
+	# - make leading spaces non-breaking
+	# - force linebreaks
+	set t [join [Breaks [LeadSpaces [split $t \n]]] {}]
+    } else {
+	# Process for code block (verbatim)
+	set t [Mark $t]
+    }
+    TextClear
+    Text $t
+    TextTrimTrailingSpace
+    
+    set penv [GetCurrent]
+    if {$penv != {}} {
+	# In a list we save the current list context, activate the
+	# proper paragraph context and create its example
+	# variant. After closing the paragraph using the example we
+	# restore and reactivate the list context.
+	ContextPush
+	ContextSet $penv
+	CloseParagraph [Example $complex]
+	ContextPop
+    } else {
+	# In a regular paragraph we simple close the example
+	CloseParagraph [Example $complex]
+    }
+
+    #puts_stderr "AAA/fmt_example_end/Done"
+    return
+}
+
+proc c_get_copyright {} {
+    return [join [c_get_copyright_r] [LB]]
+}
+
+##
+# # ## ### ##### ########
+##
+
+proc Special {title id text {p {}}} {
+    Section [SetAnchor $title $id]
+    Text $text
+    CloseParagraph $p
+}
+
+proc TOC {} {
+    # While we could go through (fmt_list_begin itemized, item ...,
+    # fmt_list_end) it looks to be easier to directly emit paragraphs
+    # into the display list. No need to track anything. Just map entry
+    # level directly to the proper context.
+    Section [SetAnchor {Table Of Contents} toc]
+
+    ContextPush
+    lappend toc _bogus_
+    lappend toc [ContextNew TOC/Section { List! bullet "  [Dash]"     "    "     }]
+    lappend toc [ContextNew TOC/SubSect { List! bullet "      [Dash]" "        " }]
+    ContextPop
+
+    foreach {name id level} [c_sections] {
+	# level in {1,2}, 1 = section, 2 = subsection
+	Text [ALink "[Hash]$id" $name]
+	CloseParagraph [lindex $toc $level]
+    }
+
+    return
+}
+
+# # ## ### ##### ########
+## Engine Parameters
+## - xref	cross-reference data
+## - header	HTML or MD to place at the top of the document, before the title.
+
+proc GetXref {} { Get xref } ;# xref access to engine parameters
+
+global    __var
+array set __var {
+    xref   {}
+    header {}
+}
+proc Get               {varname}      {global __var ; return $__var($varname)}
+proc fmt_listvariables {}             {global __var ; return [array names __var]}
+proc fmt_varset        {varname text} {
+    global __var
+    if {![info exists __var($varname)]} {
+	return -code error "Unknown engine variable \"$varname\""
+    }
+    set __var($varname) $text
+    return
+}
+
+# Extended `Get`, templating.
+proc GetT {varname args} {
+    set content [Get $varname]
+    if {$content == {}} { return "" }
+    if {[llength $args]} {
+	set content [string map $args $content]
+    }
+
+    # The content is specified by the user. It is expected to be valid
+    # markdown. That means that any special characters are only quoted
+    # when they are not special. Internally this is inverted.
+
+    return "[Mark $content]\n"
+}
+
+##
+# # ## ### ##### ########
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.nroff b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.nroff
new file mode 100644
index 00000000..74ca8697
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.nroff
@@ -0,0 +1,306 @@
+# -*- tcl -*-
+#
+# -- doctools NROFF formatting engine.
+#
+# Copyright (c) 2001-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# [expand] definitions to convert a tcl based manpage definition into
+# a manpage based upon *roff markup. Additional definition files allow
+# the conversion into HTML and TMML.
+
+
+################################################################
+# Load shared code, load nroff support.
+
+dt_source _common.tcl
+dt_source _nroff.tcl
+
+global _in_example
+set    _in_example 0
+
+################################################################
+# Define the API commands.
+
+# Called to handle plain text from the input
+proc fmt_plain_text {text} {
+    global _in_example
+    if {$_in_example} {
+	set text [string map [list \\\\\n \\\n] $text]
+    }
+    return $text
+}
+
+c_pass 1 fmt_manpage_begin {title section version} c_begin
+c_pass 2 fmt_manpage_begin {title section version} {
+    c_begin
+
+    set module      [dt_module]
+    set shortdesc   [c_get_module]
+    set description [c_get_title]
+    set copyright   [c_get_copyright]
+
+    # compact whitespace
+    foreach v {module shortdesc description copyright} {
+	upvar 0 $v text
+	regsub -all {[ \t]+} $text { } text
+	set text [string trim $text]
+    }
+
+    c_holdBuffers hdr
+
+    c_hold hdr [nr_comment {}]
+    c_hold hdr [nr_comment [c_provenance]]
+    if {$copyright != {}} {
+	c_hold hdr [nr_comment $copyright]
+    }
+    c_hold hdr [nr_comment {}]
+
+    if {[set text [c_held precomments]] != {}} {
+	c_hold hdr $text
+    }
+
+    c_hold hdr [nr_title "\"[string trimleft $title :]\" $section $version $module \"$shortdesc\""]
+    c_hold hdr [nr_read man.macros]
+    c_hold hdr [nr_bolds]
+    c_hold hdr [fmt_section NAME]
+    c_hold hdr "$title \1\\- $description"
+
+    return [c_held hdr]
+}
+
+c_pass 1 fmt_moddesc   {desc} {c_set_module $desc}
+c_pass 2 fmt_moddesc   {desc} NOP
+
+c_pass 1 fmt_titledesc {desc} {c_set_title $desc}
+c_pass 2 fmt_titledesc {desc} NOP
+
+c_pass 1 fmt_copyright {desc} {c_set_copyright $desc}
+c_pass 2 fmt_copyright {desc} NOP
+
+c_pass 1 fmt_manpage_end {} NOP
+c_pass 2 fmt_manpage_end {} {
+
+    # Complete the generation with a copyright
+    # section, if such information is available.
+
+    set nroff ""
+
+    set sa [c_xref_seealso]
+    set kw [c_xref_keywords]
+    set ca [c_xref_category]
+    set ct [c_get_copyright]
+
+    if {[llength $sa] > 0} {
+	append nroff [fmt_section {SEE ALSO}] \n
+	append nroff [join [lsort $sa] ", "] \n
+    }
+    if {[llength $kw] > 0} {
+	append nroff [fmt_section KEYWORDS] \n
+	set kwline [join [lsort $kw] ", "]
+	if { [string match ".*" $kwline] } {
+	    set kwline "\\$kwline" 
+	}
+	append nroff $kwline \n
+    }
+    if {$ca ne ""} {
+	append nroff [fmt_section CATEGORY] \n
+	append nroff $ca \n
+    }
+    if {$ct != {}} {
+	append nroff [fmt_section COPYRIGHT] \n
+	append nroff [nr_nofill] \n
+	append nroff $ct \n
+	append nroff [nr_fill]
+    }
+    return $nroff
+}
+
+proc fmt_postprocess {nroff} { nroff_postprocess $nroff }
+
+proc fmt_section    {name {id {}}} {return [nr_section    $name]}
+proc fmt_subsection {name {id {}}} {return [nr_subsection $name]}
+proc fmt_para {} {
+    if {[dt_lnesting]} { return [nr_item] }
+    nr_p
+}
+
+c_pass 2 fmt_require {pkg {version {}}} NOP
+c_pass 1 fmt_require {pkg {version {}}} {
+    if {$version != {}} {set version " $version"}
+    c_hold synopsis "package require [nr_bld]$pkg $version[nr_rst]\n[nr_vspace]"
+}
+
+c_pass 1 fmt_usage {cmd args} {c_hold synopsis "$cmd [join $args " "]\n[nr_vspace]"}
+c_pass 2 fmt_usage {cmd args} NOP
+
+c_pass 1 fmt_call  {cmd args} {c_hold synopsis       "$cmd [join $args " "]\n[nr_vspace]"}
+c_pass 2 fmt_call  {cmd args} {return "[fmt_lst_item "$cmd [join $args " "]"]"}
+
+c_pass 1 fmt_description {id} NOP
+c_pass 2 fmt_description {id} {
+    set text ""
+    if {[set syn [c_held synopsis]] != {}} {
+	append text [fmt_section SYNOPSIS]\n
+	append text ${syn}\n
+	append text [nr_bolde]\n
+    }
+    append text [fmt_section DESCRIPTION]
+    return $text
+}
+
+################################################################
+
+global    list_state
+array set list_state {level -1}
+
+proc fmt_list_begin {what {hint {}}} {
+    c_cinit
+    if {[dt_lnesting]} { return [nr_in] }
+    return {}
+}
+
+proc fmt_list_end {} {
+    c_creset
+    if {[dt_lnesting]} {
+	return [nr_out][nr_item]
+    } else {
+	return [nr_p]
+    }
+}
+
+proc fmt_enum     {}        {return [nr_item " \[[c_cnext]\]\n"]}
+proc fmt_bullet   {}        {return [nr_item " \1\\(bu\n"]}
+proc fmt_lst_item {text}    {return [nr_blt $text]\n}
+proc fmt_cmd_def  {command} {return [nr_blt [fmt_cmd $command]]\n}
+
+proc fmt_arg_def {type name {mode {}}} {
+    set    text [nr_blt ""]
+    append text "$type [fmt_arg $name]"
+    if {$mode != {}} {append text " ($mode)"}
+    return $text\n
+}
+proc fmt_opt_def {name {arg {}}} {
+    #if {[string match -* $name]} {set name \1\\$name}
+    set name [fmt_option $name]
+    if {$arg != {}} {append name " $arg"}
+    return [nr_blt $name]\n
+}
+proc fmt_tkoption_def {name dbname dbclass} {
+    set    text ""
+    append text "[nr_lp]\n"
+    append text "[nr_nofill]\n"
+    append text "[nr_ta " 6c"]\n"
+    append text "Command-Line Switch:\t[bold $name]\n"
+    append text "Database Name:\t[bold $dbname]\n"
+    append text "Database Class:\t[bold $dbclass]\n"
+    append text "[nr_fill]\n"
+    append text "[nr_item]\n"
+    return $text
+}
+
+################################################################
+
+proc fmt_example_begin {} {
+    global _in_example ; set _in_example 1
+    return [nr_cs]\n
+}
+proc fmt_example_end   {} {
+    global _in_example ; set _in_example 0
+    if {[dt_lnesting]} {
+	return [nr_ce][nr_item]
+    }
+    nr_ce
+}
+proc fmt_example {code} {
+    global _in_example ; set _in_example 1
+    set lines [list "" [nr_cs]]
+    foreach line [split $code "\n"] {
+    	lappend lines [fmt_plain_text $line]
+    }
+    lappend lines [nr_ce] ""
+    set _in_example 0
+    return [join $lines "\n"]
+}
+
+proc fmt_nl     {}     {nr_vspace}
+proc fmt_arg    {text} {underline $text}
+proc fmt_cmd    {text} {bold      $text}
+proc fmt_emph   {text} {underline $text}
+proc fmt_opt    {text} {return   ?$text?}
+
+proc bold {text} {
+    # .B don't work in .TP (nr_blt)
+    if {1||[string match *\n* $text]} {
+	return [nr_bld]$text[nr_rst]
+    } else {
+	return [nr_bldt $text]
+    }
+}
+proc underline {text} {
+    return [nr_ul]$text[nr_rst]
+}
+
+proc fmt_comment {text} {
+    set res [list]
+    foreach l [split $text \n] {
+	lappend res [nr_comment $l]
+    }
+    if {[c_begun]} {
+	return [join $res \n]
+    } else {
+	if {[c_inpass] == 1} {
+	    c_hold precomments [join $res \n]
+	}
+	return ""
+    }
+}
+proc fmt_sectref {text {label {}}} {
+    if {![string length $label]} {set label $text}
+    bold $text
+}
+proc fmt_syscmd  {text} {bold $text}
+proc fmt_method  {text} {bold $text}
+proc fmt_option  {text} {bold $text}
+proc fmt_widget  {text} {bold $text}
+proc fmt_fun     {text} {bold $text}
+proc fmt_type    {text} {bold $text}
+proc fmt_package {text} {bold $text}
+proc fmt_class   {text} {bold $text}
+proc fmt_var     {text} {bold $text}
+proc fmt_file    {text} {return "\"[underline $text]\""}
+proc fmt_namespace     {text} {bold $text}
+proc fmt_uri     {text {label {}}} {
+    if {$label == {}} {
+	# Without label we use the link directly as part of the text.
+	return [underline $text]
+    } else {
+	# with label and link we use the label directly, and the
+	# link comes in parentheses after that.
+
+	return "[underline $label] \[$text\]"
+    }
+}
+proc fmt_image {text {label {}}} {
+    # text = symbolic name of the image.
+
+    set img [dt_imgdata $text {pic}]
+    if {$img ne {}} {
+	return \n\1.PS\n$img\n\1.PE\n
+    }
+    set img [dt_imgdata $text {txt}]
+    if {$img ne {}} {
+	return \n\1.PS\n\1.nf\n$img\n\1.fi\n\1.PE\n
+    }
+    if {$label eq {}} {
+	return "IMAGE: $text"
+    } else {
+	return "IMAGE: $text $label"
+    }
+}
+proc fmt_term    {text} {underline $text}
+proc fmt_const   {text} {bold $text}
+
+proc fmt_mdash {} { return " \1\\(em\n" }
+proc fmt_ndash {} { return " \1\\(en\n" }
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.null b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.null
new file mode 100644
index 00000000..1b2eee07
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.null
@@ -0,0 +1,30 @@
+# -*- tcl -*-
+#
+# -- Null format
+#
+# Copyright (c) 2001-2002 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Copyright (c) 2003      Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# This is a null format which does return no output at all.
+
+################################################################
+
+proc fmt_initialize  {}     {return}
+proc fmt_shutdown    {}     {return}
+proc fmt_numpasses   {}     {return 1}
+proc fmt_postprocess {text} {return ""}
+proc fmt_plain_text  {text} {return ""}
+proc fmt_setup       {n}    {return}
+
+foreach p {
+    manpage_begin moddesc titledesc manpage_end require description
+    section para list_begin list_end lst_item call usage bullet enum
+    arg_def cmd_def opt_def tkoption_def see_also keywords example
+    example_begin example_end nl arg cmd opt emph comment image mdash
+    sectref syscmd method option widget fun type package class var
+    file uri term const copyright namespace subsection category ndash
+} {
+    proc fmt_$p {args} {return ""}
+}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.text b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.text
new file mode 100644
index 00000000..5da08a64
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.text
@@ -0,0 +1,565 @@
+# -*- tcl -*-
+#
+# -- Engine to convert a doctools document into plain text.
+#
+# Copyright (c) 2003-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# # ## ### ##### ######## #############
+## Load shared code and modify it to our needs.
+
+dt_source _common.tcl
+dt_source _text.tcl
+
+proc c_copyrightsymbol {} {return "(c)"}
+
+# # ## ### ##### ########
+## Special manpage contexts
+
+# example     = if present, context is for an example
+# exenv       = if present, reference to example variant of current context
+
+proc Example!  {} { CAttrSet example . }
+proc Example?  {} { CAttrHas example }
+
+proc NewExample {} {
+    return [ContextNew Example { VerbatimOn ; Example! ; Prefix! "| " }] ; # {}
+}
+
+proc Example {} {
+    if {![CAttrHas exenv]} {
+	ContextPush
+	set exenv [NewExample]
+	ContextPop
+	CAttrSet exenv $exenv
+	ContextCommit
+    }
+    return [CAttrGet exenv]
+}
+
+proc NewList {what} {
+    # List contexts
+    # Per list type several contexts are required.
+    #puts_stderr "LIST OUT [CAttrName] NewList $what"
+    
+    switch -exact -- $what {
+	enumerated {NewOrderedList}
+	itemized   {NewUnorderedList}
+	arguments -
+	commands  -
+	options   -
+	tkoptions -
+	definitions {NewDefinitionList}
+    }
+
+    #puts_stderr "LIST INN [CAttrName]"
+    return
+}
+
+proc NewUnorderedList {} {
+    # Itemized list - unordered list - bullet
+    # 1. Base context provides indentation.
+    # 2. First paragraph in a list item.
+    # 3. All other paragraphs.
+    ContextPush
+
+    set base [ContextNew Itemized {
+	LC
+	MarginIn
+	set bullet [IBullet]
+    }] ; # {}
+
+    set first [ContextNew First {
+	List! bullet $bullet [BlankMargin]
+    }] ; ContextSet $base ; # {}
+
+    set next [ContextNew Next {
+	MarginIn
+    }] ; ContextSet $base ; # {}
+
+    OUL $first $next
+    ContextCommit
+
+    ContextPop
+    ContextSet $base
+    return
+}
+
+proc NewOrderedList {} {
+    # Ordered list - enumeration - enum
+    # 1. Base context provides indentation.
+    # 2. First paragraph in a list item.
+    # 3. All other paragraphs.
+    ContextPush
+    
+    set base [ContextNew Enumerated {
+	LC
+	MarginIn
+	set bullet [EBullet]
+    }] ; # {}
+
+    set first [ContextNew First {
+	List! enum $bullet [BlankMargin]
+    }] ; ContextSet $base ; # {}
+
+    set next [ContextNew Next {
+	MarginIn
+    }] ; ContextSet $base ; # {}
+
+    OUL $first $next
+    ContextCommit
+
+    ContextPop
+    ContextSet $base
+    return
+}
+
+proc NewDefinitionList {} {
+    # Definition list - terms & definitions
+    # 1. Base context provides indentation.
+    # 2. Term context
+    # 3. Definition context
+    ContextPush
+
+    set base [ContextNew Definitions {
+	LC
+	MarginIn
+    }] ; # {}
+
+    set term [ContextNew Term {
+	VerbatimOn
+    }] ; ContextSet $base ; # {}
+
+    set def [ContextNew Def {
+	MarginIn
+    }] ; ContextSet $base ; # {}
+
+    TD $term $def
+    ContextCommit
+    
+    ContextPop
+    ContextSet $base
+    return
+}
+
+# # ## ### ##### ########
+##
+
+proc LC {} {
+    # Clear inherited list type information from the current context
+    CAttrUnset _first
+    CAttrUnset _next
+    CAttrUnset _term
+    CAttrUnset _definition
+}
+
+proc OUL {f n} {
+    CAttrSet _first $f
+    CAttrSet _next  $n
+}
+
+proc TD {t d} {
+    CAttrSet _term       $t
+    CAttrSet _definition $d
+}
+
+proc IsPara   {} { CAttrHas _next }
+proc Paras    {} { global __pcount ; set  __pcount }
+proc PAdvance {} {
+    global __pcount ; incr __pcount 1
+    #puts_stderr "    ZZZ/ItemParas/Advance:$__pcount"
+}
+proc PReset   {} {
+    #puts_stderr "    ZZZ/ItemParas/Reset"
+    global __pcount ; set  __pcount 0 }
+
+global __pcount  ; set __pcount  0
+global __pcstack ; set __pcstack {}
+
+proc PSave {} {
+    global __pcount __pcstack
+    lappend __pcstack $__pcount
+    PReset
+}
+
+proc PRestore {} {
+    global __pcount __pcstack
+    set __pcount  [lindex $__pcstack end]
+    set __pcstack [lrange $__pcstack 0 end-1]
+    #puts_stderr "    ZZZ/ItemParas/Restore:$__pcount"
+    return
+}
+
+proc First    {} { CAttrGet _first }
+proc Other    {} { CAttrGet _next }
+proc Term     {} { CAttrGet _term }
+proc Def      {} { CAttrGet _definition }
+proc IsDef    {} { CAttrHas _definition }
+
+# # ## ### ##### ########
+##
+
+proc CloseCurrent {} {
+    if {[IsDef]} {
+	#puts_stderr "    ZZZ/CloseCurrent/Definitions"
+	# Currently in a definition list.
+	CloseParagraph [Def]
+    } elseif {[IsPara]} {
+	#puts_stderr "    ZZZ/CloseCurrent/UOL"
+	# Currently in an (un)ordered list.
+	#puts_stderr "    ZZZ/ItemParas/[Paras]"
+	if {![Paras]} {
+	    # No paragraphs yet, this is first in the item
+	    if {[CloseParagraph [First]]} PAdvance
+	} else {
+	    # More paragraphs in the item
+	    if {[CloseParagraph [Other]]} PAdvance
+	}
+    } else {
+	#puts_stderr "    ZZZ/CloseCurrent/Plain"
+	# Currently in a regular paragraph
+	CloseParagraph
+    }
+}
+
+proc GetCurrent {} {
+    if {[IsDef]} {
+	#puts_stderr "    ZZZ/GetCurrent/Definitions"
+	# Currently in a definition list.
+	return [Def]
+    } elseif {[IsPara]} {
+	#puts_stderr "    ZZZ/GetCurrent/UOL"
+	# Currently in an (un)ordered list.
+	#puts_stderr "    ZZZ/ItemParas/[Paras]"
+	if {![Paras]} {
+	    set res [First]
+	} else {
+	    set res [Other]
+	}
+	PAdvance
+	return $res
+    } else {
+	#puts_stderr "    ZZZ/GetCurrent/Plain"
+	# Currently in a regular paragraph
+	return {}
+    }
+}
+
+# # ## ### ##### ########
+##
+
+c_holdBuffers require
+
+rename fmt_initialize   BaseInitialize
+proc fmt_initialize {} {BaseInitialize ; TextInitialize ; return}
+
+proc fmt_postprocess {text} { text_postprocess $text }
+
+# # ## ### ##### ########
+## Implementations of the formatting commands.
+
+c_pass 1 fmt_plain_text {text} NOP
+c_pass 2 fmt_plain_text {text} { text_plain_text $text }
+
+c_pass 1 fmt_manpage_begin {title section version} NOP
+c_pass 2 fmt_manpage_begin {title section version} {
+    Off
+    set module      [dt_module]
+    set shortdesc   [c_get_module]
+    set description [c_get_title]
+
+    set     hdr [list]
+    lappend hdr "$title - $shortdesc"
+    lappend hdr [c_provenance]
+    lappend hdr "[string trimleft $title :]($section) $version $module \"$shortdesc\""
+    set     hdr [join $hdr \n]
+
+    Text $hdr
+    CloseParagraph [Verbatim]
+    Section NAME
+    Text "$title - $description"
+    CloseParagraph
+    return
+}
+
+c_pass 1 fmt_moddesc   {desc} {c_set_module $desc}
+c_pass 2 fmt_moddesc   {desc} NOP
+
+c_pass 1 fmt_titledesc {desc} {c_set_title $desc}
+c_pass 2 fmt_titledesc {desc} NOP
+
+c_pass 1 fmt_copyright {desc} {c_set_copyright $desc}
+c_pass 2 fmt_copyright {desc} NOP
+
+c_pass 1 fmt_manpage_end {} NOP
+c_pass 2 fmt_manpage_end {} {
+    set sa [c_xref_seealso]
+    set kw [c_xref_keywords]
+    set ca [c_xref_category]
+    set ct [c_get_copyright]
+
+    CloseParagraph
+    if {[llength $sa] > 0} {Section {SEE ALSO} ; Text [join [lsort $sa] ", "] ; CloseParagraph}
+    if {[llength $kw] > 0} {Section KEYWORDS   ; Text [join [lsort $kw] ", "] ; CloseParagraph}
+    if {$ca ne ""}         {Section CATEGORY   ; Text $ca                     ; CloseParagraph}
+    if {$ct != {}}         {Section COPYRIGHT  ; Text $ct ; CloseParagraph [Verbatim]}
+    return
+}
+
+c_pass 1 fmt_section     {name {id {}}} NOP
+c_pass 2 fmt_section     {name {id {}}} {CloseParagraph ; Section $name ; return}
+
+c_pass 1 fmt_subsection  {name {id {}}} NOP
+c_pass 2 fmt_subsection  {name {id {}}} {CloseParagraph ; Subsection $name ; return}
+
+c_pass 1 fmt_para {} NOP
+c_pass 2 fmt_para {} {
+    CloseCurrent
+    #puts_stderr "AAA/fmt_para/START"
+    return
+}
+
+# NL is an alias of PARA
+# See also fmt_example_begin
+c_pass 1 fmt_nl {} NOP
+c_pass 2 fmt_nl {} {CloseCurrent ; return }
+
+c_pass 2 fmt_require {pkg {version {}}} NOP
+c_pass 1 fmt_require {pkg {version {}}} {
+    set result "package require $pkg"
+    if {$version != {}} {append result " $version"}
+    c_hold require $result
+    return
+}
+
+c_pass 1 fmt_usage {cmd args} {c_hold synopsis "$cmd [join $args " "]"}
+c_pass 2 fmt_usage {cmd args} NOP
+
+c_pass 1 fmt_call  {cmd args} {c_hold synopsis "$cmd [join $args " "]"}
+c_pass 2 fmt_call  {cmd args} {fmt_lst_item "$cmd [join $args " "]"}
+
+
+c_pass 1 fmt_description {id} NOP
+c_pass 2 fmt_description {id} {
+    On
+    set syn [c_held synopsis]
+    set req [c_held require]
+
+    if {$syn != {} || $req != {}} {
+	Section SYNOPSIS
+	if {($req != {}) && ($syn != {})} {
+	    Text $req\n\n$syn
+	} else {
+	    if {$req != {}} {Text $req}
+	    if {$syn != {}} {Text $syn}
+	}
+	CloseParagraph [Verbatim]
+    }
+
+    Section DESCRIPTION
+    return
+}
+
+# # ## ### ##### ########
+##
+
+c_pass 1 fmt_list_begin {what {hint {}}} NOP
+c_pass 2 fmt_list_begin {what {hint {}}} {
+    CloseCurrent
+
+    #puts_stderr "AAA/fmt_list_begin/Setup $what"
+
+    ContextPush ;# push outer
+    NewList $what ;# base/controller of current/new/inner
+    Off
+    PSave
+
+    #puts_stderr "AAA/fmt_list_begin/Enter"
+    return
+}
+
+c_pass 1 fmt_list_end {} NOP
+c_pass 2 fmt_list_end {} {
+    CloseCurrent
+
+    #puts_stderr "AAA/fmt_list_end/Exit"
+
+    ContextPop ;# return to outer
+    PRestore
+
+    #puts_stderr "AAA/fmt_list_end/Done"
+    return
+}
+
+c_pass 1 fmt_lst_item {text} NOP
+c_pass 2 fmt_lst_item {text} {
+    if {[IsOff]} { On } else { CloseParagraph [Def] }
+
+    #puts_stderr "AAA/fmt_lst_item/(($text))"
+
+    Text $text
+    CloseParagraph [Term]
+
+    #puts_stderr "AAA/fmt_lst_item/Done"
+    return
+}
+
+c_pass 1 fmt_bullet {} NOP
+c_pass 2 fmt_bullet {} {
+    if {[IsOff]} { On } else { CloseCurrent }
+
+    #puts_stderr "AAA/fmt_bullet/START"
+    PReset
+    return
+}
+
+c_pass 1 fmt_enum {} NOP
+c_pass 2 fmt_enum {} {
+    if {[IsOff]} { On } else { CloseCurrent }
+
+    #puts_stderr "AAA/fmt_enum/START"
+    PReset
+    return
+}
+
+c_pass 1 fmt_cmd_def  {command} NOP
+c_pass 2 fmt_cmd_def  {command} {fmt_lst_item [fmt_cmd $command]}
+
+c_pass 1 fmt_arg_def {type name {mode {}}} NOP
+c_pass 2 fmt_arg_def {type name {mode {}}} {
+    set text "$type [fmt_arg $name]"
+    if {$mode != {}} {append text " ($mode)"}
+    fmt_lst_item $text
+    return
+}
+
+c_pass 1 fmt_opt_def {name {arg {}}} NOP
+c_pass 2 fmt_opt_def {name {arg {}}} {
+    set text [fmt_option $name]
+    if {$arg != {}} {append text " $arg"}
+    fmt_lst_item $text
+    return
+}
+
+c_pass 1 fmt_tkoption_def {name dbname dbclass} NOP
+c_pass 2 fmt_tkoption_def {name dbname dbclass} {
+    set    text ""
+    append text "Command-Line Switch:\t[fmt_option $name]\n"
+    append text "Database Name:\t[Strong $dbname]\n"
+    append text "Database Class:\t[Strong $dbclass]\n"
+    fmt_lst_item $text
+}
+
+# # ## ### ##### ########
+##
+
+c_pass 1 fmt_example_begin {} NOP
+c_pass 2 fmt_example_begin {} {
+    #puts_stderr "AAA/fmt_example_begin"
+
+    CloseCurrent
+
+    #puts_stderr "AAA/fmt_example_begin/Done"
+    return
+}
+
+c_pass 1 fmt_example_end {} NOP
+c_pass 2 fmt_example_end {} {
+    #puts_stderr "AAA/fmt_example_end"
+    #puts_stderr AAA/EIN=[string map [list \1 \\1 \t \\t { } \\s] <<[join [split [Text?] \n] >>\n<<]>>]
+
+    # Flush markup from preceding commands into the text buffer.
+    TextPlain ""
+    
+    TextTrimLeadingSpace
+
+    # Look for and convert continuation lines protected from Tcl
+    # substitution into a regular continuation line.
+    set t [string map [list \\\\\n \\\n] [Text?]]
+    TextClear
+    Text $t
+
+    #puts_stderr AAA/EFT=[string map [list \1\\1 \t \\t { } \\s] <<[join [split [Text?] \n] >>\n<<]>>]
+    
+    set penv [GetCurrent]
+    if {$penv != {}} {
+	# In a list we save the current list context, activate the
+	# proper paragraph context and create its example
+	# variant. After closing the paragraph using the example we
+	# restore and reactivate the list context.
+	ContextPush
+	ContextSet $penv
+	#if {[CloseParagraph [Example]]} PAdvance
+	CloseParagraph [Example]
+	ContextPop
+    } else {
+	# In a regular paragraph we simple close the example
+	#if {[CloseParagraph [Example]]} PAdvance
+	CloseParagraph [Example]
+    }
+
+    #puts_stderr "AAA/fmt_example_end/Done"
+    return
+}
+
+c_pass 1 fmt_example {code} NOP
+c_pass 2 fmt_example {code} {
+    fmt_example_begin
+    fmt_plain_text $code
+    fmt_example_end
+    return
+}
+
+# # ## ### ##### ########
+## Visual markup of words and phrases.
+
+proc fmt_arg     {text} { return $text }
+proc fmt_cmd     {text} { return $text }
+proc fmt_emph	 {text} { Em     $text }
+proc fmt_opt     {text} { return "?$text?" }
+proc fmt_comment {text} { return }
+proc fmt_sectref {text {label {}}} {
+    if {![string length $label]} {set label $text}
+    return "-> $text"
+}
+
+proc fmt_syscmd  {text} { Strong $text }
+proc fmt_method  {text} { return $text }
+proc fmt_option  {text} { return $text }
+proc fmt_widget  {text} { Strong $text }
+proc fmt_fun     {text} { Strong $text }
+proc fmt_type    {text} { Strong $text }
+proc fmt_package {text} { Strong $text }
+proc fmt_class   {text} { Strong $text }
+proc fmt_var     {text} { Strong $text }
+proc fmt_file    {text} { return "\"$text\"" }
+proc fmt_namespace     {text} { Strong $text }
+proc fmt_uri     {text {label {}}} {
+    if {$label == {}} {
+	# Without label we use the link directly as part of the text.
+	return "<URL:$text>"
+    } else {
+	return "[Em $label] <URL:$text>"
+    }
+}
+proc fmt_image {text {label {}}} {
+    # text = symbolic name of the image.
+
+    set img [dt_imgdata $text {txt}]
+    if {$img != {}} {
+	if {$label == {}} {
+	    return "IMAGE: $text"
+	} else {
+	    return "IMAGE: $text $label"
+	}
+    }
+
+    return $img
+}
+
+proc fmt_term    {text} { Em     $text }
+proc fmt_const   {text} { Strong $text }
+proc fmt_mdash {} { return " --- " }
+proc fmt_ndash {} { return " -- " }
+
+# # ## ### ##### ########
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.tmml b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.tmml
new file mode 100644
index 00000000..3e95522f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.tmml
@@ -0,0 +1,308 @@
+# -*- tcl -*-
+#
+# $Id: fmt.tmml,v 1.27 2010/07/06 18:49:15 andreas_kupries Exp $
+#
+# [expand] definitions to convert a tcl based manpage definition
+# into TMML.
+#
+# Copyright (C) 2001 Joe English <jenglish@sourceforge.net>.
+# Freely redistributable.
+#
+# See also <URL: http://tmml.sourceforge.net>
+#
+# BUGS:
+#	+ Text must be preceded by [para] or one of the
+#	  list item macros, or else the output will be invalid.
+#
+######################################################################
+
+dt_source _common.tcl
+dt_source _xml.tcl
+
+######################################################################
+# Conversion specification.
+#
+# Two-pass processing.  The first pass collects text for the
+# SYNOPSIS, SEE ALSO, and KEYWORDS sections, and the second pass
+# produces output.
+#
+
+c_holdBuffers synopsis see_also keywords
+
+variable block {section dd li desc}	;# block context elements
+
+proc fmt_nl  	{}	{ emptyElement br }
+proc fmt_arg 	{text}	{ wrap $text m }
+proc fmt_cmd	{text}	{ wrap $text cmd }
+proc fmt_emph	{text}	{ wrap $text emph }
+proc fmt_opt 	{text}	{ wrap $text o }
+
+c_pass 1 fmt_example_begin {}	NOP
+c_pass 1 fmt_example_end {} 	NOP
+c_pass 1 fmt_example {code}	NOP
+c_pass 2 fmt_example_begin {}	{
+    global inexample ; set inexample 1
+    sequence [xmlContext $::block] [start example]
+}
+c_pass 2 fmt_example_end   {}	{
+    global inexample ; set inexample 0
+    end example
+}
+c_pass 2 fmt_example {code} {
+    set code [string map [list \\\\\n \\\n] $code]
+    sequence [xmlContext $::block] [wrap $code example]
+}
+
+global inexample
+set    inexample 0
+
+proc fmt_plain_text {text} {
+    global inexample
+    if {$inexample} {
+	set text [string map [list \\\\\n \\\n] $text]
+    }
+    return $text
+}
+
+proc fmt_comment {text} {xmlComment $text}
+proc fmt_sectref {text {id {}}} {
+    global SectionNames
+    if {$id == {}} {
+	set id [c_sectionId $text]
+    }
+    if {[info exists SectionNames($id)]} {
+	return "[startTag ref refid $id]$text[endTag ref]"
+    } else {
+	return [wrap $text emph]
+    }
+}
+proc fmt_syscmd  {text} {wrap $text syscmd}
+proc fmt_method  {text} {wrap $text method}
+proc fmt_option  {text} {wrap $text option}
+proc fmt_widget  {text} {wrap $text widget}
+proc fmt_fun     {text} {wrap $text fun}
+proc fmt_type    {text} {wrap $text type}
+proc fmt_package {text} {wrap $text package}
+proc fmt_class   {text} {wrap $text class}
+proc fmt_var     {text} {wrap $text variable}
+proc fmt_file    {text} {wrap $text file}
+proc fmt_namespace     {text} {wrap $text term}
+proc fmt_uri     {text {label {}}} {
+    # TMML ignores the label
+    wrap $text url
+}
+proc fmt_term    {text} {wrap $text term}
+proc fmt_const   {text} {wrap $text l}
+
+proc fmt_mdash {} { return "[markup &]mdash;" }
+proc fmt_ndash {} { return "[markup &]ndash;" }
+
+
+c_pass 1 fmt_manpage_begin {args} NOP
+c_pass 2 fmt_manpage_begin {title section version} {
+    set headInfo [list]
+    foreach copyrightLine [split [c_get_copyright] "\n"] {
+    	lappend headInfo [emptyElement info key copyright value $copyrightLine] 
+    }
+    # ... other metadata here if needed ...
+
+    sequence \
+	[xmlComment [c_provenance]] \
+	[start manpage \
+	    id  	[dt_fileid] \
+	    cat 	cmd \
+	    title	$title \
+	    version	$version \
+	    package	[dt_module]] \
+	[wrapLines? [join $headInfo \n] head] \
+	[start namesection] \
+	[wrap $title name] \
+	[wrap [c_get_title] desc] \
+	[end namesection] \
+	;
+}
+
+c_pass 1 fmt_moddesc   {desc} {c_set_module $desc}
+c_pass 1 fmt_titledesc {desc} {c_set_title $desc}
+c_pass 1 fmt_copyright {desc} {c_set_copyright $desc}
+
+c_pass 2 fmt_moddesc     {args} NOP
+c_pass 2 fmt_titledesc   {args} NOP
+c_pass 2 fmt_copyright   {desc} NOP
+
+c_pass 1 fmt_description {id} NOP
+c_pass 2 fmt_description {id} {
+    sequence \
+	[xmlContext manpage] \
+	[wrapLines? [c_held synopsis] syntax synopsis] \
+	[start section id $id] \
+	[wrap "DESCRIPTION" title] \
+	;
+}
+
+c_pass 1 fmt_section {name {id {}}} {c_newSection $name 1 end $id}
+c_pass 2 fmt_section {name {id {}}} {
+    if {$id == {}} { set id [c_sectionId $name] }
+    sequence \
+	[xmlContext manpage] \
+    	[start section id $id] \
+	[wrap [string toupper $name] title] \
+	;
+}
+
+c_pass 1 fmt_subsection {name {id {}}} {c_newSection $name 2 end $id}
+c_pass 2 fmt_subsection {name {id {}}} {
+    if {$id == {}} { set id [c_sectionId $name] }
+    sequence \
+	[xmlContext section] \
+    	[start subsection id $id] \
+	[wrap [string toupper $name] title] \
+	;
+}
+
+c_pass 1 fmt_para {} NOP
+c_pass 2 fmt_para {} { sequence [xmlContext section] [start p] }
+
+foreach {type gi} {
+    itemized	ul
+    enumerated	ol
+    definitions	dl
+    arguments	arglist
+    commands	commandlist
+    options	optlist
+    tkoptions	optionlist
+} {
+    set listTypes($type) $gi
+    lappend listGIs $gi
+}
+
+c_pass 1 fmt_list_begin {what {hint {}}} NOP
+c_pass 1 fmt_list_end {} NOP
+c_pass 2 fmt_list_begin {what {hint {}}} {
+    variable listTypes
+    sequence \
+    	[xmlContext $::block] \
+	[start $listTypes($what)] \
+	;
+}
+c_pass 2 fmt_list_end {} {
+    variable listGIs
+    sequence \
+	[xmlContext $listGIs] \
+	[end] \
+	;
+}
+
+c_pass 1 fmt_bullet {}	NOP
+c_pass 1 fmt_enum {} 		NOP
+c_pass 2 fmt_bullet {} 	{ sequence [xmlContext {ul ol}] [start li] }
+c_pass 2 fmt_enum {} 		{ sequence [xmlContext {ul ol}] [start li] }
+
+c_pass 1 fmt_lst_item {text} NOP
+c_pass 2 fmt_lst_item {text} {
+    sequence \
+    	[xmlContext dl] \
+	[start dle] \
+	[wrap $text dt] \
+	[start dd] \
+	;
+}
+
+c_pass 1 fmt_arg_def {type name {mode {}}} NOP
+c_pass 2 fmt_arg_def {type name {mode {}}} {
+    sequence \
+    	[xmlContext arglist] \
+	[start argdef] \
+	[wrap $type argtype] \
+	[wrap $name name] \
+	[wrap? $mode argmode] \
+	[start desc] \
+	;
+}
+
+c_pass 1 fmt_cmd_def {command} NOP
+c_pass 2 fmt_cmd_def {command} {
+    sequence \
+    	[xmlContext commandlist] \
+	[start commanddef] \
+	[wrap $command command] \
+	[start desc] \
+	;
+}
+
+c_pass 1 fmt_opt_def {name {arg {}}} NOP
+c_pass 2 fmt_opt_def {name {arg {}}} {
+    sequence \
+    	[xmlContext optlist] \
+	[start optdef] \
+	[wrap $name optname] \
+	[wrap? $arg optarg] \
+	[start desc] \
+	;
+}
+
+c_pass 1 fmt_tkoption_def {name dbname dbclass}  NOP
+c_pass 2 fmt_tkoption_def {name dbname dbclass} {
+    sequence \
+    	[xmlContext optionlist] \
+	[start optiondef] \
+	[wrap $name name] \
+	[wrap $dbname dbname] \
+	[wrap $dbclass dbclass] \
+	[start desc] \
+	;
+}
+
+c_pass 1 fmt_usage {cmd args} { c_hold synopsis [formatCall $cmd $args] }
+c_pass 2 fmt_usage {cmd args} NOP
+
+c_pass 1 fmt_call {cmd args} { c_hold synopsis [formatCall $cmd $args] }
+c_pass 2 fmt_call {cmd args} {
+    sequence \
+    	[xmlContext dl] \
+	[start dle] \
+	[wrap [formatCall $cmd $args] dt] \
+	[start dd] \
+	;
+}
+proc formatCall {cmd arglist} {
+    return "$cmd [join $arglist { }]"	;# OR: wrap "..." command
+}
+
+c_pass 1 fmt_require {pkg {version {}}} {
+    c_hold synopsis [formatRequire $pkg $version]
+}
+c_pass 2 fmt_require {pkg {version {}}} NOP
+proc formatRequire {pkg version} {
+    return "package require [wrap $pkg package] $version"
+}
+
+# Note: TMML apparently has no support for category data inside of the document.
+
+c_pass 1 fmt_see_also	{args} { holdWrapped see_also $args ref }
+c_pass 1 fmt_keywords   {args} { holdWrapped keywords $args keyword }
+c_pass 1 fmt_category	{args} NOP
+c_pass 2 fmt_see_also	{args} NOP
+c_pass 2 fmt_keywords	{args} NOP
+c_pass 2 fmt_category	{args} NOP
+
+# holdWrapped --
+#	Common factor of [see_also] and [keywords].
+#
+proc holdWrapped {buffer arglist gi} {
+    foreach arg $arglist { c_hold $buffer [wrap $arg $gi] }
+    return
+}
+
+c_pass 1 fmt_manpage_end {} NOP
+c_pass 2 fmt_manpage_end {} {
+    sequence \
+	[xmlContext manpage] \
+	[wrapLines? [c_held see_also] seealso] \
+	[wrapLines? [c_held keywords] keywords] \
+	[end manpage] \
+	;
+}
+
+#*EOF*
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.wiki b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.wiki
new file mode 100644
index 00000000..c36fefa0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fmt.wiki
@@ -0,0 +1,305 @@
+# -*- tcl -*-
+# (c) 2002-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# [expand] definitions to convert a tcl based manpage definition into
+# Wiki markup.
+#
+################################################################
+
+dt_source _common.tcl   ; # Shared code
+
+proc fmt_postprocess {wiki} {
+    # Strip empty lines out of the generated wiki source
+    # and trim leading blanks, except in code samples.
+    #
+    set lines [list]
+    set codeblock 0
+    foreach line [split $wiki \n] {
+	if {![string compare $line "======"]} {
+	    set codeblock [expr {!$codeblock}]
+	    lappend lines $line
+	    continue
+	}
+	if {$codeblock} {
+	    lappend lines $line
+	} else {
+	    if {[string match " |*" $line]} {
+		# Verbatim / example
+		lappend lines [string trimright $line]
+	    } elseif {[string match ". *" $line]} {
+		# Verbatim / regular
+		lappend lines [string range [string trimright $line] 1 end]
+	    } elseif {[regexp {^   \* .*} $line]} {
+		# Itemized lists.
+		lappend lines [string map {[ [[ ] ]]} [string trimright $line]]
+	    } elseif {[string match "   1. *" $line]} {
+		# Enumerated lists
+		lappend lines [string map {[ [[ ] ]]} [string trimright $line]]
+	    } elseif {[regexp "^   .*: " $line]} {
+		# Definition list
+		lappend lines [string map {[ [[ ] ]]} $line]
+	    } elseif {[string match " *" $line]} {
+		# Unwanted indentation
+		lappend lines [string map {[ [[ ] ]]} [string trim $line]]
+	    } else {
+		# Everything else
+		lappend lines [string map {[ [[ ] ]]} [string trimright $line]]
+	    }
+	}
+    }
+    set wiki [join $lines \n]
+
+    regsub {^[ ]+} $wiki {} wiki
+    return [string trim $wiki]\n
+}
+
+
+################################################################
+## Backend for *roff markup
+
+c_pass 1 fmt_manpage_begin {title section version} NOP
+c_pass 2 fmt_manpage_begin {title section version} {
+    set module      [dt_module]
+    set shortdesc   [c_get_module]
+    set description [c_get_title]
+
+    set     hdr ""
+    append  hdr "'''$title $version'''"
+    if {[string length $module]} { 
+	append  hdr " '''$module'''"
+    }
+    if {[string length $shortdesc]} {
+	append  hdr " ''$shortdesc''"
+    }
+    append  hdr \n
+    append  hdr \n
+    append  hdr "$description"
+    append  hdr \n
+    return $hdr
+}
+
+c_pass 1 fmt_moddesc   {desc} {c_set_module $desc}
+c_pass 2 fmt_moddesc   {desc} NOP
+
+c_pass 1 fmt_titledesc {desc} {c_set_title $desc}
+c_pass 2 fmt_titledesc {desc} NOP
+
+c_pass 1 fmt_copyright {desc} {c_set_copyright $desc}
+c_pass 2 fmt_copyright {desc} NOP
+
+c_pass 1 fmt_manpage_end {} NOP
+c_pass 2 fmt_manpage_end {} {
+    # Complete the generation with a copyright
+    # section, if such information is available.
+
+    set wiki ""
+
+    set sa [c_xref_seealso]
+    set kw [c_xref_keywords]
+    set ca [c_xref_category]
+    set ct [c_get_copyright]
+
+    if {[llength $sa] > 0} {
+	append wiki [fmt_section {SEE ALSO}] \n
+	append wiki [join [lsort $sa] ", "] \n
+    }
+    if {[llength $kw] > 0} {
+	append wiki [fmt_section KEYWORDS] \n
+	append wiki [join [lsort $kw] ", "] \n
+    }
+    if {$ca ne ""} {
+	append wiki [fmt_section CATEGORY] \n
+	append wiki $ca \n
+    }
+    if {$ct != {}} {
+	append wiki [fmt_section COPYRIGHT]
+	append wiki ". " [join [split $ct \n] "\n. "] \n
+    }
+    return $wiki
+}
+
+proc fmt_section    {name {id {}}} {return "\n\n**$name**\n\n"}
+proc fmt_subsection {name {id {}}} {return "\n\n***$name***\n\n"}
+
+# TODO: Modify behaviour depending on context (normal vs list)
+proc fmt_para    {}     {return \n}
+proc fmt_nl      {}     {return \n}
+
+c_pass 2 fmt_require {pkg {version {}}} NOP
+c_pass 1 fmt_require {pkg {version {}}} {
+    if {$version != {}} {set version " $version"}
+    # @mdgen NODEP: '''
+    c_hold synopsis "package require '''$pkg$version'''\n"
+}
+
+c_pass 2 fmt_usage {cmd args} NOP
+c_pass 1 fmt_usage {cmd args} {c_hold synopsis "   * $cmd [join $args " "]\n"}
+
+c_pass 2 fmt_call {cmd args} {return "[fmt_lst_item "$cmd [join $args " "]"]"}
+c_pass 1 fmt_call {cmd args} {c_hold synopsis "   * $cmd [join $args " "]\n"}
+
+c_pass 1 fmt_description {id} NOP
+c_pass 2 fmt_description {id} {
+    set result ""
+    if {[set syn [c_held synopsis]] != {}} {
+	append result [fmt_section SYNOPSIS] \n
+	append result $syn \n\n
+    }
+    append result [fmt_section DESCRIPTION]
+    return $result
+}
+
+################################################################
+global arglist
+set ::arglist 0
+proc fmt_list_begin {what {hint {}}} {
+    switch -exact -- $what {
+	"arguments" {
+	    set ::arglist 1
+	    return "\n\n+++"
+	}
+	default {
+	    return {}
+	}
+    }
+}
+proc fmt_list_end {} {
+    if {$::arglist} {
+	set ::arglist 0
+	return "\n+++\n\n"
+    }
+    return {}
+}
+
+proc fmt_bullet   {}        {return "\n\n   * "}
+proc fmt_enum     {}        {return "\n\n   1. "}
+proc fmt_lst_item {text}    {return "\n\n   $text:   "}
+proc fmt_cmd_def  {command} {return "\n\n   [fmt_cmd $command]:  "}
+
+proc fmt_arg_def {type name {mode {}}} {
+    set text "\n"
+    append text [fmt_arg $name]
+    append text " $type"
+    if {$mode != {}} {append text " ($mode)"}
+    return "${text}   "
+}
+proc fmt_opt_def {name {arg {}}} {
+#    if {[string match -* $name]} {set    name \\-$name}
+    set name [fmt_option $name]
+    if {$arg != {}}              {append name " $arg"}
+    return "\n\n   ${name}:   "
+}
+proc fmt_tkoption_def {name dbname dbclass} {
+    set    text "\n\n"
+    append text "   Command-Line Switch:\t'''$name'''\n"
+    append text "   Database Name:\t'''$dbname'''\n"
+    append text "   Database Class:\t'''$dbclass'''\n"
+    append text "   * "
+    return $text
+}
+
+################################################################
+
+global textmode
+set    textmode ""
+
+# NOTE: The example_begin/end combo allows for the example
+# text to contain markup. The currently used verbatim
+# environment will cause show the wiki markup of the example,
+# instead of formatting per that markup.
+#
+# TODO: Strip internal markup from the example text, wiki cannot
+# handle such at all.
+
+proc fmt_example_begin {} {
+    global  mode_save textmode
+    lappend mode_save $textmode
+    set     textmode example
+    return "\n======\n"
+}
+proc fmt_example_end   {} {
+    global  mode_save textmode
+    set textmode  [lindex $mode_save end]
+    set mode_save [lrange $mode_save 0 end-1]
+    return "\n======\n"
+}
+proc fmt_example {code} {
+    set code [string map [list \\\\\n \\\n] $code]
+    return "\n======\n$code\n======\n"
+}
+
+proc emph    {text} {return ''$text''}
+proc strong  {text} {return '''$text'''}
+
+proc fmt_arg     {text} {return ''$text''}
+proc fmt_cmd     {text} {return '''$text'''}
+proc fmt_emph    {text} {return ''$text''}
+proc fmt_opt     {text} {return ?$text?}
+proc fmt_comment {text} {return {}}
+proc fmt_sectref {text {label {}}} {
+    if {![string length $label]} {set label $text}
+    strong $text
+}
+proc fmt_syscmd  {text} {strong $text}
+proc fmt_method  {text} {strong $text}
+proc fmt_option  {text} {strong $text}
+proc fmt_widget  {text} {strong $text}
+proc fmt_fun     {text} {strong $text}
+proc fmt_type    {text} {strong $text}
+proc fmt_package {text} {strong $text}
+proc fmt_class   {text} {strong $text}
+proc fmt_var     {text} {strong $text}
+proc fmt_file    {text} {return "\"[emph $text]\""}
+proc fmt_namespace     {text} {strong $text}
+proc fmt_uri     {text {label {}}} {
+    if {$label == {}} {
+	# No label is an inlined emphasized link.
+	return $text
+    } else {
+	# Label in the text, link for it is hidden in an annotation.
+	return "$text%|%$label%|%"
+    }
+}
+proc fmt_image {text {label {}}} {
+    # text = symbolic name of the image.
+
+    # Alt: png, jpg, gif, which are then used during HTML
+    # conversion. But unclear what the link is, to use for this. So,
+    # keeping as text for the moment.
+
+    set img [dt_imgdata $text {txt}]
+    if {$img eq {}} {
+	if {$label eq {}} {
+	    return "IMAGE: $text"
+	} else {
+	    return "IMAGE: $text $label"
+	}
+    }
+
+    return \n======\n$img\n======\n
+}
+proc fmt_term    {text} {emph $text}
+proc fmt_const   {text} {strong $text}
+proc fmt_mdash {} { return " --- " }
+proc fmt_ndash {} { return " -- " }
+
+################################################################
+# wiki specific commands
+
+proc fmt_plain_text {text} {
+    # For the wiki we have to force certain text into a single line.
+    # We also have to make sure that the text is on the same line as
+    # the initiator (i.e. list bullet).
+
+    global textmode
+
+    if {"$textmode" == "example"} {
+	set text [string map [list \\\\\n \\\n] $text]
+	return "$text"
+    }
+
+    regsub -all "\[ \t\n\]+" $text { } text
+    return $text
+}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fr.msg b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fr.msg
new file mode 100644
index 00000000..e418e862
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/fr.msg
@@ -0,0 +1,34 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+mcset fr end/open/list    "Fin de la page de manuel atteinte, \[list_end\] manquant"
+mcset fr end/open/example "Fin de la page de manuel atteinte, \[example_end\] manquant"
+mcset fr end/open/mp	  "Fin de la page de manuel atteinte, \[manpage_end\] manquant"
+mcset fr mpbegin          "Cette commande doit \xEAtre la premi\xE8re de la page de manuel"
+mcset fr mptitle          "TODO: TRANSLATE: Spaces not allowed in manpage title"
+mcset fr hdrcmd           "Commande interdite \xE0 l'ext\xE9rieur de l'en-t\xEAte"
+mcset fr bodycmd          "Commande interdite \xE0 l'ext\xE9rieur du corps de la page de manuel"
+mcset fr body             "Le texte est interdit \xE0 l'ext\xE9rieur du corps de la page de manuel"
+mcset fr reqcmd           "Commande interdite \xE0 l'ext\xE9rieur de l'en-t\xEAte ou de la section de condition"
+mcset fr invalidlist      "Type de liste non valide \"@\""
+mcset fr nolistcmd        "Commande interdite \xE0 l'int\xE9rieur d'une liste"
+mcset fr nolisthdr        "Commande interdite entre le d\xE9but d'une liste et son premier \xE9l\xE9ment"
+mcset fr nolisttxt        "Le texte est interdit entre le d\xE9but d'une liste et son premier \xE9l\xE9ment"
+mcset fr listcmd          "Commande interdite \xE0 l'ext\xE9rieur d'une liste"
+mcset fr deflist          "Commande restreinte \xE0 l'utilisation dans les listes de d\xE9finition"
+mcset fr bulletlist       "Commande restreinte \xE0 l'utilisation dans les listes d'\xE9l\xE9ments"
+mcset fr enumlist         "Commande restreinte \xE0 l'utilisation dans les listes num\xE9rot\xE9es"
+mcset fr examplecmd       "Commande autoris\xE9e uniquement pour fermer une section d'exemple"
+mcset fr nodonecmd        "Commande interdite apr\xE8s  \[manpage_end\]"
+mcset fr arg_list         "Commande restreinte \xE0 l'utilisation dans les listes d'arguments"
+mcset fr cmd_list         "Commande restreinte \xE0 l'utilisation dans les listes de commandes"
+mcset fr opt_list         "Commande restreinte \xE0 l'utilisation dans les listes d'options"
+mcset fr tkoption_list    "Commande restreinte \xE0 l'utilisation dans les listes de tkoption"
+mcset fr depr_strong      "Commande obsol\xE8te \"%s\".\n\tConsultez l'aide s\xE9mantique correspondante ou \[emph\] \xE0 la place."
+mcset fr depr_lstitem     "Commande obsol\xE8te \"%s\".\n\tConsultez \[def\] \xE0 la place."
+mcset fr depr_nl          "Commande obsol\xE8te \"%s\".\n\tConsultez \[para\] \xE0 la place."
+mcset fr depr_bullet      "Commande obsol\xE8te \"%s\".\n\tConsultez \[item\] \xE0 la place."
+mcset fr depr_ltype       "<List type> obsol\xE8te \"%s\".\n\tConsultez \"%s\" \xE0 la place."
+mcset fr sectambig        "@@@ Translate @@@ (Sub)Section title \"%s\" causes ambiguous section references."
+mcset fr missingsect      "@@@ Translate @@@ Refered (Sub)Section \"%s\" is not known."
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.html b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.html
new file mode 100644
index 00000000..adf0d1e2
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.html
@@ -0,0 +1,331 @@
+## -*- tcl -*-
+# ### ### ### ######### ######### #########
+##
+# $Id: idx.html,v 1.8 2007/03/20 05:06:35 andreas_kupries Exp $
+#
+# Index Formatting Engine : docidx --> HTML.
+# Single-pass
+#
+# Copyright (c) 2003-2007 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+dt_source _idx_common.tcl
+dt_source _html.tcl
+
+# ### ### ### ######### ######### #########
+## API implementation
+
+rename idx_postprocess {}
+rename fmt_postprocess idx_postprocess
+
+proc fmt_plain_text {text} {return {}}
+
+proc fmt_index_begin {l t} {
+    global la ti
+    set la $l
+    set ti $t
+    return {}
+}
+
+proc fmt_key {text} {
+    global key lk ch
+    set lk $text
+    set key($lk) {}
+    set ch([F $lk]) .
+    return {}
+}
+
+proc fmt_manpage {f l} {Ref [dt_fmap $f] $l}
+proc fmt_url     {u l} {Ref $u           $l}
+
+proc fmt_index_end {} {
+    LoadKwid
+    set lines {}
+    if {![Get raw]} {
+	BeginHeader ; Meta ; EndHeader
+	BeginBody
+    }
+    BodyHeader ; Title ; Navbar
+    BeginIndex ; Keys ; EndIndex
+    if {![Get raw]} {
+	EndBody
+    }
+    return [join $lines \n]
+}
+
+# ### ### ### ######### ######### #########
+## Helper commands
+
+proc Ref {r l} {
+    global  key  lk
+    lappend key($lk) $r $l
+    return {}
+}
+
+proc F {text} {
+    # Keep only alphanumeric, take first, uppercase
+    # Returns nothing if input has no alphanumeric characters.
+    return [string toupper [string index [regsub -all {[^a-zA-Z0-9]} $text {}] 0]]
+}
+
+proc LoadKwid {} {
+    global kwid
+    # Engine parameter - load predefined keyword anchors.
+    set             ki [Get kwid]
+    if {![llength  $ki]} return
+    array set kwid $ki
+    return
+}
+
+proc BeginHeader {} {
+    global la ti
+    upvar 1 lines lines
+    lappend lines [markup {<!DOCTYPE html>}]
+    lappend lines [markup <html>]
+    lappend lines [ht_comment [c_provenance]]
+    lappend lines [ht_comment "$la"]
+    lappend lines [markup <head>]
+    lappend lines "[markup <title>] $la [markup </title>]"
+    return
+}
+
+proc Meta {} {
+    # Engine parameter - insert 'meta'
+    set meta [Get meta]
+    if {$meta == {}} return
+    upvar 1 lines lines
+    lappend lines [markup $meta]
+    return
+}
+
+proc EndHeader {} {
+    upvar 1 lines lines
+    lappend lines [markup </head>]
+    return
+}
+
+proc BeginBody {} {
+    upvar 1 lines lines
+    lappend lines [markup <body>]
+    return
+}
+
+proc BodyHeader {} {
+    upvar 1 lines lines
+    # Engine parameter - insert 'header'
+    set header [Get header]
+    if {$header == {}} return
+    lappend map @TITLE@ [TheTitle]
+    set header [string map $map $header]
+    lappend lines [markup $header]
+    return
+}
+
+proc TheTitle {} {
+    global la ti
+    set title ???
+    if {($la != {}) && ($ti != {})} {
+	set title "$la -- $ti"
+    } elseif {$la != {}} {
+	set title $la
+    } elseif {$ti != {}} {
+	set title $ti
+    }
+    return $title
+}
+
+proc Title {} {
+    upvar 1 lines lines
+    lappend lines "[markup <h3>] [TheTitle] [markup </h3>]"
+    return
+}
+
+proc Navbar {} {
+    global ch cnt dot
+    upvar 1 lines lines
+
+    set nav {}
+    foreach c [lsort -dict [array names ch]] {
+	set ref c[F $c];#[incr cnt]
+	set ch($c) $ref
+	lappend nav [ALink $ref $c]
+    }
+
+    lappend lines [markup "<hr><div class=\"#doctools_idxnav\">"]
+    lappend lines [join $nav $dot]
+    lappend lines [markup </div>]
+    return
+}
+
+proc BeginIndex {} {
+    upvar 1 lines lines
+    lappend lines [markup "<hr><table class=\"#doctools_idx\" width=\"100%\">"]
+    return
+}
+
+proc Keys {} {
+    global key
+    upvar 1 lines lines
+    set lc {}
+    set kwlist {}
+
+    # For a good display we sort keywords in dictionary order.
+    # We ignore their leading non-alphanumeric characters.
+    set kwlist {}
+    foreach kw [array names key] {
+       set kwx [string trim [regsub -all {^[^a-zA-Z0-9]+} $kw {}]]
+       lappend kwlist [list $kwx $kw]
+    }
+    foreach item [lsort -index 0 -dict $kwlist] {
+       foreach {_ k} $item break
+	set c [F $k] ; if {$lc != $c} { Section $c ; set lc $c }
+	BeginKey   $k
+	References $k
+	EndKey
+    }
+    return
+}
+
+proc Section {c} {
+    global ch
+    upvar 1 lines lines
+    lappend lines [markup {<tr class="#doctools_idxheader"><th colspan="2">}]
+    lappend lines [markup "<a name=\"$ch($c)\">Keywords: $c</a>"]
+    lappend lines [markup </th></tr>]
+    return
+}
+
+proc BeginKey {k} {
+    upvar 1 lines lines
+    lappend lines [markup "<tr class=\"[Row]\" valign=top>"]
+    lappend lines [BeginColLeft][SetAnchor $k][markup </td>]
+    lappend lines [BeginColRight]
+    return
+}
+
+proc EndKey {} {
+    upvar 1 lines lines
+    lappend lines [markup </td></tr>]
+    return
+}
+
+proc References {k} {
+    global key dot
+    upvar 1 lines lines
+    set refs {}
+    foreach {ref label} $key($k) {
+	lappend refs [markup "<a href=\"$ref\"> $label </a>"]
+    }
+    lappend lines [join $refs $dot]
+    return
+}
+
+proc EndIndex {} {
+    upvar 1 lines lines
+    lappend lines [markup </table>]
+    # Engine parameter - insert 'footer'
+    set  footer [Get footer]
+    if {$footer == {}} return
+    lappend lines [markup "<hr>"]
+    lappend lines [markup $footer]
+    return
+}
+
+proc EndBody {} {
+    upvar 1 lines lines
+    lappend lines [markup "</body></html>"]
+    return
+}
+
+proc ALink {dst label} {
+    markup "<a href=\"#$dst\"> $label </a>"
+}
+
+proc BeginColLeft {} {
+    return [markup {<td class="#doctools_idxleft" width="35%">}]
+}
+
+proc BeginColRight {} {
+    return [markup {<td class="#doctools_idxright" width="65%">}]
+}
+
+proc SetAnchor {text} {
+    return [markup "<a name=[Anchor $text]> $text </a>"]
+}
+
+proc A {text} {
+    set anchor [regsub -all {[^a-zA-Z0-9]} [string tolower $text] {_}]
+    set anchor [regsub -all {__+} $anchor _]
+    return $anchor
+}
+
+proc Anchor {text} {
+    global kwid
+    if {[info exists kwid($text)]} {
+	return "\"$kwid($text)\""
+    }
+    return "\"[A $text]\""
+}
+
+proc Row {} {
+    global even
+    set res [expr {$even
+    ? "\#doctools_idxeven"
+    : "\#doctools_idxodd"}]
+    Flip
+    return $res
+}
+
+proc Flip {} {
+    global even
+    set    even [expr {1-$even}]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Engine state
+
+# key  : string -> dict(ref -> label) "key formatting"
+# ch   : string -> '.'                "key starting characters"
+# lk   : string                       "last key"
+# la   : string "index label"
+# ti   : string "index title"
+# cnt  : int
+# kwid : string -> ...
+# even : bool
+
+global key  ; array set key  {}
+global ch   ; array set ch   {}
+global lk   ; set       lk   {}
+global la   ; set       la   {}
+global ti   ; set       ti   {}
+global cnt  ; set       cnt  0
+global kwid ; array set kwid {}
+global even ; set       even 1
+global dot  ; set dot   [markup { &#183; }]
+
+# ### ### ### ######### ######### #########
+## Engine parameters
+
+global    __var
+array set __var {
+    meta   {}
+    header {}
+    footer {}
+    kwid   {}
+    raw    0
+}
+proc Get               {varname}      {global __var ; return $__var($varname)}
+proc idx_listvariables {}             {global __var ; return [array names __var]}
+proc idx_varset        {varname text} {
+    global __var
+    if {![info exists __var($varname)]} {return -code error "Unknown engine variable \"$varname\""}
+    set __var($varname) $text
+    return
+}
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.markdown b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.markdown
new file mode 100644
index 00000000..d5361d07
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.markdown
@@ -0,0 +1,219 @@
+# -*- tcl -*-
+# Engine to convert a docidx document into markdown text.
+#
+# Copyright (c) 2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+######################################################################
+
+dt_source _idx_common.tcl
+dt_source _text.tcl
+dt_source _markdown.tcl
+
+proc c_copyrightsymbol {} {return "(c)"}
+
+######################################################################
+# Conversion specification.
+# One-pass processing.
+
+rename idx_postprocess {}
+rename text_postprocess idx_postprocess
+proc   fmt_plain_text {text} {return {}}
+
+################################################################
+## Backend for plain text markup
+
+proc fmt_index_begin {label title} {
+    MDCInit
+    if {($label != {}) && ($title != {})} {
+	set title "$label -- $title"
+    } elseif {$label != {}} {
+	set title $label
+    } elseif {$title != {}} {
+	 # title is set
+    }
+
+    TextInitialize
+
+    MDComment "Index [Provenance]"
+    MDCDone
+
+    SectTitle hdr $title
+    Text [Compose hdr]
+    CloseParagraph [Verbatim]
+    return
+}
+
+proc fmt_index_end {} {
+    LoadKwid
+    NavBar
+    Keys
+    return
+    
+    set rmargin [RMargin $max]
+
+    incr max
+    set blank [Blank $max] ;# indent
+
+    foreach key [lsort [array names map]] {
+	set keys [join $map($key) ", "]
+	Text [InFlow $keys $rmargin [ReHead $blank $key] $blank]
+	CloseParagraph [Verbatim]
+    }
+    return
+}
+
+proc fmt_key {text} {
+    global key lk ch
+    set lk $text
+    set key($lk) {}
+    set ch([F $lk]) .
+    return
+}
+
+proc fmt_manpage {f l} {Ref [dt_fmap $f] $l}
+proc fmt_url     {u l} {Ref $u           $l}
+proc fmt_comment {text}       {return}
+
+# ### ### ### ######### ######### #########
+
+proc NavBar {} {
+    global ch dot
+    if {![array size ch]} return
+    
+    set nav {}
+    foreach c [lsort -dict [array names ch]] {
+	set ref c[F $c]
+	set ch($c) $ref
+	lappend nav [ALink [Hash]$ref $c]
+    }
+
+    Separator
+    
+    Text [join $nav $dot]
+    CloseParagraph [Verbatim]
+
+    Separator
+    return
+}
+
+proc Keys {} {
+    global key
+    set lc {}
+    set kwlist {}
+
+    # For a good display we sort keywords in dictionary order.
+    # We ignore their leading non-alphanumeric characters.
+    set kwlist {}
+    foreach kw [array names key] {
+       set kwx [string trim [regsub -all {^[^a-zA-Z0-9]+} $kw {}]]
+       lappend kwlist [list $kwx $kw]
+    }
+    foreach item [lsort -index 0 -dict $kwlist] {
+       foreach {_ k} $item break
+	set c [F $k]
+	if {$lc != $c} {
+	    CloseParagraph [Verbatim]
+	    Section $c ; set lc $c
+	}
+	BeginKey   $k
+	References $k
+	EndKey
+    }
+
+    CloseParagraph [Verbatim]
+    return
+
+}
+
+proc Section {c} {
+    global ch
+    Text "[Hash][Hash][Hash][Hash] [SetAnchor "Keywords: $c" $ch($c)]"
+    CloseParagraph [Verbatim]
+
+    Text "[VBar][VBar][VBar]\n"
+    Text "[VBar][Dash][Dash][Dash][VBar][Dash][Dash][Dash][VBar]\n"
+    return
+}
+
+proc BeginKey {k} {
+    Text "[VBar][SetAnchor $k][VBar]"
+}
+
+proc References {k} {
+    global key dot
+    set refs {}
+    foreach {ref label} $key($k) {
+	lappend refs [ALink $ref $label]
+    }
+    Text [join $refs $dot]
+    return
+}
+
+proc EndKey {} {
+    Text "[VBar]\n"
+}
+
+proc Separator {} {
+    Text [Dash][Dash][Dash][Dash]
+    CloseParagraph [Verbatim]
+}
+
+# ### ### ### ######### ######### #########
+## Engine state
+
+proc LoadKwid {} {
+    global kwid
+    # Engine parameter - load predefined keyword anchors.
+    set             ki [Get kwid]
+    if {![llength  $ki]} return
+    array set kwid $ki
+    return
+}
+
+proc Ref {r l} {
+    global  key  lk
+    lappend key($lk) $r $l
+    return
+}
+
+proc F {text} {
+    # Keep only alphanumeric, take first, uppercase
+    # Returns nothing if input has no alphanumeric characters.
+    return [string toupper [string index [regsub -all {[^a-zA-Z0-9]} $text {}] 0]]
+}
+
+# key  : string -> dict(ref -> label) "key formatting"
+# ch   : string -> '.'                "key starting characters"
+# lk   : string                       "last key"
+# kwid : string -> ...
+# even : bool
+
+global key  ; array set key  {}
+global ch   ; array set ch   {}
+global lk   ; set       lk   {}
+global la   ; set       la   {}
+global ti   ; set       ti   {}
+global kwid ; array set kwid {}
+global dot  ; set dot   " &[Hash]183; "
+
+# ### ### ### ######### ######### #########
+## Engine parameters
+
+global    __var
+array set __var {
+    kwid {}
+}
+proc Get               {varname}      {global __var ; return $__var($varname)}
+proc idx_listvariables {}             {global __var ; return [array names __var]}
+proc idx_varset        {varname text} {
+    global __var
+    if {![info exists __var($varname)]} {
+	return -code error "Unknown engine variable \"$varname\""
+    }
+    set __var($varname) $text
+    return
+}
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.nroff b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.nroff
new file mode 100644
index 00000000..dd2661cb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.nroff
@@ -0,0 +1,101 @@
+# -*- tcl -*-
+# Engine to convert a docidx document into nroff.
+#
+# Copyright (c) 2003 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+######################################################################
+
+dt_source _idx_common.tcl
+dt_source _nroff.tcl
+
+######################################################################
+# Conversion specification.
+#
+# One-pass processing.
+
+proc idx_postprocess {nroff} {
+    # Postprocessing after generation ...
+    # Strip empty lines out of the generated nroff source
+    # and trim leading blanks, except in code samples.
+
+    set lines [list]
+    foreach line [split $nroff "\n"] {
+	set line [string trim $line]
+	if {0 == [string length $line]} {
+	    continue
+	}
+	lappend lines $line
+    } 
+    return [nroff_postprocess [join $lines \n]]
+}
+
+#proc fmt_plain_text {text} {if {$text != {}} {return \n} else {return {}}}
+proc fmt_plain_text {text} {return {}}
+
+################################################################
+## Backend for NROFF markup
+
+global map ; array set map {}
+global key ; set key {}
+global max ; set max 0
+
+global prec ok haskey
+set    prec   ""
+set    ok     0
+set    haskey 0
+
+proc fmt_index_begin     {label title}      {
+    global prec ok
+    set ok 1
+    set     hdr [nr_comment {}]\n
+    if {$prec != {}} {
+	set hdr [nr_comment $prec]\n
+    }
+    append  hdr [nr_comment [c_provenance]]\n
+    append  hdr [nr_title "\"[string trimleft $label :]\" n"]\n
+    append  hdr [nr_read man.macros]\n
+    append  hdr [nr_bolds]\n
+    append  hdr [nr_section INDEX]\n
+    append  hdr $title[nr_in]\n
+    return $hdr
+}
+
+proc fmt_index_end {} {
+    global map
+    foreach key [lsort [array names map]] {
+	append r $key [nr_in] \n
+	foreach ref  $map($key) {
+	foreach {file label} $ref break
+	    append r [Man $file $label]
+	}
+	append r [nr_out] \n
+    }
+    
+    append r [nr_out]
+    return $r
+}
+
+proc fmt_key     {text}       { global key     ; set key $text ; return }
+proc fmt_manpage {file label} { global map key ; lappend map($key) [list $file $label] ; return }
+proc fmt_url     {url  label} { global map key ; lappend map($key) [list $url  $label] ; return }
+
+proc Key {text} {
+    global haskey
+    set res ""
+    if {$haskey} {append res [nr_out]\n}
+    append res $text[nr_in]\n
+    set haskey 1
+    return $res
+}
+
+proc Man {file label} {return [nr_blt [nr_bld]$file[nr_rst]]\n$label\n}
+
+proc fmt_comment {text} {
+    global prec ok
+    if {$ok} { return [nr_comment $text] }
+    append prec $text \n
+    return
+}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.null b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.null
new file mode 100644
index 00000000..d0704a62
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.null
@@ -0,0 +1,23 @@
+# -*- tcl -*-
+#
+# -- Null format (docidx)
+#
+# Copyright (c) 2003      Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# This is a null format which does return no output at all.
+
+################################################################
+
+proc idx_initialize  {}     {return}
+proc idx_shutdown    {}     {return}
+proc idx_numpasses   {}     {return 1}
+proc idx_postprocess {text} {return ""}
+proc idx_setup       {n}    {return}
+
+foreach p {
+    index_begin index_end key manpage url comment plain_text
+} {
+    proc fmt_$p {args} {return ""}
+}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.text b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.text
new file mode 100644
index 00000000..e828ddb5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.text
@@ -0,0 +1,77 @@
+# -*- tcl -*-
+# Engine to convert a docidx document into plain text.
+#
+# Copyright (c) 2003-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+######################################################################
+
+dt_source _idx_common.tcl
+dt_source _text.tcl
+
+proc c_copyrightsymbol {} {return "(c)"}
+
+######################################################################
+# Conversion specification.
+# One-pass processing.
+
+rename idx_postprocess {}
+rename text_postprocess idx_postprocess
+proc   fmt_plain_text {text} {return {}}
+
+################################################################
+## Backend for plain text markup
+
+global map ; array set map {}
+global key ; set key {}
+global max ; set max 0
+
+proc fmt_index_begin {label title} {
+    global map ; unset map ; array set map {}
+    global key ; set key {}
+    global max ; set max 0
+
+    if {($label != {}) && ($title != {})} {
+	set title "$label -- $title"
+    } elseif {$label != {}} {
+	set title $label
+    } elseif {$title != {}} {
+	 # title is set
+    }
+
+    TextInitialize
+
+    lappend   hdr "Index [Provenance]"
+    SectTitle hdr $title
+    Text [Compose hdr]
+    CloseParagraph [Verbatim]
+    return
+}
+
+proc fmt_index_end {} {
+    global map max
+
+    set rmargin [RMargin $max]
+
+    incr max
+    set blank [Blank $max] ;# indent
+
+    foreach key [lsort [array names map]] {
+	set keys [join $map($key) ", "]
+	Text [InFlow $keys $rmargin [ReHead $blank $key] $blank]
+	CloseParagraph [Verbatim]
+    }
+    return
+}
+
+proc fmt_key {text} {
+    global key max ; set key $text
+    MaxLen max $text
+    return
+}
+
+proc fmt_manpage {file label} {global map key ; lappend map($key) $file ; return}
+proc fmt_url     {url label}  {global map key ; lappend map($key) $url  ; return}
+proc fmt_comment {text}       {return}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.wiki b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.wiki
new file mode 100644
index 00000000..8eee5346
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/idx.wiki
@@ -0,0 +1,63 @@
+# -*- tcl -*-
+#
+# $Id: idx.wiki,v 1.2 2004/01/15 06:36:12 andreas_kupries Exp $
+#
+# Engine to convert a docidx document into Wiki markup.
+#
+# Copyright (c) 2003 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+######################################################################
+
+dt_source _idx_common.tcl   ; # Shared code
+
+######################################################################
+
+proc idx_postprocess {wiki} {
+    # Strip empty lines out of the generated wiki source
+    # and trim leading blanks, except in code samples.
+    #
+    set lines [list]
+    foreach line [split $wiki \n] {
+	if {[string match " |*" $line]} {
+	    # Verbatim / example
+	    lappend lines [string trimright $line]
+	} elseif {[string match ". *" $line]} {
+	    # Verbatim / regular
+	    lappend lines [string range [string trimright $line] 1 end]
+	} elseif {[string match "   \* *" $line]} {
+	    # Itemized lists.
+	    lappend lines [string map {[ [[ ] ]]} [string trimright $line]]
+	} elseif {[string match "   1. *" $line]} {
+	    # Enumerated lists
+	    lappend lines [string map {[ [[ ] ]]} [string trimright $line]]
+	} elseif {[regexp "^   (\[^:\]): " $line]} {
+	    # Definition list
+	    lappend lines [string map {[ [[ ] ]]} [string trimright $line]]
+	} elseif {[string match " *" $line]} {
+	    # Unwanted indentation
+	    lappend lines [string map {[ [[ ] ]]} [string trim $line]]
+	} else {
+	    # Everything else
+	    lappend lines [string map {[ [[ ] ]]} [string trimright $line]]
+	}
+    }
+    set wiki [join $lines \n]\n
+
+    regsub {^[ ]+} $wiki {} wiki
+    return $wiki
+}
+
+proc fmt_plain_text {text} {return {}}
+
+################################################################
+## Backend for wiki markup
+
+proc fmt_index_begin      {label title} {return "Index '''$label'''\n'''[string trim $title]'''\n"}
+proc fmt_index_end        {}            {return {}}
+proc fmt_key              {text}        {return "\n   '''[string trim $text]''':   "}
+proc fmt_manpage          {file label}  {return "$file "}
+proc fmt_url              {url label}   {return "$url "}
+proc fmt_comment          {text}        {return {}}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/man.macros b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/man.macros
new file mode 100644
index 00000000..ddd073d1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/man.macros
@@ -0,0 +1,267 @@
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+.\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+.\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+.\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+.\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+.\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+.\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+.\"	# SO - start of list of standard options
+.de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 5.5c 11c
+.ft B
+..
+.\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\*(So manual entry for details on the standard options.
+..
+.\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+.\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+.\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.\"	# UL - underline word
+.de UL
+\\$1\l'|0\(ul'\\$2
+..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.html b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.html
new file mode 100644
index 00000000..0f5cec8e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.html
@@ -0,0 +1,196 @@
+# -*- tcl -*-
+# Engine to convert a doctoc document into HTML.
+#
+# Copyright (c) 2003-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+######################################################################
+
+dt_source _toc_common.tcl
+dt_source _html.tcl
+
+######################################################################
+# Conversion specification.
+#
+# One-pass processing.
+
+rename toc_postprocess {}
+rename fmt_postprocess toc_postprocess
+
+proc fmt_plain_text {text} {return {}}
+
+################################################################
+## Backend for HTML markup
+
+proc fmt_toc_begin {label title} {
+    set hdr ""
+    if {![Get raw]} {
+	append  hdr "[markup {<!DOCTYPE html>}]"
+	append  hdr "[markup <html><head>]\n"
+	append  hdr "[markup <title>] $label [markup </title>]\n"
+
+	# Engine parameter - insert 'meta'
+	if {[set meta [Get meta]] != {}} {append hdr [markup $meta]\n}
+
+	append  hdr "[markup </head>]\n"
+	append  hdr [ht_comment [c_provenance]]\n
+	append  hdr [ht_comment "$label"]\n
+	append  hdr \n
+	append  hdr [markup <body>]\n
+    }
+    
+    # Engine parameter - insert 'header'
+    if {[set header [Get header]] != {}} {
+	lappend map @TITLE@ $label
+	set header [string map $map $header]
+	append hdr [markup $header]\n
+    }
+
+    append hdr [markup <h3>]
+    append hdr $label
+    append hdr [markup </h3>] \n
+    append hdr [markup <hr><dl><dt><h2>]
+    append hdr $title
+    append hdr [markup </h2></dt><dd>] \n
+    LSetup
+    IPush
+    return $hdr
+}
+
+proc fmt_toc_end {} {
+    set text "\n"
+    # Close table of items since last division
+    if {[Items]} { append text [tag/ table] \n }
+
+    # Engine parameter - insert 'footer'
+    set footer [Get footer]
+    if {$footer != {}} {set footer \n[markup $footer]\n}
+
+    append text [tag /dd] [tag /dl] [tag hr] $footer
+
+    if {![Get raw]} {
+	append text [tag/ body] [tag/ html] \n
+    }
+
+    IPop ; # Assert items == {}
+    LOut ; # Assert level == 0
+    return $text
+}
+
+proc fmt_division_start {title symfile} {
+    # Close table of items before the division.  Reset counter for
+    # items between end of this and following division.
+    if {[Items]} { append r [tag/ table] \n ; IReset }
+        
+    if {$symfile ne ""} {
+	append t [markup "<a href=\"[dt_fmap $symfile]\">"]
+	append t $title
+	append t [markup </a>]
+	set title $t
+    }
+
+    append r \n [markup "<dl><dt><a name='[Anchor $title]'>"]
+    append r $title
+    append r [markup </dt><dd>]
+
+    LIn
+    IPush
+    return $r
+}
+
+proc fmt_division_end {} {
+    if {[Items]} { append t [tag/ table] }
+    append t [tag /dl]
+    Even!
+    IPop
+    LOut
+    return $t
+}
+
+proc fmt_item {file label desc} {
+    if {[IFirst]} { append text \n[markup "<table class=\"#doctools_toc\">"]\n }
+    INext
+
+    if {[Even]} {
+	append text [markup "<tr class=\"#doctools_toceven\" >"]\n
+    } else {
+	append text [markup "<tr class=\"#doctools_tocodd\"  >"]\n
+    }
+    EFlip
+    append text [markup "<td class=\"#doctools_tocleft\" >"]
+    append text [markup "<a name='[Anchor $label]'><a href=\"[dt_fmap $file]\">"]
+    append text $label
+    append text [tag/ a][tag/ td]\n
+    append text [markup "<td class=\"#doctools_tocright\">"]${desc}[tag /td]\n
+    append text [tag/ tr]\n
+    return $text
+}
+
+proc fmt_comment {text} {ht_comment $text}
+
+################################################################
+
+proc Term {text} { return [tag dt]${text}[tag /dt] }
+proc Def  {text} { return [tag dd]${text}[tag /dd] }
+
+proc Anchor {text} {
+    set anchor [regsub -all {[^a-zA-Z0-9]} [string tolower $text] {_}]
+    set anchor [regsub -all {__+} $anchor _]
+    return $anchor
+}
+
+################################################################
+
+global __level
+global __items  ; set __items  {}
+global __istack ; set __istack {}
+global __even   ; set __even   1
+
+proc Even! {} { global __even ; set __even 1 }
+proc Even  {} { global __even ; set __even }
+proc EFlip {} { global __even ; set __even [expr {1 - $__even}] }
+    
+
+proc LSetup {} { global __level ; set  __level  0 }
+proc LIn    {} { global __level ; incr __level  1 }
+proc LOut   {} { global __level ; incr __level -1 }
+proc LTop   {} { global __level ; expr {!$__level } }
+
+proc IReset {} { global __items ; set  __items 0 }
+proc INext  {} { global __items ; incr __items }
+proc IFirst {} { global __items ; expr {!$__items} }
+proc Items  {} { global __items ; set __items }
+
+proc IPush {} {
+    global  __istack  __items
+    lappend __istack $__items
+    set __items 0
+    return
+}
+
+proc IPop {} {
+    global __items __istack
+    set __items  [lindex   $__istack end]
+    set __istack [lreplace $__istack end end]
+    return
+}
+
+################################################################
+
+global    __var
+array set __var {
+    meta   {}
+    header {}
+    footer {}
+    raw    0
+}
+proc Get               {varname}      {global __var ; return $__var($varname)}
+proc toc_listvariables {}             {global __var ; return [array names __var]}
+proc toc_varset        {varname text} {
+    global __var
+    if {![info exists __var($varname)]} {return -code error "Unknown engine variable \"$varname\""}
+    set __var($varname) $text
+    return
+}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.markdown b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.markdown
new file mode 100644
index 00000000..0e0df214
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.markdown
@@ -0,0 +1,75 @@
+# -*- tcl -*-
+# Engine to convert a doctoc document into markdown formatted text
+#
+# Copyright (c) 2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+######################################################################
+
+dt_source _toc_common.tcl
+dt_source _text.tcl
+dt_source _markdown.tcl
+
+######################################################################
+# Conversion specification.
+# One-pass processing.
+
+rename toc_postprocess {}
+rename text_postprocess toc_postprocess
+
+proc fmt_plain_text {text} {return {}}
+
+################################################################
+## Backend for Markdown markup
+
+proc fmt_toc_begin {label title} {
+    MDCInit
+    set title "$label -- $title"
+    
+    TextInitialize
+
+    MDComment "Table of contents [Provenance]"
+    MDCDone
+
+    SectTitle hdr $title
+    Text [Compose hdr]    
+    CloseParagraph [Verbatim]
+
+    ListOpen
+    return
+}
+
+proc fmt_toc_end {} { return }
+
+proc fmt_division_start {title symfile} {
+
+    Text [ALink $symfile $title]
+    CloseParagraph [Verbatim]
+
+    ListOpen
+}
+
+proc fmt_division_end  {} {
+    ContextPop ;# Ref (a)
+    return
+}
+
+proc fmt_item {file label desc} {
+    Text "[ALink $file $label] $desc"
+    CloseParagraph [Verbatim]
+    return
+}
+
+proc fmt_comment {text} { return }
+
+proc ListOpen {} {
+    ContextPush ;# Ref (a)
+    ContextNew Division {
+	# Indenting is done by replicating the outer ws-prefix.
+	set bullet "[WPrefix?]  [IBullet]"
+	List! bullet $bullet "[BlankM $bullet] "
+    }
+    return
+}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.nroff b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.nroff
new file mode 100644
index 00000000..600b3bf8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.nroff
@@ -0,0 +1,70 @@
+# -*- tcl -*-
+# Engine to convert a doctoc document into nroff.
+#
+# Copyright (c) 2003-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+######################################################################
+
+dt_source _toc_common.tcl
+dt_source _nroff.tcl
+
+######################################################################
+# Conversion specification.
+#
+# One-pass processing.
+
+proc toc_postprocess {nroff} {
+    # Postprocessing after generation ...
+    # Strip empty lines out of the generated nroff source
+    # and trim leading blanks, except in code samples.
+
+    set lines [list]
+    foreach line [split $nroff "\n"] {
+	set line [string trim $line]
+	if {0 == [string length $line]} {
+	    continue
+	}
+	lappend lines $line
+    } 
+    return [nroff_postprocess [join $lines \n]]
+}
+
+#proc fmt_plain_text {text} {if {$text != {}} {return \n} else {return {}}}
+proc fmt_plain_text {text} {return {}}
+
+################################################################
+## Backend for TMML markup
+
+global prec ok
+set    prec ""
+set    ok   0
+
+proc fmt_toc_begin {label title} {
+    global prec ok
+    set ok 1
+    set     hdr [nr_comment {}]\n
+    if {$prec != {}} {
+	set hdr [nr_comment $prec]\n
+    }
+    append  hdr [nr_comment [c_provenance]]\n
+    append  hdr [nr_title "\"[string trimleft $label :]\" n"]\n
+    append  hdr [nr_read man.macros]\n
+    append  hdr [nr_bolds]\n
+    append  hdr [nr_section CONTENTS]\n
+    append  hdr $title[nr_in]\n
+    return $hdr
+}
+proc fmt_toc_end        {}           {}
+proc fmt_division_start {title symfile} {return [nr_blt $title][nr_in]\n}
+proc fmt_division_end   {}              {return [nr_out]\n}
+proc fmt_item           {file label desc} {return "[nr_blt [nr_bld]$label[nr_rst]]\n[nr_ul]$file[nr_rst]: $desc\n"}
+
+proc fmt_comment {text} {
+    global prec ok
+    if {$ok} {return [nr_comment $text]}
+    append prec $text \n
+    return {}
+}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.null b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.null
new file mode 100644
index 00000000..d85ada31
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.null
@@ -0,0 +1,23 @@
+# -*- tcl -*-
+#
+# -- Null format (doctoc)
+#
+# Copyright (c) 2003      Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# This is a null format which does return no output at all.
+
+################################################################
+
+proc toc_initialize  {}     {return}
+proc toc_shutdown    {}     {return}
+proc toc_numpasses   {}     {return 1}
+proc toc_postprocess {text} {return ""}
+proc toc_setup       {n}    {return}
+
+foreach p {
+    toc_begin toc_end item division_start division_end comment plain_text
+} {
+    proc fmt_$p {args} {return ""}
+}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.text b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.text
new file mode 100644
index 00000000..c87ce4a0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.text
@@ -0,0 +1,106 @@
+# -*- tcl -*-
+# Engine to convert a doctoc document into plain text.
+#
+# Copyright (c) 2003-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+######################################################################
+
+dt_source _toc_common.tcl
+dt_source _text.tcl
+
+######################################################################
+# Conversion specification.
+# One-pass processing.
+
+rename toc_postprocess {}
+rename text_postprocess toc_postprocess
+
+proc fmt_plain_text {text} {return {}}
+
+################################################################
+## Backend for TEXT markup
+
+global seclist ; set seclist {}
+global max     ; set max 0
+
+proc InitSections {} {
+    global seclist ; set seclist {} ;# list of items in this division
+    global max     ; set max 0      ;# length of longest file path in the division
+    return
+}
+
+proc ProcessSections {} {
+    global seclist max
+    
+    if {![llength $seclist]} {
+	# Division is empty, nothing to do
+	return
+    }
+
+    incr max 2  ; set rmargin [RMargin  $max]
+    incr max -1 ; set blank   [Blank    $max]
+    incr max -1 ; set dots   "[Repeat . $max] "
+
+    # Example wrt max handling, blank, and dots:
+    #
+    # string = "longest",  max = 7 +2 => max = lmargin = 9
+    # blank  = "________" (max = 8, using _ as visible placeholder)
+    # dots   = "......._" (max = 7 (dots))
+    
+    foreach {file desc} $seclist {
+	Text [InFlow $desc $rmargin [ReHead $dots "$file "] $blank]
+	CloseParagraph [Verbatim]
+    }
+
+    set seclist {}
+    return
+}
+
+proc fmt_toc_begin {label title} {
+    set title "$label -- $title"
+    
+    TextInitialize
+    lappend   hdr "Table of contents [Provenance]"
+    lappend   hdr ""
+    SectTitle hdr $title
+    Text [Compose hdr]    
+    CloseParagraph [Verbatim]
+    return
+}
+
+proc fmt_toc_end {} {
+    ProcessSections
+    return
+}
+
+proc fmt_division_start {title symfile} {
+    # We may have sections before the new division
+    ProcessSections
+
+    InitSections
+    SubsectTitle hdr $title
+    Text [Compose hdr]
+    CloseParagraph [Verbatim]
+
+    ContextPush ;# Ref (a)
+    ContextNew Division { MarginIn }
+    return
+}
+
+proc fmt_division_end   {}      {
+    ProcessSections
+    ContextPop ;# Ref (a)
+    return
+}
+
+proc fmt_item {file label desc} {
+    global  seclist max
+    lappend seclist $file $desc
+    MaxLen max $file
+    return
+}
+
+proc fmt_comment {text} {return}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.tmml b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.tmml
new file mode 100644
index 00000000..92091d0c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.tmml
@@ -0,0 +1,34 @@
+# -*- tcl -*-
+# Engine to convert a doctoc document into TMML.
+#
+# Copyright (c) 2003-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+# See also <URL: http://tmml.sourceforge.net>
+#
+######################################################################
+
+dt_source _toc_common.tcl
+dt_source _xml.tcl
+
+######################################################################
+# Conversion specification.
+#
+# One-pass processing.
+
+rename toc_postprocess {}
+rename fmt_postprocess toc_postprocess
+
+proc fmt_plain_text {text} {if {$text != {}} {return \n} else {return {}}}
+
+################################################################
+## Backend for TMML markup
+
+proc fmt_toc_begin      {label title}     {sequence [start manual package $label] [wrap $title title]}
+proc fmt_toc_end        {}                {end manual}
+proc fmt_division_start {title symfile}   {sequence [start division] [wrap $title title]}
+proc fmt_division_end   {}                {end   division}
+proc fmt_item           {file label desc} {emptyElement subdoc href [dt_fmap $file]}
+proc fmt_comment        {text}            {xmlComment $text}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.wiki b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.wiki
new file mode 100644
index 00000000..271285eb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/mpformats/toc.wiki
@@ -0,0 +1,63 @@
+# -*- tcl -*-
+#
+# $Id: toc.wiki,v 1.6 2005/09/28 04:51:19 andreas_kupries Exp $
+#
+# Engine to convert a doctoc document into Wiki markup.
+#
+# Copyright (c) 2003 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Freely redistributable.
+#
+######################################################################
+
+dt_source _toc_common.tcl   ; # Shared code
+
+######################################################################
+
+proc toc_postprocess {wiki} {
+    # Strip empty lines out of the generated wiki source
+    # and trim leading blanks, except in code samples.
+    #
+    set lines [list]
+    foreach line [split $wiki \n] {
+	if {[string match " |*" $line]} {
+	    # Verbatim / example
+	    lappend lines [string trimright $line]
+	} elseif {[string match ". *" $line]} {
+	    # Verbatim / regular
+	    lappend lines [string range [string trimright $line] 1 end]
+	} elseif {[string match "   \* *" $line]} {
+	    # Itemized lists.
+	    lappend lines [string map {[ [[ ] ]]} [string trimright $line]]
+	} elseif {[string match "   1. *" $line]} {
+	    # Enumerated lists
+	    lappend lines [string map {[ [[ ] ]]} [string trimright $line]]
+	} elseif {[regexp "^   (\[^:\]): " $line]} {
+	    # Definition list
+	    lappend lines [string map {[ [[ ] ]]} [string trimright $line]]
+	} elseif {[string match " *" $line]} {
+	    # Unwanted indentation
+	    lappend lines [string map {[ [[ ] ]]} [string trim $line]]
+	} else {
+	    # Everything else
+	    lappend lines [string map {[ [[ ] ]]} [string trimright $line]]
+	}
+    }
+    set wiki [join $lines \n]\n
+
+    regsub {^[ ]+} $wiki {} wiki
+    return $wiki
+}
+
+proc fmt_plain_text {text} {if {$text != {}} {return \n} else {return {}}}
+
+################################################################
+## Backend for wiki markup
+
+proc fmt_toc_begin      {label title} {return "Table of Contents '''$label'''\n'''[string trim $title]'''"}
+proc fmt_toc_end        {}                {return {}}
+proc fmt_division_start {title symfile}   {return '''[string trim $title]'''}
+proc fmt_division_end   {}                {return {}}
+proc fmt_item           {file label desc} {return "   \[$label\]:   $file -- $desc"}
+proc fmt_comment        {text}            {return {}}
+
+################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/pkgIndex.tcl
new file mode 100644
index 00000000..1ca70f14
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools/pkgIndex.tcl
@@ -0,0 +1,6 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded doctools            1.5.6 [list source [file join $dir doctools.tcl]]
+package ifneeded doctools::toc       1.2   [list source [file join $dir doctoc.tcl]]
+package ifneeded doctools::idx       1.1   [list source [file join $dir docidx.tcl]]
+package ifneeded doctools::cvs       1     [list source [file join $dir cvs.tcl]]
+package ifneeded doctools::changelog 1.1   [list source [file join $dir changelog.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/html.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/html.tcl
new file mode 100644
index 00000000..acb7188c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/html.tcl
@@ -0,0 +1,209 @@
+# -*- tcl -*-
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Support package. Basic html generation commands.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.4 ; # Required Core
+package require doctools::text ; # Basic generator state management.
+
+namespace eval         ::doctools::html {}
+doctools::text::import ::doctools::html
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::doctools::html::begin {} {
+    text::begin
+    Begin
+    return
+}
+
+proc ::doctools::html::save {} {
+    variable state
+    set current [array get state]
+    text::save
+    Begin
+    set state(stack) $current
+    return
+}
+
+proc ::doctools::html::restore {} {
+    variable state
+    set html [text::restore]
+    array set state $state(stack)
+    return $html
+}
+
+proc ::doctools::html::collect {script} {
+    save
+    uplevel 1 $script
+    return [restore]
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::doctools::html::tag1 {name args} {
+    text::+ <$name
+    if {[llength $args]} {
+	foreach {a v} $args { text::+ " $a=\"$v\"" }
+    }
+    text::+ >
+    return
+}
+
+proc ::doctools::html::tag {name args} {
+    tagD $name $args
+    return
+}
+
+proc ::doctools::html::tagD {name dict} {
+    variable state
+    lappend state(tstack) $name
+    text::+ <$name
+    if {[llength $dict]} {
+	foreach {a v} $dict { text::+ " $a=\"$v\"" }
+    }
+    text::+ >
+    return
+}
+
+proc ::doctools::html::/tag {} {
+    variable state
+    set tag           [lindex   $state(tstack) end]
+    set state(tstack) [lreplace $state(tstack) end end]
+    text::+ </$tag>
+    return
+}
+
+proc ::doctools::html::tag/ {name args} {
+    variable state
+    lappend state(tstack) $tag
+    text::+ <$tag
+    if {[llength $args]} {
+	foreach {a v} $args { text::+ " $a=\"$v\"" }
+	text::+ { }
+    }
+    text::+ />
+    return
+}
+
+proc ::doctools::html::tag* {name args} {
+    set script [lindex   $args end]
+    set args   [lreplace $args end end]
+    tagD $name $args
+    uplevel 1 $script
+    /tag
+    return
+}
+
+proc ::doctools::html::tag= {name args} {
+    set text [lindex   $args end]
+    set args [lreplace $args end end]
+    eval [linsert $args 0 tag $name]
+    + $text
+    /tag
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::doctools::html::+ {text} {
+    text::+ [Quote $text]
+    return
+}
+
+proc ::doctools::html::comment {comment} {
+    text::+ "<!-- ${comment} -->"
+    return
+}
+
+proc ::doctools::html::++ {html} {
+    text::+ $html
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::doctools::html::import {{namespace {}}} {
+    uplevel 1 [list namespace eval ${namespace}::html {
+	namespace import ::doctools::html::*
+    }]
+    return
+}
+
+proc ::doctools::html::importhere {{namespace ::}} {
+    uplevel 1 [list namespace eval ${namespace} {
+	namespace import ::doctools::html::*
+    }]
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::doctools::html::Begin {} {
+    variable state
+    array unset state *
+    array set   state {
+	tags  {}
+	stack {}
+    }
+    return
+}
+
+proc ::doctools::html::Quote {text} {
+    variable textMap
+    return [string map $textMap $text]
+}
+
+# # ## ### ##### ######## ############# #####################
+
+namespace eval ::doctools::html {
+    variable  state
+    array set state {}
+
+    # Replaces HTML markup characters in $text with the appropriate
+    # entity references.
+
+    variable textMap {
+	&    &amp;    <    &lt;     >    &gt;       
+	\xa0 &nbsp;	\xb0 &deg;    \xc0 &Agrave; \xd0 &ETH;    \xe0 &agrave; \xf0 &eth;
+	\xa1 &iexcl;	\xb1 &plusmn; \xc1 &Aacute; \xd1 &Ntilde; \xe1 &aacute; \xf1 &ntilde;
+	\xa2 &cent;	\xb2 &sup2;   \xc2 &Acirc;  \xd2 &Ograve; \xe2 &acirc;  \xf2 &ograve;
+	\xa3 &pound;	\xb3 &sup3;   \xc3 &Atilde; \xd3 &Oacute; \xe3 &atilde; \xf3 &oacute;
+	\xa4 &curren;	\xb4 &acute;  \xc4 &Auml;   \xd4 &Ocirc;  \xe4 &auml;   \xf4 &ocirc;
+	\xa5 &yen;	\xb5 &micro;  \xc5 &Aring;  \xd5 &Otilde; \xe5 &aring;  \xf5 &otilde;
+	\xa6 &brvbar;	\xb6 &para;   \xc6 &AElig;  \xd6 &Ouml;   \xe6 &aelig;  \xf6 &ouml;
+	\xa7 &sect;	\xb7 &middot; \xc7 &Ccedil; \xd7 &times;  \xe7 &ccedil; \xf7 &divide;
+	\xa8 &uml;	\xb8 &cedil;  \xc8 &Egrave; \xd8 &Oslash; \xe8 &egrave; \xf8 &oslash;
+	\xa9 &copy;	\xb9 &sup1;   \xc9 &Eacute; \xd9 &Ugrave; \xe9 &eacute; \xf9 &ugrave;
+	\xaa &ordf;	\xba &ordm;   \xca &Ecirc;  \xda &Uacute; \xea &ecirc;  \xfa &uacute;
+	\xab &laquo;	\xbb &raquo;  \xcb &Euml;   \xdb &Ucirc;  \xeb &euml;   \xfb &ucirc;
+	\xac &not;	\xbc &frac14; \xcc &Igrave; \xdc &Uuml;   \xec &igrave; \xfc &uuml;
+	\xad &shy;	\xbd &frac12; \xcd &Iacute; \xdd &Yacute; \xed &iacute; \xfd &yacute;
+	\xae &reg;	\xbe &frac34; \xce &Icirc;  \xde &THORN;  \xee &icirc;  \xfe &thorn;
+	\xaf &hibar;	\xbf &iquest; \xcf &Iuml;   \xdf &szlig;  \xef &iuml;   \xff &yuml;
+    {"} &quot;
+} ; # " make the emacs highlighting code happy.
+
+    # Text commands which are html commands, unchanged
+    namespace import                \
+	::doctools::text::done      \
+	::doctools::text::+++       \
+	::doctools::text::newline   \
+	::doctools::text::prefix    \
+	::doctools::text::indent    \
+	::doctools::text::dedent    \
+	::doctools::text::indented  \
+	::doctools::text::indenting \
+	::doctools::text::newlines
+
+    namespace export begin done save restore collect + +++ \
+	prefix indent dedent indented indenting newline newlines \
+	tag /tag tag/ tag* tag1 tag= comment ++
+}
+
+# # ## ### ##### ######## ############# #####################
+package provide doctools::html 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/html_cssdefaults.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/html_cssdefaults.tcl
new file mode 100644
index 00000000..7feab312
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/html_cssdefaults.tcl
@@ -0,0 +1,158 @@
+# -*- tcl -*-
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Support package. Container for the default CSS style used by the
+# html export plugins when the user does not specify its own style.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.4 ; # Required Core
+
+namespace eval ::doctools::html::cssdefaults {
+    # Contents of the file we carry
+    variable c {}
+}
+
+proc ::doctools::html::cssdefaults::contents {} {
+    variable c
+    return  $c
+}
+
+set ::doctools::html::cssdefaults::c {
+HTML {
+    background: 	#FFFFFF;
+    color: 		black;
+}
+BODY {
+    background: 	#FFFFFF;
+    color:	 	black;
+}
+DIV.doctools {
+    margin-left:	10%;
+    margin-right:	10%;
+}
+DIV.doctools H1,DIV.doctools H2 {
+    margin-left:	-5%;
+}
+H1, H2, H3, H4 {
+    margin-top: 	1em;
+    font-family:	sans-serif;
+    font-size:	large;
+    color:		#005A9C;
+    background: 	transparent;
+    text-align:		left;
+}
+H1.title, H1.idx-title {
+    text-align: center;
+}
+UL,OL {
+    margin-right: 0em;
+    margin-top: 3pt;
+    margin-bottom: 3pt;
+}
+UL LI {
+    list-style: disc;
+}
+OL LI {
+    list-style: decimal;
+}
+DT {
+    padding-top: 	1ex;
+}
+UL.toc,UL.toc UL, UL.toc UL UL {
+    font:		normal 12pt/14pt sans-serif;
+    list-style:	none;
+}
+LI.section, LI.subsection {
+    list-style: 	none;
+    margin-left: 	0em;
+    text-indent:	0em;
+    padding: 	0em;
+}
+PRE {
+    display: 	block;
+    font-family:	monospace;
+    white-space:	pre;
+    margin:		0%;
+    padding-top:	0.5ex;
+    padding-bottom:	0.5ex;
+    padding-left:	1ex;
+    padding-right:	1ex;
+    width:		100%;
+}
+PRE.example {
+    color: 		black;
+    background: 	#f5dcb3;
+    border:		1px solid black;
+}
+UL.requirements LI, UL.syntax LI {
+    list-style: 	none;
+    margin-left: 	0em;
+    text-indent:	0em;
+    padding:	0em;
+}
+DIV.synopsis {
+    color: 		black;
+    background: 	#80ffff;
+    border:		1px solid black;
+    font-family:	serif;
+    margin-top: 	1em;
+    margin-bottom: 	1em;
+}
+UL.syntax {
+    margin-top: 	1em;
+    border-top:		1px solid black;
+}
+UL.requirements {
+    margin-bottom: 	1em;
+    border-bottom:	1px solid black;
+}
+
+DIV.idx-kwnav {
+    width:		100%;
+    margin-top:		5pt;
+    margin-bottom:	5pt;
+    margin-left:	0%;
+    margin-right:	0%;
+    padding-top:  	5pt;
+    padding-bottom:	5pt;
+    background:		#DDDDDD;
+    color:		black;
+    border: 		1px solid black;
+    text-align:		center;
+    font-size:		small;
+    font-family:	sans-serif;
+}
+
+/* TR.even/odd are used to get alternately colored table rows. 
+ * Could probably choose better colors here...
+ */
+
+TR.idx-even {
+    color: 		black;
+    background:		#efffef;
+}
+
+TR.idx-odd {
+    color: 		black;
+    background:		#efefff;
+}
+
+DIV.idx-header, DIV.idx-footer, DIV.idx-leader {
+    width:		100%;
+    margin-left:	0%;
+    margin-right:	0%;
+}
+
+TH {
+    color:		#005A9C;
+    background:		#DDDDDD;
+    text-align:	 	center;
+    font-family:	sans-serif;
+    font-weight:	bold;
+}
+}
+
+package provide doctools::html::cssdefaults 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/msgcat.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/msgcat.tcl
new file mode 100644
index 00000000..9e913e4a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/msgcat.tcl
@@ -0,0 +1,59 @@
+# -*- tcl -*-
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# L10N, I18N
+
+# Support package. Handling of message catalogs within the various
+# doctools document processing packages. Contrary to the regular
+# msgcat package here message catalogs are equated with packages. This
+# makes their use easier, as the user does not have to know the
+# location of the message catalogs. Locating a desired catalog is
+# handled through Tcl's regular package management.
+
+# To this end this package provides a command analogous to
+# 'msgcat::load', just replacing direct file access with package
+# loading. This is 'doctools::msgcat::init'.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.4 ; # Required Core
+package require msgcat  ; # Fondation catalog database
+
+namespace eval ::doctools::msgcat {}
+
+# # ## ### ##### ######## ############# #####################
+## Overide catalog unknown handler to report missing strings
+## as fatal problem. DEBUG only.
+
+if 0 {
+    proc ::msgcat::mcunknown {locale code} {
+	return "unknown error code \"$code\" (for locale $locale)"
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Public API
+
+proc ::doctools::msgcat::init {prefix} {
+    set matches 0
+    foreach p [msgcat::mcpreferences] {
+	set pkg doctools::msgcat::${prefix}::${p}
+	if {![catch {
+	    package require $pkg
+	}]} {
+	    incr matches
+	}
+    }
+    return $matches
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+namespace eval ::doctools::msgcat {
+    namespace export init
+}
+
+package provide doctools::msgcat 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/nroff_manmacros.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/nroff_manmacros.tcl
new file mode 100644
index 00000000..83522bf1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/nroff_manmacros.tcl
@@ -0,0 +1,261 @@
+# -*- tcl -*-
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Support package. Container for the man.macros needed by the nroff
+# export plugins when instructed to inline the commands the
+# documentation is using.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.4 ; # Required Core
+
+namespace eval ::doctools::nroff::man_macros {
+    # Contents of the file we carry
+    variable c {}
+}
+
+proc ::doctools::nroff::man_macros::contents {} {
+    variable c
+    return  $c
+}
+
+set ::doctools::nroff::man_macros::c {'\" The definitions below are for supplemental macros used in Tcl/Tk
+'\" manual entries.
+'\"
+'\" .AP type name in/out ?indent?
+'\"	Start paragraph describing an argument to a library procedure.
+'\"	type is type of argument (int, etc.), in/out is either "in", "out",
+'\"	or "in/out" to describe whether procedure reads or modifies arg,
+'\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+'\"	needed;  use .AS below instead)
+'\"
+'\" .AS ?type? ?name?
+'\"	Give maximum sizes of arguments for setting tab stops.  Type and
+'\"	name are examples of largest possible arguments that will be passed
+'\"	to .AP later.  If args are omitted, default tab stops are used.
+'\"
+'\" .BS
+'\"	Start box enclosure.  From here until next .BE, everything will be
+'\"	enclosed in one large box.
+'\"
+'\" .BE
+'\"	End of box enclosure.
+'\"
+'\" .CS
+'\"	Begin code excerpt.
+'\"
+'\" .CE
+'\"	End code excerpt.
+'\"
+'\" .VS ?version? ?br?
+'\"	Begin vertical sidebar, for use in marking newly-changed parts
+'\"	of man pages.  The first argument is ignored and used for recording
+'\"	the version when the .VS was added, so that the sidebars can be
+'\"	found and removed when they reach a certain age.  If another argument
+'\"	is present, then a line break is forced before starting the sidebar.
+'\"
+'\" .VE
+'\"	End of vertical sidebar.
+'\"
+'\" .DS
+'\"	Begin an indented unfilled display.
+'\"
+'\" .DE
+'\"	End of indented unfilled display.
+'\"
+'\" .SO
+'\"	Start of list of standard options for a Tk widget.  The
+'\"	options follow on successive lines, in four columns separated
+'\"	by tabs.
+'\"
+'\" .SE
+'\"	End of list of standard options for a Tk widget.
+'\"
+'\" .OP cmdName dbName dbClass
+'\"	Start of description of a specific option.  cmdName gives the
+'\"	option's name as specified in the class command, dbName gives
+'\"	the option's name in the option database, and dbClass gives
+'\"	the option's class in the option database.
+'\"
+'\" .UL arg1 arg2
+'\"	Print arg1 underlined, then print arg2 normally.
+'\"
+'\" RCS: @(#) $Id: nroff_manmacros.tcl,v 1.2 2009/04/29 02:09:46 andreas_kupries Exp $
+'\"
+'\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.if t .wh -1.3i ^B
+.nr ^l \n(.l
+.ad b
+'\"	# Start an argument description
+.de AP
+.ie !"\\$4"" .TP \\$4
+.el \{\
+.   ie !"\\$2"" .TP \\n()Cu
+.   el          .TP 15
+.\}
+.ta \\n()Au \\n()Bu
+.ie !"\\$3"" \{\
+\&\\$1	\\fI\\$2\\fP	(\\$3)
+.\".b
+.\}
+.el \{\
+.br
+.ie !"\\$2"" \{\
+\&\\$1	\\fI\\$2\\fP
+.\}
+.el \{\
+\&\\fI\\$1\\fP
+.\}
+.\}
+..
+'\"	# define tabbing values for .AP
+.de AS
+.nr )A 10n
+.if !"\\$1"" .nr )A \\w'\\$1'u+3n
+.nr )B \\n()Au+15n
+.\"
+.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
+.nr )C \\n()Bu+\\w'(in/out)'u+2n
+..
+.AS Tcl_Interp Tcl_CreateInterp in/out
+'\"	# BS - start boxed text
+'\"	# ^y = starting y location
+'\"	# ^b = 1
+.de BS
+.br
+.mk ^y
+.nr ^b 1u
+.if n .nf
+.if n .ti 0
+.if n \l'\\n(.lu\(ul'
+.if n .fi
+..
+'\"	# BE - end boxed text (draw box now)
+.de BE
+.nf
+.ti 0
+.mk ^t
+.ie n \l'\\n(^lu\(ul'
+.el \{\
+.\"	Draw four-sided box normally, but don't draw top of
+.\"	box if the box started on an earlier page.
+.ie !\\n(^b-1 \{\
+\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.el \}\
+\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
+.\}
+.\}
+.fi
+.br
+.nr ^b 0
+..
+'\"	# VS - start vertical sidebar
+'\"	# ^Y = starting y location
+'\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.de VS
+.if !"\\$2"" .br
+.mk ^Y
+.ie n 'mc \s12\(br\s0
+.el .nr ^v 1u
+..
+'\"	# VE - end of vertical sidebar
+.de VE
+.ie n 'mc
+.el \{\
+.ev 2
+.nf
+.ti 0
+.mk ^t
+\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
+.sp -1
+.fi
+.ev
+.\}
+.nr ^v 0
+..
+'\"	# Special macro to handle page bottom:  finish off current
+'\"	# box/sidebar if in box/sidebar mode, then invoked standard
+'\"	# page bottom macro.
+.de ^B
+.ev 2
+'ti 0
+'nf
+.mk ^t
+.if \\n(^b \{\
+.\"	Draw three-sided box if this is the box's first page,
+.\"	draw two sides but no top otherwise.
+.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
+.\}
+.if \\n(^v \{\
+.nr ^x \\n(^tu+1v-\\n(^Yu
+\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
+.\}
+.bp
+'fi
+.ev
+.if \\n(^b \{\
+.mk ^y
+.nr ^b 2
+.\}
+.if \\n(^v \{\
+.mk ^Y
+.\}
+..
+'\"	# DS - begin display
+.de DS
+.RS
+.nf
+.sp
+..
+'\"	# DE - end display
+.de DE
+.fi
+.RE
+.sp
+..
+'\"	# SO - start of list of standard options
+.de SO
+.SH "STANDARD OPTIONS"
+.LP
+.nf
+.ta 4c 8c 12c
+.ft B
+..
+'\"	# SE - end of list of standard options
+.de SE
+.fi
+.ft R
+.LP
+See the \\fBoptions\\fR manual entry for details on the standard options.
+..
+'\"	# OP - start of full description for a single option
+.de OP
+.LP
+.nf
+.ta 4c
+Command-Line Name:	\\fB\\$1\\fR
+Database Name:	\\fB\\$2\\fR
+Database Class:	\\fB\\$3\\fR
+.fi
+.IP
+..
+'\"	# CS - begin code excerpt
+.de CS
+.RS
+.nf
+.ta .25i .5i .75i 1i
+..
+'\"	# CE - end code excerpt
+.de CE
+.fi
+.RE
+..
+.de UL
+\\$1\l'|0\(ul'\\$2
+..}
+
+package provide doctools::nroff::man_macros 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/pkgIndex.tcl
new file mode 100644
index 00000000..de89bbb2
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/pkgIndex.tcl
@@ -0,0 +1,17 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+
+# Packages for the doctools {idx,toc,doc} v2 implementation
+# (still v1.1 doc{idx,toc} languages).
+
+# Supporting packages
+# - Handling text generation, the nroff man.macros definitions,
+#            HTML/XML generation, and the default CSS style
+# - Handling of message catalogs as packages.
+# - Recursive descent parser for Tcl strings (as expected by 'subst -novariables').
+
+package ifneeded doctools::text              0.1 [list source [file join $dir text.tcl]]
+package ifneeded doctools::nroff::man_macros 0.1 [list source [file join $dir nroff_manmacros.tcl]]
+package ifneeded doctools::html              0.1 [list source [file join $dir html.tcl]]
+package ifneeded doctools::html::cssdefaults 0.1 [list source [file join $dir html_cssdefaults.tcl]]
+package ifneeded doctools::msgcat            0.1 [list source [file join $dir msgcat.tcl]]
+package ifneeded doctools::tcl::parse        0.1 [list source [file join $dir tcl_parse.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/tcl_parse.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/tcl_parse.tcl
new file mode 100644
index 00000000..59cfd002
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/tcl_parse.tcl
@@ -0,0 +1,800 @@
+# -*- tcl -*-
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Recursive descent parser for Tcl commands embedded in a string.  (=>
+# subst -novariables, without actual evaluation of the embedded
+# commands). Useful for processing templates, etc. The result is an
+# abstract syntax tree of strings and commands, which in turn have
+# strings and commands as arguments.
+
+# The tree can be processed further. The nodes of the tree are
+# annotated with line/column/offset information to allow later stages
+# the reporting of higher-level syntax and semantic errors with exact
+# locations in the input.
+
+# TODO :: Add ability to report progress through the
+# TODO :: input. Callback. Invoked in 'Initialize', 'Step', and
+# TODO :: 'Finalize'.
+
+# TODO :: Investigate possibility of using tclparser package
+# TODO :: ('parser') to handle the command pieces embedded in the
+# TODO :: text.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.4         ; # Required runtime.
+package require snit            ; # OO system.
+package require fileutil        ; # File utilities.
+package require logger          ; # User feedback.
+package require struct::list    ; # Higher-order list operations.
+package require struct::stack   ; # Stacks
+package require struct::set     ; # Finite sets
+package require treeql          ; # Tree queries and transformation.
+
+# # ## ### ##### ######## ############# #####################
+##
+
+logger::initNamespace ::doctools::tcl::parse
+snit::type            ::doctools::tcl::parse {
+    # # ## ### ##### ######## #############
+    ## Public API
+
+    typemethod file {t path {root {}}} {
+	$type text $t [fileutil::cat -translation binary -encoding binary $path] $root
+    }
+
+    typemethod text {t text {root {}}} {
+	# --- --- --- --------- --------- ---------
+	# Phase 1. Lexical processing.
+	#          The resulting tree contains the raw tokens. See
+	#          below for the specification of the resulting tree
+	#          structure.
+	#
+	# This part is a recursive descent parser using Tcl's 12 rules
+	# for processing the input. Note: Variable references are not
+	# recognized, they are processed like regular text.
+
+	Initialize $t $text $root
+        String
+	Finalize
+
+	# Tree structure
+	# - All nodes but the root have the attributes 'type', 'range', 'line', and 'col'.
+	#
+	#   * 'type' in { Command, Text, Backslash, Word, Quote, Continuation, QBrace }
+	#   * 'range' is 2-element list (offset start, offset end)
+	#   * 'line' is integer number > 0
+	#   * 'col' is integer number >= 0
+	#
+	#   'type' specifies what sort of token the node contains.
+	#
+	#   'range' is the location of the token as offsets in
+	#           characters from the beginning of the string, for
+	#           first and last character in the token. EOL markers
+	#           count as one character. This can be empty.
+	#
+	#   'line', 'col' are the location of the first character
+	#   AFTER the token, as the line and column the character is
+	#   on and at.
+	#
+	# Meaning of the various node types
+	#
+	# Command .... : A command begins here, the text in the range
+	# .............. is the opening bracket.
+	# Text ....... : A text segment in a word, anything up to the
+	# .............. beginning of a backslash sequence or of an
+	# .............. embedded command. 
+	# Backslash .. : A backslash sequence. The text under the
+	# .............. range is the whole sequence.
+	# Word ....... : The beginning of an unquoted, quoted or
+	# .............. braced word. The text under the range is the
+	# .............. opening quote or brace, if any. The range is
+	# .............. empty for an unquoted word.
+	# Quote ...... : An embedded double-quote character which is
+	# .............. not the end of a quoted string (a special
+	# .............. type of backslash sequence). The range is the
+	# .............. whole sequence.
+	# Continuation : A continuation line in an unquoted, quoted,
+	# .............. or braced string. The range covers the whole
+	# .............. sequence, including the whitespace trailing
+	# .............. it.
+	# QBrace ..... : A quoted brace in a braced string. A special
+	# .............. kind of backslash sequence. The range covers
+	# .............. the whole sequence.
+
+	# --- --- --- --------- --------- ---------
+	# Phase 2. Convert the token tree into a syntax tree.
+	#          This phase simplifies the tree by converting and
+	#          eliminating special tokens, and further decouples
+	#          it from the input by storing the relevant string
+	#          ranges of the input in the tree. For the the
+	#          specification of the resulting structure see method
+	#          'Verify'.
+	#
+	# The sub-phases are and do
+	#
+	# (a) Extract the string information from the input and store
+	#     them in their Text tokens.
+	# (b) Convert the special tokens (QBrace, Backslash, Quote,
+	#     Continuation) into equivalent 'Text' tokens, with proper
+	#     string information.
+	# (c) Merge adjacent 'Text' tokens.
+	# (d) Remove irrelevant 'Word' tokens. These are tokens with a
+	#     single Text token as child. Word tokens without children
+	#     however represent empty strings. They are converted into
+	#     an equivalent Text node instead.
+	# (e) Pull the first word of commands into the command token,
+	#     and ensure that it is not dynamic, i.e not an embedded
+	#     command.
+
+	ShowTree $t "Raw tree"
+
+	set q [treeql %AUTO% -tree $t]
+
+	# (a)
+	foreach n [$q query tree withatt type Text] {
+	    struct::list assign [$t get $n range] a e
+	    #$t unset $n range
+	    $t set   $n text [string range $mydata $a $e]
+	}
+	ShowTree $t "Text annotation"
+
+	# (b1)
+	foreach n [$q query tree withatt type QBrace] {
+	    struct::list assign [$t get $n range] a e
+	    incr a ; # Skip backslash
+	    #$t unset $n range
+	    $t set   $n text [string range $mydata $a $e]
+	    $t set   $n type Text
+	}
+	ShowTree $t "Special conversion 1, quoted braces"
+
+	# (b2)
+	foreach n [$q query tree withatt type Backslash] {
+	    struct::list assign [$t get $n range] a e
+	    #$t unset $n range
+	    $t set   $n text [subst -nocommands -novariables [string range $mydata $a $e]]
+
+	    #puts <'[string range $mydata $a $e]'>
+	    #puts _'[subst -nocommands -novariables [string range $mydata $a $e]]'_
+
+	    $t set   $n type Text
+	}
+	ShowTree $t "Special conversion 2, backslash sequences"
+
+	# (b3)
+	foreach n [$q query tree withatt type Quote] {
+	    #$t unset $n range
+	    $t set $n text "\""
+	    $t set $n type Text
+	}
+	ShowTree $t "Special conversion 3, quoted double quotes"
+
+	# (b4)
+	foreach n [$q query tree withatt type Continuation] {
+	    #$t unset $n range
+	    $t set   $n text { }
+	    $t set   $n type Text
+	}
+	ShowTree $t "Special conversion 4, continuation lines"
+
+	# (c)
+	foreach n [$q query tree withatt type Text right withatt type Text] {
+	    set left [$t previous $n]
+	    $t append $left text [$t get $n text]
+
+	    # Extend covered range. Copy location.
+	    struct::list assign [$t get $left range] a _
+	    struct::list assign [$t get $n    range] _ e
+	    $t set $left range [list $a $e]
+	    $t set $left line  [$t get $n line]
+	    $t set $left col   [$t get $n col]
+
+	    $t delete $n
+	}
+	ShowTree $t "Merged adjacent texts"
+
+	# (d)
+	foreach n [$q query tree withatt type Word] {
+	    if {![$t numchildren $n]} {
+		$t set $n type Text
+		$t set $n text {}
+	    } elseif {[$t numchildren $n] == 1} {
+		$t cut $n
+	    }
+	}
+	ShowTree $t "Dropped simple words"
+
+	# (e)
+	foreach n [$q query tree withatt type Command] {
+	    set first [lindex [$t children $n] 0]
+	    if {[$t get $first type] eq "Word"} {
+		error {Dynamic command name}
+	    }
+	    $t set $n text  [$t get $first text]
+	    $t set $n range [$t get $first range]
+	    $t set $n line  [$t get $first line]
+	    $t set $n col   [$t get $first col]
+	    $t delete $first
+	}
+	ShowTree $t "Command lifting"
+
+	$q destroy
+
+	Verify $t
+	return
+    }
+
+    proc Verify {t} {
+	# Tree structure ...
+	# Attributes Values
+	# - type     string in {'Command','Text','Word'} (phase 2)
+	# - range    2-tuple (integer, integer), can be empty. start and end offset of the word in the input string.
+	# - line     integer, line the node starts on. First line is 1
+	# - col      integer, column the node starts on (#char since start of line, first char is 0)
+	# Constraints
+	# .(i)    The root node has no attributes at all.
+	# .(ii)   The children of the root are Command and Text nodes in semi-alternation.
+	#         I.e.: After a Text node a Command has to follow.
+	#         After a Command node either Text or Command can follow.
+	# .(iii)  The children of a Command node are Text, Word, and Command nodes, the command arguments. If any.
+	# .(iv)   The children of a Word node are Command and Text nodes in semi-alternation.
+	# .(v)    All Text nodes are leafs.
+	# .(vi)   Any Command node can be a leaf.
+	# .(vii)  Word nodes cannot be leafs.
+	# .(viii) All non-root nodes have the attributes 'type', 'range', 'col', and 'line'.
+
+	foreach n [$t nodes] {
+	    if {[$t parent $n] eq ""} {
+		# (ii)
+		set last {}
+		foreach c [$t children $n] {
+		    set type [$t get $c type]
+		    if {![struct::set contains {Command Text} $type]} {
+			return -code error "$c :: Bad node type $type in child of root node"
+		    } elseif {($type eq $last) && ($last eq "Text")} {
+			return -code error "$c :: Bad node $type, not semi-alternating"
+		    }
+		    set last $type
+		}
+		# (i)
+		if {[llength [$t getall $n]]} {
+		    return -code error "$n :: Bad root node, has attributes, should not"
+		}
+		continue
+	    } else {
+		# (viii)
+		foreach k {range line col} {
+		    if {![$t keyexists $n $k]} {
+			return -code error "$n :: Bad node, attribute '$k' missing"
+		    }
+		}
+	    }
+	    set type [$t get $n type]
+	    switch -exact -- $type {
+		Command {
+		    # (vi)
+		    # No need to check children. May have some or not,
+		    # and no specific sequence is required.
+		}
+		Word {
+		    # (vii)
+		    if {![llength [$t children $n]]} {
+			return -code error "$n :: Bad word node is leaf"
+		    }
+		    # (iv)
+		    set last {}
+		    foreach c [$t children $n] {
+			set type [$t get $c type]
+			if {![struct::set contains {Command Text} $type]} {
+			    return -code error "$n :: Bad node type $type in word node"
+			} elseif {($type eq $last) && ($last eq "Text")} {
+			    return -code error "$c :: Bad node $type, not semi-alternating"
+			}
+			set last $type
+		    }
+		}
+		Text {
+		    # (v)
+		    if {[llength [$t children $n]]} {
+			return -code error "$n :: Bad text node is not leaf"
+		    }
+		}
+		default {
+		    # (iii)
+		    return -code error "$n :: Bad node type $type"
+		}
+	    }
+	}
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Internal methods, lexical processing
+
+    proc String {} {
+	while 1 {
+	    Note @String
+	    if {[EOF]}         break
+	    if {[Command]}     continue
+	    if {[TextSegment]} continue
+	    if {[Backslash]}   continue
+
+	    Stop ;# Unexpected character
+	}
+	Note @EOF
+	return
+    }
+
+    proc Command {} {
+	# A command starts with an opening bracket.
+	Note ?Command
+	if {![Match "\\A(\\\[)" range]} {
+	    Note \t%No-Command
+	    return 0
+	}
+	Note !Command
+
+	PushRoot [Node Command $range]
+	while {[Word]} {
+	    # Step over any whitespace after the last word
+	    Whitespace
+	    # Command ends at the closing bracket
+	    if {[Match "\\A(\\])" range]} break
+	    if {![EOF]} continue
+
+	    Stop ;# Unexpected end of input
+	}
+
+	Note !CommandStop
+	PopRoot
+	return 1
+    }
+
+    proc TextSegment {} {
+	# A text segment is anything up to a command start or start of
+	# a back slash sequence.
+	Note ?TextSegment
+	if {![Match "\\A(\[^\\\[\]+)" range]} {
+	    Note \t%No-TextSegment
+	    return 0
+	}
+	Note !TextSegment
+	Node Text $range
+	return 1
+    }
+
+    proc TextSegmentWithoutQuote {} {
+	Note ?TextSegmentWithoutQuote
+	# A text segment without quote is anything up to a command
+	# start or start of a back slash sequence, or a double-quote
+	# character.
+	if {![Match "\\A(\[^\"\\\\\[\]+)" range]} {
+	    Note \t%No-TextSegmentWithoutQuote
+	    return 0
+	}
+	Note !TextSegment
+	Node Text $range
+	return 1
+    }
+
+    proc Backslash {} {
+	Note ?Backslash
+	if {
+	    ![Match "\\A(\\\\x\[a-fA-F0-9\]+)"     range] &&
+	    ![Match "\\A(\\\\u\[a-fA-F0-9\]{1,4})" range] &&
+	    ![Match "\\A(\\\\\[0-2\]\[0-7\]{2})"   range] &&
+	    ![Match "\\A(\\\\\[0-7\]{1,2})"        range] &&
+	    ![Match {\A(\\[abfnrtv])}          range]
+	} {
+	    Note \t%No-Backslash
+	    return 0
+	}
+	Note !Backslash
+	Node Backslash $range
+	return 1
+    }
+
+    proc Word {} {
+	Note ?Word
+	if {[QuotedWord]}   {return 1}
+	if {[BracedWord 0]} {return 1}
+	return [UnquotedWord]
+    }
+
+    proc Whitespace {} {
+	Note ?Whitespace
+	if {![Match {\A([ \t]|(\\\n[ \t]*))+} range]} {
+	    Note \t%No-Whitespace
+	    return 0
+	}
+	Note !Whitespace
+	return 1
+    }
+
+    proc QuotedWord {} {
+	# A quoted word starts with a double quote.
+	Note ?QuotedWord
+	if {![Match "\\A(\")" range]} {
+	    Note \t%No-QuotedWord
+	    return 0
+	}
+	Note !QuotedWord
+	PushRoot [Node Word $range]
+	QuotedString
+	PopRoot
+	return 1
+    }
+
+    proc BracedWord {keepclose} {
+	# A braced word starts with an opening brace.
+	Note ?BracedWord/$keepclose
+	if {![Match "\\A(\{)" range]} {
+	    Note \t%No-BracedWord/$keepclose
+	    return 0
+	}
+	Note !BracedWord/$keepclose
+	PushRoot [Node Word $range]
+	BracedString $keepclose
+	PopRoot
+	return 1
+    }
+
+    proc UnquotedWord {} {
+	Note !UnquotedWord
+	PushRoot [Node Word {}]
+	UnquotedString
+	PopRoot
+	return 1
+    }
+
+    proc QuotedString {} {
+	Note !QuotedString
+	while 1 {
+	    Note !QuotedStringPart
+	    # A quoted word (and thus the embedded string) ends with
+	    # double quote.
+	    if {[Match "\\A(\")" range]} {
+		return
+	    }
+	    # Now try to match possible pieces of the string. This is
+	    # a repetition of the code in 'String', except for the
+	    # different end condition above, and the possible embedded
+	    # double quotes and continuation lines the outer string
+	    # can ignore.
+	    if {[Command]}      continue
+	    if {[Quote]}        continue
+	    if {[QuotedBraces]} continue
+	    if {[Continuation]} continue
+	    if {[Backslash]}    continue
+            # Check after backslash recognition and processing
+	    if {[TextSegmentWithoutQuote]}  continue
+
+	    Stop ;# Unexpected character or end of input
+	}
+	return
+    }
+
+    proc BracedString {keepclose} {
+	while 1 {
+	    Note !BracedStringPart
+	    # Closing brace encountered. keepclose is set if we are in
+	    # a nested braced string. Only then do we have to put the
+	    # brace as a regular text piece into the string
+	    if {[Match "\\A(\})" range]} {
+		if {$keepclose} {
+		    Node Text $range
+		}
+		return
+	    }
+	    # Special sequences.
+	    if {[QuotedBraces]} continue
+	    if {[Continuation]} continue
+	    if {[BracedWord 1]} continue
+	    # A backslash without a brace coming after is regular a
+	    # character.
+	    if {[Match {\A(\\)} range]} {
+		Node Text $range
+		continue
+	    }
+	    # Gooble sequence of regular characters. Stops at
+	    # backslash and braces. Backslash stop is needed to handle
+	    # the case of them starting a quoted brace.
+	    if {[Match {\A([^\\\{\}]*)} range]} {
+		Node Text $range
+		continue
+	    }
+	    Stop ;# Unexpected character or end of input.
+	}
+    }
+
+    proc UnquotedString {} {
+	while 1 {
+	    Note !UnquotedStringPart
+	    # Stop conditions
+	    # - end of string
+	    # - whitespace
+	    # - Closing bracket (end of command the word is in)
+	    if {[EOF]}                    return
+	    if {[Whitespace]}             return
+	    if {[Peek "\\A(\\\])" range]} return
+
+	    # Match each possible type of part
+	    if {[Command]}              continue
+	    if {[Quote]}                continue
+	    if {[Continuation]}         continue
+	    if {[Backslash]}            continue
+            # Last, capture backslash sequences first.
+	    if {[UnquotedTextSegment]}  continue
+
+	    Stop ;# Unexpected character or end of input.
+	}
+	return
+    }
+
+    proc UnquotedTextSegment {} {
+	# All chars but whitespace and brackets (start or end of
+	# command).
+	Note ?UnquotedTextSegment
+	if {![Match {\A([^\]\[\t\n ]+)} range]} {
+	    Note \t%No-UnquotedTextSegment
+	    return 0
+	}
+	Note !UnquotedTextSegment
+	Node Text $range
+	return 1
+    }
+
+    proc Quote {} {
+	Note ?EmdeddedQuote
+	if {![Match "\\A(\\\")" range]} {
+	    Note \t%No-EmdeddedQuote
+	    return 0
+	}
+	# Embedded double quote, not the end of the quoted string.
+	Note !EmdeddedQuote
+	Node Quote $range
+	return 1
+    }
+
+    proc Continuation {} {
+	Note ?ContinuationLine
+	if {![Match "\\A(\\\\\n\[ \t\]*)" range]} {
+	    Note \t%No-ContinuationLine
+	    return 0
+	}
+	Note !ContinuationLine
+	Node Continuation $range
+	return 1
+    }
+
+    proc QuotedBraces {} {
+	Note ?QuotedBrace
+	if {
+	    ![Match "\\A(\\\\\{)" range] &&
+	    ![Match "\\A(\\\\\})" range]
+	} {
+	    Note \t%No-QuotedBrace
+	    return 0
+	}
+	Note !QuotedBrace
+	Node QBrace $range
+	return 1
+    }
+
+    # # ## ### ##### ######## #############
+    ## Tree construction helper commands.
+
+    proc Node {what range} {
+	set n [lindex [$mytree insert $myroot end] 0]
+
+	Note "+\tNode $n @ $myroot $what"
+
+	$mytree set $n type  $what
+	$mytree set $n range $range
+	$mytree set $n line  $myline
+	$mytree set $n col   $mycol
+
+	return $n
+    }
+
+    proc PushRoot {x} {
+	Note "Push Root = $x"
+	$myrootstack push $myroot
+	set     myroot $x
+	return
+    }
+
+    proc PopRoot {} {
+	set myroot      [$myrootstack pop]
+	Note "Pop Root = $myroot"
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Error reporting
+
+    proc Stop {} {
+	::variable myerr
+	set ahead  [string range $mydata $mypos [expr {$mypos + 30}]]
+	set err    [expr {![string length $ahead] ? "eof" : "char"}]
+	set ahead  [string map [list \n \\n \t \\t \r \\r] [string range $ahead 0 0]]
+	set caller [lindex [info level -1] 0]
+	set msg   "[format $myerr($err) $ahead $caller] at line ${myline}.$mycol"
+	set err    [list doctools::tcl::parse $err $mypos $myline $mycol]
+
+	return -code error -errorcode $err $msg
+    }
+
+    # # ## ### ##### ######## #############
+    ## Input processing. Match/peek lexemes, update location after
+    ## stepping over a range. Match = Peek + Step.
+
+    proc EOF {} {
+	Note "?EOF($mypos >= $mysize) = [expr {$mypos >= $mysize}]"
+	return [expr {$mypos >= $mysize}]
+    }
+
+    proc Match {pattern rv} {
+	upvar 1 $rv range
+	set ok [Peek $pattern range]
+	if {$ok} {Step $range}
+	return $ok
+    }
+
+    proc Peek {pattern rv} {
+	upvar 1 $rv range
+
+	Note Peek($pattern)----|[string map [list "\n" "\\n"  "\t" "\\t"] [string range $mydata $mypos [expr {$mypos + 30}]]]|
+
+	if {[regexp -start $mypos -indices -- $pattern $mydata -> range]} {
+	    Note \tOK
+	    return 1
+	} else {
+	    Note \tFAIL
+	    return 0
+	}
+    }
+
+    proc Step {range} {
+	struct::list assign $range a e
+
+	set  mylastpos $mypos
+
+	set  mypos $e
+	incr mypos
+
+	set pieces [split [string range $mydata $a $e] \n]
+        set delta  [string length [lindex $pieces end]]
+        set nlines [expr {[llength $pieces] - 1}]
+
+	if {$nlines} {
+	    incr myline $nlines
+	    set  mycol  $delta 
+	} else {
+	    incr mycol  $delta
+	}
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Setup / Shutdown of parser/lexer
+
+    proc Initialize {t text root} {
+	set mytree $t
+	if {$root eq {}} {
+	    set myroot [$t rootname]
+	} else {
+	    set myroot $root
+	}
+
+	if {$myrootstack ne {}} Finalize
+	set myrootstack [struct::stack %AUTO%]
+	$myrootstack clear
+
+	set mydata $text
+	set mysize [string length $mydata]
+
+	set mypos  0
+	set myline 1
+	set mycol  0
+	return
+    }
+
+    proc Finalize {} {
+	$myrootstack destroy
+	set myrootstack {}
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Debugging helper commands
+    ## Add ability to disable these.
+    ## For the tree maybe add ability to dump through a callback ?
+
+    proc Note {text} {
+	upvar 1 range range
+	set m {}
+	append m "$text "
+	if {[info exists range]} {
+	    append m "($range) "
+	    if {$range != {}} {
+		foreach {a e} $range break
+		append m " = \"[string map [list "\n" "\\n"  "\t" "\\t"] \
+                                   [string range $mydata $a $e]]\""
+	    }
+	} else {
+	    append m "@$mypos ($myline/$mycol)"
+	}
+	#log::debug $m
+        puts $m
+	return
+    }
+
+    #proc ShowTreeX {args} {}
+    proc ShowTreeX {t x} {
+	puts "=== \[ $x \] [string repeat = [expr {72 - [string length $x] - 9}]]"
+	$t walk root -order pre -type dfs n {
+	    set prefix [string repeat .... [$t depth $n]]
+	    puts "$prefix$n <[DictSort [$t getall $n]]>"
+	}
+	return
+    }
+
+    proc Note     {args} {}
+    proc ShowTree {args} {}
+
+    # # ## ### ##### ######## #############
+
+    proc DictSort {dict} {
+	array set tmp $dict
+	set res {}
+	foreach k [lsort -dict [array names tmp]] {
+	    lappend res $k $tmp($k)
+	}
+	return $res
+    }
+
+    # # ## ### ##### ######## #############
+    ## Parser state
+
+    typevariable mytree      {} ; # Tree we are working on
+    typevariable myroot      {} ; # Current root to add nodes to.
+    typevariable myrootstack {} 
+
+    typevariable mydata {} ; # String to parse.
+    typevariable mysize 0  ; # Length of string to parse, cache
+
+    typevariable mylastpos ; # Last current position.
+    typevariable mypos  0  ; # Current parse location, offset from
+    typevariable myline 1  ; # the beginning of the string, line
+    typevariable mycol  0  ; # we are on, and the column within the
+                             # line.
+
+    typevariable myerr -array {
+	char {Unexpected character '%1$s' in %2$s}
+	eof  {Unexpected end of input in %2$s}
+    }
+
+
+    # # ## ### ##### ######## #############
+    ## Configuration
+
+    pragma -hasinstances   no ; # singleton
+    pragma -hastypeinfo    no ; # no introspection
+    pragma -hastypedestroy no ; # immortal
+
+    ##
+    # # ## ### ##### ######## #############
+}
+
+namespace eval ::doctools::tcl {
+    namespace export parse
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide doctools::tcl::parse 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/text.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/text.tcl
new file mode 100644
index 00000000..2d3af9b5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2base/text.tcl
@@ -0,0 +1,216 @@
+# -*- tcl -*-
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Support package. Basic text generation commands.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.4 ; # Required Core
+
+namespace eval ::doctools::text {}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::doctools::text::begin {} {
+    variable state
+    array unset state *
+    array set   state {
+	stack     {}
+	buffer    {}
+	prefix    {}
+	pstack    {}
+	underl    {}
+	break     0
+	newlines  1
+	indenting 1
+    }
+    return
+}
+
+proc ::doctools::text::done {} {
+    variable state
+    return $state(buffer)
+}
+
+proc ::doctools::text::save {} {
+    variable state
+    set current [array get state]
+    begin
+    set state(stack) $current
+    return
+}
+
+proc ::doctools::text::restore {} {
+    variable state
+    set text [done]
+    array set state $state(stack)
+    return $text
+}
+
+proc ::doctools::text::collect {script} {
+    save
+    uplevel 1 $script
+    return [restore]
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::doctools::text::+ {text} {
+    variable state
+    if {$state(break)} {
+	+++ [string repeat \n $state(break)]
+	+++ $state(prefix)
+	set state(break) 0
+    }
+    +++ $text
+    set state(underl) [string length $text]
+    return
+}
+
+proc ::doctools::text::underline {char} {
+    variable state
+    newline
+    + [string repeat [string index $char 0] $state(underl)]
+    newline
+    return
+}
+
+proc ::doctools::text::+++ {text} {
+    variable state
+    append   state(buffer) $text
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::doctools::text::newline {{increment 1}} {
+    variable state
+    if {!$state(newlines)} { return 0 }
+    incr state(break) $increment
+    return 1
+}
+
+proc ::doctools::text::newline? {} {
+    variable state
+    if {!$state(newlines)} { return 0 }
+    if {$state(break)} { return 1 }
+    if {![string length $state(buffer)]} { return 1 }
+    if {[string index   $state(buffer) end] eq "\n"} { return 1 }
+    incr state(break)
+    return 1
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::doctools::text::prefix {text} {
+    variable state
+    if {!$state(indenting)} return
+    set state(prefix) $text
+    return
+}
+
+proc ::doctools::text::indent {{increment 2}} {
+    variable state
+    if {!$state(indenting)} return
+    lappend state(pstack) $state(prefix)
+    set     state(prefix) [string repeat { } $increment]$state(prefix)
+    return
+}
+
+proc ::doctools::text::dedent {} {
+    variable state
+    if {!$state(indenting)} return
+    set state(prefix) [lindex   $state(pstack) end]
+    set state(pstack) [lreplace $state(pstack) end end]
+    return
+}
+
+proc ::doctools::text::indented {increment script} {
+    indent $increment
+    uplevel 1 $script
+    dedent
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::doctools::text::indenting {enable} {
+    variable state
+    set state(indenting) $enable
+    return
+}
+
+proc ::doctools::text::newlines {enable} {
+    variable state
+    set state(newlines) $enable
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::doctools::text::field {wvar elements {index {}}} {
+    upvar 1 $wvar width
+    set width 0
+    #puts @!$width
+    if {$index ne {}} {
+	foreach e $elements {
+	    #puts stdout @/$e
+	    set e [lindex $e $index]
+	    #puts stdout @^$e
+	    set l [string length $e]
+	    if {$l <= $width} continue
+	    set width $l
+	}
+    } else {
+	foreach e $elements {
+	    #puts stdout @/$e
+	    set l [string length $e]
+	    if {$l <= $width} continue
+	    set width $l
+	}
+    }
+    #puts stdout @=$width
+    return
+}
+
+proc ::doctools::text::right {wvar str} {
+    upvar $wvar width
+    return [format %${width}s $str]
+}
+
+proc ::doctools::text::left {wvar str} {
+    upvar $wvar width
+    return [format %-${width}s $str]
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::doctools::text::import {{namespace {}}} {
+    uplevel 1 [list namespace eval ${namespace}::text {
+	namespace import ::doctools::text::*
+    }]
+    return
+}
+
+proc ::doctools::text::importhere {{namespace ::}} {
+    uplevel 1 [list namespace eval ${namespace} {
+	namespace import ::doctools::text::*
+    }]
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+
+namespace eval ::doctools::text {
+    variable  state
+    array set state {}
+
+    namespace export begin done save restore collect + underline +++ \
+	prefix indent dedent indented indenting newline newlines \
+	field right left newline?
+}
+
+# # ## ### ##### ######## ############# #####################
+package provide doctools::text 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/container.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/container.tcl
new file mode 100644
index 00000000..ae1a8798
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/container.tcl
@@ -0,0 +1,405 @@
+# docidx.tcl --
+#
+#	Implementation of docidx objects for Tcl. v2.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: container.tcl,v 1.3 2009/08/11 22:52:47 andreas_kupries Exp $
+
+# Each object manages one index, with methods to add and remove keys
+# and references, singly, or in bulk. The bulk methods accept various
+# forms of textual serializations, among them text using the docidx
+# markup language.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+package require doctools::idx::structure
+package require snit
+
+# ### ### ### ######### ######### #########
+## API
+
+snit::type ::doctools::idx {
+
+    # Concepts:
+    # - An index consists of a (possibly empty) set of keys, 
+    # - Each key in the set is identified by its name.
+    # - Each key has a (possibly empty) set of references.
+    # - Each reference is identified by its target, specified as
+    #   either url or symbolic filename, depending on the type of
+    #   reference (url, or manpage).
+    # - A reference can be in the sets of more than one key.
+    # - A reference outside of the sets of all keys is not possible
+    #   however.
+    # - A reference carries not only its identifying target, but also
+    #   a descriptive label (*). This label is however not unique per
+    #   reference, but only per a pair of key and reference in that
+    #   key.
+    # - The type of a reference (url, or manpage) is however bound to
+    #   the reference itself.
+    # - (*) For keys the identifying feature is identical to its
+    #   label.
+
+    # Note: url and manpage references share a namespace for their
+    # identifiers. This should be no problem with manpage identifiers
+    # being symbolic filenames and as such they should never look like
+    # urls.
+
+    # ### ### ### ######### ######### #########
+    ## Options
+
+    ## None
+
+    # ### ### ### ######### ######### #########
+    ## Methods
+
+    # Default constructor.
+    # Default destructor.
+
+    # ### ### ### ######### ######### #########
+
+    method invalidate {} {
+	array unset myidx *
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method title {{text {}}} {
+	if {[llength [info level 0]] == 6} {
+	    set mytitle $text
+	}
+	return $mytitle
+    }
+
+    method label {{text {}}} {
+	if {[llength [info level 0]] == 6} {
+	    set mylabel $text
+	}
+	return $mylabel
+    }
+
+    method exporter {{object {}}} {
+	# TODO :: unlink/link change notification callbacks on the
+	# config/include components so that we can invalidate our
+	# cache when the settings change.
+
+	if {[llength [info level 0]] == 6} {
+	    set myexporter $object
+	}
+	return $myexporter
+    }
+
+    method importer {{object {}}} {
+	if {[llength [info level 0]] == 6} {
+	    set myimporter $object
+	}
+	return $myimporter
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Direct manipulation of the index contents.
+
+    method {key add} {key} {
+	# Ignore addition of an already known key
+	if {[info exists mykey($key)]} return
+	set mykey($key) {}
+	array unset myidx *
+	return
+    }
+
+    method {key remove} {key} {
+	# Ignore removal of a key already gone
+	if {![info exists mykey($key)]} return
+	set references $mykey($key)
+	unset mykey($key)
+	foreach name $references {
+	    # Remove key from the list of users for all references it
+	    # contains.
+	    set pos [lsearch -exact $myrefuse($name) $key]
+	    set myrefuse($name) [lreplace $myrefuse($name) $pos $pos]
+	    if {[llength $myrefuse($name)]} continue
+	    # Last use of this reference is gone, delete it.
+	    unset myrefuse($name)
+	    unset myref($name)
+	}
+	array unset myidx *
+	return
+    }
+
+    method keys {} {
+	return [array names mykey]
+    }
+
+    method {key references} {key} {
+	if {![info exists mykey($key)]} {
+	    return -code error "Unknown key '$key'"
+	}
+	return $mykey($key)
+    }
+
+    method {reference add} {reftype key name label} {
+	if {![info exists mykey($key)]} {
+	    return -code error "Unknown key '$key'"
+	}
+	if {[info exists myref($name)] && ([lindex $myref($name) 0] ne $reftype)} {
+	    return -code error "Cannot add $reftype reference '$name', is a [lindex $myref($name) 0] reference already"
+	}
+	if {($reftype ne "url") && ($reftype ne "manpage")} {
+	    return -code error "Bad reference type '$reftype'"
+	}
+	set myref($name) [list $reftype $label]
+	if {![info exists myrefuse($name)]} {
+	    set myrefuse($name) {}
+	}
+	if {![info exists mylink([list $name $key])]} {
+	    # reference was not used by the key yet.
+	    lappend mykey($key) $name
+	    lappend myrefuse($name) $key
+	    set mylink([list $name $key]) .
+	}
+	array unset myidx *
+	return
+    }
+
+    method {reference remove} {name} {
+	# Ignore removal of already unknown reference
+	if {![info exists myrefuse($name)]} return
+	foreach key $myrefuse($name) {
+	    unset mylink([list $name $key])
+	    set pos   [lsearch -exact $mykey($key) $name]
+	    set mykey($key) [lreplace $mykey($key) $pos $pos]
+	}
+	unset myref($name)
+	unset myrefuse($name)
+	array unset myidx *
+	return
+    }
+
+    method {reference label} {name} {
+	if {![info exists myref($name)]} {
+	    return -code error "Unknown reference '$name'"
+	}
+	return [lindex $myref($name) 1]
+    }
+
+    method {reference type} {name} {
+	if {![info exists myref($name)]} {
+	    return -code error "Unknown reference '$name'"
+	}
+	return [lindex $myref($name) 0]
+    }
+
+    method {reference keys} {name} {
+	if {![info exists myrefuse($name)]} {
+	    return -code error "Unknown reference '$name'"
+	}
+	return $myrefuse($name)
+    }
+
+    method references {} {
+	return [array names myrefuse]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Public methods. Bulk loading and merging.
+
+    method {deserialize =} {data {format {}}} {
+	# Default format is the regular index serialization
+	if {$format eq {}} {
+	    set format serial
+	}
+
+	if {$format ne "serial"} {
+	    set data [$self Import $format $data]
+	    # doctools::idx::structure verify-as-canonical $data
+	    # ImportSerial verifies.
+	}
+
+	$self ImportSerial $data
+	return
+    }
+
+    method {deserialize +=} {data {format {}}} {
+	# Default format is the regular index serialization
+	if {$format eq {}} {
+	    set format serial
+	}
+
+	if {$format ne "serial"} {
+	    set data [$self Import $format $data]
+	    # doctools::idx::structure verify-as-canonical $data
+	    # merge or ImportSerial verify the structure.
+	}
+
+	set data [doctools::idx::structure merge [$self serialize] $data]
+	# doctools::idx::structure verify-as-canonical $data
+	# ImportSerial verifies.
+
+	$self ImportSerial $data
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method serialize {{format {}}} {
+	# Default format is the regular index serialization
+	if {$format eq {}} {
+	    set format serial
+	}
+
+	# First check the cache for a remebered representation of the
+	# index for the chosen format, and return it, if such is
+	# known.
+
+	if {[info exists myidx($format)]} {
+	    return $myidx($format)
+	}
+
+	# If there is no cached representation we have to generate it
+	# from it from our internal representation.
+
+	if {$format eq "serial"} {
+	    return [$self GenerateSerial]
+	} else {
+	    return [$self Generate $format]
+	}
+
+	return -code error "Internal error, reached unreachable location"
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal methods
+
+    method GenerateSerial {} {
+	# We can generate the list serialization easily from the
+	# internal representation.
+
+	# Scan and reorder ...
+	set keywords {}
+	foreach kw [lsort -dict [array names mykey]] {
+	    # Sort the references in a keyword by their _labels_.
+	    set tmp {}
+	    foreach rid $mykey($kw) { lappend tmp [list $rid [lindex $myref($rid) 1]] }
+	    set refs {}
+	    foreach item [lsort -dict -index 1 $tmp] {
+		lappend refs [lindex $item 0]
+	    }
+	    lappend keywords $kw $refs
+	}
+
+	set references {}
+	foreach rid [lsort -dict [array names myrefuse]] {
+	    lappend references $rid $myref($rid)
+	}
+
+	# Construct result
+	set serial [list doctools::idx \
+			[list \
+			     label      $mylabel \
+			     keywords   $keywords \
+			     references $references \
+			     title      $mytitle]]
+
+	# This is just present to assert that the code above creates
+	# correct serializations.
+	doctools::idx::structure verify-as-canonical $serial
+
+	set myidx(serial) $serial
+	return $serial
+    }
+
+    method Generate {format} {
+	if {$myexporter eq {}} {
+	    return -code error "Unable to export from \"$format\", no exporter configured"
+	}
+	set res [$myexporter export object $self $format]
+	set myidx($format) $res
+	return $res
+    }
+
+    method ImportSerial {serial} {
+	doctools::idx::structure verify $serial iscanonical
+
+	array unset myidx    *
+	array unset mykey    *
+	array unset myrefuse *
+	array unset myref    *
+	array unset mylink   *
+
+	# Unpack the serialization.
+	array set idx $serial
+	array set idx $idx(doctools::idx)
+	unset     idx(doctools::idx)
+
+	# We are setting the relevant variables directly instead of
+	# going through the accessor methods.
+	# I. Label and title
+	# II. Keys and references
+	# III. Back index references -> keys.
+
+	set mytitle $idx(title)
+	set mylabel $idx(label)
+
+	array set mykey $idx(keywords)
+	array set myref $idx(references)
+
+	foreach k [array names mykey] {
+	    foreach r $mykey($k) {
+		lappend myrefuse($r) $k
+		set mylink([list $r $k]) .
+	    }
+	}
+
+	# Extend cache (only if canonical, as we return only canonical
+	# data).
+	if {$iscanonical} {
+	    set myidx(serial) $serial
+	}
+	return
+    }
+
+    method Import {format data} {
+	if {$myimporter eq {}} {
+	    return -code error "Unable to import from \"$format\", no importer configured"
+	}
+
+	return [$myimporter import text $data $format]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+
+    # References to export/import managers extending the
+    # (de)serialization abilities of the index.
+    variable myexporter {}
+    variable myimporter {}
+
+    # Internal representation of the index.
+
+    variable mytitle           {} ; # 
+    variable mylabel           {} ; # 
+    variable mykey      -array {} ; # key -> list of references
+    variable myref      -array {} ; # reference -> (type, label)
+    variable myrefuse   -array {} ; # reference -> list of keys using the reference
+    variable mylink     -array {} ; # reference x key -> exists if the reference is used by key.
+
+    # Array serving as cache holding alternative representations of
+    # the index generated via 'serialize', i.e. data export.
+
+    variable myidx -array {}
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::idx 2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export.tcl
new file mode 100644
index 00000000..5b43d24e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export.tcl
@@ -0,0 +1,123 @@
+# export.tcl --
+#
+#	Exporting indices into other formats.
+#
+# Copyright (c) 2009-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# Each object manages a set of plugins for the conversion of keyword
+# indices into some textual representation. I.e. this object manages
+# the conversion to specialized serializations of keyword indices.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+package require struct::map
+package require doctools::idx::structure
+package require pluginmgr
+package require snit
+
+# ### ### ### ######### ######### #########
+## API
+
+snit::type ::doctools::idx::export {
+
+    # ### ### ### ######### ######### #########
+    ## Options :: None
+
+    # ### ### ### ######### ######### #########
+    ## Creation, destruction.
+
+    constructor {} {
+	install myconfig using ::struct::map ${selfns}::config
+	return
+    }
+
+    destructor {
+	$myconfig destroy
+	# Clear the cache of loaded export plugins.
+	foreach k [array names myplugin] {
+	    $myplugin($k) destroy
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Convert from the Tcl index serialization to other formats.
+
+    method {export object} {obj {format {}}} {
+	return [$self export serial [$obj serialize] $format]
+    }
+
+    method {export serial} {serial {format {}}} {
+	doctools::idx::structure verify $serial iscanonical
+
+	set plugin [$self GetPlugin $format]
+
+	# We have a plugin, now feed it.
+
+	if {!$iscanonical} {
+	    set serial [doctools::idx::structure canonicalize $serial]
+	}
+
+	set     configuration [$myconfig get]
+	lappend configuration user   $::tcl_platform(user)
+	lappend configuration format [$plugin plugin]
+
+	return [$plugin do export $serial $configuration]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal methods
+
+    method GetPlugin {format} {
+	if {$format eq {}} { set format docidx }
+
+	if {![info exists myplugin($format)]} {
+	    set plugin [pluginmgr ${selfns}::fmt-$format \
+			       -pattern doctools::idx::export::* \
+			       -api { export } \
+			       -setup [mymethod PluginSetup]]
+	    ::pluginmgr::paths $plugin doctools::idx::export
+	    $plugin load $format
+	    set myplugin($format) $plugin
+	} else {
+	    set plugin $myplugin($format)
+	}
+
+	return $plugin
+    }
+
+    method PluginSetup {mgr ip} {
+	# Inject a pseudo package into the plugin interpreter the
+	# formatters can use to check that they were loaded into a
+	# proper environment.
+	$ip eval {package provide doctools::idx::export::plugin 1}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+
+    # Array serving as a cache for the various plugin managers holding
+    # a specific export plugin.
+
+    variable myplugin -array {}
+
+    # A component managing the configuration given to the export
+    # plugins when they are invoked.
+
+    component myconfig -public config
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::idx::export 0.2.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_docidx.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_docidx.tcl
new file mode 100644
index 00000000..4d48254f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_docidx.tcl
@@ -0,0 +1,210 @@
+# docidx.tcl --
+#
+#	The docidx export plugin. Generation of docidx markup.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: export_docidx.tcl,v 1.3 2009/08/07 18:53:11 andreas_kupries Exp $
+
+# This package is a plugin for the doctools::idx v2 system.  It takes
+# the list serialization of a keyword index and produces text in
+# docidx format.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::idx::export::plugin
+
+package require Tcl 8.4
+package require doctools::idx::export::plugin ; # Presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require doctools::idx::structure      ; # Verification that
+						# the input is proper.
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc export {serial configuration} {
+
+    # Phase I. Check that we got a canonical index serialization. That
+    #          makes the unpacking easier, as we can mix it with the
+    #          generation of the output, knowing that everything is
+    #          already sorted as it should be.
+
+    ::doctools::idx::structure verify-as-canonical $serial
+
+    # ### ### ### ######### ######### #########
+    # Configuration ...
+    # * Standard entries
+    #   - user   = person running the application doing the formatting
+    #   - format = name of this format
+    #   - file   = name of the file the index came from. Optional.
+    #   - map    = maps symbolic references to actual file path. Optional.
+    # * docidx specific entries
+    #   - newlines = boolean. tags separated by eol markers
+    #   - indented = boolean. tags indented per the index structure.
+    #   - aligned  = boolean. reference information tabular aligned within keys.
+    #
+    # Notes
+    # * This format ignores 'map' even if set, as the written docidx
+    #   contains the symbolic references and only them.
+    # * aligned  => newlines
+    # * indented => newlines
+
+    # Combinations of the format specific entries
+    # N I A |
+    # - - - + ---------------------
+    # 0 0 0 | Ultracompact (no whitespace, single line)
+    # 1 0 0 | Compact (no whitespace, multiple lines)
+    # 1 1 0 | Indented
+    # 1 0 1 | Tabular aligned references
+    # 1 1 1 | Indented + Tabular aligned references
+    # - - - + ---------------------
+    # 0 1 0 | Not possible, per the implications above.
+    # 0 0 1 | ditto
+    # 0 1 1 | ditto
+    # - - - + ---------------------
+
+    # Import the configuration and initialize the internal state
+    array set config {
+	newlines 0
+	aligned  0
+	indented 0
+    }
+    array set config $configuration
+    array set types {
+	manpage {manpage}
+	url     {url    }
+    }
+
+    # Force the implications mentioned in the notes above.
+    if {
+	$config(aligned) ||
+	$config(indented)
+    } {
+	set config(newlines) 1
+    }
+
+    # ### ### ### ######### ######### #########
+
+    # Phase II. Generate the output, taking the configuration into
+    #           account.
+
+    TagsBegin
+
+    # First some comments about the provenance of the output.
+    Tag+ comment [list "Generated @ [clock format [clock seconds]]"]
+    Tag+ comment [list "By          $config(user)"]
+    if {[info exists config(file)] && ($config(file) ne {})} {
+	Tag+ comment [list "From file   $config(file)"]
+    }
+
+    # Unpack the serialization.
+    array set idx $serial
+    array set idx $idx(doctools::idx)
+    unset     idx(doctools::idx)
+    array set r $idx(references)
+
+    # Now open the markup
+
+    Tag+ index_begin [list $idx(label) $idx(title)]
+
+    # Iterate over the keys and their references
+    foreach {keyword references} $idx(keywords) {
+	# Print the key
+	if {$config(indented)} {TagPrefix {    }}
+	Tag+ key [list $keyword]
+
+	# Print the references in the key
+	if {$config(aligned)} { Align $references max }
+	if {$config(indented)} {TagPrefix {        }}
+
+	# Iterate over the references
+	foreach id $references {
+	    foreach {type label} $r($id) break
+	    if {$config(aligned)} { 
+		set id [FmtR max $id]
+		set type $types($type)
+	    } else {
+		set id [list $id]
+	    }
+	    Tag+ $type $id [list $label]
+	}
+    }
+
+    # Close the index
+    TagPrefix {}
+    Tag+ index_end
+
+    # Last formatting, joining the commands together.
+    set sep [expr {$config(newlines) ? "\n" : ""}]
+    return [join $lines $sep]
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+
+proc TagPrefix {str} {
+    upvar 1 prefix prefix
+    set    prefix $str
+    return
+}
+
+proc TagsBegin {} {
+    upvar 1 prefix prefix lines lines
+    set prefix {}
+    set lines  {}
+    return
+}
+
+proc Tag {n args} {
+    upvar 1 prefix prefix
+    set    cmd $prefix
+    append cmd \[$n
+    if {[llength $args]} { append cmd " [join $args]" }
+    append  cmd \]
+    return $cmd
+}
+
+proc Tag+ {n args} {
+    upvar 1 prefix prefix lines lines
+    lappend lines [eval [linsert $args 0 Tag $n]]
+    return
+}
+
+proc Align {references mv} {
+    upvar 1 $mv max r r
+    # Generate a list of references sortable by name, and also find the
+    # max length of all relevant names.
+    set max 0
+    foreach id $references {
+	Max max [list $id]
+    }
+    return
+}
+
+proc Max {v str} {
+    upvar 1 $v max
+    set x [string length $str]
+    if {$x <= $max} return
+    set max $x
+    return
+}
+
+proc FmtR {v str} {
+    upvar 1 $v max
+    return [list $str][string repeat { } [expr {$max - [string length [list $str]]}]]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide doctools::idx::export::docidx 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_html.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_html.tcl
new file mode 100644
index 00000000..37e8f19f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_html.tcl
@@ -0,0 +1,421 @@
+# text.tcl --
+#
+#	The HTML export plugin. Generation of HTML markup.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: export_html.tcl,v 1.3 2009/08/07 18:53:11 andreas_kupries Exp $
+
+# This package is a plugin for the doctools::idx v2 system.  It takes
+# the list serialization of a keyword index and produces text in HTML
+# format.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::idx::export::plugin
+
+package require Tcl 8.4
+package require doctools::idx::export::plugin ; # Presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require doctools::idx::structure ; # Verification that the
+					   # input is proper.
+package require doctools::html
+package require doctools::html::cssdefaults
+
+doctools::html::import ;# -> ::html::*
+
+# ### ### ### ######### ######### #########
+## API. 
+
+proc export {serial configuration} {
+
+    # Phase I. Check that we got a canonical index serialization. That
+    #          makes the unpacking easier, as we can mix it with the
+    #          generation of the output, knowing that everything is
+    #          already sorted as it should be.
+
+    ::doctools::idx::structure verify-as-canonical $serial
+
+    # ### ### ### ######### ######### #########
+    # Configuration ...
+    # * Standard entries
+    #   - user   = person running the application doing the formatting
+    #   - format = name of this format
+    #   - file   = name of the file the index came from. Optional.
+    #   - map    = maps symbolic references to actual file path. Optional.
+
+    # * HTML specific entries
+    #   - newlines = boolean. tags separated by eol markers
+    #   - indented = boolean. tags indented per their nesting structure.
+    #   //layout   = string in { list, table }.
+    #
+    #   - meta   = HTML fragment for use within the document <meta> section.
+    #   - header = HTML fragment used immediately after <body>
+    #   - footer = HTML fragment used immediately before </body>
+    #
+    #   - kwid   = dictionary mapping keywords to link anchor names.
+    #     <=> KeyWord IDentifier
+    # 
+    # Notes
+    # * indented => newlines
+
+    # Import the configuration and initialize the internal state
+    #// layout    list
+    array set config {
+	newlines  0
+	indented  0
+	meta      {}
+	header    {}
+	footer    {}
+	kwid      {}
+	map       {}
+	sepline   ------------------------------------------------------------
+	kwidth         35
+	dot            {&#183;}
+	class.main     doctools
+	class.header   idx-header
+	class.title    idx-title
+	class.navsep   idx-navsep
+	class.navbar   idx-kwnav
+	class.contents idx-contents
+	class.leader   idx-leader
+	class.row0     idx-even
+	class.row1     idx-odd
+	class.keyword  idx-keyword
+	class.refs     idx-refs
+	class.footer   idx-footer
+    }
+    array set config $configuration
+    array set map    $config(map)
+    array set kwid   $config(kwid)
+
+    if {($config(kwidth) < 1) || ($config(kwidth) > 99)} {
+	set config(kwidth) 35
+    }
+    set config(rwidth) [expr {100 - $config(kwidth)}]
+
+
+    # Force the implications mentioned in the notes above.
+    if {$config(indented)} {
+	set config(newlines) 1
+    }
+
+    # Allow structuring comments iff structure is present.
+    set config(comments) [expr {$config(indented) || $config(newlines)}]
+
+    array set anchor {}
+    set dot {&#183;}
+
+    # ### ### ### ######### ######### #########
+
+    # Phase II. Generate the output, taking the configuration into
+    #           account.
+
+    # Unpack the serialization.
+    array set idx $serial
+    array set idx $idx(doctools::idx)
+    unset     idx(doctools::idx)
+    array set r $idx(references)
+    array set k $idx(keywords)
+
+    html::begin
+    # Configure the layouting
+    if {!$config(indented)} { html::indenting 0 }
+    if {!$config(newlines)} { html::newlines  0 }
+
+    html::tag* html {
+	html::newline ; html::indented 4 {
+	    Header
+	    Provenance
+	    Body
+	}
+    }
+
+    return [html::done]
+}
+
+# ### ### ### ######### ######### #########
+
+proc Header {} {
+    upvar 1 config config idx idx
+    html::tag* head {
+	html::newline ; html::indented 4 {
+	    html::tag= title [Title] ; html::newline
+	    if {![Extend meta]} {
+		html::tag* style {
+		    DefaultStyle
+		} ; html::newline
+	    }
+	}
+    } ; html::newline
+    return
+}
+
+proc Provenance {} {
+    upvar 1 config config
+    if {!$config(comments)} return
+    html::comment [html::collect {
+	html::indented 4 {
+	    html::+  "Generated @ [clock format [clock seconds]]" ; html::newline
+	    html::+  "By          $config(user)"                  ; html::newline
+	    if {[info exists config(file)] && ($config(file) ne {})} {
+		html::+ "From file   $config(file)" ; html::newline
+	    }
+	}
+    }] ; html::newline
+    return
+}
+
+proc Body {} {
+    upvar 1 config config idx idx dot dot anchor anchor kwid kwid k k r r
+    html::tag* body {
+	html::newline ; html::indented 4 {
+	    html::tag* div class $config(class.main) {
+		html::newline ; html::indented 4 {
+		    html::tag* div class $config(class.header) {
+			html::newline ; html::indented 4 {
+			    BodyTitle
+			    UserHeader
+			    html::tag1 hr class $config(class.navsep) ; html::newline
+			    NavigationBar
+			}
+		    } ;	html::newline
+		    Keywords
+		    html::tag* div class $config(class.footer) {
+			html::newline ; html::indented 4 {
+			    html::tag1 hr class $config(class.navsep) ; html::newline
+			    UserFooter
+			}
+		    } ; html::newline
+		}
+	    } ; html::newline
+	}
+    } ; html::newline
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc BodyTitle {} {
+    upvar 1 idx idx config config
+    html::tag= h1 class $config(class.title) [Title] ; html::newline
+    return
+}
+
+proc UserHeader {} {
+    upvar 1 config config
+    Extend header
+    html::newline
+    return
+}
+
+proc UserFooter {} {
+    upvar 1 config config
+    Extend footer
+    html::newline
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc Title {} {
+    upvar 1 idx(label) label idx(title) title
+    if {($label ne {}) && ($title ne {})} {
+	return "$label -- $title"
+    } elseif {$label ne {}} {
+	return $label
+    } elseif {$title ne {}} {
+	return $title
+    }
+    return -code error {Reached the unreachable}
+}
+
+proc DefaultStyle {} {
+    html::comment \n[doctools::html::cssdefaults::contents]
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc NavigationBar {} {
+    upvar 1 config config idx idx anchor anchor kwid kwid char char
+
+    # No navigation bar for an empty index.
+
+    if {![llength $idx(keywords)]} return
+
+    # Name each keyword, if that was not done already. And sort them
+    # into bins based on their first character (always taken as upper
+    # case, i.e. X and x are the same).
+
+    foreach {keyword references} $idx(keywords) {
+	if {![info exists kwid($keyword)]} {
+	    set kwid($keyword) KW-$keyword
+	}
+	lappend char([string toupper [string index $keyword 0]]) $keyword
+    }
+
+    # Now name each character
+
+    set counter 0
+    foreach c [lsort -dict [array names char]] {
+	set anchor($c) KEYWORDS-$c
+	incr counter
+    }
+
+    # Now we have the information we can construct the nav bar from.
+
+    # NOTE: Should I do this as ul/ ?  Then the CSS can select the
+    # location of the navbar, its orientation, and how the elements
+    # are joined. Right ?!
+
+    Separator {Navigation Bar}
+    html::newline
+    set sep 0
+    html::tag* div class $config(class.navbar) {
+	html::newline ; html::indented 4 {
+	    foreach c [lsort -dict [array names char]] {
+		if {$sep} {
+		    html::++ " $config(dot)"
+		    if {![html::newline]} { html::++ " " }
+		}
+		html::tag= a href #$anchor($c) $c
+		set sep 1
+	    }
+	    html::newline
+	}
+    } ; html::newline
+    return
+}
+
+proc Keywords {} {
+    upvar 1 config config idx idx anchor anchor dot dot kwid kwid char char k k r r
+
+    # No content for an empty index.
+
+    if {![llength $idx(keywords)]} return
+
+    # Process the characters and associated keywords.
+
+    set rows [list $config(class.row0) $config(class.row1)]
+
+    Separator Contents
+    html::newline
+    html::tag* table class $config(class.contents) width 100% {
+	html::newline ; html::indented 4 {
+	    foreach c [lsort -dict [array names char]] {
+		Separator "($c)"
+		html::newline
+		Leader $c
+		foreach kw $char($c) {
+		    Keyword $kw
+		}
+	    }
+	    Separator
+	    html::newline
+	}
+    } ; html::newline
+    return
+}
+
+proc Leader {char} {
+    upvar 1 anchor anchor config config
+
+    html::tag* tr class $config(class.leader) {
+	html::tag* th colspan 2 {
+	    html::tag= a name $anchor($char) "Keywords: $char"
+	}
+    } ; html::newline
+    return
+}
+
+proc Keyword {kw} {
+    upvar 1 config config rows rows kwid kwid k k r r
+
+    html::tag* tr class [Row] {
+	html::newline ; html::indented 4 {
+	    html::tag* td width $config(kwidth)% class $config(class.keyword) {
+		html::tag= a name $kwid($kw) $kw
+	    } ; html::newline
+	    html::tag* td width $config(rwidth)% class $config(class.refs) {
+		if {[llength $k($kw)]} {
+		    html::newline ; html::indented 4 {
+			References $kw
+		    }
+		}
+	    } ; html::newline
+	}
+    } ; html::newline
+    return
+}
+
+proc References {kw} {
+    upvar 1 config config k k r r
+    # Iterate over the references of the key
+    set sep 0
+    foreach id $k($kw) {
+	foreach {type label} $r($id) break
+	if {$sep} {
+	    html::++ " $config(dot)"
+	    if {![html::newline]} { html::++ " " }
+	}
+	html::tag= a href [Map $type $id] $label
+	set sep 1
+    }
+    html::newline
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc Separator {{text {}}} {
+    upvar config config
+    if {!$config(comments)} return
+    set str $config(sepline)
+    if {$text ne {}} {
+	set new " $text "
+	set str [string replace $str 1 [string length $new] $new]
+    }
+    html::comment $str
+    return
+}
+
+proc Row {} {
+    upvar 1 rows rows
+    foreach {a b} $rows break
+    set rows [list $b $a]
+    return $a
+}
+
+proc Map {type id} {
+    if {$type eq "url"} { return $id }
+    upvar 1 map map
+    if {![info exists map($id)]} { return $id }
+    return $map($id)
+}
+
+proc Extend {varname} {
+    upvar 1 config config
+    if {$config($varname) eq {}} {
+	if {$config(comments)} {
+	    html::comment "Customization Point: $varname"
+	}
+	return 0
+    }
+    html::+++ $config($varname)
+    return 1
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::idx::export::html 0.2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_json.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_json.tcl
new file mode 100644
index 00000000..1c0bfb65
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_json.tcl
@@ -0,0 +1,214 @@
+# json.tcl --
+#
+#	The JSON export plugin. Generation of Java Script Object Notation.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: export_json.tcl,v 1.2 2009/08/07 18:53:11 andreas_kupries Exp $
+
+# This package is a plugin for the doctools::idx v2 system.  It takes
+# the list serialization of a keyword index and produces text in JSON
+# format.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::idx::export::plugin
+
+package require Tcl 8.4
+package require doctools::idx::export::plugin ; # Presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require doctools::idx::structure      ; # Verification that
+						# the input is proper.
+package require textutil::adjust
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc export {serial configuration} {
+
+    # Phase I. Check that we got a canonical index serialization. That
+    #          makes the unpacking easier, as we can mix it with the
+    #          generation of the output, knowing that everything is
+    #          already sorted as it should be.
+
+    ::doctools::idx::structure verify-as-canonical $serial
+
+    # ### ### ### ######### ######### #########
+    # Configuration ...
+    # * Standard entries
+    #   - user   = person running the application doing the formatting
+    #   - format = name of this format
+    #   - file   = name of the file the index came from. Optional.
+    #   - map    = maps symbolic references to actual file path. Optional.
+    # * json/format specific entries
+    #   - indented = boolean. objects indented per the index structure.
+    #   - aligned  = boolean. object keys tabular aligned vertically.
+    #
+    # Notes
+    # * This format ignores 'map' even if set, as the written json
+    #   contains the symbolic references and only them.
+    # * aligned  => indented
+
+    # Combinations of the format specific entries
+    # N I A |
+    # - - - + ---------------------
+    # 0 0 0 | Ultracompact (no whitespace, single line)
+    # 1 0 0 | Compact (no whitespace, multiple lines)
+    # 1 1 0 | Indented
+    # 1 0 1 | Tabular aligned references
+    # 1 1 1 | Indented + Tabular aligned references
+    # - - - + ---------------------
+    # 0 1 0 | Not possible, per the implications above.
+    # 0 0 1 | ditto
+    # 0 1 1 | ditto
+    # - - - + ---------------------
+
+    # Import the configuration and initialize the internal state
+    array set config {
+	indented 0
+	aligned  0
+    }
+    array set config $configuration
+
+    # Force the implications mentioned in the notes above.
+    if {$config(aligned)} {
+	set config(indented) 1
+    }
+
+    # ### ### ### ######### ######### #########
+
+    # Phase II. Generate the output, taking the configuration into
+    #           account. We construct this from the inside out.
+
+    # Unpack the serialization.
+    array set idx $serial
+    array set idx $idx(doctools::idx)
+    unset     idx(doctools::idx)
+
+    set keywords {}
+    foreach {kw references} $idx(keywords) {
+	set tmp {}
+	foreach id $references { lappend tmp [JsonString $id] }
+	lappend keywords $kw [JsonArrayList $tmp]
+    }
+
+    if {$config(aligned)} { set max 9 }
+
+    set references {}
+    foreach {id decl} $idx(references) {
+	foreach {type label} $decl break
+	set type  [JsonString $type]
+	set label [JsonString $label]
+	if {$config(aligned)} {
+	    set type [FmtR max $type]
+	}
+	lappend references $id [JsonArray $type $label]
+    }
+
+    return [JsonObject doctools::idx \
+		[JsonObject \
+		     label      [JsonString $idx(label)] \
+		     keywords   [JsonObjectDict $keywords] \
+		     references [JsonObjectDict $references] \
+		     title      [JsonString $idx(title)]]]
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+
+proc JsonQuotes {} {
+    return [list "\"" "\\\"" / \\/ \\ \\\\ \b \\b \f \\f \n \\n \r \\r \t \\t]
+}
+
+proc JsonString {s} {
+    return "\"[string map [JsonQuotes] $s]\""
+}
+
+proc JsonArray {args} {
+    upvar 1 config config
+    return [JsonArrayList $args]
+}
+
+proc JsonArrayList {list} {
+    # compact form.
+    return "\[[join $list ,]\]"
+}
+
+proc JsonObject {args} {
+    upvar 1 config config
+    return [JsonObjectDict $args]
+}
+
+proc JsonObjectDict {dict} {
+    # The dict maps string keys to json-formatted data. I.e. we have
+    # to quote the keys, but not the values, as the latter are already
+    # in the proper format.
+    upvar 1 config config
+
+    set tmp {}
+    foreach {k v} $dict { lappend tmp [JsonString $k] $v }
+    set dict $tmp
+
+    if {$config(aligned)} { Align $dict max }
+
+    if {$config(indented)} {
+	set content {}
+	foreach {k v} $dict {
+	    if {$config(aligned)} { set k [FmtR max $k] }
+	    if {[string match *\n* $v]} {
+		# multi-line value
+		lappend content "    $k : [textutil::adjust::indent $v {    } 1]"
+	    } else {
+		# single line value.
+		lappend content "    $k : $v"
+	    }
+	}
+	if {[llength $content]} {
+	    return "\{\n[join $content ,\n]\n\}"
+	} else {
+	    return "\{\}"
+	}
+    } else {
+	# ultra compact form.
+	set tmp {}
+	foreach {k v} $dict { lappend tmp "$k:$v" }
+	return "\{[join $tmp ,]\}"
+    }
+}
+
+proc Align {dict mv} {
+    upvar 1 $mv max
+    # Generate a list of references sortable by name, and also find the
+    # max length of all relevant names.
+    set max 0
+    foreach {str _} $dict { Max max $str }
+    return
+}
+
+proc Max {v str} {
+    upvar 1 $v max
+    set x [string length $str]
+    if {$x <= $max} return
+    set max $x
+    return
+}
+
+proc FmtR {v str} {
+    upvar 1 $v max
+    return $str[string repeat { } [expr {$max - [string length $str]}]]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::idx::export::json 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_nroff.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_nroff.tcl
new file mode 100644
index 00000000..8ee559ab
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_nroff.tcl
@@ -0,0 +1,213 @@
+# text.tcl --
+#
+#	The NROFF export plugin. Generation of man.macros based nroff markup.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: export_nroff.tcl,v 1.4 2009/08/07 18:53:11 andreas_kupries Exp $
+
+# This package is a plugin for the doctools::idx v2 system.  It takes
+# the list serialization of a keyword index and produces text in nroff
+# format, man.macros based.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::idx::export::plugin
+
+package require Tcl 8.4
+package require doctools::idx::export::plugin ; # Presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require doctools::idx::structure    ; # Verification that the
+					      # input is proper.
+package require doctools::text              ; # Text assembly package
+package require doctools::nroff::man_macros ; # Macro definitions for result.
+
+doctools::text::import ;# -> ::text::*
+
+# ### ### ### ######### ######### #########
+## API. 
+
+proc export {serial configuration} {
+
+    # Phase I. Check that we got a canonical index serialization. That
+    #          makes the unpacking easier, as we can mix it with the
+    #          generation of the output, knowing that everything is
+    #          already sorted as it should be.
+
+    ::doctools::idx::structure verify-as-canonical $serial
+
+    # ### ### ### ######### ######### #########
+    # Configuration ...
+    # * Standard entries
+    #   - user   = person running the application doing the formatting
+    #   - format = name of this format
+    #   - file   = name of the file the index came from. Optional.
+    #   - map    = maps symbolic references to actual file path. Ignored
+    #
+    # Specific
+    #   - inline = boolean. if set (default) man.macros is inlined in
+    #              the output. other a .so reference to the file is
+    #              generated.
+
+    # Import the configuration and initialize the internal state
+
+    array set config {
+	inline 1
+    }
+    array set config $configuration
+
+    # ### ### ### ######### ######### #########
+
+    # Phase II. Generate the output, taking the configuration into
+    #           account.
+
+    # Unpack the serialization.
+    array set idx $serial
+    array set idx $idx(doctools::idx)
+    unset     idx(doctools::idx)
+    array set r $idx(references)
+
+    text::begin
+    text::indenting 0 ; # Just in case someone tries to.
+
+    Provenance
+    if {$config(inline)} {
+	text::newline?
+	text::+ [doctools::nroff::man_macros::contents]
+    } else {
+	.so man.macros
+    }
+    .TH $idx(label)
+    .SH index
+    if {$idx(title) ne {}} {
+	text::+ $idx(title)
+    }
+    .RS
+
+    # Iterate over the keys and their references
+    foreach {keyword references} $idx(keywords) {
+	# Print the key
+	text::+ $keyword
+	text::newline
+	# Iterate over the references
+	.RS
+	foreach id $references {
+	    foreach {type label} $r($id) break
+	    .TP [BOLD $id]
+	    text::newline
+	    text::+ $label
+	    text::newline
+	}
+	.RE
+	if {[llength $references]} {
+	    .PP
+	}
+    }
+
+    return [text::done]
+}
+
+# ### ### ### ######### ######### #########
+
+proc Provenance {} {
+    upvar 1 config config
+    COMMENT  "Generated @ [clock format [clock seconds]]"
+    COMMENT  "By          $config(user)"
+    if {[info exists config(file)] && ($config(file) ne {})} {
+	COMMENT "From file   $config(file)"
+    }
+    return
+}
+
+proc .so {file} {
+    text::newline?
+    text::+ ".so $file"
+    text::newline
+    return
+}
+
+proc .TP {text} {
+    text::newline?
+    text::+ .TP
+    text::newline
+    text::+ $text
+    return
+}
+
+proc COMMENT {text} {
+    set pfx "'\\\" " ;#
+    text::newline?
+
+    foreach line [split $text \n] {
+	text::+ $pfx
+	text::+ $line
+	text::newline
+    }
+    #text::+ $pfx[join [split $text \n] \n$pfx]
+    return
+}
+
+proc BOLD {text} {
+    return \\fB$text\\fR
+}
+
+proc .RS {} {
+    text::newline?
+    text::+ .RS
+    text::newline
+    return
+}
+
+proc .RE {} {
+    text::newline?
+    text::+ .RE
+    text::newline
+    return
+}
+
+proc .PP {} {
+    text::newline?
+    text::+ .PP
+    text::newline
+    return
+}
+
+proc .SH {name} {
+    text::newline?
+    text::+ ".SH "
+    set hasspaces [regexp {[ 	]} $name]
+    set name [string toupper $name]
+
+    if {$hasspaces} { text::+ \" }
+    text::+ $name
+    if {$hasspaces} { text::+ \" }
+    text::newline
+    return
+}
+
+proc .TH {name} {
+    text::newline?
+    text::+ ".TH "
+    set hasspaces [regexp {[ 	]} $name]
+    set name [string toupper $name]
+
+    if {$hasspaces} { text::+ \" }
+    text::+ $name
+    if {$hasspaces} { text::+ \" }
+    text::newline
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::idx::export::nroff 0.3
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_text.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_text.tcl
new file mode 100644
index 00000000..4880f952
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_text.tcl
@@ -0,0 +1,136 @@
+# text.tcl --
+#
+#	The text export plugin. Generation of plain text (ReST -
+#	re-structured text).
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: export_text.tcl,v 1.3 2009/08/07 18:53:11 andreas_kupries Exp $
+
+# This package is a plugin for the the doctools::idx v2 system.  It
+# takes the list serialization of a keyword index and produces text in
+# text format.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::idx::export::plugin
+
+package require Tcl 8.4
+package require doctools::idx::export::plugin ; # Presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require doctools::idx::structure ; # Verification that the
+					   # input is proper.
+package require doctools::text           ; # Text assembly package
+
+doctools::text::import ;# -> ::text::*
+
+# ### ### ### ######### ######### #########
+## API. 
+
+proc export {serial configuration} {
+
+    # Phase I. Check that we got a canonical index serialization. That
+    #          makes the unpacking easier, as we can mix it with the
+    #          generation of the output, knowing that everything is
+    #          already sorted as it should be.
+
+    ::doctools::idx::structure verify-as-canonical $serial
+
+    # ### ### ### ######### ######### #########
+    # Configuration ...
+    # * Standard entries
+    #   - user   = person running the application doing the formatting
+    #   - format = name of this format
+    #   - file   = name of the file the index came from. Optional.
+    #   - map    = maps symbolic references to actual file path. Optional.
+
+    # //possible parameters to influence the output.
+    # //* symbolic mapping off/on
+
+    # Import the configuration and initialize the internal state
+
+    array set config $configuration
+    array set map    {}
+    if {[info exists config(map)]} {
+	array set map $config(map)
+    }
+
+    # ### ### ### ######### ######### #########
+
+    # Phase II. Generate the output, taking the configuration into
+    #           account.
+
+    # Unpack the serialization.
+    array set idx $serial
+    array set idx $idx(doctools::idx)
+    unset     idx(doctools::idx)
+    array set r $idx(references)
+
+    text::begin
+    text::+ [Header]
+    text::underline =
+
+    # Iterate over the keys and their references
+    foreach {keyword references} $idx(keywords) {
+	# Print the key
+	text::newline
+	text::+ $keyword
+	text::underline -
+
+	# Print the references in the key
+	set tmp {}
+	foreach id $references { lappend tmp [lindex $r($id) end] }
+	text::field lwidth $tmp
+	unset tmp
+
+	# Iterate over the references
+	foreach id $references {
+	    foreach {type label} $r($id) break
+	    text::indented 4 {
+		# maybe special field/tabulation commands.
+		text::+ [text::left lwidth $label]
+		text::+ { }
+		text::+ ([Map $type $id])
+		text::newline
+	    }
+	}
+    }
+
+    # Return final assembled text
+    return [text::done]
+}
+
+# ### ### ### ######### ######### #########
+
+proc Header {} {
+    upvar 1 idx(label) label idx(title) title
+    if {($label ne {}) && ($title ne {})} {
+	return "$label -- $title"
+    } elseif {$label ne {}} {
+	return $label
+    } elseif {$title ne {}} {
+	return $title
+    }
+    return -code error {Reached the unreachable}
+}
+
+proc Map {type id} {
+    if {$type eq "url"} { return $id }
+    upvar 1 map map
+    if {![info exists map($id)]} { return $id }
+    return $map($id)
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::idx::export::text 0.2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_wiki.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_wiki.tcl
new file mode 100644
index 00000000..6334edab
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/export_wiki.tcl
@@ -0,0 +1,163 @@
+# text.tcl --
+#
+#	The wiki export plugin. Generation of plain text, ready for
+#	use by the Tcler' Wiki
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: export_wiki.tcl,v 1.3 2009/08/07 18:53:11 andreas_kupries Exp $
+
+# This package is a plugin for the the doctools::idx v2 system.  It
+# takes the list serialization of a keyword index and produces text in
+# text format.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::idx::export::plugin
+
+package require Tcl 8.4
+package require doctools::idx::export::plugin ; # Presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require doctools::idx::structure ; # Verification that the
+					   # input is proper.
+package require doctools::text           ; # Text assembly package
+
+doctools::text::import ;# -> ::text
+
+# ### ### ### ######### ######### #########
+## API. 
+
+proc export {serial configuration} {
+
+    # Phase I. Check that we got a canonical index serialization. That
+    #          makes the unpacking easier, as we can mix it with the
+    #          generation of the output, knowing that everything is
+    #          already sorted as it should be.
+
+    ::doctools::idx::structure verify-as-canonical $serial
+
+    # ### ### ### ######### ######### #########
+    # Configuration ...
+    # * Standard entries
+    #   - user   = person running the application doing the formatting
+    #   - format = name of this format
+    #   - file   = name of the file the index came from. Optional.
+    #   - map    = maps symbolic references to actual file path. Optional.
+
+    # Format specific
+    #   - style  = string in { list, table }, list default.
+
+
+    # //possible parameters to influence the output.
+    # //* symbolic mapping off/on
+
+    # Import the configuration and initialize the internal state
+
+    array set config {
+	style list
+    }
+    array set config $configuration
+    array set map    {}
+    if {[info exists config(map)]} {
+	array set map $config(map)
+    }
+
+    # ### ### ### ######### ######### #########
+
+    # Phase II. Generate the output, taking the configuration into
+    #           account.
+
+    # Unpack the serialization.
+    array set idx $serial
+    array set idx $idx(doctools::idx)
+    unset     idx(doctools::idx)
+    array set r $idx(references)
+
+    # FUTURE :: Create wiki package on top of the text generator,
+    #           providing encapsulated wiki commands.
+
+    text::begin
+    text::+ "**[Header]**"
+    text::newline 2
+
+    switch -exact -- $config(style) {
+	list {
+	    text::+ <<TOC>>
+	    text::newline 2
+
+	    # Iterate over the keys and their references
+	    foreach {keyword references} $idx(keywords) {
+		text::+ "***$keyword***"
+		text::newline
+
+		text::indented 3 {
+		    # Iterate over the references
+		    foreach id $references {
+			text::+ "* [FormatReference $id]"
+			text::newline
+		    }
+		}
+		if {[llength $references]} {
+		    text::newline
+		}
+	    }
+	}
+	table {
+	    foreach {keyword references} $idx(keywords) {
+		text::+ "%|'''$keyword'''| |%"
+		text::newline
+		foreach id $references {
+		    text::+ "&| | [FormatReference $id] |&"
+		    text::newline
+		}
+	    }
+	}
+	default {
+	    return -code error "bad style \"$style\""
+	}
+    }
+
+    # Last formatting, joining the lines together.
+    return [text::done]
+}
+
+# ### ### ### ######### ######### #########
+
+proc FormatReference {id} {
+    upvar 1 r r map map
+    foreach {type label} $r($id) break
+    return "\[[Map $type $id]%|%$label\]"
+}
+
+proc Header {} {
+    upvar 1 idx(label) label idx(title) title
+    if {($label ne {}) && ($title ne {})} {
+	return "$label -- $title"
+    } elseif {$label ne {}} {
+	return $label
+    } elseif {$title ne {}} {
+	return $title
+    }
+    return -code error {Reached the unreachable}
+}
+
+proc Map {type id} {
+    if {$type eq "url"} { return $id }
+    upvar 1 map map
+    if {![info exists map($id)]} { return $id }
+    return $map($id)
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::idx::export::wiki 0.2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/import.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/import.tcl
new file mode 100644
index 00000000..3744ffc8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/import.tcl
@@ -0,0 +1,189 @@
+# import.tcl --
+#
+#	Importing indices into other formats.
+#
+# Copyright (c) 2009-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# Each object manages a set of plugins for the conversion of keyword
+# indices into some textual representation. I.e. this object manages
+# the conversion to specialized serializations of keyword indices.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+package require struct::map
+package require doctools::idx::structure
+package require fileutil::paths
+package require pluginmgr
+package require snit
+
+# ### ### ### ######### ######### #########
+## API
+
+snit::type ::doctools::idx::import {
+
+    # ### ### ### ######### ######### #########
+    ## Options :: None
+
+    # ### ### ### ######### ######### #########
+    ## Creation, destruction.
+
+    constructor {} {
+	install myconfig  using ::struct::map     ${selfns}::config
+	install myinclude using ::fileutil::paths ${selfns}::include
+	return
+    }
+
+    destructor {
+	$myconfig  destroy
+	$myinclude destroy
+	# Clear the cache of loaded import plugins.
+	foreach k [array names myplugin] {
+	    $myplugin($k) destroy
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Convert from other formats to the Tcl index serialization
+
+    method {import object text} {obj text {format {}}} {
+	$obj deserialize [$self import text $text $format]
+	return
+    }
+
+    method {import object file} {obj path {format {}}} {
+	$obj deserialize [$self import file $path $format]
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method {import text} {text {format {}}} {
+	set plugin [$self GetPlugin $format]
+
+	set     configuration [$myconfig get]
+	lappend configuration user   $::tcl_platform(user)
+	lappend configuration format [$plugin plugin]
+
+	return [$plugin do import $text $configuration]
+    }
+
+    method {import file} {path {format {}}} {
+	# The plugin is not trusted to handle the file to convert.
+	return [$self import text [fileutil::cat $path] $format]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal methods
+
+    method GetPlugin {format} {
+	if {$format eq {}} { set format docidx }
+
+	if {![info exists myplugin($format)]} {
+	    set plugin [pluginmgr ${selfns}::fmt-$format \
+			       -pattern doctools::idx::import::* \
+			       -api { import } \
+			       -setup [mymethod PluginSetup]]
+	    ::pluginmgr::paths $plugin doctools::idx::import
+	    $plugin load $format
+	    set myplugin($format) $plugin
+	} else {
+	    set plugin $myplugin($format)
+	}
+
+	return $plugin
+    }
+
+    method PluginSetup {mgr ip} {
+	# Inject a pseudo package into the plugin interpreter the
+	# import plugins can use to check that they were loaded into a
+	# proper environment.
+	$ip eval {package provide doctools::idx::import::plugin 1}
+
+	# The import plugins may use msgcat, which requires access to
+	# tcl_platform during its initialization, and won't have it by
+	# default. We trust them enough to hand out the information.
+	# TODO :: remove user/wordSize, etc. We need only 'os'.
+	$ip eval [list array set ::tcl_platform [array get ::tcl_platform]]
+
+	# Provide an alias-command a plugin can use to ask for any
+	# file, so that it can handle the processing of include files,
+	# should its format have that concept. Like docidx. The alias
+	# will be directed to a method of ours and use the configured
+	# include paths to find the file, analogous to the GetFile
+	# procedure of doctools::idx::parse.
+
+	#8.5+: ::interp alias $ip include {} {*}[mymethod IncludeFile]
+	eval [linsert [mymethod IncludeFile] 0 ::interp alias $ip include {}]
+	return
+    }
+
+    method IncludeFile {currentfile path} {
+	# result = ok text fullpath error-code error-message
+
+	# Find the file, or not.
+	set fullpath [$self Locate $path]
+	if {$fullpath eq {}} {
+	    return [list 0 {} $path notfound {}]
+	}
+
+	# Read contents, or not.
+	if {[catch {
+	    set data [fileutil::cat $fullpath]
+	} msg]} {
+	    set error notread
+	    set emessage $msg
+	    return [list 0 {} $fullpath notread $msg]
+	}
+
+	return [list 1 $data $fullpath {} {}]
+    }
+
+    method Locate {path} {
+	upvar 1 currentfile currentfile
+
+	if {$currentfile ne {}} {
+	    set pathstosearch \
+		[linsert [$myinclude paths] 0 \
+		     [file dirname [file normalize $currentfile]]]
+	} else {
+	    set pathstosearch [$myinclude paths]
+	}
+
+	foreach base $pathstosearch {
+	    set try [file join $base $path]
+	    if {![file exists $try]} continue
+	    return $try
+	}
+	# Nothing found
+	return {}
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+
+    # Array serving as a cache for the various plugin managers holding
+    # a specific import plugin.
+
+    variable myplugin -array {}
+
+    # A component managing the configuration given to the import
+    # plugins when they are invoked.
+
+    component myconfig  -public config
+    component myinclude -public include
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::idx::import 0.2.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/import_docidx.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/import_docidx.tcl
new file mode 100644
index 00000000..ffa47082
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/import_docidx.tcl
@@ -0,0 +1,91 @@
+# docidx.tcl --
+#
+#	The docidx import plugin. Bridge between import management and
+#	the parsing of docidx markup.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: import_docidx.tcl,v 1.3 2009/08/07 18:53:11 andreas_kupries Exp $
+
+# This package is a plugin for the the doctools::idx v2 system.  It
+# takes text in docidx format and produces the list serialization of a
+# keyword index.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::idx::import::plugin
+
+package require Tcl 8.4
+package require doctools::idx::import::plugin ; # The presence of this
+						# pseudo package
+						# indicates execution
+						# of this code inside
+						# of an interpreter
+						# which was properly
+						# initialized for use
+						# by import plugins.
+package require doctools::idx::parse          ; # The actual docidx
+						# parser used by the
+						# plugin.
+
+# ### ### ### ######### ######### #########
+
+## We redefine the command 'doctools::idx::parse::GetFile' to use the
+## 'include' alias provided by the plugin manager, as reguar file
+## commands are not allowed in this 'safe' environment. However this
+## is done if and only if we truly are in the plugin environment. The
+## testsuite, for example, will leave out the definition of 'include',
+## signaling in this way that the regular file operations can still be
+## used.
+
+if {[llength [info commands include]]} {
+
+    # Note: We are poking directly into the implementation of the
+    #       class. Any changes to the interface here have to reviewed
+    #       for their impact on doctools::idx::parse, and possibly
+    #       ported over.
+
+    proc ::doctools::idx::parse::GetFile {currentfile path dv pv ev mv} {
+	upvar 1 $dv data $pv fullpath $ev error $mv emessage
+	foreach {ok data fullpath error emessage} [include $currentfile $path] break
+	return $ok
+    }
+}
+
+# ### ### ### ######### ######### #########
+## API :: Convert text to canonical index serialization.
+
+proc import {text configuration} {
+    global errorInfo errorCode
+
+    doctools::idx::parse var load $configuration
+
+    # Could be done better using a try/finally
+    set code [catch {
+	doctools::idx::parse text $text
+    } serial]
+
+    # Save error state if there was any.
+    set ei $errorInfo
+    set ec $errorCode
+
+    # Cleanup parser configuration, regardless of errors or not.
+    doctools::idx::parse var unset *
+
+    # Rethrow any error, using the captured state.
+    if {$code} {
+	return -code $code -errorinfo $ei -errorcode $ec $serial
+    }
+
+    return $serial
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::idx::import::docidx 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/import_json.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/import_json.tcl
new file mode 100644
index 00000000..fffbab88
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/import_json.tcl
@@ -0,0 +1,78 @@
+# json.tcl --
+#
+#	The json import plugin. Bridge between import management and
+#	the parsing of json markup.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: import_json.tcl,v 1.4 2009/11/23 23:04:25 andreas_kupries Exp $
+
+# This package is a plugin for the the doctools::idx v2 system.  It
+# takes text in json format and produces the list serialization of a
+# keyword index.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @sak notprovided dict
+# @mdgen NODEP: doctools::idx::import::plugin
+
+package require Tcl 8.4
+package require doctools::idx::import::plugin ; # The presence of this
+						# pseudo package
+						# indicates execution
+						# of this code inside
+						# of an interpreter
+						# which was properly
+						# initialized for use
+						# by import plugins.
+package require doctools::idx::structure      ; # Verification of the json
+					        # parse result as a
+					        # proper index
+					        # serialization.
+
+if {[package vcompare [package present Tcl] 8.5] < 0} {
+    if {[catch {
+	package require dict
+    }]} {
+	# Create a pure Tcl implementation of the dict methods
+	# required by json, and fake the presence of the dict package.
+	proc dict {cmd args} { return [uplevel 1 [linsert $args 0 dict/$cmd]] }
+	proc dict/create {} { return {} }
+	proc dict/set {var key val} {
+	    upvar 1 $var a
+	    array set x $a
+	    set x($key) $val
+	    set a [array get x]
+	    return
+	}
+	package provide dict 1
+    }
+}
+
+package require json ; # The actual json parser used by the plugin.
+# Requires 8.5, or 8.4+dict.
+
+# ### ### ### ######### ######### #########
+
+# ### ### ### ######### ######### #########
+## API :: Convert text to canonical index serialization.
+
+proc import {text configuration} {
+    # Note: We cannot fail here on duplicate keys in the input,
+    # especially for keywords and references, as we do for Tcl-based
+    # canonical index serializations, because our underlying JSON
+    # parser automatically merges them, by taking only the last found
+    # definition. I.e. of two or more definitions for a key X the last
+    # overwrites all previous occurrences.
+    return [doctools::idx::structure canonicalize [json::json2dict $text]]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::idx::import::json 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/msgcat_c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/msgcat_c.tcl
new file mode 100644
index 00000000..b0f3d43b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/msgcat_c.tcl
@@ -0,0 +1,26 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+mcset c  docidx/char/syntax             {Bad character in string}
+mcset c  docidx/cmd/illegal		{Illegal command "%1$s", not a docidx command}       ; # Details: cmdname
+mcset c  docidx/cmd/nested		{Illegal use of "%1$s" as argument of other command} ; # Details: cmdname
+mcset c  docidx/cmd/toomanyargs		{Too many args for "%1$s", at most %2$d allowed}     ; # Details: cmdname, max#args
+mcset c  docidx/cmd/wrongargs		{Wrong#args for "%1$s", need at least %2$d}          ; # Details: cmdname, min#args
+mcset c  docidx/eof/syntax              {Bad <eof>}
+mcset c  docidx/include/path/notfound	{Include file "%1$s" not found}                      ; # Details: file name
+mcset c  docidx/include/read-failed	{Unable to read include file "%1$s", %2$s}           ; # Details: file name and error msg
+mcset c  docidx/include/syntax		{Errors in include file "%1$s"}
+mcset c  docidx/plaintext		{Plain text beyond whitespace is not allowed}
+mcset c  docidx/vset/varname/unknown	{Unknown variable "%1$s"}                            ; # Details: variable name
+
+mcset c  docidx/index_begin/missing	{Expected [index_begin], not found}
+mcset c  docidx/index_begin/syntax	{Unexpected [index_begin], not allowed here}
+mcset c  docidx/index_end/missing	{Expected [index_end], not found}
+mcset c  docidx/index_end/syntax	{Unexpected [index_end], not allowed here}
+mcset c  docidx/key/missing		{Expected [key], not found}
+mcset c  docidx/key/syntax		{Unexpected [key], not allowed here}
+
+mcset c  docidx/ref/redef               {Bad redefinition of reference "%1$s", first (%2$s "%3$s"), now (%4$s "%5$s")}
+
+package provide doctools::msgcat::idx::c 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/msgcat_de.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/msgcat_de.tcl
new file mode 100644
index 00000000..3148da36
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/msgcat_de.tcl
@@ -0,0 +1,26 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+mcset de docidx/char/syntax             {Unerwartetes Zeichen im String}
+mcset de docidx/cmd/illegal		{Illegaler Befehl "%1$s", ist kein docidx Befehl}                 ; # Details: cmdname
+mcset de docidx/cmd/nested		{Illegale Nutzung von "%1$s" als Argument eines anderen Befehles} ; # Details: cmdname
+mcset de docidx/cmd/toomanyargs		{Zu viele Argumente fuer "%1$s", hoechstens %2$d moeglich}        ; # Details: cmdname, max#args
+mcset de docidx/cmd/wrongargs		{Zu wenig Argumente fuer "%1$s", mindestens %2$d notwendig}       ; # Details: cmdname, min#args
+mcset de docidx/eof/syntax              {Unerwartetes Ende der Datei}
+mcset de docidx/include/path/notfound	{Include-Datei "%1$s" nicht gefunden}                             ; # Details: file name
+mcset de docidx/include/read-failed	{Konnte Include-Datei "%1$s" nicht lesen: %2$s}                   ; # Details: file name and error msg
+mcset de docidx/include/syntax		{Fehler in der Include-Datei "%1$s"}
+mcset de docidx/plaintext		{Normaler Text ist (mit Ausnahme von reinem Leerraum) nicht erlaubt}
+mcset de docidx/vset/varname/unknown	{Unbekannte Variable "%1$s"}                                      ; # Details: variable name
+
+mcset de docidx/index_begin/missing	{Erwarteter Befehl [index_begin] nicht vorhanden}
+mcset de docidx/index_begin/syntax	{[index_begin] ist hier nicht erlaubt}
+mcset de docidx/index_end/missing	{Erwarteter Befehl [index_end] nicht vorhanden}
+mcset de docidx/index_end/syntax	{[index_end] ist hier nicht erlaubt}
+mcset de docidx/key/missing		{Erwarteter Befehl [key] nicht vorhanden}
+mcset de docidx/key/syntax		{[key] ist hier nicht erlaubt}
+
+mcset de docidx/ref/redef               {Fehlerhafte Verwendung der Referenz "%1$s", zuerst (%2$s "%3$s"), jetzt (%4$s "%5$s")}
+
+package provide doctools::msgcat::idx::de 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/msgcat_en.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/msgcat_en.tcl
new file mode 100644
index 00000000..97be163f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/msgcat_en.tcl
@@ -0,0 +1,26 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+mcset en docidx/char/syntax             {Bad character in string}
+mcset en docidx/cmd/illegal		{Illegal command "%1$s", not a docidx command}       ; # Details: cmdname
+mcset en docidx/cmd/nested		{Illegal use of "%1$s" as argument of other command} ; # Details: cmdname
+mcset en docidx/cmd/toomanyargs		{Too many args for "%1$s", at most %2$d allowed}     ; # Details: cmdname, max#args
+mcset en docidx/cmd/wrongargs		{Wrong#args for "%1$s", need at least %2$d}          ; # Details: cmdname, min#args
+mcset en docidx/eof/syntax              {Bad <eof>}
+mcset en docidx/include/path/notfound	{Include file "%1$s" not found}                      ; # Details: file name
+mcset en docidx/include/read-failed	{Unable to read include file "%1$s", %2$s}           ; # Details: file name and error msg
+mcset en docidx/include/syntax		{Errors in include file "%1$s"}
+mcset en docidx/plaintext		{Plain text beyond whitespace is not allowed}
+mcset en docidx/vset/varname/unknown	{Unknown variable "%1$s"}                            ; # Details: variable name
+
+mcset en docidx/index_begin/missing	{Expected [index_begin], not found}
+mcset en docidx/index_begin/syntax	{Unexpected [index_begin], not allowed here}
+mcset en docidx/index_end/missing	{Expected [index_end], not found}
+mcset en docidx/index_end/syntax	{Unexpected [index_end], not allowed here}
+mcset en docidx/key/missing		{Expected [key], not found}
+mcset en docidx/key/syntax		{Unexpected [key], not allowed here}
+
+mcset en docidx/ref/redef               {Bad redefinition of reference "%1$s", first (%2$s "%3$s"), now (%4$s "%5$s")}
+
+package provide doctools::msgcat::idx::en 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/msgcat_fr.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/msgcat_fr.tcl
new file mode 100644
index 00000000..e8a31474
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/msgcat_fr.tcl
@@ -0,0 +1,29 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+# The texts are in english because I have do not have enough knowledge
+# of french to make the translation.
+
+mcset fr docidx/char/syntax             {Bad character in string}
+mcset fr docidx/cmd/illegal		{Illegal command "%1$s", not a docidx command}       ; # Details: cmdname
+mcset fr docidx/cmd/nested		{Illegal use of "%1$s" as argument of other command} ; # Details: cmdname
+mcset fr docidx/cmd/toomanyargs		{Too many args for "%1$s", at most %2$d allowed}     ; # Details: cmdname, max#args
+mcset fr docidx/cmd/wrongargs		{Wrong#args for "%1$s", need at least %2$d}          ; # Details: cmdname, min#args
+mcset fr docidx/eof/syntax              {Bad <eof>}
+mcset fr docidx/include/path/notfound	{Include file "%1$s" not found}                      ; # Details: file name
+mcset fr docidx/include/read-failed	{Unable to read include file "%1$s", %2$s}           ; # Details: file name and error msg
+mcset fr docidx/include/syntax		{Errors in include file "%1$s"}
+mcset fr docidx/plaintext		{Plain text beyond whitespace is not allowed}
+mcset fr docidx/vset/varname/unknown	{Unknown variable "%1$s"}                            ; # Details: variable name
+
+mcset fr docidx/index_begin/missing	{Expected [index_begin], not found}
+mcset fr docidx/index_begin/syntax	{Unexpected [index_begin], not allowed here}
+mcset fr docidx/index_end/missing	{Expected [index_end], not found}
+mcset fr docidx/index_end/syntax	{Unexpected [index_end], not allowed here}
+mcset fr docidx/key/missing		{Expected [key], not found}
+mcset fr docidx/key/syntax		{Unexpected [key], not allowed here}
+
+mcset fr docidx/ref/redef               {Bad redefinition of reference "%1$s", first (%2$s "%3$s"), now (%4$s "%5$s")}
+
+package provide doctools::msgcat::idx::fr 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/parse.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/parse.tcl
new file mode 100644
index 00000000..078bb290
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/parse.tcl
@@ -0,0 +1,1043 @@
+# -*- tcl -*-
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Parser for docidx formatted input. The result is a struct::tree
+# repesenting the contents of the document in a structured form.
+
+# - root = index, attributes for title and label.
+# - children of the root = keys of the index, attribute for keyword.
+# - children of the keys = manpage and url references for the key,
+#                          attributes for reference and label.
+#
+# The order of the keywords under root, and of the references under
+# their keyword reflects the order of the information in the parsed
+# document.
+
+# Attributes in the nodes, except root provide location information,
+# i.e. referring from there in the input the information is coming from
+# (human-readable output: line/col for end of token, offset start/end
+# for range covered by token.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.4                  ; # Required runtime.
+package require doctools::idx::structure ; # Parse Tcl script, like subst.
+package require doctools::msgcat         ; # Error message L10N
+package require doctools::tcl::parse     ; # Parse Tcl script, like subst.
+package require fileutil                 ; # Easy loading of files.
+package require logger                   ; # User feedback.
+package require snit                     ; # OO system.
+package require struct::list             ; # Assign
+package require struct::tree             ; # Internal syntax tree
+
+# # ## ### ##### ######## ############# #####################
+##
+
+logger::initNamespace ::doctools::idx::parse
+snit::type            ::doctools::idx::parse {
+    # # ## ### ##### ######## #############
+    ## Public API
+
+    typemethod file {path} {
+	log::debug [list $type file]
+	return [$type text [fileutil::cat $path] $path]
+    }
+
+    typemethod text {text {path {}}} {
+	log::debug [list $type text]
+
+	set ourfile $path
+
+	array set vars [array get ourvars]
+	array set _file {}
+	ClearErrors
+
+	set t [struct::tree AST]
+
+	Process $t $text [$t rootname] vars _file
+	StopOnErrors
+
+	ReshapeTree $t
+	StopOnErrors
+
+	set serial [Serialize $t]
+	StopOnErrors
+
+	$t destroy
+	return $serial
+    }
+
+    # # ## ### ##### ######## #############
+    ## Manage symbol table (vset variables).
+
+    typemethod vars {} {
+	return [array get ourvars]
+    }
+
+    typemethod {var set} {name value} {
+	set ourvars($name) $value
+	return
+    }
+
+    typemethod {var load} {dict} {
+	array set ourvars $dict
+	return
+    }
+
+    typemethod {var unset} {args} {
+	if {![llength $args]} { lappend args * }
+	foreach pattern $args {
+	    array unset ourvars $pattern
+	}
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Manage search paths for include files.
+
+    typemethod includes {} {
+	return $ourincpaths
+    }
+
+    typemethod {include set} {paths} {
+	set ourincpaths [lsort -uniq $paths]
+	return
+    }
+
+    typemethod {include add} {path} {
+	lappend ourincpaths $path
+	set     ourincpaths [lsort -uniq $ourincpaths]
+	return
+    }
+
+    typemethod {include remove} {path} {
+	set pos [lsearch $ourincpaths $path]
+	if {$pos < 0} return
+	set  ourincpaths [lreplace $ourincpaths $pos $pos]
+	return
+    }
+
+    typemethod {include clear} {} {
+	set ourincpaths {}
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    proc Process {t text root vv fv} {
+	upvar 1 $vv vars $fv _file
+
+	DropChildren $t $root
+
+	# Phase 1. Generate the basic syntax tree
+
+	if {[catch {
+	    doctools::tcl::parse text $t $text $root
+	} msg]} {
+	    if {![string match {doctools::tcl::parse *} $::errorCode]} {
+		# Not a parse error, rethrow.
+		return \
+		    -code      error \
+		    -errorcode $::errorCode \
+		    -errorinfo $::errorInfo \
+		    $msg
+	    }
+
+	    # Parse error, low-level syntax breakdown, extract the
+	    # machine-info from the errorCode, and report internally.
+	    # See the documentation of doctools::tcl::parse for the
+	    # definition of the format.
+	    struct::list assign $::errorCode _ msg pos line col
+	    # msg in {eof, char}
+	    ReportAt $_file($root) [list $pos $pos] $line $col docidx/$msg/syntax {}
+	    return 0
+	}
+
+	#doctools::parse::tcl::ShowTreeX $t {Raw Result}
+
+	# Phase 2. Check for errors.
+
+	CheckBasicConstraints  $t $root      _file
+	ResolveVarsAndIncludes $t $root vars _file
+	return 1
+    }
+
+    proc CheckBasicConstraints {t root fv} {
+	::variable ourfile
+	upvar 1 $fv _file
+
+	# Bottom-up walk through the nodes starting at the current
+	# root.
+
+	$t walk $root -type dfs -order pre n {
+	    # Ignore the root node itself. Except for one thing: The
+	    # path information is remembered for the root as well.
+
+	    set _file($n) $ourfile
+	    #puts "_file($n) = $ourfile"
+	    if {$n eq $root} continue
+
+	    switch -exact [$t get $n type] {
+		Text {
+		    # Texts at the top level are irrelevant and
+		    # removed. They have to contain only whitespace as
+		    # well.
+		    if {[$t depth $n] == 1} {
+			if {[regexp {[^[:blank:]\n]} [$t get $n text]]} {
+			    Error $t $n docidx/plaintext
+			}
+			MarkDrop $n
+		    }
+		}
+		Word {
+		    # Word nodes we ignore. They are just argument
+		    # aggregators. They will be gone later, when
+		    # reduce arguments to their text form.
+		}
+		Command {
+		    set cmdname [$t get $n text]
+		    set parens  [$t parent $n]
+
+		    if {$parens eq $root} {
+			set parentt {}
+		    } else {
+			set parentt [$t get $parens type]
+		    }
+		    set nested 0
+
+		    if {($parentt eq "Command") || ($parentt eq "Word")} {
+			# Commands can be children/arguments of other
+			# commands only in very restricted
+			# circumstances => rb, lb, vset/1.
+			set nested 1
+			if {![Nestable $t $n $cmdname errcmdname] && [Legal $cmdname]} {
+			    # Report only legal un-nestable commands.
+			    # Illegal commands get their own report,
+			    # see below.
+			    MakeErrorMsg $t $n docidx/cmd/nested $errcmdname
+			}
+		    }
+
+		    if {![Legal $cmdname]} {
+			# Deletion is safe because we are walking
+			# bottom up. If nested we drop only the
+			# children and replace this node with a fake.
+			if {$nested} {
+			    MakeErrorMsg $t $n docidx/cmd/illegal $cmdname
+			} else {
+			    Error $t $n docidx/cmd/illegal $cmdname
+			    MarkDrop $n
+			}
+
+			continue
+		    }
+
+		    # Check arguments of the legal commands only.
+		    ArgInfo $cmdname min max
+		    set argc [llength [$t children $n]]
+
+		    if {$argc < $min} {
+			MakeErrorMsg $t $n docidx/cmd/wrongargs $cmdname $min
+		    } elseif {$argc > $max} {
+			MakeErrorMsg $t $n docidx/cmd/toomanyargs $cmdname $max
+		    }
+
+		    # Convert the quoting commands for bracket into
+		    # equivalent text nodes, and remove comments.
+		    if {$cmdname eq "lb"} {
+			MakeText $t $n "\["
+		    } elseif {$cmdname eq "rb"} {
+			MakeText $t $n "\]"
+		    } elseif {$cmdname eq "comment"} {
+			# Remove comments or replace with error node (nested).
+			if {$nested} {
+			    MakeError $t $n
+			} else {
+			    MarkDrop $n
+			}
+		    }
+		}
+	    }
+	}
+
+	# Kill the nodes marked for removal now that the walker is not
+	# accessing them any longer.
+	PerformDrop $t
+
+	#doctools::parse::tcl::ShowTreeX $t {Basic Constraints}
+	return
+    }
+
+    proc ResolveVarsAndIncludes {t root vv fv} {
+	upvar 1 $vv vars $fv _file
+
+	# Now resolve include and vset uses ... This has to be done at
+	# the same time, as each include may (re)define variables.
+
+	# Bottom-up walk. Children before parent, and from the left =>
+	# Nested vset uses are resolved in the proper order.
+
+	$t walk $root -type dfs -order post n {
+	    # Ignore the root node itself.
+	    if {$n eq $root} continue
+
+	    set ntype [$t get $n type]
+
+	    switch -exact -- $ntype {
+		Text - Error {
+		    # Ignore these nodes.
+		}
+		Word {
+		    # Children have to be fully converted to Text, or,
+		    # in case of trouble, Error. Aggregate the
+		    # information.
+		    CollapseWord $t $n
+		}
+		Command {
+		    set cmdname [$t get $n text]
+
+		    switch -exact -- $cmdname {
+			vset {
+			    set argv [$t children $n]
+			    switch -exact -- [llength $argv] {
+				1 {
+				    VariableUse $t $n [lindex $argv 0]
+				}
+				2 {
+				    struct::list assign $argv var val
+				    VariableDefine $t $n $var $val
+				}
+			    }
+			    # vset commands at the structural toplevel are
+			    # irrelevant and removed.
+			    if {[$t depth $n] == 1} {
+				MarkDrop $n
+			    }
+			}
+			include {
+			    # Pulls vars, _file from this scope
+			    ProcessInclude $t $n [lindex [$t children $n] 0]
+			}
+			default {
+			    # For all other commands move the argument
+			    # information into an attribute. Errors in
+			    # the argument cause the command to conert
+			    # into an error.
+			    CollapseArguments $t $n
+			}
+		    }
+		}
+	    }
+	}
+
+	# Kill the nodes marked for removal now that the walker is
+	# not accessing them any longer.
+	PerformDrop $t
+
+	#doctools::parse::tcl::ShowTreeX $t {Vars/Includes Resolved}
+	return
+    }
+
+    proc ReshapeTree {t} {
+	upvar 1 _file _file
+
+	# We are assuming that there are no illegal commands in the
+	# tree, and further that all of lb, rb, vset, comment, and
+	# include are gone as well, per the operation of the previous
+	# phases (-> CheckBasicConstraints, ResolveVarsAndIncludes).
+	# The only commands which can occur here are
+	#
+	#     index_begin, index_end, key, manpage, url
+
+	# Grammar:
+	#     INDEX := index_begin KEYS index_end
+	#     KEYS  := { key ITEMS }
+	#     ITEMS := { manpage | url }
+
+	# Hand coded LL(1) parser with explicit state machine. No
+	# stack required for this grammar.
+
+	set root     [$t rootname]
+	set children [$t children $root]
+	lappend children $root
+
+	$t set $root text <EOF>
+	$t set $root range {0 0}
+	$t set $root line  1
+	$t set $root col   0
+
+	set at    {}
+	set state INDEX
+
+	foreach n $children {
+	    set cmdname [$t get $n text]
+	    #puts <$n>|$cmdname|$state|
+
+	    # We store the location of the last node in the root, for
+	    # use when an unexpected eof triggers an error.
+	    if {$n ne $root} {
+		$t set $root range [$t get $n range]
+		$t set $root line  [$t get $n line]
+		$t set $root col   [$t get $n col]
+	    }
+
+	    # LL(1) parser table. State/Nexttoken determine action and
+	    # next state.
+	    switch -exact -- [list $state $cmdname] {
+		{INDEX index_begin} {
+		    # Pull arguments of the proper index_begin up into
+		    # the root. Drop the expected node.
+		    $t set $root argv [$t get $n argv]
+		    $t delete $n
+		    # Starting series of keywwords and their
+		    # references. Destination is root, not that it
+		    # matters, and we remember the state.
+		    set at    $root
+		    set state KEYS
+		}
+		{KEYS key} {
+		    # Starting series of references in a keyword.
+		    # Destination for movement is this keyword, and we
+		    # remember the state.
+		    set at    $n
+		    set state ITEMS
+		}
+		{ITEMS index_end} -
+		{KEYS index_end} {
+		    # End of the document reached, with proper closing
+		    # of keys and references. Drop the node, and jump to
+		    # the end state
+		    set state EOF
+		    $t delete $n
+		}
+		{ITEMS manpage} -
+		{ITEMS url} {
+		    # Move references to their keyword.
+		    $t move $at end $n
+		}
+		{ITEMS key} {
+		    # Move destination of references forward.
+		    set at $n
+		}
+		{EOF <EOF>} {
+		    # Good, really reached the end. Nothing to be
+		    # done.
+		}
+		{INDEX index_end} -
+		{INDEX key} -
+		{INDEX manpage} -
+		{INDEX url} -
+		{INDEX <EOF>} {
+		    Error $t $n docidx/index_begin/missing
+		    if {$n ne $root} {
+			$t delete $n
+		    }
+		}
+		{KEYS index_begin} -
+		{KEYS manpage} -
+		{KEYS url} {
+		    Error $t $n docidx/key/missing
+		    if {$n ne $root} {
+			$t delete $n
+		    }
+		}
+		{EOF index_begin} -
+		{EOF index_end} -
+		{EOF key} -
+		{EOF manpage} -
+		{EOF url} -
+		{ITEMS index_begin} {
+		    # TODO ?! Split this, and add message which command was expected.
+		    # Unexpected and wrong. The node is dropped.
+		    Error $t $n docidx/$cmdname/syntax
+		    $t delete $n
+		}
+		{KEYS <EOF>} -
+		{ITEMS <EOF>} {
+		    Error $t $n docidx/index_end/missing
+		}
+	    }
+	}
+
+	$t unset $root text
+	$t unset $root range
+	$t unset $root line
+	$t unset $root col
+
+	#doctools::parse::tcl::ShowTreeX $t Shaped/Structure
+	return
+    }
+
+    proc Serialize {t} {
+	upvar 1 _file _file
+	# We assume here that the tree is already in the correct
+	# shape/structure, i.e. of at most depth 2, a root, optionally
+	# a series of children for the keywords, and each keyword with
+	# an optional series of children for the items, i.e. manpage
+	# and url references.
+
+	# We now extract the basic information about the index from
+	# the tree, do some higher level checking on the references,
+	# and return the serialization of the index generated from the
+	# extracted data.
+
+	set error 0
+	set root [$t rootname]
+
+	# Root delivers index label and title.
+	struct::list assign [$t get $root argv] label title
+
+	array set k {}
+	array set r {}
+
+	# Each keyword in the tree
+	foreach key [$t children $root] {
+	    set kw [lindex [$t get $key argv] 0]
+	    set k($kw) {}
+
+	    # Each reference in a key.
+	    foreach item [$t children $key] {
+		struct::list assign [$t get $item argv] id rlabel
+		set rtype [$t get $item text]
+		set decl  [list $rtype $rlabel]
+
+		lappend k($kw) $id
+
+		# Checking that all uses of a reference use the same
+		# type and label.
+		if {[info exists r($id)]} {
+		    if {$r($id) ne $decl} {
+			struct::list assign $r($id) otype olabel
+			MakeErrorMsg $t $item docidx/ref/redef \
+			    $id $otype $olabel $rtype $rlabel
+			set error 1
+		    }
+		    continue
+		}
+		set r($id) $decl
+	    }
+	}
+
+	if {$error} return
+	# Caller will handle the errors.
+
+	## ### ### ### ######### ######### #########
+	## The part below is identical to the serialization backend of
+	## command 'doctools::idx::structure merge'.
+
+	# Now construct the result, from the inside out, with proper
+	# sorting at all levels.
+
+	set keywords {}
+	foreach kw [lsort -dict [array names k]] {
+	    # Sort references in a keyword by their _labels_.
+	    set tmp {}
+	    foreach rid $k($kw) { lappend tmp [list $rid [lindex $r($rid) 1]] }
+	    set refs {}
+	    foreach item [lsort -dict -index 1 $tmp] {
+		lappend refs [lindex $item 0]
+	    }
+	    lappend keywords $kw $refs
+	}
+
+	set references {}
+	foreach rid [lsort -dict [array names r]] {
+	    lappend references $rid $r($rid)
+	}
+
+	set serial [list doctools::idx \
+			[list \
+			     label      $label \
+			     keywords   $keywords \
+			     references $references \
+			     title      $title]]
+
+
+	# Caller verify, ensure contract
+	#::doctools::idx::structure verify-as-canonical $serial
+	return $serial
+    }
+
+    # # ## ### ##### ######## #############
+
+    proc CollapseArguments {t n} {
+	#puts __CA($n)
+
+	set ok 1
+	set argv {}
+	foreach ch [$t children $n] {
+	    lappend argv [$t get $ch text]
+	    if {[$t get $ch type] eq "Error"} {
+		set ok 0
+		break
+	    }
+	}
+	if {$ok} {
+	    $t set $n argv $argv
+	    DropChildren $t $n
+	} else {
+	    MakeError $t $n
+	}
+	return
+    }
+
+    proc CollapseWord {t n} {
+	#puts __CW($n)
+
+	set ok 1
+	set text {}
+	foreach ch [$t children $n] {
+	    append text [$t get $ch text]
+	    if {[$t get $ch type] eq "Error"} {
+		set ok 0
+		break
+	    }
+	}
+	if {$ok} {
+	    MakeText $t $n $text
+	} else {
+	    MakeError $t $n
+	}
+	return
+    }
+
+    proc VariableUse {t n var} {
+	upvar 1 vars vars _file _file
+
+	# vset/1 - the command returns text information to the
+	# caller. Extract the argument data.
+
+	set vartype [$t get $var type]
+	set varname [$t get $var text]
+
+	# Remove the now superfluous argument nodes.
+	DropChildren $t $n
+
+	if {$vartype eq "Error"} {
+	    # First we check if the command is in trouble because it
+	    # has a bogus argument. If so we convert it into an error
+	    # node to signal even higher commands, and ignore it. We
+	    # do not report an error, as the actual problem was
+	    # reported already.
+
+	    MakeError $t $n
+	} elseif {![info exists vars($varname)]} {
+	    # Secondly we check if the referenced variable is
+	    # known. If not it is trouble, and we report it.
+
+	    MakeErrorMsg $t $n docidx/vset/varname/unknown $varname
+	} elseif {[$t depth $n] == 1} {
+	    # Commands at the structural toplevel are irrelevant and
+	    # removed (see caller). They have to checked again however
+	    # to see if the use introduced non-whitespace where it
+	    # should not be.
+
+	    if {[regexp {[^[:blank:]\n]} $vars($varname)]} {
+		Error $t $n docidx/plaintext
+	    }
+	} else {
+	    MakeText $t $n $vars($varname)
+	}
+    }
+
+    proc VariableDefine {t n var val} {
+	upvar 1 vars vars
+
+	# vset/2 - the command links a variable to a value. Extract
+	# the argument data.
+
+	set vartype [$t get $var type]
+	set valtype [$t get $val type]
+	set varname [$t get $var text]
+	set value   [$t get $val text]
+
+	# Remove the now superfluous argument nodes.
+	DropChildren $t $n
+
+	if {($vartype eq "Error") || ($valtype eq "Error")} {
+	    # First we check if the command is in trouble because it
+	    # has one or more bogus arguments. If so we convert it
+	    # into an error node to signal even higher commands, and
+	    # ignore it. We do not report an error, as the actual
+	    # problem was reported already.
+
+	    MakeError $t $n
+	    return
+	}
+
+	# And save the change to the symbol table we are lugging
+	# around during the processing.
+
+	set vars($varname) $value
+	return
+    }
+
+    proc ProcessInclude {t n path} {
+	upvar 1 vars vars _file _file
+	::variable ourfile
+
+	# include - the command returns file content and inserts it in
+	# the place of the command.  First extract the argument data
+
+	set pathtype [$t get $path type]
+	set pathname [$t get $path text]
+
+	# Remove the now superfluous argument nodes.
+	DropChildren $t $n
+
+	# Check for problems stemming from other trouble.
+	if {$pathtype eq "Error"} {
+	    # First we check if the command is in trouble because it
+	    # has a bogus argument. If so convert it into an error
+	    # node to signal even higher commands, and ignore it. We
+	    # do not report an error, as the actual problem was
+	    # reported already.
+
+	    MakeError $t $n
+	    return
+	}
+
+	if {![GetFile $ourfile $pathname text fullpath error emsg]} {
+	    switch -exact -- $error {
+		notfound { Error $t $n docidx/include/path/notfound $pathname       }
+		notread  { Error $t $n docidx/include/read-failed   $fullpath $emsg }
+	    }
+	    MarkDrop $n
+	    return
+	}
+
+	# Parse the file. This also resolves variables further.
+
+	set currenterrors [GetErrors]
+	set currentpath $ourfile
+	ClearErrors
+
+	# WIBNI :: Remember the path as relative to the current path.
+	set ourfile $fullpath
+	if {![Process $t $text $n vars _file]} {
+
+	    set newerrors [GetErrors]
+	    SetErrors $currenterrors
+	    set ourfile $currentpath
+	    Error $t $n docidx/include/syntax $fullpath $newerrors
+	    MarkDrop $n
+	    return
+	}
+
+	if {![$t numchildren $n]} {
+	    # Inclusion did not generate additional content, we can
+	    # ignore the command completely.
+	    MarkDrop $n
+	    return
+	}
+
+	# Create marker nodes which show the file entry/exit
+	# transitions. Disabled, makes shaping tree structure too
+	# complex. And checking the syntax as well, if we wish to have
+	# only proper complete structures in an include file. Need
+	# proper LR parser for that (is not LL(1)), or maybe even
+	# something like earley-aycock for full handling of an
+	# ambigous grammar.
+	if 0 {
+	    set fstart [$t insert $n 0]
+	    set fstop  [$t insert $n end]
+
+	    $t set $fstart type Command
+	    $t set $fstop  type Command
+
+	    $t set $fstart text include_begin
+	    $t set $fstop  text include_end
+
+	    $t set $fstart path $fullpath
+	    $t set $fstop  path $fullpath
+	}
+	# Remove the include command itself, merging its children
+	# into the place it occupied in its parent.
+	$t cut $n
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    ## Note: The import plugin for docidx rewrites the 'GetFile'
+    ##       command below to make use of an alias provided by the
+    ##       plugin manager. This re-enables the ability of this class
+    ##       to handle include files which would otherwise be gone due
+    ##       to the necessary file operations (exists, isfile,
+    ##       readable, open, read) be disallowed by the safe
+    ##       environment the plugin operates in.
+    ##
+    ## Any changes to GetFile have to reviewed for their impact on
+    ## doctools::idx::import::docidx, and possibly ported over.
+
+    proc GetFile {currentfile path dv pv ev mv} {
+	upvar 1 $dv data $pv fullpath $ev error $mv emessage
+	set data     {}
+	set error    {}
+	set emessage {}
+
+	# Find the file, or not.
+	set fullpath [Locate $path]
+	if {$fullpath eq {}} {
+	    set fullpath $path
+	    set error notfound
+	    return 0
+	}
+
+	# Read contents, or not.
+	if {[catch {
+	    set data [fileutil::cat $fullpath]
+	} msg]} {
+	    set error notread
+	    set emessage $msg
+	    return 0
+	}
+
+	return 1
+    }
+
+    proc Locate {path} {
+	upvar 1 currentfile currentfile
+
+	if {$currentfile ne {}} {
+	    set pathstosearch \
+		[linsert $ourincpaths 0 \
+		     [file dirname [file normalize $currentfile]]]
+	} else {
+	    set pathstosearch $ourincpaths
+	}
+
+	foreach base $pathstosearch {
+	    set try [file join $base $path]
+	    if {![file exists $try]} continue
+	    return $try
+	}
+	# Nothing found
+	return {}
+    }
+
+    # # ## ### ##### ######## #############
+    ## Management of nodes to kill
+
+    proc MarkDrop {n} {
+	::variable ourtokill
+	lappend ourtokill $n
+	#puts %%mark4kill=$n|[info level -1]
+	return
+    }
+
+    proc DropChildren {t n} {
+	foreach child [$t children $n] {
+	    MarkDrop $child
+	}
+	return
+    }
+
+    proc PerformDrop {t} {
+	::variable ourtokill
+	#puts __PD($t)=<[join $ourtokill ,]>
+	foreach n $ourtokill {
+	    #puts x($n/[$t exists $n])
+	    if {![$t exists $n]} continue
+	    #puts ^^DEL($n)
+	    $t delete $n
+	}
+	set ourtokill {}
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Command predicates
+
+    proc Nestable {t n cmdname cv} {
+	upvar 1 $cv outname
+	set outname $cmdname
+	switch -exact -- $cmdname {
+	    lb - rb { return 1 }
+	    vset {
+		if {[$t numchildren $n] == 1} {
+		    return 1
+		}
+		append outname /2
+	    }
+	}
+	return 0
+    }
+
+    proc Legal {cmdname} {
+	::variable ourcmds
+	#parray ourcmds
+	return [info exists ourcmds($cmdname)]
+    }
+
+    proc ArgInfo {cmdname minv maxv} {
+	::variable ourcmds
+	upvar 1 $minv min $maxv max
+	foreach {min max} $ourcmds($cmdname) break
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Higher level error handling, node conversion.
+
+    proc MakeError {t n} {
+	#puts %%error=$n|[info level -1]
+	$t set $n type Error
+	DropChildren $t $n
+	return
+    }
+
+    proc MakeErrorMsg {t n msg args} {
+	upvar 1 _file _file
+	#puts %%error=$n|[info level -1]
+	Report $t $n $msg $args
+	$t set $n type Error
+	DropChildren $t $n
+	return
+    }
+
+    proc MakeText {t n text} {
+	#puts %%text=$n|[info level -1]
+	$t set $n type Text
+	$t set $n text $text
+	DropChildren $t $n
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Error reporting
+
+    proc Error {t n text args} {
+	upvar 1 _file _file
+	Report $t $n $text $args
+    }
+
+    proc Report {t n text details} {
+	upvar 1 _file _file
+	ReportAt $_file($n) [$t get $n range] [$t get $n line] [$t get $n col] $text $details
+	return
+    }
+
+    proc ReportAt {file range line col text details} {
+	::variable ourerrors
+	#puts !![list $file $range $line $col $text $details]/[info level -1]
+	lappend ourerrors [list $file $range $line $col $text $details]
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Error Management
+
+    proc ClearErrors {} {
+	::variable ourerrors {}
+	return
+    }
+
+    proc GetErrors {} {
+	::variable ourerrors
+	return $ourerrors
+    }
+
+    proc SetErrors {t} {
+	::variable ourerrors $t
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Error Response
+
+    proc StopOnErrors {} {
+	::variable ourerrors
+	if {![llength $ourerrors]} return
+
+	upvar 1 t t
+	$t destroy
+
+	doctools::msgcat::init idx
+	set info [SortMessages $ourerrors]
+	set msg  [Formatted $info {}]
+
+	return -code error -errorcode $info $msg
+    }
+
+    proc Formatted {errors prefix} {
+	set lines {}
+	foreach err $errors {
+	    struct::list assign $err file range line col msg details
+	    #8.5: set text [msgcat::mc $msg {*}$details]
+	    set text [eval [linsert $details 0 msgcat::mc $msg]]
+	    if {![string length $prefix] && [string length $file]} {
+		set prefix "\"$file\" "
+	    }
+
+	    lappend lines "${prefix}error on line $line.$col: $text"
+
+	    if {$msg eq "docidx/include/syntax"} {
+		struct::list assign $details path moreerrors
+		lappend lines [Formatted [SortMessages $moreerrors] "\"$path\": "]
+	    }
+	}
+	return [join $lines \n]
+    }
+
+    proc SortMessages {messages} {
+	return [lsort -dict -index 0 \
+		    [lsort -dict -index 2 \
+			 [lsort -dict -index 3 \
+			      [lsort -unique $messages]]]]
+    }
+
+    # # ## ### ##### ######## #############
+    ## Parser state
+
+    # Path to the file currently processed, if known. Empty if not known
+    typevariable ourfile {}
+
+    # Array of variables for use by vset. During parsing a local copy
+    # is used so that variables set by the document cannot spill back
+    # to the parser state.
+    typevariable ourvars -array {}
+
+    # List of paths to use when searching for an include file.
+    typevariable ourincpaths {}
+
+    # Record of errors found so far. List of 5-tuples containing token
+    # range, line, column of firt character after the token, error
+    # code, and error arguments, in this order.
+    typevariable ourerrors {}
+
+    # List of nodes marked for removal.
+    typevariable ourtokill {}
+
+    # Map of legal commands to their min/max number of arguments.
+    typevariable ourcmds -array {
+	comment     {1 1}
+	include     {1 1}
+	lb          {0 0}
+	rb          {0 0}
+	vset        {1 2}
+
+	index_begin {2 2}
+	index_end   {0 0}
+	key         {1 1}
+	manpage     {2 2}
+	url         {2 2}
+    }
+
+    # # ## ### ##### ######## #############
+    ## Configuration
+
+    pragma -hasinstances   no ; # singleton
+    pragma -hastypeinfo    no ; # no introspection
+    pragma -hastypedestroy no ; # immortal
+
+    ##
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide doctools::idx::parse 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/pkgIndex.tcl
new file mode 100644
index 00000000..33086486
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/pkgIndex.tcl
@@ -0,0 +1,35 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+
+# Packages for the doctools idx v2 implementation
+# (still v1.1 docidx language).
+
+# - Index container, mutable index objects
+# - Export and import management
+# - Export and import plugins
+# - Parser for docidx markup, and handling serializations
+# - Message catalogs for the parser
+
+package ifneeded doctools::idx                 2     [list source [file join $dir container.tcl]]
+package ifneeded doctools::idx::export         0.2.1 [list source [file join $dir export.tcl]]
+
+package ifneeded doctools::idx::export::docidx 0.1 [list source [file join $dir export_docidx.tcl]]
+package ifneeded doctools::idx::export::html   0.2 [list source [file join $dir export_html.tcl]]
+package ifneeded doctools::idx::export::json   0.1 [list source [file join $dir export_json.tcl]]
+package ifneeded doctools::idx::export::nroff  0.3 [list source [file join $dir export_nroff.tcl]]
+package ifneeded doctools::idx::export::text   0.2 [list source [file join $dir export_text.tcl]]
+package ifneeded doctools::idx::export::wiki   0.2 [list source [file join $dir export_wiki.tcl]]
+
+package ifneeded doctools::idx::import::docidx 0.1 [list source [file join $dir import_docidx.tcl]]
+package ifneeded doctools::idx::import::json   0.1 [list source [file join $dir import_json.tcl]]
+
+package ifneeded doctools::idx::parse          0.1 [list source [file join $dir parse.tcl]]
+package ifneeded doctools::idx::structure      0.1 [list source [file join $dir structure.tcl]]
+
+package ifneeded doctools::msgcat::idx::c      0.1 [list source [file join $dir msgcat_c.tcl]]
+package ifneeded doctools::msgcat::idx::de     0.1 [list source [file join $dir msgcat_de.tcl]]
+package ifneeded doctools::msgcat::idx::en     0.1 [list source [file join $dir msgcat_en.tcl]]
+package ifneeded doctools::msgcat::idx::fr     0.1 [list source [file join $dir msgcat_fr.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+
+package ifneeded doctools::idx::import         0.2.1 [list source [file join $dir import.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/structure.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/structure.tcl
new file mode 100644
index 00000000..c7e32856
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2idx/structure.tcl
@@ -0,0 +1,288 @@
+# -*- tcl -*-
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Verification of serialized indices, and conversion between
+# serialized indices and other data structures.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.4              ; # Required runtime.
+package require snit                 ; # OO system.
+
+# # ## ### ##### ######## ############# #####################
+##
+
+snit::type ::doctools::idx::structure {
+    # # ## ### ##### ######## #############
+    ## Public API
+
+    # Check that the proposed serialization of a keyword index is
+    # indeed such.
+
+    typemethod verify {serial {canonvar {}}} {
+	# Basic syntax: Length and outer type code
+	if {[llength $serial] != 2} {
+	    return -code error $ourprefix$ourshort
+	}
+
+	foreach {tag contents} $serial break
+	#struct::list assign $serial tag contents
+
+	if {$tag ne $ourcode} {
+	    return -code error $ourprefix[format $ourtag $tag]
+	}
+
+	if {[llength $contents] != 8} {
+	    return -code error $ourprefix$ourcshort
+	}
+
+	# Unpack the contents, then check that all necessary keys are
+	# present. Together with the length check we can then also be
+	# sure that no other key is present either.
+	array set idx $contents
+
+	foreach k {label title keywords references} {
+	    if {[info exists idx($k)]} continue
+	    return -code error $ourprefix[format $ourmiss $k]
+	}
+
+	# Pull the keys and check their use (n duplicates allowed). At
+	# the same time we collect the references they are associated
+	# with.
+
+	set refs {}
+	set keys {}
+	array set kw {}
+
+	foreach {k reflist} $idx(keywords) {
+	    lappend keys $k
+	    set kw($k) {}
+	    foreach r $reflist { lappend refs $r }
+	}
+
+	# Fail if keys are duplicated
+	if {[llength [array names kw]] != [llength $keys]} {
+	    return -code error $ourprefix$ourkdup
+	}
+
+	# Pull the references and check their values, and use.
+	array set rd {}
+	set refids {}
+	foreach {id rdef} $idx(references) {
+	    if {[llength $rdef] != 2} {
+		return -code error $ourprefix$ourrshort
+	    }
+	    set rtag [lindex $rdef 0]
+	    if {($rtag ne "manpage") && ($rtag ne "url")} {
+		return -code error $ourprefix[format $ourrtag $rtag]
+	    }
+	    lappend refids $id
+	    set rd($id) {}
+	}
+
+	# Fail if reference ids are duplicated
+	if {[llength [array names rd]] != [llength $refids]} {
+	    return -code error $ourprefix$ourrdup
+	}
+
+	# Fail if we have references in keys without decl, or
+	# references not used by any key.
+	if {[lsort -dict [lsort -unique $refs]] ne [lsort -dict $refids]} {
+	    return -code error $ourprefix$ourrmismatch
+	}
+
+	if {$canonvar ne {}} {
+	    upvar 1 $canonvar iscanonical
+
+	    # Now various checks if the keys and identifiers are
+	    # properly sorted to make this a canonical serialization.
+	    set iscanonical 1
+
+	    foreach {a _ b _ c _ d _} $contents break
+	    #struct::list assign $contents a _ b _ c _ d _
+	    if {
+		([list $a $b $c $d] ne {label keywords references title}) ||
+		($keys   ne [lsort -dict [array names kw]]) ||
+		($refids ne [lsort -dict [array names rd]])
+	    } {
+		set iscanonical 0
+	    }
+	}
+
+	# Everything checked out.
+	return
+    }
+
+    typemethod verify-as-canonical {serial} {
+	$type verify $serial iscanonical
+	if {!$iscanonical} {
+	    #puts <$kw>\n<[lsort -dict [lsort -unique $kw]]>
+	    return -code error $ourprefix$ourdupsort
+	}
+	return
+    }
+
+    typemethod canonicalize {serial} {
+	$type verify $serial iscanonical
+	if {$iscanonical} { return $serial }
+
+	# Unpack the serialization.
+	array set idx $serial
+	array set idx $idx(doctools::idx)
+	unset     idx(doctools::idx)
+	array set k $idx(keywords)
+	array set r $idx(references)
+
+	# Scan and reorder ...
+	set keywords {}
+	foreach kw [lsort -dict [array names k]] {
+	    # Sort references in a keyword by their _labels_.
+	    set tmp {}
+	    foreach rid $k($kw) { lappend tmp [list $rid [lindex $r($rid) 1]] }
+	    set refs {}
+	    foreach item [lsort -dict -index 1 $tmp] {
+		lappend refs [lindex $item 0]
+	    }
+	    lappend keywords $kw $refs
+	}
+
+	set references {}
+	foreach rid [lsort -dict [array names r]] {
+	    lappend references $rid $r($rid)
+	}
+
+	# Construct result
+	set serial [list doctools::idx \
+			[list \
+			     label      $idx(label) \
+			     keywords   $keywords \
+			     references $references \
+			     title      $idx(title)]]
+
+	return $serial
+    }
+
+    # Merge the serialization of two indices into a new serialization.
+
+    typemethod merge {seriala serialb} {
+	$type verify $seriala
+	$type verify $serialb
+
+	# Merge using title and label of the second index, and the new
+	# key definitions come after the existing, overriding as
+	# needed.
+
+	# Unpack the definitions...
+
+	array set a $seriala ; array set a $a(doctools::idx) ; unset a(doctools::idx)
+	array set b $serialb ; array set a $b(doctools::idx) ; unset b(doctools::idx)
+
+	# Merge keywords...
+
+	array set k $a(keywords)
+	foreach {kw reflist} $b(keywords) {
+	    if {![info exists k($kw)]} { set k($kw) {} }
+	    foreach r $reflist { lappend k($kw) }
+	}
+
+	# Merge references... Here we may have conflicting
+	# declarations for the same id.
+
+	array set r $a(references)
+	foreach {rid rdecl} $b(references) {
+	    if {[info exists r($rid)]} {
+		if {$r($rid) ne $rdecl} {
+		    return -code error [format $ourmergeerr $r($rid) $rdecl $rid]
+		}
+		continue
+	    }
+	    set r($rid) $decl
+	}
+
+	# Now construct the result, from the inside out, with proper
+	# sorting at all levels.
+
+	set keywords {}
+	foreach kw [lsort -dict [array names k]] {
+	    # Sort references in a keyword by their _labels_.
+	    set tmp {}
+	    foreach rid $k($kw) { lappend tmp [list $rid [lindex $r($rid) 1]] }
+	    set refs {}
+	    foreach item [lsort -dict -index 1 $tmp] {
+		lappend refs [lindex $item 0]
+	    }
+	    lappend keywords $kw $refs
+	}
+
+	set references {}
+	foreach rid [lsort -dict [array names r]] {
+	    lappend references $rid $r($rid)
+	}
+
+	set serial [list doctools::idx \
+			[list \
+			     label      $b(label) \
+			     keywords   $keywords \
+			     references $references \
+			     title      $b(title)]]
+
+	# Caller has to verify, ensure contract.
+	#$type verify-as-canonical $serial
+	return $serial
+    }
+
+    # Converts an index serialization into a human readable string for
+    # test results. It assumes that the serialization is at least
+    # structurally sound.
+
+    typemethod print {serial} {
+	array set i $serial
+	array set i $i(doctools::idx)
+	array set r $i(references)
+	set lines {}
+	lappend lines [list doctools::idx $i(label) $i(title)]
+	foreach {key reflist} $i(keywords) {
+	    lappend lines ....$key
+	    foreach ref $reflist {
+		lappend lines ........[linsert $r($ref) end $ref]
+	    }
+	}
+	return [join $lines \n]
+    }
+
+    # # ## ### ##### ######## #############
+
+    typevariable ourcode      doctools::idx
+    typevariable ourprefix    {error in serialization:}
+    #                                                                               # Test cases (doctools-idx-structure-)
+    typevariable ourshort     { dictionary too short, expected exactly one key}   ; # 6.0
+    typevariable ourtag       { bad type tag "%s"}                                ; # 6.1
+    typevariable ourcshort    { dictionary too short, expected exactly four keys} ; # 6.2
+    typevariable ourmiss      { missing expected key "%s"}                        ; # 6.3, 6.4, 6.5, 6.6
+    typevariable ourkdup      { duplicate keywords}                               ; # 6.8
+    typevariable ourrshort    { reference list wrong, need exactly 2}             ; # 6.12
+    typevariable ourrtag      { bad reference tag "%s"}                           ; # 6.13
+    typevariable ourrdup      { duplicate reference identifiers}                  ; # 6.14
+    typevariable ourrmismatch { use and declaration of references not matching}   ; # 6.10, 6.11
+    # Message for non-canonical serialization when expecting canonical form
+    typevariable ourdupsort   { duplicate and/or unsorted keywords/identifiers}   ; # 6.7, 6.9, 6.15
+
+    typevariable ourmergeerr  {Mismatching declarations '%s' vs. '%s' for '%s'}
+
+    # # ## ### ##### ######## #############
+    ## Configuration
+
+    pragma -hasinstances   no ; # singleton
+    pragma -hastypeinfo    no ; # no introspection
+    pragma -hastypedestroy no ; # immortal
+
+    ##
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide doctools::idx::structure 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/container.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/container.tcl
new file mode 100644
index 00000000..bfc66c76
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/container.tcl
@@ -0,0 +1,545 @@
+# doctoc.tcl --
+#
+#	Implementation of doctoc objects for Tcl. v2.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: container.tcl,v 1.2 2009/11/15 05:50:03 andreas_kupries Exp $
+
+# Each object manages one table of contents, with methods to add and
+# remove entries and divisions, singly, or in bulk. The bulk methods
+# accept various forms of textual serializations, among them text
+# using the doctoc markup language.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+package require doctools::toc::structure
+package require snit
+package require struct::tree
+
+# ### ### ### ######### ######### #########
+## API
+
+snit::type ::doctools::toc {
+
+    # Concepts:
+    # - A table of contents consists of an ordered set of elements,
+    #   references and divisions.
+    # - Both type of elements within the table are identified by their
+    #   label.
+    # - A reference has two additional pieces of information,
+    #   the id of the document it references, and a textual description.
+    # - A division may have the id of a document.
+    # - The main data of a division is an ordered set of elements,
+    #   references and divisions.
+    # - Both type of elements within the division are identified by
+    #   their label.
+    # - The definitions above define a tree of elements, with
+    #   references as leafs, and divisions as the inner nodes.
+    # - Regarding identification, the full label of each element is
+    #   the list of per-node labels on the path from the root of the
+    #   tree to the element itself.
+
+    # ### ### ### ######### ######### #########
+    ## Options
+
+    ## None
+
+    # ### ### ### ######### ######### #########
+    ## Methods
+
+    constructor {} {
+	install mytree using struct::tree ${selfns}::T
+	# Root is a fake division
+	set myroot [$mytree rootname]
+	$mytree set $myroot type division
+	$mytree set $myroot label {}
+	$mytree set $myroot labelindex {}
+	return
+    }
+
+    # Default destructor.
+
+    # ### ### ### ######### ######### #########
+
+    method invalidate {} {
+	array unset mytoc *
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method title {{text {}}} {
+	if {[llength [info level 0]] == 6} {
+	    set mytitle $text
+	}
+	return $mytitle
+    }
+
+    method label {{text {}}} {
+	if {[llength [info level 0]] == 6} {
+	    set mylabel $text
+	    $mytree set $myroot label $text
+	}
+	return $mylabel
+    }
+
+    method exporter {{object {}}} {
+	# TODO :: unlink/link change notification callbacks on the
+	# config/include components so that we can invalidate our
+	# cache when the settings change.
+
+	if {[llength [info level 0]] == 6} {
+	    set myexporter $object
+	}
+	return $myexporter
+    }
+
+    method importer {{object {}}} {
+	if {[llength [info level 0]] == 6} {
+	    set myimporter $object
+	}
+	return $myimporter
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Direct manipulation of the table of contents.
+
+    method {+ reference} {pid label docid desc} {
+	CheckDiv $pid
+	if {$docid eq {}} {
+	    return -code error "Illegal empty document reference for reference entry"
+	}
+
+	array set l [$mytree get $pid labelindex]
+	if {[info exists l($label)]} {
+	    return -code error "Redefinition of label '$label' in '[$self full-label $pid]'"
+	}
+
+	set new [$mytree insert $pid end]
+	set l($label) $new
+	$mytree set $pid labelindex [array get l]
+
+	$mytree set $new type        reference
+	$mytree set $new label       $label
+	$mytree set $new document    $docid
+	$mytree set $new description $desc
+
+	array unset mytoc *
+	return $new
+    }
+
+    method {+ division} {pid label {docid {}}} {
+	CheckDiv $pid
+
+	array set l [$mytree get $pid labelindex]
+	if {[info exists l($label)]} {
+	    return -code error "Redefinition of label '$label' in '[$self full-label $pid]'"
+	}
+
+	set new [$mytree insert $pid end]
+	set l($label) $new
+	$mytree set $pid labelindex [array get l]
+
+	$mytree set $new type  division
+	$mytree set $new label $label
+	if {$docid ne {}} {
+	    $mytree set $new document $docid
+	}
+	$mytree set $new labelindex {}
+
+	array unset mytoc *
+	return $new
+    }
+
+    method remove {id} {
+	Check $id
+	if {$id eq $myroot} {
+	    return -code error {Unable to remove root}
+	}
+	set pid   [$mytree parent $id]
+	set label [$mytree get $id label]
+
+	array set l [$mytree get $pid labelindex]
+	unset l($label)
+	$mytree set $pid labelindex [array get l]
+	$mytree delete $id
+
+	array unset mytoc *
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method up {id} {
+	Check $id
+	return [$mytree parent $id]
+    }
+
+    method next {id} {
+	Check $id
+	set n [$mytree next $id]
+	if {$n eq {}} { set n [$mytree parent $id] }
+	return $n
+    }
+
+    method prev {id} {
+	Check $id
+	set n [$mytree previous $id]
+	if {$n eq {}} { set n [$mytree parent $id] }
+	return $n
+    }
+
+    method child {id label args} {
+	CheckDiv $id
+	# Find the id of the element with the given labels, in the
+	# parent element id.
+	foreach label [linsert $args 0 $label] {
+	    array set l [$mytree get $id labelindex]
+	    if {![info exists l($label)]} {
+		return -code error "Bad label '$label' in '[$self full-label $id]'"
+	    }
+	    set id $l($label)
+	    unset l
+	}
+	return $id
+    }
+
+    method element {args} {
+	if {![llength $args]} { return $myroot }
+	# 8.5: $self child $myroot {*}$args
+	return [eval [linsert $args 0 $self child $myroot]]
+    }
+
+    method children {id} {
+	CheckDiv $id
+	return [$mytree children $id]
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method type {id} {
+	Check $id
+	return [$mytree get $id type]
+    }
+
+    method full-label {id} {
+	Check $id
+	set result {}
+	foreach node [struct::list reverse [lrange [$mytree ancestors $id] 0 end-1]] {
+	    lappend result [$mytree get $node label]
+	}
+	lappend result [$mytree get $id label]
+
+	return $result
+    }
+
+    method elabel {id {newlabel {}}} {
+	Check $id
+	set thelabel [$mytree get $id label]
+	if {
+	    ([llength [info level 0]] == 7) &&
+	    ($newlabel ne $thelabel)
+	} {
+	    # Handle only calls which change the label
+
+	    set parent [$mytree parent $id]
+	    array set l [$mytree get $parent labelindex]
+
+	    if {[info exists l($newlabel)]} {
+		return -code error "Redefinition of label '$newlabel' in '[$self full-label $parent]'"
+	    }
+
+	    # Copy node information and re-label.
+	    set   l($newlabel) $l($thelabel)
+	    unset l($thelabel)
+	    $mytree set $id label $newlabel
+	    $mytree set $parent labelindex [array get l]
+
+	    if {$id eq $myroot} {
+		set mylabel $newlabel
+	    }
+
+	    set thelabel $newlabel
+	}
+	return $thelabel
+    }
+
+    method description {id {newdesc {}}} {
+	Check $id
+	if {[$mytree get $id type] eq "division"} {
+	    return -code error "Divisions have no description"
+	}
+	set thedescription [$mytree get $id description]
+	if {
+	    ([llength [info level 0]] == 7) &&
+	    ($newdesc ne $thedescription)
+	} {
+	    # Handle only calls which change the description
+	    $mytree set $id description $newdesc
+
+	    set thedescription $newdesc
+	}
+	return $thedescription
+    }
+
+    method document {id {newdocid {}}} {
+	Check $id
+	set thedocid {}
+	catch {
+	    set thedocid [$mytree get $id document]
+	}
+	if {
+	    ([llength [info level 0]] == 7) &&
+	    ($newdocid ne $thedocid)
+	} {
+	    # Handle only calls which change the document
+	    if {$newdocid eq {}} {
+		if {[$mytree get $id type] eq "division"} {
+		    $mytree unset $id document
+		} else {
+		    return -code error "Illegal to unset document reference in reference entry"
+		}
+	    } else {
+		$mytree set $id document $newdocid
+	    }
+	    set thedocid $newdocid
+	}
+	return $thedocid
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Public methods. Bulk loading and merging.
+
+    method {deserialize =} {data {format {}}} {
+	# Default format is the regular toc serialization
+	if {$format eq {}} {
+	    set format serial
+	}
+
+	if {$format ne "serial"} {
+	    set data [$self Import $format $data]
+	    # doctools::toc::structure verify-as-canonical $data
+	    # ImportSerial verifies.
+	}
+
+	$self ImportSerial $data
+	return
+    }
+
+    method {deserialize +=} {data {format {}}} {
+	# Default format is the regular toc serialization
+	if {$format eq {}} {
+	    set format serial
+	}
+
+	if {$format ne "serial"} {
+	    set data [$self Import $format $data]
+	    # doctools::toc::structure verify-as-canonical $data
+	    # merge or ImportSerial verify the structure.
+	}
+
+	set data [doctools::toc::structure merge [$self serialize] $data]
+	# doctools::toc::structure verify-as-canonical $data
+	# ImportSerial verifies.
+
+	$self ImportSerial $data
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method serialize {{format {}}} {
+	# Default format is the regular toc serialization
+	if {$format eq {}} {
+	    set format serial
+	}
+
+	# First check the cache for a remebered representation of the
+	# toc for the chosen format, and return it, if such is known.
+
+	if {[info exists mytoc($format)]} {
+	    return $mytoc($format)
+	}
+
+	# If there is no cached representation we have to generate it
+	# from it from our internal representation.
+
+	if {$format eq "serial"} {
+	    return [$self GenerateSerial]
+	} else {
+	    return [$self Generate $format]
+	}
+
+	return -code error "Internal error, reached unreachable location"
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal methods
+
+    proc Check {id} {
+	upvar 1 mytree mytree
+	if {![$mytree exists $id]} {
+	    return -code error "Bad toc element handle '$id'"
+	}
+	return
+    }
+
+    proc CheckDiv {id} {
+	upvar 1 mytree mytree
+	Check $id
+	if {[$mytree get $id type] ne "division"} {
+	    return -code error "toc element handle '$id' does not refer to a division"
+	}
+    }
+
+    method GenerateSerial {} {
+	# We can generate the list serialization easily from the
+	# internal representation.
+
+	# Construct result
+	set serial [list doctools::toc \
+			[list \
+			     items [$self GenerateDivision $myroot] \
+			     label $mylabel \
+			     title $mytitle]]
+
+	# This is just present to assert that the code above creates
+	# correct serializations.
+	doctools::toc::structure verify-as-canonical $serial
+
+	set mytoc(serial) $serial
+	return $serial
+    }
+
+    method GenerateDivision {root} {
+	upvar 1 mytree mytree
+	set div {}
+	foreach id [$mytree children $root] {
+	    set etype [$mytree get $id type]
+	    set edata {}
+	    switch -exact -- $etype {
+		reference {
+		    lappend edata \
+			desc  [$mytree get $id description] \
+			id    [$mytree get $id document] \
+			label [$mytree get $id label]
+		}
+		division {
+		    if {[$mytree keyexists $id document]} {
+			lappend edata id [$mytree get $id document]
+		    }
+		    lappend edata \
+			items [$self GenerateDivision $id] \
+			label [$mytree get $id label]
+		}
+	    }
+	    lappend div [list $etype $edata]
+	}
+	return $div
+    }
+
+    method Generate {format} {
+	if {$myexporter eq {}} {
+	    return -code error "Unable to export from \"$format\", no exporter configured"
+	}
+	set res [$myexporter export object $self $format]
+	set mytoc($format) $res
+	return $res
+    }
+
+    method ImportSerial {serial} {
+	doctools::toc::structure verify $serial iscanonical
+
+	# Kill existing content
+	foreach id [$mytree children $myroot] {
+	    $mytree delete $id
+	}
+
+	# Unpack the serialization.
+	array set toc $serial
+	array set toc $toc(doctools::toc)
+	unset     toc(doctools::toc)
+
+	# We are setting the relevant variables directly instead of
+	# going through the accessor methods.
+
+	set mytitle $toc(title)
+	set mylabel $toc(label)
+
+	$self ImportDivision $toc(items) $myroot
+
+	# Extend cache (only if canonical, as we return only canonical
+	# data).
+	if {$iscanonical} {
+	    set mytoc(serial) $serial
+	}
+	return
+    }
+
+    method ImportDivision {items root} {
+	foreach element $items {
+	    foreach {etype edata} $element break
+	    #struct::list assign $element etype edata
+	    array set toc $edata
+	    switch -exact -- $etype {
+		reference {
+		    $self + reference $root \
+			$toc(label) $toc(id) $toc(desc)
+		}
+		division {
+		    if {[info exists toc(id)]} {
+			set div [$self + division $root $toc(label) $toc(id)]
+		    } else {
+			set div [$self + division $root $toc(label)]
+		    }
+		    $self ImportDivision $toc(items) $div
+		}
+	    }
+	    unset toc
+	}
+	return
+    }
+
+    method Import {format data} {
+	if {$myimporter eq {}} {
+	    return -code error "Unable to import from \"$format\", no importer configured"
+	}
+
+	return [$myimporter import text $data $format]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+
+    # References to export/import managers extending the
+    # (de)serialization abilities of the table of contents.
+    variable myexporter {}
+    variable myimporter {}
+
+    # Internal representation of the table of contents.
+
+    variable mytitle           {} ; # 
+    variable mylabel           {} ; # 
+    variable mytree            {} ; # Tree object holding the toc.
+    variable myroot            {} ; # Name of the tree root node.
+
+    # Array serving as cache holding alternative representations of
+    # the toc generated via 'serialize', i.e. data export.
+
+    variable mytoc -array {}
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::toc 2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export.tcl
new file mode 100644
index 00000000..eb3aa62c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export.tcl
@@ -0,0 +1,123 @@
+# export.tcl --
+#
+#	Exporting indices into other formats.
+#
+# Copyright (c) 2009-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# Each object manages a set of plugins for the conversion of keyword
+# indices into some textual representation. I.e. this object manages
+# the conversion to specialized serializations of keyword indices.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+package require struct::map
+package require doctools::toc::structure
+package require pluginmgr
+package require snit
+
+# ### ### ### ######### ######### #########
+## API
+
+snit::type ::doctools::toc::export {
+
+    # ### ### ### ######### ######### #########
+    ## Options :: None
+
+    # ### ### ### ######### ######### #########
+    ## Creation, destruction.
+
+    constructor {} {
+	install myconfig using ::struct::map ${selfns}::config
+	return
+    }
+
+    destructor {
+	$myconfig destroy
+	# Clear the cache of loaded export plugins.
+	foreach k [array names myplugin] {
+	    $myplugin($k) destroy
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Convert from the Tcl toc serialization to other formats.
+
+    method {export object} {obj {format {}}} {
+	return [$self export serial [$obj serialize] $format]
+    }
+
+    method {export serial} {serial {format {}}} {
+	doctools::toc::structure verify $serial iscanonical
+
+	set plugin [$self GetPlugin $format]
+
+	# We have a plugin, now feed it.
+
+	if {!$iscanonical} {
+	    set serial [doctools::toc::structure canonicalize $serial]
+	}
+
+	set     configuration [$myconfig get]
+	lappend configuration user   $::tcl_platform(user)
+	lappend configuration format [$plugin plugin]
+
+	return [$plugin do export $serial $configuration]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal methods
+
+    method GetPlugin {format} {
+	if {$format eq {}} { set format doctoc }
+
+	if {![info exists myplugin($format)]} {
+	    set plugin [pluginmgr ${selfns}::fmt-$format \
+			       -pattern doctools::toc::export::* \
+			       -api { export } \
+			       -setup [mymethod PluginSetup]]
+	    ::pluginmgr::paths $plugin doctools::toc::export
+	    $plugin load $format
+	    set myplugin($format) $plugin
+	} else {
+	    set plugin $myplugin($format)
+	}
+
+	return $plugin
+    }
+
+    method PluginSetup {mgr ip} {
+	# Inject a pseudo package into the plugin interpreter the
+	# formatters can use to check that they were loaded into a
+	# proper environment.
+	$ip eval {package provide doctools::toc::export::plugin 1}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+
+    # Array serving as a cache for the various plugin managers holding
+    # a specific export plugin.
+
+    variable myplugin -array {}
+
+    # A component managing the configuration given to the export
+    # plugins when they are invoked.
+
+    component myconfig -public config
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::toc::export 0.2.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_doctoc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_doctoc.tcl
new file mode 100644
index 00000000..6f5d42d6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_doctoc.tcl
@@ -0,0 +1,217 @@
+# doctoc.tcl --
+#
+#	The doctoc export plugin. Generation of doctoc markup.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: export_doctoc.tcl,v 1.3 2009/11/15 05:50:03 andreas_kupries Exp $
+
+# This package is a plugin for the doctools::toc v2 system.  It takes
+# the list serialization of a table of contents and produces text in
+# doctoc format.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::toc::export::plugin
+
+package require Tcl 8.4
+package require doctools::toc::export::plugin ; # Presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require doctools::toc::structure      ; # Verification that
+						# the input is proper.
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc export {serial configuration} {
+
+    # Phase I. Check that we got a canonical ToC serialization. That
+    #          makes the unpacking easier, as we can mix it with the
+    #          generation of the output, knowing that everything is
+    #          already sorted as it should be.
+
+    ::doctools::toc::structure verify-as-canonical $serial
+
+    # ### ### ### ######### ######### #########
+    # Configuration ...
+    # * Standard entries
+    #   - user   = person running the application doing the formatting
+    #   - format = name of this format
+    #   - file   = name of the file the ToC came from. Optional.
+    #   - map    = maps symbolic document ids to actual file path or url. Optional.
+    # * doctoc specific entries
+    #   - newlines = boolean. tags separated by eol markers
+    #   - indented = boolean. tags indented per the toc structure.
+    #   - aligned  = boolean. reference information tabular aligned within keys.
+    #
+    # Notes
+    # * This format ignores 'map' even if set, as the written doctoc
+    #   contains the symbolic document ids and only them.
+    # * aligned  => newlines
+    # * indented => newlines
+
+    # Combinations of the format specific entries
+    # N I A |
+    # - - - + ---------------------
+    # 0 0 0 | Ultracompact (no whitespace, single line)
+    # 1 0 0 | Compact (no whitespace, multiple lines)
+    # 1 1 0 | Indented
+    # 1 0 1 | Tabular aligned references
+    # 1 1 1 | Indented + Tabular aligned references
+    # - - - + ---------------------
+    # 0 1 0 | Not possible, per the implications above.
+    # 0 0 1 | ditto
+    # 0 1 1 | ditto
+    # - - - + ---------------------
+
+    # Import the configuration and initialize the internal state
+    array set config {
+	newlines 0
+	aligned  0
+	indented 0
+    }
+    array set config $configuration
+
+    # Force the implications mentioned in the notes above.
+    if {
+	$config(aligned) ||
+	$config(indented)
+    } {
+	set config(newlines) 1
+    }
+
+    # ### ### ### ######### ######### #########
+
+    # Phase II. Generate the output, taking the configuration into
+    #           account.
+
+    TagsBegin
+
+    # First some comments about the provenance of the output.
+    Tag+ comment [list "Generated @ [clock format [clock seconds]]"]
+    Tag+ comment [list "By          $config(user)"]
+    if {[info exists config(file)] && ($config(file) ne {})} {
+	Tag+ comment [list "From file   $config(file)"]
+    }
+
+    # Unpack the serialization.
+    array set toc $serial
+    array set toc $toc(doctools::toc)
+    unset     toc(doctools::toc)
+
+    # Now open the markup
+
+    Tag+ toc_begin [list $toc(label) $toc(title)]
+    PrintItems $toc(items) {    } {    }
+    TagPrefix {}
+    Tag+ toc_end
+
+    # Last formatting, joining the commands together.
+    set sep [expr {$config(newlines) ? "\n" : ""}]
+    return [join $lines $sep]
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+
+proc PrintItems {items indentation increment} {
+    upvar 1 config config prefix prefix lines lines
+
+    if {$config(aligned)} {
+	set imax 0
+	set lmax 0
+	foreach element $items {
+	    foreach {etype edata} $element break
+	    if {$etype eq "division"} { continue }
+	    array set toc $edata
+	    Max imax [list $toc(id)]
+	    Max lmax [list $toc(label)]
+	    unset toc
+	}
+    }
+
+    foreach element $items {
+	if {$config(indented)} {TagPrefix $indentation}
+	foreach {etype edata} $element break
+	array set toc $edata
+	switch -exact -- $etype {
+	    reference {
+		if {$config(aligned)} {
+		    Tag+ item [FmtR imax $toc(id)] [FmtR lmax $toc(label)] [list $toc(desc)]
+		} else {
+		    Tag+ item [list $toc(id) $toc(label) $toc(desc)]
+		}
+	    }
+	    division {
+		if {[info exists toc(id)]} {
+		    Tag+ division_start [list $toc(label) $toc(id)]
+		} else {
+		    Tag+ division_start [list $toc(label)]
+		}
+		PrintItems $toc(items) $indentation$increment $increment
+		if {$config(indented)} {TagPrefix $indentation}
+		Tag+ division_end
+	    }
+	}
+	unset toc
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc TagPrefix {str} {
+    upvar 1 prefix prefix
+    set    prefix $str
+    return
+}
+
+proc TagsBegin {} {
+    upvar 1 prefix prefix lines lines
+    set prefix {}
+    set lines  {}
+    return
+}
+
+proc Tag {n args} {
+    upvar 1 prefix prefix
+    set    cmd $prefix
+    append cmd \[$n
+    if {[llength $args]} { append cmd " [join $args]" }
+    append  cmd \]
+    return $cmd
+}
+
+proc Tag+ {n args} {
+    upvar 1 prefix prefix lines lines
+    lappend lines [eval [linsert $args 0 Tag $n]]
+    return
+}
+
+proc Max {v str} {
+    upvar 1 $v max
+    set x [string length $str]
+    if {$x <= $max} return
+    set max $x
+    return
+}
+
+proc FmtR {v str} {
+    upvar 1 $v max
+    return [list $str][string repeat { } [expr {$max - [string length [list $str]]}]]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::toc::export::doctoc 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_html.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_html.tcl
new file mode 100644
index 00000000..bfdbeedc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_html.tcl
@@ -0,0 +1,323 @@
+# text.tcl --
+#
+#	The HTML export plugin. Generation of HTML markup.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: export_html.tcl,v 1.3 2009/11/15 05:50:03 andreas_kupries Exp $
+
+# This package is a plugin for the doctools::toc v2 system.  It takes
+# the list serialization of a table of contents and produces text in
+# HTML format.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::toc::export::plugin
+
+package require Tcl 8.4
+package require doctools::toc::export::plugin ; # Presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require doctools::toc::structure ; # Verification that the
+					   # input is proper.
+package require doctools::html
+package require doctools::html::cssdefaults
+
+doctools::html::import ;# -> ::html::*
+
+# ### ### ### ######### ######### #########
+## API. 
+
+proc export {serial configuration} {
+
+    # Phase I. Check that we got a canonical toc serialization. That
+    #          makes the unpacking easier, as we can mix it with the
+    #          generation of the output, knowing that everything is
+    #          already sorted as it should be.
+
+    ::doctools::toc::structure verify-as-canonical $serial
+
+    # ### ### ### ######### ######### #########
+    # Configuration ...
+    # * Standard entries
+    #   - user   = person running the application doing the formatting
+    #   - format = name of this format
+    #   - file   = name of the file the toc came from. Optional.
+    #   - map    = maps symbolic references to actual file path. Optional.
+
+    # * HTML specific entries
+    #   - newlines = boolean. tags separated by eol markers
+    #   - indented = boolean. tags indented per their nesting structure.
+    #   //layout   = string in { list, table }.
+    #
+    #   - meta   = HTML fragment for use within the document <meta> section.
+    #   - header = HTML fragment used immediately after <body>
+    #   - footer = HTML fragment used immediately before </body>
+    #
+    #   - rid   = dictionary mapping element labels to link anchor names.
+    #     <=> Reference IDentifier
+    # 
+    # Notes
+    # * indented => newlines
+
+    # Import the configuration and initialize the internal state
+    #// layout    list
+    array set config {
+	newlines  0
+	indented  0
+	meta      {}
+	header    {}
+	footer    {}
+	rid      {}
+	map       {}
+	sepline   ------------------------------------------------------------
+	class.main     doctools
+	class.header   toc-header
+	class.title    toc-title
+	class.navsep   toc-navsep
+	class.contents toc-contents
+	class.ref      toc-ref
+	class.div      toc-div
+	class.footer   toc-footer
+    }
+    array set config $configuration
+    array set map    $config(map)
+    array set rid    $config(rid)
+
+    # Force the implications mentioned in the notes above.
+    if {$config(indented)} {
+	set config(newlines) 1
+    }
+
+    # Allow structuring comments iff structure is present.
+    set config(comments) [expr {$config(indented) || $config(newlines)}]
+
+    # ### ### ### ######### ######### #########
+
+    # Phase II. Generate the output, taking the configuration into
+    #           account.
+
+    # Unpack the serialization.
+    array set toc $serial
+    array set toc $toc(doctools::toc)
+    unset     toc(doctools::toc)
+
+    html::begin
+    # Configure the layouting
+    if {!$config(indented)} { html::indenting 0 }
+    if {!$config(newlines)} { html::newlines  0 }
+
+    html::tag* html {
+	html::newline ; html::indented 4 {
+	    Header
+	    Provenance
+	    Body
+	}
+    }
+
+    return [html::done]
+}
+
+# ### ### ### ######### ######### #########
+
+proc Header {} {
+    upvar 1 config config toc toc
+    html::tag* head {
+	html::newline ; html::indented 4 {
+	    html::tag= title [Title] ; html::newline
+	    if {![Extend meta]} {
+		html::tag* style {
+		    DefaultStyle
+		} ; html::newline
+	    }
+	}
+    } ; html::newline
+    return
+}
+
+proc Provenance {} {
+    upvar 1 config config
+    if {!$config(comments)} return
+    html::comment [html::collect {
+	html::indented 4 {
+	    html::+  "Generated @ [clock format [clock seconds]]" ; html::newline
+	    html::+  "By          $config(user)"                  ; html::newline
+	    if {[info exists config(file)] && ($config(file) ne {})} {
+		html::+ "From file   $config(file)" ; html::newline
+	    }
+	}
+    }] ; html::newline
+    return
+}
+
+proc Body {} {
+    upvar 1 config config rid rid toc toc
+    html::tag* body {
+	html::newline ; html::indented 4 {
+	    html::tag* div class $config(class.main) {
+		html::newline ; html::indented 4 {
+		    html::tag* div class $config(class.header) {
+			html::newline ; html::indented 4 {
+			    BodyTitle
+			    UserHeader
+			    html::tag1 hr class $config(class.navsep) ; html::newline
+			}
+		    } ;	html::newline
+		    Division $toc(items) {} {Table Of Contents}
+		    html::tag* div class $config(class.footer) {
+			html::newline ; html::indented 4 {
+			    html::tag1 hr class $config(class.navsep) ; html::newline
+			    UserFooter
+			}
+		    } ; html::newline
+		}
+	    } ; html::newline
+	}
+    } ; html::newline
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc BodyTitle {} {
+    upvar 1 toc toc config config
+    html::tag= h1 class $config(class.title) [Title] ; html::newline
+    return
+}
+
+proc UserHeader {} {
+    upvar 1 config config
+    Extend header
+    html::newline
+    return
+}
+
+proc UserFooter {} {
+    upvar 1 config config
+    Extend footer
+    html::newline
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc Title {} {
+    upvar 1 toc(label) label toc(title) title
+    if {($label ne {}) && ($title ne {})} {
+	return "$label -- $title"
+    } elseif {$label ne {}} {
+	return $label
+    } elseif {$title ne {}} {
+	return $title
+    }
+    return -code error {Reached the unreachable}
+}
+
+proc DefaultStyle {} {
+    html::comment \n[doctools::html::cssdefaults::contents]
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc Division {items path seplabel} {
+    upvar 1 config config rid rid map map
+
+    # No content for an empty division
+    if {![llength $items]} return
+
+    # Process the elements in a division.
+
+    Separator "Start $seplabel"
+
+    html::tag* dl class $config(class.contents) {
+	html::newline ; html::indented 4 {
+	    foreach element $items {
+		foreach {etype edata} $element break
+		array set e $edata
+		switch -exact -- $etype {
+		    reference {
+			html::tag* dt class $config(class.ref) {
+			    RMap $e(label)
+			    html::tag= a href [Map $e(id)] $e(label)
+			}
+			html::newline
+			html::tag= dd class $config(class.ref) $e(desc)
+			html::newline
+		    }
+		    division {
+			html::tag* dt class $config(class.div) {
+			    RMap $e(label)
+			    if {[info exists e(id)]} {
+				html::tag= a href [Map $e(id)] $e(label)
+			    } else {
+				html::+ $e(label)
+			    }
+			}
+			html::newline
+			html::tag* dd class $config(class.div) {
+			    html::newline ; html::indented 4 {
+				Division $e(items) [linsert $path end $e(label)] "Division ($e(label))"
+			    }
+			} ; html::newline
+		    }
+		}
+		unset e
+	    }
+	}
+    } ; html::newline
+    Separator "Stop  $seplabel"
+}
+
+# ### ### ### ######### ######### #########
+
+proc Separator {{text {}}} {
+    upvar config config
+    if {!$config(comments)} return
+    set str $config(sepline)
+    if {$text ne {}} {
+	set new " $text "
+	set str [string replace $str 1 [string length $new] $new]
+    }
+    html::comment $str
+    html::newline
+    return
+}
+
+proc Map {id} {
+    upvar 1 map map
+    if {![info exists map($id)]} { return $id }
+    return $map($id)
+}
+
+proc RMap {label} {
+    upvar 1 rid rid path path
+    set k [linsert $path end $label]
+    if {![info exists rid($k)]} return
+    html::tag/ a name $rid($k)
+}
+
+proc Extend {varname} {
+    upvar 1 config config
+    if {$config($varname) eq {}} {
+	if {$config(comments)} {
+	    html::comment "Customization Point: $varname"
+	}
+	return 0
+    }
+    html::+++ $config($varname)
+    return 1
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::toc::export::html 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_json.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_json.tcl
new file mode 100644
index 00000000..7051f59b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_json.tcl
@@ -0,0 +1,223 @@
+# json.tcl --
+#
+#	The JSON export plugin. Generation of Java Script Object Notation.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: export_json.tcl,v 1.3 2009/11/15 05:50:03 andreas_kupries Exp $
+
+# This package is a plugin for the doctools::toc v2 system.  It takes
+# the list serialization of a table of contents and produces text in
+# JSON format.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::toc::export::plugin
+
+package require Tcl 8.4
+package require doctools::toc::export::plugin ; # Presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require doctools::toc::structure      ; # Verification that
+						# the input is proper.
+package require textutil::adjust
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc export {serial configuration} {
+
+    # Phase I. Check that we got a canonical toc serialization. That
+    #          makes the unpacking easier, as we can mix it with the
+    #          generation of the output, knowing that everything is
+    #          already sorted as it should be.
+
+    ::doctools::toc::structure verify-as-canonical $serial
+
+    # ### ### ### ######### ######### #########
+    # Configuration ...
+    # * Standard entries
+    #   - user   = person running the application doing the formatting
+    #   - format = name of this format
+    #   - file   = name of the file the toc came from. Optional.
+    #   - map    = maps symbolic references to actual file path. Optional.
+    # * json/format specific entries
+    #   - indented = boolean. objects indented per the toc structure.
+    #   - aligned  = boolean. object keys tabular aligned vertically.
+    #
+    # Notes
+    # * This format ignores 'map' even if set, as the written json
+    #   contains the symbolic references and only them.
+    # * aligned  => indented
+
+    # Combinations of the format specific entries
+    # N I A |
+    # - - - + ---------------------
+    # 0 0 0 | Ultracompact (no whitespace, single line)
+    # 1 0 0 | Compact (no whitespace, multiple lines)
+    # 1 1 0 | Indented
+    # 1 0 1 | Tabular aligned references
+    # 1 1 1 | Indented + Tabular aligned references
+    # - - - + ---------------------
+    # 0 1 0 | Not possible, per the implications above.
+    # 0 0 1 | ditto
+    # 0 1 1 | ditto
+    # - - - + ---------------------
+
+    # Import the configuration and initialize the internal state
+    array set config {
+	indented 0
+	aligned  0
+    }
+    array set config $configuration
+
+    # Force the implications mentioned in the notes above.
+    if {$config(aligned)} {
+	set config(indented) 1
+    }
+
+    # ### ### ### ######### ######### #########
+
+    # Phase II. Generate the output, taking the configuration into
+    #           account. We construct this from the inside out.
+
+    # Unpack the serialization.
+    array set toc $serial
+    array set toc $toc(doctools::toc)
+    unset     toc(doctools::toc)
+
+    return [JsonObject doctools::toc \
+		[JsonObject \
+		     items  [ProcessDivision $toc(items)] \
+		     label  [JsonString      $toc(label)] \
+		     title  [JsonString      $toc(title)]]]
+
+    # ### ### ### ######### ######### #########
+}
+
+proc ProcessDivision {items} {
+    upvar 1 config config
+    set result {}
+
+    foreach element $items {
+	foreach {etype edata} $element break
+	array set toc $edata
+	switch -exact -- $etype {
+	    reference {
+		set edata [JsonObject \
+			       desc  [JsonString $toc(desc)] \
+			       id    [JsonString $toc(id)] \
+			       label [JsonString $toc(label)]]
+	    }
+	    division {
+		set edata {}
+		if {[info exists toc(id)]} { lappend edata id [JsonString $toc(id)] }
+		lappend edata \
+		    items [ProcessDivision $toc(items)] \
+		    label [JsonString      $toc(label)]
+		set edata [JsonObjectDict $edata]
+	    }
+	}
+	unset toc
+	lappend result [JsonObject $etype $edata]
+    }
+
+    return [JsonArrayList $result]
+}
+
+# ### ### ### ######### ######### #########
+
+proc JsonQuotes {} {
+    return [list "\"" "\\\"" / \\/ \\ \\\\ \b \\b \f \\f \n \\n \r \\r \t \\t]
+}
+
+proc JsonString {s} {
+    return "\"[string map [JsonQuotes] $s]\""
+}
+
+proc JsonArray {args} {
+    upvar 1 config config
+    return [JsonArrayList $args]
+}
+
+proc JsonArrayList {list} {
+    # compact form.
+    return "\[[join $list ,]\]"
+}
+
+proc JsonObject {args} {
+    upvar 1 config config
+    return [JsonObjectDict $args]
+}
+
+proc JsonObjectDict {dict} {
+    # The dict maps string keys to json-formatted data. I.e. we have
+    # to quote the keys, but not the values, as the latter are already
+    # in the proper format.
+    upvar 1 config config
+
+    set tmp {}
+    foreach {k v} $dict { lappend tmp [JsonString $k] $v }
+    set dict $tmp
+
+    if {$config(aligned)} { Align $dict max }
+
+    if {$config(indented)} {
+	set content {}
+	foreach {k v} $dict {
+	    if {$config(aligned)} { set k [FmtR max $k] }
+	    if {[string match *\n* $v]} {
+		# multi-line value
+		lappend content "    $k : [textutil::adjust::indent $v {    } 1]"
+	    } else {
+		# single line value.
+		lappend content "    $k : $v"
+	    }
+	}
+	if {[llength $content]} {
+	    return "\{\n[join $content ,\n]\n\}"
+	} else {
+	    return "\{\}"
+	}
+    } else {
+	# ultra compact form.
+	set tmp {}
+	foreach {k v} $dict { lappend tmp "$k:$v" }
+	return "\{[join $tmp ,]\}"
+    }
+}
+
+proc Align {dict mv} {
+    upvar 1 $mv max
+    # Generate a list of references sortable by name, and also find the
+    # max length of all relevant names.
+    set max 0
+    foreach {str _} $dict { Max max $str }
+    return
+}
+
+proc Max {v str} {
+    upvar 1 $v max
+    set x [string length $str]
+    if {$x <= $max} return
+    set max $x
+    return
+}
+
+proc FmtR {v str} {
+    upvar 1 $v max
+    return $str[string repeat { } [expr {$max - [string length $str]}]]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::toc::export::json 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_nroff.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_nroff.tcl
new file mode 100644
index 00000000..28a7d663
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_nroff.tcl
@@ -0,0 +1,218 @@
+# text.tcl --
+#
+#	The NROFF export plugin. Generation of man.macros based nroff markup.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: export_nroff.tcl,v 1.4 2009/11/15 05:50:03 andreas_kupries Exp $
+
+# This package is a plugin for the doctools::toc v2 system.  It takes
+# the list serialization of a table of contents and produces text in
+# nroff format, man.macros based.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::toc::export::plugin
+
+package require Tcl 8.4
+package require doctools::toc::export::plugin ; # Presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require doctools::toc::structure    ; # Verification that the
+					      # input is proper.
+package require doctools::text              ; # Text assembly package
+package require doctools::nroff::man_macros ; # Macro definitions for result.
+
+doctools::text::import ;# -> ::text::*
+
+# ### ### ### ######### ######### #########
+## API. 
+
+proc export {serial configuration} {
+
+    # Phase I. Check that we got a canonical toc serialization. That
+    #          makes the unpacking easier, as we can mix it with the
+    #          generation of the output, knowing that everything is
+    #          already sorted as it should be.
+
+    ::doctools::toc::structure verify-as-canonical $serial
+
+    # ### ### ### ######### ######### #########
+    # Configuration ...
+    # * Standard entries
+    #   - user   = person running the application doing the formatting
+    #   - format = name of this format
+    #   - file   = name of the file the toc came from. Optional.
+    #   - map    = maps symbolic references to actual file path. Ignored
+    #
+    # Specific
+    #   - inline = boolean. if set (default) man.macros is inlined in
+    #              the output. other a .so reference to the file is
+    #              generated.
+
+    # Import the configuration and initialize the internal state
+
+    array set config {
+	inline 1
+    }
+    array set config $configuration
+
+    # ### ### ### ######### ######### #########
+
+    # Phase II. Generate the output, taking the configuration into
+    #           account.
+
+    # Unpack the serialization.
+    array set toc $serial
+    array set toc $toc(doctools::toc)
+    unset     toc(doctools::toc)
+
+    text::begin
+    text::indenting 0 ; # Just in case someone tries to.
+
+    Provenance
+    if {$config(inline)} {
+	text::newline?
+	text::+ [doctools::nroff::man_macros::contents]
+    } else {
+	.so man.macros
+    }
+    .TH $toc(label)
+    .SH {table of contents}
+    if {$toc(title) ne {}} {
+	text::+ $toc(title)
+    }
+
+    Division $toc(items)
+    return [text::done]
+}
+
+proc Division {items} {
+    if {![llength $items]} return
+    .RS
+
+    foreach element $items {
+	foreach {etype edata} $element break
+	array set e $edata
+	switch -exact -- $etype {
+	    reference {
+		.TP [BOLD $e(label)]
+		text::newline
+		text::+ $e(desc)
+		text::newline
+	    }
+	    division {
+		.TP [BOLD $e(label)]
+		text::newline
+		Division $e(items)
+	    }
+	}
+	unset e
+    }
+    .RE
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc Provenance {} {
+    upvar 1 config config
+    COMMENT  "Generated @ [clock format [clock seconds]]"
+    COMMENT  "By          $config(user)"
+    if {[info exists config(file)] && ($config(file) ne {})} {
+	COMMENT "From file   $config(file)"
+    }
+    return
+}
+
+proc .so {file} {
+    text::newline?
+    text::+ ".so $file"
+    text::newline
+    return
+}
+
+proc .TP {text} {
+    text::newline?
+    text::+ .TP
+    text::newline
+    text::+ $text
+    return
+}
+
+proc COMMENT {text} {
+    set pfx "'\\\" " ;#
+    text::newline?
+
+    foreach line [split $text \n] {
+	text::+ $pfx
+	text::+ $line
+	text::newline
+    }
+    #text::+ $pfx[join [split $text \n] \n$pfx]
+    return
+}
+
+proc BOLD {text} {
+    return \\fB$text\\fR
+}
+
+proc .RS {} {
+    text::newline?
+    text::+ .RS
+    text::newline
+    return
+}
+
+proc .RE {} {
+    text::newline?
+    text::+ .RE
+    text::newline
+    return
+}
+
+proc .PP {} {
+    text::newline?
+    text::+ .PP
+    text::newline
+    return
+}
+
+proc .SH {name} {
+    text::newline?
+    text::+ ".SH "
+    set hasspaces [regexp {[ 	]} $name]
+    set name [string toupper $name]
+
+    if {$hasspaces} { text::+ \" }
+    text::+ $name
+    if {$hasspaces} { text::+ \" }
+    text::newline
+    return
+}
+
+proc .TH {name} {
+    text::newline?
+    text::+ ".TH "
+    set hasspaces [regexp {[ 	]} $name]
+    set name [string toupper $name]
+
+    if {$hasspaces} { text::+ \" }
+    text::+ $name
+    if {$hasspaces} { text::+ \" }
+    text::newline
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::toc::export::nroff 0.2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_text.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_text.tcl
new file mode 100644
index 00000000..41a28647
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_text.tcl
@@ -0,0 +1,142 @@
+# text.tcl --
+#
+#	The text export plugin. Generation of plain text (ReST -
+#	re-structured text).
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: export_text.tcl,v 1.3 2009/11/15 05:50:03 andreas_kupries Exp $
+
+# This package is a plugin for the the doctools::toc v2 system.  It
+# takes the list serialization of a table of contents and produces
+# text in text format.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::toc::export::plugin
+
+package require Tcl 8.4
+package require doctools::toc::export::plugin ; # Presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require doctools::toc::structure ; # Verification that the
+					   # input is proper.
+package require doctools::text           ; # Text assembly package
+
+doctools::text::import ;# -> ::text::*
+
+# ### ### ### ######### ######### #########
+## API. 
+
+proc export {serial configuration} {
+
+    # Phase I. Check that we got a canonical toc serialization. That
+    #          makes the unpacking easier, as we can mix it with the
+    #          generation of the output, knowing that everything is
+    #          already sorted as it should be.
+
+    ::doctools::toc::structure verify-as-canonical $serial
+
+    # ### ### ### ######### ######### #########
+    # Configuration ...
+    # * Standard entries
+    #   - user   = person running the application doing the formatting
+    #   - format = name of this format
+    #   - file   = name of the file the toc came from. Optional.
+    #   - map    = maps symbolic references to actual file path. Optional.
+
+    # //possible parameters to influence the output.
+    # //* symbolic mapping off/on
+
+    # Import the configuration and initialize the internal state
+
+    array set config $configuration
+    array set map    {}
+    if {[info exists config(map)]} {
+	array set map $config(map)
+    }
+
+    # ### ### ### ######### ######### #########
+
+    # Phase II. Generate the output, taking the configuration into
+    #           account.
+
+    # Unpack the serialization.
+    array set toc $serial
+    array set toc $toc(doctools::toc)
+    unset     toc(doctools::toc)
+
+    text::begin
+    text::+ [Header]
+    text::underline =
+
+    # Iterate over the keys and their references
+    PrintDivision $toc(items)
+
+    # Return final assembled text
+    return [text::done]
+}
+
+proc PrintDivision {items} {
+    foreach element $items {
+	foreach {etype edata} $element break
+	array set toc $edata
+
+	switch -exact -- $etype {
+	    reference {
+		text::newline
+		text::+ "[Map $toc(id)] : $toc(label)"
+		text::newline
+		text::indented 4 { text::+ $toc(desc) }
+		text::newline
+	    }
+	    division {
+		text::newline
+		if {[info exists toc(id)]} {
+		    text::+ "[Map $toc(id)] : $toc(label)"
+		} else {
+		    text::+ "$toc(label)"
+		}
+		text::underline -
+		text::indented 4 {
+		    PrintDivision $toc(items)
+		}
+		text::newline
+	    }
+	}
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc Header {} {
+    upvar 1 toc(label) label toc(title) title
+    if {($label ne {}) && ($title ne {})} {
+	return "$label -- $title"
+    } elseif {$label ne {}} {
+	return $label
+    } elseif {$title ne {}} {
+	return $title
+    }
+    return -code error {Reached the unreachable}
+}
+
+proc Map {id} {
+    upvar 1 map map
+    if {![info exists map($id)]} { return $id }
+    return $map($id)
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::toc::export::text 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_wiki.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_wiki.tcl
new file mode 100644
index 00000000..0ced5cf8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/export_wiki.tcl
@@ -0,0 +1,144 @@
+# text.tcl --
+#
+#	The wiki export plugin. Generation of plain text, ready for
+#	use by the Tcler's Wiki
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: export_wiki.tcl,v 1.3 2009/11/15 05:50:03 andreas_kupries Exp $
+
+# This package is a plugin for the the doctools::toc v2 system.  It
+# takes the list serialization of a table of contents and produces
+# text in wiki format.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::toc::export::plugin
+
+package require Tcl 8.4
+package require doctools::toc::export::plugin ; # Presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require doctools::toc::structure ; # Verification that the
+					   # input is proper.
+package require doctools::text           ; # Text assembly package
+
+doctools::text::import ;# -> ::text
+
+# ### ### ### ######### ######### #########
+## API. 
+
+proc export {serial configuration} {
+
+    # Phase I. Check that we got a canonical toc serialization. That
+    #          makes the unpacking easier, as we can mix it with the
+    #          generation of the output, knowing that everything is
+    #          already sorted as it should be.
+
+    ::doctools::toc::structure verify-as-canonical $serial
+
+    # ### ### ### ######### ######### #########
+    # Configuration ...
+    # * Standard entries
+    #   - user   = person running the application doing the formatting
+    #   - format = name of this format
+    #   - file   = name of the file the toc came from. Optional.
+    #   - map    = maps symbolic references to actual file path. Optional.
+
+    # //possible parameters to influence the output.
+    # //* symbolic mapping off/on
+
+    # Import the configuration and initialize the internal state
+
+    array set config $configuration
+    array set map    {}
+    if {[info exists config(map)]} {
+	array set map $config(map)
+    }
+
+    # ### ### ### ######### ######### #########
+
+    # Phase II. Generate the output, taking the configuration into
+    #           account.
+
+    # Unpack the serialization.
+    array set toc $serial
+    array set toc $toc(doctools::toc)
+    unset     toc(doctools::toc)
+
+    # FUTURE :: Create wiki package on top of the text generator,
+    #           providing encapsulated wiki commands.
+
+    text::begin
+    text::+ "**[Header]**"
+    text::newline
+
+    PrintDivision $toc(items) {   *} *
+
+    # Last formatting, joining the lines together.
+    return [text::done]
+}
+
+proc PrintDivision {items indent increment} {
+    upvar 1 map map
+    foreach element $items {
+	foreach {etype edata} $element break
+	array set toc $edata
+	switch -exact -- $etype {
+	    reference {
+		text::newline
+		text::+ "$indent [FormatReference] : $toc(desc)"
+	    }
+	    division {
+		if {[info exists toc(id)]} {
+		    text::newline
+		    text::+ "$indent [FormatReference]"
+		} else {
+		    text::newline
+		    text::+ "$indent $toc(label)"
+		}
+		PrintDivision $toc(items) $indent$increment $increment
+	    }
+	}
+	unset toc
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc FormatReference {} {
+    upvar 1 map map toc toc
+    return "\[[Map $toc(id)]%|%$toc(label)\]"
+}
+
+proc Header {} {
+    upvar 1 toc(label) label toc(title) title
+    if {($label ne {}) && ($title ne {})} {
+	return "$label -- $title"
+    } elseif {$label ne {}} {
+	return $label
+    } elseif {$title ne {}} {
+	return $title
+    }
+    return -code error {Reached the unreachable}
+}
+
+proc Map {id} {
+    upvar 1 map map
+    if {![info exists map($id)]} { return $id }
+    return $map($id)
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::toc::export::wiki 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/import.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/import.tcl
new file mode 100644
index 00000000..cd6c05b4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/import.tcl
@@ -0,0 +1,189 @@
+# import.tcl --
+#
+#	Importing indices into other formats.
+#
+# Copyright (c) 2009-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# Each object manages a set of plugins for the conversion of keyword
+# indices into some textual representation. I.e. this object manages
+# the conversion to specialized serializations of keyword indices.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+package require struct::map
+package require doctools::toc::structure
+package require fileutil::paths
+package require pluginmgr
+package require snit
+
+# ### ### ### ######### ######### #########
+## API
+
+snit::type ::doctools::toc::import {
+
+    # ### ### ### ######### ######### #########
+    ## Options :: None
+
+    # ### ### ### ######### ######### #########
+    ## Creation, destruction.
+
+    constructor {} {
+	install myconfig  using ::struct::map     ${selfns}::config
+	install myinclude using ::fileutil::paths ${selfns}::include
+	return
+    }
+
+    destructor {
+	$myconfig  destroy
+	$myinclude destroy
+	# Clear the cache of loaded import plugins.
+	foreach k [array names myplugin] {
+	    $myplugin($k) destroy
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Convert from other formats to the Tcl toc serialization
+
+    method {import object text} {obj text {format {}}} {
+	$obj deserialize [$self import text $text $format]
+	return
+    }
+
+    method {import object file} {obj path {format {}}} {
+	$obj deserialize [$self import file $path $format]
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method {import text} {text {format {}}} {
+	set plugin [$self GetPlugin $format]
+
+	set     configuration [$myconfig get]
+	lappend configuration user   $::tcl_platform(user)
+	lappend configuration format [$plugin plugin]
+
+	return [$plugin do import $text $configuration]
+    }
+
+    method {import file} {path {format {}}} {
+	# The plugin is not trusted to handle the file to convert.
+	return [$self import text [fileutil::cat $path] $format]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal methods
+
+    method GetPlugin {format} {
+	if {$format eq {}} { set format doctoc }
+
+	if {![info exists myplugin($format)]} {
+	    set plugin [pluginmgr ${selfns}::fmt-$format \
+			       -pattern doctools::toc::import::* \
+			       -api { import } \
+			       -setup [mymethod PluginSetup]]
+	    ::pluginmgr::paths $plugin doctools::toc::import
+	    $plugin load $format
+	    set myplugin($format) $plugin
+	} else {
+	    set plugin $myplugin($format)
+	}
+
+	return $plugin
+    }
+
+    method PluginSetup {mgr ip} {
+	# Inject a pseudo package into the plugin interpreter the
+	# import plugins can use to check that they were loaded into a
+	# proper environment.
+	$ip eval {package provide doctools::toc::import::plugin 1}
+
+	# The import plugins may use msgcat, which requires access to
+	# tcl_platform during its initialization, and won't have it by
+	# default. We trust them enough to hand out the information.
+	# TODO :: remove user/wordSize, etc. We need only 'os'.
+	$ip eval [list array set ::tcl_platform [array get ::tcl_platform]]
+
+	# Provide an alias-command a plugin can use to ask for any
+	# file, so that it can handle the processing of include files,
+	# should its format have that concept. Like doctoc. The alias
+	# will be directed to a method of ours and use the configured
+	# include paths to find the file, analogous to the GetFile
+	# procedure of doctools::toc::parse.
+
+	#8.5+: ::interp alias $ip include {} {*}[mymethod IncludeFile]
+	eval [linsert [mymethod IncludeFile] 0 ::interp alias $ip include {}]
+	return
+    }
+
+    method IncludeFile {currentfile path} {
+	# result = ok text fullpath error-code error-message
+
+	# Find the file, or not.
+	set fullpath [$self Locate $path]
+	if {$fullpath eq {}} {
+	    return [list 0 {} $path notfound {}]
+	}
+
+	# Read contents, or not.
+	if {[catch {
+	    set data [fileutil::cat $fullpath]
+	} msg]} {
+	    set error notread
+	    set emessage $msg
+	    return [list 0 {} $fullpath notread $msg]
+	}
+
+	return [list 1 $data $fullpath {} {}]
+    }
+
+    method Locate {path} {
+	upvar 1 currentfile currentfile
+
+	if {$currentfile ne {}} {
+	    set pathstosearch \
+		[linsert [$myinclude paths] 0 \
+		     [file dirname [file normalize $currentfile]]]
+	} else {
+	    set pathstosearch [$myinclude paths]
+	}
+
+	foreach base $pathstosearch {
+	    set try [file join $base $path]
+	    if {![file exists $try]} continue
+	    return $try
+	}
+	# Nothing found
+	return {}
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+
+    # Array serving as a cache for the various plugin managers holding
+    # a specific import plugin.
+
+    variable myplugin -array {}
+
+    # A component managing the configuration given to the import
+    # plugins when they are invoked.
+
+    component myconfig  -public config
+    component myinclude -public include
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::toc::import 0.2.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/import_doctoc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/import_doctoc.tcl
new file mode 100644
index 00000000..eff659b4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/import_doctoc.tcl
@@ -0,0 +1,91 @@
+# doctoc.tcl --
+#
+#	The doctoc import plugin. Bridge between import management and
+#	the parsing of doctoc markup.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: import_doctoc.tcl,v 1.3 2009/11/15 05:50:03 andreas_kupries Exp $
+
+# This package is a plugin for the the doctools::toc v2 system.  It
+# takes text in docidx format and produces the list serialization of a
+# table of contents.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::toc::import::plugin
+
+package require Tcl 8.4
+package require doctools::toc::import::plugin ; # The presence of this
+						# pseudo package
+						# indicates execution
+						# of this code inside
+						# of an interpreter
+						# which was properly
+						# initialized for use
+						# by import plugins.
+package require doctools::toc::parse          ; # The actual doctoc
+						# parser used by the
+						# plugin.
+
+# ### ### ### ######### ######### #########
+
+## We redefine the command 'doctools::toc::parse::GetFile' to use the
+## 'include' alias provided by the plugin manager, as reguar file
+## commands are not allowed in this 'safe' environment. However this
+## is done if and only if we truly are in the plugin environment. The
+## testsuite, for example, will leave out the definition of 'include',
+## signaling in this way that the regular file operations can still be
+## used.
+
+if {[llength [info commands include]]} {
+
+    # Note: We are poking directly into the implementation of the
+    #       class. Any changes to the interface here have to reviewed
+    #       for their impact on doctools::toc::parse, and possibly
+    #       ported over.
+
+    proc ::doctools::toc::parse::GetFile {currentfile path dv pv ev mv} {
+	upvar 1 $dv data $pv fullpath $ev error $mv emessage
+	foreach {ok data fullpath error emessage} [include $currentfile $path] break
+	return $ok
+    }
+}
+
+# ### ### ### ######### ######### #########
+## API :: Convert text to canonical toc serialization.
+
+proc import {text configuration} {
+    global errorInfo errorCode
+
+    doctools::toc::parse var load $configuration
+
+    # Could be done better using a try/finally
+    set code [catch {
+	doctools::toc::parse text $text
+    } serial]
+
+    # Save error state if there was any.
+    set ei $errorInfo
+    set ec $errorCode
+
+    # Cleanup parser configuration, regardless of errors or not.
+    doctools::toc::parse var unset *
+
+    # Rethrow any error, using the captured state.
+    if {$code} {
+	return -code $code -errorinfo $ei -errorcode $ec $serial
+    }
+
+    return $serial
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::toc::import::doctoc 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/import_json.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/import_json.tcl
new file mode 100644
index 00000000..201bd9b1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/import_json.tcl
@@ -0,0 +1,77 @@
+# json.tcl --
+#
+#	The json import plugin. Bridge between import management and
+#	the parsing of json markup.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: import_json.tcl,v 1.3 2009/11/15 05:50:03 andreas_kupries Exp $
+
+# This package is a plugin for the the doctools::toc v2 system.  It
+# takes text in json format and produces the list serialization of a
+# table of contents.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: doctools::toc::import::plugin
+
+package require Tcl 8.4
+package require doctools::toc::import::plugin ; # The presence of this
+						# pseudo package
+						# indicates execution
+						# of this code inside
+						# of an interpreter
+						# which was properly
+						# initialized for use
+						# by import plugins.
+package require doctools::toc::structure      ; # Verification of the json
+					        # parse result as a
+					        # proper toc
+					        # serialization.
+
+if {[package vcompare [package present Tcl] 8.5] < 0} {
+    if {[catch {
+	package require dict
+    }]} {
+	# Create a pure Tcl implementation of the dict methods
+	# required by json, and fake the presence of the dict package.
+	proc dict {cmd args} { return [uplevel 1 [linsert $args 0 dict/$cmd]] }
+	proc dict/create {} { return {} }
+	proc dict/set {var key val} {
+	    upvar 1 $var a
+	    array set x $a
+	    set x($key) $val
+	    set a [array get x]
+	    return
+	}
+	package provide dict 1
+    }
+}
+
+package require json ; # The actual json parser used by the plugin.
+# Requires 8.5, or 8.4+dict.
+
+# ### ### ### ######### ######### #########
+
+# ### ### ### ######### ######### #########
+## API :: Convert text to canonical toc serialization.
+
+proc import {text configuration} {
+    # Note: We cannot fail here on duplicate keys in the input,
+    # especially for keywords and references, as we do for Tcl-based
+    # canonical toc serializations, because our underlying JSON parser
+    # automatically merges them, by taking only the last found
+    # definition. I.e. of two or more definitions for a key X the last
+    # overwrites all previous occurrences.
+    return [doctools::toc::structure canonicalize [json::json2dict $text]]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide doctools::toc::import::json 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/msgcat_c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/msgcat_c.tcl
new file mode 100644
index 00000000..31a8e54a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/msgcat_c.tcl
@@ -0,0 +1,28 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+mcset c  doctoc/char/syntax             {Bad character in string}
+mcset c  doctoc/cmd/illegal		{Illegal command "%1$s", not a doctoc command}       ; # Details: cmdname
+mcset c  doctoc/cmd/nested		{Illegal use of "%1$s" as argument of other command} ; # Details: cmdname
+mcset c  doctoc/cmd/toomanyargs		{Too many args for "%1$s", at most %2$d allowed}     ; # Details: cmdname, max#args
+mcset c  doctoc/cmd/wrongargs		{Wrong#args for "%1$s", need at least %2$d}          ; # Details: cmdname, min#args
+mcset c  doctoc/eof/syntax              {Bad <eof>}
+mcset c  doctoc/include/path/notfound	{Include file "%1$s" not found}                      ; # Details: file name
+mcset c  doctoc/include/read-failed	{Unable to read include file "%1$s", %2$s}           ; # Details: file name and error msg
+mcset c  doctoc/include/syntax		{Errors in include file "%1$s"}
+mcset c  doctoc/plaintext		{Plain text beyond whitespace is not allowed}
+mcset c  doctoc/vset/varname/unknown	{Unknown variable "%1$s"}                            ; # Details: variable name
+
+mcset c  doctoc/division_end/missing	{Expected [division_end], not found}
+mcset c  doctoc/division_end/syntax	{Unexpected [division_end], not allowed here}
+mcset c  doctoc/division_start/syntax	{Expected [division_start], not found}
+mcset c  doctoc/item/syntax		{Unexpected [item], not allowed here}
+mcset c  doctoc/toc_begin/missing	{Expected [toc_begin], not found}
+mcset c  doctoc/toc_begin/syntax	{Unexpected [toc_begin], not allowed here}
+mcset c  doctoc/toc_end/missing		{Expected [toc_end], not found}
+mcset c  doctoc/toc_end/syntax		{Unexpected [toc_end], not allowed here}
+
+mcset c  doctoc/redef                   {Bad reuse of label "%1$s"}
+
+package provide doctools::msgcat::toc::c 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/msgcat_de.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/msgcat_de.tcl
new file mode 100644
index 00000000..23ef4a21
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/msgcat_de.tcl
@@ -0,0 +1,28 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+mcset de doctoc/char/syntax             {Unerwartetes Zeichen im String}
+mcset de doctoc/cmd/illegal		{Illegaler Befehl "%1$s", ist kein doctoc Befehl}                 ; # Details: cmdname
+mcset de doctoc/cmd/nested		{Illegale Nutzung von "%1$s" als Argument eines anderen Befehles} ; # Details: cmdname
+mcset de doctoc/cmd/toomanyargs		{Zu viele Argumente fuer "%1$s", hoechstens %2$d moeglich}        ; # Details: cmdname, max#args
+mcset de doctoc/cmd/wrongargs		{Zu wenig Argumente fuer "%1$s", mindestens %2$d notwendig}       ; # Details: cmdname, min#args
+mcset de doctoc/eof/syntax              {Unerwartetes Ende der Datei}
+mcset de doctoc/include/path/notfound	{Include-Datei "%1$s" nicht gefunden}                             ; # Details: file name
+mcset de doctoc/include/read-failed	{Konnte Include-Datei "%1$s" nicht lesen: %2$s}                   ; # Details: file name and error msg
+mcset de doctoc/include/syntax		{Fehler in der Include-Datei "%1$s"}
+mcset de doctoc/plaintext		{Normaler Text ist (mit Ausnahme von reinem Leerraum) nicht erlaubt}
+mcset de doctoc/vset/varname/unknown	{Unbekannte Variable "%1$s"}                                      ; # Details: variable name
+
+mcset de doctoc/division_end/missing	{Erwarteter Befehl [division_end] nicht vorhanden}
+mcset de doctoc/division_end/syntax	{[division_end] ist hier nicht erlaubt}
+mcset de doctoc/division_start/syntax	{Erwarteter Befehl [division_start] nicht vorhanden}
+mcset de doctoc/item/syntax		{[item] ist hier nicht erlaubt}
+mcset de doctoc/toc_begin/missing	{Erwarteter Befehl [toc_begin] nicht vorhanden}
+mcset de doctoc/toc_begin/syntax	{[toc_begin] ist hier nicht erlaubt}
+mcset de doctoc/toc_end/missing		{Erwarteter Befehl [toc_end] nicht vorhanden}
+mcset de doctoc/toc_end/syntax		{[toc_end] ist hier nicht erlaubt}
+
+mcset de doctoc/redef                   {Fehlerhafte Wiederverwendung des Labels "%1$s"}
+
+package provide doctools::msgcat::toc::de 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/msgcat_en.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/msgcat_en.tcl
new file mode 100644
index 00000000..f996281f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/msgcat_en.tcl
@@ -0,0 +1,28 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+mcset en doctoc/char/syntax             {Bad character in string}
+mcset en doctoc/cmd/illegal		{Illegal command "%1$s", not a doctoc command}       ; # Details: cmdname
+mcset en doctoc/cmd/nested		{Illegal use of "%1$s" as argument of other command} ; # Details: cmdname
+mcset en doctoc/cmd/toomanyargs		{Too many args for "%1$s", at most %2$d allowed}     ; # Details: cmdname, max#args
+mcset en doctoc/cmd/wrongargs		{Wrong#args for "%1$s", need at least %2$d}          ; # Details: cmdname, min#args
+mcset en doctoc/eof/syntax              {Bad <eof>}
+mcset en doctoc/include/path/notfound	{Include file "%1$s" not found}                      ; # Details: file name
+mcset en doctoc/include/read-failed	{Unable to read include file "%1$s", %2$s}           ; # Details: file name and error msg
+mcset en doctoc/include/syntax		{Errors in include file "%1$s"}
+mcset en doctoc/plaintext		{Plain text beyond whitespace is not allowed}
+mcset en doctoc/vset/varname/unknown	{Unknown variable "%1$s"}                            ; # Details: variable name
+
+mcset en doctoc/division_end/missing	{Expected [division_end], not found}
+mcset en doctoc/division_end/syntax	{Unexpected [division_end], not allowed here}
+mcset en doctoc/division_start/syntax	{Expected [division_start], not found}
+mcset en doctoc/item/syntax		{Unexpected [item], not allowed here}
+mcset en doctoc/toc_begin/missing	{Expected [toc_begin], not found}
+mcset en doctoc/toc_begin/syntax	{Unexpected [toc_begin], not allowed here}
+mcset en doctoc/toc_end/missing		{Expected [toc_end], not found}
+mcset en doctoc/toc_end/syntax		{Unexpected [toc_end], not allowed here}
+
+mcset en doctoc/redef                   {Bad reuse of label "%1$s"}
+
+package provide doctools::msgcat::toc::en 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/msgcat_fr.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/msgcat_fr.tcl
new file mode 100644
index 00000000..7317aae5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/msgcat_fr.tcl
@@ -0,0 +1,31 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+# The texts are in english because I have do not have enough knowledge
+# of french to make the translation.
+
+mcset fr doctoc/char/syntax             {Bad character in string}
+mcset fr doctoc/cmd/illegal		{Illegal command "%1$s", not a doctoc command}       ; # Details: cmdname
+mcset fr doctoc/cmd/nested		{Illegal use of "%1$s" as argument of other command} ; # Details: cmdname
+mcset fr doctoc/cmd/toomanyargs		{Too many args for "%1$s", at most %2$d allowed}     ; # Details: cmdname, max#args
+mcset fr doctoc/cmd/wrongargs		{Wrong#args for "%1$s", need at least %2$d}          ; # Details: cmdname, min#args
+mcset fr doctoc/eof/syntax              {Bad <eof>}
+mcset fr doctoc/include/path/notfound	{Include file "%1$s" not found}                      ; # Details: file name
+mcset fr doctoc/include/read-failed	{Unable to read include file "%1$s", %2$s}           ; # Details: file name and error msg
+mcset fr doctoc/include/syntax		{Errors in include file "%1$s"}
+mcset fr doctoc/plaintext		{Plain text beyond whitespace is not allowed}
+mcset fr doctoc/vset/varname/unknown	{Unknown variable "%1$s"}                            ; # Details: variable name
+
+mcset fr doctoc/division_end/missing	{Expected [division_end], not found}
+mcset fr doctoc/division_end/syntax	{Unexpected [division_end], not allowed here}
+mcset fr doctoc/division_start/syntax	{Expected [division_start], not found}
+mcset fr doctoc/item/syntax		{Unexpected [item], not allowed here}
+mcset fr doctoc/toc_begin/missing	{Expected [toc_begin], not found}
+mcset fr doctoc/toc_begin/syntax	{Unexpected [toc_begin], not allowed here}
+mcset fr doctoc/toc_end/missing		{Expected [toc_end], not found}
+mcset fr doctoc/toc_end/syntax		{Unexpected [toc_end], not allowed here}
+
+mcset fr doctoc/redef                   {Bad reuse of label "%1$s"}
+
+package provide doctools::msgcat::toc::fr 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/parse.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/parse.tcl
new file mode 100644
index 00000000..84309038
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/parse.tcl
@@ -0,0 +1,1058 @@
+# -*- tcl -*-
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Parser for doctoc formatted input. The result is a struct::tree
+# repesenting the contents of the document in a structured form.
+
+# - root = table, attributes for title and label.
+# - children of the root  = if any, elements of the table, references and divisions.
+# - children of divisions = if any, elements of the division, references and divisions.
+#
+# The order of the elements under root, and of the elements under
+# their division reflects the order of the information in the parsed
+# document.
+
+# Attributes in the nodes, except root provide location information,
+# i.e. referring from there in the input the information is coming from
+# (human-readable output: line/col for end of token, offset start/end
+# for range covered by token.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.4                  ; # Required runtime.
+package require doctools::toc::structure ; # Parse Tcl script, like subst.
+package require doctools::msgcat         ; # Error message L10N
+package require doctools::tcl::parse     ; # Parse Tcl script, like subst.
+package require fileutil                 ; # Easy loading of files.
+package require logger                   ; # User feedback.
+package require snit                     ; # OO system.
+package require struct::list             ; # Assign
+package require struct::tree             ; # Internal syntax tree
+
+# # ## ### ##### ######## ############# #####################
+##
+
+logger::initNamespace ::doctools::toc::parse
+snit::type            ::doctools::toc::parse {
+    # # ## ### ##### ######## #############
+    ## Public API
+
+    typemethod file {path} {
+	log::debug [list $type file]
+	return [$type text [fileutil::cat $path] $path]
+    }
+
+    typemethod text {text {path {}}} {
+	log::debug [list $type text]
+
+	set ourfile $path
+
+	array set vars [array get ourvars]
+	array set _file {}
+	ClearErrors
+
+	set t [struct::tree AST]
+
+	Process $t $text [$t rootname] vars _file
+	StopOnErrors
+
+	ReshapeTree $t
+	StopOnErrors
+
+	set serial [Serialize $t]
+	StopOnErrors
+
+	$t destroy
+	return $serial
+    }
+
+    # # ## ### ##### ######## #############
+    ## Manage symbol table (vset variables).
+
+    typemethod vars {} {
+	return [array get ourvars]
+    }
+
+    typemethod {var set} {name value} {
+	set ourvars($name) $value
+	return
+    }
+
+    typemethod {var load} {dict} {
+	array set ourvars $dict
+	return
+    }
+
+    typemethod {var unset} {args} {
+	if {![llength $args]} { lappend args * }
+	foreach pattern $args {
+	    array unset ourvars $pattern
+	}
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Manage search paths for include files.
+
+    typemethod includes {} {
+	return $ourincpaths
+    }
+
+    typemethod {include set} {paths} {
+	set ourincpaths [lsort -uniq $paths]
+	return
+    }
+
+    typemethod {include add} {path} {
+	lappend ourincpaths $path
+	set     ourincpaths [lsort -uniq $ourincpaths]
+	return
+    }
+
+    typemethod {include remove} {path} {
+	set pos [lsearch $ourincpaths $path]
+	if {$pos < 0} return
+	set  ourincpaths [lreplace $ourincpaths $pos $pos]
+	return
+    }
+
+    typemethod {include clear} {} {
+	set ourincpaths {}
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    proc Process {t text root vv fv} {
+	upvar 1 $vv vars $fv _file
+
+	DropChildren $t $root
+
+	# Phase 1. Generate the basic syntax tree
+
+	if {[catch {
+	    doctools::tcl::parse text $t $text $root
+	} msg]} {
+	    if {![string match {doctools::tcl::parse *} $::errorCode]} {
+		# Not a parse error, rethrow.
+		return \
+		    -code      error \
+		    -errorcode $::errorCode \
+		    -errorinfo $::errorInfo \
+		    $msg
+	    }
+
+	    # Parse error, low-level syntax breakdown, extract the
+	    # machine-info from the errorCode, and report internally.
+	    # See the documentation of doctools::tcl::parse for the
+	    # definition of the format.
+	    struct::list assign $::errorCode _ msg pos line col
+	    # msg in {eof, char}
+	    ReportAt $_file($root) [list $pos $pos] $line $col doctoc/$msg/syntax {}
+	    return 0
+	}
+
+	#doctools::parse::tcl::ShowTreeX $t {Raw Result}
+
+	# Phase 2. Check for errors.
+
+	CheckBasicConstraints  $t $root      _file
+	ResolveVarsAndIncludes $t $root vars _file
+	return 1
+    }
+
+    proc CheckBasicConstraints {t root fv} {
+	::variable ourfile
+	upvar 1 $fv _file
+
+	# Bottom-up walk through the nodes starting at the current
+	# root.
+
+	$t walk $root -type dfs -order pre n {
+	    # Ignore the root node itself. Except for one thing: The
+	    # path information is remembered for the root as well.
+
+	    set _file($n) $ourfile
+	    #puts "_file($n) = $ourfile"
+	    if {$n eq $root} continue
+
+	    switch -exact [$t get $n type] {
+		Text {
+		    # Texts at the top level are irrelevant and
+		    # removed. They have to contain only whitespace as
+		    # well.
+		    if {[$t depth $n] == 1} {
+			if {[regexp {[^[:blank:]\n]} [$t get $n text]]} {
+			    Error $t $n doctoc/plaintext
+			}
+			MarkDrop $n
+		    }
+		}
+		Word {
+		    # Word nodes we ignore. They are just argument
+		    # aggregators. They will be gone later, when
+		    # reduce arguments to their text form.
+		}
+		Command {
+		    set cmdname [$t get $n text]
+		    set parens  [$t parent $n]
+
+		    if {$parens eq $root} {
+			set parentt {}
+		    } else {
+			set parentt [$t get $parens type]
+		    }
+		    set nested 0
+
+		    if {($parentt eq "Command") || ($parentt eq "Word")} {
+			# Commands can be children/arguments of other
+			# commands only in very restricted
+			# circumstances => rb, lb, vset/1.
+			set nested 1
+			if {![Nestable $t $n $cmdname errcmdname] && [Legal $cmdname]} {
+			    # Report only legal un-nestable commands.
+			    # Illegal commands get their own report,
+			    # see below.
+			    MakeErrorMsg $t $n doctoc/cmd/nested $errcmdname
+			}
+		    }
+
+		    if {![Legal $cmdname]} {
+			# Deletion is safe because we are walking
+			# bottom up. If nested we drop only the
+			# children and replace this node with a fake.
+			if {$nested} {
+			    MakeErrorMsg $t $n doctoc/cmd/illegal $cmdname
+			} else {
+			    Error $t $n doctoc/cmd/illegal $cmdname
+			    MarkDrop $n
+			}
+
+			continue
+		    }
+
+		    # Check arguments of the legal commands only.
+		    ArgInfo $cmdname min max
+		    set argc [llength [$t children $n]]
+
+		    if {$argc < $min} {
+			MakeErrorMsg $t $n doctoc/cmd/wrongargs $cmdname $min
+		    } elseif {$argc > $max} {
+			MakeErrorMsg $t $n doctoc/cmd/toomanyargs $cmdname $max
+		    }
+
+		    # Convert the quoting commands for bracket into
+		    # equivalent text nodes, and remove comments.
+		    if {$cmdname eq "lb"} {
+			MakeText $t $n "\["
+		    } elseif {$cmdname eq "rb"} {
+			MakeText $t $n "\]"
+		    } elseif {$cmdname eq "comment"} {
+			# Remove comments or replace with error node (nested).
+			if {$nested} {
+			    MakeError $t $n
+			} else {
+			    MarkDrop $n
+			}
+		    }
+		}
+	    }
+	}
+
+	# Kill the nodes marked for removal now that the walker is not
+	# accessing them any longer.
+	PerformDrop $t
+
+	#doctools::parse::tcl::ShowTreeX $t {Basic Constraints}
+	return
+    }
+
+    proc ResolveVarsAndIncludes {t root vv fv} {
+	upvar 1 $vv vars $fv _file
+
+	# Now resolve include and vset uses ... This has to be done at
+	# the same time, as each include may (re)define variables.
+
+	# Bottom-up walk. Children before parent, and from the left =>
+	# Nested vset uses are resolved in the proper order.
+
+	$t walk $root -type dfs -order post n {
+	    # Ignore the root node itself.
+	    if {$n eq $root} continue
+
+	    set ntype [$t get $n type]
+
+	    switch -exact -- $ntype {
+		Text - Error {
+		    # Ignore these nodes.
+		}
+		Word {
+		    # Children have to be fully converted to Text, or,
+		    # in case of trouble, Error. Aggregate the
+		    # information.
+		    CollapseWord $t $n
+		}
+		Command {
+		    set cmdname [$t get $n text]
+
+		    switch -exact -- $cmdname {
+			vset {
+			    set argv [$t children $n]
+			    switch -exact -- [llength $argv] {
+				1 {
+				    VariableUse $t $n [lindex $argv 0]
+				}
+				2 {
+				    struct::list assign $argv var val
+				    VariableDefine $t $n $var $val
+				}
+			    }
+			    # vset commands at the structural toplevel are
+			    # irrelevant and removed.
+			    if {[$t depth $n] == 1} {
+				MarkDrop $n
+			    }
+			}
+			include {
+			    # Pulls vars, _file from this scope
+			    ProcessInclude $t $n [lindex [$t children $n] 0]
+			}
+			default {
+			    # For all other commands move the argument
+			    # information into an attribute. Errors in
+			    # the argument cause the command to conert
+			    # into an error.
+			    CollapseArguments $t $n
+			}
+		    }
+		}
+	    }
+	}
+
+	# Kill the nodes marked for removal now that the walker is
+	# not accessing them any longer.
+	PerformDrop $t
+
+	#doctools::parse::tcl::ShowTreeX $t {Vars/Includes Resolved}
+	return
+    }
+
+    proc ReshapeTree {t} {
+	upvar 1 _file _file
+
+	# We are assuming that there are no illegal commands in the
+	# tree, and further that all of lb, rb, vset, comment, and
+	# include are gone as well, per the operation of the previous
+	# phases (-> CheckBasicConstraints, ResolveVarsAndIncludes).
+	# The only commands which can occur here are
+	#
+	#     toc_begin, toc_end, division_start, division_end, item
+
+	# Grammar:
+	#     TOC   := toc_begin ITEMS toc_end
+	#     ITEMS := { item | DIV }
+	#     DIV   := division_start ITEMS division_end
+
+	# Hand coded LL(1) parser with explicit stack and state
+	# machine.
+
+	set root     [$t rootname]
+	set children [$t children $root]
+	lappend children $root
+
+	$t set $root text <EOF>
+	$t set $root range {0 0}
+	$t set $root line  1
+	$t set $root col   0
+
+	set st    [struct::stack %AUTO%]
+	set at    {}
+	set state TOC
+
+	foreach n $children {
+	    #puts ____[$t get $n text]($n)
+
+	    set cmdname [$t get $n text]
+	    #puts <$n>|$cmdname|$state|
+
+	    # We store the location of the last node in the root, for
+	    # use when an unexpected eof triggers an error.
+	    if {$n ne $root} {
+		$t set $root range [$t get $n range]
+		$t set $root line  [$t get $n line]
+		$t set $root col   [$t get $n col]
+	    }
+
+	    # LL(1) parser table. State/Nexttoken determine action and
+	    # next state.
+	    switch -exact -- [list $state $cmdname] {
+		{TOC toc_begin} {
+		    # Pull arguments of the proper toc_begin up into
+		    # the root. Drop the expected node.
+		    $t set $root argv [$t get $n argv]
+		    $t delete $n
+		    #puts \t/drop/$n
+		    # Starting series of toplevel items and divisions.
+		    # Destination for movement is root, and we remember
+		    # the state.
+		    $st push $at
+		    $st push $state
+		    set at    $root
+		    #puts \t/p=$at
+		    set state ITEMS
+		}
+		{ITEMS item} {
+		    # Move item to proper parent. Nothing needed to be
+		    # done for the toplevel items.
+		}
+		{ITEMS division_start} -
+		{DIV division_start} {
+		    # Sub division begins, toplevel or deeper. Mark it
+		    # as new movement destination, and remember the
+		    # state. Also, do not forget to move it as well.
+		    if {$at ne $root} {
+			$t move $at end $n
+			#puts \t/moveto/$at
+		    }
+		    $st push $at
+		    $st push $state
+		    set at $n
+		    #puts \t/p=$at
+		    set state DIV
+		}
+		{ITEMS toc_end} {
+		    # End of the document reached, with proper closing
+		    # of sub divisions and all. Drop the node, and go
+		    # to end state
+		    set state EOF
+		    $t delete $n
+		    #puts \t/drop/$n
+		}
+		{DIV item} {
+		    # Move item to proper parent.
+		    $t move $at end $n
+		    #puts \t/moveto/$at
+		}
+		{DIV division_end} {
+		    # Drop the node, pop the state and restore the
+		    # previous state/destination.
+		    $t delete $n
+		    #puts \t/drop/$n
+		    set state [$st pop]
+		    set at    [$st pop]
+		    #puts \t/p=$at
+		}
+		{EOF <EOF>} {
+		    # Good, really reached the end. Nothing to be
+		    # done.
+		}
+		{TOC division_end} -
+		{TOC division_start} -
+		{TOC item} -
+		{TOC toc_end} {
+		    Error $t $n doctoc/toc_begin/missing
+		    $t delete $n
+		    #puts \t/drop/$n
+		}
+		{EOF division_start} -
+		{ITEMS division_end} -
+		{EOF division_end} -
+		{EOF item} -
+		{ITEMS toc_begin} -
+		{EOF toc_begin} -
+		{DIV toc_begin} -
+		{EOF toc_end} -
+		{DIV toc_end} {
+		    # TODO ?! Split this, and add message which command was expected.
+		    # Unexpected and wrong. The node is dropped.
+		    Error $t $n doctoc/$cmdname/syntax
+		    $t delete $n
+		    #puts \t/drop/$n
+		}
+		{TOC <EOF>} {
+		    Error $t $n doctoc/toc_begin/missing
+		}
+		{ITEMS <EOF>} {
+		    Error $t $n doctoc/toc_end/missing
+		}
+		{DIV <EOF>} {
+		    Error $t $n doctoc/division_end/missing
+		}
+	    }
+	}
+
+	$st destroy
+
+	$t unset $root text
+	$t unset $root range
+	$t unset $root line
+	$t unset $root col
+
+	#doctools::parse::tcl::ShowTreeX $t Shaped/Structure
+	return
+    }
+
+    proc Serialize {t} {
+	upvar 1 _file _file
+	# We assume here that the tree is already in the correct
+	# shape/structure, i.e. root, children for references and
+	# divisions, with divisions possibly having children and well.
+
+	# We now extract the basic information about the table from
+	# the tree, do some higher level checking on the elements and
+	# return the serialization of the table generated from the
+	# extracted data.
+
+	set error 0
+	set root [$t rootname]
+
+	# Root delivers toc label and title.
+	struct::list assign [$t get $root argv] label title
+
+	set prefix ....
+	set items [GetDivision $t $root error]
+
+	if {$error} return
+	# Caller will handle the errors.
+
+	## ### ### ### ######### ######### #########
+	## The part below is identical to the serialization backend of
+	## command 'doctools::toc::structure merge'.
+
+	# Now construct the result, from the inside out, with proper
+	# sorting at all levels.
+
+	set serial [list doctools::toc \
+			[list \
+			     items      $items \
+			     label      $label \
+			     title      $title]]
+
+	# Caller verify, ensure contract
+	#::doctools::toc::structure verify-as-canonical $serial
+	return $serial
+    }
+
+    proc GetDivision {t root ev} {
+	upvar 1 $ev error _file _file
+	array set l {} ; # Label counters
+	set items {}
+
+	# Each element in the tree
+	foreach element [$t children $root] {
+	    switch -exact -- [$t get $element text] {
+		item {
+		    struct::list assign [$t get $element argv] file label desc
+		    lappend items [list reference [list \
+						       desc  $desc \
+						       id    $file \
+						       label $label]]
+		    lappend l($label) .
+		}
+		division_start {
+		    struct::list assign [$t get $element argv] label file
+		    set subitems [GetDivision $t $element error]
+		    if {$error} return
+		    set res {}
+		    if {$file ne {}} {
+			lappend res id $file
+		    }
+		    lappend res \
+			items $subitems \
+			label $label
+		    lappend items [list division $res]
+		    lappend l($label) .
+		}
+	    }
+	    if {[llength $l($label)] > 1} {
+		MakeErrorMsg $t $element doctoc/redef $label
+		set error 1
+		return
+	    }
+	}
+	return $items
+    }
+
+    # # ## ### ##### ######## #############
+
+    proc CollapseArguments {t n} {
+	#puts __CA($n)
+
+	set ok 1
+	set argv {}
+	foreach ch [$t children $n] {
+	    lappend argv [$t get $ch text]
+	    if {[$t get $ch type] eq "Error"} {
+		set ok 0
+		break
+	    }
+	}
+	if {$ok} {
+	    $t set $n argv $argv
+	    DropChildren $t $n
+	} else {
+	    MakeError $t $n
+	}
+	return
+    }
+
+    proc CollapseWord {t n} {
+	#puts __CW($n)
+
+	set ok 1
+	set text {}
+	foreach ch [$t children $n] {
+	    append text [$t get $ch text]
+	    if {[$t get $ch type] eq "Error"} {
+		set ok 0
+		break
+	    }
+	}
+	if {$ok} {
+	    MakeText $t $n $text
+	} else {
+	    MakeError $t $n
+	}
+	return
+    }
+
+    proc VariableUse {t n var} {
+	upvar 1 vars vars _file _file
+
+	# vset/1 - the command returns text information to the
+	# caller. Extract the argument data.
+
+	set vartype [$t get $var type]
+	set varname [$t get $var text]
+
+	# Remove the now superfluous argument nodes.
+	DropChildren $t $n
+
+	if {$vartype eq "Error"} {
+	    # First we check if the command is in trouble because it
+	    # has a bogus argument. If so we convert it into an error
+	    # node to signal even higher commands, and ignore it. We
+	    # do not report an error, as the actual problem was
+	    # reported already.
+
+	    MakeError $t $n
+	} elseif {![info exists vars($varname)]} {
+	    # Secondly we check if the referenced variable is
+	    # known. If not it is trouble, and we report it.
+
+	    MakeErrorMsg $t $n doctoc/vset/varname/unknown $varname
+	} elseif {[$t depth $n] == 1} {
+	    # Commands at the structural toplevel are irrelevant and
+	    # removed (see caller). They have to checked again however
+	    # to see if the use introduced non-whitespace where it
+	    # should not be.
+
+	    if {[regexp {[^[:blank:]\n]} $vars($varname)]} {
+		Error $t $n doctoc/plaintext
+	    }
+	} else {
+	    MakeText $t $n $vars($varname)
+	}
+    }
+
+    proc VariableDefine {t n var val} {
+	upvar 1 vars vars
+
+	# vset/2 - the command links a variable to a value. Extract
+	# the argument data.
+
+	set vartype [$t get $var type]
+	set valtype [$t get $val type]
+	set varname [$t get $var text]
+	set value   [$t get $val text]
+
+	# Remove the now superfluous argument nodes.
+	DropChildren $t $n
+
+	if {($vartype eq "Error") || ($valtype eq "Error")} {
+	    # First we check if the command is in trouble because it
+	    # has one or more bogus arguments. If so we convert it
+	    # into an error node to signal even higher commands, and
+	    # ignore it. We do not report an error, as the actual
+	    # problem was reported already.
+
+	    MakeError $t $n
+	    return
+	}
+
+	# And save the change to the symbol table we are lugging
+	# around during the processing.
+
+	set vars($varname) $value
+	return
+    }
+
+    proc ProcessInclude {t n path} {
+	upvar 1 vars vars _file _file
+	::variable ourfile
+
+	# include - the command returns file content and inserts it in
+	# the place of the command.  First extract the argument data
+
+	set pathtype [$t get $path type]
+	set pathname [$t get $path text]
+
+	# Remove the now superfluous argument nodes.
+	DropChildren $t $n
+
+	# Check for problems stemming from other trouble.
+	if {$pathtype eq "Error"} {
+	    # First we check if the command is in trouble because it
+	    # has a bogus argument. If so convert it into an error
+	    # node to signal even higher commands, and ignore it. We
+	    # do not report an error, as the actual problem was
+	    # reported already.
+
+	    MakeError $t $n
+	    return
+	}
+
+	if {![GetFile $ourfile $pathname text fullpath error emsg]} {
+	    switch -exact -- $error {
+		notfound { Error $t $n doctoc/include/path/notfound $pathname       }
+		notread  { Error $t $n doctoc/include/read-failed   $fullpath $emsg }
+	    }
+	    MarkDrop $n
+	    return
+	}
+
+	# Parse the file. This also resolves variables further.
+
+	set currenterrors [GetErrors]
+	set currentpath $ourfile
+	ClearErrors
+
+	# WIBNI :: Remember the path as relative to the current path.
+	set ourfile $fullpath
+	if {![Process $t $text $n vars _file]} {
+
+	    set newerrors [GetErrors]
+	    SetErrors $currenterrors
+	    set ourfile $currentpath
+	    Error $t $n doctoc/include/syntax $fullpath $newerrors
+	    MarkDrop $n
+	    return
+	}
+
+	if {![$t numchildren $n]} {
+	    # Inclusion did not generate additional content, we can
+	    # ignore the command completely.
+	    MarkDrop $n
+	    return
+	}
+
+	# Create marker nodes which show the file entry/exit
+	# transitions. Disabled, makes shaping tree structure too
+	# complex. And checking the syntax as well, if we wish to have
+	# only proper complete structures in an include file. Need
+	# proper LR parser for that (is not LL(1)), or maybe even
+	# something like earley-aycock for full handling of an
+	# ambigous grammar.
+	if 0 {
+	    set fstart [$t insert $n 0]
+	    set fstop  [$t insert $n end]
+
+	    $t set $fstart type Command
+	    $t set $fstop  type Command
+
+	    $t set $fstart text include_begin
+	    $t set $fstop  text include_end
+
+	    $t set $fstart path $fullpath
+	    $t set $fstop  path $fullpath
+	}
+	# Remove the include command itself, merging its children
+	# into the place it occupied in its parent.
+	$t cut $n
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    ## Note: The import plugin for doctoc rewrites the 'GetFile'
+    ##       command below to make use of an alias provided by the
+    ##       plugin manager. This re-enables the ability of this class
+    ##       to handle include files which would otherwise be gone due
+    ##       to the necessary file operations (exists, isfile,
+    ##       readable, open, read) be disallowed by the safe
+    ##       environment the plugin operates in.
+    ##
+    ## Any changes to GetFile have to reviewed for their impact on
+    ## doctools::toc::import::doctoc, and possibly ported over.
+
+    proc GetFile {currentfile path dv pv ev mv} {
+	upvar 1 $dv data $pv fullpath $ev error $mv emessage
+	set data     {}
+	set error    {}
+	set emessage {}
+
+	# Find the file, or not.
+	set fullpath [Locate $path]
+	if {$fullpath eq {}} {
+	    set fullpath $path
+	    set error notfound
+	    return 0
+	}
+
+	# Read contents, or not.
+	if {[catch {
+	    set data [fileutil::cat $fullpath]
+	} msg]} {
+	    set error notread
+	    set emessage $msg
+	    return 0
+	}
+
+	return 1
+    }
+
+    proc Locate {path} {
+	upvar 1 currentfile currentfile
+
+	if {$currentfile ne {}} {
+	    set pathstosearch \
+		[linsert $ourincpaths 0 \
+		     [file dirname [file normalize $currentfile]]]
+	} else {
+	    set pathstosearch $ourincpaths
+	}
+
+	foreach base $pathstosearch {
+	    set try [file join $base $path]
+	    if {![file exists $try]} continue
+	    return $try
+	}
+	# Nothing found
+	return {}
+    }
+
+    # # ## ### ##### ######## #############
+    ## Management of nodes to kill
+
+    proc MarkDrop {n} {
+	::variable ourtokill
+	lappend ourtokill $n
+	#puts %%mark4kill=$n|[info level -1]
+	return
+    }
+
+    proc DropChildren {t n} {
+	foreach child [$t children $n] {
+	    MarkDrop $child
+	}
+	return
+    }
+
+    proc PerformDrop {t} {
+	::variable ourtokill
+	#puts __PD($t)=<[join $ourtokill ,]>
+	foreach n $ourtokill {
+	    #puts x($n/[$t exists $n])
+	    if {![$t exists $n]} continue
+	    #puts ^^DEL($n)
+	    $t delete $n
+	}
+	set ourtokill {}
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Command predicates
+
+    proc Nestable {t n cmdname cv} {
+	upvar 1 $cv outname
+	set outname $cmdname
+	switch -exact -- $cmdname {
+	    lb - rb { return 1 }
+	    vset {
+		if {[$t numchildren $n] == 1} {
+		    return 1
+		}
+		append outname /2
+	    }
+	}
+	return 0
+    }
+
+    proc Legal {cmdname} {
+	::variable ourcmds
+	#parray ourcmds
+	return [info exists ourcmds($cmdname)]
+    }
+
+    proc ArgInfo {cmdname minv maxv} {
+	::variable ourcmds
+	upvar 1 $minv min $maxv max
+	foreach {min max} $ourcmds($cmdname) break
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Higher level error handling, node conversion.
+
+    proc MakeError {t n} {
+	#puts %%error=$n|[info level -1]
+	$t set $n type Error
+	DropChildren $t $n
+	return
+    }
+
+    proc MakeErrorMsg {t n msg args} {
+	upvar 1 _file _file
+	#puts %%error=$n|[info level -1]
+	Report $t $n $msg $args
+	$t set $n type Error
+	DropChildren $t $n
+	return
+    }
+
+    proc MakeText {t n text} {
+	#puts %%text=$n|[info level -1]
+	$t set $n type Text
+	$t set $n text $text
+	DropChildren $t $n
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Error reporting
+
+    proc Error {t n text args} {
+	upvar 1 _file _file
+	Report $t $n $text $args
+    }
+
+    proc Report {t n text details} {
+	upvar 1 _file _file
+	ReportAt $_file($n) [$t get $n range] [$t get $n line] [$t get $n col] $text $details
+	return
+    }
+
+    proc ReportAt {file range line col text details} {
+	::variable ourerrors
+	#puts !![list $file $range $line $col $text $details]/[info level -1]
+	lappend ourerrors [list $file $range $line $col $text $details]
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Error Management
+
+    proc ClearErrors {} {
+	::variable ourerrors {}
+	return
+    }
+
+    proc GetErrors {} {
+	::variable ourerrors
+	return $ourerrors
+    }
+
+    proc SetErrors {t} {
+	::variable ourerrors $t
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Error Response
+
+    proc StopOnErrors {} {
+	::variable ourerrors
+	if {![llength $ourerrors]} return
+
+	upvar 1 t t
+	$t destroy
+
+	doctools::msgcat::init toc
+	set info [SortMessages $ourerrors]
+	set msg  [Formatted $info {}]
+
+	return -code error -errorcode $info $msg
+    }
+
+    proc Formatted {errors prefix} {
+	set lines {}
+	foreach err $errors {
+	    struct::list assign $err file range line col msg details
+	    #8.5: set text [msgcat::mc $msg {*}$details]
+	    set text [eval [linsert $details 0 msgcat::mc $msg]]
+	    if {![string length $prefix] && [string length $file]} {
+		set prefix "\"$file\" "
+	    }
+
+	    lappend lines "${prefix}error on line $line.$col: $text"
+
+	    if {$msg eq "doctoc/include/syntax"} {
+		struct::list assign $details path moreerrors
+		lappend lines [Formatted [SortMessages $moreerrors] "\"$path\": "]
+	    }
+	}
+	return [join $lines \n]
+    }
+
+    proc SortMessages {messages} {
+	return [lsort -dict -index 0 \
+		    [lsort -dict -index 2 \
+			 [lsort -dict -index 3 \
+			      [lsort -unique $messages]]]]
+    }
+
+    # # ## ### ##### ######## #############
+    ## Parser state
+
+    # Path to the file currently processed, if known. Empty if not known
+    typevariable ourfile {}
+
+    # Array of variables for use by vset. During parsing a local copy
+    # is used so that variables set by the document cannot spill back
+    # to the parser state.
+    typevariable ourvars -array {}
+
+    # List of paths to use when searching for an include file.
+    typevariable ourincpaths {}
+
+    # Record of errors found so far. List of 5-tuples containing token
+    # range, line, column of firt character after the token, error
+    # code, and error arguments, in this order.
+    typevariable ourerrors {}
+
+    # List of nodes marked for removal.
+    typevariable ourtokill {}
+
+    # Map of legal commands to their min/max number of arguments.
+    typevariable ourcmds -array {
+	comment        {1 1}
+	include        {1 1}
+	lb             {0 0}
+	rb             {0 0}
+	vset           {1 2}
+
+	division_end   {0 0}
+	division_start {1 2}
+	item           {3 3}
+	toc_begin      {2 2}
+	toc_end        {0 0}
+    }
+
+    # # ## ### ##### ######## #############
+    ## Configuration
+
+    pragma -hasinstances   no ; # singleton
+    pragma -hastypeinfo    no ; # no introspection
+    pragma -hastypedestroy no ; # immortal
+
+    ##
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide doctools::toc::parse 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/pkgIndex.tcl
new file mode 100644
index 00000000..b51db905
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/pkgIndex.tcl
@@ -0,0 +1,35 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+
+# Packages for the doctools toc v2 implementation
+# (still v1.1 doctoc language).
+
+# - Index container, mutable toc objects
+# - Export and import management
+# - Export and import plugins
+# - Parser for doctoc markup, and handling serializations
+# - Message catalogs for the parser
+
+package ifneeded doctools::toc                 2     [list source [file join $dir container.tcl]]
+package ifneeded doctools::toc::export         0.2.1 [list source [file join $dir export.tcl]]
+
+package ifneeded doctools::toc::export::doctoc 0.1 [list source [file join $dir export_doctoc.tcl]]
+package ifneeded doctools::toc::export::html   0.1 [list source [file join $dir export_html.tcl]]
+package ifneeded doctools::toc::export::json   0.1 [list source [file join $dir export_json.tcl]]
+package ifneeded doctools::toc::export::nroff  0.2 [list source [file join $dir export_nroff.tcl]]
+package ifneeded doctools::toc::export::text   0.1 [list source [file join $dir export_text.tcl]]
+package ifneeded doctools::toc::export::wiki   0.1 [list source [file join $dir export_wiki.tcl]]
+
+package ifneeded doctools::toc::import::doctoc 0.1 [list source [file join $dir import_doctoc.tcl]]
+package ifneeded doctools::toc::import::json   0.1 [list source [file join $dir import_json.tcl]]
+
+package ifneeded doctools::toc::parse          0.1 [list source [file join $dir parse.tcl]]
+package ifneeded doctools::toc::structure      0.1 [list source [file join $dir structure.tcl]]
+
+package ifneeded doctools::msgcat::toc::c      0.1 [list source [file join $dir msgcat_c.tcl]]
+package ifneeded doctools::msgcat::toc::de     0.1 [list source [file join $dir msgcat_de.tcl]]
+package ifneeded doctools::msgcat::toc::en     0.1 [list source [file join $dir msgcat_en.tcl]]
+package ifneeded doctools::msgcat::toc::fr     0.1 [list source [file join $dir msgcat_fr.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+
+package ifneeded doctools::toc::import         0.2.1 [list source [file join $dir import.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/structure.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/structure.tcl
new file mode 100644
index 00000000..edbaff64
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/doctools2toc/structure.tcl
@@ -0,0 +1,388 @@
+# -*- tcl -*-
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Verification of serialized tables of contents, and conversion
+# between serialized tables of contents and other data structures.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.4              ; # Required runtime.
+package require snit                 ; # OO system.
+
+# # ## ### ##### ######## ############# #####################
+##
+
+snit::type ::doctools::toc::structure {
+    # # ## ### ##### ######## #############
+    ## Public API
+
+    # Check that the proposed serialization of a table of contents is
+    # indeed such.
+
+    typemethod verify {serial {canonvar {}}} {
+	# Basic syntax: Length and outer type code
+	if {[llength $serial] != 2} {
+	    return -code error $ourprefix$ourshort
+	}
+
+	foreach {tag contents} $serial break
+	#struct::list assign $serial tag contents
+
+	if {$tag ne $ourcode} {
+	    return -code error $ourprefix[format $ourtag $tag]
+	}
+
+	if {[llength $contents] != 6} {
+	    return -code error $ourprefix$ourcshort
+	}
+
+	# Unpack the contents, then check that all necessary keys are
+	# present. Together with the length check we can then also be
+	# sure that no other key is present either.
+	array set toc $contents
+
+	foreach k {label title items} {
+	    if {[info exists toc($k)]} continue
+	    return -code error $ourprefix[format $ourmiss $k]
+	}
+
+	if {$canonvar eq {}} {
+	    VerifyDivision $toc(items)
+	} else {
+	    upvar 1 $canonvar iscanonical
+
+	    set iscanonical 1
+	    VerifyDivision $toc(items) iscanonical
+
+	    # Quick exit if the inner structure was already
+	    # non-canonical.
+	    if {!$iscanonical} return
+
+	    # Now various checks if the keys and identifiers are
+	    # properly sorted to make this a canonical serialization.
+
+	    foreach {a _ b _ c _} $contents break
+	    #struct::list assign $contents a _ b _ c _
+	    if {[list $a $b $c] ne {items label title}} {
+		set iscanonical 0
+	    }
+	}
+
+	# Everything checked out.
+	return
+    }
+
+    typemethod verify-as-canonical {serial} {
+	$type verify $serial iscanonical
+	if {!$iscanonical} {
+	    return -code error $ourprefix$ourdupsort
+	}
+	return
+    }
+
+    typemethod canonicalize {serial} {
+	$type verify $serial iscanonical
+	if {$iscanonical} { return $serial }
+
+	# Unpack the serialization.
+	array set toc $serial
+	array set toc $toc(doctools::toc)
+	unset     toc(doctools::toc)
+
+	# Construct result
+	set serial [list doctools::toc \
+			[list \
+			     items  [CanonicalizeDivision $toc(items)] \
+			     label  $toc(label) \
+			     title  $toc(title)]]
+	return $serial
+    }
+
+    # Merge the serialization of two indices into a new serialization.
+
+    typemethod merge {seriala serialb} {
+	$type verify $seriala
+	$type verify $serialb
+
+	# Merge using title and label of the second toc, and the new
+	# elements come after the existing.
+
+	# Unpack the definitions...
+	array set a $seriala ; array set a $a(doctools::toc) ; unset a(doctools::toc)
+	array set b $serialb ; array set a $b(doctools::toc) ; unset b(doctools::toc)
+
+	# Construct result
+	set serial [list doctools::toc \
+			[list \
+			     items  [MergeDivisions $a(items) $b(items)] \
+			     label  $b(label) \
+			     title  $b(title)]]
+
+	# Caller has to verify, ensure contract.
+	#$type verify-as-canonical $serial
+	return $serial
+    }
+
+    # Converts a toc serialization into a human readable string for
+    # test results. It assumes that the serialization is at least
+    # structurally sound.
+
+    typemethod print {serial} {
+	# Unpack the serialization.
+	array set toc $serial
+	array set toc $toc(doctools::toc)
+	unset     toc(doctools::toc)
+	# Print
+	set lines {}
+	lappend lines [list doctools::toc $toc(label) $toc(title)]
+	PrintDivision lines $toc(items) .... ....
+	return [join $lines \n]
+    }
+
+    # # ## ### ##### ######## #############
+
+    proc VerifyDivision {items {canonvar {}}} {
+	if {$canonvar ne {}} {
+	    upvar 1 $canonvar iscanonical
+	}
+
+	array set label {}
+
+	foreach element $items {
+	    if {[llength $element] != 2} {
+		return -code error $ourprefix$oureshort
+	    }
+	    foreach {etype edata} $element break
+	    #struct::list assign $element etype edata
+
+	    switch -exact -- $etype {
+		reference {
+		    # edata = dict (id, label, desc)
+		    if {[llength $edata] != 6} {
+			return -code error $ourprefix$ourcshort
+		    }
+		    array set toc $edata
+		    foreach k {id label desc} {
+			if {[info exists toc($k)]} continue
+			return -code error $ourprefix[format $ourmiss $k]
+		    }
+		    lappend label($toc(label)) .
+		    if {$canonvar ne {}} {
+			foreach {a _ b _ c _} $edata break
+			#struct::list assign $edata a _ b _ c _
+			if {[list $a $b $c] ne {desc id label}} {
+			    set iscanonical 0
+			}
+		    }
+		}
+		division {
+		    # edata = dict (id?, label, items)
+		    if {([llength $edata] != 4) && ([llength $edata] != 6)} {
+			return -code error $ourprefix$ourdshort
+		    }
+		    array set toc $edata
+		    foreach k {label items} {
+			if {[info exists toc($k)]} continue
+			return -code error $ourprefix[format $ourmiss $k]
+		    }
+		    lappend label($toc(label)) .
+		    if {$canonvar eq {}} {
+			VerifyDivision $toc(items)
+		    } else {
+			VerifyDivision $toc(items) iscanonical
+			if {$iscanonical} {
+			    if {[info exists toc(id)]} {
+				foreach {a _ b _ c _} $edata break
+				#struct::list assign $edata a _ b _ c _
+				if {[list $a $b $c] ne {id items label}} {
+				    set iscanonical 0
+				}
+			    } else {
+				foreach {a _ b _} $edata break
+				#struct::list assign $edata a _ b _
+				if {[list $a $b] ne {items label}} {
+				    set iscanonical 0
+				}
+			    }
+			}
+		    }
+		}
+		default {
+		    return -code error $ourprefix[format $ouretag $etype]
+		}
+	    }
+	    unset toc
+	}
+
+	# Fail if labels are duplicated.
+	foreach k [array names label] {
+	    if {[llength $label($k)] > 1} {
+		return -code error $ourprefix$ourldup
+	    }
+	}
+
+	return
+    }
+
+    proc CanonicalizeDivision {items} {
+	set result {}
+	foreach element $items {
+	    foreach {etype edata} $element break
+	    #struct::list assign $element etype edata
+
+	    array set toc $edata
+	    switch -exact -- $etype {
+		reference {
+		    set element \
+			[list \
+			     desc  $toc(desc) \
+			     id    $toc(id) \
+			     label $toc(label)]
+		}
+		division {
+		    set element {}
+		    if {[info exists toc(id)]} {
+			lappend element id $toc(id)
+		    }
+		    lappend element \
+			items [CanonicalizeDivision $toc(items)] \
+			label $toc(label)
+		}
+	    }
+	    unset toc
+	    lappend result [list $etype $element]
+	}
+	return $result
+    }
+
+    proc PrintDivision {lv items prefix increment} {
+	upvar 1 $lv lines
+
+	foreach element $items {
+	    foreach {etype edata} $element break
+	    #struct::list assign $element etype edata
+	    array set toc $edata
+	    switch -exact -- $etype {
+		reference {
+		    lappend lines $prefix[list $toc(id) $toc(label) $toc(desc)]
+		}
+		division {
+		    set buf {}
+		    if {[info exists toc(id)]} {
+			lappend buf  $toc(id)
+		    }
+		    lappend buf $toc(label)
+		    lappend lines $prefix$buf
+		    PrintDivision lines $toc(items) $prefix$increment $increment
+		}
+	    }
+	    unset toc
+	}
+	return
+    }
+
+    proc MergeDivisions {aitems bitems} {
+
+	# Unpack the b-items for easy access when looping over a.
+	array set b
+	foreach element $bitems {
+	    foreach {etype edata} $element break
+	    array set toc $edata
+	    set b($toc(label)) [list $etype $edata]
+	    unset toc
+	}
+
+	set items {}
+
+	# Unification loop...
+	foreach element $aitems {
+	    foreach {etype edata} $element break
+	    array set toc $edata
+	    set label $toc(label)
+	    if {![info exists b($label)]} {
+		# Nothing in b, keep entry as is.
+		lappend items $element
+	    } else {
+		# Unify. Type dependent. And throw an if the types do
+		# not match.
+		foreach {btype bdata} $b($label) break
+		if {$etype ne $btype} {
+		    # TODO :: More details in error message to show
+		    # where the mismatch is.
+		    return -code error "Merge error"
+		}
+		switch -exact -- $etype {
+		    reference {
+			# Unification by taking the b-information.
+			lappend items $b($label)
+		    }
+		    division {
+			# Unification by taking the b-information
+			# where possible, and merging the sub-ordinate
+			# items.
+			array set btoc $bdata
+			set element {}
+			if {[info exists btoc(id)]} {
+			    lappend element id $btoc(id)
+			} elseif {[info exists toc(id)]} {
+			    lappend element id $toc(id)
+			}
+			lappend element \
+			    items [MergeDivisions $toc(items) $btoc(items)] \
+			    label $btoc(label)
+			unset btoc
+			lappend items [list $etype $element]
+		    }
+		}
+		unset b($label)
+	    }
+	    unset toc
+	}
+
+	# Appending loop. Now we add everything from b which was not
+	# unified with data in a.
+	foreach element $bitems {
+	    foreach {etype edata} $element break
+	    array set toc $edata
+	    set label $toc(label)
+	    if {![info exists b($label)]} continue
+	    lappend items $element
+	}
+
+	return $items
+    }
+
+    # # ## ### ##### ######## #############
+
+    typevariable ourcode      doctools::toc
+    typevariable ourprefix    {error in serialization:}
+    #                                                                                # Test cases (doctools-toc-structure-)
+    typevariable ourshort     { dictionary too short, expected exactly one key}    ; # 6.0
+    typevariable ourtag       { bad type tag "%s"}                                 ; # 6.1
+    typevariable ourcshort    { dictionary too short, expected exactly three keys} ; # 6.2, 6.9
+    typevariable ourdshort    { dictionary too short, expected two or three keys}  ; # 6.14
+    typevariable ourmiss      { missing expected key "%s"}                         ; # 6.3, 6.4, 6.5, 6.10, 6.11, 6.12, 6.15, 6.16 (XXX + inner: div)
+    typevariable ourldup      { duplicate labels}                                  ; # 6.19, 6.20, 6.21
+    typevariable oureshort    { element list wrong, need exactly 2}                ; # 6.7
+    typevariable ouretag      { bad element tag "%s"}                              ; # 6.8
+    # Message for non-canonical serialization when expecting canonical form
+    typevariable ourdupsort   { duplicate and/or unsorted keywords}                 ; # 6.6, 6.13, 6.17, 6.18
+    typevariable ourmergeerr  {Mismatching declarations '%s' vs. '%s' for '%s'}
+
+    # # ## ### ##### ######## #############
+    ## Configuration
+
+    pragma -hasinstances   no ; # singleton
+    pragma -hastypeinfo    no ; # no introspection
+    pragma -hastypedestroy no ; # immortal
+
+    ##
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide doctools::toc::structure 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dtplite/dtplite.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dtplite/dtplite.tcl
new file mode 100644
index 00000000..9d0ff1e6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dtplite/dtplite.tcl
@@ -0,0 +1,1785 @@
+# -*- tcl -*- \
+# @@ Meta Begin
+# Application dtplite 1.3.1
+# Meta platform     tcl
+# Meta summary      Lightweight DocTools Processor
+# Meta description  This application is a simple processor
+# Meta description  for documents written in the doctools
+# Meta description  markup language. It covers the most
+# Meta description  common use cases, but is not as
+# Meta description  configurable as its big brother dtp.
+# Meta category     Processing doctools documents
+# Meta subject      doctools doctoc docidx
+# Meta require      {doctools 1}
+# Meta require      {doctools::idx 1}
+# Meta require      {doctools::toc 1}
+# Meta require      fileutil
+# Meta require      textutil::repeat
+# Meta author       Andreas Kupries
+# Meta license      BSD
+# @@ Meta End
+
+package provide dtplite 1.3.1
+
+# dtp lite - Lightweight DocTools Processor
+# ======== = ==============================
+#
+# Use cases
+# ---------
+#
+# (1)	Validation of a single manpage, i.e. checking that it is valid
+#	doctools format.
+#
+# (1a)	Getting a preliminary version of the formatted output, for
+#	display in a browser, nroff, etc., proofreading the
+#	formatting.
+#
+# (2)	Generate documentation for a single package, i.e. all the
+#	manpages, plus index and table of contents.
+#
+# (3)	Generation of unified documentation for several
+#	packages. Especially unified keyword index and table of
+#	contents. This may additionally generate per-package TOCs
+#	as well (Per-package indices don't make sense IMHO).
+#
+# Command syntax
+# --------------
+#
+# Ad 1)	dtplite -o output format file
+#
+#	The option -o specifies where to write the output to. Using
+#	the string "-" as name of the output file causes the tool to
+#	write the generated data to stdout. If $output is a directory
+#	then a file named [[file rootname $file].$format] is written
+#	to the directory.
+
+# Ad 1a)	dtplite validate file
+#
+#	The "validate" format does not generate output at all, only
+#	syntax checking is performed.
+#
+# Ad 2)	dtplite -o output format directory
+#
+#	I.e. we distinguish (2) from (1) by the type of the input,
+#	file, or directory. In this situation output has to be a
+#	directory. Use the path "." to place the results into the
+#	current directory.
+#
+#	We locate _all_ files under directory, i.e. all subdirectories
+#	are scanned as well. We replicate the found directory
+#	structure in the output (See example below). The index and
+#	table of contents are written to the toplevel directory in the
+#	output. The names are hardwired to "toc.$format" and
+#	"index.$format".
+#
+# Ad 3)	dtplite -merge -o output format directory
+#
+#	This can be treated as special case of (2). The -merge option
+#	tells it that the output is nested one level deeper, to keep a
+#	global toc and index in the toplevel and to merge the package
+#	toc and index into them.
+#
+#	This way the global documents are built up incrementally. This
+#	can help us in a future extended installer as well!, extending
+#	a global documentation tree of all installed packages.
+#
+# Additional features.
+#
+# *	As described above the format name is used as the extension
+#	for the generated files. Does it make sense to introduce an
+#	option with which we can overide this, or should we simply
+#	expect that a calling script does a proper renaming of all the
+#	files ?  ... The option is better. In HTML output we have
+#	links between the files, and renaming from the outside just
+#	breaks the links. This option is '-ext'. It is ignored if the
+#	output is a single file (fully specified via -o), or stdout.
+#
+#	-ext extension
+#
+# *	Most of the formats don't need much/none of customizability.
+#	I.e. text, nroff, wiki, tmml, ...  For HTML however some
+#	degree of customizability is required for good output.  What
+#	should we given to the user ?
+#
+#	- Allow setting of a stylesheet.
+#	- Allow integration of custom body header and footer html.
+#	- Allow additional links for the navigation bar.
+#	- Force module name, for when the directory name is wrong.
+#	- Allow raw output, aka "embedded HTML", no head/body, just the body itself
+#
+#	Note: The tool generates standard navigation bars to link the
+#	all tocs, indices, and pages together.
+#
+#	-style file
+#	-header file
+#	-footer file
+#	-module name
+#	-nav label url
+#	-prenav label url
+#	-postnav label url
+#	-raw
+#
+# *	The application may mis-detect files as doctools input.
+#	And we cannot always mark them as non-doctools because
+#	they may be such. Test cases, for example. To exclude
+#	these we have the option '-exclude' taking a glob pattern.
+#	Multiple uses of the option accumulate.
+#
+#	-exclude glob
+#
+# *	For tcllib itself we have external tools generating a nicer
+#	TOC. Use option -toc to specify the doctoc file to use
+#	_instead_ of generating our own. And using option -post+toc
+#	and -pre+toc to _add_ more special toc's to the main
+#	navbar. These latter mix with the -pre- and -postnav options.
+#
+#	-toc            path|text
+#	-post+toc label path|text
+#	-pre+toc label path|text
+#
+# That should be enough to allow the creation of good looking formatted
+# documentation without getting overly complex in both implementation
+# and use.
+
+package require doctools      1.4.11 ; # 'image' support, -ibase support
+package require doctools::idx 1.0.4 ;
+package require doctools::toc 1.1.3 ;
+package require fileutil
+package require textutil::repeat
+
+# ### ### ### ######### ######### #########
+## Internal data and status
+
+namespace eval ::dtplite {
+    variable print ::puts
+
+    # Path to where the output goes to. This is a file in case of mode
+    # 'file', irrelevant for mode 'file.stdout', and the directory for
+    # all the generated files for the two directory modes. Specified
+    # through the mandatory option '-o'.
+
+    variable  output ""
+
+    # Path to where the documents to convert come from. This is a
+    # single file in the case of the two file modes, and a directory
+    # for the directory modes. In the later case all files under that
+    # directory are significant, including links, if identifiable as
+    # in doctools format (fileutil::fileType). Specified through the
+    # last argument on the command line. The relative path of a file
+    # under 'input' also becomes its relative path under 'output'.
+
+    variable  input  ""
+
+    # The extension to use for the generated files. Ignored by the
+    # file modes, as for them they either don't generate a file, or
+    # know its full name already, i.e. including any wanted
+    # extension. Set via option '-ext'. Defaults to the format name if
+    # '-ext' was not used.
+
+    variable  ext    ""
+
+    # Optional. HTML specific, requires engine parameter 'meta'. Path
+    # to a stylesheet file to use in the output. The file modes link
+    # to it using the original location, but the directory modes copy
+    # the file into the 'output' and link it there (to make the
+    # 'output' more selfcontained). Initially set via option '-style'.
+
+    variable  style  ""
+
+    # Optional. Path to a file. Contents of the file are assigned to
+    # engine parameter 'header', if present. If navigation buttons
+    # were defined their HTML will be appended to the file contents
+    # before doing the assignment. A specification is ignored if the
+    # engine does not support the parameter 'header'. Set via option
+    # '-header'.
+
+    variable  header ""
+
+    # Like header, but for the document footer, and no navigation bar
+    # insert. Set via option '-footer', requires engine parameter
+    # 'footer'.
+
+    variable  footer ""
+
+    # raw flag. When set "embedded HTML" is generated. Or whatever
+    # fits the definition for the active format.
+
+    variable raw off
+    
+    # List of buttons/links for a navigation bar. No navigation bar is
+    # created if this is empty. HTML specific, requires engine
+    # parameter 'header' (The navigation bar is merged with the
+    # 'header' data, see above). Each element of the list is a
+    # 2-element list, containing the button label and url, in this
+    # order. Initial data comes from the command line, via options
+    # '-nav', '-prenav', and '-postnav'. The commands 'Navbutton(Push|Pop)'
+    # then allow the programmatic addition and removal of buttons at
+    # the left (stack like, top at end index). This is used for the
+    # insertion of links to TOC and Index into each document, if
+    # applicable.
+
+    variable  nav     {}
+    variable  prenav  {}
+    variable  postnav {}
+
+    # The name of the format to convert the doctools documents
+    # into. Set via the next-to-last argument on the command
+    # line. Used as extension for the generated files as well by the
+    # directory modes, and if not overridden via '-ext'. See 'ext'
+    # above.
+
+    variable  format ""
+
+    # Boolean flag. Set by the option '-merge'. Ignored when a file
+    # mode is detected, but for a directory it determines the
+    # difference between the two directory modes, i.e. plain
+    # generation, or incremental merging of many inputs into one
+    # output.
+
+    variable  merge  0
+
+    # Boolean flag. Automatically set by code distinguishing between
+    # file and directory modes. Set for a the file modes, unset for
+    # the directory modes.
+
+    variable  single 1
+
+    # Boolean flag. Automatically set by the code processing the '-o'
+    # option. Set if output is '-', unset otherwise. Ignored for the
+    # directory modes. Distinguished between the two file modes, i.e.
+    # writing to a file (unset), or stdout (set).
+
+    variable  stdout 0
+
+    # Name of the found processing mode. Derived from the values of
+    # the three boolean flags (merge, single, stdout). This value is
+    # used during the dispatch to the command implementing the mode,
+    # after processing the command line.
+    #
+    # Possible/Legal values:	Meaning
+    # ---------------------	-------
+    # File			File mode. Write result to a file.
+    # File.Stdout		File mode. Write result to stdout.
+    # Directory			Directory mode. Plain processing of one set.
+    # Directory.Merge		Directory mode. Merging of multiple sets into
+    #				one output.
+    # ---------------------	-------
+
+    variable  mode   ""
+
+    # Name of the module currently processed. Derived from the 'input'
+    # (last element of this path, without extension).
+
+    variable  module ""
+
+    # Crossreference data. Extracted from the processed documents, a
+    # rearrangement and filtration of the full meta data (See 'meta'
+    # below). Relevant only to the directory modes. I.e. the file
+    # modes don't bother with its extraction and use.
+
+    variable  xref
+    array set xref   {}
+
+    # Index data. Mapping from keyword (label) to the name of its
+    # anchor in the index output. Requires support for the engine
+    # parameter 'kwid' in the index engine.
+
+    variable  kwid
+    array set kwid {}
+
+    # Cache. This array maps from the path of an input file/document
+    # (relative to 'input'), to the paths of the file to generate
+    # (relative to 'output', including extension and such). In other
+    # words we derive the output paths from the inputs only once and
+    # then simply get them here.
+
+    variable  out
+    array set out  {}
+
+    # Meta data cache. Stores the meta data extracted from the input
+    # files/documents, per input. The meta data is a dictionary and
+    # processed several ways to get: Crossreferences (See 'xref'
+    # above), Table Of Contents, and Keyword Index. The last two are
+    # not cached, but ephemeral.
+
+    variable  meta
+    array set meta {}
+
+    # Cache of input documents. When we read an input file we store
+    # its contents here, keyed by path (relative to 'input') so that
+    # we don't have to go to the disk when we we need the file again.
+    # The directory modes need each input twice, for metadata
+    # extraction, and the actual conversion.
+
+    variable  data
+    array set data {}
+
+    # Database of image files for use by dt_imap.
+
+    variable  imap
+    array set imap {}
+
+    # Database of exclusion patterns. Files matching these are not
+    # manpages. For example, test files for doctools itself may fall
+    # under this.
+
+    variable excl {}
+
+    # Path of a user specified table of contents (doctoc format).
+
+    variable utoc {}
+
+    # List of path|text of additional TOCs to put into the navigation
+    # bar. Label and ordering information is found in the pre- and
+    # postnav lists. See above.
+
+    variable mtoc {}
+}
+
+# ### ### ### ######### ######### #########
+## External data and status
+#
+## Only the directory merge mode uses external data, saving the
+## internal representations of current toc, index. and xref
+## information for use by future mergers. It uses three files,
+## described below. The files are created if they don't exist.
+## Remove them when the merging is complete.
+#
+## .toc
+## Contains the current full toc in form of a dictionary.
+#  Keys are division labels, values the lists of toc items.
+#
+## .idx
+## Contains the current full index, plus keyword id map.  Is a list of
+#  three elements, index, start id for new kwid entries, and the
+#  keyword id map (kwid). Index and Kwid are both dictionaries, keyed
+#  by keywords. Index value is a list of 2-tuples containing symbolic
+#  file plus label, in this order. Kwid value is the id of the anchor
+#  for that keyword in the index.
+#
+## .xrf
+## Contains the current cross reference database, a dictionary. Keys
+#  are tags the formatter can search for (keywords, keywords with
+#  prefixes, keywords with suffices), values a list containing either
+#  the file to refer to to, or both file and an anchor in that
+#  file. The latter is for references into the index.
+
+proc ::dtplite::Init {} {
+    variable  data
+    variable  excl {}
+    variable  ext    ""
+    variable  footer ""
+    variable  format ""
+    variable  header ""
+    variable  imap
+    variable  input  ""
+    variable  kwid
+    variable  merge  0
+    variable  meta
+    variable  mode   ""
+    variable  module ""
+    variable  mtoc {}
+    variable  nav     {}
+    variable  out
+    variable  output ""
+    variable  postnav {}
+    variable  prenav  {}
+    variable  single 1
+    variable  stdout 0
+    variable  style  ""
+    variable  utoc {}
+    variable  xref
+    variable  xrefl
+
+    array unset data     *
+    array unset imap     *
+    array unset kwid     *
+    array unset meta     *
+    array unset out      *
+    array unset xref     *
+    catch { unset xrefl }
+
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Option processing.
+## Validate command line.
+## Full command line syntax.
+##
+# dtplite	-o outputpath	\
+#		?-merge?	\
+#		?-raw?	\
+#		?-ext ext?	\
+#		?-style file?	\
+#		?-header file?	\
+#		?-footer file?	\
+#		?-module name?	\
+#		?-nav label url?... \
+#		?-prenav label url?... \
+#		?-postnav label url?... \
+#		?-exclude glob?... \
+#		?-toc path|text? \
+#		?-post+toc label path|text? \
+#		?-pre+toc label path|text? \
+#		format inputpath
+##
+
+proc ::dtplite::ProcessCmdline {argv} {
+    variable output ; variable style  ; variable stdout
+    variable format ; variable header ; variable single
+    variable input  ; variable footer ; variable mode
+    variable ext    ; variable nav    ; variable merge
+    variable module ; variable excl   ; variable utoc
+    variable prenav ; variable postnav ; variable mtoc
+    variable raw
+
+    # Process the options, perform basic validation.
+
+    set fixup {}
+    set muser false
+
+    while {[llength $argv]} {
+	set opt [lindex $argv 0]
+	if {![string match "-*" $opt]} break
+
+	if {[string equal $opt "-o"]} {
+	    if {[llength $argv] < 2} Usage
+	    set output [lindex $argv 1]
+	    set argv   [lrange $argv 2 end]
+	} elseif {[string equal $opt "-merge"]} {
+	    set merge 1
+	    set argv [lrange $argv 1 end]
+	} elseif {[string equal $opt "-raw"]} {
+	    set raw on
+	    set argv [lrange $argv 1 end]
+	} elseif {[string equal $opt "-ext"]} {
+	    if {[llength $argv] < 2} Usage
+	    set ext  [lindex $argv 1]
+	    set argv [lrange $argv 2 end]
+	} elseif {[string equal $opt "-toc"]} {
+	    if {[llength $argv] < 2} Usage
+	    set utoc [lindex $argv 1]
+	    set argv [lrange $argv 2 end]
+	} elseif {[string equal $opt "-post+toc"]} {
+	    if {[llength $argv] < 3} Usage
+	    # Place toc data separate from the nav data, and identify
+	    # by counter (list length). The nav data gets the file
+	    # name (see Do.Directory* commands, marker (+TOC)). As
+	    # relative paths they will be transformed during navbar
+	    # generation to link properly.
+	    set n [llength $mtoc]
+	    set fname toc$n.$ext
+	    if {$ext == {}} {
+		lappend fixup postnav [llength $postnav]
+	    }
+	    lappend postnav [list [lindex $argv 1] $fname]
+	    lappend mtoc    [lindex $argv 2]
+	    set argv        [lrange $argv 3 end]
+	} elseif {[string equal $opt "-pre+toc"]} {
+	    if {[llength $argv] < 3} Usage
+	    # Place toc data separate from the nav data, and identify
+	    # by counter (list length). The nav data gets the file
+	    # name (see Do.Directory* commands, marker (+TOC)). As
+	    # relative paths they will be transformed during navbar
+	    # generation to link properly.
+	    set n [llength $mtoc]
+	    set fname toc$n.$ext
+	    if {$ext == {}} {
+		lappend fixup prenav [llength $prenav]
+	    }
+	    lappend prenav [list [lindex $argv 1] $fname]
+	    lappend mtoc   [lindex $argv 2]
+	    set argv       [lrange $argv 3 end]
+	} elseif {[string equal $opt "-exclude"]} {
+	    if {[llength $argv] < 2} Usage
+	    lappend excl [lindex $argv 1]
+	    set argv [lrange $argv 2 end]
+	} elseif {[string equal $opt "-style"]} {
+	    if {[llength $argv] < 2} Usage
+	    set style [lindex $argv 1]
+	    set argv  [lrange $argv 2 end]
+	} elseif {[string equal $opt "-header"]} {
+	    if {[llength $argv] < 2} Usage
+	    set header [lindex $argv 1]
+	    set argv   [lrange $argv 2 end]
+	} elseif {[string equal $opt "-footer"]} {
+	    if {[llength $argv] < 2} Usage
+	    set footer [lindex $argv 1]
+	    set argv   [lrange $argv 2 end]
+	} elseif {[string equal $opt "-module"]} {
+	    if {[llength $argv] < 2} Usage
+	    set module [lindex $argv 1]
+	    set argv   [lrange $argv 2 end]
+	    set muser true
+	} elseif {[string equal $opt "-nav"]} {
+	    if {[llength $argv] < 3} Usage
+	    lappend prenav [lrange $argv 1 2]
+	    set argv       [lrange $argv 3 end]
+	} elseif {[string equal $opt "-postnav"]} {
+	    if {[llength $argv] < 3} Usage
+	    lappend postnav [lrange $argv 1 2]
+	    set argv        [lrange $argv 3 end]
+	} elseif {[string equal $opt "-prenav"]} {
+	    if {[llength $argv] < 3} Usage
+	    lappend prenav [lrange $argv 1 2]
+	    set argv       [lrange $argv 3 end]
+	} else {
+	    Usage
+	}
+    }
+
+    # Additional validation, and extraction of the non-option
+    # arguments.
+
+    if {[llength $argv] != 2} Usage
+
+    set format [lindex $argv 0]
+    set input  [lindex $argv 1]
+
+    if {[string equal $format validate]} {
+	set format null
+    }
+
+    # Final validation across the whole configuration.
+
+    if {[string equal $format ""]} {
+	ArgError "Illegal empty format specification"
+
+    } else {
+	# Early check: Is the chosen format ok ? For this we have
+	# create and configure a doctools object.
+
+	doctools::new dt
+	if {[catch {dt configure -format $format}]} {
+	    ArgError "Unknown format \"$format\""
+	}
+	dt configure -deprecated 1
+
+	# Check style, header, and footer options, if present.
+
+	CheckInsert   header {Header file}
+	CheckInsert   footer {Footer file}
+	CheckPresence raw    {Raw flag}
+
+	if {[llength $nav] && ![in [dt parameters] header]} {
+	    ArgError "-nav not supported by format \"$format\""
+	}
+	if {![string equal $style ""]} {
+	    if {![in [dt parameters] meta]} {
+		ArgError "-style not supported by format \"$format\""
+	    } elseif {![file exists $style]} {
+		ArgError "Unable to find style file \"$style\""
+	    }
+	}
+    }
+
+    # Set up an extension based on the format, if no extension was
+    # specified.  Also compute the name of the module, based on the
+    # input. [SF Tcllib Bug 1111364]. Has to come before the line
+    # marked with a [*], or a filename without extension is created.
+
+    if {[string equal $ext ""]} {
+	set ext $format
+	foreach {v i} $fixup {
+	    upvar 0 $v navlist
+	    set item [lindex $navlist $i]
+	    set item [lreplace $item 1 1 [lindex $item 1]$ext]
+	    set navlist [lreplace $navlist $i $i $item]
+	}
+    }
+
+    CheckInput $input {Input path}
+    if {[file isfile $input]} {
+	# Input file. Merge mode is not possible. Output can be file
+	# or directory, or "-" for stdout. The output may exist, but
+	# does not have to. The directory it is in however does have
+	# to exist, and has to be writable (if the output does not
+	# exist yet). An existing output has to be writable.
+
+	if {$merge} {
+	    ArgError "-merge illegal when processing a single input file."
+	}
+	if {![string equal $output "-"]} {
+	    CheckTheOutput
+
+	    # If the output is an existing directory then we have to
+	    # ensure that the actual output is a file in that
+	    # directory, and we derive its name from the name of the
+	    # input file (and -ext, if present).
+
+	    if {[file isdirectory $output]} {
+		# [*] [SF Tcllib Bug 1111364]
+		set output [file join $output [file tail [Output $input]]]
+	    }
+	} else {
+	    set stdout 1
+	}
+    } else {
+	# Input directory. Merge mode is possible. Output has to be a
+	# directory. The output may exist, but does not have to. The
+	# directory it is in however does have to exist. An existing
+	# output has to be writable.
+
+	set single 0
+	CheckTheOutput 1
+    }
+
+    # Determine the operation mode from the flags
+
+    if {$single} {
+	if {$stdout} {
+	    set mode File.Stdout
+	} else {
+	    set mode File
+	}
+    } elseif {$merge} {
+	set mode Directory.Merge
+    } else {
+	set mode Directory
+    }
+
+    # Derive a module name iff user has not chosen any.
+    if {!$muser} {
+	set module [file rootname [file tail [file normalize $input]]]
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Option processing.
+## Helpers: Generation of error messages.
+## I.  General usage/help message.
+## II. Specific messages.
+#
+# Both write their messages to stderr and then
+# exit the application with status 1.
+##
+
+proc ::dtplite::Usage {} {
+    global argv0
+    Print stderr "$argv0 wrong#args, expected:\
+	    -o outputpath ?-merge? ?-raw? ?-ext ext?\
+	    ?-style file? ?-header file?\
+	    ?-footer file? ?-module string? ?-nav label url?...\
+	    format inputpath"
+    return -code error -errorcode {DTPLITE STOP} {}
+}
+
+proc ::dtplite::ArgError {text} {
+    global argv0
+    Print stderr "$argv0: $text"
+    return -code error -errorcode {DTPLITE STOP} {}
+}
+
+proc ::dtplite::Print {args} {
+    variable print
+    set cmd [concat $print $args]
+    return [uplevel 1 $cmd]
+}
+
+proc in {list item} {
+    expr {([lsearch -exact $list $item] >= 0)}
+}
+
+# ### ### ### ######### ######### #########
+## Helper commands. File paths.
+## Conversion of relative paths
+## to absolute ones for input
+## and output. Derivation of
+## output file name from input.
+
+proc ::dtplite::Pick {f} {
+    variable input
+    return [file join $input $f]
+}
+
+proc ::dtplite::Output {f} {
+    variable ext
+    return [file rootname $f].$ext
+}
+
+proc ::dtplite::At {f} {
+    variable output
+    set of     [file normalize [file join $output $f]]
+    file mkdir [file dirname $of]
+    return $of
+}
+
+# ### ### ### ######### ######### #########
+## Check existence and permissions of an input/output file or
+## directory.
+
+proc ::dtplite::CheckInput {f label} {
+    if {![file exists $f]} {
+	ArgError "Unable to find $label \"$f\""
+    } elseif {![file readable $f]} {
+	ArgError "$label \"$f\" not readable (permission denied)"
+    }
+    return
+}
+
+proc ::dtplite::CheckTheOutput {{needdir 0}} {
+    variable output
+    variable format
+
+    if {[string equal $format null]} {
+	# The format does not generate output, so not specifying an
+	# output file is ok for that case.
+	return
+    }
+
+    if {[string equal $output ""]} {
+	ArgError "No output path specified"
+    }
+
+    set base [file dirname $output]
+    if {[string equal $base ""]} {set base [pwd]}
+
+    if {![file exists $output]} {
+	if {![file exists $base]} {
+	    ArgError "Output base path \"$base\" not found"
+	}
+	if {![file writable $base]} {
+	    ArgError "Output base path \"$base\" not writable (permission denied)"
+	}
+    } else {
+	if {![file writable $output]} {
+	    ArgError "Output path \"$output\" not writable (permission denied)"
+	}
+	if {$needdir && ![file isdirectory $output]} {
+	    ArgError "Output path \"$output\" not a directory"
+	}
+    }
+    return
+}
+
+proc ::dtplite::CheckInsert {option label} {
+    variable format
+    variable $option
+    upvar 0  $option opt
+
+    if {![string equal $opt ""]} {
+	if {![in [dt parameters] $option]} {
+	    ArgError "-$option not supported by format \"$format\""
+	}
+	CheckInput $opt $label
+	set opt [Get $opt]
+    }
+    return
+}
+
+proc ::dtplite::CheckPresence {option label} {
+    variable format
+    variable $option
+    upvar 0  $option opt
+
+    if {$opt} {
+	if {![in [dt parameters] $option]} {
+	    ArgError "-$option not supported by format \"$format\""
+	}
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Helper commands. File reading and writing.
+
+proc ::dtplite::Get {f} {
+    variable data
+    if {[info exists data($f)]} {return $data($f)}
+    return [set data($f) [fileutil::cat $f]]
+}
+
+proc ::dtplite::Write {f data} {
+    # An empty filename is acceptable, the format will be 'null'
+    if {[string equal $f ""]} return
+    fileutil::writeFile $f $data
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Dump accumulated warnings.
+
+proc ::dtplite::Warnings {} {
+    set warnings [dt warnings]
+    if {[llength $warnings] > 0} {
+	Print stderr [join $warnings \n]
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Configuation phase, validate command line.
+
+# ### ### ### ######### ######### #########
+## We can assume that we have from here on a command 'dt', which is a
+## doctools object command, and already configured for the format to
+## generate.
+# ### ### ### ######### ######### #########
+
+# ### ### ### ######### ######### #########
+## Commands implementing the main functionality.
+
+proc ::dtplite::Do.File {} {
+    # Process a single input file, write the result to a single outut file.
+
+    variable input
+    variable output
+
+    SinglePrep
+    Write $output [dt format [Get $input]]
+    Warnings
+    return
+}
+
+proc ::dtplite::Do.File.Stdout {} {
+    # Process a single input file, write the result to stdout.
+
+    variable input
+
+    SinglePrep
+    puts  stdout [dt format [Get $input]]
+    close stdout
+    Warnings
+    return
+}
+
+proc ::dtplite::Do.Directory {} {
+    # Process a directory of input files, through all subdirectories.
+    # Generate index and toc, but no merging with an existing index
+    # and toc. I.e. any existing index and toc files are overwritten.
+
+    variable input
+    variable out
+    variable module
+    variable meta
+    variable format
+    variable utoc
+    variable mtoc
+
+    # Phase 0. Find the documents to convert.
+    # Phase I. Collect meta data, and compute the map from input to
+    # ........ output files. This is also the map for the symbolic
+    # ........ references. We extend an existing map (required for use
+    # ........ in merge op.
+    # Phase II. Build index and toc information from the meta data.
+    # Phase III. Convert each file, using index, toc and meta
+    # .......... information.
+
+    MapImages
+    set files [LocateManpages $input]
+    if {![llength $files]} {
+	ArgError "Module \"$module\" has no files to process."
+    }
+
+    MetadataGet $files
+    StyleMakeLocal
+
+    # Attention, ordering! Ensure that 'kwid' is initialized before
+    # testing it with 'HaveKeywords' everywhere we configure the links
+    # showns in the navigation bar.
+
+    set idx [IdxGenerate $module [IdxGet]]
+
+    if {$utoc ne {}} {
+	if {[file exists $utoc]} { set utoc [Get $utoc] }
+	TocWrite toc index $utoc
+    } else {
+	TocWrite toc index [TocGenerate [TocGet $module toc]]
+    }
+    # (+TOC)
+    set n 0
+    foreach item $mtoc {
+	if {[file exists $item]} { set item [Get $item] }
+	TocWrite toc$n index $item
+	incr n
+    }
+    IdxWrite index toc $idx
+
+    dt configure -module $module
+    XrefGet
+    XrefSetup   dt
+    FooterSetup dt
+    MapSetup    dt
+
+    foreach f [lsort -dict $files] {
+	Print stdout \t$f
+
+	set o $out($f)
+	dt configure -file [At $o] -ibase $input/$f
+
+        if {[HaveKeywords]} {
+            NavbuttonPush {Keyword Index} [Output index] $o
+        }
+	NavbuttonPush {Table Of Contents} [Output toc]   $o
+	HeaderSetup dt $o
+	NavbuttonPop
+        if {[HaveKeywords]} {
+            NavbuttonPop
+        }
+	StyleSetup dt $o
+
+	if {[string equal $format null]} {
+	    dt format [Get [Pick $f]]
+	} else {
+	    Write [At $o] [dt format [Get [Pick $f]]]
+	}
+	Warnings
+    }
+    return
+}
+
+proc ::dtplite::Do.Directory.Merge {} {
+    # See Do.Directory, but merge the TOC/Index information from this
+    # set of input files into an existing TOC/Index.
+
+    variable input
+    variable out
+    variable module
+    variable meta
+    variable output
+    variable format
+    variable utoc
+    variable mtoc
+
+    # Phase 0. Find the documents to process.
+    # Phase I. Collect meta data, and compute the map from input to
+    # ........ output files. This is also the map for the symbolic
+    # ........ references. We extend an existing map (required for use
+    # ........ in merge op.
+    # Phase II. Build module local toc from the meta data, insert it
+    # ......... into the main toc as well, and generate a global
+    # ......... index.
+    # Phase III. Process each file, using cross references, and links
+    # .......... to boths tocs and the index.
+
+    MapImages
+    set files [LocateManpages $input]
+    if {![llength $files]} {
+	ArgError "Module \"$module\" has no files to process."
+    }
+
+    MetadataGet $files $module
+    StyleMakeLocal     $module
+
+    # Attention, ordering! Ensure that 'kwid' is initialized before
+    # testing it with 'HaveKeywords' everywhere we configure the links
+    # showns in the navigation bar.
+
+    set idx [IdxGenerate {} [IdxGetSaved index]]
+
+    set localtoc [TocGet $module $module/toc]
+    TocWrite $module/toc index [TocGenerate $localtoc] [TocMap $localtoc]
+    if {$utoc ne {}} {
+	if {[file exists $utoc]} { set utoc [Get $utoc] }
+	TocWrite toc index $utoc
+    } else {
+	TocWrite toc index [TocGenerate [TocMergeSaved $localtoc]]
+    }
+    # (+TOC)
+    set n 0
+    foreach item $mtoc {
+	if {[file exists $item]} { set item [Get $item] }
+	TocWrite toc$n index $item
+	incr n
+    }
+    IdxWrite index toc $idx
+
+    dt configure -module $module
+    XrefGetSaved
+    XrefSetup   dt
+    FooterSetup dt
+    MapSetup    dt
+
+    foreach f [lsort -dict $files] {
+	Print stdout \t$f
+
+	set o $out($f)
+	dt configure -file [At $o] -ibase $input/$f
+        if {[HaveKeywords]} {
+            NavbuttonPush {Keyword Index} [Output index] $o
+        }
+	NavbuttonPush {Table Of Contents}      [Output $module/toc] $o
+	NavbuttonPush {Main Table Of Contents} [Output toc]         $o
+	HeaderSetup dt $o
+	NavbuttonPop
+	NavbuttonPop
+        if {[HaveKeywords]} {
+            NavbuttonPop
+        }
+	StyleSetup dt $o
+
+	if {[string equal $format null]} {
+	    dt format [Get [Pick $f]]
+	} else {
+	    Write [At $o] [dt format [Get [Pick $f]]]
+	}
+	Warnings
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Helper commands. Preparations shared between the two file modes.
+
+proc ::dtplite::SinglePrep {} {
+    variable input
+    variable module
+
+    MapImages
+    StyleSetup  dt
+    HeaderSetup dt {}
+    FooterSetup dt
+    MapSetup    dt
+
+    dt configure -module $module -file $input
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Get the base meta data out of the listed documents.
+
+proc ::dtplite::MetadataGet {files {floc {}}} {
+    # meta :: map (symbolicfile -> metadata)
+    # metadata = dict (key -> value)
+    # key      = set { desc, fid, file, keywords,
+    #                  module, section, see_also,
+    #                  shortdesc, title, version }
+    # desc      :: string 'document title'
+    # fid       :: string           'file name, without path/extension'
+    # file      :: string           'file name, without path'
+    # keywords  :: list (string...) 'key phrases'
+    # module    :: string           'module the file is in'
+    # section   :: string           'manpage section'
+    # see_also  :: list (string...) 'related files'
+    # shortdesc :: string           'module description'
+    # title     :: string           'manpage file name intended'
+    # version   :: string           'file/package version'
+    variable meta
+    variable input
+    variable out
+
+    doctools::new meta -format list -deprecated 1
+    foreach f $files {
+	meta configure -file $input/$f
+	set o [Output [file join $floc files $f]]
+	set out($f)  $o
+	set meta($o) [lindex [string trim [meta format [Get [Pick $f]]]] 1]
+    }
+    meta destroy
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Handling Tables of Contents:
+## - Get them out of the base meta data.
+## - As above, and merging them with global toc.
+## - Conversion of internals into doctoc.
+## - Processing doctoc into final formatting.
+
+proc ::dtplite::TocGet {desc {f toc}} {
+    # Generate the intermediate form of a TOC for the current document
+    # set. This generates a single division.
+
+    # Get toc out of the meta data.
+    variable meta
+    set res {}
+    foreach {k item} [array get meta] {
+	lappend res [TocItem $k $item]
+    }
+    return [list $desc [list $f $res]]
+}
+
+proc ::dtplite::TocMap {toc {base {}}} {
+    if {$base == {}} {
+	set base  [lindex [lindex $toc 1] 0]
+    }
+    set items [lindex [lindex $toc 1] 1]
+
+    set res {}
+    foreach i $items {
+	foreach {f label desc} $i break
+	lappend res $f [fileutil::relativeUrl $base $f]
+    }
+    return $res
+}
+
+proc ::dtplite::TocItem {f meta} {
+    array set md $meta
+    set desc    $md(desc)
+    set label   $md(title)
+    return [list $f $label $desc]
+}
+
+proc ::dtplite::TocMergeSaved {sub} {
+    # sub is the TOC of the current doc set (local toc). Merge this
+    # into the main toc (as read from the saved global state), and
+    # return the resulting internal rep for further processing.
+
+    set fqn [At .toc]
+    if {[file exists $fqn]} {
+	array set _ [Get $fqn]
+    }
+    array set _ $sub
+    set thetoc [array get _]
+
+    # Save extended toc for next merge.
+    Write $fqn $thetoc
+
+    return $thetoc
+}
+
+proc ::dtplite::TocGenerate {data} {
+    # Handling single and multiple divisions.
+    # single div => div is full toc
+    # multi div  => place divs into the toc in alpha order.
+    #
+    # Sort toc (each division) by label (index 1).
+    # Write as doctoc.
+
+    array set toc $data
+
+    TagsBegin
+    if {[array size toc] < 2} {
+	# Empty, or single division. The division is the TOC, toplevel.
+
+	unset toc
+	set desc [lindex $data 0]
+	set data [lindex [lindex $data 1] 1]
+	TocAlign mxf mxl $data
+
+	Tag+ toc_begin [list {Table Of Contents} $desc]
+	foreach item [lsort -dict -index 1 $data] {
+	    foreach {symfile label desc} $item break
+	    Tag+ item \
+		    [FmtR mxf $symfile] \
+		    [FmtR mxl $label] \
+		    [list $desc]
+	}
+    } else {
+	Tag+ toc_begin [list {Table Of Contents} Modules]
+	foreach desc [lsort -dict [array names toc]] {
+	    foreach {ref div} $toc($desc) break
+	    TocAlign mxf mxl $div
+
+	    Tag+ division_start [list $desc [Output $ref]]
+	    foreach item [lsort -dict -index 1 $div] {
+		foreach {symfile label desc} $item break
+		Tag+ item \
+			[FmtR mxf $symfile] \
+			[FmtR mxl $label] \
+			[list $desc]
+	    }
+	    Tag+ division_end
+	}
+    }
+
+    Tag+ toc_end
+
+    #puts ____________________\n[join $lines \n]\n_________________________
+    return [join $lines \n]\n
+}
+
+proc ::dtplite::TocWrite {ftoc findex text {map {}}} {
+    variable format
+
+    if {[string equal $format null]} return
+
+    #Print stdout "Writing toc (base) .${ftoc}doc ..."
+    Write [At .${ftoc}doc] $text
+
+    set ft [Output $ftoc]
+
+    doctools::toc::new toc -format $format -file $ft
+    if {[HaveKeywords]} {
+        NavbuttonPush {Keyword Index} [Output $findex] $ftoc
+    }
+    HeaderSetup toc $ft
+    if {[HaveKeywords]} {
+        NavbuttonPop
+    }
+    FooterSetup  toc
+    StyleSetup   toc $ftoc
+
+    foreach {k v} $map {toc map $k $v}
+
+    Print stdout "Writing toc ($format) $ft ..."
+    Write [At $ft] [toc format $text]
+
+    toc destroy
+    return
+}
+
+proc ::dtplite::TocAlign {fv lv div} {
+    upvar 1 $fv mxf $lv mxl
+    set mxf 0
+    set mxl 0
+    foreach item $div {
+	foreach {symfile label desc} $item break
+	Max mxf $symfile
+	Max mxl $label
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Handling Keyword Indices:
+## - Get them out of the base meta data.
+## - As above, and merging them with global index.
+## - Conversion of internals into docidx.
+## - Processing docidx into final formatting.
+
+proc ::dtplite::IdxGet {{f index}} {
+    # Get index out of the meta data.
+    array set keys {}
+    array set kdup {}
+    return [lindex [IdxExtractMeta] 1]
+}
+
+proc ::dtplite::IdxGetSaved {{f index}} {
+    # Get index out of the meta data, merge into global state.
+    variable meta
+    variable kwid
+
+    array set keys {}
+    array set kwid {}
+    array set kdup {}
+    set start 0
+
+    set fqn [At .idx]
+    if {[file exists $fqn]} {
+	foreach {kw kd start ki} [Get $fqn] break
+	array set keys $kw
+	array set kwid $ki
+	array set kdup $kd
+    }
+
+    foreach {start theindex} [IdxExtractMeta $start] break
+
+    # Save extended index for next merge.
+    Write $fqn [list $theindex [array get kdup] $start [array get kwid]]
+
+    return $theindex
+}
+
+proc ::dtplite::IdxExtractMeta {{start 0}} {
+    # Get index out of the meta data.
+    variable meta
+    variable kwid
+
+    upvar keys keys kdup kdup
+    foreach {k item} [array get meta] {
+	foreach {symfile keywords label} [IdxItem $k $item] break
+	# Store inverted file - keyword relationship
+	# Kdup is used to prevent entering of duplicates.
+	# Checks full (keyword file label).
+	foreach k $keywords {
+	    set kx [list $k $symfile $label]
+	    if {![info exists kdup($kx)]} {
+		lappend keys($k) [list $symfile $label]
+		set kdup($kx) .
+	    }
+	    if {[info exist kwid($k)]} continue
+	    set kwid($k) [IdxAnchor $k]
+	    incr start
+	}
+    }
+    return [list $start [array get keys]]
+}
+
+proc ::dtplite::IdxAnchor {text} {
+    set anchor [regsub -all {[^a-zA-Z0-9]} [string tolower $text] {_}]
+    set anchor [regsub -all {__+} $anchor _]
+    return $anchor
+}
+
+proc ::dtplite::IdxItem {f meta} {
+    array set md $meta
+    set keywords $md(keywords)
+    set title    $md(title)
+    return [list $f $keywords $title]
+}
+
+proc ::dtplite::IdxGenerate {desc data} {
+    # Sort by keyword label.
+    # Write as docidx.
+
+    array set keys $data
+
+    TagsBegin
+    Tag+ index_begin [list {Keyword Index} $desc]
+
+    # For a good display we sort keywords in dictionary order.
+    # We ignore their leading non-alphanumeric characters.
+    set kwlist {}
+    foreach kw [array names keys] {
+	set kwx [string trim [regsub -all {^[^a-zA-Z0-9]+} $kw {}]]
+	lappend kwlist [list $kwx $kw]
+    }
+    foreach item [lsort -index 0 -dict $kwlist] {
+	foreach {_ k} $item break
+	IdxAlign mxf $keys($k)
+
+	Tag+ key [list $k]
+	foreach v [lsort -dict -index 1 $keys($k)] {
+	    foreach {file label} $v break
+	    Tag+ manpage [FmtR mxf $file] [list $label]
+	}
+    }
+
+    Tag+ index_end
+    #puts ____________________\n[join $lines \n]\n_________________________
+    return [join $lines \n]\n
+}
+
+proc ::dtplite::IdxWrite {findex ftoc text} {
+    variable format
+
+    if {[string equal $format null]} return
+    if {![HaveKeywords]} return
+
+    #Print stdout "Writing index (base) .idxdoc ..."
+    Write [At .idxdoc] $text
+
+    set fi [Output $findex]
+
+    doctools::idx::new idx -format $format -file $fi
+
+    NavbuttonPush {Table Of Contents} [Output $ftoc] $findex
+    HeaderSetup   idx $findex
+    NavbuttonPop
+    FooterSetup   idx
+    StyleSetup    idx $findex
+    XrefSetupKwid idx
+
+    Print stdout "Writing index ($format) $fi ..."
+    Write [At $fi] [idx format $text]
+
+    idx destroy
+    return
+}
+
+proc ::dtplite::IdxAlign {v keys} {
+    upvar 1 $v mxf
+    set mxf 0
+    foreach item $keys {
+	foreach {symfile label} $item break
+	Max mxf $symfile
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Detect presence of keywords.
+
+proc ::dtplite::HaveKeywords {} {
+    variable   kwid
+    array size kwid
+}
+
+# ### ### ### ######### ######### #########
+## Column sizing
+
+proc ::dtplite::Max {v str} {
+    upvar 1 $v max
+    set l [string length [list $str]]
+    if {$max < $l} {set max $l}
+    return
+}
+
+proc ::dtplite::FmtR {v str} {
+    upvar 1 $v max
+    return [list $str][textutil::repeat::blank \
+	    [expr {$max - [string length [list $str]]}]]
+}
+
+# ### ### ### ######### ######### #########
+## Code generation.
+
+proc ::dtplite::Tag {n args} {
+    if {[llength $args]} {
+	return "\[$n [join $args]\]"
+    } else {
+	return "\[$n\]"
+    }
+    #return \[[linsert $args 0 $n]\]
+}
+
+proc ::dtplite::Tag+ {n args} {
+    upvar 1 lines lines
+    lappend lines [eval [linsert $args 0 ::dtplite::Tag $n]]
+    return
+}
+
+proc ::dtplite::TagsBegin {} {
+    upvar 1 lines lines
+    set lines {}
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Collect all files for possible use as image
+
+proc ::dtplite::MapImages {} {
+    variable input
+    variable output
+    variable single
+    variable stdout
+
+    # Ignore images when writing results to a pipe.
+    if {$stdout} return
+
+    set out  [file normalize $output]
+    set path [file normalize $input]
+    set res  {}
+
+    if {$single} {
+	# output is file, image directory is sibling to it.
+	set imgbase [file join [file dirname $output] image]
+	# input to search is director the input file is in, and below
+	set path    [file dirname $path]
+    } else {
+	# output is directory, image directory is inside.
+	set imgbase [file join $out image]
+    }
+
+    set n [llength [file split $path]]
+
+    foreach f [::fileutil::find $path] {
+	MapImage \
+	    [::fileutil::stripN $f $n] \
+	    $f [file join $imgbase [file tail $f]]
+    }
+    return
+}
+
+proc ::dtplite::MapImage {path orig dest} {
+    # A file a/b/x.y is stored under
+    # a/b/x.y, b/x.y, and x.y
+
+    variable imap
+    set plist [file split $path]
+    while {[llength $plist]} {
+	set imap([join $plist /]) [list $orig $dest]
+	set plist [lrange $plist 1 end]
+    }
+    return
+}
+
+proc ::dtplite::MapSetup {dt} {
+    # imap :: map (symbolicfile -> list (originpath,destpath)))
+    variable imap
+    # Skip if no data available
+
+    #puts MIS|[array size imap]|
+    if {![array size imap]} return
+
+    foreach sf [array names imap] {
+	foreach {origin destination} $imap($sf) break
+	$dt img $sf $origin $destination
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Find the documents to process.
+
+proc ::dtplite::LocateManpages {path} {
+    set path [file normalize $path]
+    set n    [llength [file split $path]]
+    set res  {}
+    foreach f [::fileutil::find $path ::dtplite::IsDoctools] {
+	lappend res [::fileutil::stripN $f $n]
+    }
+    return $res
+}
+
+proc ::dtplite::IsDoctools {f} {
+    set res [expr {[in [::fileutil::fileType $f] doctools] && ![Excluded [file normalize $f]]}]
+    #puts ...$f\t$res\t|[fileutil::fileType $f]|\texcluded=[Excluded [file normalize $f]]\tin.[pwd]
+    return $res
+}
+
+proc ::dtplite::Excluded {f} {
+    variable excl
+    foreach p $excl {
+	if {[string match $p $f]} {return 1}
+    }
+    return 0
+}
+
+# ### ### ### ######### ######### #########
+## Handling a style sheet
+## - Decoupling output from input location.
+## - Generate HTML to insert into a generated document.
+
+proc ::dtplite::StyleMakeLocal {{pfx {}}} {
+    variable style
+    if {[string equal $style ""]} return
+    set base [file join $pfx [file tail $style]]
+
+    # TODO input == output does what here ?
+
+    file copy -force $style [At $base]
+    set style $base
+    return
+}
+
+proc ::dtplite::StyleSetup {o {f {}}} {
+    variable style
+    if {[string equal $style ""]}   return
+    if {![in [$o parameters] meta]} return
+
+    if {![string equal $f ""]} {
+	set dst [fileutil::relativeUrl $f $style]
+    } else {
+	set dst $style
+    }
+    set value "<link\
+	    rel=\"stylesheet\"\
+	    href=\"$dst\"\
+	    type=\"text/css\">"
+
+    $o setparam meta $value
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Handling the cross references
+## - Getting them out of the base meta data.
+## - ditto, plus merging with saved xref information.
+## - Insertion into processor, cached list.
+## - Setting up the keyword-2-anchor map.
+
+proc ::dtplite::XrefGet {} {
+    variable meta
+    variable xref
+    variable kwid
+
+    array set keys {}
+    foreach {symfile item} [array get meta] {
+	array set md $item
+	# Cross-references ... File based, see-also
+
+	set t  $md(title)
+	set ts ${t}($md(section))
+	set td $md(desc)
+
+	set xref(sa,$t)  [set _ [list $symfile]]
+	set xref(sa,$ts) $_
+	set xref($t)     $_ ; # index on manpage file name
+	set xref($ts)    $_ ; # ditto, with section added
+	set xref($td)    $_ ; # index on document title
+
+	# Store an inverted file - keyword relationship, for the index
+	foreach kw $md(keywords) {
+	    lappend keys($kw) $symfile
+	}
+    }
+
+    set if [Output index]
+    foreach k [array names keys] {
+	if {[info exists xref(kw,$k)]} continue
+
+	set frag $kwid($k)
+	set xref(kw,$k) [set _ [list $if $frag]]
+	set xref($k)    $_
+    }
+    return
+}
+
+proc ::dtplite::XrefGetSaved {} {
+    # xref :: map (xrefid -> list (symbolicfile))
+    variable  xref
+    array set xref {}
+
+    # Load old cross references, from a previous run
+    set fqn [At .xrf]
+    if {[file exists $fqn]} {
+	array set xref [set s [Get $fqn]]
+    }
+
+    # Add any new cross references ...
+    XrefGet
+    Write $fqn [array get xref]
+    return
+}
+
+proc ::dtplite::XrefSetup {o} {
+    # xref :: map (xrefid -> list (symbolicfile))
+    variable xref
+    # Skip if no data available
+    if {![array size xref]}         return
+    # Skip if backend doesn't support an index
+    if {![in [$o parameters] xref]} return
+
+    # Transfer index data to the backend. The data we keep has to be
+    # re-formatted from a dict into a list of tuples with leading
+    # xrefid.
+
+    # xrefl :: list (list (xrefid symbolicfile...)...)
+    variable xrefl
+    if {![info exist xrefl]} {
+	set xrefl {}
+	foreach k [array names xref] {
+	    lappend xrefl [linsert $xref($k) 0 $k]
+	    set f [lindex $xref($k) 0]
+	    dt map $f [At $f]
+	}
+    }
+    $o setparam xref $xrefl
+    return
+}
+
+proc ::dtplite::XrefSetupKwid {o} {
+    # kwid :: map (label -> anchorname)
+    variable kwid
+    # Skip if no data available
+    if {![array size kwid]}         return
+    # Skip if backend doesn't support an index
+    if {![in [$o parameters] kwid]} return
+    # Transfer index data to the backend
+    $o setparam kwid [array get kwid]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Extending and shrinking the navigation bar.
+
+proc ::dtplite::NavbuttonPush {label file ref} {
+    # nav = list (list (label reference) ...)
+    variable nav
+    #set file [fileutil::relativeUrl $ref $file]]]
+    set      nav [linsert $nav 0 [list $label $file]]
+    return
+}
+
+proc ::dtplite::NavbuttonPop {} {
+    # nav = list (list (label reference) ...)
+    variable nav
+    set      nav [lrange $nav 1 end]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Header/Footer mgmt
+## Header is merged from regular header, plus nav bar.
+## Caching the merge result for quicker future access.
+
+proc ::dtplite::HeaderSetup {o ref} {
+    variable header
+    variable nav
+    variable prenav
+    variable postnav
+    variable raw
+
+    # Activate raw mode, if supported and requested.
+    if {[in [$o parameters] raw] && $raw} {
+	$o setparam raw 1
+    }
+    
+    # We cannot generate a navigation bar if the output format does
+    # not support a "header".
+    if {![in [$o parameters] header]} return
+
+    # Do not generate a navigation bar if no content was specified for
+    # it, at all.
+    if {![llength $prenav] &&
+	![llength $postnav] &&
+	![llength $nav] &&
+	[string equal $header ""]} return
+
+    $o setparam header [Navbar $nav $ref]
+    return
+}
+
+proc ::dtplite::Navbar {nav ref} {
+    variable header
+    variable prenav
+    variable postnav
+
+    set sep 0
+    set first 1
+    set hdr ""
+
+    append hdr [NavbarSegment sep first $prenav  $ref]
+    append hdr [NavbarSegment sep first $nav     $ref]
+    append hdr [NavbarSegment sep first $postnav $ref]
+
+    if {[string length $hdr]} {
+	set hdr "<hr> \[\n $hdr \] <hr>\n"
+    }
+    if {![string equal $header ""]} {
+	set hdr "$header $hdr"
+    }
+    return $hdr
+}
+
+proc ::dtplite::NavbarSegment {sepv firstv nav ref} {
+    if {![llength $nav]} { return {} }
+    upvar 1 $sepv sep $firstv first
+
+    if {$sep} {append hdr <br>\n}
+    set sep 0
+
+    foreach item $nav {
+	if {!$first} {append hdr "&#124; "} else {append hdr "  "}
+	set first 0
+	foreach {label url} $item break
+
+	if {[string length $ref] &&
+	    ![string match *://* $url] &&
+	    ![string match /*    $url]} {
+	    # The specified url is a plain relative path and we have a
+	    # proper referent.  We assume that this path is relative
+	    # to the toplevel toc and index files we are generating,
+	    # and transform it here to be relative to the referent
+	    # instead.
+	    set url [fileutil::relativeUrl $ref $url]
+	}
+	append hdr "<a href=\"" $url "\">" $label "</a>\n"
+    }
+    return $hdr
+}
+
+proc ::dtplite::FooterSetup {o} {
+    variable footer
+    if {[string equal $footer ""]}    return
+    if {![in [$o parameters] footer]} return
+    $o setparam footer $footer
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Invoking the functionality.
+
+proc ::dtplite::print-via {cmd} {
+    variable print $cmd
+    return
+}
+
+proc ::dtplite::do {arguments} {
+    Init
+
+    if {[catch {
+	ProcessCmdline $arguments
+    }]} {
+	return 1
+    }
+    if {[catch {
+	set mode $::dtplite::mode
+	Do.$mode
+    } msg]} {
+	## puts $::errorInfo
+	dt destroy
+	ArgError $msg
+	return 1
+    }
+    dt destroy
+    return 0
+}
+
+# ### ### ### ######### ######### #########
+return
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dtplite/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dtplite/pkgIndex.tcl
new file mode 100644
index 00000000..941c5c75
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/dtplite/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded dtplite 1.3.1 [list source [file join $dir dtplite.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/decode.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/decode.tcl
new file mode 100644
index 00000000..02ce8a6a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/decode.tcl
@@ -0,0 +1,207 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Copyright (c) 2008-2009 ActiveState Software Inc., Andreas Kupries
+##                    2016 Andreas Kupries
+## BSD License
+##
+# Package to help the writing of file decoders. Provides generic
+# low-level support commands.
+
+package require Tcl 8.4
+
+namespace eval ::fileutil::decode {
+    namespace export mark go rewind at
+    namespace export byte short-le long-le nbytes skip
+    namespace export unsigned match recode getval
+    namespace export clear get put putloc setbuf
+}
+
+# ### ### ### ######### ######### #########
+##
+
+proc ::fileutil::decode::open {fname} {
+    variable chan
+    set chan [::open $fname r]
+    fconfigure $chan \
+	-translation binary \
+	-encoding    binary \
+	-eofchar     {}
+    return
+}
+
+proc ::fileutil::decode::close {} {
+    variable chan
+    ::close $chan
+}
+
+# ### ### ### ######### ######### #########
+##
+
+proc ::fileutil::decode::mark {} {
+    variable chan
+    variable mark
+    set mark [tell $chan]
+    return
+}
+
+proc ::fileutil::decode::go {to} {
+    variable chan
+    seek $chan $to start
+    return
+}
+
+proc ::fileutil::decode::rewind {} {
+    variable chan
+    variable mark
+    if {$mark == {}} {
+	return -code error \
+	    -errorcode {FILE DECODE NO MARK} \
+	    "No mark to rewind to"
+    }
+    seek $chan $mark start
+    set mark {}
+    return
+}
+
+proc ::fileutil::decode::at {} {
+    variable chan
+    return [tell $chan]
+}
+
+# ### ### ### ######### ######### #########
+##
+
+proc ::fileutil::decode::byte {} {
+    variable chan
+    variable mask 0xff
+    variable val [read $chan 1]
+    binary scan $val c val
+    return
+}
+
+proc ::fileutil::decode::short-le {} {
+    variable chan
+    variable mask 0xffff
+    variable val [read $chan 2]
+    binary scan $val s val
+    return
+}
+
+proc ::fileutil::decode::long-le {} {
+    variable chan
+    variable mask 0xffffffff
+    variable val [read $chan 4]
+    binary scan $val i val
+    return
+}
+
+proc ::fileutil::decode::nbytes {n} {
+    variable chan
+    variable mask {}
+    variable val [read $chan $n]
+    return
+}
+
+proc ::fileutil::decode::skip {n} {
+    variable chan
+    #read $chan $n
+    seek $chan $n current
+    return
+}
+
+# ### ### ### ######### ######### #########
+##
+
+proc ::fileutil::decode::unsigned {} {
+    variable val
+    if {$val >= 0} return
+    variable mask
+    if {$mask eq {}} {
+	return -code error \
+	    -errorcode {FILE DECODE ILLEGAL UNSIGNED} \
+	    "Unsigned not possible here"
+    }
+    set val [format %u [expr {$val & $mask}]]
+    return
+}
+
+proc ::fileutil::decode::match {eval} {
+    variable val
+
+    #puts "Match: Expected $eval, Got: [format 0x%08x $val]"
+
+    if {$val == $eval} {return 1}
+    rewind
+    return 0
+}
+
+proc ::fileutil::decode::recode {cmdpfx} {
+    variable val
+    lappend cmdpfx $val
+    set val [uplevel 1 $cmdpfx]
+    return
+}
+
+proc ::fileutil::decode::getval {} {
+    variable val
+    return $val
+}
+
+# ### ### ### ######### ######### #########
+##
+
+proc ::fileutil::decode::clear {} {
+    variable buf {}
+    return
+}
+
+proc ::fileutil::decode::get {} {
+    variable buf
+    return $buf
+}
+
+proc ::fileutil::decode::setbuf {list} {
+    variable buf $list
+    return
+}
+
+proc ::fileutil::decode::put {name} {
+    variable buf
+    variable val
+    lappend buf $name $val
+    return
+}
+
+proc ::fileutil::decode::putloc {name} {
+    variable buf
+    variable chan
+    lappend buf $name [tell $chan]
+    return
+}
+
+# ### ### ### ######### ######### #########
+##
+
+namespace eval ::fileutil::decode {
+    # Stream to read from
+    variable chan {}
+
+    # Last value read from the stream, or modified through decoder
+    # operations.
+    variable val  {}
+
+    # Remembered location in the stream
+    variable mark {}
+
+    # Buffer for accumulating structured results
+    variable buf  {}
+
+    # Mask for trimming a value to unsigned.
+    # Size-dependent
+    variable mask {}
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide fileutil::decode 0.2.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/fileutil.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/fileutil.tcl
new file mode 100644
index 00000000..cb9c6274
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/fileutil.tcl
@@ -0,0 +1,2311 @@
+# fileutil.tcl --
+#
+#	Tcl implementations of standard UNIX utilities.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+# Copyright (c) 2002      by Phil Ehrens <phil@slug.org> (fileType)
+# Copyright (c) 2005-2013 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.2
+package require cmdline
+package provide fileutil 1.16.1
+
+namespace eval ::fileutil {
+    namespace export \
+	    grep find findByPattern cat touch foreachLine \
+	    jail stripPwd stripN stripPath tempdir tempfile \
+	    install fileType writeFile appendToFile \
+	    insertIntoFile removeFromFile replaceInFile \
+	    updateInPlace test tempdirReset maketempdir
+}
+
+# ::fileutil::grep --
+#
+#	Implementation of grep.  Adapted from the Tcler's Wiki.
+#
+# Arguments:
+#	pattern		pattern to search for.
+#	files		list of files to search; if NULL, uses stdin.
+#
+# Results:
+#	results		list of matches
+
+proc ::fileutil::grep {pattern {files {}}} {
+    set result [list]
+    if {[llength $files] == 0} {
+	# read from stdin
+	set lnum 0
+	while {[gets stdin line] >= 0} {
+	    incr lnum
+	    if {[regexp -- $pattern $line]} {
+		lappend result "${lnum}:${line}"
+	    }
+	}
+    } else {
+	foreach filename $files {
+	    set file [open $filename r]
+	    set lnum 0
+	    while {[gets $file line] >= 0} {
+		incr lnum
+		if {[regexp -- $pattern $line]} {
+		    lappend result "${filename}:${lnum}:${line}"
+		}
+	    }
+	    close $file
+	}
+    }
+    return $result
+}
+
+# ::fileutil::find ==
+
+# Below is the core command, which is portable across Tcl versions and
+# platforms. Functionality which is common or platform and/or Tcl
+# version dependent, has been factored out/ encapsulated into separate
+# (small) commands. Only these commands may have multiple variant
+# implementations per the available features of the Tcl core /
+# platform.
+#
+# These commands are
+#
+# FADD   - Add path result, performs filtering. Portable!
+# GLOBF  - Return files in a directory.         Tcl version/platform dependent.
+# GLOBD  - Return dirs  in a directory.         Tcl version/platform dependent.
+# ACCESS - Check directory for accessibility.   Tcl version/platform dependent.
+
+proc ::fileutil::find {{basedir .} {filtercmd {}}} {
+    set result {}
+    set filt   [string length $filtercmd]
+
+    if {[file isfile $basedir]} {
+	# The base is a file, and therefore only possible result,
+	# modulo filtering.
+
+	FADD $basedir
+
+    } elseif {[file isdirectory $basedir]} {
+	# For a directory as base we do an iterative recursion through
+	# the directory hierarchy starting at the base. We use a queue
+	# (Tcl list) of directories we have to check. We access it by
+	# index, and stop when we have reached beyond the end of the
+	# list. This is faster than removing elements from the be-
+	# ginning of the list, as that entails copying down a possibly
+	# large list of directories, making it O(n*n). The index is
+	# faster, O(n), at the expense of memory. Nothing is deleted
+	# from the list until we have processed all directories in the
+	# hierarchy.
+	#
+	# We scan each directory at least twice. First for files, then
+	# for directories. The scans may internally make several
+	# passes (normal vs hidden files).
+	#
+	# Looped directory structures due to symbolic links are
+	# handled by _fully_ normalizing directory paths and checking
+	# if we encountered the normalized form before. The array
+	# 'known' is our cache where we record the known normalized
+	# paths.
+
+	set pending [list $basedir]
+	set at      0
+	array set   parent {}
+	array set   norm   {}
+	Enter {} $basedir
+
+	while {$at < [llength $pending]} {
+	    # Get next directory not yet processed.
+	    set current [lindex $pending $at]
+	    incr at
+
+	    # Is the directory accessible? Continue if not.
+	    ACCESS $current
+
+	    # Files first, then the sub-directories ...
+
+	    foreach f [GLOBF $current] { FADD $f }
+
+	    foreach f [GLOBD $current] {
+		# Ignore current and parent directory, this needs
+		# explicit filtering outside of the filter command.
+		if {
+		    [string equal [file tail $f]  "."] ||
+		    [string equal [file tail $f] ".."]
+		} continue
+
+		# Extend result, modulo filtering.
+		FADD $f
+
+		# Detection of symlink loops via a portable path
+		# normalization computing a canonical form of the path
+		# followed by a check if that canonical form was
+		# encountered before. If ok, record directory for
+		# expansion in future iterations.
+
+		Enter $current $f
+		if {[Cycle $f]} continue
+
+		lappend pending $f
+	    }
+	}
+    } else {
+	return -code error "$basedir does not exist"
+    }
+
+    return $result
+}
+
+proc  ::fileutil::Enter {parent path} {
+    upvar 1 parent _parent norm _norm
+    set _parent($path) $parent
+    set _norm($path)   [fullnormalize $path]
+    return
+}
+
+proc  ::fileutil::Cycle {path} {
+    upvar 1 parent _parent norm _norm
+    set nform $_norm($path)
+    set paren $_parent($path)
+    while {$paren ne {}} {
+	if {$_norm($paren) eq $nform} { return yes }
+	set paren $_parent($paren)
+    }
+    return no
+}
+
+# Helper command for fileutil::find. Performs the filtering of the
+# result per a filter command for the candidates found by the
+# traversal core, see above. This is portable.
+
+proc ::fileutil::FADD {filename} {
+    upvar 1 result result filt filt filtercmd filtercmd
+    if {!$filt} {
+	lappend result $filename
+	return
+    }
+
+    set here [pwd]
+    cd [file dirname $filename]
+
+    if {[uplevel 2 [linsert $filtercmd end [file tail $filename]]]} {
+	lappend result $filename
+    }
+
+    cd $here
+    return
+}
+
+# The next three helper commands for fileutil::find depend strongly on
+# the version of Tcl, and partially on the platform.
+
+# 1. The -directory and -types switches were added to glob in Tcl
+#    8.3. This means that we have to emulate them for Tcl 8.2.
+#
+# 2. In Tcl 8.3 using -types f will return only true files, but not
+#    links to files. This changed in 8.4+ where links to files are
+#    returned as well. So for 8.3 we have to handle the links
+#    separately (-types l) and also filter on our own.
+#    Note that Windows file links are hard links which are reported by
+#    -types f, but not -types l, so we can optimize that for the two
+#    platforms.
+#
+#    Note further that we have to handle broken links on our own. They
+#    are not returned by glob yet we want them in the output.
+#
+# 3. In Tcl 8.3 we also have a crashing bug in glob (SIGABRT, "stat on
+#    a known file") when trying to perform 'glob -types {hidden f}' on
+#    a directory without e'x'ecute permissions. We code around by
+#    testing if we can cd into the directory (stat might return enough
+#    information too (mode), but possibly also not portable).
+#
+#    For Tcl 8.2 and 8.4+ glob simply delivers an empty result
+#    (-nocomplain), without crashing. For them this command is defined
+#    so that the bytecode compiler removes it from the bytecode.
+#
+#    This bug made the ACCESS helper necessary.
+#    We code around the problem by testing if we can cd into the
+#    directory (stat might return enough information too (mode), but
+#    possibly also not portable).
+
+if {[package vsatisfies [package present Tcl] 8.5]} {
+    # Tcl 8.5+.
+    # We have to check readability of "current" on our own, glob
+    # changed to error out instead of returning nothing.
+
+    proc ::fileutil::ACCESS {args} {}
+
+    proc ::fileutil::GLOBF {current} {
+	if {![file readable $current] ||
+	    [BadLink $current]} {
+	    return {}
+	}
+
+	set res [lsort -unique [concat \
+		     [glob -nocomplain -directory $current -types f          -- *] \
+		     [glob -nocomplain -directory $current -types {hidden f} -- *]]]
+
+	# Look for broken links (They are reported as neither file nor directory).
+	foreach l [lsort -unique [concat \
+		       [glob -nocomplain -directory $current -types l          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden l} -- *]]] {
+	    if {[file isfile      $l]} continue
+	    if {[file isdirectory $l]} continue
+	    lappend res $l
+	}
+	return [lsort -unique $res]
+    }
+
+    proc ::fileutil::GLOBD {current} {
+	if {![file readable $current] ||
+	    [BadLink $current]} {
+	    return {}
+	}
+
+	lsort -unique [concat \
+	   [glob -nocomplain -directory $current -types d          -- *] \
+	   [glob -nocomplain -directory $current -types {hidden d} -- *]]
+    }
+
+    proc ::fileutil::BadLink {current} {
+	if {[file type $current] ne "link"} { return no }
+
+	set dst [file join [file dirname $current] [file readlink $current]]
+
+	if {![file exists   $dst] ||
+	    ![file readable $dst]} {
+	    return yes
+	}
+
+	return no
+    }
+} elseif {[package vsatisfies [package present Tcl] 8.4]} {
+    # Tcl 8.4+.
+    # (Ad 1) We have -directory, and -types,
+    # (Ad 2) Links are returned for -types f/d if they refer to files/dirs.
+    # (Ad 3) No bug to code around
+
+    proc ::fileutil::ACCESS {args} {}
+
+    proc ::fileutil::GLOBF {current} {
+	set res [lsort -unique [concat \
+		    [glob -nocomplain -directory $current -types f          -- *] \
+		    [glob -nocomplain -directory $current -types {hidden f} -- *]]]
+
+	# Look for broken links (They are reported as neither file nor directory).
+	foreach l [lsort -unique [concat \
+		       [glob -nocomplain -directory $current -types l          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden l} -- *]]] {
+	    if {[file isfile      $l]} continue
+	    if {[file isdirectory $l]} continue
+	    lappend res $l
+	}
+	return [lsort -unique $res]
+    }
+
+    proc ::fileutil::GLOBD {current} {
+	lsort -unique [concat \
+	    [glob -nocomplain -directory $current -types d          -- *] \
+	    [glob -nocomplain -directory $current -types {hidden d} -- *]]
+    }
+
+} elseif {[package vsatisfies [package present Tcl] 8.3]} {
+    # 8.3.
+    # (Ad 1) We have -directory, and -types,
+    # (Ad 2) Links are NOT returned for -types f/d, collect separately.
+    #        No symbolic file links on Windows.
+    # (Ad 3) Bug to code around.
+
+    proc ::fileutil::ACCESS {current} {
+	if {[catch {
+	    set h [pwd] ; cd $current ; cd $h
+	}]} {return -code continue}
+	return
+    }
+
+    if {[string equal $::tcl_platform(platform) windows]} {
+	proc ::fileutil::GLOBF {current} {
+	    concat \
+		[glob -nocomplain -directory $current -types f          -- *] \
+		[glob -nocomplain -directory $current -types {hidden f} -- *]]
+	}
+    } else {
+	proc ::fileutil::GLOBF {current} {
+	    set l [concat \
+		       [glob -nocomplain -directory $current -types f          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden f} -- *]]
+
+	    foreach x [concat \
+			   [glob -nocomplain -directory $current -types l          -- *] \
+			   [glob -nocomplain -directory $current -types {hidden l} -- *]] {
+		if {[file isdirectory $x]} continue
+		# We have now accepted files, links to files, and broken links.
+		lappend l $x
+	    }
+
+	    return $l
+	}
+    }
+
+    proc ::fileutil::GLOBD {current} {
+	set l [concat \
+		   [glob -nocomplain -directory $current -types d          -- *] \
+		   [glob -nocomplain -directory $current -types {hidden d} -- *]]
+
+	foreach x [concat \
+		       [glob -nocomplain -directory $current -types l          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden l} -- *]] {
+	    if {![file isdirectory $x]} continue
+	    lappend l $x
+	}
+
+	return $l
+    }
+} else {
+    # 8.2.
+    # (Ad 1,2,3) We do not have -directory, nor -types. Full emulation required.
+
+    proc ::fileutil::ACCESS {args} {}
+
+    if {[string equal $::tcl_platform(platform) windows]} {
+	# Hidden files cannot be handled by Tcl 8.2 in glob. We have
+	# to punt.
+
+	proc ::fileutil::GLOBF {current} {
+	    set current \\[join [split $current {}] \\]
+	    set res {}
+	    foreach x [glob -nocomplain -- [file join $current *]] {
+		if {[file isdirectory $x]} continue
+		if {[catch {file type $x}]} continue
+		# We have now accepted files, links to files, and
+		# broken links. We may also have accepted a directory
+		# as well, if the current path was inaccessible. This
+		# however will cause 'file type' to throw an error,
+		# hence the second check.
+		lappend res $x
+	    }
+	    return $res
+	}
+
+	proc ::fileutil::GLOBD {current} {
+	    set current \\[join [split $current {}] \\]
+	    set res {}
+	    foreach x [glob -nocomplain -- [file join $current *]] {
+		if {![file isdirectory $x]} continue
+		lappend res $x
+	    }
+	    return $res
+	}
+    } else {
+	# Hidden files on Unix are dot-files. We emulate the switch
+	# '-types hidden' by using an explicit pattern.
+
+	proc ::fileutil::GLOBF {current} {
+	    set current \\[join [split $current {}] \\]
+	    set res {}
+	    foreach x [glob -nocomplain -- [file join $current *] [file join $current .*]] {
+		if {[file isdirectory $x]} continue
+		if {[catch {file type $x}]} continue
+		# We have now accepted files, links to files, and
+		# broken links. We may also have accepted a directory
+		# as well, if the current path was inaccessible. This
+		# however will cause 'file type' to throw an error,
+		# hence the second check.
+
+		lappend res $x
+	    }
+	    return $res
+	}
+
+	proc ::fileutil::GLOBD {current} {
+	    set current \\[join [split $current {}] \\]
+	    set res {}
+	    foreach x [glob -nocomplain -- $current/* [file join $current .*]] {
+		if {![file isdirectory $x]} continue
+		lappend res $x
+	    }
+	    return $res
+	}
+    }
+}
+
+# ::fileutil::findByPattern --
+#
+#	Specialization of find. Finds files based on their names,
+#	which have to match the specified patterns. Options are used
+#	to specify which type of patterns (regexp-, glob-style) is
+#	used.
+#
+# Arguments:
+#	basedir		Directory to start searching from.
+#	args		Options (-glob, -regexp, --) followed by a
+#			list of patterns to search for.
+#
+# Results:
+#	files		a list of interesting files.
+
+proc ::fileutil::findByPattern {basedir args} {
+    set pos 0
+    set cmd ::fileutil::FindGlob
+    foreach a $args {
+	incr pos
+	switch -glob -- $a {
+	    --      {break}
+	    -regexp {set cmd ::fileutil::FindRegexp}
+	    -glob   {set cmd ::fileutil::FindGlob}
+	    -*      {return -code error "Unknown option $a"}
+	    default {incr pos -1 ; break}
+	}
+    }
+
+    set args [lrange $args $pos end]
+
+    if {[llength $args] != 1} {
+	set pname [lindex [info level 0] 0]
+	return -code error \
+		"wrong#args for \"$pname\", should be\
+		\"$pname basedir ?-regexp|-glob? ?--? patterns\""
+    }
+
+    set patterns [lindex $args 0]
+    return [find $basedir [list $cmd $patterns]]
+}
+
+
+# ::fileutil::FindRegexp --
+#
+#	Internal helper. Filter command used by 'findByPattern'
+#	to match files based on regular expressions.
+#
+# Arguments:
+#	patterns	List of regular expressions to match against.
+#	filename	Name of the file to match against the patterns.
+# Results:
+#	interesting	A boolean flag. Set to true if the file
+#			matches at least one of the patterns.
+
+proc ::fileutil::FindRegexp {patterns filename} {
+    foreach p $patterns {
+	if {[regexp -- $p $filename]} {
+	    return 1
+	}
+    }
+    return 0
+}
+
+# ::fileutil::FindGlob --
+#
+#	Internal helper. Filter command used by 'findByPattern'
+#	to match files based on glob expressions.
+#
+# Arguments:
+#	patterns	List of glob expressions to match against.
+#	filename	Name of the file to match against the patterns.
+# Results:
+#	interesting	A boolean flag. Set to true if the file
+#			matches at least one of the patterns.
+
+proc ::fileutil::FindGlob {patterns filename} {
+    foreach p $patterns {
+	if {[string match $p $filename]} {
+	    return 1
+	}
+    }
+    return 0
+}
+
+# ::fileutil::stripPwd --
+#
+#	If the specified path references is a path in [pwd] (or [pwd] itself) it
+#	is made relative to [pwd]. Otherwise it is left unchanged.
+#	In the case of [pwd] itself the result is the string '.'.
+#
+# Arguments:
+#	path		path to modify
+#
+# Results:
+#	path		The (possibly) modified path.
+
+proc ::fileutil::stripPwd {path} {
+
+    # [file split] is used to generate a canonical form for both
+    # paths, for easy comparison, and also one which is easy to modify
+    # using list commands.
+
+    set pwd [pwd]
+    if {[string equal $pwd $path]} {
+	return "."
+    }
+
+    set pwd   [file split $pwd]
+    set npath [file split $path]
+
+    if {[string match ${pwd}* $npath]} {
+	set path [eval [linsert [lrange $npath [llength $pwd] end] 0 file join ]]
+    }
+    return $path
+}
+
+# ::fileutil::stripN --
+#
+#	Removes N elements from the beginning of the path.
+#
+# Arguments:
+#	path		path to modify
+#	n		number of elements to strip
+#
+# Results:
+#	path		The modified path
+
+proc ::fileutil::stripN {path n} {
+    set path [file split $path]
+    if {$n >= [llength $path]} {
+	return {}
+    } else {
+	return [eval [linsert [lrange $path $n end] 0 file join]]
+    }
+}
+
+# ::fileutil::stripPath --
+#
+#	If the specified path references/is a path in prefix (or prefix itself) it
+#	is made relative to prefix. Otherwise it is left unchanged.
+#	In the case of it being prefix itself the result is the string '.'.
+#
+# Arguments:
+#	prefix		prefix to strip from the path.
+#	path		path to modify
+#
+# Results:
+#	path		The (possibly) modified path.
+
+if {[string equal $tcl_platform(platform) windows]} {
+
+    # Windows. While paths are stored with letter-case preserved al
+    # comparisons have to be done case-insensitive. For reference see
+    # SF Tcllib Bug 2499641.
+
+    proc ::fileutil::stripPath {prefix path} {
+	# [file split] is used to generate a canonical form for both
+	# paths, for easy comparison, and also one which is easy to modify
+	# using list commands.
+
+	set prefix [file split $prefix]
+	set npath  [file split $path]
+
+	if {[string equal -nocase $prefix $npath]} {
+	    return "."
+	}
+
+	if {[string match -nocase "${prefix} *" $npath]} {
+	    set path [eval [linsert [lrange $npath [llength $prefix] end] 0 file join ]]
+	}
+	return $path
+    }
+} else {
+    proc ::fileutil::stripPath {prefix path} {
+	# [file split] is used to generate a canonical form for both
+	# paths, for easy comparison, and also one which is easy to modify
+	# using list commands.
+
+	set prefix [file split $prefix]
+	set npath  [file split $path]
+
+	if {[string equal $prefix $npath]} {
+	    return "."
+	}
+
+	if {[string match "${prefix} *" $npath]} {
+	    set path [eval [linsert [lrange $npath [llength $prefix] end] 0 file join ]]
+	}
+	return $path
+    }
+}
+
+# ::fileutil::jail --
+#
+#	Ensures that the input path 'filename' stays within the
+#	directory 'jail'. In this way it prevents user-supplied paths
+#	from escaping the jail.
+#
+# Arguments:
+#	jail		The path to the directory the other must
+#			not escape from.
+#	filename	The path to prevent from escaping.
+#
+# Results:
+#	path		The (possibly) modified path surely within
+#			the confines of the jail.
+
+proc fileutil::jail {jail filename} {
+    if {![string equal [file pathtype $filename]  "relative"]} {
+	# Although the path to check is absolute (or volumerelative on
+	# windows) we cannot perform a simple prefix check to see if
+	# the path is inside the jail or not. We have to normalize
+	# both path and jail and then we can check. If the path is
+	# outside we make the original path relative and prefix it
+	# with the original jail. We do make the jail pseudo-absolute
+	# by prefixing it with the current working directory for that.
+
+	# Normalized jail. Fully resolved sym links, if any. Our main
+	# complication is that normalize does not resolve symlinks in the
+	# last component of the path given to it, so we add a bogus
+	# component, resolve, and then strip it off again. That is why the
+	# code is so large and long.
+
+	set njail [eval [list file join] [lrange [file split \
+		[Normalize [file join $jail __dummy__]]] 0 end-1]]
+
+	# Normalize filename. Fully resolved sym links, if
+	# any. S.a. for an explanation of the complication.
+
+	set nfile [eval [list file join] [lrange [file split \
+		[Normalize [file join $filename __dummy__]]] 0 end-1]]
+
+	if {[string match ${njail}* $nfile]} {
+	    return $filename
+	}
+
+	# Outside the jail, put it inside. ... We normalize the input
+	# path lexically for this, to prevent escapes still lurking in
+	# the original path. (We cannot use the normalized path,
+	# symlinks may have bent it out of shape in unrecognizable ways.
+
+	return [eval [linsert [lrange [file split \
+		[lexnormalize $filename]] 1 end] 0 file join [pwd] $jail]]
+    } else {
+	# The path is relative, consider it as outside
+	# implicitly. Normalize it lexically! to prevent escapes, then
+	# put the jail in front, use PWD to ensure absoluteness.
+
+	return [eval [linsert [file split [lexnormalize $filename]] 0 \
+		file join [pwd] $jail]]
+    }
+}
+
+
+# ::fileutil::test --
+#
+#	Simple API to testing various properties of
+#	a path (read, write, file/dir, existence)
+#
+# Arguments:
+#	path	path to test
+#	codes	names of the properties to test
+#	msgvar	Name of variable to leave an error
+#		message in. Optional.
+#	label	Label for error message, optional
+#
+# Results:
+#	ok	boolean flag, set if the path passes
+#		all tests.
+
+namespace eval ::fileutil {
+    variable  test
+    array set test {
+	read   {readable    {Read access is denied}}
+	write  {writable    {Write access is denied}}
+	exec   {executable  {Is not executable}}
+	exists {exists      {Does not exist}}
+	file   {isfile      {Is not a file}}
+	dir    {isdirectory {Is not a directory}}
+    }
+}
+
+proc ::fileutil::test {path codes {msgvar {}} {label {}}} {
+    variable test
+
+    if {[string equal $msgvar ""]} {
+	set msg ""
+    } else {
+	upvar 1 $msgvar msg
+    }
+
+    if {![string equal $label ""]} {append label { }}
+
+    if {![regexp {^(read|write|exec|exists|file|dir)} $codes]} {
+	# Translate single characters into proper codes
+	set codes [string map {
+	    r read w write e exists x exec f file d dir
+	} [split $codes {}]]
+    }
+
+    foreach c $codes {
+	foreach {cmd text} $test($c) break
+	if {![file $cmd $path]} {
+	    set msg "$label\"$path\": $text"
+	    return 0
+	}
+    }
+
+    return 1
+}
+
+# ::fileutil::cat --
+#
+#	Tcl implementation of the UNIX "cat" command.  Returns the contents
+#	of the specified files.
+#
+# Arguments:
+#	args	names of the files to read, interspersed with options
+#		to set encodings, translations, or eofchar.
+#
+# Results:
+#	data	data read from the file.
+
+proc ::fileutil::cat {args} {
+    # Syntax: (?options? file)+
+    # options = -encoding    ENC
+    #         | -translation TRA
+    #         | -eofchar     ECH
+    #         | --
+
+    if {![llength $args]} {
+	# Argument processing stopped with arguments missing.
+	return -code error \
+		"wrong#args: should be\
+		[lindex [info level 0] 0] ?-eofchar|-translation|-encoding arg?+ file ..."
+    }
+
+    # We go through the arguments using foreach and keeping track of
+    # the index we are at. We do not shift the arguments out to the
+    # left. That is inherently quadratic, copying everything down.
+
+    set opts {}
+    set mode maybeopt
+    set channels {}
+
+    foreach a $args {
+	if {[string equal $mode optarg]} {
+	    lappend opts $a
+	    set mode maybeopt
+	    continue
+	} elseif {[string equal $mode maybeopt]} {
+	    if {[string match -* $a]} {
+		switch -exact -- $a {
+		    -encoding -
+		    -translation -
+		    -eofchar {
+			lappend opts $a
+			set mode optarg
+			continue
+		    }
+		    -- {
+			set mode file
+			continue
+		    }
+		    default {
+			return -code error \
+				"Bad option \"$a\",\
+				expected one of\
+				-encoding, -eofchar,\
+				or -translation"
+		    }
+		}
+	    }
+	    # Not an option, but a file. Change mode and fall through.
+	    set mode file
+	}
+	# Process file arguments
+
+	if {[string equal $a -]} {
+	    # Stdin reference is special.
+
+	    # Test that the current options are all ok.
+	    # For stdin we have to avoid closing it.
+
+	    set old [fconfigure stdin]
+	    set fail [catch {
+		SetOptions stdin $opts
+	    } msg] ; # {}
+	    SetOptions stdin $old
+
+	    if {$fail} {
+		return -code error $msg
+	    }
+
+	    lappend channels [list $a $opts 0]
+	} else {
+	    if {![file exists $a]} {
+		return -code error "Cannot read file \"$a\", does not exist"
+	    } elseif {![file isfile $a]} {
+		return -code error "Cannot read file \"$a\", is not a file"
+	    } elseif {![file readable $a]} {
+		return -code error "Cannot read file \"$a\", read access is denied"
+	    }
+
+	    # Test that the current options are all ok.
+	    set c [open $a r]
+	    set fail [catch {
+		SetOptions $c $opts
+	    } msg] ; # {}
+	    close $c
+	    if {$fail} {
+		return -code error $msg
+	    }
+
+	    lappend channels [list $a $opts [file size $a]]
+	}
+
+	# We may have more options and files coming after.
+	set mode maybeopt
+    }
+
+    if {![string equal $mode maybeopt]} {
+	# Argument processing stopped with arguments missing.
+	return -code error \
+		"wrong#args: should be\
+		[lindex [info level 0] 0] ?-eofchar|-translation|-encoding arg?+ file ..."
+    }
+
+    set data ""
+    foreach c $channels {
+	foreach {fname opts size} $c break
+
+	if {[string equal $fname -]} {
+	    set old [fconfigure stdin]
+	    SetOptions stdin $opts
+	    append data [read stdin]
+	    SetOptions stdin $old
+	    continue
+	}
+
+	set c [open $fname r]
+	SetOptions $c $opts
+
+	if {$size > 0} {
+	    # Used the [file size] command to get the size, which
+	    # preallocates memory, rather than trying to grow it as
+	    # the read progresses.
+	    append data [read $c $size]
+	} else {
+	    # if the file has zero bytes it is either empty, or
+	    # something where [file size] reports 0 but the file
+	    # actually has data (like the files in the /proc
+	    # filesystem on Linux).
+	    append data [read $c]
+	}
+	close $c
+    }
+
+    return $data
+}
+
+# ::fileutil::writeFile --
+#
+#	Write the specified data into the named file,
+#	creating it if necessary.
+#
+# Arguments:
+#	options...	Options and arguments.
+#	filename	Path to the file to write.
+#	data		The data to write into the file
+#
+# Results:
+#	None.
+
+proc ::fileutil::writeFile {args} {
+    # Syntax: ?options? file data
+    # options = -encoding    ENC
+    #         | -translation TRA
+    #         | -eofchar     ECH
+    #         | --
+
+    Spec Writable $args opts fname data
+
+    # Now perform the requested operation.
+
+    file mkdir [file dirname $fname]
+    set              c [open $fname w]
+    SetOptions      $c $opts
+    puts -nonewline $c $data
+    close           $c
+    return
+}
+
+# ::fileutil::appendToFile --
+#
+#	Append the specified data at the end of the named file,
+#	creating it if necessary.
+#
+# Arguments:
+#	options...	Options and arguments.
+#	filename	Path to the file to extend.
+#	data		The data to extend the file with.
+#
+# Results:
+#	None.
+
+proc ::fileutil::appendToFile {args} {
+    # Syntax: ?options? file data
+    # options = -encoding    ENC
+    #         | -translation TRA
+    #         | -eofchar     ECH
+    #         | --
+
+    Spec Writable $args opts fname data
+
+    # Now perform the requested operation.
+
+    file mkdir [file dirname $fname]
+    set              c [open $fname a]
+    SetOptions      $c $opts
+    set at    [tell $c]
+    puts -nonewline $c $data
+    close           $c
+    return $at
+}
+
+# ::fileutil::insertIntoFile --
+#
+#	Insert the specified data into the named file,
+#	creating it if necessary, at the given locaton.
+#
+# Arguments:
+#	options...	Options and arguments.
+#	filename	Path to the file to extend.
+#	data		The data to extend the file with.
+#
+# Results:
+#	None.
+
+proc ::fileutil::insertIntoFile {args} {
+
+    # Syntax: ?options? file at data
+    # options = -encoding    ENC
+    #         | -translation TRA
+    #         | -eofchar     ECH
+    #         | --
+
+    Spec ReadWritable $args opts fname at data
+
+    set max [file size $fname]
+    CheckLocation $at $max insertion
+
+    if {[string length $data] == 0} {
+	# Another degenerate case, inserting nothing.
+	# Leave the file well enough alone.
+	return
+    }
+
+    foreach {c o t} [Open2 $fname $opts] break
+
+    # The degenerate cases of both appending and insertion at the
+    # beginning of the file allow more optimized implementations of
+    # the operation.
+
+    if {$at == 0} {
+	puts -nonewline    $o $data
+	fcopy           $c $o
+    } elseif {$at == $max} {
+	fcopy           $c $o
+	puts -nonewline    $o $data
+    } else {
+	fcopy           $c $o -size $at
+	puts -nonewline    $o $data
+	fcopy           $c $o
+    }
+
+    Close2 $fname $t $c $o
+    return
+}
+
+# ::fileutil::removeFromFile --
+#
+#	Remove n characters from the named file,
+#	starting at the given locaton.
+#
+# Arguments:
+#	options...	Options and arguments.
+#	filename	Path to the file to extend.
+#	at		Location to start the removal from.
+#	n		Number of characters to remove.
+#
+# Results:
+#	None.
+
+proc ::fileutil::removeFromFile {args} {
+
+    # Syntax: ?options? file at n
+    # options = -encoding    ENC
+    #         | -translation TRA
+    #         | -eofchar     ECH
+    #         | --
+
+    Spec ReadWritable $args opts fname at n
+
+    set max [file size $fname]
+    CheckLocation    $at $max removal
+    CheckLength   $n $at $max removal
+
+    if {$n == 0} {
+	# Another degenerate case, removing nothing.
+	# Leave the file well enough alone.
+	return
+    }
+
+    foreach {c o t} [Open2 $fname $opts] break
+
+    # The degenerate cases of both removal from the beginning or end
+    # of the file allow more optimized implementations of the
+    # operation.
+
+    if {$at == 0} {
+	seek  $c    $n current
+	fcopy $c $o
+    } elseif {($at + $n) == $max} {
+	fcopy $c $o -size $at
+	# Nothing further to copy.
+    } else {
+	fcopy $c $o -size $at
+	seek  $c    $n current
+	fcopy $c $o
+    }
+
+    Close2 $fname $t $c $o
+    return
+}
+
+# ::fileutil::replaceInFile --
+#
+#	Remove n characters from the named file,
+#	starting at the given locaton, and replace
+#	it with the given data.
+#
+# Arguments:
+#	options...	Options and arguments.
+#	filename	Path to the file to extend.
+#	at		Location to start the removal from.
+#	n		Number of characters to remove.
+#	data		The replacement data.
+#
+# Results:
+#	None.
+
+proc ::fileutil::replaceInFile {args} {
+
+    # Syntax: ?options? file at n data
+    # options = -encoding    ENC
+    #         | -translation TRA
+    #         | -eofchar     ECH
+    #         | --
+
+    Spec ReadWritable $args opts fname at n data
+
+    set max [file size $fname]
+    CheckLocation    $at $max replacement
+    CheckLength   $n $at $max replacement
+
+    if {
+	($n == 0) &&
+	([string length $data] == 0)
+    } {
+	# Another degenerate case, replacing nothing with
+	# nothing. Leave the file well enough alone.
+	return
+    }
+
+    foreach {c o t} [Open2 $fname $opts] break
+
+    # Check for degenerate cases and handle them separately,
+    # i.e. strip the no-op parts out of the general implementation.
+
+    if {$at == 0} {
+	if {$n == 0} {
+	    # Insertion instead of replacement.
+
+	    puts -nonewline    $o $data
+	    fcopy           $c $o
+
+	} elseif {[string length $data] == 0} {
+	    # Removal instead of replacement.
+
+	    seek  $c    $n current
+	    fcopy $c $o
+
+	} else {
+	    # General replacement at front.
+
+	    seek         $c    $n current
+	    puts -nonewline $o $data
+	    fcopy        $c $o
+	}
+    } elseif {($at + $n) == $max} {
+	if {$n == 0} {
+	    # Appending instead of replacement
+
+	    fcopy           $c $o
+	    puts -nonewline    $o $data
+
+	} elseif {[string length $data] == 0} {
+	    # Truncating instead of replacement
+
+	    fcopy $c $o -size $at
+	    # Nothing further to copy.
+
+	} else {
+	    # General replacement at end
+
+	    fcopy        $c $o -size $at
+	    puts -nonewline $o $data
+	}
+    } else {
+	if {$n == 0} {
+	    # General insertion.
+
+	    fcopy           $c $o -size $at
+	    puts -nonewline    $o $data
+	    fcopy           $c $o
+
+	} elseif {[string length $data] == 0} {
+	    # General removal.
+
+	    fcopy $c $o -size $at
+	    seek  $c    $n current
+	    fcopy $c $o
+
+	} else {
+	    # General replacement.
+
+	    fcopy        $c $o -size $at
+	    seek         $c    $n current
+	    puts -nonewline $o $data
+	    fcopy        $c $o
+	}
+    }
+
+    Close2 $fname $t $c $o
+    return
+}
+
+# ::fileutil::updateInPlace --
+#
+#	Run command prefix on the contents of the
+#	file and replace them with the result of
+#	the command.
+#
+# Arguments:
+#	options...	Options and arguments.
+#	filename	Path to the file to extend.
+#	cmd		Command prefix to run.
+#
+# Results:
+#	None.
+
+proc ::fileutil::updateInPlace {args} {
+    # Syntax: ?options? file cmd
+    # options = -encoding    ENC
+    #         | -translation TRA
+    #         | -eofchar     ECH
+    #         | --
+
+    Spec ReadWritable $args opts fname cmd
+
+    # readFile/cat inlined ...
+
+    set             c [open $fname r]
+    SetOptions     $c $opts
+    set data [read $c]
+    close          $c
+
+    # Transformation. Abort and do not modify the target file if an
+    # error was raised during this step.
+
+    lappend cmd $data
+    set code [catch {uplevel 1 $cmd} res]
+    if {$code} {
+	return -code $code $res
+    }
+
+    # writeFile inlined, with careful preservation of old contents
+    # until we are sure that the write was ok.
+
+    if {[catch {
+	file rename -force $fname ${fname}.bak
+
+	set              o [open $fname w]
+	SetOptions      $o $opts
+	puts -nonewline $o $res
+	close           $o
+
+	file delete -force ${fname}.bak
+    } msg]} {
+	if {[file exists ${fname}.bak]} {
+	    catch {
+		file rename -force ${fname}.bak $fname
+	    }
+	    return -code error $msg
+	}
+    }
+    return
+}
+
+proc ::fileutil::Writable {fname mv} {
+    upvar 1 $mv msg
+    if {[file exists $fname]} {
+	if {![file isfile $fname]} {
+	    set msg "Cannot use file \"$fname\", is not a file"
+	    return 0
+	} elseif {![file writable $fname]} {
+	    set msg "Cannot use file \"$fname\", write access is denied"
+	    return 0
+	}
+    }
+    return 1
+}
+
+proc ::fileutil::ReadWritable {fname mv} {
+    upvar 1 $mv msg
+    if {![file exists $fname]} {
+	set msg "Cannot use file \"$fname\", does not exist"
+	return 0
+    } elseif {![file isfile $fname]} {
+	set msg "Cannot use file \"$fname\", is not a file"
+	return 0
+    } elseif {![file writable $fname]} {
+	set msg "Cannot use file \"$fname\", write access is denied"
+	return 0
+    } elseif {![file readable $fname]} {
+	set msg "Cannot use file \"$fname\", read access is denied"
+	return 0
+    }
+    return 1
+}
+
+proc ::fileutil::Spec {check alist ov fv args} {
+    upvar 1 $ov opts $fv fname
+
+    set  n [llength $args] ; # Num more args
+    incr n                 ; # Count path as well
+
+    set opts {}
+    set mode maybeopt
+
+    set at 0
+    foreach a $alist {
+	if {[string equal $mode optarg]} {
+	    lappend opts $a
+	    set mode maybeopt
+	    incr at
+	    continue
+	} elseif {[string equal $mode maybeopt]} {
+	    if {[string match -* $a]} {
+		switch -exact -- $a {
+		    -encoding -
+		    -translation -
+		    -eofchar {
+			lappend opts $a
+			set mode optarg
+			incr at
+			continue
+		    }
+		    -- {
+			# Stop processing.
+			incr at
+			break
+		    }
+		    default {
+			return -code error \
+				"Bad option \"$a\",\
+				expected one of\
+				-encoding, -eofchar,\
+				or -translation"
+		    }
+		}
+	    }
+	    # Not an option, but a file.
+	    # Stop processing.
+	    break
+	}
+    }
+
+    if {([llength $alist] - $at) != $n} {
+	# Argument processing stopped with arguments missing, or too
+	# many
+	return -code error \
+		"wrong#args: should be\
+		[lindex [info level 1] 0] ?-eofchar|-translation|-encoding arg? file $args"
+    }
+
+    set fname [lindex $alist $at]
+    incr at
+    foreach \
+	    var $args \
+	    val [lrange $alist $at end] {
+	upvar 1 $var A
+	set A $val
+    }
+
+    # Check given path ...
+
+    if {![eval [linsert $check end $a msg]]} {
+	return -code error $msg
+    }
+
+    return
+}
+
+proc ::fileutil::Open2 {fname opts} {
+    set c [open $fname r]
+    set t [tempfile]
+    set o [open $t     w]
+
+    SetOptions $c $opts
+    SetOptions $o $opts
+
+    return [list $c $o $t]
+}
+
+proc ::fileutil::Close2 {f temp in out} {
+    close $in
+    close $out
+
+    file copy   -force $f ${f}.bak
+    file rename -force $temp $f
+    file delete -force ${f}.bak
+    return
+}
+
+proc ::fileutil::SetOptions {c opts} {
+    if {![llength $opts]} return
+    eval [linsert $opts 0 fconfigure $c]
+    return
+}
+
+proc ::fileutil::CheckLocation {at max label} {
+    if {![string is integer -strict $at]} {
+	return -code error \
+		"Expected integer but got \"$at\""
+    } elseif {$at < 0} {
+	return -code error \
+		"Bad $label point $at, before start of data"
+    } elseif {$at > $max} {
+	return -code error \
+		"Bad $label point $at, behind end of data"
+    }
+}
+
+proc ::fileutil::CheckLength {n at max label} {
+    if {![string is integer -strict $n]} {
+	return -code error \
+		"Expected integer but got \"$n\""
+    } elseif {$n < 0} {
+	return -code error \
+		"Bad $label size $n"
+    } elseif {($at + $n) > $max} {
+	return -code error \
+		"Bad $label size $n, going behind end of data"
+    }
+}
+
+# ::fileutil::foreachLine --
+#
+#	Executes a script for every line in a file.
+#
+# Arguments:
+#	var		name of the variable to contain the lines
+#	filename	name of the file to read.
+#	cmd		The script to execute.
+#
+# Results:
+#	None.
+
+proc ::fileutil::foreachLine {var filename cmd} {
+    upvar 1 $var line
+    set fp [open $filename r]
+
+    # -future- Use try/eval from tcllib/control
+    catch {
+	set code 0
+	set result {}
+	set return 0
+	while {[gets $fp line] >= 0} {
+	    set code [catch {uplevel 1 $cmd} result options]
+	    if {$code == 2} {
+		set return 1
+		set code [dict get $options -code]
+		break
+	    } elseif {$code != 0 && $code != 4} {
+		break
+	    }
+	}
+    }
+    close $fp
+
+    if {$return || $code == 1 || $code > 4} {
+	return -options $options $result
+    }
+    return $result
+}
+
+# ::fileutil::touch --
+#
+#	Tcl implementation of the UNIX "touch" command.
+#
+#	touch [-a] [-m] [-c] [-r ref_file] [-t time] filename ...
+#
+# Arguments:
+#	-a		change the access time only, unless -m also specified
+#	-m		change the modification time only, unless -a also specified
+#	-c		silently prevent creating a file if it did not previously exist
+#	-r ref_file	use the ref_file's time instead of the current time
+#	-t time		use the specified time instead of the current time
+#			("time" is an integer clock value, like [clock seconds])
+#	filename ...	the files to modify
+#
+# Results
+#	None.
+#
+# Errors:
+#	Both of "-r" and "-t" cannot be specified.
+
+if {[package vsatisfies [package provide Tcl] 8.3]} {
+    namespace eval ::fileutil {
+	namespace export touch
+    }
+
+    proc ::fileutil::touch {args} {
+        # Don't bother catching errors, just let them propagate up
+
+        set options {
+            {a          "set the atime only"}
+            {m          "set the mtime only"}
+            {c          "do not create non-existant files"}
+            {r.arg  ""  "use time from ref_file"}
+            {t.arg  -1  "use specified time"}
+        }
+        set usage ": [lindex [info level 0] 0]\
+                      \[options] filename ...\noptions:"
+        array set params [::cmdline::getoptions args $options $usage]
+
+        # process -a and -m options
+        set set_atime [set set_mtime "true"]
+        if {  $params(a) && ! $params(m)} {set set_mtime "false"}
+        if {! $params(a) &&   $params(m)} {set set_atime "false"}
+
+        # process -r and -t
+        set has_t [expr {$params(t) != -1}]
+        set has_r [expr {[string length $params(r)] > 0}]
+        if {$has_t && $has_r} {
+            return -code error "Cannot specify both -r and -t"
+        } elseif {$has_t} {
+            set atime [set mtime $params(t)]
+        } elseif {$has_r} {
+            file stat $params(r) stat
+            set atime $stat(atime)
+            set mtime $stat(mtime)
+        } else {
+            set atime [set mtime [clock seconds]]
+        }
+
+        # do it
+        foreach filename $args {
+            if {! [file exists $filename]} {
+                if {$params(c)} {continue}
+                close [open $filename w]
+            }
+            if {$set_atime} {file atime $filename $atime}
+            if {$set_mtime} {file mtime $filename $mtime}
+        }
+        return
+    }
+}
+
+# ::fileutil::fileType --
+#
+#	Do some simple heuristics to determine file type.
+#
+#
+# Arguments:
+#	filename        Name of the file to test.
+#
+# Results
+#	type            Type of the file.  May be a list if multiple tests
+#                       are positive (eg, a file could be both a directory
+#                       and a link).  In general, the list proceeds from most
+#                       general (eg, binary) to most specific (eg, gif), so
+#                       the full type for a GIF file would be
+#                       "binary graphic gif"
+#
+#                       At present, the following types can be detected:
+#
+#                       directory
+#                       empty
+#                       binary
+#                       text
+#                       script <interpreter>
+#                       executable [elf, dos, ne, pe]
+#                       binary graphic [gif, jpeg, png, tiff, bitmap, icns]
+#                       ps, eps, pdf
+#                       html
+#                       xml <doctype>
+#                       message pgp
+#                       compressed [bzip, gzip, zip, tar]
+#                       audio [mpeg, wave]
+#                       gravity_wave_data_frame
+#                       link
+#			doctools, doctoc, and docidx documentation files.
+#
+
+proc ::fileutil::fileType {filename} {
+    ;## existence test
+    if { ! [ file exists $filename ] } {
+        set err "file not found: '$filename'"
+        return -code error $err
+    }
+    ;## directory test
+    if { [ file isdirectory $filename ] } {
+        set type directory
+        if { ! [ catch {file readlink $filename} ] } {
+            lappend type link
+        }
+        return $type
+    }
+    ;## empty file test
+    if { ! [ file size $filename ] } {
+        set type empty
+        if { ! [ catch {file readlink $filename} ] } {
+            lappend type link
+        }
+        return $type
+    }
+    set bin_rx {[\x00-\x08\x0b\x0e-\x1f]}
+
+    if { [ catch {
+        set fid [ open $filename r ]
+        fconfigure $fid -translation binary
+        fconfigure $fid -buffersize 1024
+        fconfigure $fid -buffering full
+        set test [ read $fid 1024 ]
+        ::close $fid
+    } err ] } {
+        catch { ::close $fid }
+        return -code error "::fileutil::fileType: $err"
+    }
+
+    if { [ regexp $bin_rx $test ] } {
+        set type binary
+        set binary 1
+    } else {
+        set type text
+        set binary 0
+    }
+
+    # SF Tcllib bug [795585]. Allowing whitespace between #!
+    # and path of script interpreter
+
+    set metakit 0
+
+    if { [ regexp {^\#\!\s*(\S+)} $test -> terp ] } {
+        lappend type script $terp
+    } elseif {([regexp "\\\[manpage_begin " $test] &&
+	       !([regexp -- {--- !doctools ---} $test] || [regexp -- "!tcl\.tk//DSL doctools//EN//" $test])) ||
+                ([regexp -- {--- doctools ---} $test]  || [regexp -- "tcl\.tk//DSL doctools//EN//" $test])} {
+	lappend type doctools
+    } elseif {([regexp "\\\[toc_begin " $test] &&
+	       !([regexp -- {--- !doctoc ---} $test] || [regexp -- "!tcl\.tk//DSL doctoc//EN//" $test])) ||
+                ([regexp -- {--- doctoc ---} $test]  || [regexp -- "tcl\.tk//DSL doctoc//EN//" $test])} {
+	lappend type doctoc
+    } elseif {([regexp "\\\[index_begin " $test] &&
+	       !([regexp -- {--- !docidx ---} $test] || [regexp -- "!tcl\.tk//DSL docidx//EN//" $test])) ||
+              ([regexp -- {--- docidx ---} $test] || [regexp -- "tcl\.tk//DSL docidx//EN//" $test])} {
+	lappend type docidx
+    } elseif {[regexp -- "tcl\\.tk//DSL diagram//EN//" $test]} {
+	lappend type tkdiagram
+    } elseif { $binary && [ regexp {^[\x7F]ELF} $test ] } {
+        lappend type executable elf
+    } elseif { $binary && [string match "MZ*" $test] } {
+        if { [scan [string index $test 24] %c] < 64 } {
+            lappend type executable dos
+        } else {
+            binary scan [string range $test 60 61] s next
+            set sig [string range $test $next [expr {$next + 1}]]
+            if { $sig == "NE" || $sig == "PE" } {
+                lappend type executable [string tolower $sig]
+            } else {
+                lappend type executable dos
+            }
+        }
+    } elseif { $binary && [string match "SQLite format 3\x00*" $test] } {
+	lappend type sqlite3
+
+	# Check for various sqlite-based application file formats.
+	set appid [string range $test 68 71]
+	if {$appid eq "\x0f\x05\x51\x12"} {
+	    lappend type fossil-checkout
+	} elseif {$appid eq "\x0f\x05\x51\x13"} {
+	    lappend type fossil-global-config
+	} elseif {$appid eq "\x0f\x05\x51\x11"} {
+	    lappend type fossil-repository
+	} else {
+	    # encode the appid as hex and append that.
+	    binary scan $appid H8 aid
+	    lappend type A$aid
+	}
+
+    } elseif { $binary && [string match "BZh91AY\&SY*" $test] } {
+        lappend type compressed bzip
+    } elseif { $binary && [string match "\x1f\x8b*" $test] } {
+        lappend type compressed gzip
+    } elseif { $binary && [string range $test 257 262] == "ustar\x00" } {
+        lappend type compressed tar
+    } elseif { $binary && [string match "\x50\x4b\x03\x04*" $test] } {
+        lappend type compressed zip
+    } elseif { $binary && [string match "GIF*" $test] } {
+        lappend type graphic gif
+    } elseif { $binary && [string match "icns*" $test] } {
+        lappend type graphic icns bigendian
+    } elseif { $binary && [string match "snci*" $test] } {
+        lappend type graphic icns smallendian
+    } elseif { $binary && [string match "\x89PNG*" $test] } {
+        lappend type graphic png
+    } elseif { $binary && [string match "\xFF\xD8\xFF*" $test] } {
+        binary scan $test x3H2x2a5 marker txt
+        if { $marker == "e0" && $txt == "JFIF\x00" } {
+            lappend type graphic jpeg jfif
+        } elseif { $marker == "e1" && $txt == "Exif\x00" } {
+            lappend type graphic jpeg exif
+        }
+    } elseif { $binary && [string match "MM\x00\**" $test] } {
+        lappend type graphic tiff
+    } elseif { $binary && [string match "BM*" $test] && [string range $test 6 9] == "\x00\x00\x00\x00" } {
+        lappend type graphic bitmap
+    } elseif { ! $binary && [string match -nocase "*\<html\>*" $test] } {
+        lappend type html
+    } elseif {[string match "\%PDF\-*" $test] } {
+        lappend type pdf
+    } elseif { [string match "\%\!PS\-*" $test] } {
+       lappend type ps
+       if { [string match "* EPSF\-*" $test] } {
+           lappend type eps
+       }
+    } elseif { [string match -nocase "*\<\?xml*" $test] } {
+        lappend type xml
+        if { [ regexp -nocase {\<\!DOCTYPE\s+(\S+)} $test -> doctype ] } {
+            lappend type $doctype
+        }
+    } elseif { [string match {*BEGIN PGP MESSAGE*} $test] } {
+        lappend type message pgp
+    } elseif { $binary && [string match {IGWD*} $test] } {
+        lappend type gravity_wave_data_frame
+    } elseif {[string match "JL\x1a\x00*" $test] && ([file size $filename] >= 27)} {
+	lappend type metakit smallendian
+	set metakit 1
+    } elseif {[string match "LJ\x1a\x00*" $test] && ([file size $filename] >= 27)} {
+	lappend type metakit bigendian
+	set metakit 1
+    } elseif { $binary && [string match "RIFF*" $test] && [string range $test 8 11] == "WAVE" } {
+        lappend type audio wave
+    } elseif { $binary && [string match "ID3*" $test] } {
+        lappend type audio mpeg
+    } elseif { $binary && [binary scan $test S tmp] && [expr {$tmp & 0xFFE0}] == 65504 } {
+        lappend type audio mpeg
+    }
+
+    # Additional checks of file contents at the end of the file,
+    # possibly pointing into the middle too (attached metakit,
+    # attached zip).
+
+    ## Metakit File format: http://www.equi4.com/metakit/metakit-ff.html
+    ## Metakit database attached ? ##
+
+    if {!$metakit && ([file size $filename] >= 27)} {
+	# The offsets in the footer are in always bigendian format
+
+	if { [ catch {
+	    set fid [ open $filename r ]
+	    fconfigure $fid -translation binary
+	    fconfigure $fid -buffersize 1024
+	    fconfigure $fid -buffering full
+	    seek $fid -16 end
+	    set test [ read $fid 16 ]
+	    ::close $fid
+	} err ] } {
+	    catch { ::close $fid }
+	    return -code error "::fileutil::fileType: $err"
+	}
+
+	binary scan $test IIII __ hdroffset __ __
+	set hdroffset [expr {[file size $filename] - 16 - $hdroffset}]
+
+	# Further checks iff the offset is actually inside the file.
+
+	if {($hdroffset >= 0) && ($hdroffset < [file size $filename])} {
+	    # Seek to the specified location and try to match a metakit header
+	    # at this location.
+
+	    if { [ catch {
+		set         fid [ open $filename r ]
+		fconfigure $fid -translation binary
+		fconfigure $fid -buffersize 1024
+		fconfigure $fid -buffering full
+		seek       $fid $hdroffset start
+		set test [ read $fid 16 ]
+		::close $fid
+	    } err ] } {
+		catch { ::close $fid }
+		return -code error "::fileutil::fileType: $err"
+	    }
+
+	    if {[string match "JL\x1a\x00*" $test]} {
+		lappend type attached metakit smallendian
+		set metakit 1
+	    } elseif {[string match "LJ\x1a\x00*" $test]} {
+		lappend type attached metakit bigendian
+		set metakit 1
+	    }
+	}
+    }
+
+    ## Zip File Format: http://zziplib.sourceforge.net/zzip-parse.html
+    ## http://www.pkware.com/products/enterprise/white_papers/appnote.html
+
+
+    ;## lastly, is it a link?
+    if { ! [ catch {file readlink $filename} ] } {
+        lappend type link
+    }
+    return $type
+}
+
+# ::fileutil::tempdir --
+#
+#	Return the correct directory to use for temporary files.
+#	Python attempts this sequence, which seems logical:
+#
+#       1. The directory named by the `TMPDIR' environment variable.
+#
+#       2. The directory named by the `TEMP' environment variable.
+#
+#       3. The directory named by the `TMP' environment variable.
+#
+#       4. A platform-specific location:
+#            * On Macintosh, the `Temporary Items' folder.
+#
+#            * On Windows, the directories `C:\\TEMP', `C:\\TMP',
+#              `\\TEMP', and `\\TMP', in that order.
+#
+#            * On all other platforms, the directories `/tmp',
+#              `/var/tmp', and `/usr/tmp', in that order.
+#
+#       5. As a last resort, the current working directory.
+#
+#	The code here also does
+#
+#	0. The directory set by invoking tempdir with an argument.
+#	   If this is present it is used exclusively.
+#
+# Arguments:
+#	None.
+#
+# Side Effects:
+#	None.
+#
+# Results:
+#	The directory for temporary files.
+
+proc ::fileutil::tempdir {args} {
+    if {[llength $args] > 1} {
+	return -code error {wrong#args: should be "::fileutil::tempdir ?path?"}
+    } elseif {[llength $args] == 1} {
+	variable tempdir    [lindex $args 0]
+	variable tempdirSet 1
+	return
+    }
+    return [Normalize [TempDir]]
+}
+
+proc ::fileutil::tempdirReset {} {
+    variable tempdir    {}
+    variable tempdirSet 0
+    return
+}
+
+proc ::fileutil::TempDir {} {
+    global tcl_platform env
+    variable tempdir
+    variable tempdirSet
+
+    set attempdirs [list]
+    set problems   {}
+
+    if {$tempdirSet} {
+	lappend attempdirs $tempdir
+	lappend problems {User/Application specified tempdir}
+    } else {
+	foreach tmp {TMPDIR TEMP TMP} {
+	    if { [info exists env($tmp)] } {
+		lappend attempdirs $env($tmp)
+	    } else {
+		lappend problems "No environment variable $tmp"
+	    }
+	}
+
+	switch $tcl_platform(platform) {
+	    windows {
+		lappend attempdirs "C:\\TEMP" "C:\\TMP" "\\TEMP" "\\TMP"
+	    }
+	    macintosh {
+		lappend attempdirs $env(TRASH_FOLDER)  ;# a better place?
+	    }
+	    default {
+		lappend attempdirs \
+		    [file join / tmp] \
+		    [file join / var tmp] \
+		    [file join / usr tmp]
+	    }
+	}
+
+	lappend attempdirs [pwd]
+    }
+
+    foreach tmp $attempdirs {
+	if { [file isdirectory $tmp] && [file writable $tmp] } {
+	    return $tmp
+	} elseif { ![file isdirectory $tmp] } {
+	    lappend problems "Not a directory: $tmp"
+	} else {
+	    lappend problems "Not writable: $tmp"
+	}
+    }
+
+    # Fail if nothing worked.
+    return -code error "Unable to determine a proper directory for temporary files\n[join $problems \n]"
+}
+
+namespace eval ::fileutil {
+    variable tempdir    {}
+    variable tempdirSet 0
+}
+
+# ::fileutil::maketempdir --
+
+proc ::fileutil::maketempdir {args} {
+    return [Normalize [MakeTempDir $args]]
+}
+
+proc ::fileutil::MakeTempDir {config} {
+    # Setup of default configuration.
+    array set options {}
+    set options(-suffix) ""
+    set options(-prefix) "tmp"
+    set options(-dir)    [tempdir]
+
+    # TODO: Check for and reject options not in -suffix, -prefix, -dir
+    # Merge user configuration, overwrite defaults.
+    array set options $config
+
+    # See also "tempfile" below. Could be shareable internal configuration.
+    set chars       abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+    set nrand_chars 10
+    set maxtries    10
+
+    for {set i 0} {$i < $maxtries} {incr i} {
+	# Build up the candidate name. See also "tempfile".
+	set directory_name $options(-prefix)
+	for {set j 0} {$j < $nrand_chars} {incr j} {
+	    append directory_name \
+		[string index $chars [expr {int(rand() * 62)}]]
+	}
+	append directory_name $options(-suffix)
+	set path [file join $options(-dir) $directory_name]
+
+	# Try to create. Try again if already exists, or trouble
+	# with creation and setting of perms.
+	#
+	# Note: The last looks as if it is able to leave partial
+	# directories behind (created, trouble with perms). But
+	# deleting ... Might pull the rug out from somebody else.
+
+	if {[file exists $path]} continue
+	if {[catch {
+	    file mkdir $path
+	    if {$::tcl_platform(platform) eq "unix"} {
+		file attributes $path -permissions 0700
+	    }
+	}]} continue
+
+	return $path
+    }
+    return -code error "Failed to find an unused temporary directory name"
+}
+
+# ::fileutil::tempfile --
+#
+#   generate a temporary file name suitable for writing to
+#   the file name will be unique, writable and will be in the
+#   appropriate system specific temp directory
+#   Code taken from http://mini.net/tcl/772 attributed to
+#    Igor Volobouev and anon.
+#
+# Arguments:
+#   prefix     - a prefix for the filename, p
+# Results:
+#   returns a file name
+#
+
+proc ::fileutil::tempfile {{prefix {}}} {
+    return [Normalize [TempFile $prefix]]
+}
+
+proc ::fileutil::TempFile {prefix} {
+    set tmpdir [tempdir]
+
+    set chars       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+    set nrand_chars 10
+    set maxtries    10
+    set access      [list RDWR CREAT EXCL]
+    set permission  0600
+    set channel ""
+    set checked_dir_writable 0
+
+    for {set i 0} {$i < $maxtries} {incr i} {
+ 	set newname $prefix
+ 	for {set j 0} {$j < $nrand_chars} {incr j} {
+ 	    append newname [string index $chars \
+		    [expr {int(rand()*62)}]]
+ 	}
+	set newname [file join $tmpdir $newname]
+
+	if {[catch {open $newname $access $permission} channel]} {
+	    if {!$checked_dir_writable} {
+		set dirname [file dirname $newname]
+		if {![file writable $dirname]} {
+		    return -code error "Directory $dirname is not writable"
+		}
+		set checked_dir_writable 1
+	    }
+	} else {
+	    # Success
+	    close $channel
+	    return $newname
+	}
+
+    }
+    if {[string compare $channel ""]} {
+ 	return -code error "Failed to open a temporary file: $channel"
+    } else {
+ 	return -code error "Failed to find an unused temporary file name"
+    }
+}
+
+# ::fileutil::install --
+#
+#	Tcl version of the 'install' command, which copies files from
+#	one places to another and also optionally sets some attributes
+#	such as group, owner, and permissions.
+#
+# Arguments:
+#	-m		Change the file permissions to the specified
+#                       value.  Valid arguments are those accepted by
+#			file attributes -permissions
+#
+# Results:
+#	None.
+
+# TODO - add options for group/owner manipulation.
+
+proc ::fileutil::install {args} {
+    set options {
+	{m.arg "" "Set permission mode"}
+    }
+    set usage ": [lindex [info level 0] 0]\
+\[options] source destination \noptions:"
+    array set params [::cmdline::getoptions args $options $usage]
+    # Args should now just be the source and destination.
+    if { [llength $args] < 2 } {
+	return -code error $usage
+    }
+    set src [lindex $args 0]
+    set dst [lindex $args 1]
+    file copy -force $src $dst
+    if { $params(m) != "" } {
+	set targets [::fileutil::find $dst]
+	foreach fl $targets {
+	    file attributes $fl -permissions $params(m)
+	}
+    }
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::fileutil::lexnormalize {sp} {
+    set spx [file split $sp]
+
+    # Resolution of embedded relative modifiers (., and ..).
+
+    if {
+	([lsearch -exact $spx . ] < 0) &&
+	([lsearch -exact $spx ..] < 0)
+    } {
+	# Quick path out if there are no relative modifiers
+	return $sp
+    }
+
+    set absolute [expr {![string equal [file pathtype $sp] relative]}]
+    # A volumerelative path counts as absolute for our purposes.
+
+    set sp $spx
+    set np {}
+    set noskip 1
+
+    while {[llength $sp]} {
+	set ele    [lindex $sp 0]
+	set sp     [lrange $sp 1 end]
+	set islast [expr {[llength $sp] == 0}]
+
+	if {[string equal $ele ".."]} {
+	    if {
+		($absolute  && ([llength $np] >  1)) ||
+		(!$absolute && ([llength $np] >= 1))
+	    } {
+		# .. : Remove the previous element added to the
+		# new path, if there actually is enough to remove.
+		set np [lrange $np 0 end-1]
+	    }
+	} elseif {[string equal $ele "."]} {
+	    # Ignore .'s, they stay at the current location
+	    continue
+	} else {
+	    # A regular element.
+	    lappend np $ele
+	}
+    }
+    if {[llength $np] > 0} {
+	return [eval [linsert $np 0 file join]]
+	# 8.5: return [file join {*}$np]
+    }
+    return {}
+}
+
+# ### ### ### ######### ######### #########
+## Forward compatibility. Some routines require path normalization,
+## something we have supported by the builtin 'file' only since Tcl
+## 8.4. For versions of Tcl before that, to be supported by the
+## module, we implement a normalizer in Tcl itself. Slow, but working.
+
+if {[package vcompare [package provide Tcl] 8.4] < 0} {
+    # Pre 8.4. We do not have 'file normalize'. We create an
+    # approximation for it based on earlier commands.
+
+    # ... Hm. This is lexical normalization. It does not resolve
+    # symlinks in the path to their origin.
+
+    proc ::fileutil::Normalize {sp} {
+	set sp [file split $sp]
+
+	# Conversion of the incoming path to absolute.
+	if {[string equal [file pathtype [lindex $sp 0]] "relative"]} {
+	    set sp [file split [eval [list file join [pwd]] $sp]]
+	}
+
+	# Resolution of symlink components, and embedded relative
+	# modifiers (., and ..).
+
+	set np {}
+	set noskip 1
+	while {[llength $sp]} {
+	    set ele    [lindex $sp 0]
+	    set sp     [lrange $sp 1 end]
+	    set islast [expr {[llength $sp] == 0}]
+
+	    if {[string equal $ele ".."]} {
+		if {[llength $np] > 1} {
+		    # .. : Remove the previous element added to the
+		    # new path, if there actually is enough to remove.
+		    set np [lrange $np 0 end-1]
+		}
+	    } elseif {[string equal $ele "."]} {
+		# Ignore .'s, they stay at the current location
+		continue
+	    } else {
+		# A regular element. If it is not the last component
+		# then check if the combination is a symlink, and if
+		# yes, resolve it.
+
+		lappend np $ele
+
+		if {!$islast && $noskip} {
+		    # The flag 'noskip' is technically not required,
+		    # just 'file exists'. However if a path P does not
+		    # exist, then all longer paths starting with P can
+		    # not exist either, and using the flag to store
+		    # this knowledge then saves us a number of
+		    # unnecessary stat calls. IOW this a performance
+		    # optimization.
+
+		    set p [eval file join $np]
+		    set noskip [file exists $p]
+		    if {$noskip} {
+			if {[string equal link [file type $p]]} {
+			    set dst [file readlink $p]
+
+			    # We always push the destination in front of
+			    # the source path (in expanded form). So that
+			    # we handle .., .'s, and symlinks inside of
+			    # this path as well. An absolute path clears
+			    # the result, a relative one just removes the
+			    # last, now resolved component.
+
+			    set sp [eval [linsert [file split $dst] 0 linsert $sp 0]]
+
+			    if {![string equal relative [file pathtype $dst]]} {
+				# Absolute|volrelative destination, clear
+				# result, we have to start over.
+				set np {}
+			    } else {
+				# Relative link, just remove the resolved
+				# component again.
+				set np [lrange $np 0 end-1]
+			    }
+			}
+		    }
+		}
+	    }
+	}
+	if {[llength $np] > 0} {
+	    return [eval file join $np]
+	}
+	return {}
+    }
+} else {
+    proc ::fileutil::Normalize {sp} {
+	file normalize $sp
+    }
+}
+
+# ::fileutil::relative --
+#
+#	Taking two _directory_ paths, a base and a destination, computes the path
+#	of the destination relative to the base.
+#
+# Arguments:
+#	base	The path to make the destination relative to.
+#	dst	The destination path
+#
+# Results:
+#	The path of the destination, relative to the base.
+
+proc ::fileutil::relative {base dst} {
+    # Ensure that the link to directory 'dst' is properly done relative to
+    # the directory 'base'.
+
+    if {![string equal [file pathtype $base] [file pathtype $dst]]} {
+	return -code error "Unable to compute relation for paths of different pathtypes: [file pathtype $base] vs. [file pathtype $dst], ($base vs. $dst)"
+    }
+
+    set base [lexnormalize [file join [pwd] $base]]
+    set dst  [lexnormalize [file join [pwd] $dst]]
+
+    set save $dst
+    set base [file split $base]
+    set dst  [file split $dst]
+
+    while {[string equal [lindex $dst 0] [lindex $base 0]]} {
+	set dst  [lrange $dst  1 end]
+	set base [lrange $base 1 end]
+	if {![llength $dst]} {break}
+    }
+
+    set dstlen  [llength $dst]
+    set baselen [llength $base]
+
+    if {($dstlen == 0) && ($baselen == 0)} {
+	# Cases:
+	# (a) base == dst
+
+	set dst .
+    } else {
+	# Cases:
+	# (b) base is: base/sub = sub
+	#     dst  is: base     = {}
+
+	# (c) base is: base     = {}
+	#     dst  is: base/sub = sub
+
+	while {$baselen > 0} {
+	    set dst [linsert $dst 0 ..]
+	    incr baselen -1
+	}
+	# 8.5: set dst [file join {*}$dst]
+	set dst [eval [linsert $dst 0 file join]]
+    }
+
+    return $dst
+}
+
+# ::fileutil::relativeUrl --
+#
+#	Taking two _file_ paths, a base and a destination, computes the path
+#	of the destination relative to the base, from the inside of the base.
+#
+#	This is how a browser resolves relative links in a file, hence the
+#	url in the command name.
+#
+# Arguments:
+#	base	The file path to make the destination relative to.
+#	dst	The destination file path
+#
+# Results:
+#	The path of the destination file, relative to the base file.
+
+proc ::fileutil::relativeUrl {base dst} {
+    # Like 'relative', but for links from _inside_ a file to a
+    # different file.
+
+    if {![string equal [file pathtype $base] [file pathtype $dst]]} {
+	return -code error "Unable to compute relation for paths of different pathtypes: [file pathtype $base] vs. [file pathtype $dst], ($base vs. $dst)"
+    }
+
+    set base [lexnormalize [file join [pwd] $base]]
+    set dst  [lexnormalize [file join [pwd] $dst]]
+
+    set basedir [file dirname $base]
+    set dstdir  [file dirname $dst]
+
+    set dstdir  [relative $basedir $dstdir]
+
+    # dstdir == '.' on input => dstdir output has trailing './'. Strip
+    # this superfluous segment off.
+
+    if {[string equal $dstdir "."]} {
+	return [file tail $dst]
+    } elseif {[string equal [file tail $dstdir] "."]} {
+	return [file join [file dirname $dstdir] [file tail $dst]]
+    } else {
+	return [file join $dstdir [file tail $dst]]
+    }
+}
+
+# ::fileutil::fullnormalize --
+#
+#	Normalizes a path completely. I.e. a symlink in the last
+#	element is resolved as well, not only symlinks in the higher
+#	elements.
+#
+# Arguments:
+#	path	The path to normalize
+#
+# Results:
+#	The input path with all symlinks resolved.
+
+proc ::fileutil::fullnormalize {path} {
+    # When encountering symlinks in a file copy operation Tcl copies
+    # the link, not the contents of the file it references. There are
+    # situations there this is not acceptable. For these this command
+    # resolves all symbolic links in the path, including in the last
+    # element of the path. A "file copy" using the return value of
+    # this command copies an actual file, it will not encounter
+    # symlinks.
+
+    # BUG / WORKAROUND. Using the / instead of the join seems to work
+    # around a bug in the path handling on windows which can break the
+    # core 'file normalize' for symbolic links. This was exposed by
+    # the find testsuite which could not reproduced outside. I believe
+    # that there is some deep path bug in the core triggered under
+    # special circumstances. Use of / likely forces a refresh through
+    # the string rep and so avoids the problem with the path intrep.
+
+    return [file dirname [Normalize $path/__dummy__]]
+    #return [file dirname [Normalize [file join $path __dummy__]]]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/multi.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/multi.tcl
new file mode 100644
index 00000000..b95a728d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/multi.tcl
@@ -0,0 +1,28 @@
+# ### ### ### ######### ######### #########
+##
+# (c) 2007 Andreas Kupries.
+
+# Multi file operations. Singleton based on the multiop processor.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require fileutil::multi::op
+
+# ### ### ### ######### ######### #########
+## API & Implementation
+
+namespace eval ::fileutil {}
+
+# Create the multiop processor object and make its do method the main
+# command of this package.
+::fileutil::multi::op ::fileutil::multi::obj
+
+proc ::fileutil::multi {args} {
+    return [uplevel 1 [linsert $args 0 ::fileutil::multi::obj do]]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide fileutil::multi 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/multiop.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/multiop.tcl
new file mode 100644
index 00000000..9d065198
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/multiop.tcl
@@ -0,0 +1,645 @@
+# ### ### ### ######### ######### #########
+##
+# (c) 2007-2008 Andreas Kupries.
+
+# DSL allowing the easy specification of multi-file copy and/or move
+# and/or deletion operations. Alternate names would be scatter/gather
+# processor, or maybe even assembler.
+
+# Examples:
+# (1) copy
+#     into [installdir_of tls]
+#     from c:/TDK/PrivateOpenSSL/bin
+#     the  *.dll
+#
+# (2) move
+#     from /sources
+#     into /scratch
+#     the  *
+#     but not *.html
+#  (Alternatively: except for *.html)
+#
+# (3) into /scratch
+#     from /sources
+#     move
+#     as   pkgIndex.tcl
+#     the  index
+#
+# (4) in /scratch
+#     remove
+#     the *.txt
+
+# The language is derived from the parts of TclApp's option language
+# dealing with files and their locations, yet not identical. In parts
+# simplified, in parts more capable, keyword names were changed
+# throughout.
+
+# Language commands
+
+# From the examples
+#
+# into        DIR           : Specify destination directory.
+# in          DIR           : See 'into'.
+# from        DIR           : Specify source directory.
+# the         PATTERN (...) : Specify files to operate on.
+# but not     PATTERN       : Specify exceptions to 'the'.
+# but exclude PATTERN       : Specify exceptions to 'the'.
+# except for  PATTERN       : See 'but not'.
+# as          NAME          : New name for file.
+# move                      : Move files.
+# copy                      : Copy files.
+# remove                    : Delete files.
+#
+# Furthermore
+#
+# reset     : Force to defaults.
+# cd    DIR : Change destination to subdirectory.
+# up        : Change destination to parent directory.
+# (         : Save a copy of the current state.
+# )         : Restore last saved state and make it current.
+
+# The main active element is the command 'the'. In other words, this
+# command not only specifies the files to operate on, but also
+# executes the operation as defined in the current state. All other
+# commands modify the state to set the operation up, and nothing
+# else. To allow for a more natural syntax the active command also
+# looks ahead for the commands 'as', 'but', and 'except', and executes
+# them, like qualifiers, so that they take effect as if they had been
+# written before. The command 'but' and 'except use identical
+# constructions to handle their qualifiers, i.e. 'not' and 'for'.
+
+# Note that the fact that most commands just modify the state allows
+# us to use more off forms as specifications instead of just natural
+# language sentences For example the example 2 can re-arranged into:
+#
+# (5) from /sources
+#     into /scratch
+#     but not *.html
+#     move
+#     the  *
+#
+# and the result is still a valid specification.
+
+# Further note that the information collected by 'but', 'except', and
+# 'as' is automatically reset after the associated 'the' was
+# executed. However no other state is reset in that manner, allowing
+# the user to avoid repetitions of unchanging information. Lets us for
+# example merge the examples 2 and 3. The trivial merge is:
+
+# (6) move
+#     into /scratch
+#     from /sources
+#     the  *
+#     but not *.html not index
+#     move
+#     into /scratch
+#     from /sources
+#     the  index
+#     as   pkgIndex.tcl
+#
+# With less repetitions
+#
+# (7) move
+#     into /scratch
+#     from /sources
+#     the  *
+#     but not *.html not index
+#     the  index
+#     as   pkgIndex.tcl
+
+# I have not yet managed to find a suitable syntax to specify when to
+# add a new extension to the moved/copied files, or have to strip all
+# extensions, a specific extension, or even replace extensions.
+
+# Other possibilities to muse about: Load the patterns for 'not'/'for'
+# from a file ... Actually, load the whole exceptions from a file,
+# with its contents a proper interpretable word list. Which makes it
+# general processing of include files.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# This processor uses the 'wip' word list interpreter as its
+# foundation.
+
+package require fileutil      ; # File testing
+package require snit          ; # OO support
+package require struct::stack ; # Context stack
+package require wip           ; # DSL execution core
+
+# ### ### ### ######### ######### #########
+## API & Implementation
+
+snit::type ::fileutil::multi::op {
+    # ### ### ### ######### ######### #########
+    ## API
+
+    constructor {args} {} ; # create processor
+
+    # ### ### ### ######### ######### #########
+    ## API - Implementation.
+
+    constructor {args} {
+	install stack using struct::stack ${selfns}::stack
+	$self wip_setup
+
+	# Mapping dsl commands to methods.
+	defdva \
+	    reset  Reset	(    Push	)       Pop	\
+	    into   Into		in   Into	from    From	\
+	    cd     ChDir	up   ChUp	as      As	\
+	    move   Move		copy Copy	remove  Remove	\
+	    but    But		not  Exclude	the     The	\
+	    except Except	for  Exclude    exclude Exclude \
+	    to     Into         ->   Save       the-set TheSet  \
+	    recursive Recursive recursively Recursive           \
+	    for-win     ForWindows   for-unix   ForUnix         \
+	    for-windows ForWindows   expand     Expand          \
+	    invoke Invoke strict Strict !strict NotStrict \
+	    files  Files  links  Links  all Everything    \
+	    dirs   Directories directories Directories    \
+	    state? QueryState from? QueryFrom into? QueryInto \
+	    excluded? QueryExcluded as? QueryAs type? QueryType \
+	    recursive? QueryRecursive operation? QueryOperation \
+	    strict? QueryStrict !recursive NotRecursive
+
+	$self Reset
+	runl $args
+	return
+    }
+
+    destructor {
+	$mywip destroy
+	return
+    }
+
+    method do {args} {
+	return [runl $args]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## DSL Implementation
+    wip::dsl
+
+    # General reset of processor state
+    method Reset {} {
+	$stack clear
+	set base     ""
+	set alias    ""
+	set op       ""
+	set recursive 0
+	set src      ""
+	set excl     ""
+	set types    {}
+	set strict   0
+	return
+    }
+
+    # Stack manipulation
+    method Push {} {
+	$stack push [list $base $alias $op $opcmd $recursive $src $excl $types $strict]
+	return
+    }
+
+    method Pop {} {
+	if {![$stack size]} {
+	    return -code error {Stack underflow}
+	}
+	foreach {base alias op opcmd recursive src excl types strict} [$stack pop] break
+	return
+    }
+
+    # Destination directory
+    method Into {dir} {
+	if {$dir eq ""} {set dir [pwd]}
+	if {$strict && ![fileutil::test $dir edr msg {Destination directory}]} {
+	    return -code error $msg
+	}
+	set base $dir
+	return
+    }
+
+    method ChDir {dir} { $self Into [file join    $base $dir] ; return }
+    method ChUp  {}    { $self Into [file dirname $base]      ; return }
+
+    # Detail
+    method As {fname} {
+	set alias [ForceRelative $fname]
+	return
+    }
+
+    # Operations
+    method Move   {} { set op move   ; return }
+    method Copy   {} { set op copy   ; return }
+    method Remove {} { set op remove ; return }
+    method Expand {} { set op expand ; return }
+
+    method Invoke {cmdprefix} {
+	set op    invoke
+	set opcmd $cmdprefix
+	return
+    }
+
+    # Operation qualifier
+    method Recursive    {} { set recursive 1 ; return }
+    method NotRecursive {} { set recursive 0 ; return }
+
+    # Source directory
+    method From {dir} {
+	if {$dir eq ""} {set dir [pwd]}
+	if {![fileutil::test $dir edr msg {Source directory}]} {
+	    return -code error $msg
+	}
+	set src $dir
+	return
+    }
+
+    # Exceptions
+    method But    {} { run_next_while {not exclude} ; return }
+    method Except {} { run_next_while {for}         ; return }
+
+    method Exclude {pattern} {
+	lappend excl $pattern
+	return
+    }
+
+    # Define the files to operate on, and perform the operation.
+    method The {pattern} {
+	run_next_while {as but except exclude from into in to files dirs directories links all}
+
+	switch -exact -- $op {
+	    invoke {Invoke [Resolve [Remember [Exclude [Expand $src  $pattern]]]]}
+	    move   {Move   [Resolve [Remember [Exclude [Expand $src  $pattern]]]]}
+	    copy   {Copy   [Resolve [Remember [Exclude [Expand $src  $pattern]]]]}
+	    remove {Remove          [Remember [Exclude [Expand $base $pattern]]] }
+	    expand {                 Remember [Exclude [Expand $base $pattern]]  }
+	}
+
+	# Reset the per-pattern flags of the resolution context back
+	# to their defaults, for the next pattern.
+
+	set alias    {}
+	set excl     {}
+	set recursive 0
+	return
+    }
+
+    # Like 'The' above, except that the fileset is taken from the
+    # specified variable. Semi-complementary to 'Save' below.
+    # Exclusion data and recursion info do not apply for this, this is
+    # already implicitly covered by the set, when it was generated.
+
+    method TheSet {varname} {
+	# See 'Save' for the levels we jump here.
+	upvar 5 $varname var
+
+	run_next_while {as from into in to}
+
+	switch -exact -- $op {
+	    invoke {Invoke [Resolve $var]}
+	    move   {Move   [Resolve $var]}
+	    copy   {Copy   [Resolve $var]}
+	    remove {Remove          $var }
+	    expand {
+		return -code error "Expansion does not make sense\
+                                    when we already have a set of files."
+	    }
+	}
+
+	# Reset the per-pattern flags of the resolution context back
+	# to their defaults, for the next pattern.
+
+	set alias    {}
+	return
+    }
+
+    # Save the last expansion result to a variable for use by future commands.
+
+    method Save {varname} {
+	# Levels to jump. Brittle.
+	# 5: Caller
+	# 4:   object do ...
+	# 3:     runl
+	# 2:       wip::runl
+	# 1:         run_next
+	# 0: Here
+	upvar 5 $varname v
+	set v $lastexpansion
+	return
+    }
+
+    # Platform conditionals ...
+
+    method ForUnix {} {
+	global tcl_platform
+	if {$tcl_platform(platform) eq "unix"} return
+	# Kill the remaining code. This effectively aborts processing.
+	replacel {}
+	return
+    }
+
+    method ForWindows {} {
+	global tcl_platform
+	if {$tcl_platform(platform) eq "windows"} return
+	# Kill the remaining code. This effectively aborts processing.
+	replacel {}
+	return
+    }
+
+    # Strictness
+
+    method Strict {} {
+	set strict 1
+	return
+    }
+
+    method NotStrict {} {
+	set strict 0
+	return
+    }
+
+    # Type qualifiers
+
+    method Files {} {
+	set types files
+	return
+    }
+
+    method Links {} {
+	set types links
+	return
+    }
+
+    method Directories {} {
+	set types dirs
+	return
+    }
+
+    method Everything {} {
+	set types {}
+	return
+    }
+
+    # State interogation
+
+    method QueryState {} {
+	return [list \
+		    from      $src \
+		    into      $base \
+		    as        $alias \
+		    op        $op \
+		    excluded  $excl \
+		    recursive $recursive \
+		    type      $types \
+		    strict    $strict \
+		   ]
+    }
+    method QueryExcluded {} {
+	return $excl
+    }
+    method QueryFrom {} {
+	return $src
+    }
+    method QueryInto {} {
+	return $base
+    }
+    method QueryAs {} {
+	return $alias
+    }
+    method QueryOperation {} {
+	return $op
+    }
+    method QueryRecursive {} {
+	return $recursive
+    }
+    method QueryType {} {
+	return $types
+    }
+    method QueryStrict {} {
+	return $strict
+    }
+
+    # ### ### ### ######### ######### #########
+    ## DSL State
+
+    component stack       ; # State stack     - ( )
+    variable  base     "" ; # Destination dir - into, in, cd, up
+    variable  alias    "" ; # Detail          - as
+    variable  op       "" ; # Operation       - move, copy, remove, expand, invoke
+    variable  opcmd    "" ; # Command prefix for invoke.
+    variable  recursive 0 ; # Op. qualifier: recursive expansion?
+    variable  src      "" ; # Source dir      - from
+    variable  excl     "" ; # Excluded files  - but not|exclude, except for
+    # incl                ; # Included files  - the (immediate use)
+    variable types     {} ; # Limit glob/find to specific types (f, l, d).
+    variable strict    0  ; # Strictness of into/Expand
+
+    variable lastexpansion "" ; # Area for last expansion result, for 'Save' to take from.
+
+    # ### ### ### ######### ######### #########
+    ## Internal -- Path manipulation helpers.
+
+    proc ForceRelative {path} {
+	set pathtype [file pathtype $path]
+	switch -exact -- $pathtype {
+	    relative {
+		return $path
+	    }
+	    absolute {
+		# Chop off the first element in the path, which is the
+		# root, either '/' or 'x:/'. If this was the only
+		# element assume an empty path.
+
+		set path [lrange [file split $path] 1 end]
+		if {![llength $path]} {return {}}
+		return [eval [linsert $path 0 file join]]
+	    }
+	    volumerelative {
+		return -code error {Unable to handle volumerelative path, yet}
+	    }
+	}
+
+	return -code error \
+	    "file pathtype returned unknown type \"$pathtype\""
+    }
+
+    proc ForceAbsolute {path} {
+	return [file join [pwd] $path]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal - Operation execution helpers
+
+    proc Invoke {files} {
+	upvar 1 base base src src opcmd opcmd
+	uplevel #0 [linsert $opcmd end $src $base $files]
+	return
+    }
+
+    proc Move {files} {
+	upvar 1 base base src src
+
+	foreach {s d} $files {
+	    set s [file join $src  $s]
+	    set d [file join $base $d]
+
+	    file mkdir [file dirname $d]
+	    file rename -force $s $d
+	}
+	return
+    }
+
+    proc Copy {files} {
+	upvar 1 base base src src
+
+	foreach {s d} $files {
+	    set s [file join $src  $s]
+	    set d [file join $base $d]
+
+	    file mkdir [file dirname $d]
+	    if {
+		[file isdirectory $s] &&
+		[file exists      $d] &&
+		[file isdirectory $d]
+	    } {
+		# Special case: source and destination are
+		# directories, and the latter exists. This puts the
+		# source under the destination, and may even prevent
+		# copying at all. The semantics of the operation is
+		# that the source is the destination. We avoid the
+		# trouble by copying the contents of the source,
+		# instead of the directory itself.
+		foreach path [glob -directory $s *] {
+		    file copy -force $path $d
+		}
+	    } else {
+		file copy -force $s $d
+	    }
+	}
+	return
+    }
+
+    proc Remove {files} {
+	upvar 1 base base
+
+	foreach f $files {
+	    file delete -force [file join $base $f]
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal -- Resolution helper commands
+
+    typevariable tmap -array {
+	files {f TFile}
+	links {l TLink}
+	dirs  {d TDir}
+	{}    {{} {}}
+    }
+
+    proc Expand {dir pattern} {
+	upvar 1 recursive recursive strict strict types types tmap tmap
+	# FUTURE: struct::list filter ...
+
+	set files {}
+	if {$recursive} {
+	    # Recursion through the entire directory hierarchy, save
+	    # all matching paths.
+
+	    set filter [lindex $tmap($types) 1]
+	    if {$filter ne ""} {
+		set filter [myproc $filter]
+	    }
+
+	    foreach f [fileutil::find $dir $filter] {
+		if {![string match $pattern [file tail $f]]} continue
+		lappend files [fileutil::stripPath $dir $f]
+	    }
+	} else {
+	    # No recursion, just scan the whole directory for matching paths.
+	    # check for specific types integrated.
+
+	    set filter [lindex $tmap($types) 0]
+	    if {$filter ne ""} {
+		foreach f [glob -nocomplain -directory $dir -types $filter -- $pattern] {
+		    lappend files [fileutil::stripPath $dir $f]
+		}
+	    } else {
+		foreach f [glob -nocomplain -directory $dir -- $pattern] {
+		    lappend files [fileutil::stripPath $dir $f]
+		}
+	    }
+	}
+
+	if {[llength $files]} {return $files}
+	if {!$strict}         {return {}}
+
+	return -code error \
+	    "No files matching pattern \"$pattern\" in directory \"$dir\""
+    }
+
+    proc TFile {f} {file isfile $f}
+    proc TDir  {f} {file isdirectory $f}
+    proc TLink {f} {expr {[file type $f] eq "link"}}
+
+    proc Exclude {files} {
+	upvar 1 excl excl
+
+	# FUTURE: struct::list filter ...
+	set res {}
+	foreach f $files {
+	    if {[IsExcluded $f $excl]} continue
+	    lappend res $f
+	}
+	return $res
+    }
+
+    proc IsExcluded {f patterns} {
+	foreach p $patterns {
+	    if {[string match $p $f]} {return 1}
+	}
+	return 0
+    }
+
+    proc Resolve {files} {
+	upvar 1 alias alias
+	set res {}
+	foreach f $files {
+
+	    # Remember alias for processing and auto-invalidate to
+	    # prevent contamination of the next file.
+
+	    set thealias $alias
+	    set alias    ""
+
+	    if {$thealias eq ""} {
+		set d $f
+	    } else {
+		set d [file dirname $f]
+		if {$d eq "."} {
+		    set d $thealias
+		} else {
+		    set d [file join $d $thealias]
+		}
+	    }
+
+	    lappend res $f $d
+	}
+	return $res
+    }
+
+    proc Remember {files} {
+	upvar 1 lastexpansion lastexpansion
+	set lastexpansion $files
+	return $files
+    }
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide fileutil::multi::op 0.5.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/paths.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/paths.tcl
new file mode 100644
index 00000000..e387acf7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/paths.tcl
@@ -0,0 +1,74 @@
+# paths.tcl --
+#
+#	Manage lists of search paths.
+#
+# Copyright (c) 2009-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# Each object instance manages a list of paths.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+package require snit
+
+# ### ### ### ######### ######### #########
+## API
+
+snit::type ::fileutil::paths {
+
+    # ### ### ### ######### ######### #########
+    ## Options :: None
+
+    # ### ### ### ######### ######### #########
+    ## Creation, destruction
+
+    # Default constructor.
+    # Default destructor.
+
+    # ### ### ### ######### ######### #########
+    ## Methods :: Querying and manipulating the list of paths.
+
+    method paths {} {
+	return $mypaths
+    }
+
+    method add {path} {
+	set pos [lsearch $mypaths $path]
+	if {$pos >= 0 } return
+	lappend mypaths $path
+	return
+    }
+
+    method remove {path} {
+	set pos [lsearch $mypaths $path]
+	if {$pos < 0} return
+	set mypaths [lreplace $mypaths $pos $pos]
+	return
+    }
+
+    method clear {} {
+	set mypaths {}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal methods :: None
+
+    # ### ### ### ######### ######### #########
+    ## State :: List of paths.
+
+    variable mypaths {}
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide fileutil::paths 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/pkgIndex.tcl
new file mode 100644
index 00000000..110eb616
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/pkgIndex.tcl
@@ -0,0 +1,15 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded fileutil 1.16.1 [list source [file join $dir fileutil.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.3]} {return}
+package ifneeded fileutil::traverse 0.6 [list source [file join $dir traverse.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded fileutil::multi     0.1   [list source [file join $dir multi.tcl]]
+package ifneeded fileutil::multi::op 0.5.3 [list source [file join $dir multiop.tcl]]
+package ifneeded fileutil::decode    0.2.1 [list source [file join $dir decode.tcl]]
+package ifneeded fileutil::paths     1     [list source [file join $dir paths.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.5]} return
+
+if {![package vsatisfies [package provide Tcl] 8.6]} return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/traverse.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/traverse.tcl
new file mode 100644
index 00000000..2f36d109
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fileutil/traverse.tcl
@@ -0,0 +1,504 @@
+# traverse.tcl --
+#
+#	Directory traversal.
+#
+# Copyright (c) 2006-2015 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.3
+
+# OO core
+if {[package vsatisfies [package present Tcl] 8.5]} {
+    # Use new Tcl 8.5a6+ features to specify the allowed packages.
+    # We can use anything above 1.3. This means v2 as well.
+    package require snit 1.3-
+} else {
+    # For Tcl 8.{3,4} only snit1 of a suitable patchlevel is possible.
+    package require snit 1.3
+}
+package require control  ; # Helpers for control structures
+package require fileutil ; # -> fullnormalize
+
+snit::type ::fileutil::traverse {
+
+    # Incremental directory traversal.
+
+    # API
+    # create  %AUTO% basedirectory options... -> object
+    # next    filevar                         -> boolean
+    # foreach filevar script
+    # files                                   -> list (path ...)
+
+    # Options
+    # -prefilter command-prefix
+    # -filter    command-prefix
+    # -errorcmd  command-prefix
+
+    # Use cases
+    #
+    # (a) Basic incremental
+    # - Create and configure a traversal object.
+    # - Execute 'next' to retrieve one path at a time,
+    #   until the command returns False, signaling that
+    #   the iterator has exhausted the supply of paths.
+    #   (The path is stored in the named variable).
+    #
+    # The execution of 'next' can be done in a loop, or via event
+    # processing.
+
+    # (b) Basic loop
+    # - Create and configure a traversal object.
+    # - Run a script for each path, using 'foreach'.
+    #   This is a convenient standard wrapper around 'next'.
+    #
+    # The loop properly handles all possible Tcl result codes.
+
+    # (c) Non-incremental, non-looping.
+    # - Create and configure a traversal object.
+    # - Retrieve a list of all paths via 'files'.
+
+    # The -prefilter callback is executed for directories. Its result
+    # determines if the traverser recurses into the directory or not.
+    # The default is to always recurse into all directories. The call-
+    # back is invoked with a single argument, the path of the
+    # directory.
+    #
+    # The -filter callback is executed for all paths. Its result
+    # determines if the current path is a valid result, and returned
+    # by 'next'. The default is to accept all paths as valid. The
+    # callback is invoked with a single argument, the path to check.
+
+    # The -errorcmd callback is executed for all paths the traverser
+    # has trouble with. Like being unable to cd into them, get their
+    # status, etc. The default is to ignore any such problems. The
+    # callback is invoked with a two arguments, the path for which the
+    # error occured, and the error message. Errors thrown by the
+    # filter callbacks are handled through this callback too. Errors
+    # thrown by the error callback itself are not caught and ignored,
+    # but allowed to pass to the caller, usually of 'next'.
+
+    # Note: Low-level functionality, version and platform dependent is
+    # implemented in procedures, and conditioally defined for optimal
+    # use of features, etc. ...
+
+    # Note: Traversal is done in depth-first pre-order.
+
+    # Note: The options are handled only during
+    # construction. Afterward they are read-only and attempts to
+    # modify them will cause the system to throw errors.
+
+    # ### ### ### ######### ######### #########
+    ## Implementation
+
+    option -filter    -default {} -readonly 1
+    option -prefilter -default {} -readonly 1
+    option -errorcmd  -default {} -readonly 1
+
+    constructor {basedir args} {
+	set _base $basedir
+	$self configurelist $args
+	return
+    }
+
+    method files {} {
+	set files {}
+	$self foreach f {lappend files $f}
+	return $files
+    }
+
+    method foreach {fvar body} {
+	upvar 1 $fvar currentfile
+
+	# (Re-)initialize the traversal state on every call.
+	$self Init
+
+	while {[$self next currentfile]} {
+	    set code [catch {uplevel 1 $body} result]
+
+	    # decide what to do upon the return code:
+	    #
+	    #               0 - the body executed successfully
+	    #               1 - the body raised an error
+	    #               2 - the body invoked [return]
+	    #               3 - the body invoked [break]
+	    #               4 - the body invoked [continue]
+	    # everything else - return and pass on the results
+	    #
+	    switch -exact -- $code {
+		0 {}
+		1 {
+		    return -errorinfo [::control::ErrorInfoAsCaller uplevel foreach]  \
+			    -errorcode $::errorCode -code error $result
+		}
+		3 {
+		    # FRINK: nocheck
+		    return
+		}
+		4 {}
+		default {
+		    return -code $code $result
+		}
+	    }
+	}
+	return
+    }
+
+    method next {fvar} {
+	upvar 1 $fvar currentfile
+
+	# Initialize on first call.
+	if {!$_init} {
+	    $self Init
+	}
+
+	# We (still) have valid paths in the result stack, return the
+	# next one.
+
+	if {[llength $_results]} {
+	    set top      [lindex   $_results end]
+	    set _results [lreplace $_results end end]
+	    set currentfile $top
+	    return 1
+	}
+
+	# Take the next directory waiting in the processing stack and
+	# fill the result stack with all valid files and sub-
+	# directories contained in it. Extend the processing queue
+	# with all sub-directories not yet seen already (!circular
+	# symlinks) and accepted by the prefilter. We stop iterating
+	# when we either have no directories to process anymore, or
+	# the result stack contains at least one path we can return.
+
+	while {[llength $_pending]} {
+	    set top      [lindex   $_pending end]
+	    set _pending [lreplace $_pending end end]
+
+	    # Directory accessible? Skip if not.
+	    if {![ACCESS $top]} {
+		Error $top "Inacessible directory"
+		continue
+	    }
+
+	    # Expand the result stack with all files in the directory,
+	    # modulo filtering.
+
+	    foreach f [GLOBF $top] {
+		if {![Valid $f]} continue
+		lappend _results $f
+	    }
+
+	    # Expand the result stack with all sub-directories in the
+	    # directory, modulo filtering. Further expand the
+	    # processing stack with the same directories, if not seen
+	    # yet and modulo pre-filtering.
+
+	    foreach f [GLOBD $top] {
+		if {
+		    [string equal [file tail $f]  "."] ||
+		    [string equal [file tail $f] ".."]
+		} continue
+
+		if {[Valid $f]} {
+		    lappend _results $f
+		}
+
+		Enter $top $f
+		if {[Cycle $f]} continue
+
+		if {[Recurse $f]} {
+		    lappend _pending $f
+		}
+	    }
+
+	    # Stop expanding if we have paths to return.
+
+	    if {[llength $_results]} {
+		set top      [lindex   $_results end]
+		set _results [lreplace $_results end end]
+		set currentfile $top
+		return 1
+	    }
+	}
+
+	# Allow re-initialization with next call.
+
+	set _init 0
+	return 0
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Traversal state
+
+    # * Initialization flag. Checked in 'next', reset by next when no
+    #   more files are available. Set in 'Init'.
+    # * Base directory (or file) to start the traversal from.
+    # * Stack of prefiltered unknown directories waiting for
+    #   processing, i.e. expansion (TOP at end).
+    # * Stack of valid paths waiting to be returned as results.
+    # * Set of directories already visited (normalized paths), for
+    #   detection of circular symbolic links.
+
+    variable _init         0  ; # Initialization flag.
+    variable _base         {} ; # Base directory.
+    variable _pending      {} ; # Processing stack.
+    variable _results      {} ; # Result stack.
+
+    # sym link handling (to break cycles, while allowing the following of non-cycle links).
+    # Notes
+    # - path parent   tracking is lexical.
+    # - path identity tracking is based on the normalized path, i.e. the path with all
+    #   symlinks resolved.
+    # Maps
+    # - path -> parent     (easier to follow the list than doing dirname's)
+    # - path -> normalized (cache to avoid redundant calls of fullnormalize)
+    # cycle <=> A parent's normalized form (NF) is identical to the current path's NF
+
+    variable _parent -array {}
+    variable _norm   -array {}
+
+    # ### ### ### ######### ######### #########
+    ## Internal helpers.
+
+    proc Enter {parent path} {
+	#puts ___E|$path
+	upvar 1 _parent _parent _norm _norm
+	set _parent($path) $parent
+	set _norm($path)   [fileutil::fullnormalize $path]
+    }
+
+    proc Cycle {path} {
+	upvar 1 _parent _parent _norm _norm
+	set nform $_norm($path)
+	set paren $_parent($path)
+	while {$paren ne {}} {
+	    if {$_norm($paren) eq $nform} { return yes }
+	    set paren $_parent($paren)
+	}
+	return no
+    }
+
+    method Init {} {
+	array unset _parent *
+	array unset _norm   *
+
+	# Path ok as result?
+	if {[Valid $_base]} {
+	    lappend _results $_base
+	}
+
+	# Expansion allowed by prefilter?
+	if {[file isdirectory $_base] && [Recurse $_base]} {
+	    Enter {} $_base
+	    lappend _pending $_base
+	}
+
+	# System is set up now.
+	set _init 1
+	return
+    }
+
+    proc Valid {path} {
+	#puts ___V|$path
+	upvar 1 options options
+	if {![llength $options(-filter)]} {return 1}
+	set path [file normalize $path]
+	set code [catch {uplevel \#0 [linsert $options(-filter) end $path]} valid]
+	if {!$code} {return $valid}
+	Error $path $valid
+	return 0
+    }
+
+    proc Recurse {path} {
+	#puts ___X|$path
+	upvar 1 options options _norm _norm
+	if {![llength $options(-prefilter)]} {return 1}
+	set path [file normalize $path]
+	set code [catch {uplevel \#0 [linsert $options(-prefilter) end $path]} valid]
+	if {!$code} {return $valid}
+	Error $path $valid
+	return 0
+    }
+
+    proc Error {path msg} {
+	upvar 1 options options
+	if {![llength $options(-errorcmd)]} return
+	set path [file normalize $path]
+	uplevel \#0 [linsert $options(-errorcmd) end $path $msg]
+	return
+    }
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+##
+
+# The next three helper commands for the traverser depend strongly on
+# the version of Tcl, and partially on the platform.
+
+# 1. In Tcl 8.3 using -types f will return only true files, but not
+#    links to files. This changed in 8.4+ where links to files are
+#    returned as well. So for 8.3 we have to handle the links
+#    separately (-types l) and also filter on our own.
+#    Note that Windows file links are hard links which are reported by
+#    -types f, but not -types l, so we can optimize that for the two
+#    platforms.
+#
+# 2. In Tcl 8.3 we also have a crashing bug in glob (SIGABRT, "stat on
+#    a known file") when trying to perform 'glob -types {hidden f}' on
+#    a directory without e'x'ecute permissions. We code around by
+#    testing if we can cd into the directory (stat might return enough
+#    information too (mode), but possibly also not portable).
+#
+#    For Tcl 8.2 and 8.4+ glob simply delivers an empty result
+#    (-nocomplain), without crashing. For them this command is defined
+#    so that the bytecode compiler removes it from the bytecode.
+#
+#    This bug made the ACCESS helper necessary.
+#    We code around the problem by testing if we can cd into the
+#    directory (stat might return enough information too (mode), but
+#    possibly also not portable).
+
+if {[package vsatisfies [package present Tcl] 8.5]} {
+    # Tcl 8.5+.
+    # We have to check readability of "current" on our own, glob
+    # changed to error out instead of returning nothing.
+
+    proc ::fileutil::traverse::ACCESS {args} {return 1}
+
+    proc ::fileutil::traverse::GLOBF {current} {
+	if {![file readable $current] ||
+	    [BadLink $current]} {
+	    return {}
+	}
+
+	set res [lsort -unique [concat \
+		     [glob -nocomplain -directory $current -types f          -- *] \
+		     [glob -nocomplain -directory $current -types {hidden f} -- *]]]
+
+	# Look for broken links (They are reported as neither file nor directory).
+	foreach l [lsort -unique [concat \
+		       [glob -nocomplain -directory $current -types l          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden l} -- *]]] {
+	    if {[file isfile      $l]} continue
+	    if {[file isdirectory $l]} continue
+	    lappend res $l
+	}
+	return [lsort -unique $res]
+    }
+
+    proc ::fileutil::traverse::GLOBD {current} {
+	if {![file readable $current] ||
+	    [BadLink $current]} {
+	    return {}
+	}
+
+	lsort -unique [concat \
+	   [glob -nocomplain -directory $current -types d          -- *] \
+	   [glob -nocomplain -directory $current -types {hidden d} -- *]]
+    }
+
+    proc ::fileutil::traverse::BadLink {current} {
+	if {[file type $current] ne "link"} { return no }
+
+	set dst [file join [file dirname $current] [file readlink $current]]
+
+	if {![file exists   $dst] ||
+	    ![file readable $dst]} {
+	    return yes
+	}
+
+	return no
+    }
+
+} elseif {[package vsatisfies [package present Tcl] 8.4]} {
+    # Tcl 8.4+.
+    # (Ad 1) We have -directory, and -types,
+    # (Ad 2) Links are returned for -types f/d if they refer to files/dirs.
+    # (Ad 3) No bug to code around
+
+    proc ::fileutil::traverse::ACCESS {args} {return 1}
+
+    proc ::fileutil::traverse::GLOBF {current} {
+	set res [concat \
+		     [glob -nocomplain -directory $current -types f          -- *] \
+		     [glob -nocomplain -directory $current -types {hidden f} -- *]]
+
+	# Look for broken links (They are reported as neither file nor directory).
+	foreach l [concat \
+		       [glob -nocomplain -directory $current -types l          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden l} -- *] ] {
+	    if {[file isfile      $l]} continue
+	    if {[file isdirectory $l]} continue
+	    lappend res $l
+	}
+	return $res
+    }
+
+    proc ::fileutil::traverse::GLOBD {current} {
+	concat \
+	    [glob -nocomplain -directory $current -types d          -- *] \
+	    [glob -nocomplain -directory $current -types {hidden d} -- *]
+    }
+
+} else {
+    # 8.3.
+    # (Ad 1) We have -directory, and -types,
+    # (Ad 2) Links are NOT returned for -types f/d, collect separately.
+    #        No symbolic file links on Windows.
+    # (Ad 3) Bug to code around.
+
+    proc ::fileutil::traverse::ACCESS {current} {
+	if {[catch {
+	    set h [pwd] ; cd $current ; cd $h
+	}]} {return 0}
+	return 1
+    }
+
+    if {[string equal $::tcl_platform(platform) windows]} {
+	proc ::fileutil::traverse::GLOBF {current} {
+	    concat \
+		[glob -nocomplain -directory $current -types f          -- *] \
+		[glob -nocomplain -directory $current -types {hidden f} -- *]]
+	}
+    } else {
+	proc ::fileutil::traverse::GLOBF {current} {
+	    set l [concat \
+		       [glob -nocomplain -directory $current -types f          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden f} -- *]]
+
+	    foreach x [concat \
+			   [glob -nocomplain -directory $current -types l          -- *] \
+			   [glob -nocomplain -directory $current -types {hidden l} -- *]] {
+		if {[file isdirectory $x]} continue
+		# We have now accepted files, links to files, and broken links.
+		lappend l $x
+	    }
+
+	    return $l
+	}
+    }
+
+    proc ::fileutil::traverse::GLOBD {current} {
+	set l [concat \
+		   [glob -nocomplain -directory $current -types d          -- *] \
+		   [glob -nocomplain -directory $current -types {hidden d} -- *]]
+
+	foreach x [concat \
+		       [glob -nocomplain -directory $current -types l          -- *] \
+		       [glob -nocomplain -directory $current -types {hidden l} -- *]] {
+	    if {![file isdirectory $x]} continue
+	    lappend l $x
+	}
+
+	return $l
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide fileutil::traverse 0.6
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftp/ftp.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftp/ftp.tcl
new file mode 100644
index 00000000..f5f13c7f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftp/ftp.tcl
@@ -0,0 +1,3159 @@
+# ftp.tcl --
+#
+#	FTP library package for Tcl 8.2+.  Originally written by Steffen
+#	Traeger (Steffen.Traeger@t-online.de); modified by Peter MacDonald
+#	(peter@pdqi.com) to support multiple simultaneous FTP sessions;
+#	Modified by Steve Ball (Steve.Ball@zveno.com) to support
+#	asynchronous operation.
+#
+# Copyright (c) 1996-1999 by Steffen Traeger <Steffen.Traeger@t-online.de>
+# Copyright (c) 2000 by Ajuba Solutions
+# Copyright (c) 2000 by Zveno Pty Ltd
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: ftp.tcl,v 1.50 2011/08/09 20:57:01 andreas_kupries Exp $
+#
+#   core ftp support: 	ftp::Open <server> <user> <passwd> <?options?>
+#			ftp::Close <s>
+#			ftp::Cd <s> <directory>
+#			ftp::Pwd <s>
+#			ftp::Type <s> <?ascii|binary|tenex?>	
+#			ftp::List <s> <?directory?>
+#			ftp::NList <s> <?directory?>
+#			ftp::FileSize <s> <file>
+#			ftp::ModTime <s> <file> <?newtime?>
+#			ftp::Delete <s> <file>
+#			ftp::Rename <s> <from> <to>
+#			ftp::Put <s> <(local | -data "data" -channel chan)> <?remote?>
+#			ftp::Append <s> <(local | -data "data" | -channel chan)> <?remote?>
+#			ftp::Get <s> <remote> <?(local | -variable varname | -channel chan)?>
+#			ftp::Reget <s> <remote> <?local?>
+#			ftp::Newer <s> <remote> <?local?>
+#			ftp::MkDir <s> <directory>
+#			ftp::RmDir <s> <directory>
+#			ftp::Quote <s> <arg1> <arg2> ...
+#
+# Internal documentation. Contents of a session state array.
+#
+# ---------------------------------------------
+# key             value
+# ---------------------------------------------
+# State           Current state of the session and the currently executing command.
+# RemoteFileName  Name of the remote file, for put/get
+# LocalFileName   Name of local file, for put/get
+# inline          1 - Put/Get is inline (from data, to variable)
+# filebuffer  
+# PutData         Data to move when inline
+# SourceCI        Channel to read from, "Put"
+# ---------------------------------------------
+#
+
+package require Tcl 8.2
+package require log     ; # tcllib/log, general logging facility.
+
+namespace eval ::ftp {
+    namespace export DisplayMsg Open Close Cd Pwd Type List NList \
+	    FileSize ModTime Delete Rename Put Append Get Reget \
+	    Newer Quote MkDir RmDir
+
+    variable serial  0
+    variable VERBOSE 0
+    variable DEBUG   0
+}
+
+#############################################################################
+#
+# DisplayMsg --
+#
+# This is a simple procedure to display any messages on screen.
+# Can be intercepted by the -output option to Open
+#
+#	namespace ftp {
+#		proc DisplayMsg {msg} {
+#			......
+#		}
+#	}
+#
+# Arguments:
+# msg - 		message string
+# state -		different states {normal, data, control, error}
+#
+proc ::ftp::DisplayMsg {s msg {state ""}} {
+
+    upvar ::ftp::ftp$s ftp
+
+    if { ([info exists ftp(Output)]) && ($ftp(Output) != "") } {
+        eval [concat $ftp(Output) {$s $msg $state}]
+        return
+    }
+
+    # FIX #476729. Instead of changing the documentation this
+    #              procedure is changed to enforce the documented
+    #              behaviour. IOW, this procedure will not throw
+    #              errors anymore. At the same time printing to stdout
+    #              is exchanged against calls into the 'log' module
+    #              tcllib, which is much easier to customize for the
+    #              needs of any application using the ftp module. The
+    #              variable VERBOSE is still relevant as it controls
+    #              whether this procedure is called or not.
+
+    global errorInfo
+    switch -exact -- $state {
+        error   {log::log error "$state | $msg"}
+        default {log::log debug "$state | $msg"}
+    }
+    return
+}
+
+#############################################################################
+#
+# Timeout --
+#
+# Handle timeouts
+# 
+# Arguments:
+#  -
+#
+proc ::ftp::Timeout {s} {
+    upvar ::ftp::ftp$s ftp
+    variable VERBOSE
+
+    if {$VERBOSE} { DisplayMsg $s Waiting|Timeout! }
+
+    after cancel $ftp(Wait)
+    set ftp(state.control) 1
+
+    DisplayMsg "" "Timeout of control connection after $ftp(Timeout) sec.!" error
+    Command $ftp(Command) timeout
+    return
+}
+
+#############################################################################
+#
+# WaitOrTimeout --
+#
+# Blocks the running procedure and waits for a variable of the transaction 
+# to complete. It continues processing procedure until a procedure or 
+# StateHandler sets the value of variable "finished". 
+# If a connection hangs the variable is setting instead of by this procedure after 
+# specified seconds in $ftp(Timeout).
+#  
+# 
+# Arguments:
+#  -		
+#
+
+proc ::ftp::WaitOrTimeout {s} {
+    upvar ::ftp::ftp$s ftp
+    variable VERBOSE
+
+    set retvar 1
+
+    if { ![string length $ftp(Command)] && [info exists ftp(state.control)] } {
+
+	if {$VERBOSE} { DisplayMsg $s Waiting|$ftp(Timeout)|\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\# }
+
+        set ftp(Wait) [after [expr {$ftp(Timeout) * 1000}] [list [namespace current]::Timeout $s]]
+
+        vwait ::ftp::ftp${s}(state.control)
+        set retvar $ftp(state.control)
+
+	if {$VERBOSE} { DisplayMsg $s Waiting|Done|\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\# }
+    }
+
+    if {$ftp(Error) != ""} {
+        set errmsg $ftp(Error)
+        set ftp(Error) ""
+        DisplayMsg $s $errmsg error
+    }
+
+    if {$VERBOSE} { DisplayMsg $s Waiting|OK|$retvar }
+    return $retvar
+}
+
+#############################################################################
+#
+# WaitComplete --
+#
+# Transaction completed.
+# Cancel execution of the delayed command declared in procedure WaitOrTimeout.
+# 
+# Arguments:
+# value -	result of the transaction
+#			0 ... Error
+#			1 ... OK
+#
+
+proc ::ftp::WaitComplete {s value} {
+    variable VERBOSE
+    upvar ::ftp::ftp$s ftp
+
+    if {$VERBOSE} { DisplayMsg $s Waiting|Complete|$s|$value|\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\# }
+
+    if {![info exists ftp(Command)]} {
+	set ftp(state.control) $value
+
+	if {$VERBOSE} { DisplayMsg $s Waiting|Complete|Done/Command|$value|\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\# }
+	return $value
+    }
+    if { ![string length $ftp(Command)] && [info exists ftp(state.data)] } {
+
+	if {$VERBOSE} { DisplayMsg $s Waiting|State|\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\# }
+
+        vwait ::ftp::ftp${s}(state.data)
+
+	if {$VERBOSE} { DisplayMsg $s Waiting|State|Done|\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\# }
+    }
+
+    catch {after cancel $ftp(Wait)}
+    set ftp(state.control) $value
+
+    if {$VERBOSE} { DisplayMsg $s Waiting|OK|$ftp(state.control)|\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\# }
+
+    return $ftp(state.control)
+}
+
+#############################################################################
+#
+# PutsCtrlSocket --
+#
+# Puts then specified command to control socket,
+# if DEBUG is set than it logs via DisplayMsg
+# 
+# Arguments:
+# command - 		ftp command
+#
+
+proc ::ftp::PutsCtrlSock {s {command ""}} {
+    upvar ::ftp::ftp$s ftp
+    variable DEBUG
+	
+    if { $DEBUG } {
+        DisplayMsg $s "---> $command"
+    }
+
+    puts $ftp(CtrlSock) $command
+    flush $ftp(CtrlSock)
+    return
+}
+
+#############################################################################
+#
+# StateHandler --
+#
+# Implements a finite state handler and a fileevent handler
+# for the control channel
+# 
+# Arguments:
+# sock - 		socket name
+#			If called from a procedure than this argument is empty.
+# 			If called from a fileevent than this argument contains
+#			the socket channel identifier.
+
+proc ::ftp::StateHandler {s {sock ""}} {
+    upvar ::ftp::ftp$s ftp
+    variable DEBUG 
+    variable VERBOSE
+
+    if {$VERBOSE} { DisplayMsg $s StateHandler/$s/$sock/================================================ }
+
+    # disable fileevent on control socket, enable it at the and of the state machine
+    # fileevent $ftp(CtrlSock) readable {}
+		
+    # there is no socket (and no channel to get) if called from a procedure
+
+    set rc "   "
+    set msgtext {}
+
+    if { $sock != "" } {
+
+        set number 0                            ;# Error condition
+        catch {set number [gets $sock bufline]}
+
+        if { $number > 0 } {
+
+            # get return code, check for multi-line text
+            
+            if {![regexp -- "^-?(\[0-9\]+)( |-)?(.*)$" $bufline all rc multi_line msgtext]} {
+		set errmsg "C: Internal Error @ line 255.\
+			Regex pattern not matching the input \"$bufline\""
+		if {$VERBOSE} {
+		    DisplayMsg $s $errmsg control
+		}
+	    } else {
+		# multi-line format detected ("-"), get all the lines
+		# until the real return code
+
+		set buffer $bufline
+			
+		while { [string equal $multi_line "-"] } {
+		    set number [gets $sock bufline]	
+		    if { $number > 0 } {
+			append buffer \n "$bufline"
+			regexp -- "(^\[0-9\]+)( |-)?(.*)$" $bufline all rc multi_line
+			# multi_line is not set if the bufline does not match the regexp,
+			# I.e. this keeps the '-' which started this around until the
+			# closing line does match and sets it to space.
+		    } elseif {$number == -1 && [eof $sock]} {
+			# The reply indicated a multi-line reply, but the
+			# socket was closed and there were no more lines.
+			# In that case, keep the current return values.
+
+			# This means the server isn't speaking strict rfc959.
+			# see section on multi-line replies
+			break
+		    }
+		}
+
+		# Export the accumulated response. [Bug 1191607].
+		set msgtext $buffer
+	    }
+        } elseif { [eof $ftp(CtrlSock)] } {
+            # remote server has closed control connection. kill
+            # control socket, unset State to disable all following
+            # commands. Killing the socket is done before
+            # 'WaitComplete' to prevent it from recursively entering
+            # this code, overflowing the stack (socket still existing,
+            # still readable, still eof). [SF Tcllib Bug 15822535].
+            
+            set rc 421
+            catch {close $ftp(CtrlSock)}
+            catch {unset  ftp(CtrlSock)}
+            catch {unset  ftp(state.data)}
+            if { $VERBOSE } {
+                DisplayMsg $s "C: 421 Service not available, closing control connection." control
+            }
+            if {![string equal $ftp(State) "quit_sent"]} {
+		set ftp(Error) "Service not available!"
+	    }
+            CloseDataConn $s
+            WaitComplete $s 0
+	    Command $ftp(Command) terminated
+            catch {unset ftp(State)}
+
+	    if {$VERBOSE} { DisplayMsg $s EOF/Control }
+            return
+        } else {
+	    # Fix SF bug #466746: Incomplete line, do nothing.
+	    if {$VERBOSE} { DisplayMsg $s Incomplete/Line }
+	    return	   
+	}
+    } 
+	
+    if { $DEBUG } {
+        DisplayMsg $s "-> rc=\"$rc\" -> msgtext=\"$msgtext\" -> state=\"$ftp(State)\""
+    }
+
+    # In asynchronous mode, should we move on to the next state?
+    set nextState 0
+	
+    # system status replay
+    if { [string equal $rc "211"] } {
+	if {$VERBOSE} { DisplayMsg $s Ignore/211 }
+        return
+    }
+
+    # use only the first digit 
+    regexp -- "^\[0-9\]?" $rc rc
+
+    if {$VERBOSE} { DisplayMsg $s StateBegin////////($ftp(State)) }
+
+    switch -exact -- $ftp(State) {
+        user { 
+            switch -exact -- $rc {
+                2 {
+                    PutsCtrlSock $s "USER $ftp(User)"
+                    set ftp(State) passwd
+		    Command $ftp(Command) user
+                }
+                default {
+                    set errmsg "Error connecting! $msgtext"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        passwd {
+            switch -exact -- $rc {
+                2 {
+                    set complete_with 1
+		    Command $ftp(Command) password
+                }
+                3 {
+                    PutsCtrlSock $s "PASS $ftp(Passwd)"
+                    set ftp(State) connect
+		    Command $ftp(Command) password
+                }
+                default {
+                    set errmsg "Error connecting! $msgtext"
+                    set complete_with 0
+		    Command $ftp(Command) error $msgtext
+                }
+            }
+        }
+        connect {
+            switch -exact -- $rc {
+                2 {
+		    # The type is set after this, and we want to report
+		    # that the connection is complete once the type is done
+		    set nextState 1
+		    if {[info exists ftp(NextState)] && ![llength $ftp(NextState)]} {
+			Command $ftp(Command) connect $s
+		    } else {
+			set complete_with 1
+		    }
+                }
+                default {
+                    set errmsg "Error connecting! $msgtext"
+                    set complete_with 0
+		    Command $ftp(Command) error $msgtext
+                }
+            }
+        }   
+	connect_last {
+	    Command $ftp(Command) connect $s
+	    set complete_with 1
+	}
+        quit {
+            PutsCtrlSock $s "QUIT"
+            set ftp(State) quit_sent
+        }
+        quit_sent {
+            switch -exact -- $rc {
+                2 {
+                    set complete_with 1
+		    set nextState 1
+		    Command $ftp(Command) quit
+                }
+                default {
+                    set errmsg "Error disconnecting! $msgtext"
+                    set complete_with 0
+		    Command $ftp(Command) error $msgtext
+                }
+            }
+        }
+        quote {
+            PutsCtrlSock $s $ftp(Cmd)
+            set ftp(State) quote_sent
+        }
+        quote_sent {
+            set complete_with 1
+            set ftp(Quote) $buffer
+	    set nextState 1
+	    Command $ftp(Command) quote $buffer
+        }
+        type {
+            if { [string equal $ftp(Type) "ascii"] } {
+                PutsCtrlSock $s "TYPE A"
+            } elseif { [string equal $ftp(Type) "binary"] } {
+                PutsCtrlSock $s "TYPE I"
+            } else {
+                PutsCtrlSock $s "TYPE L"
+            }
+            set ftp(State) type_sent
+        }
+        type_sent {
+            switch -exact -- $rc {
+                2 {
+                    set complete_with 1
+		    set nextState 1
+		    Command $ftp(Command) type $ftp(Type)
+                }
+                default {
+                    set errmsg "Error setting type \"$ftp(Type)\"!"
+                    set complete_with 0
+		    Command $ftp(Command) error "error setting type \"$ftp(Type)\""
+                }
+            }
+        }
+	type_change {
+	    set ftp(Type) $ftp(type:changeto)
+	    set ftp(State) type
+	    StateHandler $s
+	}
+        nlist_active {
+            if { [OpenActiveConn $s] } {
+                PutsCtrlSock $s "PORT $ftp(LocalAddr),$ftp(DataPort)"
+                set ftp(State) nlist_open
+            } else {
+                set errmsg "Error setting port!"
+            }
+        }
+        nlist_passive {
+            PutsCtrlSock $s "PASV"
+            set ftp(State) nlist_open
+        }
+        nlist_open {
+            switch -exact -- $rc {
+                1 {}
+		2 {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        if { ![OpenPassiveConn $s $buffer] } {
+                            set errmsg "Error setting PASSIVE mode!"
+                            set complete_with 0
+			    Command $ftp(Command) error "error setting passive mode"
+                        }
+                    }   
+                    PutsCtrlSock $s "NLST$ftp(Dir)"
+                    set ftp(State) list_sent
+                }
+                default {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        set errmsg "Error setting PASSIVE mode!"
+                    } else {
+                        set errmsg "Error setting port!"
+                    }  
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        list_active {
+            if { [OpenActiveConn $s] } {
+                PutsCtrlSock $s "PORT $ftp(LocalAddr),$ftp(DataPort)"
+                set ftp(State) list_open
+            } else {
+                set errmsg "Error setting port!"
+		Command $ftp(Command) error $errmsg
+            }
+        }
+        list_passive {
+            PutsCtrlSock $s "PASV"
+            set ftp(State) list_open
+        }
+        list_open {
+            switch -exact -- $rc {
+                1 {}
+		2 {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        if { ![OpenPassiveConn $s $buffer] } {
+                            set errmsg "Error setting PASSIVE mode!"
+                            set complete_with 0
+			    Command $ftp(Command) error $errmsg
+                        }
+                    }   
+                    PutsCtrlSock $s "LIST$ftp(Dir)"
+                    set ftp(State) list_sent
+                }
+                default {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        set errmsg "Error setting PASSIVE mode!"
+                    } else {
+                        set errmsg "Error setting port!"
+                    }  
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        list_sent {
+            switch -exact -- $rc {
+                1 -
+		2 {
+                    set ftp(State) list_close
+                }
+                default {  
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        catch {unset ftp(state.data)}
+                    }    
+                    set errmsg "Error getting directory listing!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        list_close {
+            switch -exact -- $rc {
+                1 {}
+		2 {
+		    # Sync control sequencer to active data connection
+		    # before stepping out
+		    WaitDataConn $s
+
+		    set nextState 1
+		    if {[info exists ftp(NextState)] && ![llength $ftp(NextState)]} {
+			Command $ftp(Command) list [ListPostProcess $ftp(List)]
+		    } else {
+			set complete_with 1
+		    }
+                }
+                default {
+                    set errmsg "Error receiving list!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+	list_last {
+	    Command $ftp(Command) list [ListPostProcess $ftp(List)]
+	    set complete_with 1
+	}
+        size {
+            PutsCtrlSock $s "SIZE $ftp(File)"
+            set ftp(State) size_sent
+        }
+        size_sent {
+            switch -exact -- $rc {
+                2 {
+                    regexp -- "^\[0-9\]+ (.*)$" $buffer all ftp(FileSize)
+                    set complete_with 1
+		    set nextState 1
+		    Command $ftp(Command) size $ftp(File) $ftp(FileSize)
+                }
+                default {
+                    set errmsg "Error getting file size!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        } 
+        modtime {
+            if {$ftp(DateTime) != ""} {
+              PutsCtrlSock $s "MDTM $ftp(DateTime) $ftp(File)"
+            } else { ;# No DateTime Specified
+              PutsCtrlSock $s "MDTM $ftp(File)"
+            }
+            set ftp(State) modtime_sent
+        }  
+        modtime_sent {
+            switch -exact -- $rc {
+                2 {
+                    regexp -- "^\[0-9\]+ (.*)$" $buffer all ftp(DateTime)
+                    set complete_with 1
+		    set nextState 1
+		    Command $ftp(Command) modtime $ftp(File) [ModTimePostProcess $ftp(DateTime)]
+                }
+                default {
+                    if {$ftp(DateTime) != ""} {
+                      set errmsg "Error setting modification time! No server MDTM support?"
+                    } else {
+                      set errmsg "Error getting modification time!"
+                    }
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        } 
+        pwd {
+            PutsCtrlSock $s "PWD"
+            set ftp(State) pwd_sent
+        }
+        pwd_sent {
+            switch -exact -- $rc {
+                2 {
+                    regexp -- "^.*\"(.*)\"" $buffer temp ftp(Dir)
+                    set complete_with 1
+		    set nextState 1
+		    Command $ftp(Command) pwd $ftp(Dir)
+                }
+                default {
+                    set errmsg "Error getting working dir!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        cd {
+            PutsCtrlSock $s "CWD$ftp(Dir)"
+            set ftp(State) cd_sent
+        }
+        cd_sent {
+            switch -exact -- $rc {
+                1 {}
+		2 {
+                    set complete_with 1
+		    set nextState 1
+		    Command $ftp(Command) cd $ftp(Dir)
+                }
+                default {
+                    set errmsg "Error changing directory to \"$ftp(Dir)\""
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        mkdir {
+            PutsCtrlSock $s "MKD $ftp(Dir)"
+            set ftp(State) mkdir_sent
+        }
+        mkdir_sent {
+            switch -exact -- $rc {
+                2 {
+                    set complete_with 1
+		    set nextState 1
+		    Command $ftp(Command) mkdir $ftp(Dir)
+                }
+                default {
+                    set errmsg "Error making dir \"$ftp(Dir)\"!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        rmdir {
+            PutsCtrlSock $s "RMD $ftp(Dir)"
+            set ftp(State) rmdir_sent
+        }
+        rmdir_sent {
+            switch -exact -- $rc {
+                2 {
+                    set complete_with 1
+		    set nextState 1
+		    Command $ftp(Command) rmdir $ftp(Dir)
+                }
+                default {
+                    set errmsg "Error removing directory!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        delete {
+            PutsCtrlSock $s "DELE $ftp(File)"
+            set ftp(State) delete_sent
+        }
+        delete_sent {
+            switch -exact -- $rc {
+                2 {
+                    set complete_with 1
+		    set nextState 1
+		    Command $ftp(Command) delete $ftp(File)
+                }
+                default {
+                    set errmsg "Error deleting file \"$ftp(File)\"!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        rename {
+            PutsCtrlSock $s "RNFR $ftp(RenameFrom)"
+            set ftp(State) rename_to
+        }
+        rename_to {
+            switch -exact -- $rc {
+                3 {
+                    PutsCtrlSock $s "RNTO $ftp(RenameTo)"
+                    set ftp(State) rename_sent
+                }
+                default {
+                    set errmsg "Error renaming file \"$ftp(RenameFrom)\"!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        rename_sent {
+            switch -exact -- $rc {
+                2 {
+                    set complete_with 1
+		    set nextState 1
+		    Command $ftp(Command) rename $ftp(RenameFrom) $ftp(RenameTo)
+                }
+                default {
+                    set errmsg "Error renaming file \"$ftp(RenameFrom)\"!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        put_active {
+            if { [OpenActiveConn $s] } {
+                PutsCtrlSock $s "PORT $ftp(LocalAddr),$ftp(DataPort)"
+                set ftp(State) put_open
+            } else {
+                set errmsg "Error setting port!"
+		Command $ftp(Command) error $errmsg
+            }
+        }
+        put_passive {
+            PutsCtrlSock $s "PASV"
+            set ftp(State) put_open
+        }
+        put_open {
+            switch -exact -- $rc {
+                1 -
+		2 {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        if { ![OpenPassiveConn $s $buffer] } {
+                            set errmsg "Error setting PASSIVE mode!"
+                            set complete_with 0
+			    Command $ftp(Command) error $errmsg
+                        }
+                    } 
+                    PutsCtrlSock $s "STOR $ftp(RemoteFilename)"
+                    set ftp(State) put_sent
+                }
+                default {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        set errmsg "Error setting PASSIVE mode!"
+                    } else {
+                        set errmsg "Error setting port!"
+                    }  
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        put_sent {
+            switch -exact -- $rc {
+                1 -
+		2 {
+                    set ftp(State) put_close
+                }
+                default {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        # close already opened DataConnection
+                        catch {unset ftp(state.data)}
+                    }  
+                    set errmsg "Error opening connection!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        put_close {
+            switch -exact -- $rc {
+		1 {
+		    # Keep going
+		    if {$VERBOSE} { DisplayMsg $s put_close/1--continue }
+		    return
+		}
+                2 {
+		    # Sync control sequencer to active data connection
+		    # before stepping out
+		    WaitDataConn $s
+
+                    set complete_with 1
+		    set nextState 1
+		    Command $ftp(Command) put $ftp(RemoteFilename)
+                }
+                default {
+		    DisplayMsg $s "rc = $rc msgtext = \"$msgtext\""
+                    set errmsg "Error storing file \"$ftp(RemoteFilename)\" due to \"$msgtext\""
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        append_active {
+            if { [OpenActiveConn $s] } {
+                PutsCtrlSock $s "PORT $ftp(LocalAddr),$ftp(DataPort)"
+                set ftp(State) append_open
+            } else {
+                set errmsg "Error setting port!"
+		Command $ftp(Command) error $errmsg
+            }
+        }
+        append_passive {
+            PutsCtrlSock $s "PASV"
+            set ftp(State) append_open
+        }
+        append_open {
+            switch -exact -- $rc {
+		1 -
+                2 {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        if { ![OpenPassiveConn $s $buffer] } {
+                            set errmsg "Error setting PASSIVE mode!"
+                            set complete_with 0
+			    Command $ftp(Command) error $errmsg
+                        }
+                    }   
+                    PutsCtrlSock $s "APPE $ftp(RemoteFilename)"
+                    set ftp(State) append_sent
+                }
+                default {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        set errmsg "Error setting PASSIVE mode!"
+                    } else {
+                        set errmsg "Error setting port!"
+                    }  
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        append_sent {
+            switch -exact -- $rc {
+                1 {
+                    set ftp(State) append_close
+                }
+                default {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        # close already opened DataConnection
+                        catch {unset ftp(state.data)}
+                    }  
+                    set errmsg "Error opening connection!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        append_close {
+            switch -exact -- $rc {
+                2 {
+		    # Sync control sequencer to active data connection
+		    # before stepping out
+		    WaitDataConn $s
+
+                    set complete_with 1
+		    set nextState 1
+		    Command $ftp(Command) append $ftp(RemoteFilename)
+                }
+                default {
+                    set errmsg "Error storing file \"$ftp(RemoteFilename)\"!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        reget_active {
+            if { [OpenActiveConn $s] } {
+                PutsCtrlSock $s "PORT $ftp(LocalAddr),$ftp(DataPort)"
+                set ftp(State) reget_restart
+            } else {
+                set errmsg "Error setting port!"
+		Command $ftp(Command) error $errmsg
+            }
+        }
+        reget_passive {
+            PutsCtrlSock $s "PASV"
+            set ftp(State) reget_restart
+        }
+        reget_restart {
+            switch -exact -- $rc {
+                2 { 
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        if { ![OpenPassiveConn $s $buffer] } {
+                            set errmsg "Error setting PASSIVE mode!"
+                            set complete_with 0
+			    Command $ftp(Command) error $errmsg
+                        }
+                    }   
+                    if { $ftp(FileSize) != 0 } {
+                        PutsCtrlSock $s "REST $ftp(FileSize)"
+                        set ftp(State) reget_open
+                    } else {
+                        PutsCtrlSock $s "RETR $ftp(RemoteFilename)"
+                        set ftp(State) reget_sent
+                    } 
+                }
+                default {
+                    set errmsg "Error restarting filetransfer of \"$ftp(RemoteFilename)\"!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        reget_open {
+            switch -exact -- $rc {
+                2 -
+                3 {
+                    PutsCtrlSock $s "RETR $ftp(RemoteFilename)"
+                    set ftp(State) reget_sent
+                }
+                default {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        set errmsg "Error setting PASSIVE mode!"
+                    } else {
+                        set errmsg "Error setting port!"
+                    }
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        reget_sent {
+            switch -exact -- $rc {
+                1 {
+                    set ftp(State) reget_close
+                }
+                default {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        # close already opened DataConnection
+                        catch {unset ftp(state.data)}
+                    }  
+                    set errmsg "Error retrieving file \"$ftp(RemoteFilename)\"!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        reget_close {
+            switch -exact -- $rc {
+                2 {
+		    # Sync control sequencer to active data connection
+		    # before stepping out
+		    WaitDataConn $s
+
+                    set complete_with 1
+		    set nextState 1
+		    Command $ftp(Command) get $ftp(RemoteFilename):$ftp(From):$ftp(To)
+		    unset ftp(From) ftp(To)
+                }
+                default {
+                    set errmsg "Error retrieving file \"$ftp(RemoteFilename)\"!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        get_active {
+            if { [OpenActiveConn $s] } {
+                PutsCtrlSock $s "PORT $ftp(LocalAddr),$ftp(DataPort)"
+                set ftp(State) get_open
+            } else {
+                set errmsg "Error setting port!"
+		Command $ftp(Command) error $errmsg
+            }
+        } 
+        get_passive {
+            PutsCtrlSock $s "PASV"
+            set ftp(State) get_open
+        }
+        get_open {
+            switch -exact -- $rc {
+                1 -
+		2 -
+                3 {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        if { ![OpenPassiveConn $s $buffer] } {
+                            set errmsg "Error setting PASSIVE mode!"
+                            set complete_with 0
+			    Command $ftp(Command) error $errmsg
+                        }
+                    }   
+                    PutsCtrlSock $s "RETR $ftp(RemoteFilename)"
+                    set ftp(State) get_sent
+                }
+                default {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        set errmsg "Error setting PASSIVE mode!"
+                    } else {
+                        set errmsg "Error setting port!"
+                    }  
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        get_sent {
+            switch -exact -- $rc {
+                1 {
+                    set ftp(State) get_close
+                }
+                default {
+                    if { [string equal $ftp(Mode) "passive"] } {
+                        # close already opened DataConnection
+                        catch {unset ftp(state.data)}
+                    }  
+                    set errmsg "Error retrieving file \"$ftp(RemoteFilename)\"!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+        get_close {
+            switch -exact -- $rc {
+                2 {
+		    # Sync control sequencer to active data connection
+		    # before stepping out
+		    WaitDataConn $s
+
+                    set complete_with 1
+		    set nextState 1
+		    if {$ftp(inline)} {
+			upvar #0 $ftp(get:varname) returnData
+			set returnData $ftp(GetData)
+			Command $ftp(Command) get $ftp(GetData)
+		    } else {
+			Command $ftp(Command) get $ftp(RemoteFilename)
+		    }
+                }
+                default {
+                    set errmsg "Error retrieving file \"$ftp(RemoteFilename)\"!"
+                    set complete_with 0
+		    Command $ftp(Command) error $errmsg
+                }
+            }
+        }
+	default {
+	    error "Unknown state \"$ftp(State)\""
+	}
+    }
+
+    if {$VERBOSE} { DisplayMsg $s ////////StateDone==>$ftp(State) }
+
+    # finish waiting 
+    if { [info exists complete_with] } {
+	if {$VERBOSE} { DisplayMsg $s WaitBegin////////($complete_with) }
+
+        WaitComplete $s $complete_with
+
+	if {$VERBOSE} { DisplayMsg $s ////////WaitDone }
+    }
+
+    # display control channel message
+    if { [info exists buffer] } {
+        if { $VERBOSE } {
+            foreach line [split $buffer \n] {
+                DisplayMsg $s "C: $line" control
+            }
+        }
+    }
+	
+    # Rather than throwing an error in the event loop, set the ftp(Error)
+    # variable to hold the message so that it can later be thrown after the
+    # the StateHandler has completed.
+
+    if { [info exists errmsg] } {
+        set ftp(Error) $errmsg
+    }
+
+    # If operating asynchronously, commence next state
+    if {$VERBOSE} {
+	DisplayMsg $s "ns=$nextState, NS=[info exists ftp(NextState)], NSlen=[expr {[info exists ftp(NextState)] && [llength $ftp(NextState)]}]"
+    }
+    if {$nextState && [info exists ftp(NextState)] && [llength $ftp(NextState)]} {
+	# Pop the head of the NextState queue
+	if {$VERBOSE} { DisplayMsg $s Sequence=($ftp(NextState)) }
+
+	set ftp(State)     [lindex   $ftp(NextState) 0]
+	set ftp(NextState) [lreplace $ftp(NextState) 0 0]
+
+	if {$VERBOSE} { DisplayMsg $s Recurse/StateHandler }
+	StateHandler $s
+    }
+
+    # enable fileevent on control socket again
+    #fileevent $ftp(CtrlSock) readable [list ::ftp::StateHandler $ftp(CtrlSock)]
+
+    if {$VERBOSE} { DisplayMsg $s ======/HandlerDone }
+    return
+}
+
+#############################################################################
+#
+# Type --
+#
+# REPRESENTATION TYPE - Sets the file transfer type to ascii or binary.
+# (exported)
+#
+# Arguments:
+# type - 		specifies the representation type (ascii|binary)
+# 
+# Returns:
+# type	-		returns the current type or {} if an error occurs
+
+proc ::ftp::Type {s {type ""}} {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        if { ![string is digit -strict $s] } {
+            DisplayMsg $s "Bad connection name \"$s\"" error
+        } else {
+            DisplayMsg $s "Not connected!" error
+        }
+        return {}
+    }
+
+    # return current type
+    if { $type == "" } {
+        return $ftp(Type)
+    }
+
+    # save current type
+    set old_type $ftp(Type) 
+	
+    set ftp(Type) $type
+    set ftp(State) type
+    StateHandler $s
+	
+    # wait for synchronization
+    set rc [WaitOrTimeout $s]
+    if { $rc } {
+        return $ftp(Type)
+    } else {
+        # restore old type
+        set ftp(Type) $old_type
+        return {}
+    }
+}
+
+#############################################################################
+#
+# NList --
+#
+# NAME LIST - This command causes a directory listing to be sent from
+# server to user site.
+# (exported)
+# 
+# Arguments:
+# dir - 		The $dir should specify a directory or other system 
+#			specific file group descriptor; a null argument 
+#			implies the current directory. 
+#
+# Arguments:
+# dir - 		directory to list 
+# 
+# Returns:
+# sorted list of files or {} if listing fails
+
+proc ::ftp::NList {s { dir ""}} {
+    variable VERBOSE
+    upvar ::ftp::ftp$s ftp
+
+    if {$VERBOSE} { DisplayMsg $s NList($s)($dir)~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ }
+
+    if { ![info exists ftp(State)] } {
+        if { ![string is digit -strict $s] } {
+            DisplayMsg $s "Bad connection name \"$s\"" error
+        } else {
+            DisplayMsg $s "Not connected!" error
+        }
+        return {}
+    }
+
+    set ftp(List) {}
+    if { $dir == "" } {
+        set ftp(Dir) ""
+    } else {
+        set ftp(Dir) " $dir"
+    }
+
+    # save current type and force ascii mode
+    set old_type $ftp(Type)
+    if { $ftp(Type) != "ascii" } {
+	if {$VERBOSE} { DisplayMsg $s NList/ForceAscii }
+
+	if {[string length $ftp(Command)]} {
+	    set ftp(NextState) [list nlist_$ftp(Mode) type_change list_last]
+	    set ftp(type:changeto) $old_type
+	    Type $s ascii
+	    return {}
+	}
+        Type $s ascii
+    }
+
+    set ftp(State) nlist_$ftp(Mode)
+
+    if {$VERBOSE} { DisplayMsg $s NList/Process~~~~~~~~~~~~~~~~~~~ }
+    StateHandler $s
+
+    if {$VERBOSE} { DisplayMsg $s NList/Processed~~~~~~~~~~~~~~~~~ }
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s]
+
+    # restore old type
+    if {$VERBOSE} { DisplayMsg $s NList/RestoreType~~~~~~~~~~~~~~~~~~~~~ }
+    if { [Type $s] != $old_type } {
+        Type $s $old_type
+    }
+
+    unset ftp(Dir)
+    if { $rc } {
+	if {$VERBOSE} { DisplayMsg $s NList/ReturnData~~~~~~~~~~~~~~~~~~~~~~~ }
+
+	return [lsort [split [string trim $ftp(List) \n] \n]]
+    } else {
+	if {$VERBOSE} { DisplayMsg $s NList/CDC~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ }
+
+        CloseDataConn $s
+        return {}
+    }
+
+    if {$VERBOSE} { DisplayMsg $s ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~NList/Done }
+}
+
+#############################################################################
+#
+# List --
+#
+# LIST - This command causes a list to be sent from the server
+# to user site.
+# (exported)
+# 
+# Arguments:
+# dir - 		If the $dir specifies a directory or other group of 
+#			files, the server should transfer a list of files in 
+#			the specified directory. If the $dir specifies a file
+#			then the server should send current information on the
+# 			file.  A null argument implies the user's current 
+#			working or default directory.  
+# 
+# Returns:
+# list of files or {} if listing fails
+
+proc ::ftp::List {s {dir ""}} {
+
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        if { ![string is digit -strict $s] } {
+            DisplayMsg $s "Bad connection name \"$s\"" error
+        } else {
+            DisplayMsg $s "Not connected!" error
+        }
+        return {}
+    }
+
+    set ftp(List) {}
+    if { $dir == "" } {
+        set ftp(Dir) ""
+    } else {
+        set ftp(Dir) " $dir"
+    }
+
+    # save current type and force ascii mode
+
+    set old_type $ftp(Type)
+    if { ![string equal "$ftp(Type)" "ascii"] } {
+	if {[string length $ftp(Command)]} {
+	    set ftp(NextState) [list list_$ftp(Mode) type_change list_last]
+	    set ftp(type:changeto) $old_type
+	    Type $s ascii
+	    return {}
+	}
+        Type $s ascii
+    }
+
+    set ftp(State) list_$ftp(Mode)
+    StateHandler $s
+
+    # wait for synchronization
+
+    set rc [WaitOrTimeout $s]
+
+    # restore old type
+
+    if { ![string equal "[Type $s]" "$old_type"] } {
+        Type $s $old_type
+    }
+
+    unset ftp(Dir)
+    if { $rc } { 
+	return [ListPostProcess $ftp(List)]
+    } else {
+        CloseDataConn $s
+        return {}
+    }
+}
+
+proc ::ftp::ListPostProcess l {
+
+    # clear "total"-line
+
+    set l [split $l "\n"]
+    set index [lsearch -regexp $l "^total"]
+    if { $index != "-1" } { 
+	set l [lreplace $l $index $index]
+    }
+
+    # clear blank line
+
+    set index [lsearch -regexp $l "^$"]
+    if { $index != "-1" } { 
+	set l [lreplace $l $index $index]
+    }
+
+    return $l
+}
+
+#############################################################################
+#
+# FileSize --
+#
+# REMOTE FILE SIZE - This command gets the file size of the
+# file on the remote machine. 
+# ATTENTION! Doesn't work properly in ascii mode!
+# (exported)
+# 
+# Arguments:
+# filename - 		specifies the remote file name
+# 
+# Returns:
+# size -		files size in bytes or {} in error cases
+
+proc ::ftp::FileSize {s {filename ""}} {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        if { ![string is digit -strict $s] } {
+            DisplayMsg $s "Bad connection name \"$s\"" error
+        } else {
+            DisplayMsg $s "Not connected!" error
+        }
+        return {}
+    }
+	
+    if { $filename == "" } {
+        return {}
+    } 
+
+    set ftp(File) $filename
+    set ftp(FileSize) 0
+	
+    set ftp(State) size
+    StateHandler $s
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s]
+	
+    if {![string length $ftp(Command)]} {
+	unset ftp(File)
+    }
+		
+    if { $rc } {
+        return $ftp(FileSize)
+    } else {
+        return {}
+    }
+}
+
+
+#############################################################################
+#
+# ModTime --
+#
+# MODIFICATION TIME - This command gets the last modification time of the
+# file on the remote machine.
+# (exported)
+# 
+# Arguments:
+# filename - 		specifies the remote file name
+# datetime -            optional new timestamp for file
+# 
+# Returns:
+# clock -		files date and time as a system-depentend integer
+#			value in seconds (see tcls clock command) or {} in 
+#			error cases
+# if MDTM not supported on server, returns original timestamp
+
+proc ::ftp::ModTime {s {filename ""} {datetime ""}} {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        if { ![string is digit -strict $s] } {
+            DisplayMsg $s "Bad connection name \"$s\"" error
+        } else {
+            DisplayMsg $s "Not connected!" error
+        } 
+        return {}
+    }
+	
+    if { $filename == "" } {
+        return {}
+    } 
+
+    set ftp(File) $filename
+
+    if {$datetime != ""} {
+      set datetime [clock format $datetime -format "%Y%m%d%H%M%S"]
+    }
+    set ftp(DateTime) $datetime
+	
+    set ftp(State) modtime
+    StateHandler $s
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s]
+	
+    if {![string length $ftp(Command)]} {
+	unset ftp(File)
+    }
+    if { ![string length $ftp(Command)] && $rc } {
+        return [ModTimePostProcess $ftp(DateTime)]
+    } else {
+        return {}
+    }
+}
+
+proc ::ftp::ModTimePostProcess {clock} {
+    foreach {year month day hour min sec} {1 1 1 1 1 1} break
+
+    # Bug #478478. Special code to detect ftp servers with a Y2K patch
+    # gone bad and delivering, hmmm, non-standard date information.
+
+    if {[string length $clock] == 15} {
+        scan $clock "%2s%3s%2s%2s%2s%2s%2s" cent year month day hour min sec
+        set year [expr {($cent * 100) + $year}]
+	log::log warning "data | W: server with non-standard time, bad Y2K patch."
+    } else {
+        scan $clock "%4s%2s%2s%2s%2s%2s" year month day hour min sec
+    }
+
+    set clock [clock scan "$month/$day/$year $hour:$min:$sec" -gmt 1]
+    return $clock
+}
+
+#############################################################################
+#
+# Pwd --
+#
+# PRINT WORKING DIRECTORY - Causes the name of the current working directory.
+# (exported)
+# 
+# Arguments:
+# None.
+# 
+# Returns:
+# current directory name
+
+proc ::ftp::Pwd {s } {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        if { ![string is digit -strict $s] } {
+            DisplayMsg $s "Bad connection name \"$s\"" error
+        } else {
+            DisplayMsg $s "Not connected!" error
+        }
+        return {}
+    }
+
+    set ftp(Dir) {}
+
+    set ftp(State) pwd
+    StateHandler $s
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s]
+	
+    if { $rc } {
+        return $ftp(Dir)
+    } else {
+        return {}
+    }
+}
+
+#############################################################################
+#
+# Cd --
+#   
+# CHANGE DIRECTORY - Sets the working directory on the server host.
+# (exported)
+# 
+# Arguments:
+# dir -			pathname specifying a directory
+#
+# Returns:
+# 0 -			ERROR
+# 1 - 			OK
+
+proc ::ftp::Cd {s {dir ""}} {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        if { ![string is digit -strict $s] } {
+            DisplayMsg $s "Bad connection name \"$s\"" error
+        } else {
+            DisplayMsg $s "Not connected!" error
+        }
+        return 0
+    }
+
+    if { $dir == "" } {
+        set ftp(Dir) ""
+    } else {
+        set ftp(Dir) " $dir"
+    }
+
+    set ftp(State) cd
+    StateHandler $s
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s] 
+
+    if {![string length $ftp(Command)]} {
+	unset ftp(Dir)
+    }
+	
+    if { $rc } {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+#############################################################################
+#
+# MkDir --
+#
+# MAKE DIRECTORY - This command causes the directory specified in the $dir
+# to be created as a directory (if the $dir is absolute) or as a subdirectory
+# of the current working directory (if the $dir is relative).
+# (exported)
+# 
+# Arguments:
+# dir -			new directory name
+#
+# Returns:
+# 0 -			ERROR
+# 1 - 			OK
+
+proc ::ftp::MkDir {s dir} {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        DisplayMsg $s "Not connected!" error
+        return 0
+    }
+
+    set ftp(Dir) $dir
+
+    set ftp(State) mkdir
+    StateHandler $s
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s] 
+
+    if {![string length $ftp(Command)]} {
+	unset ftp(Dir)
+    }
+	
+    if { $rc } {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+#############################################################################
+#
+# RmDir --
+#
+# REMOVE DIRECTORY - This command causes the directory specified in $dir to 
+# be removed as a directory (if the $dir is absolute) or as a 
+# subdirectory of the current working directory (if the $dir is relative).
+# (exported)
+#
+# Arguments:
+# dir -			directory name
+#
+# Returns:
+# 0 -			ERROR
+# 1 - 			OK
+
+proc ::ftp::RmDir {s dir} {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        DisplayMsg $s "Not connected!" error
+        return 0
+    }
+
+    set ftp(Dir) $dir
+
+    set ftp(State) rmdir
+    StateHandler $s
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s] 
+
+    if {![string length $ftp(Command)]} {
+	unset ftp(Dir)
+    }
+	
+    if { $rc } {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+#############################################################################
+#
+# Delete --
+#
+# DELETE - This command causes the file specified in $file to be deleted at 
+# the server site.
+# (exported)
+# 
+# Arguments:
+# file -			file name
+#
+# Returns:
+# 0 -			ERROR
+# 1 - 			OK
+
+proc ::ftp::Delete {s file} {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        DisplayMsg $s "Not connected!" error
+        return 0
+    }
+
+    set ftp(File) $file
+
+    set ftp(State) delete
+    StateHandler $s
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s] 
+
+    if {![string length $ftp(Command)]} {
+	unset ftp(File)
+    }
+	
+    if { $rc } {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+#############################################################################
+#
+# Rename --
+#
+# RENAME FROM TO - This command causes the file specified in $from to be 
+# renamed at the server site.
+# (exported)
+# 
+# Arguments:
+# from -			specifies the old file name of the file which 
+#				is to be renamed
+# to -				specifies the new file name of the file 
+#				specified in the $from agument
+# Returns:
+# 0 -			ERROR
+# 1 - 			OK
+
+proc ::ftp::Rename {s from to} {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        DisplayMsg $s "Not connected!" error
+        return 0
+    }
+
+    set ftp(RenameFrom) $from
+    set ftp(RenameTo) $to
+
+    set ftp(State) rename
+
+    StateHandler $s
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s] 
+
+    if {![string length $ftp(Command)]} {
+	unset ftp(RenameFrom)
+	unset ftp(RenameTo)
+    }
+	
+    if { $rc } {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+#############################################################################
+#
+# ElapsedTime --
+#
+# Gets the elapsed time for file transfer
+# 
+# Arguments:
+# stop_time - 		ending time
+
+proc ::ftp::ElapsedTime {s stop_time} {
+    variable VERBOSE
+    upvar ::ftp::ftp$s ftp
+
+    set elapsed [expr {$stop_time - $ftp(Start_Time)}]
+    if { $elapsed == 0 } {
+        set elapsed 1
+    }
+    set persec [expr {$ftp(Total) / $elapsed}]
+    if { $VERBOSE } {
+        DisplayMsg $s "$ftp(Total) bytes sent in $elapsed seconds ($persec Bytes/s)"
+    }
+    return
+}
+
+#############################################################################
+#
+# PUT --
+#
+# STORE DATA - Causes the server to accept the data transferred via the data 
+# connection and to store the data as a file at the server site.  If the file
+# exists at the server site, then its contents shall be replaced by the data
+# being transferred.  A new file is created at the server site if the file
+# does not already exist.
+# (exported)
+#
+# Arguments:
+# source -			local file name
+# dest -			remote file name, if unspecified, ftp assigns
+#				the local file name.
+# Returns:
+# 0 -			file not stored
+# 1 - 			OK
+
+proc ::ftp::Put {s args} {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        DisplayMsg $s "Not connected!" error
+        return 0
+    }
+    if {([llength $args] < 1) || ([llength $args] > 4)} {
+        DisplayMsg $s \
+		"wrong # args: should be \"ftp::Put handle (-data \"data\" | -channel chan | localFilename) remoteFilename\"" error
+	return 0    
+    }
+
+    set ftp(inline) 0
+    set flags 1
+    set source ""
+    set dest ""
+    foreach arg $args {
+        if {[string equal $arg "--"]} {
+            set flags 0
+        } elseif {($flags) && ([string equal $arg "-data"])} {
+            set ftp(inline) 1
+            set ftp(filebuffer) ""
+        } elseif {($flags) && ([string equal $arg "-channel"])} {
+            set ftp(inline) 2
+	} elseif {$source == ""} {
+            set source $arg
+	} elseif {$dest == ""} {
+            set dest $arg
+	} else {
+            DisplayMsg $s "wrong # args: should be \"ftp::Put handle (-data \"data\" | -channel chan | localFilename) remoteFilename\"" error
+	    return 0
+        }
+    }
+
+    if {($source == "")} {
+        DisplayMsg $s "Must specify a valid data source to Put" error
+        return 0
+    }        
+
+    set ftp(RemoteFilename) $dest
+
+    if {$ftp(inline) == 1} {
+        set ftp(PutData) $source
+        if { $dest == "" } {
+            set dest ftp.tmp
+        }
+        set ftp(RemoteFilename) $dest
+    } else {
+	if {$ftp(inline) == 0} {
+	    # File transfer
+
+	    set ftp(PutData) ""
+	    if { ![file exists $source] } {
+		DisplayMsg $s "File \"$source\" not exist" error
+		return 0
+	    }
+	    if { $dest == "" } {
+		set dest [file tail $source]
+	    }
+	    set ftp(LocalFilename) $source
+	    set ftp(SourceCI) [open $ftp(LocalFilename) r]
+	} else {
+	    # Channel transfer. We fake the rest of the system into
+	    # believing that a file transfer is happening. This makes
+	    # the handling easier.
+
+	    set ftp(SourceCI) $source
+	    set ftp(inline) 0
+	}
+        set ftp(RemoteFilename) $dest
+
+	# TODO: read from source file asynchronously
+        if { [string equal $ftp(Type) "ascii"] } {
+            fconfigure $ftp(SourceCI) -buffering line -blocking 1
+        } else {
+            fconfigure $ftp(SourceCI) -buffering line -translation binary -blocking 1
+        }
+    }
+
+    set ftp(State) put_$ftp(Mode)
+    StateHandler $s
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s]
+    if { $rc } {
+	if {![string length $ftp(Command)]} {
+	    ElapsedTime $s [clock seconds]
+	}
+        return 1
+    } else {
+        CloseDataConn $s
+        return 0
+    }
+}
+
+#############################################################################
+#
+# APPEND --
+#
+# APPEND DATA - Causes the server to accept the data transferred via the data 
+# connection and to store the data as a file at the server site.  If the file
+# exists at the server site, then the data shall be appended to that file; 
+# otherwise the file specified in the pathname shall be created at the
+# server site.
+# (exported)
+#
+# Arguments:
+# source -			local file name
+# dest -			remote file name, if unspecified, ftp assigns
+#				the local file name.
+# Returns:
+# 0 -			file not stored
+# 1 - 			OK
+
+proc ::ftp::Append {s args} {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        DisplayMsg $s "Not connected!" error
+        return 0
+    }
+
+    if {([llength $args] < 1) || ([llength $args] > 4)} {
+        DisplayMsg $s "wrong # args: should be \"ftp::Append handle (-data \"data\" | -channel chan | localFilename) remoteFilename\"" error
+        return 0
+    }
+
+    set ftp(inline) 0
+    set flags 1
+    set source ""
+    set dest ""
+    foreach arg $args {
+        if {[string equal $arg "--"]} {
+            set flags 0
+        } elseif {($flags) && ([string equal $arg "-data"])} {
+            set ftp(inline) 1
+            set ftp(filebuffer) ""
+        } elseif {($flags) && ([string equal $arg "-channel"])} {
+            set ftp(inline) 2
+        } elseif {$source == ""} {
+            set source $arg
+        } elseif {$dest == ""} {
+            set dest $arg
+        } else {
+            DisplayMsg $s "wrong # args: should be \"ftp::Append handle (-data \"data\" | -channel chan | localFilename) remoteFilename\"" error
+            return 0
+        }
+    }
+
+    if {($source == "")} {
+        DisplayMsg $s "Must specify a valid data source to Append" error
+        return 0
+    }   
+
+    set ftp(RemoteFilename) $dest
+
+    if {$ftp(inline) == 1} {
+        set ftp(PutData) $source
+        if { $dest == "" } {
+            set dest ftp.tmp
+        }
+        set ftp(RemoteFilename) $dest
+    } else {
+	if {$ftp(inline) == 0} {
+	    # File transfer
+
+	    set ftp(PutData) ""
+	    if { ![file exists $source] } {
+		DisplayMsg $s "File \"$source\" not exist" error
+		return 0
+	    }
+			
+	    if { $dest == "" } {
+		set dest [file tail $source]
+	    }
+
+	    set ftp(LocalFilename) $source
+	    set ftp(SourceCI) [open $ftp(LocalFilename) r]
+	} else {
+	    # Channel transfer. We fake the rest of the system into
+	    # believing that a file transfer is happening. This makes
+	    # the handling easier.
+
+	    set ftp(SourceCI) $source
+	    set ftp(inline) 0
+	}
+        set ftp(RemoteFilename) $dest
+
+        if { [string equal $ftp(Type) "ascii"] } {
+            fconfigure $ftp(SourceCI) -buffering line -blocking 1
+        } else {
+            fconfigure $ftp(SourceCI) -buffering line -translation binary \
+                    -blocking 1
+        }
+    }
+
+    set ftp(State) append_$ftp(Mode)
+    StateHandler $s
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s]
+    if { $rc } {
+	if {![string length $ftp(Command)]} {
+	    ElapsedTime $s [clock seconds]
+	}
+        return 1
+    } else {
+        CloseDataConn $s
+        return 0
+    }
+}
+
+
+#############################################################################
+#
+# Get --
+#
+# RETRIEVE DATA - Causes the server to transfer a copy of the specified file
+# to the local site at the other end of the data connection.
+# (exported)
+#
+# Arguments:
+# source -			remote file name
+# dest -			local file name, if unspecified, ftp assigns
+#				the remote file name.
+# Returns:
+# 0 -			file not retrieved
+# 1 - 			OK
+
+proc ::ftp::Get {s args} {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        DisplayMsg $s "Not connected!" error
+        return 0
+    }
+
+    if {([llength $args] < 1) || ([llength $args] > 4)} {
+        DisplayMsg $s "wrong # args: should be \"ftp::Get handle remoteFile ?(-variable varName | -channel chan | localFilename)?\"" error
+	return 0    
+    }
+
+    set ftp(inline) 0
+    set flags 1
+    set source ""
+    set dest ""
+    set varname "**NONE**"
+    foreach arg $args {
+        if {[string equal $arg "--"]} {
+            set flags 0
+        } elseif {($flags) && ([string equal $arg "-variable"])} {
+            set ftp(inline) 1
+            set ftp(filebuffer) ""
+        } elseif {($flags) && ([string equal $arg "-channel"])} {
+            set ftp(inline) 2
+	} elseif {($ftp(inline) == 1) && ([string equal $varname "**NONE**"])} {
+            set varname $arg
+	    set ftp(get:varname) $varname
+	} elseif {($ftp(inline) == 2) && ([string equal $varname "**NONE**"])} {
+	    set ftp(get:channel) $arg
+	} elseif {$source == ""} {
+            set source $arg
+	} elseif {$dest == ""} {
+            set dest $arg
+	} else {
+            DisplayMsg $s "wrong # args: should be \"ftp::Get handle remoteFile
+?(-variable varName | -channel chan | localFilename)?\"" error
+	    return 0
+        }
+    }
+
+    if {($ftp(inline) != 0) && ($dest != "")} {
+        DisplayMsg $s "Cannot return data in a variable or channel, and place it in destination file." error
+        return 0
+    }
+
+    if {$source == ""} {
+        DisplayMsg $s "Must specify a valid data source to Get" error
+        return 0
+    }
+
+    if {$ftp(inline) == 0} {
+	if { $dest == "" } {
+	    set dest $source
+	} else {
+	    if {[file isdirectory $dest]} {
+		set dest [file join $dest [file tail $source]]
+	    }
+	}
+	if {![file exists [file dirname $dest]]} {
+	    return -code error "ftp::Get, directory \"[file dirname $dest]\" for destination \"$dest\" does not exist"
+	}
+	set ftp(LocalFilename) $dest
+    }
+
+    set ftp(RemoteFilename) $source
+
+    if {$ftp(inline) == 2} {
+	set ftp(inline) 0
+    }
+    set ftp(State) get_$ftp(Mode)
+    StateHandler $s
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s]
+
+    # It is important to unset 'get:channel' in all cases or it will
+    # interfere with any following ftp command (as its existence
+    # suppresses the closing of the destination channel identifier
+    # (DestCI). We cannot do it earlier than just before the 'return'
+    # or code depending on it for the current command may not execute
+    # correctly.
+
+    if { $rc } {
+	if {![string length $ftp(Command)]} {
+	    ElapsedTime $s [clock seconds]
+	    if {$ftp(inline)} {
+		catch {unset ftp(get:channel)}
+		upvar $varname returnData
+		set returnData $ftp(GetData)
+	    }
+	}
+	# catch {unset ftp(get:channel)}
+	# SF Bug 1708350. DISABLED. In async mode (Open -command) the
+	# unset here causes HandleData to blow up, see marker <@>. In
+	# essence in async mode HandleData can be entered multiple
+	# times, and unsetting get:channel here causes it to think
+	# that the data goes into a local file, not a channel, but the
+	# state does not contain local file information, so an error
+	# is thrown. Removing the catch here seems to fix it without
+	# adverse effects elsewhere. Maybe. We hope.
+        return 1
+    } else {
+        if {$ftp(inline)} {
+	    catch {unset ftp(get:channel)}
+            return ""
+	}
+        CloseDataConn $s
+	catch {unset ftp(get:channel)}
+        return 0
+    }
+}
+
+#############################################################################
+#
+# Reget --
+#
+# RESTART RETRIEVING DATA - Causes the server to transfer a copy of the specified file
+# to the local site at the other end of the data connection like get but skips over 
+# the file to the specified data checkpoint. 
+# (exported)
+#
+# Arguments:
+# source -			remote file name
+# dest -			local file name, if unspecified, ftp assigns
+#				the remote file name.
+# Returns:
+# 0 -			file not retrieved
+# 1 - 			OK
+
+proc ::ftp::Reget {s source {dest ""} {from_bytes 0} {till_bytes -1}} {
+    upvar ::ftp::ftp$s ftp
+    
+    if { ![info exists ftp(State)] } {
+        DisplayMsg $s "Not connected!" error
+        return 0
+    }
+
+    if { $dest == "" } {
+        set dest $source
+    }
+    if {![file exists [file dirname $dest]]} {
+	return -code error \
+	"ftp::Reget, directory \"[file dirname $dest]\" for destination \"$dest\" does not exist"
+    }
+
+    set ftp(RemoteFilename) $source
+    set ftp(LocalFilename) $dest
+    set ftp(From) $from_bytes
+
+
+    # Assumes that the local file has a starting offset of $from_bytes
+    # The following calculation ensures that the download starts from the
+    # correct offset
+
+    if { [file exists $ftp(LocalFilename)] } {
+	set ftp(FileSize) [ expr {[file size $ftp(LocalFilename)] + $from_bytes }]
+	 	
+	if { $till_bytes != -1 } {
+	    set ftp(To)   $till_bytes	
+	    set ftp(Bytes_to_go) [ expr {$till_bytes - $ftp(FileSize)} ]
+	
+	    if { $ftp(Bytes_to_go) <= 0 } {return 0}
+
+	} else {
+	    # till_bytes not set
+	    set ftp(To)   end
+	}
+
+    } else {
+	# local file does not exist
+        set ftp(FileSize) $from_bytes
+		  
+	if { $till_bytes != -1 } {
+	    set ftp(Bytes_to_go) [ expr {$till_bytes - $from_bytes }]
+	    set ftp(To) $till_bytes
+	} else {
+	    #till_bytes not set
+	    set ftp(To)   end
+	}
+    }
+	
+    set ftp(State) reget_$ftp(Mode)
+    StateHandler $s
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s]
+    if { $rc } {
+	if {![string length $ftp(Command)]} {
+	    ElapsedTime $s [clock seconds]
+	}
+        return 1
+    } else {
+        CloseDataConn $s
+        return 0
+    }
+}
+
+#############################################################################
+#
+# Newer --
+#
+# GET NEWER DATA - Get the file only if the modification time of the remote 
+# file is more recent that the file on the current system. If the file does
+# not exist on the current system, the remote file is considered newer.
+# Otherwise, this command is identical to get. 
+# (exported)
+#
+# Arguments:
+# source -			remote file name
+# dest -			local file name, if unspecified, ftp assigns
+#				the remote file name.
+#
+# Returns:
+# 0 -			file not retrieved
+# 1 - 			OK
+
+proc ::ftp::Newer {s source {dest ""}} {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        DisplayMsg $s "Not connected!" error
+        return 0
+    }
+
+    if {[string length $ftp(Command)]} {
+	return -code error "unable to retrieve file asynchronously (not implemented yet)"
+    }
+
+    if { $dest == "" } {
+        set dest $source
+    }
+    if {![file exists [file dirname $dest]]} {
+	return -code error "ftp::Newer, directory \"[file dirname $dest]\" for destination \"$dest\" does not exist"
+    }
+
+    set ftp(RemoteFilename) $source
+    set ftp(LocalFilename) $dest
+
+    # get remote modification time
+    set rmt [ModTime $s $ftp(RemoteFilename)]
+    if { $rmt == "-1" } {
+        return 0
+    }
+
+    # get local modification time
+    if { [file exists $ftp(LocalFilename)] } {
+        set lmt [file mtime $ftp(LocalFilename)]
+    } else {
+        set lmt 0
+    }
+	
+    # remote file is older than local file
+    if { $rmt < $lmt } {
+        return 0
+    }
+
+    # remote file is newer than local file or local file doesn't exist
+    # get it
+    set rc [Get $s $ftp(RemoteFilename) $ftp(LocalFilename)]
+    return $rc
+		
+}
+
+#############################################################################
+#
+# Quote -- 
+#
+# The arguments specified are sent, verbatim, to the remote ftp server.     
+#
+# Arguments:
+# 	arg1 arg2 ...
+#
+# Returns:
+#  string sent back by the remote ftp server or null string if any error
+#
+
+proc ::ftp::Quote {s args} {
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        DisplayMsg $s "Not connected!" error
+        return 0
+    }
+
+    set ftp(Cmd) $args
+    set ftp(Quote) {}
+
+    set ftp(State) quote
+    StateHandler $s
+
+    # wait for synchronization
+    set rc [WaitOrTimeout $s] 
+
+    unset ftp(Cmd)
+
+    if { $rc } {
+        return $ftp(Quote)
+    } else {
+        return {}
+    }
+}
+
+
+#############################################################################
+#
+# Abort -- 
+#
+# ABORT - Tells the server to abort the previous ftp service command and 
+# any associated transfer of data. The control connection is not to be 
+# closed by the server, but the data connection must be closed.
+# 
+# NOTE: This procedure doesn't work properly. Thus the ftp::Abort command
+# is no longer available!
+#
+# Arguments:
+# None.
+#
+# Returns:
+# 0 -			ERROR
+# 1 - 			OK
+#
+# proc Abort {} {
+#
+# }
+
+#############################################################################
+#
+# Close -- 
+#
+# Terminates a ftp session and if file transfer is not in progress, the server
+# closes the control connection.  If file transfer is in progress, the 
+# connection will remain open for result response and the server will then
+# close it. 
+# (exported)
+# 
+# Arguments:
+# None.
+#
+# Returns:
+# 0 -			ERROR
+# 1 - 			OK
+
+proc ::ftp::Close {s } {
+    variable connections
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        DisplayMsg $s "Not connected!" error
+        return 0
+    }
+
+    if {[info exists \
+            connections($ftp(User),$ftp(Passwd),$ftp(RemoteHost),afterid)]} {
+        unset connections($ftp(User),$ftp(Passwd),$ftp(RemoteHost),afterid)
+        unset connections($ftp(User),$ftp(Passwd),$ftp(RemoteHost))
+    }
+
+    set ftp(State) quit
+    StateHandler $s
+
+    # wait for synchronization
+    WaitOrTimeout $s
+
+    catch {close $ftp(CtrlSock)}
+    catch {unset ftp}
+    return 1
+}
+
+proc ::ftp::LazyClose {s } {
+    variable connections
+    upvar ::ftp::ftp$s ftp
+
+    if { ![info exists ftp(State)] } {
+        DisplayMsg $s "Not connected!" error
+        return 0
+    }
+
+    if {[info exists connections($ftp(User),$ftp(Passwd),$ftp(RemoteHost))]} {
+        set connections($ftp(User),$ftp(Passwd),$ftp(RemoteHost),afterid) \
+                [after 5000 [list ftp::Close $s]]
+    }
+    return 1
+}
+
+#############################################################################
+#
+# Open --
+#
+# Starts the ftp session and sets up a ftp control connection.
+# (exported)
+# 
+# Arguments:
+# server - 		The ftp server hostname.
+# user -		A string identifying the user. The user identification 
+#			is that which is required by the server for access to 
+#			its file system.  
+# passwd -		A string specifying the user's password.
+# options -		-blocksize size		writes "size" bytes at once
+#						(default 4096)
+#			-timeout seconds	if non-zero, sets up timeout to
+#						occur after specified number of
+#						seconds (default 120)
+#			-progress proc		procedure name that handles callbacks
+#						(no default)  
+#			-output proc		procedure name that handles output
+#						(no default)  
+#			-mode mode		switch active or passive file transfer
+#						(default active)
+#			-port number		alternative port (default 21)
+#			-command proc		callback for completion notification
+#						(no default)
+# 
+# Returns:
+# 0 -			Not logged in
+# 1 - 			User logged in
+
+proc ::ftp::Open {server user passwd args} {
+    variable DEBUG 
+    variable VERBOSE
+    variable serial
+    variable connections
+
+    set s $serial
+    incr serial
+    upvar ::ftp::ftp$s ftp
+#    if { [info exists ftp(State)] } {
+#        DisplayMsg $s "Mmh, another attempt to open a new connection? There is already a hot wire!" error
+#        return 0
+#    }
+
+    # default NO DEBUG
+    if { ![info exists DEBUG] } {
+        set DEBUG 0
+    }
+
+    # default NO VERBOSE
+    if { ![info exists VERBOSE] } {
+        set VERBOSE 0
+    }
+	
+    if { $DEBUG } {
+        DisplayMsg $s "Starting new connection with: "
+    }
+
+    set ftp(inline) 	0
+    set ftp(User)       $user
+    set ftp(Passwd) 	$passwd
+    set ftp(RemoteHost) $server
+    set ftp(LocalHost) 	[info hostname]
+    set ftp(DataPort) 	0
+    set ftp(Type) 	{}
+    set ftp(Error) 	""
+    set ftp(Progress) 	{}
+    set ftp(Command)	{}
+    set ftp(Output) 	{}
+    set ftp(Blocksize) 	4096	
+    set ftp(Timeout) 	600	
+    set ftp(Mode) 	active	
+    set ftp(Port) 	21	
+
+    set ftp(State) 	user
+	
+    # set state var
+    set ftp(state.control) ""
+	
+    # Get and set possible options
+    set options {-blocksize -timeout -mode -port -progress -output -command}
+    foreach {option value} $args {
+        if { [lsearch -exact $options $option] != "-1" } {
+            if { $DEBUG } {
+                DisplayMsg $s "  $option = $value"
+            }
+            regexp -- {^-(.?)(.*)$} $option all first rest
+            set option "[string toupper $first]$rest"
+            set ftp($option) $value
+        } 
+    }
+    if { $DEBUG && ([llength $args] == 0) } {
+        DisplayMsg $s "  no option"
+    }
+
+    if {[info exists \
+            connections($ftp(User),$ftp(Passwd),$ftp(RemoteHost),afterid)]} {
+        after cancel $connections($ftp(User),$ftp(Passwd),$ftp(RemoteHost),afterid)
+	Command $ftp(Command) connect $connections($ftp(User),$ftp(Passwd),$ftp(RemoteHost))
+        return $connections($ftp(User),$ftp(Passwd),$ftp(RemoteHost))
+    }
+
+
+    # No call of StateHandler is required at this time.
+    # StateHandler at first time is called automatically
+    # by a fileevent for the control channel.
+
+    # Try to open a control connection
+    if { ![OpenControlConn $s [expr {[string length $ftp(Command)] > 0}]] } {
+        return -1
+    }
+
+    # waits for synchronization
+    #   0 ... Not logged in
+    #   1 ... User logged in
+    if {[string length $ftp(Command)]} {
+	# Don't wait - asynchronous operation
+	set ftp(NextState) {type connect_last}
+        set connections($ftp(User),$ftp(Passwd),$ftp(RemoteHost)) $s
+	return $s
+    } elseif { [WaitOrTimeout $s] } {
+        # default type is binary
+        Type $s binary
+        set connections($ftp(User),$ftp(Passwd),$ftp(RemoteHost)) $s
+	Command $ftp(Command) connect $s
+        return $s
+    } else {
+        # close connection if not logged in
+        Close $s
+        return -1
+    }
+}
+
+#############################################################################
+#
+# CopyNext --
+#
+# recursive background copy procedure for ascii/binary file I/O
+# 
+# Arguments:
+# bytes - 		indicates how many bytes were written on $ftp(DestCI)
+
+proc ::ftp::CopyNext {s bytes {error {}}} {
+    upvar ::ftp::ftp$s ftp
+    variable DEBUG
+    variable VERBOSE
+
+    # summary bytes
+
+    incr ftp(Total) $bytes
+
+    # update bytes_to_go and blocksize
+
+    if { [info exists ftp(Bytes_to_go)] } {
+	set ftp(Bytes_to_go) [expr {$ftp(Bytes_to_go) - $bytes}]
+	 
+	if { $ftp(Blocksize) <= $ftp(Bytes_to_go) } {
+	    set blocksize $ftp(Blocksize)
+	} else {
+	    set blocksize $ftp(Bytes_to_go)
+	}
+    } else {
+	set blocksize $ftp(Blocksize)
+    } 
+    
+    # callback for progress bar procedure
+    
+    if { ([info exists ftp(Progress)]) && \
+	    [string length $ftp(Progress)] && \
+	    ([info commands [lindex $ftp(Progress) 0]] != "") } { 
+        eval $ftp(Progress) $ftp(Total)
+    }
+
+    # setup new timeout handler
+
+    catch {after cancel $ftp(Wait)}
+    set ftp(Wait) [after [expr {$ftp(Timeout) * 1000}] [namespace current]::Timeout $s]
+
+    if { $DEBUG } {
+        DisplayMsg $s "-> $ftp(Total) bytes $ftp(SourceCI) -> $ftp(DestCI)" 
+    }
+
+    if { $error != "" } {
+	# Protect the destination channel from destruction if it came
+	# from the caller. Closing it is not our responsibility in that case.
+
+	if {![info exists ftp(get:channel)]} {
+	    catch {close $ftp(DestCI)}
+	}
+        catch {close $ftp(SourceCI)}
+        catch {unset ftp(state.data)}
+        DisplayMsg $s $error error
+
+    } elseif { ([eof $ftp(SourceCI)] || ($blocksize <= 0)) } {
+	# Protect the destination channel from destruction if it came
+	# from the caller. Closing it is not our responsibility in that case.
+
+	if {![info exists ftp(get:channel)]} {
+	    close $ftp(DestCI)
+	}
+        close $ftp(SourceCI)
+        catch {unset ftp(state.data)}
+        if { $VERBOSE } {
+            DisplayMsg $s "D: Port closed" data
+        }
+
+    } else {
+	fcopy $ftp(SourceCI) $ftp(DestCI) \
+		-command [list [namespace current]::CopyNext $s] \
+		-size $blocksize
+    }
+    return
+}
+
+#############################################################################
+#
+# HandleData --
+#
+# Handles ascii/binary data transfer for Put and Get 
+# 
+# Arguments:
+# sock - 		socket name (data channel)
+
+proc ::ftp::HandleData {s sock} {
+    upvar ::ftp::ftp$s ftp
+
+    # Turn off any fileevent handlers
+
+    fileevent $sock writable {}		
+    fileevent $sock readable {}
+
+    # create local file for ftp::Get 
+
+    if { [string match "get*" $ftp(State)]  && (!$ftp(inline))} {
+
+	# A channel was specified by the caller. Use that instead of a
+	# file.
+
+	# SF Bug 1708350 <@>
+	if {[info exists ftp(get:channel)]} {
+	    set ftp(DestCI) $ftp(get:channel)
+	    set rc 0
+	} else {
+	    set rc [catch {set ftp(DestCI) [open $ftp(LocalFilename) w]} msg]
+	}
+        if { $rc != 0 } {
+            DisplayMsg $s "$msg" error
+            return 0
+        }
+	# TODO: Use non-blocking I/O
+        if { [string equal $ftp(Type) "ascii"] } {
+            fconfigure $ftp(DestCI) -buffering line -blocking 1
+        } else {
+            fconfigure $ftp(DestCI) -buffering line -translation binary -blocking 1
+        }
+    }	
+
+    # append local file for ftp::Reget 
+
+    if { [string match "reget*" $ftp(State)] } {
+        set rc [catch {set ftp(DestCI) [open $ftp(LocalFilename) a]} msg]
+        if { $rc != 0 } {
+            DisplayMsg $s "$msg" error
+            return 0
+        }
+	# TODO: Use non-blocking I/O
+        if { [string equal $ftp(Type) "ascii"] } {
+            fconfigure $ftp(DestCI) -buffering line -blocking 1
+        } else {
+            fconfigure $ftp(DestCI) -buffering line -translation binary -blocking 1
+        }
+    }	
+
+
+    set ftp(Total) 0
+    set ftp(Start_Time) [clock seconds]
+	 
+    # calculate blocksize
+	 
+    if { [ info exists ftp(Bytes_to_go) ] } {
+			
+	if { $ftp(Blocksize) <= $ftp(Bytes_to_go) } {
+	    set Blocksize $ftp(Blocksize)
+	} else {
+	    set Blocksize $ftp(Bytes_to_go)
+	}
+	
+    } else {
+	set Blocksize $ftp(Blocksize)
+    }
+	
+    # perform fcopy
+    fcopy $ftp(SourceCI) $ftp(DestCI) \
+	    -command [list [namespace current]::CopyNext $s ] \
+	    -size $Blocksize
+    return 1
+}
+
+#############################################################################
+#
+# HandleList --
+#
+# Handles ascii data transfer for list commands
+# 
+# Arguments:
+# sock - 		socket name (data channel)
+
+proc ::ftp::HandleList {s sock} {
+    upvar ::ftp::ftp$s ftp
+    variable VERBOSE
+
+    if { ![eof $sock] } {
+        set buffer [read $sock]
+        if { $buffer != "" } {
+            set ftp(List) [append ftp(List) $buffer]
+        }	
+    } else {
+        close $sock
+        catch {unset ftp(state.data)}
+        if { $VERBOSE } {
+            DisplayMsg $s "D: Port closed" data
+        }
+    }
+    return
+}
+
+#############################################################################
+#
+# HandleVar --
+#
+# Handles data transfer for get/put commands that use buffers instead
+# of files.
+# 
+# Arguments:
+# sock - 		socket name (data channel)
+
+proc ::ftp::HandleVar {s sock} {
+    upvar ::ftp::ftp$s ftp
+    variable VERBOSE
+
+    if {$ftp(Start_Time) == -1} {
+        set ftp(Start_Time) [clock seconds]
+    }
+
+    if { ![eof $sock] } {
+        set buffer [read $sock]
+        if { $buffer != "" } {
+            append ftp(GetData) $buffer
+            incr ftp(Total) [string length $buffer]
+        }	
+    } else {
+        close $sock
+        catch {unset ftp(state.data)}
+        if { $VERBOSE } {
+            DisplayMsg $s "D: Port closed" data
+        }
+    }
+    return
+}
+
+#############################################################################
+#
+# HandleOutput --
+#
+# Handles data transfer for get/put commands that use buffers instead
+# of files.
+# 
+# Arguments:
+# sock - 		socket name (data channel)
+
+proc ::ftp::HandleOutput {s sock} {
+    upvar ::ftp::ftp$s ftp
+    variable VERBOSE
+
+    if {$ftp(Start_Time) == -1} {
+        set ftp(Start_Time) [clock seconds]
+    }
+
+    if { $ftp(Total) < [string length $ftp(PutData)] } {
+        set substr [string range $ftp(PutData) $ftp(Total) \
+                [expr {$ftp(Total) + $ftp(Blocksize)}]]
+        if {[catch {puts -nonewline $sock "$substr"} result]} {
+            close $sock
+            catch {unset ftp(state.data)}
+            if { $VERBOSE } {
+                DisplayMsg $s "D: Port closed" data
+            }
+        } else {
+            incr ftp(Total) [string length $substr]
+        }
+    } else {
+        fileevent $sock writable {}		
+        close $sock
+        catch {unset ftp(state.data)}
+        if { $VERBOSE } {
+            DisplayMsg $s "D: Port closed" data
+        }
+    }
+    return
+}
+
+############################################################################
+#
+# CloseDataConn -- 
+#
+# Closes all sockets and files used by the data conection
+#
+# Arguments:
+# None.
+#
+# Returns:
+# None.
+#
+proc ::ftp::CloseDataConn {s } {
+    upvar ::ftp::ftp$s ftp
+
+    # Protect the destination channel from destruction if it came
+    # from the caller. Closing it is not our responsibility.
+
+    if {[info exists ftp(get:channel)]} {
+	catch {unset ftp(get:channel)}
+	catch {unset ftp(DestCI)}
+    }
+
+    catch { unset ftp(AC) }
+    catch {after cancel $ftp(Wait)}
+    catch {fileevent $ftp(DataSock) readable {}}
+    catch {close $ftp(DataSock); unset ftp(DataSock)}
+    catch {close $ftp(DestCI); unset ftp(DestCI)} 
+    catch {close $ftp(SourceCI); unset ftp(SourceCI)}
+    catch {close $ftp(DummySock); unset ftp(DummySock)}
+    return
+}
+
+#############################################################################
+#
+# InitDataConn --
+#
+# Configures new data channel for connection to ftp server 
+# ATTENTION! The new data channel "sock" is not the same as the 
+# server channel, it's a dummy.
+# 
+# Arguments:
+# sock -		the name of the new channel
+# addr -		the address, in network address notation, 
+#			of the client's host,
+# port -		the client's port number
+
+proc ::ftp::InitDataConn {s sock addr port} {
+    upvar ::ftp::ftp$s ftp
+    variable VERBOSE
+
+    if { $VERBOSE } {
+        DisplayMsg $s "D: New Connection from $addr:$port" data
+        DisplayMsg $s "D: Sequencer state $ftp(State)" data
+    }
+
+    # If the new channel is accepted, the dummy channel will be closed
+
+    catch {close $ftp(DummySock); unset ftp(DummySock)}
+
+    set ftp(state.data) 0
+
+    # Configure translation and blocking modes
+
+    set blocking 1
+    if {[string length $ftp(Command)]} {
+	set blocking 0
+    }
+
+    if { [string equal $ftp(Type) "ascii"] } {
+        fconfigure $sock -buffering line -blocking $blocking
+    } else {
+        fconfigure $sock -buffering line -translation binary -blocking $blocking
+    }
+
+    # assign fileevent handlers, source and destination CI (Channel Identifier)
+
+    # NB: this really does need to be -regexp [PT] 18Mar03
+    switch -regexp -- $ftp(State) {
+        list {
+            fileevent $sock readable [list [namespace current]::HandleList $s $sock]
+            set ftp(SourceCI) $sock
+        }
+        get {
+            if {$ftp(inline)} {
+                set ftp(GetData) ""
+                set ftp(Start_Time) -1
+                set ftp(Total) 0
+                fileevent $sock readable [list [namespace current]::HandleVar $s $sock]
+	    } else {
+                fileevent $sock readable [list [namespace current]::HandleData $s $sock]
+                set ftp(SourceCI) $sock
+	    }
+        }
+        append -
+        put {
+            if {$ftp(inline)} {
+                set ftp(Start_Time) -1
+                set ftp(Total) 0
+                fileevent $sock writable [list [namespace current]::HandleOutput $s $sock]
+	    } else {
+                fileevent $sock writable [list [namespace current]::HandleData $s $sock]
+                set ftp(DestCI) $sock
+	    }
+        }
+	default {
+	    error "Unknown state \"$ftp(State)\""
+	}
+    }
+
+    if { $VERBOSE } {
+        DisplayMsg $s "D: ... Connection from $addr:$port ... initialized" data
+    }
+
+    # Marker for WaitDataConn
+    set ftp(AC) 1
+    return
+}
+
+#############################################################################
+#
+# WaitDataConn --
+# Arguments: The ftp connection handle
+# Returns:   None
+#
+# Synchronizes the control sequencer to the data connection (active
+# mode). This must be placed at the end of all state sequences,
+# i.e. the last state of each sequence, dealing with a data
+# connection. Without the sync the control sequencer may step to the
+# next command causing a very late-coming data connection to encounter
+# an unknown state, and failing to establish what to do.
+#
+# Sync is achieved through the state field AC, in cooperation with the
+# procedures OpenActiveConn and InitDataConn.
+#
+# Missing field => Not an active connection - Ignore
+# AC == 0       => OAC has run, IDC not     - Wait for IDC, then cleanup
+# AC == 1       => OAC has run, IDC as well - No waiting, just cleanup.
+
+proc ::ftp::WaitDataConn {s} {
+    variable VERBOSE
+    upvar ::ftp::ftp$s ftp
+
+    if {$VERBOSE} { DisplayMsg $s WDC|$s|Begin|@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ }
+
+    # Passive connection, nothing to do
+    if {![info exists ftp(AC)]} {
+	if {$VERBOSE} { DisplayMsg $s WDC|$s|Passive|@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ }
+	return
+    }
+
+    # InitDataConn has not run yet. Wait!
+    if {!$ftp(AC)} {
+	if {$VERBOSE} { DisplayMsg $s WDC|$s|Sync|@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ }
+	vwait ::ftp::ftp${s}(AC)
+	# assert ftp(AC) == 1
+	if {$VERBOSE} { DisplayMsg $s WDC|$s|Synced|@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ }
+    } ; # else: Was run already
+
+    if {$VERBOSE} { DisplayMsg $s WDC|$s|Cleanup|@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ }
+    # InitDataConn has run, clean up and continue
+    unset ftp(AC)
+    return
+}
+
+#############################################################################
+#
+# OpenActiveConn --
+#
+# Opens a ftp data connection
+# 
+# Arguments:
+# None.
+# 
+# Returns:
+# 0 -			no connection
+# 1 - 			connection established
+
+proc ::ftp::OpenActiveConn {s } {
+    upvar ::ftp::ftp$s ftp
+    variable VERBOSE
+
+    # Port address 0 is a dummy used to give the server the responsibility 
+    # of getting free new port addresses for every data transfer.
+    
+    set rc [catch {set ftp(DummySock) [socket -server [list [namespace current]::InitDataConn $s] 0]} msg]
+    if { $rc != 0 } {
+        DisplayMsg $s "$msg" error
+        return 0
+    }
+
+    # prepare local ip address for PORT command (convert pointed format
+    # to comma format)
+
+    set ftp(LocalAddr) [lindex [fconfigure $ftp(CtrlSock) -sockname] 0]
+    set ftp(LocalAddr) [string map {. ,} $ftp(LocalAddr)]
+
+    # get a new local port address for data transfer and convert it to a format
+    # which is useable by the PORT command
+
+    set p [lindex [fconfigure $ftp(DummySock) -sockname] 2]
+    if { $VERBOSE } {
+        DisplayMsg $s "D: Port is $p" data
+    }
+    set ftp(DataPort) "[expr {$p / 256}],[expr {$p % 256}]"
+
+    # Marker for WaitDataConn
+    set ftp(AC) 0
+    return 1
+}
+
+#############################################################################
+#
+# OpenPassiveConn --
+#
+# Opens a ftp data connection
+# 
+# Arguments:
+# buffer - returned line from server control connection 
+# 
+# Returns:
+# 0 -			no connection
+# 1 - 			connection established
+
+proc ::ftp::OpenPassiveConn {s buffer} {
+    upvar ::ftp::ftp$s ftp
+
+    if { [regexp -- {([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+)} $buffer all a1 a2 a3 a4 p1 p2] } {
+        set ftp(LocalAddr) "$a1.$a2.$a3.$a4"
+        set ftp(DataPort) "[expr {$p1 * 256 + $p2}]"
+
+        # establish data connection for passive mode
+
+        set rc [catch {set ftp(DataSock) [socket $ftp(LocalAddr) $ftp(DataPort)]} msg]
+        if { $rc != 0 } {
+            DisplayMsg $s "$msg" error
+            return 0
+        }
+
+        InitDataConn $s $ftp(DataSock) $ftp(LocalAddr) $ftp(DataPort)
+        return 1
+    } else {
+        return 0
+    }
+}
+
+#############################################################################
+#
+# OpenControlConn --
+#
+# Opens a ftp control connection
+# 
+# Arguments:
+#	s	connection id
+#	block	blocking or non-blocking mode
+# 
+# Returns:
+# 0 -			no connection
+# 1 - 			connection established
+
+proc ::ftp::OpenControlConn {s {block 1}} {
+    upvar ::ftp::ftp$s ftp
+    variable DEBUG
+    variable VERBOSE
+
+    # open a control channel
+
+    set rc [catch {set ftp(CtrlSock) [socket $ftp(RemoteHost) $ftp(Port)]} msg]
+    if { $rc != 0 } {
+        if { $VERBOSE } {
+            DisplayMsg $s "C: No connection to server!" error
+        }
+        if { $DEBUG } {
+            DisplayMsg $s "[list $msg]" error
+        }
+        unset ftp(State)
+        return 0
+    }
+
+    # configure control channel
+
+    fconfigure $ftp(CtrlSock) -buffering line -blocking $block -translation {auto crlf}
+    fileevent $ftp(CtrlSock) readable [list [namespace current]::StateHandler $s $ftp(CtrlSock)]
+	
+    # report ready message
+
+    if { $VERBOSE } {
+        DisplayMsg $s "C: Connection to $ftp(RemoteHost):$ftp(Port)" control
+    }
+	
+    return 1
+}
+
+# ::ftp::Command --
+#
+#	Wrapper for evaluated user-supplied command callback
+#
+# Arguments:
+#	cb	callback script
+#	msg	what happened
+#	args	additional info
+#
+# Results:
+#	Depends on callback script
+
+proc ::ftp::Command {cb msg args} {
+    if {[string length $cb]} {
+	uplevel #0 $cb [list $msg] $args
+    }
+}
+
+# ==================================================================
+# ?????? Hmm, how to do multithreaded for tkcon?
+# added TkCon support
+# TkCon is (c) 1995-2001 Jeffrey Hobbs, http://tkcon.sourceforge.net/
+# started with: tkcon -load ftp
+if { [string equal [uplevel "#0" {info commands tkcon}] "tkcon"] } {
+
+    # new ftp::List proc makes the output more readable
+    proc ::ftp::__ftp_ls {args} {
+	set rc [eval [linsert $args 0 ::ftp::List_org]]
+        foreach i $rc {
+            puts $i
+        }
+	return $rc
+    }
+
+    # rename the original ftp::List procedure
+    rename ::ftp::List ::ftp::List_org
+
+    alias ::ftp::List	::ftp::__ftp_ls
+    alias bye		catch {::ftp::Close; exit}
+
+    set ::ftp::VERBOSE 1
+    set ::ftp::DEBUG 0
+}
+
+# ==================================================================
+# At last, everything is fine, we can provide the package.
+
+package provide ftp [lindex {Revision: 2.4.13} 1]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftp/ftp_geturl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftp/ftp_geturl.tcl
new file mode 100644
index 00000000..d909d4b2
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftp/ftp_geturl.tcl
@@ -0,0 +1,135 @@
+# ftp_geturl.tcl --
+#
+# Copyright (c) 2001 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# ftp::geturl url
+
+package require ftp
+package require uri
+
+namespace eval ::ftp {
+    namespace export geturl
+}
+
+# ::ftp::geturl
+#
+# Command useable by uri to retrieve the contents of an ftp url.
+# Returns the contents of the requested url.
+
+proc ::ftp::geturl {url} {
+    # FUTURE: -validate to validate existence of url, but no download
+    # of contents.
+
+    array set urlparts [uri::split $url]
+
+    if {$urlparts(user) == {}} {
+        set urlparts(user) "anonymous"
+    }
+    if {$urlparts(pwd) == {}} {
+        set urlparts(pwd) "user@localhost.localdomain"
+    }
+    if {$urlparts(port) == {}} {
+        set urlparts(port) 21
+    }
+
+    set fdc [ftp::Open $urlparts(host) $urlparts(user) $urlparts(pwd) \
+                 -port $urlparts(port)]
+    if {$fdc < 0} {
+	return -code error "Cannot reach host for url \"$url\""
+    }
+
+    # We have reached the host, now get on to retrieve the item.
+    # We are very careful in accessing the item because we don't know
+    # if it is a file, directory or link. So we change into the
+    # directory containing the item, get a list of all entries and
+    # then determine if the item actually exists and what type it is,
+    # and what actions to perform.
+
+    set ftp_dir  [file dirname $urlparts(path)]
+    set ftp_file [file tail    $urlparts(path)]
+
+    set result [ftp::Cd $fdc $ftp_dir]
+    if { $result == 0 } {
+	ftp::Close $fdc
+	return -code error "Cannot reach directory of url \"$url\""
+    }
+
+    # Fix for the tkcon List enhancements in ftp.tcl
+    set List ::ftp::List_org
+    if {[info commands $List] == {}} {
+        set List ::ftp::List 
+    }
+
+    # The result of List is a list of entries in the given directory.
+    # Note that it is in 'ls -l format. We parse that into a more
+    # readable array.
+
+    #array set flist [ftp::ParseList [$List $fdc ""]]
+    #if {![info exists flist($ftp_file)]} {}
+    set flist [$List $fdc $ftp_file]
+    if {$flist == {}} {
+	ftp::Close $fdc
+	return -code error "Cannot reach item of url \"$url\""
+    }
+
+    # The item exists, what is it ?
+    # File     : Download the contents.
+    # Directory: Download a listing, this is its contents.
+    # Link     : For now we do not follow the link but return the
+    #            meta information, i.e. the path it is pointing to.
+
+    #switch -exact -- [lindex $flist($ftp_file) 0] {}
+    switch -exact -- [string index [lindex $flist 0] 0] {
+	- {
+	    if {[string equal $ftp_file {}]} {
+                set contents [ftp::NList $fdc $ftp_file]
+            } else {
+                ftp::Get $fdc $ftp_file -variable contents
+            }
+	}
+	d {
+	    set contents [ftp::NList $fdc $ftp_file]
+	}
+	l {
+	    set contents $flist
+	}
+        default {
+            ftp::Close $fdc
+            return -code error "File information \"$flist\" not recognised"
+        }
+    }
+
+    ftp::Close $fdc
+    return $contents
+}
+
+# Internal helper to parse a directory listing into something which
+# can be better handled by tcl than raw ls -l format.
+
+proc ::ftp::ParseList {flist} {
+    array set data {}
+    foreach item $flist {
+	foreach {mode dummy owner group size month day yrtime name} $item break
+
+	if {[string first : $yrtime] >=0} {
+	    set date "$month/$day/[clock format [clock seconds] -format %Y] $yrtime"
+	} else {
+	    set date "$month/$day/$yrtime 00:00"
+	}
+	set info [list owner $owner group $group size $size date $date]
+
+	switch -exact -- [string index $mode 0] {
+	    - {set type file}
+	    d {set type dir}
+	    l {set type link ; lappend info link [lindex $item end]}
+	}
+
+	set data($name) [list $type $info]
+    }
+    array get data
+}
+
+# ==================================================================
+# At last, everything is fine, we can provide the package.
+
+package provide ftp::geturl [lindex {Revision: 0.2.2} 1]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftp/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftp/pkgIndex.tcl
new file mode 100644
index 00000000..01551033
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftp/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded ftp         2.4.13 [list source [file join $dir ftp.tcl]]
+package ifneeded ftp::geturl 0.2.2  [list source [file join $dir ftp_geturl.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftpd/ftpd.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftpd/ftpd.tcl
new file mode 100644
index 00000000..7e93f8ec
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftpd/ftpd.tcl
@@ -0,0 +1,2064 @@
+# ftpd.tcl --
+#
+#       This file contains Tcl/Tk package to create a ftp daemon.
+#       I believe it was originally written by Matt Newman (matt@sensus.org).  
+#       Modified by Dan Kuchler (kuchler@ajubasolutions.com) to handle
+#       more ftp commands and to fix some bugs in the original implementation
+#       that was found in the stdtcl module.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: ftpd.tcl,v 1.34 2011/08/09 20:55:38 andreas_kupries Exp $
+#
+
+# Define the ftpd package version 1.2.5
+
+package require Tcl 8.2
+namespace eval ::ftpd {
+
+    # The listening port.
+
+    variable port 21
+
+    variable contact
+    if {![info exists contact]} {
+        global tcl_platform
+	set contact "$tcl_platform(user)@[info hostname]"
+    }
+
+    variable cwd
+    if {![info exists cwd]} {
+	set cwd ""
+    }
+    
+    variable welcome
+    if {![info exists welcome]} {
+	set welcome "[info hostname] FTP server ready."
+    }
+
+    # Global configuration.
+
+    variable cfg
+    if {![info exists cfg]} {
+	array set cfg [list \
+	    closeCmd    {} \
+	    authIpCmd   {} \
+	    authUsrCmd  {::ftpd::anonAuth} \
+            authFileCmd {::ftpd::fileAuth} \
+	    logCmd      {::ftpd::logStderr} \
+	    fsCmd       {::ftpd::fsFile::fs} \
+	    xferDoneCmd {}]
+    }
+
+    variable commands
+    if {![info exists commands]} {
+	array set commands [list \
+	    ABOR       {ABOR (abort operation)} \
+	    ACCT       {(specify account); unimplemented.} \
+	    ALLO       {(allocate storage - vacuously); unimplemented.} \
+	    APPE       {APPE <sp> file-name} \
+	    CDUP       {CDUP (change to parent directory)} \
+	    CWD        {CWD [ <sp> directory-name ]} \
+	    DELE       {DELE <sp> file-name} \
+            HELP       {HELP [ <sp> <string> ]} \
+	    LIST       {LIST [ <sp> path-name ]} \
+	    NLST       {NLST [ <sp> path-name ]} \
+	    MAIL       {(mail to user); unimplemented.} \
+            MDTM       {MDTM <sp> path-name} \
+	    MKD        {MKD <sp> path-name} \
+	    MLFL       {(mail file); unimplemented.} \
+	    MODE       {(specify transfer mode); unimplemented.} \
+	    MRCP       {(mail recipient); unimplemented.} \
+	    MRSQ       {(mail recipient scheme question); unimplemented.} \
+	    MSAM       {(mail send to terminal and mailbox); unimplemented.} \
+	    MSND       {(mail send to terminal); unimplemented.} \
+	    MSOM       {(mail send to terminal or mailbox); unimplemented.} \
+	    NOOP       {NOOP} \
+	    PASS       {PASS <sp> password} \
+            PASV       {(set server in passive mode); unimplemented.} \
+	    PORT       {PORT <sp> b0, b1, b2, b3, b4, b5} \
+            PWD        {PWD (return current directory)} \
+	    QUIT       {QUIT (terminate service)} \
+	    REIN       {REIN (reinitialize server state)} \
+	    REST       {(restart command); unimplemented.} \
+	    RETR       {RETR <sp> file-name} \
+	    RMD        {RMD <sp> path-name} \
+	    RNFR       {RNFR <sp> file-name} \
+	    RNTO       {RNTO <sp> file-name} \
+	    SIZE       {SIZE <sp> path-name} \
+	    SMNT       {(structure mount); unimplemented.} \
+	    STOR       {STOR <sp> file-name} \
+	    STOU       {STOU <sp> file-name} \
+	    STRU       {(specify file structure); unimplemented.} \
+	    SYST       {SYST (get type of operating system)} \
+	    TYPE       {TYPE <sp> [ A | E | I | L ]} \
+	    USER       {USER <sp> username} \
+	    XCUP       {XCUP (change to parent directory)} \
+	    XCWD       {XCWD [ <sp> directory-name ]} \
+	    XMKD       {XMKD <sp> path-name} \
+	    XPWD       {XPWD (return current directory)} \
+	    XRMD       {XRMD <sp> path-name}]
+    }
+
+    variable passwords [list ]
+
+    # Exported procedures
+
+    namespace export config hasCallback logStderr 
+    namespace export fileAuth anonAuth unixAuth server accept read
+}
+
+
+# ::ftpd::config --
+#
+#       Configure the configurable parameters of the ftp daemon.
+#
+# Arguments:
+#       options -    -authIpCmd proc      procedure that accepts or rejects an
+#                                         incoming connection. A value of 0 or
+#                                         an error causes the connection to be
+#                                         rejected. There is no  default.
+#                    -authUsrCmd proc     procedure that accepts or rejects a
+#                                         login.  Defaults to ::ftpd::anonAuth
+#                    -authFileCmd proc    procedure that accepts or rejects
+#                                         access to read or write a certain
+#                                         file or path.  Defaults to
+#                                         ::ftpd::userAuth
+#                    -logCmd proc         procedure that logs information from
+#                                         the ftp engine.  Default is
+#                                         ::ftpd::logStderr
+#                    -fsCmd proc          procedure to connect the ftp engine
+#                                         to the file system it operates on.
+#                                         Default is ::ftpd::fsFile::fs
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Changes the value of the specified configurables.
+
+proc ::ftpd::config {args} {
+
+    # Processing of global configuration changes.
+
+    package require cmdline
+
+    variable cfg
+
+     # Make default value be the current value so we can call this
+     # command multiple times without resetting already set values
+
+    array set cfg [cmdline::getoptions args [list \
+        [list closeCmd.arg    $cfg(closeCmd)    {Callback when a connection is closed.}] \
+        [list authIpCmd.arg   $cfg(authIpCmd)   {Callback to authenticate new connections based on the ip-address of the peer. Optional}] \
+        [list authUsrCmd.arg  $cfg(authUsrCmd)  {Callback to authenticate new connections based on the user logging in.}] \
+        [list authFileCmd.arg $cfg(authFileCmd) {Callback to accept or deny a users access to read and write to a specific path or file.}] \
+        [list logCmd.arg      $cfg(logCmd)      {Callback for log information generated by the FTP engine.}] \
+        [list xferDoneCmd.arg $cfg(xferDoneCmd) {Callback for transfer completion notification. Optional}] \
+        [list fsCmd.arg       $cfg(fsCmd)       {Callback to connect the engine to the filesystem it operates on.}]]]
+    return
+}
+
+
+# ::ftpd::hasCallback --
+#
+#       Determines whether or not a non-NULL callback has been defined for one
+#       of the callback types.
+#
+# Arguments:
+#       callbackType -        One of authIpCmd, authUsrCmd, logCmd, or fsCmd
+#
+# Results:
+#       Returns 1 if a non-NULL callback has been specified for the
+#       callbackType that is passed in.
+#
+# Side Effects:
+#       None.
+
+proc ::ftpd::hasCallback {callbackType} {
+    variable cfg
+
+    return [expr {[info exists cfg($callbackType)] && [string length $cfg($callbackType)]}]
+}
+
+
+# ::ftpd::logStderr --
+#
+#       Outputs a message with the specified severity to stderr.  The default
+#       logCmd callback.
+#
+# Arguments:
+#       severity -            The severity of the error.  One of debug, error,
+#                             or note.
+#       text -                The error message.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       A message is written to the stderr channel.
+
+proc ::ftpd::logStderr {severity text} {
+
+    # Standard log handler. Prints to stderr.
+
+    puts stderr "\[$severity\] $text"
+    return
+}
+
+
+# ::ftpd::Log --
+#
+#       Used for all ftpd logging.
+#
+# Arguments:
+#       severity -            The severity of the error.  One of debug, error,
+#                             or note.
+#       text -                The error message.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The ftpd logCmd callback is called with the specified severity and
+#       text if there is a non-NULL ftpCmd.
+
+proc ::ftpd::Log {severity text} {
+
+    # Central call out to log handlers.
+
+    variable     cfg
+    
+    if {[hasCallback logCmd]} {
+        set cmd $cfg(logCmd)
+        lappend cmd $severity $text
+        eval $cmd
+    }
+    return
+}
+
+
+# ::ftpd::fileAuth --
+#
+#       Given a username, path, and operation- decides whether or not to accept
+#       the attempted read or write operation.
+#
+# Arguments:
+#       user -                The name of the user that is attempting to
+#                             connect to the ftpd.
+#       path -                The path or filename that the user is attempting
+#                             to read or write.
+#       operation -           read or write.
+#
+# Results:
+#       Returns 0 if it rejects access and 1 if it accepts access.
+#
+# Side Effects:
+#       None.
+
+proc ::ftpd::fileAuth {user path operation} {
+    # Standard authentication handler
+
+    if {(![Fs exists $path]) && ([string equal $operation "write"])} {
+        if {[Fs exists [file dirname $path]]} {
+            set path [file dirname $path]
+	}
+    } elseif {(![Fs exists $path]) && ([string equal $operation "read"])} {
+        return 0
+    }
+
+    if {[Fs exists $path]} {
+        set mode [Fs permissions $path]
+        if {([string equal $operation "read"] && (($mode & 00004) > 0)) || \
+                ([string equal $operation "write"] && (($mode & 00002) > 0))} {
+            return 1
+        }
+    }
+    return 0
+}
+
+# ::ftpd::anonAuth --
+#
+#       Given a username and password, decides whether or not to accept the
+#       attempted login.  This is the default ftpd authUsrCmd callback. By
+#       default it accepts the annonymous user and does some basic checking
+#       checking on the form of the password to see if it has the form of an
+#       email address.
+#
+# Arguments:
+#       user -                The name of the user that is attempting to
+#                             connect to the ftpd.
+#       pass -                The password of the user that is attempting to
+#                             connect to the ftpd.
+#
+# Results:
+#       Returns 0 if it rejects the login and 1 if it accepts the login.
+#
+# Side Effects:
+#       None.
+
+proc ::ftpd::anonAuth {user pass} {
+    # Standard authentication handler
+    #
+    # Accept user 'anonymous' if a password was
+    # provided which is at least similar to an
+    # fully qualified email address.
+
+    if {(![string equal $user anonymous]) && (![string equal $user ftp])} {
+	return 0
+    }
+
+    set pass [split $pass @]
+    if {[llength $pass] != 2} {
+	return 0
+    }
+
+    set domain [split [lindex $pass 1] .]
+    if {[llength $domain] < 2} {
+	return 0
+    }
+
+    return 1
+}
+
+# ::ftpd::unixAuth --
+#
+#       Given a username and password, decides whether or not to accept the
+#       attempted login.  This is an alternative to the default ftpd
+#       authUsrCmd callback. By default it accepts the annonymous user and does
+#       some basic checking checking on the form of the password to see if it
+#       has the form of an email address.
+#
+# Arguments:
+#       user -                The name of the user that is attempting to
+#                             connect to the ftpd.
+#       pass -                The password of the user that is attempting to
+#                             connect to the ftpd.
+#
+# Results:
+#       Returns 0 if it rejects the login and 1 if it accepts the login.
+#
+# Side Effects:
+#       None.
+
+proc ::ftpd::unixAuth {user pass} {
+
+    variable passwords
+    array set password $passwords
+
+    # Standard authentication handler
+    #
+    # Accept user 'anonymous' if a password was
+    # provided which is at least similar to an
+    # fully qualified email address.
+
+    if {([llength $passwords] == 0) && (![catch {package require crypt}])} {
+        foreach file [list /etc/passwd /etc/shadow] {
+            if {([file exists $file]) && ([file readable $file])} {
+                set fh [open $file r]
+                set data [read $fh [file size $file]]
+                foreach line [split $data \n] {
+                    foreach {username passwd uid gid dir sh} [split $line :] {
+                        if {[string length $passwd] > 2} {
+                            set password($username) $passwd
+		        } elseif {$passwd == ""} {
+                            set password($username) ""
+		        }
+                        break
+		    }
+		}
+	    }
+	}
+        set passwords [array get password]
+    }
+
+    ::ftpd::Log debug $passwords
+
+    if {[string equal $user anonymous] || [string equal $user ftp]} {
+
+        set pass [split $pass @]
+        if {[llength $pass] != 2} {
+	    return 0
+        }
+
+        set domain [split [lindex $pass 1] .]
+        if {[llength $domain] < 2} {
+	    return 0
+        }
+
+        return 1
+    }
+
+    if {[info exists password($user)]} {
+        if {$password($user) == ""} {
+            return 1
+	}
+        if {[string equal $password($user) [::crypt $pass $password($user)]]} {
+	    return 1
+        }
+    }
+
+    return 0
+}
+
+# ::ftpd::server --
+#
+#       Creates a server socket at the specified port.
+#
+# Arguments:
+#       myaddr -              The domain-style name or numerical IP address of
+#                             the client-side network interface to use for the
+#                             connection. The name of the user that is
+#                             attempting to connect to the ftpd.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       A listener is setup on the specified port which will call
+#       ::ftpd::accept when it is connected to.
+
+proc ::ftpd::server {{myaddr {}}} {
+    variable port
+    variable serviceSock
+    if {[string length $myaddr]} {
+	set serviceSock [socket -server ::ftpd::accept -myaddr $myaddr $port]
+    } else {
+	set serviceSock [socket -server ::ftpd::accept $port]
+    }
+    set port [lindex [fconfigure $serviceSock -sockname] 2]
+    return
+}
+
+
+# ::ftpd::accept --
+#
+#       Checks if the connecting IP is authorized to connect or not.  If not
+#       the socket is closed and failure is logged.  Otherwise, a welcome is
+#       printed out, and a ftpd::Read filevent is placed on the socket.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       ipaddr -              The client's IP address.
+#       client_port -         The client's port number.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Sets up a ftpd::Read fileevent to trigger whenever the channel is
+#       readable.  Logs an error and closes the connection if the IP is
+#       not authorized to connect.
+
+proc ::ftpd::accept {sock ipaddr client_port} {
+    upvar #0 ::ftpd::$sock data
+    variable welcome
+    variable cfg
+    variable cwd
+    variable CurrentSocket 
+
+    set CurrentSocket $sock
+    if {[info exists data]} {
+	unset data
+    }
+
+    if {[hasCallback authIpCmd]} {
+	# Call out to authenticate the peer. A return value of 0 or an
+	# error causes the system to reject the connection. Everything
+	# else (with 1 prefered) leads to acceptance.
+
+	set     cmd $cfg(authIpCmd)
+	lappend cmd $ipaddr
+
+	set fail [catch {eval $cmd} res]
+
+	if {$fail} {
+	    Log error "AuthIp error: $res"
+	}
+	if {$fail || ($res == 0)} {
+	    Log note "AuthIp: Access denied to $ipaddr"
+
+	    # Now: Close the connection. (Is there a standard response
+	    # before closing down to signal the peer that we don't want
+	    # to talk to it ? -> read RFC).
+
+	    close $sock
+	    return
+	}
+
+	# Accept the connection (for now, 'authUsrCmd' may revoke this
+	# decision).
+    }
+
+    array set data [list \
+        access          0 \
+	ip              $ipaddr \
+	state		command \
+	buffering	line \
+	cwd		"$cwd" \
+	mode		binary \
+	sock2a          "" \
+        sock2           ""]
+
+    fconfigure $sock -buffering line
+    fileevent  $sock readable [list ::ftpd::Read $sock]
+    puts       $sock "220 $welcome"
+
+    Log debug "Accept $ipaddr"
+    return
+}
+
+# ::ftpd::Read --
+#
+#       Checks the state of a channel and then reads a command from the
+#       channel if it is not at end of file yet.  If there is a command named
+#       ftpd::command::* where '*' is the all upper case name of the command,
+#       then that proc is called to handle the command with the remaining parts
+#       of the command that was read from the channel as arguments.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Runs the appropriate command depending on the state in the state
+#       machine, and the command that is specified.
+
+proc ::ftpd::Read {sock} {
+    upvar #0 ::ftpd::$sock data
+    variable CurrentSocket 
+
+    set CurrentSocket $sock
+    if {[eof $sock]} {
+	Finish $sock
+	return
+    }
+    switch -exact -- $data(state) {
+	command {
+	    gets $sock command
+	    set argument ""
+	    if {![regexp {^([^ ]+) (.*)$} $command -> cmd argument]} {
+		if {![regexp {^([^ ]+)$} $command -> cmd]} {
+		    # Very bad command syntax.
+		    puts $sock "500 Command not understood."
+		    return
+		}
+	    }
+	    set cmd [string toupper $cmd]
+	    auto_load ::ftpd::command::$cmd
+            if {($data(access) == 0) && ((![info exists data(user)]) || \
+	            ($data(user) == "")) && (![string equal $cmd "USER"])} {
+                if {[string equal $cmd "PASS"]} {
+		    puts $sock "503 Login with USER first."
+                } else {
+                    puts $sock "530 Please login with USER and PASS."
+		}
+	    } elseif {($data(access) == 0) && (![string equal $cmd "PASS"]) \
+                    && (![string equal $cmd "USER"]) \
+                    && (![string equal $cmd "QUIT"])} {
+                puts $sock "530 Please login with USER and PASS."
+	    } elseif {[info commands ::ftpd::command::$cmd] != ""} {
+		Log debug $command
+		::ftpd::command::$cmd $sock $argument
+		catch {flush $sock}
+	    } else {
+		Log error "Unknown command: $cmd"
+		puts $sock "500 Unknown command $cmd"
+	    }
+	}
+	default {
+	    error "Unknown state \"$data(state)\""
+	}
+    }
+    return
+}
+
+# ::ftpd::Finish --
+#
+#       Closes the socket connection between the ftpd and client.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The channel is closed.
+
+proc ::ftpd::Finish {sock} {
+    upvar #0 ::ftpd::$sock data
+    variable cfg
+
+    if {[hasCallback closeCmd]} then {
+	##
+	## User specified a close command so invoke it
+	##
+	uplevel #0 $cfg(closeCmd)
+    }
+    close $sock
+    if {[info exists data]} {
+	unset data
+    }
+    return
+}
+
+# ::ftpd::FinishData --
+#
+#       Closes the data socket connection that is created when the 'PORT'
+#       command is recieved.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The data channel is closed.
+
+proc ::ftpd::FinishData {sock} {
+    upvar #0 ::ftpd::$sock data
+    catch {close $data(sock2)}
+    set   data(sock2) {}
+    return
+}
+
+# ::ftpd::Fs --
+#
+#       The general filesystem command.  Used as an intermediary for filesystem
+#       access to allow alternate (virtual, etc.) filesystems to be used.  The
+#       ::ftpd::Fs command will call out to the fsCmd callback with the
+#       subcommand and arguments that are passed to it.
+#
+# The fsCmd callback is called in the following ways:
+#
+# <cmd> append <path>
+# <cmd> delete <path> <channel-to-write-to>
+# <cmd> dlist <path> <style> <channel-to-write-dir-list-to>
+# <cmd> exists <path>
+# <cmd> mkdir <path> <channel-to-write-to>
+# <cmd> mtime <path> <channel-to-write-mtime-to>
+# <cmd> permissions <path>
+# <cmd> rename <path> <newpath> <channel-to-write-to>
+# <cmd> retr  <path>
+# <cmd> rmdir <path> <channel-to-write-to>
+# <cmd> size  <path> <channel-to-write-size-to>
+# <cmd> store <path>
+#
+# Arguments:
+#       command -                The filesystem command (one of dlist, retr, or
+#                                store).  'dlist' will list files in a
+#                                directory, 'retr' will get a channel to
+#                                to read the specified file from, 'store'
+#                                will return the channel to write to, and
+#                                'mtime' will print the modification time.
+#       path -                   The file name or directory to read, write, or
+#                                list.
+#       args -                   Additional arguments for filesystem commands.
+#                                Currently this is used by 'dlist' which
+#                                has two additional arguments 'style' and
+#                                'channel-to-write-dir-list-to'. It is also
+#                                used by 'size' and 'mtime' which have one
+#                                additional argument 'channel-to-write-to'.
+#
+# Results:
+#       For a 'appe', 'retr', or 'stor' a channel is returned. For 'exists'
+#       a 1 is returned if the path exists, and is not a directory.  Otherwise
+#       a 0 is returned. For 'permissions' the octal file permissions (i.e.
+#       the 'file stat' mode) are returned.
+#
+# Side Effects:
+#       For 'dlist' a directory listing for the specified path is written to
+#       the specified channel.  For 'mtime' the modification time is written
+#       or an error is thrown.  An error is thrown if there is no fsCmd
+#       callback configured for the ftpd.
+
+proc ::ftpd::Fs {command path args} {
+    variable cfg
+
+    if {![hasCallback fsCmd]} {
+	error "-fsCmd must not be empty, need a way to access files."
+    }
+
+    return [eval [list $cfg(fsCmd) $command $path] $args]
+}
+
+# Create a namespace to hold one proc for each ftp command (in upper case
+# letters) that is supported by the ftp daemon.  The existance of a proc
+# in this namespace is the way that the list of supported commands is
+# determined, and the procs in this namespace are invoked to handle the
+# ftp commands with the same name as the procs.
+
+namespace eval ::ftpd::command {
+    # All commands in this namespace are private, no export.
+}
+
+# ::ftpd::command::ABOR --
+#
+#       Handle the ABOR ftp command.  Closes the data socket if it
+#       is open, and then prints the appropriate success message.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the APPE command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The data is copied to from the socket data(sock2) to the
+#       writable channel to create a file.
+
+proc ::ftpd::command::ABOR {sock list} {
+
+    ::ftpd::FinishData $sock
+    puts $sock "225 ABOR command successful."
+
+    return
+}
+
+# ::ftpd::command::APPE --
+#
+#       Handle the APPE ftp command.  Gets a writable channel for the file
+#       specified from ::ftpd::Fs and copies the data from data(sock2) to
+#       the writable channel.  If the filename already exists the data is
+#       appended, otherwise the file is created and then written.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the APPE command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The data is copied to from the socket data(sock2) to the
+#       writable channel to create a file.
+
+proc ::ftpd::command::APPE {sock filename} {
+    upvar #0 ::ftpd::$sock data
+
+    set path [file join $data(cwd) [string trimleft $filename /]]
+    if {[::ftpd::hasCallback authFileCmd]} {
+        set cmd $::ftpd::cfg(authFileCmd)
+        lappend cmd $data(user) $path write
+        if {[eval $cmd] == 0} {
+	    puts $sock "550 $filename: Permission denied"
+            return
+        }
+    }
+
+    #
+    # Patched Mark O'Connor
+    #
+    if {![catch {::ftpd::Fs append $path $data(mode)} f]} {
+	puts $sock "150 Copy Started ($data(mode))"
+	::ftpd::PasvCheckAndWait $sock
+	fcopy $data(sock2) $f -command [list ::ftpd::GetDone $sock $data(sock2) $f ""]
+    } else {
+	puts $sock "500 Copy Failed: $path $f"
+	::ftpd::FinishData $sock
+    }
+    return
+}
+
+# ::ftpd::command::CDUP --
+#
+#       Handle the CDUP ftp command.  Change the current working directory to
+#       the directory above the current working directory.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the CDUP command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Changes the data(cwd) to the appropriate directory.
+
+proc ::ftpd::command::CDUP {sock list} {
+    upvar #0 ::ftpd::$sock data
+
+    set data(cwd) [file dirname $data(cwd)]
+    puts $sock "200 CDUP command successful."
+    return
+}
+
+# ::ftpd::command::CWD --
+#
+#       Handle the CWD ftp command.  Change the current working directory.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the CWD command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Changes the data(cwd) to the appropriate directory.
+
+proc ::ftpd::command::CWD {sock relativepath} {
+    upvar #0 ::ftpd::$sock data
+
+    if {[string equal $relativepath .]} {
+	puts $sock "250 CWD command successful."
+	return
+    }
+
+    if {[string equal $relativepath ..]} {
+	set data(cwd) [file dirname $data(cwd)]
+	puts $sock "250 CWD command successful."
+	return
+    }
+
+    set path [file join $data(cwd) $relativepath]
+
+    if {[::ftpd::Fs exists $path]} {
+        puts $sock "550 not a directory"
+        return
+    }
+
+    set data(cwd) $path
+    puts $sock "250 CWD command successful."
+    return
+}
+
+# ::ftpd::command::DELE --
+#
+#       Handle the DELE ftp command.  Delete the specified file.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the DELE command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The specified file is deleted.
+
+proc ::ftpd::command::DELE {sock filename} {
+    upvar #0 ::ftpd::$sock data
+
+    set path [file join $data(cwd) [string trimleft $filename /]]
+    if {[::ftpd::hasCallback authFileCmd]} {
+        set cmd $::ftpd::cfg(authFileCmd)
+        lappend cmd $data(user) $path write
+        if {[eval $cmd] == 0} {
+	    puts $sock "550 $filename: Permission denied"
+            return
+        }
+    }
+
+    if {[catch {::ftpd::Fs delete $path $sock} msg]} {
+	puts $sock "500 DELE Failed: $path $msg"
+    }
+    return
+}
+
+# ::ftpd::command::HELP --
+#
+#       Handle the HELP ftp command.  Display a list of commands
+#       or syntax information about the supported commands.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the HELP command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Displays a helpful message.
+
+proc ::ftpd::command::HELP {sock command} {
+    upvar #0 ::ftpd::$sock data
+
+    if {$command != ""} {
+        set command [string toupper $command]
+        if {![info exists ::ftpd::commands($command)]} {
+            puts $sock "502 Unknown command '$command'."
+	} elseif {[info commands ::ftpd::command::$command] == ""} {
+            puts $sock "214 $command\t$::ftpd::commands($command)"
+	} else {
+	    puts $sock "214 Syntax: $::ftpd::commands($command)"
+        }
+    } else {
+        set commandList [lsort [array names ::ftpd::commands]]
+        puts $sock "214-The following commands are recognized (* =>'s unimplemented)."
+        set i 1
+        foreach commandName $commandList {
+            if {[info commands ::ftpd::command::$commandName] == ""} {
+                puts -nonewline $sock [format " %-7s" "${commandName}*"]
+	    } else {
+                puts -nonewline $sock [format " %-7s" $commandName]
+	    }
+            if {($i % 8) == 0} {
+                puts $sock ""
+	    }
+            incr i
+	}
+        incr i -1
+        if {($i % 8) != 0} {
+            puts $sock ""
+	}
+        puts $sock "214 Direct comments to $::ftpd::contact."
+    }
+
+    return
+}
+
+# ::ftpd::command::LIST --
+#
+#       Handle the LIST ftp command.  Lists the names of the files in the
+#       specified path.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the LIST command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       A listing of files is written to the socket.
+
+proc ::ftpd::command::LIST {sock filename} {
+    ::ftpd::List $sock $filename list
+    return
+}
+
+# ::ftpd::command::MDTM --
+#
+#       Handle the MDTM ftp command.  Prints the modification time of the
+#       specified file to the socket.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the MDTM command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Prints the modification time of the specified file to the socket.
+
+proc ::ftpd::command::MDTM {sock filename} {
+    upvar #0 ::ftpd::$sock data
+
+    set path [file join $data(cwd) [string trimleft $filename /]]
+    if {[catch {::ftpd::Fs mtime $path $sock} msg]} {
+	puts $sock "500 MDTM Failed: $path $msg"
+	::ftpd::FinishData $sock
+    }
+    return
+}
+
+# ::ftpd::command::MKD --
+#
+#       Handle the MKD ftp command.  Create the specified directory.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the MKD command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The directory specified by $path (if it exists) is deleted.
+
+proc ::ftpd::command::MKD {sock filename} {
+    upvar #0 ::ftpd::$sock data
+
+    set path [file join $data(cwd) [string trimleft $filename /]]
+
+    if {[::ftpd::hasCallback authFileCmd]} {
+        set cmd $::ftpd::cfg(authFileCmd)
+        lappend cmd $data(user) $path write
+        if {[eval $cmd] == 0} {
+	    puts $sock "550 $filename: Permission denied"
+            return
+        }
+    }
+
+    if {[catch {::ftpd::Fs mkdir $path $sock} f]} {
+	puts $sock "500 MKD Failed: $path $f"
+    }
+    return
+}
+
+# ::ftpd::command::NOOP --
+#
+#       Handle the NOOP ftp command.  Do nothing.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the NOOP command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Prints the proper NOOP response.
+
+proc ::ftpd::command::NOOP {sock list} {
+
+    puts $sock "200 NOOP command successful."
+    return
+}
+
+# ::ftpd::command::NLST --
+#
+#       Handle the NLST ftp command.  Lists the full file stat of all of the
+#       files that are in the specified path.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the NLST command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       A listing of file stats is written to the socket.
+
+proc ::ftpd::command::NLST {sock filename} {
+    ::ftpd::List $sock $filename nlst
+    return
+}
+
+# ::ftpd::command::PASS --
+#
+#       Handle the PASS ftp command.  Check whether the specified user
+#       and password are allowed to log in (using the authUsrCmd).  If
+#       they are allowed to log in, they are allowed to continue.  If
+#       not ::ftpd::Log is used to log and error, and an "Access Denied"
+#       error is sent back.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the PASS command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The user is accepted, or an error is logged and the user/password is
+#       denied..
+
+proc ::ftpd::command::PASS {sock password} {
+    upvar #0 ::ftpd::$sock data
+
+    if {$password == ""} {
+        puts $sock "530 Please login with USER and PASS."
+        return
+    }
+    set data(pass) $password
+
+    ::ftpd::Log debug "pass <$data(pass)>"
+
+    if {![::ftpd::hasCallback authUsrCmd]} {
+	error "-authUsrCmd must not be empty, need a way to authenticate the user."
+    }
+
+    # Call out to authenticate the user. A return value of 0 or an
+    # error causes the system to reject the connection. Everything
+    # else (with 1 prefered) leads to acceptance.
+    
+    set cmd $::ftpd::cfg(authUsrCmd)
+    lappend cmd $data(user) $data(pass)
+
+    set fail [catch {eval $cmd} res]
+
+    if {$fail} {
+	::ftpd::Log error "AuthUsr error: $res"
+    }
+    if {$fail || ($res == 0)} {
+	::ftpd::Log note "AuthUsr: Access denied to <$data(user)> <$data(pass)>."
+	unset data(user)
+        unset data(pass)
+        puts $sock "551 Access Denied"
+    } else {
+	puts $sock "230 OK"
+	set data(access) 1
+    }
+    return
+}
+
+# ::ftpd::command::PORT --
+#
+#       Handle the PORT ftp command.  Create a new socket with the specified
+#       paramaters.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the PORT command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       A new socket, data(sock2), is opened.
+
+proc ::ftpd::command::PORT {sock numbers} {
+    upvar #0 ::ftpd::$sock data
+    set x [split $numbers ,]
+
+    ::ftpd::FinishData $sock
+
+    set data(sock2) [socket [join [lrange $x 0 3] .] \
+	[expr {([lindex $x 4] << 8) | [lindex $x 5]}]]
+    fconfigure $data(sock2) -translation $data(mode)
+    puts $sock "200 PORT OK"
+    return
+}
+
+# ::ftpd::command::PWD --
+#
+#       Handle the PWD ftp command.  Prints the current working directory to
+#       the socket.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the PWD command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Prints the current working directory to the socket.
+
+proc ::ftpd::command::PWD {sock list} {
+    upvar #0 ::ftpd::$sock data
+    ::ftpd::Log debug $data(cwd)
+    puts $sock "257 \"$data(cwd)\" is current directory."
+    return
+}
+
+# ::ftpd::command::QUIT --
+#
+#       Handle the QUIT ftp command.  Closes the socket.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the PWD command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Closes the connection.
+
+proc ::ftpd::command::QUIT {sock list} {
+    ::ftpd::Log note "Closed $sock"
+    puts $sock "221 Goodbye."
+    ::ftpd::Finish $sock
+    # FRINK: nocheck
+    #unset ::ftpd::$sock
+    return
+}
+
+# ::ftpd::command::REIN --
+#
+#       Handle the REIN ftp command. This command terminates a USER, flushing
+#       all I/O and account information, except to allow any transfer in
+#       progress to be completed.  All parameters are reset to the default
+#       settings and the control connection is left open.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the REIN command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The file specified by $path (if it exists) is copied to the socket
+#       data(sock2) otherwise a 'Copy Failed' message is output.
+
+proc ::ftpd::command::REIN {sock list} {
+    upvar #0 ::ftpd::$sock data
+
+    ::ftpd::FinishData $sock
+    catch {close $data(sock2a)}
+
+    # Reinitialize the user and connection data.
+
+    array set data [list \
+        access          0 \
+	state		command \
+	buffering	line \
+	cwd		"$::ftpd::cwd" \
+	mode		binary \
+	sock2a          "" \
+        sock2           ""]
+
+    return
+}
+
+# ::ftpd::command::RETR --
+#
+#       Handle the RETR ftp command.  Gets a readable channel for the file
+#       specified from ::ftpd::Fs and copies the file to second socket 
+#       data(sock2).
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the RETR command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The file specified by $path (if it exists) is copied to the socket
+#       data(sock2) otherwise a 'Copy Failed' message is output.
+
+proc ::ftpd::command::RETR {sock filename} {
+    upvar #0 ::ftpd::$sock data
+
+    set path [file join $data(cwd) [string trimleft $filename /]]
+
+    if {[::ftpd::hasCallback authFileCmd]} {
+        set cmd $::ftpd::cfg(authFileCmd)
+        lappend cmd $data(user) $path read
+        if {[eval $cmd] == 0} {
+	    puts $sock "550 $filename: Permission denied"
+            return
+        }
+    }
+
+    #
+    # Patched Mark O'Connor
+    #
+    if {![catch {::ftpd::Fs retr $path $data(mode)} f]} {
+	puts $sock "150 Copy Started ($data(mode))"
+	::ftpd::PasvCheckAndWait $sock
+	fcopy $f $data(sock2) -command [list ::ftpd::GetDone $sock $data(sock2) $f ""]
+    } else {
+	puts $sock "500 Copy Failed: $path $f"
+	::ftpd::FinishData $sock
+    }
+    return
+}
+
+# ::ftpd::command::RMD --
+#
+#       Handle the RMD ftp command.  Remove the specified directory.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the RMD command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The directory specified by $path (if it exists) is deleted.
+
+proc ::ftpd::command::RMD {sock filename} {
+    upvar #0 ::ftpd::$sock data
+
+    set path [file join $data(cwd) [string trimleft $filename /]]
+
+    if {[::ftpd::hasCallback authFileCmd]} {
+        set cmd $::ftpd::cfg(authFileCmd)
+        lappend cmd $data(user) $path write
+        if {[eval $cmd] == 0} {
+	    puts $sock "550 $filename: Permission denied"
+            return
+        }
+    }
+    if {[catch {::ftpd::Fs rmdir $path $sock} f]} {
+	puts $sock "500 RMD Failed: $path $f"
+    }
+    return
+}
+
+# ::ftpd::command::RNFR --
+#
+#       Handle the RNFR ftp command.  Stores the name of the file to rename
+#       from.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the RNFR command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       If the file specified by $path exists, then store the name and request
+#       the next name.
+
+proc ::ftpd::command::RNFR {sock filename} {
+    upvar #0 ::ftpd::$sock data
+
+    set path [file join $data(cwd) [string trimleft $filename /]]
+
+    if {[::ftpd::Fs exists $path]} {
+        if {[::ftpd::hasCallback authFileCmd]} {
+            set cmd $::ftpd::cfg(authFileCmd)
+            lappend cmd $data(user) $path write
+            if {[eval $cmd] == 0} {
+	        puts $sock "550 $filename: Permission denied"
+                return
+            }
+	}
+
+        puts $sock "350 File exists, ready for destination name"
+        set data(renameFrom) $path
+    } else {
+        puts $sock "550 $path: No such file or directory."
+    }
+    return
+}
+
+# ::ftpd::command::RNTO --
+#
+#       Handle the RNTO ftp command.  Renames the file specified by 'RNFR' if
+#       one was specified.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the RNTO command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The specified file is renamed.
+
+proc ::ftpd::command::RNTO {sock filename} {
+    upvar #0 ::ftpd::$sock data
+
+    if {$filename == ""} {
+        puts $sock "500 'RNTO': command not understood."
+        return
+    }
+
+    set path [file join $data(cwd) [string trimleft $filename /]]
+
+    if {![info exists data(renameFrom)]} {
+        puts $sock "503 Bad sequence of commands."
+        return
+    }
+    if {[::ftpd::hasCallback authFileCmd]} {
+        set cmd $::ftpd::cfg(authFileCmd)
+        lappend cmd $data(user) $path write
+        if {[eval $cmd] == 0} {
+            puts $sock "550 $filename: Permission denied"
+            return
+        }
+    }
+
+
+    if {![catch {::ftpd::Fs rename $data(renameFrom) $path $sock} msg]} {
+        unset data(renameFrom)
+    } else {
+        unset data(renameFrom)
+        puts $sock "500 'RNTO': command not understood."
+    }
+    return
+}
+
+# ::ftpd::command::SIZE --
+#
+#       Handle the SIZE ftp command.  Prints the modification time of the
+#       specified file to the socket.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the MDTM command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Prints the size of the specified file to the socket.
+
+proc ::ftpd::command::SIZE {sock filename} {
+    upvar #0 ::ftpd::$sock data
+
+    set path [file join $data(cwd) [string trimleft $filename /]]
+    if {[catch {::ftpd::Fs size $path $sock} msg]} {
+	puts $sock "500 SIZE Failed: $path $msg"
+	::ftpd::FinishData $sock
+    }
+    return
+}
+ 
+# ::ftpd::command::STOR --
+#
+#       Handle the STOR ftp command.  Gets a writable channel for the file
+#       specified from ::ftpd::Fs and copies the data from data(sock2) to
+#       the writable channel.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the STOR command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The data is copied to from the socket data(sock2) to the
+#       writable channel to create a file.
+
+proc ::ftpd::command::STOR {sock filename} {
+    upvar #0 ::ftpd::$sock data
+
+    set path [file join $data(cwd) [string trimleft $filename /]]
+    if {[::ftpd::hasCallback authFileCmd]} {
+        set cmd $::ftpd::cfg(authFileCmd)
+        lappend cmd $data(user) $path write
+        if {[eval $cmd] == 0} {
+	    puts $sock "550 $filename: Permission denied"
+            return
+        }
+    }
+
+    #
+    # Patched Mark O'Connor
+    #
+    if {![catch {::ftpd::Fs store $path $data(mode)} f]} {
+	puts $sock "150 Copy Started ($data(mode))"
+	::ftpd::PasvCheckAndWait $sock
+	fcopy $data(sock2) $f -command [list ::ftpd::GetDone $sock $data(sock2) $f ""]
+    } else {
+	puts $sock "500 Copy Failed: $path $f"
+	::ftpd::FinishData $sock
+    }
+    return
+}
+
+# ::ftpd::command::STOU --
+#
+#       Handle the STOR ftp command.  Gets a writable channel for the file
+#       specified from ::ftpd::Fs and copies the data from data(sock2) to
+#       the writable channel.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the STOU command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The data is copied to from the socket data(sock2) to the
+#       writable channel to create a file.
+
+proc ::ftpd::command::STOU {sock filename} {
+    upvar #0 ::ftpd::$sock data
+
+    set path [file join $data(cwd) [string trimleft $filename /]]
+    if {[::ftpd::hasCallback authFileCmd]} {
+        set cmd $::ftpd::cfg(authFileCmd)
+        lappend cmd $data(user) $path write
+        if {[eval $cmd] == 0} {
+	    puts $sock "550 $filename: Permission denied"
+            return
+        }
+    }
+    
+    set file $path
+    set i 0
+    while {[::ftpd::Fs exists $file]} {
+        set file "$path.$i"
+        incr i
+    }
+
+    #
+    # Patched Mark O'Connor
+    #
+    if {![catch {::ftpd::Fs store $file $data(mode)} f]} {
+	puts $sock "150 Copy Started ($data(mode))"
+	::ftpd::PasvCheckAndWait $sock
+	fcopy $data(sock2) $f -command [list ::ftpd::GetDone $sock $data(sock2) $f $file]
+    } else {
+	puts $sock "500 Copy Failed: $path $f"
+	::ftpd::FinishData $sock
+    }
+    return
+}
+
+# ::ftpd::command::SYST --
+#
+#       Handle the SYST ftp command.  Print the system information.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the SYST command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Prints the system information.
+
+proc ::ftpd::command::SYST {sock list} {
+    upvar #0 ::ftpd::$sock data
+
+    global tcl_platform
+
+    if {[string equal $tcl_platform(platform) "unix"]} {
+        set platform UNIX
+    } elseif {[string equal $tcl_platform(platform) "windows"]} {
+        set platform WIN32
+    } elseif {[string equal $tcl_platform(platform) "macintosh"]} {
+        set platform MACOS
+    } else {
+        set platform UNKNOWN
+    }
+    set version [string toupper $tcl_platform(os)]
+    puts $sock "215 $platform Type: L8 Version: $version"
+
+    return
+}
+
+# ::ftpd::command::TYPE --
+#
+#       Handle the TYPE ftp command.  Sets up the proper translation mode on
+#       the data socket data(sock2)
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the TYPE command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The translation mode of the data channel is changed to the appropriate
+#       mode.
+ 
+proc ::ftpd::command::TYPE {sock type} {
+    upvar #0 ::ftpd::$sock data
+
+    if {[string compare i [string tolower $type]] == 0} {
+	set data(mode) binary
+    } else {
+	set data(mode) auto
+    }
+
+    if {$data(sock2) != {}} {
+	fconfigure $data(sock2) -translation $data(mode)
+    }
+    puts $sock "200 Type set to $type."
+    return
+}
+
+# ::ftpd::command::USER --
+#
+#       Handle the USER ftp command.  Store the username, and request a
+#       password.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       list -                   The arguments to the USER command.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       A message is printed asking for the password.
+
+proc ::ftpd::command::USER {sock username} {
+    upvar #0 ::ftpd::$sock data
+
+    if {$username == ""} {
+        puts $sock "530 Please login with USER and PASS."
+        return
+    }
+    set data(user) $username
+    puts $sock "331 Password Required"
+
+    ::ftpd::Log debug "user <$data(user)>"
+    return
+}
+
+# ::ftpd::GetDone --
+#
+#       The fcopy command callback for both the RETR and STOR calls.  Called
+#       after the fcopy completes.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       sock2 -                  The data socket data(sock2).
+#       f -                      The file channel.
+#       filename -               The name of the unique file (if a unique
+#                                transfer was requested), and the empty string
+#                                otherwise
+#       bytes -                  The number of bytes that were copied.
+#       err -                    Passed if an error occurred during the fcopy.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The open file channel is closed and a 'complete' message is printed to
+#       the socket.
+
+proc ::ftpd::GetDone {sock sock2 f filename bytes {err {}}} {
+    upvar #0 ::ftpd::$sock data
+    variable cfg
+
+    close $f
+    FinishData $sock
+
+    if {[string length $err]} {
+	puts $sock "226- $err"
+    } elseif {$filename == ""} {
+        puts $sock "226 Transfer complete ($bytes bytes)"
+    } else {
+        puts $sock "226 Transfer complete (unique file name: $filename)."
+    }
+    if {[hasCallback xferDoneCmd]} then {
+	catch {$cfg(xferDoneCmd) $sock $sock2 $f $bytes $filename $err}
+    }
+    Log debug "GetDone $f $sock2 $bytes bytes filename: $filename"
+    return
+}
+
+# ::ftpd::List --
+#
+#       Handle the NLST and LIST ftp commands.  Shared command to do the
+#       actual listing of files.
+#
+# Arguments:
+#       sock -                   The channel for this connection to the ftpd.
+#       filename -               The path/filename to list.
+#       style -                  The type of listing -- nlst or list.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       A listing of file stats is written to the socket.
+
+proc ::ftpd::List {sock filename style} {
+    upvar #0 ::ftpd::$sock data
+    puts $sock "150 Opening data channel"
+
+    set path [file join $data(cwd) $filename]
+
+    PasvCheckAndWait $sock
+    Fs dlist $path $style $data(sock2)
+
+    FinishData $sock
+    puts $sock "226 Listing complete"
+    return
+}
+
+# Standard filesystem - Assume the files are held on a standard disk.  This
+# namespace contains the commands to act as the default fsCmd callback for the
+# ftpd.
+
+namespace eval ::ftpd::fsFile {
+    # Our document root directory
+
+    variable docRoot
+    if {![info exists docRoot]} {
+	set docRoot /
+    }
+
+    namespace export docRoot fs
+}
+
+# ::ftpd::fsFile::docRoot --
+#
+#       Set or query the root of the ftpd file system.  If no 'dir' argument
+#       is passed, or if the 'dir' argument is the null string, then the
+#       current docroot is returned.  If a non-NULL 'dir' argument is passed
+#       in it is set as the docRoot.
+#
+# Arguments:
+#       dir  -                   The directory to set as the ftp docRoot.
+#                                (optional. If unspecified, the current docRoot
+#                                is returned).
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Sets the docRoot to the specified directory if a directory is
+#       specified.
+
+proc ::ftpd::fsFile::docRoot {{dir {}}} {
+    variable docRoot
+    if {[string length $dir] == 0} {
+	return $docRoot
+    } else {
+	set docRoot $dir
+    }
+    return ""
+}
+
+# ::ftpd::fsFile::fs --
+#
+#       Handles the a standard file systems file system requests and is the
+#       default fsCmd callback.
+#
+# Arguments:
+#       command -                The filesystem command (one of dlist, retr, or
+#                                store).  'dlist' will list files in a
+#                                directory, 'retr' will get a channel to
+#                                to read the specified file from, and 'store'
+#                                will return the channel to write to.
+#       path -                   The file name or directory to read, write or
+#                                list.
+#       args -                   Additional arguments for filesystem commands.
+#                                Currently this is used by 'dlist' which
+#                                has two additional arguments 'style' and
+#                                'channel-to-write-dir-list-to'. It is also
+#                                used by 'size' and 'mtime' which have one
+#                                additional argument 'channel-to-write-to'.
+#
+# Results:
+#       For a 'appe', 'retr', or 'stor' a channel is returned. For 'exists' a 1
+#       is returned if the path exists, and is not a directory.  Otherwise a
+#       0 is returned.  For 'permissions' the octal file permissions (i.e.
+#       the 'file stat' mode) are returned.
+#
+# Side Effects:
+#       For 'dlist' a directory listing for the specified path is written to
+#       the specified channel.  For 'mtime' the modification time is written
+#       or an error is thrown.  An error is thrown if there is no fsCmd
+#       callback configured for the ftpd.
+
+proc ::ftpd::fsFile::fs {command path args} {
+    # append <path>
+    # delete <path> <channel-to-write-to>
+    # dlist <path> <style> <channel-to-write-dir-list-to>
+    # exists <path>
+    # mkdir <path> <channel-to-write-to>
+    # mtime <path> <channel-to-write-mtime-to>
+    # permissions <path>
+    # rename <path> <newpath> <channel-to-write-to>
+    # retr  <path>
+    # rmdir <path> <channel-to-write-to>
+    # size  <path> <channel-to-write-size-to>
+    # store <path>
+
+    global tcl_platform
+
+    variable docRoot
+
+    set path [file join $docRoot $path]
+
+    switch -exact -- $command {
+        append {
+	    #
+	    # Patched Mark O'Connor
+	    #
+	    set fhandle [open $path a]
+	    if {[lindex $args 0] == "binary"} {
+		fconfigure $fhandle -translation binary -encoding binary
+	    }
+	    return $fhandle
+        }
+	retr {
+	    #
+	    # Patched Mark O'Connor
+	    #
+	    set fhandle [open $path r]
+	    if {[lindex $args 0] == "binary"} {
+		fconfigure $fhandle -translation binary -encoding binary
+	    }
+	    return $fhandle
+	}
+	store {
+	    #
+	    # Patched Mark O'Connor
+	    #
+	    set fhandle [open $path w]
+	    if {[lindex $args 0] == "binary"} {
+		fconfigure $fhandle -translation binary -encoding binary
+	    }
+	    return $fhandle
+	}
+	dlist {
+	    foreach {style outchan} $args break
+	    ::ftpd::Log debug "at dlist {$style} {$outchan} {$path}"
+	    #set path [glob -nocomplain $path]
+	    #::ftpd::Log debug "at dlist2 {$style} {$outchan} {$path}"
+
+            # Attempt to get a list of all files (even ones that start with .)
+
+	    if {[file isdirectory $path]} {
+		set path1 [file join $path *]
+                set path2 [file join $path .*]
+	    } else {
+                set path1 $path
+                set path2 $path
+	    }
+
+            # Get a list of all files that match the glob pattern
+
+            set fileList [lsort -unique [concat [glob -nocomplain $path1] \
+                    [glob -nocomplain $path2]]]
+	    
+	    ::ftpd::Log debug "File list is {$fileList}"
+
+	    switch -- $style {
+	        nlst {
+		    ::ftpd::Log debug "In nlist"
+	            foreach f [lsort $fileList] {
+                        if {[string equal [file tail $f] "."] || \
+                                [string equal [file tail $f] ".."]} {
+                            continue
+                        }
+			if {[string equal {} $f]} then continue
+			::ftpd::Log debug [file tail $f]
+		        puts $outchan [file tail $f]
+	            }
+	        }
+		list {
+		    # [ 766112 ] report . and .. directories (linux)
+		    # Copied the code from 'nlst' above to handle this.
+
+	            foreach f [lsort $fileList] {
+                        if {[string equal [file tail $f] "."] || \
+                                [string equal [file tail $f] ".."]} {
+                            continue
+                        }
+			file stat $f stat
+                        if {[string equal $tcl_platform(platform) "unix"]} {
+                            set user [file attributes $f -owner]
+                            set group [file attributes $f -group]
+                        } else {
+                            set user owner
+                            set group group
+                        }
+			puts $outchan [format "%s %3d %s %8s %11s %s %s" \
+			        [PermBits $f $stat(mode)] $stat(nlink) \
+	                        $user $group $stat(size) \
+                                [FormDate $stat(mtime)] [file tail $f]]
+		    }
+		}
+		default {
+		    error "Unknown list style <$style>"
+		}
+	    }
+	}
+        delete {
+	    foreach {outchan} $args break
+
+            if {![file exists $path]} {
+                puts $outchan "550 $path: No such file or directory."
+	    } elseif {![file isfile $path]} {
+                puts $outchan "550 $path: File exists."
+	    } else {
+                file delete $path
+                puts $outchan "250 DELE command successful."
+	    }
+	}
+        exists {
+            if {[file isdirectory $path]} {
+                return 0
+	    } else {
+                return [file exists $path]
+	    }
+	}
+        mkdir {
+	    foreach {outchan} $args break
+
+            set path [string trimright $path /]
+            if {[file exists $path]} {
+                if {[file isdirectory $path]} {
+                    puts $outchan "521 \"$path\" directory exists"
+		} else {
+		    puts $outchan "521 \"$path\" already exists"
+                }
+	    } elseif {[file exists [file dirname $path]]} {
+                file mkdir $path
+                puts $outchan "257 \"$path\" new directory created."
+	    } else {
+                puts $outchan "550 $path: No such file or directory."
+	    }
+	}
+        mtime {
+	    foreach {outchan} $args break
+
+            if {![file exists $path]} {
+                puts $outchan "550 $path: No such file or directory"
+            } elseif {![file isfile $path]} {
+	        puts $outchan "550 $path: not a plain file."
+            } else {
+                set time [file mtime $path]
+                puts $outchan [clock format $time -format "213 %Y%m%d%H%M%S"]
+	    }
+        }
+        permissions {
+	    file stat $path stat
+            return $stat(mode)
+        }
+        rename {
+            foreach {newname outchan} $args break
+
+            if {![file isdirectory [file dirname $newname]]} {
+	        puts $outchan "550 rename: No such file or directory."
+            }
+            file rename $path $newname
+            puts $outchan "250 RNTO command successful."
+	}
+        rmdir {
+	    foreach {outchan} $args break
+
+            if {![file isdirectory $path]} {
+                puts $outchan "550 $path: Not a directory."
+	    } elseif {[llength [glob -nocomplain [file join $path *]]] != 0} {
+                puts $outchan "550 $path: Directory not empty."
+            } else {
+                file delete $path
+                puts $outchan "250 RMD command successful."
+	    }
+	}
+        size {
+	    foreach {outchan} $args break
+
+            if {![file exists $path]} {
+                puts $outchan "550 $path: No such file or directory"
+            } elseif {![file isfile $path]} {
+	        puts $outchan "550 $path: not a plain file."
+            } else {
+                puts $outchan "213 [file size $path]"
+	    }
+        }
+	default {
+	    error "Unknown command \"$command\""
+	}
+    }
+    return ""
+}
+
+# ::ftpd::fsFile::PermBits --
+#
+#       Returns the file permissions for the specified file.
+#
+# Arguments:
+#       file  -                  The file to return the permissions of.
+#
+# Results:
+#       The permissions for the specified file are returned.
+#
+# Side Effects:
+#       None.
+
+proc ::ftpd::fsFile::PermBits {file mode} {
+
+    array set s {
+        0 --- 1 --x 2 -w- 3 -wx 4 r-- 5 r-x 6 rw- 7 rwx
+    }
+
+    set type [file type $file]
+    if {[string equal $type "file"]} {
+        set permissions "-"
+    } else {
+        set permissions [string index $type 0]
+    }
+    foreach j [split [format %03o [expr {$mode&0777}]] {}] {
+        append permissions $s($j)
+    }
+
+    return $permissions
+}
+
+# ::ftpd::fsFile::FormDate --
+#
+#       Returns the file permissions for the specified file.
+#
+# Arguments:
+#       seconds  -              The number of seconds returned by 'file mtime'.
+#
+# Results:
+#       A formatted date is returned.
+#
+# Side Effects:
+#       None.
+
+proc ::ftpd::fsFile::FormDate {seconds} {
+
+    set currentTime [clock seconds]
+    set oldTime [clock scan "6 months ago" -base $currentTime]
+    if {$seconds <= $oldTime} {
+        set time [clock format $seconds -format "%Y"]
+    } else {
+        set time [clock format $seconds -format "%H:%M"]
+    }
+    set day [string trimleft [clock format $seconds -format "%d"] 0]
+    set month [clock format $seconds -format "%b"]
+    return [format "%3s %2s %5s" $month $day $time]
+}
+
+# Only provide the package if it has been successfully
+# sourced into the interpreter.
+
+#
+# Patched Mark O'Connor
+#
+package provide ftpd 1.3
+
+
+##
+## Implementation of passive command
+##
+proc ::ftpd::command::PASV {sock argument} {
+    upvar #0 ::ftpd::$sock data
+
+    set data(sock2a) [socket -server [list ::ftpd::PasvAccept $sock] 0]
+    set list1 [fconfigure $sock -sockname]
+    set ip [lindex $list1 0]
+    set list2 [fconfigure $data(sock2a) -sockname]
+    set port [lindex $list2 2]
+    ::ftpd::Log debug "PASV on {$list1} {$list2} $ip $port"
+    set ans [split $ip {.}]
+    lappend ans [expr {($port >> 8) & 0xff}] [expr {$port & 0xff}]
+    set ans [join $ans {,}]
+    puts $sock "227 Entering Passive Mode ($ans)."
+    set data(sock2) ""
+    return
+}
+
+
+proc ::ftpd::PasvAccept {sock sock2 ip port} {
+    upvar #0 ::ftpd::$sock data
+
+    ::ftpd::Log debug "In Pasv Accept with {$sock} {$sock2} {$ip} {$port}"
+    ##
+    ## Verify this is from who it should be
+    ##
+    if {![string equal $ip $data(ip)]} then {
+	##
+	## Nope, so close it and wait some more
+	##
+	close $sock2
+	return
+    }
+    ::ftpd::FinishData $sock
+
+    set data(sock2) $sock2 ; # (*), see ::ftpd::PasvCheckAndWait
+    fconfigure $data(sock2) -translation $data(mode)
+    close $data(sock2a)
+    set data(sock2a) ""
+    return
+}
+
+proc ::ftpd::PasvCheckAndWait {sock} {
+    upvar #0 ::ftpd::$sock data
+
+    # Check if we are in passive mode, with the data connection not
+    # yet established. If so, wait for the data connection to be
+    # made. This vwait is unlocked by (*) in ::ftpd::PasvAccept above.
+
+    if {$data(sock2) != ""} return
+    vwait ::ftpd::${sock}(sock2)
+    return
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftpd/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftpd/pkgIndex.tcl
new file mode 100644
index 00000000..68aa204a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ftpd/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.3]} {return}
+package ifneeded ftpd 1.3 [list source [file join $dir ftpd.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/cfront.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/cfront.tcl
new file mode 100644
index 00000000..d9f03721
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/cfront.tcl
@@ -0,0 +1,932 @@
+# cfront.tcl --
+#
+#	Generator frontend for compiler of magic(5) files into recognizers
+#	based on the 'rtcore'. Parses magic(5) into a basic 'script'.
+#
+# Copyright (c) 2016      Poor Yorick     <tk.tcl.core.tcllib@pooryorick.com>
+# Copyright (c) 2004-2005 Colin McCormack <coldstore@users.sourceforge.net>
+# Copyright (c) 2005      Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: cfront.tcl,v 1.7 2008/03/22 01:10:32 andreas_kupries Exp $
+
+#####
+#
+# "mime type recognition in pure tcl"
+# http://wiki.tcl.tk/12526
+#
+# Tcl code harvested on:  10 Feb 2005, 04:06 GMT
+# Wiki page last updated: ???
+#
+#####
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.5
+
+# file to compile the magic file from magic(5) into a tcl program
+package require fileutil              ; # File processing (input)
+package require fileutil::magic::cgen ; # Code generator.
+package require fileutil::magic::rt   ; # Runtime (typemap)
+package require struct::list          ; # lrepeat.
+package require struct::tree          ; #
+
+package provide fileutil::magic::cfront 1.3.0
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+namespace eval ::fileutil::magic::cfront {
+    # Configuration flag. (De)activate debugging output.
+    # This is done during initialization.
+    # Changes at runtime have no effect.
+
+    variable debug 0
+
+    # Make backend functionality accessible
+    namespace import ::fileutil::magic::cgen
+
+    namespace export compile generate install
+
+    namespace upvar ::fileutil::magic::rt typemap typemap
+
+    variable floattestops {= < > !}
+    variable inttestops {= < > & ^ ~ !}
+    variable stringtestops { > < = !}
+    variable offsetopts {& | ^ + - * / %}
+    variable stringmodifiers {W w c C t b T}
+    variable typemodifiers [dict create \
+	indirect r \
+	search $stringmodifiers \
+	string $stringmodifiers \
+	pstring [list {*}$stringmodifiers B H h L l J] \
+	regex {c s l} \
+    ]
+    set numeric_modifier_allowed {regex search}
+
+    variable types_numeric_short
+    foreach {shortname name} {
+	dC byte d1 byte C byte 1 byte ds short d2 short S short 2 short dI long
+	dL long d4 long I long L long 4 long d8 quad 8 quad dQ quad Q quad
+    } {
+	dict set types_numeric_short $shortname $name
+	dict set types_numeric_short u$shortname u$name
+    }
+
+    variable types_numeric_all [list {*}[
+	array names typemap] {*}[dict keys $types_numeric_short]]
+
+    variable types_string_short [dict create s string] 
+    variable types_string_short [dict create us ustring] 
+
+    variable types_string {
+	bestring clear indirect lestring lestring16 pstring regex search
+	string ustring
+    }
+    variable types_string_all [list {*}[
+	dict keys $types_string_short] {*}$types_string]
+
+    variable types_verbatim {name use}
+
+    variable types_notimplemented {der}
+
+    variable types_numeric_real
+    foreach name {float double befloat bedouble lefloat ledouble} {
+	lappend types_numeric_real $name u$name
+    }
+
+    variable indir_typemap [dict create \
+	b byte c byte e ledouble f ledouble g ledouble i leid3 h leshort \
+	s leshort l lelong B byte C byte E bedouble F bedouble G bedouble \
+	H beshort I beid3 L belong m ME S beshort]
+
+}
+
+
+proc ::fileutil::magic::cfront::advance {len args} {
+    upvar node node tree tree
+    if {[llength args]} {
+	upvar [lindex $args 0] res
+    }
+    set res {}
+    set line [$tree get $node line]
+    set cursor [$tree get $node cursor]
+    if {[string index $len 0] eq {w}} {
+	regexp -start $cursor {\A(\s*)} $line match res
+	incr cursor [string length $match]
+	set len [string range $len 1 end]
+    }
+    if {$len ne {}} {
+	if {[regexp -start $cursor "\\A(.{[
+	    scan $len %lld]})" $line match res]} {
+	    incr cursor [string length $match]
+	}
+    }
+    set line [$tree get $node line]
+    $tree set $node cursor $cursor
+    return $res
+}
+
+
+# compile up magic files or directories of magic files into a single recognizer.
+proc ::fileutil::magic::cfront::compile {args} {
+    set tree [tree]
+
+    foreach arg $args {
+   	if {[file type $arg] eq  {directory}} {
+   	    foreach file [glob [file join $arg *]] {
+		if {[file tail $file] eq {make}} {
+		    set chan [open $file r+]
+		    set data [read $chan]
+		    seek $chan 0
+		    regsub {\\\^\\\.BEGIN} $data {^\\\\.BEGIN} data
+		    regsub {\\\^\\\.PRECIOUS} $data {^\\\\.PRECIOUS} data
+		    regsub {\\\^\\\.include} $data {^\\\\.include} data
+		    puts $chan $data
+		    close $chan
+		}
+   		process $tree $file
+   	    }
+	    #append tcl "magic::file_start $file" \n
+	    #append tcl [run $script1] \n
+   	} else {
+   	    set file $arg
+   	    process $tree $file
+	    #append tcl "magic::file_start $file" \n
+	    #append tcl [run $script1] \n
+   	}
+    }
+
+    #puts stderr $script
+    ::fileutil::magic::cfront::Debug {puts "\# $args"}
+
+    # Historically, this command converted the output of [process] , which was
+    # a list , into a tree . Now it post-processes the tree .
+    cgen 2tree $tree
+
+    set tests [cgen treegen $tree root]
+    set named [$tree get root named]
+
+    ::fileutil::magic::cfront::Debug {puts [treedump $t]}
+    #set tcl [run $script]
+
+    return [list $named $tests]
+}
+
+
+proc ::fileutil::magic::cfront::generate args {
+
+    set indent {}
+    set pline {}
+
+    while {[llength $args]} {
+	set args [lassign $args[set args {}] key]
+	switch $key {
+	    compressed {
+		set args [lassign $args[set args {}] val]
+		if {$val} {
+		    set indent {}
+		    set pline {}
+		} else {
+		    set indent \t
+		    set pline \n
+		}
+	    }
+	    -- break
+	    default {
+		error [list {unknown argument}]
+	    }
+	}
+    }
+
+    lassign [compile {*}$args] named tests
+
+    append script "variable named {\n"
+	dict for {key val} $named {
+	    append script "${indent}[list $key]"
+		append script "$pline${indent}${indent}[list [string map [
+		    list \n \n${indent}] $val]]\n"
+	    }
+    append script "$pline}\n"
+
+    append script "proc analyze {} {\n"
+	    foreach item $tests {
+		append script "${indent}[string map [
+		    list \n \n${indent}] $item]\n"
+	    }
+    append script "$pline}\n"
+
+    return $script 
+}
+
+
+proc ::fileutil::magic::cfront::install args {
+    foreach arg $args {
+	set path [file tail $arg]
+	eval [generate compressed 1 -- ::fileutil::magic::/$path $arg]
+    }
+    return
+}
+
+
+proc ::fileutil::magic::cfront::parseerror args {
+    upvar node node tree tree
+    set cursor [$tree get $node cursor]
+    set line [$tree get $node line]
+    set files [$tree get root files]
+    set file [lindex $files [$tree get $node file]]
+    return -code error -errorcode [list fumagic {parse error}] [
+	list [lmap arg $args {string trim $arg}] \
+	file $file \
+	linenenum [$tree get $node linenum] \
+	cursor $cursor \
+	line [list \
+	    [string range $line 0 ${cursor}-1] \
+	    [string range $line $cursor end]]]
+}
+
+
+proc ::fileutil::magic::cfront::parsewarning args {
+    upvar node node tree tree
+    catch {parseerror {*}$args} res options
+    puts stderr [list parse warning $res]
+    #puts stderr [dict get $options -errorinfo]
+}
+
+
+# parse an individual line
+variable ::fileutil::magic::cfront::parsedkeys {
+}
+proc ::fileutil::magic::cfront::parseline {tree node} {
+    variable parsedkeys
+    set line [$tree get $node line]
+    $tree set $node cursor 0 
+    parseoffset $tree $node
+    parsetype $tree $node
+    parsetest $tree $node
+    parsemsg $tree $node
+
+    set record [$tree getall $node]
+    foreach key $parsedkeys {
+	if {![dict exists $record $key]} {
+	    return -code error [list {missing key} $key]
+	}
+    }
+    ::fileutil::magic::cfront::Debug {
+   	puts [list parsed $record]
+    }
+}
+
+
+proc ::fileutil::magic::cfront::parsefloat {tree node} {
+    set line [$tree get $node line]
+    set cursor [$tree get $node cursor]
+    # If only [scan] had a @ conversion character like [binary scan]
+    set line2 [string range $line $cursor end]
+    if {[scan $line2 %e%n num count] < 0} {
+	parseerror {invalid floating point number}
+    }
+    set cursor [expr {$cursor + $count}]
+    $tree set $node cursor $cursor
+
+    # These suffixes are not used in magic files
+    #if {[regexp -start $cursor {\A([fFlL)} -> modifier]} {
+    #    advance [string length $modifier]]
+    #}
+    return $num
+}
+
+
+proc ::fileutil::magic::cfront::parseint {tree node} {
+    set line [$tree get $node line]
+    set cursor [$tree get $node cursor]
+    # If only [scan] had a @ conversion character like [binary scan]
+    set line2 [string range $line $cursor end]
+    if {[set scanres [scan $line2 %lli%n num n]] < 1} {
+	parseerror [list {invalid number} $line2]
+    }
+    set cursor [expr {$cursor + $n}]
+    $tree set $node cursor $cursor
+    # Thse suffixes are not used in magic files
+    #if {[regexp -start $cursor {\A([uU]?[lL]{1,2})} -> modifier]} {
+    #    advance [string length $modifier]]
+    #}
+    return $num
+}
+
+
+proc ::fileutil::magic::cfront::parsetype {tree node} {
+    variable types_numeric_all
+    variable types_numeric_short
+    variable types_string_all
+    variable types_string_short
+    variable types_notimplemented
+    set line [$tree get $node line]
+    set cursor [$tree get $node cursor]
+    $tree set $node mod {}
+    $tree set $node mand {}
+    set num_or_string {
+    }
+    if {[regexp -start $cursor {\A\s*(\w+)} $line match type]} {
+	advance [string length $match]
+	if {$type in $types_numeric_all} {
+	    if {[dict exists $types_numeric_short $type]} {
+		set type [dict get $types_numeric_short $type]
+	    }
+	    $tree set $node type $type
+	    parsetypenummod $tree $node
+	} elseif {$type in $types_string_all} {
+	    if {[dict exists $types_string_short $type]} {
+		set type [dict get $types_string_short $type]
+	    }
+	    $tree set $node type $type
+	    # No modifying operator for strings
+	    parsetypemod $tree $node
+
+	    if {$type eq {search} && [$tree get $node mand] eq {}} {
+		parsewarning {search has no number}
+		# set the same default that file(1) sets
+		$tree set $node mand 100
+	    }
+	} elseif {$type in {default name use}} {
+	    $tree set $node type $type
+	} elseif {$type in $types_notimplemented} {
+	    parseerror {type not implemented}
+	} else {
+	    parseerror {unknown type}
+	}
+    } else {
+	parseerror {no type}
+    }
+}
+
+
+proc ::fileutil::magic::cfront::parsetypemod {tree node} {
+    # For numeric types , $mod is a list of modifiers and $mand is either a
+    # number or the empty string .
+    variable typemodifiers
+    variable numeric_modifier_allowed
+    set type [$tree get $node type]
+    if {[advance 1 char] ne {/}} {
+	rewind 1
+	return
+    }
+    set res [dict create] 
+    while 1 {
+	if {[advance 1 char] eq {/}} {
+	    continue
+	}
+	if {[string is space $char]} {
+	    break
+	}
+	if {[dict exists $typemodifiers $type] && $char in [dict get $typemodifiers $type]} {
+	    dict set res $char {}
+	} elseif {$type in $numeric_modifier_allowed} {
+	    rewind 1
+	    if {[catch {parseint $tree $node} mand]} {
+		# Whatever it is, it isn't a number.  Let the next parsing step
+		# handle it .
+		break
+	    } else {
+		$tree set $node mand $mand  ; # numeric modifier
+	    }
+	} else {
+	    parseerror {bad modifier}
+	}
+    }
+    $tree set $node mod [dict keys $res]
+}
+
+
+proc ::fileutil::magic::cfront::parsetypenummod {tree node} {
+    variable typemap
+    # For numeric types, $mod is an operator and $mand is a number
+    set line [$tree get $node line]
+    set type [$tree get $node type]
+    set cursor [$tree get $node cursor]
+    if {[regexp -start $cursor {\A([-&|^+*/%=])} $line match mod]} {
+	advance [string length $match]
+	$tree set $node mod $mod
+	# {to do} {parse floats?}
+	set mand [parseint $tree $node] ; # mod operand
+	if {[info exists typemap($type)]} {
+	    lassign $typemap($type) dummy scan
+
+	    # the modifier for a numeric type is a number of the same
+	    # type
+	    binary scan [binary format $scan $mand] $scan mand
+	}
+	$tree set $node mand $mand 
+    } else {
+	$tree set $node mod {}
+	$tree set $node mand {}
+    }
+}
+
+
+proc ::fileutil::magic::cfront::parsestringval {tree node} {
+    variable floattestops
+    variable inttestops
+    variable stringtestops
+    advance w1 char 
+    set val {}
+    set nodetype [$tree get $node type]
+    set line [$tree get $node line]
+    while 1 {
+	# break on whitespace or empty string
+	if {[string is space $char] || $char eq {}} break
+	switch $char [dict create  \
+	    \\ {
+		advance 1 char
+		if {[string is space $char]} {
+		    append val \\$char
+		} else {
+		    # extra backslashes because of interaction with glob
+		    switch -glob -- $char {
+			\\\\ {
+			    append val {\\}
+			} \t {
+			    parsewarning {use \t instead of \<tab>}
+			    append val \\t
+			} > - < - & - ^ - = - ! - ( - ) - . {
+			    if {$char in [list {*}$stringtestops \
+				{*}$floattestops {*}$inttestops]} {
+				parsewarning {no need to escape operators}
+			    }
+			    append val $char 
+			} a - b - f - n - r - t - v {
+			    append val \\$char
+			} x {
+			    set cursor [$tree get $node cursor]
+			    if {[regexp -start $cursor \
+				{\A([0-9A-Fa-f]{1,2})} $line match char2]} {
+				advance [string length $match] 
+				append val \\x$char2
+			    } else {
+				parseerror {malformed \x escape sequence}
+			    }
+			} [0-7] {
+			    set cursor [$tree get $node cursor]
+			    append val \\$char
+			    if {[regexp -start $cursor \
+				{\A([0-7]{1,2})} $line match char2]} {
+				advance [string length $match] 
+				append val $char2
+			    }
+			} default {
+			    if {$nodetype eq {regex}} {
+				if {$char ni {[ ] ( ) . * ? ^ $ | \{ \}}} {
+				    parsewarning [list {no need to escape}]
+				}
+			    } elseif {[string is print $char]} {
+				if {$char ni {< > & ^ = !}} {
+				    parsewarning [list {no need to escape}]
+				}
+			    }
+			    append val [tclescape $char]
+			}
+		    }
+		}
+	    } default {
+		append val [tclescape $char]
+	    }
+	]
+	advance 1 char
+    }
+    $tree set $node val $val
+}
+
+
+proc ::fileutil::magic::cfront::parsetest {tree node} {
+    variable floattestops
+    variable inttestops
+    variable stringtestops
+    variable types_numeric_real
+    variable types_numeric_all
+    variable types_string
+    variable types_verbatim
+    variable typemap
+    set type [$tree get $node type]
+    if {$type in $types_verbatim} {
+	parsetestverbatim $tree $node
+	return
+    }
+    $tree set $node compinvert 0
+    set testinvert 0
+    set comp ==
+    advance w1 char
+    if {$char eq {x}} {
+	advance 1 char
+	if {[string is space $char]} {
+	    $tree set $node testinvert 0
+	    $tree set $node comp x
+	    $tree set $node val {}
+	    return
+	} else {
+	    rewind 1
+	}
+    }
+
+    if {$type in $types_string} {
+	while 1  {
+	    if {$char in $stringtestops} {
+		if {$char eq {!}} {
+		    set testinvert 1
+		} else {
+		    set comp $char
+		    # Exclamation must precede any normal operator
+		    break
+		}
+		advance w1 char
+	    } else {
+		rewind 1
+		break
+	    }
+	}
+	parsestringval $tree $node
+    } elseif {$type in $types_numeric_all} {
+	if {$type in $types_numeric_real} {
+	    set ops $floattestops
+	    set parsecmd parsefloat
+	} else {
+	    set ops $inttestops 
+	    set parsecmd parseint
+	}
+
+	while 1 {
+	    if {$char in $ops} {
+		if {$char eq {~}} {
+		    $tree set $node compinvert 1 
+		} elseif {$char eq {!}} {
+		    set testinvert 1
+		} else {
+		    set comp $char
+		    # Exclamation and tilde must precede any normal operator
+		    break
+		}
+		advance w1 char
+	    } else {
+		rewind 1
+		break
+	    }
+	}
+	set val [$parsecmd $tree $node]
+	set scan [lindex $typemap([$tree get $node type]) 1]
+
+	# get value in binary form, then back to numeric
+	# this avoids problems with sign, as both values are
+	# [binary scan]-converted identically
+	binary scan [binary format $scan $val] $scan val
+	$tree set $node val $val 
+    } else {
+	parseerror {don't know how to parse the test or this type}
+    }
+    switch $comp {
+	= {
+	    set comp ==
+	}
+    }
+    # This facilitates Switch creation by [treegen1]
+    if {$testinvert && ($comp eq {==})} {
+	set comp !=
+	set testinvert 0
+    }
+    $tree set $node testinvert $testinvert
+    $tree set $node comp $comp 
+}
+
+
+proc ::fileutil::magic::cfront::parsetestverbatim {tree node} {
+    switch [$tree get $node type] {
+	name {
+	    $tree set $node rel 1
+	}
+	use {
+	    set cursor [$tree get $node cursor]
+	    # order matters in regular expression : longest match must come
+	    # first in parenthesized
+	    if {[regexp -start $cursor {\A\s*(?:\\\^|\^)} [$tree get $node line] match]} {
+		advance [string length $match]
+		$tree set $node iendian 1
+	    } else {
+		$tree set $node iendian 0
+	    }
+	}
+
+    }
+    parsestringval $tree $node
+}
+
+
+proc ::fileutil::magic::cfront::parseoffset {tree node} {
+
+    # Offset parser.
+    # Syntax:
+    #   ( ?&? number ?.[bslBSL]? ?[+-]? ?number? )
+
+    # This was all fine and dandy, but didn't do spaces where spaces might
+    # exist between lexical elements in the wild, and ididn't do offset
+    # operators
+
+    #set n {([-+]?[0-9]+|[-+]?0x[0-9A-Fa-f]+)[UL]*}
+
+    ##"\\((&?)(${n})((\\.\[bslBSL])?)()(\[+-]?)(${n}?)\\)"
+    #set o \
+    #    "^(&?)${n}((?:\\.\[bslBSL])?)(?:(\[-+*/%&|^])${n})?(?:(\[+-])(\\()?${n}\\)?)?$"
+    ##     |   |   |                     |            |        |      |    |
+    ##     1   2   3                     4            5        6      7    8 
+    ##                            1    2    3     4   5        6    7     8   
+    #set ok [regexp $o $offset -> irel base type  iop ioperand sign ind idx]
+
+    variable offsetopts
+    variable indir_typemap
+    $tree set $node rel 0 ;   # relative
+    $tree set $node ind 0 ;   # indirect
+    $tree set $node ir 0 ;    # indirect relative
+    $tree set $node it {} ;   # indir_type
+    $tree set $node ioi 0 ;   # indirect offset invert
+    $tree set $node iir 0 ;   # indirect indirect relative 
+    $tree set $node ioo + ;   # indirect_offset_op
+    $tree set $node io 0 ;    # indirect offset
+    advance w1 char
+    if {$char eq {&}} {
+	advance w1 char
+	$tree set $node rel 1
+    }
+
+    if {$char eq {(}} {
+	$tree set $node ind 1
+
+	if {[advance w1] eq {&}} {
+	    $tree set $node ir 1
+	} else {
+	    rewind 1
+	}
+	$tree set $node o [parseint $tree $node]
+
+	# $char is used below if it's not "."
+	if {[advance w1 char] in {. ,}} {
+	    advance w1 it
+	    if {[dict exists $indir_typemap $it]} {
+		set it [
+		    dict get $indir_typemap $it]
+		    if {$char eq {.}} {
+			set it u$it
+		    } 
+	    } else {
+		parseerror {bad indirect offset type}
+	    }
+	    advance w1 char
+	} else {
+	    set it long
+	}
+	$tree set $node it $it
+
+
+	# The C implementation does this, so we will , too .
+	if {$char eq {~}} {
+	    advance w1 char
+	    $tree set $node ioi 1
+	}
+
+	if {$char in $offsetopts} {
+	    $tree set $node ioo $char
+	    if {[advance w1] in {(}} {
+		$tree set $node iir 1
+	    } else {
+		rewind 1
+	    }
+	    $tree set $node io [parseint $tree $node]
+	    if {[$tree get $node iir]} {
+		if {[advance w1] ne {)}} {
+		    parseerror {
+			expected closing parenthesis for indirect indirect offset offset
+		    }
+		}
+	    }
+	    advance w1 char
+	}
+
+	if {$char ne {)}} {
+	    parseerror {
+		expected close parenthesis for indirect offset 
+	    }
+	}
+    } else {
+	rewind 1
+	$tree set $node o [parseint $tree $node]
+    }
+}
+
+
+proc ::fileutil::magic::cfront::parseoffsetmod {tree node} {
+    advance w1 char
+    if {$char eq {~}} {
+	$tree set $node offset_invert 1
+	advance w1 char
+    } else {
+	$tree set $node offset_invert 0
+    }
+    switch $char {
+	+ - - - * - / - % - & - | - ^ {
+	    $tree set $node offset_mod_op $char
+	    $tree set $node offset_mod [parseint $tree $node]
+	}
+	default {
+	    $tree set $node offset_mod_op {}
+	    $tree set $node offset_mod {}
+	    rewind 1
+	    # no offset modifier
+	}
+    }
+}
+
+
+proc ::fileutil::magic::cfront::parsemsg {tree node} {
+    advance w
+    set line [$tree get $node line]
+    set cursor [$tree get $node cursor]
+
+    ##leave \b in the message for [emit] to parse
+    #regexp -start $cursor {\A(\b|\\b)?(.*)$} $line match b line
+    #if {$b ne {}} {
+    #    $tree set $node space 0
+    #} else {
+    #    $tree set $node space 1
+    #}
+
+    set line [string range $line $cursor end]
+
+    $tree set $node desc $line
+}
+
+
+# process a magic file
+proc ::fileutil::magic::cfront::process {tree file {maxlevel 10000}} {
+    variable level	;# level of line
+    variable linenum	;# line number
+
+    set level  0
+
+    set linenum 0
+    set records {}
+    set rejected 0
+    set script {}
+    if {[$tree keyexists root files]} {
+	set files [$tree get root files]
+    } else {
+	set files {}
+    }
+    set fileidx [llength $files] 
+    if {$file in $files} {
+	return -code error [list {already processed file} $file]
+    }
+    lappend files $file
+    $tree set root files $files
+    $tree set root level -1
+    set node root
+    ::fileutil::foreachLine line $file {
+   	incr linenum
+	# Only trim the left side . White space on the the right side could be
+	# part of an escape sequence , and trimming would munge it .
+   	set line [string trimleft $line]
+   	if {[string index $line 0] eq {#}} {
+   	    continue	;# skip comments
+   	} elseif {$line eq {}} {
+   	    continue	;# skip blank lines
+   	} else {
+   	    # parse line
+	    if {[regexp {^\s*!:(\S+)\s*(.*?)\s*$} $line -> extname extdata]} {
+		if {$rejected} {
+		    continue
+		}
+		if {$node eq {root}} {
+		    return -code error [list {malformed magic file}]
+		}
+		$tree set $node ext_$extname $extdata
+	    } else {
+		# calculate the line's level
+		set unlevel [string trimleft $line >]
+		set level   [expr {[string length $line] - [string length $unlevel]}]
+		set line $unlevel
+		if {$level > $maxlevel} {
+		    return -code continue "Skip - too high a level"
+		}
+		if {$level > 0} {
+		    if {$rejected} {
+			continue
+		    }
+		    while {[$tree keyexists $node level] && [$tree get $node level] >= $level} {
+			set node [$tree parent $node]
+		    }
+		    if {$level > [$tree get $node level]+1} {
+			return -code error [
+			    list {level more than one greater than parent level} \
+				file $file linenum $linenum line $line]
+		    }
+		    set node [$tree insert $node end]
+		} else {
+		    set rejected 0
+		    set node [$tree insert root end]
+		    set node0 $node
+		}
+		$tree set $node file $fileidx
+		$tree set $node line $line
+		$tree set $node linenum $linenum
+		$tree set $node level $level
+		if {[catch {parseline $tree $node} cres copts]} {
+		    set errorcode [dict get $copts -errorcode]
+		    if {[lindex $errorcode 0] eq {fumagic} && [
+			lindex $errorcode 1] eq {parse error}} {
+			# don't delete the full node because the parts that
+			# have been parsed so far might be useful
+			#$tree delete $node0
+			$tree delete $node
+			set rejected 1
+			puts stderr [list Rejected {bad parse}]
+			puts stderr [dict get $copts -errorinfo]
+			continue	;# skip erroring lines
+		    } else {
+			return -options $copts $cres
+		    }
+
+		}
+	    }
+   	}
+
+   	# collect some summaries
+   	::fileutil::magic::cfront::Debug {
+   	    variable types
+   	    set types($type) [$tree get $node type]
+   	    variable quals
+   	    set quals($qual) [$tree get $node qual]
+   	}
+
+   	#puts $linenum level:$level offset:$offset type:$type
+	#puts qual:$qual compare:$compare val:'$val' desc:'$desc'
+
+    }
+}
+
+
+proc ::fileutil::magic::cfront::rewind len {
+    upvar node node tree tree
+    set cursor [$tree get $node cursor]
+    incr cursor -$len
+    $tree set $node cursor $cursor
+}
+
+
+proc ::fileutil::magic::cfront::tclescape char {
+	if {[string is space $char] || $char in [
+	    list \# \{ \} \[  \] \" \$ \; \n]} {
+	    append val \\
+	}
+	append val $char
+	return $val
+}
+
+
+proc ::fileutil::magic::cfront::tree {} {
+    set tree [::struct::tree]
+
+    $tree set root path ""
+    $tree set root otype Root
+    $tree set root type root
+    $tree set root named {}
+    $tree set root message "unknown"
+    return $tree
+}
+
+
+# ### ### ### ######### ######### #########
+## Internal, debugging.
+
+if {!$::fileutil::magic::cfront::debug} {
+    # This procedure definition is optimized out of using code by the
+    # core bcc. It knows that neither argument checks are required,
+    # nor is anything done. So neither results, nor errors are
+    # possible, a true no-operation.
+    proc ::fileutil::magic::cfront::Debug {args} {}
+
+} else {
+    proc ::fileutil::magic::cfront::Debug {script} {
+	# Run the commands in the debug script. This usually generates
+	# some output. The uplevel is required to ensure the proper
+	# resolution of all variables found in the script.
+	uplevel 1 $script
+	return
+    }
+}
+
+#set script [magic::compile {} /usr/share/misc/file/magic]
+#puts "\# types:[array names magic::types]"
+#puts "\# quals:[array names magic::quals]"
+#puts "Script: $script"
+
+# ### ### ### ######### ######### #########
+## Ready for use.
+# EOF
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/cgen.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/cgen.tcl
new file mode 100644
index 00000000..491c2508
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/cgen.tcl
@@ -0,0 +1,705 @@
+# cgen.tcl --
+#
+#	Generator core for compiler of magic(5) files into recognizers
+#	based on the 'rtcore'.
+#
+# Copyright (c) 2016      Poor Yorick     <tk.tcl.core.tcllib@pooryorick.com>
+# Copyright (c) 2004-2005 Colin McCormack <coldstore@users.sourceforge.net>
+# Copyright (c) 2005      Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: cgen.tcl,v 1.7 2007/06/23 03:39:34 andreas_kupries Exp $
+
+#####
+#
+# "mime type recognition in pure tcl"
+# http://wiki.tcl.tk/12526
+#
+# Tcl code harvested on:  10 Feb 2005, 04:06 GMT
+# Wiki page last updated: ???
+#
+#####
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.4
+package require fileutil::magic::rt ; # Runtime core, for Access to the typemap
+package require struct::list        ; # Our data structures.
+
+package provide fileutil::magic::cgen 1.3.0
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+namespace eval ::fileutil::magic {
+    namespace export *
+}
+namespace eval ::fileutil::magic::cgen {
+    namespace ensemble create
+    namespace export *
+    # Import the runtime typemap into our scope.
+    variable ::fileutil::magic::rt::typemap
+
+    # The tree most operations use for their work.
+    variable tree {}
+
+    # Generator data structure.
+    variable regions
+
+    # Export the API
+    namespace export 2tree treedump treegen
+
+   # Assumption : the parser folds the test inversion operator into equality and
+   # inequality operators .
+    variable offsetskey {
+	type o rel ind ir it ioi ioo iir io compinvert mod mand
+    }
+
+    variable indent {}
+    variable indents {}
+    variable innamed 0
+}
+
+
+# Optimisations:
+
+# reorder tests according to expected or observed frequency this
+# conflicts with reduction in strength optimisations.
+
+# Rewriting within a level will require pulling apart the list of
+# tests at that level and reordering them.  There is an inconsistency
+# between handling at 0-level and deeper level - this has to be
+# removed or justified.
+
+# Hypothetically, every test at the same level should be mutually
+# exclusive, but this is not given, and should be detected.  If true,
+# this allows reduction in strength to switch on Numeric tests
+
+# reduce Numeric tests at the same level to switches
+#
+# - first pass through clauses at same level to categorise as
+#   variant values over same test (type and offset).
+
+# work out some way to cache String comparisons
+
+# Reduce seek/reads for String comparisons at same level:
+#
+# - first pass through clauses at same level to determine string ranges.
+#
+# - String tests at same level over overlapping ranges can be
+#   written as sub-string comparisons over the maximum range
+#   this saves re-reading the same string from file.
+#
+# - common prefix strings will have to be guarded against, by
+#   sorting string values, then sorting the tests in reverse length order.
+
+
+proc ::fileutil::magic::cgen::LessIndent {} {
+    variable indent
+    variable indents
+    set size [expr {[string length $indent] - 1}]
+    if {[dict exists $indents $size]} {
+	set indent [dict get $indents $size]
+    } else {
+	set indent [string repeat \t $size]
+	dict set indents $size $indent
+    }
+    return
+}
+
+proc ::fileutil::magic::cgen::MoreIndent {} {
+    variable indent
+    variable indents
+    set size [expr {[string length $indent] + 1}]
+    if {[dict exists $indents $size]} {
+        set indent [dict get $indents $size]
+    } else {
+        set indent [string repeat \t $size]
+        dict set indents $size $indent
+    }
+    return
+}
+
+
+proc ::fileutil::magic::cgen::path {tree} {
+    # Annotates the tree. In each node we store the path from the root
+    # to this node, as list of nodes, with the current node the last
+    # element. The root node is never stored in the path.
+
+    $tree set root path {}
+    foreach child [$tree children root] {
+   	$tree walk $child -type dfs node {
+   	    set path [$tree get [$tree parent $node] path]
+   	    lappend path [$tree index $node]
+   	    $tree set $node path $path
+   	}
+    }
+    return
+}
+
+proc ::fileutil::magic::cgen::tree_el {tree node} {
+    set parent [$tree parent $node]
+    if {[$tree keyexists $parent path]} {
+	set path [$tree get $parent path]
+    } else {
+	set path {} 
+    }
+    lappend path [$tree index $node]
+    $tree set $node path $path
+
+    foreach name {type} {
+	set $name [$tree get $node $name]
+    }
+
+    puts stderr [list frlaalm [$tree getall $node]]
+
+    # Recursively creates and annotates a node for the specified
+    # tests, and its sub-tests (args).
+
+
+    # generate a proc call type for the type, Numeric or String
+    variable ::fileutil::magic::rt::typemap
+
+    switch -glob -- $type {
+   	*byte* -
+	*double* -
+	*float* -
+   	*short* -
+   	*long* -
+	*quad* -
+   	*date* {
+   	    $tree set $node otype N
+   	}
+   	clear - search - regex - *string* {
+   	    $tree set $node otype S
+   	}
+	name {
+	    $tree set $node otype A
+	}
+	use {
+	    $tree set $node otype U
+	}
+	default {
+	    $tree set $node otype D
+	}
+	indirect {
+	    $tree set $node otype T
+	}
+   	default {
+   	    puts stderr "Unknown type: '$type'"
+	    $tree set $node otype Unknown
+   	}
+    }
+
+    # Stores the type determined above, and the arguments into
+    # attributes of the new node.
+
+    # now add children
+    foreach el [$tree children $node] {
+	tree_el $tree $el
+    }
+    return
+}
+
+proc ::fileutil::magic::cgen::2tree {tree} {
+
+    foreach child [$tree children root] {
+	tree_el $tree $child
+    }
+    optNum $tree root
+    #optStr $tree root
+    puts stderr "Script contains [llength [$tree children root]] discriminators"
+    path $tree
+
+    return $tree
+}
+
+proc ::fileutil::magic::cgen::isStr {tree node} {
+    return [expr {"S" eq [$tree get $node otype]}]
+}
+
+proc ::fileutil::magic::cgen::sortRegion {r1 r2} {
+    set cmp 0
+    if {[catch {
+   	if {[string match (*) $r1] || [string match (*) $r2]} {
+   	    set cmp [string compare $r1 $r2]
+   	} else {
+   	    set cmp [expr {[lindex $r1 0] - [lindex $r2 0]}]
+   	    if {!$cmp} {
+   		set cmp 0
+   		set cmp [expr {[lindex $r1 1] - [lindex $r2 1]}]
+   	    }
+   	}
+    } result]} {
+   	set cmp [string compare $r1 $r2]
+    }
+    return $cmp
+}
+
+proc ::fileutil::magic::cgen::optStr {tree node} {
+    variable regions
+    catch {unset regions}
+    array set regions {}
+
+    optStr1 $tree $node
+
+    puts stderr "Regions [array statistics regions]"
+    foreach region [lsort \
+	    -index   0 \
+	    -command ::fileutil::magic::cgen::sortRegion \
+	    [array name regions]] {
+   	puts "$region - $regions($region)"
+    }
+}
+
+proc ::fileutil::magic::cgen::optStr1 {tree node} {
+    variable regions
+
+    # traverse each numeric element of this node's children,
+    # categorising them
+
+    set kids [$tree children $node]
+    foreach child $kids {
+   	optStr1 $tree $child
+    }
+
+    set strings [$tree children $node filter ::fileutil::magic::cgen::isStr]
+    #puts stderr "optstr: $node: $strings"
+
+    foreach el $strings {
+   	#if {[$tree get $el otype] eq "String"} {puts "[$tree getall $el] - [string length [$tree get $el val]]"}
+	if {[$tree get $el comp] eq "x"} {
+	    continue
+	}
+
+	set o [$tree get $el o]
+	set len    [string length [$tree get $el val]]
+	lappend regions([list $o $len]) $el
+    }
+}
+
+proc ::fileutil::magic::cgen::isNum {tree node} {
+    return [expr {"N" eq [$tree get $node otype]}]
+}
+
+proc ::fileutil::magic::cgen::switchNSort {tree n1 n2} {
+
+    # deal with the fact that [lsort] barfs if the result is larger than 32
+    # bits
+    set val1 [$tree get $n1 val]
+    set val2 [$tree get $n2 val]
+    expr {$val1 > $val2 ? 1 : $val1 < $val2 ? -1 : 0}
+}
+
+proc ::fileutil::magic::cgen::optNum {tree node} {
+    variable offsetskey
+    array set offsets {}
+
+    # traverse each numeric element of this node's children,
+    # categorising them
+
+    set kids [$tree children $node]
+    foreach child $kids {
+	optNum $tree $child
+    }
+
+    set numerics [$tree children $node filter ::fileutil::magic::cgen::isNum]
+    #puts stderr "optNum: $node: $numerics"
+    if {[llength $numerics] < 2} {
+	return
+    }
+
+    foreach el $numerics {
+	if {[$tree get $el comp] ne {==}} {
+	    continue
+	}
+	set key {}
+	foreach name $offsetskey {
+	    lappend key [$tree get $el $name]
+	}
+	lappend offsets([join $key ,]) $el
+    }
+
+    #puts "Offset: stderr [array get offsets]"
+    foreach {match nodes} [array get offsets] {
+	if {[llength $nodes] < 2} {
+	    continue
+	}
+
+	catch {unset matcher}
+	foreach n $nodes {
+	    set nv [expr [$tree get $n val]]
+	    if {[info exists matcher($nv)]} {
+		puts stderr "*====================================="
+		puts stderr "* Node         <[$tree getall $n]>"
+		puts stderr "* clashes with <[$tree getall $matcher($nv)]>"
+		puts stderr "*====================================="
+	    } else {
+		set matcher($nv) $n
+	    }
+	}
+
+	foreach $offsetskey [split $match ,] break
+	set switch [$tree insert $node [$tree index [lindex $nodes 0]]]
+	$tree set $switch otype   Switch
+	$tree set $switch desc $match
+	foreach name $offsetskey {
+	    $tree set $switch $name [set $name]
+	}
+
+	set nodes [lsort -command [list ::fileutil::magic::cgen::switchNSort $tree] $nodes]
+
+	eval [linsert $nodes 0 $tree move $switch end]
+	# 8.5 # $tree move $switch end {*}$nodes
+	set     path [$tree get [$tree parent $switch] path]
+	lappend path [$tree index $switch]
+	$tree set $switch path $path
+
+	set level [$tree get [$tree parent $switch] level]
+	$tree set $switch level [expr {$level+1}]
+    }
+}
+
+
+# Useful when debugging
+proc ::fileutil::magic::cgen::stack {tree node} {
+    set res {}
+    set files [$tree get root files]
+    while 1 {
+	set s [dict create \
+	    file [lindex $files [$tree get $node file]] \
+	    linenum [$tree get $node linenum]]
+	if {[$tree keyexists $node origin]} {
+	    set origin [$tree get $node origin]
+	    dict set s origin [dict create \
+		name [$tree get $origin val] \
+		file [lindex $files [$tree get $origin file]] \
+		linenum [$tree get $origin linenum]]
+	}
+	set res [linsert $res 0 $s]
+	set node [$tree parent $node]
+	if {$node eq {root}} {
+	    break
+	}
+    }
+    return $res
+}
+
+proc ::fileutil::magic::cgen::treedump {tree} {
+    set result ""
+    $tree walk root -type dfs node {
+	set path  [$tree get $node path]
+	set depth [llength $path]
+
+	append result [string repeat "  " $depth] [list $path] ": " [$tree get $node type]:
+
+	if {[$tree keyexists $node o]} {
+	    append result " ,O|[$tree get $node o]|"
+
+	    set x {}
+	    foreach v {ind rel base itype iop ioperand idelta} {lappend x [$tree get $node $v]}
+	    append result "=<[join $x !]>"
+	}
+	if {[$tree keyexists $node qual]} {
+	    set q [$tree get $node qual]
+	    if {$q ne ""} {
+		append result " ,q/$q/"
+	    }
+	}
+
+	if {[$tree keyexists $node comp]} {
+	    append result " " C([$tree get $node comp])
+	}
+	if {[$tree keyexists $node val]} {
+	    append result " " V([$tree get $node val])
+	}
+
+	if {[$tree keyexists $node otype]} {
+	    append result " " [$tree get $node otype]
+	}
+
+	if {$depth == 1} {
+	    set msg [$tree get $node desc]
+	    set n $node
+	    while {($n != {}) && ($msg == "")} {
+		set n [lindex [$tree children $n] 0]
+		if {$n != {}} {
+		    set msg [$tree get $n desc]
+		}
+	    }
+	    append result " " ( $msg )
+	    if {[$tree keyexists $node file]} {
+		append result " - " [$tree get $node file]
+	    }
+	}
+
+	#append result " <" [$tree getall $node] >
+	append result \n
+    }
+    return $result
+}
+
+proc ::fileutil::magic::cgen::treegen {tree node} {
+    variable indent
+    variable innamed
+    variable ::fileutil::magic::rt::typemap
+
+    set result {} 
+    set otype [$tree get $node otype]
+    set level [$tree get $node level]
+
+    # Generate code for each node per its type.
+
+    switch $otype {
+	A {
+	    incr innamed
+	    try  {
+		set file [$tree get $node file]
+		set val [$tree get $node val]
+		if {[dict exists named $file$val]} {
+		    return -code error [list {name already exists} $file $val]
+		}
+		set aresult {}
+		foreach child [$tree children $node] {
+		    lappend aresult [treegen $tree $child]
+		}
+		set named [$tree get root named]
+		dict set named $file $val [join $aresult \n]
+		$tree set root named $named
+		return
+	    } finally {
+		incr innamed -1
+	    }
+	}
+	U {
+	    set file [$tree get $node file]
+	    set val [$tree get $node val]
+	    # generateOffset is expanded via subsitution
+	    append result "${indent}U [list $file] [list $val] [
+		GenerateOffset $tree $node]\n" 
+	}
+	N - S - D {
+	    set names {type mod mand testinvert compinvert comp val desc path}
+	    foreach name $names {
+		set $name [$tree get $node $name]
+	    }
+
+	    set o [GenerateOffset $tree $node]
+
+	    if {$val eq {}} {
+		# If the value is the empty string, armor it.  Otherwise, it's
+		# already been armored.
+		set val [list $val]
+	    }
+
+	    switch $otype {
+		N {
+		    set type [list N $type]
+		    # $type and $o are expanded via substitution 
+		    append result "${indent}if \{\[$type $o [list $testinvert] [
+			list $compinvert] [list $mod] [list $mand] [
+			list $comp] $val\]\} \{\n"
+			MoreIndent
+			append result "${indent}>\n"
+		}
+		S {
+		    switch $comp {
+			== {set comp eq}
+			!= {set comp ne}
+		    }
+
+		    set type [list S $type]
+
+		    append result "${indent}if \{\[$type $o [list $testinvert] [
+			list $mod] [list $mand] [list $comp] $val\]\} \{\n"
+			MoreIndent
+			append result "${indent}>\n"
+		}
+
+		D {
+		    set type [list D]
+		    append result "${indent}if \{\[$type $o]\} \{\n" 
+			MoreIndent
+			append result "${indent}>\n"
+
+		}
+	    }
+
+	    MoreIndent
+
+		if {[$tree isleaf $node] && $desc ne {}} {
+		    append result "${indent}emit [list $desc]\n"
+		} else {
+		    if {$desc ne {}} {
+			append result "${indent}emit [list $desc]\n"
+		    }
+		    foreach child [$tree children $node] {
+			append result [treegen $tree $child]\n
+		    }
+		    #append result "\nreturn \$result"
+		}
+
+		if {[$tree keyexists $node ext_mime]} {
+		    append result "${indent}mime [list [$tree get $node ext_mime]]\n"
+		}
+
+		if {[$tree keyexists $node ext_ext]} {
+		    append result "${indent}ext [list [$tree get $node ext_ext]]\n"
+		}
+
+		if {[$tree keyexists $node ext_strength]} {
+		    append result "${indent}strength [list [$tree get $node ext_strength]]\n"
+		}
+
+	    LessIndent
+
+	    append result ${indent}<\n
+	    LessIndent
+	    append result ${indent}\}\n
+	}
+	T {
+	    set desc [$tree get $node desc]
+	    if {$desc ne {}} {
+		append result "${indent}emit [list $desc]\n"
+	    }
+	    set o [GenerateOffset $tree $node]
+	    set mod [$tree get $node mod]
+	    append result "${indent}T $o [list $mod]\n"
+	}
+	Root {
+	    foreach child [$tree children $node] {
+		lappend result [treegen $tree $child]
+		if {[lindex $result end] eq {}} {
+		    set result [lreplace $result[set result {}] end end]
+		}
+	    }
+	}
+	Switch {
+	    set names {o type compinvert mod mand}
+	    foreach name $names {
+		set $name [$tree get $node $name]
+	    }
+	    set o [GenerateOffset $tree $node]
+
+	    set fetch Nv
+
+	    append fetch " $type $o [list $compinvert] [list $mod] [list $mand]"
+	    append result "${indent}switch \[$fetch\] \{\n"
+
+	    MoreIndent
+
+		set scan [lindex $typemap($type) 1]
+
+		foreach child [lsort -command [
+		    list ::fileutil::magic::cgen::switchNSort $tree] [
+			$tree children $node]] {
+
+		    # See ::fileutil::magic::rt::rtscan
+		    if {$scan eq {me}} {
+			set scan I
+		    }
+
+		    set val [$tree get $child val]
+
+		    if {[info exists lastval] && $lastval != $val} {
+			LessIndent
+			append result "${indent}\}\n"
+		    } 
+
+		    if {![info exists lastval] || $lastval != $val} {
+			append result "${indent}$val \{\n"
+			MoreIndent
+		    }
+
+		    append result "${indent}>\n"
+
+		    MoreIndent
+
+			set desc [$tree get $child desc]
+
+			# emit, mime, and ext come first so that they are
+			# picked up when child nodes produce results
+
+			if {$desc ne {}} {
+			    append result "${indent}emit [list $desc]\n"
+			}
+
+			if {[$tree keyexists $child ext_mime]} {
+			    append result "${indent}mime [list [
+				$tree get $child ext_mime]]\n"
+			}
+
+			if {[$tree keyexists $child ext_ext]} {
+			    append result "${indent}ext [list [
+				$tree get $child ext_ext]]\n"
+			}
+
+			if {![$tree isleaf $child]} {
+			    foreach grandchild [$tree children $child] {
+				append result [treegen $tree $grandchild]\n
+			    }
+			}
+		    LessIndent
+
+		    append result "${indent}<\n"
+
+		    set lastval $val
+		}
+
+	    LessIndent
+	    append result "${indent}\}\n"
+
+	    LessIndent
+	    append result "${indent}\}\n"
+	}
+    }
+    return $result
+}
+
+proc ::fileutil::magic::cgen::GenerateOffset {tree node} {
+    # Examples:
+    # direct absolute:     45      -> 45
+    # direct relative:    &45      -> [R 45]
+    # indirect absolute:  (45.s+1) -> [I 45 s + 0 1]
+    # indirect absolute (indirect offset):  (45.s+(1)) -> [I 45 s + 1 1]
+    # relative indirect absolute:  &(45.s+1) -> [R [I 45 s + 0 1]]
+    # relative indirect absolute (indirect offset):  &(45.s+(1)) -> [R [I 45 s + 1 1]]
+    # indirect relative: (&45.s+1) -> [I [R 45] s op 0 1]
+    # relative indirect relative: &(&45.s+1) -> [R [I [R 45] s + 0 1]]
+    # relative indirect relative: &(&45.s+(1)) -> [R [I [R 45] s + 1 1]]
+
+    variable innamed
+
+    foreach v {o rel ind ir it ioi iir ioo io} {
+	set $v [$tree get $node $v]
+    }
+
+    #foreach v {ind rel base itype iop ioperand iindir idelta} {
+    #    set $v [$tree get $node $v]
+    #}
+
+    if {$ind} {
+	if {$ir} {set o "\[R $o]"}
+	set o "\[I $o [list $it] [list $ioi] [list $ioo] [list $iir] [list $io]\]"
+    }
+
+    # spec
+    #   named instance direct offsets are relative to the offset of the
+    #   previous matched entry
+    if {$innamed} {
+	set o "\[O $o]"
+    }
+
+    if {$rel} {
+	set o "\[R $o\]"
+    }
+    
+    return $o
+}
+
+# ### ### ### ######### ######### #########
+## Ready for use.
+# EOF
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/filetypes.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/filetypes.tcl
new file mode 100644
index 00000000..cc83ebe4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/filetypes.tcl
@@ -0,0 +1,85040 @@
+# filetypes.tcl --
+#
+#	Tcl based file type recognizer using the runtime core and
+#	generated from /usr/share/misc/magic.mime. Limited output,
+#	but only mime-types, i.e. standardized.
+#
+# Copyright (c) 2016-2017 Poor Yorick     <tk.tcl.core.tcllib@pooryorick.com>
+# Copyright (c) 2004-2005 Colin McCormack <coldstore@users.sourceforge.net>
+# Copyright (c) 2005-2006 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+#####
+#
+# "mime type discriminator"
+# http://wiki.tcl.tk/12537
+#
+# Tcl code harvested on:  10 Feb 2005, 04:16 GMT
+# Wiki page last updated: ???
+#
+#####
+
+# ### ### ### ######### ######### #########
+## Requirements.
+
+package require Tcl 8.6
+package require fileutil::magic::rt 3-
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+namespace eval ::fileutil::magic::filetype {
+    namespace import ::fileutil::magic::rt::*
+}
+
+proc ::fileutil::magic::filetype file {
+    namespace upvar filetype named named tests tests
+    if {![file exists $file]} {
+	return -code error "file not found: \"$file\""
+    }
+    if {[file isdirectory $file]} {
+	return [list directory application/x-directory {}]
+    }
+
+    set chan [open $file]
+    try {
+	set matches {}
+	file stat $file stats
+	set finfo [array get stats]
+	dict set finfo name $file
+	set ft [rt::new $finfo $chan $named [
+	    list [namespace which filetype::analyze]]]
+	set class [$ft]
+	while 1 {
+	    lassign [$ft] weight result mimetype ext 
+	    dict update matches $weight weight {
+		lappend weight [list $result $mimetype $ext]
+	    }
+	}
+    } finally {
+	close $chan
+    }
+
+    set keys [dict keys $matches]
+    if {[llength $keys]} {
+	set res [lindex [dict get $matches [::tcl::mathfunc::max {*}$keys]] end]
+	lassign $res result mimetype ext
+	foreach item $result {
+	    if {$item ne {}} {
+		return $res
+	    }
+	}
+	if {$mimtetype ne {} || $ext ne {}} {
+	    return $res
+	}
+    }
+    return [list $class {} {}]
+}
+
+
+package provide fileutil::magic::filetype 2.0.1
+
+
+namespace eval ::fileutil::magic::filetype {
+# The actual recognizer is the command below.
+
+##
+## -- Do not edit after this line !
+## -- ** BEGIN GENERATED CODE ** --
+
+variable named {
+	7
+		{PIT-entry {if {[N ulequad [O 0] 0 0 & 18446744060824649724 == 0]} {
+		>
+			if {[N ubyte [O 36] 0 0 {} {} != 0]} {
+				>
+					if {[S string [O 36] 0 {} {} > \0]} {
+						>
+							emit %-.32s
+						<
+					}
+	
+					if {[N ulelong [O 12] 0 0 & 2 == 2]} {
+						>
+							emit {\b+RW}
+						<
+					}
+	
+					if {[N ulelong [O 8] 0 0 {} {} x {}]} {
+						>
+							emit (0x%x)
+						<
+					}
+	
+					if {[S string [O 68] 0 {} {} > \0]} {
+						>
+							emit {"%-.64s"}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	}}
+	12
+		{apple-driver-map {if {[N ubequad [O 0] 0 0 {} {} != 0]} {
+		>
+			if {[N ubelong [O 0] 0 0 {} {} x {}]} {
+				>
+					emit {\b, driver start block %u}
+				<
+			}
+	
+			if {[N ubeshort [O 4] 0 0 {} {} x {}]} {
+				>
+					emit {\b, size %u}
+				<
+			}
+	
+			if {[N ubeshort [O 6] 0 0 {} {} x {}]} {
+				>
+					emit {\b, type 0x%x}
+				<
+			}
+	
+		<
+	}
+	} apple-apm {if {[N belong [O 0] 0 0 {} {} == 1347223552]} {
+		>
+			emit {Apple Partition Map}
+			if {[N ubelong [O 4] 0 0 {} {} x {}]} {
+				>
+					emit {\b, map block count %u}
+				<
+			}
+	
+			if {[N ubelong [O 8] 0 0 {} {} x {}]} {
+				>
+					emit {\b, start block %u}
+				<
+			}
+	
+			if {[N ubelong [O 12] 0 0 {} {} x {}]} {
+				>
+					emit {\b, block count %u}
+				<
+			}
+	
+			if {[S string [O 16] 0 {} {} > 0]} {
+				>
+					emit {\b, name %s}
+				<
+			}
+	
+			if {[S string [O 48] 0 {} {} > 0]} {
+				>
+					emit {\b, type %s}
+				<
+			}
+	
+			if {[S string [O 120] 0 {} {} > 0]} {
+				>
+					emit {\b, processor %s}
+				<
+			}
+	
+			if {[S string [O 136] 0 {} {} > 0]} {
+				>
+					emit {\b, boot arguments %s}
+				<
+			}
+	
+			if {[N belong [O 88] 0 0 {} {} & 1]} {
+				>
+					emit {\b, valid}
+				<
+			}
+	
+			if {[N belong [O 88] 0 0 {} {} & 2]} {
+				>
+					emit {\b, allocated}
+				<
+			}
+	
+			if {[N belong [O 88] 0 0 {} {} & 4]} {
+				>
+					emit {\b, in use}
+				<
+			}
+	
+			if {[N belong [O 88] 0 0 {} {} & 8]} {
+				>
+					emit {\b, has boot info}
+				<
+			}
+	
+			if {[N belong [O 88] 0 0 {} {} & 16]} {
+				>
+					emit {\b, readable}
+				<
+			}
+	
+			if {[N belong [O 88] 0 0 {} {} & 32]} {
+				>
+					emit {\b, writable}
+				<
+			}
+	
+			if {[N belong [O 88] 0 0 {} {} & 64]} {
+				>
+					emit {\b, pic boot code}
+				<
+			}
+	
+			if {[N belong [O 88] 0 0 {} {} & 128]} {
+				>
+					emit {\b, chain compatible driver}
+				<
+			}
+	
+			if {[N belong [O 88] 0 0 {} {} & 256]} {
+				>
+					emit {\b, real driver}
+				<
+			}
+	
+			if {[N belong [O 88] 0 0 {} {} & 512]} {
+				>
+					emit {\b, chain driver}
+				<
+			}
+	
+			if {[N ubelong [O 88] 0 0 {} {} & 1073741824]} {
+				>
+					emit {\b, mount at startup}
+				<
+			}
+	
+			if {[N ubelong [O 88] 0 0 {} {} & 2147483648]} {
+				>
+					emit {\b, is the startup partition}
+				<
+			}
+	
+		<
+	}
+	} appleworks {switch [Nv belong [O 0] 0 & 16777215] {
+		34819 {
+			>
+				emit {ClarisWorks CWK Document}
+			<
+		}
+		516352 {
+			>
+				emit {AppleWorks CWK Document}
+			<
+		}
+	}
+	
+	if {[D [O 0]]} {
+		>
+			if {[N belong [O 0] 0 0 {} {} x {}]} {
+				>
+					emit {AppleWorks/ClarisWorks CWK Document}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N byte [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {\b, version %d}
+		<
+	}
+	
+	if {[N beshort [O 30] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %d}
+		<
+	}
+	
+	if {[N beshort [O 32] 0 0 {} {} x {}]} {
+		>
+			emit {\bx%d}
+			ext cwk
+		<
+	}
+	}}
+	15
+		{apt-cache-64bit-be {if {[N beshort [O 12] 0 0 {} {} == 1]} {
+		>
+			emit {\b, dirty}
+		<
+	}
+	
+	if {[N bequad [O 40] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %llu packages}
+		<
+	}
+	
+	if {[N bequad [O 48] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %llu versions}
+		<
+	}
+	} apt-cache-32bit-be {if {[N beshort [O 8] 0 0 {} {} == 1]} {
+		>
+			emit {\b, dirty}
+		<
+	}
+	
+	if {[N belong [O 40] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %u packages}
+		<
+	}
+	
+	if {[N belong [O 44] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %u versions}
+		<
+	}
+	} apt-cache-be {if {[N byte [O 6] 0 0 {} {} == 1]} {
+		>
+			emit {\b, dirty}
+		<
+	}
+	
+	if {[N belong [O 24] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %u packages}
+		<
+	}
+	
+	if {[N belong [O 28] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %u versions}
+		<
+	}
+	}}
+	16
+		{tar-file {if {[S string [O 257] 0 {} {} ne ustar]} {
+		>
+			if {[N ulong [O 257] 0 0 {} {} == 0]} {
+				>
+					switch [Nv ubyte [O 156] 0 {} {}] {
+						76 {
+							>
+								emit {GNU tar archive}
+								mime application/x-gtar
+								ext tar/gtar
+							<
+						}
+						77 {
+							>
+								emit {GNU tar archive}
+								mime application/x-gtar
+								ext tar/gtar
+							<
+						}
+						86 {
+							>
+								emit {GNU tar archive}
+								mime application/x-gtar
+								ext tar/gtar
+							<
+						}
+					}
+	
+					if {[D [O 156]]} {
+						>
+							emit {tar archive (V7)}
+							mime application/x-tar
+							ext tar
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulong [O 257] 0 0 {} {} != 0]} {
+				>
+					emit {tar archive (old)}
+					mime application/x-tar
+					ext tar
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string [O 257] 0 {} {} eq ustar]} {
+		>
+			switch [Nv ubelong [O 261] 0 {} {}] {
+				1912602624 {
+					>
+						emit {tar archive (ustar)}
+						mime application/x-ustar
+						ext tar/ustar
+					<
+				}
+				1912614960 {
+					>
+						emit POSIX
+						switch [Nv ubyte [O 156] 0 {} {}] {
+							103 {
+								>
+									emit {\b.1-2001}
+								<
+							}
+							120 {
+								>
+									emit {\b.1-2001}
+								<
+							}
+						}
+	
+						if {[N ubyte [O 156] 0 0 {} {} x {}]} {
+							>
+								emit {tar archive}
+								mime application/x-ustar
+								ext tar/ustar
+							<
+						}
+	
+					<
+				}
+				1914707968 {
+					>
+						emit {POSIX tar archive (GNU)}
+						mime application/x-gtar
+						ext tar/gtar
+					<
+				}
+			}
+	
+			if {[D [O 261]]} {
+				>
+					emit {tar archive (unknown ustar)}
+					mime application/x-ustar
+					ext tar/ustar
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubyte [O 156] 0 0 {} {} x {}]} {
+		>
+			switch [Nv ubyte [O 156] 0 {} {}] {
+				0 {
+					>
+						emit {\b, file}
+					<
+				}
+				48 {
+					>
+						emit {\b, file}
+					<
+				}
+				49 {
+					>
+						emit {\b, hard link}
+					<
+				}
+				50 {
+					>
+						emit {\b, symlink}
+					<
+				}
+				51 {
+					>
+						emit {\b, char device}
+					<
+				}
+				52 {
+					>
+						emit {\b, block device}
+					<
+				}
+				53 {
+					>
+						emit {\b, directory}
+					<
+				}
+				54 {
+					>
+						emit {\b, fifo}
+					<
+				}
+				55 {
+					>
+						emit {\b, reserved}
+					<
+				}
+				76 {
+					>
+						emit {\b, long path}
+					<
+				}
+				77 {
+					>
+						emit {\b, multi volume}
+					<
+				}
+				86 {
+					>
+						emit {\b, volume}
+					<
+				}
+				103 {
+					>
+						emit {\b, global}
+					<
+				}
+				120 {
+					>
+						emit {\b, extension}
+					<
+				}
+			}
+	
+			if {[D [O 156]]} {
+				>
+					emit {\b, type}
+					if {[N ubyte [O 156] 0 0 {} {} x {}]} {
+						>
+							emit '%c'
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} > \0]} {
+		>
+			emit %-.60s
+		<
+	}
+	
+	if {[S string [O 100] 0 {} {} > \0]} {
+		>
+			emit {\b, mode %-.7s}
+		<
+	}
+	
+	if {[S string [O 108] 0 {} {} > \0]} {
+		>
+			emit {\b, uid %-.7s}
+		<
+	}
+	
+	if {[S string [O 116] 0 {} {} > \0]} {
+		>
+			emit {\b, gid %-.7s}
+		<
+	}
+	
+	if {[N ubyte [O 124] 0 0 {} {} < 56]} {
+		>
+			if {[S string [O 124] 0 {} {} > \0]} {
+				>
+					emit {\b, size %-.12s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubyte [O 124] 0 0 {} {} > 239]} {
+		>
+			emit {\b, size 0x}
+			if {[N ubyte [O 124] 0 0 {} {} != 255]} {
+				>
+					emit {\b%2.2x}
+				<
+			}
+	
+			if {[N ubyte [O 125] 0 0 {} {} != 255]} {
+				>
+					emit {\b%2.2x}
+				<
+			}
+	
+			if {[N ubyte [O 126] 0 0 {} {} != 255]} {
+				>
+					emit {\b%2.2x}
+				<
+			}
+	
+			if {[N ubyte [O 127] 0 0 {} {} != 255]} {
+				>
+					emit {\b%2.2x}
+				<
+			}
+	
+			if {[N ubyte [O 128] 0 0 {} {} != 255]} {
+				>
+					emit {\b%2.2x}
+				<
+			}
+	
+			if {[N ubyte [O 129] 0 0 {} {} != 255]} {
+				>
+					emit {\b%2.2x}
+				<
+			}
+	
+			if {[N ubyte [O 130] 0 0 {} {} != 255]} {
+				>
+					emit {\b%2.2x}
+				<
+			}
+	
+			if {[N ubyte [O 131] 0 0 {} {} != 255]} {
+				>
+					emit {\b%2.2x}
+				<
+			}
+	
+			if {[N ubyte [O 132] 0 0 {} {} != 255]} {
+				>
+					emit {\b%2.2x}
+				<
+			}
+	
+			if {[N ubyte [O 133] 0 0 {} {} != 255]} {
+				>
+					emit {\b%2.2x}
+				<
+			}
+	
+			if {[N ubyte [O 134] 0 0 {} {} != 255]} {
+				>
+					emit {\b%2.2x}
+				<
+			}
+	
+			if {[N ubyte [O 135] 0 0 {} {} != 255]} {
+				>
+					emit {\b%2.2x}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string [O 136] 0 {} {} > \0]} {
+		>
+			emit {\b, seconds %-.11s}
+		<
+	}
+	
+	if {[S string [O 157] 0 {} {} > \0]} {
+		>
+			emit {\b, linkname %-.40s}
+		<
+	}
+	
+	if {[S string [O 257] 0 {} {} eq ustar]} {
+		>
+			if {[S string [O 265] 0 {} {} > \0]} {
+				>
+					emit {\b, user %-.32s}
+				<
+			}
+	
+			if {[S string [O 297] 0 {} {} > \0]} {
+				>
+					emit {\b, group %-.32s}
+				<
+			}
+	
+			if {[N ubequad [O 329] 0 0 & 14974415777481871327 != 0]} {
+				>
+					if {[S string [O 329] 0 {} {} x {}]} {
+						>
+							emit {\b, devmaj %-.7s}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ubequad [O 337] 0 0 & 14974415777481871327 != 0]} {
+				>
+					if {[S string [O 337] 0 {} {} x {}]} {
+						>
+							emit {\b, devmin %-.7s}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string [O 345] 0 {} {} > \0]} {
+				>
+					emit {\b, prefix %-.155s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string [O 257] 0 {} {} ne ustar]} {
+		>
+			if {[S string [O 508] 0 {} {} eq tar\0]} {
+				>
+					if {[S string [O 257] 0 {} {} > \0]} {
+						>
+							emit {\b, padding: %-.40s}
+						<
+					}
+	
+				<
+			}
+	
+			if {[D [O 508]]} {
+				>
+					if {[S string [O 257] 0 {} {} > \0]} {
+						>
+							emit {\b, comment: %-.40s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	} lharc-file {if {[S string [O 2] 0 {} {} eq -]} {
+		>
+			if {[S string [O 6] 0 {} {} eq -]} {
+				>
+					if {[N ubyte [O 20] 0 0 {} {} < 4]} {
+						>
+							if {[S regex [O 3] 0 {} {} eq ^(lh\[0-9a-ex\]|lz\[s2-8\]|pm\[012\]|pc1)]} {
+								>
+									emit {\b }
+									if {[S string [O 2] 0 {} {} eq -lz]} {
+										>
+											emit {\b }
+											if {[S string [O 2] 0 {} {} eq -lzs]} {
+												>
+													emit {LHa/LZS archive data}
+												<
+											}
+	
+											if {[S regex [O 3] 0 {} {} eq ^lz\[45\]]} {
+												>
+													emit {LHarc 1.x archive data}
+												<
+											}
+	
+											if {[S regex [O 3] 0 {} {} eq ^lz\[2378\]]} {
+												>
+													emit {LArc archive}
+												<
+											}
+	
+											ext lzs
+										<
+									}
+	
+									if {[S string [O 2] 0 {} {} eq -lh]} {
+										>
+											emit {\b}
+											if {[S regex [O 3] 0 {} {} eq ^lh\[01\]]} {
+												>
+													emit {LHarc 1.x/ARX archive data}
+													if {[S string [O 2] 0 {} {} eq -lh1]} {
+														>
+															emit {\b }
+															ext lha/lzh/ice
+														<
+													}
+	
+												<
+											}
+	
+											if {[S regex [O 3] 0 {} {} eq ^lh\[23d\]]} {
+												>
+													emit {LHa 2.x? archive data}
+												<
+											}
+	
+											if {[S regex [O 3] 0 {} {} eq ^lh\[7\]]} {
+												>
+													emit {LHa (2.x)/LHark archive data}
+												<
+											}
+	
+											if {[S regex [O 3] 0 {} {} eq ^lh\[456\]]} {
+												>
+													emit {LHa (2.x) archive data}
+													if {[S string [O 2] 0 {} {} eq -lh5]} {
+														>
+															emit {\b }
+															ext lha/lzh/rom/bin
+														<
+													}
+	
+												<
+											}
+	
+											if {[S regex [O 3] 0 {} {} eq ^lh\[89a-ce\]]} {
+												>
+													emit {LHa (Joe Jared) archive}
+												<
+											}
+	
+											if {[S string [O 2] 0 {} {} eq -lhx]} {
+												>
+													emit {LHa (UNLHA32) archive}
+												<
+											}
+	
+											if {[S regex [O 3] 0 {} {} ne ^(lh1|lh5)]} {
+												>
+													emit {\b }
+													ext lha/lzh
+												<
+											}
+	
+											if {[D [O 2]]} {
+												>
+													emit {LHa (unknown) archive}
+												<
+											}
+	
+										<
+									}
+	
+									if {[S regex [O 3] 0 {} {} eq ^pm\[012\]]} {
+										>
+											emit {PMarc archive data}
+											ext pma
+										<
+									}
+	
+									if {[S string [O 3] 0 {} {} x {}]} {
+										>
+											emit {[%3.3s]}
+											U 16 lharc-header [O 0]
+	
+										<
+									}
+	
+									mime application/x-lzh-compressed
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	} lharc-header {if {[N ubyte [O 0] 0 0 {} {} x {}]} {
+		>
+		<
+	}
+	
+	switch [Nv ubyte [O 20] 0 {} {}] {
+		1 {
+			>
+				if {[N ubyte [O [I 21 ubyte 0 + 0 24]] 0 0 {} {} < 33]} {
+					>
+						emit {\b, 0x%x OS}
+					<
+				}
+	
+				if {[N ubyte [O [I 21 ubyte 0 + 0 24]] 0 0 {} {} > 32]} {
+					>
+						emit {\b, '%c' OS}
+					<
+				}
+	
+			<
+		}
+		2 {
+			>
+				if {[N ubyte [O 23] 0 0 {} {} < 33]} {
+					>
+						emit {\b, 0x%x OS}
+					<
+				}
+	
+				if {[N ubyte [O 23] 0 0 {} {} > 32]} {
+					>
+						emit {\b, '%c' OS}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[N ubyte [O 20] 0 0 {} {} < 2]} {
+		>
+			if {[N ubyte [O 21] 0 0 {} {} > 0]} {
+				>
+					emit {\b, with}
+					if {[S pstring [O 21] 0 {} {} x {}]} {
+						>
+							emit {"%s"}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	} rar-file-header {switch [Nv byte [O 24] 0 {} {}] {
+		15 {
+			>
+				emit {\b, v1.5}
+			<
+		}
+		20 {
+			>
+				emit {\b, v2.0}
+			<
+		}
+		29 {
+			>
+				emit {\b, v4}
+			<
+		}
+	}
+	
+	switch [Nv byte [O 15] 0 {} {}] {
+		0 {
+			>
+				emit {\b, os: MS-DOS}
+			<
+		}
+		1 {
+			>
+				emit {\b, os: OS/2}
+			<
+		}
+		2 {
+			>
+				emit {\b, os: Win32}
+			<
+		}
+		3 {
+			>
+				emit {\b, os: Unix}
+			<
+		}
+		4 {
+			>
+				emit {\b, os: Mac OS}
+			<
+		}
+		5 {
+			>
+				emit {\b, os: BeOS}
+			<
+		}
+	}
+	} rar-archive-header {if {[N leshort [O 3] 0 0 & 511 > 0]} {
+		>
+			emit {\b, flags:}
+			if {[N leshort [O 3] 0 0 {} {} & 1]} {
+				>
+					emit ArchiveVolume
+				<
+			}
+	
+			if {[N leshort [O 3] 0 0 {} {} & 2]} {
+				>
+					emit Commented
+				<
+			}
+	
+			if {[N leshort [O 3] 0 0 {} {} & 4]} {
+				>
+					emit Locked
+				<
+			}
+	
+			if {[N leshort [O 3] 0 0 {} {} & 16]} {
+				>
+					emit NewVolumeNaming
+				<
+			}
+	
+			if {[N leshort [O 3] 0 0 {} {} & 8]} {
+				>
+					emit Solid
+				<
+			}
+	
+			if {[N leshort [O 3] 0 0 {} {} & 32]} {
+				>
+					emit Authenticated
+				<
+			}
+	
+			if {[N leshort [O 3] 0 0 {} {} & 64]} {
+				>
+					emit RecoveryRecordPresent
+				<
+			}
+	
+			if {[N leshort [O 3] 0 0 {} {} & 128]} {
+				>
+					emit EncryptedBlockHeader
+				<
+			}
+	
+			if {[N leshort [O 3] 0 0 {} {} & 256]} {
+				>
+					emit FirstVolume
+				<
+			}
+	
+		<
+	}
+	}}
+	37
+		{mach-o {U 37 mach-o-cpu [O 0]
+	
+	emit {\b:}
+	T [O [I 8 ubelong 0 + 0 0]] {}
+	
+	if {[N belong [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {\b]}
+		<
+	}
+	}}
+	47
+		{display-coff {if {[N uleshort [O 18] 0 0 & 36480 == 0]} {
+		>
+			if {[S clear [O 0] 0 {} {} x {}]} {
+				>
+				<
+			}
+	
+			switch [Nv uleshort [O 0] 0 {} {}] {
+				332 {
+					>
+						emit {Intel 80386}
+					<
+				}
+				1280 {
+					>
+						emit {Hitachi SH big-endian}
+					<
+				}
+				1360 {
+					>
+						emit {Hitachi SH little-endian}
+					<
+				}
+			}
+	
+			if {[D [O 0]]} {
+				>
+					if {[N uleshort [O 0] 0 0 {} {} x {}]} {
+						>
+							emit {type 0x%04x}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N uleshort [O 0] 0 0 {} {} x {}]} {
+				>
+					emit COFF
+				<
+			}
+	
+			if {[N leshort [O 18] 0 0 {} {} ^ 2]} {
+				>
+					emit {object file}
+				<
+			}
+	
+			if {[N leshort [O 18] 0 0 {} {} & 2]} {
+				>
+					emit executable
+				<
+			}
+	
+			if {[N leshort [O 18] 0 0 {} {} & 1]} {
+				>
+					emit {\b, no relocation info}
+				<
+			}
+	
+			if {[N leshort [O 18] 0 0 {} {} & 4]} {
+				>
+					emit {\b, no line number info}
+				<
+			}
+	
+			if {[N leshort [O 18] 0 0 {} {} & 8]} {
+				>
+					emit {\b, stripped}
+				<
+			}
+	
+			if {[N leshort [O 18] 0 0 {} {} ^ 8]} {
+				>
+					emit {\b, not stripped}
+				<
+			}
+	
+			if {[N uleshort [O 2] 0 0 {} {} < 2]} {
+				>
+					emit {\b, %d section}
+				<
+			}
+	
+			if {[N uleshort [O 2] 0 0 {} {} > 1]} {
+				>
+					emit {\b, %d sections}
+				<
+			}
+	
+			if {[N ulelong [O 8] 0 0 {} {} > 0]} {
+				>
+					emit {\b, symbol offset=0x%x}
+				<
+			}
+	
+			if {[N ulelong [O 12] 0 0 {} {} > 0]} {
+				>
+					emit {\b, %d symbols}
+				<
+			}
+	
+			if {[N uleshort [O 16] 0 0 {} {} > 0]} {
+				>
+					emit {\b, optional header size %d}
+				<
+			}
+	
+		<
+	}
+	}}
+	50
+		{zstd-dictionary-id {if {[N byte [O 0] 0 0 {} {} & 32]} {
+		>
+			emit {\b, Dictionary ID:}
+			switch [Nv byte [O 0] 0 & 3] {
+				0 {
+					>
+						emit None
+					<
+				}
+				1 {
+					>
+						if {[N byte [O 1] 0 0 {} {} x {}]} {
+							>
+								emit %u
+							<
+						}
+	
+					<
+				}
+				2 {
+					>
+						if {[N leshort [O 1] 0 0 {} {} x {}]} {
+							>
+								emit %u
+							<
+						}
+	
+					<
+				}
+				3 {
+					>
+						if {[N lelong [O 1] 0 0 {} {} x {}]} {
+							>
+								emit %u
+							<
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[N byte [O 0] 0 0 {} {} ^ 32]} {
+		>
+			emit {\b, Dictionary ID:}
+			switch [Nv byte [O 0] 0 & 3] {
+				0 {
+					>
+						emit None
+					<
+				}
+				1 {
+					>
+						if {[N byte [O 2] 0 0 {} {} x {}]} {
+							>
+								emit %u
+							<
+						}
+	
+					<
+				}
+				2 {
+					>
+						if {[N leshort [O 2] 0 0 {} {} x {}]} {
+							>
+								emit %u
+							<
+						}
+	
+					<
+				}
+				3 {
+					>
+						if {[N lelong [O 2] 0 0 {} {} x {}]} {
+							>
+								emit %u
+							<
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	}}
+	51
+		{nes-rom-image-ines {switch [Nv byte [O 7] 0 & 12] {
+		8 {
+			>
+				emit {(NES 2.0)}
+			<
+			>
+				switch [Nv byte [O 12] 0 & 3] {
+					0 {
+						>
+							emit {[NTSC]}
+						<
+					}
+					1 {
+						>
+							emit {[PAL]}
+						<
+					}
+				}
+	
+				if {[N byte [O 12] 0 0 & 2 == 2]} {
+					>
+						emit {[NTSC+PAL]}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[N byte [O 4] 0 0 {} {} x {}]} {
+		>
+			emit {\b: %ux16k PRG}
+		<
+	}
+	
+	if {[N byte [O 5] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %ux8k CHR}
+		<
+	}
+	
+	if {[N byte [O 6] 0 0 & 8 == 8]} {
+		>
+			emit {[4-Scr]}
+		<
+	}
+	
+	switch [Nv byte [O 6] 0 & 9] {
+		0 {
+			>
+				emit {[H-mirror]}
+			<
+		}
+		1 {
+			>
+				emit {[V-mirror]}
+			<
+		}
+	}
+	
+	if {[N byte [O 6] 0 0 & 2 == 2]} {
+		>
+			emit {[SRAM]}
+		<
+	}
+	
+	if {[N byte [O 6] 0 0 & 4 == 4]} {
+		>
+			emit {[Trainer]}
+		<
+	}
+	
+	switch [Nv byte [O 7] 0 & 3] {
+		1 {
+			>
+				emit {[VS]}
+				if {[N byte [O 7] 0 0 & 12 == 8]} {
+					>
+						switch [Nv byte [O 13] 0 & 15] {
+							0 {
+								>
+									emit {\b, RP2C03B}
+								<
+							}
+							1 {
+								>
+									emit {\b, RP2C03G}
+								<
+							}
+							2 {
+								>
+									emit {\b, RP2C04-0001}
+								<
+							}
+							3 {
+								>
+									emit {\b, RP2C04-0002}
+								<
+							}
+							4 {
+								>
+									emit {\b, RP2C04-0003}
+								<
+							}
+							5 {
+								>
+									emit {\b, RP2C04-0004}
+								<
+							}
+							6 {
+								>
+									emit {\b, RP2C03B}
+								<
+							}
+							7 {
+								>
+									emit {\b, RP2C03C}
+								<
+							}
+							8 {
+								>
+									emit {\b, RP2C05-01}
+								<
+							}
+							9 {
+								>
+									emit {\b, RP2C05-02}
+								<
+							}
+							10 {
+								>
+									emit {\b, RP2C05-03}
+								<
+							}
+							11 {
+								>
+									emit {\b, RP2C05-04}
+								<
+							}
+							12 {
+								>
+									emit {\b, RP2C05-05}
+								<
+							}
+						}
+	
+					<
+				}
+	
+				if {[N byte [O 7] 0 0 {} {} x {}]} {
+					>
+						emit {\b]}
+					<
+				}
+	
+			<
+		}
+		2 {
+			>
+				emit {[PC10]}
+			<
+		}
+	}
+	} nintendo-fds-disk-info-block {if {[N byte [O 23] 0 0 {} {} != 1]} {
+		>
+			emit FMC-
+		<
+	}
+	
+	if {[N byte [O 23] 0 0 {} {} == 1]} {
+		>
+			emit FSC-
+		<
+	}
+	
+	if {[S string [O 16] 0 {} {} x {}]} {
+		>
+			emit {\b%.3s}
+		<
+	}
+	
+	if {[N byte [O 15] 0 0 {} {} x {}]} {
+		>
+			emit {\b, mfr %02X}
+		<
+	}
+	
+	if {[N byte [O 20] 0 0 {} {} x {}]} {
+		>
+			emit (Rev.%02u)
+		<
+	}
+	} sega-mega-drive-header {if {[N byte [O 288] 0 0 {} {} > 32]} {
+		>
+			if {[S string [O 288] 0 {} {} > \0]} {
+				>
+					emit {\b: "%.16s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N byte [O 288] 0 0 {} {} < 33]} {
+		>
+			if {[S string [O 336] 0 {} {} > \0]} {
+				>
+					emit {\b: "%.16s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string [O 384] 0 {} {} > \0]} {
+		>
+			emit (%.14s
+			if {[S string [O 272] 0 {} {} > \0]} {
+				>
+					emit {\b, %.16s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N byte [O 384] 0 0 {} {} == 0]} {
+		>
+			if {[S string [O 272] 0 {} {} > \0]} {
+				>
+					emit (%.16s
+				<
+			}
+	
+		<
+	}
+	
+	if {[N byte [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {\b)}
+		<
+	}
+	} sega-genesis-smd-header {if {[N byte [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {%dx16k blocks}
+		<
+	}
+	
+	if {[N byte [O 2] 0 0 {} {} == 0]} {
+		>
+			emit {\b, last in series or standalone}
+		<
+	}
+	
+	if {[N byte [O 2] 0 0 {} {} > 0]} {
+		>
+			emit {\b, split ROM}
+		<
+	}
+	} sega-master-system-rom-header {switch [Nv byte [O 15] 0 & -16] {
+		48 {
+			>
+				emit {Sega Master System}
+				mime application/x-sms-rom
+			<
+		}
+		64 {
+			>
+				emit {Sega Master System}
+				mime application/x-sms-rom
+			<
+		}
+		80 {
+			>
+				emit {Sega Game Gear}
+				mime application/x-gamegear-rom
+			<
+		}
+		96 {
+			>
+				emit {Sega Game Gear}
+				mime application/x-gamegear-rom
+			<
+		}
+		112 {
+			>
+				emit {Sega Game Gear}
+				mime application/x-gamegear-rom
+			<
+		}
+	}
+	
+	if {[D [O 15]]} {
+		>
+			emit {Sega Master System / Game Gear}
+			mime application/x-sms-rom
+		<
+	}
+	
+	if {[N byte [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {ROM image:}
+		<
+	}
+	
+	switch [Nv byte [O 14] 0 & -16] {
+		-128 {
+			>
+				emit 8
+			<
+		}
+		-112 {
+			>
+				emit 9
+			<
+		}
+		-96 {
+			>
+				emit 10
+			<
+		}
+		-80 {
+			>
+				emit 11
+			<
+		}
+		-64 {
+			>
+				emit 12
+			<
+		}
+		-48 {
+			>
+				emit 13
+			<
+		}
+		-32 {
+			>
+				emit 14
+			<
+		}
+		-16 {
+			>
+				emit 15
+			<
+		}
+		0 {
+			>
+				if {[N leshort [O 12] 0 0 {} {} x {}]} {
+					>
+						emit %04x
+					<
+				}
+	
+			<
+		}
+		16 {
+			>
+				emit 1
+			<
+		}
+		32 {
+			>
+				emit 2
+			<
+		}
+		48 {
+			>
+				emit 3
+			<
+		}
+		64 {
+			>
+				emit 4
+			<
+		}
+		80 {
+			>
+				emit 5
+			<
+		}
+		96 {
+			>
+				emit 6
+			<
+		}
+		112 {
+			>
+				emit 7
+			<
+		}
+	}
+	
+	if {[N byte [O 14] 0 0 & -16 != 0]} {
+		>
+			if {[N leshort [O 12] 0 0 {} {} x {}]} {
+				>
+					emit {\b%04x}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N byte [O 14] 0 0 & 15 x {}]} {
+		>
+			emit (Rev.%02d)
+		<
+	}
+	
+	switch [Nv byte [O 15] 0 & 15] {
+		0 {
+			>
+				emit {(256 KB)}
+			<
+		}
+		1 {
+			>
+				emit {(512 KB)}
+			<
+		}
+		2 {
+			>
+				emit {(1 MB)}
+			<
+		}
+		10 {
+			>
+				emit {(8 KB)}
+			<
+		}
+		11 {
+			>
+				emit {(16 KB)}
+			<
+		}
+		12 {
+			>
+				emit {(32 KB)}
+			<
+		}
+		13 {
+			>
+				emit {(48 KB)}
+			<
+		}
+		14 {
+			>
+				emit {(64 KB)}
+			<
+		}
+		15 {
+			>
+				emit {(128 KB)}
+			<
+		}
+	}
+	} sega-saturn-disc-header {if {[S string [O 96] 0 {} {} > \0]} {
+		>
+			emit {\b: "%.32s"}
+		<
+	}
+	
+	if {[S string [O 32] 0 {} {} > \0]} {
+		>
+			emit (%.10s
+			if {[S string [O 42] 0 {} {} > \0]} {
+				>
+					emit {\b, %.6s)}
+				<
+			}
+	
+			if {[N byte [O 42] 0 0 {} {} == 0]} {
+				>
+					emit {\b)}
+				<
+			}
+	
+		<
+	}
+	} sega-dreamcast-disc-header {if {[S string [O 128] 0 {} {} > \0]} {
+		>
+			emit {\b: "%.32s"}
+		<
+	}
+	
+	if {[S string [O 64] 0 {} {} > \0]} {
+		>
+			emit (%.10s
+			if {[S string [O 74] 0 {} {} > \0]} {
+				>
+					emit {\b, %.6s)}
+				<
+			}
+	
+			if {[N byte [O 74] 0 0 {} {} == 0]} {
+				>
+					emit {\b)}
+				<
+			}
+	
+		<
+	}
+	} nintendo-gcn-disc-common {if {[S string [O 32] 0 {} {} x {}]} {
+		>
+			emit {"%.64s"}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} x {}]} {
+		>
+			emit (%.6s
+		<
+	}
+	
+	if {[N byte [O 6] 0 0 {} {} > 0]} {
+		>
+			switch [Nv byte [O 6] 0 {} {}] {
+				1 {
+					>
+						emit {\b, Disc 2}
+					<
+				}
+				2 {
+					>
+						emit {\b, Disc 3}
+					<
+				}
+				3 {
+					>
+						emit {\b, Disc 4}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[N byte [O 7] 0 0 {} {} x {}]} {
+		>
+			emit {\b, Rev.%02u)}
+		<
+	}
+	
+	if {[N belong [O 24] 0 0 {} {} == 1562156707]} {
+		>
+			if {[N beshort [O 96] 0 0 {} {} == 257]} {
+				>
+					emit {\b (Unencrypted)}
+				<
+			}
+	
+		<
+	}
+	} nintendo-3ds-version-code {if {[N leshort [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {\b%u,}
+		<
+	}
+	
+	switch [Nv leshort [O 0] 0 & -1024] {
+		0 {
+			>
+				emit 0
+			<
+		}
+		1024 {
+			>
+				emit 1
+			<
+		}
+		2048 {
+			>
+				emit 2
+			<
+		}
+		3072 {
+			>
+				emit 3
+			<
+		}
+		4096 {
+			>
+				emit 4
+			<
+		}
+		5120 {
+			>
+				emit 5
+			<
+		}
+		6144 {
+			>
+				emit 6
+			<
+		}
+		7168 {
+			>
+				emit 7
+			<
+		}
+		8192 {
+			>
+				emit 8
+			<
+		}
+		9216 {
+			>
+				emit 9
+			<
+		}
+		10240 {
+			>
+				emit 10
+			<
+		}
+		11264 {
+			>
+				emit 11
+			<
+		}
+		12288 {
+			>
+				emit 12
+			<
+		}
+		13312 {
+			>
+				emit 13
+			<
+		}
+		14336 {
+			>
+				emit 14
+			<
+		}
+		15360 {
+			>
+				emit 15
+			<
+		}
+	}
+	
+	switch [Nv leshort [O 0] 0 & 1008] {
+		0 {
+			>
+				emit {\b.0}
+			<
+		}
+		16 {
+			>
+				emit {\b.1}
+			<
+		}
+		32 {
+			>
+				emit {\b.2}
+			<
+		}
+		48 {
+			>
+				emit {\b.3}
+			<
+		}
+		64 {
+			>
+				emit {\b.4}
+			<
+		}
+		80 {
+			>
+				emit {\b.5}
+			<
+		}
+		96 {
+			>
+				emit {\b.6}
+			<
+		}
+		112 {
+			>
+				emit {\b.7}
+			<
+		}
+		128 {
+			>
+				emit {\b.8}
+			<
+		}
+		144 {
+			>
+				emit {\b.9}
+			<
+		}
+		160 {
+			>
+				emit {\b.10}
+			<
+		}
+		176 {
+			>
+				emit {\b.11}
+			<
+		}
+		192 {
+			>
+				emit {\b.12}
+			<
+		}
+		208 {
+			>
+				emit {\b.13}
+			<
+		}
+		224 {
+			>
+				emit {\b.14}
+			<
+		}
+		240 {
+			>
+				emit {\b.15}
+			<
+		}
+	}
+	
+	if {[N leshort [O 0] 0 0 & 15 x {}]} {
+		>
+			emit {\b.%u}
+		<
+	}
+	}}
+	58
+		{cups-le {if {[N lelong [O 280] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %d}
+		<
+	}
+	
+	if {[N lelong [O 284] 0 0 {} {} x {}]} {
+		>
+			emit {\bx%d dpi}
+		<
+	}
+	
+	if {[N lelong [O 376] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %dx}
+		<
+	}
+	
+	if {[N lelong [O 380] 0 0 {} {} x {}]} {
+		>
+			emit {\b%d pixels}
+		<
+	}
+	
+	if {[N lelong [O 388] 0 0 {} {} x {}]} {
+		>
+			emit {%d bits/color}
+		<
+	}
+	
+	if {[N lelong [O 392] 0 0 {} {} x {}]} {
+		>
+			emit {%d bits/pixel}
+		<
+	}
+	
+	switch [Nv lelong [O 400] 0 {} {}] {
+		0 {
+			>
+				emit ColorOrder=Chunky
+			<
+		}
+		1 {
+			>
+				emit ColorOrder=Banded
+			<
+		}
+		2 {
+			>
+				emit ColorOrder=Planar
+			<
+		}
+	}
+	
+	switch [Nv lelong [O 404] 0 {} {}] {
+		0 {
+			>
+				emit ColorSpace=gray
+			<
+		}
+		1 {
+			>
+				emit ColorSpace=RGB
+			<
+		}
+		2 {
+			>
+				emit ColorSpace=RGBA
+			<
+		}
+		3 {
+			>
+				emit ColorSpace=black
+			<
+		}
+		4 {
+			>
+				emit ColorSpace=CMY
+			<
+		}
+		5 {
+			>
+				emit ColorSpace=YMC
+			<
+		}
+		6 {
+			>
+				emit ColorSpace=CMYK
+			<
+		}
+		7 {
+			>
+				emit ColorSpace=YMCK
+			<
+		}
+		8 {
+			>
+				emit ColorSpace=KCMY
+			<
+		}
+		9 {
+			>
+				emit ColorSpace=KCMYcm
+			<
+		}
+		10 {
+			>
+				emit ColorSpace=GMCK
+			<
+		}
+		11 {
+			>
+				emit ColorSpace=GMCS
+			<
+		}
+		12 {
+			>
+				emit ColorSpace=WHITE
+			<
+		}
+		13 {
+			>
+				emit ColorSpace=GOLD
+			<
+		}
+		14 {
+			>
+				emit ColorSpace=SILVER
+			<
+		}
+		15 {
+			>
+				emit {ColorSpace=CIE XYZ}
+			<
+		}
+		16 {
+			>
+				emit {ColorSpace=CIE Lab}
+			<
+		}
+		17 {
+			>
+				emit ColorSpace=RGBW
+			<
+		}
+		18 {
+			>
+				emit ColorSpace=sGray
+			<
+		}
+		19 {
+			>
+				emit ColorSpace=sRGB
+			<
+		}
+		20 {
+			>
+				emit ColorSpace=AdobeRGB
+			<
+		}
+	}
+	}}
+	60
+		{xbase-type {if {[N ubyte [O 0] 0 0 {} {} < 2]} {
+		>
+		<
+	}
+	
+	if {[N ubyte [O 0] 0 0 {} {} > 1]} {
+		>
+			switch [Nv ubyte [O 0] 0 {} {}] {
+				2 {
+					>
+						emit FoxBase
+					<
+				}
+				3 {
+					>
+						emit {FoxBase+/dBase III}
+						mime application/x-dbf
+					<
+				}
+				4 {
+					>
+						emit {dBase IV}
+						mime application/x-dbf
+					<
+				}
+				5 {
+					>
+						emit {dBase V}
+						mime application/x-dbf
+					<
+				}
+				48 {
+					>
+						emit {Visual FoxPro}
+						mime application/x-dbf
+					<
+				}
+				49 {
+					>
+						emit {Visual FoxPro, autoincrement}
+						mime application/x-dbf
+					<
+				}
+				50 {
+					>
+						emit {Visual FoxPro, with field type Varchar}
+						mime application/x-dbf
+					<
+				}
+				67 {
+					>
+						emit {dBase IV, with SQL table}
+						mime application/x-dbf
+					<
+				}
+				123 {
+					>
+						emit {dBase IV, with memo}
+						mime application/x-dbf
+					<
+				}
+				131 {
+					>
+						emit {FoxBase+/dBase III, with memo .DBT}
+						mime application/x-dbf
+					<
+				}
+				135 {
+					>
+						emit {VISUAL OBJECTS, with memo file}
+						mime application/x-dbf
+					<
+				}
+				139 {
+					>
+						emit {dBase IV, with memo .DBT}
+						mime application/x-dbf
+					<
+				}
+				142 {
+					>
+						emit {dBase IV, with SQL table}
+						mime application/x-dbf
+					<
+				}
+				179 {
+					>
+						emit Flagship
+					<
+				}
+				203 {
+					>
+						emit {dBase IV with SQL table, with memo .DBT}
+						mime application/x-dbf
+					<
+				}
+				229 {
+					>
+						emit {Clipper SIX with memo}
+						mime application/x-dbf
+					<
+				}
+				245 {
+					>
+						emit {FoxPro with memo}
+						mime application/x-dbf
+					<
+				}
+			}
+	
+			if {[D [O 0]]} {
+				>
+					emit xBase
+					if {[N ubyte [O 0] 0 0 {} {} x {}]} {
+						>
+							emit (0x%x)
+						<
+					}
+	
+					mime application/x-dbf
+				<
+			}
+	
+		<
+	}
+	} xbase-date {if {[N ubelong [O 0] 0 0 {} {} x {}]} {
+		>
+		<
+	}
+	
+	if {[N ubyte [O 1] 0 0 {} {} < 13]} {
+		>
+			if {[N ubyte [O 1] 0 0 {} {} > 0]} {
+				>
+					if {[N ubyte [O 2] 0 0 {} {} > 0]} {
+						>
+							if {[N ubyte [O 2] 0 0 {} {} < 32]} {
+								>
+									if {[N ubyte [O 0] 0 0 {} {} x {}]} {
+										>
+											if {[N ubyte [O 0] 0 0 {} {} < 100]} {
+												>
+													emit {\b %.2d}
+												<
+											}
+	
+											if {[N ubyte [O 0] 0 0 {} {} > 99]} {
+												>
+													emit {\b %d}
+												<
+											}
+	
+										<
+									}
+	
+									if {[N ubyte [O 1] 0 0 {} {} x {}]} {
+										>
+											emit {\b-%d}
+										<
+									}
+	
+									if {[N ubyte [O 2] 0 0 {} {} x {}]} {
+										>
+											emit {\b-%d}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	} dbase3-memo-print {if {[N ubyte [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {dBase III DBT}
+		<
+	}
+	
+	if {[N ubyte [O 16] 0 0 {} {} != 3]} {
+		>
+			emit {\b, version number %u}
+		<
+	}
+	
+	if {[N lelong [O 0] 0 0 {} {} != 0]} {
+		>
+			emit {\b, next free block index %u}
+		<
+	}
+	
+	if {[N uleshort [O 20] 0 0 {} {} != 0]} {
+		>
+			emit {\b, block length %u}
+		<
+	}
+	
+	if {[S string [O 512] 0 {} {} > \0]} {
+		>
+			emit {\b, 1st item "%s"}
+		<
+	}
+	} dbase4-memo-print {if {[N lelong [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {dBase IV DBT}
+			mime application/x-dbt
+			ext dbt
+		<
+	}
+	
+	if {[N ubelong [O 8] 0 0 {} {} > 536870912]} {
+		>
+			if {[N uleshort [O 20] 0 0 {} {} > 0]} {
+				>
+					if {[S string [O 8] 0 {} {} > \0]} {
+						>
+							emit {\b of %-.8s.DBF}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ulelong [O 4] 0 0 {} {} != 0]} {
+		>
+			if {[N ulelong [O 4] 0 0 & 63 == 0]} {
+				>
+					emit {\b, blocks size %u}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N uleshort [O 20] 0 0 {} {} > 0]} {
+		>
+			emit {\b, block length %u}
+		<
+	}
+	
+	if {[N lelong [O 0] 0 0 {} {} != 0]} {
+		>
+			emit {\b, next free block index %u}
+		<
+	}
+	
+	if {[N uleshort [O 20] 0 0 {} {} > 0]} {
+		>
+			if {[N ubelong [O [I 20 uleshort 0 + 0 0]] 0 0 {} {} x {}]} {
+				>
+					U 60 dbase4-memofield-print [R [O -4]]
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N uleshort [O 20] 0 0 {} {} == 0]} {
+		>
+			if {[N ubelong [O 512] 0 0 {} {} x {}]} {
+				>
+					U 60 dbase4-memofield-print [R [O -4]]
+	
+				<
+			}
+	
+		<
+	}
+	} dbase4-memofield-print {if {[N ubelong [O 0] 0 0 {} {} != 4294903808]} {
+		>
+			if {[N lelong [O 0] 0 0 {} {} x {}]} {
+				>
+					emit {\b, next free block %u}
+				<
+			}
+	
+			if {[N lelong [O 4] 0 0 {} {} x {}]} {
+				>
+					emit {\b, next used block %u}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubelong [O 0] 0 0 {} {} == 4294903808]} {
+		>
+			if {[N lelong [O 4] 0 0 {} {} x {}]} {
+				>
+					emit {\b, field length %d}
+					if {[S string [O 8] 0 {} {} > \0]} {
+						>
+							emit {\b, 1st used item "%s"}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	} foxpro-memo-print {if {[N belong [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {FoxPro FPT}
+		<
+	}
+	
+	if {[N ubeshort [O 6] 0 0 {} {} x {}]} {
+		>
+			emit {\b, blocks size %u}
+		<
+	}
+	
+	if {[N belong [O 0] 0 0 {} {} != 0]} {
+		>
+			emit {\b, next free block index %u}
+		<
+	}
+	
+	if {[N ubelong [O 512] 0 0 {} {} < 3]} {
+		>
+			emit {\b, field type %u}
+		<
+	}
+	
+	if {[N ubelong [O 512] 0 0 {} {} == 1]} {
+		>
+			if {[N belong [O 516] 0 0 {} {} > 0]} {
+				>
+					emit {\b, field length %d}
+					if {[S string [O 520] 0 {} {} > \0]} {
+						>
+							emit {\b, 1st item "%s"}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	}}
+	63
+		{certinfo {}}
+	68
+		{new-dump-be {if {[N bedate [O 4] 0 0 {} {} x {}]} {
+		>
+			emit {This dump %s,}
+		<
+	}
+	
+	if {[N bedate [O 8] 0 0 {} {} x {}]} {
+		>
+			emit {Previous dump %s,}
+		<
+	}
+	
+	if {[N belong [O 12] 0 0 {} {} > 0]} {
+		>
+			emit {Volume %d,}
+		<
+	}
+	
+	if {[N belong [O 692] 0 0 {} {} == 0]} {
+		>
+			emit {Level zero, type:}
+		<
+	}
+	
+	if {[N belong [O 692] 0 0 {} {} > 0]} {
+		>
+			emit {Level %d, type:}
+		<
+	}
+	
+	switch [Nv belong [O 0] 0 {} {}] {
+		1 {
+			>
+				emit {tape header,}
+			<
+		}
+		2 {
+			>
+				emit {beginning of file record,}
+			<
+		}
+		3 {
+			>
+				emit {map of inodes on tape,}
+			<
+		}
+		4 {
+			>
+				emit {continuation of file record,}
+			<
+		}
+		5 {
+			>
+				emit {end of volume,}
+			<
+		}
+		6 {
+			>
+				emit {map of inodes deleted,}
+			<
+		}
+		7 {
+			>
+				emit {end of medium (for floppy),}
+			<
+		}
+	}
+	
+	if {[S string [O 676] 0 {} {} > \0]} {
+		>
+			emit {Label %s,}
+		<
+	}
+	
+	if {[S string [O 696] 0 {} {} > \0]} {
+		>
+			emit {Filesystem %s,}
+		<
+	}
+	
+	if {[S string [O 760] 0 {} {} > \0]} {
+		>
+			emit {Device %s,}
+		<
+	}
+	
+	if {[S string [O 824] 0 {} {} > \0]} {
+		>
+			emit {Host %s,}
+		<
+	}
+	
+	if {[N belong [O 888] 0 0 {} {} > 0]} {
+		>
+			emit {Flags %x}
+		<
+	}
+	} old-dump-be {if {[N belong [O 12] 0 0 {} {} > 0]} {
+		>
+			emit {Volume %d,}
+		<
+	}
+	
+	if {[N belong [O 692] 0 0 {} {} == 0]} {
+		>
+			emit {Level zero, type:}
+		<
+	}
+	
+	if {[N belong [O 692] 0 0 {} {} > 0]} {
+		>
+			emit {Level %d, type:}
+		<
+	}
+	
+	switch [Nv belong [O 0] 0 {} {}] {
+		1 {
+			>
+				emit {tape header,}
+			<
+		}
+		2 {
+			>
+				emit {beginning of file record,}
+			<
+		}
+		3 {
+			>
+				emit {map of inodes on tape,}
+			<
+		}
+		4 {
+			>
+				emit {continuation of file record,}
+			<
+		}
+		5 {
+			>
+				emit {end of volume,}
+			<
+		}
+		6 {
+			>
+				emit {map of inodes deleted,}
+			<
+		}
+		7 {
+			>
+				emit {end of medium (for floppy),}
+			<
+		}
+	}
+	
+	if {[S string [O 676] 0 {} {} > \0]} {
+		>
+			emit {Label %s,}
+		<
+	}
+	
+	if {[S string [O 696] 0 {} {} > \0]} {
+		>
+			emit {Filesystem %s,}
+		<
+	}
+	
+	if {[S string [O 760] 0 {} {} > \0]} {
+		>
+			emit {Device %s,}
+		<
+	}
+	
+	if {[S string [O 824] 0 {} {} > \0]} {
+		>
+			emit {Host %s,}
+		<
+	}
+	
+	if {[N belong [O 888] 0 0 {} {} > 0]} {
+		>
+			emit {Flags %x}
+		<
+	}
+	} ufs2-dump-be {if {[N beqdate [O 896] 0 0 {} {} x {}]} {
+		>
+			emit {This dump %s,}
+		<
+	}
+	
+	if {[N beqdate [O 904] 0 0 {} {} x {}]} {
+		>
+			emit {Previous dump %s,}
+		<
+	}
+	
+	if {[N belong [O 12] 0 0 {} {} > 0]} {
+		>
+			emit {Volume %d,}
+		<
+	}
+	
+	if {[N belong [O 692] 0 0 {} {} == 0]} {
+		>
+			emit {Level zero, type:}
+		<
+	}
+	
+	if {[N belong [O 692] 0 0 {} {} > 0]} {
+		>
+			emit {Level %d, type:}
+		<
+	}
+	
+	switch [Nv belong [O 0] 0 {} {}] {
+		1 {
+			>
+				emit {tape header,}
+			<
+		}
+		2 {
+			>
+				emit {beginning of file record,}
+			<
+		}
+		3 {
+			>
+				emit {map of inodes on tape,}
+			<
+		}
+		4 {
+			>
+				emit {continuation of file record,}
+			<
+		}
+		5 {
+			>
+				emit {end of volume,}
+			<
+		}
+		6 {
+			>
+				emit {map of inodes deleted,}
+			<
+		}
+		7 {
+			>
+				emit {end of medium (for floppy),}
+			<
+		}
+	}
+	
+	if {[S string [O 676] 0 {} {} > \0]} {
+		>
+			emit {Label %s,}
+		<
+	}
+	
+	if {[S string [O 696] 0 {} {} > \0]} {
+		>
+			emit {Filesystem %s,}
+		<
+	}
+	
+	if {[S string [O 760] 0 {} {} > \0]} {
+		>
+			emit {Device %s,}
+		<
+	}
+	
+	if {[S string [O 824] 0 {} {} > \0]} {
+		>
+			emit {Host %s,}
+		<
+	}
+	
+	if {[N belong [O 888] 0 0 {} {} > 0]} {
+		>
+			emit {Flags %x}
+		<
+	}
+	}}
+	71
+		{vimnanoswap {if {[N byte [O 67] 0 0 {} {} == 0]} {
+		>
+			if {[N byte [O 107] 0 0 {} {} == 0]} {
+				>
+					if {[N ulelong [O 24] 0 0 {} {} x {}]} {
+						>
+							emit {\b, pid %d}
+						<
+					}
+	
+					if {[S string [O 28] 0 {} {} > \0]} {
+						>
+							emit {\b, user %s}
+						<
+					}
+	
+					if {[S string [O 68] 0 {} {} > \0]} {
+						>
+							emit {\b, host %s}
+						<
+					}
+	
+					if {[S string [O 108] 0 {} {} > \0]} {
+						>
+							emit {\b, file %s}
+						<
+					}
+	
+					if {[N byte [O 1007] 0 0 {} {} == 85]} {
+						>
+							emit {\b, modified}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	}}
+	73
+		{elf-mips {switch [Nv lelong [O 0] 0 & -268435456] {
+		-2147483648 {
+			>
+				emit {MIPS64 rel2}
+			<
+		}
+		-1879048192 {
+			>
+				emit {MIPS32 rel6}
+			<
+		}
+		-1610612736 {
+			>
+				emit {MIPS64 rel6}
+			<
+		}
+		0 {
+			>
+				emit MIPS-I
+			<
+		}
+		268435456 {
+			>
+				emit MIPS-II
+			<
+		}
+		536870912 {
+			>
+				emit MIPS-III
+			<
+		}
+		805306368 {
+			>
+				emit MIPS-IV
+			<
+		}
+		1073741824 {
+			>
+				emit MIPS-V
+			<
+		}
+		1342177280 {
+			>
+				emit MIPS32
+			<
+		}
+		1610612736 {
+			>
+				emit MIPS64
+			<
+		}
+		1879048192 {
+			>
+				emit {MIPS32 rel2}
+			<
+		}
+	}
+	} elf-sparc {switch [Nv lelong [O 0] 0 & 16776960] {
+		256 {
+			>
+				emit {V8+ Required,}
+			<
+		}
+		512 {
+			>
+				emit {Sun UltraSPARC1 Extensions Required,}
+			<
+		}
+		1024 {
+			>
+				emit {HaL R1 Extensions Required,}
+			<
+		}
+		2048 {
+			>
+				emit {Sun UltraSPARC3 Extensions Required,}
+			<
+		}
+	}
+	
+	switch [Nv lelong [O 0] 0 & 3] {
+		0 {
+			>
+				emit {total store ordering,}
+			<
+		}
+		1 {
+			>
+				emit {partial store ordering,}
+			<
+		}
+		2 {
+			>
+				emit {relaxed memory ordering,}
+			<
+		}
+	}
+	} elf-pa-risc {if {[N leshort [O 2] 0 0 {} {} == 532]} {
+		>
+			emit 2.0
+		<
+	}
+	
+	if {[N leshort [O 0] 0 0 {} {} & 8]} {
+		>
+			emit (LP64)
+		<
+	}
+	} elf-le {switch [Nv leshort [O 16] 0 {} {}] {
+		0 {
+			>
+				emit {no file type,}
+				mime application/octet-stream
+			<
+		}
+		1 {
+			>
+				emit relocatable,
+				mime application/x-object
+			<
+		}
+		2 {
+			>
+				emit executable,
+				mime application/x-executable
+			<
+		}
+		3 {
+			>
+				emit {${x?pie executable:shared object},}
+				mime {application/x-${x?pie-executable:sharedlib}}
+			<
+		}
+		4 {
+			>
+				emit {core file,}
+				mime application/x-coredump
+			<
+		}
+	}
+	
+	if {[N byte [O 7] 0 0 {} {} == -54]} {
+		>
+			if {[N leshort [O 16] 0 0 {} {} == -511]} {
+				>
+					emit executable,
+					mime application/x-executable
+				<
+			}
+	
+		<
+	}
+	
+	if {[N leshort [O 16] 0 0 {} {} & -256]} {
+		>
+			emit processor-specific,
+		<
+	}
+	
+	if {[S clear [O 18] 0 {} {} x {}]} {
+		>
+		<
+	}
+	
+	switch [Nv leshort [O 18] 0 {} {}] {
+		-32233 {
+			>
+				emit {Ubicom IP2xxx (unofficial),}
+			<
+		}
+		-31630 {
+			>
+				emit {OpenRISC (obsolete),}
+			<
+		}
+		-28635 {
+			>
+				emit {Cygnus PowerPC (unofficial),}
+			<
+		}
+		-28634 {
+			>
+				emit {Alpha (unofficial),}
+			<
+		}
+		-28607 {
+			>
+				emit {Cygnus M32R (unofficial),}
+			<
+		}
+		-28544 {
+			>
+				emit {Cygnus V850 (unofficial),}
+			<
+		}
+		-23664 {
+			>
+				emit {IBM S/390 (obsolete),}
+			<
+		}
+		-21561 {
+			>
+				emit {Old Xtensa (unofficial),}
+			<
+		}
+		-21179 {
+			>
+				emit {xstormy16 (unofficial),}
+			<
+		}
+		-17749 {
+			>
+				emit {Old MicroBlaze (unofficial),,}
+			<
+		}
+		-16657 {
+			>
+				emit {Cygnus MN10300 (unofficial),}
+			<
+		}
+		-8531 {
+			>
+				emit {Cygnus MN10200 (unofficial),}
+			<
+		}
+		-4083 {
+			>
+				emit {Toshiba MeP (unofficial),}
+			<
+		}
+		-336 {
+			>
+				emit {Renesas M32C (unofficial),}
+			<
+		}
+		-326 {
+			>
+				emit {Vitesse IQ2000 (unofficial),}
+			<
+		}
+		-325 {
+			>
+				emit {NIOS (unofficial),}
+			<
+		}
+		-275 {
+			>
+				emit {Moxie (unofficial),}
+			<
+		}
+		0 {
+			>
+				emit {no machine,}
+			<
+		}
+		1 {
+			>
+				emit {AT&T WE32100,}
+			<
+		}
+		2 {
+			>
+				emit SPARC,
+			<
+		}
+		3 {
+			>
+				emit {Intel 80386,}
+			<
+		}
+		4 {
+			>
+				emit {Motorola m68k,}
+				if {[N byte [O 4] 0 0 {} {} == 1]} {
+					>
+						if {[N lelong [O 36] 0 0 {} {} & 16777216]} {
+							>
+								emit 68000,
+							<
+						}
+	
+						if {[N lelong [O 36] 0 0 {} {} & 8454144]} {
+							>
+								emit CPU32,
+							<
+						}
+	
+						if {[N lelong [O 36] 0 0 {} {} == 0]} {
+							>
+								emit 68020,
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		5 {
+			>
+				emit {Motorola m88k,}
+			<
+		}
+		6 {
+			>
+				emit {Intel 80486,}
+			<
+		}
+		7 {
+			>
+				emit {Intel 80860,}
+			<
+		}
+		8 {
+			>
+				emit MIPS,
+				if {[N byte [O 4] 0 0 {} {} == 1]} {
+					>
+						if {[N lelong [O 36] 0 0 {} {} & 32]} {
+							>
+								emit N32
+							<
+						}
+	
+					<
+				}
+	
+			<
+			>
+				switch [Nv byte [O 4] 0 {} {}] {
+					1 {
+						>
+							U 73 elf-mips [O 36]
+	
+						<
+					}
+					2 {
+						>
+							U 73 elf-mips [O 48]
+	
+						<
+					}
+				}
+	
+			<
+		}
+		9 {
+			>
+				emit Amdahl,
+			<
+		}
+		10 {
+			>
+				emit MIPS,
+				if {[N byte [O 4] 0 0 {} {} == 1]} {
+					>
+						if {[N lelong [O 36] 0 0 {} {} & 32]} {
+							>
+								emit N32
+							<
+						}
+	
+					<
+				}
+	
+			<
+			>
+				emit {MIPS (deprecated),}
+			<
+		}
+		11 {
+			>
+				emit RS6000,
+			<
+		}
+		15 {
+			>
+				emit PA-RISC,
+				switch [Nv byte [O 4] 0 {} {}] {
+					1 {
+						>
+							U 73 elf-pa-risc [O 36]
+	
+						<
+					}
+					2 {
+						>
+							U 73 elf-pa-risc [O 48]
+	
+						<
+					}
+				}
+	
+			<
+		}
+		16 {
+			>
+				emit nCUBE,
+			<
+		}
+		17 {
+			>
+				emit {Fujitsu VPP500,}
+			<
+		}
+		18 {
+			>
+				emit SPARC32PLUS,
+				if {[N byte [O 4] 0 0 {} {} == 1]} {
+					>
+						U 73 elf-sparc [O 36]
+	
+					<
+				}
+	
+			<
+		}
+		19 {
+			>
+				emit {Intel 80960,}
+			<
+		}
+		20 {
+			>
+				emit {PowerPC or cisco 4500,}
+			<
+		}
+		21 {
+			>
+				emit {64-bit PowerPC or cisco 7500,}
+			<
+		}
+		22 {
+			>
+				emit {IBM S/390,}
+			<
+		}
+		23 {
+			>
+				emit {Cell SPU,}
+			<
+		}
+		24 {
+			>
+				emit {cisco SVIP,}
+			<
+		}
+		25 {
+			>
+				emit {cisco 7200,}
+			<
+		}
+		36 {
+			>
+				emit {NEC V800 or cisco 12000,}
+			<
+		}
+		37 {
+			>
+				emit {Fujitsu FR20,}
+			<
+		}
+		38 {
+			>
+				emit {TRW RH-32,}
+			<
+		}
+		39 {
+			>
+				emit {Motorola RCE,}
+			<
+		}
+		40 {
+			>
+				emit ARM,
+				if {[N byte [O 4] 0 0 {} {} == 1]} {
+					>
+						switch [Nv lelong [O 36] 0 & -16777216] {
+							67108864 {
+								>
+									emit EABI4
+								<
+							}
+							83886080 {
+								>
+									emit EABI5
+								<
+							}
+						}
+	
+						if {[N lelong [O 36] 0 0 {} {} & 8388608]} {
+							>
+								emit BE8
+							<
+						}
+	
+						if {[N lelong [O 36] 0 0 {} {} & 4194304]} {
+							>
+								emit LE8
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		41 {
+			>
+				emit Alpha,
+			<
+		}
+		42 {
+			>
+				emit {Renesas SH,}
+			<
+		}
+		43 {
+			>
+				emit {SPARC V9,}
+				if {[N byte [O 4] 0 0 {} {} == 2]} {
+					>
+						U 73 elf-sparc [O 48]
+	
+					<
+				}
+	
+			<
+		}
+		44 {
+			>
+				emit {Siemens Tricore Embedded Processor,}
+			<
+		}
+		45 {
+			>
+				emit {Argonaut RISC Core, Argonaut Technologies Inc.,}
+			<
+		}
+		46 {
+			>
+				emit {Renesas H8/300,}
+			<
+		}
+		47 {
+			>
+				emit {Renesas H8/300H,}
+			<
+		}
+		48 {
+			>
+				emit {Renesas H8S,}
+			<
+		}
+		49 {
+			>
+				emit {Renesas H8/500,}
+			<
+		}
+		50 {
+			>
+				emit IA-64,
+			<
+		}
+		51 {
+			>
+				emit {Stanford MIPS-X,}
+			<
+		}
+		52 {
+			>
+				emit {Motorola Coldfire,}
+			<
+		}
+		53 {
+			>
+				emit {Motorola M68HC12,}
+			<
+		}
+		54 {
+			>
+				emit {Fujitsu MMA,}
+			<
+		}
+		55 {
+			>
+				emit {Siemens PCP,}
+			<
+		}
+		56 {
+			>
+				emit {Sony nCPU,}
+			<
+		}
+		57 {
+			>
+				emit {Denso NDR1,}
+			<
+		}
+		58 {
+			>
+				emit Start*Core,
+			<
+		}
+		59 {
+			>
+				emit {Toyota ME16,}
+			<
+		}
+		60 {
+			>
+				emit ST100,
+			<
+		}
+		61 {
+			>
+				emit {Tinyj emb.,}
+			<
+		}
+		62 {
+			>
+				emit x86-64,
+			<
+		}
+		63 {
+			>
+				emit {Sony DSP,}
+			<
+		}
+		64 {
+			>
+				emit {DEC PDP-10,}
+			<
+		}
+		65 {
+			>
+				emit {DEC PDP-11,}
+			<
+		}
+		66 {
+			>
+				emit FX66,
+			<
+		}
+		67 {
+			>
+				emit {ST9+ 8/16 bit,}
+			<
+		}
+		68 {
+			>
+				emit {ST7 8 bit,}
+			<
+		}
+		69 {
+			>
+				emit MC68HC16,
+			<
+		}
+		70 {
+			>
+				emit MC68HC11,
+			<
+		}
+		71 {
+			>
+				emit MC68HC08,
+			<
+		}
+		72 {
+			>
+				emit MC68HC05,
+			<
+		}
+		73 {
+			>
+				emit {SGI SVx or Cray NV1,}
+			<
+		}
+		74 {
+			>
+				emit {ST19 8 bit,}
+			<
+		}
+		75 {
+			>
+				emit {Digital VAX,}
+			<
+		}
+		76 {
+			>
+				emit {Axis cris,}
+			<
+		}
+		77 {
+			>
+				emit {Infineon 32-bit embedded,}
+			<
+		}
+		78 {
+			>
+				emit {Element 14 64-bit DSP,}
+			<
+		}
+		79 {
+			>
+				emit {LSI Logic 16-bit DSP,}
+			<
+		}
+		80 {
+			>
+				emit MMIX,
+			<
+		}
+		81 {
+			>
+				emit {Harvard machine-independent,}
+			<
+		}
+		82 {
+			>
+				emit {SiTera Prism,}
+			<
+		}
+		83 {
+			>
+				emit {Atmel AVR 8-bit,}
+			<
+		}
+		84 {
+			>
+				emit {Fujitsu FR30,}
+			<
+		}
+		85 {
+			>
+				emit {Mitsubishi D10V,}
+			<
+		}
+		86 {
+			>
+				emit {Mitsubishi D30V,}
+			<
+		}
+		87 {
+			>
+				emit {NEC v850,}
+			<
+		}
+		88 {
+			>
+				emit {Renesas M32R,}
+			<
+		}
+		89 {
+			>
+				emit {Matsushita MN10300,}
+			<
+		}
+		90 {
+			>
+				emit {Matsushita MN10200,}
+			<
+		}
+		91 {
+			>
+				emit picoJava,
+			<
+		}
+		92 {
+			>
+				emit OpenRISC,
+			<
+		}
+		93 {
+			>
+				emit {ARC Cores Tangent-A5,}
+			<
+		}
+		94 {
+			>
+				emit {Tensilica Xtensa,}
+			<
+		}
+		95 {
+			>
+				emit {Alphamosaic VideoCore,}
+			<
+		}
+		96 {
+			>
+				emit {Thompson Multimedia,}
+			<
+		}
+		97 {
+			>
+				emit {NatSemi 32k,}
+			<
+		}
+		98 {
+			>
+				emit {Tenor Network TPC,}
+			<
+		}
+		99 {
+			>
+				emit {Trebia SNP 1000,}
+			<
+		}
+		100 {
+			>
+				emit {STMicroelectronics ST200,}
+			<
+		}
+		101 {
+			>
+				emit {Ubicom IP2022,}
+			<
+		}
+		102 {
+			>
+				emit {MAX Processor,}
+			<
+		}
+		103 {
+			>
+				emit {NatSemi CompactRISC,}
+			<
+		}
+		104 {
+			>
+				emit {Fujitsu F2MC16,}
+			<
+		}
+		105 {
+			>
+				emit {TI msp430,}
+			<
+		}
+		106 {
+			>
+				emit {Analog Devices Blackfin,}
+			<
+		}
+		107 {
+			>
+				emit {S1C33 Family of Seiko Epson,}
+			<
+		}
+		108 {
+			>
+				emit {Sharp embedded,}
+			<
+		}
+		109 {
+			>
+				emit {Arca RISC,}
+			<
+		}
+		110 {
+			>
+				emit {PKU-Unity Ltd.,}
+			<
+		}
+		111 {
+			>
+				emit {eXcess: 16/32/64-bit,}
+			<
+		}
+		112 {
+			>
+				emit {Icera Deep Execution Processor,}
+			<
+		}
+		113 {
+			>
+				emit {Altera Nios II,}
+			<
+		}
+		114 {
+			>
+				emit {NatSemi CRX,}
+			<
+		}
+		115 {
+			>
+				emit {Motorola XGATE,}
+			<
+		}
+		116 {
+			>
+				emit {Infineon C16x/XC16x,}
+			<
+		}
+		117 {
+			>
+				emit {Renesas M16C series,}
+			<
+		}
+		118 {
+			>
+				emit {Microchip dsPIC30F,}
+			<
+		}
+		119 {
+			>
+				emit {Freescale RISC core,}
+			<
+		}
+		120 {
+			>
+				emit {Renesas M32C series,}
+			<
+		}
+		131 {
+			>
+				emit {Altium TSK3000 core,}
+			<
+		}
+		132 {
+			>
+				emit {Freescale RS08,}
+			<
+		}
+		134 {
+			>
+				emit {Cyan Technology eCOG2,}
+			<
+		}
+		135 {
+			>
+				emit {Sunplus S+core7 RISC,}
+			<
+		}
+		136 {
+			>
+				emit {New Japan Radio (NJR) 24-bit DSP,}
+			<
+		}
+		137 {
+			>
+				emit {Broadcom VideoCore III,}
+			<
+		}
+		138 {
+			>
+				emit LatticeMico32,
+			<
+		}
+		139 {
+			>
+				emit {Seiko Epson C17 family,}
+			<
+		}
+		140 {
+			>
+				emit {TI TMS320C6000 DSP family,}
+			<
+		}
+		141 {
+			>
+				emit {TI TMS320C2000 DSP family,}
+			<
+		}
+		142 {
+			>
+				emit {TI TMS320C55x DSP family,}
+			<
+		}
+		160 {
+			>
+				emit {STMicroelectronics 64bit VLIW DSP,}
+			<
+		}
+		161 {
+			>
+				emit {Cypress M8C,}
+			<
+		}
+		162 {
+			>
+				emit {Renesas R32C series,}
+			<
+		}
+		163 {
+			>
+				emit {NXP TriMedia family,}
+			<
+		}
+		164 {
+			>
+				emit {QUALCOMM DSP6,}
+			<
+		}
+		165 {
+			>
+				emit {Intel 8051 and variants,}
+			<
+		}
+		166 {
+			>
+				emit {STMicroelectronics STxP7x family,}
+			<
+		}
+		167 {
+			>
+				emit {Andes embedded RISC,}
+			<
+		}
+		168 {
+			>
+				emit {Cyan eCOG1X family,}
+			<
+		}
+		169 {
+			>
+				emit {Dallas MAXQ30,}
+			<
+		}
+		170 {
+			>
+				emit {New Japan Radio (NJR) 16-bit DSP,}
+			<
+		}
+		171 {
+			>
+				emit {M2000 Reconfigurable RISC,}
+			<
+		}
+		172 {
+			>
+				emit {Cray NV2 vector architecture,}
+			<
+		}
+		173 {
+			>
+				emit {Renesas RX family,}
+			<
+		}
+		174 {
+			>
+				emit META,
+			<
+		}
+		175 {
+			>
+				emit {MCST Elbrus,}
+			<
+		}
+		176 {
+			>
+				emit {Cyan Technology eCOG16 family,}
+			<
+		}
+		177 {
+			>
+				emit {NatSemi CompactRISC,}
+			<
+		}
+		178 {
+			>
+				emit {Freescale Extended Time Processing Unit,}
+			<
+		}
+		179 {
+			>
+				emit {Infineon SLE9X,}
+			<
+		}
+		180 {
+			>
+				emit {Intel L1OM,}
+			<
+		}
+		181 {
+			>
+				emit {Intel K1OM,}
+			<
+		}
+		183 {
+			>
+				emit {ARM aarch64,}
+			<
+		}
+		185 {
+			>
+				emit {Atmel 32-bit family,}
+			<
+		}
+		186 {
+			>
+				emit {STMicroeletronics STM8 8-bit,}
+			<
+		}
+		187 {
+			>
+				emit {Tilera TILE64,}
+			<
+		}
+		188 {
+			>
+				emit {Tilera TILEPro,}
+			<
+		}
+		189 {
+			>
+				emit {Xilinx MicroBlaze 32-bit RISC,}
+			<
+		}
+		190 {
+			>
+				emit {NVIDIA CUDA architecture,}
+			<
+		}
+		191 {
+			>
+				emit {Tilera TILE-Gx,}
+			<
+		}
+		197 {
+			>
+				emit {Renesas RL78 family,}
+			<
+		}
+		199 {
+			>
+				emit {Renesas 78K0R,}
+			<
+		}
+		200 {
+			>
+				emit {Freescale 56800EX,}
+			<
+		}
+		201 {
+			>
+				emit {Beyond BA1,}
+			<
+		}
+		202 {
+			>
+				emit {Beyond BA2,}
+			<
+		}
+		203 {
+			>
+				emit {XMOS xCORE,}
+			<
+		}
+		204 {
+			>
+				emit {Microchip 8-bit PIC(r),}
+			<
+		}
+		210 {
+			>
+				emit {KM211 KM32,}
+			<
+		}
+		211 {
+			>
+				emit {KM211 KMX32,}
+			<
+		}
+		212 {
+			>
+				emit {KM211 KMX16,}
+			<
+		}
+		213 {
+			>
+				emit {KM211 KMX8,}
+			<
+		}
+		214 {
+			>
+				emit {KM211 KVARC,}
+			<
+		}
+		215 {
+			>
+				emit {Paneve CDP,}
+			<
+		}
+		216 {
+			>
+				emit {Cognitive Smart Memory,}
+			<
+		}
+		217 {
+			>
+				emit {iCelero CoolEngine,}
+			<
+		}
+		218 {
+			>
+				emit {Nanoradio Optimized RISC,}
+			<
+		}
+		243 {
+			>
+				emit {UCB RISC-V,}
+			<
+		}
+		4183 {
+			>
+				emit {AVR (unofficial),}
+			<
+		}
+		4185 {
+			>
+				emit {MSP430 (unofficial),}
+			<
+		}
+		4643 {
+			>
+				emit {Adapteva Epiphany (unofficial),}
+			<
+		}
+		9520 {
+			>
+				emit {Morpho MT (unofficial),}
+			<
+		}
+		13104 {
+			>
+				emit {FR30 (unofficial),}
+			<
+		}
+		13350 {
+			>
+				emit {OpenRISC (obsolete),}
+			<
+		}
+		18056 {
+			>
+				emit {Infineon C166 (unofficial),}
+			<
+		}
+		21569 {
+			>
+				emit {Cygnus FRV (unofficial),}
+			<
+		}
+		23205 {
+			>
+				emit {DLX (unofficial),}
+			<
+		}
+		30288 {
+			>
+				emit {Cygnus D10V (unofficial),}
+			<
+		}
+		30326 {
+			>
+				emit {Cygnus D30V (unofficial),}
+			<
+		}
+	}
+	
+	if {[D [O 18]]} {
+		>
+			if {[N leshort [O 18] 0 0 {} {} x {}]} {
+				>
+					emit {*unknown arch 0x%x*}
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv lelong [O 20] 0 {} {}] {
+		0 {
+			>
+				emit {invalid version}
+			<
+		}
+		1 {
+			>
+				emit {version 1}
+			<
+		}
+	}
+	}}
+	79
+		{partid {switch [Nv ubyte [O 0] 0 {} {}] {
+		0 {
+			>
+				emit Unused
+			<
+		}
+		1 {
+			>
+				emit {12-bit FAT}
+			<
+		}
+		2 {
+			>
+				emit {XENIX /}
+			<
+		}
+		3 {
+			>
+				emit {XENIX /usr}
+			<
+		}
+		4 {
+			>
+				emit {16-bit FAT, less than 32M}
+			<
+		}
+		5 {
+			>
+				emit {extended partition}
+			<
+		}
+		6 {
+			>
+				emit {16-bit FAT, more than 32M}
+			<
+		}
+		7 {
+			>
+				emit {OS/2 HPFS, NTFS, QNX2, Adv. UNIX}
+			<
+		}
+		8 {
+			>
+				emit {AIX or os, or etc.}
+			<
+		}
+		9 {
+			>
+				emit {AIX boot partition or Coherent}
+			<
+		}
+		10 {
+			>
+				emit {O/2 boot manager or Coherent swap}
+			<
+		}
+		11 {
+			>
+				emit {32-bit FAT}
+			<
+		}
+		12 {
+			>
+				emit {32-bit FAT, LBA-mapped}
+			<
+		}
+		13 {
+			>
+				emit {7XXX, LBA-mapped}
+			<
+		}
+		14 {
+			>
+				emit {16-bit FAT, LBA-mapped}
+			<
+		}
+		15 {
+			>
+				emit {extended partition, LBA-mapped}
+			<
+		}
+		16 {
+			>
+				emit OPUS
+			<
+		}
+		17 {
+			>
+				emit {OS/2 DOS 12-bit FAT}
+			<
+		}
+		18 {
+			>
+				emit {Compaq diagnostics}
+			<
+		}
+		20 {
+			>
+				emit {OS/2 DOS 16-bit FAT <32M}
+			<
+		}
+		22 {
+			>
+				emit {OS/2 DOS 16-bit FAT >=32M}
+			<
+		}
+		23 {
+			>
+				emit {OS/2 hidden IFS}
+			<
+		}
+		24 {
+			>
+				emit {AST Windows swapfile}
+			<
+		}
+		25 {
+			>
+				emit {Willowtech Photon coS}
+			<
+		}
+		27 {
+			>
+				emit {hidden win95 fat 32}
+			<
+		}
+		28 {
+			>
+				emit {hidden win95 fat 32 lba}
+			<
+		}
+		29 {
+			>
+				emit {hidden win95 fat 16 lba}
+			<
+		}
+		32 {
+			>
+				emit {Willowsoft OFS1}
+			<
+		}
+		33 {
+			>
+				emit reserved
+			<
+		}
+		35 {
+			>
+				emit reserved
+			<
+		}
+		36 {
+			>
+				emit {NEC DOS}
+			<
+		}
+		38 {
+			>
+				emit reserved
+			<
+		}
+		49 {
+			>
+				emit reserved
+			<
+		}
+		50 {
+			>
+				emit {Alien Internet Services NOS}
+			<
+		}
+		51 {
+			>
+				emit reserved
+			<
+		}
+		52 {
+			>
+				emit reserved
+			<
+		}
+		53 {
+			>
+				emit {JFS on OS2}
+			<
+		}
+		54 {
+			>
+				emit reserved
+			<
+		}
+		56 {
+			>
+				emit Theos
+			<
+		}
+		57 {
+			>
+				emit {Plan 9, or Theos spanned}
+			<
+		}
+		58 {
+			>
+				emit {Theos ver 4 4gb partition}
+			<
+		}
+		59 {
+			>
+				emit {Theos ve 4 extended partition}
+			<
+		}
+		60 {
+			>
+				emit {PartitionMagic recovery}
+			<
+		}
+		61 {
+			>
+				emit {Hidden Netware}
+			<
+		}
+		64 {
+			>
+				emit {VENIX 286 or LynxOS}
+			<
+		}
+		65 {
+			>
+				emit PReP
+			<
+		}
+		66 {
+			>
+				emit {linux swap sharing DRDOS disk}
+			<
+		}
+		67 {
+			>
+				emit {linux sharing DRDOS disk}
+			<
+		}
+		68 {
+			>
+				emit {GoBack change utility}
+			<
+		}
+		69 {
+			>
+				emit {Boot US Boot manager}
+			<
+		}
+		70 {
+			>
+				emit {EUMEL/Elan or Ergos 3}
+			<
+		}
+		71 {
+			>
+				emit {EUMEL/Elan or Ergos 3}
+			<
+		}
+		72 {
+			>
+				emit {EUMEL/Elan or Ergos 3}
+			<
+		}
+		74 {
+			>
+				emit {ALFX/THIN filesystem for DOS}
+			<
+		}
+		76 {
+			>
+				emit {Oberon partition}
+			<
+		}
+		77 {
+			>
+				emit QNX4.x
+			<
+		}
+		78 {
+			>
+				emit {QNX4.x 2nd part}
+			<
+		}
+		79 {
+			>
+				emit {QNX4.x 3rd part}
+			<
+		}
+		80 {
+			>
+				emit {DM (disk manager)}
+			<
+		}
+		81 {
+			>
+				emit {DM6 Aux1 (or Novell)}
+			<
+		}
+		82 {
+			>
+				emit {CP/M or Microport SysV/AT}
+			<
+		}
+		83 {
+			>
+				emit {DM6 Aux3}
+			<
+		}
+		84 {
+			>
+				emit {DM6 DDO}
+			<
+		}
+		85 {
+			>
+				emit {EZ-Drive (disk manager)}
+			<
+		}
+		86 {
+			>
+				emit {Golden Bow (disk manager)}
+			<
+		}
+		87 {
+			>
+				emit {Drive PRO}
+			<
+		}
+		92 {
+			>
+				emit {Priam Edisk (disk manager)}
+			<
+		}
+		97 {
+			>
+				emit SpeedStor
+			<
+		}
+		99 {
+			>
+				emit {GNU HURD or Mach or Sys V/386}
+			<
+		}
+		100 {
+			>
+				emit {Novell Netware 2.xx or Speedstore}
+			<
+		}
+		101 {
+			>
+				emit {Novell Netware 3.xx}
+			<
+		}
+		102 {
+			>
+				emit {Novell 386 Netware}
+			<
+		}
+		103 {
+			>
+				emit Novell
+			<
+		}
+		104 {
+			>
+				emit Novell
+			<
+		}
+		105 {
+			>
+				emit Novell
+			<
+		}
+		112 {
+			>
+				emit {DiskSecure Multi-Boot}
+			<
+		}
+		113 {
+			>
+				emit reserved
+			<
+		}
+		115 {
+			>
+				emit reserved
+			<
+		}
+		116 {
+			>
+				emit reserved
+			<
+		}
+		117 {
+			>
+				emit PC/IX
+			<
+		}
+		118 {
+			>
+				emit reserved
+			<
+		}
+		119 {
+			>
+				emit {M2FS/M2CS partition}
+			<
+		}
+		120 {
+			>
+				emit {XOSL boot loader filesystem}
+			<
+		}
+		128 {
+			>
+				emit {MINIX until 1.4a}
+			<
+		}
+		129 {
+			>
+				emit {MINIX since 1.4b}
+			<
+		}
+		130 {
+			>
+				emit {Linux swap or Solaris}
+			<
+		}
+		131 {
+			>
+				emit {Linux native}
+			<
+		}
+		132 {
+			>
+				emit {OS/2 hidden C: drive}
+			<
+		}
+		133 {
+			>
+				emit {Linux extended partition}
+			<
+		}
+		134 {
+			>
+				emit {NT FAT volume set}
+			<
+		}
+		135 {
+			>
+				emit {NTFS volume set or HPFS mirrored}
+			<
+		}
+		138 {
+			>
+				emit {Linux Kernel AiR-BOOT partition}
+			<
+		}
+		139 {
+			>
+				emit {Legacy Fault tolerant FAT32}
+			<
+		}
+		140 {
+			>
+				emit {Legacy Fault tolerant FAT32 ext}
+			<
+		}
+		141 {
+			>
+				emit {Hidden free FDISK FAT12}
+			<
+		}
+		142 {
+			>
+				emit {Linux Logical Volume Manager}
+			<
+		}
+		144 {
+			>
+				emit {Hidden free FDISK FAT16}
+			<
+		}
+		145 {
+			>
+				emit {Hidden free FDISK DOS EXT}
+			<
+		}
+		146 {
+			>
+				emit {Hidden free FDISK FAT16 Big}
+			<
+		}
+		147 {
+			>
+				emit {Amoeba filesystem}
+			<
+		}
+		148 {
+			>
+				emit {Amoeba bad block table}
+			<
+		}
+		149 {
+			>
+				emit {MIT EXOPC native partitions}
+			<
+		}
+		151 {
+			>
+				emit {Hidden free FDISK FAT32}
+			<
+		}
+		152 {
+			>
+				emit {Datalight ROM-DOS Super-Boot}
+			<
+		}
+		153 {
+			>
+				emit {Mylex EISA SCSI}
+			<
+		}
+		154 {
+			>
+				emit {Hidden free FDISK FAT16 LBA}
+			<
+		}
+		155 {
+			>
+				emit {Hidden free FDISK EXT LBA}
+			<
+		}
+		159 {
+			>
+				emit BSDI?
+			<
+		}
+		160 {
+			>
+				emit {IBM Thinkpad hibernation}
+			<
+		}
+		161 {
+			>
+				emit {HP Volume expansion (SpeedStor)}
+			<
+		}
+		163 {
+			>
+				emit {HP Volume expansion (SpeedStor)}
+			<
+		}
+		164 {
+			>
+				emit {HP Volume expansion (SpeedStor)}
+			<
+		}
+		165 {
+			>
+				emit {386BSD partition type}
+			<
+		}
+		166 {
+			>
+				emit {OpenBSD partition type}
+			<
+		}
+		167 {
+			>
+				emit {NeXTSTEP 486}
+			<
+		}
+		168 {
+			>
+				emit {Apple UFS}
+			<
+		}
+		169 {
+			>
+				emit {NetBSD partition type}
+			<
+		}
+		170 {
+			>
+				emit {Olivetty Fat12 1.44MB Service part}
+			<
+		}
+		171 {
+			>
+				emit {Apple Boot}
+			<
+		}
+		174 {
+			>
+				emit {SHAG OS filesystem}
+			<
+		}
+		175 {
+			>
+				emit {Apple HFS}
+			<
+		}
+		176 {
+			>
+				emit {BootStar Dummy}
+			<
+		}
+		177 {
+			>
+				emit reserved
+			<
+		}
+		179 {
+			>
+				emit reserved
+			<
+		}
+		180 {
+			>
+				emit reserved
+			<
+		}
+		182 {
+			>
+				emit reserved
+			<
+		}
+		183 {
+			>
+				emit {BSDI BSD/386 filesystem}
+			<
+		}
+		184 {
+			>
+				emit {BSDI BSD/386 swap}
+			<
+		}
+		187 {
+			>
+				emit {Boot Wizard Hidden}
+			<
+		}
+		190 {
+			>
+				emit {Solaris 8 partition type}
+			<
+		}
+		191 {
+			>
+				emit {Solaris partition type}
+			<
+		}
+		192 {
+			>
+				emit CTOS
+			<
+		}
+		193 {
+			>
+				emit {DRDOS/sec (FAT-12)}
+			<
+		}
+		194 {
+			>
+				emit {Hidden Linux}
+			<
+		}
+		195 {
+			>
+				emit {Hidden Linux swap}
+			<
+		}
+		196 {
+			>
+				emit {DRDOS/sec (FAT-16, < 32M)}
+			<
+		}
+		197 {
+			>
+				emit {DRDOS/sec (EXT)}
+			<
+		}
+		198 {
+			>
+				emit {DRDOS/sec (FAT-16, >= 32M)}
+			<
+		}
+		199 {
+			>
+				emit {Syrinx (Cyrnix?) or HPFS disabled}
+			<
+		}
+		200 {
+			>
+				emit {Reserved for DR-DOS 8.0+}
+			<
+		}
+		201 {
+			>
+				emit {Reserved for DR-DOS 8.0+}
+			<
+		}
+		202 {
+			>
+				emit {Reserved for DR-DOS 8.0+}
+			<
+		}
+		203 {
+			>
+				emit {DR-DOS 7.04+ Secured FAT32 CHS}
+			<
+		}
+		204 {
+			>
+				emit {DR-DOS 7.04+ Secured FAT32 LBA}
+			<
+		}
+		205 {
+			>
+				emit {CTOS Memdump}
+			<
+		}
+		206 {
+			>
+				emit {DR-DOS 7.04+ FAT16X LBA}
+			<
+		}
+		207 {
+			>
+				emit {DR-DOS 7.04+ EXT LBA}
+			<
+		}
+		208 {
+			>
+				emit {REAL/32 secure big partition}
+			<
+		}
+		209 {
+			>
+				emit {Old Multiuser DOS FAT12}
+			<
+		}
+		212 {
+			>
+				emit {Old Multiuser DOS FAT16 Small}
+			<
+		}
+		213 {
+			>
+				emit {Old Multiuser DOS Extended}
+			<
+		}
+		214 {
+			>
+				emit {Old Multiuser DOS FAT16 Big}
+			<
+		}
+		216 {
+			>
+				emit {CP/M 86}
+			<
+		}
+		219 {
+			>
+				emit {CP/M or Concurrent CP/M}
+			<
+		}
+		221 {
+			>
+				emit {Hidden CTOS Memdump}
+			<
+		}
+		222 {
+			>
+				emit {Dell PowerEdge Server utilities}
+			<
+		}
+		223 {
+			>
+				emit {DG/UX virtual disk manager}
+			<
+		}
+		224 {
+			>
+				emit {STMicroelectronics ST AVFS}
+			<
+		}
+		225 {
+			>
+				emit {DOS access or SpeedStor 12-bit}
+			<
+		}
+		227 {
+			>
+				emit {DOS R/O or Storage Dimensions}
+			<
+		}
+		228 {
+			>
+				emit {SpeedStor 16-bit FAT < 1024 cyl.}
+			<
+		}
+		229 {
+			>
+				emit reserved
+			<
+		}
+		230 {
+			>
+				emit reserved
+			<
+		}
+		235 {
+			>
+				emit BeOS
+			<
+		}
+		238 {
+			>
+				emit {GPT Protective MBR}
+			<
+		}
+		239 {
+			>
+				emit {EFI system partition}
+			<
+		}
+		240 {
+			>
+				emit {Linux PA-RISC boot loader}
+			<
+		}
+		241 {
+			>
+				emit {SpeedStor or Storage Dimensions}
+			<
+		}
+		242 {
+			>
+				emit {DOS 3.3+ Secondary}
+			<
+		}
+		243 {
+			>
+				emit reserved
+			<
+		}
+		244 {
+			>
+				emit {SpeedStor large partition}
+			<
+		}
+		245 {
+			>
+				emit {Prologue multi-volumen partition}
+			<
+		}
+		246 {
+			>
+				emit reserved
+			<
+		}
+		249 {
+			>
+				emit {pCache: ext2/ext3 persistent cache}
+			<
+		}
+		250 {
+			>
+				emit {Bochs x86 emulator}
+			<
+		}
+		251 {
+			>
+				emit {VMware File System}
+			<
+		}
+		252 {
+			>
+				emit {VMware Swap}
+			<
+		}
+		253 {
+			>
+				emit {Linux RAID partition persistent sb}
+			<
+		}
+		254 {
+			>
+				emit {LANstep or IBM PS/2 IML}
+			<
+		}
+		255 {
+			>
+				emit {Xenix Bad Block Table}
+			<
+		}
+	}
+	} DOS-filename {if {[N ubyte [O 0] 0 0 & 223 > 0]} {
+		>
+			if {[N ubyte [O 0] 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+					if {[N ubyte [O 1] 0 0 & 223 > 0]} {
+						>
+							if {[N ubyte [O 1] 0 0 {} {} x {}]} {
+								>
+									emit {\b%c}
+									if {[N ubyte [O 2] 0 0 & 223 > 0]} {
+										>
+											if {[N ubyte [O 2] 0 0 {} {} x {}]} {
+												>
+													emit {\b%c}
+													if {[N ubyte [O 3] 0 0 & 223 > 0]} {
+														>
+															if {[N ubyte [O 3] 0 0 {} {} x {}]} {
+																>
+																	emit {\b%c}
+																	if {[N ubyte [O 4] 0 0 & 223 > 0]} {
+																		>
+																			if {[N ubyte [O 4] 0 0 {} {} x {}]} {
+																				>
+																					emit {\b%c}
+																					if {[N ubyte [O 5] 0 0 & 223 > 0]} {
+																						>
+																							if {[N ubyte [O 5] 0 0 {} {} x {}]} {
+																								>
+																									emit {\b%c}
+																									if {[N ubyte [O 6] 0 0 & 223 > 0]} {
+																										>
+																											if {[N ubyte [O 6] 0 0 {} {} x {}]} {
+																												>
+																													emit {\b%c}
+																													if {[N ubyte [O 7] 0 0 & 223 > 0]} {
+																														>
+																															if {[N ubyte [O 7] 0 0 {} {} x {}]} {
+																																>
+																																	emit {\b%c}
+																																<
+																															}
+	
+																														<
+																													}
+	
+																												<
+																											}
+	
+																										<
+																									}
+	
+																								<
+																							}
+	
+																						<
+																					}
+	
+																				<
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ubyte [O 8] 0 0 & 223 > 0]} {
+				>
+					emit {\b.}
+					if {[N ubyte [O 8] 0 0 {} {} x {}]} {
+						>
+							emit {\b%c}
+							if {[N ubyte [O 9] 0 0 & 223 > 0]} {
+								>
+									if {[N ubyte [O 9] 0 0 {} {} x {}]} {
+										>
+											emit {\b%c}
+											if {[N ubyte [O 10] 0 0 & 223 > 0]} {
+												>
+													if {[N ubyte [O 10] 0 0 {} {} x {}]} {
+														>
+															emit {\b%c}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	} 2xDOS-filename {if {[N ubyte [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {\b}
+		<
+	}
+	
+	U 79 DOS-filename [O 0]
+	
+	if {[N ubyte [O 11] 0 0 {} {} x {}]} {
+		>
+			emit {\b+}
+		<
+	}
+	
+	U 79 DOS-filename [O 11]
+	} partition-table {U 79 partition-entry-test [O 0]
+	
+	U 79 partition-entry-test [O 16]
+	
+	U 79 partition-entry-test [O 32]
+	
+	U 79 partition-entry-test [O 48]
+	} partition-entry-test {if {[N ubyte [O 4] 0 0 {} {} > 0]} {
+		>
+			if {[N ubyte [O 0] 0 0 {} {} == 0]} {
+				>
+					U 79 partition-entry [O 0]
+	
+				<
+			}
+	
+			if {[N ubyte [O 0] 0 0 {} {} > 127]} {
+				>
+					U 79 partition-entry [O 0]
+	
+				<
+			}
+	
+		<
+	}
+	} partition-entry {if {[N ubyte [O 4] 0 0 {} {} > 0]} {
+		>
+			emit {\b; partition}
+			if {[N leshort [O 64] 0 0 {} {} == -21931]} {
+				>
+					emit 1
+				<
+			}
+	
+			if {[N leshort [O 48] 0 0 {} {} == -21931]} {
+				>
+					emit 2
+				<
+			}
+	
+			if {[N leshort [O 32] 0 0 {} {} == -21931]} {
+				>
+					emit 3
+				<
+			}
+	
+			if {[N leshort [O 16] 0 0 {} {} == -21931]} {
+				>
+					emit 4
+				<
+			}
+	
+			if {[N ubyte [O 4] 0 0 {} {} x {}]} {
+				>
+					emit {: ID=0x%x}
+				<
+			}
+	
+			if {[N ubyte [O 0] 0 0 & 128 == 128]} {
+				>
+					emit {\b, active}
+				<
+			}
+	
+			if {[N ubyte [O 0] 0 0 {} {} > 128]} {
+				>
+					emit 0x%x
+				<
+			}
+	
+			if {[N ubyte [O 1] 0 0 {} {} x {}]} {
+				>
+					emit {\b, start-CHS (}
+				<
+			}
+	
+			U 79 partition-chs [O 1]
+	
+			if {[N ubyte [O 5] 0 0 {} {} x {}]} {
+				>
+					emit {\b), end-CHS (}
+				<
+			}
+	
+			U 79 partition-chs [O 5]
+	
+			if {[N ulelong [O 8] 0 0 {} {} x {}]} {
+				>
+					emit {\b), startsector %u}
+				<
+			}
+	
+			if {[N ulelong [O 12] 0 0 {} {} x {}]} {
+				>
+					emit {\b, %u sectors}
+				<
+			}
+	
+		<
+	}
+	} partition-chs {if {[N ubyte [O 1] 0 0 {} {} x {}]} {
+		>
+			emit {\b0x}
+		<
+	}
+	
+	switch [Nv ubyte [O 1] 0 & 192] {
+		64 {
+			>
+				emit {\b1}
+			<
+		}
+		128 {
+			>
+				emit {\b2}
+			<
+		}
+		192 {
+			>
+				emit {\b3}
+			<
+		}
+	}
+	
+	if {[N ubyte [O 2] 0 0 {} {} x {}]} {
+		>
+			emit {\b%x}
+		<
+	}
+	
+	if {[N ubyte [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {\b,%u}
+		<
+	}
+	
+	if {[N ubyte [O 1] 0 0 & 63 x {}]} {
+		>
+			emit {\b,%u}
+		<
+	}
+	} cdrom {if {[S string [O 38913] 0 {} {} ne NSR0]} {
+		>
+			emit {ISO 9660 CD-ROM filesystem data}
+			mime application/x-iso9660-image
+			ext iso/iso9660
+		<
+	}
+	
+	if {[S string [O 38913] 0 {} {} eq NSR0]} {
+		>
+			emit {UDF filesystem data}
+			if {[S string [O 38917] 0 {} {} eq 1]} {
+				>
+					emit {(version 1.0)}
+				<
+			}
+	
+			if {[S string [O 38917] 0 {} {} eq 2]} {
+				>
+					emit {(version 1.5)}
+				<
+			}
+	
+			if {[S string [O 38917] 0 {} {} eq 3]} {
+				>
+					emit {(version 2.0)}
+				<
+			}
+	
+			if {[N byte [O 38917] 0 0 {} {} > 51]} {
+				>
+					emit {(unknown version, ID 0x%X)}
+				<
+			}
+	
+			if {[N byte [O 38917] 0 0 {} {} < 49]} {
+				>
+					emit {(unknown version, ID 0x%X)}
+				<
+			}
+	
+			mime application/x-iso9660-image
+			ext iso/udf
+		<
+	}
+	
+	if {[N leshort [O 510] 0 0 {} {} == -21931]} {
+		>
+			emit {(DOS/MBR boot sector)}
+		<
+	}
+	
+	if {[S string [O 32808] 0 T {} > \0]} {
+		>
+			emit '%s'
+		<
+	}
+	
+	if {[S string [O 34816] 0 {} {} eq \000CD001\001EL\ TORITO\ SPECIFICATION]} {
+		>
+			emit (bootable)
+		<
+	}
+	}}
+	81
+		{swf-details {if {[S string [O 0] 0 {} {} eq F]} {
+		>
+			if {[N byte [O 8] 0 0 & -3 == 8]} {
+				>
+					emit {Macromedia Flash data}
+					if {[N byte [O 3] 0 0 {} {} x {}]} {
+						>
+							emit {\b, version %d}
+						<
+					}
+	
+					mime application/x-shockwave-flash
+				<
+			}
+	
+			if {[N byte [O 8] 0 0 & -2 == 16]} {
+				>
+					emit {Macromedia Flash data}
+					if {[N byte [O 3] 0 0 {} {} x {}]} {
+						>
+							emit {\b, version %d}
+						<
+					}
+	
+					mime application/x-shockwave-flash
+				<
+			}
+	
+			if {[N byte [O 8] 0 0 {} {} == 24]} {
+				>
+					emit {Macromedia Flash data}
+					if {[N byte [O 3] 0 0 {} {} x {}]} {
+						>
+							emit {\b, version %d}
+						<
+					}
+	
+					mime application/x-shockwave-flash
+				<
+			}
+	
+			if {[N beshort [O 8] 0 0 & -121 == 8192]} {
+				>
+					emit {Macromedia Flash data}
+					if {[N byte [O 3] 0 0 {} {} x {}]} {
+						>
+							emit {\b, version %d}
+						<
+					}
+	
+					mime application/x-shockwave-flash
+				<
+			}
+	
+			if {[N beshort [O 8] 0 0 & -32 == 12288]} {
+				>
+					emit {Macromedia Flash data}
+					if {[N byte [O 3] 0 0 {} {} x {}]} {
+						>
+							emit {\b, version %d}
+						<
+					}
+	
+					mime application/x-shockwave-flash
+				<
+			}
+	
+			if {[N byte [O 8] 0 0 & 7 == 0]} {
+				>
+					if {[N ubyte [O 8] 0 0 {} {} > 47]} {
+						>
+							if {[N ubyte [O 9] 0 0 {} {} < 32]} {
+								>
+									emit {Macromedia Flash data}
+									if {[N byte [O 3] 0 0 {} {} x {}]} {
+										>
+											emit {\b, version %d}
+										<
+									}
+	
+									mime application/x-shockwave-flash
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq C]} {
+		>
+			if {[N byte [O 8] 0 0 {} {} == 120]} {
+				>
+					emit {Macromedia Flash data (compressed)}
+					if {[N byte [O 3] 0 0 {} {} x {}]} {
+						>
+							emit {\b, version %d}
+						<
+					}
+	
+					mime application/x-shockwave-flash
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq Z]} {
+		>
+			if {[N byte [O 8] 0 0 {} {} == 93]} {
+				>
+					emit {Macromedia Flash data (lzma compressed)}
+					if {[N byte [O 3] 0 0 {} {} x {}]} {
+						>
+							emit {\b, version %d}
+						<
+					}
+	
+					mime application/x-shockwave-flash
+				<
+			}
+	
+		<
+	}
+	}}
+	83
+		{sfnt-font {if {[N ubeshort [O 4] 0 0 {} {} < 47]} {
+		>
+			if {[S regex [O 12] 0 l 4 eq ^\[A-Za-z\]\[A-Za-z\]\[A-Za-z/\]\[A-Za-z2\ \]]} {
+				>
+					if {[N ubelong [O 0] 0 0 {} {} != 1330926671]} {
+						>
+							emit TrueType
+							mime application/font-sfnt
+							ext ttf/tte
+						<
+					}
+	
+					if {[N ubelong [O 0] 0 0 {} {} == 1330926671]} {
+						>
+							emit OpenType
+							mime application/font-sfnt
+							ext otf
+						<
+					}
+	
+					if {[N ubelong [O 0] 0 0 {} {} x {}]} {
+						>
+							emit {Font data}
+						<
+					}
+	
+					if {[S search [O 12] 0 {} 432 eq DSIG]} {
+						>
+							emit {\b, digitally signed}
+						<
+					}
+	
+					if {[N ubeshort [O 4] 0 0 {} {} x {}]} {
+						>
+							emit {\b, %d tables}
+						<
+					}
+	
+					if {[S string [O 12] 0 {} {} x {}]} {
+						>
+							emit {\b, 1st "%4.4s"}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	} sfnt-names {if {[S search [O 12] 0 {} 432 eq s]} {
+		>
+			emit {name		}
+			if {[N ubelong [R [O 8]] 0 0 {} {} > 1048576]} {
+				>
+					if {[N ubelong [R [O -4]] 0 0 {} {} x {}]} {
+						>
+							emit {\b, name offset 0x%x}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ubelong [R [O 8]] 0 0 {} {} < 1048576]} {
+				>
+					if {[N ubelong [R [O -16]] 0 0 {} {} x {}]} {
+						>
+							if {[N ubequad [O [I [R 8] ubelong 0 + 0 0]] 0 0 {} {} x {}]} {
+								>
+									if {[N ubeshort [R [O -6]] 0 0 {} {} x {}]} {
+										>
+											emit {\b, %d names}
+										<
+									}
+	
+									switch [Nv ubeshort [R [O -2]] 0 {} {}] {
+										0 {
+											>
+												emit {\b, Unicode}
+											<
+										}
+										1 {
+											>
+												emit {\b, Macintosh}
+											<
+										}
+										3 {
+											>
+												emit {\b, Microsoft}
+											<
+										}
+									}
+	
+									if {[N ubeshort [R [O 2]] 0 0 {} {} > 0]} {
+										>
+											emit {\b, language 0x%x}
+										<
+									}
+	
+									if {[N ubeshort [R [O 4]] 0 0 {} {} > 0]} {
+										>
+											emit {\b, type %d string}
+										<
+									}
+	
+									if {[N ubeshort [R [O 0]] 0 0 {} {} == 0]} {
+										>
+											if {[N ubeshort [R [O 6]] 0 0 {} {} == 0]} {
+												>
+													if {[N ubyte [R [O [I [R -14] ubeshort 0 - 0 18]]] 0 0 {} {} != 0]} {
+														>
+															if {[S string [R [O -1]] 0 {} {} x {}]} {
+																>
+																	emit {\b, %-11.96s}
+																<
+															}
+	
+														<
+													}
+	
+													if {[N ubyte [R [O [I [R -14] ubeshort 0 - 0 18]]] 0 0 {} {} == 0]} {
+														>
+															if {[S lestring16 [R [O 0]] 0 {} {} x {}]} {
+																>
+																	emit {\b, %-11.96s}
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[N ubeshort [R [O 0]] 0 0 {} {} > 0]} {
+										>
+											if {[N ubeshort [R [O 6]] 0 0 {} {} == 0]} {
+												>
+													if {[S lestring16 [R [O [I [R -14] ubeshort 0 - 0 17]]] 0 {} {} x {}]} {
+														>
+															emit {\b, %-11.96s}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	} woff {switch [Nv belong [O 4] 0 {} {}] {
+		65536 {
+			>
+				emit {\b, TrueType}
+			<
+		}
+		1330926671 {
+			>
+				emit {\b, CFF}
+			<
+		}
+		1953658213 {
+			>
+				emit {\b, TrueType}
+			<
+		}
+	}
+	
+	if {[D [O 4]]} {
+		>
+			if {[N belong [O 4] 0 0 {} {} x {}]} {
+				>
+					emit {\b, flavor %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N belong [O 8] 0 0 {} {} x {}]} {
+		>
+			emit {\b, length %d}
+		<
+	}
+	}}
+	89
+		{pak-entry {if {[N ulelong [O 56] 0 0 {} {} > 11]} {
+		>
+			if {[N ulelong [O 56] 0 0 {} {} x {}]} {
+				>
+					emit {at 0x%x}
+				<
+			}
+	
+			if {[N ulelong [O 60] 0 0 {} {} x {}]} {
+				>
+					emit {%u bytes}
+				<
+			}
+	
+			if {[S string [O 0] 0 {} {} x {}]} {
+				>
+					emit '%-.56s'
+				<
+			}
+	
+			emit {\b: }
+			T [O [I 56 long 0 + 0 0]] {}
+	
+		<
+	}
+	}}
+	98
+		{gpt-mbr-type {if {[N ubyte [O 450] 0 0 {} {} == 238]} {
+		>
+			if {[N ulelong [O 454] 0 0 {} {} == 1]} {
+				>
+					if {[S string [O 462] 0 {} {} ne \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+						>
+							emit {\b (with hybrid MBR)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulelong [O 454] 0 0 {} {} != 1]} {
+				>
+					emit {\b (nonstandard: not at LBA 1)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubyte [O 466] 0 0 {} {} == 238]} {
+		>
+			if {[N ulelong [O 470] 0 0 {} {} == 1]} {
+				>
+					if {[S string [O 478] 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+						>
+							if {[S string [O 446] 0 {} {} ne \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+								>
+									emit {\b (with hybrid MBR)}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string [O 478] 0 {} {} ne \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+						>
+							emit {\b (with hybrid MBR)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulelong [O 470] 0 0 {} {} != 1]} {
+				>
+					emit {\b (nonstandard: not at LBA 1)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubyte [O 482] 0 0 {} {} == 238]} {
+		>
+			if {[N ulelong [O 486] 0 0 {} {} == 1]} {
+				>
+					if {[S string [O 494] 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+						>
+							if {[S string [O 446] 0 {} {} ne \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+								>
+									emit {\b (with hybrid MBR)}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string [O 494] 0 {} {} ne \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+						>
+							emit {\b (with hybrid MBR)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulelong [O 486] 0 0 {} {} != 1]} {
+				>
+					emit {\b (nonstandard: not at LBA 1)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubyte [O 498] 0 0 {} {} == 238]} {
+		>
+			if {[N ulelong [O 502] 0 0 {} {} == 1]} {
+				>
+					if {[S string [O 446] 0 {} {} ne \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+						>
+							emit {\b (with hybrid MBR)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulelong [O 502] 0 0 {} {} != 1]} {
+				>
+					emit {\b (nonstandard: not at LBA 1)}
+				<
+			}
+	
+		<
+	}
+	} gpt-table {if {[N uleshort [O 10] 0 0 {} {} x {}]} {
+		>
+			emit {\b, version %u}
+		<
+	}
+	
+	if {[N uleshort [O 8] 0 0 {} {} x {}]} {
+		>
+			emit {\b.%u}
+		<
+	}
+	
+	if {[N ulelong [O 56] 0 0 {} {} x {}]} {
+		>
+			emit {\b, GUID: %08x}
+		<
+	}
+	
+	if {[N uleshort [O 60] 0 0 {} {} x {}]} {
+		>
+			emit {\b-%04x}
+		<
+	}
+	
+	if {[N uleshort [O 62] 0 0 {} {} x {}]} {
+		>
+			emit {\b-%04x}
+		<
+	}
+	
+	if {[N ubeshort [O 64] 0 0 {} {} x {}]} {
+		>
+			emit {\b-%04x}
+		<
+	}
+	
+	if {[N ubeshort [O 66] 0 0 {} {} x {}]} {
+		>
+			emit {\b-%04x}
+		<
+	}
+	
+	if {[N ubelong [O 68] 0 0 {} {} x {}]} {
+		>
+			emit {\b%08x}
+		<
+	}
+	
+	if {[N ulequad [O 32] 0 0 + 1 x {}]} {
+		>
+			emit {\b, disk size: %lld sectors}
+		<
+	}
+	}}
+	109
+		{color-profile {if {[S string [O 36] 0 {} {} eq acsp]} {
+		>
+			if {[N ubeshort [O 26] 0 0 {} {} < 13]} {
+				>
+					if {[S string [O 40] 0 {} {} eq APPL]} {
+						>
+							emit ColorSync
+						<
+					}
+	
+					if {[S string [O 40] 0 {} {} eq MSFT]} {
+						>
+							emit Microsoft
+						<
+					}
+	
+					if {[S string [O 40] 0 {} {} eq SGI\ ]} {
+						>
+							emit SGI
+						<
+					}
+	
+					if {[S string [O 40] 0 {} {} eq SUNW]} {
+						>
+							emit {Sun KCMS}
+						<
+					}
+	
+					if {[S string [O 40] 0 {} {} eq TGNT]} {
+						>
+							emit Taligent
+						<
+					}
+	
+					if {[S string [O 40] 0 {} {} x {}]} {
+						>
+							emit {color profi}
+							mime application/vnd.iccprofile
+						<
+					}
+	
+					if {[N ubyte [O 8] 0 0 {} {} == 2]} {
+						>
+							if {[N ubyte [O 9] 0 0 {} {} != 0]} {
+								>
+									emit {\ble}
+									ext icc/icm
+								<
+							}
+	
+							if {[N ubyte [O 9] 0 0 {} {} == 0]} {
+								>
+									emit {\bl}
+									if {[S string [O 4] 0 {} {} eq KCMS]} {
+										>
+											emit {\be}
+											ext icc/icm/cc
+										<
+									}
+	
+									if {[S string [O 4] 0 {} {} ne KCMS]} {
+										>
+											emit {\be}
+											ext icc/icm
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ubyte [O 8] 0 0 {} {} != 2]} {
+						>
+							emit {\ble}
+							ext icc
+						<
+					}
+	
+					if {[N ubyte [O 8] 0 0 {} {} x {}]} {
+						>
+							emit %u
+						<
+					}
+	
+					if {[N ubyte [O 9] 0 0 / 16 x {}]} {
+						>
+							emit {\b.%u}
+						<
+					}
+	
+					if {[N ubyte [O 10] 0 0 {} {} > 0]} {
+						>
+							emit {\b.%u}
+							if {[N ubyte [O 11] 0 0 {} {} > 0]} {
+								>
+									emit {\b.%u}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string [O 4] 0 {} {} > \ ]} {
+						>
+							emit {\b, type %.2s}
+							if {[S string [O 6] 0 {} {} > \ ]} {
+								>
+									emit {\b%.1s}
+									if {[S string [O 7] 0 {} {} > \ ]} {
+										>
+											emit {\b%.1s}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string [O 16] 0 {} {} x {}]} {
+						>
+							emit {\b, %.3s}
+						<
+					}
+	
+					if {[S string [O 19] 0 {} {} > \ ]} {
+						>
+							emit {\b%.1s}
+						<
+					}
+	
+					if {[S string [O 20] 0 {} {} > \0]} {
+						>
+							emit {\b/%.3s}
+							if {[S string [O 23] 0 {} {} > \ ]} {
+								>
+									emit {\b%.1s}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string [O 12] 0 {} {} x {}]} {
+						>
+							emit {\b-%.4s device}
+						<
+					}
+	
+					if {[S string [O 52] 0 {} {} > \040]} {
+						>
+							if {[N ubelong [O 52] 0 0 {} {} != 1852796517]} {
+								>
+									if {[S string [O 48] 0 {} {} x {}]} {
+										>
+											emit {\b, %.2s}
+										<
+									}
+	
+									if {[S string [O 50] 0 {} {} > \ ]} {
+										>
+											emit {\b%.1s}
+										<
+									}
+	
+									if {[S string [O 51] 0 {} {} > \ ]} {
+										>
+											emit {\b%.1s}
+										<
+									}
+	
+									if {[S string [O 52] 0 {} {} > \ \ ]} {
+										>
+											emit {\b/%.3s}
+											if {[S string [O 55] 0 {} {} > \ ]} {
+												>
+													emit {\b%.1s}
+												<
+											}
+	
+										<
+									}
+	
+									if {[S string [O 52] 0 {} {} x {}]} {
+										>
+											emit model
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string [O 80] 0 {} {} > \0]} {
+						>
+							emit {by %.2s}
+							if {[S string [O 82] 0 {} {} > \ ]} {
+								>
+									emit {\b%.1s}
+									if {[S string [O 83] 0 {} {} > \ ]} {
+										>
+											emit {\b%.1s}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ubelong [O 0] 0 0 {} {} x {}]} {
+						>
+							emit {\b, %u bytes}
+						<
+					}
+	
+					if {[N ubequad [O 24] 0 0 {} {} != 0]} {
+						>
+							if {[N ubeshort [O 28] 0 0 {} {} x {}]} {
+								>
+									emit {\b, %u}
+								<
+							}
+	
+							if {[N ubeshort [O 26] 0 0 {} {} x {}]} {
+								>
+									emit {\b-%u}
+								<
+							}
+	
+							if {[N ubeshort [O 24] 0 0 {} {} x {}]} {
+								>
+									emit {\b-%u}
+								<
+							}
+	
+							if {[N ubequad [O 30] 0 0 & 18446744073709486080 != 0]} {
+								>
+									if {[N ubeshort [O 30] 0 0 {} {} x {}]} {
+										>
+											emit %u
+										<
+									}
+	
+									if {[N ubeshort [O 32] 0 0 {} {} x {}]} {
+										>
+											emit {\b:%.2u}
+										<
+									}
+	
+									if {[N ubeshort [O 34] 0 0 {} {} x {}]} {
+										>
+											emit {\b:%.2u}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ubeshort [O 44] 0 0 {} {} > 0]} {
+						>
+							emit {\b, 0x%x vendor flags}
+						<
+					}
+	
+					if {[N ubelong [O 44] 0 0 {} {} & 1]} {
+						>
+							emit {\b, embedded}
+						<
+					}
+	
+					if {[N ubelong [O 44] 0 0 {} {} & 2]} {
+						>
+							emit {\b, dependently}
+						<
+					}
+	
+					if {[N ubelong [O 44] 0 0 {} {} & 4]} {
+						>
+							emit {\b, MCS}
+						<
+					}
+	
+					if {[N ubelong [O 56] 0 0 {} {} > 0]} {
+						>
+							emit {\b, 0x%x vendor attribute}
+						<
+					}
+	
+					if {[N ubelong [O 60] 0 0 {} {} & 1]} {
+						>
+							emit {\b, transparent}
+						<
+					}
+	
+					if {[N ubelong [O 60] 0 0 {} {} & 2]} {
+						>
+							emit {\b, matte}
+						<
+					}
+	
+					if {[N ubelong [O 60] 0 0 {} {} & 4]} {
+						>
+							emit {\b, negative}
+						<
+					}
+	
+					if {[N ubelong [O 60] 0 0 {} {} & 8]} {
+						>
+							emit {\b, black&white}
+						<
+					}
+	
+					if {[N ubelong [O 60] 0 0 {} {} & 16]} {
+						>
+							emit {\b, non-paper}
+						<
+					}
+	
+					if {[N ubelong [O 60] 0 0 {} {} & 32]} {
+						>
+							emit {\b, non-textured}
+						<
+					}
+	
+					if {[N ubelong [O 60] 0 0 {} {} & 64]} {
+						>
+							emit {\b, non-isotropic}
+						<
+					}
+	
+					if {[N ubelong [O 60] 0 0 {} {} & 128]} {
+						>
+							emit {\b, self-luminous}
+						<
+					}
+	
+					if {[N ubelong [O 64] 0 0 {} {} > 3]} {
+						>
+							emit {\b, 0x%x rendering intent}
+						<
+					}
+	
+					switch [Nv ubelong [O 64] 0 {} {}] {
+						1 {
+							>
+								emit {\b, relative colorimetric}
+							<
+						}
+						2 {
+							>
+								emit {\b, saturation}
+							<
+						}
+						3 {
+							>
+								emit {\b, absolute colorimetric}
+							<
+						}
+					}
+	
+					if {[N ubequad [O 71] 0 0 {} {} != 15420326223628206291]} {
+						>
+							emit {\b, PCS}
+							if {[N ubelong [O 68] 0 0 {} {} != 63189]} {
+								>
+									emit X=0x%x
+								<
+							}
+	
+							if {[N ubelong [O 72] 0 0 {} {} != 65536]} {
+								>
+									emit Y=0x%x
+								<
+							}
+	
+							if {[N ubelong [O 76] 0 0 {} {} != 54061]} {
+								>
+									emit Z=0x%x
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ubequad [O 84] 0 0 {} {} > 0]} {
+						>
+							emit {\b, 0x%llx MD5}
+						<
+					}
+	
+					if {[N ubelong [O 128] 0 0 {} {} x {}]} {
+						>
+							if {[S search [O 132] 0 {} 508 eq cprt]} {
+								>
+								<
+							}
+	
+							if {[D [O 132]]} {
+								>
+									emit {\b, no copyright tag}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S search [O 132] 0 {} 508 eq desc]} {
+						>
+							if {[S string [O [I [R 0] ubelong 0 + 0 0]] 0 {} {} eq desc]} {
+								>
+									if {[S pstring [R [O 4]] 0 l {} x {}]} {
+										>
+											emit {"%s"}
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string [O [I [R 0] ubelong 0 + 0 0]] 0 {} {} eq mluc]} {
+								>
+									if {[N ubequad [R [O [I [R 8] ubelong 0 + 0 0]]] 0 0 {} {} x {}]} {
+										>
+											if {[S bestring16 [R [O 4]] 0 {} {} x {}]} {
+												>
+													emit '%s'
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	}}
+	111
+		{tga-image {if {[N ubyte [O 2] 0 0 {} {} < 34]} {
+		>
+			emit {Targa image data}
+			mime image/x-tga
+			ext tga/tpic/icb/vda/vst
+		<
+	}
+	
+	switch [Nv ubyte [O 2] 0 & 247] {
+		1 {
+			>
+				emit {- Map}
+			<
+		}
+		2 {
+			>
+				emit {- RGB}
+				if {[N ubyte [O 17] 0 0 & 15 > 0]} {
+					>
+						emit {\bA}
+					<
+				}
+	
+			<
+		}
+		3 {
+			>
+				emit {- Mono}
+			<
+		}
+	}
+	
+	switch [Nv ubyte [O 2] 0 {} {}] {
+		32 {
+			>
+				emit {- Color}
+			<
+		}
+		33 {
+			>
+				emit {- Color}
+			<
+		}
+	}
+	
+	if {[N ubyte [O 1] 0 0 {} {} == 1]} {
+		>
+			emit (
+			if {[N uleshort [O 3] 0 0 {} {} > 0]} {
+				>
+					emit {\b%d-}
+				<
+			}
+	
+			if {[N uleshort [O 5] 0 0 {} {} x {}]} {
+				>
+					emit {\b%d)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubyte [O 2] 0 0 & 8 == 8]} {
+		>
+			emit {- RLE}
+		<
+	}
+	
+	if {[N uleshort [O 12] 0 0 {} {} > 0]} {
+		>
+			emit {%d x}
+		<
+	}
+	
+	if {[N uleshort [O 12] 0 0 {} {} == 0]} {
+		>
+			emit {65536 x}
+		<
+	}
+	
+	if {[N uleshort [O 14] 0 0 {} {} > 0]} {
+		>
+			emit %d
+		<
+	}
+	
+	if {[N uleshort [O 14] 0 0 {} {} == 0]} {
+		>
+			emit 65536
+		<
+	}
+	
+	if {[N ubyte [O 16] 0 0 {} {} x {}]} {
+		>
+			emit {x %d}
+		<
+	}
+	
+	if {[N uleshort [O 8] 0 0 {} {} > 0]} {
+		>
+			emit +%d
+		<
+	}
+	
+	if {[N uleshort [O 10] 0 0 {} {} > 0]} {
+		>
+			emit +%d
+		<
+	}
+	
+	if {[N ubyte [O 17] 0 0 & 15 > 0]} {
+		>
+			emit {- %d-bit alpha}
+		<
+	}
+	
+	if {[N ubyte [O 17] 0 0 {} {} & 32]} {
+		>
+			emit {- top}
+		<
+	}
+	
+	if {[N ubyte [O 17] 0 0 {} {} & 16]} {
+		>
+			emit {- right}
+		<
+	}
+	
+	switch [Nv ubyte [O 17] 0 & 192] {
+		64 {
+			>
+				emit {- interleave}
+			<
+		}
+		128 {
+			>
+				emit {- four way interleave}
+			<
+		}
+		192 {
+			>
+				emit {- reserved}
+			<
+		}
+	}
+	
+	if {[N ubyte [O 0] 0 0 {} {} > 0]} {
+		>
+			if {[S string [O 18] 0 {} {} x {}]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search [O 18] 0 {} 4261301 eq s]} {
+		>
+			emit {TRUEVISION-XFILE.\0}
+			if {[N ulelong [R [O -8]] 0 0 {} {} > 0]} {
+				>
+					if {[N uleshort [O [I [R -4] ulelong 0 + 0 0]] 0 0 {} {} == 495]} {
+						>
+							if {[S string [R [O 0]] 0 {} {} > \0]} {
+								>
+									emit {- author "%-.40s"}
+								<
+							}
+	
+							if {[S string [R [O 41]] 0 {} {} > \0]} {
+								>
+									emit {- comment "%-.80s"}
+								<
+							}
+	
+							if {[N ubequad [R [O 365]] 0 0 & 18446744073709486080 != 0]} {
+								>
+									if {[N uleshort [R [O -6]] 0 0 {} {} x {}]} {
+										>
+											emit %d
+										<
+									}
+	
+									if {[N uleshort [R [O -8]] 0 0 {} {} x {}]} {
+										>
+											emit {\b-%d}
+										<
+									}
+	
+									if {[N uleshort [R [O -4]] 0 0 {} {} x {}]} {
+										>
+											emit {\b-%d}
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ubequad [R [O 371]] 0 0 & 18446744073709486080 != 0]} {
+								>
+									if {[N uleshort [R [O -8]] 0 0 {} {} x {}]} {
+										>
+											emit %d
+										<
+									}
+	
+									if {[N uleshort [R [O -6]] 0 0 {} {} x {}]} {
+										>
+											emit {\b:%.2d}
+										<
+									}
+	
+									if {[N uleshort [R [O -4]] 0 0 {} {} x {}]} {
+										>
+											emit {\b:%.2d}
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string [R [O 377]] 0 {} {} > \0]} {
+								>
+									emit {- job "%-.40s"}
+								<
+							}
+	
+							if {[N ubequad [R [O 418]] 0 0 & 18446744073709486080 != 0]} {
+								>
+									if {[N uleshort [R [O -8]] 0 0 {} {} x {}]} {
+										>
+											emit %d
+										<
+									}
+	
+									if {[N uleshort [R [O -6]] 0 0 {} {} x {}]} {
+										>
+											emit {\b:%.2d}
+										<
+									}
+	
+									if {[N uleshort [R [O -4]] 0 0 {} {} x {}]} {
+										>
+											emit {\b:%.2d}
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string [R [O 424]] 0 {} {} > \0]} {
+								>
+									emit {- %-.40s}
+								<
+							}
+	
+							if {[N ubyte [R [O 424]] 0 0 {} {} > 0]} {
+								>
+									if {[N uleshort [R [O 40]] 0 0 / 100 x {}]} {
+										>
+											emit %d
+										<
+									}
+	
+									if {[N uleshort [R [O 40]] 0 0 % 100 x {}]} {
+										>
+											emit {\b.%d}
+										<
+									}
+	
+									if {[N ubyte [R [O 42]] 0 0 {} {} > 32]} {
+										>
+											emit {\b%c}
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ulelong [R [O 468]] 0 0 {} {} > 0]} {
+								>
+									emit {- keycolor 0x%8.8x}
+								<
+							}
+	
+							if {[N uleshort [R [O 474]] 0 0 {} {} > 0]} {
+								>
+									if {[N uleshort [R [O -4]] 0 0 {} {} > 0]} {
+										>
+											emit {- aspect %d}
+										<
+									}
+	
+									if {[N uleshort [R [O -2]] 0 0 {} {} x {}]} {
+										>
+											emit {\b/%d}
+										<
+									}
+	
+								<
+							}
+	
+							if {[N uleshort [R [O 478]] 0 0 {} {} > 0]} {
+								>
+									if {[N uleshort [R [O -4]] 0 0 {} {} > 0]} {
+										>
+											emit {- gamma %d}
+										<
+									}
+	
+									if {[N uleshort [R [O -2]] 0 0 {} {} x {}]} {
+										>
+											emit {\b/%d}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	} netpbm {if {[S regex [O 3] 0 s {} eq \[0-9\]\{1,50\}\ \[0-9\]\{1,50\}]} {
+		>
+			emit {Netpbm image data}
+			if {[S regex [R [O 0]] 0 {} {} eq \[0-9\]\{1,50\}]} {
+				>
+					emit {\b, size = %s x}
+					if {[S regex [R [O 0]] 0 {} {} eq \[0-9\]\{1,50\}]} {
+						>
+							emit {\b %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	} tiff_ifd {if {[N leshort [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {\b, direntries=%d}
+		<
+	}
+	
+	U 111 tiff_entry [O 2]
+	} tiff_entry {switch [Nv leshort [O 0] 0 {} {}] {
+		-32104 {
+			>
+				if {[S string [O [I 8 ulelong 0 + 0 0]] 0 {} {} x {}]} {
+					>
+						emit {\b, copyright=%s}
+					<
+				}
+	
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		-30871 {
+			>
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		-30683 {
+			>
+				emit {\b, GPS-Data}
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		254 {
+			>
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		256 {
+			>
+				if {[N lelong [O 4] 0 0 {} {} == 1]} {
+					>
+						U 111 tiff_entry [O 12]
+	
+						if {[N leshort [O 8] 0 0 {} {} x {}]} {
+							>
+								emit {\b, width=%d}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		257 {
+			>
+				if {[N lelong [O 4] 0 0 {} {} == 1]} {
+					>
+						if {[N leshort [O 8] 0 0 {} {} x {}]} {
+							>
+								emit {\b, height=%d}
+							<
+						}
+	
+						U 111 tiff_entry [O 12]
+	
+					<
+				}
+	
+			<
+		}
+		258 {
+			>
+				if {[N leshort [O 8] 0 0 {} {} x {}]} {
+					>
+						emit {\b, bps=%d}
+					<
+				}
+	
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		259 {
+			>
+				if {[N lelong [O 4] 0 0 {} {} == 1]} {
+					>
+						emit {\b, compression=}
+						switch [Nv leshort [O 8] 0 {} {}] {
+							-32763 {
+								>
+									emit {\bPackBits (Macintosh RLE)}
+								<
+							}
+							-32727 {
+								>
+									emit {\bThunderscan RLE}
+								<
+							}
+							-32641 {
+								>
+									emit {\bRasterPadding (CT or MP)}
+								<
+							}
+							-32640 {
+								>
+									emit {\bRLE (Line Work)}
+								<
+							}
+							-32639 {
+								>
+									emit {\bRLE (High-Res Cont-Tone)}
+								<
+							}
+							-32638 {
+								>
+									emit {\bRLE (Binary Line Work)}
+								<
+							}
+							-32590 {
+								>
+									emit {\bDeflate (PKZIP)}
+								<
+							}
+							-32589 {
+								>
+									emit {\bKodak DCS}
+								<
+							}
+							-30875 {
+								>
+									emit {\bJBIG}
+								<
+							}
+							-30824 {
+								>
+									emit {\bJPEG2000}
+								<
+							}
+							-30823 {
+								>
+									emit {\bNikon NEF Compressed}
+								<
+							}
+							1 {
+								>
+									emit {\bnone}
+								<
+							}
+							2 {
+								>
+									emit {\bhuffman}
+								<
+							}
+							3 {
+								>
+									emit {\bbi-level group 3}
+								<
+							}
+							4 {
+								>
+									emit {\bbi-level group 4}
+								<
+							}
+							5 {
+								>
+									emit {\bLZW}
+								<
+							}
+							6 {
+								>
+									emit {\bJPEG (old)}
+								<
+							}
+							7 {
+								>
+									emit {\bJPEG}
+								<
+							}
+							8 {
+								>
+									emit {\bdeflate}
+								<
+							}
+							9 {
+								>
+									emit {\bJBIG, ITU-T T.85}
+								<
+							}
+							10 {
+								>
+									emit {\bJBIG, ITU-T T.43}
+								<
+							}
+							32766 {
+								>
+									emit {\bNeXT RLE 2-bit}
+								<
+							}
+						}
+	
+						if {[D [O 8]]} {
+							>
+								if {[N leshort [O 8] 0 0 {} {} x {}]} {
+									>
+										emit {\b(unknown 0x%x)}
+									<
+								}
+	
+							<
+						}
+	
+						U 111 tiff_entry [O 12]
+	
+					<
+				}
+	
+			<
+		}
+		262 {
+			>
+				emit {\b, PhotometricIntepretation=}
+				if {[S clear [O 8] 0 {} {} x {}]} {
+					>
+					<
+				}
+	
+				switch [Nv leshort [O 8] 0 {} {}] {
+					0 {
+						>
+							emit {\bWhiteIsZero}
+						<
+					}
+					1 {
+						>
+							emit {\bBlackIsZero}
+						<
+					}
+					2 {
+						>
+							emit {\bRGB}
+						<
+					}
+					3 {
+						>
+							emit {\bRGB Palette}
+						<
+					}
+					4 {
+						>
+							emit {\bTransparency Mask}
+						<
+					}
+					5 {
+						>
+							emit {\bCMYK}
+						<
+					}
+					6 {
+						>
+							emit {\bYCbCr}
+						<
+					}
+					8 {
+						>
+							emit {\bCIELab}
+						<
+					}
+				}
+	
+				if {[D [O 8]]} {
+					>
+						if {[N leshort [O 8] 0 0 {} {} x {}]} {
+							>
+								emit {\b(unknown=0x%x)}
+							<
+						}
+	
+					<
+				}
+	
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		266 {
+			>
+				if {[N lelong [O 4] 0 0 {} {} == 1]} {
+					>
+						U 111 tiff_entry [O 12]
+	
+					<
+				}
+	
+			<
+		}
+		269 {
+			>
+				if {[S string [O [I 8 ulelong 0 + 0 0]] 0 {} {} x {}]} {
+					>
+						emit {\b, name=%s}
+						U 111 tiff_entry [O 12]
+	
+					<
+				}
+	
+			<
+		}
+		270 {
+			>
+				if {[S string [O [I 8 ulelong 0 + 0 0]] 0 {} {} x {}]} {
+					>
+						emit {\b, description=%s}
+						U 111 tiff_entry [O 12]
+	
+					<
+				}
+	
+			<
+		}
+		271 {
+			>
+				if {[S string [O [I 8 ulelong 0 + 0 0]] 0 {} {} x {}]} {
+					>
+						emit {\b, manufacturer=%s}
+						U 111 tiff_entry [O 12]
+	
+					<
+				}
+	
+			<
+		}
+		272 {
+			>
+				if {[S string [O [I 8 ulelong 0 + 0 0]] 0 {} {} x {}]} {
+					>
+						emit {\b, model=%s}
+						U 111 tiff_entry [O 12]
+	
+					<
+				}
+	
+			<
+		}
+		273 {
+			>
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		274 {
+			>
+				emit {\b, orientation=}
+				switch [Nv leshort [O 8] 0 {} {}] {
+					1 {
+						>
+							emit {\bupper-left}
+						<
+					}
+					3 {
+						>
+							emit {\blower-right}
+						<
+					}
+					6 {
+						>
+							emit {\bupper-right}
+						<
+					}
+					8 {
+						>
+							emit {\blower-left}
+						<
+					}
+					9 {
+						>
+							emit {\bundefined}
+						<
+					}
+				}
+	
+				if {[D [O 8]]} {
+					>
+						if {[N leshort [O 8] 0 0 {} {} x {}]} {
+							>
+								emit {\b[*%d*]}
+							<
+						}
+	
+					<
+				}
+	
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		282 {
+			>
+				if {[N lelong [O 8] 0 0 {} {} x {}]} {
+					>
+						emit {\b, xresolution=%d}
+					<
+				}
+	
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		283 {
+			>
+				if {[N lelong [O 8] 0 0 {} {} x {}]} {
+					>
+						emit {\b, yresolution=%d}
+					<
+				}
+	
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		296 {
+			>
+				if {[N leshort [O 8] 0 0 {} {} x {}]} {
+					>
+						emit {\b, resolutionunit=%d}
+					<
+				}
+	
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		305 {
+			>
+				if {[S string [O [I 8 ulelong 0 + 0 0]] 0 {} {} x {}]} {
+					>
+						emit {\b, software=%s}
+					<
+				}
+	
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		306 {
+			>
+				if {[S string [O [I 8 ulelong 0 + 0 0]] 0 {} {} x {}]} {
+					>
+						emit {\b, datetime=%s}
+					<
+				}
+	
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		316 {
+			>
+				if {[S string [O [I 8 ulelong 0 + 0 0]] 0 {} {} x {}]} {
+					>
+						emit {\b, hostcomputer=%s}
+					<
+				}
+	
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		318 {
+			>
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		319 {
+			>
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		529 {
+			>
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		531 {
+			>
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+		532 {
+			>
+				U 111 tiff_entry [O 12]
+	
+			<
+		}
+	}
+	} png-ihdr {if {[N belong [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %d x}
+		<
+	}
+	
+	if {[N belong [O 4] 0 0 {} {} x {}]} {
+		>
+			emit %d,
+		<
+	}
+	
+	if {[N byte [O 8] 0 0 {} {} x {}]} {
+		>
+			emit %d-bit
+		<
+	}
+	
+	switch [Nv byte [O 9] 0 {} {}] {
+		0 {
+			>
+				emit grayscale,
+			<
+		}
+		2 {
+			>
+				emit {\b/color RGB,}
+			<
+		}
+		3 {
+			>
+				emit colormap,
+			<
+		}
+		4 {
+			>
+				emit gray+alpha,
+			<
+		}
+		6 {
+			>
+				emit {\b/color RGBA,}
+			<
+		}
+	}
+	
+	switch [Nv byte [O 12] 0 {} {}] {
+		0 {
+			>
+				emit non-interlaced
+			<
+		}
+		1 {
+			>
+				emit interlaced
+			<
+		}
+	}
+	} gem_info {if {[N beshort [O 0] 0 0 {} {} < 3]} {
+		>
+			emit GEM
+			if {[N beshort [O 2] 0 0 {} {} > 9]} {
+				>
+					if {[S string [O 16] 0 {} {} eq STTT\0\x10]} {
+						>
+							emit STTT
+						<
+					}
+	
+					if {[S string [O 16] 0 {} {} eq TIMG\0]} {
+						>
+							emit TIMG
+						<
+					}
+	
+					if {[S string [O 16] 0 {} {} eq \0\x80]} {
+						>
+							if {[N beshort [O 2] 0 0 {} {} == 24]} {
+								>
+									emit NOSIG
+								<
+							}
+	
+							if {[N beshort [O 2] 0 0 {} {} != 24]} {
+								>
+									emit HYPERPAINT
+								<
+							}
+	
+						<
+					}
+	
+					if {[D [O 16]]} {
+						>
+							if {[S string [O 16] 0 {} {} ne XIMG\0]} {
+								>
+									emit NOSIG
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string [O 16] 0 {} {} eq XIMG\0]} {
+				>
+					emit {XIMG Image data}
+					ext img/ximg
+				<
+			}
+	
+			if {[S string [O 16] 0 {} {} ne XIMG\0]} {
+				>
+					emit {Image data}
+					ext img
+				<
+			}
+	
+			if {[N beshort [O 2] 0 0 {} {} == 9]} {
+				>
+					emit (Ventura)
+				<
+			}
+	
+			if {[N beshort [O 12] 0 0 {} {} x {}]} {
+				>
+					emit {%d x}
+				<
+			}
+	
+			if {[N beshort [O 14] 0 0 {} {} x {}]} {
+				>
+					emit %d,
+				<
+			}
+	
+			if {[N beshort [O 4] 0 0 {} {} x {}]} {
+				>
+					emit {%d planes,}
+				<
+			}
+	
+			if {[N beshort [O 8] 0 0 {} {} x {}]} {
+				>
+					emit {%d x}
+				<
+			}
+	
+			if {[N beshort [O 10] 0 0 {} {} x {}]} {
+				>
+					emit {%d pixelsize}
+				<
+			}
+	
+			if {[N beshort [O 6] 0 0 {} {} != 2]} {
+				>
+					emit {\b, pattern size %d}
+				<
+			}
+	
+			mime image/x-gem
+		<
+	}
+	} dpx_info {if {[N beshort [O 768] 0 0 {} {} < 4]} {
+		>
+			if {[N belong [O 772] 0 0 {} {} x {}]} {
+				>
+					emit %dx
+				<
+			}
+	
+			if {[N belong [O 776] 0 0 {} {} x {}]} {
+				>
+					emit {\b%d,}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N beshort [O 768] 0 0 {} {} > 3]} {
+		>
+			if {[N belong [O 776] 0 0 {} {} x {}]} {
+				>
+					emit %dx
+				<
+			}
+	
+			if {[N belong [O 772] 0 0 {} {} x {}]} {
+				>
+					emit {\b%d,}
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv beshort [O 768] 0 {} {}] {
+		0 {
+			>
+				emit {left to right/top to bottom}
+			<
+		}
+		1 {
+			>
+				emit {right to left/top to bottom}
+			<
+		}
+		2 {
+			>
+				emit {left to right/bottom to top}
+			<
+		}
+		3 {
+			>
+				emit {right to left/bottom to top}
+			<
+		}
+		4 {
+			>
+				emit {top to bottom/left to right}
+			<
+		}
+		5 {
+			>
+				emit {top to bottom/right to left}
+			<
+		}
+		6 {
+			>
+				emit {bottom to top/left to right}
+			<
+		}
+		7 {
+			>
+				emit {bottom to top/right to left}
+			<
+		}
+	}
+	} ms-directdraw-surface {if {[N ulelong [O 16] 0 0 {} {} x {}]} {
+		>
+			emit {%u x}
+		<
+	}
+	
+	if {[N ulelong [O 12] 0 0 {} {} x {}]} {
+		>
+			emit %u
+		<
+	}
+	
+	if {[N ulelong [O 88] 0 0 {} {} > 0]} {
+		>
+			emit {\b, %u-bit color}
+		<
+	}
+	
+	if {[N ulelong [O 80] 0 0 & 4 == 4]} {
+		>
+			if {[S string [O 84] 0 {} {} x {}]} {
+				>
+					emit {\b, compressed using %.4s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ulelong [O 80] 0 0 & 2 == 2]} {
+		>
+			emit {\b, alpha only}
+		<
+	}
+	
+	if {[N ulelong [O 80] 0 0 & 512 == 512]} {
+		>
+			emit {\b, YUV}
+		<
+	}
+	
+	if {[N ulelong [O 80] 0 0 & 131072 == 131072]} {
+		>
+			emit {\b, luminance}
+		<
+	}
+	
+	if {[N ulelong [O 80] 0 0 & 64 == 64]} {
+		>
+			switch [Nv ulelong [O 88] 0 {} {}] {
+				16 {
+					>
+						switch [Nv ulequad [O 92] 0 {} {}] {
+							1030792151055 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 263882790670080]} {
+										>
+											emit {\b, ABGR4444}
+										<
+									}
+	
+								<
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 3840]} {
+										>
+											emit {\b, xBGR4444}
+										<
+									}
+	
+								<
+							}
+							1030792154880 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 263882790666255]} {
+										>
+											emit {\b, ARGB4444}
+										<
+									}
+	
+								<
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 15]} {
+										>
+											emit {\b, xRGB4444}
+										<
+									}
+	
+								<
+							}
+							4260607565568 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 124]} {
+										>
+											emit {\b, BGR555}
+										<
+									}
+	
+								<
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 140737488355452]} {
+										>
+											emit {\b, ABGR1555}
+										<
+									}
+	
+								<
+							}
+							4260607589376 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 31]} {
+										>
+											emit {\b, RGB555}
+										<
+									}
+	
+								<
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 140737488355359]} {
+										>
+											emit {\b, ARGB1555}
+										<
+									}
+	
+								<
+							}
+							8521215115326 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 4295030784]} {
+										>
+											emit {\b, BGRA5551}
+										<
+									}
+	
+								<
+							}
+							8521215178752 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 4294967358]} {
+										>
+											emit {\b, RGBA5551}
+										<
+									}
+	
+								<
+							}
+							8658654076672 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 248]} {
+										>
+											emit {\b, BGR565}
+										<
+									}
+	
+								<
+							}
+							8658654132224 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 31]} {
+										>
+											emit {\b, RGB565}
+										<
+									}
+	
+								<
+							}
+							16492674416880 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 64424570880]} {
+										>
+											emit {\b, BGRA4444}
+										<
+									}
+	
+								<
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 61440]} {
+										>
+											emit {\b, BGRx4444}
+										<
+									}
+	
+								<
+							}
+							16492674478080 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 64424509680]} {
+										>
+											emit {\b, RGBA4444}
+										<
+									}
+	
+								<
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 240]} {
+										>
+											emit {\b, RGBx4444}
+										<
+									}
+	
+								<
+							}
+						}
+	
+					<
+				}
+				24 {
+					>
+						switch [Nv ulequad [O 92] 0 {} {}] {
+							280375465083135 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 16711680]} {
+										>
+											emit {\b, BGR888}
+										<
+									}
+	
+								<
+							}
+							280375481794560 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 255]} {
+										>
+											emit {\b, RGB888}
+										<
+									}
+	
+								<
+							}
+						}
+	
+					<
+				}
+				32 {
+					>
+						switch [Nv ulequad [O 92] 0 {} {}] {
+							280375465083135 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 18374686479688335360]} {
+										>
+											emit {\b, ABGR8888}
+										<
+									}
+	
+								<
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 16711680]} {
+										>
+											emit {\b, xBGR8888}
+										<
+									}
+	
+								<
+							}
+							280375481794560 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 18374686479671623935]} {
+										>
+											emit {\b, ARGB8888}
+										<
+									}
+	
+								<
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 255]} {
+										>
+											emit {\b, xRGB8888}
+										<
+									}
+	
+								<
+							}
+							281474976645120 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 0]} {
+										>
+											emit {\b, R16G16}
+										<
+									}
+	
+								<
+							}
+							4499201580860415 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 13835058056354856960]} {
+										>
+											emit {\b, A2B10G10R10}
+										<
+									}
+	
+								<
+							}
+							4499202653552640 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 13835058055282164735]} {
+										>
+											emit {\b, A2R10G10B10}
+										<
+									}
+	
+								<
+							}
+							71776119061282560 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 1099494850560]} {
+										>
+											emit {\b, BGBA8888}
+										<
+									}
+	
+								<
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 4278190080]} {
+										>
+											emit {\b, BGBx8888}
+										<
+									}
+	
+								<
+							}
+							71776123339407360 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 1095216725760]} {
+										>
+											emit {\b, RGBA8888}
+										<
+									}
+	
+								<
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 65280]} {
+										>
+											emit {\b, RGBx8888}
+										<
+									}
+	
+								<
+							}
+							18446462598732906495 {
+								>
+									if {[N ulequad [O 100] 0 0 {} {} == 0]} {
+										>
+											emit {\b, G16R16}
+										<
+									}
+	
+								<
+							}
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	} sega-pvr-image-header {if {[N leshort [O 12] 0 0 {} {} x {}]} {
+		>
+			emit {%u x}
+		<
+	}
+	
+	if {[N leshort [O 14] 0 0 {} {} x {}]} {
+		>
+			emit %u
+		<
+	}
+	
+	switch [Nv byte [O 8] 0 {} {}] {
+		0 {
+			>
+				emit {\b, ARGB1555}
+			<
+		}
+		1 {
+			>
+				emit {\b, RGB565}
+			<
+		}
+		2 {
+			>
+				emit {\b, ARGB4444}
+			<
+		}
+		3 {
+			>
+				emit {\b, YUV442}
+			<
+		}
+		4 {
+			>
+				emit {\b, Bump}
+			<
+		}
+		5 {
+			>
+				emit {\b, 4bpp}
+			<
+		}
+		6 {
+			>
+				emit {\b, 8bpp}
+			<
+		}
+	}
+	
+	switch [Nv byte [O 9] 0 {} {}] {
+		1 {
+			>
+				emit {\b, square twiddled}
+			<
+		}
+		2 {
+			>
+				emit {\b, square twiddled & mipmap}
+			<
+		}
+		3 {
+			>
+				emit {\b, VQ}
+			<
+		}
+		4 {
+			>
+				emit {\b, VQ & mipmap}
+			<
+		}
+		5 {
+			>
+				emit {\b, 8-bit CLUT twiddled}
+			<
+		}
+		6 {
+			>
+				emit {\b, 4-bit CLUT twiddled}
+			<
+		}
+		7 {
+			>
+				emit {\b, 8-bit direct twiddled}
+			<
+		}
+		8 {
+			>
+				emit {\b, 4-bit direct twiddled}
+			<
+		}
+		9 {
+			>
+				emit {\b, rectangle}
+			<
+		}
+		11 {
+			>
+				emit {\b, rectangular stride}
+			<
+		}
+		13 {
+			>
+				emit {\b, rectangular twiddled}
+			<
+		}
+		16 {
+			>
+				emit {\b, small VQ}
+			<
+		}
+		17 {
+			>
+				emit {\b, small VQ & mipmap}
+			<
+		}
+		18 {
+			>
+				emit {\b, square twiddled & mipmap}
+			<
+		}
+	}
+	} sega-gvr-image-header {if {[N beshort [O 12] 0 0 {} {} x {}]} {
+		>
+			emit {%u x}
+		<
+	}
+	
+	if {[N beshort [O 14] 0 0 {} {} x {}]} {
+		>
+			emit %u
+		<
+	}
+	
+	switch [Nv byte [O 11] 0 {} {}] {
+		0 {
+			>
+				emit {\b, I4}
+			<
+		}
+		1 {
+			>
+				emit {\b, I8}
+			<
+		}
+		2 {
+			>
+				emit {\b, IA4}
+			<
+		}
+		3 {
+			>
+				emit {\b, IA8}
+			<
+		}
+		4 {
+			>
+				emit {\b, RGB565}
+			<
+		}
+		5 {
+			>
+				emit {\b, RGB5A3}
+			<
+		}
+		6 {
+			>
+				emit {\b, ARGB8888}
+			<
+		}
+		8 {
+			>
+				emit {\b, CI4}
+			<
+		}
+		9 {
+			>
+				emit {\b, CI8}
+			<
+		}
+		14 {
+			>
+				emit {\b, DXT1}
+			<
+		}
+	}
+	} khronos-ktx-glEnum {switch [Nv lelong [O 0] 0 {} {}] {
+		6407 {
+			>
+				emit {\b, RGB}
+			<
+		}
+		6408 {
+			>
+				emit {\b, RGBA}
+			<
+		}
+		6409 {
+			>
+				emit {\b, LUMINANCE}
+			<
+		}
+		6410 {
+			>
+				emit {\b, LUMINANCE_ALPHA}
+			<
+		}
+		32993 {
+			>
+				emit {\b, BGR}
+			<
+		}
+		32994 {
+			>
+				emit {\b, BGRA}
+			<
+		}
+		33696 {
+			>
+				emit {\b, RGB_S3TC}
+			<
+		}
+		33697 {
+			>
+				emit {\b, RGB4_S3TC}
+			<
+		}
+		33698 {
+			>
+				emit {\b, RGBA_S3TC}
+			<
+		}
+		33699 {
+			>
+				emit {\b, RGBA4_S3TC}
+			<
+		}
+		33700 {
+			>
+				emit {\b, RGBA_DXT5_S3TC}
+			<
+		}
+		33701 {
+			>
+				emit {\b, RGBA4_DXT5_S3TC}
+			<
+		}
+		36196 {
+			>
+				emit {\b, ETC1_RGB8_OES}
+			<
+		}
+		37488 {
+			>
+				emit {\b, COMPRESSED_R11_EAC}
+			<
+		}
+		37489 {
+			>
+				emit {\b, COMPRESSED_SIGNED_R11_EAC}
+			<
+		}
+		37490 {
+			>
+				emit {\b, COMPRESSED_RG11_EAC}
+			<
+		}
+		37491 {
+			>
+				emit {\b, COMPRESSED_SIGNED_RG11_EAC}
+			<
+		}
+		37492 {
+			>
+				emit {\b, COMPRESSED_RGB8_ETC2}
+			<
+		}
+		37493 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ETC2}
+			<
+		}
+		37494 {
+			>
+				emit {\b, COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2}
+			<
+		}
+		37495 {
+			>
+				emit {\b, COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2}
+			<
+		}
+		37496 {
+			>
+				emit {\b, COMPRESSED_RGBA2_ETC2_EAC}
+			<
+		}
+		37497 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ETC2_EAC}
+			<
+		}
+		37808 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_4x4_KHR}
+			<
+		}
+		37809 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_5x4_KHR}
+			<
+		}
+		37810 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_5x5_KHR}
+			<
+		}
+		37811 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_6x5_KHR}
+			<
+		}
+		37812 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_6x6_KHR}
+			<
+		}
+		37813 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_8x5_KHR}
+			<
+		}
+		37814 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_8x6_KHR}
+			<
+		}
+		37815 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_8x8_KHR}
+			<
+		}
+		37816 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_10x5_KHR}
+			<
+		}
+		37817 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_10x6_KHR}
+			<
+		}
+		37818 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_10x8_KHR}
+			<
+		}
+		37819 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_10x10_KHR}
+			<
+		}
+		37820 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_12x10_KHR}
+			<
+		}
+		37821 {
+			>
+				emit {\b, COMPRESSED_RGBA_ASTC_12x12_KHR}
+			<
+		}
+		37840 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR}
+			<
+		}
+		37841 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR}
+			<
+		}
+		37842 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR}
+			<
+		}
+		37843 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR}
+			<
+		}
+		37844 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR}
+			<
+		}
+		37845 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR}
+			<
+		}
+		37846 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR}
+			<
+		}
+		37847 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR}
+			<
+		}
+		37848 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR}
+			<
+		}
+		37849 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR}
+			<
+		}
+		37850 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR}
+			<
+		}
+		37851 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR}
+			<
+		}
+		37852 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR}
+			<
+		}
+		37853 {
+			>
+				emit {\b, COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR}
+			<
+		}
+	}
+	} khronos-ktx-endian-header {if {[N lelong [O 20] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %u}
+		<
+	}
+	
+	if {[N lelong [O 24] 0 0 {} {} > 1]} {
+		>
+			emit {x %u}
+		<
+	}
+	
+	if {[N lelong [O 28] 0 0 {} {} > 1]} {
+		>
+			emit {x %u}
+		<
+	}
+	
+	if {[N lelong [O 8] 0 0 {} {} > 0]} {
+		>
+			U 111 khronos-ktx-glEnum [O 8]
+	
+		<
+	}
+	
+	if {[N lelong [O 8] 0 0 {} {} == 0]} {
+		>
+			U 111 khronos-ktx-glEnum [O 12]
+	
+		<
+	}
+	} vtf-image-format {switch [Nv lelong [O 0] 0 {} {}] {
+		0 {
+			>
+				emit RGBA8888
+			<
+		}
+		1 {
+			>
+				emit ABGR8888
+			<
+		}
+		2 {
+			>
+				emit RGB888
+			<
+		}
+		3 {
+			>
+				emit BGR888
+			<
+		}
+		4 {
+			>
+				emit RGB565
+			<
+		}
+		5 {
+			>
+				emit I8
+			<
+		}
+		6 {
+			>
+				emit IA88
+			<
+		}
+		7 {
+			>
+				emit P8
+			<
+		}
+		8 {
+			>
+				emit A8
+			<
+		}
+		9 {
+			>
+				emit {RGB888 (bluescreen)}
+			<
+		}
+		10 {
+			>
+				emit {BGR888 (bluescreen)}
+			<
+		}
+		11 {
+			>
+				emit ARGB8888
+			<
+		}
+		12 {
+			>
+				emit BGRA8888
+			<
+		}
+		13 {
+			>
+				emit DXT1
+			<
+		}
+		14 {
+			>
+				emit DXT3
+			<
+		}
+		15 {
+			>
+				emit DXT5
+			<
+		}
+		16 {
+			>
+				emit BGRx8888
+			<
+		}
+		17 {
+			>
+				emit BGR565
+			<
+		}
+		18 {
+			>
+				emit BGRx5551
+			<
+		}
+		19 {
+			>
+				emit BGRA4444
+			<
+		}
+		20 {
+			>
+				emit DXT1+A1
+			<
+		}
+		21 {
+			>
+				emit BGRA5551
+			<
+		}
+		22 {
+			>
+				emit UV88
+			<
+		}
+		23 {
+			>
+				emit UVWQ8888
+			<
+		}
+		24 {
+			>
+				emit RGBA16161616F
+			<
+		}
+		25 {
+			>
+				emit RGBA16161616
+			<
+		}
+		26 {
+			>
+				emit UVLX8888
+			<
+		}
+	}
+	}}
+	120
+		{jpeg_segment {switch [Nv beshort [O 0] 0 {} {}] {
+		-64 {
+			>
+				U 120 jpeg_segment [O [I 2 ubeshort 0 + 0 2]]
+	
+				if {[N byte [O 4] 0 0 {} {} x {}]} {
+					>
+						emit {\b, baseline, precision %d}
+					<
+				}
+	
+				if {[N beshort [O 7] 0 0 {} {} x {}]} {
+					>
+						emit {\b, %dx}
+					<
+				}
+	
+				if {[N beshort [O 5] 0 0 {} {} x {}]} {
+					>
+						emit {\b%d}
+					<
+				}
+	
+				if {[N byte [O 9] 0 0 {} {} x {}]} {
+					>
+						emit {\b, frames %d}
+					<
+				}
+	
+			<
+		}
+		-63 {
+			>
+				U 120 jpeg_segment [O [I 2 ubeshort 0 + 0 2]]
+	
+				if {[N byte [O 4] 0 0 {} {} x {}]} {
+					>
+						emit {\b, extended sequential, precision %d}
+					<
+				}
+	
+				if {[N beshort [O 7] 0 0 {} {} x {}]} {
+					>
+						emit {\b, %dx}
+					<
+				}
+	
+				if {[N beshort [O 5] 0 0 {} {} x {}]} {
+					>
+						emit {\b%d}
+					<
+				}
+	
+				if {[N byte [O 9] 0 0 {} {} x {}]} {
+					>
+						emit {\b, frames %d}
+					<
+				}
+	
+			<
+		}
+		-62 {
+			>
+				U 120 jpeg_segment [O [I 2 ubeshort 0 + 0 2]]
+	
+				if {[N byte [O 4] 0 0 {} {} x {}]} {
+					>
+						emit {\b, progressive, precision %d}
+					<
+				}
+	
+				if {[N beshort [O 7] 0 0 {} {} x {}]} {
+					>
+						emit {\b, %dx}
+					<
+				}
+	
+				if {[N beshort [O 5] 0 0 {} {} x {}]} {
+					>
+						emit {\b%d}
+					<
+				}
+	
+				if {[N byte [O 9] 0 0 {} {} x {}]} {
+					>
+						emit {\b, frames %d}
+					<
+				}
+	
+			<
+		}
+		-60 {
+			>
+				U 120 jpeg_segment [O [I 2 ubeshort 0 + 0 2]]
+	
+			<
+		}
+		-31 {
+			>
+				if {[S string [O 4] 0 {} {} eq Exif]} {
+					>
+						emit {\b, Exif Standard: [}
+						T [O 10] r
+	
+						if {[S string [O 10] 0 {} {} x {}]} {
+							>
+								emit {\b]}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-2 {
+			>
+				if {[S pstring [O 2] 0 {H J} {} x {}]} {
+					>
+						emit {\b, comment: "%s"}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[N beshort [O 0] 0 0 & -32 == -32]} {
+		>
+			U 120 jpeg_segment [O [I 2 ubeshort 0 + 0 2]]
+	
+		<
+	}
+	
+	if {[N beshort [O 0] 0 0 & -48 == -48]} {
+		>
+			if {[N beshort [O 0] 0 0 & -32 != -32]} {
+				>
+					U 120 jpeg_segment [O [I 2 ubeshort 0 + 0 2]]
+	
+				<
+			}
+	
+		<
+	}
+	}}
+	124
+		{keytab_entry {if {[S pstring [O 4] 0 H {} x {}]} {
+		>
+			emit {\b, realm=%s}
+			if {[S pstring [R [O 0]] 0 H {} x {}]} {
+				>
+					emit {\b, principal=%s/}
+					if {[S pstring [R [O 0]] 0 H {} x {}]} {
+						>
+							emit {\b%s}
+							if {[N belong [R [O 0]] 0 0 {} {} x {}]} {
+								>
+									emit {\b, type=%d}
+									if {[N bedate [R [O 0]] 0 0 {} {} x {}]} {
+										>
+											emit {\b, date=%s}
+											if {[N byte [R [O 0]] 0 0 {} {} x {}]} {
+												>
+													emit {\b, kvno=%u}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	}}
+	129
+		{linuxraid {if {[N belong [O 16] 0 0 {} {} x {}]} {
+		>
+			emit UUID=%8x:
+		<
+	}
+	
+	if {[N belong [O 20] 0 0 {} {} x {}]} {
+		>
+			emit {\b%8x:}
+		<
+	}
+	
+	if {[N belong [O 24] 0 0 {} {} x {}]} {
+		>
+			emit {\b%8x:}
+		<
+	}
+	
+	if {[N belong [O 28] 0 0 {} {} x {}]} {
+		>
+			emit {\b%8x}
+		<
+	}
+	
+	if {[S string [O 32] 0 {} {} x {}]} {
+		>
+			emit name=%s
+		<
+	}
+	
+	if {[N lelong [O 72] 0 0 {} {} x {}]} {
+		>
+			emit level=%d
+		<
+	}
+	
+	if {[N lelong [O 92] 0 0 {} {} x {}]} {
+		>
+			emit disks=%d
+		<
+	}
+	}}
+	135
+		{mach-o-cpu {switch [Nv belong [O 0] 0 & 16777216] {
+		0 {
+			>
+				switch [Nv belong [O 0] 0 & 16777215] {
+					1 {
+						>
+							switch [Nv belong [O 4] 0 & 16777215] {
+								0 {
+									>
+										emit vax
+									<
+								}
+								1 {
+									>
+										emit vax11/780
+									<
+								}
+								2 {
+									>
+										emit vax11/785
+									<
+								}
+								3 {
+									>
+										emit vax11/750
+									<
+								}
+								4 {
+									>
+										emit vax11/730
+									<
+								}
+								5 {
+									>
+										emit uvaxI
+									<
+								}
+								6 {
+									>
+										emit uvaxII
+									<
+								}
+								7 {
+									>
+										emit vax8200
+									<
+								}
+								8 {
+									>
+										emit vax8500
+									<
+								}
+								9 {
+									>
+										emit vax8600
+									<
+								}
+								10 {
+									>
+										emit vax8650
+									<
+								}
+								11 {
+									>
+										emit vax8800
+									<
+								}
+								12 {
+									>
+										emit uvaxIII
+									<
+								}
+							}
+	
+							if {[N belong [O 4] 0 0 & 16777215 > 12]} {
+								>
+									emit {vax subarchitecture=%d}
+								<
+							}
+	
+						<
+					}
+					2 {
+						>
+							emit romp
+						<
+					}
+					3 {
+						>
+							emit architecture=3
+						<
+					}
+					4 {
+						>
+							emit ns32032
+						<
+					}
+					5 {
+						>
+							emit ns32332
+						<
+					}
+					6 {
+						>
+							emit m68k
+						<
+					}
+					7 {
+						>
+							switch [Nv belong [O 4] 0 & 15] {
+								3 {
+									>
+										emit i386
+									<
+								}
+								4 {
+									>
+										emit i486
+										switch [Nv belong [O 4] 0 & 16777200] {
+											0 {
+												>
+												<
+											}
+											128 {
+												>
+													emit {\bsx}
+												<
+											}
+										}
+	
+									<
+								}
+								5 {
+									>
+										emit i586
+									<
+								}
+								6 {
+									>
+										switch [Nv belong [O 4] 0 & 16777200] {
+											0 {
+												>
+													emit p6
+												<
+											}
+											16 {
+												>
+													emit pentium_pro
+												<
+											}
+											32 {
+												>
+													emit pentium_2_m0x20
+												<
+											}
+											48 {
+												>
+													emit pentium_2_m3
+												<
+											}
+											64 {
+												>
+													emit pentium_2_m0x40
+												<
+											}
+											80 {
+												>
+													emit pentium_2_m5
+												<
+											}
+										}
+	
+										if {[N belong [O 4] 0 0 & 16777200 > 80]} {
+											>
+												emit pentium_2_m0x%x
+											<
+										}
+	
+									<
+								}
+								7 {
+									>
+										emit celeron
+										switch [Nv belong [O 4] 0 & 16777200] {
+											0 {
+												>
+													emit {\b_m0x%x}
+												<
+											}
+											16 {
+												>
+													emit {\b_m0x%x}
+												<
+											}
+											32 {
+												>
+													emit {\b_m0x%x}
+												<
+											}
+											48 {
+												>
+													emit {\b_m0x%x}
+												<
+											}
+											64 {
+												>
+													emit {\b_m0x%x}
+												<
+											}
+											80 {
+												>
+													emit {\b_m0x%x}
+												<
+											}
+											96 {
+												>
+												<
+											}
+											112 {
+												>
+													emit {\b_mobile}
+												<
+											}
+										}
+	
+										if {[N belong [O 4] 0 0 & 16777200 > 112]} {
+											>
+												emit {\b_m0x%x}
+											<
+										}
+	
+									<
+								}
+								8 {
+									>
+										emit pentium_3
+										switch [Nv belong [O 4] 0 & 16777200] {
+											0 {
+												>
+												<
+											}
+											16 {
+												>
+													emit {\b_m}
+												<
+											}
+											32 {
+												>
+													emit {\b_xeon}
+												<
+											}
+										}
+	
+										if {[N belong [O 4] 0 0 & 16777200 > 32]} {
+											>
+												emit {\b_m0x%x}
+											<
+										}
+	
+									<
+								}
+								9 {
+									>
+										emit pentiumM
+										if {[N belong [O 4] 0 0 & 16777200 == 0]} {
+											>
+											<
+										}
+	
+										if {[N belong [O 4] 0 0 & 16777200 > 0]} {
+											>
+												emit {\b_m0x%x}
+											<
+										}
+	
+									<
+								}
+								10 {
+									>
+										emit pentium_4
+										switch [Nv belong [O 4] 0 & 16777200] {
+											0 {
+												>
+												<
+											}
+											16 {
+												>
+													emit {\b_m}
+												<
+											}
+										}
+	
+										if {[N belong [O 4] 0 0 & 16777200 > 16]} {
+											>
+												emit {\b_m0x%x}
+											<
+										}
+	
+									<
+								}
+								11 {
+									>
+										emit itanium
+										switch [Nv belong [O 4] 0 & 16777200] {
+											0 {
+												>
+												<
+											}
+											16 {
+												>
+													emit {\b_2}
+												<
+											}
+										}
+	
+										if {[N belong [O 4] 0 0 & 16777200 > 16]} {
+											>
+												emit {\b_m0x%x}
+											<
+										}
+	
+									<
+								}
+								12 {
+									>
+										emit xeon
+										switch [Nv belong [O 4] 0 & 16777200] {
+											0 {
+												>
+												<
+											}
+											16 {
+												>
+													emit {\b_mp}
+												<
+											}
+										}
+	
+										if {[N belong [O 4] 0 0 & 16777200 > 16]} {
+											>
+												emit {\b_m0x%x}
+											<
+										}
+	
+									<
+								}
+							}
+	
+							if {[N belong [O 4] 0 0 & 15 > 12]} {
+								>
+									emit {ia32 family=%d}
+									if {[N belong [O 4] 0 0 & 16777200 == 0]} {
+										>
+										<
+									}
+	
+									if {[N belong [O 4] 0 0 & 16777200 > 0]} {
+										>
+											emit model=%x
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+					8 {
+						>
+							emit mips
+							switch [Nv belong [O 4] 0 & 16777215] {
+								1 {
+									>
+										emit R2300
+									<
+								}
+								2 {
+									>
+										emit R2600
+									<
+								}
+								3 {
+									>
+										emit R2800
+									<
+								}
+								4 {
+									>
+										emit R2000a
+									<
+								}
+								5 {
+									>
+										emit R2000
+									<
+								}
+								6 {
+									>
+										emit R3000a
+									<
+								}
+								7 {
+									>
+										emit R3000
+									<
+								}
+							}
+	
+							if {[N belong [O 4] 0 0 & 16777215 > 7]} {
+								>
+									emit subarchitecture=%d
+								<
+							}
+	
+						<
+					}
+					9 {
+						>
+							emit ns32532
+						<
+					}
+					10 {
+						>
+							emit mc98000
+						<
+					}
+					11 {
+						>
+							emit hppa
+							switch [Nv belong [O 4] 0 & 16777215] {
+								0 {
+									>
+										emit 7100
+									<
+								}
+								1 {
+									>
+										emit 7100LC
+									<
+								}
+							}
+	
+							if {[N belong [O 4] 0 0 & 16777215 > 1]} {
+								>
+									emit subarchitecture=%d
+								<
+							}
+	
+						<
+					}
+					12 {
+						>
+							emit arm
+							switch [Nv belong [O 4] 0 & 16777215] {
+								0 {
+									>
+									<
+								}
+								1 {
+									>
+										emit subarchitecture=%d
+									<
+								}
+								2 {
+									>
+										emit subarchitecture=%d
+									<
+								}
+								3 {
+									>
+										emit subarchitecture=%d
+									<
+								}
+								4 {
+									>
+										emit subarchitecture=%d
+									<
+								}
+								5 {
+									>
+										emit {\bv4t}
+									<
+								}
+								6 {
+									>
+										emit {\bv6}
+									<
+								}
+								7 {
+									>
+										emit {\bv5tej}
+									<
+								}
+								8 {
+									>
+										emit {\bxscale}
+									<
+								}
+								9 {
+									>
+										emit {\bv7}
+									<
+								}
+								10 {
+									>
+										emit {\bv7f}
+									<
+								}
+								11 {
+									>
+										emit {\bv7s}
+									<
+								}
+								12 {
+									>
+										emit {\bv7k}
+									<
+								}
+								13 {
+									>
+										emit {\bv8}
+									<
+								}
+								14 {
+									>
+										emit {\bv6m}
+									<
+								}
+								15 {
+									>
+										emit {\bv7m}
+									<
+								}
+								16 {
+									>
+										emit {\bv7em}
+									<
+								}
+							}
+	
+							if {[N belong [O 4] 0 0 & 16777215 > 16]} {
+								>
+									emit subarchitecture=%d
+								<
+							}
+	
+						<
+					}
+					13 {
+						>
+							switch [Nv belong [O 4] 0 & 16777215] {
+								0 {
+									>
+										emit mc88000
+									<
+								}
+								1 {
+									>
+										emit mc88100
+									<
+								}
+								2 {
+									>
+										emit mc88110
+									<
+								}
+							}
+	
+							if {[N belong [O 4] 0 0 & 16777215 > 2]} {
+								>
+									emit {mc88000 subarchitecture=%d}
+								<
+							}
+	
+						<
+					}
+					14 {
+						>
+							emit SPARC
+						<
+					}
+					15 {
+						>
+							emit i860g
+						<
+					}
+					16 {
+						>
+							emit alpha
+						<
+					}
+					17 {
+						>
+							emit rs6000
+						<
+					}
+					18 {
+						>
+							emit ppc
+							switch [Nv belong [O 4] 0 & 16777215] {
+								0 {
+									>
+									<
+								}
+								1 {
+									>
+										emit {\b_601}
+									<
+								}
+								2 {
+									>
+										emit {\b_602}
+									<
+								}
+								3 {
+									>
+										emit {\b_603}
+									<
+								}
+								4 {
+									>
+										emit {\b_603e}
+									<
+								}
+								5 {
+									>
+										emit {\b_603ev}
+									<
+								}
+								6 {
+									>
+										emit {\b_604}
+									<
+								}
+								7 {
+									>
+										emit {\b_604e}
+									<
+								}
+								8 {
+									>
+										emit {\b_620}
+									<
+								}
+								9 {
+									>
+										emit {\b_650}
+									<
+								}
+								10 {
+									>
+										emit {\b_7400}
+									<
+								}
+								11 {
+									>
+										emit {\b_7450}
+									<
+								}
+								100 {
+									>
+										emit {\b_970}
+									<
+								}
+							}
+	
+							if {[N belong [O 4] 0 0 & 16777215 > 100]} {
+								>
+									emit subarchitecture=%d
+								<
+							}
+	
+						<
+					}
+				}
+	
+				if {[N belong [O 0] 0 0 & 16777215 > 18]} {
+					>
+						emit architecture=%d
+					<
+				}
+	
+			<
+		}
+		16777216 {
+			>
+				switch [Nv belong [O 0] 0 & 16777215] {
+					0 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					1 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					2 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					3 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					4 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					5 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					6 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					7 {
+						>
+							emit x86_64
+							switch [Nv belong [O 4] 0 & 16777215] {
+								0 {
+									>
+										emit subarchitecture=%d
+									<
+								}
+								1 {
+									>
+										emit subarchitecture=%d
+									<
+								}
+								2 {
+									>
+										emit subarchitecture=%d
+									<
+								}
+								3 {
+									>
+									<
+								}
+								4 {
+									>
+										emit {\b_arch1}
+									<
+								}
+								8 {
+									>
+										emit {\b_haswell}
+									<
+								}
+							}
+	
+							if {[N belong [O 4] 0 0 & 16777215 > 4]} {
+								>
+									emit subarchitecture=%d
+								<
+							}
+	
+						<
+					}
+					8 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					9 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					10 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					11 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					12 {
+						>
+							emit arm64
+							switch [Nv belong [O 4] 0 & 16777215] {
+								0 {
+									>
+									<
+								}
+								1 {
+									>
+										emit {\bv8}
+									<
+								}
+							}
+	
+						<
+					}
+					13 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					14 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					15 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					16 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					17 {
+						>
+							emit {64-bit architecture=%d}
+						<
+					}
+					18 {
+						>
+							emit ppc64
+							switch [Nv belong [O 4] 0 & 16777215] {
+								0 {
+									>
+									<
+								}
+								1 {
+									>
+										emit {\b_601}
+									<
+								}
+								2 {
+									>
+										emit {\b_602}
+									<
+								}
+								3 {
+									>
+										emit {\b_603}
+									<
+								}
+								4 {
+									>
+										emit {\b_603e}
+									<
+								}
+								5 {
+									>
+										emit {\b_603ev}
+									<
+								}
+								6 {
+									>
+										emit {\b_604}
+									<
+								}
+								7 {
+									>
+										emit {\b_604e}
+									<
+								}
+								8 {
+									>
+										emit {\b_620}
+									<
+								}
+								9 {
+									>
+										emit {\b_650}
+									<
+								}
+								10 {
+									>
+										emit {\b_7400}
+									<
+								}
+								11 {
+									>
+										emit {\b_7450}
+									<
+								}
+								100 {
+									>
+										emit {\b_970}
+									<
+								}
+							}
+	
+							if {[N belong [O 4] 0 0 & 16777215 > 100]} {
+								>
+									emit subarchitecture=%d
+								<
+							}
+	
+						<
+					}
+				}
+	
+				if {[N belong [O 0] 0 0 & 16777215 > 18]} {
+					>
+						emit {64-bit architecture=%d}
+					<
+				}
+	
+			<
+		}
+	}
+	} mach-o-be {if {[N byte [O 0] 0 0 {} {} == -49]} {
+		>
+			emit 64-bit
+		<
+	}
+	
+	U 135 mach-o-cpu [O 4]
+	
+	switch [Nv belong [O 12] 0 {} {}] {
+		1 {
+			>
+				emit object
+			<
+		}
+		2 {
+			>
+				emit executable
+			<
+		}
+		3 {
+			>
+				emit {fixed virtual memory shared library}
+			<
+		}
+		4 {
+			>
+				emit core
+			<
+		}
+		5 {
+			>
+				emit {preload executable}
+			<
+		}
+		6 {
+			>
+				emit {dynamically linked shared library}
+			<
+		}
+		7 {
+			>
+				emit {dynamic linker}
+			<
+		}
+		8 {
+			>
+				emit bundle
+			<
+		}
+		9 {
+			>
+				emit {dynamically linked shared library stub}
+			<
+		}
+		10 {
+			>
+				emit {dSYM companion file}
+			<
+		}
+		11 {
+			>
+				emit {kext bundle}
+			<
+		}
+	}
+	
+	if {[N belong [O 12] 0 0 {} {} > 11]} {
+		>
+			if {[N belong [O 12] 0 0 {} {} x {}]} {
+				>
+					emit filetype=%d
+				<
+			}
+	
+		<
+	}
+	
+	if {[N belong [O 24] 0 0 {} {} > 0]} {
+		>
+			emit {\b, flags:<}
+			if {[N belong [O 24] 0 0 {} {} & 1]} {
+				>
+					emit {\bNOUNDEFS}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 2]} {
+				>
+					emit {\b|INCRLINK}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 4]} {
+				>
+					emit {\b|DYLDLINK}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 8]} {
+				>
+					emit {\b|BINDATLOAD}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 16]} {
+				>
+					emit {\b|PREBOUND}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 32]} {
+				>
+					emit {\b|SPLIT_SEGS}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 64]} {
+				>
+					emit {\b|LAZY_INIT}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 128]} {
+				>
+					emit {\b|TWOLEVEL}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 256]} {
+				>
+					emit {\b|FORCE_FLAT}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 512]} {
+				>
+					emit {\b|NOMULTIDEFS}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 1024]} {
+				>
+					emit {\b|NOFIXPREBINDING}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 2048]} {
+				>
+					emit {\b|PREBINDABLE}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 4096]} {
+				>
+					emit {\b|ALLMODSBOUND}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 8192]} {
+				>
+					emit {\b|SUBSECTIONS_VIA_SYMBOLS}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 16384]} {
+				>
+					emit {\b|CANONICAL}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 32768]} {
+				>
+					emit {\b|WEAK_DEFINES}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 65536]} {
+				>
+					emit {\b|BINDS_TO_WEAK}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 131072]} {
+				>
+					emit {\b|ALLOW_STACK_EXECUTION}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 262144]} {
+				>
+					emit {\b|ROOT_SAFE}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 524288]} {
+				>
+					emit {\b|SETUID_SAFE}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 1048576]} {
+				>
+					emit {\b|NO_REEXPORTED_DYLIBS}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 2097152]} {
+				>
+					emit {\b|PIE}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 4194304]} {
+				>
+					emit {\b|DEAD_STRIPPABLE_DYLIB}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 8388608]} {
+				>
+					emit {\b|HAS_TLV_DESCRIPTORS}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 16777216]} {
+				>
+					emit {\b|NO_HEAP_EXECUTION}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} & 33554432]} {
+				>
+					emit {\b|APP_EXTENSION_SAFE}
+				<
+			}
+	
+			if {[N belong [O 24] 0 0 {} {} x {}]} {
+				>
+					emit {\b>}
+				<
+			}
+	
+		<
+	}
+	}}
+	136
+		{mac-bin {if {[N ubyte [O 122] 0 0 {} {} x {}]} {
+		>
+			emit MacBinary
+		<
+	}
+	
+	switch [Nv ubyte [O 122] 0 {} {}] {
+		129 {
+			>
+				emit II
+			<
+		}
+		130 {
+			>
+				emit III
+				if {[S string [O 102] 0 {} {} ne mBIN]} {
+					>
+						emit {with surprising version}
+						mime application/x-macbinary
+						ext bin/macbin
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[N byte [O 73] 0 0 {} {} & 1]} {
+		>
+			emit {\b, inited}
+		<
+	}
+	
+	if {[N byte [O 73] 0 0 {} {} & 2]} {
+		>
+			emit {\b, changed}
+		<
+	}
+	
+	if {[N byte [O 73] 0 0 {} {} & 4]} {
+		>
+			emit {\b, busy}
+		<
+	}
+	
+	if {[N byte [O 73] 0 0 {} {} & 8]} {
+		>
+			emit {\b, bozo}
+		<
+	}
+	
+	if {[N byte [O 73] 0 0 {} {} & 16]} {
+		>
+			emit {\b, system}
+		<
+	}
+	
+	if {[N byte [O 73] 0 0 {} {} & 32]} {
+		>
+			emit {\b, bundle}
+		<
+	}
+	
+	if {[N byte [O 73] 0 0 {} {} & 64]} {
+		>
+			emit {\b, invisible}
+		<
+	}
+	
+	if {[N byte [O 73] 0 0 {} {} & -128]} {
+		>
+			emit {\b, locked}
+		<
+	}
+	
+	if {[N ubeshort [O 79] 0 0 {} {} != 0]} {
+		>
+			emit {\b, ID 0x%x}
+		<
+	}
+	
+	if {[N byte [O 81] 0 0 {} {} != 0]} {
+		>
+			emit {\b, protected 0x%x}
+		<
+	}
+	
+	if {[N ubeshort [O 99] 0 0 {} {} != 0]} {
+		>
+			emit {\b, comment length %u}
+		<
+	}
+	
+	if {[N ubyte [O 106] 0 0 {} {} != 0]} {
+		>
+			emit {\b, char. code 0x%x}
+		<
+	}
+	
+	if {[N ubyte [O 107] 0 0 {} {} != 0]} {
+		>
+			emit {\b, more flags 0x%x}
+		<
+	}
+	
+	if {[N ubelong [O 116] 0 0 {} {} != 0]} {
+		>
+			emit {\b, total length %u}
+		<
+	}
+	
+	if {[N ubeshort [O 120] 0 0 {} {} != 0]} {
+		>
+			emit {\b, 2nd header length %u}
+		<
+	}
+	
+	if {[N beldate [O 91] 0 0 - 2082844800 x {}]} {
+		>
+			emit {\b, %s}
+		<
+	}
+	
+	if {[N ubelong [O 91] 0 0 {} {} < 2082844800]} {
+		>
+			emit {INVALID date}
+		<
+	}
+	
+	if {[N beldate [O 95] 0 0 - 2082844800 x {}]} {
+		>
+			emit {\b, modified %s}
+		<
+	}
+	
+	if {[N ulong [O 69] 0 0 {} {} != 0]} {
+		>
+			emit {\b, creator}
+			U 136 apple-creator [O 69]
+	
+		<
+	}
+	
+	if {[N ulong [O 65] 0 0 {} {} != 0]} {
+		>
+			emit {\b, type}
+			U 136 apple-type [O 65]
+	
+		<
+	}
+	
+	if {[N ubelong [O 83] 0 0 {} {} != 0]} {
+		>
+			emit {\b, %u bytes}
+		<
+	}
+	
+	if {[S pstring [O 1] 0 {} {} x {}]} {
+		>
+			emit {"%s"}
+		<
+	}
+	
+	if {[N ubelong [O 83] 0 0 {} {} != 0]} {
+		>
+			emit {\b }
+			T [O 128] {}
+	
+		<
+	}
+	
+	if {[N ubelong [O 87] 0 0 {} {} != 0]} {
+		>
+			if {[N ubelong [O 83] 0 0 + 128 x {}]} {
+				>
+					emit {\b, at 0x%x}
+				<
+			}
+	
+			if {[N ubelong [O 87] 0 0 {} {} != 0]} {
+				>
+					emit {%u bytes}
+				<
+			}
+	
+			if {[N ubequad [O [I 83 ubeshort 0 + 0 128]] 0 0 {} {} x {}]} {
+				>
+					emit {resource }
+					T [R [O -8]] {}
+	
+				<
+			}
+	
+		<
+	}
+	} apple-type {if {[S string [O 0] 0 {} {} eq 8BIM]} {
+		>
+			emit PhotoShop
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq ALB3]} {
+		>
+			emit {PageMaker 3}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq ALB4]} {
+		>
+			emit {PageMaker 4}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq ALT3]} {
+		>
+			emit {PageMaker 3}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq APPL]} {
+		>
+			emit application
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq AWWP]} {
+		>
+			emit {AppleWorks word processor}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq CIRC]} {
+		>
+			emit {simulated circuit}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq DRWG]} {
+		>
+			emit MacDraw
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq EPSF]} {
+		>
+			emit {Encapsulated PostScript}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq FFIL]} {
+		>
+			emit {font suitcase}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq FKEY]} {
+		>
+			emit {function key}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq FNDR]} {
+		>
+			emit {Macintosh Finder}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq GIFf]} {
+		>
+			emit {GIF image}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq Gzip]} {
+		>
+			emit {GNU gzip}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq INIT]} {
+		>
+			emit {system extension}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq LIB\ ]} {
+		>
+			emit library
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq LWFN]} {
+		>
+			emit {PostScript font}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq MSBC]} {
+		>
+			emit {Microsoft BASIC}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq PACT]} {
+		>
+			emit {Compact Pro archive}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq PDF\ ]} {
+		>
+			emit {Portable Document Format}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq PICT]} {
+		>
+			emit picture
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq PNTG]} {
+		>
+			emit {MacPaint picture}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq PREF]} {
+		>
+			emit preferences
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq PROJ]} {
+		>
+			emit {Think C project}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq QPRJ]} {
+		>
+			emit {Think Pascal project}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq SCFL]} {
+		>
+			emit {Defender scores}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq SCRN]} {
+		>
+			emit {startup screen}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq SITD]} {
+		>
+			emit {StuffIt Deluxe}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq SPn3]} {
+		>
+			emit SuperPaint
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq STAK]} {
+		>
+			emit {HyperCard stack}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq Seg\ ]} {
+		>
+			emit {StuffIt segment}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq TARF]} {
+		>
+			emit {Unix tar archive}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq TEXT]} {
+		>
+			emit ASCII
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq TIFF]} {
+		>
+			emit {TIFF image}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq TOVF]} {
+		>
+			emit {Eudora table of contents}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq WDBN]} {
+		>
+			emit {Microsoft Word word processor}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq WORD]} {
+		>
+			emit {MacWrite word processor}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq XLS\ ]} {
+		>
+			emit {Microsoft Excel}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq ZIVM]} {
+		>
+			emit {compress (.Z)}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq ZSYS]} {
+		>
+			emit {Pre-System 7 system file}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq acf3]} {
+		>
+			emit {Aldus FreeHand}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq cdev]} {
+		>
+			emit {control panel}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq dfil]} {
+		>
+			emit {Desk Accessory suitcase}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq libr]} {
+		>
+			emit library
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq nX^d]} {
+		>
+			emit {WriteNow word processor}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq nX^w]} {
+		>
+			emit {WriteNow dictionary}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq rsrc]} {
+		>
+			emit resource
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq scbk]} {
+		>
+			emit Scrapbook
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq shlb]} {
+		>
+			emit {shared library}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq ttro]} {
+		>
+			emit {SimpleText read-only}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq zsys]} {
+		>
+			emit {system file}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq BINA]} {
+		>
+			emit {binary file}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq BMPp]} {
+		>
+			emit {BMP image}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq JPEG]} {
+		>
+			emit {JPEG image}
+		<
+	}
+	
+	if {[D [O 0]]} {
+		>
+			if {[S string [O 0] 0 {} {} x {}]} {
+				>
+					emit '%4.4s'
+				<
+			}
+	
+		<
+	}
+	} apple-creator {if {[S string [O 0] 0 {} {} eq 8BIM]} {
+		>
+			emit {Adobe Photoshop}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq ALD3]} {
+		>
+			emit {PageMaker 3}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq ALD4]} {
+		>
+			emit {PageMaker 4}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq ALFA]} {
+		>
+			emit {Alpha editor}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq APLS]} {
+		>
+			emit {Apple Scanner}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq APSC]} {
+		>
+			emit {Apple Scanner}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq BRKL]} {
+		>
+			emit Brickles
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq BTFT]} {
+		>
+			emit BitFont
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq CCL2]} {
+		>
+			emit {Common Lisp 2}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq CCL\ ]} {
+		>
+			emit {Common Lisp}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq CDmo]} {
+		>
+			emit {The Talking Moose}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq CPCT]} {
+		>
+			emit {Compact Pro}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq CSOm]} {
+		>
+			emit Eudora
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq DMOV]} {
+		>
+			emit {Font/DA Mover}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq DSIM]} {
+		>
+			emit DigSim
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq EDIT]} {
+		>
+			emit {Macintosh Edit}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq ERIK]} {
+		>
+			emit {Macintosh Finder}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq EXTR]} {
+		>
+			emit {self-extracting archive}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq Gzip]} {
+		>
+			emit {GNU gzip}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq KAHL]} {
+		>
+			emit {Think C}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq LWFU]} {
+		>
+			emit {LaserWriter Utility}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq LZIV]} {
+		>
+			emit compress
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq MACA]} {
+		>
+			emit MacWrite
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq MACS]} {
+		>
+			emit {Macintosh operating system}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq MAcK]} {
+		>
+			emit {MacKnowledge terminal emulator}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq MLND]} {
+		>
+			emit Defender
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq MPNT]} {
+		>
+			emit MacPaint
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq MSBB]} {
+		>
+			emit {Microsoft BASIC (binary)}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq MSWD]} {
+		>
+			emit {Microsoft Word}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq NCSA]} {
+		>
+			emit {NCSA Telnet}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq PJMM]} {
+		>
+			emit {Think Pascal}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq PSAL]} {
+		>
+			emit {Hunt the Wumpus}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq R*ch]} {
+		>
+			emit BBEdit
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq RMKR]} {
+		>
+			emit {Resource Maker}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq RSED]} {
+		>
+			emit {Resource Editor}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq Rich]} {
+		>
+			emit BBEdit
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq SIT!]} {
+		>
+			emit StuffIt
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq SPNT]} {
+		>
+			emit SuperPaint
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq Unix]} {
+		>
+			emit {NeXT Mac filesystem}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq VIM!]} {
+		>
+			emit {Vim editor}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq WILD]} {
+		>
+			emit HyperCard
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq XCEL]} {
+		>
+			emit {Microsoft Excel}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq aCa2]} {
+		>
+			emit Fontographer
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq aca3]} {
+		>
+			emit {Aldus FreeHand}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq dosa]} {
+		>
+			emit {Macintosh MS-DOS file system}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq movr]} {
+		>
+			emit {Font/DA Mover}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq nX^n]} {
+		>
+			emit WriteNow
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq pdos]} {
+		>
+			emit {Apple ProDOS file system}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq scbk]} {
+		>
+			emit Scrapbook
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq ttxt]} {
+		>
+			emit SimpleText
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq ufox]} {
+		>
+			emit {Foreign File Access}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq BOBO]} {
+		>
+			emit {Apple Works}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq PSPT]} {
+		>
+			emit {Apple File Exchange}
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq STi0]} {
+		>
+			emit stuffit
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq oneb]} {
+		>
+			emit {Disk Copy Self Mounting}
+		<
+	}
+	
+	if {[D [O 0]]} {
+		>
+			if {[S string [O 0] 0 {} {} x {}]} {
+				>
+					emit '%4.4s'
+				<
+			}
+	
+		<
+	}
+	}}
+	148
+		{diy-thermocam-parser {if {[N beshort [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {scale %d-}
+		<
+	}
+	
+	if {[N beshort [O 2] 0 0 {} {} x {}]} {
+		>
+			emit {\b%d,}
+		<
+	}
+	
+	if {[N lefloat [O 4] 0 0 {} {} x {}]} {
+		>
+			emit {spot sensor temperature %f,}
+		<
+	}
+	
+	switch [Nv ubyte [O 9] 0 {} {}] {
+		0 {
+			>
+				emit {unit celsius,}
+			<
+		}
+		1 {
+			>
+				emit {unit fahrenheit,}
+			<
+		}
+	}
+	
+	if {[N ubyte [O 8] 0 0 {} {} x {}]} {
+		>
+			emit {color scheme %d}
+		<
+	}
+	
+	if {[N ubyte [O 10] 0 0 {} {} == 1]} {
+		>
+			emit {\b, show spot sensor}
+		<
+	}
+	
+	if {[N ubyte [O 11] 0 0 {} {} == 1]} {
+		>
+			emit {\b, show scale bar}
+		<
+	}
+	
+	if {[N ubyte [O 12] 0 0 {} {} & 1]} {
+		>
+			emit {\b, minimum point enabled}
+		<
+	}
+	
+	if {[N ubyte [O 12] 0 0 {} {} & 2]} {
+		>
+			emit {\b, maximum point enabled}
+		<
+	}
+	
+	if {[N lefloat [O 13] 0 0 {} {} x {}]} {
+		>
+			emit {\b, calibration: offset %f,}
+		<
+	}
+	
+	if {[N lefloat [O 17] 0 0 {} {} x {}]} {
+		>
+			emit {slope %f}
+		<
+	}
+	} diy-thermocam-checker {if {[N ubyte [O 9] 0 0 {} {} < 2]} {
+		>
+			if {[N ubyte [O 10] 0 0 {} {} < 2]} {
+				>
+					if {[N ubyte [O 11] 0 0 {} {} < 2]} {
+						>
+							if {[N ubyte [O 12] 0 0 {} {} < 4]} {
+								>
+									if {[N lefloat [O 17] 0 0 {} {} > 9.999999747378752e-5]} {
+										>
+											emit {DIY-Thermocam raw data}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	}}
+	163
+		{msdos-driver {if {[S search [O 40] 0 {} 7 eq UPX!]} {
+		>
+			emit {\bUPX compressed}
+		<
+	}
+	
+	switch [Nv uleshort [O 4] 0 & 32768] {
+		0 {
+			>
+				emit {\bblock device driver}
+			<
+			>
+				if {[N uleshort [O 4] 0 0 & 2 == 2]} {
+					>
+						emit {\b,32-bit sector-}
+					<
+				}
+	
+			<
+			>
+				if {[N uleshort [O 4] 0 0 & 18498 > 0]} {
+					>
+						emit {\bsupport}
+					<
+				}
+	
+			<
+		}
+		32768 {
+			>
+				emit {\b}
+				if {[N uleshort [O 4] 0 0 & 8 == 8]} {
+					>
+						emit {\bclock}
+					<
+				}
+	
+				if {[N uleshort [O 4] 0 0 & 16 == 16]} {
+					>
+						emit {\bfast}
+					<
+				}
+	
+				if {[N uleshort [O 4] 0 0 & 3 > 0]} {
+					>
+						emit {\bstandard}
+						if {[N uleshort [O 4] 0 0 & 1 == 1]} {
+							>
+								emit {\binput}
+							<
+						}
+	
+						if {[N uleshort [O 4] 0 0 & 3 == 3]} {
+							>
+								emit {\b/}
+							<
+						}
+	
+						if {[N uleshort [O 4] 0 0 & 2 == 2]} {
+							>
+								emit {\boutput}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N uleshort [O 4] 0 0 & 32768 == 32768]} {
+					>
+						emit {\bcharacter device driver}
+					<
+				}
+	
+			<
+			>
+				if {[N uleshort [O 4] 0 0 & 8192 == 8192]} {
+					>
+						emit {\b,until busy-}
+					<
+				}
+	
+			<
+			>
+				if {[N uleshort [O 4] 0 0 & 26688 > 0]} {
+					>
+						emit {\bsupport}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[N ubyte [O 0] 0 0 {} {} x {}]} {
+		>
+			if {[S search [O 40] 0 {} 7 eq UPX!]} {
+				>
+				<
+			}
+	
+			if {[D [O 40]]} {
+				>
+					if {[N ubyte [O 12] 0 0 {} {} > 46]} {
+						>
+							emit {\b}
+							if {[N ubyte [O 10] 0 0 {} {} > 32]} {
+								>
+									if {[N ubyte [O 10] 0 0 {} {} != 46]} {
+										>
+											if {[N ubyte [O 10] 0 0 {} {} != 42]} {
+												>
+													emit {\b%c}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ubyte [O 11] 0 0 {} {} > 32]} {
+								>
+									if {[N ubyte [O 11] 0 0 {} {} != 46]} {
+										>
+											emit {\b%c}
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ubyte [O 12] 0 0 {} {} > 32]} {
+								>
+									if {[N ubyte [O 12] 0 0 {} {} != 57]} {
+										>
+											if {[N ubyte [O 12] 0 0 {} {} != 46]} {
+												>
+													emit {\b%c}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ubyte [O 13] 0 0 {} {} > 32]} {
+						>
+							if {[N ubyte [O 13] 0 0 {} {} != 46]} {
+								>
+									emit {\b%c}
+								<
+							}
+	
+							if {[N ubyte [O 14] 0 0 {} {} > 32]} {
+								>
+									if {[N ubyte [O 14] 0 0 {} {} != 46]} {
+										>
+											emit {\b%c}
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ubyte [O 15] 0 0 {} {} > 32]} {
+								>
+									if {[N ubyte [O 15] 0 0 {} {} != 46]} {
+										>
+											emit {\b%c}
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ubyte [O 16] 0 0 {} {} > 32]} {
+								>
+									if {[N ubyte [O 16] 0 0 {} {} != 46]} {
+										>
+											if {[N ubyte [O 16] 0 0 {} {} < 203]} {
+												>
+													emit {\b%c}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ubyte [O 17] 0 0 {} {} > 32]} {
+								>
+									if {[N ubyte [O 17] 0 0 {} {} != 46]} {
+										>
+											if {[N ubyte [O 17] 0 0 {} {} < 144]} {
+												>
+													emit {\b%c}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ubyte [O 12] 0 0 {} {} < 47]} {
+						>
+							if {[S string [O 22] 0 {} {} > \056]} {
+								>
+									emit %-.6s
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N uleshort [O 4] 0 0 & 64 == 64]} {
+		>
+			emit {\b,IOCTL-}
+		<
+	}
+	
+	if {[N uleshort [O 4] 0 0 & 2048 == 2048]} {
+		>
+			emit {\b,close media-}
+		<
+	}
+	
+	if {[N uleshort [O 4] 0 0 & 16384 == 16384]} {
+		>
+			emit {\b,control strings-}
+		<
+	}
+	
+	if {[N ubyte [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {\b)}
+		<
+	}
+	} msdos-com {if {[N byte [O 0] 0 0 {} {} x {}]} {
+		>
+			emit {DOS executable (COM)}
+		<
+	}
+	
+	if {[S string [O 6] 0 {} {} eq SFX\ of\ LHarc]} {
+		>
+			emit {\b, %s}
+		<
+	}
+	
+	if {[N leshort [O 510] 0 0 {} {} == -21931]} {
+		>
+			emit {\b, boot code}
+		<
+	}
+	
+	if {[S string [O 85] 0 {} {} eq UPX]} {
+		>
+			emit {\b, UPX compressed}
+		<
+	}
+	
+	if {[S string [O 4] 0 {} {} eq \ \$ARX]} {
+		>
+			emit {\b, ARX self-extracting archive}
+		<
+	}
+	
+	if {[S string [O 4] 0 {} {} eq \ \$LHarc]} {
+		>
+			emit {\b, LHarc self-extracting archive}
+		<
+	}
+	
+	if {[S string [O 526] 0 {} {} eq SFX\ by\ LARC]} {
+		>
+			emit {\b, LARC self-extracting archive}
+		<
+	}
+	} lotus-cells {if {[N ubelong [O 0] 0 0 {} {} == 100665344]} {
+		>
+			emit {\b, cell range}
+			if {[N ulong [O 4] 0 0 {} {} != 0]} {
+				>
+					if {[N uleshort [O 4] 0 0 {} {} x {}]} {
+						>
+							emit {\b%d,}
+						<
+					}
+	
+					if {[N uleshort [O 6] 0 0 {} {} x {}]} {
+						>
+							emit {\b%d-}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N uleshort [O 8] 0 0 {} {} x {}]} {
+				>
+					emit {\b%d,}
+				<
+			}
+	
+			if {[N uleshort [O 10] 0 0 {} {} x {}]} {
+				>
+					emit {\b%d}
+				<
+			}
+	
+		<
+	}
+	} cur-ico-dir {if {[N ulelong [O 18] 0 0 {} {} & 6]} {
+		>
+			if {[N ulelong [O [I 18 ulelong 0 + 0 0]] 0 0 {} {} x {}]} {
+				>
+					emit {MS Windows}
+					switch [Nv ubelong [O 0] 0 {} {}] {
+						256 {
+							>
+								emit {icon resource}
+								mime image/x-icon
+								ext ico
+								if {[N uleshort [O 4] 0 0 {} {} x {}]} {
+									>
+										emit {- %d icon}
+									<
+								}
+	
+								if {[N uleshort [O 4] 0 0 {} {} > 1]} {
+									>
+										emit {\bs}
+									<
+								}
+	
+								U 163 ico-entry [O 6]
+	
+								if {[N uleshort [O 4] 0 0 {} {} > 1]} {
+									>
+										U 163 ico-entry [O 22]
+	
+									<
+								}
+	
+							<
+						}
+						512 {
+							>
+								emit {cursor resource}
+								mime image/x-win-bitmap
+								ext cur
+								if {[N uleshort [O 4] 0 0 {} {} x {}]} {
+									>
+										emit {- %d icon}
+									<
+								}
+	
+								if {[N uleshort [O 4] 0 0 {} {} > 1]} {
+									>
+										emit {\bs}
+									<
+								}
+	
+								U 163 cur-entry [O 6]
+	
+							<
+						}
+					}
+	
+				<
+			}
+	
+		<
+	}
+	} cur-entry {U 163 cur-ico-entry [O 0]
+	
+	if {[N uleshort [O 4] 0 0 {} {} x {}]} {
+		>
+			emit {\b, hotspot @%dx}
+		<
+	}
+	
+	if {[N uleshort [O 6] 0 0 {} {} x {}]} {
+		>
+			emit {\b%d}
+		<
+	}
+	} ico-entry {U 163 cur-ico-entry [O 0]
+	
+	if {[N uleshort [O 4] 0 0 {} {} > 1]} {
+		>
+			emit {\b, %d planes}
+		<
+	}
+	
+	if {[N uleshort [O 6] 0 0 {} {} > 1]} {
+		>
+			emit {\b, %d bits/pixel}
+		<
+	}
+	} cur-ico-entry {if {[N byte [O 0] 0 0 {} {} == 0]} {
+		>
+			emit {\b, 256x}
+		<
+	}
+	
+	if {[N byte [O 0] 0 0 {} {} != 0]} {
+		>
+			emit {\b, %dx}
+		<
+	}
+	
+	if {[N byte [O 1] 0 0 {} {} == 0]} {
+		>
+			emit {\b256}
+		<
+	}
+	
+	if {[N byte [O 1] 0 0 {} {} != 0]} {
+		>
+			emit {\b%d}
+		<
+	}
+	
+	if {[N ubyte [O 2] 0 0 {} {} != 0]} {
+		>
+			emit {\b, %d colors}
+		<
+	}
+	
+	if {[N ubelong [O [I 12 ulelong 0 + 0 0]] 0 0 {} {} == 2303741511]} {
+		>
+			emit {\b with}
+			T [R [O -4]] {}
+	
+		<
+	}
+	
+	if {[N ubelong [O [I 12 ulelong 0 + 0 0]] 0 0 {} {} != 2303741511]} {
+		>
+		<
+	}
+	} cab-anchor {if {[S string [R [O 0]] 0 {} {} x {}]} {
+		>
+			emit %s
+			if {[S string [R [O 1]] 0 {} {} x {}]} {
+				>
+					emit {disk %s}
+				<
+			}
+	
+		<
+	}
+	} cab-folder {if {[N uleshort [O 4] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %u datablock}
+		<
+	}
+	
+	if {[N uleshort [O 4] 0 0 {} {} > 1]} {
+		>
+			emit {\bs}
+		<
+	}
+	
+	if {[N uleshort [O 6] 0 0 {} {} x {}]} {
+		>
+			emit {\b, 0x%x compression}
+		<
+	}
+	} cab-file {if {[N uleshort [O 8] 0 0 {} {} > 0]} {
+		>
+			emit {\b, iFolder 0x%x}
+		<
+	}
+	
+	if {[N uleshort [O 14] 0 0 {} {} > 0]} {
+		>
+			emit +
+			if {[N uleshort [O 14] 0 0 {} {} & 1]} {
+				>
+					emit {\bR}
+				<
+			}
+	
+			if {[N uleshort [O 14] 0 0 {} {} & 2]} {
+				>
+					emit {\bH}
+				<
+			}
+	
+			if {[N uleshort [O 14] 0 0 {} {} & 4]} {
+				>
+					emit {\bS}
+				<
+			}
+	
+			if {[N uleshort [O 14] 0 0 {} {} & 32]} {
+				>
+					emit {\bA}
+				<
+			}
+	
+			if {[N uleshort [O 14] 0 0 {} {} & 64]} {
+				>
+					emit {\bX}
+				<
+			}
+	
+			if {[N uleshort [O 14] 0 0 {} {} & 128]} {
+				>
+					emit {\bUtf}
+				<
+			}
+	
+			if {[N uleshort [O 14] 0 0 {} {} & 256]} {
+				>
+					emit {\b?}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string [O 16] 0 {} {} x {}]} {
+		>
+			emit {"%s"}
+		<
+	}
+	}}
+	164
+		{msooxml {if {[S string [O 0] 0 {} {} eq word/]} {
+		>
+			emit {Microsoft Word 2007+}
+			mime application/vnd.openxmlformats-officedocument.wordprocessingml.document
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq ppt/]} {
+		>
+			emit {Microsoft PowerPoint 2007+}
+			mime application/vnd.openxmlformats-officedocument.presentationml.presentation
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq xl/]} {
+		>
+			emit {Microsoft Excel 2007+}
+			mime application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+		<
+	}
+	}}
+	173
+		{ktrace {if {[N leshort [O 4] 0 0 {} {} == 7]} {
+		>
+			if {[N leshort [O 6] 0 0 {} {} < 3]} {
+				>
+					emit {NetBSD ktrace file version %d}
+					if {[S string [O 12] 0 {} {} x {}]} {
+						>
+							emit {from %s}
+						<
+					}
+	
+					if {[S string [O 56] 0 {} {} x {}]} {
+						>
+							emit {\b, emulation %s}
+						<
+					}
+	
+					if {[N lelong [O 8] 0 0 {} {} < 65536]} {
+						>
+							emit {\b, pid=%d}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	}}
+	187
+		{aportisdoc {if {[N beshort [O [I 78 ubelong 0 + 0 0]] 0 0 {} {} == 1]} {
+		>
+			emit {\b, uncompressed}
+		<
+	}
+	
+	if {[N beshort [O [I 78 ubelong 0 + 0 0]] 0 0 {} {} > 1]} {
+		>
+			if {[N belong [O [I 78 ubelong 0 + 0 4]] 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d bytes uncompressed}
+				<
+			}
+	
+		<
+	}
+	}}
+	199
+		{pgp {switch [Nv byte [O 0] 0 {} {}] {
+		48 {
+			>
+				switch [Nv byte [O 1] 0 & -64] {
+					-128 {
+						>
+							emit {Sym. Encrypted and Integrity Protected Data}
+						<
+					}
+					-64 {
+						>
+							emit {Modification Detection Code}
+						<
+					}
+					0 {
+						>
+							emit {Unused [0%x]}
+						<
+					}
+					64 {
+						>
+							emit {User Attribute}
+						<
+					}
+				}
+	
+			<
+		}
+		103 {
+			>
+				emit {Reserved (old)}
+			<
+		}
+		104 {
+			>
+				emit {Public-Key Encrypted Session Key (old)}
+			<
+		}
+		105 {
+			>
+				emit {Signature (old)}
+			<
+		}
+		106 {
+			>
+				emit {Symmetric-Key Encrypted Session Key (old)}
+			<
+		}
+		107 {
+			>
+				emit {One-Pass Signature (old)}
+			<
+		}
+		108 {
+			>
+				emit {Secret-Key (old)}
+			<
+		}
+		109 {
+			>
+				emit {Public-Key (old)}
+			<
+		}
+		110 {
+			>
+				emit {Secret-Subkey (old)}
+			<
+		}
+		111 {
+			>
+				emit {Compressed Data (old)}
+			<
+		}
+		112 {
+			>
+				emit {Symmetrically Encrypted Data (old)}
+			<
+		}
+		113 {
+			>
+				emit {Marker (old)}
+			<
+		}
+		114 {
+			>
+				emit {Literal Data (old)}
+			<
+		}
+		115 {
+			>
+				emit {Trust (old)}
+			<
+		}
+		116 {
+			>
+				emit {User ID (old)}
+			<
+		}
+		117 {
+			>
+				emit {Public-Subkey (old)}
+			<
+		}
+		118 {
+			>
+				emit {Unused (old)}
+			<
+		}
+		119 {
+			>
+				switch [Nv byte [O 1] 0 & -64] {
+					-128 {
+						>
+							emit Signature
+						<
+					}
+					-64 {
+						>
+							emit {Symmetric-Key Encrypted Session Key}
+						<
+					}
+					0 {
+						>
+							emit Reserved
+						<
+					}
+					64 {
+						>
+							emit {Public-Key Encrypted Session Key}
+						<
+					}
+				}
+	
+			<
+		}
+		120 {
+			>
+				switch [Nv byte [O 1] 0 & -64] {
+					-128 {
+						>
+							emit Public-Key
+						<
+					}
+					-64 {
+						>
+							emit Secret-Subkey
+						<
+					}
+					0 {
+						>
+							emit {One-Pass Signature}
+						<
+					}
+					64 {
+						>
+							emit Secret-Key
+						<
+					}
+				}
+	
+			<
+		}
+		121 {
+			>
+				switch [Nv byte [O 1] 0 & -64] {
+					-128 {
+						>
+							emit Marker
+						<
+					}
+					-64 {
+						>
+							emit {Literal Data}
+						<
+					}
+					0 {
+						>
+							emit {Compressed Data}
+						<
+					}
+					64 {
+						>
+							emit {Symmetrically Encrypted Data}
+						<
+					}
+				}
+	
+			<
+		}
+		122 {
+			>
+				switch [Nv byte [O 1] 0 & -64] {
+					-128 {
+						>
+							emit Public-Subkey
+						<
+					}
+					-64 {
+						>
+							emit {Unused [z%x]}
+						<
+					}
+					0 {
+						>
+							emit Trust
+						<
+					}
+					64 {
+						>
+							emit {User ID}
+						<
+					}
+				}
+	
+			<
+		}
+	}
+	} crypto {switch [Nv byte [O 0] 0 {} {}] {
+		0 {
+			>
+				emit {Plaintext or unencrypted data}
+			<
+		}
+		1 {
+			>
+				emit IDEA
+			<
+		}
+		2 {
+			>
+				emit TripleDES
+			<
+		}
+		3 {
+			>
+				emit {CAST5 (128 bit key)}
+			<
+		}
+		4 {
+			>
+				emit {Blowfish (128 bit key, 16 rounds)}
+			<
+		}
+		7 {
+			>
+				emit {AES with 128-bit key}
+			<
+		}
+		8 {
+			>
+				emit {AES with 192-bit key}
+			<
+		}
+		9 {
+			>
+				emit {AES with 256-bit key}
+			<
+		}
+		10 {
+			>
+				emit {Twofish with 256-bit key}
+			<
+		}
+	}
+	} hash {switch [Nv byte [O 0] 0 {} {}] {
+		1 {
+			>
+				emit MD5
+			<
+		}
+		2 {
+			>
+				emit SHA-1
+			<
+		}
+		3 {
+			>
+				emit RIPE-MD/160
+			<
+		}
+		8 {
+			>
+				emit SHA256
+			<
+		}
+		9 {
+			>
+				emit SHA384
+			<
+		}
+		10 {
+			>
+				emit SHA512
+			<
+		}
+		11 {
+			>
+				emit SHA224
+			<
+		}
+	}
+	} key_algo {switch [Nv byte [O 0] 0 {} {}] {
+		1 {
+			>
+				emit {RSA (Encrypt or Sign)}
+			<
+		}
+		2 {
+			>
+				emit {RSA Encrypt-Only}
+			<
+		}
+		3 {
+			>
+				emit {RSA (Sign-Only)}
+			<
+		}
+		16 {
+			>
+				emit {ElGamal (Encrypt-Only)}
+			<
+		}
+		17 {
+			>
+				emit DSA
+			<
+		}
+		18 {
+			>
+				emit {Elliptic Curve}
+			<
+		}
+		19 {
+			>
+				emit ECDSA
+			<
+		}
+		20 {
+			>
+				emit {ElGamal (Encrypt or Sign)}
+			<
+		}
+		21 {
+			>
+				emit Diffie-Hellman
+			<
+		}
+	}
+	
+	if {[D [O 0]]} {
+		>
+			if {[N ubyte [O 0] 0 0 {} {} < 22]} {
+				>
+					emit {unknown (pub %d)}
+				<
+			}
+	
+			if {[N ubyte [O 0] 0 0 {} {} > 21]} {
+				>
+					emit {invalid (%d)}
+				<
+			}
+	
+		<
+	}
+	} chkcrypto {U 199 crypto [O 0]
+	
+	switch [Nv byte [O 1] 0 {} {}] {
+		0 {
+			>
+				emit {Simple S2K}
+			<
+		}
+		1 {
+			>
+				emit {Salted S2K}
+			<
+		}
+		3 {
+			>
+				emit {Salted&Iterated S2K}
+			<
+		}
+	}
+	
+	U 199 hash [O 2]
+	} keyprolog {if {[N byte [O 0] 0 0 {} {} == 4]} {
+		>
+		<
+	}
+	
+	if {[N beldate [O 1] 0 0 {} {} x {}]} {
+		>
+			emit {created on %s -}
+		<
+	}
+	
+	switch [Nv byte [O 5] 0 {} {}] {
+		1 {
+			>
+				emit {RSA (Encrypt or Sign)}
+			<
+		}
+		2 {
+			>
+				emit {RSA Encrypt-Only}
+			<
+		}
+	}
+	} keyend {if {[S string [O 0] 0 {} {} eq \x00\x11\x01\x00\x01]} {
+		>
+			emit e=65537
+		<
+	}
+	
+	U 199 crypto [O 5]
+	
+	switch [Nv byte [O 5] 0 {} {}] {
+		-2 {
+			>
+				emit hashed
+				U 199 chkcrypto [O 6]
+	
+			<
+		}
+		-1 {
+			>
+				emit checksummed
+				U 199 chkcrypto [O 6]
+	
+			<
+		}
+	}
+	} x1024 {U 199 keyprolog [O 0]
+	
+	if {[S string [O 6] 0 {} {} eq \x03\xfe]} {
+		>
+		<
+	}
+	
+	if {[S string [O 6] 0 {} {} eq \x03\xff]} {
+		>
+		<
+	}
+	
+	if {[S string [O 6] 0 {} {} eq \x04\x00]} {
+		>
+		<
+	}
+	
+	U 199 keyend [O 136]
+	} x2048 {U 199 keyprolog [O 0]
+	
+	if {[S string [O 6] 0 {} {} eq \x80\x00]} {
+		>
+		<
+	}
+	
+	if {[S string [O 6] 0 {} {} eq \x07\xfe]} {
+		>
+		<
+	}
+	
+	if {[S string [O 6] 0 {} {} eq \x07\xff]} {
+		>
+		<
+	}
+	
+	U 199 keyend [O 264]
+	} x3072 {U 199 keyprolog [O 0]
+	
+	if {[S string [O 6] 0 {} {} eq \x0b\xfe]} {
+		>
+		<
+	}
+	
+	if {[S string [O 6] 0 {} {} eq \x0b\xff]} {
+		>
+		<
+	}
+	
+	if {[S string [O 6] 0 {} {} eq \x0c\x00]} {
+		>
+		<
+	}
+	
+	U 199 keyend [O 392]
+	} x4096 {U 199 keyprolog [O 0]
+	
+	if {[S string [O 6] 0 {} {} eq \x10\x00]} {
+		>
+		<
+	}
+	
+	if {[S string [O 6] 0 {} {} eq \x0f\xfe]} {
+		>
+		<
+	}
+	
+	if {[S string [O 6] 0 {} {} eq \x0f\xff]} {
+		>
+		<
+	}
+	
+	U 199 keyend [O 520]
+	} pgpkey {} x8192 {U 199 keyprolog [O 0]
+	
+	if {[S string [O 6] 0 {} {} eq \x20\x00]} {
+		>
+		<
+	}
+	
+	if {[S string [O 6] 0 {} {} eq \x1f\xfe]} {
+		>
+		<
+	}
+	
+	if {[S string [O 6] 0 {} {} eq \x1f\xff]} {
+		>
+		<
+	}
+	
+	U 199 keyend [O 1032]
+	
+	
+	if {[S string [O 0] 0 {} {} eq \x01\xd8]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x01\xeb]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x01\xfb]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x01\xfd]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x01\xf3]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x01\xee]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x01\xfe]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x01\xf4]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x02\x0d]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x02\x03]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x02\x05]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x02\x15]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x02\x00]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x02\x10]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x02\x04]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x02\x06]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x02\x16]} {
+		>
+			emit 1024b
+			U 199 x1024 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\x98]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xab]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xbb]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xbd]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xcd]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xb3]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xc3]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xc5]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xd5]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xae]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xbe]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xc0]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xd0]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xb4]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xc4]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xc6]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x03\xd6]} {
+		>
+			emit 2048b
+			U 199 x2048 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05X]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05k]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05\{]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05\}]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05\x8d]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05s]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05\x83]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05\x85]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05\x95]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05n]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05\x7e]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05\x80]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05\x90]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05t]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05\x84]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05\x86]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x05\x96]} {
+		>
+			emit 3072b
+			U 199 x3072 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07\[]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07\x18]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07+]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07\;]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07=]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07M]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x073]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07C]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07E]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07U]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07.]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07>]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07@]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07P]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x074]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07D]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07F]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x07V]} {
+		>
+			emit 4096b
+			U 199 x4096 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0e\[]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0e\x18]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0e+]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0e\;]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0e=]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0eM]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0e3]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0eC]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0eE]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0eU]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0e.]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0e>]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0e@]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0eP]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0e4]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0eD]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0eF]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq \x0eV]} {
+		>
+			emit 8192b
+			U 199 x8192 [O 2]
+	
+		<
+	}
+	}}
+	214
+		{riff-wave {switch [Nv leshort [O 0] 0 {} {}] {
+		1 {
+			>
+				emit {\b, Microsoft PCM}
+				if {[N leshort [O 14] 0 0 {} {} > 0]} {
+					>
+						if {[N leshort [O 14] 0 0 {} {} < 1024]} {
+							>
+								emit {\b, %d bit}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		2 {
+			>
+				emit {\b, Microsoft ADPCM}
+			<
+		}
+		6 {
+			>
+				emit {\b, ITU G.711 A-law}
+			<
+		}
+		7 {
+			>
+				emit {\b, ITU G.711 mu-law}
+			<
+		}
+		8 {
+			>
+				emit {\b, Microsoft DTS}
+			<
+		}
+		17 {
+			>
+				emit {\b, IMA ADPCM}
+			<
+		}
+		20 {
+			>
+				emit {\b, ITU G.723 ADPCM (Yamaha)}
+			<
+		}
+		49 {
+			>
+				emit {\b, GSM 6.10}
+			<
+		}
+		64 {
+			>
+				emit {\b, ITU G.721 ADPCM}
+			<
+		}
+		80 {
+			>
+				emit {\b, MPEG}
+			<
+		}
+		85 {
+			>
+				emit {\b, MPEG Layer 3}
+			<
+		}
+		8193 {
+			>
+				emit {\b, DTS}
+			<
+		}
+	}
+	
+	switch [Nv leshort [O 2] 0 {} {}] {
+		1 {
+			>
+				emit {\b, mono}
+			<
+		}
+		2 {
+			>
+				emit {\b, stereo}
+			<
+		}
+	}
+	
+	if {[N leshort [O 2] 0 0 {} {} > 2]} {
+		>
+			if {[N leshort [O 2] 0 0 {} {} < 128]} {
+				>
+					emit {\b, %d channels}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lelong [O 4] 0 0 {} {} > 0]} {
+		>
+			if {[N lelong [O 4] 0 0 {} {} < 1000000]} {
+				>
+					emit {%d Hz}
+				<
+			}
+	
+		<
+	}
+	} riff-walk {if {[S string [O 0] 0 {} {} eq fmt\x20]} {
+		>
+			if {[N lelong [O 4] 0 0 {} {} < 128]} {
+				>
+					U 214 riff-wave [O 8]
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq LIST]} {
+		>
+			U 214 riff-walk [R [O [I 4 ulelong 0 + 0 4]]]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq DISP]} {
+		>
+			U 214 riff-walk [R [O [I 4 ulelong 0 + 0 4]]]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq bext]} {
+		>
+			U 214 riff-walk [R [O [I 4 ulelong 0 + 0 4]]]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq Fake]} {
+		>
+			U 214 riff-walk [R [O [I 4 ulelong 0 + 0 4]]]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq fact]} {
+		>
+			U 214 riff-walk [R [O [I 4 ulelong 0 + 0 4]]]
+	
+		<
+	}
+	
+	if {[S string [O 0] 0 {} {} eq VP8]} {
+		>
+			if {[N byte [O 11] 0 0 {} {} == -99]} {
+				>
+					if {[N byte [O 12] 0 0 {} {} == 1]} {
+						>
+							if {[N byte [O 13] 0 0 {} {} == 42]} {
+								>
+									emit {\b, VP8 encoding}
+									if {[N leshort [O 14] 0 0 & 16383 x {}]} {
+										>
+											emit {\b, %d}
+										<
+									}
+	
+									if {[N leshort [O 16] 0 0 & 16383 x {}]} {
+										>
+											emit {\bx%d, Scaling:}
+										<
+									}
+	
+									switch [Nv leshort [O 14] 0 & -16384] {
+										0 {
+											>
+												emit {\b [none]}
+											<
+											>
+												emit {\bx[none]}
+											<
+										}
+										4096 {
+											>
+												emit {\b [5/4]}
+											<
+											>
+												emit {\bx[5/4]}
+											<
+										}
+										8192 {
+											>
+												emit {\b [5/3]}
+											<
+											>
+												emit {\bx[5/3]}
+											<
+										}
+										12288 {
+											>
+												emit {\b [2]}
+											<
+											>
+												emit {\bx[2]}
+											<
+										}
+									}
+	
+									switch [Nv byte [O 15] 0 & -128] {
+										-128 {
+											>
+												emit {\b, bad color specification}
+											<
+										}
+										0 {
+											>
+												emit {\b, YUV color}
+											<
+										}
+									}
+	
+									switch [Nv byte [O 15] 0 & 64] {
+										0 {
+											>
+												emit {\b, decoders should clamp}
+											<
+										}
+										64 {
+											>
+												emit {\b, no clamping required}
+											<
+										}
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	}}
+	226
+		{sereal {if {[N byte [O 4] 0 0 & 15 x {}]} {
+		>
+			emit {(version %d,}
+		<
+	}
+	
+	switch [Nv byte [O 4] 0 & -16] {
+		0 {
+			>
+				emit uncompressed)
+			<
+		}
+		16 {
+			>
+				emit {compressed with non-incremental Snappy)}
+			<
+		}
+		32 {
+			>
+				emit {compressed with incremental Snappy)}
+			<
+		}
+	}
+	
+	if {[N byte [O 4] 0 0 & -16 > 32]} {
+		>
+			emit {unknown subformat, flag: %d>>4)}
+		<
+	}
+	}}
+	235
+		{pcap-be {if {[N beshort [O 4] 0 0 {} {} x {}]} {
+		>
+			emit {- version %d}
+		<
+	}
+	
+	if {[N beshort [O 6] 0 0 {} {} x {}]} {
+		>
+			emit {\b.%d}
+		<
+	}
+	
+	switch [Nv belong [O 20] 0 {} {}] {
+		0 {
+			>
+				emit {(No link-layer encapsulation}
+			<
+		}
+		1 {
+			>
+				emit (Ethernet
+			<
+		}
+		2 {
+			>
+				emit {(3Mb Ethernet}
+			<
+		}
+		3 {
+			>
+				emit (AX.25
+			<
+		}
+		4 {
+			>
+				emit (ProNET
+			<
+		}
+		5 {
+			>
+				emit (CHAOS
+			<
+		}
+		6 {
+			>
+				emit {(Token Ring}
+			<
+		}
+		7 {
+			>
+				emit {(BSD ARCNET}
+			<
+		}
+		8 {
+			>
+				emit (SLIP
+			<
+		}
+		9 {
+			>
+				emit (PPP
+			<
+		}
+		10 {
+			>
+				emit (FDDI
+			<
+		}
+		11 {
+			>
+				emit {(RFC 1483 ATM}
+			<
+		}
+		12 {
+			>
+				emit {(raw IP}
+			<
+		}
+		13 {
+			>
+				emit {(BSD/OS SLIP}
+			<
+		}
+		14 {
+			>
+				emit {(BSD/OS PPP}
+			<
+		}
+		19 {
+			>
+				emit {(Linux ATM Classical IP}
+			<
+		}
+		50 {
+			>
+				emit {(PPP or Cisco HDLC}
+			<
+		}
+		51 {
+			>
+				emit (PPP-over-Ethernet
+			<
+		}
+		99 {
+			>
+				emit {(Symantec Enterprise Firewall}
+			<
+		}
+		100 {
+			>
+				emit {(RFC 1483 ATM}
+			<
+		}
+		101 {
+			>
+				emit {(raw IP}
+			<
+		}
+		102 {
+			>
+				emit {(BSD/OS SLIP}
+			<
+		}
+		103 {
+			>
+				emit {(BSD/OS PPP}
+			<
+		}
+		104 {
+			>
+				emit {(BSD/OS Cisco HDLC}
+			<
+		}
+		105 {
+			>
+				emit (802.11
+			<
+		}
+		106 {
+			>
+				emit {(Linux Classical IP over ATM}
+			<
+		}
+		107 {
+			>
+				emit {(Frame Relay}
+			<
+		}
+		108 {
+			>
+				emit {(OpenBSD loopback}
+			<
+		}
+		109 {
+			>
+				emit {(OpenBSD IPsec encrypted}
+			<
+		}
+		112 {
+			>
+				emit {(Cisco HDLC}
+			<
+		}
+		113 {
+			>
+				emit {(Linux "cooked"}
+			<
+		}
+		114 {
+			>
+				emit (LocalTalk
+			<
+		}
+		117 {
+			>
+				emit {(OpenBSD PFLOG}
+			<
+		}
+		119 {
+			>
+				emit {(802.11 with Prism header}
+			<
+		}
+		122 {
+			>
+				emit {(RFC 2625 IP over Fibre Channel}
+			<
+		}
+		123 {
+			>
+				emit (SunATM
+			<
+		}
+		127 {
+			>
+				emit {(802.11 with radiotap header}
+			<
+		}
+		129 {
+			>
+				emit {(Linux ARCNET}
+			<
+		}
+		138 {
+			>
+				emit {(Apple IP over IEEE 1394}
+			<
+		}
+		139 {
+			>
+				emit {(MTP2 with pseudo-header}
+			<
+		}
+		140 {
+			>
+				emit (MTP2
+			<
+		}
+		141 {
+			>
+				emit (MTP3
+			<
+		}
+		142 {
+			>
+				emit (SCCP
+			<
+		}
+		143 {
+			>
+				emit (DOCSIS
+			<
+		}
+		144 {
+			>
+				emit (IrDA
+			<
+		}
+		147 {
+			>
+				emit {(Private use 0}
+			<
+		}
+		148 {
+			>
+				emit {(Private use 1}
+			<
+		}
+		149 {
+			>
+				emit {(Private use 2}
+			<
+		}
+		150 {
+			>
+				emit {(Private use 3}
+			<
+		}
+		151 {
+			>
+				emit {(Private use 4}
+			<
+		}
+		152 {
+			>
+				emit {(Private use 5}
+			<
+		}
+		153 {
+			>
+				emit {(Private use 6}
+			<
+		}
+		154 {
+			>
+				emit {(Private use 7}
+			<
+		}
+		155 {
+			>
+				emit {(Private use 8}
+			<
+		}
+		156 {
+			>
+				emit {(Private use 9}
+			<
+		}
+		157 {
+			>
+				emit {(Private use 10}
+			<
+		}
+		158 {
+			>
+				emit {(Private use 11}
+			<
+		}
+		159 {
+			>
+				emit {(Private use 12}
+			<
+		}
+		160 {
+			>
+				emit {(Private use 13}
+			<
+		}
+		161 {
+			>
+				emit {(Private use 14}
+			<
+		}
+		162 {
+			>
+				emit {(Private use 15}
+			<
+		}
+		163 {
+			>
+				emit {(802.11 with AVS header}
+			<
+		}
+		165 {
+			>
+				emit {(BACnet MS/TP}
+			<
+		}
+		166 {
+			>
+				emit (PPPD
+			<
+		}
+		169 {
+			>
+				emit {(GPRS LLC}
+			<
+		}
+		177 {
+			>
+				emit {(Linux LAPD}
+			<
+		}
+		187 {
+			>
+				emit {(Bluetooth HCI H4}
+			<
+		}
+		189 {
+			>
+				emit {(Linux USB}
+			<
+		}
+		192 {
+			>
+				emit (PPI
+			<
+		}
+		195 {
+			>
+				emit (802.15.4
+			<
+		}
+		196 {
+			>
+				emit (SITA
+			<
+		}
+		197 {
+			>
+				emit {(Endace ERF}
+			<
+		}
+		201 {
+			>
+				emit {(Bluetooth HCI H4 with pseudo-header}
+			<
+		}
+		202 {
+			>
+				emit {(AX.25 with KISS header}
+			<
+		}
+		203 {
+			>
+				emit (LAPD
+			<
+		}
+		204 {
+			>
+				emit {(PPP with direction pseudo-header}
+			<
+		}
+		205 {
+			>
+				emit {(Cisco HDLC with direction pseudo-header}
+			<
+		}
+		206 {
+			>
+				emit {(Frame Relay with direction pseudo-header}
+			<
+		}
+		209 {
+			>
+				emit {(Linux IPMB}
+			<
+		}
+		215 {
+			>
+				emit {(802.15.4 with non-ASK PHY header}
+			<
+		}
+		220 {
+			>
+				emit {(Memory-mapped Linux USB}
+			<
+		}
+		224 {
+			>
+				emit {(Fibre Channel FC-2}
+			<
+		}
+		225 {
+			>
+				emit {(Fibre Channel FC-2 with frame delimiters}
+			<
+		}
+		226 {
+			>
+				emit {(Solaris IPNET}
+			<
+		}
+		227 {
+			>
+				emit (SocketCAN
+			<
+		}
+		228 {
+			>
+				emit {(Raw IPv4}
+			<
+		}
+		229 {
+			>
+				emit {(Raw IPv6}
+			<
+		}
+		230 {
+			>
+				emit {(802.15.4 without FCS}
+			<
+		}
+		231 {
+			>
+				emit {(D-Bus messages}
+			<
+		}
+		235 {
+			>
+				emit (DVB-CI
+			<
+		}
+		236 {
+			>
+				emit (MUX27010
+			<
+		}
+		237 {
+			>
+				emit {(STANAG 5066 D_PDUs}
+			<
+		}
+		239 {
+			>
+				emit {(Linux netlink NFLOG messages}
+			<
+		}
+		240 {
+			>
+				emit {(Hilscher netAnalyzer}
+			<
+		}
+		241 {
+			>
+				emit {(Hilscher netAnalyzer with delimiters}
+			<
+		}
+		242 {
+			>
+				emit (IP-over-Infiniband
+			<
+		}
+		243 {
+			>
+				emit {(MPEG-2 Transport Stream packets}
+			<
+		}
+		244 {
+			>
+				emit {(ng4t ng40}
+			<
+		}
+		245 {
+			>
+				emit {(NFC LLCP}
+			<
+		}
+		247 {
+			>
+				emit (Infiniband
+			<
+		}
+		248 {
+			>
+				emit (SCTP
+			<
+		}
+	}
+	
+	if {[N belong [O 16] 0 0 {} {} x {}]} {
+		>
+			emit {\b, capture length %d)}
+		<
+	}
+	}}
+	252
+		{firmware-tplink {if {[N ubyte [O 0] 0 0 {} {} x {}]} {
+		>
+			emit firmware
+			mime application/x-tplink-bin
+			ext bin
+		<
+	}
+	
+	if {[N ubeshort [O 64] 0 0 {} {} x {}]} {
+		>
+			emit %x
+		<
+	}
+	
+	if {[N ubeshort [O 66] 0 0 {} {} x {}]} {
+		>
+			emit v%x
+		<
+	}
+	
+	if {[N ubelong [O 68] 0 0 {} {} != 1]} {
+		>
+			emit {(revision %u)}
+		<
+	}
+	
+	if {[S string [O 4] 0 {} {} x {}]} {
+		>
+			emit %.24s
+		<
+	}
+	
+	if {[S string [O 28] 0 {} {} x {}]} {
+		>
+			emit %.36s
+		<
+	}
+	
+	if {[N ubyte [O 0] 0 0 {} {} != 1]} {
+		>
+			emit V%X
+		<
+	}
+	
+	if {[N long [O 152] 0 0 {} {} != 0]} {
+		>
+			emit {\b, version}
+			if {[N ubeshort [O 152] 0 0 {} {} x {}]} {
+				>
+					emit %u
+				<
+			}
+	
+			if {[N ubeshort [O 154] 0 0 {} {} x {}]} {
+				>
+					emit {\b.%u}
+				<
+			}
+	
+			if {[N ubeshort [O 156] 0 0 {} {} x {}]} {
+				>
+					emit {\b.%u}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubelong [O 72] 0 0 {} {} x {}]} {
+		>
+			if {[N ubelong [O 72] 0 0 {} {} == 1]} {
+				>
+					emit (US)
+				<
+			}
+	
+			if {[N ubelong [O 72] 0 0 {} {} > 1]} {
+				>
+					emit {(region %u)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubelong [O 124] 0 0 {} {} x {}]} {
+		>
+			emit {\b, %u bytes or less}
+		<
+	}
+	
+	if {[N ubelong [O 72] 0 0 {} {} != 0]} {
+		>
+			emit {\b, UNKNOWN1 0x%x}
+		<
+	}
+	
+	if {[N ubelong [O 92] 0 0 {} {} != 0]} {
+		>
+			emit {\b, UNKNOWN2 0x%x}
+		<
+	}
+	
+	if {[N ubelong [O 112] 0 0 {} {} != 0]} {
+		>
+			emit {\b, UNKNOWN3 0x%x}
+		<
+	}
+	
+	if {[N ubelong [O 128] 0 0 {} {} x {}]} {
+		>
+			emit {\b, at 0x%x}
+		<
+	}
+	
+	if {[N ubelong [O 132] 0 0 {} {} x {}]} {
+		>
+			emit {%u bytes }
+		<
+	}
+	
+	T [O [I 128 ubelong 0 + 0 0]] {}
+	
+	if {[N ubelong [O 136] 0 0 {} {} x {}]} {
+		>
+			emit {\b, at 0x%x}
+		<
+	}
+	
+	if {[N ubelong [O 140] 0 0 {} {} x {}]} {
+		>
+			emit {%u bytes }
+		<
+	}
+	
+	T [O [I 136 ubelong 0 + 0 0]] {}
+	
+	if {[N ubelong [O 144] 0 0 {} {} != 0]} {
+		>
+			emit {\b, at 0x%x}
+			if {[N ubelong [O 148] 0 0 {} {} != 0]} {
+				>
+					emit {%u bytes}
+				<
+			}
+	
+		<
+	}
+	}}
+	275
+		{help-ver-date {if {[N leshort [O 0] 0 0 {} {} == 876]} {
+		>
+			if {[N leshort [O 4] 0 0 {} {} == 1]} {
+				>
+					emit Windows
+					switch [Nv leshort [O 2] 0 {} {}] {
+						15 {
+							>
+								emit 3.x
+							<
+						}
+						21 {
+							>
+								emit 3.0
+							<
+						}
+						33 {
+							>
+								emit 3.1
+							<
+						}
+						39 {
+							>
+								emit x.y
+							<
+						}
+						51 {
+							>
+								emit 95
+							<
+						}
+					}
+	
+					if {[D [O 2]]} {
+						>
+							emit y.z
+							if {[N leshort [O 2] 0 0 {} {} x {}]} {
+								>
+									emit 0x%x
+								<
+							}
+	
+						<
+					}
+	
+					if {[N leshort [O 2] 0 0 {} {} x {}]} {
+						>
+							emit help
+						<
+					}
+	
+					if {[N ldate [O 6] 0 0 {} {} x {}]} {
+						>
+							emit {\b, %s}
+						<
+					}
+	
+					mime application/winhelp
+					ext hlp
+				<
+			}
+	
+		<
+	}
+	} cnt-name {if {[S string [O 0] 0 {} {} eq \040]} {
+		>
+			if {[S regex [O 1] 0 c {} eq ^(\[^\xd>\]*|.*.hlp)]} {
+				>
+					emit {MS Windows help file Content, based "%s"}
+					mime text/plain
+					ext cnt
+				<
+			}
+	
+		<
+	}
+	} ini-file {if {[S search [O 0] 0 {} 8192 eq \[]} {
+		>
+			if {[S regex [R [O 0]] 0 c {} eq ^(autorun)]} {
+				>
+					if {[S string [R [O 0]] 0 {} {} eq \]\r\n\[]} {
+						>
+							emit {Total commander directory treeinfo.wc}
+							mime text/plain
+							ext wc
+						<
+					}
+	
+					if {[S string [R [O 0]] 0 {} {} ne \]\r\n\[]} {
+						>
+							emit {Microsoft Windows Autorun file}
+							mime application/x-setupscript
+							ext inf
+						<
+					}
+	
+				<
+			}
+	
+			if {[S regex [R [O 0]] 0 c {} eq ^(version|strings)\]]} {
+				>
+					emit {Windows setup INFormation}
+					mime application/x-setupscript
+					ext inf
+				<
+			}
+	
+			if {[S regex [R [O 0]] 0 c {} eq ^(WinsockCRCList|OEMCPL)\]]} {
+				>
+					emit {Windows setup INFormation}
+					mime application/x-setupscript
+					ext inf
+				<
+			}
+	
+			if {[S regex [R [O 0]] 0 c {} eq ^(.ShellClassInfo|DeleteOnCopy|LocalizedFileNames)\]]} {
+				>
+					emit {Windows desktop.ini}
+					mime application/x-wine-extension-ini
+				<
+			}
+	
+			if {[S regex [R [O 0]] 0 c {} eq ^(don't\ load)\]]} {
+				>
+					emit {Windows CONTROL.INI}
+					mime application/x-wine-extension-ini
+					ext ini
+				<
+			}
+	
+			if {[S regex [R [O 0]] 0 c {} eq ^(ndishlp\\\$|protman\\\$|NETBEUI\\\$)\]]} {
+				>
+					emit {Windows PROTOCOL.INI}
+					mime application/x-wine-extension-ini
+					ext ini
+				<
+			}
+	
+			if {[S regex [R [O 0]] 0 c {} eq ^(windows|Compatibility|embedding)\]]} {
+				>
+					emit {Windows WIN.INI}
+					mime application/x-wine-extension-ini
+					ext ini
+				<
+			}
+	
+			if {[S regex [R [O 0]] 0 c {} eq ^(boot|386enh|drivers)\]]} {
+				>
+					emit {Windows SYSTEM.INI}
+					mime application/x-wine-extension-ini
+					ext ini
+				<
+			}
+	
+			if {[S regex [R [O 0]] 0 c {} eq ^(SafeList)\]]} {
+				>
+					emit {Windows IOS.INI}
+					mime application/x-wine-extension-ini
+					ext ini
+				<
+			}
+	
+			if {[S regex [R [O 0]] 0 c {} eq ^(boot\x20loader)\]]} {
+				>
+					emit {Windows boot.ini}
+					mime application/x-wine-extension-ini
+					ext ini
+				<
+			}
+	
+			if {[S regex [R [O 0]] 0 c {} eq ^(menu)\]]} {
+				>
+					emit {MS-DOS CONFIG.SYS}
+					ext sys/dos/w40
+				<
+			}
+	
+			if {[S regex [R [O 0]] 0 c {} eq ^(Paths)\]\r\n]} {
+				>
+					emit {MS-DOS MSDOS.SYS}
+					ext sys/dos
+				<
+			}
+	
+			if {[S regex [R [O 0]] 0 c {} eq ^(options)\]\r\n]} {
+				>
+					emit {Microsoft HTML Help Project}
+					mime text/plain
+					ext hhp
+				<
+			}
+	
+			if {[D [R [O 0]]]} {
+				>
+					if {[S search [R [O 0]] 0 {} 8192 eq \[]} {
+						>
+							if {[S string [R [O 0]] 0 c {} eq version]} {
+								>
+									emit {Windows setup INFormation}
+									mime application/x-setupscript
+									ext inf
+								<
+							}
+	
+							if {[D [R [O 0]]]} {
+								>
+									if {[N ubyte [R [O 0]] 0 0 {} {} x {}]} {
+										>
+											if {[S regex [R [O -1]] 0 {} {} eq ^(\[A-Za-z0-9_()\ \]+)\]\r]} {
+												>
+													emit {Generic INItialization configuration [%-.40s}
+													mime application/x-wine-extension-ini
+													ext ini/inf
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	}}
+	288
+		{zipcd {if {[S string [O 0] 0 {} {} eq PK\001\002]} {
+		>
+			if {[N leshort [O 4] 0 0 {} {} x {}]} {
+				>
+					emit {\b, made by}
+				<
+			}
+	
+			U 288 zipversion [O 4]
+	
+			if {[N leshort [O 6] 0 0 {} {} x {}]} {
+				>
+					emit {\b, extract using at least}
+				<
+			}
+	
+			U 288 zipversion [O 6]
+	
+			if {[N ledate [O 12] 0 0 {} {} x {}]} {
+				>
+					emit {\b, last modified %s}
+				<
+			}
+	
+			if {[N lelong [O 24] 0 0 {} {} > 0]} {
+				>
+					emit {\b, uncompressed size %d}
+				<
+			}
+	
+			if {[N leshort [O 10] 0 0 {} {} x {}]} {
+				>
+					emit {\b, method=}
+				<
+			}
+	
+			U 288 zipcompression [O 10]
+	
+		<
+	}
+	} zipcompression {switch [Nv leshort [O 0] 0 {} {}] {
+		0 {
+			>
+				emit {\bstore}
+			<
+		}
+		8 {
+			>
+				emit {\bdeflate}
+			<
+		}
+		9 {
+			>
+				emit {\bdeflate64}
+			<
+		}
+		12 {
+			>
+				emit {\bbzip2}
+			<
+		}
+		14 {
+			>
+				emit {\blzma}
+			<
+		}
+		94 {
+			>
+				emit {\bMP3}
+			<
+		}
+		95 {
+			>
+				emit {\bxz}
+			<
+		}
+		96 {
+			>
+				emit {\bJpeg}
+			<
+		}
+		97 {
+			>
+				emit {\bWavPack}
+			<
+		}
+		98 {
+			>
+				emit {\bPPMd}
+			<
+		}
+		99 {
+			>
+				emit {\bAES Encrypted}
+			<
+		}
+	}
+	
+	if {[D [O 0]]} {
+		>
+			if {[N leshort [O 0] 0 0 {} {} x {}]} {
+				>
+					emit {\b[%#x]}
+				<
+			}
+	
+		<
+	}
+	} zipversion {switch [Nv leshort [O 0] 0 {} {}] {
+		9 {
+			>
+				emit v0.9
+			<
+		}
+		10 {
+			>
+				emit v1.0
+			<
+		}
+		11 {
+			>
+				emit v1.1
+			<
+		}
+		20 {
+			>
+				emit v2.0
+			<
+		}
+		21 {
+			>
+				emit v2.1
+			<
+		}
+		25 {
+			>
+				emit v2.5
+			<
+		}
+		27 {
+			>
+				emit v2.7
+			<
+		}
+		45 {
+			>
+				emit v4.5
+			<
+		}
+		46 {
+			>
+				emit v4.6
+			<
+		}
+		50 {
+			>
+				emit v5.0
+			<
+		}
+		51 {
+			>
+				emit v5.1
+			<
+		}
+		52 {
+			>
+				emit v5.2
+			<
+		}
+		61 {
+			>
+				emit v6.1
+			<
+		}
+		62 {
+			>
+				emit v6.2
+			<
+		}
+		63 {
+			>
+				emit v6.3
+			<
+		}
+	}
+	
+	if {[D [O 0]]} {
+		>
+			if {[N leshort [O 0] 0 0 {} {} x {}]} {
+				>
+					emit {v?[%#x]}
+				<
+			}
+	
+		<
+	}
+	}}
+
+}
+proc analyze {} {
+	switch [Nv leshort 0 0 {} {}] {
+		-13230 {
+			>
+				emit {RLE image data,}
+				if {[N leshort 6 0 0 {} {} x {}]} {
+					>
+						emit {%d x}
+					<
+				}
+	
+				if {[N leshort 8 0 0 {} {} x {}]} {
+					>
+						emit %d
+					<
+				}
+	
+				if {[N leshort 2 0 0 {} {} > 0]} {
+					>
+						emit {\b, lower left corner: %d}
+					<
+				}
+	
+				if {[N leshort 4 0 0 {} {} > 0]} {
+					>
+						emit {\b, lower right corner: %d}
+					<
+				}
+	
+				if {[N byte 10 0 0 & 1 == 1]} {
+					>
+						emit {\b, clear first}
+					<
+				}
+	
+				if {[N byte 10 0 0 & 2 == 2]} {
+					>
+						emit {\b, no background}
+					<
+				}
+	
+				if {[N byte 10 0 0 & 4 == 4]} {
+					>
+						emit {\b, alpha channel}
+					<
+				}
+	
+				if {[N byte 10 0 0 & 8 == 8]} {
+					>
+						emit {\b, comment}
+					<
+				}
+	
+				if {[N byte 11 0 0 {} {} > 0]} {
+					>
+						emit {\b, %d color channels}
+					<
+				}
+	
+				if {[N byte 12 0 0 {} {} > 0]} {
+					>
+						emit {\b, %d bits per pixel}
+					<
+				}
+	
+				if {[N byte 13 0 0 {} {} > 0]} {
+					>
+						emit {\b, %d color map channels}
+					<
+				}
+	
+			<
+		}
+		-5536 {
+			>
+				emit {ARJ archive data}
+				mime application/x-arj
+				if {[N byte 5 0 0 {} {} x {}]} {
+					>
+						emit {\b, v%d,}
+					<
+				}
+	
+				if {[N byte 8 0 0 {} {} & 4]} {
+					>
+						emit multi-volume,
+					<
+				}
+	
+				if {[N byte 8 0 0 {} {} & 16]} {
+					>
+						emit slash-switched,
+					<
+				}
+	
+				if {[N byte 8 0 0 {} {} & 32]} {
+					>
+						emit backup,
+					<
+				}
+	
+				if {[S string 34 0 {} {} x {}]} {
+					>
+						emit {original name: %s,}
+					<
+				}
+	
+				switch [Nv byte 7 0 {} {}] {
+					0 {
+						>
+							emit {os: MS-DOS}
+						<
+					}
+					1 {
+						>
+							emit {os: PRIMOS}
+						<
+					}
+					2 {
+						>
+							emit {os: Unix}
+						<
+					}
+					3 {
+						>
+							emit {os: Amiga}
+						<
+					}
+					4 {
+						>
+							emit {os: Macintosh}
+						<
+					}
+					5 {
+						>
+							emit {os: OS/2}
+						<
+					}
+					6 {
+						>
+							emit {os: Apple ][ GS}
+						<
+					}
+					7 {
+						>
+							emit {os: Atari ST}
+						<
+					}
+					8 {
+						>
+							emit {os: NeXT}
+						<
+					}
+					9 {
+						>
+							emit {os: VAX/VMS}
+						<
+					}
+				}
+	
+				if {[N byte 3 0 0 {} {} > 0]} {
+					>
+						emit %d\]
+					<
+				}
+	
+			<
+		}
+		-5247 {
+			>
+				emit {PRCS packaged project}
+			<
+		}
+		-155 {
+			>
+				emit {old 16-bit-int little-endian archive}
+				if {[S string 2 0 {} {} eq __.SYMDEF]} {
+					>
+						emit {random library}
+					<
+				}
+	
+			<
+			>
+				emit x.out
+				if {[S string 2 0 {} {} eq __.SYMDEF]} {
+					>
+						emit randomized
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} x {}]} {
+					>
+						emit archive
+					<
+				}
+	
+			<
+		}
+		-147 {
+			>
+				emit {very old 16-bit-int little-endian archive}
+			<
+		}
+		257 {
+			>
+				if {[N ulelong 68 0 0 {} {} != 88]} {
+					>
+						emit {PDP-11 UNIX/RT ldp}
+					<
+				}
+	
+			<
+		}
+		261 {
+			>
+				emit {PDP-11 old overlay}
+			<
+		}
+		263 {
+			>
+				emit {PDP-11 executable}
+				if {[N leshort 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N byte 15 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		264 {
+			>
+				emit {PDP-11 pure executable}
+				if {[N leshort 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N byte 15 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		265 {
+			>
+				emit {PDP-11 separate I&D executable}
+				if {[N leshort 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N byte 15 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		267 {
+			>
+				emit {PDP-11 demand-paged pure executable}
+				if {[N leshort 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		280 {
+			>
+				emit {PDP-11 overlaid pure executable}
+				if {[N leshort 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		281 {
+			>
+				emit {PDP-11 overlaid separate executable}
+				if {[N leshort 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		283 {
+			>
+				emit {SVr2 curses screen image, little-endian}
+			<
+		}
+		284 {
+			>
+				emit {SVr3 curses screen image, little-endian}
+			<
+		}
+		285 {
+			>
+				emit {SVr4 curses screen image, little-endian}
+			<
+		}
+		287 {
+			>
+				emit {PDP-11 kernel overlay}
+			<
+		}
+		320 {
+			>
+				emit {old Microsoft 8086 x.out}
+				if {[N byte 3 0 0 {} {} & 4]} {
+					>
+						emit separate
+					<
+				}
+	
+				if {[N byte 3 0 0 {} {} & 2]} {
+					>
+						emit pure
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} & 1]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ 1]} {
+					>
+						emit relocatable
+					<
+				}
+	
+				if {[N lelong 20 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		322 {
+			>
+				emit {basic-16 executable}
+				if {[N lelong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		323 {
+			>
+				emit {basic-16 executable (TV)}
+				if {[N lelong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		328 {
+			>
+				emit {x86 executable}
+				if {[N lelong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		329 {
+			>
+				emit {x86 executable (TV)}
+				if {[N lelong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		330 {
+			>
+				emit {iAPX 286 executable small model (COFF)}
+				if {[N lelong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		332 {
+			>
+				U 113 display-coff 0
+	
+			<
+		}
+		338 {
+			>
+				emit {iAPX 286 executable large model (COFF)}
+				if {[N lelong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		358 {
+			>
+				emit {MS Windows COFF MIPS R4000 object file}
+			<
+		}
+		376 {
+			>
+				emit {VAX COFF executable}
+				if {[N lelong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N leshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		381 {
+			>
+				emit {VAX COFF pure executable}
+				if {[N lelong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N leshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		387 {
+			>
+				switch [Nv leshort 24 0 {} {}] {
+					263 {
+						>
+							emit {COFF format alpha object}
+							if {[N leshort 22 0 0 & 12288 == 8192]} {
+								>
+									emit {shared library}
+								<
+							}
+	
+							if {[N byte 27 0 0 {} {} x {}]} {
+								>
+									emit {- version %d}
+								<
+							}
+	
+							if {[N byte 26 0 0 {} {} x {}]} {
+								>
+									emit {\b.%d}
+								<
+							}
+	
+							if {[N byte 28 0 0 {} {} x {}]} {
+								>
+									emit {\b-%d}
+								<
+							}
+	
+						<
+					}
+					264 {
+						>
+							emit {COFF format alpha pure}
+						<
+					}
+					267 {
+						>
+							emit {COFF format alpha demand paged}
+							if {[N leshort 22 0 0 & 12288 != 8192]} {
+								>
+									emit executable
+								<
+							}
+	
+							if {[N leshort 22 0 0 & 8192 != 0]} {
+								>
+									emit {dynamically linked}
+								<
+							}
+	
+							if {[N lelong 16 0 0 {} {} != 0]} {
+								>
+									emit {not stripped}
+								<
+							}
+	
+							if {[N lelong 16 0 0 {} {} == 0]} {
+								>
+									emit stripped
+								<
+							}
+	
+							if {[N byte 27 0 0 {} {} x {}]} {
+								>
+									emit {- version %d}
+								<
+							}
+	
+							if {[N byte 26 0 0 {} {} x {}]} {
+								>
+									emit {\b.%d}
+								<
+							}
+	
+							if {[N byte 28 0 0 {} {} x {}]} {
+								>
+									emit {\b-%d}
+								<
+							}
+	
+						<
+					}
+				}
+	
+			<
+		}
+		388 {
+			>
+				emit {MS Windows COFF Alpha object file}
+			<
+		}
+		392 {
+			>
+				emit {Alpha compressed COFF}
+			<
+		}
+		399 {
+			>
+				emit {Alpha u-code object}
+			<
+		}
+		443 {
+			>
+				if {[N leshort 2 0 0 {} {} == 256]} {
+					>
+						emit {Brooktrout 301 fax image,}
+						if {[N leshort 9 0 0 {} {} x {}]} {
+							>
+								emit {%d x}
+							<
+						}
+	
+						if {[N leshort 45 0 0 {} {} x {}]} {
+							>
+								emit %d
+							<
+						}
+	
+						switch [Nv leshort 6 0 {} {}] {
+							100 {
+								>
+									emit {\b, normal resolution}
+								<
+							}
+							200 {
+								>
+									emit {\b, fine resolution}
+								<
+							}
+						}
+	
+						switch [Nv byte 11 0 {} {}] {
+							1 {
+								>
+									emit {\b, G3 compression}
+								<
+							}
+							2 {
+								>
+									emit {\b, G32D compression}
+								<
+							}
+						}
+	
+					<
+				}
+	
+			<
+		}
+		496 {
+			>
+				emit {MS Windows COFF PowerPC object file}
+			<
+		}
+		518 {
+			>
+				emit {Microsoft a.out}
+				if {[N leshort 8 0 0 {} {} == 1]} {
+					>
+						emit {Middle model}
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 16]} {
+					>
+						emit overlay
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 2]} {
+					>
+						emit separate
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 4]} {
+					>
+						emit pure
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 2048]} {
+					>
+						emit segmented
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 1024]} {
+					>
+						emit standalone
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 8]} {
+					>
+						emit fixed-stack
+					<
+				}
+	
+				if {[N byte 28 0 0 {} {} & -128]} {
+					>
+						emit byte-swapped
+					<
+				}
+	
+				if {[N byte 28 0 0 {} {} & 64]} {
+					>
+						emit word-swapped
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit not-stripped
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} ^ -16384]} {
+					>
+						emit pre-SysV
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 16384]} {
+					>
+						emit V2.3
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & -32768]} {
+					>
+						emit V3.0
+					<
+				}
+	
+				if {[N byte 28 0 0 {} {} & 4]} {
+					>
+						emit 86
+					<
+				}
+	
+				if {[N byte 28 0 0 {} {} & 11]} {
+					>
+						emit 186
+					<
+				}
+	
+				if {[N byte 28 0 0 {} {} & 9]} {
+					>
+						emit 286
+					<
+				}
+	
+				if {[N byte 28 0 0 {} {} & 10]} {
+					>
+						emit 386
+					<
+				}
+	
+				if {[N byte 31 0 0 {} {} < 64]} {
+					>
+						emit {small model}
+					<
+				}
+	
+				switch [Nv byte 31 0 {} {}] {
+					72 {
+						>
+							emit {large model}
+						<
+					}
+					73 {
+						>
+							emit {huge model}
+						<
+					}
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 1]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} ^ 1]} {
+					>
+						emit {object file}
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 64]} {
+					>
+						emit {Large Text}
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 32]} {
+					>
+						emit {Large Data}
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 288]} {
+					>
+						emit {Huge Objects Enabled}
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		616 {
+			>
+				emit {MS Windows COFF Motorola 68000 object file}
+			<
+		}
+		656 {
+			>
+				emit {MS Windows COFF PA-RISC object file}
+			<
+		}
+		662 {
+			>
+				emit {Atari ATR image}
+			<
+		}
+		1078 {
+			>
+				emit {Linux/i386 PC Screen Font v1 data,}
+				if {[N byte 2 0 0 & 1 == 0]} {
+					>
+						emit {256 characters,}
+					<
+				}
+	
+				if {[N byte 2 0 0 & 1 != 0]} {
+					>
+						emit {512 characters,}
+					<
+				}
+	
+				if {[N byte 2 0 0 & 2 == 0]} {
+					>
+						emit {no directory,}
+					<
+				}
+	
+				if {[N byte 2 0 0 & 2 != 0]} {
+					>
+						emit {Unicode directory,}
+					<
+				}
+	
+				if {[N byte 3 0 0 {} {} > 0]} {
+					>
+						emit 8x%d
+					<
+				}
+	
+			<
+		}
+		1360 {
+			>
+				if {[N uleshort 18 0 0 & 36480 == 0]} {
+					>
+						U 104 display-coff 0
+	
+					<
+				}
+	
+			<
+		}
+		1408 {
+			>
+				emit {XENIX 8086 relocatable or 80286 small model}
+			<
+		}
+		3468 {
+			>
+				if {[N leshort 4 0 0 {} {} == 515]} {
+					>
+						switch [Nv leshort 2 0 {} {}] {
+							516 {
+								>
+									emit {GPG symmetrically encrypted data (3DES cipher)}
+								<
+							}
+							772 {
+								>
+									emit {GPG symmetrically encrypted data (CAST5 cipher)}
+								<
+							}
+							1028 {
+								>
+									emit {GPG symmetrically encrypted data (BLOWFISH cipher)}
+								<
+							}
+							1796 {
+								>
+									emit {GPG symmetrically encrypted data (AES cipher)}
+								<
+							}
+							2052 {
+								>
+									emit {GPG symmetrically encrypted data (AES192 cipher)}
+								<
+							}
+							2308 {
+								>
+									emit {GPG symmetrically encrypted data (AES256 cipher)}
+								<
+							}
+							2564 {
+								>
+									emit {GPG symmetrically encrypted data (TWOFISH cipher)}
+								<
+							}
+							2820 {
+								>
+									emit {GPG symmetrically encrypted data (CAMELLIA128 cipher)}
+								<
+							}
+							3076 {
+								>
+									emit {GPG symmetrically encrypted data (CAMELLIA192 cipher)}
+								<
+							}
+							3332 {
+								>
+									emit {GPG symmetrically encrypted data (CAMELLIA256 cipher)}
+								<
+							}
+						}
+	
+					<
+				}
+	
+			<
+		}
+		4097 {
+			>
+				emit {LANalyzer capture file}
+			<
+		}
+		4103 {
+			>
+				emit {LANalyzer capture file}
+			<
+		}
+		4843 {
+			>
+				emit {SYMMETRY i386 .o}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N lelong 124 0 0 {} {} > 0]} {
+					>
+						emit {version %d}
+					<
+				}
+	
+			<
+		}
+		6532 {
+			>
+				emit {Linux old jffs2 filesystem data little endian}
+			<
+		}
+		6533 {
+			>
+				emit {Linux jffs2 filesystem data little endian}
+			<
+		}
+		8939 {
+			>
+				emit {SYMMETRY i386 executable (0 @ 0)}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N lelong 124 0 0 {} {} > 0]} {
+					>
+						emit {version %d}
+					<
+				}
+	
+			<
+		}
+		13035 {
+			>
+				emit {SYMMETRY i386 executable (invalid @ 0)}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N lelong 124 0 0 {} {} > 0]} {
+					>
+						emit {version %d}
+					<
+				}
+	
+			<
+		}
+		13123 {
+			>
+				emit {Clarion Developer (v2 and above) data file}
+				if {[N leshort 2 0 0 {} {} & 1]} {
+					>
+						emit {\b, locked}
+					<
+				}
+	
+				if {[N leshort 2 0 0 {} {} & 4]} {
+					>
+						emit {\b, encrypted}
+					<
+				}
+	
+				if {[N leshort 2 0 0 {} {} & 8]} {
+					>
+						emit {\b, memo file exists}
+					<
+				}
+	
+				if {[N leshort 2 0 0 {} {} & 16]} {
+					>
+						emit {\b, compressed}
+					<
+				}
+	
+				if {[N leshort 2 0 0 {} {} & 64]} {
+					>
+						emit {\b, read only}
+					<
+				}
+	
+				if {[N lelong 5 0 0 {} {} x {}]} {
+					>
+						emit {\b, %d records}
+					<
+				}
+	
+			<
+		}
+		13133 {
+			>
+				emit {Clarion Developer (v2 and above) memo data}
+			<
+		}
+		16728 {
+			>
+				emit {Sony PlayStation Audio}
+			<
+		}
+		17131 {
+			>
+				if {[N lelong 124 0 0 {} {} > -1]} {
+					>
+						if {[N lelong 124 0 0 {} {} != 28867614]} {
+							>
+								emit {SYMMETRY i386 standalone executable}
+								if {[N lelong 16 0 0 {} {} > 0]} {
+									>
+										emit {not stripped}
+									<
+								}
+	
+								if {[N lelong 124 0 0 {} {} > 0]} {
+									>
+										emit {version %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		18912 {
+			>
+				emit {Clarion Developer (v2 and above) help data}
+			<
+		}
+		19789 {
+			>
+				if {[N leshort 6 0 0 {} {} == 2]} {
+					>
+						if {[N lelong 8 0 0 {} {} == 10]} {
+							>
+								if {[N leshort 16 0 0 {} {} == 15677]} {
+									>
+										emit {3D Studio model}
+										mime image/x-3ds
+										ext 3ds
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		21020 {
+			>
+				emit {COFF DSP21k}
+				if {[N lelong 18 0 0 {} {} & 2]} {
+					>
+						emit executable,
+					<
+				}
+	
+				if {[N lelong 18 0 0 {} {} ^ 2]} {
+					>
+						if {[N lelong 18 0 0 {} {} & 1]} {
+							>
+								emit {static object,}
+							<
+						}
+	
+						if {[N lelong 18 0 0 {} {} ^ 1]} {
+							>
+								emit {relocatable object,}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N lelong 18 0 0 {} {} & 8]} {
+					>
+						emit stripped
+					<
+				}
+	
+				if {[N lelong 18 0 0 {} {} ^ 8]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+			>
+				emit {SHARC COFF binary}
+				if {[N leshort 2 0 0 {} {} > 1]} {
+					>
+						emit {, %d sections}
+						if {[N lelong 12 0 0 {} {} > 0]} {
+							>
+								emit {, not stripped}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+	}
+	
+	switch [Nv beshort 0 0 {} {}] {
+		-32768 {
+			>
+				if {[S string [I 2 ubeshort 0 - 0 2] 0 {} {} eq (c)CRI]} {
+					>
+						emit {CRI ADX ADPCM audio}
+						if {[N byte 18 0 0 {} {} x {}]} {
+							>
+								emit v%u
+							<
+						}
+	
+						switch [Nv byte 4 0 {} {}] {
+							2 {
+								>
+									emit {\b, pre-set prediction coefficients}
+								<
+							}
+							3 {
+								>
+									emit {\b, standard ADX}
+								<
+							}
+							4 {
+								>
+									emit {\b, exponential scale}
+								<
+							}
+							5 {
+								>
+									emit {\b, AHX}
+								<
+							}
+						}
+	
+						if {[N belong 8 0 0 {} {} x {}]} {
+							>
+								emit {\b, %u Hz}
+							<
+						}
+	
+						switch [Nv byte 18 0 {} {}] {
+							3 {
+								>
+									if {[N beshort 2 0 0 {} {} > 43]} {
+										>
+											if {[N belong 24 0 0 {} {} != 0]} {
+												>
+													emit {\b, looping}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+							4 {
+								>
+									if {[N beshort 2 0 0 {} {} > 55]} {
+										>
+											if {[N belong 36 0 0 {} {} != 0]} {
+												>
+													emit {\b, looping}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+						}
+	
+						if {[N byte 19 0 0 & 8 == 8]} {
+							>
+								emit {\b, encrypted}
+							<
+						}
+	
+					<
+				}
+	
+			<
+			>
+				emit {lif file}
+			<
+		}
+		-32760 {
+			>
+				if {[S string 6 0 {} {} eq BS93]} {
+					>
+						emit {Lynx homebrew cartridge}
+						if {[N beshort 2 0 0 {} {} x {}]} {
+							>
+								emit {\b, RAM start $%04x}
+							<
+						}
+	
+						mime application/x-atari-lynx-rom
+					<
+				}
+	
+				if {[S string 6 0 {} {} eq LYNX]} {
+					>
+						emit {Lynx cartridge}
+						if {[N beshort 2 0 0 {} {} x {}]} {
+							>
+								emit {\b, RAM start $%04x}
+							<
+						}
+	
+						mime application/x-atari-lynx-rom
+					<
+				}
+	
+			<
+		}
+		-31486 {
+			>
+				emit {GPG encrypted data}
+				mime {text/PGP # encoding: data}
+			<
+		}
+		-30875 {
+			>
+				emit {disk quotas file}
+			<
+		}
+		-30771 {
+			>
+				emit {OS9/6809 module:}
+				switch [Nv byte 6 0 & 15] {
+					0 {
+						>
+							emit non-executable
+						<
+					}
+					1 {
+						>
+							emit {machine language}
+						<
+					}
+					2 {
+						>
+							emit {BASIC I-code}
+						<
+					}
+					3 {
+						>
+							emit {Pascal P-code}
+						<
+					}
+					4 {
+						>
+							emit {C I-code}
+						<
+					}
+					5 {
+						>
+							emit {COBOL I-code}
+						<
+					}
+					6 {
+						>
+							emit {Fortran I-code}
+						<
+					}
+				}
+	
+				switch [Nv byte 6 0 & -16] {
+					-64 {
+						>
+							emit {system module}
+						<
+					}
+					-48 {
+						>
+							emit {file manager}
+						<
+					}
+					-32 {
+						>
+							emit {device driver}
+						<
+					}
+					-16 {
+						>
+							emit {device descriptor}
+						<
+					}
+					16 {
+						>
+							emit {program executable}
+						<
+					}
+					32 {
+						>
+							emit subroutine
+						<
+					}
+					48 {
+						>
+							emit multi-module
+						<
+					}
+					64 {
+						>
+							emit {data module}
+						<
+					}
+				}
+	
+			<
+		}
+		-27392 {
+			>
+				emit {PGP key security ring}
+				mime application/x-pgp-keyring
+			<
+		}
+		-27391 {
+			>
+				emit {PGP key security ring}
+				mime application/x-pgp-keyring
+			<
+		}
+		-26110 {
+			>
+				emit {Zebra Metafile graphic}
+				switch [Nv leshort 2 0 {} {}] {
+					1 {
+						>
+							emit {(version 1.x)}
+						<
+					}
+					2 {
+						>
+							emit {(version 1.1x or 1.2x)}
+						<
+					}
+					3 {
+						>
+							emit {(version 1.49)}
+						<
+					}
+					4 {
+						>
+							emit {(version 1.50)}
+						<
+					}
+				}
+	
+				if {[S string 4 0 {} {} x {}]} {
+					>
+						emit {(comment = %s)}
+					<
+				}
+	
+			<
+		}
+		-23040 {
+			>
+				emit {PGP encrypted data}
+				mime {text/PGP # encoding: armored data}
+			<
+		}
+		-21928 {
+			>
+				emit {floppy image data (IBM SaveDskF, old)}
+			<
+		}
+		-21927 {
+			>
+				emit {floppy image data (IBM SaveDskF)}
+			<
+		}
+		-21926 {
+			>
+				emit {floppy image data (IBM SaveDskF, compressed)}
+			<
+		}
+		-21267 {
+			>
+				emit {Java serialization data}
+				if {[N beshort 2 0 0 {} {} > 4]} {
+					>
+						emit {\b, version %d}
+					<
+				}
+	
+			<
+		}
+		-8185 {
+			>
+				emit {amd 29k coff archive}
+			<
+		}
+		-7408 {
+			>
+				emit {Amiga Workbench}
+				if {[N beshort 2 0 0 {} {} == 1]} {
+					>
+						switch [Nv byte 48 0 {} {}] {
+							1 {
+								>
+									emit {disk icon}
+								<
+							}
+							2 {
+								>
+									emit {drawer icon}
+								<
+							}
+							3 {
+								>
+									emit {tool icon}
+								<
+							}
+							4 {
+								>
+									emit {project icon}
+								<
+							}
+							5 {
+								>
+									emit {garbage icon}
+								<
+							}
+							6 {
+								>
+									emit {device icon}
+								<
+							}
+							7 {
+								>
+									emit {kickstart icon}
+								<
+							}
+							8 {
+								>
+									emit {workbench application icon}
+								<
+							}
+						}
+	
+					<
+				}
+	
+				if {[N beshort 2 0 0 {} {} > 1]} {
+					>
+						emit {icon, vers. %d}
+					<
+				}
+	
+			<
+		}
+		-1279 {
+			>
+				emit {QDOS object}
+				if {[S pstring 2 0 {} {} x {}]} {
+					>
+						emit '%s'
+					<
+				}
+	
+			<
+		}
+		-511 {
+			>
+				emit {MySQL table definition file}
+				if {[N byte 2 0 0 {} {} x {}]} {
+					>
+						emit {Version %d}
+					<
+				}
+	
+				switch [Nv byte 3 0 {} {}] {
+					0 {
+						>
+							emit {\b, type UNKNOWN}
+						<
+					}
+					1 {
+						>
+							emit {\b, type DIAM_ISAM}
+						<
+					}
+					2 {
+						>
+							emit {\b, type HASH}
+						<
+					}
+					3 {
+						>
+							emit {\b, type MISAM}
+						<
+					}
+					4 {
+						>
+							emit {\b, type PISAM}
+						<
+					}
+					5 {
+						>
+							emit {\b, type RMS_ISAM}
+						<
+					}
+					6 {
+						>
+							emit {\b, type HEAP}
+						<
+					}
+					7 {
+						>
+							emit {\b, type ISAM}
+						<
+					}
+					8 {
+						>
+							emit {\b, type MRG_ISAM}
+						<
+					}
+					9 {
+						>
+							emit {\b, type MYISAM}
+						<
+					}
+					10 {
+						>
+							emit {\b, type MRG_MYISAM}
+						<
+					}
+					11 {
+						>
+							emit {\b, type BERKELEY_DB}
+						<
+					}
+					12 {
+						>
+							emit {\b, type INNODB}
+						<
+					}
+					13 {
+						>
+							emit {\b, type GEMINI}
+						<
+					}
+					14 {
+						>
+							emit {\b, type NDBCLUSTER}
+						<
+					}
+					15 {
+						>
+							emit {\b, type EXAMPLE_DB}
+						<
+					}
+					16 {
+						>
+							emit {\b, type CSV_DB}
+						<
+					}
+					17 {
+						>
+							emit {\b, type FEDERATED_DB}
+						<
+					}
+					18 {
+						>
+							emit {\b, type BLACKHOLE_DB}
+						<
+					}
+					19 {
+						>
+							emit {\b, type PARTITION_DB}
+						<
+					}
+					20 {
+						>
+							emit {\b, type BINLOG}
+						<
+					}
+					21 {
+						>
+							emit {\b, type SOLID}
+						<
+					}
+					22 {
+						>
+							emit {\b, type PBXT}
+						<
+					}
+					23 {
+						>
+							emit {\b, type TABLE_FUNCTION}
+						<
+					}
+					24 {
+						>
+							emit {\b, type MEMCACHE}
+						<
+					}
+					25 {
+						>
+							emit {\b, type FALCON}
+						<
+					}
+					26 {
+						>
+							emit {\b, type MARIA}
+						<
+					}
+					27 {
+						>
+							emit {\b, type PERFORMANCE_SCHEMA}
+						<
+					}
+					127 {
+						>
+							emit {\b, type DEFAULT}
+						<
+					}
+				}
+	
+				if {[N ulong 51 0 0 {} {} x {}]} {
+					>
+						emit {\b, MySQL version %d}
+					<
+				}
+	
+			<
+		}
+		-508 {
+			>
+				emit {structured file}
+			<
+		}
+		-155 {
+			>
+				emit {old 16-bit-int big-endian archive}
+				if {[S string 2 0 {} {} eq __.SYMDEF]} {
+					>
+						emit {random library}
+					<
+				}
+	
+			<
+		}
+		-147 {
+			>
+				emit {very old 16-bit-int big-endian archive}
+			<
+		}
+		-40 {
+			>
+				emit {JPEG image data}
+				mime image/jpeg
+				ext jpeg/jpg/jpe/jfif
+				if {[S string 6 0 {} {} eq JFIF]} {
+					>
+						emit {\b, JFIF standard}
+						if {[N byte 11 0 0 {} {} x {}]} {
+							>
+								emit {\b %d.}
+							<
+						}
+	
+						if {[N byte 12 0 0 {} {} x {}]} {
+							>
+								emit {\b%02d}
+							<
+						}
+	
+						switch [Nv byte 13 0 {} {}] {
+							0 {
+								>
+									emit {\b, aspect ratio}
+								<
+							}
+							1 {
+								>
+									emit {\b, resolution (DPI)}
+								<
+							}
+							2 {
+								>
+									emit {\b, resolution (DPCM)}
+								<
+							}
+						}
+	
+						if {[N beshort 14 0 0 {} {} x {}]} {
+							>
+								emit {\b, density %dx}
+							<
+						}
+	
+						if {[N beshort 16 0 0 {} {} x {}]} {
+							>
+								emit {\b%d}
+							<
+						}
+	
+						if {[N beshort 4 0 0 {} {} x {}]} {
+							>
+								emit {\b, segment length %d}
+							<
+						}
+	
+						if {[N byte 18 0 0 {} {} != 0]} {
+							>
+								emit {\b, thumbnail %dx}
+								if {[N byte 19 0 0 {} {} x {}]} {
+									>
+										emit {\b%d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 6 0 {} {} eq Exif]} {
+					>
+						emit {\b, Exif standard: [}
+						T 12 r
+	
+						if {[S string 12 0 {} {} x {}]} {
+							>
+								emit {\b]}
+							<
+						}
+	
+					<
+				}
+	
+				U 120 jpeg_segment [I 4 ubeshort 0 + 0 4]
+	
+			<
+		}
+		1 {
+			>
+				switch [Nv beshort 2 0 {} {}] {
+					8 {
+						>
+							U 111 gem_info 0
+	
+						<
+					}
+					9 {
+						>
+							U 111 gem_info 0
+	
+						<
+					}
+					24 {
+						>
+							U 111 gem_info 0
+	
+						<
+					}
+					25 {
+						>
+							U 111 gem_info 0
+	
+						<
+					}
+				}
+	
+			<
+		}
+		9 {
+			>
+				if {[N belong 2 0 0 {} {} == 267390960]} {
+					>
+						if {[N belong [R 0] 0 0 {} {} == 267390960]} {
+							>
+								if {[N byte [R 0] 0 0 {} {} == 0]} {
+									>
+									<
+								}
+	
+								if {[N beshort [R 1] 0 0 {} {} == 1]} {
+									>
+									<
+								}
+	
+								if {[S string [R 3] 0 {} {} eq a]} {
+									>
+										emit {Xilinx BIT data}
+										if {[S pstring [R 0] 0 H {} x {}]} {
+											>
+												emit {- from %s}
+												if {[S string [R 1] 0 {} {} eq b]} {
+													>
+														if {[S pstring [R 0] 0 H {} x {}]} {
+															>
+																emit {- for %s}
+																if {[S string [R 1] 0 {} {} eq c]} {
+																	>
+																		if {[S pstring [R 0] 0 H {} x {}]} {
+																			>
+																				emit {- built %s}
+																				if {[S string [R 1] 0 {} {} eq d]} {
+																					>
+																						if {[S pstring [R 0] 0 H {} x {}]} {
+																							>
+																								emit {\b(%s)}
+																								if {[S string [R 1] 0 {} {} eq e]} {
+																									>
+																										if {[N belong [R 0] 0 0 {} {} x {}]} {
+																											>
+																												emit {- data length 0x%x}
+																											<
+																										}
+	
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		100 {
+			>
+				emit {Atari 68xxx CPX file}
+				if {[N beshort 8 0 0 {} {} x {}]} {
+					>
+						emit {(version %04x)}
+					<
+				}
+	
+			<
+		}
+		200 {
+			>
+				emit {hp200 (68010) BSD}
+				switch [Nv beshort 2 0 {} {}] {
+					263 {
+						>
+							emit {impure binary}
+						<
+					}
+					264 {
+						>
+							emit {read-only binary}
+						<
+					}
+					267 {
+						>
+							emit {demand paged binary}
+						<
+					}
+				}
+	
+			<
+		}
+		260 {
+			>
+				emit {shared library}
+			<
+		}
+		261 {
+			>
+				emit {ctab data}
+			<
+		}
+		283 {
+			>
+				emit {SVr2 curses screen image, big-endian}
+			<
+		}
+		284 {
+			>
+				emit {SVr3 curses screen image, big-endian}
+			<
+		}
+		285 {
+			>
+				emit {SVr4 curses screen image, big-endian}
+			<
+		}
+		300 {
+			>
+				emit {hp300 (68020+68881) BSD}
+				switch [Nv beshort 2 0 {} {}] {
+					263 {
+						>
+							emit {impure binary}
+						<
+					}
+					264 {
+						>
+							emit {read-only binary}
+						<
+					}
+					267 {
+						>
+							emit {demand paged binary}
+						<
+					}
+				}
+	
+			<
+		}
+		312 {
+			>
+				emit {interLaced eXtensible Trace (LXT) file}
+				if {[N beshort 2 0 0 {} {} > 0]} {
+					>
+						emit {(Version %u)}
+					<
+				}
+	
+			<
+		}
+		320 {
+			>
+				emit {MIPSEB MIPS-III ECOFF executable}
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit (impure)
+						<
+					}
+					264 {
+						>
+							emit (swapped)
+						<
+					}
+					267 {
+						>
+							emit (paged)
+						<
+					}
+				}
+	
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} == 0]} {
+					>
+						emit stripped
+					<
+				}
+	
+				if {[N byte 22 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N byte 23 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+		322 {
+			>
+				emit {MIPSEL-BE MIPS-III ECOFF executable}
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit (impure)
+						<
+					}
+					264 {
+						>
+							emit (swapped)
+						<
+					}
+					267 {
+						>
+							emit (paged)
+						<
+					}
+				}
+	
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} == 0]} {
+					>
+						emit stripped
+					<
+				}
+	
+				if {[N byte 22 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N byte 23 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+		336 {
+			>
+				emit {mc68k COFF}
+				if {[N beshort 18 0 0 {} {} ^ 16]} {
+					>
+						emit object
+					<
+				}
+	
+				if {[N beshort 18 0 0 {} {} & 16]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[S string 168 0 {} {} eq .lowmem]} {
+					>
+						emit {Apple toolbox}
+					<
+				}
+	
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit (impure)
+						<
+					}
+					264 {
+						>
+							emit (pure)
+						<
+					}
+					267 {
+						>
+							emit {(demand paged)}
+						<
+					}
+					273 {
+						>
+							emit (standalone)
+						<
+					}
+				}
+	
+			<
+		}
+		337 {
+			>
+				emit {mc68k executable (shared)}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		338 {
+			>
+				emit {mc68k executable (shared demand paged)}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		344 {
+			>
+				emit {SVR2 pure executable (USS/370)}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 24 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		345 {
+			>
+				emit {SVR2 executable (Amdahl-UTS)}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 24 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		346 {
+			>
+				emit {370 XA sysV pure executable}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N beshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N belong 30 0 0 {} {} > 0]} {
+					>
+						emit {- 5.2 format}
+					<
+				}
+	
+			<
+		}
+		348 {
+			>
+				emit {SVR2 pure executable (Amdahl-UTS)}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 24 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		349 {
+			>
+				emit {SVR2 executable (USS/370)}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 24 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		351 {
+			>
+				emit {370 XA sysV executable}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N beshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N belong 30 0 0 {} {} > 0]} {
+					>
+						emit {- 5.2 format}
+					<
+				}
+	
+			<
+		}
+		352 {
+			>
+				emit {MIPSEB ECOFF executable}
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit (impure)
+						<
+					}
+					264 {
+						>
+							emit (swapped)
+						<
+					}
+					267 {
+						>
+							emit (paged)
+						<
+					}
+				}
+	
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} == 0]} {
+					>
+						emit stripped
+					<
+				}
+	
+				if {[N byte 22 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N byte 23 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+		354 {
+			>
+				emit {MIPSEL-BE ECOFF executable}
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit (impure)
+						<
+					}
+					264 {
+						>
+							emit (swapped)
+						<
+					}
+					267 {
+						>
+							emit (paged)
+						<
+					}
+				}
+	
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} == 0]} {
+					>
+						emit stripped
+					<
+				}
+	
+				if {[N byte 23 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N byte 22 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+		355 {
+			>
+				emit {MIPSEB MIPS-II ECOFF executable}
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit (impure)
+						<
+					}
+					264 {
+						>
+							emit (swapped)
+						<
+					}
+					267 {
+						>
+							emit (paged)
+						<
+					}
+				}
+	
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} == 0]} {
+					>
+						emit stripped
+					<
+				}
+	
+				if {[N byte 22 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N byte 23 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+		358 {
+			>
+				emit {MIPSEL-BE MIPS-II ECOFF executable}
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit (impure)
+						<
+					}
+					264 {
+						>
+							emit (swapped)
+						<
+					}
+					267 {
+						>
+							emit (paged)
+						<
+					}
+				}
+	
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} == 0]} {
+					>
+						emit stripped
+					<
+				}
+	
+				if {[N byte 22 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N byte 23 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+		364 {
+			>
+				emit {68K BCS executable}
+			<
+		}
+		365 {
+			>
+				emit {88K BCS executable}
+			<
+		}
+		368 {
+			>
+				emit {WE32000 COFF}
+				if {[N beshort 18 0 0 {} {} ^ 16]} {
+					>
+						emit object
+					<
+				}
+	
+				if {[N beshort 18 0 0 {} {} & 16]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N beshort 18 0 0 {} {} ^ 4096]} {
+					>
+						emit {N/A on 3b2/300 w/paging}
+					<
+				}
+	
+				if {[N beshort 18 0 0 {} {} & 8192]} {
+					>
+						emit {32100 required}
+					<
+				}
+	
+				if {[N beshort 18 0 0 {} {} & 16384]} {
+					>
+						emit {and MAU hardware required}
+					<
+				}
+	
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit (impure)
+						<
+					}
+					264 {
+						>
+							emit (pure)
+						<
+					}
+					267 {
+						>
+							emit {(demand paged)}
+						<
+					}
+					291 {
+						>
+							emit {(target shared library)}
+						<
+					}
+				}
+	
+				if {[N beshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		369 {
+			>
+				emit {WE32000 COFF executable (TV)}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		378 {
+			>
+				emit {amd 29k coff noprebar executable}
+			<
+		}
+		384 {
+			>
+				emit {MIPSEB Ucode}
+			<
+		}
+		386 {
+			>
+				emit {MIPSEL-BE Ucode}
+			<
+		}
+		392 {
+			>
+				emit {Tower/XP rel 2 object}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit executable
+						<
+					}
+					264 {
+						>
+							emit {pure executable}
+						<
+					}
+				}
+	
+				if {[N beshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		397 {
+			>
+				emit {Tower/XP rel 2 object}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit executable
+						<
+					}
+					264 {
+						>
+							emit {pure executable}
+						<
+					}
+				}
+	
+				if {[N beshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		400 {
+			>
+				emit {Tower/XP rel 3 object}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit executable
+						<
+					}
+					264 {
+						>
+							emit {pure executable}
+						<
+					}
+				}
+	
+				if {[N beshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		404 {
+			>
+				emit {apollo a88k COFF executable}
+				if {[N beshort 18 0 0 {} {} ^ 16384]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N beshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		405 {
+			>
+				emit {Tower/XP rel 3 object}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit executable
+						<
+					}
+					264 {
+						>
+							emit {pure executable}
+						<
+					}
+				}
+	
+				if {[N beshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		407 {
+			>
+				emit {Apollo m68k COFF executable}
+				if {[N beshort 18 0 0 {} {} ^ 16384]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N beshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		408 {
+			>
+				emit {Tower32/600/400 68020 object}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit executable
+						<
+					}
+					264 {
+						>
+							emit {pure executable}
+						<
+					}
+				}
+	
+				if {[N beshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		416 {
+			>
+				emit {Tower32/800 68020}
+				if {[N beshort 18 0 0 {} {} & 8192]} {
+					>
+						emit {w/68881 object}
+					<
+				}
+	
+				if {[N beshort 18 0 0 {} {} & 16384]} {
+					>
+						emit {compatible object}
+					<
+				}
+	
+				if {[N beshort 18 0 0 {} {} & 24576]} {
+					>
+						emit object
+					<
+				}
+	
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit executable
+						<
+					}
+					267 {
+						>
+							emit {pure executable}
+						<
+					}
+				}
+	
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N beshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		421 {
+			>
+				emit {Tower32/800 68010}
+				if {[N beshort 18 0 0 {} {} & 16384]} {
+					>
+						emit {compatible object}
+					<
+				}
+	
+				if {[N beshort 18 0 0 {} {} & 24576]} {
+					>
+						emit object
+					<
+				}
+	
+				switch [Nv beshort 20 0 {} {}] {
+					263 {
+						>
+							emit executable
+						<
+					}
+					267 {
+						>
+							emit {pure executable}
+						<
+					}
+				}
+	
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N beshort 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		474 {
+			>
+				emit {SGI image data}
+				if {[N byte 2 0 0 {} {} == 1]} {
+					>
+						emit {\b, RLE}
+					<
+				}
+	
+				if {[N byte 3 0 0 {} {} == 2]} {
+					>
+						emit {\b, high precision}
+					<
+				}
+	
+				if {[N beshort 4 0 0 {} {} x {}]} {
+					>
+						emit {\b, %d-D}
+					<
+				}
+	
+				if {[N beshort 6 0 0 {} {} x {}]} {
+					>
+						emit {\b, %d x}
+					<
+				}
+	
+				if {[N beshort 8 0 0 {} {} x {}]} {
+					>
+						emit %d
+					<
+				}
+	
+				if {[N beshort 10 0 0 {} {} x {}]} {
+					>
+						emit {\b, %d channel}
+					<
+				}
+	
+				if {[N beshort 10 0 0 {} {} != 1]} {
+					>
+						emit {\bs}
+					<
+				}
+	
+				if {[S string 80 0 {} {} > 0]} {
+					>
+						emit {\b, "%s"}
+					<
+				}
+	
+			<
+		}
+		479 {
+			>
+				emit {executable (RISC System/6000 V3.1) or obj module}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		503 {
+			>
+				emit {64-bit XCOFF executable or object module}
+				if {[N belong 20 0 0 {} {} == 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		518 {
+			>
+				emit {ALAN game data}
+				if {[N byte 2 0 0 {} {} < 10]} {
+					>
+						emit {version 2.6%d}
+					<
+				}
+	
+			<
+		}
+		550 {
+			>
+				emit {IRIS Showcase template}
+				if {[N byte 2 0 0 {} {} == 99]} {
+					>
+						emit -
+					<
+				}
+	
+				if {[N byte 3 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		890 {
+			>
+				emit {amd 29k coff prebar executable}
+			<
+		}
+		1280 {
+			>
+				if {[N ubeshort 18 0 0 & 36480 == 0]} {
+					>
+						U 104 display-coff 0
+	
+					<
+				}
+	
+			<
+		}
+		1286 {
+			>
+				emit {IRIS Showcase file}
+				if {[N byte 2 0 0 {} {} == 73]} {
+					>
+						emit -
+					<
+				}
+	
+				if {[N byte 3 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		2057 {
+			>
+				emit {Bentley/Intergraph MicroStation}
+				if {[N byte 2 0 0 {} {} == -2]} {
+					>
+						if {[N beshort 4 0 0 {} {} == 6144]} {
+							>
+								emit {CIT raster CAD}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		2935 {
+			>
+				emit {ATSC A/52 aka AC-3 aka Dolby Digital stream,}
+				mime audio/vnd.dolby.dd-raw
+				switch [Nv byte 4 0 & -64] {
+					-128 {
+						>
+							emit {32 kHz,}
+						<
+					}
+					-64 {
+						>
+							emit {reserved frequency,}
+						<
+					}
+					0 {
+						>
+							emit {48 kHz,}
+						<
+					}
+					64 {
+						>
+							emit {44.1 kHz,}
+						<
+					}
+				}
+	
+				switch [Nv byte 5 0 & 7] {
+					0 {
+						>
+							emit {\b, complete main (CM)}
+						<
+					}
+					1 {
+						>
+							emit {\b, music and effects (ME)}
+						<
+					}
+					2 {
+						>
+							emit {\b, visually impaired (VI)}
+						<
+					}
+					3 {
+						>
+							emit {\b, hearing impaired (HI)}
+						<
+					}
+					4 {
+						>
+							emit {\b, dialogue (D)}
+						<
+					}
+					5 {
+						>
+							emit {\b, commentary (C)}
+						<
+					}
+					6 {
+						>
+							emit {\b, emergency (E)}
+						<
+					}
+				}
+	
+				if {[N beshort 5 0 0 & 2016 == 1824]} {
+					>
+						emit {\b, voiceover (VO)}
+					<
+				}
+	
+				if {[N beshort 5 0 0 & 2016 > 1824]} {
+					>
+						emit {\b, karaoke}
+					<
+				}
+	
+				switch [Nv byte 6 0 & -32] {
+					-128 {
+						>
+							emit {2 front/1 rear,}
+							if {[N byte 6 0 0 & 4 == 4]} {
+								>
+									emit {LFE on,}
+								<
+							}
+	
+						<
+					}
+					-96 {
+						>
+							emit {3 front/1 rear,}
+							if {[N byte 6 0 0 & 1 == 1]} {
+								>
+									emit {LFE on,}
+								<
+							}
+	
+						<
+					}
+					-64 {
+						>
+							emit {2 front/2 rear,}
+							if {[N byte 6 0 0 & 4 == 4]} {
+								>
+									emit {LFE on,}
+								<
+							}
+	
+						<
+					}
+					-32 {
+						>
+							emit {3 front/2 rear,}
+							if {[N byte 6 0 0 & 1 == 1]} {
+								>
+									emit {LFE on,}
+								<
+							}
+	
+						<
+					}
+					0 {
+						>
+							emit {1+1 front,}
+							if {[N byte 6 0 0 & 16 == 16]} {
+								>
+									emit {LFE on,}
+								<
+							}
+	
+						<
+					}
+					32 {
+						>
+							emit {1 front/0 rear,}
+							if {[N byte 6 0 0 & 16 == 16]} {
+								>
+									emit {LFE on,}
+								<
+							}
+	
+						<
+					}
+					64 {
+						>
+							emit {2 front/0 rear,}
+							switch [Nv byte 6 0 & 24] {
+								0 {
+									>
+										emit {Dolby Surround not indicated}
+									<
+								}
+								8 {
+									>
+										emit {not Dolby Surround encoded}
+									<
+								}
+								16 {
+									>
+										emit {Dolby Surround encoded}
+									<
+								}
+								24 {
+									>
+										emit {reserved Dolby Surround mode}
+									<
+								}
+							}
+	
+							if {[N byte 6 0 0 & 4 == 4]} {
+								>
+									emit {LFE on,}
+								<
+							}
+	
+						<
+					}
+					96 {
+						>
+							emit {3 front/0 rear,}
+							if {[N byte 6 0 0 & 4 == 4]} {
+								>
+									emit {LFE on,}
+								<
+							}
+	
+						<
+					}
+				}
+	
+				switch [Nv byte 4 0 & 62] {
+					0 {
+						>
+							emit {\b, 32 kbit/s}
+						<
+					}
+					2 {
+						>
+							emit {\b, 40 kbit/s}
+						<
+					}
+					4 {
+						>
+							emit {\b, 48 kbit/s}
+						<
+					}
+					6 {
+						>
+							emit {\b, 56 kbit/s}
+						<
+					}
+					8 {
+						>
+							emit {\b, 64 kbit/s}
+						<
+					}
+					10 {
+						>
+							emit {\b, 80 kbit/s}
+						<
+					}
+					12 {
+						>
+							emit {\b, 96 kbit/s}
+						<
+					}
+					14 {
+						>
+							emit {\b, 112 kbit/s}
+						<
+					}
+					16 {
+						>
+							emit {\b, 128 kbit/s}
+						<
+					}
+					18 {
+						>
+							emit {\b, 160 kbit/s}
+						<
+					}
+					20 {
+						>
+							emit {\b, 192 kbit/s}
+						<
+					}
+					22 {
+						>
+							emit {\b, 224 kbit/s}
+						<
+					}
+					24 {
+						>
+							emit {\b, 256 kbit/s}
+						<
+					}
+					26 {
+						>
+							emit {\b, 320 kbit/s}
+						<
+					}
+					28 {
+						>
+							emit {\b, 384 kbit/s}
+						<
+					}
+					30 {
+						>
+							emit {\b, 448 kbit/s}
+						<
+					}
+					32 {
+						>
+							emit {\b, 512 kbit/s}
+						<
+					}
+					34 {
+						>
+							emit {\b, 576 kbit/s}
+						<
+					}
+					36 {
+						>
+							emit {\b, 640 kbit/s}
+						<
+					}
+				}
+	
+			<
+		}
+		3599 {
+			>
+				emit {Atari MSA archive data}
+				if {[N beshort 2 0 0 {} {} x {}]} {
+					>
+						emit {\b, %d sectors per track}
+					<
+				}
+	
+				switch [Nv beshort 4 0 {} {}] {
+					0 {
+						>
+							emit {\b, 1 sided}
+						<
+					}
+					1 {
+						>
+							emit {\b, 2 sided}
+						<
+					}
+				}
+	
+				if {[N beshort 6 0 0 {} {} x {}]} {
+					>
+						emit {\b, starting track: %d}
+					<
+				}
+	
+				if {[N beshort 8 0 0 {} {} x {}]} {
+					>
+						emit {\b, ending track: %d}
+					<
+				}
+	
+			<
+		}
+		3840 {
+			>
+				emit {AmigaOS bitmap font}
+			<
+		}
+		3843 {
+			>
+				emit {AmigaOS outline font}
+			<
+		}
+		4112 {
+			>
+				emit {PEX Binary Archive}
+			<
+		}
+		5493 {
+			>
+				emit {fsav macro virus signatures}
+				if {[N leshort 8 0 0 {} {} > 0]} {
+					>
+						emit (%d-
+					<
+				}
+	
+				if {[N byte 11 0 0 {} {} > 0]} {
+					>
+						emit {\b%02d-}
+					<
+				}
+	
+				if {[N byte 10 0 0 {} {} > 0]} {
+					>
+						emit {\b%02d)}
+					<
+				}
+	
+			<
+		}
+		14541 {
+			>
+				emit {C64 PCLink Image}
+			<
+		}
+		16385 {
+			>
+				emit {MIPSEB-LE MIPS-III ECOFF executable}
+				switch [Nv beshort 20 0 {} {}] {
+					1793 {
+						>
+							emit (impure)
+						<
+					}
+					2049 {
+						>
+							emit (swapped)
+						<
+					}
+					2817 {
+						>
+							emit (paged)
+						<
+					}
+				}
+	
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} == 0]} {
+					>
+						emit stripped
+					<
+				}
+	
+				if {[N byte 23 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N byte 22 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+		16897 {
+			>
+				emit {MIPSEL MIPS-III ECOFF executable}
+				switch [Nv beshort 20 0 {} {}] {
+					1793 {
+						>
+							emit (impure)
+						<
+					}
+					2049 {
+						>
+							emit (swapped)
+						<
+					}
+					2817 {
+						>
+							emit (paged)
+						<
+					}
+				}
+	
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} == 0]} {
+					>
+						emit stripped
+					<
+				}
+	
+				if {[N byte 23 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N byte 22 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+		17746 {
+			>
+				if {[N ubeshort 2 0 0 & 61951 == 0]} {
+					>
+						emit {Apple Driver Map}
+						if {[N beshort 2 0 0 {} {} x {}]} {
+							>
+								emit {\b, blocksize %d}
+							<
+						}
+	
+						if {[N ubelong 4 0 0 {} {} x {}]} {
+							>
+								emit {\b, blockcount %u}
+							<
+						}
+	
+						if {[N ubeshort 8 0 0 {} {} x {}]} {
+							>
+								emit {\b, devtype %u}
+							<
+						}
+	
+						if {[N ubeshort 10 0 0 {} {} x {}]} {
+							>
+								emit {\b, devid %u}
+							<
+						}
+	
+						if {[N ubelong 12 0 0 {} {} > 0]} {
+							>
+								if {[N ubelong 12 0 0 {} {} x {}]} {
+									>
+										emit {\b, driver data %u}
+									<
+								}
+	
+							<
+						}
+	
+						if {[N ubeshort 16 0 0 {} {} x {}]} {
+							>
+								emit {\b, driver count %u}
+							<
+						}
+	
+						if {[N ubelong 516 0 0 {} {} > 0]} {
+							>
+								emit {\b, contains[@0x200]:}
+								U 12 apple-apm 512
+	
+							<
+						}
+	
+						if {[N ubelong 516 0 0 {} {} > 1]} {
+							>
+								emit {\b, contains[@0x400]:}
+								U 12 apple-apm 1024
+	
+							<
+						}
+	
+						if {[N ubelong 516 0 0 {} {} > 2]} {
+							>
+								emit {\b, contains[@0x600]:}
+								U 12 apple-apm 1536
+	
+							<
+						}
+	
+						if {[N ubelong 516 0 0 {} {} > 3]} {
+							>
+								emit {\b, contains[@0x800]:}
+								U 12 apple-apm 2048
+	
+							<
+						}
+	
+						if {[N ubelong 516 0 0 {} {} > 4]} {
+							>
+								emit {\b, contains[@0xA00]:}
+								U 12 apple-apm 2560
+	
+							<
+						}
+	
+						if {[N ubelong 516 0 0 {} {} > 5]} {
+							>
+								emit {\b, contains[@0xC00]:}
+								U 12 apple-apm 3072
+	
+							<
+						}
+	
+						if {[N ubelong 516 0 0 {} {} > 6]} {
+							>
+								emit {\b, contains[@0xE00]:}
+								U 12 apple-apm 3584
+	
+							<
+						}
+	
+						if {[N ubelong 516 0 0 {} {} > 7]} {
+							>
+								emit {\b, contains[@0x1000]:}
+								U 12 apple-apm 4096
+	
+							<
+						}
+	
+						mime application/x-apple-diskimage
+						ext dmg/iso
+					<
+				}
+	
+			<
+		}
+		19196 {
+			>
+				emit {OS9/68K module:}
+				if {[N byte 20 0 0 & -128 == -128]} {
+					>
+						emit re-entrant
+					<
+				}
+	
+				if {[N byte 20 0 0 & 64 == 64]} {
+					>
+						emit ghost
+					<
+				}
+	
+				if {[N byte 20 0 0 & 32 == 32]} {
+					>
+						emit system-state
+					<
+				}
+	
+				switch [Nv byte 19 0 {} {}] {
+					1 {
+						>
+							emit {machine language}
+						<
+					}
+					2 {
+						>
+							emit {BASIC I-code}
+						<
+					}
+					3 {
+						>
+							emit {Pascal P-code}
+						<
+					}
+					4 {
+						>
+							emit {C I-code}
+						<
+					}
+					5 {
+						>
+							emit {COBOL I-code}
+						<
+					}
+					6 {
+						>
+							emit {Fortran I-code}
+						<
+					}
+				}
+	
+				switch [Nv byte 18 0 {} {}] {
+					1 {
+						>
+							emit {program executable}
+						<
+					}
+					2 {
+						>
+							emit subroutine
+						<
+					}
+					3 {
+						>
+							emit multi-module
+						<
+					}
+					4 {
+						>
+							emit {data module}
+						<
+					}
+					11 {
+						>
+							emit {trap library}
+						<
+					}
+					12 {
+						>
+							emit {system module}
+						<
+					}
+					13 {
+						>
+							emit {file manager}
+						<
+					}
+					14 {
+						>
+							emit {device driver}
+						<
+					}
+					15 {
+						>
+							emit {device descriptor}
+						<
+					}
+				}
+	
+			<
+		}
+		21930 {
+			>
+				emit {BIOS (ia32) ROM Ext.}
+				mime application/octet-stream
+				ext rom/bin
+				if {[S string 5 0 {} {} eq USB]} {
+					>
+						emit USB
+					<
+				}
+	
+				if {[S string 7 0 {} {} eq LDR]} {
+					>
+						emit {UNDI image}
+					<
+				}
+	
+				if {[S string 30 0 {} {} eq IBM]} {
+					>
+						emit {IBM comp. Video}
+					<
+				}
+	
+				if {[S string 26 0 {} {} eq Adaptec]} {
+					>
+						emit Adaptec
+					<
+				}
+	
+				if {[S string 28 0 {} {} eq Adaptec]} {
+					>
+						emit Adaptec
+					<
+				}
+	
+				if {[S string 42 0 {} {} eq PROMISE]} {
+					>
+						emit Promise
+					<
+				}
+	
+				if {[N byte 2 0 0 {} {} x {}]} {
+					>
+						emit (%d*512)
+					<
+				}
+	
+			<
+		}
+		22529 {
+			>
+				emit {370 sysV pure executable}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		23041 {
+			>
+				emit {370 XA sysV pure executable}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		23809 {
+			>
+				emit {370 sysV executable}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		24321 {
+			>
+				emit {370 XA sysV executable}
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		24577 {
+			>
+				emit {MIPSEB-LE ECOFF executable}
+				switch [Nv beshort 20 0 {} {}] {
+					1793 {
+						>
+							emit (impure)
+						<
+					}
+					2049 {
+						>
+							emit (swapped)
+						<
+					}
+					2817 {
+						>
+							emit (paged)
+						<
+					}
+				}
+	
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} == 0]} {
+					>
+						emit stripped
+					<
+				}
+	
+				if {[N byte 23 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N byte 22 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+		24602 {
+			>
+				emit {Atari 68xxx executable,}
+				if {[N belong 2 0 0 {} {} x {}]} {
+					>
+						emit {text len %u,}
+					<
+				}
+	
+				if {[N belong 6 0 0 {} {} x {}]} {
+					>
+						emit {data len %u,}
+					<
+				}
+	
+				if {[N belong 10 0 0 {} {} x {}]} {
+					>
+						emit {BSS len %u,}
+					<
+				}
+	
+				if {[N belong 14 0 0 {} {} x {}]} {
+					>
+						emit {symboltab len %u,}
+					<
+				}
+	
+				if {[N belong 18 0 0 {} {} == 0]} {
+					>
+					<
+				}
+	
+				if {[N belong 22 0 0 {} {} & 1]} {
+					>
+						emit {fastload flag,}
+					<
+				}
+	
+				if {[N belong 22 0 0 {} {} & 2]} {
+					>
+						emit {may be loaded to alternate RAM,}
+					<
+				}
+	
+				if {[N belong 22 0 0 {} {} & 4]} {
+					>
+						emit {malloc may be from alternate RAM,}
+					<
+				}
+	
+				if {[N belong 22 0 0 {} {} x {}]} {
+					>
+						emit {flags: 0x%X,}
+					<
+				}
+	
+				if {[N beshort 26 0 0 {} {} == 0]} {
+					>
+						emit {no relocation tab}
+					<
+				}
+	
+				if {[N beshort 26 0 0 {} {} != 0]} {
+					>
+						emit {+ relocation tab}
+					<
+				}
+	
+				if {[S string 30 0 {} {} eq SFX]} {
+					>
+						emit {[Self-Extracting LZH SFX archive]}
+					<
+				}
+	
+				if {[S string 38 0 {} {} eq SFX]} {
+					>
+						emit {[Self-Extracting LZH SFX archive]}
+					<
+				}
+	
+				if {[S string 44 0 {} {} eq ZIP!]} {
+					>
+						emit {[Self-Extracting ZIP SFX archive]}
+					<
+				}
+	
+			<
+		}
+		25089 {
+			>
+				emit {MIPSEL ECOFF executable}
+				switch [Nv beshort 20 0 {} {}] {
+					1793 {
+						>
+							emit (impure)
+						<
+					}
+					2049 {
+						>
+							emit (swapped)
+						<
+					}
+					2817 {
+						>
+							emit (paged)
+						<
+					}
+				}
+	
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} == 0]} {
+					>
+						emit stripped
+					<
+				}
+	
+				if {[N byte 23 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N byte 22 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+		25345 {
+			>
+				emit {MIPSEB-LE MIPS-II ECOFF executable}
+				switch [Nv beshort 20 0 {} {}] {
+					1793 {
+						>
+							emit (impure)
+						<
+					}
+					2049 {
+						>
+							emit (swapped)
+						<
+					}
+					2817 {
+						>
+							emit (paged)
+						<
+					}
+				}
+	
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} == 0]} {
+					>
+						emit stripped
+					<
+				}
+	
+				if {[N byte 23 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N byte 22 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+		26113 {
+			>
+				emit {MIPSEL MIPS-II ECOFF executable}
+				switch [Nv beshort 20 0 {} {}] {
+					1793 {
+						>
+							emit (impure)
+						<
+					}
+					2049 {
+						>
+							emit (swapped)
+						<
+					}
+					2817 {
+						>
+							emit (paged)
+						<
+					}
+				}
+	
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} == 0]} {
+					>
+						emit stripped
+					<
+				}
+	
+				if {[N byte 23 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N byte 22 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+		30461 {
+			>
+				emit {LZH compressed data,}
+				if {[S string 2 0 {} {} x {}]} {
+					>
+						emit {original name %s}
+					<
+				}
+	
+			<
+		}
+		30462 {
+			>
+				emit {crunched data,}
+				if {[S string 2 0 {} {} x {}]} {
+					>
+						emit {original name %s}
+					<
+				}
+	
+			<
+		}
+		30463 {
+			>
+				emit {squeezed data,}
+				if {[S string 4 0 {} {} x {}]} {
+					>
+						emit {original name %s}
+					<
+				}
+	
+			<
+		}
+		32639 {
+			>
+				emit {RDI Acoustic Doppler Current Profiler (ADCP)}
+			<
+		}
+	}
+	
+	if {[N ubyte 0 0 0 {} {} > 0]} {
+		>
+			if {[N ubyte 0 0 0 {} {} < 9]} {
+				>
+					if {[N belong 16 0 0 & -33492752 == 12336]} {
+						>
+							if {[N ubyte 0 0 0 {} {} < 10]} {
+								>
+									if {[N ubeshort 2 0 0 {} {} x {}]} {
+										>
+											if {[S regex 18 0 {} {} eq \[0-9\]\[0-9\]\[0-9\]\[0-9\]\[0-9\]\[0-9\]]} {
+												>
+													if {[N ubyte 0 0 0 {} {} < 10]} {
+														>
+															emit {Infocom (Z-machine %d}
+															if {[N ubeshort 2 0 0 {} {} x {}]} {
+																>
+																	emit {\b, Release %d}
+																	if {[S string 18 0 {} {} > \0]} {
+																		>
+																			emit {\b, Serial %.6s}
+																		<
+																	}
+	
+																	if {[S string 18 0 {} {} x {}]} {
+																		>
+																			emit {\b)}
+																			mime application/x-zmachine
+																			strength {+ 40}
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Glul]} {
+		>
+			emit {Glulx game data}
+			if {[N beshort 4 0 0 {} {} x {}]} {
+				>
+					emit {(Version %d}
+					if {[N byte 6 0 0 {} {} x {}]} {
+						>
+							emit {\b.%d}
+						<
+					}
+	
+					if {[N byte 8 0 0 {} {} x {}]} {
+						>
+							emit {\b.%d)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 36 0 {} {} eq Info]} {
+				>
+					emit {Compiled by Inform}
+					mime application/x-glulx
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TADS2\ bin]} {
+		>
+			emit TADS
+			if {[N belong 9 0 0 {} {} != 168630784]} {
+				>
+					emit {game data, CORRUPTED}
+				<
+			}
+	
+			if {[N belong 9 0 0 {} {} == 168630784]} {
+				>
+					if {[S string 13 0 {} {} > \0]} {
+						>
+							emit {%s game data}
+							mime application/x-tads
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TADS2\ rsc]} {
+		>
+			emit TADS
+			if {[N belong 9 0 0 {} {} != 168630784]} {
+				>
+					emit {resource data, CORRUPTED}
+				<
+			}
+	
+			if {[N belong 9 0 0 {} {} == 168630784]} {
+				>
+					if {[S string 13 0 {} {} > \0]} {
+						>
+							emit {%s resource data}
+							mime application/x-tads
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TADS2\ save/g]} {
+		>
+			emit TADS
+			if {[N belong 12 0 0 {} {} != 168630784]} {
+				>
+					emit {saved game data, CORRUPTED}
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} == 168630784]} {
+				>
+					if {[S string [I 16 uleshort 0 + 0 32] 0 {} {} > \0]} {
+						>
+							emit {%s saved game data}
+							mime application/x-tads
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TADS2\ save]} {
+		>
+			emit TADS
+			if {[N belong 10 0 0 {} {} != 168630784]} {
+				>
+					emit {saved game data, CORRUPTED}
+				<
+			}
+	
+			if {[N belong 10 0 0 {} {} == 168630784]} {
+				>
+					if {[S string 14 0 {} {} > \0]} {
+						>
+							emit {%s saved game data}
+							mime application/x-tads
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq T3-image\015\012\032]} {
+		>
+			if {[N leshort 11 0 0 {} {} x {}]} {
+				>
+					emit {TADS 3 game data (format version %d)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq T3-state-v]} {
+		>
+			if {[S string 14 0 {} {} eq \015\012\032]} {
+				>
+					emit {TADS 3 saved game data (format version}
+					if {[N byte 10 0 0 {} {} x {}]} {
+						>
+							emit %c
+						<
+					}
+	
+					if {[N byte 11 0 0 {} {} x {}]} {
+						>
+							emit {\b%c}
+						<
+					}
+	
+					if {[N byte 12 0 0 {} {} x {}]} {
+						>
+							emit {\b%c}
+						<
+					}
+	
+					if {[N byte 13 0 0 {} {} x {}]} {
+						>
+							emit {\b%c)}
+							mime application/x-t3vm-image
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv belong 0 0 {} {}] {
+		-2147479551 {
+			>
+				emit {AmigaOS outline tag}
+			<
+		}
+		-2017063670 {
+			>
+				emit {python 2.0 byte-compiled}
+			<
+		}
+		-1991489968 {
+			>
+				if {[N belong 4 0 0 {} {} == 218765834]} {
+					>
+					<
+				}
+	
+				if {[N belong 12 0 0 {} {} == 0]} {
+					>
+						emit {Lytro Light Field Picture}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} x {}]} {
+					>
+						emit {\b, version %d}
+					<
+				}
+	
+			<
+		}
+		-1728153892 {
+			>
+				if {[N ubeshort 4 0 0 {} {} < 10]} {
+					>
+						emit {APT cache data, version %u}
+						if {[N ubeshort 6 0 0 {} {} x {}]} {
+							>
+								emit {\b.%u, 32 bit big-endian}
+							<
+						}
+	
+						U 15 apt-cache-32bit-be 0
+	
+					<
+				}
+	
+				if {[N ubyte 4 0 0 {} {} > 9]} {
+					>
+						emit {APT cache data, version %u}
+						if {[N ubyte 5 0 0 {} {} x {}]} {
+							>
+								emit {\b.%u, big-endian}
+							<
+						}
+	
+						U 15 apt-cache-be 0
+	
+					<
+				}
+	
+			<
+		}
+		-1722938102 {
+			>
+				emit {python 1.5/1.6 byte-compiled}
+			<
+		}
+		-1643377398 {
+			>
+				emit {python 3.3 byte-compiled}
+			<
+		}
+		-1374734174 {
+			>
+				if {[N belong 12 0 0 {} {} == 1048576]} {
+					>
+						if {[N belong [I 8 ubelong 0 + 0 28] 0 0 {} {} == -1036804291]} {
+							>
+								emit {Nintendo GameCube embedded disc image:}
+								U 51 nintendo-gcn-disc-common [I 8 ubelong 0 + 0 0]
+	
+								mime application/x-gamecube-rom
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-1275982582 {
+			>
+				emit {python 2.5 byte-compiled}
+			<
+		}
+		-1195374706 {
+			>
+				emit {Linux kernel}
+				if {[S string 483 0 {} {} eq Loading]} {
+					>
+						emit {version 1.3.79 or older}
+					<
+				}
+	
+				if {[S string 489 0 {} {} eq Loading]} {
+					>
+						emit {from prehistoric times}
+					<
+				}
+	
+			<
+			>
+				emit Linux
+				if {[N belong 486 0 0 {} {} == 1162627923]} {
+					>
+						emit {ELKS Kernel}
+					<
+				}
+	
+				if {[N belong 486 0 0 {} {} != 1162627923]} {
+					>
+						emit {style boot sector}
+					<
+				}
+	
+			<
+		}
+		-1161903941 {
+			>
+				emit {IRIX N32 core dump}
+				if {[N belong 4 0 0 {} {} == 1]} {
+					>
+						emit of
+					<
+				}
+	
+				if {[S string 16 0 {} {} > \0]} {
+					>
+						emit '%s'
+					<
+				}
+	
+			<
+		}
+		-1059131379 {
+			>
+				emit {GStreamer binary registry}
+				if {[S string 4 0 {} {} x {}]} {
+					>
+						emit {\b, version %s}
+					<
+				}
+	
+			<
+		}
+		-1040441407 {
+			>
+				emit {Common Trace Format (CTF) trace data (BE)}
+			<
+		}
+		-976170042 {
+			>
+				emit {DOS EPS Binary File}
+				mime image/x-eps
+				if {[N long 4 0 0 {} {} > 0]} {
+					>
+						emit {Postscript starts at byte %d}
+						if {[N long 8 0 0 {} {} > 0]} {
+							>
+								emit {length %d}
+								if {[N long 12 0 0 {} {} > 0]} {
+									>
+										emit {Metafile starts at byte %d}
+										if {[N long 16 0 0 {} {} > 0]} {
+											>
+												emit {length %d}
+											<
+										}
+	
+									<
+								}
+	
+								if {[N long 20 0 0 {} {} > 0]} {
+									>
+										emit {TIFF starts at byte %d}
+										if {[N long 24 0 0 {} {} > 0]} {
+											>
+												emit {length %d}
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+			>
+				emit {DOS EPS Binary File}
+				if {[N long 4 0 0 {} {} > 0]} {
+					>
+						emit {Postscript starts at byte %d}
+						if {[N long 8 0 0 {} {} > 0]} {
+							>
+								emit {length %d}
+								if {[N long 12 0 0 {} {} > 0]} {
+									>
+										emit {Metafile starts at byte %d}
+										if {[N long 16 0 0 {} {} > 0]} {
+											>
+												emit {length %d}
+											<
+										}
+	
+									<
+								}
+	
+								if {[N long 20 0 0 {} {} > 0]} {
+									>
+										emit {TIFF starts at byte %d}
+										if {[N long 24 0 0 {} {} > 0]} {
+											>
+												emit {length %d}
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-951729837 {
+			>
+				emit GEOS
+				switch [Nv byte 40 0 {} {}] {
+					1 {
+						>
+							emit executable
+						<
+					}
+					2 {
+						>
+							emit VMFile
+						<
+					}
+					3 {
+						>
+							emit binary
+						<
+					}
+					4 {
+						>
+							emit {directory label}
+						<
+					}
+				}
+	
+				if {[N byte 40 0 0 {} {} < 1]} {
+					>
+						emit unknown
+					<
+				}
+	
+				if {[N byte 40 0 0 {} {} > 4]} {
+					>
+						emit unknown
+					<
+				}
+	
+				if {[S string 4 0 {} {} > \0]} {
+					>
+						emit {\b, name "%s"}
+					<
+				}
+	
+			<
+		}
+		-938869246 {
+			>
+				emit {Bentley/Intergraph MicroStation DGN vector CAD}
+			<
+		}
+		-889275714 {
+			>
+				if {[N belong 4 0 0 {} {} > 30]} {
+					>
+						emit {compiled Java class data,}
+						if {[N beshort 6 0 0 {} {} x {}]} {
+							>
+								emit {version %d.}
+							<
+						}
+	
+						if {[N beshort 4 0 0 {} {} x {}]} {
+							>
+								emit {\b%d}
+							<
+						}
+	
+						switch [Nv belong 4 0 {} {}] {
+							46 {
+								>
+									emit {(Java 1.2)}
+								<
+							}
+							47 {
+								>
+									emit {(Java 1.3)}
+								<
+							}
+							48 {
+								>
+									emit {(Java 1.4)}
+								<
+							}
+							49 {
+								>
+									emit {(Java 1.5)}
+								<
+							}
+							50 {
+								>
+									emit {(Java 1.6)}
+								<
+							}
+							51 {
+								>
+									emit {(Java 1.7)}
+								<
+							}
+							52 {
+								>
+									emit {(Java 1.8)}
+								<
+							}
+						}
+	
+						mime application/x-java-applet
+					<
+				}
+	
+			<
+			>
+				if {[N belong 4 0 0 {} {} == 1]} {
+					>
+						emit {Mach-O universal binary with 1 architecture:}
+						U 37 mach-o 8
+	
+						mime application/x-mach-binary
+					<
+				}
+	
+				if {[N belong 4 0 0 {} {} > 1]} {
+					>
+						if {[N belong 4 0 0 {} {} < 20]} {
+							>
+								emit {Mach-O universal binary with %d architectures:}
+								U 37 mach-o 8
+	
+								mime application/x-mach-binary
+							<
+						}
+	
+						switch [Nv belong 4 0 {} {}] {
+							2 {
+								>
+									U 37 mach-o 28
+	
+								<
+							}
+							3 {
+								>
+									U 37 mach-o 48
+	
+								<
+							}
+							4 {
+								>
+									U 37 mach-o 68
+	
+								<
+							}
+							5 {
+								>
+									U 37 mach-o 88
+	
+								<
+							}
+							6 {
+								>
+									U 37 mach-o 108
+	
+								<
+							}
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-889270259 {
+			>
+				emit {JAR compressed with pack200,}
+				if {[N byte 5 0 0 {} {} x {}]} {
+					>
+						emit {version %d.}
+					<
+				}
+	
+				if {[N byte 4 0 0 {} {} x {}]} {
+					>
+						emit {\b%d}
+						mime application/x-java-pack200
+					<
+				}
+	
+			<
+			>
+				emit {JAR compressed with pack200,}
+				if {[N byte 5 0 0 {} {} x {}]} {
+					>
+						emit {version %d.}
+					<
+				}
+	
+				if {[N byte 4 0 0 {} {} x {}]} {
+					>
+						emit {\b%d}
+						mime application/x-java-pack200
+					<
+				}
+	
+			<
+		}
+		-825307442 {
+			>
+				emit {Java JCE KeyStore}
+				mime application/x-java-jce-keystore
+			<
+		}
+		-804389139 {
+			>
+				if {[N byte [R [I 8 ubelong 0 + 0 0]] 0 0 {} {} x {}]} {
+					>
+						if {[N byte [R [I 12 ubelong 0 + 0 0]] 0 0 {} {} x {}]} {
+							>
+								if {[N belong 20 0 0 {} {} > 1]} {
+									>
+										emit {Device Tree Blob version %d}
+										if {[N belong 4 0 0 {} {} x {}]} {
+											>
+												emit {\b, size=%d}
+											<
+										}
+	
+										if {[N belong 20 0 0 {} {} > 1]} {
+											>
+												if {[N belong 28 0 0 {} {} x {}]} {
+													>
+														emit {\b, boot CPU=%d}
+													<
+												}
+	
+											<
+										}
+	
+										if {[N belong 20 0 0 {} {} > 2]} {
+											>
+												if {[N belong 32 0 0 {} {} x {}]} {
+													>
+														emit {\b, string block size=%d}
+													<
+												}
+	
+											<
+										}
+	
+										if {[N belong 20 0 0 {} {} > 16]} {
+											>
+												if {[N belong 36 0 0 {} {} x {}]} {
+													>
+														emit {\b, DT structure block size=%d}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-772666102 {
+			>
+				emit {python 2.6 byte-compiled}
+			<
+		}
+		-559043264 {
+			>
+				emit {IRIX 64-bit core dump}
+				if {[N belong 4 0 0 {} {} == 1]} {
+					>
+						emit of
+					<
+				}
+	
+				if {[S string 16 0 {} {} > \0]} {
+					>
+						emit '%s'
+					<
+				}
+	
+			<
+		}
+		-559043152 {
+			>
+				emit {IRIX core dump}
+				if {[N belong 4 0 0 {} {} == 1]} {
+					>
+						emit of
+					<
+				}
+	
+				if {[S string 16 0 {} {} > \0]} {
+					>
+						emit '%s'
+					<
+				}
+	
+			<
+		}
+		-559039810 {
+			>
+				emit {IRIX Parallel Arena}
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		-364936773 {
+			>
+				emit {Conary changeset data}
+			<
+		}
+		-307499301 {
+			>
+				emit RPM
+				mime application/x-rpm
+				if {[N byte 4 0 0 {} {} x {}]} {
+					>
+						emit v%d
+					<
+				}
+	
+				if {[N byte 5 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+				switch [Nv beshort 6 0 {} {}] {
+					0 {
+						>
+							emit bin
+							switch [Nv beshort 8 0 {} {}] {
+								1 {
+									>
+										emit i386/x86_64
+									<
+								}
+								2 {
+									>
+										emit Alpha/Sparc64
+									<
+								}
+								3 {
+									>
+										emit Sparc
+									<
+								}
+								4 {
+									>
+										emit MIPS
+									<
+								}
+								5 {
+									>
+										emit PowerPC
+									<
+								}
+								6 {
+									>
+										emit 68000
+									<
+								}
+								7 {
+									>
+										emit SGI
+									<
+								}
+								8 {
+									>
+										emit RS6000
+									<
+								}
+								9 {
+									>
+										emit IA64
+									<
+								}
+								10 {
+									>
+										emit Sparc64
+									<
+								}
+								11 {
+									>
+										emit MIPSel
+									<
+								}
+								12 {
+									>
+										emit ARM
+									<
+								}
+								13 {
+									>
+										emit MiNT
+									<
+								}
+								14 {
+									>
+										emit S/390
+									<
+								}
+								15 {
+									>
+										emit S/390x
+									<
+								}
+								16 {
+									>
+										emit PowerPC64
+									<
+								}
+								17 {
+									>
+										emit SuperH
+									<
+								}
+								18 {
+									>
+										emit Xtensa
+									<
+								}
+								255 {
+									>
+										emit noarch
+									<
+								}
+							}
+	
+						<
+					}
+					1 {
+						>
+							emit src
+						<
+					}
+				}
+	
+			<
+		}
+		-302060034 {
+			>
+				emit {Sun 'jks' Java Keystore File data}
+			<
+		}
+		-301200118 {
+			>
+				emit {python 3.4 byte-compiled}
+			<
+		}
+		-249691108 {
+			>
+				emit {magic binary file for file(1) cmd}
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {(version %d) (big endian)}
+					<
+				}
+	
+			<
+		}
+		-86111232 {
+			>
+				emit {Mac OS X Code Requirement}
+				if {[N belong 8 0 0 {} {} == 1]} {
+					>
+						emit (opExpr)
+					<
+				}
+	
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {- %d bytes}
+					<
+				}
+	
+			<
+		}
+		-86111231 {
+			>
+				emit {Mac OS X Code Requirement Set}
+				if {[N belong 8 0 0 {} {} > 1]} {
+					>
+						emit {containing %d items}
+					<
+				}
+	
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {- %d bytes}
+					<
+				}
+	
+			<
+		}
+		-86111230 {
+			>
+				emit {Mac OS X Code Directory}
+				if {[N belong 8 0 0 {} {} x {}]} {
+					>
+						emit {version %x}
+					<
+				}
+	
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit {flags 0x%x}
+					<
+				}
+	
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {- %d bytes}
+					<
+				}
+	
+			<
+		}
+		-86111040 {
+			>
+				emit {Mac OS X Detached Code Signature (non-executable)}
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {- %d bytes}
+					<
+				}
+	
+			<
+		}
+		-86111039 {
+			>
+				emit {Mac OS X Detached Code Signature}
+				if {[N belong 8 0 0 {} {} > 1]} {
+					>
+						emit {(%d elements)}
+					<
+				}
+	
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {- %d bytes}
+					<
+				}
+	
+			<
+		}
+		-17957139 {
+			>
+				emit {Java KeyStore}
+				mime application/x-java-keystore
+			<
+		}
+		-12432129 {
+			>
+				emit {WRAptor packer (c64)}
+			<
+		}
+		-12169394 {
+			>
+				emit {DOS code page font data collection}
+			<
+		}
+		-11534511 {
+			>
+				emit {JPEG 2000 codestream}
+			<
+		}
+		-65536 {
+			>
+				if {[N belong 24 0 0 {} {} == 0]} {
+					>
+						if {[N belong 28 0 0 {} {} == 0]} {
+							>
+								if {[N belong 32792 0 0 {} {} == 1562156707]} {
+									>
+										emit {Nintendo Wii SDK disc image:}
+										U 51 nintendo-gcn-disc-common 32768
+	
+									<
+								}
+	
+								if {[N belong 32796 0 0 {} {} == -1036804291]} {
+									>
+										emit {Nintendo GameCube SDK disc image:}
+										U 51 nintendo-gcn-disc-common 32768
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		1 {
+			>
+				if {[N byte 4 0 0 & 31 == 7]} {
+					>
+						emit {JVT NAL sequence, H.264 video}
+						switch [Nv byte 5 0 {} {}] {
+							66 {
+								>
+									emit {\b, baseline}
+								<
+							}
+							77 {
+								>
+									emit {\b, main}
+								<
+							}
+							88 {
+								>
+									emit {\b, extended}
+								<
+							}
+						}
+	
+						if {[N byte 7 0 0 {} {} x {}]} {
+							>
+								emit {\b @ L %u}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		4 {
+			>
+				emit {X11 SNF font data, MSB first}
+				mime application/x-font-sfn
+			<
+		}
+		32 {
+			>
+				if {[N byte 4 0 0 {} {} == 1]} {
+					>
+						if {[S string 8 0 {} {} eq KBXf]} {
+							>
+								emit {GPG keybox database}
+								if {[N byte 5 0 0 {} {} == 1]} {
+									>
+										emit {version %d}
+									<
+								}
+	
+								if {[N bedate 16 0 0 {} {} x {}]} {
+									>
+										emit {\b, created-at %s}
+									<
+								}
+	
+								if {[N bedate 20 0 0 {} {} x {}]} {
+									>
+										emit {\b, last-maintained %s}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		123 {
+			>
+				emit {dar archive,}
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {label "%.8x}
+						if {[N belong 8 0 0 {} {} x {}]} {
+							>
+								emit %.8x
+								if {[N beshort 12 0 0 {} {} x {}]} {
+									>
+										emit %.4x\"
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 14 0 0 {} {} == 84]} {
+					>
+						emit {end slice}
+					<
+				}
+	
+				switch [Nv beshort 14 0 {} {}] {
+					20046 {
+						>
+							emit multi-part
+						<
+					}
+					20051 {
+						>
+							emit {multi-part, with -S}
+						<
+					}
+				}
+	
+			<
+		}
+		256 {
+			>
+				if {[N beshort [I 4 ubelong 0 + 0 24] 0 0 {} {} x {}]} {
+					>
+						switch [Nv belong [R 4] 0 {} {}] {
+							1179602516 {
+								>
+									emit {Mac OSX datafork font, 'FONT'}
+								<
+							}
+							1313230420 {
+								>
+									emit {Mac OSX datafork font, 'NFNT'}
+								<
+							}
+							1347375956 {
+								>
+									emit {Mac OSX datafork font, PostScript}
+								<
+							}
+							1936092788 {
+								>
+									emit {Mac OSX datafork font, TrueType}
+								<
+							}
+						}
+	
+					<
+				}
+	
+			<
+			>
+				if {[N byte 9 0 0 {} {} == 0]} {
+					>
+						if {[N byte 0 0 0 {} {} x {}]} {
+							>
+							<
+						}
+	
+						U 163 cur-ico-dir 0
+	
+					<
+				}
+	
+				if {[N ubyte 9 0 0 {} {} == 255]} {
+					>
+						if {[N byte 0 0 0 {} {} x {}]} {
+							>
+							<
+						}
+	
+						U 163 cur-ico-dir 0
+	
+					<
+				}
+	
+			<
+		}
+		263 {
+			>
+				emit {a.out big-endian 32-bit executable}
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+			>
+				emit {Plan 9 executable, Motorola 68k}
+			<
+		}
+		264 {
+			>
+				emit {a.out big-endian 32-bit pure executable}
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		267 {
+			>
+				emit {a.out big-endian 32-bit demand paged executable}
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		327 {
+			>
+				emit {Convex old-style object}
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		331 {
+			>
+				emit {Convex old-style demand paged executable}
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		333 {
+			>
+				emit {Convex old-style pre-paged executable}
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		335 {
+			>
+				emit {Convex old-style pre-paged, non-swapped executable}
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		385 {
+			>
+				emit {Convex SOFF}
+				if {[N belong 88 0 0 & 983040 == 0]} {
+					>
+						emit c1
+					<
+				}
+	
+				if {[N belong 88 0 0 {} {} & 65536]} {
+					>
+						emit c2
+					<
+				}
+	
+				if {[N belong 88 0 0 {} {} & 131072]} {
+					>
+						emit c2mp
+					<
+				}
+	
+				if {[N belong 88 0 0 {} {} & 262144]} {
+					>
+						emit parallel
+					<
+				}
+	
+				if {[N belong 88 0 0 {} {} & 524288]} {
+					>
+						emit intrinsic
+					<
+				}
+	
+				if {[N belong 88 0 0 {} {} & 1]} {
+					>
+						emit {demand paged}
+					<
+				}
+	
+				if {[N belong 88 0 0 {} {} & 2]} {
+					>
+						emit pre-paged
+					<
+				}
+	
+				if {[N belong 88 0 0 {} {} & 4]} {
+					>
+						emit non-swapped
+					<
+				}
+	
+				if {[N belong 88 0 0 {} {} & 8]} {
+					>
+						emit POSIX
+					<
+				}
+	
+				if {[N belong 84 0 0 {} {} & -2147483648]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 84 0 0 {} {} & 1073741824]} {
+					>
+						emit object
+					<
+				}
+	
+				if {[N belong 84 0 0 & 536870912 == 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				switch [Nv belong 84 0 & 402653184] {
+					0 {
+						>
+							emit {native fpmode}
+						<
+					}
+					268435456 {
+						>
+							emit {ieee fpmode}
+						<
+					}
+					402653184 {
+						>
+							emit {undefined fpmode}
+						<
+					}
+				}
+	
+			<
+		}
+		389 {
+			>
+				emit {Convex SOFF core}
+			<
+		}
+		391 {
+			>
+				emit {Convex SOFF checkpoint}
+				if {[N belong 88 0 0 & 983040 == 0]} {
+					>
+						emit c1
+					<
+				}
+	
+				if {[N belong 88 0 0 {} {} & 65536]} {
+					>
+						emit c2
+					<
+				}
+	
+				if {[N belong 88 0 0 {} {} & 131072]} {
+					>
+						emit c2mp
+					<
+				}
+	
+				if {[N belong 88 0 0 {} {} & 262144]} {
+					>
+						emit parallel
+					<
+				}
+	
+				if {[N belong 88 0 0 {} {} & 524288]} {
+					>
+						emit intrinsic
+					<
+				}
+	
+				if {[N belong 88 0 0 {} {} & 8]} {
+					>
+						emit POSIX
+					<
+				}
+	
+				switch [Nv belong 84 0 & 402653184] {
+					0 {
+						>
+							emit {native fpmode}
+						<
+					}
+					268435456 {
+						>
+							emit {ieee fpmode}
+						<
+					}
+					402653184 {
+						>
+							emit {undefined fpmode}
+						<
+					}
+				}
+	
+			<
+		}
+		491 {
+			>
+				emit {Plan 9 executable, Intel 386}
+			<
+		}
+		505 {
+			>
+				emit {AIX compiled message catalog}
+			<
+		}
+		512 {
+			>
+				if {[N ubyte 7 0 0 {} {} == 0]} {
+					>
+						if {[N ubyte 6 0 0 {} {} > 0]} {
+							>
+								emit Lotus
+								switch [Nv uleshort 4 0 {} {}] {
+									7 {
+										>
+											emit {1-2-3 CoNFiguration, version 2.x (PGRAPH.CNF)}
+											ext cnf
+										<
+									}
+									1028 {
+										>
+											emit {1-2-3 WorKSheet, version 1}
+											ext wks
+										<
+									}
+									1029 {
+										>
+											emit {Symphony WoRksheet, version 1.0}
+											ext wrk/wr1
+										<
+									}
+									1030 {
+										>
+											emit {1-2-3/Symphony worksheet, version 2}
+											ext wk1/wr1
+										<
+									}
+									1536 {
+										>
+											emit {1-2-3 WorKsheet, version 1.xJ}
+											ext wj1
+										<
+									}
+									1538 {
+										>
+											emit {1-2-3 worksheet, version 2.4J}
+											ext wj3
+										<
+									}
+									2049 {
+										>
+											emit {1-2-3 CoNFiguration, version 1-2.1}
+											ext cnf
+										<
+									}
+									2050 {
+										>
+											emit {Symphony CoNFiguration}
+											ext cnf
+										<
+									}
+									2052 {
+										>
+											emit {1-2-3 CoNFiguration, version 2.2}
+											ext cnf
+										<
+									}
+									2058 {
+										>
+											emit {1-2-3 CoNFiguration, version 2.3-2.4}
+											ext cnf
+										<
+									}
+									3077 {
+										>
+											emit {1-2-3 CoNFiguration, version 2.4J}
+											ext cnf
+										<
+									}
+									5122 {
+										>
+											emit {1-2-3 CoNFiguration, version 3.x}
+											ext cnf
+										<
+									}
+									5200 {
+										>
+											emit {1-2-3 CoNFiguration, version 4.x}
+											ext cnf
+										<
+									}
+									32774 {
+										>
+											emit {1-2-3 ForMaTting data, version 2.x}
+											ext fmt/fj3
+										<
+									}
+									32775 {
+										>
+											emit {1-2-3 FoRMatting data, version 2.0}
+											ext frm
+										<
+									}
+								}
+	
+								if {[D 4]} {
+									>
+										emit {unknown worksheet or configuration}
+										if {[N uleshort 4 0 0 {} {} x {}]} {
+											>
+												emit {\b, revision 0x%x}
+											<
+										}
+	
+										ext cnf
+									<
+								}
+	
+								U 163 lotus-cells 6
+	
+								U 163 lotus-cells [I 8 uleshort 0 + 0 10]
+	
+								mime application/vnd.lotus-1-2-3
+							<
+						}
+	
+					<
+				}
+	
+			<
+			>
+				if {[N byte 9 0 0 {} {} == 0]} {
+					>
+						U 163 cur-ico-dir 0
+	
+					<
+				}
+	
+				if {[N ubyte 9 0 0 {} {} == 255]} {
+					>
+						U 163 cur-ico-dir 0
+	
+					<
+				}
+	
+			<
+		}
+		583 {
+			>
+				emit {Plan 9 executable, Intel 960}
+			<
+		}
+		683 {
+			>
+				emit {Plan 9 executable, SPARC}
+			<
+		}
+		999 {
+			>
+				emit {AmigaOS object/library data}
+			<
+		}
+		1011 {
+			>
+				emit {AmigaOS loadseg()ble executable/binary}
+			<
+		}
+		1018 {
+			>
+				emit {AmigaOS shared library}
+			<
+		}
+		1031 {
+			>
+				emit {Plan 9 executable, MIPS R3000}
+			<
+		}
+		1163 {
+			>
+				emit {Plan 9 executable, AT&T DSP 3210}
+			<
+		}
+		1303 {
+			>
+				emit {Plan 9 executable, MIPS R4000 BE}
+			<
+		}
+		1451 {
+			>
+				emit {Plan 9 executable, AMD 29000}
+			<
+		}
+		1607 {
+			>
+				emit {Plan 9 executable, ARM 7-something}
+			<
+		}
+		1771 {
+			>
+				emit {Plan 9 executable, PowerPC}
+			<
+		}
+		1943 {
+			>
+				emit {Plan 9 executable, MIPS R4000 LE}
+			<
+		}
+		2123 {
+			>
+				emit {Plan 9 executable, DEC Alpha}
+			<
+		}
+		6656 {
+			>
+				if {[N ubyte 20 0 0 {} {} > 0]} {
+					>
+						if {[N ubyte 20 0 0 {} {} < 32]} {
+							>
+								emit {Lotus 1-2-3}
+								switch [Nv uleshort 4 0 {} {}] {
+									4096 {
+										>
+											emit {WorKsheet, version 3}
+											ext wk3
+										<
+									}
+									4098 {
+										>
+											emit {WorKsheet, version 4}
+											ext wk4/wt4
+										<
+									}
+									4099 {
+										>
+											emit {WorKsheet, version 97}
+											ext 123
+										<
+									}
+									4101 {
+										>
+											emit {WorKsheet, version 9.8 Millennium}
+											ext 123
+										<
+									}
+									32769 {
+										>
+											emit {FoRMatting data}
+											ext frm
+										<
+									}
+									32775 {
+										>
+											emit {ForMatting data, version 3}
+											ext fm3
+										<
+									}
+								}
+	
+								if {[D 4]} {
+									>
+										emit unknown
+										if {[N uleshort 6 0 0 {} {} == 4]} {
+											>
+												emit worksheet
+												ext wXX
+											<
+										}
+	
+										if {[N uleshort 6 0 0 {} {} != 4]} {
+											>
+												emit {formatting data}
+												ext fXX
+											<
+										}
+	
+										if {[N uleshort 4 0 0 {} {} x {}]} {
+											>
+												emit {\b, revision 0x%x}
+											<
+										}
+	
+									<
+								}
+	
+								if {[N uleshort 6 0 0 {} {} == 4]} {
+									>
+										emit {\b, cell range}
+										if {[N ulelong 8 0 0 {} {} != 0]} {
+											>
+												if {[N ubyte 10 0 0 {} {} > 0]} {
+													>
+														emit {\b%d*}
+													<
+												}
+	
+												if {[N uleshort 8 0 0 {} {} x {}]} {
+													>
+														emit {\b%d,}
+													<
+												}
+	
+												if {[N ubyte 11 0 0 {} {} x {}]} {
+													>
+														emit {\b%d-}
+													<
+												}
+	
+											<
+										}
+	
+										if {[N ubyte 14 0 0 {} {} > 0]} {
+											>
+												emit {\b%d*}
+											<
+										}
+	
+										if {[N uleshort 12 0 0 {} {} x {}]} {
+											>
+												emit {\b%d,}
+											<
+										}
+	
+										if {[N ubyte 15 0 0 {} {} x {}]} {
+											>
+												emit {\b%d}
+											<
+										}
+	
+										if {[N ubyte 20 0 0 {} {} > 1]} {
+											>
+												emit {\b, character set 0x%x}
+											<
+										}
+	
+										if {[N ubyte 21 0 0 {} {} x {}]} {
+											>
+												emit {\b, flags 0x%x}
+											<
+										}
+	
+									<
+								}
+	
+								if {[N uleshort 6 0 0 {} {} != 4]} {
+									>
+										if {[S search 30 0 {} 29 eq \0\xAE]} {
+											>
+												if {[S string [R 4] 0 {} {} > \0]} {
+													>
+														emit {\b, 1st font "%s"}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+								mime application/vnd.lotus-1-2-3
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		9994 {
+			>
+				emit {ESRI Shapefile}
+				if {[N belong 4 0 0 {} {} == 0]} {
+					>
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} == 0]} {
+					>
+					<
+				}
+	
+				if {[N belong 12 0 0 {} {} == 0]} {
+					>
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} == 0]} {
+					>
+					<
+				}
+	
+				if {[N belong 20 0 0 {} {} == 0]} {
+					>
+					<
+				}
+	
+				if {[N lelong 28 0 0 {} {} x {}]} {
+					>
+						emit {version %d}
+					<
+				}
+	
+				if {[N belong 24 0 0 {} {} x {}]} {
+					>
+						emit {length %d}
+					<
+				}
+	
+				switch [Nv lelong 32 0 {} {}] {
+					0 {
+						>
+							emit {type Null Shape}
+						<
+					}
+					1 {
+						>
+							emit {type Point}
+						<
+					}
+					3 {
+						>
+							emit {type PolyLine}
+						<
+					}
+					5 {
+						>
+							emit {type Polygon}
+						<
+					}
+					8 {
+						>
+							emit {type MultiPoint}
+						<
+					}
+					11 {
+						>
+							emit {type PointZ}
+						<
+					}
+					13 {
+						>
+							emit {type PolyLineZ}
+						<
+					}
+					15 {
+						>
+							emit {type PolygonZ}
+						<
+					}
+					18 {
+						>
+							emit {type MultiPointZ}
+						<
+					}
+					21 {
+						>
+							emit {type PointM}
+						<
+					}
+					23 {
+						>
+							emit {type PolyLineM}
+						<
+					}
+					25 {
+						>
+							emit {type PolygonM}
+						<
+					}
+					28 {
+						>
+							emit {type MultiPointM}
+						<
+					}
+					31 {
+						>
+							emit {type MultiPatch}
+						<
+					}
+				}
+	
+			<
+		}
+		65381 {
+			>
+				emit {old 32-bit-int big-endian archive}
+				if {[S string 4 0 {} {} eq __.SYMDEF]} {
+					>
+						emit {random library}
+					<
+				}
+	
+			<
+		}
+		65389 {
+			>
+				emit {very old 32-bit-int big-endian archive}
+			<
+		}
+		70231 {
+			>
+				emit {Core file}
+			<
+		}
+		107364 {
+			>
+				emit {IRCAM file (VAX big-endian)}
+			<
+		}
+		172900 {
+			>
+				emit {IRCAM file (Sun little-endian)}
+			<
+		}
+		196608 {
+			>
+				if {[N belong 49124 0 0 {} {} < 47104]} {
+					>
+						if {[N belong 49128 0 0 {} {} < 47104]} {
+							>
+								if {[N belong 49132 0 0 {} {} < 47104]} {
+									>
+										if {[N belong 49136 0 0 {} {} < 47104]} {
+											>
+												emit {QL OS dump data,}
+												if {[S string 49148 0 {} {} > \0]} {
+													>
+														emit {type %.3s,}
+													<
+												}
+	
+												if {[S string 49142 0 {} {} > \0]} {
+													>
+														emit {version %.4s}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		238436 {
+			>
+				emit {IRCAM file (MIPS big-endian)}
+			<
+		}
+		303972 {
+			>
+				emit {IRCAM file (NeXT little-endian)}
+			<
+		}
+		333312 {
+			>
+				emit {AppleSingle encoded Macintosh file}
+			<
+		}
+		333319 {
+			>
+				emit {AppleDouble encoded Macintosh file}
+			<
+		}
+		340322 {
+			>
+				emit {Berkeley DB 1.85/1.86}
+				if {[N belong 4 0 0 {} {} > 0]} {
+					>
+						emit {(Btree, version %d, big-endian)}
+					<
+				}
+	
+			<
+		}
+		393218 {
+			>
+				emit {GDSII Stream file}
+				if {[N byte 4 0 0 {} {} == 0]} {
+					>
+						if {[N byte 5 0 0 {} {} x {}]} {
+							>
+								emit {version %d.0}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 4 0 0 {} {} > 0]} {
+					>
+						emit {version %d}
+						if {[N byte 5 0 0 {} {} x {}]} {
+							>
+								emit {\b.%d}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		398689 {
+			>
+				emit {Berkeley DB}
+				switch [Nv belong 8 0 {} {}] {
+					1234 {
+						>
+							if {[N belong 4 0 0 {} {} > 2]} {
+								>
+									emit 1.86
+								<
+							}
+	
+							if {[N belong 4 0 0 {} {} < 3]} {
+								>
+									emit 1.85
+								<
+							}
+	
+							if {[N belong 4 0 0 {} {} > 0]} {
+								>
+									emit {(Hash, version %d, native byte-order)}
+								<
+							}
+	
+						<
+					}
+					4321 {
+						>
+							if {[N belong 4 0 0 {} {} > 2]} {
+								>
+									emit 1.86
+								<
+							}
+	
+							if {[N belong 4 0 0 {} {} < 3]} {
+								>
+									emit 1.85
+								<
+							}
+	
+							if {[N belong 4 0 0 {} {} > 0]} {
+								>
+									emit {(Hash, version %d, big-endian)}
+								<
+							}
+	
+						<
+					}
+				}
+	
+			<
+		}
+		525398 {
+			>
+				emit {SunOS core file}
+				switch [Nv belong 4 0 {} {}] {
+					432 {
+						>
+							emit (SPARC)
+							if {[S string 132 0 {} {} > \0]} {
+								>
+									emit {from '%s'}
+								<
+							}
+	
+							switch [Nv belong 116 0 {} {}] {
+								3 {
+									>
+										emit (quit)
+									<
+								}
+								4 {
+									>
+										emit {(illegal instruction)}
+									<
+								}
+								5 {
+									>
+										emit {(trace trap)}
+									<
+								}
+								6 {
+									>
+										emit (abort)
+									<
+								}
+								7 {
+									>
+										emit {(emulator trap)}
+									<
+								}
+								8 {
+									>
+										emit {(arithmetic exception)}
+									<
+								}
+								9 {
+									>
+										emit (kill)
+									<
+								}
+								10 {
+									>
+										emit {(bus error)}
+									<
+								}
+								11 {
+									>
+										emit {(segmentation violation)}
+									<
+								}
+								12 {
+									>
+										emit {(bad argument to system call)}
+									<
+								}
+								29 {
+									>
+										emit {(resource lost)}
+									<
+								}
+							}
+	
+							if {[N belong 120 0 0 {} {} x {}]} {
+								>
+									emit (T=%dK,
+								<
+							}
+	
+							if {[N belong 124 0 0 {} {} x {}]} {
+								>
+									emit D=%dK,
+								<
+							}
+	
+							if {[N belong 128 0 0 {} {} x {}]} {
+								>
+									emit S=%dK)
+								<
+							}
+	
+						<
+					}
+					456 {
+						>
+							emit {(SPARC 4.x BCP)}
+							if {[S string 152 0 {} {} > \0]} {
+								>
+									emit {from '%s'}
+								<
+							}
+	
+						<
+					}
+					826 {
+						>
+							emit (68K)
+							if {[S string 128 0 {} {} > \0]} {
+								>
+									emit {from '%s'}
+								<
+							}
+	
+						<
+					}
+				}
+	
+			<
+		}
+		34210055 {
+			>
+				emit {HP s200 (2.x release) executable}
+				if {[N beshort 4 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N belong 36 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		34210056 {
+			>
+				emit {HP s200 (2.x release) pure executable}
+				if {[N beshort 4 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N belong 36 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		34275590 {
+			>
+				emit {PA-RISC1.0 relocatable object}
+			<
+		}
+		34275591 {
+			>
+				emit {PA-RISC1.0 executable}
+				if {[N belong 168 0 0 & 4 == 4]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong [I 144 long 0 + 0 0] 0 0 {} {} == 89060912]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34275592 {
+			>
+				emit {PA-RISC1.0 shared executable}
+				if {[N belong 168 0 0 & 4 == 4]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong [I 144 long 0 + 0 0] 0 0 {} {} == 89060912]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34275595 {
+			>
+				emit {PA-RISC1.0 demand-load executable}
+				if {[N belong 168 0 0 & 4 == 4]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong [I 144 long 0 + 0 0] 0 0 {} {} == 89060912]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34275597 {
+			>
+				emit {PA-RISC1.0 dynamic load library}
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34275598 {
+			>
+				emit {PA-RISC1.0 shared library}
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34341126 {
+			>
+				emit {HP s200 relocatable executable}
+				if {[N beshort 4 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N beshort 6 0 0 {} {} > 0]} {
+					>
+						emit {- highwater %d}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & -2147483648]} {
+					>
+						emit {save fp regs}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & 536870912]} {
+					>
+						emit debuggable
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & 268435456]} {
+					>
+						emit PIC
+					<
+				}
+	
+			<
+		}
+		34341127 {
+			>
+				emit {HP s200 executable}
+				if {[N beshort 4 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & -2147483648]} {
+					>
+						emit {save fp regs}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & 1073741824]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & 536870912]} {
+					>
+						emit debuggable
+					<
+				}
+	
+				if {[N belong 36 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		34341128 {
+			>
+				emit {HP s200 pure executable}
+				if {[N beshort 4 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & -2147483648]} {
+					>
+						emit {save fp regs}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & 1073741824]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & 536870912]} {
+					>
+						emit debuggable
+					<
+				}
+	
+				if {[N belong 36 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		34341131 {
+			>
+				emit {HP s200 demand-load executable}
+				if {[N beshort 4 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & -2147483648]} {
+					>
+						emit {save fp regs}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & 1073741824]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & 536870912]} {
+					>
+						emit debuggable
+					<
+				}
+	
+				if {[N belong 36 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		34341133 {
+			>
+				emit {HP s200 dynamic load library}
+				if {[N beshort 4 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N beshort 6 0 0 {} {} > 0]} {
+					>
+						emit {- highwater %d}
+					<
+				}
+	
+				if {[N belong 36 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		34341134 {
+			>
+				emit {HP s200 shared library}
+				if {[N beshort 4 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N beshort 6 0 0 {} {} > 0]} {
+					>
+						emit {- highwater %d}
+					<
+				}
+	
+				if {[N belong 36 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		34603270 {
+			>
+				emit {PA-RISC1.1 relocatable object}
+			<
+		}
+		34603271 {
+			>
+				emit {PA-RISC1.1 executable}
+				if {[N belong 168 0 0 {} {} & 4]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong [I 144 long 0 + 0 0] 0 0 {} {} == 89060912]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34603272 {
+			>
+				emit {PA-RISC1.1 shared executable}
+				if {[N belong 168 0 0 & 4 == 4]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong [I 144 long 0 + 0 0] 0 0 {} {} == 89060912]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34603275 {
+			>
+				emit {PA-RISC1.1 demand-load executable}
+				if {[N belong 168 0 0 & 4 == 4]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong [I 144 long 0 + 0 0] 0 0 {} {} == 89060912]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34603277 {
+			>
+				emit {PA-RISC1.1 dynamic load library}
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34603278 {
+			>
+				emit {PA-RISC1.1 shared library}
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34865414 {
+			>
+				emit {PA-RISC2.0 relocatable object}
+			<
+		}
+		34865415 {
+			>
+				emit {PA-RISC2.0 executable}
+				if {[N belong 168 0 0 {} {} & 4]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong [I 144 long 0 + 0 0] 0 0 {} {} == 89060912]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34865416 {
+			>
+				emit {PA-RISC2.0 shared executable}
+				if {[N belong 168 0 0 {} {} & 4]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong [I 144 long 0 + 0 0] 0 0 {} {} == 89060912]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34865419 {
+			>
+				emit {PA-RISC2.0 demand-load executable}
+				if {[N belong 168 0 0 {} {} & 4]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong [I 144 long 0 + 0 0] 0 0 {} {} == 89060912]} {
+					>
+						emit {dynamically linked}
+					<
+				}
+	
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34865421 {
+			>
+				emit {PA-RISC2.0 dynamic load library}
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		34865422 {
+			>
+				emit {PA-RISC2.0 shared library}
+				if {[N belong 96 0 0 {} {} > 0]} {
+					>
+						emit {- not stripped}
+					<
+				}
+	
+			<
+		}
+		50331648 {
+			>
+				if {[N ubelong 8 0 0 {} {} == 3959554048]} {
+					>
+						emit {VMS Alpha executable}
+						if {[S string 75264 0 {} {} eq PK\003\004]} {
+							>
+								emit {\b, Info-ZIP SFX archive v5.12 w/decryption}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		66260234 {
+			>
+				emit {python 2.7 byte-compiled}
+			<
+		}
+		84017152 {
+			>
+				emit {Kerberos Keytab file}
+				U 124 keytab_entry 4
+	
+			<
+		}
+		101117429 {
+			>
+				emit {Adobe InDesign}
+				if {[S string 16 0 {} {} eq DOCUMENT]} {
+					>
+						emit Document
+					<
+				}
+	
+			<
+		}
+		119734787 {
+			>
+				emit {Khronos SPIR-V binary, big-endian}
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {\b, version 0x%08x}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} x {}]} {
+					>
+						emit {\b, generator 0x%08x}
+					<
+				}
+	
+			<
+		}
+		134551296 {
+			>
+				emit {Bentley/Intergraph MicroStation DGN cell library}
+			<
+		}
+		134872578 {
+			>
+				emit {Bentley/Intergraph MicroStation DGN vector CAD}
+			<
+		}
+		199600449 {
+			>
+				emit {SGI disk label (volume header)}
+			<
+		}
+		235082497 {
+			>
+				emit {Hierarchical Data Format (version 4) data}
+				mime application/x-hdf
+			<
+		}
+		324508365 {
+			>
+				emit {GNU dbm 1.x or ndbm database, big endian, 32-bit}
+				mime application/x-gdbm
+			<
+		}
+		324508366 {
+			>
+				emit {GNU dbm 1.x or ndbm database, big endian, old}
+				mime application/x-gdbm
+			<
+		}
+		324508367 {
+			>
+				emit {GNU dbm 1.x or ndbm database, big endian, 64-bit}
+				mime application/x-gdbm
+			<
+		}
+		326773060 {
+			>
+				emit {NeWS bitmap font}
+			<
+		}
+		326773063 {
+			>
+				emit {NeWS font family}
+			<
+		}
+		326773072 {
+			>
+				emit {scalable OpenFont binary}
+			<
+		}
+		326773073 {
+			>
+				emit {encrypted scalable OpenFont binary}
+			<
+		}
+		335698201 {
+			>
+				emit {libGrx font data,}
+				if {[N leshort 8 0 0 {} {} x {}]} {
+					>
+						emit %dx
+					<
+				}
+	
+				if {[N leshort 10 0 0 {} {} x {}]} {
+					>
+						emit {\b%d}
+					<
+				}
+	
+				if {[S string 40 0 {} {} x {}]} {
+					>
+						emit %s
+					<
+				}
+	
+			<
+		}
+		369954058 {
+			>
+				emit {python 3.5.1- byte-compiled}
+			<
+		}
+		386731274 {
+			>
+				emit {python 3.5.2+ byte-compiled}
+			<
+		}
+		440786851 {
+			>
+				emit {EBML file}
+				if {[S search 4 0 b 100 eq \102\202]} {
+					>
+						if {[S string [R 1] 0 {} {} x {}]} {
+							>
+								emit {\b, creator %.8s}
+							<
+						}
+	
+					<
+				}
+	
+			<
+			>
+				if {[S search 4 0 {} 4096 eq \x42\x82]} {
+					>
+						if {[S string [R 1] 0 {} {} eq webm]} {
+							>
+								emit WebM
+								mime video/webm
+							<
+						}
+	
+						if {[S string [R 1] 0 {} {} eq matroska]} {
+							>
+								emit {Matroska data}
+								mime video/x-matroska
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		518517022 {
+			>
+				emit {Pulsar POP3 daemon mailbox cache file.}
+				if {[N ubelong 4 0 0 {} {} x {}]} {
+					>
+						emit {Version: %d.}
+					<
+				}
+	
+				if {[N ubelong 8 0 0 {} {} x {}]} {
+					>
+						emit {\b%d}
+					<
+				}
+	
+			<
+		}
+		518520576 {
+			>
+				emit {EET archive}
+				mime application/x-eet
+			<
+		}
+		554074152 {
+			>
+				emit {Sega Dreamcast VMU game image}
+			<
+		}
+		557605234 {
+			>
+				emit {archive file}
+				switch [Nv belong 68 0 {} {}] {
+					34276889 {
+						>
+							emit {- PA-RISC1.0 relocatable library}
+						<
+					}
+					34604569 {
+						>
+							emit {- PA-RISC1.1 relocatable library}
+						<
+					}
+					34670105 {
+						>
+							emit {- PA-RISC1.2 relocatable library}
+						<
+					}
+					34866713 {
+						>
+							emit {- PA-RISC2.0 relocatable library}
+						<
+					}
+				}
+	
+			<
+		}
+		654645590 {
+			>
+				emit {u-boot legacy uImage,}
+				if {[S string 32 0 {} {} x {}]} {
+					>
+						emit %s,
+					<
+				}
+	
+				switch [Nv byte 28 0 {} {}] {
+					0 {
+						>
+							emit {Invalid os/}
+						<
+					}
+					1 {
+						>
+							emit OpenBSD/
+						<
+					}
+					2 {
+						>
+							emit NetBSD/
+						<
+					}
+					3 {
+						>
+							emit FreeBSD/
+						<
+					}
+					4 {
+						>
+							emit 4.4BSD/
+						<
+					}
+					5 {
+						>
+							emit Linux/
+						<
+					}
+					6 {
+						>
+							emit SVR4/
+						<
+					}
+					7 {
+						>
+							emit Esix/
+						<
+					}
+					8 {
+						>
+							emit Solaris/
+						<
+					}
+					9 {
+						>
+							emit Irix/
+						<
+					}
+					10 {
+						>
+							emit SCO/
+						<
+					}
+					11 {
+						>
+							emit Dell/
+						<
+					}
+					12 {
+						>
+							emit NCR/
+						<
+					}
+					13 {
+						>
+							emit LynxOS/
+						<
+					}
+					14 {
+						>
+							emit VxWorks/
+						<
+					}
+					15 {
+						>
+							emit pSOS/
+						<
+					}
+					16 {
+						>
+							emit QNX/
+						<
+					}
+					17 {
+						>
+							emit Firmware/
+						<
+					}
+					18 {
+						>
+							emit RTEMS/
+						<
+					}
+					19 {
+						>
+							emit ARTOS/
+						<
+					}
+					20 {
+						>
+							emit {Unity OS/}
+						<
+					}
+					21 {
+						>
+							emit INTEGRITY/
+						<
+					}
+				}
+	
+				switch [Nv byte 29 0 {} {}] {
+					0 {
+						>
+							emit {\bInvalid CPU,}
+						<
+					}
+					1 {
+						>
+							emit {\bAlpha,}
+						<
+					}
+					2 {
+						>
+							emit {\bARM,}
+						<
+					}
+					3 {
+						>
+							emit {\bIntel x86,}
+						<
+					}
+					4 {
+						>
+							emit {\bIA64,}
+						<
+					}
+					5 {
+						>
+							emit {\bMIPS,}
+						<
+					}
+					6 {
+						>
+							emit {\bMIPS 64-bit,}
+						<
+					}
+					7 {
+						>
+							emit {\bPowerPC,}
+						<
+					}
+					8 {
+						>
+							emit {\bIBM S390,}
+						<
+					}
+					9 {
+						>
+							emit {\bSuperH,}
+						<
+					}
+					10 {
+						>
+							emit {\bSparc,}
+						<
+					}
+					11 {
+						>
+							emit {\bSparc 64-bit,}
+						<
+					}
+					12 {
+						>
+							emit {\bM68K,}
+						<
+					}
+					13 {
+						>
+							emit {\bNios-32,}
+						<
+					}
+					14 {
+						>
+							emit {\bMicroBlaze,}
+						<
+					}
+					15 {
+						>
+							emit {\bNios-II,}
+						<
+					}
+					16 {
+						>
+							emit {\bBlackfin,}
+						<
+					}
+					17 {
+						>
+							emit {\bAVR32,}
+						<
+					}
+					18 {
+						>
+							emit {\bSTMicroelectronics ST200,}
+						<
+					}
+					19 {
+						>
+							emit {\bSandbox architecture,}
+						<
+					}
+					20 {
+						>
+							emit {\bANDES Technology NDS32,}
+						<
+					}
+					21 {
+						>
+							emit {\bOpenRISC 1000,}
+						<
+					}
+					22 {
+						>
+							emit {\bARM 64-bit,}
+						<
+					}
+					23 {
+						>
+							emit {\bDesignWare ARC,}
+						<
+					}
+					24 {
+						>
+							emit {\bx86_64,}
+						<
+					}
+					25 {
+						>
+							emit {\bXtensa,}
+						<
+					}
+				}
+	
+				switch [Nv byte 30 0 {} {}] {
+					0 {
+						>
+							emit {Invalid Image}
+						<
+					}
+					1 {
+						>
+							emit {Standalone Program}
+						<
+					}
+					2 {
+						>
+							emit {OS Kernel Image}
+						<
+					}
+					3 {
+						>
+							emit {RAMDisk Image}
+						<
+					}
+					4 {
+						>
+							emit {Multi-File Image}
+						<
+					}
+					5 {
+						>
+							emit {Firmware Image}
+						<
+					}
+					6 {
+						>
+							emit {Script File}
+						<
+					}
+					7 {
+						>
+							emit {Filesystem Image (any type)}
+						<
+					}
+					8 {
+						>
+							emit {Binary Flat Device Tree BLOB}
+						<
+					}
+				}
+	
+				switch [Nv byte 31 0 {} {}] {
+					0 {
+						>
+							emit {(Not compressed),}
+						<
+					}
+					1 {
+						>
+							emit (gzip),
+						<
+					}
+					2 {
+						>
+							emit (bzip2),
+						<
+					}
+					3 {
+						>
+							emit (lzma),
+						<
+					}
+				}
+	
+				if {[N belong 12 0 0 {} {} x {}]} {
+					>
+						emit {%d bytes,}
+					<
+				}
+	
+				if {[N bedate 8 0 0 {} {} x {}]} {
+					>
+						emit %s,
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} x {}]} {
+					>
+						emit {Load Address: 0x%08X,}
+					<
+				}
+	
+				if {[N belong 20 0 0 {} {} x {}]} {
+					>
+						emit {Entry Point: 0x%08X,}
+					<
+				}
+	
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {Header CRC: 0x%08X,}
+					<
+				}
+	
+				if {[N belong 24 0 0 {} {} x {}]} {
+					>
+						emit {Data CRC: 0x%08X}
+					<
+				}
+	
+			<
+		}
+		684539205 {
+			>
+				emit {Linux Compressed ROM File System data, big endian}
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {size %u}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & 1]} {
+					>
+						emit {version #2}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & 2]} {
+					>
+						emit sorted_dirs
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} & 4]} {
+					>
+						emit hole_support
+					<
+				}
+	
+				if {[N belong 32 0 0 {} {} x {}]} {
+					>
+						emit {CRC 0x%x,}
+					<
+				}
+	
+				if {[N belong 36 0 0 {} {} x {}]} {
+					>
+						emit {edition %u,}
+					<
+				}
+	
+				if {[N belong 40 0 0 {} {} x {}]} {
+					>
+						emit {%u blocks,}
+					<
+				}
+	
+				if {[N belong 44 0 0 {} {} x {}]} {
+					>
+						emit {%u files}
+					<
+				}
+	
+			<
+		}
+		720047370 {
+			>
+				emit {python 2.1 byte-compiled}
+			<
+		}
+		770510090 {
+			>
+				emit {python 2.2 byte-compiled}
+			<
+		}
+		779248125 {
+			>
+				emit {RealAudio sound file}
+				mime audio/x-pn-realaudio
+			<
+		}
+		807842421 {
+			>
+				emit {Microsoft ASF}
+				mime video/x-ms-asf
+			<
+		}
+		834535424 {
+			>
+				emit {Microsoft Word Document}
+				mime application/msword
+			<
+		}
+		856493322 {
+			>
+				emit {python 3.6 byte-compiled}
+			<
+		}
+		876099889 {
+			>
+				emit {Linux Journalled Flash File system, big endian}
+			<
+		}
+		990645514 {
+			>
+				emit {python 3.0 byte-compiled}
+			<
+		}
+		1005718794 {
+			>
+				emit {python 2.3 byte-compiled}
+			<
+		}
+		1010974665 {
+			>
+				if {[N belong 4 0 0 {} {} == 1787282127]} {
+					>
+						emit {Adrift game file version}
+						switch [Nv belong 8 0 {} {}] {
+							-1840955807 {
+								>
+									emit 5.0
+								<
+							}
+							-1824178591 {
+								>
+									emit 4.0
+								<
+							}
+							-1807403423 {
+								>
+									emit 3.80
+								<
+							}
+							-1807403167 {
+								>
+									emit 3.90
+								<
+							}
+						}
+	
+						if {[D 8]} {
+							>
+								emit unknown
+								mime application/x-adrift
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		1041042698 {
+			>
+				emit {python 3.7 byte-compiled}
+			<
+		}
+		1125466468 {
+			>
+				emit {X64 Image}
+			<
+		}
+		1257963521 {
+			>
+				emit {QL plugin-ROM data,}
+				if {[S pstring 9 0 {} {} eq \0]} {
+					>
+						emit un-named
+					<
+				}
+	
+				if {[S pstring 9 0 {} {} > \0]} {
+					>
+						emit {named: %s}
+					<
+				}
+	
+			<
+		}
+		1279543401 {
+			>
+				emit {ld.so hints file (Big Endian}
+				if {[N belong 4 0 0 {} {} > 0]} {
+					>
+						emit {\b, version %d)}
+					<
+				}
+	
+				if {[N belong 4 0 0 {} {} < 1]} {
+					>
+						emit {\b)}
+					<
+				}
+	
+			<
+		}
+		1297241678 {
+			>
+				emit {VMware nvram}
+			<
+		}
+		1313166080 {
+			>
+				emit {NES ROM image (Wii U Virtual Console)}
+				mime application/x-nes-rom
+				U 51 nes-rom-image-ines 0
+	
+			<
+		}
+		1314148939 {
+			>
+				emit {MultiTrack sound data}
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		1326189834 {
+			>
+				emit {python 3.1 byte-compiled}
+			<
+		}
+		1330597709 {
+			>
+				emit {User-mode Linux COW file}
+				if {[N belong 4 0 0 {} {} < 3]} {
+					>
+						emit {\b, version %d}
+						if {[S string 8 0 {} {} > \0]} {
+							>
+								emit {\b, backing file %s}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N belong 4 0 0 {} {} > 2]} {
+					>
+						emit {\b, version %d}
+						if {[S string 32 0 {} {} > \0]} {
+							>
+								emit {\b, backing file %s}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		1347223552 {
+			>
+				U 12 apple-apm 0
+	
+			<
+		}
+		1396917837 {
+			>
+				emit {IRIS Showcase file}
+				if {[N byte 4 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		1413695053 {
+			>
+				emit {IRIS Showcase template}
+				if {[N byte 4 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		1481003842 {
+			>
+				emit {SGI XFS filesystem data}
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {(blksz %d,}
+					<
+				}
+	
+				if {[N beshort 104 0 0 {} {} x {}]} {
+					>
+						emit {inosz %d,}
+					<
+				}
+	
+				if {[N beshort 100 0 0 {} {} ^ 8196]} {
+					>
+						emit {v1 dirs)}
+					<
+				}
+	
+				if {[N beshort 100 0 0 {} {} & 8196]} {
+					>
+						emit {v2 dirs)}
+					<
+				}
+	
+			<
+		}
+		1504078485 {
+			>
+				emit {Sun raster image data}
+				if {[N belong 4 0 0 {} {} > 0]} {
+					>
+						emit {\b, %d x}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} > 0]} {
+					>
+						emit %d,
+					<
+				}
+	
+				if {[N belong 12 0 0 {} {} > 0]} {
+					>
+						emit %d-bit,
+					<
+				}
+	
+				switch [Nv belong 20 0 {} {}] {
+					0 {
+						>
+							emit {old format,}
+						<
+					}
+					2 {
+						>
+							emit compressed,
+						<
+					}
+					3 {
+						>
+							emit RGB,
+						<
+					}
+					4 {
+						>
+							emit TIFF,
+						<
+					}
+					5 {
+						>
+							emit IFF,
+						<
+					}
+					65535 {
+						>
+							emit {reserved for testing,}
+						<
+					}
+				}
+	
+				switch [Nv belong 24 0 {} {}] {
+					0 {
+						>
+							emit {no colormap}
+						<
+					}
+					1 {
+						>
+							emit {RGB colormap}
+						<
+					}
+					2 {
+						>
+							emit {raw colormap}
+						<
+					}
+				}
+	
+			<
+		}
+		1688404224 {
+			>
+				emit {IRCAM file (VAX little-endian)}
+			<
+		}
+		1688404480 {
+			>
+				emit {IRCAM file (Sun big-endian)}
+			<
+		}
+		1688404736 {
+			>
+				emit {IRCAM file (MIPS little-endian)}
+			<
+		}
+		1688404992 {
+			>
+				emit {IRCAM file (NeXT big-endian)}
+			<
+			>
+				emit {IRCAM file (NeXT big-endian)}
+			<
+		}
+		1734567009 {
+			>
+				emit {GCC gcda coverage (-fprofile-arcs),}
+				if {[N byte [R 0] 0 0 {} {} x {}]} {
+					>
+						emit {version %c.}
+					<
+				}
+	
+				if {[N byte [R 2] 0 0 {} {} x {}]} {
+					>
+						emit {\b%c (big-endian)}
+					<
+				}
+	
+			<
+		}
+		1734569583 {
+			>
+				emit {GCC gcno coverage (-ftest-coverage),}
+				if {[N byte [R 0] 0 0 {} {} x {}]} {
+					>
+						emit {version %c.}
+					<
+				}
+	
+				if {[N byte [R 2] 0 0 {} {} x {}]} {
+					>
+						emit {\b%c (big-endian)}
+					<
+				}
+	
+			<
+		}
+		1812729098 {
+			>
+				emit {python 3.2 byte-compiled}
+			<
+		}
+		1844579594 {
+			>
+				emit {python 2.4 byte-compiled}
+			<
+		}
+		1886869041 {
+			>
+				emit {Cracklib password index, big endian}
+				if {[N belong 4 0 0 {} {} > -1]} {
+					>
+						emit {(%i words)}
+					<
+				}
+	
+			<
+		}
+		1920139574 {
+			>
+				emit {rdiff network-delta signature data}
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {(block length=%d,}
+					<
+				}
+	
+				if {[N belong 8 0 0 {} {} x {}]} {
+					>
+						emit {signature strength=%d)}
+					<
+				}
+	
+			<
+		}
+		1920139830 {
+			>
+				emit {rdiff network-delta data}
+			<
+		}
+		1936484385 {
+			>
+				emit {Allegro datafile (packed)}
+			<
+		}
+		1936484395 {
+			>
+				emit {Allegro datafile (appended exe data)}
+			<
+		}
+		1936484398 {
+			>
+				emit {Allegro datafile (not packed/autodetect)}
+			<
+		}
+		1976638807 {
+			>
+				emit {Common Trace Format (CTF) packetized metadata (BE)}
+				if {[N byte 35 0 0 {} {} x {}]} {
+					>
+						emit {\b, v%d}
+					<
+				}
+	
+				if {[N byte 36 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[S search 0 0 {} 8192 eq (input,]} {
+		>
+			emit {Algol 68 source text}
+			mime text/x-Algol68
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^PROC]} {
+		>
+			emit {Algol 68 source text}
+			mime text/x-Algol68
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq MODE\[\t\ \]]} {
+		>
+			emit {Algol 68 source text}
+			mime text/x-Algol68
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq REF\[\t\ \]]} {
+		>
+			emit {Algol 68 source text}
+			mime text/x-Algol68
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq FLEX\[\t\ \]*\\\[]} {
+		>
+			emit {Algol 68 source text}
+			mime text/x-Algol68
+		<
+	}
+	
+	switch [Nv short 0 0 {} {}] {
+		-21846 {
+			>
+				emit {SoftQuad DESC or font file binary}
+				if {[N short 2 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		-16166 {
+			>
+				emit {Compiled PSI (v2) data}
+				if {[S string 3 0 {} {} > \0]} {
+					>
+						emit (%s)
+					<
+				}
+	
+			<
+		}
+		-16162 {
+			>
+				emit {Compiled PSI (v1) data}
+			<
+		}
+		-14479 {
+			>
+				emit {byte-swapped cpio archive}
+				mime {application/x-cpio # encoding: swapped}
+			<
+		}
+		-13563 {
+			>
+				emit {huf output}
+				mime application/octet-stream
+			<
+		}
+		256 {
+			>
+				if {[S search 2 0 {} 9 eq \0\0]} {
+					>
+					<
+				}
+	
+				if {[D 2]} {
+					>
+						if {[N belong 0 0 0 {} {} != 107364]} {
+							>
+								if {[N beshort 2 0 0 {} {} != 8]} {
+									>
+										if {[S search 11 0 {} 262 eq \x06DESIGN]} {
+											>
+											<
+										}
+	
+										if {[D 11]} {
+											>
+												if {[S search 27118 0 {} 1864 eq DreamWorld]} {
+													>
+													<
+												}
+	
+												if {[D 27118]} {
+													>
+														if {[N ubequad 8 0 0 {} {} != 3314931918822244867]} {
+															>
+																if {[N ubequad 8 0 0 {} {} != 6768475576809644948]} {
+																	>
+																		emit {raw G3 (Group 3) FAX, byte-padded}
+																		mime image/g3fax
+																		ext g3
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		262 {
+			>
+				emit {VAX-order2 68k Blit mpx/mux executable}
+			<
+		}
+		272 {
+			>
+				emit {0420 Alliant virtual executable}
+				if {[N short 2 0 0 {} {} & 32]} {
+					>
+						emit {common library}
+					<
+				}
+	
+				if {[N long 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		273 {
+			>
+				emit {0421 Alliant compact executable}
+				if {[N short 2 0 0 {} {} & 32]} {
+					>
+						emit {common library}
+					<
+				}
+	
+				if {[N long 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		286 {
+			>
+				emit {Berkeley vfont data}
+			<
+		}
+		340 {
+			>
+				emit Encore
+				switch [Nv short 20 0 {} {}] {
+					263 {
+						>
+							emit executable
+						<
+					}
+					264 {
+						>
+							emit {pure executable}
+						<
+					}
+					267 {
+						>
+							emit {demand-paged executable}
+						<
+					}
+					271 {
+						>
+							emit {unsupported executable}
+						<
+					}
+				}
+	
+				if {[N long 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N short 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N short 22 0 0 {} {} == 0]} {
+					>
+						emit -
+					<
+				}
+	
+			<
+		}
+		341 {
+			>
+				emit {Encore unsupported executable}
+				if {[N long 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N short 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N short 22 0 0 {} {} == 0]} {
+					>
+						emit -
+					<
+				}
+	
+			<
+		}
+		373 {
+			>
+				emit {i386 COFF object}
+			<
+		}
+		381 {
+			>
+				emit {CLIPPER COFF executable (VAX #)}
+				switch [Nv short 20 0 {} {}] {
+					263 {
+						>
+							emit (impure)
+						<
+					}
+					264 {
+						>
+							emit {(5.2 compatible)}
+						<
+					}
+					265 {
+						>
+							emit (pure)
+						<
+					}
+					267 {
+						>
+							emit {(demand paged)}
+						<
+					}
+					291 {
+						>
+							emit {(target shared library)}
+						<
+					}
+				}
+	
+				if {[N long 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N short 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		383 {
+			>
+				emit {CLIPPER COFF executable}
+				switch [Nv short 18 0 & 30720] {
+					0 {
+						>
+							emit {C1 R1}
+						<
+					}
+					2048 {
+						>
+							emit {C2 R1}
+						<
+					}
+					4096 {
+						>
+							emit {C3 R1}
+						<
+					}
+					30720 {
+						>
+							emit TEST
+						<
+					}
+				}
+	
+				switch [Nv short 20 0 {} {}] {
+					263 {
+						>
+							emit (impure)
+						<
+					}
+					264 {
+						>
+							emit (pure)
+						<
+					}
+					265 {
+						>
+							emit {(separate I&D)}
+						<
+					}
+					267 {
+						>
+							emit (paged)
+						<
+					}
+					291 {
+						>
+							emit {(target shared library)}
+						<
+					}
+				}
+	
+				if {[N long 12 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N short 22 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N long 48 0 0 & 1 == 1]} {
+					>
+						emit {alignment trap enabled}
+					<
+				}
+	
+				switch [Nv byte 52 0 {} {}] {
+					1 {
+						>
+							emit -Ctnc
+						<
+					}
+					2 {
+						>
+							emit -Ctsw
+						<
+					}
+					3 {
+						>
+							emit -Ctpw
+						<
+					}
+					4 {
+						>
+							emit -Ctcb
+						<
+					}
+				}
+	
+				switch [Nv byte 53 0 {} {}] {
+					1 {
+						>
+							emit -Cdnc
+						<
+					}
+					2 {
+						>
+							emit -Cdsw
+						<
+					}
+					3 {
+						>
+							emit -Cdpw
+						<
+					}
+					4 {
+						>
+							emit -Cdcb
+						<
+					}
+				}
+	
+				switch [Nv byte 54 0 {} {}] {
+					1 {
+						>
+							emit -Csnc
+						<
+					}
+					2 {
+						>
+							emit -Cssw
+						<
+					}
+					3 {
+						>
+							emit -Cspw
+						<
+					}
+					4 {
+						>
+							emit -Cscb
+						<
+					}
+				}
+	
+			<
+		}
+		392 {
+			>
+				emit {Perkin-Elmer executable}
+			<
+		}
+		601 {
+			>
+				emit {mumps avl global}
+				if {[N byte 2 0 0 {} {} > 0]} {
+					>
+						emit (V%d)
+					<
+				}
+	
+				if {[N byte 6 0 0 {} {} > 0]} {
+					>
+						emit {with %d byte name}
+					<
+				}
+	
+				if {[N byte 7 0 0 {} {} > 0]} {
+					>
+						emit {and %d byte data cells}
+					<
+				}
+	
+			<
+		}
+		602 {
+			>
+				emit {mumps blt global}
+				if {[N byte 2 0 0 {} {} > 0]} {
+					>
+						emit (V%d)
+					<
+				}
+	
+				if {[N short 8 0 0 {} {} > 0]} {
+					>
+						emit {- %d byte blocks}
+					<
+				}
+	
+				switch [Nv byte 15 0 {} {}] {
+					0 {
+						>
+							emit {- P/D format}
+						<
+					}
+					1 {
+						>
+							emit {- P/K/D format}
+						<
+					}
+					2 {
+						>
+							emit {- K/D format}
+						<
+					}
+				}
+	
+				if {[N byte 15 0 0 {} {} > 2]} {
+					>
+						emit {- Bad Flags}
+					<
+				}
+	
+			<
+		}
+		1281 {
+			>
+				emit {locale data table}
+				switch [Nv short 6 0 {} {}] {
+					36 {
+						>
+							emit {for MIPS}
+						<
+					}
+					64 {
+						>
+							emit {for Alpha}
+						<
+					}
+				}
+	
+			<
+		}
+		1537 {
+			>
+				emit {VAX-order 68k Blit mpx/mux executable}
+			<
+		}
+		1793 {
+			>
+				emit {VAX-order 68K Blit (standalone) executable}
+			<
+		}
+		5120 {
+			>
+				if {[S search 2 0 {} 9 eq \0\0]} {
+					>
+					<
+				}
+	
+				if {[D 2]} {
+					>
+						emit {raw G3 (Group 3) FAX}
+						mime image/g3fax
+						ext g3
+					<
+				}
+	
+			<
+		}
+		7681 {
+			>
+				emit {byte-swapped Berkeley vfont data}
+			<
+		}
+		7967 {
+			>
+				emit {old packed data}
+				mime application/octet-stream
+			<
+		}
+		8191 {
+			>
+				emit {compacted data}
+				mime application/octet-stream
+			<
+		}
+		10012 {
+			>
+				if {[S regex 16 0 s {} eq ^\[0-78\]\[0-9.\]\{4\}]} {
+					>
+						emit {Sendmail frozen configuration}
+						if {[S string 16 0 {} {} > \0]} {
+							>
+								emit {- version %s}
+							<
+						}
+	
+						ext fc
+					<
+				}
+	
+			<
+		}
+		10775 {
+			>
+				emit {"compact bitmap" format (Poskanzer)}
+			<
+		}
+		21845 {
+			>
+				emit {VISX image file}
+				switch [Nv byte 2 0 {} {}] {
+					-126 {
+						>
+							emit (graph)
+						<
+					}
+					-125 {
+						>
+							emit {(adjacency graph)}
+						<
+					}
+					-124 {
+						>
+							emit {(adjacency graph library)}
+						<
+					}
+					0 {
+						>
+							emit (zero)
+						<
+					}
+					1 {
+						>
+							emit {(unsigned char)}
+						<
+					}
+					2 {
+						>
+							emit {(short integer)}
+						<
+					}
+					3 {
+						>
+							emit {(float 32)}
+						<
+					}
+					4 {
+						>
+							emit {(float 64)}
+						<
+					}
+					5 {
+						>
+							emit {(signed char)}
+						<
+					}
+					6 {
+						>
+							emit (bit-plane)
+						<
+					}
+					7 {
+						>
+							emit (classes)
+						<
+					}
+					8 {
+						>
+							emit (statistics)
+						<
+					}
+					10 {
+						>
+							emit {(ascii text)}
+						<
+					}
+					15 {
+						>
+							emit {(image segments)}
+						<
+					}
+					100 {
+						>
+							emit {(image set)}
+						<
+					}
+					101 {
+						>
+							emit {(unsigned char vector)}
+						<
+					}
+					102 {
+						>
+							emit {(short integer vector)}
+						<
+					}
+					103 {
+						>
+							emit {(float 32 vector)}
+						<
+					}
+					104 {
+						>
+							emit {(float 64 vector)}
+						<
+					}
+					105 {
+						>
+							emit {(signed char vector)}
+						<
+					}
+					106 {
+						>
+							emit {(bit plane vector)}
+						<
+					}
+					121 {
+						>
+							emit {(feature vector)}
+						<
+					}
+					122 {
+						>
+							emit {(feature vector library)}
+						<
+					}
+					124 {
+						>
+							emit {(chain code)}
+						<
+					}
+					126 {
+						>
+							emit {(bit vector)}
+						<
+					}
+				}
+	
+				if {[S string 2 0 {} {} eq .VISIX]} {
+					>
+						emit {(ascii text)}
+					<
+				}
+	
+			<
+		}
+		24672 {
+			>
+				emit {Dyalog APL transfer}
+			<
+		}
+		29127 {
+			>
+				emit {cpio archive}
+				mime application/x-cpio
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq AMANDA:\ ]} {
+		>
+			emit AMANDA
+			if {[S string 8 0 {} {} eq TAPESTART\ DATE]} {
+				>
+					emit {tape header file,}
+					if {[S string 23 0 {} {} eq X]} {
+						>
+							if {[S string 25 0 {} {} > \ ]} {
+								>
+									emit {Unused %s}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string 23 0 {} {} > \ ]} {
+						>
+							emit {DATE %s}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq FILE\ ]} {
+				>
+					emit {dump file,}
+					if {[S string 13 0 {} {} > \ ]} {
+						>
+							emit {DATE %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FC14]} {
+		>
+			emit {Future Composer 1.4 Module sound file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SMOD]} {
+		>
+			emit {Future Composer 1.3 Module sound file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AON4artofnoise]} {
+		>
+			emit {Art Of Noise Module sound file}
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq MUGICIAN/SOFTEYES]} {
+		>
+			emit {Mugician Module sound file}
+		<
+	}
+	
+	if {[S string 58 0 {} {} eq SIDMON\ II\ -\ THE]} {
+		>
+			emit {Sidmon 2.0 Module sound file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Synth4.0]} {
+		>
+			emit {Synthesis Module sound file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ARP.]} {
+		>
+			emit {The Holy Noise Module sound file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BeEp\0]} {
+		>
+			emit {JamCracker Module sound file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq COSO\0]} {
+		>
+			emit {Hippel-COSO Module sound file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\#\ version]} {
+		>
+			emit {catalog translation}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq EMOD\0]} {
+		>
+			emit {Amiga E module}
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq ECXM\0]} {
+		>
+			emit {ECX module}
+		<
+	}
+	
+	if {[S string 0 0 c {} eq @database]} {
+		>
+			emit {AmigaGuide file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RDSK]} {
+		>
+			emit {Rigid Disk Block}
+			if {[S string 160 0 {} {} x {}]} {
+				>
+					emit {on %.24s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DOS\0]} {
+		>
+			emit {Amiga DOS disk}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DOS\1]} {
+		>
+			emit {Amiga FFS disk}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DOS\2]} {
+		>
+			emit {Amiga Inter DOS disk}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DOS\3]} {
+		>
+			emit {Amiga Inter FFS disk}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DOS\4]} {
+		>
+			emit {Amiga Fastdir DOS disk}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DOS\5]} {
+		>
+			emit {Amiga Fastdir FFS disk}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq KICK]} {
+		>
+			emit {Kickstart disk}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LZX]} {
+		>
+			emit {LZX compressed archive (Amiga)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq .KEY]} {
+		>
+			emit {AmigaDOS script}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq .key]} {
+		>
+			emit {AmigaDOS script}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq dex\n]} {
+		>
+			if {[S regex 0 0 {} {} eq dex\n\[0-9\]\{2\}\0]} {
+				>
+					emit {Dalvik dex file}
+				<
+			}
+	
+			if {[S string 4 0 {} {} > 000]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq dey\n]} {
+		>
+			if {[S regex 0 0 {} {} eq dey\n\[0-9\]\{2\}\0]} {
+				>
+					emit {Dalvik dex file (optimized for host)}
+				<
+			}
+	
+			if {[S string 4 0 {} {} > 000]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ANDROID!]} {
+		>
+			emit {Android bootimg}
+			if {[S string 1024 0 {} {} eq LOKI\01]} {
+				>
+					emit {\b, LOKI'd}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} > 0]} {
+				>
+					emit {\b, kernel}
+					if {[N lelong 12 0 0 {} {} > 0]} {
+						>
+							emit {\b (0x%x)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N lelong 16 0 0 {} {} > 0]} {
+				>
+					emit {\b, ramdisk}
+					if {[N lelong 20 0 0 {} {} > 0]} {
+						>
+							emit {\b (0x%x)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N lelong 24 0 0 {} {} > 0]} {
+				>
+					emit {\b, second stage}
+					if {[N lelong 28 0 0 {} {} > 0]} {
+						>
+							emit {\b (0x%x)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N lelong 36 0 0 {} {} > 0]} {
+				>
+					emit {\b, page size: %d}
+				<
+			}
+	
+			if {[S string 38 0 {} {} > 0]} {
+				>
+					emit {\b, name: %s}
+				<
+			}
+	
+			if {[S string 64 0 {} {} > 0]} {
+				>
+					emit {\b, cmdline (%s)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq ANDROID\ BACKUP\n1\n]} {
+		>
+			emit {Android Backup}
+			if {[S string 17 0 {} {} eq 0\n]} {
+				>
+					emit {\b, Not-Compressed}
+				<
+			}
+	
+			if {[S string 17 0 {} {} eq 1\n]} {
+				>
+					emit {\b, Compressed}
+					if {[S regex 19 0 l 1 eq ^(\[^n\n\]|n\[^o\]|no\[^n\]|non\[^e\]|none.+).*]} {
+						>
+							emit {\b, Encrypted (%s)}
+						<
+					}
+	
+					if {[S string 19 0 {} {} eq none\n]} {
+						>
+							emit {\b, Not-Encrypted}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv ulelong 0 0 {} {}] {
+		1 {
+			>
+				if {[S string 40 0 {} {} eq \ EMF]} {
+					>
+						emit {Windows Enhanced Metafile (EMF) image data}
+						if {[N ulelong 44 0 0 {} {} x {}]} {
+							>
+								emit {version 0x%x}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		8127978 {
+			>
+				emit {pxelinux loader (version 2.13 or older)}
+			<
+		}
+		168627466 {
+			>
+				if {[N ulelong 8 0 0 {} {} == 439041101]} {
+					>
+						emit {pcap-ng capture file}
+						if {[N leshort 12 0 0 {} {} x {}]} {
+							>
+								emit {- version %d}
+							<
+						}
+	
+						if {[N leshort 14 0 0 {} {} x {}]} {
+							>
+								emit {\b.%d}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		305436790 {
+			>
+				if {[N ulequad 28 0 0 & 18446744060824649724 == 0]} {
+					>
+						if {[N ulelong 4 0 0 {} {} < 128]} {
+							>
+								emit {Partition Information Table for Samsung smartphone}
+								if {[N ulelong 4 0 0 {} {} x {}]} {
+									>
+										emit {\b, %d entries}
+									<
+								}
+	
+								if {[N ulelong 4 0 0 {} {} > 0]} {
+									>
+										emit {\b; #1}
+									<
+								}
+	
+								U 7 PIT-entry 28
+	
+								if {[N ulelong 4 0 0 {} {} > 1]} {
+									>
+										emit {\b; #2}
+									<
+								}
+	
+								U 7 PIT-entry 160
+	
+								if {[N ulelong 4 0 0 {} {} > 2]} {
+									>
+										emit {\b; #3}
+									<
+								}
+	
+								U 7 PIT-entry 292
+	
+								if {[N ulelong 4 0 0 {} {} > 3]} {
+									>
+										emit {\b; #4}
+									<
+								}
+	
+								U 7 PIT-entry 424
+	
+								if {[N ulelong 4 0 0 {} {} > 4]} {
+									>
+										emit {\b; #5}
+									<
+								}
+	
+								U 7 PIT-entry 556
+	
+								if {[N ulelong 4 0 0 {} {} > 5]} {
+									>
+										emit {\b; #6}
+									<
+								}
+	
+								U 7 PIT-entry 688
+	
+								if {[N ulelong 4 0 0 {} {} > 6]} {
+									>
+										emit {\b; #7}
+									<
+								}
+	
+								U 7 PIT-entry 820
+	
+								if {[N ulelong 4 0 0 {} {} > 7]} {
+									>
+										emit {\b; #8}
+									<
+								}
+	
+								U 7 PIT-entry 952
+	
+								if {[N ulelong 4 0 0 {} {} > 8]} {
+									>
+										emit {\b; #9}
+									<
+								}
+	
+								U 7 PIT-entry 1084
+	
+								if {[N ulelong 4 0 0 {} {} > 9]} {
+									>
+										emit {\b; #10}
+									<
+								}
+	
+								U 7 PIT-entry 1216
+	
+								if {[N ulelong 4 0 0 {} {} > 10]} {
+									>
+										emit {\b; #11}
+									<
+								}
+	
+								U 7 PIT-entry 1348
+	
+								if {[N ulelong 4 0 0 {} {} > 11]} {
+									>
+										emit {\b; #12}
+									<
+								}
+	
+								U 7 PIT-entry 1480
+	
+								if {[N ulelong 4 0 0 {} {} > 12]} {
+									>
+										emit {\b; #13}
+										U 7 PIT-entry 1612
+	
+									<
+								}
+	
+								if {[N ulelong 4 0 0 {} {} > 13]} {
+									>
+										emit {\b; #14}
+										U 7 PIT-entry 1744
+	
+									<
+								}
+	
+								if {[N ulelong 4 0 0 {} {} > 14]} {
+									>
+										emit {\b; #15}
+									<
+								}
+	
+								U 7 PIT-entry 1876
+	
+								if {[N ulelong 4 0 0 {} {} > 15]} {
+									>
+										emit {\b; #16}
+									<
+								}
+	
+								U 7 PIT-entry 2008
+	
+								if {[N ulelong 4 0 0 {} {} > 16]} {
+									>
+										emit {\b; #17}
+									<
+								}
+	
+								U 7 PIT-entry 2140
+	
+								if {[N ulelong 4 0 0 {} {} > 17]} {
+									>
+										emit {\b; #18}
+									<
+								}
+	
+								U 7 PIT-entry 2272
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		1212429320 {
+			>
+				emit {4DOS help file}
+				if {[S string 4 0 {} {} x {}]} {
+					>
+						emit {\b, version %-4.4s}
+					<
+				}
+	
+			<
+		}
+		1617337446 {
+			>
+				emit {pxelinux loader}
+			<
+		}
+		2712847316 {
+			>
+				emit {tcpdump capture file (little-endian)}
+				mime application/vnd.tcpdump.pcap
+				U 235 pcap-be 0
+	
+			<
+		}
+		2712849716 {
+			>
+				emit {extended tcpdump capture file (little-endian)}
+				U 235 pcap-be 0
+	
+			<
+		}
+		3221226986 {
+			>
+				emit {pxelinux loader (version 3.70 or newer)}
+			<
+		}
+		4294906091 {
+			>
+				emit {DR-DOS executable (COM)}
+			<
+		}
+	}
+	
+	switch [Nv lelong 0 0 {} {}] {
+		-2147417760 {
+			>
+				emit {MDEC video stream,}
+				if {[N leshort 16 0 0 {} {} x {}]} {
+					>
+						emit %dx
+					<
+				}
+	
+				if {[N leshort 18 0 0 {} {} x {}]} {
+					>
+						emit {\b%d}
+					<
+				}
+	
+			<
+		}
+		-1728153892 {
+			>
+				if {[N uleshort 4 0 0 {} {} < 10]} {
+					>
+						emit {APT cache data, version %u}
+						if {[N uleshort 6 0 0 {} {} x {}]} {
+							>
+								emit {\b.%u, 32 bit little-endian}
+							<
+						}
+	
+						U 15 apt-cache-32bit-be 0
+	
+					<
+				}
+	
+				if {[N ubyte 4 0 0 {} {} > 9]} {
+					>
+						emit {APT cache data, version %u}
+						if {[N ubyte 5 0 0 {} {} x {}]} {
+							>
+								emit {\b.%u, little-endian}
+							<
+						}
+	
+						U 15 apt-cache-be 0
+	
+					<
+				}
+	
+			<
+		}
+		-1700603645 {
+			>
+				emit {Keepass password database}
+				switch [Nv lelong 4 0 {} {}] {
+					-1253311643 {
+						>
+							emit {1.x KDB}
+							if {[N lelong 48 0 0 {} {} > 0]} {
+								>
+									emit {\b, %d groups}
+								<
+							}
+	
+							if {[N lelong 52 0 0 {} {} > 0]} {
+								>
+									emit {\b, %d entries}
+								<
+							}
+	
+							switch [Nv lelong 8 0 & 15] {
+								1 {
+									>
+										emit {\b, SHA-256}
+									<
+								}
+								2 {
+									>
+										emit {\b, AES}
+									<
+								}
+								4 {
+									>
+										emit {\b, RC4}
+									<
+								}
+								8 {
+									>
+										emit {\b, Twofish}
+									<
+								}
+							}
+	
+							if {[N lelong 120 0 0 {} {} > 0]} {
+								>
+									emit {\b, %d key transformation rounds}
+								<
+							}
+	
+						<
+					}
+					-1253311641 {
+						>
+							emit {2.x KDBX}
+						<
+					}
+				}
+	
+			<
+		}
+		-1641380927 {
+			>
+				emit {Unreal Engine Package,}
+				if {[N leshort 4 0 0 {} {} x {}]} {
+					>
+						emit {version: %i}
+					<
+				}
+	
+				if {[N lelong 12 0 0 {} {} != 0]} {
+					>
+						emit {\b, names: %i}
+					<
+				}
+	
+				if {[N lelong 28 0 0 {} {} != 0]} {
+					>
+						emit {\b, imports: %i}
+					<
+				}
+	
+				if {[N lelong 20 0 0 {} {} != 0]} {
+					>
+						emit {\b, exports: %i}
+					<
+				}
+	
+			<
+		}
+		-1456779524 {
+			>
+				emit {Linux Software RAID}
+				if {[N lelong 4 0 0 {} {} x {}]} {
+					>
+						emit {version 1.1 (%d)}
+					<
+				}
+	
+				U 129 linuxraid 0
+	
+			<
+		}
+		-1324630015 {
+			>
+				switch [Nv lelong 4 0 {} {}] {
+					0 {
+						>
+							emit {Nintendo GameCube disc image (GCZ format)}
+							mime application/x-gamecube-rom
+						<
+					}
+					1 {
+						>
+							emit {Nintendo Wii disc image (GCZ format)}
+							mime application/x-wii-rom
+						<
+					}
+				}
+	
+				if {[D 4]} {
+					>
+						emit {Nintendo GameCube/Wii disc image (GCZ format)}
+					<
+				}
+	
+			<
+		}
+		-1040441407 {
+			>
+				emit {Common Trace Format (CTF) trace data (LE)}
+			<
+		}
+		-681629056 {
+			>
+				emit {Cineon image data}
+				if {[N belong 200 0 0 {} {} > 0]} {
+					>
+						emit {\b, %d x}
+					<
+				}
+	
+				if {[N belong 204 0 0 {} {} > 0]} {
+					>
+						emit %d
+					<
+				}
+	
+			<
+		}
+		-570294007 {
+			>
+				emit {locale archive}
+				if {[N lelong 24 0 0 {} {} x {}]} {
+					>
+						emit {%d strings}
+					<
+				}
+	
+			<
+		}
+		-332356553 {
+			>
+				emit {Zstandard dictionary}
+				mime application/x-zstd-dictionary
+				if {[N lelong 4 0 0 {} {} x {}]} {
+					>
+						emit {(ID %u)}
+					<
+				}
+	
+			<
+		}
+		-316211398 {
+			>
+				emit {Android sparse image}
+				if {[N leshort 4 0 0 {} {} x {}]} {
+					>
+						emit {\b, version: %d}
+					<
+				}
+	
+				if {[N leshort 6 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} x {}]} {
+					>
+						emit {\b, Total of %d}
+					<
+				}
+	
+				if {[N lelong 12 0 0 {} {} x {}]} {
+					>
+						emit {\b %d-byte output blocks in}
+					<
+				}
+	
+				if {[N lelong 20 0 0 {} {} x {}]} {
+					>
+						emit {\b %d input chunks.}
+					<
+				}
+	
+			<
+		}
+		-249691108 {
+			>
+				emit {magic binary file for file(1) cmd}
+				if {[N lelong 4 0 0 {} {} x {}]} {
+					>
+						emit {(version %d) (little endian)}
+					<
+				}
+	
+			<
+		}
+		-109248628 {
+			>
+				emit {SE Linux policy}
+				if {[N lelong 16 0 0 {} {} x {}]} {
+					>
+						emit v%d
+					<
+				}
+	
+				if {[N lelong 20 0 0 {} {} == 1]} {
+					>
+						emit MLS
+					<
+				}
+	
+				if {[N lelong 24 0 0 {} {} x {}]} {
+					>
+						emit {%d symbols}
+					<
+				}
+	
+				if {[N lelong 28 0 0 {} {} x {}]} {
+					>
+						emit {%d ocons}
+					<
+				}
+	
+			<
+			>
+				emit {SE Linux policy}
+				if {[N lelong 16 0 0 {} {} x {}]} {
+					>
+						emit v%d
+					<
+				}
+	
+				if {[N lelong 20 0 0 {} {} == 1]} {
+					>
+						emit MLS
+					<
+				}
+	
+				if {[N lelong 24 0 0 {} {} x {}]} {
+					>
+						emit {%d symbols}
+					<
+				}
+	
+				if {[N lelong 28 0 0 {} {} x {}]} {
+					>
+						emit {%d ocons}
+					<
+				}
+	
+			<
+			>
+				emit {SE Linux policy}
+				if {[N lelong 16 0 0 {} {} x {}]} {
+					>
+						emit v%d
+					<
+				}
+	
+				if {[N lelong 20 0 0 {} {} == 1]} {
+					>
+						emit MLS
+					<
+				}
+	
+				if {[N lelong 24 0 0 {} {} x {}]} {
+					>
+						emit {%d symbols}
+					<
+				}
+	
+				if {[N lelong 28 0 0 {} {} x {}]} {
+					>
+						emit {%d ocons}
+					<
+				}
+	
+			<
+		}
+		-109248625 {
+			>
+				emit {SE Linux modular policy}
+				if {[N lelong 4 0 0 {} {} x {}]} {
+					>
+						emit {version %d,}
+					<
+				}
+	
+				if {[N lelong 8 0 0 {} {} x {}]} {
+					>
+						emit {%d sections,}
+						if {[N lelong [I 12 ulelong 0 + 0 0] 0 0 {} {} == -109248627]} {
+							>
+								if {[N lelong [I 12 ulelong 0 + 0 27] 0 0 {} {} x {}]} {
+									>
+										emit {mod version %d,}
+									<
+								}
+	
+								switch [Nv lelong [I 12 ulelong 0 + 0 31] 0 {} {}] {
+									0 {
+										>
+											emit {Not MLS,}
+										<
+									}
+									1 {
+										>
+											emit MLS,
+										<
+									}
+								}
+	
+								switch [Nv lelong [I 12 ulelong 0 + 0 23] 0 {} {}] {
+									1 {
+										>
+											emit base
+										<
+									}
+									2 {
+										>
+											if {[S string [I 12 ulelong 0 + 0 47] 0 {} {} > \0]} {
+												>
+													emit {module name %s}
+												<
+											}
+	
+										<
+									}
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-47205086 {
+			>
+				emit {Zstandard compressed data (v0.2)}
+				mime application/x-zstd
+			<
+		}
+		-47205085 {
+			>
+				emit {Zstandard compressed data (v0.3)}
+				mime application/x-zstd
+			<
+		}
+		-47205084 {
+			>
+				emit {Zstandard compressed data (v0.4)}
+				mime application/x-zstd
+			<
+		}
+		-47205083 {
+			>
+				emit {Zstandard compressed data (v0.5)}
+				mime application/x-zstd
+			<
+		}
+		-47205082 {
+			>
+				emit {Zstandard compressed data (v0.6)}
+				mime application/x-zstd
+			<
+		}
+		-47205081 {
+			>
+				emit {Zstandard compressed data (v0.7)}
+				mime application/x-zstd
+				U 50 zstd-dictionary-id 4
+	
+			<
+		}
+		-47205080 {
+			>
+				emit {Zstandard compressed data (v0.8+)}
+				mime application/x-zstd
+				U 50 zstd-dictionary-id 4
+	
+			<
+		}
+		-21555 {
+			>
+				emit {MLSSA datafile,}
+				if {[N leshort 4 0 0 {} {} x {}]} {
+					>
+						emit {algorithm %d,}
+					<
+				}
+	
+				if {[N lelong 10 0 0 {} {} x {}]} {
+					>
+						emit {%d samples}
+					<
+				}
+	
+			<
+		}
+		1 {
+			>
+				if {[N lelong 4 0 0 {} {} == 100]} {
+					>
+						if {[N lelong 8 0 0 {} {} == 10000]} {
+							>
+								if {[N lelong 12 0 0 {} {} == 50]} {
+									>
+										if {[N lelong 16 0 0 {} {} == 50000]} {
+											>
+												if {[N lelong 20 0 0 {} {} == 100]} {
+													>
+														if {[N lelong 24 0 0 {} {} == 1000]} {
+															>
+																if {[N lelong 28 0 0 {} {} == 1000]} {
+																	>
+																		if {[N lelong 36 0 0 {} {} == 10]} {
+																			>
+																				if {[N lelong 40 0 0 {} {} == 100]} {
+																					>
+																						if {[N lelong 32 0 0 {} {} x {}]} {
+																							>
+																								emit {LG robot VR6[234]xx %dm^2 navigation}
+																							<
+																						}
+	
+																						switch [Nv lelong 136040 0 {} {}] {
+																							-1 {
+																								>
+																									emit {reuse map data}
+																								<
+																							}
+																							0 {
+																								>
+																									emit {map data}
+																								<
+																							}
+																						}
+	
+																						if {[N lelong 136040 0 0 {} {} > 0]} {
+																							>
+																								emit {spurious map data}
+																							<
+																						}
+	
+																						if {[N lelong 136040 0 0 {} {} < -1]} {
+																							>
+																								emit {spurious map data}
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		4 {
+			>
+				if {[N lelong 104 0 0 {} {} == 4]} {
+					>
+						emit {X11 SNF font data, LSB first}
+						mime application/x-font-sfn
+					<
+				}
+	
+			<
+			>
+				if {[N lelong 12 0 0 {} {} == 280]} {
+					>
+						emit {Windows Recycle Bin INFO2 file (Win98 or below)}
+					<
+				}
+	
+			<
+		}
+		5 {
+			>
+				if {[N lelong 12 0 0 {} {} == 800]} {
+					>
+						emit {Windows Recycle Bin INFO2 file (Win2k - WinXP)}
+					<
+				}
+	
+			<
+		}
+		16 {
+			>
+				emit {TIM image,}
+				switch [Nv lelong 4 0 {} {}] {
+					2 {
+						>
+							emit 15-Bit,
+						<
+					}
+					3 {
+						>
+							emit 24-Bit,
+						<
+					}
+					8 {
+						>
+							emit 4-Bit,
+						<
+					}
+					9 {
+						>
+							emit 8-Bit,
+						<
+					}
+				}
+	
+				if {[N lelong 4 0 0 {} {} & 8]} {
+					>
+						if {[N leshort [I 8 ulelong 0 + 0 12] 0 0 {} {} x {}]} {
+							>
+								emit {Pixel at (%d,}
+							<
+						}
+	
+						if {[N leshort [I 8 ulelong 0 + 0 14] 0 0 {} {} x {}]} {
+							>
+								emit {\b%d)}
+							<
+						}
+	
+						if {[N leshort [I 8 ulelong 0 + 0 16] 0 0 {} {} x {}]} {
+							>
+								emit Size=%dx
+							<
+						}
+	
+						if {[N leshort [I 8 ulelong 0 + 0 18] 0 0 {} {} x {}]} {
+							>
+								emit {\b%d,}
+							<
+						}
+	
+						switch [Nv lelong 4 0 {} {}] {
+							8 {
+								>
+									emit {16 CLUT Entries at}
+								<
+							}
+							9 {
+								>
+									emit {256 CLUT Entries at}
+								<
+							}
+						}
+	
+						if {[N leshort 12 0 0 {} {} x {}]} {
+							>
+								emit (%d,
+							<
+						}
+	
+						if {[N leshort 14 0 0 {} {} x {}]} {
+							>
+								emit {\b%d)}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N lelong 4 0 0 {} {} ^ 8]} {
+					>
+						if {[N leshort 12 0 0 {} {} x {}]} {
+							>
+								emit {Pixel at (%d,}
+							<
+						}
+	
+						if {[N leshort 14 0 0 {} {} x {}]} {
+							>
+								emit {\b%d)}
+							<
+						}
+	
+						if {[N leshort 16 0 0 {} {} x {}]} {
+							>
+								emit Size=%dx
+							<
+						}
+	
+						if {[N leshort 18 0 0 {} {} x {}]} {
+							>
+								emit {\b%d}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		76 {
+			>
+				if {[N lelong 4 0 0 {} {} == 136193]} {
+					>
+						emit {Windows shortcut file}
+					<
+				}
+	
+			<
+		}
+		204 {
+			>
+				emit {386 compact demand paged pure executable}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N byte 32 0 0 {} {} == 106]} {
+					>
+						emit {(uses shared libs)}
+					<
+				}
+	
+			<
+		}
+		234 {
+			>
+				emit {BALANCE NS32000 .o}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N lelong 124 0 0 {} {} > 0]} {
+					>
+						emit {version %d}
+					<
+				}
+	
+			<
+		}
+		263 {
+			>
+				emit {a.out little-endian 32-bit executable}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N byte 32 0 0 {} {} == 106]} {
+					>
+						emit {(uses BSD/OS shared libs)}
+					<
+				}
+	
+			<
+		}
+		264 {
+			>
+				emit {a.out little-endian 32-bit pure executable}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N byte 32 0 0 {} {} == 106]} {
+					>
+						emit {(uses BSD/OS shared libs)}
+					<
+				}
+	
+			<
+		}
+		267 {
+			>
+				emit {a.out little-endian 32-bit demand paged pure executable}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N byte 32 0 0 {} {} == 106]} {
+					>
+						emit {(uses BSD/OS shared libs)}
+					<
+				}
+	
+			<
+		}
+		272 {
+			>
+				emit {a.out VAX demand paged (first page unmapped) pure executable}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		518 {
+			>
+				emit b.out
+				if {[N leshort 30 0 0 {} {} & 16]} {
+					>
+						emit overlay
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 2]} {
+					>
+						emit separate
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 4]} {
+					>
+						emit pure
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 2048]} {
+					>
+						emit segmented
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 1024]} {
+					>
+						emit standalone
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 1]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} ^ 1]} {
+					>
+						emit {object file}
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 16384]} {
+					>
+						emit V2.3
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & -32768]} {
+					>
+						emit V3.0
+					<
+				}
+	
+				if {[N byte 28 0 0 {} {} & 4]} {
+					>
+						emit 86
+					<
+				}
+	
+				if {[N byte 28 0 0 {} {} & 11]} {
+					>
+						emit 186
+					<
+				}
+	
+				if {[N byte 28 0 0 {} {} & 9]} {
+					>
+						emit 286
+					<
+				}
+	
+				if {[N byte 28 0 0 {} {} & 41]} {
+					>
+						emit 286
+					<
+				}
+	
+				if {[N byte 28 0 0 {} {} & 10]} {
+					>
+						emit 386
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 4]} {
+					>
+						emit {Large Text}
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 2]} {
+					>
+						emit {Large Data}
+					<
+				}
+	
+				if {[N leshort 30 0 0 {} {} & 258]} {
+					>
+						emit {Huge Objects Enabled}
+					<
+				}
+	
+			<
+		}
+		4330 {
+			>
+				emit {BALANCE NS32000 executable (0 @ 0)}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N lelong 124 0 0 {} {} > 0]} {
+					>
+						emit {version %d}
+					<
+				}
+	
+			<
+		}
+		8426 {
+			>
+				emit {BALANCE NS32000 executable (invalid @ 0)}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N lelong 124 0 0 {} {} > 0]} {
+					>
+						emit {version %d}
+					<
+				}
+	
+			<
+		}
+		12522 {
+			>
+				emit {BALANCE NS32000 standalone executable}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N lelong 124 0 0 {} {} > 0]} {
+					>
+						emit {version %d}
+					<
+				}
+	
+			<
+		}
+		33644 {
+			>
+				emit {PDP-11 double precision APL workspace}
+			<
+		}
+		33645 {
+			>
+				emit {PDP-11 single precision APL workspace}
+			<
+		}
+		33646 {
+			>
+				emit {VAX double precision APL workspace}
+			<
+		}
+		33647 {
+			>
+				emit {VAX single precision APL workspace}
+			<
+		}
+		65381 {
+			>
+				emit {old 32-bit-int little-endian archive}
+				if {[S string 4 0 {} {} eq __.SYMDEF]} {
+					>
+						emit {random library}
+					<
+				}
+	
+			<
+		}
+		65389 {
+			>
+				emit {very old 32-bit-int little-endian archive}
+			<
+		}
+		220991 {
+			>
+				if {[N uleshort [I 4 ulelong 0 + 0 9] 0 0 {} {} == 10555]} {
+					>
+						emit MS
+						if {[S string 212 0 {} {} eq \x62\x6D\x66\x01\x00]} {
+							>
+								emit {Windows help annotation}
+								mime application/x-winhelp
+								ext ann
+							<
+						}
+	
+						if {[S string 212 0 {} {} ne \x62\x6D\x66\x01\x00]} {
+							>
+								if {[S string [I 4 ulelong 0 + 0 101] 0 {} {} eq |Pete]} {
+									>
+										emit {Windows help Global Index}
+										mime application/x-winhelp
+										ext gid
+									<
+								}
+	
+								if {[S string [I 4 ulelong 0 + 0 101] 0 {} {} ne |Pete]} {
+									>
+										if {[S search 16 0 {} 18863 eq s]} {
+											>
+												emit {\x6c\x03}
+												U 275 help-ver-date [R 0]
+	
+												if {[N leshort [R 4] 0 0 {} {} != 1]} {
+													>
+														if {[S search [R 0] 0 {} 27055 eq s]} {
+															>
+																emit {\x6c\x03}
+																U 275 help-ver-date [R 0]
+	
+																if {[N leshort [R 4] 0 0 {} {} != 1]} {
+																	>
+																		if {[S search [R 0] 0 {} 18863 eq s]} {
+																			>
+																				emit {\x6c\x03}
+																				U 275 help-ver-date [R 0]
+	
+																				if {[N leshort [R 4] 0 0 {} {} != 1]} {
+																					>
+																						if {[S search [R 0] 0 {} 18863 eq s]} {
+																							>
+																								emit {\x6c\x03}
+																								U 275 help-ver-date [R 0]
+	
+																								if {[N leshort [R 4] 0 0 {} {} != 1]} {
+																									>
+																										if {[S search [R 0] 0 {} 18863 eq s]} {
+																											>
+																												emit {\x6c\x03}
+																												U 275 help-ver-date [R 0]
+	
+																												if {[N leshort [R 4] 0 0 {} {} != 1]} {
+																													>
+																														if {[S search [R 0] 0 {} 18863 eq s]} {
+																															>
+																																emit {\x6c\x03}
+																																U 275 help-ver-date [R 0]
+	
+																																if {[N leshort [R 4] 0 0 {} {} != 1]} {
+																																	>
+																																		if {[S search [R 0] 0 {} 18863 eq s]} {
+																																			>
+																																				emit {\x6c\x03}
+																																				U 275 help-ver-date [R 0]
+	
+																																				if {[N leshort [R 4] 0 0 {} {} != 1]} {
+																																					>
+																																						emit {Windows y.z help}
+																																						mime application/winhelp
+																																						ext hlp
+																																					<
+																																				}
+	
+																																			<
+																																		}
+	
+																																	<
+																																}
+	
+																															<
+																														}
+	
+																													<
+																												}
+	
+																											<
+																										}
+	
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+										if {[S search 16 0 {} 18863 eq s]} {
+											>
+												emit {\x6c\x03}
+											<
+										}
+	
+										if {[D 16]} {
+											>
+												emit {Windows help Bookmark}
+												mime application/x-winhelp
+												ext bmk
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+						if {[N lelong 12 0 0 {} {} x {}]} {
+							>
+								emit {\b, %d bytes}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		236525 {
+			>
+				emit {PDP-11 old archive}
+			<
+		}
+		236526 {
+			>
+				emit {PDP-11 4.0 archive}
+			<
+		}
+		340322 {
+			>
+				emit {Berkeley DB 1.85/1.86}
+				if {[N lelong 4 0 0 {} {} > 0]} {
+					>
+						emit {(Btree, version %d, little-endian)}
+					<
+				}
+	
+			<
+		}
+		459106 {
+			>
+				emit {LFS filesystem image}
+				switch [Nv lelong 4 0 {} {}] {
+					1 {
+						>
+							emit {version 1,}
+							if {[N lelong 8 0 0 {} {} x {}]} {
+								>
+									emit {\b blocks %u,}
+								<
+							}
+	
+							if {[N lelong 12 0 0 {} {} x {}]} {
+								>
+									emit {\b blocks per segment %u,}
+								<
+							}
+	
+						<
+					}
+					2 {
+						>
+							emit {version 2,}
+							if {[N lelong 8 0 0 {} {} x {}]} {
+								>
+									emit {\b fragments %u,}
+								<
+							}
+	
+							if {[N lelong 12 0 0 {} {} x {}]} {
+								>
+									emit {\b bytes per segment %u,}
+								<
+							}
+	
+						<
+					}
+				}
+	
+				if {[N lelong 16 0 0 {} {} x {}]} {
+					>
+						emit {\b disk blocks %u,}
+					<
+				}
+	
+				if {[N lelong 20 0 0 {} {} x {}]} {
+					>
+						emit {\b block size %u,}
+					<
+				}
+	
+				if {[N lelong 24 0 0 {} {} x {}]} {
+					>
+						emit {\b fragment size %u,}
+					<
+				}
+	
+				if {[N lelong 28 0 0 {} {} x {}]} {
+					>
+						emit {\b fragments per block %u,}
+					<
+				}
+	
+				if {[N lelong 32 0 0 {} {} x {}]} {
+					>
+						emit {\b start for free list %u,}
+					<
+				}
+	
+				if {[N lelong 36 0 0 {} {} x {}]} {
+					>
+						emit {\b number of free blocks %d,}
+					<
+				}
+	
+				if {[N lelong 40 0 0 {} {} x {}]} {
+					>
+						emit {\b number of files %u,}
+					<
+				}
+	
+				if {[N lelong 44 0 0 {} {} x {}]} {
+					>
+						emit {\b blocks available for writing %d,}
+					<
+				}
+	
+				if {[N lelong 48 0 0 {} {} x {}]} {
+					>
+						emit {\b inodes in cache %d,}
+					<
+				}
+	
+				if {[N lelong 52 0 0 {} {} x {}]} {
+					>
+						emit {\b inode file disk address 0x%x,}
+					<
+				}
+	
+				if {[N lelong 56 0 0 {} {} x {}]} {
+					>
+						emit {\b inode file inode number %u,}
+					<
+				}
+	
+				if {[N lelong 60 0 0 {} {} x {}]} {
+					>
+						emit {\b address of last segment written 0x%x,}
+					<
+				}
+	
+				if {[N lelong 64 0 0 {} {} x {}]} {
+					>
+						emit {\b address of next segment to write 0x%x,}
+					<
+				}
+	
+				if {[N lelong 68 0 0 {} {} x {}]} {
+					>
+						emit {\b address of current segment written 0x%x}
+					<
+				}
+	
+			<
+		}
+		459141 {
+			>
+				emit {ECOFF NetBSD/alpha binary}
+				switch [Nv leshort 10 0 {} {}] {
+					0 {
+						>
+							emit stripped
+						<
+					}
+					1 {
+						>
+							emit {not stripped}
+						<
+					}
+				}
+	
+			<
+		}
+		524291 {
+			>
+				emit {Android binary XML}
+			<
+		}
+		1638399 {
+			>
+				emit {GEM Metafile data}
+				if {[N leshort 4 0 0 {} {} x {}]} {
+					>
+						emit {version %d}
+					<
+				}
+	
+			<
+		}
+		6553804 {
+			>
+				emit {Linux/i386 demand-paged executable (QMAGIC)}
+				if {[N lelong 16 0 0 {} {} == 0]} {
+					>
+						emit {\b, stripped}
+					<
+				}
+	
+			<
+		}
+		6553863 {
+			>
+				emit {Linux/i386 impure executable (OMAGIC)}
+				if {[N lelong 16 0 0 {} {} == 0]} {
+					>
+						emit {\b, stripped}
+					<
+				}
+	
+			<
+		}
+		6553864 {
+			>
+				emit {Linux/i386 pure executable (NMAGIC)}
+				if {[N lelong 16 0 0 {} {} == 0]} {
+					>
+						emit {\b, stripped}
+					<
+				}
+	
+			<
+		}
+		6553867 {
+			>
+				emit {Linux/i386 demand-paged executable (ZMAGIC)}
+				if {[N lelong 16 0 0 {} {} == 0]} {
+					>
+						emit {\b, stripped}
+					<
+				}
+	
+			<
+		}
+		6583086 {
+			>
+				emit {DEC audio data:}
+				switch [Nv lelong 12 0 {} {}] {
+					1 {
+						>
+							emit {8-bit ISDN mu-law,}
+							mime audio/x-dec-basic
+						<
+					}
+					2 {
+						>
+							emit {8-bit linear PCM [REF-PCM],}
+							mime audio/x-dec-basic
+						<
+					}
+					3 {
+						>
+							emit {16-bit linear PCM,}
+							mime audio/x-dec-basic
+						<
+					}
+					4 {
+						>
+							emit {24-bit linear PCM,}
+							mime audio/x-dec-basic
+						<
+					}
+					5 {
+						>
+							emit {32-bit linear PCM,}
+							mime audio/x-dec-basic
+						<
+					}
+					6 {
+						>
+							emit {32-bit IEEE floating point,}
+							mime audio/x-dec-basic
+						<
+					}
+					7 {
+						>
+							emit {64-bit IEEE floating point,}
+							mime audio/x-dec-basic
+						<
+					}
+					23 {
+						>
+							emit {8-bit ISDN mu-law compressed (CCITT G.721 ADPCM voice enc.),}
+							mime audio/x-dec-basic
+						<
+					}
+				}
+	
+				switch [Nv belong 12 0 {} {}] {
+					8 {
+						>
+							emit {Fragmented sample data,}
+						<
+					}
+					10 {
+						>
+							emit {DSP program,}
+						<
+					}
+					11 {
+						>
+							emit {8-bit fixed point,}
+						<
+					}
+					12 {
+						>
+							emit {16-bit fixed point,}
+						<
+					}
+					13 {
+						>
+							emit {24-bit fixed point,}
+						<
+					}
+					14 {
+						>
+							emit {32-bit fixed point,}
+						<
+					}
+					18 {
+						>
+							emit {16-bit linear with emphasis,}
+						<
+					}
+					19 {
+						>
+							emit {16-bit linear compressed,}
+						<
+					}
+					20 {
+						>
+							emit {16-bit linear with emphasis and compression,}
+						<
+					}
+					21 {
+						>
+							emit {Music kit DSP commands,}
+						<
+					}
+					24 {
+						>
+							emit {compressed (8-bit CCITT G.722 ADPCM)}
+						<
+					}
+					25 {
+						>
+							emit {compressed (3-bit CCITT G.723.3 ADPCM),}
+						<
+					}
+					26 {
+						>
+							emit {compressed (5-bit CCITT G.723.5 ADPCM),}
+						<
+					}
+					27 {
+						>
+							emit {8-bit A-law (CCITT G.711),}
+						<
+					}
+				}
+	
+				switch [Nv lelong 20 0 {} {}] {
+					1 {
+						>
+							emit mono,
+						<
+					}
+					2 {
+						>
+							emit stereo,
+						<
+					}
+					4 {
+						>
+							emit quad,
+						<
+					}
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {%d Hz}
+					<
+				}
+	
+			<
+		}
+		16922978 {
+			>
+				emit {mdbm file, version 0 (obsolete)}
+			<
+		}
+		20000630 {
+			>
+				emit {OpenEXR image data,}
+				mime image/x-exr
+				if {[N lelong 4 0 0 & 255 x {}]} {
+					>
+						emit {version %d,}
+					<
+				}
+	
+				if {[N lelong 4 0 0 {} {} ^ 512]} {
+					>
+						emit {storage: scanline}
+					<
+				}
+	
+				if {[N lelong 4 0 0 {} {} & 512]} {
+					>
+						emit {storage: tiled}
+					<
+				}
+	
+				if {[S search 8 0 {} 4096 eq compression\0]} {
+					>
+						emit {\b, compression:}
+						switch [Nv byte [R 16] 0 {} {}] {
+							0 {
+								>
+									emit none
+								<
+							}
+							1 {
+								>
+									emit rle
+								<
+							}
+							2 {
+								>
+									emit zips
+								<
+							}
+							3 {
+								>
+									emit zip
+								<
+							}
+							4 {
+								>
+									emit piz
+								<
+							}
+							5 {
+								>
+									emit pxr24
+								<
+							}
+							6 {
+								>
+									emit b44
+								<
+							}
+							7 {
+								>
+									emit b44a
+								<
+							}
+							8 {
+								>
+									emit dwaa
+								<
+							}
+							9 {
+								>
+									emit dwab
+								<
+							}
+						}
+	
+						if {[N byte [R 16] 0 0 {} {} > 9]} {
+							>
+								emit unknown
+							<
+						}
+	
+					<
+				}
+	
+				if {[S search 8 0 {} 4096 eq dataWindow\0]} {
+					>
+						emit {\b, dataWindow:}
+						if {[N lelong [R 10] 0 0 {} {} x {}]} {
+							>
+								emit (%d
+							<
+						}
+	
+						if {[N lelong [R 14] 0 0 {} {} x {}]} {
+							>
+								emit %d)-
+							<
+						}
+	
+						if {[N lelong [R 18] 0 0 {} {} x {}]} {
+							>
+								emit {\b(%d}
+							<
+						}
+	
+						if {[N lelong [R 22] 0 0 {} {} x {}]} {
+							>
+								emit %d)
+							<
+						}
+	
+					<
+				}
+	
+				if {[S search 8 0 {} 4096 eq displayWindow\0]} {
+					>
+						emit {\b, displayWindow:}
+						if {[N lelong [R 10] 0 0 {} {} x {}]} {
+							>
+								emit (%d
+							<
+						}
+	
+						if {[N lelong [R 14] 0 0 {} {} x {}]} {
+							>
+								emit %d)-
+							<
+						}
+	
+						if {[N lelong [R 18] 0 0 {} {} x {}]} {
+							>
+								emit {\b(%d}
+							<
+						}
+	
+						if {[N lelong [R 22] 0 0 {} {} x {}]} {
+							>
+								emit %d)
+							<
+						}
+	
+					<
+				}
+	
+				if {[S search 8 0 {} 4096 eq lineOrder\0]} {
+					>
+						emit {\b, lineOrder:}
+						switch [Nv byte [R 14] 0 {} {}] {
+							0 {
+								>
+									emit {increasing y}
+								<
+							}
+							1 {
+								>
+									emit {decreasing y}
+								<
+							}
+							2 {
+								>
+									emit {random y}
+								<
+							}
+						}
+	
+						if {[N byte [R 14] 0 0 {} {} > 2]} {
+							>
+								emit unknown
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		38177486 {
+			>
+				emit {Bochs Sparse disk image}
+			<
+		}
+		101718065 {
+			>
+				if {[N leshort 22 0 0 {} {} == 0]} {
+					>
+						emit {UBIfs image}
+					<
+				}
+	
+				if {[N lequad 8 0 0 {} {} x {}]} {
+					>
+						emit {\b, sequence number %llu}
+					<
+				}
+	
+				if {[N leshort 16 0 0 {} {} x {}]} {
+					>
+						emit {\b, length %u}
+					<
+				}
+	
+				if {[N lelong 4 0 0 {} {} x {}]} {
+					>
+						emit {\b, CRC 0x%08x}
+					<
+				}
+	
+			<
+		}
+		119734787 {
+			>
+				emit {Khronos SPIR-V binary, little-endian}
+				if {[N lelong 4 0 0 {} {} x {}]} {
+					>
+						emit {\b, version 0x%08x}
+					<
+				}
+	
+				if {[N lelong 8 0 0 {} {} x {}]} {
+					>
+						emit {\b, generator 0x%08x}
+					<
+				}
+	
+			<
+		}
+		134761296 {
+			>
+				emit {TurboC Font file}
+			<
+		}
+		134769520 {
+			>
+				emit {TurboC BGI file}
+			<
+		}
+		186106078 {
+			>
+				emit {LLVM bitcode, wrapper}
+				switch [Nv lelong 16 0 {} {}] {
+					7 {
+						>
+							emit i386
+						<
+					}
+					12 {
+						>
+							emit arm
+						<
+					}
+					18 {
+						>
+							emit ppc
+						<
+					}
+					16777223 {
+						>
+							emit x86_64
+						<
+					}
+					16777234 {
+						>
+							emit ppc64
+						<
+					}
+				}
+	
+			<
+		}
+		250739385 {
+			>
+				switch [Nv lelong 4 0 {} {}] {
+					1 {
+						>
+							emit {Universal EFI binary with 1 architecture}
+							switch [Nv lelong [R 0] 0 {} {}] {
+								7 {
+									>
+										emit {\b, i386}
+									<
+								}
+								16777223 {
+									>
+										emit {\b, x86_64}
+									<
+								}
+							}
+	
+						<
+					}
+					2 {
+						>
+							emit {Universal EFI binary with 2 architectures}
+							switch [Nv lelong [R 0] 0 {} {}] {
+								7 {
+									>
+										emit {\b, i386}
+									<
+								}
+								16777223 {
+									>
+										emit {\b, x86_64}
+									<
+								}
+							}
+	
+							switch [Nv lelong [R 20] 0 {} {}] {
+								7 {
+									>
+										emit {\b, i386}
+									<
+								}
+								16777223 {
+									>
+										emit {\b, x86_64}
+									<
+								}
+							}
+	
+						<
+					}
+				}
+	
+				if {[N lelong 4 0 0 {} {} > 2]} {
+					>
+						emit {Universal EFI binary with %d architectures}
+					<
+				}
+	
+			<
+		}
+		267429210 {
+			>
+				emit {Intel serial flash for ICH/PCH ROM <= 5 or 3400 series A-step}
+			<
+		}
+		268435511 {
+			>
+				emit {Psion Series 5}
+				switch [Nv lelong 4 0 {} {}] {
+					268435513 {
+						>
+							emit {font file}
+						<
+					}
+					268435514 {
+						>
+							emit {printer driver}
+						<
+					}
+					268435515 {
+						>
+							emit clipboard
+						<
+					}
+					268435522 {
+						>
+							emit {multi-bitmap image}
+							mime image/x-epoc-mbm
+						<
+					}
+					268435562 {
+						>
+							emit {application information file}
+						<
+					}
+					268435565 {
+						>
+							switch [Nv lelong 8 0 {} {}] {
+								268435581 {
+									>
+										emit {Sketch image}
+										mime image/x-epoc-sketch
+									<
+								}
+								268435582 {
+									>
+										emit {voice note}
+									<
+								}
+								268435583 {
+									>
+										emit {Word file}
+										mime application/x-epoc-word
+									<
+								}
+								268435589 {
+									>
+										emit {OPL program (TextEd)}
+										mime application/x-epoc-opl
+									<
+								}
+								268435591 {
+									>
+										emit {Comms settings}
+									<
+								}
+								268435592 {
+									>
+										emit {Sheet file}
+										mime application/x-epoc-sheet
+									<
+								}
+								268435908 {
+									>
+										emit {EasyFax initialisation file}
+									<
+								}
+							}
+	
+						<
+					}
+					268435571 {
+						>
+							emit {OPO module}
+							mime application/x-epoc-opo
+						<
+					}
+					268435572 {
+						>
+							emit {OPL application}
+							mime application/x-epoc-app
+						<
+					}
+					268435594 {
+						>
+							emit {exported multi-bitmap image}
+						<
+					}
+					268435821 {
+						>
+							if {[N lelong 8 0 0 {} {} == 268435591]} {
+								>
+									emit {Comms names}
+								<
+							}
+	
+						<
+					}
+				}
+	
+			<
+		}
+		268435521 {
+			>
+				emit {Psion Series 5 ROM multi-bitmap image}
+			<
+		}
+		268435536 {
+			>
+				emit {Psion Series 5}
+				switch [Nv lelong 4 0 {} {}] {
+					268435565 {
+						>
+							emit database
+							switch [Nv lelong 8 0 {} {}] {
+								268435588 {
+									>
+										emit {Agenda file}
+										mime application/x-epoc-agenda
+									<
+								}
+								268435590 {
+									>
+										emit {Data file}
+										mime application/x-epoc-data
+									<
+								}
+								268438762 {
+									>
+										emit {Jotter file}
+										mime application/x-epoc-jotter
+									<
+								}
+							}
+	
+						<
+					}
+					268435684 {
+						>
+							emit {ini file}
+						<
+					}
+				}
+	
+			<
+		}
+		268435577 {
+			>
+				emit {Psion Series 5 binary:}
+				switch [Nv lelong 4 0 {} {}] {
+					0 {
+						>
+							emit DLL
+						<
+					}
+					268435529 {
+						>
+							emit {comms hardware library}
+						<
+					}
+					268435530 {
+						>
+							emit {comms protocol library}
+						<
+					}
+					268435549 {
+						>
+							emit OPX
+						<
+					}
+					268435564 {
+						>
+							emit application
+						<
+					}
+					268435597 {
+						>
+							emit DLL
+						<
+					}
+					268435628 {
+						>
+							emit {logical device driver}
+						<
+					}
+					268435629 {
+						>
+							emit {physical device driver}
+						<
+					}
+					268435685 {
+						>
+							emit {file transfer protocol}
+						<
+						>
+							emit {file transfer protocol}
+						<
+					}
+					268435776 {
+						>
+							emit {printer definition}
+						<
+					}
+					268435777 {
+						>
+							emit {printer definition}
+						<
+					}
+				}
+	
+			<
+		}
+		268435578 {
+			>
+				emit {Psion Series 5 executable}
+			<
+		}
+		270539386 {
+			>
+				emit {Symbian installation file (Symbian OS 9.x)}
+				mime x-epoc/x-sisx-app
+			<
+		}
+		320013059 {
+			>
+				emit {SpeedShop data file}
+			<
+		}
+		324508365 {
+			>
+				emit {GNU dbm 1.x or ndbm database, little endian, 32-bit}
+				mime application/x-gdbm
+			<
+		}
+		324508366 {
+			>
+				emit {GNU dbm 1.x or ndbm database, little endian, old}
+				mime application/x-gdbm
+			<
+		}
+		324508367 {
+			>
+				emit {GNU dbm 1.x or ndbm database, little endian, 64-bit}
+				mime application/x-gdbm
+			<
+		}
+		329904510 {
+			>
+				emit {ST40 component image format}
+				if {[S string 4 0 {} {} > \0]} {
+					>
+						emit {\b, name '%s'}
+					<
+				}
+	
+			<
+		}
+		336851773 {
+			>
+				emit {SYSLINUX' LSS16 image data}
+				mime image/x-lss16
+				if {[N leshort 4 0 0 {} {} x {}]} {
+					>
+						emit {\b, width %d}
+					<
+				}
+	
+				if {[N leshort 6 0 0 {} {} x {}]} {
+					>
+						emit {\b, height %d}
+					<
+				}
+	
+			<
+		}
+		407642370 {
+			>
+				emit {LZ4 compressed data (v0.1-v0.9)}
+				mime application/x-lz4
+			<
+		}
+		407642371 {
+			>
+				emit {LZ4 compressed data (v1.0-v1.3)}
+				mime application/x-lz4
+			<
+		}
+		407708164 {
+			>
+				emit {LZ4 compressed data (v1.4+)}
+				mime application/x-lz4
+			<
+		}
+		453186358 {
+			>
+				emit {L	Netboot image,}
+				if {[N lelong 4 0 0 & -256 == 0]} {
+					>
+						switch [Nv lelong 4 0 & 256] {
+							0 {
+								>
+									emit {mode 2}
+								<
+							}
+							256 {
+								>
+									emit {mode 3}
+								<
+							}
+						}
+	
+					<
+				}
+	
+				if {[N lelong 4 0 0 & -256 != 0]} {
+					>
+						emit {unknown mode}
+					<
+				}
+	
+			<
+		}
+		536937252 {
+			>
+				emit {gconv module configuration cache data}
+			<
+		}
+		574529400 {
+			>
+				emit {Transport Neutral Encapsulation Format}
+				mime application/vnd.ms-tnef
+			<
+			>
+				emit TNEF
+				mime application/vnd.ms-tnef
+			<
+		}
+		592003669 {
+			>
+				if {[N leshort 4 0 0 {} {} < 2]} {
+					>
+					<
+				}
+	
+				if {[S string 5 0 {} {} eq \0\0\0]} {
+					>
+					<
+				}
+	
+				if {[S string 28 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+					>
+					<
+				}
+	
+				if {[N leshort 4 0 0 {} {} x {}]} {
+					>
+						emit {UBI image, version %u}
+					<
+				}
+	
+			<
+		}
+		684539205 {
+			>
+				emit {Linux Compressed ROM File System data, little endian}
+				if {[N lelong 4 0 0 {} {} x {}]} {
+					>
+						emit {size %u}
+					<
+				}
+	
+				if {[N lelong 8 0 0 {} {} & 1]} {
+					>
+						emit {version #2}
+					<
+				}
+	
+				if {[N lelong 8 0 0 {} {} & 2]} {
+					>
+						emit sorted_dirs
+					<
+				}
+	
+				if {[N lelong 8 0 0 {} {} & 4]} {
+					>
+						emit hole_support
+					<
+				}
+	
+				if {[N lelong 32 0 0 {} {} x {}]} {
+					>
+						emit {CRC 0x%x,}
+					<
+				}
+	
+				if {[N lelong 36 0 0 {} {} x {}]} {
+					>
+						emit {edition %u,}
+					<
+				}
+	
+				if {[N lelong 40 0 0 {} {} x {}]} {
+					>
+						emit {%u blocks,}
+					<
+				}
+	
+				if {[N lelong 44 0 0 {} {} x {}]} {
+					>
+						emit {%u files}
+					<
+				}
+	
+			<
+		}
+		876099889 {
+			>
+				emit {Linux Journalled Flash File system, little endian}
+			<
+		}
+		987654321 {
+			>
+				emit {DCX multi-page PCX image data}
+			<
+		}
+		1160843812 {
+			>
+				emit {iproute2 routes dump}
+			<
+		}
+		1194725922 {
+			>
+				emit {iproute2 addresses dump}
+			<
+		}
+		1279543401 {
+			>
+				emit {ld.so hints file (Little Endian}
+				if {[N lelong 4 0 0 {} {} > 0]} {
+					>
+						emit {\b, version %d)}
+					<
+				}
+	
+				if {[N belong 4 0 0 {} {} < 1]} {
+					>
+						emit {\b)}
+					<
+				}
+	
+			<
+		}
+		1313096225 {
+			>
+				emit {Microsoft Outlook email folder}
+				switch [Nv leshort 10 0 {} {}] {
+					14 {
+						>
+							emit (<=2002)
+						<
+					}
+					23 {
+						>
+							emit (>=2003)
+						<
+					}
+				}
+	
+			<
+		}
+		1414939417 {
+			>
+				emit {CRIU image file v1.1}
+			<
+		}
+		1427134784 {
+			>
+				emit {CRIU service file}
+			<
+		}
+		1437209140 {
+			>
+				emit {Valve Pak file}
+				if {[N lelong 4 0 0 {} {} x {}]} {
+					>
+						emit {\b, version %u}
+					<
+				}
+	
+				if {[N lelong 8 0 0 {} {} x {}]} {
+					>
+						emit {\b, %u entries}
+					<
+				}
+	
+			<
+		}
+		1479618838 {
+			>
+				emit {CRIU inventory}
+			<
+		}
+		1554098963 {
+			>
+				emit ASTC
+				if {[N byte 4 0 0 {} {} x {}]} {
+					>
+						emit %u
+					<
+				}
+	
+				if {[N byte 5 0 0 {} {} x {}]} {
+					>
+						emit {\bx%u}
+					<
+				}
+	
+				if {[N byte 6 0 0 {} {} > 1]} {
+					>
+						emit {\bx%u}
+					<
+				}
+	
+				if {[N lelong 7 0 0 & 16777215 x {}]} {
+					>
+						emit {texture, %u}
+					<
+				}
+	
+				if {[N lelong 10 0 0 & 16777215 x {}]} {
+					>
+						emit {x %u}
+					<
+				}
+	
+				if {[N lelong 13 0 0 & 16777215 > 1]} {
+					>
+						emit {x %u}
+					<
+				}
+	
+			<
+		}
+		1734567009 {
+			>
+				emit {GCC gcda coverage (-fprofile-arcs),}
+				if {[N byte [R 3] 0 0 {} {} x {}]} {
+					>
+						emit {version %c.}
+					<
+				}
+	
+				if {[N byte [R 1] 0 0 {} {} x {}]} {
+					>
+						emit {\b%c}
+					<
+				}
+	
+			<
+		}
+		1734569583 {
+			>
+				emit {GCC gcno coverage (-ftest-coverage),}
+				if {[N byte [R 3] 0 0 {} {} x {}]} {
+					>
+						emit {version %c.}
+					<
+				}
+	
+				if {[N byte [R 1] 0 0 {} {} x {}]} {
+					>
+						emit {\b%c}
+					<
+				}
+	
+			<
+		}
+		1886869041 {
+			>
+				emit {Cracklib password index, little endian}
+				if {[N long 4 0 0 {} {} > 0]} {
+					>
+						emit {(%i words)}
+					<
+				}
+	
+				if {[N long 4 0 0 {} {} == 0]} {
+					>
+						emit (\"64-bit\")
+						if {[N long 8 0 0 {} {} > -1]} {
+							>
+								emit {(%i words)}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		1976638807 {
+			>
+				emit {Common Trace Format (CTF) packetized metadata (LE)}
+				if {[N byte 35 0 0 {} {} x {}]} {
+					>
+						emit {\b, v%d}
+					<
+				}
+	
+				if {[N byte 36 0 0 {} {} x {}]} {
+					>
+						emit {\b.%d}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq MOVI]} {
+		>
+			emit {Silicon Graphics movie file}
+			mime video/x-sgi-movie
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq moov]} {
+		>
+			emit {Apple QuickTime}
+			if {[S string 12 0 {} {} eq mvhd]} {
+				>
+					emit {\b movie (fast start)}
+				<
+			}
+	
+			if {[S string 12 0 {} {} eq mdra]} {
+				>
+					emit {\b URL}
+				<
+			}
+	
+			if {[S string 12 0 {} {} eq cmov]} {
+				>
+					emit {\b movie (fast start, compressed header)}
+				<
+			}
+	
+			if {[S string 12 0 {} {} eq rmra]} {
+				>
+					emit {\b multiple URLs}
+				<
+			}
+	
+			mime video/quicktime
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq mdat]} {
+		>
+			emit {Apple QuickTime movie (unoptimized)}
+			mime video/quicktime
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq idsc]} {
+		>
+			emit {Apple QuickTime image (fast start)}
+			mime image/x-quicktime
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq pckg]} {
+		>
+			emit {Apple QuickTime compressed archive}
+			mime application/x-quicktime-player
+		<
+	}
+	
+	if {[S string 4 0 W {} eq jP]} {
+		>
+			emit {JPEG 2000 image}
+			mime image/jp2
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq ftyp]} {
+		>
+			emit {ISO Media}
+			if {[S string 8 0 {} {} eq XAVC]} {
+				>
+					emit {\b, MPEG v4 system, Sony XAVC Codec}
+					if {[S string 96 0 {} {} x {}]} {
+						>
+							emit {\b, Audio "%.4s"}
+						<
+					}
+	
+					if {[N beshort 118 0 0 {} {} x {}]} {
+						>
+							emit {at %dHz}
+						<
+					}
+	
+					if {[S string 140 0 {} {} x {}]} {
+						>
+							emit {\b, Video "%.4s"}
+						<
+					}
+	
+					if {[N beshort 168 0 0 {} {} x {}]} {
+						>
+							emit %d
+						<
+					}
+	
+					if {[N beshort 170 0 0 {} {} x {}]} {
+						>
+							emit {\bx%d}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq 3g2]} {
+				>
+					emit {\b, MPEG v4 system, 3GPP2}
+					switch [Nv byte 11 0 {} {}] {
+						4 {
+							>
+								emit {\b v4 (H.263/AMR GSM 6.10)}
+							<
+						}
+						5 {
+							>
+								emit {\b v5 (H.263/AMR GSM 6.10)}
+							<
+						}
+						6 {
+							>
+								emit {\b v6 (ITU H.264/AMR GSM 6.10)}
+							<
+						}
+						97 {
+							>
+								emit {\b C.S0050-0 V1.0}
+							<
+						}
+						98 {
+							>
+								emit {\b C.S0050-0-A V1.0.0}
+							<
+						}
+						99 {
+							>
+								emit {\b C.S0050-0-B V1.0}
+							<
+						}
+					}
+	
+					mime video/3gpp2
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq 3ge]} {
+				>
+					emit {\b, MPEG v4 system, 3GPP}
+					switch [Nv byte 11 0 {} {}] {
+						6 {
+							>
+								emit {\b, Release 6 MBMS Extended Presentations}
+							<
+						}
+						7 {
+							>
+								emit {\b, Release 7 MBMS Extended Presentations}
+							<
+						}
+					}
+	
+					mime video/3gpp
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq 3gg]} {
+				>
+					emit {\b, MPEG v4 system, 3GPP}
+					if {[N byte 11 0 0 {} {} == 6]} {
+						>
+							emit {\b, Release 6 General Profile}
+						<
+					}
+	
+					mime video/3gpp
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq 3gp]} {
+				>
+					emit {\b, MPEG v4 system, 3GPP}
+					switch [Nv byte 11 0 {} {}] {
+						1 {
+							>
+								emit {\b, Release %d (non existent)}
+							<
+						}
+						2 {
+							>
+								emit {\b, Release %d (non existent)}
+							<
+						}
+						3 {
+							>
+								emit {\b, Release %d (non existent)}
+							<
+						}
+						4 {
+							>
+								emit {\b, Release %d}
+							<
+						}
+						5 {
+							>
+								emit {\b, Release %d}
+							<
+						}
+						6 {
+							>
+								emit {\b, Release %d}
+							<
+						}
+						7 {
+							>
+								emit {\b, Release %d Streaming Servers}
+							<
+						}
+					}
+	
+					mime video/3gpp
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq 3gs]} {
+				>
+					emit {\b, MPEG v4 system, 3GPP}
+					if {[N byte 11 0 0 {} {} == 7]} {
+						>
+							emit {\b, Release %d Streaming Servers}
+						<
+					}
+	
+					mime video/3gpp
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq avc1]} {
+				>
+					emit {\b, MPEG v4 system, 3GPP JVT AVC [ISO 14496-12:2005]}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 W {} eq qt]} {
+				>
+					emit {\b, Apple QuickTime movie}
+					mime video/quicktime
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq CAEP]} {
+				>
+					emit {\b, Canon Digital Camera}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq caqv]} {
+				>
+					emit {\b, Casio Digital Camera}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq CDes]} {
+				>
+					emit {\b, Convergent Design}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq da0a]} {
+				>
+					emit {\b, DMB MAF w/ MPEG Layer II aud, MOT slides, DLS, JPG/PNG/MNG}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq da0b]} {
+				>
+					emit {\b, DMB MAF, ext DA0A, with 3GPP timed text, DID, TVA, REL, IPMP}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq da1a]} {
+				>
+					emit {\b, DMB MAF audio with ER-BSAC audio, JPG/PNG/MNG images}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq da1b]} {
+				>
+					emit {\b, DMB MAF, ext da1a, with 3GPP timed text, DID, TVA, REL, IPMP}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq da2a]} {
+				>
+					emit {\b, DMB MAF aud w/ HE-AAC v2 aud, MOT slides, DLS, JPG/PNG/MNG}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq da2b]} {
+				>
+					emit {\b, DMB MAF, ext da2a, with 3GPP timed text, DID, TVA, REL, IPMP}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq da3a]} {
+				>
+					emit {\b, DMB MAF aud with HE-AAC aud, JPG/PNG/MNG images}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq da3b]} {
+				>
+					emit {\b, DMB MAF, ext da3a w/ BIFS, 3GPP, DID, TVA, REL, IPMP}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq dash]} {
+				>
+					emit {\b, MPEG v4 system, Dynamic Adaptive Streaming over HTTP}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq dmb1]} {
+				>
+					emit {\b, DMB MAF supporting all the components defined in the spec}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq dmpf]} {
+				>
+					emit {\b, Digital Media Project}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq drc1]} {
+				>
+					emit {\b, Dirac (wavelet compression), encap in ISO base media (MP4)}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq dv1a]} {
+				>
+					emit {\b, DMB MAF vid w/ AVC vid, ER-BSAC aud, BIFS, JPG/PNG/MNG, TS}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq dv1b]} {
+				>
+					emit {\b, DMB MAF, ext dv1a, with 3GPP timed text, DID, TVA, REL, IPMP}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq dv2a]} {
+				>
+					emit {\b, DMB MAF vid w/ AVC vid, HE-AAC v2 aud, BIFS, JPG/PNG/MNG, TS}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq dv2b]} {
+				>
+					emit {\b, DMB MAF, ext dv2a, with 3GPP timed text, DID, TVA, REL, IPMP}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq dv3a]} {
+				>
+					emit {\b, DMB MAF vid w/ AVC vid, HE-AAC aud, BIFS, JPG/PNG/MNG, TS}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq dv3b]} {
+				>
+					emit {\b, DMB MAF, ext dv3a, with 3GPP timed text, DID, TVA, REL, IPMP}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq dvr1]} {
+				>
+					emit {\b, DVB (.DVB) over RTP}
+					mime video/vnd.dvb.file
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq dvt1]} {
+				>
+					emit {\b, DVB (.DVB) over MPEG-2 Transport Stream}
+					mime video/vnd.dvb.file
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq F4V]} {
+				>
+					emit {\b, Video for Adobe Flash Player 9+ (.F4V)}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq F4P]} {
+				>
+					emit {\b, Protected Video for Adobe Flash Player 9+ (.F4P)}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq F4A]} {
+				>
+					emit {\b, Audio for Adobe Flash Player 9+ (.F4A)}
+					mime audio/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq F4B]} {
+				>
+					emit {\b, Audio Book for Adobe Flash Player 9+ (.F4B)}
+					mime audio/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq isc2]} {
+				>
+					emit {\b, ISMACryp 2.0 Encrypted File}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq iso2]} {
+				>
+					emit {\b, MP4 Base Media v2 [ISO 14496-12:2005]}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq isom]} {
+				>
+					emit {\b, MP4 Base Media v1 [IS0 14496-12:2003]}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 W {} eq jp2]} {
+				>
+					emit {\b, JPEG 2000}
+					mime image/jp2
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq JP2]} {
+				>
+					emit {\b, JPEG 2000 Image (.JP2) [ISO 15444-1 ?]}
+					mime image/jp2
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq JP20]} {
+				>
+					emit {\b, Unknown, from GPAC samples (prob non-existent)}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq jpm]} {
+				>
+					emit {\b, JPEG 2000 Compound Image (.JPM) [ISO 15444-6]}
+					mime image/jpm
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq jpx]} {
+				>
+					emit {\b, JPEG 2000 w/ extensions (.JPX) [ISO 15444-2]}
+					mime image/jpx
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq KDDI]} {
+				>
+					emit {\b, 3GPP2 EZmovie for KDDI 3G cellphones}
+					mime video/3gpp2
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq M4A]} {
+				>
+					emit {\b, Apple iTunes ALAC/AAC-LC (.M4A) Audio}
+					mime audio/x-m4a
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq M4B]} {
+				>
+					emit {\b, Apple iTunes ALAC/AAC-LC (.M4B) Audio Book}
+					mime audio/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq M4P]} {
+				>
+					emit {\b, Apple iTunes ALAC/AAC-LC (.M4P) AES Protected Audio}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq M4V]} {
+				>
+					emit {\b, Apple iTunes Video (.M4V) Video}
+					mime video/x-m4v
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq M4VH]} {
+				>
+					emit {\b, Apple TV (.M4V)}
+					mime video/x-m4v
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq M4VP]} {
+				>
+					emit {\b, Apple iPhone (.M4V)}
+					mime video/x-m4v
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq mj2s]} {
+				>
+					emit {\b, Motion JPEG 2000 [ISO 15444-3] Simple Profile}
+					mime video/mj2
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq mjp2]} {
+				>
+					emit {\b, Motion JPEG 2000 [ISO 15444-3] General Profile}
+					mime video/mj2
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq mmp4]} {
+				>
+					emit {\b, MPEG-4/3GPP Mobile Profile (.MP4 / .3GP) (for NTT)}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq mobi]} {
+				>
+					emit {\b, MPEG-4, MOBI format}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq mp21]} {
+				>
+					emit {\b, MPEG-21 [ISO/IEC 21000-9]}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq mp41]} {
+				>
+					emit {\b, MP4 v1 [ISO 14496-1:ch13]}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq mp42]} {
+				>
+					emit {\b, MP4 v2 [ISO 14496-14]}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq mp71]} {
+				>
+					emit {\b, MP4 w/ MPEG-7 Metadata [per ISO 14496-12]}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq mp7t]} {
+				>
+					emit {\b, MPEG v4 system, MPEG v7 XML}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq mp7b]} {
+				>
+					emit {\b, MPEG v4 system, MPEG v7 binary XML}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq mmp4]} {
+				>
+					emit {\b, MPEG v4 system, 3GPP Mobile}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq MPPI]} {
+				>
+					emit {\b, Photo Player, MAF [ISO/IEC 23000-3]}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq mqt]} {
+				>
+					emit {\b, Sony / Mobile QuickTime (.MQV) US Pat 7,477,830}
+					mime video/quicktime
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq MSNV]} {
+				>
+					emit {\b, MPEG-4 (.MP4) for SonyPSP}
+					mime audio/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq NDAS]} {
+				>
+					emit {\b, MP4 v2 [ISO 14496-14] Nero Digital AAC Audio}
+					mime audio/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq NDSC]} {
+				>
+					emit {\b, MPEG-4 (.MP4) Nero Cinema Profile}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq NDSH]} {
+				>
+					emit {\b, MPEG-4 (.MP4) Nero HDTV Profile}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq NDSM]} {
+				>
+					emit {\b, MPEG-4 (.MP4) Nero Mobile Profile}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq NDSP]} {
+				>
+					emit {\b, MPEG-4 (.MP4) Nero Portable Profile}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq NDSS]} {
+				>
+					emit {\b, MPEG-4 (.MP4) Nero Standard Profile}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq NDXC]} {
+				>
+					emit {\b, H.264/MPEG-4 AVC (.MP4) Nero Cinema Profile}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq NDXH]} {
+				>
+					emit {\b, H.264/MPEG-4 AVC (.MP4) Nero HDTV Profile}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq NDXM]} {
+				>
+					emit {\b, H.264/MPEG-4 AVC (.MP4) Nero Mobile Profile}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq NDXP]} {
+				>
+					emit {\b, H.264/MPEG-4 AVC (.MP4) Nero Portable Profile}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq NDXS]} {
+				>
+					emit {\b, H.264/MPEG-4 AVC (.MP4) Nero Standard Profile}
+					mime video/mp4
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq odcf]} {
+				>
+					emit {\b, OMA DCF DRM Format 2.0 (OMA-TS-DRM-DCF-V2_0-20060303-A)}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq opf2]} {
+				>
+					emit {\b, OMA PDCF DRM Format 2.1 (OMA-TS-DRM-DCF-V2_1-20070724-C)}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq opx2]} {
+				>
+					emit {\b, OMA PDCF DRM + XBS ext (OMA-TS-DRM_XBS-V1_0-20070529-C)}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq pana]} {
+				>
+					emit {\b, Panasonic Digital Camera}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq qt]} {
+				>
+					emit {\b, Apple QuickTime (.MOV/QT)}
+					mime video/quicktime
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq mif1]} {
+				>
+					emit {\b, HEIF Image}
+					mime image/heif
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq msf1]} {
+				>
+					emit {\b, HEIF Image Sequence}
+					mime image/heif-sequence
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq heic]} {
+				>
+					emit {\b, HEIF Image HEVC Main or Main Still Picture Profile}
+					mime image/heic
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq heix]} {
+				>
+					emit {\b, HEIF Image HEVC Main 10 Profile}
+					mime image/heic
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq hevc]} {
+				>
+					emit {\b, HEIF Image Sequenz HEVC Main or Main Still Picture Profile}
+					mime image/heic-sequence
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq hevx]} {
+				>
+					emit {\b, HEIF Image Sequence HEVC Main 10 Profile}
+					mime image/heic-sequence
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq heim]} {
+				>
+					emit {\b, HEIF Image L-HEVC}
+					mime image/heif
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq heis]} {
+				>
+					emit {\b, HEIF Image L-HEVC}
+					mime image/heif
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq avic]} {
+				>
+					emit {\b, HEIF Image AVC}
+					mime image/heif
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq hevm]} {
+				>
+					emit {\b, HEIF Image Sequence L-HEVC}
+					mime image/heif-sequence
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq hevs]} {
+				>
+					emit {\b, HEIF Image Sequence L-HEVC}
+					mime image/heif-sequence
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq avcs]} {
+				>
+					emit {\b, HEIF Image Sequence AVC}
+					mime image/heif-sequence
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq ROSS]} {
+				>
+					emit {\b, Ross Video}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq sdv]} {
+				>
+					emit {\b, SD Memory Card Video}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq ssc1]} {
+				>
+					emit {\b, Samsung stereo, single stream (patent pending)}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq ssc2]} {
+				>
+					emit {\b, Samsung stereo, dual stream (patent pending)}
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv belong 0 0 & -256] {
+		-2063526912 {
+			>
+				emit {cisco IOS microcode}
+				if {[S string 7 0 {} {} > \0]} {
+					>
+						emit {for '%s'}
+					<
+				}
+	
+			<
+		}
+		-2063480064 {
+			>
+				emit {cisco IOS experimental microcode}
+				if {[S string 7 0 {} {} > \0]} {
+					>
+						emit {for '%s'}
+					<
+				}
+	
+			<
+		}
+		-16907008 {
+			>
+				emit {MySQL ISAM index file}
+				if {[N byte 3 0 0 {} {} x {}]} {
+					>
+						emit {Version %d}
+					<
+				}
+	
+			<
+		}
+		-16906752 {
+			>
+				emit {MySQL ISAM compressed data file}
+				if {[N byte 3 0 0 {} {} x {}]} {
+					>
+						emit {Version %d}
+					<
+				}
+	
+			<
+		}
+		-16906496 {
+			>
+				emit {MySQL MyISAM index file}
+				if {[N byte 3 0 0 {} {} x {}]} {
+					>
+						emit {Version %d}
+					<
+				}
+	
+				if {[N beshort 14 0 0 {} {} x {}]} {
+					>
+						emit {\b, %d key parts}
+					<
+				}
+	
+				if {[N beshort 16 0 0 {} {} x {}]} {
+					>
+						emit {\b, %d unique key parts}
+					<
+				}
+	
+				if {[N byte 18 0 0 {} {} x {}]} {
+					>
+						emit {\b, %d keys}
+					<
+				}
+	
+				if {[N bequad 28 0 0 {} {} x {}]} {
+					>
+						emit {\b, %lld records}
+					<
+				}
+	
+				if {[N bequad 36 0 0 {} {} x {}]} {
+					>
+						emit {\b, %lld deleted records}
+					<
+				}
+	
+			<
+		}
+		-16906240 {
+			>
+				emit {MySQL MyISAM compressed data file}
+				if {[N byte 3 0 0 {} {} x {}]} {
+					>
+						emit {Version %d}
+					<
+				}
+	
+			<
+		}
+		-16905984 {
+			>
+				emit {MySQL Maria index file}
+				if {[N byte 3 0 0 {} {} x {}]} {
+					>
+						emit {Version %d}
+					<
+				}
+	
+			<
+		}
+		-16905728 {
+			>
+				emit {MySQL Maria compressed data file}
+				if {[N byte 3 0 0 {} {} x {}]} {
+					>
+						emit {Version %d}
+					<
+				}
+	
+			<
+		}
+		-16905216 {
+			>
+				if {[S string 4 0 {} {} eq MACF]} {
+					>
+						emit {MySQL Maria control file}
+						if {[N byte 3 0 0 {} {} x {}]} {
+							>
+								emit {Version %d}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		256 {
+			>
+				switch [Nv byte 3 0 {} {}] {
+					-80 {
+						>
+							emit {MPEG sequence, v4}
+							mime video/mpeg4-generic
+							if {[N belong 5 0 0 {} {} == 437]} {
+								>
+									if {[N byte 9 0 0 {} {} & -128]} {
+										>
+											switch [Nv byte 10 0 & -16] {
+												16 {
+													>
+														emit {\b, video}
+													<
+												}
+												32 {
+													>
+														emit {\b, still texture}
+													<
+												}
+												48 {
+													>
+														emit {\b, mesh}
+													<
+												}
+												64 {
+													>
+														emit {\b, face}
+													<
+												}
+											}
+	
+										<
+									}
+	
+									switch [Nv byte 9 0 & -8] {
+										8 {
+											>
+												emit {\b, video}
+											<
+										}
+										16 {
+											>
+												emit {\b, still texture}
+											<
+										}
+										24 {
+											>
+												emit {\b, mesh}
+											<
+										}
+										32 {
+											>
+												emit {\b, face}
+											<
+										}
+									}
+	
+								<
+							}
+	
+							switch [Nv byte 4 0 {} {}] {
+								-127 {
+									>
+										emit {\b, hybrid @ L1}
+									<
+								}
+								-126 {
+									>
+										emit {\b, hybrid @ L2}
+									<
+								}
+								-111 {
+									>
+										emit {\b, advanced RT simple @ L!}
+									<
+								}
+								-110 {
+									>
+										emit {\b, advanced RT simple @ L2}
+									<
+								}
+								-109 {
+									>
+										emit {\b, advanced RT simple @ L3}
+									<
+								}
+								-108 {
+									>
+										emit {\b, advanced RT simple @ L4}
+									<
+								}
+								-95 {
+									>
+										emit {\b, core scalable @ L1}
+									<
+								}
+								-94 {
+									>
+										emit {\b, core scalable @ L2}
+									<
+								}
+								-93 {
+									>
+										emit {\b, core scalable @ L3}
+									<
+								}
+								-79 {
+									>
+										emit {\b, advanced coding efficiency @ L1}
+									<
+								}
+								-78 {
+									>
+										emit {\b, advanced coding efficiency @ L2}
+									<
+								}
+								-77 {
+									>
+										emit {\b, advanced coding efficiency @ L3}
+									<
+								}
+								-76 {
+									>
+										emit {\b, advanced coding efficiency @ L4}
+									<
+								}
+								-63 {
+									>
+										emit {\b, advanced core @ L1}
+									<
+								}
+								-62 {
+									>
+										emit {\b, advanced core @ L2}
+									<
+								}
+								-47 {
+									>
+										emit {\b, advanced scalable texture @ L1}
+									<
+								}
+								-46 {
+									>
+										emit {\b, advanced scalable texture @ L2}
+									<
+								}
+								-45 {
+									>
+										emit {\b, advanced scalable texture @ L3}
+									<
+								}
+								-31 {
+									>
+										emit {\b, simple studio @ L1}
+									<
+								}
+								-30 {
+									>
+										emit {\b, simple studio @ L2}
+									<
+								}
+								-29 {
+									>
+										emit {\b, simple studio @ L3}
+									<
+								}
+								-28 {
+									>
+										emit {\b, simple studio @ L4}
+									<
+								}
+								-27 {
+									>
+										emit {\b, core studio @ L1}
+									<
+								}
+								-26 {
+									>
+										emit {\b, core studio @ L2}
+									<
+								}
+								-25 {
+									>
+										emit {\b, core studio @ L3}
+									<
+								}
+								-24 {
+									>
+										emit {\b, core studio @ L4}
+									<
+								}
+								-16 {
+									>
+										emit {\b, advanced simple @ L0}
+									<
+								}
+								-15 {
+									>
+										emit {\b, advanced simple @ L1}
+									<
+								}
+								-14 {
+									>
+										emit {\b, advanced simple @ L2}
+									<
+								}
+								-13 {
+									>
+										emit {\b, advanced simple @ L3}
+									<
+								}
+								-12 {
+									>
+										emit {\b, advanced simple @ L4}
+									<
+								}
+								-11 {
+									>
+										emit {\b, advanced simple @ L5}
+									<
+								}
+								-9 {
+									>
+										emit {\b, advanced simple @ L3b}
+									<
+								}
+								-8 {
+									>
+										emit {\b, FGS @ L0}
+									<
+								}
+								-7 {
+									>
+										emit {\b, FGS @ L1}
+									<
+								}
+								-6 {
+									>
+										emit {\b, FGS @ L2}
+									<
+								}
+								-5 {
+									>
+										emit {\b, FGS @ L3}
+									<
+								}
+								-4 {
+									>
+										emit {\b, FGS @ L4}
+									<
+								}
+								-3 {
+									>
+										emit {\b, FGS @ L5}
+									<
+								}
+								1 {
+									>
+										emit {\b, simple @ L1}
+									<
+								}
+								2 {
+									>
+										emit {\b, simple @ L2}
+									<
+								}
+								3 {
+									>
+										emit {\b, simple @ L3}
+									<
+								}
+								4 {
+									>
+										emit {\b, simple @ L0}
+									<
+								}
+								17 {
+									>
+										emit {\b, simple scalable @ L1}
+									<
+								}
+								18 {
+									>
+										emit {\b, simple scalable @ L2}
+									<
+								}
+								33 {
+									>
+										emit {\b, core @ L1}
+									<
+								}
+								34 {
+									>
+										emit {\b, core @ L2}
+									<
+								}
+								50 {
+									>
+										emit {\b, main @ L2}
+									<
+								}
+								51 {
+									>
+										emit {\b, main @ L3}
+									<
+								}
+								53 {
+									>
+										emit {\b, main @ L4}
+									<
+								}
+								66 {
+									>
+										emit {\b, n-bit @ L2}
+									<
+								}
+								81 {
+									>
+										emit {\b, scalable texture @ L1}
+									<
+								}
+								97 {
+									>
+										emit {\b, simple face animation @ L1}
+									<
+								}
+								98 {
+									>
+										emit {\b, simple face animation @ L2}
+									<
+								}
+								99 {
+									>
+										emit {\b, simple face basic animation @ L1}
+									<
+								}
+								100 {
+									>
+										emit {\b, simple face basic animation @ L2}
+									<
+								}
+								113 {
+									>
+										emit {\b, basic animation text @ L1}
+									<
+								}
+								114 {
+									>
+										emit {\b, basic animation text @ L2}
+									<
+								}
+							}
+	
+						<
+					}
+					-77 {
+						>
+							emit {MPEG sequence}
+							mime video/mpeg
+							switch [Nv belong 12 0 {} {}] {
+								434 {
+									>
+										emit {\b, v1, progressive Y'CbCr 4:2:0 video}
+									<
+								}
+								437 {
+									>
+										emit {\b, v2,}
+										switch [Nv byte 16 0 & 15] {
+											1 {
+												>
+													emit {\b HP}
+												<
+											}
+											2 {
+												>
+													emit {\b Spt}
+												<
+											}
+											3 {
+												>
+													emit {\b SNR}
+												<
+											}
+											4 {
+												>
+													emit {\b MP}
+												<
+											}
+											5 {
+												>
+													emit {\b SP}
+												<
+											}
+										}
+	
+										switch [Nv byte 17 0 & -16] {
+											-128 {
+												>
+													emit {\b@ML}
+												<
+											}
+											-96 {
+												>
+													emit {\b@LL}
+												<
+											}
+											64 {
+												>
+													emit {\b@HL}
+												<
+											}
+											96 {
+												>
+													emit {\b@H-14}
+												<
+											}
+										}
+	
+										if {[N byte 17 0 0 {} {} & 8]} {
+											>
+												emit {\b progressive}
+											<
+										}
+	
+										if {[N byte 17 0 0 {} {} ^ 8]} {
+											>
+												emit {\b interlaced}
+											<
+										}
+	
+										switch [Nv byte 17 0 & 6] {
+											2 {
+												>
+													emit {\b Y'CbCr 4:2:0 video}
+												<
+											}
+											4 {
+												>
+													emit {\b Y'CbCr 4:2:2 video}
+												<
+											}
+											6 {
+												>
+													emit {\b Y'CbCr 4:4:4 video}
+												<
+											}
+										}
+	
+									<
+								}
+								440 {
+									>
+										emit {\b, v1, progressive Y'CbCr 4:2:0 video}
+									<
+								}
+							}
+	
+							if {[N byte 11 0 0 {} {} & 2]} {
+								>
+									if {[N byte 75 0 0 {} {} & 1]} {
+										>
+											switch [Nv belong 140 0 {} {}] {
+												434 {
+													>
+														emit {\b, v1, progressive Y'CbCr 4:2:0 video}
+													<
+												}
+												437 {
+													>
+														emit {\b, v2,}
+														switch [Nv byte 144 0 & 15] {
+															1 {
+																>
+																	emit {\b HP}
+																<
+															}
+															2 {
+																>
+																	emit {\b Spt}
+																<
+															}
+															3 {
+																>
+																	emit {\b SNR}
+																<
+															}
+															4 {
+																>
+																	emit {\b MP}
+																<
+															}
+															5 {
+																>
+																	emit {\b SP}
+																<
+															}
+														}
+	
+														switch [Nv byte 145 0 & -16] {
+															-128 {
+																>
+																	emit {\b@ML}
+																<
+															}
+															-96 {
+																>
+																	emit {\b@LL}
+																<
+															}
+															64 {
+																>
+																	emit {\b@HL}
+																<
+															}
+															96 {
+																>
+																	emit {\b@H-14}
+																<
+															}
+														}
+	
+														if {[N byte 145 0 0 {} {} & 8]} {
+															>
+																emit {\b progressive}
+															<
+														}
+	
+														if {[N byte 145 0 0 {} {} ^ 8]} {
+															>
+																emit {\b interlaced}
+															<
+														}
+	
+														switch [Nv byte 145 0 & 6] {
+															2 {
+																>
+																	emit {\b Y'CbCr 4:2:0 video}
+																<
+															}
+															4 {
+																>
+																	emit {\b Y'CbCr 4:2:2 video}
+																<
+															}
+															6 {
+																>
+																	emit {\b Y'CbCr 4:4:4 video}
+																<
+															}
+														}
+	
+													<
+												}
+												440 {
+													>
+														emit {\b, v1, progressive Y'CbCr 4:2:0 video}
+													<
+												}
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+							switch [Nv belong 76 0 {} {}] {
+								434 {
+									>
+										emit {\b, v1, progressive Y'CbCr 4:2:0 video}
+									<
+								}
+								437 {
+									>
+										emit {\b, v2,}
+										switch [Nv byte 80 0 & 15] {
+											1 {
+												>
+													emit {\b HP}
+												<
+											}
+											2 {
+												>
+													emit {\b Spt}
+												<
+											}
+											3 {
+												>
+													emit {\b SNR}
+												<
+											}
+											4 {
+												>
+													emit {\b MP}
+												<
+											}
+											5 {
+												>
+													emit {\b SP}
+												<
+											}
+										}
+	
+										switch [Nv byte 81 0 & -16] {
+											-128 {
+												>
+													emit {\b@ML}
+												<
+											}
+											-96 {
+												>
+													emit {\b@LL}
+												<
+											}
+											64 {
+												>
+													emit {\b@HL}
+												<
+											}
+											96 {
+												>
+													emit {\b@H-14}
+												<
+											}
+										}
+	
+										if {[N byte 81 0 0 {} {} & 8]} {
+											>
+												emit {\b progressive}
+											<
+										}
+	
+										if {[N byte 81 0 0 {} {} ^ 8]} {
+											>
+												emit {\b interlaced}
+											<
+										}
+	
+										switch [Nv byte 81 0 & 6] {
+											2 {
+												>
+													emit {\b Y'CbCr 4:2:0 video}
+												<
+											}
+											4 {
+												>
+													emit {\b Y'CbCr 4:2:2 video}
+												<
+											}
+											6 {
+												>
+													emit {\b Y'CbCr 4:4:4 video}
+												<
+											}
+										}
+	
+									<
+								}
+								440 {
+									>
+										emit {\b, v1, progressive Y'CbCr 4:2:0 video}
+									<
+								}
+							}
+	
+							switch [Nv belong 4 0 & -256] {
+								167802880 {
+									>
+										emit {\b, 160x120}
+										if {[N byte 7 0 0 & -16 == 16]} {
+											>
+												emit {\b, 4:3}
+											<
+										}
+	
+									<
+								}
+								251699200 {
+									>
+										emit {\b, 240x160}
+										if {[N byte 7 0 0 & -16 == 16]} {
+											>
+												emit {\b, 4:3}
+											<
+										}
+	
+									<
+								}
+								335605760 {
+									>
+										emit {\b, 320x240}
+										if {[N byte 7 0 0 & -16 == 16]} {
+											>
+												emit {\b, 4:3}
+											<
+										}
+	
+									<
+								}
+								671211520 {
+									>
+										emit {\b, LD-TV 640P}
+										if {[N byte 7 0 0 & -16 == 16]} {
+											>
+												emit {\b, 4:3}
+											<
+										}
+	
+									<
+								}
+								805453824 {
+									>
+										emit {\b, PAL Capture}
+										if {[N byte 7 0 0 & -16 == 16]} {
+											>
+												emit {\b, 4:3}
+											<
+										}
+	
+									<
+								}
+								1342188800 {
+									>
+										emit {\b, SD-TV 1280I}
+										if {[N byte 7 0 0 & -16 == 16]} {
+											>
+												emit {\b, 16:9}
+											<
+										}
+	
+									<
+								}
+								2013542400 {
+									>
+										emit {\b, HD-TV 1920P}
+										if {[N byte 7 0 0 & -16 == 16]} {
+											>
+												emit {\b, 16:9}
+											<
+										}
+	
+									<
+								}
+							}
+	
+							switch [Nv beshort 4 0 & -16] {
+								5632 {
+									>
+										emit {\b, CIF}
+										switch [Nv beshort 5 0 & 4095] {
+											240 {
+												>
+													emit {\b NTSC}
+												<
+											}
+											288 {
+												>
+													emit {\b PAL}
+												<
+											}
+											576 {
+												>
+													emit {\b PAL 625}
+													switch [Nv byte 7 0 & -16] {
+														32 {
+															>
+																emit {\b, 4:3}
+															<
+														}
+														48 {
+															>
+																emit {\b, 16:9}
+															<
+														}
+														64 {
+															>
+																emit {\b, 11:5}
+															<
+														}
+													}
+	
+												<
+											}
+										}
+	
+										switch [Nv byte 7 0 & -16] {
+											-128 {
+												>
+													emit {\b, PAL 4:3}
+												<
+											}
+											-64 {
+												>
+													emit {\b, NTSC 4:3}
+												<
+											}
+											32 {
+												>
+													emit {\b, 4:3}
+												<
+											}
+											48 {
+												>
+													emit {\b, 16:9}
+												<
+											}
+											64 {
+												>
+													emit {\b, 11:5}
+												<
+											}
+										}
+	
+									<
+								}
+								7680 {
+									>
+										emit {\b, SVCD}
+										switch [Nv beshort 5 0 & 4095] {
+											480 {
+												>
+													emit {\b NTSC 525}
+												<
+											}
+											576 {
+												>
+													emit {\b PAL 625}
+												<
+											}
+										}
+	
+										switch [Nv byte 7 0 & -16] {
+											32 {
+												>
+													emit {\b, 4:3}
+												<
+											}
+											48 {
+												>
+													emit {\b, 16:9}
+												<
+											}
+											64 {
+												>
+													emit {\b, 11:5}
+												<
+											}
+										}
+	
+									<
+								}
+								11264 {
+									>
+										emit {\b, 4CIF}
+										switch [Nv beshort 5 0 & 4095] {
+											480 {
+												>
+													emit {\b NTSC}
+												<
+											}
+											576 {
+												>
+													emit {\b PAL}
+												<
+											}
+										}
+	
+										switch [Nv byte 7 0 & -16] {
+											-128 {
+												>
+													emit {\b, PAL 4:3}
+												<
+											}
+											-64 {
+												>
+													emit {\b, NTSC 4:3}
+												<
+											}
+											32 {
+												>
+													emit {\b, 4:3}
+												<
+											}
+											48 {
+												>
+													emit {\b, 16:9}
+												<
+											}
+											64 {
+												>
+													emit {\b, 11:5}
+												<
+											}
+										}
+	
+									<
+								}
+								11520 {
+									>
+										emit {\b, CCIR/ITU}
+										switch [Nv beshort 5 0 & 4095] {
+											480 {
+												>
+													emit {\b NTSC 525}
+												<
+											}
+											576 {
+												>
+													emit {\b PAL 625}
+												<
+											}
+										}
+	
+										switch [Nv byte 7 0 & -16] {
+											32 {
+												>
+													emit {\b, 4:3}
+												<
+											}
+											48 {
+												>
+													emit {\b, 16:9}
+												<
+											}
+											64 {
+												>
+													emit {\b, 11:5}
+												<
+											}
+										}
+	
+									<
+								}
+							}
+	
+							switch [Nv byte 7 0 & 15] {
+								1 {
+									>
+										emit {\b, 23.976 fps}
+									<
+								}
+								2 {
+									>
+										emit {\b, 24 fps}
+									<
+								}
+								3 {
+									>
+										emit {\b, 25 fps}
+									<
+								}
+								4 {
+									>
+										emit {\b, 29.97 fps}
+									<
+								}
+								5 {
+									>
+										emit {\b, 30 fps}
+									<
+								}
+								6 {
+									>
+										emit {\b, 50 fps}
+									<
+								}
+								7 {
+									>
+										emit {\b, 59.94 fps}
+									<
+								}
+								8 {
+									>
+										emit {\b, 60 fps}
+									<
+								}
+							}
+	
+							if {[N byte 11 0 0 {} {} & 4]} {
+								>
+									emit {\b, Constrained}
+								<
+							}
+	
+						<
+					}
+					-75 {
+						>
+							emit {MPEG sequence, v4}
+							mime video/mpeg4-generic
+							if {[N byte 4 0 0 {} {} & -128]} {
+								>
+									switch [Nv byte 5 0 & -16] {
+										16 {
+											>
+												emit {\b, video (missing profile header)}
+											<
+										}
+										32 {
+											>
+												emit {\b, still texture (missing profile header)}
+											<
+										}
+										48 {
+											>
+												emit {\b, mesh (missing profile header)}
+											<
+										}
+										64 {
+											>
+												emit {\b, face (missing profile header)}
+											<
+										}
+									}
+	
+								<
+							}
+	
+							switch [Nv byte 4 0 & -8] {
+								8 {
+									>
+										emit {\b, video (missing profile header)}
+									<
+								}
+								16 {
+									>
+										emit {\b, still texture (missing profile header)}
+									<
+								}
+								24 {
+									>
+										emit {\b, mesh (missing profile header)}
+									<
+								}
+								32 {
+									>
+										emit {\b, face (missing profile header)}
+									<
+								}
+							}
+	
+						<
+					}
+					-70 {
+						>
+							emit {MPEG sequence}
+							mime video/mpeg
+							if {[N byte 4 0 0 {} {} & 64]} {
+								>
+									emit {\b, v2, program multiplex}
+								<
+							}
+	
+							if {[N byte 4 0 0 {} {} ^ 64]} {
+								>
+									emit {\b, v1, system multiplex}
+								<
+							}
+	
+						<
+					}
+					-69 {
+						>
+							emit {MPEG sequence, v1/2, multiplex (missing pack header)}
+						<
+					}
+				}
+	
+				if {[N byte 3 0 0 & 31 == 7]} {
+					>
+						emit {MPEG sequence, H.264 video}
+						switch [Nv byte 4 0 {} {}] {
+							66 {
+								>
+									emit {\b, baseline}
+								<
+							}
+							77 {
+								>
+									emit {\b, main}
+								<
+							}
+							88 {
+								>
+									emit {\b, extended}
+								<
+							}
+						}
+	
+						if {[N byte 6 0 0 {} {} x {}]} {
+							>
+								emit {\b @ L %u}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		520552448 {
+			>
+				emit DIF
+				if {[N byte 4 0 0 {} {} & 1]} {
+					>
+						emit {(DVCPRO) movie file}
+					<
+				}
+	
+				if {[N byte 4 0 0 {} {} ^ 1]} {
+					>
+						emit {(DV) movie file}
+					<
+				}
+	
+				if {[N byte 3 0 0 {} {} & -128]} {
+					>
+						emit (PAL)
+					<
+				}
+	
+				if {[N byte 3 0 0 {} {} ^ -128]} {
+					>
+						emit (NTSC)
+					<
+				}
+	
+			<
+		}
+	}
+	
+	switch [Nv beshort 0 0 & -2] {
+		-30 {
+			>
+				emit {MPEG ADTS, layer III,  v2.5}
+				mime audio/mpeg
+				switch [Nv byte 2 0 & -16] {
+					-128 {
+						>
+							emit {\b,  64 kbps}
+						<
+					}
+					-112 {
+						>
+							emit {\b,  80 kbps}
+						<
+					}
+					-96 {
+						>
+							emit {\b,  96 kbps}
+						<
+					}
+					-80 {
+						>
+							emit {\b, 112 kbps}
+						<
+					}
+					-64 {
+						>
+							emit {\b, 128 kbps}
+						<
+					}
+					-48 {
+						>
+							emit {\b, 144 kbps}
+						<
+					}
+					-32 {
+						>
+							emit {\b, 160 kbps}
+						<
+					}
+					16 {
+						>
+							emit {\b,   8 kbps}
+						<
+					}
+					32 {
+						>
+							emit {\b,  16 kbps}
+						<
+					}
+					48 {
+						>
+							emit {\b,  24 kbps}
+						<
+					}
+					64 {
+						>
+							emit {\b,  32 kbps}
+						<
+					}
+					80 {
+						>
+							emit {\b,  40 kbps}
+						<
+					}
+					96 {
+						>
+							emit {\b,  48 kbps}
+						<
+					}
+					112 {
+						>
+							emit {\b,  56 kbps}
+						<
+					}
+				}
+	
+				switch [Nv byte 2 0 & 12] {
+					0 {
+						>
+							emit {\b, 11.025 kHz}
+						<
+					}
+					4 {
+						>
+							emit {\b, 12 kHz}
+						<
+					}
+					8 {
+						>
+							emit {\b, 8 kHz}
+						<
+					}
+				}
+	
+				switch [Nv byte 3 0 & -64] {
+					-128 {
+						>
+							emit {\b, 2x Monaural}
+						<
+					}
+					-64 {
+						>
+							emit {\b, Monaural}
+						<
+					}
+					0 {
+						>
+							emit {\b, Stereo}
+						<
+					}
+					64 {
+						>
+							emit {\b, JntStereo}
+						<
+					}
+				}
+	
+			<
+		}
+		-14 {
+			>
+				emit {MPEG ADTS, layer III, v2}
+				mime audio/mpeg
+				switch [Nv byte 2 0 & -16] {
+					-128 {
+						>
+							emit {\b,  64 kbps}
+						<
+					}
+					-112 {
+						>
+							emit {\b,  80 kbps}
+						<
+					}
+					-96 {
+						>
+							emit {\b,  96 kbps}
+						<
+					}
+					-80 {
+						>
+							emit {\b, 112 kbps}
+						<
+					}
+					-64 {
+						>
+							emit {\b, 128 kbps}
+						<
+					}
+					-48 {
+						>
+							emit {\b, 144 kbps}
+						<
+					}
+					-32 {
+						>
+							emit {\b, 160 kbps}
+						<
+					}
+					16 {
+						>
+							emit {\b,   8 kbps}
+						<
+					}
+					32 {
+						>
+							emit {\b,  16 kbps}
+						<
+					}
+					48 {
+						>
+							emit {\b,  24 kbps}
+						<
+					}
+					64 {
+						>
+							emit {\b,  32 kbps}
+						<
+					}
+					80 {
+						>
+							emit {\b,  40 kbps}
+						<
+					}
+					96 {
+						>
+							emit {\b,  48 kbps}
+						<
+					}
+					112 {
+						>
+							emit {\b,  56 kbps}
+						<
+					}
+				}
+	
+				switch [Nv byte 2 0 & 12] {
+					0 {
+						>
+							emit {\b, 22.05 kHz}
+						<
+					}
+					4 {
+						>
+							emit {\b, 24 kHz}
+						<
+					}
+					8 {
+						>
+							emit {\b, 16 kHz}
+						<
+					}
+				}
+	
+				switch [Nv byte 3 0 & -64] {
+					-128 {
+						>
+							emit {\b, 2x Monaural}
+						<
+					}
+					-64 {
+						>
+							emit {\b, Monaural}
+						<
+					}
+					0 {
+						>
+							emit {\b, Stereo}
+						<
+					}
+					64 {
+						>
+							emit {\b, JntStereo}
+						<
+					}
+				}
+	
+			<
+		}
+		-12 {
+			>
+				emit {MPEG ADTS, layer II, v2}
+				mime audio/mpeg
+				switch [Nv byte 2 0 & -16] {
+					-128 {
+						>
+							emit {\b,  64 kbps}
+						<
+					}
+					-112 {
+						>
+							emit {\b,  80 kbps}
+						<
+					}
+					-96 {
+						>
+							emit {\b,  96 kbps}
+						<
+					}
+					-80 {
+						>
+							emit {\b, 112 kbps}
+						<
+					}
+					-64 {
+						>
+							emit {\b, 128 kbps}
+						<
+					}
+					-48 {
+						>
+							emit {\b, 144 kbps}
+						<
+					}
+					-32 {
+						>
+							emit {\b, 160 kbps}
+						<
+					}
+					16 {
+						>
+							emit {\b,   8 kbps}
+						<
+					}
+					32 {
+						>
+							emit {\b,  16 kbps}
+						<
+					}
+					48 {
+						>
+							emit {\b,  24 kbps}
+						<
+					}
+					64 {
+						>
+							emit {\b,  32 kbps}
+						<
+					}
+					80 {
+						>
+							emit {\b,  40 kbps}
+						<
+					}
+					96 {
+						>
+							emit {\b,  48 kbps}
+						<
+					}
+					112 {
+						>
+							emit {\b,  56 kbps}
+						<
+					}
+				}
+	
+				switch [Nv byte 2 0 & 12] {
+					0 {
+						>
+							emit {\b, 22.05 kHz}
+						<
+					}
+					4 {
+						>
+							emit {\b, 24 kHz}
+						<
+					}
+					8 {
+						>
+							emit {\b, 16 kHz}
+						<
+					}
+				}
+	
+				switch [Nv byte 3 0 & -64] {
+					-128 {
+						>
+							emit {\b, 2x Monaural}
+						<
+					}
+					-64 {
+						>
+							emit {\b, Monaural}
+						<
+					}
+					0 {
+						>
+							emit {\b, Stereo}
+						<
+					}
+					64 {
+						>
+							emit {\b, JntStereo}
+						<
+					}
+				}
+	
+			<
+		}
+		-10 {
+			>
+				emit {MPEG ADTS, layer I, v2}
+				mime audio/mpeg
+				switch [Nv byte 2 0 & -16] {
+					-128 {
+						>
+							emit {\b, 128 kbps}
+						<
+					}
+					-112 {
+						>
+							emit {\b, 144 kbps}
+						<
+					}
+					-96 {
+						>
+							emit {\b, 160 kbps}
+						<
+					}
+					-80 {
+						>
+							emit {\b, 176 kbps}
+						<
+					}
+					-64 {
+						>
+							emit {\b, 192 kbps}
+						<
+					}
+					-48 {
+						>
+							emit {\b, 224 kbps}
+						<
+					}
+					-32 {
+						>
+							emit {\b, 256 kbps}
+						<
+					}
+					16 {
+						>
+							emit {\b,  32 kbps}
+						<
+					}
+					32 {
+						>
+							emit {\b,  48 kbps}
+						<
+					}
+					48 {
+						>
+							emit {\b,  56 kbps}
+						<
+					}
+					64 {
+						>
+							emit {\b,  64 kbps}
+						<
+					}
+					80 {
+						>
+							emit {\b,  80 kbps}
+						<
+					}
+					96 {
+						>
+							emit {\b,  96 kbps}
+						<
+					}
+					112 {
+						>
+							emit {\b, 112 kbps}
+						<
+					}
+				}
+	
+				switch [Nv byte 2 0 & 12] {
+					0 {
+						>
+							emit {\b, 22.05 kHz}
+						<
+					}
+					4 {
+						>
+							emit {\b, 24 kHz}
+						<
+					}
+					8 {
+						>
+							emit {\b, 16 kHz}
+						<
+					}
+				}
+	
+				switch [Nv byte 3 0 & -64] {
+					-128 {
+						>
+							emit {\b, 2x Monaural}
+						<
+					}
+					-64 {
+						>
+							emit {\b, Monaural}
+						<
+					}
+					0 {
+						>
+							emit {\b, Stereo}
+						<
+					}
+					64 {
+						>
+							emit {\b, JntStereo}
+						<
+					}
+				}
+	
+			<
+		}
+		-6 {
+			>
+				switch [Nv byte 2 0 & -16] {
+					-128 {
+						>
+							emit {MPEG ADTS, layer III, v1, 112 kbps}
+							mime audio/mpeg
+						<
+					}
+					-112 {
+						>
+							emit {MPEG ADTS, layer III, v1, 128 kbps}
+							mime audio/mpeg
+						<
+					}
+					-96 {
+						>
+							emit {MPEG ADTS, layer III, v1, 160 kbps}
+							mime audio/mpeg
+						<
+					}
+					-80 {
+						>
+							emit {MPEG ADTS, layer III, v1, 192 kbps}
+							mime audio/mpeg
+						<
+					}
+					-64 {
+						>
+							emit {MPEG ADTS, layer III, v1, 224 kbps}
+							mime audio/mpeg
+						<
+					}
+					-48 {
+						>
+							emit {MPEG ADTS, layer III, v1, 256 kbps}
+							mime audio/mpeg
+						<
+					}
+					-32 {
+						>
+							emit {MPEG ADTS, layer III, v1, 320 kbps}
+							mime audio/mpeg
+						<
+					}
+					16 {
+						>
+							emit {MPEG ADTS, layer III, v1,  32 kbps}
+							mime audio/mpeg
+						<
+					}
+					32 {
+						>
+							emit {MPEG ADTS, layer III, v1,  40 kbps}
+							mime audio/mpeg
+						<
+					}
+					48 {
+						>
+							emit {MPEG ADTS, layer III, v1,  48 kbps}
+							mime audio/mpeg
+						<
+					}
+					64 {
+						>
+							emit {MPEG ADTS, layer III, v1,  56 kbps}
+							mime audio/mpeg
+						<
+					}
+					80 {
+						>
+							emit {MPEG ADTS, layer III, v1,  64 kbps}
+							mime audio/mpeg
+						<
+					}
+					96 {
+						>
+							emit {MPEG ADTS, layer III, v1,  80 kbps}
+							mime audio/mpeg
+						<
+					}
+					112 {
+						>
+							emit {MPEG ADTS, layer III, v1,  96 kbps}
+							mime audio/mpeg
+						<
+					}
+				}
+	
+				switch [Nv byte 2 0 & 12] {
+					0 {
+						>
+							emit {\b, 44.1 kHz}
+						<
+					}
+					4 {
+						>
+							emit {\b, 48 kHz}
+						<
+					}
+					8 {
+						>
+							emit {\b, 32 kHz}
+						<
+					}
+				}
+	
+				switch [Nv byte 3 0 & -64] {
+					-128 {
+						>
+							emit {\b, 2x Monaural}
+						<
+					}
+					-64 {
+						>
+							emit {\b, Monaural}
+						<
+					}
+					0 {
+						>
+							emit {\b, Stereo}
+						<
+					}
+					64 {
+						>
+							emit {\b, JntStereo}
+						<
+					}
+				}
+	
+			<
+		}
+		-4 {
+			>
+				emit {MPEG ADTS, layer II, v1}
+				mime audio/mpeg
+				switch [Nv byte 2 0 & -16] {
+					-128 {
+						>
+							emit {\b, 128 kbps}
+						<
+					}
+					-112 {
+						>
+							emit {\b, 160 kbps}
+						<
+					}
+					-96 {
+						>
+							emit {\b, 192 kbps}
+						<
+					}
+					-80 {
+						>
+							emit {\b, 224 kbps}
+						<
+					}
+					-64 {
+						>
+							emit {\b, 256 kbps}
+						<
+					}
+					-48 {
+						>
+							emit {\b, 320 kbps}
+						<
+					}
+					-32 {
+						>
+							emit {\b, 384 kbps}
+						<
+					}
+					16 {
+						>
+							emit {\b,  32 kbps}
+						<
+					}
+					32 {
+						>
+							emit {\b,  48 kbps}
+						<
+					}
+					48 {
+						>
+							emit {\b,  56 kbps}
+						<
+					}
+					64 {
+						>
+							emit {\b,  64 kbps}
+						<
+					}
+					80 {
+						>
+							emit {\b,  80 kbps}
+						<
+					}
+					96 {
+						>
+							emit {\b,  96 kbps}
+						<
+					}
+					112 {
+						>
+							emit {\b, 112 kbps}
+						<
+					}
+				}
+	
+				switch [Nv byte 2 0 & 12] {
+					0 {
+						>
+							emit {\b, 44.1 kHz}
+						<
+					}
+					4 {
+						>
+							emit {\b, 48 kHz}
+						<
+					}
+					8 {
+						>
+							emit {\b, 32 kHz}
+						<
+					}
+				}
+	
+				switch [Nv byte 3 0 & -64] {
+					-128 {
+						>
+							emit {\b, 2x Monaural}
+						<
+					}
+					-64 {
+						>
+							emit {\b, Monaural}
+						<
+					}
+					0 {
+						>
+							emit {\b, Stereo}
+						<
+					}
+					64 {
+						>
+							emit {\b, JntStereo}
+						<
+					}
+				}
+	
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq ADIF]} {
+		>
+			emit {MPEG ADIF, AAC}
+			if {[N byte 4 0 0 {} {} & -128]} {
+				>
+					if {[N byte 13 0 0 {} {} & 16]} {
+						>
+							emit {\b, VBR}
+						<
+					}
+	
+					if {[N byte 13 0 0 {} {} ^ 16]} {
+						>
+							emit {\b, CBR}
+						<
+					}
+	
+					switch [Nv byte 16 0 & 30] {
+						2 {
+							>
+								emit {\b, single stream}
+							<
+						}
+						4 {
+							>
+								emit {\b, 2 streams}
+							<
+						}
+						6 {
+							>
+								emit {\b, 3 streams}
+							<
+						}
+					}
+	
+					if {[N byte 16 0 0 {} {} & 8]} {
+						>
+							emit {\b, 4 or more streams}
+						<
+					}
+	
+					if {[N byte 16 0 0 {} {} & 16]} {
+						>
+							emit {\b, 8 or more streams}
+						<
+					}
+	
+					if {[N byte 4 0 0 {} {} & -128]} {
+						>
+							emit {\b, Copyrighted}
+						<
+					}
+	
+					if {[N byte 13 0 0 {} {} & 64]} {
+						>
+							emit {\b, Original Source}
+						<
+					}
+	
+					if {[N byte 13 0 0 {} {} & 32]} {
+						>
+							emit {\b, Home Flag}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 4 0 0 {} {} ^ -128]} {
+				>
+					if {[N byte 4 0 0 {} {} & 16]} {
+						>
+							emit {\b, VBR}
+						<
+					}
+	
+					if {[N byte 4 0 0 {} {} ^ 16]} {
+						>
+							emit {\b, CBR}
+						<
+					}
+	
+					switch [Nv byte 7 0 & 30] {
+						2 {
+							>
+								emit {\b, single stream}
+							<
+						}
+						4 {
+							>
+								emit {\b, 2 streams}
+							<
+						}
+						6 {
+							>
+								emit {\b, 3 streams}
+							<
+						}
+					}
+	
+					if {[N byte 7 0 0 {} {} & 8]} {
+						>
+							emit {\b, 4 or more streams}
+						<
+					}
+	
+					if {[N byte 7 0 0 {} {} & 16]} {
+						>
+							emit {\b, 8 or more streams}
+						<
+					}
+	
+					if {[N byte 4 0 0 {} {} & 64]} {
+						>
+							emit {\b, Original Stream(s)}
+						<
+					}
+	
+					if {[N byte 4 0 0 {} {} & 32]} {
+						>
+							emit {\b, Home Source}
+						<
+					}
+	
+				<
+			}
+	
+			mime audio/x-hx-aac-adif
+		<
+	}
+	
+	if {[N beshort 0 0 0 & -10 == -16]} {
+		>
+			emit {MPEG ADTS, AAC}
+			if {[N byte 1 0 0 {} {} & 8]} {
+				>
+					emit {\b, v2}
+				<
+			}
+	
+			if {[N byte 1 0 0 {} {} ^ 8]} {
+				>
+					emit {\b, v4}
+					if {[N byte 2 0 0 {} {} & -64]} {
+						>
+							emit {\b LTP}
+						<
+					}
+	
+				<
+			}
+	
+			switch [Nv byte 2 0 & -64] {
+				-128 {
+					>
+						emit {\b SSR}
+					<
+				}
+				0 {
+					>
+						emit {\b Main}
+					<
+				}
+				64 {
+					>
+						emit {\b LC}
+					<
+				}
+			}
+	
+			switch [Nv byte 2 0 & 60] {
+				0 {
+					>
+						emit {\b, 96 kHz}
+					<
+				}
+				4 {
+					>
+						emit {\b, 88.2 kHz}
+					<
+				}
+				8 {
+					>
+						emit {\b, 64 kHz}
+					<
+				}
+				12 {
+					>
+						emit {\b, 48 kHz}
+					<
+				}
+				16 {
+					>
+						emit {\b, 44.1 kHz}
+					<
+				}
+				20 {
+					>
+						emit {\b, 32 kHz}
+					<
+				}
+				24 {
+					>
+						emit {\b, 24 kHz}
+					<
+				}
+				28 {
+					>
+						emit {\b, 22.05 kHz}
+					<
+				}
+				32 {
+					>
+						emit {\b, 16 kHz}
+					<
+				}
+				36 {
+					>
+						emit {\b, 12 kHz}
+					<
+				}
+				40 {
+					>
+						emit {\b, 11.025 kHz}
+					<
+				}
+				44 {
+					>
+						emit {\b, 8 kHz}
+					<
+				}
+			}
+	
+			switch [Nv beshort 2 0 & 448] {
+				64 {
+					>
+						emit {\b, monaural}
+					<
+				}
+				128 {
+					>
+						emit {\b, stereo}
+					<
+				}
+				192 {
+					>
+						emit {\b, stereo + center}
+					<
+				}
+				256 {
+					>
+						emit {\b, stereo+center+LFE}
+					<
+				}
+				320 {
+					>
+						emit {\b, surround}
+					<
+				}
+				384 {
+					>
+						emit {\b, surround + LFE}
+					<
+				}
+			}
+	
+			if {[N beshort 2 0 0 {} {} & 448]} {
+				>
+					emit {\b, surround + side}
+				<
+			}
+	
+			mime audio/x-hx-aac-adts
+		<
+	}
+	
+	if {[N beshort 0 0 0 & -32 == 22240]} {
+		>
+			emit {MPEG-4 LOAS}
+			if {[N byte 3 0 0 & -32 == 64]} {
+				>
+					switch [Nv byte 4 0 & 60] {
+						4 {
+							>
+								emit {\b, single stream}
+							<
+						}
+						8 {
+							>
+								emit {\b, 2 streams}
+							<
+						}
+						12 {
+							>
+								emit {\b, 3 streams}
+							<
+						}
+					}
+	
+					if {[N byte 4 0 0 {} {} & 8]} {
+						>
+							emit {\b, 4 or more streams}
+						<
+					}
+	
+					if {[N byte 4 0 0 {} {} & 32]} {
+						>
+							emit {\b, 8 or more streams}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 3 0 0 & -64 == 0]} {
+				>
+					switch [Nv byte 4 0 & 120] {
+						8 {
+							>
+								emit {\b, single stream}
+							<
+						}
+						16 {
+							>
+								emit {\b, 2 streams}
+							<
+						}
+						24 {
+							>
+								emit {\b, 3 streams}
+							<
+						}
+					}
+	
+					if {[N byte 4 0 0 {} {} & 32]} {
+						>
+							emit {\b, 4 or more streams}
+						<
+					}
+	
+					if {[N byte 4 0 0 {} {} & 64]} {
+						>
+							emit {\b, 8 or more streams}
+						<
+					}
+	
+				<
+			}
+	
+			mime audio/x-mp4a-latm
+		<
+	}
+	
+	switch [Nv leshort 4 0 {} {}] {
+		-20719 {
+			>
+				if {[N leshort 8 0 0 {} {} == 320]} {
+					>
+						if {[N leshort 10 0 0 {} {} == 200]} {
+							>
+								if {[N leshort 12 0 0 {} {} == 8]} {
+									>
+										emit {FLI animation, 320x200x8}
+										if {[N leshort 6 0 0 {} {} x {}]} {
+											>
+												emit {\b, %d frames}
+											<
+										}
+	
+										if {[N leshort 16 0 0 {} {} x {}]} {
+											>
+												emit {\b, %d/70s per frame}
+											<
+										}
+	
+										mime video/x-fli
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-20718 {
+			>
+				if {[N leshort 12 0 0 {} {} == 8]} {
+					>
+						emit {FLC animation}
+						if {[N leshort 8 0 0 {} {} x {}]} {
+							>
+								emit {\b, %d}
+							<
+						}
+	
+						if {[N leshort 10 0 0 {} {} x {}]} {
+							>
+								emit {\bx%dx8}
+							<
+						}
+	
+						if {[N uleshort 6 0 0 {} {} x {}]} {
+							>
+								emit {\b, %d frames}
+							<
+						}
+	
+						if {[N uleshort 16 0 0 {} {} x {}]} {
+							>
+								emit {\b, %dms per frame}
+							<
+						}
+	
+						mime video/x-flc
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[N belong 0 0 0 & -10486000 == 1195376656]} {
+		>
+			if {[N byte 188 0 0 {} {} == 71]} {
+				>
+					emit {MPEG transport stream data}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x8aMNG]} {
+		>
+			emit {MNG video data,}
+			if {[N belong 4 0 0 {} {} != 218765834]} {
+				>
+					emit CORRUPTED,
+				<
+			}
+	
+			if {[N belong 4 0 0 {} {} == 218765834]} {
+				>
+					if {[N belong 16 0 0 {} {} x {}]} {
+						>
+							emit {%d x}
+						<
+					}
+	
+					if {[N belong 20 0 0 {} {} x {}]} {
+						>
+							emit %d
+						<
+					}
+	
+				<
+			}
+	
+			mime video/x-mng
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x8bJNG]} {
+		>
+			emit {JNG video data,}
+			if {[N belong 4 0 0 {} {} != 218765834]} {
+				>
+					emit CORRUPTED,
+				<
+			}
+	
+			if {[N belong 4 0 0 {} {} == 218765834]} {
+				>
+					if {[N belong 16 0 0 {} {} x {}]} {
+						>
+							emit {%d x}
+						<
+					}
+	
+					if {[N belong 20 0 0 {} {} x {}]} {
+						>
+							emit %d
+						<
+					}
+	
+				<
+			}
+	
+			mime video/x-jng
+		<
+	}
+	
+	if {[S string 3 0 {} {} eq \x0D\x0AVersion:Vivo]} {
+		>
+			emit {Vivo video data}
+		<
+	}
+	
+	if {[S string 0 0 w {} eq \#VRML\ V1.0\ ascii]} {
+		>
+			emit {VRML 1 file}
+			mime model/vrml
+		<
+	}
+	
+	if {[S string 0 0 w {} eq \#VRML\ V2.0\ utf8]} {
+		>
+			emit {ISO/IEC 14772 VRML 97 file}
+			mime model/vrml
+		<
+	}
+	
+	if {[S string 0 0 w {} eq <?xml\ version=]} {
+		>
+			if {[S search 20 0 w 1000 eq <!DOCTYPE\ X3D]} {
+				>
+					emit {X3D (Extensible 3D) model xml text}
+					mime model/x3d+xml
+				<
+			}
+	
+			strength {+ 5}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HVQM4]} {
+		>
+			emit %s
+			if {[S string 6 0 {} {} > \0]} {
+				>
+					emit v%s
+				<
+			}
+	
+			if {[N byte 0 0 0 {} {} x {}]} {
+				>
+					emit {GameCube movie,}
+				<
+			}
+	
+			if {[N ubeshort 52 0 0 {} {} x {}]} {
+				>
+					emit {%d x}
+				<
+			}
+	
+			if {[N ubeshort 54 0 0 {} {} x {}]} {
+				>
+					emit %d,
+				<
+			}
+	
+			if {[N ubeshort 38 0 0 {} {} x {}]} {
+				>
+					emit %dus,
+				<
+			}
+	
+			if {[N ubeshort 66 0 0 {} {} == 0]} {
+				>
+					emit {no audio}
+				<
+			}
+	
+			if {[N ubeshort 66 0 0 {} {} > 0]} {
+				>
+					emit {%dHz audio}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DVDVIDEO-VTS]} {
+		>
+			emit {Video title set,}
+			if {[N byte 33 0 0 {} {} x {}]} {
+				>
+					emit v%x
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DVDVIDEO-VMG]} {
+		>
+			emit {Video manager,}
+			if {[N byte 33 0 0 {} {} x {}]} {
+				>
+					emit v%x
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NuppelVideo]} {
+		>
+			emit {MythTV NuppelVideo}
+			if {[S string 12 0 {} {} x {}]} {
+				>
+					emit v%s
+				<
+			}
+	
+			if {[N lelong 20 0 0 {} {} x {}]} {
+				>
+					emit (%d
+				<
+			}
+	
+			if {[N lelong 24 0 0 {} {} x {}]} {
+				>
+					emit {\bx%d),}
+				<
+			}
+	
+			if {[S string 36 0 {} {} eq P]} {
+				>
+					emit {\bprogressive,}
+				<
+			}
+	
+			if {[S string 36 0 {} {} eq I]} {
+				>
+					emit {\binterlaced,}
+				<
+			}
+	
+			if {[N ledouble 40 0 0 {} {} x {}]} {
+				>
+					emit {\baspect:%.2f,}
+				<
+			}
+	
+			if {[N ledouble 48 0 0 {} {} x {}]} {
+				>
+					emit {\bfps:%.2f}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MythTV]} {
+		>
+			emit {MythTV NuppelVideo}
+			if {[S string 12 0 {} {} x {}]} {
+				>
+					emit v%s
+				<
+			}
+	
+			if {[N lelong 20 0 0 {} {} x {}]} {
+				>
+					emit (%d
+				<
+			}
+	
+			if {[N lelong 24 0 0 {} {} x {}]} {
+				>
+					emit {\bx%d),}
+				<
+			}
+	
+			if {[S string 36 0 {} {} eq P]} {
+				>
+					emit {\bprogressive,}
+				<
+			}
+	
+			if {[S string 36 0 {} {} eq I]} {
+				>
+					emit {\binterlaced,}
+				<
+			}
+	
+			if {[N ledouble 40 0 0 {} {} x {}]} {
+				>
+					emit {\baspect:%.2f,}
+				<
+			}
+	
+			if {[N ledouble 48 0 0 {} {} x {}]} {
+				>
+					emit {\bfps:%.2f}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BIK]} {
+		>
+			emit {Bink Video}
+			if {[S regex 3 0 {} {} eq \[a-z\]]} {
+				>
+					emit rev.%s
+				<
+			}
+	
+			if {[N ulelong 20 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d}
+				<
+			}
+	
+			if {[N ulelong 24 0 0 {} {} x {}]} {
+				>
+					emit {\bx%d}
+				<
+			}
+	
+			if {[N ulelong 8 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d frames}
+				<
+			}
+	
+			if {[N ulelong 32 0 0 {} {} x {}]} {
+				>
+					emit {at rate %d/}
+				<
+			}
+	
+			if {[N ulelong 28 0 0 {} {} > 1]} {
+				>
+					emit {\b%d}
+				<
+			}
+	
+			if {[N ulelong 40 0 0 {} {} == 0]} {
+				>
+					emit {\b, no audio}
+				<
+			}
+	
+			if {[N ulelong 40 0 0 {} {} != 0]} {
+				>
+					emit {\b, %d audio track}
+					if {[N ulelong 40 0 0 {} {} != 1]} {
+						>
+							emit {\bs}
+						<
+					}
+	
+					if {[N uleshort 48 0 0 {} {} x {}]} {
+						>
+							emit %dHz
+						<
+					}
+	
+					if {[N byte 51 0 0 & 32 == 0]} {
+						>
+							emit mono
+						<
+					}
+	
+					if {[N byte 51 0 0 & 32 != 0]} {
+						>
+							emit stereo
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq nut/multimedia\ container\0]} {
+		>
+			emit {NUT multimedia container}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NSVf]} {
+		>
+			emit {Nullsoft Video}
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq RED1]} {
+		>
+			emit {REDCode Video}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AMVS]} {
+		>
+			emit {MTV Multimedia File}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ARMovie\012]} {
+		>
+			emit ARMovie
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Interplay\040MVE\040File\032]} {
+		>
+			emit {Interplay MVE Movie}
+		<
+	}
+	
+	switch [Nv bequad 0 0 {} {}] {
+		-9207870847048482801 {
+			>
+				emit {Nintendo 64 ROM image}
+				mime application/x-n64-rom
+				if {[S string 32 0 {} {} > \0]} {
+					>
+						emit {\b: "%.20s"}
+					<
+				}
+	
+				if {[S string 59 0 {} {} x {}]} {
+					>
+						emit (%.4s
+					<
+				}
+	
+				if {[N byte 63 0 0 {} {} x {}]} {
+					>
+						emit {\b, Rev.%02u)}
+					<
+				}
+	
+			<
+		}
+		-9121646941414855425 {
+			>
+				emit {LLVM indexed profile data,}
+				if {[N byte [R 7] 0 0 {} {} x {}]} {
+					>
+						emit {version %d (big-endian)}
+					<
+				}
+	
+			<
+		}
+		-6518119229588284681 {
+			>
+				emit {Hash::SharedMem master file, big-endian}
+				if {[N bequad 8 0 0 {} {} < 16777216]} {
+					>
+						if {[N byte 15 0 0 {} {} > 2]} {
+							>
+								emit {\b, line size 2^%d byte}
+							<
+						}
+	
+						if {[N byte 14 0 0 {} {} > 2]} {
+							>
+								emit {\b, page size 2^%d byte}
+							<
+						}
+	
+						if {[N byte 13 0 0 {} {} & 1]} {
+							>
+								if {[N byte 13 0 0 {} {} > 1]} {
+									>
+										emit {\b, max fanout %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-5199405631432697327 {
+			>
+				if {[N bequad 8 0 0 {} {} == -6463228381250015859]} {
+					>
+						emit {Windows Television DVR Media}
+					<
+				}
+	
+			<
+		}
+		-4137723088997562430 {
+			>
+				emit {Hash::SharedMem data file, big-endian}
+				if {[N bequad 8 0 0 {} {} < 16777216]} {
+					>
+						if {[N byte 15 0 0 {} {} > 2]} {
+							>
+								emit {\b, line size 2^%d byte}
+							<
+						}
+	
+						if {[N byte 14 0 0 {} {} > 2]} {
+							>
+								emit {\b, page size 2^%d byte}
+							<
+						}
+	
+						if {[N byte 13 0 0 {} {} & 1]} {
+							>
+								if {[N byte 13 0 0 {} {} > 1]} {
+									>
+										emit {\b, max fanout %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-41534659755609471 {
+			>
+				emit {LLVM raw profile data,}
+				if {[N byte [R 7] 0 0 {} {} x {}]} {
+					>
+						emit {version %d (big-endian)}
+					<
+				}
+	
+			<
+		}
+		11259375 {
+			>
+				emit {Erlang DETS file}
+			<
+		}
+		2566813404 {
+			>
+				if {[N ubeshort 8 0 0 {} {} < 10]} {
+					>
+						emit {APT cache data, version %u}
+						if {[N beshort 10 0 0 {} {} x {}]} {
+							>
+								emit {\b.%u, 64 bit big-endian}
+							<
+						}
+	
+						U 15 apt-cache-64bit-be 0
+	
+					<
+				}
+	
+			<
+		}
+		65677417116533018 {
+			>
+				emit {UCL compressed data}
+			<
+		}
+		1315192064904724480 {
+			>
+				emit {Nintendo 64 ROM image (wordswapped)}
+				mime application/x-n64-rom
+			<
+		}
+		3999266915158593280 {
+			>
+				emit {Nintendo 64 ROM image (V64)}
+				mime application/x-n64-rom
+			<
+		}
+		4616813591155179520 {
+			>
+				emit {Nintendo 64 ROM image (32-bit byteswapped)}
+				mime application/x-n64-rom
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq FILM]} {
+		>
+			emit {Sega FILM/CPK Multimedia,}
+			if {[N belong 32 0 0 {} {} x {}]} {
+				>
+					emit {%d x}
+				<
+			}
+	
+			if {[N belong 28 0 0 {} {} x {}]} {
+				>
+					emit %d
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq THP\0]} {
+		>
+			emit {Nintendo THP Multimedia}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BBCD]} {
+		>
+			emit {BBC Dirac Video}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SMK]} {
+		>
+			emit {RAD Game Tools Smacker Multimedia}
+			if {[N byte 3 0 0 {} {} x {}]} {
+				>
+					emit {version %c,}
+				<
+			}
+	
+			if {[N lelong 4 0 0 {} {} x {}]} {
+				>
+					emit {%d x}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit %d,
+				<
+			}
+	
+			if {[N lelong 12 0 0 {} {} x {}]} {
+				>
+					emit {%d frames}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x06\x0e\x2b\x34\x02\x05\x01\x01\x0d\x01\x02\x01\x01\x02]} {
+		>
+			emit {Material exchange container format}
+			mime application/mxf
+			ext mxf
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ANIM]} {
+		>
+			if {[S string 8 0 {} {} eq AHDR]} {
+				>
+					emit {LucasArts Smush Animation Format (SAN) video}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SANM]} {
+		>
+			if {[S string 8 0 {} {} eq SHDR]} {
+				>
+					emit {LucasArts Smush v2 (SANM) video}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Obj]} {
+		>
+			emit {Apache Avro}
+			if {[N byte 3 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ORC]} {
+		>
+			emit {Apache ORC}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PAR1]} {
+		>
+			emit {Apache Parquet}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RCF]} {
+		>
+			emit {Apache Hive RC file}
+			if {[N byte 3 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SEQ]} {
+		>
+			if {[N byte 3 0 0 {} {} < 6]} {
+				>
+					emit {Apache Hadoop Sequence file version %d}
+				<
+			}
+	
+			if {[N byte 3 0 0 {} {} > 6]} {
+				>
+					emit {Apache Hadoop Sequence file version %d}
+				<
+			}
+	
+			if {[N byte 3 0 0 {} {} == 6]} {
+				>
+					if {[S string 5 0 {} {} eq org.apache.hadoop.hive.ql.io.RCFile\$KeyBuffer]} {
+						>
+							emit {Apache Hive RC file version 0}
+						<
+					}
+	
+					if {[D 3]} {
+						>
+							emit {Apache Hadoop Sequence file version 6}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv long 0 0 {} {}] {
+		-1042103351 {
+			>
+				emit {SPSS Portable File}
+				if {[S string 40 0 {} {} x {}]} {
+					>
+						emit %s
+					<
+				}
+	
+			<
+		}
+		-762612112 {
+			>
+				emit {CLISP memory image data, other endian}
+			<
+		}
+		-97271666 {
+			>
+				emit {SunPC 4.0 Hard Disk}
+			<
+		}
+		-1 {
+			>
+				if {[N belong [R 0] 0 0 {} {} == -1432791706]} {
+					>
+						emit {Xilinx RAW bitstream (.BIN)}
+					<
+				}
+	
+			<
+		}
+		262 {
+			>
+				emit {68k Blit mpx/mux executable}
+			<
+		}
+		268 {
+			>
+				emit {unknown demand paged pure executable}
+				if {[N long 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		269 {
+			>
+				emit {i960 b.out relocatable object}
+				if {[N long 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		270 {
+			>
+				emit {unknown readable demand paged pure executable}
+			<
+		}
+		31415 {
+			>
+				emit {Mirage Assembler m.out executable}
+			<
+		}
+		33132 {
+			>
+				emit {APL workspace (Ken's original?)}
+			<
+			>
+				emit {apl workspace}
+			<
+		}
+		59397 {
+			>
+				emit {overlay object file (z8000 a.out)}
+			<
+		}
+		59399 {
+			>
+				emit {object file (z8000 a.out)}
+			<
+		}
+		59400 {
+			>
+				emit {pure object file (z8000 a.out)}
+			<
+		}
+		59401 {
+			>
+				emit {separate object file (z8000 a.out)}
+			<
+		}
+		61374 {
+			>
+				emit {OSF/Rose object}
+			<
+		}
+		65381 {
+			>
+				emit {HP old archive}
+			<
+		}
+		340322 {
+			>
+				emit {Berkeley DB 1.85/1.86}
+				if {[N long 4 0 0 {} {} > 0]} {
+					>
+						emit {(Btree, version %d, native byte-order)}
+					<
+				}
+	
+			<
+		}
+		395726 {
+			>
+				emit {Jaleo XFS file}
+				if {[N long 4 0 0 {} {} x {}]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+				if {[N long 8 0 0 {} {} x {}]} {
+					>
+						emit {- [%d -}
+					<
+				}
+	
+				if {[N long 20 0 0 {} {} x {}]} {
+					>
+						emit {\b%dx}
+					<
+				}
+	
+				if {[N long 24 0 0 {} {} x {}]} {
+					>
+						emit {\b%dx}
+					<
+				}
+	
+				switch [Nv long 28 0 {} {}] {
+					1000 {
+						>
+							emit {\bRGB24]}
+						<
+					}
+					1008 {
+						>
+							emit {\bYUV422]}
+						<
+					}
+				}
+	
+			<
+		}
+		398689 {
+			>
+				emit {Berkeley DB}
+				mime application/x-dbm
+				switch [Nv belong 8 0 {} {}] {
+					1234 {
+						>
+							if {[N belong 4 0 0 {} {} > 2]} {
+								>
+									emit 1.86
+								<
+							}
+	
+							if {[N belong 4 0 0 {} {} < 3]} {
+								>
+									emit 1.85
+								<
+							}
+	
+							if {[N belong 4 0 0 {} {} > 0]} {
+								>
+									emit {(Hash, version %d, little-endian)}
+								<
+							}
+	
+						<
+					}
+					4321 {
+						>
+							if {[N belong 4 0 0 {} {} > 2]} {
+								>
+									emit 1.86
+								<
+							}
+	
+							if {[N belong 4 0 0 {} {} < 3]} {
+								>
+									emit 1.85
+								<
+							}
+	
+							if {[N belong 4 0 0 {} {} > 0]} {
+								>
+									emit {(Hash, version %d, native byte-order)}
+								<
+							}
+	
+						<
+					}
+				}
+	
+			<
+		}
+		1234567 {
+			>
+				emit {X image}
+			<
+		}
+		22552998 {
+			>
+				emit {HP core file}
+			<
+		}
+		34078982 {
+			>
+				emit {HP s500 relocatable executable}
+				if {[N long 16 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		34078983 {
+			>
+				emit {HP s500 executable}
+				if {[N long 16 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		34078984 {
+			>
+				emit {HP s500 pure executable}
+				if {[N long 16 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		34144101 {
+			>
+				emit {HP s500 old archive}
+			<
+		}
+		34275173 {
+			>
+				emit {HP s200 old archive}
+			<
+		}
+		34341132 {
+			>
+				emit {compiled Lisp}
+			<
+		}
+		34406245 {
+			>
+				emit {HP s200 old archive}
+			<
+		}
+		135137807 {
+			>
+				emit {TML 2301 byte-order format}
+			<
+		}
+		168757262 {
+			>
+				emit {TML 0123 byte-order format}
+			<
+		}
+		235409162 {
+			>
+				emit {TML 3210 byte-order format}
+			<
+		}
+		252317192 {
+			>
+				emit {TML 1032 byte-order format}
+			<
+		}
+		1123028772 {
+			>
+				emit {Artisan image data}
+				switch [Nv long 4 0 {} {}] {
+					1 {
+						>
+							emit {\b, rectangular 24-bit}
+						<
+					}
+					2 {
+						>
+							emit {\b, rectangular 8-bit with colormap}
+						<
+					}
+					3 {
+						>
+							emit {\b, rectangular 32-bit (24-bit with matte)}
+						<
+					}
+				}
+	
+			<
+		}
+		1145263299 {
+			>
+				emit {DACT compressed data}
+				if {[N byte 4 0 0 {} {} > -1]} {
+					>
+						emit {(version %i.}
+					<
+				}
+	
+				if {[N byte 5 0 0 {} {} > -1]} {
+					>
+						emit %i.
+					<
+				}
+	
+				if {[N byte 6 0 0 {} {} > -1]} {
+					>
+						emit %i)
+					<
+				}
+	
+				if {[N long 7 0 0 {} {} > 0]} {
+					>
+						emit {, original size: %i bytes}
+					<
+				}
+	
+				if {[N long 15 0 0 {} {} > 30]} {
+					>
+						emit {, block size: %i bytes}
+					<
+				}
+	
+			<
+			>
+				emit {DACT compressed data}
+				if {[N byte 4 0 0 {} {} > -1]} {
+					>
+						emit {(version %i.}
+					<
+				}
+	
+				if {[N byte 5 0 0 {} {} > -1]} {
+					>
+						emit {$BS%i.}
+					<
+				}
+	
+				if {[N byte 6 0 0 {} {} > -1]} {
+					>
+						emit {$BS%i)}
+					<
+				}
+	
+				if {[N long 7 0 0 {} {} > 0]} {
+					>
+						emit {$BS, original size: %i bytes}
+					<
+				}
+	
+				if {[N long 15 0 0 {} {} > 30]} {
+					>
+						emit {$BS, block size: %i bytes}
+					<
+				}
+	
+			<
+		}
+		1302851304 {
+			>
+				emit {HP-WINDOWS font}
+				if {[N byte 8 0 0 {} {} > 0]} {
+					>
+						emit {- version %d}
+					<
+				}
+	
+			<
+		}
+		1351614727 {
+			>
+				emit {Pyramid 90x family executable}
+			<
+		}
+		1351614728 {
+			>
+				emit {Pyramid 90x family pure executable}
+				if {[N long 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		1351614731 {
+			>
+				emit {Pyramid 90x family demand paged pure executable}
+				if {[N long 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		1886817234 {
+			>
+				emit {CLISP memory image data}
+			<
+		}
+	}
+	
+	if {[S search 0 0 t 1 eq FiLeStArTfIlEsTaRt]} {
+		>
+			emit {binscii (apple ][) text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x0aGL]} {
+		>
+			emit {Binary II (apple ][) data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x76\xff]} {
+		>
+			emit {Squeezed (apple ][) data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NuFile]} {
+		>
+			emit {NuFile archive (apple ][) data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq N\xf5F\xe9l\xe5]} {
+		>
+			emit {NuFile archive (apple ][) data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 2IMG]} {
+		>
+			emit {Apple ][ 2IMG Disk Image}
+			if {[S string 4 0 {} {} eq XGS!]} {
+				>
+					emit {\b, XGS}
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq CTKG]} {
+				>
+					emit {\b, Catakig}
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq ShIm]} {
+				>
+					emit {\b, Sheppy's ImageMaker}
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq WOOF]} {
+				>
+					emit {\b, Sweet 16}
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq B2TR]} {
+				>
+					emit {\b, Bernie ][ the Rescue}
+				<
+			}
+	
+			if {[S string 4 0 {} {} ne nfc]} {
+				>
+					emit {\b, ASIMOV2}
+				<
+			}
+	
+			if {[S string 4 0 {} {} x {}]} {
+				>
+					emit {\b, Unknown Format}
+				<
+			}
+	
+			switch [Nv byte 12 0 {} {}] {
+				0 {
+					>
+						emit {\b, DOS 3.3 sector order}
+						if {[N byte 16 0 0 {} {} == 0]} {
+							>
+								emit {\b, Volume 254}
+							<
+						}
+	
+						if {[N byte 16 0 0 & 127 x {}]} {
+							>
+								emit {\b, Volume %u}
+							<
+						}
+	
+					<
+				}
+				1 {
+					>
+						emit {\b, ProDOS sector order}
+						if {[N short 20 0 0 {} {} x {}]} {
+							>
+								emit {\b, %u Blocks}
+							<
+						}
+	
+					<
+				}
+				2 {
+					>
+						emit {\b, NIB data}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq package0]} {
+		>
+			emit {Newton package, NOS 1.x,}
+			if {[N belong 12 0 0 {} {} & -2147483648]} {
+				>
+					emit AutoRemove,
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} & 1073741824]} {
+				>
+					emit CopyProtect,
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} & 268435456]} {
+				>
+					emit NoCompression,
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} & 67108864]} {
+				>
+					emit Relocation,
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} & 33554432]} {
+				>
+					emit UseFasterCompression,
+				<
+			}
+	
+			if {[N belong 16 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq package1]} {
+		>
+			emit {Newton package, NOS 2.x,}
+			if {[N belong 12 0 0 {} {} & -2147483648]} {
+				>
+					emit AutoRemove,
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} & 1073741824]} {
+				>
+					emit CopyProtect,
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} & 268435456]} {
+				>
+					emit NoCompression,
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} & 67108864]} {
+				>
+					emit Relocation,
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} & 33554432]} {
+				>
+					emit UseFasterCompression,
+				<
+			}
+	
+			if {[N belong 16 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq package4]} {
+		>
+			emit {Newton package,}
+			switch [Nv byte 8 0 {} {}] {
+				8 {
+					>
+						emit {NOS 1.x,}
+					<
+				}
+				9 {
+					>
+						emit {NOS 2.x,}
+					<
+				}
+			}
+	
+			if {[N belong 12 0 0 {} {} & -2147483648]} {
+				>
+					emit AutoRemove,
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} & 1073741824]} {
+				>
+					emit CopyProtect,
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} & 268435456]} {
+				>
+					emit NoCompression,
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq O]} {
+		>
+			if {[N ubequad 84 0 0 {} {} ^ 71494644084571648]} {
+				>
+					if {[S regex 5 0 s {} eq \[=.<>|!^\x8a\]\{79\}]} {
+						>
+							emit {AppleWorks Word Processor}
+							if {[N ubyte 183 0 0 {} {} == 30]} {
+								>
+									emit 3.0
+								<
+							}
+	
+							if {[N ubyte 183 0 0 {} {} != 30]} {
+								>
+									if {[N ubyte 183 0 0 {} {} != 0]} {
+										>
+											emit 0x%x
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string 5 0 {} {} x {}]} {
+								>
+									emit {\b, tabstop ruler "%6.6s"}
+								<
+							}
+	
+							if {[N byte 85 0 0 & 1 > 0]} {
+								>
+									emit {\b, zoomed}
+								<
+							}
+	
+							if {[N byte 90 0 0 & 1 > 0]} {
+								>
+									emit {\b, paginated}
+								<
+							}
+	
+							if {[N byte 92 0 0 & 1 > 0]} {
+								>
+									emit {\b, with mail merge}
+								<
+							}
+	
+							if {[N ubyte 91 0 0 {} {} > 0]} {
+								>
+									if {[N ubyte 91 0 0 {} {} x {}]} {
+										>
+											emit {\b, %d/10 inch left margin}
+										<
+									}
+	
+								<
+							}
+	
+							mime application/x-appleworks3
+							ext awp
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N belong 0 0 0 & 16711935 == 524288]} {
+		>
+			if {[N leshort 2 0 0 {} {} > 0]} {
+				>
+					emit {Applesoft BASIC program data, first line number %d}
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv belong 0 0 & -16711681] {
+		1442840576 {
+			>
+				if {[S regex 1 0 s {} eq ^\[0-9\]]} {
+					>
+						emit {ps database}
+						if {[S string 1 0 {} {} > \0]} {
+							>
+								emit {version %s}
+							<
+						}
+	
+						if {[S string 4 0 {} {} > \0]} {
+							>
+								emit {from kernel %s}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		1677774848 {
+			>
+				emit {Apple Mechanic font}
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq bplist00]} {
+		>
+			emit {Apple binary property list}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq bplist]} {
+		>
+			if {[N byte 6 0 0 {} {} x {}]} {
+				>
+					emit {\bCoreFoundation binary property list data, version 0x%c}
+					if {[N byte 7 0 0 {} {} x {}]} {
+						>
+							emit {\b%c}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 6 0 {} {} eq 00]} {
+				>
+					emit {\b}
+					switch [Nv byte 8 0 & -16] {
+						-128 {
+							>
+								emit {\b, root type: uid (CORRUPT)}
+							<
+						}
+						-96 {
+							>
+								emit {\b, root type: array}
+							<
+						}
+						-48 {
+							>
+								emit {\b, root type: dictionary}
+							<
+						}
+						0 {
+							>
+								emit {\b}
+								switch [Nv byte 8 0 & 15] {
+									0 {
+										>
+											emit {\b, root type: null}
+										<
+									}
+									8 {
+										>
+											emit {\b, root type: false boolean}
+										<
+									}
+									9 {
+										>
+											emit {\b, root type: true boolean}
+										<
+									}
+								}
+	
+							<
+						}
+						16 {
+							>
+								emit {\b, root type: integer}
+							<
+						}
+						32 {
+							>
+								emit {\b, root type: real}
+							<
+						}
+						48 {
+							>
+								emit {\b, root type: date}
+							<
+						}
+						64 {
+							>
+								emit {\b, root type: data}
+							<
+						}
+						80 {
+							>
+								emit {\b, root type: ascii string}
+							<
+						}
+						96 {
+							>
+								emit {\b, root type: unicode string}
+							<
+						}
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq typedstream]} {
+		>
+			emit {NeXT/Apple typedstream data, big endian}
+			if {[N byte 0 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d}
+				<
+			}
+	
+			if {[N byte 0 0 0 {} {} < 5]} {
+				>
+					emit {\b}
+					if {[N byte 13 0 0 {} {} == -127]} {
+						>
+							emit {\b}
+							if {[N ubeshort 14 0 0 {} {} x {}]} {
+								>
+									emit {\b, system %d}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq streamtyped]} {
+		>
+			emit {NeXT/Apple typedstream data, little endian}
+			if {[N byte 0 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d}
+				<
+			}
+	
+			if {[N byte 0 0 0 {} {} < 5]} {
+				>
+					emit {\b}
+					if {[N byte 13 0 0 {} {} == -127]} {
+						>
+							emit {\b}
+							if {[N uleshort 14 0 0 {} {} x {}]} {
+								>
+									emit {\b, system %d}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq caff]} {
+		>
+			emit {CoreAudio Format audio file}
+			if {[N beshort 4 0 0 {} {} < 10]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+			if {[N beshort 6 0 0 {} {} x {}]} {
+				>
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq kych]} {
+		>
+			emit {Mac OS X Keychain File}
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq innotek\ VirtualBox\ Disk\ Image]} {
+		>
+			emit %s
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\0\0\1Bud1\0]} {
+		>
+			emit {Apple Desktop Services Store}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000\000\001\000]} {
+		>
+			if {[N leshort 4 0 0 {} {} == 0]} {
+				>
+					if {[N lelong 16 0 0 {} {} == 0]} {
+						>
+							emit {Apple HFS/HFS+ resource fork}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FasdUAS]} {
+		>
+			emit {AppleScript compiled}
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq BOBO]} {
+		>
+			if {[N byte 0 0 0 {} {} > 4]} {
+				>
+					if {[N belong 12 0 0 {} {} == 0]} {
+						>
+							if {[N belong 26 0 0 {} {} == 0]} {
+								>
+									U 12 appleworks 0
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N belong 0 0 0 {} {} == 75607296]} {
+				>
+					U 12 appleworks 0
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 32 0 {} {} eq NXSB]} {
+		>
+			emit {Apple File System (APFS)}
+			if {[N ulelong 36 0 0 {} {} x {}]} {
+				>
+					emit {\b, blocksize %u}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq itch]} {
+		>
+			if {[S string 24 0 {} {} eq artw]} {
+				>
+					if {[S string 488 0 {} {} eq data]} {
+						>
+							emit {iTunes cover art}
+							if {[S string 493 0 {} {} eq PNG]} {
+								>
+									emit (PNG)
+								<
+							}
+	
+							if {[N beshort 492 0 0 {} {} == -40]} {
+								>
+									emit (JPEG)
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 65 0 {} {} eq PNTGMPNT]} {
+		>
+			emit {MacPaint image data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PBLAPP\000\000]} {
+		>
+			emit {Pebble application}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq *BEGIN]} {
+		>
+			emit Applixware
+			if {[S string 7 0 {} {} eq WORDS]} {
+				>
+					emit {Words Document}
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq GRAPHICS]} {
+				>
+					emit Graphic
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq RASTER]} {
+				>
+					emit Bitmap
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq SPREADSHEETS]} {
+				>
+					emit Spreadsheet
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq MACRO]} {
+				>
+					emit Macro
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq BUILDER]} {
+				>
+					emit {Builder Object}
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv lequad 0 0 {} {}] {
+		-9121646941414855425 {
+			>
+				emit {LLVM indexed profile data,}
+				if {[N byte [R 0] 0 0 {} {} x {}]} {
+					>
+						emit {version %d}
+					<
+				}
+	
+			<
+		}
+		-6518119229588284681 {
+			>
+				emit {Hash::SharedMem master file, little-endian}
+				if {[N lequad 8 0 0 {} {} < 16777216]} {
+					>
+						if {[N byte 8 0 0 {} {} > 2]} {
+							>
+								emit {\b, line size 2^%d byte}
+							<
+						}
+	
+						if {[N byte 9 0 0 {} {} > 2]} {
+							>
+								emit {\b, page size 2^%d byte}
+							<
+						}
+	
+						if {[N byte 10 0 0 {} {} & 1]} {
+							>
+								if {[N byte 10 0 0 {} {} > 1]} {
+									>
+										emit {\b, max fanout %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-4137723088997562430 {
+			>
+				emit {Hash::SharedMem data file, little-endian}
+				if {[N lequad 8 0 0 {} {} < 16777216]} {
+					>
+						if {[N byte 8 0 0 {} {} > 2]} {
+							>
+								emit {\b, line size 2^%d byte}
+							<
+						}
+	
+						if {[N byte 9 0 0 {} {} > 2]} {
+							>
+								emit {\b, page size 2^%d byte}
+							<
+						}
+	
+						if {[N byte 10 0 0 {} {} & 1]} {
+							>
+								if {[N byte 10 0 0 {} {} > 1]} {
+									>
+										emit {\b, max fanout %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-41534659755609471 {
+			>
+				emit {LLVM raw profile data,}
+				if {[N byte [R 0] 0 0 {} {} x {}]} {
+					>
+						emit {version %d}
+					<
+				}
+	
+			<
+		}
+		2566813404 {
+			>
+				if {[N uleshort 8 0 0 {} {} < 10]} {
+					>
+						emit {APT cache data, version %u}
+						if {[N leshort 10 0 0 {} {} x {}]} {
+							>
+								emit {\b.%u, 64 bit little-endian}
+							<
+						}
+	
+						U 15 apt-cache-64bit-be 0
+	
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[N quad 500 0 0 {} {} == 0]} {
+		>
+			if {[N ubeshort 0 0 0 {} {} > 7936]} {
+				>
+					if {[N ubeshort 0 0 0 {} {} < 64765]} {
+						>
+							if {[N ubelong 508 0 0 & 2342424063 == 0]} {
+								>
+									if {[N ubyte 100 0 0 & 200 == 0]} {
+										>
+											if {[N ubyte 101 0 0 & 200 == 0]} {
+												>
+													if {[N ubyte 155 0 0 & 223 == 0]} {
+														>
+															if {[N ubyte 148 0 0 & 239 == 32]} {
+																>
+																	U 16 tar-file 0
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			strength /2
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GNU\ tar-]} {
+		>
+			emit {GNU tar incremental snapshot data}
+			if {[S regex [R 0] 0 {} {} eq \[0-9\].\[0-9\]+-\[0-9\]+]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 070707]} {
+		>
+			emit {ASCII cpio archive (pre-SVR4 or odc)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 070701]} {
+		>
+			emit {ASCII cpio archive (SVR4 with no CRC)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 070702]} {
+		>
+			emit {ASCII cpio archive (SVR4 with CRC)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <ar>]} {
+		>
+			emit {System V Release 1 ar archive}
+			mime application/x-archive
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq !<arch>\ndebian]} {
+		>
+			if {[S string 8 0 {} {} eq debian-split]} {
+				>
+					emit {part of multipart Debian package}
+					mime application/vnd.debian.binary-package
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq debian-binary]} {
+				>
+					emit {Debian binary package}
+					mime application/vnd.debian.binary-package
+				<
+			}
+	
+			if {[S string 8 0 {} {} ne debian]} {
+				>
+				<
+			}
+	
+			if {[S string 68 0 {} {} > \0]} {
+				>
+					emit {(format %s)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq !<arch>\n__________E]} {
+		>
+			emit {MIPS archive}
+			if {[S string 20 0 {} {} eq U]} {
+				>
+					emit {with MIPS Ucode members}
+				<
+			}
+	
+			if {[S string 21 0 {} {} eq L]} {
+				>
+					emit {with MIPSEL members}
+				<
+			}
+	
+			if {[S string 21 0 {} {} eq B]} {
+				>
+					emit {with MIPSEB members}
+				<
+			}
+	
+			if {[S string 19 0 {} {} eq L]} {
+				>
+					emit {and an EL hash table}
+				<
+			}
+	
+			if {[S string 19 0 {} {} eq B]} {
+				>
+					emit {and an EB hash table}
+				<
+			}
+	
+			if {[S string 22 0 {} {} eq X]} {
+				>
+					emit {-- out of date}
+				<
+			}
+	
+			mime application/x-archive
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq -h-]} {
+		>
+			emit {Software Tools format archive text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq !<arch>\n]} {
+		>
+			emit {current ar archive}
+			if {[S string 8 0 {} {} eq __.SYMDEF]} {
+				>
+					emit {random library}
+				<
+			}
+	
+			if {[S string 68 0 {} {} eq __.SYMDEF\ SORTED]} {
+				>
+					emit {random library}
+				<
+			}
+	
+			mime application/x-archive
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq !<thin>\n]} {
+		>
+			emit {thin archive with}
+			switch [Nv belong 68 0 {} {}] {
+				0 {
+					>
+						emit {no symbol entries}
+					<
+				}
+				1 {
+					>
+						emit {%d symbol entry}
+					<
+				}
+			}
+	
+			if {[N belong 68 0 0 {} {} > 1]} {
+				>
+					emit {%d symbol entries}
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv lelong 0 0 & -2139029505] {
+		538 {
+			>
+				emit {ARC archive data, uncompressed}
+				mime application/x-arc
+			<
+		}
+		794 {
+			>
+				emit {ARC archive data, packed}
+				mime application/x-arc
+			<
+		}
+		1050 {
+			>
+				emit {ARC archive data, squeezed}
+				mime application/x-arc
+			<
+		}
+		1562 {
+			>
+				emit {ARC archive data, crunched}
+				mime application/x-arc
+			<
+		}
+		2074 {
+			>
+				emit {ARC archive data, dynamic LZW}
+				mime application/x-arc
+			<
+		}
+		2330 {
+			>
+				emit {ARC archive data, squashed}
+				mime application/x-arc
+			<
+		}
+		2586 {
+			>
+				emit {PAK archive data}
+				mime application/x-arc
+			<
+		}
+		5146 {
+			>
+				emit {ARC+ archive data}
+				mime application/x-arc
+			<
+		}
+		18458 {
+			>
+				emit {HYP archive data}
+				mime application/x-arc
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq \032archive]} {
+		>
+			emit {RISC OS archive (ArcFS format)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Archive\000]} {
+		>
+			emit {RISC OS archive (ArcFS format)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CRUSH]} {
+		>
+			emit {Crush archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HLSQZ]} {
+		>
+			emit {Squeeze It archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SQWEZ]} {
+		>
+			emit {SQWEZ archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HPAK]} {
+		>
+			emit {HPack archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x91\x33HF]} {
+		>
+			emit {HAP archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MDmd]} {
+		>
+			emit {MDCD archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LIM\x1a]} {
+		>
+			emit {LIM archive data}
+		<
+	}
+	
+	if {[S string 3 0 {} {} eq LH5]} {
+		>
+			emit {SAR archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \212\3SB\020\0]} {
+		>
+			emit {BSArc/BS2 archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BSA\0]} {
+		>
+			emit {BSArc archive data}
+			if {[N lelong 4 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -ah]} {
+		>
+			emit {MAR archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq JRchive]} {
+		>
+			emit {JRC archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DS\0]} {
+		>
+			emit {Quantum archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PK\3\6]} {
+		>
+			emit {ReSOF archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 7\4]} {
+		>
+			emit {QuArk archive data}
+		<
+	}
+	
+	if {[S string 14 0 {} {} eq YC]} {
+		>
+			emit {YAC archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq X1]} {
+		>
+			emit {X1 archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XhDr]} {
+		>
+			emit {X1 archive data}
+		<
+	}
+	
+	if {[N belong 0 0 0 & -8192 == 1996431360]} {
+		>
+			emit {CDC Codec archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xad6\"]} {
+		>
+			emit {AMGC archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq N\xc3\xb5F\xc3\xa9lx\xc3\xa5]} {
+		>
+			emit {NuLIB archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LEOLZW]} {
+		>
+			emit {PAKLeo archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SChF]} {
+		>
+			emit {ChArc archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PSA]} {
+		>
+			emit {PSA archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DSIGDCC]} {
+		>
+			emit {CrossePAC archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x1f\x9f\x4a\x10\x0a]} {
+		>
+			emit {Freeze archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xc2\xa8MP\xc2\xa8]} {
+		>
+			emit {KBoom archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x76\xff]} {
+		>
+			emit {NSQ archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Dirk\ Paehl]} {
+		>
+			emit {DPA archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\6]} {
+		>
+			if {[S search 12 0 {} 261 eq DESIGN]} {
+				>
+				<
+			}
+	
+			if {[D 12]} {
+				>
+					emit {TTComp archive, binary, 4K dictionary}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ESP]} {
+		>
+			emit {ESP archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \1ZPK\1]} {
+		>
+			emit {ZPack archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xbc\x40]} {
+		>
+			emit {Sky archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq UFA]} {
+		>
+			emit {UFA archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq -H2O]} {
+		>
+			emit {DRY archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FOXSQZ]} {
+		>
+			emit {FoxSQZ archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ,AR7]} {
+		>
+			emit {AR7 archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PPMZ]} {
+		>
+			emit {PPMZ archive data}
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq \x88\xf0\x27]} {
+		>
+			if {[S string 0 0 {} {} eq KWAJ]} {
+				>
+					emit {MS Compress archive data, KWAJ variant}
+					if {[N uleshort 8 0 0 {} {} x {}]} {
+						>
+							emit {\b, %u method}
+						<
+					}
+	
+					if {[N uleshort 10 0 0 {} {} x {}]} {
+						>
+							emit {\b, 0x%x offset}
+						<
+					}
+	
+					if {[N uleshort 12 0 0 {} {} > 0]} {
+						>
+							emit {\b, 0x%x flags}
+						<
+					}
+	
+					if {[N uleshort 12 0 0 {} {} & 1]} {
+						>
+							if {[N ulelong 14 0 0 {} {} x {}]} {
+								>
+									emit {\b, original size: %u bytes}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N uleshort 12 0 0 {} {} & 8]} {
+						>
+							if {[N uleshort 12 0 0 {} {} ^ 1]} {
+								>
+									if {[N uleshort 12 0 0 {} {} ^ 2]} {
+										>
+											if {[N uleshort 12 0 0 {} {} ^ 4]} {
+												>
+													if {[N uleshort 12 0 0 {} {} ^ 16]} {
+														>
+															if {[S string 14 0 {} {} x {}]} {
+																>
+																	emit {\b, %-.8s}
+																<
+															}
+	
+														<
+													}
+	
+													if {[N uleshort 12 0 0 {} {} & 16]} {
+														>
+															if {[S string 14 0 {} {} x {}]} {
+																>
+																	emit {\b, %-.8s}
+																	if {[S string [R 1] 0 {} {} x {}]} {
+																		>
+																			emit {\b.%-.3s}
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+											if {[N uleshort 12 0 0 {} {} & 4]} {
+												>
+													if {[N uleshort 12 0 0 {} {} ^ 16]} {
+														>
+															if {[N uleshort [I 14 uleshort 0 + 0 0] 0 0 {} {} x {}]} {
+																>
+																	if {[S string [R 14] 0 {} {} x {}]} {
+																		>
+																			emit {\b, %-.8s}
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+													if {[N uleshort 12 0 0 {} {} & 16]} {
+														>
+															if {[N uleshort [I 14 uleshort 0 + 0 0] 0 0 {} {} x {}]} {
+																>
+																	if {[S string [R 14] 0 {} {} x {}]} {
+																		>
+																			emit {\b, %-.8s}
+																			if {[S string [R 1] 0 {} {} x {}]} {
+																				>
+																					emit {\b.%-.3s}
+																				<
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[N uleshort 12 0 0 {} {} & 2]} {
+										>
+											if {[N uleshort 12 0 0 {} {} ^ 4]} {
+												>
+													if {[N uleshort 12 0 0 {} {} ^ 16]} {
+														>
+															if {[S string 16 0 {} {} x {}]} {
+																>
+																	emit {\b, %-.8s}
+																<
+															}
+	
+														<
+													}
+	
+													if {[N uleshort 12 0 0 {} {} & 16]} {
+														>
+															if {[S string 16 0 {} {} x {}]} {
+																>
+																	emit {\b, %-.8s}
+																	if {[S string [R 1] 0 {} {} x {}]} {
+																		>
+																			emit {\b.%-.3s}
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+											if {[N uleshort 12 0 0 {} {} & 4]} {
+												>
+													if {[N uleshort 12 0 0 {} {} ^ 16]} {
+														>
+															if {[N uleshort [I 16 uleshort 0 + 0 0] 0 0 {} {} x {}]} {
+																>
+																	if {[S string [R 16] 0 {} {} x {}]} {
+																		>
+																			emit {\b, %-.8s}
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+													if {[N uleshort 12 0 0 {} {} & 16]} {
+														>
+															if {[N uleshort [I 16 uleshort 0 + 0 0] 0 0 {} {} x {}]} {
+																>
+																<
+															}
+	
+															if {[S string [R 16] 0 {} {} x {}]} {
+																>
+																	emit %-.8s
+																	if {[S string [R 1] 0 {} {} x {}]} {
+																		>
+																			emit {\b.%-.3s}
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+							if {[N uleshort 12 0 0 {} {} & 1]} {
+								>
+									if {[N uleshort 12 0 0 {} {} ^ 2]} {
+										>
+											if {[N uleshort 12 0 0 {} {} ^ 4]} {
+												>
+													if {[N uleshort 12 0 0 {} {} ^ 16]} {
+														>
+															if {[S string 18 0 {} {} x {}]} {
+																>
+																	emit {\b, %-.8s}
+																<
+															}
+	
+														<
+													}
+	
+													if {[N uleshort 12 0 0 {} {} & 16]} {
+														>
+															if {[S string 18 0 {} {} x {}]} {
+																>
+																	emit {\b, %-.8s}
+																	if {[S string [R 1] 0 {} {} x {}]} {
+																		>
+																			emit {\b.%-.3s}
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+											if {[N uleshort 12 0 0 {} {} & 4]} {
+												>
+													if {[N uleshort 12 0 0 {} {} ^ 16]} {
+														>
+															if {[N uleshort [I 18 uleshort 0 + 0 0] 0 0 {} {} x {}]} {
+																>
+																	if {[S string [R 18] 0 {} {} x {}]} {
+																		>
+																			emit {\b, %-.8s}
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+													if {[N uleshort 12 0 0 {} {} & 16]} {
+														>
+															if {[N uleshort [I 18 uleshort 0 + 0 0] 0 0 {} {} x {}]} {
+																>
+																	if {[S string [R 18] 0 {} {} x {}]} {
+																		>
+																			emit {\b, %-.8s}
+																			if {[S string [R 1] 0 {} {} x {}]} {
+																				>
+																					emit {\b.%-.3s}
+																				<
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[N uleshort 12 0 0 {} {} & 2]} {
+										>
+											if {[N uleshort 12 0 0 {} {} ^ 4]} {
+												>
+													if {[N uleshort 12 0 0 {} {} ^ 16]} {
+														>
+															if {[S string 20 0 {} {} x {}]} {
+																>
+																	emit {\b, %-.8s}
+																<
+															}
+	
+														<
+													}
+	
+													if {[N uleshort 12 0 0 {} {} & 16]} {
+														>
+															if {[S string 20 0 {} {} x {}]} {
+																>
+																	emit {\b, %-.8s}
+																	if {[S string [R 1] 0 {} {} x {}]} {
+																		>
+																			emit {\b.%-.3s}
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+											if {[N uleshort 12 0 0 {} {} & 4]} {
+												>
+													if {[N uleshort 12 0 0 {} {} ^ 16]} {
+														>
+															if {[N uleshort [I 20 uleshort 0 + 0 0] 0 0 {} {} x {}]} {
+																>
+																	if {[S string [R 20] 0 {} {} x {}]} {
+																		>
+																			emit {\b, %-.8s}
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+													if {[N uleshort 12 0 0 {} {} & 16]} {
+														>
+															if {[N uleshort [I 20 uleshort 0 + 0 0] 0 0 {} {} x {}]} {
+																>
+																	if {[S string [R 20] 0 {} {} x {}]} {
+																		>
+																			emit {\b, %-.8s}
+																			if {[S string [R 1] 0 {} {} x {}]} {
+																				>
+																					emit {\b.%-.3s}
+																				<
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					mime application/x-ms-compress-kwaj
+					ext ??_
+				<
+			}
+	
+			if {[S string 0 0 {} {} eq SZDD]} {
+				>
+					emit {MS Compress archive data, SZDD variant}
+					if {[S string 9 0 {} {} > \0]} {
+						>
+							emit {\b, %-.1s is last character of original name}
+						<
+					}
+	
+					if {[S string 8 0 {} {} ne A]} {
+						>
+							emit {\b, %-.1s method}
+						<
+					}
+	
+					if {[N ulelong 10 0 0 {} {} > 0]} {
+						>
+							emit {\b, original size: %u bytes}
+						<
+					}
+	
+					mime application/x-ms-compress-szdd
+					ext ??_
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 3 0 {} {} eq \x88\xf0\x27]} {
+		>
+			if {[S string 0 0 {} {} eq SZ\x20]} {
+				>
+					emit {MS Compress archive data, QBasic variant}
+					if {[N ulelong 8 0 0 {} {} > 0]} {
+						>
+							emit {\b, original size: %u bytes}
+						<
+					}
+	
+					mime application/x-ms-compress-sz
+					ext {??$}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MP3\x1a]} {
+		>
+			emit {MP3-Archiver archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq OZ\xc3\x9d]} {
+		>
+			emit {ZET archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x65\x5d\x13\x8c\x08\x01\x03\x00]} {
+		>
+			emit {TSComp archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq gW\4\1]} {
+		>
+			emit {ARQ archive data}
+		<
+	}
+	
+	if {[S string 3 0 {} {} eq OctSqu]} {
+		>
+			emit {Squash archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \5\1\1\0]} {
+		>
+			emit {Terse archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x01\x08\x0b\x08\xef\x00\x9e\x32\x30\x36\x31]} {
+		>
+			emit {PUCrunch archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq UHA]} {
+		>
+			emit {UHarc archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \2AB]} {
+		>
+			emit {ABComp archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \3AB2]} {
+		>
+			emit {ABComp archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CO\0]} {
+		>
+			emit {CMP archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x93\xb9\x06]} {
+		>
+			emit {Splint archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x13\x5d\x65\x8c]} {
+		>
+			emit {InstallShield Z archive Data}
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq GTH]} {
+		>
+			emit {Gather archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BOA]} {
+		>
+			emit {BOA archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ULEB\xa]} {
+		>
+			emit {RAX archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ULEB\0]} {
+		>
+			emit {Xtreme archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq @\xc3\xa2\1\0]} {
+		>
+			emit {Pack Magic archive data}
+		<
+	}
+	
+	if {[N belong 0 0 0 & -16777217 == 436421733]} {
+		>
+			emit {BTS archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Ora\ ]} {
+		>
+			emit {ELI 5750 archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x1aFC\x1a]} {
+		>
+			emit {QFC archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x1aQF\x1a]} {
+		>
+			emit {QFC archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RNC]} {
+		>
+			emit {PRO-PACK archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 777]} {
+		>
+			emit {777 archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq sTaC]} {
+		>
+			emit {LZS221 archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HPA]} {
+		>
+			emit {HPA archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LG]} {
+		>
+			emit {Arhangel archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 0123456789012345BZh]} {
+		>
+			emit {EXP1 archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IMP\xa]} {
+		>
+			emit {IMP archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x00\x9E\x6E\x72\x76\xFF]} {
+		>
+			emit {NRV archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x73\xb2\x90\xf4]} {
+		>
+			emit {Squish archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PHILIPP]} {
+		>
+			emit {Par archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PAR]} {
+		>
+			emit {Par archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq UB]} {
+		>
+			emit {HIT archive data}
+		<
+	}
+	
+	if {[N belong 0 0 0 & -4096 == 1396846592]} {
+		>
+			emit {SBX archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NSK]} {
+		>
+			emit {NaShrink archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ CAR\ archive\ header]} {
+		>
+			emit {SAPCAR archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CAR\ 2.00RG]} {
+		>
+			emit {SAPCAR archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DST]} {
+		>
+			emit {Disintegrator archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ASD]} {
+		>
+			emit {ASD archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ISc(]} {
+		>
+			emit {InstallShield CAB}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq T4\x1a]} {
+		>
+			emit {TOP4 archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BH\5\7]} {
+		>
+			emit {BlakHole archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BIX0]} {
+		>
+			emit {BIX archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ChfLZ]} {
+		>
+			emit {ChiefLZA archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Blink]} {
+		>
+			emit {Blink archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xda\xfa]} {
+		>
+			emit {Logitech Compress archive data}
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq (C)\ STEPANYUK]} {
+		>
+			emit {ARS-Sfx archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AKT32]} {
+		>
+			emit {AKT32 archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AKT]} {
+		>
+			emit {AKT archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MSTSM]} {
+		>
+			emit {NPack archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\x50\0\x14]} {
+		>
+			emit {PFT archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SEM]} {
+		>
+			emit {SemOne archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x8f\xaf\xac\x84]} {
+		>
+			emit {PPMD archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FIZ]} {
+		>
+			emit {FIZ archive data}
+		<
+	}
+	
+	if {[N belong 0 0 0 & -3856 == 1297285120]} {
+		>
+			emit {MSXiE archive data}
+		<
+	}
+	
+	switch [Nv belong 0 0 & -16] {
+		0 {
+			>
+				if {[N beshort 4 0 0 {} {} == 2569]} {
+					>
+						if {[S string 6 0 {} {} eq OSMHeader]} {
+							>
+								emit {OpenStreetMap Protocolbuffer Binary Format}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		1612316672 {
+			>
+				emit {Atari ST M68K contiguous executable}
+				if {[N belong 2 0 0 {} {} x {}]} {
+					>
+						emit (txt=%d,
+					<
+				}
+	
+				if {[N belong 6 0 0 {} {} x {}]} {
+					>
+						emit dat=%d,
+					<
+				}
+	
+				if {[N belong 10 0 0 {} {} x {}]} {
+					>
+						emit bss=%d,
+					<
+				}
+	
+				if {[N belong 14 0 0 {} {} x {}]} {
+					>
+						emit sym=%d)
+					<
+				}
+	
+			<
+		}
+		1612382208 {
+			>
+				emit {Atari ST M68K non-contig executable}
+				if {[N belong 2 0 0 {} {} x {}]} {
+					>
+						emit (txt=%d,
+					<
+				}
+	
+				if {[N belong 6 0 0 {} {} x {}]} {
+					>
+						emit dat=%d,
+					<
+				}
+	
+				if {[N belong 10 0 0 {} {} x {}]} {
+					>
+						emit bss=%d,
+					<
+				}
+	
+				if {[N belong 14 0 0 {} {} x {}]} {
+					>
+						emit sym=%d)
+					<
+				}
+	
+			<
+		}
+		2038050864 {
+			>
+				emit {DeepFreezer archive data}
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq <DC-]} {
+		>
+			emit {DC archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \4TPAC\3]} {
+		>
+			emit {TPac archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Ai\1\1\0]} {
+		>
+			emit {Ai archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Ai\1\0\0]} {
+		>
+			emit {Ai archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Ai\2\0]} {
+		>
+			emit {Ai32 archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Ai\2\1]} {
+		>
+			emit {Ai32 archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SBC]} {
+		>
+			emit {SBC archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq YBS]} {
+		>
+			emit {Ybs archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x9e\0\0]} {
+		>
+			emit {DitPack archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DMS!]} {
+		>
+			emit {DMS archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x8f\xaf\xac\x8c]} {
+		>
+			emit {EPC archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq VS\x1a]} {
+		>
+			emit {VSARC archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PDZ]} {
+		>
+			emit {PDZ archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq rdqx]} {
+		>
+			emit {ReDuq archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GCAX]} {
+		>
+			emit {GCA archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq pN]} {
+		>
+			emit {PPMN archive data}
+		<
+	}
+	
+	if {[S string 3 0 {} {} eq WINIMAGE]} {
+		>
+			emit {WinImage archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CMP0CMP]} {
+		>
+			emit {Compressia archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq UHB]} {
+		>
+			emit {UHBC archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x61\x5C\x04\x05]} {
+		>
+			emit {WinHKI archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq WWP]} {
+		>
+			emit {WWPack archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xffBSG]} {
+		>
+			emit {BSN archive data}
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq \xffBSG]} {
+		>
+			emit {BSN archive data}
+		<
+	}
+	
+	if {[S string 3 0 {} {} eq \xffBSG]} {
+		>
+			emit {BSN archive data}
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq \0\xae\2]} {
+		>
+			emit {BSN archive data}
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq \0\xae\3]} {
+		>
+			emit {BSN archive data}
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq \0\xae\7]} {
+		>
+			emit {BSN archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x33\x18]} {
+		>
+			emit {AIN archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x33\x17]} {
+		>
+			emit {AIN archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SZ\x0a\4]} {
+		>
+			emit {SZip archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq jm]} {
+		>
+			if {[S string 2 0 {} {} eq \x2\x4]} {
+				>
+					emit {Xpack DiskImage archive data}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq xpa]} {
+		>
+			emit XPA
+			if {[S string 0 0 {} {} eq xpa\0\1]} {
+				>
+					emit {\b32 archive data}
+				<
+			}
+	
+			if {[N ubeshort 3 0 0 {} {} != 1]} {
+				>
+					emit {\bck archive data}
+				<
+			}
+	
+			ext xpa
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xcd\ jm]} {
+		>
+			emit {Xpack single archive data}
+			ext xpa
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DZ]} {
+		>
+			if {[N byte 2 0 0 {} {} < 4]} {
+				>
+					emit {Dzip archive data}
+					if {[N byte 2 0 0 {} {} x {}]} {
+						>
+							emit {\b, version %i}
+						<
+					}
+	
+					if {[N byte 3 0 0 {} {} x {}]} {
+						>
+							emit {\b.%i}
+						<
+					}
+	
+					if {[N ulelong 4 0 0 {} {} x {}]} {
+						>
+							emit {\b, offset 0x%x}
+						<
+					}
+	
+					if {[N ulelong 8 0 0 {} {} x {}]} {
+						>
+							emit {\b, %u files}
+						<
+					}
+	
+					mime application/x-dzip
+					ext dz
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ZZ\ \0\0]} {
+		>
+			emit {ZZip archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ZZ0]} {
+		>
+			emit {ZZip archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xaa\x40\x5f\x77\x1f\xe5\x82\x0d]} {
+		>
+			emit {PAQ archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PAQ]} {
+		>
+			emit {PAQ archive data}
+			if {[N byte 3 0 0 & -16 == 48]} {
+				>
+					if {[N byte 3 0 0 {} {} x {}]} {
+						>
+							emit (v%c)
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 14 0 {} {} eq \x1aJar\x1b]} {
+		>
+			emit {JAR (ARJ Software, Inc.) archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq JARCS]} {
+		>
+			emit {JAR (ARJ Software, Inc.) archive data}
+		<
+	}
+	
+	switch [Nv leshort 2 0 {} {}] {
+		-5536 {
+			>
+				emit {ARJ archive data}
+			<
+		}
+		14336 {
+			>
+				emit {BS image,}
+				if {[N leshort 6 0 0 {} {} x {}]} {
+					>
+						emit {Version %d,}
+					<
+				}
+	
+				if {[N leshort 4 0 0 {} {} x {}]} {
+					>
+						emit {Quantization %d,}
+					<
+				}
+	
+				if {[N leshort 0 0 0 {} {} x {}]} {
+					>
+						emit {(Decompresses to %d words)}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[N belong 0 0 0 & -65284 == 1212219392]} {
+		>
+			emit {HA archive data}
+			if {[N leshort 2 0 0 {} {} == 1]} {
+				>
+					emit {1 file,}
+				<
+			}
+	
+			if {[N leshort 2 0 0 {} {} > 1]} {
+				>
+					emit {%u files,}
+				<
+			}
+	
+			switch [Nv byte 4 0 & 15] {
+				0 {
+					>
+						emit {first is type CPY}
+					<
+				}
+				1 {
+					>
+						emit {first is type ASC}
+					<
+				}
+				2 {
+					>
+						emit {first is type HSC}
+					<
+				}
+				14 {
+					>
+						emit {first is type DIR}
+					<
+				}
+				15 {
+					>
+						emit {first is type SPECIAL}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HPAK]} {
+		>
+			emit {HPACK archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \351,\001JAM\ ]} {
+		>
+			emit {JAM archive,}
+			if {[S string 7 0 {} {} > \0]} {
+				>
+					emit {version %.4s}
+				<
+			}
+	
+			if {[N byte 38 0 0 {} {} == 39]} {
+				>
+					emit -
+					if {[S string 43 0 {} {} > \0]} {
+						>
+							emit {label %.11s,}
+						<
+					}
+	
+					if {[N lelong 39 0 0 {} {} x {}]} {
+						>
+							emit {serial %08x,}
+						<
+					}
+	
+					if {[S string 54 0 {} {} > \0]} {
+						>
+							emit {fstype %.8s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lh0-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lh1-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lz2-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lz3-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lz4-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lz5-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lz7-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lz8-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lzs-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lhd-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lh2-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lh3-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lh4-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lh5-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lh6-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lh7-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lh8-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lh9-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lha-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lhb-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lhc-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lhe-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lhx-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -lZ]} {
+		>
+			emit {PUT archive data}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -sw1-]} {
+		>
+			emit {Swag archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Rar!\x1a\7\0]} {
+		>
+			emit {RAR archive data}
+			switch [Nv byte [I 12 ulelong 0 + 0 9] 0 {} {}] {
+				116 {
+					>
+						U 16 rar-file-header [I 12 ulelong 0 + 0 7]
+	
+					<
+				}
+				122 {
+					>
+						U 16 rar-file-header [I 12 ulelong 0 + 0 7]
+	
+					<
+				}
+			}
+	
+			if {[N byte 9 0 0 {} {} == 115]} {
+				>
+					U 16 rar-archive-header 7
+	
+				<
+			}
+	
+			mime application/x-rar
+			ext rar/cbr
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Rar!\x1a\7\1\0]} {
+		>
+			emit {RAR archive data, v5}
+			mime application/x-rar
+			ext rar
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RE\x7e\x5e]} {
+		>
+			emit {RAR archive data (<v1.5)}
+			mime application/x-rar
+			ext rar/cbr
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SQSH]} {
+		>
+			emit {squished archive data (Acorn RISCOS)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq UC2\x1a]} {
+		>
+			emit {UC2 archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PK\x07\x08PK\x03\x04]} {
+		>
+			emit {Zip multi-volume archive data, at least PKZIP v2.50 to extract}
+			mime application/zip
+			ext zip/cbz
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PK\005\006]} {
+		>
+			emit {Zip archive data (empty)}
+			mime application/zip
+			ext zip/cbz
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PK\003\004]} {
+		>
+			if {[S string 26 0 {} {} eq \x8\0\0\0mimetypeapplication/]} {
+				>
+					if {[S string 50 0 {} {} eq vnd.kde.]} {
+						>
+							emit {KOffice (>=1.2)}
+							if {[S string 58 0 {} {} eq karbon]} {
+								>
+									emit {Karbon document}
+								<
+							}
+	
+							if {[S string 58 0 {} {} eq kchart]} {
+								>
+									emit {KChart document}
+								<
+							}
+	
+							if {[S string 58 0 {} {} eq kformula]} {
+								>
+									emit {KFormula document}
+								<
+							}
+	
+							if {[S string 58 0 {} {} eq kivio]} {
+								>
+									emit {Kivio document}
+								<
+							}
+	
+							if {[S string 58 0 {} {} eq kontour]} {
+								>
+									emit {Kontour document}
+								<
+							}
+	
+							if {[S string 58 0 {} {} eq kpresenter]} {
+								>
+									emit {KPresenter document}
+								<
+							}
+	
+							if {[S string 58 0 {} {} eq kspread]} {
+								>
+									emit {KSpread document}
+								<
+							}
+	
+							if {[S string 58 0 {} {} eq kword]} {
+								>
+									emit {KWord document}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string 50 0 {} {} eq vnd.sun.xml.]} {
+						>
+							emit {OpenOffice.org 1.x}
+							if {[S string 62 0 {} {} eq writer]} {
+								>
+									emit Writer
+									if {[N byte 68 0 0 {} {} != 46]} {
+										>
+											emit document
+										<
+									}
+	
+									if {[S string 68 0 {} {} eq .template]} {
+										>
+											emit template
+										<
+									}
+	
+									if {[S string 68 0 {} {} eq .global]} {
+										>
+											emit {global document}
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string 62 0 {} {} eq calc]} {
+								>
+									emit Calc
+									if {[N byte 66 0 0 {} {} != 46]} {
+										>
+											emit spreadsheet
+										<
+									}
+	
+									if {[S string 66 0 {} {} eq .template]} {
+										>
+											emit template
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string 62 0 {} {} eq draw]} {
+								>
+									emit Draw
+									if {[N byte 66 0 0 {} {} != 46]} {
+										>
+											emit document
+										<
+									}
+	
+									if {[S string 66 0 {} {} eq .template]} {
+										>
+											emit template
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string 62 0 {} {} eq impress]} {
+								>
+									emit Impress
+									if {[N byte 69 0 0 {} {} != 46]} {
+										>
+											emit presentation
+										<
+									}
+	
+									if {[S string 69 0 {} {} eq .template]} {
+										>
+											emit template
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string 62 0 {} {} eq math]} {
+								>
+									emit {Math document}
+								<
+							}
+	
+							if {[S string 62 0 {} {} eq base]} {
+								>
+									emit {Database file}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string 50 0 {} {} eq vnd.oasis.opendocument.]} {
+						>
+							emit OpenDocument
+							if {[S string 73 0 {} {} eq text]} {
+								>
+									if {[N byte 77 0 0 {} {} != 45]} {
+										>
+											emit Text
+											mime application/vnd.oasis.opendocument.text
+										<
+									}
+	
+									if {[S string 77 0 {} {} eq -template]} {
+										>
+											emit {Text Template}
+											mime application/vnd.oasis.opendocument.text-template
+										<
+									}
+	
+									if {[S string 77 0 {} {} eq -web]} {
+										>
+											emit {HTML Document Template}
+											mime application/vnd.oasis.opendocument.text-web
+										<
+									}
+	
+									if {[S string 77 0 {} {} eq -master]} {
+										>
+											emit {Master Document}
+											mime application/vnd.oasis.opendocument.text-master
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string 73 0 {} {} eq graphics]} {
+								>
+									if {[N byte 81 0 0 {} {} != 45]} {
+										>
+											emit Drawing
+											mime application/vnd.oasis.opendocument.graphics
+										<
+									}
+	
+									if {[S string 81 0 {} {} eq -template]} {
+										>
+											emit Template
+											mime application/vnd.oasis.opendocument.graphics-template
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string 73 0 {} {} eq presentation]} {
+								>
+									if {[N byte 85 0 0 {} {} != 45]} {
+										>
+											emit Presentation
+											mime application/vnd.oasis.opendocument.presentation
+										<
+									}
+	
+									if {[S string 85 0 {} {} eq -template]} {
+										>
+											emit Template
+											mime application/vnd.oasis.opendocument.presentation-template
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string 73 0 {} {} eq spreadsheet]} {
+								>
+									if {[N byte 84 0 0 {} {} != 45]} {
+										>
+											emit Spreadsheet
+											mime application/vnd.oasis.opendocument.spreadsheet
+										<
+									}
+	
+									if {[S string 84 0 {} {} eq -template]} {
+										>
+											emit Template
+											mime application/vnd.oasis.opendocument.spreadsheet-template
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string 73 0 {} {} eq chart]} {
+								>
+									if {[N byte 78 0 0 {} {} != 45]} {
+										>
+											emit Chart
+											mime application/vnd.oasis.opendocument.chart
+										<
+									}
+	
+									if {[S string 78 0 {} {} eq -template]} {
+										>
+											emit Template
+											mime application/vnd.oasis.opendocument.chart-template
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string 73 0 {} {} eq formula]} {
+								>
+									if {[N byte 80 0 0 {} {} != 45]} {
+										>
+											emit Formula
+											mime application/vnd.oasis.opendocument.formula
+										<
+									}
+	
+									if {[S string 80 0 {} {} eq -template]} {
+										>
+											emit Template
+											mime application/vnd.oasis.opendocument.formula-template
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string 73 0 {} {} eq database]} {
+								>
+									emit Database
+									mime application/vnd.oasis.opendocument.database
+								<
+							}
+	
+							if {[S string 73 0 {} {} eq base]} {
+								>
+									emit Database
+									mime application/vnd.oasis.opendocument.base
+								<
+							}
+	
+							if {[S string 73 0 {} {} eq image]} {
+								>
+									if {[N byte 78 0 0 {} {} != 45]} {
+										>
+											emit Image
+											mime application/vnd.oasis.opendocument.image
+										<
+									}
+	
+									if {[S string 78 0 {} {} eq -template]} {
+										>
+											emit Template
+											mime application/vnd.oasis.opendocument.image-template
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string 50 0 {} {} eq epub+zip]} {
+						>
+							emit {EPUB document}
+							mime application/epub+zip
+						<
+					}
+	
+					if {[S string 50 0 {} {} ne epub+zip]} {
+						>
+							if {[S string 50 0 {} {} ne vnd.oasis.opendocument.]} {
+								>
+									if {[S string 50 0 {} {} ne vnd.sun.xml.]} {
+										>
+											if {[S string 50 0 {} {} ne vnd.kde.]} {
+												>
+													if {[S regex 38 0 {} {} eq \[!-OQ-~\]+]} {
+														>
+															emit {Zip data (MIME type "%s"?)}
+															mime application/zip
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 26 0 {} {} eq \x8\0\0\0mimetype]} {
+				>
+					if {[S string 38 0 {} {} ne application/]} {
+						>
+							if {[S regex 38 0 {} {} eq \[!-OQ-~\]+]} {
+								>
+									emit {Zip data (MIME type "%s"?)}
+									mime application/zip
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N leshort [I 26 uleshort 0 + 0 30] 0 0 {} {} == -13570]} {
+				>
+					emit {Java archive data (JAR)}
+					mime application/java-archive
+				<
+			}
+	
+			if {[N leshort [I 26 uleshort 0 + 0 30] 0 0 {} {} != -13570]} {
+				>
+					if {[S string 26 0 {} {} ne \x8\0\0\0mimetype]} {
+						>
+							if {[S string 30 0 {} {} eq Payload/]} {
+								>
+									if {[S search 38 0 {} 64 eq .app/]} {
+										>
+											emit {iOS App}
+											mime application/x-ios-app
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N leshort [I 26 uleshort 0 + 0 30] 0 0 {} {} != -13570]} {
+				>
+					if {[S string 26 0 {} {} ne \x8\0\0\0mimetype]} {
+						>
+							emit {Zip archive data}
+							if {[N beshort 4 0 0 {} {} x {}]} {
+								>
+									emit {\b, at least}
+								<
+							}
+	
+							U 16 zipversion 4
+	
+							if {[N beshort 4 0 0 {} {} x {}]} {
+								>
+									emit {to extract}
+								<
+							}
+	
+							if {[S string 353 0 {} {} eq WINZIP]} {
+								>
+									emit {\b, WinZIP self-extracting}
+								<
+							}
+	
+							mime application/zip
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq VCLMTF]} {
+		>
+			emit {StarView MetaFile}
+			if {[N beshort 6 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d}
+				<
+			}
+	
+			if {[N belong 8 0 0 {} {} x {}]} {
+				>
+					emit {\b, size %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lelong 20 0 0 {} {} == -37443620]} {
+		>
+			emit {Zoo archive data}
+			if {[N byte 4 0 0 {} {} > 48]} {
+				>
+					emit {\b, v%c.}
+					if {[N byte 6 0 0 {} {} > 47]} {
+						>
+							emit {\b%c}
+							if {[N byte 7 0 0 {} {} > 47]} {
+								>
+									emit {\b%c}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 32 0 0 {} {} > 0]} {
+				>
+					emit {\b, modify: v%d}
+					if {[N byte 33 0 0 {} {} x {}]} {
+						>
+							emit {\b.%d+}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N lelong 42 0 0 {} {} == -37443620]} {
+				>
+					emit {\b,}
+					if {[N byte 70 0 0 {} {} > 0]} {
+						>
+							emit {extract: v%d}
+							if {[N byte 71 0 0 {} {} x {}]} {
+								>
+									emit {\b.%d+}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			mime application/x-zoo
+		<
+	}
+	
+	if {[S string 10 0 {} {} eq \#\ This\ is\ a\ shell\ archive]} {
+		>
+			emit {shell archive text}
+			mime application/octet-stream
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\ \ \ \ \ \ \ \ \ \ \ \0\0]} {
+		>
+			emit {LBR archive data}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -pm0-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -pm1-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -pm2-]} {
+		>
+			U 16 lharc-file 0
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -pms-]} {
+		>
+			emit {PMarc SFX archive (CP/M, DOS)}
+			ext com
+		<
+	}
+	
+	if {[S string 5 0 {} {} eq -pc1-]} {
+		>
+			emit {PopCom compressed executable (CP/M)}
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq gtktalog\ ]} {
+		>
+			emit {GTKtalog catalog data,}
+			if {[S string 13 0 {} {} eq 3]} {
+				>
+					emit {version 3}
+					if {[N beshort 14 0 0 {} {} == 26490]} {
+						>
+							emit (gzipped)
+						<
+					}
+	
+					if {[N beshort 14 0 0 {} {} != 26490]} {
+						>
+							emit {(not gzipped)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 13 0 {} {} > 3]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PAR\0]} {
+		>
+			emit {PARity archive data}
+			if {[N leshort 48 0 0 {} {} == 0]} {
+				>
+					emit {- Index file}
+				<
+			}
+	
+			if {[N leshort 48 0 0 {} {} > 0]} {
+				>
+					emit {- file number %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq d8:announce]} {
+		>
+			emit {BitTorrent file}
+			mime application/x-bittorrent
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq d13:announce-list]} {
+		>
+			emit {BitTorrent file}
+			mime application/x-bittorrent
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PK00PK\003\004]} {
+		>
+			emit {Zip archive data}
+			mime application/zip
+			ext zip/cbz
+		<
+	}
+	
+	if {[S string 7 0 {} {} eq **ACE**]} {
+		>
+			emit {ACE archive data}
+			if {[N byte 15 0 0 {} {} > 0]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+			switch [Nv byte 16 0 {} {}] {
+				0 {
+					>
+						emit {\b, from MS-DOS}
+					<
+				}
+				1 {
+					>
+						emit {\b, from OS/2}
+					<
+				}
+				2 {
+					>
+						emit {\b, from Win/32}
+					<
+				}
+				3 {
+					>
+						emit {\b, from Unix}
+					<
+				}
+				4 {
+					>
+						emit {\b, from MacOS}
+					<
+				}
+				5 {
+					>
+						emit {\b, from WinNT}
+					<
+				}
+				6 {
+					>
+						emit {\b, from Primos}
+					<
+				}
+				7 {
+					>
+						emit {\b, from AppleGS}
+					<
+				}
+				8 {
+					>
+						emit {\b, from Atari}
+					<
+				}
+				9 {
+					>
+						emit {\b, from Vax/VMS}
+					<
+				}
+				10 {
+					>
+						emit {\b, from Amiga}
+					<
+				}
+				11 {
+					>
+						emit {\b, from Next}
+					<
+				}
+			}
+	
+			if {[N byte 14 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d to extract}
+				<
+			}
+	
+			if {[N leshort 5 0 0 {} {} & 128]} {
+				>
+					emit {\b, multiple volumes,}
+					if {[N byte 17 0 0 {} {} x {}]} {
+						>
+							emit {\b (part %d),}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N leshort 5 0 0 {} {} & 2]} {
+				>
+					emit {\b, contains comment}
+				<
+			}
+	
+			if {[N leshort 5 0 0 {} {} & 512]} {
+				>
+					emit {\b, sfx}
+				<
+			}
+	
+			if {[N leshort 5 0 0 {} {} & 1024]} {
+				>
+					emit {\b, small dictionary}
+				<
+			}
+	
+			if {[N leshort 5 0 0 {} {} & 2048]} {
+				>
+					emit {\b, multi-volume}
+				<
+			}
+	
+			if {[N leshort 5 0 0 {} {} & 4096]} {
+				>
+					emit {\b, contains AV-String}
+					if {[S string 30 0 {} {} eq \x16*UNREGISTERED\x20VERSION*]} {
+						>
+							emit (unregistered)
+						<
+					}
+	
+				<
+			}
+	
+			if {[N leshort 5 0 0 {} {} & 8192]} {
+				>
+					emit {\b, with recovery record}
+				<
+			}
+	
+			if {[N leshort 5 0 0 {} {} & 16384]} {
+				>
+					emit {\b, locked}
+				<
+			}
+	
+			if {[N leshort 5 0 0 {} {} & -32768]} {
+				>
+					emit {\b, solid}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 26 0 {} {} eq sfArk]} {
+		>
+			emit {sfArk compressed Soundfont}
+			if {[S string 21 0 {} {} eq 2]} {
+				>
+					if {[S string 1 0 {} {} > \0]} {
+						>
+							emit {Version %s}
+						<
+					}
+	
+					if {[S string 42 0 {} {} > \0]} {
+						>
+							emit {: %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Packed\ File\ ]} {
+		>
+			emit {Personal NetWare Packed File}
+			if {[S string 12 0 {} {} x {}]} {
+				>
+					emit {\b, was "%.12s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RZIP]} {
+		>
+			emit {rzip compressed data}
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {- version %d}
+				<
+			}
+	
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+			if {[N belong 6 0 0 {} {} x {}]} {
+				>
+					emit {(%d bytes)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lelong 8 0 0 {} {} == 268436505]} {
+		>
+			emit {Symbian installation file}
+			switch [Nv lelong 4 0 {} {}] {
+				268435565 {
+					>
+						emit {(EPOC release 3/4/5)}
+					<
+				}
+				268450322 {
+					>
+						emit {(EPOC release 6)}
+					<
+				}
+			}
+	
+			mime application/vnd.symbian.install
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MPQ\032]} {
+		>
+			emit {MoPaQ (MPQ) archive}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq KGB_arch]} {
+		>
+			emit {KGB Archiver file}
+			if {[S string 10 0 {} {} x {}]} {
+				>
+					emit {with compression level %.1s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq xar!]} {
+		>
+			emit {xar archive}
+			if {[N beshort 6 0 0 {} {} x {}]} {
+				>
+					emit {version %d,}
+				<
+			}
+	
+			switch [Nv belong 24 0 {} {}] {
+				0 {
+					>
+						emit {no checksum}
+					<
+				}
+				1 {
+					>
+						emit {SHA-1 checksum}
+					<
+				}
+				2 {
+					>
+						emit {MD5 checksum}
+					<
+				}
+			}
+	
+			mime application/x-xar
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PAR2]} {
+		>
+			emit {Parity Archive Volume Set}
+		<
+	}
+	
+	if {[S string 12 0 {} {} eq BB02]} {
+		>
+			emit {Bacula volume}
+			if {[N bedate 20 0 0 {} {} x {}]} {
+				>
+					emit {\b, started %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq zPQ]} {
+		>
+			emit {ZPAQ stream}
+			if {[N byte 3 0 0 {} {} x {}]} {
+				>
+					emit {\b, level %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 7kSt]} {
+		>
+			emit {ZPAQ file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq L\0R\0F\0\0\0]} {
+		>
+			emit {BBeB ebook data, unencrypted}
+			if {[N beshort 8 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d}
+				<
+			}
+	
+			switch [Nv byte 36 0 {} {}] {
+				1 {
+					>
+						emit {\b, front-to-back}
+					<
+				}
+				16 {
+					>
+						emit {\b, back-to-front}
+					<
+				}
+			}
+	
+			if {[N beshort 42 0 0 {} {} x {}]} {
+				>
+					emit {\b, (%dx,}
+				<
+			}
+	
+			if {[N beshort 44 0 0 {} {} x {}]} {
+				>
+					emit %d)
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubelong 0 0 0 & 4294965232 == 4277076224]} {
+		>
+			emit {Norton GHost image}
+			switch [Nv ubyte 2 0 & 8] {
+				0 {
+					>
+						emit {\b, first file}
+					<
+					>
+						if {[N ubequad 12 0 0 {} {} != 0]} {
+							>
+								emit {\b, password protected}
+							<
+						}
+	
+						if {[N ubyte 44 0 0 {} {} != 1]} {
+							>
+								if {[N ubyte 10 0 0 {} {} == 1]} {
+									>
+										emit {\b, sector copy}
+									<
+								}
+	
+								if {[N ubyte 43 0 0 {} {} == 1]} {
+									>
+										emit {\b, boot track}
+									<
+								}
+	
+							<
+						}
+	
+						if {[N ubyte 44 0 0 {} {} == 1]} {
+							>
+								emit {\b, disc sector copy}
+							<
+						}
+	
+						if {[S string 255 0 {} {} > \0]} {
+							>
+								emit {"%-.254s"}
+							<
+						}
+	
+					<
+				}
+				8 {
+					>
+						emit {\b, split file}
+						if {[N ubyte 4 0 0 {} {} x {}]} {
+							>
+								emit id=0x%x
+							<
+						}
+	
+					<
+				}
+			}
+	
+			switch [Nv ubyte 3 0 {} {}] {
+				0 {
+					>
+						emit {\b, no compression}
+					<
+				}
+				2 {
+					>
+						emit {\b, fast compression (Z1)}
+					<
+				}
+				3 {
+					>
+						emit {\b, medium compression (Z2)}
+					<
+				}
+			}
+	
+			if {[N ubyte 3 0 0 {} {} > 3]} {
+				>
+					if {[N ubyte 3 0 0 {} {} < 11]} {
+						>
+							emit {\b, compression (Z%d-1)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 3592 0 {} 7776 eq \x55\xAA]} {
+				>
+					emit {\b; contains}
+					T [R -512] {}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Cr24]} {
+		>
+			emit {Google Chrome extension}
+			if {[N ulong 4 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %u}
+				<
+			}
+	
+			mime application/x-chrome-extension
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SBx]} {
+		>
+			emit SeqBox,
+			if {[N byte 3 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 56 0 {} {} eq USE\040LYNX\040TO\040DISSOLVE\040THIS\040FILE]} {
+		>
+			emit {LyNX archive}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\040\t\]\{0,50\}\\.asciiz]} {
+		>
+			emit {assembler source text}
+			mime text/x-asm
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\040\t\]\{0,50\}\\.byte]} {
+		>
+			emit {assembler source text}
+			mime text/x-asm
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\040\t\]\{0,50\}\\.even]} {
+		>
+			emit {assembler source text}
+			mime text/x-asm
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\040\t\]\{0,50\}\\.globl]} {
+		>
+			emit {assembler source text}
+			mime text/x-asm
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\040\t\]\{0,50\}\\.text]} {
+		>
+			emit {assembler source text}
+			mime text/x-asm
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\040\t\]\{0,50\}\\.file]} {
+		>
+			emit {assembler source text}
+			mime text/x-asm
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\040\t\]\{0,50\}\\.type]} {
+		>
+			emit {assembler source text}
+			mime text/x-asm
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq *STA]} {
+		>
+			emit Aster*x
+			if {[S string 7 0 {} {} eq WORD]} {
+				>
+					emit {Words Document}
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq GRAP]} {
+				>
+					emit Graphic
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq SPRE]} {
+				>
+					emit Spreadsheet
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq MACR]} {
+				>
+					emit Macro
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 2278]} {
+		>
+			emit {Aster*x Version 2}
+			switch [Nv byte 29 0 {} {}] {
+				50 {
+					>
+						emit Spreadsheet
+					<
+				}
+				53 {
+					>
+						emit Graphic
+					<
+				}
+				54 {
+					>
+						emit {Words Document}
+					<
+				}
+				56 {
+					>
+						emit Macro
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000\004\036\212\200]} {
+		>
+			emit {3b2 core file}
+			if {[S string 364 0 {} {} > \0]} {
+				>
+					emit {of '%s'}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq .snd]} {
+		>
+			emit {Sun/NeXT audio data:}
+			switch [Nv belong 12 0 {} {}] {
+				1 {
+					>
+						emit {8-bit ISDN mu-law,}
+						mime audio/basic
+					<
+				}
+				2 {
+					>
+						emit {8-bit linear PCM [REF-PCM],}
+						mime audio/basic
+					<
+				}
+				3 {
+					>
+						emit {16-bit linear PCM,}
+						mime audio/basic
+					<
+				}
+				4 {
+					>
+						emit {24-bit linear PCM,}
+						mime audio/basic
+					<
+				}
+				5 {
+					>
+						emit {32-bit linear PCM,}
+						mime audio/basic
+					<
+				}
+				6 {
+					>
+						emit {32-bit IEEE floating point,}
+						mime audio/basic
+					<
+				}
+				7 {
+					>
+						emit {64-bit IEEE floating point,}
+						mime audio/basic
+					<
+				}
+				8 {
+					>
+						emit {Fragmented sample data,}
+					<
+				}
+				10 {
+					>
+						emit {DSP program,}
+					<
+				}
+				11 {
+					>
+						emit {8-bit fixed point,}
+					<
+				}
+				12 {
+					>
+						emit {16-bit fixed point,}
+					<
+				}
+				13 {
+					>
+						emit {24-bit fixed point,}
+					<
+				}
+				14 {
+					>
+						emit {32-bit fixed point,}
+					<
+				}
+				18 {
+					>
+						emit {16-bit linear with emphasis,}
+					<
+				}
+				19 {
+					>
+						emit {16-bit linear compressed,}
+					<
+				}
+				20 {
+					>
+						emit {16-bit linear with emphasis and compression,}
+					<
+				}
+				21 {
+					>
+						emit {Music kit DSP commands,}
+					<
+				}
+				23 {
+					>
+						emit {8-bit ISDN mu-law compressed (CCITT G.721 ADPCM voice enc.),}
+						mime audio/x-adpcm
+					<
+				}
+				24 {
+					>
+						emit {compressed (8-bit CCITT G.722 ADPCM)}
+					<
+				}
+				25 {
+					>
+						emit {compressed (3-bit CCITT G.723.3 ADPCM),}
+					<
+				}
+				26 {
+					>
+						emit {compressed (5-bit CCITT G.723.5 ADPCM),}
+					<
+				}
+				27 {
+					>
+						emit {8-bit A-law (CCITT G.711),}
+					<
+				}
+			}
+	
+			switch [Nv belong 20 0 {} {}] {
+				1 {
+					>
+						emit mono,
+					<
+				}
+				2 {
+					>
+						emit stereo,
+					<
+				}
+				4 {
+					>
+						emit quad,
+					<
+				}
+			}
+	
+			if {[N belong 16 0 0 {} {} > 0]} {
+				>
+					emit {%d Hz}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MThd]} {
+		>
+			emit {Standard MIDI data}
+			if {[N beshort 8 0 0 {} {} x {}]} {
+				>
+					emit {(format %d)}
+				<
+			}
+	
+			if {[N beshort 10 0 0 {} {} x {}]} {
+				>
+					emit {using %d track}
+				<
+			}
+	
+			if {[N beshort 10 0 0 {} {} > 1]} {
+				>
+					emit {\bs}
+				<
+			}
+	
+			if {[N beshort 12 0 0 & 32767 x {}]} {
+				>
+					emit {at 1/%d}
+				<
+			}
+	
+			if {[N beshort 12 0 0 & -32768 > 0]} {
+				>
+					emit SMPTE
+				<
+			}
+	
+			mime audio/midi
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CTMF]} {
+		>
+			emit {Creative Music (CMF) data}
+			mime audio/x-unknown
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SBI]} {
+		>
+			emit {SoundBlaster instrument data}
+			mime audio/x-unknown
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Creative\ Voice\ File]} {
+		>
+			emit {Creative Labs voice data}
+			if {[N byte 19 0 0 {} {} == 26]} {
+				>
+				<
+			}
+	
+			if {[N byte 23 0 0 {} {} > 0]} {
+				>
+					emit {- version %d}
+				<
+			}
+	
+			if {[N byte 22 0 0 {} {} > 0]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+			mime audio/x-unknown
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq EMOD]} {
+		>
+			emit {Extended MOD sound data,}
+			if {[N byte 4 0 0 & -16 x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+			if {[N byte 4 0 0 & 15 x {}]} {
+				>
+					emit {\b.%d,}
+				<
+			}
+	
+			if {[N byte 45 0 0 {} {} x {}]} {
+				>
+					emit {%d instruments}
+				<
+			}
+	
+			switch [Nv byte 83 0 {} {}] {
+				0 {
+					>
+						emit (module)
+					<
+				}
+				1 {
+					>
+						emit (song)
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq .RMF\0\0\0]} {
+		>
+			emit {RealMedia file}
+			mime application/vnd.rn-realmedia
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MAS_U]} {
+		>
+			emit {ULT(imate) Module sound data}
+		<
+	}
+	
+	if {[S string 44 0 {} {} eq SCRM]} {
+		>
+			emit {ScreamTracker III Module sound data}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GF1PATCH110\0ID\#000002\0]} {
+		>
+			emit {GUS patch}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GF1PATCH100\0ID\#000002\0]} {
+		>
+			emit {Old GUS	patch}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MAS_UTrack_V00]} {
+		>
+			if {[S string 14 0 {} {} > /0]} {
+				>
+					emit {ultratracker V1.%.1s module sound data}
+					mime audio/x-mod
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq UN05]} {
+		>
+			emit {MikMod UNI format module sound data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Extended\ Module:]} {
+		>
+			emit {Fasttracker II module sound data}
+			if {[S string 17 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 21 0 c {} eq !SCREAM!]} {
+		>
+			emit {Screamtracker 2 module sound data}
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 21 0 {} {} eq BMOD2STM]} {
+		>
+			emit {Screamtracker 2 module sound data}
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 1080 0 {} {} eq M.K.]} {
+		>
+			emit {4-channel Protracker module sound data}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 1080 0 {} {} eq M!K!]} {
+		>
+			emit {4-channel Protracker module sound data}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 1080 0 {} {} eq FLT4]} {
+		>
+			emit {4-channel Startracker module sound data}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 1080 0 {} {} eq FLT8]} {
+		>
+			emit {8-channel Startracker module sound data}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 1080 0 {} {} eq 4CHN]} {
+		>
+			emit {4-channel Fasttracker module sound data}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 1080 0 {} {} eq 6CHN]} {
+		>
+			emit {6-channel Fasttracker module sound data}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 1080 0 {} {} eq 8CHN]} {
+		>
+			emit {8-channel Fasttracker module sound data}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 1080 0 {} {} eq CD81]} {
+		>
+			emit {8-channel Octalyser module sound data}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 1080 0 {} {} eq OKTA]} {
+		>
+			emit {8-channel Octalyzer module sound data}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 1080 0 {} {} eq 16CN]} {
+		>
+			emit {16-channel Taketracker module sound data}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 1080 0 {} {} eq 32CN]} {
+		>
+			emit {32-channel Taketracker module sound data}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TOC]} {
+		>
+			emit {TOC sound file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SIDPLAY\ INFOFILE]} {
+		>
+			emit {Sidplay info file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PSID]} {
+		>
+			emit {PlaySID v2.2+ (AMIGA) sidtune}
+			if {[N beshort 4 0 0 {} {} > 0]} {
+				>
+					emit {w/ header v%d,}
+				<
+			}
+	
+			if {[N beshort 14 0 0 {} {} == 1]} {
+				>
+					emit {single song,}
+				<
+			}
+	
+			if {[N beshort 14 0 0 {} {} > 1]} {
+				>
+					emit {%d songs,}
+				<
+			}
+	
+			if {[N beshort 16 0 0 {} {} > 0]} {
+				>
+					emit {default song: %d}
+				<
+			}
+	
+			if {[S string 22 0 {} {} > \0]} {
+				>
+					emit {name: "%s"}
+				<
+			}
+	
+			if {[S string 54 0 {} {} > \0]} {
+				>
+					emit {author: "%s"}
+				<
+			}
+	
+			if {[S string 86 0 {} {} > \0]} {
+				>
+					emit {copyright: "%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RSID]} {
+		>
+			emit {RSID sidtune PlaySID compatible}
+			if {[N beshort 4 0 0 {} {} > 0]} {
+				>
+					emit {w/ header v%d,}
+				<
+			}
+	
+			if {[N beshort 14 0 0 {} {} == 1]} {
+				>
+					emit {single song,}
+				<
+			}
+	
+			if {[N beshort 14 0 0 {} {} > 1]} {
+				>
+					emit {%d songs,}
+				<
+			}
+	
+			if {[N beshort 16 0 0 {} {} > 0]} {
+				>
+					emit {default song: %d}
+				<
+			}
+	
+			if {[S string 22 0 {} {} > \0]} {
+				>
+					emit {name: "%s"}
+				<
+			}
+	
+			if {[S string 54 0 {} {} > \0]} {
+				>
+					emit {author: "%s"}
+				<
+			}
+	
+			if {[S string 86 0 {} {} > \0]} {
+				>
+					emit {copyright: "%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NIST_1A\n\ \ \ 1024\n]} {
+		>
+			emit {NIST SPHERE file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SOUND\ SAMPLE\ DATA\ ]} {
+		>
+			emit {Sample Vision file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 2BIT]} {
+		>
+			emit {Audio Visual Research file,}
+			switch [Nv beshort 12 0 {} {}] {
+				-1 {
+					>
+						emit stereo,
+					<
+				}
+				0 {
+					>
+						emit mono,
+					<
+				}
+			}
+	
+			if {[N beshort 14 0 0 {} {} x {}]} {
+				>
+					emit {%d bits}
+				<
+			}
+	
+			switch [Nv beshort 16 0 {} {}] {
+				-1 {
+					>
+						emit signed,
+					<
+				}
+				0 {
+					>
+						emit unsigned,
+					<
+				}
+			}
+	
+			if {[N belong 22 0 0 & 16777215 x {}]} {
+				>
+					emit {%d Hz,}
+				<
+			}
+	
+			switch [Nv beshort 18 0 {} {}] {
+				-1 {
+					>
+						emit loop,
+					<
+				}
+				0 {
+					>
+						emit {no loop,}
+					<
+				}
+			}
+	
+			if {[N ubyte 21 0 0 {} {} < 128]} {
+				>
+					emit {note %d,}
+				<
+			}
+	
+			switch [Nv byte 22 0 {} {}] {
+				0 {
+					>
+						emit {replay 5.485 KHz}
+					<
+				}
+				1 {
+					>
+						emit {replay 8.084 KHz}
+					<
+				}
+				2 {
+					>
+						emit {replay 10.971 KHz}
+					<
+				}
+				3 {
+					>
+						emit {replay 16.168 KHz}
+					<
+				}
+				4 {
+					>
+						emit {replay 21.942 KHz}
+					<
+				}
+				5 {
+					>
+						emit {replay 32.336 KHz}
+					<
+				}
+				6 {
+					>
+						emit {replay 43.885 KHz}
+					<
+				}
+				7 {
+					>
+						emit {replay 47.261 KHz}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq _SGI_SoundTrack]} {
+		>
+			emit {SGI SoundTrack project file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ID3]} {
+		>
+			emit {Audio file with ID3 version 2}
+			if {[N byte 3 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+					if {[N byte 5 0 0 {} {} & -128]} {
+						>
+							emit {\b, unsynchronized frames}
+						<
+					}
+	
+					if {[N byte 5 0 0 {} {} & 64]} {
+						>
+							emit {\b, extended header}
+						<
+					}
+	
+					if {[N byte 5 0 0 {} {} & 32]} {
+						>
+							emit {\b, experimental}
+						<
+					}
+	
+					if {[N byte 5 0 0 {} {} & 16]} {
+						>
+							emit {\b, footer present}
+						<
+					}
+	
+				<
+			}
+	
+			emit {\b, contains:}
+			T [I 6 ubeid3 0 + 0 10] {}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NESM\x1a]} {
+		>
+			emit {NES Sound File}
+			if {[S string 14 0 {} {} > \0]} {
+				>
+					emit {("%s" by}
+				<
+			}
+	
+			if {[S string 46 0 {} {} > \0]} {
+				>
+					emit {%s, copyright}
+				<
+			}
+	
+			if {[S string 78 0 {} {} > \0]} {
+				>
+					emit %s),
+				<
+			}
+	
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {version %d,}
+				<
+			}
+	
+			if {[N byte 6 0 0 {} {} x {}]} {
+				>
+					emit {%d tracks,}
+				<
+			}
+	
+			if {[N byte 122 0 0 & 2 == 1]} {
+				>
+					emit {dual PAL/NTSC}
+				<
+			}
+	
+			switch [Nv byte 122 0 & 1] {
+				0 {
+					>
+						emit NTSC
+					<
+				}
+				1 {
+					>
+						emit PAL
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NSFE]} {
+		>
+			emit {Extended NES Sound File}
+			if {[S search 48 0 {} 4096 eq auth]} {
+				>
+					if {[S string [R 0] 0 {} {} > \0]} {
+						>
+							emit (\"%s\"
+							if {[S string [R 1] 0 {} {} > \0]} {
+								>
+									emit {by %s}
+									if {[S string [R 1] 0 {} {} > \0]} {
+										>
+											emit {\b, copyright %s}
+											if {[S string [R 1] 0 {} {} > \0]} {
+												>
+													emit {\b, ripped by %s}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 20 0 0 {} {} x {}]} {
+				>
+					emit {\b), %d tracks,}
+				<
+			}
+	
+			switch [Nv byte 18 0 & 2] {
+				0 {
+					>
+						switch [Nv byte 18 0 & 1] {
+							0 {
+								>
+									emit NTSC
+								<
+							}
+							1 {
+								>
+									emit PAL
+								<
+							}
+						}
+	
+					<
+				}
+				1 {
+					>
+						emit {dual PAL/NTSC}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SNES-SPC700\ Sound\ File\ Data\ v]} {
+		>
+			emit {SNES SPC700 sound file}
+			if {[S string [R 0] 0 {} {} eq 0.30]} {
+				>
+					emit {\b, version %s}
+					switch [Nv byte 35 0 {} {}] {
+						26 {
+							>
+								emit {\b, with ID666 tag}
+								if {[S string 46 0 {} {} > \0]} {
+									>
+										emit {\b, song "%.32s"}
+									<
+								}
+	
+								if {[S string 78 0 {} {} > \0]} {
+									>
+										emit {\b, game "%.32s"}
+									<
+								}
+	
+							<
+						}
+						27 {
+							>
+								emit {\b, without ID666 tag}
+							<
+						}
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IMPM]} {
+		>
+			emit {Impulse Tracker module sound data -}
+			if {[S string 4 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+			if {[N leshort 40 0 0 {} {} != 0]} {
+				>
+					emit {compatible w/ITv%x}
+				<
+			}
+	
+			if {[N leshort 42 0 0 {} {} != 0]} {
+				>
+					emit {created w/ITv%x}
+				<
+			}
+	
+			mime audio/x-mod
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq IM10]} {
+		>
+			emit {Imago Orpheus module sound data -}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IMPS]} {
+		>
+			emit {Impulse Tracker Sample}
+			if {[N byte 18 0 0 {} {} & 2]} {
+				>
+					emit {16 bit}
+				<
+			}
+	
+			if {[N byte 18 0 0 {} {} ^ 2]} {
+				>
+					emit {8 bit}
+				<
+			}
+	
+			if {[N byte 18 0 0 {} {} & 4]} {
+				>
+					emit stereo
+				<
+			}
+	
+			if {[N byte 18 0 0 {} {} ^ 4]} {
+				>
+					emit mono
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IMPI]} {
+		>
+			emit {Impulse Tracker Instrument}
+			if {[N leshort 28 0 0 {} {} != 0]} {
+				>
+					emit ITv%x
+				<
+			}
+	
+			if {[N byte 30 0 0 {} {} != 0]} {
+				>
+					emit {%d samples}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LM8953]} {
+		>
+			emit {Yamaha TX Wave}
+			switch [Nv byte 22 0 {} {}] {
+				-55 {
+					>
+						emit non-looped
+					<
+				}
+				73 {
+					>
+						emit looped
+					<
+				}
+			}
+	
+			switch [Nv byte 23 0 {} {}] {
+				1 {
+					>
+						emit 33kHz
+					<
+				}
+				2 {
+					>
+						emit 50kHz
+					<
+				}
+				3 {
+					>
+						emit 16kHz
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 76 0 {} {} eq SCRS]} {
+		>
+			emit {Scream Tracker Sample}
+			switch [Nv byte 0 0 {} {}] {
+				1 {
+					>
+						emit sample
+					<
+				}
+				2 {
+					>
+						emit {adlib melody}
+					<
+				}
+			}
+	
+			if {[N byte 0 0 0 {} {} > 2]} {
+				>
+					emit {adlib drum}
+				<
+			}
+	
+			if {[N byte 31 0 0 {} {} & 2]} {
+				>
+					emit stereo
+				<
+			}
+	
+			if {[N byte 31 0 0 {} {} ^ 2]} {
+				>
+					emit mono
+				<
+			}
+	
+			if {[N byte 31 0 0 {} {} & 4]} {
+				>
+					emit {16bit little endian}
+				<
+			}
+	
+			if {[N byte 31 0 0 {} {} ^ 4]} {
+				>
+					emit 8bit
+				<
+			}
+	
+			switch [Nv byte 30 0 {} {}] {
+				0 {
+					>
+						emit unpacked
+					<
+				}
+				1 {
+					>
+						emit packed
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MMD0]} {
+		>
+			emit {MED music file, version 0}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MMD1]} {
+		>
+			emit {OctaMED Pro music file, version 1}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MMD3]} {
+		>
+			emit {OctaMED Soundstudio music file, version 3}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq OctaMEDCmpr]} {
+		>
+			emit {OctaMED Soundstudio compressed file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MED]} {
+		>
+			emit MED_Song
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SymM]} {
+		>
+			emit {Symphonie SymMOD music file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq THX]} {
+		>
+			emit {AHX version}
+			switch [Nv byte 3 0 {} {}] {
+				0 {
+					>
+						emit {1 module data}
+					<
+				}
+				1 {
+					>
+						emit {2 module data}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq OKTASONG]} {
+		>
+			emit {Oktalyzer module data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DIGI\ Booster\ module\0]} {
+		>
+			emit %s
+			if {[N byte 20 0 0 {} {} > 0]} {
+				>
+					emit %c
+					if {[N byte 21 0 0 {} {} > 0]} {
+						>
+							emit {\b%c}
+							if {[N byte 22 0 0 {} {} > 0]} {
+								>
+									emit {\b%c}
+									if {[N byte 23 0 0 {} {} > 0]} {
+										>
+											emit {\b%c}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 610 0 {} {} > \0]} {
+				>
+					emit {\b, "%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DBM0]} {
+		>
+			emit {DIGI Booster Pro Module}
+			if {[N byte 4 0 0 {} {} > 0]} {
+				>
+					emit V%X.
+					if {[N byte 5 0 0 {} {} x {}]} {
+						>
+							emit {\b%02X}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 16 0 {} {} > \0]} {
+				>
+					emit {\b, "%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FTMN]} {
+		>
+			emit {FaceTheMusic module}
+			if {[S string 16 0 {} {} > \0d]} {
+				>
+					emit {\b, "%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AMShdr\32]} {
+		>
+			emit {Velvet Studio AMS Module v2.2}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Extreme]} {
+		>
+			emit {Extreme Tracker AMS Module v1.3}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DDMF]} {
+		>
+			emit {Xtracker DMF Module}
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit v%i
+				<
+			}
+	
+			if {[S string 13 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+			if {[S string 43 0 {} {} > \0]} {
+				>
+					emit {Composer: "%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DSM\32]} {
+		>
+			emit {Dynamic Studio Module DSM}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SONG]} {
+		>
+			emit {DigiTrekker DTM Module}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DMDL]} {
+		>
+			emit {DigiTrakker MDL Module}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PSM\32]} {
+		>
+			emit {Protracker Studio PSM Module}
+		<
+	}
+	
+	if {[S string 44 0 {} {} eq PTMF]} {
+		>
+			emit {Poly Tracker PTM Module}
+			if {[S string 0 0 {} {} > \32]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MT20]} {
+		>
+			emit {MadTracker 2.0 Module MT2}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RAD\40by\40REALiTY!!]} {
+		>
+			emit {RAD Adlib Tracker Module RAD}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RTMM]} {
+		>
+			emit {RTM Module}
+		<
+	}
+	
+	if {[S string 1062 0 {} {} eq MaDoKaN96]} {
+		>
+			emit {XMS Adlib Module}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {Composer: "%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AMF]} {
+		>
+			emit {AMF Module}
+			if {[S string 4 0 {} {} > \0]} {
+				>
+					emit {Title: "%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MODINFO1]} {
+		>
+			emit {Open Cubic Player Module Inforation MDZ}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Extended\40Instrument:]} {
+		>
+			emit {Fast Tracker II Instrument}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \210NOA\015\012\032]} {
+		>
+			emit {NOA Nancy Codec Movie file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MMMD]} {
+		>
+			emit {Yamaha SMAF file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \001Sharp\040JisakuMelody]} {
+		>
+			emit {SHARP Cell-Phone ringing Melody}
+			if {[S string 20 0 {} {} eq Ver01.00]} {
+				>
+					emit {Ver. 1.00}
+					if {[N byte 32 0 0 {} {} x {}]} {
+						>
+							emit {, %d tracks}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq fLaC]} {
+		>
+			emit {FLAC audio bitstream data}
+			if {[N byte 4 0 0 & 127 > 0]} {
+				>
+					emit {\b, unknown version}
+				<
+			}
+	
+			if {[N byte 4 0 0 & 127 == 0]} {
+				>
+					emit {\b}
+					switch [Nv beshort 20 0 & 496] {
+						48 {
+							>
+								emit {\b, 4 bit}
+							<
+						}
+						80 {
+							>
+								emit {\b, 6 bit}
+							<
+						}
+						112 {
+							>
+								emit {\b, 8 bit}
+							<
+						}
+						176 {
+							>
+								emit {\b, 12 bit}
+							<
+						}
+						240 {
+							>
+								emit {\b, 16 bit}
+							<
+						}
+						368 {
+							>
+								emit {\b, 24 bit}
+							<
+						}
+					}
+	
+					switch [Nv byte 20 0 & 14] {
+						0 {
+							>
+								emit {\b, mono}
+							<
+						}
+						2 {
+							>
+								emit {\b, stereo}
+							<
+						}
+						4 {
+							>
+								emit {\b, 3 channels}
+							<
+						}
+						6 {
+							>
+								emit {\b, 4 channels}
+							<
+						}
+						8 {
+							>
+								emit {\b, 5 channels}
+							<
+						}
+						10 {
+							>
+								emit {\b, 6 channels}
+							<
+						}
+						12 {
+							>
+								emit {\b, 7 channels}
+							<
+						}
+						14 {
+							>
+								emit {\b, 8 channels}
+							<
+						}
+					}
+	
+					switch [Nv belong 17 0 & 16777200] {
+						176400 {
+							>
+								emit {\b, 11.025 kHz}
+							<
+						}
+						256000 {
+							>
+								emit {\b, 16 kHz}
+							<
+						}
+						352800 {
+							>
+								emit {\b, 22.05 kHz}
+							<
+						}
+						384000 {
+							>
+								emit {\b, 24 kHz}
+							<
+						}
+						512000 {
+							>
+								emit {\b, 32 kHz}
+							<
+						}
+						705600 {
+							>
+								emit {\b, 44.1 kHz}
+							<
+						}
+						768000 {
+							>
+								emit {\b, 48 kHz}
+							<
+						}
+						1024000 {
+							>
+								emit {\b, 64 kHz}
+							<
+						}
+						1411200 {
+							>
+								emit {\b, 88.2 kHz}
+							<
+						}
+						1536000 {
+							>
+								emit {\b, 96 kHz}
+							<
+						}
+						2048000 {
+							>
+								emit {\b, 128 kHz}
+							<
+						}
+						2822400 {
+							>
+								emit {\b, 176.4 kHz}
+							<
+						}
+						3072000 {
+							>
+								emit {\b, 192 kHz}
+							<
+						}
+						4096000 {
+							>
+								emit {\b, 256 kHz}
+							<
+						}
+						5644800 {
+							>
+								emit {\b, 352.8 kHz}
+							<
+						}
+						6144000 {
+							>
+								emit {\b, 384 kHz}
+							<
+						}
+					}
+	
+					if {[N byte 21 0 0 & 15 > 0]} {
+						>
+							emit {\b, >4G samples}
+						<
+					}
+	
+					if {[N byte 21 0 0 & 15 == 0]} {
+						>
+							emit {\b}
+							if {[N belong 22 0 0 {} {} > 0]} {
+								>
+									emit {\b, %u samples}
+								<
+							}
+	
+							if {[N belong 22 0 0 {} {} == 0]} {
+								>
+									emit {\b, length unknown}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			mime audio/flac
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq VBOX]} {
+		>
+			emit {VBOX voice message data}
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq RB40]} {
+		>
+			emit {RBS Song file}
+			if {[S string 29 0 {} {} eq ReBorn]} {
+				>
+					emit {created by ReBorn}
+				<
+			}
+	
+			if {[S string 37 0 {} {} eq Propellerhead]} {
+				>
+					emit {created by ReBirth}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq A\#S\#C\#S\#S\#L\#V\#3]} {
+		>
+			emit {Synthesizer Generator or Kimwitu data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq A\#S\#C\#S\#S\#L\#HUB]} {
+		>
+			emit {Kimwitu++ data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TFMX-SONG]} {
+		>
+			emit {TFMX module sound data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MAC\040]} {
+		>
+			emit {Monkey's Audio compressed format}
+			if {[N uleshort 4 0 0 {} {} > 3979]} {
+				>
+					emit {version %d}
+					switch [Nv uleshort [I 8 ulelong 0 + 0 0] 0 {} {}] {
+						1000 {
+							>
+								emit {with fast compression}
+							<
+						}
+						2000 {
+							>
+								emit {with normal compression}
+							<
+						}
+						3000 {
+							>
+								emit {with high compression}
+							<
+						}
+						4000 {
+							>
+								emit {with extra high compression}
+							<
+						}
+						5000 {
+							>
+								emit {with insane compression}
+							<
+						}
+					}
+	
+					switch [Nv uleshort [I 8 ulelong 0 + 0 18] 0 {} {}] {
+						1 {
+							>
+								emit {\b, mono}
+							<
+						}
+						2 {
+							>
+								emit {\b, stereo}
+							<
+						}
+					}
+	
+					if {[N ulelong [I 8 ulelong 0 + 0 20] 0 0 {} {} x {}]} {
+						>
+							emit {\b, sample rate %d}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N uleshort 4 0 0 {} {} < 3980]} {
+				>
+					emit {version %d}
+					switch [Nv uleshort 6 0 {} {}] {
+						1000 {
+							>
+								emit {with fast compression}
+							<
+						}
+						2000 {
+							>
+								emit {with normal compression}
+							<
+						}
+						3000 {
+							>
+								emit {with high compression}
+							<
+						}
+						4000 {
+							>
+								emit {with extra high compression}
+							<
+						}
+						5000 {
+							>
+								emit {with insane compression}
+							<
+						}
+					}
+	
+					switch [Nv uleshort 10 0 {} {}] {
+						1 {
+							>
+								emit {\b, mono}
+							<
+						}
+						2 {
+							>
+								emit {\b, stereo}
+							<
+						}
+					}
+	
+					if {[N ulelong 12 0 0 {} {} x {}]} {
+						>
+							emit {\b, sample rate %d}
+						<
+					}
+	
+				<
+			}
+	
+			mime audio/x-ape
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RAWADATA]} {
+		>
+			emit {RdosPlay RAW}
+		<
+	}
+	
+	if {[S string 1068 0 {} {} eq RoR]} {
+		>
+			emit {AMUSIC Adlib Tracker}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq JCH]} {
+		>
+			emit EdLib
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq mpu401tr]} {
+		>
+			emit {MPU-401 Trakker}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SAdT]} {
+		>
+			emit {Surprise! Adlib Tracker}
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {Version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XAD!]} {
+		>
+			emit {eXotic ADlib}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ofTAZ!]} {
+		>
+			emit {eXtra Simple Music}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ZXAYEMUL]} {
+		>
+			emit {Spectrum 128 tune}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0BONK]} {
+		>
+			emit BONK,
+			if {[N byte 14 0 0 {} {} x {}]} {
+				>
+					emit {%d channel(s),}
+				<
+			}
+	
+			switch [Nv byte 15 0 {} {}] {
+				0 {
+					>
+						emit lossy,
+					<
+				}
+				1 {
+					>
+						emit lossless,
+					<
+				}
+			}
+	
+			if {[N byte 16 0 0 {} {} x {}]} {
+				>
+					emit mid-side
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 384 0 {} {} eq LockStream]} {
+		>
+			emit {LockStream Embedded file (mostly MP3 on old Nokia phones)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TWIN97012000]} {
+		>
+			emit {VQF data}
+			switch [Nv short 27 0 {} {}] {
+				0 {
+					>
+						emit {\b, Mono}
+					<
+				}
+				1 {
+					>
+						emit {\b, Stereo}
+					<
+				}
+			}
+	
+			if {[N short 31 0 0 {} {} > 0]} {
+				>
+					emit {\b, %d kbit/s}
+				<
+			}
+	
+			if {[N short 35 0 0 {} {} > 0]} {
+				>
+					emit {\b, %d kHz}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Winamp\ EQ\ library\ file]} {
+		>
+			emit %s
+			if {[S string 23 0 {} {} x {}]} {
+				>
+					emit {\b%.4s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \[Equalizer\ preset\]]} {
+		>
+			emit {XMMS equalizer preset}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#EXTM3U]} {
+		>
+			emit {M3U playlist text}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \[playlist\]]} {
+		>
+			emit {PLS playlist text}
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq \[licq\]]} {
+		>
+			emit {LICQ configuration file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ICE!]} {
+		>
+			emit {SNDH Atari ST music}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SC68\ Music-file\ /\ (c)\ (BeN)jami]} {
+		>
+			emit {sc68 Atari ST music}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MP+]} {
+		>
+			emit {Musepack audio (MP+)}
+			if {[N byte 3 0 0 {} {} == -1]} {
+				>
+					emit {\b, SV pre8}
+				<
+			}
+	
+			switch [Nv byte 3 0 & 15] {
+				6 {
+					>
+						emit {\b, SV 6}
+					<
+				}
+				7 {
+					>
+						emit {\b, SV 7}
+						switch [Nv byte 3 0 & -16] {
+							-16 {
+								>
+									emit {\b.15}
+								<
+							}
+							0 {
+								>
+									emit {\b.0}
+								<
+							}
+							16 {
+								>
+									emit {\b.1}
+								<
+							}
+						}
+	
+						switch [Nv byte 10 0 & -16] {
+							-128 {
+								>
+									emit {\b, quality 3 (Thumb)}
+								<
+							}
+							-112 {
+								>
+									emit {\b, quality 4 (Radio)}
+								<
+							}
+							-96 {
+								>
+									emit {\b, quality 5 (Standard)}
+								<
+							}
+							-80 {
+								>
+									emit {\b, quality 6 (Xtreme)}
+								<
+							}
+							-64 {
+								>
+									emit {\b, quality 7 (Insane)}
+								<
+							}
+							-48 {
+								>
+									emit {\b, quality 8 (BrainDead)}
+								<
+							}
+							-32 {
+								>
+									emit {\b, quality 9}
+								<
+							}
+							-16 {
+								>
+									emit {\b, quality 10}
+								<
+							}
+							0 {
+								>
+									emit {\b, no profile}
+								<
+							}
+							16 {
+								>
+									emit {\b, profile 'Unstable/Experimental'}
+								<
+							}
+							80 {
+								>
+									emit {\b, quality 0}
+								<
+							}
+							96 {
+								>
+									emit {\b, quality 1}
+								<
+							}
+							112 {
+								>
+									emit {\b, quality 2 (Telephone)}
+								<
+							}
+						}
+	
+						switch [Nv byte 27 0 {} {}] {
+							0 {
+								>
+									emit {\b, Buschmann 1.7.0-9, Klemm 0.90-1.05}
+								<
+							}
+							102 {
+								>
+									emit {\b, Beta 1.02}
+								<
+							}
+							104 {
+								>
+									emit {\b, Beta 1.04}
+								<
+							}
+							105 {
+								>
+									emit {\b, Alpha 1.05}
+								<
+							}
+							106 {
+								>
+									emit {\b, Beta 1.06}
+								<
+							}
+							110 {
+								>
+									emit {\b, Release 1.1}
+								<
+							}
+							111 {
+								>
+									emit {\b, Alpha 1.11}
+								<
+							}
+							112 {
+								>
+									emit {\b, Beta 1.12}
+								<
+							}
+							113 {
+								>
+									emit {\b, Alpha 1.13}
+								<
+							}
+							114 {
+								>
+									emit {\b, Beta 1.14}
+								<
+							}
+							115 {
+								>
+									emit {\b, Alpha 1.15}
+								<
+							}
+						}
+	
+					<
+				}
+				8 {
+					>
+						emit {\b, SV 8}
+					<
+				}
+			}
+	
+			mime audio/x-musepack
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MPCK]} {
+		>
+			emit {Musepack audio (MPCK)}
+			mime audio/x-musepack
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BEGIN:IMELODY]} {
+		>
+			emit {iMelody Ringtone Format}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \030FICHIER\ GUITAR\ PRO\ v3.]} {
+		>
+			emit {Guitar Pro Ver. 3 Tablature}
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq SONG]} {
+		>
+			emit {SoundFX Module sound file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#!AMR]} {
+		>
+			emit {Adaptive Multi-Rate Codec (GSM telephony)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SCgf]} {
+		>
+			emit {SuperCollider3 Synth Definition file,}
+			if {[N belong 4 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TTA1]} {
+		>
+			emit {True Audio Lossless Audio}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq wvpk]} {
+		>
+			emit {WavPack Lossless Audio}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Vgm\040]} {
+		>
+			if {[N ubyte 9 0 0 {} {} > 0]} {
+				>
+					emit {VGM Video Game Music dump v}
+					if {[N ubyte 9 0 0 / 16 > 0]} {
+						>
+							emit {\b%d}
+						<
+					}
+	
+					if {[N ubyte 9 0 0 & 15 x {}]} {
+						>
+							emit {\b%d}
+						<
+					}
+	
+					if {[N ubyte 8 0 0 / 16 x {}]} {
+						>
+							emit {\b.%d}
+						<
+					}
+	
+					if {[N ubyte 8 0 0 & 15 > 0]} {
+						>
+							emit {\b%d}
+						<
+					}
+	
+					if {[N ubyte 8 0 0 {} {} x {}]} {
+						>
+							emit {\b, soundchip(s)=}
+						<
+					}
+	
+					if {[N ulelong 12 0 0 {} {} > 0]} {
+						>
+							emit SN76489,
+						<
+					}
+	
+					if {[N ulelong 16 0 0 {} {} > 0]} {
+						>
+							emit YM2413,
+						<
+					}
+	
+					if {[N ulelong 44 0 0 {} {} > 0]} {
+						>
+							emit YM2612,
+						<
+					}
+	
+					if {[N ulelong 48 0 0 {} {} > 0]} {
+						>
+							emit YM2151,
+						<
+					}
+	
+					if {[N ulelong 56 0 0 {} {} > 0]} {
+						>
+							emit {Sega PCM,}
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 12]} {
+						>
+							if {[N ulelong 64 0 0 {} {} > 0]} {
+								>
+									emit RF5C68,
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 16]} {
+						>
+							if {[N ulelong 68 0 0 {} {} > 0]} {
+								>
+									emit YM2203,
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 20]} {
+						>
+							if {[N ulelong 72 0 0 {} {} > 0]} {
+								>
+									emit YM2608,
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 24]} {
+						>
+							if {[N lelong 76 0 0 {} {} > 0]} {
+								>
+									emit YM2610,
+								<
+							}
+	
+							if {[N lelong 76 0 0 {} {} < 0]} {
+								>
+									emit YM2610B,
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 28]} {
+						>
+							if {[N ulelong 80 0 0 {} {} > 0]} {
+								>
+									emit YM3812,
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 32]} {
+						>
+							if {[N ulelong 84 0 0 {} {} > 0]} {
+								>
+									emit YM3526,
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 36]} {
+						>
+							if {[N ulelong 88 0 0 {} {} > 0]} {
+								>
+									emit Y8950,
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 40]} {
+						>
+							if {[N ulelong 92 0 0 {} {} > 0]} {
+								>
+									emit YMF262,
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 44]} {
+						>
+							if {[N ulelong 96 0 0 {} {} > 0]} {
+								>
+									emit YMF278B,
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 48]} {
+						>
+							if {[N ulelong 100 0 0 {} {} > 0]} {
+								>
+									emit YMF271,
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 52]} {
+						>
+							if {[N ulelong 104 0 0 {} {} > 0]} {
+								>
+									emit YMZ280B,
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 56]} {
+						>
+							if {[N ulelong 108 0 0 {} {} > 0]} {
+								>
+									emit RF5C164,
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 60]} {
+						>
+							if {[N ulelong 112 0 0 {} {} > 0]} {
+								>
+									emit PWM,
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ulelong 52 0 0 {} {} > 64]} {
+						>
+							if {[N ulelong 116 0 0 {} {} > 0]} {
+								>
+									switch [Nv ubyte 120 0 {} {}] {
+										0 {
+											>
+												emit AY-3-8910,
+											<
+										}
+										1 {
+											>
+												emit AY-3-8912,
+											<
+										}
+										2 {
+											>
+												emit AY-3-8913,
+											<
+										}
+										3 {
+											>
+												emit AY-3-8930,
+											<
+										}
+										16 {
+											>
+												emit YM2149,
+											<
+										}
+										17 {
+											>
+												emit YM3439,
+											<
+										}
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SCOW]} {
+		>
+			switch [Nv byte 4 0 {} {}] {
+				-62 {
+					>
+						emit {GVOX Encore music, version < 5.0}
+					<
+				}
+				-60 {
+					>
+						emit {GVOX Encore music, version 5.0 or above}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ZBOT]} {
+		>
+			if {[N byte 4 0 0 {} {} == -59]} {
+				>
+					emit {GVOX Encore music, version < 5.0}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AUDIMG]} {
+		>
+			if {[N ubyte 13 0 0 {} {} < 13]} {
+				>
+					emit {Garmin Voice Processing Module}
+					if {[S string 6 0 {} {} x {}]} {
+						>
+							emit {\b, version %3.3s}
+						<
+					}
+	
+					if {[N ubyte 12 0 0 {} {} x {}]} {
+						>
+							emit {\b, %.2d}
+						<
+					}
+	
+					if {[N ubyte 13 0 0 {} {} x {}]} {
+						>
+							emit {\b.%.2d}
+						<
+					}
+	
+					if {[N uleshort 14 0 0 {} {} x {}]} {
+						>
+							emit {\b.%.4d}
+						<
+					}
+	
+					if {[N ubyte 11 0 0 {} {} x {}]} {
+						>
+							emit %.2d
+						<
+					}
+	
+					if {[N ubyte 10 0 0 {} {} x {}]} {
+						>
+							emit {\b:%.2d}
+						<
+					}
+	
+					if {[N ubyte 9 0 0 {} {} x {}]} {
+						>
+							emit {\b:%.2d}
+						<
+					}
+	
+					if {[N ubyte 18 0 0 {} {} x {}]} {
+						>
+							emit {\b, language ID %d}
+						<
+					}
+	
+					if {[N uleshort 16 0 0 {} {} > 0]} {
+						>
+							if {[N ulelong [I 16 uleshort 0 + 0 0] 0 0 {} {} > 0]} {
+								>
+									emit {\b, at offset 0x%x}
+									if {[N ulelong [I 16 uleshort 0 + 0 4] 0 0 {} {} > 0]} {
+										>
+											emit {%d Bytes}
+											if {[S string [I [R -8] ulelong 0 + 0 0] 0 {} {} eq RIFF]} {
+												>
+													emit {\b}
+													T [R -4] {}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					mime audio/x-vpm-wav-garmin
+					ext vpm
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GDM]} {
+		>
+			if {[N byte 3 0 0 {} {} == -2]} {
+				>
+					emit {General Digital Music.}
+				<
+			}
+	
+			if {[S string 4 0 {} {} > \0]} {
+				>
+					emit {title: "%s"}
+				<
+			}
+	
+			if {[S string 36 0 {} {} > \0]} {
+				>
+					emit {musician: "%s"}
+					if {[N beshort 68 0 0 {} {} == 3338]} {
+						>
+							if {[N byte 70 0 0 {} {} == 26]} {
+								>
+									if {[S string 71 0 {} {} eq GMFS]} {
+										>
+											emit Version
+										<
+									}
+	
+									if {[N byte 75 0 0 {} {} x {}]} {
+										>
+											emit %d.
+										<
+									}
+	
+									if {[N byte 76 0 0 {} {} x {}]} {
+										>
+											emit {\b%02d}
+										<
+									}
+	
+									if {[N beshort 77 0 0 {} {} == 0]} {
+										>
+											emit {(2GDM v}
+										<
+									}
+	
+									if {[N byte 79 0 0 {} {} x {}]} {
+										>
+											emit {\b%d.}
+											if {[N byte 80 0 0 {} {} x {}]} {
+												>
+													emit {\b%d)}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MTM]} {
+		>
+			emit Multitracker
+			if {[N byte 3 0 0 / 16 x {}]} {
+				>
+					emit {Version %d.}
+				<
+			}
+	
+			if {[N byte 3 0 0 & 15 x {}]} {
+				>
+					emit {\b%02d}
+					if {[S string 4 0 {} {} > \0]} {
+						>
+							emit {title: "%s"}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HVL]} {
+		>
+			if {[N byte 3 0 0 {} {} < 2]} {
+				>
+					emit {Hively Tracker Song}
+				<
+			}
+	
+			switch [Nv byte 3 0 {} {}] {
+				0 {
+					>
+						emit {1 module data}
+					<
+				}
+				1 {
+					>
+						emit {2 module data}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MO3]} {
+		>
+			if {[N ubyte 3 0 0 {} {} < 6]} {
+				>
+					emit {MOdule with MP3}
+					switch [Nv byte 3 0 {} {}] {
+						0 {
+							>
+								emit {Version	0	(With MP3 and lossless)}
+							<
+						}
+						1 {
+							>
+								emit {Version	1	(With ogg and lossless)}
+							<
+						}
+						3 {
+							>
+								emit {Version 2.2}
+							<
+						}
+						4 {
+							>
+								emit {(With no LAME header)}
+							<
+						}
+						5 {
+							>
+								emit {Version 2.4}
+							<
+						}
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ADRVPACK]} {
+		>
+			emit {AProSys	module}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AON]} {
+		>
+			if {[S string 4 0 {} {} eq \"ArtOfNoise]} {
+				>
+					emit {by Bastian Spiegel(twice/lego)"}
+				<
+			}
+	
+			if {[S string 46 0 {} {} eq NAME]} {
+				>
+					emit {Art of Noise Tracker Song}
+				<
+			}
+	
+			if {[S string 3 0 {} {} < 9]} {
+				>
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq 4]} {
+				>
+					emit {(4 voices)}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq 8]} {
+				>
+					emit {(8 voices)}
+					if {[S string 54 0 {} {} > \0]} {
+						>
+							emit {Title: "%s"}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FAR]} {
+		>
+			if {[N byte 44 0 0 {} {} == 13]} {
+				>
+				<
+			}
+	
+			if {[N byte 45 0 0 {} {} == 10]} {
+				>
+				<
+			}
+	
+			if {[N byte 46 0 0 {} {} == 26]} {
+				>
+					if {[N byte 3 0 0 {} {} == -2]} {
+						>
+							emit {Farandole Tracker Song}
+							if {[N byte 49 0 0 / 16 x {}]} {
+								>
+									emit {Version %d.}
+								<
+							}
+	
+							if {[N byte 49 0 0 & 15 x {}]} {
+								>
+									emit {\b%02d}
+									if {[S string 4 0 {} {} > \0]} {
+										>
+											emit {\b, title: "%s"}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq cyd!song]} {
+		>
+			emit {Klystrack song}
+			if {[N byte 8 0 0 {} {} > 0]} {
+				>
+					emit {\b, version %u}
+				<
+			}
+	
+			if {[N byte 8 0 0 {} {} > 26]} {
+				>
+					if {[S pstring 149 0 {} {} x {}]} {
+						>
+							emit {\b, title %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq cyd!inst]} {
+		>
+			emit {Klystrack instrument}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq WOPL3-INST\0]} {
+		>
+			emit {WOPL instrument}
+			if {[N leshort 11 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %u}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq WOPL3-BANK\0]} {
+		>
+			emit {WOPL instrument bank}
+			if {[N leshort 11 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %u}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Junglevision\ Patch\ File]} {
+		>
+			emit {Junglevision instrument data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#OPL_II\#]} {
+		>
+			emit {DMX OP2 instrument data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IBK\x1a]} {
+		>
+			emit {IBK instrument data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 2OP\x1a]} {
+		>
+			emit {IBK instrument data, 2 operators}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 4OP\x1a]} {
+		>
+			emit {IBK instrument data, 4 operators}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq ADLIB-]} {
+		>
+			emit {AdLib instrument data}
+			if {[N byte 0 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %u}
+				<
+			}
+	
+			if {[N byte 1 0 0 {} {} x {}]} {
+				>
+					emit {\b.%u}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LA]} {
+		>
+			if {[S string 2 0 {} {} eq 03]} {
+				>
+					emit {Lossless audio version 0.3}
+				<
+			}
+	
+			if {[S string 2 0 {} {} eq 04]} {
+				>
+					emit {Lossless audio version 0.4}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \074\074bbx\076\076]} {
+		>
+			emit BBx
+			if {[S string 7 0 {} {} eq \000]} {
+				>
+					emit {indexed file}
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq \001]} {
+				>
+					emit {serial file}
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq \002]} {
+				>
+					emit {keyed file}
+					if {[N short 13 0 0 {} {} == 0]} {
+						>
+							emit (sort)
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq \004]} {
+				>
+					emit program
+					if {[N byte 18 0 0 {} {} x {}]} {
+						>
+							emit {(LEVEL %d)}
+							if {[S string 23 0 {} {} > \000]} {
+								>
+									emit psaved
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq \006]} {
+				>
+					emit {mkeyed file}
+					if {[N short 13 0 0 {} {} == 0]} {
+						>
+							emit (sort)
+						<
+					}
+	
+					if {[S string 8 0 {} {} eq \000]} {
+						>
+							emit (mkey)
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BEETLE\000]} {
+		>
+			emit {Beetle VM object file}
+		<
+	}
+	
+	switch [Nv byte 0 0 {} {}] {
+		-128 {
+			>
+				if {[N uleshort 1 0 0 {} {} < 1022]} {
+					>
+						if {[N uleshort 1 0 0 {} {} > 0]} {
+							>
+								if {[N ubyte 3 0 0 {} {} > 0]} {
+									>
+										if {[S regex 4 0 {} {} eq \[a-zA-Z_/\]\{1,8\}\[.\]]} {
+											>
+												emit {8086 relocatable (Microsoft)}
+												if {[S pstring 3 0 {} {} x {}]} {
+													>
+														emit {\b, "%s"}
+													<
+												}
+	
+												mime application/x-object
+												ext o/a
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-116 {
+			>
+				emit {PGP symmetric key encrypted data -}
+				switch [Nv byte 1 0 {} {}] {
+					12 {
+						>
+						<
+					}
+					13 {
+						>
+						<
+					}
+				}
+	
+				if {[N byte 2 0 0 {} {} == 4]} {
+					>
+					<
+				}
+	
+				U 199 crypto 3
+	
+				switch [Nv byte 4 0 {} {}] {
+					1 {
+						>
+							emit {salted -}
+							U 199 hash 5
+	
+							switch [Nv byte 14 0 {} {}] {
+								-55 {
+									>
+										emit .
+									<
+								}
+								-46 {
+									>
+										emit .
+									<
+								}
+							}
+	
+						<
+					}
+					3 {
+						>
+							emit {salted & iterated -}
+							U 199 hash 5
+	
+							switch [Nv byte 15 0 {} {}] {
+								-55 {
+									>
+										emit .
+									<
+								}
+								-46 {
+									>
+										emit .
+									<
+								}
+							}
+	
+						<
+					}
+				}
+	
+			<
+		}
+		-107 {
+			>
+				emit {PGP	Secret Key -}
+				U 199 pgpkey 1
+	
+			<
+		}
+		-105 {
+			>
+				emit {PGP	Secret Sub-key -}
+				U 199 pgpkey 1
+	
+			<
+		}
+		-103 {
+			>
+				if {[N ubyte 3 0 0 {} {} < 5]} {
+					>
+						if {[N ubyte [I 1 ubeshort 0 + 0 3] 0 0 {} {} > 127]} {
+							>
+								if {[N ubyte 3 0 0 {} {} < 4]} {
+									>
+										emit {PGP key public ring (v%u)}
+										if {[N beldate 4 0 0 {} {} x {}]} {
+											>
+												emit {created %s}
+											<
+										}
+	
+										if {[N ubeshort 8 0 0 {} {} > 0]} {
+											>
+												emit {\b, %u days valid}
+											<
+										}
+	
+										if {[N ubeshort 8 0 0 {} {} == 0]} {
+											>
+												emit {\b, not expire}
+											<
+										}
+	
+										U 199 key_algo 10
+	
+										if {[N ubeshort 11 0 0 {} {} x {}]} {
+											>
+												emit {%u bits}
+											<
+										}
+	
+										if {[N ubequad 13 0 0 {} {} x {}]} {
+											>
+												emit MPI=0x%16.16llx...
+											<
+										}
+	
+										mime application/pgp-keys
+										ext pgp/ASD
+									<
+								}
+	
+								if {[N ubyte 3 0 0 {} {} > 3]} {
+									>
+										emit {PGP/GPG key public ring (v%u)}
+										if {[N beldate 4 0 0 {} {} x {}]} {
+											>
+												emit {created %s}
+											<
+										}
+	
+										U 199 key_algo 8
+	
+										if {[N ubeshort 9 0 0 {} {} x {}]} {
+											>
+												emit {%u bits}
+											<
+										}
+	
+										if {[N ubequad 11 0 0 {} {} x {}]} {
+											>
+												emit MPI=0x%16.16llx...
+											<
+										}
+	
+										mime application/pgp-keys
+										ext pgp/gpg/pkr/asd
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-99 {
+			>
+				if {[N ubeshort 1 0 0 {} {} > 0]} {
+					>
+						if {[N ubyte 3 0 0 {} {} > 0]} {
+							>
+								if {[N ubyte 3 0 0 {} {} < 5]} {
+									>
+										emit {PGP Secret Sub-key}
+										if {[N ubyte 3 0 0 {} {} x {}]} {
+											>
+												emit (v%d)
+											<
+										}
+	
+										if {[N ubyte 3 0 0 {} {} x {}]} {
+											>
+												emit -
+											<
+										}
+	
+										if {[N ubyte 3 0 0 {} {} < 4]} {
+											>
+												if {[N ubeshort 11 0 0 {} {} x {}]} {
+													>
+														emit %db
+													<
+												}
+	
+												if {[N beldate 4 0 0 {} {} x {}]} {
+													>
+														emit {created on %s -}
+													<
+												}
+	
+												U 199 key_algo 10
+	
+												if {[N ubequad [I 11 ubeshort 0 / 0 8] 0 0 {} {} x {}]} {
+													>
+														U 199 keyend [R 5]
+	
+													<
+												}
+	
+											<
+										}
+	
+										if {[N ubyte 3 0 0 {} {} > 3]} {
+											>
+												if {[N ubeshort 9 0 0 {} {} x {}]} {
+													>
+														emit %db
+													<
+												}
+	
+												if {[N beldate 4 0 0 {} {} x {}]} {
+													>
+														emit {created on %s -}
+													<
+												}
+	
+												U 199 key_algo 8
+	
+												if {[N ubequad [I 9 ubeshort 0 / 0 8] 0 0 {} {} x {}]} {
+													>
+														U 199 keyend [R 3]
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-23 {
+			>
+				if {[N short 1 0 0 {} {} > -1]} {
+					>
+						if {[N byte [I 1 uleshort 0 + 0 3] 0 0 {} {} x {}]} {
+							>
+								U 163 msdos-com 0
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[N short 1 0 0 {} {} < -259]} {
+					>
+						if {[N byte [I 1 leshort 0 + 0 65539] 0 0 {} {} x {}]} {
+							>
+								U 163 msdos-com 0
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-21 {
+			>
+				if {[N byte 1 0 0 {} {} > -1]} {
+					>
+						if {[N byte [I 1 ubyte 0 + 0 2] 0 0 {} {} x {}]} {
+							>
+								U 163 msdos-com 0
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-2 {
+			>
+				if {[N uleshort 1 0 0 {} {} == 1]} {
+					>
+						if {[N uleshort 5 0 0 {} {} == 65535]} {
+							>
+								if {[N byte 6 0 0 {} {} == 10]} {
+									>
+										emit {MSX Mega-Assembler source}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		-1 {
+			>
+				if {[N uleshort 3 0 0 {} {} == 10]} {
+					>
+						if {[N uleshort 1 0 0 {} {} > 32768]} {
+							>
+								emit {MSX-BASIC program}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		0 {
+			>
+				if {[N ubyte 1 0 0 {} {} > 0]} {
+					>
+						if {[N ubyte 1 0 0 {} {} < 64]} {
+							>
+								if {[N ubelong 2 0 0 {} {} > 520093696]} {
+									>
+										if {[N byte 74 0 0 {} {} == 0]} {
+											>
+												if {[N byte 82 0 0 {} {} == 0]} {
+													>
+														switch [Nv ubeshort 122 0 {} {}] {
+															0 {
+																>
+																	U 136 mac-bin 0
+	
+																<
+															}
+															33153 {
+																>
+																	U 136 mac-bin 0
+	
+																<
+															}
+														}
+	
+													<
+												}
+	
+												if {[N ubeshort 122 0 0 {} {} == 33409]} {
+													>
+														U 136 mac-bin 0
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+			>
+				if {[S string 12 0 {} {} eq \x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x40\x00]} {
+					>
+						emit {Soundtrakker 128 ST2 music,}
+						if {[S string 1 0 {} {} x {}]} {
+							>
+								emit {name: %s}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		4 {
+			>
+				if {[N beshort 10 0 0 {} {} == 4064]} {
+					>
+						if {[N belong 12 0 0 {} {} == -250544146]} {
+							>
+								if {[N beshort 520 0 0 {} {} == 256]} {
+									>
+										if {[N byte 522 0 0 {} {} == 15]} {
+											>
+												if {[N bequad 524 0 0 {} {} == 18773704704]} {
+													>
+														if {[N byte 91 0 0 {} {} == 2]} {
+															>
+																if {[N belong 84 0 0 {} {} x {}]} {
+																	>
+																		emit {Nintendo amiibo NFC dump - amiibo ID: %08X-}
+																	<
+																}
+	
+																if {[N belong 88 0 0 {} {} x {}]} {
+																	>
+																		emit {\b%08X}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		32 {
+			>
+				if {[N leshort 1 0 0 {} {} == 7]} {
+					>
+						if {[N byte 118 0 0 {} {} == 32]} {
+							>
+								if {[N leshort 119 0 0 {} {} == 117]} {
+									>
+										emit {TomTom activity file, v7}
+										if {[N leldate 8 0 0 {} {} x {}]} {
+											>
+												emit (%s,
+											<
+										}
+	
+										if {[N byte 3 0 0 {} {} x {}]} {
+											>
+												emit {device firmware %d.}
+											<
+										}
+	
+										if {[N byte 4 0 0 {} {} x {}]} {
+											>
+												emit {\b%d.}
+											<
+										}
+	
+										if {[N byte 5 0 0 {} {} x {}]} {
+											>
+												emit {\b%d,}
+											<
+										}
+	
+										if {[N leshort 6 0 0 {} {} x {}]} {
+											>
+												emit {product ID %04d)}
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		38 {
+			>
+				if {[S regex 16 0 s {} eq ^\[0-78\]\[0-9.\]\{4\}]} {
+					>
+						emit {Sendmail frozen configuration}
+						if {[S string 16 0 {} {} > \0]} {
+							>
+								emit {- version %s}
+							<
+						}
+	
+						ext fc
+					<
+				}
+	
+			<
+		}
+		97 {
+			>
+				if {[S search [R 1] 0 b 5 eq \x64]} {
+					>
+						if {[S search [R 1] 0 b 8 eq \x5f\x81\x44]} {
+							>
+								if {[S search [R 64] 0 b 64 eq \x5f\x81\x49\x01\x03\x5f\x81\x3d\x01]} {
+									>
+										if {[N byte [R 0] 0 0 {} {} x {}]} {
+											>
+												emit {TAP 3.%d Batch (TD.57, Transferred Account)}
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+			>
+				if {[S search [R 1] 0 b 8 eq \x5f\x29\x01\x02\x5f\x25\x01]} {
+					>
+						if {[N byte [R 0] 0 0 {} {} x {}]} {
+							>
+								emit {NRT 2.%d (TD.35, Near Real Time Roaming Data Exchange)}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		98 {
+			>
+				if {[S search 2 0 b 8 eq \x5f\x81\x44]} {
+					>
+						if {[S search [R 64] 0 b 64 eq \x5f\x81\x49\x01\x03\x5f\x81\x3d\x01]} {
+							>
+								if {[N byte [R 0] 0 0 {} {} x {}]} {
+									>
+										emit {TAP 3.%d Notification (TD.57, Transferred Account)}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq \x7f\x84\x16]} {
+		>
+			if {[S search [R 1] 0 b 8 eq \x7f\x84\x19]} {
+				>
+					if {[S search [R 64] 0 b 64 eq \x5f\x81\x49\x01\x03\x5f\x81\x3d\x01]} {
+						>
+							if {[S string [R 1] 0 b {} eq \x5f\x84\x20\x01\x01\x5f\x84\x1f\x01]} {
+								>
+									if {[N byte [R 0] 0 0 {} {} x {}]} {
+										>
+											emit {RAP 1.%d Batch (TD.32, Returned Account Procedure),}
+										<
+									}
+	
+								<
+							}
+	
+							if {[N byte [R 0] 0 0 {} {} x {}]} {
+								>
+									emit {TAP 3.%d}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x7f\x84\x17]} {
+		>
+			if {[S search [R 1] 0 b 5 eq \x5f\x81\x44]} {
+				>
+					emit {RAP Acknowledgement (TD.32, Returned Account Procedure)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq bFLT]} {
+		>
+			emit {BFLT executable}
+			if {[N belong 4 0 0 {} {} x {}]} {
+				>
+					emit {- version %d}
+				<
+			}
+	
+			if {[N belong 4 0 0 {} {} == 4]} {
+				>
+					if {[N belong 36 0 0 & 1 == 1]} {
+						>
+							emit ram
+						<
+					}
+	
+					if {[N belong 36 0 0 & 2 == 2]} {
+						>
+							emit gotpic
+						<
+					}
+	
+					if {[N belong 36 0 0 & 4 == 4]} {
+						>
+							emit gzip
+						<
+					}
+	
+					if {[N belong 36 0 0 & 8 == 8]} {
+						>
+							emit gzdata
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BlockHashLoc\x1a]} {
+		>
+			emit {BlockHashLoc recovery info,}
+			if {[N byte 13 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+					ext bhl
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \037\213]} {
+		>
+			if {[N byte 3 0 0 {} {} & 4]} {
+				>
+					if {[S string 12 0 {} {} eq BC]} {
+						>
+							if {[N leshort 14 0 0 {} {} & 2]} {
+								>
+									emit {Blocked GNU Zip Format (BGZF; gzip compatible)}
+									if {[N leshort 16 0 0 {} {} x {}]} {
+										>
+											emit {\b, block length %d}
+											mime application/x-gzip
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TBI\1]} {
+		>
+			emit {SAMtools TBI (Tabix index format)}
+			if {[N lelong 4 0 0 {} {} == 1]} {
+				>
+					emit {\b, with %d reference sequence}
+				<
+			}
+	
+			if {[N lelong 4 0 0 {} {} > 1]} {
+				>
+					emit {\b, with %d reference sequences}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} & 65536]} {
+				>
+					emit {\b, using half-closed-half-open coordinates (BED style)}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} ^ 65536]} {
+				>
+					switch [Nv lelong 8 0 {} {}] {
+						0 {
+							>
+								emit {\b, using closed and one based coordinates (GFF style)}
+							<
+						}
+						1 {
+							>
+								emit {\b, using SAM format}
+							<
+						}
+						2 {
+							>
+								emit {\b, using VCF format}
+							<
+						}
+					}
+	
+				<
+			}
+	
+			if {[N lelong 12 0 0 {} {} x {}]} {
+				>
+					emit {\b, sequence name column: %d}
+				<
+			}
+	
+			if {[N lelong 16 0 0 {} {} x {}]} {
+				>
+					emit {\b, region start column: %d}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} == 0]} {
+				>
+					if {[N lelong 20 0 0 {} {} x {}]} {
+						>
+							emit {\b, region end column: %d}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 24 0 0 {} {} x {}]} {
+				>
+					emit {\b, comment character: %c}
+				<
+			}
+	
+			if {[N lelong 28 0 0 {} {} x {}]} {
+				>
+					emit {\b, skip line count: %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BAM\1]} {
+		>
+			emit {SAMtools BAM (Binary Sequence Alignment/Map)}
+			if {[N lelong 4 0 0 {} {} > 0]} {
+				>
+					if {[S regex [R 0] 0 {} {} eq ^\[@\]HD\t.*VN:]} {
+						>
+							emit {\b, with SAM header}
+							if {[S regex [R 0] 0 {} {} eq \[0-9.\]+]} {
+								>
+									emit {\b version %s}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N lelong [R [I 4 long 0 + 0 0]] 0 0 {} {} > 0]} {
+						>
+							emit {\b, with %d reference sequences}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BAI\1]} {
+		>
+			emit {SAMtools BAI (BAM indexing format)}
+			if {[N lelong 4 0 0 {} {} > 0]} {
+				>
+					emit {\b, with %d reference sequences}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CRAM]} {
+		>
+			emit CRAM
+			if {[N byte 4 0 0 {} {} > -1]} {
+				>
+					emit {version %d.}
+				<
+			}
+	
+			if {[N byte 5 0 0 {} {} > -1]} {
+				>
+					emit {\b%d}
+				<
+			}
+	
+			if {[S string 6 0 {} {} > \0]} {
+				>
+					emit {(identified as %s)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BCF\4]} {
+		>
+			if {[N lelong [R 0] 0 0 {} {} > 0]} {
+				>
+					if {[N lelong [R [I [R -4] long 0 + 0 0]] 0 0 {} {} > 0]} {
+						>
+							emit {SAMtools BCF (Binary Call Format)}
+							if {[N lelong [R [I [R -4] long 0 + 0 0]] 0 0 {} {} > 0]} {
+								>
+									if {[S search [R 0] 0 {} 100 eq \#\#samtoolsVersion=]} {
+										>
+											if {[S string [R 0] 0 {} {} x {}]} {
+												>
+													emit {\b, generated by SAMtools version %s}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BCF\2\1]} {
+		>
+			emit {Binary Call Format (BCF) version 2.1}
+			if {[N lelong [R 0] 0 0 {} {} > 0]} {
+				>
+					if {[S search [R 0] 0 {} 100 eq \#\#samtoolsVersion=]} {
+						>
+							if {[S string [R 0] 0 {} {} x {}]} {
+								>
+									emit {\b, generated by SAMtools version %s}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BCF\2\2]} {
+		>
+			emit {Binary Call Format (BCF) version 2.2}
+			if {[N lelong [R 0] 0 0 {} {} > 0]} {
+				>
+					if {[S search [R 0] 0 {} 100 eq \#\#samtoolsVersion=]} {
+						>
+							if {[S string [R 0] 0 {} {} x {}]} {
+								>
+									emit {\b, generated by SAMtools version %s}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 100 eq \#\#fileformat=VCFv]} {
+		>
+			emit {Variant Call Format (VCF)}
+			if {[S string [R 0] 0 {} {} x {}]} {
+				>
+					emit {\b version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq @HD\t]} {
+		>
+			if {[S search 4 0 {} 100 eq VN:]} {
+				>
+					emit {Sequence Alignment/Map (SAM), with header}
+					if {[S regex [R 0] 0 {} {} eq \[0-9.\]+]} {
+						>
+							emit {\b version %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[!-?A-~\]\{1,255\}(\t\[^\t\]+)\{11\}]} {
+		>
+			if {[S regex 0 0 {} {} eq ^(\[^\t\]+\t)\{1\}\[0-9\]\{1,5\}\t]} {
+				>
+					if {[S regex 0 0 {} {} eq ^(\[^\t\]+\t)\{2\}\\*|\[^*=\]*\t]} {
+						>
+							if {[S regex 0 0 {} {} eq ^(\[^\t\]+\t)\{3\}\[0-9\]\{1,9\}\t]} {
+								>
+									if {[S regex 0 0 {} {} eq ^(\[^\t\]+\t)\{4\}\[0-9\]\{1,3\}\t]} {
+										>
+											if {[S regex 0 0 {} {} eq \t(\\*|(\[0-9\]+\[MIDNSHPX=\])+)\t]} {
+												>
+													if {[S regex 0 0 {} {} eq \t(\\*|=|\[!-()+->?-~\]\[!-~\]*)\t]} {
+														>
+															if {[S regex 0 0 {} {} eq ^(\[^\t\]+\t)\{7\}\[0-9\]\{1,9\}\t]} {
+																>
+																	if {[S regex 0 0 {} {} eq \t\[+-\]\{0,1\}\[0-9\]\{1,9\}\t.*\t]} {
+																		>
+																			if {[S regex 0 0 {} {} eq ^(\[^\t\]+\t)\{9\}(\\*|\[A-Za-z=.\]+)\t]} {
+																				>
+																					if {[S regex 0 0 {} {} eq ^(\[^\t\]+\t)\{10\}\[!-~\]+]} {
+																						>
+																							emit {Sequence Alignment/Map (SAM)}
+																							if {[S regex 0 0 {} {} eq ^\[@\]HD\t.*VN:]} {
+																								>
+																									emit {\b, with header}
+																									if {[S regex [R 0] 0 {} {} eq \[0-9.\]+]} {
+																										>
+																											emit {\b version %s}
+																										<
+																									}
+	
+																								<
+																							}
+	
+																						<
+																					}
+	
+																				<
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N belong 5 0 0 {} {} == 0]} {
+		>
+			if {[N belong 8 0 0 {} {} == 2101256]} {
+				>
+					emit {BlackBerry RIM ETP file}
+					if {[S string 22 0 {} {} x {}]} {
+						>
+							emit {\b for %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq C\0\0\0R\0\0\0]} {
+		>
+			emit BLCR
+			switch [Nv lelong 16 0 {} {}] {
+				1 {
+					>
+						emit x86
+					<
+				}
+				3 {
+					>
+						emit alpha
+					<
+				}
+				5 {
+					>
+						emit x86-64
+					<
+				}
+				7 {
+					>
+						emit ARM
+					<
+				}
+			}
+	
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit {context data (little endian, version %d)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\0\0C\0\0\0R]} {
+		>
+			emit BLCR
+			switch [Nv belong 16 0 {} {}] {
+				2 {
+					>
+						emit SPARC
+					<
+				}
+				4 {
+					>
+						emit ppc
+					<
+				}
+				6 {
+					>
+						emit ppc64
+					<
+				}
+				7 {
+					>
+						emit ARMEB
+					<
+				}
+				8 {
+					>
+						emit SPARC64
+					<
+				}
+			}
+	
+			if {[N belong 8 0 0 {} {} x {}]} {
+				>
+					emit {context data (big endian, version %d)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BLENDER]} {
+		>
+			emit Blender3D,
+			if {[S string 7 0 {} {} eq _]} {
+				>
+					emit {saved as 32-bits}
+					if {[S string 8 0 {} {} eq v]} {
+						>
+							emit {little endian}
+							if {[N byte 9 0 0 {} {} x {}]} {
+								>
+									emit {with version %c.}
+								<
+							}
+	
+							if {[N byte 10 0 0 {} {} x {}]} {
+								>
+									emit {\b%c}
+								<
+							}
+	
+							if {[N byte 11 0 0 {} {} x {}]} {
+								>
+									emit {\b%c}
+								<
+							}
+	
+							if {[S string 64 0 {} {} eq GLOB]} {
+								>
+									emit {\b.}
+									if {[N leshort 88 0 0 {} {} x {}]} {
+										>
+											emit {\b%.4d}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string 8 0 {} {} eq V]} {
+						>
+							emit {big endian}
+							if {[N byte 9 0 0 {} {} x {}]} {
+								>
+									emit {with version %c.}
+								<
+							}
+	
+							if {[N byte 10 0 0 {} {} x {}]} {
+								>
+									emit {\b%c}
+								<
+							}
+	
+							if {[N byte 11 0 0 {} {} x {}]} {
+								>
+									emit {\b%c}
+								<
+							}
+	
+							if {[S string 64 0 {} {} eq GLOB]} {
+								>
+									emit {\b.}
+									if {[N beshort 88 0 0 {} {} x {}]} {
+										>
+											emit {\b%.4d}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq -]} {
+				>
+					emit {saved as 64-bits}
+					if {[S string 8 0 {} {} eq v]} {
+						>
+							emit {little endian}
+						<
+					}
+	
+					if {[N byte 9 0 0 {} {} x {}]} {
+						>
+							emit {with version %c.}
+						<
+					}
+	
+					if {[N byte 10 0 0 {} {} x {}]} {
+						>
+							emit {\b%c}
+						<
+					}
+	
+					if {[N byte 11 0 0 {} {} x {}]} {
+						>
+							emit {\b%c}
+						<
+					}
+	
+					if {[S string 68 0 {} {} eq GLOB]} {
+						>
+							emit {\b.}
+							if {[N leshort 96 0 0 {} {} x {}]} {
+								>
+									emit {\b%.4d}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string 8 0 {} {} eq V]} {
+						>
+							emit {big endian}
+							if {[N byte 9 0 0 {} {} x {}]} {
+								>
+									emit {with version %c.}
+								<
+							}
+	
+							if {[N byte 10 0 0 {} {} x {}]} {
+								>
+									emit {\b%c}
+								<
+							}
+	
+							if {[N byte 11 0 0 {} {} x {}]} {
+								>
+									emit {\b%c}
+								<
+							}
+	
+							if {[S string 68 0 {} {} eq GLOB]} {
+								>
+									emit {\b.}
+									if {[N beshort 96 0 0 {} {} x {}]} {
+										>
+											emit {\b%.4d}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#!BPY]} {
+		>
+			emit {Blender3D BPython script}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq !<bout>]} {
+		>
+			emit {b.out archive}
+			if {[S string 8 0 {} {} eq __.SYMDEF]} {
+				>
+					emit {random library}
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv belong 0 0 & 16777215] {
+		65799 {
+			>
+				emit {a.out SunOS mc68010}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		65800 {
+			>
+				emit {a.out SunOS mc68010 pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		65803 {
+			>
+				emit {a.out SunOS mc68010 demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N belong 20 0 0 {} {} < 4096]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} == 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} > 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		131335 {
+			>
+				emit {a.out SunOS mc68020}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		131336 {
+			>
+				emit {a.out SunOS mc68020 pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		131339 {
+			>
+				emit {a.out SunOS mc68020 demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N belong 20 0 0 {} {} < 4096]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} == 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} > 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		196871 {
+			>
+				emit SPARC
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 36 0 0 {} {} == -1274019839]} {
+					>
+						emit {(uses shared libs)}
+					<
+				}
+	
+			<
+			>
+				emit {a.out SunOS SPARC}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		196872 {
+			>
+				emit {SPARC pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 36 0 0 {} {} == -1274019839]} {
+					>
+						emit {(uses shared libs)}
+					<
+				}
+	
+			<
+			>
+				emit {a.out SunOS SPARC pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		196875 {
+			>
+				emit {SPARC demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N belong 20 0 0 {} {} < 4096]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} == 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} > 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+				if {[N belong 36 0 0 {} {} == -1274019839]} {
+					>
+						emit {(uses shared libs)}
+					<
+				}
+	
+			<
+			>
+				emit {a.out SunOS SPARC demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N belong 20 0 0 {} {} < 4096]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} == 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} > 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq XIA1]} {
+		>
+			emit {Chiasmus encrypted data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XIS]} {
+		>
+			emit {Chiasmus key}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq btsnoop\0]} {
+		>
+			emit BTSnoop
+			if {[N belong 8 0 0 {} {} x {}]} {
+				>
+					emit {version %d,}
+				<
+			}
+	
+			switch [Nv belong 12 0 {} {}] {
+				1001 {
+					>
+						emit {Unencapsulated HCI}
+					<
+				}
+				1002 {
+					>
+						emit {HCI UART (H4)}
+					<
+				}
+				1003 {
+					>
+						emit {HCI BCSP}
+					<
+				}
+				1004 {
+					>
+						emit {HCI Serial (H5)}
+						if {[N belong 12 0 0 {} {} x {}]} {
+							>
+								emit {type %d}
+							<
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	
+	switch [Nv belong 91392 0 {} {}] {
+		302072064 {
+			>
+				emit {D64 Image}
+			<
+		}
+		302072192 {
+			>
+				emit {D71 Image}
+			<
+		}
+	}
+	
+	if {[N belong 399360 0 0 {} {} == 671302656]} {
+		>
+			emit {D81 Image}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq C64\40CARTRIDGE]} {
+		>
+			emit {CCS C64 Emultar Cartridge Image}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GCR-1541]} {
+		>
+			emit {GCR Image}
+			if {[N byte 8 0 0 {} {} x {}]} {
+				>
+					emit {version: %i}
+				<
+			}
+	
+			if {[N byte 9 0 0 {} {} x {}]} {
+				>
+					emit {tracks: %i}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 9 0 {} {} eq PSUR]} {
+		>
+			emit {ARC archive (c64)}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -LH1-]} {
+		>
+			emit {LHA archive (c64)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq C64File]} {
+		>
+			emit {PC64 Emulator file}
+			if {[S string 8 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq C64Image]} {
+		>
+			emit {PC64 Freezer Image}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CBM\144\0\0]} {
+		>
+			emit {Power 64 C64 Emulator Snapshot}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq C64S\x20tape\x20file]} {
+		>
+			emit {T64 tape Image}
+			if {[N leshort 32 0 0 {} {} x {}]} {
+				>
+					emit Version:0x%x
+				<
+			}
+	
+			if {[N leshort 36 0 0 {} {} != 0]} {
+				>
+					emit Entries:%i
+				<
+			}
+	
+			if {[S string 40 0 {} {} x {}]} {
+				>
+					emit Name:%.24s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq C64\x20tape\x20image\x20file\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0]} {
+		>
+			emit {T64 tape Image}
+			if {[N leshort 32 0 0 {} {} x {}]} {
+				>
+					emit Version:0x%x
+				<
+			}
+	
+			if {[N leshort 36 0 0 {} {} != 0]} {
+				>
+					emit Entries:%i
+				<
+			}
+	
+			if {[S string 40 0 {} {} x {}]} {
+				>
+					emit Name:%.24s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq C64S\x20tape\x20image\x20file\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0]} {
+		>
+			emit {T64 tape Image}
+			if {[N leshort 32 0 0 {} {} x {}]} {
+				>
+					emit Version:0x%x
+				<
+			}
+	
+			if {[N leshort 36 0 0 {} {} != 0]} {
+				>
+					emit Entries:%i
+				<
+			}
+	
+			if {[S string 40 0 {} {} x {}]} {
+				>
+					emit Name:%.24s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq C64-TAPE-RAW]} {
+		>
+			emit {C64 Raw Tape File (.tap),}
+			if {[N byte 12 0 0 {} {} x {}]} {
+				>
+					emit Version:%u,
+				<
+			}
+	
+			if {[N lelong 16 0 0 {} {} x {}]} {
+				>
+					emit {Length:%u cycles}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GTS5]} {
+		>
+			emit {GoatTracker 2 song}
+			if {[S string 4 0 {} {} > \0]} {
+				>
+					emit {\b, "%s"}
+				<
+			}
+	
+			if {[S string 36 0 {} {} > \0]} {
+				>
+					emit {\b by %s}
+				<
+			}
+	
+			if {[S string 68 0 {} {} > \0]} {
+				>
+					emit {\b (C) %s}
+				<
+			}
+	
+			if {[N byte 100 0 0 {} {} > 0]} {
+				>
+					emit {\b, %u subsong(s)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \010\011\376]} {
+		>
+			emit Microstation
+			if {[S string 3 0 {} {} eq \002]} {
+				>
+					if {[S string 30 0 {} {} eq \026\105]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \034\105]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \073\107]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \073\110]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \106\107]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \110\103]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \120\104]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \172\104]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \172\105]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \172\106]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \234\106]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \273\105]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \306\106]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \310\104]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \341\104]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \372\103]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \372\104]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \372\106]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+					if {[S string 30 0 {} {} eq \376\103]} {
+						>
+							emit DGNFile
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq \030\000\000]} {
+				>
+					emit CITFile
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq \030\000\003]} {
+				>
+					emit CITFile
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MC0.0]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 1.0}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1.2]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 1.2}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1.3]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 1.3}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1.40]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 1.40}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1.50]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 2.05}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC2.10]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 2.10}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC2.21]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 2.21}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC2.22]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 2.22}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1001]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 2.22}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1002]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 2.50}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1003]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 2.60}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1004]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 9}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1006]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 10}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1009]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 11/12}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1012]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 13}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1014]} {
+		>
+			emit {DWG AutoDesk AutoCAD Release 14}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1015]} {
+		>
+			emit {DWG AutoDesk AutoCAD 2000/2002}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1018]} {
+		>
+			emit {DWG AutoDesk AutoCAD 2004/2005/2006}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1021]} {
+		>
+			emit {DWG AutoDesk AutoCAD 2007/2008/2009}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1024]} {
+		>
+			emit {DWG AutoDesk AutoCAD 2010/2011/2012}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AC1027]} {
+		>
+			emit {DWG AutoDesk AutoCAD 2013/2014}
+			mime image/vnd.dwg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq KF]} {
+		>
+			switch [Nv belong 2 0 {} {}] {
+				-201293819 {
+					>
+						emit {Kompas drawing 5.9R01.003}
+					<
+				}
+				83886087 {
+					>
+						emit {Kompas drawing 7.0}
+					<
+				}
+				83886089 {
+					>
+						emit {Kompas drawing 9.0}
+					<
+				}
+				134217737 {
+					>
+						emit {Kompas drawing 9.0 SP1}
+					<
+				}
+				150994950 {
+					>
+						emit {Kompas drawing 6.0}
+					<
+				}
+				285245445 {
+					>
+						emit {Kompas drawing 5.8R01.003}
+					<
+				}
+				419467269 {
+					>
+						emit {Kompas drawing 5.10R01}
+					<
+				}
+				436207624 {
+					>
+						emit {Kompas drawing 8.0}
+					<
+				}
+				469794821 {
+					>
+						emit {Kompas drawing 5.9R01.002}
+					<
+				}
+				553684997 {
+					>
+						emit {Kompas drawing 5.10R02 febr}
+					<
+				}
+				554696714 {
+					>
+						emit {Kompas drawing 10.0}
+					<
+				}
+				570462213 {
+					>
+						emit {Kompas drawing 5.10R03}
+					<
+					>
+						emit {Kompas drawing 5.10R02 mar}
+					<
+				}
+				588251146 {
+					>
+						emit {Kompas drawing 10.0 SP1}
+					<
+				}
+				738263303 {
+					>
+						emit {Kompas drawing 7+}
+					<
+				}
+				822083595 {
+					>
+						emit {Kompas drawing 11.0}
+					<
+				}
+				838860806 {
+					>
+						emit {Kompas drawing 6+}
+					<
+				}
+				838860811 {
+					>
+						emit {Kompas drawing 11.0 SP1}
+					<
+				}
+				855703560 {
+					>
+						emit {Kompas drawing 8+}
+					<
+				}
+				1291845644 {
+					>
+						emit {Kompas drawing 12.0}
+					<
+				}
+				1308622860 {
+					>
+						emit {Kompas drawing 12.0 SP1}
+					<
+				}
+				1358991365 {
+					>
+						emit {Kompas drawing 5.11R01}
+					<
+				}
+				1409323013 {
+					>
+						emit {Kompas drawing 5.11R02}
+					<
+				}
+				1543540741 {
+					>
+						emit {Kompas drawing 5.11R03}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MegaCad23\0]} {
+		>
+			emit {MegaCAD 2D/3D drawing}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \;\;\020HSF\020V]} {
+		>
+			emit {OpenHSF (Hoops Stream Format)}
+			if {[S regex 7 0 {} 9 eq V\[.0-9\]\{4,5\}\020]} {
+				>
+					emit %s
+					ext hsf
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xd9\xd9\xf7]} {
+		>
+			emit {Concise Binary Object Representation (CBOR) container}
+			if {[N ubyte 3 0 0 {} {} < 32]} {
+				>
+					emit {(positive integer)}
+				<
+			}
+	
+			if {[N ubyte 3 0 0 {} {} < 64]} {
+				>
+					if {[N ubyte 3 0 0 {} {} > 31]} {
+						>
+							emit {(negative integer)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ubyte 3 0 0 {} {} < 96]} {
+				>
+					if {[N ubyte 3 0 0 {} {} > 63]} {
+						>
+							emit {(byte string)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ubyte 3 0 0 {} {} < 128]} {
+				>
+					if {[N ubyte 3 0 0 {} {} > 95]} {
+						>
+							emit {(text string)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ubyte 3 0 0 {} {} < 160]} {
+				>
+				<
+			}
+	
+			if {[N ubyte 3 0 0 {} {} > 127]} {
+				>
+					emit (array)
+				<
+			}
+	
+			if {[N ubyte 3 0 0 {} {} < 192]} {
+				>
+					if {[N ubyte 3 0 0 {} {} > 159]} {
+						>
+							emit (map)
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ubyte 3 0 0 {} {} < 224]} {
+				>
+					if {[N ubyte 3 0 0 {} {} > 191]} {
+						>
+							emit (tagged)
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ubyte 3 0 0 {} {} > 223]} {
+				>
+					emit (other)
+				<
+			}
+	
+			mime application/cbor
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#\040xmcd]} {
+		>
+			emit {CDDB(tm) format CD text data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \{title]} {
+		>
+			emit {Chord text file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ptab\003\000]} {
+		>
+			emit {Power-Tab v3 Tablature File}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ptab\004\000]} {
+		>
+			emit {Power-Tab v4 Tablature File}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RuneCT]} {
+		>
+			emit {Citrus locale declaration for LC_CTYPE}
+		<
+	}
+	
+	if {[S search 0 0 {} 8192 eq \"libhdr\"]} {
+		>
+			emit {BCPL source text}
+			mime text/x-bcpl
+		<
+	}
+	
+	if {[S search 0 0 {} 8192 eq \"LIBHDR\"]} {
+		>
+			emit {BCPL source text}
+			mime text/x-bcpl
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\#include]} {
+		>
+			emit C
+			if {[S regex 0 0 {} {} eq ^class\[\[:space:\]\]+]} {
+				>
+					if {[S regex [R 0] 0 {} {} eq \\\{\[.*\]\\\}(\;)?\$]} {
+						>
+							emit {\b++}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S clear [R 0] 0 {} {} x {}]} {
+				>
+					emit {source text}
+					mime text/x-c
+					strength {+ 13}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\#\[\[:space:\]\]*pragma]} {
+		>
+			emit {C source text}
+			mime text/x-c
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\#\[\[:space:\]\]*(if|ifn)def]} {
+		>
+			if {[S regex [R 0] 0 {} {} eq ^\#\[\[:space:\]\]*endif\$]} {
+				>
+					emit {C source text}
+					mime text/x-c
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\#\[\[:space:\]\]*(if|ifn)def]} {
+		>
+			if {[S regex [R 0] 0 {} {} eq ^\#\[\[:space:\]\]*define]} {
+				>
+					emit {C source text}
+					mime text/x-c
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*char(\ \\*|\\*)(.+)(=.*)?\;\[\[:space:\]\]*\$]} {
+		>
+			emit {C source text}
+			mime text/x-c
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*double(\ \\*|\\*)(.+)(=.*)?\;\[\[:space:\]\]*\$]} {
+		>
+			emit {C source text}
+			mime text/x-c
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*extern\[\[:space:\]\]+]} {
+		>
+			emit {C source text}
+			mime text/x-c
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*float(\ \\*|\\*)(.+)(=.*)?\;\[\[:space:\]\]*\$]} {
+		>
+			emit {C source text}
+			mime text/x-c
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^struct\[\[:space:\]\]+]} {
+		>
+			emit {C source text}
+			mime text/x-c
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^union\[\[:space:\]\]+]} {
+		>
+			emit {C source text}
+			mime text/x-c
+		<
+	}
+	
+	if {[S search 0 0 {} 8192 eq main(]} {
+		>
+			if {[S regex [R 0] 0 {} {} eq \\)\[\[:space:\]\]*\\\{]} {
+				>
+					emit {C source text}
+					mime text/x-c
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^namespace\[\[:space:\]\]+\[_\[:alpha:\]\]\{1,30\}\[\[:space:\]\]*\\\{]} {
+		>
+			emit {C++ source text}
+			mime text/x-c++
+			strength {+ 30}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^using\[\[:space:\]\]+(namespace\ )?std(::)?\[\[:alpha:\]\]*\[\[:space:\]\]*\;]} {
+		>
+			emit {C++ source text}
+			mime text/x-c++
+			strength {+ 30}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*template\[\[:space:\]\]*<.*>\[\[:space:\]\]*\$]} {
+		>
+			emit {C++ source text}
+			mime text/x-c++
+			strength {+ 30}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*virtual\[\[:space:\]\]+.*\[\}\;\]\[\[:space:\]\]*\$]} {
+		>
+			emit {C++ source text}
+			mime text/x-c++
+			strength {+ 30}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*class\[\[:space:\]\]+\[\[:digit:\]\[:alpha:\]:_\]+\[\[:space:\]\]*\\\{(.*\[\n\]*)*\\\}(\;)?\$]} {
+		>
+			emit {C++ source text}
+			mime text/x-c++
+			strength {+ 13}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*public:]} {
+		>
+			emit {C++ source text}
+			mime text/x-c++
+			strength {+ 30}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*private:]} {
+		>
+			emit {C++ source text}
+			mime text/x-c++
+			strength {+ 30}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*protected:]} {
+		>
+			emit {C++ source text}
+			mime text/x-c++
+			strength {+ 30}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\#import]} {
+		>
+			emit {Objective-C source text}
+			mime text/x-objective-c
+			strength {+ 25}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq cscope]} {
+		>
+			emit {cscope reference data}
+			if {[S string 7 0 {} {} x {}]} {
+				>
+					emit {version %.2s}
+				<
+			}
+	
+			if {[S string 7 0 {} {} > 14]} {
+				>
+					if {[S search 10 0 {} 100 eq \ -q\ ]} {
+						>
+							emit {with inverted index}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 10 0 {} 100 eq \ -c\ ]} {
+				>
+					emit {text (non-compressed)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 514 0 {} {} eq \377\377\377\377\000]} {
+		>
+			if {[S string 0 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+				>
+					emit {Claris clip art}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 514 0 {} {} eq \377\377\377\377\001]} {
+		>
+			if {[S string 0 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+				>
+					emit {Claris clip art}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \020\341\000\000\010\010]} {
+		>
+			emit {Claris Works palette files .plt}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \002\271\262\000\040\002\000\164]} {
+		>
+			emit {Claris works dictionary}
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq pipe]} {
+		>
+			emit {CLIPPER instruction trace}
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq prof]} {
+		>
+			emit {CLIPPER instruction profile}
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /bin/sh]} {
+		>
+			emit {POSIX shell script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w b} {} eq \#!\ /bin/sh]} {
+		>
+			emit {POSIX shell script executable (binary data)}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /bin/csh]} {
+		>
+			emit {C shell script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /bin/ksh]} {
+		>
+			emit {Korn shell script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w b} {} eq \#!\ /bin/ksh]} {
+		>
+			emit {Korn shell script executable (binary data)}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /bin/tcsh]} {
+		>
+			emit {Tenex C shell script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/bin/tcsh]} {
+		>
+			emit {Tenex C shell script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/local/tcsh]} {
+		>
+			emit {Tenex C shell script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/local/bin/tcsh]} {
+		>
+			emit {Tenex C shell script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /bin/zsh]} {
+		>
+			emit {Paul Falstad's zsh script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/bin/zsh]} {
+		>
+			emit {Paul Falstad's zsh script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/local/bin/zsh]} {
+		>
+			emit {Paul Falstad's zsh script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/local/bin/ash]} {
+		>
+			emit {Neil Brown's ash script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/local/bin/ae]} {
+		>
+			emit {Neil Brown's ae script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /bin/nawk]} {
+		>
+			emit {new awk script text executable}
+			mime text/x-nawk
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/bin/nawk]} {
+		>
+			emit {new awk script text executable}
+			mime text/x-nawk
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/local/bin/nawk]} {
+		>
+			emit {new awk script text executable}
+			mime text/x-nawk
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /bin/gawk]} {
+		>
+			emit {GNU awk script text executable}
+			mime text/x-gawk
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/bin/gawk]} {
+		>
+			emit {GNU awk script text executable}
+			mime text/x-gawk
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/local/bin/gawk]} {
+		>
+			emit {GNU awk script text executable}
+			mime text/x-gawk
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /bin/awk]} {
+		>
+			emit {awk script text executable}
+			mime text/x-awk
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/bin/awk]} {
+		>
+			emit {awk script text executable}
+			mime text/x-awk
+		<
+	}
+	
+	if {[S regex 0 0 {} 4096 eq ^\[\040\t\f\r\n\]\{0,100\}BEGIN\[\040\t\f\r\n\]\{0,100\}\[\{\]]} {
+		>
+			emit {awk or perl script text}
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /bin/rc]} {
+		>
+			emit {Plan 9 rc shell script text executable}
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /bin/bash]} {
+		>
+			emit {Bourne-Again shell script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w b} {} eq \#!\ /bin/bash]} {
+		>
+			emit {Bourne-Again shell script executable (binary data)}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/bin/bash]} {
+		>
+			emit {Bourne-Again shell script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w b} {} eq \#!\ /usr/bin/bash]} {
+		>
+			emit {Bourne-Again shell script executable (binary data)}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/local/bash]} {
+		>
+			emit {Bourne-Again shell script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w b} {} eq \#!\ /usr/local/bash]} {
+		>
+			emit {Bourne-Again shell script executable (binary data)}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/local/bin/bash]} {
+		>
+			emit {Bourne-Again shell script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w b} {} eq \#!\ /usr/local/bin/bash]} {
+		>
+			emit {Bourne-Again shell script executable (binary data)}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S string 0 0 {w t} {} eq \#!\ /usr/bin/env\ bash]} {
+		>
+			emit {Bourne-Again shell script text executable}
+			mime text/x-shellscript
+		<
+	}
+	
+	if {[S search 0 0 c 1 eq <?php]} {
+		>
+			emit {PHP script text}
+			mime text/x-php
+			strength {+ 30}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq <?\n]} {
+		>
+			emit {PHP script text}
+			mime text/x-php
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq <?\r]} {
+		>
+			emit {PHP script text}
+			mime text/x-php
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!\ /usr/local/bin/php]} {
+		>
+			emit {PHP script text executable}
+			mime text/x-php
+			strength {+ 10}
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!\ /usr/bin/php]} {
+		>
+			emit {PHP script text executable}
+			mime text/x-php
+			strength {+ 10}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <?php]} {
+		>
+			if {[S regex 5 0 {} {} eq \[\ \n\]]} {
+				>
+					if {[S string 6 0 {} {} eq /*\ Smarty\ version]} {
+						>
+							emit {Smarty compiled template}
+							if {[S regex 24 0 {} {} eq \[0-9.\]+]} {
+								>
+									emit {\b, version %s}
+									mime text/x-php
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Zend\x00]} {
+		>
+			emit {PHP script Zend Optimizer data}
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \$!]} {
+		>
+			emit {DCL command file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#!/usr/bin/pdmenu]} {
+		>
+			emit {Pdmenu configuration file text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x0b\x13\x08\x00]} {
+		>
+			if {[N uleshort 4 0 0 {} {} < 4]} {
+				>
+					emit {ksh byte-code version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \$Suite]} {
+		>
+			emit {TTCN Abstract Test Suite}
+			if {[S string [R 1] 0 {} {} eq \$SuiteId]} {
+				>
+					if {[S string [R 1] 0 {} {} > \n]} {
+						>
+							emit %s
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string [R 2] 0 {} {} eq \$SuiteId]} {
+				>
+					if {[S string [R 1] 0 {} {} > \n]} {
+						>
+							emit %s
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string [R 3] 0 {} {} eq \$SuiteId]} {
+				>
+					if {[S string [R 1] 0 {} {} > \n]} {
+						>
+							emit %s
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq mscdocument]} {
+		>
+			emit {Message Sequence Chart (document)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq msc]} {
+		>
+			emit {Message Sequence Chart (chart)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq submsc]} {
+		>
+			emit {Message Sequence Chart (subchart)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \037\235]} {
+		>
+			emit {compress'd data}
+			if {[N byte 2 0 0 & -128 > 0]} {
+				>
+					emit {block compressed}
+				<
+			}
+	
+			if {[N byte 2 0 0 & 31 x {}]} {
+				>
+					emit {%d bits}
+				<
+			}
+	
+			mime application/x-compress
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \037\213]} {
+		>
+			emit {gzip compressed data}
+			if {[N byte 2 0 0 {} {} < 8]} {
+				>
+					emit {\b, reserved method}
+				<
+			}
+	
+			if {[N byte 2 0 0 {} {} > 8]} {
+				>
+					emit {\b, unknown method}
+				<
+			}
+	
+			if {[N byte 3 0 0 {} {} & 1]} {
+				>
+					emit {\b, ASCII}
+				<
+			}
+	
+			if {[N byte 3 0 0 {} {} & 2]} {
+				>
+					emit {\b, has CRC}
+				<
+			}
+	
+			if {[N byte 3 0 0 {} {} & 4]} {
+				>
+					emit {\b, extra field}
+				<
+			}
+	
+			if {[N byte 3 0 0 & 12 == 8]} {
+				>
+					if {[S string 10 0 {} {} x {}]} {
+						>
+							emit {\b, was "%s"}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 3 0 0 {} {} & 16]} {
+				>
+					emit {\b, has comment}
+				<
+			}
+	
+			if {[N byte 3 0 0 {} {} & 32]} {
+				>
+					emit {\b, encrypted}
+				<
+			}
+	
+			if {[N ledate 4 0 0 {} {} > 0]} {
+				>
+					emit {\b, last modified: %s}
+				<
+			}
+	
+			switch [Nv byte 8 0 {} {}] {
+				2 {
+					>
+						emit {\b, max compression}
+					<
+				}
+				4 {
+					>
+						emit {\b, max speed}
+					<
+				}
+			}
+	
+			switch [Nv byte 9 0 {} {}] {
+				0 {
+					>
+						emit {\b, from FAT filesystem (MS-DOS, OS/2, NT)}
+					<
+				}
+				1 {
+					>
+						emit {\b, from Amiga}
+					<
+				}
+				2 {
+					>
+						emit {\b, from VMS}
+					<
+				}
+				3 {
+					>
+						emit {\b, from Unix}
+					<
+				}
+				4 {
+					>
+						emit {\b, from VM/CMS}
+					<
+				}
+				5 {
+					>
+						emit {\b, from Atari}
+					<
+				}
+				6 {
+					>
+						emit {\b, from HPFS filesystem (OS/2, NT)}
+					<
+				}
+				7 {
+					>
+						emit {\b, from MacOS}
+					<
+				}
+				8 {
+					>
+						emit {\b, from Z-System}
+					<
+				}
+				9 {
+					>
+						emit {\b, from CP/M}
+					<
+				}
+				10 {
+					>
+						emit {\b, from TOPS/20}
+					<
+				}
+				11 {
+					>
+						emit {\b, from NTFS filesystem (NT)}
+					<
+				}
+				12 {
+					>
+						emit {\b, from QDOS}
+					<
+				}
+				13 {
+					>
+						emit {\b, from Acorn RISCOS}
+					<
+				}
+			}
+	
+			if {[N lelong -4 0 0 {} {} x {}]} {
+				>
+					emit {\b, original size %d}
+				<
+			}
+	
+			mime application/x-gzip
+			strength {* 2}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \037\036]} {
+		>
+			emit {packed data}
+			if {[N belong 2 0 0 {} {} > 1]} {
+				>
+					emit {\b, %d characters originally}
+				<
+			}
+	
+			if {[N belong 2 0 0 {} {} == 1]} {
+				>
+					emit {\b, %d character originally}
+				<
+			}
+	
+			mime application/octet-stream
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \377\037]} {
+		>
+			emit {compacted data}
+			mime application/octet-stream
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BZh]} {
+		>
+			emit {bzip2 compressed data}
+			if {[N byte 3 0 0 {} {} > 47]} {
+				>
+					emit {\b, block size = %c00k}
+				<
+			}
+	
+			mime application/x-bzip2
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BZ0]} {
+		>
+			emit {bzip compressed data}
+			if {[N byte 3 0 0 {} {} > 47]} {
+				>
+					emit {\b, block size = %c00k}
+				<
+			}
+	
+			mime application/x-bzip
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LZIP]} {
+		>
+			emit {lzip compressed data}
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {\b, version: %d}
+				<
+			}
+	
+			mime application/x-lzip
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \037\237]} {
+		>
+			emit {frozen file 2.1}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \037\236]} {
+		>
+			emit {frozen file 1.0 (or gzip 0.5)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \037\240]} {
+		>
+			emit {SCO compress -H (LZH) data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a]} {
+		>
+			emit {lzop compressed data}
+			if {[N beshort 9 0 0 {} {} < 2368]} {
+				>
+					if {[N byte 9 0 0 & -16 == 0]} {
+						>
+							emit {- version 0.}
+						<
+					}
+	
+					if {[N beshort 9 0 0 & 4095 x {}]} {
+						>
+							emit {\b%03x,}
+						<
+					}
+	
+					switch [Nv byte 13 0 {} {}] {
+						1 {
+							>
+								emit LZO1X-1,
+							<
+						}
+						2 {
+							>
+								emit LZO1X-1(15),
+							<
+						}
+						3 {
+							>
+								emit LZO1X-999,
+							<
+						}
+					}
+	
+					switch [Nv byte 14 0 {} {}] {
+						0 {
+							>
+								emit {os: MS-DOS}
+							<
+						}
+						1 {
+							>
+								emit {os: Amiga}
+							<
+						}
+						2 {
+							>
+								emit {os: VMS}
+							<
+						}
+						3 {
+							>
+								emit {os: Unix}
+							<
+						}
+						5 {
+							>
+								emit {os: Atari}
+							<
+						}
+						6 {
+							>
+								emit {os: OS/2}
+							<
+						}
+						7 {
+							>
+								emit {os: MacOS}
+							<
+						}
+						10 {
+							>
+								emit {os: Tops/20}
+							<
+						}
+						11 {
+							>
+								emit {os: WinNT}
+							<
+						}
+						14 {
+							>
+								emit {os: Win32}
+							<
+						}
+					}
+	
+				<
+			}
+	
+			if {[N beshort 9 0 0 {} {} > 2361]} {
+				>
+					switch [Nv byte 9 0 & -16] {
+						0 {
+							>
+								emit {- version 0.}
+							<
+						}
+						16 {
+							>
+								emit {- version 1.}
+							<
+						}
+						32 {
+							>
+								emit {- version 2.}
+							<
+						}
+					}
+	
+					if {[N beshort 9 0 0 & 4095 x {}]} {
+						>
+							emit {\b%03x,}
+						<
+					}
+	
+					switch [Nv byte 15 0 {} {}] {
+						1 {
+							>
+								emit LZO1X-1,
+							<
+						}
+						2 {
+							>
+								emit LZO1X-1(15),
+							<
+						}
+						3 {
+							>
+								emit LZO1X-999,
+							<
+						}
+					}
+	
+					switch [Nv byte 17 0 {} {}] {
+						0 {
+							>
+								emit {os: MS-DOS}
+							<
+						}
+						1 {
+							>
+								emit {os: Amiga}
+							<
+						}
+						2 {
+							>
+								emit {os: VMS}
+							<
+						}
+						3 {
+							>
+								emit {os: Unix}
+							<
+						}
+						5 {
+							>
+								emit {os: Atari}
+							<
+						}
+						6 {
+							>
+								emit {os: OS/2}
+							<
+						}
+						7 {
+							>
+								emit {os: MacOS}
+							<
+						}
+						10 {
+							>
+								emit {os: Tops/20}
+							<
+						}
+						11 {
+							>
+								emit {os: WinNT}
+							<
+						}
+						14 {
+							>
+								emit {os: Win32}
+							<
+						}
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \037\241]} {
+		>
+			emit {Quasijarus strong compressed data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XPKF]} {
+		>
+			emit {Amiga xpkf.library compressed data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PP11]} {
+		>
+			emit {Power Packer 1.1 compressed data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PP20]} {
+		>
+			emit {Power Packer 2.0 compressed data,}
+			switch [Nv belong 4 0 {} {}] {
+				151587081 {
+					>
+						emit {fast compression}
+					<
+				}
+				151652874 {
+					>
+						emit {mediocre compression}
+					<
+				}
+				151653131 {
+					>
+						emit {good compression}
+					<
+				}
+				151653388 {
+					>
+						emit {very good compression}
+					<
+				}
+				151653389 {
+					>
+						emit {best compression}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 7z\274\257\047\034]} {
+		>
+			emit {7-zip archive data,}
+			if {[N byte 6 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+			if {[N byte 7 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+					mime application/x-7z-compressed
+					ext 7z/cb7
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lelong 0 0 0 & 16777215 == 93]} {
+		>
+			switch [Nv leshort 12 0 {} {}] {
+				0 {
+					>
+						emit {LZMA compressed data,}
+						if {[N lequad 5 0 0 {} {} == -1]} {
+							>
+								emit streamed
+							<
+						}
+	
+						if {[N lequad 5 0 0 {} {} != -1]} {
+							>
+								emit {non-streamed, size %lld}
+							<
+						}
+	
+					<
+				}
+				255 {
+					>
+						emit {LZMA compressed data,}
+						mime application/x-lzma
+						if {[N lequad 5 0 0 {} {} == -1]} {
+							>
+								emit streamed
+							<
+						}
+	
+						if {[N lequad 5 0 0 {} {} != -1]} {
+							>
+								emit {non-streamed, size %lld}
+							<
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S ustring 0 0 {} {} eq \xFD7zXZ\x00]} {
+		>
+			emit {XZ compressed data}
+			mime application/x-xz
+			strength {* 2}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LRZI]} {
+		>
+			emit {LRZIP compressed data}
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {- version %d}
+				<
+			}
+	
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+					mime application/x-lrzip
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lelong 0 0 0 & -16 == 407710288]} {
+		>
+			T [I 4 ulelong 0 + 0 8] {}
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq -afx-]} {
+		>
+			emit {AFX compressed file data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RZIP]} {
+		>
+			emit {rzip compressed data}
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {- version %d}
+				<
+			}
+	
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+			if {[N belong 6 0 0 {} {} x {}]} {
+				>
+					emit {(%d bytes)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ArC\x01]} {
+		>
+			emit {FreeArc archive <http://freearc.org>}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \377\006\0\0sNaPpY]} {
+		>
+			emit {snappy framed data}
+			mime application/x-snappy-framed
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq qpress10]} {
+		>
+			emit {qpress compressed data}
+			mime application/x-qpress
+		<
+	}
+	
+	if {[S string 0 0 b {} x {}]} {
+		>
+			if {[N beshort 0 0 0 % 31 == 0]} {
+				>
+					if {[N byte 0 0 0 & 15 == 8]} {
+						>
+							if {[N byte 0 0 0 & -128 == 0]} {
+								>
+									emit {zlib compressed data}
+									mime application/zlib
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BWC]} {
+		>
+			if {[N byte 3 0 0 {} {} == 0]} {
+				>
+					emit {BWC compressed data}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SLIB]} {
+		>
+			emit {Softlib archive}
+			if {[N leshort 4 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d}
+				<
+			}
+	
+			if {[N leshort 6 0 0 {} {} x {}]} {
+				>
+					emit {(contains %d files)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq bvx-]} {
+		>
+			emit {lzfse encoded, no compression}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq bvx1]} {
+		>
+			emit {lzfse compressed, uncompressed tables}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq bvx2]} {
+		>
+			emit {lzfse compressed, compressed tables}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq bvxn]} {
+		>
+			emit {lzfse encoded, lzvn compressed}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NES\x1A]} {
+		>
+			emit {NES ROM image (iNES)}
+			U 51 nes-rom-image-ines 0
+	
+			mime application/x-nes-rom
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq UNIF]} {
+		>
+			if {[N lelong 4 0 0 {} {} < 16]} {
+				>
+					emit {NES ROM image (UNIF v%d format)}
+					mime application/x-nes-rom
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FDS\x1A]} {
+		>
+			if {[S string 17 0 {} {} eq *NINTENDO-HVC*]} {
+				>
+					emit {Famicom Disk System disk image:}
+					U 51 nintendo-fds-disk-info-block 16
+	
+					mime application/x-fds-disk
+				<
+			}
+	
+			if {[N byte 4 0 0 {} {} == 1]} {
+				>
+					emit {(%u side)}
+				<
+			}
+	
+			if {[N byte 4 0 0 {} {} != 1]} {
+				>
+					emit {(%u sides)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq *NINTENDO-HVC*]} {
+		>
+			emit {Famicom Disk System disk image:}
+			U 51 nintendo-fds-disk-info-block 0
+	
+			mime application/x-fds-disk
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TNES]} {
+		>
+			emit {NES ROM image (Nintendo 3DS Virtual Console)}
+			if {[N byte 4 0 0 {} {} == 100]} {
+				>
+					emit {\b: FDS,}
+					U 51 nintendo-fds-disk-info-block 8208
+	
+				<
+			}
+	
+			if {[N byte 4 0 0 {} {} != 100]} {
+				>
+					emit {\b: TNES mapper %u}
+					if {[N byte 5 0 0 {} {} x {}]} {
+						>
+							emit {\b, %ux8k PRG}
+						<
+					}
+	
+					if {[N byte 6 0 0 {} {} x {}]} {
+						>
+							emit {\b, %ux8k CHR}
+						<
+					}
+	
+					if {[N byte 7 0 0 & 8 == 1]} {
+						>
+							emit {[WRAM]}
+						<
+					}
+	
+					switch [Nv byte 8 0 & 9] {
+						1 {
+							>
+								emit {[H-mirror]}
+							<
+						}
+						2 {
+							>
+								emit {[V-mirror]}
+							<
+						}
+					}
+	
+					if {[N byte 8 0 0 & 2 == 3]} {
+						>
+							emit {[VRAM]}
+						<
+					}
+	
+				<
+			}
+	
+			mime application/x-nes-rom
+		<
+	}
+	
+	if {[N bequad 260 0 0 {} {} == -3536057540719869941]} {
+		>
+			emit {Game Boy ROM image}
+			if {[N byte 323 0 0 & -128 == -128]} {
+				>
+					if {[S string 308 0 {} {} > \0]} {
+						>
+							emit {\b: "%.15s"}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 323 0 0 & -128 != -128]} {
+				>
+					if {[S string 308 0 {} {} > \0]} {
+						>
+							emit {\b: "%.16s"}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 332 0 0 {} {} x {}]} {
+				>
+					emit (Rev.%02u)
+				<
+			}
+	
+			if {[N byte 331 0 0 {} {} == 51]} {
+				>
+					if {[N byte 326 0 0 {} {} == 3]} {
+						>
+							if {[N byte 323 0 0 & -128 == -128]} {
+								>
+									emit {[SGB+CGB]}
+								<
+							}
+	
+							if {[N byte 323 0 0 & -128 != -128]} {
+								>
+									emit {[SGB]}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N byte 326 0 0 {} {} != 3]} {
+						>
+							switch [Nv byte 323 0 & -64] {
+								-128 {
+									>
+										emit {[CGB]}
+									<
+								}
+								-64 {
+									>
+										emit {[CGB ONLY]}
+									<
+								}
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 331 0 0 {} {} != 51]} {
+				>
+				<
+			}
+	
+			switch [Nv byte 327 0 {} {}] {
+				-4 {
+					>
+						emit {[Pocket Camera]}
+					<
+				}
+				-3 {
+					>
+						emit {[Bandai TAMA5]}
+					<
+				}
+				-2 {
+					>
+						emit {[Hudson HuC-3]}
+					<
+				}
+				-1 {
+					>
+						emit {[Hudson HuC-1]}
+					<
+				}
+				0 {
+					>
+						emit {[ROM ONLY]}
+					<
+				}
+				1 {
+					>
+						emit {[MBC1]}
+					<
+				}
+				2 {
+					>
+						emit {[MBC1+RAM]}
+					<
+				}
+				3 {
+					>
+						emit {[MBC1+RAM+BATT]}
+					<
+				}
+				5 {
+					>
+						emit {[MBC2]}
+					<
+				}
+				6 {
+					>
+						emit {[MBC2+BATTERY]}
+					<
+				}
+				8 {
+					>
+						emit {[ROM+RAM]}
+					<
+				}
+				9 {
+					>
+						emit {[ROM+RAM+BATTERY]}
+					<
+				}
+				11 {
+					>
+						emit {[MMM01]}
+					<
+				}
+				12 {
+					>
+						emit {[MMM01+SRAM]}
+					<
+				}
+				13 {
+					>
+						emit {[MMM01+SRAM+BATT]}
+					<
+				}
+				15 {
+					>
+						emit {[MBC3+TIMER+BATT]}
+					<
+				}
+				16 {
+					>
+						emit {[MBC3+TIMER+RAM+BATT]}
+					<
+				}
+				17 {
+					>
+						emit {[MBC3]}
+					<
+				}
+				18 {
+					>
+						emit {[MBC3+RAM]}
+					<
+				}
+				19 {
+					>
+						emit {[MBC3+RAM+BATT]}
+					<
+				}
+				25 {
+					>
+						emit {[MBC5]}
+					<
+				}
+				26 {
+					>
+						emit {[MBC5+RAM]}
+					<
+				}
+				27 {
+					>
+						emit {[MBC5+RAM+BATT]}
+					<
+				}
+				28 {
+					>
+						emit {[MBC5+RUMBLE]}
+					<
+				}
+				29 {
+					>
+						emit {[MBC5+RUMBLE+SRAM]}
+					<
+				}
+				30 {
+					>
+						emit {[MBC5+RUMBLE+SRAM+BATT]}
+					<
+				}
+			}
+	
+			switch [Nv byte 328 0 {} {}] {
+				0 {
+					>
+						emit {\b, ROM: 256Kbit}
+					<
+				}
+				1 {
+					>
+						emit {\b, ROM: 512Kbit}
+					<
+				}
+				2 {
+					>
+						emit {\b, ROM: 1Mbit}
+					<
+				}
+				3 {
+					>
+						emit {\b, ROM: 2Mbit}
+					<
+				}
+				4 {
+					>
+						emit {\b, ROM: 4Mbit}
+					<
+				}
+				5 {
+					>
+						emit {\b, ROM: 8Mbit}
+					<
+				}
+				6 {
+					>
+						emit {\b, ROM: 16Mbit}
+					<
+				}
+				7 {
+					>
+						emit {\b, ROM: 32Mbit}
+					<
+				}
+				82 {
+					>
+						emit {\b, ROM: 9Mbit}
+					<
+				}
+				83 {
+					>
+						emit {\b, ROM: 10Mbit}
+					<
+				}
+				84 {
+					>
+						emit {\b, ROM: 12Mbit}
+					<
+				}
+			}
+	
+			switch [Nv byte 329 0 {} {}] {
+				1 {
+					>
+						emit {\b, RAM: 16Kbit}
+					<
+				}
+				2 {
+					>
+						emit {\b, RAM: 64Kbit}
+					<
+				}
+				3 {
+					>
+						emit {\b, RAM: 128Kbit}
+					<
+				}
+				4 {
+					>
+						emit {\b, RAM: 1Mbit}
+					<
+				}
+				5 {
+					>
+						emit {\b, RAM: 512Kbit}
+					<
+				}
+			}
+	
+			mime application/x-gameboy-rom
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SEGADISCSYSTEM\ \ ]} {
+		>
+			emit {Sega Mega CD disc image}
+			U 51 sega-mega-drive-header 0
+	
+			if {[N byte 0 0 0 {} {} x {}]} {
+				>
+					emit {\b, 2048-byte sectors}
+				<
+			}
+	
+			mime application/x-sega-cd-rom
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SEGABOOTDISC\ \ \ \ ]} {
+		>
+			emit {Sega Mega CD disc image}
+			U 51 sega-mega-drive-header 0
+	
+			if {[N byte 0 0 0 {} {} x {}]} {
+				>
+					emit {\b, 2048-byte sectors}
+				<
+			}
+	
+			mime application/x-sega-cd-rom
+		<
+	}
+	
+	if {[S string 16 0 {} {} eq SEGADISCSYSTEM\ \ ]} {
+		>
+			emit {Sega Mega CD disc image}
+			U 51 sega-mega-drive-header 16
+	
+			if {[N byte 0 0 0 {} {} x {}]} {
+				>
+					emit {\b, 2352-byte sectors}
+				<
+			}
+	
+			mime application/x-sega-cd-rom
+		<
+	}
+	
+	if {[S string 16 0 {} {} eq SEGABOOTDISC\ \ \ \ ]} {
+		>
+			emit {Sega Mega CD disc image}
+			U 51 sega-mega-drive-header 16
+	
+			if {[N byte 0 0 0 {} {} x {}]} {
+				>
+					emit {\b, 2352-byte sectors}
+				<
+			}
+	
+			mime application/x-sega-cd-rom
+		<
+	}
+	
+	if {[S string 256 0 {} {} eq SEGA]} {
+		>
+			if {[N bequad 960 0 0 {} {} == 5566821131383687237]} {
+				>
+					emit {Sega 32X ROM image}
+					U 51 sega-mega-drive-header 0
+	
+					mime application/x-genesis-32x-rom
+				<
+			}
+	
+			if {[N bequad 960 0 0 {} {} != 5566821131383687237]} {
+				>
+					if {[N belong 261 0 0 {} {} == 1346978639]} {
+						>
+							emit {Sega Pico ROM image}
+							U 51 sega-mega-drive-header 0
+	
+							mime application/x-sega-pico-rom
+						<
+					}
+	
+					if {[N belong 261 0 0 {} {} != 1346978639]} {
+						>
+							if {[N beshort 384 0 0 {} {} == 16978]} {
+								>
+									emit {Sega Mega CD Boot ROM image}
+									mime application/x-genesis-rom
+								<
+							}
+	
+							if {[N beshort 384 0 0 {} {} != 16978]} {
+								>
+									emit {Sega Mega Drive / Genesis ROM image}
+									mime application/x-genesis-rom
+								<
+							}
+	
+							U 51 sega-mega-drive-header 0
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 640 0 {} {} eq EAGN]} {
+		>
+			if {[N beshort 8 0 0 {} {} == -21829]} {
+				>
+					emit {Sega Mega Drive / Genesis ROM image (SMD format):}
+					U 51 sega-genesis-smd-header 0
+	
+					mime application/x-genesis-rom
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 640 0 {} {} eq EAMG]} {
+		>
+			if {[N beshort 8 0 0 {} {} == -21829]} {
+				>
+					emit {Sega Mega Drive / Genesis ROM image (SMD format):}
+					U 51 sega-genesis-smd-header 0
+	
+					mime application/x-genesis-rom
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 32752 0 {} {} eq TMR\ SEGA]} {
+		>
+			U 51 sega-master-system-rom-header 32752
+	
+		<
+	}
+	
+	if {[S string 16368 0 {} {} eq TMR\ SEGA]} {
+		>
+			U 51 sega-master-system-rom-header 16368
+	
+		<
+	}
+	
+	if {[S string 8176 0 {} {} eq TMR\ SEGA]} {
+		>
+			U 51 sega-master-system-rom-header 8176
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SEGA\ SEGASATURN\ ]} {
+		>
+			emit {Sega Saturn disc image}
+			U 51 sega-saturn-disc-header 0
+	
+			if {[N byte 0 0 0 {} {} x {}]} {
+				>
+					emit {(2048-byte sectors)}
+				<
+			}
+	
+			mime application/x-saturn-rom
+		<
+	}
+	
+	if {[S string 16 0 {} {} eq SEGA\ SEGASATURN\ ]} {
+		>
+			emit {Sega Saturn disc image}
+			U 51 sega-saturn-disc-header 16
+	
+			if {[N byte 0 0 0 {} {} x {}]} {
+				>
+					emit {(2352-byte sectors)}
+				<
+			}
+	
+			mime application/x-saturn-rom
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SEGA\ SEGAKATANA\ ]} {
+		>
+			emit {Sega Dreamcast disc image}
+			U 51 sega-dreamcast-disc-header 0
+	
+			if {[N byte 0 0 0 {} {} x {}]} {
+				>
+					emit {(2048-byte sectors)}
+				<
+			}
+	
+			mime application/x-dc-rom
+		<
+	}
+	
+	if {[S string 16 0 {} {} eq SEGA\ SEGAKATANA\ ]} {
+		>
+			emit {Sega Dreamcast disc image}
+			U 51 sega-dreamcast-disc-header 16
+	
+			if {[N byte 0 0 0 {} {} x {}]} {
+				>
+					emit {(2352-byte sectors)}
+				<
+			}
+	
+			mime application/x-dc-rom
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LCDi]} {
+		>
+			emit {Dream Animator file}
+		<
+	}
+	
+	if {[N bequad 4 0 0 {} {} == 2666041169113948705]} {
+		>
+			emit {Game Boy Advance ROM image}
+			if {[S string 160 0 {} {} > \0]} {
+				>
+					emit {\b: "%.12s"}
+				<
+			}
+	
+			if {[S string 172 0 {} {} x {}]} {
+				>
+					emit (%.6s
+				<
+			}
+	
+			if {[N byte 188 0 0 {} {} x {}]} {
+				>
+					emit {\b, Rev.%02u)}
+				<
+			}
+	
+			mime application/x-gba-rom
+		<
+	}
+	
+	switch [Nv bequad 192 0 {} {}] {
+		-4008115836254384158 {
+			>
+				emit {Nintendo DS Slot-2 ROM image (PassMe)}
+				mime application/x-nintendo-ds-rom
+			<
+		}
+		2666041169113948705 {
+			>
+				emit {Nintendo DS ROM image}
+				mime application/x-nintendo-ds-rom
+				if {[S string 0 0 {} {} > \0]} {
+					>
+						emit {\b: "%.12s"}
+					<
+				}
+	
+				if {[S string 12 0 {} {} x {}]} {
+					>
+						emit (%.6s
+					<
+				}
+	
+				if {[N byte 30 0 0 {} {} x {}]} {
+					>
+						emit {\b, Rev.%02u)}
+					<
+				}
+	
+				switch [Nv byte 18 0 {} {}] {
+					2 {
+						>
+							emit {(DSi enhanced)}
+						<
+					}
+					3 {
+						>
+							emit {(DSi only)}
+						<
+					}
+				}
+	
+				if {[N lelong 32 0 0 {} {} < 16384]} {
+					>
+						emit (homebrew)
+					<
+				}
+	
+				if {[N lelong 32 0 0 {} {} > 16383]} {
+					>
+						if {[N lequad 16384 0 0 {} {} == 0]} {
+							>
+								emit (multiboot)
+							<
+						}
+	
+						if {[N lequad 16384 0 0 {} {} != 0]} {
+							>
+								if {[N lequad 16384 0 0 {} {} == -1729418541196648705]} {
+									>
+										emit (decrypted)
+									<
+								}
+	
+								if {[N lequad 16384 0 0 {} {} != -1729418541196648705]} {
+									>
+										if {[N lequad 4096 0 0 {} {} == 0]} {
+											>
+												emit (encrypted)
+											<
+										}
+	
+										if {[N lequad 4096 0 0 {} {} != 0]} {
+											>
+												emit {(mask ROM)}
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[S string 10 0 {} {} eq BY\ SNK\ CORPORATION]} {
+		>
+			emit {Neo Geo Pocket}
+			if {[N byte 35 0 0 {} {} == 16]} {
+				>
+					emit Color
+				<
+			}
+	
+			if {[N byte 0 0 0 {} {} x {}]} {
+				>
+					emit {ROM image}
+				<
+			}
+	
+			if {[S string 36 0 {} {} > \0]} {
+				>
+					emit {\b: "%.12s"}
+				<
+			}
+	
+			if {[N byte 31 0 0 {} {} == -1]} {
+				>
+					emit {(debug mode enabled)}
+				<
+			}
+	
+			mime application/x-neo-geo-pocket-rom
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PS-X\ EXE]} {
+		>
+			emit {Sony Playstation executable}
+			if {[N lelong 16 0 0 {} {} x {}]} {
+				>
+					emit PC=0x%08x,
+				<
+			}
+	
+			if {[N lelong 20 0 0 {} {} != 0]} {
+				>
+					emit GP=0x%08x,
+				<
+			}
+	
+			if {[N lelong 24 0 0 {} {} != 0]} {
+				>
+					emit {.text=[0x%08x,}
+					if {[N lelong 28 0 0 {} {} x {}]} {
+						>
+							emit {\b0x%x],}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N lelong 32 0 0 {} {} != 0]} {
+				>
+					emit {.data=[0x%08x,}
+					if {[N lelong 36 0 0 {} {} x {}]} {
+						>
+							emit {\b0x%x],}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N lelong 40 0 0 {} {} != 0]} {
+				>
+					emit {.bss=[0x%08x,}
+					if {[N lelong 44 0 0 {} {} x {}]} {
+						>
+							emit {\b0x%x],}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N lelong 48 0 0 {} {} != 0]} {
+				>
+					emit Stack=0x%08x,
+				<
+			}
+	
+			if {[N lelong 48 0 0 {} {} == 0]} {
+				>
+					emit {No Stack!,}
+				<
+			}
+	
+			if {[N lelong 52 0 0 {} {} != 0]} {
+				>
+					emit StackSize=0x%x,
+				<
+			}
+	
+			if {[S string 113 0 {} {} x {}]} {
+				>
+					emit (%s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CPE]} {
+		>
+			emit {CPE executable}
+			if {[N byte 3 0 0 {} {} x {}]} {
+				>
+					emit {(version %d)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XBEH]} {
+		>
+			emit {XBE, Microsoft Xbox executable}
+			if {[N ulelong 4 0 0 {} {} == 0]} {
+				>
+					if {[N ulelong [R 2] 0 0 {} {} == 0]} {
+						>
+							if {[N ulelong [R 2] 0 0 {} {} == 0]} {
+								>
+									emit {\b, not signed}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulelong 4 0 0 {} {} > 0]} {
+				>
+					if {[N ulelong [R 2] 0 0 {} {} > 0]} {
+						>
+							if {[N ulelong [R 2] 0 0 {} {} > 0]} {
+								>
+									emit {\b, signed}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulelong 260 0 0 {} {} == 65536]} {
+				>
+					if {[N ulelong [I 280 long 0 - 0 65376] 0 0 & 2147483655 == 2147483655]} {
+						>
+							emit {\b, all regions}
+						<
+					}
+	
+					if {[N ulelong [I 280 long 0 - 0 65376] 0 0 & 2147483655 != 2147483655]} {
+						>
+							if {[N ulelong [I 280 long 0 - 0 65376] 0 0 {} {} > 0]} {
+								>
+									emit (regions:
+									if {[N ulelong [I 280 long 0 - 0 65376] 0 0 {} {} & 1]} {
+										>
+											emit NA
+										<
+									}
+	
+									if {[N ulelong [I 280 long 0 - 0 65376] 0 0 {} {} & 2]} {
+										>
+											emit Japan
+										<
+									}
+	
+									if {[N ulelong [I 280 long 0 - 0 65376] 0 0 {} {} & 4]} {
+										>
+											emit Rest_of_World
+										<
+									}
+	
+									if {[N ulelong [I 280 long 0 - 0 65376] 0 0 {} {} & 2147483648]} {
+										>
+											emit Manufacturer
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ulelong [I 280 long 0 - 0 65376] 0 0 {} {} > 0]} {
+								>
+									emit {\b)}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XIP0]} {
+		>
+			emit {XIP, Microsoft Xbox data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XTF0]} {
+		>
+			emit {XTF, Microsoft Xbox data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x01ZZZZZ\x01]} {
+		>
+			emit {3DO "Opera" file system}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GBS]} {
+		>
+			emit {Nintendo Gameboy Music/Audio Data}
+			if {[S string 16 0 {} {} > \0]} {
+				>
+					emit {("%.32s" by}
+				<
+			}
+	
+			if {[S string 48 0 {} {} > \0]} {
+				>
+					emit {%.32s, copyright}
+				<
+			}
+	
+			if {[S string 80 0 {} {} > \0]} {
+				>
+					emit %.32s),
+				<
+			}
+	
+			if {[N byte 3 0 0 {} {} x {}]} {
+				>
+					emit {version %u,}
+				<
+			}
+	
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {%u tracks}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PATCH]} {
+		>
+			emit {IPS patch file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PPF30]} {
+		>
+			emit {Playstation Patch File version 3.0}
+			switch [Nv byte 5 0 {} {}] {
+				0 {
+					>
+						emit {\b, PPF 1.0 patch}
+					<
+				}
+				1 {
+					>
+						emit {\b, PPF 2.0 patch}
+					<
+				}
+				2 {
+					>
+						emit {\b, PPF 3.0 patch}
+						switch [Nv byte 56 0 {} {}] {
+							0 {
+								>
+									emit {\b, Imagetype BIN (any)}
+								<
+							}
+							1 {
+								>
+									emit {\b, Imagetype GI (PrimoDVD)}
+								<
+							}
+						}
+	
+						switch [Nv byte 57 0 {} {}] {
+							0 {
+								>
+									emit {\b, Blockcheck disabled}
+								<
+							}
+							1 {
+								>
+									emit {\b, Blockcheck enabled}
+								<
+							}
+						}
+	
+						switch [Nv byte 58 0 {} {}] {
+							0 {
+								>
+									emit {\b, Undo data not available}
+								<
+							}
+							1 {
+								>
+									emit {\b, Undo data available}
+								<
+							}
+						}
+	
+					<
+				}
+			}
+	
+			if {[S string 6 0 {} {} x {}]} {
+				>
+					emit {\b, description: %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PPF20]} {
+		>
+			emit {Playstation Patch File version 2.0}
+			switch [Nv byte 5 0 {} {}] {
+				0 {
+					>
+						emit {\b, PPF 1.0 patch}
+					<
+				}
+				1 {
+					>
+						emit {\b, PPF 2.0 patch}
+						if {[N lelong 56 0 0 {} {} > 0]} {
+							>
+								emit {\b, size of file to patch %d}
+							<
+						}
+	
+					<
+				}
+			}
+	
+			if {[S string 6 0 {} {} x {}]} {
+				>
+					emit {\b, description: %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PPF10]} {
+		>
+			emit {Playstation Patch File version 1.0}
+			if {[N byte 5 0 0 {} {} == 0]} {
+				>
+					emit {\b, Simple Encoding}
+				<
+			}
+	
+			if {[S string 6 0 {} {} x {}]} {
+				>
+					emit {\b, description: %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SMV\x1A]} {
+		>
+			emit {SNES9x input recording}
+			if {[N lelong 4 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d}
+				<
+			}
+	
+			if {[N lelong 4 0 0 {} {} < 5]} {
+				>
+					if {[N ledate 8 0 0 {} {} x {}]} {
+						>
+							emit {\b, recorded at %s}
+						<
+					}
+	
+					if {[N lelong 12 0 0 {} {} > 0]} {
+						>
+							emit {\b, rerecorded %d times}
+						<
+					}
+	
+					if {[N lelong 16 0 0 {} {} x {}]} {
+						>
+							emit {\b, %d frames long}
+						<
+					}
+	
+					if {[N byte 20 0 0 {} {} > 0]} {
+						>
+							emit {\b, data for controller(s):}
+							if {[N byte 20 0 0 {} {} & 1]} {
+								>
+									emit {#1}
+								<
+							}
+	
+							if {[N byte 20 0 0 {} {} & 2]} {
+								>
+									emit {#2}
+								<
+							}
+	
+							if {[N byte 20 0 0 {} {} & 4]} {
+								>
+									emit {#3}
+								<
+							}
+	
+							if {[N byte 20 0 0 {} {} & 8]} {
+								>
+									emit {#4}
+								<
+							}
+	
+							if {[N byte 20 0 0 {} {} & 16]} {
+								>
+									emit {#5}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N byte 21 0 0 {} {} ^ 1]} {
+						>
+							emit {\b, begins from snapshot}
+						<
+					}
+	
+					if {[N byte 21 0 0 {} {} & 1]} {
+						>
+							emit {\b, begins from reset}
+						<
+					}
+	
+					if {[N byte 21 0 0 {} {} ^ 2]} {
+						>
+							emit {\b, NTSC standard}
+						<
+					}
+	
+					if {[N byte 21 0 0 {} {} & 2]} {
+						>
+							emit {\b, PAL standard}
+						<
+					}
+	
+					if {[N byte 23 0 0 {} {} & 1]} {
+						>
+							emit {\b, settings:}
+							if {[N lelong 4 0 0 {} {} < 4]} {
+								>
+									if {[N byte 23 0 0 {} {} & 2]} {
+										>
+											emit WIP1Timing
+										<
+									}
+	
+								<
+							}
+	
+							if {[N byte 23 0 0 {} {} & 4]} {
+								>
+									emit Left+Right
+								<
+							}
+	
+							if {[N byte 23 0 0 {} {} & 8]} {
+								>
+									emit VolumeEnvX
+								<
+							}
+	
+							if {[N byte 23 0 0 {} {} & 16]} {
+								>
+									emit FakeMute
+								<
+							}
+	
+							if {[N byte 23 0 0 {} {} & 32]} {
+								>
+									emit SyncSound
+								<
+							}
+	
+							if {[N lelong 4 0 0 {} {} > 3]} {
+								>
+									if {[N byte 23 0 0 {} {} & -128]} {
+										>
+											emit NoCPUShutdown
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[N lelong 4 0 0 {} {} < 4]} {
+						>
+							if {[N lelong 24 0 0 {} {} > 35]} {
+								>
+									if {[N leshort 32 0 0 {} {} != 0]} {
+										>
+											if {[S lestring16 32 0 {} {} x {}]} {
+												>
+													emit {\b, metadata: "%s"}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[N lelong 4 0 0 {} {} > 3]} {
+						>
+							if {[N byte 36 0 0 {} {} > 0]} {
+								>
+									emit {\b, port 1:}
+									switch [Nv byte 36 0 {} {}] {
+										1 {
+											>
+												emit joypad
+											<
+										}
+										2 {
+											>
+												emit mouse
+											<
+										}
+										3 {
+											>
+												emit SuperScope
+											<
+										}
+										4 {
+											>
+												emit Justifier
+											<
+										}
+										5 {
+											>
+												emit multitap
+											<
+										}
+									}
+	
+								<
+							}
+	
+							if {[N byte 36 0 0 {} {} > 0]} {
+								>
+									emit {\b, port 2:}
+									switch [Nv byte 37 0 {} {}] {
+										1 {
+											>
+												emit joypad
+											<
+										}
+										2 {
+											>
+												emit mouse
+											<
+										}
+										3 {
+											>
+												emit SuperScope
+											<
+										}
+										4 {
+											>
+												emit Justifier
+											<
+										}
+										5 {
+											>
+												emit multitap
+											<
+										}
+									}
+	
+								<
+							}
+	
+							if {[N lelong 24 0 0 {} {} > 67]} {
+								>
+									if {[N leshort 64 0 0 {} {} != 0]} {
+										>
+											if {[S lestring16 64 0 {} {} x {}]} {
+												>
+													emit {\b, metadata: "%s"}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[N byte 23 0 0 {} {} & 64]} {
+						>
+							emit {\b, ROM:}
+							if {[N lelong [I 24 ulelong 0 - 0 26] 0 0 {} {} x {}]} {
+								>
+									emit {CRC32 0x%08x}
+								<
+							}
+	
+							if {[S string [I 24 ulelong 0 - 0 23] 0 {} {} x {}]} {
+								>
+									emit {"%s"}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SCVM]} {
+		>
+			emit {ScummVM savegame}
+			if {[S string 12 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N belong 28 0 0 {} {} == -1036804291]} {
+		>
+			emit {Nintendo GameCube disc image:}
+			U 51 nintendo-gcn-disc-common 0
+	
+			mime application/x-gamecube-rom
+		<
+	}
+	
+	switch [Nv belong 24 0 {} {}] {
+		60011 {
+			>
+				emit {old-fs dump file (big endian),}
+				U 68 old-dump-be 0
+	
+			<
+		}
+		60012 {
+			>
+				emit {new-fs dump file (big endian),}
+				U 68 new-dump-be 0
+	
+			<
+		}
+		60013 {
+			>
+				emit {dump format, 4.2 or 4.3 BSD (IDC compatible)}
+			<
+		}
+		60014 {
+			>
+				emit {dump format, Convex Storage Manager by-reference dump}
+			<
+		}
+		424935705 {
+			>
+				emit {new-fs dump file (ufs2, big endian),}
+				U 68 ufs2-dump-be 0
+	
+			<
+		}
+		1562156707 {
+			>
+				emit {Nintendo Wii disc image:}
+				U 51 nintendo-gcn-disc-common 0
+	
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq WBFS]} {
+		>
+			if {[N belong 536 0 0 {} {} == 1562156707]} {
+				>
+					emit {Nintendo Wii disc image (WBFS format):}
+					U 51 nintendo-gcn-disc-common 512
+	
+					mime application/x-wii-rom
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CISO]} {
+		>
+			if {[N lelong 4 0 0 {} {} == 2097152]} {
+				>
+					if {[N byte 8 0 0 {} {} == 1]} {
+						>
+							if {[N belong 32796 0 0 {} {} == -1036804291]} {
+								>
+									emit {Nintendo GameCube disc image (CISO format):}
+									U 51 nintendo-gcn-disc-common 32768
+	
+									mime application/x-wii-rom
+								<
+							}
+	
+							if {[N belong 32792 0 0 {} {} == 1562156707]} {
+								>
+									emit {Nintendo Wii disc image (CISO format):}
+									U 51 nintendo-gcn-disc-common 32768
+	
+									mime application/x-wii-rom
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq WII\001DISC]} {
+		>
+			switch [Nv belong 8 0 {} {}] {
+				1 {
+					>
+						if {[N belong 84 0 0 {} {} == -1036804291]} {
+							>
+								emit {Nintendo GameCube disc image (WDFv1 format):}
+								U 51 nintendo-gcn-disc-common 56
+	
+								mime application/x-gamecube-rom
+							<
+						}
+	
+						if {[N belong 88 0 0 {} {} == 1562156707]} {
+							>
+								emit {Nintendo Wii disc image (WDFv1 format):}
+								U 51 nintendo-gcn-disc-common 56
+	
+								mime application/x-wii-rom
+							<
+						}
+	
+					<
+				}
+				2 {
+					>
+						if {[N belong [I 12 ubelong 0 + 0 28] 0 0 {} {} == -1036804291]} {
+							>
+								emit {Nintendo GameCube disc image (WDFv2 format):}
+								U 51 nintendo-gcn-disc-common [I 12 ubelong 0 + 0 0]
+	
+								mime application/x-gamecube-rom
+							<
+						}
+	
+						if {[N belong [I 12 ubelong 0 + 0 24] 0 0 {} {} == 1562156707]} {
+							>
+								emit {Nintendo Wii disc image (WDFv2 format):}
+								U 51 nintendo-gcn-disc-common [I 12 ubelong 0 + 0 0]
+	
+								mime application/x-wii-rom
+							<
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq WIA\001]} {
+		>
+			emit Nintendo
+			switch [Nv belong 72 0 {} {}] {
+				1 {
+					>
+						emit GameCube
+						mime application/x-gamecube-rom
+					<
+				}
+				2 {
+					>
+						emit Wii
+						mime application/x-wii-rom
+					<
+				}
+			}
+	
+			if {[D 72]} {
+				>
+					emit GameCube/Wii
+				<
+			}
+	
+			if {[N belong 72 0 0 {} {} x {}]} {
+				>
+					emit {disc image (WIA format):}
+					U 51 nintendo-gcn-disc-common 88
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 256 0 {} {} eq NCSD]} {
+		>
+			if {[N lequad 280 0 0 {} {} == 0]} {
+				>
+					emit {Nintendo 3DS Game Card image}
+					if {[S string 4432 0 {} {} > \0]} {
+						>
+							emit {\b: "%.16s"}
+						<
+					}
+	
+					if {[N byte 786 0 0 {} {} x {}]} {
+						>
+							emit (Rev.%02u)
+						<
+					}
+	
+					if {[N byte 4492 0 0 {} {} == 2]} {
+						>
+							emit {(New3DS only)}
+						<
+					}
+	
+					switch [Nv byte 397 0 {} {}] {
+						0 {
+							>
+								emit {(inner device)}
+							<
+						}
+						1 {
+							>
+								emit (Card1)
+							<
+						}
+						2 {
+							>
+								emit (Card2)
+							<
+						}
+						3 {
+							>
+								emit {(extended device)}
+							<
+						}
+					}
+	
+				<
+			}
+	
+			switch [Nv bequad 280 0 {} {}] {
+				72622751638093824 {
+					>
+						emit {Nintendo 3DS eMMC dump (Old3DS)}
+					<
+				}
+				72622751654871040 {
+					>
+						emit {Nintendo 3DS eMMC dump (New3DS)}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 256 0 {} {} eq NCCH]} {
+		>
+			emit {Nintendo 3DS}
+			switch [Nv byte 397 0 & 2] {
+				0 {
+					>
+						emit {File Archive (CFA)}
+					<
+				}
+				2 {
+					>
+						emit {Executable Image (CXI)}
+					<
+				}
+			}
+	
+			if {[S string 336 0 {} {} > \0]} {
+				>
+					emit {\b: "%.16s"}
+				<
+			}
+	
+			switch [Nv byte 397 0 {} {}] {
+				5 {
+					>
+						if {[N leshort 270 0 0 {} {} x {}]} {
+							>
+								emit {(Old3DS System Update v}
+							<
+						}
+	
+						U 51 nintendo-3ds-version-code 270
+	
+						if {[N leshort 270 0 0 {} {} x {}]} {
+							>
+								emit {\b)}
+							<
+						}
+	
+					<
+				}
+				21 {
+					>
+						if {[N leshort 270 0 0 {} {} x {}]} {
+							>
+								emit {(New3DS System Update v}
+							<
+						}
+	
+						U 51 nintendo-3ds-version-code 270
+	
+						if {[N leshort 270 0 0 {} {} x {}]} {
+							>
+								emit {\b)}
+							<
+						}
+	
+					<
+				}
+			}
+	
+			if {[N byte 397 0 0 {} {} != 5]} {
+				>
+					if {[N byte 397 0 0 {} {} != 21]} {
+						>
+							if {[N byte 274 0 0 {} {} x {}]} {
+								>
+									emit (v
+								<
+							}
+	
+							U 51 nintendo-3ds-version-code 274
+	
+							if {[N byte 274 0 0 {} {} x {}]} {
+								>
+									emit {\b)}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 396 0 0 {} {} == 2]} {
+				>
+					emit {(New3DS only)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SMDH]} {
+		>
+			emit {Nintendo 3DS SMDH file}
+			if {[N leshort 520 0 0 {} {} != 0]} {
+				>
+					if {[S lestring16 520 0 {} {} x {}]} {
+						>
+							emit {\b: "%.128s"}
+						<
+					}
+	
+					if {[N leshort 904 0 0 {} {} != 0]} {
+						>
+							if {[S lestring16 904 0 {} {} x {}]} {
+								>
+									emit {by %.128s}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N leshort 520 0 0 {} {} == 0]} {
+				>
+					if {[N leshort 8 0 0 {} {} != 0]} {
+						>
+							if {[S lestring16 8 0 {} {} x {}]} {
+								>
+									emit {\b: "%.128s"}
+								<
+							}
+	
+							if {[N leshort 392 0 0 {} {} != 0]} {
+								>
+									if {[S lestring16 392 0 {} {} x {}]} {
+										>
+											emit {by %.128s}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 3DSX]} {
+		>
+			emit {Nintendo 3DS Homebrew Application (3DSX)}
+		<
+	}
+	
+	if {[N byte 0 0 0 {} {} > 0]} {
+		>
+			if {[N byte 0 0 0 {} {} < 3]} {
+				>
+					if {[S string 1 0 {} {} eq ATARI7800]} {
+						>
+							emit {Atari 7800 ROM image}
+							if {[S string 17 0 {} {} > \0]} {
+								>
+									emit {\b: "%.32s"}
+								<
+							}
+	
+							switch [Nv byte 57 0 {} {}] {
+								0 {
+									>
+										emit (NTSC)
+									<
+								}
+								1 {
+									>
+										emit (PAL)
+									<
+								}
+							}
+	
+							if {[N byte 54 0 0 & 1 == 1]} {
+								>
+									emit (POKEY)
+								<
+							}
+	
+							mime application/x-atari-7800-rom
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq g\ GCE]} {
+		>
+			emit {Vectrex ROM image}
+			if {[S string 17 0 {} {} > \0]} {
+				>
+					emit {\b: "%.16s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TN:]} {
+		>
+			if {[S search [R 0] 0 {} 64 eq \nSF:/]} {
+				>
+					emit {LCOV coverage tracefile}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x20\x20\x20\x20\x20\x20\x20\x20-:\x20\x20\x20\ 0:Source:]} {
+		>
+			if {[S search [R 0] 0 {} 128 eq \x20\x20\x20\x20\x20\x20\x20\x20-:\x20\x20\x20\ 0:Graph:]} {
+				>
+					if {[S search [R 0] 0 {} 128 eq \x20\x20\x20\x20\x20\x20\x20\x20-:\x20\x20\x20\ 0:Data:]} {
+						>
+							emit {GCOV coverage report}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \0\0\0\0pwV1]} {
+		>
+			emit {Cracklib password index, big endian ("64-bit")}
+			if {[N belong 12 0 0 {} {} > 0]} {
+				>
+					emit {(%i words)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq !_TAG]} {
+		>
+			emit {Exuberant Ctags tag file text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq /*\x20CTF\x20]} {
+		>
+			emit {Common Trace Format (CTF) plain text metadata}
+			if {[S regex [R 0] 0 {} {} eq \[0-9\]+.\[0-9\]+]} {
+				>
+					emit {\b, v%s}
+				<
+			}
+	
+			strength {+ 5			# this is to make sure we beat C}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ACMP]} {
+		>
+			emit {Map file for the AssaultCube FPS game}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CUBE]} {
+		>
+			emit {Map file for cube and cube2 engine games}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MAPZ)]} {
+		>
+			emit {Map file for the Blood Frontier/Red Eclipse FPS games}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RaS]} {
+		>
+			if {[S string 3 0 {} {} eq t]} {
+				>
+					emit {Cups Raster version 1, Big Endian}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq 2]} {
+				>
+					emit {Cups Raster version 2, Big Endian}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq 3]} {
+				>
+					emit {Cups Raster version 3, Big Endian}
+					mime application/vnd.cups-raster
+				<
+			}
+	
+			U 58 cups-le 0
+	
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq SaR]} {
+		>
+			if {[S string 0 0 {} {} eq t]} {
+				>
+					emit {Cups Raster version 1, Little Endian}
+				<
+			}
+	
+			if {[S string 0 0 {} {} eq 2]} {
+				>
+					emit {Cups Raster version 2, Little Endian}
+				<
+			}
+	
+			if {[S string 0 0 {} {} eq 3]} {
+				>
+					emit {Cups Raster version 3, Little Endian}
+					mime application/vnd.cups-raster
+				<
+			}
+	
+			U 58 cups-le 0
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GDBM]} {
+		>
+			emit {GNU dbm 2.x database}
+			mime application/x-gdbm
+		<
+	}
+	
+	switch [Nv long 12 0 {} {}] {
+		264584 {
+			>
+				emit {Berkeley DB}
+				if {[N long 16 0 0 {} {} > 0]} {
+					>
+						emit {(Log, version %d, native byte-order)}
+					<
+				}
+	
+			<
+		}
+		270931 {
+			>
+				emit {Berkeley DB}
+				if {[N long 16 0 0 {} {} > 0]} {
+					>
+						emit {(Queue, version %d, native byte-order)}
+					<
+				}
+	
+			<
+		}
+		340322 {
+			>
+				emit {Berkeley DB}
+				if {[N long 16 0 0 {} {} > 0]} {
+					>
+						emit {(Btree, version %d, native byte-order)}
+					<
+				}
+	
+			<
+		}
+		398689 {
+			>
+				emit {Berkeley DB}
+				if {[N long 16 0 0 {} {} > 0]} {
+					>
+						emit {(Hash, version %d, native byte-order)}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	switch [Nv belong 12 0 {} {}] {
+		264584 {
+			>
+				emit {Berkeley DB}
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {(Log, version %d, big-endian)}
+					<
+				}
+	
+			<
+		}
+		270931 {
+			>
+				emit {Berkeley DB}
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {(Queue, version %d, big-endian)}
+					<
+				}
+	
+			<
+		}
+		340322 {
+			>
+				emit {Berkeley DB}
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {(Btree, version %d, big-endian)}
+					<
+				}
+	
+			<
+		}
+		398689 {
+			>
+				emit {Berkeley DB}
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {(Hash, version %d, big-endian)}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	switch [Nv lelong 12 0 {} {}] {
+		264584 {
+			>
+				emit {Berkeley DB}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {(Log, version %d, little-endian)}
+					<
+				}
+	
+			<
+		}
+		270931 {
+			>
+				emit {Berkeley DB}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {(Queue, version %d, little-endian)}
+					<
+				}
+	
+			<
+		}
+		340322 {
+			>
+				emit {Berkeley DB}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {(Btree, version %d, little-endian)}
+					<
+				}
+	
+			<
+		}
+		398689 {
+			>
+				emit {Berkeley DB}
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {(Hash, version %d, little-endian)}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[S string 0 0 b {} eq RRD\0]} {
+		>
+			emit {RRDTool DB}
+			if {[S string 4 0 b {} x {}]} {
+				>
+					emit {version %s}
+					if {[N short 10 0 0 {} {} != 0]} {
+						>
+							emit {16bit aligned}
+							if {[N bedouble 10 0 0 {} {} == 8.642135e+130]} {
+								>
+									emit big-endian
+									if {[N short 18 0 0 {} {} x {}]} {
+										>
+											emit {32bit long (m68k)}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[N short 10 0 0 {} {} == 0]} {
+						>
+							if {[N long 12 0 0 {} {} != 0]} {
+								>
+									emit {32bit aligned}
+									if {[N bedouble 12 0 0 {} {} == 8.642135e+130]} {
+										>
+											emit big-endian
+											if {[N long 20 0 0 {} {} == 0]} {
+												>
+													emit {64bit long}
+												<
+											}
+	
+											if {[N long 20 0 0 {} {} != 0]} {
+												>
+													emit {32bit long}
+												<
+											}
+	
+										<
+									}
+	
+									if {[N ledouble 12 0 0 {} {} == 8.642135e+130]} {
+										>
+											emit little-endian
+											if {[N long 24 0 0 {} {} == 0]} {
+												>
+													emit {64bit long}
+												<
+											}
+	
+											if {[N long 24 0 0 {} {} != 0]} {
+												>
+													emit {32bit long (i386)}
+												<
+											}
+	
+										<
+									}
+	
+									if {[S string 12 0 {} {} eq \x43\x2b\x1f\x5b\x2f\x25\xc0\xc7]} {
+										>
+											emit middle-endian
+											if {[N short 24 0 0 {} {} != 0]} {
+												>
+													emit {32bit long (arm)}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[N quad 8 0 0 {} {} == 0]} {
+						>
+							emit {64bit aligned}
+							if {[N bedouble 16 0 0 {} {} == 8.642135e+130]} {
+								>
+									emit big-endian
+									if {[N long 24 0 0 {} {} == 0]} {
+										>
+											emit {64bit long (s390x)}
+										<
+									}
+	
+									if {[N long 24 0 0 {} {} != 0]} {
+										>
+											emit {32bit long (hppa/mips/ppc/s390/SPARC)}
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ledouble 16 0 0 {} {} == 8.642135e+130]} {
+								>
+									emit little-endian
+									if {[N long 28 0 0 {} {} == 0]} {
+										>
+											emit {64bit long (alpha/amd64/ia64)}
+										<
+									}
+	
+									if {[N long 28 0 0 {} {} != 0]} {
+										>
+											emit {32bit long (armel/mipsel)}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq root\0]} {
+		>
+			emit {ROOT file}
+			if {[N belong 4 0 0 {} {} x {}]} {
+				>
+					emit {Version %d}
+				<
+			}
+	
+			if {[N belong 33 0 0 {} {} x {}]} {
+				>
+					emit {(Compression: %d)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubelong 0 0 0 & 65535 < 3104]} {
+		>
+			if {[N ubyte 2 0 0 {} {} > 0]} {
+				>
+					if {[N ubyte 3 0 0 {} {} > 0]} {
+						>
+							if {[N ubyte 3 0 0 {} {} < 32]} {
+								>
+									if {[N ubyte 0 0 0 {} {} > 1]} {
+										>
+											if {[N ubyte 27 0 0 {} {} == 0]} {
+												>
+													if {[N ubelong 24 0 0 & 4294967295 > 19931136]} {
+														>
+														<
+													}
+	
+													if {[N ubelong 24 0 0 & 4294967295 < 19931137]} {
+														>
+															if {[N ubelong 24 0 0 & 4294967295 == 0]} {
+																>
+																	if {[N ubelong 12 0 0 & 4294967038 == 0]} {
+																		>
+																			if {[N ubyte 28 0 0 {} {} x {}]} {
+																				>
+																				<
+																			}
+	
+																			if {[N ubyte 28 0 0 & 248 == 0]} {
+																				>
+																					if {[N uleshort 8 0 0 {} {} > 31]} {
+																						>
+																							if {[N ubyte 32 0 0 {} {} > 0]} {
+																								>
+																									U 60 xbase-type 0
+	
+																									if {[N ubyte 0 0 0 {} {} x {}]} {
+																										>
+																											emit {\b DBF}
+																										<
+																									}
+	
+																									if {[N lelong 4 0 0 {} {} == 0]} {
+																										>
+																											emit {\b, no records}
+																										<
+																									}
+	
+																									if {[N lelong 4 0 0 {} {} > 0]} {
+																										>
+																											emit {\b, %d record}
+																											if {[N lelong 4 0 0 {} {} > 1]} {
+																												>
+																													emit {\bs}
+																												<
+																											}
+	
+																										<
+																									}
+	
+																									if {[N uleshort 10 0 0 {} {} x {}]} {
+																										>
+																											emit {* %d}
+																										<
+																									}
+	
+																									if {[N ubyte 1 0 0 {} {} x {}]} {
+																										>
+																											emit {\b, update-date}
+																										<
+																									}
+	
+																									U 60 xbase-date 1
+	
+																									if {[N ubyte 29 0 0 {} {} > 0]} {
+																										>
+																											emit {\b, codepage ID=0x%x}
+																										<
+																									}
+	
+																									if {[N ubyte 28 0 0 & 1 == 1]} {
+																										>
+																											emit {\b, with index file .MDX}
+																										<
+																									}
+	
+																									if {[N ubyte 28 0 0 & 2 == 2]} {
+																										>
+																											emit {\b, with memo .FPT}
+																										<
+																									}
+	
+																									if {[N ubyte 28 0 0 & 4 == 4]} {
+																										>
+																											emit {\b, DataBaseContainer}
+																										<
+																									}
+	
+																									if {[N uleshort 8 0 0 {} {} > 0]} {
+																										>
+																										<
+																									}
+	
+																									if {[N ubyte [I 8 uleshort 0 + 0 1] 0 0 {} {} > 0]} {
+																										>
+																											if {[N uleshort 8 0 0 {} {} > 0]} {
+																												>
+																													emit {\b, at offset %d}
+																												<
+																											}
+	
+																											if {[N ubyte [I 8 uleshort 0 + 0 1] 0 0 {} {} > 0]} {
+																												>
+																													if {[S string [R -1] 0 {} {} > \0]} {
+																														>
+																															emit {1st record "%s"}
+																														<
+																													}
+	
+																												<
+																											}
+	
+																										<
+																									}
+	
+																								<
+																							}
+	
+																						<
+																					}
+	
+																				<
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+															if {[N ubelong 24 0 0 & 20183039 > 0]} {
+																>
+																	if {[N ubyte 47 0 0 {} {} == 0]} {
+																		>
+																			if {[N ubyte 559 0 0 & 239 == 0]} {
+																				>
+																					if {[N ubeshort 45 0 0 {} {} < 3104]} {
+																						>
+																							if {[N ubyte 45 0 0 {} {} > 0]} {
+																								>
+																									if {[N ubyte 46 0 0 {} {} < 32]} {
+																										>
+																											if {[N ubyte 46 0 0 {} {} > 0]} {
+																												>
+																													U 60 xbase-type 0
+	
+																													if {[N ubyte 0 0 0 {} {} x {}]} {
+																														>
+																															emit {\b MDX}
+																														<
+																													}
+	
+																													if {[N ubyte 1 0 0 {} {} x {}]} {
+																														>
+																															emit {\b, creation-date}
+																														<
+																													}
+	
+																													U 60 xbase-date 1
+	
+																													if {[N ubyte 44 0 0 {} {} x {}]} {
+																														>
+																															emit {\b, update-date}
+																														<
+																													}
+	
+																													U 60 xbase-date 44
+	
+																													if {[N uleshort 28 0 0 {} {} x {}]} {
+																														>
+																															emit {\b, %d}
+																														<
+																													}
+	
+																													if {[N ubyte 25 0 0 {} {} x {}]} {
+																														>
+																															emit {\b/%d tags}
+																														<
+																													}
+	
+																													if {[N ubyte 26 0 0 {} {} x {}]} {
+																														>
+																															emit {* %d}
+																														<
+																													}
+	
+																												<
+																											}
+	
+																											if {[S string 548 0 {} {} x {}]} {
+																												>
+																													emit {\b, 1st tag "%.11s"}
+																												<
+																											}
+	
+																										<
+																									}
+	
+																								<
+																							}
+	
+																						<
+																					}
+	
+																				<
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubyte 16 0 0 {} {} < 4]} {
+		>
+			if {[N ubyte 16 0 0 {} {} != 2]} {
+				>
+					if {[N ubyte 16 0 0 {} {} != 1]} {
+						>
+							if {[N ulelong 0 0 0 {} {} > 0]} {
+								>
+									if {[N ubelong 17 0 0 & 4294835712 == 0]} {
+										>
+											if {[N ubelong 20 0 0 & 4278263963 == 0]} {
+												>
+													switch [Nv ubyte 16 0 {} {}] {
+														0 {
+															>
+																if {[N uleshort 20 0 0 {} {} == 0]} {
+																	>
+																		if {[N ulong 8 0 0 {} {} == 0]} {
+																			>
+																				if {[N ubeshort 6 0 0 {} {} > 0]} {
+																					>
+																						if {[N ushort 4 0 0 {} {} == 0]} {
+																							>
+																								U 60 foxpro-memo-print 0
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																				if {[N ubeshort 6 0 0 {} {} == 0]} {
+																					>
+																						if {[N ubeshort 510 0 0 {} {} == 0]} {
+																							>
+																								if {[N ubelong 512 0 0 {} {} < 4278189827]} {
+																									>
+																										if {[N ubelong 512 0 0 {} {} > 522199072]} {
+																											>
+																												if {[N ubyte 513 0 0 {} {} > 0]} {
+																													>
+																														U 60 dbase3-memo-print 0
+	
+																													<
+																												}
+	
+																											<
+																										}
+	
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																		if {[N ubelong 8 0 0 {} {} != 0]} {
+																			>
+																				if {[N ubeshort 510 0 0 {} {} == 0]} {
+																					>
+																						if {[N ubyte 0 0 0 {} {} > 5]} {
+																							>
+																								if {[N ubyte 0 0 0 {} {} < 48]} {
+																									>
+																										U 60 dbase3-memo-print 0
+	
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+																if {[N uleshort 20 0 0 {} {} > 0]} {
+																	>
+																		if {[N uleshort 20 0 0 & 32783 == 0]} {
+																			>
+																				U 60 dbase4-memo-print 0
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+														3 {
+															>
+																U 60 dbase3-memo-print 0
+	
+															<
+														}
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq Standard\ Jet\ DB]} {
+		>
+			emit {Microsoft Access Database}
+			mime application/x-msaccess
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq Standard\ ACE\ DB]} {
+		>
+			emit {Microsoft Access Database}
+			mime application/x-msaccess
+		<
+	}
+	
+	if {[N ubelong 4 0 0 {} {} == 4023233417]} {
+		>
+			if {[N ubelong 132 0 0 {} {} == 0]} {
+				>
+					emit {Extensible storage engine}
+					switch [Nv ulelong 12 0 {} {}] {
+						0 {
+							>
+								emit DataBase
+								ext edb/sdb
+							<
+						}
+						1 {
+							>
+								emit STreaMing
+								ext stm
+							<
+						}
+					}
+	
+					if {[N uleshort 8 0 0 {} {} x {}]} {
+						>
+							emit {\b, version 0x%x}
+						<
+					}
+	
+					if {[N uleshort 10 0 0 {} {} > 0]} {
+						>
+							emit {revision 0x%4.4x}
+						<
+					}
+	
+					if {[N ubelong 0 0 0 {} {} x {}]} {
+						>
+							emit {\b, checksum 0x%8.8x}
+						<
+					}
+	
+					if {[N ulequad 236 0 0 {} {} x {}]} {
+						>
+							emit {\b, page size %lld}
+						<
+					}
+	
+					switch [Nv ulelong 52 0 {} {}] {
+						1 {
+							>
+								emit {\b, JustCreated}
+							<
+						}
+						2 {
+							>
+								emit {\b, DirtyShutdown}
+							<
+						}
+						4 {
+							>
+								emit {\b, BeingConverted}
+							<
+						}
+						5 {
+							>
+								emit {\b, ForceDetach}
+							<
+						}
+					}
+	
+					if {[N ulelong 216 0 0 {} {} x {}]} {
+						>
+							emit {\b, Windows version %d}
+						<
+					}
+	
+					if {[N ulelong 220 0 0 {} {} x {}]} {
+						>
+							emit {\b.%d}
+						<
+					}
+	
+					mime application/x-ms-ese
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq sdbf]} {
+		>
+			if {[N ubyte 7 0 0 {} {} == 0]} {
+				>
+					if {[N uleshort 12 0 0 {} {} == 30722]} {
+						>
+							emit {Windows application compatibility Shim DataBase}
+							mime application/x-ms-sdb
+							ext sdb
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TDB\ file]} {
+		>
+			emit {TDB database}
+			if {[N lelong 32 0 0 {} {} == 637606253]} {
+				>
+					emit {version 6, little-endian}
+					if {[N lelong 36 0 0 {} {} x {}]} {
+						>
+							emit {hash size %d bytes}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq ICE]} {
+		>
+			emit {ICE authority data}
+		<
+	}
+	
+	if {[S string 10 0 {} {} eq MIT-MAGIC-COOKIE-1]} {
+		>
+			emit {X11 Xauthority data}
+		<
+	}
+	
+	if {[S string 11 0 {} {} eq MIT-MAGIC-COOKIE-1]} {
+		>
+			emit {X11 Xauthority data}
+		<
+	}
+	
+	if {[S string 12 0 {} {} eq MIT-MAGIC-COOKIE-1]} {
+		>
+			emit {X11 Xauthority data}
+		<
+	}
+	
+	if {[S string 13 0 {} {} eq MIT-MAGIC-COOKIE-1]} {
+		>
+			emit {X11 Xauthority data}
+		<
+	}
+	
+	if {[S string 14 0 {} {} eq MIT-MAGIC-COOKIE-1]} {
+		>
+			emit {X11 Xauthority data}
+		<
+	}
+	
+	if {[S string 15 0 {} {} eq MIT-MAGIC-COOKIE-1]} {
+		>
+			emit {X11 Xauthority data}
+		<
+	}
+	
+	if {[S string 16 0 {} {} eq MIT-MAGIC-COOKIE-1]} {
+		>
+			emit {X11 Xauthority data}
+		<
+	}
+	
+	if {[S string 17 0 {} {} eq MIT-MAGIC-COOKIE-1]} {
+		>
+			emit {X11 Xauthority data}
+		<
+	}
+	
+	if {[S string 18 0 {} {} eq MIT-MAGIC-COOKIE-1]} {
+		>
+			emit {X11 Xauthority data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PGDMP]} {
+		>
+			emit {PostgreSQL custom database dump}
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {- v%d}
+				<
+			}
+	
+			if {[N byte 6 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+			if {[N beshort 5 0 0 {} {} < 257]} {
+				>
+					emit {\b-0}
+				<
+			}
+	
+			if {[N beshort 5 0 0 {} {} > 256]} {
+				>
+					if {[N byte 7 0 0 {} {} x {}]} {
+						>
+							emit {\b-%d}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq @(\#)ADF\ Database]} {
+		>
+			emit {CGNS Advanced Data Format}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ToKyO\ CaBiNeT\n]} {
+		>
+			emit {Tokyo Cabinet}
+			if {[S string 14 0 {} {} x {}]} {
+				>
+					emit {\b (%s)}
+				<
+			}
+	
+			switch [Nv byte 32 0 {} {}] {
+				0 {
+					>
+						emit {\b, Hash}
+						mime application/x-tokyocabinet-hash
+					<
+				}
+				1 {
+					>
+						emit {\b, B+ tree}
+						mime application/x-tokyocabinet-btree
+					<
+				}
+				2 {
+					>
+						emit {\b, Fixed-length}
+						mime application/x-tokyocabinet-fixed
+					<
+				}
+				3 {
+					>
+						emit {\b, Table}
+						mime application/x-tokyocabinet-table
+					<
+				}
+			}
+	
+			if {[N byte 33 0 0 {} {} & 1]} {
+				>
+					emit {\b, [open]}
+				<
+			}
+	
+			if {[N byte 33 0 0 {} {} & 2]} {
+				>
+					emit {\b, [fatal]}
+				<
+			}
+	
+			if {[N byte 34 0 0 {} {} x {}]} {
+				>
+					emit {\b, apow=%d}
+				<
+			}
+	
+			if {[N byte 35 0 0 {} {} x {}]} {
+				>
+					emit {\b, fpow=%d}
+				<
+			}
+	
+			if {[N byte 36 0 0 {} {} & 1]} {
+				>
+					emit {\b, [large]}
+				<
+			}
+	
+			if {[N byte 36 0 0 {} {} & 2]} {
+				>
+					emit {\b, [deflate]}
+				<
+			}
+	
+			if {[N byte 36 0 0 {} {} & 4]} {
+				>
+					emit {\b, [bzip]}
+				<
+			}
+	
+			if {[N byte 36 0 0 {} {} & 8]} {
+				>
+					emit {\b, [tcbs]}
+				<
+			}
+	
+			if {[N byte 36 0 0 {} {} & 16]} {
+				>
+					emit {\b, [excodec]}
+				<
+			}
+	
+			if {[N lequad 40 0 0 {} {} x {}]} {
+				>
+					emit {\b, bnum=%lld}
+				<
+			}
+	
+			if {[N lequad 48 0 0 {} {} x {}]} {
+				>
+					emit {\b, rnum=%lld}
+				<
+			}
+	
+			if {[N lequad 56 0 0 {} {} x {}]} {
+				>
+					emit {\b, fsiz=%lld}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \\\[depot\\\]\n\f]} {
+		>
+			emit {Quick Database Manager, little endian}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \\\[DEPOT\\\]\n\f]} {
+		>
+			emit {Quick Database Manager, big endian}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ToKyO\ CaBiNeT\n]} {
+		>
+			emit {TokyoCabinet database}
+			if {[S string 14 0 {} {} x {}]} {
+				>
+					emit {(version %s)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FS21]} {
+		>
+			emit {Zope Object Database File Storage v3 (data)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FS30]} {
+		>
+			emit {Zope Object Database File Storage v4 (data)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ZEC3]} {
+		>
+			emit {Zope Object Database Client Cache File (data)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IDA1]} {
+		>
+			emit {IDA (Interactive Disassembler) database}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq hopperdb]} {
+		>
+			emit {Hopper database}
+		<
+	}
+	
+	if {[N ubyte 5 0 0 {} {} > 0]} {
+		>
+			if {[N ubelong [I 5 ubyte 0 + 0 7] 0 0 & 4093636608 == 0]} {
+				>
+					if {[S search [R 1] 0 {} 2 eq DESIGN]} {
+						>
+							emit {Panorama database}
+							if {[S pstring 5 0 {} {} x {}]} {
+								>
+									emit {\b, "%s"}
+								<
+							}
+	
+							ext pan
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq askw40\0]} {
+		>
+			emit {askSam DB}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MBSTV\040]} {
+		>
+			emit {MUIbase DB}
+			if {[S string 6 0 {} {} x {}]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NBCDB\012]} {
+		>
+			emit {NetBSD Constant Database}
+			if {[N byte 7 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d}
+				<
+			}
+	
+			if {[S string 8 0 {} {} x {}]} {
+				>
+					emit {\b, for '%s'}
+				<
+			}
+	
+			if {[N lelong 24 0 0 {} {} x {}]} {
+				>
+					emit {\b, datasize %d}
+				<
+			}
+	
+			if {[N lelong 28 0 0 {} {} x {}]} {
+				>
+					emit {\b, entries %d}
+				<
+			}
+	
+			if {[N lelong 32 0 0 {} {} x {}]} {
+				>
+					emit {\b, index %d}
+				<
+			}
+	
+			if {[N lelong 36 0 0 {} {} x {}]} {
+				>
+					emit {\b, seed %#x}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq REDIS]} {
+		>
+			emit {Redis RDB file,}
+			if {[S regex 5 0 {} {} eq \[0-9\]\[0-9\]\[0-9\]\[0-9\]]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq //\ <!--\ <mdb:mork:z\ v=\"]} {
+		>
+			emit {Mozilla Mork database}
+			if {[S string 23 0 {} {} x {}]} {
+				>
+					emit {\b, version %.3s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} < ?xml]} {
+		>
+			if {[S regex [R 0] 0 {} {} eq (eml)-\[0-9\].\[0-9\].\[0-9\]+]} {
+				>
+					emit eml://ecoinformatics.org/%s
+				<
+			}
+	
+			if {[S regex [R 0] 0 {} {} eq (onedcx/v)\[0-9\].\[0-9\]+]} {
+				>
+					emit http://ns.dataone.org/metadata/schema/onedcx/v1.0
+				<
+			}
+	
+			if {[S regex [R 0] 0 {} {} eq fgdc]} {
+				>
+					emit FGDC-STD-001-1998
+				<
+			}
+	
+			if {[S regex [R 0] 0 {} {} eq (mercury/terms/v)\[0-9\].\[0-9\]]} {
+				>
+					emit http://purl.org/ornl/schema/mercury/terms/v1.0
+				<
+			}
+	
+			if {[S regex [R 0] 0 {} {} eq isotc211]} {
+				>
+					if {[S regex [R 0] 0 {} {} eq eng\;USA]} {
+						>
+							emit http://www.isotc211.org/2005/gmd
+						<
+					}
+	
+					if {[S regex [R 0] 0 {} {} eq gov.noaa.nodc:\[0-9\]+]} {
+						>
+							emit http://www.isotc211.org/2005/gmd-noaa
+						<
+					}
+	
+					if {[S regex [R 0] 0 {} {} eq pangaea.dataset\[0-9\]\[0-9\]\[0-9\]\[0-9\]\[0-9\]\[0-9\]+]} {
+						>
+							emit http://www.isotc211.org/2005/gmd-pangaea
+							mime text/xml
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} < ?xml]} {
+		>
+			if {[S regex [R 0] 0 {} {} eq rdf]} {
+				>
+					if {[S regex [R 0] 0 {} {} eq openarchives]} {
+						>
+							emit http://www.openarchives.org/ore/terms
+							mime application/rdf+xml
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} < DryadData]} {
+		>
+			if {[S regex [R 0] 0 {} {} eq (dryad-bibo/v)\[0-9\].\[0-9\]]} {
+				>
+					emit http://datadryad.org/profile/v3.1
+					mime text/xml
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DBPF]} {
+		>
+			emit {Maxis Database Packed File}
+			if {[N ulelong 4 0 0 {} {} x {}]} {
+				>
+					emit {\b, version: %u.}
+					if {[N ulelong 8 0 0 {} {} x {}]} {
+						>
+							emit {\b%u}
+							if {[N ulelong 36 0 0 {} {} x {}]} {
+								>
+									emit {\b, files: %u}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ledate 24 0 0 {} {} != 0]} {
+						>
+							emit {\b, created: %s}
+						<
+					}
+	
+					if {[N ledate 28 0 0 {} {} != 0]} {
+						>
+							emit {\b, modified: %s}
+							mime application/x-maxis-dbpf
+							ext dbpf/package/dat/sc4
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <list>\n<protocol\ bbn-m]} {
+		>
+			emit {Diamond Multimedia Document}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq diff\040]} {
+		>
+			emit {diff output text}
+			mime text/x-diff
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq ***\040]} {
+		>
+			emit {diff output text}
+			mime text/x-diff
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq Only\040in\040]} {
+		>
+			emit {diff output text}
+			mime text/x-diff
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq Common\040subdirectories:\040]} {
+		>
+			emit {diff output text}
+			mime text/x-diff
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq Index:]} {
+		>
+			emit {RCS/CVS diff output text}
+			mime text/x-diff
+		<
+	}
+	
+	if {[S string 0 0 b {} eq BSDIFF40]} {
+		>
+			emit {bsdiff(1) patch file}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq ---\040]} {
+		>
+			if {[S search [R 0] 0 {} 1024 eq \n]} {
+				>
+					if {[S search [R 0] 0 {} 1 eq +++\040]} {
+						>
+							if {[S search [R 0] 0 {} 1024 eq \n]} {
+								>
+									if {[S search [R 0] 0 {} 1 eq @@]} {
+										>
+											emit {unified diff output text}
+											mime text/x-diff
+											strength {+ 90}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq !<arch>\n________64E]} {
+		>
+			emit {Alpha archive}
+			if {[S string 22 0 {} {} eq X]} {
+				>
+					emit {-- out of date}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Core\001]} {
+		>
+			emit {Alpha COFF format core dump (Digital UNIX)}
+			if {[S string 24 0 {} {} > \0]} {
+				>
+					emit {\b, from '%s'}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Core\002]} {
+		>
+			emit {Alpha COFF format core dump (Digital UNIX)}
+			if {[S string 24 0 {} {} > \0]} {
+				>
+					emit {\b, from '%s'}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \377\377\177]} {
+		>
+			emit ddis/ddif
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \377\377\174]} {
+		>
+			emit {ddis/dots archive}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \377\377\176]} {
+		>
+			emit {ddis/dtif table data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \033c\033]} {
+		>
+			emit {LN03 output}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq !<PDF>!\n]} {
+		>
+			emit {profiling data file}
+		<
+	}
+	
+	switch [Nv lelong 24 0 {} {}] {
+		60011 {
+			>
+				emit {old-fs dump file (little endian),}
+				U 68 old-dump-be 0
+	
+			<
+		}
+		60012 {
+			>
+				emit {new-fs dump file (little endian),}
+				U 68 new-dump-be 0
+	
+			<
+		}
+		424935705 {
+			>
+				emit {new-fs dump file (ufs2, little endian),}
+				U 68 ufs2-dump-be 0
+	
+			<
+		}
+	}
+	
+	if {[N leshort 18 0 0 {} {} == -5525]} {
+		>
+			emit {old-fs dump file (16-bit, assuming PDP-11 endianness),}
+			if {[N medate 2 0 0 {} {} x {}]} {
+				>
+					emit {Previous dump %s,}
+				<
+			}
+	
+			if {[N medate 6 0 0 {} {} x {}]} {
+				>
+					emit {This dump %s,}
+				<
+			}
+	
+			if {[N leshort 10 0 0 {} {} > 0]} {
+				>
+					emit {Volume %d,}
+				<
+			}
+	
+			switch [Nv leshort 0 0 {} {}] {
+				1 {
+					>
+						emit {tape header.}
+					<
+				}
+				2 {
+					>
+						emit {beginning of file record.}
+					<
+				}
+				3 {
+					>
+						emit {map of inodes on tape.}
+					<
+				}
+				4 {
+					>
+						emit {continuation of file record.}
+					<
+				}
+				5 {
+					>
+						emit {end of volume.}
+					<
+				}
+				6 {
+					>
+						emit {map of inodes deleted.}
+					<
+				}
+				7 {
+					>
+						emit {end of medium (for floppy).}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[N ubeshort 0 0 0 & 65376 == 43520]} {
+		>
+			if {[N byte 1 0 0 {} {} != 4]} {
+				>
+					if {[N ubeshort 2 0 0 {} {} > 0]} {
+						>
+							emit {Dyalog APL}
+							switch [Nv byte 1 0 {} {}] {
+								-128 {
+									>
+										emit DDB
+									<
+								}
+								0 {
+									>
+										emit aplcore
+									<
+								}
+								1 {
+									>
+										emit {component file 32-bit non-journaled non-checksummed}
+									<
+								}
+								2 {
+									>
+										emit {external variable exclusive}
+									<
+								}
+								3 {
+									>
+										emit workspace
+										switch [Nv byte 7 0 & 40] {
+											0 {
+												>
+													emit 32-bit
+												<
+											}
+											32 {
+												>
+													emit 64-bit
+												<
+											}
+										}
+	
+										switch [Nv byte 7 0 & 12] {
+											0 {
+												>
+													emit classic
+												<
+											}
+											4 {
+												>
+													emit unicode
+												<
+											}
+										}
+	
+										switch [Nv byte 7 0 & -120] {
+											-128 {
+												>
+													emit little-endian
+												<
+											}
+											0 {
+												>
+													emit big-endian
+												<
+											}
+										}
+	
+									<
+								}
+								6 {
+									>
+										emit {external variable shared}
+									<
+								}
+								7 {
+									>
+										emit session
+									<
+								}
+								8 {
+									>
+										emit {mapped file 32-bit}
+									<
+								}
+								9 {
+									>
+										emit {component file 64-bit non-journaled non-checksummed}
+									<
+								}
+								10 {
+									>
+										emit {mapped file 64-bit}
+									<
+								}
+								11 {
+									>
+										emit {component file 32-bit level 1 journaled non-checksummed}
+									<
+								}
+								12 {
+									>
+										emit {component file 64-bit level 1 journaled non-checksummed}
+									<
+								}
+								13 {
+									>
+										emit {component file 32-bit level 1 journaled checksummed}
+									<
+								}
+								14 {
+									>
+										emit {component file 64-bit level 1 journaled checksummed}
+									<
+								}
+								15 {
+									>
+										emit {component file 32-bit level 2 journaled checksummed}
+									<
+								}
+								16 {
+									>
+										emit {component file 64-bit level 2 journaled checksummed}
+									<
+								}
+								17 {
+									>
+										emit {component file 32-bit level 3 journaled checksummed}
+									<
+								}
+								18 {
+									>
+										emit {component file 64-bit level 3 journaled checksummed}
+									<
+								}
+								19 {
+									>
+										emit {component file 32-bit non-journaled checksummed}
+									<
+								}
+								20 {
+									>
+										emit {component file 64-bit non-journaled checksummed}
+									<
+								}
+								21 {
+									>
+										emit {component file under construction}
+									<
+								}
+								22 {
+									>
+										emit {DFS component file 64-bit level 1 journaled checksummed}
+									<
+								}
+								23 {
+									>
+										emit {DFS component file 64-bit level 2 journaled checksummed}
+									<
+								}
+								24 {
+									>
+										emit {DFS component file 64-bit level 3 journaled checksummed}
+									<
+								}
+								25 {
+									>
+										emit {external workspace}
+									<
+								}
+							}
+	
+							if {[N byte 2 0 0 {} {} x {}]} {
+								>
+									emit {version %d}
+								<
+							}
+	
+							if {[N byte 3 0 0 {} {} x {}]} {
+								>
+									emit {\b.%d}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq @CT\ ]} {
+		>
+			emit {T602 document data,}
+			if {[S string 4 0 {} {} eq 0]} {
+				>
+					emit Kamenicky
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq 1]} {
+				>
+					emit {CP 852}
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq 2]} {
+				>
+					emit KOI8-CS
+				<
+			}
+	
+			if {[S string 4 0 {} {} > 2]} {
+				>
+					emit {unknown encoding}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq VimCrypt~]} {
+		>
+			emit {Vim encrypted file data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq b0VIM\ ]} {
+		>
+			emit {Vim swap file}
+			if {[S string [R 0] 0 {} {} > \0]} {
+				>
+					emit {\b, version %s}
+				<
+			}
+	
+			U 71 vimnanoswap 0
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq b0nano]} {
+		>
+			emit {Nano swap file}
+			U 71 vimnanoswap 0
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x00\x00\x00\x12Kate\ Swap\ File\ 2.0\x00]} {
+		>
+			emit {Kate swap file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \177ELF]} {
+		>
+			emit ELF
+			switch [Nv byte 4 0 {} {}] {
+				0 {
+					>
+						emit {invalid class}
+					<
+				}
+				1 {
+					>
+						emit 32-bit
+					<
+				}
+				2 {
+					>
+						emit 64-bit
+					<
+				}
+			}
+	
+			switch [Nv byte 5 0 {} {}] {
+				0 {
+					>
+						emit {invalid byte order}
+					<
+				}
+				1 {
+					>
+						emit LSB
+						U 73 elf-le 0
+	
+					<
+				}
+				2 {
+					>
+						emit MSB
+						U 73 elf-le 0
+	
+					<
+				}
+			}
+	
+			switch [Nv byte 7 0 {} {}] {
+				-54 {
+					>
+						emit {(Cafe OS)}
+					<
+				}
+				-1 {
+					>
+						emit (embedded)
+					<
+				}
+				0 {
+					>
+						emit (SYSV)
+					<
+				}
+				1 {
+					>
+						emit (HP-UX)
+					<
+				}
+				2 {
+					>
+						emit (NetBSD)
+					<
+				}
+				3 {
+					>
+						emit (GNU/Linux)
+					<
+				}
+				4 {
+					>
+						emit (GNU/Hurd)
+					<
+				}
+				5 {
+					>
+						emit (86Open)
+					<
+				}
+				6 {
+					>
+						emit (Solaris)
+					<
+				}
+				7 {
+					>
+						emit (Monterey)
+					<
+				}
+				8 {
+					>
+						emit (IRIX)
+					<
+				}
+				9 {
+					>
+						emit (FreeBSD)
+					<
+				}
+				10 {
+					>
+						emit (Tru64)
+					<
+				}
+				11 {
+					>
+						emit {(Novell Modesto)}
+					<
+				}
+				12 {
+					>
+						emit (OpenBSD)
+					<
+				}
+				13 {
+					>
+						emit (OpenVMS)
+					<
+				}
+				14 {
+					>
+						emit {(HP NonStop Kernel)}
+					<
+				}
+				15 {
+					>
+						emit {(AROS Research Operating System)}
+					<
+				}
+				16 {
+					>
+						emit (FenixOS)
+					<
+				}
+				17 {
+					>
+						emit {(Nuxi CloudABI)}
+					<
+				}
+				97 {
+					>
+						emit (ARM)
+					<
+				}
+			}
+	
+			strength *2
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0177BEAM!]} {
+		>
+			emit {Old Erlang BEAM file}
+			if {[N short 6 0 0 {} {} > 0]} {
+				>
+					emit {- version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FOR1]} {
+		>
+			if {[S string 8 0 {} {} eq BEAM]} {
+				>
+					emit {Erlang BEAM file}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq Tue\ Jan\ 22\ 14:32:44\ MET\ 1991]} {
+		>
+			emit {Erlang JAM file - version 4.2}
+		<
+	}
+	
+	if {[S string 79 0 {} {} eq Tue\ Jan\ 22\ 14:32:44\ MET\ 1991]} {
+		>
+			emit {Erlang JAM file - version 4.2}
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq 1.0\ Fri\ Feb\ 3\ 09:55:56\ MET\ 1995]} {
+		>
+			emit {Erlang JAM file - version 4.3}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FCS1.0]} {
+		>
+			emit {Flow Cytometry Standard (FCS) data, version 1.0}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FCS2.0]} {
+		>
+			emit {Flow Cytometry Standard (FCS) data, version 2.0}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FCS3.0]} {
+		>
+			emit {Flow Cytometry Standard (FCS) data, version 3.0}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \366\366\366\366]} {
+		>
+			emit {PC formatted floppy with no filesystem}
+		<
+	}
+	
+	if {[N beshort 508 0 0 {} {} == -9538]} {
+		>
+			if {[N long 504 0 0 {} {} > 0]} {
+				>
+					emit {Sun disk label}
+					if {[S string 0 0 {} {} x {}]} {
+						>
+							emit '%s
+							if {[S string 31 0 {} {} > \0]} {
+								>
+									emit {\b%s}
+									if {[S string 63 0 {} {} > \0]} {
+										>
+											emit {\b%s}
+											if {[S string 95 0 {} {} > \0]} {
+												>
+													emit {\b%s}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string 0 0 {} {} x {}]} {
+						>
+							emit {\b'}
+						<
+					}
+	
+					if {[N short 476 0 0 {} {} > 0]} {
+						>
+							emit {%d rpm,}
+						<
+					}
+	
+					if {[N short 478 0 0 {} {} > 0]} {
+						>
+							emit {%d phys cys,}
+						<
+					}
+	
+					if {[N short 480 0 0 {} {} > 0]} {
+						>
+							emit {%d alts/cyl,}
+						<
+					}
+	
+					if {[N short 486 0 0 {} {} > 0]} {
+						>
+							emit {%d interleave,}
+						<
+					}
+	
+					if {[N short 488 0 0 {} {} > 0]} {
+						>
+							emit {%d data cyls,}
+						<
+					}
+	
+					if {[N short 490 0 0 {} {} > 0]} {
+						>
+							emit {%d alt cyls,}
+						<
+					}
+	
+					if {[N short 492 0 0 {} {} > 0]} {
+						>
+							emit {%d heads/partition,}
+						<
+					}
+	
+					if {[N short 494 0 0 {} {} > 0]} {
+						>
+							emit {%d sectors/track,}
+						<
+					}
+	
+					if {[N long 500 0 0 {} {} > 0]} {
+						>
+							emit {start cyl %d,}
+						<
+					}
+	
+					if {[N long 504 0 0 {} {} x {}]} {
+						>
+							emit {%d blocks}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N belong 512 0 0 & 16777215 == 196871]} {
+				>
+					emit {\b, boot block present}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SBMBAKUP_]} {
+		>
+			emit {Smart Boot Manager backup file}
+			if {[S string 9 0 {} {} x {}]} {
+				>
+					emit {\b, version %-5.5s}
+					if {[S string 14 0 {} {} eq _]} {
+						>
+							if {[S string 15 0 {} {} x {}]} {
+								>
+									emit %-.1s
+									if {[S string 16 0 {} {} eq _]} {
+										>
+											emit {\b.}
+											if {[S string 17 0 {} {} x {}]} {
+												>
+													emit {\b%-.1s}
+													if {[S string 18 0 {} {} eq _]} {
+														>
+															emit {\b.}
+															if {[S string 19 0 {} {} x {}]} {
+																>
+																	emit {\b%-.1s}
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ubyte 22 0 0 {} {} == 0]} {
+								>
+									if {[N ubyte 21 0 0 {} {} x {}]} {
+										>
+											emit {\b, from drive 0x%x}
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ubyte 22 0 0 {} {} > 0]} {
+								>
+									if {[S string 21 0 {} {} x {}]} {
+										>
+											emit {\b, from drive %s}
+										<
+									}
+	
+								<
+							}
+	
+							if {[S search 535 0 {} 17 eq \x55\xAA]} {
+								>
+									emit {\b; contains}
+									T [R -512] {}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DOSEMU\0]} {
+		>
+			if {[N leshort 638 0 0 {} {} == -21931]} {
+				>
+					if {[N ubyte 19 0 0 {} {} == 128]} {
+						>
+							if {[N ubyte [I 19 ubyte 0 - 0 1] 0 0 {} {} == 0]} {
+								>
+									emit {DOS Emulator image}
+									if {[N ulelong 7 0 0 {} {} > 0]} {
+										>
+											emit {\b, %u heads}
+										<
+									}
+	
+									if {[N ulelong 11 0 0 {} {} > 0]} {
+										>
+											emit {\b, %d sectors/track}
+										<
+									}
+	
+									if {[N ulelong 15 0 0 {} {} > 0]} {
+										>
+											emit {\b, %d cylinders}
+										<
+									}
+	
+									emit {\b; contains}
+									T 128 {}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PNCIHISK\0]} {
+		>
+			emit {Norton Utilities disc image data}
+			if {[S search 509 0 {} 1026 eq \x55\xAA\xeb]} {
+				>
+					emit {\b; contains}
+					T [R -1] {}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PNCIUNDO]} {
+		>
+			emit {Norton Disk Doctor UnDo file}
+		<
+	}
+	
+	if {[S search 30 0 {} 481 eq \x55\xAA]} {
+		>
+			if {[N uleshort 11 0 0 {} {} < 512]} {
+				>
+					if {[N uleshort [I 11 uleshort 0 - 0 2] 0 0 {} {} == 43605]} {
+						>
+							emit {DOS/MBR boot sector}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N leshort 510 0 0 {} {} == -21931]} {
+				>
+					emit {DOS/MBR boot sector}
+				<
+			}
+	
+			strength +65
+		<
+	}
+	
+	switch [Nv leshort 510 0 {} {}] {
+		-21931 {
+			>
+				emit {DOS/MBR boot sector}
+				if {[S string 2 0 {} {} eq OSBS]} {
+					>
+						emit {OS/BS MBR}
+					<
+				}
+	
+				if {[S search 0 0 {} 2 eq \x33\xc0\x8e\xd0\xbc\x00\x7c]} {
+					>
+						emit MS-MBR
+						switch [Nv ubequad 8 0 {} {}] {
+							5766665946185735036 {
+								>
+									switch [Nv ubequad 24 0 {} {}] {
+										17556381263194468612 {
+											>
+												emit XP
+												switch [Nv ubelong 436 0 & 16777215] {
+													2901091 {
+														>
+															emit english
+														<
+													}
+													2902126 {
+														>
+															emit german
+														<
+													}
+												}
+	
+												if {[N ubyte 437 0 0 {} {} > 0]} {
+													>
+														emit {at offset 0x1%x}
+													<
+												}
+	
+												if {[S string [I 437 ubyte 0 + 0 256] 0 {} {} > \0]} {
+													>
+														emit {"%s"}
+													<
+												}
+	
+												if {[N ubyte 438 0 0 {} {} > 0]} {
+													>
+														emit {at offset 0x1%x}
+													<
+												}
+	
+												if {[S string [I 438 ubyte 0 + 0 256] 0 {} {} > \0]} {
+													>
+														emit {"%s"}
+													<
+												}
+	
+												if {[N ubyte 439 0 0 {} {} > 0]} {
+													>
+														emit {at offset 0x1%x}
+													<
+												}
+	
+												if {[S string [I 439 ubyte 0 + 0 256] 0 {} {} > \0]} {
+													>
+														emit {"%s"}
+													<
+												}
+	
+											<
+										}
+										17556381267489435908 {
+											>
+												emit 9M
+												if {[S string [I 60 ubyte 0 + 0 255] 0 {} {} eq Invalid\ partition\ table]} {
+													>
+														emit english
+													<
+												}
+	
+												if {[S string [I 60 ubyte 0 + 0 255] 0 {} {} eq Ung\201ltige\ Partitionstabelle]} {
+													>
+														emit german
+													<
+												}
+	
+												if {[S string [I 60 ubyte 0 + 0 255] 0 {} {} eq Table\ de\ partition\ erron\202e]} {
+													>
+														emit french
+													<
+												}
+	
+												if {[S string [I 60 ubyte 0 + 0 255] 0 {} {} eq \215\245\257\340\240\242\250\253\354\255\240\357\ \342\240\241\253\250\346\240]} {
+													>
+														emit russian
+													<
+												}
+	
+												if {[N ubyte 60 0 0 {} {} x {}]} {
+													>
+														emit {at offset 0x%x+0xFF}
+													<
+												}
+	
+												if {[S string [I 60 ubyte 0 + 0 255] 0 {} {} > \0]} {
+													>
+														emit {"%s"}
+													<
+												}
+	
+												if {[N ubyte 189 0 0 {} {} x {}]} {
+													>
+														emit {at offset 0x1%x}
+													<
+												}
+	
+												if {[S string [I 189 ubyte 0 + 0 256] 0 {} {} > \0]} {
+													>
+														emit {"%s"}
+													<
+												}
+	
+												if {[N ubyte 169 0 0 {} {} x {}]} {
+													>
+														emit {at offset 0x1%x}
+													<
+												}
+	
+												if {[S string [I 169 ubyte 0 + 0 256] 0 {} {} > \0]} {
+													>
+														emit {"%s"}
+													<
+												}
+	
+											<
+										}
+									}
+	
+								<
+							}
+							10084773457928649724 {
+								>
+									switch [Nv ubyte 22 0 {} {}] {
+										242 {
+											>
+												if {[N ubequad 34 0 0 {} {} == 13797911610017883509]} {
+													>
+														emit {\b,NEC 3.3}
+													<
+												}
+	
+												if {[D 34]} {
+													>
+														emit {\b,D0S version 3.3-7.0}
+														if {[S string [I 73 ubyte 0 + 0 0] 0 {} {} eq Invalid\ partition\ table]} {
+															>
+																emit english
+															<
+														}
+	
+														if {[S string [I 73 ubyte 0 + 0 0] 0 {} {} eq Ung\201ltige\ Partitionstabelle]} {
+															>
+																emit german
+															<
+														}
+	
+														if {[S string [I 73 ubyte 0 + 0 0] 0 {} {} eq Table\ de\ partition\ invalide]} {
+															>
+																emit french
+															<
+														}
+	
+														if {[S string [I 73 ubyte 0 + 0 0] 0 {} {} eq Tabela\ de\ parti\207ao\ inv\240lida]} {
+															>
+																emit portuguese
+															<
+														}
+	
+														if {[S string [I 73 ubyte 0 + 0 0] 0 {} {} eq Tabla\ de\ partici\242n\ no\ v\240lida]} {
+															>
+																emit spanish
+															<
+														}
+	
+														if {[S string [I 73 ubyte 0 + 0 0] 0 {} {} eq Tavola\ delle\ partizioni\ non\ valida]} {
+															>
+																emit italian
+															<
+														}
+	
+														if {[N ubyte 73 0 0 {} {} > 0]} {
+															>
+																emit {at offset 0x%x}
+																if {[S string [I 73 ubyte 0 + 0 0] 0 {} {} > \0]} {
+																	>
+																		emit {"%s"}
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte 116 0 0 {} {} > 0]} {
+															>
+																emit {at offset 0x%x}
+																if {[S string [I 116 ubyte 0 + 0 0] 0 {} {} > \0]} {
+																	>
+																		emit {"%s"}
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte 121 0 0 {} {} > 0]} {
+															>
+																emit {at offset 0x%x}
+																if {[S string [I 121 ubyte 0 + 0 0] 0 {} {} > \0]} {
+																	>
+																		emit {"%s"}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+										243 {
+											>
+												emit {\b,DOS 2}
+												if {[S regex 219 0 {} {} eq Author\ -\ ]} {
+													>
+														emit Author:
+														if {[S string [R 0] 0 {} {} x {}]} {
+															>
+																emit {"%s"}
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+									}
+	
+								<
+							}
+							13875265812538638080 {
+								>
+									switch [Nv ubequad 236 0 {} {}] {
+										7386461203189481845 {
+											>
+												emit {Windows 7}
+												if {[N ubelong 436 0 0 & 16777215 == 6519706]} {
+													>
+														emit english
+													<
+												}
+	
+												if {[N ubyte 437 0 0 {} {} > 0]} {
+													>
+														emit {at offset 0x1%x}
+													<
+												}
+	
+												if {[S string [I 437 ubyte 0 + 0 256] 0 {} {} > \0]} {
+													>
+														emit {"%s"}
+													<
+												}
+	
+												if {[N ubyte 438 0 0 {} {} > 0]} {
+													>
+														emit {at offset 0x1%x}
+													<
+												}
+	
+												if {[S string [I 438 ubyte 0 + 0 256] 0 {} {} > \0]} {
+													>
+														emit {"%s"}
+													<
+												}
+	
+												if {[N ubyte 439 0 0 {} {} > 0]} {
+													>
+														emit {at offset 0x1%x}
+													<
+												}
+	
+												if {[S string [I 439 ubyte 0 + 0 256] 0 {} {} > \0]} {
+													>
+														emit {"%s"}
+													<
+												}
+	
+											<
+										}
+										8447458234516915024 {
+											>
+												emit Vista
+												if {[N ubelong 436 0 0 & 16777215 == 6453913]} {
+													>
+														emit english
+													<
+												}
+	
+												if {[N ubyte 437 0 0 {} {} > 0]} {
+													>
+														emit {at offset 0x1%x}
+													<
+												}
+	
+												if {[S string [I 437 ubyte 0 + 0 256] 0 {} {} > \0]} {
+													>
+														emit {"%s"}
+													<
+												}
+	
+												if {[N ubyte 438 0 0 {} {} > 0]} {
+													>
+														emit {at offset 0x1%x}
+													<
+												}
+	
+												if {[S string [I 438 ubyte 0 + 0 256] 0 {} {} > \0]} {
+													>
+														emit {"%s"}
+													<
+												}
+	
+												if {[N ubyte 439 0 0 {} {} > 0]} {
+													>
+														emit {at offset 0x1%x}
+													<
+												}
+	
+												if {[S string [I 439 ubyte 0 + 0 256] 0 {} {} > \0]} {
+													>
+														emit {"%s"}
+													<
+												}
+	
+											<
+										}
+									}
+	
+								<
+							}
+						}
+	
+						if {[N ulelong 440 0 0 {} {} > 0]} {
+							>
+								emit {\b, disk signature 0x%-.4x}
+							<
+						}
+	
+						if {[N uleshort 218 0 0 {} {} == 0]} {
+							>
+								if {[N ulelong 220 0 0 {} {} > 0]} {
+									>
+										emit {\b, created}
+										if {[N ubyte 220 0 0 {} {} x {}]} {
+											>
+												emit {with driveID 0x%x}
+											<
+										}
+	
+										if {[N ubyte 223 0 0 {} {} x {}]} {
+											>
+												emit {at %x}
+											<
+										}
+	
+										if {[N ubyte 222 0 0 {} {} x {}]} {
+											>
+												emit {\b:%x}
+											<
+										}
+	
+										if {[N ubyte 221 0 0 {} {} x {}]} {
+											>
+												emit {\b:%x}
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[N ubequad 0 0 0 {} {} == 18066242684150922240]} {
+					>
+						if {[N ubequad 8 0 0 {} {} == 142985680396521176]} {
+							>
+								emit {MS-MBR,D0S version 3.21 spanish}
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 157 0 {} {} eq Invalid\ partition\ table\$]} {
+					>
+						if {[S string 181 0 {} {} eq No\ Operating\ System\$]} {
+							>
+								if {[S string 201 0 {} {} eq Operating\ System\ load\ error\$]} {
+									>
+										emit {\b, DR-DOS MBR, Version 7.01 to 7.03}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 157 0 {} {} eq Invalid\ partition\ table\$]} {
+					>
+						if {[S string 181 0 {} {} eq No\ operating\ system\$]} {
+							>
+								if {[S string 201 0 {} {} eq Operating\ system\ load\ error\$]} {
+									>
+										emit {\b, DR-DOS MBR, Version 7.01 to 7.03}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 342 0 {} {} eq Invalid\ partition\ table\$]} {
+					>
+						if {[S string 366 0 {} {} eq No\ operating\ system\$]} {
+							>
+								if {[S string 386 0 {} {} eq Operating\ system\ load\ error\$]} {
+									>
+										emit {\b, DR-DOS MBR, version 7.01 to 7.03}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 295 0 {} {} eq NEWLDR\0]} {
+					>
+						if {[S string 302 0 {} {} eq Bad\ PT\ \$]} {
+							>
+								if {[S string 310 0 {} {} eq No\ OS\ \$]} {
+									>
+										if {[S string 317 0 {} {} eq OS\ load\ err\$]} {
+											>
+												if {[S string 329 0 {} {} eq Moved\ or\ missing\ IBMBIO.LDR\n\r]} {
+													>
+														if {[S string 358 0 {} {} eq Press\ any\ key\ to\ continue.\n\r\$]} {
+															>
+																if {[S string 387 0 {} {} eq Copyright\ (c)\ 1984,1998]} {
+																	>
+																		if {[S string 411 0 {} {} eq Caldera\ Inc.\0]} {
+																			>
+																				emit {\b, DR-DOS MBR (IBMBIO.LDR)}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S search 325 0 {} 7 eq Default:\ F]} {
+					>
+						emit {\b, FREE-DOS MBR}
+					<
+				}
+	
+				if {[S string 64 0 {} {} eq no\ active\ partition\ found]} {
+					>
+						if {[S string 96 0 {} {} eq read\ error\ while\ reading\ drive]} {
+							>
+								emit {\b, FREE-DOS Beta 0.9 MBR}
+							<
+						}
+	
+					<
+				}
+	
+				if {[S search 387 0 {} 4 eq \0\ Error!\r]} {
+					>
+						if {[S search 378 0 {} 7 eq Virus!]} {
+							>
+								if {[S search 397 0 {} 4 eq Booting\040]} {
+									>
+										if {[S search 408 0 {} 4 eq HD1/\0]} {
+											>
+												emit {\b, Ranish MBR (}
+												if {[S string 416 0 {} {} eq Writing\ changes...]} {
+													>
+														emit {\b2.37}
+														if {[N ubyte 438 0 0 {} {} x {}]} {
+															>
+																emit {\b,0x%x dots}
+															<
+														}
+	
+														if {[N ubyte 440 0 0 {} {} > 0]} {
+															>
+																emit {\b,virus check}
+															<
+														}
+	
+														if {[N ubyte 441 0 0 {} {} > 0]} {
+															>
+																emit {\b,partition %c}
+															<
+														}
+	
+													<
+												}
+	
+												if {[S string 416 0 {} {} ne Writing\ changes...]} {
+													>
+														emit {\b}
+														if {[N ubyte 418 0 0 {} {} == 1]} {
+															>
+																emit {\bvirus check,}
+															<
+														}
+	
+														if {[N ubyte 419 0 0 {} {} x {}]} {
+															>
+																emit {\b0x%x seconds}
+															<
+														}
+	
+														if {[N ubyte 420 0 0 & 15 > 0]} {
+															>
+																emit {\b,partition}
+																if {[N ubyte 420 0 0 & 15 < 5]} {
+																	>
+																		emit {\b %x}
+																	<
+																}
+	
+																if {[N ubyte 420 0 0 & 15 == 15]} {
+																	>
+																		emit {\b ask}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+												if {[N ubyte 420 0 0 {} {} x {}]} {
+													>
+														emit {\b)}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 362 0 {} {} eq MBR\ Error\ \0\r]} {
+					>
+						if {[S string 376 0 {} {} eq ress\ any\ key\ to\040]} {
+							>
+								if {[S string 392 0 {} {} eq boot\ from\ floppy...\0]} {
+									>
+										emit {\b, Acronis MBR}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 309 0 {} {} eq No\ bootable\ partition\ found\r]} {
+					>
+						if {[S string 339 0 {} {} eq I/O\ Error\ reading\ boot\ sector\r]} {
+							>
+								emit {\b, Visopsys MBR}
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 349 0 {} {} eq No\ bootable\ partition\ found\r]} {
+					>
+						if {[S string 379 0 {} {} eq I/O\ Error\ reading\ boot\ sector\r]} {
+							>
+								emit {\b, simple Visopsys MBR}
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 64 0 {} {} eq SBML]} {
+					>
+						if {[S string 43 0 {} {} eq SMART\ BTMGR]} {
+							>
+								if {[S string 430 0 {} {} eq SBMK\ Bad!\r]} {
+									>
+										emit {\b, Smart Boot Manager}
+										if {[S string 6 0 {} {} > \0]} {
+											>
+												emit {\b, version %s}
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 382 0 {} {} eq XOSLLOADXCF]} {
+					>
+						emit {\b, eXtended Operating System Loader}
+					<
+				}
+	
+				if {[S string 6 0 {} {} eq LILO]} {
+					>
+						emit {\b, LInux i386 boot LOader}
+						if {[S string 120 0 {} {} eq LILO]} {
+							>
+								emit {\b, version 22.3.4 SuSe}
+							<
+						}
+	
+						if {[S string 172 0 {} {} eq LILO]} {
+							>
+								emit {\b, version 22.5.8 Debian}
+							<
+						}
+	
+					<
+				}
+	
+				if {[S search 342 0 {} 60 eq \0Geom\0]} {
+					>
+						if {[N ubyte 65 0 0 {} {} < 2]} {
+							>
+								if {[N ubyte 62 0 0 {} {} > 2]} {
+									>
+										emit {\b; GRand Unified Bootloader}
+										if {[N ubyte 62 0 0 {} {} x {}]} {
+											>
+												emit {\b, stage1 version 0x%x}
+											<
+										}
+	
+										if {[N ubyte 64 0 0 {} {} < 255]} {
+											>
+												emit {\b, boot drive 0x%x}
+											<
+										}
+	
+										if {[N ubyte 65 0 0 {} {} > 0]} {
+											>
+												emit {\b, LBA flag 0x%x}
+											<
+										}
+	
+										if {[N uleshort 66 0 0 {} {} < 32768]} {
+											>
+												emit {\b, stage2 address 0x%x}
+											<
+										}
+	
+										if {[N uleshort 66 0 0 {} {} > 32768]} {
+											>
+												emit {\b, stage2 address 0x%x}
+											<
+										}
+	
+										if {[N ulelong 68 0 0 {} {} > 1]} {
+											>
+												emit {\b, 1st sector stage2 0x%x}
+											<
+										}
+	
+										if {[N uleshort 72 0 0 {} {} < 2048]} {
+											>
+												emit {\b, stage2 segment 0x%x}
+											<
+										}
+	
+										if {[N uleshort 72 0 0 {} {} > 2048]} {
+											>
+												emit {\b, stage2 segment 0x%x}
+											<
+										}
+	
+										if {[S string 402 0 {} {} eq Geom\0Hard\ Disk\0Read\0\ Error\0]} {
+											>
+												if {[S string 394 0 {} {} eq stage1]} {
+													>
+														emit {\b, GRUB version 0.5.95}
+													<
+												}
+	
+											<
+										}
+	
+										if {[S string 382 0 {} {} eq Geom\0Hard\ Disk\0Read\0\ Error\0]} {
+											>
+												if {[S string 376 0 {} {} eq GRUB\ \0]} {
+													>
+														emit {\b, GRUB version 0.93 or 1.94}
+													<
+												}
+	
+											<
+										}
+	
+										if {[S string 383 0 {} {} eq Geom\0Hard\ Disk\0Read\0\ Error\0]} {
+											>
+												if {[S string 377 0 {} {} eq GRUB\ \0]} {
+													>
+														emit {\b, GRUB version 0.94}
+													<
+												}
+	
+											<
+										}
+	
+										if {[S string 385 0 {} {} eq Geom\0Hard\ Disk\0Read\0\ Error\0]} {
+											>
+												if {[S string 379 0 {} {} eq GRUB\ \0]} {
+													>
+														emit {\b, GRUB version 0.95 or 0.96}
+													<
+												}
+	
+											<
+										}
+	
+										if {[S string 391 0 {} {} eq Geom\0Hard\ Disk\0Read\0\ Error\0]} {
+											>
+												if {[S string 385 0 {} {} eq GRUB\ \0]} {
+													>
+														emit {\b, GRUB version 0.97}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+								if {[S string 343 0 {} {} eq Geom\0Read\0\ Error\0]} {
+									>
+										if {[S string 321 0 {} {} eq Loading\ stage1.5]} {
+											>
+												emit {\b, GRUB version x.y}
+											<
+										}
+	
+									<
+								}
+	
+								if {[S string 380 0 {} {} eq Geom\0Hard\ Disk\0Read\0\ Error\0]} {
+									>
+										if {[S string 374 0 {} {} eq GRUB\ \0]} {
+											>
+												emit {\b, GRUB version n.m}
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 395 0 {} {} eq chksum\0\ ERROR!\0]} {
+					>
+						emit {\b, Gujin bootloader}
+					<
+				}
+	
+				if {[S string 3 0 {} {} eq BCDL]} {
+					>
+						if {[S string 498 0 {} {} eq BCDL\ \ \ \ BIN]} {
+							>
+								emit {\b, Bootable CD Loader (1.50Z)}
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 3 0 {} {} ne IHISK]} {
+					>
+						if {[N belong 0 0 0 {} {} != -1195374706]} {
+							>
+								if {[S string 514 0 {} {} ne HdrS]} {
+									>
+										if {[S string 422 0 {} {} ne Be\ Boot\ Loader]} {
+											>
+												if {[N ubelong 0 0 0 & 4244635648 == 3909091328]} {
+													>
+														if {[N ubequad [I 1 ubyte 0 + 0 2] 0 0 {} {} == 18028402503091929230]} {
+															>
+																U 79 partition-table 446
+	
+															<
+														}
+	
+													<
+												}
+	
+												if {[N ubelong 0 0 0 & 4244635648 != 3909091328]} {
+													>
+														if {[S string 0 0 {} {} ne RRaA]} {
+															>
+																if {[N ubequad 0 0 0 {} {} != 18043126232640415371]} {
+																	>
+																		if {[N ubequad 0 0 0 {} {} != 7354297128558431054]} {
+																			>
+																				if {[S string 0 0 {} {} ne \r\n]} {
+																					>
+																						if {[N ubyte 446 0 0 {} {} == 0]} {
+																							>
+																								U 79 partition-table 446
+	
+																							<
+																						}
+	
+																						if {[N ubyte 446 0 0 {} {} > 127]} {
+																							>
+																								U 79 partition-table 446
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 442 0 {} {} eq Non-system\ disk,\040]} {
+					>
+						if {[S string 459 0 {} {} eq press\ any\ key...\x7\0]} {
+							>
+								emit {\b, Acronis Startup Recovery Loader}
+								if {[N ubyte 447 0 0 {} {} x {}]} {
+									>
+										emit {\b}
+									<
+								}
+	
+								U 79 DOS-filename 477
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 185 0 {} {} eq FDBOOT\ Version\040]} {
+					>
+						if {[S string 204 0 {} {} eq \rNo\ Systemdisk.\040]} {
+							>
+								if {[S string 220 0 {} {} eq Booting\ from\ harddisk.\n\r]} {
+									>
+									<
+								}
+	
+								if {[S string 245 0 {} {} eq Cannot\ load\ from\ harddisk.\n\r]} {
+									>
+										if {[S string 273 0 {} {} eq Insert\ Systemdisk\040]} {
+											>
+												if {[S string 291 0 {} {} eq and\ press\ any\ key.\n\r]} {
+													>
+														emit {\b, FDBOOT harddisk Bootloader}
+														if {[S string 200 0 {} {} > \0]} {
+															>
+																emit {\b, version %-3s}
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 242 0 {} {} eq Bootsector\ from\ C.H.\ Hochst\204]} {
+					>
+					<
+				}
+	
+				if {[S search 242 0 {} 127 eq Bootsector\ from\ C.H.\ Hochst]} {
+					>
+						if {[S search 278 0 {} 127 eq No\ Systemdisk.\ Booting\ from\ harddisk]} {
+							>
+								if {[S search 208 0 {} 261 eq Cannot\ load\ from\ harddisk.]} {
+									>
+										if {[S search 236 0 {} 235 eq Insert\ Systemdisk\ and\ press\ any\ key.]} {
+											>
+												if {[S search 180 0 {} 96 eq Disk\ formatted\ with\ WinImage\ ]} {
+													>
+														emit {\b, WinImage harddisk Bootloader}
+														if {[S string [R 0] 0 {} {} x {}]} {
+															>
+																emit {\b, version %-4.4s}
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[N ubyte [I 1 ubyte 0 + 0 2] 0 0 {} {} == 14]} {
+					>
+						if {[N ubyte [I 1 ubyte 0 + 0 3] 0 0 {} {} == 31]} {
+							>
+								if {[N ubyte [I 1 ubyte 0 + 0 4] 0 0 {} {} == 190]} {
+									>
+										if {[N ubyte [I 1 ubyte 0 + 0 5] 0 0 & 211 == 83]} {
+											>
+												if {[N ubyte [I 1 ubyte 0 + 0 6] 0 0 {} {} == 124]} {
+													>
+														if {[N ubyte [I 1 ubyte 0 + 0 7] 0 0 {} {} == 172]} {
+															>
+																if {[N ubyte [I 1 ubyte 0 + 0 8] 0 0 {} {} == 34]} {
+																	>
+																		if {[N ubyte [I 1 ubyte 0 + 0 9] 0 0 {} {} == 192]} {
+																			>
+																				if {[N ubyte [I 1 ubyte 0 + 0 10] 0 0 {} {} == 116]} {
+																					>
+																						if {[N ubyte [I 1 ubyte 0 + 0 11] 0 0 {} {} == 11]} {
+																							>
+																								if {[N ubyte [I 1 ubyte 0 + 0 12] 0 0 {} {} == 86]} {
+																									>
+																										if {[N ubyte [I 1 ubyte 0 + 0 13] 0 0 {} {} == 180]} {
+																											>
+																												emit {\b, mkdosfs boot message display}
+																												switch [Nv ubyte [I 1 ubyte 0 + 0 5] 0 {} {}] {
+																													91 {
+																														>
+																															if {[S string 91 0 {} {} > \0]} {
+																																>
+																																	emit {"%-s"}
+																																<
+																															}
+	
+																														<
+																													}
+																													119 {
+																														>
+																															if {[S string 119 0 {} {} > \0]} {
+																																>
+																																	emit {"%-s"}
+																																<
+																															}
+	
+																														<
+																													}
+																												}
+	
+																											<
+																										}
+	
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 214 0 {} {} eq Please\ try\ to\ install\ FreeDOS\ ]} {
+					>
+						emit {\b, DOS Emulator boot message display}
+					<
+				}
+	
+				if {[S string 103 0 {} {} eq This\ is\ not\ a\ bootable\ disk.\040]} {
+					>
+						if {[S string 132 0 {} {} eq Please\ insert\ a\ bootable\040]} {
+							>
+								if {[S string 157 0 {} {} eq floppy\ and\r\n]} {
+									>
+										if {[S string 169 0 {} {} eq press\ any\ key\ to\ try\ again...\r]} {
+											>
+												emit {\b, FREE-DOS message display}
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 66 0 {} {} eq Solaris\ Boot\ Sector]} {
+					>
+						if {[S string 99 0 {} {} eq Incomplete\ MDBoot\ load.]} {
+							>
+								if {[S string 89 0 {} {} eq Version]} {
+									>
+										emit {\b, Sun Solaris Bootloader}
+										if {[N byte 97 0 0 {} {} x {}]} {
+											>
+												emit {version %c}
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 408 0 {} {} eq OS/2\ !!\ SYS01475\r\0]} {
+					>
+						if {[S string 429 0 {} {} eq OS/2\ !!\ SYS02025\r\0]} {
+							>
+								if {[S string 450 0 {} {} eq OS/2\ !!\ SYS02027\r\0]} {
+									>
+									<
+								}
+	
+								if {[S string 469 0 {} {} eq OS2BOOT\ \ \ \ ]} {
+									>
+										emit {\b, IBM OS/2 Warp bootloader}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 409 0 {} {} eq OS/2\ !!\ SYS01475\r\0]} {
+					>
+						if {[S string 430 0 {} {} eq OS/2\ !!\ SYS02025\r\0]} {
+							>
+								if {[S string 451 0 {} {} eq OS/2\ !!\ SYS02027\r\0]} {
+									>
+									<
+								}
+	
+								if {[S string 470 0 {} {} eq OS2BOOT\ \ \ \ ]} {
+									>
+										emit {\b, IBM OS/2 Warp Bootloader}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 112 0 {} {} eq This\ disk\ is\ not\ bootable\r]} {
+					>
+						if {[S string 142 0 {} {} eq If\ you\ wish\ to\ make\ it\ bootable]} {
+							>
+								if {[S string 176 0 {} {} eq run\ the\ DOS\ program\ SYS\040]} {
+									>
+									<
+								}
+	
+								if {[S string 200 0 {} {} eq after\ the\r]} {
+									>
+										if {[S string 216 0 {} {} eq system\ has\ been\ loaded\r\n]} {
+											>
+												if {[S string 242 0 {} {} eq Please\ insert\ a\ DOS\ diskette\040]} {
+													>
+													<
+												}
+	
+												if {[S string 271 0 {} {} eq into\r\n\ the\ drive\ and\040]} {
+													>
+														if {[S string 292 0 {} {} eq strike\ any\ key...\0]} {
+															>
+																emit {\b, IBM OS/2 Warp message display}
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 430 0 {} {} eq NTLDR\ is\ missing\xFF\r\n]} {
+					>
+						if {[S string 449 0 {} {} eq Disk\ error\xFF\r\n]} {
+							>
+								if {[S string 462 0 {} {} eq Press\ any\ key\ to\ restart\r]} {
+									>
+										emit {\b, Microsoft Windows XP Bootloader}
+										if {[N ubyte 417 0 0 & 223 > 0]} {
+											>
+												if {[S string 417 0 {} {} x {}]} {
+													>
+														emit %-.5s
+														if {[N ubyte 422 0 0 & 223 > 0]} {
+															>
+																if {[S string 422 0 {} {} x {}]} {
+																	>
+																		emit {\b%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+												if {[N ubyte 425 0 0 & 223 > 0]} {
+													>
+														if {[S string 425 0 {} {} > \ ]} {
+															>
+																emit {\b.%-.3s}
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+										if {[N ubyte 371 0 0 {} {} > 32]} {
+											>
+												if {[N ubyte 368 0 0 & 223 > 0]} {
+													>
+														if {[S string 368 0 {} {} x {}]} {
+															>
+																emit %-.5s
+																if {[N ubyte 373 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 373 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.3s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte 376 0 0 & 223 > 0]} {
+															>
+																if {[S string 376 0 {} {} x {}]} {
+																	>
+																		emit {\b.%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 430 0 {} {} eq NTLDR\ nicht\ gefunden\xFF\r\n]} {
+					>
+						if {[S string 453 0 {} {} eq Datentr\204gerfehler\xFF\r\n]} {
+							>
+								if {[S string 473 0 {} {} eq Neustart\ mit\ beliebiger\ Taste\r]} {
+									>
+										emit {\b, Microsoft Windows XP Bootloader (german)}
+										if {[N ubyte 417 0 0 & 223 > 0]} {
+											>
+												if {[S string 417 0 {} {} x {}]} {
+													>
+														emit %-.5s
+														if {[N ubyte 422 0 0 & 223 > 0]} {
+															>
+																if {[S string 422 0 {} {} x {}]} {
+																	>
+																		emit {\b%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+												if {[N ubyte 425 0 0 & 223 > 0]} {
+													>
+														if {[S string 425 0 {} {} > \ ]} {
+															>
+																emit {\b.%-.3s}
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+										if {[S string 379 0 {} {} eq \0]} {
+											>
+												if {[N ubyte 368 0 0 & 223 > 0]} {
+													>
+														if {[S string 368 0 {} {} x {}]} {
+															>
+																emit %-.5s
+																if {[N ubyte 373 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 373 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.3s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 430 0 {} {} eq NTLDR\ fehlt\xFF\r\n]} {
+					>
+						if {[S string 444 0 {} {} eq Datentr\204gerfehler\xFF\r\n]} {
+							>
+								if {[S string 464 0 {} {} eq Neustart\ mit\ beliebiger\ Taste\r]} {
+									>
+										emit {\b, Microsoft Windows XP Bootloader (2.german)}
+										if {[N ubyte 417 0 0 & 223 > 0]} {
+											>
+												if {[S string 417 0 {} {} x {}]} {
+													>
+														emit %-.5s
+														if {[N ubyte 422 0 0 & 223 > 0]} {
+															>
+																if {[S string 422 0 {} {} x {}]} {
+																	>
+																		emit {\b%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+												if {[N ubyte 425 0 0 & 223 > 0]} {
+													>
+														if {[S string 425 0 {} {} > \ ]} {
+															>
+																emit {\b.%-.3s}
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+										if {[N ubyte 371 0 0 {} {} > 32]} {
+											>
+												if {[N ubyte 368 0 0 & 223 > 0]} {
+													>
+														if {[S string 368 0 {} {} x {}]} {
+															>
+																emit %-.5s
+																if {[N ubyte 373 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 373 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.3s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte 376 0 0 & 223 > 0]} {
+															>
+																if {[S string 376 0 {} {} x {}]} {
+																	>
+																		emit {\b.%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 430 0 {} {} eq NTLDR\ fehlt\xFF\r\n]} {
+					>
+						if {[S string 444 0 {} {} eq Medienfehler\xFF\r\n]} {
+							>
+								if {[S string 459 0 {} {} eq Neustart:\ Taste\ dr\201cken\r]} {
+									>
+										emit {\b, Microsoft Windows XP Bootloader (3.german)}
+										if {[N ubyte 371 0 0 {} {} > 32]} {
+											>
+												if {[N ubyte 368 0 0 & 223 > 0]} {
+													>
+														if {[S string 368 0 {} {} x {}]} {
+															>
+																emit %-.5s
+																if {[N ubyte 373 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 373 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.3s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte 376 0 0 & 223 > 0]} {
+															>
+																if {[S string 376 0 {} {} x {}]} {
+																	>
+																		emit {\b.%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+										if {[N ubyte 417 0 0 & 223 > 0]} {
+											>
+												if {[S string 417 0 {} {} x {}]} {
+													>
+														emit %-.5s
+														if {[N ubyte 422 0 0 & 223 > 0]} {
+															>
+																if {[S string 422 0 {} {} x {}]} {
+																	>
+																		emit {\b%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+												if {[N ubyte 425 0 0 & 223 > 0]} {
+													>
+														if {[S string 425 0 {} {} > \ ]} {
+															>
+																emit {\b.%-.3s}
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 430 0 {} {} eq Datentr\204ger\ entfernen\xFF\r\n]} {
+					>
+						if {[S string 454 0 {} {} eq Medienfehler\xFF\r\n]} {
+							>
+								if {[S string 469 0 {} {} eq Neustart:\ Taste\ dr\201cken\r]} {
+									>
+										emit {\b, Microsoft Windows XP Bootloader (4.german)}
+										if {[S string 379 0 {} {} eq \0]} {
+											>
+												if {[N ubyte 368 0 0 & 223 > 0]} {
+													>
+														if {[S string 368 0 {} {} x {}]} {
+															>
+																emit %-.5s
+																if {[N ubyte 373 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 373 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.3s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte 376 0 0 & 223 > 0]} {
+															>
+																if {[S string 376 0 {} {} x {}]} {
+																	>
+																		emit {\b.%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+										if {[N ubyte 417 0 0 & 223 > 0]} {
+											>
+												if {[S string 417 0 {} {} x {}]} {
+													>
+														emit %-.5s
+														if {[N ubyte 422 0 0 & 223 > 0]} {
+															>
+																if {[S string 422 0 {} {} x {}]} {
+																	>
+																		emit {\b%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+												if {[N ubyte 425 0 0 & 223 > 0]} {
+													>
+														if {[S string 425 0 {} {} > \ ]} {
+															>
+																emit {\b.%-.3s}
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 389 0 {} {} eq Fehler\ beim\ Lesen\040]} {
+					>
+						if {[S string 407 0 {} {} eq des\ Datentr\204gers]} {
+							>
+								if {[S string 426 0 {} {} eq NTLDR\ fehlt]} {
+									>
+										if {[S string 440 0 {} {} eq NTLDR\ ist\ komprimiert]} {
+											>
+												if {[S string 464 0 {} {} eq Neustart\ mit\ Strg+Alt+Entf\r]} {
+													>
+														emit {\b, Microsoft Windows XP Bootloader NTFS (german)}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 313 0 {} {} eq A\ disk\ read\ error\ occurred.\r]} {
+					>
+						if {[S string 345 0 {} {} eq A\ kernel\ file\ is\ missing\040]} {
+							>
+								if {[S string 370 0 {} {} eq from\ the\ disk.\r]} {
+									>
+										if {[S string 484 0 {} {} eq NTLDR\ is\ compressed]} {
+											>
+												if {[S string 429 0 {} {} eq Insert\ a\ system\ diskette\040]} {
+													>
+														if {[S string 454 0 {} {} eq and\ restart\r\nthe\ system.\r]} {
+															>
+																emit {\b, Microsoft Windows XP Bootloader NTFS}
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[N ubyte 472 0 0 & 223 > 0]} {
+					>
+						if {[S string 389 0 {} {} eq Invalid\ system\ disk\xFF\r\n]} {
+							>
+								if {[S string 411 0 {} {} eq Disk\ I/O\ error]} {
+									>
+										if {[S string 428 0 {} {} eq Replace\ the\ disk,\ and\040]} {
+											>
+												if {[S string 455 0 {} {} eq press\ any\ key]} {
+													>
+														emit {\b, Microsoft Windows 98 Bootloader}
+														if {[N ubyte 472 0 0 & 223 > 0]} {
+															>
+																if {[S string 472 0 {} {} x {}]} {
+																	>
+																		emit {\b %-.2s}
+																		if {[N ubyte 474 0 0 & 223 > 0]} {
+																			>
+																				if {[S string 474 0 {} {} x {}]} {
+																					>
+																						emit {\b%-.5s}
+																						if {[N ubyte 479 0 0 & 223 > 0]} {
+																							>
+																								if {[S string 479 0 {} {} x {}]} {
+																									>
+																										emit {\b%-.1s}
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+																if {[N ubyte 480 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 480 0 {} {} x {}]} {
+																			>
+																				emit {\b.%-.3s}
+																			<
+																		}
+	
+																	<
+																}
+	
+																if {[N ubyte 483 0 0 & 223 > 0]} {
+																	>
+																		emit {\b+}
+																		if {[S string 483 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.5s}
+																				if {[N ubyte 488 0 0 & 223 > 0]} {
+																					>
+																						if {[S string 488 0 {} {} x {}]} {
+																							>
+																								emit {\b%-.3s}
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																		if {[N ubyte 491 0 0 & 223 > 0]} {
+																			>
+																				if {[S string 491 0 {} {} x {}]} {
+																					>
+																						emit {\b.%-.3s}
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+						if {[S string 390 0 {} {} eq Invalid\ system\ disk\xFF\r\n]} {
+							>
+								if {[S string 412 0 {} {} eq Disk\ I/O\ error\xFF\r\n]} {
+									>
+										if {[S string 429 0 {} {} eq Replace\ the\ disk,\ and\040]} {
+											>
+												if {[S string 451 0 {} {} eq then\ press\ any\ key\r]} {
+													>
+														emit {\b, Microsoft Windows 98 Bootloader}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+						if {[S string 388 0 {} {} eq Ungueltiges\ System\ \xFF\r\n]} {
+							>
+								if {[S string 410 0 {} {} eq E/A-Fehler\ \ \ \ \xFF\r\n]} {
+									>
+										if {[S string 427 0 {} {} eq Datentraeger\ wechseln\ und\040]} {
+											>
+												if {[S string 453 0 {} {} eq Taste\ druecken\r]} {
+													>
+														emit {\b, Microsoft Windows 95/98/ME Bootloader (german)}
+														if {[N ubyte 497 0 0 & 223 > 0]} {
+															>
+																if {[S string 497 0 {} {} x {}]} {
+																	>
+																		emit %-.5s
+																		if {[N ubyte 502 0 0 & 223 > 0]} {
+																			>
+																				if {[S string 502 0 {} {} x {}]} {
+																					>
+																						emit {\b%-.1s}
+																						if {[N ubyte 503 0 0 & 223 > 0]} {
+																							>
+																								if {[S string 503 0 {} {} x {}]} {
+																									>
+																										emit {\b%-.1s}
+																										if {[N ubyte 504 0 0 & 223 > 0]} {
+																											>
+																												if {[S string 504 0 {} {} x {}]} {
+																													>
+																														emit {\b%-.1s}
+																													<
+																												}
+	
+																											<
+																										}
+	
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte 505 0 0 & 223 > 0]} {
+															>
+																if {[S string 505 0 {} {} x {}]} {
+																	>
+																		emit {\b.%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte 472 0 0 & 223 > 0]} {
+															>
+																emit or
+																if {[S string 472 0 {} {} x {}]} {
+																	>
+																		emit {\b %-.2s}
+																		if {[N ubyte 474 0 0 & 223 > 0]} {
+																			>
+																				if {[S string 474 0 {} {} x {}]} {
+																					>
+																						emit {\b%-.5s}
+																						if {[N ubyte 479 0 0 & 223 > 0]} {
+																							>
+																								if {[S string 479 0 {} {} x {}]} {
+																									>
+																										emit {\b%-.1s}
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+																if {[N ubyte 480 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 480 0 {} {} x {}]} {
+																			>
+																				emit {\b.%-.3s}
+																			<
+																		}
+	
+																	<
+																}
+	
+																if {[N ubyte 483 0 0 & 223 > 0]} {
+																	>
+																		emit {\b+}
+																		if {[S string 483 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.5s}
+																				if {[N ubyte 488 0 0 & 223 > 0]} {
+																					>
+																						if {[S string 488 0 {} {} x {}]} {
+																							>
+																								emit {\b%-.3s}
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																		if {[N ubyte 491 0 0 & 223 > 0]} {
+																			>
+																				if {[S string 491 0 {} {} x {}]} {
+																					>
+																						emit {\b.%-.3s}
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+						if {[S string 390 0 {} {} eq Ungueltiges\ System\ \xFF\r\n]} {
+							>
+								if {[S string 412 0 {} {} eq E/A-Fehler\ \ \ \ \xFF\r\n]} {
+									>
+										if {[S string 429 0 {} {} eq Datentraeger\ wechseln\ und\040]} {
+											>
+												if {[S string 455 0 {} {} eq Taste\ druecken\r]} {
+													>
+														emit {\b, Microsoft Windows 95/98/ME Bootloader (German)}
+														if {[N ubyte 497 0 0 & 223 > 0]} {
+															>
+																if {[S string 497 0 {} {} x {}]} {
+																	>
+																		emit %-.7s
+																		if {[N ubyte 504 0 0 & 223 > 0]} {
+																			>
+																				if {[S string 504 0 {} {} x {}]} {
+																					>
+																						emit {\b%-.1s}
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte 505 0 0 & 223 > 0]} {
+															>
+																if {[S string 505 0 {} {} x {}]} {
+																	>
+																		emit {\b.%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte 472 0 0 & 223 > 0]} {
+															>
+																emit or
+																if {[S string 472 0 {} {} x {}]} {
+																	>
+																		emit {\b %-.2s}
+																		if {[N ubyte 474 0 0 & 223 > 0]} {
+																			>
+																				if {[S string 474 0 {} {} x {}]} {
+																					>
+																						emit {\b%-.6s}
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+																if {[N ubyte 480 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 480 0 {} {} x {}]} {
+																			>
+																				emit {\b.%-.3s}
+																			<
+																		}
+	
+																	<
+																}
+	
+																if {[N ubyte 483 0 0 & 223 > 0]} {
+																	>
+																		emit {\b+}
+																		if {[S string 483 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.5s}
+																				if {[N ubyte 488 0 0 & 223 > 0]} {
+																					>
+																						if {[S string 488 0 {} {} x {}]} {
+																							>
+																								emit {\b%-.3s}
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																		if {[N ubyte 491 0 0 & 223 > 0]} {
+																			>
+																				if {[S string 491 0 {} {} x {}]} {
+																					>
+																						emit {\b.%-.3s}
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+						if {[S string 389 0 {} {} eq Ungueltiges\ System\ \xFF\r\n]} {
+							>
+								if {[S string 411 0 {} {} eq E/A-Fehler\ \ \ \ \xFF\r\n]} {
+									>
+										if {[S string 428 0 {} {} eq Datentraeger\ wechseln\ und\040]} {
+											>
+												if {[S string 454 0 {} {} eq Taste\ druecken\r]} {
+													>
+														emit {\b, Microsoft Windows 95/98/ME Bootloader (GERMAN)}
+														if {[S string 472 0 {} {} x {}]} {
+															>
+																emit %-.2s
+																if {[N ubyte 474 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 474 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.5s}
+																			<
+																		}
+	
+																		if {[N ubyte 479 0 0 & 223 > 0]} {
+																			>
+																				if {[S string 479 0 {} {} x {}]} {
+																					>
+																						emit {\b%-.1s}
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte 480 0 0 & 223 > 0]} {
+															>
+																if {[S string 480 0 {} {} x {}]} {
+																	>
+																		emit {\b.%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte 483 0 0 & 223 > 0]} {
+															>
+																emit {\b+}
+																if {[S string 483 0 {} {} x {}]} {
+																	>
+																		emit {\b%-.5s}
+																	<
+																}
+	
+																if {[N ubyte 488 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 488 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.2s}
+																			<
+																		}
+	
+																		if {[N ubyte 490 0 0 & 223 > 0]} {
+																			>
+																				if {[S string 490 0 {} {} x {}]} {
+																					>
+																						emit {\b%-.1s}
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+																if {[N ubyte 491 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 491 0 {} {} x {}]} {
+																			>
+																				emit {\b.%-.3s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[N ubyte 479 0 0 & 223 > 0]} {
+					>
+						if {[S string 416 0 {} {} eq Kein\ System\ oder\040]} {
+							>
+								if {[S string 433 0 {} {} eq Laufwerksfehler]} {
+									>
+										if {[S string 450 0 {} {} eq Wechseln\ und\ Taste\ dr\201cken]} {
+											>
+												emit {\b, Microsoft DOS Bootloader (german)}
+												if {[S string 479 0 {} {} x {}]} {
+													>
+														emit {\b %-.2s}
+														if {[N ubyte 481 0 0 & 223 > 0]} {
+															>
+																if {[S string 481 0 {} {} x {}]} {
+																	>
+																		emit {\b%-.6s}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+												if {[N ubyte 487 0 0 & 223 > 0]} {
+													>
+														if {[S string 487 0 {} {} x {}]} {
+															>
+																emit {\b.%-.3s}
+															<
+														}
+	
+														if {[N ubyte 490 0 0 & 223 > 0]} {
+															>
+																emit {\b+}
+																if {[S string 490 0 {} {} x {}]} {
+																	>
+																		emit {\b%-.5s}
+																		if {[N ubyte 495 0 0 & 223 > 0]} {
+																			>
+																				if {[S string 495 0 {} {} x {}]} {
+																					>
+																						emit {\b%-.3s}
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+																if {[N ubyte 498 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 498 0 {} {} x {}]} {
+																			>
+																				emit {\b.%-.3s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S search 376 0 {} 41 eq Non-System\ disk\ or\040]} {
+					>
+						if {[S search 395 0 {} 41 eq disk\ error\r]} {
+							>
+								if {[S search 407 0 {} 41 eq Replace\ and\040]} {
+									>
+										if {[S search 419 0 {} 41 eq press\ ]} {
+											>
+												emit {\b,}
+											<
+										}
+	
+										if {[S search 419 0 {} 41 eq strike\ ]} {
+											>
+												emit {\b, old}
+											<
+										}
+	
+										if {[S search 426 0 {} 41 eq any\ key\ when\ ready\r]} {
+											>
+												emit {MS or PC-DOS bootloader}
+												if {[S search 468 0 {} 18 eq \0]} {
+													>
+														if {[S string [R 0] 0 {} {} x {}]} {
+															>
+																emit {\b %-.2s}
+																if {[N ubyte [R -20] 0 0 & 223 > 0]} {
+																	>
+																		if {[S string [R -1] 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.4s}
+																				if {[N ubyte [R -16] 0 0 & 223 > 0]} {
+																					>
+																						if {[S string [R -1] 0 {} {} x {}]} {
+																							>
+																								emit {\b%-.2s}
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte [R 8] 0 0 & 223 > 0]} {
+															>
+																emit {\b.}
+																if {[S string [R -1] 0 {} {} x {}]} {
+																	>
+																		emit {\b%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte [R 11] 0 0 & 223 > 0]} {
+															>
+																emit {\b+}
+																if {[S string [R -1] 0 {} {} x {}]} {
+																	>
+																		emit {\b%-.5s}
+																		if {[N ubyte [R -6] 0 0 & 223 > 0]} {
+																			>
+																				if {[S string [R -1] 0 {} {} x {}]} {
+																					>
+																						emit {\b%-.1s}
+																						if {[N ubyte [R -5] 0 0 & 223 > 0]} {
+																							>
+																								if {[S string [R -1] 0 {} {} x {}]} {
+																									>
+																										emit {\b%-.2s}
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+																if {[N ubyte [R 7] 0 0 & 223 > 0]} {
+																	>
+																		emit {\b.}
+																		if {[S string [R -1] 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.3s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 441 0 {} {} eq Cannot\ load\ from\ harddisk.\n\r]} {
+					>
+						if {[S string 469 0 {} {} eq Insert\ Systemdisk\040]} {
+							>
+								if {[S string 487 0 {} {} eq and\ press\ any\ key.\n\r]} {
+									>
+										emit {\b, MS (2.11) DOS bootloader}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 54 0 {} {} eq SYS]} {
+					>
+						if {[S string 324 0 {} {} eq VASKK]} {
+							>
+								if {[S string 495 0 {} {} eq NEWLDR\0]} {
+									>
+										emit {\b, DR-DOS Bootloader (LOADER.SYS)}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 98 0 {} {} eq Press\ a\ key\ to\ retry\0\r]} {
+					>
+						if {[S string 120 0 {} {} eq Cannot\ find\ file\ \0\r]} {
+							>
+								if {[S string 139 0 {} {} eq Disk\ read\ error\0\r]} {
+									>
+										if {[S string 156 0 {} {} eq Loading\ ...\0]} {
+											>
+												emit {\b, DR-DOS (3.41) Bootloader}
+												if {[N ubyte 44 0 0 & 223 > 0]} {
+													>
+														if {[S string 44 0 {} {} x {}]} {
+															>
+																emit {\b %-.6s}
+																if {[N ubyte 50 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 50 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.2s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+														if {[N ubyte 52 0 0 & 223 > 0]} {
+															>
+																if {[S string 52 0 {} {} x {}]} {
+																	>
+																		emit {\b.%-.3s}
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 70 0 {} {} eq IBMBIO\ \ COM]} {
+					>
+						if {[S string 472 0 {} {} eq Cannot\ load\ DOS!\040]} {
+							>
+								if {[S string 489 0 {} {} eq Any\ key\ to\ retry]} {
+									>
+										emit {\b, DR-DOS Bootloader}
+									<
+								}
+	
+							<
+						}
+	
+						if {[S string 471 0 {} {} eq Cannot\ load\ DOS\040]} {
+							>
+							<
+						}
+	
+						if {[S string 487 0 {} {} eq press\ key\ to\ retry]} {
+							>
+								emit {\b, Open-DOS Bootloader}
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 444 0 {} {} eq KERNEL\ \ SYS]} {
+					>
+						if {[S string 314 0 {} {} eq BOOT\ error!]} {
+							>
+								emit {\b, FREE-DOS Bootloader}
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 499 0 {} {} eq KERNEL\ \ SYS]} {
+					>
+						if {[S string 305 0 {} {} eq BOOT\ err!\0]} {
+							>
+								emit {\b, Free-DOS Bootloader}
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 449 0 {} {} eq KERNEL\ \ SYS]} {
+					>
+						if {[S string 319 0 {} {} eq BOOT\ error!]} {
+							>
+								emit {\b, FREE-DOS 0.5 Bootloader}
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 449 0 {} {} eq Loading\ FreeDOS]} {
+					>
+						if {[N ulelong 431 0 0 {} {} > 0]} {
+							>
+								emit {\b, FREE-DOS 0.95,1.0 Bootloader}
+								if {[N ubyte 497 0 0 & 223 > 0]} {
+									>
+										if {[S string 497 0 {} {} x {}]} {
+											>
+												emit {\b %-.6s}
+												if {[N ubyte 503 0 0 & 223 > 0]} {
+													>
+														if {[S string 503 0 {} {} x {}]} {
+															>
+																emit {\b%-.1s}
+																if {[N ubyte 504 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 504 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.1s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+										if {[N ubyte 505 0 0 & 223 > 0]} {
+											>
+												if {[S string 505 0 {} {} x {}]} {
+													>
+														emit {\b.%-.3s}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 331 0 {} {} eq Error!.0]} {
+					>
+						emit {\b, FREE-DOS 1.0 bootloader}
+					<
+				}
+	
+				if {[S string 125 0 {} {} eq Loading\ FreeDOS...\r]} {
+					>
+						if {[S string 311 0 {} {} eq BOOT\ error!\r]} {
+							>
+								emit {\b, FREE-DOS bootloader}
+								if {[N ubyte 441 0 0 & 223 > 0]} {
+									>
+										if {[S string 441 0 {} {} x {}]} {
+											>
+												emit {\b %-.6s}
+												if {[N ubyte 447 0 0 & 223 > 0]} {
+													>
+														if {[S string 447 0 {} {} x {}]} {
+															>
+																emit {\b%-.1s}
+																if {[N ubyte 448 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 448 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.1s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+										if {[N ubyte 449 0 0 & 223 > 0]} {
+											>
+												if {[S string 449 0 {} {} x {}]} {
+													>
+														emit {\b.%-.3s}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 124 0 {} {} eq FreeDOS\0]} {
+					>
+						if {[S string 331 0 {} {} eq \ err\0]} {
+							>
+								emit {\b, FREE-DOS BETa 0.9 Bootloader}
+								if {[N ubyte 497 0 0 & 223 > 0]} {
+									>
+										if {[S string 497 0 {} {} x {}]} {
+											>
+												emit {\b %-.6s}
+												if {[N ubyte 503 0 0 & 223 > 0]} {
+													>
+														if {[S string 503 0 {} {} x {}]} {
+															>
+																emit {\b%-.1s}
+																if {[N ubyte 504 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 504 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.1s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+										if {[N ubyte 505 0 0 & 223 > 0]} {
+											>
+												if {[S string 505 0 {} {} x {}]} {
+													>
+														emit {\b.%-.3s}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+						if {[S string 333 0 {} {} eq \ err\0]} {
+							>
+								emit {\b, FREE-DOS BEta 0.9 Bootloader}
+								if {[N ubyte 497 0 0 & 223 > 0]} {
+									>
+										if {[S string 497 0 {} {} x {}]} {
+											>
+												emit {\b %-.6s}
+												if {[N ubyte 503 0 0 & 223 > 0]} {
+													>
+														if {[S string 503 0 {} {} x {}]} {
+															>
+																emit {\b%-.1s}
+																if {[N ubyte 504 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 504 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.1s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+										if {[N ubyte 505 0 0 & 223 > 0]} {
+											>
+												if {[S string 505 0 {} {} x {}]} {
+													>
+														emit {\b.%-.3s}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+						if {[S string 334 0 {} {} eq \ err\0]} {
+							>
+								emit {\b, FREE-DOS Beta 0.9 Bootloader}
+								if {[N ubyte 497 0 0 & 223 > 0]} {
+									>
+										if {[S string 497 0 {} {} x {}]} {
+											>
+												emit {\b %-.6s}
+												if {[N ubyte 503 0 0 & 223 > 0]} {
+													>
+														if {[S string 503 0 {} {} x {}]} {
+															>
+																emit {\b%-.1s}
+																if {[N ubyte 504 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 504 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.1s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+										if {[N ubyte 505 0 0 & 223 > 0]} {
+											>
+												if {[S string 505 0 {} {} x {}]} {
+													>
+														emit {\b.%-.3s}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 336 0 {} {} eq Error!\040]} {
+					>
+						if {[S string 343 0 {} {} eq Hit\ a\ key\ to\ reboot.]} {
+							>
+								emit {\b, FREE-DOS Beta 0.9sr1 Bootloader}
+								if {[N ubyte 497 0 0 & 223 > 0]} {
+									>
+										if {[S string 497 0 {} {} x {}]} {
+											>
+												emit {\b %-.6s}
+												if {[N ubyte 503 0 0 & 223 > 0]} {
+													>
+														if {[S string 503 0 {} {} x {}]} {
+															>
+																emit {\b%-.1s}
+																if {[N ubyte 504 0 0 & 223 > 0]} {
+																	>
+																		if {[S string 504 0 {} {} x {}]} {
+																			>
+																				emit {\b%-.1s}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+										if {[N ubyte 505 0 0 & 223 > 0]} {
+											>
+												if {[S string 505 0 {} {} x {}]} {
+													>
+														emit {\b.%-.3s}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[N ulelong 478 0 0 {} {} == 0]} {
+					>
+						if {[S string [I 1 ubyte 0 + 0 326] 0 {} {} eq I/O\ Error\ reading\040]} {
+							>
+								if {[S string [I 1 ubyte 0 + 0 344] 0 {} {} eq Visopsys\ loader\r]} {
+									>
+										if {[S string [I 1 ubyte 0 + 0 361] 0 {} {} eq Press\ any\ key\ to\ continue.\r]} {
+											>
+												emit {\b, Visopsys loader}
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[N ubyte 494 0 0 {} {} > 77]} {
+					>
+						if {[S string 495 0 {} {} > E]} {
+							>
+								if {[S string 495 0 {} {} < S]} {
+									>
+										if {[S string 3 0 {} {} eq BootProg]} {
+											>
+											<
+										}
+	
+										if {[N ubyte 499 0 0 & 223 > 0]} {
+											>
+												emit {\b, COM/EXE Bootloader}
+												U 79 DOS-filename 499
+	
+												if {[S string 492 0 {} {} eq RENF]} {
+													>
+														emit {\b, FAT (12 bit)}
+													<
+												}
+	
+												if {[S string 495 0 {} {} eq RENF]} {
+													>
+														emit {\b, FAT (16 bit)}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[S string 0 0 {} {} eq RRaA]} {
+					>
+						if {[S string 484 0 {} {} eq rrAa]} {
+							>
+								emit {\b, FSInfosector}
+								if {[N ulelong 488 0 0 {} {} < 4294967295]} {
+									>
+										emit {\b, %u free clusters}
+									<
+								}
+	
+								if {[N ulelong 492 0 0 {} {} < 4294967295]} {
+									>
+										emit {\b, last allocated cluster %u}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[N ubyte 3 0 0 {} {} == 0]} {
+					>
+						if {[N ubyte 446 0 0 {} {} == 0]} {
+							>
+								if {[N ubyte 450 0 0 {} {} > 0]} {
+									>
+										if {[N ubyte 482 0 0 {} {} == 0]} {
+											>
+												if {[N ubyte 498 0 0 {} {} == 0]} {
+													>
+														if {[N ubyte 466 0 0 {} {} < 16]} {
+															>
+																switch [Nv ubyte 466 0 {} {}] {
+																	0 {
+																		>
+																			emit {\b, extended partition table (last)}
+																		<
+																	}
+																	5 {
+																		>
+																			emit {\b, extended partition table}
+																		<
+																	}
+																	15 {
+																		>
+																			emit {\b, extended partition table (LBA)}
+																		<
+																	}
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+				if {[N lelong 512 0 0 {} {} == -2108275369]} {
+					>
+						emit {\b, BSD disklabel}
+					<
+				}
+	
+			<
+			>
+				if {[S string 3 0 {} {} ne MS]} {
+					>
+						if {[S string 3 0 {} {} ne SYSLINUX]} {
+							>
+								if {[S string 3 0 {} {} ne MTOOL]} {
+									>
+										if {[S string 3 0 {} {} ne NEWLDR]} {
+											>
+												if {[S string 5 0 {} {} ne DOS]} {
+													>
+														if {[S string 82 0 {} {} ne FAT32]} {
+															>
+																if {[S string 514 0 {} {} ne HdrS]} {
+																	>
+																		if {[S string 422 0 {} {} ne Be\ Boot\ Loader]} {
+																			>
+																				if {[N ubyte 450 0 0 {} {} == 238]} {
+																					>
+																						if {[N ubyte 466 0 0 {} {} != 238]} {
+																							>
+																								if {[N ubyte 482 0 0 {} {} != 238]} {
+																									>
+																										if {[N ubyte 498 0 0 {} {} != 238]} {
+																											>
+																												if {[S string [I 454 ulelong 0 * 0 8192] 0 {} {} eq EFI\ PART]} {
+																													>
+																														emit {GPT partition table}
+																														U 98 gpt-mbr-type 0
+	
+																														U 98 gpt-table [R -8]
+	
+																														if {[N ubyte 0 0 0 {} {} x {}]} {
+																															>
+																																emit {of 8192 bytes}
+																															<
+																														}
+	
+																													<
+																												}
+	
+																												if {[S string [I 454 ulelong 0 * 0 8192] 0 {} {} ne EFI\ PART]} {
+																													>
+																														if {[S string [I 454 ulelong 0 * 0 4096] 0 {} {} eq EFI\ PART]} {
+																															>
+																																emit {GPT partition table}
+																																U 98 gpt-mbr-type 0
+	
+																																U 98 gpt-table [R -8]
+	
+																																if {[N ubyte 0 0 0 {} {} x {}]} {
+																																	>
+																																		emit {of 4096 bytes}
+																																	<
+																																}
+	
+																															<
+																														}
+	
+																														if {[S string [I 454 ulelong 0 * 0 4096] 0 {} {} ne EFI\ PART]} {
+																															>
+																																if {[S string [I 454 ulelong 0 * 0 2048] 0 {} {} eq EFI\ PART]} {
+																																	>
+																																		emit {GPT partition table}
+																																		U 98 gpt-mbr-type 0
+	
+																																		U 98 gpt-table [R -8]
+	
+																																		if {[N ubyte 0 0 0 {} {} x {}]} {
+																																			>
+																																				emit {of 2048 bytes}
+																																			<
+																																		}
+	
+																																	<
+																																}
+	
+																																if {[S string [I 454 ulelong 0 * 0 2048] 0 {} {} ne EFI\ PART]} {
+																																	>
+																																		if {[S string [I 454 ulelong 0 * 0 1024] 0 {} {} eq EFI\ PART]} {
+																																			>
+																																				emit {GPT partition table}
+																																				U 98 gpt-mbr-type 0
+	
+																																				U 98 gpt-table [R -8]
+	
+																																				if {[N ubyte 0 0 0 {} {} x {}]} {
+																																					>
+																																						emit {of 1024 bytes}
+																																					<
+																																				}
+	
+																																			<
+																																		}
+	
+																																		if {[S string [I 454 ulelong 0 * 0 1024] 0 {} {} ne EFI\ PART]} {
+																																			>
+																																				if {[S string [I 454 ulelong 0 * 0 512] 0 {} {} eq EFI\ PART]} {
+																																					>
+																																						emit {GPT partition table}
+																																						U 98 gpt-mbr-type 0
+	
+																																						U 98 gpt-table [R -8]
+	
+																																						if {[N ubyte 0 0 0 {} {} x {}]} {
+																																							>
+																																								emit {of 512 bytes}
+																																							<
+																																						}
+	
+																																					<
+																																				}
+	
+																																			<
+																																		}
+	
+																																	<
+																																}
+	
+																															<
+																														}
+	
+																													<
+																												}
+	
+																											<
+																										}
+	
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																				if {[N ubyte 450 0 0 {} {} != 238]} {
+																					>
+																						if {[N ubyte 466 0 0 {} {} == 238]} {
+																							>
+																								if {[N ubyte 482 0 0 {} {} != 238]} {
+																									>
+																										if {[N ubyte 498 0 0 {} {} != 238]} {
+																											>
+																												if {[S string [I 470 ulelong 0 * 0 8192] 0 {} {} eq EFI\ PART]} {
+																													>
+																														emit {GPT partition table}
+																														U 98 gpt-mbr-type 0
+	
+																														U 98 gpt-table [R -8]
+	
+																														if {[N ubyte 0 0 0 {} {} x {}]} {
+																															>
+																																emit {of 8192 bytes}
+																															<
+																														}
+	
+																													<
+																												}
+	
+																												if {[S string [I 470 ulelong 0 * 0 8192] 0 {} {} ne EFI\ PART]} {
+																													>
+																														if {[S string [I 470 ulelong 0 * 0 4096] 0 {} {} eq EFI\ PART]} {
+																															>
+																																emit {GPT partition table}
+																																U 98 gpt-mbr-type 0
+	
+																																U 98 gpt-table [R -8]
+	
+																																if {[N ubyte 0 0 0 {} {} x {}]} {
+																																	>
+																																		emit {of 4096 bytes}
+																																	<
+																																}
+	
+																															<
+																														}
+	
+																														if {[S string [I 470 ulelong 0 * 0 4096] 0 {} {} ne EFI\ PART]} {
+																															>
+																																if {[S string [I 470 ulelong 0 * 0 2048] 0 {} {} eq EFI\ PART]} {
+																																	>
+																																		emit {GPT partition table}
+																																		U 98 gpt-mbr-type 0
+	
+																																		U 98 gpt-table [R -8]
+	
+																																		if {[N ubyte 0 0 0 {} {} x {}]} {
+																																			>
+																																				emit {of 2048 bytes}
+																																			<
+																																		}
+	
+																																	<
+																																}
+	
+																																if {[S string [I 470 ulelong 0 * 0 2048] 0 {} {} ne EFI\ PART]} {
+																																	>
+																																		if {[S string [I 470 ulelong 0 * 0 1024] 0 {} {} eq EFI\ PART]} {
+																																			>
+																																				emit {GPT partition table}
+																																				U 98 gpt-mbr-type 0
+	
+																																				U 98 gpt-table [R -8]
+	
+																																				if {[N ubyte 0 0 0 {} {} x {}]} {
+																																					>
+																																						emit {of 1024 bytes}
+																																					<
+																																				}
+	
+																																			<
+																																		}
+	
+																																		if {[S string [I 470 ulelong 0 * 0 1024] 0 {} {} ne EFI\ PART]} {
+																																			>
+																																				if {[S string [I 470 ulelong 0 * 0 512] 0 {} {} eq EFI\ PART]} {
+																																					>
+																																						emit {GPT partition table}
+																																						U 98 gpt-mbr-type 0
+	
+																																						U 98 gpt-table [R -8]
+	
+																																						if {[N ubyte 0 0 0 {} {} x {}]} {
+																																							>
+																																								emit {of 512 bytes}
+																																							<
+																																						}
+	
+																																					<
+																																				}
+	
+																																			<
+																																		}
+	
+																																	<
+																																}
+	
+																															<
+																														}
+	
+																													<
+																												}
+	
+																											<
+																										}
+	
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																				if {[N ubyte 450 0 0 {} {} != 238]} {
+																					>
+																						if {[N ubyte 466 0 0 {} {} != 238]} {
+																							>
+																								if {[N ubyte 482 0 0 {} {} == 238]} {
+																									>
+																										if {[N ubyte 498 0 0 {} {} != 238]} {
+																											>
+																												if {[S string [I 486 ulelong 0 * 0 8192] 0 {} {} eq EFI\ PART]} {
+																													>
+																														emit {GPT partition table}
+																														U 98 gpt-mbr-type 0
+	
+																														U 98 gpt-table [R -8]
+	
+																														if {[N ubyte 0 0 0 {} {} x {}]} {
+																															>
+																																emit {of 8192 bytes}
+																															<
+																														}
+	
+																													<
+																												}
+	
+																												if {[S string [I 486 ulelong 0 * 0 8192] 0 {} {} ne EFI\ PART]} {
+																													>
+																														if {[S string [I 486 ulelong 0 * 0 4096] 0 {} {} eq EFI\ PART]} {
+																															>
+																																emit {GPT partition table}
+																																U 98 gpt-mbr-type 0
+	
+																																U 98 gpt-table [R -8]
+	
+																																if {[N ubyte 0 0 0 {} {} x {}]} {
+																																	>
+																																		emit {of 4096 bytes}
+																																	<
+																																}
+	
+																															<
+																														}
+	
+																														if {[S string [I 486 ulelong 0 * 0 4096] 0 {} {} ne EFI\ PART]} {
+																															>
+																																if {[S string [I 486 ulelong 0 * 0 2048] 0 {} {} eq EFI\ PART]} {
+																																	>
+																																		emit {GPT partition table}
+																																		U 98 gpt-mbr-type 0
+	
+																																		U 98 gpt-table [R -8]
+	
+																																		if {[N ubyte 0 0 0 {} {} x {}]} {
+																																			>
+																																				emit {of 2048 bytes}
+																																			<
+																																		}
+	
+																																	<
+																																}
+	
+																																if {[S string [I 486 ulelong 0 * 0 2048] 0 {} {} ne EFI\ PART]} {
+																																	>
+																																		if {[S string [I 486 ulelong 0 * 0 1024] 0 {} {} eq EFI\ PART]} {
+																																			>
+																																				emit {GPT partition table}
+																																				U 98 gpt-mbr-type 0
+	
+																																				U 98 gpt-table [R -8]
+	
+																																				if {[N ubyte 0 0 0 {} {} x {}]} {
+																																					>
+																																						emit {of 1024 bytes}
+																																					<
+																																				}
+	
+																																			<
+																																		}
+	
+																																		if {[S string [I 486 ulelong 0 * 0 1024] 0 {} {} ne EFI\ PART]} {
+																																			>
+																																				if {[S string [I 486 ulelong 0 * 0 512] 0 {} {} eq EFI\ PART]} {
+																																					>
+																																						emit {GPT partition table}
+																																						U 98 gpt-mbr-type 0
+	
+																																						U 98 gpt-table [R -8]
+	
+																																						if {[N ubyte 0 0 0 {} {} x {}]} {
+																																							>
+																																								emit {of 512 bytes}
+																																							<
+																																						}
+	
+																																					<
+																																				}
+	
+																																			<
+																																		}
+	
+																																	<
+																																}
+	
+																															<
+																														}
+	
+																													<
+																												}
+	
+																											<
+																										}
+	
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																				if {[N ubyte 450 0 0 {} {} != 238]} {
+																					>
+																						if {[N ubyte 466 0 0 {} {} != 238]} {
+																							>
+																								if {[N ubyte 482 0 0 {} {} != 238]} {
+																									>
+																										if {[N ubyte 498 0 0 {} {} == 238]} {
+																											>
+																												if {[S string [I 502 ulelong 0 * 0 8192] 0 {} {} eq EFI\ PART]} {
+																													>
+																														emit {GPT partition table}
+																														U 98 gpt-mbr-type 0
+	
+																														U 98 gpt-table [R -8]
+	
+																														if {[N ubyte 0 0 0 {} {} x {}]} {
+																															>
+																																emit {of 8192 bytes}
+																															<
+																														}
+	
+																													<
+																												}
+	
+																												if {[S string [I 502 ulelong 0 * 0 8192] 0 {} {} ne EFI\ PART]} {
+																													>
+																														if {[S string [I 502 ulelong 0 * 0 4096] 0 {} {} eq EFI\ PART]} {
+																															>
+																																emit {GPT partition table}
+																																U 98 gpt-mbr-type 0
+	
+																																U 98 gpt-table [R -8]
+	
+																																if {[N ubyte 0 0 0 {} {} x {}]} {
+																																	>
+																																		emit {of 4096 bytes}
+																																	<
+																																}
+	
+																															<
+																														}
+	
+																														if {[S string [I 502 ulelong 0 * 0 4096] 0 {} {} ne EFI\ PART]} {
+																															>
+																																if {[S string [I 502 ulelong 0 * 0 2048] 0 {} {} eq EFI\ PART]} {
+																																	>
+																																		emit {GPT partition table}
+																																		U 98 gpt-mbr-type 0
+	
+																																		U 98 gpt-table [R -8]
+	
+																																		if {[N ubyte 0 0 0 {} {} x {}]} {
+																																			>
+																																				emit {of 2048 bytes}
+																																			<
+																																		}
+	
+																																	<
+																																}
+	
+																																if {[S string [I 502 ulelong 0 * 0 2048] 0 {} {} ne EFI\ PART]} {
+																																	>
+																																		if {[S string [I 502 ulelong 0 * 0 1024] 0 {} {} eq EFI\ PART]} {
+																																			>
+																																				emit {GPT partition table}
+																																				U 98 gpt-mbr-type 0
+	
+																																				U 98 gpt-table [R -8]
+	
+																																				if {[N ubyte 0 0 0 {} {} x {}]} {
+																																					>
+																																						emit {of 1024 bytes}
+																																					<
+																																				}
+	
+																																			<
+																																		}
+	
+																																		if {[S string [I 502 ulelong 0 * 0 1024] 0 {} {} ne EFI\ PART]} {
+																																			>
+																																				if {[S string [I 502 ulelong 0 * 0 512] 0 {} {} eq EFI\ PART]} {
+																																					>
+																																						emit {GPT partition table}
+																																						U 98 gpt-mbr-type 0
+	
+																																						U 98 gpt-table [R -8]
+	
+																																						if {[N ubyte 0 0 0 {} {} x {}]} {
+																																							>
+																																								emit {of 512 bytes}
+																																							<
+																																						}
+	
+																																					<
+																																				}
+	
+																																			<
+																																		}
+	
+																																	<
+																																}
+	
+																															<
+																														}
+	
+																													<
+																												}
+	
+																											<
+																										}
+	
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq FATX]} {
+		>
+			emit {FATX filesystem data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq -rom1fs-]} {
+		>
+			emit {romfs filesystem, version 1}
+			if {[N belong 8 0 0 {} {} x {}]} {
+				>
+					emit {%d bytes,}
+				<
+			}
+	
+			if {[S string 16 0 {} {} x {}]} {
+				>
+					emit {named %s.}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 395 0 {} {} eq OS/2]} {
+		>
+			emit {OS/2 Boot Manager}
+		<
+	}
+	
+	if {[N ulequad 0 0 0 & 10416825940200975098 == 10416825940192586490]} {
+		>
+			if {[S search 631 0 {} 689 eq ISOLINUX\ ]} {
+				>
+					emit {isolinux Loader}
+					if {[S string [R 0] 0 {} {} x {}]} {
+						>
+							emit {(version %-4.4s)}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LDLINUX\ SYS\ ]} {
+		>
+			emit {SYSLINUX loader}
+			if {[S string 12 0 {} {} x {}]} {
+				>
+					emit {(older version %-4.4s)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \r\nSYSLINUX\ ]} {
+		>
+			emit {SYSLINUX loader}
+			if {[S string 11 0 {} {} x {}]} {
+				>
+					emit {(version %-4.4s)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ulelong 0 0 0 & 2156960747 == 9443563]} {
+		>
+			if {[S search 434 0 {} 47 eq Boot\ failed]} {
+				>
+					if {[S search 482 0 {} 132 eq \0LDLINUX\ SYS]} {
+						>
+							emit {Syslinux bootloader (version 2.13 or older)}
+						<
+					}
+	
+					if {[N ubyte 1 0 0 {} {} == 88]} {
+						>
+							emit {Syslinux bootloader (version 3.0-3.9)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 459 0 {} 30 eq Boot\ error\r\n\0]} {
+				>
+					if {[N ubyte 1 0 0 {} {} == 88]} {
+						>
+							emit {Syslinux bootloader (version 3.10 or newer)}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 16 0 {} 4 eq \xbf\x00\x06\xb9\x00\x01]} {
+		>
+			if {[S search 94 0 {} 249 eq Missing\ operating\ system]} {
+				>
+					if {[S search 408 0 {} 4 eq HD1/\0]} {
+						>
+						<
+					}
+	
+					if {[D 408]} {
+						>
+							if {[S search 250 0 {} 118 eq \0Operating\ system\ load]} {
+								>
+									emit {SYSLINUX MBR}
+									if {[S search 292 0 {} 98 eq error]} {
+										>
+											if {[S string [R 0] 0 {} {} eq \r]} {
+												>
+													emit {(version 3.35 or older)}
+												<
+											}
+	
+											if {[S string [R 0] 0 {} {} eq .\r]} {
+												>
+													emit {(version 3.52 or newer)}
+												<
+											}
+	
+											if {[D [R 0]]} {
+												>
+													emit {(version 3.36-3.51 )}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 368 0 {} 106 eq \0Disk\ error\ on\ boot\r\n]} {
+				>
+					emit {SYSLINUX GPT-MBR}
+					if {[S search 156 0 {} 10 eq \0Boot\ partition\ not\ found\r\n]} {
+						>
+							if {[S search 270 0 {} 10 eq \0OS\ not\ bootable\r\n]} {
+								>
+									emit {(version 3.86 or older)}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S search 174 0 {} 10 eq \0Missing\ OS\r\n]} {
+						>
+							if {[S search 189 0 {} 10 eq \0Multiple\ active\ partitions\r\n]} {
+								>
+									emit {(version 4.00 or newer)}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			strength +36
+		<
+	}
+	
+	if {[N ubequad 0 0 0 {} {} == 3585022330545405070]} {
+		>
+			if {[N uleshort 4 0 0 {} {} x {}]} {
+				>
+					if {[S search 181 0 {} 166 eq Error\ \0\r\n]} {
+						>
+							emit {NetBSD mbr}
+							if {[N ubelong 440 0 0 {} {} > 0]} {
+								>
+									emit {\b,Serial 0x%-.8x}
+								<
+							}
+	
+							if {[S search 187 0 {} 71 eq \xcd\x13\x5a\x52\x52]} {
+								>
+									emit {\b,bootselector}
+								<
+							}
+	
+							if {[S search 150 0 {} 1 eq \x66\x87\xca\x66\x01\xca\x66\x89\x16\x3a\x07\xbe\x32\x07\xb4\x42\x5a\x52\xcd\x13]} {
+								>
+									emit {\b,boot extended}
+								<
+							}
+	
+							if {[S search 304 0 {} 55 eq \xee\x80\xc2\x05\xec\xa8\x40]} {
+								>
+									emit {\b,serial IO}
+								<
+							}
+	
+							if {[S search 196 0 {} 106 eq No\ active\ partition\0]} {
+								>
+									if {[S string [R 0] 0 {} {} eq Disk\ read\ error\0]} {
+										>
+											if {[S string [R 0] 0 {} {} eq No\ operating\ system\0]} {
+												>
+													emit {\b,verbose}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+							if {[S search 125 0 {} 7 eq \x5a\x52\xb4\x08\xcd\x13]} {
+								>
+									emit {\b,CHS}
+								<
+							}
+	
+							if {[S search 164 0 {} 84 eq \xbb\xaa\x55\xb4\x41\x5a\x52\xcd\x13]} {
+								>
+									emit {\b,LBA-check}
+								<
+							}
+	
+							if {[S search 38 0 {} 21 eq \xBB\x94\x07]} {
+								>
+									if {[N ubequad [R -9] 0 0 & 13691207746446080916 == 13690943863638768532]} {
+										>
+											if {[S search 181 0 {} 166 eq Error\ \0]} {
+												>
+													if {[S string [R 3] 0 {} {} x {}]} {
+														>
+															emit {\b,"%s"}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+							U 79 partition-table 446
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubequad 0 0 0 & 16958463276293816320 == 16958462726538002432]} {
+		>
+			if {[N ubequad [I 1 ubyte 0 + 0 2] 0 0 {} {} == 18028402503091929230]} {
+				>
+					if {[S string 376 0 {} {} eq No\ operating\ system\r\n\0]} {
+						>
+							if {[S string 398 0 {} {} eq Disk\ error\r\n\0FDD\0HDD\0]} {
+								>
+									if {[S string 419 0 {} {} eq \ EBIOS\r\n\0]} {
+										>
+											emit {AdvanceMAME mbr}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ulequad 0 0 0 & 14851535477856547324 == 10232179249133924860]} {
+		>
+			if {[S string [I 444 uleshort 0 + 0 0] 0 {} {} eq NDTmbr]} {
+				>
+					if {[S string [R -14] 0 {} {} eq 1234F\0]} {
+						>
+							emit {Turton mbr (}
+							if {[N ubyte [I 444 uleshort 0 + 0 7] 0 0 {} {} x {}]} {
+								>
+									emit {\b%u<=}
+								<
+							}
+	
+							if {[N ubyte [I 444 uleshort 0 + 0 9] 0 0 {} {} x {}]} {
+								>
+									emit {\bVersion<=%u}
+								<
+							}
+	
+							if {[N ubyte [I 444 uleshort 0 + 0 8] 0 0 & 1 == 1]} {
+								>
+									emit {\b,Y2K-Fix}
+								<
+							}
+	
+							if {[N ubyte [I 444 uleshort 0 + 0 8] 0 0 & 2 == 2]} {
+								>
+									emit {\b,TestDisk}
+								<
+							}
+	
+							if {[N ubyte [I 444 uleshort 0 + 0 9] 0 0 {} {} < 2]} {
+								>
+									if {[N ubyte [I 444 uleshort 0 + 0 12] 0 0 {} {} != 18]} {
+										>
+											emit {\b,%u/18 seconds}
+										<
+									}
+	
+									if {[N ubyte [I 444 uleshort 0 + 0 13] 0 0 {} {} < 2]} {
+										>
+											emit {\b,floppy 0x%x}
+										<
+									}
+	
+									if {[N ubyte [I 444 uleshort 0 + 0 13] 0 0 {} {} > 1]} {
+										>
+											if {[N ubyte [I 444 uleshort 0 + 0 13] 0 0 {} {} != 128]} {
+												>
+													emit {\b,drive 0x%x}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ubyte [I 444 uleshort 0 + 0 9] 0 0 {} {} > 1]} {
+								>
+									if {[N uleshort [I 444 uleshort 0 + 0 12] 0 0 {} {} != 18]} {
+										>
+											emit {\b,%u/18 seconds}
+										<
+									}
+	
+									if {[N ubyte [I 444 uleshort 0 + 0 14] 0 0 {} {} < 2]} {
+										>
+											emit {\b,floppy 0x%x}
+										<
+									}
+	
+									if {[N ubyte [I 444 uleshort 0 + 0 14] 0 0 {} {} > 1]} {
+										>
+											if {[N ubyte [I 444 uleshort 0 + 0 14] 0 0 {} {} != 128]} {
+												>
+													emit {\b,drive 0x%x}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ubyte 0 0 0 {} {} x {}]} {
+								>
+									emit {\b)}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N uleshort 512 0 0 {} {} == 28906]} {
+		>
+			if {[N ubeshort 518 0 0 {} {} > 768]} {
+				>
+					if {[N ubyte 530 0 0 {} {} > 41]} {
+						>
+							if {[N ubyte 531 0 0 {} {} > 41]} {
+								>
+									if {[N ubyte 531 0 0 {} {} > 41]} {
+										>
+											emit {GRand Unified Bootloader}
+										<
+									}
+	
+									if {[N ubyte 535 0 0 {} {} == 255]} {
+										>
+											emit stage1_5
+										<
+									}
+	
+									if {[N ubyte 535 0 0 {} {} < 255]} {
+										>
+											emit stage2
+										<
+									}
+	
+									if {[N ubyte 518 0 0 {} {} x {}]} {
+										>
+											emit {\b version %u}
+										<
+									}
+	
+									if {[N ubyte 519 0 0 {} {} x {}]} {
+										>
+											emit {\b.%u}
+										<
+									}
+	
+									if {[N ulelong 520 0 0 {} {} < 16777215]} {
+										>
+											emit {\b, installed partition %u}
+										<
+									}
+	
+									if {[N ulelong 520 0 0 {} {} > 16777215]} {
+										>
+											emit {\b, installed partition %u}
+										<
+									}
+	
+									if {[N ulelong 524 0 0 & 774897664 == 774897664]} {
+										>
+											if {[N ubyte 524 0 0 {} {} x {}]} {
+												>
+													emit {\b, identifier 0x%x}
+												<
+											}
+	
+											if {[N ubyte 525 0 0 {} {} > 0]} {
+												>
+													emit {\b, LBA flag 0x%x}
+												<
+											}
+	
+											if {[S string 526 0 {} {} > \0]} {
+												>
+													emit {\b, GRUB version %-s}
+													if {[N ulong 533 0 0 {} {} == 4294967295]} {
+														>
+															if {[S string 537 0 {} {} > \0]} {
+																>
+																	emit {\b, configuration file %-s}
+																<
+															}
+	
+														<
+													}
+	
+													if {[N ulong 533 0 0 {} {} != 4294967295]} {
+														>
+															if {[S string 533 0 {} {} > \0]} {
+																>
+																	emit {\b, configuration file %-s}
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[N ulelong 524 0 0 & 774897664 != 774897664]} {
+										>
+											if {[N ulelong 524 0 0 {} {} > 0]} {
+												>
+													emit {\b, saved entry %d}
+												<
+											}
+	
+											if {[N ubyte 528 0 0 {} {} x {}]} {
+												>
+													emit {\b, identifier 0x%x}
+												<
+											}
+	
+											if {[N ubyte 529 0 0 {} {} > 0]} {
+												>
+													emit {\b, LBA flag 0x%x}
+												<
+											}
+	
+											if {[S string 530 0 {} {} > \0]} {
+												>
+													emit {\b, GRUB version %-s}
+												<
+											}
+	
+											if {[N ulong 535 0 0 {} {} == 4294967295]} {
+												>
+													if {[S string 539 0 {} {} > \0]} {
+														>
+															emit {\b, configuration file %-s}
+														<
+													}
+	
+												<
+											}
+	
+											if {[N ulong 535 0 0 {} {} != 4294967295]} {
+												>
+													if {[S string 535 0 {} {} > \0]} {
+														>
+															emit {\b, configuration file %-s}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ulelong 0 0 0 & 2151678185 == 233]} {
+		>
+			if {[N uleshort 11 0 0 & 31 == 0]} {
+				>
+					if {[N uleshort 11 0 0 {} {} < 32769]} {
+						>
+							if {[N uleshort 11 0 0 {} {} > 31]} {
+								>
+									if {[N ubyte 21 0 0 & 240 == 240]} {
+										>
+											switch [Nv ubyte 0 0 {} {}] {
+												233 {
+													>
+														if {[N uleshort 1 0 0 {} {} x {}]} {
+															>
+																emit {\b, code offset 0x%x+3}
+															<
+														}
+	
+													<
+												}
+												235 {
+													>
+														emit {DOS/MBR boot sector}
+														if {[N ubyte 1 0 0 {} {} x {}]} {
+															>
+																emit {\b, code offset 0x%x+2}
+															<
+														}
+	
+													<
+												}
+											}
+	
+											if {[S string 3 0 {} {} > \0]} {
+												>
+													emit {\b, OEM-ID "%-.8s"}
+													if {[S string 8 0 {} {} eq IHC]} {
+														>
+															emit {\b cached by Windows 9M}
+														<
+													}
+	
+												<
+											}
+	
+											if {[N uleshort 11 0 0 {} {} > 512]} {
+												>
+													emit {\b, Bytes/sector %u}
+												<
+											}
+	
+											if {[N uleshort 11 0 0 {} {} < 512]} {
+												>
+													emit {\b, Bytes/sector %u}
+												<
+											}
+	
+											if {[N ubyte 13 0 0 {} {} > 1]} {
+												>
+													emit {\b, sectors/cluster %u}
+												<
+											}
+	
+											if {[S string 82 0 c {} eq fat32]} {
+												>
+													if {[N uleshort 14 0 0 {} {} != 32]} {
+														>
+															emit {\b, reserved sectors %u}
+														<
+													}
+	
+												<
+											}
+	
+											if {[S string 82 0 c {} ne fat32]} {
+												>
+													if {[N uleshort 14 0 0 {} {} > 1]} {
+														>
+															emit {\b, reserved sectors %u}
+														<
+													}
+	
+												<
+											}
+	
+											if {[N ubyte 16 0 0 {} {} > 2]} {
+												>
+													emit {\b, FATs %u}
+												<
+											}
+	
+											switch [Nv ubyte 16 0 {} {}] {
+												0 {
+													>
+														if {[N uleshort 17 0 0 {} {} == 0]} {
+															>
+																if {[N uleshort 19 0 0 {} {} == 0]} {
+																	>
+																		if {[N uleshort 22 0 0 {} {} == 0]} {
+																			>
+																				emit {\b; NTFS}
+																				if {[N uleshort 24 0 0 {} {} > 0]} {
+																					>
+																						emit {\b, sectors/track %u}
+																					<
+																				}
+	
+																				if {[N ulelong 36 0 0 {} {} != 8388736]} {
+																					>
+																						emit {\b, physical drive 0x%x}
+																					<
+																				}
+	
+																				if {[N ulequad 40 0 0 {} {} > 0]} {
+																					>
+																						emit {\b, sectors %lld}
+																					<
+																				}
+	
+																				if {[N ulequad 48 0 0 {} {} > 0]} {
+																					>
+																						emit {\b, $MFT start cluster %lld}
+																					<
+																				}
+	
+																				if {[N ulequad 56 0 0 {} {} > 0]} {
+																					>
+																						emit {\b, $MFTMirror start cluster %lld}
+																					<
+																				}
+	
+																				if {[N lelong 64 0 0 {} {} < 256]} {
+																					>
+																						if {[N lelong 64 0 0 {} {} < 128]} {
+																							>
+																								emit {\b, clusters/RecordSegment %d}
+																							<
+																						}
+	
+																						if {[N ubyte 64 0 0 {} {} > 127]} {
+																							>
+																								emit {\b, bytes/RecordSegment 2^(-1*%i)}
+																							<
+																						}
+	
+																					<
+																				}
+	
+																				if {[N ulelong 68 0 0 {} {} < 256]} {
+																					>
+																						if {[N ulelong 68 0 0 {} {} < 128]} {
+																							>
+																								emit {\b, clusters/index block %d}
+																							<
+																						}
+	
+																						if {[N ubyte 68 0 0 {} {} > 127]} {
+																							>
+																								emit {\b, bytes/index block 2^(-1*%i)}
+																							<
+																						}
+	
+																					<
+																				}
+	
+																				if {[N ulequad 72 0 0 {} {} x {}]} {
+																					>
+																						emit {\b, serial number 0%llx}
+																					<
+																				}
+	
+																				if {[N ulelong 80 0 0 {} {} > 0]} {
+																					>
+																						emit {\b, checksum 0x%x}
+																					<
+																				}
+	
+																				if {[N ulelong 600 0 0 & 37008 == 37008]} {
+																					>
+																						emit {\b; contains}
+																						T [R -92] {}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+												1 {
+													>
+														emit {\b, FAT  %u}
+													<
+												}
+											}
+	
+											if {[N ubyte 16 0 0 {} {} > 0]} {
+												>
+												<
+											}
+	
+											if {[N uleshort 17 0 0 {} {} > 0]} {
+												>
+													emit {\b, root entries %u}
+												<
+											}
+	
+											if {[N uleshort 19 0 0 {} {} > 0]} {
+												>
+													emit {\b, sectors %u (volumes <=32 MB)}
+												<
+											}
+	
+											if {[N ubyte 21 0 0 {} {} > 240]} {
+												>
+													emit {\b, Media descriptor 0x%x}
+												<
+											}
+	
+											if {[N ubyte 21 0 0 {} {} < 240]} {
+												>
+													emit {\b, Media descriptor 0x%x}
+												<
+											}
+	
+											if {[N uleshort 22 0 0 {} {} > 0]} {
+												>
+													emit {\b, sectors/FAT %u}
+												<
+											}
+	
+											if {[N uleshort 24 0 0 {} {} x {}]} {
+												>
+													emit {\b, sectors/track %u}
+												<
+											}
+	
+											if {[N ubyte 26 0 0 {} {} > 2]} {
+												>
+													emit {\b, heads %u}
+												<
+											}
+	
+											if {[N ubyte 26 0 0 {} {} == 1]} {
+												>
+													emit {\b, heads %u}
+												<
+											}
+	
+											if {[N uleshort 11 0 0 {} {} > 32]} {
+												>
+													if {[N ubyte 38 0 0 & 86 == 0]} {
+														>
+															if {[N ulelong 28 0 0 {} {} > 0]} {
+																>
+																	emit {\b, hidden sectors %u}
+																<
+															}
+	
+															if {[N ulelong 32 0 0 {} {} > 0]} {
+																>
+																	emit {\b, sectors %u (volumes > 32 MB)}
+																<
+															}
+	
+															if {[S string 82 0 c {} ne fat32]} {
+																>
+																	if {[N ubyte 36 0 0 {} {} != 128]} {
+																		>
+																			if {[N ubyte 36 0 0 {} {} != 0]} {
+																				>
+																					emit {\b, physical drive 0x%x}
+																				<
+																			}
+	
+																		<
+																	}
+	
+																	if {[N ubyte 37 0 0 {} {} > 0]} {
+																		>
+																			emit {\b, reserved 0x%x}
+																		<
+																	}
+	
+																	if {[N ubyte 38 0 0 {} {} != 41]} {
+																		>
+																			emit {\b, dos < 4.0 BootSector (0x%x)}
+																		<
+																	}
+	
+																	if {[N ubyte 38 0 0 & 254 == 40]} {
+																		>
+																			if {[N ulelong 39 0 0 {} {} x {}]} {
+																				>
+																					emit {\b, serial number 0x%x}
+																				<
+																			}
+	
+																		<
+																	}
+	
+																	if {[N ubyte 38 0 0 {} {} == 41]} {
+																		>
+																			if {[S string 43 0 {} {} < NO\ NAME]} {
+																				>
+																					emit {\b, label: "%11.11s"}
+																				<
+																			}
+	
+																			if {[S string 43 0 {} {} > NO\ NAME]} {
+																				>
+																					emit {\b, label: "%11.11s"}
+																				<
+																			}
+	
+																			if {[S string 43 0 {} {} eq NO\ NAME]} {
+																				>
+																					emit {\b, unlabeled}
+																				<
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+											if {[S string 82 0 c {} ne fat32]} {
+												>
+													if {[S string 54 0 {} {} eq FAT12]} {
+														>
+															emit {\b, FAT (12 bit)}
+														<
+													}
+	
+													if {[S string 54 0 {} {} eq FAT16]} {
+														>
+															emit {\b, FAT (16 bit)}
+														<
+													}
+	
+													if {[D 54]} {
+														>
+															if {[N ubyte 21 0 0 {} {} < 240]} {
+																>
+																	emit {\b, FAT (12 bit by descriptor)}
+																<
+															}
+	
+															switch [Nv ubyte 21 0 {} {}] {
+																240 {
+																	>
+																		if {[N ulelong 32 0 0 {} {} > 65535]} {
+																			>
+																				emit {\b, FAT (16 bit by descriptor+sectors)}
+																			<
+																		}
+	
+																		if {[D 32]} {
+																			>
+																				emit {\b, FAT (12 bit by descriptor+sectors)}
+																			<
+																		}
+	
+																	<
+																}
+																248 {
+																	>
+																		if {[N ubequad 19 0 0 {} {} == 14988815201611612161]} {
+																			>
+																				emit {\b, FAT (12 bit by descriptor+geometry)}
+																			<
+																		}
+	
+																		if {[D 19]} {
+																			>
+																				emit {\b, FAT (1Y bit by descriptor)}
+																			<
+																		}
+	
+																	<
+																}
+																250 {
+																	>
+																		if {[N ubequad 19 0 0 {} {} == 9224209873305600001]} {
+																			>
+																				emit {\b, FAT (12 bit by descriptor+geometry)}
+																			<
+																		}
+	
+																		if {[D 19]} {
+																			>
+																				emit {\b, FAT (1Y bit by descriptor)}
+																			<
+																		}
+	
+																	<
+																}
+															}
+	
+															if {[D 21]} {
+																>
+																	emit {\b, FAT (12 bit by descriptor)}
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+											if {[S string 82 0 c {} eq fat32]} {
+												>
+													emit {\b, FAT (32 bit)}
+													if {[N ulelong 36 0 0 {} {} x {}]} {
+														>
+															emit {\b, sectors/FAT %u}
+														<
+													}
+	
+													if {[N uleshort 40 0 0 {} {} > 0]} {
+														>
+															emit {\b, extension flags 0x%x}
+														<
+													}
+	
+													if {[N uleshort 42 0 0 {} {} > 0]} {
+														>
+															emit {\b, fsVersion %u}
+														<
+													}
+	
+													if {[N ulelong 44 0 0 {} {} > 2]} {
+														>
+															emit {\b, rootdir cluster %u}
+														<
+													}
+	
+													if {[N uleshort 48 0 0 {} {} > 1]} {
+														>
+															emit {\b, infoSector %u}
+														<
+													}
+	
+													if {[N uleshort 48 0 0 {} {} < 1]} {
+														>
+															emit {\b, infoSector %u}
+														<
+													}
+	
+													switch [Nv uleshort 50 0 {} {}] {
+														0 {
+															>
+																emit {\b, no Backup boot sector}
+															<
+														}
+														65535 {
+															>
+																emit {\b, no Backup boot sector}
+															<
+														}
+													}
+	
+													if {[D 50]} {
+														>
+															if {[N uleshort 50 0 0 {} {} x {}]} {
+																>
+																	emit {\b, Backup boot sector %u}
+																<
+															}
+	
+														<
+													}
+	
+													if {[N ulelong 52 0 0 {} {} > 0]} {
+														>
+															emit {\b, reserved1 0x%x}
+														<
+													}
+	
+													if {[N ulelong 56 0 0 {} {} > 0]} {
+														>
+															emit {\b, reserved2 0x%x}
+														<
+													}
+	
+													if {[N ulelong 60 0 0 {} {} > 0]} {
+														>
+															emit {\b, reserved3 0x%x}
+														<
+													}
+	
+													if {[N ubyte 64 0 0 {} {} != 128]} {
+														>
+															if {[N ubyte 64 0 0 {} {} > 0]} {
+																>
+																	emit {\b, physical drive 0x%x}
+																<
+															}
+	
+														<
+													}
+	
+													if {[N ubyte 65 0 0 {} {} > 0]} {
+														>
+															emit {\b, reserved 0x%x}
+														<
+													}
+	
+													if {[N ubyte 66 0 0 {} {} != 41]} {
+														>
+															emit {\b, dos < 4.0 BootSector (0x%x)}
+														<
+													}
+	
+													if {[N ubyte 66 0 0 {} {} == 41]} {
+														>
+															if {[N ulelong 67 0 0 {} {} x {}]} {
+																>
+																	emit {\b, serial number 0x%x}
+																<
+															}
+	
+															if {[S string 71 0 {} {} < NO\ NAME]} {
+																>
+																	emit {\b, label: "%11.11s"}
+																<
+															}
+	
+															if {[S string 71 0 {} {} > NO\ NAME]} {
+																>
+																	emit {\b, label: "%11.11s"}
+																<
+															}
+	
+															if {[S string 71 0 {} {} eq NO\ NAME]} {
+																>
+																	emit {\b, unlabeled}
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+											if {[N ubyte 21 0 0 {} {} != 248]} {
+												>
+													if {[S string 54 0 {} {} ne FAT16]} {
+														>
+															if {[N ulelong [I 11 uleshort 0 + 0 0] 0 0 & 16777200 == 16777200]} {
+																>
+																	emit {\b, followed by FAT}
+																	mime application/x-ima
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			strength +60
+		<
+	}
+	
+	if {[N ulelong 86 0 0 & 4294905855 == 2425357035]} {
+		>
+			if {[N ulelong [I 0 uleshort 0 * 0 2] 0 0 & 4294967040 == 262144]} {
+				>
+					if {[S lestring16 2 0 {} {} x {}]} {
+						>
+							emit {Microsoft Windows XP/VISTA bootloader %-5.5s}
+						<
+					}
+	
+					if {[S string 18 0 {} {} eq \$]} {
+						>
+							if {[S lestring16 12 0 {} {} x {}]} {
+								>
+									emit {\b%-2.2s}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0ntfsclone-image]} {
+		>
+			emit {ntfsclone image,}
+			if {[N byte 16 0 0 {} {} x {}]} {
+				>
+					emit {version %d.}
+				<
+			}
+	
+			if {[N byte 17 0 0 {} {} x {}]} {
+				>
+					emit {\b%d,}
+				<
+			}
+	
+			if {[N lelong 18 0 0 {} {} x {}]} {
+				>
+					emit {cluster size %d,}
+				<
+			}
+	
+			if {[N lequad 22 0 0 {} {} x {}]} {
+				>
+					emit {device size %lld,}
+				<
+			}
+	
+			if {[N lequad 30 0 0 {} {} x {}]} {
+				>
+					emit {%lld total clusters,}
+				<
+			}
+	
+			if {[N lequad 38 0 0 {} {} x {}]} {
+				>
+					emit {%lld clusters in use}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lelong 9564 0 0 {} {} == 72020]} {
+		>
+			emit {Unix Fast File system [v1] (little-endian),}
+			if {[S string 8404 0 {} {} x {}]} {
+				>
+					emit {last mounted on %s,}
+				<
+			}
+	
+			if {[N ledate 8224 0 0 {} {} x {}]} {
+				>
+					emit {last written at %s,}
+				<
+			}
+	
+			if {[N byte 8401 0 0 {} {} x {}]} {
+				>
+					emit {clean flag %d,}
+				<
+			}
+	
+			if {[N lelong 8228 0 0 {} {} x {}]} {
+				>
+					emit {number of blocks %d,}
+				<
+			}
+	
+			if {[N lelong 8232 0 0 {} {} x {}]} {
+				>
+					emit {number of data blocks %d,}
+				<
+			}
+	
+			if {[N lelong 8236 0 0 {} {} x {}]} {
+				>
+					emit {number of cylinder groups %d,}
+				<
+			}
+	
+			if {[N lelong 8240 0 0 {} {} x {}]} {
+				>
+					emit {block size %d,}
+				<
+			}
+	
+			if {[N lelong 8244 0 0 {} {} x {}]} {
+				>
+					emit {fragment size %d,}
+				<
+			}
+	
+			if {[N lelong 8252 0 0 {} {} x {}]} {
+				>
+					emit {minimum percentage of free blocks %d,}
+				<
+			}
+	
+			if {[N lelong 8256 0 0 {} {} x {}]} {
+				>
+					emit {rotational delay %dms,}
+				<
+			}
+	
+			if {[N lelong 8260 0 0 {} {} x {}]} {
+				>
+					emit {disk rotational speed %drps,}
+				<
+			}
+	
+			switch [Nv lelong 8320 0 {} {}] {
+				0 {
+					>
+						emit {TIME optimization}
+					<
+				}
+				1 {
+					>
+						emit {SPACE optimization}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[N lelong 42332 0 0 {} {} == 424935705]} {
+		>
+			emit {Unix Fast File system [v2] (little-endian)}
+			if {[S string [R -1164] 0 {} {} x {}]} {
+				>
+					emit {last mounted on %s,}
+				<
+			}
+	
+			if {[S string [R -696] 0 {} {} > \0]} {
+				>
+					emit {volume name %s,}
+				<
+			}
+	
+			if {[N leqldate [R -304] 0 0 {} {} x {}]} {
+				>
+					emit {last written at %s,}
+				<
+			}
+	
+			if {[N byte [R -1167] 0 0 {} {} x {}]} {
+				>
+					emit {clean flag %d,}
+				<
+			}
+	
+			if {[N byte [R -1168] 0 0 {} {} x {}]} {
+				>
+					emit {readonly flag %d,}
+				<
+			}
+	
+			if {[N lequad [R -296] 0 0 {} {} x {}]} {
+				>
+					emit {number of blocks %lld,}
+				<
+			}
+	
+			if {[N lequad [R -288] 0 0 {} {} x {}]} {
+				>
+					emit {number of data blocks %lld,}
+				<
+			}
+	
+			if {[N lelong [R -1332] 0 0 {} {} x {}]} {
+				>
+					emit {number of cylinder groups %d,}
+				<
+			}
+	
+			if {[N lelong [R -1328] 0 0 {} {} x {}]} {
+				>
+					emit {block size %d,}
+				<
+			}
+	
+			if {[N lelong [R -1324] 0 0 {} {} x {}]} {
+				>
+					emit {fragment size %d,}
+				<
+			}
+	
+			if {[N lelong [R -180] 0 0 {} {} x {}]} {
+				>
+					emit {average file size %d,}
+				<
+			}
+	
+			if {[N lelong [R -176] 0 0 {} {} x {}]} {
+				>
+					emit {average number of files in dir %d,}
+				<
+			}
+	
+			if {[N lequad [R -272] 0 0 {} {} x {}]} {
+				>
+					emit {pending blocks to free %lld,}
+				<
+			}
+	
+			if {[N lelong [R -264] 0 0 {} {} x {}]} {
+				>
+					emit {pending inodes to free %d,}
+				<
+			}
+	
+			if {[N lequad [R -664] 0 0 {} {} x {}]} {
+				>
+					emit {system-wide uuid %0llx,}
+				<
+			}
+	
+			if {[N lelong [R -1316] 0 0 {} {} x {}]} {
+				>
+					emit {minimum percentage of free blocks %d,}
+				<
+			}
+	
+			switch [Nv lelong [R -1248] 0 {} {}] {
+				0 {
+					>
+						emit {TIME optimization}
+					<
+				}
+				1 {
+					>
+						emit {SPACE optimization}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[N lelong 66908 0 0 {} {} == 424935705]} {
+		>
+			emit {Unix Fast File system [v2] (little-endian)}
+			if {[S string [R -1164] 0 {} {} x {}]} {
+				>
+					emit {last mounted on %s,}
+				<
+			}
+	
+			if {[S string [R -696] 0 {} {} > \0]} {
+				>
+					emit {volume name %s,}
+				<
+			}
+	
+			if {[N leqldate [R -304] 0 0 {} {} x {}]} {
+				>
+					emit {last written at %s,}
+				<
+			}
+	
+			if {[N byte [R -1167] 0 0 {} {} x {}]} {
+				>
+					emit {clean flag %d,}
+				<
+			}
+	
+			if {[N byte [R -1168] 0 0 {} {} x {}]} {
+				>
+					emit {readonly flag %d,}
+				<
+			}
+	
+			if {[N lequad [R -296] 0 0 {} {} x {}]} {
+				>
+					emit {number of blocks %lld,}
+				<
+			}
+	
+			if {[N lequad [R -288] 0 0 {} {} x {}]} {
+				>
+					emit {number of data blocks %lld,}
+				<
+			}
+	
+			if {[N lelong [R -1332] 0 0 {} {} x {}]} {
+				>
+					emit {number of cylinder groups %d,}
+				<
+			}
+	
+			if {[N lelong [R -1328] 0 0 {} {} x {}]} {
+				>
+					emit {block size %d,}
+				<
+			}
+	
+			if {[N lelong [R -1324] 0 0 {} {} x {}]} {
+				>
+					emit {fragment size %d,}
+				<
+			}
+	
+			if {[N lelong [R -180] 0 0 {} {} x {}]} {
+				>
+					emit {average file size %d,}
+				<
+			}
+	
+			if {[N lelong [R -176] 0 0 {} {} x {}]} {
+				>
+					emit {average number of files in dir %d,}
+				<
+			}
+	
+			if {[N lequad [R -272] 0 0 {} {} x {}]} {
+				>
+					emit {pending blocks to free %lld,}
+				<
+			}
+	
+			if {[N lelong [R -264] 0 0 {} {} x {}]} {
+				>
+					emit {pending inodes to free %d,}
+				<
+			}
+	
+			if {[N lequad [R -664] 0 0 {} {} x {}]} {
+				>
+					emit {system-wide uuid %0llx,}
+				<
+			}
+	
+			if {[N lelong [R -1316] 0 0 {} {} x {}]} {
+				>
+					emit {minimum percentage of free blocks %d,}
+				<
+			}
+	
+			switch [Nv lelong [R -1248] 0 {} {}] {
+				0 {
+					>
+						emit {TIME optimization}
+					<
+				}
+				1 {
+					>
+						emit {SPACE optimization}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[N belong 9564 0 0 {} {} == 72020]} {
+		>
+			emit {Unix Fast File system [v1] (big-endian),}
+			if {[N belong 7168 0 0 {} {} == 1279345228]} {
+				>
+					emit {Apple UFS Volume}
+					if {[S string 7186 0 {} {} x {}]} {
+						>
+							emit {named %s,}
+						<
+					}
+	
+					if {[N belong 7176 0 0 {} {} x {}]} {
+						>
+							emit {volume label version %d,}
+						<
+					}
+	
+					if {[N bedate 7180 0 0 {} {} x {}]} {
+						>
+							emit {created on %s,}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8404 0 {} {} x {}]} {
+				>
+					emit {last mounted on %s,}
+				<
+			}
+	
+			if {[N bedate 8224 0 0 {} {} x {}]} {
+				>
+					emit {last written at %s,}
+				<
+			}
+	
+			if {[N byte 8401 0 0 {} {} x {}]} {
+				>
+					emit {clean flag %d,}
+				<
+			}
+	
+			if {[N belong 8228 0 0 {} {} x {}]} {
+				>
+					emit {number of blocks %d,}
+				<
+			}
+	
+			if {[N belong 8232 0 0 {} {} x {}]} {
+				>
+					emit {number of data blocks %d,}
+				<
+			}
+	
+			if {[N belong 8236 0 0 {} {} x {}]} {
+				>
+					emit {number of cylinder groups %d,}
+				<
+			}
+	
+			if {[N belong 8240 0 0 {} {} x {}]} {
+				>
+					emit {block size %d,}
+				<
+			}
+	
+			if {[N belong 8244 0 0 {} {} x {}]} {
+				>
+					emit {fragment size %d,}
+				<
+			}
+	
+			if {[N belong 8252 0 0 {} {} x {}]} {
+				>
+					emit {minimum percentage of free blocks %d,}
+				<
+			}
+	
+			if {[N belong 8256 0 0 {} {} x {}]} {
+				>
+					emit {rotational delay %dms,}
+				<
+			}
+	
+			if {[N belong 8260 0 0 {} {} x {}]} {
+				>
+					emit {disk rotational speed %drps,}
+				<
+			}
+	
+			switch [Nv belong 8320 0 {} {}] {
+				0 {
+					>
+						emit {TIME optimization}
+					<
+				}
+				1 {
+					>
+						emit {SPACE optimization}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[N belong 42332 0 0 {} {} == 424935705]} {
+		>
+			emit {Unix Fast File system [v2] (big-endian)}
+			if {[S string [R -1164] 0 {} {} x {}]} {
+				>
+					emit {last mounted on %s,}
+				<
+			}
+	
+			if {[S string [R -696] 0 {} {} > \0]} {
+				>
+					emit {volume name %s,}
+				<
+			}
+	
+			if {[N beqldate [R -304] 0 0 {} {} x {}]} {
+				>
+					emit {last written at %s,}
+				<
+			}
+	
+			if {[N byte [R -1167] 0 0 {} {} x {}]} {
+				>
+					emit {clean flag %d,}
+				<
+			}
+	
+			if {[N byte [R -1168] 0 0 {} {} x {}]} {
+				>
+					emit {readonly flag %d,}
+				<
+			}
+	
+			if {[N bequad [R -296] 0 0 {} {} x {}]} {
+				>
+					emit {number of blocks %lld,}
+				<
+			}
+	
+			if {[N bequad [R -288] 0 0 {} {} x {}]} {
+				>
+					emit {number of data blocks %lld,}
+				<
+			}
+	
+			if {[N belong [R -1332] 0 0 {} {} x {}]} {
+				>
+					emit {number of cylinder groups %d,}
+				<
+			}
+	
+			if {[N belong [R -1328] 0 0 {} {} x {}]} {
+				>
+					emit {block size %d,}
+				<
+			}
+	
+			if {[N belong [R -1324] 0 0 {} {} x {}]} {
+				>
+					emit {fragment size %d,}
+				<
+			}
+	
+			if {[N belong [R -180] 0 0 {} {} x {}]} {
+				>
+					emit {average file size %d,}
+				<
+			}
+	
+			if {[N belong [R -176] 0 0 {} {} x {}]} {
+				>
+					emit {average number of files in dir %d,}
+				<
+			}
+	
+			if {[N bequad [R -272] 0 0 {} {} x {}]} {
+				>
+					emit {pending blocks to free %lld,}
+				<
+			}
+	
+			if {[N belong [R -264] 0 0 {} {} x {}]} {
+				>
+					emit {pending inodes to free %d,}
+				<
+			}
+	
+			if {[N bequad [R -664] 0 0 {} {} x {}]} {
+				>
+					emit {system-wide uuid %0llx,}
+				<
+			}
+	
+			if {[N belong [R -1316] 0 0 {} {} x {}]} {
+				>
+					emit {minimum percentage of free blocks %d,}
+				<
+			}
+	
+			switch [Nv belong [R -1248] 0 {} {}] {
+				0 {
+					>
+						emit {TIME optimization}
+					<
+				}
+				1 {
+					>
+						emit {SPACE optimization}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[N belong 66908 0 0 {} {} == 424935705]} {
+		>
+			emit {Unix Fast File system [v2] (big-endian)}
+			if {[S string [R -1164] 0 {} {} x {}]} {
+				>
+					emit {last mounted on %s,}
+				<
+			}
+	
+			if {[S string [R -696] 0 {} {} > \0]} {
+				>
+					emit {volume name %s,}
+				<
+			}
+	
+			if {[N beqldate [R -304] 0 0 {} {} x {}]} {
+				>
+					emit {last written at %s,}
+				<
+			}
+	
+			if {[N byte [R -1167] 0 0 {} {} x {}]} {
+				>
+					emit {clean flag %d,}
+				<
+			}
+	
+			if {[N byte [R -1168] 0 0 {} {} x {}]} {
+				>
+					emit {readonly flag %d,}
+				<
+			}
+	
+			if {[N bequad [R -296] 0 0 {} {} x {}]} {
+				>
+					emit {number of blocks %lld,}
+				<
+			}
+	
+			if {[N bequad [R -288] 0 0 {} {} x {}]} {
+				>
+					emit {number of data blocks %lld,}
+				<
+			}
+	
+			if {[N belong [R -1332] 0 0 {} {} x {}]} {
+				>
+					emit {number of cylinder groups %d,}
+				<
+			}
+	
+			if {[N belong [R -1328] 0 0 {} {} x {}]} {
+				>
+					emit {block size %d,}
+				<
+			}
+	
+			if {[N belong [R -1324] 0 0 {} {} x {}]} {
+				>
+					emit {fragment size %d,}
+				<
+			}
+	
+			if {[N belong [R -180] 0 0 {} {} x {}]} {
+				>
+					emit {average file size %d,}
+				<
+			}
+	
+			if {[N belong [R -176] 0 0 {} {} x {}]} {
+				>
+					emit {average number of files in dir %d,}
+				<
+			}
+	
+			if {[N bequad [R -272] 0 0 {} {} x {}]} {
+				>
+					emit {pending blocks to free %lld,}
+				<
+			}
+	
+			if {[N belong [R -264] 0 0 {} {} x {}]} {
+				>
+					emit {pending inodes to free %d,}
+				<
+			}
+	
+			if {[N bequad [R -664] 0 0 {} {} x {}]} {
+				>
+					emit {system-wide uuid %0llx,}
+				<
+			}
+	
+			if {[N belong [R -1316] 0 0 {} {} x {}]} {
+				>
+					emit {minimum percentage of free blocks %d,}
+				<
+			}
+	
+			switch [Nv belong [R -1248] 0 {} {}] {
+				0 {
+					>
+						emit {TIME optimization}
+					<
+				}
+				1 {
+					>
+						emit {SPACE optimization}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	switch [Nv ulequad 0 0 {} {}] {
+		6192449487699967 {
+			>
+				U 163 msdos-driver 0
+	
+			<
+		}
+		16325548649369164 {
+			>
+				emit {MS Advisor help file}
+			<
+		}
+		35747322042318847 {
+			>
+				U 163 msdos-driver 0
+	
+			<
+		}
+		365847100979675154 {
+			>
+				U 163 msdos-driver 0
+	
+			<
+		}
+		557611562475454463 {
+			>
+				U 163 msdos-driver 0
+	
+			<
+		}
+		862167487276384255 {
+			>
+				U 163 msdos-driver 0
+	
+			<
+		}
+		3671137388043632662 {
+			>
+				U 163 msdos-driver 0
+	
+			<
+		}
+		14429899677490098225 {
+			>
+				emit {HAMMER filesystem (little-endian),}
+				if {[N lelong 144 0 0 + 1 x {}]} {
+					>
+						emit {volume %d}
+					<
+				}
+	
+				if {[N lelong 148 0 0 {} {} x {}]} {
+					>
+						emit {(of %d),}
+					<
+				}
+	
+				if {[S string 80 0 {} {} x {}]} {
+					>
+						emit {name %s,}
+					<
+				}
+	
+				if {[N ulelong 152 0 0 {} {} x {}]} {
+					>
+						emit {version %u,}
+					<
+				}
+	
+				if {[N ulelong 160 0 0 {} {} x {}]} {
+					>
+						emit {flags 0x%x}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[N leshort 1080 0 0 {} {} == -4269]} {
+		>
+			emit Linux
+			if {[N lelong 1100 0 0 {} {} x {}]} {
+				>
+					emit {rev %d}
+				<
+			}
+	
+			if {[N leshort 1086 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+			if {[N lelong 1116 0 0 {} {} ^ 4]} {
+				>
+					emit {ext2 filesystem data}
+					if {[N leshort 1082 0 0 {} {} ^ 1]} {
+						>
+							emit {(mounted or unclean)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N lelong 1116 0 0 {} {} & 4]} {
+				>
+					if {[N lelong 1120 0 0 {} {} < 64]} {
+						>
+							if {[N lelong 1124 0 0 {} {} < 8]} {
+								>
+									emit {ext3 filesystem data}
+								<
+							}
+	
+							if {[N lelong 1124 0 0 {} {} > 7]} {
+								>
+									emit {ext4 filesystem data}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N lelong 1120 0 0 {} {} > 63]} {
+						>
+							emit {ext4 filesystem data}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N belong 1128 0 0 {} {} x {}]} {
+				>
+					emit {\b, UUID=%08x}
+				<
+			}
+	
+			if {[N beshort 1132 0 0 {} {} x {}]} {
+				>
+					emit {\b-%04x}
+				<
+			}
+	
+			if {[N beshort 1134 0 0 {} {} x {}]} {
+				>
+					emit {\b-%04x}
+				<
+			}
+	
+			if {[N beshort 1136 0 0 {} {} x {}]} {
+				>
+					emit {\b-%04x}
+				<
+			}
+	
+			if {[N belong 1138 0 0 {} {} x {}]} {
+				>
+					emit {\b-%08x}
+				<
+			}
+	
+			if {[N beshort 1142 0 0 {} {} x {}]} {
+				>
+					emit {\b%04x}
+				<
+			}
+	
+			if {[S string 1144 0 {} {} > 0]} {
+				>
+					emit {\b, volume name "%s"}
+				<
+			}
+	
+			if {[N lelong 1120 0 0 {} {} & 4]} {
+				>
+					emit {(needs journal recovery)}
+				<
+			}
+	
+			if {[N leshort 1082 0 0 {} {} & 2]} {
+				>
+					emit (errors)
+				<
+			}
+	
+			if {[N lelong 1120 0 0 {} {} & 1]} {
+				>
+					emit (compressed)
+				<
+			}
+	
+			if {[N lelong 1120 0 0 {} {} & 64]} {
+				>
+					emit (extents)
+				<
+			}
+	
+			if {[N lelong 1120 0 0 {} {} & 128]} {
+				>
+					emit (64bit)
+				<
+			}
+	
+			if {[N lelong 1124 0 0 {} {} & 2]} {
+				>
+					emit {(large files)}
+				<
+			}
+	
+			if {[N lelong 1124 0 0 {} {} & 8]} {
+				>
+					emit {(huge files)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lelong 1024 0 0 {} {} == -218816496]} {
+		>
+			emit {F2FS filesystem}
+			if {[N belong 1132 0 0 {} {} x {}]} {
+				>
+					emit {\b, UUID=%08x}
+				<
+			}
+	
+			if {[N beshort 1136 0 0 {} {} x {}]} {
+				>
+					emit {\b-%04x}
+				<
+			}
+	
+			if {[N beshort 1138 0 0 {} {} x {}]} {
+				>
+					emit {\b-%04x}
+				<
+			}
+	
+			if {[N beshort 1140 0 0 {} {} x {}]} {
+				>
+					emit {\b-%04x}
+				<
+			}
+	
+			if {[N belong 1142 0 0 {} {} x {}]} {
+				>
+					emit {\b-%08x}
+				<
+			}
+	
+			if {[N beshort 1146 0 0 {} {} x {}]} {
+				>
+					emit {\b%04x}
+				<
+			}
+	
+			if {[S lestring16 5244 0 {} {} x {}]} {
+				>
+					emit {\b, volume name "%s"}
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv leshort 1040 0 {} {}] {
+		4991 {
+			>
+				if {[N beshort 1026 0 0 {} {} < 100]} {
+					>
+					<
+				}
+	
+				if {[N beshort 1026 0 0 {} {} > -1]} {
+					>
+						emit {Minix filesystem, V1, 14 char names, %d zones}
+					<
+				}
+	
+				if {[S string 30 0 {} {} eq minix]} {
+					>
+						emit {\b, bootable}
+					<
+				}
+	
+			<
+		}
+		5007 {
+			>
+				if {[N beshort 1026 0 0 {} {} < 100]} {
+					>
+					<
+				}
+	
+				if {[N beshort 1026 0 0 {} {} > -1]} {
+					>
+						emit {Minix filesystem, V1, 30 char names, %d zones}
+					<
+				}
+	
+				if {[S string 30 0 {} {} eq minix]} {
+					>
+						emit {\b, bootable}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	switch [Nv beshort 1040 0 {} {}] {
+		4991 {
+			>
+				if {[N beshort 1026 0 0 {} {} < 100]} {
+					>
+					<
+				}
+	
+				if {[N beshort 1026 0 0 {} {} > -1]} {
+					>
+						emit {Minix filesystem, V1 (big endian), %d zones}
+					<
+				}
+	
+				if {[S string 30 0 {} {} eq minix]} {
+					>
+						emit {\b, bootable}
+					<
+				}
+	
+			<
+		}
+		5007 {
+			>
+				if {[N beshort 1026 0 0 {} {} < 100]} {
+					>
+					<
+				}
+	
+				if {[N beshort 1026 0 0 {} {} > -1]} {
+					>
+						emit {Minix filesystem, V1, 30 char names (big endian), %d zones}
+					<
+				}
+	
+				if {[S string 30 0 {} {} eq minix]} {
+					>
+						emit {\b, bootable}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[N belong 2048 0 0 {} {} == 1190930176]} {
+		>
+			emit {Atari-ST Minix kernel image}
+			if {[S string 19 0 {} {} eq \240\005\371\005\0\011\0\2\0]} {
+				>
+					emit {\b, 720k floppy}
+				<
+			}
+	
+			if {[S string 19 0 {} {} eq \320\002\370\005\0\011\0\1\0]} {
+				>
+					emit {\b, 360k floppy}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 19 0 {} {} eq \320\002\360\003\0\011\0\1\0]} {
+		>
+			emit {DOS floppy 360k}
+			if {[N leshort 510 0 0 {} {} == -21931]} {
+				>
+					emit {\b, DOS/MBR hard disk boot sector}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 19 0 {} {} eq \240\005\371\003\0\011\0\2\0]} {
+		>
+			emit {DOS floppy 720k}
+			if {[N leshort 510 0 0 {} {} == -21931]} {
+				>
+					emit {\b, DOS/MBR hard disk boot sector}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 19 0 {} {} eq \100\013\360\011\0\022\0\2\0]} {
+		>
+			emit {DOS floppy 1440k}
+			if {[N leshort 510 0 0 {} {} == -21931]} {
+				>
+					emit {\b, DOS/MBR hard disk boot sector}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 19 0 {} {} eq \240\005\371\005\0\011\0\2\0]} {
+		>
+			emit {DOS floppy 720k, IBM}
+			if {[N leshort 510 0 0 {} {} == -21931]} {
+				>
+					emit {\b, DOS/MBR hard disk boot sector}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 19 0 {} {} eq \100\013\371\005\0\011\0\2\0]} {
+		>
+			emit {DOS floppy 1440k, mkdosfs}
+			if {[N leshort 510 0 0 {} {} == -21931]} {
+				>
+					emit {\b, DOS/MBR hard disk boot sector}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 19 0 {} {} eq \320\002\370\005\0\011\0\1\0]} {
+		>
+			emit {Atari-ST floppy 360k}
+		<
+	}
+	
+	if {[S string 19 0 {} {} eq \240\005\371\005\0\011\0\2\0]} {
+		>
+			emit {Atari-ST floppy 720k}
+		<
+	}
+	
+	if {[S string 37633 0 {} {} eq CD001]} {
+		>
+			emit {ISO 9660 CD-ROM filesystem data (raw 2352 byte sectors)}
+			mime application/x-iso9660-image
+		<
+	}
+	
+	if {[S string 32777 0 {} {} eq CDROM]} {
+		>
+			emit {High Sierra CD-ROM filesystem data}
+		<
+	}
+	
+	if {[S string 32769 0 {} {} eq CD001]} {
+		>
+			U 79 cdrom 0
+	
+			strength +34
+		<
+	}
+	
+	if {[S string 339969 0 {} {} eq CD001]} {
+		>
+			emit {Nero CD image at 0x4B000}
+			U 79 cdrom 307200
+	
+			mime application/x-nrg
+			ext nrg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CISO]} {
+		>
+			if {[N lelong 4 0 0 {} {} != 0]} {
+				>
+					if {[N lelong 4 0 0 {} {} != 2097152]} {
+						>
+							if {[N lelong 16 0 0 {} {} != 2048]} {
+								>
+									emit {Compressed ISO CD image}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 65588 0 {} {} eq ReIsErFs]} {
+		>
+			emit {ReiserFS V3.5}
+		<
+	}
+	
+	if {[S string 65588 0 {} {} eq ReIsEr2Fs]} {
+		>
+			emit {ReiserFS V3.6}
+		<
+	}
+	
+	if {[S string 65588 0 {} {} eq ReIsEr3Fs]} {
+		>
+			emit {ReiserFS V3.6.19}
+			if {[N leshort 65580 0 0 {} {} x {}]} {
+				>
+					emit {block size %d}
+				<
+			}
+	
+			if {[N leshort 65586 0 0 {} {} & 2]} {
+				>
+					emit {(mounted or unclean)}
+				<
+			}
+	
+			if {[N lelong 65536 0 0 {} {} x {}]} {
+				>
+					emit {num blocks %d}
+				<
+			}
+	
+			switch [Nv lelong 65600 0 {} {}] {
+				1 {
+					>
+						emit {tea hash}
+					<
+				}
+				2 {
+					>
+						emit {yura hash}
+					<
+				}
+				3 {
+					>
+						emit {r5 hash}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ESTFBINR]} {
+		>
+			emit {EST flat binary}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq VoIP\ Startup\ and]} {
+		>
+			emit {Aculab VoIP firmware}
+			if {[S string 35 0 {} {} x {}]} {
+				>
+					emit {format %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq sqsh]} {
+		>
+			emit {Squashfs filesystem, big endian,}
+			if {[N beshort 28 0 0 {} {} x {}]} {
+				>
+					emit {version %d.}
+				<
+			}
+	
+			if {[N beshort 30 0 0 {} {} x {}]} {
+				>
+					emit {\b%d,}
+				<
+			}
+	
+			if {[N beshort 28 0 0 {} {} < 3]} {
+				>
+					if {[N belong 8 0 0 {} {} x {}]} {
+						>
+							emit {%d bytes,}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N beshort 28 0 0 {} {} > 2]} {
+				>
+					if {[N beshort 28 0 0 {} {} < 4]} {
+						>
+							if {[N bequad 63 0 0 {} {} x {}]} {
+								>
+									emit {%lld bytes,}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N beshort 28 0 0 {} {} > 3]} {
+						>
+							if {[N bequad 40 0 0 {} {} x {}]} {
+								>
+									emit {%lld bytes,}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N belong 4 0 0 {} {} x {}]} {
+				>
+					emit {%d inodes,}
+				<
+			}
+	
+			if {[N beshort 28 0 0 {} {} < 2]} {
+				>
+					if {[N beshort 32 0 0 {} {} x {}]} {
+						>
+							emit {blocksize: %d bytes,}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N beshort 28 0 0 {} {} > 1]} {
+				>
+					if {[N beshort 28 0 0 {} {} < 4]} {
+						>
+							if {[N belong 51 0 0 {} {} x {}]} {
+								>
+									emit {blocksize: %d bytes,}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N beshort 28 0 0 {} {} > 3]} {
+						>
+							if {[N belong 12 0 0 {} {} x {}]} {
+								>
+									emit {blocksize: %d bytes,}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N beshort 28 0 0 {} {} < 4]} {
+				>
+					if {[N bedate 39 0 0 {} {} x {}]} {
+						>
+							emit {created: %s}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N beshort 28 0 0 {} {} > 3]} {
+				>
+					if {[N bedate 8 0 0 {} {} x {}]} {
+						>
+							emit {created: %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq hsqs]} {
+		>
+			emit {Squashfs filesystem, little endian,}
+			if {[N leshort 28 0 0 {} {} x {}]} {
+				>
+					emit {version %d.}
+				<
+			}
+	
+			if {[N leshort 30 0 0 {} {} x {}]} {
+				>
+					emit {\b%d,}
+				<
+			}
+	
+			if {[N leshort 28 0 0 {} {} < 3]} {
+				>
+					if {[N lelong 8 0 0 {} {} x {}]} {
+						>
+							emit {%d bytes,}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N leshort 28 0 0 {} {} > 2]} {
+				>
+					if {[N leshort 28 0 0 {} {} < 4]} {
+						>
+							if {[N lequad 63 0 0 {} {} x {}]} {
+								>
+									emit {%lld bytes,}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N leshort 28 0 0 {} {} > 3]} {
+						>
+							if {[N lequad 40 0 0 {} {} x {}]} {
+								>
+									emit {%lld bytes,}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N lelong 4 0 0 {} {} x {}]} {
+				>
+					emit {%d inodes,}
+				<
+			}
+	
+			if {[N leshort 28 0 0 {} {} < 2]} {
+				>
+					if {[N leshort 32 0 0 {} {} x {}]} {
+						>
+							emit {blocksize: %d bytes,}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N leshort 28 0 0 {} {} > 1]} {
+				>
+					if {[N leshort 28 0 0 {} {} < 4]} {
+						>
+							if {[N lelong 51 0 0 {} {} x {}]} {
+								>
+									emit {blocksize: %d bytes,}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N leshort 28 0 0 {} {} > 3]} {
+						>
+							if {[N lelong 12 0 0 {} {} x {}]} {
+								>
+									emit {blocksize: %d bytes,}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N leshort 28 0 0 {} {} < 4]} {
+				>
+					if {[N ledate 39 0 0 {} {} x {}]} {
+						>
+							emit {created: %s}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N leshort 28 0 0 {} {} > 3]} {
+				>
+					if {[N ledate 8 0 0 {} {} x {}]} {
+						>
+							emit {created: %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x01\xb3\xa1\x13\x22]} {
+		>
+			emit {AFS Dump}
+			if {[N belong [R 0] 0 0 {} {} x {}]} {
+				>
+					emit (v%d)
+					if {[N byte [R 0] 0 0 {} {} == 118]} {
+						>
+							if {[N belong [R 0] 0 0 {} {} x {}]} {
+								>
+									emit {Vol %d,}
+									if {[N byte [R 0] 0 0 {} {} == 110]} {
+										>
+											if {[S string [R 0] 0 {} {} x {}]} {
+												>
+													emit %s
+													if {[N byte [R 1] 0 0 {} {} == 116]} {
+														>
+															if {[N beshort [R 0] 0 0 {} {} == 2]} {
+																>
+																	if {[N bedate [R 4] 0 0 {} {} x {}]} {
+																		>
+																			emit {on: %s}
+																		<
+																	}
+	
+																	if {[N bedate [R 0] 0 0 {} {} == 0]} {
+																		>
+																			emit {full dump}
+																		<
+																	}
+	
+																	if {[N bedate [R 0] 0 0 {} {} != 0]} {
+																		>
+																			emit {incremental since: %s}
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DISO]} {
+		>
+			emit {Delta ISO data}
+			if {[N belong 4 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+			strength +50
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq \x01\x00\x01\x00\x01\x00]} {
+		>
+			if {[S string [I 0 uleshort 0 + 0 16] 0 {} {} eq \x01\x01]} {
+				>
+					if {[N byte [R [I [R 0] ubyte 0 + 0 8]] 0 0 {} {} == 66]} {
+						>
+							emit {OpenVMS backup saveset data}
+							if {[N lelong 40 0 0 {} {} x {}]} {
+								>
+									emit {(block size %d,}
+								<
+							}
+	
+							if {[S string 49 0 {} {} > \0]} {
+								>
+									emit {original name '%s',}
+								<
+							}
+	
+							switch [Nv short 2 0 {} {}] {
+								1024 {
+									>
+										emit {VAX generated)}
+									<
+								}
+								2048 {
+									>
+										emit {AXP generated)}
+									<
+								}
+								4096 {
+									>
+										emit {I64 generated)}
+									<
+								}
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq OracleCFS]} {
+		>
+			emit {Oracle Clustered Filesystem,}
+			if {[N long 4 0 0 {} {} x {}]} {
+				>
+					emit {rev %d}
+				<
+			}
+	
+			if {[N long 0 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d,}
+				<
+			}
+	
+			if {[S string 560 0 {} {} x {}]} {
+				>
+					emit {label: %.64s,}
+				<
+			}
+	
+			if {[S string 136 0 {} {} x {}]} {
+				>
+					emit {mountpoint: %.128s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 32 0 {} {} eq ORCLDISK]} {
+		>
+			emit {Oracle ASM Volume,}
+			if {[S string 40 0 {} {} x {}]} {
+				>
+					emit {Disk Name: %0.12s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 32 0 {} {} eq ORCLCLRD]} {
+		>
+			emit {Oracle ASM Volume (cleared),}
+			if {[S string 40 0 {} {} x {}]} {
+				>
+					emit {Disk Name: %0.12s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq OracleCFS]} {
+		>
+			emit {Oracle Clustered Filesystem,}
+			if {[N long 4 0 0 {} {} x {}]} {
+				>
+					emit {rev %d}
+				<
+			}
+	
+			if {[N long 0 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d,}
+				<
+			}
+	
+			if {[S string 560 0 {} {} x {}]} {
+				>
+					emit {label: %.64s,}
+				<
+			}
+	
+			if {[S string 136 0 {} {} x {}]} {
+				>
+					emit {mountpoint: %.128s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 32 0 {} {} eq ORCLDISK]} {
+		>
+			emit {Oracle ASM Volume,}
+			if {[S string 40 0 {} {} x {}]} {
+				>
+					emit {Disk Name: %0.12s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 32 0 {} {} eq ORCLCLRD]} {
+		>
+			emit {Oracle ASM Volume (cleared),}
+			if {[S string 40 0 {} {} x {}]} {
+				>
+					emit {Disk Name: %0.12s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CPQRFBLO]} {
+		>
+			emit {Compaq/HP RILOE floppy image}
+		<
+	}
+	
+	if {[S string 1008 0 {} {} eq DECFILE11]} {
+		>
+			emit {Files-11 On-Disk Structure}
+			if {[N byte 525 0 0 {} {} x {}]} {
+				>
+					emit {(ODS-%d);}
+				<
+			}
+	
+			if {[S string 1017 0 {} {} eq A]} {
+				>
+					emit {RSX-11, VAX/VMS or OpenVMS VAX file system;}
+				<
+			}
+	
+			if {[S string 1017 0 {} {} eq B]} {
+				>
+					switch [Nv byte 525 0 {} {}] {
+						2 {
+							>
+								emit {VAX/VMS or OpenVMS file system;}
+							<
+						}
+						5 {
+							>
+								emit {OpenVMS Alpha or Itanium file system;}
+							<
+						}
+					}
+	
+				<
+			}
+	
+			if {[S string 984 0 {} {} x {}]} {
+				>
+					emit {volume label is '%-12.12s'}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DAA\x0\x0\x0\x0\x0]} {
+		>
+			emit {PowerISO Direct-Access-Archive}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \1\0\0\0\0\0\0\300\0\2\0\0]} {
+		>
+			emit {Marvell Libertas firmware}
+		<
+	}
+	
+	if {[N belong 65536 0 0 {} {} == 18225520]} {
+		>
+			switch [Nv belong 65560 0 {} {}] {
+				1309 {
+					>
+						emit {GFS1 Filesystem}
+						if {[N belong 65572 0 0 {} {} x {}]} {
+							>
+								emit {(blocksize %d,}
+							<
+						}
+	
+						if {[S string 65632 0 {} {} > \0]} {
+							>
+								emit {lockproto %s)}
+							<
+						}
+	
+					<
+				}
+				1801 {
+					>
+						emit {GFS2 Filesystem}
+						if {[N belong 65572 0 0 {} {} x {}]} {
+							>
+								emit {(blocksize %d,}
+							<
+						}
+	
+						if {[S string 65632 0 {} {} > \0]} {
+							>
+								emit {lockproto %s)}
+							<
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 65600 0 {} {} eq _BHRfS_M]} {
+		>
+			emit {BTRFS Filesystem}
+			if {[S string 65835 0 {} {} > \0]} {
+				>
+					emit {label "%s",}
+				<
+			}
+	
+			if {[N lelong 65680 0 0 {} {} x {}]} {
+				>
+					emit {sectorsize %d,}
+				<
+			}
+	
+			if {[N lelong 65684 0 0 {} {} x {}]} {
+				>
+					emit {nodesize %d,}
+				<
+			}
+	
+			if {[N lelong 65688 0 0 {} {} x {}]} {
+				>
+					emit {leafsize %d,}
+				<
+			}
+	
+			if {[N belong 65568 0 0 {} {} x {}]} {
+				>
+					emit UUID=%08x-
+				<
+			}
+	
+			if {[N beshort 65572 0 0 {} {} x {}]} {
+				>
+					emit {\b%04x-}
+				<
+			}
+	
+			if {[N beshort 65574 0 0 {} {} x {}]} {
+				>
+					emit {\b%04x-}
+				<
+			}
+	
+			if {[N beshort 65576 0 0 {} {} x {}]} {
+				>
+					emit {\b%04x-}
+				<
+			}
+	
+			if {[N beshort 65578 0 0 {} {} x {}]} {
+				>
+					emit {\b%04x}
+				<
+			}
+	
+			if {[N belong 65580 0 0 {} {} x {}]} {
+				>
+					emit {\b%08x,}
+				<
+			}
+	
+			if {[N lequad 65656 0 0 {} {} x {}]} {
+				>
+					emit %lld/
+				<
+			}
+	
+			if {[N lequad 65648 0 0 {} {} x {}]} {
+				>
+					emit {\b%lld bytes used,}
+				<
+			}
+	
+			if {[N lequad 65672 0 0 {} {} x {}]} {
+				>
+					emit {%lld devices}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq *dvdisaster*]} {
+		>
+			emit {dvdisaster error correction file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XFSM]} {
+		>
+			if {[S string 512 0 {} {} eq XFSB]} {
+				>
+					emit {XFS filesystem metadump image}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CROMFS]} {
+		>
+			emit CROMFS
+			if {[S string 6 0 {} {} > \0]} {
+				>
+					emit {\b version %2.2s,}
+				<
+			}
+	
+			if {[N ulequad 8 0 0 {} {} > 0]} {
+				>
+					emit {\b block data at %lld,}
+				<
+			}
+	
+			if {[N ulequad 16 0 0 {} {} > 0]} {
+				>
+					emit {\b fblock table at %lld,}
+				<
+			}
+	
+			if {[N ulequad 24 0 0 {} {} > 0]} {
+				>
+					emit {\b inode table at %lld,}
+				<
+			}
+	
+			if {[N ulequad 32 0 0 {} {} > 0]} {
+				>
+					emit {\b root at %lld,}
+				<
+			}
+	
+			if {[N ulelong 40 0 0 {} {} > 0]} {
+				>
+					emit {\b fblock size = %d,}
+				<
+			}
+	
+			if {[N ulelong 44 0 0 {} {} > 0]} {
+				>
+					emit {\b block size = %d,}
+				<
+			}
+	
+			if {[N ulequad 48 0 0 {} {} > 0]} {
+				>
+					emit {\b bytes = %lld}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XFSM]} {
+		>
+			if {[S string 512 0 {} {} eq XFSB]} {
+				>
+					emit {XFS filesystem metadump image}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DISO]} {
+		>
+			emit {Delta ISO data,}
+			if {[N belong 4 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 32768 0 {} {} eq JFS1]} {
+		>
+			if {[N lelong [R 0] 0 0 {} {} < 3]} {
+				>
+					emit {JFS2 filesystem image}
+					if {[S regex [R 144] 0 {} {} eq \[\x20-\x7E\]\{1,16\}]} {
+						>
+							emit {(label "%s")}
+						<
+					}
+	
+					if {[N lequad [R 0] 0 0 {} {} x {}]} {
+						>
+							emit {\b, %lld blocks}
+						<
+					}
+	
+					if {[N lelong [R 8] 0 0 {} {} x {}]} {
+						>
+							emit {\b, blocksize %d}
+						<
+					}
+	
+					if {[N lelong [R 32] 0 0 & 6 > 0]} {
+						>
+							emit (dirty)
+						<
+					}
+	
+					if {[N lelong [R 36] 0 0 {} {} > 0]} {
+						>
+							emit (compressed)
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq td\000]} {
+		>
+			emit {floppy image data (TeleDisk, compressed)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TD\000]} {
+		>
+			emit {floppy image data (TeleDisk)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CQ\024]} {
+		>
+			emit {floppy image data (CopyQM,}
+			if {[N leshort 16 0 0 {} {} x {}]} {
+				>
+					emit {%d sectors,}
+				<
+			}
+	
+			if {[N leshort 18 0 0 {} {} x {}]} {
+				>
+					emit {%d heads.)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ACT\020Apricot\020disk\020image\032\004]} {
+		>
+			emit {floppy image data (ApriDisk)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \074CPM_Disk\076]} {
+		>
+			emit {disk image data (YAZE)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\0\0ReFS\0]} {
+		>
+			emit {ReFS filesystem image}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq EVF\x09\x0d\x0a\xff\x00]} {
+		>
+			emit {EWF/Expert Witness/EnCase image file format}
+		<
+	}
+	
+	switch [Nv ulelong 32 0 & 4294967039] {
+		672 {
+			>
+				if {[S string 16 0 {} {} eq \0\0\0\0\0\0\0\0\0\0]} {
+					>
+						if {[S string 640 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+							>
+								if {[N ubyte 26 0 0 & 239 == 0]} {
+									>
+										if {[N ubyte 27 0 0 & 143 == 0]} {
+											>
+												if {[N ubyte 27 0 0 & 70 < 64]} {
+													>
+														if {[N ulelong 28 0 0 {} {} > 33]} {
+															>
+																if {[S regex 0 0 {} {} eq \[\[:print:\]\]*]} {
+																	>
+																		emit {NEC PC-88 disk image, name=%s}
+																		switch [Nv ubyte 27 0 {} {}] {
+																			0 {
+																				>
+																					emit {\b, media=2D}
+																				<
+																			}
+																			16 {
+																				>
+																					emit {\b, media=2DD}
+																				<
+																			}
+																			32 {
+																				>
+																					emit {\b, media=2HD}
+																				<
+																			}
+																			48 {
+																				>
+																					emit {\b, media=1D}
+																				<
+																			}
+																			64 {
+																				>
+																					emit {\b, media=1DD}
+																				<
+																			}
+																		}
+	
+																		if {[N ubyte 26 0 0 {} {} == 16]} {
+																			>
+																				emit {\b, write-protected}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+			>
+				if {[S string 16 0 {} {} eq \0\0\0\0\0\0\0\0\0\0]} {
+					>
+						if {[S string 640 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+							>
+								if {[N ubyte 26 0 0 & 239 == 0]} {
+									>
+										if {[N ubyte 27 0 0 & 143 == 0]} {
+											>
+												if {[N ubyte 27 0 0 & 70 < 64]} {
+													>
+														if {[N ulelong 28 0 0 {} {} > 33]} {
+															>
+																if {[S regex 0 0 {} {} eq \[\[:print:\]\]*]} {
+																	>
+																		emit {NEC PC-88 disk image, name=%s}
+																		switch [Nv ubyte 27 0 {} {}] {
+																			0 {
+																				>
+																					emit {\b, media=2D}
+																				<
+																			}
+																			16 {
+																				>
+																					emit {\b, media=2DD}
+																				<
+																			}
+																			32 {
+																				>
+																					emit {\b, media=2HD}
+																				<
+																			}
+																			48 {
+																				>
+																					emit {\b, media=1D}
+																				<
+																			}
+																			64 {
+																				>
+																					emit {\b, media=1DD}
+																				<
+																			}
+																		}
+	
+																		if {[N ubyte 26 0 0 {} {} == 16]} {
+																			>
+																				emit {\b, write-protected}
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[S pstring 0 0 {} {} eq HDD\ Raw\ Copy\ Tool]} {
+		>
+			emit %s
+			if {[S pstring 256 0 {} {} x {}]} {
+				>
+					emit %s
+				<
+			}
+	
+			if {[S pstring 512 0 {} {} x {}]} {
+				>
+					emit {- HD model: %s}
+				<
+			}
+	
+			if {[S pstring 1024 0 {} {} x {}]} {
+				>
+					emit {serial: %s}
+					ext imgc
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FP1]} {
+		>
+			emit {libfprint fingerprint data V1}
+			if {[N beshort 3 0 0 {} {} x {}]} {
+				>
+					emit {\b, driver_id %x}
+				<
+			}
+	
+			if {[N belong 5 0 0 {} {} x {}]} {
+				>
+					emit {\b, devtype %x}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FP2]} {
+		>
+			emit {libfprint fingerprint data V2}
+			if {[N beshort 3 0 0 {} {} x {}]} {
+				>
+					emit {\b, driver_id %x}
+				<
+			}
+	
+			if {[N belong 5 0 0 {} {} x {}]} {
+				>
+					emit {\b, devtype %x}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq WS]} {
+		>
+			if {[N ulelong 4 0 0 {} {} > 14]} {
+				>
+					if {[N ubyte 3 0 0 {} {} != 0]} {
+						>
+							U 81 swf-details 0
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FLV\x01]} {
+		>
+			emit {Macromedia Flash Video}
+			mime video/x-flv
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AGD2\xbe\xb8\xbb\xcd\x00]} {
+		>
+			emit {Macromedia Freehand 7 Document}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AGD3\xbe\xb8\xbb\xcc\x00]} {
+		>
+			emit {Macromedia Freehand 8 Document}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AGD4\xbe\xb8\xbb\xcb\x00]} {
+		>
+			emit {Macromedia Freehand 9 Document}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FLIF]} {
+		>
+			emit FLIF
+			if {[S string 4 0 {} {} < H]} {
+				>
+					emit {image data}
+					if {[N beshort 6 0 0 {} {} x {}]} {
+						>
+							emit {\b, %u}
+						<
+					}
+	
+					if {[N beshort 8 0 0 {} {} x {}]} {
+						>
+							emit {\bx%u}
+						<
+					}
+	
+					if {[S string 5 0 {} {} eq 1]} {
+						>
+							emit {\b, 8-bit/color,}
+						<
+					}
+	
+					if {[S string 5 0 {} {} eq 2]} {
+						>
+							emit {\b, 16-bit/color,}
+						<
+					}
+	
+					if {[S string 4 0 {} {} eq 1]} {
+						>
+							emit {\b, grayscale, non-interlaced}
+						<
+					}
+	
+					if {[S string 4 0 {} {} eq 3]} {
+						>
+							emit {\b, RGB, non-interlaced}
+						<
+					}
+	
+					if {[S string 4 0 {} {} eq 4]} {
+						>
+							emit {\b, RGBA, non-interlaced}
+						<
+					}
+	
+					if {[S string 4 0 {} {} eq A]} {
+						>
+							emit {\b, grayscale}
+						<
+					}
+	
+					if {[S string 4 0 {} {} eq C]} {
+						>
+							emit {\b, RGB, interlaced}
+						<
+					}
+	
+					if {[S string 4 0 {} {} eq D]} {
+						>
+							emit {\b, RGBA, interlaced}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 4 0 {} {} > H]} {
+				>
+					emit {\b, animation data}
+					if {[N ubyte 5 0 0 {} {} < 255]} {
+						>
+							emit {\b, %i frames}
+							if {[N beshort 7 0 0 {} {} x {}]} {
+								>
+									emit {\b, %u}
+								<
+							}
+	
+							if {[N beshort 9 0 0 {} {} x {}]} {
+								>
+									emit {\bx%u}
+								<
+							}
+	
+							if {[S string 6 0 {} {} eq 1]} {
+								>
+									emit {\b, 8-bit/color}
+								<
+							}
+	
+							if {[S string 6 0 {} {} eq 2]} {
+								>
+									emit {\b, 16-bit/color}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ubyte 5 0 0 {} {} == 255]} {
+						>
+							if {[N beshort 6 0 0 {} {} x {}]} {
+								>
+									emit {\b, %i frames,}
+								<
+							}
+	
+							if {[N beshort 9 0 0 {} {} x {}]} {
+								>
+									emit {\b, %u}
+								<
+							}
+	
+							if {[N beshort 11 0 0 {} {} x {}]} {
+								>
+									emit {\bx%u}
+								<
+							}
+	
+							if {[S string 8 0 {} {} eq 1]} {
+								>
+									emit {\b, 8-bit/color}
+								<
+							}
+	
+							if {[S string 8 0 {} {} eq 2]} {
+								>
+									emit {\b, 16-bit/color}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string 4 0 {} {} eq Q]} {
+						>
+							emit {\b, grayscale, non-interlaced}
+						<
+					}
+	
+					if {[S string 4 0 {} {} eq S]} {
+						>
+							emit {\b, RGB, non-interlaced}
+						<
+					}
+	
+					if {[S string 4 0 {} {} eq T]} {
+						>
+							emit {\b, RGBA, non-interlaced}
+						<
+					}
+	
+					if {[S string 4 0 {} {} eq a]} {
+						>
+							emit {\b, grayscale}
+						<
+					}
+	
+					if {[S string 4 0 {} {} eq c]} {
+						>
+							emit {\b, RGB, interlaced}
+						<
+					}
+	
+					if {[S string 4 0 {} {} eq d]} {
+						>
+							emit {\b, RGBA, interlaced}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq FONT]} {
+		>
+			emit {ASCII vfont text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %!PS-AdobeFont-1.]} {
+		>
+			emit {PostScript Type 1 font text}
+			if {[S string 20 0 {} {} > \0]} {
+				>
+					emit (%s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 6 0 {} {} eq %!PS-AdobeFont-1.]} {
+		>
+			emit {PostScript Type 1 font program data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %!FontType1]} {
+		>
+			emit {PostScript Type 1 font program data}
+		<
+	}
+	
+	if {[S string 6 0 {} {} eq %!FontType1]} {
+		>
+			emit {PostScript Type 1 font program data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %!PS-Adobe-3.0\ Resource-Font]} {
+		>
+			emit {PostScript Type 1 font text}
+		<
+	}
+	
+	if {[N uleshort 0 0 0 {} {} == 256]} {
+		>
+			if {[N uleshort 66 0 0 {} {} == 129]} {
+				>
+					if {[S string [I 101 ulelong 0 + 0 0] 0 c {} eq Postscript]} {
+						>
+							emit {Printer Font Metrics}
+							if {[N ulelong 139 0 0 {} {} > 0]} {
+								>
+									if {[S string [I 139 ulelong 0 + 0 0] 0 {} {} x {}]} {
+										>
+											emit %s
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ulelong 2 0 0 {} {} x {}]} {
+								>
+									emit {\b, %d bytes}
+								<
+							}
+	
+							if {[N ulelong 105 0 0 {} {} > 0]} {
+								>
+									if {[S string [I 105 ulelong 0 + 0 0] 0 {} {} x {}]} {
+										>
+											emit {\b, %s}
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ubyte 80 0 0 {} {} == 1]} {
+								>
+									emit italic
+								<
+							}
+	
+							if {[N ubyte 81 0 0 {} {} == 1]} {
+								>
+									emit underline
+								<
+							}
+	
+							if {[N ubyte 82 0 0 {} {} == 1]} {
+								>
+									emit strikeout
+								<
+							}
+	
+							if {[N uleshort 83 0 0 {} {} > 699]} {
+								>
+									emit bold
+								<
+							}
+	
+							switch [Nv ubyte 90 0 {} {}] {
+								16 {
+									>
+										emit serif
+									<
+								}
+								17 {
+									>
+										emit {serif proportional}
+									<
+								}
+								49 {
+									>
+										emit proportional
+									<
+								}
+								64 {
+									>
+										emit script
+									<
+								}
+								65 {
+									>
+										emit {script proportional}
+									<
+								}
+							}
+	
+							mime application/x-font-pfm
+							ext pfm
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq STARTFONT\ ]} {
+		>
+			emit {X11 BDF font text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FILE]} {
+		>
+			if {[S string 8 0 {} {} eq PFF2]} {
+				>
+					if {[N ubelong 4 0 0 {} {} == 4]} {
+						>
+							if {[S string 12 0 {} {} eq NAME]} {
+								>
+									emit {GRUB2 font}
+									if {[N ubelong 16 0 0 {} {} > 0]} {
+										>
+											if {[S string 20 0 {} {} > \0]} {
+												>
+													emit {"%-s"}
+												<
+											}
+	
+										<
+									}
+	
+									mime application/x-font-pf2
+									ext pf2
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \001fcp]} {
+		>
+			emit {X11 Portable Compiled Font data,}
+			if {[N lelong 12 0 0 {} {} ^ 8]} {
+				>
+					emit {bit: LSB,}
+				<
+			}
+	
+			if {[N lelong 12 0 0 {} {} & 8]} {
+				>
+					emit {bit: MSB,}
+				<
+			}
+	
+			if {[N lelong 12 0 0 {} {} ^ 4]} {
+				>
+					emit {byte: LSB first}
+				<
+			}
+	
+			if {[N lelong 12 0 0 {} {} & 4]} {
+				>
+					emit {byte: MSB first}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq D1.0\015]} {
+		>
+			emit {X11 Speedo font data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq flf]} {
+		>
+			emit {FIGlet font}
+			if {[S string 3 0 {} {} > 2a]} {
+				>
+					emit {version %-2.2s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq flc]} {
+		>
+			emit {FIGlet controlfile}
+			if {[S string 3 0 {} {} > 2a]} {
+				>
+					emit {version %-2.2s}
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv belong 7 0 {} {}] {
+		4540225 {
+			>
+				emit {DOS code page font data}
+			<
+		}
+		5654852 {
+			>
+				emit {DOS code page font data (from Linux?)}
+			<
+		}
+	}
+	
+	if {[S string 4098 0 {} {} eq DOSFONT]} {
+		>
+			emit {DOSFONT2 encrypted font data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PFR1]} {
+		>
+			emit {Portable Font Resource font data (new)}
+			if {[S string 102 0 {} {} > 0]} {
+				>
+					emit {\b: %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PFR0]} {
+		>
+			emit {Portable Font Resource font data (old)}
+			if {[N beshort 4 0 0 {} {} > 0]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq typ1]} {
+		>
+			U 83 sfnt-font 0
+	
+			U 83 sfnt-names 0
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq true]} {
+		>
+			U 83 sfnt-font 0
+	
+			U 83 sfnt-names 0
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000\001\000\000]} {
+		>
+			U 83 sfnt-font 0
+	
+			U 83 sfnt-names 0
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \007\001\001\000Copyright\ (c)\ 199]} {
+		>
+			emit {Adobe Multiple Master font}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \012\001\001\000Copyright\ (c)\ 199]} {
+		>
+			emit {Adobe Multiple Master font}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ttcf]} {
+		>
+			if {[N ubyte 4 0 0 {} {} == 0]} {
+				>
+					if {[N ubelong [I 12 ubelong 0 + 0 0] 0 0 {} {} != 1330926671]} {
+						>
+							emit TrueType
+							ext ttc
+						<
+					}
+	
+					if {[N ubelong [I 12 ubelong 0 + 0 0] 0 0 {} {} == 1330926671]} {
+						>
+							emit OpenType
+							ext ttc/otc
+						<
+					}
+	
+					if {[N ubyte 4 0 0 {} {} x {}]} {
+						>
+							emit {font collection data}
+							mime application/font-sfnt
+						<
+					}
+	
+					switch [Nv belong 4 0 {} {}] {
+						65536 {
+							>
+								emit {\b, 1.0}
+							<
+						}
+						131072 {
+							>
+								emit {\b, 2.0}
+							<
+						}
+					}
+	
+					if {[N ubelong 8 0 0 {} {} > 0]} {
+						>
+							emit {\b, %d fonts}
+						<
+					}
+	
+					if {[N ubequad [I 8 ubelong 0 * 0 4] 0 0 {} {} x {}]} {
+						>
+							if {[N belong [R 4] 0 0 {} {} == 1146308935]} {
+								>
+									emit {\b, digitally signed}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ubelong 12 0 0 {} {} x {}]} {
+						>
+							emit {\b, at 0x%x}
+						<
+					}
+	
+					U 83 sfnt-font [I 12 ubelong 0 + 0 0]
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq OTTO]} {
+		>
+			emit {OpenType font data}
+			mime application/vnd.ms-opentype
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SplineFontDB:]} {
+		>
+			emit {Spline Font Database}
+			if {[S string 14 0 {} {} x {}]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+			mime application/vnd.font-fontforge-sfd
+		<
+	}
+	
+	if {[S string 64 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+		>
+			if {[S string 34 0 {} {} eq LP]} {
+				>
+					emit {Embedded OpenType (EOT)}
+					if {[N short 82 0 0 {} {} != 0]} {
+						>
+							if {[S lestring16 84 0 {} {} x {}]} {
+								>
+									emit {\b, %s family}
+									mime application/vnd.ms-fontobject
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq wOFF]} {
+		>
+			emit {Web Open Font Format}
+			U 83 woff 0
+	
+			if {[N beshort 20 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d}
+				<
+			}
+	
+			if {[N beshort 22 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq wOF2]} {
+		>
+			emit {Web Open Font Format (Version 2)}
+			U 83 woff 0
+	
+			if {[N beshort 24 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d}
+				<
+			}
+	
+			if {[N beshort 26 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 l 100 ne ^\[^Cc\ \t\].*\$]} {
+		>
+			if {[S regex 0 0 l 100 eq ^\[Cc\]\[\ \t\]]} {
+				>
+					emit {FORTRAN program text}
+					mime text/x-fortran
+					strength {- 5}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <MakerFile]} {
+		>
+			emit {FrameMaker document}
+			if {[S string 11 0 {} {} eq 5.5]} {
+				>
+					emit (5.5
+				<
+			}
+	
+			if {[S string 11 0 {} {} eq 5.0]} {
+				>
+					emit (5.0
+				<
+			}
+	
+			if {[S string 11 0 {} {} eq 4.0]} {
+				>
+					emit (4.0
+				<
+			}
+	
+			if {[S string 11 0 {} {} eq 3.0]} {
+				>
+					emit (3.0
+				<
+			}
+	
+			if {[S string 11 0 {} {} eq 2.0]} {
+				>
+					emit (2.0
+				<
+			}
+	
+			if {[S string 11 0 {} {} eq 1.0]} {
+				>
+					emit (1.0
+				<
+			}
+	
+			if {[N byte 14 0 0 {} {} x {}]} {
+				>
+					emit %c)
+				<
+			}
+	
+			mime application/x-mif
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <MIFFile]} {
+		>
+			emit {FrameMaker MIF (ASCII) file}
+			if {[S string 9 0 {} {} eq 4.0]} {
+				>
+					emit (4.0)
+				<
+			}
+	
+			if {[S string 9 0 {} {} eq 3.0]} {
+				>
+					emit (3.0)
+				<
+			}
+	
+			if {[S string 9 0 {} {} eq 2.0]} {
+				>
+					emit (2.0)
+				<
+			}
+	
+			if {[S string 9 0 {} {} eq 1.0]} {
+				>
+					emit (1.x)
+				<
+			}
+	
+			mime application/x-mif
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq <MakerDictionary]} {
+		>
+			emit {FrameMaker Dictionary text}
+			if {[S string 17 0 {} {} eq 3.0]} {
+				>
+					emit (3.0)
+				<
+			}
+	
+			if {[S string 17 0 {} {} eq 2.0]} {
+				>
+					emit (2.0)
+				<
+			}
+	
+			if {[S string 17 0 {} {} eq 1.0]} {
+				>
+					emit (1.x)
+				<
+			}
+	
+			mime application/x-mif
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <MakerScreenFont]} {
+		>
+			emit {FrameMaker Font file}
+			if {[S string 17 0 {} {} eq 1.01]} {
+				>
+					emit (%s)
+				<
+			}
+	
+			mime application/x-mif
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <MML]} {
+		>
+			emit {FrameMaker MML file}
+			mime application/x-mif
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <BookFile]} {
+		>
+			emit {FrameMaker Book file}
+			if {[S string 10 0 {} {} eq 3.0]} {
+				>
+					emit (3.0
+				<
+			}
+	
+			if {[S string 10 0 {} {} eq 2.0]} {
+				>
+					emit (2.0
+				<
+			}
+	
+			if {[S string 10 0 {} {} eq 1.0]} {
+				>
+					emit (1.0
+				<
+			}
+	
+			if {[N byte 13 0 0 {} {} x {}]} {
+				>
+					emit %c)
+				<
+			}
+	
+			mime application/x-mif
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <Maker\040Intermediate\040Print\040File]} {
+		>
+			emit {FrameMaker IPL file}
+			mime application/x-mif
+		<
+	}
+	
+	switch [Nv lelong 0 0 & 67108863] {
+		8782028 {
+			>
+				emit {FreeBSD/i386 compact demand paged}
+				if {[N lelong 20 0 0 {} {} < 4096]} {
+					>
+						if {[N byte 3 0 0 & -64 & -128]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						switch [Nv byte 3 0 & -64] {
+							0 {
+								>
+									emit object
+								<
+							}
+							64 {
+								>
+									emit {PIC object}
+								<
+							}
+						}
+	
+					<
+				}
+	
+				if {[N lelong 20 0 0 {} {} > 4095]} {
+					>
+						switch [Nv byte 3 0 & -128] {
+							-128 {
+								>
+									emit {dynamically linked executable}
+								<
+							}
+							0 {
+								>
+									emit executable
+								<
+							}
+						}
+	
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8782087 {
+			>
+				emit FreeBSD/i386
+				if {[N lelong 20 0 0 {} {} < 4096]} {
+					>
+						if {[N byte 3 0 0 & -64 & -128]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						switch [Nv byte 3 0 & -64] {
+							0 {
+								>
+									emit object
+								<
+							}
+							64 {
+								>
+									emit {PIC object}
+								<
+							}
+						}
+	
+					<
+				}
+	
+				if {[N lelong 20 0 0 {} {} > 4095]} {
+					>
+						switch [Nv byte 3 0 & -128] {
+							-128 {
+								>
+									emit {dynamically linked executable}
+								<
+							}
+							0 {
+								>
+									emit executable
+								<
+							}
+						}
+	
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8782088 {
+			>
+				emit {FreeBSD/i386 pure}
+				if {[N lelong 20 0 0 {} {} < 4096]} {
+					>
+						if {[N byte 3 0 0 & -64 & -128]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						switch [Nv byte 3 0 & -64] {
+							0 {
+								>
+									emit object
+								<
+							}
+							64 {
+								>
+									emit {PIC object}
+								<
+							}
+						}
+	
+					<
+				}
+	
+				if {[N lelong 20 0 0 {} {} > 4095]} {
+					>
+						switch [Nv byte 3 0 & -128] {
+							-128 {
+								>
+									emit {dynamically linked executable}
+								<
+							}
+							0 {
+								>
+									emit executable
+								<
+							}
+						}
+	
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8782091 {
+			>
+				emit {FreeBSD/i386 demand paged}
+				if {[N lelong 20 0 0 {} {} < 4096]} {
+					>
+						if {[N byte 3 0 0 & -64 & -128]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						switch [Nv byte 3 0 & -64] {
+							0 {
+								>
+									emit object
+								<
+							}
+							64 {
+								>
+									emit {PIC object}
+								<
+							}
+						}
+	
+					<
+				}
+	
+				if {[N lelong 20 0 0 {} {} > 4095]} {
+					>
+						switch [Nv byte 3 0 & -128] {
+							-128 {
+								>
+									emit {dynamically linked executable}
+								<
+							}
+							0 {
+								>
+									emit executable
+								<
+							}
+						}
+	
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[S string 7 0 {} {} eq \357\020\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+		>
+			emit {FreeBSD/i386 a.out core file}
+			if {[S string 1039 0 {} {} > \0]} {
+				>
+					emit {from '%s'}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SCRSHOT_]} {
+		>
+			emit {scrshot(1) screenshot,}
+			if {[N byte 8 0 0 {} {} x {}]} {
+				>
+					emit {version %d,}
+				<
+			}
+	
+			if {[N byte 9 0 0 {} {} == 2]} {
+				>
+					emit {%d bytes in header,}
+					if {[N byte 10 0 0 {} {} x {}]} {
+						>
+							emit {%d chars wide by}
+						<
+					}
+	
+					if {[N byte 11 0 0 {} {} x {}]} {
+						>
+							emit {%d chars high}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ClamAV-VDB:]} {
+		>
+			if {[S string 11 0 {} {} > \0]} {
+				>
+					emit {Clam AntiVirus database %-.23s}
+					if {[S string 34 0 {} {} eq :]} {
+						>
+							if {[S string 35 0 {} {} ne :]} {
+								>
+									emit {\b, version}
+									if {[S string 35 0 {} {} x {}]} {
+										>
+											emit {\b %-.1s}
+											if {[S string 36 0 {} {} ne :]} {
+												>
+													if {[S string 36 0 {} {} x {}]} {
+														>
+															emit {\b%-.1s}
+															if {[S string 37 0 {} {} ne :]} {
+																>
+																	if {[S string 37 0 {} {} x {}]} {
+																		>
+																			emit {\b%-.1s}
+																			if {[S string 38 0 {} {} ne :]} {
+																				>
+																					if {[S string 38 0 {} {} x {}]} {
+																						>
+																							emit {\b%-.1s}
+																							if {[S string 39 0 {} {} ne :]} {
+																								>
+																									if {[S string 39 0 {} {} x {}]} {
+																										>
+																											emit {\b%-.1s}
+																										<
+																									}
+	
+																								<
+																							}
+	
+																						<
+																					}
+	
+																				<
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 512 0 {} {} eq \037\213]} {
+				>
+					emit {\b, gzipped}
+				<
+			}
+	
+			if {[S string 769 0 {} {} eq ustar\0]} {
+				>
+					emit {\b, tarred}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AVG7_ANTIVIRUS_VAULT_FILE]} {
+		>
+			emit {AVG 7 Antivirus vault file data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq X5O!P%@AP\[4\\PZX54(P^)7CC)7\}\$EICAR]} {
+		>
+			if {[S string 33 0 {} {} eq -STANDARD-ANTIVIRUS-TEST-FILE!\$H+H*]} {
+				>
+					emit {EICAR virus test files}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \037\135\211]} {
+		>
+			emit {FuseCompress(ed) data}
+			switch [Nv byte 3 0 {} {}] {
+				0 {
+					>
+						emit {(none format)}
+					<
+				}
+				1 {
+					>
+						emit {(bz2 format)}
+					<
+				}
+				2 {
+					>
+						emit {(gz format)}
+					<
+				}
+				3 {
+					>
+						emit {(lzo format)}
+					<
+				}
+				4 {
+					>
+						emit {(xor format)}
+					<
+				}
+			}
+	
+			if {[N byte 3 0 0 {} {} > 4]} {
+				>
+					emit {(unknown format)}
+				<
+			}
+	
+			if {[N long 4 0 0 {} {} x {}]} {
+				>
+					emit {uncompressed size: %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IDP2]} {
+		>
+			emit {Quake II 3D Model file,}
+			if {[N long 20 0 0 {} {} x {}]} {
+				>
+					emit {%u skin(s),}
+				<
+			}
+	
+			if {[N long 8 0 0 {} {} x {}]} {
+				>
+					emit {(%u x}
+				<
+			}
+	
+			if {[N long 12 0 0 {} {} x {}]} {
+				>
+					emit %u),
+				<
+			}
+	
+			if {[N long 40 0 0 {} {} x {}]} {
+				>
+					emit {%u frame(s),}
+				<
+			}
+	
+			if {[N long 16 0 0 {} {} x {}]} {
+				>
+					emit {Frame size %u bytes,}
+				<
+			}
+	
+			if {[N long 24 0 0 {} {} x {}]} {
+				>
+					emit {%u vertices/frame,}
+				<
+			}
+	
+			if {[N long 28 0 0 {} {} x {}]} {
+				>
+					emit {%u texture coordinates,}
+				<
+			}
+	
+			if {[N long 32 0 0 {} {} x {}]} {
+				>
+					emit {%u triangles/frame}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IBSP]} {
+		>
+			emit Quake
+			switch [Nv long 4 0 {} {}] {
+				38 {
+					>
+						emit {II Map file (BSP)}
+					<
+				}
+				46 {
+					>
+						emit {III Map file (BSP)}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IDS2]} {
+		>
+			emit {Quake II SP2 sprite file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xcb\x1dBoom\xe6\xff\x03\x01]} {
+		>
+			emit {Boom or linuxdoom demo}
+		<
+	}
+	
+	if {[S string 24 0 {} {} eq LxD\ 203]} {
+		>
+			emit {Linuxdoom save}
+			if {[S string 0 0 {} {} x {}]} {
+				>
+					emit {, name=%s}
+				<
+			}
+	
+			if {[S string 44 0 {} {} x {}]} {
+				>
+					emit {, world=%s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PACK]} {
+		>
+			if {[N ulelong 8 0 0 {} {} < 16777216]} {
+				>
+					if {[N ubyte [I 4 ulelong 0 + 0 55] 0 0 {} {} == 0]} {
+						>
+							emit {Quake I or II world or extension}
+							if {[N ulelong 8 0 0 / 64 x {}]} {
+								>
+									emit {\b, %u files}
+								<
+							}
+	
+							if {[N ulelong 4 0 0 {} {} x {}]} {
+								>
+									emit {\b, offset 0x%x}
+								<
+							}
+	
+							U 89 pak-entry [I 4 ulelong 0 + 0 0]
+	
+							mime application/x-dzip
+							ext pak
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aIntroduction]} {
+		>
+			emit {Quake I save: start Introduction}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Slipgate_Complex]} {
+		>
+			emit {Quake I save: e1m1 The slipgate complex}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aCastle_of_the_Damned]} {
+		>
+			emit {Quake I save: e1m2 Castle of the damned}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Necropolis]} {
+		>
+			emit {Quake I save: e1m3 The necropolis}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Grisly_Grotto]} {
+		>
+			emit {Quake I save: e1m4 The grisly grotto}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aZiggurat_Vertigo]} {
+		>
+			emit {Quake I save: e1m8 Ziggurat vertigo (secret)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aGloom_Keep]} {
+		>
+			emit {Quake I save: e1m5 Gloom keep}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Door_To_Chthon]} {
+		>
+			emit {Quake I save: e1m6 The door to Chthon}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_House_of_Chthon]} {
+		>
+			emit {Quake I save: e1m7 The house of Chthon}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Installation]} {
+		>
+			emit {Quake I save: e2m1 The installation}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Ogre_Citadel]} {
+		>
+			emit {Quake I save: e2m2 The ogre citadel}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Crypt_of_Decay]} {
+		>
+			emit {Quake I save: e2m3 The crypt of decay (dopefish lives!)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aUnderearth]} {
+		>
+			emit {Quake I save: e2m7 Underearth (secret)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Ebon_Fortress]} {
+		>
+			emit {Quake I save: e2m4 The ebon fortress}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Wizard's_Manse]} {
+		>
+			emit {Quake I save: e2m5 The wizard's manse}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Dismal_Oubliette]} {
+		>
+			emit {Quake I save: e2m6 The dismal oubliette}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aTermination_Central]} {
+		>
+			emit {Quake I save: e3m1 Termination central}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aVaults_of_Zin]} {
+		>
+			emit {Quake I save: e3m2 Vaults of Zin}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Tomb_of_Terror]} {
+		>
+			emit {Quake I save: e3m3 The tomb of terror}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aSatan's_Dark_Delight]} {
+		>
+			emit {Quake I save: e3m4 Satan's dark delight}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Haunted_Halls]} {
+		>
+			emit {Quake I save: e3m7 The haunted halls (secret)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aWind_Tunnels]} {
+		>
+			emit {Quake I save: e3m5 Wind tunnels}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aChambers_of_Torment]} {
+		>
+			emit {Quake I save: e3m6 Chambers of torment}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Sewage_System]} {
+		>
+			emit {Quake I save: e4m1 The sewage system}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Tower_of_Despair]} {
+		>
+			emit {Quake I save: e4m2 The tower of despair}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Elder_God_Shrine]} {
+		>
+			emit {Quake I save: e4m3 The elder god shrine}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Palace_of_Hate]} {
+		>
+			emit {Quake I save: e4m4 The palace of hate}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aHell's_Atrium]} {
+		>
+			emit {Quake I save: e4m5 Hell's atrium}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Nameless_City]} {
+		>
+			emit {Quake I save: e4m8 The nameless city (secret)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Pain_Maze]} {
+		>
+			emit {Quake I save: e4m6 The pain maze}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aAzure_Agony]} {
+		>
+			emit {Quake I save: e4m7 Azure agony}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aShub-Niggurath's_Pit]} {
+		>
+			emit {Quake I save: end Shub-Niggurath's pit}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aPlace_of_Two_Deaths]} {
+		>
+			emit {Quake I save: dm1 Place of two deaths}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aClaustrophobopolis]} {
+		>
+			emit {Quake I save: dm2 Claustrophobopolis}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Abandoned_Base]} {
+		>
+			emit {Quake I save: dm3 The abandoned base}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Bad_Place]} {
+		>
+			emit {Quake I save: dm4 The bad place}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Cistern]} {
+		>
+			emit {Quake I save: dm5 The cistern}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Dark_Zone]} {
+		>
+			emit {Quake I save: dm6 The dark zone}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aCommand_HQ]} {
+		>
+			emit {Quake I save: start Command HQ}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Pumping_Station]} {
+		>
+			emit {Quake I save: hip1m1 The pumping station}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aStorage_Facility]} {
+		>
+			emit {Quake I save: hip1m2 Storage facility}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aMilitary_Complex]} {
+		>
+			emit {Quake I save: hip1m5 Military complex (secret)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Lost_Mine]} {
+		>
+			emit {Quake I save: hip1m3 The lost mine}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aResearch_Facility]} {
+		>
+			emit {Quake I save: hip1m4 Research facility}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aAncient_Realms]} {
+		>
+			emit {Quake I save: hip2m1 Ancient realms}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Gremlin's_Domain]} {
+		>
+			emit {Quake I save: hip2m6 The gremlin's domain (secret)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Black_Cathedral]} {
+		>
+			emit {Quake I save: hip2m2 The black cathedral}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Catacombs]} {
+		>
+			emit {Quake I save: hip2m3 The catacombs}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Crypt__]} {
+		>
+			emit {Quake I save: hip2m4 The crypt}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aMortum's_Keep]} {
+		>
+			emit {Quake I save: hip2m5 Mortum's keep}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aTur_Torment]} {
+		>
+			emit {Quake I save: hip3m1 Tur torment}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aPandemonium]} {
+		>
+			emit {Quake I save: hip3m2 Pandemonium}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aLimbo]} {
+		>
+			emit {Quake I save: hip3m3 Limbo}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0athe_Edge_of_Oblivion]} {
+		>
+			emit {Quake I save: hipdm1 The edge of oblivion (secret)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Gauntlet]} {
+		>
+			emit {Quake I save: hip3m4 The gauntlet}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aArmagon's_Lair]} {
+		>
+			emit {Quake I save: hipend Armagon's lair}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Academy]} {
+		>
+			emit {Quake I save: start The academy}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Lab]} {
+		>
+			emit {Quake I save: d1 The lab}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aArea_33]} {
+		>
+			emit {Quake I save: d1b Area 33}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aSECRET_MISSIONS]} {
+		>
+			emit {Quake I save: d3b Secret missions}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Hospital]} {
+		>
+			emit {Quake I save: d10 The hospital (secret)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Genetics_Lab]} {
+		>
+			emit {Quake I save: d11 The genetics lab (secret)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aBACK_2_MALICE]} {
+		>
+			emit {Quake I save: d4b Back to Malice}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aArea44]} {
+		>
+			emit {Quake I save: d1c Area 44}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aTakahiro_Towers]} {
+		>
+			emit {Quake I save: d2 Takahiro towers}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aA_Rat's_Life]} {
+		>
+			emit {Quake I save: d3 A rat's life}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aInto_The_Flood]} {
+		>
+			emit {Quake I save: d4 Into the flood}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Flood]} {
+		>
+			emit {Quake I save: d5 The flood}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aNuclear_Plant]} {
+		>
+			emit {Quake I save: d6 Nuclear plant}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Incinerator_Plant]} {
+		>
+			emit {Quake I save: d7 The incinerator plant}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Foundry]} {
+		>
+			emit {Quake I save: d7b The foundry}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Underwater_Base]} {
+		>
+			emit {Quake I save: d8 The underwater base}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aTakahiro_Base]} {
+		>
+			emit {Quake I save: d9 Takahiro base}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aTakahiro_Laboratories]} {
+		>
+			emit {Quake I save: d12 Takahiro laboratories}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aStayin'_Alive]} {
+		>
+			emit {Quake I save: d13 Stayin' alive}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aB.O.S.S._HQ]} {
+		>
+			emit {Quake I save: d14 B.O.S.S. HQ}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aSHOWDOWN!]} {
+		>
+			emit {Quake I save: d15 Showdown!}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aThe_Seventh_Precinct]} {
+		>
+			emit {Quake I save: ddm1 The seventh precinct}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aSub_Station]} {
+		>
+			emit {Quake I save: ddm2 Sub station}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aCrazy_Eights!]} {
+		>
+			emit {Quake I save: ddm3 Crazy eights!}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aEast_Side_Invertationa]} {
+		>
+			emit {Quake I save: ddm4 East side invertationa}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aSlaughterhouse]} {
+		>
+			emit {Quake I save: ddm5 Slaughterhouse}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aDOMINO]} {
+		>
+			emit {Quake I save: ddm6 Domino}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 5\x0aSANDRA'S_LADDER]} {
+		>
+			emit {Quake I save: ddm7 Sandra's ladder}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MComprHD]} {
+		>
+			emit {MAME CHD compressed hard disk image,}
+			if {[N belong 12 0 0 {} {} x {}]} {
+				>
+					emit {version %u}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IWAD]} {
+		>
+			emit {doom main IWAD data}
+			if {[N lelong 4 0 0 {} {} x {}]} {
+				>
+					emit {containing %d lumps}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PWAD]} {
+		>
+			emit {doom patch PWAD data}
+			if {[N lelong 4 0 0 {} {} x {}]} {
+				>
+					emit {containing %d lumps}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq KenSilverman]} {
+		>
+			emit {Build engine group file}
+			if {[N lelong 12 0 0 {} {} x {}]} {
+				>
+					emit {containing %d files}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Warcraft\ III\ recorded\ game]} {
+		>
+			emit %s
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HM3W]} {
+		>
+			emit {Warcraft III map file}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq \\(\;.*GM\\\[\[0-9\]\{1,2\}\\\]]} {
+		>
+			emit {Smart Game Format}
+			if {[S search 2 0 b 512 eq GM\[]} {
+				>
+					if {[S string [R 0] 0 {} {} eq 1\]]} {
+						>
+							emit (Go)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 2\]]} {
+						>
+							emit (Othello)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 3\]]} {
+						>
+							emit (chess)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 4\]]} {
+						>
+							emit (Gomoku+Renju)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 5\]]} {
+						>
+							emit {(Nine Men's Morris)}
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 6\]]} {
+						>
+							emit (Backgammon)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 7\]]} {
+						>
+							emit {(Chinese chess)}
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 8\]]} {
+						>
+							emit (Shogi)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 9\]]} {
+						>
+							emit {(Lines of Action)}
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 10\]]} {
+						>
+							emit (Ataxx)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 11\]]} {
+						>
+							emit (Hex)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 12\]]} {
+						>
+							emit (Jungle)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 13\]]} {
+						>
+							emit (Neutron)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 14\]]} {
+						>
+							emit {(Philosopher's Football)}
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 15\]]} {
+						>
+							emit (Quadrature)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 16\]]} {
+						>
+							emit (Trax)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 17\]]} {
+						>
+							emit (Tantrix)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 18\]]} {
+						>
+							emit (Amazons)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 19\]]} {
+						>
+							emit (Octi)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 20\]]} {
+						>
+							emit (Gess)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 21\]]} {
+						>
+							emit (Twixt)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 22\]]} {
+						>
+							emit (Zertz)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 23\]]} {
+						>
+							emit (Plateau)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 24\]]} {
+						>
+							emit (Yinsh)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 25\]]} {
+						>
+							emit (Punct)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 26\]]} {
+						>
+							emit (Gobblet)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 27\]]} {
+						>
+							emit (hive)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 28\]]} {
+						>
+							emit (Exxit)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 29\]]} {
+						>
+							emit (Hnefatal)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 30\]]} {
+						>
+							emit (Kuba)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 31\]]} {
+						>
+							emit (Tripples)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 32\]]} {
+						>
+							emit (Chase)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 33\]]} {
+						>
+							emit {(Tumbling Down)}
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 34\]]} {
+						>
+							emit (Sahara)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 35\]]} {
+						>
+							emit (Byte)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 36\]]} {
+						>
+							emit (Focus)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 37\]]} {
+						>
+							emit (Dvonn)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 38\]]} {
+						>
+							emit (Tamsk)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 39\]]} {
+						>
+							emit (Gipf)
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq 40\]]} {
+						>
+							emit (Kropki)
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Gamebryo\ File\ Format,\ Version\ ]} {
+		>
+			emit {Gamebryo game engine file}
+			if {[S regex [R 0] 0 {} {} eq \[0-9a-z.\]+]} {
+				>
+					emit {\b, version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \;Gamebryo\ KFM\ File\ Version\ ]} {
+		>
+			emit {Gamebryo game engine animation File}
+			if {[S regex [R 0] 0 {} {} eq \[0-9a-z.\]+]} {
+				>
+					emit {\b, version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NetImmerse\ File\ Format,\ Versio]} {
+		>
+			if {[S string [R 0] 0 {} {} eq n\ ]} {
+				>
+					emit {NetImmerse game engine file}
+					if {[S regex [R 0] 0 {} {} eq \[0-9a-z.\]+]} {
+						>
+							emit {\b, version %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 2 0 c {} eq \\(\;.*GM\\\[\[0-9\]\{1,2\}\\\]]} {
+		>
+			emit {Smart Game Format}
+			if {[S regex 2 0 c {} eq GM\\\[1\\\]]} {
+				>
+					emit {- Go Game}
+				<
+			}
+	
+			if {[S regex 2 0 c {} eq GM\\\[6\\\]]} {
+				>
+					emit {- BackGammon Game}
+				<
+			}
+	
+			if {[S regex 2 0 c {} eq GM\\\[11\\\]]} {
+				>
+					emit {- Hex Game}
+				<
+			}
+	
+			if {[S regex 2 0 c {} eq GM\\\[18\\\]]} {
+				>
+					emit {- Amazons Game}
+				<
+			}
+	
+			if {[S regex 2 0 c {} eq GM\\\[19\\\]]} {
+				>
+					emit {- Octi Game}
+				<
+			}
+	
+			if {[S regex 2 0 c {} eq GM\\\[20\\\]]} {
+				>
+					emit {- Gess Game}
+				<
+			}
+	
+			if {[S regex 2 0 c {} eq GM\\\[21\\\]]} {
+				>
+					emit {- twix Game}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq gpch]} {
+		>
+			emit {GCC precompiled header}
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {(version %c}
+				<
+			}
+	
+			if {[N byte 6 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 7 0 0 {} {} x {}]} {
+				>
+					emit {\b%c)}
+				<
+			}
+	
+			switch [Nv byte 4 0 {} {}] {
+				43 {
+					>
+						emit {for C++}
+					<
+				}
+				67 {
+					>
+						emit {for C}
+					<
+				}
+				79 {
+					>
+						emit {for Objective-C++}
+					<
+				}
+				111 {
+					>
+						emit {for Objective-C}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Identification_Information]} {
+		>
+			emit {FGDC ASCII metadata}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq KEB\ ]} {
+		>
+			emit {Knudsen seismic KEL binary (KEB) -}
+			if {[S regex 4 0 {} {} eq \[-A-Z0-9\]*]} {
+				>
+					emit {Software: %s}
+					if {[S regex [R 1] 0 {} {} eq V\[0-9\]*.\[0-9\]*]} {
+						>
+							emit {version %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HCA]} {
+		>
+			emit {LADS Caris Ascii Format (CAF) bathymetric lidar}
+			if {[S regex 4 0 {} {} eq \[0-9\]*.\[0-9\]*]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HCB]} {
+		>
+			emit {LADS Caris Binary Format (CBF) bathymetric lidar waveform data}
+			if {[N byte 3 0 0 {} {} x {}]} {
+				>
+					emit {version %d .}
+				<
+			}
+	
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit %d
+				<
+			}
+	
+		<
+	}
+	
+	if {[N beshort 4 0 0 {} {} == 8194]} {
+		>
+			emit {GeoSwath RDF}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Start:-]} {
+		>
+			emit {GeoSwatch auf text file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SB2100]} {
+		>
+			emit {SeaBeam 2100 multibeam sonar}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SB2100DR]} {
+		>
+			emit {SeaBeam 2100 DR multibeam sonar}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SB2100PR]} {
+		>
+			emit {SeaBeam 2100 PR multibeam sonar}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \$HSF]} {
+		>
+			emit {XSE multibeam}
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq GSF-v]} {
+		>
+			emit {SAIC generic sensor format (GSF) sonar data,}
+			if {[S regex [R 0] 0 {} {} eq \[0-9\]*.\[0-9\]*]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 9 0 {} {} eq MGD77]} {
+		>
+			emit {MGD77 Header, Marine Geophysical Data Exchange Format}
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq Swath\ Data\ File:]} {
+		>
+			emit {mbsystem info cache}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HDCS]} {
+		>
+			emit {Caris multibeam sonar related data}
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq Start/Stop\ parameter\ header:]} {
+		>
+			emit {Caris ASCII project summary}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %%\ TDR\ 2.0]} {
+		>
+			emit {IVS Fledermaus TDR file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq U3D]} {
+		>
+			emit {ECMA-363, Universal 3D}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \$@MID@\$]} {
+		>
+			emit {elog journal entry}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DSBB]} {
+		>
+			emit {Surfer 6 binary grid file}
+			if {[N leshort 4 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d}
+				<
+			}
+	
+			if {[N leshort 6 0 0 {} {} x {}]} {
+				>
+					emit {\bx%d}
+				<
+			}
+	
+			if {[N ledouble 8 0 0 {} {} x {}]} {
+				>
+					emit {\b, minx=%g}
+				<
+			}
+	
+			if {[N ledouble 16 0 0 {} {} x {}]} {
+				>
+					emit {\b, maxx=%g}
+				<
+			}
+	
+			if {[N ledouble 24 0 0 {} {} x {}]} {
+				>
+					emit {\b, miny=%g}
+				<
+			}
+	
+			if {[N ledouble 32 0 0 {} {} x {}]} {
+				>
+					emit {\b, maxy=%g}
+				<
+			}
+	
+			if {[N ledouble 40 0 0 {} {} x {}]} {
+				>
+					emit {\b, minz=%g}
+				<
+			}
+	
+			if {[N ledouble 48 0 0 {} {} x {}]} {
+				>
+					emit {\b, maxz=%g}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LASF]} {
+		>
+			emit {LIDAR point data records}
+			if {[N byte 24 0 0 {} {} > 0]} {
+				>
+					emit {\b, version %u}
+				<
+			}
+	
+			if {[N byte 25 0 0 {} {} > 0]} {
+				>
+					emit {\b.%u}
+				<
+			}
+	
+			if {[S string 26 0 {} {} > \0]} {
+				>
+					emit {\b, SYSID %s}
+				<
+			}
+	
+			if {[S string 58 0 {} {} > \0]} {
+				>
+					emit {\b, Generating Software %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ .PCD]} {
+		>
+			emit {Point Cloud Data}
+		<
+	}
+	
+	if {[S string 0 0 t {} eq GIMP\ Gradient]} {
+		>
+			emit {GIMP gradient data}
+		<
+	}
+	
+	if {[S string 0 0 t {} eq GIMP\ Palette]} {
+		>
+			emit {GIMP palette data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq gimp\ xcf]} {
+		>
+			emit {GIMP XCF image data,}
+			if {[S string 9 0 {} {} eq file]} {
+				>
+					emit {version 0,}
+				<
+			}
+	
+			if {[S string 9 0 {} {} eq v]} {
+				>
+					emit version
+					if {[S string 10 0 {} {} > \0]} {
+						>
+							emit %s,
+						<
+					}
+	
+				<
+			}
+	
+			if {[N belong 14 0 0 {} {} x {}]} {
+				>
+					emit {%u x}
+				<
+			}
+	
+			if {[N belong 18 0 0 {} {} x {}]} {
+				>
+					emit %u,
+				<
+			}
+	
+			switch [Nv belong 22 0 {} {}] {
+				0 {
+					>
+						emit {RGB Color}
+					<
+				}
+				1 {
+					>
+						emit Greyscale
+					<
+				}
+				2 {
+					>
+						emit {Indexed Color}
+					<
+				}
+			}
+	
+			if {[N belong 22 0 0 {} {} > 2]} {
+				>
+					emit {Unknown Image Type.}
+				<
+			}
+	
+			mime image/x-xcf
+		<
+	}
+	
+	if {[S string 20 0 {} {} eq GPAT]} {
+		>
+			emit {GIMP pattern data,}
+			if {[S string 24 0 {} {} x {}]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 20 0 {} {} eq GIMP]} {
+		>
+			emit {GIMP brush data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\040GIMP\040Curves\040File]} {
+		>
+			emit {GIMP curve file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GnomeKeyring\n\r\0\n]} {
+		>
+			emit {GNOME keyring}
+			if {[N ubyte [R 0] 0 0 {} {} == 0]} {
+				>
+					emit {\b, major version 0}
+					if {[N ubyte [R 0] 0 0 {} {} == 0]} {
+						>
+							emit {\b, minor version 0}
+							if {[N ubyte [R 0] 0 0 {} {} == 0]} {
+								>
+									emit {\b, crypto type 0 (AES)}
+								<
+							}
+	
+							if {[N ubyte [R 0] 0 0 {} {} > 0]} {
+								>
+									emit {\b, crypto type %u (unknown)}
+								<
+							}
+	
+							if {[N ubyte [R 1] 0 0 {} {} == 0]} {
+								>
+									emit {\b, hash type 0 (MD5)}
+								<
+							}
+	
+							if {[N ubyte [R 1] 0 0 {} {} > 0]} {
+								>
+									emit {\b, hash type %u (unknown)}
+								<
+							}
+	
+							if {[N ubelong [R 2] 0 0 {} {} == 4294967295]} {
+								>
+									emit {\b, name NULL}
+								<
+							}
+	
+							if {[N ubelong [R 2] 0 0 {} {} != 4294967295]} {
+								>
+									if {[N ubelong [R -4] 0 0 {} {} > 255]} {
+										>
+											emit {\b, name too long for file's pstring type}
+										<
+									}
+	
+									if {[N ubelong [R -4] 0 0 {} {} < 256]} {
+										>
+											if {[S pstring [R -1] 0 {} {} x {}]} {
+												>
+													emit {\b, name "%s"}
+													if {[N ubeqdate [R 0] 0 0 {} {} x {}]} {
+														>
+															emit {\b, last modified %s}
+														<
+													}
+	
+													if {[N ubeqdate [R 8] 0 0 {} {} x {}]} {
+														>
+															emit {\b, created %s}
+														<
+													}
+	
+													if {[N ubelong [R 16] 0 0 {} {} & 1]} {
+														>
+															if {[N ubelong [R 0] 0 0 {} {} x {}]} {
+																>
+																	emit {\b, locked if idle for %u seconds}
+																<
+															}
+	
+														<
+													}
+	
+													if {[N ubelong [R 16] 0 0 {} {} ^ 1]} {
+														>
+															emit {\b, not locked if idle}
+														<
+													}
+	
+													if {[N ubelong [R 24] 0 0 {} {} x {}]} {
+														>
+															emit {\b, hash iterations %u}
+														<
+													}
+	
+													if {[N ubequad [R 28] 0 0 {} {} x {}]} {
+														>
+															emit {\b, salt %llu}
+														<
+													}
+	
+													if {[N ubelong [R 52] 0 0 {} {} x {}]} {
+														>
+															emit {\b, %u item(s)}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq gtktalog]} {
+		>
+			emit {GNOME Catalogue (gtktalog)}
+			if {[S string 13 0 {} {} > \0]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GVariant]} {
+		>
+			emit {GVariant Database file,}
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GOBJ\nMETADATA\r\n\032]} {
+		>
+			emit {G-IR binary database}
+			if {[N byte 16 0 0 {} {} x {}]} {
+				>
+					emit {\b, v%d}
+				<
+			}
+	
+			if {[N byte 17 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+			if {[N leshort 20 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d entries}
+				<
+			}
+	
+			if {[N leshort 22 0 0 {} {} x {}]} {
+				>
+					emit {\b/%d local}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \336\22\4\225]} {
+		>
+			emit {GNU message catalog (little endian),}
+			if {[N ulelong 4 0 0 {} {} x {}]} {
+				>
+					emit revision
+					mime application/x-gettext-translation
+					ext gmo/mo
+				<
+			}
+	
+			if {[N ulelong 4 0 0 / 65535 x {}]} {
+				>
+					emit %u.
+				<
+			}
+	
+			if {[N ulelong 4 0 0 & 65535 x {}]} {
+				>
+					emit {\b%u}
+					if {[N ulelong 8 0 0 {} {} x {}]} {
+						>
+							emit {\b, %u message}
+						<
+					}
+	
+					if {[N ulelong 8 0 0 {} {} > 1]} {
+						>
+							emit {\bs}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulelong 4 0 0 & 65535 == 0]} {
+				>
+					if {[N ulelong 12 0 0 {} {} != 28]} {
+						>
+							emit {\b, at 0x%x string table}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulelong 4 0 0 & 65535 > 0]} {
+				>
+					if {[N ulelong 12 0 0 {} {} != 48]} {
+						>
+							emit {\b, at 0x%x string table}
+						<
+					}
+	
+					if {[N ulelong 36 0 0 {} {} x {}]} {
+						>
+							emit {\b, %u sysdep message}
+						<
+					}
+	
+					if {[N ulelong 36 0 0 {} {} > 1]} {
+						>
+							emit {\bs}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulelong [I 16 ulelong 0 + 0 0] 0 0 {} {} > 0]} {
+				>
+					if {[N ulelong [R 0] 0 0 {} {} x {}]} {
+						>
+							if {[S string [I [R -4] long 0 + 0 0] 0 {} {} x {}]} {
+								>
+									emit {\b, %s}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulelong [I 16 ulelong 0 + 0 8] 0 0 {} {} > 1]} {
+				>
+					if {[N ulelong [R 0] 0 0 {} {} x {}]} {
+						>
+							if {[N ubyte [I [R -4] long 0 + 0 0] 0 0 {} {} != 10]} {
+								>
+									if {[S string [R -1] 0 {} {} x {}]} {
+										>
+											emit '%s'
+										<
+									}
+	
+								<
+							}
+	
+							if {[N ubyte [I [R -4] long 0 + 0 0] 0 0 {} {} == 10]} {
+								>
+									if {[N ubyte [R 0] 0 0 {} {} != 10]} {
+										>
+											if {[S string [R -1] 0 {} {} x {}]} {
+												>
+													emit '%s'
+												<
+											}
+	
+										<
+									}
+	
+									if {[N ubyte [R 0] 0 0 {} {} == 10]} {
+										>
+											if {[S string [R 0] 0 {} {} x {}]} {
+												>
+													emit '%s'
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \225\4\22\336]} {
+		>
+			emit {GNU message catalog (big endian),}
+			if {[N beshort 4 0 0 {} {} x {}]} {
+				>
+					emit {revision %d.}
+				<
+			}
+	
+			if {[N beshort 6 0 0 {} {} > 0]} {
+				>
+					emit {\b%d,}
+					if {[N belong 8 0 0 {} {} x {}]} {
+						>
+							emit {%d messages,}
+						<
+					}
+	
+					if {[N belong 36 0 0 {} {} x {}]} {
+						>
+							emit {%d sysdep messages}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N beshort 6 0 0 {} {} == 0]} {
+				>
+					emit {\b%d,}
+					if {[N belong 8 0 0 {} {} x {}]} {
+						>
+							emit {%d messages}
+						<
+					}
+	
+				<
+			}
+	
+			mime application/x-gettext-translation
+			ext gmo/mo
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \001gpg]} {
+		>
+			emit {GPG key trust database}
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 39 0 {} {} eq <gmr:Workbook]} {
+		>
+			emit {Gnumeric spreadsheet}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0LOCATE]} {
+		>
+			emit {GNU findutils locate database data}
+			if {[S string 7 0 {} {} > \0]} {
+				>
+					emit {\b, format %s}
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq 02]} {
+				>
+					emit {\b (frcode)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1024 eq \nmsgid]} {
+		>
+			if {[S search [R 0] 0 {} 1024 eq \nmsgstr]} {
+				>
+					emit {GNU gettext message catalogue text}
+					mime text/x-po
+					strength +100
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 39 0 {} {} eq <gmr:Workbook]} {
+		>
+			emit {Gnumeric spreadsheet}
+			mime application/x-gnumeric
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq EFI\ PART]} {
+		>
+			emit {GPT data structure (nonstandard: at LBA 0)}
+			U 98 gpt-table 0
+	
+			if {[N ubyte 0 0 0 {} {} x {}]} {
+				>
+					emit {(sector size unknown)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lequad 8 0 0 {} {} == -6075971174239896308]} {
+		>
+			emit {Vulkan trace file, little-endian}
+			if {[N leshort 0 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N bequad 8 0 0 {} {} == -6075971174239896308]} {
+		>
+			emit {Vulkan trace file, big-endian}
+			if {[N beshort 0 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000\000\0001\000\000\0000\000\000\0000\000\000\0002\000\000\0000\000\000\0000\000\000\0003]} {
+		>
+			emit {old ACE/gr binary file}
+			if {[N byte 39 0 0 {} {} > 0]} {
+				>
+					emit {- version %c}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ xvgr\ parameter\ file]} {
+		>
+			emit {ACE/gr ascii file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ xmgr\ parameter\ file]} {
+		>
+			emit {ACE/gr ascii file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ ACE/gr\ parameter\ file]} {
+		>
+			emit {ACE/gr ascii file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ Grace\ project\ file]} {
+		>
+			emit {Grace project file}
+			if {[S string 23 0 {} {} eq @version\ ]} {
+				>
+					emit (version
+					if {[N byte 32 0 0 {} {} > 0]} {
+						>
+							emit %c
+						<
+					}
+	
+					if {[S string 33 0 {} {} > \0]} {
+						>
+							emit {\b.%.2s}
+						<
+					}
+	
+					if {[S string 35 0 {} {} > \0]} {
+						>
+							emit {\b.%.2s)}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ ACE/gr\ fit\ description\ ]} {
+		>
+			emit {ACE/gr fit description file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GRG]} {
+		>
+			emit {Gringotts data file}
+			if {[S string 3 0 {} {} eq 1]} {
+				>
+					emit {v.1, MCRYPT S2K, SERPENT crypt, SHA-256 hash, ZLib lvl.9}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq 2]} {
+				>
+					emit {v.2, MCRYPT S2K,}
+					switch [Nv byte 8 0 & 112] {
+						0 {
+							>
+								emit {RIJNDAEL-128 crypt,}
+							<
+						}
+						16 {
+							>
+								emit {SERPENT crypt,}
+							<
+						}
+						32 {
+							>
+								emit {TWOFISH crypt,}
+							<
+						}
+						48 {
+							>
+								emit {CAST-256 crypt,}
+							<
+						}
+						64 {
+							>
+								emit {SAFER+ crypt,}
+							<
+						}
+						80 {
+							>
+								emit {LOKI97 crypt,}
+							<
+						}
+						96 {
+							>
+								emit {3DES crypt,}
+							<
+						}
+						112 {
+							>
+								emit {RIJNDAEL-256 crypt,}
+							<
+						}
+					}
+	
+					switch [Nv byte 8 0 & 8] {
+						0 {
+							>
+								emit {SHA1 hash,}
+							<
+						}
+						8 {
+							>
+								emit {RIPEMD-160 hash,}
+							<
+						}
+					}
+	
+					switch [Nv byte 8 0 & 4] {
+						0 {
+							>
+								emit ZLib
+							<
+						}
+						4 {
+							>
+								emit BZip2
+							<
+						}
+					}
+	
+					switch [Nv byte 8 0 & 3] {
+						0 {
+							>
+								emit lvl.0
+							<
+						}
+						1 {
+							>
+								emit lvl.3
+							<
+						}
+						2 {
+							>
+								emit lvl.6
+							<
+						}
+						3 {
+							>
+								emit lvl.9
+							<
+						}
+					}
+	
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq 3]} {
+				>
+					emit {v.3, OpenPGP S2K,}
+					switch [Nv byte 8 0 & 112] {
+						0 {
+							>
+								emit {RIJNDAEL-128 crypt,}
+							<
+						}
+						16 {
+							>
+								emit {SERPENT crypt,}
+							<
+						}
+						32 {
+							>
+								emit {TWOFISH crypt,}
+							<
+						}
+						48 {
+							>
+								emit {CAST-256 crypt,}
+							<
+						}
+						64 {
+							>
+								emit {SAFER+ crypt,}
+							<
+						}
+						80 {
+							>
+								emit {LOKI97 crypt,}
+							<
+						}
+						96 {
+							>
+								emit {3DES crypt,}
+							<
+						}
+						112 {
+							>
+								emit {RIJNDAEL-256 crypt,}
+							<
+						}
+					}
+	
+					switch [Nv byte 8 0 & 8] {
+						0 {
+							>
+								emit {SHA1 hash,}
+							<
+						}
+						8 {
+							>
+								emit {RIPEMD-160 hash,}
+							<
+						}
+					}
+	
+					switch [Nv byte 8 0 & 4] {
+						0 {
+							>
+								emit ZLib
+							<
+						}
+						4 {
+							>
+								emit BZip2
+							<
+						}
+					}
+	
+					switch [Nv byte 8 0 & 3] {
+						0 {
+							>
+								emit lvl.0
+							<
+						}
+						1 {
+							>
+								emit lvl.3
+							<
+						}
+						2 {
+							>
+								emit lvl.6
+							<
+						}
+						3 {
+							>
+								emit lvl.9
+							<
+						}
+					}
+	
+				<
+			}
+	
+			if {[S string 3 0 {} {} > 3]} {
+				>
+					emit {v.%.1s (unknown details)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GOOF----]} {
+		>
+			emit {Guile Object}
+			if {[S string 8 0 {} {} eq LE]} {
+				>
+					emit {\b, little endian}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq BE]} {
+				>
+					emit {\b, big endian}
+				<
+			}
+	
+			if {[S string 11 0 {} {} eq 4]} {
+				>
+					emit {\b, 32bit}
+				<
+			}
+	
+			if {[S string 11 0 {} {} eq 8]} {
+				>
+					emit {\b, 64bit}
+				<
+			}
+	
+			if {[S regex 13 0 {} {} eq ...]} {
+				>
+					emit {\b, bytecode v%s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Bitmapfile]} {
+		>
+			emit {HP Bitmapfile}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IMGfile]} {
+		>
+			emit {CIS 	compimg HP Bitmapfile}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq msgcat01]} {
+		>
+			emit {HP NLS message catalog,}
+			if {[N long 8 0 0 {} {} > 0]} {
+				>
+					emit {%d messages}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HPHP]} {
+		>
+			emit HP
+			if {[S string 4 0 {} {} eq 48]} {
+				>
+					emit {48 binary}
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq 49]} {
+				>
+					emit {49 binary}
+				<
+			}
+	
+			if {[N byte 7 0 0 {} {} > 64]} {
+				>
+					emit {- Rev %c}
+				<
+			}
+	
+			switch [Nv leshort 8 0 {} {}] {
+				10513 {
+					>
+						emit (ADR)
+					<
+				}
+				10547 {
+					>
+						emit (REAL)
+					<
+				}
+				10581 {
+					>
+						emit (LREAL)
+					<
+				}
+				10615 {
+					>
+						emit (COMPLX)
+					<
+				}
+				10653 {
+					>
+						emit (LCOMPLX)
+					<
+				}
+				10687 {
+					>
+						emit (CHAR)
+					<
+				}
+				10728 {
+					>
+						emit (ARRAY)
+					<
+				}
+				10762 {
+					>
+						emit (LNKARRAY)
+					<
+				}
+				10796 {
+					>
+						emit (STRING)
+					<
+				}
+				10830 {
+					>
+						emit (HXS)
+					<
+				}
+				10868 {
+					>
+						emit (LIST)
+					<
+				}
+				10902 {
+					>
+						emit (DIR)
+					<
+				}
+				10936 {
+					>
+						emit (ALG)
+					<
+				}
+				10970 {
+					>
+						emit (UNIT)
+					<
+				}
+				11004 {
+					>
+						emit (TAGGED)
+					<
+				}
+				11038 {
+					>
+						emit (GROB)
+					<
+				}
+				11072 {
+					>
+						emit (LIB)
+					<
+				}
+				11106 {
+					>
+						emit (BACKUP)
+					<
+				}
+				11144 {
+					>
+						emit (LIBDATA)
+					<
+				}
+				11677 {
+					>
+						emit (PROG)
+					<
+				}
+				11724 {
+					>
+						emit (CODE)
+					<
+				}
+				11848 {
+					>
+						emit (GNAME)
+					<
+				}
+				11885 {
+					>
+						emit (LNAME)
+					<
+				}
+				11922 {
+					>
+						emit (XLIB)
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %%HP:]} {
+		>
+			emit {HP text}
+			if {[S string 6 0 {} {} eq T(0)]} {
+				>
+					emit {- T(0)}
+				<
+			}
+	
+			if {[S string 6 0 {} {} eq T(1)]} {
+				>
+					emit {- T(1)}
+				<
+			}
+	
+			if {[S string 6 0 {} {} eq T(2)]} {
+				>
+					emit {- T(2)}
+				<
+			}
+	
+			if {[S string 6 0 {} {} eq T(3)]} {
+				>
+					emit {- T(3)}
+				<
+			}
+	
+			if {[S string 10 0 {} {} eq A(D)]} {
+				>
+					emit A(D)
+				<
+			}
+	
+			if {[S string 10 0 {} {} eq A(R)]} {
+				>
+					emit A(R)
+				<
+			}
+	
+			if {[S string 10 0 {} {} eq A(G)]} {
+				>
+					emit A(G)
+				<
+			}
+	
+			if {[S string 14 0 {} {} eq F(.)]} {
+				>
+					emit {F(.);}
+				<
+			}
+	
+			if {[S string 14 0 {} {} eq F(,)]} {
+				>
+					emit {F(,);}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HP3]} {
+		>
+			if {[S string 3 0 {} {} eq 8]} {
+				>
+					emit {HP 38}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq 9]} {
+				>
+					emit {HP 39}
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq Bin]} {
+				>
+					emit binary
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq Asc]} {
+				>
+					emit ASCII
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq A]} {
+				>
+					emit {(Directory List)}
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq B]} {
+				>
+					emit (Zaplet)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq C]} {
+				>
+					emit (Note)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq D]} {
+				>
+					emit (Program)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq E]} {
+				>
+					emit (Variable)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq F]} {
+				>
+					emit (List)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq G]} {
+				>
+					emit (Matrix)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq H]} {
+				>
+					emit (Library)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq I]} {
+				>
+					emit {(Target List)}
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq J]} {
+				>
+					emit {(ASCII Vector specification)}
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq K]} {
+				>
+					emit (wildcard)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HP3]} {
+		>
+			if {[S string 3 0 {} {} eq 8]} {
+				>
+					emit {HP 38}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq 9]} {
+				>
+					emit {HP 39}
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq Bin]} {
+				>
+					emit binary
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq Asc]} {
+				>
+					emit ASCII
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq A]} {
+				>
+					emit {(Directory List)}
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq B]} {
+				>
+					emit (Zaplet)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq C]} {
+				>
+					emit (Note)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq D]} {
+				>
+					emit (Program)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq E]} {
+				>
+					emit (Variable)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq F]} {
+				>
+					emit (List)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq G]} {
+				>
+					emit (Matrix)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq H]} {
+				>
+					emit (Library)
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq I]} {
+				>
+					emit {(Target List)}
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq J]} {
+				>
+					emit {(ASCII Vector specification)}
+				<
+			}
+	
+			if {[S string 7 0 {} {} eq K]} {
+				>
+					emit (wildcard)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 16 0 {} {} eq HP-UX]} {
+		>
+			if {[N belong 0 0 0 {} {} == 2]} {
+				>
+					if {[N belong 12 0 0 {} {} == 60]} {
+						>
+							switch [Nv belong 76 0 {} {}] {
+								1 {
+									>
+										if {[N belong 88 0 0 {} {} == 4]} {
+											>
+												if {[N belong 92 0 0 {} {} == 1]} {
+													>
+														if {[N belong 96 0 0 {} {} == 256]} {
+															>
+																if {[N belong 108 0 0 {} {} == 68]} {
+																	>
+																		if {[N belong 180 0 0 {} {} == 4]} {
+																			>
+																				emit {core file}
+																				if {[S string 164 0 {} {} > \0]} {
+																					>
+																						emit {from '%s'}
+																					<
+																				}
+	
+																				switch [Nv belong 196 0 {} {}] {
+																					3 {
+																						>
+																							emit {- received SIGQUIT}
+																						<
+																					}
+																					4 {
+																						>
+																							emit {- received SIGILL}
+																						<
+																					}
+																					5 {
+																						>
+																							emit {- received SIGTRAP}
+																						<
+																					}
+																					6 {
+																						>
+																							emit {- received SIGABRT}
+																						<
+																					}
+																					7 {
+																						>
+																							emit {- received SIGEMT}
+																						<
+																					}
+																					8 {
+																						>
+																							emit {- received SIGFPE}
+																						<
+																					}
+																					10 {
+																						>
+																							emit {- received SIGBUS}
+																						<
+																					}
+																					11 {
+																						>
+																							emit {- received SIGSEGV}
+																						<
+																					}
+																					12 {
+																						>
+																							emit {- received SIGSYS}
+																						<
+																					}
+																					33 {
+																						>
+																							emit {- received SIGXCPU}
+																						<
+																					}
+																					34 {
+																						>
+																							emit {- received SIGXFSZ}
+																						<
+																					}
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+								256 {
+									>
+										if {[N belong 88 0 0 {} {} == 68]} {
+											>
+												if {[N belong 160 0 0 {} {} == 1]} {
+													>
+														if {[N belong 172 0 0 {} {} == 4]} {
+															>
+																if {[N belong 176 0 0 {} {} == 1]} {
+																	>
+																		if {[N belong 180 0 0 {} {} == 4]} {
+																			>
+																				emit {core file}
+																				if {[S string 144 0 {} {} > \0]} {
+																					>
+																						emit {from '%s'}
+																					<
+																				}
+	
+																				switch [Nv belong 196 0 {} {}] {
+																					3 {
+																						>
+																							emit {- received SIGQUIT}
+																						<
+																					}
+																					4 {
+																						>
+																							emit {- received SIGILL}
+																						<
+																					}
+																					5 {
+																						>
+																							emit {- received SIGTRAP}
+																						<
+																					}
+																					6 {
+																						>
+																							emit {- received SIGABRT}
+																						<
+																					}
+																					7 {
+																						>
+																							emit {- received SIGEMT}
+																						<
+																					}
+																					8 {
+																						>
+																							emit {- received SIGFPE}
+																						<
+																					}
+																					10 {
+																						>
+																							emit {- received SIGBUS}
+																						<
+																					}
+																					11 {
+																						>
+																							emit {- received SIGSEGV}
+																						<
+																					}
+																					12 {
+																						>
+																							emit {- received SIGSYS}
+																						<
+																					}
+																					33 {
+																						>
+																							emit {- received SIGXCPU}
+																						<
+																					}
+																					34 {
+																						>
+																							emit {- received SIGXFSZ}
+																						<
+																					}
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 36 0 {} {} eq HP-UX]} {
+		>
+			if {[N belong 0 0 0 {} {} == 1]} {
+				>
+					if {[N belong 12 0 0 {} {} == 4]} {
+						>
+							if {[N belong 16 0 0 {} {} == 1]} {
+								>
+									if {[N belong 20 0 0 {} {} == 2]} {
+										>
+											if {[N belong 32 0 0 {} {} == 60]} {
+												>
+													if {[N belong 96 0 0 {} {} == 256]} {
+														>
+															if {[N belong 108 0 0 {} {} == 68]} {
+																>
+																	if {[N belong 180 0 0 {} {} == 4]} {
+																		>
+																			emit {core file}
+																			if {[S string 164 0 {} {} > \0]} {
+																				>
+																					emit {from '%s'}
+																				<
+																			}
+	
+																			switch [Nv belong 196 0 {} {}] {
+																				3 {
+																					>
+																						emit {- received SIGQUIT}
+																					<
+																				}
+																				4 {
+																					>
+																						emit {- received SIGILL}
+																					<
+																				}
+																				5 {
+																					>
+																						emit {- received SIGTRAP}
+																					<
+																				}
+																				6 {
+																					>
+																						emit {- received SIGABRT}
+																					<
+																				}
+																				7 {
+																					>
+																						emit {- received SIGEMT}
+																					<
+																				}
+																				8 {
+																					>
+																						emit {- received SIGFPE}
+																					<
+																				}
+																				10 {
+																					>
+																						emit {- received SIGBUS}
+																					<
+																				}
+																				11 {
+																					>
+																						emit {- received SIGSEGV}
+																					<
+																				}
+																				12 {
+																					>
+																						emit {- received SIGSYS}
+																					<
+																				}
+																				33 {
+																					>
+																						emit {- received SIGXCPU}
+																					<
+																				}
+																				34 {
+																					>
+																						emit {- received SIGXFSZ}
+																					<
+																				}
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 100 0 {} {} eq HP-UX]} {
+		>
+			if {[N belong 0 0 0 {} {} == 256]} {
+				>
+					if {[N belong 12 0 0 {} {} == 68]} {
+						>
+							if {[N belong 84 0 0 {} {} == 2]} {
+								>
+									if {[N belong 96 0 0 {} {} == 60]} {
+										>
+											if {[N belong 160 0 0 {} {} == 1]} {
+												>
+													if {[N belong 172 0 0 {} {} == 4]} {
+														>
+															if {[N belong 176 0 0 {} {} == 1]} {
+																>
+																	if {[N belong 180 0 0 {} {} == 4]} {
+																		>
+																			emit {core file}
+																			if {[S string 68 0 {} {} > \0]} {
+																				>
+																					emit {from '%s'}
+																				<
+																			}
+	
+																			switch [Nv belong 196 0 {} {}] {
+																				3 {
+																					>
+																						emit {- received SIGQUIT}
+																					<
+																				}
+																				4 {
+																					>
+																						emit {- received SIGILL}
+																					<
+																				}
+																				5 {
+																					>
+																						emit {- received SIGTRAP}
+																					<
+																				}
+																				6 {
+																					>
+																						emit {- received SIGABRT}
+																					<
+																				}
+																				7 {
+																					>
+																						emit {- received SIGEMT}
+																					<
+																				}
+																				8 {
+																					>
+																						emit {- received SIGFPE}
+																					<
+																				}
+																				10 {
+																					>
+																						emit {- received SIGBUS}
+																					<
+																				}
+																				11 {
+																					>
+																						emit {- received SIGSEGV}
+																					<
+																				}
+																				12 {
+																					>
+																						emit {- received SIGSYS}
+																					<
+																				}
+																				33 {
+																					>
+																						emit {- received SIGXCPU}
+																					<
+																				}
+																				34 {
+																					>
+																						emit {- received SIGXFSZ}
+																					<
+																				}
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 120 0 {} {} eq HP-UX]} {
+		>
+			switch [Nv belong 0 0 {} {}] {
+				1 {
+					>
+						if {[N belong 12 0 0 {} {} == 4]} {
+							>
+								if {[N belong 16 0 0 {} {} == 1]} {
+									>
+										if {[N belong 20 0 0 {} {} == 256]} {
+											>
+												if {[N belong 32 0 0 {} {} == 68]} {
+													>
+														if {[N belong 104 0 0 {} {} == 2]} {
+															>
+																if {[N belong 116 0 0 {} {} == 60]} {
+																	>
+																		if {[N belong 180 0 0 {} {} == 4]} {
+																			>
+																				emit {core file}
+																				if {[S string 88 0 {} {} > \0]} {
+																					>
+																						emit {from '%s'}
+																					<
+																				}
+	
+																				switch [Nv belong 196 0 {} {}] {
+																					3 {
+																						>
+																							emit {- received SIGQUIT}
+																						<
+																					}
+																					4 {
+																						>
+																							emit {- received SIGILL}
+																						<
+																					}
+																					5 {
+																						>
+																							emit {- received SIGTRAP}
+																						<
+																					}
+																					6 {
+																						>
+																							emit {- received SIGABRT}
+																						<
+																					}
+																					7 {
+																						>
+																							emit {- received SIGEMT}
+																						<
+																					}
+																					8 {
+																						>
+																							emit {- received SIGFPE}
+																						<
+																					}
+																					10 {
+																						>
+																							emit {- received SIGBUS}
+																						<
+																					}
+																					11 {
+																						>
+																							emit {- received SIGSEGV}
+																						<
+																					}
+																					12 {
+																						>
+																							emit {- received SIGSYS}
+																						<
+																					}
+																					33 {
+																						>
+																							emit {- received SIGXCPU}
+																						<
+																					}
+																					34 {
+																						>
+																							emit {- received SIGXFSZ}
+																						<
+																					}
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				256 {
+					>
+						if {[N belong 12 0 0 {} {} == 68]} {
+							>
+								if {[N belong 84 0 0 {} {} == 1]} {
+									>
+										if {[N belong 96 0 0 {} {} == 4]} {
+											>
+												if {[N belong 100 0 0 {} {} == 1]} {
+													>
+														if {[N belong 104 0 0 {} {} == 2]} {
+															>
+																if {[N belong 116 0 0 {} {} == 44]} {
+																	>
+																		if {[N belong 180 0 0 {} {} == 4]} {
+																			>
+																				emit {core file}
+																				if {[S string 68 0 {} {} > \0]} {
+																					>
+																						emit {from '%s'}
+																					<
+																				}
+	
+																				switch [Nv belong 196 0 {} {}] {
+																					3 {
+																						>
+																							emit {- received SIGQUIT}
+																						<
+																					}
+																					4 {
+																						>
+																							emit {- received SIGILL}
+																						<
+																					}
+																					5 {
+																						>
+																							emit {- received SIGTRAP}
+																						<
+																					}
+																					6 {
+																						>
+																							emit {- received SIGABRT}
+																						<
+																					}
+																					7 {
+																						>
+																							emit {- received SIGEMT}
+																						<
+																					}
+																					8 {
+																						>
+																							emit {- received SIGFPE}
+																						<
+																					}
+																					10 {
+																						>
+																							emit {- received SIGBUS}
+																						<
+																					}
+																					11 {
+																						>
+																							emit {- received SIGSEGV}
+																						<
+																					}
+																					12 {
+																						>
+																							emit {- received SIGSYS}
+																						<
+																					}
+																					33 {
+																						>
+																							emit {- received SIGXCPU}
+																						<
+																					}
+																					34 {
+																						>
+																							emit {- received SIGXFSZ}
+																						<
+																					}
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 0xabcdef]} {
+		>
+			emit {AIX message catalog}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <aiaff>]} {
+		>
+			emit archive
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <bigaf>]} {
+		>
+			emit {archive (big format)}
+		<
+	}
+	
+	if {[N belong 4 0 0 {} {} & 267312560]} {
+		>
+			if {[N byte 7 0 0 & 3 != 3]} {
+				>
+					emit {AIX core file}
+					if {[N byte 1 0 0 {} {} & 1]} {
+						>
+							emit fulldump
+						<
+					}
+	
+					if {[N byte 7 0 0 {} {} & 1]} {
+						>
+							emit 32-bit
+							if {[S string 1760 0 {} {} > \0]} {
+								>
+									emit {\b, %s}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N byte 7 0 0 {} {} & 2]} {
+						>
+							emit 64-bit
+							if {[S string 1316 0 {} {} > \0]} {
+								>
+									emit {\b, %s}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 36 0 {} {} eq acsp]} {
+		>
+			U 109 color-profile 0
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FORM]} {
+		>
+			emit {IFF data}
+			if {[S string 8 0 {} {} eq AIFF]} {
+				>
+					emit {\b, AIFF audio}
+					mime audio/x-aiff
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq AIFC]} {
+				>
+					emit {\b, AIFF-C compressed audio}
+					mime audio/x-aiff
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq 8SVX]} {
+				>
+					emit {\b, 8SVX 8-bit sampled sound voice}
+					mime audio/x-aiff
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq 16SV]} {
+				>
+					emit {\b, 16SV 16-bit sampled sound voice}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq SAMP]} {
+				>
+					emit {\b, SAMP sampled audio}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq MAUD]} {
+				>
+					emit {\b, MAUD MacroSystem audio}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq SMUS]} {
+				>
+					emit {\b, SMUS simple music}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq CMUS]} {
+				>
+					emit {\b, CMUS complex music}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq ILBMBMHD]} {
+				>
+					emit {\b, ILBM interleaved image}
+					if {[N beshort 20 0 0 {} {} x {}]} {
+						>
+							emit {\b, %d x}
+						<
+					}
+	
+					if {[N beshort 22 0 0 {} {} x {}]} {
+						>
+							emit %d
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq RGBN]} {
+				>
+					emit {\b, RGBN 12-bit RGB image}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq RGB8]} {
+				>
+					emit {\b, RGB8 24-bit RGB image}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq DEEP]} {
+				>
+					emit {\b, DEEP TVPaint/XiPaint image}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq DR2D]} {
+				>
+					emit {\b, DR2D 2-D object}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq TDDD]} {
+				>
+					emit {\b, TDDD 3-D rendering}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq LWOB]} {
+				>
+					emit {\b, LWOB 3-D object}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq LWO2]} {
+				>
+					emit {\b, LWO2 3-D object, v2}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq LWLO]} {
+				>
+					emit {\b, LWLO 3-D layered object}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq REAL]} {
+				>
+					emit {\b, REAL Real3D rendering}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq MC4D]} {
+				>
+					emit {\b, MC4D MaxonCinema4D rendering}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq ANIM]} {
+				>
+					emit {\b, ANIM animation}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq YAFA]} {
+				>
+					emit {\b, YAFA animation}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq SSA\ ]} {
+				>
+					emit {\b, SSA super smooth animation}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq ACBM]} {
+				>
+					emit {\b, ACBM continuous image}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq FAXX]} {
+				>
+					emit {\b, FAXX fax image}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq FTXT]} {
+				>
+					emit {\b, FTXT formatted text}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq CTLG]} {
+				>
+					emit {\b, CTLG message catalog}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq PREF]} {
+				>
+					emit {\b, PREF preferences}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq DTYP]} {
+				>
+					emit {\b, DTYP datatype description}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq PTCH]} {
+				>
+					emit {\b, PTCH binary patch}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq AMFF]} {
+				>
+					emit {\b, AMFF AmigaMetaFile format}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq WZRD]} {
+				>
+					emit {\b, WZRD StormWIZARD resource}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq DOC\ ]} {
+				>
+					emit {\b, DOC desktop publishing document}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq WVQA]} {
+				>
+					emit {\b, Westwood Studios VQA Multimedia,}
+					if {[N leshort 24 0 0 {} {} x {}]} {
+						>
+							emit {%d video frames,}
+						<
+					}
+	
+					if {[N leshort 26 0 0 {} {} x {}]} {
+						>
+							emit {%d x}
+						<
+					}
+	
+					if {[N leshort 28 0 0 {} {} x {}]} {
+						>
+							emit %d
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq MOVE]} {
+				>
+					emit {\b, Wing Commander III Video}
+					if {[S string 12 0 {} {} eq _PC_]} {
+						>
+							emit {\b, PC version}
+						<
+					}
+	
+					if {[S string 12 0 {} {} eq 3DO_]} {
+						>
+							emit {\b, 3DO version}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq IFRS]} {
+				>
+					emit {\b, Blorb Interactive Fiction}
+					if {[S string 24 0 {} {} eq Exec]} {
+						>
+							emit {with executable chunk}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq IFZS]} {
+				>
+					emit {\b, Z-machine or Glulx saved game file (Quetzal)}
+					mime application/x-blorb
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubequad 0 0 0 & 71710148363550912 == 0]} {
+		>
+			if {[N ubyte 2 0 0 {} {} > 0]} {
+				>
+					if {[N ubyte 2 0 0 {} {} < 34]} {
+						>
+							switch [Nv ubyte 16 0 {} {}] {
+								1 {
+									>
+										U 111 tga-image 0
+	
+									<
+								}
+								8 {
+									>
+										U 111 tga-image 0
+	
+									<
+								}
+								15 {
+									>
+										U 111 tga-image 0
+	
+									<
+								}
+								16 {
+									>
+										U 111 tga-image 0
+	
+									<
+								}
+								24 {
+									>
+										U 111 tga-image 0
+	
+									<
+								}
+								32 {
+									>
+										U 111 tga-image 0
+	
+									<
+								}
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq P1]} {
+		>
+			if {[S regex 0 0 {} 4 eq P1\[\040\t\f\r\n\]]} {
+				>
+					U 111 netpbm 0
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq P2]} {
+		>
+			if {[S regex 0 0 {} 4 eq P2\[\040\t\f\r\n\]]} {
+				>
+					U 111 netpbm 0
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq P3]} {
+		>
+			if {[S regex 0 0 {} 4 eq P3\[\040\t\f\r\n\]]} {
+				>
+					U 111 netpbm 0
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq P4]} {
+		>
+			if {[S regex 0 0 {} 4 eq P4\[\040\t\f\r\n\]]} {
+				>
+					U 111 netpbm 0
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq P5]} {
+		>
+			if {[S regex 0 0 {} 4 eq P5\[\040\t\f\r\n\]]} {
+				>
+					U 111 netpbm 0
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq P6]} {
+		>
+			if {[S regex 0 0 {} 4 eq P6\[\040\t\f\r\n\]]} {
+				>
+					U 111 netpbm 0
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq P7]} {
+		>
+			emit {Netpbm PAM image file}
+			mime image/x-portable-pixmap
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \117\072]} {
+		>
+			emit {Solitaire Image Recorder format}
+			if {[S string 4 0 {} {} eq \013]} {
+				>
+					emit {MGI Type 11}
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq \021]} {
+				>
+					emit {MGI Type 17}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq .MDA]} {
+		>
+			emit {MicroDesign data}
+			switch [Nv byte 21 0 {} {}] {
+				48 {
+					>
+						emit {version 2}
+					<
+				}
+				51 {
+					>
+						emit {version 3}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq .MDP]} {
+		>
+			emit {MicroDesign page data}
+			switch [Nv byte 21 0 {} {}] {
+				48 {
+					>
+						emit {version 2}
+					<
+				}
+				51 {
+					>
+						emit {version 3}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IIN1]} {
+		>
+			emit {NIFF image data}
+			mime image/x-niff
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq II\x1a\0\0\0HEAPCCDR]} {
+		>
+			emit {Canon CIFF raw image data}
+			if {[N leshort 16 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d.}
+				<
+			}
+	
+			if {[N leshort 14 0 0 {} {} x {}]} {
+				>
+					emit {\b%d}
+				<
+			}
+	
+			mime image/x-canon-crw
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq II\x2a\0\x10\0\0\0CR]} {
+		>
+			emit {Canon CR2 raw image data}
+			if {[N byte 10 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d.}
+				<
+			}
+	
+			if {[N byte 11 0 0 {} {} x {}]} {
+				>
+					emit {\b%d}
+				<
+			}
+	
+			mime image/x-canon-cr2
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MM\x00\x2a]} {
+		>
+			emit {TIFF image data, big-endian}
+			U 111 tiff_ifd [I 4 ubelong 0 + 0 0]
+	
+			mime image/tiff
+			strength +70
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq II\x2a\x00]} {
+		>
+			emit {TIFF image data, little-endian}
+			U 111 tiff_ifd [I 4 ulelong 0 + 0 0]
+	
+			mime image/tiff
+			strength +70
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MM\x00\x2b]} {
+		>
+			emit {Big TIFF image data, big-endian}
+			mime image/tiff
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq II\x2b\x00]} {
+		>
+			emit {Big TIFF image data, little-endian}
+			mime image/tiff
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x89PNG\x0d\x0a\x1a\x0a\x00\x00\x00\x0DIHDR]} {
+		>
+			emit {PNG image data}
+			U 111 png-ihdr 16
+	
+			mime image/png
+			strength +10
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x89PNG\x0d\x0a\x1a\x0a\x00\x00\x00\x04CgBI]} {
+		>
+			if {[S string 24 0 {} {} eq \x00\x00\x00\x0DIHDR]} {
+				>
+					emit {PNG image data (CgBI)}
+					U 111 png-ihdr 32
+	
+					mime image/png
+					strength +10
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GIF94z]} {
+		>
+			emit {ZIF image (GIF+deflate alpha)}
+			mime image/x-unknown
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FGF95a]} {
+		>
+			emit {FGF image (GIF+deflate beta)}
+			mime image/x-unknown
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PBF]} {
+		>
+			emit {PBF image (deflate compression)}
+			mime image/x-unknown
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GIF8]} {
+		>
+			emit {GIF image data}
+			if {[S string 4 0 {} {} eq 7a]} {
+				>
+					emit {\b, version 8%s,}
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq 9a]} {
+				>
+					emit {\b, version 8%s,}
+				<
+			}
+	
+			if {[N leshort 6 0 0 {} {} > 0]} {
+				>
+					emit {%d x}
+				<
+			}
+	
+			if {[N leshort 8 0 0 {} {} > 0]} {
+				>
+					emit %d
+				<
+			}
+	
+			mime image/gif
+			strength +80
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \361\0\100\273]} {
+		>
+			emit {CMU window manager raster image data}
+			if {[N lelong 4 0 0 {} {} > 0]} {
+				>
+					emit {%d x}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} > 0]} {
+				>
+					emit %d,
+				<
+			}
+	
+			if {[N lelong 12 0 0 {} {} > 0]} {
+				>
+					emit %d-bit
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq id=ImageMagick]} {
+		>
+			emit {MIFF image data}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#FIG]} {
+		>
+			emit {FIG image text}
+			if {[S string 5 0 {} {} x {}]} {
+				>
+					emit {\b, version %.3s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ARF_BEGARF]} {
+		>
+			emit {PHIGS clear text archive}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq @(\#)SunPHIGS]} {
+		>
+			emit SunPHIGS
+			if {[S string 40 0 {} {} eq SunBin]} {
+				>
+					emit binary
+				<
+			}
+	
+			if {[S string 32 0 {} {} eq archive]} {
+				>
+					emit archive
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GKSM]} {
+		>
+			emit {GKS Metafile}
+			if {[S string 24 0 {} {} eq SunGKS]} {
+				>
+					emit {\b, SunGKS}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BEGMF]} {
+		>
+			emit {clear text Computer Graphics Metafile}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq yz]} {
+		>
+			emit {MGR bitmap, modern format, 8-bit aligned}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq zz]} {
+		>
+			emit {MGR bitmap, old format, 1-bit deep, 16-bit aligned}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq xz]} {
+		>
+			emit {MGR bitmap, old format, 1-bit deep, 32-bit aligned}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq yx]} {
+		>
+			emit {MGR bitmap, modern format, squeezed}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %bitmap\0]} {
+		>
+			emit {FBM image data}
+			switch [Nv long 30 0 {} {}] {
+				49 {
+					>
+						emit {\b, mono}
+					<
+				}
+				51 {
+					>
+						emit {\b, color}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq PC\ Research,\ Inc]} {
+		>
+			emit {group 3 fax data}
+			switch [Nv byte 29 0 {} {}] {
+				0 {
+					>
+						emit {\b, normal resolution (204x98 DPI)}
+					<
+				}
+				1 {
+					>
+						emit {\b, fine resolution (204x196 DPI)}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Sfff]} {
+		>
+			emit {structured fax file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x11\x06]} {
+		>
+			emit {Award BIOS Logo, 136 x 84}
+			mime image/x-award-bioslogo
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x11\x09]} {
+		>
+			emit {Award BIOS Logo, 136 x 126}
+			mime image/x-award-bioslogo
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AWBM]} {
+		>
+			if {[N leshort 4 0 0 {} {} < 1981]} {
+				>
+					emit {Award BIOS bitmap}
+					if {[N leshort 4 0 0 & 3 == 0]} {
+						>
+							if {[N leshort 4 0 0 {} {} x {}]} {
+								>
+									emit {\b, %d}
+								<
+							}
+	
+							if {[N leshort 6 0 0 {} {} x {}]} {
+								>
+									emit {x %d}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N leshort 4 0 0 & 3 > 0]} {
+						>
+							emit {\b,}
+							switch [Nv leshort 4 0 & 3] {
+								1 {
+									>
+										if {[N leshort 4 0 0 {} {} x {}]} {
+											>
+												emit %d+3
+											<
+										}
+	
+									<
+								}
+								2 {
+									>
+										if {[N leshort 4 0 0 {} {} x {}]} {
+											>
+												emit %d+2
+											<
+										}
+	
+									<
+								}
+								3 {
+									>
+										if {[N leshort 4 0 0 {} {} x {}]} {
+											>
+												emit %d+1
+											<
+										}
+	
+									<
+								}
+							}
+	
+							if {[N leshort 6 0 0 {} {} x {}]} {
+								>
+									emit {x %d}
+								<
+							}
+	
+						<
+					}
+	
+					mime image/x-award-bmp
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BM]} {
+		>
+			switch [Nv leshort 14 0 {} {}] {
+				12 {
+					>
+						emit {PC bitmap, OS/2 1.x format}
+						mime image/x-ms-bmp
+						if {[N leshort 18 0 0 {} {} x {}]} {
+							>
+								emit {\b, %d x}
+							<
+						}
+	
+						if {[N leshort 20 0 0 {} {} x {}]} {
+							>
+								emit %d
+							<
+						}
+	
+					<
+				}
+				40 {
+					>
+						emit {PC bitmap, Windows 3.x format}
+						mime image/x-ms-bmp
+						if {[N lelong 18 0 0 {} {} x {}]} {
+							>
+								emit {\b, %d x}
+							<
+						}
+	
+						if {[N lelong 22 0 0 {} {} x {}]} {
+							>
+								emit {%d x}
+							<
+						}
+	
+						if {[N leshort 28 0 0 {} {} x {}]} {
+							>
+								emit %d
+							<
+						}
+	
+					<
+				}
+				64 {
+					>
+						emit {PC bitmap, OS/2 2.x format}
+						mime image/x-ms-bmp
+						if {[N leshort 18 0 0 {} {} x {}]} {
+							>
+								emit {\b, %d x}
+							<
+						}
+	
+						if {[N leshort 20 0 0 {} {} x {}]} {
+							>
+								emit %d
+							<
+						}
+	
+					<
+				}
+				108 {
+					>
+						emit {PC bitmap, Windows 95/NT4 and newer format}
+						mime image/x-ms-bmp
+						if {[N lelong 18 0 0 {} {} x {}]} {
+							>
+								emit {\b, %d x}
+							<
+						}
+	
+						if {[N lelong 22 0 0 {} {} x {}]} {
+							>
+								emit {%d x}
+							<
+						}
+	
+						if {[N leshort 28 0 0 {} {} x {}]} {
+							>
+								emit %d
+							<
+						}
+	
+					<
+				}
+				124 {
+					>
+						emit {PC bitmap, Windows 98/2000 and newer format}
+						mime image/x-ms-bmp
+						if {[N lelong 18 0 0 {} {} x {}]} {
+							>
+								emit {\b, %d x}
+							<
+						}
+	
+						if {[N lelong 22 0 0 {} {} x {}]} {
+							>
+								emit {%d x}
+							<
+						}
+	
+						if {[N leshort 28 0 0 {} {} x {}]} {
+							>
+								emit %d
+							<
+						}
+	
+					<
+				}
+				128 {
+					>
+						emit {PC bitmap, Windows NT/2000 format}
+						mime image/x-ms-bmp
+						if {[N lelong 18 0 0 {} {} x {}]} {
+							>
+								emit {\b, %d x}
+							<
+						}
+	
+						if {[N lelong 22 0 0 {} {} x {}]} {
+							>
+								emit {%d x}
+							<
+						}
+	
+						if {[N leshort 28 0 0 {} {} x {}]} {
+							>
+								emit %d
+							<
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq /*\ XPM\ */]} {
+		>
+			emit {X pixmap image text}
+			mime image/x-xpmi
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Imagefile\ version-]} {
+		>
+			emit {iff image data}
+			if {[S string 10 0 {} {} > \0]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IT01]} {
+		>
+			emit {FIT image data}
+			if {[N belong 4 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d x}
+				<
+			}
+	
+			if {[N belong 8 0 0 {} {} x {}]} {
+				>
+					emit {%d x}
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} x {}]} {
+				>
+					emit %d
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IT02]} {
+		>
+			emit {FIT image data}
+			if {[N belong 4 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d x}
+				<
+			}
+	
+			if {[N belong 8 0 0 {} {} x {}]} {
+				>
+					emit {%d x}
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} x {}]} {
+				>
+					emit %d
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 2048 0 {} {} eq PCD_IPI]} {
+		>
+			emit {Kodak Photo CD image pack file}
+			switch [Nv byte 3586 0 & 3] {
+				0 {
+					>
+						emit {, landscape mode}
+					<
+				}
+				1 {
+					>
+						emit {, portrait mode}
+					<
+				}
+				2 {
+					>
+						emit {, landscape mode}
+					<
+				}
+				3 {
+					>
+						emit {, portrait mode}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PCD_OPA]} {
+		>
+			emit {Kodak Photo CD overview pack file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SIMPLE\ \ =]} {
+		>
+			emit {FITS image data}
+			if {[S string 109 0 {} {} eq 8]} {
+				>
+					emit {\b, 8-bit, character or unsigned binary integer}
+				<
+			}
+	
+			if {[S string 108 0 {} {} eq 16]} {
+				>
+					emit {\b, 16-bit, two's complement binary integer}
+				<
+			}
+	
+			if {[S string 107 0 {} {} eq \ 32]} {
+				>
+					emit {\b, 32-bit, two's complement binary integer}
+				<
+			}
+	
+			if {[S string 107 0 {} {} eq -32]} {
+				>
+					emit {\b, 32-bit, floating point, single precision}
+				<
+			}
+	
+			if {[S string 107 0 {} {} eq -64]} {
+				>
+					emit {\b, 64-bit, floating point, double precision}
+				<
+			}
+	
+			mime image/fits
+			ext fits/fts
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq This\ is\ a\ BitMap\ file]} {
+		>
+			emit {Lisp Machine bit-array-file}
+		<
+	}
+	
+	if {[S string 128 0 {} {} eq DICM]} {
+		>
+			emit {DICOM medical imaging data}
+			mime application/dicom
+			ext dcm/dicom/dic
+		<
+	}
+	
+	if {[N belong 0 0 0 {} {} > 100]} {
+		>
+			if {[N belong 8 0 0 {} {} < 3]} {
+				>
+					if {[N belong 12 0 0 {} {} < 33]} {
+						>
+							if {[N belong 4 0 0 {} {} == 7]} {
+								>
+									emit {XWD X Window Dump image data}
+									if {[S string 100 0 {} {} > \0]} {
+										>
+											emit {\b, "%s"}
+										<
+									}
+	
+									if {[N belong 16 0 0 {} {} x {}]} {
+										>
+											emit {\b, %dx}
+										<
+									}
+	
+									if {[N belong 20 0 0 {} {} x {}]} {
+										>
+											emit {\b%dx}
+										<
+									}
+	
+									if {[N belong 12 0 0 {} {} x {}]} {
+										>
+											emit {\b%d}
+										<
+									}
+	
+									mime image/x-xwindowdump
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NJPL1I00]} {
+		>
+			emit {PDS (JPL) image data}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq NJPL1I]} {
+		>
+			emit {PDS (JPL) image data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CCSD3ZF]} {
+		>
+			emit {PDS (CCSD) image data}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq CCSD3Z]} {
+		>
+			emit {PDS (CCSD) image data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PDS_]} {
+		>
+			emit {PDS image data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LBLSIZE=]} {
+		>
+			emit {PDS (VICAR) image data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq pM85]} {
+		>
+			emit {Atari ST STAD bitmap image data (hor)}
+			switch [Nv byte 5 0 {} {}] {
+				-1 {
+					>
+						emit {(black background)}
+					<
+				}
+				0 {
+					>
+						emit {(white background)}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq pM86]} {
+		>
+			emit {Atari ST STAD bitmap image data (vert)}
+			switch [Nv byte 5 0 {} {}] {
+				-1 {
+					>
+						emit {(black background)}
+					<
+				}
+				0 {
+					>
+						emit {(white background)}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[N ubelong 0 0 0 & 4294508032 == 167772160]} {
+		>
+			if {[N ubyte 3 0 0 {} {} > 0]} {
+				>
+					if {[N ubyte 1 0 0 {} {} < 6]} {
+						>
+							if {[N ubyte 1 0 0 {} {} != 1]} {
+								>
+									emit PCX
+									switch [Nv ubyte 1 0 {} {}] {
+										0 {
+											>
+												emit {ver. 2.5 image data}
+											<
+										}
+										2 {
+											>
+												emit {ver. 2.8 image data, with palette}
+											<
+										}
+										3 {
+											>
+												emit {ver. 2.8 image data, without palette}
+											<
+										}
+										4 {
+											>
+												emit {for Windows image data}
+											<
+										}
+										5 {
+											>
+												emit {ver. 3.0 image data}
+											<
+										}
+									}
+	
+									if {[N uleshort 4 0 0 {} {} x {}]} {
+										>
+											emit {bounding box [%d,}
+										<
+									}
+	
+									if {[N uleshort 6 0 0 {} {} x {}]} {
+										>
+											emit {%d] -}
+										<
+									}
+	
+									if {[N uleshort 8 0 0 {} {} x {}]} {
+										>
+											emit {[%d,}
+										<
+									}
+	
+									if {[N uleshort 10 0 0 {} {} x {}]} {
+										>
+											emit %d\],
+										<
+									}
+	
+									if {[N ubyte 65 0 0 {} {} > 1]} {
+										>
+											emit {%d planes each of}
+										<
+									}
+	
+									if {[N ubyte 3 0 0 {} {} x {}]} {
+										>
+											emit %d-bit
+										<
+									}
+	
+									switch [Nv byte 68 0 {} {}] {
+										1 {
+											>
+												emit colour,
+											<
+										}
+										2 {
+											>
+												emit grayscale,
+											<
+										}
+									}
+	
+									if {[D 68]} {
+										>
+											emit image,
+										<
+									}
+	
+									if {[N leshort 12 0 0 {} {} > 0]} {
+										>
+											emit {%d x}
+											if {[N uleshort 14 0 0 {} {} x {}]} {
+												>
+													emit {%d dpi,}
+												<
+											}
+	
+										<
+									}
+	
+									switch [Nv byte 2 0 {} {}] {
+										0 {
+											>
+												emit uncompressed
+											<
+										}
+										1 {
+											>
+												emit {RLE compressed}
+											<
+										}
+									}
+	
+									mime image/x-pcx
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 8BPS]} {
+		>
+			emit {Adobe Photoshop Image}
+			if {[N beshort 4 0 0 {} {} == 2]} {
+				>
+					emit (PSB)
+				<
+			}
+	
+			if {[N belong 18 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d x}
+				<
+			}
+	
+			if {[N belong 14 0 0 {} {} x {}]} {
+				>
+					emit %d,
+				<
+			}
+	
+			switch [Nv beshort 24 0 {} {}] {
+				0 {
+					>
+						emit bitmap
+					<
+				}
+				1 {
+					>
+						emit grayscale
+						if {[N beshort 12 0 0 {} {} == 2]} {
+							>
+								emit {with alpha}
+							<
+						}
+	
+					<
+				}
+				2 {
+					>
+						emit indexed
+					<
+				}
+				3 {
+					>
+						emit RGB
+						if {[N beshort 12 0 0 {} {} == 4]} {
+							>
+								emit {\bA}
+							<
+						}
+	
+					<
+				}
+				4 {
+					>
+						emit CMYK
+						if {[N beshort 12 0 0 {} {} == 5]} {
+							>
+								emit {\bA}
+							<
+						}
+	
+					<
+				}
+				7 {
+					>
+						emit multichannel
+					<
+				}
+				8 {
+					>
+						emit duotone
+					<
+				}
+				9 {
+					>
+						emit lab
+					<
+				}
+			}
+	
+			if {[N beshort 12 0 0 {} {} > 1]} {
+				>
+					if {[N beshort 12 0 0 {} {} x {}]} {
+						>
+							emit {\b, %dx}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N beshort 12 0 0 {} {} == 1]} {
+				>
+					emit {\b,}
+				<
+			}
+	
+			if {[N beshort 22 0 0 {} {} x {}]} {
+				>
+					emit {%d-bit channel}
+				<
+			}
+	
+			if {[N beshort 12 0 0 {} {} > 1]} {
+				>
+					emit {\bs}
+				<
+			}
+	
+			mime image/vnd.adobe.photoshop
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq P7\ 332]} {
+		>
+			emit {XV thumbnail image data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NITF]} {
+		>
+			emit {National Imagery Transmission Format}
+			if {[S string 25 0 {} {} > \0]} {
+				>
+					emit {dated %.14s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 16 0 {} {} eq XIMG\0]} {
+		>
+			U 111 gem_info 0
+	
+		<
+	}
+	
+	if {[S string 16 0 {} {} eq STTT\0\x10]} {
+		>
+			U 111 gem_info 0
+	
+		<
+	}
+	
+	if {[S string 16 0 {} {} eq TIMG\0]} {
+		>
+			U 111 gem_info 0
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\nSMJPEG]} {
+		>
+			emit SMJPEG
+			if {[N belong 8 0 0 {} {} x {}]} {
+				>
+					emit {%d.x data}
+				<
+			}
+	
+			if {[S string 16 0 {} {} eq _SND]} {
+				>
+					emit {\b,}
+					if {[N beshort 24 0 0 {} {} > 0]} {
+						>
+							emit {%d Hz}
+						<
+					}
+	
+					switch [Nv byte 26 0 {} {}] {
+						8 {
+							>
+								emit 8-bit
+							<
+						}
+						16 {
+							>
+								emit 16-bit
+							<
+						}
+					}
+	
+					if {[S string 28 0 {} {} eq NONE]} {
+						>
+							emit uncompressed
+						<
+					}
+	
+					if {[N byte 27 0 0 {} {} == 1]} {
+						>
+							emit mono
+						<
+					}
+	
+					if {[N byte 28 0 0 {} {} == 2]} {
+						>
+							emit stereo
+						<
+					}
+	
+					if {[S string 32 0 {} {} eq _VID]} {
+						>
+							emit {\b,}
+							if {[N belong 40 0 0 {} {} > 0]} {
+								>
+									emit {%d frames}
+								<
+							}
+	
+							if {[N beshort 44 0 0 {} {} > 0]} {
+								>
+									emit {(%d x}
+								<
+							}
+	
+							if {[N beshort 46 0 0 {} {} > 0]} {
+								>
+									emit %d)
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 16 0 {} {} eq _VID]} {
+				>
+					emit {\b,}
+					if {[N belong 24 0 0 {} {} > 0]} {
+						>
+							emit {%d frames}
+						<
+					}
+	
+					if {[N beshort 28 0 0 {} {} > 0]} {
+						>
+							emit {(%d x}
+						<
+					}
+	
+					if {[N beshort 30 0 0 {} {} > 0]} {
+						>
+							emit %d)
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Paint\ Shop\ Pro\ Image\ File]} {
+		>
+			emit {Paint Shop Pro Image File}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq P7\ 332]} {
+		>
+			emit {XV "thumbnail file" (icon) data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq KiSS]} {
+		>
+			emit KISS/GS
+			switch [Nv byte 4 0 {} {}] {
+				16 {
+					>
+						emit color
+						if {[N byte 5 0 0 {} {} x {}]} {
+							>
+								emit {%d bit}
+							<
+						}
+	
+						if {[N leshort 8 0 0 {} {} x {}]} {
+							>
+								emit {%d colors}
+							<
+						}
+	
+						if {[N leshort 10 0 0 {} {} x {}]} {
+							>
+								emit {%d groups}
+							<
+						}
+	
+					<
+				}
+				32 {
+					>
+						emit cell
+						if {[N byte 5 0 0 {} {} x {}]} {
+							>
+								emit {%d bit}
+							<
+						}
+	
+						if {[N leshort 8 0 0 {} {} x {}]} {
+							>
+								emit {%d x}
+							<
+						}
+	
+						if {[N leshort 10 0 0 {} {} x {}]} {
+							>
+								emit %d
+							<
+						}
+	
+						if {[N leshort 12 0 0 {} {} x {}]} {
+							>
+								emit +%d
+							<
+						}
+	
+						if {[N leshort 14 0 0 {} {} x {}]} {
+							>
+								emit +%d
+							<
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq C\253\221g\230\0\0\0]} {
+		>
+			emit {Webshots Desktop .wbz file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CKD_P370]} {
+		>
+			emit {Hercules CKD DASD image file}
+			if {[N long 8 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d heads per cylinder}
+				<
+			}
+	
+			if {[N long 12 0 0 {} {} x {}]} {
+				>
+					emit {\b, track size %d bytes}
+				<
+			}
+	
+			if {[N byte 16 0 0 {} {} x {}]} {
+				>
+					emit {\b, device type 33%2.2X}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CKD_C370]} {
+		>
+			emit {Hercules compressed CKD DASD image file}
+			if {[N long 8 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d heads per cylinder}
+				<
+			}
+	
+			if {[N long 12 0 0 {} {} x {}]} {
+				>
+					emit {\b, track size %d bytes}
+				<
+			}
+	
+			if {[N byte 16 0 0 {} {} x {}]} {
+				>
+					emit {\b, device type 33%2.2X}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CKD_S370]} {
+		>
+			emit {Hercules CKD DASD shadow file}
+			if {[N long 8 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d heads per cylinder}
+				<
+			}
+	
+			if {[N long 12 0 0 {} {} x {}]} {
+				>
+					emit {\b, track size %d bytes}
+				<
+			}
+	
+			if {[N byte 16 0 0 {} {} x {}]} {
+				>
+					emit {\b, device type 33%2.2X}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \146\031\0\0]} {
+		>
+			emit {Squeak image data}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq 'From\040Squeak]} {
+		>
+			emit {Squeak program text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PaRtImAgE-VoLuMe]} {
+		>
+			emit PartImage
+			if {[S string 32 0 {} {} eq 0.6.1]} {
+				>
+					emit {file version %s}
+					if {[N lelong 96 0 0 {} {} > -1]} {
+						>
+							emit {volume %d}
+						<
+					}
+	
+					if {[S string 512 0 {} {} > \0]} {
+						>
+							emit {type %s}
+						<
+					}
+	
+					if {[S string 5120 0 {} {} > \0]} {
+						>
+							emit {device %s,}
+						<
+					}
+	
+					if {[S string 5632 0 {} {} > \0]} {
+						>
+							emit {original filename %s,}
+						<
+					}
+	
+					switch [Nv lelong 10052 0 {} {}] {
+						0 {
+							>
+								emit {not compressed}
+							<
+						}
+						1 {
+							>
+								emit {gzip compressed}
+							<
+						}
+						2 {
+							>
+								emit {bzip2 compressed}
+							<
+						}
+					}
+	
+					if {[N lelong 10052 0 0 {} {} > 2]} {
+						>
+							emit {compressed with unknown algorithm}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 32 0 {} {} > 0.6.1]} {
+				>
+					emit {file version %s}
+				<
+			}
+	
+			if {[S string 32 0 {} {} < 0.6.1]} {
+				>
+					emit {file version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N leshort 14 0 0 {} {} < 2]} {
+		>
+			if {[N leshort 62 0 0 {} {} < 2]} {
+				>
+					if {[N leshort 54 0 0 {} {} == 12345]} {
+						>
+							emit {Bio-Rad .PIC Image File}
+							if {[N leshort 0 0 0 {} {} > 0]} {
+								>
+									emit {%d x}
+								<
+							}
+	
+							if {[N leshort 2 0 0 {} {} > 0]} {
+								>
+									emit %d,
+								<
+							}
+	
+							if {[N leshort 4 0 0 {} {} == 1]} {
+								>
+									emit {1 image in file}
+								<
+							}
+	
+							if {[N leshort 4 0 0 {} {} > 1]} {
+								>
+									emit {%d images in file}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000MRM]} {
+		>
+			emit {Minolta Dimage camera raw image data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq AT&TFORM]} {
+		>
+			if {[S string 12 0 {} {} eq DJVM]} {
+				>
+					emit {DjVu multiple page document}
+					mime image/vnd.djvu
+				<
+			}
+	
+			if {[S string 12 0 {} {} eq DJVU]} {
+				>
+					emit {DjVu image or single page document}
+					mime image/vnd.djvu
+				<
+			}
+	
+			if {[S string 12 0 {} {} eq DJVI]} {
+				>
+					emit {DjVu shared document}
+					mime image/vnd.djvu
+				<
+			}
+	
+			if {[S string 12 0 {} {} eq THUM]} {
+				>
+					emit {DjVu page thumbnails}
+					mime image/vnd.djvu
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SDPX]} {
+		>
+			emit {DPX image data, big-endian,}
+			U 111 dpx_info 0
+	
+			mime image/x-dpx
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XPDS]} {
+		>
+			emit {DPX image data, little-endian,}
+			U 111 dpx_info 0
+	
+			mime image/x-dpx
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CDF\001]} {
+		>
+			emit {NetCDF Data Format data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \211HDF\r\n\032\n]} {
+		>
+			emit {Hierarchical Data Format (version 5) data}
+			mime application/x-hdf
+		<
+	}
+	
+	if {[S string 512 0 {} {} eq \211HDF\r\n\032\n]} {
+		>
+			emit {Hierarchical Data Format (version 5) with 512 bytes user block}
+			mime application/x-hdf
+		<
+	}
+	
+	if {[S string 1024 0 {} {} eq \211HDF\r\n\032\n]} {
+		>
+			emit {Hierarchical Data Format (version 5) with 1k user block}
+			mime application/x-hdf
+		<
+	}
+	
+	if {[S string 2048 0 {} {} eq \211HDF\r\n\032\n]} {
+		>
+			emit {Hierarchical Data Format (version 5) with 2k user block}
+			mime application/x-hdf
+		<
+	}
+	
+	if {[S string 4096 0 {} {} eq \211HDF\r\n\032\n]} {
+		>
+			emit {Hierarchical Data Format (version 5) with 4k user block}
+			mime application/x-hdf
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XARA\243\243]} {
+		>
+			emit {Xara graphics file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CPC\262]} {
+		>
+			emit {Cartesian Perceptual Compression image}
+			mime image/x-cpi
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq C565]} {
+		>
+			emit {OLPC firmware icon image data}
+			if {[N leshort 4 0 0 {} {} x {}]} {
+				>
+					emit {%u x}
+				<
+			}
+	
+			if {[N leshort 6 0 0 {} {} x {}]} {
+				>
+					emit %u
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xce\xda\xde\xfa]} {
+		>
+			emit {Cytovision Metaphases file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xed\xad\xef\xac]} {
+		>
+			emit {Cytovision Karyotype file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x0b\x00\x03\x00]} {
+		>
+			emit {Cytovision FISH Probe file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xed\xfe\xda\xbe]} {
+		>
+			emit {Cytovision FLEX file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xed\xab\xed\xfe]} {
+		>
+			emit {Cytovision FLEX file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xad\xfd\xea\xad]} {
+		>
+			emit {Cytovision RATS file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xff\xa0\xff\xa8\x00]} {
+		>
+			emit {Wavelet Scalar Quantization image data}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq PCO-]} {
+		>
+			emit {PCO B16 image data}
+			if {[N lelong 12 0 0 {} {} x {}]} {
+				>
+					emit {\b, %dx}
+				<
+			}
+	
+			if {[N lelong 16 0 0 {} {} x {}]} {
+				>
+					emit {\b%d}
+				<
+			}
+	
+			switch [Nv lelong 20 0 {} {}] {
+				-1 {
+					>
+						emit {\b, extended header}
+						switch [Nv lelong 24 0 {} {}] {
+							0 {
+								>
+									emit {\b, grayscale}
+									switch [Nv lelong 36 0 {} {}] {
+										0 {
+											>
+												emit {linear LUT}
+											<
+										}
+										1 {
+											>
+												emit {logarithmic LUT}
+											<
+										}
+									}
+	
+									if {[N lelong 28 0 0 {} {} x {}]} {
+										>
+											emit {[%d}
+										<
+									}
+	
+									if {[N lelong 32 0 0 {} {} x {}]} {
+										>
+											emit {\b,%d]}
+										<
+									}
+	
+								<
+							}
+							1 {
+								>
+									emit {\b, color}
+									switch [Nv lelong 64 0 {} {}] {
+										0 {
+											>
+												emit {linear LUT}
+											<
+										}
+										1 {
+											>
+												emit {logarithmic LUT}
+											<
+										}
+									}
+	
+									if {[N lelong 40 0 0 {} {} x {}]} {
+										>
+											emit {r[%d}
+										<
+									}
+	
+									if {[N lelong 44 0 0 {} {} x {}]} {
+										>
+											emit {\b,%d]}
+										<
+									}
+	
+									if {[N lelong 48 0 0 {} {} x {}]} {
+										>
+											emit {g[%d}
+										<
+									}
+	
+									if {[N lelong 52 0 0 {} {} x {}]} {
+										>
+											emit {\b,%d]}
+										<
+									}
+	
+									if {[N lelong 56 0 0 {} {} x {}]} {
+										>
+											emit {b[%d}
+										<
+									}
+	
+									if {[N lelong 60 0 0 {} {} x {}]} {
+										>
+											emit {\b,%d]}
+										<
+									}
+	
+								<
+							}
+						}
+	
+					<
+				}
+				0 {
+					>
+						emit {\b, short header}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \[BitmapInfo2\]]} {
+		>
+			emit {Polar Monitor Bitmap text}
+			mime image/x-polar-monitor-bitmap
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GARMIN\ BITMAP\ 01]} {
+		>
+			emit {Garmin Bitmap file}
+			if {[S string 47 0 {} {} > 0]} {
+				>
+					emit {\b, version %4.4s}
+				<
+			}
+	
+			if {[N uleshort 85 0 0 {} {} > 0]} {
+				>
+					emit {\b, %dx}
+					if {[N uleshort 83 0 0 {} {} x {}]} {
+						>
+							emit {\b%d}
+						<
+					}
+	
+				<
+			}
+	
+			ext srf
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IIO2H]} {
+		>
+			emit {Ulead Photo Explorer5}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Xcur]} {
+		>
+			emit {X11 cursor}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MMOR]} {
+		>
+			emit {Olympus ORF raw image data, big-endian}
+			mime image/x-olympus-orf
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IIRO]} {
+		>
+			emit {Olympus ORF raw image data, little-endian}
+			mime image/x-olympus-orf
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IIRS]} {
+		>
+			emit {Olympus ORF raw image data, little-endian}
+			mime image/x-olympus-orf
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HDMV0100]} {
+		>
+			emit {AVCHD Clip Information}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#?RADIANCE\n]} {
+		>
+			emit {Radiance HDR image data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PFS1\x0a]} {
+		>
+			emit {PFS HDR image data}
+			if {[S regex 1 0 {} {} eq \[0-9\]*\ ]} {
+				>
+					emit {\b, %s}
+					if {[S regex 1 0 {} {} eq \ \[0-9\]\{4\}]} {
+						>
+							emit {\bx%s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FOVb]} {
+		>
+			emit {Foveon X3F raw image data}
+			if {[N leshort 6 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d.}
+				<
+			}
+	
+			if {[N leshort 4 0 0 {} {} x {}]} {
+				>
+					emit {\b%d}
+				<
+			}
+	
+			if {[N lelong 28 0 0 {} {} x {}]} {
+				>
+					emit {\b, %dx}
+				<
+			}
+	
+			if {[N lelong 32 0 0 {} {} x {}]} {
+				>
+					emit {\b%d}
+				<
+			}
+	
+			mime image/x-x3f
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PDN3]} {
+		>
+			emit {Paint.NET image data}
+			mime image/x-paintnet
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x46\x4d\x52\x00]} {
+		>
+			emit {ISO/IEC 19794-2 Format Minutiae Record (FMR)}
+		<
+	}
+	
+	if {[N bequad 90 0 0 {} {} == 6290772526005243648]} {
+		>
+			emit {JPEG-XR Image}
+			if {[N byte 98 0 0 & 8 == 8]} {
+				>
+					emit {\b, hard tiling}
+				<
+			}
+	
+			if {[N byte 99 0 0 & -128 == -128]} {
+				>
+					emit {\b, tiling present}
+				<
+			}
+	
+			if {[N byte 99 0 0 & 64 == 64]} {
+				>
+					emit {\b, codestream present}
+				<
+			}
+	
+			if {[N byte 99 0 0 & 56 x {}]} {
+				>
+					emit {\b, spatial xform=}
+				<
+			}
+	
+			switch [Nv byte 99 0 & 56] {
+				0 {
+					>
+						emit {\bTL}
+					<
+				}
+				8 {
+					>
+						emit {\bBL}
+					<
+				}
+				16 {
+					>
+						emit {\bTR}
+					<
+				}
+				24 {
+					>
+						emit {\bBR}
+					<
+				}
+				32 {
+					>
+						emit {\bBT}
+					<
+				}
+				40 {
+					>
+						emit {\bRB}
+					<
+				}
+				48 {
+					>
+						emit {\bLT}
+					<
+				}
+				56 {
+					>
+						emit {\bLB}
+					<
+				}
+			}
+	
+			switch [Nv byte 100 0 & -128] {
+				-128 {
+					>
+						emit {\b, short header}
+						if {[N beshort 102 0 0 + 1 x {}]} {
+							>
+								emit {\b, %d}
+							<
+						}
+	
+						if {[N beshort 104 0 0 + 1 x {}]} {
+							>
+								emit {\bx%d}
+							<
+						}
+	
+					<
+				}
+				0 {
+					>
+						emit {\b, long header}
+						if {[N belong 102 0 0 + 1 x {}]} {
+							>
+								emit {\b, %x}
+							<
+						}
+	
+						if {[N belong 106 0 0 + 1 x {}]} {
+							>
+								emit {\bx%x}
+							<
+						}
+	
+					<
+				}
+			}
+	
+			if {[N beshort 101 0 0 & 15 x {}]} {
+				>
+					emit {\b, bitdepth=}
+					switch [Nv beshort 101 0 & 15] {
+						0 {
+							>
+								emit {\b1-WHITE=1}
+							<
+						}
+						1 {
+							>
+								emit {\b8}
+							<
+						}
+						2 {
+							>
+								emit {\b16}
+							<
+						}
+						3 {
+							>
+								emit {\b16-SIGNED}
+							<
+						}
+						4 {
+							>
+								emit {\b16-FLOAT}
+							<
+						}
+						5 {
+							>
+								emit {\b(reserved 5)}
+							<
+						}
+						6 {
+							>
+								emit {\b32-SIGNED}
+							<
+						}
+						7 {
+							>
+								emit {\b32-FLOAT}
+							<
+						}
+						8 {
+							>
+								emit {\b5}
+							<
+						}
+						9 {
+							>
+								emit {\b10}
+							<
+						}
+						10 {
+							>
+								emit {\b5-6-5}
+							<
+						}
+						11 {
+							>
+								emit {\b(reserved %d)}
+							<
+						}
+						12 {
+							>
+								emit {\b(reserved %d)}
+							<
+						}
+						13 {
+							>
+								emit {\b(reserved %d)}
+							<
+						}
+						14 {
+							>
+								emit {\b(reserved %d)}
+							<
+						}
+						15 {
+							>
+								emit {\b1-BLACK=1}
+							<
+						}
+					}
+	
+				<
+			}
+	
+			if {[N beshort 101 0 0 & 240 x {}]} {
+				>
+					emit {\b, colorfmt=}
+					switch [Nv beshort 101 0 & 240] {
+						0 {
+							>
+								emit {\bYONLY}
+							<
+						}
+						16 {
+							>
+								emit {\bYUV240}
+							<
+						}
+						32 {
+							>
+								emit {\bYWV422}
+							<
+						}
+						48 {
+							>
+								emit {\bYWV444}
+							<
+						}
+						64 {
+							>
+								emit {\bCMYK}
+							<
+						}
+						80 {
+							>
+								emit {\bCMYKDIRECT}
+							<
+						}
+						96 {
+							>
+								emit {\bNCOMPONENT}
+							<
+						}
+						112 {
+							>
+								emit {\bRGB}
+							<
+						}
+						128 {
+							>
+								emit {\bRGBE}
+							<
+						}
+					}
+	
+					if {[N beshort 101 0 0 & 240 > 128]} {
+						>
+							emit {\b(reserved 0x%x)}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x42\x50\x47\xFB]} {
+		>
+			emit {BPG (Better Portable Graphics)}
+			mime image/bpg
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq icns]} {
+		>
+			emit {Mac OS X icon}
+			if {[N ubelong 4 0 0 {} {} > 0]} {
+				>
+					if {[N ubelong 4 0 0 {} {} x {}]} {
+						>
+							emit {\b, %d bytes}
+						<
+					}
+	
+					if {[S string 8 0 {} {} x {}]} {
+						>
+							emit {\b, "%4.4s" type}
+						<
+					}
+	
+				<
+			}
+	
+			mime image/x-icns
+			ext icns
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq farbfeld]} {
+		>
+			emit {farbfeld image data,}
+			if {[N ubelong 8 0 0 {} {} x {}]} {
+				>
+					emit %dx
+				<
+			}
+	
+			if {[N ubelong 12 0 0 {} {} x {}]} {
+				>
+					emit {\b%d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq DDS\040\174\000\000\000]} {
+		>
+			emit {Microsoft DirectDraw Surface (DDS):}
+			U 111 ms-directdraw-surface 0
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PVRT]} {
+		>
+			if {[S string 16 0 {} {} eq DDS\040\174\000\000\000]} {
+				>
+					emit {Sega PVR (Xbox) image:}
+					U 111 ms-directdraw-surface 32
+	
+				<
+			}
+	
+			if {[N belong 16 0 0 {} {} != 1145328416]} {
+				>
+					emit {Sega PVR image:}
+					U 111 sega-pvr-image-header 0
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GBIX]} {
+		>
+			if {[S string 16 0 {} {} eq PVRT]} {
+				>
+					if {[S string 16 0 {} {} eq DDS\040\174\000\000\000]} {
+						>
+							emit {Sega PVR (Xbox) image:}
+						<
+					}
+	
+					U 111 ms-directdraw-surface 32
+	
+					if {[N belong 16 0 0 {} {} != 1145328416]} {
+						>
+							emit {Sega PVR image:}
+							U 111 sega-pvr-image-header 16
+	
+						<
+					}
+	
+					if {[N lelong 8 0 0 {} {} x {}]} {
+						>
+							emit {\b, global index = %u}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GVRT]} {
+		>
+			emit {Sega GVR image:}
+			U 111 sega-gvr-image-header 16
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GBIX]} {
+		>
+			if {[S string 16 0 {} {} eq GVRT]} {
+				>
+					emit {Sega GVR image:}
+					U 111 sega-gvr-image-header 16
+	
+					if {[N belong 8 0 0 {} {} x {}]} {
+						>
+							emit {\b, global index = %u}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GCIX]} {
+		>
+			if {[S string 16 0 {} {} eq GVRT]} {
+				>
+					emit {Sega GVR image:}
+					U 111 sega-gvr-image-header 16
+	
+					if {[N belong 8 0 0 {} {} x {}]} {
+						>
+							emit {\b, global index = %u}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CI]} {
+		>
+			if {[N leshort 2 0 0 {} {} == 44]} {
+				>
+					emit {Vision Research CINE Video,}
+					switch [Nv leshort 4 0 {} {}] {
+						0 {
+							>
+								emit Grayscale,
+							<
+						}
+						1 {
+							>
+								emit {JPEG Compressed,}
+							<
+						}
+						2 {
+							>
+								emit RAW,
+							<
+						}
+					}
+	
+					if {[N leshort 6 0 0 {} {} x {}]} {
+						>
+							emit {version %d,}
+						<
+					}
+	
+					if {[N lelong 20 0 0 {} {} x {}]} {
+						>
+							emit {%d frames,}
+						<
+					}
+	
+					if {[N lelong 48 0 0 {} {} x {}]} {
+						>
+							emit %dx
+						<
+					}
+	
+					if {[N lelong 52 0 0 {} {} x {}]} {
+						>
+							emit {\b%d}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ARRI]} {
+		>
+			emit {ARRI ARI image data,}
+			switch [Nv lelong 4 0 {} {}] {
+				305419896 {
+					>
+						emit big-endian,
+					<
+				}
+				2018915346 {
+					>
+						emit little-endian,
+					<
+				}
+			}
+	
+			if {[N lelong 12 0 0 {} {} x {}]} {
+				>
+					emit {version %d,}
+				<
+			}
+	
+			if {[N lelong 20 0 0 {} {} x {}]} {
+				>
+					emit %dx
+				<
+			}
+	
+			if {[N lelong 24 0 0 {} {} x {}]} {
+				>
+					emit {\b%d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xABKTX\ 11\xBB\r\n\x1A\n]} {
+		>
+			emit {Khronos KTX texture}
+			if {[N lelong 12 0 0 {} {} == 67305985]} {
+				>
+					emit (little-endian)
+					U 111 khronos-ktx-endian-header 16
+	
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} == 67305985]} {
+				>
+					emit (big-endian)
+					U 111 khronos-ktx-endian-header 16
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq VTF\0]} {
+		>
+			emit {Valve Texture Format}
+			if {[N lelong 4 0 0 {} {} x {}]} {
+				>
+					emit v%u
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit {\b.%u}
+				<
+			}
+	
+			if {[N leshort 16 0 0 {} {} x {}]} {
+				>
+					emit {\b, %u}
+				<
+			}
+	
+			if {[N leshort 18 0 0 {} {} > 1]} {
+				>
+					emit {x %u}
+				<
+			}
+	
+			if {[N lequad 4 0 0 {} {} == 30064771074]} {
+				>
+					if {[N leshort 63 0 0 {} {} > 1]} {
+						>
+							emit {x %u}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N leshort 24 0 0 {} {} > 1]} {
+				>
+					emit {\b, %u frames}
+				<
+			}
+	
+			if {[N byte 56 0 0 {} {} x {}]} {
+				>
+					emit {\b, mipmaps: %u}
+				<
+			}
+	
+			if {[N lelong 52 0 0 {} {} > -1]} {
+				>
+					emit {\b,}
+					U 111 vtf-image-format 52
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq VTF3]} {
+		>
+			emit {Valve Texture Format (PS3)}
+			if {[N beshort 20 0 0 {} {} x {}]} {
+				>
+					emit {\b, %u}
+				<
+			}
+	
+			if {[N beshort 22 0 0 {} {} x {}]} {
+				>
+					emit {\b x %u}
+				<
+			}
+	
+			switch [Nv belong 16 0 & 8192] {
+				0 {
+					>
+						emit {\b, DXT1}
+					<
+				}
+				8192 {
+					>
+						emit {\b, DXT5}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DanM]} {
+		>
+			emit {icrosoft Paint image data (version 1.x)}
+			if {[N leshort 4 0 0 {} {} x {}]} {
+				>
+					emit (%d
+					if {[N leshort 6 0 0 {} {} x {}]} {
+						>
+							emit {x %d)}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LinS]} {
+		>
+			emit {Microsoft Paint image data (version 2.0)}
+			if {[N leshort 4 0 0 {} {} x {}]} {
+				>
+					emit (%d
+					if {[N leshort 6 0 0 {} {} x {}]} {
+						>
+							emit {x %d)}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {c W} 100 eq constant\ story]} {
+		>
+			emit {Inform source text}
+		<
+	}
+	
+	if {[N lelong 16 0 0 {} {} == 267429210]} {
+		>
+			emit {Intel serial flash for PCH ROM}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \210OPS]} {
+		>
+			emit {Interleaf saved data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <!OPS]} {
+		>
+			emit {Interleaf document text}
+			if {[S string 5 0 {} {} eq ,\ Version\ =]} {
+				>
+					emit {\b, version}
+					if {[S string 17 0 {} {} > \0]} {
+						>
+							emit %.3s
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq pgscriptver]} {
+		>
+			emit {IslandWrite document}
+		<
+	}
+	
+	if {[S string 13 0 {} {} eq DrawFile]} {
+		>
+			emit {IslandDraw document}
+		<
+	}
+	
+	if {[N leshort 0 0 0 & -4 == -27136]} {
+		>
+			emit {little endian ispell}
+			switch [Nv byte 0 0 {} {}] {
+				0 {
+					>
+						emit {hash file (?),}
+					<
+				}
+				1 {
+					>
+						emit {3.0 hash file,}
+					<
+				}
+				2 {
+					>
+						emit {3.1 hash file,}
+					<
+				}
+				3 {
+					>
+						emit {hash file (?),}
+					<
+				}
+			}
+	
+			switch [Nv leshort 2 0 {} {}] {
+				0 {
+					>
+						emit {8-bit, no capitalization, 26 flags}
+					<
+				}
+				1 {
+					>
+						emit {7-bit, no capitalization, 26 flags}
+					<
+				}
+				2 {
+					>
+						emit {8-bit, capitalization, 26 flags}
+					<
+				}
+				3 {
+					>
+						emit {7-bit, capitalization, 26 flags}
+					<
+				}
+				4 {
+					>
+						emit {8-bit, no capitalization, 52 flags}
+					<
+				}
+				5 {
+					>
+						emit {7-bit, no capitalization, 52 flags}
+					<
+				}
+				6 {
+					>
+						emit {8-bit, capitalization, 52 flags}
+					<
+				}
+				7 {
+					>
+						emit {7-bit, capitalization, 52 flags}
+					<
+				}
+				8 {
+					>
+						emit {8-bit, no capitalization, 128 flags}
+					<
+				}
+				9 {
+					>
+						emit {7-bit, no capitalization, 128 flags}
+					<
+				}
+				10 {
+					>
+						emit {8-bit, capitalization, 128 flags}
+					<
+				}
+				11 {
+					>
+						emit {7-bit, capitalization, 128 flags}
+					<
+				}
+				12 {
+					>
+						emit {8-bit, no capitalization, 256 flags}
+					<
+				}
+				13 {
+					>
+						emit {7-bit, no capitalization, 256 flags}
+					<
+				}
+				14 {
+					>
+						emit {8-bit, capitalization, 256 flags}
+					<
+				}
+				15 {
+					>
+						emit {7-bit, capitalization, 256 flags}
+					<
+				}
+			}
+	
+			if {[N leshort 4 0 0 {} {} > 0]} {
+				>
+					emit {and %d string characters}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N beshort 0 0 0 & -4 == -27136]} {
+		>
+			emit {big endian ispell}
+			switch [Nv byte 1 0 {} {}] {
+				0 {
+					>
+						emit {hash file (?),}
+					<
+				}
+				1 {
+					>
+						emit {3.0 hash file,}
+					<
+				}
+				2 {
+					>
+						emit {3.1 hash file,}
+					<
+				}
+				3 {
+					>
+						emit {hash file (?),}
+					<
+				}
+			}
+	
+			switch [Nv beshort 2 0 {} {}] {
+				0 {
+					>
+						emit {8-bit, no capitalization, 26 flags}
+					<
+				}
+				1 {
+					>
+						emit {7-bit, no capitalization, 26 flags}
+					<
+				}
+				2 {
+					>
+						emit {8-bit, capitalization, 26 flags}
+					<
+				}
+				3 {
+					>
+						emit {7-bit, capitalization, 26 flags}
+					<
+				}
+				4 {
+					>
+						emit {8-bit, no capitalization, 52 flags}
+					<
+				}
+				5 {
+					>
+						emit {7-bit, no capitalization, 52 flags}
+					<
+				}
+				6 {
+					>
+						emit {8-bit, capitalization, 52 flags}
+					<
+				}
+				7 {
+					>
+						emit {7-bit, capitalization, 52 flags}
+					<
+				}
+				8 {
+					>
+						emit {8-bit, no capitalization, 128 flags}
+					<
+				}
+				9 {
+					>
+						emit {7-bit, no capitalization, 128 flags}
+					<
+				}
+				10 {
+					>
+						emit {8-bit, capitalization, 128 flags}
+					<
+				}
+				11 {
+					>
+						emit {7-bit, capitalization, 128 flags}
+					<
+				}
+				12 {
+					>
+						emit {8-bit, no capitalization, 256 flags}
+					<
+				}
+				13 {
+					>
+						emit {7-bit, no capitalization, 256 flags}
+					<
+				}
+				14 {
+					>
+						emit {8-bit, capitalization, 256 flags}
+					<
+				}
+				15 {
+					>
+						emit {7-bit, capitalization, 256 flags}
+					<
+				}
+			}
+	
+			if {[N beshort 4 0 0 {} {} > 0]} {
+				>
+					emit {and %d string characters}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ISPL]} {
+		>
+			emit ispell
+			if {[N long 4 0 0 {} {} x {}]} {
+				>
+					emit {hash file version %d,}
+				<
+			}
+	
+			if {[N long 8 0 0 {} {} x {}]} {
+				>
+					emit {lexletters %d,}
+				<
+			}
+	
+			if {[N long 12 0 0 {} {} x {}]} {
+				>
+					emit {lexsize %d,}
+				<
+			}
+	
+			if {[N long 16 0 0 {} {} x {}]} {
+				>
+					emit {hashsize %d,}
+				<
+			}
+	
+			if {[N long 20 0 0 {} {} x {}]} {
+				>
+					emit {stblsize %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq IsZ!]} {
+		>
+			emit {ISO Zipped file}
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {\b, header size %u}
+				<
+			}
+	
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %u}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit {\b, serial %u}
+				<
+			}
+	
+			if {[N byte 17 0 0 {} {} > 0]} {
+				>
+					emit {\b, password protected}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^import.*\;\$]} {
+		>
+			emit {Java source}
+			mime text/x-java
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq JAVA\x20PROFILE\x201.0.]} {
+		>
+			if {[N short 18 0 0 {} {} == 0]} {
+				>
+					if {[N ushort 17 0 0 - 49 < 2]} {
+						>
+							emit {Java HPROF dump,}
+						<
+					}
+	
+					if {[N beqdate 23 0 0 / 1000 x {}]} {
+						>
+							emit {created %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!/bin/node]} {
+		>
+			emit {Node.js script text executable}
+			mime application/javascript
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!/usr/bin/node]} {
+		>
+			emit {Node.js script text executable}
+			mime application/javascript
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!/bin/nodejs]} {
+		>
+			emit {Node.js script text executable}
+			mime application/javascript
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!/usr/bin/nodejs]} {
+		>
+			emit {Node.js script text executable}
+			mime application/javascript
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#!/usr/bin/env\ node]} {
+		>
+			emit {Node.js script text executable}
+			mime application/javascript
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#!/usr/bin/env\ nodejs]} {
+		>
+			emit {Node.js script text executable}
+			mime application/javascript
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq hsi1]} {
+		>
+			emit {JPEG image data, HSI proprietary}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x00\x00\x00\x0C\x6A\x50\x20\x20\x0D\x0A\x87\x0A]} {
+		>
+			emit {JPEG 2000}
+			if {[S string 20 0 {} {} eq \x6a\x70\x32\x20]} {
+				>
+					emit {Part 1 (JP2)}
+					mime image/jp2
+				<
+			}
+	
+			if {[S string 20 0 {} {} eq \x6a\x70\x78\x20]} {
+				>
+					emit {Part 2 (JPX)}
+					mime image/jpx
+				<
+			}
+	
+			if {[S string 20 0 {} {} eq \x6a\x70\x6d\x20]} {
+				>
+					emit {Part 6 (JPM)}
+					mime image/jpm
+				<
+			}
+	
+			if {[S string 20 0 {} {} eq \x6d\x6a\x70\x32]} {
+				>
+					emit {Part 3 (MJ2)}
+					mime video/mj2
+				<
+			}
+	
+		<
+	}
+	
+	if {[N beshort 45 0 0 {} {} == -174]} {
+		>
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x49\x49\xbc]} {
+		>
+			if {[N byte 3 0 0 {} {} == 1]} {
+				>
+					if {[N lelong 4 0 0 % 2 == 0]} {
+						>
+							emit JPEG-XR
+							mime image/jxr
+							ext jxr
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq KarmaRHD\040Version]} {
+		>
+			emit {Karma Data Structure Version}
+			if {[N belong 16 0 0 {} {} x {}]} {
+				>
+					emit %u
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \[KDE\ Desktop\ Entry\]]} {
+		>
+			emit {KDE desktop entry}
+			mime application/x-kdelnk
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \#\ KDE\ Config\ File]} {
+		>
+			emit {KDE config file}
+			mime application/x-kdelnk
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \#\ xmcd]} {
+		>
+			emit {xmcd database file for kscd}
+			mime text/x-xmcd
+		<
+	}
+	
+	if {[S string 0 0 t {} eq <?xml]} {
+		>
+			if {[S search 20 0 {} 400 eq \ xmlns=]} {
+				>
+					if {[S regex [R 0] 0 {} {} eq \['\"\]http://earth.google.com/kml]} {
+						>
+							emit {Google KML document}
+							if {[S string [R 1] 0 {} {} eq 2.0']} {
+								>
+									emit {\b, version 2.0}
+								<
+							}
+	
+							if {[S string [R 1] 0 {} {} eq 2.1']} {
+								>
+									emit {\b, version 2.1}
+								<
+							}
+	
+							if {[S string [R 1] 0 {} {} eq 2.2']} {
+								>
+									emit {\b, version 2.2}
+								<
+							}
+	
+							mime application/vnd.google-earth.kml+xml
+						<
+					}
+	
+					if {[S regex [R 0] 0 {} {} eq \['\"\]http://www.opengis.net/kml]} {
+						>
+							emit {OpenGIS KML document}
+							if {[S string [R 1] 0 t {} eq 2.2]} {
+								>
+									emit {\b, version 2.2}
+								<
+							}
+	
+							mime application/vnd.google-earth.kml+xml
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PK\003\004]} {
+		>
+			if {[N byte 4 0 0 {} {} == 20]} {
+				>
+					if {[S string 30 0 {} {} eq doc.kml]} {
+						>
+							emit {Compressed Google KML Document, including resources.}
+							mime application/vnd.google-earth.kmz
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq lect]} {
+		>
+			emit {DEC SRC Virtual Paper Lectern file}
+		<
+	}
+	
+	if {[S search 0 0 {} 100 eq yyprevious]} {
+		>
+			emit {C program text (from lex)}
+			if {[S search 3 0 {} 1 > \0]} {
+				>
+					emit {for %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 100 eq generated\ by\ flex]} {
+		>
+			emit {C program text (from flex)}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq %\{]} {
+		>
+			emit {lex description text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \007\001\000]} {
+		>
+			emit {Linux/i386 object file}
+			if {[N lelong 20 0 0 {} {} > 4128]} {
+				>
+					emit {\b, DLL library}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \01\03\020\04]} {
+		>
+			emit {Linux-8086 impure executable}
+			if {[N long 28 0 0 {} {} != 0]} {
+				>
+					emit {not stripped}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \01\03\040\04]} {
+		>
+			emit {Linux-8086 executable}
+			if {[N long 28 0 0 {} {} != 0]} {
+				>
+					emit {not stripped}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \243\206\001\0]} {
+		>
+			emit {Linux-8086 object file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \01\03\020\20]} {
+		>
+			emit {Minix-386 impure executable}
+			if {[N long 28 0 0 {} {} != 0]} {
+				>
+					emit {not stripped}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \01\03\040\20]} {
+		>
+			emit {Minix-386 executable}
+			if {[N long 28 0 0 {} {} != 0]} {
+				>
+					emit {not stripped}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \01\03\04\20]} {
+		>
+			emit {Minix-386 NSYM/GNU executable}
+			if {[N long 28 0 0 {} {} != 0]} {
+				>
+					emit {not stripped}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lelong 216 0 0 {} {} == 273]} {
+		>
+			emit {Linux/i386 core file}
+			if {[S string 220 0 {} {} > \0]} {
+				>
+					emit {of '%s'}
+				<
+			}
+	
+			if {[N lelong 200 0 0 {} {} > 0]} {
+				>
+					emit {(signal %d)}
+				<
+			}
+	
+			strength {/ 2}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq LILO]} {
+		>
+			emit {Linux/i386 LILO boot/chain loader}
+		<
+	}
+	
+	if {[S string 28 0 {} {} eq make\ config]} {
+		>
+			emit {Linux make config build file (old)}
+		<
+	}
+	
+	if {[S search 49 0 {} 70 eq Kernel\ Configuration]} {
+		>
+			emit {Linux make config build file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x72\xb5\x4a\x86\x00\x00]} {
+		>
+			emit {Linux/i386 PC Screen Font v2 data,}
+			if {[N lelong 16 0 0 {} {} x {}]} {
+				>
+					emit {%d characters,}
+				<
+			}
+	
+			if {[N lelong 12 0 0 & 1 == 0]} {
+				>
+					emit {no directory,}
+				<
+			}
+	
+			if {[N lelong 12 0 0 & 1 != 0]} {
+				>
+					emit {Unicode directory,}
+				<
+			}
+	
+			if {[N lelong 24 0 0 {} {} x {}]} {
+				>
+					emit %d
+				<
+			}
+	
+			if {[N lelong 28 0 0 {} {} x {}]} {
+				>
+					emit {\bx%d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 4086 0 {} {} eq SWAP-SPACE]} {
+		>
+			emit {Linux/i386 swap file}
+		<
+	}
+	
+	if {[S string 4076 0 {} {} eq SWAPSPACE2S1SUSPEND]} {
+		>
+			emit {Linux/i386 swap file (new style) with SWSUSP1 image}
+		<
+	}
+	
+	if {[S string 4076 0 {} {} eq SWAPSPACE2LINHIB0001]} {
+		>
+			emit {Linux/i386 swap file (new style) (compressed hibernate)}
+		<
+	}
+	
+	if {[S string 4086 0 {} {} eq SWAPSPACE2]} {
+		>
+			emit {Linux/i386 swap file (new style),}
+			if {[N long 1024 0 0 {} {} x {}]} {
+				>
+					emit {version %d (4K pages),}
+				<
+			}
+	
+			if {[N long 1028 0 0 {} {} x {}]} {
+				>
+					emit {size %d pages,}
+				<
+			}
+	
+			if {[S string 1052 0 {} {} eq \0]} {
+				>
+					emit {no label,}
+				<
+			}
+	
+			if {[S string 1052 0 {} {} > \0]} {
+				>
+					emit LABEL=%s,
+				<
+			}
+	
+			if {[N belong 1036 0 0 {} {} x {}]} {
+				>
+					emit UUID=%08x
+				<
+			}
+	
+			if {[N beshort 1040 0 0 {} {} x {}]} {
+				>
+					emit {\b-%04x}
+				<
+			}
+	
+			if {[N beshort 1042 0 0 {} {} x {}]} {
+				>
+					emit {\b-%04x}
+				<
+			}
+	
+			if {[N beshort 1044 0 0 {} {} x {}]} {
+				>
+					emit {\b-%04x}
+				<
+			}
+	
+			if {[N belong 1046 0 0 {} {} x {}]} {
+				>
+					emit {\b-%08x}
+				<
+			}
+	
+			if {[N beshort 1050 0 0 {} {} x {}]} {
+				>
+					emit {\b%04x}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 65526 0 {} {} eq SWAPSPACE2]} {
+		>
+			emit {Linux/ppc swap file}
+			if {[N long 1024 0 0 {} {} x {}]} {
+				>
+					emit {version %d,}
+				<
+			}
+	
+			if {[N long 1028 0 0 {} {} x {}]} {
+				>
+					emit {size %d pages,}
+				<
+			}
+	
+			if {[S string 1052 0 {} {} eq \0]} {
+				>
+					emit {no label,}
+				<
+			}
+	
+			if {[S string 1052 0 {} {} > \0]} {
+				>
+					emit LABEL=%s,
+				<
+			}
+	
+			if {[N belong 1036 0 0 {} {} x {}]} {
+				>
+					emit UUID=%08x
+				<
+			}
+	
+			if {[N beshort 1040 0 0 {} {} x {}]} {
+				>
+					emit {\b-%04x}
+				<
+			}
+	
+			if {[N beshort 1042 0 0 {} {} x {}]} {
+				>
+					emit {\b-%04x}
+				<
+			}
+	
+			if {[N beshort 1044 0 0 {} {} x {}]} {
+				>
+					emit {\b-%04x}
+				<
+			}
+	
+			if {[N belong 1046 0 0 {} {} x {}]} {
+				>
+					emit {\b-%08x}
+				<
+			}
+	
+			if {[N beshort 1050 0 0 {} {} x {}]} {
+				>
+					emit {\b%04x}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 16374 0 {} {} eq SWAPSPACE2]} {
+		>
+			emit {Linux/ia64 swap file}
+		<
+	}
+	
+	if {[S string 514 0 {} {} eq HdrS]} {
+		>
+			emit {Linux kernel}
+			if {[N leshort 510 0 0 {} {} == -21931]} {
+				>
+					emit {x86 boot executable}
+					if {[N leshort 518 0 0 {} {} > 511]} {
+						>
+							switch [Nv byte 529 0 {} {}] {
+								0 {
+									>
+										emit zImage,
+									<
+								}
+								1 {
+									>
+										emit bzImage,
+									<
+								}
+							}
+	
+							if {[N lelong 526 0 0 {} {} > 0]} {
+								>
+									if {[S string [I 526 uleshort 0 + 0 512] 0 {} {} > \0]} {
+										>
+											emit {version %s,}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					switch [Nv leshort 498 0 {} {}] {
+						0 {
+							>
+								emit RW-rootFS,
+							<
+						}
+						1 {
+							>
+								emit RO-rootFS,
+							<
+						}
+					}
+	
+					if {[N leshort 508 0 0 {} {} > 0]} {
+						>
+							emit {root_dev 0x%X,}
+						<
+					}
+	
+					if {[N leshort 502 0 0 {} {} > 0]} {
+						>
+							emit {swap_dev 0x%X,}
+						<
+					}
+	
+					if {[N leshort 504 0 0 {} {} > 0]} {
+						>
+							emit {RAMdisksize %u KB,}
+						<
+					}
+	
+					switch [Nv leshort 506 0 {} {}] {
+						-3 {
+							>
+								emit {Prompt for Videomode}
+							<
+						}
+						-2 {
+							>
+								emit {Extended VGA}
+							<
+						}
+						-1 {
+							>
+								emit {Normal VGA}
+							<
+						}
+					}
+	
+					if {[N leshort 506 0 0 {} {} > 0]} {
+						>
+							emit {Video mode %d}
+						<
+					}
+	
+				<
+			}
+	
+			strength {+ 55}
+		<
+	}
+	
+	if {[S search 8 0 {} 1 eq \ A\ _text]} {
+		>
+			emit {Linux kernel symbol map text}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq Begin3]} {
+		>
+			emit {Linux Software Map entry text}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq Begin4]} {
+		>
+			emit {Linux Software Map entry text (new format)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xb8\xc0\x07\x8e\xd8\xb8\x00\x90]} {
+		>
+			emit Linux
+			if {[N leshort 497 0 0 {} {} == 0]} {
+				>
+					emit {x86 boot sector}
+					switch [Nv belong 514 0 {} {}] {
+						-1869686604 {
+							>
+								emit {version 0.99-1.1.42}
+							<
+						}
+						-1869686600 {
+							>
+								emit {for memtest86}
+							<
+						}
+						142 {
+							>
+								emit {of a kernel from the dawn of time!}
+							<
+						}
+					}
+	
+				<
+			}
+	
+			if {[N leshort 497 0 0 {} {} != 0]} {
+				>
+					emit {x86 kernel}
+					if {[N leshort 504 0 0 {} {} > 0]} {
+						>
+							emit {RAMdisksize=%u KB}
+						<
+					}
+	
+					if {[N leshort 502 0 0 {} {} > 0]} {
+						>
+							emit swap=0x%X
+						<
+					}
+	
+					if {[N leshort 508 0 0 {} {} > 0]} {
+						>
+							emit root=0x%X
+							switch [Nv leshort 498 0 {} {}] {
+								0 {
+									>
+										emit {\b-rw}
+									<
+								}
+								1 {
+									>
+										emit {\b-ro}
+									<
+								}
+							}
+	
+						<
+					}
+	
+					switch [Nv leshort 506 0 {} {}] {
+						-3 {
+							>
+								emit vga=ask
+							<
+						}
+						-2 {
+							>
+								emit vga=extended
+							<
+						}
+						-1 {
+							>
+								emit vga=normal
+							<
+						}
+					}
+	
+					if {[N leshort 506 0 0 {} {} > 0]} {
+						>
+							emit vga=%d
+						<
+					}
+	
+					switch [Nv belong 514 0 {} {}] {
+						-1869686655 {
+							>
+								emit {version 1.1.43-1.1.45}
+							<
+						}
+						364020173 {
+							>
+								if {[N belong 2702 0 0 {} {} == 1437227610]} {
+									>
+										emit {version 1.1.46-1.2.13,1.3.0}
+									<
+								}
+	
+								if {[N belong 2713 0 0 {} {} == 1437227610]} {
+									>
+										emit {version 1.3.1,2}
+									<
+								}
+	
+								if {[N belong 2723 0 0 {} {} == 1437227610]} {
+									>
+										emit {version 1.3.3-1.3.30}
+									<
+								}
+	
+								if {[N belong 2726 0 0 {} {} == 1437227610]} {
+									>
+										emit {version 1.3.31-1.3.41}
+									<
+								}
+	
+								if {[N belong 2859 0 0 {} {} == 1437227610]} {
+									>
+										emit {version 1.3.42-1.3.45}
+									<
+								}
+	
+								if {[N belong 2807 0 0 {} {} == 1437227610]} {
+									>
+										emit {version 1.3.46-1.3.72}
+									<
+								}
+	
+							<
+						}
+					}
+	
+					if {[S string 514 0 {} {} eq HdrS]} {
+						>
+							if {[N leshort 518 0 0 {} {} > 511]} {
+								>
+									switch [Nv byte 529 0 {} {}] {
+										0 {
+											>
+												emit {\b, zImage}
+											<
+										}
+										1 {
+											>
+												emit {\b, bzImage}
+											<
+										}
+									}
+	
+									if {[S string [I 526 uleshort 0 + 0 512] 0 {} {} > \0]} {
+										>
+											emit {\b, version %s}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq \x02\x00\x00\x18\x60\x00\x00\x50\x02\x00\x00\x68\x60\x00\x00\x50\x40\x40\x40\x40\x40\x40\x40\x40]} {
+		>
+			emit {Linux S390}
+			if {[S search 65536 0 b 4096 eq \x00\x0a\x00\x00\x8b\xad\xcc\xcc]} {
+				>
+					if {[S string [R 0] 0 {} {} eq \xc1\x00\xef\xe3\xf0\x68\x00\x00]} {
+						>
+							emit {Z10 64bit kernel}
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq \xc1\x00\xef\xc3\x00\x00\x00\x00]} {
+						>
+							emit {Z9-109 64bit kernel}
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq \xc0\x00\x20\x00\x00\x00\x00\x00]} {
+						>
+							emit {Z990 64bit kernel}
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq \x00\x00\x00\x00\x00\x00\x00\x00]} {
+						>
+							emit {Z900 64bit kernel}
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq \x81\x00\xc8\x80\x00\x00\x00\x00]} {
+						>
+							emit {Z10 32bit kernel}
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq \x81\x00\xc8\x80\x00\x00\x00\x00]} {
+						>
+							emit {Z9-109 32bit kernel}
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq \x80\x00\x20\x00\x00\x00\x00\x00]} {
+						>
+							emit {Z990 32bit kernel}
+						<
+					}
+	
+					if {[S string [R 0] 0 {} {} eq \x80\x00\x00\x00\x00\x00\x00\x00]} {
+						>
+							emit {Z900 32bit kernel}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lelong 36 0 0 {} {} == 24061976]} {
+		>
+			emit {Linux kernel ARM boot executable zImage (little-endian)}
+		<
+	}
+	
+	if {[N belong 36 0 0 {} {} == 24061976]} {
+		>
+			emit {Linux kernel ARM boot executable zImage (big-endian)}
+		<
+	}
+	
+	if {[N lelong 0 0 0 & -16776961 == -1023409943]} {
+		>
+			emit {Linux-Dev86 executable, headerless}
+			if {[S string 5 0 {} {} eq .]} {
+				>
+					if {[S string 4 0 {} {} > \0]} {
+						>
+							emit {\b, libc version %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lelong 0 0 0 & -16711681 == 67109633]} {
+		>
+			emit {Linux-8086 executable}
+			if {[N byte 2 0 0 & 1 != 0]} {
+				>
+					emit {\b, unmapped zero page}
+				<
+			}
+	
+			if {[N byte 2 0 0 & 32 == 0]} {
+				>
+					emit {\b, impure}
+				<
+			}
+	
+			if {[N byte 2 0 0 & 32 != 0]} {
+				>
+					if {[N byte 2 0 0 & 16 != 0]} {
+						>
+							emit {\b, A_EXEC}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 2 0 0 & 2 != 0]} {
+				>
+					emit {\b, A_PAL}
+				<
+			}
+	
+			if {[N byte 2 0 0 & 4 != 0]} {
+				>
+					emit {\b, A_NSYM}
+				<
+			}
+	
+			if {[N byte 2 0 0 & 8 != 0]} {
+				>
+					emit {\b, A_STAND}
+				<
+			}
+	
+			if {[N byte 2 0 0 & 64 != 0]} {
+				>
+					emit {\b, A_PURE}
+				<
+			}
+	
+			if {[N byte 2 0 0 & -128 != 0]} {
+				>
+					emit {\b, A_TOVLY}
+				<
+			}
+	
+			if {[N long 28 0 0 {} {} != 0]} {
+				>
+					emit {\b, not stripped}
+				<
+			}
+	
+			if {[S string 37 0 {} {} eq .]} {
+				>
+					if {[S string 36 0 {} {} > \0]} {
+						>
+							emit {\b, libc version %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq OOOM]} {
+		>
+			emit {User-Mode-Linux's Copy-On-Write disk image}
+			if {[N belong 4 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HM\001]} {
+		>
+			emit {LVM1 (Linux Logical Volume Manager), version 1}
+			if {[S string 300 0 {} {} > \0]} {
+				>
+					emit {, System ID: %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HM\002]} {
+		>
+			emit {LVM1 (Linux Logical Volume Manager), version 2}
+			if {[S string 300 0 {} {} > \0]} {
+				>
+					emit {, System ID: %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 536 0 {} {} eq LVM2\ 001]} {
+		>
+			emit {LVM2 PV (Linux Logical Volume Manager)}
+			if {[N byte [R [I [R -12] ulelong 0 - 0 33]] 0 0 {} {} x {}]} {
+				>
+					if {[S string [R 0] 0 {} {} > \x2f]} {
+						>
+							emit {\b, UUID: %.6s}
+						<
+					}
+	
+					if {[S string [R 6] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 10] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 14] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 18] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 22] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 26] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.6s}
+						<
+					}
+	
+					if {[N lequad [R 32] 0 0 {} {} x {}]} {
+						>
+							emit {\b, size: %lld}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 24 0 {} {} eq LVM2\ 001]} {
+		>
+			emit {LVM2 PV (Linux Logical Volume Manager)}
+			if {[N byte [R [I [R -12] ulelong 0 - 0 33]] 0 0 {} {} x {}]} {
+				>
+					if {[S string [R 0] 0 {} {} > \x2f]} {
+						>
+							emit {\b, UUID: %.6s}
+						<
+					}
+	
+					if {[S string [R 6] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 10] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 14] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 18] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 22] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 26] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.6s}
+						<
+					}
+	
+					if {[N lequad [R 32] 0 0 {} {} x {}]} {
+						>
+							emit {\b, size: %lld}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 1048 0 {} {} eq LVM2\ 001]} {
+		>
+			emit {LVM2 PV (Linux Logical Volume Manager)}
+			if {[N byte [R [I [R -12] ulelong 0 - 0 33]] 0 0 {} {} x {}]} {
+				>
+					if {[S string [R 0] 0 {} {} > \x2f]} {
+						>
+							emit {\b, UUID: %.6s}
+						<
+					}
+	
+					if {[S string [R 6] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 10] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 14] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 18] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 22] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 26] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.6s}
+						<
+					}
+	
+					if {[N lequad [R 32] 0 0 {} {} x {}]} {
+						>
+							emit {\b, size: %lld}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 1560 0 {} {} eq LVM2\ 001]} {
+		>
+			emit {LVM2 PV (Linux Logical Volume Manager)}
+			if {[N byte [R [I [R -12] ulelong 0 - 0 33]] 0 0 {} {} x {}]} {
+				>
+					if {[S string [R 0] 0 {} {} > \x2f]} {
+						>
+							emit {\b, UUID: %.6s}
+						<
+					}
+	
+					if {[S string [R 6] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 10] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 14] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 18] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 22] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.4s}
+						<
+					}
+	
+					if {[S string [R 26] 0 {} {} > \x2f]} {
+						>
+							emit {\b-%.6s}
+						<
+					}
+	
+					if {[N lequad [R 32] 0 0 {} {} x {}]} {
+						>
+							emit {\b, size: %lld}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SnAp]} {
+		>
+			emit {LVM Snapshot (CopyOnWrite store)}
+			if {[N lelong 4 0 0 {} {} != 0]} {
+				>
+					emit {- valid,}
+				<
+			}
+	
+			if {[N lelong 4 0 0 {} {} == 0]} {
+				>
+					emit {- invalid,}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit {version %d,}
+				<
+			}
+	
+			if {[N lelong 12 0 0 {} {} x {}]} {
+				>
+					emit {chunk_size %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LUKS\xba\xbe]} {
+		>
+			emit {LUKS encrypted file,}
+			if {[N beshort 6 0 0 {} {} x {}]} {
+				>
+					emit {ver %d}
+				<
+			}
+	
+			if {[S string 8 0 {} {} x {}]} {
+				>
+					emit {[%s,}
+				<
+			}
+	
+			if {[S string 40 0 {} {} x {}]} {
+				>
+					emit %s,
+				<
+			}
+	
+			if {[S string 72 0 {} {} x {}]} {
+				>
+					emit %s\]
+				<
+			}
+	
+			if {[S string 168 0 {} {} x {}]} {
+				>
+					emit {UUID: %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LinuxGuestRecord]} {
+		>
+			emit {Xen saved domain}
+			if {[S search 20 0 {} 256 eq (name]} {
+				>
+					if {[S string [R 1] 0 {} {} x {}]} {
+						>
+							emit {(name %s)}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LinuxGuestRecord]} {
+		>
+			emit {Xen saved domain}
+			if {[S search 20 0 {} 256 eq (name]} {
+				>
+					emit (name
+					if {[S string [R 1] 0 {} {} x {}]} {
+						>
+							emit %s...)
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LPKSHHRH]} {
+		>
+			if {[N ubyte 16 0 0 & 252 == 0]} {
+				>
+					if {[N ubequad 24 0 0 {} {} > 0]} {
+						>
+							if {[N ubequad 32 0 0 {} {} > 0]} {
+								>
+									if {[N ubequad 40 0 0 {} {} > 0]} {
+										>
+											if {[N ubequad 48 0 0 {} {} > 0]} {
+												>
+													if {[N ubequad 56 0 0 {} {} > 0]} {
+														>
+															if {[N ubequad 64 0 0 {} {} > 0]} {
+																>
+																	emit {Journal file}
+																	if {[N leqdate 184 0 0 {} {} == 0]} {
+																		>
+																			emit empty
+																		<
+																	}
+	
+																	switch [Nv ubyte 16 0 {} {}] {
+																		0 {
+																			>
+																				emit {\b, offline}
+																			<
+																		}
+																		1 {
+																			>
+																				emit {\b, online}
+																			<
+																		}
+																		2 {
+																			>
+																				emit {\b, archived}
+																			<
+																		}
+																	}
+	
+																	if {[N ulelong 8 0 0 & 1 == 1]} {
+																		>
+																			emit {\b, sealed}
+																		<
+																	}
+	
+																	if {[N ulelong 12 0 0 & 1 == 1]} {
+																		>
+																			emit {\b, compressed}
+																		<
+																	}
+	
+																	mime application/octet-stream
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lequad 4104 0 0 {} {} == 8]} {
+		>
+			if {[S string 4120 0 {} {} eq \xc6\x85\x73\xf6\x4e\x1a\x45\xca\x82\x65\xf5\x7f\x48\xba\x6d\x81]} {
+				>
+					emit BCache
+					switch [Nv ulequad 4112 0 {} {}] {
+						0 {
+							>
+								emit {cache device}
+							<
+						}
+						1 {
+							>
+								emit {backing device}
+							<
+						}
+						3 {
+							>
+								emit {cache device}
+							<
+						}
+						4 {
+							>
+								emit {backing device}
+							<
+						}
+					}
+	
+					if {[S string 4168 0 {} {} > 0]} {
+						>
+							emit {\b, label "%.32s"}
+						<
+					}
+	
+					if {[N ubelong 4136 0 0 {} {} x {}]} {
+						>
+							emit {\b, uuid %08x}
+						<
+					}
+	
+					if {[N ubeshort 4140 0 0 {} {} x {}]} {
+						>
+							emit {\b-%04x}
+						<
+					}
+	
+					if {[N ubeshort 4142 0 0 {} {} x {}]} {
+						>
+							emit {\b-%04x}
+						<
+					}
+	
+					if {[N ubeshort 4144 0 0 {} {} x {}]} {
+						>
+							emit {\b-%04x}
+						<
+					}
+	
+					if {[N ubelong 4146 0 0 {} {} x {}]} {
+						>
+							emit {\b-%08x}
+						<
+					}
+	
+					if {[N ubeshort 4150 0 0 {} {} x {}]} {
+						>
+							emit {\b%04x}
+						<
+					}
+	
+					if {[N ubelong 4152 0 0 {} {} x {}]} {
+						>
+							emit {\b, set uuid %08x}
+						<
+					}
+	
+					if {[N ubeshort 4156 0 0 {} {} x {}]} {
+						>
+							emit {\b-%04x}
+						<
+					}
+	
+					if {[N ubeshort 4158 0 0 {} {} x {}]} {
+						>
+							emit {\b-%04x}
+						<
+					}
+	
+					if {[N ubeshort 4160 0 0 {} {} x {}]} {
+						>
+							emit {\b-%04x}
+						<
+					}
+	
+					if {[N ubelong 4162 0 0 {} {} x {}]} {
+						>
+							emit {\b-%08x}
+						<
+					}
+	
+					if {[N ubeshort 4166 0 0 {} {} x {}]} {
+						>
+							emit {\b%04x}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lelong 4096 0 0 {} {} == -1456779524]} {
+		>
+			emit {Linux Software RAID}
+			if {[N lelong 4100 0 0 {} {} x {}]} {
+				>
+					emit {version 1.2 (%d)}
+				<
+			}
+	
+			U 129 linuxraid 4096
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0mlocate]} {
+		>
+			emit {mlocate database}
+			if {[N byte 12 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %d}
+				<
+			}
+	
+			if {[N byte 13 0 0 {} {} == 1]} {
+				>
+					emit {\b, require visibility}
+				<
+			}
+	
+			if {[S string 16 0 {} {} x {}]} {
+				>
+					emit {\b, root %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq KDUMP]} {
+		>
+			emit {Kdump compressed dump}
+			if {[N long 8 0 0 {} {} x {}]} {
+				>
+					emit v%d
+				<
+			}
+	
+			if {[S string 12 0 {} {} > \0]} {
+				>
+					emit {\b, system %s}
+				<
+			}
+	
+			if {[S string 77 0 {} {} > \0]} {
+				>
+					emit {\b, node %s}
+				<
+			}
+	
+			if {[S string 142 0 {} {} > \0]} {
+				>
+					emit {\b, release %s}
+				<
+			}
+	
+			if {[S string 207 0 {} {} > \0]} {
+				>
+					emit {\b, version %s}
+				<
+			}
+	
+			if {[S string 272 0 {} {} > \0]} {
+				>
+					emit {\b, machine %s}
+				<
+			}
+	
+			if {[S string 337 0 {} {} > \0]} {
+				>
+					emit {\b, domain %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq (setq\ ]} {
+		>
+			emit {Lisp/Scheme program text}
+			mime text/x-lisp
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq (defvar\ ]} {
+		>
+			emit {Lisp/Scheme program text}
+			mime text/x-lisp
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq (defparam\ ]} {
+		>
+			emit {Lisp/Scheme program text}
+			mime text/x-lisp
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq (defun\ ]} {
+		>
+			emit {Lisp/Scheme program text}
+			mime text/x-lisp
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq (autoload\ ]} {
+		>
+			emit {Lisp/Scheme program text}
+			mime text/x-lisp
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq (custom-set-variables\ ]} {
+		>
+			emit {Lisp/Scheme program text}
+			mime text/x-lisp
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \012(]} {
+		>
+			if {[S regex [R 0] 0 {} {} eq ^(defun|defvar|defconst|defmacro|setq|fset)]} {
+				>
+					emit {Emacs v18 byte-compiled Lisp data}
+					mime application/x-elc
+					ext elc
+				<
+			}
+	
+			if {[S regex [R 0] 0 {} {} eq ^(put|provide|require|random)]} {
+				>
+					emit {Emacs v18 byte-compiled Lisp data}
+					mime application/x-elc
+					ext elc
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \;ELC]} {
+		>
+			if {[N byte 4 0 0 {} {} > 18]} {
+				>
+					emit {Emacs/XEmacs v%d byte-compiled Lisp data}
+					mime application/x-elc
+					ext elc
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq (SYSTEM::VERSION\040']} {
+		>
+			emit {CLISP byte-compiled Lisp program (pre 2004-03-27)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq (|SYSTEM|::|VERSION|\040']} {
+		>
+			emit {CLISP byte-compiled Lisp program text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \372\372\372\372]} {
+		>
+			emit {MIT scheme (library?)}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq <TeXmacs|]} {
+		>
+			emit {TeXmacs document text}
+			mime text/texmacs
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq llvm]} {
+		>
+			emit {LLVM byte-codes, uncompressed}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq llvc0]} {
+		>
+			emit {LLVM byte-codes, null compression}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq llvc1]} {
+		>
+			emit {LLVM byte-codes, gzip compression}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq llvc2]} {
+		>
+			emit {LLVM byte-codes, bzip2 compression}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BC\xc0\xde]} {
+		>
+			emit {LLVM IR bitcode}
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!\ /usr/bin/lua]} {
+		>
+			emit {Lua script text executable}
+			mime text/x-lua
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!\ /usr/local/bin/lua]} {
+		>
+			emit {Lua script text executable}
+			mime text/x-lua
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#!/usr/bin/env\ lua]} {
+		>
+			emit {Lua script text executable}
+			mime text/x-lua
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#!\ /usr/bin/env\ lua]} {
+		>
+			emit {Lua script text executable}
+			mime text/x-lua
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \033Lua]} {
+		>
+			emit {Lua bytecode,}
+			switch [Nv byte 4 0 {} {}] {
+				80 {
+					>
+						emit {version 5.0}
+					<
+				}
+				81 {
+					>
+						emit {version 5.1}
+					<
+				}
+				82 {
+					>
+						emit {version 5.2}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LUKS\xba\xbe]} {
+		>
+			emit {LUKS encrypted file,}
+			if {[N beshort 6 0 0 {} {} x {}]} {
+				>
+					emit {ver %d}
+				<
+			}
+	
+			if {[S string 8 0 {} {} x {}]} {
+				>
+					emit {[%s,}
+				<
+			}
+	
+			if {[S string 40 0 {} {} x {}]} {
+				>
+					emit %s,
+				<
+			}
+	
+			if {[S string 72 0 {} {} x {}]} {
+				>
+					emit %s\]
+				<
+			}
+	
+			if {[S string 168 0 {} {} x {}]} {
+				>
+					emit {UUID: %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^dnl\ ]} {
+		>
+			emit {M4 macro processor script text}
+			mime text/x-m4
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^AC_DEFUN\\(\\\[]} {
+		>
+			emit {M4 macro processor script text}
+			mime text/x-m4
+			strength {+ 15}
+		<
+	}
+	
+	if {[N lelong 0 0 0 & -2 == -17958194]} {
+		>
+			emit Mach-O
+			U 135 mach-o-be 0
+	
+			mime application/x-mach-binary
+			strength +1
+		<
+	}
+	
+	switch [Nv belong 0 0 & -2] {
+		-17958194 {
+			>
+				emit Mach-O
+				mime application/x-mach-binary
+				U 135 mach-o-be 0
+	
+			<
+		}
+		931071618 {
+			>
+				emit {SQLite Write-Ahead Log,}
+				ext sqlite-wal/db-wal
+				if {[N belong 4 0 0 {} {} x {}]} {
+					>
+						emit {version %d}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[S string 11 0 {} {} eq must\ be\ converted\ with\ BinHex]} {
+		>
+			emit {BinHex binary text}
+			if {[S string 41 0 {} {} x {}]} {
+				>
+					emit {\b, version %.3s}
+				<
+			}
+	
+			mime application/mac-binhex40
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SIT!]} {
+		>
+			emit {StuffIt Archive (data)}
+			if {[S string 2 0 {} {} x {}]} {
+				>
+					emit {: %s}
+				<
+			}
+	
+			mime application/x-stuffit
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SITD]} {
+		>
+			emit {StuffIt Deluxe (data)}
+			if {[S string 2 0 {} {} x {}]} {
+				>
+					emit {: %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Seg]} {
+		>
+			emit {StuffIt Deluxe Segment (data)}
+			if {[S string 2 0 {} {} x {}]} {
+				>
+					emit {: %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq StuffIt]} {
+		>
+			emit {StuffIt Archive}
+			mime application/x-stuffit
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SAS]} {
+		>
+			emit SAS
+			if {[S string 24 0 {} {} eq DATA]} {
+				>
+					emit {data file}
+				<
+			}
+	
+			if {[S string 24 0 {} {} eq CATALOG]} {
+				>
+					emit catalog
+				<
+			}
+	
+			if {[S string 24 0 {} {} eq INDEX]} {
+				>
+					emit {data file index}
+				<
+			}
+	
+			if {[S string 24 0 {} {} eq VIEW]} {
+				>
+					emit {data view}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 84 0 {} {} eq SAS]} {
+		>
+			emit {SAS 7+}
+			if {[S string 156 0 {} {} eq DATA]} {
+				>
+					emit {data file}
+				<
+			}
+	
+			if {[S string 156 0 {} {} eq CATALOG]} {
+				>
+					emit catalog
+				<
+			}
+	
+			if {[S string 156 0 {} {} eq INDEX]} {
+				>
+					emit {data file index}
+				<
+			}
+	
+			if {[S string 156 0 {} {} eq VIEW]} {
+				>
+					emit {data view}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \$FL2]} {
+		>
+			emit {SPSS System File}
+			if {[S string 24 0 {} {} x {}]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \$FL3]} {
+		>
+			emit {SPSS System File}
+			if {[S string 24 0 {} {} x {}]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv beshort 1024 0 {} {}] {
+		-11561 {
+			>
+				emit {Macintosh MFS data}
+				if {[N beshort 0 0 0 {} {} == 19531]} {
+					>
+						emit (bootable)
+					<
+				}
+	
+				if {[N beshort 1034 0 0 {} {} & -32768]} {
+					>
+						emit (locked)
+					<
+				}
+	
+				if {[N beldate 1026 0 0 - 2082844800 x {}]} {
+					>
+						emit {created: %s,}
+					<
+				}
+	
+				if {[N beldate 1030 0 0 - 2082844800 > 0]} {
+					>
+						emit {last backup: %s,}
+					<
+				}
+	
+				if {[N belong 1044 0 0 {} {} x {}]} {
+					>
+						emit {block size: %d,}
+					<
+				}
+	
+				if {[N beshort 1042 0 0 {} {} x {}]} {
+					>
+						emit {number of blocks: %d,}
+					<
+				}
+	
+				if {[S pstring 1060 0 {} {} x {}]} {
+					>
+						emit {volume name: %s}
+					<
+				}
+	
+			<
+		}
+		16964 {
+			>
+				if {[N ubeshort 1038 0 0 {} {} == 3]} {
+					>
+						if {[N ubyte 1060 0 0 {} {} < 28]} {
+							>
+								emit {Macintosh HFS data}
+								if {[N beshort 0 0 0 {} {} == 19531]} {
+									>
+										emit (bootable)
+									<
+								}
+	
+								if {[N beshort 1034 0 0 {} {} & -32768]} {
+									>
+										emit (locked)
+									<
+								}
+	
+								if {[N beshort 1034 0 0 {} {} ^ 256]} {
+									>
+										emit (mounted)
+									<
+								}
+	
+								if {[N beshort 1034 0 0 {} {} & 512]} {
+									>
+										emit {(spared blocks)}
+									<
+								}
+	
+								if {[N beshort 1034 0 0 {} {} & 2048]} {
+									>
+										emit (unclean)
+									<
+								}
+	
+								if {[N beshort 1148 0 0 {} {} == 18475]} {
+									>
+										emit {(Embedded HFS+ Volume)}
+									<
+								}
+	
+								if {[N belong 1044 0 0 {} {} x {}]} {
+									>
+										emit {block size: %d,}
+									<
+								}
+	
+								if {[N beshort 1042 0 0 {} {} x {}]} {
+									>
+										emit {number of blocks: %d,}
+									<
+								}
+	
+								if {[S pstring 1060 0 {} {} x {}]} {
+									>
+										emit {volume name: %s}
+									<
+								}
+	
+								mime application/x-apple-diskimage
+								ext hfs/dmg
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		18475 {
+			>
+				emit {Macintosh HFS Extended}
+				if {[N beshort [R 0] 0 0 {} {} x {}]} {
+					>
+						emit {version %d data}
+					<
+				}
+	
+				if {[N beshort 0 0 0 {} {} == 19531]} {
+					>
+						emit (bootable)
+					<
+				}
+	
+				if {[N belong 1028 0 0 {} {} ^ 256]} {
+					>
+						emit (mounted)
+					<
+				}
+	
+				if {[N belong [R 2] 0 0 {} {} & 512]} {
+					>
+						emit {(spared blocks)}
+					<
+				}
+	
+				if {[N belong [R 2] 0 0 {} {} & 2048]} {
+					>
+						emit (unclean)
+					<
+				}
+	
+				if {[N belong [R 2] 0 0 {} {} & 32768]} {
+					>
+						emit (locked)
+					<
+				}
+	
+				if {[S string [R 6] 0 {} {} x {}]} {
+					>
+						emit {last mounted by: '%.4s',}
+					<
+				}
+	
+				if {[N beldate [R 14] 0 0 - 2082844800 x {}]} {
+					>
+						emit {created: %s,}
+					<
+				}
+	
+				if {[N bedate [R 18] 0 0 - -20352 x {}]} {
+					>
+						emit {last modified: %s,}
+					<
+				}
+	
+				if {[N bedate [R 22] 0 0 - -20352 > 0]} {
+					>
+						emit {last backup: %s,}
+					<
+				}
+	
+				if {[N bedate [R 26] 0 0 - -20352 > 0]} {
+					>
+						emit {last checked: %s,}
+					<
+				}
+	
+				if {[N belong [R 38] 0 0 {} {} x {}]} {
+					>
+						emit {block size: %d,}
+					<
+				}
+	
+				if {[N belong [R 42] 0 0 {} {} x {}]} {
+					>
+						emit {number of blocks: %d,}
+					<
+				}
+	
+				if {[N belong [R 46] 0 0 {} {} x {}]} {
+					>
+						emit {free blocks: %d}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq BOMStore]} {
+		>
+			emit {Mac OS X bill of materials (BOM) file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq book\0\0\0\0mark\0\0\0\0]} {
+		>
+			emit {MacOS Alias file}
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \#\ Magic]} {
+		>
+			emit {magic text file for file(1) cmd}
+		<
+	}
+	
+	if {[S string 0 0 t {} eq Relay-Version:]} {
+		>
+			emit {old news text}
+			mime message/rfc822
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \#!\ rnews]} {
+		>
+			emit {batched news text}
+			mime message/rfc822
+		<
+	}
+	
+	if {[S string 0 0 t {} eq N\#!\ rnews]} {
+		>
+			emit {mailed, batched news text}
+			mime message/rfc822
+		<
+	}
+	
+	if {[S string 0 0 t {} eq Forward\ to]} {
+		>
+			emit {mail forwarding text}
+			mime message/rfc822
+		<
+	}
+	
+	if {[S string 0 0 t {} eq Pipe\ to]} {
+		>
+			emit {mail piping text}
+			mime message/rfc822
+		<
+	}
+	
+	if {[S string 0 0 {t c} {} eq delivered-to:]} {
+		>
+			emit {SMTP mail text}
+			mime message/rfc822
+		<
+	}
+	
+	if {[S string 0 0 {t c} {} eq return-path:]} {
+		>
+			emit {SMTP mail text}
+			mime message/rfc822
+		<
+	}
+	
+	if {[S string 0 0 t {} eq Path:]} {
+		>
+			emit {news text}
+			mime message/news
+		<
+	}
+	
+	if {[S string 0 0 t {} eq Xref:]} {
+		>
+			emit {news text}
+			mime message/news
+		<
+	}
+	
+	if {[S string 0 0 t {} eq From:]} {
+		>
+			emit {news or mail text}
+			mime message/rfc822
+		<
+	}
+	
+	if {[S string 0 0 t {} eq Article]} {
+		>
+			emit {saved news text}
+			mime message/news
+		<
+	}
+	
+	if {[S string 0 0 t {} eq BABYL]} {
+		>
+			emit {Emacs RMAIL text}
+		<
+	}
+	
+	if {[S string 0 0 t {} eq Received:]} {
+		>
+			emit {RFC 822 mail text}
+			mime message/rfc822
+		<
+	}
+	
+	if {[S string 0 0 t {} eq MIME-Version:]} {
+		>
+			emit {MIME entity text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq *mbx*]} {
+		>
+			emit {MBX mail folder}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \241\002\213\015skiplist\ file\0\0\0]} {
+		>
+			emit {Cyrus skiplist DB}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \241\002\213\015twoskip\ file\0\0\0\0]} {
+		>
+			emit {Cyrus twoskip DB}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq JAM\0]} {
+		>
+			emit {JAM message area header file}
+			if {[N leshort 12 0 0 {} {} > 0]} {
+				>
+					emit {(%d messages)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CyrSBytecode]} {
+		>
+			emit {Cyrus sieve bytecode data,}
+			if {[N belong 12 0 0 {} {} == 1]} {
+				>
+					emit {version 1, big-endian}
+				<
+			}
+	
+			if {[N lelong 12 0 0 {} {} == 1]} {
+				>
+					emit {version 1, little-endian}
+				<
+			}
+	
+			if {[N belong 12 0 0 {} {} x {}]} {
+				>
+					emit {version %d, network-endian}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 l 100 eq ^CFLAGS]} {
+		>
+			emit {makefile script text}
+			mime text/x-makefile
+		<
+	}
+	
+	if {[S regex 0 0 l 100 eq ^VPATH]} {
+		>
+			emit {makefile script text}
+			mime text/x-makefile
+		<
+	}
+	
+	if {[S regex 0 0 l 100 eq ^LDFLAGS]} {
+		>
+			emit {makefile script text}
+			mime text/x-makefile
+		<
+	}
+	
+	if {[S regex 0 0 l 100 eq ^all:]} {
+		>
+			emit {makefile script text}
+			mime text/x-makefile
+		<
+	}
+	
+	if {[S regex 0 0 l 100 eq ^\\.PRECIOUS]} {
+		>
+			emit {makefile script text}
+			mime text/x-makefile
+		<
+	}
+	
+	if {[S regex 0 0 l 100 eq ^\\.BEGIN]} {
+		>
+			emit {BSD makefile script text}
+			mime text/x-makefile
+			ext /mk
+			strength +10
+		<
+	}
+	
+	if {[S regex 0 0 l 100 eq ^\\.include]} {
+		>
+			emit {BSD makefile script text}
+			mime text/x-makefile
+			ext /mk
+			strength +10
+		<
+	}
+	
+	if {[S regex 0 0 l 100 eq ^\\.endif]} {
+		>
+			emit {BSD makefile script text}
+			mime text/x-makefile
+			ext /mk
+			strength +10
+		<
+	}
+	
+	if {[S regex 0 0 l 100 eq ^SUBDIRS]} {
+		>
+			emit {automake makefile script text}
+			mime text/x-makefile
+			strength +10
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq .FIT]} {
+		>
+			emit {FIT Map data}
+			if {[N byte 15 0 0 {} {} == 0]} {
+				>
+					if {[N belong 35 0 0 {} {} x {}]} {
+						>
+							emit {\b, unit id %d}
+						<
+					}
+	
+					if {[N lelong 39 0 0 {} {} x {}]} {
+						>
+							emit {\b, serial %u}
+						<
+					}
+	
+					if {[N leldate 43 0 0 + 631065600 x {}]} {
+						>
+							emit {\b, %s}
+						<
+					}
+	
+					if {[N leshort 47 0 0 {} {} x {}]} {
+						>
+							emit {\b, manufacturer %d}
+						<
+					}
+	
+					if {[N leshort 47 0 0 {} {} == 1]} {
+						>
+							emit {\b (garmin)}
+						<
+					}
+	
+					if {[N leshort 49 0 0 {} {} x {}]} {
+						>
+							emit {\b, product %d}
+						<
+					}
+	
+					if {[N byte 53 0 0 {} {} x {}]} {
+						>
+							emit {\b, type %d}
+						<
+					}
+	
+					switch [Nv byte 53 0 {} {}] {
+						1 {
+							>
+								emit {\b (Device)}
+							<
+						}
+						2 {
+							>
+								emit {\b (Settings)}
+							<
+						}
+						3 {
+							>
+								emit {\b (Sports/Cycling)}
+							<
+						}
+						4 {
+							>
+								emit {\b (Activity)}
+							<
+						}
+						8 {
+							>
+								emit {\b (Elevations)}
+							<
+						}
+						10 {
+							>
+								emit {\b (Totals)}
+							<
+						}
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000MVR4\nI]} {
+		>
+			emit {MapleVr4 library}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000\004\000\000]} {
+		>
+			emit {Maple help database}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <PACKAGE=]} {
+		>
+			emit {Maple help file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <HELP\ NAME=]} {
+		>
+			emit {Maple help file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \n<HELP\ NAME=]} {
+		>
+			emit {Maple help file with extra carriage return at start (yuck)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ daub]} {
+		>
+			emit {Maple help file, old style}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000\000\001\044\000\221]} {
+		>
+			emit {Maple worksheet}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq WriteNow\000\002\000\001\000\000\000\000\100\000\000\000\000\000]} {
+		>
+			emit {Maple worksheet, but weird}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \{VERSION\ ]} {
+		>
+			emit {Maple worksheet}
+			if {[S string 9 0 {} {} > \0]} {
+				>
+					emit {version %.1s.}
+					if {[S string 11 0 {} {} > \0]} {
+						>
+							emit %.1s
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\0\001\$]} {
+		>
+			emit {Maple something}
+			if {[S string 4 0 {} {} eq \000\105]} {
+				>
+					emit {An old revision}
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq \001\122]} {
+				>
+					emit {The latest save}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\n\#\#\ <SHAREFILE=]} {
+		>
+			emit {Maple something}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \n\#\n\#\#\ <SHAREFILE=]} {
+		>
+			emit {Maple something}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\#\ <SHAREFILE=]} {
+		>
+			emit {Maple something}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\r\#\#\ <SHAREFILE=]} {
+		>
+			emit {Maple something}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \r\#\r\#\#\ <SHAREFILE=]} {
+		>
+			emit {Maple something}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ \r\#\#\ <DESCRIBE>]} {
+		>
+			emit {Maple something anomalous.}
+		<
+	}
+	
+	if {[S string 20 0 {} {} eq 45]} {
+		>
+			if {[S search 0 0 {} 2048 eq \x1e]} {
+				>
+					if {[S regex 0 0 l 1 eq (^\[0-9\]\{5\})\[acdnp\]\[^bhlnqsu-z\]]} {
+						>
+							emit {MARC21 Bibliographic}
+							mime application/marc
+						<
+					}
+	
+					if {[S regex 0 0 l 1 eq (^\[0-9\]\{5\})\[acdnosx\]\[z\]]} {
+						>
+							emit {MARC21 Authority}
+							mime application/marc
+						<
+					}
+	
+					if {[S regex 0 0 l 1 eq (^\[0-9\]\{5\})\[cdn\]\[uvxy\]]} {
+						>
+							emit {MARC21 Holdings}
+							mime application/marc
+						<
+					}
+	
+					if {[S regex 0 0 l 1 eq (^\[0-9\]\{5\})\[acdn\]\[w\]]} {
+						>
+							emit {MARC21 Classification}
+							mime application/marc
+						<
+					}
+	
+					if {[S regex 0 0 l 1 eq (^\[0-9\]\{5\})\[cdn\]\[q\]]} {
+						>
+							emit {MARC21 Community}
+							mime application/marc
+						<
+					}
+	
+					if {[S regex 0 0 l 1 eq (^.\{21\})(\[^0\]\{2\})]} {
+						>
+							emit (non-conforming)
+							mime application/marc
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq .MCAD\t]} {
+		>
+			emit {Mathcad document}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \064\024\012\000\035\000\000\000]} {
+		>
+			emit {Mathematica version 2 notebook}
+			ext mb
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \064\024\011\000\035\000\000\000]} {
+		>
+			emit {Mathematica version 2 notebook}
+			ext mb
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq (*^\n\n::\[\011frontEndVersion\ =\ ]} {
+		>
+			emit {Mathematica notebook}
+			ext mb
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq (*^\r\r::\[\011]} {
+		>
+			emit {Mathematica notebook version 2.x}
+			ext mb
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq (*^\r\n\r\n::\[\011]} {
+		>
+			emit {Mathematica notebook version 2.x}
+			ext mb
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq (*^\015]} {
+		>
+			emit {Mathematica notebook version 2.x}
+			ext mb
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq (*^\n\r\n\r::\[\011]} {
+		>
+			emit {Mathematica notebook version 2.x}
+			ext mb
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq (*^\r::\[\011]} {
+		>
+			emit {Mathematica notebook version 2.x}
+			ext mb
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq (*^\r\n::\[\011]} {
+		>
+			emit {Mathematica notebook version 2.x}
+			ext mb
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq (*^\n\n::\[\011]} {
+		>
+			emit {Mathematica notebook version 2.x}
+			ext mb
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq (*^\n::\[\011]} {
+		>
+			emit {Mathematica notebook version 2.x}
+			ext mb
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq (*This\ is\ a\ Mathematica\ binary\ ]} {
+		>
+			emit {Mathematica binary file}
+			if {[S string 88 0 {} {} > \0]} {
+				>
+					emit {from %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MMAPBF\000\001\000\000\000\203\000\001\000]} {
+		>
+			emit {Mathematica PBF (fonts I think)}
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq \ A~]} {
+		>
+			emit {MAthematica .ml file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq (***********************]} {
+		>
+			emit {Mathematica 3.0 notebook}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MATLAB]} {
+		>
+			emit {Matlab v5 mat-file}
+			switch [Nv short 126 0 {} {}] {
+				18765 {
+					>
+						emit {(big endian)}
+						if {[N beshort 124 0 0 {} {} x {}]} {
+							>
+								emit {version 0x%04x}
+							<
+						}
+	
+					<
+				}
+				19785 {
+					>
+						emit {(little endian)}
+						if {[N leshort 124 0 0 {} {} x {}]} {
+							>
+								emit {version 0x%04x}
+							<
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0m\3]} {
+		>
+			emit {mcrypt 2.5 encrypted data,}
+			if {[S string 4 0 {} {} > \0]} {
+				>
+					emit {algorithm: %s,}
+					if {[N leshort [R 1] 0 0 {} {} > 0]} {
+						>
+							emit {keysize: %d bytes,}
+							if {[S string [R 0] 0 {} {} > \0]} {
+								>
+									emit {mode: %s,}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0m\2]} {
+		>
+			emit {mcrypt 2.2 encrypted data,}
+			switch [Nv byte 3 0 {} {}] {
+				0 {
+					>
+						emit {algorithm: blowfish-448,}
+					<
+				}
+				1 {
+					>
+						emit {algorithm: DES,}
+					<
+				}
+				2 {
+					>
+						emit {algorithm: 3DES,}
+					<
+				}
+				3 {
+					>
+						emit {algorithm: 3-WAY,}
+					<
+				}
+				4 {
+					>
+						emit {algorithm: GOST,}
+					<
+				}
+				6 {
+					>
+						emit {algorithm: SAFER-SK64,}
+					<
+				}
+				7 {
+					>
+						emit {algorithm: SAFER-SK128,}
+					<
+				}
+				8 {
+					>
+						emit {algorithm: CAST-128,}
+					<
+				}
+				9 {
+					>
+						emit {algorithm: xTEA,}
+					<
+				}
+				10 {
+					>
+						emit {algorithm: TWOFISH-128,}
+					<
+				}
+				11 {
+					>
+						emit {algorithm: RC2,}
+					<
+				}
+				12 {
+					>
+						emit {algorithm: TWOFISH-192,}
+					<
+				}
+				13 {
+					>
+						emit {algorithm: TWOFISH-256,}
+					<
+				}
+				14 {
+					>
+						emit {algorithm: blowfish-128,}
+					<
+				}
+				15 {
+					>
+						emit {algorithm: blowfish-192,}
+					<
+				}
+				16 {
+					>
+						emit {algorithm: blowfish-256,}
+					<
+				}
+				100 {
+					>
+						emit {algorithm: RC6,}
+					<
+				}
+				101 {
+					>
+						emit {algorithm: IDEA,}
+					<
+				}
+			}
+	
+			switch [Nv byte 4 0 {} {}] {
+				0 {
+					>
+						emit {mode: CBC,}
+					<
+				}
+				1 {
+					>
+						emit {mode: ECB,}
+					<
+				}
+				2 {
+					>
+						emit {mode: CFB,}
+					<
+				}
+				3 {
+					>
+						emit {mode: OFB,}
+					<
+				}
+				4 {
+					>
+						emit {mode: nOFB,}
+					<
+				}
+			}
+	
+			switch [Nv byte 5 0 {} {}] {
+				0 {
+					>
+						emit {keymode: 8bit}
+					<
+				}
+				1 {
+					>
+						emit {keymode: 4bit}
+					<
+				}
+				2 {
+					>
+						emit {keymode: SHA-1 hash}
+					<
+				}
+				3 {
+					>
+						emit {keymode: MD5 hash}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[N ubyte 38408 0 0 {} {} < 19]} {
+		>
+			U 148 diy-thermocam-checker 38400
+	
+		<
+	}
+	
+	if {[N ubyte 9608 0 0 {} {} < 19]} {
+		>
+			U 148 diy-thermocam-checker 9600
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HG10]} {
+		>
+			emit {Mercurial changeset bundle}
+			if {[S string 4 0 {} {} eq UN]} {
+				>
+					emit (uncompressed)
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq GZ]} {
+				>
+					emit {(gzip compressed)}
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq BZ]} {
+				>
+					emit {(bzip2 compressed)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MeTaSt00r3]} {
+		>
+			emit {Metastore data file,}
+			if {[N bequad 10 0 0 {} {} x {}]} {
+				>
+					emit {version %0llx}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq RINEX]} {
+		>
+			if {[S search 80 0 {} 256 eq XXRINEXB]} {
+				>
+					emit {RINEX Data, GEO SBAS Broadcast}
+					if {[S string [R 32] 0 {} {} x {}]} {
+						>
+							emit {\b, date %15.15s}
+						<
+					}
+	
+					if {[S string 5 0 {} {} x {}]} {
+						>
+							emit {\b, version %6.6s}
+							mime rinex/broadcast
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 80 0 {} 256 eq XXRINEXD]} {
+				>
+					emit {RINEX Data, Observation (Hatanaka comp)}
+					if {[S string [R 32] 0 {} {} x {}]} {
+						>
+							emit {\b, date %15.15s}
+						<
+					}
+	
+					if {[S string 5 0 {} {} x {}]} {
+						>
+							emit {\b, version %6.6s}
+							mime rinex/observation
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 80 0 {} 256 eq XXRINEXC]} {
+				>
+					emit {RINEX Data, Clock}
+					if {[S string [R 32] 0 {} {} x {}]} {
+						>
+							emit {\b, date %15.15s}
+						<
+					}
+	
+					if {[S string 5 0 {} {} x {}]} {
+						>
+							emit {\b, version %6.6s}
+							mime rinex/clock
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 80 0 {} 256 eq XXRINEXH]} {
+				>
+					emit {RINEX Data, GEO SBAS Navigation}
+					if {[S string [R 32] 0 {} {} x {}]} {
+						>
+							emit {\b, date %15.15s}
+						<
+					}
+	
+					if {[S string 5 0 {} {} x {}]} {
+						>
+							emit {\b, version %6.6s}
+							mime rinex/navigation
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 80 0 {} 256 eq XXRINEXG]} {
+				>
+					emit {RINEX Data, GLONASS Navigation}
+					if {[S string [R 32] 0 {} {} x {}]} {
+						>
+							emit {\b, date %15.15s}
+						<
+					}
+	
+					if {[S string 5 0 {} {} x {}]} {
+						>
+							emit {\b, version %6.6s}
+							mime rinex/navigation
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 80 0 {} 256 eq XXRINEXL]} {
+				>
+					emit {RINEX Data, Galileo Navigation}
+					if {[S string [R 32] 0 {} {} x {}]} {
+						>
+							emit {\b, date %15.15s}
+						<
+					}
+	
+					if {[S string 5 0 {} {} x {}]} {
+						>
+							emit {\b, version %6.6s}
+							mime rinex/navigation
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 80 0 {} 256 eq XXRINEXM]} {
+				>
+					emit {RINEX Data, Meteorological}
+					if {[S string [R 32] 0 {} {} x {}]} {
+						>
+							emit {\b, date %15.15s}
+						<
+					}
+	
+					if {[S string 5 0 {} {} x {}]} {
+						>
+							emit {\b, version %6.6s}
+							mime rinex/meteorological
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 80 0 {} 256 eq XXRINEXN]} {
+				>
+					emit {RINEX Data, Navigation}
+					if {[S string [R 32] 0 {} {} x {}]} {
+						>
+							emit {\b, date %15.15s}
+						<
+					}
+	
+					if {[S string 5 0 {} {} x {}]} {
+						>
+							emit {\b, version %6.6s}
+							mime rinex/navigation
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 80 0 {} 256 eq XXRINEXO]} {
+				>
+					emit {RINEX Data, Observation}
+					if {[S string [R 32] 0 {} {} x {}]} {
+						>
+							emit {\b, date %15.15s}
+						<
+					}
+	
+					if {[S string 5 0 {} {} x {}]} {
+						>
+							emit {\b, version %6.6s}
+							mime rinex/observation
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GRIB]} {
+		>
+			switch [Nv byte 7 0 {} {}] {
+				1 {
+					>
+						emit {Gridded binary (GRIB) version 1}
+					<
+				}
+				2 {
+					>
+						emit {Gridded binary (GRIB) version 2}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x30\x00\x00\x7C]} {
+		>
+			if {[S string 36 0 {} {} eq \x00\x3E]} {
+				>
+					emit {Micro Focus File with Header (DAT)}
+					mime application/octet-stream
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x30\x7E\x00\x00]} {
+		>
+			if {[S string 36 0 {} {} eq \x00\x3E]} {
+				>
+					emit {Micro Focus File with Header (DAT)}
+					mime application/octet-stream
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 39 0 {} {} eq \x02]} {
+		>
+			if {[S string 136 0 {} {} eq \x02\x02\x04\x04]} {
+				>
+					emit {Micro Focus Index File (IDX)}
+					mime application/octet-stream
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq Content-Type:\040]} {
+		>
+			if {[S string 14 0 {} {} > \0]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq Content-Type:]} {
+		>
+			if {[S string 13 0 {} {} > \0]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq %%!!]} {
+		>
+			emit {X-Post-It-Note text}
+		<
+	}
+	
+	if {[S string 0 0 c {} eq BEGIN:VCALENDAR]} {
+		>
+			emit {vCalendar calendar file}
+			mime text/calendar
+		<
+	}
+	
+	if {[S string 0 0 c {} eq BEGIN:VCARD]} {
+		>
+			emit {vCard visiting card}
+			if {[S search 12 0 c 14000 eq VERSION:]} {
+				>
+					if {[S string [R 0] 0 {} {} x {}]} {
+						>
+							emit {\b, version %-.3s}
+						<
+					}
+	
+				<
+			}
+	
+			mime text/vcard
+		<
+	}
+	
+	if {[S search 0 0 {} 80 eq .la\ -\ a\ libtool\ library\ file]} {
+		>
+			emit {libtool library file}
+		<
+	}
+	
+	if {[S search 0 0 {} 80 eq .lo\ -\ a\ libtool\ object\ file]} {
+		>
+			emit {libtool object file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MDMP]} {
+		>
+			emit {Mini DuMP crash report}
+			if {[N ulelong 4 0 0 & 65535 != 42899]} {
+				>
+					emit {\b, version 0x%4.4x}
+				<
+			}
+	
+			if {[N ulelong 8 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d streams}
+				<
+			}
+	
+			if {[N ulelong 12 0 0 {} {} != 32]} {
+				>
+					emit {\b, 0x%8.8x RVA}
+				<
+			}
+	
+			if {[N ulelong 16 0 0 {} {} != 0]} {
+				>
+					emit {\b, CheckSum 0x%8.8x}
+				<
+			}
+	
+			if {[N ledate 20 0 0 {} {} x {}]} {
+				>
+					emit {\b, %s}
+				<
+			}
+	
+			if {[N ulelong 24 0 0 {} {} x {}]} {
+				>
+					emit {\b, 0x%x type}
+				<
+			}
+	
+			mime application/x-dmp
+			ext dmp/mdmp
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\x20abook\x20addressbook\x20file]} {
+		>
+			emit {abook address book}
+			mime application/x-abook-addressbook
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \311\304]} {
+		>
+			emit {ID tags data}
+			if {[N short 2 0 0 {} {} > 0]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \001\001\001\001]} {
+		>
+			emit {MMDF mailbox}
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq PC\ Research,\ Inc]} {
+		>
+			emit Digifax-G3-File
+			switch [Nv byte 29 0 {} {}] {
+				0 {
+					>
+						emit {\b, normal resolution}
+					<
+				}
+				1 {
+					>
+						emit {\b, fine resolution}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RMD1]} {
+		>
+			emit {raw modem data}
+			if {[S string 4 0 {} {} > \0]} {
+				>
+					emit {(%s /}
+				<
+			}
+	
+			if {[N short 20 0 0 {} {} > 0]} {
+				>
+					emit {compression type 0x%04x)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PVF1\n]} {
+		>
+			emit {portable voice format}
+			if {[S string 5 0 {} {} > \0]} {
+				>
+					emit {(binary %s)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PVF2\n]} {
+		>
+			emit {portable voice format}
+			if {[S string 5 0 {} {} > \0]} {
+				>
+					emit {(ascii %s)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq S0]} {
+		>
+			emit {Motorola S-Record; binary data in text format}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XPCOM\nMozFASL\r\n\x1A]} {
+		>
+			emit {Mozilla XUL fastload data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq mozLz4a]} {
+		>
+			emit {Mozilla lz4 compressed bookmark data}
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq PK\001\002]} {
+		>
+			emit {Mozilla archive omni.ja}
+			mime application/x-zip
+			ext ja
+		<
+	}
+	
+	if {[S string 0 0 t {} eq @]} {
+		>
+			if {[S string 1 0 {c W} {} eq \ echo\ off]} {
+				>
+					emit {DOS batch file text}
+					mime text/x-msdos-batch
+				<
+			}
+	
+			if {[S string 1 0 {c W} {} eq echo\ off]} {
+				>
+					emit {DOS batch file text}
+					mime text/x-msdos-batch
+				<
+			}
+	
+			if {[S string 1 0 {c W} {} eq rem]} {
+				>
+					emit {DOS batch file text}
+					mime text/x-msdos-batch
+				<
+			}
+	
+			if {[S string 1 0 {c W} {} eq set\ ]} {
+				>
+					emit {DOS batch file text}
+					mime text/x-msdos-batch
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 100 0 {} 65535 eq rxfuncadd]} {
+		>
+			if {[S regex 100 0 c {} eq ^\[\ \t\]\{0,10\}call\[\ \t\]\{1,10\}rxfunc]} {
+				>
+					emit {OS/2 REXX batch file text}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 100 0 {} 65535 eq say]} {
+		>
+			if {[S regex 100 0 c {} eq ^\[\ \t\]\{0,10\}say\ \['\"\]]} {
+				>
+					emit {OS/2 REXX batch file text}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq MZ]} {
+		>
+			if {[N leshort 24 0 0 {} {} < 64]} {
+				>
+					emit {MS-DOS executable}
+					mime application/x-dosexec
+				<
+			}
+	
+			if {[N leshort 24 0 0 {} {} > 63]} {
+				>
+					if {[S string [I 60 ulelong 0 + 0 0] 0 {} {} eq PE\0\0]} {
+						>
+							emit PE
+							switch [Nv leshort [I 60 ulelong 0 + 0 24] 0 {} {}] {
+								263 {
+									>
+										emit {ROM image}
+									<
+								}
+								267 {
+									>
+										emit {\b32 executable}
+									<
+									>
+										if {[N lelong [I 60 ulelong 0 + 0 232] 0 0 {} {} > 0]} {
+											>
+												emit {Mono/.Net assembly}
+											<
+										}
+	
+									<
+								}
+								523 {
+									>
+										emit {\b32+ executable}
+									<
+									>
+										if {[N lelong [I 60 ulelong 0 + 0 248] 0 0 {} {} > 0]} {
+											>
+												emit {Mono/.Net assembly}
+											<
+										}
+	
+									<
+								}
+							}
+	
+							if {[D [I 60 ulelong 0 + 0 24]]} {
+								>
+									emit {Unknown PE signature}
+									if {[N leshort [R 0] 0 0 {} {} x {}]} {
+										>
+											emit 0x%x
+										<
+									}
+	
+								<
+							}
+	
+							if {[N leshort [I 60 ulelong 0 + 0 22] 0 0 & 8192 > 0]} {
+								>
+									emit (DLL)
+								<
+							}
+	
+							switch [Nv leshort [I 60 ulelong 0 + 0 92] 0 {} {}] {
+								1 {
+									>
+										emit (native)
+									<
+								}
+								2 {
+									>
+										emit (GUI)
+									<
+								}
+								3 {
+									>
+										emit (console)
+									<
+								}
+								7 {
+									>
+										emit (POSIX)
+									<
+								}
+								9 {
+									>
+										emit {(Windows CE)}
+									<
+								}
+								10 {
+									>
+										emit {(EFI application)}
+									<
+								}
+								11 {
+									>
+										emit {(EFI boot service driver)}
+									<
+								}
+								12 {
+									>
+										emit {(EFI runtime driver)}
+									<
+								}
+								13 {
+									>
+										emit {(EFI ROM)}
+									<
+								}
+								14 {
+									>
+										emit (XBOX)
+									<
+								}
+								15 {
+									>
+										emit {(Windows boot application)}
+									<
+								}
+							}
+	
+							if {[D [I 60 ulelong 0 + 0 92]]} {
+								>
+									emit {(Unknown subsystem}
+									if {[N leshort [R 0] 0 0 {} {} x {}]} {
+										>
+											emit 0x%x)
+										<
+									}
+	
+								<
+							}
+	
+							switch [Nv leshort [I 60 ulelong 0 + 0 4] 0 {} {}] {
+								-31132 {
+									>
+										emit x86-64
+									<
+								}
+								-16146 {
+									>
+										emit MSIL
+									<
+								}
+								332 {
+									>
+										emit {Intel 80386}
+									<
+								}
+								358 {
+									>
+										emit {MIPS R4000}
+									<
+								}
+								360 {
+									>
+										emit {MIPS R10000}
+									<
+								}
+								388 {
+									>
+										emit Alpha
+									<
+								}
+								418 {
+									>
+										emit {Hitachi SH3}
+									<
+								}
+								422 {
+									>
+										emit {Hitachi SH4}
+									<
+								}
+								448 {
+									>
+										emit ARM
+									<
+								}
+								450 {
+									>
+										emit {ARM Thumb}
+									<
+								}
+								452 {
+									>
+										emit {ARMv7 Thumb}
+									<
+								}
+								496 {
+									>
+										emit PowerPC
+									<
+								}
+								512 {
+									>
+										emit {Intel Itanium}
+									<
+								}
+								614 {
+									>
+										emit MIPS16
+									<
+								}
+								616 {
+									>
+										emit {Motorola 68000}
+									<
+								}
+								656 {
+									>
+										emit PA-RISC
+									<
+								}
+								870 {
+									>
+										emit MIPSIV
+									<
+								}
+								1126 {
+									>
+										emit {MIPS16 with FPU}
+									<
+								}
+								3772 {
+									>
+										emit {EFI byte code}
+									<
+								}
+							}
+	
+							if {[D [I 60 ulelong 0 + 0 4]]} {
+								>
+									emit {Unknown processor type}
+									if {[N leshort [R 0] 0 0 {} {} x {}]} {
+										>
+											emit 0x%x
+										<
+									}
+	
+								<
+							}
+	
+							if {[N leshort [I 60 ulelong 0 + 0 22] 0 0 & 512 > 0]} {
+								>
+									emit {(stripped to external PDB)}
+								<
+							}
+	
+							if {[N leshort [I 60 ulelong 0 + 0 22] 0 0 & 4096 > 0]} {
+								>
+									emit {system file}
+								<
+							}
+	
+							if {[S string [I 8 uleshort 0 * 0 16] 0 {} {} eq 32STUB]} {
+								>
+									emit {\b, 32rtm DOS extender}
+								<
+							}
+	
+							if {[S string [I 8 uleshort 0 * 0 16] 0 {} {} ne 32STUB]} {
+								>
+									emit {\b, for MS Windows}
+								<
+							}
+	
+							if {[S string [I 60 ulelong 0 + 0 248] 0 {} {} eq UPX0]} {
+								>
+									emit {\b, UPX compressed}
+								<
+							}
+	
+							if {[S search [I 60 ulelong 0 + 0 248] 0 {} 320 eq PEC2]} {
+								>
+									emit {\b, PECompact2 compressed}
+								<
+							}
+	
+							if {[S search [I 60 ulelong 0 + 0 248] 0 {} 320 eq UPX2]} {
+								>
+									if {[S string [I [R 16] ulelong 0 + 1 -4] 0 {} {} eq PK\3\4]} {
+										>
+											emit {\b, ZIP self-extracting archive (Info-Zip)}
+										<
+									}
+	
+								<
+							}
+	
+							if {[S search [I 60 ulelong 0 + 0 248] 0 {} 320 eq .idata]} {
+								>
+									if {[S string [I [R 14] ulelong 0 + 1 -4] 0 {} {} eq PK\3\4]} {
+										>
+											emit {\b, ZIP self-extracting archive (Info-Zip)}
+										<
+									}
+	
+									if {[S string [I [R 14] ulelong 0 + 1 -4] 0 {} {} eq ZZ0]} {
+										>
+											emit {\b, ZZip self-extracting archive}
+										<
+									}
+	
+									if {[S string [I [R 14] ulelong 0 + 1 -4] 0 {} {} eq ZZ1]} {
+										>
+											emit {\b, ZZip self-extracting archive}
+										<
+									}
+	
+								<
+							}
+	
+							if {[S search [I 60 ulelong 0 + 0 248] 0 {} 320 eq .rsrc]} {
+								>
+									if {[S string [I [R 15] ulelong 0 + 1 -4] 0 {} {} eq a\\\4\5]} {
+										>
+											emit {\b, WinHKI self-extracting archive}
+										<
+									}
+	
+									if {[S string [I [R 15] ulelong 0 + 1 -4] 0 {} {} eq Rar!]} {
+										>
+											emit {\b, RAR self-extracting archive}
+										<
+									}
+	
+									if {[S search [I [R 15] ulelong 0 + 1 -4] 0 {} 12288 eq MSCF]} {
+										>
+											emit {\b, InstallShield self-extracting archive}
+										<
+									}
+	
+									if {[S search [I [R 15] ulelong 0 + 1 -4] 0 {} 32 eq Nullsoft]} {
+										>
+											emit {\b, Nullsoft Installer self-extracting archive}
+										<
+									}
+	
+								<
+							}
+	
+							if {[S search [I 60 ulelong 0 + 0 248] 0 {} 320 eq .data]} {
+								>
+									if {[S string [I [R 15] ulelong 0 + 0 0] 0 {} {} eq WEXTRACT]} {
+										>
+											emit {\b, MS CAB-Installer self-extracting archive}
+										<
+									}
+	
+								<
+							}
+	
+							if {[S search [I 60 ulelong 0 + 0 248] 0 {} 320 eq .petite\0]} {
+								>
+									emit {\b, Petite compressed}
+									if {[N byte [I 60 ulelong 0 + 0 247] 0 0 {} {} x {}]} {
+										>
+											if {[S string [I [R 260] ulelong 0 + 1 -4] 0 {} {} eq !sfx!]} {
+												>
+													emit {\b, ACE self-extracting archive}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+							if {[S search [I 60 ulelong 0 + 0 248] 0 {} 320 eq .WISE]} {
+								>
+									emit {\b, WISE installer self-extracting archive}
+								<
+							}
+	
+							if {[S search [I 60 ulelong 0 + 0 248] 0 {} 320 eq .dz\0\0\0]} {
+								>
+									emit {\b, Dzip self-extracting archive}
+								<
+							}
+	
+							if {[S search [R [I 60 ulelong 0 + 0 248]] 0 {} 256 eq _winzip_]} {
+								>
+									emit {\b, ZIP self-extracting archive (WinZip)}
+								<
+							}
+	
+							if {[S search [R [I 60 ulelong 0 + 0 248]] 0 {} 256 eq SharedD]} {
+								>
+									emit {\b, Microsoft Installer self-extracting archive}
+								<
+							}
+	
+							if {[S string 48 0 {} {} eq Inno]} {
+								>
+									emit {\b, InnoSetup self-extracting archive}
+								<
+							}
+	
+							mime application/x-dosexec
+						<
+					}
+	
+					if {[S string [I 60 ulelong 0 + 0 0] 0 {} {} ne PE\0\0]} {
+						>
+							emit {MS-DOS executable}
+							mime application/x-dosexec
+						<
+					}
+	
+					if {[S string [I 60 ulelong 0 + 0 0] 0 {} {} eq NE]} {
+						>
+							emit {\b, NE}
+							switch [Nv byte [I 60 ulelong 0 + 0 54] 0 {} {}] {
+								-127 {
+									>
+										emit {for MS-DOS, Phar Lap DOS extender}
+									<
+								}
+								1 {
+									>
+										emit {for OS/2 1.x}
+									<
+								}
+								2 {
+									>
+										emit {for MS Windows 3.x}
+									<
+								}
+								3 {
+									>
+										emit {for MS-DOS}
+									<
+								}
+								4 {
+									>
+										emit {for Windows 386}
+									<
+								}
+								5 {
+									>
+										emit {for Borland Operating System Services}
+									<
+								}
+							}
+	
+							if {[D [I 60 ulelong 0 + 0 54]]} {
+								>
+									if {[N byte [I 60 ulelong 0 + 0 54] 0 0 {} {} x {}]} {
+										>
+											emit {(unknown OS %x)}
+										<
+									}
+	
+								<
+							}
+	
+							switch [Nv leshort [I 60 ulelong 0 + 0 12] 0 & -32765] {
+								-32767 {
+									>
+										emit (driver)
+									<
+								}
+								-32766 {
+									>
+										emit (DLL)
+									<
+								}
+							}
+	
+							if {[S string [R [I [R 36] uleshort 0 - 0 1]] 0 {} {} eq ARJSFX]} {
+								>
+									emit {\b, ARJ self-extracting archive}
+								<
+							}
+	
+							if {[S search [I 60 ulelong 0 + 0 112] 0 {} 128 eq WinZip(R)\ Self-Extractor]} {
+								>
+									emit {\b, ZIP self-extracting archive (WinZip)}
+								<
+							}
+	
+							mime application/x-dosexec
+						<
+					}
+	
+					if {[S string [I 60 ulelong 0 + 0 0] 0 {} {} eq LX\0\0]} {
+						>
+							emit {\b, LX}
+							if {[N leshort [I 60 ulelong 0 + 0 10] 0 0 {} {} < 1]} {
+								>
+									emit {(unknown OS)}
+								<
+							}
+	
+							switch [Nv leshort [I 60 ulelong 0 + 0 10] 0 {} {}] {
+								1 {
+									>
+										emit {for OS/2}
+									<
+								}
+								2 {
+									>
+										emit {for MS Windows}
+									<
+								}
+								3 {
+									>
+										emit {for DOS}
+									<
+								}
+							}
+	
+							if {[N leshort [I 60 ulelong 0 + 0 10] 0 0 {} {} > 3]} {
+								>
+									emit {(unknown OS)}
+								<
+							}
+	
+							if {[N lelong [I 60 ulelong 0 + 0 16] 0 0 & 163840 == 32768]} {
+								>
+									emit (DLL)
+								<
+							}
+	
+							if {[N lelong [I 60 ulelong 0 + 0 16] 0 0 & 131072 > 0]} {
+								>
+									emit {(device driver)}
+								<
+							}
+	
+							if {[N lelong [I 60 ulelong 0 + 0 16] 0 0 & 768 == 768]} {
+								>
+									emit (GUI)
+								<
+							}
+	
+							if {[N lelong [I 60 ulelong 0 + 0 16] 0 0 & 164608 < 768]} {
+								>
+									emit (console)
+								<
+							}
+	
+							switch [Nv leshort [I 60 ulelong 0 + 0 8] 0 {} {}] {
+								1 {
+									>
+										emit i80286
+									<
+								}
+								2 {
+									>
+										emit i80386
+									<
+								}
+								3 {
+									>
+										emit i80486
+									<
+								}
+							}
+	
+							if {[S string [I 8 uleshort 0 * 0 16] 0 {} {} eq emx]} {
+								>
+									emit {\b, emx}
+									if {[S string [R 1] 0 {} {} x {}]} {
+										>
+											emit %s
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string [R [I [R 84] ulelong 0 - 0 3]] 0 {} {} eq arjsfx]} {
+								>
+									emit {\b, ARJ self-extracting archive}
+								<
+							}
+	
+							mime application/x-dosexec
+						<
+					}
+	
+					if {[S string [I 60 ulelong 0 + 0 0] 0 {} {} eq W3]} {
+						>
+							emit {\b, W3 for MS Windows}
+							mime application/x-dosexec
+						<
+					}
+	
+					if {[S string [I 60 ulelong 0 + 0 0] 0 {} {} eq LE\0\0]} {
+						>
+							emit {\b, LE executable}
+							switch [Nv leshort [I 60 ulelong 0 + 0 10] 0 {} {}] {
+								1 {
+									>
+										if {[S search 576 0 {} 256 eq DOS/4G]} {
+											>
+												emit {for MS-DOS, DOS4GW DOS extender}
+											<
+										}
+	
+										if {[S search 576 0 {} 512 eq WATCOM\ C/C++]} {
+											>
+												emit {for MS-DOS, DOS4GW DOS extender}
+											<
+										}
+	
+										if {[S search 1088 0 {} 256 eq CauseWay\ DOS\ Extender]} {
+											>
+												emit {for MS-DOS, CauseWay DOS extender}
+											<
+										}
+	
+										if {[S search 64 0 {} 64 eq PMODE/W]} {
+											>
+												emit {for MS-DOS, PMODE/W DOS extender}
+											<
+										}
+	
+										if {[S search 64 0 {} 64 eq STUB/32A]} {
+											>
+												emit {for MS-DOS, DOS/32A DOS extender (stub)}
+											<
+										}
+	
+										if {[S search 64 0 {} 128 eq STUB/32C]} {
+											>
+												emit {for MS-DOS, DOS/32A DOS extender (configurable stub)}
+											<
+										}
+	
+										if {[S search 64 0 {} 128 eq DOS/32A]} {
+											>
+												emit {for MS-DOS, DOS/32A DOS extender (embedded)}
+											<
+										}
+	
+										if {[N lelong [R 36] 0 0 {} {} < 80]} {
+											>
+												if {[S string [I [R 76] ulelong 0 + 0 0] 0 {} {} eq \xfc\xb8WATCOM]} {
+													>
+														if {[S search [R 0] 0 {} 8 eq 3\xdbf\xb9]} {
+															>
+																emit {\b, 32Lite compressed}
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+								2 {
+									>
+										emit {for MS Windows}
+									<
+								}
+								3 {
+									>
+										emit {for DOS}
+									<
+								}
+								4 {
+									>
+										emit {for MS Windows (VxD)}
+									<
+								}
+							}
+	
+							if {[S string [I [R 124] ulelong 0 + 0 38] 0 {} {} eq UPX]} {
+								>
+									emit {\b, UPX compressed}
+								<
+							}
+	
+							if {[S string [R [I [R 84] ulelong 0 - 0 3]] 0 {} {} eq UNACE]} {
+								>
+									emit {\b, ACE self-extracting archive}
+								<
+							}
+	
+							mime application/x-dosexec
+						<
+					}
+	
+					if {[N lelong 60 0 0 {} {} > 536870912]} {
+						>
+							if {[N leshort [I 4 uleshort 0 * 0 512] 0 0 {} {} != 332]} {
+								>
+									emit {\b, MZ for MS-DOS}
+									mime application/x-dosexec
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N long 2 0 0 {} {} != 0]} {
+				>
+					if {[N leshort 24 0 0 {} {} < 64]} {
+						>
+							if {[N leshort [I 4 uleshort 0 * 0 512] 0 0 {} {} != 332]} {
+								>
+									if {[S string [R [I 2 uleshort 0 - 0 514]] 0 {} {} ne LE]} {
+										>
+											if {[S string [R -2] 0 {} {} ne BW]} {
+												>
+													emit {\b, MZ for MS-DOS}
+													mime application/x-dosexec
+												<
+											}
+	
+										<
+									}
+	
+									if {[S string [R [I 2 uleshort 0 - 0 514]] 0 {} {} eq LE]} {
+										>
+											emit {\b, LE}
+											if {[S search 576 0 {} 256 eq DOS/4G]} {
+												>
+													emit {for MS-DOS, DOS4GW DOS extender}
+												<
+											}
+	
+										<
+									}
+	
+									if {[S string [R [I 2 uleshort 0 - 0 514]] 0 {} {} eq BW]} {
+										>
+											if {[S search 576 0 {} 256 eq DOS/4G]} {
+												>
+													emit {\b, LE for MS-DOS, DOS4GW DOS extender (embedded)}
+												<
+											}
+	
+											if {[S search 576 0 {} 256 ne DOS/4G]} {
+												>
+													emit {\b, BW collection for MS-DOS}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N leshort [I 4 uleshort 0 * 0 512] 0 0 {} {} == 332]} {
+				>
+					emit {\b, COFF}
+					if {[S string [I 8 uleshort 0 * 0 16] 0 {} {} eq go32stub]} {
+						>
+							emit {for MS-DOS, DJGPP go32 DOS extender}
+						<
+					}
+	
+					if {[S string [I 8 uleshort 0 * 0 16] 0 {} {} eq emx]} {
+						>
+							if {[S string [R 1] 0 {} {} x {}]} {
+								>
+									emit {for DOS, Win or OS/2, emx %s}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N byte [R [I [R 66] ulelong 0 - 0 3]] 0 0 {} {} x {}]} {
+						>
+							if {[S string [R 38] 0 {} {} eq UPX]} {
+								>
+									emit {\b, UPX compressed}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S search [R 44] 0 {} 160 eq .text]} {
+						>
+							if {[N lelong [R 11] 0 0 {} {} < 8192]} {
+								>
+									if {[N lelong [R 0] 0 0 {} {} > 24576]} {
+										>
+											emit {\b, 32lite compressed}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					mime application/x-dosexec
+				<
+			}
+	
+			if {[S string [I 8 uleshort 0 * 0 16] 0 {} {} eq \$WdX]} {
+				>
+					emit {\b, WDos/X DOS extender}
+				<
+			}
+	
+			if {[S string 53 0 {} {} eq \x8e\xc0\xb9\x08\x00\xf3\xa5\x4a\x75\xeb\x8e\xc3\x8e\xd8\x33\xff\xbe\x30\x00\x05]} {
+				>
+					emit {\b, aPack compressed}
+				<
+			}
+	
+			if {[S string 231 0 {} {} eq LH/2\ ]} {
+				>
+					emit {Self-Extract \b, %s}
+				<
+			}
+	
+			if {[S string 28 0 {} {} eq UC2X]} {
+				>
+					emit {\b, UCEXE compressed}
+				<
+			}
+	
+			if {[S string 28 0 {} {} eq WWP\ ]} {
+				>
+					emit {\b, WWPACK compressed}
+				<
+			}
+	
+			if {[S string 28 0 {} {} eq RJSX]} {
+				>
+					emit {\b, ARJ self-extracting archive}
+				<
+			}
+	
+			if {[S string 28 0 {} {} eq diet]} {
+				>
+					emit {\b, diet compressed}
+				<
+			}
+	
+			if {[S string 28 0 {} {} eq LZ09]} {
+				>
+					emit {\b, LZEXE v0.90 compressed}
+				<
+			}
+	
+			if {[S string 28 0 {} {} eq LZ91]} {
+				>
+					emit {\b, LZEXE v0.91 compressed}
+				<
+			}
+	
+			if {[S string 28 0 {} {} eq tz]} {
+				>
+					emit {\b, TinyProg compressed}
+				<
+			}
+	
+			if {[S string 30 0 {} {} eq Copyright\ 1989-1990\ PKWARE\ Inc.]} {
+				>
+					emit {Self-extracting PKZIP archive}
+					mime application/zip
+				<
+			}
+	
+			if {[S string 30 0 {} {} eq PKLITE\ Copr.]} {
+				>
+					emit {Self-extracting PKZIP archive}
+					mime application/zip
+				<
+			}
+	
+			if {[S search 32 0 {} 224 eq aRJsfX]} {
+				>
+					emit {\b, ARJ self-extracting archive}
+				<
+			}
+	
+			if {[S string 32 0 {} {} eq AIN]} {
+				>
+					if {[S string 35 0 {} {} eq 2]} {
+						>
+							emit {\b, AIN 2.x compressed}
+						<
+					}
+	
+					if {[S string 35 0 {} {} < 2]} {
+						>
+							emit {\b, AIN 1.x compressed}
+						<
+					}
+	
+					if {[S string 35 0 {} {} > 2]} {
+						>
+							emit {\b, AIN 1.x compressed}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 36 0 {} {} eq LHa's\ SFX]} {
+				>
+					emit {\b, LHa self-extracting archive}
+					mime application/x-lha
+				<
+			}
+	
+			if {[S string 36 0 {} {} eq LHA's\ SFX]} {
+				>
+					emit {\b, LHa self-extracting archive}
+					mime application/x-lha
+				<
+			}
+	
+			if {[S string 36 0 {} {} eq \ \$ARX]} {
+				>
+					emit {\b, ARX self-extracting archive}
+				<
+			}
+	
+			if {[S string 36 0 {} {} eq \ \$LHarc]} {
+				>
+					emit {\b, LHarc self-extracting archive}
+				<
+			}
+	
+			if {[S string 32 0 {} {} eq SFX\ by\ LARC]} {
+				>
+					emit {\b, LARC self-extracting archive}
+				<
+			}
+	
+			if {[S string 64 0 {} {} eq aPKG]} {
+				>
+					emit {\b, aPackage self-extracting archive}
+				<
+			}
+	
+			if {[S string 100 0 {} {} eq W\ Collis\0\0]} {
+				>
+					emit {\b, Compack compressed}
+				<
+			}
+	
+			if {[S string 122 0 {} {} eq Windows\ self-extracting\ ZIP]} {
+				>
+					emit {\b, ZIP self-extracting archive}
+					if {[S search [R 244] 0 {} 320 eq \x0\x40\x1\x0]} {
+						>
+							if {[S string [I [R 0] ulelong 0 + 1 4] 0 {} {} eq MSCF]} {
+								>
+									emit {\b, WinHKI CAB self-extracting archive}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 1638 0 {} {} eq -lh5-]} {
+				>
+					emit {\b, LHa self-extracting archive v2.13S}
+				<
+			}
+	
+			if {[S string 96392 0 {} {} eq Rar!]} {
+				>
+					emit {\b, RAR self-extracting archive}
+				<
+			}
+	
+			if {[N long [I 4 uleshort 0 * 0 512] 0 0 {} {} x {}]} {
+				>
+					if {[N byte [R [I 2 uleshort 0 - 0 517]] 0 0 {} {} x {}]} {
+						>
+							if {[S string [R 0] 0 {} {} eq PK\3\4]} {
+								>
+									emit {\b, ZIP self-extracting archive}
+								<
+							}
+	
+							if {[S string [R 0] 0 {} {} eq Rar!]} {
+								>
+									emit {\b, RAR self-extracting archive}
+								<
+							}
+	
+							if {[S string [R 0] 0 {} {} eq !\x11]} {
+								>
+									emit {\b, AIN 2.x self-extracting archive}
+								<
+							}
+	
+							if {[S string [R 0] 0 {} {} eq !\x12]} {
+								>
+									emit {\b, AIN 2.x self-extracting archive}
+								<
+							}
+	
+							if {[S string [R 0] 0 {} {} eq !\x17]} {
+								>
+									emit {\b, AIN 1.x self-extracting archive}
+								<
+							}
+	
+							if {[S string [R 0] 0 {} {} eq !\x18]} {
+								>
+									emit {\b, AIN 1.x self-extracting archive}
+								<
+							}
+	
+							if {[S search [R 7] 0 {} 400 eq **ACE**]} {
+								>
+									emit {\b, ACE self-extracting archive}
+								<
+							}
+	
+							if {[S search [R 0] 0 {} 1152 eq UC2SFX\ Header]} {
+								>
+									emit {\b, UC2 self-extracting archive}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search [I 8 uleshort 0 * 0 16] 0 {} 32 eq PKSFX]} {
+				>
+					emit {\b, ZIP self-extracting archive (PKZIP)}
+				<
+			}
+	
+			if {[S string 49801 0 {} {} eq \x79\xff\x80\xff\x76\xff]} {
+				>
+					emit {\b, CODEC archive v3.21}
+					if {[N leshort 49824 0 0 {} {} == 1]} {
+						>
+							emit {\b, 1 file}
+						<
+					}
+	
+					if {[N leshort 49824 0 0 {} {} > 1]} {
+						>
+							emit {\b, %u files}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq KCF]} {
+		>
+			emit {FreeDOS KEYBoard Layout collection}
+			if {[N uleshort 3 0 0 {} {} x {}]} {
+				>
+					emit {\b, version 0x%x}
+				<
+			}
+	
+			if {[N ubyte 6 0 0 {} {} > 0]} {
+				>
+					if {[S string 7 0 {} {} > \0]} {
+						>
+							emit {\b, author=%-.14s}
+						<
+					}
+	
+					if {[S search 7 0 {} 254 eq \xff]} {
+						>
+							emit {\b, info=}
+							if {[S string [R 0] 0 {} {} x {}]} {
+								>
+									emit {\b%-.15s}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq KLF]} {
+		>
+			emit {FreeDOS KEYBoard Layout file}
+			if {[N uleshort 3 0 0 {} {} x {}]} {
+				>
+					emit {\b, version 0x%x}
+				<
+			}
+	
+			if {[N ubyte 5 0 0 {} {} > 0]} {
+				>
+					if {[S string 8 0 {} {} x {}]} {
+						>
+							emit {\b, name=%-.2s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xffKEYB\ \ \ \0\0\0\0]} {
+		>
+			if {[S string 12 0 {} {} eq \0\0\0\0`\004\360]} {
+				>
+					emit {MS-DOS KEYBoard Layout file}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ulequad 0 0 0 & 8388071129087 == 4294967295]} {
+		>
+			U 163 msdos-driver 0
+	
+		<
+	}
+	
+	switch [Nv ubyte 0 0 {} {}] {
+		140 {
+			>
+				if {[S string 4 0 {} {} ne O====]} {
+					>
+						if {[S string 5 0 {} {} ne MAIN]} {
+							>
+								if {[N ubyte 4 0 0 {} {} > 13]} {
+									>
+										emit {DOS executable (COM, 0x8C-variant)}
+										mime application/x-dosexec
+										ext com
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		184 {
+			>
+				if {[S string 0 0 {} {} ne \xb8\xc0\x07\x8e]} {
+					>
+						if {[N lelong 1 0 0 & -2 == 567102718]} {
+							>
+								emit {COM executable (32-bit COMBOOT}
+								switch [Nv lelong 1 0 {} {}] {
+									567102718 {
+										>
+											emit {\b, relocatable)}
+										<
+									}
+									567102719 {
+										>
+											emit {\b)}
+										<
+									}
+								}
+	
+								mime application/x-c32-comboot-syslinux-exec
+								ext c32
+							<
+						}
+	
+						if {[D 1]} {
+							>
+								emit {COM executable for DOS}
+								mime application/x-dosexec
+								ext com
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		253 {
+			>
+				if {[N uleshort 1 0 0 {} {} == 0]} {
+					>
+						if {[N uleshort 5 0 0 {} {} == 0]} {
+							>
+								if {[N uleshort 3 0 0 {} {} > 317]} {
+									>
+										emit {MSX Graph Saurus compressed image}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		254 {
+			>
+				if {[N uleshort 1 0 0 {} {} == 0]} {
+					>
+						if {[N uleshort 5 0 0 {} {} == 0]} {
+							>
+								switch [Nv uleshort 3 0 {} {}] {
+									14335 {
+										>
+											emit {MSX SC2/GRP raw image}
+										<
+									}
+									27136 {
+										>
+											emit {MSX Graph Saurus SR5 raw image}
+										<
+									}
+									54271 {
+										>
+											emit {MSX screen 7-12 raw image}
+										<
+									}
+									54272 {
+										>
+											emit {MSX Graph Saurus SR7/SR8/SRS raw image}
+										<
+									}
+								}
+	
+								if {[N uleshort 3 0 0 {} {} > 30366]} {
+									>
+										if {[N uleshort 3 0 0 {} {} < 32768]} {
+											>
+												emit {MSX GE5/GE6 raw image}
+												if {[N uleshort 3 0 0 {} {} == 32767]} {
+													>
+														emit {\b, with sprite patterns}
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[N ubeshort 0 0 0 & 60301 > 60160]} {
+		>
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \x81\xfc]} {
+		>
+			if {[S string 4 0 {} {} eq \x77\x02\xcd\x20\xb9]} {
+				>
+					if {[S string 36 0 {} {} eq UPX!]} {
+						>
+							emit {FREE-DOS executable (COM), UPX compressed}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 252 0 {} {} eq Must\ have\ DOS\ version]} {
+		>
+			emit {DR-DOS executable (COM)}
+		<
+	}
+	
+	if {[S string 34 0 {} {} eq UPX!]} {
+		>
+			emit {FREE-DOS executable (COM), UPX compressed}
+		<
+	}
+	
+	if {[S string 35 0 {} {} eq UPX!]} {
+		>
+			emit {FREE-DOS executable (COM), UPX compressed}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq \xcd\x21]} {
+		>
+			emit {COM executable for DOS}
+		<
+	}
+	
+	if {[S string 4 0 {} {} eq \xcd\x21]} {
+		>
+			emit {COM executable for DOS}
+		<
+	}
+	
+	if {[S string 5 0 {} {} eq \xcd\x21]} {
+		>
+			emit {COM executable for DOS}
+		<
+	}
+	
+	if {[S string 7 0 {} {} eq \xcd\x21]} {
+		>
+			if {[N byte 0 0 0 {} {} != -72]} {
+				>
+					emit {COM executable for DOS}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 10 0 {} {} eq \xcd\x21]} {
+		>
+			if {[S string 5 0 {} {} ne \xcd\x21]} {
+				>
+					emit {COM executable for DOS}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 13 0 {} {} eq \xcd\x21]} {
+		>
+			emit {COM executable for DOS}
+		<
+	}
+	
+	if {[S string 18 0 {} {} eq \xcd\x21]} {
+		>
+			emit {COM executable for MS-DOS}
+		<
+	}
+	
+	if {[S string 23 0 {} {} eq \xcd\x21]} {
+		>
+			emit {COM executable for MS-DOS}
+		<
+	}
+	
+	if {[S string 30 0 {} {} eq \xcd\x21]} {
+		>
+			emit {COM executable for MS-DOS}
+		<
+	}
+	
+	if {[S string 70 0 {} {} eq \xcd\x21]} {
+		>
+			emit {COM executable for DOS}
+		<
+	}
+	
+	if {[S search 6 0 {} 10 eq \xfc\x57\xf3\xa5\xc3]} {
+		>
+			emit {COM executable for MS-DOS}
+		<
+	}
+	
+	if {[S search 6 0 {} 10 eq \xfc\x57\xf3\xa4\xc3]} {
+		>
+			emit {COM executable for DOS}
+			if {[S search 24 0 {} 16 eq \x50\xa4\xff\xd5\x73]} {
+				>
+					emit {\b, aPack compressed}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq W\ Collis\0\0]} {
+		>
+			emit {COM executable for MS-DOS, Compack compressed}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq LZ]} {
+		>
+			emit {MS-DOS executable (built-in)}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \320\317\021\340\241\261\032\341AAFB\015\000OM\006\016\053\064\001\001\001\377]} {
+		>
+			emit {AAF legacy file using MS Structured Storage}
+			switch [Nv byte 30 0 {} {}] {
+				9 {
+					>
+						emit {(512B sectors)}
+					<
+				}
+				12 {
+					>
+						emit {(4kB sectors)}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \320\317\021\340\241\261\032\341\001\002\001\015\000\002\000\000\006\016\053\064\003\002\001\001]} {
+		>
+			emit {AAF file using MS Structured Storage}
+			switch [Nv byte 30 0 {} {}] {
+				9 {
+					>
+						emit {(512B sectors)}
+					<
+				}
+				12 {
+					>
+						emit {(4kB sectors)}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 2080 0 {} {} eq Microsoft\ Word\ 6.0\ Document]} {
+		>
+			emit %s
+			mime application/msword
+		<
+	}
+	
+	if {[S string 2080 0 {} {} eq Documento\ Microsoft\ Word\ 6]} {
+		>
+			emit {Spanish Microsoft Word 6 document data}
+			mime application/msword
+		<
+	}
+	
+	if {[S string 2112 0 {} {} eq MSWordDoc]} {
+		>
+			emit {Microsoft Word document data}
+			mime application/msword
+		<
+	}
+	
+	if {[S string 0 0 b {} eq PO^Q`]} {
+		>
+			emit {Microsoft Word 6.0 Document}
+			mime application/msword
+		<
+	}
+	
+	if {[N long 4 0 0 {} {} == 0]} {
+		>
+			switch [Nv belong 0 0 {} {}] {
+				-30277632 {
+					>
+						emit {Microsoft Word for Macintosh 1.0}
+						mime application/msword
+						ext mcw
+					<
+				}
+				-30146560 {
+					>
+						emit {Microsoft Word for Macintosh 3.0}
+						mime application/msword
+						ext mcw
+					<
+				}
+				-29949924 {
+					>
+						emit {Microsoft Word for Macintosh 4.0}
+						mime application/msword
+						ext mcw
+					<
+				}
+				-29949917 {
+					>
+						emit {Microsoft Word for Macintosh 5.0}
+						mime application/msword
+						ext mcw
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \333\245-\0\0\0]} {
+		>
+			emit {Microsoft Word 2.0 Document}
+			mime application/msword
+			ext doc
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \xDB\xA5\x2D\x00]} {
+		>
+			emit {Microsoft WinWord 2.0 Document}
+			mime application/msword
+		<
+	}
+	
+	if {[S string 2080 0 {} {} eq Microsoft\ Excel\ 5.0\ Worksheet]} {
+		>
+			emit %s
+			mime application/vnd.ms-excel
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \xDB\xA5\x2D\x00]} {
+		>
+			emit {Microsoft WinWord 2.0 Document}
+			mime application/msword
+		<
+	}
+	
+	if {[S string 2080 0 {} {} eq Foglio\ di\ lavoro\ Microsoft\ Exce]} {
+		>
+			emit %s
+			mime application/vnd.ms-excel
+		<
+	}
+	
+	if {[S string 2114 0 {} {} eq Biff5]} {
+		>
+			emit {Microsoft Excel 5.0 Worksheet}
+			mime application/vnd.ms-excel
+		<
+	}
+	
+	if {[S string 2121 0 {} {} eq Biff5]} {
+		>
+			emit {Microsoft Excel 5.0 Worksheet}
+			mime application/vnd.ms-excel
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \x09\x04\x06\x00\x00\x00\x10\x00]} {
+		>
+			emit {Microsoft Excel Worksheet}
+			mime application/vnd.ms-excel
+		<
+	}
+	
+	if {[S string 0 0 b {} eq WordPro\0]} {
+		>
+			emit {Lotus WordPro}
+			mime application/vnd.lotus-wordpro
+		<
+	}
+	
+	if {[S string 0 0 b {} eq WordPro\r\373]} {
+		>
+			emit {Lotus WordPro}
+			mime application/vnd.lotus-wordpro
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x71\xa8\x00\x00\x01\x02]} {
+		>
+			if {[S string 12 0 {} {} eq Stirling\ Technologies,]} {
+				>
+					emit {InstallShield Uninstall Script}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq Nullsoft\ AVS\ Preset\ ]} {
+		>
+			emit {Winamp plug in}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \327\315\306\232]} {
+		>
+			emit {Windows metafile}
+			mime image/wmf
+			ext wmf
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \002\000\011\000]} {
+		>
+			emit {Windows metafile}
+			mime image/wmf
+			ext wmf
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \001\000\011\000]} {
+		>
+			emit {Windows metafile}
+			mime image/wmf
+			ext wmf
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \003\001\001\004\070\001\000\000]} {
+		>
+			emit {tz3 ms-works file}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \003\002\001\004\070\001\000\000]} {
+		>
+			emit {tz3 ms-works file}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \003\003\001\004\070\001\000\000]} {
+		>
+			emit {tz3 ms-works file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \211\000\077\003\005\000\063\237\127\065\027\266\151\064\005\045\101\233\021\002]} {
+		>
+			emit {PGP sig}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \211\000\077\003\005\000\063\237\127\066\027\266\151\064\005\045\101\233\021\002]} {
+		>
+			emit {PGP sig}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \211\000\077\003\005\000\063\237\127\067\027\266\151\064\005\045\101\233\021\002]} {
+		>
+			emit {PGP sig}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \211\000\077\003\005\000\063\237\127\070\027\266\151\064\005\045\101\233\021\002]} {
+		>
+			emit {PGP sig}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \211\000\077\003\005\000\063\237\127\071\027\266\151\064\005\045\101\233\021\002]} {
+		>
+			emit {PGP sig}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \211\000\225\003\005\000\062\122\207\304\100\345\042]} {
+		>
+			emit {PGP sig}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq MDIF\032\000\010\000\000\000\372\046\100\175\001\000\001\036\001\000]} {
+		>
+			emit {MS Windows special zipped file}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \102\101\050\000\000\000\056\000\000\000\000\000\000\000]} {
+		>
+			emit {Icon for MS Windows}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq PK\010\010BGI]} {
+		>
+			emit {Borland font}
+			if {[S string 4 0 {} {} > \0]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq pk\010\010BGI]} {
+		>
+			emit {Borland device}
+			if {[S string 4 0 {} {} > \0]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 9 0 {} {} eq GERBILDOC]} {
+		>
+			emit {First Choice document}
+		<
+	}
+	
+	if {[S string 9 0 {} {} eq GERBILDB]} {
+		>
+			emit {First Choice database}
+		<
+	}
+	
+	if {[S string 9 0 {} {} eq GERBILCLIP]} {
+		>
+			emit {First Choice database}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GERBIL]} {
+		>
+			emit {First Choice device file}
+		<
+	}
+	
+	if {[S string 9 0 {} {} eq RABBITGRAPH]} {
+		>
+			emit {RabbitGraph file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DCU1]} {
+		>
+			emit {Borland Delphi .DCU file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq !<spell>]} {
+		>
+			emit {MKS Spell hash list (old format)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq !<spell2>]} {
+		>
+			emit {MKS Spell hash list}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TPF0]} {
+		>
+			if {[S pstring 4 0 {} {} > \0]} {
+				>
+					emit {Delphi compiled form '%s'}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PMCC]} {
+		>
+			emit {Windows 3.x .GRP file}
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq RDC-meg]} {
+		>
+			emit MegaDots
+			if {[N byte 8 0 0 {} {} > 47]} {
+				>
+					emit {version %c}
+				<
+			}
+	
+			if {[N byte 9 0 0 {} {} > 47]} {
+				>
+					emit {\b.%c file}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 369 0 {} {} eq MICROSOFT\ PIFEX\0]} {
+		>
+			emit {Windows Program Information File}
+			if {[S string 36 0 {} {} > \0]} {
+				>
+					emit {\b for %.63s}
+				<
+			}
+	
+			if {[S string 101 0 {} {} > \0]} {
+				>
+					emit {\b, directory=%.64s}
+				<
+			}
+	
+			if {[S string 165 0 {} {} > \0]} {
+				>
+					emit {\b, parameters=%.64s}
+				<
+			}
+	
+			if {[S search 391 0 {} 2901 eq WINDOWS\ VMM\ 4.0\0]} {
+				>
+					if {[N ubyte [R 94] 0 0 {} {} > 0]} {
+						>
+							if {[S string [R -1] 0 {} {} < PIFMGR.DLL]} {
+								>
+									emit {\b, icon=%s}
+								<
+							}
+	
+							if {[S string [R -1] 0 {} {} > PIFMGR.DLL]} {
+								>
+									emit {\b, icon=%s}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ubyte [R 240] 0 0 {} {} > 0]} {
+						>
+							if {[S string [R -1] 0 {} {} < Terminal]} {
+								>
+									emit {\b, font=%.32s}
+								<
+							}
+	
+							if {[S string [R -1] 0 {} {} > Terminal]} {
+								>
+									emit {\b, font=%.32s}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N ubyte [R 272] 0 0 {} {} > 0]} {
+						>
+							if {[S string [R -1] 0 {} {} < Lucida\ Console]} {
+								>
+									emit {\b, TrueTypeFont=%.32s}
+								<
+							}
+	
+							if {[S string [R -1] 0 {} {} > Lucida\ Console]} {
+								>
+									emit {\b, TrueTypeFont=%.32s}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 391 0 {} 2901 eq WINDOWS\ NT\ \ 3.1\0]} {
+				>
+					emit {\b, Windows NT-style}
+				<
+			}
+	
+			if {[S search 391 0 {} 2901 eq CONFIG\ \ SYS\ 4.0\0]} {
+				>
+					emit {\b +CONFIG.SYS}
+				<
+			}
+	
+			if {[S search 391 0 {} 2901 eq AUTOEXECBAT\ 4.0\0]} {
+				>
+					emit {\b +AUTOEXEC.BAT}
+				<
+			}
+	
+			mime application/x-dosexec
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NG\0\001]} {
+		>
+			if {[N ulelong 2 0 0 {} {} == 256]} {
+				>
+					emit {Norton Guide}
+					if {[S string 8 0 {} {} > \0]} {
+						>
+							emit {"%-.40s"}
+						<
+					}
+	
+					if {[S string 48 0 {} {} > \0]} {
+						>
+							emit {\b, %-.66s}
+						<
+					}
+	
+					if {[S string 114 0 {} {} > \0]} {
+						>
+							emit %-.66s
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq ITSF\003\000\000\000\x60\000\000\000]} {
+		>
+			emit {MS Windows HtmlHelp Data}
+		<
+	}
+	
+	if {[S string 2 0 b {} eq GFA-BASIC3]} {
+		>
+			emit {GFA-BASIC 3 data}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq MSCF\0\0\0\0]} {
+		>
+			emit {Microsoft Cabinet archive data}
+			if {[S search 44 0 c 980 eq .diag]} {
+				>
+					emit {\b, Diagnostic}
+					mime application/vnd.ms-cab-compressed
+					ext diagcab
+				<
+			}
+	
+			if {[S search 44 0 c 300 eq png.pub\0]} {
+				>
+					emit {\b, Publisher Packed and Go}
+					mime application/vnd.ms-cab-compressed
+					ext puz
+				<
+			}
+	
+			if {[S search 44 0 c 17 eq ppview32.exe\0]} {
+				>
+					emit {\b, PowerPoint Viewer Packed and Go}
+					mime application/vnd.ms-powerpoint
+					ext ppz
+				<
+			}
+	
+			if {[S search 44 0 c 3369 eq content.ini\0]} {
+				>
+					emit {\b, IncrediMail}
+					if {[S search 44 0 c 83 eq Flavor.htm\0]} {
+						>
+							emit ecard
+							ext imf
+						<
+					}
+	
+					if {[S search 44 0 c 211 eq .swf\0]} {
+						>
+							emit skin
+							ext ims
+						<
+					}
+	
+					if {[S search 44 0 c 92 eq anim.im3\0]} {
+						>
+							emit animation
+							ext ima
+						<
+					}
+	
+					if {[D 44]} {
+						>
+							if {[S search 44 0 c 116 eq thumb]} {
+								>
+									emit {ecard, image, notifier or skin}
+									ext imf/imi/imn/ims
+								<
+							}
+	
+							if {[D 44]} {
+								>
+									emit {emoticons or sound}
+									ext ime/imw
+								<
+							}
+	
+						<
+					}
+	
+					mime application/x-incredimail
+				<
+			}
+	
+			if {[D 44]} {
+				>
+					if {[N ubyte [I 16 ulelong 0 + 0 16] 0 0 {} {} x {}]} {
+						>
+							if {[S string [R -1] 0 c {} eq _accrpt_.snp]} {
+								>
+									emit {\b, Access report snapshot}
+									mime application/msaccess
+									ext snp
+								<
+							}
+	
+							if {[S string [R 7] 0 {} {} eq .000]} {
+								>
+									emit {\b, WinCE install}
+									mime application/vnd.ms-cab-compressed
+									ext cab
+								<
+							}
+	
+							if {[S string [R -1] 0 c {} eq wsusscan.cab]} {
+								>
+									emit {\b, Microsoft Standalone Update}
+									mime application/vnd.ms-cab-compressed
+									ext msu
+								<
+							}
+	
+							if {[D [R -1]]} {
+								>
+									if {[S search [R -1] 0 {} 255 eq .]} {
+										>
+											if {[S string [R 0] 0 c {} eq ppt\0]} {
+												>
+													emit {\b, PowerPoint Packed and Go}
+													mime application/vnd.ms-powerpoint
+													ext ppz
+												<
+											}
+	
+											if {[S string [R 0] 0 c {} eq theme]} {
+												>
+													emit {\b, Windows}
+													if {[S string [I 16 ulelong 0 + 0 16] 0 {} {} eq Panoram]} {
+														>
+															emit 8
+															ext deskthemepack
+														<
+													}
+	
+													if {[S string [I 16 ulelong 0 + 0 16] 0 {} {} ne Panoram]} {
+														>
+															emit {7 or 8}
+															ext themepack/deskthemepack
+														<
+													}
+	
+													if {[N ubyte [I 16 ulelong 0 + 0 16] 0 0 {} {} x {}]} {
+														>
+															emit {Theme Pack}
+														<
+													}
+	
+													mime application/x-windows-themepack
+												<
+											}
+	
+											if {[D [R 0]]} {
+												>
+													if {[S search [R 0] 0 {} 255 eq \0]} {
+														>
+															if {[S string [R 16] 0 c {} eq wsusscan.cab]} {
+																>
+																	emit {\b, Microsoft Standalone Update}
+																	mime application/vnd.ms-cab-compressed
+																	ext msu
+																<
+															}
+	
+															if {[D [R 16]]} {
+																>
+																	if {[N uleshort 28 0 0 {} {} > 1]} {
+																		>
+																			emit {\b, many}
+																			mime application/vnd.ms-cab-compressed
+																			ext cab
+																		<
+																	}
+	
+																	if {[N uleshort 28 0 0 {} {} == 1]} {
+																		>
+																			if {[N uleshort 30 0 0 {} {} == 0]} {
+																				>
+																					emit {\b, Windows 2000/XP setup}
+																					mime application/vnd.ms-cab-compressed
+																					ext _/?_/??_
+																				<
+																			}
+	
+																			if {[N uleshort 30 0 0 {} {} != 0]} {
+																				>
+																					emit {\b, single}
+																					mime application/vnd.ms-cab-compressed
+																					ext cab
+																				<
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulelong 8 0 0 {} {} x {}]} {
+				>
+					emit {\b, %u bytes}
+				<
+			}
+	
+			if {[N uleshort 28 0 0 {} {} == 1]} {
+				>
+					emit {\b, 1 file}
+				<
+			}
+	
+			if {[N uleshort 28 0 0 {} {} > 1]} {
+				>
+					emit {\b, %u files}
+				<
+			}
+	
+			if {[N ulelong 16 0 0 {} {} x {}]} {
+				>
+					emit {\b, at 0x%x}
+				<
+			}
+	
+			U 163 cab-file [I 16 ulelong 0 + 0 0]
+	
+			if {[N uleshort 28 0 0 {} {} > 1]} {
+				>
+					if {[N ubyte [I 16 ulelong 0 + 0 16] 0 0 {} {} x {}]} {
+						>
+							if {[S search [R 0] 0 {} 255 eq \0]} {
+								>
+									U 163 cab-file [R 0]
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ubeshort 24 0 0 {} {} != 769]} {
+				>
+					emit {\b version 0x%x}
+				<
+			}
+	
+			if {[N uleshort 26 0 0 {} {} > 1]} {
+				>
+					emit {\b, %u cffolders}
+				<
+			}
+	
+			if {[N uleshort 30 0 0 {} {} > 0]} {
+				>
+					emit {\b, flags 0x%x}
+				<
+			}
+	
+			if {[N uleshort 32 0 0 {} {} > 0]} {
+				>
+					emit {\b, ID %u}
+				<
+			}
+	
+			if {[N uleshort 34 0 0 + 1 x {}]} {
+				>
+					emit {\b, number %u}
+				<
+			}
+	
+			if {[N uleshort 30 0 0 {} {} & 4]} {
+				>
+					emit {\b, extra bytes}
+					if {[N uleshort 36 0 0 {} {} > 0]} {
+						>
+							emit {%u in head}
+						<
+					}
+	
+					if {[N ubyte 38 0 0 {} {} > 0]} {
+						>
+							emit {%u in folder}
+						<
+					}
+	
+					if {[N ubyte 39 0 0 {} {} > 0]} {
+						>
+							emit {%u in data block}
+						<
+					}
+	
+					if {[N uleshort 36 0 0 {} {} > 0]} {
+						>
+							U 163 cab-folder [I 36 uleshort 0 + 0 40]
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N uleshort 30 0 0 {} {} ^ 4]} {
+				>
+					switch [Nv uleshort 30 0 {} {}] {
+						0 {
+							>
+								U 163 cab-folder 36
+	
+							<
+						}
+						1 {
+							>
+								emit {\b, previous}
+								U 163 cab-anchor 36
+	
+							<
+						}
+						2 {
+							>
+								emit {\b, next}
+								U 163 cab-anchor 36
+	
+							<
+						}
+						3 {
+							>
+								emit {\b, previous}
+								if {[S string 36 0 {} {} x {}]} {
+									>
+										emit %s
+										if {[S string [R 1] 0 {} {} x {}]} {
+											>
+												emit {disk %s}
+												if {[S string [R 1] 0 {} {} x {}]} {
+													>
+														emit {\b, next %s}
+														if {[S string [R 1] 0 {} {} x {}]} {
+															>
+																emit {disk %s}
+																U 163 cab-folder [R 1]
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq ISc(]} {
+		>
+			emit {InstallShield Cabinet archive data}
+			if {[N byte 5 0 0 & -16 == 96]} {
+				>
+					emit {version 6,}
+				<
+			}
+	
+			if {[N byte 5 0 0 & -16 != 96]} {
+				>
+					emit {version 4/5,}
+				<
+			}
+	
+			if {[N lelong [I 12 ulelong 0 + 0 40] 0 0 {} {} x {}]} {
+				>
+					emit {%u files}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq MSCE\0\0\0\0]} {
+		>
+			emit {Microsoft WinCE install header}
+			switch [Nv lelong 20 0 {} {}] {
+				0 {
+					>
+						emit {\b, architecture-independent}
+					<
+				}
+				103 {
+					>
+						emit {\b, Hitachi SH3}
+					<
+				}
+				104 {
+					>
+						emit {\b, Hitachi SH4}
+					<
+				}
+				2577 {
+					>
+						emit {\b, StrongARM}
+					<
+				}
+				4000 {
+					>
+						emit {\b, MIPS R4000}
+					<
+				}
+				10003 {
+					>
+						emit {\b, Hitachi SH3}
+					<
+				}
+				10004 {
+					>
+						emit {\b, Hitachi SH3E}
+					<
+				}
+				10005 {
+					>
+						emit {\b, Hitachi SH4}
+					<
+				}
+				70001 {
+					>
+						emit {\b, ARM 7TDMI}
+					<
+				}
+			}
+	
+			if {[N leshort 52 0 0 {} {} == 1]} {
+				>
+					emit {\b, 1 file}
+				<
+			}
+	
+			if {[N leshort 52 0 0 {} {} > 1]} {
+				>
+					emit {\b, %u files}
+				<
+			}
+	
+			if {[N leshort 56 0 0 {} {} == 1]} {
+				>
+					emit {\b, 1 registry entry}
+				<
+			}
+	
+			if {[N leshort 56 0 0 {} {} > 1]} {
+				>
+					emit {\b, %u registry entries}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \224\246\056]} {
+		>
+			emit {Microsoft Word Document}
+			mime application/msword
+		<
+	}
+	
+	if {[S string 512 0 {} {} eq R\0o\0o\0t\0\ \0E\0n\0t\0r\0y]} {
+		>
+			emit {Microsoft Word Document}
+			mime application/msword
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \$RBU]} {
+		>
+			if {[S string 23 0 {} {} eq Dell]} {
+				>
+					emit {%s system BIOS}
+				<
+			}
+	
+			if {[N byte 5 0 0 {} {} == 2]} {
+				>
+					if {[N byte 48 0 0 {} {} x {}]} {
+						>
+							emit {version %d.}
+						<
+					}
+	
+					if {[N byte 49 0 0 {} {} x {}]} {
+						>
+							emit {\b%d.}
+						<
+					}
+	
+					if {[N byte 50 0 0 {} {} x {}]} {
+						>
+							emit {\b%d}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 5 0 0 {} {} < 2]} {
+				>
+					if {[S string 48 0 {} {} x {}]} {
+						>
+							emit {version %.3s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq ITOLITLS]} {
+		>
+			emit {Microsoft Reader eBook Data}
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %u}
+					mime application/x-ms-reader
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq B000FF\n]} {
+		>
+			emit {Windows Embedded CE binary image}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq MSWIM\000\000\000]} {
+		>
+			emit {Windows imaging (WIM) image}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq WLPWM\000\000\000]} {
+		>
+			emit {Windows imaging (WIM) image, wimlib pipable format}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xfc\x03\x00]} {
+		>
+			emit {Mallard BASIC program data (v1.11)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xfc\x04\x00]} {
+		>
+			emit {Mallard BASIC program data (v1.29+)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xfc\x03\x01]} {
+		>
+			emit {Mallard BASIC protected program data (v1.11)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xfc\x04\x01]} {
+		>
+			emit {Mallard BASIC protected program data (v1.29+)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MIOPEN]} {
+		>
+			emit {Mallard BASIC Jetsam data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Jetsam0]} {
+		>
+			emit {Mallard BASIC Jetsam index data}
+		<
+	}
+	
+	if {[N ushort 3 0 0 {} {} > 1979]} {
+		>
+			if {[N ubyte 5 0 0 - 1 < 31]} {
+				>
+					if {[N ubyte 6 0 0 - 1 < 12]} {
+						>
+							if {[S string 7 0 {} {} eq \0\0\0\0\0\0\0\0]} {
+								>
+									if {[N ubyte 1 0 0 {} {} x {}]} {
+										>
+											emit {DOS 2.0 backup id file, sequence %d}
+											ext @@@
+										<
+									}
+	
+									if {[N ubyte 0 0 0 {} {} == 255]} {
+										>
+											emit {\b, last disk}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubyte 82 0 0 {} {} == 0]} {
+		>
+			if {[N byte 0 0 0 - 127 < -126]} {
+				>
+					if {[N ubyte 83 0 0 - 1 < 78]} {
+						>
+							if {[N ubyte [I 83 ubyte 0 + 0 4] 0 0 {} {} == 0]} {
+								>
+									if {[N ubyte [I 83 ubyte 0 + 0 3] 0 0 {} {} > 31]} {
+										>
+											if {[N ubyte 5 0 0 & 140 == 12]} {
+												>
+													if {[N ubyte 0 0 0 {} {} x {}]} {
+														>
+															emit {DOS 2.0-3.2 backed up}
+														<
+													}
+	
+													if {[N ubyte 0 0 0 {} {} == 0]} {
+														>
+															if {[N uleshort 1 0 0 {} {} x {}]} {
+																>
+																	emit {sequence %d of}
+																<
+															}
+	
+														<
+													}
+	
+													if {[S string 5 0 {} {} x {}]} {
+														>
+															emit {file %s}
+														<
+													}
+	
+													emit {\b; }
+													T 128 {}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x8bBACKUP\x20]} {
+		>
+			if {[S string 10 0 {} {} eq \0\0\0\0\0\0\0\0]} {
+				>
+					if {[N ubyte 9 0 0 {} {} x {}]} {
+						>
+							emit {DOS 3.3 backup control file, sequence %d}
+						<
+					}
+	
+					if {[N ubyte 138 0 0 {} {} == 255]} {
+						>
+							emit {\b, last disk}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PK\003\004]} {
+		>
+			U 164 msooxml 30
+	
+			if {[S regex 30 0 {} {} eq \\\[Content_Types\\\]\\.xml|_rels/\\.rels]} {
+				>
+					if {[S search [I 18 ulelong 0 + 0 49] 0 {} 2000 eq PK\003\004]} {
+						>
+							if {[S search [R 26] 0 {} 1000 eq PK\003\004]} {
+								>
+									U 164 msooxml [R 26]
+	
+									if {[D [R 26]]} {
+										>
+											if {[S search [R 26] 0 {} 1000 eq PK\003\004]} {
+												>
+													U 164 msooxml [R 26]
+	
+													if {[D [R 26]]} {
+														>
+															emit {Microsoft OOXML}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			strength +10
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HWB\000\377\001\000\000\000]} {
+		>
+			emit {Microsoft Visual C .APS file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \102\157\162\154\141\156\144\040\103\053\053\040\120\162\157]} {
+		>
+			emit {MSVC .ide}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000\000\000\000\040\000\000\000\377]} {
+		>
+			emit {MSVC .res}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \377\003\000\377\001\000\020\020\350]} {
+		>
+			emit {MSVC .res}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \377\003\000\377\001\000\060\020\350]} {
+		>
+			emit {MSVC .res}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \360\015\000\000]} {
+		>
+			emit {Microsoft Visual C library}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \360\075\000\000]} {
+		>
+			emit {Microsoft Visual C library}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \360\175\000\000]} {
+		>
+			emit {Microsoft Visual C library}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DTJPCH0\000\022\103\006\200]} {
+		>
+			emit {Microsoft Visual C .pch}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Microsoft\ C/C++\040]} {
+		>
+			if {[S search 24 0 {} 14 eq \r\n\x1A]} {
+				>
+					emit {MSVC program database}
+					if {[S regex 16 0 {} {} eq (\[0-9.\]+)]} {
+						>
+							emit {ver %s}
+						<
+					}
+	
+					if {[N leshort 30 0 0 {} {} == 0]} {
+						>
+							if {[N lelong 32 0 0 {} {} x {}]} {
+								>
+									emit {\b, %d}
+								<
+							}
+	
+							if {[N lelong 40 0 0 {} {} x {}]} {
+								>
+									emit {\b*%d bytes}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N leshort 30 0 0 {} {} != 0]} {
+						>
+							if {[N lelong 44 0 0 {} {} x {}]} {
+								>
+									emit {\b, %d}
+								<
+							}
+	
+							if {[N leshort 50 0 0 {} {} x {}]} {
+								>
+									emit {\b*%d bytes}
+								<
+							}
+	
+						<
+					}
+	
+					mime application/x-ms-pdb
+					ext pdb
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 c {} eq bsjb\001\000\001\000\000\000\000\000\f\000\000\000pdb\ v1.0]} {
+		>
+			emit {Microsoft Rosyln C# debugging symbols version 1.0}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000\002\000\007\000]} {
+		>
+			emit {MSVC .sbr}
+			if {[S string 5 0 {} {} > \0]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \002\000\002\001]} {
+		>
+			emit {MSVC .bsc}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq 1.00\ .0000.0000\000\003]} {
+		>
+			emit {MSVC .wsp version 1.0000.0000}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq MGS]} {
+		>
+			emit {MSX Gigamix MGSDRV3 music file,}
+			if {[N ubeshort 6 0 0 {} {} == 3338]} {
+				>
+					if {[N byte 3 0 0 {} {} x {}]} {
+						>
+							emit {\bv%c}
+						<
+					}
+	
+					if {[N byte 4 0 0 {} {} x {}]} {
+						>
+							emit {\b.%c}
+						<
+					}
+	
+					if {[N byte 5 0 0 {} {} x {}]} {
+						>
+							emit {\b%c}
+						<
+					}
+	
+					if {[S string 8 0 {} {} > \0]} {
+						>
+							emit {\b, title: %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 1 0 b {} eq mgs2\ ]} {
+		>
+			emit {MSX Gigamix MGSDRV2 music file}
+			if {[N uleshort 6 0 0 {} {} == 128]} {
+				>
+					if {[N uleshort 46 0 0 {} {} == 0]} {
+						>
+							if {[S string 48 0 {} {} > \0]} {
+								>
+									emit {\b, title: %s}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq KSCC]} {
+		>
+			emit {KSS music file v1.03}
+			if {[N byte 14 0 0 {} {} == 0]} {
+				>
+					switch [Nv byte 15 0 & 2] {
+						0 {
+							>
+								emit {\b, soundchips: AY-3-8910, SCC(+)}
+							<
+						}
+						2 {
+							>
+								emit {\b, soundchip(s): SN76489}
+								if {[N byte 15 0 0 & 4 == 4]} {
+									>
+										emit stereo
+									<
+								}
+	
+							<
+						}
+					}
+	
+					if {[N byte 15 0 0 & 1 == 1]} {
+						>
+							emit {\b, YM2413}
+						<
+					}
+	
+					if {[N byte 15 0 0 & 8 == 8]} {
+						>
+							emit {\b, Y8950}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq KSSX]} {
+		>
+			emit {KSS music file v1.20}
+			if {[N byte 14 0 0 & -17 == 0]} {
+				>
+					switch [Nv byte 15 0 & 64] {
+						0 {
+							>
+								emit {\b, 60Hz}
+							<
+						}
+						64 {
+							>
+								emit {\b, 50Hz}
+							<
+						}
+					}
+	
+					switch [Nv byte 15 0 & 2] {
+						0 {
+							>
+								emit {\b, soundchips: AY-3-8910, SCC(+)}
+							<
+						}
+						2 {
+							>
+								emit {\b, soundchips: SN76489}
+								if {[N byte 15 0 0 & 4 == 4]} {
+									>
+										emit stereo
+									<
+								}
+	
+							<
+						}
+					}
+	
+					if {[N byte 15 0 0 & 1 == 1]} {
+						>
+							emit {\b,}
+							switch [Nv byte 15 0 & 24] {
+								0 {
+									>
+										emit {\bYM2413}
+									<
+								}
+								8 {
+									>
+										emit {\bYM2413, Y8950}
+									<
+								}
+								24 {
+									>
+										emit {\bYM2413+Y8950 pseudostereo}
+									<
+								}
+							}
+	
+						<
+					}
+	
+					if {[N byte 15 0 0 & 24 == 16]} {
+						>
+							emit {\b, Majyutsushi DAC}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq MBMS]} {
+		>
+			if {[N byte 4 0 0 {} {} == 16]} {
+				>
+					emit {MSX Moonblaster for MoonSound music}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq MPK]} {
+		>
+			emit {MSX Music Player K-kaz song}
+			if {[N ubeshort 6 0 0 {} {} == 3338]} {
+				>
+					if {[N byte 3 0 0 {} {} x {}]} {
+						>
+							emit v%c
+						<
+					}
+	
+					if {[N byte 4 0 0 {} {} x {}]} {
+						>
+							emit {\b.%c}
+						<
+					}
+	
+					if {[N byte 5 0 0 {} {} x {}]} {
+						>
+							emit {\b%c}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N beshort 53 0 0 {} {} == 3338]} {
+		>
+			if {[N beshort 123 0 0 {} {} == 3338]} {
+				>
+					if {[N byte 125 0 0 {} {} == 26]} {
+						>
+							if {[N uleshort 135 0 0 {} {} == 0]} {
+								>
+									emit {MSX OPX Music file}
+									switch [Nv byte 134 0 {} {}] {
+										0 {
+											>
+												emit v1.5
+												if {[S string 0 0 {} {} > \32]} {
+													>
+														emit {\b, title: %s}
+													<
+												}
+	
+											<
+										}
+										1 {
+											>
+												emit v2.4
+												if {[S string 0 0 {} {} > \32]} {
+													>
+														emit {\b, title: %s}
+													<
+												}
+	
+											<
+										}
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 139 0 b {} eq SCMD]} {
+		>
+			if {[N uleshort 206 0 0 {} {} == 0]} {
+				>
+					emit {MSX SCMD Music file}
+					if {[S string 143 0 {} {} > \0]} {
+						>
+							emit {\b, title: %s}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 65535 eq \r\n@title]} {
+		>
+			if {[S search [R 0] 0 {} 65535 eq \r\n@m=\[]} {
+				>
+					emit {MSX SCMD source MML file}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq G9B]} {
+		>
+			if {[N uleshort 1 0 0 {} {} == 11]} {
+				>
+					if {[N uleshort 3 0 0 {} {} > 10]} {
+						>
+							if {[N ubyte 5 0 0 {} {} > 0]} {
+								>
+									emit {MSX G9B image, depth=%d}
+									if {[N uleshort 8 0 0 {} {} x {}]} {
+										>
+											emit {\b, %dx}
+										<
+									}
+	
+									if {[N uleshort 10 0 0 {} {} x {}]} {
+										>
+											emit {\b%d}
+										<
+									}
+	
+									if {[N ubyte 5 0 0 {} {} < 9]} {
+										>
+											switch [Nv ubyte 6 0 {} {}] {
+												0 {
+													>
+														if {[N ubyte 7 0 0 {} {} x {}]} {
+															>
+																emit {\b, codec=%d RGB color palettes}
+															<
+														}
+	
+													<
+												}
+												64 {
+													>
+														emit {\b, codec=RGB fixed color}
+													<
+												}
+												128 {
+													>
+														emit {\b, codec=YJK}
+													<
+												}
+												192 {
+													>
+														emit {\b, codec=YUV}
+													<
+												}
+											}
+	
+										<
+									}
+	
+									if {[N ubyte 5 0 0 {} {} > 8]} {
+										>
+											emit {codec=RGB fixed color}
+										<
+									}
+	
+									switch [Nv ubyte 12 0 {} {}] {
+										0 {
+											>
+												emit {\b, raw}
+											<
+										}
+										1 {
+											>
+												emit {\b, bitbuster compression}
+											<
+										}
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv ubeshort 0 0 {} {}] {
+		3338 {
+			>
+				U 275 ini-file 0
+	
+			<
+		}
+		62403 {
+			>
+				if {[N uleshort 2 0 0 {} {} < 16384]} {
+					>
+						if {[N ubyte 8 0 0 {} {} == 195]} {
+							>
+								if {[N uleshort 9 0 0 {} {} < 16384]} {
+									>
+										if {[N ubeshort 11 0 0 {} {} == 195]} {
+											>
+												if {[N uleshort 13 0 0 {} {} < 16384]} {
+													>
+														if {[N ubeshort 15 0 0 {} {} == 195]} {
+															>
+																if {[N uleshort 17 0 0 {} {} < 16384]} {
+																	>
+																		if {[N ubeshort 19 0 0 {} {} == 195]} {
+																			>
+																				if {[N uleshort 21 0 0 {} {} < 16384]} {
+																					>
+																						if {[N ubyte 80 0 0 {} {} == 195]} {
+																							>
+																								if {[N uleshort 81 0 0 {} {} < 16384]} {
+																									>
+																										if {[N ubyte [I 9 uleshort 0 + 0 0] 0 0 {} {} == 195]} {
+																											>
+																												if {[N uleshort [R 0] 0 0 {} {} > 16384]} {
+																													>
+																														if {[N ubyte [R 0] 0 0 {} {} == 195]} {
+																															>
+																																emit {MSX BIOS+BASIC}
+																																if {[N ubyte 45 0 0 + 1 < 3]} {
+																																	>
+																																		emit {\b. version=MSX%d}
+																																	<
+																																}
+	
+																																switch [Nv ubyte 45 0 {} {}] {
+																																	2 {
+																																		>
+																																			emit {\b, version=MSX2+}
+																																		<
+																																	}
+																																	3 {
+																																		>
+																																			emit {\b, version=MSX Turbo-R}
+																																		<
+																																	}
+																																}
+	
+																																if {[N ubyte 45 0 0 {} {} > 3]} {
+																																	>
+																																		emit {\b, version=Unknown MSX %d version}
+																																	<
+																																}
+	
+																																if {[N ubyte 6 0 0 {} {} x {}]} {
+																																	>
+																																		emit {\b, VDP.DR=0x%2x}
+																																	<
+																																}
+	
+																																if {[N ubyte 7 0 0 {} {} x {}]} {
+																																	>
+																																		emit {\b, VDP.DW=0x%2x}
+																																	<
+																																}
+	
+																																switch [Nv ubyte 43 0 & 15] {
+																																	0 {
+																																		>
+																																			emit {\b, charset=Japanese}
+																																		<
+																																	}
+																																	1 {
+																																		>
+																																			emit {\b, charset=International}
+																																		<
+																																	}
+																																	2 {
+																																		>
+																																			emit {\b, charset=Korean}
+																																		<
+																																	}
+																																}
+	
+																																if {[N ubyte 43 0 0 & 15 > 2]} {
+																																	>
+																																		emit {\b, charset=Unknown id:%d}
+																																	<
+																																}
+	
+																																switch [Nv ubyte 43 0 & 112] {
+																																	0 {
+																																		>
+																																			emit {\b, date format=Y-M-D}
+																																		<
+																																	}
+																																	16 {
+																																		>
+																																			emit {\b, date format=M-D-Y}
+																																		<
+																																	}
+																																	32 {
+																																		>
+																																			emit {\b, date format=D-M-Y}
+																																		<
+																																	}
+																																}
+	
+																																switch [Nv ubyte 43 0 & 128] {
+																																	0 {
+																																		>
+																																			emit {\b, vfreq=60Hz}
+																																		<
+																																	}
+																																	128 {
+																																		>
+																																			emit {\b, vfreq=50Hz}
+																																		<
+																																	}
+																																}
+	
+																																switch [Nv ubyte 44 0 & 15] {
+																																	0 {
+																																		>
+																																			emit {\b, keyboard=Japanese}
+																																		<
+																																	}
+																																	1 {
+																																		>
+																																			emit {\b, keyboard=International}
+																																		<
+																																	}
+																																	2 {
+																																		>
+																																			emit {\b, keyboard=French}
+																																		<
+																																	}
+																																	3 {
+																																		>
+																																			emit {\b, keyboard=UK}
+																																		<
+																																	}
+																																	4 {
+																																		>
+																																			emit {\b, keyboard=German}
+																																		<
+																																	}
+																																	5 {
+																																		>
+																																			emit {\b, keyboard=Unknown id:%d}
+																																		<
+																																	}
+																																	6 {
+																																		>
+																																			emit {\b, keyboard=Spanish}
+																																		<
+																																	}
+																																}
+	
+																																if {[N ubyte 44 0 0 & 15 > 6]} {
+																																	>
+																																		emit {\b, keyboard=Unknown id:%d}
+																																	<
+																																}
+	
+																																switch [Nv ubyte 44 0 & 240] {
+																																	0 {
+																																		>
+																																			emit {\b, basic=Japanese}
+																																		<
+																																	}
+																																	16 {
+																																		>
+																																			emit {\b, basic=International}
+																																		<
+																																	}
+																																}
+	
+																																if {[N ubyte 44 0 0 & 240 > 16]} {
+																																	>
+																																		emit {\b, basic=Unknown id:%d}
+																																	<
+																																}
+	
+																																if {[N ubyte 46 0 0 & 1 == 1]} {
+																																	>
+																																		emit {\b, built-in MIDI}
+																																	<
+																																}
+	
+																															<
+																														}
+	
+																													<
+																												}
+	
+																											<
+																										}
+	
+																									<
+																								}
+	
+																							<
+																						}
+	
+																					<
+																				}
+	
+																			<
+																		}
+	
+																	<
+																}
+	
+															<
+														}
+	
+													<
+												}
+	
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[S string 0 0 b {} eq CD]} {
+		>
+			if {[N uleshort 2 0 0 {} {} > 16]} {
+				>
+					if {[N uleshort 2 0 0 {} {} < 16384]} {
+						>
+							if {[N uleshort 4 0 0 {} {} < 16384]} {
+								>
+									if {[N uleshort 6 0 0 {} {} < 16384]} {
+										>
+											if {[N ubyte 8 0 0 {} {} == 195]} {
+												>
+													if {[N uleshort 9 0 0 {} {} < 16384]} {
+														>
+															if {[N ubyte 16 0 0 {} {} == 195]} {
+																>
+																	if {[N uleshort 17 0 0 {} {} < 16384]} {
+																		>
+																			if {[N ubyte 20 0 0 {} {} == 195]} {
+																				>
+																					if {[N uleshort 21 0 0 {} {} < 16384]} {
+																						>
+																							emit {MSX2/2+/TR SubROM}
+																						<
+																					}
+	
+																				<
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0]} {
+		>
+			if {[N ubequad 1520 0 0 {} {} == 9404222467904897024]} {
+				>
+					if {[N ubyte 336 0 0 {} {} == 56]} {
+						>
+							if {[S string 368 0 {} {} eq \20\20\20]} {
+								>
+									if {[S string 7730 0 {} {} eq ())]} {
+										>
+											if {[N ubequad 8496 0 0 {} {} == 11936044558089132039]} {
+												>
+												<
+											}
+	
+											if {[N ubequad 8504 0 0 {} {} == 5353148437523607744]} {
+												>
+													emit {MSX Kanji Font}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq AB]} {
+		>
+			switch [Nv uleshort 2 0 {} {}] {
+				16 {
+					>
+						emit {MSX ROM}
+						if {[N uleshort 2 0 0 {} {} x {}]} {
+							>
+								emit {\b, init=0x%4x}
+							<
+						}
+	
+						if {[N uleshort 4 0 0 {} {} > 0]} {
+							>
+								emit {\b, stahdl=0x%4x}
+							<
+						}
+	
+						if {[N uleshort 6 0 0 {} {} > 0]} {
+							>
+								emit {\b, devhdl=0x%4x}
+							<
+						}
+	
+						if {[N uleshort 8 0 0 {} {} > 0]} {
+							>
+								emit {\b, bas=0x%4x}
+							<
+						}
+	
+					<
+				}
+				16400 {
+					>
+						emit {MSX ROM}
+						if {[N uleshort 2 0 0 {} {} x {}]} {
+							>
+								emit {\b, init=0x%04x}
+							<
+						}
+	
+						if {[N uleshort 4 0 0 {} {} > 0]} {
+							>
+								emit {\b, stahdl=0x%04x}
+							<
+						}
+	
+						if {[N uleshort 6 0 0 {} {} > 0]} {
+							>
+								emit {\b, devhdl=0x%04x}
+							<
+						}
+	
+						if {[N uleshort 8 0 0 {} {} > 0]} {
+							>
+								emit {\b, bas=0x%04x}
+							<
+						}
+	
+					<
+				}
+				32784 {
+					>
+						emit {MSX ROM}
+						if {[N uleshort 2 0 0 {} {} x {}]} {
+							>
+								emit {\b, init=0x%04x}
+							<
+						}
+	
+						if {[N uleshort 4 0 0 {} {} > 0]} {
+							>
+								emit {\b, stahdl=0x%04x}
+							<
+						}
+	
+						if {[N uleshort 6 0 0 {} {} > 0]} {
+							>
+								emit {\b, devhdl=0x%04x}
+							<
+						}
+	
+						if {[N uleshort 8 0 0 {} {} > 0]} {
+							>
+								emit {\b, bas=0x%04x}
+							<
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq AB\0\0]} {
+		>
+			if {[N uleshort 6 0 0 {} {} == 0]} {
+				>
+					if {[N uleshort 4 0 0 {} {} > 16399]} {
+						>
+							emit {MSX-BASIC extension ROM}
+							if {[N uleshort 4 0 0 {} {} > 0]} {
+								>
+									emit {\b, stahdl=0x%04x}
+								<
+							}
+	
+							if {[N uleshort 6 0 0 {} {} > 0]} {
+								>
+									emit {\b, devhdl=0x%04x}
+								<
+							}
+	
+							if {[S string 28 0 {} {} eq OPLL]} {
+								>
+									emit {\b, MSX-Music}
+									if {[S string 24 0 {} {} eq PAC2]} {
+										>
+											emit {\b (external)}
+										<
+									}
+	
+									if {[S string 24 0 {} {} eq APRL]} {
+										>
+											emit {\b (internal)}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq AB\0\0\0\0]} {
+		>
+			if {[N uleshort 6 0 0 {} {} > 16399]} {
+				>
+					emit {MSX device BIOS}
+					if {[N uleshort 6 0 0 {} {} > 0]} {
+						>
+							emit {\b, devhdl=0x%04x}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq AB]} {
+		>
+			if {[N uleshort 2 0 0 {} {} > 15]} {
+				>
+					if {[N uleshort 2 0 0 {} {} < 49152]} {
+						>
+							if {[S string 8 0 {} {} eq \0\0\0\0\0\0\0\0]} {
+								>
+									if {[N uleshort [I 2 uleshort 0 & 0 16383] 0 0 {} {} > 0]} {
+										>
+											emit {MSX ROM}
+											if {[S string 16 0 {} {} eq YZ\0\0\0\0]} {
+												>
+													emit {Konami Game Master 2 MSX ROM}
+												<
+											}
+	
+											if {[S string 16 0 {} {} eq CD]} {
+												>
+													emit {\b, Konami RC-}
+													if {[N ubyte 18 0 0 {} {} x {}]} {
+														>
+															emit {\b%d}
+														<
+													}
+	
+													if {[N ubyte 19 0 0 / 16 x {}]} {
+														>
+															emit {\b%d}
+														<
+													}
+	
+													if {[N ubyte 19 0 0 & 15 x {}]} {
+														>
+															emit {\b%d}
+														<
+													}
+	
+												<
+											}
+	
+											if {[S string 16 0 {} {} eq EF]} {
+												>
+													emit {\b, Konami RC-}
+													if {[N ubyte 18 0 0 {} {} x {}]} {
+														>
+															emit {\b%d}
+														<
+													}
+	
+													if {[N ubyte 19 0 0 / 16 x {}]} {
+														>
+															emit {\b%d}
+														<
+													}
+	
+													if {[N ubyte 19 0 0 & 15 x {}]} {
+														>
+															emit {\b%d}
+														<
+													}
+	
+												<
+											}
+	
+											if {[N uleshort 2 0 0 {} {} x {}]} {
+												>
+													emit {\b, init=0x%04x}
+												<
+											}
+	
+											if {[N uleshort 4 0 0 {} {} > 0]} {
+												>
+													emit {\b, stahdl=0x%04x}
+												<
+											}
+	
+											if {[N uleshort 6 0 0 {} {} > 0]} {
+												>
+													emit {\b, devhdl=0x%04x}
+												<
+											}
+	
+											if {[N uleshort 8 0 0 {} {} > 0]} {
+												>
+													emit {\b, bas=0x%04x}
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+							if {[N uleshort 2 0 0 {} {} == 0]} {
+								>
+									if {[N uleshort 4 0 0 {} {} == 0]} {
+										>
+											if {[N uleshort 6 0 0 {} {} == 0]} {
+												>
+													if {[N uleshort 8 0 0 {} {} > 0]} {
+														>
+															emit {MSX BASIC program in ROM, bas=0x%04x}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 16384 0 b {} eq AB]} {
+		>
+			if {[N uleshort 16386 0 0 {} {} > 16399]} {
+				>
+					if {[S string 16394 0 {} {} eq \0\0\0\0\0\0]} {
+						>
+							emit {MSX ROM with nonstandard page order}
+							if {[N uleshort 16386 0 0 {} {} x {}]} {
+								>
+									emit {\b, init=0x%04x}
+								<
+							}
+	
+							if {[N uleshort 16388 0 0 {} {} > 0]} {
+								>
+									emit {\b, stahdl=0x%04x}
+								<
+							}
+	
+							if {[N uleshort 16390 0 0 {} {} > 0]} {
+								>
+									emit {\b, devhdl=0x%04x}
+								<
+							}
+	
+							if {[N uleshort 16392 0 0 {} {} > 0]} {
+								>
+									emit {\b, bas=0x%04x}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 32768 0 b {} eq AB]} {
+		>
+			if {[N uleshort 32770 0 0 {} {} > 16399]} {
+				>
+					if {[S string 32778 0 {} {} eq \0\0\0\0\0\0]} {
+						>
+							emit {MSX ROM with nonstandard page order}
+							if {[N uleshort 32770 0 0 {} {} x {}]} {
+								>
+									emit {\b, init=0x%04x}
+								<
+							}
+	
+							if {[N uleshort 32772 0 0 {} {} > 0]} {
+								>
+									emit {\b, stahdl=0x%04x}
+								<
+							}
+	
+							if {[N uleshort 32774 0 0 {} {} > 0]} {
+								>
+									emit {\b, devhdl=0x%04x}
+								<
+							}
+	
+							if {[N uleshort 32776 0 0 {} {} > 0]} {
+								>
+									emit {\b, bas=0x%04x}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 245760 0 b {} eq AB]} {
+		>
+			if {[S string 245768 0 {} {} eq \0\0\0\0\0\0\0\0]} {
+				>
+					emit {MSX MegaROM with nonstandard page order}
+					if {[N uleshort 245762 0 0 {} {} x {}]} {
+						>
+							emit {\b, init=0x%04x}
+						<
+					}
+	
+					if {[N uleshort 245764 0 0 {} {} > 0]} {
+						>
+							emit {\b, stahdl=0x%04x}
+						<
+					}
+	
+					if {[N uleshort 245766 0 0 {} {} > 0]} {
+						>
+							emit {\b, devhdl=0x%04x}
+						<
+					}
+	
+					if {[N uleshort 245768 0 0 {} {} > 0]} {
+						>
+							emit {\b, bas=0x%04x}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \x1F\xA6\xDE\xBA\xCC\x13\x7D\x74]} {
+		>
+			emit {MSX cassette archive}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ExecROM\ patchfile\x1A]} {
+		>
+			emit {MSX ExecROM patchfile}
+			if {[N ubyte 18 0 0 / 16 x {}]} {
+				>
+					emit v%d
+				<
+			}
+	
+			if {[N ubyte 18 0 0 & 15 x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+			if {[N ubyte 19 0 0 {} {} x {}]} {
+				>
+					emit {\b, contains %d patches}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N uleshort 4 0 0 {} {} == 2304]} {
+		>
+			if {[N byte 15 0 0 {} {} == 1]} {
+				>
+					if {[N byte 20 0 0 {} {} == 0]} {
+						>
+							if {[S string 30 0 {} {} eq \040\040\040]} {
+								>
+									if {[N byte 35 0 0 {} {} == 1]} {
+										>
+											if {[N byte 37 0 0 {} {} == 0]} {
+												>
+													if {[S string 21 0 {} {} > \x30]} {
+														>
+															if {[S string 21 0 {} {} < \x5A]} {
+																>
+																	emit {Konami King's Valley-2 custom stage, title: "%-8.8s"}
+																	if {[N byte 29 0 0 {} {} < 32]} {
+																		>
+																			emit {\b, theme: %d}
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq //!Mup]} {
+		>
+			emit {Mup music publication program input text}
+			if {[S string 6 0 {} {} eq -Arkkra]} {
+				>
+					emit (Arkkra)
+					if {[S string 13 0 {} {} eq -]} {
+						>
+							if {[S string 16 0 {} {} eq .]} {
+								>
+									if {[S string 14 0 {} {} x {}]} {
+										>
+											emit {\b, need V%.4s}
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string 15 0 {} {} eq .]} {
+								>
+									if {[S string 14 0 {} {} x {}]} {
+										>
+											emit {\b, need V%.3s}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 6 0 {} {} eq -]} {
+				>
+					if {[S string 9 0 {} {} eq .]} {
+						>
+							if {[S string 7 0 {} {} x {}]} {
+								>
+									emit {\b, need V%.4s}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string 8 0 {} {} eq .]} {
+						>
+							if {[S string 7 0 {} {} x {}]} {
+								>
+									emit {\b, need V%.3s}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Bagpipe]} {
+		>
+			emit Bagpipe
+			if {[S string 8 0 {} {} eq Reader]} {
+				>
+					emit Reader
+					if {[S string 15 0 {} {} > \0]} {
+						>
+							emit {(version %.3s)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq Music\ Writer]} {
+				>
+					emit {Music Writer}
+					if {[S string 20 0 {} {} eq :]} {
+						>
+							if {[S string 21 0 {} {} > \0]} {
+								>
+									emit {(version %.3s)}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string 21 0 {} {} eq Gold]} {
+						>
+							emit Gold
+							if {[S string 25 0 {} {} eq :]} {
+								>
+									if {[S string 26 0 {} {} > \0]} {
+										>
+											emit {(version %.3s)}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DAF/SPK]} {
+		>
+			emit {NASA SPICE file (binary format)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DAFETF\ NAIF\ DAF\ ENCODED]} {
+		>
+			emit {NASA SPICE file (transfer format)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RSRC]} {
+		>
+			emit {National Instruments,}
+			if {[S string 8 0 {} {} eq LV]} {
+				>
+					emit {LabVIEW File,}
+					if {[S string 10 0 {} {} eq SB]} {
+						>
+							emit {Code Resource File, data}
+						<
+					}
+	
+					if {[S string 10 0 {} {} eq IN]} {
+						>
+							emit {Virtual Instrument Program, data}
+						<
+					}
+	
+					if {[S string 10 0 {} {} eq AR]} {
+						>
+							emit {VI Library, data}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq LMNULBVW]} {
+				>
+					emit {Portable File Names, data}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq rsc]} {
+				>
+					emit {Resources File, data}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq VMAP]} {
+		>
+			emit {National Instruments, VXI File, data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NEKO]} {
+		>
+			emit {NekoVM bytecode}
+			if {[N lelong 4 0 0 {} {} x {}]} {
+				>
+					emit {(%d global symbols,}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit {%d global fields,}
+				<
+			}
+	
+			if {[N lelong 12 0 0 {} {} x {}]} {
+				>
+					emit {%d bytecode ops)}
+					mime application/x-nekovm-bytecode
+				<
+			}
+	
+		<
+	}
+	
+	switch [Nv belong 0 0 & 67108863] {
+		8782087 {
+			>
+				emit {a.out NetBSD/i386}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						if {[N byte 0 0 0 {} {} & 64]} {
+							>
+								emit {position independent}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} != 0]} {
+							>
+								emit executable
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} == 0]} {
+							>
+								emit {object file}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8782088 {
+			>
+				emit {a.out NetBSD/i386 pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8782091 {
+			>
+				emit {a.out NetBSD/i386 demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N lelong 20 0 0 {} {} < 4096]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} == 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} > 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8782151 {
+			>
+				emit {a.out NetBSD/i386 core}
+				if {[S string 12 0 {} {} > \0]} {
+					>
+						emit {from '%s'}
+					<
+				}
+	
+				if {[N lelong 32 0 0 {} {} != 0]} {
+					>
+						emit {(signal %d)}
+					<
+				}
+	
+			<
+		}
+		8847623 {
+			>
+				emit {a.out NetBSD/m68k}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						if {[N byte 0 0 0 {} {} & 64]} {
+							>
+								emit {position independent}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} != 0]} {
+							>
+								emit executable
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} == 0]} {
+							>
+								emit {object file}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8847624 {
+			>
+				emit {a.out NetBSD/m68k pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8847627 {
+			>
+				emit {a.out NetBSD/m68k demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N belong 20 0 0 {} {} < 8192]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} == 8192]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} > 8192]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8847687 {
+			>
+				emit {a.out NetBSD/m68k core}
+				if {[S string 12 0 {} {} > \0]} {
+					>
+						emit {from '%s'}
+					<
+				}
+	
+				if {[N belong 32 0 0 {} {} != 0]} {
+					>
+						emit {(signal %d)}
+					<
+				}
+	
+			<
+		}
+		8913159 {
+			>
+				emit {a.out NetBSD/m68k4k}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						if {[N byte 0 0 0 {} {} & 64]} {
+							>
+								emit {position independent}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} != 0]} {
+							>
+								emit executable
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} == 0]} {
+							>
+								emit {object file}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8913160 {
+			>
+				emit {a.out NetBSD/m68k4k pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8913163 {
+			>
+				emit {a.out NetBSD/m68k4k demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N belong 20 0 0 {} {} < 4096]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} == 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} > 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8913223 {
+			>
+				emit {a.out NetBSD/m68k4k core}
+				if {[S string 12 0 {} {} > \0]} {
+					>
+						emit {from '%s'}
+					<
+				}
+	
+				if {[N belong 32 0 0 {} {} != 0]} {
+					>
+						emit {(signal %d)}
+					<
+				}
+	
+			<
+		}
+		8978695 {
+			>
+				emit {a.out NetBSD/ns32532}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						if {[N byte 0 0 0 {} {} & 64]} {
+							>
+								emit {position independent}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} != 0]} {
+							>
+								emit executable
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} == 0]} {
+							>
+								emit {object file}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8978696 {
+			>
+				emit {a.out NetBSD/ns32532 pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8978699 {
+			>
+				emit {a.out NetBSD/ns32532 demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N lelong 20 0 0 {} {} < 4096]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} == 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} > 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		8978759 {
+			>
+				emit {a.out NetBSD/ns32532 core}
+				if {[S string 12 0 {} {} > \0]} {
+					>
+						emit {from '%s'}
+					<
+				}
+	
+				if {[N lelong 32 0 0 {} {} != 0]} {
+					>
+						emit {(signal %d)}
+					<
+				}
+	
+			<
+		}
+		9044231 {
+			>
+				emit {a.out NetBSD/SPARC}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						if {[N byte 0 0 0 {} {} & 64]} {
+							>
+								emit {position independent}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} != 0]} {
+							>
+								emit executable
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} == 0]} {
+							>
+								emit {object file}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9044232 {
+			>
+				emit {a.out NetBSD/SPARC pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9044235 {
+			>
+				emit {a.out NetBSD/SPARC demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N belong 20 0 0 {} {} < 8192]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} == 8192]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} > 8192]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9044295 {
+			>
+				emit {a.out NetBSD/SPARC core}
+				if {[S string 12 0 {} {} > \0]} {
+					>
+						emit {from '%s'}
+					<
+				}
+	
+				if {[N belong 32 0 0 {} {} != 0]} {
+					>
+						emit {(signal %d)}
+					<
+				}
+	
+			<
+		}
+		9109767 {
+			>
+				emit {a.out NetBSD/pmax}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						if {[N byte 0 0 0 {} {} & 64]} {
+							>
+								emit {position independent}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} != 0]} {
+							>
+								emit executable
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} == 0]} {
+							>
+								emit {object file}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9109768 {
+			>
+				emit {a.out NetBSD/pmax pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9109771 {
+			>
+				emit {a.out NetBSD/pmax demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N lelong 20 0 0 {} {} < 4096]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} == 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} > 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9109831 {
+			>
+				emit {a.out NetBSD/pmax core}
+				if {[S string 12 0 {} {} > \0]} {
+					>
+						emit {from '%s'}
+					<
+				}
+	
+				if {[N lelong 32 0 0 {} {} != 0]} {
+					>
+						emit {(signal %d)}
+					<
+				}
+	
+			<
+		}
+		9175303 {
+			>
+				emit {a.out NetBSD/vax 1k}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						if {[N byte 0 0 0 {} {} & 64]} {
+							>
+								emit {position independent}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} != 0]} {
+							>
+								emit executable
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} == 0]} {
+							>
+								emit {object file}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9175304 {
+			>
+				emit {a.out NetBSD/vax 1k pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9175307 {
+			>
+				emit {a.out NetBSD/vax 1k demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N lelong 20 0 0 {} {} < 4096]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} == 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} > 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9175367 {
+			>
+				emit {a.out NetBSD/vax 1k core}
+				if {[S string 12 0 {} {} > \0]} {
+					>
+						emit {from '%s'}
+					<
+				}
+	
+				if {[N lelong 32 0 0 {} {} != 0]} {
+					>
+						emit {(signal %d)}
+					<
+				}
+	
+			<
+		}
+		9240903 {
+			>
+				emit {a.out NetBSD/alpha core}
+				if {[S string 12 0 {} {} > \0]} {
+					>
+						emit {from '%s'}
+					<
+				}
+	
+				if {[N lelong 32 0 0 {} {} != 0]} {
+					>
+						emit {(signal %d)}
+					<
+				}
+	
+			<
+		}
+		9306375 {
+			>
+				emit {a.out NetBSD/mips}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						if {[N byte 0 0 0 {} {} & 64]} {
+							>
+								emit {position independent}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} != 0]} {
+							>
+								emit executable
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} == 0]} {
+							>
+								emit {object file}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9306376 {
+			>
+				emit {a.out NetBSD/mips pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9306379 {
+			>
+				emit {a.out NetBSD/mips demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N belong 20 0 0 {} {} < 8192]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} == 8192]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N belong 20 0 0 {} {} > 8192]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N belong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9306439 {
+			>
+				emit {a.out NetBSD/mips core}
+				if {[S string 12 0 {} {} > \0]} {
+					>
+						emit {from '%s'}
+					<
+				}
+	
+				if {[N belong 32 0 0 {} {} != 0]} {
+					>
+						emit {(signal %d)}
+					<
+				}
+	
+			<
+		}
+		9371911 {
+			>
+				emit {a.out NetBSD/arm32}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						if {[N byte 0 0 0 {} {} & 64]} {
+							>
+								emit {position independent}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} != 0]} {
+							>
+								emit executable
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} == 0]} {
+							>
+								emit {object file}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9371912 {
+			>
+				emit {a.out NetBSD/arm32 pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9371915 {
+			>
+				emit {a.out NetBSD/arm32 demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N lelong 20 0 0 {} {} < 4096]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} == 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} > 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9371975 {
+			>
+				emit {a.out NetBSD/arm core}
+				if {[S string 12 0 {} {} > \0]} {
+					>
+						emit {from '%s'}
+					<
+				}
+	
+				if {[N lelong 32 0 0 {} {} != 0]} {
+					>
+						emit {(signal %d)}
+					<
+				}
+	
+			<
+		}
+		9765191 {
+			>
+				emit {a.out NetBSD/powerpc core}
+				if {[S string 12 0 {} {} > \0]} {
+					>
+						emit {from '%s'}
+					<
+				}
+	
+			<
+		}
+		9830663 {
+			>
+				emit {a.out NetBSD/vax 4k}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						if {[N byte 0 0 0 {} {} & 64]} {
+							>
+								emit {position independent}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} != 0]} {
+							>
+								emit executable
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} == 0]} {
+							>
+								emit {object file}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9830664 {
+			>
+				emit {a.out NetBSD/vax 4k pure}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						emit {dynamically linked executable}
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9830667 {
+			>
+				emit {a.out NetBSD/vax 4k demand paged}
+				if {[N byte 0 0 0 {} {} & -128]} {
+					>
+						if {[N lelong 20 0 0 {} {} < 4096]} {
+							>
+								emit {shared library}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} == 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+						if {[N lelong 20 0 0 {} {} > 4096]} {
+							>
+								emit {dynamically linked executable}
+							<
+						}
+	
+					<
+				}
+	
+				if {[N byte 0 0 0 {} {} ^ -128]} {
+					>
+						emit executable
+					<
+				}
+	
+				if {[N lelong 16 0 0 {} {} > 0]} {
+					>
+						emit {not stripped}
+					<
+				}
+	
+			<
+		}
+		9830727 {
+			>
+				emit {a.out NetBSD/vax 4k core}
+				if {[S string 12 0 {} {} > \0]} {
+					>
+						emit {from '%s'}
+					<
+				}
+	
+				if {[N lelong 32 0 0 {} {} != 0]} {
+					>
+						emit {(signal %d)}
+					<
+				}
+	
+			<
+		}
+	}
+	
+	if {[N belong 0 0 0 & 65535 == 36810]} {
+		>
+			emit {NetBSD kernel core file}
+			switch [Nv belong 0 0 & 67043328] {
+				0 {
+					>
+						emit {\b, Unknown}
+					<
+				}
+				65536 {
+					>
+						emit {\b, sun 68010/68020}
+					<
+				}
+				131072 {
+					>
+						emit {\b, sun 68020}
+					<
+				}
+				6553600 {
+					>
+						emit {\b, 386 PC}
+					<
+				}
+				8781824 {
+					>
+						emit {\b, i386 BSD}
+					<
+				}
+				8847360 {
+					>
+						emit {\b, m68k BSD (8K pages)}
+					<
+				}
+				8912896 {
+					>
+						emit {\b, m68k BSD (4K pages)}
+					<
+				}
+				8978432 {
+					>
+						emit {\b, ns32532 BSD}
+					<
+				}
+				9043968 {
+					>
+						emit {\b, SPARC/32 BSD}
+					<
+				}
+				9109504 {
+					>
+						emit {\b, pmax BSD}
+					<
+				}
+				9175040 {
+					>
+						emit {\b, vax BSD (1K pages)}
+					<
+				}
+				9240576 {
+					>
+						emit {\b, alpha BSD}
+					<
+				}
+				9306112 {
+					>
+						emit {\b, mips BSD (Big Endian)}
+					<
+				}
+				9371648 {
+					>
+						emit {\b, arm6 BSD}
+					<
+				}
+				9437184 {
+					>
+						emit {\b, m68k BSD (2K pages)}
+					<
+				}
+				9502720 {
+					>
+						emit {\b, sh3 BSD}
+					<
+				}
+				9568256 {
+					>
+						emit {\b, parisc BSD}
+					<
+				}
+				9764864 {
+					>
+						emit {\b, ppc BSD (Big Endian)}
+					<
+				}
+				9830400 {
+					>
+						emit {\b, vax BSD (4K pages)}
+					<
+				}
+				9895936 {
+					>
+						emit {\b, mips1 BSD}
+					<
+				}
+				9961472 {
+					>
+						emit {\b, mips2 BSD}
+					<
+				}
+				10027008 {
+					>
+						emit {\b, m88k BSD}
+					<
+				}
+				10158080 {
+					>
+						emit {\b, sh5/64 BSD}
+					<
+				}
+				10223616 {
+					>
+						emit {\b, SPARC/64 BSD}
+					<
+				}
+				10289152 {
+					>
+						emit {\b, amd64 BSD}
+					<
+				}
+				10354688 {
+					>
+						emit {\b, sh5/32 BSD}
+					<
+				}
+				10420224 {
+					>
+						emit {\b, ia64 BSD}
+					<
+				}
+				11993088 {
+					>
+						emit {\b, aarch64 BSD}
+					<
+				}
+				12058624 {
+					>
+						emit {\b, or1k BSD}
+					<
+				}
+				12124160 {
+					>
+						emit {\b, Risk-V BSD}
+					<
+				}
+				13107200 {
+					>
+						emit {\b, hp200 BSD}
+					<
+				}
+				19660800 {
+					>
+						emit {\b, hp300 BSD}
+					<
+				}
+				34275328 {
+					>
+						emit {\b, hp800 HP-UX}
+					<
+				}
+				34340864 {
+					>
+						emit {\b, hp200/hp300 HP-UX}
+					<
+				}
+			}
+	
+			switch [Nv belong 0 0 & -67108864] {
+				67108864 {
+					>
+						emit {\b, CPU}
+					<
+				}
+				134217728 {
+					>
+						emit {\b, DATA}
+					<
+				}
+				268435456 {
+					>
+						emit {\b, STACK}
+					<
+				}
+			}
+	
+			if {[N leshort 4 0 0 {} {} x {}]} {
+				>
+					emit {\b, (headersize = %d}
+				<
+			}
+	
+			if {[N leshort 6 0 0 {} {} x {}]} {
+				>
+					emit {\b, segmentsize = %d}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit {\b, segments = %d)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 56 0 {} {} eq netbsd]} {
+		>
+			U 173 ktrace 0
+	
+		<
+	}
+	
+	if {[S string 56 0 {} {} eq linux]} {
+		>
+			U 173 ktrace 0
+	
+		<
+	}
+	
+	if {[S string 56 0 {} {} eq sunos]} {
+		>
+			U 173 ktrace 0
+	
+		<
+	}
+	
+	if {[S string 56 0 {} {} eq hpux]} {
+		>
+			U 173 ktrace 0
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000\017\102\104\000\000\000\000\000\000\001\000\000\000\000\002\000\000\000\002\000\000\004\000]} {
+		>
+			emit {Netscape Address book}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000\017\102\111]} {
+		>
+			emit {Netscape Communicator address book}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ Netscape\ folder\ cache]} {
+		>
+			emit {Netscape folder cache}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000\036\204\220\000]} {
+		>
+			emit {Netscape folder cache}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SX961999]} {
+		>
+			emit Net2phone
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq JG\004\016\0\0\0\0]} {
+		>
+			emit {AOL ART image}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq JG\003\016\0\0\0\0]} {
+		>
+			emit {AOL ART image}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NetWare\ Loadable\ Module]} {
+		>
+			emit {NetWare Loadable Module}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq StartFontMetrics]} {
+		>
+			emit {ASCII font metrics}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq StartFont]} {
+		>
+			emit {ASCII font bits}
+		<
+	}
+	
+	switch [Nv belong 8 0 {} {}] {
+		326773573 {
+			>
+				emit {X11/NeWS bitmap font}
+			<
+		}
+		326773576 {
+			>
+				emit {X11/NeWS font family}
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq NPFF]} {
+		>
+			emit {NItpicker Flow File}
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit V%d.
+				<
+			}
+	
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit %d
+				<
+			}
+	
+			if {[N bedate 6 0 0 {} {} x {}]} {
+				>
+					emit {started: %s}
+				<
+			}
+	
+			if {[N bedate 10 0 0 {} {} x {}]} {
+				>
+					emit {stopped: %s}
+				<
+			}
+	
+			if {[N belong 14 0 0 {} {} x {}]} {
+				>
+					emit {Bytes: %u}
+				<
+			}
+	
+			if {[N belong 18 0 0 {} {} x {}]} {
+				>
+					emit {Bytes1: %u}
+				<
+			}
+	
+			if {[N belong 22 0 0 {} {} x {}]} {
+				>
+					emit {Flows: %u}
+				<
+			}
+	
+			if {[N belong 26 0 0 {} {} x {}]} {
+				>
+					emit {Pkts: %u}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %SEMI-OASIS\r\n]} {
+		>
+			emit {OASIS Stream file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Caml1999]} {
+		>
+			emit OCaml
+			if {[S string 8 0 {} {} eq X]} {
+				>
+					emit {exec file}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq I]} {
+				>
+					emit {interface file (.cmi)}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq O]} {
+				>
+					emit {object file (.cmo)}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq A]} {
+				>
+					emit {library file (.cma)}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq Y]} {
+				>
+					emit {native object file (.cmx)}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq Z]} {
+				>
+					emit {native library file (.cmxa)}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq M]} {
+				>
+					emit {abstract syntax tree implementation file}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq N]} {
+				>
+					emit {abstract syntax tree interface file}
+				<
+			}
+	
+			if {[S string 9 0 {} {} > \0]} {
+				>
+					emit {(Version %3.3s)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Octave-1-L]} {
+		>
+			emit {Octave binary data (little endian)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Octave-1-B]} {
+		>
+			emit {Octave binary data (big endian)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \320\317\021\340\241\261\032\341]} {
+		>
+			emit {OLE 2 Compound Document}
+			if {[S string 1152 0 {} {} eq D\000g\000n\000~\000H]} {
+				>
+					emit {: Microstation V8 DGN}
+				<
+			}
+	
+			if {[S string 1152 0 {} {} eq V\000i\000s\000i\000o\000D\000o\000c]} {
+				>
+					emit {: Visio Document}
+				<
+			}
+	
+			if {[S string 546 0 {} {} eq bjbj]} {
+				>
+					emit {: Microsoft Word Document}
+					mime application/msword
+					ext doc/dot
+				<
+			}
+	
+			if {[S string 546 0 {} {} eq jbjb]} {
+				>
+					emit {: Microsoft Word Document}
+					mime application/msword
+					ext doc
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \177OLF]} {
+		>
+			emit OLF
+			switch [Nv byte 4 0 {} {}] {
+				0 {
+					>
+						emit {invalid class}
+					<
+				}
+				1 {
+					>
+						emit 32-bit
+					<
+				}
+				2 {
+					>
+						emit 64-bit
+					<
+				}
+			}
+	
+			switch [Nv byte 7 0 {} {}] {
+				0 {
+					>
+						emit {invalid os}
+					<
+				}
+				1 {
+					>
+						emit OpenBSD
+					<
+				}
+				2 {
+					>
+						emit NetBSD
+					<
+				}
+				3 {
+					>
+						emit FreeBSD
+					<
+				}
+				4 {
+					>
+						emit 4.4BSD
+					<
+				}
+				5 {
+					>
+						emit Linux
+					<
+				}
+				6 {
+					>
+						emit SVR4
+					<
+				}
+				7 {
+					>
+						emit esix
+					<
+				}
+				8 {
+					>
+						emit Solaris
+					<
+				}
+				9 {
+					>
+						emit Irix
+					<
+				}
+				10 {
+					>
+						emit SCO
+					<
+				}
+				11 {
+					>
+						emit Dell
+					<
+				}
+				12 {
+					>
+						emit NCR
+					<
+				}
+			}
+	
+			switch [Nv byte 5 0 {} {}] {
+				0 {
+					>
+						emit {invalid byte order}
+					<
+				}
+				1 {
+					>
+						emit LSB
+						switch [Nv leshort 16 0 {} {}] {
+							0 {
+								>
+									emit {no file type,}
+								<
+							}
+							1 {
+								>
+									emit relocatable,
+								<
+							}
+							2 {
+								>
+									emit executable,
+								<
+							}
+							3 {
+								>
+									emit {shared object,}
+								<
+							}
+							4 {
+								>
+									emit {core file}
+									if {[S string [I 56 long 0 + 0 204] 0 {} {} > \0]} {
+										>
+											emit {of '%s'}
+										<
+									}
+	
+									if {[N lelong [I 56 long 0 + 0 16] 0 0 {} {} > 0]} {
+										>
+											emit {(signal %d),}
+										<
+									}
+	
+								<
+							}
+						}
+	
+						if {[N leshort 16 0 0 {} {} & -256]} {
+							>
+								emit processor-specific,
+							<
+						}
+	
+						switch [Nv leshort 18 0 {} {}] {
+							-28634 {
+								>
+									emit Alpha,
+								<
+							}
+							0 {
+								>
+									emit {no machine,}
+								<
+							}
+							1 {
+								>
+									emit {AT&T WE32100 - invalid byte order,}
+								<
+							}
+							2 {
+								>
+									emit {SPARC - invalid byte order,}
+								<
+							}
+							3 {
+								>
+									emit {Intel 80386,}
+								<
+							}
+							4 {
+								>
+									emit {Motorola 68000 - invalid byte order,}
+								<
+							}
+							5 {
+								>
+									emit {Motorola 88000 - invalid byte order,}
+								<
+							}
+							6 {
+								>
+									emit {Intel 80486,}
+								<
+							}
+							7 {
+								>
+									emit {Intel 80860,}
+								<
+							}
+							8 {
+								>
+									emit {MIPS R3000_BE - invalid byte order,}
+								<
+							}
+							9 {
+								>
+									emit {Amdahl - invalid byte order,}
+								<
+							}
+							10 {
+								>
+									emit {MIPS R3000_LE,}
+								<
+							}
+							11 {
+								>
+									emit {RS6000 - invalid byte order,}
+								<
+							}
+							15 {
+								>
+									emit {PA-RISC - invalid byte order,}
+								<
+							}
+							16 {
+								>
+									emit nCUBE,
+								<
+							}
+							17 {
+								>
+									emit VPP500,
+								<
+							}
+							18 {
+								>
+									emit SPARC32PLUS,
+								<
+							}
+							20 {
+								>
+									emit PowerPC,
+								<
+							}
+						}
+	
+						switch [Nv lelong 20 0 {} {}] {
+							0 {
+								>
+									emit {invalid version}
+								<
+							}
+							1 {
+								>
+									emit {version 1}
+								<
+							}
+						}
+	
+						if {[N lelong 36 0 0 {} {} == 1]} {
+							>
+								emit {MathCoPro/FPU/MAU Required}
+							<
+						}
+	
+					<
+				}
+				2 {
+					>
+						emit MSB
+						switch [Nv beshort 16 0 {} {}] {
+							0 {
+								>
+									emit {no file type,}
+								<
+							}
+							1 {
+								>
+									emit relocatable,
+								<
+							}
+							2 {
+								>
+									emit executable,
+								<
+							}
+							3 {
+								>
+									emit {shared object,}
+								<
+							}
+							4 {
+								>
+									emit {core file,}
+									if {[S string [I 56 long 0 + 0 204] 0 {} {} > \0]} {
+										>
+											emit {of '%s'}
+										<
+									}
+	
+									if {[N belong [I 56 long 0 + 0 16] 0 0 {} {} > 0]} {
+										>
+											emit {(signal %d),}
+										<
+									}
+	
+								<
+							}
+						}
+	
+						if {[N beshort 16 0 0 {} {} & -256]} {
+							>
+								emit processor-specific,
+							<
+						}
+	
+						switch [Nv beshort 18 0 {} {}] {
+							-28634 {
+								>
+									emit Alpha,
+								<
+							}
+							0 {
+								>
+									emit {no machine,}
+								<
+							}
+							1 {
+								>
+									emit {AT&T WE32100,}
+								<
+							}
+							2 {
+								>
+									emit SPARC,
+								<
+							}
+							3 {
+								>
+									emit {Intel 80386 - invalid byte order,}
+								<
+							}
+							4 {
+								>
+									emit {Motorola 68000,}
+								<
+							}
+							5 {
+								>
+									emit {Motorola 88000,}
+								<
+							}
+							6 {
+								>
+									emit {Intel 80486 - invalid byte order,}
+								<
+							}
+							7 {
+								>
+									emit {Intel 80860,}
+								<
+							}
+							8 {
+								>
+									emit {MIPS R3000_BE,}
+								<
+							}
+							9 {
+								>
+									emit Amdahl,
+								<
+							}
+							10 {
+								>
+									emit {MIPS R3000_LE - invalid byte order,}
+								<
+							}
+							11 {
+								>
+									emit RS6000,
+								<
+							}
+							15 {
+								>
+									emit PA-RISC,
+								<
+							}
+							16 {
+								>
+									emit nCUBE,
+								<
+							}
+							17 {
+								>
+									emit VPP500,
+								<
+							}
+							18 {
+								>
+									emit SPARC32PLUS,
+								<
+							}
+							20 {
+								>
+									emit {PowerPC or cisco 4500,}
+								<
+							}
+							21 {
+								>
+									emit {cisco 7500,}
+								<
+							}
+							24 {
+								>
+									emit {cisco SVIP,}
+								<
+							}
+							25 {
+								>
+									emit {cisco 7200,}
+								<
+							}
+							36 {
+								>
+									emit {cisco 12000,}
+								<
+							}
+						}
+	
+						switch [Nv belong 20 0 {} {}] {
+							0 {
+								>
+									emit {invalid version}
+								<
+							}
+							1 {
+								>
+									emit {version 1}
+								<
+							}
+						}
+	
+						if {[N belong 36 0 0 {} {} == 1]} {
+							>
+								emit {MathCoPro/FPU/MAU Required}
+							<
+						}
+	
+					<
+				}
+			}
+	
+			if {[S string 8 0 {} {} > \0]} {
+				>
+					emit (%s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 1 0 {} 100 eq InternetShortcut]} {
+		>
+			emit {MS Windows 95 Internet shortcut text}
+			if {[S search 17 0 {} 100 eq URL=]} {
+				>
+					emit (URL=<
+					if {[S string [R 0] 0 {} {} x {}]} {
+						>
+							emit {\b%s>)}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HSP\x01\x9b\x00]} {
+		>
+			emit {OS/2 INF}
+			if {[S string 107 0 {} {} > 0]} {
+				>
+					emit (%s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HSP\x10\x9b\x00]} {
+		>
+			emit {OS/2 HLP}
+			if {[S string 107 0 {} {} > 0]} {
+				>
+					emit (%s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xff\xff\xff\xff\x14\0\0\0]} {
+		>
+			emit {OS/2 INI}
+		<
+	}
+	
+	if {[S search 1090 0 {} 7393 eq \x19\xDB\xD8\xE2\xD9\xC4\xE2\xE2\xD7\xC3]} {
+		>
+			emit {IBM OS/400 save file data}
+			switch [Nv byte [R 212] 0 {} {}] {
+				1 {
+					>
+						emit {\b, created with SAVOBJ}
+					<
+				}
+				2 {
+					>
+						emit {\b, created with SAVLIB}
+					<
+				}
+				7 {
+					>
+						emit {\b, created with SAVCFG}
+					<
+				}
+				8 {
+					>
+						emit {\b, created with SAVSECDTA}
+					<
+				}
+				10 {
+					>
+						emit {\b, created with SAVSECDTA}
+					<
+				}
+				11 {
+					>
+						emit {\b, created with SAVDLO}
+					<
+				}
+				13 {
+					>
+						emit {\b, created with SAVLICPGM}
+					<
+				}
+				17 {
+					>
+						emit {\b, created with SAVCHGOBJ}
+					<
+				}
+			}
+	
+			switch [Nv byte [R 213] 0 {} {}] {
+				48 {
+					>
+						emit {\b, at least V2R3 to open}
+					<
+				}
+				49 {
+					>
+						emit {\b, at least V3R0M5 to open}
+					<
+				}
+				52 {
+					>
+						emit {\b, at least V3R1 to open}
+					<
+				}
+				53 {
+					>
+						emit {\b, at least V3R6 to open}
+					<
+				}
+				54 {
+					>
+						emit {\b, at least V3R2 to open}
+					<
+				}
+				58 {
+					>
+						emit {\b, at least V3R7 to open}
+					<
+				}
+				59 {
+					>
+						emit {\b, at least V4R1 to open}
+					<
+				}
+				60 {
+					>
+						emit {\b, at least V4R2 to open}
+					<
+				}
+				61 {
+					>
+						emit {\b, at least V4R1M4 to open}
+					<
+				}
+				62 {
+					>
+						emit {\b, at least V4R3 to open}
+					<
+				}
+				63 {
+					>
+						emit {\b, at least V4R4 to open}
+					<
+				}
+				64 {
+					>
+						emit {\b, at least V4R5 to open}
+					<
+				}
+				65 {
+					>
+						emit {\b, at least V5R1 to open}
+					<
+				}
+				66 {
+					>
+						emit {\b, at least V5R2 to open}
+					<
+				}
+				67 {
+					>
+						emit {\b, at least V5R3 to open}
+					<
+				}
+				68 {
+					>
+						emit {\b, at least V5R4 to open}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq SDocSilX]} {
+		>
+			emit {iSiloX E-book}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq BOOKMOBI]} {
+		>
+			emit {Mobipocket E-book}
+			if {[N belong [I 78 ubelong 0 + 0 0] 0 0 {} {} x {}]} {
+				>
+					if {[S string [R [I [R 80] ubelong 0 - 0 4]] 0 {} {} > \0]} {
+						>
+							emit {"%s"}
+						<
+					}
+	
+				<
+			}
+	
+			U 187 aportisdoc 0
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq TEXtREAd]} {
+		>
+			emit {AportisDoc/PalmDOC E-book}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+			U 187 aportisdoc 0
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq BVokBDIC]} {
+		>
+			emit {BDicty PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq DB99DBOS]} {
+		>
+			emit {DB PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq vIMGView]} {
+		>
+			emit {FireViewer/ImageViewer PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq PmDBPmDB]} {
+		>
+			emit {HanDBase PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq InfoINDB]} {
+		>
+			emit {InfoView PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq ToGoToGo]} {
+		>
+			emit {iSilo PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq JfDbJBas]} {
+		>
+			emit {JFile PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq JfDbJFil]} {
+		>
+			emit {JFile Pro PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq DATALSdb]} {
+		>
+			emit {List PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq Mdb1Mdb1]} {
+		>
+			emit {MobileDB PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq PNRdPPrs]} {
+		>
+			emit {PeanutPress PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq DataPlkr]} {
+		>
+			emit {Plucker PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq DataSprd]} {
+		>
+			emit {QuickSheet PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq SM01SMem]} {
+		>
+			emit {SuperMemo PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq TEXtTlDc]} {
+		>
+			emit {TealDoc PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq InfoTlIf]} {
+		>
+			emit {TealInfo PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq DataTlMl]} {
+		>
+			emit {TealMeal PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq DataTlPt]} {
+		>
+			emit {TealPaint PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq dataTDBP]} {
+		>
+			emit {ThinkDB PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq TdatTide]} {
+		>
+			emit {Tides PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq ToRaTRPW]} {
+		>
+			emit {TomeRaider PalmOS document}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq zTXT]} {
+		>
+			emit {A GutenPalm zTXT e-book}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+			switch [Nv byte [I 78 ubelong 0 + 0 0] 0 {} {}] {
+				0 {
+					>
+						if {[N byte [I 78 ubelong 0 + 0 1] 0 0 {} {} x {}]} {
+							>
+								emit (v0.%02d)
+							<
+						}
+	
+					<
+				}
+				1 {
+					>
+						if {[N byte [I 78 ubelong 0 + 0 1] 0 0 {} {} x {}]} {
+							>
+								emit (v1.%02d)
+								if {[N beshort [I 78 ubelong 0 + 0 10] 0 0 {} {} > 0]} {
+									>
+										if {[N beshort [I 78 ubelong 0 + 0 10] 0 0 {} {} < 2]} {
+											>
+												emit {- 1 bookmark}
+											<
+										}
+	
+										if {[N beshort [I 78 ubelong 0 + 0 10] 0 0 {} {} > 1]} {
+											>
+												emit {- %d bookmarks}
+											<
+										}
+	
+									<
+								}
+	
+								if {[N beshort [I 78 ubelong 0 + 0 14] 0 0 {} {} > 0]} {
+									>
+										if {[N beshort [I 78 ubelong 0 + 0 14] 0 0 {} {} < 2]} {
+											>
+												emit {- 1 annotation}
+											<
+										}
+	
+										if {[N beshort [I 78 ubelong 0 + 0 14] 0 0 {} {} > 1]} {
+											>
+												emit {- %d annotations}
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+			}
+	
+			if {[N byte [I 78 ubelong 0 + 0 0] 0 0 {} {} > 1]} {
+				>
+					emit (v%d.
+					if {[N byte [I 78 ubelong 0 + 0 1] 0 0 {} {} x {}]} {
+						>
+							emit %02d)
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq libr]} {
+		>
+			if {[N beshort 32 0 0 & -66 == 0]} {
+				>
+					if {[S string 0 0 {} {} > \0]} {
+						>
+							emit {Palm OS dynamic library data "%s"}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq ptch]} {
+		>
+			emit {Palm OS operating system patch data}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 60 0 {} {} eq BOOKMOBI]} {
+		>
+			emit {Mobipocket E-book}
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit {"%s"}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N beshort 0 0 0 & 4095 == 2766]} {
+		>
+			emit PARIX
+			switch [Nv byte 0 0 & -16] {
+				-128 {
+					>
+						emit T800
+					<
+				}
+				-112 {
+					>
+						emit T9000
+					<
+				}
+			}
+	
+			switch [Nv byte 19 0 & 2] {
+				0 {
+					>
+						emit object
+					<
+				}
+				2 {
+					>
+						emit executable
+					<
+				}
+			}
+	
+			if {[N byte 19 0 0 & 12 == 0]} {
+				>
+					emit {not stripped}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \376PBC\r\n\032\n]} {
+		>
+			emit {Parrot bytecode}
+			if {[N byte 64 0 0 {} {} x {}]} {
+				>
+					emit %d.
+				<
+			}
+	
+			if {[N byte 72 0 0 {} {} x {}]} {
+				>
+					emit {\b%d,}
+				<
+			}
+	
+			if {[N byte 8 0 0 {} {} > 0]} {
+				>
+					emit {%d byte words,}
+				<
+			}
+	
+			switch [Nv byte 16 0 {} {}] {
+				0 {
+					>
+						emit little-endian,
+					<
+				}
+				1 {
+					>
+						emit big-endian,
+					<
+				}
+			}
+	
+			switch [Nv byte 32 0 {} {}] {
+				0 {
+					>
+						emit {IEEE-754 8 byte double floats,}
+					<
+				}
+				1 {
+					>
+						emit {x86 12 byte long double floats,}
+					<
+				}
+				2 {
+					>
+						emit {IEEE-754 16 byte long double floats,}
+					<
+				}
+				3 {
+					>
+						emit {MIPS 16 byte long double floats,}
+					<
+				}
+				4 {
+					>
+						emit {AIX 16 byte long double floats,}
+					<
+				}
+				5 {
+					>
+						emit {4-byte floats,}
+					<
+				}
+			}
+	
+			if {[N byte 40 0 0 {} {} x {}]} {
+				>
+					emit {Parrot %d.}
+				<
+			}
+	
+			if {[N byte 48 0 0 {} {} x {}]} {
+				>
+					emit {\b%d.}
+				<
+			}
+	
+			if {[N byte 56 0 0 {} {} x {}]} {
+				>
+					emit {\b%d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 8192 eq (input,]} {
+		>
+			emit {Pascal source text}
+			mime text/x-pascal
+		<
+	}
+	
+	if {[S string 0 0 b {} eq MAKI01]} {
+		>
+			emit {Maki-chan v1.}
+			if {[N ubyte 6 0 0 | 32 x {}]} {
+				>
+					emit {\b%c image}
+				<
+			}
+	
+			if {[N ubelong 8 0 0 {} {} > 1077952576]} {
+				>
+					emit {\b, system ID:}
+					if {[N byte 8 0 0 {} {} x {}]} {
+						>
+							emit %c
+						<
+					}
+	
+					if {[N byte 9 0 0 {} {} x {}]} {
+						>
+							emit {\b%c}
+						<
+					}
+	
+					if {[N byte 10 0 0 {} {} x {}]} {
+						>
+							emit {\b%c}
+						<
+					}
+	
+					if {[N byte 11 0 0 {} {} x {}]} {
+						>
+							emit {\b%c}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ubeshort 44 0 0 {} {} x {}]} {
+				>
+					emit {\b, %dx}
+				<
+			}
+	
+			if {[N ubeshort 46 0 0 {} {} x {}]} {
+				>
+					emit {\b%d}
+				<
+			}
+	
+			switch [Nv ubeshort 38 0 & 2] {
+				0 {
+					>
+						emit {\b, 16 paletted RGB colors}
+					<
+				}
+				2 {
+					>
+						emit {\b, 8 fixed RGB colors}
+					<
+				}
+			}
+	
+			if {[N ubeshort 38 0 0 & 1 == 1]} {
+				>
+					emit {\b, 2:1 dot aspect ratio}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq MAKI02\ \ ]} {
+		>
+			emit {Maki-chan v2 image,}
+			if {[N byte 8 0 0 {} {} x {}]} {
+				>
+					emit {system ID: %c}
+				<
+			}
+	
+			if {[N byte 9 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 10 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 11 0 0 {} {} x {}]} {
+				>
+					emit {\b%c,}
+				<
+			}
+	
+			if {[S search 13 0 {} 512 eq \x1A]} {
+				>
+					if {[N ubeshort [R 1] 0 0 {} {} == 836]} {
+						>
+							emit {256x212, 19268 fixed YJK colors}
+						<
+					}
+	
+					if {[N ubeshort [R 1] 0 0 {} {} != 836]} {
+						>
+							if {[N uleshort [R 5] 0 0 + 1 x {}]} {
+								>
+									emit %dx
+								<
+							}
+	
+							if {[N uleshort [R 7] 0 0 + 1 x {}]} {
+								>
+									emit {\b%d,}
+								<
+							}
+	
+							switch [Nv ubyte [R 0] 0 & 134] {
+								0 {
+									>
+										emit {16 paletted RGB colors}
+									<
+								}
+								2 {
+									>
+										emit {8 paletted RGB colors}
+									<
+								}
+								4 {
+									>
+										emit {16 fixed RGB colors}
+									<
+								}
+								6 {
+									>
+										emit {8 fixed RGB colors}
+									<
+								}
+							}
+	
+							switch [Nv ubyte [R 0] 0 & 129] {
+								128 {
+									>
+										emit {256 paletted RGB colors}
+									<
+								}
+								129 {
+									>
+										emit {256 fixed MSX-SCR8 colors}
+									<
+								}
+							}
+	
+							if {[N ubyte [R 0] 0 0 & 1 == 1]} {
+								>
+									emit {\b, 2:1 dot aspect ratio}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 11 0 b {} eq MAJYO]} {
+		>
+			emit {XLD4(Q4) picture}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Pi]} {
+		>
+			if {[S search 2 0 {} 512 eq \x1A]} {
+				>
+					if {[N ubyte [R 0] 0 0 {} {} == 0]} {
+						>
+							switch [Nv ubyte [R 3] 0 {} {}] {
+								4 {
+									>
+										emit {Yanagisawa Pi 16 color picture,}
+									<
+								}
+								8 {
+									>
+										emit {Yanagisawa Pi 256 color picture}
+									<
+								}
+							}
+	
+							if {[N byte [R 4] 0 0 {} {} x {}]} {
+								>
+									emit {system ID: %c}
+								<
+							}
+	
+							if {[N byte [R 5] 0 0 {} {} x {}]} {
+								>
+									emit {\b%c}
+								<
+							}
+	
+							if {[N byte [R 6] 0 0 {} {} x {}]} {
+								>
+									emit {\b%c}
+								<
+							}
+	
+							if {[N byte [R 7] 0 0 {} {} x {}]} {
+								>
+									emit {\b%c,}
+								<
+							}
+	
+							if {[N ubeshort [R 10] 0 0 {} {} x {}]} {
+								>
+									emit %dx
+								<
+							}
+	
+							if {[N ubeshort [R 12] 0 0 {} {} x {}]} {
+								>
+									emit {\b%d}
+								<
+							}
+	
+							if {[N byte [R 4] 0 0 {} {} x {}]} {
+								>
+									emit {system ID: %c}
+								<
+							}
+	
+							if {[N byte [R 5] 0 0 {} {} x {}]} {
+								>
+									emit {\b%c}
+								<
+							}
+	
+							if {[N byte [R 6] 0 0 {} {} x {}]} {
+								>
+									emit {\b%c}
+								<
+							}
+	
+							if {[N byte [R 7] 0 0 {} {} x {}]} {
+								>
+									emit {\b%c,}
+								<
+							}
+	
+							if {[N ubeshort [R 10] 0 0 {} {} x {}]} {
+								>
+									emit %dx
+								<
+							}
+	
+							if {[N ubeshort [R 12] 0 0 {} {} x {}]} {
+								>
+									emit {\b%d}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %PDF-]} {
+		>
+			emit {PDF document}
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %c}
+				<
+			}
+	
+			if {[N byte 7 0 0 {} {} x {}]} {
+				>
+					emit {\b.%c}
+				<
+			}
+	
+			mime application/pdf
+			strength +60
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \012%PDF-]} {
+		>
+			emit {PDF document}
+			if {[N byte 6 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %c}
+				<
+			}
+	
+			if {[N byte 8 0 0 {} {} x {}]} {
+				>
+					emit {\b.%c}
+				<
+			}
+	
+			mime application/pdf
+			strength +60
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %FDF-]} {
+		>
+			emit {FDF document}
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %c}
+				<
+			}
+	
+			if {[N byte 7 0 0 {} {} x {}]} {
+				>
+					emit {\b.%c}
+				<
+			}
+	
+			mime application/vnd.fdf
+			strength +60
+		<
+	}
+	
+	if {[S search 0 0 {} 256 eq %PDF-]} {
+		>
+			emit {PDF document}
+			if {[N byte [R 0] 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %c}
+				<
+			}
+	
+			if {[N byte [R 2] 0 0 {} {} x {}]} {
+				>
+					emit {\b.%c}
+				<
+			}
+	
+			mime application/pdf
+			strength +60
+		<
+	}
+	
+	if {[S search 0 0 {} 1024 eq eval\ \"exec\ perl]} {
+		>
+			emit {Perl script text}
+			mime text/x-perl
+		<
+	}
+	
+	if {[S search 0 0 {} 1024 eq eval\ \"exec\ /bin/perl]} {
+		>
+			emit {Perl script text}
+			mime text/x-perl
+		<
+	}
+	
+	if {[S search 0 0 {} 1024 eq eval\ \"exec\ /usr/bin/perl]} {
+		>
+			emit {Perl script text}
+			mime text/x-perl
+		<
+	}
+	
+	if {[S search 0 0 {} 1024 eq eval\ \"exec\ /usr/local/bin/perl]} {
+		>
+			emit {Perl script text}
+			mime text/x-perl
+		<
+	}
+	
+	if {[S search 0 0 {} 1024 eq eval\ 'exec\ perl]} {
+		>
+			emit {Perl script text}
+			mime text/x-perl
+		<
+	}
+	
+	if {[S search 0 0 {} 1024 eq eval\ 'exec\ /bin/perl]} {
+		>
+			emit {Perl script text}
+			mime text/x-perl
+		<
+	}
+	
+	if {[S search 0 0 {} 1024 eq eval\ 'exec\ /usr/bin/perl]} {
+		>
+			emit {Perl script text}
+			mime text/x-perl
+		<
+	}
+	
+	if {[S search 0 0 {} 1024 eq eval\ 'exec\ /usr/local/bin/perl]} {
+		>
+			emit {Perl script text}
+			mime text/x-perl
+		<
+	}
+	
+	if {[S search 0 0 {} 1024 eq eval\ '(exit\ \$?0)'\ &&\ eval\ 'exec]} {
+		>
+			emit {Perl script text}
+			mime text/x-perl
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#!/usr/bin/env\ perl]} {
+		>
+			emit {Perl script text executable}
+			mime text/x-perl
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#!\ /usr/bin/env\ perl]} {
+		>
+			emit {Perl script text executable}
+			mime text/x-perl
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#!]} {
+		>
+			if {[S regex 0 0 {} {} eq ^\#!.*/bin/perl(\[\[:space:\]\].*)*\$]} {
+				>
+					emit {Perl script text executable}
+					mime text/x-perl
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 8192 eq package]} {
+		>
+			if {[S regex 0 0 {} {} eq ^package\[\ \t\]+\[0-9A-Za-z_:\]+\ *\;]} {
+				>
+					emit {Perl5 module source text}
+					strength {+ 40}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 8192 ne p]} {
+		>
+			if {[S regex 0 0 {} {} eq ^package\[\ \t\]+\[0-9A-Za-z_:\]+\ *\;]} {
+				>
+					if {[S regex 0 0 {} {} eq ^1\ *\;|^(use|sub|my)\ .*\[(\;\{=\]]} {
+						>
+							emit {Perl5 module source text}
+							strength {+ 75}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 W 1024 eq =pod\n]} {
+		>
+			emit {Perl POD document text}
+		<
+	}
+	
+	if {[S search 0 0 W 1024 eq \n=pod\n]} {
+		>
+			emit {Perl POD document text}
+		<
+	}
+	
+	if {[S search 0 0 W 1024 eq =head1\ ]} {
+		>
+			emit {Perl POD document text}
+		<
+	}
+	
+	if {[S search 0 0 W 1024 eq \n=head1\ ]} {
+		>
+			emit {Perl POD document text}
+		<
+	}
+	
+	if {[S search 0 0 W 1024 eq =head2\ ]} {
+		>
+			emit {Perl POD document text}
+		<
+	}
+	
+	if {[S search 0 0 W 1024 eq \n=head2\ ]} {
+		>
+			emit {Perl POD document text}
+		<
+	}
+	
+	if {[S search 0 0 W 1024 eq =encoding\ ]} {
+		>
+			emit {Perl POD document text}
+		<
+	}
+	
+	if {[S search 0 0 W 1024 eq \n=encoding\ ]} {
+		>
+			emit {Perl POD document text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq perl-store]} {
+		>
+			emit {perl Storable (v0.6) data}
+			if {[N byte 4 0 0 {} {} > 0]} {
+				>
+					emit {(net-order %d)}
+					if {[N byte 4 0 0 {} {} & 1]} {
+						>
+							emit (network-ordered)
+						<
+					}
+	
+					switch [Nv byte 4 0 {} {}] {
+						2 {
+							>
+								emit {(major 1)}
+							<
+						}
+						3 {
+							>
+								emit {(major 1)}
+							<
+						}
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq pst0]} {
+		>
+			emit {perl Storable (v0.7) data}
+			if {[N byte 4 0 0 {} {} > 0]} {
+				>
+					if {[N byte 4 0 0 {} {} & 1]} {
+						>
+							emit (network-ordered)
+						<
+					}
+	
+					switch [Nv byte 4 0 {} {}] {
+						4 {
+							>
+								emit {(major 2)}
+							<
+						}
+						5 {
+							>
+								emit {(major 2)}
+							<
+						}
+					}
+	
+					if {[N byte 5 0 0 {} {} > 0]} {
+						>
+							emit {(minor %d)}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PGF]} {
+		>
+			emit {Progressive Graphics image data,}
+			if {[S string 3 0 {} {} eq 2]} {
+				>
+					emit {version %s,}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq 4]} {
+				>
+					emit {version %s,}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq 5]} {
+				>
+					emit {version %s,}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq 6]} {
+				>
+					emit {version %s,}
+					if {[N lelong 8 0 0 {} {} x {}]} {
+						>
+							emit {%d x}
+						<
+					}
+	
+					if {[N lelong 12 0 0 {} {} x {}]} {
+						>
+							emit %d,
+						<
+					}
+	
+					if {[N byte 16 0 0 {} {} x {}]} {
+						>
+							emit {%d levels,}
+						<
+					}
+	
+					if {[N byte 17 0 0 {} {} x {}]} {
+						>
+							emit {compression level %d,}
+						<
+					}
+	
+					if {[N byte 18 0 0 {} {} x {}]} {
+						>
+							emit {%d bpp,}
+						<
+					}
+	
+					if {[N byte 19 0 0 {} {} x {}]} {
+						>
+							emit {%d channels,}
+						<
+					}
+	
+					if {[S clear 20 0 {} {} x {}]} {
+						>
+						<
+					}
+	
+					switch [Nv byte 20 0 {} {}] {
+						-1 {
+							>
+								emit {unknown format,}
+							<
+						}
+						0 {
+							>
+								emit bitmap,
+							<
+						}
+						1 {
+							>
+								emit {gray scale,}
+							<
+						}
+						2 {
+							>
+								emit {indexed color,}
+							<
+						}
+						3 {
+							>
+								emit {RGB color,}
+							<
+						}
+						4 {
+							>
+								emit {CYMK color,}
+							<
+						}
+						5 {
+							>
+								emit {HSL color,}
+							<
+						}
+						6 {
+							>
+								emit {HSB color,}
+							<
+						}
+						7 {
+							>
+								emit multi-channel,
+							<
+						}
+						8 {
+							>
+								emit {duo tone,}
+							<
+						}
+						9 {
+							>
+								emit {LAB color,}
+							<
+						}
+						10 {
+							>
+								emit {gray scale 16,}
+							<
+						}
+						11 {
+							>
+								emit {RGB color 48,}
+							<
+						}
+						12 {
+							>
+								emit {LAB color 48,}
+							<
+						}
+						13 {
+							>
+								emit {CYMK color 64,}
+							<
+						}
+						14 {
+							>
+								emit {deep multi-channel,}
+							<
+						}
+						15 {
+							>
+								emit {duo tone 16,}
+							<
+						}
+						17 {
+							>
+								emit {RGBA color,}
+							<
+						}
+						18 {
+							>
+								emit {gray scale 32,}
+							<
+						}
+						19 {
+							>
+								emit {RGB color 12,}
+							<
+						}
+						20 {
+							>
+								emit {RGB color 16,}
+							<
+						}
+					}
+	
+					if {[D 20]} {
+						>
+							emit format
+							if {[N byte 20 0 0 {} {} x {}]} {
+								>
+									emit {\b %d,}
+								<
+							}
+	
+						<
+					}
+	
+					if {[N byte 21 0 0 {} {} x {}]} {
+						>
+							emit {%d bpc}
+						<
+					}
+	
+				<
+			}
+	
+			mime image/x-pgf
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq ---BEGIN\040PGP\040PUBLIC\040KEY\040BLOCK-]} {
+		>
+			emit {PGP public key block}
+			if {[S search 10 0 {} 100 eq \n\n]} {
+				>
+					U 199 pgp [R 0]
+	
+				<
+			}
+	
+			mime application/pgp-keys
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq -----BEGIN\040PGP\040MESSAGE-]} {
+		>
+			emit {PGP message}
+			if {[S search 10 0 {} 100 eq \n\n]} {
+				>
+					U 199 pgp [R 0]
+	
+				<
+			}
+	
+			mime application/pgp
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq -----BEGIN\040PGP\040SIGNATURE-]} {
+		>
+			emit {PGP signature}
+			if {[S search 10 0 {} 100 eq \n\n]} {
+				>
+					U 199 pgp [R 0]
+	
+				<
+			}
+	
+			mime application/pgp-signature
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x84\x8c\x03]} {
+		>
+			emit {PGP RSA encrypted session key -}
+			if {[N lelong 3 0 0 {} {} x {}]} {
+				>
+					emit {keyid: %X}
+				<
+			}
+	
+			if {[N lelong 7 0 0 {} {} x {}]} {
+				>
+					emit %X
+				<
+			}
+	
+			switch [Nv byte 11 0 {} {}] {
+				1 {
+					>
+						emit {RSA (Encrypt or Sign) 1024b}
+					<
+				}
+				2 {
+					>
+						emit {RSA Encrypt-Only 1024b}
+					<
+				}
+			}
+	
+			if {[S string 12 0 {} {} eq \x04\x00]} {
+				>
+				<
+			}
+	
+			if {[S string 12 0 {} {} eq \x03\xff]} {
+				>
+				<
+			}
+	
+			if {[S string 12 0 {} {} eq \x03\xfe]} {
+				>
+				<
+			}
+	
+			if {[S string 12 0 {} {} eq \x03\xfd]} {
+				>
+				<
+			}
+	
+			if {[S string 12 0 {} {} eq \x03\xfc]} {
+				>
+				<
+			}
+	
+			if {[S string 12 0 {} {} eq \x03\xfb]} {
+				>
+				<
+			}
+	
+			if {[S string 12 0 {} {} eq \x03\xfa]} {
+				>
+				<
+			}
+	
+			if {[S string 12 0 {} {} eq \x03\xf9]} {
+				>
+				<
+			}
+	
+			if {[N byte 142 0 0 {} {} == -46]} {
+				>
+					emit .
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x85\x01\x0c\x03]} {
+		>
+			emit {PGP RSA encrypted session key -}
+			if {[N lelong 4 0 0 {} {} x {}]} {
+				>
+					emit {keyid: %X}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit %X
+				<
+			}
+	
+			switch [Nv byte 12 0 {} {}] {
+				1 {
+					>
+						emit {RSA (Encrypt or Sign) 2048b}
+					<
+				}
+				2 {
+					>
+						emit {RSA Encrypt-Only 2048b}
+					<
+				}
+			}
+	
+			if {[S string 13 0 {} {} eq \x08\x00]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x07\xff]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x07\xfe]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x07\xfd]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x07\xfc]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x07\xfb]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x07\xfa]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x07\xf9]} {
+				>
+				<
+			}
+	
+			if {[N byte 271 0 0 {} {} == -46]} {
+				>
+					emit .
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x85\x01\x8c\x03]} {
+		>
+			emit {PGP RSA encrypted session key -}
+			if {[N lelong 4 0 0 {} {} x {}]} {
+				>
+					emit {keyid: %X}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit %X
+				<
+			}
+	
+			switch [Nv byte 12 0 {} {}] {
+				1 {
+					>
+						emit {RSA (Encrypt or Sign) 3072b}
+					<
+				}
+				2 {
+					>
+						emit {RSA Encrypt-Only 3072b}
+					<
+				}
+			}
+	
+			if {[S string 13 0 {} {} eq \x0c\x00]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0b\xff]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0b\xfe]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0b\xfd]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0b\xfc]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0b\xfb]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0b\xfa]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0b\xf9]} {
+				>
+				<
+			}
+	
+			if {[N byte 399 0 0 {} {} == -46]} {
+				>
+					emit .
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x85\x02\x0c\x03]} {
+		>
+			emit {PGP RSA encrypted session key -}
+			if {[N lelong 4 0 0 {} {} x {}]} {
+				>
+					emit {keyid: %X}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit %X
+				<
+			}
+	
+			switch [Nv byte 12 0 {} {}] {
+				1 {
+					>
+						emit {RSA (Encrypt or Sign) 4096b}
+					<
+				}
+				2 {
+					>
+						emit {RSA Encrypt-Only 4096b}
+					<
+				}
+			}
+	
+			if {[S string 13 0 {} {} eq \x10\x00]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0f\xff]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0f\xfe]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0f\xfd]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0f\xfc]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0f\xfb]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0f\xfa]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x0f\xf9]} {
+				>
+				<
+			}
+	
+			if {[N byte 527 0 0 {} {} == -46]} {
+				>
+					emit .
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x85\x04\x0c\x03]} {
+		>
+			emit {PGP RSA encrypted session key -}
+			if {[N lelong 4 0 0 {} {} x {}]} {
+				>
+					emit {keyid: %X}
+				<
+			}
+	
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit %X
+				<
+			}
+	
+			switch [Nv byte 12 0 {} {}] {
+				1 {
+					>
+						emit {RSA (Encrypt or Sign) 8129b}
+					<
+				}
+				2 {
+					>
+						emit {RSA Encrypt-Only 8129b}
+					<
+				}
+			}
+	
+			if {[S string 13 0 {} {} eq \x20\x00]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x1f\xff]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x1f\xfe]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x1f\xfd]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x1f\xfc]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x1f\xfb]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x1f\xfa]} {
+				>
+				<
+			}
+	
+			if {[S string 13 0 {} {} eq \x1f\xf9]} {
+				>
+				<
+			}
+	
+			if {[N byte 1039 0 0 {} {} == -46]} {
+				>
+					emit .
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ PaCkAgE\ DaTaStReAm]} {
+		>
+			emit {pkg Datastream (SVR4)}
+			mime application/x-svr4-package
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq POLYSAVE]} {
+		>
+			emit {Poly/ML saved state}
+			if {[N long 8 0 0 {} {} x {}]} {
+				>
+					emit {version %u}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq POLYMODU]} {
+		>
+			emit {Poly/ML saved module}
+			if {[N long 8 0 0 {} {} x {}]} {
+				>
+					emit {version %u}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %!]} {
+		>
+			emit {PostScript document text}
+			if {[S string 2 0 {} {} eq PS-Adobe-]} {
+				>
+					emit conforming
+					if {[S string 11 0 {} {} > \0]} {
+						>
+							emit {DSC level %.3s}
+							if {[S string 15 0 {} {} eq EPS]} {
+								>
+									emit {\b, type %s}
+								<
+							}
+	
+							if {[S string 15 0 {} {} eq Query]} {
+								>
+									emit {\b, type %s}
+								<
+							}
+	
+							if {[S string 15 0 {} {} eq ExitServer]} {
+								>
+									emit {\b, type %s}
+								<
+							}
+	
+							if {[S search 15 0 {} 1000 eq %%LanguageLevel:\040]} {
+								>
+									if {[S string [R 0] 0 {} {} > \0]} {
+										>
+											emit {\b, Level %s}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			mime application/postscript
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \004%!]} {
+		>
+			emit {PostScript document text}
+			if {[S string 3 0 {} {} eq PS-Adobe-]} {
+				>
+					emit conforming
+					if {[S string 12 0 {} {} > \0]} {
+						>
+							emit {DSC level %.3s}
+							if {[S string 16 0 {} {} eq EPS]} {
+								>
+									emit {\b, type %s}
+								<
+							}
+	
+							if {[S string 16 0 {} {} eq Query]} {
+								>
+									emit {\b, type %s}
+								<
+							}
+	
+							if {[S string 16 0 {} {} eq ExitServer]} {
+								>
+									emit {\b, type %s}
+								<
+							}
+	
+							if {[S search 16 0 {} 1000 eq %%LanguageLevel:\040]} {
+								>
+									if {[S string [R 0] 0 {} {} > \0]} {
+										>
+											emit {\b, Level %s}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			mime application/postscript
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \033%-12345X%!PS]} {
+		>
+			emit {PostScript document}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq *PPD-Adobe:\x20]} {
+		>
+			emit {PPD file}
+			if {[S string [R 0] 0 {} {} x {}]} {
+				>
+					emit {\b, version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \033%-12345X@PJL]} {
+		>
+			emit {HP Printer Job Language data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \033%-12345X@PJL]} {
+		>
+			emit {HP Printer Job Language data}
+			if {[S string [R 0] 0 {} {} > \0]} {
+				>
+					emit %s
+					if {[S string [R 0] 0 {} {} > \0]} {
+						>
+							emit %s
+							if {[S string [R 0] 0 {} {} > \0]} {
+								>
+									emit %s
+									if {[S string [R 0] 0 {} {} > \0]} {
+										>
+											emit %s
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \033%-12345X@PJL]} {
+		>
+			if {[S search [R 0] 0 {} 10000 eq %!]} {
+				>
+					emit {PJL encapsulated PostScript document text}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \033%-12345X@PJL]} {
+		>
+			emit {HP Printer Job Language data}
+			if {[S search 0 0 {} 10000 eq @PJL\ ENTER\ LANGUAGE=HBPL]} {
+				>
+					emit {- HBPL}
+				<
+			}
+	
+			if {[S search 0 0 {} 10000 eq @PJL\ ENTER\ LANGUAGE=HIPERC]} {
+				>
+					emit {- Oki Data HIPERC}
+				<
+			}
+	
+			if {[S search 0 0 {} 10000 eq @PJL\ ENTER\ LANGUAGE=LAVAFLOW]} {
+				>
+					emit {- Konica Minolta LAVAFLOW}
+				<
+			}
+	
+			if {[S search 0 0 {} 10000 eq @PJL\ ENTER\ LANGUAGE=QPDL]} {
+				>
+					emit {- Samsung QPDL}
+				<
+			}
+	
+			if {[S search 0 0 {} 10000 eq @PJL\ ENTER\ LANGUAGE\ =\ QPDL]} {
+				>
+					emit {- Samsung QPDL}
+				<
+			}
+	
+			if {[S search 0 0 {} 10000 eq @PJL\ ENTER\ LANGUAGE=ZJS]} {
+				>
+					emit {- HP ZJS}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \033E\033]} {
+		>
+			emit {HP PCL printer data}
+			if {[S string 3 0 {} {} eq &l0A]} {
+				>
+					emit {- default page size}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq &l1A]} {
+				>
+					emit {- US executive page size}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq &l2A]} {
+				>
+					emit {- US letter page size}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq &l3A]} {
+				>
+					emit {- US legal page size}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq &l26A]} {
+				>
+					emit {- A4 page size}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq &l80A]} {
+				>
+					emit {- Monarch envelope size}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq &l81A]} {
+				>
+					emit {- No. 10 envelope size}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq &l90A]} {
+				>
+					emit {- Intl. DL envelope size}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq &l91A]} {
+				>
+					emit {- Intl. C5 envelope size}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq &l100A]} {
+				>
+					emit {- Intl. B5 envelope size}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq &l-81A]} {
+				>
+					emit {- No. 10 envelope size (landscape)}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq &l-90A]} {
+				>
+					emit {- Intl. DL envelope size (landscape)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq @document(]} {
+		>
+			emit {Imagen printer}
+			if {[S string 10 0 {} {} eq language\ impress]} {
+				>
+					emit {(imPRESS data)}
+				<
+			}
+	
+			if {[S string 10 0 {} {} eq language\ daisy]} {
+				>
+					emit {(daisywheel text)}
+				<
+			}
+	
+			if {[S string 10 0 {} {} eq language\ diablo]} {
+				>
+					emit {(daisywheel text)}
+				<
+			}
+	
+			if {[S string 10 0 {} {} eq language\ printer]} {
+				>
+					emit {(line printer emulation)}
+				<
+			}
+	
+			if {[S string 10 0 {} {} eq language\ tektronix]} {
+				>
+					emit {(Tektronix 4014 emulation)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Rast]} {
+		>
+			emit {RST-format raster font data}
+			if {[S string 45 0 {} {} > 0]} {
+				>
+					emit {face %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \033\[K\002\0\0\017\033(a\001\0\001\033(g]} {
+		>
+			emit {Canon Bubble Jet BJC formatted data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x1B\x40\x1B\x28\x52\x08\x00\x00REMOTE1P]} {
+		>
+			emit {Epson Stylus Color 460 data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq JZJZ]} {
+		>
+			if {[S string 18 0 {} {} eq ZZ]} {
+				>
+					emit {Zenographics ZjStream printer data (big-endian)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ZJZJ]} {
+		>
+			if {[S string 18 0 {} {} eq ZZ]} {
+				>
+					emit {Zenographics ZjStream printer data (little-endian)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq OAK]} {
+		>
+			if {[N byte 7 0 0 {} {} == 0]} {
+				>
+				<
+			}
+	
+			if {[N byte 11 0 0 {} {} == 0]} {
+				>
+					emit {Oak Technologies printer stream}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %!VMF]} {
+		>
+			emit {SunClock's Vector Map Format data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xbe\xefABCDEFGH]} {
+		>
+			emit {HP LaserJet 1000 series downloadable firmware}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x1b\x01@EJL]} {
+		>
+			emit {Epson ESC/Page language printer data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq FTNCHEK_\ P]} {
+		>
+			emit {project file for ftnchek}
+			if {[S string 10 0 {} {} eq 1]} {
+				>
+					emit {version 2.7}
+				<
+			}
+	
+			if {[S string 10 0 {} {} eq 2]} {
+				>
+					emit {version 2.8 to 2.10}
+				<
+			}
+	
+			if {[S string 10 0 {} {} eq 3]} {
+				>
+					emit {version 2.11 or later}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 512 eq \n\n//\ ===BEGIN\ ICANN\ DOMAINS===\n\n]} {
+		>
+			emit {Public Suffix List data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq .DAFSA@PSL_]} {
+		>
+			if {[S string 15 0 {} {} eq \n]} {
+				>
+					emit {Public Suffix List data (optimized)}
+					if {[N byte 11 0 0 {} {} > 47]} {
+						>
+							if {[N byte 11 0 0 {} {} < 58]} {
+								>
+									emit {(Version %c)}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PWS3]} {
+		>
+			emit {Password Safe V3 database}
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \"\"\"]} {
+		>
+			emit {Python script text executable}
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!\ /usr/bin/python]} {
+		>
+			emit {Python script text executable}
+			mime text/x-python
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!\ /usr/local/bin/python]} {
+		>
+			emit {Python script text executable}
+			mime text/x-python
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#!/usr/bin/env\ python]} {
+		>
+			emit {Python script text executable}
+			mime text/x-python
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 10 eq \#!\ /usr/bin/env\ python]} {
+		>
+			emit {Python script text executable}
+			mime text/x-python
+			strength {+ 15}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^from\[\040\t\f\r\n\]+(\[A-Za-z0-9_\]|\\.)+\[\040\t\f\r\n\]+import.*\$]} {
+		>
+			emit {Python script text executable}
+			mime text/x-python
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq def\ __init__]} {
+		>
+			if {[S search [R 0] 0 {} 64 eq self]} {
+				>
+					emit {Python script text executable}
+					mime text/x-python
+					strength {+ 15}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq if\ __name__]} {
+		>
+			if {[S search [R 0] 0 {} 64 eq '__main__']} {
+				>
+					emit {Python script text executable}
+				<
+			}
+	
+			if {[S search [R 0] 0 {} 64 eq \"__main__\"]} {
+				>
+					emit {Python script text executable}
+					mime text/x-python
+					strength {+ 15}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^import\ \[_\[:alpha:\]\]+\ as\ \[\[:alpha:\]\]\[\[:space:\]\]*\$]} {
+		>
+			emit {Python script text executable}
+			mime text/x-python
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq try:]} {
+		>
+			if {[S regex [R 0] 0 {} {} eq ^\[\[:space:\]\]*except.*:\$]} {
+				>
+					emit {Python script text executable}
+					mime text/x-python
+					strength {+ 15}
+				<
+			}
+	
+			if {[S search [R 0] 0 {} 4096 eq finally:]} {
+				>
+					emit {Python script text executable}
+					mime text/x-python
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^class\ \[_\[:alpha:\]\]+(\\(.*\\))?(\ )*:(\[\ \t\]+pass)?\$]} {
+		>
+			emit {Python script text executable}
+			mime text/x-python
+			strength {+ 15}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]\{0,50\}def\ \{1,50\}\[_a-zA-Z\]\{1,100\}]} {
+		>
+			if {[S regex [R 0] 0 {} {} eq \\((\[\[:alpha:\]*_,\ \])\{0,255\}\\):\$]} {
+				>
+					emit {Python script text executable}
+					mime text/x-python
+					strength {+ 15}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <!DOCTYPE\040RCC>]} {
+		>
+			emit {Qt Resource Collection file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq qres\0\0]} {
+		>
+			emit {Qt Binary Resource file}
+		<
+	}
+	
+	if {[S search 0 0 {} 1024 eq The\040Resource\040Compiler\040for\040Qt]} {
+		>
+			emit {Qt C-code resource file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x3c\xb8\x64\x18\xca\xef\x9c\x95]} {
+		>
+			if {[S string 8 0 {} {} eq \xcd\x21\x1c\xbf\x60\xa1\xbd\xdd]} {
+				>
+					emit {Qt Translation file}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq /1\ :pserver:]} {
+		>
+			emit {cvs password text file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ v2\ git\ bundle\n]} {
+		>
+			emit {Git bundle}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PACK]} {
+		>
+			if {[N ubelong 4 0 0 {} {} < 9]} {
+				>
+					if {[S search 9 0 {} 13 eq ::]} {
+						>
+						<
+					}
+	
+					if {[D 9]} {
+						>
+							emit {Git pack}
+							if {[N ubelong 4 0 0 {} {} x {}]} {
+								>
+									emit {\b, version %u}
+								<
+							}
+	
+							if {[N ubelong 8 0 0 {} {} x {}]} {
+								>
+									emit {\b, %u objects}
+								<
+							}
+	
+							mime application/x-git
+							ext pack
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \377tOc]} {
+		>
+			emit {Git pack index}
+			if {[N belong 4 0 0 {} {} == 2]} {
+				>
+					emit {\b, version 2}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DIRC]} {
+		>
+			emit {Git index}
+			if {[N belong 4 0 0 {} {} > 0]} {
+				>
+					emit {\b, version %d}
+					if {[N belong 8 0 0 {} {} > 0]} {
+						>
+							emit {\b, %d entries}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HG10]} {
+		>
+			emit {Mercurial bundle,}
+			if {[S string 4 0 {} {} eq UN]} {
+				>
+					emit uncompressed
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq BZ]} {
+				>
+					emit {bzip2 compressed}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SVN-fs-dump-format-version:]} {
+		>
+			emit {Subversion dumpfile}
+			if {[S string 28 0 {} {} > \0]} {
+				>
+					emit {(version: %s)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ Bazaar\ revision\ bundle\ v]} {
+		>
+			emit {Bazaar Bundle}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\ Bazaar\ merge\ directive\ format]} {
+		>
+			emit {Bazaar merge directive}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RIFF]} {
+		>
+			emit {RIFF (little-endian) data}
+			if {[S string 8 0 {} {} eq PAL\ ]} {
+				>
+					emit {\b, palette}
+					if {[N ulelong 4 0 0 + 8 x {}]} {
+						>
+							emit {\b, %u bytes}
+						<
+					}
+	
+					if {[S string 12 0 {} {} eq plth]} {
+						>
+							emit {\b, extended}
+						<
+					}
+	
+					if {[S string 12 0 {} {} eq data]} {
+						>
+							if {[N ulelong 16 0 0 {} {} x {}]} {
+								>
+									emit {\b, data size %u}
+								<
+							}
+	
+							if {[N uleshort 22 0 0 {} {} x {}]} {
+								>
+									emit {\b, %u entries}
+								<
+							}
+	
+							if {[N ubequad [I 22 uleshort 0 * 0 4] 0 0 {} {} x {}]} {
+								>
+									if {[N ubelong [R 16] 0 0 {} {} x {}]} {
+										>
+											emit {\b, extra bytes}
+											if {[N ubelong [R -4] 0 0 {} {} > 0]} {
+												>
+													emit 0x%8.8x
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					mime application/x-riff
+					ext pal
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq RDIB]} {
+				>
+					emit {\b, device-independent bitmap}
+					if {[S string 16 0 {} {} eq BM]} {
+						>
+							switch [Nv leshort 30 0 {} {}] {
+								12 {
+									>
+										emit {\b, OS/2 1.x format}
+										if {[N leshort 34 0 0 {} {} x {}]} {
+											>
+												emit {\b, %d x}
+											<
+										}
+	
+										if {[N leshort 36 0 0 {} {} x {}]} {
+											>
+												emit %d
+											<
+										}
+	
+									<
+								}
+								40 {
+									>
+										emit {\b, Windows 3.x format}
+										if {[N lelong 34 0 0 {} {} x {}]} {
+											>
+												emit {\b, %d x}
+											<
+										}
+	
+										if {[N lelong 38 0 0 {} {} x {}]} {
+											>
+												emit {%d x}
+											<
+										}
+	
+										if {[N leshort 44 0 0 {} {} x {}]} {
+											>
+												emit %d
+											<
+										}
+	
+									<
+								}
+								64 {
+									>
+										emit {\b, OS/2 2.x format}
+										if {[N leshort 34 0 0 {} {} x {}]} {
+											>
+												emit {\b, %d x}
+											<
+										}
+	
+										if {[N leshort 36 0 0 {} {} x {}]} {
+											>
+												emit %d
+											<
+										}
+	
+									<
+								}
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq RMID]} {
+				>
+					emit {\b, MIDI}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq RMMP]} {
+				>
+					emit {\b, multimedia movie}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq RMP3]} {
+				>
+					emit {\b, MPEG Layer 3 audio}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq WAVE]} {
+				>
+					emit {\b, WAVE audio}
+					if {[S string 12 0 {} {} > \0]} {
+						>
+							U 214 riff-walk 12
+	
+						<
+					}
+	
+					mime audio/x-wav
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq CDRA]} {
+				>
+					emit {\b, Corel Draw Picture}
+					mime image/x-coreldraw
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq CDR6]} {
+				>
+					emit {\b, Corel Draw Picture, version 6}
+					mime image/x-coreldraw
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq NUNDROOT]} {
+				>
+					emit {\b, Steinberg CuBase}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq AVI\040]} {
+				>
+					emit {\b, AVI}
+					if {[S string 12 0 {} {} eq LIST]} {
+						>
+							if {[S string 20 0 {} {} eq hdrlavih]} {
+								>
+									if {[N lelong [R 36] 0 0 {} {} x {}]} {
+										>
+											emit {\b, %u x}
+										<
+									}
+	
+									if {[N lelong [R 40] 0 0 {} {} x {}]} {
+										>
+											emit %u,
+										<
+									}
+	
+									if {[N lelong [R 4] 0 0 {} {} > 1000000]} {
+										>
+											emit {<1 fps,}
+										<
+									}
+	
+									switch [Nv lelong [R 4] 0 {} {}] {
+										33333 {
+											>
+												emit {30.00 fps,}
+											<
+										}
+										33367 {
+											>
+												emit {29.97 fps,}
+											<
+										}
+										40000 {
+											>
+												emit {25.00 fps,}
+											<
+										}
+										41667 {
+											>
+												emit {24.00 fps,}
+											<
+										}
+										41708 {
+											>
+												emit {23.98 fps,}
+											<
+										}
+										50000 {
+											>
+												emit {20.00 fps,}
+											<
+										}
+										66667 {
+											>
+												emit {15.00 fps,}
+											<
+										}
+										83333 {
+											>
+												emit {12.00 fps,}
+											<
+										}
+										100000 {
+											>
+												emit {10.00 fps,}
+											<
+										}
+										111111 {
+											>
+												emit {9.00 fps,}
+											<
+										}
+										125000 {
+											>
+												emit {8.00 fps,}
+											<
+										}
+										142857 {
+											>
+												emit {7.00 fps,}
+											<
+										}
+										166667 {
+											>
+												emit {6.00 fps,}
+											<
+										}
+										200000 {
+											>
+												emit {5.00 fps,}
+											<
+										}
+										250000 {
+											>
+												emit {4.00 fps,}
+											<
+										}
+										333333 {
+											>
+												emit {3.00 fps,}
+											<
+										}
+										500000 {
+											>
+												emit {2.00 fps,}
+											<
+										}
+										1000000 {
+											>
+												emit {1.00 fps,}
+											<
+										}
+									}
+	
+									if {[N lelong [R 4] 0 0 {} {} < 101010]} {
+										>
+											if {[N lelong [R -4] 0 0 {} {} > 99010]} {
+												>
+													if {[N lelong [R -4] 0 0 {} {} != 100000]} {
+														>
+															emit {~10 fps,}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[N lelong [R 4] 0 0 {} {} < 84034]} {
+										>
+											if {[N lelong [R -4] 0 0 {} {} > 82645]} {
+												>
+													if {[N lelong [R -4] 0 0 {} {} != 83333]} {
+														>
+															emit {~12 fps,}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[N lelong [R 4] 0 0 {} {} < 67114]} {
+										>
+											if {[N lelong [R -4] 0 0 {} {} > 66225]} {
+												>
+													if {[N lelong [R -4] 0 0 {} {} != 66667]} {
+														>
+															emit {~15 fps,}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[N lelong [R 4] 0 0 {} {} < 41841]} {
+										>
+											if {[N lelong [R -4] 0 0 {} {} > 41494]} {
+												>
+													if {[N lelong [R -4] 0 0 {} {} != 41708]} {
+														>
+															if {[N lelong [R -4] 0 0 {} {} != 41667]} {
+																>
+																	emit {~24 fps,}
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[N lelong [R 4] 0 0 {} {} < 40161]} {
+										>
+											if {[N lelong [R -4] 0 0 {} {} > 39841]} {
+												>
+													if {[N lelong [R -4] 0 0 {} {} != 40000]} {
+														>
+															emit {~25 fps,}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[N lelong [R 4] 0 0 {} {} < 33445]} {
+										>
+											if {[N lelong [R -4] 0 0 {} {} > 33223]} {
+												>
+													if {[N lelong [R -4] 0 0 {} {} != 33367]} {
+														>
+															if {[N lelong [R -4] 0 0 {} {} != 33333]} {
+																>
+																	emit {~30 fps,}
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[N lelong [R 4] 0 0 {} {} < 32224]} {
+										>
+											emit {>30 fps,}
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string 88 0 {} {} eq LIST]} {
+								>
+									if {[S string 96 0 {} {} eq strlstrh]} {
+										>
+											if {[S string 108 0 {} {} eq vids]} {
+												>
+													emit video:
+													if {[N lelong [R 0] 0 0 {} {} == 0]} {
+														>
+															emit uncompressed
+														<
+													}
+	
+													if {[S string [I 104 ulelong 0 + 0 108] 0 {} {} eq strf]} {
+														>
+															switch [Nv lelong [I 104 ulelong 0 + 0 132] 0 {} {}] {
+																0 {
+																	>
+																	<
+																}
+																1 {
+																	>
+																		emit {RLE 8bpp}
+																	<
+																}
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq cvid]} {
+																>
+																	emit Cinepak
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq i263]} {
+																>
+																	emit {Intel I.263}
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq iv32]} {
+																>
+																	emit {Indeo 3.2}
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq iv41]} {
+																>
+																	emit {Indeo 4.1}
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq iv50]} {
+																>
+																	emit {Indeo 5.0}
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq mp42]} {
+																>
+																	emit {Microsoft MPEG-4 v2}
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq mp43]} {
+																>
+																	emit {Microsoft MPEG-4 v3}
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq fmp4]} {
+																>
+																	emit {FFMpeg MPEG-4}
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq mjpg]} {
+																>
+																	emit {Motion JPEG}
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq div3]} {
+																>
+																	emit {DivX 3}
+																	if {[S string 112 0 c {} eq div3]} {
+																		>
+																			emit Low-Motion
+																		<
+																	}
+	
+																	if {[S string 112 0 c {} eq div4]} {
+																		>
+																			emit Fast-Motion
+																		<
+																	}
+	
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq divx]} {
+																>
+																	emit {DivX 4}
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq dx50]} {
+																>
+																	emit {DivX 5}
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq xvid]} {
+																>
+																	emit XviD
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq h264]} {
+																>
+																	emit H.264
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq wmv3]} {
+																>
+																	emit {Windows Media Video 9}
+																<
+															}
+	
+															if {[S string [I 104 ulelong 0 + 0 132] 0 c {} eq h264]} {
+																>
+																	emit {X.264 or H.264}
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[S string [I 92 ulelong 0 + 0 96] 0 {} {} eq LIST]} {
+										>
+											if {[S string [I 92 ulelong 0 + 0 104] 0 {} {} eq strlstrh]} {
+												>
+													if {[S string [I 92 ulelong 0 + 0 116] 0 {} {} eq auds]} {
+														>
+															emit {\b, audio:}
+															if {[S string [I 92 ulelong 0 + 0 172] 0 {} {} eq strf]} {
+																>
+																	switch [Nv leshort [I 92 ulelong 0 + 0 180] 0 {} {}] {
+																		1 {
+																			>
+																				emit {uncompressed PCM}
+																			<
+																		}
+																		2 {
+																			>
+																				emit ADPCM
+																			<
+																		}
+																		6 {
+																			>
+																				emit aLaw
+																			<
+																		}
+																		7 {
+																			>
+																				emit uLaw
+																			<
+																		}
+																		80 {
+																			>
+																				emit {MPEG-1 Layer 1 or 2}
+																			<
+																		}
+																		85 {
+																			>
+																				emit {MPEG-1 Layer 3}
+																			<
+																		}
+																		353 {
+																			>
+																				emit DivX
+																			<
+																		}
+																		8192 {
+																			>
+																				emit {Dolby AC3}
+																			<
+																		}
+																	}
+	
+																	switch [Nv leshort [I 92 ulelong 0 + 0 182] 0 {} {}] {
+																		1 {
+																			>
+																				emit (mono,
+																			<
+																		}
+																		2 {
+																			>
+																				emit (stereo,
+																			<
+																		}
+																	}
+	
+																	if {[N leshort [I 92 ulelong 0 + 0 182] 0 0 {} {} > 2]} {
+																		>
+																			emit {(%d channels,}
+																		<
+																	}
+	
+																	if {[N lelong [I 92 ulelong 0 + 0 184] 0 0 {} {} x {}]} {
+																		>
+																			emit {%d Hz)}
+																		<
+																	}
+	
+																<
+															}
+	
+															if {[S string [I 92 ulelong 0 + 0 180] 0 {} {} eq strf]} {
+																>
+																	switch [Nv leshort [I 92 ulelong 0 + 0 188] 0 {} {}] {
+																		1 {
+																			>
+																				emit {uncompressed PCM}
+																			<
+																		}
+																		2 {
+																			>
+																				emit ADPCM
+																			<
+																		}
+																		85 {
+																			>
+																				emit {MPEG-1 Layer 3}
+																			<
+																		}
+																		353 {
+																			>
+																				emit DivX
+																			<
+																		}
+																		8192 {
+																			>
+																				emit {Dolby AC3}
+																			<
+																		}
+																	}
+	
+																	switch [Nv leshort [I 92 ulelong 0 + 0 190] 0 {} {}] {
+																		1 {
+																			>
+																				emit (mono,
+																			<
+																		}
+																		2 {
+																			>
+																				emit (stereo,
+																			<
+																		}
+																	}
+	
+																	if {[N leshort [I 92 ulelong 0 + 0 190] 0 0 {} {} > 2]} {
+																		>
+																			emit {(%d channels,}
+																		<
+																	}
+	
+																	if {[N lelong [I 92 ulelong 0 + 0 192] 0 0 {} {} x {}]} {
+																		>
+																			emit {%d Hz)}
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+					mime video/x-msvideo
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq ACON]} {
+				>
+					emit {\b, animated cursor}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq sfbk]} {
+				>
+					emit SoundFont/Bank
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq CDXA]} {
+				>
+					emit {\b, wrapped MPEG-1 (CDXA)}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq 4XMV]} {
+				>
+					emit {\b, 4X Movie file}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq AMV\040]} {
+				>
+					emit {\b, AMV}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq WEBP]} {
+				>
+					emit {\b, Web/P image}
+					U 214 riff-walk 12
+	
+					mime image/webp
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RIFX]} {
+		>
+			emit {RIFF (big-endian) data}
+			if {[S string 8 0 {} {} eq PAL]} {
+				>
+					emit {\b, palette}
+					if {[N beshort 16 0 0 {} {} x {}]} {
+						>
+							emit {\b, version %d}
+						<
+					}
+	
+					if {[N beshort 18 0 0 {} {} x {}]} {
+						>
+							emit {\b, %d entries}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq RDIB]} {
+				>
+					emit {\b, device-independent bitmap}
+					if {[S string 16 0 {} {} eq BM]} {
+						>
+							switch [Nv beshort 30 0 {} {}] {
+								12 {
+									>
+										emit {\b, OS/2 1.x format}
+										if {[N beshort 34 0 0 {} {} x {}]} {
+											>
+												emit {\b, %d x}
+											<
+										}
+	
+										if {[N beshort 36 0 0 {} {} x {}]} {
+											>
+												emit %d
+											<
+										}
+	
+									<
+								}
+								40 {
+									>
+										emit {\b, Windows 3.x format}
+										if {[N belong 34 0 0 {} {} x {}]} {
+											>
+												emit {\b, %d x}
+											<
+										}
+	
+										if {[N belong 38 0 0 {} {} x {}]} {
+											>
+												emit {%d x}
+											<
+										}
+	
+										if {[N beshort 44 0 0 {} {} x {}]} {
+											>
+												emit %d
+											<
+										}
+	
+									<
+								}
+								64 {
+									>
+										emit {\b, OS/2 2.x format}
+										if {[N beshort 34 0 0 {} {} x {}]} {
+											>
+												emit {\b, %d x}
+											<
+										}
+	
+										if {[N beshort 36 0 0 {} {} x {}]} {
+											>
+												emit %d
+											<
+										}
+	
+									<
+								}
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq RMID]} {
+				>
+					emit {\b, MIDI}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq RMMP]} {
+				>
+					emit {\b, multimedia movie}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq WAVE]} {
+				>
+					emit {\b, WAVE audio}
+					if {[N leshort 20 0 0 {} {} == 1]} {
+						>
+							emit {\b, Microsoft PCM}
+							if {[N leshort 34 0 0 {} {} > 0]} {
+								>
+									emit {\b, %d bit}
+								<
+							}
+	
+						<
+					}
+	
+					switch [Nv beshort 22 0 {} {}] {
+						1 {
+							>
+								emit {\b, mono}
+							<
+						}
+						2 {
+							>
+								emit {\b, stereo}
+							<
+						}
+					}
+	
+					if {[N beshort 22 0 0 {} {} > 2]} {
+						>
+							emit {\b, %d channels}
+						<
+					}
+	
+					if {[N belong 24 0 0 {} {} > 0]} {
+						>
+							emit {%d Hz}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq CDRA]} {
+				>
+					emit {\b, Corel Draw Picture}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq CDR6]} {
+				>
+					emit {\b, Corel Draw Picture, version 6}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq AVI\040]} {
+				>
+					emit {\b, AVI}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq ACON]} {
+				>
+					emit {\b, animated cursor}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq NIFF]} {
+				>
+					emit {\b, Notation Interchange File Format}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq sfbk]} {
+				>
+					emit SoundFont/Bank
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq riff\x2E\x91\xCF\x11\xA5\xD6\x28\xDB\x04\xC1\x00\x00]} {
+		>
+			emit {Sony Wave64 RIFF data}
+			if {[S string 24 0 {} {} eq wave\xF3\xAC\xD3\x11\x8C\xD1\x00\xC0\x4F\x8E\xDB\x8A]} {
+				>
+					emit {\b, WAVE 64 audio}
+					if {[S search 40 0 {} 256 eq fmt\x20\xF3\xAC\xD3\x11\x8C\xD1\x00\xC0\x4F\x8E\xDB\x8A]} {
+						>
+							emit {\b}
+							switch [Nv leshort [R 10] 0 {} {}] {
+								1 {
+									>
+										emit {\b, mono}
+									<
+								}
+								2 {
+									>
+										emit {\b, stereo}
+									<
+								}
+							}
+	
+							if {[N leshort [R 10] 0 0 {} {} > 2]} {
+								>
+									emit {\b, %d channels}
+								<
+							}
+	
+							if {[N lelong [R 12] 0 0 {} {} > 0]} {
+								>
+									emit {%d Hz}
+								<
+							}
+	
+						<
+					}
+	
+					mime audio/x-w64
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RF64\xff\xff\xff\xffWAVEds64]} {
+		>
+			emit {MBWF/RF64 audio}
+			if {[S search 40 0 {} 256 eq fmt\x20]} {
+				>
+					emit {\b}
+					switch [Nv leshort [R 6] 0 {} {}] {
+						1 {
+							>
+								emit {\b, mono}
+							<
+						}
+						2 {
+							>
+								emit {\b, stereo}
+							<
+						}
+					}
+	
+					if {[N leshort [R 6] 0 0 {} {} > 2]} {
+						>
+							emit {\b, %d channels}
+						<
+					}
+	
+					if {[N lelong [R 8] 0 0 {} {} > 0]} {
+						>
+							emit {%d Hz}
+						<
+					}
+	
+				<
+			}
+	
+			mime audio/x-wav
+		<
+	}
+	
+	if {[N lelong -44 0 0 {} {} == 0]} {
+		>
+			if {[N lelong 4 0 0 {} {} == 0]} {
+				>
+					if {[N lelong 8 0 0 {} {} == 1]} {
+						>
+						<
+					}
+	
+					if {[N lelong 12 0 0 {} {} == 4]} {
+						>
+							if {[S string 16 0 {} {} eq 283x]} {
+								>
+									if {[N lelong 20 0 0 {} {} == 1]} {
+										>
+											if {[N lelong 24 0 0 {} {} == 4]} {
+												>
+													if {[S string 28 0 {} {} eq DTOK]} {
+														>
+															if {[N lelong 32 0 0 {} {} == 44]} {
+																>
+																	if {[N lelong 36 0 0 {} {} == 4]} {
+																		>
+																			if {[S string 40 0 {} {} eq RPTL]} {
+																				>
+																					emit {Raspberry PI kernel image}
+																				<
+																			}
+	
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq drpm]} {
+		>
+			emit {Delta RPM}
+			if {[S string 12 0 {} {} x {}]} {
+				>
+					emit %s
+					switch [Nv beshort 8 0 {} {}] {
+						11 {
+							>
+								emit MIPSel
+							<
+						}
+						12 {
+							>
+								emit ARM
+							<
+						}
+						13 {
+							>
+								emit MiNT
+							<
+						}
+						14 {
+							>
+								emit S/390
+							<
+						}
+						15 {
+							>
+								emit S/390x
+							<
+						}
+						16 {
+							>
+								emit PowerPC64
+							<
+						}
+						17 {
+							>
+								emit SuperH
+							<
+						}
+						18 {
+							>
+								emit Xtensa
+							<
+						}
+					}
+	
+					if {[S string 10 0 {} {} x {}]} {
+						>
+							emit %s
+						<
+					}
+	
+				<
+			}
+	
+			mime application/x-rpm
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \{\\rtf]} {
+		>
+			emit {Rich Text Format data,}
+			if {[S string 5 0 {} {} eq 1]} {
+				>
+					emit {version 1,}
+					if {[S string 6 0 {} {} eq \\ansi]} {
+						>
+							emit ANSI
+						<
+					}
+	
+					if {[S string 6 0 {} {} eq \\mac]} {
+						>
+							emit {Apple Macintosh}
+						<
+					}
+	
+					if {[S string 6 0 {} {} eq \\pc]} {
+						>
+							emit {IBM PC, code page 437}
+						<
+					}
+	
+					if {[S string 6 0 {} {} eq \\pca]} {
+						>
+							emit {IBM PS/2, code page 850}
+						<
+					}
+	
+					if {[D 6]} {
+						>
+							emit {unknown character set}
+						<
+					}
+	
+				<
+			}
+	
+			if {[D 5]} {
+				>
+					emit {unknown version}
+				<
+			}
+	
+			mime text/rtf
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!\ /usr/bin/ruby]} {
+		>
+			emit {Ruby script text executable}
+			mime text/x-ruby
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!\ /usr/local/bin/ruby]} {
+		>
+			emit {Ruby script text executable}
+			mime text/x-ruby
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#!/usr/bin/env\ ruby]} {
+		>
+			emit {Ruby script text executable}
+			mime text/x-ruby
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#!\ /usr/bin/env\ ruby]} {
+		>
+			emit {Ruby script text executable}
+			mime text/x-ruby
+			strength {+ 15}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*require\[\[:space:\]\]'\[A-Za-z_/\]+']} {
+		>
+			if {[S regex 0 0 {} {} eq def\ \[a-z\]|\ do\$]} {
+				>
+					if {[S regex [R 0] 0 {} {} eq ^\[\[:space:\]\]*end(\[\[:space:\]\]+\[\;\#\].*)?\$]} {
+						>
+							emit {Ruby script text}
+							mime text/x-ruby
+							strength {+ 30}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*(class|module)\[\[:space:\]\]\[A-Z\]]} {
+		>
+			if {[S regex 0 0 {} {} eq (modul|includ)e\ \[A-Z\]|def\ \[a-z\]]} {
+				>
+					if {[S regex [R 0] 0 {} {} eq ^\[\[:space:\]\]*end(\[\[:space:\]\]+\[\;\#\].*)?\$]} {
+						>
+							emit {Ruby script text}
+							mime text/x-ruby
+							strength {+ 30}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*(class|module)\[\[:space:\]\]\[A-Z\]]} {
+		>
+			if {[S regex [R 0] 0 {} {} eq ^\[\[:space:\]\]*end(\[\[:space:\]\]+\[\;\#if\].*)?\$]} {
+				>
+					emit {Ruby script text}
+					mime text/x-ruby
+					strength {+ 10}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*def\ \[a-z\]|def\ \[\[:alpha:\]\]+::\[a-z\]]} {
+		>
+			if {[S regex [R 0] 0 {} {} eq ^\[\[:space:\]\]*end(\[\[:space:\]\]+\[\;\#\].*)?\$]} {
+				>
+					emit {Ruby script text}
+					mime text/x-ruby
+					strength {+ 10}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*require\[\[:space:\]\]'\[A-Za-z_/\]+']} {
+		>
+			emit {Ruby script text}
+			mime text/x-ruby
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^\[\[:space:\]\]*include\ (\[A-Z\]+\[a-z\]*(::))+]} {
+		>
+			emit {Ruby script text}
+			mime text/x-ruby
+		<
+	}
+	
+	if {[S string 38 0 {} {} eq Spreadsheet]} {
+		>
+			emit {sc spreadsheet file}
+			mime application/x-sc
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq \001s\ ]} {
+		>
+			emit {SCCS archive data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MTZ\040]} {
+		>
+			emit {MTZ reflection file}
+		<
+	}
+	
+	if {[S string 92 0 {} {} eq PLOT%%84]} {
+		>
+			emit {Plot84 plotting file}
+			if {[N byte 52 0 0 {} {} == 1]} {
+				>
+					emit {, Little-endian}
+				<
+			}
+	
+			if {[N byte 55 0 0 {} {} == 1]} {
+				>
+					emit {, Big-endian}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq EZD_MAP]} {
+		>
+			emit {NEWEZD Electron Density Map}
+		<
+	}
+	
+	if {[S string 109 0 {} {} eq MAP\040(]} {
+		>
+			emit {Old EZD Electron Density Map}
+		<
+	}
+	
+	if {[S string 0 0 c {} eq :-)\040Origin]} {
+		>
+			emit {BRIX Electron Density Map}
+			if {[S string 170 0 {} {} > 0]} {
+				>
+					emit {, Sigma:%.12s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 7 0 {} {} eq 18\040!NTITLE]} {
+		>
+			emit {XPLOR ASCII Electron Density Map}
+		<
+	}
+	
+	if {[S string 9 0 {} {} eq \040!NTITLE\012\040REMARK]} {
+		>
+			emit {CNS ASCII electron density map}
+		<
+	}
+	
+	if {[S string 208 0 {} {} eq MAP\040]} {
+		>
+			emit {CCP4 Electron Density Map}
+			switch [Nv byte 212 0 {} {}] {
+				17 {
+					>
+						emit {\b, Big-endian}
+					<
+				}
+				34 {
+					>
+						emit {\b, VAX format}
+					<
+				}
+				68 {
+					>
+						emit {\b, Little-endian}
+					<
+				}
+				85 {
+					>
+						emit {\b, Convex native}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq R-AXIS4\ \ \ ]} {
+		>
+			emit {R-Axis Area Detector Image:}
+			if {[N lelong 796 0 0 {} {} < 20]} {
+				>
+					emit {Little-endian, IP #%d,}
+					if {[N lelong 768 0 0 {} {} > 0]} {
+						>
+							emit Size=%dx
+						<
+					}
+	
+					if {[N lelong 772 0 0 {} {} > 0]} {
+						>
+							emit {\b%d}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N belong 796 0 0 {} {} < 20]} {
+				>
+					emit {Big-endian, IP #%d,}
+					if {[N belong 768 0 0 {} {} > 0]} {
+						>
+							emit Size=%dx
+						<
+					}
+	
+					if {[N belong 772 0 0 {} {} > 0]} {
+						>
+							emit {\b%d}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RAXIS\ \ \ \ \ ]} {
+		>
+			emit {R-Axis Area Detector Image, Win32:}
+			if {[N lelong 796 0 0 {} {} < 20]} {
+				>
+					emit {Little-endian, IP #%d,}
+					if {[N lelong 768 0 0 {} {} > 0]} {
+						>
+							emit Size=%dx
+						<
+					}
+	
+					if {[N lelong 772 0 0 {} {} > 0]} {
+						>
+							emit {\b%d}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N belong 796 0 0 {} {} < 20]} {
+				>
+					emit {Big-endian, IP #%d,}
+					if {[N belong 768 0 0 {} {} > 0]} {
+						>
+							emit Size=%dx
+						<
+					}
+	
+					if {[N belong 772 0 0 {} {} > 0]} {
+						>
+							emit {\b%d}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 1028 0 {} {} eq MMX\000\000\000\000\000\000\000\000\000\000\000\000\000]} {
+		>
+			emit {MAR Area Detector Image,}
+			if {[N ulong 1072 0 0 {} {} > 1]} {
+				>
+					emit Compressed(%d),
+				<
+			}
+	
+			if {[N ulong 1100 0 0 {} {} > 1]} {
+				>
+					emit {%d headers,}
+				<
+			}
+	
+			if {[N ulong 1104 0 0 {} {} > 0]} {
+				>
+					emit {%d x}
+				<
+			}
+	
+			if {[N ulong 1108 0 0 {} {} > 0]} {
+				>
+					emit %d,
+				<
+			}
+	
+			if {[N ulong 1120 0 0 {} {} > 0]} {
+				>
+					emit {%d bits/pixel}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 c 1 eq 0\ HEAD]} {
+		>
+			emit {GEDCOM genealogy text}
+			if {[S search [R 0] 0 {} 100 eq 1\ GEDC]} {
+				>
+					if {[S search [R 0] 0 {} 100 eq 2\ VERS]} {
+						>
+							emit version
+							if {[S string [R 1] 0 {} {} > \0]} {
+								>
+									emit %s
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000\060\000\040\000\110\000\105\000\101\000\104]} {
+		>
+			emit {GEDCOM data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \060\000\040\000\110\000\105\000\101\000\104\000]} {
+		>
+			emit {GEDCOM data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \376\377\000\060\000\040\000\110\000\105\000\101\000\104]} {
+		>
+			emit {GEDCOM data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \377\376\060\000\040\000\110\000\105\000\101\000\104\000]} {
+		>
+			emit {GEDCOM data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HEADER\ \ \ \040]} {
+		>
+			if {[S regex [R 0] 0 l 1 eq ^.\{40\}]} {
+				>
+					if {[S regex [R 0] 0 l 1 eq \[0-9\]\{2\}-\[A-Z\]\{3\}-\[0-9\]\{2\}\ \{3\}]} {
+						>
+							if {[S regex [R 0] 0 {l s} 1 eq \[A-Z0-9\]\{4\}.\{14\}\$]} {
+								>
+									if {[S regex [R 0] 0 l 1 eq \[A-Z0-9\]\{4\}]} {
+										>
+											emit {Protein Data Bank data, ID Code %s}
+											mime chemical/x-pdb
+										<
+									}
+	
+									if {[S regex 0 0 l 1 eq \[0-9\]\{2\}-\[A-Z\]\{3\}-\[0-9\]\{2\}]} {
+										>
+											emit {\b, %s}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq -----BEGIN\ CERTIFICATE------]} {
+		>
+			emit {RFC1421 Security Certificate text}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq -----BEGIN\ NEW\ CERTIFICATE]} {
+		>
+			emit {RFC1421 Security Certificate Signing Request text}
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq policy_module(]} {
+		>
+			emit {SE Linux policy module source}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq policy_module(]} {
+		>
+			emit {SE Linux policy module source}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#\#\ <summary>]} {
+		>
+			emit {SE Linux policy interface source}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq divert(-1)\n]} {
+		>
+			emit {sendmail m4 text file}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq =srl]} {
+		>
+			emit {Sereal data packet}
+			U 226 sereal [R 0]
+	
+			mime application/sereal
+		<
+	}
+	
+	if {[S string 0 0 b {} eq =\xF3rl]} {
+		>
+			emit {Sereal data packet}
+			U 226 sereal [R 0]
+	
+			mime application/sereal
+		<
+	}
+	
+	if {[S string 0 0 b {} eq =\xC3\xB3rl]} {
+		>
+			emit {Sereal data packet, UTF-8 encoded}
+			U 226 sereal [R 0]
+	
+			mime application/sereal
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq kbd!map]} {
+		>
+			emit {kbd map file}
+			if {[N byte 8 0 0 {} {} > 0]} {
+				>
+					emit {Ver %d:}
+				<
+			}
+	
+			if {[N short 10 0 0 {} {} > 0]} {
+				>
+					emit {with %d table(s)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x43\x72\x73\x68\x44\x75\x6d\x70]} {
+		>
+			emit {IRIX vmcore dump of}
+			if {[S string 36 0 {} {} > \0]} {
+				>
+					emit '%s'
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SGIAUDIT]} {
+		>
+			emit {SGI Audit file}
+			if {[N byte 8 0 0 {} {} x {}]} {
+				>
+					emit {- version %d}
+				<
+			}
+	
+			if {[N byte 9 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq WNGZWZSC]} {
+		>
+			emit {Wingz compiled script}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq WNGZWZSS]} {
+		>
+			emit {Wingz spreadsheet}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq WNGZWZHP]} {
+		>
+			emit {Wingz help file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#Inventor\040V]} {
+		>
+			emit {IRIS Inventor 1.0 file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#Inventor\040V2]} {
+		>
+			emit {Open Inventor 2.0 file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq glfHeadMagic()\;]} {
+		>
+			emit GLF_TEXT
+		<
+	}
+	
+	switch [Nv belong 4 0 {} {}] {
+		16 {
+			>
+				emit GLS_BINARY_MSB_FIRST
+			<
+		}
+		125 {
+			>
+				emit GLF_BINARY_MSB_FIRST
+			<
+		}
+		19195 {
+			>
+				emit {QDOS executable}
+				if {[S pstring 9 0 {} {} x {}]} {
+					>
+						emit '%s'
+					<
+				}
+	
+			<
+		}
+		268435456 {
+			>
+				emit GLS_BINARY_LSB_FIRST
+			<
+		}
+		2097152000 {
+			>
+				emit GLF_BINARY_LSB_FIRST
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq glsBeginGLS(]} {
+		>
+			emit GLS_TEXT
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PmNs]} {
+		>
+			emit {PCP compiled namespace (V.0)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PmN]} {
+		>
+			emit {PCP compiled namespace}
+			if {[S string 3 0 {} {} > \0]} {
+				>
+					emit (V.%1.1s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[N belong 3 0 0 {} {} == -2075130586]} {
+		>
+			emit {PCP archive}
+			if {[N byte 7 0 0 {} {} x {}]} {
+				>
+					emit (V.%d)
+				<
+			}
+	
+			switch [Nv belong 20 0 {} {}] {
+				-2 {
+					>
+						emit {temporal index}
+					<
+				}
+				-1 {
+					>
+						emit metadata
+					<
+				}
+				0 {
+					>
+						emit {log volume #0}
+					<
+				}
+			}
+	
+			if {[N belong 20 0 0 {} {} > 0]} {
+				>
+					emit {log volume #%d}
+				<
+			}
+	
+			if {[S string 24 0 {} {} > \0]} {
+				>
+					emit {host: %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PCPFolio]} {
+		>
+			emit PCP
+			if {[S string 9 0 {} {} eq Version:]} {
+				>
+					emit {Archive Folio}
+				<
+			}
+	
+			if {[S string 18 0 {} {} > \0]} {
+				>
+					emit (V.%s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#pmchart]} {
+		>
+			emit {PCP pmchart view}
+			if {[S string 9 0 {} {} eq Version]} {
+				>
+				<
+			}
+	
+			if {[S string 17 0 {} {} > \0]} {
+				>
+					emit (V%-3.3s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#kmchart]} {
+		>
+			emit {PCP kmchart view}
+			if {[S string 9 0 {} {} eq Version]} {
+				>
+				<
+			}
+	
+			if {[S string 17 0 {} {} > \0]} {
+				>
+					emit (V.%s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq pmview]} {
+		>
+			emit {PCP pmview config}
+			if {[S string 7 0 {} {} eq Version]} {
+				>
+				<
+			}
+	
+			if {[S string 15 0 {} {} > \0]} {
+				>
+					emit (V%-3.3s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#pmlogger]} {
+		>
+			emit {PCP pmlogger config}
+			if {[S string 10 0 {} {} eq Version]} {
+				>
+				<
+			}
+	
+			if {[S string 18 0 {} {} > \0]} {
+				>
+					emit (V%1.1s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#pmdahotproc]} {
+		>
+			emit {PCP pmdahotproc config}
+			if {[S string 13 0 {} {} eq Version]} {
+				>
+				<
+			}
+	
+			if {[S string 21 0 {} {} > \0]} {
+				>
+					emit (V%-3.3s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PcPh]} {
+		>
+			emit {PCP Help}
+			if {[S string 4 0 {} {} eq 1]} {
+				>
+					emit Index
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq 2]} {
+				>
+					emit Text
+				<
+			}
+	
+			if {[S string 5 0 {} {} > \0]} {
+				>
+					emit (V.%1.1s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#pmieconf-rules]} {
+		>
+			emit {PCP pmieconf rules}
+			if {[S string 16 0 {} {} > \0]} {
+				>
+					emit (V.%1.1s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 3 0 {} {} eq pmieconf-pmie]} {
+		>
+			emit {PCP pmie config}
+			if {[S string 17 0 {} {} > \0]} {
+				>
+					emit (V.%1.1s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MMV]} {
+		>
+			emit {PCP memory mapped values}
+			if {[N long 4 0 0 {} {} x {}]} {
+				>
+					emit (V.%d)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq mdbm]} {
+		>
+			emit {mdbm file,}
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {version %d,}
+				<
+			}
+	
+			if {[N byte 6 0 0 {} {} x {}]} {
+				>
+					emit {2^%d pages,}
+				<
+			}
+	
+			if {[N byte 7 0 0 {} {} x {}]} {
+				>
+					emit {pagesize 2^%d,}
+				<
+			}
+	
+			if {[N byte 17 0 0 {} {} x {}]} {
+				>
+					emit {hash %d,}
+				<
+			}
+	
+			if {[N byte 11 0 0 {} {} x {}]} {
+				>
+					emit {dataformat %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq //Maya\040ASCII]} {
+		>
+			emit {Alias Maya Ascii File,}
+			if {[S string 13 0 {} {} > \0]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq MAYAFOR4]} {
+		>
+			emit {Alias Maya Binary File,}
+			if {[S string 32 0 {} {} > \0]} {
+				>
+					emit {version %s scene}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq MayaFOR4]} {
+		>
+			emit {Alias Maya Binary File,}
+			if {[S string 32 0 {} {} > \0]} {
+				>
+					emit {version %s scene}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq CIMG]} {
+		>
+			emit {Alias Maya Image File}
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq DEEP]} {
+		>
+			emit {Alias Maya Image File}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <?xml\ version=]} {
+		>
+			if {[S regex 14 0 {} {} eq \['\"\ \t\]*\[0-9.\]+\['\"\ \t\]*]} {
+				>
+					if {[S search 19 0 {} 4096 eq <svg]} {
+						>
+							emit {SVG Scalable Vector Graphics image}
+							mime image/svg+xml
+						<
+					}
+	
+					if {[S search 19 0 {} 4096 eq <gnc-v2]} {
+						>
+							emit {GnuCash file}
+							mime application/x-gnucash
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <svg]} {
+		>
+			emit {SVG Scalable Vector Graphics image}
+			mime image/svg
+		<
+	}
+	
+	if {[S string 0 0 t {} eq <?xml\ version=]} {
+		>
+			if {[S regex 14 0 {} {} eq \['\"\ \t\]*\[0-9.\]+\['\"\ \t\]*]} {
+				>
+					if {[S search 19 0 {} 4096 eq <urlset]} {
+						>
+							emit {XML Sitemap document text}
+							mime application/xml-sitemap
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <?xml\ version=]} {
+		>
+			if {[S regex 14 0 {} {} eq \['\"\ \t\]*\[0-9.\]+\['\"\ \t\]*]} {
+				>
+					if {[S search 19 0 {} 4096 eq <osm]} {
+						>
+							emit {OpenStreetMap XML data}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq <?xml\ version=\"]} {
+		>
+			if {[S search 19 0 {c W b t} 4096 eq <!doctype\ html]} {
+				>
+					emit {XHTML document text}
+					if {[S string 15 0 {} {} > \0]} {
+						>
+							emit {(version %.3s)}
+							mime text/html
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq <?xml\ version=']} {
+		>
+			if {[S search 19 0 {c W b t} 4096 eq <!doctype\ html]} {
+				>
+					emit {XHTML document text}
+					if {[S string 15 0 {} {} > \0]} {
+						>
+							emit {(version %.3s)}
+							mime text/html
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq <?xml\ version=\"]} {
+		>
+			if {[S search 19 0 {c W b t} 4096 eq <html]} {
+				>
+					emit {broken XHTML document text}
+					if {[S string 15 0 {} {} > \0]} {
+						>
+							emit {(version %.3s)}
+							mime text/html
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {c W t} 4096 eq <!doctype\ html]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c W b t} 4096 eq <!doctype\ svg]} {
+		>
+			emit {SVG XML document}
+			mime image/svg+xml
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c w t} 4096 eq <head>]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c W t} 4096 eq <head\ ]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c w t} 4096 eq <title>]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c W t} 4096 eq <title\ ]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c w t} 4096 eq <html>]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c W t} 4096 eq <html\ ]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c w t} 4096 eq <script>]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c W t} 4096 eq <script\ ]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c w t} 4096 eq <style>]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c W t} 4096 eq <style\ ]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c w t} 4096 eq <table>]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c W t} 4096 eq <table\ ]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c w t} 4096 eq <a\ href=]} {
+		>
+			emit {HTML document text}
+			mime text/html
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {c w t} 1 eq <?xml]} {
+		>
+			emit {XML document text}
+			mime text/xml
+			strength {+ 5}
+		<
+	}
+	
+	if {[S string 0 0 t {} eq <?xml\ version\ \"]} {
+		>
+			emit XML
+			mime text/xml
+			strength {+ 5}
+		<
+	}
+	
+	if {[S string 0 0 t {} eq <?xml\ version=\"]} {
+		>
+			emit XML
+			if {[S string 15 0 t {} > \0]} {
+				>
+					emit {%.3s document text}
+					if {[S search 23 0 {} 1 eq <xsl:stylesheet]} {
+						>
+							emit {(XSL stylesheet)}
+						<
+					}
+	
+					if {[S search 24 0 {} 1 eq <xsl:stylesheet]} {
+						>
+							emit {(XSL stylesheet)}
+						<
+					}
+	
+				<
+			}
+	
+			mime text/xml
+			strength {+ 5}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <?xml\ version=']} {
+		>
+			emit XML
+			if {[S string 15 0 t {} > \0]} {
+				>
+					emit {%.3s document text}
+					if {[S search 23 0 {} 1 eq <xsl:stylesheet]} {
+						>
+							emit {(XSL stylesheet)}
+						<
+					}
+	
+					if {[S search 24 0 {} 1 eq <xsl:stylesheet]} {
+						>
+							emit {(XSL stylesheet)}
+						<
+					}
+	
+				<
+			}
+	
+			mime text/xml
+			strength {+ 5}
+		<
+	}
+	
+	if {[S search 0 0 {w t} 1 eq <?XML]} {
+		>
+			emit {broken XML document text}
+			mime text/xml
+			strength {- 10}
+		<
+	}
+	
+	if {[S search 0 0 {c w t} 4096 eq <!doctype]} {
+		>
+			emit {exported SGML document text}
+		<
+	}
+	
+	if {[S search 0 0 {c w t} 4096 eq <!subdoc]} {
+		>
+			emit {exported SGML subdocument text}
+		<
+	}
+	
+	if {[S search 0 0 {c w t} 4096 eq <!--]} {
+		>
+			emit {exported SGML document text}
+			strength {- 10}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#\ HTTP\ Cookie\ File]} {
+		>
+			emit {Web browser cookie text}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#\ Netscape\ HTTP\ Cookie\ File]} {
+		>
+			emit {Netscape cookie text}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#\ KDE\ Cookie\ File]} {
+		>
+			emit {Konqueror cookie text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <?xml\ version=]} {
+		>
+			if {[S regex 14 0 {} {} eq \['\"\ \t\]*\[0-9.\]+\['\"\ \t\]*]} {
+				>
+					if {[S search 19 0 {} 4096 eq <pef]} {
+						>
+							emit {Portable Embosser Format}
+							mime application/x-pef+xml
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq .SYSTEM]} {
+		>
+			emit {SHARC architecture file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq .system]} {
+		>
+			emit {SHARC architecture file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq QL5]} {
+		>
+			emit {QL disk dump data,}
+			if {[S string 3 0 {} {} eq A]} {
+				>
+					emit {720 KB,}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq B]} {
+				>
+					emit {1.44 MB,}
+				<
+			}
+	
+			if {[S string 3 0 {} {} eq C]} {
+				>
+					emit {3.2 MB,}
+				<
+			}
+	
+			if {[S string 4 0 {} {} > \0]} {
+				>
+					emit label:%.10s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NqNqNq`\004]} {
+		>
+			emit {QL firmware executable (BCPL)}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^%?\[\ \t\]*SiSU\[\ \t\]+insert]} {
+		>
+			emit {SiSU text insert}
+			if {[S regex 5 0 {} {} eq \[0-9.\]+]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^%\[\ \t\]+SiSU\[\ \t\]+master]} {
+		>
+			emit {SiSU text master}
+			if {[S regex 5 0 {} {} eq \[0-9.\]+]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^%?\[\ \t\]*SiSU\[\ \t\]+text]} {
+		>
+			emit {SiSU text}
+			if {[S regex 5 0 {} {} eq \[0-9.\]+]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^%?\[\ \t\]*SiSU\[\ \t\]\[0-9.\]+]} {
+		>
+			emit {SiSU text}
+			if {[S regex 5 0 {} {} eq \[0-9.\]+]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^%*\[\ \t\]*sisu-\[0-9.\]+]} {
+		>
+			emit {SiSU text}
+			if {[S regex 5 0 {} {} eq \[0-9.\]+]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#\#Sketch]} {
+		>
+			emit {Sketch document text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GSTIm\0\0]} {
+		>
+			emit {GNU SmallTalk}
+			switch [Nv byte 7 0 & 1] {
+				0 {
+					>
+						emit {LE image version}
+						if {[N byte 10 0 0 {} {} x {}]} {
+							>
+								emit %d.
+							<
+						}
+	
+						if {[N byte 9 0 0 {} {} x {}]} {
+							>
+								emit {\b%d.}
+							<
+						}
+	
+						if {[N byte 8 0 0 {} {} x {}]} {
+							>
+								emit {\b%d}
+							<
+						}
+	
+					<
+				}
+				1 {
+					>
+						emit {BE image version}
+						if {[N byte 8 0 0 {} {} x {}]} {
+							>
+								emit %d.
+							<
+						}
+	
+						if {[N byte 9 0 0 {} {} x {}]} {
+							>
+								emit {\b%d.}
+							<
+						}
+	
+						if {[N byte 10 0 0 {} {} x {}]} {
+							>
+								emit {\b%d}
+							<
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq :)\n]} {
+		>
+			emit {Smile binary data}
+			if {[N byte 3 0 0 & -16 x {}]} {
+				>
+					emit {version %d:}
+				<
+			}
+	
+			switch [Nv byte 3 0 & 4] {
+				0 {
+					>
+						emit {binary encoded,}
+					<
+				}
+				4 {
+					>
+						emit {binary raw,}
+					<
+				}
+			}
+	
+			switch [Nv byte 3 0 & 2] {
+				0 {
+					>
+						emit {shared String values disabled,}
+					<
+				}
+				2 {
+					>
+						emit {shared String values enabled,}
+					<
+				}
+			}
+	
+			switch [Nv byte 3 0 & 1] {
+				0 {
+					>
+						emit {shared field names disabled}
+					<
+				}
+				1 {
+					>
+						emit {shared field names enabled}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RTSS]} {
+		>
+			emit {NetMon capture file}
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {- version %d}
+				<
+			}
+	
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+			switch [Nv leshort 6 0 {} {}] {
+				0 {
+					>
+						emit (Unknown)
+					<
+				}
+				1 {
+					>
+						emit (Ethernet)
+					<
+				}
+				2 {
+					>
+						emit {(Token Ring)}
+					<
+				}
+				3 {
+					>
+						emit (FDDI)
+					<
+				}
+				4 {
+					>
+						emit (ATM)
+					<
+				}
+			}
+	
+			if {[N leshort 6 0 0 {} {} > 4]} {
+				>
+					emit {(type %d)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq GMBU]} {
+		>
+			emit {NetMon capture file}
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {- version %d}
+				<
+			}
+	
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+			switch [Nv leshort 6 0 {} {}] {
+				0 {
+					>
+						emit (Unknown)
+					<
+				}
+				1 {
+					>
+						emit (Ethernet)
+					<
+				}
+				2 {
+					>
+						emit {(Token Ring)}
+					<
+				}
+				3 {
+					>
+						emit (FDDI)
+					<
+				}
+				4 {
+					>
+						emit (ATM)
+					<
+				}
+				5 {
+					>
+						emit {(IP-over-IEEE 1394)}
+					<
+				}
+				6 {
+					>
+						emit (802.11)
+					<
+				}
+				7 {
+					>
+						emit {(Raw IP)}
+					<
+				}
+				8 {
+					>
+						emit {(Raw IP)}
+					<
+				}
+				9 {
+					>
+						emit {(Raw IP)}
+					<
+				}
+			}
+	
+			if {[N leshort 6 0 0 {} {} > 9]} {
+				>
+					emit {(type %d)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TRSNIFF\ data\ \ \ \ \032]} {
+		>
+			emit {Sniffer capture file}
+			if {[N byte 33 0 0 {} {} == 2]} {
+				>
+					emit (compressed)
+				<
+			}
+	
+			if {[N leshort 23 0 0 {} {} x {}]} {
+				>
+					emit {- version %d}
+				<
+			}
+	
+			if {[N leshort 25 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+			switch [Nv byte 32 0 {} {}] {
+				0 {
+					>
+						emit {(Token Ring)}
+					<
+				}
+				1 {
+					>
+						emit (Ethernet)
+					<
+				}
+				2 {
+					>
+						emit (ARCNET)
+					<
+				}
+				3 {
+					>
+						emit (StarLAN)
+					<
+				}
+				4 {
+					>
+						emit {(PC Network broadband)}
+					<
+				}
+				5 {
+					>
+						emit (LocalTalk)
+					<
+				}
+				6 {
+					>
+						emit (Znet)
+					<
+				}
+				7 {
+					>
+						emit {(Internetwork Analyzer)}
+					<
+				}
+				9 {
+					>
+						emit (FDDI)
+					<
+				}
+				10 {
+					>
+						emit (ATM)
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XCP\0]} {
+		>
+			emit {NetXRay capture file}
+			if {[S string 4 0 {} {} > \0]} {
+				>
+					emit {- version %s}
+				<
+			}
+	
+			switch [Nv leshort 44 0 {} {}] {
+				0 {
+					>
+						emit (Ethernet)
+					<
+				}
+				1 {
+					>
+						emit {(Token Ring)}
+					<
+				}
+				2 {
+					>
+						emit (FDDI)
+					<
+				}
+				3 {
+					>
+						emit (WAN)
+					<
+				}
+				8 {
+					>
+						emit (ATM)
+					<
+				}
+				9 {
+					>
+						emit (802.11)
+					<
+				}
+			}
+	
+		<
+	}
+	
+	switch [Nv ubelong 0 0 {} {}] {
+		168627466 {
+			>
+				if {[N ubelong 8 0 0 {} {} == 439041101]} {
+					>
+						emit {pcap-ng capture file}
+						if {[N beshort 12 0 0 {} {} x {}]} {
+							>
+								emit {- version %d}
+							<
+						}
+	
+						if {[N beshort 14 0 0 {} {} x {}]} {
+							>
+								emit {\b.%d}
+							<
+						}
+	
+					<
+				}
+	
+			<
+		}
+		2712847316 {
+			>
+				emit {tcpdump capture file (big-endian)}
+				mime application/vnd.tcpdump.pcap
+				U 235 pcap-be 0
+	
+			<
+		}
+		2712849716 {
+			>
+				emit {extended tcpdump capture file (big-endian)}
+				U 235 pcap-be 0
+	
+			<
+		}
+	}
+	
+	if {[S string 0 0 {} {} eq iptrace\ 1.0]} {
+		>
+			emit {"iptrace" capture file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq iptrace\ 2.0]} {
+		>
+			emit {"iptrace" capture file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x54\x52\x00\x64\x00]} {
+		>
+			emit {"nettl" capture file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x42\xd2\x00\x34\x12\x66\x22\x88]} {
+		>
+			emit {RADCOM WAN/LAN Analyzer capture file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq NetS]} {
+		>
+			emit {NetStumbler log file}
+			if {[N lelong 8 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d stations found}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \177ver]} {
+		>
+			emit {EtherPeek/AiroPeek/OmniPeek capture file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x05VNF]} {
+		>
+			emit {Visual Networks traffic capture file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ObserverPktBuffe]} {
+		>
+			emit {Network Instruments Observer capture file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xaa\xaa\xaa\xaa]} {
+		>
+			emit {5View capture file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <!SQ\ DTD>]} {
+		>
+			emit {Compiled SGML rules file}
+			if {[S string 9 0 {} {} > \0]} {
+				>
+					emit {Type %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <!SQ\ A/E>]} {
+		>
+			emit {A/E SGML Document binary}
+			if {[S string 9 0 {} {} > \0]} {
+				>
+					emit {Type %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <!SQ\ STS>]} {
+		>
+			emit {A/E SGML binary styles file}
+			if {[S string 9 0 {} {} > \0]} {
+				>
+					emit {Type %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq SQ\ BITMAP1]} {
+		>
+			emit {SoftQuad Raster Format text}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq X\ ]} {
+		>
+			emit {SoftQuad troff Context intermediate}
+			if {[S string 2 0 {} {} eq 495]} {
+				>
+					emit {for AT&T 495 laser printer}
+				<
+			}
+	
+			if {[S string 2 0 {} {} eq hp]} {
+				>
+					emit {for Hewlett-Packard LaserJet}
+				<
+			}
+	
+			if {[S string 2 0 {} {} eq impr]} {
+				>
+					emit {for IMAGEN imPRESS}
+				<
+			}
+	
+			if {[S string 2 0 {} {} eq ps]} {
+				>
+					emit {for PostScript}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq X\ 495]} {
+		>
+			emit {SoftQuad troff Context intermediate for AT&T 495 laser printer}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq X\ hp]} {
+		>
+			emit {SoftQuad troff Context intermediate for HP LaserJet}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq X\ impr]} {
+		>
+			emit {SoftQuad troff Context intermediate for IMAGEN imPRESS}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq X\ ps]} {
+		>
+			emit {SoftQuad troff Context intermediate for PostScript}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq spec]} {
+		>
+			emit SPEC
+			if {[S string 4 0 {} {} eq .cpu]} {
+				>
+					emit CPU
+					if {[S string 8 0 {} {} < :]} {
+						>
+							emit {\b%.4s}
+						<
+					}
+	
+					if {[S string 12 0 {} {} eq .]} {
+						>
+							emit {raw result text}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 17 0 {} {} eq version=SPECjbb]} {
+		>
+			emit SPECjbb
+			if {[S string 32 0 {} {} < :]} {
+				>
+					emit {\b%.4s}
+					if {[S string 37 0 {} {} < :]} {
+						>
+							emit {v%.4s raw result text}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq BEGIN\040SPECWEB]} {
+		>
+			emit SPECweb
+			if {[S string 13 0 {} {} < :]} {
+				>
+					emit {\b%.2s}
+					if {[S string 15 0 {} {} eq _SSL]} {
+						>
+							emit {\b_SSL}
+							if {[S string 20 0 {} {} < :]} {
+								>
+									emit {v%.4s raw result text}
+								<
+							}
+	
+						<
+					}
+	
+					if {[S string 16 0 {} {} < :]} {
+						>
+							emit {v%.4s raw result text}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PLUS3DOS\032]} {
+		>
+			emit {Spectrum +3 data}
+			switch [Nv byte 15 0 {} {}] {
+				0 {
+					>
+						emit {- BASIC program}
+					<
+				}
+				1 {
+					>
+						emit {- number array}
+					<
+				}
+				2 {
+					>
+						emit {- character array}
+					<
+				}
+				3 {
+					>
+						emit {- memory block}
+						if {[N belong 16 0 0 {} {} == 1769536]} {
+							>
+								emit (screen)
+							<
+						}
+	
+					<
+				}
+				4 {
+					>
+						emit {- Tasword document}
+					<
+				}
+			}
+	
+			if {[S string 15 0 {} {} eq TAPEFILE]} {
+				>
+					emit {- ZXT tapefile}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \023\000\000]} {
+		>
+			if {[S string 4 0 {} {} > \0]} {
+				>
+					if {[S string 4 0 {} {} < \177]} {
+						>
+							emit {Spectrum .TAP data "%-10.10s"}
+							switch [Nv byte 3 0 {} {}] {
+								0 {
+									>
+										emit {- BASIC program}
+									<
+								}
+								1 {
+									>
+										emit {- number array}
+									<
+								}
+								2 {
+									>
+										emit {- character array}
+									<
+								}
+								3 {
+									>
+										emit {- memory block}
+										if {[N belong 14 0 0 {} {} == 1769536]} {
+											>
+												emit (screen)
+											<
+										}
+	
+									<
+								}
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ZXTape!\x1a]} {
+		>
+			emit {Spectrum .TZX data}
+			if {[N byte 8 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+			if {[N byte 9 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RZX!]} {
+		>
+			emit {Spectrum .RZX data}
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MV\ -\ CPCEMU\ Disk-Fil]} {
+		>
+			emit {Amstrad/Spectrum .DSK data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq MV\ -\ CPC\ format\ Dis]} {
+		>
+			emit {Amstrad/Spectrum DU54 .DSK data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq EXTENDED\ CPC\ DSK\ Fil]} {
+		>
+			emit {Amstrad/Spectrum Extended .DSK data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SINCLAIR]} {
+		>
+			emit {Spectrum .SCL Betadisk image}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RS-IDE\x1a]} {
+		>
+			emit {Spectrum .HDF hard disk image}
+			if {[N byte 7 0 0 {} {} x {}]} {
+				>
+					emit {\b, version 0x%02x}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ZXST]} {
+		>
+			emit {zx-state snapshot}
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {\b.%d}
+					switch [Nv byte 6 0 {} {}] {
+						0 {
+							>
+								emit {16k ZX Spectrum}
+							<
+						}
+						1 {
+							>
+								emit {48k ZX Spectrum/ZX Spectrum+}
+							<
+						}
+						2 {
+							>
+								emit {ZX Spectrum 128}
+							<
+						}
+						3 {
+							>
+								emit {ZX Spectrum +2}
+							<
+						}
+						4 {
+							>
+								emit {ZX Spectrum +2A/+2B}
+							<
+						}
+						5 {
+							>
+								emit {ZX Spectrum +3}
+							<
+						}
+						6 {
+							>
+								emit {ZX Spectrum +3e}
+							<
+						}
+						7 {
+							>
+								emit {Pentagon 128}
+							<
+						}
+						8 {
+							>
+								emit {Timex Sinclair TC2048}
+							<
+						}
+						9 {
+							>
+								emit {Timex Sinclair TC2068}
+							<
+						}
+						10 {
+							>
+								emit {Scorpion ZS-256}
+							<
+						}
+						11 {
+							>
+								emit {ZX Spectrum SE}
+							<
+						}
+						12 {
+							>
+								emit {Timex Sinclair TS2068}
+							<
+						}
+						13 {
+							>
+								emit {Pentagon 512}
+							<
+						}
+						14 {
+							>
+								emit {Pentagon 1024}
+							<
+						}
+						15 {
+							>
+								emit {48k ZX Spectrum (NTSC)}
+							<
+						}
+						16 {
+							>
+								emit {ZX Spectrum 12Ke}
+								if {[N byte 7 0 0 {} {} == 1]} {
+									>
+										emit {(alternate timings)}
+									<
+								}
+	
+							<
+						}
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \376bin]} {
+		>
+			emit {MySQL replication log,}
+			if {[N long 9 0 0 {} {} x {}]} {
+				>
+					emit {server id %d}
+				<
+			}
+	
+			switch [Nv byte 8 0 {} {}] {
+				1 {
+					>
+						switch [Nv long 13 0 {} {}] {
+							69 {
+								>
+									emit {\b, MySQL V3.2.3}
+									if {[S string 19 0 {} {} x {}]} {
+										>
+											emit {\b, server version %s}
+										<
+									}
+	
+								<
+							}
+							75 {
+								>
+									emit {\b, MySQL V4.0.2-V4.1}
+									if {[S string 25 0 {} {} x {}]} {
+										>
+											emit {\b, server version %s}
+										<
+									}
+	
+								<
+							}
+						}
+	
+					<
+				}
+				15 {
+					>
+						emit {MySQL V5+,}
+						if {[S string 25 0 {} {} x {}]} {
+							>
+								emit {server version %s}
+							<
+						}
+	
+					<
+				}
+			}
+	
+			if {[S string 4 0 {} {} eq MARIALOG]} {
+				>
+					emit {MySQL Maria transaction log file}
+					if {[N byte 3 0 0 {} {} x {}]} {
+						>
+							emit {Version %d}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq iRivDB]} {
+		>
+			emit {iRiver Database file}
+			if {[S string 11 0 {} {} > \0]} {
+				>
+					emit {Version %s}
+				<
+			}
+	
+			if {[S string 39 0 {} {} eq iHP-100]} {
+				>
+					emit {[H Series]}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq **\ This\ file\ contains\ an\ SQLite]} {
+		>
+			emit {SQLite 2.x database}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SQLite\ format\ 3]} {
+		>
+			emit {SQLite 3.x database}
+			if {[N belong 60 0 0 {} {} == 1598903374]} {
+				>
+					emit {(Monotone source repository)}
+				<
+			}
+	
+			switch [Nv belong 68 0 {} {}] {
+				252006673 {
+					>
+						emit {(Fossil repository)}
+					<
+				}
+				252006674 {
+					>
+						emit {(Fossil checkout)}
+					<
+				}
+				252006675 {
+					>
+						emit {(Fossil global configuration)}
+					<
+				}
+				1113932898 {
+					>
+						emit {(Bentley Systems BeSQLite Database)}
+					<
+				}
+				1113934958 {
+					>
+						emit {(Bentley Systems Localization File)}
+					<
+				}
+				1196444487 {
+					>
+						emit {(OGC GeoPackage file)}
+					<
+				}
+			}
+	
+			if {[D 68]} {
+				>
+					if {[N belong 68 0 0 {} {} != 0]} {
+						>
+							emit {\b, application id %u}
+						<
+					}
+	
+					if {[N belong 60 0 0 {} {} != 0]} {
+						>
+							emit {\b, user version %d}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N belong 96 0 0 {} {} x {}]} {
+				>
+					emit {\b, last written using SQLite version %d}
+				<
+			}
+	
+			mime application/x-sqlite3
+			ext sqlite/sqlite3/db/dbe
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xd9\xd5\x05\xf9\x20\xa1\x63\xd7]} {
+		>
+			emit {SQLite Rollback Journal}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PSDB\0]} {
+		>
+			emit {Panasonic channel list DataBase}
+			if {[S string 126 0 {} {} eq SQLite\ format\ 3]} {
+				>
+					emit {\b; contains}
+					T [R -15] {}
+	
+				<
+			}
+	
+			ext db/bin
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq --\ H2\ 0.5/B\ --\ \n]} {
+		>
+			emit {H2 Database file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SSH\ PRIVATE\ KEY]} {
+		>
+			emit {OpenSSH RSA1 private key,}
+			if {[S string 28 0 {} {} > \0]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq -----BEGIN\ OPENSSH\ PRIVATE\ KEY-----]} {
+		>
+			emit {OpenSSH private key}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ssh-dss\ ]} {
+		>
+			emit {OpenSSH DSA public key}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ssh-rsa\ ]} {
+		>
+			emit {OpenSSH RSA public key}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ecdsa-sha2-nistp256]} {
+		>
+			emit {OpenSSH ECDSA public key}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ecdsa-sha2-nistp384]} {
+		>
+			emit {OpenSSH ECDSA public key}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ecdsa-sha2-nistp521]} {
+		>
+			emit {OpenSSH ECDSA public key}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ssh-ed25519]} {
+		>
+			emit {OpenSSH ED25519 public key}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq -----BEGIN\040CERTIFICATE-----]} {
+		>
+			emit {PEM certificate}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq -----BEGIN\040CERTIFICATE\040REQ]} {
+		>
+			emit {PEM certificate request}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq -----BEGIN\040RSA\040PRIVATE]} {
+		>
+			emit {PEM RSA private key}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq -----BEGIN\040DSA\040PRIVATE]} {
+		>
+			emit {PEM DSA private key}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq -----BEGIN\040EC\040PRIVATE]} {
+		>
+			emit {PEM EC private key}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq -----BEGIN\040ECDSA\040PRIVATE]} {
+		>
+			emit {PEM ECDSA private key}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Salted__]} {
+		>
+			emit {openssl enc'd data with salted password}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq U2FsdGVkX1]} {
+		>
+			emit {openssl enc'd data with salted password, base64 encoded}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#SUNPC_CONFIG]} {
+		>
+			emit {SunPC 4.0 Properties Values}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq snoop]} {
+		>
+			emit {Snoop capture file}
+			if {[N belong 8 0 0 {} {} > 0]} {
+				>
+					emit {- version %d}
+				<
+			}
+	
+			switch [Nv belong 12 0 {} {}] {
+				0 {
+					>
+						emit {(IEEE 802.3)}
+					<
+				}
+				1 {
+					>
+						emit {(IEEE 802.4)}
+					<
+				}
+				2 {
+					>
+						emit {(IEEE 802.5)}
+					<
+				}
+				3 {
+					>
+						emit {(IEEE 802.6)}
+					<
+				}
+				4 {
+					>
+						emit (Ethernet)
+					<
+				}
+				5 {
+					>
+						emit (HDLC)
+					<
+				}
+				6 {
+					>
+						emit {(Character synchronous)}
+					<
+				}
+				7 {
+					>
+						emit {(IBM channel-to-channel adapter)}
+					<
+				}
+				8 {
+					>
+						emit (FDDI)
+					<
+				}
+				9 {
+					>
+						emit (Other)
+					<
+				}
+				10 {
+					>
+						emit {(type %d)}
+					<
+				}
+				11 {
+					>
+						emit {(type %d)}
+					<
+				}
+				12 {
+					>
+						emit {(type %d)}
+					<
+				}
+				13 {
+					>
+						emit {(type %d)}
+					<
+				}
+				14 {
+					>
+						emit {(type %d)}
+					<
+				}
+				15 {
+					>
+						emit {(type %d)}
+					<
+				}
+				16 {
+					>
+						emit {(Fibre Channel)}
+					<
+				}
+				17 {
+					>
+						emit (ATM)
+					<
+				}
+				18 {
+					>
+						emit {(ATM Classical IP)}
+					<
+				}
+				19 {
+					>
+						emit {(type %d)}
+					<
+				}
+				20 {
+					>
+						emit {(type %d)}
+					<
+				}
+				21 {
+					>
+						emit {(type %d)}
+					<
+				}
+				22 {
+					>
+						emit {(type %d)}
+					<
+				}
+				23 {
+					>
+						emit {(type %d)}
+					<
+				}
+				24 {
+					>
+						emit {(type %d)}
+					<
+				}
+				25 {
+					>
+						emit {(type %d)}
+					<
+				}
+				26 {
+					>
+						emit {(IP over Infiniband)}
+					<
+				}
+			}
+	
+			if {[N belong 12 0 0 {} {} > 26]} {
+				>
+					emit {(type %d)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Cobalt\ Networks\ Inc.\nFirmware\ v]} {
+		>
+			emit {Paged COBALT boot rom}
+			if {[S string 38 0 {} {} x {}]} {
+				>
+					emit V%.4s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CRfs]} {
+		>
+			emit {COBALT boot rom data (Flat boot rom or file system)}
+		<
+	}
+	
+	if {[S string 48 0 {} {} eq SymExe]} {
+		>
+			emit {SymbOS executable}
+			if {[N ubyte 54 0 0 {} {} x {}]} {
+				>
+					emit v%c
+				<
+			}
+	
+			if {[N ubyte 55 0 0 {} {} x {}]} {
+				>
+					emit {\b.%c}
+				<
+			}
+	
+			if {[S string 15 0 {} {} x {}]} {
+				>
+					emit {\b, name: %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq INFOq\0]} {
+		>
+			emit {SymbOS DOX document}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SMD1]} {
+		>
+			emit {SymbOS driver}
+			if {[N byte 19 0 0 {} {} x {}]} {
+				>
+					emit {\b, name: %c}
+				<
+			}
+	
+			if {[N byte 20 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 21 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 22 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 23 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 24 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 25 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 26 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 27 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 28 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 29 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 30 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[N byte 31 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SymVid]} {
+		>
+			emit {SymbOS video}
+			if {[N ubyte 6 0 0 {} {} x {}]} {
+				>
+					emit v%c
+				<
+			}
+	
+			if {[N ubyte 7 0 0 {} {} x {}]} {
+				>
+					emit {\b.%c}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N ubeshort 0 0 0 & 65408 == 61440]} {
+		>
+			emit {SysEx File -}
+			switch [Nv byte 1 0 {} {}] {
+				1 {
+					>
+						emit Sequential
+					<
+				}
+				2 {
+					>
+						emit IDP
+					<
+				}
+				3 {
+					>
+						emit OctavePlateau
+					<
+				}
+				4 {
+					>
+						emit Moog
+					<
+				}
+				5 {
+					>
+						emit Passport
+					<
+				}
+				6 {
+					>
+						emit Lexicon
+					<
+				}
+				7 {
+					>
+						emit {Kurzweil/Future Retro}
+						if {[N byte 3 0 0 {} {} == 119]} {
+							>
+								emit 777
+							<
+						}
+	
+						switch [Nv byte 4 0 {} {}] {
+							0 {
+								>
+									emit Bank
+								<
+							}
+							1 {
+								>
+									emit Song
+								<
+							}
+						}
+	
+						switch [Nv byte 5 0 {} {}] {
+							0 {
+								>
+									emit 1
+								<
+							}
+							1 {
+								>
+									emit 2
+								<
+							}
+							2 {
+								>
+									emit 3
+								<
+							}
+							3 {
+								>
+									emit 4
+								<
+							}
+							4 {
+								>
+									emit 5
+								<
+							}
+							5 {
+								>
+									emit 6
+								<
+							}
+							6 {
+								>
+									emit 7
+								<
+							}
+							7 {
+								>
+									emit 8
+								<
+							}
+							8 {
+								>
+									emit 9
+								<
+							}
+							9 {
+								>
+									emit 10
+								<
+							}
+							10 {
+								>
+									emit 11
+								<
+							}
+							11 {
+								>
+									emit 12
+								<
+							}
+							12 {
+								>
+									emit 13
+								<
+							}
+							13 {
+								>
+									emit 14
+								<
+							}
+							14 {
+								>
+									emit 15
+								<
+							}
+							15 {
+								>
+									emit 16
+								<
+							}
+							16 {
+								>
+									emit (ALL)
+								<
+							}
+						}
+	
+						if {[N byte 2 0 0 {} {} x {}]} {
+							>
+								emit {\b, Channel %d}
+							<
+						}
+	
+					<
+				}
+				8 {
+					>
+						emit Fender
+					<
+				}
+				9 {
+					>
+						emit Gulbransen
+					<
+				}
+				10 {
+					>
+						emit AKG
+					<
+				}
+				11 {
+					>
+						emit Voyce
+					<
+				}
+				12 {
+					>
+						emit Waveframe
+					<
+				}
+				13 {
+					>
+						emit ADA
+					<
+				}
+				14 {
+					>
+						emit Garfield
+					<
+				}
+				15 {
+					>
+						emit Ensoniq
+					<
+				}
+				16 {
+					>
+						emit Oberheim
+						if {[N byte 2 0 0 {} {} == 6]} {
+							>
+								emit {Matrix 6 series}
+							<
+						}
+	
+						switch [Nv byte 3 0 {} {}] {
+							1 {
+								>
+									emit {Dump (Bank)}
+								<
+							}
+							10 {
+								>
+									emit {Dump (All)}
+								<
+							}
+						}
+	
+						if {[N belong 4 0 0 {} {} == 132110]} {
+							>
+								emit {Matrix 1000}
+								if {[N byte 11 0 0 {} {} < 2]} {
+									>
+										emit {User bank %d}
+									<
+								}
+	
+								if {[N byte 11 0 0 {} {} > 1]} {
+									>
+										emit {Preset bank %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				17 {
+					>
+						emit Apple
+					<
+				}
+				18 {
+					>
+						emit GreyMatter
+					<
+				}
+				20 {
+					>
+						emit PalmTree
+					<
+				}
+				21 {
+					>
+						emit JLCooper
+					<
+				}
+				22 {
+					>
+						emit Lowrey
+					<
+				}
+				23 {
+					>
+						emit AdamsSmith
+					<
+				}
+				24 {
+					>
+						emit E-mu
+					<
+				}
+				25 {
+					>
+						emit Harmony
+					<
+				}
+				26 {
+					>
+						emit ART
+					<
+				}
+				27 {
+					>
+						emit Baldwin
+					<
+				}
+				28 {
+					>
+						emit Eventide
+					<
+				}
+				29 {
+					>
+						emit Inventronics
+					<
+				}
+				31 {
+					>
+						emit Clarity
+					<
+				}
+				33 {
+					>
+						emit SIEL
+					<
+				}
+				34 {
+					>
+						emit Synthaxe
+					<
+				}
+				36 {
+					>
+						emit Hohner
+					<
+				}
+				37 {
+					>
+						emit Twister
+					<
+				}
+				38 {
+					>
+						emit Solton
+					<
+				}
+				39 {
+					>
+						emit Jellinghaus
+					<
+				}
+				40 {
+					>
+						emit Southworth
+					<
+				}
+				41 {
+					>
+						emit PPG
+					<
+				}
+				42 {
+					>
+						emit JEN
+					<
+				}
+				43 {
+					>
+						emit SSL
+					<
+				}
+				44 {
+					>
+						emit AudioVertrieb
+					<
+				}
+				47 {
+					>
+						emit ELKA
+						if {[N byte 3 0 0 {} {} == 9]} {
+							>
+								emit EK-44
+							<
+						}
+	
+					<
+				}
+				48 {
+					>
+						emit Dynacord
+					<
+				}
+				49 {
+					>
+						emit Jomox
+					<
+				}
+				51 {
+					>
+						emit Clavia
+					<
+				}
+				57 {
+					>
+						emit Soundcraft
+					<
+				}
+				62 {
+					>
+						emit Waldorf
+						switch [Nv byte 2 0 {} {}] {
+							0 {
+								>
+									emit microWave
+								<
+							}
+							3 {
+								>
+									emit Wave
+									switch [Nv byte 4 0 {} {}] {
+										0 {
+											>
+												emit {SBPR (Soundprogram)}
+											<
+										}
+										1 {
+											>
+												emit {SAPR (Performance)}
+											<
+										}
+										2 {
+											>
+												emit {SWAVE (Wave)}
+											<
+										}
+										3 {
+											>
+												emit {SWTBL (Wave control table)}
+											<
+										}
+										4 {
+											>
+												emit {SVT (Velocity Curve)}
+											<
+										}
+										5 {
+											>
+												emit {STT (Tuning Table)}
+											<
+										}
+										6 {
+											>
+												emit {SGLB (Global Parameters)}
+											<
+										}
+										7 {
+											>
+												emit {SARRMAP (Performance Program Change Map)}
+											<
+										}
+										8 {
+											>
+												emit {SBPRMAP (Sound Program Change Map)}
+											<
+										}
+										9 {
+											>
+												emit {SBPRPAR (Sound Parameter)}
+											<
+										}
+										10 {
+											>
+												emit {SARRPAR (Performance Parameter)}
+											<
+										}
+										11 {
+											>
+												emit {SINSPAR (Instrument/External Parameter)}
+											<
+										}
+										15 {
+											>
+												emit {SBULK (Bulk Switch on/off)}
+											<
+										}
+									}
+	
+								<
+							}
+							14 {
+								>
+									emit {microwave2 / XT}
+								<
+							}
+							15 {
+								>
+									emit {Q / Q+}
+								<
+							}
+							16 {
+								>
+									emit microQ
+									switch [Nv byte 4 0 {} {}] {
+										0 {
+											>
+												emit {SNDR (Sound Request)}
+											<
+										}
+										1 {
+											>
+												emit {MULR (Multi Request)}
+											<
+										}
+										2 {
+											>
+												emit {DRMR (Drum Map Request)}
+											<
+										}
+										4 {
+											>
+												emit {GLBR (Global Parameter Request)}
+											<
+										}
+										16 {
+											>
+												emit {SNDD (Sound Dump)}
+											<
+										}
+										17 {
+											>
+												emit {MULD (Multi Dump)}
+											<
+										}
+										18 {
+											>
+												emit {DRMD (Drum Map Dump)}
+											<
+										}
+										20 {
+											>
+												emit {GLBD (Global Parameter Dump)}
+											<
+										}
+										32 {
+											>
+												emit {SNDP (Sound Parameter Change)}
+											<
+										}
+										33 {
+											>
+												emit {MULP (Multi Parameter Change)}
+											<
+										}
+										34 {
+											>
+												emit {DRMP (Drum Map Parameter Change)}
+											<
+										}
+										36 {
+											>
+												emit {GLBP (Global Parameter Parameter Change)}
+											<
+										}
+										48 {
+											>
+												emit {SNDQ (Sound Parameter Inquiry)}
+											<
+										}
+										49 {
+											>
+												emit {MULQ (Multi Parameter Inquiry)}
+											<
+										}
+										50 {
+											>
+												emit {DRMQ (Drum Map Parameter Inquiry)}
+											<
+										}
+										52 {
+											>
+												emit {GLBQ (Global Parameter Parameter Inquiry)}
+											<
+										}
+										112 {
+											>
+												emit {(Sound Reserved)}
+											<
+										}
+										113 {
+											>
+												emit {OS (Multi Reserved)}
+											<
+										}
+										114 {
+											>
+												emit {BIN (Drum Map Reserved)}
+											<
+										}
+									}
+	
+								<
+							}
+							17 {
+								>
+									emit rackAttack
+									switch [Nv byte 4 0 {} {}] {
+										0 {
+											>
+												emit {SNDR (Sound Parameter Request)}
+											<
+										}
+										1 {
+											>
+												emit {PRGR (Program Parameter Request)}
+											<
+										}
+										3 {
+											>
+												emit {PATR (Pattern Parameter Request)}
+											<
+										}
+										4 {
+											>
+												emit {GLBR (Global Parameter Request)}
+											<
+										}
+										5 {
+											>
+												emit {EFXR (FX Parameter Request)}
+											<
+										}
+										7 {
+											>
+												emit {MODR (Mode Command Request)}
+											<
+										}
+										16 {
+											>
+												emit {SNDD (Sound Parameter Dump)}
+											<
+										}
+										17 {
+											>
+												emit {PRGD (Program Parameter Dump)}
+											<
+										}
+										19 {
+											>
+												emit {PATD (Pattern Parameter Dump)}
+											<
+										}
+										20 {
+											>
+												emit {GLBD (Global Parameter Dump)}
+											<
+										}
+										21 {
+											>
+												emit {EFXD (FX Parameter Dump)}
+											<
+										}
+										23 {
+											>
+												emit {MODD (Mode Command Dump)}
+											<
+										}
+										32 {
+											>
+												emit {SNDP (Sound Parameter Parameter Change)}
+											<
+										}
+										33 {
+											>
+												emit {PRGP (Program Parameter Parameter Change)}
+											<
+										}
+										35 {
+											>
+												emit {PATP (Pattern Parameter Parameter Change)}
+											<
+										}
+										36 {
+											>
+												emit {GLBP (Global Parameter Parameter Change)}
+											<
+										}
+										37 {
+											>
+												emit {EFXP (FX Parameter Parameter Change)}
+											<
+										}
+										39 {
+											>
+												emit {MODP (Mode Command Parameter Change)}
+											<
+										}
+										48 {
+											>
+												emit {SNDQ (Sound Parameter Parameter Inquiry)}
+											<
+										}
+										49 {
+											>
+												emit {PRGQ (Program Parameter Parameter Inquiry)}
+											<
+										}
+										51 {
+											>
+												emit {PATQ (Pattern Parameter Parameter Inquiry)}
+											<
+										}
+										52 {
+											>
+												emit {GLBQ (Global Parameter Parameter Inquiry)}
+											<
+										}
+										53 {
+											>
+												emit {EFXQ (FX Parameter Parameter Inquiry)}
+											<
+										}
+										55 {
+											>
+												emit {MODQ (Mode Command Parameter Inquiry)}
+											<
+										}
+										113 {
+											>
+												emit {OS (Program Parameter Reserved)}
+											<
+										}
+									}
+	
+								<
+							}
+						}
+	
+						switch [Nv byte 3 0 {} {}] {
+							0 {
+								>
+									emit {(default id)}
+								<
+							}
+							127 {
+								>
+									emit {Microwave I}
+									switch [Nv byte 4 0 {} {}] {
+										0 {
+											>
+												emit {SNDR (Sound Request)}
+											<
+										}
+										1 {
+											>
+												emit {MULR (Multi Request)}
+											<
+										}
+										2 {
+											>
+												emit {DRMR (Drum Map Request)}
+											<
+										}
+										3 {
+											>
+												emit {PATR (Sequencer Pattern Request)}
+											<
+										}
+										4 {
+											>
+												emit {GLBR (Global Parameter Request)}
+											<
+										}
+										7 {
+											>
+												emit {MODR (Mode Parameter Request)}
+											<
+										}
+										16 {
+											>
+												emit {SNDD (Sound Dump)}
+											<
+										}
+										17 {
+											>
+												emit {MULD (Multi Dump)}
+											<
+										}
+										18 {
+											>
+												emit {DRMD (Drum Map Dump)}
+											<
+										}
+										19 {
+											>
+												emit {PATD (Sequencer Pattern Dump)}
+											<
+										}
+										20 {
+											>
+												emit {GLBD (Global Parameter Dump)}
+											<
+										}
+										23 {
+											>
+												emit {MODD (Mode Parameter Dump)}
+											<
+										}
+										32 {
+											>
+												emit {SNDP (Sound Parameter Change)}
+											<
+										}
+										33 {
+											>
+												emit {MULP (Multi Parameter Change)}
+											<
+										}
+										34 {
+											>
+												emit {DRMP (Drum Map Parameter Change)}
+											<
+										}
+										35 {
+											>
+												emit {PATP (Sequencer Pattern Parameter Change)}
+											<
+										}
+										36 {
+											>
+												emit {GLBP (Global Parameter Parameter Change)}
+											<
+										}
+										39 {
+											>
+												emit {MODP (Mode Parameter Parameter Change)}
+											<
+										}
+										48 {
+											>
+												emit {SNDQ (Sound Parameter Inquiry)}
+											<
+										}
+										49 {
+											>
+												emit {MULQ (Multi Parameter Inquiry)}
+											<
+										}
+										50 {
+											>
+												emit {DRMQ (Drum Map Parameter Inquiry)}
+											<
+										}
+										51 {
+											>
+												emit {PATQ (Sequencer Pattern Parameter Inquiry)}
+											<
+										}
+										52 {
+											>
+												emit {GLBQ (Global Parameter Parameter Inquiry)}
+											<
+										}
+										55 {
+											>
+												emit {MODQ (Mode Parameter Parameter Inquiry)}
+											<
+										}
+										112 {
+											>
+												emit {BOOT (Sound Reserved)}
+											<
+										}
+										113 {
+											>
+												emit {OS (Multi Reserved)}
+											<
+										}
+										114 {
+											>
+												emit {BIN (Drum Map Reserved)}
+											<
+										}
+										115 {
+											>
+												emit {AFM (Sequencer Pattern Reserved)}
+											<
+										}
+									}
+	
+								<
+							}
+						}
+	
+						if {[N byte 3 0 0 {} {} > 0]} {
+							>
+								emit (
+								if {[N byte 3 0 0 {} {} < 127]} {
+									>
+										emit {\bdevice %d)}
+									<
+								}
+	
+								if {[N byte 3 0 0 {} {} == 127]} {
+									>
+										emit {\bbroadcast id)}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				64 {
+					>
+						emit Kawai
+						switch [Nv byte 3 0 {} {}] {
+							32 {
+								>
+									emit K1
+								<
+							}
+							34 {
+								>
+									emit K4
+								<
+							}
+						}
+	
+					<
+				}
+				65 {
+					>
+						emit Roland
+						switch [Nv byte 3 0 {} {}] {
+							2 {
+								>
+									emit TR-707
+								<
+							}
+							20 {
+								>
+									emit D-50
+								<
+							}
+							43 {
+								>
+									emit U-220
+								<
+							}
+						}
+	
+					<
+				}
+				66 {
+					>
+						emit Korg
+						if {[N byte 3 0 0 {} {} == 25]} {
+							>
+								emit M1
+							<
+						}
+	
+					<
+				}
+				67 {
+					>
+						emit Yamaha
+					<
+				}
+				68 {
+					>
+						emit Casio
+					<
+				}
+				70 {
+					>
+						emit Kamiya
+					<
+				}
+				71 {
+					>
+						emit Akai
+					<
+				}
+				72 {
+					>
+						emit Victor
+					<
+				}
+				73 {
+					>
+						emit Mesosha
+					<
+				}
+				75 {
+					>
+						emit Fujitsu
+					<
+				}
+				76 {
+					>
+						emit Sony
+					<
+				}
+				78 {
+					>
+						emit Teac
+					<
+				}
+				80 {
+					>
+						emit Matsushita
+					<
+				}
+				81 {
+					>
+						emit Fostex
+					<
+				}
+				82 {
+					>
+						emit Zoom
+					<
+				}
+				84 {
+					>
+						emit Matsushita
+					<
+				}
+				87 {
+					>
+						emit {Acoustic tech. lab.}
+					<
+				}
+			}
+	
+			switch [Nv belong 1 0 & -256] {
+				29696 {
+					>
+						emit {Ta Horng}
+					<
+				}
+				29952 {
+					>
+						emit e-Tek
+					<
+				}
+				30208 {
+					>
+						emit E-Voice
+					<
+				}
+				30464 {
+					>
+						emit Midisoft
+					<
+				}
+				30720 {
+					>
+						emit Q-Sound
+					<
+				}
+				30976 {
+					>
+						emit Westrex
+					<
+				}
+				31232 {
+					>
+						emit Nvidia*
+					<
+				}
+				31488 {
+					>
+						emit ESS
+					<
+				}
+				31744 {
+					>
+						emit Mediatrix
+					<
+				}
+				32000 {
+					>
+						emit Brooktree
+					<
+				}
+				32256 {
+					>
+						emit Otari
+					<
+				}
+				32512 {
+					>
+						emit {Key Electronics}
+					<
+				}
+				65536 {
+					>
+						emit Shure
+					<
+				}
+				65792 {
+					>
+						emit AuraSound
+					<
+				}
+				66048 {
+					>
+						emit Crystal
+					<
+				}
+				66304 {
+					>
+						emit Rockwell
+					<
+				}
+				66560 {
+					>
+						emit {Silicon Graphics}
+					<
+				}
+				66816 {
+					>
+						emit Midiman
+					<
+				}
+				67072 {
+					>
+						emit PreSonus
+					<
+				}
+				67584 {
+					>
+						emit Topaz
+					<
+				}
+				67840 {
+					>
+						emit {Cast Lightning}
+					<
+				}
+				68096 {
+					>
+						emit Microsoft
+					<
+				}
+				68352 {
+					>
+						emit {Sonic Foundry}
+					<
+				}
+				68608 {
+					>
+						emit {Line 6}
+					<
+				}
+				68864 {
+					>
+						emit {Beatnik Inc.}
+					<
+				}
+				69120 {
+					>
+						emit {Van Koerving}
+					<
+				}
+				69376 {
+					>
+						emit {Altech Systems}
+					<
+				}
+				69632 {
+					>
+						emit {S & S Research}
+					<
+				}
+				69888 {
+					>
+						emit {VLSI Technology}
+					<
+				}
+				70144 {
+					>
+						emit Chromatic
+					<
+				}
+				70400 {
+					>
+						emit Sapphire
+					<
+				}
+				70656 {
+					>
+						emit IDRC
+					<
+				}
+				70912 {
+					>
+						emit {Justonic Tuning}
+					<
+				}
+				71168 {
+					>
+						emit TorComp
+					<
+				}
+				71424 {
+					>
+						emit {Newtek Inc.}
+					<
+				}
+				71680 {
+					>
+						emit {Sound Sculpture}
+					<
+				}
+				71936 {
+					>
+						emit {Walker Technical}
+					<
+				}
+				72192 {
+					>
+						emit {Digital Harmony}
+					<
+				}
+				72448 {
+					>
+						emit InVision
+					<
+				}
+				72704 {
+					>
+						emit T-Square
+					<
+				}
+				72960 {
+					>
+						emit Nemesys
+					<
+				}
+				73216 {
+					>
+						emit DBX
+					<
+				}
+				73472 {
+					>
+						emit Syndyne
+					<
+				}
+				73728 {
+					>
+						emit Bitheadz
+					<
+				}
+				73984 {
+					>
+						emit Cakewalk
+					<
+				}
+				74240 {
+					>
+						emit Staccato
+					<
+				}
+				74496 {
+					>
+						emit {National Semicon.}
+					<
+				}
+				74752 {
+					>
+						emit {Boom Theory}
+					<
+				}
+				75008 {
+					>
+						emit {Virtual DSP Corp}
+					<
+				}
+				75264 {
+					>
+						emit Antares
+					<
+				}
+				75520 {
+					>
+						emit {Angel Software}
+					<
+				}
+				75776 {
+					>
+						emit {St Louis Music}
+					<
+				}
+				76032 {
+					>
+						emit {Lyrrus dba G-VOX}
+					<
+				}
+				76288 {
+					>
+						emit {Ashley Audio}
+					<
+				}
+				76544 {
+					>
+						emit Vari-Lite
+					<
+				}
+				76800 {
+					>
+						emit {Summit Audio}
+					<
+				}
+				77056 {
+					>
+						emit {Aureal Semicon.}
+					<
+				}
+				77312 {
+					>
+						emit SeaSound
+					<
+				}
+				77568 {
+					>
+						emit {U.S. Robotics}
+					<
+				}
+				77824 {
+					>
+						emit Aurisis
+					<
+				}
+				78080 {
+					>
+						emit {Nearfield Multimedia}
+					<
+				}
+				78336 {
+					>
+						emit {FM7 Inc.}
+					<
+				}
+				78592 {
+					>
+						emit {Swivel Systems}
+					<
+				}
+				78848 {
+					>
+						emit Hyperactive
+					<
+				}
+				79104 {
+					>
+						emit MidiLite
+					<
+				}
+				79360 {
+					>
+						emit Radical
+					<
+				}
+				79616 {
+					>
+						emit {Roger Linn}
+					<
+				}
+				79872 {
+					>
+						emit Helicon
+					<
+				}
+				80128 {
+					>
+						emit Event
+					<
+				}
+				80384 {
+					>
+						emit {Sonic Network}
+					<
+				}
+				80640 {
+					>
+						emit {Realtime Music}
+					<
+				}
+				80896 {
+					>
+						emit {Apogee Digital}
+					<
+				}
+				2108160 {
+					>
+						emit {Medeli Electronics}
+					<
+				}
+				2108416 {
+					>
+						emit {Charlie Lab}
+					<
+				}
+				2108672 {
+					>
+						emit {Blue Chip Music}
+					<
+				}
+				2108928 {
+					>
+						emit {BEE OH Corp}
+					<
+				}
+				2109184 {
+					>
+						emit {LG Semicon America}
+					<
+				}
+				2109440 {
+					>
+						emit TESI
+					<
+				}
+				2109696 {
+					>
+						emit EMAGIC
+					<
+				}
+				2109952 {
+					>
+						emit Behringer
+					<
+				}
+				2110208 {
+					>
+						emit {Access Music}
+					<
+				}
+				2110464 {
+					>
+						emit Synoptic
+					<
+				}
+				2110720 {
+					>
+						emit {Hanmesoft Corp}
+					<
+				}
+				2110976 {
+					>
+						emit Terratec
+					<
+				}
+				2111232 {
+					>
+						emit {Proel SpA}
+					<
+				}
+				2111488 {
+					>
+						emit {IBK MIDI}
+					<
+				}
+				2111744 {
+					>
+						emit IRCAM
+					<
+				}
+				2112000 {
+					>
+						emit {Propellerhead Software}
+					<
+				}
+				2112256 {
+					>
+						emit {Red Sound Systems}
+					<
+				}
+				2112512 {
+					>
+						emit {Electron ESI AB}
+					<
+				}
+				2112768 {
+					>
+						emit {Sintefex Audio}
+					<
+				}
+				2113024 {
+					>
+						emit {Music and More}
+					<
+				}
+				2113280 {
+					>
+						emit Amsaro
+					<
+				}
+				2113536 {
+					>
+						emit {CDS Advanced Technology}
+					<
+				}
+				2113792 {
+					>
+						emit {Touched by Sound}
+					<
+				}
+				2114048 {
+					>
+						emit {DSP Arts}
+					<
+				}
+				2114304 {
+					>
+						emit {Phil Rees Music}
+					<
+				}
+				2114560 {
+					>
+						emit {Stamer Musikanlagen GmbH}
+					<
+				}
+				2114816 {
+					>
+						emit Soundart
+					<
+				}
+				2115072 {
+					>
+						emit {C-Mexx Software}
+					<
+				}
+				2115328 {
+					>
+						emit {Klavis Tech.}
+					<
+				}
+				2115584 {
+					>
+						emit {Noteheads AB}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq T707]} {
+		>
+			emit {Roland TR-707 Data}
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!\ /usr/bin/tcl]} {
+		>
+			emit {Tcl script text executable}
+			mime text/x-tcl
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!\ /usr/local/bin/tcl]} {
+		>
+			emit {Tcl script text executable}
+			mime text/x-tcl
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#!/usr/bin/env\ tcl]} {
+		>
+			emit {Tcl script text executable}
+			mime text/x-tcl
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#!\ /usr/bin/env\ tcl]} {
+		>
+			emit {Tcl script text executable}
+			mime text/x-tcl
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!\ /usr/bin/wish]} {
+		>
+			emit {Tcl/Tk script text executable}
+			mime text/x-tcl
+		<
+	}
+	
+	if {[S search 0 0 w 1 eq \#!\ /usr/local/bin/wish]} {
+		>
+			emit {Tcl/Tk script text executable}
+			mime text/x-tcl
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#!/usr/bin/env\ wish]} {
+		>
+			emit {Tcl/Tk script text executable}
+			mime text/x-tcl
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \#!\ /usr/bin/env\ wish]} {
+		>
+			emit {Tcl/Tk script text executable}
+			mime text/x-tcl
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq package\ req]} {
+		>
+			if {[S regex 0 0 {} {} eq ^package\[\ \t\]+req]} {
+				>
+					emit {Tcl script}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 ne p]} {
+		>
+			if {[S regex 0 0 {} {} eq ^package\[\ \t\]+req]} {
+				>
+					emit {Tcl script}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#!teapot\012xdr]} {
+		>
+			emit {teapot work sheet (XDR format)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \032\001]} {
+		>
+			if {[N ubyte 16 0 0 {} {} > 32]} {
+				>
+					if {[S regex 12 0 {} {} eq ^\[a-zA-Z0-9\]\[a-zA-Z0-9.\]\[^|\]*]} {
+						>
+							emit {Compiled terminfo entry "%-s"}
+							mime application/x-terminfo
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \036\002]} {
+		>
+			if {[N ubyte 16 0 0 {} {} > 32]} {
+				>
+					if {[S regex 12 0 {} {} eq ^\[a-zA-Z0-9\]\[a-zA-Z0-9.\]\[^|\]*]} {
+						>
+							emit {Compiled 32-bit terminfo entry "%-s"}
+							mime application/x-terminfo2
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^MAX=\[0-9\]+,\[0-9\]+\$]} {
+		>
+			if {[S regex 1 0 {} {} eq ^BEG=\[0-9\]+,\[0-9\]+\$]} {
+				>
+				<
+			}
+	
+			if {[S regex 2 0 {} {} eq ^SCROLL=\[0-9\]+,\[0-9\]+\$]} {
+				>
+				<
+			}
+	
+			if {[S regex 3 0 {} {} eq ^VMIN=\[0-9\]+\$]} {
+				>
+				<
+			}
+	
+			if {[S regex 4 0 {} {} eq ^VTIME=\[0-9\]+\$]} {
+				>
+				<
+			}
+	
+			if {[S regex 5 0 {} {} eq ^FLAGS=0x\[\[:xdigit:\]\]+\$]} {
+				>
+				<
+			}
+	
+			if {[S regex 6 0 {} {} eq ^FG=\[0-9\],\[0-9\]+\$]} {
+				>
+				<
+			}
+	
+			if {[S regex 7 0 {} {} eq ^BG=\[0-9\]+,\[0-9\]+,]} {
+				>
+					emit {Solaris xcurses screen image}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \210\210\210\210ncurses]} {
+		>
+			emit {ncurses6 screen image}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PDC\001]} {
+		>
+			emit {PDCurses screen image}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \367\002]} {
+		>
+			emit {TeX DVI file}
+			if {[S string 16 0 {} {} > \0]} {
+				>
+					emit (%s)
+				<
+			}
+	
+			mime application/x-dvi
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \367\203]} {
+		>
+			emit {TeX generic font data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \367\131]} {
+		>
+			emit {TeX packed font data}
+			if {[S string 3 0 {} {} > \0]} {
+				>
+					emit (%s)
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \367\312]} {
+		>
+			emit {TeX virtual font data}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq This\ is\ TeX,]} {
+		>
+			emit {TeX transcript text}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq This\ is\ METAFONT,]} {
+		>
+			emit {METAFONT transcript text}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq \000\021]} {
+		>
+			emit {TeX font metric data}
+			if {[S string 33 0 {} {} > \0]} {
+				>
+					emit (%s)
+				<
+			}
+	
+			mime application/x-tex-tfm
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq \000\022]} {
+		>
+			emit {TeX font metric data}
+			if {[S string 33 0 {} {} > \0]} {
+				>
+					emit (%s)
+				<
+			}
+	
+			mime application/x-tex-tfm
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \\input\ texinfo]} {
+		>
+			emit {Texinfo source text}
+			mime text/x-texinfo
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq This\ is\ Info\ file]} {
+		>
+			emit {GNU Info text}
+			mime text/x-info
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\input]} {
+		>
+			emit {TeX document text}
+			mime text/x-tex
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\begin]} {
+		>
+			emit {LaTeX document text}
+			mime text/x-tex
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\section]} {
+		>
+			emit {LaTeX document text}
+			mime text/x-tex
+			strength {+ 18}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\setlength]} {
+		>
+			emit {LaTeX document text}
+			mime text/x-tex
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\documentstyle]} {
+		>
+			emit {LaTeX document text}
+			mime text/x-tex
+			strength {+ 18}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\chapter]} {
+		>
+			emit {LaTeX document text}
+			mime text/x-tex
+			strength {+ 18}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\documentclass]} {
+		>
+			emit {LaTeX 2e document text}
+			mime text/x-tex
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\relax]} {
+		>
+			emit {LaTeX auxiliary file}
+			mime text/x-tex
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\contentsline]} {
+		>
+			emit {LaTeX table of contents}
+			mime text/x-tex
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq %\ -*-latex-*-]} {
+		>
+			emit {LaTeX document text}
+			mime text/x-tex
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \\ifx]} {
+		>
+			emit {TeX document text}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\indexentry]} {
+		>
+			emit {LaTeX raw index file}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\begin\{theindex\}]} {
+		>
+			emit {LaTeX sorted index}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\glossaryentry]} {
+		>
+			emit {LaTeX raw glossary}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\begin\{theglossary\}]} {
+		>
+			emit {LaTeX sorted glossary}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq This\ is\ makeindex]} {
+		>
+			emit {Makeindex log file}
+		<
+	}
+	
+	if {[S search 0 0 c 1 eq @article\{]} {
+		>
+			emit {BibTeX text file}
+		<
+	}
+	
+	if {[S search 0 0 c 1 eq @book\{]} {
+		>
+			emit {BibTeX text file}
+		<
+	}
+	
+	if {[S search 0 0 c 1 eq @inbook\{]} {
+		>
+			emit {BibTeX text file}
+		<
+	}
+	
+	if {[S search 0 0 c 1 eq @incollection\{]} {
+		>
+			emit {BibTeX text file}
+		<
+	}
+	
+	if {[S search 0 0 c 1 eq @inproceedings\{]} {
+		>
+			emit {BibTeX text file}
+		<
+	}
+	
+	if {[S search 0 0 c 1 eq @manual\{]} {
+		>
+			emit {BibTeX text file}
+		<
+	}
+	
+	if {[S search 0 0 c 1 eq @misc\{]} {
+		>
+			emit {BibTeX text file}
+		<
+	}
+	
+	if {[S search 0 0 c 1 eq @preamble\{]} {
+		>
+			emit {BibTeX text file}
+		<
+	}
+	
+	if {[S search 0 0 c 1 eq @phdthesis\{]} {
+		>
+			emit {BibTeX text file}
+		<
+	}
+	
+	if {[S search 0 0 c 1 eq @techreport\{]} {
+		>
+			emit {BibTeX text file}
+		<
+	}
+	
+	if {[S search 0 0 c 1 eq @unpublished\{]} {
+		>
+			emit {BibTeX text file}
+		<
+	}
+	
+	if {[S search 73 0 {} 1 eq %%%\ \ ]} {
+		>
+			emit BibTeX-file\{\ BibTex\ text\ file\ (with\ full\ header)
+		<
+	}
+	
+	if {[S search 73 0 {} 1 eq %%%\ \ @BibTeX-style-file\{]} {
+		>
+			emit {BibTeX style text file (with full header)}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq %\ BibTeX\ standard\ bibliography\ ]} {
+		>
+			emit {BibTeX standard bibliography style text file}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq %\ BibTeX\ `]} {
+		>
+			emit {BibTeX custom bibliography style text file}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq @c\ @mapfile\{]} {
+		>
+			emit {TeX font aliases text file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \#LyX]} {
+		>
+			emit {LyX document text}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\setupcolors\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\definecolor\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\setupinteraction\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\useURL\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\setuppapersize\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\setuplayout\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\setupfooter\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\setupfootertexts\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\setuppagenumbering\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\setupbodyfont\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\setuphead\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\setupitemize\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\setupwhitespace\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S search 0 0 {} 4096 eq \\setupindenting\[]} {
+		>
+			emit {ConTeXt document text}
+			strength {+ 15}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %TGIF\ ]} {
+		>
+			emit {Tgif file version}
+			if {[S string 6 0 {} {} x {}]} {
+				>
+					emit %s
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq **TI80**]} {
+		>
+			emit {TI-80 Graphing Calculator File.}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq **TI81**]} {
+		>
+			emit {TI-81 Graphing Calculator File.}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq **TI73**]} {
+		>
+			emit {TI-73 Graphing Calculator}
+			switch [Nv byte 59 0 {} {}] {
+				0 {
+					>
+						emit {(real number)}
+					<
+				}
+				1 {
+					>
+						emit (list)
+					<
+				}
+				2 {
+					>
+						emit (matrix)
+					<
+				}
+				3 {
+					>
+						emit (equation)
+					<
+				}
+				4 {
+					>
+						emit (string)
+					<
+				}
+				5 {
+					>
+						emit (program)
+					<
+				}
+				6 {
+					>
+						emit {(assembly program)}
+					<
+				}
+				7 {
+					>
+						emit (picture)
+					<
+				}
+				8 {
+					>
+						emit (gdb)
+					<
+				}
+				12 {
+					>
+						emit {(complex number)}
+					<
+				}
+				15 {
+					>
+						emit {(window settings)}
+					<
+				}
+				16 {
+					>
+						emit (zoom)
+					<
+				}
+				17 {
+					>
+						emit {(table setup)}
+					<
+				}
+				19 {
+					>
+						emit (backup)
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq **TI82**]} {
+		>
+			emit {TI-82 Graphing Calculator}
+			switch [Nv byte 59 0 {} {}] {
+				0 {
+					>
+						emit (real)
+					<
+				}
+				1 {
+					>
+						emit (list)
+					<
+				}
+				2 {
+					>
+						emit (matrix)
+					<
+				}
+				3 {
+					>
+						emit (Y-variable)
+					<
+				}
+				5 {
+					>
+						emit (program)
+					<
+				}
+				6 {
+					>
+						emit {(protected prgm)}
+					<
+				}
+				7 {
+					>
+						emit (picture)
+					<
+				}
+				8 {
+					>
+						emit (gdb)
+					<
+				}
+				11 {
+					>
+						emit {(window settings)}
+					<
+				}
+				12 {
+					>
+						emit {(window settings)}
+					<
+				}
+				13 {
+					>
+						emit {(table setup)}
+					<
+				}
+				14 {
+					>
+						emit (screenshot)
+					<
+				}
+				15 {
+					>
+						emit (backup)
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq **TI83**]} {
+		>
+			emit {TI-83 Graphing Calculator}
+			switch [Nv byte 59 0 {} {}] {
+				0 {
+					>
+						emit (real)
+					<
+				}
+				1 {
+					>
+						emit (list)
+					<
+				}
+				2 {
+					>
+						emit (matrix)
+					<
+				}
+				3 {
+					>
+						emit (Y-variable)
+					<
+				}
+				4 {
+					>
+						emit (string)
+					<
+				}
+				5 {
+					>
+						emit (program)
+					<
+				}
+				6 {
+					>
+						emit {(protected prgm)}
+					<
+				}
+				7 {
+					>
+						emit (picture)
+					<
+				}
+				8 {
+					>
+						emit (gdb)
+					<
+				}
+				11 {
+					>
+						emit {(window settings)}
+					<
+				}
+				12 {
+					>
+						emit {(window settings)}
+					<
+				}
+				13 {
+					>
+						emit {(table setup)}
+					<
+				}
+				14 {
+					>
+						emit (screenshot)
+					<
+				}
+				19 {
+					>
+						emit (backup)
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq **TI83F*]} {
+		>
+			emit {TI-83+ Graphing Calculator}
+			switch [Nv byte 59 0 {} {}] {
+				0 {
+					>
+						emit {(real number)}
+					<
+				}
+				1 {
+					>
+						emit (list)
+					<
+				}
+				2 {
+					>
+						emit (matrix)
+					<
+				}
+				3 {
+					>
+						emit (equation)
+					<
+				}
+				4 {
+					>
+						emit (string)
+					<
+				}
+				5 {
+					>
+						emit (program)
+					<
+				}
+				6 {
+					>
+						emit {(assembly program)}
+					<
+				}
+				7 {
+					>
+						emit (picture)
+					<
+				}
+				8 {
+					>
+						emit (gdb)
+					<
+				}
+				12 {
+					>
+						emit {(complex number)}
+					<
+				}
+				15 {
+					>
+						emit {(window settings)}
+					<
+				}
+				16 {
+					>
+						emit (zoom)
+					<
+				}
+				17 {
+					>
+						emit {(table setup)}
+					<
+				}
+				19 {
+					>
+						emit (backup)
+					<
+				}
+				21 {
+					>
+						emit {(application variable)}
+					<
+				}
+				23 {
+					>
+						emit {(group of variable)}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq **TI85**]} {
+		>
+			emit {TI-85 Graphing Calculator}
+			switch [Nv byte 59 0 {} {}] {
+				0 {
+					>
+						emit {(real number)}
+					<
+				}
+				1 {
+					>
+						emit {(complex number)}
+					<
+				}
+				2 {
+					>
+						emit {(real vector)}
+					<
+				}
+				3 {
+					>
+						emit {(complex vector)}
+					<
+				}
+				4 {
+					>
+						emit {(real list)}
+					<
+				}
+				5 {
+					>
+						emit {(complex list)}
+					<
+				}
+				6 {
+					>
+						emit {(real matrix)}
+					<
+				}
+				7 {
+					>
+						emit {(complex matrix)}
+					<
+				}
+				8 {
+					>
+						emit {(real constant)}
+					<
+				}
+				9 {
+					>
+						emit {(complex constant)}
+					<
+				}
+				10 {
+					>
+						emit (equation)
+					<
+				}
+				12 {
+					>
+						emit (string)
+					<
+				}
+				13 {
+					>
+						emit {(function GDB)}
+					<
+				}
+				14 {
+					>
+						emit {(polar GDB)}
+					<
+				}
+				15 {
+					>
+						emit {(parametric GDB)}
+					<
+				}
+				16 {
+					>
+						emit {(diffeq GDB)}
+					<
+				}
+				17 {
+					>
+						emit (picture)
+					<
+				}
+				18 {
+					>
+						emit (program)
+					<
+				}
+				19 {
+					>
+						emit (range)
+					<
+				}
+				23 {
+					>
+						emit {(window settings)}
+					<
+				}
+				24 {
+					>
+						emit {(window settings)}
+					<
+				}
+				25 {
+					>
+						emit {(window settings)}
+					<
+				}
+				26 {
+					>
+						emit {(window settings)}
+					<
+				}
+				27 {
+					>
+						emit (zoom)
+					<
+				}
+				29 {
+					>
+						emit (backup)
+					<
+				}
+				30 {
+					>
+						emit (unknown)
+					<
+				}
+				42 {
+					>
+						emit (equation)
+					<
+				}
+			}
+	
+			if {[S string 50 0 {} {} eq ZS4]} {
+				>
+					emit {- ZShell Version 4 File.}
+				<
+			}
+	
+			if {[S string 50 0 {} {} eq ZS3]} {
+				>
+					emit {- ZShell Version 3 File.}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq **TI86**]} {
+		>
+			emit {TI-86 Graphing Calculator}
+			switch [Nv byte 59 0 {} {}] {
+				0 {
+					>
+						emit {(real number)}
+					<
+				}
+				1 {
+					>
+						emit {(complex number)}
+					<
+				}
+				2 {
+					>
+						emit {(real vector)}
+					<
+				}
+				3 {
+					>
+						emit {(complex vector)}
+					<
+				}
+				4 {
+					>
+						emit {(real list)}
+					<
+				}
+				5 {
+					>
+						emit {(complex list)}
+					<
+				}
+				6 {
+					>
+						emit {(real matrix)}
+					<
+				}
+				7 {
+					>
+						emit {(complex matrix)}
+					<
+				}
+				8 {
+					>
+						emit {(real constant)}
+					<
+				}
+				9 {
+					>
+						emit {(complex constant)}
+					<
+				}
+				10 {
+					>
+						emit (equation)
+					<
+				}
+				12 {
+					>
+						emit (string)
+					<
+				}
+				13 {
+					>
+						emit {(function GDB)}
+					<
+				}
+				14 {
+					>
+						emit {(polar GDB)}
+					<
+				}
+				15 {
+					>
+						emit {(parametric GDB)}
+					<
+				}
+				16 {
+					>
+						emit {(diffeq GDB)}
+					<
+				}
+				17 {
+					>
+						emit (picture)
+					<
+				}
+				18 {
+					>
+						emit (program)
+					<
+				}
+				19 {
+					>
+						emit (range)
+					<
+				}
+				23 {
+					>
+						emit {(window settings)}
+					<
+				}
+				24 {
+					>
+						emit {(window settings)}
+					<
+				}
+				25 {
+					>
+						emit {(window settings)}
+					<
+				}
+				26 {
+					>
+						emit {(window settings)}
+					<
+				}
+				27 {
+					>
+						emit (zoom)
+					<
+				}
+				29 {
+					>
+						emit (backup)
+					<
+				}
+				30 {
+					>
+						emit (unknown)
+					<
+				}
+				42 {
+					>
+						emit (equation)
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq **TI89**]} {
+		>
+			emit {TI-89 Graphing Calculator}
+			switch [Nv byte 72 0 {} {}] {
+				0 {
+					>
+						emit (expression)
+					<
+				}
+				4 {
+					>
+						emit (list)
+					<
+				}
+				6 {
+					>
+						emit (matrix)
+					<
+				}
+				10 {
+					>
+						emit (data)
+					<
+				}
+				11 {
+					>
+						emit (text)
+					<
+				}
+				12 {
+					>
+						emit (string)
+					<
+				}
+				13 {
+					>
+						emit {(graphic data base)}
+					<
+				}
+				14 {
+					>
+						emit (figure)
+					<
+				}
+				16 {
+					>
+						emit (picture)
+					<
+				}
+				18 {
+					>
+						emit (program)
+					<
+				}
+				19 {
+					>
+						emit (function)
+					<
+				}
+				20 {
+					>
+						emit (macro)
+					<
+				}
+				28 {
+					>
+						emit (zipped)
+					<
+				}
+				33 {
+					>
+						emit (assembler)
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq **TI92**]} {
+		>
+			emit {TI-92 Graphing Calculator}
+			switch [Nv byte 72 0 {} {}] {
+				0 {
+					>
+						emit (expression)
+					<
+				}
+				4 {
+					>
+						emit (list)
+					<
+				}
+				6 {
+					>
+						emit (matrix)
+					<
+				}
+				10 {
+					>
+						emit (data)
+					<
+				}
+				11 {
+					>
+						emit (text)
+					<
+				}
+				12 {
+					>
+						emit (string)
+					<
+				}
+				13 {
+					>
+						emit {(graphic data base)}
+					<
+				}
+				14 {
+					>
+						emit (figure)
+					<
+				}
+				16 {
+					>
+						emit (picture)
+					<
+				}
+				18 {
+					>
+						emit (program)
+					<
+				}
+				19 {
+					>
+						emit (function)
+					<
+				}
+				20 {
+					>
+						emit (macro)
+					<
+				}
+				29 {
+					>
+						emit (backup)
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq **TI92P*]} {
+		>
+			emit {TI-92+/V200 Graphing Calculator}
+			switch [Nv byte 72 0 {} {}] {
+				0 {
+					>
+						emit (expression)
+					<
+				}
+				4 {
+					>
+						emit (list)
+					<
+				}
+				6 {
+					>
+						emit (matrix)
+					<
+				}
+				10 {
+					>
+						emit (data)
+					<
+				}
+				11 {
+					>
+						emit (text)
+					<
+				}
+				12 {
+					>
+						emit (string)
+					<
+				}
+				13 {
+					>
+						emit {(graphic data base)}
+					<
+				}
+				14 {
+					>
+						emit (figure)
+					<
+				}
+				16 {
+					>
+						emit (picture)
+					<
+				}
+				18 {
+					>
+						emit (program)
+					<
+				}
+				19 {
+					>
+						emit (function)
+					<
+				}
+				20 {
+					>
+						emit (macro)
+					<
+				}
+				28 {
+					>
+						emit (zipped)
+					<
+				}
+				33 {
+					>
+						emit (assembler)
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 22 0 {} {} eq Advanced]} {
+		>
+			emit {TI-XX Graphing Calculator (FLASH)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq **TIFL**]} {
+		>
+			emit {TI-XX Graphing Calculator (FLASH)}
+			if {[N byte 8 0 0 {} {} > 0]} {
+				>
+					emit {- Revision %d}
+					if {[N byte 9 0 0 {} {} x {}]} {
+						>
+							emit {\b.%d,}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 12 0 0 {} {} > 0]} {
+				>
+					emit {Revision date %02x}
+					if {[N byte 13 0 0 {} {} x {}]} {
+						>
+							emit {\b/%02x}
+						<
+					}
+	
+					if {[N beshort 14 0 0 {} {} x {}]} {
+						>
+							emit {\b/%04x,}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 17 0 {} {} > /0]} {
+				>
+					emit {name: '%s',}
+				<
+			}
+	
+			switch [Nv byte 48 0 {} {}] {
+				-120 {
+					>
+						emit {device: TI-92+,}
+					<
+				}
+				-104 {
+					>
+						emit {device: TI-89,}
+					<
+				}
+				115 {
+					>
+						emit {device: TI-83+,}
+					<
+				}
+				116 {
+					>
+						emit {device: TI-73,}
+					<
+				}
+			}
+	
+			switch [Nv byte 49 0 {} {}] {
+				35 {
+					>
+						emit {type: OS upgrade,}
+					<
+				}
+				36 {
+					>
+						emit {type: application,}
+					<
+				}
+				37 {
+					>
+						emit {type: certificate,}
+					<
+				}
+				62 {
+					>
+						emit {type: license,}
+					<
+				}
+			}
+	
+			if {[N lelong 74 0 0 {} {} > 0]} {
+				>
+					emit {size: %d bytes}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq VTI]} {
+		>
+			emit {Virtual TI skin}
+			if {[S string 3 0 {} {} eq v]} {
+				>
+					emit {- Version}
+					if {[N byte 4 0 0 {} {} > 0]} {
+						>
+							emit {\b %c}
+						<
+					}
+	
+					if {[N byte 6 0 0 {} {} x {}]} {
+						>
+							emit {\b.%c}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TiEmu]} {
+		>
+			emit {TiEmu skin}
+			if {[S string 6 0 {} {} eq v]} {
+				>
+					emit {- Version}
+					if {[N byte 7 0 0 {} {} > 0]} {
+						>
+							emit {\b %c}
+						<
+					}
+	
+					if {[N byte 9 0 0 {} {} x {}]} {
+						>
+							emit {\b.%c}
+						<
+					}
+	
+					if {[N byte 10 0 0 {} {} x {}]} {
+						>
+							emit {\b%c}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TZif]} {
+		>
+			emit {timezone data}
+			if {[N byte 4 0 0 {} {} == 0]} {
+				>
+					emit {\b, old version}
+				<
+			}
+	
+			if {[N byte 4 0 0 {} {} > 0]} {
+				>
+					emit {\b, version %c}
+				<
+			}
+	
+			switch [Nv belong 20 0 {} {}] {
+				0 {
+					>
+						emit {\b, no gmt time flags}
+					<
+				}
+				1 {
+					>
+						emit {\b, 1 gmt time flag}
+					<
+					>
+						emit {\b, 1 std time flag}
+					<
+				}
+			}
+	
+			if {[N belong 20 0 0 {} {} > 1]} {
+				>
+					emit {\b, %d gmt time flags}
+				<
+			}
+	
+			if {[N belong 24 0 0 {} {} == 0]} {
+				>
+					emit {\b, no std time flags}
+				<
+			}
+	
+			if {[N belong 24 0 0 {} {} > 1]} {
+				>
+					emit {\b, %d std time flags}
+				<
+			}
+	
+			switch [Nv belong 28 0 {} {}] {
+				0 {
+					>
+						emit {\b, no leap seconds}
+					<
+				}
+				1 {
+					>
+						emit {\b, 1 leap second}
+					<
+				}
+			}
+	
+			if {[N belong 28 0 0 {} {} > 1]} {
+				>
+					emit {\b, %d leap seconds}
+				<
+			}
+	
+			switch [Nv belong 32 0 {} {}] {
+				0 {
+					>
+						emit {\b, no transition times}
+					<
+				}
+				1 {
+					>
+						emit {\b, 1 transition time}
+					<
+				}
+			}
+	
+			if {[N belong 32 0 0 {} {} > 1]} {
+				>
+					emit {\b, %d transition times}
+				<
+			}
+	
+			switch [Nv belong 36 0 {} {}] {
+				0 {
+					>
+						emit {\b, no abbreviation chars}
+					<
+				}
+				1 {
+					>
+						emit {\b, 1 abbreviation char}
+					<
+				}
+			}
+	
+			if {[N belong 36 0 0 {} {} > 1]} {
+				>
+					emit {\b, %d abbreviation chars}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0]} {
+		>
+			emit {old timezone data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0]} {
+		>
+			emit {old timezone data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0]} {
+		>
+			emit {old timezone data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0]} {
+		>
+			emit {old timezone data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0]} {
+		>
+			emit {old timezone data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\6\0]} {
+		>
+			emit {old timezone data}
+		<
+	}
+	
+	if {[N ulelong 0 0 0 {} {} < 3]} {
+		>
+			if {[N ulelong 0 0 0 {} {} != 0]} {
+				>
+					if {[N long 256 0 0 {} {} == 0]} {
+						>
+							U 252 firmware-tplink 0
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq .\\\"]} {
+		>
+			emit {troff or preprocessor input text}
+			mime text/troff
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq '\\\"]} {
+		>
+			emit {troff or preprocessor input text}
+			mime text/troff
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq '.\\\"]} {
+		>
+			emit {troff or preprocessor input text}
+			mime text/troff
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \\\"]} {
+		>
+			emit {troff or preprocessor input text}
+			mime text/troff
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq ''']} {
+		>
+			emit {troff or preprocessor input text}
+			mime text/troff
+		<
+	}
+	
+	if {[S regex 0 0 l 20 eq ^\\.\[A-Za-z0-9\]\[A-Za-z0-9\]\[\ \t\]]} {
+		>
+			emit {troff or preprocessor input text}
+			mime text/troff
+		<
+	}
+	
+	if {[S regex 0 0 l 20 eq ^\\.\[A-Za-z0-9\]\[A-Za-z0-9\]\$]} {
+		>
+			emit {troff or preprocessor input text}
+			mime text/troff
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq x\ T]} {
+		>
+			emit {ditroff output text}
+			if {[S search 4 0 {} 1 eq cat]} {
+				>
+					emit {for the C/A/T phototypesetter}
+				<
+			}
+	
+			if {[S search 4 0 {} 1 eq ps]} {
+				>
+					emit {for PostScript}
+				<
+			}
+	
+			if {[S search 4 0 {} 1 eq dvi]} {
+				>
+					emit {for DVI}
+				<
+			}
+	
+			if {[S search 4 0 {} 1 eq ascii]} {
+				>
+					emit {for ASCII}
+				<
+			}
+	
+			if {[S search 4 0 {} 1 eq lj4]} {
+				>
+					emit {for LaserJet 4}
+				<
+			}
+	
+			if {[S search 4 0 {} 1 eq latin1]} {
+				>
+					emit {for ISO 8859-1 (Latin 1)}
+				<
+			}
+	
+			if {[S search 4 0 {} 1 eq X75]} {
+				>
+					emit {for xditview at 75dpi}
+					if {[S search 7 0 {} 1 eq -12]} {
+						>
+							emit (12pt)
+						<
+					}
+	
+				<
+			}
+	
+			if {[S search 4 0 {} 1 eq X100]} {
+				>
+					emit {for xditview at 100dpi}
+					if {[S search 8 0 {} 1 eq -12]} {
+						>
+							emit (12pt)
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \100\357]} {
+		>
+			emit {very old (C/A/T) troff output data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0\0\1\236\0\0\0\0\0\0\0\0\0\0\0\0]} {
+		>
+			emit {BEA TUXEDO DES mask data}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Interpress/Xerox]} {
+		>
+			emit {Xerox InterPress data}
+			if {[S string 16 0 {} {} eq /]} {
+				>
+					emit (version
+					if {[S string 17 0 {} {} > \0]} {
+						>
+							emit %s)
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq +/v8]} {
+		>
+			emit {Unicode text, UTF-7}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq +/v9]} {
+		>
+			emit {Unicode text, UTF-7}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq +/v+]} {
+		>
+			emit {Unicode text, UTF-7}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq +/v/]} {
+		>
+			emit {Unicode text, UTF-7}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \335\163\146\163]} {
+		>
+			emit {Unicode text, UTF-8-EBCDIC}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \000\000\376\377]} {
+		>
+			emit {Unicode text, UTF-32, big-endian}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \377\376\000\000]} {
+		>
+			emit {Unicode text, UTF-32, little-endian}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \016\376\377]} {
+		>
+			emit {Unicode text, SCSU (Standard Compression Scheme for Unicode)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq UTE+]} {
+		>
+			emit {uterus file}
+			if {[S string 4 0 {} {} eq v]} {
+				>
+					emit {\b, version}
+				<
+			}
+	
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit %c
+				<
+			}
+	
+			if {[S string 6 0 {} {} eq .]} {
+				>
+					emit {\b.}
+				<
+			}
+	
+			if {[N byte 7 0 0 {} {} x {}]} {
+				>
+					emit {\b%c}
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq <>]} {
+				>
+					emit {\b, big-endian}
+					if {[N belong 16 0 0 {} {} > 0]} {
+						>
+							emit {\b, slut size %u}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 8 0 {} {} eq ><]} {
+				>
+					emit {\b, litte-endian}
+					if {[N lelong 16 0 0 {} {} > 0]} {
+						>
+							emit {\b, slut size %u}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 10 0 0 {} {} & 8]} {
+				>
+					emit {\b, compressed}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq begin\ ]} {
+		>
+			emit {uuencoded or xxencoded text}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq xbtoa\ Begin]} {
+		>
+			emit {btoa'd text}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq \$\012ship]} {
+		>
+			emit {ship'd binary text}
+		<
+	}
+	
+	if {[S search 0 0 {} 1 eq Decode\ the\ following\ with\ bdeco]} {
+		>
+			emit {bencoded News text}
+		<
+	}
+	
+	if {[S search 11 0 {} 1 eq must\ be\ converted\ with\ BinHex]} {
+		>
+			emit {BinHex binary text}
+			if {[S search 41 0 {} 1 x {}]} {
+				>
+					emit {\b, version %.3s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[N beshort 6 0 0 {} {} == 263]} {
+		>
+			emit {unicos (cray) executable}
+		<
+	}
+	
+	if {[S string 596 0 {} {} eq \130\337\377\377]} {
+		>
+			emit {Ultrix core file}
+			if {[S string 600 0 {} {} > \0]} {
+				>
+					emit {from '%s'}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Joy!peffpwpc]} {
+		>
+			emit {header for PowerPC PEF executable}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq avaobj]} {
+		>
+			emit {AVR assembler object code}
+			if {[S string 7 0 {} {} > \0]} {
+				>
+					emit {version '%s'}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq gmon]} {
+		>
+			emit {GNU prof performance data}
+			if {[N long 4 0 0 {} {} x {}]} {
+				>
+					emit {- version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xc0HRB]} {
+		>
+			emit {Harbour HRB file}
+			if {[N leshort 4 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xc0HBV]} {
+		>
+			emit {Harbour variable dump file}
+			if {[N leshort 4 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \#!\ /]} {
+		>
+			emit a
+			if {[S string 3 0 {} {} > \0]} {
+				>
+					emit {%s script text executable}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \#!\ /]} {
+		>
+			emit a
+			if {[S string 3 0 {} {} > \0]} {
+				>
+					emit {%s script executable (binary data)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \#!\t/]} {
+		>
+			emit a
+			if {[S string 3 0 {} {} > \0]} {
+				>
+					emit {%s script text executable}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \#!\t/]} {
+		>
+			emit a
+			if {[S string 3 0 {} {} > \0]} {
+				>
+					emit {%s script executable (binary data)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \#!/]} {
+		>
+			emit a
+			if {[S string 2 0 {} {} > \0]} {
+				>
+					emit {%s script text executable}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \#!/]} {
+		>
+			emit a
+			if {[S string 2 0 {} {} > \0]} {
+				>
+					emit {%s script executable (binary data)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \#!\ ]} {
+		>
+			emit {script text executable}
+			if {[S string 3 0 {} {} > \0]} {
+				>
+					emit {for %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \#!\ ]} {
+		>
+			emit {script executable}
+			if {[S string 3 0 {} {} > \0]} {
+				>
+					emit {for %s (binary data)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \#!/usr/bin/env]} {
+		>
+			emit a
+			if {[S string 15 0 t {} > \0]} {
+				>
+					emit {%s script text executable}
+					strength {/ 10}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \#!/usr/bin/env]} {
+		>
+			emit a
+			if {[S string 15 0 b {} > \0]} {
+				>
+					emit {%s script executable (binary data)}
+					strength {/ 10}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 t {} eq \#!\ /usr/bin/env]} {
+		>
+			emit a
+			if {[S string 16 0 t {} > \0]} {
+				>
+					emit {%s script text executable}
+					strength {/ 10}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq \#!\ /usr/bin/env]} {
+		>
+			emit a
+			if {[S string 16 0 b {} > \0]} {
+				>
+					emit {%s script executable (binary data)}
+					strength {/ 10}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq XPCOM\nTypeLib\r\n\032]} {
+		>
+			emit {XPConnect Typelib}
+			if {[N byte 16 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+					if {[N byte 17 0 0 {} {} x {}]} {
+						>
+							emit {\b.%d}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LBLSIZE=]} {
+		>
+			emit {VICAR image data}
+			if {[S string 32 0 {} {} eq BYTE]} {
+				>
+					emit {\b, 8 bits  = VAX byte}
+				<
+			}
+	
+			if {[S string 32 0 {} {} eq HALF]} {
+				>
+					emit {\b, 16 bits = VAX word     = Fortran INTEGER*2}
+				<
+			}
+	
+			if {[S string 32 0 {} {} eq FULL]} {
+				>
+					emit {\b, 32 bits = VAX longword = Fortran INTEGER*4}
+				<
+			}
+	
+			if {[S string 32 0 {} {} eq REAL]} {
+				>
+					emit {\b, 32 bits = VAX longword = Fortran REAL*4}
+				<
+			}
+	
+			if {[S string 32 0 {} {} eq DOUB]} {
+				>
+					emit {\b, 64 bits = VAX quadword = Fortran REAL*8}
+				<
+			}
+	
+			if {[S string 32 0 {} {} eq COMPLEX]} {
+				>
+					emit {\b, 64 bits = VAX quadword = Fortran COMPLEX*8}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 43 0 {} {} eq SFDU_LABEL]} {
+		>
+			emit {VICAR label file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq conectix]} {
+		>
+			emit {Microsoft Disk Image, Virtual Server or Virtual PC}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LibvirtQemudSave]} {
+		>
+			emit {Libvirt QEMU Suspend Image}
+			if {[N lelong 16 0 0 {} {} x {}]} {
+				>
+					emit {\b, version %u}
+				<
+			}
+	
+			if {[N lelong 20 0 0 {} {} x {}]} {
+				>
+					emit {\b, XML length %u}
+				<
+			}
+	
+			if {[N lelong 24 0 0 {} {} == 1]} {
+				>
+					emit {\b, running}
+				<
+			}
+	
+			if {[N lelong 28 0 0 {} {} == 1]} {
+				>
+					emit {\b, compressed}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq LibvirtQemudPart]} {
+		>
+			emit {Libvirt QEMU partial Suspend Image}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq COWD]} {
+		>
+			emit VMWare3
+			switch [Nv byte 4 0 {} {}] {
+				2 {
+					>
+						emit {undoable disk image}
+						if {[S string 32 0 {} {} > \0]} {
+							>
+								emit (%s)
+							<
+						}
+	
+					<
+				}
+				3 {
+					>
+						emit {disk image}
+						if {[N lelong 32 0 0 {} {} x {}]} {
+							>
+								emit (%d/
+							<
+						}
+	
+						if {[N lelong 36 0 0 {} {} x {}]} {
+							>
+								emit {\b%d/}
+							<
+						}
+	
+						if {[N lelong 40 0 0 {} {} x {}]} {
+							>
+								emit {\b%d)}
+							<
+						}
+	
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq VMDK]} {
+		>
+			emit {VMware4 disk image}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq KDMV]} {
+		>
+			emit {VMware4 disk image}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq QFI\xFB]} {
+		>
+			emit {QEMU QCOW Image}
+			switch [Nv belong 4 0 {} {}] {
+				1 {
+					>
+						emit (v1)
+						if {[N belong 12 0 0 {} {} > 0]} {
+							>
+								emit {\b, has backing file (}
+								if {[S string [I 12 ubelong 0 + 0 0] 0 {} {} > \0]} {
+									>
+										emit {\bpath %s}
+										if {[N bedate 20 0 0 {} {} > 0]} {
+											>
+												emit {\b, mtime %s)}
+											<
+										}
+	
+										if {[D 20]} {
+											>
+												emit {\b)}
+											<
+										}
+	
+									<
+								}
+	
+							<
+						}
+	
+						if {[N bequad 24 0 0 {} {} x {}]} {
+							>
+								emit {\b, %lld bytes}
+							<
+						}
+	
+						if {[N belong 36 0 0 {} {} == 1]} {
+							>
+								emit {\b, AES-encrypted}
+							<
+						}
+	
+					<
+				}
+				2 {
+					>
+						emit (v2)
+						if {[N bequad 8 0 0 {} {} > 0]} {
+							>
+								emit {\b, has backing file}
+								if {[S string [I 12 ubelong 0 + 0 0] 0 {} {} > \0]} {
+									>
+										emit {(path %s)}
+									<
+								}
+	
+							<
+						}
+	
+						if {[N bequad 24 0 0 {} {} x {}]} {
+							>
+								emit {\b, %lld bytes}
+							<
+						}
+	
+						if {[N belong 32 0 0 {} {} == 1]} {
+							>
+								emit {\b, AES-encrypted}
+							<
+						}
+	
+					<
+				}
+				3 {
+					>
+						emit (v3)
+						if {[N bequad 8 0 0 {} {} > 0]} {
+							>
+								emit {\b, has backing file}
+								if {[S string [I 12 ubelong 0 + 0 0] 0 {} {} > \0]} {
+									>
+										emit {(path %s)}
+									<
+								}
+	
+							<
+						}
+	
+						if {[N bequad 24 0 0 {} {} x {}]} {
+							>
+								emit {\b, %lld bytes}
+							<
+						}
+	
+						if {[N belong 32 0 0 {} {} == 1]} {
+							>
+								emit {\b, AES-encrypted}
+							<
+						}
+	
+					<
+				}
+			}
+	
+			if {[D 4]} {
+				>
+					emit {(unknown version)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq QEVM]} {
+		>
+			emit {QEMU suspend to disk image}
+		<
+	}
+	
+	if {[S string 0 0 b {} eq QED\0]} {
+		>
+			emit {QEMU QED Image}
+		<
+	}
+	
+	if {[N ulelong 64 0 0 {} {} == 3201962111]} {
+		>
+			emit {VirtualBox Disk Image}
+			if {[N uleshort 68 0 0 {} {} > 0]} {
+				>
+					emit {\b, major %u}
+				<
+			}
+	
+			if {[N uleshort 70 0 0 {} {} > 0]} {
+				>
+					emit {\b, minor %u}
+				<
+			}
+	
+			if {[S string 0 0 {} {} > \0]} {
+				>
+					emit (%s)
+				<
+			}
+	
+			if {[N lequad 368 0 0 {} {} x {}]} {
+				>
+					emit {\b, %lld bytes}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 b {} eq Bochs\ Virtual\ HD\ Image]} {
+		>
+			emit {Bochs disk image,}
+			if {[S string 32 0 {} {} x {}]} {
+				>
+					emit {type %s,}
+				<
+			}
+	
+			if {[S string 48 0 {} {} x {}]} {
+				>
+					emit {subtype %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \211\277\036\203]} {
+		>
+			emit {Virtutech CRAFF}
+			if {[N belong 4 0 0 {} {} x {}]} {
+				>
+					emit v%d
+				<
+			}
+	
+			switch [Nv belong 20 0 {} {}] {
+				0 {
+					>
+						emit uncompressed
+					<
+				}
+				1 {
+					>
+						emit bzipp2ed
+					<
+				}
+				2 {
+					>
+						emit gzipped
+					<
+				}
+			}
+	
+			if {[N belong 24 0 0 {} {} == 0]} {
+				>
+					emit {not clean}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xb0\0\x30\0]} {
+		>
+			emit {VMS VAX executable}
+			if {[S string 44032 0 {} {} eq PK\003\004]} {
+				>
+					emit {\b, Info-ZIP SFX archive v5.12 w/decryption}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq OggS]} {
+		>
+			emit {Ogg data}
+			if {[N byte 4 0 0 {} {} != 0]} {
+				>
+					emit {UNKNOWN REVISION %u}
+				<
+			}
+	
+			if {[N byte 4 0 0 {} {} == 0]} {
+				>
+					if {[S string 28 0 {} {} eq \x7fFLAC]} {
+						>
+							emit {\b, FLAC audio}
+							mime audio/ogg
+						<
+					}
+	
+					if {[S string 28 0 {} {} eq \x80theora]} {
+						>
+							emit {\b, Theora video}
+							mime video/ogg
+						<
+					}
+	
+					if {[S string 28 0 {} {} eq \x80kate\0\0\0\0]} {
+						>
+							emit {\b, Kate (Karaoke and Text)}
+							if {[N ubyte 37 0 0 {} {} x {}]} {
+								>
+									emit v%u
+								<
+							}
+	
+							if {[N ubyte 38 0 0 {} {} x {}]} {
+								>
+									emit {\b.%u,}
+								<
+							}
+	
+							if {[N byte 40 0 0 {} {} == 0]} {
+								>
+									emit {utf8 encoding,}
+								<
+							}
+	
+							if {[N byte 40 0 0 {} {} != 0]} {
+								>
+									emit {unknown character encoding,}
+								<
+							}
+	
+							if {[S string 60 0 {} {} > \0]} {
+								>
+									emit {language %s,}
+								<
+							}
+	
+							if {[S string 60 0 {} {} eq \0]} {
+								>
+									emit {no language set,}
+								<
+							}
+	
+							if {[S string 76 0 {} {} > \0]} {
+								>
+									emit {category %s}
+								<
+							}
+	
+							if {[S string 76 0 {} {} eq \0]} {
+								>
+									emit {no category set}
+								<
+							}
+	
+							mime application/ogg
+						<
+					}
+	
+					if {[S string 28 0 {} {} eq fishead\0]} {
+						>
+							emit {\b, Skeleton}
+							if {[N leshort 36 0 0 {} {} x {}]} {
+								>
+									emit v%u
+								<
+							}
+	
+							if {[N leshort 40 0 0 {} {} x {}]} {
+								>
+									emit {\b.%u}
+								<
+							}
+	
+							mime video/ogg
+						<
+					}
+	
+					if {[S string 28 0 {} {} eq Speex\ \ \ ]} {
+						>
+							emit {\b, Speex audio}
+							mime audio/ogg
+						<
+					}
+	
+					if {[S string 28 0 {} {} eq \x01video\0\0\0]} {
+						>
+							emit {\b, OGM video}
+							if {[S string 37 0 c {} eq div3]} {
+								>
+									emit {(DivX 3)}
+								<
+							}
+	
+							if {[S string 37 0 c {} eq divx]} {
+								>
+									emit {(DivX 4)}
+								<
+							}
+	
+							if {[S string 37 0 c {} eq dx50]} {
+								>
+									emit {(DivX 5)}
+								<
+							}
+	
+							if {[S string 37 0 c {} eq xvid]} {
+								>
+									emit (XviD)
+								<
+							}
+	
+							mime video/ogg
+						<
+					}
+	
+					if {[S string 28 0 {} {} eq \x01vorbis]} {
+						>
+							emit {\b, Vorbis audio,}
+							if {[N lelong 35 0 0 {} {} != 0]} {
+								>
+									emit {UNKNOWN VERSION %u,}
+								<
+							}
+	
+							if {[N lelong 35 0 0 {} {} == 0]} {
+								>
+									switch [Nv ubyte 39 0 {} {}] {
+										1 {
+											>
+												emit mono,
+											<
+										}
+										2 {
+											>
+												emit stereo,
+											<
+										}
+									}
+	
+									if {[N ubyte 39 0 0 {} {} > 2]} {
+										>
+											emit {%u channels,}
+										<
+									}
+	
+									if {[N lelong 40 0 0 {} {} x {}]} {
+										>
+											emit {%u Hz}
+										<
+									}
+	
+									if {[S string 48 0 {} {} < \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff]} {
+										>
+											emit {\b,}
+											if {[N lelong 52 0 0 {} {} != -1]} {
+												>
+													if {[N lelong 52 0 0 {} {} != 0]} {
+														>
+															if {[N lelong 52 0 0 {} {} != -1000]} {
+																>
+																	if {[N lelong 52 0 0 {} {} x {}]} {
+																		>
+																			emit <%u
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+											if {[N lelong 48 0 0 {} {} != -1]} {
+												>
+													if {[N lelong 48 0 0 {} {} x {}]} {
+														>
+															emit ~%u
+														<
+													}
+	
+												<
+											}
+	
+											if {[N lelong 44 0 0 {} {} != -1]} {
+												>
+													if {[N lelong 44 0 0 {} {} != -1000]} {
+														>
+															if {[N lelong 44 0 0 {} {} != 0]} {
+																>
+																	if {[N lelong 44 0 0 {} {} x {}]} {
+																		>
+																			emit >%u
+																		<
+																	}
+	
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+											if {[S string 48 0 {} {} < \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff]} {
+												>
+													emit bps
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+							if {[S string [I 84 ubyte 0 + 0 85] 0 {} {} eq \x03vorbis]} {
+								>
+									if {[S string [I 84 ubyte 0 + 0 96] 0 c {} eq Xiphophorus\ libVorbis\ I]} {
+										>
+											emit {\b, created by: Xiphophorus libVorbis I}
+											if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} > 00000000]} {
+												>
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} < 20000508]} {
+														>
+															emit {(<beta1, prepublic)}
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} eq 20000508]} {
+														>
+															emit {(1.0 beta 1 or beta 2)}
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} > 20000508]} {
+														>
+															if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} < 20001031]} {
+																>
+																	emit (beta2-3)
+																<
+															}
+	
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} eq 20001031]} {
+														>
+															emit {(1.0 beta 3)}
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} > 20001031]} {
+														>
+															if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} < 20010225]} {
+																>
+																	emit (beta3-4)
+																<
+															}
+	
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} eq 20010225]} {
+														>
+															emit {(1.0 beta 4)}
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} > 20010225]} {
+														>
+															if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} < 20010615]} {
+																>
+																	emit (beta4-RC1)
+																<
+															}
+	
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} eq 20010615]} {
+														>
+															emit {(1.0 RC1)}
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} eq 20010813]} {
+														>
+															emit {(1.0 RC2)}
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} eq 20010816]} {
+														>
+															emit {(RC2 - Garf tuned v1)}
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} eq 20011014]} {
+														>
+															emit {(RC2 - Garf tuned v2)}
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} eq 20011217]} {
+														>
+															emit {(1.0 RC3)}
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} eq 20011231]} {
+														>
+															emit {(1.0 RC3)}
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 120] 0 {} {} > 20011231]} {
+														>
+															emit {(pre-1.0 CVS)}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[S string [I 84 ubyte 0 + 0 96] 0 c {} eq Xiph.Org\ libVorbis\ I]} {
+										>
+											emit {\b, created by: Xiph.Org libVorbis I}
+											if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} > 00000000]} {
+												>
+													if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} < 20020717]} {
+														>
+															emit {(pre-1.0 CVS)}
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} eq 20020717]} {
+														>
+															emit (1.0)
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} eq 20030909]} {
+														>
+															emit (1.0.1)
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} eq 20040629]} {
+														>
+															emit {(1.1.0 RC1)}
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} eq 20050304]} {
+														>
+															emit (1.1.2)
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} eq 20070622]} {
+														>
+															emit (1.2.0)
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} eq 20090624]} {
+														>
+															emit (1.2.2)
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} eq 20090709]} {
+														>
+															emit (1.2.3)
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} eq 20100325]} {
+														>
+															emit (1.3.1)
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} eq 20101101]} {
+														>
+															emit (1.3.2)
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} eq 20120203]} {
+														>
+															emit (1.3.3)
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} eq 20140122]} {
+														>
+															emit (1.3.4)
+														<
+													}
+	
+													if {[S string [I 84 ubyte 0 + 0 117] 0 {} {} eq 20150105]} {
+														>
+															emit (1.3.5)
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+							mime audio/ogg
+						<
+					}
+	
+					if {[S string 28 0 {} {} eq OpusHead]} {
+						>
+							emit {\b, Opus audio,}
+							if {[N ubyte 36 0 0 {} {} > 15]} {
+								>
+									emit {UNKNOWN VERSION %u,}
+								<
+							}
+	
+							if {[N ubyte 36 0 0 {} {} & 15]} {
+								>
+									emit {version 0.%d}
+									if {[N ubyte 46 0 0 {} {} > 1]} {
+										>
+											if {[N ubyte 46 0 0 {} {} != 255]} {
+												>
+													emit {unknown channel mapping family %u,}
+												<
+											}
+	
+											if {[N ubyte 37 0 0 {} {} x {}]} {
+												>
+													emit {%u channels}
+												<
+											}
+	
+										<
+									}
+	
+									switch [Nv ubyte 46 0 {} {}] {
+										0 {
+											>
+												switch [Nv ubyte 37 0 {} {}] {
+													1 {
+														>
+															emit mono
+														<
+													}
+													2 {
+														>
+															emit stereo
+														<
+													}
+												}
+	
+											<
+										}
+										1 {
+											>
+												switch [Nv ubyte 37 0 {} {}] {
+													1 {
+														>
+															emit mono
+														<
+													}
+													2 {
+														>
+															emit stereo
+														<
+													}
+													3 {
+														>
+															emit {linear surround}
+														<
+													}
+													4 {
+														>
+															emit quadraphonic
+														<
+													}
+													5 {
+														>
+															emit {5.0 surround}
+														<
+													}
+													6 {
+														>
+															emit {5.1 surround}
+														<
+													}
+													7 {
+														>
+															emit {6.1 surround}
+														<
+													}
+													8 {
+														>
+															emit {7.1 surround}
+														<
+													}
+												}
+	
+											<
+										}
+									}
+	
+									if {[N lelong 40 0 0 {} {} != 0]} {
+										>
+											emit {\b, %u Hz}
+										<
+									}
+	
+								<
+							}
+	
+							mime audio/ogg
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N lelong 2 0 0 {} {} == 1194011726]} {
+		>
+			emit {VXL data file,}
+			if {[N leshort 0 0 0 {} {} > 0]} {
+				>
+					emit {schema version no %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq WARC/]} {
+		>
+			emit {WARC Archive}
+			if {[S string 5 0 {} {} x {}]} {
+				>
+					emit {version %.4s}
+					mime application/warc
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq filedesc://]} {
+		>
+			emit {Internet Archive File}
+			if {[S search 11 0 {} 256 eq \x0A]} {
+				>
+					emit {\b}
+					if {[N ubyte [R 0] 0 0 {} {} > 0]} {
+						>
+							emit {\b version %c}
+						<
+					}
+	
+				<
+			}
+	
+			mime application/x-ia-arc
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \0asm]} {
+		>
+			emit {WebAssembly (wasm) binary module}
+			if {[N lelong 4 0 0 {} {} == 1]} {
+				>
+					emit {version %#x (MVP)}
+				<
+			}
+	
+			if {[N lelong 4 0 0 {} {} > 1]} {
+				>
+					emit {version %#x}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xCF\xAD\x12\xFE]} {
+		>
+			emit {MS Outlook Express DBX file}
+			switch [Nv byte 4 0 {} {}] {
+				-59 {
+					>
+						emit {\b, message database}
+					<
+				}
+				-58 {
+					>
+						emit {\b, folder database}
+					<
+				}
+				-57 {
+					>
+						emit {\b, account information}
+					<
+				}
+				48 {
+					>
+						emit {\b, offline database}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PAGE]} {
+		>
+			if {[S string 4 0 {} {} eq DUMP]} {
+				>
+					emit {MS Windows 32bit crash dump}
+					switch [Nv byte 92 0 {} {}] {
+						0 {
+							>
+								emit {\b, no PAE}
+							<
+						}
+						1 {
+							>
+								emit {\b, PAE}
+							<
+						}
+					}
+	
+					switch [Nv lelong 3976 0 {} {}] {
+						1 {
+							>
+								emit {\b, full dump}
+							<
+						}
+						2 {
+							>
+								emit {\b, kernel dump}
+							<
+						}
+						3 {
+							>
+								emit {\b, small dump}
+							<
+						}
+					}
+	
+					if {[N lelong 104 0 0 {} {} x {}]} {
+						>
+							emit {\b, %d pages}
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 4 0 {} {} eq DU64]} {
+				>
+					emit {MS Windows 64bit crash dump}
+					switch [Nv lelong 3992 0 {} {}] {
+						1 {
+							>
+								emit {\b, full dump}
+							<
+						}
+						2 {
+							>
+								emit {\b, kernel dump}
+							<
+						}
+						3 {
+							>
+								emit {\b, small dump}
+							<
+						}
+					}
+	
+					if {[N lequad 144 0 0 {} {} x {}]} {
+						>
+							emit {\b, %lld pages}
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ElfFile\0]} {
+		>
+			emit {MS Windows Vista Event Log}
+			if {[N leshort 42 0 0 {} {} x {}]} {
+				>
+					emit {\b, %d chunks}
+					if {[N lelong 16 0 0 {} {} x {}]} {
+						>
+							emit {\b (no. %d in use)}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N lelong 24 0 0 {} {} > 1]} {
+				>
+					emit {\b, next record no. %d}
+				<
+			}
+	
+			if {[N lelong 24 0 0 {} {} == 1]} {
+				>
+					emit {\b, empty}
+				<
+			}
+	
+			if {[N lelong 120 0 0 {} {} & 1]} {
+				>
+					emit {\b, DIRTY}
+				<
+			}
+	
+			if {[N lelong 120 0 0 {} {} & 2]} {
+				>
+					emit {\b, FULL}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \120\115\103\103]} {
+		>
+			emit {MS Windows 3.1 group files}
+		<
+	}
+	
+	if {[S regex 0 0 {} {} eq ^(:|\;)]} {
+		>
+			if {[S search 0 0 {} 45 eq :Base]} {
+				>
+					U 275 cnt-name [R 0]
+	
+				<
+			}
+	
+			if {[S search 0 0 {} 45 eq :Base]} {
+				>
+				<
+			}
+	
+			if {[D 0]} {
+				>
+					if {[S search 0 0 {} 45 eq :Title]} {
+						>
+							U 275 cnt-name [R 0]
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq tfMR]} {
+		>
+			emit {MS Windows help Full Text Search index}
+			if {[S string 16 0 {} {} > \0]} {
+				>
+					emit {for "%s"}
+				<
+			}
+	
+			mime application/x-winhelp-fts
+			ext fts
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HyperTerminal\040]} {
+		>
+			if {[S string 15 0 {} {} eq 1.0\ --\ HyperTerminal\ data\ file]} {
+				>
+					emit {MS Windows HyperTerminal profile}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \114\0\0\0\001\024\002\0\0\0\0\0\300\0\0\0\0\0\0\106]} {
+		>
+			emit {MS Windows shortcut}
+			if {[N lelong 20 0 0 & 1 == 1]} {
+				>
+					emit {\b, Item id list present}
+				<
+			}
+	
+			if {[N lelong 20 0 0 & 2 == 2]} {
+				>
+					emit {\b, Points to a file or directory}
+				<
+			}
+	
+			if {[N lelong 20 0 0 & 4 == 4]} {
+				>
+					emit {\b, Has Description string}
+				<
+			}
+	
+			if {[N lelong 20 0 0 & 8 == 8]} {
+				>
+					emit {\b, Has Relative path}
+				<
+			}
+	
+			if {[N lelong 20 0 0 & 16 == 16]} {
+				>
+					emit {\b, Has Working directory}
+				<
+			}
+	
+			if {[N lelong 20 0 0 & 32 == 32]} {
+				>
+					emit {\b, Has command line arguments}
+				<
+			}
+	
+			if {[N lelong 20 0 0 & 64 == 64]} {
+				>
+					emit {\b, Icon}
+					if {[N lelong 56 0 0 {} {} x {}]} {
+						>
+							emit {\b number=%d}
+						<
+					}
+	
+				<
+			}
+	
+			if {[N lelong 24 0 0 & 1 == 1]} {
+				>
+					emit {\b, Read-Only}
+				<
+			}
+	
+			if {[N lelong 24 0 0 & 2 == 2]} {
+				>
+					emit {\b, Hidden}
+				<
+			}
+	
+			if {[N lelong 24 0 0 & 4 == 4]} {
+				>
+					emit {\b, System}
+				<
+			}
+	
+			if {[N lelong 24 0 0 & 8 == 8]} {
+				>
+					emit {\b, Volume Label}
+				<
+			}
+	
+			if {[N lelong 24 0 0 & 16 == 16]} {
+				>
+					emit {\b, Directory}
+				<
+			}
+	
+			if {[N lelong 24 0 0 & 32 == 32]} {
+				>
+					emit {\b, Archive}
+				<
+			}
+	
+			if {[N lelong 24 0 0 & 64 == 64]} {
+				>
+					emit {\b, Encrypted}
+				<
+			}
+	
+			if {[N lelong 24 0 0 & 128 == 128]} {
+				>
+					emit {\b, Normal}
+				<
+			}
+	
+			if {[N lelong 24 0 0 & 256 == 256]} {
+				>
+					emit {\b, Temporary}
+				<
+			}
+	
+			if {[N lelong 24 0 0 & 512 == 512]} {
+				>
+					emit {\b, Sparse}
+				<
+			}
+	
+			if {[N lelong 24 0 0 & 1024 == 1024]} {
+				>
+					emit {\b, Reparse point}
+				<
+			}
+	
+			if {[N lelong 24 0 0 & 2048 == 2048]} {
+				>
+					emit {\b, Compressed}
+				<
+			}
+	
+			if {[N lelong 24 0 0 & 4096 == 4096]} {
+				>
+					emit {\b, Offline}
+				<
+			}
+	
+			if {[N leqwdate 28 0 0 {} {} x {}]} {
+				>
+					emit {\b, ctime=%s}
+				<
+			}
+	
+			if {[N leqwdate 36 0 0 {} {} x {}]} {
+				>
+					emit {\b, mtime=%s}
+				<
+			}
+	
+			if {[N leqwdate 44 0 0 {} {} x {}]} {
+				>
+					emit {\b, atime=%s}
+				<
+			}
+	
+			if {[N lelong 52 0 0 {} {} x {}]} {
+				>
+					emit {\b, length=%u, window=}
+				<
+			}
+	
+			if {[N lelong 60 0 0 & 1 == 1]} {
+				>
+					emit {\bhide}
+				<
+			}
+	
+			if {[N lelong 60 0 0 & 2 == 2]} {
+				>
+					emit {\bnormal}
+				<
+			}
+	
+			if {[N lelong 60 0 0 & 4 == 4]} {
+				>
+					emit {\bshowminimized}
+				<
+			}
+	
+			if {[N lelong 60 0 0 & 8 == 8]} {
+				>
+					emit {\bshowmaximized}
+				<
+			}
+	
+			if {[N lelong 60 0 0 & 16 == 16]} {
+				>
+					emit {\bshownoactivate}
+				<
+			}
+	
+			if {[N lelong 60 0 0 & 32 == 32]} {
+				>
+					emit {\bminimize}
+				<
+			}
+	
+			if {[N lelong 60 0 0 & 64 == 64]} {
+				>
+					emit {\bshowminnoactive}
+				<
+			}
+	
+			if {[N lelong 60 0 0 & 128 == 128]} {
+				>
+					emit {\bshowna}
+				<
+			}
+	
+			if {[N lelong 60 0 0 & 256 == 256]} {
+				>
+					emit {\brestore}
+				<
+			}
+	
+			if {[N lelong 60 0 0 & 512 == 512]} {
+				>
+					emit {\bshowdefault}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \164\146\115\122\012\000\000\000\001\000\000\000]} {
+		>
+			emit {MS Windows help cache}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Client\ UrlCache\ MMF]} {
+		>
+			emit {Internet Explorer cache file}
+			if {[S string 20 0 {} {} > \0]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq regf]} {
+		>
+			emit {MS Windows registry file, NT/2000 or above}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CREG]} {
+		>
+			emit {MS Windows 95/98/ME registry file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq SHCC3]} {
+		>
+			emit {MS Windows 3.1 registry file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq REGEDIT]} {
+		>
+			if {[S search 7 0 {} 3 eq \n]} {
+				>
+					emit {Windows Registry text}
+					if {[S string 0 0 {} {} eq REGEDIT4]} {
+						>
+							emit {(Win95 or above)}
+						<
+					}
+	
+					mime text/x-ms-regedit
+					ext reg
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Windows\ Registry\ Editor\ ]} {
+		>
+			if {[S string [R 0] 0 {} {} eq Version\ 5.00\r\n\r\n]} {
+				>
+					emit {Windows Registry text (Win2K or above)}
+					mime text/x-ms-regedit
+					ext reg
+				<
+			}
+	
+		<
+	}
+	
+	if {[S lestring16 2 0 {} {} eq Windows\ Registry\ Editor\ ]} {
+		>
+			if {[S lestring16 50 0 {} {} eq Version\ 5.00\r\n\r\n]} {
+				>
+					emit {Windows Registry little-endian text (Win2K or above)}
+					mime text/x-ms-regedit
+					ext reg
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq WINE\ REGISTRY\ Version\ ]} {
+		>
+			emit {WINE registry text}
+			if {[S string [R 0] 0 {} {} x {}]} {
+				>
+					emit {\b, version %s}
+					mime text/x-wine-extension-reg
+					ext reg
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \;]} {
+		>
+			U 275 ini-file 0
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \[]} {
+		>
+			U 275 ini-file 0
+	
+		<
+	}
+	
+	if {[N ubelong 0 0 0 & 4294937087 == 4294838528]} {
+		>
+			if {[S search 2 0 {} 8192 eq \[]} {
+				>
+					if {[S lestring16 [R 3] 0 {} {} eq ersion\]]} {
+						>
+							emit {Windows setup INFormation}
+							mime application/x-setupscript
+							ext inf
+						<
+					}
+	
+					if {[S lestring16 [R 3] 0 {} {} eq trings\]]} {
+						>
+							emit {Windows setup INFormation}
+							mime application/x-setupscript
+							ext inf
+						<
+					}
+	
+					if {[S lestring16 [R 3] 0 {} {} eq ourceDisksNames\]]} {
+						>
+							emit {Windows setup INFormation}
+							mime application/x-setupscript
+							ext inf
+						<
+					}
+	
+					if {[D [R 3]]} {
+						>
+							if {[S search [R 0] 0 {} 8192 eq \x0A\x00\x5b]} {
+								>
+									if {[S lestring16 [R 3] 0 {} {} eq ersion\]]} {
+										>
+											emit {Windows setup INFormation}
+											mime application/x-setupscript
+											ext inf
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[N leshort 0 0 0 & -258 == 0]} {
+		>
+			if {[N ulelong 4 0 0 & 4244635136 == 0]} {
+				>
+					if {[N ulelong 68 0 0 {} {} > 87]} {
+						>
+							if {[N ubelong [I 68 ulelong 0 - 0 1] 0 0 & 4292920601 == 4194328]} {
+								>
+									emit {Windows Precompiled iNF}
+									if {[N uleshort 0 0 0 {} {} != 257]} {
+										>
+											if {[N ubyte 1 0 0 {} {} x {}]} {
+												>
+													emit {\b, version %u}
+												<
+											}
+	
+											if {[N ubyte 0 0 0 {} {} x {}]} {
+												>
+													emit {\b.%u}
+												<
+											}
+	
+										<
+									}
+	
+									if {[N uleshort 2 0 0 {} {} != 2]} {
+										>
+											emit {\b, InfStyle %u}
+										<
+									}
+	
+									switch [Nv ulelong 4 0 & 1] {
+										1 {
+											>
+												emit {\b, unicoded}
+											<
+											>
+												if {[S lestring16 [I 20 ulelong 0 + 0 0] 0 {} {} x {}]} {
+													>
+														emit {"%s"}
+													<
+												}
+	
+											<
+										}
+									}
+	
+									if {[N ulelong 4 0 0 & 32 == 32]} {
+										>
+											emit {\b, digitally signed}
+										<
+									}
+	
+									if {[N ulelong 20 0 0 {} {} x {}]} {
+										>
+											emit {\b, at 0x%x}
+										<
+									}
+	
+									if {[N ulelong 4 0 0 & 1 != 1]} {
+										>
+											if {[S string [I 20 ulelong 0 + 0 0] 0 {} {} x {}]} {
+												>
+													emit {"%s"}
+												<
+											}
+	
+										<
+									}
+	
+									if {[N ulelong 68 0 0 {} {} > 87]} {
+										>
+											if {[N ulelong 4 0 0 & 1 == 1]} {
+												>
+													if {[N ubequad [I 68 ulelong 0 + 0 0] 0 0 {} {} == 4827922573759108864]} {
+														>
+														<
+													}
+	
+													if {[N ubequad [I 68 ulelong 0 + 0 0] 0 0 {} {} != 4827922573759108864]} {
+														>
+															if {[S lestring16 [I 68 ulelong 0 + 0 0] 0 {} {} x {}]} {
+																>
+																	emit {\b, WinDirPath "%s"}
+																<
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+											if {[N ulelong 4 0 0 & 1 != 1]} {
+												>
+													if {[S string [I 68 ulelong 0 + 0 0] 0 {} {} ne C:\\WINDOWS]} {
+														>
+															emit {\b, WinDirPath "%s"}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[N ulelong 72 0 0 {} {} > 0]} {
+										>
+											emit {\b,}
+											if {[N ulelong 4 0 0 & 1 == 1]} {
+												>
+													if {[S lestring16 [I 72 ulelong 0 + 0 0] 0 {} {} x {}]} {
+														>
+															emit {OsLoaderPath "%s"}
+														<
+													}
+	
+												<
+											}
+	
+											if {[N ulelong 4 0 0 & 1 != 1]} {
+												>
+													if {[S string [I 72 ulelong 0 + 0 0] 0 {} {} x {}]} {
+														>
+															emit {OsLoaderPath "%s"}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[N uleshort 78 0 0 {} {} != 1031]} {
+										>
+											emit {\b, LanguageId %x}
+										<
+									}
+	
+									if {[N ulelong 80 0 0 {} {} > 0]} {
+										>
+											emit {\b,}
+											if {[N ulelong 4 0 0 & 1 == 1]} {
+												>
+													if {[S lestring16 [I 80 ulelong 0 + 0 0] 0 {} {} x {}]} {
+														>
+															emit {SourcePath "%s"}
+														<
+													}
+	
+												<
+											}
+	
+											if {[N ulelong 4 0 0 & 1 != 1]} {
+												>
+													if {[S string [I 80 ulelong 0 + 0 0] 0 {} {} > \0]} {
+														>
+															emit {SourcePath "%s"}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									if {[N ulelong 84 0 0 {} {} > 0]} {
+										>
+											emit {\b,}
+											if {[N ulelong 4 0 0 & 1 == 1]} {
+												>
+													if {[S lestring16 [I 84 ulelong 0 + 0 0] 0 {} {} x {}]} {
+														>
+															emit {InfName "%s"}
+														<
+													}
+	
+												<
+											}
+	
+											if {[N ulelong 4 0 0 & 1 != 1]} {
+												>
+													if {[S string [I 84 ulelong 0 + 0 0] 0 {} {} > \0]} {
+														>
+															emit {InfName "%s"}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+									mime application/x-pnf
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			strength -5
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq TAPE]} {
+		>
+			if {[N ulequad 20 0 0 {} {} == 0]} {
+				>
+					if {[N uleshort 28 0 0 {} {} == 0]} {
+						>
+							if {[N ulelong 36 0 0 {} {} == 0]} {
+								>
+									if {[N ulelong 4 0 0 & 4294770656 == 0]} {
+										>
+											emit {Windows NTbackup archive}
+											switch [Nv ubyte 10 0 {} {}] {
+												1 {
+													>
+														emit {\b NetWare}
+													<
+												}
+												13 {
+													>
+														emit {\b NetWare SMS}
+													<
+												}
+												14 {
+													>
+														emit {\b NT}
+													<
+												}
+												24 {
+													>
+														emit {\b 3}
+													<
+												}
+												25 {
+													>
+														emit {\b OS/2}
+													<
+												}
+												26 {
+													>
+														emit {\b 95}
+													<
+												}
+												27 {
+													>
+														emit {\b Macintosh}
+													<
+												}
+												28 {
+													>
+														emit {\b UNIX}
+													<
+												}
+											}
+	
+											if {[N ulelong 4 0 0 & 4 != 0]} {
+												>
+													emit {\b, compressed}
+												<
+											}
+	
+											if {[N ulelong 4 0 0 & 8 != 0]} {
+												>
+													emit {\b, End Of Medium hit}
+												<
+											}
+	
+											if {[N ulelong 4 0 0 & 131072 == 0]} {
+												>
+													if {[N ulelong 4 0 0 & 65536 != 0]} {
+														>
+															emit {\b, with catalog}
+														<
+													}
+	
+												<
+											}
+	
+											if {[N ulelong 4 0 0 & 131072 != 0]} {
+												>
+													emit {\b, with file catalog}
+												<
+											}
+	
+											if {[N uleshort 60 0 0 {} {} > 1]} {
+												>
+													emit {\b, sequence %u}
+												<
+											}
+	
+											if {[N uleshort 62 0 0 {} {} > 0]} {
+												>
+													emit {\b, 0x%x encrypted}
+												<
+											}
+	
+											if {[N uleshort 64 0 0 {} {} != 2]} {
+												>
+													emit {\b, soft size %u*512}
+												<
+											}
+	
+											if {[N uleshort 68 0 0 {} {} > 0]} {
+												>
+													if {[N uleshort 70 0 0 {} {} > 0]} {
+														>
+															switch [Nv ubyte 48 0 {} {}] {
+																1 {
+																	>
+																		if {[S string [I 70 uleshort 0 + 0 0] 0 {} {} > \0]} {
+																			>
+																				emit {\b, name: %s}
+																			<
+																		}
+	
+																	<
+																}
+																2 {
+																	>
+																		if {[S lestring16 [I 70 uleshort 0 + 0 0] 0 {} {} x {}]} {
+																			>
+																				emit {\b, name: %s}
+																			<
+																		}
+	
+																	<
+																}
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+											if {[N uleshort 72 0 0 {} {} > 0]} {
+												>
+												<
+											}
+	
+											if {[N uleshort 74 0 0 {} {} > 0]} {
+												>
+													switch [Nv ubyte 48 0 {} {}] {
+														1 {
+															>
+																if {[S string [I 74 uleshort 0 + 0 0] 0 {} {} > \0]} {
+																	>
+																		emit {\b, label: %s}
+																	<
+																}
+	
+															<
+														}
+														2 {
+															>
+																if {[S lestring16 [I 74 uleshort 0 + 0 0] 0 {} {} x {}]} {
+																	>
+																		emit {\b, label: %s}
+																	<
+																}
+	
+															<
+														}
+													}
+	
+												<
+											}
+	
+											if {[N uleshort 86 0 0 {} {} x {}]} {
+												>
+													emit {\b, software (0x%x)}
+												<
+											}
+	
+											if {[N uleshort 80 0 0 {} {} > 0]} {
+												>
+													if {[N uleshort 82 0 0 {} {} > 0]} {
+														>
+															switch [Nv ubyte 48 0 {} {}] {
+																1 {
+																	>
+																		if {[S string [I 82 uleshort 0 + 0 0] 0 {} {} > \0]} {
+																			>
+																				emit {\b: %s}
+																			<
+																		}
+	
+																	<
+																}
+																2 {
+																	>
+																		if {[S lestring16 [I 82 uleshort 0 + 0 0] 0 {} {} x {}]} {
+																			>
+																				emit {\b: %s}
+																			<
+																		}
+	
+																	<
+																}
+															}
+	
+														<
+													}
+	
+												<
+											}
+	
+											if {[N uleshort 84 0 0 {} {} != 1024]} {
+												>
+													emit {\b, block size %u}
+												<
+											}
+	
+											ext bkf
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq JASC-PAL\r\n]} {
+		>
+			emit {PaintShop Pro color palette}
+			if {[S string 10 0 {} {} ne 0100]} {
+				>
+					emit {\b, version %.4s}
+				<
+			}
+	
+			if {[S string 16 0 {} {} x {}]} {
+				>
+					emit {\b, %.3s colors}
+				<
+			}
+	
+			ext pal/PspPalette
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Inno\ Setup\ Uninstall\ Log\ (b)]} {
+		>
+			emit {InnoSetup Log}
+			if {[S string 28 0 {} {} > \0]} {
+				>
+					emit {\b%.7s}
+				<
+			}
+	
+			if {[S string 192 0 {} {} x {}]} {
+				>
+					emit %s
+				<
+			}
+	
+			if {[N ubyte 64 0 0 {} {} == 123]} {
+				>
+					if {[S string 64 0 {} {} x {}]} {
+						>
+							emit %-.38s
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulelong 320 0 0 {} {} x {}]} {
+				>
+					emit {\b, version 0x%x}
+				<
+			}
+	
+			if {[N ulelong 328 0 0 {} {} x {}]} {
+				>
+					emit {\b, %u bytes}
+				<
+			}
+	
+			if {[N ulelong 320 0 0 {} {} < 1000]} {
+				>
+					if {[S pstring 470 0 {} {} x {}]} {
+						>
+							emit {\b, %s}
+							if {[S pstring [R 0] 0 {} {} x {}]} {
+								>
+									emit {\b\%s}
+									if {[S pstring [R 0] 0 {} {} x {}]} {
+										>
+											emit {\b, "%s"}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N ulelong 320 0 0 {} {} > 999]} {
+				>
+					if {[S lestring16 475 0 {} {} x {}]} {
+						>
+							emit {\b, %-.9s}
+						<
+					}
+	
+					if {[S search 475 0 {} 43 eq \xFF\xFF\xFF]} {
+						>
+							if {[S lestring16 [R 0] 0 {} {} x {}]} {
+								>
+									emit {\b\%-.9s}
+								<
+							}
+	
+							if {[S search [R 0] 0 {} 43 eq \xFF\xFF\xFF]} {
+								>
+									if {[S lestring16 [R 0] 0 {} {} x {}]} {
+										>
+											emit {\b, %-.42s}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			mime application/x-innosetup
+			ext dat
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq RGDB]} {
+		>
+			emit {CRDA wireless regulatory database file}
+			if {[N belong 4 0 0 {} {} == 19]} {
+				>
+					emit {(Version 1)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq \040\040\040\040\040\040\040\040\040\040\040ML4D\040'92]} {
+		>
+			emit {Smith Corona PWP}
+			switch [Nv byte 24 0 {} {}] {
+				2 {
+					>
+						emit {\b, single spaced}
+					<
+				}
+				3 {
+					>
+						emit {\b, 1.5 spaced}
+					<
+				}
+				4 {
+					>
+						emit {\b, double spaced}
+					<
+				}
+			}
+	
+			switch [Nv byte 25 0 {} {}] {
+				66 {
+					>
+						emit {\b, letter}
+					<
+				}
+				84 {
+					>
+						emit {\b, legal}
+					<
+				}
+			}
+	
+			if {[N byte 26 0 0 {} {} == 70]} {
+				>
+					emit {\b, A4}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xffWPC]} {
+		>
+			switch [Nv byte 8 0 {} {}] {
+				1 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							1 {
+								>
+									emit {WordPerfect macro}
+								<
+							}
+							2 {
+								>
+									emit {WordPerfect help file}
+								<
+							}
+							3 {
+								>
+									emit {WordPerfect keyboard file}
+								<
+							}
+							10 {
+								>
+									emit {WordPerfect document}
+								<
+							}
+							11 {
+								>
+									emit {WordPerfect dictionary}
+								<
+							}
+							12 {
+								>
+									emit {WordPerfect thesaurus}
+								<
+							}
+							13 {
+								>
+									emit {WordPerfect block}
+								<
+							}
+							14 {
+								>
+									emit {WordPerfect rectangular block}
+								<
+							}
+							15 {
+								>
+									emit {WordPerfect column block}
+								<
+							}
+							16 {
+								>
+									emit {WordPerfect printer data}
+								<
+							}
+							19 {
+								>
+									emit {WordPerfect printer data}
+								<
+							}
+							20 {
+								>
+									emit {WordPerfect driver resource data}
+								<
+							}
+							22 {
+								>
+									emit {WordPerfect graphic image}
+								<
+							}
+							23 {
+								>
+									emit {WordPerfect hyphenation code}
+								<
+							}
+							24 {
+								>
+									emit {WordPerfect hyphenation data}
+								<
+							}
+							25 {
+								>
+									emit {WordPerfect macro resource data}
+								<
+							}
+							27 {
+								>
+									emit {WordPerfect hyphenation lex}
+								<
+							}
+							29 {
+								>
+									emit {WordPerfect wordlist}
+								<
+							}
+							30 {
+								>
+									emit {WordPerfect equation resource data}
+								<
+							}
+							33 {
+								>
+									emit {WordPerfect spell rules}
+								<
+							}
+							34 {
+								>
+									emit {WordPerfect dictionary rules}
+								<
+							}
+							39 {
+								>
+									emit {WordPerfect spell rules (Microlytics)}
+								<
+							}
+							43 {
+								>
+									emit {WordPerfect settings file}
+								<
+							}
+							44 {
+								>
+									emit {WordPerfect 3.5 document}
+								<
+							}
+							45 {
+								>
+									emit {WordPerfect 4.2 document}
+								<
+							}
+							69 {
+								>
+									emit {WordPerfect dialog file}
+								<
+							}
+							76 {
+								>
+									emit {WordPerfect button bar}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel WordPerfect: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				2 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							1 {
+								>
+									emit {Corel shell macro}
+								<
+							}
+							10 {
+								>
+									emit {Corel shell definition}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel Shell: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				3 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							1 {
+								>
+									emit {Corel Notebook macro}
+								<
+							}
+							2 {
+								>
+									emit {Corel Notebook help file}
+								<
+							}
+							3 {
+								>
+									emit {Corel Notebook keyboard file}
+								<
+							}
+							10 {
+								>
+									emit {Corel Notebook definition}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel Notebook: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				4 {
+					>
+						if {[N byte 9 0 0 {} {} == 2]} {
+							>
+								emit {Corel Calculator help file}
+							<
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel Calculator: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				5 {
+					>
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel File Manager: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				6 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							2 {
+								>
+									emit {Corel Calendar help file}
+								<
+							}
+							10 {
+								>
+									emit {Corel Calendar data file}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel Calendar: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				7 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							1 {
+								>
+									emit {Corel Editor macro}
+								<
+							}
+							2 {
+								>
+									emit {Corel Editor help file}
+								<
+							}
+							3 {
+								>
+									emit {Corel Editor keyboard file}
+								<
+							}
+							25 {
+								>
+									emit {Corel Editor macro resource file}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel Program Editor/Ed Editor: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				8 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							1 {
+								>
+									emit {Corel Macro editor macro}
+								<
+							}
+							2 {
+								>
+									emit {Corel Macro editor help file}
+								<
+							}
+							3 {
+								>
+									emit {Corel Macro editor keyboard file}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel Macro Editor: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				9 {
+					>
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel Plan Perfect: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				10 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							1 {
+								>
+									emit {Corel PlanPerfect macro}
+								<
+							}
+							2 {
+								>
+									emit {Corel PlanPerfect help file}
+								<
+							}
+							3 {
+								>
+									emit {Corel PlanPerfect keyboard file}
+								<
+							}
+							10 {
+								>
+									emit {Corel PlanPerfect worksheet}
+								<
+							}
+							15 {
+								>
+									emit {Corel PlanPerfect printer definition}
+								<
+							}
+							18 {
+								>
+									emit {Corel PlanPerfect graphic definition}
+								<
+							}
+							19 {
+								>
+									emit {Corel PlanPerfect data}
+								<
+							}
+							20 {
+								>
+									emit {Corel PlanPerfect temporary printer}
+								<
+							}
+							25 {
+								>
+									emit {Corel PlanPerfect macro resource data}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel DataPerfect: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				11 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							2 {
+								>
+									emit {Corel Mail help file}
+								<
+							}
+							5 {
+								>
+									emit {Corel Mail distribution list}
+								<
+							}
+							10 {
+								>
+									emit {Corel Mail out box}
+								<
+							}
+							11 {
+								>
+									emit {Corel Mail in box}
+								<
+							}
+							20 {
+								>
+									emit {Corel Mail users archived mailbox}
+								<
+							}
+							21 {
+								>
+									emit {Corel Mail archived message database}
+								<
+							}
+							22 {
+								>
+									emit {Corel Mail archived attachments}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel Mail: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				12 {
+					>
+						if {[N byte 9 0 0 {} {} == 11]} {
+							>
+								emit {Corel Printer temporary file}
+							<
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel Printer: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				13 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							2 {
+								>
+									emit {Corel Scheduler help file}
+								<
+							}
+							10 {
+								>
+									emit {Corel Scheduler in file}
+								<
+							}
+							11 {
+								>
+									emit {Corel Scheduler out file}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel Scheduler: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				14 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							10 {
+								>
+									emit {Corel GroupWise settings file}
+								<
+							}
+							17 {
+								>
+									emit {Corel GroupWise directory services}
+								<
+							}
+							43 {
+								>
+									emit {Corel GroupWise settings file}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel WordPerfect Office: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				15 {
+					>
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel DrawPerfect: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				16 {
+					>
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel LetterPerfect: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				17 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							10 {
+								>
+									emit {Corel Terminal resource data}
+								<
+							}
+							11 {
+								>
+									emit {Corel Terminal resource data}
+								<
+							}
+							43 {
+								>
+									emit {Corel Terminal resource data}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel Terminal: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				18 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							10 {
+								>
+									emit {Corel loadable file}
+								<
+							}
+							11 {
+								>
+									emit {Corel GUI loadable text}
+								<
+							}
+							12 {
+								>
+									emit {Corel graphics resource data}
+								<
+							}
+							13 {
+								>
+									emit {Corel printer settings file}
+								<
+							}
+							14 {
+								>
+									emit {Corel port definition file}
+								<
+							}
+							15 {
+								>
+									emit {Corel print queue parameters}
+								<
+							}
+							16 {
+								>
+									emit {Corel compressed file}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel loadable file: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+						switch [Nv byte 15 0 {} {}] {
+							0 {
+								>
+									emit {\b, optimized for Intel}
+								<
+							}
+							1 {
+								>
+									emit {\b, optimized for Non-Intel}
+								<
+							}
+						}
+	
+					<
+				}
+				20 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							10 {
+								>
+									emit {Corel Network service msg file}
+								<
+							}
+							11 {
+								>
+									emit {Corel Network service msg file}
+								<
+							}
+							12 {
+								>
+									emit {Corel Async gateway login msg}
+								<
+							}
+							14 {
+								>
+									emit {Corel GroupWise message file}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {Corel Network service: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				31 {
+					>
+						switch [Nv byte 9 0 {} {}] {
+							20 {
+								>
+									emit {GroupWise admin domain database}
+								<
+							}
+							21 {
+								>
+									emit {GroupWise admin host database}
+								<
+							}
+							23 {
+								>
+									emit {GroupWise admin remote host database}
+								<
+							}
+							24 {
+								>
+									emit {GroupWise admin ADS deferment data file}
+								<
+							}
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {GroupWise: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+				33 {
+					>
+						if {[N byte 9 0 0 {} {} == 10]} {
+							>
+								emit {IntelliTAG (SGML) compiled DTD}
+							<
+						}
+	
+						if {[D 9]} {
+							>
+								if {[N byte 9 0 0 {} {} x {}]} {
+									>
+										emit {IntelliTAG: Unknown filetype %d}
+									<
+								}
+	
+							<
+						}
+	
+					<
+				}
+			}
+	
+			if {[D 8]} {
+				>
+					if {[N byte 8 0 0 {} {} x {}]} {
+						>
+							emit {Unknown Corel/Wordperfect product %d,}
+							if {[N byte 9 0 0 {} {} x {}]} {
+								>
+									emit {file type %d}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[N byte 10 0 0 {} {} == 0]} {
+				>
+					emit {\b, v5.}
+				<
+			}
+	
+			if {[N byte 10 0 0 {} {} != 0]} {
+				>
+					emit {\b, v%d.}
+				<
+			}
+	
+			if {[N byte 11 0 0 {} {} x {}]} {
+				>
+					emit {\b%d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq HWP\ Document\ File]} {
+		>
+			emit {Hangul (Korean) Word Processor File 3.0}
+		<
+	}
+	
+	if {[S string 512 0 {} {} eq R\0o\0o\0t\0]} {
+		>
+			emit {Hangul (Korean) Word Processor File 2000}
+			mime application/x-hwp
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq CSBK]} {
+		>
+			emit {Ted Neslson's CosmicBook hypertext file}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq EYWR]} {
+		>
+			emit {AmigaWriter file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \\1cw\ ]} {
+		>
+			emit {ChiWriter file}
+			if {[S string 5 0 {} {} > \0]} {
+				>
+					emit {version %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \\1cw]} {
+		>
+			emit {ChiWriter file}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq IIXPR3]} {
+		>
+			emit {Intel Quark Express Document (English)}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq IIXPRa]} {
+		>
+			emit {Intel Quark Express Document (Korean)}
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq MMXPR3]} {
+		>
+			emit {Motorola Quark Express Document (English)}
+			mime application/x-quark-xpress-3
+		<
+	}
+	
+	if {[S string 2 0 {} {} eq MMXPRa]} {
+		>
+			emit {Motorola Quark Express Document (Korean)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DOC]} {
+		>
+			if {[N byte 43 0 0 {} {} == 20]} {
+				>
+					emit {Just System Word Processor Ichitaro v4}
+					mime application/x-ichitaro4
+				<
+			}
+	
+			if {[S string 144 0 {} {} eq JDASH]} {
+				>
+					emit application/x-ichitaro4
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DOC]} {
+		>
+			if {[N byte 43 0 0 {} {} == 21]} {
+				>
+					emit {Just System Word Processor Ichitaro v5}
+					mime application/x-ichitaro5
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq DOC]} {
+		>
+			if {[N byte 43 0 0 {} {} == 22]} {
+				>
+					emit {Just System Word Processor Ichitaro v6}
+					mime application/x-ichitaro6
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 w {} eq <map\ version]} {
+		>
+			emit {Freemind document}
+			mime application/x-freemind
+		<
+	}
+	
+	if {[S string 0 0 w {} eq <map\ version=\"freeplane]} {
+		>
+			emit {Freeplane document}
+			mime application/x-freeplane
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <SCRIBUSUTF8\ Version]} {
+		>
+			emit {Scribus Document}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq <SCRIBUSUTF8NEW\ Version]} {
+		>
+			emit {Scribus Document}
+			mime application/x-scribus
+		<
+	}
+	
+	if {[N ulelong 0 0 0 & 2155937791 == 4612]} {
+		>
+			emit {gfxboot compiled html help file}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq wsdl]} {
+		>
+			emit {PHP WSDL cache,}
+			if {[N byte 4 0 0 {} {} x {}]} {
+				>
+					emit {version 0x%02x}
+				<
+			}
+	
+			if {[N ledate 6 0 0 {} {} x {}]} {
+				>
+					emit {\b, created %s}
+				<
+			}
+	
+			if {[N lelong 10 0 0 {} {} < 2147483647]} {
+				>
+					if {[S pstring 10 0 l {} x {}]} {
+						>
+							emit {\b, uri: "%s"}
+							if {[N lelong [R 0] 0 0 {} {} < 2147483647]} {
+								>
+									if {[S pstring [R -4] 0 l {} x {}]} {
+										>
+											emit {\b, source: "%s"}
+											if {[N lelong [R 0] 0 0 {} {} < 2147483647]} {
+												>
+													if {[S pstring [R -4] 0 l {} x {}]} {
+														>
+															emit {\b, target_ns: "%s"}
+														<
+													}
+	
+												<
+											}
+	
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq PIC]} {
+		>
+			if {[S search 3 0 {} 512 eq \x1A]} {
+				>
+					if {[S search [R 0] 0 {} 512 eq \x0]} {
+						>
+							if {[N ubyte [R 0] 0 0 {} {} == 0]} {
+								>
+									emit {Yanagisawa PIC image file,}
+									switch [Nv ubyte [R 0] 0 & 15] {
+										0 {
+											>
+												emit {model: X68000,}
+											<
+										}
+										1 {
+											>
+												emit {model: PC-88VA,}
+											<
+										}
+										2 {
+											>
+												emit {model: FM-TOWNS,}
+											<
+										}
+										3 {
+											>
+												emit {model: MAC,}
+											<
+										}
+										15 {
+											>
+												emit {model: Generic,}
+											<
+										}
+									}
+	
+									if {[N ubeshort [R 3] 0 0 {} {} x {}]} {
+										>
+											emit %dx
+										<
+									}
+	
+									if {[N ubeshort [R 5] 0 0 {} {} x {}]} {
+										>
+											emit {\b%d,}
+										<
+									}
+	
+									switch [Nv ubeshort [R 1] 0 {} {}] {
+										4 {
+											>
+												emit {colors: 16}
+											<
+										}
+										8 {
+											>
+												emit {colors: 256}
+											<
+										}
+										12 {
+											>
+												emit {colors: 4096}
+											<
+										}
+										15 {
+											>
+												emit {colors: 32768}
+											<
+										}
+										16 {
+											>
+												emit {colors: 65536}
+											<
+										}
+									}
+	
+									if {[N ubeshort [R 1] 0 0 {} {} > 16]} {
+										>
+											emit {colors: %d-bit}
+										<
+									}
+	
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %XDELTA%]} {
+		>
+			emit {XDelta binary patch file 0.14}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %XDZ000%]} {
+		>
+			emit {XDelta binary patch file 0.18}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %XDZ001%]} {
+		>
+			emit {XDelta binary patch file 0.20}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %XDZ002%]} {
+		>
+			emit {XDelta binary patch file 1.0}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %XDZ003%]} {
+		>
+			emit {XDelta binary patch file 1.0.4}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq %XDZ004%]} {
+		>
+			emit {XDelta binary patch file 1.1}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \xD6\xC3\xC4\x00]} {
+		>
+			emit {VCDIFF binary diff}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq core]} {
+		>
+			emit {core file (Xenix)}
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x55\x7A\x6E\x61]} {
+		>
+			emit {xo65 object,}
+			if {[N leshort 4 0 0 {} {} x {}]} {
+				>
+					emit {version %d,}
+				<
+			}
+	
+			switch [Nv leshort 6 0 & 1] {
+				0 {
+					>
+						emit {no debug info}
+					<
+				}
+				1 {
+					>
+						emit {with debug info}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x6E\x61\x55\x7A]} {
+		>
+			emit {xo65 library,}
+			if {[N leshort 4 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq \x01\x00\x6F\x36\x35]} {
+		>
+			emit o65
+			switch [Nv leshort 6 0 & 4096] {
+				0 {
+					>
+						emit executable,
+					<
+				}
+				4096 {
+					>
+						emit object,
+					<
+				}
+			}
+	
+			if {[N byte 5 0 0 {} {} x {}]} {
+				>
+					emit {version %d,}
+				<
+			}
+	
+			switch [Nv leshort 6 0 & -32768] {
+				-32768 {
+					>
+						emit 65816,
+					<
+				}
+				0 {
+					>
+						emit 6502,
+					<
+				}
+			}
+	
+			switch [Nv leshort 6 0 & 8192] {
+				0 {
+					>
+						emit {16 bit,}
+					<
+				}
+				8192 {
+					>
+						emit {32 bit,}
+					<
+				}
+			}
+	
+			switch [Nv leshort 6 0 & 16384] {
+				0 {
+					>
+						emit {byte reloc,}
+					<
+				}
+				16384 {
+					>
+						emit {page reloc,}
+					<
+				}
+			}
+	
+			switch [Nv leshort 6 0 & 3] {
+				0 {
+					>
+						emit {alignment 1}
+					<
+				}
+				1 {
+					>
+						emit {alignment 2}
+					<
+				}
+				2 {
+					>
+						emit {alignment 4}
+					<
+				}
+				3 {
+					>
+						emit {alignment 256}
+					<
+				}
+			}
+	
+		<
+	}
+	
+	if {[S string 1 0 {} {} eq mkx]} {
+		>
+			emit {Compiled XKB Keymap: lsb,}
+			if {[N byte 0 0 0 {} {} > 0]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+			if {[N byte 0 0 0 {} {} == 0]} {
+				>
+					emit obsolete
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq xkm]} {
+		>
+			emit {Compiled XKB Keymap: msb,}
+			if {[N byte 3 0 0 {} {} > 0]} {
+				>
+					emit {version %d}
+				<
+			}
+	
+			if {[N byte 3 0 0 {} {} == 0]} {
+				>
+					emit obsolete
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq xFSdump0]} {
+		>
+			emit {xfsdump archive}
+			if {[N belong 8 0 0 {} {} x {}]} {
+				>
+					emit {(version %d)}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq Xcur]} {
+		>
+			emit {Xcursor data}
+			if {[N leshort 10 0 0 {} {} x {}]} {
+				>
+					emit {version %d}
+					if {[N leshort 8 0 0 {} {} x {}]} {
+						>
+							emit {\b.%d}
+						<
+					}
+	
+				<
+			}
+	
+			mime image/x-xcursor
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq YARA]} {
+		>
+			if {[N lelong 4 0 0 {} {} > 2047]} {
+				>
+				<
+			}
+	
+			if {[N byte 8 0 0 {} {} < 20]} {
+				>
+					emit {YARA 3.x compiled rule set}
+					if {[S clear 8 0 {} {} x {}]} {
+						>
+						<
+					}
+	
+					switch [Nv byte 8 0 {} {}] {
+						6 {
+							>
+								emit {created with version 3.3.0}
+							<
+						}
+						8 {
+							>
+								emit {created with version 3.4.0}
+							<
+						}
+						11 {
+							>
+								emit {created with version 3.5.0}
+							<
+						}
+					}
+	
+					if {[D 8]} {
+						>
+							if {[N byte 8 0 0 {} {} x {}]} {
+								>
+									emit {development version 0x%02x}
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq \000\000\000\002\365\272\313\254]} {
+		>
+			emit {ZFS shapshot (big-endian machine),}
+			if {[N belong 20 0 0 {} {} x {}]} {
+				>
+					emit {version %u,}
+				<
+			}
+	
+			switch [Nv belong 32 0 {} {}] {
+				0 {
+					>
+						emit {type: NONE,}
+					<
+				}
+				1 {
+					>
+						emit {type: META,}
+					<
+				}
+				2 {
+					>
+						emit {type: ZFS,}
+					<
+				}
+				3 {
+					>
+						emit {type: ZVOL,}
+					<
+				}
+				4 {
+					>
+						emit {type: OTHER,}
+					<
+				}
+				5 {
+					>
+						emit {type: ANY,}
+					<
+				}
+			}
+	
+			if {[N belong 32 0 0 {} {} > 5]} {
+				>
+					emit {type: UNKNOWN (%u),}
+				<
+			}
+	
+			if {[N byte 40 0 0 {} {} x {}]} {
+				>
+					emit {destination GUID: %02X}
+				<
+			}
+	
+			if {[N byte 41 0 0 {} {} x {}]} {
+				>
+					emit %02X
+				<
+			}
+	
+			if {[N byte 42 0 0 {} {} x {}]} {
+				>
+					emit %02X
+				<
+			}
+	
+			if {[N byte 43 0 0 {} {} x {}]} {
+				>
+					emit %02X
+				<
+			}
+	
+			if {[N byte 44 0 0 {} {} x {}]} {
+				>
+					emit %02X
+				<
+			}
+	
+			if {[N byte 45 0 0 {} {} x {}]} {
+				>
+					emit %02X
+				<
+			}
+	
+			if {[N byte 46 0 0 {} {} x {}]} {
+				>
+					emit %02X
+				<
+			}
+	
+			if {[N byte 47 0 0 {} {} x {}]} {
+				>
+					emit %02X,
+				<
+			}
+	
+			if {[N ulong 48 0 0 {} {} > 0]} {
+				>
+					if {[N ulong 52 0 0 {} {} > 0]} {
+						>
+							if {[N byte 48 0 0 {} {} x {}]} {
+								>
+									emit {source GUID: %02X}
+								<
+							}
+	
+							if {[N byte 49 0 0 {} {} x {}]} {
+								>
+									emit %02X
+								<
+							}
+	
+							if {[N byte 50 0 0 {} {} x {}]} {
+								>
+									emit %02X
+								<
+							}
+	
+							if {[N byte 51 0 0 {} {} x {}]} {
+								>
+									emit %02X
+								<
+							}
+	
+							if {[N byte 52 0 0 {} {} x {}]} {
+								>
+									emit %02X
+								<
+							}
+	
+							if {[N byte 53 0 0 {} {} x {}]} {
+								>
+									emit %02X
+								<
+							}
+	
+							if {[N byte 54 0 0 {} {} x {}]} {
+								>
+									emit %02X
+								<
+							}
+	
+							if {[N byte 55 0 0 {} {} x {}]} {
+								>
+									emit %02X,
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 56 0 {} {} > \0]} {
+				>
+					emit {name: '%s'}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 8 0 {} {} eq \254\313\272\365\002\000\000\000]} {
+		>
+			emit {ZFS shapshot (little-endian machine),}
+			if {[N lelong 16 0 0 {} {} x {}]} {
+				>
+					emit {version %u,}
+				<
+			}
+	
+			switch [Nv lelong 32 0 {} {}] {
+				0 {
+					>
+						emit {type: NONE,}
+					<
+				}
+				1 {
+					>
+						emit {type: META,}
+					<
+				}
+				2 {
+					>
+						emit {type: ZFS,}
+					<
+				}
+				3 {
+					>
+						emit {type: ZVOL,}
+					<
+				}
+				4 {
+					>
+						emit {type: OTHER,}
+					<
+				}
+				5 {
+					>
+						emit {type: ANY,}
+					<
+				}
+			}
+	
+			if {[N lelong 32 0 0 {} {} > 5]} {
+				>
+					emit {type: UNKNOWN (%u),}
+				<
+			}
+	
+			if {[N byte 47 0 0 {} {} x {}]} {
+				>
+					emit {destination GUID: %02X}
+				<
+			}
+	
+			if {[N byte 46 0 0 {} {} x {}]} {
+				>
+					emit %02X
+				<
+			}
+	
+			if {[N byte 45 0 0 {} {} x {}]} {
+				>
+					emit %02X
+				<
+			}
+	
+			if {[N byte 44 0 0 {} {} x {}]} {
+				>
+					emit %02X
+				<
+			}
+	
+			if {[N byte 43 0 0 {} {} x {}]} {
+				>
+					emit %02X
+				<
+			}
+	
+			if {[N byte 42 0 0 {} {} x {}]} {
+				>
+					emit %02X
+				<
+			}
+	
+			if {[N byte 41 0 0 {} {} x {}]} {
+				>
+					emit %02X
+				<
+			}
+	
+			if {[N byte 40 0 0 {} {} x {}]} {
+				>
+					emit %02X,
+				<
+			}
+	
+			if {[N ulong 48 0 0 {} {} > 0]} {
+				>
+					if {[N ulong 52 0 0 {} {} > 0]} {
+						>
+							if {[N byte 55 0 0 {} {} x {}]} {
+								>
+									emit {source GUID: %02X}
+								<
+							}
+	
+							if {[N byte 54 0 0 {} {} x {}]} {
+								>
+									emit %02X
+								<
+							}
+	
+							if {[N byte 53 0 0 {} {} x {}]} {
+								>
+									emit %02X
+								<
+							}
+	
+							if {[N byte 52 0 0 {} {} x {}]} {
+								>
+									emit %02X
+								<
+							}
+	
+							if {[N byte 51 0 0 {} {} x {}]} {
+								>
+									emit %02X
+								<
+							}
+	
+							if {[N byte 50 0 0 {} {} x {}]} {
+								>
+									emit %02X
+								<
+							}
+	
+							if {[N byte 49 0 0 {} {} x {}]} {
+								>
+									emit %02X
+								<
+							}
+	
+							if {[N byte 48 0 0 {} {} x {}]} {
+								>
+									emit %02X,
+								<
+							}
+	
+						<
+					}
+	
+				<
+			}
+	
+			if {[S string 56 0 {} {} > \0]} {
+				>
+					emit {name: '%s'}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string -22 0 {} {} eq PK\005\006]} {
+		>
+			emit {Zip archive data}
+			U 288 zipcd [I 16 ulelong 0 + 0 0]
+	
+			if {[S pstring 20 0 l {} > 0]} {
+				>
+					emit {\b, %s}
+				<
+			}
+	
+		<
+	}
+	
+	if {[S string 0 0 {} {} eq ZyXEL\002]} {
+		>
+			emit {ZyXEL voice data}
+			if {[N byte 10 0 0 {} {} == 0]} {
+				>
+					emit {- CELP encoding}
+				<
+			}
+	
+			switch [Nv byte 10 0 & 11] {
+				1 {
+					>
+						emit {- ADPCM2 encoding}
+					<
+				}
+				2 {
+					>
+						emit {- ADPCM3 encoding}
+					<
+				}
+				3 {
+					>
+						emit {- ADPCM4 encoding}
+					<
+				}
+				8 {
+					>
+						emit {- New ADPCM3 encoding}
+					<
+				}
+			}
+	
+			if {[N byte 10 0 0 & 4 == 4]} {
+				>
+					emit {with resync}
+				<
+			}
+	
+		<
+	}
+	
+
+}
+
+
+## -- ** END GENERATED CODE ** --
+## -- Do not edit before this line !
+##
+
+}
+
+# ### ### ### ######### ######### #########
+## Ready for use.
+# EOF
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/pkgIndex.tcl
new file mode 100644
index 00000000..a4590070
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/pkgIndex.tcl
@@ -0,0 +1,14 @@
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+
+# Recognizers
+package ifneeded fileutil::magic::filetype 2.0.1 [list source [file join $dir filetypes.tcl]]
+
+# Runtime
+package ifneeded fileutil::magic::rt 3.0 [list source [file join $dir rtcore.tcl]]
+
+# Compiler packages
+package ifneeded fileutil::magic::cgen   1.3.0 [list source [file join $dir cgen.tcl]]
+package ifneeded fileutil::magic::cfront 1.3.0 [list source [file join $dir cfront.tcl]]
+
+
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/rtcore.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/rtcore.tcl
new file mode 100644
index 00000000..6bf1fe3e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/fumagic/rtcore.tcl
@@ -0,0 +1,1019 @@
+# rtcore.tcl --
+#
+#	Runtime core for file type recognition engines written in pure Tcl.
+#
+# Copyright (c) 2004-2005 Colin McCormack <coldstore@users.sourceforge.net>
+# Copyright (c) 2005      Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Copyright (c) 2016-2018 Poor Yorick     <tk.tcl.core.tcllib@pooryorick.com>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: rtcore.tcl,v 1.5 2005/09/28 04:51:19 andreas_kupries Exp $
+
+#####
+#
+# "mime type recognition in pure tcl"
+# http://wiki.tcl.tk/12526
+#
+# Tcl code harvested on:  10 Feb 2005, 04:06 GMT
+# Wiki page last updated: ???
+#
+#####
+
+# TODO
+#    Required Functionality
+#	implement full offset language}
+#	    done
+#
+#	    by pooryorick
+#
+#	    time {2016 06}
+#
+#
+#	implement pstring (pascal string)
+#	    done
+#
+#	    by pooryorick
+#
+#	    time {2016 06}
+#}
+#
+#	implement regex form
+#	    done
+#
+#	    by pooryorick
+#
+#	    time {2016 06}
+#
+#
+#	implement string qualifiers
+#	    done
+#	    
+#	    by pooryorick
+#
+#	    time {2016 06}
+#
+#	implement correct handling of date types
+#
+#	finish implementing the indirect type} 
+#	    done
+#
+#	    by pooryorick
+#
+#	    2018 08
+#
+#	Maybe distinguish between binary and text tests, like file(n)
+#
+#	    done
+#
+#	    by pooryorick
+#
+#	    2018 08
+#	
+#	process and use strength directives
+#
+#	    done
+#
+#	    by pooryorick
+#
+#	    2018 08
+#
+#	handle the "indirect" type
+#
+#	    done
+#
+#	    by pooryorick
+#
+#	    2018 08
+#
+#
+#    }
+#}
+
+
+
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.5
+
+
+
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+namespace eval ::fileutil::magic::rt {
+    # Configuration flag. (De)activate debugging output.
+    # This is done during initialization.
+    # Changes at runtime have no effect.
+
+    variable debug 0
+
+    # The maximum size of a substring to inspect from the file in question 
+    variable maxstring 64
+
+    # The maximum length of any %s substitution in a resulting description is
+    variable maxpstring 64
+
+    variable regexdefaultlen 4096
+
+    # [*] The vast majority of magic strings are in the first 4k of the file.
+
+    # Export APIs (full public, recognizer public)
+    namespace export file_start result
+    namespace export emit ext mime new offset strength \
+	D Nv N O S Nvx Nx Sx L R T I U < >
+
+    namespace eval _ {}
+
+}
+
+
+
+
+# ### ### ### ######### ######### #########
+## Public API, general use.
+
+
+proc ::fileutil::magic::rt::> {} {
+    upvar #1 cursors cursors depth depth found found \
+	level level lfound lfound strengths strengths \
+	typematch typematch useful useful virtual virtual
+    set prevlevel $level
+    incr level
+    incr depth
+    set cursors($level) $cursors($prevlevel)
+    set strengths($level) 0
+    set useful($level) 0
+    set virtual($level) $virtual($prevlevel)
+    set found 0
+    dict set lfound $level 0
+    return
+}
+
+
+proc ::fileutil::magic::rt::< {} {
+    upvar #1 class class ext ext found found level level mime mime \
+	result result strengths strengths typematch typematch useful useful
+
+    if {$level == 1 && [llength $result]} {
+	set leveln $level
+	set weight 0
+	while {$leveln >= 0} {
+	    set weight [
+		expr {$weight + $useful($leveln) + $strengths($leveln) + $typematch($leveln)}]
+	    incr leveln -1
+	}
+
+	foreach item $result[set result {}] {
+	    set item [lmap {-> x ->} [regexp -all -inline \
+		{(.+?)([[:punct:]][[:space:]]+|[:,+]*$)} $item[set item {}]] {
+
+		regsub {"(.*)"} $x {\1} x
+		regsub {'(.*)'} $x {\1} x
+		regsub {\((.*)\)} $x {\1} x
+		regsub {\{(.*)\}} $x {\1} x
+		regsub {<(.*)>} $x {\1} x
+		regsub {\[(.*)\]} $x {\1} x
+		regsub {[[:space:]][[:space:]]+} $x { } x
+
+		string trim $x
+	    }]
+	    lappend result {*}$item
+	}
+
+	yield [list $weight $result $mime $ext]
+	set result {}
+    }
+
+    # $useful holds weight of the match at each level, Each weight is
+    # basically length of the match.
+    set useful($level) 0
+    set strengths($level) 0
+
+    incr level -1
+
+    if {$level == 0} {
+	set ext {}
+	set found 0
+	set mime {}
+	set depth 0
+    }
+}
+
+
+proc ::fileutil::magic::rt::classify {data} {
+    set bin_rx {[\x00-\x08\x0b\x0e-\x1f]}
+    if {[regexp $bin_rx $data] } {
+        return binary
+    } else {
+        return text
+    }
+}
+
+proc ::fileutil::magic::rt::executable {} {
+    upvar #1 finfo finfo
+    if {![dict exists $finfo mode]} {
+	return 0
+    }
+    expr {([dict get $finfo mode] & 0o111) > 0} 
+}
+
+
+proc ::fileutil::magic::rt::ext value {
+    upvar #1 ext ext
+    set ext [split $value /]
+}
+
+
+# mark the start of a magic file in debugging
+proc ::fileutil::magic::rt::file_start {name} {
+    ::fileutil::magic::rt::Debug {puts stderr "File: $name"}
+}
+
+
+proc ::fileutil::magic::rt::message msg {
+    upvar #1 finfo finfo
+    set ranges [regexp -all -inline -indices {\$\{([^\}]*)\}} $msg]
+    foreach {orange irange} $ranges {
+	lassign $irange first last
+	set sub [string range $msg $first $last] 
+
+	if {[regexp {^x\?([^:]*?):(.*)$} $sub -> tmsg fmsg]} {
+	    set part [expr {[executable] ? $tmsg : $fmsg}]
+	    set msg [string replace $msg[set line {}] {*}$orange $part]
+	} else {
+	    parseerror error [list {unrecognized variable in description}] 
+	}
+    }
+    return $msg
+}
+
+
+proc ::fileutil::magic::rt::mime value {
+    upvar #1 mime mime
+    set mime [split [message $value] /]
+}
+
+
+proc ::fileutil::magic::rt::new {finfo chan named tests} {
+    coroutine _::[info cmdcount] [list [
+	namespace which coro]] $finfo $chan $named $tests
+}
+
+# level #1 of a coroutine
+proc ::fileutil::magic::rt::coro {finfo chan named tests} {
+    array set cache {}	    ; # Cache of fetched and decoded numeric
+			    ; # values.
+
+    ::fconfigure $chan -translation binary
+
+    # fill the string cache
+    set strbuf [::read $chan 4096]  ; # Input cache [*].
+    set class [classify $strbuf]    ; # text or binary
+
+    # clear the fetch cache
+    catch {unset cache}
+    array set cache {}
+
+    set depth 0		; # depth of the current branch
+    set ext {}
+    set extracted {}    ; # The value extracted for inspection
+    set found 1		; # Whether the last test produced a match
+    set level 0
+    set lfound {}	; # For each level, whether a match was found
+    dict set lfound 0 1
+    set mime {}
+    set result {}	; # The accumulated recognition result that is
+			; # in progress.
+
+    array unset cursors	; # the offset just after the last matching bytes,
+			; # per nesting level.
+
+    array unset strengths ; #strengths at each level
+
+    set virtual(0) 0	; # the virtual start of the file at each level
+
+    set strengths(0) 0
+    set typematch(0) 0
+
+    yield [info coroutine]
+    yield $class
+
+    if {[string length $strbuf] == 0} {
+	yield [list 0 empty {} {}]
+    } else {
+	{*}$tests
+    }
+    rename [info coroutine] {}
+    return -code break
+}
+
+proc ::fileutil::magic::rt::strength {expr} {
+    upvar #1 level level strengths strengths
+    upvar 0 strengths($level) strength
+    # this expr must not be braced
+    set strength [expr double($strength) $expr]
+}
+
+proc ::fileutil::magic::rt::use {named file name} {
+    if [dict exists $named $file $name] {
+	set script [dict get $named $file $name]
+    } else {
+	dict for {file1 val} $named {
+	    if {[dict exists $val $name]} {
+		set script [dict get $val $name]
+		break
+	    }
+	}
+    }
+    if {![info exists script]} {
+	return -code error [list {name not found} $file $name]
+    }
+    return $script
+}
+
+
+
+# ### ### ### ######### ######### #########
+## Public API, for use by a recognizer.
+
+
+# emit a description 
+proc ::fileutil::magic::rt::emit msg {
+    upvar #1 extracted extracted found found level level lfound lfound \
+	result result
+    variable maxpstring
+    set found 1
+    dict set lfound $level 1
+
+    #set map [list \
+    #    \\b "" \
+    #    %c [apply {extracted {
+    #        if {[catch {format %c $extracted} result]} {
+    #    	return {}
+    #        }
+    #        return $result
+
+    #    }} $extracted] \
+    #    %s  [string trim [string range $extracted 0 $maxpstring]] \
+    #    %ld $extracted \
+    #    %d  $extracted \
+    #]
+    #[::string map $map $msg]
+
+    # {to do} {Is only taking up to the first newline really a good general rule?}
+    regexp {\A[^\n\r]*} $extracted extracted2
+
+    regsub -all {\s+} $extracted2 { } extracted2
+
+    set arguments {}
+    set count [expr {[string length $msg] - [string length [
+	string map {% {}} $msg]]}]
+    for {set i 0} {$i < $count} {incr i} {
+	lappend arguments $extracted2
+    }
+    catch {set msg [format $msg {*}$arguments]}
+
+    # Assumption: [regexp] leaves $msg untouched if it fails
+    regexp {\A(\b|\\b)?(.*)$} $msg match b msg
+
+    set msg [message $msg[set msg {}]]
+
+    if {$b ne {} && [llength $result]} {
+	lset result end [lindex $result end]$msg
+    } else {
+	lappend result $msg
+    }
+    return
+}
+
+proc ::fileutil::magic::rt::D offset {
+    upvar #1 found found
+    expr {!$found}
+}
+
+proc ::fileutil::magic::rt::I {offset it ioi ioo iir io} {
+    # Handling of base locations specified indirectly through the
+    # contents of the inspected file.
+    upvar #1 level level
+    variable typemap
+    foreach {size scan} $typemap($it) break
+
+    set offset [Fetch $offset $size $scan]
+
+    if {[catch {expr {$offset + 0}}]} {
+	return [expr {-1 * 2 ** 128}]
+    }
+
+    if {$ioi && ![catch {$offset + 0}]} {
+	set offset [expr {~$offset}]
+    }
+
+    if {$iir} {
+	set io [Fetch [expr {$offset + $io}] $size $scan]
+    }
+
+    if {$ioo ne {}} {
+	# no bracing this expression
+	set offset [expr $offset $ioo $io]
+    }
+    return $offset
+}
+
+
+proc ::fileutil::magic::rt::L newlevel {
+    upvar #1 level level
+    set level $newlevel
+    # Regenerate level information in the calling context.
+    return
+}
+
+
+# Numeric - get bytes of $type at $offset and $compare to $val
+# qual might be a mask
+proc ::fileutil::magic::rt::N {
+    type offset testinvert compinvert mod mand comp val} {
+
+    upvar #1 class class cursors cursors extracted extracted level level \
+	typematch typematch useful useful
+    variable typemap
+
+    # unpack the type characteristics
+    foreach {size scan} $typemap($type) break
+
+    # fetch the numeric field
+    set extracted [Fetch $offset $size $scan]
+    if {$extracted eq {}} {
+
+	# Rules like the following, from the jpeg file, imply that
+	# in the absence of an extracted value, a numerical value of 
+	# 0 should be used
+
+	# From jpeg:
+	    ## Next, show thumbnail info, if it exists:
+	    #>>18    byte        !0      \b, thumbnail %dx
+	#
+	# pyk 2018-08-16:
+	#    Not necessarily.  The failure to extract might cause the rule to
+	#    be skipped.  Consider doing something different here.
+	set extracted 0
+    }
+
+    # Would moving this before the fetch be an optimisation ? The
+    # tradeoff is that we give up filling the cache, and it is unclear
+    # how often that value would be used. -- Profile!
+    if {$comp eq {x}} {
+	set useful($level) 0
+	# anything matches - don't care
+	if {$testinvert} {
+	    return 0
+	} else {
+	    return 1
+	}
+    }
+
+    if {$compinvert && $extracted ne {}} {
+	set extracted [expr -$extracted]
+    }
+
+    # perform comparison
+    if {$mod ne {}} {
+	# there's a mask to be applied
+	set extracted [expr $extracted $mod $mand]
+    }
+    switch $comp {
+	& {
+	    set c [expr {($extracted & $val) == $val}]
+	}
+	^ {
+	    set c [expr {($extracted & ~$val) == $extracted}]
+	}
+	== - != - < - > {
+	    set c [expr $extracted $comp $val]
+	}
+	default {
+	    #Should never reach this
+	    return -code error [list {unknown comparison operator} $comp]
+	}
+    }
+    # Do this last to minimize shimmering
+    set useful($level) [string length $extracted]
+
+    if {$class eq {binary}} {
+	set typematch($level)  1
+    } else {
+	set typematch($level)  0
+    }
+
+    ::fileutil::magic::rt::Debug {
+	puts stderr "numeric $type: $val $t$comp $extracted / $mod - $c"
+    }
+    if {$testinvert} {
+	set c [expr {!$c}]
+	return $c 
+    } else {
+	return $c
+    }
+}
+
+
+proc ::fileutil::magic::rt::Nv {type offset compinvert mod mand} {
+    upvar #1 class class cursors cursors extracted extracted level level \
+	offsets offsets useful useful
+    variable typemap
+
+    set offsets($level) $offset
+
+    # unpack the type characteristics
+    foreach {size scan} $typemap($type) break
+
+    # fetch the numeric field from the file
+    set extracted [Fetch $offset $size $scan]
+
+    if {$compinvert && $extracted ne {}} {
+	set extracted [expr ~$extracted]
+    }
+    if {$mod ne {} && $extracted ne {}} {
+	# there's a mask to be applied
+	set extracted [expr $extracted $mod $mand]
+    }
+
+    if {$class eq {binary}} {
+	set typematch($level)  1
+    } else {
+	set typematch($level)  0
+    }
+
+    ::fileutil::magic::rt::Debug {puts stderr "NV $type $offset $mod: $extracted"}
+    set useful($level) [string length $extracted]
+    return $extracted
+}
+
+
+proc ::fileutil::magic::rt::O offset {
+    # Handling of offset locations specified relative to the offset
+    # last field one level up.
+    upvar #1 offsets offsets level level
+    upvar 0 offsets([expr {$level -1}]) base
+    return [expr {$base + $offset}]
+}
+
+
+proc ::fileutil::magic::rt::R offset {
+    # Handling of offset locations specified relative to the cursor one level
+    # up.
+    upvar #1 cursors cursors level level
+    upvar 0 cursors([expr {$level -1}]) cursor
+    return [expr {$cursor + $offset}]
+}
+
+
+proc ::fileutil::magic::rt::S {type offset testinvert mod mand comp val} {
+    upvar #1 cursors cursors extracted extracted level level \
+	lfound lfound useful useful
+    variable maxstring
+    variable regexdefaultlen
+
+    upvar 0 cursors($level) cursor useful($level) used
+    set cursor $offset
+
+    # $compinvert is currently ignored for strings
+
+    switch $type {
+	pstring {
+	    set ptype B
+	    set vincluded 0
+	    # The last pstring type specifier wins 
+	    foreach item $mod {
+		if {$item eq {J}} {
+		    set vincluded 1
+		} else {
+		    set ptype $item
+		}
+	    }
+	    lassign [dict get {B {b 1} H {S 2} h {s 2} L {I 4} l {i 4}} $ptype] scan slength
+	    set length [GetString $offset $slength]
+	    incr offset $slength
+	    incr cursor $slength
+	    set scanu ${scan}u
+	    if {[binary scan $length $scanu length2]} {
+		if {$vincluded} {
+		    set length2 [expr {$length2 - $slength}]
+		}
+		set extracted [GetString $offset $length2]
+		incr cursor [string length $extracted]
+		    array get cursors]]
+		set c [Smatch $val $comp $extracted $mod]
+	    } else {
+		set c 0
+	    }
+	}
+	regex {
+	    if {$mand eq {}} {
+		set mand $regexdefaultlen 
+	    }
+	    set extracted [GetString $offset $mand]
+	    if {[regexp -indices $val $extracted match indices]} {
+		incr cursor [lindex $indices 1]
+		set used [string length $match]
+	        set c 1
+	    } else {
+	        set c 0
+	    }
+	}
+	search {
+	    set limit $mand
+	    set extracted [GetString $offset $limit]
+	    if {[set offset2 [string first $val $extracted]] >= 0} {
+		set cursor [expr {$offset + $offset2 + [string length $val]}]
+		set used [string length $val]
+		set c 1
+	    } else {
+		set c 0
+	    }
+	} default {
+	    # explicit "default" type, which is intended only to be used with
+	    # the "x" pattern
+	    set c [expr {[dict exists $lfound $level] ? ![dict get $lfound $level] : 1}]
+	} default {
+	    # get the string and compare it
+	    switch $type bestring16 - lestring16 {
+		set extracted [GetString $offset [
+		    expr {2 * [string length $val]}]]
+		switch $type bestring16 {
+		    binary scan $extracted Su* extracted
+		} lestring16 {
+		    binary scan $extracted su* extracted
+		}
+
+		foreach ordinal $extracted[set extracted {}] {
+		    append extracted [format %c $ordinal]
+		}
+
+	    } default {
+		# If $val is 0, give [emit] something to work with .
+		if {$val eq  "\0"} {
+		    set extracted [GetString $offset $maxstring]
+		} else {
+		    set extracted [GetString $offset [string length $val]]
+		}
+	    }
+	    incr cursor [string length $extracted]
+	    set c [Smatch $val $comp $extracted $mod]
+	}
+    }
+
+
+    ::fileutil::magic::rt::Debug {
+	puts "String '$val' $comp '$extracted' - $c"
+	if {$c} {
+	    puts "offset $offset - $extracted"
+	}
+    }
+    if {$testinvert} {
+	return [expr {!$c}]
+    } else {
+	return $c
+    }
+}
+
+
+proc ::fileutil::magic::rt::Smatch {val op string mod} {
+    upvar #1 class class level level typematch typematch useful useful 
+    if {$op eq {x}} {
+	set useful($level) 0
+	return 1
+    }
+
+    if {![string length $string] && $op in {eq == < <=}} {
+	if {$op in {eq == < <=}} {
+	    # Nothing matches an empty $string.
+	    return 0
+	}
+	return 1
+    }
+
+    if {$op eq {>} && [string length $val] > [string length $string]} {
+	return 1
+    }
+
+    # To preserve the semantics, the w operation must occur prior to the W
+    # operation (Assuming the interpretation that w makes all whitespace
+    # optional, relaxing the requirements of W) .
+    if {{w} in $mod} {
+	regsub -all {\s} $string[set string {}] {} string
+	regsub -all {\s} $val[set val {}] {} val
+    }
+
+    if {{W} in $mod} {
+	set blanklen [::tcl::mathfunc::max 0 {*}[
+	    lmap {_unused_ blanks} [regexp -all -indices -inline {(\s+)} $val] {
+	    expr {[lindex $blanks 1] - [lindex $blanks 0]}
+	}]]
+	if {![regexp "\s{$blanklen}" $string]} {
+	    ::fileutil::magic::rt::Debug {
+		puts "String '$val' $op '$string' - $c"
+		if {$c} {
+		    puts "offset $offset - $string"
+		}
+	    }
+	    return 0
+	}
+
+	regsub -all {\s+} $string[set string {}] { } string
+	regsub -all {\s+} $val[set val {}] { } val
+    }
+
+
+    if {{T} in $mod} {
+	set string [string trim $string[set string {}]]
+	set val [string tolower $val[set val {}]]
+    }
+
+    if {$class eq {binary} || {b} in $mod} {
+	set typematch($level)  0
+    } else {
+	set typematch($level)  1
+    }
+
+    set string [string range $string  0 [string length $val]-1]
+
+    # The remaining code may assume that $string and $val have the same length
+    # .
+
+    set opnum [dict get {< -1 == 0 eq 0 != 0 ne 0 > 1} $op]
+
+    if {{c} in $mod || {C} in $mod} {
+	set res 1
+	if {{c} in $mod && {C} in $mod} {
+	    set string [string tolower $string[set string {}]]
+	    set val [string tolower $val[set val {}]]
+	} elseif {{c} in $mod} {
+	    foreach sc [split $string] vc [split $val] {
+		if {[string is lower $sc]} {
+		    set vc [string tolower $vc]
+		}
+		if {[::string compare $val $string] != $opnum} {
+		    set res 0
+		    break
+		}
+	    }
+	} elseif {{C} in $mode} {
+	    foreach vc [split $val] sc [split $string]  {
+		if {[string is upper $vc]} {
+		    set sc [string toupper $sc]
+		}
+		if {[::string compare $val $string] != $opnum} {
+		    set res 0
+		    break
+		}
+	    }
+	}
+    } else {
+	set res [expr {[::string compare $string $val] == $opnum}]
+    }
+    if {$op in {!= ne}} {
+	set res [expr {!$res}]
+    }
+    # use the extracted value here, not val, because in the case of
+    # inequalities the extra information has weight
+    set useful($level) [string length $string]
+    return $res
+}
+
+
+proc ::fileutil::magic::rt::T {offset mod} {
+    upvar #1 cursors cursors level level offsets offsets tests tests \
+	virtual virtual
+    if {{r} in $mod} {
+	set offset [expr {$cursors($level) + $offset}]
+    }
+    set newvirtual [expr {$virtual($level) + $offset}]
+    >
+	set virtual($level) $newvirtual
+	{*}$tests
+    <
+}
+
+
+proc ::fileutil::magic::rt::U {file name offset} {
+    upvar #1 level level named named offsets offsets
+    set script [use $named $file $name]
+    set offsets($level) $offset
+    >
+	::try $script
+    <
+}
+
+
+
+# ### ### ### ######### ######### #########
+## Internal. Retrieval of the data used in comparisons.
+
+
+# fetch and cache a numeric value from the file
+proc ::fileutil::magic::rt::Fetch {where what scan} {
+    upvar #1 cache cache chan chan cursors cursors extracted extracted \
+	level level offsets offsets strbuf strbuf virtual virtual
+
+    set where [expr {$virtual($level) + $where}]
+    set offsets($level) $where 
+
+    # A negative offset means that an attempt to extract an indirect offset failed
+    if {$where < 0} {
+	return {}
+    }
+    # {to do} id3 length
+    if {[info exists cache($where,$what,$scan)]} {
+	lassign $cache($where,$what,$scan) extracted cursor
+    } else {
+	::seek $chan $where
+	set data [::read $chan $what]
+	set cursor [expr {$where + [string length $data]}]
+	set extracted [rtscan $data $scan]
+	set cache($where,$what,$scan) [list $extracted $cursor]
+
+	# Optimization: If we got 4 bytes, i.e. long we implicitly
+	# know the short and byte data as well. Should put them into
+	# the cache. -- Profile: How often does such an overlap truly
+	# happen ?
+    }
+    set cursors($level) $cursor 
+    return $extracted
+}
+
+
+proc ::fileutil::magic::rt::GetString {offset len} {
+    upvar #1 chan chan level level strbuf strbuf offsets offsets \
+	virtual virtual
+    # We have the first 1k of the file cached
+
+    set offsets($level) $offset
+    set offset [expr {$virtual($level) + $offset}]
+    set end [expr {$offset + $len - 1}]
+    if {$end < [string length $strbuf]} {
+        # in the string cache, copy the requested part.
+	try {
+	    set string [::string range $strbuf $offset $end]
+	} on error {tres topts} {
+	    lassign [dict get $topts -errorcode] TCL VALUE INDEX
+	    if {$TCL eq {TCL} && $VALUE eq {VALUE} && $INDEX eq {INDEX}} {
+		set string {}
+	    } else {
+		return -options $topts $tres
+	    }
+	}
+    } else {
+	# an unusual one, move to the offset and read directly from
+	# the file.
+	::seek $chan $offset
+	try {
+	    # maybe offset is out of bounds
+	    set string [::read $chan $len]
+	} on error {tres topts} {
+	    lassign [dict get $topts -errorcode] TCL VALUE INDEX
+	    if {$TCL eq {TCL} && $VALUE eq {VALUE} && $INDEX eq {INDEX}} {
+		set string {}
+	    } else {
+		return -options $topts $tres
+	    }
+	}
+    }
+    return $string
+}
+
+
+proc ::fileutil::magic::rt::me4 data {
+	binary scan $data a4 chars
+	set data [binary format a4 [lindex $chars 1] [
+	lindex $chars 0] [lindex $chars 3] [lindex $chars 2]]
+}
+
+
+proc ::fileutil::magic::rt::rtscan {data scan} {
+    if {$scan eq {me}} {
+	set data [me4 $data]
+	set scan I 
+    }
+    set numeric {}
+    binary scan $data $scan numeric
+    return $numeric
+}
+
+
+
+# ### ### ### ######### ######### #########
+## Internal, debugging.
+
+if {!$::fileutil::magic::rt::debug} {
+    # This procedure definition is optimized out of using code by the
+    # core bcc. It knows that neither argument checks are required,
+    # nor is anything done. So neither results, nor errors are
+    # possible, a true no-operation.
+    proc ::fileutil::magic::rt::Debug {args} {}
+
+} else {
+    proc ::fileutil::magic::rt::Debug {script} {
+	# Run the commands in the debug script. This usually generates
+	# some output. The uplevel is required to ensure the proper
+	# resolution of all variables found in the script.
+	uplevel 1 $script
+	return
+    }
+}
+
+
+
+# ### ### ### ######### ######### #########
+## Initializ package
+
+
+proc ::fileutil::magic::rt::Init {} {
+    variable typemap
+    global tcl_platform
+
+    # map magic typenames to field characteristics: size (#byte),
+
+    # Types without explicit endianess assume/use 'native' byteorder.
+    # We also put in special forms for the compiler, so that it can use short
+    # names for the native-endian types as well.
+
+    # {to do} {Is ldate done correctly in the procedure?  What is its byte
+    # order anyway?  Native?}
+    
+    foreach {type sig} {
+	bedate  {4 S}
+	bedouble {8 Q}
+	befloat {4 R}
+	beid3 {4 n}
+	beldate {4 I}
+	belong  {4 I}
+	beqdate {8 W}
+	beqldate {8 W}
+	beqwdate {8 W}
+	beqldate {8 W}
+	bequad {8 W} 
+	beshort {2 S}
+	bestring16 {2 S}
+	byte    {1 c}
+	date {4 n}
+	double {8 d}
+	float {4 f}
+	ldate {4 n}
+	ledate   {4 n}
+	ledouble {8 q}
+	leid3 {4 nu}
+	lefloat {4 f}
+	leldate  {4 i}
+	lelong  {4 i}
+	leqdate {8 w}
+	leqldate {8 w}
+	lequad {8 w}
+	leqwdate {8 w}
+	leshort {2 s}
+	lestring16 {2 s}
+	long  {4 n}
+	medate  {4 me}
+	meldate  {4 me}
+	melong  {4 me}
+	qdate {8 m}
+	qdate {8 n}
+	qldata {8 m}
+	quad {8 m} 
+	qwdate {8 m}
+	short {2 t}
+    } {
+	set typemap($type) $sig
+	lassign $sig size scan
+	set typemap(u$type) [list $size ${scan}u]
+    }
+
+    # generate short form names
+    foreach {n v} [array get typemap] {
+	foreach {len scan} $v break
+	set typemap($scan) [list $len $scan]
+    }
+
+    # Add the special Q and Y short forms using the proper native endianess.
+
+    if {$tcl_platform(byteOrder) eq {littleEndian}} {
+	array set typemap {Q {4 i} Y {2 s} quad {8 w}}
+    } else {
+	array set typemap {Q {4 I} Y {2 S} quad {8 W}}
+    }
+}
+
+::fileutil::magic::rt::Init
+
+
+
+# ### ### ### ######### ######### #########
+## Ready for use.
+
+package provide fileutil::magic::rt 3.0
+
+# EOF
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/generator/generator.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/generator/generator.tcl
new file mode 100644
index 00000000..66cadbf7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/generator/generator.tcl
@@ -0,0 +1,380 @@
+# generator.tcl --
+#
+#       Iterators and generators via coroutines.
+#
+# Copyright (c) 2009 by Neil Madden <nem@cs.nott.ac.uk>
+#
+# See the file "license.terms" for information on Usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+
+package require Tcl         8.6
+package provide generator   0.2
+
+namespace eval generator {
+    namespace export {[a-z]*}
+    namespace ensemble create
+
+    # next generator varName ?varName ..? --
+    #
+    #   Fetch the next values from a generator, assigning them to variables. If
+    #   the generator is exhausted any remaining variables are assigned the
+    #   empty string.
+    #
+    proc next {generator args} {
+        set items [takeList [llength $args] $generator]
+        uplevel 1 [list lassign $items {*}$args]
+    }
+
+    proc takeList {n generator} {
+        if {![exists $generator]} { return [list] }
+        set ret [list]
+        for {set i 0} {$i < $n} {incr i} {
+            set item [$generator]
+            if {[llength $item] == 0} { break }
+            lappend ret [lindex $item 0]
+        }
+        return $ret
+    }
+
+
+    # foreach varSpec generator ?varSpec generator ...? body --
+    #
+    #       Iterate over the elements of one or more generator functions. Each
+    #       generator is a command that yields successive elements. The syntax
+    #       of this construct closely matches that of the built-in foreach
+    #       command.
+    #
+    proc foreach args {
+        if {[llength $args] < 3 || ([llength $args] % 2) != 1} {
+            Usage "foreach varSpec generator ?varSpec generator ..? body"
+        }
+        set body [lindex $args end]
+        set genSpec [lrange $args 0 end-1]
+        set items [list]
+        ::foreach {varList generator} $genSpec {
+            lappend items [takeList [llength $varList] $generator]
+        }
+
+        try {
+            # Keep going until all of the generators are exhausted
+            # This is the foreach behaviour: empty strings are substituted for
+            # exhausted generators.
+            while 1 {
+                set count 0
+                ::foreach {varList generator} $genSpec item $items {
+                    incr count [llength $item]
+                    uplevel 1 [list lassign $item {*}$varList]
+                }
+                if {$count == 0} {
+                    # All exhausted
+                    break
+                }
+                try {
+                    uplevel 1 $body
+                } on continue {} {
+                    # Continue processing
+                } on return {result options} {
+                    # increment -level to remove implementation details
+                    dict incr options -level
+                    return -options $options $result
+                }
+                set items [list]
+                ::foreach {varList generator} $genSpec {
+                    lappend items [takeList [llength $varList] $generator]
+                }
+            }
+        } finally {
+            # Ensure generators are all cleaned up
+            ::foreach {_ generator} $genSpec {
+                destroy $generator
+            }
+        }
+        return
+    }
+
+    # finally cmd args.. --
+    #
+    #       Arranges for cmd to be called when the generator is destroyed. This
+    #       can be used to perform cleanup in the event that a generator is
+    #       terminated early.
+    #
+    proc finally args {
+        set ns [uplevel 1 { namespace current }]
+        trace add command [info coroutine] delete [list ::apply [list args $args $ns]]
+    }
+    proc exists generator { expr {[llength [info commands $generator]] != 0} }
+    proc destroy args {
+        ::foreach generator $args {
+            if {[exists $generator]} { rename $generator "" }
+        }
+    }
+    proc yield args {
+        # Each argument is yielded individually as a separate value.
+        ::foreach arg $args {
+            ::yield [list $arg]
+        }
+    }
+
+    proc define {name params body} {
+        set name [Resolve 1 $name]
+        set ns [namespace qualifiers $name]
+        set lambda [list $params $body $ns]
+        interp alias {} $name {} ::generator::spawn $lambda
+        return $name
+    }
+                ##### PRIVATE METHODS #####
+
+    proc spawn {lambda args} {
+        set it [Gensym]
+        coroutine $it ::generator::generate $it $lambda $args
+    }
+
+    proc generate {name lambda argList} {
+        ::yield $name
+        apply $lambda {*}$argList
+    }
+
+    proc Resolve {level name} {
+        if {[string match ::* $name]} { return $name }
+        if {[string is integer -strict $level] && $level >= 0} { incr level }
+        set ns [uplevel $level { namespace current }]
+        if {$ns eq "::"} { return ::$name }
+        return $ns\::$name
+    }
+
+    proc All {p xs} {
+        ::foreach x $xs { if {![{*}$p $x]} { return 0 } }
+        return 1
+    }
+
+    proc Empty? xs { expr {[llength $xs] == 0} }
+
+
+    variable Gensymid 0
+    proc Gensym {} {
+        variable Gensymid
+        set prefix [namespace current]::generator
+        while {1} {
+            set name $prefix[incr Gensymid]
+            if {[llength [info commands $name]] == 0} { break }
+        }
+        return $name
+    }
+
+    proc Usage msg {
+        return -code error -level 2 "wrong # args: should be \"$msg\""
+    }
+
+    proc names {} {
+        set pat {[0-9]*}
+        return [info commands [namespace current]::generator$pat]
+    }
+
+        ##### STANDARD GENERATORS #####
+
+    define map {f xs} {
+        # Ensure underlying generator is cleaned up too
+        finally destroy $xs
+        foreach x $xs { yield [{*}$f $x] }
+    }
+    define filter {p xs} {
+        finally destroy $xs
+        foreach x $xs {
+            if {[{*}$p $x]} { yield $x }
+        }
+    }
+    proc reduce {f z xs} {
+        foreach x $xs { set z [{*}$f $z $x] }
+        return $z
+    }
+    proc foldl {f z xs} { reduce $f $z $xs }
+    proc foldr {f z xs} {
+        set ys [generator to list $xs]
+        for {set i 0} {$i < [llength $ys]} {incr i} {
+            set z [{*}$f [lindex $ys end-$i] $z]
+        }
+        return $z
+    }
+    define zipWith {f xs ys} {
+        finally destroy $xs $ys
+        foreach x $xs y $ys { yield [{*}$f $x $y] }
+    }
+    proc zip {xs ys} { zipWith list $xs $ys }
+
+    proc all {p xs} {
+        and [map $p $xs]
+    }
+    proc and xs {
+        # foldl && true $xs
+        # more efficient implementation (bail-out on first non-true element):
+        foreach x $xs { if {!$x} { return 0 } }
+        return 1
+    }
+    proc any {p xs} { reduce or 0 [map $p $xs] }
+    define concat args {
+        ::foreach xs $args { finally destroy $xs }
+        ::foreach xs $args {
+            foreach x $xs { yield $x }
+        }
+    }
+    define concatMap {f xs} {
+        concat {*}[map $f $xs]
+    }
+    proc drop {n xs} {
+        takeList $n $xs
+        return $xs
+    }
+    define dropWhile {p xs} {
+        finally destroy $xs
+        foreach x $xs {
+            if {![{*}$p $x]} { yield $x; break }
+        }
+        foreach x $xs { yield $x }
+    }
+    proc contains {elem xs} {
+        foreach x $xs { if {$x eq $elem} { return 1 } }
+        return 0
+    }
+
+    proc foldl1 {f xs} { foldl $f [take 1 $xs] $xs }
+    proc foldli {f z xs} {
+        foreach x $xs { set z [{*}$f [incr i] $z $x] }
+        return $z
+    }
+    proc foldri {f z xs} {
+        set ys [to list $xs]
+        for {set i [llength $ys]} {$i > 0} {incr i -1} {
+            set z [{*}$f [incr j] [lindex $ys $i-1] $z]
+        }
+        return $z
+    }
+    proc head xs { take 1 $xs }
+    proc tail xs { drop 1 $xs }
+    proc last xs {
+        foreach x $xs { }
+        return $x
+    }
+    define init xs {
+        finally destroy $xs
+        set last [head $xs]
+        foreach x $xs {
+            yield $last
+            set last $x
+        }
+    }
+    define take {n xs} {
+        finally destroy $xs
+        foreach x $xs {
+            if {[incr i] >= $n} { break }
+            yield $x
+        }
+    }
+    define iterate {f x} {
+        while 1 {
+            yield $x
+            set x [{*}$f $x]
+        }
+    }
+
+    proc Count {x y} { incr x }
+    proc length xs { foldl Count 0 $xs }
+
+    proc or {p xs} {
+        foreach x $xs { if {[{*}$p $x]} { return 1 } }
+        return 0
+    }
+
+    proc product xs { foldl ::tcl::mathop::* 1 $xs }
+    define repeat {n args} {
+        for {set i 0} {$i < $n} {incr i} {
+            yield {*}$args
+        }
+    }
+    proc sum xs { foldl ::tcl::mathop::+ 0 $xs }
+
+    define takeWhile {p xs} {
+        finally destroy $xs
+        foreach x $xs {
+            if {[{*}$p $x]} {
+                yield $x
+            } else {
+                break
+            }
+        }
+    }
+
+    define splitWhen {p xs} {
+        finally destroy $xs
+        set token [list]
+        foreach x $xs {
+            if {[{*}$p $x]} {
+                yield $token
+                set token [list]
+            } else {
+                lappend token $x
+            }
+        }
+        if {[llength $token]} { yield $token }
+    }
+
+    define scanl {f z xs} {
+        finally destroy $xs
+        yield $z
+        foreach x $xs {
+            set z [{*}$f $z $x]
+            yield $z
+        }
+    }
+
+    # from ?list|dict? xs
+    # Converts a list or dictionary into a generator: over elements or key/value
+    # pairs.
+    namespace eval from {
+        namespace export list dict string
+        namespace ensemble create
+
+        generator define list xs {
+            foreach x $xs { generator yield $x }
+        }
+
+        generator define dict d {
+            ::dict for {k v} $d { generator yield $k $v }
+        }
+
+        generator define string s {
+            foreach c [split $s ""] { generator yield $c }
+        }
+    }
+
+    # to ?list|dict? g
+    # Converts a generator into a list or dictionary by extracting all elements.
+    # Dictionaries are created by assuming the generator returns a pair of
+    # values per element, and using these as the key and value.
+    namespace eval to {
+        namespace export list dict string
+        namespace ensemble create
+
+        proc list g {
+            set xs [::list]
+            generator foreach x $g { lappend xs $x }
+            return $xs
+        }
+
+        proc dict g {
+            set d [dict create]
+            generator foreach {k v} $g { dict set d $k $v }
+            return $d
+        }
+
+        proc string g {
+            set s ""
+            generator foreach c $g { append s $c }
+            return $s
+        }
+    }
+    # The conversion functions should follow these identity laws:
+    # [to list [from list $xs]] == $xs
+    # [to dict [from dict $xs]] == $xs
+
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/generator/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/generator/pkgIndex.tcl
new file mode 100644
index 00000000..9c2633b2
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/generator/pkgIndex.tcl
@@ -0,0 +1,3 @@
+# Requires Tcl 8.6 and higher, to have the coroutines underlying generators.
+if {![package vsatisfies [package provide Tcl] 8.6]} return
+package ifneeded generator 0.2 [list source [file join $dir generator.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/gpx/gpx.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/gpx/gpx.tcl
new file mode 100644
index 00000000..739ab967
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/gpx/gpx.tcl
@@ -0,0 +1,294 @@
+##+##########################################################################
+#
+# gpx.tcl -- Parse gpx files
+# by Keith Vetter, July 7, 2010
+#
+# gpx definition:
+#   http://www.topografix.com/gpx.asp
+#   http://www.topografix.com/GPX/1/1/
+#   GPX 1.0 => http://www.topografix.com/gpx_manual.asp
+#
+# code reference:
+#   http://wiki.tcl.tk/26635
+
+# API
+#  set token [::gpx::Create gpxFilename]
+#  ::gpx::Cleanup $token
+#  ::gpx::GetGPXMetadata $token               => dict of metadata
+#  ::gpx::GetWaypointCount $token             => number of waypoints
+#  ::gpx::GetAllWaypoints $token              => list of waypoint items
+#  ::gpx::GetTrackCount $token                => number of tracks
+#  ::gpx::GetTrackMetadata $token $whichTrack => dict of metadata for this track
+#  ::gpx::GetTrackPoints $token $whichTrack   => list of trkpts for this track
+#  ::gpx::GetRouteCount $token                => number of routes
+#  ::gpx::GetRouteMetadata $token $whichRoute => dict of metadata for this route
+#  ::gpx::GetRoutePoints $token $whichRoute   => list of rtepts for this route
+#
+# o metadata is a dictionary whose keys depends on the which optional elements
+#   are present and whose structure depends on the element's schema
+#
+# o a waypoint/trackpoint is a 3 element list consisting of latitude,
+#   longitude and a dictionary of metadata:
+#   e.g. 41.61716028 -70.61758477 {ele 35.706 time 2010-06-17T16:02:28Z}
+#
+
+package require Tcl 8.5
+package require tdom
+
+namespace eval gpx {
+    variable nameSpaces {
+        gpx "http://www.topografix.com/GPX/1/1"
+        xsi "http://www.w3.org/2001/XMLSchema-instance"
+    }
+    # gpx 1.0 was obsoleted August 9, 2004, but we handle it anyway
+    variable nameSpaces10 {
+        gpx "http://www.topografix.com/GPX/1/0"
+        topografix "http://www.topografix.com/GPX/Private/TopoGrafix/0/2"
+    }
+    variable gpx
+    set gpx(id) 0
+
+    # Cleanup any existing doms if we reload this module
+    ::apply {{} {
+        foreach arr [array names ::gpx::gpx dom,*] {
+            catch {$::gpx::gpx($arr) delete}
+            unset ::gpx::gpx($arr)
+        }
+    }}
+}
+
+##+##########################################################################
+#
+# ::gpx::Create -- Creates a tdom object, returns opaque token to it
+#  parameters: gpxFilename
+#  returns: token for this tdom object
+#
+proc ::gpx::Create {gpxFilename {rawXML {}}} {
+    variable nameSpaces
+    variable gpx
+
+    if {$rawXML eq ""} {
+        set fin [open $gpxFilename r]
+        set rawXML [read $fin] ; list
+        close $fin
+    }
+
+    set token "gpx[incr gpx(id)]"
+    dom parse $rawXML gpx(dom,$token)
+
+    # Check version 1.0, 1.1 or fail
+    set version [[$gpx(dom,$token) documentElement] getAttribute version 0.0]
+    if {[package vcompare $version 1.1] >= 0} {
+        $gpx(dom,$token) selectNodesNamespaces $::gpx::nameSpaces
+    } elseif {[package vcompare $version 1.0] == 0} {
+        $gpx(dom,$token) selectNodesNamespaces $::gpx::nameSpaces10
+    } else {
+        $gpx(dom,$token) delete
+        error "$gpxFilename is version $version, need 1.0 or better"
+    }
+    set gpx(version,$token) $version
+    return $token
+}
+##+##########################################################################
+#
+# ::gpx::Cleanup -- Cleans up an instance of a tdom object
+#   parameter: token returned by ::gpx::Create
+#
+proc ::gpx::Cleanup {token} {
+    variable gpx
+    $gpx(dom,$token) delete
+    unset gpx(dom,$token)
+}
+
+
+##+##########################################################################
+#
+# ::gpx::GetGPXMetadata -- Return metadata dictionary for entire document
+#   parameter: token returned by ::gpx::Create
+#   returns: metadata dictionary for entire document
+#
+proc ::gpx::GetGPXMetadata {token} {
+    set gpxNode [$::gpx::gpx(dom,$token) documentElement]
+    set version $::gpx::gpx(version,$token)
+    set creator [$gpxNode getAttribute creator ?]
+    set attr [dict create version $version creator $creator]
+
+    if {[package vcompare $version 1.0] == 0} {
+        set result [::gpx::_ExtractNodeMetadata $token $gpxNode]
+    } else {
+        set meta [$::gpx::gpx(dom,$token) selectNodes /gpx:gpx/gpx:metadata]
+        set result [::gpx::_ExtractNodeMetadata $token $meta]
+    }
+    set result [dict merge $attr $result]
+    return $result
+}
+
+##+##########################################################################
+#
+# ::gpx::GetWaypointCount -- Return number of waypoints defined in gpx file
+#   parameter: token returned by ::gpx::Create
+#   returns: number of waypoints
+#
+proc ::gpx::GetWaypointCount {token} {
+    set wpts [$::gpx::gpx(dom,$token) selectNodes /gpx:gpx/gpx:wpt]
+    return [llength $wpts]
+}
+##+##########################################################################
+#
+# ::gpx::GetAllWaypoints -- Returns list of waypoints, each item consists
+# of {lat lon <dictionary of metadata>}
+#   parameter: token returned by ::gpx::Create
+#   returns: list of waypoint items
+#
+proc ::gpx::GetAllWaypoints {token} {
+    set wpts [$::gpx::gpx(dom,$token) selectNodes /gpx:gpx/gpx:wpt]
+
+    set result {}
+    foreach wpt $wpts {
+        set lat [$wpt getAttribute "lat" ?]
+        set lon [$wpt getAttribute "lon" ?]
+        set meta [::gpx::_ExtractNodeMetadata $token $wpt]
+        lappend result [list $lat $lon $meta]
+    }
+    return $result
+}
+##+##########################################################################
+#
+# ::gpx::GetTrackCount -- returns how many tracks
+#   parameter: token returned by ::gpx::Create
+#   returns: number of tracks
+#
+proc ::gpx::GetTrackCount {token} {
+    set trks [$::gpx::gpx(dom,$token) selectNodes /gpx:gpx/gpx:trk]
+    return [llength $trks]
+}
+##+##########################################################################
+#
+# ::gpx::GetTrackMetadata -- Returns metadata dictionary for this track
+#   parameter: token returned by ::gpx::Create
+#              whichTrack: which track to get (1 based)
+#   returns: metadata dictionary for this track
+#
+proc ::gpx::GetTrackMetadata {token whichTrack} {
+    set trkNode [$::gpx::gpx(dom,$token) selectNodes \
+                     /gpx:gpx/gpx:trk\[$whichTrack\]]
+
+    set meta [::gpx::_ExtractNodeMetadata $token $trkNode]
+}
+##+##########################################################################
+#
+# ::gpx::GetTrackPoints -- Returns track consisting of a list of track points,
+# each of which consists of {lat lon <dictionary of metadata>}
+#   parameter: token returned by ::gpx::Create
+#              whichTrack: which track to get (1 based)
+#   returns: list of trackpoints for given track
+#
+proc ::gpx::GetTrackPoints {token whichTrack} {
+    set trkpts [$::gpx::gpx(dom,$token) selectNodes \
+                    /gpx:gpx/gpx:trk\[$whichTrack\]//gpx:trkpt]
+    set result {}
+    foreach trkpt $trkpts {
+        set lat [$trkpt getAttribute "lat" ?]
+        set lon [$trkpt getAttribute "lon" ?]
+        set meta [::gpx::_ExtractNodeMetadata $token $trkpt]
+        lappend result [list $lat $lon $meta]
+    }
+    return $result
+}
+##+##########################################################################
+#
+# ::gpx::GetRouteCount -- returns how many routes
+#   parameter: token returned by ::gpx::Create
+#   returns: number of routes
+#
+proc ::gpx::GetRouteCount {token} {
+    set rtes [$::gpx::gpx(dom,$token) selectNodes /gpx:gpx/gpx:rte]
+    return [llength $rtes]
+}
+##+##########################################################################
+#
+# ::gpx::GetRouteMetadata -- Returns metadata dictionary for this route
+#   parameter: token returned by ::gpx::Create
+#              whichRoute: which route to get (1 based)
+#   returns: metadata dictionary for this route
+#
+proc ::gpx::GetRouteMetadata {token whichRoute} {
+    set rteNode [$::gpx::gpx(dom,$token) selectNodes \
+                     /gpx:gpx/gpx:rte\[$whichRoute\]]
+
+    set meta [::gpx::_ExtractNodeMetadata $token $rteNode]
+}
+##+##########################################################################
+#
+# ::gpx::GetRoutePoints -- Returns route consisting of a list of route points,
+# each of which consists of {lat lon <dictionary of metadata>}
+#   parameter: token returned by ::gpx::Create
+#              whichRoute: which route to get (1 based)
+#   returns: list of routepoints for given route
+#
+proc ::gpx::GetRoutePoints {token whichRoute} {
+    set rtepts [$::gpx::gpx(dom,$token) selectNodes \
+                    /gpx:gpx/gpx:rte\[$whichRoute\]//gpx:rtept]
+    set result {}
+    foreach rtept $rtepts {
+        set lat [$rtept getAttribute "lat" ?]
+        set lon [$rtept getAttribute "lon" ?]
+        set meta [::gpx::_ExtractNodeMetadata $token $rtept]
+        lappend result [list $lat $lon $meta]
+    }
+    return $result
+}
+##+##########################################################################
+#
+# ::gpx::_ExtractNodeMetadata -- Internal routine to get all
+# the optional data associated with an xml element. For most
+# elements we just want element name and text value but some
+# we want their attributes and some we want children metadata.
+#
+proc ::gpx::_ExtractNodeMetadata {token node} {
+    set result {}
+    if {$node eq ""} { return $result }
+
+    # author and email elements are different in version 1.0 and 1.1
+    set onlyAttributes [list "bounds" "email"]
+    set attributesAndElements [list "extension" "author" "link" "copyright"]
+    if {$::gpx::gpx(version,$token) == 1.0} {
+        set onlyAttributes [list "bounds"]
+        set attributesAndElements [list "extension" "link" "copyright"]
+    }
+
+    foreach child [$node childNodes] {
+        set nodeName [$child nodeName]
+
+        if {$nodeName in {"wpt" "trk" "trkseg" "trkpt" "rte" "rtept"}} continue
+        if {[string match "topografix:*" $nodeName]} continue
+
+        if {$nodeName in $onlyAttributes} {
+            set attr [::gpx::_GetAllAttributes $child]
+            lappend result $nodeName $attr
+        } elseif {$nodeName in $attributesAndElements} {
+            set attr [::gpx::_GetAllAttributes $child]
+            set meta [::gpx::_ExtractNodeMetadata $token $child]
+            set meta [concat $attr $meta]
+            lappend result $nodeName $meta
+        } else {
+            lappend result $nodeName [$child asText]
+        }
+    }
+    return $result
+}
+##+##########################################################################
+#
+# ::gpx::_GetAllAttributes -- Returns dictionary of attribute name and value
+#
+proc ::gpx::_GetAllAttributes {node} {
+    set result {}
+    foreach attr [$node attributes] {
+        lappend result $attr [$node getAttribute $attr]
+    }
+    return $result
+}
+################################################################
+
+package provide gpx 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/gpx/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/gpx/pkgIndex.tcl
new file mode 100644
index 00000000..39884dfb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/gpx/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded gpx 1 [list source [file join $dir gpx.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_aycock/aycock-build.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_aycock/aycock-build.tcl
new file mode 100644
index 00000000..f0eb2ae8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_aycock/aycock-build.tcl
@@ -0,0 +1,735 @@
+#----------------------------------------------------------------------
+#
+# aycock-build.tcl --
+#
+#	Procedures needed to compile an Aycock-Horspool-Earley parser.
+#
+# Copyright (c) 2006 by Kevin B. Kenny.  All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: aycock-build.tcl,v 1.2 2011/01/13 02:47:47 andreas_kupries Exp $
+#
+#----------------------------------------------------------------------
+
+package provide grammar::aycock 1.0
+package require Tcl 8.4
+
+# Bring in procedures that aid in debugging a parser; they will in turn
+# bring in procedures that implement the runtime system.
+
+package require grammar::aycock::debug 1.0
+
+namespace eval grammar::aycock {
+
+    # The 'aycock' namespace exports only the 'parser' command, which
+    # constructs a parser.
+
+    namespace export parser
+
+}
+
+# grammar::aycock::parser --
+#
+#	Creates an Aycock-Earley parser.
+#
+# Parameters:
+#	rules - A list that can be broken down into productions.  
+#	dump - The optional flag, '-verbose'. If supplied, the rules
+#	       and resulting LRE(0) automaton are dumped to the standard
+#	       output.
+#
+# Results:
+#	Returns the name of a parser, which is an ensemble
+#	supporting a number of subcommands for processing the
+#	language defined by $rules.
+#
+# Each production takes the form
+# 	symbol ::= rhs { action }
+# where symbol is a single word defining a nonterminal
+# symbol; rhs is the right-hand side (a sequence of nonterminal
+# or terminal symbols) and action is a single word giving
+# a script to execute when the production is reduced.  Within the
+# action, a variable $_ is defined, which is a list of the same
+# length as rhs giving the semantic values of each symbol on the
+# right-hand side.
+
+proc ::grammar::aycock::parser {rules {dump {}}} {
+    set name [MakeParser]
+    ProcessRules $name $rules
+    ComputeNullable $name
+    RewriteGrammar $name
+    MakeState0 $name
+    MakeState $name 0 \u22a2
+    CompleteAutomaton $name
+    unset ${name}::Cores
+    if {$dump eq {-verbose}} {
+	puts "parser: $name"
+	puts "Rules:"
+	DumpRuleSet $name stdout
+	puts "------------------------------------------------------------"
+	DumpAutomaton $name stdout
+    }
+    set l [NeverReduced $name]
+    if {[llength $l] != 0} {
+	return -code error "Rules never reduced: $l"
+    }
+    unset ${name}::Items
+    return $name
+}
+
+# grammar::aycock::MakeParser --
+#
+#	Constructs the ensemble that will contain an Aycock parser.
+#
+# Results:
+#	Returns the name of the parser, which is an ensemble within
+#	the "aycock" namespace.
+#
+# The following commands are members of the ensemble:
+#	parse -- Parses a sequence of symbols and returns its lexical
+#		 value.
+#	destroy -- Destroys the parser.
+#	terminals -- Lists the terminal symbols accepted by the parser
+#	nonterminals -- Lists the nonterminal symbols reduced by the parser
+#	save -- Returns a command to recreate the parser without needing
+#		to analyze the rule set.
+
+proc ::grammar::aycock::MakeParser {} {
+    variable parserCount
+    set name [namespace current]::parser[incr parserCount]
+    namespace eval $name {
+	namespace export parse terminals nonterminals save destroy
+    }
+    proc ${name}::parse {symList vallist {clientData {}}} \
+	[string map [list \
+			 PROC [namespace current]::Parse \
+			 PARSER $name] {
+			     PROC PARSER $symList $vallist $clientData
+			 }]
+    proc ${name}::terminals {} \
+	[list [namespace current]::Terminals $name]
+    proc ${name}::nonterminals {} \
+	[list [namespace current]::Nonterminals $name]
+    proc ${name}::save {} \
+	[list [namespace current]::Save $name]
+    proc ${name}::destroy {} \
+	[list namespace delete $name]
+    namespace eval $name {
+	namespace ensemble create
+    }
+    return $name
+}
+
+# grammar::aycock::ProcessRules --
+#
+#	Processes the rule set presented to grammar::aycock::parser
+#
+# Parameters:
+#	parser -- Name of the parser
+#	rules -- Rule set
+#
+# Results:
+#	None.
+#
+# Side effects:
+#	RuleSet is set to be a dictionary indexed by nonterminal symbol
+#	name, whose values are alternating right-hand sides and names
+#	of action procedures.  A set of Action procedures is constructed
+#	for the reduction actions.
+
+proc ::grammar::aycock::ProcessRules {parser rules} {
+    namespace upvar $parser \
+	RuleSet RuleSet \
+	ActionProcs ActionProcs \
+	APCount APCount
+
+    # Locate the "::=" symbols within the rules.
+
+    set RuleSet [dict create]
+    set ActionProcs [dict create]
+    set APCount 0
+    set positions {}
+    set i 0
+    foreach sym $rules {
+	if {$sym eq {::=}} {
+	    lappend positions [expr {$i-1}]
+	}
+	incr i
+    }
+    lappend positions [llength $rules]
+
+    # For each rule, place the right-hand side and action into
+    # the appropriate RuleSet entry.
+
+    set lastp [lindex $positions 0]
+    set top [lindex $rules $lastp]
+    foreach p [lrange $positions 1 end] {
+	set lhs [lindex $rules $lastp]
+	set rhs [lrange $rules [expr {$lastp + 2}] [expr {$p - 2}]]
+	set action [MakeAction $parser [lindex $rules [expr {$p - 1}]]]
+	set lastp $p
+	dict lappend RuleSet $lhs $rhs
+	dict lappend RuleSet $lhs $action
+    }
+
+    # Make a special "start" rule (whose name is the empty string)
+    # whose right-hand side is "right tack" followed by the name of
+    # the initial rule.
+
+    dict lappend RuleSet {} [list \u22a2 $top]
+    dict lappend RuleSet {} [MakeAction $parser {lindex $_ 1}]
+
+    # Clean up memory.
+
+    unset ${parser}::ActionProcs
+    unset ${parser}::APCount
+    return
+}
+
+# grammar::aycock::MakeAction --
+#
+#	Defines an action procedure for the parser to use at run time.
+#
+# Parameters:
+#	parser -- Name of the parser
+#	body -- Body of the action procedure, which is expected to
+#		return the semantic value of some nonterminal after reduction.
+#
+# Results:
+#	Returns the name of the action procedure.
+#
+# Side effects:
+#	Creates the action procedure, which will accept a single parameter,
+#	"_", containing the semantic values of the symbols on the right-hand
+#	side.
+
+proc ::grammar::aycock::MakeAction {parser {body {lindex $_ 0}}} {
+    namespace upvar $parser \
+	ActionProcs ActionProcs \
+	APCount APCount
+    if {$body eq {}} {
+	set body {lindex $_ 0}
+    }
+    if {![dict exists $ActionProcs $body]} {
+	set pname Action\#[incr APCount]
+	dict set ActionProcs $body $pname
+	namespace eval $parser [list proc $pname {_ clientData} $body]
+    }
+    return [dict get $ActionProcs $body]
+}
+
+# grammar::aycock::ComputeNullable --
+#
+#	Determines which rules in the parser's rule set are nullable, that
+#	is, can match the empty sequence of input symbols.
+#
+# Parameters:
+#	parser -- Name of the parser.
+#
+# Results:
+#	None.
+#
+# Side effects:
+#	Sets 'Nullable' to a dictionary whose keys are nonterminal symbol
+#	names and whose values are 1 if the symbol is nullable and 0 otherwise.
+
+proc ::grammar::aycock::ComputeNullable {parser} {
+    namespace upvar $parser \
+	RuleSet RuleSet \
+	Nullable Nullable
+    set Nullable [dict create]
+    set tbd {}
+    dict for {lhs rules} $RuleSet {
+	dict set Nullable $lhs 0
+	foreach {rhs action} $rules {
+	    if {[llength $rhs] == 0} {
+		dict set Nullable $lhs 1
+	    } else {
+		set ntonly 1
+		foreach sym $rhs {
+		    if {![dict exists $RuleSet $sym]} {
+			set ntonly 0
+			break
+		    }
+		}
+		if {$ntonly} {
+		    lappend tbd $lhs $rhs
+		}
+	    }
+	}
+    }
+    set changed 1
+    while {$changed} {
+	set changed 0
+	foreach {lhs rhs} $tbd {
+	    if {![dict get $Nullable $lhs]} {
+		set nullable 1
+		foreach sym $rhs {
+		    if {![dict get $Nullable $sym]} {
+			set nullable 0
+			break
+		    }
+		}
+		if {$nullable} {
+		    dict set Nullable $lhs 1
+		    set changed 1
+		}
+	    }
+	}
+    }
+    return
+}
+
+# grammar::aycock::RewriteGrammar --
+#
+#	Rewrite $parser's grammar into Nihilistic Normal Form {NNF}
+#
+# Parameters:
+#	parser -- Parser to rewrite.
+#
+# Results:
+#	None.
+#
+# Side effects:
+#	Rewrites the rule set to separate nullable rules from other
+#	rules.  The nullable rules are distinguished by having
+#	"{\u00d8}" appended to their names.
+
+proc ::grammar::aycock::RewriteGrammar {parser} {
+    namespace upvar $parser \
+	RuleSet RuleSet \
+	Nullable Nullable
+    set newRuleSet [dict create]
+
+    # Create a work list wth all rules not yet examined
+
+    set worklist {}
+    dict for {lhs rules} $RuleSet {
+	foreach {rhs action} $rules {
+	    lappend worklist $lhs $rhs 0 1 $action
+	}
+    }
+
+    # Process the rules in sequence from the worklist. For each rule,
+    # determine whether it contains a sequence of nullable symbols
+    # on the right-hand side.  If it does, split it on the last nullable
+    # symbol. Continue until all possible splits have been done.
+
+    for {set k 0} {$k < [llength $worklist]} {incr k 5} {
+	foreach {lhs rhs position candidateFlag action} \
+	    [lrange $worklist $k [expr {$k+4}]] break
+	set n [llength $rhs]
+	while {$position < $n} {
+	    set sym [lindex $rhs $position]
+	    if {![dict exists $Nullable $sym]
+		|| ![dict get $Nullable $sym]} {
+		set candidateFlag 0
+	    } else {
+		set newrhs $rhs
+		lset newrhs $position ${sym}\{\u00d8\}
+		lappend worklist $lhs $newrhs [expr {$position+1}] \
+		    $candidateFlag $action
+		set candidateFlag 0
+	    }
+	    incr position
+	}
+	if {$position >= $n} {
+	    if {$candidateFlag} {
+		set lhs ${lhs}\{\u00d8\}
+	    }
+	    dict lappend newRuleSet $lhs $rhs
+	    dict lappend newRuleSet $lhs $action
+	}
+    }
+    set RuleSet $newRuleSet
+    unset Nullable
+    return
+}
+
+# grammar::aycock::DumpRuleSet --
+#
+#	Displays the set of rules in a parser.
+#
+# Parameters:
+#	parser - Name of the parser
+#	chan - Channel on which to display the rules
+#
+# Results:
+#	None.
+#
+# Side effects:
+#	Displays the rule set on the given channel.
+
+proc ::grammar::aycock::DumpRuleSet {parser chan} {
+    namespace upvar $parser RuleSet RuleSet
+    dict for {lhs rules} $RuleSet {
+	dict for {rhs action} $rules {
+	    puts $chan "$lhs ::= $rhs [list [info body ${parser}::${action}]]"
+	}
+    }
+    return
+}
+
+# grammar::aycock::MakeState0 --
+#
+#	Makes the first state of a parser's automaton.
+#
+# Parameters:
+#	parser -- Parser under construction.
+#
+# Results:
+#	None.
+#
+# Side effects:
+#	Builds a state corresponding to the reduction of the start
+#	symbol.  Creates "Completions", "Items", "Cores", and "Edges";
+#	Completions will be a list of lists of right-hand-sides
+#	completed in each state.
+#	Items will be a list of LRE(0) items belonging to
+#	the states. Each item is represented as three elements:
+#	the nonterminal symbol, the rule number in that nonterminal's
+#	rule list, and the position of the dot within the right-hand side.
+#	Edges will be a two-level dictionary - the outer key is state
+#	number and the inner key is a symbol - giving the 'goto' symbol
+#	for a given state and symbol.
+#	Cores is a work dictionary used to avoid state duplication.
+
+proc ::grammar::aycock::MakeState0 {parser} {
+    namespace upvar $parser \
+	RuleSet RuleSet \
+	Completions Completions \
+	Items Items \
+	Cores Cores \
+	Edges Edges
+    set items {}
+    set i 0
+    foreach {rhs action} [dict get $RuleSet {}] {
+	lappend items {} $i 0
+	incr i 2
+    }
+    set Completions [list {}]
+    set Items [list $items]
+    set Cores [dict create]
+    set Edges [dict create]
+    return
+}
+
+# grammar::aycock::MakeState --
+#
+#	Constructs a state of the parsing automaton.
+#
+# Parameters:
+#	parser -- Parser under construction
+#	stateIdx - Ordinal number of a state being examined.
+#	sym - Symbol whose goto is being computed
+#
+# Results:
+#	Returns goto(state,sym)
+#
+# Side effects:
+#	Constructs a new state if necessary, updating Completions, Items
+#	Cores and Edges to reflect it.
+
+proc ::grammar::aycock::MakeState {parser stateIdx sym} {
+    namespace upvar $parser \
+	RuleSet RuleSet \
+	Completions Completions \
+	Items Items \
+	Cores Cores \
+	Edges Edges
+
+    if {$sym == {}} {
+	error "Null symbol in MakeState"
+    }
+
+    set complete [lindex $Completions $stateIdx]
+
+    # Compute the epsilon-kernel items for the given transition.
+
+    set Kitems {}
+    set items [lindex $Items $stateIdx]
+    foreach {lhs prodIndex pos} $items {
+	set rhs [lindex [dict get $RuleSet $lhs] $prodIndex]
+	if {[lindex $rhs $pos] == $sym} {
+	    set nextPos [SkipOver $rhs [expr {$pos+1}]]
+	    lappend Kitems [list $lhs $prodIndex $nextPos]
+	}
+    }
+
+    # Determine whether we've already built the state.
+
+    set core {}
+    foreach tuple \
+	[lsort -index 0 \
+	     [lsort -integer -index 1 \
+		  [lsort -integer -index 2 $Kitems]]] {
+		      foreach {lhs prodIndex pos} $tuple break
+		      lappend core $lhs $prodIndex $pos
+		  }
+
+    if {[dict exists $Cores $core]} {
+	return [dict get $Cores $core]
+    }
+
+    # We haven't built it yet - so we need to build it now.  Let k and
+    # nk be the state numbers for the epsilon-kernel and epsilon-non-kernel
+    # states.
+
+    set k [llength $Items]
+    set nk [expr {$k + 1}]
+
+    set Kitems $core
+    set NKitems {}
+
+    set Kedges [dict create]
+    set predicted [dict create]
+    set Kcomplete {}
+
+    # enumerate all the LRE(0) items in the epsilon-kernel set
+
+    foreach {lhs rhsIndex pos} $Kitems {
+	set rhs [lindex [dict get $RuleSet $lhs] $rhsIndex]
+	if {$pos == [llength $rhs]} {
+	    # reduction
+	    lappend Kcomplete $lhs $rhsIndex $pos
+	    continue
+	} elseif {![dict exists $RuleSet [set nextSym [lindex $rhs $pos]]]} {
+	    # transition on a terminal symbol
+	    if {![dict exists $Kedges $nextSym] } {
+		dict set Kedges $nextSym {}
+	    }
+	} else {
+	    # GOTO on a nonterminal
+	    dict set Kedges $nextSym {}
+	    if {![dict exists $predicted $nextSym]} {
+		dict set predicted $nextSym 1
+		set prhsIndex 0
+		foreach {prhs paction} [dict get $RuleSet $nextSym] {
+		    set ppos [SkipOver $prhs]
+		    lappend NKitems $nextSym $prhsIndex $ppos
+		    incr prhsIndex 2
+		}
+	    }
+	}
+    }
+
+    # build the state for the epsilon-kernel
+
+    lappend Completions $Kcomplete
+    lappend Items $Kitems
+    dict set Edges $stateIdx $sym $k
+    dict set Edges $k $Kedges
+
+    if {[llength $NKitems] == 0} {
+	return $k
+    }
+
+    # now start with the non-kernel set.  We need to build it before
+    # we can figure out whether we've built it already
+
+    set NKcomplete {}
+
+    # enumerate all the LRE(0) items in the non-kernel set
+
+    set NKedges [dict create]
+    set w 0
+    while {$w < [llength $NKitems] } {
+	foreach {lhs rhsIndex pos} [lrange $NKitems $w [expr {$w+2}]] break
+	incr w 3
+	set rhs [lindex [dict get $RuleSet $lhs] $rhsIndex]
+	if {$pos == [llength $rhs]} {
+	    # reduction
+	    lappend NKComplete [list $lhs $rhsIndex $pos]
+	    continue
+	}
+	set nextSym [lindex $rhs $pos]
+	if {![dict exists $RuleSet $nextSym]} {
+	    # transition on a terminal symbol
+	    if {![dict exists $NKedges $nextSym]} {
+		dict set NKedges $nextSym {}
+	    }
+	} else {
+	    # GOTO on a nonterminal
+	    dict set NKedges $nextSym {}
+	    if {![dict exists $predicted $nextSym]} {
+		dict set predicted $nextSym 1
+		set prhsIndex 0
+		dict for {prhs paction} [dict get $RuleSet $nextSym] {
+		    set ppos [SkipOver $prhs]
+		    lappend NKitems $nextSym $prhsIndex $ppos
+		    incr prhsIndex 2
+		}
+	    }
+	}
+    }
+
+    # Now we might be able to add NKedges, and NK, or maybe we don't need to.
+
+    set core [lsort [dict keys $predicted]]
+    if {[dict exists $Cores $core]} {
+	dict set Edges $k {} [dict get $Cores $core]
+    } else {
+	dict set Cores $core $nk
+	dict set Edges $k {} $nk
+	lappend Completions $NKcomplete
+	lappend Items $NKitems
+	dict set Edges $nk $NKedges
+    }
+
+    # Return the new kernel state's number.
+
+    return $k
+    
+}
+
+# grammar::aycock::SkipOver --
+#
+#	Service procedure that skips over nullable symbols beginning at
+#	a given position on a right-hand side.
+#
+# Parameters:
+#	rhs - Right-hand side being analyzed
+#	pos - Starting position within the rhs
+#
+# Results:
+#	Returns the index of the first non-nullable symbol after $pos,
+#	which will be the fictitious symbol beyond the end of the right-hand
+#	side if no non-nullable symbols remain.
+
+proc ::grammar::aycock::SkipOver {rhs {pos 0}} {
+    set n [llength $rhs]
+    while {$pos < $n} {
+	if {[string range [lindex $rhs $pos] end-2 end] ne "\{\u00d8\}"} {
+	    break
+	}
+	incr pos
+    }
+    return $pos
+}
+
+# grammar::aycock::CopmpleteAutomaton --
+#
+#	Completes building the parser automaton once the first state
+#	has been constructed.
+#
+# Parameters:
+#	parser -- Name of the parser.
+#
+# Results:
+#	None.
+#
+# Works by a brute-force approach: for each state, for each symbol
+# that the state can transition on, add goto(state,symbol) to the
+# state set; iterate until convergence.
+
+proc ::grammar::aycock::CompleteAutomaton {parser} {
+    namespace upvar $parser \
+	RuleSet RuleSet \
+	Items Items \
+	Edges Edges
+    
+    set changes 1
+    while {$changes} {
+	set changes 0
+	set worklist {}
+	dict for {state d} [dict get $Edges] {
+	    dict for {sym v} $d {
+		if {$v eq {}} {
+ 		    if {$state < [llength $Items]} {
+ 			lappend worklist \
+ 			    [list $state [dict exists $RuleSet $sym] $sym]
+ 			set changes 1
+ 		    }
+		}
+	    }
+	}
+	foreach tuple \
+	    [lsort -integer -index 0 \
+		 [lsort -integer -index 1 \
+		      [lsort -dictionary -index 2 $worklist]]] {
+		foreach {state - sym} $tuple break
+		::grammar::aycock::GoTo $parser $state $sym
+	    }
+    }
+}
+
+# grammar::aycock::GoTo --
+#
+#	Computes goto(state,symbol) in a parser.
+#
+# Parameters:
+#	parser -- Name of the parser
+#	state -- Index of the state
+#	sym -- Symbol whose goto is being computed.
+#
+# Results:
+#	Returns the goto entry.
+#
+# Side effects:
+#	Constructs a new state if needed.
+
+proc ::grammar::aycock::GoTo {parser state sym} {
+    namespace upvar $parser Edges Edges
+    if {![dict exists $Edges $state] || ![dict exists $Edges $state $sym]} {
+	return {}
+    } else {
+	set rv [dict get $Edges $state $sym]
+	if {$rv eq {}} {
+	    set rv [MakeState $parser $state $sym]
+	    dict set Edges $state $sym $rv
+	}
+    }
+    return $rv
+}
+
+# grammar::aycock::DumpAutomaton --
+#
+#	Displays the parsing automaton of an Aycock-Earley parser on a
+#	channel.
+#
+# Parameters:
+#	parser - Parser to display
+#	chan - Channel to use
+#
+# Results:
+#	None.
+#
+# Side effects:
+#	Dumps the grammar (in NNF) and the states of the parsing
+#	automaton.  For each state, indicates the LRE(0) items in that
+#	state, the completion list for the state, and the GOTO function
+#	for the state.
+    
+proc ::grammar::aycock::DumpAutomaton {parser chan} {
+    namespace upvar $parser \
+	Completions Completions \
+	Items Items \
+	Edges Edges
+    for {set ns 0} {$ns < [llength $Completions]} {incr ns} {
+	set completions [lindex $Completions $ns]
+	puts $chan "state $ns:"
+	if {[info exists Items]} {
+	    set items [lindex $Items $ns]
+	    DumpItemSet $parser $items $chan
+	    puts $chan "  ------------------------------"
+	}
+	puts $chan "  completions:"
+	DumpItemSet $parser $completions $chan
+	puts $chan "  ------------------------------"
+	puts $chan "  goto:"
+	set worklist {}
+	dict for {sym nexts} [dict get $Edges $ns] {
+	    if {$sym eq {}} {
+		set sym \u03b5
+	    }
+	    lappend worklist [list $sym $nexts]
+	}
+	foreach pair [lsort -integer -index 1 $worklist] {
+	    foreach {sym nexts} $pair break
+	    puts $chan [format "    %-22s%4d" $sym $nexts]
+	}
+	puts $chan "------------------------------------"
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_aycock/aycock-debug.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_aycock/aycock-debug.tcl
new file mode 100644
index 00000000..883d6394
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_aycock/aycock-debug.tcl
@@ -0,0 +1,189 @@
+#----------------------------------------------------------------------
+#
+# aycock-debug.tcl --
+#
+#	Procedures needed to debug an Aycock-Horspool-Earley parser.
+#
+# Copyright (c) 2006 by Kevin B. Kenny.  All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: aycock-debug.tcl,v 1.2 2011/01/13 02:47:47 andreas_kupries Exp $
+#
+#----------------------------------------------------------------------
+
+package provide grammar::aycock::debug 1.0
+package require Tcl 8.4
+
+# Bring in the runtime library
+
+package require grammar::aycock::runtime 1.0
+
+# grammar::aycock::Terminals --
+#
+#	List the terminal symbols used in a parser's grammar
+#
+# Usage:
+#	$parser terminals
+#
+# Results:
+#	Returns a list of the terminal symbols
+
+proc ::grammar::aycock::Terminals {parser} {
+    namespace upvar $parser RuleSet RuleSet
+    set t [dict create]
+    dict for {lhs rules} $RuleSet {
+	dict for {rhs action} $rules {
+	    foreach sym $rhs {
+		if {$sym ne "\u22a2"} {
+		    if {![dict exists $RuleSet $sym]} {
+			dict set t $sym {}
+		    }
+		}
+	    }
+	}
+    }
+    return [lsort -dictionary [dict keys $t]]
+}
+
+# grammar::aycock::Nonterminals --
+#
+#	List the nonterminal symbols used in a parser's grammar
+#
+# Usage:
+#	$parser nonterminals
+#
+# Results:
+#	Returns a list of the nonterminal symbols
+
+proc ::grammar::aycock::Nonterminals {parser} {
+    namespace upvar $parser RuleSet RuleSet
+    set t [dict create]
+    dict for {lhs rules} $RuleSet {
+	dict for {rhs action} $rules {
+	    foreach sym $rhs {
+		if {$sym ne "\u22a2"} {
+		    if {[dict exists $RuleSet $sym]} {
+			dict set t $sym {}
+		    }
+		}
+	    }
+	}
+    }
+    return [lsort -dictionary [dict keys $t]]
+}
+
+# grammar::aycock::NeverReduced --
+#
+#	Checks a parser's grammar for rules that cannot be reduced.
+#
+# Parameters:
+#	parser -- Name of the parser
+#
+# Results:
+#	Return a list of the left-hand sides of rules never reduced.
+
+proc ::grammar::aycock::NeverReduced {parser} {
+    namespace upvar $parser RuleSet RuleSet
+    set t [dict create]
+    foreach {lhs rules} $RuleSet {
+	dict set t $lhs {}
+    }
+    foreach s [Nonterminals $parser] {
+	dict unset t $s
+    }
+    dict unset t {}
+    return [lsort [dict keys $t]]
+}
+
+# grammar::aycock::Save --
+#
+#	Produces a script that will load an Aycock-Earley parser without
+#	needing to do all the state analysis.
+#
+# Usage:
+#	$parser save
+#
+# Results:
+#	Returns a script that when evaluated will reload the parser.
+
+proc ::grammar::aycock::Save {parser} {
+    namespace upvar $parser \
+	RuleSet RuleSet \
+	Completions Completions \
+	Edges Edges
+    set actions [dict create]
+    set rex1 {}
+    dict for {lhs rules} $RuleSet {
+	set rex2 {}
+	foreach {rhs action} $rules {
+	    dict set actions $action {}
+	    append rex2 \n \t [list $rhs $action]
+	}
+	append rex2 \n "    "
+	append rex1 \n "    " [list $lhs $rex2]
+    }
+    append rex1 \n
+    set i 0
+    set sex1 {}
+    foreach {completions} $Completions {
+	set nc 0
+	append sex1 \n "    " [list $completions [dict get $Edges $i]]
+	incr i
+    }
+    append sex1 \n
+    set retval [list [namespace current]::Restore $rex1 $sex1]
+    foreach action [lsort -dictionary [dict keys $actions]] {
+	lappend retval $action \
+	    [string trimright [info body ${parser}::$action]]\n
+    }
+    return $retval
+}
+
+# grammar::aycock::DumpItemSet --
+#
+#	Displays a representation of an LRE(0) item set on a channel
+#
+# Parameters:
+#	parser - Name of the parser
+#	s - Item set to display
+#	chan - Channel to use
+#
+# Results:
+#	None
+#
+# Side effects:
+#	Writes the LRE(0) item set on the given channel
+
+proc ::grammar::aycock::DumpItemSet {parser s {chan stdout}} {
+    foreach {lhs prodIndex pos} $s {
+	DumpItem $parser $lhs $prodIndex $pos $chan
+    }
+    return
+}
+
+# grammar::aycock::DumpItem --
+#
+#	Displays a representation of an LRE(0) item on a channel
+#
+# Parameters:
+#	parser - Name of the parser
+#	lhs - Left-hand side of the reduction
+#	prodIndex - Ordinal position of the right-hand side among
+#		    all right-hand sides for that LHS
+#	pos - Position of the dot on the right-hand side
+#	chan - Channel to use
+#
+# Results:
+#	None
+#
+# Side effects:
+#	Writes the LRE(0) item on the given channel
+
+proc ::grammar::aycock::DumpItem {parser lhs prodIndex pos {chan stdout}} {
+    namespace upvar $parser RuleSet RuleSet
+    set rhs [lindex [dict get $RuleSet $lhs] $prodIndex]
+    puts $chan "        $lhs ::= [linsert $rhs $pos \u00b7]"
+    return
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_aycock/aycock-runtime.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_aycock/aycock-runtime.tcl
new file mode 100644
index 00000000..3a0081c2
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_aycock/aycock-runtime.tcl
@@ -0,0 +1,425 @@
+#----------------------------------------------------------------------
+#
+# aycock-runtime.tcl --
+#
+#	Procedures needed to execute an Aycock-Horspool-Earley parser.
+#
+# Copyright (c) 2006 by Kevin B. Kenny.  All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: aycock-runtime.tcl,v 1.2 2011/01/13 02:47:47 andreas_kupries Exp $
+#
+#----------------------------------------------------------------------
+
+package provide grammar::aycock::runtime 1.0
+package require Tcl 8.5
+
+# Define the directory containing this package's scripts
+
+namespace eval grammar {}
+namespace eval grammar::aycock {
+    variable parserCount 0
+}
+
+# grammar::aycock::Restore --
+#
+#	Restores a parser from saved state.
+#
+# Parameters;
+#	rules - Saved rule set
+#	automaton - Saved automaton
+#	args - Saved action procedures
+#
+# Results:
+#	Returns the constructed parser's name
+#
+# Side effects:
+#	Reconstructs the parser
+
+proc ::grammar::aycock::Restore {rules automaton args} {
+    set name [MakeParser]
+    variable ${name}::RuleSet
+    variable ${name}::Completions
+    variable ${name}::Edges
+    set RuleSet $rules
+    set Edges [dict create]
+    set Completions {}
+    set i 0
+    foreach {completions edges} $automaton {
+	lappend Completions $completions
+	dict set Edges $i $edges
+	incr i
+    }
+    foreach {actionName actionBody} $args {
+	namespace eval ${name} \
+	    [list proc $actionName {_ clientData} $actionBody]
+    }
+    return ${name}
+}
+
+# grammar::aycock::MakeParser --
+#
+#	Constructs the ensemble that will contain an Aycock parser.
+#
+# Results:
+#	Returns the name of the parser, which is an ensemble within
+#	the "aycock" namespace.
+#
+# The following commands are members of the ensemble:
+#	parse -- Parses a sequence of symbols and returns its lexical
+#		 value.
+#	destroy -- Destroys the parser.
+#	terminals -- Lists the terminal symbols accepted by the parser
+#	nonterminals -- Lists the nonterminal symbols reduced by the parser
+#	save -- Returns a command to recreate the parser without needing
+#		to analyze the rule set.
+
+proc ::grammar::aycock::MakeParser {} {
+    variable parserCount
+    set name [namespace current]::parser[incr parserCount]
+    namespace eval $name {
+	namespace export parse destroy
+	namespace export terminals nonterminals save
+    }
+    proc ${name}::parse {symList vallist {clientData {}}} \
+	[string map [list \
+			 PROC [namespace current]::Parse \
+			 PARSER $name] {
+			     PROC PARSER $symList $vallist $clientData
+			 }]
+    proc ${name}::terminals {} \
+	[list [namespace current]::Terminals $name]
+    proc ${name}::nonterminals {} \
+	[list [namespace current]::Nonterminals $name]
+    proc ${name}::save {} \
+	[list [namespace current]::Save $name]
+    proc ${name}::destroy {} \
+	[list namespace delete $name]
+    namespace eval $name {
+	namespace ensemble create
+    }
+    return $name
+}
+
+# grammar::aycock::MakeSet --
+#
+#	Run one step of an Earley parse.
+#
+# Parameters:
+#	parser -- Name of the parser
+#	setsVar -- Sets of parser states already constructed
+#	sym -- Input symbol
+#
+# Results:
+#	Returns the sets of parser states updated with the transition on the
+#	given input
+#
+# Each parser state is an ordered pair (automaton state, parent)
+# where parent is the position in the input string where the substring
+# matching the given state begins.  A state set is a dictionary whose
+# keys are parser states and whose values are "links" - a link consists of
+# the automaton state, parent, and state set of the predecessor,
+# the automaton state, parent and state set of the cause, and
+# the LRE(0) parser state of the symbol being reduced - see Aycock's
+# paper for the details on how these are interpreted.
+
+proc ::grammar::aycock::MakeSet {parser setsVar sym} {
+    upvar 1 $setsVar sets
+    namespace upvar $parser \
+	Completions Completions \
+	Edges Edges
+
+    # Find the state index and set up "current" and "next" state sets.
+
+    set ip1 [llength $sets]
+    set i [expr {$ip1 - 1}]
+    set curSet [lindex $sets end]
+    set newSet {}
+
+    # Work through the "current" set to determine "next state" transitions.
+
+    set j 0
+    set worklist $curSet
+    while {$j < [llength $worklist]} {
+	set item [lindex $worklist $j]
+	incr j 2
+	foreach {state parent} $item break
+
+	# Advance using the 'goto' on the current input symbol
+
+	if {$sym ne {} && [dict exists $Edges $state $sym]} {
+	    set k [dict get $Edges $state $sym]
+	    set createdItem [list $k $parent]
+	    set links [list $state $parent $i]
+	    dict set newSet $createdItem $links {}
+
+	    # Also add the epsilon-transition from that state
+
+	    if {[dict exists $Edges $k {}]} {
+		set nk [dict get $Edges $k {}]
+		set createdItem [list $nk [expr {$i+1}]]
+		dict set newSet $createdItem {} {}
+	    }
+	}
+
+	if {$parent != $i} {
+
+	    # Reduce any completions in the current state, adding
+	    # them to the worklist because their 'goto' items may
+	    # also be shifted.
+
+	    foreach {lhs rhs pos} [lindex $Completions $state] {
+		if {$lhs eq {}} continue
+		foreach pitem [lindex $sets $parent] {
+		    foreach {pstate pparent} $pitem break
+		    if {[dict exists $Edges $pstate $lhs]} {
+
+			# goto on the newly-reduced nonterminal
+
+			set k [dict get $Edges $pstate $lhs]
+			set createdItem [list $k $pparent]
+			set links [list $pstate $pparent $parent \
+				       $state $parent $i \
+				       $lhs $rhs $pos]
+			if {![dict exists $curSet $createdItem]} {
+			    lappend worklist $createdItem $links
+			}
+			dict set curSet $createdItem $links {}
+			if {[dict exists $Edges $k {}]} {
+
+			    # epsilon-transition from the nonterminal's goto
+
+			    set nk [dict get $Edges $k {}]
+			    set createdItem [list $nk $i]
+			    if {![dict exists $curSet $createdItem]} {
+				lappend worklist $createdItem {}
+			    }
+			    dict set curSet $createdItem {} {}
+			}
+		    }
+		}
+	    }
+	}
+    }
+    set sets [lreplace $sets[set sets {}] end end $curSet $newSet]
+}
+
+# grammar::aycock::Parse --
+#
+#	Runs an Aycock-Earley parser
+#
+# Usage:
+#	$parser parse symlist vallist
+#
+# Parameters:
+#	symlist - List of token names created by scanning an input
+#	vallist - List of semantic values corresponding to the
+#		  tokens in $symlist
+#	clientData - Client data to be passed to semantic action procedures
+#
+# Results:
+#	Returns whatever the semantic action in the top-level reduction
+#	of the parse returns.
+
+proc ::grammar::aycock::Parse {parser symlist vallist {clientData {}}} {
+    namespace upvar $parser \
+	RuleSet RuleSet \
+	Edges Edges
+    set sets [list [dict create [list 1 0] {} [list 2 0] {}]]
+    set i 0
+    foreach sym $symlist {
+	MakeSet $parser sets $sym
+	if {[llength [lindex $sets end]] == 0} {
+	    return -code error "syntax error before symbol $i ($sym: [lindex $vallist $i])"
+	}
+	incr i
+    }
+    MakeSet $parser sets {}
+
+    set startSym [lindex [dict get $RuleSet {}] 0 1]
+    #set finalState [dict get $Edges 2 $startSym]
+    set finalState [dict get $Edges 1 $startSym]
+    # TODO - check that the final state *is* final... it has to contain an
+    #	     acceptor somewhere.
+    return [Reconstruct $parser {} $finalState 0 $vallist $sets \
+		[expr {[llength $sets] - 2}] $clientData]
+
+}
+
+# grammar::aycock::Reconstruct --
+#
+#	Reconstructs the parse that leads to reducing a given nonterminal
+#	symbol, and determines the nonterminal's semantic value.
+#
+# Parameters:
+#	parser -- Aycock parser
+#	nt - Name of the nonterminal being reduced
+#	state - Parser state that contains the reduction
+#	parent - Position in the input list of the start of the reduction
+#	vallist - List of semantic values corresponding the the symbols
+#		  on the right hand side of the reduction
+#	sets - List of sets generated by grammar::aycock::MakeSet
+#	k - Position in the input list at the start of the reduction
+#	clientData - Client data for semantic actions
+#
+# Results:
+#	Returns the semantic value of the left-hand side of the reduction
+
+proc ::grammar::aycock::Reconstruct {parser nt state parent vallist sets k clientData} {
+    namespace upvar $parser \
+	RuleSet RuleSet \
+	Completions Completions \
+	Edges Edges
+    set choices {}
+    # Here it's possible that Completions contains completions for the
+    # wrong nonterminal?
+    set complete [lindex $Completions $state]
+    if {[llength $complete] != 3} {
+	set complete {}
+	foreach {lhs rhs pos} [lindex $Completions $state] {
+	    if {$lhs eq $nt} {
+		lappend complete $lhs $rhs $pos
+	    }
+	}
+    }
+    set compIdx [ChooseReduction $parser $complete]
+    foreach {lhs rhsIndex pos} \
+	[lrange $complete [expr {3*$compIdx}] [expr {3*$compIdx+2}]] break
+    foreach {rhs action} [lrange [dict get $RuleSet $lhs] $rhsIndex [expr {$rhsIndex+1}]] break
+    set cmd [list ${parser}::$action]
+    set args {}
+    foreach sym $rhs {
+	lappend args {}
+    }
+    for {set i [expr {[llength $rhs]-1}]} {$i >= 0} {incr i -1} {
+	set sym [lindex $rhs $i]
+	if {![dict exists $RuleSet $sym]} {
+	    # terminal symbol
+	    if {$sym != "\u22a2"} {
+		lset args $i [lindex $vallist [expr {$k-1}]]
+		set predecessors {}
+		dict for {key v} \
+		    [dict get [lindex $sets $k] [list $state $parent]] {
+		    foreach {pstate pparent pk cstate cparent ck
+			lhs rhsIndex pos} $key break
+		    # should be only one transition on a terminal
+		    break
+		}
+		set state $pstate
+		set parent $pparent
+		set k $pk
+	    }
+	} elseif {[string range $sym end-2 end] == "\{\u00d8\}"} {
+	    lset args $i [DeriveEpsilon $parser $sym $clientData]
+	} elseif {[dict exists [lindex $sets $k] [list $state $parent]]} {
+	    set causes {}
+	    set links [dict get [lindex $sets $k] [list $state $parent]]
+	    set keys {}
+	    set reductions {}
+	    dict for {key v} $links {
+		foreach {pstate pparent pk cstate cparent ck \
+			 lhs rhsIndex pos} $key break
+		lappend reductions $lhs $rhsIndex $pos
+		lappend keys $key
+	    }
+	    set keyIdx [ChooseReduction $parser $reductions]
+	    set key [lindex $keys $keyIdx]
+		foreach {pstate pparent pk cstate cparent ck \
+			 lhs rhsIndex pos} $key break
+	    lset args $i \
+		[Reconstruct $parser $sym $cstate $cparent $vallist \
+		     $sets $ck $clientData]
+	    set state $pstate
+	    set parent $pparent
+	    set k $pk
+	} else {
+	    return -code error "syntax error: incomplete parse"
+	}
+
+    }
+    set v [eval [list $cmd $args $clientData]]
+    return $v
+}
+
+# grammar::aycock::ChooseReduction --
+#
+#	Resolves an ambiguity in an Aycock-Earley parse
+#
+# Parameters:
+#	parser - Parser structure
+#	lritems - List of LR items that could be reduced.
+#
+# Results:
+#	Returns the ordinal number of the reduction to choose
+#
+# Always resolves in favour of the shortest right-hand side. This choice
+# is equivalent to choosing "resolve shift/reduce conflicts in favour
+# of shifting" in an LR parser, and is adequate to handling situations
+# like "dangling ELSE." It is not adequate for handling things like a
+# YACC-style ambiguous expression grammar with precedence and associativity;
+# that sort of processing would need additional investigation.
+
+proc ::grammar::aycock::ChooseReduction {parser lritems} {
+#     if {[llength $lritems] != 3} {
+# 	puts "Need to choose which item to reduce:"
+# 	DumpItemSet $parser $lritems
+#     }
+    # choose the shortest reduction - this is equivalent to
+    # "resolve in favour of shift"
+    set ind -1
+    set shortest 99999
+    set i 0
+    foreach {lhs rhsIndex pos} $lritems {
+	if {$pos < $shortest} {
+	    set shortest $pos
+	    set ind $i
+	}
+	incr i
+    }
+    return $ind
+}
+
+# grammar::aycock::DeriveEpsilon --
+#
+#	Performs a set of semantic actions needed to derive the
+#	empty string within a set of reductions in an Aycock-Earley parser.
+#
+# Parameters:
+#	parser -- Parser data structure
+#	sym -- Non-terminal symbol that reduces to the empty string.
+#	clientData - Client data for semantic actions
+#
+# Results:
+#	Returns the semantic value of the given symbol
+
+proc ::grammar::aycock::DeriveEpsilon {parser sym clientData} {
+    # need to find the rule that derives the null string, and
+    # expand it out.
+    namespace upvar $parser RuleSet RuleSet
+    set rules [dict get $RuleSet $sym]
+    set idx 0
+    if { [llength $rules] != 2 } {
+	set items {}
+	set i 0
+	foreach {rhs action} $rules {
+	    lappend items $sym $i [llength $rhs]
+	    incr i 2
+	}
+	set idx [expr {2 * [ChooseReduction $parser $items]}]
+    }
+    set rhs [lindex $rules $idx]
+    set action [lindex $rules [expr {$idx + 1}]]
+    set cmd [list ${parser}::$action]
+    set args {}
+    foreach sym $rhs {
+	lappend args {}
+    }
+    for {set i [expr {[llength $rhs] - 1}]} {$i >= 0} {incr i -1} {
+	lset args $i [DeriveEpsilon $parser [lindex $rhs $i] $clientData]
+    }
+    set r [eval [list $cmd $args $clientData]]
+    return $r
+    
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_aycock/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_aycock/pkgIndex.tcl
new file mode 100644
index 00000000..1dc5d2ff
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_aycock/pkgIndex.tcl
@@ -0,0 +1,8 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+
+package ifneeded grammar::aycock 1.0 \
+    [list source [file join $dir aycock-build.tcl]]
+package ifneeded grammar::aycock::debug 1.0 \
+    [list source [file join $dir aycock-debug.tcl]]
+package ifneeded grammar::aycock::runtime 1.0 \
+    [list source [file join $dir aycock-runtime.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/dacceptor.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/dacceptor.tcl
new file mode 100644
index 00000000..479db0c6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/dacceptor.tcl
@@ -0,0 +1,166 @@
+# -*- tcl -*-
+# Grammar / Finite Automatons / Acceptance checker, DFA only
+
+# ### ### ### ######### ######### #########
+## Package description
+
+## A class whose instances take a FA and are able to check strings of
+## symbols for acceptance. This class is restricted to deterministic
+## FAs. The FA can be either a reference to some external FA container
+## object, or a copy of such. The latter makes the acceptor impervious
+## to changes in the original definition.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require snit        ; # Tcllib | OO system used
+package require struct::set ; # Tcllib | Extended set operations.
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::grammar::fa::dacceptor {
+    # ### ### ### ######### ######### #########
+    ## Type API. 
+
+    # ### ### ### ######### ######### #########
+    ## Instance API.
+
+    #constructor {fa args} {}
+    #destructor  {}
+
+    method accept? {symbolstring} {}
+
+    option -any     {}
+
+    # ### ### ### ######### ######### #########
+    ## Internal data structures.
+
+    ## We take the relevant information from the FA specified during
+    ## construction, i.e. start state, final states, and transition
+    ## table in form for direct indexing and keep it local. No need to
+    ## access or even the full FA. We require a deterministic one, and
+    ## will complete it, if necessary.
+
+    variable start ; # Name of start state.
+    variable final ; # Array, existence = state is final.
+    variable trans ; # Transition array: state x symbol -> state
+    variable sym   ; # Symbol set (as array), for checking existence.
+    variable any   ; # Symbol to map any unknown symbol to. If not
+    #              ; # specified (eq "") then unknown symbols will  cause non-
+    #              ; # acceptance.
+    variable stop  ; # Stop state, causing immediate non-acceptance when entered.
+
+    # ### ### ### ######### ######### #########
+    ## Instance API Implementation.
+
+    constructor {fa args} {
+	set any {}
+	$self configurelist $args
+
+	if {![$fa is deterministic]} {
+	    return -code error "Source FA is not deterministic"
+	}
+	if {($any ne "") && ![$fa symbol exists $any]} {
+	    return -code error "Chosen any symbol \"$any\" does not exist"
+	}
+
+	if {![$fa is complete]} {
+	    set istmp 1
+	    set tmp [grammar::fa ${selfns}::fa = $fa]
+	    set before [$tmp states]
+	    $tmp complete
+	    # Our sink is a stop state.
+	    set stop [struct::set difference [$tmp states] $before]
+	} else {
+	    set istmp 0
+	    set tmp $fa
+	    # We don't know if there is a sink, so no quickstop.
+	    set stop {}
+	}
+
+	set start [lindex [$tmp startstates] 0]
+	foreach s [$tmp finalstates]        {set final($s) .}
+	foreach s [set syms [$tmp symbols]] {set sym($s) .}
+
+	foreach s [$tmp states] {
+	    foreach sy $syms {
+		set trans($s,$sy) [lindex [$tmp next $s $sy] 0]
+	    }
+	}
+
+	if {$istmp} {$tmp destroy}
+	return
+    }
+
+    #destructor {}
+
+    onconfigure -any {value} {
+	set options(-any) $value
+	set any           $value
+	return
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    method accept? {symbolstring} {
+	set state $start
+
+	## puts "\n====================== ($symbolstring)"
+
+	if {$any eq ""} {
+	    # No any mapping of unknown symbols.
+
+	    foreach sy $symbolstring {
+		if {![info exists sym($sy)]} {
+		    # Bad symbol in input. String is not accepted,
+		    # abort immediately.
+		    ## puts " \[$state\] -- Unknown symbol ($sy)"
+		    return 0
+		}
+
+		## puts " \[$state\] --($sy)--> "
+
+		set state $trans($state,$sy)
+		# state == "" cannot happen, as our FA is complete.
+		if {$state eq $stop} {
+		    # This is a known sink, we can stop processing input now.
+		    ## puts " \[$state\] FULL STOP"
+		    return 0
+		}
+	    }
+
+	} else {
+	    # Mapping of unknown symbols to any.
+
+	    foreach sy $symbolstring {
+		if {![info exists sym($sy)]} {set sy $any}
+		## puts " \[$state\] --($sy)--> "
+		set state $trans($state,$sy)
+		# state == "" cannot happen, as our FA is complete.
+		if {$state eq $stop} {
+		    # This is a known sink, we can stop processing input now.
+		    ## puts " \[$state\] FULL STOP"
+		    return 0
+		}
+	    }
+	}
+
+	## puts " \[$state\][expr {[info exists final($state)] ? " ACCEPT" : ""}]"
+
+	return [info exists final($state)]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Type API implementation.
+
+    # ### ### ### ######### ######### #########
+    ## Type Internals.
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide grammar::fa::dacceptor 0.1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/dexec.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/dexec.tcl
new file mode 100644
index 00000000..022ec181
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/dexec.tcl
@@ -0,0 +1,188 @@
+# -*- tcl -*-
+# Grammar / Finite Automatons / Executor, DFA only
+
+# ### ### ### ######### ######### #########
+## Package description
+
+## Instances take a DFA, keep a current state and update it in
+## reaction incoming symbols. Notable events are reported via
+## callback. Currently notable: Reset, reached a final state,
+# reached an error.
+
+## From the above description it should be clear that this class is
+## run in a push fashion. If not the last sentence has made this
+## explicit, right ? Right!
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require snit   ; # Tcllib | OO system used
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::grammar::fa::dexec {
+    # ### ### ### ######### ######### #########
+    ## Type API. 
+
+    # ### ### ### ######### ######### #########
+    ## Instance API.
+
+    #constructor {fa args} {}
+    #destructor  {}
+
+    method reset {} {}
+    method put  {sy} {}
+    method state {} {}
+
+    option -command {}
+    option -any     {}
+
+    # ### ### ### ######### ######### #########
+    ## Internal data structures.
+
+    ## We take the relevant information from the FA specified during
+    ## construction, i.e. start state, final states, and transition
+    ## table in form for direct indexing and keep it local. No need to
+    ## access or even the full FA. We require a deterministic one, and
+    ## will complete it, if necessary.
+
+    variable start ; # Name of start state.
+    variable final ; # Array, existence = state is final.
+    variable trans ; # Transition array: state x symbol -> state
+    variable sym   ; # Symbol set (as array), for checking existence.
+    variable cmd   ; # Command to call for various events. Required.
+    variable any   ; # Symbol to map any unknown symbol to. If not
+    #              ; # specified (eq "") then unknown symbols will  cause non-
+    #              ; # acceptance.
+    variable curr  ; # State the underlying DFA is currently in.
+    variable inerr ; # Boolean flag. Set if an error was reached.
+
+
+    # ### ### ### ######### ######### #########
+    ## Instance API Implementation.
+
+    constructor {fa args} {
+	set any {}
+	set cmd {}
+	$self configurelist $args
+
+	if {![$fa is deterministic]} {
+	    return -code error "Source FA is not deterministic"
+	}
+	if {($any ne "") && ![$fa symbol exists $any]} {
+	    return -code error "Chosen any symbol \"$any\" does not exist"
+	}
+	if {![llength $cmd]} {
+	    return -code error "Command callback missing"
+	}
+
+	# In contrast to the acceptor we do not complete the FA. We
+	# will later report BADTRANS errors instead if a non-existing
+	# transition is attempted. For the acceptor it made sense as
+	# it made the accept/!accept decision easier. However here for
+	# the generic execution it is unreasonable interference with
+	# whatever higher levels might wish to do when encountering
+	# this.
+
+	set start [lindex [$fa startstates] 0]
+	foreach s [$fa finalstates]        {set final($s) .}
+	foreach s [set syms [$fa symbols]] {set sym($s) .}
+
+	foreach s [$fa states] {
+	    foreach sy [$fa symbols@ $s] {
+		set trans($s,$sy) [lindex [$fa next $s $sy] 0]
+	    }
+	}
+
+	$self reset
+	return
+    }
+
+    #destructor {}
+
+    onconfigure -command {value} {
+	set options(-command) $value
+	set cmd               $value
+	return
+    }
+
+    onconfigure -any {value} {
+	set options(-any) $value
+	set any           $value
+	return
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    method reset {} {
+	set curr  $start
+	set inerr 0
+	## puts -nonewline " \[$curr\]" ; flush stdout
+
+	uplevel #0 [linsert $cmd end \
+		reset]
+	return
+    }
+
+    method state {} {
+	return $curr
+    }
+
+    method put {sy} {
+	if {$inerr} return
+	## puts " --($sy)-->"
+
+	if {![info exists sym($sy)]} {
+	    if {$any eq ""} {
+		# No any mapping of unknown symbols, report as error
+		## puts " BAD SYMBOL"
+
+		set inerr 1
+		uplevel #0 [linsert $cmd end \
+			error BADSYM "Bad symbol \"$sy\""]
+		return
+	    } else {
+		# Mapping of unknown symbols to any.
+		set sy $any
+	    }
+	}
+
+	if {[catch {
+	    set new $trans($curr,$sy)
+	}]} {
+	    ## puts " NO DESTINATION"
+	    set inerr 1
+	    uplevel #0 [linsert $cmd end \
+		    error BADTRANS "Bad transition (\"$curr\" \"$sy\"), no destination"]
+	    return
+	}
+	set curr $new
+	
+	uplevel #0 [linsert $cmd end \
+		state $curr]
+	
+	## puts -nonewline " \[$curr\]" ; flush stdout
+
+	if {[info exists final($curr)]} {
+	    ## puts -nonewline " FINAL" ; flush stdout
+
+	    uplevel #0 [linsert $cmd end \
+		    final $curr]
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Type API implementation.
+
+    # ### ### ### ######### ######### #########
+    ## Type Internals.
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide grammar::fa::dexec 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/fa.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/fa.tcl
new file mode 100644
index 00000000..8e116d00
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/fa.tcl
@@ -0,0 +1,1242 @@
+# -*- tcl -*-
+# (c) 2004-2013 Andreas Kupries
+# Grammar / Finite Automatons / Container
+
+# ### ### ### ######### ######### #########
+## Package description
+
+## A class whose instances hold all the information describing a
+## single finite automaton (states, symbols, start state, set of
+## accepting states, transition function), and operations to define,
+## manipulate, and query this information.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+if {[package vcompare [package present Tcl] 8.5] >= 0} {
+    # Tcl 8.5+, extended package version numbers.
+    # Require 1.3 and beyond, regardless of major version number.
+    package require snit 1.3- ; # OO system in use (Using hierarchical methods)
+} else {
+    # Tcl 8.4, emulate, ask for 2.x first, then 1.3+.
+    if {[catch {
+	package require snit 2   ; # OO system in use (Using hierarchical methods)
+    }]} {
+	package require snit 1.3 ; # OO system in use (Using hierarchical methods)
+    }
+}
+
+package require grammar::fa::op ; # Heavy FA operations.
+package require struct::list    ; # Extended list operations.
+package require struct::set     ; # Extended set operations.
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::grammar::fa {
+    # ### ### ### ######### ######### #########
+    ## Type API. A number of operations on FAs
+
+    # ### ### ### ######### ######### #########
+    ## Instance API
+
+    #constructor {args} {}
+    #destructor  {}
+
+    method =   {b} {}
+    method --> {b} {}
+
+    method serialize {} {}
+    method deserialize {value} {}
+    method deserialize_merge {value} {}
+
+    method states {} {}
+    #method state {cmd s args} {}
+
+    method startstates {} {}
+    method start?      {s} {}
+    method start?set   {states} {}
+    #method start       {cmd args} {}
+
+    method finalstates {} {}
+    method final?      {s} {}
+    method final?set   {states} {}
+    #method final       {cmd args} {}
+
+    method symbols     {} {}
+    method symbols@    {state} {}
+    method symbols@set {states} {}
+    #method symbol      {cmd sym} {}
+
+    method next  {s sym args} {}
+    method !next {s sym args} {}
+    method nextset {states sym} {}
+
+    method is {cmd} {}
+
+    method reachable_states   {} {}
+    method unreachable_states {} {}
+    method reachable          {s} {}
+
+    method useful_states   {} {}
+    method unuseful_states {} {}
+    method useful          {s} {}
+
+    method epsilon_closure {s} {}
+
+    method clear {} {}
+
+    # ### ### ### ######### ######### #########
+    ## Instance API. Complex FA operations.
+    ## The heavy lifting is done by the operations package.
+
+    method reverse    {}                          {op::reverse    $self}
+    method complete   {{sink {}}}                 {op::complete   $self $sink}
+    method remove_eps {}                          {op::remove_eps $self}
+    method trim       {{what !reachable|!useful}} {op::trim       $self $what}
+    method complement {}                          {op::complement $self}
+    method kleene     {}                          {op::kleene     $self}
+    method optional   {}                          {op::optional   $self}
+    method fromRegex  {regex {over {}}}           {op::fromRegex  $self $regex $over}
+
+    method determinize {{mapvar {}}} {
+	if {$mapvar ne ""} {upvar 1 $mapvar map}
+	op::determinize $self map
+    }
+
+    method minimize {{mapvar {}}} {
+	if {$mapvar ne ""} {upvar 1 $mapvar map}
+	op::minimize $self map
+    }
+
+    method union {fa {mapvar {}}} {
+	if {$mapvar ne ""} {upvar 1 $mapvar map}
+	op::union $self $fa map
+    }
+
+    method intersect {fa {mapvar {}}} {
+	if {$mapvar ne ""} {upvar 1 $mapvar map}
+	op::intersect $self $fa map
+    }
+
+    method difference {fa {mapvar {}}} {
+	if {$mapvar ne ""} {upvar 1 $mapvar map}
+	op::difference $self $fa map
+    }
+
+    method concatenate {fa {mapvar {}}} {
+	if {$mapvar ne ""} {upvar 1 $mapvar map}
+	op::concatenate $self $fa map
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal data structures.
+
+    ## State information:
+    ## - Order    : Defined for all states, values provide creation order.
+    ## - Start    : Defined for states which are "start" (Input processing begins in).
+    ## - Final    : Defined for states which are "final" ("accept" input).
+    ## - Transinv : Inverse transitions. Per state the set of (state,sym)'s
+    ##              which have transitions into the state. Defined only for
+    ##              states which have inbound transitions.
+    ##
+    ## Transinv is maintained to make state deletion easier: Direct
+    ## access to the states and transitions which are inbound, for
+    ## their deletion.
+
+    variable order        ; # Map : State -> Order of creation
+    variable final        ; # Map : State -> .   Exists <=> Is a final State
+    variable start        ; # Map : State -> .   Exists <=> Is a start State
+    variable transinv     ; # Map : State -> {(State, Sym)}
+
+    ## Global information:
+    ## - Scount     : Counter for creation order of states.
+
+    variable scount     0  ; # Counter for orderering states.
+
+    ## Symbol information:
+    ## - Symbol : Defined for all symbols, values irrelevant.
+
+    variable symbol       ; # Map : Symbol -> . Exists = Symbol declared.
+
+    ## Transition data:
+    ## - TransN  : Dynamically created instance variables. Transition tables
+    ##             for single states. Defined only for states which have
+    ##             transitions.
+    ## - Transym : List of states having transitions on that symbol.
+
+    ## Transym is maintained for symbol deletion. Direct access to the transitions
+    ## we have to delete as well.
+
+    ## selfns::trans_$order(state) : Per state map : symbol -> list of destinations.
+    variable transym      ; # Map : Sym -> {State}
+
+    ## Derived information:
+    ## - Reach       : Cache for set of states reachable from start.
+    ## - Reachvalid  : Boolean flag. True iff the reach cache contains valid data
+    ## - Useful      : Cache for set of states able to reach final.
+    ## - Usefulvalid : Boolean flag. True iff the useful cache contains valid data
+    ## - Nondete     : Set of states which are non-deterministic, because they have
+    #                  epsilon-transitions.
+    # -  EC          : Cache of epsilon-closures
+
+    variable reach      {} ; # Set of states reachable from 'start'.
+    variable reachvalid 0  ; # Boolean flag, if 'reach' is valid.
+
+    variable useful      {} ; # Set of states able to reach 'final'.
+    variable usefulvalid 0  ; # Boolean flag, if 'useful' is valid.
+
+    variable nondete    {} ; # Set of non-deterministic states, by epsilon/non-epsilon.
+    variable nondets       ; # Per non-det state the set of symbols it is non-det in.
+
+    variable ec            ; # Cache of epsilon-closures for states.
+
+
+    # ### ### ### ######### ######### #########
+    ## Instance API Implementation.
+
+    constructor {args} {
+	set alen [llength $args]
+	if {($alen != 2) && ($alen != 0) && ($alen != 3)} {
+	    return -code error "wrong#args: $self ?=|:=|<--|as|deserialize a'|fromRegex re ?over??"
+	}
+
+	array set order    {} ; set nondete     {}
+	array set start    {} ; set scount      0
+	array set final    {} ; set reach       {}
+	array set symbol   {} ; set reachvalid  0
+	array set transym  {} ; set useful      {}
+	array set transinv {} ; set usefulvalid 0
+	array set nondets  {}
+	array set ec       {}
+
+	if {$alen == 0} return
+
+	foreach {cmd object} $args break
+	switch -exact -- $cmd {
+	    = - := - <-- - as {
+		if {$alen != 2} {
+		    return -code error "wrong#args: $self ?=|:=|<--|as|deserialize a'|fromRegex re ?over??"
+		}
+		$self = $object
+	    }
+	    deserialize {
+		if {$alen != 2} {
+		    return -code error "wrong#args: $self ?=|:=|<--|as|deserialize a'|fromRegex re ?over??"
+		}
+		# Object is actually a value, the deserialization to use.
+		$self deserialize $object
+	    }
+	    fromRegex {
+		# Object is actually a value, the regular expression to use.
+		if {$alen == 2} {
+		    $self fromRegex $object
+		} else {
+		    $self fromRegex $object [lindex $args 2]
+		}
+	    }
+	    default {
+		return -code error "bad assignment: $self ?=|:=|<--|as|deserialize a'|fromRegex re ?over??"
+	    }
+	}
+	return
+    }
+
+    # destructor {}
+
+    # --- --- --- --------- --------- ---------
+
+    method = {b} {
+	$self deserialize [$b serialize]
+    }
+
+    method --> {b} {
+	$b deserialize [$self serialize]
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    method serialize {} {
+	set ord {}
+	foreach {s n} [array get order] {
+	    lappend ord [list $s $n]
+	}
+	set states {} ; # Dictionary
+	foreach item [lsort -index 1 -integer -increasing $ord] {
+	    set s [lindex $item 0]
+	    set sdata {}
+
+	    # Dict data per state :
+
+	    lappend sdata [info exists start($s)]
+	    lappend sdata [info exists final($s)]
+
+	    # Transitions from the state.
+
+	    upvar #0 ${selfns}::trans_$order($s) jump
+
+	    if {![info exists jump]} {
+		lappend sdata {}
+	    } else {
+		lappend sdata [array get jump]
+	    }
+
+	    # ----------------------
+	    lappend states $s $sdata
+	}
+
+	return [::list \
+		grammar::fa \
+		[array names symbol] \
+		$states \
+		]
+    }
+
+    method deserialize {value} {
+	$self CheckSerialization $value st states acc tr newsymbols
+	$self clear
+
+	foreach s   $states     {set order($s)    [incr scount]}
+	foreach sym $newsymbols {set symbol($sym) .}
+	foreach s   $acc        {set final($s)    .}
+	foreach s   $st         {set start($s)    .}
+
+	foreach {sa sym se} $tr {$self Next $sa $sym $se}
+	return
+    }
+
+    method deserialize_merge {value} {
+	$self CheckSerialization $value st states acc tr newsymbols
+
+	foreach s   $states     {set order($s)    [incr scount]}
+	foreach sym $newsymbols {set symbol($sym) .}
+	foreach s   $acc        {set final($s)    .}
+	foreach s   $st         {set start($s)    .}
+
+	foreach {sa sym se} $tr {$self Next $sa $sym $se}
+	return
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    method states {} {
+	return [array names order]
+    }
+
+    method {state add} {s args} {
+	set args [linsert $args 0 $s]
+	foreach s $args {
+	    if {[info exists order($s)]} {
+		return -code error "State \"$s\" is already known"
+	    }
+	}
+	foreach s $args {set order($s) [incr scount]}
+	return
+    }
+
+    method {state delete} {s args} {
+	set args [linsert $args 0 $s]
+	$self StateCheckSet $args
+
+	foreach s $args {
+	    unset -nocomplain start($s)                   ; # Start/Initial indicator
+	    unset -nocomplain final($s)                   ; # Final/Accept indicator
+
+	    # Remove all inbound transitions.
+	    if {[info exists transinv($s)]} {
+		set src $transinv($s)
+		unset    transinv($s)
+
+		foreach srcitem $src {
+		    struct::list assign $srcitem sin sym
+		    $self !Next $sin $sym $s
+		}
+	    }
+
+	    # We remove transition data only after the inbound
+	    # ones. Otherwise we screw up the removal of
+	    # looping transitions. We have to consider the
+	    # backpointers to us in transinv as well.
+
+	    upvar #0  ${selfns}::trans_$order($s) jump
+	    if {[info exists jump]} {
+		foreach sym [array names jump] {
+		    $self !Transym $s $sym
+		    foreach nexts $jump($sym) {
+			$self !Transinv $s $sym $nexts
+		    }
+		}
+
+		unset ${selfns}::trans_$order($s) ; # Transitions from s
+	    }
+	    unset order($s)                               ; # State ordering
+
+	    # Removal of a state may break the automaton into
+	    # disconnected pieces. This means that the set of
+	    # reachable and useful states may change, and the
+	    # cache cannot be used from now on.
+
+	    $self InvalidateReach
+	    $self InvalidateUseful
+	}
+	return
+    }
+
+    method {state rename} {s snew} {
+	$self StateCheck $s
+	if {[info exists order($snew)]} {
+	    return -code error "State \"$snew\" is already known"
+	}
+
+	set o $order($s)
+	unset order($s)                               ; # State ordering
+	set   order($snew) $o
+
+	# Start/Initial indicator
+	if {[info exists start($s)]} {
+	    set   start($snew) $start($s)
+	    unset start($s)
+	}
+	# Final/Accept indicator
+	if {[info exists final($s)]} {
+	    set   final($snew) $final($s)
+	    unset final($s)
+	}
+	# Update all inbound transitions.
+	if {[info exists transinv($s)]} {
+	    set   transinv($snew) $transinv($s)
+	    unset transinv($s)
+
+	    # We have to perform a bit more here. We have to
+	    # go through the inbound transitions and change the
+	    # listed destination state to the new name.
+
+	    foreach srcitem $transinv($snew) {
+		struct::list assign $srcitem sin sym
+		# For loops access the 'order' array under the
+		# new name, the old entry is already gone. See
+		# above. See bug SF 2595296.
+		if {$sin eq $s} {
+		    set sin $snew
+		}
+		upvar #0 ${selfns}::trans_$order($sin) jump
+		upvar 0 jump($sym) destinations
+		set pos [lsearch -exact $destinations $s]
+		set destinations [lreplace $destinations $pos $pos $snew]
+	    }
+	}
+
+	# Another place to change are the back pointers from
+	# all the states we have transitions to, i.e. transinv
+	# for all outbound states.
+
+	upvar #0 ${selfns}::trans_$o jump
+	if {[info exists jump]} {
+	    foreach sym [array names jump] {
+		foreach sout $jump($sym) {
+		    upvar 0 transinv($sout) backpointer
+		    set pos [lsearch -exact $backpointer [list $s $sym]]
+		    set backpointer [lreplace $backpointer $pos $pos [list $snew $sym]]
+		}
+
+		# And also to update: Transym information for the symbol.
+		upvar 0 transym($sym) users
+		set pos [lsearch -exact $users $s]
+		set users [lreplace $users $pos $pos $snew]
+	    }
+	}
+
+	# Changing the name of a state does not change the
+	# reachables / useful states per se. We just may have
+	# to replace the name in the caches as well.
+
+	# - Invalidation will do the same, at the expense of a
+	# - larger computation later.
+
+	$self InvalidateReach
+	$self InvalidateUseful
+	return
+    }
+
+    method {state exists} {s} {
+	return [info exists order($s)]
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    method startstates {} {
+	return [array names start]
+    }
+
+    method start? {s} {
+	$self StateCheck $s
+	return [info exists start($s)]
+    }
+
+    method start?set {states} {
+	$self StateCheckSet $states
+	foreach s $states {
+	    if {[info exists start($s)]} {return 1}
+	}
+	return 0
+    }
+
+    # Note: Adding or removing start states does not change
+    # usefulness, only reachability
+
+    method {start add} {state args} {
+	set args [linsert $args 0 $state]
+	$self StateCheckSet $args
+	foreach s $args {set start($s) .}
+	$self InvalidateReach
+	return
+    }
+
+    method {start set} {states} {
+	$self StateCheckSet $states
+	array unset start
+	foreach s $states {set start($s) .}
+	$self InvalidateReach
+	return
+    }
+
+    method {start remove} {state args} {
+	set args [linsert $args 0 $state]
+	$self StateCheckSet $args
+	foreach s $args {
+	    unset -nocomplain start($s)
+	}
+	$self InvalidateReach
+	return
+    }
+
+    method {start clear} {} {
+	array unset start
+	$self InvalidateReach
+	return
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    method finalstates {} {
+	return [array names final]
+    }
+
+    method final? {s} {
+	$self StateCheck $s
+	return [info exists final($s)]
+    }
+
+    method final?set {states} {
+	$self StateCheckSet $states
+	foreach s $states {
+	    if {[info exists final($s)]} {return 1}
+	}
+	return 0
+    }
+
+    # Note: Adding or removing final states does not change
+    # reachability, only usefulness
+
+    method {final add} {state args} {
+	set args [linsert $args 0 $state]
+	$self StateCheckSet $args
+	foreach s $args {set final($s) .}
+	$self InvalidateUseful
+	return
+    }
+
+    method {final set} {states} {
+	$self StateCheckSet $states
+	array unset final
+	foreach s $states {set final($s) .}
+	$self InvalidateReach
+	return
+    }
+
+    method {final remove} {state args} {
+	set args [linsert $args 0 $state]
+	$self StateCheckSet $args
+	foreach s $args {
+	    unset -nocomplain final($s)
+	}
+	$self InvalidateUseful
+	return
+    }
+
+    method {final clear} {} {
+	array unset final
+	$self InvalidateReach
+	return
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    method symbols {} {
+	return [array names symbol]
+    }
+
+    method symbols@ {s {t {}}} {
+	$self StateCheck $s
+	if {$t ne ""} {	$self StateCheck $t}
+	upvar #0 ${selfns}::trans_$order($s) jump
+	if {![info exists jump]} {return {}}
+	if {$t eq ""} {
+	    # No destination, all symbols.
+	    return [array names jump]
+	}
+	# Specific destination, locate the symbols going there.
+	set result {}
+	foreach sym [array names jump] {
+	    if {[lsearch -exact $jump($sym) $t] < 0} continue
+	    lappend result $sym
+	}
+	return [lsort -uniq $result]
+    }
+
+    method symbols@set {states} {
+	# Union (fa symbol@ s, f.a. s in states)
+
+	$self StateCheckSet $states
+	set result {}
+	foreach s $states {
+	    upvar #0 ${selfns}::trans_$order($s) jump
+	    if {![info exists jump]} continue
+	    foreach sym [array names jump] {
+		lappend result $sym
+	    }
+	}
+	return [lsort -uniq $result]
+    }
+
+    method {symbol add} {sym args} {
+	set args [linsert $args 0 $sym]
+	foreach sym $args {
+	    if {$sym eq ""} {
+		return -code error "Cannot add illegal empty symbol \"\""
+	    }
+	    if {[info exists symbol($sym)]} {
+		return -code error "Symbol \"$sym\" is already known"
+	    }
+	}
+	foreach sym $args {set symbol($sym) .}
+	return
+    }
+
+    method {symbol delete} {sym args} {
+	set args [linsert $args 0 $sym]
+	$self SymbolCheckSetNE $args
+	foreach sym $args {
+	    unset symbol($sym)
+
+	    # Delete all transitions using the removed symbol.
+
+	    if {[info exists transym($sym)]} {
+		foreach s $transym($sym) {
+		    $self !Next $s $sym
+		}
+	    }
+	}
+	return
+    }
+
+    method {symbol rename} {sym newsym} {
+	$self SymbolCheckNE $sym
+	if {$newsym eq ""} {
+	    return -code error "Cannot add illegal empty symbol \"\""
+	}
+	if {[info exists symbol($newsym)]} {
+	    return -code error "Symbol \"$newsym\" is already known"
+	}
+
+	unset symbol($sym)
+	set symbol($newsym) .
+
+	if {[info exists transym($sym)]} {
+	    set   transym($newsym) [set states $transym($sym)]
+	    unset transym($sym)
+
+	    foreach s $states {
+		# Update the jump tables for each of the states
+		# using this symbol, and the reverse tables as
+		# well.
+
+		upvar #0 ${selfns}::trans_$order($s) jump
+		set   jump($newsym) [set destinations $jump($sym)]
+		unset jump($sym)
+
+		foreach sd $destinations {
+		    upvar 0 transinv($sd) backpointer
+		    set pos [lsearch -exact $backpointer [list $s $sym]]
+		    set backpointer [lreplace $backpointer $pos $pos [list $s $newsym]]
+		}
+	    }
+	}
+	return
+    }
+
+    method {symbol exists} {sym} {
+	return [info exists symbol($sym)]
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    method next {s sym args} {
+	## Split into checking and functionality ...
+
+	set alen [llength $args]
+	if {($alen != 2) && ($alen != 0)} {
+	    return -code error "wrong#args: [list $self] next s sym ?--> s'?"
+	}
+	$self StateCheck  $s
+	$self SymbolCheck $sym
+
+	if {($alen == 2) && [set cmd [lindex $args 0]] ne "-->"} {
+	    return -code error "Expected -->, got \"$cmd\""
+	}
+
+	if {$alen == 0} {
+	    # Query transition table.
+	    upvar #0 ${selfns}::trans_$order($s) jump
+	    if {![info exists jump($sym)]} {return {}}
+	    return $jump($sym)
+	}
+
+	set nexts [lindex $args 1]
+	$self StateCheck $nexts
+
+	upvar #0 ${selfns}::trans_$order($s) jump
+	if {[info exists jump($sym)] && [struct::set contains $jump($sym) $nexts]} {
+	    return -code error "Transition \"($s, ($sym)) --> $nexts\" is already known"
+	}
+
+	$self Next $s $sym $nexts
+	return
+    }
+
+    method !next {s sym args} {
+	set alen [llength $args]
+	if {($alen != 2) && ($alen != 0)} {
+	    return -code error "wrong#args: [list $self] !next s sym ?--> s'?"
+	}
+	$self StateCheck  $s
+	$self SymbolCheck $sym
+
+	if {$alen == 2} {
+	    if {[lindex $args 0] ne "-->"} {
+		return -code error "Expected -->, got \"[lindex $args 0]\""
+	    }
+	    set nexts [lindex $args 1]
+	    $self StateCheck $nexts
+	    $self !Next $s $sym $nexts
+	} else {
+	    $self !Next $s $sym
+	}
+    }
+
+    method nextset {states sym} {
+	$self SymbolCheck   $sym
+	$self StateCheckSet $states
+
+	set result {}
+	foreach s $states {
+	    upvar #0 ${selfns}::trans_$order($s) jump
+	    if {![info exists jump($sym)]} continue
+	    struct::set add result $jump($sym)
+	}
+	return $result
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    method is {cmd} {
+	switch -exact -- $cmd {
+	    complete {
+		# The FA is complete if Trans(State, Sym) != {} for all
+		# states and symbols (Not counting epsilon transitions).
+		# Without symbols the FA is deemed complete. Note:
+		# States with epsilon transitions can use symbols
+		# indirectly! Need their closures for exact
+		# computation.
+
+		set nsymbols [llength [array names symbol]]
+		if {$nsymbols == 0} {return 1}
+		foreach s [array names order] {
+		    upvar #0 ${selfns}::trans_$order($s) jump
+		    if {![info exists jump]} {return 0}
+		    set njsym [array size jump]
+		    if {[info exists jump()]} {
+			set  njsym [llength [$self symbols@set [$self epsilon_closure $s]]]
+			incr njsym -1
+		    }
+		    if {$njsym != $nsymbols}  {return 0}
+		}
+		return 1
+	    }
+	    deterministic {
+		# The FA is deterministic if it has on start state, no
+		# epsilon transitions, and the transition function is
+		# State x Symbol -> State, and not
+		# State x Symbol -> P(State).
+
+		return [expr {
+		    ([array size start] == 1) &&
+		    ![llength $nondete] &&
+		    ![array size nondets]
+		}] ;#{}
+	    }
+	    epsilon-free {
+		# FA is epsion-free if there are no states having epsilon transitions.
+		return [expr {![llength $nondete]}]
+	    }
+	    useful {
+		# The FA is useful if and only if we have states and
+		# all states are reachable and useful.
+
+		set states [$self states]
+		return [expr {
+		    [struct::set size $states] &&
+		    [struct::set equal $states [$self reachable_states]] &&
+		    [struct::set equal $states [$self useful_states]]
+		}] ;# {}
+	    }
+	}
+	return -code error "Expected complete, deterministic, epsilon-free, or useful, got \"$cmd\""
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    method reachable_states {} {
+	if {$reachvalid} {return $reach}
+	if {![array size start]} {
+	    set reach {}
+	} else {
+	    # Basic algorithm like for epsilon_closure, except that we
+	    # process all transitions, not only epsilons, and that
+	    # the initial state is fixed to start.
+
+	    set reach   [array names start]
+	    set pending $reach
+	    array set visited {}
+	    while {[llength $pending]} {
+		set s [struct::list shift pending]
+		if {[info exists visited($s)]} continue
+		set visited($s) .
+		upvar #0 ${selfns}::trans_$order($s) jump
+		if {![info exists jump]} continue
+		if {![array size  jump]} continue
+		foreach sym [array names jump] {
+		    struct::set add reach   $jump($sym)
+		    struct::set add pending $jump($sym)
+		}
+	    }
+	}
+	set reachvalid 1
+	return $reach
+    }
+
+    method unreachable_states {} {
+	# unreachable = states - reachables
+	return [struct::set difference \
+		[$self states] [$self reachable_states]]
+    }
+
+    method reachable {s} {
+	$self StateCheck $s
+	return [struct::set contains [$self reachable_states] $s]
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    method useful_states {} {
+	if {$usefulvalid} {return $useful}
+
+	# A state is useful if a final state
+	# can be reached from it.
+
+	if {![array size final]} {
+	    set useful {}
+	} else {
+	    # Basic algorithm like for epsilon_closure, except that we
+	    # process all transitions, not only epsilons, and that
+	    # the initial set of states is fixed to final.
+
+	    set useful      [array names final]
+	    array set known [array get final]
+	    set pending $useful
+	    array set visited {}
+	    while {[llength $pending]} {
+		set s [struct::list shift pending]
+		if {[info exists visited($s)]} continue
+		set visited($s) .
+
+		# All predecessors are useful, and have to be visited as well.
+		# We get the predecessors from the transinv structure.
+
+		if {![info exists transinv($s)]} continue
+		foreach before $transinv($s) {
+		    set before [lindex $before 0]
+		    if {[info exists visited($before)]} continue
+		    lappend pending $before
+		    if {[info exists known($before)]} continue
+		    lappend useful $before
+		    set known($before) .
+		}
+	    }
+	}
+	set usefulvalid 1
+	return $useful
+    }
+
+    method unuseful_states {} {
+	# unuseful = states - useful
+	return [struct::set difference \
+		[$self states] [$self useful_states]]
+    }
+
+    method useful {s} {
+	$self StateCheck $s
+	return [struct::set contains [$self useful_states] $s]
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    method epsilon_closure {s} {
+	# Iterative graph traversal. Keeps a set of states to look at,
+	# and adds to them everything it can reach from the current
+	# state via epsilon-transitions. Loops are handled through the
+	# visited array to weed out all the states already processed.
+
+	$self StateCheck $s
+
+	# Prefer cached information
+	if {[info exists ec($s)]} {
+	    return $ec($s)
+	}
+
+	set closure [list $s]
+	set pending [list $s]
+	array set visited {}
+	while {[llength $pending]} {
+	    set t [struct::list shift pending]
+	    if {[info exists visited($t)]} continue
+	    set visited($t) .
+	    upvar #0 ${selfns}::trans_$order($t) jump
+	    if {![info exists jump()]} continue
+	    struct::set add closure $jump()
+	    struct::set add pending $jump()
+	}
+	set ec($s) $closure
+	return $closure
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    method clear {} {
+	array unset order    ; set nondete     {}
+	array unset start    ; set scount      0
+	array unset final    ; set reach       {}
+	array unset symbol   ; set reachvalid  0
+	array unset transym  ; set useful      {}
+	array unset transinv ; set usefulvalid 0
+	array unset nondets
+	array unset ec
+
+	# Locate all 'trans_' arrays and remove them as well.
+
+	foreach v [info vars ${selfns}::trans_*] {
+	    unset $v
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Instance Internals.
+
+    method StateCheck {s} {
+	if {![info exists order($s)]} {
+	    return -code error "Illegal state \"$s\""
+	}
+    }
+
+    method StateCheckSet {states} {
+	foreach s $states {
+	    if {![info exists order($s)]} {
+		return -code error "Illegal state \"$s\""
+	    }
+	}
+    }
+
+    method SymbolCheck {sym} {
+	if {$sym eq ""} return
+	if {![info exists symbol($sym)]} {
+	    return -code error "Illegal symbol \"$sym\""
+	}
+    }
+
+    method SymbolCheckNE {sym} {
+	if {($sym eq "") || ![info exists symbol($sym)]} {
+	    return -code error "Illegal symbol \"$sym\""
+	}
+    }
+
+    if 0 {
+	# Unused. Activate when needed.
+	method SymbolCheckSet {symbols} {
+	    foreach sym $symbols {
+		if {$sym eq ""} continue
+		if {![info exists symbol($sym)]} {
+		    return -code error "Illegal symbol \"$sym\""
+		}
+	    }
+	}
+    }
+
+    method SymbolCheckSetNE {symbols} {
+	foreach sym $symbols {
+	    if {($sym eq "") || ![info exists symbol($sym)]} {
+		return -code error "Illegal symbol \"$sym\""
+	    }
+	}
+    }
+
+    method Next {s sym nexts} {
+	# Modify transition table. May update the set of
+	# non-deterministic states. Invalidates reachable
+	# cache, as states may become reachable. Updates
+	# the transym and transinv mappings.
+
+	upvar #0 ${selfns}::trans_$order($s) jump
+
+	$self InvalidateReach
+	$self InvalidateUseful
+	# Clear closure cache when epsilons change.
+	if {$sym eq ""} {array unset ec}
+
+	if {[info exists transym($sym)]} {
+	    struct::set include transym($sym) $s
+	} else {
+	    set transym($sym) [list $s]
+	}
+
+	if {[info exists transinv($nexts)]} {
+	    struct::set include transinv($nexts) [list $s $sym]
+	} else {
+	    set transinv($nexts) [list [list $s $sym]]
+	}
+
+	if {![info exists jump($sym)]} {
+	    set jump($sym) [list $nexts]
+	} else {
+	    struct::set include jump($sym) $nexts
+	}
+	$self NonDeterministic $s $sym
+	return
+    }
+
+    method !Next {s sym args} {
+	upvar #0 ${selfns}::trans_$order($s) jump
+	# Anything to do at all ?
+	if {![info exists jump($sym)]} return
+	$self InvalidateReach
+	$self InvalidateUseful
+	# Clear closure cache when epsilons change.
+	if {$sym eq ""} {array unset ec}
+
+	if {![llength $args]} {
+	    # Unset all transitions for (s, sym)
+	    # Update transym and transinv mappings as well, if existing.
+
+	    $self !Transym $s $sym
+	    foreach nexts $jump($sym) {
+		$self !Transinv $s $sym $nexts
+	    }
+
+	    unset jump($sym)
+	} else {
+	    # Remove the single transition (s, sym) -> nexts
+	    set nexts [lindex $args 0]
+
+	    struct::set exclude jump($sym) $nexts
+	    $self !Transinv $s $sym $nexts
+
+	    if {![struct::set size $jump($sym)]} {
+		$self !Transym $s $sym
+		unset jump($sym)
+		if {![array size jump]} {
+		    unset jump
+		}
+	    }
+	}
+
+	$self NonDeterministic $s $sym
+	return
+    }
+
+    method !Transym {s sym} {
+	struct::set exclude transym($sym) $s
+	if {![struct::set size $transym($sym)]} {
+	    unset transym($sym)
+	}
+    }
+
+    method !Transinv {s sym nexts} {
+	if {[info exists transinv($nexts)]} {
+	    struct::set exclude transinv($nexts) [list $s $sym]
+	    if {![struct::set size $transinv($nexts)]} {
+		unset transinv($nexts)
+	    }
+	}
+    }
+
+    method InvalidateReach {} {
+	set reachvalid 0
+	set reach      {}
+	return
+    }
+
+    method InvalidateUseful {} {
+	set usefulvalid 0
+	set useful     {}
+	return
+    }
+
+    method NonDeterministic {s sym} {
+	upvar #0 ${selfns}::trans_$order($s) jump
+
+	# Epsilon rule, whole state check. Epslion present <=> Not a DFA.
+
+	if {[info exists jump()]} {
+	    struct::set include nondete $s
+	} else {
+	    struct::set exclude nondete $s
+	}
+
+	# Non-determinism over a symbol.
+
+	upvar #0 ${selfns}::trans_$order($s) jump
+
+	if {[info exists jump($sym)] && [struct::set size $jump($sym)] > 1} {
+	    if {![info exists nondets($s)]} {
+		set nondets($s) [list $sym]
+	    } else {
+		struct::set include nondets($s) $sym
+	    }
+	    return
+	} else {
+	    if {![info exists nondets($s)]} return
+	    struct::set exclude nondets($s) $sym
+	    if {![struct::set size $nondets($s)]} {
+		unset nondets($s)
+	    }
+	}
+	return
+    }
+
+    method CheckSerialization {value startst states acc trans syms} {
+	# value is list/3 ('grammar::fa' symbols states)
+	# !("" in symbols)
+	# states is ordered dict (key is state, value is statedata)
+	# statedata is list/3 (start final trans|"")
+	# start is boolean
+	# final is boolean
+	# trans is dict (key in symbols, value is destinations)
+	# destinations is set of states
+
+	upvar 1 $startst startstates \
+		$states  sts \
+		$acc     a \
+		$trans   t \
+		$syms    symbols
+
+	set prefix "error in serialization:"
+	if {[llength $value] != 3} {
+	    return -code error "$prefix list length not 3"
+	}
+
+	struct::list assign $value   stype symbols statedata
+
+	if {$stype ne "grammar::fa"} {
+	    return -code error "$prefix unknown type \"$stype\""
+	}
+	if {[struct::set contains $symbols ""]} {
+	    return -code error "$prefix empty symbol is not legal"
+	}
+
+	if {[llength $statedata] % 2 == 1} {
+	    return -code error "$prefix state data is not a dictionary"
+	}
+	array set _states $statedata
+	if {[llength $statedata] != (2*[array size _states])} {
+	    return -code error "$prefix state data contains duplicate states"
+	}
+	set startstates {}
+	set sts {}
+	set p   {}
+	set a   {}
+	set e   {}
+	set l   {}
+	set m   {}
+	set t   {}
+	foreach {k v} $statedata {
+	    lappend sts $k
+	    if {[llength $v] != 3} {
+		return -code error "$prefix state list length not 3"
+	    }
+
+	    struct::list assign $v begin accept trans
+
+	    if {![string is boolean -strict $begin]} {
+		return -code error "$prefix expected boolean for start, got \"$begin\""
+	    }
+	    if {$begin} {lappend startstates $k}
+	    if {![string is boolean -strict $accept]} {
+		return -code error "$prefix expected boolean for final, got \"$accept\""
+	    }
+	    if {$accept} {lappend a $k}
+
+	    if {[llength $trans] % 2 == 1} {
+		return -code error "$prefix transition data is not a dictionary"
+	    }
+	    array set _trans $trans
+	    if {[llength $trans] != (2*[array size _trans])} {
+		return -code error "$prefix transition data contains duplicate symbols"
+	    }
+	    unset _trans
+
+	    foreach {sym destinations} $trans {
+		# destinations = list of state
+		if {($sym ne "") && ![struct::set contains $symbols $sym]} {
+		    return -code error "$prefix illegal symbol \"$sym\" in transition"
+		}
+		foreach dest $destinations {
+		    if {![info exists _states($dest)]} {
+			return -code error "$prefix illegal destination state \"$dest\""
+		    }
+		    lappend t $k $sym $dest
+		}
+	    }
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Type API implementation.
+
+    # ### ### ### ######### ######### #########
+    ## Type Internals.
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Initialization. Specify the container constructor command to use by
+## the operations package.
+
+::grammar::fa::op::constructor ::grammar::fa
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide grammar::fa 0.5
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/faop.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/faop.tcl
new file mode 100644
index 00000000..5c0804ea
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/faop.tcl
@@ -0,0 +1,1618 @@
+# -*- tcl -*-
+# Grammar / FA / Operations
+
+# ### ### ### ######### ######### #########
+## Package description
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require struct::list ; # Extended list operations.
+package require struct::set  ; # Extended set operations.
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+namespace eval ::grammar::fa::op {
+
+    # ### ### ### ######### ######### #########
+    ## API. Structure / Language / Compilation
+
+    proc reverse     {fa} {}
+    proc complete    {fa {sink {}}} {}
+    proc remove_eps  {fa} {}
+    proc trim        {fa {what !reachable|!useful}} {}
+    proc determinize {fa {mapvar {}} {idstart 0}} {}
+    proc minimize    {fa {mapvar {}}} {}
+
+    proc complement  {fa} {}
+    proc kleene      {fa} {}
+    proc optional    {fa} {}
+    proc union       {fa fb {mapvar {}}} {}
+    proc intersect   {fa fb {mapvar {}} {idstart 0}} {}
+    proc difference  {fa fb {mapvar {}}} {}
+    proc concatenate {fa fb {mapvar {}}} {}
+
+    proc fromRegex   {fa regex {over {}}} {}
+
+    proc toRegexp    {fa} {}
+    proc toRegexp2   {fa} {}
+
+    proc simplifyRegexp {rex} {}
+    proc toTclRegexp    {rex symdict} {}
+
+    # ### ### ### ######### ######### #########
+
+    namespace export reverse complete remove_eps trim \
+	    determinize minimize complement kleene \
+	    optional union intersect difference \
+	    concatenate fromRegex toRegexp toRegexp2 \
+	    simplifyRegexp toTclRegexp
+
+    # ### ### ### ######### ######### #########
+    ## Internal data structures.
+
+    variable cons {}
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## API implementation. Structure
+
+proc ::grammar::fa::op::reverse {fa} {
+    # Reversal means that all transitions change their direction
+    # and start and final states are swapped.
+
+    # Note that reversed FA might not be deterministic, even if the FA
+    # itself was.
+
+    # One loop is not enough for this. If we reverse the
+    # transitions for a state immediately we may modify a state
+    # which has not been processed yet. And when we come to this
+    # state we reverse already reversed transitions, creating a
+    # complete mess. Thus two loops, one to collect the current
+    # transitions (and also remove them), and a second to insert
+    # the reversed transitions.
+
+    set tmp [$fa finalstates]
+    $fa final set [$fa startstates]
+    $fa start set $tmp
+
+    # FUTURE : Method to retrieve all transitions
+    # FUTURE : Method to delete all transitions
+
+    set trans {}
+    foreach s [$fa states] {
+	foreach sym [$fa symbols@ $s] {
+	    lappend trans $s $sym [$fa next $s $sym]
+	    $fa !next $s $sym
+	}
+    }
+    foreach {s sym destinations} $trans {
+	foreach d $destinations {
+	    $fa next $d $sym --> $s
+	}
+    }
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::complete {fa {sink {}}} {
+    if {[$fa is complete]} return
+
+    # We have an incomplete FA.
+
+    if {$sink eq ""} {
+	set sink [FindNewState $fa sink]
+    } elseif {[$fa state exists $sink]} {
+	return -code error "The chosen sink state exists already"
+    }
+    $fa state add $sink
+
+    # Add transitions to it from all states which are not
+    # complete. The sink state itself loops on all inputs. IOW it is a
+    # non-useful state.
+
+    set symbols [$fa symbols]
+    foreach sym $symbols {
+	$fa next $sink $sym --> $sink  
+    }
+
+    if {[$fa is epsilon-free]} {
+	foreach s [$fa states] {
+	    foreach missing [struct::set difference \
+		    $symbols \
+		    [$fa symbols@ $s]] {
+		$fa next $s $missing --> $sink
+	    }
+	}
+    } else {
+	# For an FA with epsilon-transitions we cannot simply look at
+	# the direct transitions to find the used symbols. We have to
+	# determine this for the epsilon-closure of the state in
+	# question. Oh, and we have to defer actually adding the
+	# transitions after we have picked them all, or otherwise the
+	# newly added transitions throw the symbol calculations for
+	# epsilon closures off.
+
+	set new {}
+	foreach s [$fa states] {
+	    foreach missing [struct::set difference \
+		    $symbols \
+		    [$fa symbols@set [$fa epsilon_closure $s]]] {
+		lappend new $s $missing
+	    }
+	}
+
+	foreach {s missing} $new {
+	    $fa next $s $missing --> $sink
+	}
+    }
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::remove_eps {fa} {
+    # We eliminate all epsilon transitions by duplicating a number
+    # of regular transitions, which we get through the epsilon
+    # closure of the states having epsilon transitions. We do
+    # nothing if the FA is epsilon free to begin with.
+
+    if {[$fa is epsilon-free]} return
+
+    # Note: Epsilon transitions touching start and final states
+    # propagate the start markers forward and final markers
+    # backward. We do this first by propagating start markers twice,
+    # once with a reversed FA. This also gives us some
+    # epsilon-closures as well.
+
+    foreach n {1 2} {
+	foreach s [$fa startstates] {
+	    foreach e [$fa epsilon_closure $s] {
+		$fa start add $e
+	    }
+	}
+	reverse $fa
+    }
+
+    # Now duplicate all transitions which are followed or preceeded by
+    # epsilon transitions of any number greater than zero.
+
+    # Note: The closure computations done by the FA are cached in the
+    # FA, so doing it multiple times is no big penalty.
+
+    # FUTURE : Retrieve all transitions on one command.
+
+    # FUTURE : Different algorithm ...
+    # Retrieve non-eps transitions for all states ...
+    # Iterate this list. Compute e-closures for endpoints, cache
+    # them. Duplicate the transition if needed, in that case add it to
+    # the end of the list, for possible more duplication (may touch
+    # different e-closures). Stop when the list is empty again.
+
+    set changed 1
+    while {$changed} {
+	set changed 0
+	foreach s [$fa states] {
+	    foreach sym [$fa symbols@ $s] {
+		set dest [$fa next $s $sym]
+		if {$sym eq ""} {
+		    # Epsilon transitions.
+
+		    # Get the closure, and duplicate all transitions for all
+		    # non-empty symbols as transitions of the original state.
+		    # This may lead to parallel transitions between states, hence
+		    # the catch. It prevents the generated error from stopping the
+		    # action, and no actual parallel transitions are created.
+
+		    set clos [$fa epsilon_closure $s]
+		    foreach csym [$fa symbols@set $clos] {
+			if {$csym eq ""} continue
+			foreach d [$fa nextset $clos $csym] {
+			    if {![catch {$fa next $s $csym --> $d} msg]} {
+				set changed 1
+			    }
+			}
+		    }
+		} else {
+		    # Regular transition. Go through all destination
+		    # states, compute their closures and replicate the
+		    # transition if the closure contains more than the
+		    # destination itself, to all states in the closure.
+
+		    foreach d $dest {
+			set clos [$fa epsilon_closure $d]
+			if {[llength $clos] > 1} {
+			    foreach e $clos {
+				if {![catch {$fa next $s $sym --> $e}]} {
+				    set changed 1
+				}
+			    }
+			}
+		    }
+		}
+	    }
+	}
+    }
+
+    # At last, drop the epsilons for all states. Only now is this
+    # possible because otherwise we might compute bad epsilon
+    # closures in the previous loop.
+
+    foreach s [$fa states] {
+	$fa !next $s ""
+    }
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::trim {fa {what !reachable|!useful}} {
+    # Remove various unwanted pices from the FA.
+
+    switch -exact -- $what {
+	!reachable {
+	    set remove [$fa unreachable_states]
+	}
+	!useful {
+	    set remove [$fa unuseful_states]
+	}
+	!reachable&!useful -
+	!(reachable|useful) {
+	    set remove [struct::set intersect [$fa unreachable_states] [$fa unuseful_states]]
+	}
+	!reachable|!useful -
+	!(reachable&useful) {
+	    set remove [struct::set union [$fa unreachable_states] [$fa unuseful_states]]
+	}
+	default {
+	    return -code error "Expected !reachable, !useful, !reachable&!useful, !(reachable|useful), !reachable|!useful, or !(reachable&useful), got \"$what\""
+	}
+    }
+
+    foreach s $remove {
+	$fa state delete $s
+    }
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::determinize {fa {mapvar {}} {idstart 0}} {
+    # We do the operation in several stages instead of jumping
+    # directly in the subset construction. Basically we try the less
+    # expensive operations first to see if they are enough. It does
+    # help that they will us also bring nearer to the ultimate goal
+    # even if they are not enough.
+
+    set hasmap 0
+    if {$mapvar ne ""} {
+	upvar 1 $mapvar map ; set hasmap 1
+    }
+
+    # First, is the input already deterministic ?
+    # There is nothing to do in that case.
+
+    if {[$fa is deterministic]} {
+	if {$hasmap} {set map {}}
+	return
+    }
+
+    # Second, trim unreachable and unuseables. We are done if only
+    # they carried the non-determinism. Otherwise we might have made
+    # the FA smaller and was less time consuming to convert.
+
+    if {[llength [$fa startstates]]} {trim $fa !reachable}
+    if {[llength [$fa finalstates]]} {trim $fa !useful}
+    if {[$fa is deterministic]} {
+	if {$hasmap} {set map {}}
+	return
+    }
+
+    # Third, remove any epsilon transitions, and stop if that was
+    # enough. Of course, weed out again states which have become
+    # irrelevant. The removal of the epsilons will at least ensure
+    # that the subset construction won't have to deal with
+    # closures. I.e. simpler.
+
+    remove_eps $fa
+    if {[llength [$fa startstates]]} {trim $fa !reachable}
+    if {[llength [$fa finalstates]]} {trim $fa !useful}
+    if {[$fa is deterministic]} {
+	if {$hasmap} {set map {}}
+	return
+    }
+
+    # Fourth. There is no way to avoid the subset construction.
+    # Dive in. This is the only part of the algorithm which requires
+    # us to keep a map. We construct the dfa in a transient container
+    # and copy the result back to fa when completed.
+
+    array set subsets {}
+    set id      $idstart
+    set pending {}
+    set dfa [[cons] %AUTO%]
+    # FUTURE : $dfa symbol set [$fa symbols]
+    foreach sym [$fa symbols] {$dfa symbol add $sym}
+
+    # If we have start states we can initialize the algorithm with
+    # their set. Otherwise we have to the single-element sets of all
+    # states as the beginning.
+
+    set starts [$fa startstates]
+    if {[llength $starts] > 0} {
+	# Make the set of start states the initial stae of the result.
+
+	set starts [lsort $starts] ; # Sort to get canonical form.
+	$dfa state add $id
+	$dfa start add $id
+
+	# The start may also be a final state
+	if {[$fa final?set $starts]} {
+	    $dfa final add $id
+	}
+
+	set subsets(dfa,$starts) $id
+	set subsets(nfa,$id) $starts
+	
+	lappend pending $id
+	incr id
+    } else {
+	# Convert all states of the input into sets (of one element)
+	# in the output. Do not forget to mark all final states we
+	# come by. No start states, otherwise we wouldn't be here.
+
+	foreach s [$fa states] {
+	    set nfaset [list $s]
+
+	    $dfa state add $id
+	    if {[$fa final? $s]} {
+		$dfa final add $id
+	    }
+
+	    set subsets(dfa,$nfaset) $id
+	    set subsets(nfa,$id) $nfaset
+	    lappend pending $id
+	    incr id
+	}
+    }
+
+    while {[llength $pending]} {
+	set dfastate [struct::list shift pending]
+
+	# We have to compute the transition function for this dfa state.
+
+	set nfaset $subsets(nfa,$dfastate)
+
+	foreach sym [$fa symbols@set $nfaset] {
+	    set nfanext [lsort [$fa nextset $nfaset $sym]]
+
+	    if {![info exists subsets(dfa,$nfanext)]} {
+		# Unknown destination. Add it as a new state.
+
+		$dfa state add $id
+		if {[$fa final?set $nfanext]} {
+		    $dfa final add $id
+		}
+
+		set subsets(dfa,$nfanext) $id
+		set subsets(nfa,$id) $nfanext
+
+		# Schedule the calculation of the transition function
+		# of the new state.
+
+		lappend pending $id
+		incr id
+	    }
+
+	    # Add the transition
+	    $dfa next $dfastate $sym --> $subsets(dfa,$nfanext)
+	}
+    }
+
+    if {[llength [$fa startstates]]} {trim $fa !reachable}
+    if {[llength [$fa finalstates]]} {trim $fa !useful}
+
+    if {$hasmap} {
+	# The map is from new dfa states to the sets of nfa states.
+
+	set map {}
+	foreach s [$dfa states] {
+	    lappend map $s $subsets(nfa,$s)
+	}
+    }
+
+    $fa = $dfa
+    $dfa destroy
+
+    # ASSERT : $fa is deterministic
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::minimize {fa {mapvar {}}} {
+    # Brzozowski's method:
+    # Reverse, determinize, reverse again, determinize again.
+
+    reverse     $fa
+    determinize $fa mapa
+    reverse     $fa
+    determinize $fa mapb
+
+    if {$mapvar ne ""} {
+	upvar 1 $mapvar map
+
+	if {![llength $mapa] && ![llength $mapb]} {
+	    # No state reorganizations, signal up
+	    set map {}
+	} elseif {[llength $mapa] && ![llength $mapb]} {
+	    # Only one reorg, this is the combined reorg as well.
+	    set map $mapa
+	} elseif {![llength $mapa] && [llength $mapb]} {
+	    # Only one reorg, this is the combined reorg as well.
+	    set map $mapb
+	} else {
+	    # Two reorgs. Compose the maps into the final map signaled
+	    # up.
+
+	    # mapb : final state -> set of states in mapa -> sets of original states.
+
+	    set map {}
+	    array set tmp $mapa
+	    foreach {b aset} $mapb {
+		set compose {}
+		foreach a $aset {foreach o $tmp($a) {lappend compose $o}}
+		lappend map $b [lsort -uniq $compose]
+	    }
+	}
+    }
+
+    # The FA is implicitly trimmed by the determinize's.
+    return
+}
+
+# ### ### ### ######### ######### #########
+## API implementation. Language.
+
+proc ::grammar::fa::op::complement {fa} {
+    # Complementing is possible if and only if the FA is complete,
+    # and accomplished by swapping the final and non-final states.
+
+    if {![$fa is complete]} {
+	return -code error "Unable to complement incomplete FA"
+    }
+    if {![$fa is deterministic]} {
+	return -code error "Unable to complement non-deterministic FA"
+    }
+
+    set newfinal [struct::set difference [$fa states] [$fa finalstates]]
+    $fa final set $newfinal
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::kleene {fa} {
+    # The Kleene Closure of the FA makes no sense if we don't have
+    # start and final states we can work from.
+
+    set start [$fa startstates]
+    set final [$fa finalstates]
+
+    if {![llength $start] || ![llength $final]} {
+	return -code error "Unable to add Kleene's closure to a FA without start/final states"
+    }
+
+    # FUTURE :: If final states have no outgoing transitions, and start
+    # FUTURE :: states have no input transitions, then place the new
+    # FUTURE :: transitions directly between start and final
+    # FUTURE :: states. In that case we don't need new states.
+
+    # We need new start/final states, like for optional (see below)
+
+    set ns [NewState $fa s]
+    set nf [NewState $fa f]
+
+    foreach s $start {$fa next $ns "" --> $s}
+    foreach f $final {$fa next $f  "" --> $nf}
+
+    $fa start clear ; $fa start add $ns
+    $fa final clear ; $fa final add $nf
+
+    $fa next $ns "" --> $nf ; # Optionality
+    $fa next $nf "" --> $ns ; # Loop for closure
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::optional {fa} {
+    # The Optionality of the FA makes no sense if we don't have
+    # start and final states we can work from.
+
+    set start [$fa startstates]
+    set final [$fa finalstates]
+
+    if {![llength $start] || ![llength $final]} {
+	return -code error "Unable to make a FA without start/final states optional"
+    }
+
+    # We have to introduce new start and final states to ensure
+    # that we do not get additional recognized words from the FA
+    # due to epsilon transitions. IOW just placing epsilons from
+    # all start to all final states is wrong. Consider unreachable
+    # final states, they become reachable. Or final states able to
+    # reach final states from. Again the epsilons would extend the
+    # language. We have to detach our optional epsilon from anything
+    # in the existing start/final states. Hence the new start/final.
+
+    # FUTURE : Recognize if there are no problems with placing direct
+    # FUTURE : epsilons from start to final.
+
+    set ns [NewState $fa s]
+    set nf [NewState $fa f]
+
+    foreach s $start {$fa next $ns "" --> $s}
+    foreach f $final {$fa next $f  "" --> $nf}
+
+    $fa start clear ; $fa start add $ns
+    $fa final clear ; $fa final add $nf
+
+    $fa next $ns "" --> $nf ; # This is the transition which creates the optionality.
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::union {fa fb {mapvar {}}} {
+    # We union the input symbols, then add the states and
+    # transitions of the second FA to the first, adding in
+    # epsilons for the start and final states as well. When
+    # adding states we make sure that the new states do not
+    # intersect with the existing states.
+
+    struct::list assign \
+	    [MergePrepare $fa $fb union smap] \
+	    astart afinal bstart bfinal
+
+    if {$mapvar ne ""} {
+	upvar 1 $mapvar map
+	set map $smap
+    }
+
+    # And now the new start & final states
+
+    set ns [NewState $fa s]
+    set nf [NewState $fa f]
+
+    eLink1N $fa $ns $astart
+    eLink1N $fa $ns $bstart
+
+    eLinkN1 $fa $afinal $nf
+    eLinkN1 $fa $bfinal $nf
+
+    $fa start clear ; $fa start add $ns
+    $fa final clear ; $fa final add $nf
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::intersect {fa fb {mapvar {}} {idstart 0}} {
+    # Intersection has to run the two automata in parallel, using
+    # paired states. If we have start states we begin the
+    # construction with them. This leads to a smaller result as we
+    # do not have create a full cross-crossproduct. The latter is
+    # unfortunately required if there are no start states.
+
+    struct::list assign [CrossPrepare $fa $fb intersection] tmp res
+
+    # The start states of the new FA consist of the cross-product of
+    # the start states of fa with fb. These are also the states used
+    # to seed DoCross.
+
+    set id $idstart
+    set smap {}
+    set bstart [$tmp startstates]
+    foreach a [$fa startstates] {
+	foreach b $bstart {
+	    set pair [list $a $b]
+	    lappend smap    $id $pair
+	    lappend pending $pair $id
+	    $res state add $id
+	    $res start add $id
+	    incr id
+	}
+    }
+
+    set cp [DoCross $fa $tmp $res $id $pending smap]
+
+    foreach {id pair} $smap {
+	struct::list assign $pair a b
+	if {[$fa final? $a] && [$tmp final? $b]} {
+	    $res final add $id
+	}
+    }
+
+    # Remove excess states (generated because of the sinks).
+    trim $res
+    if {$mapvar ne ""} {
+	upvar 1 $mapvar map
+	# The loop is required to filter out the mappings for all
+	# states which were trimmed off.
+	set map {}
+	foreach {id pair} $smap {
+	    if {![$res state exists $id]} continue
+	    lappend map $id $pair
+	}
+    }
+
+    # Copy result into permanent storage and delete all intermediaries
+    $fa = $res
+    $res destroy
+    if {$tmp ne $fb} {$tmp destroy}
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::difference {fa fb {mapvar {}}} {
+    # Difference has to run the two automata in parallel, using
+    # paired states. Only the final states are defined differently
+    # than for intersection. It has to be final in fa and _not_ final
+    # in fb to be a final state of the result. <=> Accepted by A, but
+    # not B, to be in the difference.
+
+    struct::list assign [CrossPrepare $fa $fb difference] tmp res
+
+    # The start states of the new FA consist of the cross-product of
+    # the start states of fa with fb. These are also the states used
+    # to seed DoCross.
+
+    set id 0
+    set smap {}
+    set bstart [$tmp startstates]
+    foreach a [$fa startstates] {
+	foreach b $bstart {
+	    set pair [list $a $b]
+	    lappend smap    $id $pair
+	    lappend pending $pair $id
+	    $res state add $id
+	    $res start add $id
+	    incr id
+	}
+    }
+
+    set cp [DoCross $fa $tmp $res $id $pending smap]
+
+    foreach {id pair} $smap {
+	struct::list assign $pair a b
+	if {[$fa final? $a] && ![$tmp final? $b]} {
+	    $res final add $id
+	}
+    }
+
+    # Remove excess states (generated because of the sinks).
+    trim $res
+    if {$mapvar ne ""} {
+	upvar 1 $mapvar map
+	# The loop is required to filter out the mappings for all
+	# states which were trimmed off.
+	set map {}
+	foreach {id pair} $smap {
+	    if {![$res state exists $id]} continue
+	    lappend map $id $pair
+	}
+    }
+
+    # Copy result into permanent storage and delete all intermediaries
+    $fa = $res
+    $res destroy
+    if {$tmp ne $fb} {$tmp destroy}
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::concatenate {fa fb {mapvar {}}} {
+    # Like union, only the interconnect between existing and new FA is different.
+
+    struct::list assign \
+	    [MergePrepare $fa $fb concatenate smap] \
+	    astart afinal bstart bfinal
+
+    if {$mapvar ne ""} {
+	upvar 1 $mapvar map
+	set map $smap
+    }
+
+    set ns [NewState $fa s]
+    set nm [NewState $fa m] ;# Midpoint.
+    set nf [NewState $fa f]
+
+    eLink1N $fa $ns $astart
+    eLinkN1 $fa $afinal $nm
+
+    eLink1N $fa $nm $bstart
+    eLinkN1 $fa $bfinal $nf
+
+    $fa start clear ; $fa start add $ns
+    $fa final clear ; $fa final add $nf
+    return
+}
+
+# ### ### ### ######### ######### #########
+## API implementation. Compilation (regexp -> FA).
+
+proc ::grammar::fa::op::fromRegex {fa regex {over {}}} {
+    # Convert a regular expression into a FA. The regex is given as
+    # parse tree in the form of a nested list.
+
+    # {. A B ...} ... Concatenation (accepts zero|one arguments).
+    # {| A B ...} ... Alternatives  (accepts zero|one arguments).
+    # {? A}       ... Optional.
+    # {* A}       ... Kleene.
+    # {+ A}       ... Pos.Kleene.
+    # {! A}       ... Complement/Negation.
+    # {S Symbol}  ... Atom, Symbol
+    #
+    # Recursive descent with a helper ...
+
+    if {![llength $regex]} {
+	$fa clear
+	return
+    }
+
+    set tmp [[cons] %AUTO%]
+
+    if {![llength $over]} {
+	set over [lsort -uniq [RESymbols $regex]]
+    }
+    foreach sym $over {
+	$tmp symbol add $sym
+    }
+
+    set id 0
+    struct::list assign [Regex $tmp $regex id] s f
+    $tmp start set [list $s]
+    $tmp final set [list $f]
+
+    $fa = $tmp
+    $tmp destroy
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal helpers.
+
+proc ::grammar::fa::op::RESymbols {regex} {
+    set cmd [lindex $regex 0]
+    switch -exact -- $cmd {
+	? - * - ! - + {
+	    return [RESymbols [lindex $regex 1]]
+	}
+	. - | - & {
+	    set res {}
+	    foreach sub [lrange $regex 1 end] {
+		foreach sym [RESymbols $sub] {lappend res $sym}
+	    }
+	    return $res
+	}
+	S {
+	    return [list [lindex $regex 1]]
+	}
+	default {
+	    return -code error "Expected . ! ? * | &, or S, got \"$cmd\""
+	}
+    }
+}
+
+proc ::grammar::fa::op::Regex {fa regex idvar} {
+    upvar 1 $idvar id
+    set cmd [lindex $regex 0]
+    switch -exact -- $cmd {
+	? {
+	    # Optional
+	    set a $id ; incr id ; $fa state add $a
+	    set b $id ; incr id ; $fa state add $b
+
+	    struct::list assign [Regex $fa [lindex $regex 1] id] s f
+	    $fa next $a "" --> $s
+	    $fa next $f "" --> $b
+	    $fa next $a "" --> $b
+	}
+	* {
+	    # Kleene
+	    set a $id ; incr id ; $fa state add $a
+	    set b $a
+
+	    struct::list assign [Regex $fa [lindex $regex 1] id] s f
+	    $fa next $a "" --> $s
+	    $fa next $f "" --> $a ;# == b
+	}
+	+ {
+	    # Pos. Kleene
+	    set a $id ; incr id ; $fa state add $a
+	    set b $id ; incr id ; $fa state add $b
+
+	    struct::list assign [Regex $fa [lindex $regex 1] id] s f
+	    $fa next $a "" --> $s
+	    $fa next $f "" --> $b
+	    $fa next $b "" --> $a
+	}
+	! {
+	    # Complement.
+	    # Build up in a temp FA, complement, and
+	    # merge nack into the current
+
+	    set a $id ; incr id ; $fa state add $a
+	    set b $id ; incr id ; $fa state add $b
+
+	    set tmp [[cons] %AUTO%]
+	    foreach sym [$fa symbols] {$tmp symbol add $sym}
+	    struct::list assign [Regex $tmp [lindex $regex 1] id] s f
+	    $tmp start add $s
+	    $tmp final add $f
+
+	    determinize $tmp {} $id
+	    incr id [llength [$tmp states]]
+	    if {![$tmp is complete]} {
+		complete    $tmp $id
+		incr id
+	    }
+	    complement  $tmp
+
+	    # Merge and link.
+	    $fa deserialize_merge [$tmp serialize]
+
+	    eLink1N $fa $a [$tmp startstates]
+	    eLinkN1 $fa [$tmp finalstates] $b
+	    $tmp destroy
+	}
+	& {
+	    # Intersection ... /And
+
+	    if {[llength $regex] < 3} {
+		# Optimized path. Intersection of one sub-expression
+		# is the sub-expression itself.
+
+		struct::list assign [Regex $fa [lindex $regex 1] id] a b
+	    } else {
+		set a $id ; incr id ; $fa state add $a
+		set b $id ; incr id ; $fa state add $b
+
+		set tmp [[cons] %AUTO%]
+		foreach sym [$fa symbols] {$tmp symbol add $sym}
+		set idsub 0
+		struct::list assign [Regex $tmp [lindex $regex 1] idsub] s f
+		$tmp start add $s
+		$tmp final add $f
+
+		set beta [[cons] %AUTO%]
+		foreach sub [lrange $regex 2 end] {
+		    foreach sym [$fa symbols] {$beta symbol add $sym}
+		    struct::list assign [Regex $beta $sub idsub] s f
+		    $beta start add $s
+		    $beta final add $f
+		    intersect $tmp $beta {} $id
+		}
+		$beta destroy
+		determinize $tmp {} $id
+		incr id [llength [$tmp states]]
+
+		# Merge and link.
+		$fa deserialize_merge [$tmp serialize]
+
+		eLink1N $fa $a [$tmp startstates]
+		eLinkN1 $fa [$tmp finalstates] $b
+		$tmp destroy
+	    }
+	}
+	. {
+	    # Concatenation ...
+
+	    if {[llength $regex] == 1} {
+		# Optimized path. No sub-expressions. This represents
+		# language containing only the empty string, aka
+		# epsilon.
+
+		set a $id ; incr id ; $fa state add $a
+		set b $id ; incr id ; $fa state add $b
+		$fa next $a "" --> $b
+
+	    } elseif {[llength $regex] == 2} {
+		# Optimized path. Concatenation of one sub-expression
+		# is the sub-expression itself.
+
+		struct::list assign [Regex $fa [lindex $regex 1] id] a b
+	    } else {
+		set first 1
+		set last {}
+		foreach sub [lrange $regex 1 end] {
+		    struct::list assign [Regex $fa $sub id] s f
+		    if {$first} {set first 0 ; set a $s}
+		    if {$last != {}} {
+			$fa next $last "" --> $s
+		    }
+		    set last $f
+		}
+		set b $f
+	    }
+	}
+	| {
+	    # Alternatives ... (Union)
+
+	    if {[llength $regex] == 1} {
+		# Optimized path. No sub-expressions. This represents
+		# the empty language, i.e. the language without words.
+
+		set a $id ; incr id ; $fa state add $a
+		set b $id ; incr id ; $fa state add $b
+
+	    } elseif {[llength $regex] == 2} {
+		# Optimized path. Choice/Union of one sub-expression
+		# is the sub-expression itself.
+
+		struct::list assign [Regex $fa [lindex $regex 1] id] a b
+	    } else {
+		set a $id ; incr id ; $fa state add $a
+		set b $id ; incr id ; $fa state add $b
+		foreach sub [lrange $regex 1 end] {
+		    struct::list assign [Regex $fa $sub id] s f
+		    $fa next $a "" --> $s
+		    $fa next $f "" --> $b
+		}
+	    }
+	}
+	S {
+	    # Atom, base transition.
+	    set sym [lindex $regex 1]
+	    set a $id ; incr id ; $fa state add $a
+	    set b $id ; incr id ; $fa state add $b
+	    $fa next $a $sym --> $b
+	}
+	default {
+	    return -code error "Expected . ! ? * | &, or S, got \"$cmd\""
+	}
+    }
+    return [list $a $b]
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::CrossPrepare {fa fb label} {
+    set starta [$fa startstates]
+    set finala [$fa finalstates]
+    set startb [$fb startstates]
+    set finalb [$fb finalstates]
+    if {
+	![llength $starta] || ![llength $finala] ||
+	![llength $startb] || ![llength $finalb]
+    } {
+	return -code error "Unable to perform the $label of two FAs without start/final states"
+    }
+
+    # The inputs are made complete over the union of their symbol
+    # sets. A temp. container is used for the second input if necessary.
+
+    set totals [struct::set union [$fa symbols] [$fb symbols]]
+    foreach sym [struct::set difference $totals [$fa symbols]] {
+	$fa symbol add $sym
+    }
+    if {![$fa is epsilon-free]} {
+	remove_eps $fa
+	trim       $fa
+    }
+    if {![$fa is complete]} {
+	complete $fa
+    }
+    set tmp $fb
+    set bnew [struct::set difference $totals [$fb symbols]]
+    if {[llength $bnew]} {
+	set tmp [[cons] %AUTO% = $fb]
+	foreach sym $bnew {
+	    $tmp symbol add $sym
+	}    
+    }
+    if {![$fb is epsilon-free]} {
+	if {$tmp eq $fb} {set tmp [[cons] %AUTO% = $fb]}
+	remove_eps $tmp
+	trim       $tmp
+    }
+    if {![$fb is complete]} {
+	if {$tmp eq $fb} {set tmp [[cons] %AUTO% = $fb]}
+	complete $tmp
+    }
+
+    set res [[cons] %AUTO%]
+    foreach sym $totals {
+	$res symbol add $sym
+    } 
+
+    return [list $tmp $res]
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::DoCross {fa fb res id seed smapvar} {
+    upvar 1 $smapvar smap
+
+    set symbols [$fa symbols]
+    array set tmp $seed
+
+    set pending $seed
+    while {[llength $pending]} {
+	set cpair [struct::list shift pending]
+	set cid   [struct::list shift pending]
+
+	struct::list assign $cpair a b
+
+	# ASSERT: /res state exists /cid
+
+	# Generate the transitions for the pair, add the resulting
+	# destinations to the FA, and schedule them for a visit if
+	# they are new.
+
+	foreach sym $symbols {
+	    set adestinations [$fa next $a $sym]
+	    set bdestinations [$fb next $b $sym]
+
+	    foreach ad $adestinations {
+		foreach bd $bdestinations {
+		    set dest [list $ad $bd]
+
+		    if {![info exists tmp($dest)]} {
+			$res state add $id
+			lappend smap $id $dest
+			lappend pending $dest $id
+			set tmp($dest) $id
+			incr id
+		    }
+		    $res next $cid $sym --> $tmp($dest)
+		}
+	    }
+	}
+    }
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::MergePrepare {fa fb label mapvar} {
+    upvar 1 $mapvar map
+
+    set starta [$fa startstates]
+    set finala [$fa finalstates]
+    set startb [$fb startstates]
+    set finalb [$fb finalstates]
+    if {
+	![llength $starta] || ![llength $finala] ||
+	![llength $startb] || ![llength $finalb]
+    } {
+	return -code error "Unable to $label FAs without start/final states"
+    }
+
+    # FUTURE: add {*}[symbols], ignore dup's
+    foreach sym [$fb symbols] {catch {$fa symbol add $sym}}
+
+    set dup [struct::set intersect [$fa states] [$fb states]]
+    if {![llength $dup]} {
+	# The states do not overlap. A plain merge of fb is enough to
+	# copy the information.
+
+	$fa deserialize_merge [$fb serialize]
+	set map {}
+    } else {
+	# We have duplicate states, therefore we have to remap fb to
+	# prevent interference between the two.
+
+	set map {}
+	set tmp [[cons] %AUTO% = $fb]
+	set id 0
+	foreach s $dup {
+	    # The renaming process has to ensure that the new name is
+	    # in neither fa, nor already in fb as well.
+	    while {
+		[$fa  state exists $id] ||
+		[$tmp state exists $id]
+	    } {incr id}
+	    $tmp state rename $s $id
+	    lappend map $id $s
+	    incr id
+	}
+
+	set startb [$tmp startstates]
+	set finalb [$tmp finalstates]
+
+	$fa deserialize_merge [$tmp serialize]
+	$tmp destroy
+    }
+
+    return [list $starta $finala $startb $finalb]
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::eLink1N {fa from states} {
+    foreach s $states {
+	$fa next $from "" --> $s
+    }
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::eLinkN1 {fa states to} {
+    foreach s $states {
+	$fa next $s "" --> $to
+    }
+    return
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::NewState {fa prefix} {
+    set newstate [FindNewState $fa $prefix]
+    $fa state add $newstate
+    return $newstate
+}
+
+# --- --- --- --------- --------- ---------
+
+proc ::grammar::fa::op::FindNewState {fa prefix} {
+    #if {![$fa state exists $prefix]} {return $prefix}
+    set n 0
+    while {[$fa state exists ${prefix}.$n]} {incr n}
+    return ${prefix}.$n
+}
+
+# ### ### ### ######### ######### #########
+## API implementation. Decompilation (FA -> regexp).
+
+proc ::grammar::fa::op::toRegexp {fa} {
+    # NOTE: FUTURE - Do not go through the serialization, nor through
+    # a matrix. The algorithm can be expressed more directly as
+    # operations on the automaton (states and transitions).
+
+    set ET [ser_to_ematrix [$fa serialize]]
+    while {[llength $ET] > 2} {
+	set ET [matrix_drop_state $ET]
+    }
+    return [lindex $ET 0 1]
+}
+
+proc ::grammar::fa::op::toRegexp2 {fa} {
+    # NOTE: FUTURE - See above.
+    set ET [ser_to_ematrix [$fa serialize]]
+    while {[llength $ET] > 2} {
+	set ET [matrix_drop_state $ET re2]
+    }
+    return [lindex $ET 0 1]
+}
+
+# ### ### ### ######### ######### #########
+## Internal helpers.
+
+proc ::grammar::fa::op::ser_to_ematrix {ser} {
+    if {[lindex $ser 0] ne "grammar::fa"} then {
+	error "Expected grammar::fa automaton serialisation"
+    }
+    set stateL {}
+    set n 2; foreach {state des} [lindex $ser 2] {
+	lappend stateL $state
+	set N($state) $n
+	incr n
+    }
+    set row0 {}
+    for {set k 0} {$k<$n} {incr k} {lappend row0 [list |]}
+    set res [list $row0 $row0]
+    foreach {from des} [lindex $ser 2] {
+	set row [lrange $row0 0 1]
+	if {[lindex $des 0]} then {lset res 0 $N($from) [list .]}
+	if {[lindex $des 1]} then {lset row 1 [list .]}
+	foreach to $stateL {set S($to) [list |]}
+	foreach {symbol targetL} [lindex $des 2] {
+	    if {$symbol eq ""} then {
+		set atom [list .]
+	    } else {
+		set atom [list S $symbol]
+	    }
+	    foreach to $targetL {lappend S($to) $atom}
+	}
+	foreach to $stateL {
+	    if {[llength $S($to)] == 2} then {
+		lappend row [lindex $S($to) 1]
+	    } else {
+		lappend row $S($to)
+	    }
+	}
+	lappend res $row
+    }
+    return $res
+}
+
+proc ::grammar::fa::op::matrix_drop_state {T_in {ns re1}} {
+    set sumcmd ${ns}::|
+    set prodcmd ${ns}::.
+    set T1 {}
+    set lastcol {}
+    foreach row $T_in {
+	lappend T1 [lreplace $row end end]
+	lappend lastcol [lindex $row end]
+    }
+    set lastrow [lindex $T1 end]
+    set T1 [lreplace $T1 end end]
+    set b [${ns}::* [lindex $lastcol end]]
+    set lastcol [lreplace $lastcol end end]
+    set res {}
+    foreach row $T1 a $lastcol {
+	set newrow {}
+	foreach pos $row c $lastrow {
+	    lappend newrow [$sumcmd $pos [$prodcmd $a $b $c]]
+	}
+	lappend res $newrow
+    }
+    return $res
+}
+
+# ### ### ### ######### ######### #########
+## Internal helpers. Regexp simplification I.
+
+namespace eval ::grammar::fa::op::re1 {
+    namespace export | . {\*}
+}
+
+proc ::grammar::fa::op::re1::| {args} {
+    set L {}
+
+    # | = Choices.
+    # Sub-choices are lifted into the top expression (foreach).
+    # Identical choices are reduced to a single term (lsort -uniq).
+
+    foreach re $args {
+	switch -- [lindex $re 0] "|" {
+	    foreach term [lrange $re 1 end] {lappend L $term}
+	} default {
+	    lappend L $re
+	}
+    }
+    set L [lsort -unique $L]
+    if {[llength $L] == 1} then {
+	return [lindex $L 0]
+    } else {
+	return [linsert $L 0 |]
+    }
+}
+
+proc ::grammar::fa::op::re1::. {args} {
+    set L {}
+
+    # . = Sequence.
+    # One element sub-choices are lifted into the top expression.
+    # Sub-sequences are lifted into the top expression.
+
+    foreach re $args {
+	switch -- [lindex $re 0] "." {
+	    foreach term [lrange $re 1 end] {lappend L $term}
+	} "|" {
+	    if {[llength $re] == 1} then {return $re}
+	    lappend L $re
+	} default {
+	    lappend L $re
+	}
+    }
+    if {[llength $L] == 1} then {
+	return [lindex $L 0]
+    } else {
+	return [linsert $L 0 .]
+    }
+}
+
+proc ::grammar::fa::op::re1::* {re} {
+    # * = Kleene closure.
+    # Sub-closures are lifted into the top expression.
+    # One-element sub-(choices,sequences) are lifted into the top expression.
+
+    switch -- [lindex $re 0] "|" - "." {
+	if {[llength $re] == 1} then {
+	    return [list .]
+	} else {
+	    return [list * $re]
+	}
+    } "*" {
+	return $re
+    } default {
+	return [list * $re]
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Internal helpers. Regexp simplification II.
+
+namespace eval ::grammar::fa::op::re2 {
+    # Inherit choices and kleene-closure from the basic simplifier.
+
+    namespace import [namespace parent]::re1::|
+    namespace import [namespace parent]::re1::\\*
+}
+
+proc ::grammar::fa::op::re2::. {args} {
+
+    # . = Sequences
+    # Sub-sequences are lifted into the top expression.
+    # Sub-choices are multiplied out.
+    # <Example a(b|c) => ab|ac >
+
+    set L {}
+    set n -1
+    foreach re $args {
+	incr n
+	switch -- [lindex $re 0] "." {
+	    foreach term [lrange $re 1 end] {lappend L $term}
+	} "|" {
+	    set res [list |]
+	    set L2 [lreplace $args 0 $n]
+	    foreach term [lrange $re 1 end] {
+		lappend res [eval [list .] $L [list $term] $L2]
+	    }
+	    return [eval $res]
+	} default {
+	    lappend L $re
+	}
+    }
+    if {[llength $L] == 1} then {
+	return [lindex $L 0]
+    } else {
+	return [linsert $L 0 .]
+    }
+}
+
+# ### ### ### ######### ######### #########
+## API. Simplification of regular expressions.
+
+proc ::grammar::fa::op::simplifyRegexp {RE0} {
+    set RE1 [namespace inscope nonnull $RE0]
+    if {[lindex $RE1 0] eq "S" || $RE1 eq "." || $RE1 eq "|"} then {
+	return $RE1
+    }
+    set tmp [grammar::fa %AUTO% fromRegex $RE1]
+    $tmp minimize
+    set RE1 [toRegexp $tmp]
+    $tmp destroy
+    if {[string length $RE1] < [string length $RE0]} then {
+	set RE0 $RE1
+    }
+    if {[lindex $RE0 0] eq "S"} then {return $RE0}
+    set res [lrange $RE0 0 0]
+    foreach branch [lrange $RE0 1 end] {
+	lappend res [simplifyRegexp $branch]
+    }
+    return $res
+}
+
+# ### ### ### ######### ######### #########
+## Internal helpers.
+
+namespace eval ::grammar::fa::op::nonnull {}
+
+proc ::grammar::fa::op::nonnull::| {args} {
+    set also_empty false
+    set res [list |]
+    foreach branch $args {
+	set RE [eval $branch]
+	if {[lindex $RE 0] eq "?"} then {
+	    set also_empty true
+	    set RE [lindex $RE 1]
+	}
+	switch -- [lindex $RE 0] "|" {
+	    eval [lreplace $RE 0 0 lappend res]
+	} "." {
+	    if {[llength $RE] == 1} then {
+		set also_empty true
+	    } else {
+		lappend res $RE
+	    }
+	} default {
+	    lappend res $RE
+	}
+    }
+    if {!$also_empty} then {return $res}
+    foreach branch [lrange $res 1 end] {
+	if {[lindex $branch 0] eq "*"} then {return $res}
+    }
+    if {[llength $res] == 1} then {
+	return [list .]
+    } elseif {[llength $res] == 2} then {
+	return [lreplace $res 0 0 ?]
+    } else {
+	return [list ? $res]
+    }
+}
+
+proc ::grammar::fa::op::nonnull::. {args} {
+    set res [list .]
+    foreach branch $args {
+	set RE [eval $branch]
+	switch -- [lindex $RE 0] "|" {
+	    if {[llength $RE] == 1} then {return $RE}
+	    lappend res $RE
+	} "." {
+	    eval [lreplace $RE 0 0 lappend res]
+	} default {
+	    lappend res $RE
+	}
+    }
+    return $res
+}
+
+proc ::grammar::fa::op::nonnull::* {sub} {
+    set RE [eval $sub]
+    switch -- [lindex $RE 0] "*" - "?" - "+" {
+	return [lreplace $RE 0 0 *]
+    } default {
+	return [list * $RE]
+    }
+}
+
+proc ::grammar::fa::op::nonnull::+ {sub} {
+    set RE [eval $sub]
+    switch -- [lindex $RE 0] "+" {
+	return $RE
+    } "*" - "?" {
+	return [lreplace $RE 0 0 *]
+    } default {
+	return [list * $RE]
+    }
+}
+
+proc ::grammar::fa::op::nonnull::? {sub} {
+    set RE [eval $sub]
+    switch -- [lindex $RE 0] "?" - "*" {
+	return $RE
+    } "+" {
+	return [lreplace $RE 0 0 *]
+    } default {
+	return [list ? $RE]
+    }
+}
+
+proc ::grammar::fa::op::nonnull::S {name} {
+    return [list S $name]
+}
+
+# ### ### ### ######### ######### #########
+## API. Translate RE of this package to Tcl REs
+
+proc ::grammar::fa::op::toTclRegexp {re symdict} {
+    return [lindex [namespace inscope tclre $re $symdict] 1]
+}
+
+# ### ### ### ######### ######### #########
+## Internal helpers.
+
+namespace eval ::grammar::fa::op::tclre {}
+
+proc ::grammar::fa::op::tclre::S {name dict} {
+    array set A $dict
+    if {[info exists A($name)]} then {
+	return $A($name)
+    } elseif {[string length $name] == 1} then {
+	if {[regexp {[\\\[\]{}.()*+?^$]} $name]} then {
+	    return [list char \\$name]
+	} else {
+	    return [list char $name]
+	}
+    } else {
+	return [list class "\[\[:${name}:\]\]"]
+    }
+}
+
+proc ::grammar::fa::op::tclre::. {args} {
+    set suffix [lrange $args end end]
+    set L {}
+    foreach factor [lrange $args 0 end-1] {
+	set pair [eval $factor $suffix]
+	switch -- [lindex $pair 0] "sum" {
+	    lappend L ([lindex $pair 1])
+	} default {
+	    lappend L [lindex $pair 1]
+	}
+    }
+    return [list prod [join $L ""]]
+}
+
+proc ::grammar::fa::op::tclre::* {re dict} {
+    set pair [eval $re [list $dict]]
+    switch -- [lindex $pair 0] "sum" - "prod" {
+	return [list prod "([lindex $pair 1])*"]
+    } default {
+	return [list prod "[lindex $pair 1]*"]
+    }
+}
+
+proc ::grammar::fa::op::tclre::+ {re dict} {
+    set pair [eval $re [list $dict]]
+    switch -- [lindex $pair 0] "sum" - "prod" {
+	return [list prod "([lindex $pair 1])+"]
+    } default {
+	return [list prod "[lindex $pair 1]+"]
+    }
+}
+
+proc ::grammar::fa::op::tclre::? {re dict} {
+    set pair [eval $re [list $dict]]
+    switch -- [lindex $pair 0] "sum" - "prod" {
+	return [list prod "([lindex $pair 1])?"]
+    } default {
+	return [list prod "[lindex $pair 1]?"]
+    }
+}
+
+proc ::grammar::fa::op::tclre::| {args} {
+    set suffix [lrange $args end end]
+    set charL {}
+    set classL {}
+    set prodL {}
+    foreach factor [lrange $args 0 end-1] {
+	set pair [eval $factor $suffix]
+	switch -- [lindex $pair 0] "char" {
+	    lappend charL [lindex $pair 1]
+	} "class" {
+	    lappend classL [string range [lindex $pair 1] 1 end-1]
+	} default {
+	    lappend prodL [lindex $pair 1]
+	}
+    }
+    if {[llength $charL]>1 || [llength $classL]>0} then {
+	while {[set n [lsearch $charL -]] >= 0} {
+	    lset charL $n {\-}
+	}
+	set bracket "\[[join $charL ""][join $classL ""]\]"
+	if {![llength $prodL]} then {
+	    return [list atom $bracket]
+	}
+	lappend prodL $bracket
+    } else {
+	eval [list lappend prodL] $charL
+    }
+    return [list sum [join $prodL |]]
+}
+
+proc ::grammar::fa::op::tclre::& {args} {
+    error "Cannot express language intersection in Tcl-RE's"
+
+    # Note: This can be translated by constructing an automaton for
+    # the intersection, and then translating its conversion to a
+    # regular expression.
+}
+
+proc ::grammar::fa::op::tclre::! {args} {
+    error "Cannot express language complementation in Tcl-RE's"
+
+    # Note: This can be translated by constructing an automaton for
+    # the complement, and then translating its conversion to a regular
+    # expression. This however requires knowledge regarding the set of
+    # symbols. Large (utf-8) for Tcl regexes.
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::grammar::fa::op::constructor {cmd} {
+    variable cons $cmd
+    return
+}
+
+proc ::grammar::fa::op::cons {} {
+    variable cons
+    if {$cons ne ""} {return $cons}
+    return -code error "No constructor for FA container was established."
+}
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide grammar::fa::op 0.4.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/pkgIndex.tcl
new file mode 100644
index 00000000..155fe7c6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_fa/pkgIndex.tcl
@@ -0,0 +1,6 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+
+package ifneeded grammar::fa            0.5   [list source [file join $dir fa.tcl]]
+package ifneeded grammar::fa::op        0.4.1 [list source [file join $dir faop.tcl]]
+package ifneeded grammar::fa::dacceptor 0.1.1 [list source [file join $dir dacceptor.tcl]]
+package ifneeded grammar::fa::dexec     0.2   [list source [file join $dir dexec.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/gasm.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/gasm.tcl
new file mode 100644
index 00000000..a42fd404
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/gasm.tcl
@@ -0,0 +1,207 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Package description
+
+## (struct::)Graph based ME Assembler, for use in grammar
+## translations.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+namespace eval grammar::me::cpu::gasm {}
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+proc ::grammar::me::cpu::gasm::begin {g n {mode okfail} {note {}}} {
+    variable    gas
+    array unset gas *
+
+    # (Re)initialize the assmebler state, create the framework nodes
+    # upon which we will hang all instructions on.
+
+    set         gas(mode) $mode
+    set         gas(node) $n
+    set         gas(grap) $g
+    array set   gas {last {} cond always}
+
+    Nop $note           ; /Label entry ; /Clear
+    if {$mode eq "okfail"} {
+	Nop Exit'OK     ; /Label exit/ok     ; /Clear
+	Nop Exit'FAIL   ; /Label exit/fail   ; /Clear
+    } elseif {$mode eq "halt"} {
+	Cmd icf_halt     ; /Label exit/return ; /Clear
+    } else {
+	Cmd icf_ntreturn ; /Label exit/return ; /Clear
+    }
+
+    /At entry
+    return
+}
+
+proc ::grammar::me::cpu::gasm::done {__ t} {
+    variable gas
+
+    # Save the framework nodes in a grammar tree and shut the
+    # assembler down.
+
+    $t set $gas(node) gas::entry $gas(_entry)
+
+    if {$gas(mode) eq "okfail"} {
+	$t set $gas(node) gas::exit::ok   $gas(_exit/ok)
+	$t set $gas(node) gas::exit::fail $gas(_exit/fail)
+    } else {
+	$t set $gas(node) gas::exit $gas(_exit/return)
+    }
+
+    # Remember the node in the grammar tree which is responsible for
+    # this entry point.
+
+    $gas(grap) node set $gas(_entry) expr $gas(node)
+
+    array unset gas *
+    return
+}
+
+proc ::grammar::me::cpu::gasm::lift {t dst __ src} {
+
+    $t set $dst gas::entry      [$t get $src gas::entry]
+    $t set $dst gas::exit::ok   [$t get $src gas::exit::ok]
+    $t set $dst gas::exit::fail [$t get $src gas::exit::fail]
+    return
+}
+
+proc ::grammar::me::cpu::gasm::state {} {
+    variable gas
+    return [array get gas]
+}
+
+proc ::grammar::me::cpu::gasm::state! {s} {
+    variable  gas
+    array set gas $s
+}
+
+proc ::grammar::me::cpu::gasm::Inline {t node label} {
+    variable gas
+
+    set gas(_${label}/entry)     [$t get $node gas::entry]
+    set gas(_${label}/exit/ok)   [$t get $node gas::exit::ok]
+    set gas(_${label}/exit/fail) [$t get $node gas::exit::fail]
+
+    __Link $gas(_${label}/entry) $gas(cond)
+    /At    ${label}/exit/ok
+    return
+}
+
+proc ::grammar::me::cpu::gasm::Cmd {cmd args} {
+    variable gas
+
+    # Add a new instruction, and link it to the anchor. The created
+    # instruction becomes the new anchor.
+
+    upvar 0 gas(grap) g gas(last) anchor gas(cond) cond
+
+    set node [$g node insert]
+    $g  node set $node instruction $cmd
+    $g  node set $node arguments   $args
+
+    if {$anchor ne ""} {__Link $node $cond}
+
+    set anchor $node
+    set cond   always
+    return
+}
+
+proc ::grammar::me::cpu::gasm::Bra {} {
+    Cmd .BRA
+}
+
+proc ::grammar::me::cpu::gasm::Nop {{text {}}} {
+    Cmd .NOP $text
+}
+
+proc ::grammar::me::cpu::gasm::Note {text} {
+    Cmd .C $text
+}
+
+proc ::grammar::me::cpu::gasm::Jmp {label} {
+    variable gas
+    __Link $gas(_$label) $gas(cond)
+    return
+}
+
+proc ::grammar::me::cpu::gasm::Exit {} {
+    variable gas
+    if {$gas(mode) eq "okfail"} {
+	__Link $gas(_exit/$gas(cond)) $gas(cond)
+    } else {
+	__Link $gas(_exit/return) always
+    }
+    return
+}
+
+proc ::grammar::me::cpu::gasm::Who {label} {
+    variable gas
+    return  $gas(_$label)
+}
+
+proc ::grammar::me::cpu::gasm::__Link {to cond} {
+    variable gas
+    upvar 0 gas(grap) g gas(last) anchor
+
+    set arc [$g arc insert $anchor $to]
+    $g  arc set $arc condition $cond
+    return
+}
+
+proc ::grammar::me::cpu::gasm::/Label {name} {
+    variable gas
+    set gas(_$name) $gas(last)
+    return
+}
+
+proc ::grammar::me::cpu::gasm::/Clear {} {
+    variable gas
+    set gas(last) {}
+    set gas(cond) always
+    return
+}
+
+proc ::grammar::me::cpu::gasm::/Ok {} {
+    variable gas
+    set gas(cond) ok
+    return
+}
+
+proc ::grammar::me::cpu::gasm::/Fail {} {
+    variable gas
+    set gas(cond) fail
+    return
+}
+
+proc ::grammar::me::cpu::gasm::/At {name} {
+    variable gas
+    set gas(last) $gas(_$name)
+    set gas(cond) always
+    return
+}
+
+proc ::grammar::me::cpu::gasm::/CloseLoop {} {
+    variable gas
+    $gas(grap) node set $gas(last) LOOP .
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Interfacing
+
+namespace eval grammar::me::cpu::gasm {
+    namespace export begin done lift state state!
+    namespace export Inline Cmd Bra Nop Note Jmp Exit Who
+    namespace export /Label /Clear /Ok /Fail /At /CloseLoop
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide grammar::me::cpu::gasm 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/me_cpu.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/me_cpu.tcl
new file mode 100644
index 00000000..89d7eae2
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/me_cpu.tcl
@@ -0,0 +1,103 @@
+# -*- tcl -*-
+# (C) 2005-2006 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# ### ### ### ######### ######### #########
+## Package description
+
+## Implementation of ME virtual machines, object-based API to the
+## state values provided by "grammar::me::cpu::core".
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require snit
+package require grammar::me::cpu::core
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::grammar::me::cpu {
+    constructor {code_} {
+	# The 'core new' call validates the code as well.
+
+	set state [core::new $code_]
+	return
+    }
+
+    method lc     {location}     {return [core::lc     $state $location]}
+    method tok    {args}         {return [eval [linsert $args 0 core::tok $state]]}
+    method pc     {}             {return [core::pc     $state]}
+    method iseof  {}             {return [core::iseof  $state]}
+    method at     {}             {return [core::at     $state]}
+    method cc     {}             {return [core::cc     $state]}
+    method sv     {}             {return [core::sv     $state]}
+    method ok     {}             {return [core::ok     $state]}
+    method error  {}             {return [core::error  $state]}
+    method lstk   {}             {return [core::lstk   $state]}
+    method astk   {}             {return [core::astk   $state]}
+    method mstk   {}             {return [core::mstk   $state]}
+    method estk   {}             {return [core::estk   $state]}
+    method rstk   {}             {return [core::rstk   $state]}
+    method nc     {}             {return [core::nc     $state]}
+    method ast    {}             {return [core::ast    $state]}
+    method halted {}             {return [core::halted $state]}
+    method code   {}             {return [core::code   $state]}
+
+    method eof {} {
+	core::eof state
+	return
+    }
+
+    method put {tok lex line col} {
+	core::put state $tok $lex $line $col
+	return
+    }
+
+    method putstring {str lvar cvar} {
+	upvar 1 $lvar line $cvar col
+	foreach ch [split $str {}] {
+	    core::put state $ch {} $line $col
+	    if {$ch eq "\n"} {
+		incr line
+		set  col 0
+	    } else {
+		incr col
+	    }
+	}
+	return
+    }
+
+    method run {{n -1}} {
+	core::run state $n
+	return
+    }
+
+    method pull {next} {
+	while {1} {
+	    core::run state
+	    if {[core::halted $state]} break
+
+	    set tokdata [uplevel \#0 $next]
+	    if {![llength $tokdata]} break
+	    if {[llength $tokdata] != 4} {
+		return -code error "Bad callback result, expected 4 elements"
+	    }
+	    foreach {tok lex line col} $tokdata break
+	    core::put state $tok $lex $line $col
+	}
+    }
+
+    method reset {} {
+	set state [core::new [core::code $state]]
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Data structures
+
+    variable state ; # State of ME cpu handled here.
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide grammar::me::cpu 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/me_cpucore.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/me_cpucore.tcl
new file mode 100644
index 00000000..9a3a4024
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/me_cpucore.tcl
@@ -0,0 +1,1156 @@
+# -*- tcl -*-
+# (C) 2005-2006 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# ### ### ### ######### ######### #########
+## Package description
+
+## Implementation of ME virtual machines based on state values
+## manipulated by the commands according to the match
+## instructions. Allows for implementation in C.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+namespace eval ::grammar::me::cpu::core {}
+
+# ### ### ### ######### ######### #########
+## Implementation, API. Ensemble command.
+
+proc ::grammar::me::cpu::core {cmd args} {
+    # Dispatcher for the ensemble command.
+    variable core::cmds
+    return [uplevel 1 [linsert $args 0 $cmds($cmd)]]
+}
+
+namespace eval grammar::me::cpu::core {
+    variable cmds
+
+    # Mapping from cmd names to procedures for quick dispatch. The
+    # objects will shimmer into resolved command references.
+
+    array set cmds {
+	disasm ::grammar::me::cpu::core::disasm
+	asm    ::grammar::me::cpu::core::asm
+	new    ::grammar::me::cpu::core::new
+	lc     ::grammar::me::cpu::core::lc
+	tok    ::grammar::me::cpu::core::tok
+	pc     ::grammar::me::cpu::core::pc
+	iseof  ::grammar::me::cpu::core::iseof
+	at     ::grammar::me::cpu::core::at
+	cc     ::grammar::me::cpu::core::cc
+	sv     ::grammar::me::cpu::core::sv
+	ok     ::grammar::me::cpu::core::ok
+	error  ::grammar::me::cpu::core::error
+	lstk   ::grammar::me::cpu::core::lstk
+	astk   ::grammar::me::cpu::core::astk
+	mstk   ::grammar::me::cpu::core::mstk
+	estk   ::grammar::me::cpu::core::estk
+	rstk   ::grammar::me::cpu::core::rstk
+	nc     ::grammar::me::cpu::core::nc
+	ast    ::grammar::me::cpu::core::ast
+	halted ::grammar::me::cpu::core::halted
+	code   ::grammar::me::cpu::core::code
+	eof    ::grammar::me::cpu::core::eof
+	put    ::grammar::me::cpu::core::put
+	run    ::grammar::me::cpu::core::run
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ensemble implementation
+
+proc ::grammar::me::cpu::core::disasm {code} {
+    variable iname
+    variable tclass
+    variable anum
+
+    Validate $code ord dst jmp
+
+    set label 0
+    foreach k [array names jmp] {
+	set jmp($k) bra$label
+	incr label
+    }
+    foreach k [array names dst] {
+	if {![info exists jmp($k)]} {
+	    set jmp($k) {}
+	}
+    }
+
+    set result {}
+    foreach {asm pool tokmap} $code break
+
+    set pc    0
+    set pcend [llength $asm]
+
+    while {$pc < $pcend} {
+	set base $pc
+	set insn [lindex $asm $pc] ; incr pc
+	set an   [lindex $anum $insn]
+
+	if {$an == 1} {
+	    set a [lindex $asm $pc] ; incr pc
+	} elseif {$an == 2} {
+	    set a [lindex $asm $pc] ; incr pc
+	    set b [lindex $asm $pc] ; incr pc
+	} elseif {$an == 3} {
+	    set a [lindex $asm $pc] ; incr pc
+	    set b [lindex $asm $pc] ; incr pc
+	    set c [lindex $asm $pc] ; incr pc
+	}
+
+	set     instruction {}
+	lappend instruction $jmp($base)
+	lappend instruction $iname($insn)
+
+	switch -exact $insn {
+	    0 - 5 - 20 - 24 - 25 - 26 -
+	    a/string {
+		lappend instruction [lindex $pool $a]
+	    }
+	    1 {
+		# a/tok b/string
+		if {![llength $tokmap]} {
+		    lappend instruction [lindex $pool $a]
+		} else {
+		    lappend instruction ${a}:$ord($a)
+		}
+		lappend instruction [lindex $pool $b]
+	    }
+	    2 {
+		# a/tokstart b/tokend c/string
+		if {![llength $tokmap]} {
+		    lappend instruction [lindex $pool $a]
+		    lappend instruction [lindex $pool $b]
+		} else {
+		    # tokmap defined: a = b = order rank.
+		    lappend instruction ${a}:$ord($a)
+		    lappend instruction ${b}:$ord($b)
+		}
+		lappend instruction [lindex $pool $c]
+	    }
+	    3 {
+		# a/class(0-5) b/string
+		lappend instruction [lindex $tclass $a]
+		lappend instruction [lindex $pool $b]
+	    }
+	    4 {
+		# a/branch b/string
+		lappend instruction $jmp($a)
+		lappend instruction [lindex $pool $b]
+	    }
+	    6 - 11 - 12 - 13 -
+	    a/branch {
+		lappend instruction $jmp($a)
+	    }
+	    default {}
+	}
+
+	lappend result $instruction
+    }
+
+    return $result
+}
+
+proc ::grammar::me::cpu::core::asm {code} {
+    variable iname
+    variable anum
+    variable tccode
+
+    # code = list(insn), insn = list (label insn-name ...)
+
+    # I. Indices for the labels, based on instruction sizes.
+
+    array set jmp {}
+    set off 0
+    foreach insn $code {
+	foreach {label name} $insn break
+	# Ignore embedded comments, except for labels
+	if {$label ne ""} {
+	    set jmp($label) $off
+	}
+	if {$name eq ".C"} continue
+	if {![info exists iname($name)]} {
+	    return -code error "Bad instruction \"$insn\", unknown command \"$name\""
+	}
+	set an [lindex $anum $iname($name)]
+	if {[llength $insn] != ($an+2)} {
+	    return -code error "Bad instruction \"$insn\", expected $an argument[expr {$an == 1 ? "" : "s"}]"
+	}
+	incr off
+	incr off [lindex $anum $iname($name)]
+    }
+
+    set asm          {}
+    set pool         {}
+    array set poolh  {}
+    array set tokmap {}
+    array set ord    {}
+    set plain        0
+
+    foreach insn $code {
+	foreach {label name} $insn break
+	# Ignore embedded comments
+	if {$name eq ".C"} continue
+	set an [lindex $anum $iname($name)]
+
+	# Instruction code to assembly ...
+	lappend asm $iname($name)
+
+	# Encode arguments ...
+	switch -exact -- $name {
+	    ict_advance            -
+	    inc_save               -
+	    ier_nonterminal        -
+	    isv_nonterminal_leaf   -
+	    isv_nonterminal_range  -
+	    isv_nonterminal_reduce {
+		lappend asm [Str [lindex $insn 2]]
+	    }
+	    ict_match_token {
+		lappend asm [Tok [lindex $insn 2]]
+		lappend asm [Str [lindex $insn 3]]
+	    }
+	    ict_match_tokrange {
+		lappend asm [Tok [lindex $insn 2]]
+		lappend asm [Tok [lindex $insn 3]]
+		lappend asm [Str [lindex $insn 4]]
+	    }
+	    ict_match_tokclass {
+		set ccode [lindex $insn 2]
+		if {![info exists tccode($ccode)]} {
+		    return -code error "Bad instruction \"$insn\", unknown class code \"$ccode\""
+		}
+		lappend asm $tccode($ccode)
+		lappend asm [Str [lindex $insn 3]]
+
+	    }
+	    inc_restore {
+		set jmpto [lindex $insn 2]
+		if {![info exists jmp($jmpto)]} {
+		    return -code error "Bad instruction \"$insn\", unknown branch destination \"$jmpto\""
+		}
+		lappend asm $jmp($jmpto)
+		lappend asm [Str [lindex $insn 3]]
+	    }
+	    icf_ntcall  -
+	    icf_jalways -
+	    icf_jok     -
+	    icf_jfail   {
+		set jmpto [lindex $insn 2]
+		if {![info exists jmp($jmpto)]} {
+		    return -code error "Bad instruction \"$insn\", unknown branch destination \"$jmpto\""
+		}
+		lappend asm $jmp($jmpto)
+	    }
+	}
+    }
+
+    return [list $asm $pool [array get tokmap]]
+}
+
+proc ::grammar::me::cpu::core::new {code} {
+    # The code generating the state is drawn out to integrate a
+    # specification of how the machine state is mapped to Tcl as well.
+
+    Validate $code
+
+    set     state {}   ; # The state is representend as a Tcl list.
+    # ### ### ### ######### ######### #########
+    lappend state $code ; # [_0] code  - list  - code to run (-)
+    lappend state 0     ; # [_1] pc    - int   - Program counter
+    lappend state 0     ; # [_2] halt  - bool  - Flag, set (internal) when machine was halted (icf_halt).
+    lappend state 0     ; # [_3] eof   - bool  - Flag, set (external) when where will be no more input.
+    lappend state {}    ; # [_4] tc    - list  - Terminal cache, pending and processed tokens.
+    lappend state -1    ; # [_5] cl    - int   - Current Location
+    lappend state {}    ; # [_6] ct    - token - Current Character
+    lappend state 0     ; # [_7] ok    - bool  - Match Status
+    lappend state {}    ; # [_8] sv    - any   - Semantic Value
+    lappend state {}    ; # [_9] er    - list  - Error status (*)
+    lappend state {}    ; # [10] ls    - list  - Location Stack (x)
+    lappend state {}    ; # [11] as    - list  - Ast Stack
+    lappend state {}    ; # [12] ms    - list  - Ast Marker Stack
+    lappend state {}    ; # [13] es    - list  - Error Stack
+    lappend state {}    ; # [14] rs    - list  - Return Stack
+    lappend state {}    ; # [15] nc    - dict  - Nonterminal Cache (backtracking)
+    # ### ### ### ######### ######### #########
+
+    # tc    = list(token)
+    # token = list(str lexeme line col)
+
+
+    # (-) See manpage of this package for the representation.
+
+    # (*) 2 elements, first is error location, second is list of 
+    # ... strings, the error messages. The strings are actually
+    # ... represented by references into the pool element of the code.
+
+    # (x) Regarding the various stacks maintained in the state, their
+    #     top element is always at the right end, i.e. the last
+    #     element in the list representing it.
+
+    return $state
+}
+
+proc ::grammar::me::cpu::core::ntok {state} {
+    return [llength [lindex $state 4]]
+}
+
+proc ::grammar::me::cpu::core::lc {state loc} {
+    set tc  [lindex $state 4]
+    set loc [INDEX $tc $loc "Illegal location"]
+    return [lrange [lindex $tc $loc] 2 3]
+    # result = list(line col)
+}
+
+proc ::grammar::me::cpu::core::tok {state args} {
+    if {[llength $args] > 2} {
+	return -code error {wrong # args: should be "grammar::me::cpu::core::tok state ?from ?to??"}
+    }
+    set tc [lindex $state 4]
+    if {[llength $args] == 0} {
+	return $tc
+    } elseif {[llength $args] == 1} {
+	set at [INDEX $tc [lindex $args 0] "Illegal location"]
+	return [lrange $tc $at $at]
+    } else {
+	set from [INDEX $tc [lindex $args 0] "Illegal start location"]
+	set to   [INDEX $tc [lindex $args 1] "Illegal end location"]
+	if {$from > $to} {
+	    return -code error "Illegal empty location range $from .. $to"
+	}
+	return [lrange $tc $from $to]
+    }
+    # result = list(token), token = list(str lex line col)
+}
+
+proc ::grammar::me::cpu::core::pc {state} {
+    return [lindex $state 1]
+}
+
+proc ::grammar::me::cpu::core::iseof {state} {
+    return [lindex $state 3]
+}
+
+proc ::grammar::me::cpu::core::at {state} {
+    return [lindex $state 5]
+}
+
+proc ::grammar::me::cpu::core::cc {state} {
+    return [lindex $state 6]
+}
+
+proc ::grammar::me::cpu::core::sv {state} {
+    return [lindex $state 8]
+}
+
+proc ::grammar::me::cpu::core::ok {state} {
+    return [lindex $state 7]
+}
+
+proc ::grammar::me::cpu::core::error {state} {
+    set er [lindex $state 9]
+    if {[llength $er]} {
+	foreach {l m} $er break
+
+	set pool [lindex $state 0 1] ; # state ->/0 code ->/1 pool
+	set mx   {}
+	foreach id $m {
+	    lappend mx [lindex $pool $id]
+	}
+	set er [list $l $mx]
+    }
+    return $er
+}
+
+proc ::grammar::me::cpu::core::lstk {state} {
+    return [lindex $state 10]
+}
+
+proc ::grammar::me::cpu::core::astk {state} {
+    return [lindex $state 11]
+}
+
+proc ::grammar::me::cpu::core::mstk {state} {
+    return [lindex $state 12]
+}
+
+proc ::grammar::me::cpu::core::estk {state} {
+    return [lindex $state 13]
+}
+
+proc ::grammar::me::cpu::core::rstk {state} {
+    return [lindex $state 14]
+}
+
+proc ::grammar::me::cpu::core::nc {state} {
+    return [lindex $state 15]
+}
+
+proc ::grammar::me::cpu::core::ast {state} {
+    return [lindex $state 11 end]
+}
+
+proc ::grammar::me::cpu::core::halted {state} {
+    return [lindex $state 2]
+}
+
+proc ::grammar::me::cpu::core::code {state} {
+    return [lindex $state 0]
+}
+
+proc ::grammar::me::cpu::core::eof {statevar} {
+    upvar 1 $statevar state
+    lset state 3 1
+    return
+}
+
+proc ::grammar::me::cpu::core::put {statevar tok lex line col} {
+    upvar 1 $statevar state
+    if {[lindex $state 3]} {
+	return -code error "Cannot add input data after eof"
+    }
+    set     tc [K [lindex $state 4] [lset state 4 {}]]
+    lappend tc [list $tok $lex $line $col]
+    lset state 4 $tc
+    return
+}
+
+proc ::grammar::me::cpu::core::run {statevar {steps -1}} {
+    # Execution loop. Should be instrumented for statistics about
+    # dynamic instruction frequency. I.e. which instructions are
+    # executed the most => put them at the front of the if/switch for
+    # quicker selection. I.e. frequency coding of the branches for
+    # speed.
+
+    # A C implementation can shimmer the state into a directly
+    # accessible data structure. And the asm instructions can shimmer
+    # into an integer index upon which we can switch fast.
+
+    variable anum
+    variable tclass
+    upvar 1 $statevar state
+    variable iname ; # For debug output
+
+    # Do nothing for a stopped machine (halt flag set).
+    if {[lindex $state 2]} {return $state}
+
+    # Fail if there are no instruction to execute
+    if {![llength [lindex $state 0 0]]} {
+	# No instructions to execute
+	return -code error "No instructions to execute"
+    }
+
+    # Unpack state into locally accessible variables
+    #        0    1  2    3   4  5  6  7  8  9  10 11 12 13 14 15 16 17 18  19  20
+    foreach {code pc halt eof tc cl ct ok sv er ls as ms es rs nc} $state break
+
+    # Unpack match program for easy access as well.
+    #        0   1    2
+    foreach {asm pool tokmap} $code break
+
+    if 0 {
+	puts ________________________
+	puts [join [disasm $code] \n]
+	puts ________________________
+    }
+
+    # Ensure that the unpacked information is not shared
+    unset state
+
+    # Internal flags for optimal handling of the nonterminal
+    # cache. Avoid multiple unpacking of the dictionary, and avoid
+    # repacking if it was not modified.
+
+    set ncunpacked 0
+    set ncmodified 0
+    set tmunpacked 0
+
+    while {1} {
+	# Stop execution if the specified number of instructions have
+	# been executed. Ignore if infinity was specified.
+	if {$steps == 0} break
+	if {$steps > 0} {incr steps -1}
+
+	# Get current instruction ...
+
+	if 0 {puts .$pc:\t$iname([lindex $asm $pc])}
+	if 0 {puts -nonewline .$pc:\t$iname([lindex $asm $pc])}
+
+	set insn [lindex $asm $pc] ; incr pc
+
+	# And its arguments ...
+
+	set an [lindex $anum $insn]
+	if {$an == 1} {
+	    set a [lindex $asm $pc] ; incr pc
+	    if 0 {puts \t<$a>}
+	} elseif {$an == 2} {
+	    set a [lindex $asm $pc] ; incr pc
+	    set b [lindex $asm $pc] ; incr pc
+	    if 0 {puts \t<$a|$b>}
+	} elseif {$an == 3} {
+	    set a [lindex $asm $pc] ; incr pc
+	    set b [lindex $asm $pc] ; incr pc
+	    set c [lindex $asm $pc] ; incr pc
+	    if 0 {puts \t<$a|$b|$c>}
+	} ;# else {puts ""}
+
+	# Dispatch to implementation of the instruction ...
+
+	# Separate if commands are used for easier ordering of the
+	# dispatch. The order of the branches should be frequency
+	# coded to have the most frequently used instructions first.
+
+	# ict_advance <a:message>
+	if {$insn == 0} {
+	    if 0 {puts \t\[$cl|[llength $tc]|$eof\]}
+	    incr cl
+	    if {$cl < [llength $tc]} {
+		if 0 {puts \tConsume}
+
+		set ct [lindex $tc $cl 0]
+		set ok 1
+		set er {}
+	    } elseif {$eof} {
+		if 0 {puts \tFail<Eof>}
+
+		# We have no input, and there won't be more coming in
+		# either. Fail the advance. We do _not_ stop the match
+		# loop, the program has to complete. The failure might
+		# be no such, revealed during backtracking. The current
+		# location is not rewound automatically, this is the
+		# responsibility of any backtracking.
+
+		set er  [list $cl [list $a]]
+		set ok  0
+	    } else {
+		if 0 {puts \tSuspend&Wait}
+
+		# We have no input, stop matching and wait for
+		# more. We reset the machine into a state
+		# which will restart this instruction when
+		# execution resumes.
+
+		incr cl -1
+		incr pc -2 ; # code and message argument
+		break
+	    }
+	    if 0 {puts .Next}
+	    continue
+	}
+
+	# ict_match_token <a:token> <b:message>
+	if {$insn == 1} {
+	    if {[llength $tokmap]} {
+		if {!$tmunpacked} {
+		    array set tm $tokmap
+		    set tmunpacked 1
+		}
+		set ok [expr {$a == $tm($ct)}]
+	    } else {
+		set xch [lindex $pool $a]
+		set ok  [expr {$xch eq $ct}]
+	    }
+	    if {!$ok} {
+		set er [list $cl [list $b]]
+	    } else {
+		set er {}
+	    }
+	    continue
+	}
+
+	# ict_match_tokrange <a:tokstart> <b:tokend> <c:message>
+	if {$insn == 2} {
+	    if {[llength $tokmap]} {
+		if {!$tmunpacked} {
+		    array set tm $tokmap
+		    set tmunpacked 1
+		}
+		set x $tm($ct)
+		set ok [expr {($a <= $x) && ($x <= $b)}]
+	    } else {
+		set a [lindex $pool $a]
+		set b [lindex $pool $b]
+		set ok [expr {
+		    ([string compare $a $ct] <= 0) &&
+		    ([string compare $ct $b] <= 0)
+		}] ; # {}
+	    }
+	    if {!$ok} {
+		set er [list $cl [list $c]]
+	    } else {
+		set er {}
+	    }
+	    continue
+	}
+
+	# ict_match_tokclass <a:code> <b:message>
+	if {$insn == 3} {
+	    set strcode [lindex $tclass $a]
+	    set ok   [string is $strcode -strict $ct]
+	    if {!$ok} {
+		set er [list $cl [list $b]]
+	    } else {
+		set er {}
+	    }
+	    continue
+	}
+
+	# inc_restore <a:branchtarget> <b:nonterminal>
+	if {$insn == 4} {
+	    set sym [lindex $pool $b]
+
+	    # Unpack the cache dict, only here.
+	    # 8.5 - Use dict operations instead.
+
+	    if {!$ncunpacked} {
+		array set ncc $nc
+		set ncunpacked 1
+	    }
+
+	    if {[info exists ncc($cl,$sym)]} {
+		foreach {go ok error sv} $ncc($cl,$sym) break
+
+		# Go forward, as the nonterminal matches (or not).
+		set cl $go
+		set pc $a
+	    }
+	    continue
+	}
+
+	# inc_save <a:nonterminal>
+	if {$insn == 5} {
+	    set sym [lindex $pool $a]
+	    set at  [lindex $ls end]
+	    set ls  [lrange $ls 0 end-1]
+
+	    # Unpack, modify, only here.
+	    # 8.5 - Use dict operations instead.
+
+	    if {!$ncunpacked} {
+		array set ncc $nc
+		set ncunpacked 1
+	    }
+
+	    set ncc($at,$sym) [list $cl $ok $er $sv]
+	    set ncmodified 1
+	    continue
+	}
+
+	# icf_ntcall <a:branchtarget>
+	if {$insn == 6} {
+	    lappend rs $pc
+	    set     pc $a
+	    continue
+	}
+
+	# icf_ntreturn
+	if {$insn == 7} {
+	    set pc [lindex $rs end]
+	    set rs [lrange $rs 0 end-1]
+	    continue
+	}
+
+	# iok_ok
+	if {$insn == 8} {
+	    set ok 1
+	    continue
+	}
+
+	# iok_fail
+	if {$insn == 9} {
+	    set ok 0
+	    continue
+	}
+
+	# iok_negate
+	if {$insn == 10} {
+	    set ok [expr {!$ok}]
+	    continue
+	}
+
+	# icf_jalways <a:branchtarget>
+	if {$insn == 11} {
+	    set pc $a
+	    continue
+	}
+
+	# icf_jok <a:branchtarget>
+	if {$insn == 12} {
+	    if {$ok} {set pc $a}
+	    # !ok => pc is already on next instruction.
+	    continue
+	}
+
+	# icf_jfail <a:branchtarget>
+	if {$insn == 13} {
+	    if {!$ok} {set pc $a}
+	    # ok => pc is already on next instruction.
+	    continue
+	}
+
+	# icf_halt
+	if {$insn == 14} {
+	    set halt 1
+	    break
+	}
+
+	# icl_push
+	if {$insn == 15} {
+	    lappend ls $cl
+	    continue
+	}
+
+	# icl_rewind
+	if {$insn == 16} {
+	    set cl [lindex $ls end]
+	    set ls [lrange $ls 0 end-1]
+	    continue
+	}
+
+	# icl_pop
+	if {$insn == 17} {
+	    set ls [lrange $ls 0 end-1]
+	    continue
+	}
+
+	# ier_push
+	if {$insn == 18} {
+	    lappend es $er
+	    continue
+	}
+
+	# ier_clear
+	if {$insn == 19} {
+	    set er {}
+	    continue
+	}
+
+	# ier_nonterminal <a:nonterminal>
+	if {$insn == 20} {
+	    if {[llength $er]} {
+		set  pos [lindex $ls end]
+		incr pos
+		set eloc [lindex $er 0]
+		if {$eloc == $pos} {
+		    set er [list $eloc [list $a]]
+		}
+	    }
+	    continue
+	}
+
+	# ier_merge
+	if {$insn == 21} {
+	    set old [lindex $es end]
+	    set es  [lrange $es 0 end-1]
+
+	    # We have either old or current error data, keep it.
+
+	    if {![llength $er]} {
+		# No current data, keep old
+		set er $old
+	    } elseif {[llength $old]} {
+		# If one of the errors is further on in the input
+		# choose that as the information to propagate.
+
+		foreach {loe msgse} $er  break
+		foreach {lon msgsn} $old break
+
+		if {$lon > $loe} {
+		    set er $old
+		} elseif {$loe == $lon} {
+		    # Equal locations, merge the message lists.
+
+		    foreach m $msgsn {lappend msgse $m}
+		    set er [list $loe [lsort -uniq $msgse]]
+		}
+		# else lon < loe - er is better - nothing
+	    }
+	    # else - !old, but er - nothing
+
+	    continue
+	}
+
+	# isv_clear
+	if {$insn == 22} {
+	    set sv {}
+	    continue
+	}
+
+	# isv_terminal (implied ias_push)
+	if {$insn == 23} {
+	    set sv [list {} $cl $cl]
+	    lappend as $sv
+	    continue
+	}
+
+	# isv_nonterminal_leaf <a:nonterminal>
+	if {$insn == 24} {
+	    set pos [lindex $ls end]
+	    set sv  [list $a $pos $cl]
+	    continue
+	}
+
+	# isv_nonterminal_range <a:nonterminal>
+	if {$insn == 25} {
+	    set pos [lindex $ls end]
+	    set sv  [list $a $pos $cl [list {} $pos $cl]]
+	    continue
+	}
+
+	# isv_nonterminal_reduce <a:nonterminal>
+	if {$insn == 26} {
+	    set pos [lindex $ls end]
+	    if {[llength $ms]} {
+		set  mrk [lindex $ms end]
+		incr mrk
+	    } else {
+		set mrk 0
+	    }
+	    set sv [lrange $as $mrk end]
+	    set sv [linsert $sv 0 $a $pos $cl]
+	    continue
+	}
+
+	# ias_push
+	if {$insn == 27} {
+	    lappend as $sv
+	    continue
+	}
+
+	# ias_mark
+	if {$insn == 28} {
+	    set  mark [llength $as]
+	    incr mark -1
+	    lappend ms $mark
+	    continue
+	}
+
+	# ias_mrewind
+	if {$insn == 29} {
+	    set mark [lindex $ms end]
+	    set ms   [lrange $ms 0 end-1]
+	    set as   [lrange $as 0 $mark]
+	    continue
+	}
+
+	# ias_mpop
+	if {$insn == 30} {
+	    set ms [lrange $ms 0 end-1]
+	    continue
+	}
+
+	return -code error "Illegal instruction $insn"
+    }
+
+    # Repack a modified cache dictionary, then repack and store the
+    # updated state value.
+
+    if 0 {puts .Repackage\ state}
+
+    if {$ncmodified} {set nc [array get ncc]}
+    set state [list $code $pc $halt $eof $tc $cl $ct $ok $sv $er $ls $as $ms $es $rs $nc]
+    return
+}
+
+namespace eval grammar::me::cpu::core {
+    # Map between class codes and names
+    variable tclass {}
+    variable tccode
+
+    foreach {x code} {
+	0 alnum
+	1 alpha
+	2 digit
+	3 xdigit
+	4 punct
+	5 space
+    } {
+	lappend tclass $code
+	set tccode($code) $x
+    }
+
+    # Number of arguments per ME instruction.
+    # Indexed by instruction code.
+    variable anum {}
+
+    # Mapping between instruction codes and names.
+    variable iname
+
+    foreach {z insn x notes} {
+	0  ict_advance            1	{-- TESTED}
+	1  ict_match_token        2	{-- TESTED}
+	2  ict_match_tokrange     3	{-- TESTED}
+	3  ict_match_tokclass     2	{-- TESTED}
+	4  inc_restore            2	{-- TESTED}
+	5  inc_save               1	{-- TESTED}
+	6  icf_ntcall             1	{-- TESTED}
+	7  icf_ntreturn           0	{-- TESTED}
+	8  iok_ok                 0	{-- TESTED}
+	9  iok_fail               0	{-- TESTED}
+	10 iok_negate             0	{-- TESTED}
+	11 icf_jalways            1	{-- TESTED}
+	12 icf_jok                1	{-- TESTED}
+	13 icf_jfail              1	{-- TESTED}
+	14 icf_halt               0	{-- TESTED}
+	15 icl_push               0	{-- TESTED}
+	16 icl_rewind             0	{-- TESTED}
+	17 icl_pop                0	{-- TESTED}
+	18 ier_push               0	{-- TESTED}
+	19 ier_clear              0	{-- TESTED}
+	20 ier_nonterminal        1	{-- TESTED}
+	21 ier_merge              0	{-- TESTED}
+	22 isv_clear              0	{-- TESTED}
+	23 isv_terminal           0	{-- TESTED}
+	24 isv_nonterminal_leaf   1	{-- TESTED}
+	25 isv_nonterminal_range  1	{-- TESTED}
+	26 isv_nonterminal_reduce 1	{-- TESTED}
+	27 ias_push               0	{-- TESTED}
+	28 ias_mark               0	{-- TESTED}
+	29 ias_mrewind            0	{-- TESTED}
+	30 ias_mpop               0	{-- TESTED}
+    } {
+	lappend anum $x
+	set iname($z) $insn
+	set iname($insn) $z
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Helper commands ((Dis)Assembler, runtime).
+
+proc ::grammar::me::cpu::core::INDEX {list i label} {
+    if {$i eq "end"} {
+	set i [expr {[llength $list] - 1}]
+    } elseif {[regexp {^end-([0-9]+)$} $i -> n]} {
+	set i [expr {[llength $list] - $n -1}]
+    }
+    if {
+	![string is integer -strict $i] ||
+	($i < 0) ||
+	($i >= [llength $list])
+    } {
+	return -code error "$label $i"
+    }
+    return $i
+}
+
+proc ::grammar::me::cpu::core::K {x y} {set x}
+
+proc ::grammar::me::cpu::core::Str {str} {
+    upvar 1 pool pool poolh poolh
+    if {![info exists poolh($str)]} {
+	set poolh($str) [llength $pool]
+	lappend pool $str
+    }
+    return $poolh($str)
+}
+
+proc ::grammar::me::cpu::core::Tok {str} {
+    upvar 1 tokmap tokmap ord ord plain plain
+
+    if {[regexp {^([^:]+):(.+)$} $str -> id name]} {
+	if {$plain} {
+	    return -code error "Bad assembly, mixing plain and ranked tokens"
+	}
+	if {[info exists ord($id)]} {
+	    return -code error "Bad assembly, non-total ordering for $name and $ord($id), at rank $id"
+	}
+	set ord($id) $name
+	set tokmap($name) $id
+
+	return $id
+    } else {
+	if {[array size ord]} {
+	    return -code error "Bad assembly, mixing plain and ranked tokens"
+	}
+	set plain 1
+	return [uplevel 1 [list Str $str]]
+    }
+}
+
+proc ::grammar::me::cpu::core::Validate {code {ovar {}} {tvar {}} {jvar {}}} {
+    variable anum
+    variable iname
+
+    # Basic validation of structure ...
+
+    if {[llength $code] != 3} {
+	return -code error "Bad length"
+    }
+
+    foreach {asm pool tokmap} $code break
+
+    if {[llength $tokmap] % 2 == 1} {
+	return -code error "Bad tokmap, expected a dictionary"
+    }
+
+    array set ord {}
+    if {[llength $tokmap] > 0} {
+	foreach {tok rank} $tokmap {
+	    if {[info exists ord($rank)]} {
+		return -code error "Bad tokmap, non-total ordering for $tok and $ord($rank), at rank $rank"
+	    }
+	    set ord($rank) $tok
+	}
+    }
+
+    # Basic validation of ME code: Valid instructions, collect valid
+    # branch target indices
+
+    array set target {}
+
+    set pc 0
+    set pcend   [llength $asm]
+    set poolend [llength $pool]
+
+    while {$pc < $pcend} {
+	set target($pc) .
+
+	set insn [lindex $asm $pc]
+	if {($insn < 0) || ($insn > 30)} {
+	    return -code error "Invalid instruction $insn at PC $pc"
+	}
+
+	incr pc
+	incr pc [lindex $anum $insn]
+    }
+
+    if {$pc > $pcend} {
+	return -code error "Bad program, last instruction $insn ($iname($insn)) is truncated"
+    }
+
+    # Validation of ME instruction arguments (pool references, branch
+    # targets, ...)
+
+    if {$jvar ne ""} {
+	upvar 1 $jvar jmp
+    }
+    array set jmp {}
+
+    set pc 0
+    while {$pc < $pcend} {
+	set base $pc
+	set insn [lindex $asm $pc] ; incr pc
+	set an   [lindex $anum $insn]
+
+	if {$an == 1} {
+	    set a [lindex $asm $pc] ; incr pc
+	} elseif {$an == 2} {
+	    set a [lindex $asm $pc] ; incr pc
+	    set b [lindex $asm $pc] ; incr pc
+	} elseif {$an == 3} {
+	    set a [lindex $asm $pc] ; incr pc
+	    set b [lindex $asm $pc] ; incr pc
+	    set c [lindex $asm $pc] ; incr pc
+	}
+
+	switch -exact $insn {
+	    0 - 5 - 20 - 24 - 25 - 26 -
+	    a/string {
+		if {($a < 0) || ($a >= $poolend)} {
+		    return -code error "Invalid string reference $a for instruction $insn ($iname($insn)) at $base"
+		}
+	    }
+	    1 {
+		# a/tok b/string
+		if {![llength $tokmap]} {
+		    if {($a < 0) || ($a >= $poolend)} {
+			return -code error "Invalid string reference $a for instruction $insn ($iname($insn)) at $base"
+		    }
+		} else {
+		    if {![info exists ord($a)]} {
+			return -code error "Invalid token rank $a for instruction $insn ($iname($insn)) at $base"
+		    }
+		}
+		if {($b < 0) || ($b >= $poolend)} {
+		    return -code error "Invalid string reference $b for instruction $insn ($iname($insn)) at $base"
+		}
+	    }
+	    2 {
+		# a/tokstart b/tokend c/string
+
+		if {![llength $tokmap]} {
+		    # a = b = string references.
+		    if {($a < 0) || ($a >= $poolend)} {
+			return -code error "Invalid string reference $a for instruction $insn ($iname($insn)) at $base"
+		    }
+		    if {($b < 0) || ($b >= $poolend)} {
+			return -code error "Invalid string reference $b for instruction $insn ($iname($insn)) at $base"
+		    }
+		    if {$a == $b} {
+			return -code error "Invalid single-token range for instruction $insn ($iname($insn)) at $base"
+		    }
+		    if {[string compare [lindex $pool $a] [lindex $pool $b]] > 0} {
+			return -code error "Invalid empty range for instruction $insn ($iname($insn)) at $base"
+		    }
+		} else {
+		    # tokmap defined: a = b = order rank.
+		    if {![info exists ord($a)]} {
+			return -code error "Invalid token rank $a for instruction $insn ($iname($insn)) at $base"
+		    }
+		    if {![info exists ord($b)]} {
+			return -code error "Invalid token rank $b for instruction $insn ($iname($insn)) at $base"
+		    }
+		    if {$a == $b} {
+			return -code error "Invalid single-token range for instruction $insn ($iname($insn)) at $base"
+		    }
+		    if {$a > $b} {
+			return -code error "Invalid empty range for instruction $insn ($iname($insn)) at $base"
+		    }
+		}
+		if {($c < 0) || ($c >= $poolend)} {
+		    return -code error "Invalid string reference $c for instruction $insn ($iname($insn)) at $base"
+		}
+	    }
+	    3 {
+		# a/class(0-5) b/string
+		if {($a < 0) || ($a > 5)} {
+		    return -code error "Invalid token-class $a for instruction $insn ($iname($insn)) at $base"
+		}
+		if {($b < 0) || ($b >= $poolend)} {
+		    return -code error "Invalid string reference $b for instruction $insn ($iname($insn)) at $base"
+		}
+	    }
+	    4 {
+		# a/branch b/string
+		if {![info exists target($a)]} {
+		    return -code error "Invalid branch target $a for instruction $insn ($iname($insn)) at $base"
+		} else {
+		    set jmp($a) .
+		}
+		if {($b < 0) || ($b >= $poolend)} {
+		    return -code error "Invalid string reference $b for instruction $insn ($iname($insn)) at $base"
+		}
+	    }
+	    6 - 11 - 12 - 13 -
+	    a/branch {
+		if {![info exists target($a)]} {
+		    return -code error "Invalid branch target $a for instruction $insn ($iname($insn)) at $base"
+		} else {
+		    set jmp($base) $a
+		}
+	    }
+	    default {}
+	}
+    }
+
+    # All checks passed, code is deemed good enough.
+    # Caller may have asked for some of the collected
+    # information.
+
+    if {$ovar ne ""} {
+	upvar 1 $ovar o
+	array set o [array get ord]
+    }
+    if {$tvar ne ""} {
+	upvar 1 $tvar t
+	array set t [array get target]
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide grammar::me::cpu::core 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/me_tcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/me_tcl.tcl
new file mode 100644
index 00000000..e0e86e43
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/me_tcl.tcl
@@ -0,0 +1,521 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Package description
+
+## Implementation of the ME virtual machine as a singleton, tied to
+## Tcl for control flow and stack handling (except the AST stack).
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+namespace eval ::grammar::me::tcl {
+    namespace export \
+	init lc tok sv tokens ast \
+	astall ctok nc next ord \
+	\
+	isv_clear              ict_advance        inc_save    \
+	isv_terminal           ict_match_token    inc_restore \
+	isv_nonterminal_leaf   ict_match_tokrange icl_get     \
+	isv_nonterminal_range  ict_match_tokclass icl_rewind  \
+	isv_nonterminal_reduce iok_ok      \
+	ier_clear              iok_fail    \
+	ier_get                iok_negate  \
+	ier_expected           ias_push    \
+	ier_nonterminal        ias_mark    \
+	ier_merge              ias_pop2mark
+
+    variable ok
+}
+
+# ### ### ### ######### ######### #########
+## Implementation, API. Ensemble command.
+
+proc ::grammar::me::tcl {cmd args} {
+    # Dispatcher for the ensemble command.
+    variable tcl::cmds
+    return [uplevel 1 [linsert $args 0 $cmds($cmd)]]
+}
+
+namespace eval grammar::me::tcl {
+    variable cmds
+
+    # Mapping from cmd names to procedures for quick dispatch. The
+    # objects will shimmer into resolved command references.
+
+    array set cmds {
+	init   ::grammar::me::tcl::init
+	lc     ::grammar::me::tcl::lc
+	tok    ::grammar::me::tcl::tok
+	sv     ::grammar::me::tcl::sv
+	tokens ::grammar::me::tcl::tokens
+	ast    ::grammar::me::tcl::ast
+	astall ::grammar::me::tcl::astall
+	ctok   ::grammar::me::tcl::ctok
+	nc     ::grammar::me::tcl::nc
+	next   ::grammar::me::tcl::next
+	ord    ::grammar::me::tcl::ord
+    }
+}
+
+# ### ### ### ######### ######### #########
+## API Implementation.
+
+proc ::grammar::me::tcl::init {nxcmd {tokmap {}}} {
+    variable next  $nxcmd
+    variable as    {}
+    variable ok    0
+    variable error {}
+    variable sv    {}
+    variable loc  -1
+    variable ct    {}
+    variable tc    {}
+    variable nc
+    variable tokOrd
+    variable tokUseOrd 0
+
+    array unset nc     *
+    array unset tokOrd *
+
+    if {[llength $tokmap]} {
+	if {[llength $tokmap] % 2 == 1} {
+	    return -code error \
+		    "Bad token order map, not a dictionary"
+	}
+	array set tokOrd $tokmap
+	set tokUseOrd 1
+    }
+    return
+}
+
+proc ::grammar::me::tcl::lc {pos} {
+    variable tc
+    return [lrange [lindex $tc $pos] 2 3]
+}
+
+proc ::grammar::me::tcl::tok {from {to {}}} {
+    variable tc
+    if {$to == {}} {set to $from}
+    return [lrange $tc $from $to]
+}
+
+proc ::grammar::me::tcl::tokens {} {
+    variable tc
+    return [llength $tc]
+}
+
+proc ::grammar::me::tcl::sv {} {
+    variable sv
+    return  $sv
+}
+
+proc ::grammar::me::tcl::ast {} {
+    variable as
+    return [lindex $as end]
+}
+
+proc ::grammar::me::tcl::astall {} {
+    variable as
+    return $as
+}
+
+proc ::grammar::me::tcl::ctok {} {
+    variable ct
+    return  $ct
+}
+
+proc ::grammar::me::tcl::nc {} {
+    variable nc
+    return [array get nc]
+}
+
+proc ::grammar::me::tcl::next {} {
+    variable next
+    return  $next
+}
+
+proc ::grammar::me::tcl::ord {} {
+    variable tokOrd
+    return [array get tokOrd]
+}
+
+# ### ### ### ######### ######### #########
+## Terminal matching
+
+proc ::grammar::me::tcl::ict_advance {msg} {
+    # Inlined: Getch, Expected, ClearErrors
+
+    variable ok
+    variable error
+    # ------------------------
+    variable tc
+    variable loc
+    variable ct
+    # ------------------------
+    variable next
+    # ------------------------
+
+    # Satisfy from input cache if possible.
+    incr loc
+    if {$loc < [llength $tc]} {
+	set ct [lindex $tc $loc 0]
+	set ok 1
+	set error {}
+	return
+    }
+
+    # Actually read from the input, and remember
+    # the information.
+
+    # Read from buffer, and remember.
+    # Note: loc is the instance variable.
+    # This implicitly increments the location!
+
+    set tokdata [uplevel \#0 $next]
+    if {![llength $tokdata]} {
+	set ok 0
+	set error [list $loc [list $msg]]
+	return
+    } elseif {[llength $tokdata] != 4} {
+	return -code error "Bad callback result, expected 4 elements"
+    }
+
+    lappend tc $tokdata
+    set ct [lindex $tokdata 0]
+    set ok    1
+    set error {}
+    return
+}
+
+proc ::grammar::me::tcl::ict_match_token {tok msg} {
+    variable ct
+    variable ok
+
+    set ok [expr {$tok eq $ct}]
+
+    OkFail $msg
+    return
+}
+
+proc ::grammar::me::tcl::ict_match_tokrange {toks toke msg} {
+    variable ct
+    variable ok
+    variable tokUseOrd
+    variable tokOrd
+
+    if {$tokUseOrd} {
+	set ord $tokOrd($ct)
+	set ok [expr {
+	    ($toks <= $ord) &&
+	    ($ord <= $toke)
+	}] ; # {}
+    } else {
+	set ok [expr {
+	    ([string compare $toks   $ct] <= 0) &&
+	    ([string compare $ct   $toke] <= 0)
+	}] ; # {}
+    }
+
+    OkFail $msg
+    return
+}
+
+proc ::grammar::me::tcl::ict_match_tokclass {code msg} {
+    variable ct
+    variable ok
+
+    set ok [string is $code -strict $ct]
+
+    OkFail $msg
+    return
+}
+
+proc ::grammar::me::tcl::OkFail {msg} {
+    variable ok
+    variable error
+    variable loc
+
+    # Inlined: Expected, Unget, ClearErrors
+
+    if {!$ok} {
+	set error [list $loc [list $msg]]
+	incr loc -1
+    } else {
+	set error {}
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Nonterminal cache
+
+proc ::grammar::me::tcl::inc_restore {symbol} {
+    variable loc
+    variable nc
+    variable ok
+    variable error
+    variable sv
+
+    # Satisfy from cache if possible.
+    if {[info exists nc($loc,$symbol)]} {
+	foreach {go ok error sv} $nc($loc,$symbol) break
+
+	# Go forward, as the nonterminal matches (or not).
+	set loc $go
+	return 1
+    }
+    return 0
+}
+
+proc ::grammar::me::tcl::inc_save {symbol at} {
+    variable loc
+    variable nc
+    variable ok
+    variable error
+    variable sv
+
+    if 0 {
+	if {[info exists nc($at,$symbol)]} {
+	    return -code error "Cannot overwrite\
+		    existing data @ ($at, $symbol)"
+	}
+    }
+
+    # FIXME - end location should be argument.
+
+    # Store not only the value, but also how far
+    # the match went (if it was a match).
+
+    set nc($at,$symbol) [list $loc $ok $error $sv]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Unconditional matching.
+
+proc ::grammar::me::tcl::iok_ok {} {
+    variable ok 1
+    return
+}
+
+proc ::grammar::me::tcl::iok_fail {} {
+    variable ok 0
+    return
+}
+
+proc ::grammar::me::tcl::iok_negate {} {
+    variable ok
+    set ok [expr {!$ok}]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Basic input handling and tracking
+
+proc ::grammar::me::tcl::icl_get {} {
+    variable loc
+    return  $loc
+}
+
+proc ::grammar::me::tcl::icl_rewind {oldloc} {
+    variable loc
+
+    if 0 {
+	if {($oldloc < -1) || ($oldloc > $loc)} {
+	    return -code error "Bad location \"$oldloc\" (vs $loc)"
+	}
+    }
+    set loc $oldloc
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Error handling.
+
+proc ::grammar::me::tcl::ier_get {} {
+    variable error
+    return  $error
+}
+
+proc ::grammar::me::tcl::ier_clear {} {
+    variable error {}
+    return
+}
+
+proc ::grammar::me::tcl::ier_nonterminal {msg pos} {
+    # Inlined: Errors, Expected.
+
+    variable error
+
+    if {[llength $error]} {
+	foreach {l m} $error break
+	incr pos
+	if {$l == $pos} {
+	    set error [list $l [list $msg]]
+	}
+    }
+}
+
+proc ::grammar::me::tcl::ier_merge {new} {
+    variable error
+
+    # We have either old or new error data, keep it.
+
+    if {![llength $error]} {set error $new ; return}
+    if {![llength $new]}   {return}
+
+    # If one of the errors is further on in the input choose that as
+    # the information to propagate.
+
+    foreach {loe msgse} $error break
+    foreach {lon msgsn} $new   break
+
+    if {$lon > $loe} {set error $new ; return}
+    if {$loe > $lon} {return}
+
+    # Equal locations, merge the message lists.
+
+    foreach m $msgsn {lappend msgse $m}
+    set error [list $loe [lsort -uniq $msgse]]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Operations for the construction of the
+## abstract syntax tree (AST).
+
+proc ::grammar::me::tcl::isv_clear {} {
+    variable sv {}
+    return
+}
+
+proc ::grammar::me::tcl::isv_terminal {} {
+    variable loc
+    variable sv
+    variable as
+
+    set sv [list {} $loc $loc]
+    lappend as $sv
+    return
+}
+
+proc ::grammar::me::tcl::isv_nonterminal_leaf {nt pos} {
+    # Inlined clear, reduce, and optimized.
+    variable ok
+    variable loc
+    variable sv {}
+
+    # Clear ; if {$ok} {Reduce $nt}
+
+    if {$ok} {
+	incr pos
+	set sv [list $nt $pos $loc]
+    }
+    return
+}
+
+proc ::grammar::me::tcl::isv_nonterminal_range {nt pos} {
+    variable ok
+    variable loc
+    variable sv {}
+
+    if {$ok} {
+	# TerminalString $pos
+	# Get all characters after 'pos' to current location as terminal data.
+
+	incr pos
+	set sv [list $nt $pos $loc [list {} $pos $loc]]
+
+	#set sv [linsert $sv 0 $nt] ;#Reduce $nt
+    }
+    return
+}
+
+proc ::grammar::me::tcl::isv_nonterminal_reduce {nt pos {mrk 0}} {
+    variable ok
+    variable as
+    variable loc
+    variable sv {}
+
+    if {$ok} {
+	incr pos
+	set sv [lrange $as $mrk end]         ;#SaveToMark $mrk
+	set sv [linsert $sv 0 $nt $pos $loc] ;#Reduce $nt
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## AST stack handling
+
+proc ::grammar::me::tcl::ias_push {} {
+    variable as
+    variable sv
+    lappend as $sv
+    return
+}
+
+proc ::grammar::me::tcl::ias_mark {} {
+    variable as
+    return [llength $as]
+}
+
+proc ::grammar::me::tcl::ias_pop2mark {mark} {
+    variable as
+    if {[llength $as] <= $mark} return
+    incr mark -1
+    set as [lrange $as 0 $mark]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Data structures.
+
+namespace eval ::grammar::me::tcl {
+    # ### ### ### ######### ######### #########
+    ## Public State of MVM (Matching Virtual Machine)
+
+    variable ok   0  ; # Boolean: Ok/Fail of last match operation.
+
+    # ### ### ### ######### ######### #########
+    ## Internal state.
+
+    variable ct   {}  ; # Current token.
+    variable loc  0   ; # Location of 'ct' as offset in input.
+
+    variable error {} ; # Error data for last match.
+    #                 ; # == List (loc, list of strings)
+    #                 ; # or empty list
+    variable sv   {}  ; # Semantic value for last match.
+
+    # ### ### ### ######### ######### #########
+    ## Data structures for AST construction
+
+    variable as {} ; # Stack of values for AST
+
+    # ### ### ### ######### ######### #########
+    ## Memo data structures for tokens and match results.
+
+    variable tc {}
+    variable nc ; array set nc {}
+
+    # ### ### ### ######### ######### #########
+    ## Input buffer, location of next character to read.
+    ## ASSERT (loc <= cloc)
+
+    variable next   ; # Callback to get next character.
+
+    # Token ordering for range checks. Optional
+
+    variable tokOrd ; array set tokOrd {}
+    variable tokUseOrd 0
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide grammar::me::tcl 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/me_util.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/me_util.tcl
new file mode 100644
index 00000000..625e8941
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/me_util.tcl
@@ -0,0 +1,188 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Package description
+
+## Utility commands for the conversion between various representations
+## of abstract syntax trees.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+namespace eval ::grammar::me::util {
+    namespace export ast2tree ast2etree tree2ast
+}
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+# ### ### ### ######### ######### #########
+## API Implementation.
+
+proc ::grammar::me::util::ast2tree {ast tree {root {}}} {
+    # See grammar::me_ast for the specification of both value and tree
+    # representations.
+
+    if {$root eq ""} {
+	set root [$tree rootname]
+    }
+
+    # Decompose the AST value into its components.
+
+    if {[llength $ast] < 3} {
+	return -code error "Bad node \"$ast\", not enough elements"
+    }
+
+    set type     [lindex $ast 0]
+    set range    [lrange $ast 1 2]
+    set children [lrange $ast 3 end]
+
+    if {($type eq "") && [llength $children]} {
+	return -code error \
+	    "Terminal node \"[lrange $ast 0 2]\" has children"
+    }
+    foreach {s e} $range break
+    if {
+	![string is integer -strict $s] || ($s < 0) ||
+	![string is integer -strict $e] || ($e < 0)
+    } {
+	return -code error "Bad range information \"$range\""
+    }
+
+    # Create a node for the root of the AST and fill it with the data
+    # from the value. Afterward recurse and build the tree for the
+    # children of the root.
+
+    set new [lindex [$tree insert $root end] 0]
+
+    if {$type eq ""} {
+	$tree set $new type terminal
+    } else {
+	$tree set $new type   nonterminal
+	$tree set $new detail $type
+    }
+
+    $tree set $new range $range
+
+    foreach child $children {
+	ast2tree $child $tree $new
+    }
+    return
+}
+
+proc ::grammar::me::util::ast2etree {ast mcmd tree {root {}}} {
+    # See grammar::me_ast for the specification of both value and tree
+    # representations.
+
+    if {$root eq ""} {
+	set root [$tree rootname]
+    }
+
+    # Decompose the AST value into its components.
+
+    if {[llength $ast] < 3} {
+	return -code error "Bad node \"$ast\", not enough elements"
+    }
+
+    set type     [lindex $ast 0]
+    set range    [lrange $ast 1 2]
+    set children [lrange $ast 3 end]
+
+    if {($type eq "") && [llength $children]} {
+	return -code error \
+	    "Terminal node \"[lrange $ast 0 2]\" has children"
+    }
+    foreach {s e} $range break
+    if {
+	![string is integer -strict $s] || ($s < 0) ||
+	![string is integer -strict $e] || ($e < 0)
+    } {
+	return -code error "Bad range information \"$range\""
+    }
+
+    # Create a node for the root of the AST and fill it with the data
+    # from the value. Afterward recurse and build the tree for the
+    # children of the root.
+
+    set new [lindex [$tree insert $root end] 0]
+
+    if {$type eq ""} {
+	set     cmd $mcmd
+	lappend cmd tok
+	foreach loc $range {lappend cmd $loc}
+
+	$tree set $new type   terminal
+	$tree set $new detail [uplevel \#0 $cmd]
+    } else {
+	$tree set $new type   nonterminal
+	$tree set $new detail $type
+    }
+
+    set range_lc {}
+    foreach loc $range {
+	lappend range_lc [uplevel \#0 \
+		[linsert $mcmd end lc $loc]]
+    }
+
+    $tree set $new range    $range
+    $tree set $new range_lc $range_lc
+
+    foreach child $children {
+	ast2etree $child $mcmd $tree $new
+    }
+    return
+}
+
+proc ::grammar::me::util::tree2ast {tree {root {}}} {
+    # See grammar::me_ast for the specification of both value and tree
+    # representations.
+
+    if {$root eq ""} {
+	set root [$tree rootname]
+    }
+
+    set value {}
+
+    if {![$tree keyexists $root type]} {
+	return -code error "Bad node \"$root\", type information is missing"
+    }
+    if {![$tree keyexists $root range]} {
+	return -code error "Bad node \"$root\", range information is missing"
+    }
+
+    set range [$tree get $root range]
+    if {[llength $range] != 2} {
+	return -code error "Bad node \"root\", bad range information \"$range\""
+    }
+
+    foreach {s e} $range break
+    if {
+	![string is integer -strict $s] || ($s < 0) ||
+	![string is integer -strict $e] || ($e < 0)
+    } {
+	return -code error "Bad node \"root\", bad range information \"$range\""
+    }
+
+    if {[$tree get $root type] eq "terminal"} {
+	lappend value {}
+    } else {
+	if {![$tree keyexists $root detail]} {
+	    return -code error "Bad node \"$root\", nonterminal detail is missing"
+	}
+
+	lappend value [$tree get $root detail]
+    }
+
+    # Range data ...
+    lappend value $s $e
+
+    foreach child [$tree children $root] {
+	lappend value [tree2ast $tree $child]
+    }
+
+    return $value
+}
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide grammar::me::util 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/pkgIndex.tcl
new file mode 100644
index 00000000..f43762aa
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_me/pkgIndex.tcl
@@ -0,0 +1,7 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+
+package ifneeded grammar::me::util      0.1 [list source [file join $dir me_util.tcl]]
+package ifneeded grammar::me::tcl       0.1 [list source [file join $dir me_tcl.tcl]]
+package ifneeded grammar::me::cpu       0.2 [list source [file join $dir me_cpu.tcl]]
+package ifneeded grammar::me::cpu::core 0.2 [list source [file join $dir me_cpucore.tcl]]
+package ifneeded grammar::me::cpu::gasm 0.1 [list source [file join $dir gasm.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_peg/peg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_peg/peg.tcl
new file mode 100644
index 00000000..2ccfa725
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_peg/peg.tcl
@@ -0,0 +1,541 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Grammars / Parsing Expression Grammars / Container
+
+# ### ### ### ######### ######### #########
+## Package description
+
+# A class whose instances hold all the information describing a single
+# parsing expression grammar (terminal symbols, nonterminal symbols,
+# nonterminal rules, start expression, hints), and operations to
+# define, manipulate, and query this information.
+#
+# The container has only one functionality beyond the simple storage
+# of the aforementioned information. It keeps track if the provided
+# grammar is valid (*). The container provides no higher-level
+# operations on the grammar, like removal of unreachable nonterminals,
+# rule rewriting, etc.
+#
+# The set of terminal symbols is the set of characters (i.e.
+# implicitly defined). For Tcl this means that all the unicode
+# characters are supported.
+#
+# (*) A grammar is valid if and only if all its rules are valid.  A
+# rule is valid if and only if all nonterminals referenced by the RHS
+# of the rule are in the set of nonterminals, and if only the allowed
+# operators are used in the expression.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require snit         ; # Tcllib | OO system used
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::grammar::peg {
+    # ### ### ### ######### ######### #########
+    ## Type API. Helpful methods for PEs.
+
+    proc ValidateSerial {e prefix} {}
+    proc Validate   {e} {}
+    proc References {e} {}
+    proc Rename     {e old new} {}
+
+    # ### ### ### ######### ######### #########
+    ## Instance API
+
+    constructor {args} {}
+
+    method clear {} {}
+
+    method =   {src} {}
+    method --> {dst} {}
+    method serialize {} {}
+    method deserialize {value} {}
+
+    method {is valid} {} {}
+    method start {args} {}
+
+    method nonterminals {} {}
+    method {nonterminal add}    {nts pae} {}
+    method {nonterminal delete} {nts pae} {}
+    method {nonterminal exists} {nts} {}
+    method {nonterminal rename} {ntsold ntsnew} {}
+    method {nonterminal mode}   {nts args} {}
+
+    method {unknown nonterminals} {} {}
+
+    method {nonterminal rule}   {nts} {}
+
+    # ### ### ### ######### ######### #########
+    ## Internal data structures.
+
+    ## - Set of nonterminal symbols, and
+    ## - Mapping from nonterminals to their defining parsing
+    ##   expressions, and
+    ## - Start parsing expression.
+    ## - And usage of nonterminals by others, required for tracking
+    ##   of validity.
+
+    ## se: expression               | Start expression
+    ## nt: nonterm -> expression    | Known Nt's, their rules
+    ## re: nonterm -> list(nonterm) | Known Nt's, what others they use.
+    ## ir: nonterm -> list(nonterm) | Nt's, possibly unknown, their users.
+    ## uk: nonterm -> use counter   | Nt's which are unknown.
+    ##
+    ## Both 're' and 'ir' can list a nonterminal A multiple times,
+    ## if it uses or is used multiple times.
+    ##
+    ## Grammar is invalid <=> '[array size uk] > 0'
+
+    variable se        epsilon
+    variable nt -array {}
+    variable re -array {}
+    variable ir -array {}
+    variable uk -array {}
+    variable mo -array {}
+
+    # ### ### ### ######### ######### #########
+    ## Instance API Implementation.
+
+    constructor {args} {
+	if {
+	    (([llength $args] != 0) && ([llength $args] != 2)) ||
+	    (([llength $args] == 2) && ([lsearch {= := <-- as deserialize} [lindex $args 0]]) < 0)
+	} {
+	    return -code error "wrong#args: $self ?=|:=|<--|as|deserialize a'?"
+	}
+
+	# Serialization arguments.
+	# [llength args] in {0 2}
+	#
+	# =           src-obj
+	# :=          src-obj
+	# <--         src-obj
+	# as          src-obj
+	# deserialize src-value
+
+	if {[llength $args] == 2} {
+	    foreach {op val} $args break
+	    switch -exact -- $op {
+		= - := - <-- - as {
+		    $self deserialize [$val serialize]
+		}
+		deserialize {
+		    $self deserialize $val
+		}
+	    }
+	}
+	return
+    }
+
+    #destructor {}
+
+    method clear {} {
+	array unset nt *
+	array unset re *
+	array unset ir *
+	array unset uk *
+	array unset mo *
+	set se epsilon
+	return
+    }
+
+    method = {src} {
+	$self dserialize [$src serialize]
+    }
+
+    method --> {dst} {
+	$dst deserialize [$self serialize]
+    }
+
+    method serialize {} {
+	return [::list \
+		grammar::pegc \
+		[array get nt] \
+		[array get mo] \
+		$se]
+    }
+
+    method deserialize {value} {
+	# Validate value, then clear and refill.
+
+	$self CheckSerialization $value ntv mov sev
+	$self clear
+
+	foreach {s e} $ntv {
+	    $self NtAdd $s $e
+	}
+	array set mo $mov
+	$self start $sev
+	return
+    }
+
+    method {is valid} {} {
+	return [expr {[array size uk] == 0}]
+    }
+
+    method start {args} {
+	if {[llength $args] == 0} {
+	    return $se
+	}
+	if {[llength $args] > 1} {
+	    return -code error "wrong#args: $self start ?pe?"
+	}
+	set newse [lindex $args 0]
+	Validate $newse
+	set se   $newse
+	return
+    }
+
+    method nonterminals {} {
+	return [array names nt]
+    }
+
+    method {nonterminal add} {nts pae} {
+	$self CheckNtKnown $nts
+	Validate $pae
+	$self NtAdd $nts $pae
+	return
+    }
+
+    method {nonterminal mode} {nts args} {
+	$self CheckNt $nts
+	if {![llength $args]} {
+	    return $mo($nts)
+	} elseif {[llength $args] == 1} {
+	    set mo($nts) [lindex $args 0]
+	    return
+	} else {
+	    return -code error "wrong#args"
+	}
+	return
+    }
+
+    method {nonterminal delete} {nts args} {
+	set args [linsert $args 0 $nts]
+	foreach nts $args {
+	    $self CheckNt $nts
+	}
+
+	foreach nts $args {
+	    $self NtDelete $nts
+	}
+	return
+    }
+
+    method {nonterminal exists} {nts} {
+	return [info exists nt($nts)]
+    }
+
+    method {nonterminal rename} {ntsold ntsnew} {
+	$self CheckNt      $ntsold
+	$self CheckNtKnown $ntsnew
+
+	# Difficult. We have to go through all rules and rewrite their
+	# RHS to use the new name of the nonterminal. We can however
+	# restrict ourselves to the rules which actually use the
+	# changed nonterminal.
+
+	# We also have to update the used/user information. We know
+	# that the validity of the grammar is unchanged by this
+	# operation. The unknown information is unchanged as well, as
+	# we cannot rename an unknown nonterminal. IOW we know that
+	# 'ntsold' is not in 'uk', and so 'ntsnew' will not be in that
+	# array either after the rename.
+
+	set myusers $ir($ntsold)
+	set myused  $re($ntsold)
+
+	set nt($ntsnew) $nt($ntsold)
+	unset            nt($ntsold)
+
+	set mo($ntsnew) $mo($ntsold)
+	unset            mo($ntsold)
+
+	foreach x $myusers {
+	    set nt($x) [Rename $nt($x) $ntsold $ntsnew]
+	}
+
+	# It is possible to use myself, and be used by myself.
+
+	while {[set pos [lsearch -exact $myusers $ntsold]] >= 0} {
+	    set myusers [lreplace $myusers $pos $pos $ntsnew]
+	}
+	while {[set pos [lsearch -exact $myused $ntsold]] >= 0} {
+	    set myused [lreplace $myused $pos $pos $ntsnew]
+	}
+
+	set re($ntsnew) $myusers
+	set ir($ntsnew) $myused
+
+	unset            re($ntsold)
+	unset            ir($ntsold)
+	return
+    }
+
+    method {unknown nonterminals} {} {
+	return [array names uk]
+    }
+
+    method {nonterminal rule} {nts} {
+	$self CheckNt $nts
+	return $nt($nts)
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal helper methods
+
+    method NtAdd {nts pae} {
+	# None of the symbols is known. We can add them to the
+	# grammar. If however any of their PEs is known to the PE
+	# storage then we had expressions refering to unknown
+	# symbols. The grammar is most certainly invalid and may have
+	# become valid right now. We have to invalidate the validity
+	# cache.
+
+	set nt($nts) $pae
+	set mo($nts) value
+
+	# Track users, uses, and unknowns.
+
+	set references [References $pae]
+
+	# We use the refered symbols
+	set re($nts) $references
+
+	# We are a user for the refered symbols
+	# Record unknown symbols immediately.
+	foreach x $references {
+	    lappend ir($x) $nts
+	    if {[info exists nt($x)]} continue
+	    if {[catch {incr uk($x)}]} {set uk($x) 1}
+	}
+
+	# We are definitely not unknown.
+	unset -nocomplain uk($nts)
+	return
+    }
+
+    method NtDelete {nts} {
+	set references $re($nts)
+
+	# We are gone. We are not using anything anymore.
+	unset    nt($nts)
+	unset    re($nts)
+	unset    mo($nts)
+
+	# Our references loose us as their user.
+	foreach x $references {
+	    set pos [lsearch -exact $ir($x) $x]
+	    if {$pos < 0} {error PANIC}
+	    set ir($x) [lreplace $ir($x) $pos $pos]
+	    if {[llength $ir($x)] == 0} {
+		unset ir($x)
+		# x is not referenced anywhere, cannot be unknown.
+		unset -nocomplain uk($x)
+	    }
+	    if {[info exists uk($x)]} {
+		incr uk($x) -1
+	    }
+	}
+
+	# We might be used by others still, and therefore become
+	# unknown.
+
+	if {[info exists ir($nts]} {
+	    set uk($nts) [llength $ir($nts)]
+	}
+	return
+    }
+
+    method CheckNt {nts} {
+	if {![info exists nt($nts)]} {
+	    return -code error "Invalid nonterminal \"$nts\""
+	}
+	return
+    }
+
+    method CheckNtKnown {nts} {
+	if {[info exists nt($nts)]} {
+	    return -code error "Nonterminal \"$nts\" is already known"
+	}
+	return
+    }
+
+    method CheckSerialization {value ntv mov sev} {
+	# value is list/3 ('grammar::pegc' nonterminals start)
+	# terminals is list of string.
+	# nonterminals is doct (key is string, value is expr)
+	# start is expr
+	# terminals * nonterminals == empty
+	# expr is parsing expression (Validate PE).
+
+	upvar 1 \
+	    $ntv ntvs \
+	    $mov movs \
+	    $sev sevs
+
+	set prefix "error in serialization:"
+	if {[llength $value] != 4} {
+	    return -code error "$prefix list length not 4"
+	}
+
+	struct::list assign $value type nonterminals hints start
+	if {$type ne "grammar::pegc"} {
+	    return -code error "$prefix unknown type \"$type\""
+	}
+
+	ValidateSerial $start "$prefix invalid start expression"
+
+	if {[llength $nonterminals] % 2 == 1} {
+	    return -code error "$prefix nonterminal data is not a dictionary"
+	}
+	array set _nt $nonterminals
+	if {[llength $nonterminals] != (2*[array size _nt])} {
+	    return -code error "$prefix nonterminal data contains duplicate names, or misses some"
+	}
+
+	foreach {s e} $nonterminals {
+	    ValidateSerial $start "$prefix nonterminal \"$s\", invalid parsing expression"
+	}
+
+
+	if {[llength $hints] % 2 == 1} {
+	    return -code error "$prefix nonterminal modes is not a dictionary"
+	}
+	array set _mo $hints
+	if {[llength $hints] != (2*[array size _mo])} {
+	    return -code error "$prefix nonterminal modes contains duplicate names, or misses some"
+	}
+	foreach {s _} $hints {
+	    if {![info exists _nt($s)]} {
+		return -code error "$prefix nonterminal mode for unknown nonterminal \"$s\""
+	    }
+	}
+
+	set ntvs $nonterminals
+	set sevs $start
+	set movs $hints
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    # ### ### ### ######### ######### #########
+    ## Type API implementation.
+
+    proc ValidateSerial {e prefix} {
+	if {![catch {Validate $e} msg]} return
+	return -code error "$prefix, $msg"
+    }
+
+    proc Validate {e} {
+	if {[llength $e] == 0} {
+	    return -code error "invalid empty expression list"
+	}
+
+	set op [lindex $e 0]
+	set ar [lrange $e 1 end]
+
+	switch -exact -- $op {
+	    epsilon - alpha - alnum - dot {
+		if {[llength $ar] > 0} {
+		    return -code error "wrong#args for \"$op\""
+		}
+	    }
+	    .. {
+		if {[llength $ar] != 2} {
+		    return -code error "wrong#args for \"$op\""
+		}
+		# Leaf, arguments are not expressions to validate.
+	    }
+	    n - t {
+		if {[llength $ar] != 1} {
+		    return -code error "wrong#args for \"$op\""
+		}
+		# Leaf, argument is not expression to validate.
+	    }
+	    & - ! - * - + - ? {
+		if {[llength $ar] != 1} {
+		    return -code error "wrong#args for \"$op\""
+		}
+		Validate [lindex $ar 0]
+	    }
+	    x - / {
+		if {![llength $ar]} {
+		    return -code error "wrong#args for \"$op\""
+		}
+		foreach e $ar {
+		    Validate $e
+		}
+	    }
+	    default {
+		return -code error "invalid operator \"$op\""
+	    }
+	}
+    }
+
+    proc References {e} {
+	set references {}
+
+	set op [lindex $e 0]
+	set ar [lrange $e 1 end]
+
+	switch -exact -- $op {
+	    epsilon - t - alpha - alnum - dot - .. {}
+	    n {
+		# Remember referenced nonterminal
+		lappend references [lindex $ar 0]
+	    }
+	    & - ! - * - + - ? {
+		foreach r [References [lindex $ar 0]] {
+		    lappend references $r
+		}
+	    }
+	    x - / {
+		foreach e $ar {
+		    foreach r [References $e] {
+			lappend references $r
+		    }
+		}
+	    }
+	}
+	return $references
+    }
+
+    proc Rename {e old new} {
+	set op [lindex $e 0]
+	set ar [lrange $e 1 end]
+
+	switch -exact -- $op {
+	    epsilon - t - alpha - alnum - dot - .. {return $e}
+	    n {
+		if {[lindex $ar 0] ne $old} {return $e}
+		return [list n $new]
+	    }
+	    & - ! - * - + - ? {
+		return [list $op [Rename [lindex $ar 0] $old $new]]
+	    }
+	    x - / {
+		set res $op
+		foreach e $ar {
+		    lappend res [Rename $e $old $new]
+		}
+		return $res
+	    }
+	}
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Type Internals.
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide grammar::peg 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_peg/peg_interp.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_peg/peg_interp.tcl
new file mode 100644
index 00000000..b0c7f2f2
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_peg/peg_interp.tcl
@@ -0,0 +1,350 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Grammar / Parsing Expression Grammar / Interpreter (Namespace based)
+
+# ### ### ### ######### ######### #########
+## Package description
+
+## The instances of this class match an input provided by a buffer to
+## a parsing expression grammar provided by a peg container. The
+## matching process is interpretative, i.e. expressions are matched on
+## the fly and multiple as they are encountered. The interpreter
+## operates in pull-push mode, i.e. the interpreter object is in
+## charge and reads the character stream from the buffer as it needs,
+## and returns with the result of the match either when encountering
+## an error, or when the match was successful.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require grammar::me::tcl
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+namespace eval ::grammar::peg::interp {
+    # Import the virtual machine for matching.
+
+    namespace import ::grammar::me::tcl::*
+    upvar #0 ::grammar::me::tcl::ok ok
+}
+
+# ### ### ### ######### ######### #########
+## Instance API Implementation.
+
+proc ::grammar::peg::interp::setup {peg} {
+    variable ru
+    variable mo
+    variable se
+
+    if {![$peg is valid]} {
+        return -code error "Cannot initialize interpreter for invalid grammar"
+    }
+    set se [$peg start]
+    foreach s [$peg nonterminals] {
+        set ru($s) [$peg nonterminal rule $s]
+        set mo($s) [$peg nonterminal mode $s]
+    }
+
+    #parray mo
+    return
+}
+
+proc ::grammar::peg::interp::parse {nxcmd emvar astvar} {
+    variable ok
+    variable se
+
+    upvar 1 $emvar emsg $astvar ast
+
+    init $nxcmd
+
+    MatchExpr $se
+    isv_nonterminal_reduce ALL -1
+    set ast [sv]
+    if {!$ok} {
+        foreach {l m} [ier_get] break
+        lappend l [lc $l]
+        set emsg [list $l $m]
+    }
+
+    return $ok
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper methods
+
+proc ::grammar::peg::interp::MatchExpr {e} {
+    variable ok
+    variable mode
+    variable mo
+    variable ru
+
+    set op [lindex $e 0]
+    set ar [lrange $e 1 end]
+
+    switch -exact -- $op {
+        epsilon {
+            # No input to match, nor consume. Match always.
+            iok_ok
+        }
+        dot {
+            # Match and consume one character. No matter which
+            # character. Fails only when reaching eof. Does not
+            # consume input on failure.
+            
+            ict_advance "Expected any character (got EOF)"
+            if {$ok && ($mode eq "value")} {isv_terminal}
+        }
+        alnum - alpha {
+            ict_advance            "Expected <$op> (got EOF)"
+            if {!$ok} return
+
+            ict_match_tokclass $op "Expected <$op>"
+            if {$ok && ($mode eq "value")} {isv_terminal}
+        }
+        t {
+            # Match and consume one specific character. Fails if
+            # the character at the location is not what was
+            # expected. Does not consume input on failure.
+
+            set ch [lindex $ar 0]
+
+            ict_advance     "Expected $ch (got EOF)"
+            if {!$ok} return
+
+            ict_match_token $ch "Expected $ch"
+            if {$ok && ($mode eq "value")} {isv_terminal}
+        }
+        .. {
+            # Match and consume one character, if in the specified
+            # range. Fails if the read character is outside of the
+            # range. Does not consume input on failure.
+
+            foreach {chbegin chend} $ar break
+
+            ict_advance                        "Expected \[$chbegin .. $chend\] (got EOF)"
+            if {!$ok} return
+
+            ict_match_tokrange $chbegin $chend "Expected \[$chbegin .. $chend\]"
+            if {$ok && ($mode eq "value")} {isv_terminal}
+        }
+        n {
+            # To match a nonterminal in the input we match its
+            # parsing expression. This can be cut short if the
+            # necessary information can be obtained from the memo
+            # cache. Does not consume input on failure.
+
+            set nt [lindex $ar 0]
+            set savemode $mode
+            set mode $mo($nt)
+
+            if {[inc_restore $nt]} {
+                if {$ok && ($mode ne "discard")} ias_push
+                set mode $savemode
+                return
+            }
+
+            set pos [icl_get]
+            set mrk [ias_mark]
+
+            MatchExpr $ru($nt)
+
+            # Generate semantic value, based on mode.
+            if {$mode eq "value"} {
+                isv_nonterminal_reduce $nt $pos $mrk
+            } elseif {$mode eq "match"} {
+                isv_nonterminal_range  $nt $pos
+            } elseif {$mode eq "leaf"} {
+                isv_nonterminal_leaf   $nt $pos
+            } else {
+                # mode eq "discard"
+                isv_clear
+            }
+            inc_save $nt $pos
+
+            # AST operations ...
+            ias_pop2mark $mrk
+            if {$ok && ($mode ne "discard")} ias_push
+
+            set mode $savemode
+            # Even if match is ok.
+	    ier_nonterminal "Expected $nt" $pos
+        }
+        & {
+            # Lookahead predicate. And. Matches the expression
+            # against the input and returns match result. Never
+            # consumes any input.
+
+            set pos [icl_get]
+
+            MatchExpr [lindex $ar 0]
+
+            icl_rewind $pos
+            return
+        }
+        ! {
+            # Negated lookahead predicate. Matches the expression
+            # against the input and returns the negated match
+            # result. Never consumes any input.
+
+            set pos [icl_get]
+            set mrk [ias_mark]
+            
+            MatchExpr [lindex $ar 0]
+
+            if {$ok} {ias_pop2mark $mrk}
+            icl_rewind $pos
+
+            iok_negate
+            return
+        }
+        * {
+            # Zero or more repetitions. This consumes as much
+            # input as it was able to match the sub
+            # expression. The expresion as a whole always matches,
+            # even if the sub expression fails (zero repetition).
+
+            set sub [lindex $ar 0]
+
+            while {1} {
+                set pos [icl_get]
+
+                set old [ier_get]
+                MatchExpr $sub
+                ier_merge $old
+
+                if {$ok} continue
+		break
+            }
+
+	    icl_rewind $pos
+	    iok_ok
+	    return
+        }
+        + {
+            # One or more repetition. Like *, except for one match
+            # at the front which has to match for success. This
+            # expression can fail. It will consume only as much
+            # input as it was able to match.
+
+            set sub [lindex $ar 0]
+
+            set pos [icl_get]
+
+            MatchExpr $sub
+            if {!$ok} {
+                icl_rewind $pos
+                return
+            }
+
+            while {1} {
+                set pos [icl_get]
+
+                set old [ier_get]
+                MatchExpr $sub
+                ier_merge $old
+
+                if {$ok} continue
+		break
+            }
+
+	    icl_rewind $pos
+	    iok_ok
+	    return
+        }
+        ? {
+            # Optional matching. Tries to match the sub
+            # expression. Will never fail, even if the sub
+            # expression is not matching. Consumes only input as
+            # it could match in the sub expression. Like *, but
+            # without the repetition.
+
+            set pos [icl_get]
+
+	    set old [ier_get]
+            MatchExpr [lindex $ar 0]
+	    ier_merge $old
+
+            if {!$ok} {
+                icl_rewind $pos
+                iok_ok
+            }
+            return
+        }
+        x {
+            # Sequence. Matches each sub expression in turn, each
+            # consuming input. In case of failure by one of the
+            # sequence elements nothing is consumed at all.
+
+            set pos [icl_get]
+            set mrk [ias_mark]
+            ier_clear
+
+            foreach e $ar {
+
+                set old [ier_get]
+                MatchExpr $e
+                ier_merge $old
+
+                if {!$ok} {
+                    ias_pop2mark $mrk
+                    icl_rewind $pos
+                    return
+                }
+            }
+            # OK
+            return
+        }
+        / {
+            # Choice. Matches each sub expression in turn, always
+            # starting from the current location. Nothing is
+            # consumed if all branches fail. Consumes as much as
+            # was consumed by the matching branch.
+
+            set pos [icl_get]
+            set mrk [ias_mark]
+
+            ier_clear
+            foreach e $ar {
+
+                set old [ier_get]
+                MatchExpr $e
+                ier_merge $old
+
+                if {!$ok} {
+                    ias_pop2mark $mrk
+                    icl_rewind $pos
+                    continue
+                }
+                return
+            }
+            # FAIL
+            iok_fail
+            return
+        }
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Interpreter data structures.
+
+namespace eval ::grammar::peg::interp {
+    ## Start expression.
+    ## Map from nonterminals to their expressions.
+    ## Reference to internal memo cache.
+
+    variable se {} ; # Start expression.
+    variable ru    ; # Nonterminals and rule map.
+    variable mo    ; # Nonterminal modes.
+
+    variable mode value ; # Matching mode.
+
+    array set ru {}
+    array set mo {}
+}
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide grammar::peg::interp 0.1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_peg/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_peg/pkgIndex.tcl
new file mode 100644
index 00000000..dfed1efb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/grammar_peg/pkgIndex.tcl
@@ -0,0 +1,2 @@
+package ifneeded grammar::peg         0.2   [list source [file join $dir peg.tcl]]
+package ifneeded grammar::peg::interp 0.1.1 [list source [file join $dir peg_interp.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/hook/hook.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/hook/hook.tcl
new file mode 100644
index 00000000..9d3ca677
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/hook/hook.tcl
@@ -0,0 +1,358 @@
+# hook.tcl
+#
+#       This file implements the hook(n) Subject/Observer
+#       callback mechanism.  Any number of observers can register for
+#       a particular hook from a particular subject; when the
+#       subject calls the hook, all observers are called.
+#
+# Copyright (C) 2010 by Will Duquette
+#
+# See the file "license.terms" for information on usage and
+# redistribution of this file, and for a DISCLAIMER OF ALL
+# WARRANTIES.
+
+namespace eval hook {
+    namespace export bind call cget configure forget
+    namespace ensemble create
+
+    # Subject Dictionary:
+    #
+    # Dictionary subject -> hook -> observer -> binding
+
+    variable sdict [dict create]
+
+    # Observer Dictionary:
+    #
+    # Dictionary observer -> subject -> hook -> 1
+    #
+    # The "1" is so that the hook name is a key, and can be
+    # cleared using [dict unset $o $s $h]
+
+    variable odict [dict create]
+
+    # Observer counter
+    #
+    # Used to auto-generate observer names in [hook bind].
+
+    variable observerCounter 0
+
+    # Configuration options
+    #
+    # -errorcommand  Handles errors in hook bindings.
+    # -tracecommand  Trace called hooks.
+
+    variable options
+    array set options {
+        -errorcommand {}
+        -tracecommand {}
+    }
+}
+
+
+# hook::bind --
+#
+#       By default, binds an observer to a subject's hook.
+#       Alternatively, bind can delete or query a binding, or query a
+#       number of bindings.
+#
+# Arguments:
+#       subject   (optional) The name of the entity that owns the hook.
+#                 It will usually be a fully-qualified command
+#                 name, but "virtual" subjects are also allowed.
+#
+#       hook      (optional) The name of the hook.  By convention,
+#                 hook names are enclosed in angle brackets and contain
+#                 no whitespace; however, any non-empty string is allowed.
+#
+#       observer  (optional) The name of the entity observing the hook.
+#                 It will usually be a fully-qualified command name,
+#                 but "virtual" observers are also allowed.
+#
+#                 If observer is the empty string, an observer name
+#                 of the form "::hook::ob<num>" will be generated.
+#
+#       binding   (optional) The binding proper, a command prefix to which
+#                 the hook's arguments will be appended.
+#
+# Results:
+#       If called with no arguments, returns a list of the names of the
+#       subjects to which observers are bound.
+#
+#       If called with just a subject name, returns a list of the names
+#       of the subject's hooks to which bindings are bound.
+#
+#       If called with just a subject name and a hook name, returns a
+#       list of the names of the observers bound to that subject and hook.
+#
+#       If called with a subject name, hook name, and observer name,
+#       returns the associated binding, or the empty string if none.
+#
+#       If called with all four arguments, it either adds or deletes
+#       a binding.  If the binding is the empty string, any existing
+#       binding is deleted and the empty string is returned.
+#       Otherwise the binding is saved, and the observer name is
+#       returned.  The observer will be automatically
+#       generated if the empty string is given.
+
+proc hook::bind {args} {
+    variable sdict
+    variable odict
+    variable observerCounter
+
+    # FIRST, there should be no more than four args.
+    set argc [llength $args]
+
+    if {$argc > 4} {
+        return -code error "wrong # args: should be \"hook bind ?subject? ?hook? ?observer? ?binding?\""
+    }
+
+    lassign $args subject hook observer binding
+
+    # NEXT, Add, update, or delete a binding.
+    if {$argc == 4} {
+        if {$binding ne ""} {
+            # FIRST, auto-generate an observer, if need be.  Note that
+            # with bignums there's no chance of running out of valid
+            # observer IDs.
+            if {$observer eq ""} {
+                set observer [namespace current]::ob[incr observerCounter]
+            }
+
+            # NEXT, add or update the binding
+            dict set sdict $subject $hook $observer $binding
+            dict set odict $observer $subject $hook 1
+
+            # NEXT, return the observer.
+            return $observer
+        } else {
+            if {[dict exists $sdict $subject $hook $observer]} {
+                dict unset sdict $subject $hook $observer
+            }
+            if {[dict exists $odict $observer $subject $hook]} {
+                dict unset odict $observer $subject $hook
+            }
+        }
+
+        return
+    }
+
+    # NEXT, Query a binding
+    if {$argc == 3} {
+        if {[dict exists $sdict $subject $hook $observer]} {
+            return [dict get $sdict $subject $hook $observer]
+        } else {
+            return {}
+        }
+    }
+
+    # NEXT, Query the observers bound to a subject and hook.
+    if {$argc == 2} {
+        if {[dict exists $sdict $subject $hook]} {
+            return [dict keys [dict get $sdict $subject $hook]]
+        } else {
+            return {}
+        }
+    }
+
+    # NEXT, query the bound hooks for a given subject.
+    if {$argc == 1} {
+        if {[dict exists $sdict $subject]} {
+            return [dict keys [dict get $sdict $subject]]
+        } else {
+            return {}
+        }
+    }
+
+    # FINALLY, query the subjects with active bindings.
+    return [dict keys $sdict]
+}
+
+
+# hook::forget --
+#
+#       Forget all bindings in which a named entity appears as either
+#       subject or observer.  No error is raised if the named entity
+#       appears in no bindings at all.
+#
+# Arguments:
+#       object    The name of a subject, an observer, or both.
+#
+# Results:
+#       Returns the empty string.
+
+proc hook::forget {object} {
+    variable sdict
+    variable odict
+
+    # FIRST, get rid of any odict entries for which this object
+    # is the subject.
+    if {[dict exists $sdict $object]} {
+        dict for {hook dict_o} [dict get $sdict $object] {
+            dict for {observer binding} $dict_o {
+                dict unset odict $observer $object $hook
+            }
+        }
+    }
+
+
+    # NEXT, get rid of any sdict entries for which this object is
+    # the observer.
+    if {[dict exists $odict $object]} {
+        dict for {subject hdict} [dict get $odict $object] {
+            dict for {hook dummy} $hdict {
+                dict unset sdict $subject $hook $object
+            }
+        }
+    }
+
+
+    # NEXT, get rid of this object from sdict as subject.
+    dict unset sdict $object
+
+    # NEXT, get rid of this object form odict as observers.
+    dict unset odict $object
+
+
+    return
+}
+
+# hook::call --
+#
+#       A subject calls a hook.  Bindings are called for all bound
+#       observers.  There is no guarantee of the order in which bindings
+#       will be called.  All bindings are called before the call returns.
+#       Note that modules should document the hooks they call, including
+#       details of any arguments associated with each hook.
+#
+# Arguments:
+#       subject     The subject sending the hook
+#       hook        The name of the hook being sent
+#       args        (optional) any arguments for this subject and hook.
+#
+# Results:
+#       The bindings are called in no particular order; the args are
+#       appended to each binding.  Returns the empty string.
+#
+#       If -errorcommand is defined, errors in bindings are handled
+#       by the specified command.  It is called with three arguments:
+#       a list of the subject, hook, args, and observer, the error result,
+#       and the return options dictionary.
+#
+#       When the -tracecommand is set, it is called with four arguments:
+#       the subject, the hook, a list of the hook arguments, and a
+#       list of the receiving observers.
+
+proc hook::call {subject hook args} {
+    variable sdict
+    variable options
+
+    # FIRST, If there are no observers we're done.
+    if {[dict exists $sdict $subject $hook]} {
+        set observers [dict keys [dict get $sdict $subject $hook]]
+    } else {
+        set observers [list]
+    }
+
+    # NEXT, for each observer, retrieve the binding (if it
+    # still exists) and execute it.  Keep track of the observers
+    # for which the hook was actually called.
+    set called [list]
+
+    foreach observer $observers {
+        # FIRST, skip bindings that no longer exist.
+        if {![dict exists $sdict $subject $hook $observer]} {
+            continue
+        }
+
+        set binding [dict get $sdict $subject $hook $observer]
+
+        # NEXT, remember that we called a binding for this observer.
+        lappend called $observer
+
+        if {$options(-errorcommand) eq ""} {
+            uplevel #0 [list {*}$binding {*}$args]
+        } elseif {[catch {
+            uplevel #0 [list {*}$binding {*}$args]
+        } result opts]} {
+            uplevel #0 \
+                [list {*}$options(-errorcommand) \
+                     [list $subject $hook $args $observer] \
+                     $result                               \
+                     $opts]
+        }
+    }
+
+    if {$options(-tracecommand) ne ""} {
+        {*}$options(-tracecommand) $subject $hook $args $called
+    }
+
+    return
+}
+
+# hook::cget --
+#
+#       Returns the value of a hook configuration option.
+#
+# Arguments:
+#       option    The name of the option
+#
+# Results:
+#       Returns the option's value.  Throws an error if the
+#       option name is invalid.
+
+proc hook::cget {option} {
+    variable options
+
+    if {$option ni [array names options]} {
+        return -code error "unknown option \"$option\""
+    }
+
+    return $options($option)
+}
+
+
+# hook::configure --
+#
+#       Sets the value of one or more hook configuration options.
+#
+# Arguments:
+#       args   A list of option names and their values
+#
+# Results:
+#       Saves the option values.  Throws an error for unknown options
+#       and invalid values.  No option values are changed on error.
+
+proc hook::configure {args} {
+    variable options
+
+    # FIRST, validate the options
+    set argc [llength $args]
+    set i 0
+
+    while {$i < $argc} {
+        # FIRST, make sure it's a known option.
+        set option [lindex $args [incr i]-1]
+
+        if {$option ni [array names options]} {
+            return -code error "unknown option \"$option\""
+        }
+
+        # NEXT, make sure a value is specified.
+        if {$i == $argc} {
+            return -code error "value for \"$option\" missing"
+        }
+
+        # NEXT, skip the value
+        incr i
+    }
+
+    # NEXT, save the values
+    array set options $args
+
+    return
+}
+
+# ---------------------------------------------------------------
+# Ready
+
+package provide hook 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/hook/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/hook/pkgIndex.tcl
new file mode 100644
index 00000000..9666ae8f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/hook/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded hook 0.2 [list source [file join $dir hook.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/html/html.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/html/html.tcl
new file mode 100644
index 00000000..710be6ec
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/html/html.tcl
@@ -0,0 +1,1581 @@
+# html.tcl --
+#
+#	Procedures to make generating HTML easier.
+#
+#	This module depends on the ncgi module for the procedures
+#	that initialize form elements based on current CGI values.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+# Copyright (c) 2006 Michael Schlenker <mic42@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# Originally by Brent Welch, with help from Dan Kuchler and Melissa Chawla
+
+package require Tcl 8.2
+package require ncgi
+package provide html 1.5
+
+namespace eval ::html {
+
+    # State about the current page
+
+    variable page
+
+    # A simple set of global defaults for tag parameters is implemented
+    # by storing into elements indexed by "key.param", where key is
+    # often the name of an HTML tag (anything for scoping), and
+    # param must be the name of the HTML tag parameter (e.g., "href" or "size")
+    #	input.size
+    #	body.bgcolor
+    #	body.text
+    #	font.face
+    #	font.size
+    #	font.color
+
+    variable defaults
+    array set defaults {
+	input.size	45
+	body.bgcolor	white
+	body.text	black
+    }
+
+    # In order to nandle nested calls to redefined control structures,
+    # we need a temporary variable that is known not to exist.  We keep this
+    # counter to append to the varname.  Each time we need a temporary
+    # variable, we increment this counter.
+
+    variable randVar 0
+
+    # No more export, because this defines things like
+    # foreach and if that do HTML things, not Tcl control
+    # namespace export *
+
+    # Dictionary mapping from special characters to their entities.
+
+    variable entities {
+        \xa0 &nbsp; \xa1 &iexcl; \xa2 &cent; \xa3 &pound; \xa4 &curren;
+        \xa5 &yen; \xa6 &brvbar; \xa7 &sect; \xa8 &uml; \xa9 &copy;
+        \xaa &ordf; \xab &laquo; \xac &not; \xad &shy; \xae &reg;
+        \xaf &macr; \xb0 &deg; \xb1 &plusmn; \xb2 &sup2; \xb3 &sup3;
+        \xb4 &acute; \xb5 &micro; \xb6 &para; \xb7 &middot; \xb8 &cedil;
+        \xb9 &sup1; \xba &ordm; \xbb &raquo; \xbc &frac14; \xbd &frac12;
+        \xbe &frac34; \xbf &iquest; \xc0 &Agrave; \xc1 &Aacute; \xc2 &Acirc;
+        \xc3 &Atilde; \xc4 &Auml; \xc5 &Aring; \xc6 &AElig; \xc7 &Ccedil;
+        \xc8 &Egrave; \xc9 &Eacute; \xca &Ecirc; \xcb &Euml; \xcc &Igrave;
+        \xcd &Iacute; \xce &Icirc; \xcf &Iuml; \xd0 &ETH; \xd1 &Ntilde;
+        \xd2 &Ograve; \xd3 &Oacute; \xd4 &Ocirc; \xd5 &Otilde; \xd6 &Ouml;
+        \xd7 &times; \xd8 &Oslash; \xd9 &Ugrave; \xda &Uacute; \xdb &Ucirc;
+        \xdc &Uuml; \xdd &Yacute; \xde &THORN; \xdf &szlig; \xe0 &agrave;
+        \xe1 &aacute; \xe2 &acirc; \xe3 &atilde; \xe4 &auml; \xe5 &aring;
+        \xe6 &aelig; \xe7 &ccedil; \xe8 &egrave; \xe9 &eacute; \xea &ecirc;
+        \xeb &euml; \xec &igrave; \xed &iacute; \xee &icirc; \xef &iuml;
+        \xf0 &eth; \xf1 &ntilde; \xf2 &ograve; \xf3 &oacute; \xf4 &ocirc;
+        \xf5 &otilde; \xf6 &ouml; \xf7 &divide; \xf8 &oslash; \xf9 &ugrave;
+        \xfa &uacute; \xfb &ucirc; \xfc &uuml; \xfd &yacute; \xfe &thorn;
+        \xff &yuml; \u192 &fnof; \u391 &Alpha; \u392 &Beta; \u393 &Gamma;
+        \u394 &Delta; \u395 &Epsilon; \u396 &Zeta; \u397 &Eta; \u398 &Theta;
+        \u399 &Iota; \u39A &Kappa; \u39B &Lambda; \u39C &Mu; \u39D &Nu;
+        \u39E &Xi; \u39F &Omicron; \u3A0 &Pi; \u3A1 &Rho; \u3A3 &Sigma;
+        \u3A4 &Tau; \u3A5 &Upsilon; \u3A6 &Phi; \u3A7 &Chi; \u3A8 &Psi;
+        \u3A9 &Omega; \u3B1 &alpha; \u3B2 &beta; \u3B3 &gamma; \u3B4 &delta;
+        \u3B5 &epsilon; \u3B6 &zeta; \u3B7 &eta; \u3B8 &theta; \u3B9 &iota;
+        \u3BA &kappa; \u3BB &lambda; \u3BC &mu; \u3BD &nu; \u3BE &xi;
+        \u3BF &omicron; \u3C0 &pi; \u3C1 &rho; \u3C2 &sigmaf; \u3C3 &sigma;
+        \u3C4 &tau; \u3C5 &upsilon; \u3C6 &phi; \u3C7 &chi; \u3C8 &psi;
+        \u3C9 &omega; \u3D1 &thetasym; \u3D2 &upsih; \u3D6 &piv;
+        \u2022 &bull; \u2026 &hellip; \u2032 &prime; \u2033 &Prime;
+        \u203E &oline; \u2044 &frasl; \u2118 &weierp; \u2111 &image;
+        \u211C &real; \u2122 &trade; \u2135 &alefsym; \u2190 &larr;
+        \u2191 &uarr; \u2192 &rarr; \u2193 &darr; \u2194 &harr; \u21B5 &crarr;
+        \u21D0 &lArr; \u21D1 &uArr; \u21D2 &rArr; \u21D3 &dArr; \u21D4 &hArr;
+        \u2200 &forall; \u2202 &part; \u2203 &exist; \u2205 &empty;
+        \u2207 &nabla; \u2208 &isin; \u2209 &notin; \u220B &ni; \u220F &prod;
+        \u2211 &sum; \u2212 &minus; \u2217 &lowast; \u221A &radic;
+        \u221D &prop; \u221E &infin; \u2220 &ang; \u2227 &and; \u2228 &or;
+        \u2229 &cap; \u222A &cup; \u222B &int; \u2234 &there4; \u223C &sim;
+        \u2245 &cong; \u2248 &asymp; \u2260 &ne; \u2261 &equiv; \u2264 &le;
+        \u2265 &ge; \u2282 &sub; \u2283 &sup; \u2284 &nsub; \u2286 &sube;
+        \u2287 &supe; \u2295 &oplus; \u2297 &otimes; \u22A5 &perp;
+        \u22C5 &sdot; \u2308 &lceil; \u2309 &rceil; \u230A &lfloor;
+        \u230B &rfloor; \u2329 &lang; \u232A &rang; \u25CA &loz;
+        \u2660 &spades; \u2663 &clubs; \u2665 &hearts; \u2666 &diams;
+        \x22 &quot; \x26 &amp; \x3C &lt; \x3E &gt; \u152 &OElig;
+        \u153 &oelig; \u160 &Scaron; \u161 &scaron; \u178 &Yuml;
+        \u2C6 &circ; \u2DC &tilde; \u2002 &ensp; \u2003 &emsp; \u2009 &thinsp;
+        \u200C &zwnj; \u200D &zwj; \u200E &lrm; \u200F &rlm; \u2013 &ndash;
+        \u2014 &mdash; \u2018 &lsquo; \u2019 &rsquo; \u201A &sbquo;
+        \u201C &ldquo; \u201D &rdquo; \u201E &bdquo; \u2020 &dagger;
+        \u2021 &Dagger; \u2030 &permil; \u2039 &lsaquo; \u203A &rsaquo;
+        \u20AC &euro;
+    }
+}
+
+# ::html::foreach
+#
+#	Rework the "foreach" command to blend into HTML template files.
+#	Rather than evaluating the body, we return the subst'ed body.  Each
+#	iteration of the loop causes another string to be concatenated to
+#	the result value.  No error checking is done on any arguments.
+#
+# Arguments:
+#	varlist	Variables to instantiate with values from the next argument.
+#	list	Values to set variables in varlist to.
+#	args	?varlist2 list2 ...? body, where body is the string to subst
+#		during each iteration of the loop.
+#
+# Results:
+#	Returns a string composed of multiple concatenations of the
+#	substitued body.
+#
+# Side Effects:
+#	None.
+
+proc ::html::foreach {vars vals args} {
+    variable randVar
+
+    # The body of the foreach loop must be run in the stack frame
+    # above this one in order to have access to local variable at that stack
+    # level.
+
+    # To support nested foreach loops, we use a uniquely named
+    # variable to store incremental results.
+    incr randVar
+    ::set resultVar "result_$randVar"
+
+    # Extract the body and any varlists and valuelists from the args.
+    ::set body [lindex $args end]
+    ::set varvals [linsert [lreplace $args end end] 0 $vars $vals]
+
+    # Create the script to eval in the stack frame above this one.
+    ::set script "::foreach"
+    ::foreach {vars vals} $varvals {
+        append script " [list $vars] [list $vals]"
+    }
+    append script " \{\n"
+    append script "  append $resultVar \[subst \{$body\}\]\n"
+    append script "\}\n"
+
+    # Create a temporary variable in the stack frame above this one,
+    # and use it to store the incremental results of the multiple loop
+    # iterations.  Remove the temporary variable when we're done so there's
+    # no trace of this loop left in that stack frame.
+
+    upvar 1 $resultVar tmp
+    ::set tmp ""
+    uplevel 1 $script
+    ::set result $tmp
+    unset tmp
+    return $result
+}
+
+# ::html::for
+#
+#	Rework the "for" command to blend into HTML template files.
+#	Rather than evaluating the body, we return the subst'ed body.  Each
+#	iteration of the loop causes another string to be concatenated to
+#	the result value.  No error checking is done on any arguments.
+#
+# Arguments:
+#	start	A script to evaluate once at the very beginning.
+#	test	An expression to eval before each iteration of the loop.
+#		Once the expression is false, the command returns.
+#	next	A script to evaluate after each iteration of the loop.
+#	body	The string to subst during each iteration of the loop.
+#
+# Results:
+#	Returns a string composed of multiple concatenations of the
+#	substitued body.
+#
+# Side Effects:
+#	None.
+
+proc ::html::for {start test next body} {
+    variable randVar
+
+    # The body of the for loop must be run in the stack frame
+    # above this one in order to have access to local variable at that stack
+    # level.
+
+    # To support nested for loops, we use a uniquely named
+    # variable to store incremental results.
+    incr randVar
+    ::set resultVar "result_$randVar"
+
+    # Create the script to eval in the stack frame above this one.
+    ::set script "::for [list $start] [list $test] [list $next] \{\n"
+    append script "  append $resultVar \[subst \{$body\}\]\n"
+    append script "\}\n"
+
+    # Create a temporary variable in the stack frame above this one,
+    # and use it to store the incremental resutls of the multiple loop
+    # iterations.  Remove the temporary variable when we're done so there's
+    # no trace of this loop left in that stack frame.
+
+    upvar 1 $resultVar tmp
+    ::set tmp ""
+    uplevel 1 $script
+    ::set result $tmp
+    unset tmp
+    return $result
+}
+
+# ::html::while
+#
+#	Rework the "while" command to blend into HTML template files.
+#	Rather than evaluating the body, we return the subst'ed body.  Each
+#	iteration of the loop causes another string to be concatenated to
+#	the result value.  No error checking is done on any arguments.
+#
+# Arguments:
+#	test	An expression to eval before each iteration of the loop.
+#		Once the expression is false, the command returns.
+#	body	The string to subst during each iteration of the loop.
+#
+# Results:
+#	Returns a string composed of multiple concatenations of the
+#	substitued body.
+#
+# Side Effects:
+#	None.
+
+proc ::html::while {test body} {
+    variable randVar
+
+    # The body of the while loop must be run in the stack frame
+    # above this one in order to have access to local variable at that stack
+    # level.
+
+    # To support nested while loops, we use a uniquely named
+    # variable to store incremental results.
+    incr randVar
+    ::set resultVar "result_$randVar"
+
+    # Create the script to eval in the stack frame above this one.
+    ::set script "::while [list $test] \{\n"
+    append script "  append $resultVar \[subst \{$body\}\]\n"
+    append script "\}\n"
+
+    # Create a temporary variable in the stack frame above this one,
+    # and use it to store the incremental resutls of the multiple loop
+    # iterations.  Remove the temporary variable when we're done so there's
+    # no trace of this loop left in that stack frame.
+
+    upvar 1 $resultVar tmp
+    ::set tmp ""
+    uplevel 1 $script
+    ::set result $tmp
+    unset tmp
+    return $result
+}
+
+# ::html::if
+#
+#	Rework the "if" command to blend into HTML template files.
+#	Rather than evaluating a body clause, we return the subst'ed body.
+#	No error checking is done on any arguments.
+#
+# Arguments:
+#	test	An expression to eval to decide whether to use the then body.
+#	body	The string to subst if the test case was true.
+#	args	?elseif test body2 ...? ?else bodyn?, where bodyn is the string
+#		to subst if none of the tests are true.
+#
+# Results:
+#	Returns a string composed by substituting a body clause.
+#
+# Side Effects:
+#	None.
+
+proc ::html::if {test body args} {
+    variable randVar
+
+    # The body of the then/else clause must be run in the stack frame
+    # above this one in order to have access to local variable at that stack
+    # level.
+
+    # To support nested if's, we use a uniquely named
+    # variable to store incremental results.
+    incr randVar
+    ::set resultVar "result_$randVar"
+
+    # Extract the elseif clauses and else clause if they exist.
+    ::set cmd [linsert $args 0 "::if" $test $body]
+
+    ::foreach {keyword test body} $cmd {
+        ::if {[string equal $keyword "else"]} {
+            append script " else \{\n"
+            ::set body $test
+        } else {
+            append script " $keyword [list $test] \{\n"
+        }
+        append script "  append $resultVar \[subst \{$body\}\]\n"
+        append script "\} "
+    }
+
+    # Create a temporary variable in the stack frame above this one,
+    # and use it to store the incremental resutls of the multiple loop
+    # iterations.  Remove the temporary variable when we're done so there's
+    # no trace of this loop left in that stack frame.
+
+    upvar $resultVar tmp
+    ::set tmp ""
+    uplevel $script
+    ::set result $tmp
+    unset tmp
+    return $result
+}
+
+# ::html::set
+#
+#	Rework the "set" command to blend into HTML template files.
+#	The return value is always "" so nothing is appended in the
+#	template.  No error checking is done on any arguments.
+#
+# Arguments:
+#	var	The variable to set.
+#	val	The new value to give the variable.
+#
+# Results:
+#	Returns "".
+#
+# Side Effects:
+#	None.
+
+proc ::html::set {var val} {
+
+    # The variable must be set in the stack frame above this one.
+
+    ::set cmd [list set $var $val]
+    uplevel 1 $cmd
+    return ""
+}
+
+# ::html::eval
+#
+#	Rework the "eval" command to blend into HTML template files.
+#	The return value is always "" so nothing is appended in the
+#	template.  No error checking is done on any arguments.
+#
+# Arguments:
+#	args	The args to evaluate.  At least one must be given.
+#
+# Results:
+#	Returns "".
+#
+# Side Effects:
+#	Throws an error if no arguments are given.
+
+proc ::html::eval {args} {
+
+    # The args must be evaluated in the stack frame above this one.
+    ::eval [linsert $args 0 uplevel 1]
+    return ""
+}
+
+# ::html::init
+#
+#	Reset state that gets accumulated for the current page.
+#
+# Arguments:
+#	nvlist	Name, value list that is used to initialize default namespace
+#		variables that set font, size, etc.
+#
+# Side Effects:
+#	Wipes the page state array
+
+proc ::html::init {{nvlist {}}} {
+    variable page
+    variable defaults
+    ::if {[info exists page]} {
+	unset page
+    }
+    ::if {[info exists defaults]} {
+	unset defaults
+    }
+    array set defaults $nvlist
+}
+
+# ::html::head
+#
+#	Generate the <head> section.  There are a number of
+#	optional calls you make *before* this to inject
+#	meta tags - see everything between here and the bodyTag proc.
+#
+# Arguments:
+#	title	The page title
+#
+# Results:
+#	HTML for the <head> section
+
+proc ::html::head {title} {
+    variable page
+    ::set html "[openTag html][openTag head]\n"
+    append html "\t[title $title]"
+    ::if {[info exists page(author)]} {
+	append html "\t$page(author)"
+    }
+    ::if {[info exists page(meta)]} {
+	::foreach line $page(meta) {
+	    append html "\t$line\n"
+	}
+    }
+    ::if {[info exists page(css)]} {
+	::foreach style $page(css) {
+	    append html "\t$style\n"
+	}
+    }
+    ::if {[info exists page(js)]} {
+	::foreach script $page(js) {
+	    append html "\t$script\n"
+	}
+    }
+    append html "[closeTag]\n"
+}
+
+# ::html::title
+#
+#	Wrap up the <title> and tuck it away for use in the page later.
+#
+# Arguments:
+#	title	The page title
+#
+# Results:
+#	HTML for the <title> section
+
+proc ::html::title {title} {
+    variable page
+    ::set page(title) $title
+    ::set html "<title>$title</title>\n"
+    return $html
+}
+
+# ::html::getTitle
+#
+#	Return the title of the current page.
+#
+# Arguments:
+#	None
+#
+# Results:
+#	The title
+
+proc ::html::getTitle {} {
+    variable page
+    ::if {[info exists page(title)]} {
+	return $page(title)
+    } else {
+	return ""
+    }
+}
+
+# ::html::meta
+#
+#	Generate a meta tag.  This tag gets bundled into the <head>
+#	section generated by html::head
+#
+# Arguments:
+#	args	A name-value list of meta tag names and values.
+#
+# Side Effects:
+#	Stores HTML for the <meta> tag for use later by html::head
+
+# Ref: https://www.w3schools.com/tags/tag_meta.asp
+
+proc ::html::meta {args} {
+    # compatibility command
+    variable page
+    append html ""
+    ::foreach {name value} $args {
+	append html "<meta name=\"$name\" content=\"[quoteFormValue $value]\">"
+    }
+    lappend page(meta) $html
+    return ""
+}
+
+proc ::html::meta_name {args} {
+    variable page
+    append html ""
+    ::foreach {name value} $args {
+	append html "<meta name=\"$name\" content=\"[quoteFormValue $value]\">"
+    }
+    lappend page(meta) $html
+    return ""
+}
+
+proc ::html::meta_charset {charset} {
+    variable page
+    append html "<meta charset=\"[quoteFormValue $charset]\">"
+    lappend page(meta) $html
+    return ""
+}
+
+proc ::html::meta_equiv {args} {
+    variable page
+    append html ""
+    ::foreach {name value} $args {
+	append html "<meta http-equiv=\"$name\" content=\"[quoteFormValue $value]\">"
+    }
+    lappend page(meta) $html
+    return ""
+}
+
+# ::html::refresh
+#
+#	Generate a meta refresh tag.  This tag gets bundled into the <head>
+#	section generated by html::head
+#
+# Arguments:
+#	content	Time period, in seconds, before the refresh
+#	url	(option) new page to view. If not specified, then
+#		the current page is reloaded.
+#
+# Side Effects:
+#	Stores HTML for the <meta> tag for use later by html::head
+
+proc ::html::refresh {content {url {}}} {
+    variable page
+    ::set html "<meta http-equiv=\"Refresh\" content=\"$content"
+    ::if {[string length $url]} {
+	append html "; url=$url"
+    }
+    append html "\">"
+    lappend page(meta) $html
+    return ""
+}
+
+# ::html::headTag
+#
+#	Embed a tag into the HEAD section
+#	generated by html::head
+#
+# Arguments:
+#	string	Everything but the < > for the tag.
+#
+# Side Effects:
+#	Stores HTML for the tag for use later by html::head
+
+proc ::html::headTag {string} {
+    variable page
+    lappend page(meta) <$string>
+    return ""
+}
+
+# ::html::keywords
+#
+#	Add META tag keywords to the <head> section.
+#	Call this before you call html::head
+#
+# Arguments:
+#	args	The keywords
+#
+# Side Effects:
+#	See html::meta
+
+proc ::html::keywords {args} {
+    html::meta keywords [join $args ", "]
+}
+
+# ::html::description
+#
+#	Add a description META tag to the <head> section.
+#	Call this before you call html::head
+#
+# Arguments:
+#	description	The description
+#
+# Side Effects:
+#	See html::meta
+
+proc ::html::description {description} {
+    html::meta description $description
+}
+
+# ::html::author
+#
+#	Add an author comment to the <head> section.
+#	Call this before you call html::head
+#
+# Arguments:
+#	author	Author's name
+#
+# Side Effects:
+#	sets page(author)
+
+proc ::html::author {author} {
+    variable page
+    ::set page(author) "<!-- $author -->\n"
+    return ""
+}
+
+# ::html::tagParam
+#
+#	Return a name, value string for the tag parameters.
+#	The values come from "hard-wired" values in the
+#	param argument, or from the defaults set with html::init.
+#
+# Arguments:
+#	tag	Name of the HTML tag (case insensitive).
+#	param	pname=value info that overrides any default values
+#
+# Results
+#	A string of the form:
+#		pname="keyvalue" name2="2nd value"
+
+proc ::html::tagParam {tag {param {}}} {
+    variable defaults
+
+    ::set def ""
+    ::foreach key [lsort [array names defaults $tag.*]] {
+	append def [default $key $param]
+    }
+    return [string trimleft $param$def]
+}
+
+# ::html::default
+#
+#	Return a default value, if one has been registered
+#	and an overriding value does not occur in the existing
+#	tag parameters.
+#
+# Arguments:
+#	key	Index into the defaults array defined by html::init
+#		This is expected to be in the form tag.pname where
+#		the pname part is used in the tag parameter name
+#	param	pname=value info that overrides any default values
+#
+# Results
+#	pname="keyvalue"
+
+proc ::html::default {key {param {}}} {
+    variable defaults
+    ::set pname [string tolower [lindex [split $key .] 1]]
+    ::set key [string tolower $key]
+    ::if {![regexp -nocase "(\[ 	\]|^)$pname=" $param] &&
+	    [info exists defaults($key)] &&
+	    [string length $defaults($key)]} {
+	return " $pname=\"$defaults($key)\""
+    } else {
+	return ""
+    }
+}
+
+# ::html::bodyTag
+#
+#	Generate a body tag
+#
+# Arguments:
+#	none
+#
+# Results
+#	A body tag
+
+proc ::html::bodyTag {args} {
+    return [openTag body [join $args]]\n
+}
+
+# The following procedures are all related to generating form elements
+# that are initialized to store the current value of the form element
+# based on the CGI state.  These functions depend on the ncgi::value
+# procedure and assume that the caller has called ncgi::parse and/or
+# ncgi::init appropriately to initialize the ncgi module.
+
+# ::html::formValue
+#
+#	Return a name and value pair, where the value is initialized
+#	from existing form data, if any.
+#
+# Arguments:
+#	name		The name of the form element
+#	defvalue	A default value to use, if not appears in the CGI
+#			inputs.  DEPRECATED - use ncgi::defValue instead.
+#
+# Retults:
+#	A string like:
+#	name="fred" value="freds value"
+
+proc ::html::formValue {name {defvalue {}}} {
+    ::set value [ncgi::value $name]
+    ::if {[string length $value] == 0} {
+	::set value $defvalue
+    }
+    return "name=\"$name\" value=\"[quoteFormValue $value]\""
+}
+
+# ::html::quoteFormValue
+#
+#	Quote a value for use in a value=\"$value\" fragment.
+#
+# Arguments:
+#	value		The value to quote
+#
+# Retults:
+#	A string like:
+#	&#34;Hello, &lt;b&gt;World!&#34;
+
+proc ::html::quoteFormValue {value} {
+    return [string map [list "&" "&amp;" "\"" "&#34;" \
+			    "'" "&#39;" "<" "&lt;" ">" "&gt;"] $value]
+}
+
+# ::html::textInput --
+#
+#	Return an <input type=text> element.  This uses the
+#	input.size default falue.
+#
+# Arguments:
+#	name		The form element name
+#	args		Additional attributes for the INPUT tag
+#
+# Results:
+#	The html fragment
+
+proc ::html::textInput {name {value {}} args} {
+    ::set html "<input type=\"text\" "
+    append html [formValue $name $value]
+    append html [default input.size $args]
+    ::if {[llength $args] != 0} then {
+	append html " " [join $args]
+    }
+    append html ">\n"
+    return $html
+}
+
+# ::html::textInputRow --
+#
+#	Format a table row containing a text input element and a label.
+#
+# Arguments:
+#	label	Label to display next to the form element
+#	name	The form element name
+#	args	Additional attributes for the INPUT tag
+#
+# Results:
+#	The html fragment
+
+proc ::html::textInputRow {label name {value {}} args} {
+    ::set html [row $label [::eval [linsert $args 0 html::textInput $name $value]]]
+    return $html
+}
+
+# ::html::passwordInputRow --
+#
+#	Format a table row containing a password input element and a label.
+#
+# Arguments:
+#	label	Label to display next to the form element
+#	name	The form element name
+#
+# Results:
+#	The html fragment
+
+proc ::html::passwordInputRow {label {name password}} {
+    ::set html [row $label [passwordInput $name]]
+    return $html
+}
+
+# ::html::passwordInput --
+#
+#	Return an <input type=password> element.
+#
+# Arguments:
+#	name	The form element name. Defaults to "password"
+#
+# Results:
+#	The html fragment
+
+proc ::html::passwordInput {{name password}} {
+    ::set html "<input type=\"password\" name=\"$name\">\n"
+    return $html
+}
+
+# ::html::checkbox --
+#
+#	Format a checkbox so that it retains its state based on
+#	the current CGI values
+#
+# Arguments:
+#	name		The form element name
+#	value		The value associated with the checkbox
+#
+# Results:
+#	The html fragment
+
+proc ::html::checkbox {name value} {
+    ::set html "<input type=\"checkbox\" [checkValue $name $value]>\n"
+}
+
+# ::html::checkValue
+#
+#	Like html::formalue, but for checkboxes that need CHECKED
+#
+# Arguments:
+#	name		The name of the form element
+#	defvalue	A default value to use, if not appears in the CGI
+#			inputs
+#
+# Retults:
+#	A string like:
+#	name="fred" value="freds value" CHECKED
+
+
+proc ::html::checkValue {name {value 1}} {
+    ::foreach v [ncgi::valueList $name] {
+	::if {[string compare $value $v] == 0} {
+	    return "name=\"$name\" value=\"[quoteFormValue $value]\" checked"
+	}
+    }
+    return "name=\"$name\" value=\"[quoteFormValue $value]\""
+}
+
+# ::html::radioValue
+#
+#	Like html::formValue, but for radioboxes that need CHECKED
+#
+# Arguments:
+#	name	The name of the form element
+#	value	The value associated with the radio button.
+#
+# Retults:
+#	A string like:
+#	name="fred" value="freds value" CHECKED
+
+proc ::html::radioValue {name value {defaultSelection {}}} {
+    ::if {[string equal $value [ncgi::value $name $defaultSelection]]} {
+	return "name=\"$name\" value=\"[quoteFormValue $value]\" checked"
+    } else {
+	return "name=\"$name\" value=\"[quoteFormValue $value]\""
+    }
+}
+
+# ::html::radioSet --
+#
+#	Display a set of radio buttons while looking for an existing
+#	value from the query data, if any.
+
+proc ::html::radioSet {key sep list {defaultSelection {}}} {
+    ::set html ""
+    ::set s ""
+    ::foreach {label v} $list {
+	append html "$s<input type=\"radio\" [radioValue $key $v $defaultSelection]> $label"
+	::set s $sep
+    }
+    return $html
+}
+
+# ::html::checkSet --
+#
+#	Display a set of check buttons while looking for an existing
+#	value from the query data, if any.
+
+proc ::html::checkSet {key sep list} {
+    ::set s ""
+    ::foreach {label v} $list {
+	append html "$s<input type=\"checkbox\" [checkValue $key $v]> $label"
+	::set s $sep
+    }
+    return $html
+}
+
+# ::html::select --
+#
+#	Format a <select> element that retains the state of the
+#	current CGI values.
+#
+# Arguments:
+#	name		The form element name
+#	param		The various size, multiple parameters for the tag
+#	choices		A simple list of choices
+#	current		Value to assume if nothing is in CGI state
+#
+# Results:
+#	The html fragment
+
+proc ::html::select {name param choices {current {}}} {
+    ::set def [ncgi::valueList $name $current]
+    ::set html "<select name=\"$name\"[string trimright  " $param"]>\n"
+    ::foreach {label v} $choices {
+	::if {[lsearch -exact $def $v] != -1} {
+	    ::set SEL " selected"
+	} else {
+	    ::set SEL ""
+	}
+	append html "<option value=\"$v\"$SEL>$label\n"
+    }
+    append html "</select>\n"
+    return $html
+}
+
+# ::html::selectPlain --
+#
+#	Format a <select> element where the values are the same
+#	as those that are displayed.
+#
+# Arguments:
+#	name		The form element name
+#	param		Tag parameters
+#	choices		A simple list of choices
+#
+# Results:
+#	The html fragment
+
+proc ::html::selectPlain {name param choices {current {}}} {
+    ::set namevalue {}
+    ::foreach c $choices {
+	lappend namevalue $c $c
+    }
+    return [select $name $param $namevalue $current]
+}
+
+# ::html::textarea --
+#
+#	Format a <textarea> element that retains the state of the
+#	current CGI values.
+#
+# Arguments:
+#	name		The form element name
+#	param		The various size, multiple parameters for the tag
+#	current		Value to assume if nothing is in CGI state
+#
+# Results:
+#	The html fragment
+
+proc ::html::textarea {name {param {}} {current {}}} {
+    ::set value [quoteFormValue [ncgi::value $name $current]]
+    return "<[string trimright \
+	"textarea name=\"$name\"\
+		[tagParam textarea $param]"]>$value</textarea>\n"
+}
+
+# ::html::submit --
+#
+#	Format a submit button.
+#
+# Arguments:
+#	label		The string to appear in the submit button.
+#	name		The name for the submit button element.
+#	title		The string to appear on the submit button.
+#			Optional. If not specified no title is shown.
+#
+# Results:
+#	The html fragment
+
+proc ::html::submit {label {name submit} {title {}}} {
+    ::set html "<input type=\"submit\" name=\"$name\" value=\"$label\""
+    ::if {$title != ""} { append html " title=\"$title\"" }
+    append html ">\n"
+}
+
+# ::html::varEmpty --
+#
+#	Return true if the variable doesn't exist or is an empty string
+#
+# Arguments:
+#	varname	Name of the variable
+#
+# Results:
+#	1 if the variable doesn't exist or has the empty value
+
+proc ::html::varEmpty {name} {
+    upvar 1 $name var
+    ::if {[info exists var]} {
+	::set value $var
+    } else {
+	::set value ""
+    }
+    return [expr {[string length [string trim $value]] == 0}]
+}
+
+# ::html::getFormInfo --
+#
+#	Generate hidden fields to capture form values.
+#
+# Arguments:
+#	args	List of elements to save.  If this is empty, everything is
+#		saved in hidden fields.  This is a list of string match
+#		patterns.
+#
+# Results:
+#	A bunch of <input type=hidden> elements
+
+proc ::html::getFormInfo {args} {
+    ::if {[llength $args] == 0} {
+	::set args *
+    }
+    ::set html ""
+    ::foreach {n v} [ncgi::nvlist] {
+	::foreach pat $args {
+	    ::if {[string match $pat $n]} {
+		append html "<input type=\"hidden\" name=\"$n\" \
+				    value=\"[quoteFormValue $v]\">\n"
+	    }
+	}
+    }
+    return $html
+}
+
+# ::html::h1
+#	Generate an H1 tag.
+#
+# Arguments:
+#	string
+#	param
+#
+# Results:
+#	Formats the tag.
+
+proc ::html::h1 {string {param {}}} {
+    html::h 1 $string $param
+}
+proc ::html::h2 {string {param {}}} {
+    html::h 2 $string $param
+}
+proc ::html::h3 {string {param {}}} {
+    html::h 3 $string $param
+}
+proc ::html::h4 {string {param {}}} {
+    html::h 4 $string $param
+}
+proc ::html::h5 {string {param {}}} {
+    html::h 5 $string $param
+}
+proc ::html::h6 {string {param {}}} {
+    html::h 6 $string $param
+}
+proc ::html::h {level string {param {}}} {
+    return "<[string trimright "h$level [tagParam h$level $param]"]>$string</h$level>\n"
+}
+
+# ::html::wrapTag
+#   Takes an optional text and wraps it in a tag pair, along with
+#   optional attributes for the tag
+#
+# Arguments:
+#   tag      The HTML tag name 
+#   text     Optional text to insert between open/close tag
+#   args     List of optional attributes and values to use for the tag
+#
+# Results:
+#   String with the text wrapped in the open/close tag
+
+proc ::html::wrapTag {tag {text ""} args} {
+    ::set html ""
+    ::set params ""
+    ::foreach {i j} $args {
+        append params "$i=\"[quoteFormValue $j]\" "
+    }
+    append html [openTag $tag [string trimright $params]]
+    append html $text
+    append html [closeTag]
+    return $html
+}
+
+# ::html::openTag
+#	Remember that a tag  is opened so it can be closed later.
+#	This is used to automatically clean up at the end of a page.
+#
+# Arguments:
+#	tag	The HTML tag name
+#	param	Any parameters for the tag
+#
+# Results:
+#	Formats the tag.  Also keeps it around in a per-page stack
+#	of open tags.
+
+proc ::html::openTag {tag {param {}}} {
+    variable page
+    lappend page(stack) $tag
+    return "<[string trimright "$tag [tagParam $tag $param]"]>"
+}
+
+# ::html::closeTag
+#	Pop a tag from the stack and close it.
+#
+# Arguments:
+#	None
+#
+# Results:
+#	A close tag.  Also pops the stack.
+
+proc ::html::closeTag {} {
+    variable page
+    ::if {[info exists page(stack)]} {
+	::set top [lindex $page(stack) end]
+	::set page(stack) [lreplace $page(stack) end end]
+    }
+    ::if {[info exists top] && [string length $top]} {
+	return </$top>
+    } else {
+	return ""
+    }
+}
+
+# ::html::end
+#
+#	Close out all the open tags.  Especially useful for
+#	Tables that do not display at all if they are unclosed.
+#
+# Arguments:
+#	None
+#
+# Results:
+#	Some number of close HTML tags.
+
+proc ::html::end {} {
+    variable page
+    ::set html ""
+    ::while {[llength $page(stack)]} {
+	append html [closeTag]\n
+    }
+    return $html
+}
+
+# ::html::row
+#
+#	Format a table row.  If the default font has been set, this
+#	takes care of wrapping the table cell contents in a font tag.
+#
+# Arguments:
+#	args	Values to put into the row
+#
+# Results:
+#	A <tr><td>...</tr> fragment
+
+proc ::html::row {args} {
+    ::set html <tr>\n
+    ::foreach x $args {
+	append html \t[cell "" $x td]\n
+    }
+    append html "</tr>\n"
+    return $html
+}
+
+# ::html::hdrRow
+#
+#	Format a table row.  If the default font has been set, this
+#	takes care of wrapping the table cell contents in a font tag.
+#
+# Arguments:
+#	args	Values to put into the row
+#
+# Results:
+#	A <tr><th>...</tr> fragment
+
+proc ::html::hdrRow {args} {
+    variable defaults
+    ::set html <tr>\n
+    ::foreach x $args {
+	append html \t[cell "" $x th]\n
+    }
+    append html "</tr>\n"
+    return $html
+}
+
+# ::html::paramRow
+#
+#	Format a table row.  If the default font has been set, this
+#	takes care of wrapping the table cell contents in a font tag.
+#
+#       Based on html::row
+#
+# Arguments:
+#	list	Values to put into the row
+#       rparam   Parameters for row
+#       cparam   Parameters for cells
+#
+# Results:
+#	A <tr><td>...</tr> fragment
+
+proc ::html::paramRow {list {rparam {}} {cparam {}}} {
+    ::set html "<tr $rparam>\n"
+    ::foreach x $list {
+	append html \t[cell $cparam $x td]\n
+    }
+    append html "</tr>\n"
+    return $html
+}
+
+# ::html::cell
+#
+#	Format a table cell.  If the default font has been set, this
+#	takes care of wrapping the table cell contents in a font tag.
+#
+# Arguments:
+#	param	Td tag parameters
+#	value	The value to put into the cell
+#	tag	(option) defaults to TD
+#
+# Results:
+#	<td>...</td> fragment
+
+proc ::html::cell {param value {tag td}} {
+    ::set font [font]
+    ::if {[string length $font]} {
+	::set value $font$value</font>
+    }
+    return "<[string trimright "$tag $param"]>$value</$tag>"
+}
+
+# ::html::tableFromArray
+#
+#	Format a Tcl array into an HTML table
+#
+# Arguments:
+#	arrname	The name of the array
+#	param	The <table> tag parameters, if any.
+#	pat	A string match pattern for the element keys
+#
+# Results:
+#	A <table>
+
+proc ::html::tableFromArray {arrname {param {}} {pat *}} {
+    upvar 1 $arrname arr
+    ::set html ""
+    ::if {[info exists arr]} {
+	append html "<table $param>\n"
+	append html "<tr><th colspan=2>$arrname</th></tr>\n"
+	::foreach name [lsort [array names arr $pat]] {
+	    append html [row $name $arr($name)]
+	}
+	append html </table>\n
+    }
+    return $html
+}
+
+# ::html::tableFromList
+#
+#	Format a table from a name, value list
+#
+# Arguments:
+#	querylist	A name, value list
+#	param		The <table> tag parameters, if any.
+#
+# Results:
+#	A <table>
+
+proc ::html::tableFromList {querylist {param {}}} {
+    ::set html ""
+    ::if {[llength $querylist]} {
+	append html "<table $param>"
+	::foreach {label value} $querylist {
+	    append html [row $label $value]
+	}
+	append html </table>
+    }
+    return $html
+}
+
+# ::html::mailto
+#
+#	Format a mailto: HREF tag
+#
+# Arguments:
+#	email	The target
+#	subject	The subject of the email, if any
+#
+# Results:
+#	A <a href=mailto> tag </a>
+
+proc ::html::mailto {email {subject {}}} {
+    ::set html "<a href=\"mailto:$email"
+    ::if {[string length $subject]} {
+	append html ?subject=$subject
+    }
+    append html "\">$email</a>"
+    return $html
+}
+
+# ::html::font
+#
+#	Generate a standard <font> tag.  This depends on defaults being
+#	set via html::init
+#
+# Arguments:
+#	args	Font parameters.
+#
+# Results:
+#	HTML
+
+proc ::html::font {args} {
+
+    # e.g., font.face, font.size, font.color
+    ::set param [tagParam font [join $args]]
+
+    ::if {[string length $param]} {
+	return "<[string trimright "font $param"]>"
+    } else {
+	return ""
+    }
+}
+
+# ::html::minorMenu
+#
+#	Create a menu of links given a list of label, URL pairs.
+#	If the URL is the current page, it is not highlighted.
+#
+# Arguments:
+#
+#	list	List that alternates label, url, label, url
+#	sep	Separator between elements
+#
+# Results:
+#	html
+
+proc ::html::minorMenu {list {sep { | }}} {
+    ::set s ""
+    ::set html ""
+    regsub -- {index.h?tml$} [ncgi::urlStub] {} this
+    ::foreach {label url} $list {
+	regsub -- {index.h?tml$} $url {} that
+	::if {[string compare $this $that] == 0} {
+	    append html "$s$label"
+	} else {
+	    append html "$s<a href=\"$url\">$label</a>"
+	}
+	::set s $sep
+    }
+    return $html
+}
+
+# ::html::minorList
+#
+#	Create a list of links given a list of label, URL pairs.
+#	If the URL is the current page, it is not highlighted.
+#
+#       Based on html::minorMenu
+#
+# Arguments:
+#
+#	list	List that alternates label, url, label, url
+#       ordered Boolean flag to choose between ordered and
+#               unordered lists. Defaults to 0, i.e. unordered.
+#
+# Results:
+#	A <ul><li><a...><\li>.....<\ul> fragment
+#    or a <ol><li><a...><\li>.....<\ol> fragment
+
+proc ::html::minorList {list {ordered 0}} {
+    ::set s ""
+    ::set html ""
+    ::if { $ordered } {
+	append html [openTag ol]
+    } else {
+	append html [openTag ul]
+    }
+    regsub -- {index.h?tml$} [ncgi::urlStub] {} this
+    ::foreach {label url} $list {
+	append html [openTag li]
+	regsub -- {index.h?tml$} $url {} that
+	::if {[string compare $this $that] == 0} {
+	    append html "$s$label"
+	} else {
+	    append html "$s<a href=\"$url\">$label</a>"
+	}
+	append html [closeTag]
+	append html \n
+    }
+    append html [closeTag]
+    return $html
+}
+
+# ::html::extractParam
+#
+#	Extract a value from parameter list (this needs a re-do)
+#
+# Arguments:
+#   param	A parameter list.  It should alredy have been processed to
+#		remove any entity references
+#   key		The parameter name
+#   varName	The variable to put the value into (use key as default)
+#
+# Results:
+#	returns "1" if the keyword is found, "0" otherwise
+
+proc ::html::extractParam {param key {varName ""}} {
+    ::if {$varName == ""} {
+	upvar $key result
+    } else {
+	upvar $varName result
+    }
+    ::set ws " \t\n\r"
+
+    # look for name=value combinations.  Either (') or (") are valid delimeters
+    ::if {
+      [regsub -nocase [format {.*%s[%s]*=[%s]*"([^"]*).*} $key $ws $ws] $param {\1} value] ||
+      [regsub -nocase [format {.*%s[%s]*=[%s]*'([^']*).*} $key $ws $ws] $param {\1} value] ||
+      [regsub -nocase [format {.*%s[%s]*=[%s]*([^%s]+).*} $key $ws $ws $ws] $param {\1} value] } {
+        ::set result $value
+        return 1
+    }
+
+    # now look for valueless names
+    # I should strip out name=value pairs, so we don't end up with "name"
+    # inside the "value" part of some other key word - some day
+
+    ::set bad \[^a-zA-Z\]+
+    ::if {[regexp -nocase  "$bad$key$bad" -$param-]} {
+	return 1
+    } else {
+	return 0
+    }
+}
+
+# ::html::urlParent --
+#	This is like "file dirname", but doesn't screw with the slashes
+#       (file dirname will collapse // into /)
+#
+# Arguments:
+#	url	The URL
+#
+# Results:
+#	The parent directory of the URL.
+
+proc ::html::urlParent {url} {
+    ::set url [string trimright $url /]
+    regsub -- {[^/]+$} $url {} url
+    return $url
+}
+
+# ::html::html_entities --
+#	Replaces all special characters in the text with their
+#	entities.
+#
+# Arguments:
+#	s	The near-HTML text
+#
+# Results:
+#	The text with entities in place of specials characters.
+
+proc ::html::html_entities {s} {
+    variable entities
+    ::set text [string map $entities $s]
+    ::if {[string is ascii $text]} {
+        return $text
+    }
+    # Escape unicode characters
+    ::set N [string length $text]
+    ::set c 0
+    ::set result {}
+    ::for {::set x 0} {$x < $N} {::incr x} {
+        ::set char [string index $text $x]
+        ::set code [::scan $char %c]
+        ::if {$code>255} {
+            ::append result "&#$code\;"
+        } else {
+            ::append result $char
+        }
+    }
+    return $result
+}
+
+# ::html::nl2br --
+#	Replaces all line-endings in the text with <br> tags.
+#
+# Arguments:
+#	s	The near-HTML text
+#
+# Results:
+#	The text with <br> in place of line-endings.
+
+proc ::html::nl2br {s} {
+    return [string map [list \n\r <br> \r\n <br> \n <br> \r <br>] $s]
+}
+
+# ::html::doctype
+#	Create the DOCTYPE tag and tuck it away for usage
+#
+# Arguments:
+#	arg	The DOCTYPE you want to declare
+#
+# Results:
+#	HTML for the doctype section
+
+proc ::html::doctype {arg} {
+    variable doctypes
+    ::set code [string toupper $arg]
+    ::if {![info exists doctypes($code)]} {
+	return -code error -errorcode {HTML DOCTYPE BAD} \
+	    "Unknown doctype \"$arg\""
+    }
+    return $doctypes($code)
+}
+
+namespace eval ::html {
+    variable  doctypes
+    array set doctypes {
+	HTML32   {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">}
+	HTML40   {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">}
+	HTML40T  {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">}
+	HTML40F  {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN" "http://www.w3.org/TR/REC-html40/frameset.dtd">}
+	HTML401  {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">}
+	HTML401T {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">}
+	HTML401F {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">}
+	XHTML10S {<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">}
+	XHTML10T {<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">}
+	XHTML10F {<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">}
+	XHTML11  {<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">}
+	XHTMLB   {<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">}
+    }
+}
+
+# ::html::css
+#	Create the text/css tag and tuck it away for usage
+#
+# Arguments:
+#	href	The location of the css file to include the filename and path
+#
+# Results:
+#	None.
+
+proc ::html::css {href} {
+    variable page
+    lappend page(css) "<link rel=\"stylesheet\" type=\"text/css\" href=\"[quoteFormValue $href]\">"
+    return
+}
+
+# ::html::css-clear
+#	Drop all text/css references.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	None.
+
+proc ::html::css-clear {} {
+    variable page
+    catch { unset page(css) }
+    return
+}
+
+# ::html::js
+#   Create the text/javascript tag and tuck it away for usage
+#
+# Arguments:
+#	href	The location of the javascript file to include the filename and path
+#
+# Results:
+#	None.
+
+proc ::html::js {href} {
+    variable page
+    lappend page(js) "<script language=\"javascript\" type=\"text/javascript\" src=\"[quoteFormValue $href]\"></script>"
+    return
+}
+
+# ::html::js-clear
+#	Drop all text/javascript references.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	None.
+
+proc ::html::js-clear {} {
+    variable page
+    catch { unset page(js) }
+    return
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/html/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/html/pkgIndex.tcl
new file mode 100644
index 00000000..c86f9f4f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/html/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded html 1.5 [list source [file join $dir html.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/htmlparse/htmlparse.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/htmlparse/htmlparse.tcl
new file mode 100644
index 00000000..190cd4fa
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/htmlparse/htmlparse.tcl
@@ -0,0 +1,1444 @@
+# htmlparse.tcl --
+#
+#	This file implements a simple HTML parsing library in Tcl.
+#	It may take advantage of parsers coded in C in the future.
+#
+#	The functionality here is a subset of the
+#
+#		Simple HTML display library by Stephen Uhler (stephen.uhler@sun.com)
+#		Copyright (c) 1995 by Sun Microsystems
+#		Version 0.3 Fri Sep  1 10:47:17 PDT 1995
+#
+#	The main restriction is that all Tk-related code in the above
+#	was left out of the code here. It is expected that this code
+#	will go into a 'tklib' in the future.
+#
+# Copyright (c) 2001 by ActiveState Tool Corp.
+# See the file license.terms.
+
+package require Tcl       8.2
+package require struct::stack
+package require cmdline   1.1
+
+namespace eval ::htmlparse {
+    namespace export		\
+	    parse		\
+	    debugCallback	\
+	    mapEscapes		\
+	    2tree		\
+	    removeVisualFluff	\
+	    removeFormDefs
+
+    # Table of escape characters. Maps from their names to the actual
+    # character.  See http://htmlhelp.org/reference/html40/entities/
+
+    variable namedEntities
+
+    # I. Latin-1 Entities (HTML 4.01)
+    array set namedEntities {
+	nbsp \xa0 iexcl \xa1 cent \xa2 pound \xa3 curren \xa4
+	yen \xa5 brvbar \xa6 sect \xa7 uml \xa8 copy \xa9
+	ordf \xaa laquo \xab not \xac shy \xad reg \xae
+	macr \xaf deg \xb0 plusmn \xb1 sup2 \xb2 sup3 \xb3
+	acute \xb4 micro \xb5 para \xb6 middot \xb7 cedil \xb8
+	sup1 \xb9 ordm \xba raquo \xbb frac14 \xbc frac12 \xbd
+	frac34 \xbe iquest \xbf Agrave \xc0 Aacute \xc1 Acirc \xc2
+	Atilde \xc3 Auml \xc4 Aring \xc5 AElig \xc6 Ccedil \xc7
+	Egrave \xc8 Eacute \xc9 Ecirc \xca Euml \xcb Igrave \xcc
+	Iacute \xcd Icirc \xce Iuml \xcf ETH \xd0 Ntilde \xd1
+	Ograve \xd2 Oacute \xd3 Ocirc \xd4 Otilde \xd5 Ouml \xd6
+	times \xd7 Oslash \xd8 Ugrave \xd9 Uacute \xda Ucirc \xdb
+	Uuml \xdc Yacute \xdd THORN \xde szlig \xdf agrave \xe0
+	aacute \xe1 acirc \xe2 atilde \xe3 auml \xe4 aring \xe5
+	aelig \xe6 ccedil \xe7 egrave \xe8 eacute \xe9 ecirc \xea
+	euml \xeb igrave \xec iacute \xed icirc \xee iuml \xef
+	eth \xf0 ntilde \xf1 ograve \xf2 oacute \xf3 ocirc \xf4
+	otilde \xf5 ouml \xf6 divide \xf7 oslash \xf8 ugrave \xf9
+	uacute \xfa ucirc \xfb uuml \xfc yacute \xfd thorn \xfe
+	yuml \xff
+    }
+
+    # II. Entities for Symbols and Greek Letters (HTML 4.01)
+    array set namedEntities {
+	fnof \u192 Alpha \u391 Beta \u392 Gamma \u393 Delta \u394
+	Epsilon \u395 Zeta \u396 Eta \u397 Theta \u398 Iota \u399
+	Kappa \u39A Lambda \u39B Mu \u39C Nu \u39D Xi \u39E
+	Omicron \u39F Pi \u3A0 Rho \u3A1 Sigma \u3A3 Tau \u3A4
+	Upsilon \u3A5 Phi \u3A6 Chi \u3A7 Psi \u3A8 Omega \u3A9
+	alpha \u3B1 beta \u3B2 gamma \u3B3 delta \u3B4 epsilon \u3B5
+	zeta \u3B6 eta \u3B7 theta \u3B8 iota \u3B9 kappa \u3BA
+	lambda \u3BB mu \u3BC nu \u3BD xi \u3BE omicron \u3BF
+	pi \u3C0 rho \u3C1 sigmaf \u3C2 sigma \u3C3 tau \u3C4
+	upsilon \u3C5 phi \u3C6 chi \u3C7 psi \u3C8 omega \u3C9
+	thetasym \u3D1 upsih \u3D2 piv \u3D6 bull \u2022
+	hellip \u2026 prime \u2032 Prime \u2033 oline \u203E
+	frasl \u2044 weierp \u2118 image \u2111 real \u211C
+	trade \u2122 alefsym \u2135 larr \u2190 uarr \u2191
+	rarr \u2192 darr \u2193 harr \u2194 crarr \u21B5
+	lArr \u21D0 uArr \u21D1 rArr \u21D2 dArr \u21D3 hArr \u21D4
+	forall \u2200 part \u2202 exist \u2203 empty \u2205
+	nabla \u2207 isin \u2208 notin \u2209 ni \u220B prod \u220F
+	sum \u2211 minus \u2212 lowast \u2217 radic \u221A
+	prop \u221D infin \u221E ang \u2220 and \u2227 or \u2228
+	cap \u2229 cup \u222A int \u222B there4 \u2234 sim \u223C
+	cong \u2245 asymp \u2248 ne \u2260 equiv \u2261 le \u2264
+	ge \u2265 sub \u2282 sup \u2283 nsub \u2284 sube \u2286
+	supe \u2287 oplus \u2295 otimes \u2297 perp \u22A5
+	sdot \u22C5 lceil \u2308 rceil \u2309 lfloor \u230A
+	rfloor \u230B lang \u2329 rang \u232A loz \u25CA
+	spades \u2660 clubs \u2663 hearts \u2665 diams \u2666
+    }
+
+    # III. Special Entities (HTML 4.01)
+    array set namedEntities {
+	quot \x22 amp \x26 lt \x3C gt \x3E OElig \u152 oelig \u153
+	Scaron \u160 scaron \u161 Yuml \u178 circ \u2C6
+	tilde \u2DC ensp \u2002 emsp \u2003 thinsp \u2009
+	zwnj \u200C zwj \u200D lrm \u200E rlm \u200F ndash \u2013
+	mdash \u2014 lsquo \u2018 rsquo \u2019 sbquo \u201A
+	ldquo \u201C rdquo \u201D bdquo \u201E dagger \u2020
+	Dagger \u2021 permil \u2030 lsaquo \u2039 rsaquo \u203A
+	euro \u20AC
+    }
+
+    # IV. Special Entities (XHTML, XML)
+    array set namedEntities {
+	apos \u0027
+    }
+
+    # HTML5 section 8.5 Named character references (additions only)
+    # http://www.w3.org/TR/2011/WD-html5-20110113/named-character-references.html
+
+    array set namedEntities {
+	Abreve \u102  abreve \u103  ac \u223e  acd \u223f 
+	acE \u223e\u333  Acy \u410  acy \u430  af \u2061 
+	Afr \ud835\udd04  afr \ud835\udd1e  aleph \u2135  Amacr \u100 
+	amacr \u101  amalg \u2a3f  AMP \u26  andand \u2a55  And \u2a53 
+	andd \u2a5c  andslope \u2a58  andv \u2a5a  ange \u29a4 
+	angle \u2220  angmsdaa \u29a8  angmsdab \u29a9  angmsdac \u29aa 
+	angmsdad \u29ab  angmsdae \u29ac  angmsdaf \u29ad 
+	angmsdag \u29ae  angmsdah \u29af  angmsd \u2221  angrt \u221f 
+	angrtvb \u22be  angrtvbd \u299d  angsph \u2222  angst \uc5 
+	angzarr \u237c  Aogon \u104  aogon \u105  Aopf \ud835\udd38 
+	aopf \ud835\udd52  apacir \u2a6f  ap \u2248  apE \u2a70 
+	ape \u224a  apid \u224b  ApplyFunction \u2061  approx \u2248 
+	approxeq \u224a  Ascr \ud835\udc9c  ascr \ud835\udcb6 
+	Assign \u2254  ast \u2a  asympeq \u224d  awconint \u2233 
+	awint \u2a11  backcong \u224c  backepsilon \u3f6 
+	backprime \u2035  backsim \u223d  backsimeq \u22cd 
+	Backslash \u2216  Barv \u2ae7  barvee \u22bd  barwed \u2305 
+	Barwed \u2306  barwedge \u2305  bbrk \u23b5  bbrktbrk \u23b6 
+	bcong \u224c  Bcy \u411  bcy \u431  becaus \u2235  because \u2235 
+	Because \u2235  bemptyv \u29b0  bepsi \u3f6  bernou \u212c 
+	Bernoullis \u212c  beth \u2136  between \u226c  Bfr \ud835\udd05 
+	bfr \ud835\udd1f  bigcap \u22c2  bigcirc \u25ef  bigcup \u22c3 
+	bigodot \u2a00  bigoplus \u2a01  bigotimes \u2a02 
+	bigsqcup \u2a06  bigstar \u2605  bigtriangledown \u25bd 
+	bigtriangleup \u25b3  biguplus \u2a04  bigvee \u22c1 
+	bigwedge \u22c0  bkarow \u290d  blacklozenge \u29eb 
+	blacksquare \u25aa  blacktriangle \u25b4 
+	blacktriangledown \u25be  blacktriangleleft \u25c2 
+	blacktriangleright \u25b8  blank \u2423  blk12 \u2592 
+	blk14 \u2591  blk34 \u2593  block \u2588  bne \u3d\u20e5 
+	bnequiv \u2261\u20e5  bNot \u2aed  bnot \u2310  Bopf \ud835\udd39 
+	bopf \ud835\udd53  bot \u22a5  bottom \u22a5  bowtie \u22c8 
+	boxbox \u29c9  boxdl \u2510  boxdL \u2555  boxDl \u2556 
+	boxDL \u2557  boxdr \u250c  boxdR \u2552  boxDr \u2553 
+	boxDR \u2554  boxh \u2500  boxH \u2550  boxhd \u252c 
+	boxHd \u2564  boxhD \u2565  boxHD \u2566  boxhu \u2534 
+	boxHu \u2567  boxhU \u2568  boxHU \u2569  boxminus \u229f 
+	boxplus \u229e  boxtimes \u22a0  boxul \u2518  boxuL \u255b 
+	boxUl \u255c  boxUL \u255d  boxur \u2514  boxuR \u2558 
+	boxUr \u2559  boxUR \u255a  boxv \u2502  boxV \u2551 
+	boxvh \u253c  boxvH \u256a  boxVh \u256b  boxVH \u256c 
+	boxvl \u2524  boxvL \u2561  boxVl \u2562  boxVL \u2563 
+	boxvr \u251c  boxvR \u255e  boxVr \u255f  boxVR \u2560 
+	bprime \u2035  breve \u2d8  Breve \u2d8  bscr \ud835\udcb7 
+	Bscr \u212c  bsemi \u204f  bsim \u223d  bsime \u22cd 
+	bsolb \u29c5  bsol \u5c  bsolhsub \u27c8  bullet \u2022 
+	bump \u224e  bumpE \u2aae  bumpe \u224f  Bumpeq \u224e 
+	bumpeq \u224f  Cacute \u106  cacute \u107  capand \u2a44 
+	capbrcup \u2a49  capcap \u2a4b  Cap \u22d2  capcup \u2a47 
+	capdot \u2a40  CapitalDifferentialD \u2145  caps \u2229\ufe00 
+	caret \u2041  caron \u2c7  Cayleys \u212d  ccaps \u2a4d 
+	Ccaron \u10c  ccaron \u10d  Ccirc \u108  ccirc \u109 
+	Cconint \u2230  ccups \u2a4c  ccupssm \u2a50  Cdot \u10a 
+	cdot \u10b  Cedilla \ub8  cemptyv \u29b2  centerdot \ub7 
+	CenterDot \ub7  cfr \ud835\udd20  Cfr \u212d  CHcy \u427 
+	chcy \u447  check \u2713  checkmark \u2713  circeq \u2257 
+	circlearrowleft \u21ba  circlearrowright \u21bb 
+	circledast \u229b  circledcirc \u229a  circleddash \u229d 
+	CircleDot \u2299  circledR \uae  circledS \u24c8 
+	CircleMinus \u2296  CirclePlus \u2295  CircleTimes \u2297 
+	cir \u25cb  cirE \u29c3  cire \u2257  cirfnint \u2a10 
+	cirmid \u2aef  cirscir \u29c2  ClockwiseContourIntegral \u2232 
+	CloseCurlyDoubleQuote \u201d  CloseCurlyQuote \u2019 
+	clubsuit \u2663  colon \u3a  Colon \u2237  Colone \u2a74 
+	colone \u2254  coloneq \u2254  comma \u2c  commat \u40 
+	comp \u2201  compfn \u2218  complement \u2201  complexes \u2102 
+	congdot \u2a6d  Congruent \u2261  conint \u222e  Conint \u222f 
+	ContourIntegral \u222e  copf \ud835\udd54  Copf \u2102 
+	coprod \u2210  Coproduct \u2210  COPY \ua9  copysr \u2117 
+	CounterClockwiseContourIntegral \u2233  cross \u2717 
+	Cross \u2a2f  Cscr \ud835\udc9e  cscr \ud835\udcb8  csub \u2acf 
+	csube \u2ad1  csup \u2ad0  csupe \u2ad2  ctdot \u22ef 
+	cudarrl \u2938  cudarrr \u2935  cuepr \u22de  cuesc \u22df 
+	cularr \u21b6  cularrp \u293d  cupbrcap \u2a48  cupcap \u2a46 
+	CupCap \u224d  Cup \u22d3  cupcup \u2a4a  cupdot \u228d 
+	cupor \u2a45  cups \u222a\ufe00  curarr \u21b7  curarrm \u293c 
+	curlyeqprec \u22de  curlyeqsucc \u22df  curlyvee \u22ce 
+	curlywedge \u22cf  curvearrowleft \u21b6  curvearrowright \u21b7 
+	cuvee \u22ce  cuwed \u22cf  cwconint \u2232  cwint \u2231 
+	cylcty \u232d  daleth \u2138  Darr \u21a1  dash \u2010 
+	Dashv \u2ae4  dashv \u22a3  dbkarow \u290f  dblac \u2dd 
+	Dcaron \u10e  dcaron \u10f  Dcy \u414  dcy \u434  ddagger \u2021 
+	ddarr \u21ca  DD \u2145  dd \u2146  DDotrahd \u2911 
+	ddotseq \u2a77  Del \u2207  demptyv \u29b1  dfisht \u297f 
+	Dfr \ud835\udd07  dfr \ud835\udd21  dHar \u2965  dharl \u21c3 
+	dharr \u21c2  DiacriticalAcute \ub4  DiacriticalDot \u2d9 
+	DiacriticalDoubleAcute \u2dd  DiacriticalGrave \u60 
+	DiacriticalTilde \u2dc  diam \u22c4  diamond \u22c4 
+	Diamond \u22c4  diamondsuit \u2666  die \ua8 
+	DifferentialD \u2146  digamma \u3dd  disin \u22f2  div \uf7 
+	divideontimes \u22c7  divonx \u22c7  DJcy \u402  djcy \u452 
+	dlcorn \u231e  dlcrop \u230d  dollar \u24  Dopf \ud835\udd3b 
+	dopf \ud835\udd55  Dot \ua8  dot \u2d9  DotDot \u20dc 
+	doteq \u2250  doteqdot \u2251  DotEqual \u2250  dotminus \u2238 
+	dotplus \u2214  dotsquare \u22a1  doublebarwedge \u2306 
+	DoubleContourIntegral \u222f  DoubleDot \ua8 
+	DoubleDownArrow \u21d3  DoubleLeftArrow \u21d0 
+	DoubleLeftRightArrow \u21d4  DoubleLeftTee \u2ae4 
+	DoubleLongLeftArrow \u27f8  DoubleLongLeftRightArrow \u27fa 
+	DoubleLongRightArrow \u27f9  DoubleRightArrow \u21d2 
+	DoubleRightTee \u22a8  DoubleUpArrow \u21d1 
+	DoubleUpDownArrow \u21d5  DoubleVerticalBar \u2225 
+	DownArrowBar \u2913  downarrow \u2193  DownArrow \u2193 
+	Downarrow \u21d3  DownArrowUpArrow \u21f5  DownBreve \u311 
+	downdownarrows \u21ca  downharpoonleft \u21c3 
+	downharpoonright \u21c2  DownLeftRightVector \u2950 
+	DownLeftTeeVector \u295e  DownLeftVectorBar \u2956 
+	DownLeftVector \u21bd  DownRightTeeVector \u295f 
+	DownRightVectorBar \u2957  DownRightVector \u21c1 
+	DownTeeArrow \u21a7  DownTee \u22a4  drbkarow \u2910 
+	drcorn \u231f  drcrop \u230c  Dscr \ud835\udc9f 
+	dscr \ud835\udcb9  DScy \u405  dscy \u455  dsol \u29f6 
+	Dstrok \u110  dstrok \u111  dtdot \u22f1  dtri \u25bf 
+	dtrif \u25be  duarr \u21f5  duhar \u296f  dwangle \u29a6 
+	DZcy \u40f  dzcy \u45f  dzigrarr \u27ff  easter \u2a6e 
+	Ecaron \u11a  ecaron \u11b  ecir \u2256  ecolon \u2255  Ecy \u42d 
+	ecy \u44d  eDDot \u2a77  Edot \u116  edot \u117  eDot \u2251 
+	ee \u2147  efDot \u2252  Efr \ud835\udd08  efr \ud835\udd22 
+	eg \u2a9a  egs \u2a96  egsdot \u2a98  el \u2a99  Element \u2208 
+	elinters \u23e7  ell \u2113  els \u2a95  elsdot \u2a97 
+	Emacr \u112  emacr \u113  emptyset \u2205 
+	EmptySmallSquare \u25fb  emptyv \u2205 
+	EmptyVerySmallSquare \u25ab  emsp13 \u2004  emsp14 \u2005 
+	ENG \u14a  eng \u14b  Eogon \u118  eogon \u119  Eopf \ud835\udd3c 
+	eopf \ud835\udd56  epar \u22d5  eparsl \u29e3  eplus \u2a71 
+	epsi \u3b5  epsiv \u3f5  eqcirc \u2256  eqcolon \u2255 
+	eqsim \u2242  eqslantgtr \u2a96  eqslantless \u2a95  Equal \u2a75 
+	equals \u3d  EqualTilde \u2242  equest \u225f  Equilibrium \u21cc 
+	equivDD \u2a78  eqvparsl \u29e5  erarr \u2971  erDot \u2253 
+	escr \u212f  Escr \u2130  esdot \u2250  Esim \u2a73  esim \u2242 
+	excl \u21  Exists \u2203  expectation \u2130  exponentiale \u2147 
+	ExponentialE \u2147  fallingdotseq \u2252  Fcy \u424  fcy \u444 
+	female \u2640  ffilig \ufb03  fflig \ufb00  ffllig \ufb04 
+	Ffr \ud835\udd09  ffr \ud835\udd23  filig \ufb01 
+	FilledSmallSquare \u25fc  FilledVerySmallSquare \u25aa 
+	fjlig \u66\u6a  flat \u266d  fllig \ufb02  fltns \u25b1 
+	Fopf \ud835\udd3d  fopf \ud835\udd57  ForAll \u2200  fork \u22d4 
+	forkv \u2ad9  Fouriertrf \u2131  fpartint \u2a0d  frac13 \u2153 
+	frac15 \u2155  frac16 \u2159  frac18 \u215b  frac23 \u2154 
+	frac25 \u2156  frac35 \u2157  frac38 \u215c  frac45 \u2158 
+	frac56 \u215a  frac58 \u215d  frac78 \u215e  frown \u2322 
+	fscr \ud835\udcbb  Fscr \u2131  gacute \u1f5  Gammad \u3dc 
+	gammad \u3dd  gap \u2a86  Gbreve \u11e  gbreve \u11f 
+	Gcedil \u122  Gcirc \u11c  gcirc \u11d  Gcy \u413  gcy \u433 
+	Gdot \u120  gdot \u121  gE \u2267  gEl \u2a8c  gel \u22db 
+	geq \u2265  geqq \u2267  geqslant \u2a7e  gescc \u2aa9 
+	ges \u2a7e  gesdot \u2a80  gesdoto \u2a82  gesdotol \u2a84 
+	gesl \u22db\ufe00  gesles \u2a94  Gfr \ud835\udd0a 
+	gfr \ud835\udd24  gg \u226b  Gg \u22d9  ggg \u22d9  gimel \u2137 
+	GJcy \u403  gjcy \u453  gla \u2aa5  gl \u2277  glE \u2a92 
+	glj \u2aa4  gnap \u2a8a  gnapprox \u2a8a  gne \u2a88  gnE \u2269 
+	gneq \u2a88  gneqq \u2269  gnsim \u22e7  Gopf \ud835\udd3e 
+	gopf \ud835\udd58  grave \u60  GreaterEqual \u2265 
+	GreaterEqualLess \u22db  GreaterFullEqual \u2267 
+	GreaterGreater \u2aa2  GreaterLess \u2277 
+	GreaterSlantEqual \u2a7e  GreaterTilde \u2273  Gscr \ud835\udca2 
+	gscr \u210a  gsim \u2273  gsime \u2a8e  gsiml \u2a90  gtcc \u2aa7 
+	gtcir \u2a7a  GT \u3e  Gt \u226b  gtdot \u22d7  gtlPar \u2995 
+	gtquest \u2a7c  gtrapprox \u2a86  gtrarr \u2978  gtrdot \u22d7 
+	gtreqless \u22db  gtreqqless \u2a8c  gtrless \u2277 
+	gtrsim \u2273  gvertneqq \u2269\ufe00  gvnE \u2269\ufe00 
+	Hacek \u2c7  hairsp \u200a  half \ubd  hamilt \u210b 
+	HARDcy \u42a  hardcy \u44a  harrcir \u2948  harrw \u21ad 
+	Hat \u5e  hbar \u210f  Hcirc \u124  hcirc \u125  heartsuit \u2665 
+	hercon \u22b9  hfr \ud835\udd25  Hfr \u210c  HilbertSpace \u210b 
+	hksearow \u2925  hkswarow \u2926  hoarr \u21ff  homtht \u223b 
+	hookleftarrow \u21a9  hookrightarrow \u21aa  hopf \ud835\udd59 
+	Hopf \u210d  horbar \u2015  HorizontalLine \u2500 
+	hscr \ud835\udcbd  Hscr \u210b  hslash \u210f  Hstrok \u126 
+	hstrok \u127  HumpDownHump \u224e  HumpEqual \u224f 
+	hybull \u2043  hyphen \u2010  ic \u2063  Icy \u418  icy \u438 
+	Idot \u130  IEcy \u415  iecy \u435  iff \u21d4  ifr \ud835\udd26 
+	Ifr \u2111  ii \u2148  iiiint \u2a0c  iiint \u222d  iinfin \u29dc 
+	iiota \u2129  IJlig \u132  ijlig \u133  Imacr \u12a  imacr \u12b 
+	ImaginaryI \u2148  imagline \u2110  imagpart \u2111  imath \u131 
+	Im \u2111  imof \u22b7  imped \u1b5  Implies \u21d2 
+	incare \u2105  in \u2208  infintie \u29dd  inodot \u131 
+	intcal \u22ba  Int \u222c  integers \u2124  Integral \u222b 
+	intercal \u22ba  Intersection \u22c2  intlarhk \u2a17 
+	intprod \u2a3c  InvisibleComma \u2063  InvisibleTimes \u2062 
+	IOcy \u401  iocy \u451  Iogon \u12e  iogon \u12f 
+	Iopf \ud835\udd40  iopf \ud835\udd5a  iprod \u2a3c 
+	iscr \ud835\udcbe  Iscr \u2110  isindot \u22f5  isinE \u22f9 
+	isins \u22f4  isinsv \u22f3  isinv \u2208  it \u2062 
+	Itilde \u128  itilde \u129  Iukcy \u406  iukcy \u456  Jcirc \u134 
+	jcirc \u135  Jcy \u419  jcy \u439  Jfr \ud835\udd0d 
+	jfr \ud835\udd27  jmath \u237  Jopf \ud835\udd41 
+	jopf \ud835\udd5b  Jscr \ud835\udca5  jscr \ud835\udcbf 
+	Jsercy \u408  jsercy \u458  Jukcy \u404  jukcy \u454 
+	kappav \u3f0  Kcedil \u136  kcedil \u137  Kcy \u41a  kcy \u43a 
+	Kfr \ud835\udd0e  kfr \ud835\udd28  kgreen \u138  KHcy \u425 
+	khcy \u445  KJcy \u40c  kjcy \u45c  Kopf \ud835\udd42 
+	kopf \ud835\udd5c  Kscr \ud835\udca6  kscr \ud835\udcc0 
+	lAarr \u21da  Lacute \u139  lacute \u13a  laemptyv \u29b4 
+	lagran \u2112  Lang \u27ea  langd \u2991  langle \u27e8 
+	lap \u2a85  Laplacetrf \u2112  larrb \u21e4  larrbfs \u291f 
+	Larr \u219e  larrfs \u291d  larrhk \u21a9  larrlp \u21ab 
+	larrpl \u2939  larrsim \u2973  larrtl \u21a2  latail \u2919 
+	lAtail \u291b  lat \u2aab  late \u2aad  lates \u2aad\ufe00 
+	lbarr \u290c  lBarr \u290e  lbbrk \u2772  lbrace \u7b 
+	lbrack \u5b  lbrke \u298b  lbrksld \u298f  lbrkslu \u298d 
+	Lcaron \u13d  lcaron \u13e  Lcedil \u13b  lcedil \u13c  lcub \u7b 
+	Lcy \u41b  lcy \u43b  ldca \u2936  ldquor \u201e  ldrdhar \u2967 
+	ldrushar \u294b  ldsh \u21b2  lE \u2266  LeftAngleBracket \u27e8 
+	LeftArrowBar \u21e4  leftarrow \u2190  LeftArrow \u2190 
+	Leftarrow \u21d0  LeftArrowRightArrow \u21c6 
+	leftarrowtail \u21a2  LeftCeiling \u2308 
+	LeftDoubleBracket \u27e6  LeftDownTeeVector \u2961 
+	LeftDownVectorBar \u2959  LeftDownVector \u21c3  LeftFloor \u230a 
+	leftharpoondown \u21bd  leftharpoonup \u21bc 
+	leftleftarrows \u21c7  leftrightarrow \u2194 
+	LeftRightArrow \u2194  Leftrightarrow \u21d4 
+	leftrightarrows \u21c6  leftrightharpoons \u21cb 
+	leftrightsquigarrow \u21ad  LeftRightVector \u294e 
+	LeftTeeArrow \u21a4  LeftTee \u22a3  LeftTeeVector \u295a 
+	leftthreetimes \u22cb  LeftTriangleBar \u29cf 
+	LeftTriangle \u22b2  LeftTriangleEqual \u22b4 
+	LeftUpDownVector \u2951  LeftUpTeeVector \u2960 
+	LeftUpVectorBar \u2958  LeftUpVector \u21bf  LeftVectorBar \u2952 
+	LeftVector \u21bc  lEg \u2a8b  leg \u22da  leq \u2264 
+	leqq \u2266  leqslant \u2a7d  lescc \u2aa8  les \u2a7d 
+	lesdot \u2a7f  lesdoto \u2a81  lesdotor \u2a83  lesg \u22da\ufe00 
+	lesges \u2a93  lessapprox \u2a85  lessdot \u22d6 
+	lesseqgtr \u22da  lesseqqgtr \u2a8b  LessEqualGreater \u22da 
+	LessFullEqual \u2266  LessGreater \u2276  lessgtr \u2276 
+	LessLess \u2aa1  lesssim \u2272  LessSlantEqual \u2a7d 
+	LessTilde \u2272  lfisht \u297c  Lfr \ud835\udd0f 
+	lfr \ud835\udd29  lg \u2276  lgE \u2a91  lHar \u2962 
+	lhard \u21bd  lharu \u21bc  lharul \u296a  lhblk \u2584 
+	LJcy \u409  ljcy \u459  llarr \u21c7  ll \u226a  Ll \u22d8 
+	llcorner \u231e  Lleftarrow \u21da  llhard \u296b  lltri \u25fa 
+	Lmidot \u13f  lmidot \u140  lmoustache \u23b0  lmoust \u23b0 
+	lnap \u2a89  lnapprox \u2a89  lne \u2a87  lnE \u2268  lneq \u2a87 
+	lneqq \u2268  lnsim \u22e6  loang \u27ec  loarr \u21fd 
+	lobrk \u27e6  longleftarrow \u27f5  LongLeftArrow \u27f5 
+	Longleftarrow \u27f8  longleftrightarrow \u27f7 
+	LongLeftRightArrow \u27f7  Longleftrightarrow \u27fa 
+	longmapsto \u27fc  longrightarrow \u27f6  LongRightArrow \u27f6 
+	Longrightarrow \u27f9  looparrowleft \u21ab 
+	looparrowright \u21ac  lopar \u2985  Lopf \ud835\udd43 
+	lopf \ud835\udd5d  loplus \u2a2d  lotimes \u2a34  lowbar \u5f 
+	LowerLeftArrow \u2199  LowerRightArrow \u2198  lozenge \u25ca 
+	lozf \u29eb  lpar \u28  lparlt \u2993  lrarr \u21c6 
+	lrcorner \u231f  lrhar \u21cb  lrhard \u296d  lrtri \u22bf 
+	lscr \ud835\udcc1  Lscr \u2112  lsh \u21b0  Lsh \u21b0 
+	lsim \u2272  lsime \u2a8d  lsimg \u2a8f  lsqb \u5b  lsquor \u201a 
+	Lstrok \u141  lstrok \u142  ltcc \u2aa6  ltcir \u2a79  LT \u3c 
+	Lt \u226a  ltdot \u22d6  lthree \u22cb  ltimes \u22c9 
+	ltlarr \u2976  ltquest \u2a7b  ltri \u25c3  ltrie \u22b4 
+	ltrif \u25c2  ltrPar \u2996  lurdshar \u294a  luruhar \u2966 
+	lvertneqq \u2268\ufe00  lvnE \u2268\ufe00  male \u2642 
+	malt \u2720  maltese \u2720  Map \u2905  map \u21a6 
+	mapsto \u21a6  mapstodown \u21a7  mapstoleft \u21a4 
+	mapstoup \u21a5  marker \u25ae  mcomma \u2a29  Mcy \u41c 
+	mcy \u43c  mDDot \u223a  measuredangle \u2221  MediumSpace \u205f 
+	Mellintrf \u2133  Mfr \ud835\udd10  mfr \ud835\udd2a  mho \u2127 
+	midast \u2a  midcir \u2af0  mid \u2223  minusb \u229f 
+	minusd \u2238  minusdu \u2a2a  MinusPlus \u2213  mlcp \u2adb 
+	mldr \u2026  mnplus \u2213  models \u22a7  Mopf \ud835\udd44 
+	mopf \ud835\udd5e  mp \u2213  mscr \ud835\udcc2  Mscr \u2133 
+	mstpos \u223e  multimap \u22b8  mumap \u22b8  Nacute \u143 
+	nacute \u144  nang \u2220\u20d2  nap \u2249  napE \u2a70\u338 
+	napid \u224b\u338  napos \u149  napprox \u2249  natural \u266e 
+	naturals \u2115  natur \u266e  nbump \u224e\u338 
+	nbumpe \u224f\u338  ncap \u2a43  Ncaron \u147  ncaron \u148 
+	Ncedil \u145  ncedil \u146  ncong \u2247  ncongdot \u2a6d\u338 
+	ncup \u2a42  Ncy \u41d  ncy \u43d  nearhk \u2924  nearr \u2197 
+	neArr \u21d7  nearrow \u2197  nedot \u2250\u338 
+	NegativeMediumSpace \u200b  NegativeThickSpace \u200b 
+	NegativeThinSpace \u200b  NegativeVeryThinSpace \u200b 
+	nequiv \u2262  nesear \u2928  nesim \u2242\u338 
+	NestedGreaterGreater \u226b  NestedLessLess \u226a  NewLine \ua 
+	nexist \u2204  nexists \u2204  Nfr \ud835\udd11  nfr \ud835\udd2b 
+	ngE \u2267\u338  nge \u2271  ngeq \u2271  ngeqq \u2267\u338 
+	ngeqslant \u2a7e\u338  nges \u2a7e\u338  nGg \u22d9\u338 
+	ngsim \u2275  nGt \u226b\u20d2  ngt \u226f  ngtr \u226f 
+	nGtv \u226b\u338  nharr \u21ae  nhArr \u21ce  nhpar \u2af2 
+	nis \u22fc  nisd \u22fa  niv \u220b  NJcy \u40a  njcy \u45a 
+	nlarr \u219a  nlArr \u21cd  nldr \u2025  nlE \u2266\u338 
+	nle \u2270  nleftarrow \u219a  nLeftarrow \u21cd 
+	nleftrightarrow \u21ae  nLeftrightarrow \u21ce  nleq \u2270 
+	nleqq \u2266\u338  nleqslant \u2a7d\u338  nles \u2a7d\u338 
+	nless \u226e  nLl \u22d8\u338  nlsim \u2274  nLt \u226a\u20d2 
+	nlt \u226e  nltri \u22ea  nltrie \u22ec  nLtv \u226a\u338 
+	nmid \u2224  NoBreak \u2060  NonBreakingSpace \ua0 
+	nopf \ud835\udd5f  Nopf \u2115  Not \u2aec  NotCongruent \u2262 
+	NotCupCap \u226d  NotDoubleVerticalBar \u2226  NotElement \u2209 
+	NotEqual \u2260  NotEqualTilde \u2242\u338  NotExists \u2204 
+	NotGreater \u226f  NotGreaterEqual \u2271 
+	NotGreaterFullEqual \u2267\u338  NotGreaterGreater \u226b\u338 
+	NotGreaterLess \u2279  NotGreaterSlantEqual \u2a7e\u338 
+	NotGreaterTilde \u2275  NotHumpDownHump \u224e\u338 
+	NotHumpEqual \u224f\u338  notindot \u22f5\u338 
+	notinE \u22f9\u338  notinva \u2209  notinvb \u22f7 
+	notinvc \u22f6  NotLeftTriangleBar \u29cf\u338 
+	NotLeftTriangle \u22ea  NotLeftTriangleEqual \u22ec 
+	NotLess \u226e  NotLessEqual \u2270  NotLessGreater \u2278 
+	NotLessLess \u226a\u338  NotLessSlantEqual \u2a7d\u338 
+	NotLessTilde \u2274  NotNestedGreaterGreater \u2aa2\u338 
+	NotNestedLessLess \u2aa1\u338  notni \u220c  notniva \u220c 
+	notnivb \u22fe  notnivc \u22fd  NotPrecedes \u2280 
+	NotPrecedesEqual \u2aaf\u338  NotPrecedesSlantEqual \u22e0 
+	NotReverseElement \u220c  NotRightTriangleBar \u29d0\u338 
+	NotRightTriangle \u22eb  NotRightTriangleEqual \u22ed 
+	NotSquareSubset \u228f\u338  NotSquareSubsetEqual \u22e2 
+	NotSquareSuperset \u2290\u338  NotSquareSupersetEqual \u22e3 
+	NotSubset \u2282\u20d2  NotSubsetEqual \u2288  NotSucceeds \u2281 
+	NotSucceedsEqual \u2ab0\u338  NotSucceedsSlantEqual \u22e1 
+	NotSucceedsTilde \u227f\u338  NotSuperset \u2283\u20d2 
+	NotSupersetEqual \u2289  NotTilde \u2241  NotTildeEqual \u2244 
+	NotTildeFullEqual \u2247  NotTildeTilde \u2249 
+	NotVerticalBar \u2224  nparallel \u2226  npar \u2226 
+	nparsl \u2afd\u20e5  npart \u2202\u338  npolint \u2a14 
+	npr \u2280  nprcue \u22e0  nprec \u2280  npreceq \u2aaf\u338 
+	npre \u2aaf\u338  nrarrc \u2933\u338  nrarr \u219b  nrArr \u21cf 
+	nrarrw \u219d\u338  nrightarrow \u219b  nRightarrow \u21cf 
+	nrtri \u22eb  nrtrie \u22ed  nsc \u2281  nsccue \u22e1 
+	nsce \u2ab0\u338  Nscr \ud835\udca9  nscr \ud835\udcc3 
+	nshortmid \u2224  nshortparallel \u2226  nsim \u2241 
+	nsime \u2244  nsimeq \u2244  nsmid \u2224  nspar \u2226 
+	nsqsube \u22e2  nsqsupe \u22e3  nsubE \u2ac5\u338  nsube \u2288 
+	nsubset \u2282\u20d2  nsubseteq \u2288  nsubseteqq \u2ac5\u338 
+	nsucc \u2281  nsucceq \u2ab0\u338  nsup \u2285  nsupE \u2ac6\u338 
+	nsupe \u2289  nsupset \u2283\u20d2  nsupseteq \u2289 
+	nsupseteqq \u2ac6\u338  ntgl \u2279  ntlg \u2278 
+	ntriangleleft \u22ea  ntrianglelefteq \u22ec 
+	ntriangleright \u22eb  ntrianglerighteq \u22ed  num \u23 
+	numero \u2116  numsp \u2007  nvap \u224d\u20d2  nvdash \u22ac 
+	nvDash \u22ad  nVdash \u22ae  nVDash \u22af  nvge \u2265\u20d2 
+	nvgt \u3e\u20d2  nvHarr \u2904  nvinfin \u29de  nvlArr \u2902 
+	nvle \u2264\u20d2  nvlt \u3c\u20d2  nvltrie \u22b4\u20d2 
+	nvrArr \u2903  nvrtrie \u22b5\u20d2  nvsim \u223c\u20d2 
+	nwarhk \u2923  nwarr \u2196  nwArr \u21d6  nwarrow \u2196 
+	nwnear \u2927  oast \u229b  ocir \u229a  Ocy \u41e  ocy \u43e 
+	odash \u229d  Odblac \u150  odblac \u151  odiv \u2a38 
+	odot \u2299  odsold \u29bc  ofcir \u29bf  Ofr \ud835\udd12 
+	ofr \ud835\udd2c  ogon \u2db  ogt \u29c1  ohbar \u29b5  ohm \u3a9 
+	oint \u222e  olarr \u21ba  olcir \u29be  olcross \u29bb 
+	olt \u29c0  Omacr \u14c  omacr \u14d  omid \u29b6  ominus \u2296 
+	Oopf \ud835\udd46  oopf \ud835\udd60  opar \u29b7 
+	OpenCurlyDoubleQuote \u201c  OpenCurlyQuote \u2018  operp \u29b9 
+	orarr \u21bb  Or \u2a54  ord \u2a5d  order \u2134  orderof \u2134 
+	origof \u22b6  oror \u2a56  orslope \u2a57  orv \u2a5b  oS \u24c8 
+	Oscr \ud835\udcaa  oscr \u2134  osol \u2298  otimesas \u2a36 
+	Otimes \u2a37  ovbar \u233d  OverBar \u203e  OverBrace \u23de 
+	OverBracket \u23b4  OverParenthesis \u23dc  parallel \u2225 
+	par \u2225  parsim \u2af3  parsl \u2afd  PartialD \u2202 
+	Pcy \u41f  pcy \u43f  percnt \u25  period \u2e  pertenk \u2031 
+	Pfr \ud835\udd13  pfr \ud835\udd2d  phiv \u3d5  phmmat \u2133 
+	phone \u260e  pitchfork \u22d4  planck \u210f  planckh \u210e 
+	plankv \u210f  plusacir \u2a23  plusb \u229e  pluscir \u2a22 
+	plus \u2b  plusdo \u2214  plusdu \u2a25  pluse \u2a72 
+	PlusMinus \ub1  plussim \u2a26  plustwo \u2a27  pm \ub1 
+	Poincareplane \u210c  pointint \u2a15  popf \ud835\udd61 
+	Popf \u2119  prap \u2ab7  Pr \u2abb  pr \u227a  prcue \u227c 
+	precapprox \u2ab7  prec \u227a  preccurlyeq \u227c 
+	Precedes \u227a  PrecedesEqual \u2aaf  PrecedesSlantEqual \u227c 
+	PrecedesTilde \u227e  preceq \u2aaf  precnapprox \u2ab9 
+	precneqq \u2ab5  precnsim \u22e8  pre \u2aaf  prE \u2ab3 
+	precsim \u227e  primes \u2119  prnap \u2ab9  prnE \u2ab5 
+	prnsim \u22e8  Product \u220f  profalar \u232e  profline \u2312 
+	profsurf \u2313  Proportional \u221d  Proportion \u2237 
+	propto \u221d  prsim \u227e  prurel \u22b0  Pscr \ud835\udcab 
+	pscr \ud835\udcc5  puncsp \u2008  Qfr \ud835\udd14 
+	qfr \ud835\udd2e  qint \u2a0c  qopf \ud835\udd62  Qopf \u211a 
+	qprime \u2057  Qscr \ud835\udcac  qscr \ud835\udcc6 
+	quaternions \u210d  quatint \u2a16  quest \u3f  questeq \u225f 
+	QUOT \u22  rAarr \u21db  race \u223d\u331  Racute \u154 
+	racute \u155  raemptyv \u29b3  Rang \u27eb  rangd \u2992 
+	range \u29a5  rangle \u27e9  rarrap \u2975  rarrb \u21e5 
+	rarrbfs \u2920  rarrc \u2933  Rarr \u21a0  rarrfs \u291e 
+	rarrhk \u21aa  rarrlp \u21ac  rarrpl \u2945  rarrsim \u2974 
+	Rarrtl \u2916  rarrtl \u21a3  rarrw \u219d  ratail \u291a 
+	rAtail \u291c  ratio \u2236  rationals \u211a  rbarr \u290d 
+	rBarr \u290f  RBarr \u2910  rbbrk \u2773  rbrace \u7d 
+	rbrack \u5d  rbrke \u298c  rbrksld \u298e  rbrkslu \u2990 
+	Rcaron \u158  rcaron \u159  Rcedil \u156  rcedil \u157  rcub \u7d 
+	Rcy \u420  rcy \u440  rdca \u2937  rdldhar \u2969  rdquor \u201d 
+	rdsh \u21b3  realine \u211b  realpart \u211c  reals \u211d 
+	Re \u211c  rect \u25ad  REG \uae  ReverseElement \u220b 
+	ReverseEquilibrium \u21cb  ReverseUpEquilibrium \u296f 
+	rfisht \u297d  rfr \ud835\udd2f  Rfr \u211c  rHar \u2964 
+	rhard \u21c1  rharu \u21c0  rharul \u296c  rhov \u3f1 
+	RightAngleBracket \u27e9  RightArrowBar \u21e5  rightarrow \u2192 
+	RightArrow \u2192  Rightarrow \u21d2  RightArrowLeftArrow \u21c4 
+	rightarrowtail \u21a3  RightCeiling \u2309 
+	RightDoubleBracket \u27e7  RightDownTeeVector \u295d 
+	RightDownVectorBar \u2955  RightDownVector \u21c2 
+	RightFloor \u230b  rightharpoondown \u21c1  rightharpoonup \u21c0 
+	rightleftarrows \u21c4  rightleftharpoons \u21cc 
+	rightrightarrows \u21c9  rightsquigarrow \u219d 
+	RightTeeArrow \u21a6  RightTee \u22a2  RightTeeVector \u295b 
+	rightthreetimes \u22cc  RightTriangleBar \u29d0 
+	RightTriangle \u22b3  RightTriangleEqual \u22b5 
+	RightUpDownVector \u294f  RightUpTeeVector \u295c 
+	RightUpVectorBar \u2954  RightUpVector \u21be 
+	RightVectorBar \u2953  RightVector \u21c0  ring \u2da 
+	risingdotseq \u2253  rlarr \u21c4  rlhar \u21cc 
+	rmoustache \u23b1  rmoust \u23b1  rnmid \u2aee  roang \u27ed 
+	roarr \u21fe  robrk \u27e7  ropar \u2986  ropf \ud835\udd63 
+	Ropf \u211d  roplus \u2a2e  rotimes \u2a35  RoundImplies \u2970 
+	rpar \u29  rpargt \u2994  rppolint \u2a12  rrarr \u21c9 
+	Rrightarrow \u21db  rscr \ud835\udcc7  Rscr \u211b  rsh \u21b1 
+	Rsh \u21b1  rsqb \u5d  rsquor \u2019  rthree \u22cc 
+	rtimes \u22ca  rtri \u25b9  rtrie \u22b5  rtrif \u25b8 
+	rtriltri \u29ce  RuleDelayed \u29f4  ruluhar \u2968  rx \u211e 
+	Sacute \u15a  sacute \u15b  scap \u2ab8  Sc \u2abc  sc \u227b 
+	sccue \u227d  sce \u2ab0  scE \u2ab4  Scedil \u15e  scedil \u15f 
+	Scirc \u15c  scirc \u15d  scnap \u2aba  scnE \u2ab6 
+	scnsim \u22e9  scpolint \u2a13  scsim \u227f  Scy \u421 
+	scy \u441  sdotb \u22a1  sdote \u2a66  searhk \u2925 
+	searr \u2198  seArr \u21d8  searrow \u2198  semi \u3b 
+	seswar \u2929  setminus \u2216  setmn \u2216  sext \u2736 
+	Sfr \ud835\udd16  sfr \ud835\udd30  sfrown \u2322  sharp \u266f 
+	SHCHcy \u429  shchcy \u449  SHcy \u428  shcy \u448 
+	ShortDownArrow \u2193  ShortLeftArrow \u2190  shortmid \u2223 
+	shortparallel \u2225  ShortRightArrow \u2192  ShortUpArrow \u2191 
+	sigmav \u3c2  simdot \u2a6a  sime \u2243  simeq \u2243 
+	simg \u2a9e  simgE \u2aa0  siml \u2a9d  simlE \u2a9f 
+	simne \u2246  simplus \u2a24  simrarr \u2972  slarr \u2190 
+	SmallCircle \u2218  smallsetminus \u2216  smashp \u2a33 
+	smeparsl \u29e4  smid \u2223  smile \u2323  smt \u2aaa 
+	smte \u2aac  smtes \u2aac\ufe00  SOFTcy \u42c  softcy \u44c 
+	solbar \u233f  solb \u29c4  sol \u2f  Sopf \ud835\udd4a 
+	sopf \ud835\udd64  spadesuit \u2660  spar \u2225  sqcap \u2293 
+	sqcaps \u2293\ufe00  sqcup \u2294  sqcups \u2294\ufe00 
+	Sqrt \u221a  sqsub \u228f  sqsube \u2291  sqsubset \u228f 
+	sqsubseteq \u2291  sqsup \u2290  sqsupe \u2292  sqsupset \u2290 
+	sqsupseteq \u2292  square \u25a1  Square \u25a1 
+	SquareIntersection \u2293  SquareSubset \u228f 
+	SquareSubsetEqual \u2291  SquareSuperset \u2290 
+	SquareSupersetEqual \u2292  SquareUnion \u2294  squarf \u25aa 
+	squ \u25a1  squf \u25aa  srarr \u2192  Sscr \ud835\udcae 
+	sscr \ud835\udcc8  ssetmn \u2216  ssmile \u2323  sstarf \u22c6 
+	Star \u22c6  star \u2606  starf \u2605  straightepsilon \u3f5 
+	straightphi \u3d5  strns \uaf  Sub \u22d0  subdot \u2abd 
+	subE \u2ac5  subedot \u2ac3  submult \u2ac1  subnE \u2acb 
+	subne \u228a  subplus \u2abf  subrarr \u2979  subset \u2282 
+	Subset \u22d0  subseteq \u2286  subseteqq \u2ac5 
+	SubsetEqual \u2286  subsetneq \u228a  subsetneqq \u2acb 
+	subsim \u2ac7  subsub \u2ad5  subsup \u2ad3  succapprox \u2ab8 
+	succ \u227b  succcurlyeq \u227d  Succeeds \u227b 
+	SucceedsEqual \u2ab0  SucceedsSlantEqual \u227d 
+	SucceedsTilde \u227f  succeq \u2ab0  succnapprox \u2aba 
+	succneqq \u2ab6  succnsim \u22e9  succsim \u227f  SuchThat \u220b 
+	Sum \u2211  sung \u266a  Sup \u22d1  supdot \u2abe 
+	supdsub \u2ad8  supE \u2ac6  supedot \u2ac4  Superset \u2283 
+	SupersetEqual \u2287  suphsol \u27c9  suphsub \u2ad7 
+	suplarr \u297b  supmult \u2ac2  supnE \u2acc  supne \u228b 
+	supplus \u2ac0  supset \u2283  Supset \u22d1  supseteq \u2287 
+	supseteqq \u2ac6  supsetneq \u228b  supsetneqq \u2acc 
+	supsim \u2ac8  supsub \u2ad4  supsup \u2ad6  swarhk \u2926 
+	swarr \u2199  swArr \u21d9  swarrow \u2199  swnwar \u292a 
+	Tab \u9  target \u2316  tbrk \u23b4  Tcaron \u164  tcaron \u165 
+	Tcedil \u162  tcedil \u163  Tcy \u422  tcy \u442  tdot \u20db 
+	telrec \u2315  Tfr \ud835\udd17  tfr \ud835\udd31 
+	therefore \u2234  Therefore \u2234  thetav \u3d1 
+	thickapprox \u2248  thicksim \u223c  ThickSpace \u205f\u200a 
+	ThinSpace \u2009  thkap \u2248  thksim \u223c  Tilde \u223c 
+	TildeEqual \u2243  TildeFullEqual \u2245  TildeTilde \u2248 
+	timesbar \u2a31  timesb \u22a0  timesd \u2a30  tint \u222d 
+	toea \u2928  topbot \u2336  topcir \u2af1  top \u22a4 
+	Topf \ud835\udd4b  topf \ud835\udd65  topfork \u2ada  tosa \u2929 
+	tprime \u2034  TRADE \u2122  triangle \u25b5  triangledown \u25bf 
+	triangleleft \u25c3  trianglelefteq \u22b4  triangleq \u225c 
+	triangleright \u25b9  trianglerighteq \u22b5  tridot \u25ec 
+	trie \u225c  triminus \u2a3a  TripleDot \u20db  triplus \u2a39 
+	trisb \u29cd  tritime \u2a3b  trpezium \u23e2  Tscr \ud835\udcaf 
+	tscr \ud835\udcc9  TScy \u426  tscy \u446  TSHcy \u40b 
+	tshcy \u45b  Tstrok \u166  tstrok \u167  twixt \u226c 
+	twoheadleftarrow \u219e  twoheadrightarrow \u21a0  Uarr \u219f 
+	Uarrocir \u2949  Ubrcy \u40e  ubrcy \u45e  Ubreve \u16c 
+	ubreve \u16d  Ucy \u423  ucy \u443  udarr \u21c5  Udblac \u170 
+	udblac \u171  udhar \u296e  ufisht \u297e  Ufr \ud835\udd18 
+	ufr \ud835\udd32  uHar \u2963  uharl \u21bf  uharr \u21be 
+	uhblk \u2580  ulcorn \u231c  ulcorner \u231c  ulcrop \u230f 
+	ultri \u25f8  Umacr \u16a  umacr \u16b  UnderBar \u5f 
+	UnderBrace \u23df  UnderBracket \u23b5  UnderParenthesis \u23dd 
+	Union \u22c3  UnionPlus \u228e  Uogon \u172  uogon \u173 
+	Uopf \ud835\udd4c  uopf \ud835\udd66  UpArrowBar \u2912 
+	uparrow \u2191  UpArrow \u2191  Uparrow \u21d1 
+	UpArrowDownArrow \u21c5  updownarrow \u2195  UpDownArrow \u2195 
+	Updownarrow \u21d5  UpEquilibrium \u296e  upharpoonleft \u21bf 
+	upharpoonright \u21be  uplus \u228e  UpperLeftArrow \u2196 
+	UpperRightArrow \u2197  upsi \u3c5  Upsi \u3d2  UpTeeArrow \u21a5 
+	UpTee \u22a5  upuparrows \u21c8  urcorn \u231d  urcorner \u231d 
+	urcrop \u230e  Uring \u16e  uring \u16f  urtri \u25f9 
+	Uscr \ud835\udcb0  uscr \ud835\udcca  utdot \u22f0  Utilde \u168 
+	utilde \u169  utri \u25b5  utrif \u25b4  uuarr \u21c8 
+	uwangle \u29a7  vangrt \u299c  varepsilon \u3f5  varkappa \u3f0 
+	varnothing \u2205  varphi \u3d5  varpi \u3d6  varpropto \u221d 
+	varr \u2195  vArr \u21d5  varrho \u3f1  varsigma \u3c2 
+	varsubsetneq \u228a\ufe00  varsubsetneqq \u2acb\ufe00 
+	varsupsetneq \u228b\ufe00  varsupsetneqq \u2acc\ufe00 
+	vartheta \u3d1  vartriangleleft \u22b2  vartriangleright \u22b3 
+	vBar \u2ae8  Vbar \u2aeb  vBarv \u2ae9  Vcy \u412  vcy \u432 
+	vdash \u22a2  vDash \u22a8  Vdash \u22a9  VDash \u22ab 
+	Vdashl \u2ae6  veebar \u22bb  vee \u2228  Vee \u22c1 
+	veeeq \u225a  vellip \u22ee  verbar \u7c  Verbar \u2016 
+	vert \u7c  Vert \u2016  VerticalBar \u2223  VerticalLine \u7c 
+	VerticalSeparator \u2758  VerticalTilde \u2240 
+	VeryThinSpace \u200a  Vfr \ud835\udd19  vfr \ud835\udd33 
+	vltri \u22b2  vnsub \u2282\u20d2  vnsup \u2283\u20d2 
+	Vopf \ud835\udd4d  vopf \ud835\udd67  vprop \u221d  vrtri \u22b3 
+	Vscr \ud835\udcb1  vscr \ud835\udccb  vsubnE \u2acb\ufe00 
+	vsubne \u228a\ufe00  vsupnE \u2acc\ufe00  vsupne \u228b\ufe00 
+	Vvdash \u22aa  vzigzag \u299a  Wcirc \u174  wcirc \u175 
+	wedbar \u2a5f  wedge \u2227  Wedge \u22c0  wedgeq \u2259 
+	Wfr \ud835\udd1a  wfr \ud835\udd34  Wopf \ud835\udd4e 
+	wopf \ud835\udd68  wp \u2118  wr \u2240  wreath \u2240 
+	Wscr \ud835\udcb2  wscr \ud835\udccc  xcap \u22c2  xcirc \u25ef 
+	xcup \u22c3  xdtri \u25bd  Xfr \ud835\udd1b  xfr \ud835\udd35 
+	xharr \u27f7  xhArr \u27fa  xlarr \u27f5  xlArr \u27f8 
+	xmap \u27fc  xnis \u22fb  xodot \u2a00  Xopf \ud835\udd4f 
+	xopf \ud835\udd69  xoplus \u2a01  xotime \u2a02  xrarr \u27f6 
+	xrArr \u27f9  Xscr \ud835\udcb3  xscr \ud835\udccd  xsqcup \u2a06 
+	xuplus \u2a04  xutri \u25b3  xvee \u22c1  xwedge \u22c0 
+	YAcy \u42f  yacy \u44f  Ycirc \u176  ycirc \u177  Ycy \u42b 
+	ycy \u44b  Yfr \ud835\udd1c  yfr \ud835\udd36  YIcy \u407 
+	yicy \u457  Yopf \ud835\udd50  yopf \ud835\udd6a 
+	Yscr \ud835\udcb4  yscr \ud835\udcce  YUcy \u42e  yucy \u44e 
+	Zacute \u179  zacute \u17a  Zcaron \u17d  zcaron \u17e  Zcy \u417 
+	zcy \u437  Zdot \u17b  zdot \u17c  zeetrf \u2128 
+	ZeroWidthSpace \u200b  zfr \ud835\udd37  Zfr \u2128  ZHcy \u416 
+	zhcy \u436  zigrarr \u21dd  zopf \ud835\udd6b  Zopf \u2124 
+	Zscr \ud835\udcb5  zscr \ud835\udccf
+    }
+
+    # Internal cache for the foreach variable-lists and the
+    # substitution strings used to split a HTML string into
+    # incrementally handleable scripts. This should reduce the
+    # time compute this information for repeated calls with the same
+    # split-factor. The array is indexed by a combination of the
+    # numerical split factor and the length of the command prefix and
+    # maps this to a 2-element list containing variable- and
+    # subst-string.
+
+    variable  splitdata
+    array set splitdata {}
+
+}
+
+# htmlparse::parse --
+#
+#	This command is the basic parser for HTML. It takes a HTML
+#	string, parses it and invokes a command prefix for every tag
+#	encountered. It is not necessary for the HTML to be valid for
+#	this parser to function. It is the responsibility of the
+#	command invoked for every tag to check this. Another
+#	responsibility of the invoked command is the handling of tag
+#	attributes and character entities (escaped characters). The
+#	parser provides the un-interpreted tag attributes to the
+#	invoked command to aid in the former, and the package at large
+#	provides a helper command, '::htmlparse::mapEscapes', to aid
+#	in the handling of the latter. The parser *does* ignore
+#	leading DOCTYPE declarations and all valid HTML comments it
+#	encounters.
+#
+#	All information beyond the HTML string itself is specified via
+#	options, these are explained below.
+#
+#	To help understanding the options some more background
+#	information about the parser.
+#
+#	It is capable to detect incomplete tags in the HTML string
+#	given to it. Under normal circumstances this will cause the
+#	parser to throw an error, but if the option '-incvar' is used
+#	to specify a global (or namespace) variable the parser will
+#	store the incomplete part of the input into this variable
+#	instead. This will aid greatly in the handling of
+#	incrementally arriving HTML as the parser will handle whatever
+#	he can and defer the handling of the incomplete part until
+#	more data has arrived.
+#
+#	Another feature of the parser are its two possible modes of
+#	operation. The normal mode is activated if the option '-queue'
+#	is not present on the command line invoking the parser. If it
+#	is present the parser will go into the incremental mode instead.
+#
+#	The main difference is that a parser in normal mode will
+#	immediately invoke the command prefix for each tag it
+#	encounters. In incremental mode however the parser will
+#	generate a number of scripts which invoke the command prefix
+#	for groups of tags in the HTML string and then store these
+#	scripts in the specified queue. It is then the responsibility
+#	of the caller of the parser to ensure the execution of the
+#	scripts in the queue.
+#
+#	Note: The queue objecct given to the parser has to provide the
+#	same interface as the queue defined in tcllib -> struct. This
+#	does for example mean that all queues created via that part of
+#	tcllib can be immediately used here. Still, the queue doesn't
+#	have to come from tcllib -> struct as long as the same
+#	interface is provided.
+#
+#	In both modes the parser will return an empty string to the
+#	caller.
+#
+#	To a parser in incremental mode the option '-split' can be
+#	given and will specify the size of the groups he creates. In
+#	other words, -split 5 means that each of the generated scripts
+#	will invoke the command prefix for 5 consecutive tags in the
+#	HTML string. A parser in normal mode will ignore this option
+#	and its value.
+#
+#	The option '-vroot' specifies a virtual root tag. A parser in
+#	normal mode will invoke the command prefix for it immediately
+#	before and after he processes the tags in the HTML, thus
+#	simulating that the HTML string is enclosed in a <vroot>
+#	</vroot> combination. In incremental mode however the parser
+#	is unable to provide the closing virtual root as he never
+#	knows when the input is complete. In this case the first
+#	script generated by each invocation of the parser will contain
+#	an invocation of the command prefix for the virtual root as
+#	its first command.
+#
+#	Interface to the command prefix:
+#
+#	In normal mode the parser will invoke the command prefix with
+#	for arguments appended. See '::htmlparse::debugCallback' for a
+#	description. In incremental mode however the generated scripts
+#	will invoke the command prefix with five arguments
+#	appended. The last four of these are the same which were
+#	mentioned above. The first however is a placeholder string
+#	(\win\) for a clientdata value to be supplied later during the
+#	actual execution of the generated scripts. This could be a tk
+#	window path, for example. This allows the user of this package
+#	to preprocess HTML strings without commiting them to a
+#	specific window, object, whatever during parsing. This
+#	connection can be made later. This also means that it is
+#	possible to cache preprocessed HTML. Of course, nothing
+#	prevents the user of the parser to replace the placeholder
+#	with an empty string.
+#
+# Arguments:
+#	args	An option/value-list followed by the string to
+#		parse. Available options are:
+#
+#		-cmd	The command prefix to invoke for every tag in
+#			the HTML string. Defaults to
+#			'::htmlparse::debugCallback'.
+#
+#		-vroot	The virtual root tag to add around the HTML in
+#			normal mode. In incremental mode it is the
+#			first tag in each chunk processed by the
+#			parser, but there will be no closing tags.
+#			Defaults to 'hmstart'.
+#
+#		-split	The size of the groups produced by an
+#			incremental mode parser. Ignored when in
+#			normal mode. Defaults to 10. Values <= 0 are
+#			not allowed.
+#
+#		-incvar	The name of the variable where to store any
+#			incomplete HTML into. Optional.
+#
+#		-queue
+#			The handle/name of the queue objecct to store
+#			the generated scripts into. Activates
+#			incremental mode. Normal mode is used if this
+#			option is not present.
+#
+#		After the options the command expects a single argument
+#		containing the HTML string to parse.
+#
+# Side Effects:
+#	In normal mode as of the invoked command. Else none.
+#
+# Results:
+#	None.
+
+proc ::htmlparse::parse {args} {
+    # Convert the HTML string into a evaluable command sequence.
+
+    variable splitdata
+
+    # Option processing, start with the defaults, then run through the
+    # list of arguments.
+
+    set cmd    ::htmlparse::debugCallback
+    set vroot  hmstart
+    set incvar ""
+    set split  10
+    set queue  ""
+
+    while {[set err [cmdline::getopt args {cmd.arg vroot.arg incvar.arg split.arg queue.arg} opt arg]]} {
+	if {$err < 0} {
+	    return -code error "::htmlparse::parse : $arg"
+	}
+	switch -exact -- $opt {
+	    cmd    -
+	    vroot  -
+	    incvar -
+	    queue  {
+		if {[string length $arg] == 0} {
+		    return -code error "::htmlparse::parse : -$opt illegal argument (empty)"
+		}
+		# Each option has an variable with the same name associated with it.
+		# FRINK: nocheck
+		set $opt $arg
+	    }
+	    split  {
+		if {$arg <= 0} {
+		    return -code error "::htmlparse::parse : -split illegal argument (<= 0)"
+		}
+		set split $arg
+	    }
+	    default {
+		# Cannot happen
+	    }
+	}
+    }
+
+    if {[llength $args] > 1} {
+	return -code error "::htmlparse::parse : to many arguments behind the options, expected one"
+    }
+    if {[llength $args] < 1} {
+	return -code error "::htmlparse::parse : html string missing"
+    }
+
+    set html [PrepareHtml [lindex $args 0]]
+
+    # Look for incomplete HTML from the last iteration and prepend it
+    # to the input we just got.
+
+    if {$incvar != {}} {
+	upvar $incvar incomplete
+    } else {
+	set incomplete ""
+    }
+
+    if {[catch {set new $incomplete$html}]} {set new $html}
+    set html $new
+
+    # Handle incomplete HTML (Recognize incomplete tag at end, buffer
+    # it up for the next call).
+
+    set end [lindex \{$html\} end]
+    if {[set idx [string last < $end]] > [string last > $end]} {
+
+	if {$incvar == {}} {
+	    return -code error "::htmlparse::parse : HTML is incomplete, option -incvar is missing"
+	}
+
+	#  upvar $incvar incomplete -- Already done, s.a.
+	set incomplete [string range $end $idx end]
+	incr idx -1
+	set html       [string range $end 0 $idx]
+	
+    } else {
+	set incomplete ""
+    }
+
+    # Convert the HTML string into a script. First look for tag
+    # patterns and convert them into command invokations. The command
+    # is actually a placeholder ((LF) NUL SOH @ NUL). See step 2 for
+    # the explanation.
+
+    regsub -all -- {<([^\s>]+)\s*([^>]*)/>} $html {<\1 \2></\1>} html
+
+    #set sub "\}\n\0\1@\0 {\\1} {} {\\2} \{\}\n\0\1@\0 {\\1} {/} {} \{"
+    #regsub -all -- {<([^\s>]+)\s*([^>]*)/>} $html $sub html
+
+    set sub "\}\n\0\1@\0 {\\2} {\\1} {\\3} \{"
+    regsub -all -- {<(/?)([^\s>]+)\s*([^>]*)>} $html $sub html
+
+    # Step 2, replace the command placeholder with the command
+    # itself. This way any characters in the command prefix which are
+    # special to regsub are kept from the regsub.
+
+    set html [string map [list \n\0\1@\0 \n$cmd] $html]
+
+    # The value of queue now determines wether we process the HTML by
+    # ourselves (queue is empty) or if we generate a list of  scripts
+    # each of which processes n tags, n the argument to -split.
+
+    if {$queue == {}} {
+	# And evaluate it. This is the main parsing step.
+
+	eval "$cmd {$vroot} {} {} \{$html\}"
+	eval "$cmd {$vroot} /  {} {}"
+    } else {
+	# queue defined, generate list of scripts doing small chunks of tags.
+
+	set lcmd [llength $cmd]
+	set key  $split,$lcmd
+
+	if {![info exists splitdata($key)]} {
+	    for {set i 0; set group {}} {$i < $split} {incr i} {
+		# Use the length of the command prefix to generate
+		# additional variables before the main variable after
+		# which the placeholder will be inserted.
+
+		for {set j 1} {$j < $lcmd} {incr j} {
+		    append group "b${j}_$i "
+		}
+
+		append group "a$i c$i d$i e$i f$i\n"
+	    }
+	    regsub -all -- {(a[0-9]+)}          $group    {{$\1} @win@} subgroup
+	    regsub -all -- {([b-z_0-9]+[0-9]+)} $subgroup {{$\1}}       subgroup
+
+	    set splitdata($key) [list $group $subgroup]
+	}
+
+	foreach {group subgroup} $splitdata($key) break ; # lassign
+	foreach $group "$cmd {$vroot} {} {} \{$html\}" {
+	    $queue put [string trimright [subst $subgroup]]
+	}
+    }
+    return
+}
+
+# htmlparse::PrepareHtml --
+#
+#	Internal helper command of '::htmlparse::parse'. Removes
+#	leading DOCTYPE declarations and comments, protects the
+#	special characters of tcl from evaluation.
+#
+# Arguments:
+#	html	The HTML string to prepare
+#
+# Side Effects:
+#	None.
+#
+# Results:
+#	The provided HTML string with the described modifications
+#	applied to it.
+
+proc ::htmlparse::PrepareHtml {html} {
+    # Remove the following items from the text:
+    # - A leading	<!DOCTYPE...> declaration.
+    # - All comments	<!-- ... -->
+    #
+    # Also normalize the line endings (\r -> \n).
+
+    # Tcllib SF Bug 861287 - Processing of comments.
+    # Recognize EOC by RE, instead of fixed string.
+
+    set html [string map [list \r \n] $html]
+
+    regsub -- "^.*<!DOCTYPE\[^>\]*>"    $html {}     html
+    regsub -all -- "--(\[ \t\n\]*)>"      $html "\001\\1\002" html
+
+    # Recognize borken beginnings of a comment and convert them to PCDATA.
+    regsub -all -- "<--(\[^\001\]*)\001(\[^\002\]*)\002" $html {\&lt;--\1--\2\&gt;} html
+
+    # And now recognize true comments, remove them.
+    regsub -all -- "<!--\[^\001\]*\001(\[^\002\]*)\002"  $html {}                   html
+
+    # Protect characters special to tcl (braces, slashes) by
+    # converting them to their escape sequences.
+
+    return [string map [list \
+		    "\{" "&#123;" \
+		    "\}" "&#125;" \
+		    "\\" "&#92;"] $html]
+}
+
+
+
+# htmlparse::debugCallback --
+#
+#	The standard callback used by the parser in
+#	'::htmlparse::parse' if none was specified by the user. Simply
+#	dumps its arguments to stdout.  This callback can be used for
+#	both normal and incremental mode of the calling parser. In
+#	other words, it accepts four or five arguments. The last four
+#	arguments are described below. The optional fifth argument
+#	contains the clientdata value given to the callback by a
+#	parser in incremental mode. All callbacks have to follow the
+#	signature of this command in the last four arguments, and
+#	callbacks used in incremental parsing have to follow this
+#	signature in the last five arguments.
+#
+# Arguments:
+#	tag			The name of the tag currently
+#				processed by the parser.
+#
+#	slash			Either empty or a slash. Allows us to
+#				distinguish between opening (slash is
+#				empty) and closing tags (slash is
+#				equal to a '/').
+#
+#	param			The un-interpreted list of parameters
+#				to the tag.
+#
+#	textBehindTheTag	The text found by the parser behind
+#				the tag named in 'tag'.
+#
+# Side Effects:
+#	None.
+#
+# Results:
+#	None.
+
+proc ::htmlparse::debugCallback {args} {
+    # args = ?clientData? tag slash param textBehindTheTag
+    puts "==> $args"
+    return
+}
+
+# htmlparse::mapEscapes --
+#
+#	Takes a HTML string, substitutes all escape sequences with
+#	their actual characters and returns the resulting string.
+#	HTML not containing escape sequences or invalid escape
+#	sequences is returned unchanged.
+#
+# Arguments:
+#	html	The string to modify
+#
+# Side Effects:
+#	None.
+#
+# Results:
+#	The argument string with all escape sequences replaced with
+#	their actual characters.
+
+proc ::htmlparse::mapEscapes {html} {
+    # Find HTML escape characters of the form &xxx(;|EOW)
+
+    # Quote special Tcl chars so they pass through [subst] unharmed.
+    set new [string map [list \] \\\] \[ \\\[ \$ \\\$ \\ \\\\] $html]
+    regsub -all -- {&([[:alnum:]]{2,31})(;|\M)} $new {[DoNamedMap \1 {\2}]} new
+    regsub -all -- {&#([[:digit:]]{1,5})(;|\M)} $new {[DoDecMap \1 {\2}]} new
+    regsub -all -- {&#x([[:xdigit:]]{1,4})(;|\M)} $new {[DoHexMap \1 {\2}]} new
+    return [subst $new]
+}
+
+proc ::htmlparse::DoNamedMap {name endOf} {
+    variable namedEntities
+    if {[info exist namedEntities($name)]} {
+	return $namedEntities($name)
+    } else {
+	# Put it back..
+	return "&$name$endOf"
+    }
+}
+
+proc ::htmlparse::DoDecMap {dec endOf} {
+    scan $dec %d dec
+    if {$dec <= 0xFFFD} {
+	return [format %c $dec]
+    } else {
+	# Put it back..
+	return "&#$dec$endOf"
+    }
+}
+
+proc ::htmlparse::DoHexMap {hex endOf} {
+    scan $hex %x value
+    if {$value <= 0xFFFD} {
+	return [format %c $value]
+    } else {
+	# Put it back..
+	return "&#x$hex$endOf"
+    }
+}
+
+# htmlparse::2tree --
+#
+#	This command is a wrapper around '::htmlparse::parse' which
+#	takes a HTML string and converts it into a tree containing the
+#	logical structure of the parsed document. The tree object has
+#	to be created by the caller. It is also expected that the tree
+#	object provides the same interface as the tree object from
+#	tcllib -> struct. It doesn't have to come from that module
+#	though. The internal callback does some basic checking of HTML
+#	validity and tries to recover from the most basic errors.
+#
+# Arguments:
+#	html	The HTML string to parse and convert.
+#	tree	The name of the tree to fill.
+#
+# Side Effects:
+#	Creates a tree object (see tcllib -> struct)
+#	and modifies it.
+#
+# Results:
+#	The contents of 'tree'.
+
+proc ::htmlparse::2tree {html tree} {
+
+    # One internal datastructure is required, a stack of open
+    # tags. This stack is also provided by the 'struct' module of
+    # tcllib. As the operation of this command is synchronuous we
+    # don't have to take care against multiple running copies at the
+    # same times (Such are possible, but will be in different
+    # interpreters and true concurrency is possible only if they are
+    # in different threads too). IOW, no need for tricks to make the
+    # internal datastructure unique.
+
+    catch {::htmlparse::tags destroy}
+
+    ::struct::stack ::htmlparse::tags
+    ::htmlparse::tags push root
+    $tree set root type root
+
+    parse -cmd [list ::htmlparse::2treeCallback $tree] $html
+
+    # A bit hackish, correct the ordering of nodes for the optional
+    # tag types, over a larger area when was seen by the parser itself.
+
+    $tree walk root -order post n {
+	::htmlparse::Reorder $tree $n
+    }
+
+    ::htmlparse::tags destroy
+    return $tree
+}
+
+# htmlparse::2treeCallback --
+#
+#	Internal helper command. A special callback to
+#	'::htmlparse::parse' used by '::htmlparse::2tree' which takes
+#	the incoming stream of tags and converts them into a tree
+#	representing the inner structure of the parsed HTML
+#	document. Recovers from simple HTML errors like missing
+#	opening tags, missing closing tags and overlapping tags.
+#
+# Arguments:
+#	tree			The name of the tree to manipulate.
+#	tag			See '::htmlparse::debugCallback'.
+#	slash			See '::htmlparse::debugCallback'.
+#	param			See '::htmlparse::debugCallback'.
+#	textBehindTheTag	See '::htmlparse::debugCallback'.
+#
+# Side Effects:
+#	Manipulates the tree object whose name was given as the first
+#	argument.
+#
+# Results:
+#	None.
+
+proc ::htmlparse::2treeCallback {tree tag slash param textBehindTheTag} {
+    # This could be table-driven I think but for now the switches
+    # should work fine.
+
+    # Normalize tag information for later comparisons. Also remove
+    # superfluous whitespace. Don't forget to decode the standard
+    # entities.
+
+    set  tag  [string tolower $tag]
+    set  textBehindTheTag [string trim $textBehindTheTag]
+    if {$textBehindTheTag != {}} {
+	set text [mapEscapes $textBehindTheTag]
+    }
+
+    if {"$slash" == "/"} {
+	# Handle closing tags. Standard operation is to pop the tag
+	# from the stack of open tags. We don't do this for </p> and
+	# </li>. As they were optional they were never pushed onto the
+	# stack (Well, actually they are just popped immediately after
+	# they were pusheed, see below).
+
+	switch -exact -- $tag {
+	    base - option - meta - li - p {
+		# Ignore, nothing to do.		
+	    }
+	    default {
+		# The moment we get a closing tag which does not match
+		# the tag on the stack we have two possibilities on how
+		# this came into existence to choose from:
+		#
+		# a) A tag is now closed but was never opened.
+		# b) A tag requiring an end tag was opened but the end
+		#    tag was omitted and we now are at a tag which was
+		#    opened before the one with the omitted end tag.
+
+		# NOTE:
+		# Pages delivered from the amazon.uk site contain both
+		# cases: </a> without opening, <b> & <font> without
+		# closing. Another error: <a><b></a></b>, i.e. overlapping
+		# tags. Fortunately this can be handled by the algorithm
+		# below, in two cycles, one of which is case (b), followed
+		# by case (a). It seems as if Amazon/UK believes that visual
+		# markup like <b> and <font> is an option (switch-on) instead
+		# of a region.
+
+		# Algorithm used here to deal with these:
+		# 1) Search whole stack for the matching opening tag.
+		#    If there is one assume case (b) and pop everything
+		#    until and including this opening tag.
+		# 2) If no matching opening tag was found assume case
+		#    (a) and ignore the tag.
+		#
+		# Part (1) also subsumes the normal case, i.e. the
+		# matching tag is at the top of the stack.
+
+		set nodes [::htmlparse::tags peek [::htmlparse::tags size]]
+		# Note: First item is top of stack, last item is bottom of stack !
+		# (This behaviour of tcllib stacks is not documented
+		# -> we should update the manpage).
+
+		#foreach n $nodes {lappend tstring [p get $n -key type]}
+		#puts stderr --[join $tstring]--
+
+		set level 1
+		set found 0
+		foreach n $nodes {
+		    set type [$tree get $n type]
+		    if {0 == [string compare $tag $type]} {
+			# Found an earlier open tag -> (b).
+			set found 1
+			break
+		    }
+		    incr level
+		}
+		if {$found} {
+		    ::htmlparse::tags pop $level
+		    if {$level > 1} {
+			#foreach n $nodes {lappend tstring [$tree get $n type]}
+			#puts stderr "\tdesync at <$tag> ($tstring) => pop $level"
+		    }
+		} else {
+		    #foreach n $nodes {lappend tstring [$tree get $n type]}
+		    #puts stderr "\tdesync at <$tag> ($tstring) => ignore"
+		}
+	    }
+	}
+
+	# If there is text behind a closing tag X it belongs to the
+	# parent tag of X.
+
+	if {$textBehindTheTag != {}} {
+	    # Attach the text behind the closing tag to the reopened
+	    # context.
+
+	    set        pcd  [$tree insert [::htmlparse::tags peek] end]
+	    $tree set $pcd  type PCDATA
+	    $tree set $pcd  data $textBehindTheTag
+	}
+
+    } else {
+	# Handle opening tags. The standard operation for most is to
+	# push them onto the stack and thus open a nested context.
+	# This does not happen for both the optional tags (p, li) and
+	# the ones which don't have closing tags (meta, br, option,
+	# input, area, img).
+	#
+	# The text coming with the tag will be added after the tag if
+	# it is a tag without a matching close, else it will be added
+	# as a node below the tag (as it is the region between the
+	# opening and closing tag and thus nested inside). Empty text
+	# is ignored under all circcumstances.
+
+	set        node [$tree insert [::htmlparse::tags peek] end]
+	$tree set $node type $tag
+	$tree set $node data $param
+
+	if {$textBehindTheTag != {}} {
+	    switch -exact -- $tag {
+		input -	area - img - br {
+		    set pcd  [$tree insert [::htmlparse::tags peek] end]
+		}
+		default {
+		    set pcd  [$tree insert $node end]
+		}
+	    }
+	    $tree set $pcd type PCDATA
+	    $tree set $pcd data $textBehindTheTag
+	}
+
+	::htmlparse::tags push $node
+
+	# Special handling: <p>, <li> may have no closing tag => pop
+	#                 : them immediately.
+	#
+	# Special handling: <meta>, <br>, <option>, <input>, <area>,
+	#                 : <img>: no closing tags for these.
+
+	switch -exact -- $tag {
+	    hr - base - meta - li - br - option - input - area - img - p - h1 - h2 - h3 - h4 - h5 - h6 {
+		::htmlparse::tags pop
+	    }
+	    default {}
+	}
+    }
+}
+
+# htmlparse::removeVisualFluff --
+#
+#	This command walks a tree as generated by '::htmlparse::2tree'
+#	and removes all the nodes which represent visual tags and not
+#	structural ones. The purpose of the command is to make the
+#	tree easier to navigate without getting bogged down in visual
+#	information not relevant to the search.
+#
+# Arguments:
+#	tree	The name of the tree to cut down.
+#
+# Side Effects:
+#	Modifies the specified tree.
+#
+# Results:
+#	None.
+
+proc ::htmlparse::removeVisualFluff {tree} {
+    $tree walk root -order post n {
+	::htmlparse::RemoveVisualFluff $tree $n
+    }
+    return
+}
+
+# htmlparse::removeFormDefs --
+#
+#	Like '::htmlparse::removeVisualFluff' this command is here to
+#	cut down on the size of the tree as generated by
+#	'::htmlparse::2tree'. It removes all nodes representing forms
+#	and form elements.
+#
+# Arguments:
+#	tree	The name of the tree to cut down.
+#
+# Side Effects:
+#	Modifies the specified tree.
+#
+# Results:
+#	None.
+
+proc ::htmlparse::removeFormDefs {tree} {
+    $tree walk root -order post n {
+	::htmlparse::RemoveFormDefs $tree $n
+    }
+    return
+}
+
+# htmlparse::RemoveVisualFluff --
+#
+#	Internal helper command to
+#	'::htmlparse::removeVisualFluff'. Does the actual work.
+#
+# Arguments:
+#	tree	The name of the tree currently processed
+#	node	The name of the node to look at.
+#
+# Side Effects:
+#	Modifies the specified tree.
+#
+# Results:
+#	None.
+
+proc ::htmlparse::RemoveVisualFluff {tree node} {
+    switch -exact -- [$tree get $node type] {
+	hmstart - html - font - center - div - sup - b - i {
+	    # Removes the node, but does not affect the nodes below
+	    # it. These are just made into chiildren of the parent of
+	    # this node, in its place.
+
+	    $tree cut $node
+	}
+	script - option - select - meta - map - img {
+	    # Removes this node and everything below it.
+	    $tree delete $node
+	}
+	default {
+	    # Ignore tag
+	}
+    }
+}
+
+# htmlparse::RemoveFormDefs --
+#
+#	Internal helper command to
+#	'::htmlparse::removeFormDefs'. Does the actual work.
+#
+# Arguments:
+#	tree	The name of the tree currently processed
+#	node	The name of the node to look at.
+#
+# Side Effects:
+#	Modifies the specified tree.
+#
+# Results:
+#	None.
+
+proc ::htmlparse::RemoveFormDefs {tree node} {
+    switch -exact -- [$tree get $node type] {
+	form {
+	    $tree delete $node
+	}
+	default {
+	    # Ignore tag
+	}
+    }
+}
+
+# htmlparse::Reorder --
+
+#	Internal helper command to '::htmlparse::2tree'. Moves the
+#	nodes between p/p, li/li and h<i> sequences below the
+#	paragraphs and items. IOW, corrects misconstructions for
+#	the optional node types.
+#
+# Arguments:
+#	tree	The name of the tree currently processed
+#	node	The name of the node to look at.
+#
+# Side Effects:
+#	Modifies the specified tree.
+#
+# Results:
+#	None.
+
+proc ::htmlparse::Reorder {tree node} {
+    switch -exact -- [set tp [$tree get $node type]] {
+	h1 - h2 - h3 - h4 - h5 - h6 - p - li {
+	    # Look for right siblings until the next node with a
+	    # similar type (or end of level) and move these below this
+	    # node.
+
+	    while {1} {
+		set sibling [$tree next $node]
+		if {
+		    ($sibling == {}) ||
+		    ([lsearch -exact {h1 h2 h3 h4 h5 h6 p li} [$tree get $sibling type]] != -1)
+		} {
+		    break
+		}
+		$tree move $node end $sibling
+	    }
+	}
+	default {
+	    # Ignore tag
+	}
+    }
+}
+
+# ### ######### ###########################
+
+package provide htmlparse 1.2.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/htmlparse/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/htmlparse/pkgIndex.tcl
new file mode 100644
index 00000000..e5993b15
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/htmlparse/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded htmlparse 1.2.2 [list source [file join $dir htmlparse.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/http/autoproxy.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/http/autoproxy.tcl
new file mode 100644
index 00000000..8ebaef75
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/http/autoproxy.tcl
@@ -0,0 +1,588 @@
+# autoproxy.tcl - Copyright (C) 2002-2008, 2017 Pat Thoyts <patthoyts@users.sf.net>
+#
+# On Unix the standard for identifying the local HTTP proxy server
+# seems to be to use the environment variable http_proxy or ftp_proxy and
+# no_proxy to list those domains to be excluded from proxying.
+#
+# On Windows we can retrieve the Internet Settings values from the registry
+# to obtain pretty much the same information.
+#
+# With this information we can setup a suitable filter procedure for the
+# Tcl http package and arrange for automatic use of the proxy.
+#
+# Example:
+#   package require autoproxy
+#   autoproxy::init
+#   set tok [http::geturl http://wiki.tcl.tk/]
+#   http::data $tok
+#
+# To support https add:
+#   package require tls
+#   http::register https 443 ::autoproxy::tls_socket
+
+package require Tcl 8.5 ;# ni/in operators
+package require http;                   # tcl
+package require uri;                    # tcllib
+package require base64;                 # tcllib
+
+namespace eval ::autoproxy {
+    variable options
+
+    if {! [info exists options]} {
+        array set options {
+            proxy_host ""
+            proxy_port 80
+            no_proxy   {}
+            basic      {}
+            authProc   {}
+            tls_package tls
+        }
+    }
+
+    variable uid
+    if {![info exists uid]} { set uid 0 }
+
+    variable winregkey
+    set winregkey [join {
+        HKEY_CURRENT_USER
+        Software Microsoft Windows
+        CurrentVersion "Internet Settings"
+    } \\]
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Obtain configuration options for the server.
+#
+proc ::autoproxy::cget {option} {
+    variable options
+    switch -glob -- $option {
+        -host -
+        -proxy_h* { set options(proxy_host) }
+        -port -
+        -proxy_p* { set options(proxy_port) }
+        -no*      { set options(no_proxy) }
+        -basic    { set options(basic) }
+        -authProc { set options(authProc) }
+        -tls_package { set options(tls_package) }
+        default {
+            set err [join [lsort [array names options]] ", -"]
+            return -code error "bad option \"$option\":\
+                       must be one of -$err"
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Configure the autoproxy package settings.
+#  You may only configure one type of authorisation at a time as once we hit
+#  -basic, -digest or -ntlm - all further args are passed to the protocol
+#  specific script.
+#
+#  Of course, most of the point of this package is to fill as many of these
+#  fields as possible automatically. You should call autoproxy::init to
+#  do automatic configuration and then call this method to refine the details.
+#
+proc ::autoproxy::configure {args} {
+    variable options
+
+    if {[llength $args] == 0} {
+        foreach {opt value} [array get options] {
+            lappend r -$opt $value
+        }
+        return $r
+    }
+
+    while {[string match "-*" [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -host -
+            -proxy_h* { set options(proxy_host) [Pop args 1]}
+            -port -
+            -proxy_p* { set options(proxy_port) [Pop args 1]}
+            -no*      { set options(no_proxy) [Pop args 1] }
+            -basic    { Pop args; configure:basic $args ; break }
+            -authProc { set options(authProc) [Pop args 1] }
+            -tls_package {
+                set tls_package [Pop args 1]
+                if {$tls_package ni {tls twapi}} {
+                    error "Invalid TLS package option '$tls_package'. Must be 'tls' or 'twapi'"
+                }
+                set options(tls_package) $tls_package
+            }
+            --        { Pop args; break }
+            default {
+                set opts [join [lsort [array names options]] ", -"]
+                return -code error "bad option \"$option\":\
+                       must be one of -$opts"
+            }
+        }
+        Pop args
+    }
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Initialise the http proxy information from the environment or the
+#  registry (Win32)
+#
+#  This procedure will load the http package and re-writes the
+#  http::geturl method to add in the authorisation header.
+#
+#  A better solution will be to arrange for the http package to request the
+#  authorisation key on receiving an authorisation reqest.
+#
+proc ::autoproxy::init {{httpproxy {}} {no_proxy {}}} {
+    global tcl_platform
+    global env
+    variable winregkey
+    variable options
+
+    # Look for standard environment variables.
+    if {[string length $httpproxy] > 0} {
+
+        # nothing to do
+
+    } elseif {[info exists env(http_proxy)]} {
+        set httpproxy $env(http_proxy)
+        if {[info exists env(no_proxy)]} {
+            set no_proxy $env(no_proxy)
+        }
+    } else {
+        if {$tcl_platform(platform) == "windows"} {
+            #checker -scope block exclude nonPortCmd
+            package require registry 1.0
+            array set reg {ProxyEnable 0 ProxyServer "" ProxyOverride {}}
+            catch {
+                # IE5 changed ProxyEnable from a binary to a dword value.
+                switch -exact -- [registry type $winregkey "ProxyEnable"] {
+                    dword {
+                        set reg(ProxyEnable) [registry get $winregkey "ProxyEnable"]
+                    }
+                    binary {
+                        set v [registry get $winregkey "ProxyEnable"]
+                        binary scan $v i reg(ProxyEnable)
+                    }
+                    default {
+                        return -code error "unexpected type found for\
+                               ProxyEnable registry item"
+                    }
+                }
+                set reg(ProxyServer) [GetWin32Proxy http]
+                set reg(ProxyOverride) [registry get $winregkey "ProxyOverride"]
+            }
+            if {![string is bool $reg(ProxyEnable)]} {
+                set reg(ProxyEnable) 0
+            }
+            if {$reg(ProxyEnable)} {
+                set httpproxy $reg(ProxyServer)
+                set no_proxy  $reg(ProxyOverride)
+            }
+        }
+    }
+
+    # If we found something ...
+    if {[string length $httpproxy] > 0} {
+        # The http_proxy is supposed to be a URL - lets make sure.
+        if {![regexp {\w://.*} $httpproxy]} {
+            set httpproxy "http://$httpproxy"
+        }
+
+        # decompose the string.
+        array set proxy [uri::split $httpproxy]
+
+        # turn the no_proxy value into a tcl list
+        set no_proxy [string map {; " " , " "} $no_proxy]
+
+        # configure ourselves
+        configure -proxy_host $proxy(host) \
+            -proxy_port $proxy(port) \
+            -no_proxy $no_proxy
+
+        # Lift the authentication details from the environment if present.
+        if {[string length $proxy(user)] < 1 \
+                && [info exists env(http_proxy_user)] \
+                && [info exists env(http_proxy_pass)]} {
+            set proxy(user) $env(http_proxy_user)
+            set proxy(pwd)  $env(http_proxy_pass)
+        }
+
+        # Maybe the proxy url has authentication parameters?
+        # At this time, only Basic is supported.
+        if {[string length $proxy(user)] > 0} {
+            configure -basic -username $proxy(user) -password $proxy(pwd)
+        }
+
+        # setup and configure the http package to use our proxy info.
+        http::config -proxyfilter [namespace origin filter]
+    }
+    return $httpproxy
+}
+
+# autoproxy::GetWin32Proxy --
+#
+#	Parse the Windows Internet Settings registry key and return the
+#	protocol proxy requested. If the same proxy is in use for all
+#	protocols, then that will be returned. Otherwise the string is
+#	parsed. Example:
+#	 ftp=proxy:80;http=proxy:80;https=proxy:80
+#
+proc ::autoproxy::GetWin32Proxy {protocol} {
+    variable winregkey
+    #checker exclude nonPortCmd
+    set proxies [split [registry get $winregkey "ProxyServer"] ";"]
+    foreach proxy $proxies {
+        if {[string first = $proxy] == -1} {
+            return $proxy
+        } else {
+            foreach {prot host} [split $proxy =] break
+            if {[string compare $protocol $prot] == 0} {
+                return $host
+            }
+        }
+    }
+    return -code error "failed to identify an '$protocol' proxy"
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+proc ::autoproxy::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# Description
+#   An example user authentication procedure.
+# Returns:
+#   A two element list consisting of the users authentication id and
+#   password.
+proc ::autoproxy::defAuthProc {{user {}} {passwd {}} {realm {}}} {
+    if {[string length $realm] > 0} {
+        set title "Realm: $realm"
+    } else {
+        set title {}
+    }
+
+    # If you are using BWidgets then the following will do:
+    #
+    #    package require BWidget
+    #    return [PasswdDlg .defAuthDlg -parent {} -transient 0 \
+    #         -title $title -logintext $user -passwdtext $passwd]
+    #
+    # if you just have Tk and no BWidgets --
+
+    set dlg [toplevel .autoproxy_defAuthProc -class Dialog]
+    wm title $dlg $title
+    wm withdraw $dlg
+    label $dlg.ll -text Login -underline 0 -anchor w
+    entry $dlg.le -textvariable [namespace current]::${dlg}:l
+    label $dlg.pl -text Password -underline 0 -anchor w
+    entry $dlg.pe -show * -textvariable [namespace current]::${dlg}:p
+    button $dlg.ok -text OK -default active -width -11 \
+        -command [list set [namespace current]::${dlg}:ok 1]
+    grid $dlg.ll $dlg.le -sticky news
+    grid $dlg.pl $dlg.pe -sticky news
+    grid $dlg.ok - -sticky e
+    grid columnconfigure $dlg 1 -weight 1
+    bind $dlg <Return> [list $dlg.ok invoke]
+    bind $dlg <Alt-l> [list focus $dlg.le]
+    bind $dlg <Alt-p> [list focus $dlg.pe]
+    variable ${dlg}:l $user; variable ${dlg}:p $passwd
+    variable ${dlg}:ok 0
+    wm deiconify $dlg; focus $dlg.pe; update idletasks
+    set old [::grab current]; grab $dlg
+    tkwait variable [namespace current]::${dlg}:ok
+    grab release $dlg ; if {[llength $old] > 0} {::grab $old}
+    set r [list [set ${dlg}:l] [set ${dlg}:p]]
+    unset ${dlg}:l; unset ${dlg}:p; unset ${dlg}:ok
+    destroy $dlg
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Implement support for the Basic authentication scheme (RFC 1945,2617).
+# Options:
+#  -user userid  - pass in the user ID (May require Windows NT domain
+#                  as DOMAIN\\username)
+#  -password pwd - pass in the user's password.
+#  -realm realm  - pass in the http realm.
+#
+proc ::autoproxy::configure:basic {arglist} {
+    variable options
+    array set opts {user {} passwd {} realm {}}
+    foreach {opt value} $arglist {
+        switch -glob -- $opt {
+            -u* { set opts(user) $value}
+            -p* { set opts(passwd) $value}
+            -r* { set opts(realm) $value}
+            --  { break }
+            default {
+                return -code error "invalid option \"$opt\": must be one of\
+                     -username or -password or -realm"
+            }
+        }
+    }
+
+    # If nothing was provided, try calling the authProc
+    if {$options(authProc) != {} \
+            && ($opts(user) == {} || $opts(passwd) == {})} {
+        set r [$options(authProc) $opts(user) $opts(passwd) $opts(realm)]
+        set opts(user) [lindex $r 0]
+        set opts(passwd) [lindex $r 1]
+    }
+
+    if {$opts(user) eq ""} {
+        set options(basic) ""
+    } else {
+        # Store the encoded string to avoid re-encoding all the time.
+        set options(basic) [list "Proxy-Authorization" \
+                                [concat "Basic" \
+                                     [base64::encode $opts(user):$opts(passwd)]]]
+    }
+    return
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  An http package proxy filter. This attempts to work out if a request
+#  should go via the configured proxy using a glob comparison against the
+#  no_proxy list items. A typical no_proxy list might be
+#   [list localhost *.my.domain.com 127.0.0.1]
+#
+#  If we are going to use the proxy - then insert the proxy authorization
+#  header.
+#
+proc ::autoproxy::filter {host} {
+    variable options
+
+    if {$options(proxy_host) == {}} {
+        return {}
+    }
+
+    foreach domain $options(no_proxy) {
+        if {[string match $domain $host]} {
+            return {}
+        }
+    }
+
+    # Add authorisation header to the request (by Anders Ramdahl)
+    catch {
+        upvar state State
+        if {$options(basic) != {}} {
+            set State(-headers) [concat $options(basic) $State(-headers)]
+        }
+    }
+    return [list $options(proxy_host) $options(proxy_port)]
+}
+
+# -------------------------------------------------------------------------
+# autoproxy::tls_connect --
+#
+#	Create a connection to a remote machine through a proxy
+#	if necessary. This is used by the tls_socket command for
+#	use with the http package but can also be used more generally
+#	provided your proxy will permit CONNECT attempts to ports
+#	other than port 443 (many will not).
+#	This command defers to 'tunnel_connect' to link to the target
+#	host and then upgrades the link to SSL/TLS
+#
+proc ::autoproxy::tls_connect {args} {
+    variable options
+    set peersubject [lindex $args end-1]
+    if {[string length $options(proxy_host)] > 0} {
+        set s [eval [linsert $args 0 tunnel_connect]]
+        fconfigure $s -blocking 1 -buffering none -translation binary
+        if {[string equal "-async" [lindex $args end-2]]} {
+            if {$options(tls_package) eq "twapi"} {
+                set s [eval [linsert [lrange $args 0 end-3] 0 ::twapi::starttls $s -peersubject $peersubject]]
+            } else {
+                eval [linsert [lrange $args 0 end-3] 0 ::tls::import $s]
+            }
+        } else {
+            if {$options(tls_package) eq "twapi"} {
+                set s [eval [linsert [lrange $args 0 end-2] 0 ::twapi::starttls $s -peersubject $peersubject]]
+            } else {
+                eval [linsert [lrange $args 0 end-2] 0 ::tls::import $s]
+            }
+        }
+    } else {
+        if {$options(tls_package) eq "twapi"} {
+            set s [eval [linsert $args 0 ::twapi::tls_socket]]
+        } else {
+            set s [eval [linsert $args 0 ::tls::socket]]
+        }
+    }
+    return $s
+}
+
+# autoproxy::tunnel_connect --
+#
+#	Create a connection to a remote machine through a proxy
+#	if necessary. This is used by the tls_socket command for
+#	use with the http package but can also be used more generally
+#	provided your proxy will permit CONNECT attempts to ports
+#	other than port 443 (many will not).
+#	Note: this command just opens the socket through the proxy to
+#	the target machine -- no SSL/TLS negotiation is done yet.
+#
+proc ::autoproxy::tunnel_connect {args} {
+    variable options
+    variable uid
+    set code ok
+
+    # args = ... host port
+    # and the host/port is the actual endpoint we want to talk to,
+    # regardless of any proxying. See our caller tls_connect for
+    # ensuring this by peeking into the http package internals.
+
+    # To handle proxying properly we have to run through 'filter'
+    # (again), to ensure that proxy exceptions are correctly taken
+    # into account.
+
+    set proxy [filter [lindex $args end-1]]
+
+    if {[llength $proxy]} {
+        foreach {proxy_host proxy_port} $proxy break
+
+        set token [namespace current]::[incr uid]
+        upvar #0 $token state
+        set state(endpoint) [lrange $args end-1 end]
+        set state(state) connect
+        set state(data) ""
+        set state(useragent) [http::config -useragent]
+        set state(sock) [::socket $proxy_host $proxy_port]
+        fileevent $state(sock) writable [namespace code [list tunnel_write $token]]
+        vwait [set token](state)
+
+        if {[string length $state(error)] > 0} {
+            set result $state(error)
+            close $state(sock)
+            unset state
+            set code error
+        } elseif {[info exists state(code)] &&
+                  (($state(code) >= 300) ||
+                   ($state(code) < 200))} {
+            set result [lindex $state(headers) 0]
+            regexp {HTTP/\d.\d\s+\d+\s+(.*)} $result -> result
+            close $state(sock)
+            set code error
+        } else {
+            set result $state(sock)
+        }
+        unset state
+    } else {
+        set result [eval [linsert $args 0 ::socket]]
+    }
+    return -code $code $result
+}
+
+proc ::autoproxy::tunnel_write {token} {
+    upvar #0 $token state
+    variable options
+    fileevent $state(sock) writable {}
+    if {[catch {set state(error) [fconfigure $state(sock) -error]} err]} {
+        set state(error) $err
+    }
+    if {[string length $state(error)] > 0} {
+        set state(state) error
+        return
+    }
+    fconfigure $state(sock) -blocking 0 -buffering line -translation crlf
+    foreach {host port} $state(endpoint) break
+    puts $state(sock) "CONNECT $host:$port HTTP/1.1"
+    puts $state(sock) "Host: $host"
+    if {[string length $state(useragent)] > 0} {
+        puts $state(sock) "User-Agent: $state(useragent)"
+    }
+    puts $state(sock) "Proxy-Connection: keep-alive"
+    puts $state(sock) "Connection: keep-alive"
+    if {[string length $options(basic)] > 0} {
+        puts $state(sock) [join $options(basic) ": "]
+    }
+    puts $state(sock) ""
+
+    fileevent $state(sock) readable [namespace code [list tunnel_read $token]]
+    return
+}
+
+proc ::autoproxy::tunnel_read {token} {
+    upvar #0 $token state
+    set len [gets $state(sock) line]
+    if {[eof $state(sock)]} {
+        fileevent $state(sock) readable {}
+        set state(state) eof
+    } elseif {$len == 0} {
+        set state(code) [lindex [split [lindex $state(headers) 0] { }] 1]
+        fileevent $state(sock) readable {}
+        set state(state) ok
+    } else {
+        lappend state(headers) $line
+    }
+}
+
+# autoproxy::tls_socket --
+#
+#	This can be used to handle TLS connections independently of
+#	proxy presence. It can only be used with the Tcl http package
+#	and to use it you must do:
+#	   http::register https 443 ::autoproxy::tls_socket
+#	After that you can use the http::geturl command to access
+#	secure web pages and any proxy details will be handled for you.
+#
+proc ::autoproxy::tls_socket {args} {
+    variable options
+
+    # Look into the http package for the actual target. If a proxy is in use then
+    # The function appends the proxy host and port and not the target.
+
+    upvar host uhost port uport
+    set args [lrange $args 0 end-2]
+    lappend args $uhost $uport
+
+    set s [eval [linsert $args 0 tls_connect]]
+
+    # record the tls connection status in the http state array.
+    upvar state state
+
+    if {$options(tls_package) eq "twapi"} {
+        # With twapi::tls_socket, state may not be available on
+        # an async connect until negotiation is completed.
+        set state(tls_status) ""
+        set security_context [fconfigure $s -context]
+        if {$security_context ne ""} {
+            set cert [twapi::sspi_remote_cert $security_context]
+            set cert_info [twapi::cert_info $cert]
+            twapi::cert_release $cert
+            dict set state(tls_status) issuer [dict get $cert_info -issuer]
+            dict set state(tls_status) subject [dict get $cert_info -subject]
+            dict set state(tls_status) notBefore [dict get $cert_info -start]
+            dict set state(tls_status) notAfter [dict get $cert_info -end]
+            # Note: binary encode hex was not available in older Tcl, use twapi::hex
+            dict set state(tls_status) serial [twapi::hex [dict get $cert_info -serialnumber]]
+            # TBD - dict set state(tls_status) cipher
+            # TBD - dict set state(tls_status) sbits
+        }
+    } else {
+        tls::handshake $s
+        set state(tls_status) [tls::status $s]
+    }
+
+    return $s
+}
+
+# -------------------------------------------------------------------------
+
+package provide autoproxy 1.7
+
+# -------------------------------------------------------------------------
+#
+# Local variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/http/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/http/pkgIndex.tcl
new file mode 100644
index 00000000..2d77cd64
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/http/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded autoproxy 1.7 [list source [file join $dir autoproxy.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/httpd/httpd.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/httpd/httpd.tcl
new file mode 100644
index 00000000..0238b746
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/httpd/httpd.tcl
@@ -0,0 +1,2016 @@
+###
+# Amalgamated package for httpd
+# Do not edit directly, tweak the source in src/ and rerun
+# build.tcl
+###
+package require Tcl 8.6
+package provide httpd 4.3.5
+namespace eval ::httpd {}
+set ::httpd::version 4.3.5
+###
+# START: core.tcl
+###
+package require uri
+package require dns
+package require cron
+package require coroutine
+package require mime
+package require fileutil
+package require websocket
+package require Markdown
+package require fileutil::magic::filetype
+package require clay 0.7
+namespace eval httpd::content {
+}
+namespace eval ::url {
+}
+namespace eval ::httpd {
+}
+namespace eval ::scgi {
+}
+if {
+    [package vsatisfies [package require fileutil::magic::filetype] 2] ||
+    [package vsatisfies [package require fileutil::magic::filetype] 1.2]
+} {
+    # v1.2+, v2+: filetype result structure was changed completely.
+    proc ::httpd::mime-type {path} {
+	join [lindex [::fileutil::magic::filetype $path] 1] /
+    }
+} else {
+    # filetype result is mime type directly.
+    proc ::httpd::mime-type {path} {
+	::fileutil::magic::filetype $path
+    }
+}
+clay::define ::httpd::mime {
+  method ChannelCopy {in out args} {
+    try {
+      my clay refcount_incr
+      set chunk 4096
+      set size -1
+      foreach {f v} $args {
+        set [string trim $f -] $v
+      }
+      dict set info coroutine [info coroutine]
+      if {$size>0 && $chunk>$size} {
+          set chunk $size
+      }
+      set bytes 0
+      set sofar 0
+      set method [self method]
+      while 1 {
+        set command {}
+        set error {}
+        if {$size>=0} {
+          incr sofar $bytes
+          set remaining [expr {$size-$sofar}]
+          if {$remaining <= 0} {
+            break
+          } elseif {$chunk > $remaining} {
+            set chunk $remaining
+          }
+        }
+        lassign [yieldto chan copy $in $out -size $chunk \
+          -command [list [info coroutine] $method]] \
+          command bytes error
+        if {$command ne $method} {
+          error "Subroutine $method interrupted"
+        }
+        if {[string length $error]} {
+          error $error
+        }
+        if {[chan eof $in]} {
+          break
+        }
+      }
+    } finally {
+      my clay refcount_decr
+    }
+  }
+  method html_header {{title {}} args} {
+    set result {}
+    append result "<!DOCTYPE html>\n<HTML><HEAD>"
+    if {$title ne {}} {
+      append result "<TITLE>$title</TITLE>"
+    }
+    if {[dict exists $args stylesheet]} {
+      append result "<link rel=\"stylesheet\" href=\"[dict get $args stylesheet]\">"
+    } else {
+      append result "<link rel=\"stylesheet\" href=\"/style.css\">"
+    }
+    append result "</HEAD><BODY>"
+    return $result
+  }
+  method html_footer {args} {
+    return "</BODY></HTML>"
+  }
+  method http_code_string code {
+    set codes {
+      200 {Data follows}
+      204 {No Content}
+      301 {Moved Permanently}
+      302 {Found}
+      303 {Moved Temporarily}
+      304 {Not Modified}
+      307 {Moved Permanently}
+      308 {Moved Temporarily}
+      400 {Bad Request}
+      401 {Authorization Required}
+      403 {Permission denied}
+      404 {Not Found}
+      408 {Request Timeout}
+      411 {Length Required}
+      419 {Expectation Failed}
+      500 {Server Internal Error}
+      501 {Server Busy}
+      503 {Service Unavailable}
+      504 {Service Temporarily Unavailable}
+      505 {HTTP Version Not Supported}
+    }
+    if {[dict exists $codes $code]} {
+      return [dict get $codes $code]
+    }
+    return {Unknown Http Code}
+  }
+  method HttpHeaders {sock {debug {}}} {
+    set result {}
+    set LIMIT 8192
+    ###
+    # Set up a channel event to stream the data from the socket line by
+    # line. When a blank line is read, the HttpHeaderLine method will send
+    # a flag which will terminate the vwait.
+    #
+    # We do this rather than entering blocking mode to prevent the process
+    # from locking up if it's starved for input. (Or in the case of the test
+    # suite, when we are opening a blocking channel on the other side of the
+    # socket back to ourselves.)
+    ###
+    chan configure $sock -translation {auto crlf} -blocking 0 -buffering line
+    while 1 {
+      set readCount [::coroutine::util::gets_safety $sock $LIMIT line]
+      if {$readCount<=0} break
+      append result $line \n
+      if {[string length $result] > $LIMIT} {
+        error {Headers too large}
+      }
+    }
+    ###
+    # Return our buffer
+    ###
+    return $result
+  }
+  method HttpHeaders_Default {} {
+    return {Status {200 OK}
+Content-Size 0
+Content-Type {text/html; charset=UTF-8}
+Cache-Control {no-cache}
+Connection close}
+  }
+  method HttpServerHeaders {} {
+    return {
+      CONTENT_LENGTH CONTENT_TYPE QUERY_STRING REMOTE_USER AUTH_TYPE
+      REQUEST_METHOD REMOTE_ADDR REMOTE_HOST REQUEST_URI REQUEST_PATH
+      REQUEST_VERSION  DOCUMENT_ROOT QUERY_STRING REQUEST_RAW
+      GATEWAY_INTERFACE SERVER_PORT SERVER_HTTPS_PORT
+      SERVER_NAME  SERVER_SOFTWARE SERVER_PROTOCOL
+    }
+  }
+  method MimeParse mimetext {
+    set data(mimeorder) {}
+    foreach line [split $mimetext \n] {
+      # This regexp picks up
+      # key: value
+      # MIME headers.  MIME headers may be continue with a line
+      # that starts with spaces or a tab
+      if {[string length [string trim $line]]==0} break
+      if {[regexp {^([^ :]+):[ 	]*(.*)} $line dummy key value]} {
+        # The following allows something to
+        # recreate the headers exactly
+        lappend data(headerlist) $key $value
+        # The rest of this makes it easier to pick out
+        # headers from the data(mime,headername) array
+        #set key [string tolower $key]
+        if {[info exists data(mime,$key)]} {
+          append data(mime,$key) ,$value
+        } else {
+          set data(mime,$key) $value
+          lappend data(mimeorder) $key
+        }
+        set data(key) $key
+      } elseif {[regexp {^[ 	]+(.*)}  $line dummy value]} {
+        # Are there really continuation lines in the spec?
+        if {[info exists data(key)]} {
+          append data(mime,$data(key)) " " $value
+        } else {
+          error "INVALID HTTP HEADER FORMAT: $line"
+        }
+      } else {
+        error "INVALID HTTP HEADER FORMAT: $line"
+      }
+    }
+    ###
+    # To make life easier for our SCGI implementation rig things
+    # such that CONTENT_LENGTH is always first
+    # Also map all headers specified in rfc2616 to their canonical case
+    ###
+    set result {}
+    dict set result Content-Length 0
+    foreach {key} $data(mimeorder) {
+      set ckey $key
+      switch [string tolower $key] {
+        content-length {
+          set ckey Content-Length
+        }
+        content-encoding {
+          set ckey Content-Encoding
+        }
+        content-language {
+          set ckey Content-Language
+        }
+        content-location {
+          set ckey Content-Location
+        }
+        content-md5 {
+          set ckey Content-MD5
+        }
+        content-range {
+          set ckey Content-Range
+        }
+        content-type {
+          set ckey Content-Type
+        }
+        expires {
+          set ckey Expires
+        }
+        last-modified {
+          set ckey Last-Modified
+        }
+        cookie {
+          set ckey COOKIE
+        }
+        referer -
+        referrer {
+          # Standard misspelling in the RFC
+          set ckey Referer
+        }
+      }
+      dict set result $ckey $data(mime,$key)
+    }
+    return $result
+  }
+  method Url_Decode data {
+    regsub -all {\+} $data " " data
+    regsub -all {([][$\\])} $data {\\\1} data
+    regsub -all {%([0-9a-fA-F][0-9a-fA-F])} $data  {[format %c 0x\1]} data
+    return [subst $data]
+  }
+  method Url_PathCheck {urlsuffix} {
+    set pathlist ""
+    foreach part  [split $urlsuffix /] {
+      if {[string length $part] == 0} {
+        # It is important *not* to "continue" here and skip
+        # an empty component because it could be the last thing,
+        # /a/b/c/
+        # which indicates a directory.  In this case you want
+        # Auth_Check to recurse into the directory in the last step.
+      }
+      set part [Url_Decode $part]
+    	# Disallow Mac and UNIX path separators in components
+	    # Windows drive-letters are bad, too
+ 	    if {[regexp [/\\:] $part]} {
+  	    error "URL components cannot include \ or :"
+	    }
+	    switch -- $part {
+	      .  { }
+    	  .. {
+          set len [llength $pathlist]
+          if {[incr len -1] < 0} {
+            error "URL out of range"
+          }
+          set pathlist [lrange $pathlist 0 [incr len -1]]
+        }
+        default {
+          lappend pathlist $part
+        }
+      }
+    }
+    return $pathlist
+  }
+  method wait {mode sock} {
+    my clay refcount_incr
+    if {[info coroutine] eq {}} {
+      chan event $sock $mode [list set ::httpd::lock_$sock $mode]
+      vwait ::httpd::lock_$sock
+    } else {
+      chan event $sock $mode [info coroutine]
+      yield
+    }
+    chan event $sock $mode {}
+    my clay refcount_decr
+  }
+}
+
+###
+# END: core.tcl
+###
+###
+# START: reply.tcl
+###
+::clay::define ::httpd::reply {
+  superclass ::httpd::mime
+  Variable ChannelRegister {}
+  Delegate <server> {
+    description {The server object which spawned this reply}
+  }
+  Dict reply {}
+  Dict request {
+    CONTENT_LENGTH 0
+    COOKIE {}
+    HTTP_HOST {}
+    REFERER {}
+    REQUEST_URI {}
+    REMOTE_ADDR {}
+    REMOTE_HOST {}
+    USER_AGENT {}
+    SESSION {}
+  }
+  constructor {ServerObj args} {
+    my variable dispatched_time uuid
+    set uuid [namespace tail [self]]
+    set dispatched_time [clock milliseconds]
+    my clay delegate <server> $ServerObj
+    foreach {field value} [::clay::args_to_options {*}$args] {
+      my clay set config $field: $value
+    }
+  }
+  destructor {
+    my close
+  }
+  method ChannelRegister args {
+    my variable ChannelRegister
+    if {![info exists ChannelRegister]} {
+      set ChannelRegister {}
+    }
+    foreach c $args {
+      if {$c ni $ChannelRegister} {
+        lappend ChannelRegister $c
+      }
+    }
+  }
+  method close {} {
+    my variable ChannelRegister
+    if {![info exists ChannelRegister]} {
+      return
+    }
+    foreach c $ChannelRegister {
+      catch {chan event $c readable {}}
+      catch {chan event $c writable {}}
+      catch {chan flush $c}
+      catch {chan close $c}
+    }
+    set ChannelRegister {}
+  }
+  method Log_Dispatched {} {
+    my log Dispatched [dict create \
+     REMOTE_ADDR [my request get REMOTE_ADDR] \
+     REMOTE_HOST [my request get REMOTE_HOST] \
+     COOKIE [my request get HTTP_COOKIE] \
+     REFERER [my request get HTTP_REFERER] \
+     USER_AGENT [my request get HTTP_USER_AGENT] \
+     REQUEST_URI [my request get REQUEST_URI] \
+     HTTP_HOST [my request get HTTP_HOST] \
+     SESSION [my request get SESSION] \
+    ]
+  }
+  method dispatch {newsock datastate} {
+    my variable chan request
+    try {
+      my clay refcount_incr
+      set chan $newsock
+      my ChannelRegister $chan
+      chan event $chan readable {}
+      chan configure $chan -translation {auto crlf} -buffering line
+      if {[dict exists $datastate mixin]} {
+        set mixinmap [dict get $datastate mixin]
+      } else {
+        set mixinmap {}
+      }
+      foreach item [dict keys $datastate MIXIN_*] {
+        set slot [string range $item 6 end]
+        dict set mixinmap [string tolower $slot] [dict get $datastate $item]
+      }
+      my clay mixinmap {*}$mixinmap
+      if {[dict exists $datastate delegate]} {
+        my clay delegate {*}[dict get $datastate delegate]
+      }
+      my reset
+      set request [my clay get dict/ request]
+      foreach {f v} $datastate {
+        if {[string index $f end] eq "/"} {
+          catch {my clay merge $f $v}
+        } else {
+          my clay set $f $v
+        }
+        if {$f eq "http"} {
+          foreach {ff vf} $v {
+            dict set request $ff $vf
+          }
+        }
+      }
+      my Session_Load
+      my Log_Dispatched
+      my Dispatch
+    } on error {err errdat} {
+      my error 500 $err [dict get $errdat -errorinfo]
+      my DoOutput
+    } finally {
+      my close
+      my clay refcount_decr
+    }
+  }
+  method Dispatch {} {
+    # Invoke the URL implementation.
+    my content
+    my DoOutput
+  }
+  method html_header {title args} {
+    set result {}
+    append result "<HTML><HEAD>"
+    if {$title ne {}} {
+      append result "<TITLE>$title</TITLE>"
+    }
+    append result "</HEAD><BODY>"
+    append result \n {<div id="top-menu">}
+    if {[dict exists $args banner]} {
+      append result "<img src=\"[dict get $args banner]\">"
+    } else {
+      append result {<img src="/images/etoyoc-banner.jpg">}
+    }
+    append result {</div>}
+    if {[dict exists $args sideimg]} {
+      append result "\n<div name=\"sideimg\"><img align=right src=\"[dict get $args sideimg]\"></div>"
+    }
+    append result {<div id="content">}
+    return $result
+  }
+  method html_footer {args} {
+    set result {</div><div id="footer">}
+    append result {</div></BODY></HTML>}
+  }
+  method error {code {msg {}} {errorInfo {}}} {
+    my clay set  HTTP_ERROR $code
+    my reset
+    set qheaders [my clay dump]
+    set HTTP_STATUS "$code [my http_code_string $code]"
+    dict with qheaders {}
+    my reply replace {}
+    my reply set Status $HTTP_STATUS
+    my reply set Content-Type {text/html; charset=UTF-8}
+    switch $code {
+      301 - 302 - 303 - 307 - 308 {
+        my reply set Location $msg
+        set template [my <server> template redirect]
+      }
+      404 {
+        set template [my <server> template notfound]
+      }
+      default {
+        set template [my <server> template internal_error]
+      }
+    }
+    my puts [subst $template]
+  }
+  method content {} {
+    my puts [my html_header {Hello World!}]
+    my puts "<H1>HELLO WORLD!</H1>"
+    my puts [my html_footer]
+  }
+  method EncodeStatus {status} {
+    return "HTTP/1.0 $status"
+  }
+  method log {type {info {}}} {
+    my variable dispatched_time uuid
+    my <server> log $type $uuid $info
+  }
+  method CoroName {} {
+    if {[info coroutine] eq {}} {
+      return ::httpd::object::[my clay get UUID]
+    }
+  }
+  method DoOutput {} {
+    my variable reply_body chan
+    if {$chan eq {}} return
+    catch {
+      # Causing random issues. Technically a socket is always open for read and write
+      # anyway
+      #my wait writable $chan
+      chan configure $chan  -translation {binary binary}
+      ###
+      # Return dynamic content
+      ###
+      set length [string length $reply_body]
+      set result {}
+      if {${length} > 0} {
+        my reply set Content-Length [string length $reply_body]
+        append result [my reply output] \n
+        append result $reply_body
+      } else {
+        append result [my reply output]
+      }
+      chan puts -nonewline $chan $result
+      my log HttpAccess {}
+    }
+  }
+  method FormData {} {
+    my variable chan formdata
+    # Run this only once
+    if {[info exists formdata]} {
+      return $formdata
+    }
+    set length [my request get CONTENT_LENGTH]
+    set formdata {}
+    if {[my request get REQUEST_METHOD] in {"POST" "PUSH"}} {
+      set rawtype [my request get CONTENT_TYPE]
+      if {[string toupper [string range $rawtype 0 8]] ne "MULTIPART"} {
+        set type $rawtype
+      } else {
+        set type multipart
+      }
+      switch $type {
+        multipart {
+          ###
+          # Ok, Multipart MIME is troublesome, farm out the parsing to a dedicated tool
+          ###
+          set body [my clay get mimetxt]
+          append body \n [my PostData $length]
+          set token [::mime::initialize -string $body]
+          foreach item [::mime::getheader $token -names] {
+            dict set formdata $item [::mime::getheader $token $item]
+          }
+          foreach item {content encoding params parts size} {
+            dict set formdata MIME_[string toupper $item] [::mime::getproperty $token $item]
+          }
+          dict set formdata MIME_TOKEN $token
+        }
+        application/x-www-form-urlencoded {
+          # These foreach loops are structured this way to ensure there are matched
+          # name/value pairs.  Sometimes query data gets garbled.
+          set body [my PostData $length]
+          set result {}
+          foreach pair [split $body "&"] {
+            foreach {name value} [split $pair "="] {
+              lappend formdata [my Url_Decode $name] [my Url_Decode $value]
+            }
+          }
+        }
+      }
+    } else {
+      foreach pair [split [my request get QUERY_STRING] "&"] {
+        foreach {name value} [split $pair "="] {
+          lappend formdata [my Url_Decode $name] [my Url_Decode $value]
+        }
+      }
+    }
+    return $formdata
+  }
+  method PostData {length} {
+    my variable postdata
+    # Run this only once
+    if {[info exists postdata]} {
+      return $postdata
+    }
+    set postdata {}
+    if {[my request get REQUEST_METHOD] in {"POST" "PUSH"}} {
+      my variable chan
+      chan configure $chan -translation binary -blocking 0 -buffering full -buffersize 4096
+      set postdata [::coroutine::util::read $chan $length]
+    }
+    return $postdata
+  }
+  method Session_Load {} {}
+  method puts line {
+    my variable reply_body
+    append reply_body $line \n
+  }
+  method RequestFind {field} {
+    my variable request
+    if {[dict exists $request $field]} {
+      return $field
+    }
+    foreach item [dict keys $request] {
+      if {[string tolower $item] eq [string tolower $field]} {
+        return $item
+      }
+    }
+    return $field
+  }
+  method request {subcommand args} {
+    my variable request
+    switch $subcommand {
+      dump {
+        return $request
+      }
+      field {
+        tailcall my RequestFind [lindex $args 0]
+      }
+      get {
+        set field [my RequestFind [lindex $args 0]]
+        if {![dict exists $request $field]} {
+          return {}
+        }
+        tailcall dict get $request $field
+      }
+      getnull {
+        set field [my RequestFind [lindex $args 0]]
+        if {![dict exists $request $field]} {
+          return {}
+        }
+        tailcall dict get $request $field
+      }
+      exists {
+        set field [my RequestFind [lindex $args 0]]
+        tailcall dict exists $request $field
+      }
+      parse {
+        if {[catch {my MimeParse [lindex $args 0]} result]} {
+          my error 400 $result
+          tailcall my DoOutput
+        }
+        set request $result
+      }
+      replace {
+        set request [lindex $args 0]
+      }
+      set {
+        dict set request {*}$args
+      }
+      default {
+        error "Unknown command $subcommand. Valid: field, get, getnull, exists, parse, replace, set"
+      }
+    }
+  }
+  method reply {subcommand args} {
+    my variable reply
+    switch $subcommand {
+      dump {
+        return $reply
+      }
+      exists {
+        return [dict exists $reply {*}$args]
+      }
+      get -
+      getnull {
+        return [dict getnull $reply {*}$args]
+      }
+      replace {
+        set reply [my HttpHeaders_Default]
+        if {[llength $args]==1} {
+          foreach {f v} [lindex $args 0] {
+            dict set reply $f $v
+          }
+        } else {
+          foreach {f v} $args {
+            dict set reply $f $v
+          }
+        }
+      }
+      output {
+        set result {}
+        if {![dict exists $reply Status]} {
+          set status {200 OK}
+        } else {
+          set status [dict get $reply Status]
+        }
+        set result "[my EncodeStatus $status]\n"
+        foreach {f v} $reply {
+          if {$f in {Status}} continue
+          append result "[string trimright $f :]: $v\n"
+        }
+        #append result \n
+        return $result
+      }
+      set {
+        dict set reply {*}$args
+      }
+      default {
+        error "Unknown command $subcommand. Valid: exists, get, getnull, output, replace, set"
+      }
+    }
+  }
+  method reset {} {
+    my variable reply_body
+    my reply replace    [my HttpHeaders_Default]
+    my reply set Server [my <server> clay get server/ string]
+    my reply set Date [my timestamp]
+    set reply_body {}
+  }
+  method timeOutCheck {} {
+    my variable dispatched_time
+    if {([clock seconds]-$dispatched_time)>120} {
+      ###
+      # Something has lasted over 2 minutes. Kill this
+      ###
+      catch {
+        my error 408 {Request Timed out}
+        my DoOutput
+      }
+    }
+  }
+  method timestamp {} {
+    return [clock format [clock seconds] -format {%a, %d %b %Y %T %Z}]
+  }
+}
+
+###
+# END: reply.tcl
+###
+###
+# START: server.tcl
+###
+namespace eval ::httpd::object {
+}
+namespace eval ::httpd::coro {
+}
+::clay::define ::httpd::server {
+  superclass ::httpd::mime
+  clay set server/ port auto
+  clay set server/ myaddr 127.0.0.1
+  clay set server/ string [list TclHttpd $::httpd::version]
+  clay set server/ name [info hostname]
+  clay set server/ doc_root {}
+  clay set server/ reverse_dns 0
+  clay set server/ configuration_file {}
+  clay set server/ protocol {HTTP/1.1}
+  clay set socket/ buffersize   32768
+  clay set socket/ translation  {auto crlf}
+  clay set reply_class ::httpd::reply
+  Array template
+  Dict url_patterns {}
+  constructor {
+  {args {
+    port        {default auto      comment {Port to listen on}}
+    myaddr      {default 127.0.0.1 comment {IP address to listen on. "all" means all}}
+    string      {default auto      comment {Value for SERVER_SOFTWARE in HTTP headers}}
+    name        {default auto      comment {Value for SERVER_NAME in HTTP headers. Defaults to [info hostname]}}
+    doc_root    {default {}        comment {File path to serve.}}
+    reverse_dns {default 0         comment {Perform reverse DNS to convert IPs into hostnames}}
+    configuration_file {default {} comment {Configuration file to load into server namespace}}
+    protocol    {default {HTTP/1.1} comment {Value for SERVER_PROTOCOL in HTTP headers}}
+  }}} {
+    if {[llength $args]==1} {
+      set arglist [lindex $args 0]
+    } else {
+      set arglist $args
+    }
+    foreach {var val} $arglist {
+      my clay set server/ $var $val
+    }
+    my start
+  }
+  destructor {
+    my stop
+  }
+  method connect {sock ip port} {
+    ###
+    # If an IP address is blocked drop the
+    # connection
+    ###
+    if {[my Validate_Connection $sock $ip]} {
+      catch {close $sock}
+      return
+    }
+    set uuid [my Uuid_Generate]
+    set coro [coroutine ::httpd::coro::$uuid {*}[namespace code [list my Connect $uuid $sock $ip]]]
+    chan event $sock readable $coro
+  }
+  method ServerHeaders {ip http_request mimetxt} {
+    set result {}
+    dict set result HTTP_HOST {}
+    dict set result CONTENT_LENGTH 0
+    foreach {f v} [my MimeParse $mimetxt] {
+      set fld [string toupper [string map {- _} $f]]
+      if {$fld in {CONTENT_LENGTH CONTENT_TYPE}} {
+        set qfld $fld
+      } else {
+        set qfld HTTP_$fld
+      }
+      dict set result $qfld $v
+    }
+    dict set result REMOTE_ADDR     $ip
+    dict set result REMOTE_HOST     [my HostName $ip]
+    dict set result REQUEST_METHOD  [lindex $http_request 0]
+    set uriinfo [::uri::split [lindex $http_request 1]]
+    dict set result uriinfo $uriinfo
+    dict set result REQUEST_URI     [lindex $http_request 1]
+    dict set result REQUEST_PATH    [dict get $uriinfo path]
+    dict set result REQUEST_VERSION [lindex [split [lindex $http_request end] /] end]
+    dict set result DOCUMENT_ROOT   [my clay get server/ doc_root]
+    dict set result QUERY_STRING    [dict get $uriinfo query]
+    dict set result REQUEST_RAW     $http_request
+    dict set result SERVER_PORT     [my port_listening]
+    dict set result SERVER_NAME     [my clay get server/ name]
+    dict set result SERVER_PROTOCOL [my clay get server/ protocol]
+    dict set result SERVER_SOFTWARE [my clay get server/ string]
+    if {[string match 127.* $ip]} {
+      dict set result LOCALHOST [expr {[lindex [split [dict getnull $result HTTP_HOST] :] 0] eq "localhost"}]
+    }
+    return $result
+  }
+  method Connect {uuid sock ip} {
+    ::clay::cleanup
+    yield [info coroutine]
+    chan event $sock readable {}
+    chan configure $sock \
+      -blocking 0 \
+      -translation {auto crlf} \
+      -buffering line
+    my counter url_hit
+    try {
+      set readCount [::coroutine::util::gets_safety $sock 4096 http_request]
+      set mimetxt [my HttpHeaders $sock]
+      dict set query UUID $uuid
+      dict set query mimetxt $mimetxt
+      dict set query mixin style [my clay get server/ style]
+      dict set query http [my ServerHeaders $ip $http_request $mimetxt]
+      my Headers_Process query
+      set reply [my dispatch $query]
+    } on error {err errdat} {
+      my debug [list uri: [dict getnull $query REQUEST_URI] ip: $ip error: $err errorinfo: [dict get $errdat -errorinfo]]
+      my log BadRequest $uuid [list ip: $ip error: $err errorinfo: [dict get $errdat -errorinfo]]
+      catch {chan puts $sock "HTTP/1.0 400 Bad Request (The data is invalid)"}
+      catch {chan close $sock}
+      return
+    }
+    if {[dict size $reply]==0} {
+      set reply $query
+      my log BadLocation $uuid $query
+      dict set reply http HTTP_STATUS {404 Not Found}
+      dict set reply template notfound
+      dict set reply mixin reply ::httpd::content.template
+    }
+    set pageobj [::httpd::reply create ::httpd::object::$uuid [self]]
+    tailcall $pageobj dispatch $sock $reply
+  }
+  method counter which {
+    my variable counters
+    incr counters($which)
+  }
+  method CheckTimeout {} {
+    foreach obj [info commands ::httpd::object::*] {
+      try {
+        $obj timeOutCheck
+      } on error {} {
+        $obj clay refcount_decr
+      }
+    }
+    ::clay::cleanup
+  }
+  method debug args {}
+  method dispatch {data} {
+    set reply [my Dispatch_Local $data]
+    if {[dict size $reply]} {
+      return $reply
+    }
+    return [my Dispatch_Default $data]
+  }
+  method Dispatch_Default {reply} {
+    ###
+    # Fallback to docroot handling
+    ###
+    set doc_root [dict getnull $reply http DOCUMENT_ROOT]
+    if {$doc_root ne {}} {
+      ###
+      # Fall back to doc_root handling
+      ###
+      dict set reply prefix {}
+      dict set reply path $doc_root
+      dict set reply mixin reply httpd::content.file
+      return $reply
+    }
+    return {}
+  }
+  method Dispatch_Local data {}
+  method Headers_Local {varname} {}
+  method Headers_Process varname {}
+  method HostName ipaddr {
+    if {![my clay get server/ reverse_dns]} {
+      return $ipaddr
+    }
+    set t [::dns::resolve $ipaddr]
+    set result [::dns::name $t]
+    ::dns::cleanup $t
+    return $result
+  }
+  method log args {
+    # Do nothing for now
+  }
+  method plugin {slot {class {}}} {
+    if {$class eq {}} {
+      set class ::httpd::plugin.$slot
+    }
+    if {[info command $class] eq {}} {
+      error "Class $class for plugin $slot does not exist"
+    }
+    my clay mixinmap $slot $class
+    set mixinmap [my clay mixinmap]
+
+    ###
+    # Perform action on load
+    ###
+    set script [$class clay search plugin/ load]
+    eval $script
+
+    ###
+    # rebuild the dispatch method
+    ###
+    set body "\n try \{"
+    append body \n {
+  set reply [my Dispatch_Local $data]
+  if {[dict size $reply]} {return $reply}
+}
+
+    foreach {slot class} $mixinmap {
+      set script [$class clay search plugin/ dispatch]
+      if {[string length $script]} {
+        append body \n "# SLOT $slot"
+        append body \n $script
+      }
+    }
+    append body \n {  return [my Dispatch_Default $data]}
+    append body \n "\} on error \{err errdat\} \{"
+    append body \n {  puts [list DISPATCH ERROR [dict get $errdat -errorinfo]] ; return {}}
+    append body \n "\}"
+    oo::objdefine [self] method dispatch data $body
+    ###
+    # rebuild the Headers_Process method
+    ###
+    set body "\n try \{"
+    append body \n "  upvar 1 \$varname query"
+    append body \n {  my Headers_Local query}
+    foreach {slot class} $mixinmap {
+      set script [$class clay search plugin/ headers]
+      if {[string length $script]} {
+        append body \n "# SLOT $slot"
+        append body \n $script
+      }
+    }
+    append body \n "\} on error \{err errdat\} \{"
+    append body \n {  puts [list HEADERS ERROR [dict get $errdat -errorinfo]] ; return {}}
+    append body \n "\}"
+
+    oo::objdefine [self] method Headers_Process varname $body
+
+    ###
+    # rebuild the Threads_Start method
+    ###
+    set body "\n try \{"
+    foreach {slot class} $mixinmap {
+      set script [$class clay search plugin/ thread]
+      if {[string length $script]} {
+        append body \n "# SLOT $slot"
+        append body \n $script
+      }
+    }
+    append body \n "\} on error \{err errdat\} \{"
+    append body \n {  puts [list THREAD START ERROR [dict get $errdat -errorinfo]] ; return {}}
+    append body \n "\}"
+    oo::objdefine [self] method Thread_start {} $body
+  }
+  method port_listening {} {
+    my variable port_listening
+    return $port_listening
+  }
+  method PrefixNormalize prefix {
+    set prefix [string trimright $prefix /]
+    set prefix [string trimright $prefix *]
+    set prefix [string trimright $prefix /]
+    return $prefix
+  }
+  method source {filename} {
+    source $filename
+  }
+  method start {} {
+    # Build a namespace to contain replies
+    namespace eval [namespace current]::reply {}
+
+    my variable socklist port_listening
+    if {[my clay get server/ configuration_file] ne {}} {
+      source [my clay get server/ configuration_file]
+    }
+    set port [my clay get server/ port]
+    if { $port in {auto {}} } {
+      package require nettool
+      set port [::nettool::allocate_port 8015]
+    }
+    set port_listening $port
+    set myaddr [my clay get server/ myaddr]
+    my debug [list [self] listening on $port $myaddr]
+
+    if {$myaddr ni {all any * {}}} {
+      foreach ip $myaddr {
+        lappend socklist [socket -server [namespace code [list my connect]] -myaddr $ip $port]
+      }
+    } else {
+      lappend socklist [socket -server [namespace code [list my connect]] $port]
+    }
+    ::cron::every [self] 120 [namespace code {my CheckTimeout}]
+    my Thread_start
+  }
+  method stop {} {
+    my variable socklist
+    if {[info exists socklist]} {
+      foreach sock $socklist {
+        catch {close $sock}
+      }
+    }
+    set socklist {}
+    ::cron::cancel [self]
+  }
+  Ensemble SubObject::db {} {
+    return [namespace current]::Sqlite_db
+  }
+  Ensemble SubObject::default {} {
+    return [namespace current]::$method
+  }
+  method template page {
+    my variable template
+    if {[info exists template($page)]} {
+      return $template($page)
+    }
+    set template($page) [my TemplateSearch $page]
+    return $template($page)
+  }
+  method TemplateSearch page {
+    set doc_root [my clay get server/ doc_root]
+    if {$doc_root ne {} && [file exists [file join $doc_root $page.tml]]} {
+      return [::fileutil::cat [file join $doc_root $page.tml]]
+    }
+    if {$doc_root ne {} && [file exists [file join $doc_root $page.html]]} {
+      return [::fileutil::cat [file join $doc_root $page.html]]
+    }
+    switch $page {
+      redirect {
+return {
+[my html_header "$HTTP_STATUS"]
+The page you are looking for: <b>[my request get REQUEST_PATH]</b> has moved.
+<p>
+If your browser does not automatically load the new location, it is
+<a href=\"$msg\">$msg</a>
+[my html_footer]
+}
+      }
+      internal_error {
+        return {
+[my html_header "$HTTP_STATUS"]
+Error serving <b>[my request get REQUEST_PATH]</b>:
+<p>
+The server encountered an internal server error: <pre>$msg</pre>
+<pre><code>
+$errorInfo
+</code></pre>
+[my html_footer]
+        }
+      }
+      notfound {
+        return {
+[my html_header "$HTTP_STATUS"]
+The page you are looking for: <b>[my request get REQUEST_PATH]</b> does not exist.
+[my html_footer]
+        }
+      }
+    }
+  }
+  method Thread_start {} {}
+  method Uuid_Generate {} {
+    return [::clay::uuid::short]
+  }
+  method Validate_Connection {sock ip} {
+    return 0
+  }
+}
+::clay::define ::httpd::server::dispatch {
+    superclass ::httpd::server
+}
+
+###
+# END: server.tcl
+###
+###
+# START: dispatch.tcl
+###
+::clay::define ::httpd::content.redirect {
+  method reset {} {
+    ###
+    # Inject the location into the HTTP headers
+    ###
+    my variable reply_body
+    set reply_body {}
+    my reply replace    [my HttpHeaders_Default]
+    my reply set Server [my <server> clay get server/ string]
+    set msg [my clay get LOCATION]
+    my reply set Location [my clay get LOCATION]
+    set code  [my clay get REDIRECT_CODE]
+    if {$code eq {}} {
+      set code 301
+    }
+    my reply set Status [list $code [my http_code_string $code]]
+  }
+  method content {} {
+    set template [my <server> template redirect]
+    set msg [my clay get LOCATION]
+    set HTTP_STATUS [my reply get Status]
+    my puts [subst $msg]
+  }
+}
+::clay::define ::httpd::content.cache {
+  method Dispatch {} {
+    my variable chan
+    my wait writable $chan
+    chan configure $chan  -translation {binary binary}
+    chan puts -nonewline $chan [my clay get cache/ data]
+  }
+}
+::clay::define ::httpd::content.template {
+  method content {} {
+    if {[my request get HTTP_STATUS] ne {}} {
+      my reply set Status [my request get HTTP_STATUS]
+    }
+    set request [my request dump]
+    dict with request {}
+    my puts [subst [my <server> template [my clay get template]]]
+  }
+}
+
+###
+# END: dispatch.tcl
+###
+###
+# START: file.tcl
+###
+::clay::define ::httpd::content.file {
+  method FileName {} {
+    # Some dispatchers will inject a fully qualified name during discovery
+    if {[my clay exists FILENAME] && [file exists [my clay get FILENAME]]} {
+      my request set PREFIX_URI [file dirname [my clay get FILENAME]]
+      return [my clay get FILENAME]
+    }
+    set uri [string trimleft [my request get REQUEST_PATH] /]
+    set path [my clay get path]
+    set prefix [my clay get prefix]
+    set fname [string range $uri [string length $prefix] end]
+    if {$fname in "{} index.html index.md index index.tml index.tcl"} {
+      return $path
+    }
+    if {[file exists [file join $path $fname]]} {
+      return [file join $path $fname]
+    }
+    if {[file exists [file join $path $fname.md]]} {
+      return [file join $path $fname.md]
+    }
+    if {[file exists [file join $path $fname.html]]} {
+      return [file join $path $fname.html]
+    }
+    if {[file exists [file join $path $fname.tml]]} {
+      return [file join $path $fname.tml]
+    }
+    if {[file exists [file join $path $fname.tcl]]} {
+      return [file join $path $fname.tcl]
+    }
+    return {}
+  }
+  method DirectoryListing {local_file} {
+    set uri [string trimleft [my request get REQUEST_PATH] /]
+    set path [my clay get path]
+    set prefix [my clay get prefix]
+    set fname [string range $uri [string length $prefix] end]
+    my puts [my html_header "Listing of /$fname/"]
+    my puts "Listing contents of /$fname/"
+    my puts "<TABLE>"
+    if {$prefix ni {/ {}}} {
+      set updir [file dirname $prefix]
+      if {$updir ne {}} {
+        my puts "<TR><TD><a href=\"/$updir\">..</a></TD><TD></TD></TR>"
+      }
+    }
+    foreach file [glob -nocomplain [file join $local_file *]] {
+      if {[file isdirectory $file]} {
+        my puts "<TR><TD><a href=\"[file join / $uri [file tail $file]]\">[file tail $file]/</a></TD><TD></TD></TR>"
+      } else {
+        my puts "<TR><TD><a href=\"[file join / $uri [file tail $file]]\">[file tail $file]</a></TD><TD>[file size $file]</TD></TR>"
+      }
+    }
+    my puts "</TABLE>"
+    my puts [my html_footer]
+  }
+  method content {} {
+    my variable reply_file
+    set local_file [my FileName]
+    if {$local_file eq {} || ![file exist $local_file]} {
+      my log httpNotFound [my request get REQUEST_PATH]
+      my error 404 {File Not Found}
+      tailcall my DoOutput
+    }
+    if {[file isdirectory $local_file] || [file tail $local_file] in {index index.html index.tml index.md}} {
+      my request set PREFIX_URI [my request get REQUEST_PATH]
+      my request set LOCAL_DIR $local_file
+      ###
+      # Produce an index page
+      ###
+      set idxfound 0
+      foreach name {
+        index.tcl
+        index.html
+        index.tml
+        index.md
+        index.info
+        index.clay
+        content.htm
+      } {
+        if {[file exists [file join $local_file $name]]} {
+          set idxfound 1
+          set local_file [file join $local_file $name]
+          break
+        }
+      }
+      if {!$idxfound} {
+        tailcall my DirectoryListing $local_file
+      }
+    } else {
+      my request set PREFIX_URI [file dirname [my request get REQUEST_PATH]]
+      my request set LOCAL_DIR [file dirname $local_file]
+    }
+    my request set LOCAL_FILE $local_file
+
+    switch [file extension $local_file] {
+      .apng {
+        my reply set Content-Type {image/apng}
+        set reply_file $local_file
+      }
+      .bmp {
+        my reply set Content-Type {image/bmp}
+        set reply_file $local_file
+      }
+      .css {
+        my reply set Content-Type {text/css}
+        set reply_file $local_file
+      }
+      .gif {
+        my reply set Content-Type {image/gif}
+        set reply_file $local_file
+      }
+      .cur - .ico {
+        my reply set Content-Type {image/x-icon}
+        set reply_file $local_file
+      }
+      .jpg - .jpeg - .jfif - .pjpeg - .pjp {
+        my reply set Content-Type {image/jpg}
+        set reply_file $local_file
+      }
+      .js {
+        my reply set Content-Type {text/javascript}
+        set reply_file $local_file
+      }
+      .md {
+        package require Markdown
+        my reply set Content-Type {text/html; charset=UTF-8}
+        set mdtxt  [::fileutil::cat $local_file]
+        my puts [::Markdown::convert $mdtxt]
+      }
+      .png {
+        my reply set Content-Type {image/png}
+        set reply_file $local_file
+      }
+      .svgz -
+      .svg {
+        # FU magic screws it up
+        my reply set Content-Type {image/svg+xml}
+        set reply_file $local_file
+      }
+      .tcl {
+        my reply set Content-Type {text/html; charset=UTF-8}
+        try {
+          source $local_file
+        } on error {err errdat} {
+          my error 500 {Internal Error} [dict get $errdat -errorinfo]
+        }
+      }
+      .tiff {
+        my reply set Content-Type {image/tiff}
+        set reply_file $local_file
+      }
+      .tml {
+        my reply set Content-Type {text/html; charset=UTF-8}
+        set tmltxt  [::fileutil::cat $local_file]
+        set headers [my request dump]
+        dict with headers {}
+        my puts [subst $tmltxt]
+      }
+      .txt {
+        my reply set Content-Type {text/plain}
+        set reply_file $local_file
+      }
+      .webp {
+        my reply set Content-Type {image/webp}
+        set reply_file $local_file
+      }
+      default {
+        ###
+        # Assume we are returning a binary file
+        ###
+        my reply set Content-Type [::httpd::mime-type $local_file]
+        set reply_file $local_file
+      }
+    }
+  }
+  method Dispatch {} {
+    my variable reply_body reply_file reply_chan chan
+    try {
+      my reset
+      # Invoke the URL implementation.
+      my content
+    } on error {err errdat} {
+      my error 500 $err [dict get $errdat -errorinfo]
+      catch {
+        tailcall my DoOutput
+      }
+    }
+    if {$chan eq {}} return
+    catch {
+      # Causing random issues. Technically a socket is always open for read and write
+      # anyway
+      #my wait writable $chan
+      if {![info exists reply_file]} {
+        tailcall my DoOutput
+      }
+      chan configure $chan  -translation {binary binary}
+      my log HttpAccess {}
+      ###
+      # Return a stream of data from a file
+      ###
+      set size [file size $reply_file]
+      my reply set Content-Length $size
+      append result [my reply output] \n
+      chan puts -nonewline $chan $result
+      set reply_chan [open $reply_file r]
+      my ChannelRegister $reply_chan
+      my log SendReply [list length $size]
+      ###
+      # Output the file contents. With no -size flag, channel will copy until EOF
+      ###
+      chan configure $reply_chan -translation {binary binary} -buffersize 4096 -buffering full -blocking 0
+      if {$size < 40960} {
+        # Raw copy small files
+        chan copy $reply_chan $chan
+      } else {
+        my ChannelCopy $reply_chan $chan -chunk 4096
+      }
+    }
+  }
+}
+
+###
+# END: file.tcl
+###
+###
+# START: proxy.tcl
+###
+::clay::define ::httpd::content.exec {
+  variable exename [list tcl [info nameofexecutable] .tcl [info nameofexecutable]]
+  method CgiExec {execname script arglist} {
+    if { $::tcl_platform(platform) eq "windows"} {
+      if {[file extension $script] eq ".exe"} {
+        return [open "|[list $script] $arglist" r+]
+      } else {
+        if {$execname eq {}} {
+          set execname [my Cgi_Executable $script]
+        }
+        return [open "|[list $execname $script] $arglist" r+]
+      }
+    } else {
+      if {$execname eq {}} {
+        return [open "|[list $script] $arglist 2>@1" r+]
+      } else {
+        return [open "|[list $execname $script] $arglist 2>@1" r+]
+      }
+    }
+    error "CGI Not supported"
+  }
+  method Cgi_Executable {script} {
+    if {[string tolower [file extension $script]] eq ".exe"} {
+      return $script
+    }
+    my variable exename
+    set ext [file extension $script]
+    if {$ext eq {}} {
+      set which [file tail $script]
+    } else {
+      if {[dict exists exename $ext]} {
+        return [dict get $exename $ext]
+      }
+      switch $ext {
+        .pl {
+          set which perl
+        }
+        .py {
+          set which python
+        }
+        .php {
+          set which php
+        }
+        .fossil - .fos {
+          set which fossil
+        }
+        default {
+          set which tcl
+        }
+      }
+      if {[dict exists exename $which]} {
+        set result [dict get $exename $which]
+        dict set exename $ext $result
+        return $result
+      }
+    }
+    if {[dict exists exename $which]} {
+      return [dict get $exename $which]
+    }
+    if {$which eq "tcl"} {
+      if {[my clay get tcl_exe] ne {}} {
+        dict set exename $which [my clay get tcl_exe]
+      } else {
+        dict set exename $which [info nameofexecutable]
+      }
+    } else {
+      if {[my clay get ${which}_exe] ne {}} {
+        dict set exename $which [my clay get ${which}_exe]
+      } elseif {"$::tcl_platform(platform)" == "windows"} {
+        dict set exename $which $which.exe
+      } else {
+        dict set exename $which $which
+      }
+    }
+    set result [dict get $exename $which]
+    if {$ext ne {}} {
+      dict set exename $ext $result
+    }
+    return $result
+  }
+}
+::clay::define ::httpd::content.proxy {
+  superclass ::httpd::content.exec
+  method proxy_channel {} {
+    ###
+    # This method returns a channel to the
+    # proxied socket/stdout/etc
+    ###
+    error unimplemented
+  }
+  method proxy_path {} {
+    set uri [string trimleft [my request get REQUEST_URI] /]
+    set prefix [my clay get prefix]
+    return /[string range $uri [string length $prefix] end]
+  }
+  method ProxyRequest {chana chanb} {
+    chan event $chanb writable {}
+    my log ProxyRequest {}
+    chan puts $chanb "[my request get REQUEST_METHOD] [my proxy_path]"
+    set mimetxt [my clay get mimetxt]
+    chan puts $chanb [my clay get mimetxt]
+    set length [my request get CONTENT_LENGTH]
+    if {$length} {
+      chan configure $chana -translation binary -blocking 0 -buffering full -buffersize 4096
+      chan configure $chanb -translation binary -blocking 0 -buffering full -buffersize 4096
+      ###
+      # Send any POST/PUT/etc content
+      ###
+      my ChannelCopy $chana $chanb -size $length
+    } else {
+      chan flush $chanb
+    }
+    chan event $chanb readable [info coroutine]
+    yield
+  }
+  method ProxyReply {chana chanb args} {
+    my log ProxyReply [list args $args]
+    chan event $chana readable {}
+    set readCount [::coroutine::util::gets_safety $chana 4096 reply_status]
+    set replyhead [my HttpHeaders $chana]
+    set replydat  [my MimeParse $replyhead]
+
+    ###
+    # Read the first incoming line as the HTTP reply status
+    # Return the rest of the headers verbatim
+    ###
+    set replybuffer "$reply_status\n"
+    append replybuffer $replyhead
+    chan configure $chanb -translation {auto crlf} -blocking 0 -buffering full -buffersize 4096
+    chan puts $chanb $replybuffer
+    ###
+    # Output the body. With no -size flag, channel will copy until EOF
+    ###
+    chan configure $chana -translation binary -blocking 0 -buffering full -buffersize 4096
+    chan configure $chanb -translation binary -blocking 0 -buffering full -buffersize 4096
+    my ChannelCopy $chana $chanb -chunk 4096
+  }
+  method Dispatch {} {
+    my variable sock chan
+    if {[catch {my proxy_channel} sock errdat]} {
+      my error 504 {Service Temporarily Unavailable} [dict get $errdat -errorinfo]
+      tailcall my DoOutput
+    }
+    if {$sock eq {}} {
+      my error 404 {Not Found}
+      tailcall my DoOutput
+    }
+    my log HttpAccess {}
+    chan event $sock writable [info coroutine]
+    yield
+    my ChannelRegister $sock
+    my ProxyRequest $chan $sock
+    my ProxyReply   $sock $chan
+  }
+}
+
+###
+# END: proxy.tcl
+###
+###
+# START: cgi.tcl
+###
+::clay::define ::httpd::content.cgi {
+  superclass ::httpd::content.proxy
+  method FileName {} {
+    set uri [string trimleft [my request get REQUEST_PATH] /]
+    set path [my clay get path]
+    set prefix [my clay get prefix]
+
+    set fname [string range $uri [string length $prefix] end]
+    if {[file exists [file join $path $fname]]} {
+      return [file join $path $fname]
+    }
+    if {[file exists [file join $path $fname.fossil]]} {
+      return [file join $path $fname.fossil]
+    }
+    if {[file exists [file join $path $fname.fos]]} {
+      return [file join $path $fname.fos]
+    }
+    if {[file extension $fname] in {.exe .cgi .tcl .pl .py .php}} {
+      return $fname
+    }
+    return {}
+  }
+  method proxy_channel {} {
+    ###
+    # When delivering static content, allow web caches to save
+    ###
+    set local_file [my FileName]
+    if {$local_file eq {} || ![file exist $local_file]} {
+      my log httpNotFound [my request get REQUEST_PATH]
+      my error 404 {Not Found}
+      tailcall my DoOutput
+    }
+    if {[file isdirectory $local_file]} {
+      ###
+      # Produce an index page... or error
+      ###
+      tailcall my DirectoryListing $local_file
+    }
+
+    set verbatim {
+      CONTENT_LENGTH CONTENT_TYPE QUERY_STRING REMOTE_USER AUTH_TYPE
+      REQUEST_METHOD REMOTE_ADDR REMOTE_HOST REQUEST_URI REQUEST_PATH
+      REQUEST_VERSION  DOCUMENT_ROOT QUERY_STRING REQUEST_RAW
+      GATEWAY_INTERFACE SERVER_PORT SERVER_HTTPS_PORT
+      SERVER_NAME  SERVER_SOFTWARE SERVER_PROTOCOL
+    }
+    foreach item $verbatim {
+      set ::env($item) {}
+    }
+    foreach item [array names ::env HTTP_*] {
+      set ::env($item) {}
+    }
+    set ::env(SCRIPT_NAME) [my request get REQUEST_PATH]
+    set ::env(SERVER_PROTOCOL) HTTP/1.0
+    set ::env(HOME) $::env(DOCUMENT_ROOT)
+    foreach {f v} [my request dump] {
+      set ::env($f) $v
+    }
+  	set arglist $::env(QUERY_STRING)
+    set pwd [pwd]
+    cd [file dirname $local_file]
+    set script_file $local_file
+    if {[file extension $local_file] in {.fossil .fos}} {
+      if {![file exists $local_file.cgi]} {
+        set fout [open $local_file.cgi w]
+        chan puts $fout "#!/usr/bin/fossil"
+        chan puts $fout "repository: $local_file"
+        close $fout
+      }
+      set script_file $local_file.cgi
+      set EXE [my Cgi_Executable fossil]
+    } else {
+      set EXE [my Cgi_Executable $local_file]
+    }
+    set ::env(PATH_TRANSLATED) $script_file
+    set pipe [my CgiExec $EXE $script_file $arglist]
+    cd $pwd
+    return $pipe
+  }
+  method ProxyRequest {chana chanb} {
+    chan event $chanb writable {}
+    my log ProxyRequest {}
+    set length [my request get CONTENT_LENGTH]
+    if {$length} {
+      chan configure $chana -translation binary -blocking 0 -buffering full -buffersize 4096
+      chan configure $chanb -translation binary -blocking 0 -buffering full -buffersize 4096
+      ###
+      # Send any POST/PUT/etc content
+      ###
+      my ChannelCopy $chana $chanb -size $length
+    } else {
+      chan flush $chanb
+    }
+    my clay refcount_incr
+    chan event $chanb readable [info coroutine]
+    yield
+  }
+  method ProxyReply {chana chanb args} {
+    my log ProxyReply [list args $args]
+    chan event $chana readable {}
+    set replyhead [my HttpHeaders $chana]
+    set replydat  [my MimeParse $replyhead]
+    if {![dict exists $replydat Content-Length]} {
+      set length 0
+    } else {
+      set length [dict get $replydat Content-Length]
+    }
+    ###
+    # Convert the Status: header from the CGI process to
+    # a standard service reply line from a web server, but
+    # otherwise spit out the rest of the headers verbatim
+    ###
+    set replybuffer "HTTP/1.0 [dict get $replydat Status]\n"
+    append replybuffer $replyhead
+    chan configure $chanb -translation {auto crlf} -blocking 0 -buffering full -buffersize 4096
+    chan puts $chanb $replybuffer
+    ###
+    # Output the body. With no -size flag, channel will copy until EOF
+    ###
+    chan configure $chana -translation binary -blocking 0 -buffering full -buffersize 4096
+    chan configure $chanb -translation binary -blocking 0 -buffering full -buffersize 4096
+    my ChannelCopy $chana $chanb -chunk 4096
+    my clay refcount_decr
+  }
+  method DirectoryListing {local_file} {
+    my error 403 {Not Allowed}
+    tailcall my DoOutput
+  }
+}
+
+###
+# END: cgi.tcl
+###
+###
+# START: scgi.tcl
+###
+::clay::define ::httpd::protocol.scgi {
+  method EncodeStatus {status} {
+    return "Status: $status"
+  }
+}
+::clay::define ::httpd::content.scgi {
+  superclass ::httpd::content.proxy
+  method scgi_info {} {
+    ###
+    # This method should check if a process is launched
+    # or launch it if needed, and return a list of
+    # HOST PORT SCRIPT_NAME
+    ###
+    # return {localhost 8016 /some/path}
+    error unimplemented
+  }
+  method proxy_channel {} {
+    set sockinfo [my scgi_info]
+    if {$sockinfo eq {}} {
+      my error 404 {Not Found}
+      tailcall my DoOutput
+    }
+    lassign $sockinfo scgihost scgiport scgiscript
+    my clay set  SCRIPT_NAME $scgiscript
+    if {![string is integer $scgiport]} {
+      my error 404 {Not Found}
+      tailcall my DoOutput
+    }
+    return [::socket $scgihost $scgiport]
+  }
+  method ProxyRequest {chana chanb} {
+    chan event $chanb writable {}
+    my log ProxyRequest {}
+    chan configure $chana -translation binary -blocking 0 -buffering full -buffersize 4096
+    chan configure $chanb -translation binary -blocking 0 -buffering full -buffersize 4096
+    set info [dict create CONTENT_LENGTH 0 SCGI 1.0 SCRIPT_NAME [my clay get SCRIPT_NAME]]
+    foreach {f v} [my request dump] {
+      dict set info $f $v
+    }
+    set length [dict get $info CONTENT_LENGTH]
+    set block {}
+    foreach {f v} $info {
+      append block [string toupper $f] \x00 $v \x00
+    }
+    chan puts -nonewline $chanb "[string length $block]:$block,"
+    # Light off another coroutine
+    #set cmd [list coroutine [my CoroName] {*}[namespace code [list my ProxyReply $chanb $chana]]]
+    if {$length} {
+      chan configure $chana -translation binary -blocking 0 -buffering full -buffersize 4096
+      chan configure $chanb -translation binary -blocking 0 -buffering full -buffersize 4096
+      ###
+      # Send any POST/PUT/etc content
+      ###
+      my ChannelCopy $chana $chanb -size $length
+      #chan copy $chana $chanb -size $length -command [info coroutine]
+    } else {
+      chan flush $chanb
+    }
+    chan event $chanb readable [info coroutine]
+    yield
+  }
+  method ProxyReply {chana chanb args} {
+    my log ProxyReply [list args $args]
+    chan event $chana readable {}
+    set replyhead [my HttpHeaders $chana]
+    set replydat  [my MimeParse $replyhead]
+    ###
+    # Convert the Status: header from the CGI process to
+    # a standard service reply line from a web server, but
+    # otherwise spit out the rest of the headers verbatim
+    ###
+    set replybuffer "HTTP/1.0 [dict get $replydat Status]\n"
+    append replybuffer $replyhead
+    chan configure $chanb -translation {auto crlf} -blocking 0 -buffering full -buffersize 4096
+    chan puts $chanb $replybuffer
+    ###
+    # Output the body. With no -size flag, channel will copy until EOF
+    ###
+    chan configure $chana -translation binary -blocking 0 -buffering full -buffersize 4096
+    chan configure $chanb -translation binary -blocking 0 -buffering full -buffersize 4096
+    my ChannelCopy $chana $chanb -chunk 4096
+  }
+}
+::clay::define ::httpd::server.scgi {
+  superclass ::httpd::server
+  clay set socket/ buffersize   32768
+  clay set socket/ blocking     0
+  clay set socket/ translation  {binary binary}
+  method debug args {
+    puts $args
+  }
+  method Connect {uuid sock ip} {
+    yield [info coroutine]
+    chan event $sock readable {}
+    chan configure $sock \
+        -blocking 1 \
+        -translation {binary binary} \
+        -buffersize 4096 \
+        -buffering none
+    my counter url_hit
+    try {
+      # Read the SCGI request on byte at a time until we reach a ":"
+      dict set query http HTTP_HOST {}
+      dict set query http CONTENT_LENGTH 0
+      dict set query http REQUEST_URI /
+      dict set query http REMOTE_ADDR $ip
+      dict set query http DOCUMENT_ROOT [my clay get server/ doc_root]
+      set size {}
+      while 1 {
+        set char [::coroutine::util::read $sock 1]
+        if {[chan eof $sock]} {
+          catch {close $sock}
+          return
+        }
+        if {$char eq ":"} break
+        append size $char
+      }
+      # With length in hand, read the netstring encoded headers
+      set inbuffer [::coroutine::util::read $sock [expr {$size+1}]]
+      chan configure $sock -translation {auto crlf} -blocking 0 -buffersize 4096 -buffering full
+      foreach {f v} [lrange [split [string range $inbuffer 0 end-1] \0] 0 end-1] {
+        dict set query http $f $v
+      }
+      if {![dict exists $query http REQUEST_PATH]} {
+        set uri [dict get $query http REQUEST_URI]
+        set uriinfo [::uri::split $uri]
+        dict set query http REQUEST_PATH    [dict get $uriinfo path]
+      }
+      set reply [my dispatch $query]
+    } on error {err errdat} {
+      my debug [list uri: [dict getnull $query http REQUEST_URI] ip: $ip error: $err errorinfo: [dict get $errdat -errorinfo]]
+      my log BadRequest $uuid [list ip: $ip error: $err errorinfo: [dict get $errdat -errorinfo]]
+      catch {chan puts $sock "HTTP/1.0 400 Bad Request (The data is invalid)"}
+      catch {chan event readable $sock {}}
+      catch {chan event writeable $sock {}}
+      catch {chan close $sock}
+      return
+    }
+    if {[dict size $reply]==0} {
+      my log BadLocation $uuid $query
+      dict set query http HTTP_STATUS 404
+      dict set query template notfound
+      dict set query mixin reply ::httpd::content.template
+    }
+    try {
+      set pageobj [::httpd::reply create ::httpd::object::$uuid [self]]
+      dict set reply mixin protocol ::httpd::protocol.scgi
+      $pageobj dispatch $sock $reply
+    } on error {err errdat} {
+      my debug [list ip: $ip error: $err errorinfo: [dict get $errdat -errorinfo]]
+      my log BadRequest $uuid [list ip: $ip error: $err errorinfo: [dict get $errdat -errorinfo]]
+      $pageobj clay refcount_decr
+      catch {chan event readable $sock {}}
+      catch {chan event writeable $sock {}}
+      catch {chan close $sock}
+      return
+    }
+  }
+}
+
+###
+# END: scgi.tcl
+###
+###
+# START: websocket.tcl
+###
+::clay::define ::httpd::content.websocket {
+}
+
+###
+# END: websocket.tcl
+###
+###
+# START: plugin.tcl
+###
+::clay::define ::httpd::plugin {
+  clay set plugin/ load {}
+  clay set plugin/ headers {}
+  clay set plugin/ dispatch {}
+  clay set plugin/ local_config {}
+  clay set plugin/ thread {}
+}
+::clay::define ::httpd::plugin.dict_dispatch {
+  clay set plugin/ dispatch {
+    set reply [my Dispatch_Dict $data]
+    if {[dict size $reply]} {
+      return $reply
+    }
+  }
+  method Dispatch_Dict {data} {
+    my variable url_patterns
+    set vhost [lindex [split [dict get $data http HTTP_HOST] :] 0]
+    set uri   [dict get $data http REQUEST_PATH]
+    foreach {host hostpat} $url_patterns {
+      if {![string match $host $vhost]} continue
+      foreach {pattern info} $hostpat {
+        if {![string match $pattern $uri]} continue
+        set buffer $data
+        foreach {f v} $info {
+          dict set buffer $f $v
+        }
+        return $buffer
+      }
+    }
+    return {}
+  }
+  Ensemble uri::add {vhosts patterns info} {
+    my variable url_patterns
+    foreach vhost $vhosts {
+      foreach pattern $patterns {
+        set data $info
+        if {![dict exists $data prefix]} {
+           dict set data prefix [my PrefixNormalize $pattern]
+        }
+        dict set url_patterns $vhost [string trimleft $pattern /] $data
+      }
+    }
+  }
+  Ensemble uri::direct {vhosts patterns info body} {
+    my variable url_patterns url_stream
+    set cbody {}
+    if {[dict exists $info superclass]} {
+      append cbody \n "superclass {*}[dict get $info superclass]"
+      dict unset info superclass
+    }
+    append cbody \n [list method content {} $body]
+
+    set class [namespace current]::${vhosts}/${patterns}
+    set class [string map {* %} $class]
+    ::clay::define $class $cbody
+    dict set info mixin content $class
+    my uri add $vhosts $patterns $info
+  }
+}
+::clay::define ::httpd::reply.memchan {
+  superclass ::httpd::reply
+  method output {} {
+    my variable reply_body
+    return $reply_body
+  }
+  method DoOutput {} {}
+  method close {} {
+    # Neuter the channel closing mechanism we need the channel to stay alive
+    # until the reader sucks out the info
+  }
+}
+::clay::define ::httpd::plugin.local_memchan {
+  clay set plugin/ load {
+package require tcl::chan::events
+package require tcl::chan::memchan
+  }
+  method local_memchan {command args} {
+    my variable sock_to_coro
+    switch $command {
+      geturl {
+        ###
+        # Hook to allow a local process to ask for data without a socket
+        ###
+        set uuid [my Uuid_Generate]
+        set ip 127.0.0.1
+        set sock [::tcl::chan::memchan]
+        set output [coroutine ::httpd::coro::$uuid {*}[namespace code [list my Connect_Local $uuid $sock GET {*}$args]]]
+        return $output
+      }
+      default {
+        error "Valid: connect geturl"
+      }
+    }
+  }
+  method Connect_Local {uuid sock args} {
+    chan event $sock readable {}
+
+    chan configure $sock \
+      -blocking 0 \
+      -translation {auto crlf} \
+      -buffering line
+    set ip 127.0.0.1
+    dict set query UUID $uuid
+    dict set query http UUID $uuid
+    dict set query http HTTP_HOST       localhost
+    dict set query http REMOTE_ADDR     127.0.0.1
+    dict set query http REMOTE_HOST     localhost
+    dict set query http LOCALHOST 1
+    my counter url_hit
+
+    dict set query http REQUEST_METHOD  [lindex $args 0]
+    set uriinfo [::uri::split [lindex $args 1]]
+    dict set query http REQUEST_URI     [lindex $args 1]
+    dict set query http REQUEST_PATH    [dict get $uriinfo path]
+    dict set query http REQUEST_VERSION [lindex [split [lindex $args end] /] end]
+    dict set query http DOCUMENT_ROOT   [my clay get server/ doc_root]
+    dict set query http QUERY_STRING    [dict get $uriinfo query]
+    dict set query http REQUEST_RAW     $args
+    dict set query http SERVER_PORT     [my port_listening]
+    my Headers_Process query
+    set reply [my dispatch $query]
+
+    if {[llength $reply]==0} {
+      my log BadLocation $uuid $query
+      my log BadLocation $uuid $query
+      dict set query http HTTP_STATUS 404
+      dict set query template notfound
+      dict set query mixin reply ::httpd::content.template
+    }
+
+    set class ::httpd::reply.memchan
+    set pageobj [$class create ::httpd::object::$uuid [self]]
+    if {[dict exists $reply mixin]} {
+      set mixinmap [dict get $reply mixin]
+    } else {
+      set mixinmap {}
+    }
+    foreach item [dict keys $reply MIXIN_*] {
+      set slot [string range $reply 6 end]
+      dict set mixinmap [string tolower $slot] [dict get $reply $item]
+    }
+    $pageobj clay mixinmap {*}$mixinmap
+    if {[dict exists $reply delegate]} {
+      $pageobj clay delegate {*}[dict get $reply delegate]
+    }
+    $pageobj dispatch $sock $reply
+    set output [$pageobj output]
+    $pageobj clay refcount_decr
+    return $output
+  }
+}
+
+###
+# END: plugin.tcl
+###
+###
+# START: cuneiform.tcl
+###
+
+###
+# END: cuneiform.tcl
+###
+
+    namespace eval ::httpd {
+	namespace export *
+    }
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/httpd/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/httpd/pkgIndex.tcl
new file mode 100644
index 00000000..f577e8bb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/httpd/pkgIndex.tcl
@@ -0,0 +1,4 @@
+
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+package ifneeded httpd 4.3.5 [list source [file join $dir httpd.tcl]]
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/httpwget/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/httpwget/pkgIndex.tcl
new file mode 100644
index 00000000..9ffd3457
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/httpwget/pkgIndex.tcl
@@ -0,0 +1,11 @@
+# Tcl package index file, version 1.1
+# This file is generated by the "pkg_mkIndex" command
+# and sourced either when an application starts up or
+# by a "package unknown" script.  It invokes the
+# "package ifneeded" command to set up package-related
+# information so that packages will be loaded automatically
+# in response to "package require" commands.  When this
+# script is sourced, the variable $dir must contain the
+# full path name of this file's directory.
+
+package ifneeded http::wget 0.1 [list source [file join $dir wget.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/httpwget/wget.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/httpwget/wget.tcl
new file mode 100644
index 00000000..7c060990
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/httpwget/wget.tcl
@@ -0,0 +1,54 @@
+###
+# Tool to download file from the web
+# Enhacements to http
+###
+package provide http::wget 0.1
+package require http
+
+::namespace eval ::http {}
+
+###
+# topic: 1ed971e03ae89415e2f25d20e59b765c
+# description: this proc contributed by Donal Fellows
+###
+proc ::http::_followRedirects {url args} {
+    while 1 {
+        set token [geturl $url -validate 1]
+        set ncode [ncode $token]
+        if { $ncode eq "404" } {
+          error "URL Not found"
+        }
+        switch -glob $ncode {
+            30[1237] {### redirect - see below ###}
+            default  {cleanup $token ; return $url}
+        }
+        upvar #0 $token state
+        array set meta [set ${token}(meta)]
+        cleanup $token
+        if {![info exists meta(Location)]} {
+           return $url
+        }
+        set url $meta(Location)
+        unset meta
+    }
+    return $url
+}
+
+###
+# topic: fced7bc395596569ac225a719c686dcc
+###
+proc ::http::wget {url destfile {verbose 1}} {
+    set tmpchan [open $destfile w]
+    fconfigure $tmpchan -translation binary
+    if { $verbose } {
+        puts [list  GETTING [file tail $destfile] from $url]
+    }
+    set real_url [_followRedirects $url]
+    set token [geturl $real_url -channel $tmpchan -binary yes]
+    if {[ncode $token] != "200"} {
+      error "DOWNLOAD FAILED"
+    }
+    cleanup $token
+    close $tmpchan
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ident/ident.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ident/ident.tcl
new file mode 100644
index 00000000..72e0c7cd
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ident/ident.tcl
@@ -0,0 +1,90 @@
+# ident.tcl --
+#
+#	Implemetation of the client side of the ident protocol.
+#	See RFC 1413 for details on the protocol.
+#
+# Copyright (c) 2004 Reinhard Max <max@tclers.tk>
+#
+# -------------------------------------------------------------------------
+# This software 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 file 'license.terms' for
+# more details.
+# -------------------------------------------------------------------------
+# RCS: @(#) $Id: ident.tcl,v 1.2 2004/07/12 14:01:04 patthoyts Exp $
+
+package provide ident 0.42
+
+namespace eval ident {
+    namespace export query configure
+}
+
+proc ident::parse {string} {
+
+    # remove all white space for easier parsing
+    regsub -all {\s} $string "" s
+    if {[regexp {^\d+,\d+:(\w+):(.*)} $s -> resptype addinfo]} {
+	switch -exact -- $resptype {
+	    USERID {
+		if { [regexp {^([^,]+)(,([^:]+))?:} \
+			  $addinfo -> opsys . charset]
+		 } then {
+		    # get the user-if from the original string, because it
+		    # is allowed to contain white space.
+		    set index [string last : $string]
+		    incr index
+		    set userid [string range $string $index end]
+		    if {$charset != ""} {
+			set (user-id) \
+			    [encoding convertfrom $charset $userid]
+		    }
+		    set answer [list resp-type USERID opsys $opsys \
+				    user-id $userid]
+		}
+	    }
+	    ERROR {
+		set answer [list resp-type ERROR error $addinfo]
+	    }
+	}
+    }
+    if {![info exists answer]} {
+	set answer [list resp-type FATAL \
+			error "Unexpected response:\"$string\""]
+    }
+    return $answer
+}
+
+proc ident::Callback {sock command} {
+    gets $sock answer
+    close $sock
+    lappend command [parse $answer]
+    eval $command
+}
+
+proc ident::query {socket {command {}}} {
+
+    foreach {sock_ip sock_host sock_port} [fconfigure $socket -sockname] break
+    foreach {peer_ip peer_host peer_port} [fconfigure $socket -peername] break
+    
+    set blocking [string equal $command ""]
+    set failed [catch {socket $peer_ip ident} sock]
+    if {$failed} {
+	set result [list resp-type FATAL error $sock]
+	if {$blocking} {
+	    return $result
+	} else {
+	    after idle [list $command $result]
+	    return
+	}
+    }
+    fconfigure $sock -encoding binary -buffering line -blocking $blocking
+    puts $sock "$peer_port,$sock_port"
+    if {$blocking} {
+	gets $sock answer
+	close $sock
+	return [parse $answer]
+    } else {
+	fileevent $sock readable \
+	    [namespace code [list Callback $sock $command]]
+    }    
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ident/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ident/pkgIndex.tcl
new file mode 100644
index 00000000..1ffdeb07
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ident/pkgIndex.tcl
@@ -0,0 +1,13 @@
+# Tcl package index file, version 1.1
+# This file is generated by the "pkg_mkIndex" command
+# and sourced either when an application starts up or
+# by a "package unknown" script.  It invokes the
+# "package ifneeded" command to set up package-related
+# information so that packages will be loaded automatically
+# in response to "package require" commands.  When this
+# script is sourced, the variable $dir must contain the
+# full path name of this file's directory.
+
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded ident 0.42 [list source [file join $dir ident.tcl]]
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/imap4/imap4.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/imap4/imap4.tcl
new file mode 100644
index 00000000..460c065f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/imap4/imap4.tcl
@@ -0,0 +1,1382 @@
+# IMAP4 protocol pure Tcl implementation.
+#
+# COPYRIGHT AND PERMISSION NOTICE
+#
+# Copyright (C) 2004 Salvatore Sanfilippo <antirez@invece.org>.
+# Copyright (C) 2013 Nicola Hall <nicci.hall@gmail.com>
+# Copyright (C) 2013 Magnatune <magnatune@users.sourceforge.net>
+#
+# All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+
+# TODO
+# - Idle mode
+# - Async mode
+# - Authentications
+# - Literals on file mode
+# - fix OR in search, and implement time-related searches
+# All the rest... see the RFC
+
+# History
+#   20100623: G. Reithofer, creating tcl package 0.1, adding some todos
+#             option -inline for ::imap4::fetch, in order to return data as a Tcl list
+#             isableto without arguments returns the capability list
+#             implementation of LIST command
+#   20100709: Adding suppport for SSL connections, namespace variable
+#             use_ssl must be set to 1 and package TLS must be loaded
+#   20100716: Bug in parsing special leading FLAGS characters in FETCH
+#             command repaired, documentation cleanup.
+#   20121221: Added basic scope, expunge and logout function
+#   20130212: Added basic copy function
+#   20130212: Missing chan parameter added to all imaptotcl* procs -ger
+
+package require Tcl 8.5
+package provide imap4 0.5.3
+
+namespace eval imap4 {
+    variable debugmode 0     ;# inside debug mode? usually not.
+    variable folderinfo
+    variable mboxinfo
+    variable msginfo
+    variable info
+
+    # if set to 1 tls::socket must be loaded
+    variable use_ssl 0
+    
+    # Debug mode? Don't use it for production! It will print debugging
+    # information to standard output and run a special IMAP debug mode shell
+    # on protocol error.
+    variable debug 0
+
+    # Version
+    variable version "2013-02-12"
+
+    # This is where we take state of all the IMAP connections.
+    # The following arrays are indexed with the connection channel
+    # to access the per-channel information.
+    array set folderinfo {}  ;# list of folders.
+    array set mboxinfo {}    ;# selected mailbox info.
+    array set msginfo {}     ;# messages info.
+    array set info {}        ;# general connection state info.
+
+    # Return the next tag to use in IMAP requests.
+    proc tag {chan} {
+        variable info
+        incr info($chan,curtag)
+    }
+
+    # Assert that the channel is one of the specified states
+    # by the 'states' list.
+    # otherwise raise an error.
+    proc requirestate {chan states} {
+        variable info
+        if {[lsearch $states $info($chan,state)] == -1} {
+            error "IMAP channel not in one of the following states: '$states' (current state is '$info($chan,state)')"
+        }
+    }
+
+    # Open a new IMAP connection and initalize the handler.
+    proc open {hostname {port 0}} {
+        variable info
+        variable debug
+        variable use_ssl 
+        if {$debug} {
+            puts "I: open $hostname $port (SSL=$use_ssl)"
+        }
+        
+        if {$use_ssl} {
+            if {[info procs ::tls::socket] eq ""} {
+                error "Package TLS must be loaded for secure connections."
+            }
+            if {!$port} {
+                set port 993
+            }
+            set chan [::tls::socket $hostname $port]
+        } else {
+            if {!$port} {
+                set port 143
+            }
+            set chan [socket $hostname $port]
+        }
+        fconfigure $chan -encoding binary -translation binary
+        # Intialize the connection state array
+        initinfo $chan
+        # Get the banner
+        processline $chan
+        # Save the banner
+        set info($chan,banner) [lastline $chan]
+        return $chan
+    }
+
+    # Initialize the info array for a new connection.
+    proc initinfo {chan} {
+        variable info
+        set info($chan,curtag) 0
+        set info($chan,state) NOAUTH
+        set info($chan,folders) {}
+        set info($chan,capability) {}
+        set info($chan,raise_on_NO) 1
+        set info($chan,raise_on_BAD) 1
+        set info($chan,idle) {}
+        set info($chan,lastcode) {}
+        set info($chan,lastline) {}
+        set info($chan,lastrequest) {}
+    }
+
+    # Destroy an IMAP connection and free the used space.
+    proc cleanup {chan} {
+        variable info
+        variable folderinfo
+        variable mboxinfo
+        variable msginfo
+
+        ::close $chan
+
+        array unset folderinfo $chan,*
+        array unset mboxinfo $chan,*
+        array unset msginfo $chan,*
+        array unset info $chan,*
+
+        return $chan
+    }
+
+    # STARTTLS
+    # This is a new procc added to runs the STARTTLS command.  Use
+    # this when tasked with connecting to an unsecure port which must
+    # be changed to a secure port prior to user login.  This feature
+    # is known as STARTTLS.
+
+    proc starttls {chan} {                                  
+	#puts "Starting TLS"                          
+	request $chan "STARTTLS"
+	if {[getresponse $chan]} {
+	    #puts "error sending STARTTLS"
+	    return 1
+	}
+                               
+	#puts "TLS import"
+	set chan [::tls::import $chan -tls1 1]
+	#puts "TLS handshake"
+	set chan [::tls::handshake $chan]            
+        return 0
+    }
+
+    # Returns the last error code received.
+    proc lastcode {chan} {
+        variable info
+        return $info($chan,lastcode)
+    }
+
+    # Returns the last line received from the server.
+    proc lastline {chan} {
+        variable info
+        return $info($chan,lastline)
+    }
+
+    # Process an IMAP response line.
+    # This function trades semplicity in IMAP commands
+    # implementation with monolitic handling of responses.
+    # However note that the IMAP server can reply to a command
+    # with many different untagged info, so to have the reply
+    # processing centralized makes this simple to handle.
+    #
+    # Returns the line's tag.
+    proc processline {chan} {
+        variable info
+        variable debug
+        variable mboxinfo
+        variable folderinfo
+
+        set literals {}
+        while {1} {
+            # Read a line
+            if {[gets $chan buf] == -1} {
+                error "IMAP unexpected EOF from server."
+            }
+
+            append line $buf
+            # Remove the trailing CR at the end of the line, if any.
+            if {[string index $line end] eq "\r"} {
+                set line [string range $line 0 end-1]
+            }
+
+            # Check if there is a literal to read, and read it if any.
+            if {[regexp {{([0-9]+)}\s+$} $buf => length]} {
+                # puts "Reading $length bytes of literal..."
+                lappend literals [read $chan $length]
+            } else {
+                break
+            }
+        }
+        set info($chan,lastline) $line
+
+        if {$debug} {
+            puts "S: $line"
+        }
+
+        # Extract the tag.
+        set idx [string first { } $line]
+        if {$idx <= 0} {
+            protoerror $chan "IMAP: malformed response '$line'"
+        }
+
+        set tag [string range $line 0 [expr {$idx-1}]]
+        set line [string range $line [expr {$idx+1}] end]
+        # If it's just a command continuation response, return.
+        if {$tag eq {+}} {return +}
+
+        # Extract the error code, if it's a tagged line
+        if {$tag ne "*"} {
+            set idx [string first { } $line]
+            if {$idx <= 0} {
+                protoerror $chan "IMAP: malformed response '$line'"
+            }
+            set code [string range $line 0 [expr {$idx-1}]]
+            set line [string trim [string range $line [expr {$idx+1}] end]]
+            set info($chan,lastcode) $code
+        }
+
+        # Extract information from the line
+        set dirty 0
+        switch -glob -- $line {
+            {*\[READ-ONLY\]*} {set mboxinfo($chan,perm) READ-ONLY; incr dirty}
+            {*\[READ-WRITE\]*} {set mboxinfo($chan,perm) READ-WRITE; incr dirty}
+            {*\[TRYCREATE\]*} {set mboxinfo($chan,perm) TRYCREATE; incr dirty}
+            {LIST *(*)*} {
+                # regexp not secure enough ... delimiters must be PLAIN SPACES (see RFC)
+                # set res [regexp {LIST (\(.*\))(!?\s)[ ](.*)$} $line => flags delim fname]
+                #    p1|       p2|  p3|
+                # LIST (\Noselect) "/" ~/Mail/foo
+                set p1 [string first "(" $line]
+                set p2 [string first ")" $line [expr {$p1+1}]]
+                set p3 [string first " " $line [expr {$p2+2}]]
+                if {$p1<0||$p2<0||$p3<0} {
+                    protoerror $chan "IMAP: Not a valid RFC822 LIST format in '$line'"
+                }
+                set flags [string range $line [expr {$p1+1}] [expr {$p2-1}]]
+                set delim [string range $line [expr {$p2+2}] [expr {$p3-1}]]
+                set fname [string range $line [expr {$p3+1}] end]
+                if {$fname eq ""} {
+                    set folderinfo($chan,delim) [string trim $delim "\""]
+                } else {
+                    set fflag {}
+                    foreach f [split $flags] {
+                        lappend fflag $f
+                    }
+                    lappend folderinfo($chan,names) $fname
+                    lappend folderinfo($chan,flags) [list $fname $fflag]
+                    if {$delim ne "NIL"} {
+                        set folderinfo($chan,delim) [string trim $delim "\""]
+                    }
+                }
+                incr dirty
+            }
+            {FLAGS *(*)*} {
+                regexp {.*\((.*)\).*} $line => flags
+                set mboxinfo($chan,flags) $flags
+                incr dirty
+            }
+            {*\[PERMANENTFLAGS *(*)*\]*} {
+                regexp {.*\[PERMANENTFLAGS \((.*)\).*\].*} $line => flags
+                set mboxinfo($chan,permflags) $flags
+                incr dirty
+            }
+        }
+
+        if {!$dirty && $tag eq {*}} {
+            switch -regexp  -nocase -- $line {
+                {^[0-9]+\s+EXISTS} {
+                    regexp {^([0-9]+)\s+EXISTS} $line => mboxinfo($chan,exists)
+                    incr dirty
+                }
+                {^[0-9]+\s+RECENT} {
+                    regexp {^([0-9]+)\s+RECENT} $line => mboxinfo($chan,recent)
+                    incr dirty
+                }
+                {.*?\[UIDVALIDITY\s+[0-9]+?\]} {
+                    regexp {.*?\[UIDVALIDITY\s+([0-9]+?)\]} $line => \
+                        mboxinfo($chan,uidval)
+                    incr dirty
+                }
+                {.*?\[UNSEEN\s+[0-9]+?\]} {
+                    regexp {.*?\[UNSEEN\s+([0-9]+?)\]} $line => \
+                        mboxinfo($chan,unseen)
+                    incr dirty
+                }
+                {.*?\[UIDNEXT\s+[0-9]+?\]} {
+                    regexp {.*?\[UIDNEXT\s+([0-9]+?)\]} $line => \
+                        mboxinfo($chan,uidnext)
+                    incr dirty
+                }
+                {^[0-9]+\s+FETCH} {
+                    processfetchline $chan $line $literals
+                    incr dirty
+                }
+                {^CAPABILITY\s+.*} {
+                    regexp {^CAPABILITY\s+(.*)\s*$} $line => capstring
+                    set info($chan,capability) [split [string toupper $capstring]]
+                    incr dirty
+                }
+                {^LIST\s*$} {
+                    regexp {^([0-9]+)\s+EXISTS} $line => mboxinfo($chan,exists)
+                    incr dirty
+                }
+                {^SEARCH\s*$} {
+                    # Search tag without list of messages. Nothing found
+                    # so we set an empty list.
+                    set mboxinfo($chan,found) {}
+                }
+                {^SEARCH\s+.*} {
+                    regexp {^SEARCH\s+(.*)\s*$} $line => foundlist
+                    set mboxinfo($chan,found) $foundlist
+                    incr dirty
+                }
+                default {
+                    if {$debug} {
+                        puts "*** WARNING: unprocessed server reply '$line'"
+                    }
+                }
+            }
+        }
+
+        if {[string length [set info($chan,idle)]] && $dirty} {
+            # ... Notify.
+        }
+
+        # if debug and no dirty and untagged line... warning: unprocessed IMAP line
+        return $tag
+    }
+
+    # Process untagged FETCH lines.
+    proc processfetchline {chan line literals} {
+        variable msginfo
+        regexp -nocase {([0-9]+)\s+FETCH\s+(\(.*\))} $line => msgnum items
+        foreach {name val} [imaptotcl $chan items literals] {
+            set attribname [switch -glob -- [string toupper $name] {
+                INTERNALDATE {format internaldate}
+                BODYSTRUCTURE {format bodystructure}
+                {BODY\[HEADER.FIELDS*\]} {format fields}
+                {BODY.PEEK\[HEADER.FIELDS*\]} {format fields}
+                {BODY\[*\]} {format body}
+                {BODY.PEEK\[*\]} {format body}
+                HEADER {format header}
+                RFC822.HEADER {format header}
+                RFC822.SIZE {format size}
+                RFC822.TEXT {format text}
+                ENVELOPE {format envelope}
+                FLAGS {format flags}
+                UID {format uid}
+                default {
+                    protoerror $chan "IMAP: Unknown FETCH item '$name'. Upgrade the software"
+                }
+            }]
+
+            switch -- $attribname {
+                fields {
+                    set last_fieldname __garbage__
+                    foreach f [split $val "\n\r"] {
+                        # Handle multi-line headers. Append to the last header
+                        # if this line starts with a tab character.
+                        if {[string is space [string index $f 0]]} {
+                            append msginfo($chan,$msgnum,$last_fieldname) " [string range $f 1 end]"
+                            continue
+                        }
+                        # Process the line searching for a new field.
+                        if {![string length $f]} continue
+                        if {[set fnameidx [string first ":" $f]] == -1} {
+                            protoerror $chan "IMAP: Not a valid RFC822 field '$f'"
+                        }
+                        set fieldname [string tolower [string range $f 0 $fnameidx]]
+                        set last_fieldname $fieldname
+                        set fieldval [string trim \
+                            [string range $f [expr {$fnameidx+1}] end]]
+                        set msginfo($chan,$msgnum,$fieldname) $fieldval
+                    }
+                }
+                default {
+                    set msginfo($chan,$msgnum,$attribname) $val
+                }
+            }
+            #puts "$attribname -> [string range $val 0 20]"
+        }
+        # parray msginfo
+    }
+
+    # Convert IMAP data into Tcl data. Consumes the part of the
+    # string converted.
+    # 'literals' is a list with all the literals extracted
+    # from the original line, in the same order they appeared.
+    proc imaptotcl {chan datavar literalsvar} {
+        upvar 1 $datavar data $literalsvar literals
+        set data [string trim $data]
+        switch -- [string index $data 0] {
+            \{ {imaptotcl_literal $chan data literals}
+            "(" {imaptotcl_list $chan data literals}
+            "\"" {imaptotcl_quoted $chan data}
+            0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 {imaptotcl_number $chan data}
+            \) {imaptotcl_endlist $chan data;# that's a trick to parse lists}
+            default {imaptotcl_symbol $chan data}
+        }
+    }
+
+    # Extract a literal
+    proc imaptotcl_literal {chan datavar literalsvar} {
+        upvar 1 $datavar data $literalsvar literals
+        if {![regexp {{.*?}} $data match]} {
+            protoerror $chan "IMAP data format error: '$data'"
+        }
+        set data [string range $data [string length $match] end]
+        set retval [lindex $literals 0]
+        set literals [lrange $literals 1 end]
+        return $retval
+    }
+
+    # Extract a quoted string
+    proc imaptotcl_quoted {chan datavar} {
+        upvar 1 $datavar data
+        if {![regexp "\\s*?(\".*?\[^\\\\\]\"|\"\")\\s*?" $data => match]} {
+            protoerror $chan "IMAP data format error: '$data'"
+        }
+        set data [string range $data [string length $match] end]
+        return [string range $match 1 end-1]
+    }
+
+    # Extract a number
+    proc imaptotcl_number {chan datavar} {
+        upvar 1 $datavar data
+        if {![regexp {^[0-9]+} $data match]} {
+            protoerror $chan "IMAP data format error: '$data'"
+        }
+        set data [string range $data [string length $match] end]
+        return $match
+    }
+
+    # Extract a "symbol". Not really exists in IMAP, but there
+    # are named items, and this names have a strange unquoted
+    # syntax like BODY[HEAEDER.FIELD (From To)] and other stuff
+    # like that.
+    proc imaptotcl_symbol {chan datavar} {
+        upvar 1 $datavar data
+        # matching patterns: "BODY[HEAEDER.FIELD",
+        # "HEAEDER.FIELD", "\Answered", "$Forwarded"
+        set pattern {([\w\.]+\[[^\[]+\]|[\w\.]+|[\\\$]\w+)}
+        if {![regexp $pattern $data => match]} {
+            protoerror $chan "IMAP data format error: '$data'"
+        }
+        set data [string range $data [string length $match] end]
+        return $match
+    }
+
+    # Extract an IMAP list.
+    proc imaptotcl_list {chan datavar literalsvar} {
+        upvar 1 $datavar data $literalsvar literals
+        set list {}
+        # Remove the first '(' char
+        set data [string range $data 1 end]
+        # Get all the elements of the list. May indirectly recurse called
+        # by [imaptotcl].
+        while {[string length $data]} {
+            set ele [imaptotcl $chan data literals]
+            if {$ele eq {)}} {
+                break
+            }
+            lappend list $ele
+        }
+        return $list
+    }
+
+    # Just extracts the ")" character alone.
+    # This is actually part of the list extraction work.
+    proc imaptotcl_endlist {chan datavar} {
+        upvar 1 $datavar data
+        set data [string range $data 1 end]
+        return ")"
+    }
+
+    # Process IMAP responses. If the IMAP channel is not
+    # configured to raise errors on IMAP errors, returns 0
+    # on OK response, otherwise 1 is returned.
+    proc getresponse {chan} {
+        variable info
+
+        # Process lines until the tagged one.
+        while {[set tag [processline $chan]] eq {*} || $tag eq {+}} {}
+        switch -- [lastcode $chan] {
+            OK {return 0}
+            NO {
+                if {$info($chan,raise_on_NO)} {
+                    error "IMAP error: [lastline $chan]"
+                }
+                return 1
+            }
+            BAD {
+                if {$info($chan,raise_on_BAD)} {
+                    protoerror $chan "IMAP error: [lastline $chan]"
+                }
+                return 1
+            }
+            default {
+                protoerror $chan "IMAP protocol error. Unknown response code '[lastcode $chan]'"
+            }
+        }
+    }
+
+    # Write a request.
+    proc request {chan request} {
+        variable debug
+        variable info
+
+        set t "[tag $chan] [string trim $request]"
+        if {$debug} {
+            puts "C: $t"
+        }
+        set info($chan,lastrequest) $t
+        puts -nonewline $chan "$t\r\n"
+        flush $chan
+    }
+
+    # Write a multiline request. The 'request' list must contain
+    # parts of command and literals interleaved. Literals are ad odd
+    # list positions (1, 3, ...).
+    proc multiline_request {chan request} {
+        variable debug
+        variable info
+
+        lset request 0 "[tag $chan][lindex $request 0]"
+        set items [llength $request]
+        foreach {line literal} $request {
+            # Send the line
+            if {$debug} {
+                puts "C: $line"
+            }
+            puts -nonewline $chan "$line\r\n"
+            flush $chan
+            incr items -1
+            if {!$items} break
+
+            # Wait for the command continuation response
+            if {[processline $chan] ne {+}} {
+                protoerror $chan "Expected a command continuation response but got '[lastline $chan]'"
+            }
+
+            # Send the literal
+            if {$debug} {
+                puts "C> $literal"
+            }
+            puts -nonewline $chan $literal
+            flush $chan
+            incr items -1
+        }
+        set info($chan,lastrequest) $request
+    }
+
+    # Login using the IMAP LOGIN command.
+    proc login {chan user pass} {
+        variable info
+
+        requirestate $chan NOAUTH
+        request $chan "LOGIN $user $pass"
+        if {[getresponse $chan]} {
+            return 1
+        }
+        set info($chan,state) AUTH
+        return 0
+    }
+
+    # Mailbox selection.
+    proc select {chan {mailbox INBOX}} {
+        selectmbox $chan SELECT $mailbox
+    }
+
+    # Read-only equivalent of SELECT.
+    proc examine {chan {mailbox INBOX}} {
+        selectmbox $chan EXAMINE $mailbox
+    }
+
+    # General function for selection.
+    proc selectmbox {chan cmd mailbox} {
+        variable info
+        variable mboxinfo
+
+        requirestate $chan AUTH
+        # Clean info about the previous mailbox if any,
+        # but save a copy to restore this info on error.
+        set savedmboxinfo [array get mboxinfo $chan,*]
+        array unset mboxinfo $chan,*
+        request $chan "$cmd $mailbox"
+        if {[getresponse $chan]} {
+            array set mboxinfo $savedmboxinfo
+            return 1
+        }
+
+        set info($chan,state) SELECT
+        # Set the new name as mbox->current.
+        set mboxinfo($chan,current) $mailbox
+        return 0
+    }
+
+    # Parse an IMAP range, store 'start' and 'end' in the
+    # named vars. If the first number of the range is omitted,
+    # 1 is assumed. If the second number of the range is omitted,
+    # the value of "exists" of the current mailbox is assumed.
+    #
+    # So : means all the messages.
+    proc parserange {chan range startvar endvar} {
+
+        upvar $startvar start $endvar end
+        set rangelist [split $range :]
+        switch -- [llength $rangelist] {
+            1 {
+                if {![string is integer $range]} {
+                    error "Invalid range"
+                }
+                set start $range
+                set end $range
+            }
+            2 {
+                foreach {start end} $rangelist break
+                if {![string length $start]} {
+                    set start 1
+                }
+                if {![string length $end]} {
+                    set end [mboxinfo $chan exists]
+                }
+                if {![string is integer $start] || ![string is integer $end]} {
+                    error "Invalid range"
+                }
+            }
+            default {
+                error "Invalid range"
+            }
+        }
+    }
+
+    # Fetch a number of attributes from messages
+    proc fetch {chan range opt args} {
+        if {$opt eq "-inline"} {
+            set inline 1
+        } else {
+            set inline 0
+            set args [linsert $args 0 $opt]
+        }
+        requirestate $chan SELECT
+        parserange $chan $range start end
+
+        set items {}
+        set hdrfields {}
+        foreach w $args {
+            switch -glob -- [string toupper $w] {
+                ALL {lappend items ALL}
+                BODYSTRUCTURE {lappend items BODYSTRUCTURE}
+                ENVELOPE {lappend items ENVELOPE}
+                FLAGS {lappend items FLAGS}
+                SIZE {lappend items RFC822.SIZE}
+                TEXT {lappend items RFC822.TEXT}
+                HEADER {lappend items RFC822.HEADER}
+                UID {lappend items UID}
+                *: {lappend hdrfields $w}
+                default {
+                    # Fixme: better to raise an error here?
+                    lappend hdrfields $w:
+                }
+            }
+        }
+
+        if {[llength $hdrfields]} {
+            set item {BODY[HEADER.FIELDS (}
+            foreach field $hdrfields {
+                append item [string toupper [string range $field 0 end-1]] { }
+            }
+            set item [string range $item 0 end-1]
+            append item {)]}
+            lappend items $item
+        }
+
+        # Send the request
+        request $chan "FETCH $start:$end ([join $items])"
+        if {[getresponse $chan]} {
+            if {$inline} {
+                # Should we throw an error here?
+                return ""
+            }
+            return 1
+        }
+
+        if {!$inline} {
+            return 0
+        }
+
+        # -inline procesing begins here
+        set mailinfo {}
+        for {set i $start} {$i <= $end} {incr i} {
+            set mailrec {}
+            foreach {h} $args {
+                lappend mailrec [msginfo $chan $i $h ""]
+            }
+            lappend mailinfo $mailrec
+        }
+        return $mailinfo
+    }
+
+    # Get information (previously collected using fetch) from a given message.
+    # If the 'info' argument is omitted or a null string, the full list
+    # of information available for the given message is returned.
+    #
+    # If the required information name is suffixed with a ? character,
+    # the command requires true if the information is available, or
+    # false if it is not.
+    proc msginfo {chan msgid args} {
+        variable msginfo
+
+        switch -- [llength $args] {
+            0 {
+                set info {}
+            }
+            1 {
+                set info [lindex $args 0]
+                set use_defval 0
+            }
+            2 {
+                set info [lindex $args 0]
+                set defval [lindex $args 1]
+                set use_defval 1
+            }
+            default {
+                error "msginfo called with bad number of arguments! Try msginfo channel messageid ?info? ?defaultvalue?"
+            }
+        }
+        set info [string tolower $info]
+        # Handle the missing info case
+        if {![string length $info]} {
+            set list [array names msginfo $chan,$msgid,*]
+            set availinfo {}
+            foreach l $list {
+                lappend availinfo [string range $l \
+                    [string length $chan,$msgid,] end]
+            }
+            return $availinfo
+        }
+
+        if {[string index $info end] eq {?}} {
+            set info [string range $info 0 end-1]
+            return [info exists msginfo($chan,$msgid,$info)]
+        } else {
+            if {![info exists msginfo($chan,$msgid,$info)]} {
+                if {$use_defval} {
+                    return $defval
+                } else {
+                    error "No such information '$info' available for message id '$msgid'"
+                }
+            }
+            return $msginfo($chan,$msgid,$info)
+        }
+    }
+
+    # Get information on the currently selected mailbox.
+    # If the 'info' argument is omitted or a null string, the full list
+    # of information available for the mailbox is returned.
+    #
+    # If the required information name is suffixed with a ? character,
+    # the command requires true if the information is available, or
+    # false if it is not.
+    proc mboxinfo {chan {info {}}} {
+        variable mboxinfo
+
+        # Handle the missing info case
+        if {![string length $info]} {
+            set list [array names mboxinfo $chan,*]
+            set availinfo {}
+            foreach l $list {
+                lappend availinfo [string range $l \
+                    [string length $chan,] end]
+            }
+            return $availinfo
+        }
+
+        set info [string tolower $info]
+        if {[string index $info end] eq {?}} {
+            set info [string range $info 0 end-1]
+            return [info exists mboxinfo($chan,$info)]
+        } else {
+            if {![info exists mboxinfo($chan,$info)]} {
+                error "No such information '$info' available for the current mailbox"
+            }
+            return $mboxinfo($chan,$info)
+        }
+    }
+
+    # Get information on the last folders list.
+    # If the 'info' argument is omitted or a null string, the full list
+    # of information available for the folders is returned.
+    #
+    # If the required information name is suffixed with a ? character,
+    # the command requires true if the information is available, or
+    # false if it is not.
+    proc folderinfo {chan {info {}}} {
+        variable folderinfo
+
+        # Handle the missing info case
+        if {![string length $info]} {
+            set list [array names folderinfo $chan,*]
+            set availinfo {}
+            foreach l $list {
+                lappend availinfo [string range $l \
+                        [string length $chan,] end]
+            }
+            return $availinfo
+        }
+
+        set info [string tolower $info]
+        if {[string index $info end] eq {?}} {
+            set info [string range $info 0 end-1]
+            return [info exists folderinfo($chan,$info)]
+        } else {
+            if {![info exists folderinfo($chan,$info)]} {
+                error "No such information '$info' available for the current folders"
+            }
+            return $folderinfo($chan,$info)
+        }
+    }
+
+
+    # Get capabilties
+    proc capability {chan} {
+        request $chan "CAPABILITY"
+        if {[getresponse $chan]} {
+            return 1
+        }
+        return 0
+    }
+
+    # Get the current state
+    proc state {chan} {
+        variable info
+        return $info($chan,state)
+    }
+
+    # Test for capability. Use the capability command
+    # to ask the server if not already done by the user.
+    proc isableto {chan {capa ""}} {
+        variable info
+
+	set result 0
+        if {![llength $info($chan,capability)]} {
+            set result [capability $chan]
+        }
+
+        if {$capa eq ""} {
+            if {$result} {
+               # We return empty string on error
+               return ""
+            }
+            return $info($chan,capability)
+        }
+
+        set capa [string toupper $capa]
+        expr {[lsearch -exact $info($chan,capability) $capa] != -1}
+    }
+
+    # NOOP command. May get information as untagged data.
+    proc noop {chan} {
+        simplecmd $chan NOOP {NOAUTH AUTH SELECT} {}
+    }
+
+    # CHECK. Flush to disk.
+    proc check {chan} {
+        simplecmd $chan CHECK SELECT {}
+    }
+
+    # Close the mailbox. Permanently removes \Deleted messages and return to
+    # the AUTH state.
+    proc close {chan} {
+        variable info
+
+        if {[simplecmd $chan CLOSE SELECT {}]} {
+            return 1
+        }
+
+        set info($chan,state) AUTH
+        return 0
+    }
+
+    # Create a new mailbox.
+    proc create {chan mailbox} {
+        simplecmd $chan CREATE {AUTH SELECT} $mailbox
+    }
+
+    # Delete a mailbox
+    proc delete {chan mailbox} {
+        simplecmd $chan DELETE {AUTH SELECT} $mailbox
+    }
+
+    # Rename a mailbox
+    proc rename {chan oldname newname} {
+        simplecmd $chan RENAME {AUTH SELECT} $oldname $newname
+    }
+
+    # Subscribe to a mailbox
+    proc subscribe {chan mailbox} {
+        simplecmd $chan SUBSCRIBE {AUTH SELECT} $mailbox
+    }
+
+    # Unsubscribe to a mailbox
+    proc unsubscribe {chan mailbox} {
+        simplecmd $chan UNSUBSCRIBE {AUTH SELECT} $mailbox
+    }
+
+    # List of folders
+    proc folders {chan {opt ""} {ref ""} {mbox "*"}} {
+        variable folderinfo
+        array unset folderinfo $chan,*
+
+        if {$opt eq "-inline"} {
+            set inline 1
+        } else {
+            set ref $opt
+            set mbox $ref
+            set inline 0
+        }
+
+        set folderinfo($chan,match) [list $ref $mbox]
+        # parray folderinfo
+        set rv [simplecmd $chan LIST {SELECT AUTH} \"$ref\" \"$mbox\"]
+        if {$inline} {
+            set rv {}
+            foreach f [folderinfo $chan flags] {
+                set lflags {}
+                foreach fl [lindex $f 1] {
+                    if {[string is alnum [string index $fl 0]]} {
+                        lappend lflags [string tolower $fl]
+                    } else {
+                        lappend lflags [string tolower [string range $fl 1 end]]
+                    }
+                }
+                lappend rv [list [lindex $f 0] $lflags]
+            }
+        }
+        # parray folderinfo
+        return $rv
+    }
+
+    # This a general implementation for a simple implementation
+    # of an IMAP command that just requires to call ::imap4::request
+    # and ::imap4::getresponse.
+    proc simplecmd {chan command validstates args} {
+        requirestate $chan $validstates
+
+        set req "$command"
+        foreach arg $args {
+            append req " $arg"
+        }
+
+        request $chan $req
+        if {[getresponse $chan]} {
+            return 1
+        }
+
+        return 0
+    }
+
+    # Search command.
+    proc search {chan args} {
+        if {![llength $args]} {
+            error "missing arguments. Usage: search chan arg ?arg ...?"
+        }
+
+        requirestate $chan SELECT
+        set imapexpr [convert_search_expr $args]
+        multiline_prefix_command imapexpr "SEARCH"
+        multiline_request $chan $imapexpr
+        if {[getresponse $chan]} {
+            return 1
+        }
+
+        return 0
+    }
+
+    # Creates an IMAP octect-count.
+    # Used to send literals.
+    proc literalcount {string} {
+        return "{[string length $string]}"
+    }
+
+    # Append a command part to a multiline request
+    proc multiline_append_command {reqvar cmd} {
+        upvar 1 $reqvar req
+
+        if {[llength $req] == 0} {
+            lappend req {}
+        }
+
+        lset req end "[lindex $req end] $cmd"
+    }
+
+    # Append a literal to a multiline request. Uses a quoted
+    # string in simple cases.
+    proc multiline_append_literal {reqvar lit} {
+        upvar 1 $reqvar req
+
+        if {![string is alnum $lit]} {
+            lset req end "[lindex $req end] [literalcount $lit]"
+            lappend req $lit {}
+        } else {
+            multiline_append_command req "\"$lit\""
+        }
+    }
+
+    # Prefix a multiline request with a command.
+    proc multiline_prefix_command {reqvar cmd} {
+        upvar 1 $reqvar req
+
+        if {![llength $req]} {
+            lappend req {}
+        }
+
+        lset req 0 " $cmd[lindex $req 0]"
+    }
+
+    # Concat an already created search expression to a multiline request.
+    proc multiline_concat_expr {reqvar expr} {
+        upvar 1 $reqvar req
+        lset req end "[lindex $req end] ([string range [lindex $expr 0] 1 end]"
+        set req [concat $req [lrange $expr 1 end]]
+        lset req end "[lindex $req end])"
+    }
+
+    # Helper for the search command. Convert a programmer friendly expression
+    # (actually a tcl list) to the IMAP syntax. Returns a list composed of
+    # request, literal, request, literal, ... (to be sent with
+    # ::imap4::multiline_request).
+    proc convert_search_expr {expr} {
+        set result {}
+
+        while {[llength $expr]} {
+            switch -glob -- [string toupper [set token [lpop expr]]] {
+                *: {
+                    set wanted [lpop expr]
+                    multiline_append_command result "HEADER [string range $token 0 end-1]"
+                    multiline_append_literal result $wanted
+                }
+
+                ANSWERED - DELETED - DRAFT - FLAGGED - RECENT -
+                SEEN - NEW - OLD - UNANSWERED - UNDELETED -
+                UNDRAFT - UNFLAGGED - UNSEEN -
+                ALL {multiline_append_command result [string toupper $token]}
+
+                BODY - CC - FROM - SUBJECT - TEXT - KEYWORD -
+                BCC {
+                    set wanted [lpop expr]
+                    multiline_append_command result "$token"
+                    multiline_append_literal result $wanted
+                }
+
+                OR {
+                    set first [convert_search_expr [lpop expr]]
+                    set second [convert_search_expr [lpop expr]]
+                    multiline_append_command result "OR"
+                    multiline_concat_expr result $first
+                    multiline_concat_expr result $second
+                }
+
+                NOT {
+                    set e [convert_search_expr [lpop expr]]
+                    multiline_append_command result "NOT"
+                    multiline_concat_expr result $e
+                }
+
+                SMALLER -
+                LARGER {
+                    set len [lpop expr]
+                    if {![string is integer $len]} {
+                        error "Invalid integer follows '$token' in IMAP search"
+                    }
+                    multiline_append_command result "$token $len"
+                }
+
+                ON - SENTBEFORE - SENTON - SENTSINCE - SINCE -
+                BEFORE {error "TODO"}
+
+                UID {error "TODO"}
+                default {
+                    error "Syntax error in search expression: '... $token $expr'"
+                }
+            }
+        }
+        return $result
+    }
+
+    # Pop an element from the list inside the named variable and return it.
+    # If a list is empty, raise an error. The error is specific for the
+    # search command since it's the only one calling this function.
+    proc lpop {listvar} {
+        upvar 1 $listvar l
+
+        if {![llength $l]} {
+            error "Bad syntax for search expression (missing argument)"
+        }
+
+        set res [lindex $l 0]
+        set l [lrange $l 1 end]
+        return $res
+    }
+
+    # Debug mode.
+    # This is a developers mode only that pass the control to the
+    # programmer. Every line entered is sent verbatim to the
+    # server (after the addition of the request identifier).
+    # The ::imap4::debug variable is automatically set to '1' on enter.
+    #
+    # It's possible to execute Tcl commands starting the line
+    # with a slash.
+
+    proc debugmode {chan {errormsg {None}}} {
+        variable debugmode 1
+        variable debugchan $chan
+        variable version
+        variable folderinfo
+        variable mboxinfo
+        variable msginfo
+        variable info
+
+        set welcometext [list \
+                "------------------------ IMAP DEBUG MODE --------------------" \
+                "IMAP Debug mode usage: Every line typed will be sent" \
+                "verbatim to the IMAP server prefixed with a unique IMAP tag." \
+                "To execute Tcl commands prefix the line with a / character." \
+                "The current debugged channel is returned by the \[me\] command." \
+                "Type ! to exit" \
+                "Type 'info' to see information about the connection" \
+                "Type 'help' to display this information" \
+                "" \
+                "Last error: '$errormsg'" \
+                "IMAP library version: '$version'" \
+                "" \
+        ]
+        foreach l $welcometext {
+            puts $l
+        }
+
+        debugmode_info $chan
+        while 1 {
+            puts -nonewline "imap debug> "
+            flush stdout
+            gets stdin line
+            if {![string length $line]} continue
+            if {$line eq {!}} exit
+            if {$line eq {info}} {
+                debugmode_info $chan
+                continue
+            }
+            if {$line eq {help}} {
+                foreach l $welcometext {
+                    if {$l eq ""} break
+                    puts $l
+                }
+                continue
+            }
+            if {[string index $line 0] eq {/}} {
+                catch {eval [string range $line 1 end]} result
+                puts $result
+                continue
+            }
+            # Let's send the request to imap server
+            request $chan $line
+            if {[catch {getresponse $chan} error]} {
+                puts "--- ERROR ---\n$error\n-------------\n"
+            }
+         }
+    }
+
+    # Little helper for debugmode command.
+    proc debugmode_info {chan} {
+        variable info
+        puts "Last sent request: '$info($chan,lastrequest)'"
+        puts "Last received line: '$info($chan,lastline)'"
+        puts ""
+    }
+
+    # Protocol error! Enter the debug mode if ::imap4::debug is true.
+    # Otherwise just raise the error.
+    proc protoerror {chan msg} {
+        variable debug
+        variable debugmode
+
+        if {$debug && !$debugmode} {
+            debugmode $chan $msg
+        } else {
+            error $msg
+        }
+    }
+
+    proc me {} {
+        variable debugchan
+        set debugchan
+    }
+
+    # Other stuff to do in random order...
+    #
+    # proc ::imap4::idle notify-command
+    # proc ::imap4::auth plain ...
+    # proc ::imap4::securestauth user pass
+    # proc ::imap4::store
+    # proc ::imap4::logout (need to clean both msg and mailbox info arrays)
+
+    # Amend the flags of a message to be updated once CLOSE/EXPUNGE is initiated
+    proc store {chan range key values} {
+	set valid_keys {
+	    FLAGS
+	    FLAGS.SILENT
+	    +FLAGS
+	    +FLAGS.SILENT
+	    -FLAGS
+	    -FLAGS.SILENT
+	}
+	if {$key ni $valid_keys} {
+	    error "Invalid data item: $key. Must be one of [join $valid_keys ,]"
+	}
+        parserange $chan $range start end
+	set newflags {}
+	foreach val $values {
+	    if {[regexp {^\\+(.*?)$} $val]} {
+		lappend newflags $values
+	    } else {
+		lappend newflags "\\$val"
+	    }
+	}
+        request $chan "STORE $start:$end $key ([join $newflags])"
+	if {[getresponse $chan]} {
+	    return 1
+	}
+	return 0
+    }
+
+    # Logout
+    proc logout {chan} {
+	if {[simplecmd $chan LOGOUT SELECT {}]} {
+	    # clean out info arrays
+	    variable info
+	    variable folderinfo
+	    variable mboxinfo
+	    variable msginfo
+
+	    array unset folderinfo $chan,*
+	    array unset mboxinfo $chan,*
+	    array unset msginfo $chan,*
+	    array unset info $chan,*
+
+	    return 1
+	}
+        return 0
+    }
+
+    # Expunge : force removal of any messages with the 
+    # flag \Deleted
+    proc expunge {chan} {
+        if {[simplecmd $chan EXPUNGE SELECT {}]} {
+            return 1
+        }
+        return 0
+    }
+
+    # copy : copy a message to a destination mailbox
+    proc copy {chan msgid mailbox} {
+	if {[simplecmd $chan COPY SELECT [list $msgid $mailbox]]} {
+	    return 1
+	}
+	return 0
+    }
+
+}
+
+################################################################################
+# Example and test
+################################################################################
+if {[info script] eq $argv0} {
+    # set imap4::debug 0
+    set FOLDER INBOX
+    set port 0
+    if {[llength $argv] < 3} {
+        puts "Usage: imap4.tcl <server> <user> <pass> ?folder? ?-secure? ?-debug?"
+        exit
+    }
+
+    lassign $argv server user pass
+    if {$argc > 3} {
+        for {set i 3} {$i<$argc} {incr i} {
+            set opt [lindex $argv $i]
+            switch -- $opt {
+                "-debug" {
+                    set imap4::debug 1
+                }
+                "-secure" {
+                    set imap4::use_ssl 1
+                    puts "Package TLS [package require tls] loaded"
+                }
+                default {
+                    set FOLDER $opt
+                }
+            }
+        }
+    }
+
+    # open and login ...
+    set imap [imap4::open $server]
+    imap4::login $imap $user $pass
+
+    imap4::select $imap $FOLDER
+    # Output all the information about that mailbox
+    foreach info [imap4::mboxinfo $imap] {
+        puts "$info -> [imap4::mboxinfo $imap $info]"
+    }
+    set num_mails [imap4::mboxinfo $imap exists]
+    if {!$num_mails} {
+        puts "No mail in folder '$FOLDER'"
+    } else {      
+        set fields {from: to: subject: size}
+        # fetch 3 records (at most)) inline
+        set max [expr {$num_mails<=3?$num_mails:3}]
+        foreach rec [imap4::fetch $imap :$max -inline {*}$fields] {
+            puts -nonewline "#[incr idx])"
+            for {set j 0} {$j<[llength $fields]} {incr j} {
+                puts "\t[lindex $fields $j] [lindex $rec $j]"
+            }
+        }
+    
+        # Show all the information available about the message ID 1
+        puts "Available info about message 1 => [imap4::msginfo $imap 1]"
+    }
+    
+    # Use the capability stuff
+    puts "Capabilities: [imap4::isableto $imap]"
+    puts "Is able to imap4rev1? [imap4::isableto $imap imap4rev1]"
+    if {$imap4::debug} {
+        imap4::debugmode $imap
+    }
+
+    # Cleanup
+    imap4::cleanup $imap
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/imap4/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/imap4/pkgIndex.tcl
new file mode 100644
index 00000000..3ad4d0c4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/imap4/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded imap4 0.5.3 [list source [file join $dir imap4.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/inifile/ini.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/inifile/ini.tcl
new file mode 100644
index 00000000..6c3d8240
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/inifile/ini.tcl
@@ -0,0 +1,422 @@
+# ini.tcl --
+#
+#       Querying and modifying old-style windows configuration files (.ini)
+#
+# Copyright (c) 2003-2007    Aaron Faupell <afaupell@users.sourceforge.net>
+# Copyright (c) 2008-2012    Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package provide inifile 0.3.2
+
+namespace eval ini {
+    variable nexthandle  0
+    variable commentchar \;
+}
+
+proc ::ini::open {ini args} {
+    variable nexthandle
+
+    while {[string match -* [::set opt [lindex $args 0]]]} {
+	switch -exact -- $opt {
+	    -- {
+		::set args [lrange $args 1 end]
+		break
+	    }
+	    -encoding {
+		::set enc  [lindex $args 1]
+		::set args [lrange $args 2 end]
+	    }
+	    default {
+		return -code error \
+		    -errorcode {INIFILE OPTION INVALID} \
+		    "Invalid option $opt, expected -encoding"
+	    }
+	}
+    }
+
+    ::set remainder [llength $args]
+    if {$remainder > 1} {
+	return -code error \
+	    -errorcode {WRONG-ARGS INIFILE} \
+	    "wrong\#args: should be \"ini::open ?-encoding E? ?mode?\""
+    } elseif {$remainder == 1} {
+	::set mode [lindex $args 0]
+    } else {
+	::set mode r+
+    }
+
+    if { ![regexp {^(w|r)\+?$} $mode] } {
+        return -code error \
+	    -errorcode {INIFILE MODE INVALID} \
+	    "$mode is not a valid access mode"
+    }
+
+    ::set fh ini$nexthandle
+    ::set tmp [::open $ini $mode]
+    namespace eval ::ini::$fh {
+        variable data;     array set data     {}
+        variable comments; array set comments {}
+        variable sections; array set sections {}
+    }
+    fconfigure $tmp -translation crlf
+    if {[info exists enc]} {
+	::ini::_setfileenc $tmp $enc
+	::set ::ini::${fh}::enc     $enc
+    }
+
+    ::set ::ini::${fh}::channel $tmp
+    ::set ::ini::${fh}::file    [_normalize $ini]
+    ::set ::ini::${fh}::mode    $mode
+
+    incr nexthandle
+    if { [string match "r*" $mode] } {
+        _loadfile $fh
+    }
+    return $fh
+}
+
+# close the file and delete all stored info about it
+# this does not save any changes. see ::ini::commit
+
+proc ::ini::close {fh} {
+    _valid_ns $fh
+    variable ::ini::${fh}::channel
+    ::close $channel
+    namespace delete ::ini::$fh
+    return
+}
+
+# write all changes to disk
+
+proc ::ini::commit {fh} {
+    _valid_ns $fh
+
+    variable ::ini::${fh}::data
+    variable ::ini::${fh}::comments
+    variable ::ini::${fh}::sections
+    variable ::ini::${fh}::channel
+    variable ::ini::${fh}::file
+    variable ::ini::${fh}::mode
+    variable ::ini::${fh}::enc
+    variable commentchar
+
+    if { $mode == "r" } {
+	return -code error \
+	    -errorcode {INIFILE READ-ONLY} \
+	    "cannot write to read-only file"
+    }
+    ::close $channel
+    ::set channel [::open $file w]
+    if {[info exists enc]} {
+	::ini::_setfileenc $channel $enc
+    }
+    ::set char $commentchar
+    #seek $channel 0 start
+    foreach sec [array names sections] {
+	variable ::ini::${fh}::enc
+	if { [info exists comments($sec)] } {
+	    puts $channel "$char [join $comments($sec) "\n$char "]\n"
+	}
+	puts $channel "\[$sec\]"
+	foreach key [lsort -dictionary [array names data [_globescape $sec]\000*]] {
+	    ::set key [lindex [split $key \000] 1]
+	    if {[info exists comments($sec\000$key)]} {
+		puts $channel "$char [join $comments($sec\000$key) "\n$char "]"
+	    }
+	    if {[info exists enc]} {
+		::ini::_setfileenc $channel $enc
+	    }
+	    puts $channel "$key=$data($sec\000$key)"
+	}
+	puts $channel ""
+    }
+    ::close $channel
+    ::set channel [::open $file r+]
+    if {[info exists enc]} {
+	::ini::_setfileenc $channel $enc
+    }
+    return
+}
+
+# internal command to read in a file
+# see open and revert for public commands
+
+proc ::ini::_loadfile {fh} {
+    variable ::ini::${fh}::data
+    variable ::ini::${fh}::comments
+    variable ::ini::${fh}::sections
+    variable ::ini::${fh}::channel
+    variable ::ini::${fh}::file
+    variable ::ini::${fh}::mode
+    variable commentchar
+
+    ::set cur {}
+    ::set com {}
+
+    ::set char $commentchar
+    seek $channel 0 start
+
+    foreach line [split [read $channel] "\n"] {
+	# bug 3612465 - allow and ignore leading and trailing whitespace.
+	::set line [string trim $line]
+
+	if { [string match "$char*" $line] } {
+	    lappend com [string trim [string range $line [string length $char] end]]
+	} elseif { [string match {\[*\]} $line] } {
+	    ::set cur [string range $line 1 end-1]
+	    if { $cur == "" } { continue }
+	    ::set sections($cur) 1
+	    if { $com != "" } {
+		::set comments($cur) $com
+		::set com {}
+	    }
+	} elseif { [string match {*=*} $line] } {
+	    ::set line [split $line =]
+	    ::set key [string trim [lindex $line 0]]
+	    if { $key == "" || $cur == "" } { continue }
+	    ::set value [string trim [join [lrange $line 1 end] =]]
+	    if { [regexp "^(\".*\")\s+${char}(.*)$" $value -> 1 2] } {
+		::set value $1
+		lappend com $2
+	    }
+	    ::set data($cur\000$key) $value
+	    if { $com != "" } {
+		::set comments($cur\000$key) $com
+		::set com {}
+	    }
+	}
+    }
+    return
+}
+
+# internal command to escape glob special characters
+
+proc ::ini::_globescape {string} {
+    return [string map {* \\* ? \\? \\ \\\\ \[ \\\[ \] \\\]} $string]
+}
+
+# internal command to check if a section or key is nonexistant
+
+proc ::ini::_exists {fh sec args} {
+    variable ::ini::${fh}::sections
+    variable ::ini::${fh}::data
+
+    if { ![info exists sections($sec)] } {
+        return -code error \
+	    -errorcode {INIFILE SECTION INVALID} \
+	    "no such section \"$sec\""
+    }
+    if { [llength $args] > 0 } {
+        ::set key [lindex $args 0]
+        if { ![info exists data($sec\000$key)] } {
+            return -code error \
+		-errorcode {INIFILE KEY INVALID} \
+		"can't read key \"$key\""
+        }
+    }
+    return
+}
+
+proc ::ini::_setfileenc {fh enc} {
+    if {[catch {
+	fconfigure $fh -encoding $enc
+    } msg]} {
+	catch { ::close $fh }
+	return -code error $msg
+    }
+}
+
+# internal command to check validity of a handle
+
+if { [package vcompare [package provide Tcl] 8.4] < 0 } {
+    proc ::ini::_normalize {path} {
+	return $path
+    }
+    proc ::ini::_valid_ns {name} {
+	variable ::ini::${name}::data
+	if { ![info exists data] } {
+	    return -code error \
+		-errorcode {INIFILE HANDLE INVALID} \
+		"$name is not an open INI file"
+	}
+    }
+} else {
+    proc ::ini::_normalize {path} {
+	file normalize $path
+    }
+    proc ::ini::_valid_ns {name} {
+	if { ![namespace exists ::ini::$name] } {
+	    return -code error \
+		-errorcode {INIFILE HANDLE INVALID} \
+		"$name is not an open INI file"
+	}
+    }
+}
+
+# get and set the ini comment character
+
+proc ::ini::commentchar { {new {}} } {
+    variable commentchar
+    if {$new != ""} {
+        if {[string length $new] > 1} {
+	    return -code error \
+		-errorcode {INIFILE COMMENT-CHAR INVALID} \
+		"comment char must be a single character"
+	}
+        ::set commentchar $new
+    }
+    return $commentchar
+}
+
+# return all section names
+
+proc ::ini::sections {fh} {
+    _valid_ns $fh
+    variable ::ini::${fh}::sections
+    return [array names sections]
+}
+
+# return boolean indicating existance of section or key in section
+
+proc ::ini::exists {fh sec {key {}}} {
+    _valid_ns $fh
+    variable ::ini::${fh}::sections
+    variable ::ini::${fh}::data
+
+    if { $key == "" } {
+        return [info exists sections($sec)]
+    }
+    return [info exists data($sec\000$key)]
+}
+
+# return all key names of section
+# error if section is nonexistant
+
+proc ::ini::keys {fh sec} {
+    _valid_ns $fh
+    _exists $fh $sec
+    variable ::ini::${fh}::data
+
+    ::set keys {}
+    foreach x [array names data [_globescape $sec]\000*] {
+        lappend keys [lindex [split $x \000] 1]
+    }
+    return $keys
+}
+
+# return all key value pairs of section
+# error if section is nonexistant
+
+proc ::ini::get {fh sec} {
+    _valid_ns $fh
+    _exists $fh $sec
+    variable ::ini::${fh}::data
+
+    ::set r {}
+    foreach x [array names data [_globescape $sec]\000*] {
+        lappend r [lindex [split $x \000] 1] $data($x)
+    }
+    return $r
+}
+
+# return the value of a key
+# return default value if key or section is nonexistant otherwise error
+
+proc ::ini::value {fh sec key {default {}}} {
+    _valid_ns $fh
+    variable ::ini::${fh}::data
+
+    if {$default != "" && ![info exists data($sec\000$key)]} {
+        return $default
+    }
+    _exists $fh $sec $key
+    return [::set data($sec\000$key)]
+}
+
+# set the value of a key
+# new section or key names are created
+
+proc ::ini::set {fh sec key value} {
+    _valid_ns $fh
+    variable ::ini::${fh}::sections
+    variable ::ini::${fh}::data
+
+    ::set sec [string trim $sec]
+    ::set key [string trim $key]
+    if { $sec == "" || $key == "" } {
+        return -code error \
+	    -errorcode {INIFILE SYNTAX} \
+	    "section or key may not be empty"
+    }
+    ::set data($sec\000$key) $value
+    ::set sections($sec) 1
+    return $value
+}
+
+# delete a key or an entire section
+# may delete nonexistant keys and sections
+
+proc ::ini::delete {fh sec {key {}}} {
+    _valid_ns $fh
+    variable ::ini::${fh}::sections
+    variable ::ini::${fh}::data
+
+    if { $key == "" } {
+        array unset data     [_globescape $sec]\000*
+        array unset sections [_globescape $sec]
+    }
+    catch {unset data($sec\000$key)}
+}
+
+# read and set comments for sections and keys
+# may comment nonexistant sections and keys
+
+proc ::ini::comment {fh sec key args} {
+    _valid_ns $fh
+    variable ::ini::${fh}::comments
+
+    ::set r $sec
+    if { $key != "" } { append r \000$key }
+    if { [llength $args] == 0 } {
+        if { ![info exists comments($r)] } { return {} }
+        return $comments($r)
+    }
+    if { [llength $args] == 1 && [lindex $args 0] == "" } {
+        unset -nocomplain comments($r)
+        return {}
+    }
+    # take care of any embedded newlines
+    for {::set i 0} {$i < [llength $args]} {incr i} {
+        ::set args [eval [list lreplace $args $i $i] [split [lindex $args $i] \n]]
+    }
+    eval [list lappend comments($r)] $args
+}
+
+# return the physical filename for the handle
+
+proc ::ini::filename {fh} {
+    _valid_ns $fh
+    variable ::ini::${fh}::file
+    return $file
+}
+
+# reload the file from disk losing all changes since the last commit
+
+proc ::ini::revert {fh} {
+    _valid_ns $fh
+    namespace eval ::ini::$fh {
+        array set data     {}
+        array set comments {}
+        array set sections {}
+    }
+    variable ::ini::${fh}::enc
+    if {[info exists enc]} {
+	::ini::_setfileenc $fh $enc
+    }
+    variable ::ini::${fh}::mode
+    if { ![string match "w*" $mode] } {
+        _loadfile $fh
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/inifile/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/inifile/pkgIndex.tcl
new file mode 100644
index 00000000..574679e7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/inifile/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if { ![package vsatisfies [package provide Tcl] 8.2] } { return }
+package ifneeded inifile 0.3.2 [list source [file join $dir ini.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/interp/deleg_method.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/interp/deleg_method.tcl
new file mode 100644
index 00000000..c25f9a69
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/interp/deleg_method.tcl
@@ -0,0 +1,64 @@
+# interp.tcl
+# Some utility commands for creation of delegation methods.
+# (Delegation of methods to a remote interpreter via a comm
+# handle).
+#
+# Copyright (c) 2006 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: deleg_method.tcl,v 1.2 2006/09/01 19:58:21 andreas_kupries Exp $
+
+package require Tcl 8.3
+package require snit
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+namespace eval ::interp::delegate {}
+
+# ### ### ### ######### ######### #########
+## Public API
+
+snit::macro ::interp::delegate::method {args} {
+    # syntax: ?-async? name arguments comm id
+
+    set async 0
+    while {[string match -* [set opt [lindex $args 0]]]} {
+	switch -exact -- $opt {
+	    -async {set async 1 ; set args [lrange $args 1 end]}
+	    default {
+		return -code error "unknown option \"$opt\", expected -async"
+	    }
+	}
+    }
+    if {[llength $args] != 4} {
+	return -code error "wrong # args"
+    }
+    foreach {name arguments comm rid} $args break
+
+    if {![llength $arguments]} {
+	set delegate "[list $name]"
+    } elseif {[string equal args [lindex $arguments end]]} {
+	if {[llength $arguments] == 1} {
+	    set delegate "\[linsert \$args 0 [list $name]\]"
+	} else {
+	    set delegate "\[linsert \$args 0 [list $name] \$[join [lrange $arguments 0 end-1] " \$"]\]"
+	}
+    } else {
+	set delegate "\[list [list $name] \$[join $arguments " \$"]\]"
+    }
+
+    set    body ""
+    append body [list $comm] " " "send "
+    if {$async} {append body "-async "}
+    append body [list $rid] " " $delegate
+
+    ::method $name $arguments $body
+}
+
+# ### ### ### ######### ######### #########
+## Ready to go
+
+package provide interp::delegate::method 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/interp/deleg_proc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/interp/deleg_proc.tcl
new file mode 100644
index 00000000..8aee165f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/interp/deleg_proc.tcl
@@ -0,0 +1,68 @@
+# interp.tcl
+# Some utility commands for creation of delegation procedures
+# (Delegation of commands to a remote interpreter via a comm
+# handle).
+#
+# Copyright (c) 2006 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: deleg_proc.tcl,v 1.2 2006/09/01 19:58:21 andreas_kupries Exp $
+
+package require Tcl 8.3
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+namespace eval ::interp::delegate {}
+
+# ### ### ### ######### ######### #########
+## Public API
+
+proc ::interp::delegate::proc {args} {
+    # syntax: ?-async? name arguments comm id
+
+    set async 0
+    while {[string match -* [set opt [lindex $args 0]]]} {
+	switch -exact -- $opt {
+	    -async {
+		set async 1
+		set args [lrange $args 1 end]
+	    }
+	    default {
+		return -code error "unknown option \"$opt\", expected -async"
+	    }
+	}
+    }
+    if {[llength $args] != 4} {
+	return -code error "wrong # args"
+    }
+    foreach {name arguments comm rid} $args break
+    set base [namespace tail $name]
+
+    if {![llength $arguments]} {
+	set delegate "[list $base]"
+    } elseif {[string equal args [lindex $arguments end]]} {
+	if {[llength $arguments] == 1} {
+	    set delegate "\[linsert \$args 0 [list $base]\]"
+	} else {
+	    set delegate "\[linsert \$args 0 [list $base] \$[join [lrange $arguments 0 end-1] " \$"]\]"
+	}
+    } else {
+	set delegate "\[list [list $base] \$[join $arguments " \$"]\]"
+    }
+
+    set    body ""
+    append body [list $comm] " " "send "
+    if {$async} {append body "-async "}
+    append body [list $rid] " " $delegate
+
+    uplevel 1 [list ::proc $name $arguments $body]
+    return $name
+}
+
+# ### ### ### ######### ######### #########
+## Ready to go
+
+package provide interp::delegate::proc 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/interp/interp.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/interp/interp.tcl
new file mode 100644
index 00000000..7fefa5fa
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/interp/interp.tcl
@@ -0,0 +1,87 @@
+# interp.tcl
+# Some utility commands for interpreter creation
+#
+# Copyright (c) 2006 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: interp.tcl,v 1.5 2011/11/08 02:40:31 andreas_kupries Exp $
+
+package require Tcl 8.3
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+namespace eval ::interp {}
+
+# ### ### ### ######### ######### #########
+## Public API
+
+proc ::interp::createEmpty {args} {
+    # Create interpreter, predefined path or
+    # automatic naming.
+
+    if {[llength $args] > 1} {
+	return -code error "wrong#args: Expected ?path?"
+    } elseif {[llength $args] == 1} {
+	set i [interp create [lindex $args 0]]
+    } else {
+	set i [interp create]
+    }
+
+    # Clear out namespaces and commands, leaving an empty interpreter
+    # behind. Take care to delete the rename command last, as it is
+    # needed to perform the deletions. We have to keep the 'rename'
+    # command until last to allow us to delete all ocmmands. We also
+    # have to defer deletion of the ::tcl namespace (if present), as
+    # it may contain state for the auto-loader, which may be
+    # invoked. This also forces us to defer the deletion of the
+    # builtin command 'namespace' so that we can delete ::tcl at last.
+
+    foreach n [interp eval $i [list ::namespace children ::]] {
+	if {[string equal $n ::tcl]} continue
+	interp eval $i [list namespace delete $n]
+    }
+    foreach c [interp eval $i [list ::info commands]] {
+	if {[string equal $c rename]}    continue
+	if {[string equal $c namespace]} continue
+	interp eval $i [list ::rename $c {}]
+    }
+
+    interp eval $i [list ::namespace delete ::tcl]
+    catch {
+	# In 8.6 the removal of the ::tcl namespace killed the
+	# ensemblified namespace command already, so a deletion will
+	# fail. Easier to catch than being conditional.
+	interp eval $i [list ::rename namespace {}]
+    }
+    interp eval $i [list ::rename rename    {}]
+
+    # Done. Result is ready.
+
+    return $i
+}
+
+proc ::interp::snitLink {path methods} {
+    foreach m $methods {
+	set dst   [uplevel 1 [linsert $m 0 mymethod]]
+	set alias [linsert $dst 0 interp alias $path [lindex $m 0] {}]
+	eval $alias
+    }
+    return
+}
+
+proc ::interp::snitDictLink {path methoddict} {
+    foreach {c m} $methoddict {
+	set dst   [uplevel 1 [linsert $m 0 mymethod]]
+	set alias [linsert $dst 0 interp alias $path $c {}]
+	eval $alias
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready to go
+
+package provide interp 0.1.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/interp/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/interp/pkgIndex.tcl
new file mode 100644
index 00000000..072c3b13
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/interp/pkgIndex.tcl
@@ -0,0 +1,4 @@
+if {![package vsatisfies [package provide Tcl] 8.3]} return
+package ifneeded interp                   0.1.2 [list source [file join $dir interp.tcl]]
+package ifneeded interp::delegate::proc   0.2   [list source [file join $dir deleg_proc.tcl]]
+package ifneeded interp::delegate::method 0.2   [list source [file join $dir deleg_method.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/irc/irc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/irc/irc.tcl
new file mode 100644
index 00000000..1b6131d3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/irc/irc.tcl
@@ -0,0 +1,531 @@
+# irc.tcl --
+#
+#	irc implementation for Tcl.
+#
+# Copyright (c) 2001-2003 by David N. Welton <davidw@dedasys.com>.
+# This code may be distributed under the same terms as Tcl.
+
+# -------------------------------------------------------------------------
+
+package require Tcl 8.6
+
+# -------------------------------------------------------------------------
+
+namespace eval ::irc {
+    # counter used to differentiate connections
+    variable conn 0
+    variable config
+    variable irctclfile [info script]
+    array set config {
+        debug  0
+        logger 0
+    }
+}
+
+# ::irc::config --
+#
+# Set global configuration options.
+#
+# Arguments:
+#
+# key	name of the configuration option to change.
+#
+# value	value of the configuration option.
+
+proc ::irc::config { args } {
+    variable config
+    if { [llength $args] == 0 } {
+        return [array get config]
+    } elseif { [llength $args] == 1 } {
+	set key [lindex $args 0]
+        return $config($key)
+    } elseif { [llength $args] > 2 } {
+        error "wrong # args: should be \"config key ?val?\""
+    }
+    # llength $args == 2
+    set key [lindex $args 0]
+    set value [lindex $args 1]
+    foreach ns [namespace children] {
+        if { [info exists config($key)] && [info exists ${ns}::config($key)] \
+                && [set ${ns}::config($key)] == $config($key)} {
+            ${ns}::cmd-config $key $value
+        }
+    }
+    set config($key) $value
+}
+
+# ::irc::connections --
+#
+# Return a list of handles to all existing connections
+
+proc ::irc::connections { } {
+    set r {}
+    foreach ns [namespace children] {
+        lappend r ${ns}::network
+    }
+    return $r
+}
+
+# ::irc::reload --
+#
+# Reload this file, and merge the current connections into
+# the new one.
+
+proc ::irc::reload { } {
+    variable conn
+    set oldconn $conn
+    namespace eval :: {
+	source [set ::irc::irctclfile]
+    }
+    foreach ns [namespace children] {
+        foreach var {sock logger host port} {
+            set $var [set ${ns}::$var]
+        }
+        array set dispatch [array get ${ns}::dispatch]
+        array set config [array get ${ns}::config]
+        # make sure our new connection uses the same namespace
+        set conn [string range $ns 10 end]
+        ::irc::connection
+        foreach var {sock logger host port} {
+            set ${ns}::$var [set $var]
+        }
+        array set ${ns}::dispatch [array get dispatch]
+        array set ${ns}::config [array get config]
+    }
+    set conn $oldconn
+}
+
+# ::irc::connection --
+#
+# Create an IRC connection namespace and associated commands.
+
+proc ::irc::connection { args } {
+    variable conn
+    variable config
+
+    # Create a unique namespace of the form irc$conn::$host
+
+    set name [format "%s::irc%s" [namespace current] $conn]
+
+    namespace eval $name {
+	variable sock
+	variable dispatch
+	variable linedata
+	variable config
+
+	set sock {}
+	array set dispatch {}
+	array set linedata {}
+	array set config [array get ::irc::config]
+	if { $config(logger) || $config(debug)} {
+	    package require logger
+	    variable logger
+            set logger [logger::init [namespace tail [namespace current]]]
+            if { !$config(debug) } { ${logger}::disable debug }
+        }
+
+
+	# ircsend --
+	# send text to the IRC server
+
+	proc ircsend { msg } {
+	    variable sock
+	    variable dispatch
+	    if { $sock eq "" } { return }
+	    cmd-log debug "ircsend: '$msg'"
+	    if { [catch {puts $sock $msg} err] } {
+	        catch { close $sock }
+	        set sock {}
+		if { [info exists dispatch(EOF)] } {
+		    eval $dispatch(EOF)
+		}
+		cmd-log error "Error in ircsend: $err"
+	    }
+	}
+
+
+	#########################################################
+	# Implemented user-side commands, meaning that these commands
+	# cause the calling user to perform the given action.
+	#########################################################
+
+
+        # cmd-config --
+        #
+        # Set or return per-connection configuration options.
+        #
+        # Arguments:
+        #
+        # key	name of the configuration option to change.
+        #
+        # value	value (optional) of the configuration option.
+
+        proc cmd-config { args } {
+            variable config
+	    variable logger
+
+	    if { [llength $args] == 0 } {
+		return [array get config]
+	    } elseif { [llength $args] == 1 } {
+		set key [lindex $args 0]
+		return $config($key)
+	    } elseif { [llength $args] > 2 } {
+		error "wrong # args: should be \"config key ?val?\""
+	    }
+	    # llength $args == 2
+	    set key [lindex $args 0]
+	    set value [lindex $args 1]
+            if { $key eq "debug" } {
+                if {$value} {
+                    if { !$config(logger) } { cmd-config logger 1 }
+                    ${logger}::enable debug
+                } elseif { [info exists logger] } {
+                    ${logger}::disable debug
+	        }
+            }
+            if { $key eq "logger" } {
+                if { $value && !$config(logger)} {
+                    package require logger
+                    set logger [logger::init [namespace tail [namespace current]]]
+                } elseif { [info exists logger] } {
+                    ${logger}::delete
+                    unset logger
+	        }
+            }
+            set config($key) $value
+        }
+
+        proc cmd-log {level text} {
+	    variable logger
+            if { ![info exists logger] } return
+            ${logger}::$level $text
+        }
+
+        proc cmd-logname { } {
+            variable logger
+            if { ![info exists logger] } return
+            return $logger
+        }
+
+        # cmd-destroy --
+        #
+        # destroys the current connection and its namespace
+
+        proc cmd-destroy { } {
+            variable logger
+            variable sock
+            if { [info exists logger] } { ${logger}::delete }
+            catch {close $sock}
+            namespace delete [namespace current]
+        }
+
+        proc cmd-connected { } {
+            variable sock
+            if { $sock eq "" } { return 0 }
+            return 1
+        }
+
+	proc cmd-user { username hostname servername {userinfo ""} } {
+	    if { $userinfo eq "" } {
+		ircsend "USER $username $hostname server :$servername"
+	    } else {
+		ircsend "USER $username $hostname $servername :$userinfo"
+	    }
+	}
+
+	proc cmd-nick { nk } {
+	    ircsend "NICK $nk"
+	}
+
+	proc cmd-ping { target } {
+	    ircsend "PRIVMSG $target :\001PING [clock seconds]\001"
+	}
+
+	proc cmd-serverping { } {
+	    ircsend "PING [clock seconds]"
+	}
+
+	proc cmd-ctcp { target line } {
+	    ircsend "PRIVMSG $target :\001$line\001"
+	}
+
+	proc cmd-join { chan {key {}} } {
+	    ircsend "JOIN $chan $key"
+	}
+
+	proc cmd-part { chan {msg ""} } {
+	    if { $msg eq "" } {
+		ircsend "PART $chan"
+	    } else {
+		ircsend "PART $chan :$msg"
+	    }
+	}
+
+	proc cmd-quit { {msg {tcllib irc module - http://core.tcl.tk/tcllib/}} } {
+	    ircsend "QUIT :$msg"
+	}
+
+	proc cmd-privmsg { target msg } {
+	    ircsend "PRIVMSG $target :$msg"
+	}
+
+	proc cmd-notice { target msg } {
+	    ircsend "NOTICE $target :$msg"
+	}
+
+	proc cmd-kick { chan target {msg {}} } {
+	    ircsend "KICK $chan $target :$msg"
+	}
+
+	proc cmd-mode { target args } {
+	    ircsend "MODE $target [join $args]"
+	}
+
+	proc cmd-topic { chan msg } {
+	    ircsend "TOPIC $chan :$msg"
+	}
+
+	proc cmd-invite { chan target } {
+	    ircsend "INVITE $target $chan"
+	}
+
+	proc cmd-send { line } {
+	    ircsend $line
+	}
+
+	proc cmd-peername { } {
+	    variable sock
+	    if { $sock eq "" } { return {} }
+	    return [fconfigure $sock -peername]
+	}
+
+	proc cmd-sockname { } {
+	    variable sock
+	    if { $sock eq "" } { return {} }
+	    return [fconfigure $sock -sockname]
+	}
+
+        proc cmd-socket { } {
+            variable sock
+            return $sock
+        }
+
+	proc cmd-disconnect { } {
+	    variable sock
+	    if { $sock eq "" } { return -1 }
+	    catch { close $sock }
+	    set sock {}
+	    return 0
+	}
+
+	# Connect --
+	# Create the actual tcp connection.
+
+	proc cmd-connect { h {p 6667} } {
+	    variable sock
+	    variable host
+	    variable port
+
+	   set host $h
+	   set port $p
+
+	    if { $sock eq "" } {
+		set sock [socket $host $port]
+		fconfigure $sock -translation crlf -buffering line
+		fileevent $sock readable [namespace current]::GetEvent
+	    }
+	    return 0
+	}
+
+	# Callback API:
+
+	# These are all available from within callbacks, so as to
+	# provide an interface to provide some information on what is
+	# coming out of the server.
+
+	# action --
+
+	# Action returns the action performed, such as KICK, PRIVMSG,
+	# MODE etc, including numeric actions such as 001, 252, 353,
+	# and so forth.
+
+	proc action { } {
+	    variable linedata
+	    return $linedata(action)
+	}
+
+	# msg --
+
+	# The last argument of the line, after the last ':'.
+
+	proc msg { } {
+	    variable linedata
+	    return $linedata(msg)
+	}
+
+	# who --
+
+	# Who performed the action.  If the command is called as [who address],
+	# it returns the information in the form
+	# nick!ident@host.domain.net
+
+	proc who { {address 0} } {
+	    variable linedata
+	    if { $address == 0 } {
+		return [lindex [split $linedata(who) !] 0]
+	    } else {
+		return $linedata(who)
+	    }
+	}
+
+	# target --
+
+	# To whom was this action done.
+
+	proc target { } {
+	    variable linedata
+	    return $linedata(target)
+	}
+
+	# additional --
+
+	# Returns any additional header elements beyond the target as a list.
+
+	proc additional { } {
+	    variable linedata
+	    return $linedata(additional)
+	}
+
+	# header --
+
+	# Returns the entire header in list format.
+
+	proc header { } {
+	    variable linedata
+	    return [concat [list $linedata(who) $linedata(action) \
+				$linedata(target)] $linedata(additional)]
+	}
+
+	# GetEvent --
+
+	# Get a line from the server and dispatch it.
+
+	proc GetEvent { } {
+	    variable linedata
+	    variable sock
+	    variable dispatch
+	    array set linedata {}
+	    set line "eof"
+	    if { [eof $sock] || [catch {gets $sock} line] } {
+		close $sock
+		set sock {}
+		cmd-log error "Error receiving from network: $line"
+		if { [info exists dispatch(EOF)] } {
+		    eval $dispatch(EOF)
+		}
+		return
+	    }
+	    cmd-log debug "Recieved: $line"
+	    if { [set pos [string first " :" $line]] > -1 } {
+		set header [string range $line 0 [expr {$pos - 1}]]
+		set linedata(msg) [string range $line [expr {$pos + 2}] end]
+	    } else {
+		set header [string trim $line]
+		set linedata(msg) {}
+	    }
+
+	    if { [string match :* $header] } {
+		set header [split [string trimleft $header :]]
+	    } else {
+		set header [linsert [split $header] 0 {}]
+	    }
+	    set linedata(who) [lindex $header 0]
+	    set linedata(action) [lindex $header 1]
+	    set linedata(target) [lindex $header 2]
+	    set linedata(additional) [lrange $header 3 end]
+	    if { [info exists dispatch($linedata(action))] } {
+		eval $dispatch($linedata(action))
+	    } elseif { [string match {[0-9]??} $linedata(action)] } {
+		eval $dispatch(defaultnumeric)
+	    } elseif { $linedata(who) eq "" } {
+		eval $dispatch(defaultcmd)
+	    } else {
+		eval $dispatch(defaultevent)
+	    }
+	}
+
+	# registerevent --
+
+	# Register an event in the dispatch table.
+
+	# Arguments:
+	# evnt: name of event as sent by IRC server.
+	# cmd: proc to register as the event handler
+
+	proc cmd-registerevent { evnt cmd } {
+	    variable dispatch
+	    set dispatch($evnt) $cmd
+	    if { $cmd eq "" } {
+		unset dispatch($evnt)
+	    }
+	}
+
+	# getevent --
+
+	# Return the currently registered handler for the event.
+
+	# Arguments:
+	# evnt: name of event as sent by IRC server.
+
+	proc cmd-getevent { evnt } {
+	    variable dispatch
+	    if { [info exists dispatch($evnt)] } {
+		return $dispatch($evnt)
+	    }
+	    return {}
+	}
+
+	# eventexists --
+
+	# Return a boolean value indicating if there is a handler
+	# registered for the event.
+
+	# Arguments:
+	# evnt: name of event as sent by IRC server.
+
+	proc cmd-eventexists { evnt } {
+	    variable dispatch
+	    return [info exists dispatch($evnt)]
+	}
+
+	# network --
+
+	# Accepts user commands and dispatches them.
+
+	# Arguments:
+	# cmd: command to invoke
+	# args: arguments to the command
+
+	proc network { cmd args } {
+	    eval [linsert $args 0 [namespace current]::cmd-$cmd]
+	}
+
+	# Create default handlers.
+
+	set dispatch(PING) {network send "PONG :[msg]"}
+	set dispatch(defaultevent) #
+	set dispatch(defaultcmd) #
+	set dispatch(defaultnumeric) #
+    }
+
+    set returncommand [format "%s::irc%s::network" [namespace current] $conn]
+    incr conn
+    return $returncommand
+}
+
+# -------------------------------------------------------------------------
+
+package provide irc 0.7.0
+
+# -------------------------------------------------------------------------
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/irc/picoirc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/irc/picoirc.tcl
new file mode 100644
index 00000000..62ee8fae
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/irc/picoirc.tcl
@@ -0,0 +1,450 @@
+# Based upon the picoirc code by Salvatore Sanfillipo and Richard Suchenwirth
+# See http://wiki.tcl.tk/13134 for the original standalone version.
+#
+#	This package provides a general purpose minimal IRC client suitable for
+#	embedding in other applications. All communication with the parent
+#	application is done via an application provided callback procedure.
+#
+# Copyright (c) 2004 Salvatore Sanfillipo
+# Copyright (c) 2004 Richard Suchenwirth
+# Copyright (c) 2007 Patrick Thoyts
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.6
+
+# -------------------------------------------------------------------------
+
+namespace eval ::picoirc {
+    variable uid
+    if {![info exists uid]} { set uid 0 }
+
+    variable defaults {
+        server   "irc.libera.chat"
+        port     6667
+        secure   0
+        channels ""
+        callback ""
+        motd     {}
+        users    {}
+    }
+    namespace export connect post
+}
+
+proc ::picoirc::Splituri {uri} {
+    lassign {{} {} {} {}} secure server port channels
+    if {![regexp {^irc(s)?://([^:/]+)(?::([^/]+))?(?:/([^ ]+))?} $uri -> secure server port channels]} {
+        regexp {^(?:([^@]+)@)?([^:]+)(?::(\d+))?} $uri -> channels server port
+    }
+    set secure [expr {$secure eq "s"}]
+
+    set channels [lmap x [split $channels ,] {
+        # Filter out parameters that are special according to the IRC URL
+        # scheme Internet-Draft.
+        if {$x in {needkey needpass}} continue
+        set x
+    }]
+    if {[llength $channels] == 1} {
+        set channels [lindex $channels 0]
+    }
+
+    if {$port eq {}} { set port [expr {$secure ? 6697: 6667}] }
+    return [list $server $port $channels $secure]
+}
+
+proc ::picoirc::connect {callback nick args} {
+    if {[llength $args] > 2} {
+        return -code error "wrong # args: must be \"callback nick ?passwd? url\""
+    } elseif {[llength $args] == 1} {
+        set url [lindex $args 0]
+    } else {
+	lassign $args passwd url
+    }
+    variable defaults
+    variable uid
+    set context [namespace current]::irc[incr uid]
+    upvar #0 $context irc
+    array set irc $defaults
+    lassign [Splituri $url] server port channels secure
+    if {[info exists channels] && $channels ne ""} {set irc(channels) $channels}
+    if {[info exists server]   && $server   ne ""} {set irc(server)   $server}
+    if {[info exists port]     && $port     ne ""} {set irc(port)     $port}
+    if {[info exists secure]   && $secure}         {set irc(secure)   $secure}
+    if {[info exists passwd]   && $passwd   ne ""} {set irc(passwd)   $passwd}
+    set irc(callback) $callback
+    set irc(nick) $nick
+    set irc(is_registered) false
+    Callback $context init
+    if {$irc(secure)} {
+        set irc(socket) [::tls::socket -async $irc(server) $irc(port)]
+    } else {
+        set irc(socket) [socket -async $irc(server) $irc(port)]
+    }
+    fileevent $irc(socket) readable [list [namespace origin Read] $context]
+    fileevent $irc(socket) writable [list [namespace origin Write] $context]
+    return $context
+}
+
+proc picoirc::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+proc ::picoirc::Callback {context state args} {
+    upvar #0 $context irc
+    if {[llength $irc(callback)] > 0
+        && [llength [info commands [lindex $irc(callback) 0]]] == 1} {
+        if {[catch {eval $irc(callback) [list $context $state] $args} result]} {
+            puts stderr "callback error: $result"
+        } else {
+            return $result
+        }
+    }
+}
+
+proc ::picoirc::Version {context} {
+    if {[catch {Callback $context version} ver]} { set ver {} }
+    if {$ver eq {}} {
+        set ver "PicoIRC:[package provide picoirc]:Tcl [info patchlevel]"
+    }
+    return $ver
+}
+
+proc ::picoirc::Write {context} {
+    upvar #0 $context irc
+    fileevent $irc(socket) writable {}
+    if {[set err [fconfigure $irc(socket) -error]] ne ""
+        || $irc(secure) && [catch {while {![::tls::handshake $irc(socket)]} {}} err] != 0} {
+        Callback $context close $err
+        close $irc(socket)
+        unset irc
+        return
+    }
+    fconfigure $irc(socket) -blocking 0 -buffering line -translation crlf -encoding utf-8
+    Callback $context connect
+    set ver [join [lrange [split [Version $context] :] 0 1] " "]
+    Send $context "USER $::tcl_platform(user) 0 * :$ver user"
+    if {[info exists irc(passwd)] && [package provide SASL] ne {}} {
+        Send $context "CAP REQ :sasl"
+    } else {
+        Register $context
+    }
+    return
+}
+
+proc ::picoirc::Register {context} {
+    upvar #0 $context irc
+    unset -nocomplain irc(sasl:challenge) irc(sasl:mechs)
+    Send $context "NICK $irc(nick)"
+    if {[info exists irc(passwd)] && !$irc(is_registered)} {
+        Send $context "PASS $irc(passwd)"
+    }
+}
+
+proc ::picoirc::Getnick {s} {
+    set nick {}
+    regexp {^([^!]*)!} $s -> nick
+    return $nick
+}
+
+proc ::picoirc::ParseMsg {line} {
+    set prefix ""
+    if {[string match ":*" $line]} {
+        set ndx [string first " " $line]
+        set prefix [string range $line 1 [expr {$ndx - 1}]]
+        set line [string range $line [expr {$ndx + 1}] end]
+    }
+    if {[set ndx [string first " :" $line]] != -1} {
+        set parts [split [string range $line 0 [expr {$ndx - 1}]] " "]
+        set rest [string range $line [expr {$ndx + 2}] end]
+    } else {
+        set parts [split $line " "]
+        set rest ""
+    }
+    return [list $prefix $parts $rest]
+}
+
+proc ::picoirc::Read {context} {
+    upvar #0 $context irc
+    if {[eof $irc(socket)]} {
+        fileevent $irc(socket) readable {}
+        Callback $context close
+        close $irc(socket)
+        unset irc
+        return
+    }
+    if {[gets $irc(socket) line] != -1} {
+        if {[string match "PING*" $line]} {
+            Send $context "PONG [info hostname] [lindex [split $line] 1]"
+            return
+        }
+        # the callback can return -code break to prevent processing the read
+        if {[catch {Callback $context debug read $line}] == 3} {
+            return
+        }
+        if {[string match "AUTHENTICATE *" $line]} {
+            # codes 903 for successful, 904/905/906 for fail
+            set data [string range $line 13 end]
+            if {$data eq "+"} {set data ""}
+            append irc(sasl:challenge) $data ;# accumulate chunks
+            if {[string length $data] != 400} {
+                set challenge [binary decode base64 $irc(sasl:challenge)]
+                set irc(sasl:challenge) ""
+                if {![SASL::step $irc(sasl) $challenge]} {
+                    set response [SASL::response $irc(sasl)]
+                    if {$response eq ""} {
+                        set response "+"
+                    } else {
+                        set response [binary encode base64 $response]
+                    }
+                    Send $context "AUTHENTICATE $response"
+                }
+            }
+            return
+        }
+        lassign [ParseMsg $line] prefix parts rest
+        if {[lindex $parts 0] eq "PRIVMSG"} {
+            set nick [Getnick $prefix]
+            set target [lindex $parts 1]
+            set msg $rest
+            set type ""
+            if {[regexp {^\001(\S+)(?: (.*))?\001$} $msg -> ctcp data]} {
+                switch -- $ctcp {
+                    ACTION { set type ACTION ; set msg $data }
+                    VERSION {
+                        Send $context "NOTICE $nick :\001VERSION [Version $context]\001"
+                        return
+                    }
+                    PING {
+                        Send $context "NOTICE $nick :\001PING [lindex $data 0]\001"
+                        return
+                    }
+                    TIME {
+                        set time [clock format [clock seconds] \
+                                      -format {%a %b %d %H:%M:%S %Y %Z}]
+                        Send $context "NOTICE $nick :\001TIME $time\001"
+                        return
+                    }
+                    default {
+                        set err [string map [list \001 ""] $msg]
+                        Send $context "NOTICE $nick :\001ERRMSG $err : unknown query\001"
+                        return
+                    }
+                }
+            }
+            Callback $context chat $target $nick $msg $type
+        } elseif {$prefix ne {}} {
+            set server $prefix
+	    lassign $parts code target fourth fifth
+            switch -- $code {
+                001 - 002 - 003 - 004 - 005 - 250 - 251 - 252 -
+                254 - 255 - 265 - 266 { return }
+                433 {
+                    variable nickid ; if {![info exists nickid]} {set nickid 0}
+                    set seqlen [string length [incr nickid]]
+                    set irc(nick) [string range $irc(nick) 0 [expr 8-$seqlen]]$nickid
+                    Send $context "NICK $irc(nick)"
+                }
+                353 { set irc(users) [concat $irc(users) $rest]; return }
+                366 {
+                    Callback $context userlist $fourth $irc(users)
+                    set irc(users) {}
+                    return
+                }
+                332 { Callback $context topic $fourth $rest; return }
+                333 { return }
+                375 { set irc(motd) {} ; return }
+                372 { append irc(motd) $rest ; return}
+                376 {
+                    foreach channel $irc(channels) {
+                        after idle [list [namespace origin Send] \
+                                        $context "JOIN $channel"]
+                    }
+                    return
+                }
+                311 {
+		    lassign $parts code target nick name host x
+                    set irc(whois,$fourth) [list name $name host $host userinfo $rest]
+                    return
+                }
+                301 - 312 - 317 - 320 - 330 - 338 { return }
+                319 { lappend irc(whois,$fourth) channels $rest; return }
+                318 {
+                    if {[info exists irc(whois,$fourth)]} {
+                        Callback $context userinfo $fourth $irc(whois,$fourth)
+                        unset irc(whois,$fourth)
+                    }
+                    return
+                }
+                900 {
+                    Callback $context system "" $rest
+                    return
+                }
+                903 {
+                    # sasl success
+                    Send $context "CAP END"
+                    set irc(is_registered) true
+                    Callback $context system "" "SASL authentication succeeded"
+                    Register $context
+                    return
+                }
+                904 {
+                    # sasl failed, if no mechanism left, non-sasl login
+                    if {![info exists irc(sasl)]} {
+                        Send $context "CAP END"
+                        Callback $context system "" "SASL authentication failed"
+                        Register $context
+                    }
+                    return
+                }
+                905 - 906 {
+                    # sasl aborted
+                    unset irc(sasl)
+                    Send $context "CAP END"
+                    Callback $context system "" "SASL authentication aborted"
+                    Register $context
+                    return
+                }
+                908 {
+                    set provided [split $fourth ,]
+                    while {$irc(sasl:mechs) ne {}} {
+                        set mech [Pop irc(sasl:mechs)]
+                        if {$mech in $provided} {
+                            SASL::configure $irc(sasl) -mechanism $mech
+                            Send $context "AUTHENTICATE $mech"
+                            return
+                        }
+                    }
+                    unset irc(sasl) ;# no more mechanisms
+                    return
+                }
+                JOIN {
+                    set nick [Getnick $server]
+                    Callback $context traffic entered $target $nick
+                    return
+                }
+                NICK {
+                    set nick [Getnick $server]
+                    if {$irc(nick) == $nick} {set irc(nick) $rest}
+                    Callback $context traffic nickchange {} $nick $rest
+                    return
+                }
+                QUIT - PART {
+                    set nick [Getnick $server]
+                    Callback $context traffic left $target $nick
+                    return
+                }
+                MODE {
+                    set nick [Getnick $server]
+                    if {$fourth != ""} {
+                        Callback $context mode $nick $target "$fourth $fifth"
+                    } else {
+                        Callback $context mode $nick $target $rest
+                    }
+                    return
+                }
+                NOTICE {
+                    if {$target in [list $irc(nick) *]} {
+                        set target {}
+                    }
+                    Callback $context chat $target [Getnick $server] $rest NOTICE
+                    return
+                }
+                CAP {
+                    if {$fourth eq "LS"} {
+                        set irc(caps) [split $rest]
+                    } elseif {$fourth eq "ACK" && $rest eq "sasl"} {
+                        Callback $context system "" "SASL authentication supported"
+                        set irc(sasl:mechs) [SASL::mechanisms client]
+                        set irc(sasl:challenge) ""
+                        set mech [Pop irc(sasl:mechs)]
+                        set irc(sasl) [SASL::new -mechanism $mech \
+                                           -callback [list [namespace origin SASLCallback] \
+                                                          $context]]
+                        Send $context "AUTHENTICATE $mech"
+                    }
+                    return
+                }
+            }
+            Callback $context system "" "$parts $rest"
+        } else {
+            Callback $context system "" $line
+        }
+    }
+}
+
+proc ::picoirc::SASLCallback {Irc context command args} {
+    upvar #0 $Irc irc
+    switch -exact -- $command {
+        login    { return $irc(nick) }
+        username { return $irc(nick) }
+        password { return $irc(passwd) }
+        realm    { return "" }
+        hostname { return [info host] }
+        default  { return -code error unxpected }
+    }
+}
+
+proc ::picoirc::post {context channel msg} {
+    upvar #0 $context irc
+    foreach line [split $msg \n] {
+        if [regexp {^/([^ ]+) *(.*)} $line -> cmd msg] {
+            regexp {^([^ ]+)?(?: +(.*))?} $msg -> first rest
+            switch -- $cmd {
+                me {
+                    if {$channel eq ""} {
+                        Callback $context system "" "not in channel"
+                        continue
+                    }
+                    Send $context "PRIVMSG $channel :\001ACTION $msg\001"
+                    Callback $context chat $channel $irc(nick) $msg ACTION
+                }
+                nick {Send $context "NICK $msg"}
+                quit {Send $context "QUIT"}
+                part {Send $context "PART $channel"}
+                names {Send $context "NAMES $channel"}
+                whois {Send $context "WHOIS $msg"}
+                kick {Send $context "KICK $channel $first :$rest"}
+                mode {Send $context "MODE $msg"}
+                topic {Send $context "TOPIC $channel :$msg"}
+                quote {Send $context $msg}
+                join {Send $context "JOIN $msg"}
+                version {Send $context "PRIVMSG $first :\001VERSION\001"}
+                msg - notice {
+                    set type [expr {$cmd == "msg" ? ""        : "NOTICE"}]
+                    set cmd  [expr {$cmd == "msg" ? "PRIVMSG" : "NOTICE"}]
+                    Send $context "$cmd $first :$rest"
+                    Callback $context chat $first $irc(nick) $rest $type
+                }
+                default {Callback $context system $channel "unknown command /$cmd"}
+            }
+            continue
+        }
+        if {$channel eq ""} {
+            Send $context $line
+            continue
+        }
+        Send $context "PRIVMSG $channel :$line"
+        Callback $context chat $channel $irc(nick) $line
+    }
+}
+
+proc ::picoirc::Send {context line} {
+    upvar #0 $context irc
+    # the callback can return -code break to prevent writing to socket
+    if {[catch {Callback $context debug write $line}] != 3} {
+        puts $irc(socket) $line
+    }
+}
+
+# -------------------------------------------------------------------------
+
+package provide picoirc 0.13.0
+
+# -------------------------------------------------------------------------
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/irc/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/irc/pkgIndex.tcl
new file mode 100644
index 00000000..ba244cfa
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/irc/pkgIndex.tcl
@@ -0,0 +1,7 @@
+# pkgIndex.tcl -*- tcl -*-
+if { ![package vsatisfies [package provide Tcl] 8.6] } {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded irc     0.7.0 [list source [file join $dir irc.tcl]]
+package ifneeded picoirc 0.13.0 [list source [file join $dir picoirc.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/javascript/javascript.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/javascript/javascript.tcl
new file mode 100644
index 00000000..27abc550
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/javascript/javascript.tcl
@@ -0,0 +1,453 @@
+# javascript.tcl --
+#
+#	This file contains procedures that create HTML and Java Script
+#	functions that implement objects such as:
+#
+#		paired multi-selection boxes
+#		guarded submit buttons
+#		parent and child checkboxes
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: javascript.tcl,v 1.5 2005/09/30 05:36:39 andreas_kupries Exp $
+
+package require Tcl 8
+package require ncgi 1
+package provide javascript 1.0.2
+
+
+namespace eval ::javascript {
+
+    # The SelectionObjList namespace variable is used to keep the list of
+    # selection boxes that were created as parts of paired multi-selection
+    # boxes.  When a submit button is made for pages that have paired
+    # multi-selection boxes, we set a hidden field to store the initial values
+    # in the box.
+
+    variable SelectionObjList {}
+}
+
+# ::javascript::BeginJS --
+#
+#	Create HTML code to begin a java script program.
+#
+# Arguments:
+#	none.
+#
+# Results:
+#	Returns HTML code.
+
+proc ::javascript::BeginJS {} {
+    return "\n<SCRIPT LANGUAGE=\"JavaScript\">\n"
+}
+
+# ::javascript::EndJS --
+#
+#	Create HTML code to end a java script program.
+#
+# Arguments:
+#	none.
+#
+# Results:
+#	Returns HTML code.
+
+proc ::javascript::EndJS {} {
+    return "\n</SCRIPT>\n"
+}
+
+# ::javascript::MakeMultiSel --
+#
+#	Construct HTML code to create a multi-selection box.
+#
+# Arguments:
+#	id		The suffix of all HTML objects in this megawidget.
+#	side		Either "left" or "right".
+#	eltValues	The values to populate the selection box with.
+#	eltNames	The values to populate the selection box with.
+#	emptyElts	The number of empty box entry to stuff in the
+#			Selection box as placeholders for elts to be added.
+#	length		The number of elts to show before adding a vertical
+#			scrollbar.
+#	minWidth	Number of spaces to determin the minimum box width.
+#
+# Results:
+#	Returns HTML to show the selection box.
+
+proc ::javascript::MakeMultiSel {id side eltValues eltNames emptyElts \
+	length minWidth} {
+
+    variable SelectionObjList
+
+    # Add this selection box to the list.
+
+    set name "$side$id"
+    lappend SelectionObjList $name
+
+    # Create the selection box and populate it with elts.
+
+    set html ""
+    append html "<select name=$name multiple size=$length>"
+    foreach elt $eltValues name $eltNames {
+	set encodedElt [ncgi::encode $elt]
+	append html "<option value=$encodedElt>$name"
+    }
+
+    # Add empty values for the remaining elements.
+
+    for {set i 0} {$i < $emptyElts} {incr i} {
+	append html "<option value=\"\"> "
+    }
+
+    # Add an empty value with text that is as wide as the minWidth.
+
+    set filler ""
+    for {set i 0} {$i < $minWidth} {incr i} {
+	append filler "&nbsp;&nbsp;"
+    }
+    append html "<option value=\"\">$filler"
+
+    append html "</select>"
+    return $html
+}
+
+# ::javascript::MakeClickProc --
+#
+#	Create a "moveSelected$id" java script procedure to move selected items
+#	from one selection box to the other.
+#
+# Arguments:
+#	id	The suffix of all objects in this multiselection megawidget.
+#
+# Results:
+#	Returns java script code.
+
+proc ::javascript::MakeClickProc {id} {
+
+    set result "\nfunction moveSelected${id}(fromObj,toObj) \{\n"
+
+    # If nothing is selected, do nothing.
+
+    append result "\n    if (fromObj.selectedIndex > -1) \{"
+
+    # Find the first empty element in the toObj.
+
+    append result {
+        for (var k = 0; toObj.options[k].value != ""; k++) {}
+}
+
+    # Move the selected elements from the fromObj to the end of the toObj.
+    # Shift the objects in the fromObj to fill any empty spots.
+    # Clear out any extra slots in the fromObj.
+    # Deselect any selected elements (deselect with both 'selected = false'
+    # and by setting selectedIndex to -1, because setting selectedIndex to
+    # -1 didn't seem to clear selection on all windows browsers.
+
+    append result {
+        for (var i = fromObj.selectedIndex, j = fromObj.selectedIndex; fromObj.options[i].value != ""; i++) {
+            if (fromObj.options[i].selected) {
+                toObj.options[k].text = fromObj.options[i].text
+                toObj.options[k++].value = fromObj.options[i].value
+                fromObj.options[i].selected = false
+            } else {
+                fromObj.options[j].text = fromObj.options[i].text
+                fromObj.options[j++].value = fromObj.options[i].value
+            }
+        }
+        for (; j < i; j++) {
+            fromObj.options[j].text = ""
+            fromObj.options[j].value = ""
+        }
+        fromObj.selectedIndex = -1
+}
+
+    # Close the if statement and the function
+
+    append result "    \}
+\}
+"
+    return $result
+}
+
+# ::javascript::makeSelectorWidget --
+#
+#	Construct HTML code to create a dual-multi-selection megawidget.  This
+#	megawidget consists of two side-by-side multi-selection boxes
+#	separated by a left arrow and a right arrow button.  The right arrow
+#	button moves all items selected in the left box to the right box.  The
+#	left arrow button moves all items selected in the right box to the left
+#	box.
+#
+# Arguments:
+#	id		The suffix of all HTML objects in this megawidget.
+#	leftLabel	The text that appears above the left selection box.
+#	leftValueList	The values of items in the left selection box.
+#	leftNameList	The names to appear in the left selection box.
+#	rightLabel	The text that appears above the right selection box.
+#	rightValueList	The values of items in the right selection box.
+#	rightNameList	The names to appear in the right selection box.
+#	length		(optional) The number of elts to show before adding a
+#			vertical scrollbar.  Defaults to 8.
+#	minWidth	(optional) The number of spaces to determin the
+#			minimum box width.  Defaults to 32.
+#
+# Results:
+#	Returns HTML to show the dual-multi-selection megawidget.
+
+proc ::javascript::makeSelectorWidget {id leftLabel leftValueList leftNameList \
+	rightLabel rightValueList rightNameList {length 8} {minWidth 32}} {
+
+    set html ""
+    append html [BeginJS] \
+	    [MakeClickProc $id] \
+	    [EndJS]
+
+    append html "<table border=0 cellspacing=0 cellpadding=2>\n<tr><th>" \
+	    $leftLabel "</th><th></th><th>" $rightLabel "</th></tr>\n<tr>"
+
+    set leftLen [llength $leftValueList]
+    set rightLen [llength $rightValueList]
+    set len [expr {$leftLen + $rightLen}]
+
+    append html "<td valign=top colspan=1>" \
+	    [MakeMultiSel $id "left" $leftValueList $leftNameList \
+		$rightLen $length $minWidth] \
+	    "&nbsp;&nbsp;</td>\n"
+
+    append html "<td>" \
+	    "<table border=0 cellspacing=0 cellpadding=2>\n"
+
+    set args "this.form.left${id},this.form.right${id}"
+
+    append html "<tr><td><input type=button name=left${id}Button
+    onClick=\"moveSelected${id}(${args})\" value=\" >> \"></td></tr>"
+
+    set args "this.form.right${id},this.form.left${id}"
+
+    append html "<tr><td><input type=button name=right${id}Button
+	onClick=\"moveSelected${id}(${args})\" value=\" << \"></td></tr>"
+
+    append html "</table>\n" \
+	    "</td>\n"
+
+    append html "<td valign=top colspan=1>" \
+	    [MakeMultiSel $id "right" $rightValueList $rightNameList \
+		$leftLen $length $minWidth] \
+	    "&nbsp;&nbsp;</td>\n"
+
+    append html "</tr>\n" \
+	    "</table>\n"
+
+    # Add a hidden field to collect the data.
+
+    append html "<input type=hidden name=valleft${id} " \
+	    "value=\"$leftValueList\">\n" \
+	    "<input type=hidden name=valright${id} " \
+	    "value=\"$rightValueList\">\n"
+
+    return $html
+}
+
+# ::javascript::makeSubmitButton --
+#
+#	Create an HTML submit button that resets a hidden field for each
+#	registered multi-selection box.
+#
+# Arguments:
+#	name	the name of the HTML button object to create.
+#	value	the label of the HTML button object to create.
+#
+# Results:
+#	Returns HTML submit button code.
+
+proc ::javascript::makeSubmitButton {name value} {
+    variable SelectionObjList
+    set html ""
+
+    # Create the java script procedure that gathers the current values for each
+    # registered multi-selection box.
+
+    append html [BeginJS]
+    append html "\nfunction getSelections(form) \{\n"
+
+    # For each registered selection box, reset hidden field to
+    # store nonempty values.
+
+    foreach obj $SelectionObjList {
+	set selObj "form.$obj"
+	set hiddenObj "form.val$obj"
+	append html "    var tmp$obj = \"\"\n"
+	append html "    for (var i$obj = 0; i$obj < $selObj.length; i$obj++) {\n"
+	append html "        if ($selObj.options\[i$obj\].value == \"\") {\n"
+	append html "            break\n"
+	append html "        }\n"
+	append html "        tmp$obj += \" \" + $selObj.options\[i$obj\].value\n"
+	append html "    }\n"
+	append html "    $hiddenObj.value = tmp$obj \n"
+    }
+    append html "\}\n"
+    append html [EndJS]
+
+    # Empty the selection box for the next page.
+
+    set SelectionObjList {}
+
+    # Create the HTML submit button.
+
+    append html "<input type=submit name=\"$name\" value=\"$value\" 
+    onClick=\"getSelections(this.form)\">"
+
+    return $html
+}
+
+# ::javascript::makeProtectedSubmitButton --
+#
+#	Create an HTML submit button that prompts the user with a
+#	continue/cancel shutdown warning before the form is submitted.
+#
+# Arguments:
+#	name	the name of the HTML button object to create.
+#	value	the label of the HTML button object to create.
+#	msg	The message to display when the button is pressed.
+#
+# Results:
+#	Returns HTML submit button code.
+
+proc ::javascript::makeProtectedSubmitButton {name value msg} {
+    set html ""
+
+    # Create the java script procedure that gives the user the option to cancel
+    # the server shutdown request.
+
+    append html [BeginJS]
+    append html "\nfunction areYouSure${name}(form) \{\n"
+    append html "    if (confirm(\"$msg\")) \{\n"
+    append html "        return true\n"
+    append html "    \} else \{\n"
+    append html "        return false\n"
+    append html "    \}\n"
+    append html "\}\n"
+    append html [EndJS]
+
+    # Create the HTML submit button.
+
+    append html "<input type=submit name=\"$name\" value=\"$value\" 
+    onClick=\"return areYouSure${name}(this.form)\">"
+
+    return $html
+}
+
+# ::javascript::makeMasterButton --
+#
+#	Create an HTML button that sets it's slave checkboxs to the boolean
+#	value.
+#
+# Arguments:
+#	master	the name of the child's parent html checkbox object.
+#	value	the value of the master.
+#	slaves	the name of child html checkbox object to create.
+#	boolean	the java script boolean value that will be given to all the
+#		slaves.  Must be true or false.
+#
+# Results:
+#	Returns HTML code to create the child checkbox.
+
+proc ::javascript::makeMasterButton {master value slavePattern boolean} {
+    set html ""
+
+    # Create the java script "checkMaster$name" proc that gets called when the
+    # master checkbox is selected or de-selected.
+
+    append html [BeginJS]
+    append html "\nfunction checkMaster${master}(form) \{\n"
+    append html "    for (var i = 0; i < form.elements.length; i++) \{\n"
+    append html "        if (form.elements\[i\].name.match('$slavePattern')) \{\n"
+    append html "            form.elements\[i\].checked = $boolean \n"
+    append html "        \}\n"
+    append html "    \}\n"
+
+    append html "\}\n"
+    append html [EndJS]
+    
+    # Create the HTML button object.
+
+    append html "<input type=button name=\"$master\" value=\"$value\" " \
+	    "onClick=\"checkMaster${master}(this.form)\">\n"
+
+    return $html
+}
+
+# ::javascript::makeParentCheckbox --
+#
+#	Create an HTML checkbox and tie its value to that of it's child
+#	checkbox.  If the parent is unchecked, the child is automatically
+#	unchecked.
+#
+# Arguments:
+#	parentName	the name of parent html checkbox object to create.
+#	childName	the name of the parent's child html checkbox object
+# Results:
+#	Returns HTML code to create the child checkbox.
+
+proc ::javascript::makeParentCheckbox {parentName childName} {
+    set parentObj "form.$parentName"
+    set childObj "form.$childName"
+    set html ""
+
+    # Create the java script "checkParent$name" proc that gets called when the
+    # parent checkbox is selected or de-selected.
+
+    append html [BeginJS]
+    append html "\nfunction checkParent${parentName}(form) \{\n"
+    append html "    if (!$parentObj.checked && $childObj.checked) \{\n"
+    append html "        $childObj.checked = false\n"
+    append html "    \}\n"
+    append html "\}\n"
+    append html [EndJS]
+
+    # Create the HTML checkbox object.
+
+    append html "<input type=checkbox name=$parentName value=1 " \
+	    "onClick=\"checkParent${parentName}(this.form)\">"
+
+    return $html
+}
+
+# ::javascript::makeChildCheckbox --
+#
+#	Create an HTML checkbox and tie its value to that of it's parent
+#	checkbox.  If the child is checked, the parent is automatically
+#	checked.
+#
+# Arguments:
+#	parentName	the name of the child's parent html checkbox object
+#	childName	the name of child html checkbox object to create.
+#
+# Results:
+#	Returns HTML code to create the child checkbox.
+
+proc ::javascript::makeChildCheckbox {parentName childName} {
+    set parentObj "form.$parentName"
+    set childObj "form.$childName"
+    set html ""
+
+    # Create the java script "checkChild$name" proc that gets called when the
+    # child checkbox is selected or de-selected.
+
+    append html [BeginJS]
+    append html "\nfunction checkChild${childName}(form) \{\n"
+    append html "    if ($childObj.checked && !$parentObj.checked) \{\n"
+    append html "        $parentObj.checked = true\n"
+    append html "    \}\n"
+    append html "\}\n"
+    append html [EndJS]
+
+    # Create the HTML checkbox object.
+
+    append html "<input type=checkbox name=$childName value=1 " \
+	    "onClick=\"checkChild${childName}(this.form)\">"
+
+    return $html
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/javascript/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/javascript/pkgIndex.tcl
new file mode 100644
index 00000000..3387be79
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/javascript/pkgIndex.tcl
@@ -0,0 +1,4 @@
+# Tcl package index file, version 1.1
+
+if {![package vsatisfies [package provide Tcl] 8]} {return}
+package ifneeded javascript 1.0.2 [list source [file join $dir javascript.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/jpeg/jpeg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/jpeg/jpeg.tcl
new file mode 100644
index 00000000..0c37f901
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/jpeg/jpeg.tcl
@@ -0,0 +1,1125 @@
+# jpeg.tcl --
+#
+#       Querying and modifying JPEG image files.
+#
+# Copyright (c) 2004    Aaron Faupell <afaupell@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: jpeg.tcl,v 1.19 2011/05/06 13:39:27 patthoyts Exp $
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+namespace eval ::jpeg {}
+
+# ### ### ### ######### ######### #########
+## Notes :: Structure of jpeg files.
+
+# Base types
+#
+# BYTE    = 1 byte
+# SHORT   = 2 bytes, endianess determined by context.
+# BESHORT = 2 bytes, big endian
+# INT     = 4 bytes, endianess determined by context.
+
+# JPEG types
+#
+# JPEG = <
+#   BYTE     [2] == 0xFF 0xD8 (SOI (Start Of Image))
+#   JSEGMENT [.] 1 or more jpeg segments, variadic size
+#   BYTE     [2] == 0xFF 0xD9 (EOI (End Of Image))
+# >
+#
+# JSEGMENT = <
+#   BYTE    [1]   == 0xFF
+#   BYTE    [1]   Segment Tag, type marker
+#   BESHORT [1]   Segment Length N
+#   BYTE    [N-2] Segment Data, interpreted dependent on tag.
+# >
+#
+# Notable segments, and their structure.
+#
+# Comment = JSEGMENT (Tag = 0xFE, Data = <
+#
+# >)
+
+
+# Type 0xFE (Comment)
+# Data BYTE [ ]
+# Note: Multiple comment segments are allowed.
+
+# Type 0xC0/0xC1/0xC2/0xC3 (Start of Frame)
+# Data BYTE    [1] Precision
+#      BESHORT [1] Height
+#      BESHORT [1] Width
+#      BYTE    [1] Number of color components
+#      ...
+
+# Type 0xEx (x=0-9A-F) (App0 - App15)
+# Data It is expected that the data starts with a checkable marker, as
+#      the app segments can be used by multiple applications for
+#      different purposes. I.e. a sub-type is needed before the
+#      segment data can be processed.
+
+# App0/JFIF image info
+# Type 0xE0
+# Data BYTE    [5] 'JFIF\0'	JFIF sub-type marker
+#      BYTE    [1] Version1 (major)
+#      BYTE    [1] Version2 (minor)
+#      BYTE    [1] Units
+#      BESHORT [1] X-density (dots per inch ?)
+#      BESHORT [1] Y-density
+#      BYTE    [1] X-thumb   (Width  of thumbnail, if any, or zero)
+#      BYTE    [1] Y-thumb   (Height of thumbnail, if any, or zero)
+
+# App0/JFXX extended image information
+# Type 0xE0
+# Data BYTE    [5] 'JFXX\0'	JFXX sub-type marker
+#      BYTE    [1] Extension code 10 -> JPEG thumbnail
+#                                 11 -> Palletized thumbnail
+#                                 13 -> RGB thumbnail
+#      BYTE    [ ] Data per the extension code.
+
+# App1/EXIF
+# Type 0xE1
+# Data BYTE  [6] 'Exif\0\0' EXIF sub-type marker. (1)
+#      BYTE  [2] Byte Order  0x4d 0x4d = big endian
+#                         or 0x49 0x49 = small endian
+#      SHORT [1] Magic == 42 under the specified byteorder.
+#      INT   [1] Next  == Offset to the first actual EXIF data block.
+#
+# EXIF data block structure (IFD = Image File Directory)
+#
+# 1. SHORT [1] Number N of exif entries
+# 2. ENTRY [N] Array of exif entries
+# 3. INT   [1] Offset to the next EXIF data block, or <0 for the last block.
+#
+
+# exif ENTRY structure
+#
+# 1. SHORT [1] num
+# 2. SHORT [1] tag    = exif key
+# 3. SHORT [1] format
+# 4. INT   [1] component
+# 5. INT   [1] value
+
+# The 'value is interpreted dependent on the values of tag, format,
+# and component.
+#
+# A.  Tag in ( 0x8769, 0xA005 )
+#     Value is offset to a subordinate exif data block, process recursively.
+# B.  Size = components * sizeof(format)
+# B1. Size > 4
+#     Value is offset to the actual value.
+# B2. Size <= 4
+#     Value is the actual value.
+
+# Usually a jpeg with exif information has two exif data blocks. The
+# first is the main block, the second the thumbnail block.
+#
+# Note that all the exif data structures are within the app1/exif
+# segment.
+#
+# (1) The offset of the first byte after the exif marker is what all
+#     the offsets in exif are relative to.
+
+# Type 0xDA (SOS, Start of Stream/Scan)
+# Followed by the JPEG data. Last segment before EOI
+
+# ### ### ### ######### ######### #########
+
+# open a file, check jpeg signature, and a return a file handle
+# at the start of the first marker
+proc ::jpeg::openJFIF {file {mode r}} {
+    set fh [open $file $mode]
+    fconfigure $fh -encoding binary -translation binary -eofchar {}
+    # jpeg sig is FFD8, FF is start of first marker
+    if {[read $fh 3] != "\xFF\xD8\xFF"} { close $fh; return -code error "not a jpg file" }
+    # rewind to first marker
+    seek $fh -1 current
+    return $fh
+}
+
+# return a boolean indicating if a file starts with the jpeg sig
+proc ::jpeg::isJPEG {file} {
+    set is [catch {openJFIF $file} fh]
+    catch {close $fh}
+    return [expr {!$is}]
+}
+
+# takes an open filehandle at the start of a jpeg marker, and returns a list
+# containing information about the file markers in the jpeg file. each list
+# element itself a list of the marker type, offset of the start of its data,
+# and the length of its data.
+proc ::jpeg::markers {fh} {
+    set chunks [list]
+    while {[read $fh 1] == "\xFF"} {
+        binary scan [read $fh 3] H2S type len
+        # convert to unsigned
+        set len [expr {$len & 0x0000FFFF}]
+        # decrement len to account for marker bytes
+        incr len -2
+        lappend chunks [list $type [tell $fh] $len]
+        seek $fh $len current
+    }
+    # chunks = list (list (type offset length) ...)
+    return $chunks
+}
+
+proc ::jpeg::imageInfo {file} {
+    set fh [openJFIF $file r]
+    set data {}
+    if {[set app0 [lsearch -inline [markers $fh] "e0 *"]] != ""} {
+        seek $fh [lindex $app0 1] start
+        set id [read $fh 5]
+        if {$id == "JFIF\x00"} {
+            binary scan [read $fh 9] cccSScc ver1 ver2 units xr yr xt yt
+            set data [list version $ver1.$ver2 units $units xdensity $xr ydensity $yr xthumb $xt ythumb $yt]
+        }
+    }
+    close $fh
+    return $data
+}
+
+# return an images dimensions by reading the Start Of Frame marker
+proc ::jpeg::dimensions {file} {
+    set fh [openJFIF $file]
+    set sof [lsearch -inline [markers $fh] {c[0-3] *}]
+    seek $fh [lindex $sof 1] start
+    binary scan [read $fh 5] cSS precision height width
+    close $fh
+    return [list $width $height]
+}
+
+# returns a list of all comments (FE segments) in the file
+proc ::jpeg::getComments {file} {
+    set fh [openJFIF $file]
+    set comments {}
+    foreach x [lsearch -all -inline [markers $fh] "fe *"] {
+        seek $fh [lindex $x 1] start
+        lappend comments [read $fh [lindex $x 2]]
+    }
+    close $fh
+    return $comments
+}
+
+# add a new comment to the file
+proc ::jpeg::addComment {file comment args} {
+    set fh [openJFIF $file r+]
+    # find the SoF and save all data after it
+    set sof [lsearch -inline [markers $fh] {c[0-3] *}]
+    seek $fh [expr {[lindex $sof 1] - 4}] start
+    set data2 [read $fh]
+    # seek back to the SoF and write comment(s) segment
+    seek $fh [expr {[lindex $sof 1] - 4}] start
+    foreach x [linsert $args 0 $comment] {
+        if {$x == ""} continue
+        puts -nonewline $fh [binary format a2Sa* "\xFF\xFE" [expr {[string length $x] + 2}] $x]
+    }
+    # write the saved data bac
+    puts -nonewline $fh $data2
+    close $fh
+}
+
+proc ::jpeg::replaceComment {file comment} {
+    set com [getComments $file]
+    removeComments $file
+    eval [list addComment $file] [lreplace $com 0 0 $comment]
+}
+
+# removes all comment segments from the file
+proc ::jpeg::removeComments {file} {
+    set fh [openJFIF $file]
+    set data "\xFF\xD8"
+    foreach marker [markers $fh] {
+        if {[lindex $marker 0] != "fe"} {
+            # seek back 4 bytes to include the marker and length bytes
+            seek $fh [expr {[lindex $marker 1] - 4}] start
+            append data [read $fh [expr {[lindex $marker 2] + 4}]]
+        }
+    }
+    append data [read $fh]
+    close $fh
+    set fh [open $file w]
+    fconfigure $fh -encoding binary -translation binary -eofchar {}
+    puts -nonewline $fh $data
+    close $fh
+}
+
+# rewrites a jpeg file and removes all metadata (comments, exif, photoshop)
+proc ::jpeg::stripJPEG {file} {
+    set fh [openJFIF $file]
+    set data {}
+    
+    set markers [markers $fh]
+    # look for a jfif header segment and save it
+    if {[lindex $markers 0 0] == "e0"} {
+        seek $fh [lindex $markers 0 1] start
+        if {[read $fh 5] == "JFIF\x00"} {
+            seek $fh -9 current
+            set jfif [read $fh [expr {[lindex $markers 0 2] + 4}]]
+        }
+    }
+    # if we dont have a jfif header (exif files), create a fake one
+    if {![info exists jfif]} {
+        set jfif [binary format a2Sa5cccSScc "\xFF\xE0" 16 "JFIF\x00" 1 2 1 72 72 0 0]
+    }
+
+    # remove all the e* and f* markers (metadata)
+    foreach marker $markers {
+        if {![string match {[ef]*} [lindex $marker 0]]} {
+            seek $fh [expr {[lindex $marker 1] - 4}] start
+            append data [read $fh [expr {[lindex $marker 2] + 4}]]
+        }
+    }
+    append data [read $fh]
+
+    close $fh
+    set fh [open $file w+]
+    fconfigure $fh -encoding binary -translation binary -eofchar {}
+    # write a jpeg file sig, a jfif header, and all the remaining data
+    puts -nonewline $fh \xFF\xD8$jfif$data
+    close $fh
+}
+
+# if file contains a jpeg thumbnail return it. the returned data is the actual
+# jpeg data, it can be written directly to a file
+proc ::jpeg::getThumbnail {file} {
+    # check if the exif information contains a thumbnail
+    array set exif [getExif $file thumbnail]
+    if {[info exists exif(Compression)] && \
+             $exif(Compression) == 6 && \
+             [info exists exif(JPEGInterchangeFormat)] && \
+             [info exists exif(JPEGInterchangeFormatLength)]} {
+        set fh [openJFIF $file]
+        seek $fh [expr {$exif(ExifOffset) + $exif(JPEGInterchangeFormat)}] start
+        set thumb [read $fh $exif(JPEGInterchangeFormatLength)]
+        close $fh
+        return $thumb
+    }
+    # check for a JFXX segment which contains a thumbnail
+    set fh [openJFIF $file]
+    foreach x [lsearch -inline -all [markers $fh] "e0 *"] {
+        seek $fh [lindex $x 1] start
+        binary scan [read $fh 6] a5H2 id excode
+        # excode 10 is jpeg encoding, we cant interpret the other types
+        if {$id == "JFXX\x00" && $excode == "10"} {
+            set thumb [read $fh [expr {[lindex $x 2] - 6}]]
+            close $fh
+            return $thumb
+        }
+    }
+    close $fh
+}
+
+
+# takes key-value pairs returned by getExif and converts their values into
+# human readable format
+proc ::jpeg::formatExif {exif} {
+    variable exif_values
+    set out {}
+    foreach {tag val} $exif {
+        if {[info exists exif_values($tag,$val)]} {
+            set val $exif_values($tag,$val)
+        } elseif {[info exists exif_values($tag,)]} {
+            set val $exif_values($tag,)
+        } else {
+            switch -exact -- $tag {
+                UserComment {set val [string trim [string range $val 8 end] \x00]}
+                ComponentsConfiguration {binary scan $val cccc a b c d; set val $a,$b,$c,$d}
+                ExifVersion {set val [expr [string range $val 0 1].[string range $val 2 3]]}
+                FNumber {set val [format %2.1f $val]}
+                MaxApertureValue -
+                ApertureValue {
+                    if {$val > 0} {
+                        set val [format %2.1f [expr {2 * (log($val) / log(2))}]]
+                    }
+                }
+                ShutterSpeedValue {
+                    set val [expr {pow(2, $val)}]
+                    if {abs(round($val) - $val) < 0.2} {set val [expr {round($val)}]}
+                    set val 1/[string trimright [string trimright [format %.2f $val] 0] .]
+                }
+                ExposureTime {
+                    set val 1/[string trimright [string trimright [format %.4f [expr {1 / $val}]] 0] .]
+                }
+            }
+        }
+        lappend out $tag $val
+    }
+    return $out
+}
+
+# returns a list of all known exif keys
+proc ::jpeg::exifKeys {} {
+    variable exif_tags
+    set ret {}
+    foreach {x y} [array get exif_tags] {lappend ret $y}
+    return $ret
+}
+
+proc ::jpeg::getExif {file {type main}} {
+    set fh [openJFIF $file]
+    set r [catch {getExifFromChannel $fh $type} err]
+    close $fh
+    return -code $r $err
+}
+
+proc ::jpeg::getExifFromChannel {chan {type main}} {
+    # foreach because file may have multiple e1 markers
+    foreach app1 [lsearch -inline -all [markers $chan] "e1 *"] {
+        seek $chan [lindex $app1 1] start
+        # check that this e1 is really an Exif segment
+        if {[read $chan 6] != "Exif\x00\x00"} continue
+        # save offset because exif offsets are relative to this
+        set start [tell $chan]
+        # next 2 bytes determine byte order
+        binary scan [read $chan 2] H4 byteOrder
+        if {$byteOrder == "4d4d"} {
+            set byteOrder big
+        } elseif {$byteOrder == "4949"} {
+            set byteOrder little
+        } else {
+            return -code error "invalid byte order magic"
+        }
+        # the answer is 42, if we have our byte order correct
+        _scan $byteOrder [read $chan 6] si magic next
+        if {$magic != 42} { return -code error "invalid byte order"}
+
+        seek $chan [expr {$start + $next}] start
+        if {$type != "thumbnail"} {
+	    if {$type != "main"} {
+		return -code error "Bad type \"$type\", expected one of \"main\", or \"thumbnail\""
+	    }
+            set data [_exif $chan $byteOrder $start]
+        } else {
+            # number of entries in this exif block
+            _scan $byteOrder [read $chan 2] s num
+            # each entry is 12 bytes
+            seek $chan [expr {$num * 12}] current
+            # offset of next exif block (for thumbnail)
+            _scan $byteOrder [read $chan 4] i next
+            if {$next <= 0} { return }
+            # but its relative to start
+            seek $chan [expr {$start + $next}] start
+            set data [_exif $chan $byteOrder $start]
+        }
+        lappend data ExifOffset $start ExifByteOrder $byteOrder
+        return $data
+    }
+    return
+}
+
+proc ::jpeg::removeExif {file} {
+    set fh [openJFIF $file]
+    set data {}
+    set markers [markers $fh]
+    if {[lsearch $markers "e1 *"] < 0} { close $fh; return }
+    foreach marker $markers {
+        if {[lindex $marker 0] != "e1"} {
+            seek $fh [expr {[lindex $marker 1] - 4}] start
+            append data [read $fh [expr {[lindex $marker 2] + 4}]]
+        } else {
+            seek $fh [lindex $marker 1] start
+            if {[read $fh 6] == "Exif\x00\x00"} continue
+            seek $fh -10 current
+            append data [read $fh [expr {[lindex $marker 2] + 4}]]
+        }
+    }
+    append data [read $fh]
+    close $fh
+    set fh [open $file w]
+    fconfigure $fh -encoding binary -translation binary -eofchar {}
+    puts -nonewline $fh "\xFF\xD8"
+    if {[lindex $markers 0 0] != "e0"} {
+        puts -nonewline $fh [binary format a2Sa5cccSScc "\xFF\xE0" 16 "JFIF\x00" 1 2 1 72 72 0 0]
+    }
+    puts -nonewline $fh $data
+    close $fh
+}
+
+proc ::jpeg::_exif2 {data} {
+    variable exif_tags
+    set byteOrder little
+    set start 0
+    set i 2
+    for {_scan $byteOrder $data @0s num} {$num > 0} {incr num -1} {
+        binary scan $data @${i}H2H2 t1 t2
+        if {$byteOrder == "big"} {
+            set tag $t1$t2
+        } else {
+            set tag $t2$t1
+        }
+        incr i 2
+        _scan $byteOrder $data @${i}si format components
+        incr i 6
+        set value [string range $data $i [expr {$i + 3}]]
+        if {$tag == "8769" || $tag == "a005"} {
+            _scan $byteOrder $value i next
+            #set pos [tell $fh]
+            #seek $fh [expr {$offset + $next}] start
+            #eval lappend return [_exif $fh $byteOrder $offset]
+            #seek $fh $pos start
+            continue
+        }
+        if {![info exists exif_formats($format)]} continue
+        if {[info exists exif_tags($tag)]} { set tag $exif_tags($tag) }
+        set size [expr {$exif_formats($format) * $components}]
+        if {$size > 4} {
+            _scan $byteOrder $value i value
+            #puts "$value"
+            #set value [string range $data [expr {$i + $offset + $value}] [expr {$size - 1}]]
+        }
+        lappend ret $tag [_format $byteOrder $value $format $components]
+    }
+}
+
+# reads an exif block and returns key-value pairs
+proc ::jpeg::_exif {fh byteOrder offset {tag_info exif_tags}} {
+    variable exif_formats
+    variable exif_tags
+    variable gps_tags
+    set return {}
+    for {_scan $byteOrder [read $fh 2] s num} {$num > 0} {incr num -1} {
+        binary scan [read $fh 2] H2H2 t1 t2
+        _scan $byteOrder [read $fh 6] si format components
+        if {$byteOrder == "big"} {
+            set tag $t1$t2
+        } else {
+            set tag $t2$t1
+        }
+        set value [read $fh 4]
+        # special tags, they point to more exif blocks
+        if {$tag == "8769" || $tag == "a005"} {
+            _scan $byteOrder $value i next
+            set pos [tell $fh]
+            seek $fh [expr {$offset + $next}] start
+            eval lappend return [_exif $fh $byteOrder $offset]
+            seek $fh $pos start
+            continue
+        }
+	# special tag, another exif block holding GPS/location information.
+	if {$tag == "8825"} {
+            _scan $byteOrder $value i next
+            set pos [tell $fh]
+            seek $fh [expr {$offset + $next}] start
+            eval lappend return [_exif $fh $byteOrder $offset gps_tags]
+            seek $fh $pos start
+            continue
+	}
+        if {![info exists exif_formats($format)]} continue
+	upvar 0 $tag_info thetags
+        if {[info exists thetags($tag)]} { set tag $thetags($tag) }
+        set size [expr {$exif_formats($format) * $components}]
+        # if the data is over 4 bytes, its stored later in the file, with the
+        # data being the offset relative to the exif header
+        if {$size > 4} {
+            set pos [tell $fh]
+            _scan $byteOrder $value i value
+            seek $fh [expr {$offset + $value}] start
+            set value [read $fh $size]
+            seek $fh $pos start
+        }
+        lappend return $tag [_format $byteOrder $value $format $components]
+    }
+    return $return
+}
+
+proc ::jpeg::MakerNote {offset byteOrder Make data} {
+    if {$Make == "Canon"} {
+        set data [MakerNoteCanon $offset $byteOrder $data]
+    } elseif {[string match Nikon* $data] || $Make == "NIKON"} {
+        set data [MakerNoteNikon $offset $byteOrder $data]
+    } elseif {[string match FUJIFILM* $data]} {
+        set data [MakerNoteFuji $offset $byteOrder $data]
+    } elseif {[string match OLYMP* $data]} {
+        set data [MakerNoteOlympus $offset $byteOrder $data]
+    }
+    return $data
+}
+
+proc ::jpeg::MakerNoteNikon {offset byteOrder data} {
+    variable exif_formats
+    set return {}
+    if {[string match Nikon* $data]} {
+        set i 8
+    } else {
+        set i 0
+    }
+    binary scan $data @8s num
+    incr i 2
+    puts [expr {($num * 12) + $i}]
+    puts [string range $data 142 150]
+    #exit
+    for {} {$num > 0} {incr num -1} {
+        binary scan $data @${i}H2H2 t1 t2
+        if {$byteOrder == "big"} {
+            set tag $t1$t2
+        } else {
+            set tag $t2$t1
+        }
+        incr i 2
+        _scan $byteOrder $data @${i}si format components
+        incr i 6
+        set value [string range $data $i [expr {$i + 3}]]
+        if {![info exists exif_formats($format)]} continue
+        #if {[info exists exif_tags($tag)]} { set tag $exif_tags($tag) }
+        set size [expr {$exif_formats($format) * $components}]
+        if {$size > 4} {
+            _scan $byteOrder $value i value
+            puts "$value"
+            set value 1
+            #set value [string range $data [expr {$i + $offset + $value}] [expr {$size - 1}]]
+        } else {
+        
+        lappend ret $tag [_format $byteOrder $value $format $components]
+        }
+        puts "$tag $format $components $value"
+    }
+    return $return
+}
+
+proc ::jpeg::debug {file} {
+    set fh [openJFIF $file]
+
+    puts "marker: d8 length: 0"
+    puts "  SOI (Start Of Image)"
+
+    foreach marker [markers $fh] {
+        seek $fh [lindex $marker 1] 
+        puts "marker: [lindex $marker 0] length: [lindex $marker 2]"
+        switch -glob -- [lindex $marker 0] {
+            c[0-3] {
+                binary scan [read $fh 6] cSSc precision height width color
+                puts "  SOF (Start Of Frame) [string map {c0 "Baseline" c1 "Non-baseline" c2 "Progressive" c3 "Lossless"} [lindex $marker 0]]"
+                puts "    Image dimensions: $width $height"
+                puts "    Precision: $precision"
+                puts "    Color Components: $color"
+            }
+            c4 {
+                puts "  DHT (Define Huffman Table)"
+                binary scan [read $fh 17] cS bits symbols
+                puts "    $symbols symbols"
+            }
+            da {
+                puts "  SOS (Start Of Scan)"
+                binary scan [read $fh 2] c num
+                puts "    Components: $num"
+            }
+            db {
+                puts "  DQT (Define Quantization Table)"
+            }
+            dd {
+                puts "  DRI (Define Restart Interval)"
+                binary scan [read $fh 2] S num
+                puts "    Interval: $num blocks"
+            }
+            e0 {
+                set id [read $fh 5]
+                if {$id == "JFIF\x00"} {
+                    puts "  JFIF"
+                    binary scan [read $fh 9] cccSScc ver1 ver2 units xr vr xt yt
+                    puts "    Header: $ver1.$ver2 $units $xr $vr $xt $yt"
+                } elseif {$id == "JFXX\x00"} {
+                    puts "  JFXX (JFIF Extension)"
+                    binary scan [read $fh 1] H2 excode
+                    if {$excode == "10"} { set excode "10 (JPEG thumbnail)" }
+                    if {$excode == "11"} { set excode "11 (Palletized thumbnail)" }
+                    if {$excode == "13"} { set excode "13 (RGB thumbnail)" }
+                    puts "    Extension code: 0x$excode"
+                } else {
+                    puts "  Unknown APP0 segment: $id"
+                }
+            }
+            e1 {
+                if {[read $fh 6] == "Exif\x00\x00"} {
+                    puts "  EXIF data"
+                    puts "    MAIN EXIF"
+                    foreach {x y} [getExif $file] {
+                        puts "    $x $y"
+                    }
+                    puts "    THUMBNAIL EXIF"
+                    foreach {x y} [getExif $file thumbnail] {
+                        puts "    $x $y"
+                    }
+                } else {
+                    puts "  APP1 (unknown)"
+                }
+            }
+            e2 {
+                if {[read $fh 12] == "ICC_PROFILE\x00"} {
+                    puts "  ICC profile"
+                } else {
+                    puts "  APP2 (unknown)"
+                }
+            }
+            ed {
+                if {[read $fh 18] == "Photoshop 3.0\0008BIM"} {
+                    puts "  Photoshop 8BIM data"
+                } else {
+                    puts "  APP13 (unknown)"
+                }
+            }
+            ee {
+                if {[read $fh 5] == "Adobe"} {
+                    puts "  Adobe metadata"
+                } else {
+                    puts "  APP14 (unknown)"
+                }
+            }
+            e[3456789abcf] {
+                puts [format "  %s%d %s" APP 0x[string index [lindex $marker 0] 1] (unknown)]
+            }
+            fe {
+                puts "  Comment: [read $fh [lindex $marker 2]]"
+            }
+            default {
+                puts "  Unknown"
+            }
+        }
+    }
+}
+
+# for mapping the exif format types to byte lengths
+array set ::jpeg::exif_formats [list 1 1 2 1 3 2 4 4 5 8 6 1 7 1 8 2 9 4 10 8 11 4 12 8]
+
+# list of recognized exif tags. if a tag is not listed here it will show up as its raw hex value
+array set ::jpeg::exif_tags {
+    0100 ImageWidth
+    0101 ImageLength
+    0102 BitsPerSample
+    0103 Compression
+    0106 PhotometricInterpretation
+    0112 Orientation
+    0115 SamplesPerPixel
+    011c PlanarConfiguration
+    0212 YCbCrSubSampling
+    0213 YCbCrPositioning
+    011a XResolution
+    011b YResolution
+    0128 ResolutionUnit
+
+    0111 StripOffsets
+    0116 RowsPerStrip
+    0117 StripByteCounts
+    0201 JPEGInterchangeFormat
+    0202 JPEGInterchangeFormatLength
+
+    012d TransferFunction
+    013e WhitePoint
+    013f PrimaryChromaticities
+    0211 YCbCrCoefficients
+    0213 YCbCrPositioning
+    0214 ReferenceBlackWhite
+
+    0132 DateTime
+    010e ImageDescription
+    010f Make
+    0110 Model
+    0131 Software  
+    013b Artist
+    8298 Copyright
+    
+    9000 ExifVersion  
+    a000 FlashpixVersion
+
+    a001 ColorSpace
+
+    9101 ComponentsConfiguration
+    9102 CompressedBitsPerPixel
+    a002 ExifImageWidth
+    a003 ExifImageHeight
+
+    927c MakerNote
+    9286 UserComment
+
+    a004 RelatedSoundFile
+
+    9003 DateTimeOriginal
+    9004 DateTimeDigitized
+    9290 SubsecTime
+    9291 SubsecTimeOriginal
+    9292 SubsecTimeDigitized
+
+    829a ExposureTime
+    829d FNumber
+    8822 ExposureProgram
+    8824 SpectralSensitivity
+    8827 ISOSpeedRatings
+    8828 OECF
+    9201 ShutterSpeedValue
+    9202 ApertureValue
+    9203 BrightnessValue
+    9204 ExposureBiasValue
+    9205 MaxApertureValue
+    9206 SubjectDistance
+    9207 MeteringMode
+    9208 LightSource
+    9209 Flash
+    920a FocalLength
+    9214 SubjectArea
+    a20b FlashEnergy
+    a20c SpatialFrequencyResponse
+    a20e FocalPlaneXResolution
+    a20f FocalPlaneYResolution
+    a210 FocalPlaneResolutionUnit
+    a214 SubjectLocation
+    a215 ExposureIndex
+    a217 SensingMethod
+    a300 FileSource
+    a301 SceneType
+    a302 CFAPattern
+    a401 CustomRendered
+    a402 ExposureMode
+    a403 WhiteBalance
+    a404 DigitalZoomRatio
+    a405 FocalLengthIn35mmFilm
+    a406 SceneCaptureType
+    a407 GainControl
+    a408 Contrast
+    a409 Saturation
+    a40a Sharpness
+    a40b DeviceSettingDescription
+    a40c SubjectDistanceRange
+    a420 ImageUniqueID
+
+    
+    0001 InteroperabilityIndex
+    0002 InteroperabilityVersion
+    1000 RelatedImageFileFormat
+    1001 RelatedImageWidth
+    1002 RelatedImageLength
+    
+    00fe NewSubfileType
+    00ff SubfileType
+    013d Predictor
+    0142 TileWidth
+    0143 TileLength
+    0144 TileOffsets
+    0145 TileByteCounts
+    014a SubIFDs
+    015b JPEGTables
+    828d CFARepeatPatternDim
+    828e CFAPattern
+    828f BatteryLevel
+    83bb IPTC/NAA
+    8773 InterColorProfile
+    8825 GPSInfo
+    8829 Interlace
+    882a TimeZoneOffset
+    882b SelfTimerMode
+    920c SpatialFrequencyResponse
+    920d Noise
+    9211 ImageNumber
+    9212 SecurityClassification
+    9213 ImageHistory
+    9215 ExposureIndex
+    9216 TIFF/EPStandardID
+}
+
+# list of recognized exif tags for the GPSInfo section--added by mdp 6/5/2009
+array set ::jpeg::gps_tags {
+    0000 GPSVersionID
+    0001 GPSLatitudeRef
+    0002 GPSLatitude
+    0003 GPSLongitudeRef
+    0004 GPSLongitude
+    0005 GPSAltitudeRef
+    0006 GPSAltitude
+    0007 GPSTimeStamp
+    0008 GPSSatellites
+    0009 GPSStatus
+    000a GPSMeasureMode
+    000b GPSDOP
+    000c GPSSpeedRef
+    000d GPSSpeed
+    000e GPSTrackRef
+    000f GPSTrack
+    0010 GPSImgDirectionRef
+    0011 GPSImgDirection
+    0012 GPSMapDatum
+    0013 GPSDestLatitudeRef
+    0014 GPSDestLatitude
+    0015 GPSDestLongitudeRef
+    0016 GPSDestLongitude
+    0017 GPSDestBearingRef
+    0018 GPSDestBearing
+    0019 GPSDestDistanceRef
+    001a GPSDestDistance
+    001b GPSProcessingMethod
+    001c GPSAreaInformation
+    001d GPSDateStamp
+    001e GPSDifferential
+}
+
+# for mapping exif values to plain english by [formatExif]
+array set ::jpeg::exif_values {
+    Compression,1 none
+    Compression,6 JPEG
+    Compression,  unknown
+
+    PhotometricInterpretation,2 RGB
+    PhotometricInterpretation,6 YCbCr
+    PhotometricInterpretation,  unknown
+
+    Orientation,1 normal
+    Orientation,2 mirrored
+    Orientation,3 "180 degrees"
+    Orientation,4 "180 degrees, mirrored"
+    Orientation,5 "90 degrees ccw, mirrored"
+    Orientation,6 "90 degrees cw"
+    Orientation,7 "90 degrees cw, mirrored"
+    Orientation,8 "90 degrees ccw"
+    Orientation,  unknown
+
+    PlanarConfiguration,1 chunky
+    PlanarConfiguration,2 planar
+    PlanarConfiguration,  unknown
+
+    YCbCrSubSampling,2,1 YCbCr4:2:2
+    YCbCrSubSampling,2,2 YCbCr4:2:0
+    YCbCrSubSampling,    unknown
+
+    YCbCrPositioning,1 centered
+    YCbCrPositioning,2 co-sited
+    YCbCrPositioning,  unknown
+
+    FlashpixVersion,0100 "Flashpix Format Version 1.0"
+    FlashpixVersion,     unknown
+
+    ColorSpace,1     sRGB
+    ColorSpace,32768 uncalibrated
+    ColorSpace,      unknown
+
+    ExposureProgram,0 undefined
+    ExposureProgram,1 manual
+    ExposureProgram,2 normal
+    ExposureProgram,3 "aperture priority"
+    ExposureProgram,4 "shutter priority"
+    ExposureProgram,5 creative
+    ExposureProgram,6 action
+    ExposureProgram,7 portrait
+    ExposureProgram,8 landscape
+    ExposureProgram,  unknown
+
+    LightSource,0   unknown
+    LightSource,1   daylight
+    LightSource,2   flourescent
+    LightSource,3   tungsten
+    LightSource,4   flash
+    LightSource,9   "fine weather"
+    LightSource,10  "cloudy weather"
+    LightSource,11  shade
+    LightSource,12  "daylight flourescent"
+    LightSource,13  "day white flourescent"
+    LightSource,14  "cool white flourescent"
+    LightSource,15  "white flourescent"
+    LightSource,17  "standard light A"
+    LightSource,18  "standard light B"
+    LightSource,19  "standard light C"
+    LightSource,20  D55
+    LightSource,21  D65
+    LightSource,22  D75
+    LightSource,23  D50
+    LightSource,24  "ISO studio tungsten"
+    LightSource,255 other
+    LightSource,    unknown
+
+    Flash,0  "no flash"
+    Flash,1  "flash fired"
+    Flash,5  "strobe return light not detected"
+    Flash,7  "strobe return light detected"
+    Flash,9  "flash fired, compulsory flash mode"
+    Flash,13 "flash fired, compulsory flash mode, return light not detected"
+    Flash,15 "flash fired, compulsory flash mode, return light detected"
+    Flash,16 "flash did not fire, compulsory flash mode"
+    Flash,24 "flash did not fire, auto mode"
+    Flash,25 "flash fired, auto mode"
+    Flash,29 "flash fired, auto mode, return light not detected"
+    Flash,31 "flash fired, auto mode, return light detected"
+    Flash,32 "no flash function"
+    Flash,65 "flash fired, red-eye reduction mode"
+    Flash,69 "flash fired, red-eye reduction mode, return light not detected"
+    Flash,71 "flash fired, red-eye reduction mode, return light detected"
+    Flash,73 "flash fired, compulsory mode, red-eye reduction mode"
+    Flash,77 "flash fired, compulsory mode, red-eye reduction mode, return light not detected"
+    Flash,79 "flash fired, compulsory mode, red-eye reduction mode, return light detected"
+    Flash,89 "flash fired, auto mode, red-eye reduction mode"
+    Flash,93 "flash fired, auto mode, return light not detected, red-eye reduction mode"
+    Flash,95 "flash fired, auto mode, return light detected, red-eye reduction mode"
+    Flash,   unknown
+
+    ResolutionUnit,2 inch
+    ResolutionUnit,3 centimeter
+    ResolutionUnit,  unknown
+
+    SensingMethod,1 undefined
+    SensingMethod,2 "one chip color area sensor"
+    SensingMethod,3 "two chip color area sensor"
+    SensingMethod,4 "three chip color area sensor"
+    SensingMethod,5 "color sequential area sensor"
+    SensingMethod,7 "trilinear sensor"
+    SensingMethod,8 "color sequential linear sensor"
+    SensingMethod,  unknown
+
+    SceneType,\x01\x00\x00\x00 "directly photographed image"
+    SceneType,                 unknown
+
+    CustomRendered,0 normal
+    CustomRendered,1 custom
+
+    ExposureMode,0 auto
+    ExposureMode,1 manual
+    ExposureMode,2 "auto bracket"
+    ExposureMode,  unknown
+
+    WhiteBalance,0 auto
+    WhiteBlanace,1 manual
+    WhiteBlanace,  unknown
+
+    SceneCaptureType,0 standard
+    SceneCaptureType,1 landscape
+    SceneCaptureType,2 portrait
+    SceneCaptureType,3 night
+    SceneCaptureType,  unknown
+
+    GainControl,0 none
+    GainControl,1 "low gain up"
+    GainControl,2 "high gain up"
+    GainControl,3 "low gain down"
+    GainControl,4 "high gain down"
+    GainControl,  unknown
+
+    Contrast,0 normal
+    Contrast,1 soft
+    Contrast,2 hard
+    Contrast,  unknown
+
+    Saturation,0 normal
+    Saturation,1 low
+    Saturation,2 high
+    Saturation,  unknown
+
+    Sharpness,0 normal
+    Sharpness,1 soft
+    Sharpness,2 hard
+    Sharpness,  unknown
+
+    SubjectDistanceRange,0 unknown
+    SubjectDistanceRange,1 macro
+    SubjectDistanceRange,2 close
+    SubjectDistanceRange,3 distant
+    SubjectDistanceRange,  unknown
+    
+    MeteringMode,0   unknown
+    MeteringMode,1   average
+    MeteringMode,2   "center weighted average"
+    MeteringMode,3   spot
+    MeteringMode,4   multi-spot
+    MeteringMode,5   multi-segment
+    MeteringMode,6   partial
+    MeteringMode,255 other
+    MeteringMode,    unknown
+    
+    FocalPlaneResolutionUnit,2 inch
+    FocalPlaneResolutionUnit,3 centimeter
+    FocalPlaneResolutionUnit,  none
+    
+    DigitalZoomRatio,0 "not used"
+    
+    FileSource,\x03\x00\x00\x00 "digital still camera"
+    FileSource,                 unknown
+}
+
+# [binary scan], in the byte order indicated by $e
+proc ::jpeg::_scan {e v f args} {
+     foreach x $args { upvar 1 $x $x }
+     if {$e == "big"} {
+         eval [list binary scan $v [string map {b B h H s S i I} $f]] $args
+     } else {
+         eval [list binary scan $v $f] $args
+     }
+}
+
+
+# formats exif values, the numbers correspond to data types
+# values may be either byte order, as indicated by $end
+# see the exif spec for more info
+proc ::jpeg::_format {end value type num} {
+    if {$num > 1 && $type != 2 && $type != 7} {
+        variable exif_formats
+        set r {}
+        for {set i 0} {$i < $num} {incr i} {
+            set len $exif_formats($type)
+            lappend r [_format $end [string range $value [expr {$len * $i}] [expr {($len * $i) + $len - 1}]] $type 1]
+        }
+        return [join $r ,]
+    }
+    switch -exact -- $type {
+        1 { _scan $end $value c value }
+        2 { set value [string trimright $value \x00] }
+        3 {
+            _scan $end $value s value
+            set value [format %u $value]
+        }
+        4 {
+            _scan $end $value i value
+            set value [format %u $value]
+        }
+        5 {
+            _scan $end $value ii n d
+            set n [format %u $n]
+            set d [format %u $d]
+            if {$d == 0} {set d 1}
+            #set value [string trimright [string trimright [format %5.4f [expr {double($n) / $d}]] 0] .]
+            set value [string trimright [string trimright [expr {double($n) / $d}] 0] .]
+            #set value "$n/$d"
+        }
+        6 { _scan $end $value c value }
+        8 { _scan $end $value s value }
+        9 { _scan $end $value i value }
+        10 {
+            _scan $end $value ii n d
+            if {$d == 0} {set d 1}
+            #set value [string trimright [string trimright [format %5.4f [expr {double($n) / $d}]] 0] .]
+            set value [string trimright [string trimright [expr {double($n) / $d}] 0] .]
+            #set value "$n/$d"
+        }
+        11 { _scan $end $value i value }
+        12 { _scan $end $value w value }
+    }
+    return $value
+}
+
+# Do a compatibility version of [lassign] for versions of Tcl without
+# that command. Not using a version check as special builds may have
+# the command even if they are a version which nominally would not.
+
+if {![llength [info commands lassign]]} {
+    proc ::jpeg::lassign {sequence v args} {
+	set args [linsert $args 0 $v]
+	set a [::llength $args]
+
+	# Nothing to assign.
+	#if {$a == 0} {return $sequence}
+
+	# Perform assignments
+	set i 0
+	foreach v $args {
+	    upvar 1 $v var
+	    set        var [::lindex $sequence $i]
+	    incr i
+	}
+
+	# Return remainder, if there is any.
+	return [::lrange $sequence $a end]
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide jpeg 0.5
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/jpeg/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/jpeg/pkgIndex.tcl
new file mode 100644
index 00000000..a5aeabc5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/jpeg/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded jpeg 0.5 [list source [file join $dir jpeg.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/json.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/json.tcl
new file mode 100644
index 00000000..773c6a8a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/json.tcl
@@ -0,0 +1,285 @@
+# json.tcl --
+#
+#	JSON parser for Tcl. Management code, Tcl/C detection and selection.
+#
+# Copyright (c) 2013 by Andreas Kupries
+
+# @mdgen EXCLUDE: jsonc.tcl
+
+package require Tcl 8.4
+namespace eval ::json {}
+
+# ### ### ### ######### ######### #########
+## Management of json implementations.
+
+# ::json::LoadAccelerator --
+#
+#	Loads a named implementation, if possible.
+#
+# Arguments:
+#	key	Name of the implementation to load.
+#
+# Results:
+#	A boolean flag. True if the implementation
+#	was successfully loaded; and False otherwise.
+
+proc ::json::LoadAccelerator {key} {
+    variable accel
+    set r 0
+    switch -exact -- $key {
+	critcl {
+	    # Critcl implementation of json requires Tcl 8.4.
+	    if {![package vsatisfies [package provide Tcl] 8.4]} {return 0}
+	    if {[catch {package require tcllibc}]} {return 0}
+	    # Check for the jsonc 1.1.1 API we are fixing later.
+	    set r [llength [info commands ::json::many_json2dict_critcl]]
+	}
+	tcl {
+	    variable selfdir
+	    source [file join $selfdir json_tcl.tcl]
+	    set r 1
+	}
+        default {
+            return -code error "invalid accelerator/impl. package $key:\
+                must be one of [join [KnownImplementations] {, }]"
+        }
+    }
+    set accel($key) $r
+    return $r
+}
+
+# ::json::SwitchTo --
+#
+#	Activates a loaded named implementation.
+#
+# Arguments:
+#	key	Name of the implementation to activate.
+#
+# Results:
+#	None.
+
+proc ::json::SwitchTo {key} {
+    variable accel
+    variable loaded
+    variable apicmds
+
+    if {[string equal $key $loaded]} {
+	# No change, nothing to do.
+	return
+    } elseif {![string equal $key ""]} {
+	# Validate the target implementation of the switch.
+
+	if {![info exists accel($key)]} {
+	    return -code error "Unable to activate unknown implementation \"$key\""
+	} elseif {![info exists accel($key)] || !$accel($key)} {
+	    return -code error "Unable to activate missing implementation \"$key\""
+	}
+    }
+
+    # Deactivate the previous implementation, if there was any.
+
+    if {![string equal $loaded ""]} {
+	foreach c $apicmds {
+	    rename ::json::${c} ::json::${c}_$loaded
+	}
+    }
+
+    # Activate the new implementation, if there is any.
+
+    if {![string equal $key ""]} {
+	foreach c $apicmds {
+	    rename ::json::${c}_$key ::json::${c}
+	}
+    }
+
+    # Remember the active implementation, for deactivation by future
+    # switches.
+
+    set loaded $key
+    return
+}
+
+# ::json::Implementations --
+#
+#	Determines which implementations are
+#	present, i.e. loaded.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys.
+
+proc ::json::Implementations {} {
+    variable accel
+    set res {}
+    foreach n [array names accel] {
+	if {!$accel($n)} continue
+	lappend res $n
+    }
+    return $res
+}
+
+# ::json::KnownImplementations --
+#
+#	Determines which implementations are known
+#	as possible implementations.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys. In the order
+#	of preference, most prefered first.
+
+proc ::json::KnownImplementations {} {
+    return {critcl tcl}
+}
+
+proc ::json::Names {} {
+    return {
+	critcl {tcllibc based}
+	tcl    {pure Tcl}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Data structures.
+
+namespace eval ::json {
+    variable  selfdir [file dirname [info script]]
+    variable  accel
+    array set accel   {tcl 0 critcl 0}
+    variable  loaded  {}
+
+    variable apicmds {
+	json2dict
+	many-json2dict
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Wrapper fix for the jsonc package to match APIs.
+
+proc ::json::many-json2dict_critcl {args} {
+    eval [linsert $args 0 ::json::many_json2dict_critcl]
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Choose an implementation,
+## most prefered first. Loads only one of the
+## possible implementations. And activates it.
+
+namespace eval ::json {
+    variable e
+    foreach e [KnownImplementations] {
+	if {[LoadAccelerator $e]} {
+	    SwitchTo $e
+	    break
+	}
+    }
+    unset e
+}
+
+# ### ### ### ######### ######### #########
+## Tcl implementation of validation, shared for Tcl and C implementation.
+##
+## The regexp based validation is consistently faster than json-c.
+## Suspected reasons: Tcl REs are mainly in C as well, and json-c has
+## overhead in constructing its own data structures. While irrelevant
+## to validation json-c still builds them, it has no mode doing pure
+## syntax checking.
+
+namespace eval ::json {
+    # Regular expression for tokenizing a JSON text (cf. http://json.org/)
+
+    # tokens consisting of a single character
+    variable singleCharTokens { "{" "}" ":" "\\[" "\\]" "," }
+    variable singleCharTokenRE "\[[join $singleCharTokens {}]\]"
+
+    # quoted string tokens
+    variable escapableREs { "[\\\"\\\\/bfnrt]" "u[[:xdigit:]]{4}" "." }
+    variable escapedCharRE "\\\\(?:[join $escapableREs |])"
+    variable unescapedCharRE {[^\\\"]}
+    variable stringRE "\"(?:$escapedCharRE|$unescapedCharRE)*\""
+
+    # as above, for validation
+    variable escapableREsv { "[\\\"\\\\/bfnrt]" "u[[:xdigit:]]{4}" }
+    variable escapedCharREv "\\\\(?:[join $escapableREsv |])"
+    variable stringREv "\"(?:$escapedCharREv|$unescapedCharRE)*\""
+
+    # (unquoted) words
+    variable wordTokens { "true" "false" "null" }
+    variable wordTokenRE [join $wordTokens "|"]
+
+    # number tokens
+    # negative lookahead (?!0)[[:digit:]]+ might be more elegant, but
+    # would slow down tokenizing by a factor of up to 3!
+    variable positiveRE {[1-9][[:digit:]]*}
+    variable cardinalRE "-?(?:$positiveRE|0)"
+    variable fractionRE {[.][[:digit:]]+}
+    variable exponentialRE {[eE][+-]?[[:digit:]]+}
+    variable numberREa "${cardinalRE}(?:$fractionRE)?(?:$exponentialRE)?"
+    variable numberREb "${fractionRE}(?:$exponentialRE)?"
+    variable numberREc "${cardinalRE}\[.\](?:$exponentialRE)?"
+    variable numberRE  "$numberREa|$numberREb|$numberREc"
+    variable numberRE  "$numberREa|$numberREb|$numberREc"
+
+    # JSON token, and validation
+    variable tokenRE "$singleCharTokenRE|$stringRE|$wordTokenRE|$numberRE"
+    variable tokenREv "$singleCharTokenRE|$stringREv|$wordTokenRE|$numberRE"
+
+    # 0..n white space characters
+    set whiteSpaceRE {[[:space:]]*}
+
+    # Regular expression for validating a JSON text
+    variable validJsonRE "^(?:${whiteSpaceRE}(?:$tokenREv))*${whiteSpaceRE}$"
+}
+
+
+# Validate JSON text
+# @param jsonText JSON text
+# @return 1 iff $jsonText conforms to the JSON grammar
+#           (@see http://json.org/)
+proc ::json::validate {jsonText} {
+    variable validJsonRE
+
+    return [regexp -- $validJsonRE $jsonText]
+}
+
+# ### ### ### ######### ######### #########
+## These three procedures shared between Tcl and Critcl implementations.
+## See also package "json::write".
+
+proc ::json::dict2json {dictVal} {
+    # XXX: Currently this API isn't symmetrical, as to create proper
+    # XXX: JSON text requires type knowledge of the input data
+    set json ""
+    set prefix ""
+
+    foreach {key val} $dictVal {
+	# key must always be a string, val may be a number, string or
+	# bare word (true|false|null)
+	if {0 && ![string is double -strict $val]
+	    && ![regexp {^(?:true|false|null)$} $val]} {
+	    set val "\"$val\""
+	}
+    	append json "$prefix\"$key\": $val" \n
+	set prefix ,
+    }
+
+    return "\{${json}\}"
+}
+
+proc ::json::list2json {listVal} {
+    return "\[[join $listVal ,]\]"
+}
+
+proc ::json::string2json {str} {
+    return "\"$str\""
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide json 1.3.4
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/json_tcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/json_tcl.tcl
new file mode 100644
index 00000000..d1c65cbb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/json_tcl.tcl
@@ -0,0 +1,291 @@
+#
+#   JSON parser for Tcl.
+#
+#   See http://www.json.org/ && http://www.ietf.org/rfc/rfc4627.txt
+#
+#   Total rework of the code published with version number 1.0 by
+#   Thomas Maeder, Glue Software Engineering AG
+#
+#   $Id: json.tcl,v 1.7 2011/11/10 21:05:58 andreas_kupries Exp $
+#
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    package require dict
+}
+
+# Parse JSON text into a dict
+# @param jsonText JSON text
+# @return dict (or list) containing the object represented by $jsonText
+proc ::json::json2dict_tcl {jsonText} {
+    variable tokenRE
+
+    set tokens [regexp -all -inline -- $tokenRE $jsonText]
+    set nrTokens [llength $tokens]
+    set tokenCursor 0
+
+    #puts I:($jsonText)
+    #puts T:\t[join $tokens \nT:\t]
+    return [parseValue $tokens $nrTokens tokenCursor]
+}
+
+# Parse multiple JSON entities in a string into a list of dictionaries
+# @param jsonText JSON text to parse
+# @param max      Max number of entities to extract.
+# @return list of (dict (or list) containing the objects) represented by $jsonText
+proc ::json::many-json2dict_tcl {jsonText {max -1}} {
+    variable tokenRE
+
+    if {$max == 0} {
+	return -code error -errorCode {JSON BAD-LIMIT ZERO} \
+	    "Bad limit 0 of json entities to extract."
+    }
+
+    set tokens [regexp -all -inline -- $tokenRE $jsonText]
+    set nrTokens [llength $tokens]
+    set tokenCursor 0
+
+    set result {}
+    set found 0
+    set n $max
+    while {$n != 0} {
+	if {$tokenCursor >= $nrTokens} break
+	lappend result [parseValue $tokens $nrTokens tokenCursor]
+	incr found
+	if {$n > 0} {incr n -1}
+    }
+
+    if {$n > 0} {
+	return -code error -errorCode {JSON BAD-LIMIT TOO LARGE} \
+	    "Bad limit $max of json entities to extract, found only $found."
+    }
+
+    return $result
+}
+
+# Throw an exception signaling an unexpected token
+proc ::json::unexpected {tokenCursor token expected} {
+    return -code error -errorcode [list JSON UNEXPECTED $tokenCursor $expected] \
+	"unexpected token \"$token\" at position $tokenCursor; expecting $expected"
+}
+
+# Get rid of the quotes surrounding a string token and substitute the
+# real characters for escape sequences within it
+# @param token
+# @return unquoted unescaped value of the string contained in $token
+proc ::json::unquoteUnescapeString {tokenCursor token} {
+    variable stringREv
+    set unquoted [string range $token 1 end-1]
+
+    if {![regexp $stringREv $token]} {
+	unexpected $tokenCursor $token STRING
+    }
+
+    set res [subst -nocommands -novariables $unquoted]
+    return $res
+}
+
+# Parse an object member
+# @param tokens list of tokens
+# @param nrTokens length of $tokens
+# @param tokenCursorName name (in caller's context) of variable
+#                        holding current position in $tokens
+# @param objectDictName name (in caller's context) of dict
+#                       representing the JSON object of which to
+#                       parse the next member
+proc ::json::parseObjectMember {tokens nrTokens tokenCursorName objectDictName} {
+    upvar $tokenCursorName tokenCursor
+    upvar $objectDictName objectDict
+
+    set token [lindex $tokens $tokenCursor]
+    set tc $tokenCursor
+    incr tokenCursor
+
+    set leadingChar [string index $token 0]
+    if {$leadingChar eq "\""} {
+        set memberName [unquoteUnescapeString $tc $token]
+
+        if {$tokenCursor == $nrTokens} {
+            unexpected $tokenCursor "END" "\":\""
+        } else {
+            set token [lindex $tokens $tokenCursor]
+            incr tokenCursor
+
+            if {$token eq ":"} {
+                set memberValue [parseValue $tokens $nrTokens tokenCursor]
+                dict set objectDict $memberName $memberValue
+            } else {
+                unexpected $tokenCursor $token "\":\""
+            }
+        }
+    } else {
+        unexpected $tokenCursor $token "STRING"
+    }
+}
+
+# Parse the members of an object
+# @param tokens list of tokens
+# @param nrTokens length of $tokens
+# @param tokenCursorName name (in caller's context) of variable
+#                        holding current position in $tokens
+# @param objectDictName name (in caller's context) of dict
+#                       representing the JSON object of which to
+#                       parse the next member
+proc ::json::parseObjectMembers {tokens nrTokens tokenCursorName objectDictName} {
+    upvar $tokenCursorName tokenCursor
+    upvar $objectDictName objectDict
+
+    while true {
+        parseObjectMember $tokens $nrTokens tokenCursor objectDict
+
+        set token [lindex $tokens $tokenCursor]
+        incr tokenCursor
+
+        switch -exact $token {
+            "," {
+                # continue
+            }
+            "\}" {
+                break
+            }
+            default {
+                unexpected $tokenCursor $token "\",\"|\"\}\""
+            }
+        }
+    }
+}
+
+# Parse an object
+# @param tokens list of tokens
+# @param nrTokens length of $tokens
+# @param tokenCursorName name (in caller's context) of variable
+#                        holding current position in $tokens
+# @return parsed object (Tcl dict)
+proc ::json::parseObject {tokens nrTokens tokenCursorName} {
+    upvar $tokenCursorName tokenCursor
+
+    if {$tokenCursor == $nrTokens} {
+        unexpected $tokenCursor "END" "OBJECT"
+    } else {
+        set result [dict create]
+
+        set token [lindex $tokens $tokenCursor]
+
+        if {$token eq "\}"} {
+            # empty object
+            incr tokenCursor
+        } else {
+            parseObjectMembers $tokens $nrTokens tokenCursor result
+        }
+
+        return $result
+    }
+}
+
+# Parse the elements of an array
+# @param tokens list of tokens
+# @param nrTokens length of $tokens
+# @param tokenCursorName name (in caller's context) of variable
+#                        holding current position in $tokens
+# @param resultName name (in caller's context) of the list
+#                   representing the JSON array
+proc ::json::parseArrayElements {tokens nrTokens tokenCursorName resultName} {
+    upvar $tokenCursorName tokenCursor
+    upvar $resultName result
+
+    while true {
+        lappend result [parseValue $tokens $nrTokens tokenCursor]
+
+        if {$tokenCursor == $nrTokens} {
+            unexpected $tokenCursor "END" "\",\"|\"\]\""
+        } else {
+            set token [lindex $tokens $tokenCursor]
+            incr tokenCursor
+
+            switch -exact $token {
+                "," {
+                    # continue
+                }
+                "\]" {
+                    break
+                }
+                default {
+                    unexpected $tokenCursor $token "\",\"|\"\]\""
+                }
+            }
+        }
+    }
+}
+
+# Parse an array
+# @param tokens list of tokens
+# @param nrTokens length of $tokens
+# @param tokenCursorName name (in caller's context) of variable
+#                        holding current position in $tokens
+# @return parsed array (Tcl list)
+proc ::json::parseArray {tokens nrTokens tokenCursorName} {
+    upvar $tokenCursorName tokenCursor
+
+    if {$tokenCursor == $nrTokens} {
+        unexpected $tokenCursor "END" "ARRAY"
+    } else {
+        set result {}
+
+        set token [lindex $tokens $tokenCursor]
+
+        set leadingChar [string index $token 0]
+        if {$leadingChar eq "\]"} {
+            # empty array
+            incr tokenCursor
+        } else {
+            parseArrayElements $tokens $nrTokens tokenCursor result
+        }
+
+        return $result
+    }
+}
+
+# Parse a value
+# @param tokens list of tokens
+# @param nrTokens length of $tokens
+# @param tokenCursorName name (in caller's context) of variable
+#                        holding current position in $tokens
+# @return parsed value (dict, list, string, number)
+proc ::json::parseValue {tokens nrTokens tokenCursorName} {
+    upvar $tokenCursorName tokenCursor
+
+    if {$tokenCursor == $nrTokens} {
+        unexpected $tokenCursor "END" "VALUE"
+    } else {
+        set token [lindex $tokens $tokenCursor]
+	set tc $tokenCursor
+        incr tokenCursor
+
+        set leadingChar [string index $token 0]
+        switch -exact -- $leadingChar {
+            "\{" {
+                return [parseObject $tokens $nrTokens tokenCursor]
+            }
+            "\[" {
+                return [parseArray $tokens $nrTokens tokenCursor]
+            }
+            "\"" {
+                # quoted string
+                return [unquoteUnescapeString $tc $token]
+            }
+            "t" -
+            "f" -
+            "n" {
+                # bare word: true, false, null (return as is)
+                return $token
+            }
+            default {
+                # number?
+                if {[string is double -strict $token]} {
+                    return $token
+                } else {
+                    unexpected $tokenCursor $token "VALUE"
+                }
+            }
+        }
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/json_write.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/json_write.tcl
new file mode 100644
index 00000000..0e7545dd
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/json_write.tcl
@@ -0,0 +1,212 @@
+# json_write.tcl --
+#
+#	Commands for the generation of JSON (Java Script Object Notation).
+#
+# Copyright (c) 2009-2011,2022 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+
+namespace eval ::json::write {
+    namespace export \
+	string array array-strings object object-strings indented aligned
+
+    namespace ensemble create
+}
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc ::json::write::indented {{bool {}}} {
+    variable indented
+
+    if {[llength [info level 0]] > 2} {
+	return -code error {wrong # args: should be "json::write indented ?bool?"}
+    } elseif {[llength [info level 0]] == 2} {
+	if {![::string is boolean -strict $bool]} {
+	    return -code error "Expected boolean, got \"$bool\""
+	}
+	set indented $bool
+	if {!$indented} {
+	    variable aligned 0
+	}
+    }
+
+    return $indented
+}
+
+proc ::json::write::aligned {{bool {}}} {
+    variable aligned
+
+    if {[llength [info level 0]] > 2} {
+	return -code error {wrong # args: should be "json::write aligned ?bool?"}
+    } elseif {[llength [info level 0]] == 2} {
+	if {![::string is boolean -strict $bool]} {
+	    return -code error "Expected boolean, got \"$bool\""
+	}
+	set aligned $bool
+	if {$aligned} {
+	    variable indented 1
+	}
+    }
+
+    return $aligned
+}
+
+proc ::json::write::string {s} {
+    variable quotes
+    return "\"[::string map $quotes $s]\""
+}
+
+proc ::json::write::array {args} {
+    # always compact form.
+    return "\[[join $args ,]\]"
+}
+
+proc ::json::write::array-strings {args} {
+    # convenience command for an array of strings.
+    set words {}
+    foreach w $args { lappend words [string $w] }
+    return [array {*}$words]
+}
+
+proc ::json::write::object-strings {args} {
+    # convenience command for an object of string fields.
+    set words {}
+    foreach {k v} $args { lappend words $k [string $v] }
+    return [object {*}$words]
+}
+
+proc ::json::write::object {args} {
+    # The dict in args maps string keys to json-formatted data. I.e.
+    # we have to quote the keys, but not the values, as the latter are
+    # already in the proper format.
+
+    variable aligned
+    variable indented
+
+    if {[llength $args] %2 == 1} {
+	return -code error {wrong # args, expected an even number of arguments}
+    }
+
+    set dict {}
+    foreach {k v} $args {
+	lappend dict [string $k] $v
+    }
+
+    if {$aligned} {
+	set max [MaxKeyLength $dict]
+    }
+
+    if {$indented} {
+	set content {}
+	foreach {k v} $dict {
+	    if {$aligned} {
+		set k [AlignLeft $max $k]
+	    }
+	    if {[::string match *\n* $v]} {
+		# multi-line value
+		lappend content "    $k : [Indent $v {    } 1]"
+	    } else {
+		# single line value.
+		lappend content "    $k : $v"
+	    }
+	}
+	if {[llength $content]} {
+	    return "\{\n[join $content ,\n]\n\}"
+	} else {
+	    return "\{\}"
+	}
+    } else {
+	# ultra compact form.
+	set tmp {}
+	foreach {k v} $dict {
+	    lappend tmp "$k:$v"
+	}
+	return "\{[join $tmp ,]\}"
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Internals.
+
+proc ::json::write::Indent {text prefix skip} {
+    set pfx ""
+    set result {}
+    foreach line [split $text \n] {
+	if {!$skip} { set pfx $prefix } else { incr skip -1 }
+	lappend result ${pfx}$line
+    }
+    return [join $result \n]
+}
+
+proc ::json::write::MaxKeyLength {dict} {
+    # Find the max length of the keys in the dictionary.
+
+    set lengths 0 ; # This will be the max if the dict is empty, and
+		    # prevents the mathfunc from throwing errors for
+		    # that case.
+
+    foreach str [dict keys $dict] {
+	lappend lengths [::string length $str]
+    }
+
+    return [tcl::mathfunc::max {*}$lengths]
+}
+
+proc ::json::write::AlignLeft {fieldlen str} {
+    return [format %-${fieldlen}s $str]
+    #return $str[::string repeat { } [expr {$fieldlen - [::string length $str]}]]
+}
+
+# ### ### ### ######### ######### #########
+
+namespace eval ::json::write {
+    # Configuration of the layout to write.
+
+    # indented = boolean. objects are indented.
+    # aligned  = boolean. object keys are aligned vertically.
+
+    # aligned  => indented.
+
+    # Combinations of the format specific entries
+    # I A |
+    # - - + ---------------------
+    # 0 0 | Ultracompact (no whitespace, single line)
+    # 1 0 | Indented
+    # 0 1 | Not possible, per the implications above.
+    # 1 1 | Indented + vertically aligned keys
+    # - - + ---------------------
+
+    variable indented 1
+    variable aligned  1
+
+    variable quotes \
+	[list "\"" "\\\"" \\ \\\\ \b \\b \f \\f \n \\n \r \\r \t \\t \
+	     \x00 \\u0000 \x01 \\u0001 \x02 \\u0002 \x03 \\u0003 \
+	     \x04 \\u0004 \x05 \\u0005 \x06 \\u0006 \x07 \\u0007 \
+	     \x0b \\u000b \x0e \\u000e \x0f \\u000f \x10 \\u0010 \
+	     \x11 \\u0011 \x12 \\u0012 \x13 \\u0013 \x14 \\u0014 \
+	     \x15 \\u0015 \x16 \\u0016 \x17 \\u0017 \x18 \\u0018 \
+	     \x19 \\u0019 \x1a \\u001a \x1b \\u001b \x1c \\u001c \
+	     \x1d \\u001d \x1e \\u001e \x1f \\u001f \x7f \\u007f \
+	     \x80 \\u0080 \x81 \\u0081 \x82 \\u0082 \x83 \\u0083 \
+	     \x84 \\u0084 \x85 \\u0085 \x86 \\u0086 \x87 \\u0087 \
+	     \x88 \\u0088 \x89 \\u0089 \x8a \\u008a \x8b \\u008b \
+	     \x8c \\u008c \x8d \\u008d \x8e \\u008e \x8f \\u008f \
+	     \x90 \\u0090 \x91 \\u0091 \x92 \\u0092 \x93 \\u0093 \
+	     \x94 \\u0094 \x95 \\u0095 \x96 \\u0096 \x97 \\u0097 \
+	     \x98 \\u0098 \x99 \\u0099 \x9a \\u009a \x9b \\u009b \
+	     \x9c \\u009c \x9d \\u009d \x9e \\u009e \x9f \\u009f ]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide json::write 1.0.4
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/jsonc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/jsonc.tcl
new file mode 100644
index 00000000..a82226ee
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/jsonc.tcl
@@ -0,0 +1,171 @@
+# jsonc.tcl --
+#
+#       Implementation of a JSON parser in C.
+#	Binding to a yacc/bison parser by Mikhail.
+#
+# Copyright (c) 2013,2015 - critcl wrapper - Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Copyright (c) 2013      - C binding      - mi+tcl.tk-2013@aldan.algebra.com
+
+package require critcl
+# @sak notprovided jsonc
+package provide jsonc 1.1.2
+package require Tcl 8.4
+
+#critcl::cheaders -g
+#critcl::debug memory symbols
+critcl::cheaders -Ic c/*.h
+critcl::csources c/*.c
+
+# # ## ### Import base declarations, forwards ### ## # #
+
+critcl::ccode {
+    #include <json_y.h>
+}
+
+# # ## ### Main Conversion ### ## # #
+
+namespace eval ::json {
+    critcl::ccommand json2dict_critcl {dummy I objc objv} {
+	struct context context = { NULL };
+
+	if (objc != 2) {
+	    Tcl_WrongNumArgs(I, 1, objv, "json");
+	    return TCL_ERROR;
+	}
+
+	context.text   = Tcl_GetStringFromObj(objv[1], &context.remaining);
+	context.I      = I;
+	context.has_error = 0;
+	context.result = TCL_ERROR;
+
+	jsonparse (&context);
+	return context.result;
+    }
+
+    # Issue with critcl 2 used here. Cannot use '-', incomplete distinction of C and Tcl names.
+    # The json.tcl file making use of this code has a wrapper fixing the issue.
+    critcl::ccommand many_json2dict_critcl {dummy I objc objv} {
+	struct context context = { NULL };
+
+	int                      max;
+	int                      found;
+
+	Tcl_Obj* result = Tcl_NewListObj (0, NULL);
+
+	if ((objc < 2) || (objc > 3)) {
+	    Tcl_WrongNumArgs(I, 1, objv, "jsonText ?max?");
+	    return TCL_ERROR;
+	}
+
+	if (objc == 3) {
+	    if (Tcl_GetIntFromObj(I, objv[2], &max) != TCL_OK) {
+		return TCL_ERROR;
+	    }
+	    if (max <= 0) {
+		Tcl_AppendResult (I, "Bad limit ",
+				  Tcl_GetString (objv[2]),
+				  " of json entities to extract.",
+				  NULL);
+		Tcl_SetErrorCode (I, "JSON", "BAD-LIMIT", NULL);
+		return TCL_ERROR;
+	    }
+
+	} else {
+	    max = -1;
+	}
+
+	context.text   = Tcl_GetStringFromObj(objv[1], &context.remaining);
+	context.I      = I;
+	context.has_error = 0;
+	found  = 0;
+
+	/* Iterate over the input until
+	 * - we have gotten all requested values.
+	 * - we have run out of input
+	 * - we have run into an error
+	 */
+
+	while ((max < 0) || max) {
+	    context.result = TCL_ERROR;
+	    jsonparse (&context);
+
+	    /* parse error, abort */
+	    if (context.result != TCL_OK) {
+		Tcl_DecrRefCount (result);
+		return TCL_ERROR;
+	    }
+
+	    /* Proper value extracted, extend result */
+	    found ++;
+	    Tcl_ListObjAppendElement(I, result,
+				     Tcl_GetObjResult (I));
+
+	    /* Count down on the number of still missing
+	     * values, if not asking for all (-1)
+	     */
+	    if (max > 0) max --;
+
+	    /* Jump over trailing whitespace for proper end-detection */
+	    jsonskip (&context);
+
+	    /* Abort if we have consumed all input */
+	    if (!context.remaining) break;
+
+	    /* Clear scratch pad before continuing */
+	    context.obj = NULL;
+	}
+
+	/* While all parses were ok we reached end of
+	 * input without getting all requested values,
+	 * this is an error
+	 */
+	if (max > 0) {
+	    char buf [30];
+	    sprintf (buf, "%d", found);
+            Tcl_ResetResult (I);
+	    Tcl_AppendResult (I, "Bad limit ",
+			      Tcl_GetString (objv[2]),
+			      " of json entities to extract, found only ",
+			      buf,
+			      ".",
+			      NULL);
+	    Tcl_SetErrorCode (I, "JSON", "BAD-LIMIT", "TOO", "LARGE", NULL);
+	    Tcl_DecrRefCount (result);
+	    return TCL_ERROR;
+	}
+
+	/* We are good and done */
+	Tcl_SetObjResult(I, result);
+	return TCL_OK;
+    }
+
+    if 0 {critcl::ccommand validate_critcl {dummy I objc objv} {
+	struct context context = { NULL };
+
+	if (objc != 2) {
+	    Tcl_WrongNumArgs(I, 1, objv, "jsonText");
+	    return TCL_ERROR;
+	}
+
+	context.text   = Tcl_GetStringFromObj(objv[1], &context.remaining);
+	context.I      = I;
+	context.result = TCL_ERROR;
+
+	/* Iterate over the input until we have run
+	 * out of text, or encountered an error. We
+	 * use only the lexer here, and told it to not
+	* create superfluous token values.
+	 */
+
+	while (context.remaining) {
+	    if (jsonlex (&context) == -1) {
+		Tcl_SetObjResult(I, Tcl_NewBooleanObj (0));
+		return TCL_OK;
+	    }
+	}
+
+	/* We are good and done */
+	Tcl_SetObjResult(I, Tcl_NewBooleanObj (1));
+	return TCL_OK;
+    }}
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/pkgIndex.tcl
new file mode 100644
index 00000000..3533c95d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/json/pkgIndex.tcl
@@ -0,0 +1,7 @@
+# Tcl package index file, version 1.1
+
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded json 1.3.4 [list source [file join $dir json.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded json::write 1.0.4 [list source [file join $dir json_write.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/lambda/lambda.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/lambda/lambda.tcl
new file mode 100644
index 00000000..800babcc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/lambda/lambda.tcl
@@ -0,0 +1,43 @@
+# # ## ### ##### ######## ############# ####################
+## -*- tcl -*-
+## (C) 2011 Andreas Kupries, BSD licensed.
+
+# Two convenience commands to make the writing of anonymous
+# procedures, i.e. lambdas more proc-like. Instead of, for example, to
+# write
+#
+#      set f {::apply {{x} { .... }}}
+#
+# with its deep nesting of braces, or (if we wish to curry (*))
+#
+#      set f [list ::apply {{x y} { .... }} $valueforx]
+#
+# with a list command to insert the arguments, just write
+#
+#      set f [lambda {x} { .... }]
+# and
+#      set f [lambda {x y} { .... } $valueforx]
+#
+# (*) Pre-supply arguments to the anon proc, making the lambda a
+#     partial application.
+
+# # ## ### ##### ######## ############# ####################
+## Requisites
+
+package require Tcl 8.5
+
+# # ## ### ##### ######## ############# #####################
+## Public API implementation
+
+proc lambda {arguments body args} {
+    return [list ::apply [list $arguments $body] {*}$args]
+}
+
+proc lambda@ {ns arguments body args} {
+    return [list ::apply [list $arguments $body $ns] {*}$args]
+}
+
+# # ## ### ##### ######## ############# ####################
+## Ready
+package provide lambda 1
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/lambda/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/lambda/pkgIndex.tcl
new file mode 100644
index 00000000..898e4316
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/lambda/pkgIndex.tcl
@@ -0,0 +1,8 @@
+#checker -scope global exclude warnUndefinedVar
+# var in question is 'dir'.
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    # PRAGMA: returnok
+    return
+}
+# Utility wrapper around ::apply for easier writing.
+package ifneeded lambda 1 [list source [file join $dir lambda.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/lazyset/lazyset.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/lazyset/lazyset.tcl
new file mode 100644
index 00000000..20c04b46
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/lazyset/lazyset.tcl
@@ -0,0 +1,88 @@
+#! /usr/bin/env tclsh
+
+package require Tcl 8.5
+
+namespace eval ::lazyset {}
+
+proc ::lazyset::variable {args} {
+	lassign [lrange $args end-1 end] varName commandPrefix
+	set args [lrange $args 0 end-2]
+
+	set appendArgs true
+	foreach {arg val} $args {
+		switch -exact -- $arg {
+			"-array" {
+				set isArray [expr {!!$val}]
+			}
+			"-appendArgs" {
+				set appendArgs [expr {!!$val}]
+			}
+			default {
+				error "Valid options -array, -appendArgs: Invalid option \"$arg\""
+			}
+		}
+	}
+
+	set trace [uplevel 1 [list trace info variable $varName]]
+	if {$trace ne ""} {
+		uplevel 1 [list [list trace remove variable $varName $trace]]
+	}
+
+	if {![info exists isArray]} {
+		set isArray false
+		if {[uplevel 1 [list ::array exists $varName]]} {
+			set isArray true
+		}
+	}
+
+	set finalCode ""
+	if {$isArray} {
+		append finalCode {
+			set varname "$name1\($name2\)"
+			if {[uplevel 1 [list info exists $varname]]} {
+				return
+			}
+		}
+	} else {
+		append finalCode {
+			set varname $name1
+		}
+	}
+
+	if {$appendArgs} {
+		append finalCode {
+			set args [lrange $args 1 end]
+		}
+		if {$isArray} {
+			append finalCode {
+				append code " " [list $name1 $name2 {*}$args]
+			}
+		} else {
+			append finalCode {
+				append code " " [list $name1 {*}$args]
+			}
+		}
+	}
+
+	append finalCode {
+		set result [uplevel 1 $code]
+
+		uplevel 1 [list unset -nocomplain $varname]
+		uplevel 1 [list set $varname $result]
+	}
+
+	set code [list apply [list {code name1 name2 args} $finalCode] $commandPrefix]
+
+	if {$isArray} {
+		uplevel 1 [list unset -nocomplain $varName]
+		uplevel 1 [list ::array set $varName [list]]
+	} else {
+		uplevel 1 [list set $varName ""]
+	}
+
+	uplevel 1 [list trace add variable $varName read $code]
+
+	return
+}
+
+package provide lazyset 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/lazyset/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/lazyset/pkgIndex.tcl
new file mode 100644
index 00000000..ecfe06e3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/lazyset/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded lazyset 1 [list source [file join $dir lazyset.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ldap/ldap.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ldap/ldap.tcl
new file mode 100644
index 00000000..5eca01ed
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ldap/ldap.tcl
@@ -0,0 +1,2327 @@
+#-----------------------------------------------------------------------------
+#   Copyright (C) 1999-2004 Jochen C. Loewer (loewerj@web.de)
+#   Copyright (C) 2006      Michael Schlenker (mic42@users.sourceforge.net)
+#-----------------------------------------------------------------------------
+#
+#   A (partial) LDAPv3 protocol implementation in plain Tcl.
+#
+#   See RFC 4510 and ASN.1 (X.680) and BER (X.690).
+#
+#
+#   This software is copyrighted by Jochen C. Loewer (loewerj@web.de). The
+#   following terms apply to all files associated with the software unless
+#   explicitly disclaimed in individual files.
+#
+#   The authors hereby grant permission to use, copy, modify, distribute,
+#   and license this software and its documentation for any purpose, provided
+#   that existing copyright notices are retained in all copies and that this
+#   notice is included verbatim in any distributions. No written agreement,
+#   license, or royalty fee is required for any of the authorized uses.
+#   Modifications to this software may be copyrighted by their authors
+#   and need not follow the licensing terms described here, provided that
+#   the new terms are clearly indicated on the first page of each file where
+#   they apply.
+#
+#   IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+#   FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+#   ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+#   DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+#   POSSIBILITY OF SUCH DAMAGE.
+#
+#   THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+#   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+#   FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+#   IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+#   NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+#   MODIFICATIONS.
+#
+#   written by Jochen Loewer
+#   3 June, 1999
+#
+#-----------------------------------------------------------------------------
+
+package require Tcl 8.5
+package require asn 0.7
+package provide ldap 1.10.1
+
+namespace eval ldap {
+
+    namespace export    connect secure_connect  \
+			starttls                \
+			tlsoptions              \
+                        disconnect              \
+                        bind unbind             \
+                        bindSASL                \
+                        search                  \
+                        searchInit           	\
+		        searchNext	        \
+		        searchEnd		\
+                        modify                  \
+                        modifyMulti             \
+                        add                     \
+		        addMulti		\
+                        delete                  \
+                        modifyDN		\
+		        info
+
+    namespace import ::asn::*
+
+    variable doDebug
+
+    # Valid TLS procotol versions
+    variable tlsProtocols [list -tls1 yes -tls1.1 yes -tls1.2 yes]
+
+    set doDebug 0
+
+    # LDAP result codes from the RFC
+    variable resultCode2String
+    array set resultCode2String {
+         0  success
+         1  operationsError
+         2  protocolError
+         3  timeLimitExceeded
+         4  sizeLimitExceeded
+         5  compareFalse
+         6  compareTrue
+         7  authMethodNotSupported
+         8  strongAuthRequired
+        10  referral
+        11  adminLimitExceeded
+        12  unavailableCriticalExtension
+        13  confidentialityRequired
+        14  saslBindInProgress
+        16  noSuchAttribute
+        17  undefinedAttributeType
+        18  inappropriateMatching
+        19  constraintViolation
+        20  attributeOrValueExists
+        21  invalidAttributeSyntax
+        32  noSuchObject
+        33  aliasProblem
+        34  invalidDNSyntax
+        35  isLeaf
+        36  aliasDereferencingProblem
+        48  inappropriateAuthentication
+        49  invalidCredentials
+        50  insufficientAccessRights
+        51  busy
+        52  unavailable
+        53  unwillingToPerform
+        54  loopDetect
+        64  namingViolation
+        65  objectClassViolation
+        66  notAllowedOnNonLeaf
+        67  notAllowedOnRDN
+        68  entryAlreadyExists
+        69  objectClassModsProhibited
+        80  other
+    }
+
+    # TLS options for secure_connect and starttls
+    # (see tcltls documentation, function tls::import)
+    variable validTLSOptions
+    set validTLSOptions {
+	-cadir
+	-cafile
+	-certfile
+	-cipher
+	-command
+	-dhparams
+	-keyfile
+	-model
+	-password
+	-request
+	-require
+	-server
+	-servername
+	-ssl2
+	-ssl3
+	-tls1
+	-tls1.1
+	-tls1.2
+    }
+
+    # Default TLS options for secure_connect and starttls
+    variable defaultTLSOptions
+    array set defaultTLSOptions {
+	-request 1
+	-require 1
+	-ssl2    no
+	-ssl3    no
+	-tls1	 yes
+	-tls1.1	 yes
+	-tls1.2	 yes
+    }
+
+    variable curTLSOptions
+    array set curTLSOptions [array get defaultTLSOptions]
+
+    # are we using the old interface (TLSMode = "compatible") or the
+    # new one (TLSMode = "integrated")
+    variable TLSMode
+    set TLSMode "compatible"
+}
+
+
+#-----------------------------------------------------------------------------
+#    Lookup an numerical ldap result code and return a string version
+#
+#-----------------------------------------------------------------------------
+proc ::ldap::resultCode2String {code} {
+    variable resultCode2String
+    if {[::info exists resultCode2String($code)]} {
+	    return $resultCode2String($code)
+    } else {
+	    return "unknownError"
+    }
+}
+
+#-----------------------------------------------------------------------------
+#   Basic sanity check for connection handles
+#   must be an array
+#-----------------------------------------------------------------------------
+proc ::ldap::CheckHandle {handle} {
+    if {![array exists $handle]} {
+        return -code error \
+            [format "Not a valid LDAP connection handle: %s" $handle]
+    }
+}
+
+#-----------------------------------------------------------------------------
+#    info
+#
+#-----------------------------------------------------------------------------
+
+proc ldap::info {args} {
+   set cmd [lindex $args 0]
+   set cmds {connections bound bounduser control extensions features ip saslmechanisms tls whoami}
+   if {[llength $args] == 0} {
+   	return -code error \
+		"Usage: \"info subcommand ?handle?\""
+   }
+   if {[lsearch -exact $cmds $cmd] == -1} {
+   	return -code error \
+		"Invalid subcommand \"$cmd\", valid commands are\
+		[join [lrange $cmds 0 end-1] ,] and [lindex $cmds end]"
+   }
+   eval [linsert [lrange $args 1 end] 0 ldap::info_$cmd]
+}
+
+#-----------------------------------------------------------------------------
+#    get the ip address of the server we connected to
+#
+#-----------------------------------------------------------------------------
+proc ldap::info_ip {args} {
+   if {[llength $args] != 1} {
+   	return -code error \
+	       "Wrong # of arguments. Usage: ldap::info ip handle"
+   }
+   CheckHandle [lindex $args 0]
+   upvar #0 [lindex $args 0] conn
+   if {![::info exists conn(sock)]} {
+   	return -code error \
+		"\"[lindex $args 0]\" is not a ldap connection handle"
+   }
+   return [lindex [fconfigure $conn(sock) -peername] 0]
+}
+
+#-----------------------------------------------------------------------------
+#   get the list of open ldap connections
+#
+#-----------------------------------------------------------------------------
+proc ldap::info_connections {args} {
+   if {[llength $args] != 0} {
+   	return -code error \
+	       "Wrong # of arguments. Usage: ldap::info connections"
+   }
+   return [::info vars ::ldap::ldap*]
+}
+
+#-----------------------------------------------------------------------------
+#   check if the connection is bound
+#
+#-----------------------------------------------------------------------------
+proc ldap::info_bound {args} {
+   if {[llength $args] != 1} {
+   	return -code error \
+	       "Wrong # of arguments. Usage: ldap::info bound handle"
+   }
+   CheckHandle [lindex $args 0]
+   upvar #0 [lindex $args 0] conn
+   if {![::info exists conn(bound)]} {
+   	return -code error \
+		"\"[lindex $args 0]\" is not a ldap connection handle"
+   }
+
+   return $conn(bound)
+}
+
+#-----------------------------------------------------------------------------
+#   check with which user the connection is bound
+#
+#-----------------------------------------------------------------------------
+proc ldap::info_bounduser {args} {
+   if {[llength $args] != 1} {
+   	return -code error \
+	       "Wrong # of arguments. Usage: ldap::info bounduser handle"
+   }
+   CheckHandle [lindex $args 0]
+   upvar #0 [lindex $args 0] conn
+   if {![::info exists conn(bound)]} {
+   	return -code error \
+		"\"[lindex $args 0]\" is not a ldap connection handle"
+   }
+
+   return $conn(bounduser)
+}
+
+#-----------------------------------------------------------------------------
+#   check if the connection uses tls
+#
+#-----------------------------------------------------------------------------
+
+proc ldap::info_tls {args} {
+   if {[llength $args] != 1} {
+   	return -code error \
+	       "Wrong # of arguments. Usage: ldap::info tls handle"
+   }
+   CheckHandle [lindex $args 0]
+   upvar #0 [lindex $args 0] conn
+   if {![::info exists conn(tls)]} {
+   	return -code error \
+		"\"[lindex $args 0]\" is not a ldap connection handle"
+   }
+   return $conn(tls)
+}
+
+#-----------------------------------------------------------------------------
+#   return the TLS connection status
+#
+#-----------------------------------------------------------------------------
+
+proc ldap::info_tlsstatus {args} {
+   if {[llength $args] != 1} {
+   	return -code error \
+	       "Wrong # of arguments. Usage: ldap::info tlsstatus handle"
+   }
+   CheckHandle [lindex $args 0]
+   upvar #0 [lindex $args 0] conn
+   if {![::info exists conn(tls)]} {
+   	return -code error \
+		"\"[lindex $args 0]\" is not a ldap connection handle"
+   }
+   if {$conn(tls)} then {
+       set r [::tls::status $conn(sock)]
+   } else {
+       set r {}
+   }
+   return $r
+}
+
+proc ldap::info_saslmechanisms {args} {
+   if {[llength $args] != 1} {
+   	return -code error \
+	       "Wrong # of arguments. Usage: ldap::info saslmechanisms handle"
+   }
+   return [Saslmechanisms [lindex $args 0]]
+}
+
+proc ldap::info_extensions {args} {
+   if {[llength $args] != 1} {
+   	return -code error \
+	       "Wrong # of arguments. Usage: ldap::info extensions handle"
+   }
+   return [Extensions [lindex $args 0]]
+}
+
+proc ldap::info_control {args} {
+   if {[llength $args] != 1} {
+   	return -code error \
+	       "Wrong # of arguments. Usage: ldap::info control handle"
+   }
+   return [Control [lindex $args 0]]
+}
+
+proc ldap::info_features {args} {
+   if {[llength $args] != 1} {
+   	return -code error \
+	       "Wrong # of arguments. Usage: ldap::info features handle"
+   }
+   return [Features [lindex $args 0]]
+}
+
+proc ldap::info_whoami {args} {
+   if {[llength $args] != 1} {
+   	return -code error \
+	       "Wrong # of arguments. Usage: ldap::info whoami handle"
+   }
+   return [Whoami [lindex $args 0]]
+}
+
+
+#-----------------------------------------------------------------------------
+# Basic server introspection support
+#
+#-----------------------------------------------------------------------------
+proc ldap::Saslmechanisms {conn} {
+    CheckHandle $conn
+    lindex [ldap::search $conn {} {(objectClass=*)} \
+                    {supportedSASLMechanisms} -scope base] 0 1 1
+}
+
+proc ldap::Extensions {conn} {
+    CheckHandle $conn
+    lindex [ldap::search $conn {} {(objectClass=*)} \
+                    {supportedExtension} -scope base] 0 1 1
+}
+
+proc ldap::Control {conn} {
+    CheckHandle $conn
+    lindex [ldap::search $conn {} {(objectClass=*)} \
+                    {supportedControl} -scope base] 0 1 1
+}
+
+proc ldap::Features {conn} {
+    CheckHandle $conn
+    lindex [ldap::search $conn {} {(objectClass=*)} \
+                    {supportedFeatures} -scope base] 0 1 1
+}
+
+#-------------------------------------------------------------------------------
+# Implements the RFC 4532 extension "Who am I?"
+#
+#-------------------------------------------------------------------------------
+proc ldap::Whoami {handle} {
+    CheckHandle $handle
+    if {[lsearch [ldap::Extensions $handle] 1.3.6.1.4.1.4203.1.11.3] == -1} {
+        return -code error \
+            "Server does not support the \"Who am I?\" extension"
+    }
+
+    set request [asnApplicationConstr 23 [asnEncodeString 80 1.3.6.1.4.1.4203.1.11.3]]
+    set mid [SendMessage $handle $request]
+    set response [WaitForResponse $handle $mid]
+
+    asnGetApplication response appNum
+    if {$appNum != 24} {
+        return -code error \
+             "unexpected application number ($appNum != 24)"
+    }
+
+    asnGetEnumeration response resultCode
+    asnGetOctetString response matchedDN
+    asnGetOctetString response errorMessage
+    if {$resultCode != 0} {
+        return -code error \
+		-errorcode [list LDAP [resultCode2String $resultCode] $matchedDN $errorMessage] \
+		"LDAP error [resultCode2String $resultCode] '$matchedDN': $errorMessage"
+    }
+    set whoami ""
+    if {[string length $response]} {
+        asnRetag response 0x04
+        asnGetOctetString response whoami
+    }
+    return $whoami
+}
+
+#-----------------------------------------------------------------------------
+#    connect
+#
+#-----------------------------------------------------------------------------
+proc ldap::connect { host {port 389} } {
+
+    #--------------------------------------
+    #   connect via TCP/IP
+    #--------------------------------------
+    set sock [socket $host $port]
+    fconfigure $sock -blocking no -translation binary -buffering full
+
+    #--------------------------------------
+    #   initialize connection array
+    #--------------------------------------
+    upvar #0 ::ldap::ldap$sock conn
+    catch { unset conn }
+
+    set conn(host)      $host
+    set conn(sock)      $sock
+    set conn(messageId) 0
+    set conn(tls)       0
+    set conn(bound)     0
+    set conn(bounduser) ""
+    set conn(saslBindInProgress) 0
+    set conn(tlsHandshakeInProgress) 0
+    set conn(lastError) ""
+    set conn(referenceVar) [namespace current]::searchReferences
+    set conn(returnReferences) 0
+
+    fileevent $sock readable [list ::ldap::MessageReceiver ::ldap::ldap$sock]
+    return ::ldap::ldap$sock
+}
+
+#-----------------------------------------------------------------------------
+#    tlsoptions
+#
+#-----------------------------------------------------------------------------
+proc ldap::tlsoptions {args} {
+    variable curTLSOptions
+    variable validTLSOptions
+    variable defaultTLSOptions
+    variable TLSMode
+
+    if {$args eq "reset"} then {
+	array set curTLSOptions [array get defaultTLSOptions]
+    } else {
+	foreach {opt val} $args {
+	    if {$opt in $validTLSOptions} then {
+		set curTLSOptions($opt) $val
+	    } else {
+		return -code error "invalid TLS option '$opt'"
+	    }
+	}
+    }
+    set TLSMode "integrated"
+    return [array get curTLSOptions]
+}
+
+#-----------------------------------------------------------------------------
+#    secure_connect
+#
+#-----------------------------------------------------------------------------
+proc ldap::secure_connect { host {port 636} {verify_cert ""} {sni_servername ""}} {
+
+    variable tlsProtocols
+    variable curTLSOptions
+    variable TLSMode
+
+    package require tls
+
+    #------------------------------------------------------------------
+    #   set options
+    #------------------------------------------------------------------
+
+    if {$TLSMode eq "compatible"} then {
+	#
+	# Compatible with old mode. Build a TLS socket with appropriate
+	# parameters, without changing any other parameter which may
+	# have been set by a previous call to tls::init (as specified
+	# in the ldap.tcl manpage).
+	#
+	if {$verify_cert eq ""} then {
+	    set verify_cert 1
+	}
+	set cmd [list tls::socket -request 1 -require $verify_cert \
+				  -ssl2 no -ssl3 no]
+	if {$sni_servername ne ""} {
+	    lappend cmd -servername $sni_servername
+	}
+
+	# The valid ones depend on the server and openssl version,
+	# tls::ciphers all tells it in the error message, but offers no
+	# nice introspection.
+	foreach {proto active} $tlsProtocols {
+	    lappend cmd $proto $active
+	}
+
+	lappend cmd $host $port
+    } else {
+	#
+	# New, integrated mode. Use only parameters set with
+	# ldap::tlsoptions to build the socket.
+	#
+
+	if {$verify_cert ne "" || $sni_servername ne ""} then {
+	    return -code error "verify_cert/sni_servername: incompatible with the use of tlsoptions"
+	}
+
+	set cmd [list tls::socket {*}[array get curTLSOptions] $host $port]
+    }
+
+    #------------------------------------------------------------------
+    #   connect via TCP/IP
+    #------------------------------------------------------------------
+
+    set sock [eval $cmd]
+
+    #------------------------------------------------------------------
+    #   Run the TLS handshake
+    #
+    #------------------------------------------------------------------
+    
+    # run the handshake in synchronous I/O mode
+    fconfigure $sock -blocking yes -translation binary -buffering full
+
+    if {[catch { tls::handshake $sock } err]} {
+	close $sock
+	return -code error $err
+    }
+
+    # from now on, run in asynchronous I/O mode
+    fconfigure $sock -blocking no -translation binary -buffering full
+
+    #--------------------------------------
+    #   initialize connection array
+    #--------------------------------------
+    upvar ::ldap::ldap$sock conn
+    catch { unset conn }
+
+    set conn(host)      $host
+    set conn(sock)      $sock
+    set conn(messageId) 0
+    set conn(tls)       1
+    set conn(bound)     0
+    set conn(bounduser) ""
+    set conn(saslBindInProgress) 0
+    set conn(tlsHandshakeInProgress) 0
+    set conn(lasterror) ""
+    set conn(referenceVar) [namespace current]::searchReferences
+    set conn(returnReferences) 0
+    
+    fileevent $sock readable [list ::ldap::MessageReceiver ::ldap::ldap$sock]
+    return ::ldap::ldap$sock
+}
+
+
+#------------------------------------------------------------------------------
+#    starttls -  negotiate tls on an open ldap connection
+#
+#------------------------------------------------------------------------------
+proc ldap::starttls {handle {cafile ""} {certfile ""} {keyfile ""} \
+                     {verify_cert ""} {sni_servername ""}} {
+    variable tlsProtocols
+    variable curTLSOptions
+    variable TLSMode
+
+    CheckHandle $handle
+
+    upvar #0 $handle conn
+
+    #------------------------------------------------------------------
+    #   set options
+    #------------------------------------------------------------------
+
+    if {$TLSMode eq "compatible"} then {
+	#
+	# Compatible with old mode. Build a TLS socket with appropriate
+	# parameters, without changing any other parameter which may
+	# have been set by a previous call to tls::init (as specified
+	# in the ldap.tcl manpage).
+	#
+	if {$verify_cert eq ""} then {
+	    set verify_cert 1
+	}
+	set cmd [list tls::import $conn(sock) \
+		     -cafile $cafile -certfile $certfile -keyfile $keyfile \
+		     -request 1 -server 0 -require $verify_cert \
+		     -ssl2 no -ssl3 no ]
+	if {$sni_servername ne ""} {
+	    lappend cmd -servername $sni_servername
+	}
+
+	# The valid ones depend on the server and openssl version,
+	# tls::ciphers all tells it in the error message, but offers no
+	# nice introspection.
+	foreach {proto active} $tlsProtocols {
+	    lappend cmd $proto $active
+	}
+    } else {
+	#
+	# New, integrated mode. Use only parameters set with
+	# ldap::tlsoptions to build the socket.
+	#
+
+	if {$cafile ne "" || $certfile ne "" || $keyfile ne "" ||
+		$verify_cert ne "" || $sni_servername ne ""} then {
+	    return -code error "cafile/certfile/keyfile/verify_cert/sni_servername: incompatible with the use of tlsoptions"
+	}
+
+	set cmd [list tls::import $conn(sock) {*}[array get curTLSOptions]]
+    }
+
+    #------------------------------------------------------------------
+    #   check handle
+    #------------------------------------------------------------------
+
+    if {$conn(tls)} {
+        return -code error \
+            "Cannot StartTLS on connection, TLS already running"
+    }
+
+    if {[ldap::waitingForMessages $handle]} {
+        return -code error \
+            "Cannot StartTLS while waiting for repsonses"
+    }
+
+    if {$conn(saslBindInProgress)} {
+        return -code error \
+            "Cannot StartTLS while SASL bind in progress"
+    }
+
+    if {[lsearch -exact [ldap::Extensions $handle] 1.3.6.1.4.1.1466.20037] == -1} {
+        return -code error \
+            "Server does not support the StartTLS extension"
+    }
+    package require tls
+
+
+    set request [asnApplicationConstr 23 [asnEncodeString 80 1.3.6.1.4.1.1466.20037]]
+    set mid [SendMessage $handle $request]
+    set conn(tlsHandshakeInProgress) 1
+    set response [WaitForResponse $handle $mid]
+
+    asnGetApplication response appNum
+    if {$appNum != 24} {
+        set conn(tlsHandshakeInProgress) 0
+        return -code error \
+             "unexpected application number ($appNum != 24)"
+    }
+
+    asnGetEnumeration response resultCode
+    asnGetOctetString response matchedDN
+    asnGetOctetString response errorMessage
+    if {$resultCode != 0} {
+        set conn(tlsHandshakeInProgress) 0
+        return -code error \
+		-errorcode [list LDAP [resultCode2String $resultCode] $matchedDN $errorMessage] \
+		"LDAP error [resultCode2String $resultCode] '$matchedDN': $errorMessage"
+    }
+    set oid "1.3.6.1.4.1.1466.20037"
+    if {[string length $response]} {
+        asnRetag response 0x04
+        asnGetOctetString response oid
+    }
+    if {$oid ne "1.3.6.1.4.1.1466.20037"} {
+        set conn(tlsHandshakeInProgress) 0
+        return -code error \
+            "Unexpected LDAP response"
+    }
+
+    # Initiate the TLS socket setup
+
+    eval $cmd
+
+    set retry 0
+    while {1} {
+        if {$retry > 20} {
+            close $sock
+            return -code error "too long retry to setup SSL connection"
+        }
+        if {[catch { tls::handshake $conn(sock) } err]} {
+            if {[string match "*resource temporarily unavailable*" $err]} {
+                after 50
+                incr retry
+            } else {
+                close $conn(sock)
+                return -code error $err
+            }
+        } else {
+            break
+        }
+    }
+    set conn(tls) 1
+    set conn(tlsHandshakeInProgress) 0
+    return 1
+}
+
+
+
+#------------------------------------------------------------------------------
+#  Create a new unique message and send it over the socket.
+#
+#------------------------------------------------------------------------------
+
+proc ldap::CreateAndSendMessage {handle payload} {
+    upvar #0 $handle conn
+
+    if {$conn(tlsHandshakeInProgress)} {
+        return -code error \
+            "Cannot send other LDAP PDU while TLS handshake in progress"
+    }
+
+    incr conn(messageId)
+    set message [asnSequence [asnInteger $conn(messageId)] $payload]
+    debugData "Message $conn(messageId) Sent" $message
+    puts -nonewline $conn(sock) $message
+    flush $conn(sock)
+    return $conn(messageId)
+}
+
+#------------------------------------------------------------------------------
+#  Send a message to the server which expects a response,
+#  returns the messageId which is to be used with FinalizeMessage
+#  and WaitForResponse
+#
+#------------------------------------------------------------------------------
+proc ldap::SendMessage {handle pdu} {
+    upvar #0 $handle conn
+    set mid [CreateAndSendMessage $handle $pdu]
+
+    # safe the state to match responses
+    set conn(message,$mid) [list]
+    return $mid
+}
+
+#------------------------------------------------------------------------------
+#  Send a message to the server without expecting a response
+#
+#------------------------------------------------------------------------------
+proc ldap::SendMessageNoReply {handle pdu} {
+    upvar #0 $handle conn
+    return [CreateAndSendMessage $handle $pdu]
+}
+
+#------------------------------------------------------------------------------
+# Cleanup the storage associated with a messageId
+#
+#------------------------------------------------------------------------------
+proc ldap::FinalizeMessage {handle messageId} {
+    upvar #0 $handle conn
+    trace "Message $messageId finalized"
+    unset -nocomplain conn(message,$messageId)
+}
+
+#------------------------------------------------------------------------------
+#  Wait for a response for the given messageId.
+#
+#  This waits in a vwait if no message has yet been received or returns
+#  the oldest message at once, if it is queued.
+#
+#------------------------------------------------------------------------------
+proc ldap::WaitForResponse {handle messageId} {
+    upvar #0 $handle conn
+
+    trace "Waiting for Message $messageId"
+    # check if the message waits for a reply
+    if {![::info exists conn(message,$messageId)]} {
+        return -code error \
+            [format "Cannot wait for message %d." $messageId]
+    }
+
+    # check if we have a received response in the buffer
+    if {[llength $conn(message,$messageId)] > 0} {
+        set response [lindex $conn(message,$messageId) 0]
+        set conn(message,$messageId) [lrange $conn(message,$messageId) 1 end]
+        return $response
+    }
+
+    # wait for an incoming response
+    vwait [namespace which -variable $handle](message,$messageId)
+    if {[llength $conn(message,$messageId)] == 0} {
+        # We have waited and have been awakended but no message is there
+        if {[string length $conn(lastError)]} {
+            return -code error \
+                [format "Protocol error: %s" $conn(lastError)]
+        } else {
+            return -code error \
+                [format "Broken response for message %d" $messageId]
+        }
+    }
+    set response [lindex $conn(message,$messageId) 0]
+    set conn(message,$messageId) [lrange $conn(message,$messageId) 1 end]
+    return $response
+}
+
+proc ldap::waitingForMessages {handle} {
+    upvar #0 $handle conn
+    return [llength [array names conn message,*]]
+}
+
+#------------------------------------------------------------------------------
+# Process a single response PDU. Decodes the messageId and puts the
+# message into the appropriate queue.
+#
+#------------------------------------------------------------------------------
+
+proc ldap::ProcessMessage {handle response} {
+    upvar #0 $handle conn
+
+    # decode the messageId
+    asnGetInteger  response messageId
+
+    # check if we wait for a response
+    if {[::info exists conn(message,$messageId)]} {
+        # append the new message, which triggers
+        # message handlers using vwait on the entry
+        lappend conn(message,$messageId) $response
+        return
+    }
+
+    # handle unsolicited server responses
+
+    if {0} {
+        asnGetApplication response appNum
+        #if { $appNum != 24 } {
+        #     error "unexpected application number ($appNum != 24)"
+        #}
+        asnGetEnumeration response resultCode
+        asnGetOctetString response matchedDN
+        asnGetOctetString response errorMessage
+        if {[string length $response]} {
+            asnGetOctetString response responseName
+        }
+        if {[string length $response]} {
+            asnGetOctetString response responseValue
+        }
+        if {$resultCode != 0} {
+            return -code error \
+		    -errorcode [list LDAP [resultCode2String $resultCode] $matchedDN $errorMessage] \
+		    "LDAP error [resultCode2String $resultCode] '$matchedDN': $errorMessage"
+        }
+    }
+    #dumpASN1Parse $response
+    #error "Unsolicited message from server"
+
+}
+
+#-------------------------------------------------------------------------------
+# Get the code out of waitForResponse in case of errors
+#
+#-------------------------------------------------------------------------------
+proc ldap::CleanupWaitingMessages {handle} {
+    upvar #0 $handle conn
+    foreach message [array names conn message,*] {
+        set conn($message) [list]
+    }
+}
+
+#-------------------------------------------------------------------------------
+#  The basic fileevent based message receiver.
+#  It reads PDU's from the network in a non-blocking fashion.
+#
+#-------------------------------------------------------------------------------
+proc ldap::MessageReceiver {handle} {
+    upvar #0 $handle conn
+
+    # We have to account for partial PDUs received, so
+    # we keep some state information.
+    #
+    #   conn(pdu,partial)  -- we are reading a partial pdu if non zero
+    #   conn(pdu,length_bytes) -- the buffer for loading the length
+    #   conn(pdu,length)   -- we have decoded the length if >= 0, if <0 it contains
+    #                         the length of the length encoding in bytes
+    #   conn(pdu,payload)  -- the payload buffer
+    #   conn(pdu,received) -- the data received
+
+    # fetch the sequence byte
+    if {[::info exists conn(pdu,partial)] && $conn(pdu,partial) != 0} {
+        # we have decoded at least the type byte
+    } else {
+        foreach {code type} [ReceiveBytes $conn(sock) 1] {break}
+        switch -- $code {
+            ok {
+                binary scan $type c byte
+                set type [expr {($byte + 0x100) % 0x100}]
+                if {$type != 0x30} {
+                    CleanupWaitingMessages $handle
+                    set conn(lastError) [format "Expected SEQUENCE (0x30) but got %x" $type]
+                    return
+                } else {
+                    set conn(pdu,partial) 1
+                    append conn(pdu,received) $type
+                }
+	    }
+	    partial {
+		# See ticket https://core.tcl.tk/tcllib/tktview/c247ed5db42e373470bf8a6302717e76eb3c6106
+		return
+	    }
+	    eof {
+                CleanupWaitingMessages $handle
+                set conn(lastError) "Server closed connection"
+                catch {close $conn(sock)}
+                return
+            }
+            default {
+                CleanupWaitingMessages $handle
+                set bytes $type[read $conn(sock)]
+                binary scan $bytes h* values
+                set conn(lastError) [format \
+					 "Error reading SEQUENCE response for handle %s : %s : %s" $handle $code $values]
+                return
+	    }
+        }
+    }
+
+    # fetch the length
+    if {[::info exists conn(pdu,length)] && $conn(pdu,length) >= 0} {
+        # we already have a decoded length
+    } else {
+        if {[::info exists conn(pdu,length)] && $conn(pdu,length) < 0} {
+            # we already know the length, but have not received enough bytes to decode it
+            set missing [expr {1+abs($conn(pdu,length))-[string length $conn(pdu,length_bytes)]}]
+            if {$missing != 0} {
+                foreach {code bytes} [ReceiveBytes $conn(sock) $missing] {break}
+                switch -- $code {
+                    "ok"  {
+                        append conn(pdu,length_bytes) $bytes
+                        append conn(pdu,received) $bytes
+                        asnGetLength conn(pdu,length_bytes) conn(pdu,length)
+                    }
+                    "partial" {
+                        append conn(pdu,length_bytes) $bytes
+                        append conn(pdu,received) $bytes
+                        return
+                    }
+                    "eof" {
+                        CleanupWaitingMessages $handle
+                        catch {close $conn(sock)}
+                        set conn(lastError) "Server closed connection"
+                        return
+                    }
+                    default {
+                        CleanupWaitingMessages $handle
+                        set conn(lastError) [format \
+                            "Error reading LENGTH2 response for handle %s : %s" $handle $code]
+                        return
+                    }
+                }
+            }
+        } else {
+            # we know nothing, need to read the first length byte
+            foreach {code bytes} [ReceiveBytes $conn(sock) 1] {break}
+            switch -- $code {
+                "ok"  {
+                    set conn(pdu,length_bytes) $bytes
+                    binary scan $bytes c byte
+                    set size [expr {($byte + 0x100) % 0x100}]
+                    if {$size > 0x080} {
+                        set conn(pdu,length) [expr {-1* ($size & 0x7f)}]
+                        # fetch the rest with the next fileevent
+                        return
+                    } else {
+                        asnGetLength conn(pdu,length_bytes) conn(pdu,length)
+                    }
+                }
+                "eof" {
+                    CleanupWaitingMessages $handle
+                    catch {close $conn(sock)}
+                    set conn(lastError) "Server closed connection"
+                }
+                default {
+                    CleanupWaitingMessages $handle
+                    set conn(lastError) [format \
+                        "Error reading LENGTH1 response for handle %s : %s" $handle $code]
+                    return
+                }
+            }
+        }
+    }
+
+    if {[::info exists conn(pdu,payload)]} {
+        # length is decoded, we can read the rest
+        set missing [expr {$conn(pdu,length) - [string length $conn(pdu,payload)]}]
+    } else {
+        set missing $conn(pdu,length)
+    }
+    if {$missing > 0} {
+        foreach {code bytes} [ReceiveBytes $conn(sock) $missing] {break}
+        switch -- $code {
+            "ok" {
+                append conn(pdu,payload) $bytes
+            }
+            "partial" {
+                append conn(pdu,payload) $bytes
+                return
+            }
+            "eof" {
+                CleanupWaitingMessages $handle
+                catch {close $conn(sock)}
+                set conn(lastError) "Server closed connection"
+            }
+            default {
+                CleanupWaitingMessages $handle
+                set conn(lastError) [format \
+                    "Error reading DATA response for handle %s : %s" $handle $code]
+                return
+            }
+        }
+    }
+
+    # we have a complete PDU, push it for processing
+    set pdu $conn(pdu,payload)
+    set conn(pdu,payload) ""
+    set conn(pdu,partial) 0
+    unset -nocomplain set conn(pdu,length)
+    set conn(pdu,length_bytes) ""
+
+    # reschedule message Processing
+    after 0 [list ::ldap::ProcessMessage $handle $pdu]
+}
+
+#-------------------------------------------------------------------------------
+# Receive the number of bytes from the socket and signal error conditions.
+#
+#-------------------------------------------------------------------------------
+proc ldap::ReceiveBytes {sock bytes} {
+    set status [catch {read $sock $bytes} block]
+    if { $status != 0 } {
+        return [list error $block]
+    } elseif { [string length $block] == $bytes } {
+        # we have all bytes we wanted
+        return [list ok $block]
+    } elseif { [eof $sock] } {
+        return [list eof $block]
+    } elseif { [fblocked $sock] || ([string length $block] < $bytes)} {
+        return [list partial $block]
+    } else {
+        error "Socket state for socket $sock undefined!"
+    }
+}
+
+#-----------------------------------------------------------------------------
+#    bindSASL  -  does a bind with SASL authentication
+#-----------------------------------------------------------------------------
+
+proc ldap::bindSASL {handle {name ""} {password ""} } {
+    CheckHandle $handle
+
+    package require SASL
+
+    upvar #0 $handle conn
+
+    set mechs [ldap::Saslmechanisms $handle]
+
+    set conn(saslBindInProgress) 1
+    set auth 0
+    foreach mech [SASL::mechanisms] {
+        if {[lsearch -exact $mechs $mech] == -1} { continue }
+        trace "Using $mech for SASL Auth"
+        if {[catch {
+            SASLAuth $handle $mech $name $password
+        } msg]} {
+            trace [format "AUTH %s failed: %s" $mech $msg]
+        } else {
+	   # AUTH was successful
+	   if {$msg == 1} {
+	       set auth 1
+	       break
+	   }
+	}
+    }
+
+    set conn(saslBindInProgress) 0
+    return $auth
+}
+
+#-----------------------------------------------------------------------------
+#    SASLCallback - Callback to use for SASL authentication
+#
+#    More or less cut and copied from the smtp module.
+#    May need adjustments for ldap.
+#
+#-----------------------------------------------------------------------------
+proc ::ldap::SASLCallback {handle context command args} {
+    upvar #0 $handle conn
+    upvar #0 $context ctx
+    array set options $conn(options)
+    trace "SASLCallback $command"
+    switch -exact -- $command {
+        login    { return $options(-username) }
+        username { return $options(-username) }
+        password { return $options(-password) }
+        hostname { return [::info hostname] }
+        realm    {
+            if {[string equal $ctx(mech) "NTLM"] \
+                    && [info exists ::env(USERDOMAIN)]} {
+                return $::env(USERDOMAIN)
+            } else {
+                return ""
+            }
+        }
+        default  {
+            return -code error "error: unsupported SASL information requested"
+        }
+    }
+}
+
+#-----------------------------------------------------------------------------
+#    SASLAuth - Handles the actual SASL message exchange
+#
+#-----------------------------------------------------------------------------
+
+proc ldap::SASLAuth {handle mech name password} {
+    upvar 1 $handle conn
+
+    set conn(options) [list -password $password -username $name]
+
+    # check for tcllib bug # 1545306 and reset the nonce-count if
+    # found, so a second call to this code does not fail
+    #
+    if {[::info exists ::SASL::digest_md5_noncecount]} {
+        set ::SASL::digest_md5_noncecount 0
+    }
+
+    set ctx [SASL::new -mechanism $mech \
+                       -service ldap    \
+                       -callback [list ::ldap::SASLCallback $handle]]
+
+    set msg(serverSASLCreds) ""
+    # Do the SASL Message exchanges
+    while {[SASL::step $ctx $msg(serverSASLCreds)]} {
+        # Create and send the BindRequest
+        set request [buildSASLBindRequest "" $mech [SASL::response $ctx]]
+        set messageId [SendMessage $handle $request]
+        debugData bindRequest $request
+
+        set response [WaitForResponse $handle $messageId]
+        FinalizeMessage $handle $messageId
+        debugData bindResponse $response
+
+        array set msg [decodeSASLBindResponse $handle $response]
+
+	# Check for Bind success
+        if {$msg(resultCode) == 0} {
+            set conn(bound) 1
+            set conn(bounduser) $name
+            SASL::cleanup $ctx
+            break
+        }
+
+	# Check if next SASL step is requested
+        if {$msg(resultCode) == 14} {
+            continue
+        }
+
+        SASL::cleanup $ctx
+        # Something went wrong
+        return 	-code error \
+		-errorcode [list LDAP [resultCode2String $msg(resultCode)] \
+				 $msg(matchedDN) $msg(errorMessage)] \
+		"LDAP error [resultCode2String $msg(resultCode)] '$msg(matchedDN)': $msg(errorMessage)"
+    }
+
+    return 1
+}
+
+#----------------------------------------------------------------------------
+#
+# Create a LDAP BindRequest using SASL
+#
+#----------------------------------------------------------------------------
+
+proc ldap::buildSASLBindRequest {name mech {credentials {}}} {
+    if {$credentials ne {}} {
+       set request [  asnApplicationConstr 0            		\
+            [asnInteger 3]                 		\
+            [asnOctetString $name]         		\
+            [asnChoiceConstr 3                   	\
+                    [asnOctetString $mech]      	\
+                    [asnOctetString $credentials] 	\
+            ]  \
+        ]
+    } else {
+    set request [   asnApplicationConstr 0            		\
+        [asnInteger 3]                 		\
+        [asnOctetString $name]         		\
+        [asnChoiceConstr 3                   	\
+                [asnOctetString $mech]      	\
+        ] \
+        ]
+    }
+    return $request
+}
+
+#-------------------------------------------------------------------------------
+#
+# Decode an LDAP BindResponse
+#
+#-------------------------------------------------------------------------------
+proc ldap::decodeSASLBindResponse {handle response} {
+    upvar #0 $handle conn
+
+    asnGetApplication response appNum
+    if { $appNum != 1 } {
+        error "unexpected application number ($appNum != 1)"
+    }
+    asnGetEnumeration response resultCode
+    asnGetOctetString response matchedDN
+    asnGetOctetString response errorMessage
+
+    # Check if we have a serverSASLCreds field left,
+    # or if this is a simple response without it
+    # probably an error message then.
+    if {[string length $response]} {
+        asnRetag response 0x04
+        asnGetOctetString response serverSASLCreds
+    } else {
+        set serverSASLCreds ""
+    }
+    return [list appNum $appNum \
+                 resultCode $resultCode matchedDN $matchedDN \
+                 errorMessage $errorMessage serverSASLCreds $serverSASLCreds]
+}
+
+
+#-----------------------------------------------------------------------------
+#    bind  -  does a bind with simple authentication
+#
+#-----------------------------------------------------------------------------
+proc ldap::bind { handle {name ""} {password ""} } {
+    CheckHandle $handle
+
+    upvar #0 $handle conn
+
+    #-----------------------------------------------------------------
+    #   marshal bind request packet and send it
+    #
+    #-----------------------------------------------------------------
+    set request [asnApplicationConstr 0                \
+                        [asnInteger 3]                 \
+                        [asnOctetString $name]         \
+                        [asnChoice 0 $password]        \
+                ]
+    set messageId [SendMessage $handle $request]
+    debugData bindRequest $request
+
+    set response [WaitForResponse $handle $messageId]
+    FinalizeMessage $handle $messageId
+    debugData bindResponse $response
+
+    asnGetApplication response appNum
+    if { $appNum != 1 } {
+        error "unexpected application number ($appNum != 1)"
+    }
+    asnGetEnumeration response resultCode
+    asnGetOctetString response matchedDN
+    asnGetOctetString response errorMessage
+    if {$resultCode != 0} {
+        return -code error \
+		-errorcode [list LDAP [resultCode2String $resultCode] $matchedDN $errorMessage] \
+		"LDAP error [resultCode2String $resultCode] '$matchedDN': $errorMessage"
+    }
+    set conn(bound) 1
+    set conn(bounduser) $name
+}
+
+
+#-----------------------------------------------------------------------------
+#    unbind
+#
+#-----------------------------------------------------------------------------
+proc ldap::unbind { handle } {
+    CheckHandle $handle
+
+    upvar #0 $handle conn
+
+    #------------------------------------------------
+    #   marshal unbind request packet and send it
+    #------------------------------------------------
+    set request [asnApplication 2 ""]
+    SendMessageNoReply $handle $request
+
+    set conn(bounduser) ""
+    set conn(bound) 0
+    close $conn(sock)
+    set conn(sock) ""
+}
+
+
+#-----------------------------------------------------------------------------
+#    search  -  performs a LDAP search below the baseObject tree using a
+#               complex LDAP search expression (like "|(cn=Linus*)(sn=Torvalds*)"
+#               and returns all matching objects (DNs) with given attributes
+#               (or all attributes if empty list is given) as list:
+#
+#  {dn1 { attr1 {val11 val12 ...} attr2 {val21 val22 ... } ... }} {dn2 { ... }} ...
+#
+#-----------------------------------------------------------------------------
+proc ldap::search { handle baseObject filterString attributes args} {
+    CheckHandle $handle
+
+    upvar #0 $handle conn
+
+    searchInit $handle $baseObject $filterString $attributes $args
+
+    set results    {}
+    set lastPacket 0
+    while { !$lastPacket } {
+
+	set r [searchNext $handle]
+	if {[llength $r] > 0} then {
+	    lappend results $r
+	} else {
+	    set lastPacket 1
+	}
+    }
+    searchEnd $handle
+
+    return $results
+}
+#-----------------------------------------------------------------------------
+#    searchInProgress - checks if a search is in progress
+#
+#-----------------------------------------------------------------------------
+
+proc ldap::searchInProgress {handle} {
+   CheckHandle $handle
+   upvar #0 $handle conn
+   if {[::info exists conn(searchInProgress)]} {
+   	return $conn(searchInProgress)
+   } else {
+       	return 0
+   }
+}
+
+#-----------------------------------------------------------------------------
+#    searchInit - initiates an LDAP search
+#
+#-----------------------------------------------------------------------------
+proc ldap::searchInit { handle baseObject filterString attributes opt} {
+    CheckHandle $handle
+
+    upvar #0 $handle conn
+
+    if {[searchInProgress $handle]} {
+        return -code error \
+            "Cannot start search. Already a search in progress for this handle."
+    }
+
+    set scope        2
+    set derefAliases 0
+    set sizeLimit    0
+    set timeLimit    0
+    set attrsOnly    0
+
+    foreach {key value} $opt {
+        switch -- [string tolower $key] {
+            -scope {
+                switch -- $value {
+                   base 		{ set scope 0 }
+                   one - onelevel 	{ set scope 1 }
+                   sub - subtree 	{ set scope 2 }
+                   default {  }
+                }
+            }
+	    -derefaliases {
+		switch -- $value {
+		    never 	{ set derefAliases 0 }
+		    search 	{ set derefAliases 1 }
+		    find 	{ set derefAliases 2 }
+		    always 	{ set derefAliases 3 }
+		    default { }
+		}
+	    }
+	    -sizelimit {
+		set sizeLimit $value
+	    }
+	    -timelimit {
+		set timeLimit $value
+	    }
+	    -attrsonly {
+		set attrsOnly $value
+	    }
+	    -referencevar {
+		set referenceVar $value
+	    }
+	    default {
+		return -code error \
+			"Invalid search option '$key'"
+	    }
+        }
+    }
+
+    set request [buildSearchRequest $baseObject $scope \
+    			$derefAliases $sizeLimit $timeLimit $attrsOnly $filterString \
+			$attributes]
+    set messageId [SendMessage $handle $request]
+    debugData searchRequest $request
+
+    # Keep the message Id, so we know about the search
+    set conn(searchInProgress) 	$messageId
+    if {[::info exists referenceVar]} {
+	set conn(referenceVar) $referenceVar
+	set $referenceVar [list]
+    }
+
+    return $conn(searchInProgress)
+}
+
+proc ldap::buildSearchRequest {baseObject scope derefAliases
+    			       sizeLimit timeLimit attrsOnly filterString
+			       attributes} {
+    #----------------------------------------------------------
+    #   marshal filter and attributes parameter
+    #----------------------------------------------------------
+    set berFilter [filter::encode $filterString]
+
+    set berAttributes ""
+    foreach attribute $attributes {
+        append berAttributes [asnOctetString $attribute]
+    }
+
+    #----------------------------------------------------------
+    #   marshal search request packet and send it
+    #----------------------------------------------------------
+    set request [asnApplicationConstr 3             \
+                        [asnOctetString $baseObject]    \
+                        [asnEnumeration $scope]         \
+                        [asnEnumeration $derefAliases]  \
+                        [asnInteger     $sizeLimit]     \
+                        [asnInteger     $timeLimit]     \
+                        [asnBoolean     $attrsOnly]     \
+                        $berFilter                      \
+                        [asnSequence    $berAttributes] \
+                ]
+
+}
+#-----------------------------------------------------------------------------
+#    searchNext - returns the next result of an LDAP search
+#
+#-----------------------------------------------------------------------------
+proc ldap::searchNext { handle } {
+    CheckHandle $handle
+
+    upvar #0 $handle conn
+
+    if {! [::info exists conn(searchInProgress)]} then {
+	return -code error \
+	    "No search in progress"
+    }
+
+    set result {}
+    set lastPacket 0
+
+    #----------------------------------------------------------
+    #   Wait for a search response packet
+    #----------------------------------------------------------
+
+    set response [WaitForResponse $handle $conn(searchInProgress)]
+    debugData searchResponse $response
+
+    asnGetApplication response appNum
+
+    if {$appNum == 4} {
+        trace "Search Response Continue"
+	#----------------------------------------------------------
+	#   unmarshal search data packet
+	#----------------------------------------------------------
+	asnGetOctetString response objectName
+	asnGetSequence    response attributes
+	set result_attributes {}
+	while { [string length $attributes] != 0 } {
+	    asnGetSequence attributes attribute
+	    asnGetOctetString attribute attrType
+	    asnGetSet  attribute attrValues
+	    set result_attrValues {}
+	    while { [string length $attrValues] != 0 } {
+		asnGetOctetString attrValues attrValue
+		lappend result_attrValues $attrValue
+	    }
+	    lappend result_attributes $attrType $result_attrValues
+	}
+	set result [list $objectName $result_attributes]
+    } elseif {$appNum == 5} {
+        trace "Search Response Done"
+	#----------------------------------------------------------
+	#   unmarshal search final response packet
+	#----------------------------------------------------------
+	asnGetEnumeration response resultCode
+	asnGetOctetString response matchedDN
+	asnGetOctetString response errorMessage
+	set result {}
+	FinalizeMessage $handle $conn(searchInProgress)
+        unset conn(searchInProgress)
+
+	if {$resultCode != 0} {
+        return -code error \
+		-errorcode [list LDAP [resultCode2String $resultCode] $matchedDN $errorMessage] \
+		"LDAP error [resultCode2String $resultCode] : $errorMessage"
+	}
+    } elseif {$appNum == 19} {
+    	trace "Search Result Reference"
+	#---------------------------------------------------------
+	#   unmarshall search result reference packet
+	#---------------------------------------------------------
+	
+	# This should be a sequence but Microsoft AD sends just 
+	# a URI encoded as an OctetString, so have a peek at the tag
+	# and go on.
+	
+	asnPeekTag response tag type constr
+	if {$tag == 0x04} {
+	    set references $response
+	} elseif {$tag == 0x030} {
+	    asnGetSequence response references
+	} 
+
+	set urls {}
+	while {[string length $references]} {
+	    asnGetOctetString references url
+	    lappend urls $url	   
+	}
+	if {[::info exists conn(referenceVar)]} {	
+	    upvar 0 conn(referenceVar) refs
+	    if {[llength $refs]} {
+		set refs [concat [set $refs $urls]]
+	    } else {
+		set refs $urls
+	    }
+	}
+
+	# Get the next search result instead
+	set result [searchNext $handle]
+    }
+
+    # Unknown application type of result set.
+    # We should just ignore it since the only PDU the server
+    # MUST return if it understood our request is the "search response
+    # done" (apptype 5) which we know how to process.
+
+    return $result
+}
+
+#-----------------------------------------------------------------------------
+#    searchEnd - end an LDAP search
+#
+#-----------------------------------------------------------------------------
+proc ldap::searchEnd { handle } {
+    CheckHandle $handle
+
+    upvar #0 $handle conn
+
+    if {! [::info exists conn(searchInProgress)]} then {
+        # no harm done, just do nothing
+	return
+    }
+    abandon $handle $conn(searchInProgress)
+    FinalizeMessage $handle $conn(searchInProgress)
+
+    unset conn(searchInProgress)
+    unset -nocomplain conn(referenceVar)
+    return
+}
+
+#-----------------------------------------------------------------------------
+#
+#    Send an LDAP abandon message
+#
+#-----------------------------------------------------------------------------
+proc ldap::abandon {handle messageId} {
+    CheckHandle $handle
+
+    upvar #0 $handle conn
+    trace "MessagesPending: [string length $conn(messageId)]"
+    set request [asnApplication 16      	\
+                        [asnInteger $messageId]         \
+                ]
+    SendMessageNoReply $handle $request
+}
+
+#-----------------------------------------------------------------------------
+#    modify  -  provides attribute modifications on one single object (DN):
+#                 o replace attributes with new values
+#                 o delete attributes (having certain values)
+#                 o add attributes with new values
+#
+#-----------------------------------------------------------------------------
+proc ldap::modify { handle dn
+                    attrValToReplace { attrToDelete {} } { attrValToAdd {} } } {
+
+    CheckHandle $handle
+
+    upvar #0 $handle conn
+
+    set lrep {}
+    foreach {attr value} $attrValToReplace {
+	lappend lrep $attr [list $value]
+    }
+
+    set ldel {}
+    foreach {attr value} $attrToDelete {
+	if {[string equal $value ""]} then {
+	    lappend ldel $attr {}
+	} else {
+	    lappend ldel $attr [list $value]
+	}
+    }
+
+    set ladd {}
+    foreach {attr value} $attrValToAdd {
+	lappend ladd $attr [list $value]
+    }
+
+    modifyMulti $handle $dn $lrep $ldel $ladd
+}
+
+
+#-----------------------------------------------------------------------------
+#    modify  -  provides attribute modifications on one single object (DN):
+#                 o replace attributes with new values
+#                 o delete attributes (having certain values)
+#                 o add attributes with new values
+#
+#-----------------------------------------------------------------------------
+proc ldap::modifyMulti {handle dn
+                    attrValToReplace {attrValToDelete {}} {attrValToAdd {}}} {
+
+    CheckHandle $handle
+    upvar #0 $handle conn
+
+    set operationAdd     0
+    set operationDelete  1
+    set operationReplace 2
+
+    set modifications ""
+
+    #------------------------------------------------------------------
+    #   marshal attribute modify operations
+    #    - always mode 'replace' ! see rfc2251:
+    #
+    #        replace: replace all existing values of the given attribute
+    #        with the new values listed, creating the attribute if it
+    #        did not already exist.  A replace with no value will delete
+    #        the entire attribute if it exists, and is ignored if the
+    #        attribute does not exist.
+    #
+    #------------------------------------------------------------------
+    append modifications [ldap::packOpAttrVal $operationReplace \
+				$attrValToReplace]
+
+    #------------------------------------------------------------------
+    #   marshal attribute add operations
+    #
+    #------------------------------------------------------------------
+    append modifications [ldap::packOpAttrVal $operationAdd \
+				$attrValToAdd]
+
+    #------------------------------------------------------------------
+    #   marshal attribute delete operations
+    #
+    #     - a non-empty value will trigger to delete only those
+    #       attributes which have the same value as the given one
+    #
+    #     - an empty value will trigger to delete the attribute
+    #       in all cases
+    #
+    #------------------------------------------------------------------
+    append modifications [ldap::packOpAttrVal $operationDelete \
+				$attrValToDelete]
+
+    #----------------------------------------------------------
+    #   marshal 'modify' request packet and send it
+    #----------------------------------------------------------
+    set request [asnApplicationConstr 6              \
+                        [asnOctetString $dn ]            \
+                        [asnSequence    $modifications ] \
+                ]
+    set messageId [SendMessage $handle $request]
+    debugData modifyRequest $request
+    set response [WaitForResponse $handle $messageId]
+    FinalizeMessage $handle $messageId
+    debugData bindResponse $response
+
+    asnGetApplication response appNum
+    if { $appNum != 7 } {
+         error "unexpected application number ($appNum != 7)"
+    }
+    asnGetEnumeration response resultCode
+    asnGetOctetString response matchedDN
+    asnGetOctetString response errorMessage
+    if {$resultCode != 0} {
+        return -code error \
+		-errorcode [list LDAP [resultCode2String $resultCode] $matchedDN $errorMessage] \
+		"LDAP error [resultCode2String $resultCode] '$matchedDN': $errorMessage"
+    }
+}
+
+proc ldap::packOpAttrVal {op attrValueTuples} {
+    set p ""
+    foreach {attrName attrValues} $attrValueTuples {
+	set l {}
+	foreach v $attrValues {
+	    lappend l [asnOctetString $v]
+	}
+        append p [asnSequence                        \
+		    [asnEnumeration $op ]            \
+		    [asnSequence                     \
+			[asnOctetString $attrName  ] \
+			[asnSetFromList $l]          \
+		    ]                                \
+		]
+    }
+    return $p
+}
+
+
+#-----------------------------------------------------------------------------
+#    add  -  will create a new object using given DN and sets the given
+#            attributes. Multiple value attributes may be used, provided
+#            that each attr-val pair be listed.
+#
+#-----------------------------------------------------------------------------
+proc ldap::add { handle dn attrValueTuples } {
+
+    CheckHandle $handle
+
+    #
+    # In order to handle multi-valuated attributes (see bug 1191326 on
+    # sourceforge), we walk through tuples to collect all values for
+    # an attribute.
+    # http://core.tcl.tk/tcllib/tktview?name=1191326fff
+    #
+
+    foreach { attrName attrValue } $attrValueTuples {
+	lappend avpairs($attrName) $attrValue
+    }
+
+    return [addMulti $handle $dn [array get avpairs]]
+}
+
+#-----------------------------------------------------------------------------
+#    addMulti -  will create a new object using given DN and sets the given
+#                attributes. Argument is a list of attr-listOfVals pair.
+#
+#-----------------------------------------------------------------------------
+proc ldap::addMulti { handle dn attrValueTuples } {
+
+    CheckHandle $handle
+
+    upvar #0 $handle conn
+
+    #------------------------------------------------------------------
+    #   marshal attribute list
+    #
+    #------------------------------------------------------------------
+    set attrList ""
+
+    foreach { attrName attrValues } $attrValueTuples {
+	set valList {}
+	foreach val $attrValues {
+	    lappend valList [asnOctetString $val]
+	}
+	append attrList [asnSequence                         \
+			    [asnOctetString $attrName ]      \
+			    [asnSetFromList $valList]        \
+			]
+    }
+
+    #----------------------------------------------------------
+    #   marshal search 'add' request packet and send it
+    #----------------------------------------------------------
+    set request [asnApplicationConstr 8             \
+                        [asnOctetString $dn       ] \
+                        [asnSequence    $attrList ] \
+                ]
+
+    set messageId [SendMessage $handle $request]
+    debugData addRequest $request
+    set response [WaitForResponse $handle $messageId]
+    FinalizeMessage $handle $messageId
+    debugData bindResponse $response
+
+    asnGetApplication response appNum
+    if { $appNum != 9 } {
+         error "unexpected application number ($appNum != 9)"
+    }
+    asnGetEnumeration response resultCode
+    asnGetOctetString response matchedDN
+    asnGetOctetString response errorMessage
+    if {$resultCode != 0} {
+        return -code error \
+		-errorcode [list LDAP [resultCode2String $resultCode] $matchedDN $errorMessage] \
+		"LDAP error [resultCode2String $resultCode] '$matchedDN': $errorMessage"
+    }
+}
+
+#-----------------------------------------------------------------------------
+#    delete  -  removes the whole object (DN) inclusive all attributes
+#
+#-----------------------------------------------------------------------------
+proc ldap::delete { handle dn } {
+
+    CheckHandle $handle
+
+    upvar #0 $handle conn
+
+    #----------------------------------------------------------
+    #   marshal 'delete' request packet and send it
+    #----------------------------------------------------------
+    set request [asnApplication 10 $dn ]
+    set messageId [SendMessage $handle $request]
+    debugData deleteRequest $request
+    set response [WaitForResponse $handle $messageId]
+    FinalizeMessage $handle $messageId
+
+    debugData deleteResponse $response
+
+    asnGetApplication response appNum
+    if { $appNum != 11 } {
+         error "unexpected application number ($appNum != 11)"
+    }
+    asnGetEnumeration response resultCode
+    asnGetOctetString response matchedDN
+    asnGetOctetString response errorMessage
+    if {$resultCode != 0} {
+        return -code error \
+		-errorcode [list LDAP [resultCode2String $resultCode] $matchedDN $errorMessage] \
+		"LDAP error [resultCode2String $resultCode] '$matchedDN': $errorMessage"
+    }
+}
+
+
+#-----------------------------------------------------------------------------
+#    modifyDN  -  moves an object (DN) to another (relative) place
+#
+#-----------------------------------------------------------------------------
+proc ldap::modifyDN { handle dn newrdn { deleteOld 1 } {newSuperior ! } } {
+
+    CheckHandle $handle
+
+    upvar #0 $handle conn
+
+    #----------------------------------------------------------
+    #   marshal 'modifyDN' request packet and send it
+    #----------------------------------------------------------
+
+    if {[string equal $newSuperior "!"]} then {
+        set request [asnApplicationConstr 12                 \
+			    [asnOctetString $dn ]            \
+			    [asnOctetString $newrdn ]        \
+			    [asnBoolean     $deleteOld ]     \
+		    ]
+
+    } else {
+	set request [asnApplicationConstr 12                 \
+			    [asnOctetString $dn ]            \
+			    [asnOctetString $newrdn ]        \
+			    [asnBoolean     $deleteOld ]     \
+			    [asnContext     0 $newSuperior]  \
+		    ]
+    }
+    set messageId [SendMessage $handle $request]
+    debugData modifyRequest $request
+    set response [WaitForResponse $handle $messageId]
+
+    asnGetApplication response appNum
+    if { $appNum != 13 } {
+         error "unexpected application number ($appNum != 13)"
+    }
+    asnGetEnumeration response resultCode
+    asnGetOctetString response matchedDN
+    asnGetOctetString response errorMessage
+    if {$resultCode != 0} {
+        return -code error \
+		-errorcode [list LDAP [resultCode2String $resultCode] $matchedDN $errorMessage] \
+		"LDAP error [resultCode2String $resultCode] '$matchedDN': $errorMessage"
+
+    }
+}
+
+#-----------------------------------------------------------------------------
+#    disconnect
+#
+#-----------------------------------------------------------------------------
+proc ldap::disconnect { handle } {
+
+    CheckHandle $handle
+
+    upvar #0 $handle conn
+
+    # should we sent an 'unbind' ?
+    catch {close $conn(sock)}
+    unset conn
+
+    return
+}
+
+
+
+#-----------------------------------------------------------------------------
+#    trace
+#
+#-----------------------------------------------------------------------------
+proc ldap::trace { message } {
+
+    variable doDebug
+
+    if {!$doDebug} return
+
+    puts stderr $message
+}
+
+
+#-----------------------------------------------------------------------------
+#    debugData
+#
+#-----------------------------------------------------------------------------
+proc ldap::debugData { info data } {
+
+    variable doDebug
+
+    if {!$doDebug} return
+
+    set len [string length $data]
+    trace "$info ($len bytes):"
+    set address ""
+    set hexnums ""
+    set ascii   ""
+    for {set i 0} {$i < $len} {incr i} {
+        set v [string index $data $i]
+        binary scan $v H2 hex
+        binary scan $v c  num
+        set num [expr {( $num + 0x100 ) % 0x100}]
+        set text .
+        if {$num > 31} {
+            set text $v
+        }
+        if { ($i % 16) == 0 } {
+            if {$address != ""} {
+                trace [format "%4s  %-48s  |%s|" $address $hexnums $ascii ]
+                set address ""
+                set hexnums ""
+                set ascii   ""
+            }
+            append address [format "%04d" $i]
+        }
+        append hexnums "$hex "
+        append ascii   $text
+        #trace [format "%3d %2s %s" $i $hex $text]
+    }
+    if {$address != ""} {
+        trace [format "%4s  %-48s  |%s|" $address $hexnums $ascii ]
+    }
+    trace ""
+}
+
+#-----------------------------------------------------------------------------
+# ldap::filter -- set of procedures for construction of BER-encoded
+#                 data defined by ASN.1 type Filter described in RFC 4511
+#                 from string representations of search filters
+#                 defined in RFC 4515.
+#-----------------------------------------------------------------------------
+namespace eval ldap::filter {
+    # Regexp which matches strings of type AttribyteType:
+    variable reatype {[A-Za-z][A-Za-z0-9-]*|\d+(?:\.\d+)+}
+
+    # Regexp which matches attribute options in strings
+    # of type AttributeDescription:
+    variable reaopts {(?:;[A-Za-z0-9-]+)*}
+
+    # Regexp which matches strings of type AttributeDescription.
+    # Note that this regexp captures attribute options,
+    # with leading ";", if any.
+    variable readesc (?:$reatype)($reaopts)
+
+    # Two regexps to match strings representing "left hand side" (LHS)
+    # in extensible match assertion.
+    # In fact there could be one regexp with two alterations,
+    # but this would complicate capturing of regexp parts.
+    # The first regexp captures, in this order:
+    # 1. Attribute description.
+    # 2. Attribute options.
+    # 3. ":dn" string, indicating "Use DN attribute types" flag.
+    # 4. Matching rule ID.
+    # The second regexp captures, in this order:
+    # 1. ":dn" string.
+    # 2. Matching rule ID.
+    variable reaextmatch1 ^($readesc)(:dn)?(?::($reatype))?\$
+    variable reaextmatch2 ^(:dn)?:($reatype)\$
+
+    # The only validation proc using this regexp requires it to be
+    # anchored to the boundaries of a string being validated,
+    # so we change it here to allow this regexp to be compiled:
+    set readesc ^$readesc\$
+
+    unset reatype reaopts
+
+    namespace import ::asn::*
+}
+
+# "Public API" function.
+# Parses the string represntation of an LDAP search filter expression
+# and returns its BER-encoded form.
+# NOTE While RFC 4515 strictly defines that any filter expression must
+# be surrounded by parentheses it is customary for LDAP client software
+# to allow specification of simple (i.e. non-compound) filter expressions
+# without enclosing parentheses, so we also do this (in fact, we allow
+# omission of outermost parentheses in any filter expression).
+proc ldap::filter::encode s {
+    if {[string match (*) $s]} {
+	ProcessFilter $s
+    } else {
+	ProcessFilterComp $s
+    }
+}
+
+# Parses the string represntation of an LDAP search filter expression
+# and returns its BER-encoded form.
+proc ldap::filter::ProcessFilter s {
+    if {![string match (*) $s]} {
+	return -code error "Invalid filter: filter expression must be\
+	    surrounded by parentheses"
+    }
+    ProcessFilterComp [string range $s 1 end-1]
+}
+
+# Parses "internals" of a filter expression, i.e. what's contained
+# between its enclosing parentheses.
+# It classifies the type of filter expression (compound, negated or
+# simple) and invokes its corresponding handler.
+# Returns a BER-encoded form of the filter expression.
+proc ldap::filter::ProcessFilterComp s {
+    switch -- [string index $s 0] {
+	& {
+	    ProcessFilterList 0 [string range $s 1 end]
+	}
+	| {
+	    ProcessFilterList 1 [string range $s 1 end]
+	}
+	! {
+	    ProcessNegatedFilter [string range $s 1 end]
+	}
+	default {
+	    ProcessMatch $s
+	}
+    }
+}
+
+# Parses string $s containing a chain of one or more filter
+# expressions (as found in compound filter expressions),
+# processes each filter in such chain and returns
+# a BER-encoded form of this chain tagged with specified
+# application type given as $apptype.
+proc ldap::filter::ProcessFilterList {apptype s} {
+    set data ""
+    set rest $s
+    while 1 {
+	foreach {filter rest} [ExtractFilter $rest] break
+	append data [ProcessFilter $filter]
+	if {$rest == ""} break
+    }
+    # TODO looks like it's impossible to hit this condition
+    if {[string length $data] == 0} {
+	return -code error "Invalid filter: filter composition must\
+	    consist of at least one element"
+    }
+    asnChoiceConstr $apptype $data
+}
+
+# Parses a string $s representing a filter expression
+# and returns a BER construction representing negation
+# of that filter expression.
+proc ldap::filter::ProcessNegatedFilter s {
+    asnChoiceConstr 2 [ProcessFilter $s]
+}
+
+# Parses a string $s representing an "attribute matching rule"
+# (i.e. the contents of a non-compound filter expression)
+# and returns its BER-encoded form.
+proc ldap::filter::ProcessMatch s {
+    if {![regexp -indices {(=|~=|>=|<=|:=)} $s range]} {
+	return -code error "Invalid filter: no match operator in item"
+    }
+    foreach {a z} $range break
+    set lhs   [string range $s 0 [expr {$a - 1}]]
+    set match [string range $s $a $z]
+    set val   [string range $s [expr {$z + 1}] end]
+
+    switch -- $match {
+	= {
+	    if {$val eq "*"} {
+		ProcessPresenceMatch $lhs
+	    } else {
+		if {[regexp {^([^*]*)(\*(?:[^*]*\*)*)([^*]*)$} $val \
+			-> initial any final]} {
+		    ProcessSubstringMatch $lhs $initial $any $final
+		} else {
+		    ProcessSimpleMatch 3 $lhs $val
+		}
+	    }
+	}
+	>= {
+	    ProcessSimpleMatch 5 $lhs $val
+	}
+	<= {
+	    ProcessSimpleMatch 6 $lhs $val
+	}
+	~= {
+	    ProcessSimpleMatch 8 $lhs $val
+	}
+	:= {
+	    ProcessExtensibleMatch $lhs $val
+	}
+    }
+}
+
+# From a string $s, containing a chain of filter
+# expressions (as found in compound filter expressions)
+# extracts the first filter expression and returns
+# a two element list composed of the extracted filter
+# expression and the remainder of the source string.
+proc ldap::filter::ExtractFilter s {
+    if {[string index $s 0] ne "("} {
+	return -code error "Invalid filter: malformed compound filter expression"
+    }
+    set pos   1
+    set nopen 1
+    while 1 {
+	if {![regexp -indices -start $pos {\)|\(} $s match]} {
+	    return -code error "Invalid filter: unbalanced parenthesis"
+	}
+	set pos [lindex $match 0]
+	if {[string index $s $pos] eq "("} {
+	    incr nopen
+	} else {
+	    incr nopen -1
+	}
+	if {$nopen == 0} {
+	    return [list [string range $s 0 $pos] \
+		[string range $s [incr pos] end]]
+	}
+	incr pos
+    }
+}
+
+# Constructs a BER-encoded form of a "presence" match
+# involving an attribute description string passed in $attrdesc.
+proc ldap::filter::ProcessPresenceMatch attrdesc {
+    ValidateAttributeDescription $attrdesc options
+    asnChoice 7 [LDAPString $attrdesc]
+}
+
+# Constructs a BER-encoded form of a simple match designated
+# by application type $apptype and involving an attribute
+# description $attrdesc and attribute value $val.
+# "Simple" match is one of: equal, less or equal, greater
+# or equal, approximate.
+proc ldap::filter::ProcessSimpleMatch {apptype attrdesc val} {
+    ValidateAttributeDescription $attrdesc options
+    append data [asnOctetString [LDAPString $attrdesc]] \
+	[asnOctetString [AssertionValue $val]]
+    asnChoiceConstr $apptype $data
+}
+
+# Constructs a BER-encoded form of a substrings match
+# involving an attribute description $attrdesc and parts of attribute
+# value -- $initial, $any and $final.
+# A string contained in any may be compound -- several strings
+# concatenated by asterisks ("*"), they are extracted and used as
+# multiple attribute value parts of type "any".
+proc ldap::filter::ProcessSubstringMatch {attrdesc initial any final} {
+    ValidateAttributeDescription $attrdesc options
+
+    set data [asnOctetString [LDAPString $attrdesc]]
+
+    set seq [list]
+    set parts 0
+    if {$initial != ""} {
+	lappend seq [asnChoice 0 [AssertionValue $initial]]
+	incr parts
+    }
+
+    foreach v [split [string trim $any *] *] {
+	if {$v != ""} {
+	    lappend seq [asnChoice 1 [AssertionValue $v]]
+	    incr parts
+	}
+    }
+
+    if {$final != ""} {
+	lappend seq [asnChoice 2 [AssertionValue $final]]
+	incr parts
+    }
+
+    if {$parts == 0} {
+	return -code error "Invalid filter: substrings match parses to zero parts"
+    }
+
+    append data [asnSequenceFromList $seq]
+
+    asnChoiceConstr 4 $data
+}
+
+# Constructs a BER-encoded form of an extensible match
+# involving an attribute value given in $value and a string
+# containing the matching rule OID, if present a "Use DN attribute
+# types" flag, if present, and an atttibute description, if present,
+# given in $lhs (stands for "Left Hand Side").
+proc ldap::filter::ProcessExtensibleMatch {lhs value} {
+    ParseExtMatchLHS $lhs attrdesc options dn ruleid
+    set data ""
+    foreach {apptype val} [list 1 $ruleid 2 $attrdesc] {
+	if {$val != ""} {
+	    append data [asnChoice $apptype [LDAPString $val]]
+	}
+    }
+    append data [asnChoice 3 [AssertionValue $value]]
+    if {$dn} {
+	# [asnRetag] is broken in asn, so we use the trick
+	# to simulate "boolean true" BER-encoding which
+	# is octet 1 of length 1:
+	append data [asnChoice 4 [binary format cc 1 1]]
+    }
+    asnChoiceConstr 9 $data
+}
+
+# Parses a string $s, representing a "left hand side" of an extensible match
+# expression, into several parts: attribute desctiption, options,
+# "Use DN attribute types" flag and rule OID. These parts are
+# assigned to corresponding variables in the caller's scope.
+proc ldap::filter::ParseExtMatchLHS {s attrdescVar optionsVar dnVar ruleidVar} {
+    upvar 1 $attrdescVar attrdesc $optionsVar options $dnVar dn $ruleidVar ruleid
+    variable reaextmatch1
+    variable reaextmatch2
+    if {[regexp $reaextmatch1 $s -> attrdesc opts dnstr ruleid]} {
+	set options [ProcessAttrTypeOptions $opts]
+	set dn [expr {$dnstr != ""}]
+    } elseif {[regexp $reaextmatch2 $s -> dnstr ruleid]} {
+	set attrdesc ""
+	set options [list]
+	set dn [expr {$dnstr != ""}]
+    } else {
+	return -code error "Invalid filter: malformed attribute description"
+    }
+}
+
+# Validates an attribute description passed as $attrdesc.
+# Raises an error if it's ill-formed.
+# Variable in the caller's scope whose name is passed in optionsVar
+# is set to a list of attribute options (which may be empty if
+# there's no options in the attribute type).
+proc ldap::filter::ValidateAttributeDescription {attrdesc optionsVar} {
+    variable readesc
+    if {![regexp $readesc $attrdesc -> opts]} {
+	return -code error "Invalid filter: malformed attribute description"
+    }
+    upvar 1 $optionsVar options
+    set options [ProcessAttrTypeOptions $opts]
+    return
+}
+
+# Parses a string $s containing one or more attribute
+# options, delimited by seimcolons, with the leading semicolon,
+# if non-empty.
+# Returns a list of distinct options, lowercased for normalization
+# purposes.
+proc ldap::filter::ProcessAttrTypeOptions s {
+    set opts [list]
+    foreach opt [split [string trimleft $s \;] \;] {
+	lappend opts [string tolower $opt]
+    }
+    set opts
+}
+
+# Checks an assertion value $s for validity and substitutes
+# any backslash escapes in it with their respective values.
+# Returns canonical form of the attribute value
+# ready to be packed into a BER-encoded stream.
+proc ldap::filter::AssertionValue s {
+    set v [encoding convertto utf-8 $s]
+    if {[regexp {\\(?:[[:xdigit:]])?(?![[:xdigit:]])|[()*\0]} $v]} {
+	return -code error "Invalid filter: malformed assertion value"
+    }
+
+    variable escmap
+    if {![info exists escmap]} {
+	for {set i 0} {$i <= 0xff} {incr i} {
+	    lappend escmap [format {\%02x} $i] [format %c $i]
+	}
+    }
+    string map -nocase $escmap $v
+}
+
+# Turns a given Tcl string $s into a binary blob ready to be packed
+# into a BER-encoded stream.
+proc ldap::filter::LDAPString s {
+    encoding convertto utf-8 $s
+}
+
+# vim:ts=8:sw=4:sts=4:noet
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ldap/ldapx.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ldap/ldapx.tcl
new file mode 100644
index 00000000..16f55086
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ldap/ldapx.tcl
@@ -0,0 +1,1804 @@
+#
+# Extended object interface to entries in LDAP directories or LDIF files.
+#
+# (c) 2006-2018 Pierre David (pdagog@gmail.com)
+#
+# History:
+#   2006/08/08 : pda : design
+#
+
+package require Tcl 8.5
+package require snit		;# tcllib
+package require uri 1.1.5	;# tcllib
+package require base64		;# tcllib
+package require ldap 1.9.2	;# tcllib, low level code for LDAP directories
+
+package provide ldapx 1.2
+
+##############################################################################
+# LDAPENTRY object type
+##############################################################################
+
+snit::type ::ldapx::entry {
+    #########################################################################
+    # Variables
+    #########################################################################
+
+    #
+    # Format of an individual entry
+    # May be "standard" (standard LDAP entry, read from an LDAP directory
+    # or from a LDIF channel) or "change" (LDIF change, or result of the
+    # comparison of two standard entries).
+    # Special : "uninitialized" means that this entry has not been used,
+    # and the first use will initialize it.
+    #
+
+    variable format "uninitialized"
+
+    #
+    # DN
+    #
+
+    variable dn ""
+
+    #
+    # Standard entry
+    #
+    # Syntax:
+    #   - array indexed by attribute names (lower case)
+    #   - each value is the list of attributes
+    #
+    # The current state may be backed up in an internal state.
+    # (see backup and restore methods)
+    #
+
+    variable attrvals -array {}
+
+    variable backup 0
+    variable bckav  -array {}
+    variable bckdn  ""
+
+    #
+    # Change entry
+    #
+    # Syntax:
+    #	{{<op> <parameters>} ... }
+    #	    if <op> = mod
+    #		{mod {{<modop> <attr> [ {<val1> ... <valn>} ]} ...} }
+    #		where <modop> = modrepl, modadd, moddel
+    #	    if <op> = add
+    #		{add {<attr> {<val1> ... <valn>} ...}}
+    #	    if <op> = del
+    #		{del}
+    #	    if <op> = modrdn
+    #		{modrdn <newrdn> <deleteoldrdn> [ <newsuperior> ]}
+    #
+
+    variable change ""
+
+    #########################################################################
+    # Generic methods (for both standard and change entries)
+    #########################################################################
+
+    # Resets the entry to an empty state
+
+    method reset {} {
+
+	set format "uninitialized"
+	set dn ""
+	array unset attrvals
+	set backup 0
+	array unset bckav
+	set bckdn  ""
+	set change ""
+    }
+
+    # Returns current format
+
+    method format {} {
+
+	return $format
+    }
+
+    # Checks if entry is compatible with a certain format
+    # errors out if not
+
+    method compatible {ref} {
+
+	if {$format eq "uninitialized"} then {
+	    set format $ref
+	} elseif {$format ne $ref} then {
+	    return -code error \
+		"Invalid operation on format $format (should be $ref)"
+	}
+    }
+
+    # Get or set the current dn
+
+    method dn {{newdn {-}}} {
+
+	if {$newdn ne "-"} then {
+	    set dn $newdn
+	}
+	return $dn
+    }
+
+    # Get the "superior" (LDAP slang word) part of current dn
+
+    method superior {} {
+
+	set pos [string first "," $dn]
+	if {$pos == -1} then {
+	    set r ""
+	} else {
+	    set r [string range $dn [expr {$pos+1}] end]
+	}
+	return $r
+    }
+
+    # Get the "rdn" part of current dn
+
+    method rdn {} {
+
+	set pos [string first "," $dn]
+	if {$pos == -1} then {
+	    set r ""
+	} else {
+	    set r [string range $dn 0 [expr {$pos-1}]]
+	}
+	return $r
+    }
+
+    # Get a printable form of the contents
+
+    method print {} {
+
+	set r "dn: $dn"
+	switch -- $format {
+	    uninitialized {
+		# nothing
+	    }
+	    standard {
+		foreach a [lsort [array names attrvals]] {
+		    append r "\n$a: $attrvals($a)"
+		}
+	    }
+	    change {
+		if {[llength $change]} then {
+		    append r "\n$change"
+		}
+	    }
+	    default {
+		append r " (inconsistent value)"
+	    }
+	}
+	return $r
+    }
+
+    # Prints the whole state of an entry
+
+    method debug {} {
+
+	set r "dn = <$dn>\nformat = $format"
+	switch -- $format {
+	    uninitialized {
+		# nothing
+	    }
+	    standard {
+		foreach a [lsort [array names attrvals]] {
+		    append r "\n\t$a: $attrvals($a)"
+		}
+		if {$backup} then {
+		    append r "\nbackup dn = $bckdn"
+		    foreach a [lsort [array names bckav]] {
+			append r "\n\t$a: $bckav($a)"
+		    }
+		} else {
+		    append r "\nno backup"
+		}
+	    }
+	    change {
+		if {[llength $change]} then {
+		    append r "\n$change"
+		} else {
+		    append r "\nno change"
+		}
+	    }
+	    default {
+		append r " (inconsistent value)"
+	    }
+	}
+	return $r
+    }
+
+
+    #########################################################################
+    # Methods for standard entries
+    #########################################################################
+
+    # Tells if the current entry is empty
+
+    method isempty {} {
+
+	$self compatible "standard"
+
+	return [expr {[array size attrvals] == 0}]
+    }
+
+    # Get all values for an attribute
+
+    method get {attr} {
+
+	$self compatible "standard"
+
+	set a [string tolower $attr]
+	if {[info exists attrvals($a)]} then {
+	    set r $attrvals($a)
+	} else {
+	    set r {}
+	}
+	return $r
+    }
+
+    # Get only the first value for an attribute
+
+    method get1 {attr} {
+
+	return [lindex [$self get $attr] 0]
+    }
+
+
+    # Set all values for an attribute
+
+    method set {attr vals} {
+
+	$self compatible "standard"
+
+	set a [string tolower $attr]
+	if {[llength $vals]} then {
+	    set attrvals($a) $vals
+	} else {
+	    unset -nocomplain attrvals($a)
+	}
+	return $vals
+    }
+
+    # Set only one value for an attribute
+
+    method set1 {attr val} {
+
+	if {$val eq ""} then {
+	    set l {}
+	} else {
+	    set l [list $val]
+	}
+
+	return [$self set $attr $l]
+    }
+
+    # Add some values to an attribute
+
+    method add {attr vals} {
+
+	$self compatible "standard"
+
+	set a [string tolower $attr]
+	foreach v $vals {
+	    lappend attrvals($a) $v
+	}
+	return $attrvals($a)
+    }
+
+    # Add only one value to an attribute
+
+    method add1 {attr val} {
+
+	return [$self add $attr [list $val]]
+    }
+
+    # Delete all values (or some values only) for an attribute
+
+    method del {attr {vals {}}} {
+
+	$self compatible "standard"
+
+	set a [string tolower $attr]
+	if {[llength $vals]} then {
+	    set l [$self get $attr]
+	    foreach v $vals {
+		while {[set pos [lsearch -exact $l $v]] != -1} {
+		    set l [lreplace $l $pos $pos]
+		}
+	    }
+	} else {
+	    set l {}
+	}
+
+	if {[llength $l]} then {
+	    $self set $attr $l
+	} else {
+	    unset -nocomplain attrvals($a)
+	}
+	return
+    }
+
+    # Delete only one value from an attribute
+
+    method del1 {attr val} {
+
+	$self del $attr [list $val]
+    }
+
+    # Get all attribute names
+
+    method getattr {} {
+
+	$self compatible "standard"
+
+	return [array names attrvals]
+    }
+
+    # Get all attribute names and values
+
+    method getall {} {
+
+	$self compatible "standard"
+
+	return [array get attrvals]
+    }
+
+    # Reset all attribute names and values at once
+
+    method setall {lst} {
+
+	$self compatible "standard"
+
+	array unset attrvals
+	foreach {attr vals} $lst {
+	    set a [string tolower $attr]
+	    set attrvals($a) $vals
+	}
+    }
+
+    # Back up current entry into a new one or into the internal backup state
+
+    method backup {{other {}}} {
+
+	$self compatible "standard"
+
+	if {$other eq ""} then {
+	    #
+	    # Back-up entry in $self->$oldav and $self->$dn
+	    #
+	    set backup 1
+	    set bckdn $dn
+
+	    array unset bckav
+	    array set bckav [array get attrvals]
+	} else {
+	    #
+	    # Back-up entry in $other
+	    #
+	    $other compatible "standard"
+	    $other dn $dn
+	    $other setall [array get attrvals]
+	}
+    }
+
+    # Restore current entry from an old one or from the internal backup state
+
+    method restore {{other {}}} {
+
+	$self compatible "standard"
+
+	if {$backup} then {
+	    if {$other eq ""} then {
+		#
+		# Restore in current context
+		#
+		set dn $bckdn
+		array unset attrvals
+		array set attrvals [array get bckav]
+	    } else {
+		#
+		# Restore in another object
+		#
+		$other compatible "standard"
+		$other dn $bckdn
+		$other setall [array get bckav]
+	    }
+	} else {
+	    return -code error \
+		"Cannot restore a non backuped object"
+	}
+    }
+
+    # Swap current and backup data, if they reside in the same entry
+
+    method swap {} {
+
+	$self compatible "standard"
+
+	if {$backup} then {
+	    #
+	    # Swap current and backup contexts
+	    #
+	    set swdn $dn
+	    set dn $bckdn
+	    set bckdn $swdn
+
+	    set swav [array get attrvals]
+	    array unset attrvals
+	    array set attrvals [array get bckav]
+	    array unset bckav
+	    array set bckav $swav
+	} else {
+	    return -code error \
+		"Cannot swap a non backuped object"
+	}
+    }
+
+    # Apply some modifications (given by a change entry) to current entry
+
+    method apply {chg} {
+
+	$self compatible "standard"
+	$chg  compatible "change"
+
+	#
+	# Apply $chg modifications to $self
+	#
+
+	foreach mod [$chg change] {
+	    set op [lindex $mod 0]
+	    switch -- $op {
+		add {
+		    if {! [$self isempty]} then {
+			return -code error \
+			    "Cannot add an entry to a non-empty entry"
+		    }
+		    $self setall [lindex $mod 1]
+		    if {[string equal [$self dn] ""]} then {
+			$self dn [$chg dn]
+		    }
+		}
+		mod {
+		    foreach submod [lindex $mod 1] {
+			set subop [lindex $submod 0]
+			set attr [lindex $submod 1]
+			set vals [lindex $submod 2]
+			switch -- $subop {
+			    modadd {
+				$self add $attr $vals
+			    }
+			    moddel {
+				$self del $attr $vals
+			    }
+			    modrepl {
+				$self del $attr
+				$self add $attr $vals
+			    }
+			    default {
+				return -code error \
+				    "Invalid submod operation '$subop'"
+			    }
+			}
+		    }
+		}
+		del {
+		    array unset attrvals
+		}
+		modrdn {
+		    set newrdn [lindex $mod 1]
+		    set delold [lindex $mod 2]
+		    set newsup [lindex $mod 3]
+
+		    if {! [regexp {^([^=]+)=([^,]+)$} $newrdn m nattr nval]} then {
+			return -code "Invalid new RDN '$newrdn'"
+		    }
+
+		    set olddn  [$self dn]
+		    if {! [regexp {^([^=]+)=([^,]+),(.*)} $olddn m oattr oval osup]} then {
+			return -code "Invalid old DN '$olddn'"
+		    }
+
+		    if {$newsup eq ""} then {
+			set dn "$newrdn,$osup"
+		    } else {
+			set dn "$newrdn,$newsup"
+		    }
+		    $self dn $dn
+
+		    if {$delold} then {
+			$self del1 $oattr $oval
+		    }
+
+		    # XXX should we ignore case ?
+		    if {[lsearch -exact [$self get $nattr] $nval] == -1} then {
+			$self add1 $nattr $nval
+		    }
+		}
+		default {
+		    return -code error \
+			"Invalid change operation '$op'"
+		}
+	    }
+	}
+    }
+
+    #########################################################################
+    # Methods for change entries
+    #########################################################################
+
+    # Get or set all modifications
+
+    method change {{newchg {-}}} {
+
+	$self compatible "change"
+
+	if {$newchg ne "-"} then {
+	    set change $newchg
+	}
+	return $change
+    }
+
+    # Compute the difference between two entries (or between an entry
+    # and the backed-up internal state) into the current change entry
+    # e1 : new, e2 : old
+    # if e2 is not given, it defaults to backup in e1
+
+    method diff {new {old {}}} {
+
+	$self compatible "change"
+
+	#
+	# Select where backup is. If internal, creates a temporary
+	# standard entry.
+	#
+
+	if {$old eq ""} then {
+	    set destroy_old 1
+	    set old [::ldapx::entry create %AUTO%]
+	    $new restore $old
+	} else {
+	    set destroy_old 0
+	}
+
+	#
+	# Computes differences between values in the two entries
+	#
+
+	if {[$old dn] ne ""} then {
+	    $self dn [$old dn]
+	} elseif {[$new dn] ne ""} then {
+	    $self dn [$new dn]
+	} else {
+	    $self dn ""
+	}
+
+	switch -- "[$new isempty][$old isempty]" {
+	    00 {
+		# They may differ
+		set change [DiffEntries $new $old]
+	    }
+	    01 {
+		# new has been added
+		set change [list [list "add" [$new getall]]]
+	    }
+	    10 {
+		# new has been deleted
+		set change [list [list "del"]]
+	    }
+	    11 {
+		# they are both empty: no change
+		set change {}
+	    }
+	}
+
+	#
+	# Remove temporary standard entry (backup was internal)
+	#
+
+	if {$destroy_old} then {
+	    $old destroy
+	}
+
+	return $change
+    }
+
+    # local procedure to compute differences between two non empty entries
+
+    proc DiffEntries {new old} {
+	array set tnew [$new getall]
+	array set told [$old getall]
+
+	set lmod {}
+
+	#
+	# First step : is there a DN change?
+	#
+
+	set moddn [DiffDn [$new dn] [$old dn] tnew told]
+
+	#
+	# Second step : pick up changes in attributes and/or values
+	#
+
+	foreach a [array names tnew] {
+	    if {[info exists told($a)]} then {
+		#
+		# They are new and old values for this attribute.
+		# We cannot use individual delete or add (rfc 4512,
+		# paragraph 2.5.1) for attributes which do not have an
+		# equality operator, so we use "replace" everywhere.
+		#
+
+		set lnew [lsort $tnew($a)]
+		set lold [lsort $told($a)]
+		if {$lold ne $lnew} then {
+		    lappend lmod [list "modrepl" $a $tnew($a)]
+		}
+
+		unset tnew($a)
+		unset told($a)
+	    } else {
+		lappend lmod [list "modadd" $a $tnew($a)]
+		unset tnew($a)
+	    }
+	}
+
+	foreach a [array names told] {
+	    lappend lmod [list "moddel" $a]
+	}
+
+	set lchg {}
+
+	if {[llength $lmod]} then {
+	    lappend lchg [list "mod" $lmod]
+	}
+
+	#
+	# Third step : insert modDN changes
+	#
+
+	if {[llength $moddn]} then {
+	    set newrdn       [lindex $moddn 0]
+	    set deleteoldrdn [lindex $moddn 1]
+	    set newsuperior  [lindex $moddn 2]
+
+	    set lmod [list "modrdn" $newrdn $deleteoldrdn]
+	    if {! [string equal $newsuperior ""]} then {
+		lappend lmod $newsuperior
+	    }
+	    lappend lchg $lmod
+	}
+
+	return $lchg
+    }
+
+    proc DiffDn {newdn olddn _tnew _told} {
+	upvar $_tnew tnew
+	upvar $_told told
+
+	#
+	# If DNs are the same, exit
+	#
+
+	if {[string equal -nocase $newdn $olddn]} then {
+	    return {}
+	}
+
+	#
+	# Split components of both DNs : attribute, value, superior
+	#
+
+	if {! [regexp {^([^=]+)=([^,]+),(.*)} $olddn m oattr oval osup]} then {
+	    return -code "Invalid old DN '$olddn'"
+	}
+	set oattr [string tolower $oattr]
+	set ordn "$oattr=$oval"
+
+	if {! [regexp {^([^=]+)=([^,]+),(.*)} $newdn m nattr nval nsup]} then {
+	    return -code "Invalid new DN '$newdn'"
+	}
+	set nattr [string tolower $nattr]
+	set nrdn "$nattr=$nval"
+
+	#
+	# Checks if superior has changed
+	#
+
+	if {! [string equal -nocase $osup $nsup]} then {
+	    set newsuperior $nsup
+	} else {
+	    set newsuperior ""
+	}
+
+	#
+	# Checks if rdn has changed
+	#
+
+	if {! [string equal -nocase $ordn $nrdn]} then {
+	    #
+	    # Checks if old rdn must be deleted
+	    #
+
+	    set deleteoldrdn 1
+	    if {[info exists tnew($oattr)]} then {
+		set pos [lsearch -exact [string tolower $tnew($oattr)] \
+					[string tolower $oval]]
+		if {$pos != -1} then {
+		    set deleteoldrdn 0
+		}
+	    }
+
+	    #
+	    # Remove old and new rdn such as DiffEntries doesn't
+	    # detect any modification.
+	    #
+
+	    foreach t {tnew told} {
+		foreach {a v} [list $oattr $oval $nattr $nval] {
+		    if {[info exists ${t}($a)]} then {
+			set l [set ${t}($a)]
+			set pos [lsearch -exact [string tolower $l] \
+						[string tolower $v] ]
+			if {$pos != -1} then {
+			    set l [lreplace $l $pos $pos]
+			    if {[llength $l]} then {
+				set ${t}($a) $l
+			    } else {
+				unset -nocomplain ${t}($a)
+			    }
+			}
+		    }
+		}
+	    }
+	} else {
+	    set deleteoldrdn 0
+	}
+
+	return [list $nrdn $deleteoldrdn $newsuperior]
+    }
+
+
+    #########################################################################
+    # End of ldapentry
+    #########################################################################
+}
+
+##############################################################################
+# UTF8 translator, component used to manage the -utf8 option
+##############################################################################
+
+snit::type ::ldapx::utf8trans {
+
+    #########################################################################
+    # Option
+    #########################################################################
+
+    option -utf8	 -default {{.*} {}}
+
+    #########################################################################
+    # Methods
+    #########################################################################
+
+    method must {attr} {
+	set utf8yes [lindex $options(-utf8) 0]
+	set utf8no  [lindex $options(-utf8) 1]
+	set r 0
+	if {[regexp -expanded -nocase "^$utf8yes$" $attr]} then {
+	    set r 1
+	    if {[regexp -expanded -nocase "^$utf8no$" $attr]} then {
+		set r 0
+	    }
+	}
+	return $r
+    }
+
+    method encode {attr val} {
+	if {[$self must $attr]} then {
+	    set val [encoding convertto utf-8 $val]
+	}
+	return $val
+    }
+
+    method decode {attr val} {
+	if {[$self must $attr]} then {
+	    set val [encoding convertfrom utf-8 $val]
+	}
+	return $val
+    }
+
+    method encodepairs {avpairs} {
+	set r {}
+	foreach {attr vals} $avpairs {
+	    if {[llength $vals]} then {
+		lappend r $attr [$self encode $attr $vals]
+	    } else {
+		lappend r $attr
+	    }
+	}
+	return $r
+    }
+
+    method decodepairs {avpairs} {
+	set r {}
+	foreach {attr vals} $avpairs {
+	    set vals [$self decode $attr $vals]
+	    lappend r $attr $vals
+	}
+	return $r
+    }
+}
+
+##############################################################################
+# LDAP object type
+##############################################################################
+
+snit::type ::ldapx::ldap {
+    #########################################################################
+    # Options
+    #
+    # note : options are lowercase
+    #########################################################################
+
+    option -scope        -default "sub"
+    option -derefaliases -default "never"
+    option -sizelimit	 -default 0
+    option -timelimit	 -default 0
+    option -attrsonly	 -default 0
+
+    option -tlsoptions  -default {}
+
+    component translator
+    delegate option -utf8 to translator
+
+    #
+    # Channel descriptor
+    #
+
+    variable channel ""
+    variable bind 0
+
+    #
+    # Last error
+    #
+
+    variable lastError ""
+
+    #
+    # Defaults connection modes
+    #
+
+    variable connect_defaults -array {
+				    ldap {389 ::ldap::connect}
+				    ldaps {636 ::ldap::secure_connect}
+				}
+
+
+    #########################################################################
+    # Constructor
+    #########################################################################
+
+    constructor {args} {
+	install translator using ::ldapx::utf8trans create %AUTO%
+	$self configurelist $args
+    }
+
+    destructor {
+	catch {$translator destroy}
+    }
+
+    #########################################################################
+    # Methods
+    #########################################################################
+
+    # Get or set the last error message
+
+    method error {{le {-}}} {
+
+	if {! [string equal $le "-"]} then {
+	    set lastError $le
+	}
+	return $lastError
+    }
+
+    # Connect to the LDAP directory, and binds to it if needed
+
+    method connect {url {binddn {}} {bindpw {}} {starttls no}} {
+
+	array set comp [::uri::split $url "ldap"]
+
+	if {! [::info exists comp(host)]} then {
+	    $self error "Invalid host in URL '$url'"
+	    return 0
+	}
+
+	# use ::ldap with integrated TLS mode
+	::ldap::tlsoptions reset
+	::ldap::tlsoptions {*}$options(-tlsoptions)
+
+	set scheme $comp(scheme)
+	if {! [::info exists connect_defaults($scheme)]} then {
+	    $self error "Unrecognized URL '$url'"
+	    return 0
+	}
+
+	set defport [lindex $connect_defaults($scheme) 0]
+	set fct     [lindex $connect_defaults($scheme) 1]
+
+	if {[string equal $comp(port) ""]} then {
+	    set comp(port) $defport
+	}
+
+	if {[Check $selfns {set channel [$fct $comp(host) $comp(port)]}]} then {
+	    return 0
+	}
+
+	if {$starttls && [string equal $scheme "ldap"]} then {
+	    if {[Check $selfns {::ldap::starttls $channel}]} then {
+		return 0
+	    }
+	}
+
+	if {$binddn eq ""} then {
+	    set bind 0
+	} else {
+	    set bind 1
+	    if {[Check $selfns {::ldap::bind $channel $binddn $bindpw}]} then {
+		return 0
+	    }
+	}
+	return 1
+    }
+
+    # Disconnect from the LDAP directory
+
+    method disconnect {} {
+
+	Connected $selfns
+
+	if {$bind} {
+	    if {[Check $selfns {::ldap::unbind $channel}]} then {
+		return 0
+	    }
+	}
+	if {[Check $selfns {::ldap::disconnect $channel}]} then {
+	    return 0
+	}
+	set channel ""
+	return 1
+    }
+
+    # New control structure : traverse the DIT and execute the body
+    # for each found entry.
+
+    method traverse {base filter attrs entry body} {
+
+	Connected $selfns
+
+	global errorInfo errorCode
+
+	set lastError ""
+
+	#
+	# Initiate search
+	#
+
+	set opt [list                                             \
+			-scope        $options(-scope)            \
+			-derefaliases $options(-derefaliases)     \
+			-sizelimit    $options(-sizelimit)        \
+			-timelimit    $options(-timelimit)        \
+			-attrsonly    $options(-attrsonly)        \
+			]
+
+	::ldap::searchInit $channel $base $filter $attrs $opt
+
+	#
+	# Execute the specific body for each result found
+	#
+
+	while {1} {
+	    #
+	    # The first call to searchNext may fail when searchInit
+	    # is given some invalid parameters.
+	    # We must terminate the current search in order to allow
+	    # future searches.
+	    #
+
+	    set err [catch {::ldap::searchNext $channel} r]
+
+	    if {$err} then {
+		set ei $errorInfo
+		set ec $errorCode
+		::ldap::searchEnd $channel
+		return -code error -errorinfo $ei -errorcode $ec $r
+	    }
+
+	    #
+	    # End of result messages
+	    #
+
+	    if {[llength $r] == 0} then {
+		break
+	    }
+
+	    #
+	    # Set DN and attributes-values (converted from utf8 if needed)
+	    # for the entry
+	    #
+
+	    $entry reset
+
+	    $entry dn [lindex $r 0]
+	    $entry setall [$translator decodepairs [lindex $r 1]]
+
+	    #
+	    # Execute body with the entry
+	    #
+	    # http://wiki.tcl.tk/685
+	    #
+
+	    set code [catch {uplevel 1 $body} msg]
+	    switch -- $code {
+		0 {
+		    # ok
+		}
+		1 {
+		    # error
+		    set ei $errorInfo
+		    set ec $errorCode
+		    ::ldap::searchEnd $channel
+		    return -code error -errorinfo $ei -errorcode $ec $msg
+		}
+		2 {
+		    # return
+		    ::ldap::searchEnd $channel
+		    return -code return $msg
+		}
+		3 {
+		    # break
+		    ::ldap::searchEnd $channel
+		    return {}
+		}
+		4 {
+		    # continue
+		}
+		default {
+		    # user defined
+		    ::ldap::searchEnd $channel
+		    return -code $code $msg
+		}
+	    }
+	}
+
+	#
+	# Terminate search
+	#
+
+	::ldap::searchEnd $channel
+    }
+
+    # Returns a list of newly created objects which match
+
+    method search {base filter attrs} {
+
+	Connected $selfns
+
+	set e [::ldapx::entry create %AUTO%]
+	set r {}
+	$self traverse $base $filter $attrs $e {
+	    set new [::ldapx::entry create %AUTO%]
+	    $e backup $new
+	    lappend r $new
+	}
+	$e destroy
+	return $r
+    }
+
+    # Read one or more entries, and returns the number of entries found.
+    # Useful to easily read one or more entries.
+
+    method read {base filter args} {
+
+	set n 0
+	set max [llength $args]
+	set e [::ldapx::entry create %AUTO%]
+	$self traverse $base $filter {} $e {
+	    if {$n < $max} then {
+		$e backup [lindex $args $n]
+	    }
+	    incr n
+	}
+	return $n
+    }
+
+    # Commit a list of changes (or standard, backuped entries)
+
+    method commit {args} {
+
+	Connected $selfns
+
+	foreach entry $args {
+	    switch -- [$entry format] {
+		uninitialized {
+		    return -code error \
+			"Uninitialized entry"
+		}
+		standard {
+		    set echg [::ldapx::entry create %AUTO%]
+		    set lchg [$echg diff $entry]
+		    set dn   [$echg dn]
+		    $echg destroy
+		}
+		change {
+		    set dn   [$entry dn]
+		    set lchg [$entry change]
+		}
+	    }
+
+	    foreach chg $lchg {
+		set op   [lindex $chg 0]
+
+		switch -- $op {
+		    {} {
+			# nothing to do
+		    }
+		    add {
+			set av [$translator encodepairs [lindex $chg 1]]
+			if {[Check $selfns {::ldap::addMulti $channel $dn $av}]} then {
+			    return 0
+			}
+		    }
+		    del {
+			if {[Check $selfns {::ldap::delete $channel $dn}]} then {
+			    return 0
+			}
+		    }
+		    mod {
+			set lrep {}
+			set ldel {}
+			set ladd {}
+
+			foreach submod [lindex $chg 1] {
+			    set subop [lindex $submod 0]
+			    set attr [lindex $submod 1]
+			    set vals [lindex $submod 2]
+
+			    set vals [$translator encode $attr $vals]
+			    switch -- $subop {
+				modadd {
+				    lappend ladd $attr $vals
+				}
+				moddel {
+				    lappend ldel $attr $vals
+				}
+				modrepl {
+				    lappend lrep $attr $vals
+				}
+			    }
+			}
+
+			if {[Check $selfns {::ldap::modifyMulti $channel $dn \
+						    $lrep $ldel $ladd}]} then {
+			    return 0
+			}
+		    }
+		    modrdn {
+			set newrdn [lindex $chg 1]
+			set delOld [lindex $chg 2]
+			set newSup [lindex $chg 3]
+			if {[string equal $newSup ""]} then {
+			    if {[Check $selfns {::ldap::modifyDN $channel $dn \
+						    $newrdn $delOld}]} then {
+				return 0
+			    }
+			} else {
+			    if {[Check $selfns {::ldap::modifyDN $channel $dn \
+						    $newrdn $delOld $newSup}]} then {
+				return 0
+			    }
+			}
+		    }
+		}
+	    }
+	}
+
+	return 1
+    }
+
+    #########################################################################
+    # Local procedures
+    #########################################################################
+
+    proc Connected {selfns} {
+	if {$channel eq ""} then {
+	    return -code error \
+		"Object not connected"
+	}
+    }
+
+    proc Check {selfns script} {
+	return [catch {uplevel 1 $script} lastError]
+    }
+
+    #########################################################################
+    # End of LDAP object type
+    #########################################################################
+}
+
+##############################################################################
+# LDIF object type
+##############################################################################
+
+snit::type ::ldapx::ldif {
+
+    #########################################################################
+    # Options
+    #########################################################################
+
+    #
+    # Fields to ignore when reading change file
+    #
+
+    option -ignore {}
+
+    component translator
+    delegate option -utf8 to translator
+
+
+    #########################################################################
+    # Variables
+    #########################################################################
+
+    #
+    # Version of LDIF file (0 means : uninitialized)
+    #
+
+    variable version 0
+
+    #
+    # Channel descriptor
+    #
+
+    variable channel ""
+
+    #
+    # Line number
+    #
+
+    variable lineno 0
+
+    #
+    # Last error message
+    #
+
+    variable lastError ""
+
+    #
+    # Number of entries read or written
+    #
+
+    variable nentries 0
+
+    #
+    # Type of LDIF file
+    #
+
+    variable format "uninitialized"
+
+    #########################################################################
+    # Constructor
+    #########################################################################
+
+    constructor {args} {
+	install translator using ::ldapx::utf8trans create %AUTO%
+	$self configurelist $args
+    }
+
+    destructor {
+	catch {$translator destroy}
+    }
+
+    #########################################################################
+    # Methods
+    #########################################################################
+
+    # Initialize a channel
+
+    method channel {newchan} {
+
+	set channel   $newchan
+	set version   0
+	set nentries  0
+	set format    "uninitialized"
+	set lineno    0
+	return
+    }
+
+    # Get or set the last error message
+
+    method error {{le {-}}} {
+
+	if {$le ne "-"} then {
+	    set lastError $le
+	}
+	return $lastError
+    }
+
+    # An LDIF file cannot include both changes and standard entries
+    # (see RFC 2849, page 2). Check this.
+
+    method compatible {ref} {
+
+	if {$format eq "uninitialized"} then {
+	    set format $ref
+	} elseif {$format ne $ref} then {
+	    return -code error \
+		"Invalid entry ($ref) type for LDIF $format file"
+	}
+    }
+
+    # Reads an LDIF entry (standard or change) from the channel
+    # returns 1 if ok, 0 if error or EOF
+
+    # XXX this method is just coded for tests at this time
+
+    method debugread {entry} {
+
+	$entry compatible "standard"
+	$entry dn "uid=joe,ou=org,o=com"
+	$entry setall {uid {joe} sn {User} givenName {Joe} cn {{Joe User}}
+	    telephoneNumber {+31415926535 +27182818285} objectClass {person}
+	}
+	return 1
+    }
+
+    # Read an LDIF entry (standard or change) from the channel
+    # returns 1 if ok, 0 if error or EOF
+
+    method read {entry} {
+	if {$channel eq ""} then {
+	    return -code error \
+			"Channel not initialized"
+	}
+
+	set r [Lexical $selfns]
+	if {[lindex $r 0] ne "err"} then {
+	    set r [Syntaxic $selfns [lindex $r 1]]
+	}
+
+	if {[lindex $r 0] eq "err"} then {
+	    set lastError [lindex $r 1]
+	    return 0
+	}
+
+	switch -- [lindex $r 0] {
+	    uninitialized {
+		$entry reset
+		set lastError ""
+		set r 0
+	    }
+	    standard {
+		if {[catch {$self compatible "change"}]} then {
+		    set lastError "Standard entry not allowed in LDIF change file"
+		    set r 0
+		} else {
+		    $entry reset
+		    $entry dn     [lindex $r 1]
+		    $entry setall [lindex $r 2]
+		    set r 1
+		}
+	    }
+	    change {
+		if {[catch {$self compatible "change"}]} then {
+		    set lastError "Change entry not allowed in LDIF standard file"
+		    set r 0
+		} else {
+		    $entry reset
+		    $entry dn     [lindex $r 1]
+		    $entry change [list [lindex $r 2]]
+		    set r 1
+		}
+	    }
+	    default {
+		return -code error \
+			"Internal error (invalid returned entry format)"
+	    }
+	}
+
+	return $r
+    }
+
+    # Write an LDIF entry to the channel
+
+    method write {entry} {
+
+	if {$channel eq ""} then {
+	    return -code error \
+			"Channel not initialized"
+	}
+
+	switch -- [$entry format] {
+	    uninitialized {
+		# nothing
+	    }
+	    standard {
+		if {[llength [$entry getall]]} then {
+		    $self compatible "standard"
+
+		    if {$nentries == 0} then {
+			if {$version == 0} then {
+			    set version 1
+			}
+			WriteLine $selfns "version" "$version"
+			puts $channel ""
+		    }
+
+		    WriteLine $selfns "dn" [$entry dn]
+
+		    foreach a [$entry getattr] {
+			foreach v [$entry get $a] {
+			    WriteLine $selfns $a $v
+			}
+		    }
+		    puts $channel ""
+		}
+	    }
+	    change {
+		$self compatible "change"
+
+		set lchg [$entry change]
+		foreach chg $lchg {
+		    if {$nentries == 0} then {
+			if {$version == 0} then {
+			    set version 1
+			}
+			WriteLine $selfns "version" "$version"
+			puts $channel ""
+		    }
+
+		    WriteLine $selfns "dn" [$entry dn]
+
+		    set op [lindex $chg 0]
+		    switch -- $op {
+			add {
+			    WriteLine $selfns "changetype" "add"
+			    foreach {attr vals} [lindex $chg 1] {
+				foreach v $vals {
+				    WriteLine $selfns $attr $v
+				}
+			    }
+			}
+			del {
+			    WriteLine $selfns "changetype" "delete"
+			}
+			mod {
+			    WriteLine $selfns "changetype" "modify"
+			    foreach submod [lindex $chg 1] {
+				set subop [lindex $submod 0]
+				set attr [lindex $submod 1]
+				set vals [lindex $submod 2]
+
+				switch -- $subop {
+				    modadd {
+					WriteLine $selfns "add" $attr
+				    }
+				    moddel {
+					WriteLine $selfns "delete" $attr
+				    }
+				    modrepl {
+					WriteLine $selfns "replace" $attr
+				    }
+				}
+				foreach v $vals {
+				    WriteLine $selfns $attr $v
+				}
+				puts $channel "-"
+			    }
+			}
+			modrdn {
+			    WriteLine $selfns "changetype" "modrdn"
+			    set newrdn [lindex $chg 1]
+			    set delold [lindex $chg 2]
+			    set newsup [lindex $chg 3]
+			    WriteLine $selfns "newrdn" $newrdn
+			    WriteLine $selfns "deleteOldRDN" $delold
+			    if {$newsup ne ""} then {
+				WriteLine $selfns "newSuperior" $newsup
+			    }
+			}
+		    }
+		    puts $channel ""
+		    incr nentries
+		}
+	    }
+	    default {
+		return -code error \
+			"Invalid entry format"
+	    }
+	}
+	return 1
+    }
+
+    #########################################################################
+    # Local procedures to read an entry
+    #########################################################################
+
+    #
+    # Lexical analysis of an entry
+    # Special case for "version:" entry.
+    # Returns a list of lines {ok {{<attr1> <val1>} {<attr2> <val2>} ...}}
+    # or a list {err <message>}
+    #
+
+    proc Lexical {selfns} {
+	set result {}
+	set prev ""
+
+	while {[gets $channel line] > -1} {
+	    incr lineno
+
+	    if {$line eq ""} then {
+		#
+		# Empty line: we are either before the beginning
+		# of the entry or at the empty line after the
+		# entry.
+		# We don't give up before getting something.
+		#
+
+		if {! [FlushLine $selfns "" result prev msg]} then {
+		    return [list "err" $msg]
+		}
+
+		if {[llength $result]} then {
+		    break
+		}
+
+	    } elseif {[regexp {^[ \t]} $line]} then {
+		#
+		# Continuation line. Remove the continuation character.
+		#
+
+		append prev [string range $line 1 end]
+
+	    } elseif {[regexp {^-$} $line]} then {
+		#
+		# Separation between individual modifications
+		#
+
+		if {! [FlushLine $selfns "" result prev msg]} then {
+		    return [list "err" $msg]
+		}
+		lappend result [list "-" {}]
+
+	    } else {
+		#
+		# Should be a normal line (key: val)
+		#
+
+		if {! [FlushLine $selfns $line result prev msg]} then {
+		    return [list "err" $msg]
+		}
+
+	    }
+	}
+
+	#
+	# End of file, or end of entry. Flush buffered data from $prev
+	# for EOF case.
+	#
+
+	if {! [FlushLine $selfns "" result prev msg]} then {
+	    return [list "err" $msg]
+	}
+
+	return [list "ok" $result]
+    }
+
+    proc FlushLine {selfns line _result _prev _msg} {
+	upvar $_result result  $_prev prev  $_msg msg
+
+	if {$prev ne ""} then {
+	    set r [DecodeLine $selfns $prev]
+	    if {[llength $r] != 2} then {
+		set msg "$lineno: invalid syntax"
+		return 0
+	    }
+
+	    #
+	    # Special case for "version: 1". This code should not
+	    # be in lexical analysis, but this would be too disruptive
+	    # in syntaxic analysis
+	    #
+
+	    if {[string equal -nocase [lindex $r 0] "version"]} then {
+		if {$version != 0} then {
+		    set msg "version attribute allowed only at the beginning of the LDIF file"
+		    return 0
+		}
+		set val [lindex $r 1]
+		if {[catch {set val [expr {$val+0}]}]} then {
+		    set msg "invalid version value"
+		    return 0
+		}
+		if {$val != 1} then {
+		    set msg "unrecognized version '$val'"
+		    return 0
+		}
+		set version 1
+	    } else {
+		lappend result $r
+	    }
+	}
+	set prev $line
+
+	return 1
+    }
+
+    proc DecodeLine {selfns str} {
+	if {[regexp {^([^:]*)::[ \t]*(.*)} $str d key val]} then {
+	    set key [string tolower $key]
+	    set val [::base64::decode $val]
+	    set val [$translator decode $key $val]
+	    set r [list $key $val]
+	} elseif {[regexp {^([^:]*):[ \t]*(.*)} $str d key val]} then {
+	    set key [string tolower $key]
+	    set val [$translator decode $key $val]
+	    set r [list $key $val]
+	} else {
+	    # syntax error
+	    set r {}
+	}
+	return $r
+    }
+
+    #
+    # Array indexed by current state of the LDIF automaton
+    # Each element is a list of actions, each with the format:
+    #	pattern on on "attribute:value"
+    #	next state
+    #	script (to be evaled in Syntaxic local procedure)
+    #
+
+    variable ldifautomaton -array {
+	begin {
+	    {dn:*		dn		{set dn $val}}
+	    {EOF:*		end		{set r [list "empty"]}}
+	}
+	dn {
+	    {changetype:modify	mod		{set t "change" ; set r {mod}}}
+	    {changetype:modrdn	modrdn		{set t "change" ; set newsup {}}}
+	    {changetype:add	add		{set t "change"}}
+	    {changetype:delete	del		{set t "change"}}
+	    {*:*		standard	{set t "standard" ; lappend tab($key) $val}}
+	}
+	standard {
+	    {EOF:*		end		{set r [array get tab]}}
+	    {*:*		standard	{lappend tab($key) $val}}
+	}
+	mod {
+	    {add:*		mod-add		{set attr [string tolower $val] ; set vals {}}}
+	    {delete:*		mod-del		{set attr [string tolower $val] ; set vals {}}}
+	    {replace:*		mod-repl	{set attr [string tolower $val] ; set vals {}}}
+	    {EOF:*		end		{}}
+	}
+	mod-add {
+	    {*:*		mod-add-attr	{lappend vals $val}}
+	}
+	mod-add-attr {
+	    {-:*		mod		{lappend r [list "modadd" $attr $vals]}}
+	    {*:*		mod-add-attr	{lappend vals $val}}
+	}
+	mod-del {
+	    {-:*		mod		{lappend r [list "moddel" $attr $vals]}}
+	    {*:*		mod-del		{lappend vals $val}}
+	}
+	mod-repl {
+	    {-:*		mod		{lappend r [list "modrepl" $attr $vals]}}
+	    {*:*		mod-repl	{lappend vals $val}}
+	}
+	modrdn {
+	    {newrdn:*		modrdn-new	{set newrdn $val}}
+	}
+	modrdn-new {
+	    {deleteoldrdn:0	modrdn-del	{set delold 0}}
+	    {deleteoldrdn:1	modrdn-del	{set delold 1}}
+	}
+	modrdn-del {
+	    {newsuperior:*	modrdn-end	{set newsup $val}}
+	    {EOF:*		end		{set r [list modrdn $newrdn $delold] }}
+	}
+	modrdn-end {
+	    {EOF:*		end		{set r [list modrdn $newrdn $delold $newsup]}}
+	}
+	add {
+	    {EOF:*		end		{set r [list add [array get tab]]}}
+	    {*:*		add		{lappend tab($key) $val}}
+	}
+	del {
+	    {EOF:*		end		{set r [list del]}}
+	}
+    }
+
+    proc Syntaxic {selfns lcouples} {
+	set state "begin"
+	set newsup {}
+	set t "uninitialized"
+	foreach c $lcouples {
+	    set key [lindex $c 0]
+	    if {[lsearch [string tolower $options(-ignore)] $key] == -1} then {
+		set val [lindex $c 1]
+		set a [Automaton $selfns $state $key $val]
+		if {$a eq ""} then {
+		    return [list "err" "Syntax error before line $lineno"]
+		}
+		set state [lindex $a 0]
+		set script [lindex $a 1]
+		eval $script
+	    }
+	}
+
+	set a [Automaton $selfns $state "EOF" "EOF"]
+	if {$a eq ""} then {
+	    return [list "err" "Premature EOF"]
+	}
+	set script [lindex $a 1]
+	eval $script
+
+	set result [list $t]
+	switch $t {
+	    uninitialized {
+		# nothing
+	    }
+	    standard {
+		lappend result $dn $r
+	    }
+	    change {
+		lappend result $dn $r
+	    }
+	}
+
+	return $result
+    }
+
+    proc Automaton {selfns state key val} {
+	set r {}
+	if {[info exists ldifautomaton($state)]} then {
+	    foreach a $ldifautomaton($state) {
+		if {[string match [lindex $a 0] "$key:$val"]} then {
+		    set r [lreplace $a 0 0]
+		    break
+		}
+	    }
+	}
+	return $r
+    }
+
+    #########################################################################
+    # Local procedures to write an entry
+    #########################################################################
+
+    proc WriteLine {selfns attr val} {
+
+	if {[string is ascii $val] && [string is print $val]} then {
+	    set sep ":"
+	} else {
+	    set sep "::"
+	    set val [$translator encode $attr $val]
+	    set val [::base64::encode $val]
+	}
+
+	set first 1
+	foreach line [split $val "\n"] {
+	    if {$first} then {
+		puts $channel "$attr$sep $line"
+		set first 0
+	    } else {
+		puts $channel " $line"
+	    }
+	}
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ldap/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ldap/pkgIndex.tcl
new file mode 100644
index 00000000..ef784170
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ldap/pkgIndex.tcl
@@ -0,0 +1,7 @@
+# Tcl package index file, version 1.1
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded ldap 1.10.1 [list source [file join $dir ldap.tcl]]
+
+# the OO level wrapper for ldap
+package ifneeded ldapx 1.2 [list source [file join $dir ldapx.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/log.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/log.tcl
new file mode 100644
index 00000000..0d57fd67
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/log.tcl
@@ -0,0 +1,897 @@
+# log.tcl --
+#
+#	Tcl implementation of a general logging facility
+#	(Reaped from Pool_Base and modified to fit into tcllib)
+#
+# Copyright (c) 2001 by ActiveState Tool Corp.
+# See the file license.terms.
+
+package require Tcl 8
+package provide log 1.4
+
+# ### ### ### ######### ######### #########
+
+namespace eval ::log {
+    namespace export levels lv2longform lv2color lv2priority 
+    namespace export lv2cmd lv2channel lvCompare
+    namespace export lvSuppress lvSuppressLE lvIsSuppressed
+    namespace export lvCmd lvCmdForall
+    namespace export lvChannel lvChannelForall lvColor lvColorForall
+    namespace export log logMsg logError
+
+    # The known log-levels.
+
+    variable levels [list \
+	    emergency \
+	    alert \
+	    critical \
+	    error \
+	    warning \
+	    notice \
+	    info \
+	    debug]
+
+    # Array mapping from all unique prefixes for log levels to their
+    # corresponding long form.
+
+    # *future* Use a procedure from 'textutil' to calculate the
+    #          prefixes and to fill the map.
+
+    variable  levelMap
+    array set levelMap {
+	a		alert
+	al		alert
+	ale		alert
+	aler		alert
+	alert		alert
+	c		critical
+	cr		critical
+	cri		critical
+	crit		critical
+	criti		critical
+	critic		critical
+	critica		critical
+	critical	critical
+	d		debug
+	de		debug
+	deb		debug
+	debu		debug
+	debug		debug
+	em		emergency
+	eme		emergency
+	emer		emergency
+	emerg		emergency
+	emerge		emergency
+	emergen		emergency
+	emergenc	emergency
+	emergency	emergency
+	er		error
+	err		error
+	erro		error
+	error		error
+	i		info
+	in		info
+	inf		info
+	info		info
+	n		notice
+	no		notice
+	not		notice
+	noti		notice
+	notic		notice
+	notice		notice
+	w		warning
+	wa		warning
+	war		warning
+	warn		warning
+	warni		warning
+	warnin		warning
+	warning		warning
+    }
+
+    # Map from log-levels to the commands to execute when a message
+    # with that level arrives in the system. The standard command for
+    # all levels is '::log::Puts' which writes the message to either
+    # stdout or stderr, depending on the level. The decision about the
+    # channel is stored in another map and modifiable by the user of
+    # the package.
+
+    variable  cmdMap
+    array set cmdMap {}
+
+    variable lv
+    foreach  lv $levels {set cmdMap($lv) ::log::Puts}
+    unset    lv
+
+    # Map from log-levels to the channels ::log::Puts shall write
+    # messages with that level to. The map can be queried and changed
+    # by the user.
+
+    variable  channelMap
+    array set channelMap {
+	emergency  stderr
+	alert      stderr
+	critical   stderr
+	error      stderr
+	warning    stdout
+	notice     stdout
+	info       stdout
+	debug      stdout
+    }
+
+    # Graphical user interfaces may want to colorize messages based
+    # upon their level. The following array stores a map from levels
+    # to colors. The map can be queried and changed by the user.
+
+    variable  colorMap
+    array set colorMap {
+	emergency red
+	alert     red
+	critical  red
+	error     red
+	warning   yellow
+	notice    seagreen
+	info      {}
+	debug     lightsteelblue
+    }
+
+    # To allow an easy comparison of the relative importance of a
+    # level the following array maps from levels to a numerical
+    # priority. The higher the number the more important the
+    # level. The user cannot change this map (for now). This package
+    # uses the priorities to allow the user to supress messages based
+    # upon their levels.
+
+    variable  priorityMap
+    array set priorityMap {
+	emergency 7
+	alert     6
+	critical  5
+	error     4
+	warning   3
+	notice    2
+	info      1
+	debug     0
+    }
+
+    # The following array is internal and holds the information about
+    # which levels are suppressed, i.e. may not be written.
+    #
+    # 0 - messages with with level are written out.
+    # 1 - messages with this level are suppressed.
+
+    # Note: This initialization is partially overridden via
+    # 'log::lvSuppressLE' at the bottom of this file.
+
+    variable  suppressed
+    array set suppressed {
+	emergency 0
+	alert     0
+	critical  0
+	error     0
+	warning   0
+	notice    0
+	info      0
+	debug     0
+    }
+
+    # Internal static information. Map from levels to a string of
+    # spaces. The number of spaces in each string is just enough to
+    # make all level names together with their string of the same
+    # length.
+
+    variable  fill
+    array set fill {
+	emergency ""	alert "    "	critical " "	error "    "
+	warning "  "	notice "   "	info "     "	debug "    "
+    }
+}
+
+
+# log::levels --
+#
+#	Retrieves the names of all known levels.
+#
+# Arguments:
+#	None.
+#
+# Side Effects:
+#	None.
+#
+# Results:
+#	A list containing the names of all known levels,
+#	alphabetically sorted.
+
+proc ::log::levels {} {
+    variable levels
+    return [lsort $levels]
+}
+
+# log::lv2longform --
+#
+#	Converts any unique abbreviation of a level name to the full
+#	level name.
+#
+# Arguments:
+#	level	The prefix of a level name to convert.
+#
+# Side Effects:
+#	None.
+#
+# Results:
+#	Returns the full name to the specified abbreviation or an
+#	error.
+
+proc ::log::lv2longform {level} {
+    variable levelMap
+
+    if {[info exists levelMap($level)]} {
+	return $levelMap($level)
+    }
+
+    return -code error "bad level \"$level\": must be [join [lreplace [levels] end end "or [lindex [levels] end]"] ", "]."
+}
+
+# log::lv2color --
+#
+#	Converts any level name including unique abbreviations to the
+#	corresponding color.
+#
+# Arguments:
+#	level	The level to convert into a color.
+#
+# Side Effects:
+#	None.
+#
+# Results:
+#	The name of a color or an error.
+
+proc ::log::lv2color {level} {
+    variable colorMap
+    set level [lv2longform $level]
+    return $colorMap($level)
+}
+
+# log::lv2priority --
+#
+#	Converts any level name including unique abbreviations to the
+#	corresponding priority.
+#
+# Arguments:
+#	level	The level to convert into a priority.
+#
+# Side Effects:
+#	None.
+#
+# Results:
+#	The numerical priority of the level or an error.
+
+proc ::log::lv2priority {level} {
+    variable priorityMap
+    set level [lv2longform $level]
+    return $priorityMap($level)
+}
+
+# log::lv2cmd --
+#
+#	Converts any level name including unique abbreviations to the
+#	command prefix used to write messages with that level.
+#
+# Arguments:
+#	level	The level to convert into a command prefix.
+#
+# Side Effects:
+#	None.
+#
+# Results:
+#	A string containing a command prefix or an error.
+
+proc ::log::lv2cmd {level} {
+    variable cmdMap
+    set level [lv2longform $level]
+    return $cmdMap($level)
+}
+
+# log::lv2channel --
+#
+#	Converts any level name including unique abbreviations to the
+#	channel used by ::log::Puts to write messages with that level.
+#
+# Arguments:
+#	level	The level to convert into a channel.
+#
+# Side Effects:
+#	None.
+#
+# Results:
+#	A string containing a channel handle or an error.
+
+proc ::log::lv2channel {level} {
+    variable channelMap
+    set level [lv2longform $level]
+    return $channelMap($level)
+}
+
+# log::lvCompare --
+#
+#	Compares two levels (including unique abbreviations) with
+#	respect to their priority. This command can be used by the
+#	-command option of lsort.
+#
+# Arguments:
+#	level1	The first of the levels to compare.
+#	level2	The second of the levels to compare.
+#
+# Side Effects:
+#	None.
+#
+# Results:
+#	One of -1, 0 or 1 or an error. A result of -1 signals that
+#	level1 is of less priority than level2. 0 signals that both
+#	levels have the same priority. 1 signals that level1 has
+#	higher priority than level2.
+
+proc ::log::lvCompare {level1 level2} {
+    variable priorityMap
+
+    set level1 $priorityMap([lv2longform $level1])
+    set level2 $priorityMap([lv2longform $level2])
+
+    if {$level1 < $level2} {
+	return -1
+    } elseif {$level1 > $level2} {
+	return 1
+    } else {
+	return 0
+    }
+}
+
+# log::lvSuppress --
+#
+#	(Un)suppresses the output of messages having the specified
+#	level. Unique abbreviations for the level are allowed here
+#	too.
+#
+# Arguments:
+#	level		The name of the level to suppress or
+#			unsuppress. Unique abbreviations are allowed
+#			too.
+#	suppress	Boolean flag. Optional. Defaults to the value
+#			1, which means to suppress the level. The
+#			value 0 on the other hand unsuppresses the
+#			level.
+#
+# Side Effects:
+#	See above.
+#
+# Results:
+#	None.
+
+proc ::log::lvSuppress {level {suppress 1}} {
+    variable suppressed
+    set level [lv2longform $level]
+
+    switch -exact -- $suppress {
+	0 - 1 {} default {
+	    return -code error "\"$suppress\" is not a member of \{0, 1\}"
+	}
+    }
+
+    set suppressed($level) $suppress
+    return
+}
+
+# log::lvSuppressLE --
+#
+#	(Un)suppresses the output of messages having the specified
+#	level or one of lesser priority. Unique abbreviations for the
+#	level are allowed here too.
+#
+# Arguments:
+#	level		The name of the level to suppress or
+#			unsuppress. Unique abbreviations are allowed
+#			too.
+#	suppress	Boolean flag. Optional. Defaults to the value
+#			1, which means to suppress the specified
+#			levels. The value 0 on the other hand
+#			unsuppresses the levels.
+#
+# Side Effects:
+#	See above.
+#
+# Results:
+#	None.
+
+proc ::log::lvSuppressLE {level {suppress 1}} {
+    variable suppressed
+    variable levels
+    variable priorityMap
+
+    set level [lv2longform $level]
+
+    switch -exact -- $suppress {
+	0 - 1 {} default {
+	    return -code error "\"$suppress\" is not a member of \{0, 1\}"
+	}
+    }
+
+    set prio  [lv2priority $level]
+
+    foreach l $levels {
+	if {$priorityMap($l) <= $prio} {
+	    set suppressed($l) $suppress
+	}
+    }
+    return
+}
+
+# log::lvIsSuppressed --
+#
+#	Asks the package wether the specified level is currently
+#	suppressed. Unique abbreviations of level names are allowed.
+#
+# Arguments:
+#	level	The level to query.
+#
+# Side Effects:
+#	None.
+#
+# Results:
+#	None.
+
+proc ::log::lvIsSuppressed {level} {
+    variable suppressed
+    set level [lv2longform $level]
+    return $suppressed($level)
+}
+
+# log::lvCmd --
+#
+#	Defines for the specified level with which command to write
+#	the messages having this level. Unique abbreviations of level
+#	names are allowed. The command is actually a command prefix
+#	and this facility will append 2 arguments before calling it,
+#	the level of the message and the message itself, in this
+#	order.
+#
+# Arguments:
+#	level	The level the command prefix is for.
+#	cmd	The command prefix to use for the specified level.
+#
+# Side Effects:
+#	See above.
+#
+# Results:
+#	None.
+
+proc ::log::lvCmd {level cmd} {
+    variable cmdMap
+    set level [lv2longform $level]
+    set cmdMap($level) $cmd
+    return
+}
+
+# log::lvCmdForall --
+#
+#	Defines for all known levels with which command to write the
+#	messages having this level. The command is actually a command
+#	prefix and this facility will append 2 arguments before
+#	calling it, the level of the message and the message itself,
+#	in this order.
+#
+# Arguments:
+#	cmd	The command prefix to use for all levels.
+#
+# Side Effects:
+#	See above.
+#
+# Results:
+#	None.
+
+proc ::log::lvCmdForall {cmd} {
+    variable cmdMap
+    variable levels
+
+    foreach l $levels {
+	set cmdMap($l) $cmd
+    }
+    return
+}
+
+# log::lvChannel --
+#
+#	Defines for the specified level into which channel ::log::Puts
+#	(the standard command) shall write the messages having this
+#	level. Unique abbreviations of level names are allowed. The
+#	command is actually a command prefix and this facility will
+#	append 2 arguments before calling it, the level of the message
+#	and the message itself, in this order.
+#
+# Arguments:
+#	level	The level the channel is for.
+#	chan	The channel to use for the specified level.
+#
+# Side Effects:
+#	See above.
+#
+# Results:
+#	None.
+
+proc ::log::lvChannel {level chan} {
+    variable channelMap
+    set level [lv2longform $level]
+    set channelMap($level) $chan
+    return
+}
+
+# log::lvChannelForall --
+#
+#	Defines for all known levels with which which channel
+#	::log::Puts (the standard command) shall write the messages
+#	having this level. The command is actually a command prefix
+#	and this facility will append 2 arguments before calling it,
+#	the level of the message and the message itself, in this
+#	order.
+#
+# Arguments:
+#	chan	The channel to use for all levels.
+#
+# Side Effects:
+#	See above.
+#
+# Results:
+#	None.
+
+proc ::log::lvChannelForall {chan} {
+    variable channelMap
+    variable levels
+
+    foreach l $levels {
+	set channelMap($l) $chan
+    }
+    return
+}
+
+# log::lvColor --
+#
+#	Defines for the specified level the color to return for it in
+#	a call to ::log::lv2color. Unique abbreviations of level names
+#	are allowed.
+#
+# Arguments:
+#	level	The level the color is for.
+#	color	The color to use for the specified level.
+#
+# Side Effects:
+#	See above.
+#
+# Results:
+#	None.
+
+proc ::log::lvColor {level color} {
+    variable colorMap
+    set level [lv2longform $level]
+    set colorMap($level) $color
+    return
+}
+
+# log::lvColorForall --
+#
+#	Defines for all known levels the color to return for it in a
+#	call to ::log::lv2color. Unique abbreviations of level names
+#	are allowed.
+#
+# Arguments:
+#	color	The color to use for all levels.
+#
+# Side Effects:
+#	See above.
+#
+# Results:
+#	None.
+
+proc ::log::lvColorForall {color} {
+    variable colorMap
+    variable levels
+
+    foreach l $levels {
+	set colorMap($l) $color
+    }
+    return
+}
+
+# log::logarray --
+#
+#	Similar to parray, except that the contents of the array
+#	printed out through the log system instead of directly
+#	to stdout.
+#
+#	See also 'log::log' for a general explanation
+#
+# Arguments:
+#	level		The level of the message.
+#	arrayvar	The name of the array varaibe to dump
+#	pattern		Optional pattern to restrict the dump
+#			to certain elements in the array.
+#
+# Side Effects:
+#	See above.
+#
+# Results:
+#	None.
+
+proc ::log::logarray {level arrayvar {pattern *}} {
+    variable cmdMap
+
+    if {[lvIsSuppressed $level]} {
+	# Ignore messages for suppressed levels.
+	return
+    }
+
+    set level [lv2longform $level]
+
+    set cmd $cmdMap($level)
+    if {$cmd == {}} {
+	# Ignore messages for levels without a command
+	return
+    }
+
+    upvar 1 $arrayvar array
+    if {![array exists array]} {
+        error "\"$arrayvar\" isn't an array"
+    }
+    set maxl 0
+    foreach name [lsort [array names array $pattern]] {
+        if {[string length $name] > $maxl} {
+            set maxl [string length $name]
+        }
+    }
+    set maxl [expr {$maxl + [string length $arrayvar] + 2}]
+    foreach name [lsort [array names array $pattern]] {
+        set nameString [format %s(%s) $arrayvar $name]
+
+	eval [linsert $cmd end $level \
+		[format "%-*s = %s" $maxl $nameString $array($name)]]
+    }
+    return
+}
+
+# log::loghex --
+#
+#	Like 'log::log', except that the logged data is assumed to
+#	be binary and is logged as a block of hex numbers.
+#
+#	See also 'log::log' for a general explanation
+#
+# Arguments:
+#	level	The level of the message.
+#	text	Message printed before the hex block
+#	data	Binary data to show as hex.
+#
+# Side Effects:
+#	See above.
+#
+# Results:
+#	None.
+
+proc ::log::loghex {level text data} {
+    variable cmdMap
+
+    if {[lvIsSuppressed $level]} {
+	# Ignore messages for suppressed levels.
+	return
+    }
+
+    set level [lv2longform $level]
+
+    set cmd $cmdMap($level)
+    if {$cmd == {}} {
+	# Ignore messages for levels without a command
+	return
+    }
+
+    # Format the messages and print them.
+
+    set len [string length $data]
+
+    eval [linsert $cmd end $level "$text ($len bytes):"]
+
+    set address ""
+    set hexnums ""
+    set ascii   ""
+
+    for {set i 0} {$i < $len} {incr i} {
+        set v [string index $data $i]
+        binary scan $v H2 hex
+        binary scan $v c  num
+        set num [expr {($num + 0x100) % 0x100}]
+
+        set text .
+        if {$num > 31} {set text $v} 
+
+        if {($i % 16) == 0} {
+            if {$address != ""} {
+                eval [linsert $cmd end $level [format "%4s  %-48s  |%s|" $address $hexnums $ascii]]
+                set address ""
+                set hexnums ""
+                set ascii   ""
+            }
+            append address [format "%04d" $i]
+        }
+        append hexnums "$hex "
+        append ascii   $text
+    }
+    if {$address != ""} {
+	eval [linsert $cmd end $level [format "%4s  %-48s  |%s|" $address $hexnums $ascii]]
+    }
+    eval [linsert $cmd end $level ""]
+    return
+}
+
+# log::log --
+#
+#	Log a message according to the specifications for commands,
+#	channels and suppression. In other words: The command will do
+#	nothing if the specified level is suppressed. If it is not
+#	suppressed the actual logging is delegated to the specified
+#	command. If there is no command specified for the level the
+#	message won't be logged. The standard command ::log::Puts will
+#	write the message to the channel specified for the given
+#	level. If no channel is specified for the level the message
+#	won't be logged. Unique abbreviations of level names are
+#	allowed. Errors in the actual logging command are *not*
+#	catched, but propagated to the caller, as they may indicate
+#	misconfigurations of the log facility or errors in the callers
+#	code itself.
+#
+# Arguments:
+#	level	The level of the message.
+#	text	The message to log.
+#
+# Side Effects:
+#	See above.
+#
+# Results:
+#	None.
+
+proc ::log::log {level text} {
+    variable cmdMap
+
+    if {[lvIsSuppressed $level]} {
+	# Ignore messages for suppressed levels.
+	return
+    }
+
+    set level [lv2longform $level]
+
+    set cmd $cmdMap($level)
+    if {$cmd == {}} {
+	# Ignore messages for levels without a command
+	return
+    }
+
+    # Delegate actual logging to the command.
+    # Handle multi-line messages correctly.
+
+    foreach line [split $text \n] {
+	eval [linsert $cmd end $level $line]
+    }
+    return
+}
+
+# log::logMsg --
+#
+#	Convenience wrapper around ::log::log. Equivalent to
+#	'::log::log info text'.
+#
+# Arguments:
+#	text	The message to log.
+#
+# Side Effects:
+#	See ::log::log.
+#
+# Results:
+#	None.
+
+proc ::log::logMsg {text} {
+    log info $text
+}
+
+# log::logError --
+#
+#	Convenience wrapper around ::log::log. Equivalent to
+#	'::log::log error text'.
+#
+# Arguments:
+#	text	The message to log.
+#
+# Side Effects:
+#	See ::log::log.
+#
+# Results:
+#	None.
+
+proc ::log::logError {text} {
+    log error $text
+}
+
+# log::logsubst --
+#
+#	Log a message with command and variable substitution in the caller
+#	scope. The substitutions are only executed in the log case for
+#	performance reasons. Any substitution errors rise a command error.
+#
+# Arguments:
+#	level	The level of the message.
+#	text	The message to log.
+#
+# Side Effects:
+#	See above.
+#
+# Results:
+#	None.
+
+proc ::log::logsubst {level text} {
+    variable cmdMap
+
+    if {[lvIsSuppressed $level]} {
+	# Ignore messages for suppressed levels.
+	return
+    }
+
+    set level [lv2longform $level]
+
+    set cmd $cmdMap($level)
+    if {$cmd == {}} {
+	# Ignore messages for levels without a command
+	return
+    }
+    
+    set text [uplevel 1 [list subst $text]]
+
+    # Delegate actual logging to the command.
+    # Handle multi-line messages correctly.
+
+    foreach line [split $text \n] {
+	eval [linsert $cmd end $level $line]
+    }
+    return
+}
+
+# log::Puts --
+#
+#	Standard log command, writing messages and levels to
+#	user-specified channels. Assumes that the supression checks
+#	were done by the caller. Expects full level names,
+#	abbreviations are *not allowed*.
+#
+# Arguments:
+#	level	The level of the message. 
+#	text	The message to log.
+#
+# Side Effects:
+#	Writes into channels.
+#
+# Results:
+#	None.
+
+proc ::log::Puts {level text} {
+    variable channelMap
+    variable fill
+
+    set chan $channelMap($level)
+    if {$chan == {}} {
+	# Ignore levels without channel.
+	return
+    }
+
+    puts  $chan "$level$fill($level) $text"
+    flush $chan
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Initialization code. Disable logging for the lower levels by
+## default.
+
+## log::lvSuppressLE emergency
+log::lvSuppressLE warning
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/logger.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/logger.tcl
new file mode 100644
index 00000000..22b8c7f8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/logger.tcl
@@ -0,0 +1,1297 @@
+# logger.tcl --
+#
+#   Tcl implementation of a general logging facility.
+#
+# Copyright (c) 2003      by David N. Welton <davidw@dedasys.com>
+# Copyright (c) 2004-2011 by Michael Schlenker <mic42@users.sourceforge.net>
+# Copyright (c) 2006,2015 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file license.terms.
+
+# The logger package provides an 'object oriented' log facility that
+# lets you have trees of services, that inherit from one another.
+# This is accomplished through the use of Tcl namespaces.
+
+
+package require Tcl 8.2
+package provide logger 0.9.4
+
+namespace eval ::logger {
+    namespace eval tree {}
+    namespace export init enable disable services servicecmd import
+
+    # The active services.
+    variable services {}
+
+    # The log 'levels'.
+    variable levels [list debug info notice warn error critical alert emergency]
+
+    # The default global log level used for new logging services
+    variable enabled "debug"
+
+    # Tcl return codes (in numeric order)
+    variable RETURN_CODES   [list "ok" "error" "return" "break" "continue"]
+}
+
+# Try to load msgcat and fall back to format if it fails
+if {[catch {package require msgcat}]} {
+  interp alias {} ::logger::mc {} ::format
+} else {
+  namespace eval ::logger {
+    namespace import ::msgcat::mc
+  }
+}
+
+# ::logger::_nsExists --
+#
+#   Workaround for missing namespace exists in Tcl 8.2 and 8.3.
+#
+
+if {[package vcompare [package provide Tcl] 8.4] < 0} {
+    proc ::logger::_nsExists {ns} {
+        expr {![catch {namespace parent $ns}]}
+    }
+} else {
+    proc ::logger::_nsExists {ns} {
+        namespace exists $ns
+    }
+}
+
+# ::logger::_cmdPrefixExists --
+#
+# Utility function to check if a given callback prefix exists,
+# this should catch all oddities in prefix names, including spaces,
+# glob patterns, non normalized namespaces etc.
+#
+# Arguments:
+#   prefix - The command prefix to check
+#
+# Results:
+#   1 or 0 for yes or no
+#
+proc ::logger::_cmdPrefixExists {prefix} {
+    set cmd [lindex $prefix 0]
+    set full [namespace eval :: namespace which [list $cmd]]
+    if {[string equal $full ""]} {return 0} else {return 1}
+    # normalize namespaces
+    set ns [namespace qualifiers $cmd]
+    set cmd ${ns}::[namespace tail $cmd]
+    set matches [::info commands ${ns}::*]
+    if {[lsearch -exact $matches $cmd] != -1} {return 1}
+    return 0
+}
+
+# ::logger::walk --
+#
+#   Walk namespaces, starting in 'start', and evaluate 'code' in
+#   them.
+#
+# Arguments:
+#   start - namespace to start in.
+#   code - code to execute in namespaces walked.
+#
+# Side Effects:
+#   Side effects of code executed.
+#
+# Results:
+#   None.
+
+proc ::logger::walk { start code } {
+    set children [namespace children $start]
+    foreach c $children {
+    logger::walk $c $code
+    namespace eval $c $code
+    }
+}
+
+proc ::logger::init {service} {
+    variable levels
+    variable services
+    variable enabled
+
+    if {[string length [string trim $service {:}]] == 0} {
+        return -code error \
+               -errorcode [list LOGGER EMPTY_SERVICENAME] \
+               [::logger::mc "Service name invalid. May not consist only of : or be empty"]
+    }
+    # We create a 'tree' namespace to house all the services, so
+    # they are in a 'safe' namespace sandbox, and won't overwrite
+    # any commands.
+    namespace eval tree::${service} {
+        variable service
+        variable levels
+        variable oldname
+        variable enabled
+    }
+
+    lappend services $service
+
+    set [namespace current]::tree::${service}::service $service
+    set [namespace current]::tree::${service}::levels $levels
+    set [namespace current]::tree::${service}::oldname $service
+    set [namespace current]::tree::${service}::enabled $enabled
+
+    namespace eval tree::${service} {
+	# Callback to use when the service in question is shut down.
+	variable delcallback [namespace current]::no-op
+
+	# Callback when the loglevel is changed
+	variable levelchangecallback [namespace current]::no-op
+
+	# State variable to decide when to call levelcallback
+	variable inSetLevel 0
+
+	# The currently configured levelcommands
+	variable lvlcmds
+	array set lvlcmds {}
+
+	# List of procedures registered via the trace command
+	variable traceList ""
+
+	# Flag indicating whether or not tracing is currently enabled
+	variable tracingEnabled 0
+
+	# We use this to disable a service completely.  In Tcl 8.4
+	# or greater, by using this, disabled log calls are a
+	# no-op!
+
+	proc no-op args {}
+
+	proc stdoutcmd {level text} {
+	    variable service
+	    puts "\[[clock format [clock seconds]]\] \[$service\] \[$level\] \'$text\'"
+	}
+
+	proc stderrcmd {level text} {
+	    variable service
+	    puts stderr "\[[clock format [clock seconds]]\] \[$service\] \[$level\] \'$text\'"
+	}
+
+
+	# setlevel --
+	#
+	#   This command differs from enable and disable in that
+	#   it disables all the levels below that selected, and
+	#   then enables all levels above it, which enable/disable
+	#   do not do.
+	#
+	# Arguments:
+	#   lv - the level, as defined in $levels.
+	#
+	# Side Effects:
+	#   Runs disable for the level, and then enable, in order
+	#   to ensure that all levels are set correctly.
+	#
+	# Results:
+	#   None.
+
+
+	proc setlevel {lv} {
+	    variable inSetLevel 1
+	    set oldlvl [currentloglevel]
+
+	    # do not allow enable and disable to do recursion
+	    if {[catch {
+		disable $lv 0
+		set newlvl [enable $lv 0]
+	    } msg] == 1} {
+		return -code error -errorcode $::errorCode $msg
+	    }
+	    # do the recursion here
+	    logger::walk [namespace current] [list setlevel $lv]
+
+	    set inSetLevel 0
+	    lvlchangewrapper $oldlvl $newlvl
+	    return
+	}
+
+	# enable --
+	#
+	#   Enable a particular 'level', and above, for the
+	#   service, and its 'children'.
+	#
+	# Arguments:
+	#   lv - the level, as defined in $levels.
+	#
+	# Side Effects:
+	#   Enables logging for the particular level, and all
+	#   above it (those more important).  It also walks
+	#   through all services that are 'children' and enables
+	#   them at the same level or above.
+	#
+	# Results:
+	#   None.
+
+	proc enable {lv {recursion 1}} {
+	    variable levels
+	    set lvnum [lsearch -exact $levels $lv]
+	    if { $lvnum == -1 } {
+		return -code error \
+		    -errorcode [list LOGGER INVALID_LEVEL] \
+		    [::logger::mc "Invalid level '%s' - levels are %s" $lv $levels]
+	    }
+
+	    variable enabled
+	    set newlevel $enabled
+	    set elnum [lsearch -exact $levels $enabled]
+	    if {($elnum == -1) || ($elnum > $lvnum)} {
+		set newlevel $lv
+	    }
+
+	    variable service
+	    while { $lvnum <  [llength $levels] } {
+		interp alias {} [namespace current]::[lindex $levels $lvnum] \
+		    {} [namespace current]::[lindex $levels $lvnum]cmd
+		incr lvnum
+	    }
+
+	    if {$recursion} {
+		logger::walk [namespace current] [list enable $lv]
+	    }
+	    lvlchangewrapper $enabled $newlevel
+	    set enabled $newlevel
+	}
+
+	# disable --
+	#
+	#   Disable a particular 'level', and below, for the
+	#   service, and its 'children'.
+	#
+	# Arguments:
+	#   lv - the level, as defined in $levels.
+	#
+	# Side Effects:
+	#   Disables logging for the particular level, and all
+	#   below it (those less important).  It also walks
+	#   through all services that are 'children' and disables
+	#   them at the same level or below.
+	#
+	# Results:
+	#   None.
+
+	proc disable {lv {recursion 1}} {
+	    variable levels
+	    set lvnum [lsearch -exact $levels $lv]
+	    if { $lvnum == -1 } {
+		return -code error \
+		    -errorcode [list LOGGER INVALID_LEVEL] \
+		    [::logger::mc "Invalid level '%s' - levels are %s" $lv $levels]
+	    }
+
+	    variable enabled
+	    set newlevel $enabled
+	    set elnum [lsearch -exact $levels $enabled]
+	    if {($elnum > -1) && ($elnum <= $lvnum)} {
+		if {$lvnum+1 >= [llength $levels]} {
+		    set newlevel "none"
+		} else {
+		    set newlevel [lindex $levels [expr {$lvnum+1}]]
+		}
+	    }
+
+	    while { $lvnum >= 0 } {
+
+		interp alias {} [namespace current]::[lindex $levels $lvnum] {} \
+		    [namespace current]::no-op
+		incr lvnum -1
+	    }
+	    if {$recursion} {
+		logger::walk [namespace current] [list disable $lv]
+	    }
+	    lvlchangewrapper $enabled $newlevel
+	    set enabled $newlevel
+	}
+
+	# currentloglevel --
+	#
+	#   Get the currently enabled log level for this service.
+	#
+	# Arguments:
+	#   none
+	#
+	# Side Effects:
+	#   none
+	#
+	# Results:
+	#   current log level
+	#
+
+	proc currentloglevel {} {
+	    variable enabled
+	    return $enabled
+	}
+
+	# lvlchangeproc --
+	#
+	#   Set or introspect a callback for when the logger instance
+	#   changes its loglevel.
+	#
+	# Arguments:
+	#   cmd - the Tcl command to call, it is called with two parameters, old and new log level.
+	#   or none for introspection
+	#
+	# Side Effects:
+	#   None.
+	#
+	# Results:
+	#   If no arguments are given return the current callback cmd.
+
+	proc lvlchangeproc {args} {
+	    variable levelchangecallback
+
+	    switch -exact -- [llength [::info level 0]] {
+                1   {return $levelchangecallback}
+                2   {
+		    if {[::logger::_cmdPrefixExists [lindex $args 0]]} {
+                        set levelchangecallback [lindex $args 0]
+		    } else {
+                        return -code error \
+			    -errorcode [list LOGGER INVALID_CMD] \
+			    [::logger::mc "Invalid cmd '%s' - does not exist" [lindex $args 0]]
+		    }
+		}
+                default {
+                    return -code error \
+			-errorcode [list LOGGER WRONG_NUM_ARGS] \
+			[::logger::mc "Wrong # of arguments. Usage: \${log}::lvlchangeproc ?cmd?"]
+                }
+	    }
+	}
+
+	proc lvlchangewrapper {old new} {
+	    variable inSetLevel
+
+	    # we are called after disable and enable are finished
+	    if {$inSetLevel} {return}
+
+	    # no action if level does not change
+	    if {[string equal $old $new]} {return}
+
+	    variable levelchangecallback
+	    # no action if levelchangecallback isn't a valid command
+	    if {[::logger::_cmdPrefixExists $levelchangecallback]} {
+		catch {
+		    uplevel \#0 [linsert $levelchangecallback end $old $new]
+		}
+	    }
+	}
+
+	# logproc --
+	#
+	#   Command used to create a procedure that is executed to
+	#   perform the logging.  This could write to disk, out to
+	#   the network, or something else.
+	#   If two arguments are given, use an existing command.
+	#   If three arguments are given, create a proc.
+	#
+	# Arguments:
+	#   lv - the level to log, which must be one of $levels.
+	#   args - either zero, one or two arguments.
+	#          if zero this returns the current command registered
+	#          if one, this is a cmd name that is called for this level
+	#          if two, these are an argument and proc body
+	#
+	# Side Effects:
+	#   Creates a logging command to take care of the details
+	#   of logging an event.
+	#
+	# Results:
+	#   If called with zero length args, returns the name of the currently
+	#   configured logging procedure.
+	#
+	#
+
+	proc logproc {lv args} {
+	    variable levels
+	    variable lvlcmds
+
+	    set lvnum [lsearch -exact $levels $lv]
+	    if { ($lvnum == -1) && ($lv != "trace") } {
+		return -code error \
+		    -errorcode [list LOGGER INVALID_LEVEL] \
+		    [::logger::mc "Invalid level '%s' - levels are %s" $lv $levels]
+	    }
+	    switch -exact -- [llength $args] {
+		0  {
+		    return $lvlcmds($lv)
+		}
+		1  {
+		    set cmd [lindex $args 0]
+		    if {[string equal "[namespace current]::${lv}cmd" $cmd]} {return}
+		    if {[llength [::info commands $cmd]]} {
+			proc ${lv}cmd args [format {
+			    uplevel 1 [list %s [expr {[llength $args]==1 ? [lindex $args end] : $args}]]
+			} $cmd]
+		    } else {
+			return -code error \
+			    -errorcode [list LOGGER INVALID_CMD] \
+			    [::logger::mc "Invalid cmd '%s' - does not exist" $cmd]
+		    }
+		    set lvlcmds($lv) $cmd
+		}
+		2  {
+		    foreach {arg body} $args {break}
+		    proc ${lv}cmd args [format {\
+						    _setservicename args
+			set val [%s [expr {[llength $args]==1 ? [lindex $args end] : $args}]]
+			_restoreservice
+			set val} ${lv}customcmd]
+		    proc ${lv}customcmd $arg $body
+		    set lvlcmds($lv) [namespace current]::${lv}customcmd
+		}
+		default {
+		    return -code error \
+			-errorcode [list LOGGER WRONG_USAGE] \
+			[::logger::mc \
+			     "Usage: \${log}::logproc level ?cmd?\nor \${log}::logproc level argname body" ]
+		}
+	    }
+	}
+
+
+	# delproc --
+	#
+	#   Set or introspect a callback for when the logger instance
+	#   is deleted.
+	#
+	# Arguments:
+	#   cmd - the Tcl command to call.
+	#   or none for introspection
+	#
+	# Side Effects:
+	#   None.
+	#
+	# Results:
+	#   If no arguments are given return the current callback cmd.
+
+	proc delproc {args} {
+	    variable delcallback
+
+	    switch -exact -- [llength [::info level 0]] {
+                1   {return $delcallback}
+                2   { if {[::logger::_cmdPrefixExists [lindex $args 0]]} {
+		    set delcallback [lindex $args 0]
+		} else {
+		    return -code error \
+			-errorcode [list LOGGER INVALID_CMD] \
+			[::logger::mc "Invalid cmd '%s' - does not exist" [lindex $args 0]]
+		}
+		}
+                default {
+                    return -code error \
+			-errorcode [list LOGGER WRONG_NUM_ARGS] \
+			[::logger::mc "Wrong # of arguments. Usage: \${log}::delproc ?cmd?"]
+                }
+	    }
+	}
+
+
+	# delete --
+	#
+	#   Delete the namespace and its children.
+
+	proc delete {} {
+	    variable delcallback
+	    variable service
+
+	    logger::walk [namespace current] delete
+	    if {[::logger::_cmdPrefixExists $delcallback]} {
+		uplevel \#0 [lrange $delcallback 0 end]
+	    }
+	    # clean up the global services list
+	    set idx [lsearch -exact [logger::services] $service]
+	    if {$idx !=-1} {
+		set ::logger::services [lreplace [logger::services] $idx $idx]
+	    }
+
+	    namespace delete [namespace current]
+
+	}
+
+	# services --
+	#
+	#   Return all child services
+
+	proc services {} {
+	    variable service
+
+	    set children [list]
+	    foreach srv [logger::services] {
+		if {[string match "${service}::*" $srv]} {
+		    lappend children $srv
+		}
+	    }
+	    return $children
+	}
+
+	# servicename --
+	#
+	#   Return the name of the service
+
+	proc servicename {} {
+	    variable service
+	    return $service
+	}
+
+	proc _setservicename {argname} {
+	    variable service
+	    variable oldname
+	    upvar 1 $argname arg
+	    if {[llength $arg] <= 1} {
+		return
+	    }
+
+	    set count -1
+	    set newname ""
+	    while {[string equal [lindex $arg [expr {$count+1}]] "-_logger::service"]} {
+		incr count 2
+		set newname [lindex $arg $count]
+	    }
+	    if {[string equal $newname ""]} {
+		return
+	    }
+	    set oldname $service
+	    set service $newname
+	    # Pop off "-_logger::service <service>" from argument list
+	    set arg [lreplace $arg 0 $count]
+	}
+
+	proc _restoreservice {} {
+	    variable service
+	    variable oldname
+	    set service $oldname
+	    return
+	}
+
+	proc trace { action args } {
+	    variable service
+
+	    # Allow other boolean values (true, false, yes, no, 0, 1) to be used
+	    # as synonymns for "on" and "off".
+
+	    if {[string is boolean $action]} {
+		set xaction [expr {($action && 1) ? "on" : "off"}]
+	    } else {
+		set xaction $action
+	    }
+
+	    # Check for required arguments for actions/subcommands and dispatch
+	    # to the appropriate procedure.
+
+	    switch -- $xaction {
+		"status" {
+		    return [uplevel 1 [list logger::_trace_status $service $args]]
+		}
+		"on" {
+		    if {[llength $args]} {
+			return -code error \
+			    -errorcode [list LOGGER WRONG_NUM_ARGS] \
+                            [::logger::mc "wrong # args: should be \"trace on\""]
+		    }
+		    return [logger::_trace_on $service]
+		}
+		"off" {
+		    if {[llength $args]} {
+			return -code error \
+			    -errorcode [list LOGGER WRONG_NUM_ARGS] \
+                            [::logger::mc "wrong # args: should be \"trace off\""]
+		    }
+		    return [logger::_trace_off $service]
+		}
+		"add" {
+		    if {![llength $args]} {
+			return -code error \
+			    -errorcode [list LOGGER WRONG_NUM_ARGS] \
+			    [::logger::mc "wrong # args: should be \"trace add ?-ns? <proc> ...\""]
+		    }
+		    return [uplevel 1 [list ::logger::_trace_add $service $args]]
+		}
+		"remove" {
+		    if {![llength $args]} {
+			return -code error \
+			    -errorcode [list LOGGER WRONG_NUM_ARGS] \
+                            [::logger::mc "wrong # args: should be \"trace remove ?-ns? <proc> ...\""]
+		    }
+		    return [uplevel 1 [list ::logger::_trace_remove $service $args]]
+		}
+
+		default {
+		    return -code error \
+			-errorcode [list LOGGER INVALID_ARG] \
+			[::logger::mc "Invalid action \"%s\": must be status, add, remove,\
+                    on, or off" $action]
+		}
+	    }
+	}
+
+	# Walk the parent service namespaces to see first, if they
+	# exist, and if any are enabled, and then, as a
+	# consequence, enable this one
+	# too.
+
+	enable $enabled
+	variable parent [namespace parent]
+	while {[string compare $parent "::logger::tree"]} {
+	    # If the 'enabled' variable doesn't exist, create the
+	    # whole thing.
+	    if { ! [::info exists ${parent}::enabled] } {
+		logger::init [string range $parent 16 end]
+	    }
+	    set enabled [set ${parent}::enabled]
+	    enable $enabled
+	    set parent [namespace parent $parent]
+	}
+    }
+
+    # Now create the commands for different levels.
+
+    namespace eval tree::${service} {
+	set parent [namespace parent]
+
+	# We 'inherit' the commands from the parents.  This
+	# means that, if you want to share the same methods with
+	# children, they should be instantiated after the parent's
+	# methods have been defined.
+
+	variable lvl ; # prevent creative writing to the global scope
+	if {[string compare $parent "::logger::tree"]} {
+	    foreach lvl [::logger::levels] {
+		# OPTIMIZE: do not allow multiple aliases in the hierarchy
+		#           they can always be replaced by more efficient
+		#           direct aliases to the target procs.
+		interp alias {} [namespace current]::${lvl}cmd \
+		    {} ${parent}::${lvl}cmd -_logger::service $service
+	    }
+	    # inherit the starting loglevel of the parent service
+	    setlevel [${parent}::currentloglevel]
+	} else {
+	    foreach lvl [concat [::logger::levels] "trace"] {
+		proc ${lvl}cmd args [format {\
+						 _setservicename args
+		    set val [stdoutcmd %s [expr {[llength $args]==1 ? [lindex $args end] : $args}]]
+		    _restoreservice
+		    set val } $lvl]
+
+		set lvlcmds($lvl) [namespace current]::${lvl}cmd
+	    }
+	    setlevel $::logger::enabled
+	}
+	unset lvl ; # drop the temp iteration variable
+    }
+
+    return ::logger::tree::${service}
+}
+
+# ::logger::services --
+#
+#   Returns a list of all active services.
+#
+# Arguments:
+#   None.
+#
+# Side Effects:
+#   None.
+#
+# Results:
+#   List of active services.
+
+proc ::logger::services {} {
+    variable services
+    return $services
+}
+
+# ::logger::enable --
+#
+#   Global enable for a certain level.  NOTE - this implementation
+#   isn't terribly effective at the moment, because it might hit
+#   children before their parents, who will then walk down the
+#   tree attempting to disable the children again.
+#
+# Arguments:
+#   lv - level above which to enable logging.
+#
+# Side Effects:
+#   Enables logging in a given level, and all higher levels.
+#
+# Results:
+#   None.
+
+proc ::logger::enable {lv} {
+    variable services
+    if {[catch {
+        foreach sv $services {
+        ::logger::tree::${sv}::enable $lv
+        }
+    } msg] == 1} {
+        return -code error -errorcode $::errorCode $msg
+    }
+}
+
+proc ::logger::disable {lv} {
+    variable services
+    if {[catch {
+        foreach sv $services {
+        ::logger::tree::${sv}::disable $lv
+        }
+    } msg] == 1} {
+        return -code error -errorcode $::errorCode $msg
+    }
+}
+
+proc ::logger::setlevel {lv} {
+    variable services
+    variable enabled
+    variable levels
+    if {[lsearch -exact $levels $lv] == -1} {
+        return -code error \
+               -errorcode [list LOGGER INVALID_LEVEL] \
+               [::logger::mc "Invalid level '%s' - levels are %s" $lv $levels]
+    }
+    set enabled $lv
+    if {[catch {
+        foreach sv $services {
+        ::logger::tree::${sv}::setlevel $lv
+        }
+    } msg] == 1} {
+        return -code error -errorcode $::errorCode $msg
+    }
+}
+
+# ::logger::levels --
+#
+#   Introspect the available log levels.  Provided so a caller does
+#   not need to know implementation details or code the list
+#   himself.
+#
+# Arguments:
+#   None.
+#
+# Side Effects:
+#   None.
+#
+# Results:
+#   levels - The list of valid log levels accepted by enable and disable
+
+proc ::logger::levels {} {
+    variable levels
+    return $levels
+}
+
+# ::logger::servicecmd --
+#
+#   Get the command token for a given service name.
+#
+# Arguments:
+#   service - name of the service.
+#
+# Side Effects:
+#   none
+#
+# Results:
+#   log - namespace token for this service
+
+proc ::logger::servicecmd {service} {
+    variable services
+    if {[lsearch -exact $services $service] == -1} {
+        return -code error \
+               -errorcode [list LOGGER NO_SUCH_SERVICE] \
+               [::logger::mc "Service \"%s\" does not exist." $service]
+    }
+    return "::logger::tree::${service}"
+}
+
+# ::logger::import --
+#
+#   Import the logging commands.
+#
+# Arguments:
+#   service - name of the service.
+#
+# Side Effects:
+#   creates aliases in the target namespace
+#
+# Results:
+#   none
+
+proc ::logger::import {args} {
+    variable services
+
+    if {[llength $args] == 0 || [llength $args] > 7} {
+    return -code error \
+           -errorcode [list LOGGER WRONG_NUM_ARGS] \
+           [::logger::mc \
+                       "Wrong # of arguments: \"logger::import ?-all?\
+                        ?-force?\
+                        ?-prefix prefix? ?-namespace namespace? service\""]
+    }
+
+    # process options
+    #
+    set import_all 0
+    set force 0
+    set prefix ""
+    set ns [uplevel 1 namespace current]
+    while {[llength $args] > 1} {
+        set opt [lindex $args 0]
+        set args [lrange $args 1 end]
+        switch  -exact -- $opt {
+            -all    { set import_all 1}
+            -prefix { set prefix [lindex $args 0]
+                      set args [lrange $args 1 end]
+                    }
+            -namespace {
+                      set ns [lindex $args 0]
+                      set args [lrange $args 1 end]
+            }
+            -force {
+                     set force 1
+            }
+            default {
+                return -code error \
+                       -errorcode [list LOGGER UNKNOWN_ARG] \
+                       [::logger::mc \
+                       "Unknown argument: \"%s\" :\nUsage:\
+                      \"logger::import ?-all? ?-force?\
+                        ?-prefix prefix? ?-namespace namespace? service\"" $opt]
+            }
+        }
+    }
+
+    #
+    # build the list of commands to import
+    #
+
+    set cmds [logger::levels]
+    lappend cmds "trace"
+    if {$import_all} {
+        lappend cmds setlevel enable disable logproc delproc services
+        lappend cmds servicename currentloglevel delete
+    }
+
+    #
+    # check the service argument
+    #
+
+    set service [lindex $args 0]
+    if {[lsearch -exact $services $service] == -1} {
+            return -code error \
+                   -errorcode [list LOGGER NO_SUCH_SERVICE] \
+                   [::logger::mc "Service \"%s\" does not exist." $service]
+    }
+
+    #
+    # setup the namespace for the import
+    #
+
+    set sourcens [logger::servicecmd $service]
+    set localns  [uplevel 1 namespace current]
+
+    if {[string match ::* $ns]} {
+        set importns $ns
+    } else {
+        set importns ${localns}::$ns
+    }
+
+    # fake namespace exists for Tcl 8.2 - 8.3
+    if {![_nsExists $importns]} {
+        namespace eval $importns {}
+    }
+
+
+    #
+    # prepare the import
+    #
+
+    set imports ""
+    foreach cmd $cmds {
+        set cmdname ${importns}::${prefix}$cmd
+        set collision [llength [info commands $cmdname]]
+        if {$collision && !$force} {
+            return -code error \
+                   -errorcode [list LOGGER IMPORT_NAME_EXISTS] \
+                   [::logger::mc "can't import command \"%s\": already exists" $cmdname]
+        }
+        lappend imports ${importns}::${prefix}$cmd ${sourcens}::${cmd}
+    }
+
+    #
+    # and execute the aliasing after checking all is well
+    #
+
+    foreach {target source} $imports {
+        proc $target {args} "uplevel 1 \[linsert \$args 0 $source \]"
+    }
+}
+
+# ::logger::initNamespace --
+#
+#   Creates a logger for the specified namespace and makes the log
+#   commands available to said namespace as well. Allows the initial
+#   setting of a default log level.
+#
+# Arguments:
+#   ns    - Namespace to initialize, is also the service name, modulo a ::-prefix
+#   level - Initial log level, optional, defaults to 'warn'.
+#
+# Side Effects:
+#   creates aliases in the target namespace
+#
+# Results:
+#   none
+
+proc ::logger::initNamespace {ns {level {}}} {
+    set service [string trimleft $ns :]
+    if {$level == ""} {
+	# No user-specified level. Figure something out.
+	# - If the parent service exists then the 'logger::init'
+	#   below will automatically inherit its level. Good enough.
+	# - Without a parent service go and use a default level of 'warn'.
+	set parent    [string trimleft [namespace qualifiers $service] :]
+	set hasparent [expr {($parent != {}) && [_nsExists ::logger::tree::${parent}]}]
+	if {!$hasparent} {
+	    set level warn
+	}
+    }
+
+    namespace eval $ns [list ::logger::init $service]
+    namespace eval $ns [list ::logger::import -force -all -namespace log $service]
+    if {$level != ""} {
+	namespace eval $ns [list log::setlevel $level]
+    }
+    return
+}
+
+# This procedure handles the "logger::trace status" command.  Given no
+# arguments, returns a list of all procedures that have been registered
+# via "logger::trace add".  Given one or more procedure names, it will
+# return 1 if all were registered, or 0 if any were not.
+
+proc ::logger::_trace_status { service procList } {
+    upvar #0 ::logger::tree::${service}::traceList traceList
+
+    # If no procedure names were given, just return the registered list
+
+    if {![llength $procList]} {
+        return $traceList
+    }
+
+    # Get caller's namespace for qualifying unqualified procedure names
+
+    set caller_ns [uplevel 1 namespace current]
+    set caller_ns [string trimright $caller_ns ":"]
+
+    # Search for any specified proc names that are *not* registered
+
+    foreach procName $procList {
+        # Make sure the procedure namespace is qualified
+
+        if {![string match "::*" $procName]} {
+            set procName ${caller_ns}::$procName
+        }
+
+        # Check if the procedure has been registered for tracing
+
+        if {[lsearch -exact $traceList $procName] == -1} {
+	    return 0
+        }
+    }
+
+    return 1
+}
+
+# This procedure handles the "logger::trace on" command.  If tracing
+# is turned off, it will enable Tcl trace handlers for all of the procedures
+# registered via "logger::trace add".  Does nothing if tracing is already
+# turned on.
+
+proc ::logger::_trace_on { service } {
+    set tcl_version [package provide Tcl]
+
+    if {[package vcompare $tcl_version "8.4"] < 0} {
+        return -code error \
+               -errorcode [list LOGGER TRACE_NOT_AVAILABLE] \
+              [::logger::mc "execution tracing is not available in Tcl %s" $tcl_version]
+    }
+
+    namespace eval ::logger::tree::${service} {
+        if {!$tracingEnabled} {
+            set tracingEnabled 1
+            ::logger::_enable_traces $service $traceList
+        }
+    }
+
+    return 1
+}
+
+# This procedure handles the "logger::trace off" command.  If tracing
+# is turned on, it will disable Tcl trace handlers for all of the procedures
+# registered via "logger::trace add", leaving them in the list so they
+# tracing on all of them can be enabled again with "logger::trace on".
+# Does nothing if tracing is already turned off.
+
+proc ::logger::_trace_off { service } {
+    namespace eval ::logger::tree::${service} {
+        if {$tracingEnabled} {
+            ::logger::_disable_traces $service $traceList
+            set tracingEnabled 0
+        }
+    }
+
+    return 1
+}
+
+# This procedure is used by the logger::trace add and remove commands to
+# process the arguments in a common fashion.  If the -ns switch is given
+# first, this procedure will return a list of all existing procedures in
+# all of the namespaces given in remaining arguments.  Otherwise, each
+# argument is taken to be either a pattern for a glob-style search of
+# procedure names or, failing that, a namespace, in which case this
+# procedure returns a list of all the procedures matching the given
+# pattern (or all in the named namespace, if no procedures match).
+
+proc ::logger::_trace_get_proclist { inputList } {
+    set procList ""
+
+    if {[string equal [lindex $inputList 0] "-ns"]} {
+	# Verify that at least one target namespace was supplied
+
+	set inputList [lrange $inputList 1 end]
+	if {![llength $inputList]} {
+	    return -code error \
+                   -errorcode [list LOGGER TARGET_MISSING] \
+                   [::logger::mc "Must specify at least one namespace target"]
+	}
+
+	# Rebuild the argument list to contain namespace procedures
+
+	foreach namespace $inputList {
+            # Don't allow tracing of the logger (or child) namespaces
+
+	    if {![string match "::logger::*" $namespace]} {
+		set nsProcList  [::info procs ${namespace}::*]
+                set procList    [concat $procList $nsProcList]
+            }
+	}
+    } else {
+        # Search for procs or namespaces matching each of the specified
+        # patterns.
+
+        foreach pattern $inputList {
+	    set matches [uplevel 1 ::info proc $pattern]
+
+	    if {![llength $matches]} {
+	        if {[uplevel 1 namespace exists $pattern]} {
+		    set matches [::info procs ${pattern}::*]
+	        }
+
+                # Matched procs will be qualified due to above pattern
+
+                set procList [concat $procList $matches]
+            } elseif {[string match "::*" $pattern]} {
+                # Patterns were pre-qualified - add them directly
+
+                set procList [concat $procList $matches]
+            } else {
+                # Qualify each proc with the namespace it was in
+
+                set ns [uplevel 1 namespace current]
+                if {$ns == "::"} {
+                    set ns ""
+                }
+                foreach proc $matches {
+                    lappend procList ${ns}::$proc
+                }
+            }
+        }
+    }
+
+    return $procList
+}
+
+# This procedure handles the "logger::trace add" command.  If the tracing
+# feature is enabled, it will enable the Tcl entry and leave trace handlers
+# for each procedure specified that isn't already being traced.  Each
+# procedure is added to the list of procedures that the logger trace feature
+# should log when tracing is enabled.
+
+proc ::logger::_trace_add { service procList } {
+    upvar #0 ::logger::tree::${service}::traceList traceList
+
+    # Handle -ns switch and glob search patterns for procedure names
+
+    set procList [uplevel 1 [list logger::_trace_get_proclist $procList]]
+
+    # Enable tracing for each procedure that has not previously been
+    # specified via logger::trace add.  If tracing is off, this will just
+    # store the name of the procedure for later when tracing is turned on.
+
+    foreach procName $procList {
+        if {[lsearch -exact $traceList $procName] == -1} {
+            lappend traceList $procName
+            ::logger::_enable_traces $service [list $procName]
+        }
+    }
+}
+
+# This procedure handles the "logger::trace remove" command.  If the tracing
+# feature is enabled, it will remove the Tcl entry and leave trace handlers
+# for each procedure specified.  Each procedure is removed from the list
+# of procedures that the logger trace feature should log when tracing is
+# enabled.
+
+proc ::logger::_trace_remove { service procList } {
+    upvar #0 ::logger::tree::${service}::traceList traceList
+
+    # Handle -ns switch and glob search patterns for procedure names
+
+    set procList [uplevel 1 [list logger::_trace_get_proclist $procList]]
+
+    # Disable tracing for each proc that previously had been specified
+    # via logger::trace add.  If tracing is off, this will just
+    # remove the name of the procedure from the trace list so that it
+    # will be excluded when tracing is turned on.
+
+    foreach procName $procList {
+        set index [lsearch -exact $traceList $procName]
+        if {$index != -1} {
+            set traceList [lreplace $traceList $index $index]
+            ::logger::_disable_traces $service [list $procName]
+        }
+    }
+}
+
+# This procedure enables Tcl trace handlers for all procedures specified.
+# It is used both to enable Tcl's tracing for a single procedure when
+# removed via "logger::trace add", as well as to enable all traces
+# via "logger::trace on".
+
+proc ::logger::_enable_traces { service procList } {
+    upvar #0 ::logger::tree::${service}::tracingEnabled tracingEnabled
+
+    if {$tracingEnabled} {
+        foreach procName $procList {
+            ::trace add execution $procName enter \
+                [list ::logger::_trace_enter $service]
+            ::trace add execution $procName leave \
+                [list ::logger::_trace_leave $service]
+        }
+    }
+}
+
+# This procedure disables Tcl trace handlers for all procedures specified.
+# It is used both to disable Tcl's tracing for a single procedure when
+# removed via "logger::trace remove", as well as to disable all traces
+# via "logger::trace off".
+
+proc ::logger::_disable_traces { service procList } {
+    upvar #0 ::logger::tree::${service}::tracingEnabled tracingEnabled
+
+    if {$tracingEnabled} {
+        foreach procName $procList {
+            ::trace remove execution $procName enter \
+                [list ::logger::_trace_enter $service]
+            ::trace remove execution $procName leave \
+                [list ::logger::_trace_leave $service]
+        }
+    }
+}
+
+########################################################################
+# Trace Handlers
+########################################################################
+
+# This procedure is invoked upon entry into a procedure being traced
+# via "logger::trace add" when tracing is enabled via "logger::trace on"
+# to log information about how the procedure was called.
+
+proc ::logger::_trace_enter { service cmd op } {
+    # Parse the command
+    set procName [uplevel 1 namespace origin [lindex $cmd 0]]
+    set args     [lrange $cmd 1 end]
+
+    # Display the message prefix
+    set callerLvl [expr {[::info level] - 1}]
+    set calledLvl [::info level]
+
+    lappend message "proc" $procName
+    lappend message "level" $calledLvl
+    lappend message "script" [uplevel ::info script]
+
+    # Display the caller information
+    set caller ""
+    if {$callerLvl >= 1} {
+	# Display the name of the caller proc w/prepended namespace
+	catch {
+	    set callerProcName [lindex [::info level $callerLvl] 0]
+	    set caller [uplevel 2 namespace origin $callerProcName]
+	}
+    }
+
+    lappend message "caller" $caller
+
+    # Display the argument names and values
+    set argSpec [uplevel 1 ::info args $procName]
+    set argList ""
+    if {[llength $argSpec]} {
+	foreach argName $argSpec {
+            lappend argList $argName
+
+	    if {$argName == "args"} {
+                lappend argList $args
+                break
+	    } else {
+	        lappend argList [lindex $args 0]
+	        set args [lrange $args 1 end]
+            }
+	}
+    }
+
+    lappend message "procargs" $argList
+    set message [list $op $message]
+
+    ::logger::tree::${service}::tracecmd $message
+}
+
+# This procedure is invoked upon leaving into a procedure being traced
+# via "logger::trace add" when tracing is enabled via "logger::trace on"
+# to log information about the result of the procedure call.
+
+proc ::logger::_trace_leave { service cmd status rc op } {
+    variable RETURN_CODES
+
+    # Parse the command
+    set procName [uplevel 1 namespace origin [lindex $cmd 0]]
+
+    # Gather the caller information
+    set callerLvl [expr {[::info level] - 1}]
+    set calledLvl [::info level]
+
+    lappend message "proc" $procName "level" $calledLvl
+    lappend message "script" [uplevel ::info script]
+
+    # Get the name of the proc being returned to w/prepended namespace
+    set caller ""
+    catch {
+        set callerProcName [lindex [::info level $callerLvl] 0]
+        set caller [uplevel 2 namespace origin $callerProcName]
+    }
+
+    lappend message "caller" $caller
+
+    # Convert the return code from numeric to verbal
+
+    if {$status < [llength $RETURN_CODES]} {
+        set status [lindex $RETURN_CODES $status]
+    }
+
+    lappend message "status" $status
+    lappend message "result" $rc
+
+    # Display the leave message
+
+    set message [list $op $message]
+    ::logger::tree::${service}::tracecmd $message
+
+    return 1
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/loggerAppender.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/loggerAppender.tcl
new file mode 100644
index 00000000..bd003444
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/loggerAppender.tcl
@@ -0,0 +1,444 @@
+##Library Header
+#
+# Copyright (c) 2005 Cisco Systems, Inc.
+#
+# Name:
+#	::logger::appender
+#
+# Purpose:
+#	collection of appenders for tcllib logger
+#
+# Author:
+#	 Aamer Akhter / aakhter@cisco.com
+#
+# Support Alias:
+#       aakhter@cisco.com
+#
+# Usage:
+#	package require logger::appender
+#
+# Description:
+#	set of logger templates
+#      
+# Requirements:
+#       package require logger
+#       package require md5
+#
+# Variables:
+#       namespace   ::loggerExtension::
+#       id:         CVS ID: keyword extraction
+#       version:    current version of package
+#       packageDir: directory where package is located
+#       log:        instance log
+#
+# Notes:
+#       1.	
+#
+# Keywords:
+#	
+#
+# Category: 
+#       
+#
+# End of Header
+
+package require md5
+
+namespace eval ::logger::appender {
+    variable  fgcolor
+    array set fgcolor {
+	red      {31m}
+	red-bold {1;31m}
+	black    {m}
+	blue     {1m}
+	green    {32m}
+	yellow   {33m}
+	cyan     {36m}
+    }
+
+    variable  levelToColor
+    array set levelToColor {
+	debug     cyan
+	info      blue
+	notice    black
+	warn      red
+	error     red
+	critical  red-bold
+	alert     red-bold
+	emergency red-bold
+    }
+}
+
+
+
+##Procedure Header
+# Copyright (c) 2005 Cisco Systems, Inc.
+#
+# Name:
+#	::logger::appender::console
+#
+# Purpose:
+#	 
+#
+# Synopsis:
+#       ::logger::appender::console -level <level> -service <service> [options]
+#
+# Arguments:
+#       -level <level>
+#            name of level to fill in as 'priority' in log proc
+#       -service <service>
+#            name of service to fill in as 'category' in log proc
+#       -appenderArgs <appenderArgs>
+#            any additional args in list form
+#       -conversionPattern <conversionPattern>
+#            log pattern to use (see genLogProc)
+#       -procName <procName>
+#            explicitly set the proc name
+#       -procNameVar <procNameVar>
+#            name of variable to set in the calling context
+#            variable has name of proc 
+#
+#
+# Return Values:
+#	a runnable command 
+#
+# Description:
+#         
+#
+# Examples:
+#	
+#
+# Notes:
+#	1.
+#
+# End of Procedure Header 
+
+
+proc ::logger::appender::console {args} {
+    set usage {console 
+	?-level level?
+	?-service service? 
+	?-appenderArgs appenderArgs?
+    }
+    set bargs $args
+    set conversionPattern {\[%d\] \[%c\] \[%M\] \[%p\] %m}
+    while {[llength $args] > 1} {
+        set opt [lindex $args 0]
+        set args [lrange $args 1 end]
+        switch  -exact -- $opt {
+            -level { set level [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -service { set service [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -appenderArgs {
+		set appenderArgs [lindex $args 0]
+		set args [lrange $args 1 end]
+		set args [concat $args $appenderArgs]
+	    }
+	    -conversionPattern {
+		set conversionPattern [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -procName {
+		set procName [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -procNameVar {
+		set procNameVar [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+            default {
+                return -code error [msgcat::mc "Unknown argument: \"%s\" :\nUsage:\
+                %s" $opt $usage]
+            }
+        }
+    }
+    if {![info exists procName]} {
+	set procName [genProcName $bargs]
+    }
+    if {[info exists procNameVar]} {
+	upvar $procNameVar myProcNameVar
+    }
+    set procText \
+	[ ::logger::utils::createLogProc \
+	      -procName $procName \
+	      -conversionPattern $conversionPattern \
+	      -category $service \
+	      -priority $level ]
+    set myProcNameVar $procName
+    return $procText
+}
+
+
+
+##Procedure Header
+# Copyright (c) 2005 Cisco Systems, Inc.
+#
+# Name:
+#	::logger::appender::colorConsole
+#
+# Purpose:
+#	 
+#
+# Synopsis:
+#       ::logger::appender::console -level <level> -service <service> [options]
+#
+# Arguments:
+#       -level <level>
+#            name of level to fill in as 'priority' in log proc
+#       -service <service>
+#            name of service to fill in as 'category' in log proc
+#       -appenderArgs <appenderArgs>
+#            any additional args in list form
+#       -conversionPattern <conversionPattern>
+#            log pattern to use (see genLogProc)
+#       -procName <procName>
+#            explicitly set the proc name
+#       -procNameVar <procNameVar>
+#            name of variable to set in the calling context
+#            variable has name of proc 
+#
+#
+# Return Values:
+#	a runnable command 
+#
+# Description:
+#       provides colorized logs
+#
+# Examples:
+#	
+#
+# Notes:
+#	1.
+#
+# End of Procedure Header 
+
+
+proc ::logger::appender::colorConsole {args} {
+    variable fgcolor
+    set usage {console 
+	?-level level?
+	?-service service? 
+	?-appenderArgs appenderArgs?
+    }
+    set bargs $args
+    set conversionPattern {\[%d\] \[%c\] \[%M\] \[%p\] %m}
+    upvar 0 ::logger::appender::levelToColor colorMap
+    while {[llength $args] > 1} {
+        set opt [lindex $args 0]
+        set args [lrange $args 1 end]
+        switch  -exact -- $opt {
+            -level { set level [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -service { set service [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -appenderArgs {
+		set appenderArgs [lindex $args 0]
+		set args [lrange $args 1 end]
+		set args [concat $args $appenderArgs]
+	    }
+	    -conversionPattern {
+		set conversionPattern [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -procName {
+		set procName [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -procNameVar {
+		set procNameVar [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+            default {
+                return -code error [msgcat::mc "Unknown argument: \"%s\" :\nUsage:\
+                %s" $opt $usage]
+            }
+        }
+    }
+    if {![info exists procName]} {
+	set procName [genProcName $bargs]
+    }
+    upvar $procNameVar myProcNameVar
+    if {[info exists level]} {
+	#apply color
+	set colorCode $colorMap($level)
+	append newCPattern {\033\[} $fgcolor($colorCode) $conversionPattern {\033\[0m}
+	set conversionPattern $newCPattern
+    }
+    set procText \
+	[ ::logger::utils::createLogProc \
+	      -procName $procName \
+	      -conversionPattern $conversionPattern \
+	      -category $service \
+	      -priority $level ]
+    set myProcNameVar $procName
+    return $procText
+}
+
+##Procedure Header
+# Copyright (c) 2005 Cisco Systems, Inc.
+#
+# Name:
+#       ::logger::appender::fileAppend
+#
+# Purpose:
+#
+#
+# Synopsis:
+#       ::logger::appender::fileAppend -level <level> -service <service> -outputChannel <channel> [options]
+#
+# Arguments:
+#       -level <level>
+#            name of level to fill in as 'priority' in log proc
+#       -service <service>
+#            name of service to fill in as 'category' in log proc
+#       -appenderArgs <appenderArgs>
+#            any additional args in list form
+#       -conversionPattern <conversionPattern>
+#            log pattern to use (see genLogProc)
+#       -procName <procName>
+#            explicitly set the proc name
+#       -procNameVar <procNameVar>
+#            name of variable to set in the calling context
+#            variable has name of proc
+#       -outputChannel <channel>
+#            name of output channel (eg stdout, file handle)
+#
+#
+# Return Values:
+#       a runnable command
+#
+# Description:
+#
+#
+# Examples:
+#
+#
+# Notes:
+#       1.
+#
+# End of Procedure Header
+
+
+proc ::logger::appender::fileAppend {args} {
+    set usage {console
+	?-level level?
+	?-service service?
+	?-outputChannel channel?
+	?-appenderArgs appenderArgs?
+    }
+    set bargs $args
+    set conversionPattern {\[%d\] \[%c\] \[%M\] \[%p\] %m}
+    while {[llength $args] > 1} {
+	set opt [lindex $args 0]
+	set args [lrange $args 1 end]
+	switch  -exact -- $opt {
+	    -level { set level [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -service { set service [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -appenderArgs {
+		set appenderArgs [lindex $args 0]
+		set args [lrange $args 1 end]
+		set args [concat $args $appenderArgs]
+	    }
+	    -conversionPattern {
+		set conversionPattern [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -procName {
+		set procName [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -procNameVar {
+		set procNameVar [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -outputChannel {
+		set outputChannel [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    default {
+		return -code error [msgcat::mc "Unknown argument: \"%s\" :\nUsage:\
+  	                 %s" $opt $usage]
+	    }
+	}
+    }
+    if {![info exists procName]} {
+	set procName [genProcName $bargs]
+    }
+    if {[info exists procNameVar]} {
+	upvar $procNameVar myProcNameVar
+    }
+    set procText \
+	[ ::logger::utils::createLogProc \
+	      -procName $procName \
+	      -conversionPattern $conversionPattern \
+	      -category $service \
+	      -outputChannel $outputChannel \
+	      -priority $level ]
+    set myProcNameVar $procName
+    return $procText
+}
+  	 
+
+
+
+##Internal Procedure Header
+# Copyright (c) 2005 Cisco Systems, Inc.
+#
+# Name:
+#       ::logger::appender::genProcName
+#
+# Purpose:
+#        
+#
+# Synopsis:
+#       ::logger::appender::genProcName <args>
+#
+# Arguments:
+#       <formatString>
+#            string composed of formatting chars (see description)
+#
+#
+# Return Values:
+#       a runnable command 
+#
+# Description:
+#         
+#
+# Examples:
+#       ::loggerExtension::new param1
+#       ::loggerExtension::new param2
+#       ::loggerExtension::new param3 <option1>
+#
+#
+# Sample Input:
+#       (Optional) Sample of input to the proc provided by its argument values.
+#
+# Sample Output:
+#       (Optional) For procs that output to files, provide 
+#       sample of format of output produced.
+# Notes:
+#       1.
+#
+# End of Procedure Header 
+
+
+proc ::logger::appender::genProcName {args} {
+    set name [md5::md5 -hex $args]
+    return "::logger::appender::logProc-$name"
+}
+
+
+package provide logger::appender 1.3
+
+# ;;; Local Variables: ***
+# ;;; mode: tcl ***
+# ;;; End: ***
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/loggerUtils.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/loggerUtils.tcl
new file mode 100644
index 00000000..48ab2873
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/loggerUtils.tcl
@@ -0,0 +1,538 @@
+##Library Header
+#
+# Copyright (c) 2005 Cisco Systems, Inc.
+#
+# Name:
+#	::logger::utils::
+#
+# Purpose:
+#	an extension to the tcllib logger module
+#
+# Author:
+#	 Aamer Akhter / aakhter@cisco.com
+#
+# Support Alias:
+#       aakhter@cisco.com
+#
+# Usage:
+#	package require logger::utils
+#
+# Description:
+#	this extension adds template based appenders
+#
+# Requirements:
+#       package require logger
+#
+# Variables:
+#       namespace   ::logger::utils::
+#       id:         CVS ID: keyword extraction
+#       version:    current version of package
+#       packageDir: directory where package is located
+#       log:        instance log
+#
+# Notes:
+#       1.
+#
+# Keywords:
+#
+#
+# Category:
+#
+#
+# End of Header
+
+package require Tcl 8.4
+package require logger
+package require logger::appender
+package require msgcat
+
+namespace eval ::logger::utils {
+
+    variable packageDir [file dirname [info script]]
+    variable log        [logger::init logger::utils]
+
+    logger::import -force -namespace log logger::utils
+
+    # @mdgen OWNER: msgs/*.msg
+    ::msgcat::mcload [file join $packageDir msgs]
+}
+
+##Internal Procedure Header
+# Copyright (c) 2005 Cisco Systems, Inc.
+#
+# Name:
+#	::logger::utils::createFormatCmd
+#
+# Purpose:
+#
+#
+# Synopsis:
+#       ::logger::utils::createFormatCmd <formatString>
+#
+# Arguments:
+#       <formatString>
+#            string composed of formatting chars (see description)
+#
+#
+# Return Values:
+#	a runnable command
+#
+# Description:
+#       createFormatCmd translates <formatString> into an expandable
+#       command string.
+#
+#       The following are the known substitutions (from log4perl):
+#            %c category of the logging event
+#            %C fully qualified name of logging event
+#            %d current date in yyyy/MM/dd hh:mm:ss
+#            %H hostname
+#            %m message to be logged
+#            %M method where logging event was issued
+#            %p priority of logging event
+#            %P pid of current process
+#
+#
+# Examples:
+#       ::logger::new param1
+#       ::logger::new param2
+#       ::logger::new param3 <option1>
+#
+#
+# Sample Input:
+#	(Optional) Sample of input to the proc provided by its argument values.
+#
+# Sample Output:
+#	(Optional) For procs that output to files, provide
+#	sample of format of output produced.
+# Notes:
+#	1.
+#
+# End of Procedure Header
+
+
+proc ::logger::utils::createFormatCmd {text args} {
+    variable log
+    array set opt $args
+
+    regsub -all -- \
+	{%P} \
+	$text \
+	[pid] \
+	text
+
+    regsub -all -- \
+	{%H} \
+	$text \
+	[info hostname] \
+	text
+
+
+    #the %d subst has to happen at the end
+    regsub -all -- \
+	{%d} \
+	$text \
+	{[clock format [clock seconds] -format {%Y/%m/%d %H:%M:%S}]} \
+	text
+
+    if {[info exists opt(-category)]} {
+	regsub -all -- \
+	    {%c} \
+	    $text \
+	    $opt(-category) \
+	    text
+
+	regsub -all -- \
+	    {%C} \
+	    $text \
+	    [lindex [split $opt(-category) :: ] 0] \
+	    text
+    }
+
+    if {[info exists opt(-priority)]} {
+	regsub -all -- \
+	    {%p} \
+	    $text \
+	    $opt(-priority) \
+	    text
+    }
+
+    return $text
+}
+
+
+
+##Procedure Header
+# Copyright (c) 2005 Cisco Systems, Inc.
+#
+# Name:
+#	::logger::utils::createLogProc
+#
+# Purpose:
+#
+#
+# Synopsis:
+#       ::logger::utils::createLogProc -procName <procName> [options]
+#
+# Arguments:
+#       -procName <procName>
+#            name of proc to create
+#       -conversionPattern <pattern>
+#            see createFormatCmd for <pattern>
+#       -category <category>
+#            the category (service)
+#       -priority <priority>
+#            the priority (level)
+#       -outputChannel <channel>
+#            channel to output on (default stdout)
+#
+#
+# Return Values:
+#	a runnable command
+#
+# Description:
+#       createFormatCmd translates <formatString> into an expandable
+#       command string.
+#
+#       The following are the known substitutions (from log4perl):
+#            %c category of the logging event
+#            %C fully qualified name of logging event
+#            %d current date in yyyy/MM/dd hh:mm:ss
+#            %H hostname
+#            %m message to be logged
+#            %M method where logging event was issued
+#            %p priority of logging event
+#            %P pid of current process
+#
+#
+# Examples:
+#
+#
+# Sample Input:
+#	(Optional) Sample of input to the proc provided by its argument values.
+#
+# Sample Output:
+#	(Optional) For procs that output to files, provide
+#	sample of format of output produced.
+# Notes:
+#	1.
+#
+# End of Procedure Header
+
+
+proc ::logger::utils::createLogProc {args} {
+    variable log
+    array set opt $args
+
+    set formatText ""
+    set methodText ""
+    if {[info exists opt(-conversionPattern)]} {
+	set text $opt(-conversionPattern)
+
+	regsub -all -- \
+	    {%P} \
+	    $text \
+	    [pid] \
+	    text
+
+	regsub -all -- \
+	    {%H} \
+	    $text \
+	    [info hostname] \
+	    text
+
+	if {[info exists opt(-category)]} {
+	    regsub -all -- \
+		{%c} \
+		$text \
+		$opt(-category) \
+		text
+
+	    regsub -all -- \
+		{%C} \
+		$text \
+		[lindex [split $opt(-category) :: ] 0] \
+		text
+	}
+
+	if {[info exists opt(-priority)]} {
+	    regsub -all -- \
+		{%p} \
+		$text \
+		$opt(-priority) \
+		text
+	}
+
+
+	if {[regexp {%M} $text]} {
+	    set methodText {
+		if {[info level] < 2} {
+		    set method "global"
+		} elseif {[uplevel 1 {namespace which self}] == "::oo::Helpers::self"} {
+		    set    method    [uplevel 1 {self class}]
+		    append method :: [uplevel 1 {self method}]
+		} else {
+		    set method [lindex [info level -1] 0]
+		}
+	    }
+
+	    regsub -all -- \
+		{%M} \
+		$text \
+		{$method} \
+		text
+	}
+
+	regsub -all -- \
+	    {%m} \
+	    $text \
+	    {$text} \
+	    text
+
+	regsub -all -- \
+	    {%d} \
+	    $text \
+	    {[clock format [clock seconds] -format {%Y/%m/%d %H:%M:%S}]} \
+	    text
+
+    }
+
+    if {[info exists opt(-outputChannel)]} {
+	set outputChannel $opt(-outputChannel)
+    } else {
+	set outputChannel stdout
+    }
+
+    set formatText $text
+    set outputCommand puts
+
+    set procText {
+	proc $opt(-procName) {text} {
+	    $methodText
+	    $outputCommand $outputChannel \"$formatText\"
+	}
+    }
+
+    set procText [subst $procText]
+    return $procText
+}
+
+
+##Procedure Header
+# Copyright (c) 2005 Cisco Systems, Inc.
+#
+# Name:
+#	::logger::utils::applyAppender
+#
+# Purpose:
+#
+#
+# Synopsis:
+#       ::logger::utils::applyAppender -appender <appenderType> [options]
+#
+# Arguments:
+#       -service <logger service names>
+#       -serviceCmd <logger serviceCmds>
+#            name of logger instance to modify
+#            -serviceCmd takes as input the return of logger::init
+#
+#       -appender <appenderType>
+#            type of appender to use
+#             console|colorConsole...
+#
+#       -appenderArgs <argumentlist>
+#            A list of additional options plus their arguments
+#
+#       -levels <levels to apply to>
+#            list of levels to apply this appender to
+#            by default all levels are applied to
+#
+# Return Values:
+#
+#
+# Description:
+#       applyAppender will create an appender for the specified
+#       logger services. If not service is specified then the
+#       appender will be added as the default appender for
+#       the specified levels. If no levels are specified, then
+#       all levels are assumed.
+#
+#       The following are the known substitutions (from log4perl):
+#            %c category of the logging event
+#            %C fully qualified name of logging event
+#            %d current date in yyyy/MM/dd hh:mm:ss
+#            %H hostname
+#            %m message to be logged
+#            %M method where logging event was issued
+#            %p priority of logging event
+#            %P pid of current process
+#
+#
+# Examples:
+#        % set log [logger::init testLog]
+#        ::logger::tree::testLog
+#        % logger::utils::applyAppender -appender console -serviceCmd $log
+#        % ${log}::error "this is error"
+#        [2005/08/22 10:14:13] [testLog] [global] [error] this is error
+#
+#
+# End of Procedure Header
+
+
+proc ::logger::utils::applyAppender {args} {
+    set usage {logger::utils::applyAppender
+	-appender appender
+	?-instance?
+	?-levels levels?
+	?-appenderArgs appenderArgs?
+    }
+    set levels [logger::levels]
+    set appenderArgs {}
+    set bargs $args
+    while {[llength $args] > 1} {
+        set opt [lindex $args 0]
+        set args [lrange $args 1 end]
+        switch  -exact -- $opt {
+            -appender { set appender [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -serviceCmd { set serviceCmd [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -service { set serviceCmd [logger::servicecmd [lindex $args 0]]
+		set args [lrange $args 1 end]
+	    }
+            -levels { set levels [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+	    -appenderArgs {
+		set appenderArgs [lindex $args 0]
+		set args [lrange $args 1 end]
+	    }
+            default {
+                return -code error [msgcat::mc "Unknown argument: \"%s\" :\nUsage:\
+                %s" $opt $usage]
+            }
+        }
+    }
+
+    set appender ::logger::appender::${appender}
+    if {[info commands $appender] == {}} {
+	return -code error [msgcat::mc "could not find appender '%s'" $appender]
+    }
+
+    #if service is not specified make all future services with this appender
+    # spec
+    if {![info exists serviceCmd]} {
+	set ::logger::utils::autoApplyAppenderArgs $bargs
+	#add trace
+	#check to see if trace is already set
+	if {[lsearch [trace info execution logger::init] \
+		 {leave ::logger::utils::autoApplyAppender} ] == -1} {
+	    trace add execution ::logger::init leave ::logger::utils::autoApplyAppender
+	}
+	return
+    }
+
+
+    #foreach service specified, apply the appender for each of the levels
+    # specified
+    foreach srvCmd $serviceCmd {
+
+	foreach lvl $levels {
+	    set procText [$appender -appenderArgs $appenderArgs \
+			      -level $lvl \
+			      -service [${srvCmd}::servicename] \
+			      -procNameVar procName
+			 ]
+	    eval $procText
+	    ${srvCmd}::logproc $lvl $procName
+	}
+    }
+}
+
+
+##Internal Procedure Header
+# Copyright (c) 2005 Cisco Systems, Inc.
+#
+# Name:
+#	::logger::utils::autoApplyAppender
+#
+# Purpose:
+#
+#
+# Synopsis:
+#       ::logger::utils::autoApplyAppender <command> <command-string> <log> <op> <args>
+#
+# Arguments:
+#       <command>
+#       <command-string>
+#       <log>
+#            servicecmd generated by logger:init
+#       <op>
+#       <args>
+#
+# Return Values:
+#	<log>
+#
+# Description:
+#       autoApplyAppender is designed to be added via trace leave
+#       to logger::init calls
+#
+#       autoApplyAppender will look at preconfigred state (via applyAppender)
+#       to autocreate appenders for newly created logger instances
+#
+# Examples:
+#	logger::utils::applyAppender -appender console
+#	set log [logger::init applyAppender-3]
+#	${log}::error "this is error"
+#
+#
+# Sample Input:
+#
+# Sample Output:
+#
+# Notes:
+#	1.
+#
+# End of Procedure Header
+
+
+proc ::logger::utils::autoApplyAppender {command command-string log op args} {
+    variable autoApplyAppenderArgs
+    set bAppArgs $autoApplyAppenderArgs
+    set levels [logger::levels]
+    set appenderArgs {}
+    while {[llength $bAppArgs] > 1} {
+        set opt [lindex $bAppArgs 0]
+        set bAppArgs [lrange $bAppArgs 1 end]
+        switch  -exact -- $opt {
+            -appender { set appender [lindex $bAppArgs 0]
+		set bAppArgs [lrange $bAppArgs 1 end]
+	    }
+            -levels { set levels [lindex $bAppArgs 0]
+		set bAppArgs [lrange $bAppArgs 1 end]
+	    }
+	    -appenderArgs {
+		set appenderArgs [lindex $bAppArgs 0]
+		set bAppArgs [lrange $bAppArgs 1 end]
+	    }
+            default {
+                return -code error [msgcat::mc "Unknown argument: \"%s\" :\nUsage:\
+                %s" $opt $usage]
+            }
+        }
+    }
+    if {![info exists appender]} {
+	return -code error [msgcat::mc "need to specify -appender"]
+    }
+    logger::utils::applyAppender -appender $appender -serviceCmd $log \
+	-levels $levels -appenderArgs $appenderArgs
+    return $log
+}
+
+
+package provide logger::utils 1.3.1
+
+# ;;; Local Variables: ***
+# ;;; mode: tcl ***
+# ;;; End: ***
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/msgs/en.msg b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/msgs/en.msg
new file mode 100644
index 00000000..9b6df9ef
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/msgs/en.msg
@@ -0,0 +1,7 @@
+# -*- tcl -*-
+package require    msgcat
+namespace import ::msgcat::*
+
+mcset en "Unknown argument: \"%s\" :\nUsage: %s" "Unknown argument: \"%s\" :\nUsage: %s"
+mcset en "could not find appender '%s'"          "could not find appender '%s'"
+mcset en "need to specify -appender"             "need to specify -appender"
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/pkgIndex.tcl
new file mode 100644
index 00000000..1fe69c4d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/log/pkgIndex.tcl
@@ -0,0 +1,9 @@
+if {![package vsatisfies [package provide Tcl] 8]} {return}
+package ifneeded log 1.4 [list source [file join $dir log.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded logger           0.9.4 [list source [file join $dir logger.tcl]]
+package ifneeded logger::appender 1.3   [list source [file join $dir loggerAppender.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded logger::utils    1.3.1 [list source [file join $dir loggerUtils.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_geocode_nominatim.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_geocode_nominatim.tcl
new file mode 100644
index 00000000..61842485
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_geocode_nominatim.tcl
@@ -0,0 +1,91 @@
+## -*- tcl -*-
+# ### ### ### ######### ######### #########
+
+## Geocoding (finding geo coordinates from location names and keywords)
+## Reverse geocoding (putting names on coordinate sets)
+## Both based on the nominatim interface
+
+## See https://wiki.openstreetmap.org/wiki/Nominatim for details
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.6
+package require http
+package require json
+package require uri
+package require snit
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type map::geocode::nominatim {
+    # ### ### ### ######### ######### #########
+    ## API
+
+    proc callbackdefault {result} {
+        # FIXME Is there a good default here?
+        puts "callback: $result"
+    }
+
+    proc errordefault {err} {
+        bgerror "nominatim error: $err"
+    }
+
+    option -baseurl "http://nominatim.openstreetmap.org/search"
+    option -callback callbackdefault
+    option -error errordefault
+
+
+    # No special constructor, so far
+
+    # ::nominatim::search
+    # Queries the location server. Returns a list of dicts, each item having
+    # - place_id
+    # - licence
+    # - osm_type
+    # - osm_id
+    # - boundingbox
+    # - lat
+    # - lon
+    # - display_name
+    # - class
+    # - type
+    # - icon
+    # Most interesting should be display_name, lat, lon and boundingbox
+    method search {query} {
+        set query [http::formatQuery q $query format json]
+        http::geturl [uri::join {*}[uri::split $options(-baseurl)] query $query] \
+            -command [mymethod Done] -timeout 60000
+    }
+
+    method Error {context err} {
+        uplevel \#0 [list {*}$options(-error) "$context: $err"]
+	return
+    }
+
+    # Private method
+    method Done {htok} {
+        if { [http::ncode $htok] != 200 } {
+	    $self Error "HTTP" [http::code $htok]
+            return
+        }
+	if { [catch {
+	    set res [::json::json2dict [encoding convertfrom utf-8 [::http::data $htok]]]
+	} _ err] } {
+            $self Error "JSON" $err
+            return
+        }
+        if { [catch {
+	    uplevel \#0 [list {*}$options(-callback) $res]
+	} _ err] } {
+            $self Error "Callback" $err
+        }
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+    # none, so far
+}
+
+package provide map::geocode::nominatim 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy.tcl
new file mode 100644
index 00000000..a6f79236
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy.tcl
@@ -0,0 +1,285 @@
+## -*- mode: tcl; fill-column: 90 -*-
+# ### ### ### ######### ######### #########
+##
+## Common information and commands for slippy based maps. I.e. tile size, relationship
+## between zoom level and map size, etc.
+##
+## See
+##	http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Pseudo-Code
+##
+## for the coordinate conversions and other information.
+
+#
+# Management code for switching between Tcl and C accelerated implementations.
+#
+# @mdgen EXCLUDE: map_slippy_c.tcl
+#
+
+package require Tcl 8.6
+namespace eval ::map::slippy {}
+
+# ### ### ### ######### ######### #########
+## Management of map::slippy std implementations.
+
+# ::map::slippy::LoadAccelerator --
+#
+#	Loads a named implementation, if possible.
+#
+# Arguments:
+#	key	Name of the implementation to load.
+#
+# Results:
+#	A boolean flag. True if the implementation was successfully loaded; and False otherwise.
+
+proc ::map::slippy::LoadAccelerator {key} {
+    variable accel
+    set isok 0
+    switch -exact -- $key {
+	critcl {
+	    # Critcl implementation of map::slippy requires Tcl 8.6.
+	    if {![package vsatisfies [package provide Tcl] 8.6]} {return 0}
+	    if {[catch {
+		package require tcllibc
+	    }]} {
+		return 0
+	    }
+	    set isok [llength [info commands ::map::slippy::critcl_tiles]]
+	}
+	tcl {
+	    variable selfdir
+	    if {[catch {
+		source [file join $selfdir map_slippy_tcl.tcl]
+	    } msg]} {
+		#puts /$msg
+		return 0
+	    }
+	    set isok [llength [info commands ::map::slippy::tcl_tiles]]
+	}
+        default {
+            return -code error "invalid accelerator $key:\
+                must be one of [join [KnownImplementations] {, }]"
+        }
+    }
+    set accel($key) $isok
+    return $isok
+}
+
+# ::map::slippy::SwitchTo --
+#
+#	Activates a loaded named implementation.
+#
+# Arguments:
+#	key	Name of the implementation to activate.
+#
+# Results:
+#	None.
+
+proc ::map::slippy::SwitchTo {key} {
+    variable accel
+    variable loaded
+
+    if {$key eq $loaded} {
+	# No change, nothing to do.
+	return
+    } elseif {$key ne {}} {
+	# Validate the target implementation of the switch.
+
+	if {![info exists accel($key)]} {
+	    return -code error "Unable to activate unknown implementation \"$key\""
+	} elseif {![info exists accel($key)] || !$accel($key)} {
+	    return -code error "Unable to activate missing implementation \"$key\""
+	}
+    }
+
+    set cmdmap {
+	geo::2point			point::2geo
+	geo::2point*			point::2geo*
+	geo::2point-list		point::2geo-list
+	geo::bbox			point::bbox
+	geo::bbox-list			point::bbox-list
+	geo::box::2point		point::box::2geo
+	geo::box::center		point::box::center
+	geo::box::corners		point::box::corners
+	geo::box::diameter		point::box::diameter
+	geo::box::dimensions		point::box::dimensions
+	geo::box::fit
+	geo::box::inside		point::box::inside
+	geo::box::limit
+	geo::box::opposites		point::box::opposites
+	geo::box::perimeter		point::box::perimeter
+	geo::box::valid
+	geo::box::valid-list
+	geo::center			point::center
+	geo::center-list		point::center-list
+	geo::diameter			point::diameter
+	geo::diameter-list		point::diameter-list
+	geo::distance			point::distance
+	geo::distance*			point::distance*
+	geo::distance-list		point::distance-list
+	geo::limit			point::simplify::rdp
+	geo::valid
+	geo::valid-list
+	length				point::simplify::radial
+	limit2
+	limit3
+	limit6
+	tile::size
+	tile::valid
+	tiles
+	valid::latitude
+	valid::longitude
+    }
+
+    # Deactivate the previous implementation, if there was any.
+
+    if {$loaded ne {}} {
+	foreach cmd $cmdmap {
+	    set origin [string map {:: _ - _ * _args} $cmd]
+	    rename ::map::slippy::$cmd ::map::slippy::${loaded}_$origin
+	}
+    }
+
+    # Activate the new implementation, if there is any.
+
+    if {$key ne {}} {
+	foreach cmd $cmdmap {
+	    set origin [string map {:: _ - _ * _args} $cmd]
+	    rename ::map::slippy::${key}_$origin ::map::slippy::$cmd
+	}
+    }
+
+    # Remember the active implementation, for deactivation by future switches.
+
+    set loaded $key
+    return
+}
+
+# ::map::slippy::Implementations --
+#
+#	Determines which implementations are present, i.e. loaded.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys.
+
+proc ::map::slippy::Implementations {} {
+    variable accel
+    set res {}
+    foreach n [array names accel] {
+	if {!$accel($n)} continue
+	lappend res $n
+    }
+    return $res
+}
+
+# ::map::slippy::KnownImplementations --
+#
+#	Determines which implementations are known as possible implementations.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys. In the order of preference, most prefered first.
+
+proc ::map::slippy::KnownImplementations {} {
+    return {critcl tcl}
+}
+
+proc ::map::slippy::Names {} {
+    return {
+	critcl {tcllibc based}
+	tcl    {pure Tcl}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Data structures.
+
+namespace eval ::map::slippy {
+    variable  selfdir [file dirname [info script]]
+    variable  loaded  {}
+
+    variable  accel
+    array set accel {tcl 0 critcl 0}
+}
+
+# ### ### ### ######### ######### #########
+## Initialization. Ensemble
+
+namespace eval ::map {
+    namespace export slippy
+    namespace ensemble create
+}
+namespace eval ::map::slippy {
+    namespace export length geo point tile tiles \
+	limit6 limit3 limit2 pretty-distance valid
+    namespace ensemble create
+}
+namespace eval ::map::slippy::valid {
+    namespace export latitude longitude
+    namespace ensemble create
+}
+namespace eval ::map::slippy::geo {
+    namespace export \
+	2point 2point* 2point-list bbox bbox-list \
+	box center center-list diameter diameter-list \
+	distance distance* distance-list limit \
+	valid valid-list
+    namespace ensemble create
+}
+namespace eval ::map::slippy::geo::box {
+    namespace export fit 2point corners opposites center dimensions inside \
+	diameter perimeter limit valid valid-list
+    namespace ensemble create
+}
+namespace eval ::map::slippy::point {
+    namespace export \
+	2geo 2geo* 2geo-list bbox bbox-list \
+	box center center-list diameter diameter-list \
+	distance distance* distance-list simplify
+    namespace ensemble create
+}
+namespace eval ::map::slippy::point::box {
+    namespace export 2geo corners opposites center dimensions inside \
+	diameter perimeter
+    namespace ensemble create
+}
+namespace eval ::map::slippy::point::simplify {
+    namespace export radial rdp
+    namespace ensemble create
+}
+namespace eval ::map::slippy::tile {
+    namespace export size valid
+    namespace ensemble create
+}
+
+# ### ### ### ######### ######### #########
+## Unaccelerated commands
+
+proc ::map::slippy::pretty-distance {x} {
+    if {$x >= 1000} {
+	return "[limit3 [expr {$x/1000.}]] km"
+    }
+    return "[limit2 $x] m"
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Choose an implementation, most prefered first.
+## Loads only one of the possible implementations and activates it.
+
+apply {{} {
+    foreach e [KnownImplementations] {
+	if {[LoadAccelerator $e]} {
+	    SwitchTo $e
+	    break
+	}
+    }
+} ::map::slippy}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide map::slippy 0.8
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy_c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy_c.tcl
new file mode 100644
index 00000000..4acf4b29
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy_c.tcl
@@ -0,0 +1,834 @@
+## -*- tcl -*-
+# ### ### ### ######### ######### #########
+##
+## C implementation for map::slippy
+##
+## See
+##	http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Pseudo-Code
+##
+## for the coordinate conversions and other information.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require critcl 3.1.18.2	;# REQUIRED: `[]type` support.
+# TODO:                3.2
+
+critcl::tcl 8.6
+critcl::license {Andreas Kupries} {BSD licensed.}
+
+#package require critcl::cutil
+#critcl::cutil::tracer on
+#critcl::config trace
+#critcl::debug symbols
+#critcl::debug memory
+
+# ### ### ### ######### ######### #########
+## API - Helper setup
+
+critcl::ccode {
+    #include <math.h>
+    #include <stdlib.h>
+    #include <string.h>	/* memset */
+
+    #ifndef M_PI
+    #define M_PI (3.141592653589793238462643)
+    #endif
+    #define DEGTORAD     (M_PI/180.)	/* (2pi)/360 */
+    #define RADTODEG     (180./M_PI)	/* 360/(2pi) */
+    #define OURTILESIZE  (256)
+    #define OURTILESIZED ((double) OURTILESIZE)
+    #define TILES(z)     (1 << (z))
+    #define MIN(a,b)     (((a) < (b)) ? (a) : (b))
+    #define MAX(a,b)     (((a) > (b)) ? (a) : (b))
+
+    #define OP Tcl_ObjPrintf
+    #define BAD(f, ...) { if (msgv.o != 0) Tcl_ObjSetVar2 (interp, msgv.o, 0, OP (f, __VA_ARGS__), 0); return 0; }
+}
+
+# ### ### ### ######### ######### #########
+## Custom argument and result processing
+
+critcl::source c/geo.tcl
+critcl::source c/geobox.tcl
+critcl::source c/point.tcl
+critcl::source c/pointbox.tcl
+critcl::source c/wxh.tcl
+critcl::source c/common.tcl
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+critcl::cproc ::map::slippy::critcl_geo_valid_list {
+    []geo gs
+} bool {
+    for (unsigned int k = 0; k < gs.c; k++) {
+	if (!((gs.v[k].lat >=  -90) && (gs.v[k].lat <=  90) &&
+	      (gs.v[k].lon >= -180) && (gs.v[k].lon <= 180))) {
+	    return 0;
+	}
+    }
+    return 1;
+}
+
+critcl::cproc ::map::slippy::critcl_geo_box_valid_list {
+    []geobox gs
+} bool {
+    for (unsigned int k = 0; k < gs.c; k++) {
+	if (!((gs.v[k].lat0 >=  -90) && (gs.v[k].lat0 <=  90) &&
+	      (gs.v[k].lon0 >= -180) && (gs.v[k].lon0 <= 180) &&
+	      (gs.v[k].lat1 >=  -90) && (gs.v[k].lat1 <=  90) &&
+	      (gs.v[k].lon1 >= -180) && (gs.v[k].lon1 <= 180))) {
+	    return 0;
+	}
+    }
+    return 1;
+}
+
+critcl::cproc ::map::slippy::critcl_geo_valid {
+    geo g
+} bool {
+    return
+	(g.lat >=  -90) && (g.lat <=  90) &&
+	(g.lon >= -180) && (g.lon <= 180);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_box_valid {
+    geobox gbox
+} bool {
+    return
+	(gbox.lat0 >=  -90) && (gbox.lat0 <=  90) &&
+	(gbox.lon0 >= -180) && (gbox.lon0 <= 180) &&
+	(gbox.lat1 >=  -90) && (gbox.lat1 <=  90) &&
+	(gbox.lon1 >= -180) && (gbox.lon1 <= 180);
+}
+
+critcl::cproc ::map::slippy::critcl_valid_latitude {
+    double x
+} bool {
+    return (x >= -90) && (x <= 90);
+}
+
+critcl::cproc ::map::slippy::critcl_valid_longitude {
+    double x
+} bool {
+    return (x >= -180) && (x <= 180);
+}
+
+critcl::cproc ::map::slippy::critcl_limit6 {
+    Tcl_Interp* interp
+    double      x
+} object0 {
+    return delimit (x, 1000000);
+}
+
+critcl::cproc ::map::slippy::critcl_limit3 {
+    Tcl_Interp* interp
+    double      x
+} object0 {
+    return delimit (x, 1000);
+}
+
+critcl::cproc ::map::slippy::critcl_limit2 {
+    Tcl_Interp* interp
+    double      x
+} object0 {
+    return delimit (x, 100);
+}
+
+critcl::cproc ::map::slippy::critcl_length {
+    int level
+} int {
+    return OURTILESIZE * TILES (level);
+}
+
+critcl::cproc ::map::slippy::critcl_tiles {
+    int level
+} int {
+    return TILES (level);
+}
+
+critcl::cconst ::map::slippy::critcl_tile_size int OURTILESIZE
+
+critcl::cproc ::map::slippy::critcl_tile_valid {
+    Tcl_Interp* interp
+    int         zoom
+    int         row
+    int         col
+    int         levels
+    pstring    {msgv ms_pstring_empty()}
+} boolean {
+    if ((zoom < 0) || (zoom >= levels)) {
+	BAD ("Bad zoom level '%d' (max: %d)", zoom, levels);
+    }
+
+    int tiles = TILES (zoom);
+
+    if ((row < 0) || (row >= tiles) ||
+	(col < 0) || (col >= tiles)) {
+	BAD ("Bad cell '%d %d' (max: %d)", row, col, tiles);
+    }
+
+    return 1;
+}
+
+critcl::cproc ::map::slippy::critcl_geo_box_limit {
+    Tcl_Interp* interp
+    geobox      gbox
+} object0 {
+    Tcl_Obj* cl[4];
+    cl [0] = delimit (gbox.lat0, 1000000);
+    cl [1] = delimit (gbox.lon0, 1000000);
+    cl [2] = delimit (gbox.lat1, 1000000);
+    cl [3] = delimit (gbox.lon1, 1000000);
+    return Tcl_NewListObj(4, cl);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_box_inside {
+    Tcl_Interp* interp
+    geobox      gbox
+    geo         g
+} bool {
+    return ((g.lat >= gbox.lat0) && (g.lat <= gbox.lat1) &&
+	    (g.lon >= gbox.lon0) && (g.lon <= gbox.lon1));
+}
+
+critcl::cproc ::map::slippy::critcl_geo_box_center {
+    Tcl_Interp* interp
+    geobox      gbox
+} geo {
+    geo out = {
+	.lat = (gbox.lat0 + gbox.lat1) / 2.,
+	.lon = (gbox.lon0 + gbox.lon1) / 2.
+    };
+
+    return out;
+}
+
+critcl::cproc ::map::slippy::critcl_geo_box_dimensions {
+    Tcl_Interp* interp
+    geobox      gbox
+} wxh {
+    wxh out = {
+	.w = (gbox.lon1 - gbox.lon0),
+	.h = (gbox.lat1 - gbox.lat0)
+    };
+
+    return out;
+}
+
+critcl::cproc ::map::slippy::critcl_geo_box_2point {
+    int    zoom
+    geobox gbox
+} pointbox {
+    geo gmin = {
+	.lat = gbox.lat0,
+	.lon = gbox.lon0
+    };
+    geo gmax = {
+	.lat = gbox.lat1,
+	.lon = gbox.lon1
+    };
+
+    point pmin, pmax;
+
+    geo_2point (zoom, &gmin, &pmin);
+    geo_2point (zoom, &gmax, &pmax);
+
+    pointbox out = {
+	.x0 = MIN(pmin.x,pmax.x),
+	.y0 = MIN(pmin.y,pmax.y),
+	.x1 = MAX(pmin.x,pmax.x),
+	.y1 = MAX(pmin.y,pmax.y)
+    };
+
+    return out;
+}
+
+critcl::cproc ::map::slippy::critcl_geo_box_corners {
+    Tcl_Interp* interp
+    geobox      gbox
+} object0 {
+    geo g[4] = {{
+	.lat = gbox.lat0,
+	.lon = gbox.lon0
+    }, {
+	.lat = gbox.lat0,
+	.lon = gbox.lon1
+    }, {
+	.lat = gbox.lat1,
+	.lon = gbox.lon0
+    }, {
+	.lat = gbox.lat1,
+	.lon = gbox.lon1
+    }};
+
+    return geo_box_list (0, interp, 4, g);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_box_diameter {
+    Tcl_Interp* interp
+    geobox      gbox
+} double {
+    geo g[2] = {{
+	.lat = gbox.lat0,
+	.lon = gbox.lon0
+    }, {
+	.lat = gbox.lat1,
+	.lon = gbox.lon1
+    }};
+
+    return geo_distance_list (0, 2, g);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_box_opposites {
+    Tcl_Interp* interp
+    geobox      gbox
+} object0 {
+    geo g[2] = {{
+	.lat = gbox.lat0,
+	.lon = gbox.lon0
+    }, {
+	.lat = gbox.lat1,
+	.lon = gbox.lon1
+    }};
+
+    return geo_box_list (0, interp, 2, g);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_box_perimeter {
+    Tcl_Interp* interp
+    geobox      gbox
+} double {
+    geo g[4] = {{
+	.lat = gbox.lat0,
+	.lon = gbox.lon0
+    }, {
+	.lat = gbox.lat0,
+	.lon = gbox.lon1
+    }, {
+	.lat = gbox.lat1,
+	.lon = gbox.lon0
+    }, {
+	.lat = gbox.lat1,
+	.lon = gbox.lon1
+    }};
+
+    return geo_distance_list (1, 4, g);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_box_fit {
+    geobox gbox
+    wxh    canvdim
+    int    zmax
+    int    {zmin 0}
+} int {
+    double canvw = canvdim.w;
+    double canvh = canvdim.h;
+
+    geo gmin = {
+	.lat  = gbox.lat0,
+	.lon  = gbox.lon0
+    };
+    geo gmax = {
+	.lat  = gbox.lat1,
+	.lon  = gbox.lon1
+    };
+
+    point pmin, pmax;
+
+    // NOTE we assume ourtilesize == [map::slippy length 0].
+    // Further, we assume that each zoom step "grows" the linear resolution by a factor 2
+    // (that's the log(2) down there)
+
+    canvw = fabs (canvw);
+    canvh = fabs (canvh);
+
+    int z = (int) (log(fmin(
+			(canvh/OURTILESIZED) / (fabs(gbox.lat1 - gbox.lat0)/180.),
+			(canvw/OURTILESIZED) / (fabs(gbox.lon1 - gbox.lon0)/360.)))
+		/ log(2));
+    //fprintf(stdout, "z'initial:%d\n", z);fflush(stdout);
+    // clamp
+    z = ((z < zmin) ? zmin : ((z > zmax) ? zmax : z));
+    //fprintf(stdout, "z'clamp:%d\n", z);fflush(stdout);
+
+    // Now zoom is an approximation, since the scale factor isn't uniform across the map
+    // (the vertical dimension depends on latitude). So we have to refine iteratively
+    // (It is expected to take just one step):
+
+    int z1, z0, hasz1, hasz0;
+
+    hasz0 = hasz1 = 0;
+
+    while (1) {
+	//fprintf(stdout, "try zoom %d\n", z);fflush(stdout);
+	// Now we can run "uphill",   getting z0 = z - 1
+	// and            "downhill", getting z1 = z + 1
+	// (borders from the last iteration)
+
+	geo_2point (z, &gmin, &pmin);
+	geo_2point (z, &gmax, &pmax);
+
+	double w = fabs(pmax.x - pmin.x);
+	double h = fabs(pmax.y - pmin.y);
+
+	//fprintf(stdout, "dimensions|w|%f|%f|h|%f|%f\n", w, canvw, h, canvh);fflush(stdout);
+
+	if ((w > canvw) || (h > canvh)) {
+	    //fprintf(stdout, "to big: shrink z0?%d\n", hasz0);fflush(stdout);
+	    // too big: shrink
+	    if (hasz0) break; // but not if we came from below
+	    if (z <= zmin) break; // can't be < zmin
+	    z1 = z ; hasz1 = 1;
+	    z --;
+	} else {
+	    //fprintf(stdout, "fits: grow z1?%d\n", hasz1);fflush(stdout);
+	    // fits: grow
+	    if (hasz1) break; // but not if we came from above
+	    if (z >= zmax) {
+		//fprintf(stdout, "fits: at max!\n");fflush(stdout);
+		break; // can't be > zmax
+	    }
+	    z0 = z ; hasz0 = 1;
+	    z ++;
+	}
+    }
+
+    if (hasz0) { z = z0; }
+    //fprintf(stdout, "z'final:%d\n", z);fflush(stdout);
+    return z;
+}
+
+critcl::cproc ::map::slippy::critcl_geo_limit {
+    Tcl_Interp* interp
+    geo         g
+} object0 {
+    Tcl_Obj* cl[4];
+    cl [0] = delimit (g.lat, 1000000);
+    cl [1] = delimit (g.lon, 1000000);
+    return Tcl_NewListObj(2, cl);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_distance {
+    geo geoa
+    geo geob
+} double {
+    // lat, lon are in degrees - convert all to radians
+
+    double lata = DEGTORAD * geoa.lat;
+    double lona = DEGTORAD * geoa.lon;
+    double latb = DEGTORAD * geob.lat;
+    double lonb = DEGTORAD * geob.lon;
+
+    double d = geo_distance (lata, lona, latb, lonb);
+
+    // Convert to meters and return
+    double meters = 6371009 * d;
+    return meters;
+}
+
+critcl::cproc ::map::slippy::critcl_geo_distance_args {
+    bool closed
+    geo  args
+} double {
+    return geo_distance_list (closed, args.c, args.v);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_distance_list {
+    bool  closed
+    []geo geos
+} double {
+    return geo_distance_list (closed, geos.c, geos.v);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_bbox {
+    geo args
+} geobox {
+    return geo_bbox (args.c, args.v);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_bbox_list {
+    []geo geos
+} geobox {
+    return geo_bbox (geos.c, geos.v);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_center {
+    geo args
+} geo {
+    return geo_center (args.c, args.v);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_center_list {
+    []geo geos
+} geo {
+    return geo_center (geos.c, geos.v);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_diameter {
+    geo args
+} double {
+    return geo_diameter (args.c, args.v);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_diameter_list {
+    []geo geos
+} double {
+    return geo_diameter (geos.c, geos.v);
+}
+
+critcl::cproc ::map::slippy::critcl_geo_2point {
+    int zoom
+    geo g
+} point {
+    point out;
+
+    geo_2point (zoom, &g, &out);
+
+    return out;
+}
+
+critcl::cproc ::map::slippy::critcl_geo_2point_args {
+    Tcl_Interp* interp
+    int         zoom
+    geo         args
+} object0 {
+    if (args.c == 0) {
+	/* Pass the input, no need for transient helper memory */
+	return Tcl_NewListObj (0,0);
+    }
+
+    return point_box_list (1, interp, args.c, geos_2points (zoom, args.c, args.v));
+}
+
+critcl::cproc ::map::slippy::critcl_geo_2point_list {
+    Tcl_Interp* interp
+    int         zoom
+    []geo       geos
+} object0 {
+    if (geos.c == 0) {
+	/* Pass the input, no need for transient helper memory */
+	return Tcl_NewListObj (0,0);
+    }
+
+    return point_box_list (1, interp, geos.c, geos_2points (zoom, geos.c, geos.v));
+}
+
+critcl::cproc ::map::slippy::critcl_point_box_inside {
+    Tcl_Interp* interp
+    pointbox    pbox
+    point       p
+} bool {
+    return ((p.x >= pbox.x0) && (p.x <= pbox.x1) &&
+	    (p.y >= pbox.y0) && (p.y <= pbox.y1));
+}
+
+critcl::cproc ::map::slippy::critcl_point_box_center {
+    Tcl_Interp* interp
+    pointbox    pbox
+} point {
+    point out = {
+	.x = (pbox.x0 + pbox.x1) / 2.,
+	.y = (pbox.y0 + pbox.y1) / 2.
+    };
+
+    return out;
+}
+
+critcl::cproc ::map::slippy::critcl_point_box_dimensions {
+    Tcl_Interp* interp
+    pointbox      pbox
+} wxh {
+    wxh out = {
+	.w = (pbox.x1 - pbox.x0),
+	.h = (pbox.y1 - pbox.y0)
+    };
+
+    return out;
+}
+
+critcl::cproc ::map::slippy::critcl_point_box_2geo {
+    int      zoom
+    pointbox pbox
+} geobox {
+    point pmin = {
+	.y = pbox.y0,
+	.x = pbox.x0
+    };
+    point pmax = {
+	.y = pbox.y1,
+	.x = pbox.x1
+    };
+
+    geo gmin, gmax;
+
+    point_2geo (zoom, &pmin, &gmin);
+    point_2geo (zoom, &pmax, &gmax);
+
+    geobox out = {
+	.lat0 = MIN(gmin.lat,gmax.lat),
+	.lon0 = MIN(gmin.lon,gmax.lon),
+	.lat1 = MAX(gmin.lat,gmax.lat),
+	.lon1 = MAX(gmin.lon,gmax.lon)
+    };
+
+    return out;
+}
+
+critcl::cproc ::map::slippy::critcl_point_box_corners {
+    Tcl_Interp* interp
+    pointbox    pbox
+} object0 {
+    point p[4] = {{
+	.x = pbox.x0,
+	.y = pbox.y0
+    }, {
+	.x = pbox.x0,
+	.y = pbox.y1
+    }, {
+	.x = pbox.x1,
+	.y = pbox.y0
+    }, {
+	.x = pbox.x1,
+	.y = pbox.y1
+    }};
+
+    return point_box_list (0, interp, 4, p);
+}
+
+critcl::cproc ::map::slippy::critcl_point_box_diameter {
+    Tcl_Interp* interp
+    pointbox    pbox
+} double {
+    point p[2] = {{
+	.x = pbox.x0,
+	.y = pbox.y0
+    }, {
+	.x = pbox.x1,
+	.y = pbox.y1
+    }};
+
+    return point_distance_list (0, 2, p);
+}
+
+critcl::cproc ::map::slippy::critcl_point_box_opposites {
+    Tcl_Interp* interp
+    pointbox    pbox
+} object0 {
+    point p[2] = {{
+	.x = pbox.x0,
+	.y = pbox.y0
+    }, {
+	.x = pbox.x1,
+	.y = pbox.y1
+    }};
+
+    return point_box_list (0, interp, 2, p);
+}
+
+critcl::cproc ::map::slippy::critcl_point_box_perimeter {
+    Tcl_Interp* interp
+    pointbox    pbox
+} double {
+    point p[4] = {{
+	.x = pbox.x0,
+	.y = pbox.y0
+    }, {
+	.x = pbox.x0,
+	.y = pbox.y1
+    }, {
+	.x = pbox.x1,
+	.y = pbox.y0
+    }, {
+	.x = pbox.x1,
+	.y = pbox.y1
+    }};
+
+    return point_distance_list (1, 4, p);
+}
+
+critcl::cproc ::map::slippy::critcl_point_distance {
+    point pointa
+    point pointb
+} double {
+    return point_distance (&pointa, &pointb);
+}
+
+critcl::cproc ::map::slippy::critcl_point_distance_args {
+    bool  closed
+    point args
+} double {
+    return point_distance_list (closed, args.c, args.v);
+}
+
+critcl::cproc ::map::slippy::critcl_point_distance_list {
+    bool    closed
+    []point points
+} double {
+    return point_distance_list (closed, points.c, points.v);
+}
+
+critcl::cproc ::map::slippy::critcl_point_bbox {
+    point args
+} pointbox {
+    return point_bbox (args.c, args.v);
+}
+
+critcl::cproc ::map::slippy::critcl_point_bbox_list {
+    []point points
+} pointbox {
+    return point_bbox (points.c, points.v);
+}
+
+critcl::cproc ::map::slippy::critcl_point_center {
+    point args
+} point {
+    return point_center (args.c, args.v);
+}
+
+critcl::cproc ::map::slippy::critcl_point_center_list {
+    []point points
+} point {
+    return point_center (points.c, points.v);
+}
+
+critcl::cproc ::map::slippy::critcl_point_diameter {
+    point args
+} double {
+    return point_diameter (args.c, args.v);
+}
+
+critcl::cproc ::map::slippy::critcl_point_diameter_list {
+    []point points
+} double {
+    return point_diameter (points.c, points.v);
+}
+
+critcl::cproc ::map::slippy::critcl_point_2geo {
+    int   zoom
+    point p
+} geo {
+    geo out;
+
+    point_2geo (zoom, &p, &out);
+
+    return out;
+}
+
+critcl::cproc ::map::slippy::critcl_point_2geo_args {
+    Tcl_Interp* interp
+    int         zoom
+    point       args
+} object0 {
+    if (args.c == 0) {
+	/* Pass the input, no need for transient helper memory */
+	return Tcl_NewListObj (0,0);
+    }
+
+    return geo_box_list (1, interp, args.c, points_2geos (zoom, args.c, args.v));
+}
+
+critcl::cproc ::map::slippy::critcl_point_2geo_list {
+    Tcl_Interp* interp
+    int         zoom
+    []point     points
+} object0 {
+    if (points.c == 0) {
+	/* Pass the input, no need for transient helper memory */
+	return Tcl_NewListObj (0,0);
+    }
+
+    return geo_box_list (1, interp, points.c, points_2geos (zoom, points.c, points.v));
+}
+
+critcl::cproc ::map::slippy::critcl_point_simplify_radial {
+    Tcl_Interp* interp
+    double      threshold
+    bool        closed
+    []point     points
+} object0 {
+    if (points.c < 2) {
+	/* Pass the input, no need for transient helper memory */
+	return points.o;
+    }
+
+    point* res = (point*) ckalloc (points.c * sizeof(point));
+
+    unsigned int anchor = 0;
+    unsigned int into   = 0;
+
+    res[into].y = points.v[anchor].y;
+    res[into].x = points.v[anchor].x;
+    into ++;
+
+    for (unsigned int k = 1; k < points.c; k++) {
+	double d = hypot (points.v[k].x - points.v[anchor].x,
+			  points.v[k].y - points.v[anchor].y);
+	if (d < threshold) continue;
+
+	anchor = k;
+
+	res[into].y = points.v[anchor].y;
+	res[into].x = points.v[anchor].x;
+	into ++;
+    }
+
+    if (closed && (into > 1)) {
+	// For an actual loop, check last against first, remove last if necessary
+	double d = hypot (res[0].x - res[into-1].x,
+			  res[0].y - res[into-1].y);
+	if (d < threshold) {
+	    into --;
+	    // into > 0
+	}
+
+	if (into == 2) {
+	    // Loop degenerated into line, reduce to singularity using line center
+	    res[0].x = (res[0].x + res[1].x)/2.;
+	    res[0].y = (res[0].y + res[1].y)/2.;
+	    into = 1;
+	}
+    }
+
+    // Note: into >= 1, i.e. at least one point is present.
+
+    return point_box_list (1, interp, into, res);
+}
+
+critcl::cproc ::map::slippy::critcl_point_simplify_rdp {
+    Tcl_Interp* interp
+    []point     points
+} object0 {
+    if (points.c < 3) {
+	/* Pass the input, no need for transient helper memory */
+	return points.o;
+    }
+
+    /* Enough data present to run the full algorithm */
+
+    char*     keep = (char*) ckalloc (points.c * sizeof(char));
+    memset   (keep, 0,                points.c * sizeof(char));
+
+    rdp_core (keep, points.v, 0, points.c-1);
+
+    /* Compress the input array down to the kept points */
+
+    unsigned int into = 0;
+    for (unsigned int i=0; i < points.c; i++) {
+        if (!keep[i]) continue;
+	points.v[into] = points.v[i];
+	into++;
+    }
+    ckfree (keep);
+
+    if (!into) {
+	return Tcl_NewListObj (0,0);
+    }
+
+    return point_box_list (0, interp, into, points.v);
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy_cache.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy_cache.tcl
new file mode 100644
index 00000000..1a848ad6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy_cache.tcl
@@ -0,0 +1,143 @@
+## -*- tcl -*-
+# ### ### ### ######### ######### #########
+
+## A cache we put on top of a slippy fetcher, to satisfy requests for tiles from the local
+## filesystem first, if possible.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.6         ; #
+package require Tk  8.6         ; # image photo - Note: directly supports PNG format
+package require map::slippy 0.8 ; # Slippy base (constants, validation)
+package require fileutil        ; # Testing paths
+package require snit
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type map::slippy::cache {
+    # ### ### ### ######### ######### #########
+    ## API
+
+    constructor {cachedir provider} {
+	if {![fileutil::test $cachedir edrw msg]} {
+	    return -code error "$type constructor: $msg"
+	}
+	set mycachedir $cachedir
+	set myprovider $provider
+	set mylevels   [uplevel \#0 [list {*}$myprovider levels]]
+	return
+    }
+
+    delegate method * to myprovider
+    delegate option * to myprovider
+
+    method valid {tile {msgv {}}} {
+	if {$msgv ne ""} { upvar 1 $msgv msg }
+	# tile = list (zoom, row, col)
+	return [map slippy tile valid {*}$tile $mylevels msg]
+    }
+
+    method exists {tile} {
+	# tile = list (zoom, row, col)
+	if {![map slippy tile valid {*}$tile $mylevels msg]} {
+	    return -code error $msg
+	}
+	return [file exists [FileOf $tile]]
+    }
+
+    method get {tile donecmd} {
+	# tile = list (zoom, row, col)
+	if {![map slippy tile valid {*}$tile $mylevels msg]} {
+	    return -code error $msg
+	}
+
+	# Query the filesystem for a cached tile and return
+	# immediately if such was found.
+
+	set tilefile [FileOf $tile]
+	if {[file exists $tilefile]} {
+	    set tileimage [image create photo -file $tilefile]
+	    after 0 [list {*}$donecmd set $tile $tileimage]
+	    return
+	}
+
+	# The requested tile is not known to the cache, so we forward
+	# the request to our provider and intercept the result to
+	# update the cache. Only one retrieval request will be issued
+	# if multiple arrive from above.
+
+	lappend mypending($tile) $donecmd
+	if {[llength $mypending($tile)] > 1} return
+
+	uplevel \#0 [list {*}$myprovider get $tile [mymethod Done]]
+	return
+    }
+
+    method {Done set} {tile tileimage} {
+	# The requested tile was known to the provider, we can cache
+	# the image we got and then hand it over to the original
+	# requestor.
+
+	set tilefile [FileOf $tile]
+	file mkdir [file dirname $tilefile]
+	$tileimage write $tilefile -format png
+
+	set requests $mypending($tile)
+	unset mypending($tile)
+
+	# Note. The cache accepts empty callbacks for requests, and if
+	# no actual callback 'took' the image it is assumed to be not
+	# wanted and destroyed. This allows higher layers to request
+	# tiles before needng them without leaking imagas and yet also
+	# not throwing them away when a prefetch and regular fetch
+	# collide.
+
+	set taken 0
+	foreach d $requests {
+	    if {![llength $d]} continue
+	    uplevel \#0 [list {*}$d set $tile $tileimage]
+	    set taken 1
+	}
+
+	if {!$taken} {
+	    image delete $tileimage
+	}
+	return
+    }
+
+    method {Do unset} {donecmd tile} {
+	# The requested tile is not known. Nothing has to change in
+	# the cache (it did not know the tile either), the result can
+	# be directly handed over to the original requestor.
+
+	uplevel \#0 [list {*}$donecmd unset $tile]
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal commands
+
+    proc FileOf {tile} {
+	upvar 1 mycachedir mycachedir
+	lassign $tile z r c
+	return [file join $mycachedir $z $c $r.png]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+
+    variable mycachedir {} ; # Directory to cache tiles in.
+    variable myprovider {} ; # Command prefix, provider of tiles to cache.
+    variable mylevels   {} ; # Zoom-levels, retrieved from provider.
+
+    variable mypending -array {} ; # tile -> list (done-cmd-prefix)
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide map::slippy::cache 0.4
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy_fetcher.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy_fetcher.tcl
new file mode 100644
index 00000000..b210d2be
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy_fetcher.tcl
@@ -0,0 +1,170 @@
+## -*- tcl -*-
+# ### ### ### ######### ######### #########
+
+## Fetch tile images for maps based on the slippy scheme.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.6
+package require Tk  8.6 ; # image photo - Note: directly supports PNG format
+
+package require map::slippy 0.8 ; # Slippy (contants, validation)
+package require http            ; # Retrieval method
+package require snit
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type map::slippy::fetcher {
+    # ### ### ### ######### ######### #########
+    ## API
+
+    constructor {levels baseurl} {
+	set mybase   $baseurl
+	set mylevels $levels
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Query API
+
+    method levels     {} { return $mylevels }
+    method tileheight {} {map slippy tile size}
+    method tilewidth  {} {map slippy tile size}
+
+    # ### ### ### ######### ######### #########
+    ## Tile retrieval API
+
+    method get {tile donecmd} {
+	# tile = list (zoom, row, col)
+	if {![map slippy tile valid {*}$tile $mylevels msg]} {
+	    return -code error $msg
+	}
+
+	# Compose the url for the requested tile
+
+	set url [urlOf $tile]
+
+	# Initiate tile download.
+
+	# Note however that a download is actually started if and only if there is no download of
+	# this tile already in progress. If there is we simply register the new request with that
+	# download. When the download is done we convert the data to an in-memory image and provide
+	# it to all the waiting requests.
+
+	lappend mypending($url) $donecmd
+	if {[llength $mypending($url)] > 1} return
+
+	# We keep the retrieved image data in memory, 256x256 is not that large for todays RAM sizes
+	# (Seen 124K max so far).
+
+	if {[catch {
+	    set token [http::geturl $url -binary 1 -command [mymethod Done] \
+                          -timeout 60000]
+	}]} {
+	    puts $::errorInfo
+	    # Some errors, like invalid urls, raise errors synchronously, even if a callback
+	    # -command is specified.
+	    after idle [list {*}$donecmd unset $tile]
+	    return
+	}
+
+	# Remember the download settings.
+	set mytoken($token) [list $url $tile]
+	#puts "GET\t($url) = $token"
+	return
+    }
+
+    method Done {token} {
+	#puts GOT/$token
+
+	# We get the request settings and waiting callbacks first, and clean them up immediately,
+	# keeping the object state consistent even in the face of recursive calls. (Which should not
+	# be possible here).
+
+	lassign $mytoken($token) url tile
+	set requests $mypending($url)
+
+	unset mytoken($token)
+	unset mypending($url)
+
+	# Then we get the request results, and clean them up as well.
+
+	set status [http::status $token]
+	set ncode  [http::ncode  $token]
+	set data   [http::data   $token]
+	http::cleanup $token
+
+	#puts URL|$url
+	#puts STT|$status
+	#puts COD|[http::code $token]
+	#puts NCO|[http::ncode $token]
+	#puts ERR|[http::error $token]
+
+	# Check whether the retrieval failed, bad url, server out, etc. or not, and report if yes.
+
+	if {($status ne "ok") || ($ncode != 200)} {
+	    # error, eof, and other non-ok conditions.
+	    foreach d $requests {
+		after idle [list {*}$d unset $tile]
+	    }
+	    return
+	}
+
+	# The request was ok. Note that we assume that the slippy server is not redirecting us to
+	# some other url. We expect the image at exactly this location. A redirection is treated as
+	# failure, see the check above.
+
+	#puts \t|[string length $data]|
+
+	if {[catch {
+	    set tileimage [image create photo -data $data]
+	}]} {
+	    # XXX AK: Here we need a better way to report internal problems. Maybe just throw the
+	    # error?
+
+	    #puts $::errorInfo
+	    #puts $data
+
+	    foreach d $requests {
+		after idle [list {*}$d unset $tile]
+	    }
+	    return
+	}
+
+	# Finally we have the image we seek, and can report it.
+
+	foreach d $requests {
+	    after idle [list {*}$d set $tile $tileimage]
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal commands
+
+    proc urlOf {tile} {
+	upvar 1 mybase mybase
+	lassign $tile z r c
+	return $mybase/$z/$c/$r.png
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+
+    variable mybase   {} ; # Base url to the tiles.
+    variable mylevels 0  ; # Number of zoom levels (0...mylevels-1)
+
+    # State of all http requests currently in flight.
+
+    variable mypending -array {} ; # tile url   -> list (done-cmd-prefix)
+    variable mytoken   -array {} ; # http token -> list (tile url, tile id)
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide map::slippy::fetcher 0.6
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy_tcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy_tcl.tcl
new file mode 100644
index 00000000..3b9ee3b4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/map_slippy_tcl.tcl
@@ -0,0 +1,852 @@
+## -*- tcl -*-
+# ### ### ### ######### ######### #########
+##
+## Tcl implementation for map::slippy
+##
+## See
+##	http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Pseudo-Code
+##
+## for the coordinate conversions and other information.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require math::constants
+
+# ### ### ### ######### ######### #########
+## API - Ensemble setup
+
+namespace eval ::map::slippy {
+    math::constants::constants pi radtodeg degtorad
+
+    variable ourtilesize 256 ; # Size of slippy tiles <pixels>
+}
+
+# Space for RDP helpers
+namespace eval ::map::slippy::point::simplify {}
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+proc ::map::slippy::tcl_geo_valid_list {gs} {
+    foreach g $gs { if {![valid $g]} { return 0 } }
+    return 1
+}
+
+proc ::map::slippy::tcl_geo_box_valid_list {gs} {
+    foreach g $gs { if {![valid $g]} { return 0 } }
+    return 1
+}
+
+proc ::map::slippy::tcl_geo_valid {g} {
+    ::map::slippy::Check2 $g
+    lassign $g lat lon
+    return [expr {[map slippy valid latitude $lat] && [map slippy valid longitude $lon]}]
+}
+
+proc ::map::slippy::tcl_geo_box_valid {gbox} {
+    ::map::slippy::Check4 $gbox
+    lassign $gbox lat0 lon0 lat1 lon1
+    return [expr {
+	  [map slippy valid latitude $lat0] && [map slippy valid longitude $lon0] &&
+	  [map slippy valid latitude $lat1] && [map slippy valid longitude $lon1]
+    }]
+}
+
+proc ::map::slippy::tcl_valid_latitude {x} {
+    if {$x >  90} { return 0 }
+    if {$x < -90} { return 0 }
+    return 1
+}
+
+proc ::map::slippy::tcl_valid_longitude {x} {
+    if {$x >  180} { return 0 }
+    if {$x < -180} { return 0 }
+    return 1
+}
+
+proc ::map::slippy::tcl_limit6 {x} { Limit $x 1000000. }
+proc ::map::slippy::tcl_limit3 {x} { Limit $x 1000.    }
+proc ::map::slippy::tcl_limit2 {x} { Limit $x 100.     }
+proc ::map::slippy::Limit {x f} {
+    set y [expr {int($x)}]
+    if {$x == $y} { return $y }
+    set x [expr {round($x * $f)/$f}]
+    set y [expr {int($x)}]
+    if {$x == $y} { return $y }
+    return $x
+}
+
+proc ::map::slippy::tcl_length {level} {
+    variable ourtilesize
+    return [expr {$ourtilesize * (1 << $level)}]
+}
+
+proc ::map::slippy::tcl_tiles {level} {
+    return [expr {1 << $level}]
+}
+
+proc ::map::slippy::tcl_tile_size {} {
+    variable ::map::slippy::ourtilesize
+    return $ourtilesize
+}
+
+proc ::map::slippy::tcl_tile_valid {zoom row col levels {msgv {}}} {
+    if {$msgv ne ""} { upvar 1 $msgv msg }
+
+    # Requests outside of the valid ranges are rejected immediately
+
+    if {($zoom < 0) || ($zoom >= $levels)} {
+	set msg "Bad zoom level '$zoom' (max: $levels)"
+	return 0
+    }
+
+    set tiles [map slippy tiles $zoom]
+    if {($row < 0) || ($row >= $tiles) ||
+	($col < 0) || ($col >= $tiles)
+    } {
+	set msg "Bad cell '$row $col' (max: $tiles)"
+	return 0
+    }
+
+    return 1
+}
+
+proc ::map::slippy::tcl_geo_box_limit {gbox} {
+    ::map::slippy::Check4 $gbox
+    lassign $gbox latmin lonmin latmax lonmax
+
+    lappend r [map slippy limit6 $latmin]
+    lappend r [map slippy limit6 $lonmin]
+    lappend r [map slippy limit6 $latmax]
+    lappend r [map slippy limit6 $lonmax]
+
+    return $r
+}
+
+proc ::map::slippy::tcl_geo_box_inside {gbox g} {
+    ::map::slippy::Check4 $gbox
+    ::map::slippy::Check2 $g
+    lassign $gbox latmin lonmin latmax lonmax
+    lassign $g    lat lon
+
+    if {$lat < $latmin} { return 0 }
+    if {$lat > $latmax} { return 0 }
+    if {$lon < $lonmin} { return 0 }
+    if {$lon > $lonmax} { return 0 }
+
+    return 1
+}
+
+proc ::map::slippy::tcl_geo_box_center {gbox} {
+    ::map::slippy::Check4 $gbox
+    lassign $gbox latmin lonmin latmax lonmax
+
+    set lat [expr {($latmin + $latmax)/2.}]
+    set lon [expr {($lonmin + $lonmax)/2.}]
+
+    return [list $lat $lon]
+}
+
+proc ::map::slippy::tcl_geo_box_dimensions {gbox} {
+    ::map::slippy::Check4 $gbox
+    lassign $gbox latmin lonmin latmax lonmax
+
+    set dlat [expr {$latmax - $latmin}]
+    set dlon [expr {$lonmax - $lonmin}]
+
+    return [list $dlon $dlat]
+}
+
+proc ::map::slippy::tcl_geo_box_2point {zoom gbox} {
+    return [map slippy point bbox-list [map slippy geo 2point-list $zoom [opposites $gbox]]]
+}
+
+proc ::map::slippy::tcl_geo_box_corners {gbox} {
+    ::map::slippy::Check4 $gbox
+    lassign $gbox latmin lonmin latmax lonmax
+    return [list \
+		[list $latmin $lonmin] [list $latmin $lonmax] \
+		[list $latmax $lonmin] [list $latmax $lonmax]]
+}
+
+proc ::map::slippy::tcl_geo_box_diameter {gbox} {
+    ::map::slippy::Check4 $gbox
+    lassign $gbox latmin lonmin latmax lonmax
+    return [map slippy geo distance* 0 [list $latmin $lonmin] [list $latmax $lonmax]]
+}
+
+proc ::map::slippy::tcl_geo_box_opposites {gbox} {
+    ::map::slippy::Check4 $gbox
+    return [list [lrange $gbox 0 1] [lrange $gbox 2 3]]
+}
+
+proc ::map::slippy::tcl_geo_box_perimeter {gbox} {
+    return [map slippy geo distance-list 1 [corners $gbox]]
+}
+
+proc ::map::slippy::tcl_geo_box_fit {gbox canvdim zmax {zmin 0}} {
+    ::map::slippy::Check4 $gbox
+    ::map::slippy::Check2 $canvdim
+
+    variable ::map::slippy::ourtilesize
+    lassign $canvdim canvw canvh
+    lassign [dimensions $gbox] gw gh
+
+    # NOTE we assume ourtilesize == [map::slippy length 0].
+    # Further, we assume that each zoom step "grows" the linear resolution by a factor 2
+    # (that's the log(2) down there)
+    set canvw [expr {abs($canvw)}]
+    set canvh [expr {abs($canvh)}]
+    set z [expr {int(log(min( \
+		  ($canvh/$ourtilesize) / (abs($gh)/180), \
+		  ($canvw/$ourtilesize) / (abs($gw)/360))) \
+                 / log(2))}]
+    #puts z'initial:$z
+    # clamp ...
+    set z [expr {($z<$zmin) ? $zmin : (($z>$zmax) ? $zmax : $z)}]
+    #puts z'clamp:$z
+
+    # The zoom we have now is an approximation, since the scale factor isn't uniform across the map
+    # (the vertical dimension depends on latitude). We have to refine it iteratively, i.e. try to
+    # grow/shrink until it does (not) fit any longer, and then back off.
+    while {1} {
+	# Now we can run "uphill", then there's z0 = z - 1 and "downhill", then there's z1 = z + 1
+	# (from the last iteration)
+	#puts "try zoom $z"
+
+	lassign [map slippy point box dimensions [2point $z $gbox]] w h
+
+	#puts dimensions|w|[expr {abs($w)}]|$canvw|h|[expr {abs($h)}]|$canvh|
+
+	if { (abs($w) > $canvw) || (abs($h) > $canvh) } {
+	    # too big: shrink
+	    #puts "too big: shrink..."
+	    if { [info exists z0] } break; # but not if we come "from below"
+	    if {$z <= $zmin} break; # can't be < $zmin
+	    set z1 $z
+	    incr z -1
+	} else {
+	    # fits: grow
+	    #puts "fits: grow..."
+	    if { [info exists z1] } break; # but not if we come "from above"
+	    if {$z >= $zmax} {
+		#puts "fits: at max!"
+		break
+	    }
+	    set z0 $z
+	    incr z
+	}
+    }
+    if { [info exists z0] } { set z $z0 }
+    #puts z'final:$z
+    return $z
+}
+
+proc ::map::slippy::tcl_geo_limit {g} {
+    ::map::slippy::Check2 $g
+    lassign $g lat lon
+
+    lappend r [map slippy limit6 $lat]
+    lappend r [map slippy limit6 $lon]
+
+    return $r
+}
+
+proc ::map::slippy::tcl_geo_distance {geoa geob} {
+    ::map::slippy::Check2 $geoa
+    ::map::slippy::Check2 $geob
+
+    # https://en.wikipedia.org/wiki/Haversine_formula
+    # https://wiki.tcl-lang.org/page/geodesy
+    # https://en.wikipedia.org/wiki/Geographical_distance	| For radius used in angle
+    # https://en.wikipedia.org/wiki/Earth_radius		| to meter conversion
+    ##
+    # Go https://en.wikipedia.org/wiki/N-vector ?
+
+    #puts deg.A($geoa)-B($geob)
+
+    variable ::map::slippy::degtorad
+    variable ::map::slippy::pi
+
+    # Get the decimal degrees
+    lassign $geoa lata lona
+    lassign $geob latb lonb
+
+    # Convert all to radians
+    set lata [expr {$degtorad * $lata}]
+    set lona [expr {$degtorad * $lona}]
+    set latb [expr {$degtorad * $latb}]
+    set lonb [expr {$degtorad * $lonb}]
+
+    #puts rad.A($lata|$lona)-B($latb|$lonb)
+
+    set dlat [expr {$latb - $lata}]
+    set dlon [expr {$lonb - $lona}]
+
+    # puts d.lat($dlat).lon.($dlon)
+
+    set h [expr {pow((sin($dlat/2)),2) + cos($lata)*cos($latb)*pow((sin($dlon/2)),2)}]
+    #       dy^2 + cos*cos*dx^2
+    #       dy^2 + (sqrt(cos*cos)*dx)^2
+    # puts H.($h)
+
+    # Fix rounding errors, clamp to range -1...1
+    if {abs($h) > 1.0} { set h [expr {($h > 0) ? 1.0 : -1.0}] }
+    # puts HC.($h)
+
+    # Distance angle
+    set d [expr {2 * asin(sqrt($h))}]
+    # puts D.($d)
+
+    # set d [expr {2*asin(hypot( sin($dlat/2), sqrt(cos($y1)*cos($y2)) * sin($dlon/2) )  )}]
+    # not sure how bad that is with rounding errors for antipodal points.
+
+    # Convert to meters and return
+    set meters [expr {6371009*$d}]
+    #puts M.($meters)
+    return $meters
+}
+
+proc ::map::slippy::tcl_geo_distance_args {closed args} {
+    return [distance-list $closed $args]
+}
+
+proc ::map::slippy::tcl_geo_distance_list {closed geos} {
+    if {[llength $geos] < 2} { return 0 }
+
+    set d 0
+    set last [lindex $geos 0]
+    if {$closed} {
+	set first $last
+    }
+    foreach now [lrange $geos 1 end] {
+	set d [expr {$d + [distance $last $now]}]
+	set last $now
+    }
+    if {$closed} {
+	set d [expr {$d + [distance $last $first]}]
+    }
+    return $d
+}
+
+proc ::map::slippy::tcl_geo_bbox {args} {
+    return [bbox-list $args]
+}
+
+proc ::map::slippy::tcl_geo_bbox_list {geos} {
+    if {![llength $geos]} { return {0 0 0 0} }
+
+    set lat0  Inf
+    set lon0  Inf
+    set lat1 -Inf
+    set lon1 -Inf
+
+    foreach g $geos {
+	lassign $g lat lon
+	set lat0 [expr {min ($lat0, $lat)}]
+	set lon0 [expr {min ($lon0, $lon)}]
+	set lat1 [expr {max ($lat1, $lat)}]
+	set lon1 [expr {max ($lon1, $lon)}]
+
+    }
+    return [list $lat0 $lon0 $lat1 $lon1]
+}
+
+proc ::map::slippy::tcl_geo_center {args} {
+        return [center-list $args]
+}
+
+proc ::map::slippy::tcl_geo_center_list {geos} {
+    if {![llength $geos]} { return {0 0} }
+
+    set lat0  Inf
+    set lon0  Inf
+    set lat1 -Inf
+    set lon1 -Inf
+
+    foreach g $geos {
+	lassign $g lat lon
+	set lat0 [expr {min ($lat0, $lat)}]
+	set lon0 [expr {min ($lon0, $lon)}]
+	set lat1 [expr {max ($lat1, $lat)}]
+	set lon1 [expr {max ($lon1, $lon)}]
+
+    }
+
+    set lat [expr {($lat0 + $lat1)/2.}]
+    set lon [expr {($lon0 + $lon1)/2.}]
+
+    return [list $lat $lon]
+}
+
+proc ::map::slippy::tcl_geo_diameter {args} {
+    return [diameter-list $args]
+}
+
+proc ::map::slippy::tcl_geo_diameter_list {geos} {
+    if {[llength $geos] < 2} { return 0 }
+
+    # The diameter of the set of points is computed as the maximum distance over the distances
+    # between all pairs of points. The algorithm below is O(n^2).
+    ##
+    # It can be done better by (a) determining the convex hull of the set of points, followed by (b)
+    # using rotating calipers over the hull to determine the diameter.
+
+    # https://en.wikipedia.org/wiki/Rotating_calipers
+    # file:///home/aku/Downloads/MQ50856.pdf
+
+    # -- no three consecutive vertices are collinear -- collinear in spherical geo ?
+
+    set d 0
+    set k 0
+    foreach a $geos {
+	incr k
+	foreach b [lrange $geos $k end] {
+	    set d [expr {max($d, [distance $a $b])}]
+	}
+    }
+    return $d
+}
+
+# Coordinate conversions.
+# geo   = latitude, longitude
+# point = x, y
+
+proc ::map::slippy::tcl_geo_2point {zoom g} {
+    ::map::slippy::Check/Z2 $zoom $g
+
+    variable ::map::slippy::degtorad
+    variable ::map::slippy::pi
+    variable ::map::slippy::ourtilesize
+    lassign $g lat lon
+    set tiles  [map slippy tiles $zoom]
+    set latrad [expr {$degtorad * $lat}]
+    set y      [expr {$ourtilesize * ((1 - (log(tan($latrad) + 1.0/cos($latrad)) / $pi)) / 2 * $tiles)}]
+    set x      [expr {$ourtilesize * ((($lon + 180.0) / 360.0) * $tiles)}]
+    return [list $x $y]
+}
+
+proc ::map::slippy::tcl_geo_2point_args {zoom args} {
+    return [2point-list $zoom $args]
+}
+
+proc ::map::slippy::tcl_geo_2point_list {zoom geos} {
+    return [lmap geo $geos { 2point $zoom $geo }]
+}
+
+proc ::map::slippy::tcl_point_box_inside {pbox p} {
+    ::map::slippy::Check4 $pbox
+    ::map::slippy::Check2 $p
+    lassign $pbox x0 y0 x1 y1
+    lassign $p    x y
+
+    if {$y < $y0} { return 0 }
+    if {$y > $y1} { return 0 }
+    if {$x < $x0} { return 0 }
+    if {$x > $x1} { return 0 }
+
+    return 1
+}
+
+proc ::map::slippy::tcl_point_box_center {pbox} {
+    ::map::slippy::Check4 $pbox
+    lassign $pbox x0 y0 x1 y1
+
+    set x [expr {($x0 + $x1)/2.}]
+    set y [expr {($y0 + $y1)/2.}]
+
+    return [list $x $y]
+}
+
+proc ::map::slippy::tcl_point_box_dimensions {pbox} {
+    ::map::slippy::Check4 $pbox
+    lassign $pbox x0 y0 x1 y1
+
+    set dx [expr {$x1 - $x0}]
+    set dy [expr {$y1 - $y0}]
+
+    return [list $dx $dy]
+}
+
+proc ::map::slippy::tcl_point_box_2geo {zoom pbox} {
+    return [map slippy geo bbox-list [map slippy point 2geo-list $zoom [opposites $pbox]]]
+}
+
+proc ::map::slippy::tcl_point_box_corners {pbox} {
+    ::map::slippy::Check4 $pbox
+    lassign $pbox xmin ymin xmax ymax
+    return [list \
+		[list $xmin $ymin] [list $xmin $ymax] \
+		[list $xmax $ymin] [list $xmax $ymax]]
+}
+
+proc ::map::slippy::tcl_point_box_diameter {pbox} {
+    ::map::slippy::Check4 $pbox
+    lassign $pbox x0 y0 x1 y1
+    return [map slippy point distance* 0 [list $x0 $y0] [list $x1 $y1]]
+}
+
+proc ::map::slippy::tcl_point_box_opposites {pbox} {
+    ::map::slippy::Check4 $pbox
+    return [list [lrange $pbox 0 1] [lrange $pbox 2 3]]
+}
+
+proc ::map::slippy::tcl_point_box_perimeter {pbox} {
+    return [map slippy point distance-list 1 [corners $pbox]]
+}
+
+proc ::map::slippy::tcl_point_distance {pointa pointb} {
+    # points here are type point (list/p (x y))
+    ::map::slippy::Check2 $pointa
+    ::map::slippy::Check2 $pointb
+
+    lassign $pointa x0 y0
+    lassign $pointb x1 y1
+
+    return [expr { hypot ($x1 - $x0, $y1 - $y0) }]
+}
+
+proc ::map::slippy::tcl_point_distance_args {closed args} {
+    return [distance-list $closed $args]
+}
+
+proc ::map::slippy::tcl_point_distance_list {closed points} {
+    # points here are type point (list/pair (x y))
+    if {[llength $points] < 2} { return 0 }
+
+    set d 0
+    set last [lindex $points 0]
+    if {$closed} {
+	set first $last
+    }
+    foreach now [lrange $points 1 end] {
+	set d [expr {$d + [distance $last $now]}]
+	set last $now
+    }
+    if {$closed} {
+	set d [expr {$d + [distance $last $first]}]
+    }
+    return $d
+}
+
+proc ::map::slippy::tcl_point_bbox {args} {
+    return [bbox-list $args]
+}
+
+proc ::map::slippy::tcl_point_bbox_list {points} {
+    # points here are type point (list/pair (x y))
+    if {![llength $points]} { return {0 0 0 0} }
+
+    set y0  Inf
+    set x0  Inf
+    set y1 -Inf
+    set x1 -Inf
+
+    foreach g $points {
+	lassign $g x y
+	set y0 [expr {min ($y0, $y)}]
+	set x0 [expr {min ($x0, $x)}]
+	set y1 [expr {max ($y1, $y)}]
+	set x1 [expr {max ($x1, $x)}]
+
+    }
+    return [list $x0 $y0 $x1 $y1]
+}
+
+proc ::map::slippy::tcl_point_center {args} {
+    return [center-list $args]
+}
+
+proc ::map::slippy::tcl_point_center_list {points} {
+    if {![llength $points]} { return {0 0} }
+
+    set y0  Inf
+    set x0  Inf
+    set y1 -Inf
+    set x1 -Inf
+
+    foreach g $points {
+	lassign $g x y
+	set y0 [expr {min ($y0, $y)}]
+	set x0 [expr {min ($x0, $x)}]
+	set y1 [expr {max ($y1, $y)}]
+	set x1 [expr {max ($x1, $x)}]
+
+    }
+
+    set y [expr {($y0 + $y1)/2.}]
+    set x [expr {($x0 + $x1)/2.}]
+
+    # point type
+    return [list $x $y]
+}
+
+proc ::map::slippy::tcl_point_diameter {args} {
+        return [diameter-list $args]
+}
+
+proc ::map::slippy::tcl_point_diameter_list {points} {
+    if {[llength $points] < 2} { return 0 }
+
+    # The diameter of the set of points is computed as the maximum distance over the distances
+    # between all pairs of points. The algorithm below is O(n^2).
+    ##
+    # It can be done better by (a) determining the convex hull of the set of points, followed by (b)
+    # using rotating calipers over the hull to determine the diameter.
+
+    # https://en.wikipedia.org/wiki/Rotating_calipers
+    # file:///home/aku/Downloads/MQ50856.pdf
+
+    # -- no three consecutive vertices are collinear -- collinear in spherical geo ?
+
+    set d 0
+    set k 0
+    foreach a $points {
+	incr k
+	foreach b [lrange $points $k end] {
+	    set d [expr {max($d, [distance $a $b])}]
+	}
+    }
+    return $d
+}
+
+proc ::map::slippy::tcl_point_2geo {zoom p} {
+    ::map::slippy::Check/Z2 $zoom $p
+
+    variable ::map::slippy::radtodeg
+    variable ::map::slippy::pi
+    lassign $p x y
+    set length [map slippy length $zoom]
+    set lat    [expr {$radtodeg * (atan(sinh($pi * (1 - 2 * double($y) / $length))))}]
+    set lon    [expr {double($x) / $length * 360.0 - 180.0}]
+    return [list $lat $lon]
+}
+
+proc ::map::slippy::tcl_point_2geo_args {zoom args} {
+    return [2geo-list $zoom $args]
+}
+
+proc ::map::slippy::tcl_point_2geo_list {zoom points} {
+    return [lmap point $points { 2geo $zoom $point }]
+}
+
+proc ::map::slippy::tcl_point_simplify_radial {threshold closed points} {
+    # Pass input if nothing or single pixel
+    if {[llength $points] <= 1} { return $points }
+
+    # Enough data to run the full algorithm
+    set anchor [lindex $points 0]
+    set result [list $anchor]
+    set len    [llength $points]
+    set current 1
+
+    lassign $anchor ax ay
+
+    for {set current 1} {$current < $len} {incr current} {
+	set now [lindex $points $current]
+	lassign $now nx ny
+	set distance [expr {hypot($nx-$ax,$ny-$ay)}]
+	if {$distance <= $threshold} continue
+	# Far enough away from the anchor. Keep and make new anchor to check from.
+	lappend result $now
+	set ax $nx
+	set ay $ny
+    }
+
+    if {!$closed || ([llength $result] < 2)} {
+	return $result
+    }
+
+    lassign [lindex $result 0  ] fx fy
+    lassign [lindex $result end] lx ly
+    set d [expr {hypot($lx-$fx,$ly-$fy)}]
+
+    if {$d <= $threshold} { set result [lreplace $result end end] }
+
+    if {[llength $result] == 2} {
+	# If the polygon became a line make it a point anyway
+	#puts \tsingle/x
+	return [list [map slippy point center {*}$result]]
+    }
+
+    return $result
+}
+
+proc ::map::slippy::tcl_point_simplify_rdp {points} {
+    # References:
+    # - https://en.wikipedia.org/wiki/Ramer%E2%80%93Douglas%E2%80%93Peucker_algorithm
+    # - https://github.com/BobLd/RamerDouglasPeuckerNetV2
+
+    if {[llength $points] < 3} {
+	return $points
+    }
+
+    set end [llength $points] ; incr end -1
+
+    RDPCore keep $points 0 $end
+    set result [lmap i [lsort -integer [dict keys $keep]] { lindex $points $i }]
+
+    return $result
+}
+
+proc ::map::slippy::point::simplify::RDPCore {kv points i j} {
+    upvar 1 $kv keep
+
+    if {($j - $i) < 2} {
+	# no intermediate points - keep this line
+	dict set keep $i .
+	dict set keep $j .
+	return
+    }
+
+    set la [lindex $points $i]
+    set lb [lindex $points $j]
+
+    lassign [RDPFindFarthest $points $la $lb $i $j] d k
+    set t   [RDPThreshold    $points $la $lb]
+    if {$d <= $t} {
+	# Near enough, ignore the intermediaries
+	dict set keep $i .
+	dict set keep $j .
+	return
+    }
+
+    # Recurse into the pseudo-halves
+    RDPCore keep $points $i $k
+    RDPCore keep $points $k $j
+    return
+}
+
+proc ::map::slippy::point::simplify::RDPThreshold {points la lb} {
+    # References
+    # - https://core.ac.uk/download/pdf/131287229.pdf
+    # - https://github.com/BobLd/RamerDouglasPeuckerNetV2/blob/b3d00f43d0ed5951ea2b1ca86bedfa72bb3d42a4/RamerDouglasPeuckerNetV2.Test/RamerDouglasPeuckerNetV2/RamerDouglasPeucker.cs#L97-L111
+    # Modification:
+    # - special case threshold for distance (s) <= 0. Which puts tmax at +Inf (Div by zero).
+
+    lassign $la x0 y0
+    lassign $lb x1 y1
+
+    set dx [expr {$x1 - $x0}]
+    set dy [expr {$y1 - $y0}]
+    set s  [expr {hypot ($dy, $dx)}]
+
+    # If there is "no distance" at all, dismiss anything in between.
+    if {$s <= 0} { return 0	}
+
+    # Non-singular distance, continue as normal
+
+    set phi  [expr {atan2 ($dy, $dx)}]
+    set cphi [expr {cos ($phi)}]
+    set sphi [expr {sin ($phi)}]
+    set tmax [expr {(abs ($cphi) + abs ($sphi))/$s}]
+
+    # puts la..|$la
+    # puts lb..|$lb
+    # puts s...|$s
+    # puts phi.|$phi
+    # puts cphi|$cphi
+    # puts sphi|$sphi
+    # puts tmax|$tmax
+
+    set poly [expr {1 - $tmax + $tmax * $tmax}]
+
+    # puts poly|$poly
+
+    set px   [expr {$poly/$s}]
+    set pphi [expr {max (atan(abs($sphi + $cphi)*$px),
+			 atan(abs($sphi - $cphi)*$px))}]
+    set dmax [expr {$s * $pphi}]
+
+    # optimize: square for squared distance
+    return $dmax
+}
+
+proc ::map::slippy::point::simplify::RDPFindFarthest {points la lb i j} {
+    # Naive: max of distance for all intermediate points...
+    # Optimize: inline distance, avoid sqrt and recompute of commons.
+    # la ~ i, lb ~ j
+
+    set max 0
+    set d   0
+    set k  $i
+
+    for {incr k} {$k < $j} {incr k} {
+	set dx [RDPDistanceLine [lindex $points $k] $la $lb]
+	if {$dx < $d} continue
+	set d $dx
+	set max $k
+    }
+
+    return [list $d $max]
+}
+
+proc ::map::slippy::point::simplify::RDPDistanceLine {c a b} { ;# puts [info level 0]
+    # Distance of point C from line through A-B
+    # See also canvas::edit::polyline -- DistanceTo
+    # Check tcllib / math::geometry
+
+    lassign $c cx cy
+    lassign $a ax ay
+    lassign $b bx by
+
+    # Solution based on FAQ 1.02 on comp.graphics.algorithms
+    #
+    # L = hypot( Bx-Ax, By-Ay )
+    #
+    #     (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay)
+    # s = -----------------------------
+    #                 L^2
+    # dist = |s|*L
+    #
+    # =>
+    #
+    #        | (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay) |
+    # dist = ---------------------------------
+    #                       L
+
+    if {($ax == $bx) && ($ay == $by)} {
+	# (a == b) => distance is to the point
+	return [expr {hypot($cx-$ax,$cy-$ay)}]
+    }
+
+    return [expr {abs(($ay-$cy)*($bx-$ax)-($ax-$cx)*($by-$ay)) / hypot($bx-$ax,$by-$ay)}]
+}
+
+proc ::map::slippy::Check/Z2 {z p} {
+    if {[llength $p] != 2} {
+	return -code error {Bad point, expected list of 2}
+    }
+    lassign $p b c
+    if {![string is int    -strict $z]} { return -code error "expected integer but got \"$z\"" }
+    if {![string is double -strict $b]} { return -code error "expected floating-point number but got \"$b\"" }
+    if {![string is double -strict $c]} { return -code error "expected floating-point number but got \"$c\"" }
+    return
+}
+
+proc ::map::slippy::Check2 {p} {
+    if {[llength $p] != 2} {
+	return -code error {Bad point, expected list of 2}
+    }
+    lassign $p a b
+    if {![string is double -strict $a]} { return -code error "expected floating-point number but got \"$a\"" }
+    if {![string is double -strict $b]} { return -code error "expected floating-point number but got \"$b\"" }
+    return
+}
+
+proc ::map::slippy::Check4 {p} {
+    if {[llength $p] != 4} {
+	return -code error {Bad box, expected list of 4}
+    }
+    lassign $p a b c d
+    if {![string is double -strict $a]} { return -code error "expected floating-point number but got \"$a\"" }
+    if {![string is double -strict $b]} { return -code error "expected floating-point number but got \"$b\"" }
+    if {![string is double -strict $c]} { return -code error "expected floating-point number but got \"$c\"" }
+    if {![string is double -strict $d]} { return -code error "expected floating-point number but got \"$d\"" }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/pkgIndex.tcl
new file mode 100644
index 00000000..926534d3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/map/pkgIndex.tcl
@@ -0,0 +1,6 @@
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+package ifneeded map::slippy             0.8   [list source [file join $dir map_slippy.tcl]]
+package ifneeded map::slippy::fetcher    0.6   [list source [file join $dir map_slippy_fetcher.tcl]]
+package ifneeded map::slippy::cache      0.4   [list source [file join $dir map_slippy_cache.tcl]]
+package ifneeded map::geocode::nominatim 0.2   [list source [file join $dir map_geocode_nominatim.tcl]]
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mapproj/mapproj.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mapproj/mapproj.tcl
new file mode 100644
index 00000000..0dfabaa5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mapproj/mapproj.tcl
@@ -0,0 +1,1817 @@
+# mapproj.tcl --
+#
+#	Package for map projections.
+#
+# Copyright (c) 2007 by Kevin B. Kenny.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: mapproj.tcl,v 1.1 2007/08/24 22:36:35 kennykb Exp $
+#------------------------------------------------------------------------------
+
+package require Tcl 8.4
+package require math::interpolate 1.0
+package require math::special 0.2.1
+
+package provide mapproj 1.0
+
+# ::mapproj --
+#
+#	Namespace holding the procedures and values.
+
+namespace eval ::mapproj {
+
+    # Cylindrical projections
+
+    namespace export toPlateCarree fromPlateCarree
+    namespace export toCassini fromCassini
+    namespace export toCylindricalEqualArea fromCylindricalEqualArea
+    namespace export toMercator fromMercator
+
+    # Named cylindric equal-area projections with specific
+    # standard parallels
+
+    namespace export toLambertCylindricalEqualArea \
+	fromLambertCylindricalEqualArea
+    namespace export toBehrmann fromBehrmann
+    namespace export toTrystanEdwards fromTrystanEdwards
+    namespace export toHoboDyer fromHoboDyer
+    namespace export toGallPeters fromGallPeters
+    namespace export toBalthasart fromBalthasart
+
+    # Pseudocylindrical projections - equal area
+
+    namespace export toSinusoidal fromSinusoidal
+    namespace export toMillerCylindrical fromMillerCylindrical
+    namespace export toMollweide fromMollweide
+    namespace export toEckertIV fromEckertIV toEckertVI fromEckertVI
+
+    # Pseudocylindrical projections - compromise
+
+    namespace export toRobinson fromRobinson
+
+    # Azimuthal projections
+
+    namespace export toAzimuthalEquidistant fromAzimuthalEquidistant
+    namespace export toLambertAzimuthalEqualArea fromLambertAzimuthalEqualArea
+    namespace export toStereographic fromStereographic
+    namespace export toOrthographic fromOrthographic
+    namespace export toGnomonic fromGnomonic
+
+    # Pseudo-azimuthal projections
+
+    namespace export toHammer fromHammer
+
+    # Conic projections
+
+    namespace export toConicEquidistant fromConicEquidistant
+    namespace export toLambertConformalConic fromLambertConformalConic
+    namespace export toAlbersEqualAreaConic fromAlbersEqualAreaConic
+
+    # Miscellaneous projections
+
+    namespace export toPeirceQuincuncial fromPeirceQuincuncial
+
+    # Fundamental constants
+
+    variable pi [expr {acos(-1.0)}]
+    variable twopi [expr {2.0 * $pi}]
+    variable halfpi [expr {0.5 * $pi}]
+    variable quarterpi [expr {0.25 * $pi}]
+    variable threequarterpi [expr {0.75 * $pi}]
+    variable mquarterpi [expr {-0.25 * $pi}]
+    variable mthreequarterpi [expr {-0.75 * $pi}]
+    variable radian [expr {180. / $pi}]
+    variable degree [expr {$pi / 180.}]
+    variable sqrt2 [expr {sqrt(2.)}]
+    variable sqrt8 [expr {2. * $sqrt2}]
+    variable halfSqrt3 [expr {sqrt(3.) / 2.}]
+    variable halfSqrt2 [expr {sqrt(2.) / 2.}]
+    variable EckertIVK1 [expr {2.0 / sqrt($pi * (4.0 + $pi))}]
+    variable EckertIVK2 [expr {2.0 * sqrt($pi / (4.0 + $pi))}]
+    variable EckertVIK1 [expr {sqrt(2.0 + $pi)}]
+    variable PeirceQuincuncialScale 3.7081493546027438 ;# 2*K(1/2)
+    variable PeirceQuincuncialLimit 1.8540746773013719 ;# K(1/2)
+
+    # Table of parallel length and distance from equator for the
+    # Robinson projection
+
+    variable RobinsonLatitude {
+	-90.0 	-85.0	-80.0	-75.0	-70.0	-65.0
+	-60.0	-55.0	-50.0	-45.0	-40.0	-35.0
+	-30.0	-25.0	-20.0	-15.0	-10.0	-5.0
+	0.0	5.0	10.0	15.0	20.0	25.0	30.0
+	35.0	40.0	45.0	50.0	55.0	60.0
+	65.0	70.0	75.0	80.0	85.0	90.0
+    }
+    variable RobinsonPLEN {
+	0.5322	0.5722	0.6213	0.6732	0.7186	0.7597
+	0.7986	0.8350	0.8679	0.8962	0.9216	0.9427
+	0.9600	0.9730	0.9822	0.9900	0.9954	0.9986
+	1.0000	0.9986	0.9954	0.9900	0.9822	0.9730	0.9600
+	0.9427	0.9216	0.8962	0.8679	0.8350	0.7986
+	0.7597	0.7186	0.6732	0.6213	0.5722	0.5322
+    }
+    variable RobinsonPDFE {
+	-1.0000	-0.9761	-0.9394	-0.8936	-0.8435	-0.7903
+	-0.7346	-0.6769	-0.6176	-0.5571	-0.4958	-0.4340
+	-0.3720	-0.3100	-0.2480	-0.1860	-0.1240	-0.0620
+	0.0000	0.0620	0.1240	0.1860	0.2480	0.3100	0.3720
+	0.4340	0.4958	0.5571	0.6176	0.6769	0.7346
+	0.7903	0.8435	0.8936	0.9394	0.9761	1.0000
+    }
+
+    # Interpolation tables for Robinson
+
+    variable RobinsonSplinePLEN \
+	[math::interpolate::prepare-cubic-splines \
+	     $RobinsonLatitude $RobinsonPLEN]
+    variable RobinsonSplinePDFE \
+	[math::interpolate::prepare-cubic-splines \
+	     $RobinsonLatitude $RobinsonPDFE]
+    variable RobinsonM [expr {0.5072 * $pi}]
+
+    namespace import ::math::special::cn
+
+}
+
+# ::mapproj::ellF - 
+#
+#	Computes the Legendre incomplete elliptic integral of the
+#	first kind:
+#
+#	F(phi, k) = \integral_0^phi dtheta/sqrt(1 - k**2 sin**2 theta)
+#
+#
+# Parameters:
+#	phi -- Limit of integration; angle around the ellipse
+#	k -- Eccentricity
+#
+# Results:
+#	Returns F(phi, k)
+#
+# Notes:
+#	We compute this integral in terms of the Carlson elliptic integral
+#	ellRF(x, y, z).
+
+proc ::mapproj::ellF {phi k} {
+    return [ellFaux [expr {cos($phi)}] [expr {sin($phi)}] $k]
+}
+
+# ::mapproj::ellFaux -
+#
+#	Computes the Legendre incomplete elliptic integral of the
+#	first kind when circular functions of the 'phi' argument
+#	are already available.
+#
+# Parameters:
+#	cos_phi - Cosine of the argument
+#	sin_phi - Sine of the argument
+#	k - Parameter
+#
+# Results:
+#	Returns F(atan(sin_phi/cos_phi), k)
+
+proc ::mapproj::ellFaux {cos_phi sin_phi k} {
+    set rf [ellRF [expr {$cos_phi * $cos_phi}] \
+	       [expr {1.0 - $k * $k * $sin_phi * $sin_phi}] \
+	       1.0]
+    return [expr {$sin_phi * $rf}]
+}
+
+# ::mapproj::ellRF --
+#
+#	Computes the Carlson incomplete elliptic integral of the
+#	first kind:
+#
+#	RF(x, y, z) = 1/2 * integral_0^inf dt/sqrt((t+x)*(t+y)*(t+z))
+#
+# Parameters:
+#	x, y, z -- Interchangeable parameters of the integral
+#
+# Results:
+#	Returns the value of RF
+
+proc ::mapproj::ellRF {x y z} {
+    if {$x < 0.0 || $y < 0.0 || $z < 0.0} {
+	return -code error "Negative argument to Carlson's ellRF" \
+	    -errorCode "ellRF negArgument"
+    }
+    set delx 1.0; set dely 1.0; set delz 1.0
+    while {abs($delx) > 0.0025 || abs($dely) > 0.0025 || abs($delz) > 0.0025} {
+	set sx [expr {sqrt($x)}]
+	set sy [expr {sqrt($y)}]
+	set sz [expr {sqrt($z)}]
+	set len [expr {$sx * ($sy + $sz) + $sy * $sz}]
+	set x [expr {0.25 * ($x + $len)}]
+	set y [expr {0.25 * ($y + $len)}]
+	set z [expr {0.25 * ($z + $len)}]
+	set mean [expr {($x + $y + $z) / 3.0}]
+	set delx [expr {($mean - $x) / $mean}]
+	set dely [expr {($mean - $y) / $mean}]
+	set delz [expr {($mean - $z) / $mean}]
+    }
+    set e2 [expr {$delx * $dely - $delz * $delz}]
+    set e3 [expr {$delx * $dely * $delz}]
+    return [expr {(1.0 + ($e2 / 24.0 - 0.1 - 3.0 * $e3 / 44.0) * $e2
+		   + $e3 / 14.) / sqrt($mean)}]
+}
+
+# ::mapproj::toPlateCarree --
+#
+#	Project a latitude and longitude onto the plate carrée.
+#
+# Parameters:
+#	phi_0 -- Latitude of the center of the sheet in degrees
+#	lambda_0 -- Longitude of the center of sheet in degrees
+#	lambda -- Longitude of the point to be projected in degrees
+#	phi -- Latitude of the point to be projected in degrees
+#
+# Results:
+#	Returns x and y co-ordinates.  Units of x and y are Earth radii;
+#	scale is true at the Equator.
+
+proc ::mapproj::toPlateCarree {lambda_0 phi_0 lambda phi} {
+    variable degree
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set x [expr {$lambda * $degree}]
+    set y [expr {($phi - $phi_0) * $degree}]
+    return [list $x $y]
+}
+
+# ::mapproj::fromPlateCarree --
+#
+#	Solve a plate carrée projection for the
+#	latitude and longitude represented by a point on the map.
+#
+# Parameters:
+#	phi_0 -- Latitude of the center of the sheet in degrees
+#	lambda_0 -- Longitude of the center of projection
+#	x,y -- normalized x and y co-ordinates of a point on the map
+#
+# Results:
+#	Returns a list consisting of the longitude and latitude in degrees.
+
+proc ::mapproj::fromPlateCarree {phi_0 lambda_0 x y} {
+    variable radian
+    set lambda [expr {$lambda_0 + $x * $radian + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set phi [expr {$y * $radian + $phi_0}]
+    return [list $lambda $phi]
+}
+
+# mapproj::toCylindricalEqualArea --
+#
+#	Project a latitude and longitude into cylindrical equal-area
+#	co-ordinates.
+#
+# Parameters:
+#	phi_1 --    Standard latitude in degrees
+#	phi_0 -- Latitude of the center of the sheet in degrees
+#	lambda_0 -- Longitude of the center of projection in degrees
+#	lambda --   Longitude of the point to be projected in degrees
+#	phi -- Latitude of the point to be projected in degrees
+#
+# Results:
+#	Returns x and y co-ordinates.  Units of x and y are Earth radii;
+#	scale is true at the reference latitude
+
+proc ::mapproj::toCylindricalEqualArea {phi_1 lambda_0 phi_0 lambda phi} {
+    variable degree
+    set cos_phi_s [expr {cos($phi_1 * $degree)}]
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set x [expr {$lambda * $degree * $cos_phi_s}]
+    set y0 [expr {sin($phi_0 * $degree) / $cos_phi_s}]
+    set y [expr {sin($phi * $degree) / $cos_phi_s}]
+    return [list $x [expr {$y - $y0}]]
+}
+
+# ::mapproj::fromCylindricalEqualArea --
+#
+#	Solve a cylindrical equal area map projection for the
+#	latitude and longitude represented by a point on the map.
+#
+# Parameters:
+#	phi_1 -- Standard latitude in degrees
+#	phi_0 -- Latitude of the center of the sheet in degrees
+#	lambda_0 -- Longitude of the center of sheet in degrees
+#	x,y -- normalized x and y co-ordinates of a point on the map
+#
+# Results:
+#	Returns a list consisting of the longitude and latitude in degrees.
+
+proc ::mapproj::fromCylindricalEqualArea {phi_1 lambda_0 phi_0 x y} {
+    variable degree
+    variable radian
+    set cos_phi_s [expr {cos($phi_1 * $degree)}]
+    set lambda [expr {$lambda_0 + $x / $cos_phi_s * $radian + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set y0 [expr {sin($phi_0 * $degree) / $cos_phi_s}]
+    set phi [expr {asin(($y + $y0) * $cos_phi_s) * $radian}]
+    return [list $lambda $phi]
+}
+
+# ::mapproj::toMercator --
+#
+#	Project a latitude and longitude into the Mercator projection
+#	co-ordinates.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection in degrees
+#	phi_0 -- Latitude of the center of sheet in degrees
+#	lambda --   Longitude of the point to be projected in degrees
+#	phi -- Latitude of the point to be projected in degrees
+#
+# Results:
+#	Returns x and y co-ordinates in Earth radii. Scale is true
+#	at the Equator and increases without bounds toward the Poles.
+
+proc ::mapproj::toMercator {lambda_0 phi_0 lambda phi} {
+    variable trace; if {[info exists trace]} { puts [info level 0] }
+    variable degree
+    variable quarterpi
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set x [expr {$lambda * $degree}]
+    set y [expr {log(tan($quarterpi + 0.5 * $phi * $degree))}]
+    set y0 [expr {log(tan($quarterpi + 0.5 * $phi_0 * $degree))}]
+    if {[info exists trace]} { puts "[info level 0] -> $x [expr {$y - $y0}]" }
+    return [list $x [expr {$y - $y0}]]
+}
+
+# ::mapproj::fromMercator --
+#
+#	Converts Mercator map co-ordinates to latitude and longitude.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection
+#	phi_0 -- Latitude of the center of sheet in degrees
+#	x,y -- normalized x and y co-ordinates of a point on the map
+#
+# Results:
+#	Returns a list consisting of the longitude and latitude in degrees.
+
+proc ::mapproj::fromMercator {lambda_0 phi_0 x y} {
+    variable quarterpi
+    variable degree
+    variable radian
+    set y0 [expr {log(tan($quarterpi + 0.5 * $phi_0 * $degree))}]
+    set lambda [expr {$lambda_0 + $x  * $radian + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set phi [expr {$radian * 2.0 * atan(exp($y + $y0)) - 90.0}]
+    return [list $lambda $phi]
+}
+
+# ::mapproj::toMillerCylindrical --
+#
+#	Project a latitude and longitude into the Miller Cylindrical projection
+#	co-ordinates.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection in degrees
+#	lambda --   Longitude of the point to be projected in degrees
+#	phi -- Latitude of the point to be projected in degrees
+#
+# Results:
+#	Returns x and y co-ordinates.  The x co-ordinate ranges from
+#	-$pi to pi.
+
+proc ::mapproj::toMillerCylindrical {lambda_0 lambda phi} {
+    foreach {x y} [toMercator $lambda_0 0.0 \
+		       $lambda [expr {0.8 * $phi}]] break
+    set y [expr {1.25 * $y}]
+    return [list $x $y]
+}
+
+# ::mapproj::fromMillerCylindrical --
+#
+#	Converts Miller Cylindrical projected  map co-ordinates 
+#	to latitude and longitude.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection
+#	x,y -- normalized x and y co-ordinates of a point on the map
+#
+# Results:
+#	Returns a list consisting of the longitude and latitude in degrees.
+
+proc ::mapproj::fromMillerCylindrical {lambda_0 x y} {
+    foreach {lambda phi} [fromMercator $lambda_0 0.0 \
+			      $x [expr {0.8 * $y}]] break
+    return [list $lambda [expr {1.25 * $phi}]]
+}
+
+# ::mapproj::toSinusoidal --
+#
+#	Project a latitude and longitude into the sinusoidal
+#	(Sanson-Flamsteed) projection.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection in degrees
+#	phi_0 -- Latitude of the center of the sheet, in degrees
+#	lambda --   Longitude of the point to be projected in degrees
+#	phi -- Latitude of the point to be projected in degrees
+#
+# Results:
+#	Returns x and y co-ordinates, in Earth radii. 
+#	Scale is true along the Equator and central meridian.
+
+proc ::mapproj::toSinusoidal {lambda_0 phi_0 lambda phi} {
+    variable degree
+    variable quarterpi
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {($lambda - 180.) * $degree}]
+    set phi [expr {$phi * $degree}]
+    set x [expr {$lambda * cos($phi)}]
+    set phi [expr {$phi - $phi_0 * $degree}]
+    return [list $x $phi]
+}
+
+# ::mapproj::fromSinusoidal --
+#
+#	Converts sinusoidal (Sanson-Flamsteed) map co-ordinates 
+#	to latitude and longitude.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection
+#	phi_0 -- Latitude of the center of the sheet, in degrees
+#	x,y -- normalized x and y co-ordinates of a point on the map
+#
+# Results:
+#	Returns a list consisting of the longitude and latitude in degrees.
+
+proc ::mapproj::fromSinusoidal {lambda_0 phi_0 x y} {
+    variable degree
+    variable radian
+    set y [expr {$y + $phi_0 * $degree}]
+    set phi [expr {$y * $radian}]
+    set lambda [expr {180. + $lambda_0 + $radian * $x / cos($y)}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    return [list $lambda $phi]
+}
+
+# ::mapproj::toMollweide --
+#
+#	Project a latitude and longitude into the Mollweide projection
+#	co-ordinates.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection in degrees
+#	lambda --   Longitude of the point to be projected in degrees
+#	phi -- Latitude of the point to be projected in degrees
+#
+# Results:
+#	Returns x and y co-ordinates, in Earth radii. 
+#	Scale is true along the 40 deg 44 min parallels
+
+proc ::mapproj::toMollweide {lambda_0 lambda phi} {
+    variable degree
+    variable pi
+    variable halfpi
+    variable sqrt2
+    variable sqrt8
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {($lambda - 180.) * $degree}]
+    set phi [expr {$phi * $degree}]
+    set theta [expr {2.0 * asin(2.0 * $phi / $pi)}]
+    set diff 1.0
+    set pisinphi [expr {$pi * sin($phi)}]
+    while {abs($diff) >= 1.0e-4} {
+	set diff [expr {($theta + sin($theta) - $pisinphi)
+			/ (1.0 + cos($theta))}]
+	set theta [expr {$theta - $diff}]
+    }
+    set theta [expr {0.5 * $theta}]
+    set x [expr {$sqrt8 * $lambda * cos($theta) / $pi}]
+    set y [expr {$sqrt2 * sin($theta)}]
+    return [list $x $y]
+}
+
+# ::mapproj::fromMollweide --
+#
+#	Converts Mollweide projected  map co-ordinates to latitude 
+#	and longitude.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection
+#	x,y -- normalized x and y co-ordinates of a point on the map
+#
+# Results:
+#	Returns a list consisting of the longitude and latitude in degrees.
+
+proc ::mapproj::fromMollweide {lambda_0 x y} {
+    variable pi
+    variable radian
+    variable degree
+    variable halfpi
+    variable sqrt2
+    variable sqrt8
+    set theta [expr {asin($y / $sqrt2)}]
+    set lambda [expr {$lambda_0 + $radian * $pi * $x / 
+		      ($sqrt8 * cos($theta)) + 180.}]
+    set phi [expr {asin((2.0 * $theta + sin(2.0 * $theta)) / $pi)}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    return [list $lambda [expr {$phi * $radian}]]
+}
+
+# ::mapproj::toEckertIV --
+#
+#	Project a latitude and longitude into the Eckert IV projection
+#	co-ordinates.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection in degrees
+#	lambda --   Longitude of the point to be projected in degrees
+#	phi -- Latitude of the point to be projected in degrees
+#
+# Results:
+#	Returns x and y co-ordinates.  Scale is true along the 40 deg 30 min
+#	parallels.
+
+proc ::mapproj::toEckertIV {lambda_0 lambda phi} {
+    variable degree
+    variable pi
+    variable halfpi
+    variable EckertIVK1
+    variable EckertIVK2
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {($lambda - 180.) * $degree}]
+    set phi [expr {$phi * $degree}]
+    set theta [expr {$phi / 2}]
+    set diff 1.0
+    set A [expr {(2.0 + $halfpi) * sin($phi)}]
+    while {abs($diff) >= 1.0e-4} {
+	set costheta [expr {cos($theta)}]
+	set sintheta [expr {sin($theta)}]
+	set diff \
+	    [expr {($theta + $sintheta * $costheta + 2.0 * sin($theta) - $A)
+		   / (2.0 * $costheta * (1.0 + $costheta))}]
+	set theta [expr {$theta - $diff}]
+    }
+    set x [expr {$EckertIVK1 * $lambda * (1.0 + cos($theta))}]
+    set y [expr {$EckertIVK2 * sin($theta)}]
+    return [list $x $y]
+}
+
+# ::mapproj::fromEckertIV --
+#
+#	Converts Eckert IV projected  map co-ordinates to latitude 
+#	and longitude.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection
+#	x,y -- normalized x and y co-ordinates of a point on the map
+#
+# Results:
+#	Returns a list consisting of the longitude and latitude in degrees.
+
+proc ::mapproj::fromEckertIV {lambda_0 x y} {
+    variable pi
+    variable radian
+    variable degree
+    variable halfpi
+    variable sqrt2
+    variable EckertIVK1
+    variable EckertIVK2
+    set sintheta [expr {$y / $EckertIVK2}]
+    set costheta [expr {sqrt(1.0 - $sintheta * $sintheta)}]
+    set theta [expr {atan2($sintheta, $costheta)}]
+    set phi [expr {asin(($theta + $sintheta*$costheta + 2.*$sintheta)
+			/ (2. + $halfpi))}]
+    set lambda [expr {180.0 + $lambda_0
+		      + $radian / $EckertIVK1 * $x / (1.0 + $costheta)}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    return [list $lambda [expr {$phi * $radian}]]
+}
+
+# ::mapproj::toEckertVI --
+#
+#	Project a latitude and longitude into the Eckert IV projection
+#	co-ordinates.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection in degrees
+#	lambda --   Longitude of the point to be projected in degrees
+#	phi -- Latitude of the point to be projected in degrees
+#
+# Results:
+#	Returns x and y co-ordinates.  Scale is true along the 40 deg 30 min
+#	parallels.
+
+proc ::mapproj::toEckertVI {lambda_0 lambda phi} {
+    variable degree
+    variable pi
+    variable halfpi
+    variable EckertVIK1
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {($lambda - 180.) * $degree}]
+    set phi [expr {$phi * $degree}]
+    set theta [expr {$phi / 2}]
+    set diff 1.0
+    set A [expr {(1.0 + $halfpi) * sin($phi)}]
+    while {abs($diff) >= 1.0e-4} {
+	set costheta [expr {cos($theta)}]
+	set sintheta [expr {sin($theta)}]
+	set diff \
+	    [expr {($theta + $sintheta - $A)
+		   / (1.0 + $costheta)}]
+	set theta [expr {$theta - $diff}]
+    }
+    set x [expr {$lambda * (1.0 + cos($theta)) / $EckertVIK1}]
+    set y [expr {2.0 * $theta / $EckertVIK1}]
+    return [list $x $y]
+}
+
+# ::mapproj::fromEckertVI --
+#
+#	Converts Eckert IV projected  map co-ordinates to latitude 
+#	and longitude.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection
+#	x,y -- normalized x and y co-ordinates of a point on the map
+#
+# Results:
+#	Returns a list consisting of the longitude and latitude in degrees.
+
+proc ::mapproj::fromEckertVI {lambda_0 x y} {
+    variable pi
+    variable radian
+    variable degree
+    variable halfpi
+    variable sqrt2
+    variable EckertVIK1
+    puts [info level 0]
+    set theta [expr {0.5 * $EckertVIK1 * $y}]
+    puts [list theta = $theta]
+    set phi [expr {asin(($theta + sin($theta)) / (1.0 + $halfpi))}]
+    puts [list phi = $phi]
+    set lambda [expr {180.0 + $lambda_0 + $radian * $EckertVIK1 * $x
+		      / (1 + cos($theta))}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    return [list $lambda [expr {$phi * $radian}]]
+}
+
+# ::mapproj::toRobinson --
+#
+#	Project a latitude and longitude into the Robinson projection.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection in degrees
+#	lambda --   Longitude of the point to be projected in degrees
+#	phi -- Latitude of the point to be projected in degrees
+#
+# Results:
+#	Returns x and y co-ordinates, in Earth radii. 
+#	Scale is true along the Equator.
+
+proc ::mapproj::toRobinson {lambda_0 lambda phi} {
+    variable RobinsonLatitude
+    variable RobinsonSplinePLEN
+    variable RobinsonSplinePDFE
+    variable RobinsonM
+    variable pi
+    variable degree
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set y [math::interpolate::interp-cubic-splines $RobinsonSplinePDFE $phi]
+    set y [expr {$RobinsonM * $y}]
+    set s [math::interpolate::interp-cubic-splines $RobinsonSplinePLEN $phi]
+    set x [expr {$degree * $s * $lambda}]
+    return [list $x $y]
+}
+
+# ::mapproj::fromRobinson --
+#
+#	Solve the Robinson projection for the
+#	latitude and longitude represented by a point on the map.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection
+#	x,y -- normalized x and y co-ordinates of a point on the map
+#
+# Results:
+#	Returns a list consisting of the longitude and latitude in degrees.
+
+proc ::mapproj::fromRobinson {lambda_0 x y} {
+    variable RobinsonLatitude
+    variable RobinsonPDFE
+    variable RobinsonSplinePLEN
+    variable RobinsonSplinePDFE
+    variable RobinsonM
+    variable radian
+
+    # We know that Robinson latitudes are equally spaced from [-90..90]
+    # at 5-degree intervals.  Find the values for RobinsonPDFE that
+    # bracket the y co-ordinate.
+
+    set y [expr {$y / $RobinsonM}]
+    set l 0
+    set u [expr {[llength $RobinsonPDFE] - 1}]
+    while {$l < $u} {
+	set m [expr {($l + $u + 1) / 2}]
+	if {$y >= [lindex $RobinsonPDFE $m]} {
+	    set l $m
+	} else {
+	    set u [expr {$m - 1}]
+	}
+    }
+    set u [lindex $RobinsonLatitude [expr {$l+1}]]
+    set l [lindex $RobinsonLatitude $l]
+    for {set i 0} {$i < 12} {incr i} {
+	set m [expr {0.5 * ($u + $l)}]
+	set ystar [math::interpolate::interp-cubic-splines \
+		       $RobinsonSplinePDFE $m]
+	if {$ystar < $y} {
+	    set l $m
+	} else {
+	    set u $m
+	}
+    }
+    puts "latitude $m"
+    set s [math::interpolate::interp-cubic-splines $RobinsonSplinePLEN $m]
+    puts "parallel length $s"
+    set lambda [expr {180.0 + $lambda_0 + $radian * $x / $s}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    return [list $lambda $m]
+}
+
+# ::mapproj::toCassini --
+#
+#	Project a latitude and longitude into the Cassini projection.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection in degrees
+#	phi_0 -- Latitude of the center of the sheet
+#	lambda --   Longitude of the point to be projected in degrees
+#	phi -- Latitude of the point to be projected in degrees
+#
+# Results:
+#	Returns x and y co-ordinates, in Earth radii. 
+#	Scale is true along the central meridian.
+
+proc ::mapproj::toCassini {lambda_0 phi_0 lambda phi} {
+    variable degree
+    variable pi
+    variable twopi
+    variable quarterpi
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {($lambda - 180.) * $degree}]
+    set phi [expr {$phi * $degree}]
+    set x [expr {asin(cos($phi) * sin($lambda))}]
+    set y [expr {atan2(tan($phi), cos($lambda)) - $degree * $phi_0}]
+    if {$y < -$pi} {
+	set y [expr {$y + $twopi}]
+    } elseif {$y > $pi} {
+	set y [expr {$y - $twopi}]
+    }
+    return [list $x $y]
+}
+
+# ::mapproj::fromCassini --
+#
+#	Converts Cassini map co-ordinates to latitude and longitude.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection
+#	phi_0 -- Latitude of the center of the sheet
+#	x,y -- normalized x and y co-ordinates of a point on the map
+#
+# Results:
+#	Returns a list consisting of the longitude and latitude in degrees.
+
+proc ::mapproj::fromCassini {lambda_0 phi_0 x y} {
+    variable degree
+    variable radian
+    set y [expr {$y + $degree * $phi_0}]
+    set phi [expr {$radian * asin(cos($x) * sin($y))}]
+    set lambda [expr {180. + $lambda_0 + $radian * atan2(tan($x), cos($y))}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    return [list $lambda $phi]
+}
+
+# ::mapproj::toPeirceQuincuncial
+#
+#	Converts geodetic co-ordinates to the Peirce Quincuncial projection.
+#
+# Parameters:
+#	lambda_0 - Longitude of the central meridian.  (Conventionally, 20.0).
+#	lambda - Longitude of the point to be projected in degrees
+#	phi - Latitude of the point to be projected in degrees.
+#
+# Results:
+#	Returns a list of the x and y co-ordinates.
+
+proc ::mapproj::toPeirceQuincuncial {lambda_0 lambda phi} {
+    variable degree
+    variable halfSqrt2
+    variable pi
+    variable quarterpi
+    variable mquarterpi
+    variable threequarterpi
+    variable mthreequarterpi
+    variable PeirceQuincuncialScale
+
+    # Convert latitude and longitude to radians relative to the
+    # central meridian
+
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {($lambda - 180.) * $degree}]
+    set phi [expr {$phi * $degree}]
+
+    # Compute the auxiliary quantities 'm' and 'n'. Set 'm' to match
+    # the sign of 'lambda' and 'n' to be positive if |lambda| > pi/2
+
+    set cos_phiosqrt2 [expr {$halfSqrt2 * cos($phi)}]
+    set cos_lambda [expr {cos($lambda)}]
+    set sin_lambda [expr {sin($lambda)}]
+    set cos_a [expr {$cos_phiosqrt2 * ($sin_lambda + $cos_lambda)}]
+    set cos_b [expr {$cos_phiosqrt2 * ($sin_lambda - $cos_lambda)}]
+    set sin_a [expr {sqrt(1.0 - $cos_a * $cos_a)}]
+    set sin_b [expr {sqrt(1.0 - $cos_b * $cos_b)}]
+    set cos_a_cos_b [expr {$cos_a * $cos_b}]
+    set sin_a_sin_b [expr {$sin_a * $sin_b}]
+    set sin2_m [expr {1.0 + $cos_a_cos_b - $sin_a_sin_b}]
+    set sin2_n [expr {1.0 - $cos_a_cos_b - $sin_a_sin_b}]
+    if {$sin2_m < 0.0} {set sin2_m 0.0}
+    set sin_m [expr {sqrt($sin2_m)}]
+    if {$sin2_m > 1.0} { set sin2_m 1.0 }
+    set cos_m [expr {sqrt(1.0 - $sin2_m)}]
+    if {$sin_lambda < 0.0} {
+	set sin_m [expr {-$sin_m}]
+    }
+   if {$sin2_n < 0.0} { set sin2_n 0.0 }
+    set sin_n [expr {sqrt($sin2_n)}]
+    if {$sin2_n > 1.0} { set sin2_n 1.0 }
+    set cos_n [expr {sqrt(1.0 - $sin2_n)}]
+    if {$cos_lambda > 0.0} {
+	set sin_n [expr {-$sin_n}]
+    }
+
+    # Compute elliptic integrals to map the disc to the square
+
+    set x [ellFaux $cos_m $sin_m $halfSqrt2]
+    set y [ellFaux $cos_n $sin_n $halfSqrt2]
+
+    # Reflect the Southern Hemisphere outward
+
+    if {$phi < 0} {
+	if {$lambda < $mthreequarterpi} {
+	    set y [expr {$PeirceQuincuncialScale - $y}]
+	} elseif {$lambda < $mquarterpi} {
+	    set x [expr {-$PeirceQuincuncialScale - $x}]
+	} elseif {$lambda < $quarterpi} {
+	    set y [expr {-$PeirceQuincuncialScale - $y}]
+	} elseif {$lambda < $threequarterpi} {
+	    set x [expr {$PeirceQuincuncialScale - $x}]
+	} else {
+	    set y [expr {$PeirceQuincuncialScale - $y}]
+	}
+    }
+
+    # Rotate the square by 45 degrees to fit the screen better
+
+    set X [expr {($x - $y) * $halfSqrt2}]
+    set Y [expr {($x + $y) * $halfSqrt2}]
+
+    return [list $X $Y]
+}
+
+# ::mapproj::fromPeirceQuincuncial --
+#
+#	Converts Peirce Quincuncial map co-ordinates to latitude and longitude.
+#
+# Parameters:
+#	lambda_0 -- Longitude of the center of projection
+#	x,y -- normalized x and y co-ordinates of a point on the map
+#
+# Results:
+#	Returns a list consisting of the longitude and latitude in degrees.
+
+proc ::mapproj::fromPeirceQuincuncial {lambda_0 x y} {
+    variable halfSqrt2
+    variable radian
+    variable pi
+    variable halfpi
+    variable quarterpi
+    variable PeirceQuincuncialScale
+    variable PeirceQuincuncialLimit
+
+    # Rotate x and y 45 degrees
+
+    set X [expr {($x + $y) * $halfSqrt2}]
+    set Y [expr {($y - $x) * $halfSqrt2}]
+
+    # Reflect Southern Hemisphere into the Northern
+
+    set southern 0
+    if {$X < -$PeirceQuincuncialLimit} {
+	set X [expr {-$PeirceQuincuncialScale - $X}]
+	set southern 1
+    } elseif {$X > $PeirceQuincuncialLimit} {
+	set X [expr {$PeirceQuincuncialScale - $X}]
+	set southern 1
+    } elseif {$Y < -$PeirceQuincuncialLimit} {
+	set Y [expr {-$PeirceQuincuncialScale - $Y}]
+	set southern 1
+    } elseif {$Y > $PeirceQuincuncialLimit} {
+	set Y [expr {$PeirceQuincuncialScale - $Y}]
+	set southern 1
+    }
+
+    # Now we know that latitude will be positive.  If X is negative, then
+    # longitude will be negative; reflect the Western Hemisphere into the
+    # Eastern.
+
+    set western 0
+    if {$X < 0.0} {
+	set western 1
+	set X [expr {-$X}]
+    }
+
+    # If Y is positive, the point is in the back hemisphere.  Reflect
+    # it to the front.
+
+    set back 0
+    if {$Y > 0.0} {
+	set back 1
+	set Y [expr {-$Y}]
+    }
+
+    # Finally, constrain longitude to be less than pi/4, by reflecting across
+    # the 45 degree meridian.
+
+    set complement 0
+    if {$X > -$Y} {
+	set complement 1
+	set t [expr {-$X}]
+	set X [expr {-$Y}]
+	set Y $t
+    }
+
+    # Compute the elliptic functions to map the plane onto the sphere
+
+    set cnx [cn $X $halfSqrt2]
+    set cny [cn $Y $halfSqrt2]
+
+    # Undo the mapping to latitude and longitude
+
+    set a1 [expr {acos(-$cnx * $cnx)}]
+    set a2 [expr {acos($cny * $cny)}]
+    set b [expr {0.5 * ($a1 + $a2)}]
+    set a [expr {0.5 * ($a1 - $a2)}]
+    set cos_a [expr {cos($a)}]
+    set cos_b [expr {-cos($b)}]
+    set lambda [expr {$quarterpi - atan2($cos_b, $cos_a)}]
+    set phi [expr {acos(hypot($cos_b, $cos_a))}]
+
+    # Undo the reflections that were done above, to get correct latitude
+    # and longitude
+
+    if {$complement} {
+	set lambda [expr {$halfpi - $lambda}]
+    }
+    if {$back} {
+	set lambda [expr {$pi - $lambda}]
+    }
+    if {$western} {
+	set lambda [expr {-$lambda}]
+    }
+    if {$southern} {
+	set phi [expr {-$phi}]
+    }
+
+    # Convert latitude and longitude to degrees
+
+    set lambda [expr {$lambda * $radian + 180. + $lambda_0}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set phi [expr {$phi * $radian}]
+
+    return [list $lambda $phi]
+}
+
+# ::mapproj::RotateCartesianY
+#
+#	Rotates Cartesian co-ordinates about the y axis
+#
+# Parameters:
+#	phi - Angle (in degrees) about which to rotate.
+#	x,y,z - Cartesian co-ordinates
+#
+# Results:
+#	Returns a three-element list giving the rotated co-ordinates.
+
+proc ::mapproj::RotateCartesianY {phi x y z} {
+    variable degree
+    set phi [expr {$degree * $phi}]
+    set cos_phi [expr {cos($phi)}]
+    set sin_phi [expr {sin($phi)}]
+    return [list [expr {$x * $cos_phi - $z * $sin_phi}] \
+		$y \
+		[expr {$z * $cos_phi + $x * $sin_phi}]]
+}
+
+# ::mapproj::ToCartesian --
+#
+#	Converts geodetic co-ordinates to Cartesian
+#
+# Parameters:
+#	lambda - Longitude of the point to be projected, in degrees
+#	phi - Latitude of the point to be projected, in degrees
+#
+# Results:
+#	Returns a three-element list, x, y, z where x is the component
+#	in the direction of longitude 0, latitude 0, y is the component
+#	in the direction of longitude 90 East, latitude 0, and
+#	z is the component in the direction of the North Pole
+#
+# Auxiliary procedure used in several projections to convert
+# geodetic coordinates to Cartesian range and bearing.
+
+proc ::mapproj::ToCartesian {lambda phi} {
+    variable degree
+    set lambda [expr {$degree * $lambda}]
+    set phi [expr {$degree * $phi}]
+    set cos_phi [expr cos($phi)]
+    return [list [expr {$cos_phi * cos($lambda)}] \
+		[expr {$cos_phi * sin($lambda)}] \
+		[expr {sin($phi)}]]
+}
+
+# ::mapproj::CartesianToRangeAndBearing
+#
+#	Transforms view-relative Cartesian co-ordinates to range and
+#	bearing.
+#
+# Parameters:
+#	x,y,z - Cartesian co-ordinates relative to center of Earth;
+#	+x points to the viewer and +z to the "view-up" direction.
+#
+# Results:
+#	Returns a three-element list containing, in order,
+#	the cosine (easting) of the bearing, the sine (northing) of the
+#	bearing, and the range.
+
+proc ::mapproj::CartesianToRangeAndBearing {x y z} {
+    set c [expr {hypot($z, $y)}]
+    if {$c == 0} {
+	set cos_b 1.0
+	set sin_b 0.0
+    } else {
+	set cos_b [expr {$y / $c}]
+	set sin_b [expr {$z / $c}]
+    }
+    set range [expr {atan2($c, $x)}]
+    return [list $cos_b $sin_b $range]
+}
+
+# ::mapproj::RangeAndBearingToCartesian --
+#
+#	Converts range and bearing to Cartesian co-ordinates.
+#
+# Parameters:
+#	cos_b, sin_b -- Cosine (easting) and sine (northing) of the bearing
+#	range - Range, in Earth radii
+#
+# Results:
+#	Returns Cartesian co-ordinates relative to center of Earth.
+#	x is toward the station, and z is "view up"
+
+proc ::mapproj::RangeAndBearingToCartesian {cos_b sin_b range} {
+    set c [expr {sin($range)}]
+    set x [expr {cos($range)}]
+    set y [expr {$cos_b * $c}]
+    set z [expr {$sin_b * $c}]
+    return [list $x $y $z]
+}
+    
+
+# ::mapproj::CartesianToSpherical --
+#
+#	Transforms Cartesian x, y, z to spherical co-ordinates
+#
+# Parameters:
+#	x, y, z -- Coordinates of a point on the surface of the Earth,
+#	           in Earth radii
+#
+# Results:
+#	Returns a two-element list comprising longitude and latitude
+#	in radians
+
+proc ::mapproj::CartesianToSpherical {x y z} {
+    return [list [expr {atan2($y, $x)}] [expr {atan2($z, hypot($y, $x))}]]
+}
+
+# ::mapproj::toOrthographic --
+#
+#	Transforms latitude and longitude to x and y co-ordinates
+#	on an orthographic projection.  Scale is true only at the
+#	point of projection.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of projection
+#			   in degrees
+#	lambda, phi -- Longitude and latitude of the point to be projected
+#		       in degrees
+#
+# Results:
+#	Returns map x and y co-ordinates, in Earth radii.
+
+proc ::mapproj::toOrthographic {lambda_0 phi_0 lambda phi} {
+    foreach {x y z} [ToCartesian [expr {$lambda-$lambda_0}] $phi] \
+	break
+    foreach {x y z} [RotateCartesianY [expr {-$phi_0}] $x $y $z] \
+	break
+    if {$x < 0} {
+	return {}
+    } else {
+	return [list $y $z]
+    }
+}
+
+# ::mapproj::fromOrthographic --
+#
+#	Transforms x and y on an orthographic projection to latitude
+#	and longitude.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of projection
+#			   in degrees
+#	x, y -- Co-ordinates of the projected point, in Earth radii
+#
+# Results:
+#	Returns a two element list containing longitude and latitude
+#	in degrees.
+
+proc ::mapproj::fromOrthographic {lambda_0 phi_0 x y} {
+    variable radian
+    set r [expr {hypot($x, $y)}]
+    set alpha [expr {asin($r)}]
+    set z [expr {sqrt(1.0 - $r*$r)}]
+    foreach {x y z} [RotateCartesianY $phi_0 $z $x $y] break
+    foreach {lambda phi} [CartesianToSpherical $x $y $z] break
+
+    # Convert latitude and longitude to degrees
+
+    set lambda [expr {$lambda * $radian + 180. + $lambda_0}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set phi [expr {$phi * $radian}]
+
+    return [list $lambda $phi]
+}
+
+# ::mapproj::toStereographic --
+#
+#	Transforms latitude and longitude to x and y co-ordinates
+#	on an orthographic projection.  Scale is true only at the
+#	point of projection.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of projection
+#			   in degrees
+#	lambda, phi -- Longitude and latitude of the point to be projected
+#		       in degrees
+#
+# Results:
+#	Returns map x and y co-ordinates, in Earth radii.
+
+proc ::mapproj::toStereographic {lambda_0 phi_0 lambda phi} {
+    foreach {x y z} [ToCartesian [expr {$lambda-$lambda_0}] $phi] \
+	break
+    foreach {x y z} [RotateCartesianY [expr {-$phi_0}] $x $y $z] \
+	break
+    if {$x < -0.5} {
+	return {}
+    } else {
+	set y [expr {2. * $y / (1. + $x)}]
+	set z [expr {2. * $z / (1. + $x)}]
+	return [list $y $z]
+    }
+}
+
+# ::mapproj::fromStereographic --
+#
+#	Transforms x and y on an orthographic projection to latitude
+#	and longitude.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of projection
+#			   in degrees
+#	x, y -- Co-ordinates of the projected point, in Earth radii
+#
+# Results:
+#	Returns a two element list containing longitude and latitude
+#	in degrees.
+
+proc ::mapproj::fromStereographic {lambda_0 phi_0 x y} {
+    variable radian
+    variable halfpi
+    set denom [expr {4.0 + $x*$x + $y*$y}]
+    foreach {x y z} [list \
+			 [expr {(4.0 - $x*$x - $y*$y) / $denom}] \
+			 [expr {4. * $x / $denom}] \
+			 [expr {4. * $y / $denom}]] break
+    
+    foreach {x y z} [RotateCartesianY $phi_0 $x $y $z] break
+    foreach {lambda phi} [CartesianToSpherical $x $y $z] break
+
+    # Convert latitude and longitude to degrees
+
+    set lambda [expr {$lambda * $radian + 180. + $lambda_0}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set phi [expr {$phi * $radian}]
+
+    return [list $lambda $phi]
+}
+
+# ::mapproj::toGnomonic --
+#
+#	Transforms latitude and longitude to x and y co-ordinates
+#	on an orthographic projection.  Scale is true only at the
+#	point of projection.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of projection
+#			   in degrees
+#	lambda, phi -- Longitude and latitude of the point to be projected
+#		       in degrees
+#
+# Results:
+#	Returns map x and y co-ordinates, in Earth radii.
+
+proc ::mapproj::toGnomonic {lambda_0 phi_0 lambda phi} {
+    foreach {x y z} [ToCartesian [expr {$lambda-$lambda_0}] $phi] \
+	break
+    foreach {x y z} [RotateCartesianY [expr {-$phi_0}] $x $y $z] \
+	break
+    if {$x < 0.01} {
+	return {}
+    } else {
+	set y [expr {$y / $x}]
+	set z [expr {$z / $x}]
+	return [list $y $z]
+    }
+}
+
+# ::mapproj::fromGnomonic --
+#
+#	Transforms x and y on an orthographic projection to latitude
+#	and longitude.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of projection
+#			   in degrees
+#	x, y -- Co-ordinates of the projected point, in Earth radii
+#
+# Results:
+#	Returns a two element list containing longitude and latitude
+#	in degrees.
+
+proc ::mapproj::fromGnomonic {lambda_0 phi_0 x y} {
+    variable radian
+    variable halfpi
+    set denom [expr {hypot(1.0, hypot($x, $y))}]
+    foreach {x y z} [list \
+			 [expr {1.0 / $denom}] \
+			 [expr {$x / $denom}] \
+			 [expr {$y / $denom}]] break
+    
+    foreach {x y z} [RotateCartesianY $phi_0 $x $y $z] break
+    foreach {lambda phi} [CartesianToSpherical $x $y $z] break
+
+    # Convert latitude and longitude to degrees
+
+    set lambda [expr {$lambda * $radian + 180. + $lambda_0}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set phi [expr {$phi * $radian}]
+
+    return [list $lambda $phi]
+}
+
+# ::mapproj::toAzimuthalEquidistant --
+#
+#	Transforms latitude and longitude to x and y co-ordinates
+#	on an orthographic projection.  Scale is true only at the
+#	point of projection.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of projection
+#			   in degrees
+#	lambda, phi -- Longitude and latitude of the point to be projected
+#		       in degrees
+#
+# Results:
+#	Returns map x and y co-ordinates, in Earth radii.
+
+proc ::mapproj::toAzimuthalEquidistant {lambda_0 phi_0 lambda phi} {
+    foreach {x y z} [ToCartesian [expr {$lambda-$lambda_0}] $phi] \
+	break
+    foreach {x y z} [RotateCartesianY [expr {-$phi_0}] $x $y $z] \
+	break
+    foreach {cs sn range} [CartesianToRangeAndBearing $x $y $z] break
+    return [list [expr {$cs * $range}] [expr {$sn * $range}]]
+}
+
+# ::mapproj::fromAzimuthalEquidistant --
+#
+#	Transforms x and y on an orthographic projection to latitude
+#	and longitude.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of projection
+#			   in degrees
+#	x, y -- Co-ordinates of the projected point, in Earth radii
+#
+# Results:
+#	Returns a two element list containing longitude and latitude
+#	in degrees.
+
+proc ::mapproj::fromAzimuthalEquidistant {lambda_0 phi_0 x y} {
+    variable radian
+    variable halfpi
+
+    set range [expr {hypot($y, $x)}]
+    set cos_b [expr {$x / $range}]
+    set sin_b [expr {$y / $range}]
+    foreach {x y z} [RangeAndBearingToCartesian $cos_b $sin_b $range] break
+    foreach {x y z} [RotateCartesianY $phi_0 $x $y $z] break
+    foreach {lambda phi} [CartesianToSpherical $x $y $z] break
+
+    # Convert latitude and longitude to degrees
+
+    set lambda [expr {$lambda * $radian + 180. + $lambda_0}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set phi [expr {$phi * $radian}]
+
+    return [list $lambda $phi]
+}
+
+# ::mapproj::toLambertAzimuthalEqualArea --
+#
+#	Transforms latitude and longitude to x and y co-ordinates
+#	on an orthographic projection.  Scale is true only at the
+#	point of projection.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of projection
+#			   in degrees
+#	lambda, phi -- Longitude and latitude of the point to be projected
+#		       in degrees
+#
+# Results:
+#	Returns map x and y co-ordinates, in Earth radii.
+
+proc ::mapproj::toLambertAzimuthalEqualArea {lambda_0 phi_0 lambda phi} {
+    foreach {x y z} [ToCartesian [expr {$lambda-$lambda_0}] $phi] \
+	break
+    foreach {x y z} [RotateCartesianY [expr {-$phi_0}] $x $y $z] \
+	break
+    foreach {cs sn range} [CartesianToRangeAndBearing $x $y $z] break
+    set range [expr {2.0 * sin(0.5 * $range)}]
+    return [list [expr {$cs * $range}] [expr {$sn * $range}]]
+}
+
+# ::mapproj::fromLambertAzimuthalEqualArea --
+#
+#	Transforms x and y on an orthographic projection to latitude
+#	and longitude.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of projection
+#			   in degrees
+#	x, y -- Co-ordinates of the projected point, in Earth radii
+#
+# Results:
+#	Returns a two element list containing longitude and latitude
+#	in degrees.
+
+proc ::mapproj::fromLambertAzimuthalEqualArea {lambda_0 phi_0 x y} {
+    variable radian
+    variable halfpi
+
+    set range [expr {hypot($y, $x)}]
+    set cos_b [expr {$x / $range}]
+    set sin_b [expr {$y / $range}]
+    set range [expr {2.0 * asin(0.5 * $range)}]
+    foreach {x y z} [RangeAndBearingToCartesian $cos_b $sin_b $range] break
+    foreach {x y z} [RotateCartesianY $phi_0 $x $y $z] break
+    foreach {lambda phi} [CartesianToSpherical $x $y $z] break
+
+    # Convert latitude and longitude to degrees
+
+    set lambda [expr {$lambda * $radian + 180. + $lambda_0}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set phi [expr {$phi * $radian}]
+
+    return [list $lambda $phi]
+}
+
+# ::mapproj::toHammer --
+#
+#	Transforms latitude and longitude to x and y co-ordinates
+#	on an orthographic projection.  Scale is true only at the
+#	point of projection.
+#
+# Parameters:
+#	lambda_0-- Longitude of the center of projection
+#			   in degrees
+#	lambda, phi -- Longitude and latitude of the point to be projected
+#		       in degrees
+#
+# Results:
+#	Returns map x and y co-ordinates, in Earth radii.
+
+proc ::mapproj::toHammer {lambda_0 lambda phi} {
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.0}]
+    foreach {x y z} [ToCartesian [expr {$lambda/2.}] $phi] \
+	break
+    foreach {cs sn range} [CartesianToRangeAndBearing $x $y $z] break
+    set range [expr {2.0 * sin(0.5 * $range)}]
+    return [list [expr {2.0 * $cs * $range}] [expr {$sn * $range}]]
+}
+
+# ::mapproj::fromHammer --
+#
+#	Transforms x and y on an orthographic projection to latitude
+#	and longitude.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of projection
+#			   in degrees
+#	x, y -- Co-ordinates of the projected point, in Earth radii
+#
+# Results:
+#	Returns a two element list containing longitude and latitude
+#	in degrees.
+
+proc ::mapproj::fromHammer {lambda_0 x y} {
+    variable radian
+    variable halfpi
+
+    set x [expr {0.5 * $x}]
+    set range [expr {hypot($y, $x)}]
+    set cos_b [expr {$x / $range}]
+    set sin_b [expr {$y / $range}]
+    set range [expr {2.0 * asin(0.5 * $range)}]
+    foreach {x y z} [RangeAndBearingToCartesian $cos_b $sin_b $range] break
+    foreach {lambda phi} [CartesianToSpherical $x $y $z] break
+
+    # Convert latitude and longitude to degrees
+
+    set lambda [expr {2.0 * $lambda * $radian + 180. + $lambda_0}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    set phi [expr {$phi * $radian}]
+
+    return [list $lambda $phi]
+}
+
+# ::mapproj::toConicEquidistant
+#
+#	Converts latitude and longitude to map co-ordinates on a
+#	conic equidistant projection.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of the sheet.
+#	phi_1, phi_2 -- Latitudes of the two standard parallels at which scale
+#			is true
+#	lambda, phi -- Longitude and latitude of the point to be projected
+#
+# Results:
+#	Returns a list of map x and y measured in Earth radii.
+
+proc ::mapproj::toConicEquidistant {lambda_0 phi_0 phi_1 phi_2 lambda phi} {
+    variable degree
+    set phi_0 [expr {$phi_0 * $degree}]
+    set phi_1 [expr {$phi_1 * $degree}]
+    set phi_2 [expr {$phi_2 * $degree}]
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {($lambda - 180.0) * $degree}]
+    set phi [expr {$phi * $degree}]
+    set cos_phi_1 [expr {cos($phi_1)}]
+    set n [expr {($cos_phi_1 - cos($phi_2)) / ($phi_2 - $phi_1)}]
+    set G [expr {$cos_phi_1 / $n + $phi_1}]
+    set rho_0 [expr {$G - $phi_0}]
+    set theta [expr {$n * $lambda}]
+    set rho [expr {$G - $phi}]
+    set x [expr {$rho * sin($theta)}]
+    set y [expr {$rho_0 - $rho * cos($theta)}]
+    return [list $x $y]
+}
+
+# ::mapproj::fromConicEquidistant --
+#
+#	Unprojects map x and y in a conic equidistant projection to
+#	latitude and longitude
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of the sheet.
+#	phi_1, phi_2 -- Latitudes of the two standard parallels at which scale
+#			is true
+#	x, y -- Map co-ordinates in Earth radii
+#
+# Results:
+#	Returns a list of longitude and latitude in degrees.
+
+proc ::mapproj::fromConicEquidistant {lambda_0 phi_0 phi_1 phi_2 x y} {
+    variable degree
+    variable radian
+    set phi_0 [expr {$phi_0 * $degree}]
+    set phi_1 [expr {$phi_1 * $degree}]
+    set phi_2 [expr {$phi_2 * $degree}]
+    set cos_phi_1 [expr {cos($phi_1)}]
+    set n [expr {($cos_phi_1 - cos($phi_2)) / ($phi_2 - $phi_1)}]
+    set G [expr {$cos_phi_1 / $n + $phi_1}]
+    set rho_0 [expr {$G - $phi_0}]
+    set rho_0my [expr {$rho_0 - $y}]
+    set theta [expr {atan2($x, $rho_0my)}]
+    set rho [expr {sqrt($x*$x + $rho_0my * $rho_0my)}]
+    if {$n < 0.0} {set rho [expr {-$rho}]}
+    set phi [expr {($G - $rho) * $radian}]
+    set lambda [expr {($theta / $n * $radian) + $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    return [list $lambda $phi]
+}
+
+# ::mapproj::toAlbersEqualAreaConic
+#
+#	Converts latitude and longitude to map co-ordinates on a
+#	conic equal-area projection.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of the sheet.
+#	phi_1, phi_2 -- Latitudes of the two standard parallels at which scale
+#			is true
+#	lambda, phi -- Longitude and latitude of the point to be projected
+#
+# Results:
+#	Returns a list of map x and y measured in Earth radii.
+
+proc ::mapproj::toAlbersEqualAreaConic {lambda_0 phi_0 phi_1 phi_2 lambda phi} {
+    variable degree
+    set phi_0 [expr {$phi_0 * $degree}]
+    set phi_1 [expr {$phi_1 * $degree}]
+    set phi_2 [expr {$phi_2 * $degree}]
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {($lambda - 180.0) * $degree}]
+    set phi [expr {$phi * $degree}]
+    set cos_phi_1 [expr {cos($phi_1)}]
+    set sin_phi_1 [expr {sin($phi_1)}]
+    set n [expr {0.5 * ($sin_phi_1 + sin($phi_2))}]
+    set theta [expr {$n * $lambda}]
+    set C [expr {$cos_phi_1 * $cos_phi_1 + 2.0 * $n * $sin_phi_1}]
+    set rho [expr {sqrt($C - 2.0 * $n * sin($phi)) / $n}]
+    set rho_0 [expr {sqrt($C - 2.0 * $n * sin($phi_0)) / $n}]
+    set x [expr {$rho * sin($theta)}]
+    set y [expr {$rho_0 - $rho * cos($theta)}]
+    return [list $x $y]
+}
+
+# ::mapproj::fromAlbersEqualAreaConic --
+#
+#	Unprojects map x and y in a conic equal-area projection to
+#	latitude and longitude
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of the sheet.
+#	phi_1, phi_2 -- Latitudes of the two standard parallels at which scale
+#			is true
+#	x, y -- Map co-ordinates in Earth radii
+#
+# Results:
+#	Returns a list of longitude and latitude in degrees.
+
+proc ::mapproj::fromAlbersEqualAreaConic {lambda_0 phi_0 phi_1 phi_2 x y} {
+    variable degree
+    variable radian
+    variable twopi
+    set phi_0 [expr {$phi_0 * $degree}]
+    set phi_1 [expr {$phi_1 * $degree}]
+    set phi_2 [expr {$phi_2 * $degree}]
+    set cos_phi_1 [expr {cos($phi_1)}]
+    set sin_phi_1 [expr {sin($phi_1)}]
+    set n [expr {0.5 * ($sin_phi_1 + sin($phi_2))}]
+    set C [expr {$cos_phi_1 * $cos_phi_1 + 2.0 * $n * $sin_phi_1}]
+    set rho_0 [expr {sqrt($C - 2.0 * $n * sin($phi_0)) / $n}]
+    set theta [expr {atan2($x, $rho_0 - $y)}]
+    set rho [expr {hypot($x, $rho_0 - $y)}]
+    set phi [expr {$radian * asin(($C - $rho*$rho*$n*$n) / (2.0 * $n))}]
+    set lambda [expr {($theta / $n * $radian) + $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    return [list $lambda $phi]
+}
+
+# ::mapproj::toLambertConformalConic
+#
+#	Converts latitude and longitude to map co-ordinates on a
+#	conformal conic projection.
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of the sheet.
+#	phi_1, phi_2 -- Latitudes of the two standard parallels at which scale
+#			is true
+#	lambda, phi -- Longitude and latitude of the point to be projected
+#
+# Results:
+#	Returns a list of map x and y measured in Earth radii.
+
+proc ::mapproj::toLambertConformalConic {lambda_0 phi_0 phi_1 phi_2 lambda phi} {
+    variable degree
+    variable quarterpi
+    set phi_0 [expr {$phi_0 * $degree}]
+    set phi_1 [expr {$phi_1 * $degree}]
+    set phi_2 [expr {$phi_2 * $degree}]
+    set lambda [expr {$lambda - $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {($lambda - 180.0) * $degree}]
+    set phi [expr {$phi * $degree}]
+    set cos_phi_1 [expr {cos($phi_1)}]
+    set sin_phi_1 [expr {sin($phi_1)}]
+    set tan1 [expr {tan($quarterpi + 0.5 * $phi_1)}]
+    set n [expr {log($cos_phi_1 / cos($phi_2))
+		 / log(tan($quarterpi + 0.5 * $phi_2) / $tan1)}]
+    set F [expr {$cos_phi_1 * pow($tan1, $n) / $n}]
+    set rho [expr {$F * pow(tan($quarterpi + 0.5 * $phi), -$n)}]
+    set rho_0 [expr {$F * pow(tan($quarterpi + 0.5 * $phi_0), -$n)}]
+    set x [expr {$rho * sin($n * $lambda)}]
+    set y [expr {$rho_0 - $rho * cos($n * $lambda)}]
+    return [list $x $y]
+}
+
+# ::mapproj::fromLambertConformalConic --
+#
+#	Unprojects map x and y in a conformal conic projection to
+#	latitude and longitude
+#
+# Parameters:
+#	lambda_0, phi_0 -- Longitude and latitude of the center of the sheet.
+#	phi_1, phi_2 -- Latitudes of the two standard parallels at which scale
+#			is true
+#	x, y -- Map co-ordinates in Earth radii
+#
+# Results:
+#	Returns a list of longitude and latitude in degrees.
+
+proc ::mapproj::fromLambertConformalConic {lambda_0 phi_0 phi_1 phi_2 x y} {
+    variable degree
+    variable radian
+    variable quarterpi
+    set phi_0 [expr {$phi_0 * $degree}]
+    set phi_1 [expr {$phi_1 * $degree}]
+    set phi_2 [expr {$phi_2 * $degree}]
+    set cos_phi_1 [expr {cos($phi_1)}]
+    set sin_phi_1 [expr {sin($phi_1)}]
+    set tan1 [expr {tan($quarterpi + 0.5 * $phi_1)}]
+    set n [expr {log($cos_phi_1 / cos($phi_2))
+		 / log(tan($quarterpi + 0.5 * $phi_2) / $tan1)}]
+    set F [expr {$cos_phi_1 * pow($tan1, $n) / $n}]
+    set rho_0 [expr {$F * pow(tan($quarterpi + 0.5 * $phi_0), -$n)}]
+    set y [expr {$rho_0 - $y}]
+    set rho [expr {sqrt($x*$x + $y*$y)}]
+    if {$n < 0} { set rho [expr {-$rho}] }
+    set theta [expr {atan2($x, $y)}]
+    set phi [expr {$radian * 2 * atan(pow($F / $rho, 1.0 / $n)) - 90.}]
+    set lambda [expr {($theta / $n * $radian) + $lambda_0 + 180.}]
+    if {$lambda < 0.0 || $lambda > 360.0} {
+	set lambda [expr {$lambda - 360. * floor($lambda / 360.)}]
+    }
+    set lambda [expr {$lambda - 180.}]
+    return [list $lambda $phi]
+}
+
+# Define commonly used cylindrical equal-area projections
+
+proc ::mapproj::toLambertCylindricalEqualArea {lambda_0 phi_0 lambda phi} {
+    toCylindricalEqualArea 0.0 $lambda_0 $phi_0 $lambda $phi
+}
+proc ::mapproj::fromLambertCylindricalEqualArea {lambda_0 phi_0 x y} {
+    fromCylindricalEqualArea 0.0 $lambda_0 $phi_0 $x $y
+}
+proc ::mapproj::toBehrmann {lambda_0 phi_0 lambda phi} {
+    toCylindricalEqualArea 30.0 $lambda_0 $phi_0 $lambda $phi
+}
+proc ::mapproj::fromBehrmann {lambda_0 phi_0 x y} {
+    fromCylindricalEqualArea 30.0 $lambda_0 $phi_0 $x $y
+}
+proc ::mapproj::toTrystanEdwards {lambda_0 phi_0 lambda phi} {
+    toCylindricalEqualArea 37.4 $lambda_0 $phi_0 $lambda $phi
+}
+proc ::mapproj::fromTrystanEdwards {lambda_0 phi_0 x y} {
+    fromCylindricalEqualArea 37.4 $lambda_0 $phi_0 $x $y
+}
+proc ::mapproj::toHoboDyer {lambda_0 phi_0 lambda phi} {
+    toCylindricalEqualArea 37.5 $lambda_0 $phi_0 $lambda $phi
+}
+proc ::mapproj::fromHoboDyer {lambda_0 phi_0 x y} {
+    fromCylindricalEqualArea 37.5 $lambda_0 $phi_0 $x $y
+}
+proc ::mapproj::toGallPeters {lambda_0 phi_0 lambda phi} {
+    toCylindricalEqualArea 45.0 $lambda_0 $phi_0 $lambda $phi
+}
+proc ::mapproj::fromGallPeters {lambda_0 phi_0 x y} {
+    fromCylindricalEqualArea 45.0 $lambda_0 $phi_0 $x $y
+}
+proc ::mapproj::toBalthasart {lambda_0 phi_0 lambda phi} {
+    toCylindricalEqualArea 50.0 $lambda_0 $phi_0 $lambda $phi
+}
+proc ::mapproj::fromBalthasart {lambda_0 phi_0 x y} {
+    fromCylindricalEqualArea 50.0 $lambda_0 $phi_0 $x $y
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mapproj/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mapproj/pkgIndex.tcl
new file mode 100644
index 00000000..c488e8fc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mapproj/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded mapproj 1.0 [list source [file join $dir mapproj.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/markdown/markdown.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/markdown/markdown.tcl
new file mode 100644
index 00000000..be77c619
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/markdown/markdown.tcl
@@ -0,0 +1,815 @@
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2014 Caius Project
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+package require Tcl 8.5
+package require textutil::tabify
+
+## \file
+# \brief Functions for converting markdown to HTML.
+
+##
+# \brief Functions for converting markdown to HTML.
+#
+namespace eval Markdown {
+
+    namespace export convert
+
+    ##
+    #
+    # Converts text written in markdown to HTML.
+    #
+    # @param markdown  the text in markdown
+    # @param tabs      whether to preserve tabs in markdown
+    #
+    # The output of this function is only a fragment, not a complete HTML
+    # document. The format of the output is generic XHTML.
+    #
+    proc convert {markdown {tabs 0}} {
+        set markdown [regsub -all {\r\n?} $markdown \n]
+        if {!$tabs} {
+	    set markdown [::textutil::tabify::untabify2 $markdown 4]
+	}
+        set markdown [string trimright $markdown]
+
+        # COLLECT REFERENCES
+        array unset ::Markdown::_references
+        array set ::Markdown::_references [collect_references markdown]
+
+        # PROCESS
+        return [parse_block markdown]
+    }
+
+    #
+    # Register a language specific converter. This converter can be
+    # used for fenced code blocks to transform the code block into a
+    # prettified HTML.
+    #
+    proc register {lang_specifier converter {extended 0}} {
+	set ::Markdown::converter($lang_specifier) [list $extended $converter]
+    }
+
+    #
+    # Return a dict (attribute value pairs) of language specifiers and
+    # the number of occurrences as they were used in fenced code blocks.
+    #
+    proc get_lang_counter {} {
+	return [array get ::Markdown::lang_counter]
+    }
+
+    #
+    # Reset the language counters of fenced code blocks.
+    #
+    proc reset_lang_counter {} {
+	array unset ::Markdown::lang_counter
+    }
+
+    ## \private
+    proc collect_references {markdown_var} {
+        upvar $markdown_var markdown
+
+        set lines [split $markdown \n]
+        set no_lines [llength $lines]
+        set index 0
+
+        array set references {}
+
+        while {$index < $no_lines} {
+            set line [lindex $lines $index]
+
+            if {[regexp \
+		     {^[ ]{0,3}\[((?:[^\]]|\[[^\]]*?\])+)\]:\s*(\S+)(?:\s+(([\"\']).*\4|\(.*\))\s*$)?} \
+		     $line \
+		     match ref link title]
+	    } {
+                set title [string trim [string range $title 1 end-1]]
+                if {$title eq {}} {
+                    set next_line [lindex $lines $index+1]]
+
+                    if {[regexp \
+			     {^(?:\s+(?:([\"\']).*\1|\(.*\))\s*$)} \
+			     $next_line]
+		    } {
+                        set title [string range [string trim $next_line] 1 end-1]
+                        incr index
+                    }
+                }
+                set ref [string tolower $ref]
+                set link [string trim $link {<>}]
+                set references($ref) [list $link $title]
+            }
+
+            incr index
+        }
+
+        return [array get references]
+    }
+
+    ## \private
+    proc parse_block {markdown_var {parent {}}} {
+        upvar $markdown_var markdown
+
+        set lines    [split $markdown \n]
+        set no_lines [llength $lines]
+        set index    0
+        set result   {}
+
+        set ul_match {^[ ]{0,3}(?:\*(?!\s*\*\s*\*\s*$)|-(?!\s*-\s*-\s*$)|\+) }
+        set ol_match {^[ ]{0,3}\d+\. }
+
+        # PROCESS MARKDOWN
+        while {$index < $no_lines} {
+            set line [lindex $lines $index]
+
+            switch -regexp -matchvar line_match -- $line {
+                {^\s*$} {
+                    # EMPTY LINES
+                    if {![regexp {^\s*$} [lindex $lines $index-1]]} {
+                        append result "\n\n"
+                    }
+                    incr index
+                }
+                {^[ ]{0,3}\[(?:[^\]]|\[[^\]]*?\])+\]:\s*\S+(?:\s+(?:([\"\']).*\1|\(.*\))\s*$)?} {
+                    # SKIP REFERENCES
+                    set next_line [lindex $lines $index+1]
+
+                    if {[regexp \
+			     {^(?:\s+(?:([\"\']).*\1|\(.*\))\s*$)} \
+			     $next_line]
+		    } {
+                        incr index
+                    }
+
+                    incr index
+                }
+                {^[ ]{0,3}-[ ]*-[ ]*-[- ]*$} -
+                {^[ ]{0,3}_[ ]*_[ ]*_[_ ]*$} -
+                {^[ ]{0,3}\*[ ]*\*[ ]*\*[\* ]*$} {
+                    # HORIZONTAL RULES
+                    append result "<hr />"
+                    incr index
+                }
+                {^[ ]{0,3}#{1,6}} {
+                    # ATX STYLE HEADERS
+
+                    regexp {^\s*#+} $line m
+                    set h_level [string length [string trim $m]]
+
+                    set h_result \
+			[parse_inline \
+			     [regsub -all {^\s*#+\s*|\s*#+\s*$} \
+				  $line {}]]
+
+                    append result "<h$h_level>$h_result</h$h_level>"
+                    incr index
+                }
+                {^[ ]{0,3}\>} {
+                    # BLOCK QUOTES
+                    set bq_result {}
+
+                    while {$index < $no_lines} {
+                        incr index
+
+                        lappend bq_result [regsub {^[ ]{0,3}\>[ ]?} $line {}]
+
+                        if {[is_empty_line [lindex $lines $index]]} {
+                            set eoq 0
+
+                            for {set peek $index} {$peek < $no_lines} {incr peek} {
+                                set line [lindex $lines $peek]
+
+                                if {![is_empty_line $line]} {
+                                    if {![regexp {^[ ]{0,3}\>} $line]} {
+                                        set eoq 1
+                                    }
+                                    break
+                                }
+                            }
+
+                            if {$eoq} { break }
+                        }
+
+                        set line [lindex $lines $index]
+                    }
+                    set bq_result [string trim [join $bq_result \n]]
+
+                    append result \
+			<blockquote>\n \
+			[parse_block bq_result] \
+			\n</blockquote>
+                }
+                {^\s{4,}\S+} {
+                    # CODE BLOCKS
+                    set code_result {}
+
+                    while {$index < $no_lines} {
+                        incr index
+
+                        lappend code_result [html_escape [\
+                            regsub {^    } $line {}]\
+                        ]
+
+                        set eoc 0
+                        for {set peek $index} {$peek < $no_lines} {incr peek} {
+                            set line [lindex $lines $peek]
+
+                            if {![is_empty_line $line]} {
+                                if {![regexp {^\s{4,}} $line]} {
+                                    set eoc 1
+                                }
+                                break
+                            }
+                        }
+
+                        if {$eoc} { break }
+
+                        set line [lindex $lines $index]
+                    }
+                    set code_result [join $code_result \n]
+
+                    append result <pre><code> $code_result </code></pre>
+                }
+                {^(?:(?:`{3,})|(?:~{3,}))(\{?\S+\}?)?\s*.*$} {
+		    # orig:  {^(?:(?:`{3,})|(?:~{3,}))\{?(\S+)?\}?\s*$}
+
+                    # FENCED CODE BLOCKS
+                    set code_result {}
+                    if {[string index $line 0] eq {`}} {
+                        set end_match {^`{3,}\s*$}
+                    } else {
+                        set end_match {^~{3,}\s*$}
+                    }
+		    #
+		    # A language specifier might be provided
+		    # immediately after the leading delimiters.
+		    #
+		    #     ```tcl
+		    #
+		    # The language specifier is used for two purposes:
+		    # a) As a CSS class name
+		    #    (useful e.g. for highlight.js)
+		    # b) As a name for a source code to HTML converter.
+		    #    When such a converter is registered,
+		    #    the codeblock will be sent through this converter.
+		    #
+		    set lang_specifier [string tolower [lindex $line_match 1]]
+		    if {$lang_specifier ne ""} {
+			set code_CCS_class " class='[html_escape $lang_specifier]'"
+			incr ::Markdown::lang_counter($lang_specifier)
+		    } else {
+			set code_CCS_class ""
+		    }
+
+                    while {$index < $no_lines} {
+                        incr index
+
+                        set line [lindex $lines $index]
+
+                        if {[regexp $end_match $line]} {
+                            incr index
+                            break
+                        }
+
+                        lappend code_result [html_escape $line]
+                    }
+                    set code_result [join $code_result \n]
+
+		    #
+		    # If there is a converter registered, apply it on
+		    # the resulting snippet.
+		    #
+		    if {[info exists ::Markdown::converter($lang_specifier)]} {
+			lassign $::Markdown::converter($lang_specifier) extended converter
+
+			set cmd $converter
+			if {$extended} { lappend cmd [lrange [lindex $line_match 0] 1 end] }
+			lappend cmd $code_result
+			set code_result [uplevel #0 $cmd]
+		    } else {
+                        set code_result [html_escape $code_result]
+		    }
+                    append result \
+			"<pre class='code'>" \
+			<code$code_CCS_class> \
+			$code_result \
+			</code></pre>
+                }
+
+                {^[ ]{0,3}(?:\*|-|\+) |^[ ]{0,3}\d+\. } {
+                    # LISTS
+                    set list_result {}
+
+                    # continue matching same list type
+                    if {[regexp $ol_match $line]} {
+                        set list_type ol
+                        set list_match $ol_match
+                    } else {
+                        set list_type ul
+                        set list_match $ul_match
+                    }
+
+                    set last_line AAA
+
+                    while {$index < $no_lines} {
+                        if {![regexp $list_match [lindex $lines $index]]} {
+                            break
+                        }
+
+                        set item_result {}
+                        set in_p 1
+                        set p_count 1
+
+                        if {[is_empty_line $last_line]} {
+                            incr p_count
+                        }
+
+                        set last_line $line
+                        set line [regsub "$list_match\\s*" $line {}]
+
+                        # prevent recursion on same line
+                        set line [regsub {\A(\d+)\.(\s+)}   $line {\1\\.\2}]
+                        set line [regsub {\A(\*|\+|-)(\s+)} $line {\\\1\2}]
+
+                        lappend item_result $line
+
+                        for {set peek [expr {$index + 1}]} {$peek < $no_lines} {incr peek} {
+                            set line [lindex $lines $peek]
+
+                            if {[is_empty_line $line]} {
+                                set in_p 0
+                            } elseif {[regexp {^    } $line]} {
+                                if {!$in_p} {
+                                    incr p_count
+                                }
+                                set in_p 1
+                            } elseif {[regexp $list_match $line]} {
+                                if {!$in_p} {
+                                    incr p_count
+                                }
+                                break
+                            } elseif {!$in_p} {
+                                break
+                            }
+
+                            set last_line $line
+                            lappend item_result [regsub {^    } $line {}]
+                        }
+
+                        set item_result [join $item_result \n]
+
+                        if {$p_count > 1} {
+                            set item_result [parse_block item_result li]
+                        } else {
+                            if {[regexp -lineanchor \
+				     {(\A.*?)((?:^[ ]{0,3}(?:\*|-|\+) |^[ ]{0,3}\d+\. ).*\Z)} \
+				     $item_result \
+				     match para rest]
+			    } {
+                                set item_result [parse_inline $para]
+                                append item_result [parse_block rest]
+                            } else {
+                                set item_result [parse_inline $item_result]
+                            }
+                        }
+
+                        lappend list_result "<li>$item_result</li>"
+                        set index $peek
+                    }
+
+                    append result \
+			<$list_type>\n \
+			[join $list_result \n] \
+			</$list_type>\n\n
+                }
+                {^<(?:p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del)} {
+                    # HTML BLOCKS
+                    set block_tag [string range $line_match 1 end]
+		    set re_htmltag {<(/?)(\w+)(?:\s+\w+(?:=\"[^\"]+\"|'[^']+')?)*\s*>}
+
+                    set block_lines 0
+                    set buffer {}
+                    while {$index < $no_lines} {
+                        append buffer $line \n
+
+                        incr block_lines
+                        incr index
+
+                        set tags [regexp -inline -all $re_htmltag $buffer]
+
+                        set stack_count 0
+                        foreach {match type name} $tags {
+                            if {$name eq $block_tag} {
+                                if {$type eq {}} {
+                                    incr stack_count +1
+                                } else {
+                                    incr stack_count -1
+                                }
+                            }
+                        }
+
+                        if {$stack_count == 0} break
+
+                        set line [lindex $lines $index]
+                    }
+
+                    # Skip empty lines after the block.
+                    while {$index < $no_lines && [is_empty_line [lindex $lines $index]]} {
+                        incr index
+                    }
+
+                    if {$index < $no_lines} {
+                        append buffer \n
+                    }
+
+                    append result $buffer
+                }
+                {(?:^\s{0,3}|[^\\]+)\|} {
+                    # SIMPLE TABLES
+                    set cell_align {}
+                    set row_count 0
+
+                    while {$index < $no_lines} {
+                        # insert a space between || to handle empty cells
+                        set row_cols \
+			    [regexp -inline -all {(?:[^|]|\\\|)+} \
+				 [regsub -all {\|(?=\|)} \
+				      [string trim $line] {| }]]
+
+                        if {$row_count == 0} {
+                            set sep_cols [lindex $lines $index+1]
+
+                            # check if we have a separator row
+                            if {[regexp {^\s{0,3}\|?(?:\s*:?-+:?(?:\s*$|\s*\|))+} $sep_cols]} {
+                                set sep_cols \
+				    [regexp -inline -all {(?:[^|]|\\\|)+} \
+					 [string trim $sep_cols]]
+
+                                foreach {cell_data} $sep_cols {
+                                    switch -regexp $cell_data {
+                                        {:-*:} {
+                                            lappend cell_align center
+                                        }
+                                        {:-+} {
+                                            lappend cell_align left
+                                        }
+                                        {-+:} {
+                                            lappend cell_align right
+                                        }
+                                        default {
+                                            lappend cell_align {}
+                                        }
+                                    }
+                                }
+
+                                incr index
+                            }
+
+                            append result "<table class=\"table\">\n"
+                            append result "<thead>\n"
+                            append result "  <tr>\n"
+
+                            if {$cell_align ne {}} {
+                                set num_cols [llength $cell_align]
+                            } else {
+                                set num_cols [llength $row_cols]
+                            }
+
+                            for {set i 0} {$i < $num_cols} {incr i} {
+                                if {[set align [lindex $cell_align $i]] ne {}} {
+                                    append result "    <th style=\"text-align: $align\">"
+                                } else {
+                                    append result "    <th>"
+                                }
+
+                                append result \
+				    [parse_inline \
+					 [string trim \
+					      [lindex $row_cols $i]]] \
+				    </th> "\n"
+                            }
+
+                            append result "  </tr>\n"
+                            append result "</thead>\n"
+                        } else {
+                            if {$row_count == 1} {
+                                append result "<tbody>\n"
+                            }
+
+                            append result "  <tr>\n"
+
+                            if {$cell_align ne {}} {
+                                set num_cols [llength $cell_align]
+                            } else {
+                                set num_cols [llength $row_cols]
+                            }
+
+                            for {set i 0} {$i < $num_cols} {incr i} {
+                                if {[set align [lindex $cell_align $i]] ne {}} {
+                                    append result "    <td style=\"text-align: $align\">"
+                                } else {
+                                    append result "    <td>"
+                                }
+
+                                append result \
+				    [parse_inline \
+					 [string trim \
+					      [lindex $row_cols $i]]] \
+				    </td> "\n"
+                            }
+
+                            append result "  </tr>\n"
+                        }
+
+                        incr row_count
+
+                        set line [lindex $lines [incr index]]
+
+                        if {![regexp {(?:^\s{0,3}|[^\\]+)\|} $line]} {
+                            switch $row_count {
+                                1 {
+                                    append result "</table>\n"
+                                }
+                                default {
+                                    append result "</tbody>\n"
+                                    append result "</table>\n"
+                                }
+                            }
+
+                            break
+                        }
+                    }
+                }
+                default {
+                    # PARAGRAPHS AND SETEXT STYLE HEADERS
+                    set p_type p
+                    set p_result {}
+
+                    while {($index < $no_lines) && ![is_empty_line $line]} {
+                        incr index
+
+                        switch -regexp $line {
+                            {^[ ]{0,3}=+$} {
+                                set p_type h1
+                                break
+                            }
+                            {^[ ]{0,3}-+$} {
+                                set p_type h2
+                                break
+                            }
+                            {^[ ]{0,3}(?:\*|-|\+) |^[ ]{0,3}\d+\. } {
+                                if {$parent eq {li}} {
+                                    incr index -1
+                                    break
+                                } else {
+                                    lappend p_result $line
+                                }
+                            }
+                            {^[ ]{0,3}-[ ]*-[ ]*-[- ]*$} -
+                            {^[ ]{0,3}_[ ]*_[ ]*_[_ ]*$} -
+                            {^[ ]{0,3}\*[ ]*\*[ ]*\*[\* ]*$} -
+                            {^[ ]{0,3}#{1,6}} {
+                                incr index -1
+                                break
+                            }
+                            default {
+                                lappend p_result $line
+                            }
+                        }
+
+                        set line [lindex $lines $index]
+                    }
+
+                    set p_result \
+			[parse_inline \
+			     [string trim \
+				  [join $p_result \n]]]
+
+                    if {[is_empty_line [regsub -all {<!--.*?-->} $p_result {}]]} {
+                        # Do not make a new paragraph for just comments.
+                        append result $p_result
+                    } else {
+                        append result "<$p_type>$p_result</$p_type>"
+                    }
+                }
+            }
+        }
+
+        return $result
+    }
+
+    ## \private
+    proc parse_inline {text} {
+        set text [regsub -all -lineanchor {[ ]{2,}$} $text <br/>]
+
+        set index 0
+        set result {}
+
+        set re_backticks   {\A`+}
+        set re_whitespace  {\s}
+        set re_inlinelink  {\A!?\[([^\]]*)\]\(\s*((?:[^\s\)]+|\([^\s\)]+\))+)?(\s+([\"'])(.*)?\4)?\s*\)}
+        set re_reflink     {\A\!?\[((?:[^\]]|\[[^\]]*?\])+)\](?:\s*\[((?:[^\]]|\[[^\]]*?\])*)\])?}
+        set re_htmltag     {\A</?\w+\s*>|\A<\w+(?:\s+\w+=(?:\"[^\"]+\"|\'[^\']+\'))*\s*/?>}
+        set re_autolink    {\A<(?:(\S+@\S+)|(\S+://\S+))>}
+        set re_comment     {\A<!--.*?-->}
+        set re_entity      {\A\&\S+;}
+
+        while {[set chr [string index $text $index]] ne {}} {
+            switch $chr {
+                "\\" {
+                    # ESCAPES
+                    set next_chr [string index $text $index+1]
+
+                    if {[string first $next_chr {\`*_\{\}[]()#+-.!>|}] != -1} {
+                        set chr $next_chr
+                        incr index
+                    }
+                }
+                {_} -
+                {*} {
+                    # EMPHASIS
+                    if {[regexp $re_whitespace [string index $result end]] &&
+                        [regexp $re_whitespace [string index $text $index+1]]
+		    } {
+                        #do nothing
+                    } elseif {[regexp -start $index \
+				   "\\A(\\$chr{1,3})((?:\[^\\$chr\\\\]|\\\\\\$chr)*)\\1" \
+				   $text \
+				   m del sub]
+		    } {
+                        switch [string length $del] {
+                            1 {
+                                append result "<em>[parse_inline $sub]</em>"
+                            }
+                            2 {
+                                append result "<strong>[parse_inline $sub]</strong>"
+                            }
+                            3 {
+                                append result "<strong><em>[parse_inline $sub]</em></strong>"
+                            }
+                        }
+
+                        incr index [string length $m]
+                        continue
+                    }
+                }
+                {`} {
+                    # CODE
+                    regexp -start $index $re_backticks $text m
+                    set start [expr {$index + [string length $m]}]
+
+                    if {[regexp -start $start -indices $m $text m]} {
+			lassign $m from to
+			
+                        set sub [string trim [string range $text $start $from-1]]
+
+                        append result "<code>[html_escape $sub]</code>"
+                        set index [expr {$to + 1}]
+                        continue
+                    }
+                }
+                {!} -
+                {[} {
+                    # LINKS AND IMAGES
+                    if {$chr eq {!}} {
+                        set ref_type img
+                    } else {
+                        set ref_type link
+                    }
+
+                    set match_found 0
+
+                    if {[regexp -start $index $re_inlinelink $text m txt url ign del title]} {
+                        # INLINE
+                        incr index [string length $m]
+
+                        set url [html_escape [string trim $url {<> }]]
+                        set txt [parse_inline $txt]
+                        set title [parse_inline $title]
+
+                        set match_found 1
+                    } elseif {[regexp -start $index $re_reflink $text m txt lbl]} {
+                        if {$lbl eq {}} {
+                            set lbl [regsub -all {\s+} $txt { }]
+                        }
+
+                        set lbl [string tolower $lbl]
+
+                        if {[info exists ::Markdown::_references($lbl)]} {
+                            lassign $::Markdown::_references($lbl) url title
+
+                            set url [html_escape [string trim $url {<> }]]
+                            set txt [parse_inline $txt]
+                            set title [parse_inline $title]
+
+                            # REFERENCED
+                            incr index [string length $m]
+                            set match_found 1
+                        }
+                    }
+
+                    # PRINT IMG, A TAG
+                    if {$match_found} {
+                        if {$ref_type eq {link}} {
+                            if {$title ne {}} {
+                                append result "<a href=\"$url\" title=\"$title\">$txt</a>"
+                            } else {
+                                append result "<a href=\"$url\">$txt</a>"
+                            }
+                        } else {
+                            if {$title ne {}} {
+                                append result "<img src=\"$url\" alt=\"$txt\" title=\"$title\"/>"
+                            } else {
+                                append result "<img src=\"$url\" alt=\"$txt\"/>"
+                            }
+                        }
+
+                        continue
+                    }
+                }
+                {<} {
+                    # HTML TAGS, COMMENTS AND AUTOLINKS
+                    if {[regexp -start $index $re_comment $text m]} {
+                        append result $m
+                        incr index [string length $m]
+                        continue
+                    } elseif {[regexp -start $index $re_autolink $text m email link]} {
+                        if {$link ne {}} {
+                            set link [html_escape $link]
+                            append result "<a href=\"$link\">$link</a>"
+                        } else {
+                            set mailto_prefix "mailto:"
+                            if {![regexp "^${mailto_prefix}(.*)" $email mailto email]} {
+                                # $email does not contain the prefix "mailto:".
+                                set mailto "mailto:$email"
+                            }
+                            append result "<a href=\"$mailto\">$email</a>"
+                        }
+                        incr index [string length $m]
+                        continue
+                    } elseif {[regexp -start $index $re_htmltag $text m]} {
+                        append result $m
+                        incr index [string length $m]
+                        continue
+                    }
+
+                    set chr [html_escape $chr]
+                }
+                {&} {
+                    # ENTITIES
+                    if {[regexp -start $index $re_entity $text m]} {
+                        append result $m
+                        incr index [string length $m]
+                        continue
+                    }
+
+                    set chr [html_escape $chr]
+                }
+                {>} -
+                {'} -
+                "\"" {
+                    # OTHER SPECIAL CHARACTERS
+                    set chr [html_escape $chr]
+                }
+                default {}
+            }
+
+            append result $chr
+            incr index
+        }
+
+        return $result
+    }
+
+    ## \private
+    proc is_empty_line {line} {
+        return [regexp {^\s*$} $line]
+    }
+
+    ## \private
+    proc html_escape {text} {
+        return [string map {& &amp; < &lt; > &gt; \" &quot;} $text]
+    }
+}
+
+package provide Markdown 1.2.2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/markdown/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/markdown/pkgIndex.tcl
new file mode 100644
index 00000000..34a69c47
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/markdown/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded Markdown 1.2.2 [list source [file join $dir markdown.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/bessel.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/bessel.tcl
new file mode 100644
index 00000000..811f242c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/bessel.tcl
@@ -0,0 +1,194 @@
+# bessel.tcl --
+#    Evaluate the most common Bessel functions
+#
+# TODO:
+#    Yn - finding decent approximations seems tough
+#    Jnu - for arbitrary values of the parameter
+#    J'n - first derivative (from recurrence relation)
+#    Kn - forward application of recurrence relation?
+#
+
+# namespace special
+#    Create a convenient namespace for the "special" mathematical functions
+#
+namespace eval ::math::special {
+    #
+    # Define a number of common mathematical constants
+    #
+    ::math::constants::constants pi
+
+    #
+    # Export the functions
+    #
+    namespace export J0 J1 Jn J1/2 J-1/2 I_n
+}
+
+# J0 --
+#    Zeroth-order Bessel function
+#
+# Arguments:
+#    x         Value of the x-coordinate
+# Result:
+#    Value of J0(x)
+#
+proc ::math::special::J0 {x} {
+    Jn 0 $x
+}
+
+# J1 --
+#    First-order Bessel function
+#
+# Arguments:
+#    x         Value of the x-coordinate
+# Result:
+#    Value of J1(x)
+#
+proc ::math::special::J1 {x} {
+    Jn 1 $x
+}
+
+# Jn --
+#    Compute the Bessel function of the first kind of order n
+# Arguments:
+#    n       Order of the function (must be integer)
+#    x       Value of the argument
+# Result:
+#    Jn(x)
+# Note:
+#    This relies on the integral representation for
+#    the Bessel functions of integer order:
+#             1     I pi
+#    Jn(x) = --     I   cos(x sin t - nt) dt
+#            pi   0 I
+#
+#    For this kind of integrands the trapezoidal rule is
+#    very efficient according to Davis and Rabinowitz
+#    (Methods of numerical integration, 1984).
+#
+proc ::math::special::Jn {n x} {
+    variable pi
+
+    if { ![string is integer -strict $n] } {
+         return -code error "Order argument must be integer"
+    }
+
+    #
+    # Integrate over the interval [0,pi] using a small
+    # enough step - 40 points should do a good job
+    # with |x| < 20, n < 20 (an accuracy of 1.0e-8
+    # is reported by Davis and Rabinowitz)
+    #
+    set number 40
+    set step   [expr {$pi/double($number)}]
+    set result 0.0
+
+    for { set i 0 } { $i <= $number } { incr i } {
+        set t [expr {double($i)*$step}]
+        set f [expr {cos($x * sin($t) - $n * $t)}]
+        if { $i == 0 || $i == $number } {
+            set f [expr {$f/2.0}]
+        }
+        set result [expr {$result+$f}]
+    }
+
+    expr {$result*$step/$pi}
+}
+
+# J1/2 --
+#    Half-order Bessel function
+#
+# Arguments:
+#    x         Value of the x-coordinate
+# Result:
+#    Value of J1/2(x)
+#
+proc ::math::special::J1/2 {x} {
+    variable pi
+    #
+    # This Bessel function can be expressed in terms of elementary
+    # functions. Therefore use the explicit formula
+    #
+    if { $x != 0.0 } {
+        expr {sqrt(2.0/$pi/$x)*sin($x)}
+    } else {
+        return 0.0
+    }
+}
+
+# J-1/2 --
+#    Compute the Bessel function of the first kind of order -1/2
+# Arguments:
+#    x       Value of the argument (!= 0.0)
+# Result:
+#    J-1/2(x)
+#
+proc ::math::special::J-1/2 {x} {
+    variable pi
+    if { $x == 0.0 } {
+        return -code error "Argument must not be zero (singularity)"
+    } else {
+        return [expr {-cos($x)/sqrt($pi*$x/2.0)}]
+    }
+}
+
+# I_n --
+#    Compute the modified Bessel function of the first kind
+#
+# Arguments:
+#    n            Order of the function (must be positive integer or zero)
+#    x            Abscissa at which to compute it
+# Result:
+#    Value of In(x)
+# Note:
+#    This relies on Miller's algorithm for finding minimal solutions
+#
+namespace eval ::math::special {}
+
+proc ::math::special::I_n {n x} {
+    if { ! [string is integer $n] || $n < 0 } {
+        error "Wrong order: must be positive integer or zero"
+    }
+
+    set n2 [expr {$n+8}]  ;# Note: just a guess that this will be enough
+
+    set ynp1 0.0
+    set yn   1.0
+    set sum  1.0
+
+    while { $n2 > 0 } {
+        set ynm1 [expr {$ynp1+2.0*$n2*$yn/$x}]
+        set sum  [expr {$sum+$ynm1}]
+        if { $n2 == $n+1 } {
+           set result $ynm1
+        }
+        set ynp1 $yn
+        set yn   $ynm1
+        incr n2 -1
+    }
+
+    set quotient [expr {(2.0*$sum-$ynm1)/exp($x)}]
+
+    expr {$result/$quotient}
+}
+
+#
+# some tests --
+#
+if { 0 } {
+set prec $::tcl_precision
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    set ::tcl_precision 17
+} else {
+    set ::tcl_precision 0
+}
+
+foreach x {0.0 2.0 4.4 6.0 10.0 11.0 12.0 13.0 14.0} {
+    puts "J0($x) = [::math::special::J0 $x] - J1($x) = [::math::special::J1 $x] \
+- J1/2($x) = [::math::special::J1/2 $x]"
+}
+foreach n {0 1 2 3 4 5} {
+    puts [::math::special::I_n $n 1.0]
+}
+
+set ::tcl_precision $prec
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/bigfloat.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/bigfloat.tcl
new file mode 100644
index 00000000..f6f5febe
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/bigfloat.tcl
@@ -0,0 +1,2316 @@
+########################################################################
+# BigFloat for Tcl
+# Copyright (C) 2003-2005  ARNOLD Stephane
+#
+# BIGFLOAT LICENSE TERMS
+#
+# This software is copyrighted by Stephane ARNOLD, (stephanearnold <at> yahoo.fr).
+# The following terms apply to all files associated
+# with the software unless explicitly disclaimed in individual files.
+#
+# The authors hereby grant permission to use, copy, modify, distribute,
+# and license this software and its documentation for any purpose, provided
+# that existing copyright notices are retained in all copies and that this
+# notice is included verbatim in any distributions. No written agreement,
+# license, or royalty fee is required for any of the authorized uses.
+# Modifications to this software may be copyrighted by their authors
+# and need not follow the licensing terms described here, provided that
+# the new terms are clearly indicated on the first page of each file where
+# they apply.
+#
+# IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+# FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+# ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+# DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+# IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+# NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+# MODIFICATIONS.
+#
+# GOVERNMENT USE: If you are acquiring this software on behalf of the
+# U.S. government, the Government shall have only "Restricted Rights"
+# in the software and related documentation as defined in the Federal
+# Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+# are acquiring the software on behalf of the Department of Defense, the
+# software shall be classified as "Commercial Computer Software" and the
+# Government shall have only "Restricted Rights" as defined in Clause
+# 252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+# authors grant the U.S. Government and others acting in its behalf
+# permission to use and distribute the software in accordance with the
+# terms specified in this license.
+#
+########################################################################
+
+package require Tcl 8.4
+package require math::bignum
+
+# this line helps when I want to source this file again and again
+catch {namespace delete ::math::bigfloat}
+
+# private namespace
+# this software works only with Tcl v8.4 and higher
+# it is using the package math::bignum
+namespace eval ::math::bigfloat {
+    # cached constants
+    # ln(2) with arbitrary precision
+    variable Log2
+    # Pi with arb. precision
+    variable Pi
+    variable _pi0
+    # some constants (bignums) : {0 1 2 3 4 5 10}
+    variable zero
+    set zero [::math::bignum::fromstr 0]
+    variable one
+    set one [::math::bignum::fromstr 1]
+    variable two
+    set two [::math::bignum::fromstr 2]
+    variable three
+    set three [::math::bignum::fromstr 3]
+    variable four
+    set four [::math::bignum::fromstr 4]
+    variable five
+    set five [::math::bignum::fromstr 5]
+    variable ten
+    set ten [::math::bignum::fromstr 10]
+}
+
+
+
+
+################################################################################
+# procedures that handle floating-point numbers
+# these procedures are sorted by name (after eventually removing the underscores)
+#
+# BigFloats are internally represented as a list :
+# {"F" Mantissa Exponent Delta} where "F" is a character which determins
+# the datatype, Mantissa and Delta are two Big integers and Exponent a raw integer.
+#
+# The BigFloat value equals to (Mantissa +/- Delta)*2^Exponent
+# So the internal representation is binary, but trying to get as close as possible to
+# the decimal one.
+# When calling fromstr, the Delta parameter is set to the value of the last decimal digit.
+# Example : 1.50 belongs to [1.49,1.51], but internally Delta is probably not equal to 1,
+# because of the binary representation.
+#
+# So Mantissa and Delta are not limited in size, but in practice Delta is kept under
+# 2^32 by the 'normalize' procedure, to avoid a never-ended growth of memory used.
+# Indeed, when you perform some computations, the Delta parameter (which represent
+# the uncertainty on the value of the Mantissa) may increase.
+# Exponent, as a classic integer, is limited to the interval [-2147483648,2147483647]
+
+# Retrieving the parameters of a BigFloat is often done with that command :
+# foreach {dummy int exp delta} $bigfloat {break}
+# (dummy is not used, it is just used to get the "F" marker).
+# The isInt, isFloat, checkNumber and checkFloat procedures are used
+# to check data types
+#
+# Taylor development are often used to compute the analysis functions (like exp(),log()...)
+# To learn how it is done in practice, take a look at ::math::bigfloat::_asin
+# While doing computation on Mantissas, we do not care about the last digit,
+# because if we compute wisely Deltas, the digits that remain will be exact.
+################################################################################
+
+
+################################################################################
+# returns the absolute value
+################################################################################
+proc ::math::bigfloat::abs {number} {
+    checkNumber number
+    if {[isInt $number]} {
+        # set sign to positive for a BigInt
+        return [::math::bignum::abs $number]
+    }
+    # set sign to positive for a BigFloat into the Mantissa (index 1)
+    lset number 1 [::math::bignum::abs [lindex $number 1]]
+    return $number
+}
+
+
+################################################################################
+# arccosinus of a BigFloat
+################################################################################
+proc ::math::bigfloat::acos {x} {
+    # handy proc for checking datatype
+    checkFloat x
+    foreach {dummy entier exp delta} $x {break}
+    set precision [expr {($exp<0)?(-$exp):1}]
+    # acos(0.0)=Pi/2
+    # 26/07/2005 : changed precision from decimal to binary
+    # with the second parameter of pi command
+    set piOverTwo [floatRShift [pi $precision 1]]
+    if {[iszero $x]} {
+        # $x is too close to zero -> acos(0)=PI/2
+        return $piOverTwo
+    }
+    # acos(-x)= Pi/2 + asin(x)
+    if {[::math::bignum::sign $entier]} {
+        return [add $piOverTwo [asin [abs $x]]]
+    }
+    # we always use _asin to compute the result
+    # but as it is a Taylor development, the value given to [_asin]
+    # has to be a bit smaller than 1 ; by using that trick : acos(x)=asin(sqrt(1-x^2))
+    # we can limit the entry of the Taylor development below 1/sqrt(2)
+    if {[compare $x [fromstr 0.7071]]>0} {
+        # x > sqrt(2)/2 : trying to make _asin converge quickly
+        # creating 0 and 1 with the same precision as the entry
+        variable one
+        variable zero
+        set fzero [list F $zero -$precision $one]
+        set fone [list F [::math::bignum::lshift 1 $precision] \
+                -$precision $one]
+        # when $x is close to 1 (acos(1.0)=0.0)
+        if {[equal $fone $x]} {
+            return $fzero
+        }
+        if {[compare $fone $x]<0} {
+            # the behavior assumed because acos(x) is not defined
+            # when |x|>1
+            error "acos on a number greater than 1"
+        }
+        # acos(x) = asin(sqrt(1 - x^2))
+        # since 1 - cos(x)^2 = sin(x)^2
+        # x> sqrt(2)/2 so x^2 > 1/2 so 1-x^2<1/2
+        set x [sqrt [sub $fone [mul $x $x]]]
+        # the parameter named x is smaller than sqrt(2)/2
+        return [_asin $x]
+    }
+    # acos(x) = Pi/2 - asin(x)
+    # x<sqrt(2)/2 here too
+    return [sub $piOverTwo [_asin $x]]
+}
+
+
+################################################################################
+# returns A + B
+################################################################################
+proc ::math::bigfloat::add {a b} {
+    checkNumber a b
+    if {[isInt $a]} {
+        if {[isInt $b]} {
+            # intAdd adds two BigInts
+            return [::math::bignum::add $a $b]
+        }
+        # adds the BigInt a to the BigFloat b
+        return [addInt2Float $b $a]
+    }
+    if {[isInt $b]} {
+        # ... and vice-versa
+        return [addInt2Float $a $b]
+    }
+    # retrieving parameters from A and B
+    foreach {dummy integerA expA deltaA} $a {break}
+    foreach {dummy integerB expB deltaB} $b {break}
+    # when we add two numbers which have different digit numbers (after the dot)
+    # for example : 1.0 and 0.00001
+    # We promote the one with the less number of digits (1.0) to the same level as
+    # the other : so 1.00000.
+    # that is why we shift left the number which has the greater exponent
+    # But we do not forget the Delta parameter, which is lshift'ed too.
+    if {$expA>$expB} {
+        set diff [expr {$expA-$expB}]
+        set integerA [::math::bignum::lshift $integerA $diff]
+        set deltaA [::math::bignum::lshift $deltaA $diff]
+        set integerA [::math::bignum::add $integerA $integerB]
+        set deltaA [::math::bignum::add $deltaA $deltaB]
+        return [normalize [list F $integerA $expB $deltaA]]
+    } elseif {$expA==$expB} {
+        # nothing to shift left
+        return [normalize [list F [::math::bignum::add $integerA $integerB] \
+                $expA [::math::bignum::add $deltaA $deltaB]]]
+    } else {
+        set diff [expr {$expB-$expA}]
+        set integerB [::math::bignum::lshift $integerB $diff]
+        set deltaB [::math::bignum::lshift $deltaB $diff]
+        set integerB [::math::bignum::add $integerA $integerB]
+        set deltaB [::math::bignum::add $deltaB $deltaA]
+        return [normalize [list F $integerB $expA $deltaB]]
+    }
+}
+
+################################################################################
+# returns the sum A(BigFloat) + B(BigInt)
+# the greatest advantage of this method is that the uncertainty
+# of the result remains unchanged, in respect to the entry's uncertainty (deltaA)
+################################################################################
+proc ::math::bigfloat::addInt2Float {a b} {
+    # type checking
+    checkFloat a
+    if {![isInt $b]} {
+        error "'$b' is not a BigInt"
+    }
+    # retrieving data from $a
+    foreach {dummy integerA expA deltaA} $a {break}
+    # to add an int to a BigFloat,...
+    if {$expA>0} {
+        # we have to put the integer integerA
+        # to the level of zero exponent : 1e8 --> 100000000e0
+        set shift $expA
+        set integerA [::math::bignum::lshift $integerA $shift]
+        set deltaA [::math::bignum::lshift $deltaA $shift]
+        set integerA [::math::bignum::add $integerA $b]
+        # we have to normalize, because we have shifted the mantissa
+        # and the uncertainty left
+        return [normalize [list F $integerA 0 $deltaA]]
+    } elseif {$expA==0} {
+        # integerA is already at integer level : float=(integerA)e0
+        return [normalize [list F [::math::bignum::add $integerA $b] \
+                0 $deltaA]]
+    } else {
+        # here we have something like 234e-2 + 3
+        # we have to shift the integer left by the exponent |$expA|
+        set b [::math::bignum::lshift $b [expr {-$expA}]]
+        set integerA [::math::bignum::add $integerA $b]
+        return [normalize [list F $integerA $expA $deltaA]]
+    }
+}
+
+
+################################################################################
+# arcsinus of a BigFloat
+################################################################################
+proc ::math::bigfloat::asin {x} {
+    # type checking
+    checkFloat x
+    foreach {dummy entier exp delta} $x {break}
+    if {$exp>-1} {
+        error "not enough precision on input (asin)"
+    }
+    set precision [expr {-$exp}]
+    # when x=0, return 0 at the same precision as the input was
+    if {[iszero $x]} {
+        variable one
+        variable zero
+        return [list F $zero -$precision $one]
+    }
+    # asin(-x)=-asin(x)
+    if {[::math::bignum::sign $entier]} {
+        return [opp [asin [abs $x]]]
+    }
+    # 26/07/2005 : changed precision from decimal to binary
+    set piOverTwo [floatRShift [pi $precision 1]]
+    # now a little trick : asin(x)=Pi/2-asin(sqrt(1-x^2))
+    # so we can limit the entry of the Taylor development
+    # to 1/sqrt(2)~0.7071
+    # the comparison is : if x>0.7071 then ...
+    if {[compare $x [fromstr 0.7071]]>0} {
+        variable one
+        set fone [list F [::math::bignum::lshift 1 $precision] \
+                -$precision $one]
+        # asin(1)=Pi/2 (with the same precision as the entry has)
+        if {[equal $fone $x]} {
+            return $piOverTwo
+        }
+        if {[compare $x $fone]>0} {
+            error "asin on a number greater than 1"
+        }
+        # asin(x)=Pi/2-asin(sqrt(1-x^2))
+        set x [sqrt [sub $fone [mul $x $x]]]
+        return [sub $piOverTwo [_asin $x]]
+    }
+    return [normalize [_asin $x]]
+}
+
+################################################################################
+# _asin : arcsinus of numbers between 0 and +1
+################################################################################
+proc ::math::bigfloat::_asin {x} {
+    # Taylor development
+    # asin(x)=x + 1/2 x^3/3 + 3/2.4 x^5/5 + 3.5/2.4.6 x^7/7 + ...
+    # into this iterative form :
+    # asin(x)=x * (1 + 1/2 * x^2 * (1/3 + 3/4 *x^2 * (...
+    # ...* (1/(2n-1) + (2n-1)/2n * x^2 / (2n+1))...)))
+    # we show how is really computed the development :
+    # we don't need to set a var with x^n or a product of integers
+    # all we need is : x^2, 2n-1, 2n, 2n+1 and a few variables
+    foreach {dummy mantissa exp delta} $x {break}
+    set precision [expr {-$exp}]
+    if {$precision+1<[::math::bignum::bits $mantissa]} {
+        error "sinus greater than 1"
+    }
+    # precision is the number of after-dot digits
+    set result $mantissa
+    set delta_final $delta
+    # resultat is the final result, and delta_final
+    # will contain the uncertainty of the result
+    # square is the square of the mantissa
+    set square [intMulShift $mantissa $mantissa $precision]
+    # dt is the uncertainty of Mantissa
+    set dt [::math::bignum::add 1 [intMulShift $mantissa $delta [expr {$precision-1}]]]
+    # these three are required to compute the fractions implicated into
+    # the development (of Taylor, see former)
+    variable one
+    set num $one
+    # two will be used into the loop
+    variable two
+    variable three
+    set i $three
+    set denom $two
+    # the nth factor equals : $num/$denom* $mantissa/$i
+    set delta [::math::bignum::add [::math::bignum::mul $delta $square] \
+            [::math::bignum::mul $dt [::math::bignum::add $delta $mantissa]]]
+    set delta [::math::bignum::add 1 [::math::bignum::rshift [::math::bignum::div \
+            [::math::bignum::mul $delta $num] $denom] $precision]]
+    # we do not multiply the Mantissa by $num right now because it is 1 !
+    # but we have Mantissa=$x
+    # and we want Mantissa*$x^2 * $num / $denom / $i
+    set mantissa [intMulShift $mantissa $square $precision]
+    set mantissa [::math::bignum::div $mantissa $denom]
+    # do not forget the modified Taylor development :
+    # asin(x)=x * (1 + 1/2*x^2*(1/3 + 3/4*x^2*(...*(1/(2n-1) + (2n-1)/2n*x^2/(2n+1))...)))
+    # all we need is : x^2, 2n-1, 2n, 2n+1 and a few variables
+    # $num=2n-1 $denom=2n $square=x^2 and $i=2n+1
+    set mantissa_temp [::math::bignum::div $mantissa $i]
+    set delta_temp [::math::bignum::add 1 [::math::bignum::div $delta $i]]
+    # when the Mantissa increment is smaller than the Delta increment,
+    # we would not get much precision by continuing the development
+    while {![::math::bignum::iszero $mantissa_temp]} {
+        # Mantissa = Mantissa * $num/$denom * $square
+        # Add Mantissa/$i, which is stored in $mantissa_temp, to the result
+        set result [::math::bignum::add $result $mantissa_temp]
+        set delta_final [::math::bignum::add $delta_final $delta_temp]
+        # here we have $two instead of [fromstr 2] (optimization)
+        # num=num+2,i=i+2,denom=denom+2
+        # because num=2n-1 denom=2n and i=2n+1
+        set num [::math::bignum::add $num $two]
+        set i [::math::bignum::add $i $two]
+        set denom [::math::bignum::add $denom $two]
+        # computes precisly the future Delta parameter
+        set delta [::math::bignum::add [::math::bignum::mul $delta $square] \
+                [::math::bignum::mul $dt [::math::bignum::add $delta $mantissa]]]
+        set delta [::math::bignum::add 1 [::math::bignum::rshift [::math::bignum::div \
+                [::math::bignum::mul $delta $num] $denom] $precision]]
+        set mantissa [intMulShift $mantissa $square $precision]
+        set mantissa [::math::bignum::div [::math::bignum::mul $mantissa $num] $denom]
+        set mantissa_temp [::math::bignum::div $mantissa $i]
+        set delta_temp [::math::bignum::add 1 [::math::bignum::div $delta $i]]
+    }
+    return [list F $result $exp $delta_final]
+}
+
+################################################################################
+# arctangent : returns atan(x)
+################################################################################
+proc ::math::bigfloat::atan {x} {
+    checkFloat x
+    variable one
+    variable two
+    variable three
+    variable four
+    variable zero
+    foreach {dummy mantissa exp delta} $x {break}
+    if {$exp>=0} {
+        error "not enough precision to compute atan"
+    }
+    set precision [expr {-$exp}]
+    # atan(0)=0
+    if {[iszero $x]} {
+        return [list F $zero -$precision $one]
+    }
+    # atan(-x)=-atan(x)
+    if {[::math::bignum::sign $mantissa]} {
+        return [opp [atan [abs $x]]]
+    }
+    # now x is strictly positive
+    # at this moment, we are trying to limit |x| to a fair acceptable number
+    # to ensure that Taylor development will converge quickly
+    set float1 [list F [::math::bignum::lshift 1 $precision] -$precision $one]
+    if {[compare $float1 $x]<0} {
+        # compare x to 2.4142
+        if {[compare $x [fromstr 2.4142]]<0} {
+            # atan(x)=Pi/4 + atan((x-1)/(x+1))
+            # as 1<x<2.4142 : (x-1)/(x+1)=1-2/(x+1) belongs to
+            # the range :  ]0,1-2/3.414[
+            # that equals  ]0,0.414[
+            set pi_sur_quatre [div [pi $precision 1] $four]
+            return [add $pi_sur_quatre [atan \
+                    [div [sub $x $float1] [add $x $float1]]]]
+        }
+        # atan(x)=Pi/2-atan(1/x)
+        # 1/x < 1/2.414 so the argument is lower than 0.414
+        set pi_over_two [div [pi $precision 1] $two]
+        return [sub $pi_over_two [atan [div $float1 $x]]]
+    }
+    if {[compare $x [fromstr 0.4142]]>0} {
+        # atan(x)=Pi/4 + atan((x-1)/(x+1))
+        # x>0.420 so (x-1)/(x+1)=1 - 2/(x+1) > 1-2/1.414
+        #                                    > -0.414
+        # x<1 so (x-1)/(x+1)<0
+        set pi_sur_quatre [div [pi $precision 1] $four]
+        return [add $pi_sur_quatre [atan \
+                [div [sub $x $float1] [add $x $float1]]]]
+    }
+    # precision increment : to have less uncertainty
+    # we add a little more precision so that the result would be more accurate
+    # Taylor development : x - x^3/3 + x^5/5 - ... + (-1)^(n+1)*x^(2n-1)/(2n-1)
+    # when we have n steps in Taylor development : the nth term is :
+    # x^(2n-1)/(2n-1)
+    # and the loss of precision is of 2n (n sums and n divisions)
+    # this command is called with x<sqrt(2)-1
+    # if we add an increment to the precision, say n:
+    # (sqrt(2)-1)^(2n-1)/(2n-1) has to be lower than 2^(-precision-n-1)
+    # (2n-1)*log(sqrt(2)-1)-log(2n-1)<-(precision+n+1)*log(2)
+    # 2n(log(sqrt(2)-1)-log(sqrt(2)))<-(precision-1)*log(2)+log(2n-1)+log(sqrt(2)-1)
+    # 2n*log(1-1/sqrt(2))<-(precision-1)*log(2)+log(2n-1)+log(2)/2
+    # 2n/sqrt(2)>(precision-3/2)*log(2)-log(2n-1)
+    # hence log(2n-1)<2n-1
+    # n*sqrt(2)>(precision-1.5)*log(2)+1-2n
+    # n*(sqrt(2)+2)>(precision-1.5)*log(2)+1
+    set n [expr {int((log(2)*($precision-1.5)+1)/(sqrt(2)+2)+1)}]
+    incr precision $n
+    set mantissa [::math::bignum::lshift $mantissa $n]
+    set delta [::math::bignum::lshift $delta $n]
+    # end of adding precision increment
+    # now computing Taylor development :
+    # atan(x)=x - x^3/3 + x^5/5 - x^7/7 ... + (-1)^n*x^(2n+1)/(2n+1)
+    # atan(x)=x * (1 - x^2 * (1/3 - x^2 * (1/5 - x^2 * (...*(1/(2n-1) - x^2 / (2n+1))...))))
+    # what do we need to compute this ?
+    # x^2 ($square), 2n+1 ($divider), $result, the nth term of the development ($t)
+    # and the nth term multiplied by 2n+1 ($temp)
+    # then we do this (with care keeping as much precision as possible):
+    # while ($t <>0) :
+    #     $result=$result+$t
+    #     $temp=$temp * $square
+    #     $divider = $divider+2
+    #     $t=$temp/$divider
+    # end-while
+    set result $mantissa
+    set delta_end $delta
+    # we store the square of the integer (mantissa)
+    set delta_square [::math::bignum::lshift $delta 1]
+    set square [intMulShift $mantissa $mantissa $precision]
+    # the (2n+1) divider
+    set divider $three
+    # computing precisely the uncertainty
+    set delta [::math::bignum::add 1 [::math::bignum::rshift [::math::bignum::add \
+            [::math::bignum::mul $delta_square $mantissa] \
+            [::math::bignum::mul $delta $square]] $precision]]
+    # temp contains (-1)^n*x^(2n+1)
+    set temp [opp [intMulShift $mantissa $square $precision]]
+    set t [::math::bignum::div $temp $divider]
+    set dt [::math::bignum::add 1 [::math::bignum::div $delta $divider]]
+    while {![::math::bignum::iszero $t]} {
+        set result [::math::bignum::add $result $t]
+        set delta_end [::math::bignum::add $delta_end $dt]
+        set divider [::math::bignum::add $divider $two]
+        set delta [::math::bignum::add 1 [::math::bignum::rshift [::math::bignum::add \
+                [::math::bignum::mul $delta_square [abs $temp]] [::math::bignum::mul $delta \
+                [::math::bignum::add $delta_square $square]]] $precision]]
+        set temp [opp [intMulShift $temp $square $precision]]
+        set t [::math::bignum::div $temp $divider]
+        set dt [::math::bignum::add [::math::bignum::div $delta $divider] $one]
+    }
+    # we have to normalize because the uncertainty might be greater than 99
+    # moreover it is the most often case
+    return [normalize [list F $result [expr {$exp-$n}] $delta_end]]
+}
+
+
+################################################################################
+# compute atan(1/integer) at a given precision
+# this proc is only used to compute Pi
+# it is using the same Taylor development as [atan]
+################################################################################
+proc ::math::bigfloat::_atanfract {integer precision} {
+    # Taylor development : x - x^3/3 + x^5/5 - ... + (-1)^(n+1)*x^(2n-1)/(2n-1)
+    # when we have n steps in Taylor development : the nth term is :
+    # 1/denom^(2n+1)/(2n+1)
+    # and the loss of precision is of 2n (n sums and n divisions)
+    # this command is called with integer>=5
+    #
+    # We do not want to compute the Delta parameter, so we just
+    # can increment precision (with lshift) in order for the result to be precise.
+    # Remember : we compute atan2(1,$integer) with $precision bits
+    # $integer has no Delta parameter as it is a BigInt, of course, so
+    # theorically we could compute *any* number of digits.
+    #
+    # if we add an increment to the precision, say n:
+    # (1/5)^(2n-1)/(2n-1)     has to be lower than (1/2)^(precision+n-1)
+    # Calculus :
+    # log(left term) < log(right term)
+    # log(1/left term) > log(1/right term)
+    # (2n-1)*log(5)+log(2n-1)>(precision+n-1)*log(2)
+    # n(2log(5)-log(2))>(precision-1)*log(2)-log(2n-1)+log(5)
+    # -log(2n-1)>-(2n-1)
+    # n(2log(5)-log(2)+2)>(precision-1)*log(2)+1+log(5)
+    set n [expr {int((($precision-1)*log(2)+1+log(5))/(2*log(5)-log(2)+2)+1)}]
+    incr precision $n
+    # first term of the development : 1/integer
+    set a [::math::bignum::div [::math::bignum::lshift 1 $precision] $integer]
+    # 's' will contain the result
+    set s $a
+    # Taylor development : x - x^3/3 + x^5/5 - ... + (-1)^(n+1)*x^(2n-1)/(2n-1)
+    # equals x (1 - x^2 * (1/3 + x^2 * (... * (1/(2n-3) + (-1)^(n+1) * x^2 / (2n-1))...)))
+    # all we need to store is : 2n-1 ($denom), x^(2n+1) and x^2 ($square) and two results :
+    # - the nth term => $u
+    # - the nth term * (2n-1) => $t
+    # + of course, the result $s
+    set square [::math::bignum::mul $integer $integer]
+    variable two
+    variable three
+    set denom $three
+    # $t is (-1)^n*x^(2n+1)
+    set t [opp [::math::bignum::div $a $square]]
+    set u [::math::bignum::div $t $denom]
+    # we break the loop when the current term of the development is null
+    while {![::math::bignum::iszero $u]} {
+        set s [::math::bignum::add $s $u]
+        # denominator= (2n+1)
+        set denom [::math::bignum::add $denom $two]
+        # div $t by x^2
+        set t [opp [::math::bignum::div $t $square]]
+        set u [::math::bignum::div $t $denom]
+    }
+    # go back to the initial precision
+    return [::math::bignum::rshift $s $n]
+}
+
+
+################################################################################
+# returns the integer part of a BigFloat, as a BigInt
+# the result is the same one you would have
+# if you had called [expr {ceil($x)}]
+################################################################################
+proc ::math::bigfloat::ceil {number} {
+    checkFloat number
+    set number [normalize $number]
+    if {[iszero $number]} {
+        # returns the BigInt 0
+        variable zero
+        return $zero
+    }
+    foreach {dummy integer exp delta} $number {break}
+    if {$exp>=0} {
+        error "not enough precision to perform rounding (ceil)"
+    }
+    # saving the sign ...
+    set sign [::math::bignum::sign $integer]
+    set integer [abs $integer]
+    # integer part
+    set try [::math::bignum::rshift $integer [expr {-$exp}]]
+    if {$sign} {
+        return [opp $try]
+    }
+    # fractional part
+    if {![equal [::math::bignum::lshift $try [expr {-$exp}]] $integer]} {
+        return [::math::bignum::add 1 $try]
+    }
+    return $try
+}
+
+
+################################################################################
+# checks each variable to be a BigFloat
+# arguments : each argument is the name of a variable to be checked
+################################################################################
+proc ::math::bigfloat::checkFloat {args} {
+    foreach x $args {
+        upvar $x n
+        if {![isFloat $n]} {
+            error "BigFloat expected : received '$n'"
+        }
+    }
+}
+
+################################################################################
+# checks if each number is either a BigFloat or a BigInt
+# arguments : each argument is the name of a variable to be checked
+################################################################################
+proc ::math::bigfloat::checkNumber {args} {
+    foreach i $args {
+        upvar $i x
+        if {![isInt $x] && ![isFloat $x]} {
+            error "'$x' is not a number"
+        }
+    }
+}
+
+
+################################################################################
+# returns 0 if A and B are equal, else returns 1 or -1
+# accordingly to the sign of (A - B)
+################################################################################
+proc ::math::bigfloat::compare {a b} {
+    if {[isInt $a] && [isInt $b]} {
+        return [::math::bignum::cmp $a $b]
+    }
+    checkFloat a b
+    if {[equal $a $b]} {return 0}
+    return [expr {([::math::bignum::sign [lindex [sub $a $b] 1]])?-1:1}]
+}
+
+
+
+
+################################################################################
+# gets cos(x)
+# throws an error if there is not enough precision on the input
+################################################################################
+proc ::math::bigfloat::cos {x} {
+    checkFloat x
+    foreach {dummy integer exp delta} $x {break}
+    if {$exp>-2} {
+        error "not enough precision on floating-point number"
+    }
+    set precision [expr {-$exp}]
+    # cos(2kPi+x)=cos(x)
+    foreach {n integer} [divPiQuarter $integer $precision] {break}
+    # now integer>=0 and <Pi/2
+    set d [expr {[tostr $n]%4}]
+    # add trigonometric circle turns number to delta
+    set delta [::math::bignum::add [abs $n] $delta]
+    set signe 0
+    # cos(Pi-x)=-cos(x)
+    # cos(-x)=cos(x)
+    # cos(Pi/2-x)=sin(x)
+    switch -- $d {
+        1 {set signe 1;set l [_sin2 $integer $precision $delta]}
+        2 {set signe 1;set l [_cos2 $integer $precision $delta]}
+        0 {set l [_cos2 $integer $precision $delta]}
+        3 {set l [_sin2 $integer $precision $delta]}
+        default {error "internal error"}
+    }
+    # precision -> exp (multiplied by -1)
+    lset l 1 [expr {-([lindex $l 1])}]
+    # set the sign
+    set integer [lindex $l 0]
+    ::math::bignum::setsign integer $signe
+    lset l 0 $integer
+    return [normalize [linsert $l 0 F]]
+}
+
+################################################################################
+# compute cos(x) where 0<=x<Pi/2
+# returns : a list formed with :
+# 1. the mantissa
+# 2. the precision (opposite of the exponent)
+# 3. the uncertainty (doubt range)
+################################################################################
+proc ::math::bigfloat::_cos2 {x precision delta} {
+    # precision bits after the dot
+    set pi [_pi $precision]
+    set pis4 [::math::bignum::rshift $pi 2]
+    set pis2 [::math::bignum::rshift $pi 1]
+    if {[::math::bignum::cmp $x $pis4]>=0} {
+        # cos(Pi/2-x)=sin(x)
+        set x [::math::bignum::sub $pis2 $x]
+        set delta [::math::bignum::add 1 $delta]
+        return [_sin $x $precision $delta]
+    }
+    return [_cos $x $precision $delta]
+}
+
+################################################################################
+# compute cos(x) where 0<=x<Pi/4
+# returns : a list formed with :
+# 1. the mantissa
+# 2. the precision (opposite of the exponent)
+# 3. the uncertainty (doubt range)
+################################################################################
+proc ::math::bigfloat::_cos {x precision delta} {
+    variable zero
+    variable one
+    variable two
+    set float1 [::math::bignum::lshift $one $precision]
+    # Taylor development follows :
+    # cos(x)=1-x^2/2 + x^4/4! ... + (-1)^(2n)*x^(2n)/2n!
+    # cos(x)= 1 - x^2/1.2 * (1 - x^2/3.4 * (... * (1 - x^2/(2n.(2n-1))...))
+    # variables : $s (the Mantissa of the result)
+    # $denom1 & $denom2 (2n-1 & 2n)
+    # $x as the square of what is named x in 'cos(x)'
+    set s $float1
+    # 'd' is the uncertainty on x^2
+    set d [::math::bignum::mul $x [::math::bignum::lshift $delta 1]]
+    set d [::math::bignum::add 1 [::math::bignum::rshift $d $precision]]
+    # x=x^2 (because in this Taylor development, there are only even powers of x)
+    set x [intMulShift $x $x $precision]
+    set denom1 $one
+    set denom2 $two
+    set t [opp [::math::bignum::rshift $x 1]]
+    set delta $zero
+    set dt $d
+    while {![::math::bignum::iszero $t]} {
+        set s [::math::bignum::add $s $t]
+        set delta [::math::bignum::add $delta $dt]
+        set denom1 [::math::bignum::add $denom1 $two]
+        set denom2 [::math::bignum::add $denom2 $two]
+        set dt [::math::bignum::rshift [::math::bignum::add [::math::bignum::mul $x $dt]\
+                [::math::bignum::mul [::math::bignum::add $t $dt] $d]] $precision]
+        set dt [::math::bignum::add 1 $dt]
+        set t [intMulShift $x $t $precision]
+        set t [opp [::math::bignum::div $t [::math::bignum::mul $denom1 $denom2]]]
+    }
+    return [list $s $precision $delta]
+}
+
+################################################################################
+# cotangent : the trivial algorithm is used
+################################################################################
+proc ::math::bigfloat::cotan {x} {
+    return [::math::bigfloat::div [::math::bigfloat::cos $x] [::math::bigfloat::sin $x]]
+}
+
+################################################################################
+# converts angles from degrees to radians
+# deg/180=rad/Pi
+################################################################################
+proc ::math::bigfloat::deg2rad {x} {
+    checkFloat x
+    set xLen [expr {-[lindex $x 2]}]
+    if {$xLen<3} {
+        error "number too loose to convert to radians"
+    }
+    set pi [pi $xLen 1]
+    return [div [mul $x $pi] [::math::bignum::fromstr 180]]
+}
+
+
+
+################################################################################
+# private proc to get : x modulo Pi/2
+# and the quotient (x divided by Pi/2)
+# used by cos , sin & others
+################################################################################
+proc ::math::bigfloat::divPiQuarter {integer precision} {
+    incr precision 2
+    set integer [::math::bignum::lshift $integer 1]
+    set dpi [_pi $precision]
+    # modulo 2Pi
+    foreach {n integer} [::math::bignum::divqr $integer $dpi] {break}
+    # end modulo 2Pi
+    set pi [::math::bignum::rshift $dpi 1]
+    foreach {n integer} [::math::bignum::divqr $integer $pi] {break}
+    # now divide by Pi/2
+    # multiply n by 2
+    set n [::math::bignum::lshift $n 1]
+    # pis2=pi/2
+    set pis2 [::math::bignum::rshift $pi 1]
+    foreach {m integer} [::math::bignum::divqr $integer $pis2] {break}
+    return [list [::math::bignum::add $n $m] [::math::bignum::rshift $integer 1]]
+}
+
+
+################################################################################
+# divide A by B and returns the result
+# throw error : divide by zero
+################################################################################
+proc ::math::bigfloat::div {a b} {
+    variable one
+    checkNumber a b
+    # dispatch to an appropriate procedure
+    if {[isInt $a]} {
+        if {[isInt $b]} {
+            return [::math::bignum::div $a $b]
+        }
+        error "trying to divide a BigInt by a BigFloat"
+    }
+    if {[isInt $b]} {return [divFloatByInt $a $b]}
+    foreach {dummy integerA expA deltaA} $a {break}
+    foreach {dummy integerB expB deltaB} $b {break}
+    # computes the limits of the doubt (or uncertainty) interval
+    set BMin [::math::bignum::sub $integerB $deltaB]
+    set BMax [::math::bignum::add $integerB $deltaB]
+    if {[::math::bignum::cmp $BMin $BMax]>0} {
+        # swap BMin and BMax
+        set temp $BMin
+        set BMin $BMax
+        set BMax $temp
+    }
+    # multiply by zero gives zero
+    if {[::math::bignum::iszero $integerA]} {
+        # why not return any number or the integer 0 ?
+        # because there is an exponent that might be different between two BigFloats
+        # 0.00 --> exp = -2, 0.000000 -> exp = -6
+        return $a
+    }
+    # test of the division by zero
+    if {[::math::bignum::sign $BMin]+[::math::bignum::sign $BMax]==1 || \
+                [::math::bignum::iszero $BMin] || [::math::bignum::iszero $BMax]} {
+        error "divide by zero"
+    }
+    # shift A because we need accuracy
+    set l [math::bignum::bits $integerB]
+    set integerA [::math::bignum::lshift $integerA $l]
+    set deltaA [::math::bignum::lshift $deltaA $l]
+    set exp [expr {$expA-$l-$expB}]
+    # relative uncertainties (dX/X) are added
+    # to give the relative uncertainty of the result
+    # i.e. 3% on A + 2% on B --> 5% on the quotient
+    # d(A/B)/(A/B)=dA/A + dB/B
+    # Q=A/B
+    # dQ=dA/B + dB*A/B*B
+    # dQ is "delta"
+    set delta [::math::bignum::div [::math::bignum::mul $deltaB \
+            [abs $integerA]] [abs $integerB]]
+    set delta [::math::bignum::div [::math::bignum::add\
+            [::math::bignum::add 1 $delta]\
+            $deltaA] [abs $integerB]]
+    set quotient [::math::bignum::div $integerA $integerB]
+    if {[::math::bignum::sign $integerB]+[::math::bignum::sign $integerA]==1} {
+        set quotient [::math::bignum::sub $quotient 1]
+    }
+    return [normalize [list F $quotient $exp [::math::bignum::add $delta 1]]]
+}
+
+
+
+
+################################################################################
+# divide a BigFloat A by a BigInt B
+# throw error : divide by zero
+################################################################################
+proc ::math::bigfloat::divFloatByInt {a b} {
+    variable one
+    # type check
+    checkFloat a
+    if {![isInt $b]} {
+        error "'$b' is not a BigInt"
+    }
+    foreach {dummy integer exp delta} $a {break}
+    # zero divider test
+    if {[::math::bignum::iszero $b]} {
+        error "divide by zero"
+    }
+    # shift left for accuracy ; see other comments in [div] procedure
+    set l [::math::bignum::bits $b]
+    set integer [::math::bignum::lshift $integer $l]
+    set delta [::math::bignum::lshift $delta $l]
+    incr exp -$l
+    set integer [::math::bignum::div $integer $b]
+    # the uncertainty is always evaluated to the ceil value
+    # and as an absolute value
+    set delta [::math::bignum::add 1 [::math::bignum::div $delta [abs $b]]]
+    return [normalize [list F $integer $exp $delta]]
+}
+
+
+
+
+
+################################################################################
+# returns 1 if A and B are equal, 0 otherwise
+# IN : a, b (BigFloats)
+################################################################################
+proc ::math::bigfloat::equal {a b} {
+    if {[isInt $a] && [isInt $b]} {
+        return [expr {[::math::bignum::cmp $a $b]==0}]
+    }
+    # now a & b should only be BigFloats
+    checkFloat a b
+    foreach {dummy aint aexp adelta} $a {break}
+    foreach {dummy bint bexp bdelta} $b {break}
+    # set all Mantissas and Deltas to the same level (exponent)
+    # with lshift
+    set diff [expr {$aexp-$bexp}]
+    if {$diff<0} {
+        set diff [expr {-$diff}]
+        set bint [::math::bignum::lshift $bint $diff]
+        set bdelta [::math::bignum::lshift $bdelta $diff]
+    } elseif {$diff>0} {
+        set aint [::math::bignum::lshift $aint $diff]
+        set adelta [::math::bignum::lshift $adelta $diff]
+    }
+    # compute limits of the number's doubt range
+    set asupInt [::math::bignum::add $aint $adelta]
+    set ainfInt [::math::bignum::sub $aint $adelta]
+    set bsupInt [::math::bignum::add $bint $bdelta]
+    set binfInt [::math::bignum::sub $bint $bdelta]
+    # A & B are equal
+    # if their doubt ranges overlap themselves
+    if {[::math::bignum::cmp $bint $aint]==0} {
+        return 1
+    }
+    if {[::math::bignum::cmp $bint $aint]>0} {
+        set r [expr {[::math::bignum::cmp $asupInt $binfInt]>=0}]
+    } else {
+        set r [expr {[::math::bignum::cmp $bsupInt $ainfInt]>=0}]
+    }
+    return $r
+}
+
+################################################################################
+# returns exp(X) where X is a BigFloat
+################################################################################
+proc ::math::bigfloat::exp {x} {
+    checkFloat x
+    foreach {dummy integer exp delta} $x {break}
+    if {$exp>=0} {
+        # shift till exp<0 with respect to the internal representation
+        # of the number
+        incr exp
+        set integer [::math::bignum::lshift $integer $exp]
+        set delta [::math::bignum::lshift $delta $exp]
+        set exp -1
+    }
+    set precision [expr {-$exp}]
+    # add 8 bits of precision for safety
+    incr precision 8
+    set integer [::math::bignum::lshift $integer 8]
+    set delta [::math::bignum::lshift $delta 8]
+    set Log2 [_log2 $precision]
+    foreach {new_exp integer} [::math::bignum::divqr $integer $Log2] {break}
+    # new_exp = integer part of x/log(2)
+    # integer = remainder
+    # exp(K.log(2)+r)=2^K.exp(r)
+    # so we just have to compute exp(r), r is small so
+    # the Taylor development will converge quickly
+    set delta [::math::bignum::add $delta $new_exp]
+    foreach {integer delta} [_exp $integer $precision $delta] {break}
+    set delta [::math::bignum::rshift $delta 8]
+    incr precision -8
+    # multiply by 2^K , and take care of the sign
+    # example : X=-6.log(2)+0.01
+    # exp(X)=exp(0.01)*2^-6
+    if {![::math::bignum::iszero [::math::bignum::rshift [abs $new_exp] 30]]} {
+        error "floating-point overflow due to exp"
+    }
+    set new_exp [tostr $new_exp]
+    set exp [expr {$new_exp-$precision}]
+    set delta [::math::bignum::add 1 $delta]
+    return [normalize [list F [::math::bignum::rshift $integer 8] $exp $delta]]
+}
+
+
+################################################################################
+# private procedure to compute exponentials
+# using Taylor development of exp(x) :
+# exp(x)=1+ x + x^2/2 + x^3/3! +...+x^n/n!
+# input : integer (the mantissa)
+#         precision (the number of decimals)
+#         delta (the doubt limit, or uncertainty)
+# returns a list : 1. the mantissa of the result
+#                  2. the doubt limit, or uncertainty
+################################################################################
+proc ::math::bigfloat::_exp {integer precision delta} {
+    set oneShifted [::math::bignum::lshift 1 $precision]
+    if {[::math::bignum::iszero $integer]} {
+        # exp(0)=1
+        return [list $oneShifted $delta]
+    }
+    set s [::math::bignum::add $oneShifted $integer]
+    variable two
+    set d [::math::bignum::add 1 [::math::bignum::div $delta $two]]
+    set delta [::math::bignum::add $delta $delta]
+    # dt = uncertainty on x^2
+    set dt [::math::bignum::add 1 [intMulShift $d $integer $precision]]
+    # t= x^2/2
+    set t [intMulShift $integer $integer $precision]
+    set t [::math::bignum::div $t $two]
+    set denom $two
+    while {![::math::bignum::iszero $t]} {
+        # the sum is called 's'
+        set s [::math::bignum::add $s $t]
+        set delta [::math::bignum::add $delta $dt]
+        # we do not have to keep trace of the factorial, we just iterate divisions
+        set denom [::math::bignum::add 1 $denom]
+        # add delta
+        set d [::math::bignum::add 1 [::math::bignum::div $d $denom]]
+        set dt [::math::bignum::add $dt $d]
+        # get x^n from x^(n-1)
+        set t [intMulShift $integer $t $precision]
+        # here we divide
+        set t [::math::bignum::div $t $denom]
+    }
+    return [list $s $delta]
+}
+################################################################################
+# divide a BigFloat by 2 power 'n'
+################################################################################
+proc ::math::bigfloat::floatRShift {float {n 1}} {
+    return [lset float 2 [expr {[lindex $float 2]-$n}]]
+}
+
+
+
+################################################################################
+# procedure floor : identical to [expr floor($x)] in functionality
+# arguments : number IN (a BigFloat)
+# returns : the floor value as a BigInt
+################################################################################
+proc ::math::bigfloat::floor {number} {
+    variable zero
+    checkFloat number
+    set number [normalize $number]
+    if {[::math::bignum::iszero $number]} {
+        # returns the BigInt 0
+        return $zero
+    }
+    foreach {dummy integer exp delta} $number {break}
+    if {$exp>=0} {
+        error "not enough precision to perform rounding (floor)"
+    }
+    # saving the sign ...
+    set sign [::math::bignum::sign $integer]
+    set integer [abs $integer]
+    # integer part
+    set try [::math::bignum::rshift $integer [expr {-$exp}]]
+    # floor(n.xxxx)=n
+    if {!$sign} {
+        return $try
+    }
+    # floor(-n.xxxx)=-(n+1) when xxxx!=0
+    if {![equal [::math::bignum::lshift $try [expr {-$exp}]] $integer]} {
+        set try [::math::bignum::add 1 $try]
+    }
+    ::math::bignum::setsign try $sign
+    return $try
+}
+
+
+################################################################################
+# returns a list formed by an integer and an exponent
+# x = (A +/- C) * 10 power B
+# return [list "F" A B C] (where F is the BigFloat tag)
+# A and C are BigInts, B is a raw integer
+# return also a BigInt when there is neither a dot, nor a 'e' exponent
+#
+# arguments : -base base integer
+#          or integer
+#          or float
+#          or float trailingZeros
+################################################################################
+proc ::math::bigfloat::fromstr {args} {
+    if {[set string [lindex $args 0]]=="-base"} {
+        if {[llength $args]!=3} {
+            error "should be : fromstr -base base number"
+        }
+        # converts an integer i expressed in base b with : [fromstr b i]
+        return [::math::bignum::fromstr [lindex $args 2] [lindex $args 1]]
+    }
+    # trailingZeros are zeros appended to the Mantissa (it is optional)
+    set trailingZeros 0
+    if {[llength $args]==2} {
+        set trailingZeros [lindex $args 1]
+    }
+    if {$trailingZeros<0} {
+        error "second argument has to be a positive integer"
+    }
+    # eliminate the sign problem
+    # added on 05/08/2005
+    # setting '$signe' to the sign of the number
+    set string [string trimleft $string +]
+    if {[string index $string 0]=="-"} {
+        set signe 1
+        set string2 [string range $string 1 end]
+    } else  {
+        set signe 0
+        set string2 $string
+    }
+    # integer case (not a floating-point number)
+    if {[string is digit $string2]} {
+        if {$trailingZeros!=0} {
+            error "second argument not allowed with an integer"
+        }
+        # we have completed converting an integer to a BigInt
+        # please note that most math::bigfloat procs accept BigInts as arguments
+        return [::math::bignum::fromstr $string]
+    }
+    set string $string2
+    # floating-point number : check for an exponent
+    # scientific notation
+    set tab [split $string e]
+    if {[llength $tab]>2} {
+        # there are more than one 'e' letter in the number
+        error "syntax error in number : $string"
+    }
+    if {[llength $tab]==2} {
+        set exp [lindex $tab 1]
+        # now exp can look like +099 so you need to handle octal numbers
+        # too bad...
+        # find the sign (if any?)
+        regexp {^[\+\-]?} $exp expsign
+        # trim the number with left-side 0's
+        set found [string length $expsign]
+        set exp $expsign[string trimleft [string range $exp $found end] 0]
+        set number [lindex $tab 0]
+    } else {
+        set exp 0
+        set number [lindex $tab 0]
+    }
+    # a floating-point number may have a dot
+    set tab [split $number .]
+    if {[llength $tab]>2} {error "syntax error in number : $string"}
+    if {[llength $tab]==2} {
+        set number [join $tab ""]
+        # increment by the number of decimals (after the dot)
+        incr exp -[string length [lindex $tab 1]]
+    }
+    # this is necessary to ensure we can call fromstr (recursively) with
+    # the mantissa ($number)
+    if {![string is digit $number]} {
+        error "$number is not a number"
+    }
+    # take account of trailing zeros
+    incr exp -$trailingZeros
+    # multiply $number by 10^$trailingZeros
+    set number [::math::bignum::mul [::math::bignum::fromstr $number]\
+            [tenPow $trailingZeros]]
+    ::math::bignum::setsign number $signe
+    # the F tags a BigFloat
+    # a BigInt in internal representation begins by the sign
+    # delta is 1 as a BigInt
+    return [_fromstr $number $exp]
+}
+
+################################################################################
+# private procedure to transform decimal floats into binary ones
+# IN :
+#     - number : a BigInt representing the Mantissa
+#     - exp : the decimal exponent (a simple integer)
+# OUT :
+#     $number * 10^$exp, as the internal binary representation of a BigFloat
+################################################################################
+proc ::math::bigfloat::_fromstr {number exp} {
+    variable one
+    variable five
+    if {$exp==0} {
+        return [list F $number 0 $one]
+    }
+    if {$exp>0} {
+        # mul by 10^exp, and by 2^4, then normalize
+        set number [::math::bignum::lshift $number 4]
+        set exponent [tenPow $exp]
+        set number [::math::bignum::mul $number $exponent]
+        # normalize number*2^-4 +/- 2^4*10^exponent
+        return [normalize [list F $number -4 [::math::bignum::lshift $exponent 4]]]
+    }
+    # now exp is negative or null
+    # the closest power of 2 to the 'exp'th power of ten, but greater than it
+    set binaryExp [expr {int(ceil(-$exp*log(10)/log(2)))+4}]
+    # then compute n * 2^binaryExp / 10^(-exp)
+    # (exp is negative)
+    # equals n * 2^(binaryExp+exp) / 5^(-exp)
+    set diff [expr {$binaryExp+$exp}]
+    if {$diff<0} {
+        error "internal error"
+    }
+    set fivePow [::math::bignum::pow $five [::math::bignum::fromstr [expr {-$exp}]]]
+    set number [::math::bignum::div [::math::bignum::lshift $number \
+            $diff] $fivePow]
+    set delta [::math::bignum::div [::math::bignum::lshift 1 \
+            $diff] $fivePow]
+    return [normalize [list F $number [expr {-$binaryExp}] [::math::bignum::add $delta 1]]]
+}
+
+
+################################################################################
+# fromdouble :
+# like fromstr, but for a double scalar value
+# arguments :
+# double - the number to convert to a BigFloat
+# exp (optional) - the total number of digits
+################################################################################
+proc ::math::bigfloat::fromdouble {double {exp {}}} {
+    set mantissa [lindex [split $double e] 0]
+    # line added by SArnold on 05/08/2005
+    set mantissa [string trimleft [string map {+ "" - ""} $mantissa] 0]
+    set precision [string length [string map {. ""} $mantissa]]
+    if { $exp != {} && [incr exp]>$precision } {
+        return [fromstr $double [expr {$exp-$precision}]]
+    } else {
+        # tests have failed : not enough precision or no exp argument
+        return [fromstr $double]
+    }
+}
+
+
+################################################################################
+# converts a BigInt into a BigFloat with a given decimal precision
+################################################################################
+proc ::math::bigfloat::int2float {int {decimals 1}} {
+    # it seems like we need some kind of type handling
+    # very odd in this Tcl world :-(
+    if {![isInt $int]} {
+        error "first argument is not an integer"
+    }
+    if {$decimals<1} {
+        error "non-positive decimals number"
+    }
+    # the lowest number of decimals is 1, because
+    # [tostr [fromstr 10.0]] returns 10.
+    # (we lose 1 digit when converting back to string)
+    set int [::math::bignum::mul $int [tenPow $decimals]]
+    return [_fromstr $int [expr {-$decimals}]]
+
+}
+
+
+
+################################################################################
+# multiplies 'leftop' by 'rightop' and rshift the result by 'shift'
+################################################################################
+proc ::math::bigfloat::intMulShift {leftop rightop shift} {
+    return [::math::bignum::rshift [::math::bignum::mul $leftop $rightop] $shift]
+}
+
+################################################################################
+# returns 1 if x is a BigFloat, 0 elsewhere
+################################################################################
+proc ::math::bigfloat::isFloat {x} {
+    # a BigFloat is a list of : "F" mantissa exponent delta
+    if {[llength $x]!=4} {
+        return 0
+    }
+    # the marker is the letter "F"
+    if {[string equal [lindex $x 0] F]} {
+        return 1
+    }
+    return 0
+}
+
+################################################################################
+# checks that n is a BigInt (a number create by math::bignum::fromstr)
+################################################################################
+proc ::math::bigfloat::isInt {n} {
+    if {[llength $n]<3} {
+        return 0
+    }
+    if {[string equal [lindex $n 0] bignum]} {
+        return 1
+    }
+    return 0
+}
+
+
+
+################################################################################
+# returns 1 if x is null, 0 otherwise
+################################################################################
+proc ::math::bigfloat::iszero {x} {
+    if {[isInt $x]} {
+        return [::math::bignum::iszero $x]
+    }
+    checkFloat x
+    # now we do some interval rounding : if a number's interval englobs 0,
+    # it is considered to be equal to zero
+    foreach {dummy integer exp delta} $x {break}
+    set integer [::math::bignum::abs $integer]
+    if {[::math::bignum::cmp $delta $integer]>=0} {return 1}
+    return 0
+}
+
+
+################################################################################
+# compute log(X)
+################################################################################
+proc ::math::bigfloat::log {x} {
+    checkFloat x
+    foreach {dummy integer exp delta} $x {break}
+    if {[::math::bignum::iszero $integer]||[::math::bignum::sign $integer]} {
+        error "zero logarithm error"
+    }
+    if {[iszero $x]} {
+        error "number is null"
+    }
+    set precision [::math::bignum::bits $integer]
+    # uncertainty of the logarithm
+    set delta [::math::bignum::add 1 [_logOnePlusEpsilon $delta $integer $precision]]
+    # we got : x = 1xxxxxx (binary number with 'precision' bits) * 2^exp
+    # we need : x = 0.1xxxxxx(binary) *2^(exp+precision)
+    incr exp $precision
+    foreach {integer deltaIncr} [_log $integer] {break}
+    set delta [::math::bignum::add $delta $deltaIncr]
+    # log(a * 2^exp)= log(a) + exp*log(2)
+    # result = log(x) + exp*log(2)
+    # as x<1 log(x)<0 but 'integer' (result of '_log') is the absolute value
+    # that is why we substract $integer to log(2)*$exp
+    set integer [::math::bignum::sub [::math::bignum::mul [_log2 $precision] \
+            [set exp [::math::bignum::fromstr $exp]]] $integer]
+    set delta [::math::bignum::add $delta [abs $exp]]
+    return [normalize [list F $integer -$precision $delta]]
+}
+
+
+################################################################################
+# compute log(1-epsNum/epsDenom)=log(1-'epsilon')
+# Taylor development gives -x -x^2/2 -x^3/3 -x^4/4 ...
+# used by 'log' command because log(x+/-epsilon)=log(x)+log(1+/-(epsilon/x))
+# so the uncertainty equals abs(log(1-epsilon/x))
+# ================================================
+# arguments :
+# epsNum IN (the numerator of epsilon)
+# epsDenom IN (the denominator of epsilon)
+# precision IN (the number of bits after the dot)
+#
+# 'epsilon' = epsNum*2^-precision/epsDenom
+################################################################################
+proc ::math::bigfloat::_logOnePlusEpsilon {epsNum epsDenom precision} {
+    if {[::math::bignum::cmp $epsNum $epsDenom]>=0} {
+        error "number is null"
+    }
+    set s [::math::bignum::lshift $epsNum $precision]
+    set s [::math::bignum::div $s $epsDenom]
+    variable two
+    set divider $two
+    set t [::math::bignum::div [::math::bignum::mul $s $epsNum] $epsDenom]
+    set u [::math::bignum::div $t $divider]
+    # when u (the current term of the development) is zero, we have reached our goal
+    # it has converged
+    while {![::math::bignum::iszero $u]} {
+        set s [::math::bignum::add $s $u]
+        # divider = order of the term = 'n'
+        set divider [::math::bignum::add 1 $divider]
+        # t = (epsilon)^n
+        set t [::math::bignum::div [::math::bignum::mul $t $epsNum] $epsDenom]
+        # u = t/n = (epsilon)^n/n and is the nth term of the Taylor development
+        set u [::math::bignum::div $t $divider]
+    }
+    return $s
+}
+
+
+################################################################################
+# compute log(0.xxxxxxxx) : log(1-epsilon)=-eps-eps^2/2-eps^3/3...-eps^n/n
+################################################################################
+proc ::math::bigfloat::_log {integer} {
+    # the uncertainty is nbSteps with nbSteps<=nbBits
+    # take nbSteps=nbBits (the worse case) and log(nbBits+increment)=increment
+    set precision [::math::bignum::bits $integer]
+    set n [expr {int(log($precision+2*log($precision)))}]
+    set integer [::math::bignum::lshift $integer $n]
+    incr precision $n
+    variable three
+    set delta $three
+    # 1-epsilon=integer
+    set integer [::math::bignum::sub [::math::bignum::lshift 1 $precision] $integer]
+    set s $integer
+    # t=x^2
+    set t [intMulShift $integer $integer $precision]
+    variable two
+    set denom $two
+    # u=x^2/2 (second term)
+    set u [::math::bignum::div $t $denom]
+    while {![::math::bignum::iszero $u]} {
+        # while the current term is not zero, it has not converged
+        set s [::math::bignum::add $s $u]
+        set delta [::math::bignum::add 1 $delta]
+        # t=x^n
+        set t [intMulShift $t $integer $precision]
+        # denom = n (the order of the current development term)
+        set denom [::math::bignum::add 1 $denom]
+        # u = x^n/n (the nth term of Taylor development)
+        set u [::math::bignum::div $t $denom]
+    }
+    # shift right to restore the precision
+    set delta [::math::bignum::add 1 [::math::bignum::rshift $delta $n]]
+    return [list [::math::bignum::rshift $s $n] $delta]
+}
+
+################################################################################
+# computes log(num/denom) with 'precision' bits
+# used to compute some analysis constants with a given accuracy
+# you might not call this procedure directly : it assumes 'num/denom'>4/5
+# and 'num/denom'<1
+################################################################################
+proc ::math::bigfloat::__log {num denom precision} {
+    # Please Note : we here need a precision increment, in order to
+    # keep accuracy at $precision digits. If we just hold $precision digits,
+    # each number being precise at the last digit +/- 1,
+    # we would lose accuracy because small uncertainties add to themselves.
+    # Example : 0.0001 + 0.0010 = 0.0011 +/- 0.0002
+    # This is quite the same reason that made tcl_precision defaults to 12 :
+    # internally, doubles are computed with 17 digits, but to keep precision
+    # we need to limit our results to 12.
+    # The solution : given a precision target, increment precision with a
+    # computed value so that all digits of he result are exacts.
+    #
+    # p is the precision
+    # pk is the precision increment
+    # 2 power pk is also the maximum number of iterations
+    # for a number close to 1 but lower than 1,
+    # (denom-num)/denum is (in our case) lower than 1/5
+    # so the maximum nb of iterations is for:
+    # 1/5*(1+1/5*(1/2+1/5*(1/3+1/5*(...))))
+    # the last term is 1/n*(1/5)^n
+    # for the last term to be lower than 2^(-p-pk)
+    # the number of iterations has to be
+    # 2^(-pk).(1/5)^(2^pk) < 2^(-p-pk)
+    # log(1/5).2^pk < -p
+    # 2^pk > p/log(5)
+    # pk > log(2)*log(p/log(5))
+    # now set the variable n to the precision increment i.e. pk
+    set n [expr {int(log(2)*log($precision/log(5)))+1}]
+    incr precision $n
+    # log(num/denom)=log(1-(denom-num)/denom)
+    # log(1+x) = x + x^2/2 + x^3/3 + ... + x^n/n
+    #          = x(1 + x(1/2 + x(1/3 + x(...+ x(1/(n-1) + x/n)...))))
+    set num [::math::bignum::fromstr [expr {$denom-$num}]]
+    set denom [::math::bignum::fromstr $denom]
+    # $s holds the result
+    set s [::math::bignum::div [::math::bignum::lshift $num $precision] $denom]
+    # $t holds x^n
+    set t [::math::bignum::div [::math::bignum::mul $s $num] $denom]
+    variable two
+    set d $two
+    # $u holds x^n/n
+    set u [::math::bignum::div $t $d]
+    while {![::math::bignum::iszero $u]} {
+        set s [::math::bignum::add $s $u]
+        # get x^n * x
+        set t [::math::bignum::div [::math::bignum::mul $t $num] $denom]
+        # get n+1
+        set d [::math::bignum::add 1 $d]
+        # then : $u = x^(n+1)/(n+1)
+        set u [::math::bignum::div $t $d]
+    }
+    # see head of the proc : we return the value with its target precision
+    return [::math::bignum::rshift $s $n]
+}
+
+################################################################################
+# computes log(2) with 'precision' bits and caches it into a namespace variable
+################################################################################
+proc ::math::bigfloat::__logbis {precision} {
+    set increment [expr {int(log($precision)/log(2)+1)}]
+    incr precision $increment
+    # ln(2)=3*ln(1-4/5)+ln(1-125/128)
+    set a [__log 125 128 $precision]
+    set b [__log 4 5 $precision]
+    variable three
+    set r [::math::bignum::add [::math::bignum::mul $b $three] $a]
+    set ::math::bigfloat::Log2 [::math::bignum::rshift $r $increment]
+    # formerly (when BigFloats were stored in ten radix) we had to compute log(10)
+    # ln(10)=10.ln(1-4/5)+3*ln(1-125/128)
+}
+
+
+################################################################################
+# retrieves log(2) with 'precision' bits ; the result is cached
+################################################################################
+proc ::math::bigfloat::_log2 {precision} {
+    variable Log2
+    if {![info exists Log2]} {
+        __logbis $precision
+    } else {
+        # the constant is cached and computed again when more precision is needed
+        set l [::math::bignum::bits $Log2]
+        if {$precision>$l} {
+            __logbis $precision
+        }
+    }
+    # return log(2) with 'precision' bits even when the cached value has more bits
+    return [_round $Log2 $precision]
+}
+
+
+################################################################################
+# returns A modulo B (like with fmod() math function)
+################################################################################
+proc ::math::bigfloat::mod {a b} {
+    checkNumber a b
+    if {[isInt $a] && [isInt $b]} {return [::math::bignum::mod $a $b]}
+    if {[isInt $a]} {error "trying to divide a BigInt by a BigFloat"}
+    set quotient [div $a $b]
+    # examples : fmod(3,2)=1 quotient=1.5
+    # fmod(1,2)=1 quotient=0.5
+    # quotient>0 and b>0 : get floor(quotient)
+    # fmod(-3,-2)=-1 quotient=1.5
+    # fmod(-1,-2)=-1 quotient=0.5
+    # quotient>0 and b<0 : get floor(quotient)
+    # fmod(-3,2)=-1 quotient=-1.5
+    # fmod(-1,2)=-1 quotient=-0.5
+    # quotient<0 and b>0 : get ceil(quotient)
+    # fmod(3,-2)=1 quotient=-1.5
+    # fmod(1,-2)=1 quotient=-0.5
+    # quotient<0 and b<0 : get ceil(quotient)
+    if {[sign $quotient]} {
+        set quotient [ceil $quotient]
+    } else  {
+        set quotient [floor $quotient]
+    }
+    return [sub $a [mul $quotient $b]]
+}
+
+################################################################################
+# returns A times B
+################################################################################
+proc ::math::bigfloat::mul {a b} {
+    checkNumber a b
+    # dispatch the command to appropriate commands regarding types (BigInt & BigFloat)
+    if {[isInt $a]} {
+        if {[isInt $b]} {
+            return [::math::bignum::mul $a $b]
+        }
+        return [mulFloatByInt $b $a]
+    }
+    if {[isInt $b]} {return [mulFloatByInt $a $b]}
+    # now we are sure that 'a' and 'b' are BigFloats
+    foreach {dummy integerA expA deltaA} $a {break}
+    foreach {dummy integerB expB deltaB} $b {break}
+    # 2^expA * 2^expB = 2^(expA+expB)
+    set exp [expr {$expA+$expB}]
+    # mantissas are multiplied
+    set integer [::math::bignum::mul $integerA $integerB]
+    # compute precisely the uncertainty
+    set deltaAB [::math::bignum::mul $deltaA $deltaB]
+    set deltaA [::math::bignum::mul [abs $integerB] $deltaA]
+    set deltaB [::math::bignum::mul [abs $integerA] $deltaB]
+    set delta [::math::bignum::add [::math::bignum::add $deltaA $deltaB] \
+            [::math::bignum::add 1 $deltaAB]]
+    # we have to normalize because 'delta' may be too big
+    return [normalize [list F $integer $exp $delta]]
+}
+
+################################################################################
+# returns A times B, where B is a positive integer
+################################################################################
+proc ::math::bigfloat::mulFloatByInt {a b} {
+    checkFloat a
+    foreach {dummy integer exp delta} $a {break}
+    if {![isInt $b]} {
+        error "second argument expected to be a BigInt"
+    }
+    # Mantissa and Delta are simply multplied by $b
+    set integer [::math::bignum::mul $integer $b]
+    set delta [::math::bignum::mul $delta $b]
+    # We normalize because Delta could have seriously increased
+    return [normalize [list F $integer $exp $delta]]
+}
+
+################################################################################
+# normalizes a number : Delta (accuracy of the BigFloat)
+# has to be limited, because the memory use increase
+# quickly when we do some computations, as the Mantissa and Delta
+# increase together
+# The solution : keep the size of Delta under 9 bits
+################################################################################
+proc ::math::bigfloat::normalize {number} {
+    checkFloat number
+    foreach {dummy integer exp delta} $number {break}
+    set l [::math::bignum::bits $delta]
+    if {$l>8} {
+        # next line : $l holds the supplementary size (in bits)
+        incr l -8
+        # now we can shift right by $l bits
+        # always round upper the Delta
+        set delta [::math::bignum::add 1 [::math::bignum::rshift $delta $l]]
+        set integer [::math::bignum::rshift $integer $l]
+        incr exp $l
+    }
+    return [list F $integer $exp $delta]
+}
+
+
+
+################################################################################
+# returns -A (the opposite)
+################################################################################
+proc ::math::bigfloat::opp {a} {
+    checkNumber a
+    if {[iszero $a]} {
+        return $a
+    }
+    if {[isInt $a]} {
+        ::math::bignum::setsign a [expr {![::math::bignum::sign $a]}]
+        return $a
+    }
+    # recursive call
+    lset a 1 [opp [lindex $a 1]]
+    return $a
+}
+
+################################################################################
+# gets Pi with precision bits
+# after the dot (after you call [tostr] on the result)
+################################################################################
+proc ::math::bigfloat::pi {precision {binary 0}} {
+    if {[llength $precision]>1} {
+        if {[isInt $precision]} {
+            set precision [tostr $precision]
+        } else {
+            error "'$precision' expected to be an integer"
+        }
+    }
+    if {!$binary} {
+        # convert decimal digit length into bit length
+        set precision [expr {int(ceil($precision*log(10)/log(2)))}]
+    }
+    variable one
+    return [list F [_pi $precision] -$precision $one]
+}
+
+
+proc ::math::bigfloat::_pi {precision} {
+    # the constant Pi begins with 3.xxx
+    # so we need 2 digits to store the digit '3'
+    # and then we will have precision+2 bits in the mantissa
+    variable _pi0
+    if {![info exists _pi0]} {
+        set _pi0 [__pi $precision]
+    }
+    set lenPiGlobal [::math::bignum::bits $_pi0]
+    if {$lenPiGlobal<$precision} {
+        set _pi0 [__pi $precision]
+    }
+    return [::math::bignum::rshift $_pi0 [expr {[::math::bignum::bits $_pi0]-2-$precision}]]
+}
+
+################################################################################
+# computes an integer representing Pi in binary radix, with precision bits
+################################################################################
+proc ::math::bigfloat::__pi {precision} {
+    set safetyLimit 8
+    # for safety and for the better precision, we do so ...
+    incr precision $safetyLimit
+    # formula found in the Math litterature
+    # Pi/4 = 6.atan(1/18) + 8.atan(1/57) - 5.atan(1/239)
+    set a [::math::bignum::mul [_atanfract [::math::bignum::fromstr 18] $precision] \
+            [::math::bignum::fromstr 48]]
+    set a [::math::bignum::add $a [::math::bignum::mul \
+            [_atanfract [::math::bignum::fromstr 57] $precision] [::math::bignum::fromstr 32]]]
+    set a [::math::bignum::sub $a [::math::bignum::mul \
+            [_atanfract [::math::bignum::fromstr 239] $precision] [::math::bignum::fromstr 20]]]
+    return [::math::bignum::rshift $a $safetyLimit]
+}
+
+################################################################################
+# shift right an integer until it haves $precision bits
+# round at the same time
+################################################################################
+proc ::math::bigfloat::_round {integer precision} {
+    set shift [expr {[::math::bignum::bits $integer]-$precision}]
+    # $result holds the shifted integer
+    set result [::math::bignum::rshift $integer $shift]
+    # $shift-1 is the bit just rights the last bit of the result
+    # Example : integer=1000010 shift=2
+    # => result=10000 and the tested bit is '1'
+    if {[::math::bignum::testbit $integer [expr {$shift-1}]]} {
+        # we round to the upper limit
+        return [::math::bignum::add 1 $result]
+    }
+    return $result
+}
+
+################################################################################
+# returns A power B, where B is a positive integer
+################################################################################
+proc ::math::bigfloat::pow {a b} {
+    checkNumber a
+    if {![isInt $b]} {
+        error "pow : exponent is not a positive integer"
+    }
+    # case where it is obvious that we should use the appropriate command
+    # from math::bignum (added 5th March 2005)
+    if {[isInt $a]} {
+        return [::math::bignum::pow $a $b]
+    }
+    # algorithm : exponent=$b = Sum(i=0..n) b(i)2^i
+    # $a^$b = $a^( b(0) + 2b(1) + 4b(2) + ... + 2^n*b(n) )
+    # we have $a^(x+y)=$a^x * $a^y
+    # then $a^$b = Product(i=0...n) $a^(2^i*b(i))
+    # b(i) is boolean so $a^(2^i*b(i))= 1 when b(i)=0 and = $a^(2^i) when b(i)=1
+    # then $a^$b = Product(i=0...n and b(i)=1) $a^(2^i) and 1 when $b=0
+    variable one
+    if {[::math::bignum::iszero $b]} {return $one}
+    # $res holds the result
+    set res $one
+    while {1} {
+        # at the beginning i=0
+        # $remainder is b(i)
+        set remainder [::math::bignum::testbit $b 0]
+        # $b 'rshift'ed by 1 bit : i=i+1
+        # so next time we will test bit b(i+1)
+        set b [::math::bignum::rshift $b 1]
+        # if b(i)=1
+        if {$remainder} {
+            # mul the result by $a^(2^i)
+            # if i=0 we multiply by $a^(2^0)=$a^1=$a
+            set res [mul $res $a]
+        }
+        # no more bits at '1' in $b : $res is the result
+        if {[::math::bignum::iszero $b]} {
+            if {[isInt $res]} {
+                # we cannot (and should not) normalize an integer
+                return $res
+            }
+            return [normalize $res]
+        }
+        # i=i+1 : $a^(2^(i+1)) = square of $a^(2^i)
+        set a [mul $a $a]
+    }
+}
+
+################################################################################
+# converts angles for radians to degrees
+################################################################################
+proc ::math::bigfloat::rad2deg {x} {
+    checkFloat x
+    set xLen [expr {-[lindex $x 2]}]
+    if {$xLen<3} {
+        error "number too loose to convert to degrees"
+    }
+    set pi [pi $xLen 1]
+    # $rad/Pi=$deg/180
+    # so result in deg = $radians*180/Pi
+    return [div [mul $x [::math::bignum::fromstr 180]] $pi]
+}
+
+################################################################################
+# retourne la partie entière (ou 0) du nombre "number"
+################################################################################
+proc ::math::bigfloat::round {number} {
+    checkFloat number
+    #set number [normalize $number]
+    # fetching integers (or BigInts) from the internal representation
+    foreach {dummy integer exp delta} $number {break}
+    if {[::math::bignum::iszero $integer]} {
+        # returns the BigInt 0
+        variable zero
+        return $zero
+    }
+    if {$exp>=0} {
+        error "not enough precision to round (in round)"
+    }
+    set exp [expr {-$exp}]
+    # saving the sign, ...
+    set sign [::math::bignum::sign $integer]
+    set integer [abs $integer]
+    # integer part of the number
+    set try [::math::bignum::rshift $integer $exp]
+    # first bit after the dot
+    set way [::math::bignum::testbit $integer [expr {$exp-1}]]
+    # delta is shifted so it gives the integer part of 2*delta
+    set delta [::math::bignum::rshift $delta [expr {$exp-1}]]
+    # when delta is too big to compute rounded value (
+    if {![::math::bignum::iszero $delta]} {
+        error "not enough precision to round (in round)"
+    }
+    if {$way} {
+        set try [::math::bignum::add 1 $try]
+    }
+    # ... restore the sign now
+    ::math::bignum::setsign try $sign
+    return $try
+}
+
+################################################################################
+# round and divide by 10^n
+################################################################################
+proc ::math::bigfloat::roundshift {integer n} {
+    # $exp= 10^$n
+    set exp [tenPow $n]
+    foreach {result remainder} [::math::bignum::divqr $integer $exp] {}
+    # $remainder belongs to the interval [0, $exp-1]
+    # $remainder >= $exp/2 is the rounding condition
+    # that is better expressed in this form :
+    # $remainder*2 >= $exp , as we are treating integers, not rationals
+    # left shift $remainder by 1 equals to multiplying by 2 and is much faster
+    if {[::math::bignum::cmp $exp [::math::bignum::lshift $remainder 1]]<=0} {
+        return [::math::bignum::add 1 $result]
+    }
+    return $result
+}
+
+################################################################################
+# gets the sign of either a bignum, or a BitFloat
+# we keep the bignum convention : 0 for positive, 1 for negative
+################################################################################
+proc ::math::bigfloat::sign {n} {
+    if {[isInt $n]} {
+        return [::math::bignum::sign $n]
+    }
+    # sign of 0=0
+    if {[iszero $n]} {return 0}
+    # the sign of the Mantissa, which is a BigInt
+    return [::math::bignum::sign [lindex $n 1]]
+}
+
+
+################################################################################
+# gets sin(x)
+################################################################################
+proc ::math::bigfloat::sin {x} {
+    checkFloat x
+    foreach {dummy integer exp delta} $x {break}
+    if {$exp>-2} {
+        error "sin : not enough precision"
+    }
+    set precision [expr {-$exp}]
+    # sin(2kPi+x)=sin(x)
+    # $integer is now the modulo of the division of the mantissa by Pi/4
+    # and $n is the quotient
+    foreach {n integer} [divPiQuarter $integer $precision] {break}
+    set delta [::math::bignum::add $delta $n]
+    variable four
+    set d [::math::bignum::mod $n $four]
+    # now integer>=0
+    # x = $n*Pi/4 + $integer and $n belongs to [0,3]
+    # sin(2Pi-x)=-sin(x)
+    # sin(Pi-x)=sin(x)
+    # sin(Pi/2+x)=cos(x)
+    set sign 0
+    switch  -- [tostr $d] {
+        0 {set l [_sin2 $integer $precision $delta]}
+        1 {set l [_cos2 $integer $precision $delta]}
+        2 {set sign 1;set l [_sin2 $integer $precision $delta]}
+        3 {set sign 1;set l [_cos2 $integer $precision $delta]}
+        default {error "internal error"}
+    }
+    # $l is a list : {Mantissa Precision Delta}
+    # precision --> the opposite of the exponent
+    # 1.000 = 1000*10^-3 so exponent=-3 and precision=3 digits
+    lset l 1 [expr {-([lindex $l 1])}]
+    set integer [lindex $l 0]
+    # the sign depends on the switch statement below
+    ::math::bignum::setsign integer $sign
+    lset l 0 $integer
+    # we insert the Bigfloat tag (F) and normalize the final result
+    return [normalize [linsert $l 0 F]]
+}
+
+proc ::math::bigfloat::_sin2 {x precision delta} {
+    set pi [_pi $precision]
+    # shift right by 1 = divide by 2
+    # shift right by 2 = divide by 4
+    set pis2 [::math::bignum::rshift $pi 1]
+    set pis4 [::math::bignum::rshift $pi 2]
+    if {[::math::bignum::cmp $x $pis4]>=0} {
+        # sin(Pi/2-x)=cos(x)
+        set delta [::math::bignum::add 1 $delta]
+        set x [::math::bignum::sub $pis2 $x]
+        return [_cos $x $precision $delta]
+    }
+    return [_sin $x $precision $delta]
+}
+
+################################################################################
+# sin(x) with 'x' lower than Pi/4 and positive
+# 'x' is the Mantissa - 'delta' is Delta
+# 'precision' is the opposite of the exponent
+################################################################################
+proc ::math::bigfloat::_sin {x precision delta} {
+    # $s holds the result
+    set s $x
+    # sin(x) = x - x^3/3! + x^5/5! - ... + (-1)^n*x^(2n+1)/(2n+1)!
+    #        = x * (1 - x^2/(2*3) * (1 - x^2/(4*5) * (...* (1 - x^2/(2n*(2n+1)) )...)))
+    # The second expression allows us to compute the less we can
+
+    # $double holds the uncertainty (Delta) of x^2 : 2*(Mantissa*Delta) + Delta^2
+    # (Mantissa+Delta)^2=Mantissa^2 + 2*Mantissa*Delta + Delta^2
+    set double [::math::bignum::rshift [::math::bignum::mul $x $delta] [expr {$precision-1}]]
+    set double [::math::bignum::add [::math::bignum::add 1 $double] [::math::bignum::rshift \
+            [::math::bignum::mul $delta $delta] $precision]]
+    # $x holds the Mantissa of x^2
+    set x [intMulShift $x $x $precision]
+    set dt [::math::bignum::rshift [::math::bignum::add [::math::bignum::mul $x $delta] \
+            [::math::bignum::mul [::math::bignum::add $s $delta] $double]] $precision]
+    set dt [::math::bignum::add 1 $dt]
+    # $t holds $s * -(x^2) / (2n*(2n+1))
+    # mul by x^2
+    set t [intMulShift $s $x $precision]
+    variable two
+    set denom2 $two
+    variable three
+    set denom3 $three
+    # mul by -1 (opp) and divide by 2*3
+    set t [opp [::math::bignum::div $t [::math::bignum::mul $denom2 $denom3]]]
+    while {![::math::bignum::iszero $t]} {
+        set s [::math::bignum::add $s $t]
+        set delta [::math::bignum::add $delta $dt]
+        # incr n => 2n --> 2n+2 and 2n+1 --> 2n+3
+        set denom2 [::math::bignum::add $denom2 $two]
+        set denom3 [::math::bignum::add $denom3 $two]
+        # $dt is the Delta corresponding to $t
+        # $double ""     ""    ""     ""    $x (x^2)
+        # ($t+$dt) * ($x+$double) = $t*$x + ($dt*$x + $t*$double) + $dt*$double
+        #                   Mantissa^        ^--------Delta-------------------^
+        set dt [::math::bignum::rshift [::math::bignum::add [::math::bignum::mul $x $dt] \
+                [::math::bignum::mul [::math::bignum::add $t $dt] $double]] $precision]
+        set t [intMulShift $t $x $precision]
+        # removed 2005/08/31 by sarnold75
+        #set dt [::math::bignum::add $dt $double]
+        set denom [::math::bignum::mul $denom2 $denom3]
+        # now computing : div by -2n(2n+1)
+        set dt [::math::bignum::add 1 [::math::bignum::div $dt $denom]]
+        set t [opp [::math::bignum::div $t $denom]]
+    }
+    return [list $s $precision $delta]
+}
+
+
+################################################################################
+# procedure for extracting the square root of a BigFloat
+################################################################################
+proc ::math::bigfloat::sqrt {x} {
+    variable one
+    checkFloat x
+    foreach {dummy integer exp delta} $x {break}
+    # if x=0, return 0
+    if {[iszero $x]} {
+        variable zero
+        # return zero, taking care of its precision ($exp)
+        return [list F $zero $exp $one]
+    }
+    # we cannot get sqrt(x) if x<0
+    if {[lindex $integer 0]<0} {
+        error "negative sqrt input"
+    }
+    # (1+epsilon)^p = 1 + epsilon*(p-1) + epsilon^2*(p-1)*(p-2)/2! + ...
+    #                   + epsilon^n*(p-1)*...*(p-n)/n!
+    # sqrt(1 + epsilon) = (1 + epsilon)^(1/2)
+    #                   = 1 - epsilon/2 - epsilon^2*3/(4*2!) - ...
+    #                       - epsilon^n*(3*5*..*(2n-1))/(2^n*n!)
+    # sqrt(1 - epsilon) = 1 + Sum(i=1..infinity) epsilon^i*(3*5*...*(2i-1))/(i!*2^i)
+    # sqrt(n +/- delta)=sqrt(n) * sqrt(1 +/- delta/n)
+    # so the uncertainty on sqrt(n +/- delta) equals sqrt(n) * (sqrt(1 - delta/n) - 1)
+    #         sqrt(1+eps) < sqrt(1-eps) because their logarithm compare as :
+    #       -ln(2)(1+eps) < -ln(2)(1-eps)
+    # finally :
+    # Delta = sqrt(n) * Sum(i=1..infinity) (delta/n)^i*(3*5*...*(2i-1))/(i!*2^i)
+    # here we compute the second term of the product by _sqrtOnePlusEpsilon
+    set delta [_sqrtOnePlusEpsilon $delta $integer]
+    set intLen [::math::bignum::bits $integer]
+    # removed 2005/08/31 by sarnold75, readded 2005/08/31
+    set precision $intLen
+    # intLen + exp = number of bits before the dot
+    #set precision [expr {-$exp}]
+    # square root extraction
+    set integer [::math::bignum::lshift $integer $intLen]
+    incr exp -$intLen
+    incr intLen $intLen
+    # there is an exponent 2^$exp : when $exp is odd, we would need to compute sqrt(2)
+    # so we decrement $exp, in order to get it even, and we do not need sqrt(2) anymore !
+    if {$exp&1} {
+        incr exp -1
+        set integer [::math::bignum::lshift $integer 1]
+        incr intLen
+        incr precision
+    }
+    # using a low-level (in math::bignum) root extraction procedure
+    set integer [::math::bignum::sqrt $integer]
+    # delta has to be multiplied by the square root
+    set delta [::math::bignum::rshift [::math::bignum::mul $delta $integer] $precision]
+    # round to the ceiling the uncertainty (worst precision, the fastest to compute)
+    set delta [::math::bignum::add 1 $delta]
+    # we are sure that $exp is even, see above
+    return [normalize [list F $integer [expr {$exp/2}] $delta]]
+}
+
+
+
+################################################################################
+# compute abs(sqrt(1-delta/integer)-1)
+# the returned value is a relative uncertainty
+################################################################################
+proc ::math::bigfloat::_sqrtOnePlusEpsilon {delta integer} {
+    # sqrt(1-x) - 1 = x/2 + x^2*3/(2^2*2!) + x^3*3*5/(2^3*3!) + ...
+    #               = x/2 * (1 + x*3/(2*2) * ( 1 + x*5/(2*3) *
+    #                     (...* (1 + x*(2n-1)/(2n) ) )...)))
+    variable one
+    set l [::math::bignum::bits $integer]
+    # to compute delta/integer we have to shift left to keep the same precision level
+    # we have a better accuracy computing (delta << lg(integer))/integer
+    # than computing (delta/integer) << lg(integer)
+    set x [::math::bignum::div [::math::bignum::lshift $delta $l] $integer]
+    variable four
+    variable two
+    # denom holds 2n
+    set denom $four
+    # x/2
+    set result [::math::bignum::div $x $two]
+    # x^2*3/(2!*2^2)
+    variable three
+    # numerator holds 2n-1
+    set numerator $three
+    set temp [::math::bignum::mul $result $delta]
+    set temp [::math::bignum::div [::math::bignum::mul $temp $numerator] $integer]
+    set temp [::math::bignum::add 1 [::math::bignum::div $temp $denom]]
+    while {![::math::bignum::iszero $temp]} {
+        set result [::math::bignum::add $result $temp]
+        set numerator [::math::bignum::add $numerator $two]
+        set denom [::math::bignum::add $two $denom]
+        # n = n+1 ==> num=num+2 denom=denom+2
+        # num=2n+1 denom=2n+2
+        set temp [::math::bignum::mul [::math::bignum::mul $temp $delta] $numerator]
+        set temp [::math::bignum::div [::math::bignum::div $temp $denom] $integer]
+    }
+    return $result
+}
+
+################################################################################
+# substracts B to A
+################################################################################
+proc ::math::bigfloat::sub {a b} {
+    checkNumber a b
+    if {[isInt $a] && [isInt $b]} {
+        # the math::bignum::sub proc is designed to work with BigInts
+        return [::math::bignum::sub $a $b]
+    }
+    return [add $a [opp $b]]
+}
+
+################################################################################
+# tangent (trivial algorithm)
+################################################################################
+proc ::math::bigfloat::tan {x} {
+    return [::math::bigfloat::div [::math::bigfloat::sin $x] [::math::bigfloat::cos $x]]
+}
+
+################################################################################
+# returns a power of ten
+################################################################################
+proc ::math::bigfloat::tenPow {n} {
+    variable ten
+    return [::math::bignum::pow $ten [::math::bignum::fromstr $n]]
+}
+
+
+################################################################################
+# converts a BigInt to a double (basic floating-point type)
+# with respect to the global variable 'tcl_precision'
+################################################################################
+proc ::math::bigfloat::todouble {x} {
+    global tcl_precision
+    checkFloat x
+    # get the string repr of x without the '+' sign
+    set result [string trimleft [tostr $x] +]
+    set minus ""
+    if {[string index $result 0]=="-"} {
+        set minus -
+        set result [string range $result 1 end]
+    }
+    set l [split $result e]
+    set exp 0
+    if {[llength $l]==2} {
+        # exp : x=Mantissa*10^Exp
+        set exp [lindex $l 1]
+    }
+    # Mantissa = integerPart.fractionalPart
+    set l [split [lindex $l 0] .]
+    set integerPart [lindex $l 0]
+    set integerLen [string length $integerPart]
+    set fractionalPart [lindex $l 1]
+    # The number of digits in Mantissa, excluding the dot and the leading zeros, of course
+    set len [string length [set integer $integerPart$fractionalPart]]
+    # Now Mantissa is stored in $integer
+    if {$len>$tcl_precision} {
+        set lenDiff [expr {$len-$tcl_precision}]
+        # true when the number begins with a zero
+        set zeroHead 0
+        if {[string index $integer 0]==0} {
+            incr lenDiff -1
+            set zeroHead 1
+        }
+        set integer [tostr [roundshift [::math::bignum::fromstr $integer] $lenDiff]]
+        if {$zeroHead} {
+            set integer 0$integer
+        }
+        set len [string length $integer]
+        if {$len<$integerLen} {
+            set exp [expr {$integerLen-$len}]
+            # restore the true length
+            set integerLen $len
+        }
+    }
+    # number = 'sign'*'integer'*10^'exp'
+    if {$exp==0} {
+        # no scientific notation
+        set exp ""
+    } else {
+        # scientific notation
+        set exp e$exp
+    }
+    # place the dot just before the index $integerLen in the Mantissa
+    set result [string range $integer 0 [expr {$integerLen-1}]]
+    append result .[string range $integer $integerLen end]
+    # join the Mantissa with the sign before and the exponent after
+    return $minus$result$exp
+}
+
+################################################################################
+# converts a number stored as a list to a string in which all digits are true
+################################################################################
+proc ::math::bigfloat::tostr {args} {
+    variable five
+	if {[llength $args]==2} {
+		if {![string equal [lindex $args 0] -nosci]} {error "unknown option: should be -nosci"}
+		set nosci yes
+		set number [lindex $args 1]
+	} else {
+		if {[llength $args]!=1} {error "syntax error: should be tostr ?-nosci? number"}
+		set nosci no
+		set number [lindex $args 0]
+	}
+    if {[isInt $number]} {
+        return [::math::bignum::tostr $number]
+    }
+    checkFloat number
+    foreach {dummy integer exp delta} $number {break}
+    if {[iszero $number]} {
+        # we do not matter how much precision $number has :
+        # it can be 0.0000000 or 0.0, the result is still the same : the "0" string
+	# not anymore : 0.000 is not 0.0 !
+    #    return 0
+    }
+    if {$exp>0} {
+        # the power of ten the closest but greater than 2^$exp
+        # if it was lower than the power of 2, we would have more precision
+        # than existing in the number
+        set newExp [expr {int(ceil($exp*log(2)/log(10)))}]
+        # 'integer' <- 'integer' * 2^exp / 10^newExp
+        # equals 'integer' * 2^(exp-newExp) / 5^newExp
+        set binExp [expr {$exp-$newExp}]
+        if {$binExp<0} {
+            # it cannot happen
+            error "internal error"
+        }
+        # 5^newExp
+        set fivePower [::math::bignum::pow $five [::math::bignum::fromstr $newExp]]
+        # 'lshift'ing $integer by $binExp bits is like multiplying it by 2^$binExp
+        # but much, much faster
+        set integer [::math::bignum::div [::math::bignum::lshift $integer $binExp] \
+                $fivePower]
+        # $integer is the Mantissa - Delta should follow the same operations
+        set delta [::math::bignum::div [::math::bignum::lshift $delta $binExp] $fivePower]
+        set exp $newExp
+    } elseif {$exp<0} {
+        # the power of ten the closest but lower than 2^$exp
+        # same remark about the precision
+        set newExp [expr {int(floor(-$exp*log(2)/log(10)))}]
+        # 'integer' <- 'integer' * 10^newExp / 2^(-exp)
+        # equals 'integer' * 5^(newExp) / 2^(-exp-newExp)
+        set fivePower [::math::bignum::pow $five \
+                [::math::bignum::fromstr $newExp]]
+        set binShift [expr {-$exp-$newExp}]
+        # rshifting is like dividing by 2^$binShift, but faster as we said above about lshift
+        set integer [::math::bignum::rshift [::math::bignum::mul $integer $fivePower] \
+                $binShift]
+        set delta [::math::bignum::rshift [::math::bignum::mul $delta $fivePower] \
+                $binShift]
+        set exp -$newExp
+    }
+    # saving the sign, to restore it into the result
+    set sign [::math::bignum::sign $integer]
+    set result [::math::bignum::abs $integer]
+    # rounded 'integer' +/- 'delta'
+    set up [::math::bignum::add $result $delta]
+    set down [::math::bignum::sub $result $delta]
+    if {[sign $up]^[sign $down]} {
+        # $up>0 and $down<0 and vice-versa : then the number is considered equal to zero
+		# delta <= 2**n (n = bits(delta))
+		# 2**n  <= 10**exp , then
+		# exp >= n.log(2)/log(10)
+		# delta <= 10**(n.log(2)/log(10))
+        incr exp [expr {int(ceil([::math::bignum::bits $delta]*log(2)/log(10)))}]
+        set result 0
+        set isZero yes
+    } else {
+		# iterate until the convergence of the rounding
+		# we incr $shift until $up and $down are rounded to the same number
+		# at each pass we lose one digit of precision, so necessarly it will success
+		for {set shift 1} {
+			[::math::bignum::cmp [roundshift $up $shift] [roundshift $down $shift]]
+		} {
+			incr shift
+		} {}
+		incr exp $shift
+		set result [::math::bignum::tostr [roundshift $up $shift]]
+		set isZero no
+    }
+    set l [string length $result]
+    # now formatting the number the most nicely for having a clear reading
+    # would'nt we allow a number being constantly displayed
+    # as : 0.2947497845e+012 , would we ?
+	if {$nosci} {
+		if {$exp >= 0} {
+			append result [string repeat 0 $exp].
+		} elseif {$l + $exp > 0} {
+			set result [string range $result 0 end-[expr {-$exp}]].[string range $result end-[expr {-1-$exp}] end]
+		} else {
+			set result 0.[string repeat 0 [expr {-$exp-$l}]]$result
+		}
+	} else {
+		if {$exp>0} {
+			# we display 423*10^6 as : 4.23e+8
+			# Length of mantissa : $l
+			# Increment exp by $l-1 because the first digit is placed before the dot,
+			# the other ($l-1) digits following the dot.
+			incr exp [incr l -1]
+			set result [string index $result 0].[string range $result 1 end]
+			append result "e+$exp"
+		} elseif {$exp==0} {
+			# it must have a dot to be a floating-point number (syntaxically speaking)
+			append result .
+		} else {
+			set exp [expr {-$exp}]
+			if {$exp < $l} {
+				# we can display the number nicely as xxxx.yyyy*
+				# the problem of the sign is solved finally at the bottom of the proc
+				set n [string range $result 0 end-$exp]
+				incr exp -1
+				append n .[string range $result end-$exp end]
+				set result $n
+			} elseif {$l==$exp} {
+				# we avoid to use the scientific notation
+				# because it is harder to read
+				set result "0.$result"
+			} else  {
+				# ... but here there is no choice, we should not represent a number
+				# with more than one leading zero
+				set result [string index $result 0].[string range $result 1 end]e-[expr {$exp-$l+1}]
+			}
+		}
+	}
+    # restore the sign : we only put a minus on numbers that are different from zero
+    if {$sign==1 && !$isZero} {set result "-$result"}
+    return $result
+}
+
+################################################################################
+# PART IV
+# HYPERBOLIC FUNCTIONS
+################################################################################
+
+################################################################################
+# hyperbolic cosinus
+################################################################################
+proc ::math::bigfloat::cosh {x} {
+    # cosh(x) = (exp(x)+exp(-x))/2
+    # dividing by 2 is done faster by 'rshift'ing
+    return [floatRShift [add [exp $x] [exp [opp $x]]] 1]
+}
+
+################################################################################
+# hyperbolic sinus
+################################################################################
+proc ::math::bigfloat::sinh {x} {
+    # sinh(x) = (exp(x)-exp(-x))/2
+    # dividing by 2 is done faster by 'rshift'ing
+    return [floatRShift [sub [exp $x] [exp [opp $x]]] 1]
+}
+
+################################################################################
+# hyperbolic tangent
+################################################################################
+proc ::math::bigfloat::tanh {x} {
+    set up [exp $x]
+    set down [exp [opp $x]]
+    # tanh(x)=sinh(x)/cosh(x)= (exp(x)-exp(-x))/2/ [(exp(x)+exp(-x))/2]
+    #        =(exp(x)-exp(-x))/(exp(x)+exp(-x))
+    #        =($up-$down)/($up+$down)
+    return [div [sub $up $down] [add $up $down]]
+}
+
+# exporting public interface
+namespace eval ::math::bigfloat {
+    foreach function {
+        add mul sub div mod pow
+        iszero compare equal
+        fromstr tostr fromdouble todouble
+        int2float isInt isFloat
+        exp log sqrt round ceil floor
+        sin cos tan cotan asin acos atan
+        cosh sinh tanh abs opp
+        pi deg2rad rad2deg
+    } {
+        namespace export $function
+    }
+}
+
+# (AM) No "namespace import" - this should be left to the user!
+#namespace import ::math::bigfloat::*
+
+package provide math::bigfloat 1.2.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/bigfloat2.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/bigfloat2.tcl
new file mode 100644
index 00000000..685672ec
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/bigfloat2.tcl
@@ -0,0 +1,2224 @@
+########################################################################
+# BigFloat for Tcl
+# Copyright (C) 2003-2005  ARNOLD Stephane
+# It is published with the terms of tcllib's BSD-style license.
+# See the file named license.terms.
+########################################################################
+
+package require Tcl 8.5
+
+# this line helps when I want to source this file again and again
+catch {namespace delete ::math::bigfloat}
+
+# private namespace
+# this software works only with Tcl v8.4 and higher
+# it is using the package math::bignum
+namespace eval ::math::bigfloat {
+    # cached constants
+    # ln(2) with arbitrary precision
+    variable Log2
+    # Pi with arb. precision
+    variable Pi
+    variable _pi0
+}
+
+################################################################################
+# procedures that handle floating-point numbers
+# these procedures are sorted by name (after eventually removing the underscores)
+#
+# BigFloats are internally represented as a list :
+# {"F" Mantissa Exponent Delta} where "F" is a character which
+# determines the datatype, Mantissa and Delta are two big integers and
+# Exponent another integer.
+#
+# The BigFloat value equals to (Mantissa +/- Delta)*2^Exponent
+# So the internal representation is binary, but trying to get as close
+# as possible to the decimal one when converted to a string.  When
+# calling [fromstr], the Delta parameter is set to the value of 1 at
+# the position of the last decimal digit.
+#
+# Example : 1.50 belongs to [1.49,1.51], but internally Delta may not equal to 1.
+# Because of the binary representation, it is between 1 and 1+(2^-15).
+#
+# So Mantissa and Delta are not limited in size, but in practice Delta
+# is kept under 2^32 by the 'normalize' procedure, to avoid a
+# never-ended growth of memory used.  Indeed, when you perform some
+# computations, the Delta parameter (which represent the uncertainty
+# on the value of the Mantissa) may increase.  Exponent, as an
+# integer, is limited to 32 bits, and this limit seems fair.  The
+# exponent is indeed involved in logarithmic computations, so it may
+# be a mistake to give it a too large value.
+
+# Retrieving the parameters of a BigFloat is often done with that command :
+# foreach {dummy int exp delta} $bigfloat {break}
+# (dummy is not used, it is just used to get the "F" marker).
+# The isInt, isFloat, checkNumber and checkFloat procedures are used
+# to check data types
+#
+# Taylor development are often used to compute the analysis functions (like exp(),log()...)
+# To learn how it is done in practice, take a look at ::math::bigfloat::_asin
+# While doing computation on Mantissas, we do not care about the last digit,
+# because if we compute correctly Deltas, the digits that remain will be exact.
+################################################################################
+
+
+################################################################################
+# returns the absolute value
+################################################################################
+proc ::math::bigfloat::abs {number} {
+    checkNumber $number
+    if {[isInt $number]} {
+        # set sign to positive for a BigInt
+        return [expr {abs($number)}]
+    }
+    # set sign to positive for a BigFloat into the Mantissa (index 1)
+    lset number 1 [expr {abs([lindex $number 1])}]
+    return $number
+}
+
+
+################################################################################
+# arccosinus of a BigFloat
+################################################################################
+proc ::math::bigfloat::acos {x} {
+    # handy proc for checking datatype
+    checkFloat $x
+    foreach {dummy entier exp delta} $x {break}
+    set precision [expr {($exp<0)?(-$exp):1}]
+    # acos(0.0)=Pi/2
+    # 26/07/2005 : changed precision from decimal to binary
+    # with the second parameter of pi command
+    set piOverTwo [floatRShift [pi $precision 1]]
+    if {[iszero $x]} {
+        # $x is too close to zero -> acos(0)=PI/2
+        return $piOverTwo
+    }
+    # acos(-x)= Pi/2 + asin(x)
+    if {$entier<0} {
+        return [add $piOverTwo [asin [abs $x]]]
+    }
+    # we always use _asin to compute the result
+    # but as it is a Taylor development, the value given to [_asin]
+    # has to be a bit smaller than 1 ; by using that trick : acos(x)=asin(sqrt(1-x^2))
+    # we can limit the entry of the Taylor development below 1/sqrt(2)
+    if {[compare $x [fromstr 0.7071]]>0} {
+        # x > sqrt(2)/2 : trying to make _asin converge quickly
+        # creating 0 and 1 with the same precision as the entry
+        set fzero [list F 0 -$precision 1]
+        # 1.000 with $precision zeros
+        set fone [list F [expr {1<<$precision}] -$precision 1]
+        # when $x is close to 1 (acos(1.0)=0.0)
+        if {[equal $fone $x]} {
+            return $fzero
+        }
+        if {[compare $fone $x]<0} {
+            # the behavior assumed because acos(x) is not defined
+            # when |x|>1
+            error "acos on a number greater than 1"
+        }
+        # acos(x) = asin(sqrt(1 - x^2))
+        # since 1 - cos(x)^2 = sin(x)^2
+        # x> sqrt(2)/2 so x^2 > 1/2 so 1-x^2<1/2
+        set x [sqrt [sub $fone [mul $x $x]]]
+        # the parameter named x is smaller than sqrt(2)/2
+        return [_asin $x]
+    }
+    # acos(x) = Pi/2 - asin(x)
+    # x<sqrt(2)/2 here too
+    return [sub $piOverTwo [_asin $x]]
+}
+
+
+################################################################################
+# returns A + B
+################################################################################
+proc ::math::bigfloat::add {a b} {
+    checkNumber $a
+    checkNumber $b
+    if {[isInt $a]} {
+        if {[isInt $b]} {
+            # intAdd adds two BigInts
+            return [incr a $b]
+        }
+        # adds the BigInt a to the BigFloat b
+        return [addInt2Float $b $a]
+    }
+    if {[isInt $b]} {
+        # ... and vice-versa
+        return [addInt2Float $a $b]
+    }
+    # retrieving parameters from A and B
+    foreach {dummy integerA expA deltaA} $a {break}
+    foreach {dummy integerB expB deltaB} $b {break}
+    if {$expA<$expB} {
+        foreach {dummy integerA expA deltaA} $b {break}
+        foreach {dummy integerB expB deltaB} $a {break}
+    }
+    # when we add two numbers which have different digit numbers (after the dot)
+    # for example : 1.0 and 0.00001
+    # We promote the one with the less number of digits (1.0) to the same level as
+    # the other : so 1.00000.
+    # that is why we shift left the number which has the greater exponent
+    # But we do not forget the Delta parameter, which is lshift'ed too.
+    if {$expA>$expB} {
+        set diff [expr {$expA-$expB}]
+        set integerA [expr {$integerA<<$diff}]
+        set deltaA [expr {$deltaA<<$diff}]
+        incr integerA $integerB
+        incr deltaA $deltaB
+        return [normalize [list F $integerA $expB $deltaA]]
+    } elseif {$expA==$expB} {
+        # nothing to shift left
+        return [normalize [list F [incr integerA $integerB] $expA [incr deltaA $deltaB]]]
+    } else  {
+        error "internal error"
+    }
+}
+
+################################################################################
+# returns the sum A(BigFloat) + B(BigInt)
+# the greatest advantage of this method is that the uncertainty
+# of the result remains unchanged, in respect to the entry's uncertainty (deltaA)
+################################################################################
+proc ::math::bigfloat::addInt2Float {a b} {
+    # type checking
+    checkFloat $a
+    if {![isInt $b]} {
+        error "second argument is not an integer"
+    }
+    # retrieving data from $a
+    foreach {dummy integerA expA deltaA} $a {break}
+    # to add an int to a BigFloat,...
+    if {$expA>0} {
+        # we have to put the integer integerA
+        # to the level of zero exponent : 1e8 --> 100000000e0
+        set shift $expA
+        set integerA [expr {($integerA<<$shift)+$b}]
+        set deltaA [expr {$deltaA<<$shift}]
+        # we have to normalize, because we have shifted the mantissa
+        # and the uncertainty left
+        return [normalize [list F $integerA 0 $deltaA]]
+    } elseif {$expA==0} {
+        # integerA is already at integer level : float=(integerA)e0
+        return [normalize [list F [incr integerA $b] \
+                0 $deltaA]]
+    } else {
+        # here we have something like 234e-2 + 3
+        # we have to shift the integer left by the exponent |$expA|
+        incr integerA [expr {$b<<(-$expA)}]
+        return [normalize [list F $integerA $expA $deltaA]]
+    }
+}
+
+
+################################################################################
+# arcsinus of a BigFloat
+################################################################################
+proc ::math::bigfloat::asin {x} {
+    # type checking
+    checkFloat $x
+    foreach {dummy entier exp delta} $x {break}
+    if {$exp>-1} {
+        error "not enough precision on input (asin)"
+    }
+    set precision [expr {-$exp}]
+    # when x=0, return 0 at the same precision as the input was
+    if {[iszero $x]} {
+        return [list F 0 -$precision 1]
+    }
+    # asin(-x)=-asin(x)
+    if {$entier<0} {
+        return [opp [asin [abs $x]]]
+    }
+    # 26/07/2005 : changed precision from decimal to binary
+    set piOverTwo [floatRShift [pi $precision 1]]
+    # now a little trick : asin(x)=Pi/2-asin(sqrt(1-x^2))
+    # so we can limit the entry of the Taylor development
+    # to 1/sqrt(2)~0.7071
+    # the comparison is : if x>0.7071 then ...
+    if {[compare $x [fromstr 0.7071]]>0} {
+        set fone [list F [expr {1<<$precision}] -$precision 1]
+        # asin(1)=Pi/2 (with the same precision as the entry has)
+        if {[equal $fone $x]} {
+            return $piOverTwo
+        }
+        if {[compare $x $fone]>0} {
+            error "asin on a number greater than 1"
+        }
+        # asin(x)=Pi/2-asin(sqrt(1-x^2))
+        set x [sqrt [sub $fone [mul $x $x]]]
+        return [sub $piOverTwo [_asin $x]]
+    }
+    return [normalize [_asin $x]]
+}
+
+################################################################################
+# _asin : arcsinus of numbers between 0 and +1
+################################################################################
+proc ::math::bigfloat::_asin {x} {
+    # Taylor development
+    # asin(x)=x + 1/2 x^3/3 + 3/2.4 x^5/5 + 3.5/2.4.6 x^7/7 + ...
+    # into this iterative form :
+    # asin(x)=x * (1 + 1/2 * x^2 * (1/3 + 3/4 *x^2 * (...
+    # ...* (1/(2n-1) + (2n-1)/2n * x^2 / (2n+1))...)))
+    # we show how is really computed the development :
+    # we don't need to set a var with x^n or a product of integers
+    # all we need is : x^2, 2n-1, 2n, 2n+1 and a few variables
+    foreach {dummy mantissa exp delta} $x {break}
+    set precision [expr {-$exp}]
+    if {$precision+1<[bits $mantissa]} {
+        error "sinus greater than 1"
+    }
+    # precision is the number of after-dot digits
+    set result $mantissa
+    set delta_final $delta
+    # resultat is the final result, and delta_final
+    # will contain the uncertainty of the result
+    # square is the square of the mantissa
+    set square [expr {$mantissa*$mantissa>>$precision}]
+    # dt is the uncertainty of Mantissa
+    set dt [expr {$mantissa*$delta>>($precision-1)}]
+    incr dt
+    set num 1
+    # two will be used into the loop
+    set i 3
+    set denom 2
+    # the nth factor equals : $num/$denom* $mantissa/$i
+    set delta [expr {$delta*$square + $dt*($delta+$mantissa)}]
+    set delta [expr {($delta*$num)/ $denom >>$precision}]
+    incr delta
+    # we do not multiply the Mantissa by $num right now because it is 1 !
+    # but we have Mantissa=$x
+    # and we want Mantissa*$x^2 * $num / $denom / $i
+    set mantissa [expr {($mantissa*$square>>$precision)/$denom}]
+    # do not forget the modified Taylor development :
+    # asin(x)=x * (1 + 1/2*x^2*(1/3 + 3/4*x^2*(...*(1/(2n-1) + (2n-1)/2n*x^2/(2n+1))...)))
+    # all we need is : x^2, 2n-1, 2n, 2n+1 and a few variables
+    # $num=2n-1 $denom=2n $square=x^2 and $i=2n+1
+    set mantissa_temp [expr {$mantissa/$i}]
+    set delta_temp [expr {1+$delta/$i}]
+    # when the Mantissa increment is smaller than the Delta increment,
+    # we would not get much precision by continuing the development
+    while {$mantissa_temp!=0} {
+        # Mantissa = Mantissa * $num/$denom * $square
+        # Add Mantissa/$i, which is stored in $mantissa_temp, to the result
+        incr result $mantissa_temp
+        incr delta_final $delta_temp
+        # here we have $two instead of [fromstr 2] (optimization)
+        # num=num+2,i=i+2,denom=denom+2
+        # because num=2n-1 denom=2n and i=2n+1
+        incr num 2
+        incr i 2
+        incr denom 2
+        # computes precisly the future Delta parameter
+        set delta [expr {$delta*$square+$dt*($delta+$mantissa)}]
+        set delta [expr {($delta*$num)/$denom>>$precision}]
+        incr delta
+        set mantissa [expr {$mantissa*$square>>$precision}]
+        set mantissa [expr {($mantissa*$num)/$denom}]
+        set mantissa_temp [expr {$mantissa/$i}]
+        set delta_temp [expr {1+$delta/$i}]
+    }
+    return [normalize [list F $result $exp $delta_final]]
+}
+
+################################################################################
+# arctangent : returns atan(x)
+################################################################################
+proc ::math::bigfloat::atan {x} {
+    checkFloat $x
+    foreach {dummy mantissa exp delta} $x {break}
+    if {$exp>=0} {
+        error "not enough precision to compute atan"
+    }
+    set precision [expr {-$exp}]
+    # atan(0)=0
+    if {[iszero $x]} {
+        return [list F 0 -$precision $delta]
+    }
+    # atan(-x)=-atan(x)
+    if {$mantissa<0} {
+        return [opp [atan [abs $x]]]
+    }
+    # now x is strictly positive
+    # at this moment, we are trying to limit |x| to a fair acceptable number
+    # to ensure that Taylor development will converge quickly
+    set float1 [list F [expr {1<<$precision}] -$precision 1]
+    if {[compare $float1 $x]<0} {
+        # compare x to 2.4142
+        if {[compare $x [fromstr 2.4142]]<0} {
+            # atan(x)=Pi/4 + atan((x-1)/(x+1))
+            # as 1<x<2.4142 : (x-1)/(x+1)=1-2/(x+1) belongs to
+            # the range :  ]0,1-2/3.414[
+            # that equals  ]0,0.414[
+            set pi_sur_quatre [floatRShift [pi $precision 1] 2]
+            return [add $pi_sur_quatre [atan \
+                    [div [sub $x $float1] [add $x $float1]]]]
+        }
+        # atan(x)=Pi/2-atan(1/x)
+        # 1/x < 1/2.414 so the argument is lower than 0.414
+        set pi_over_two [floatRShift [pi $precision 1]]
+        return [sub $pi_over_two [atan [div $float1 $x]]]
+    }
+    if {[compare $x [fromstr 0.4142]]>0} {
+        # atan(x)=Pi/4 + atan((x-1)/(x+1))
+        # x>0.420 so (x-1)/(x+1)=1 - 2/(x+1) > 1-2/1.414
+        #                                    > -0.414
+        # x<1 so (x-1)/(x+1)<0
+        set pi_sur_quatre [floatRShift [pi $precision 1] 2]
+        return [add $pi_sur_quatre [atan \
+                [div [sub $x $float1] [add $x $float1]]]]
+    }
+    # precision increment : to have less uncertainty
+    # we add a little more precision so that the result would be more accurate
+    # Taylor development : x - x^3/3 + x^5/5 - ... + (-1)^(n+1)*x^(2n-1)/(2n-1)
+    # when we have n steps in Taylor development : the nth term is :
+    # x^(2n-1)/(2n-1)
+    # and the loss of precision is of 2n (n sums and n divisions)
+    # this command is called with x<sqrt(2)-1
+    # if we add an increment to the precision, say n:
+    # (sqrt(2)-1)^(2n-1)/(2n-1) has to be lower than 2^(-precision-n-1)
+    # (2n-1)*log(sqrt(2)-1)-log(2n-1)<-(precision+n+1)*log(2)
+    # 2n(log(sqrt(2)-1)-log(sqrt(2)))<-(precision-1)*log(2)+log(2n-1)+log(sqrt(2)-1)
+    # 2n*log(1-1/sqrt(2))<-(precision-1)*log(2)+log(2n-1)+log(2)/2
+    # 2n/sqrt(2)>(precision-3/2)*log(2)-log(2n-1)
+    # hence log(2n-1)<2n-1
+    # n*sqrt(2)>(precision-1.5)*log(2)+1-2n
+    # n*(sqrt(2)+2)>(precision-1.5)*log(2)+1
+    set n [expr {int((log(2)*($precision-1.5)+1)/(sqrt(2)+2)+1)}]
+    incr precision $n
+    set mantissa [expr {$mantissa<<$n}]
+    set delta [expr {$delta<<$n}]
+    # end of adding precision increment
+    # now computing Taylor development :
+    # atan(x)=x - x^3/3 + x^5/5 - x^7/7 ... + (-1)^n*x^(2n+1)/(2n+1)
+    # atan(x)=x * (1 - x^2 * (1/3 - x^2 * (1/5 - x^2 * (...*(1/(2n-1) - x^2 / (2n+1))...))))
+    # what do we need to compute this ?
+    # x^2 ($square), 2n+1 ($divider), $result, the nth term of the development ($t)
+    # and the nth term multiplied by 2n+1 ($temp)
+    # then we do this (with care keeping as much precision as possible):
+    # while ($t <>0) :
+    #     $result=$result+$t
+    #     $temp=$temp * $square
+    #     $divider = $divider+2
+    #     $t=$temp/$divider
+    # end-while
+    set result $mantissa
+    set delta_end $delta
+    # we store the square of the integer (mantissa)
+    # Delta of Mantissa^2 = Delta * 2 = Delta << 1
+    set delta_square [expr {$delta<<1}]
+    set square [expr {$mantissa*$mantissa>>$precision}]
+    # the (2n+1) divider
+    set divider 3
+    # computing precisely the uncertainty
+    set delta [expr {1+($delta_square*$mantissa+$delta*$square>>$precision)}]
+    # temp contains (-1)^n*x^(2n+1)
+    set temp [expr {-$mantissa*$square>>$precision}]
+    set t [expr {$temp/$divider}]
+    set dt [expr {1+$delta/$divider}]
+    while {$t!=0} {
+        incr result $t
+        incr delta_end $dt
+        incr divider 2
+        set delta [expr {1+($delta_square*abs($temp)+$delta*($delta_square+$square)>>$precision)}]
+        set temp [expr {-$temp*$square>>$precision}]
+        set t [expr {$temp/$divider}]
+        set dt [expr {1+$delta/$divider}]
+    }
+    # we have to normalize because the uncertainty might be greater than 2**16
+    # moreover it is the most often case
+    return [normalize [list F $result [expr {$exp-$n}] $delta_end]]
+}
+
+
+################################################################################
+# compute atan(1/integer) at a given precision
+# this proc is only used to compute Pi
+# it is using the same Taylor development as [atan]
+################################################################################
+proc ::math::bigfloat::_atanfract {integer precision} {
+    # Taylor development : x - x^3/3 + x^5/5 - ... + (-1)^(n+1)*x^(2n-1)/(2n-1)
+    # when we have n steps in Taylor development : the nth term is :
+    # 1/denom^(2n+1)/(2n+1)
+    # and the loss of precision is of 2n (n sums and n divisions)
+    # this command is called with integer>=5
+    #
+    # We do not want to compute the Delta parameter, so we just
+    # can increment precision (with lshift) in order for the result to be precise.
+    # Remember : we compute atan2(1,$integer) with $precision bits
+    # $integer has no Delta parameter as it is a BigInt, of course, so
+    # theorically we could compute *any* number of digits.
+    #
+    # if we add an increment to the precision, say n:
+    # (1/5)^(2n-1)/(2n-1)     has to be lower than (1/2)^(precision+n-1)
+    # Calculus :
+    # log(left term) < log(right term)
+    # log(1/left term) > log(1/right term)
+    # (2n-1)*log(5)+log(2n-1)>(precision+n-1)*log(2)
+    # n(2log(5)-log(2))>(precision-1)*log(2)-log(2n-1)+log(5)
+    # -log(2n-1)>-(2n-1)
+    # n(2log(5)-log(2)+2)>(precision-1)*log(2)+1+log(5)
+    set n [expr {int((($precision-1)*log(2)+1+log(5))/(2*log(5)-log(2)+2)+1)}]
+    incr precision $n
+    # first term of the development : 1/integer
+    set a [expr {(1<<$precision)/$integer}]
+    # 's' will contain the result
+    set s $a
+    # Taylor development : x - x^3/3 + x^5/5 - ... + (-1)^(n+1)*x^(2n-1)/(2n-1)
+    # equals x (1 - x^2 * (1/3 + x^2 * (... * (1/(2n-3) + (-1)^(n+1) * x^2 / (2n-1))...)))
+    # all we need to store is : 2n-1 ($denom), x^(2n+1) and x^2 ($square) and two results :
+    # - the nth term => $u
+    # - the nth term * (2n-1) => $t
+    # + of course, the result $s
+    set square [expr {$integer*$integer}]
+    set denom 3
+    # $t is (-1)^n*x^(2n+1)
+    set t [expr {-$a/$square}]
+    set u [expr {$t/$denom}]
+    # we break the loop when the current term of the development is null
+    while {$u!=0} {
+        incr s $u
+        # denominator= (2n+1)
+        incr denom 2
+        # div $t by x^2
+        set t [expr {-$t/$square}]
+        set u [expr {$t/$denom}]
+    }
+    # go back to the initial precision
+    return [expr {$s>>$n}]
+}
+
+#
+# bits : computes the number of bits of an integer, approx.
+#
+proc ::math::bigfloat::bits {int} {
+    set l [string length [set int [expr {abs($int)}]]]
+    # int<10**l -> log_2(int)=l*log_2(10)
+    set l [expr {int($l*log(10)/log(2))+1}]
+    if {$int>>$l!=0} {
+        error "bad result: $l bits"
+    }
+    while {($int>>($l-1))==0} {
+        incr l -1
+    }
+    return $l
+}
+
+################################################################################
+# returns the integer part of a BigFloat, as a BigInt
+# the result is the same one you would have
+# if you had called [expr {ceil($x)}]
+################################################################################
+proc ::math::bigfloat::ceil {number} {
+    checkFloat $number
+    set number [normalize $number]
+    if {[iszero $number]} {
+        return 0
+    }
+    foreach {dummy integer exp delta} $number {break}
+    if {$exp>=0} {
+        error "not enough precision to perform rounding (ceil)"
+    }
+    # saving the sign ...
+    set sign [expr {$integer<0}]
+    set integer [expr {abs($integer)}]
+    # integer part
+    set try [expr {$integer>>(-$exp)}]
+    if {$sign} {
+        return [opp $try]
+    }
+    # fractional part
+    if {($try<<(-$exp))!=$integer} {
+        return [incr try]
+    }
+    return $try
+}
+
+
+################################################################################
+# checks each variable to be a BigFloat
+# arguments : each argument is the name of a variable to be checked
+################################################################################
+proc ::math::bigfloat::checkFloat {number} {
+    if {![isFloat $number]} {
+        error "BigFloat expected"
+    }
+}
+
+################################################################################
+# checks if each number is either a BigFloat or a BigInt
+# arguments : each argument is the name of a variable to be checked
+################################################################################
+proc ::math::bigfloat::checkNumber {x} {
+    if {![isFloat $x] && ![isInt $x]} {
+        error "input is not an integer, nor a BigFloat"
+    }
+}
+
+
+################################################################################
+# returns 0 if A and B are equal, else returns 1 or -1
+# accordingly to the sign of (A - B)
+################################################################################
+proc ::math::bigfloat::compare {a b} {
+    if {[isInt $a] && [isInt $b]} {
+        set diff [expr {$a-$b}]
+        if {$diff>0} {return 1} elseif {$diff<0} {return -1}
+        return 0
+    }
+    checkFloat $a
+    checkFloat $b
+    if {[equal $a $b]} {return 0}
+    if {[lindex [sub $a $b] 1]<0} {return -1}
+    return 1
+}
+
+
+
+
+################################################################################
+# gets cos(x)
+# throws an error if there is not enough precision on the input
+################################################################################
+proc ::math::bigfloat::cos {x} {
+    checkFloat $x
+    foreach {dummy integer exp delta} $x {break}
+    if {$exp>-2} {
+        error "not enough precision on floating-point number"
+    }
+    set precision [expr {-$exp}]
+    # cos(2kPi+x)=cos(x)
+    foreach {n integer} [divPiQuarter $integer $precision] {break}
+    # now integer>=0 and <Pi/2
+    set d [expr {$n%4}]
+    # add trigonometric circle turns number to delta
+    incr delta [expr {abs($n)}]
+    set signe 0
+    # cos(Pi-x)=-cos(x)
+    # cos(-x)=cos(x)
+    # cos(Pi/2-x)=sin(x)
+    switch -- $d {
+        1 {set signe 1;set l [_sin2 $integer $precision $delta]}
+        2 {set signe 1;set l [_cos2 $integer $precision $delta]}
+        0 {set l [_cos2 $integer $precision $delta]}
+        3 {set l [_sin2 $integer $precision $delta]}
+        default {error "internal error"}
+    }
+    # precision -> exp (multiplied by -1)
+    #idebug break
+    lset l 1 [expr {-([lindex $l 1])}]
+    # set the sign
+    if {$signe} {
+        lset l 0 [expr {-[lindex $l 0]}]
+    }
+    #idebug break
+    return [normalize [linsert $l 0 F]]
+}
+
+################################################################################
+# compute cos(x) where 0<=x<Pi/2
+# returns : a list formed with :
+# 1. the mantissa
+# 2. the precision (opposite of the exponent)
+# 3. the uncertainty (doubt range)
+################################################################################
+proc ::math::bigfloat::_cos2 {x precision delta} {
+    # precision bits after the dot
+    set pi [_pi $precision]
+    set pis2 [expr {$pi>>1}]
+    set pis4 [expr {$pis2>>1}]
+    if {$x>=$pis4} {
+        # cos(Pi/2-x)=sin(x)
+        set x [expr {$pis2-$x}]
+        incr delta
+        return [_sin $x $precision $delta]
+    }
+    #idebug break
+    return [_cos $x $precision $delta]
+}
+
+################################################################################
+# compute cos(x) where 0<=x<Pi/4
+# returns : a list formed with :
+# 1. the mantissa
+# 2. the precision (opposite of the exponent)
+# 3. the uncertainty (doubt range)
+################################################################################
+proc ::math::bigfloat::_cos {x precision delta} {
+    set float1 [expr {1<<$precision}]
+    # Taylor development follows :
+    # cos(x)=1-x^2/2 + x^4/4! ... + (-1)^(2n)*x^(2n)/2n!
+    # cos(x)= 1 - x^2/1.2 * (1 - x^2/3.4 * (... * (1 - x^2/(2n.(2n-1))...))
+    # variables : $s (the Mantissa of the result)
+    # $denom1 & $denom2 (2n-1 & 2n)
+    # $x as the square of what is named x in 'cos(x)'
+    set s $float1
+    # 'd' is the uncertainty on x^2
+    set d [expr {$x*($delta<<1)}]
+    set d [expr {1+($d>>$precision)}]
+    # x=x^2 (because in this Taylor development, there are only even powers of x)
+    set x [expr {$x*$x>>$precision}]
+    set denom1 1
+    set denom2 2
+    set t [expr {-($x>>1)}]
+    set dt $d
+    while {$t!=0} {
+        incr s $t
+        incr delta $dt
+        incr denom1 2
+        incr denom2 2
+        set dt [expr {$x*$dt+($t+$dt)*$d>>$precision}]
+        incr dt
+        set t [expr {$x*$t>>$precision}]
+        set t [expr {-$t/($denom1*$denom2)}]
+    }
+    return [list $s $precision $delta]
+}
+
+################################################################################
+# cotangent : the trivial algorithm is used
+################################################################################
+proc ::math::bigfloat::cotan {x} {
+    return [::math::bigfloat::div [::math::bigfloat::cos $x] [::math::bigfloat::sin $x]]
+}
+
+################################################################################
+# converts angles from degrees to radians
+# deg/180=rad/Pi
+################################################################################
+proc ::math::bigfloat::deg2rad {x} {
+    checkFloat $x
+    set xLen [expr {-[lindex $x 2]}]
+    if {$xLen<3} {
+        error "number too loose to convert to radians"
+    }
+    set pi [pi $xLen 1]
+    return [div [mul $x $pi] 180]
+}
+
+
+
+################################################################################
+# private proc to get : x modulo Pi/2
+# and the quotient (x divided by Pi/2)
+# used by cos , sin & others
+################################################################################
+proc ::math::bigfloat::divPiQuarter {integer precision} {
+    incr precision 2
+    set integer [expr {$integer<<1}]
+    #idebug break
+    set P [_pi $precision]
+    # modulo 2Pi
+    set integer [expr {$integer%$P}]
+    # end modulo 2Pi
+    # 2Pi>>1 = Pi of course!
+    set P [expr {$P>>1}]
+    set n [expr {$integer/$P}]
+    set integer [expr {$integer%$P}]
+    # now divide by Pi/2
+    # multiply n by 2
+    set n [expr {$n<<1}]
+    # pi/2=Pi>>1
+    set P [expr {$P>>1}]
+    return [list [incr n [expr {$integer/$P}]] [expr {($integer%$P)>>1}]]
+}
+
+
+################################################################################
+# divide A by B and returns the result
+# throw error : divide by zero
+################################################################################
+proc ::math::bigfloat::div {a b} {
+    checkNumber $a
+    checkNumber $b
+    # dispatch to an appropriate procedure
+    if {[isInt $a]} {
+        if {[isInt $b]} {
+            return [expr {$a/$b}]
+        }
+        error "trying to divide an integer by a BigFloat"
+    }
+    if {[isInt $b]} {return [divFloatByInt $a $b]}
+    foreach {dummy integerA expA deltaA} $a {break}
+    foreach {dummy integerB expB deltaB} $b {break}
+    # computes the limits of the doubt (or uncertainty) interval
+    set BMin [expr {$integerB-$deltaB}]
+    set BMax [expr {$integerB+$deltaB}]
+    if {$BMin>$BMax} {
+        # swap BMin and BMax
+        set temp $BMin
+        set BMin $BMax
+        set BMax $temp
+    }
+    # multiply by zero gives zero
+    if {$integerA==0} {
+        # why not return any number or the integer 0 ?
+        # because there is an exponent that might be different between two BigFloats
+        # 0.00 --> exp = -2, 0.000000 -> exp = -6
+        return $a
+    }
+    # test of the division by zero
+    if {$BMin*$BMax<0 || $BMin==0 || $BMax==0} {
+        error "divide by zero"
+    }
+    # shift A because we need accuracy
+    set l [bits $integerB]
+    set integerA [expr {$integerA<<$l}]
+    set deltaA [expr {$deltaA<<$l}]
+    set exp [expr {$expA-$l-$expB}]
+    # relative uncertainties (dX/X) are added
+    # to give the relative uncertainty of the result
+    # i.e. 3% on A + 2% on B --> 5% on the quotient
+    # d(A/B)/(A/B)=dA/A + dB/B
+    # Q=A/B
+    # dQ=dA/B + dB*A/B*B
+    # dQ is "delta"
+    set delta [expr {($deltaB*abs($integerA))/abs($integerB)}]
+    set delta [expr {([incr delta]+$deltaA)/abs($integerB)}]
+    set quotient [expr {$integerA/$integerB}]
+    if {$integerB*$integerA<0} {
+        incr quotient -1
+    }
+    return [normalize [list F $quotient $exp [incr delta]]]
+}
+
+
+
+
+################################################################################
+# divide a BigFloat A by a BigInt B
+# throw error : divide by zero
+################################################################################
+proc ::math::bigfloat::divFloatByInt {a b} {
+    # type check
+    checkFloat $a
+    if {![isInt $b]} {
+        error "second argument is not an integer"
+    }
+    foreach {dummy integer exp delta} $a {break}
+    # zero divider test
+    if {$b==0} {
+        error "divide by zero"
+    }
+    # shift left for accuracy ; see other comments in [div] procedure
+    set l [bits $b]
+    set integer [expr {$integer<<$l}]
+    set delta [expr {$delta<<$l}]
+    incr exp -$l
+    set integer [expr {$integer/$b}]
+    # the uncertainty is always evaluated to the ceil value
+    # and as an absolute value
+    set delta [expr {$delta/abs($b)+1}]
+    return [normalize [list F $integer $exp $delta]]
+}
+
+
+
+
+
+################################################################################
+# returns 1 if A and B are equal, 0 otherwise
+# IN : a, b (BigFloats)
+################################################################################
+proc ::math::bigfloat::equal {a b} {
+    if {[isInt $a] && [isInt $b]} {
+        return [expr {$a==$b}]
+    }
+    # now a & b should only be BigFloats
+    checkFloat $a
+    checkFloat $b
+    foreach {dummy aint aexp adelta} $a {break}
+    foreach {dummy bint bexp bdelta} $b {break}
+    # set all Mantissas and Deltas to the same level (exponent)
+    # with lshift
+    set diff [expr {$aexp-$bexp}]
+    if {$diff<0} {
+        set diff [expr {-$diff}]
+        set bint [expr {$bint<<$diff}]
+        set bdelta [expr {$bdelta<<$diff}]
+    } elseif {$diff>0} {
+        set aint [expr {$aint<<$diff}]
+        set adelta [expr {$adelta<<$diff}]
+    }
+    # compute limits of the number's doubt range
+    set asupInt [expr {$aint+$adelta}]
+    set ainfInt [expr {$aint-$adelta}]
+    set bsupInt [expr {$bint+$bdelta}]
+    set binfInt [expr {$bint-$bdelta}]
+    # A & B are equal
+    # if their doubt ranges overlap themselves
+    if {$bint==$aint} {
+        return 1
+    }
+    if {$bint>$aint} {
+        set r [expr {$asupInt>=$binfInt}]
+    } else {
+        set r [expr {$bsupInt>=$ainfInt}]
+    }
+    return $r
+}
+
+################################################################################
+# returns exp(X) where X is a BigFloat
+################################################################################
+proc ::math::bigfloat::exp {x} {
+    checkFloat $x
+    foreach {dummy integer exp delta} $x {break}
+    if {$exp>=0} {
+        # shift till exp<0 with respect to the internal representation
+        # of the number
+        incr exp
+        set integer [expr {$integer<<$exp}]
+        set delta [expr {$delta<<$exp}]
+        set exp -1
+    }
+    # add 8 bits of precision for safety
+    set precision [expr {8-$exp}]
+    set integer [expr {$integer<<8}]
+    set delta [expr {$delta<<8}]
+    set Log2 [_log2 $precision]
+    set new_exp [expr {$integer/$Log2}]
+    set integer [expr {$integer%$Log2}]
+    # $new_exp = integer part of x/log(2)
+    # $integer = remainder
+    # exp(K.log(2)+r)=2^K.exp(r)
+    # so we just have to compute exp(r), r is small so
+    # the Taylor development will converge quickly
+    incr delta $new_exp
+    foreach {integer delta} [_exp $integer $precision $delta] {break}
+    set delta [expr {$delta>>8}]
+    incr precision -8
+    # multiply by 2^K , and take care of the sign
+    # example : X=-6.log(2)+0.01
+    # exp(X)=exp(0.01)*2^-6
+    # if {abs($new_exp)>>30!=0} {
+        # error "floating-point overflow due to exp"
+    # }
+    set exp [expr {$new_exp-$precision}]
+    incr delta
+    return [normalize [list F [expr {$integer>>8}] $exp $delta]]
+}
+
+
+################################################################################
+# private procedure to compute exponentials
+# using Taylor development of exp(x) :
+# exp(x)=1+ x + x^2/2 + x^3/3! +...+x^n/n!
+# input : integer (the mantissa)
+#         precision (the number of decimals)
+#         delta (the doubt limit, or uncertainty)
+# returns a list : 1. the mantissa of the result
+#                  2. the doubt limit, or uncertainty
+################################################################################
+proc ::math::bigfloat::_exp {integer precision delta} {
+    if {$integer==0} {
+        # exp(0)=1
+        return [list [expr {1<<$precision}] $delta]
+    }
+    set s [expr {(1<<$precision)+$integer}]
+    set d [expr {1+$delta/2}]
+    incr delta $delta
+    # dt = uncertainty on x^2
+    set dt [expr {1+($d*$integer>>$precision)}]
+    # t= x^2/2 = x^2>>1
+    set t [expr {$integer*$integer>>$precision+1}]
+    set denom 2
+    while {$t!=0} {
+        # the sum is called 's'
+        incr s $t
+        incr delta $dt
+        # we do not have to keep trace of the factorial, we just iterate divisions
+        incr denom
+        # add delta
+        set d [expr {1+$d/$denom}]
+        incr dt $d
+        # get x^n from x^(n-1)
+        set t [expr {($integer*$t>>$precision)/$denom}]
+    }
+    return [list $s $delta]
+}
+################################################################################
+# divide a BigFloat by 2 power 'n'
+################################################################################
+proc ::math::bigfloat::floatRShift {float {n 1}} {
+    return [lset float 2 [expr {[lindex $float 2]-$n}]]
+}
+
+
+
+################################################################################
+# procedure floor : identical to [expr floor($x)] in functionality
+# arguments : number IN (a BigFloat)
+# returns : the floor value as a BigInt
+################################################################################
+proc ::math::bigfloat::floor {number} {
+    checkFloat $number
+    if {[iszero $number]} {
+        # returns the BigInt 0
+        return 0
+    }
+    foreach {dummy integer exp delta} $number {break}
+    if {$exp>=0} {
+        error "not enough precision to perform rounding (floor)"
+    }
+    # floor(n.xxxx)=n when n is positive
+    if {$integer>0} {return [expr {$integer>>(-$exp)}]}
+    set integer [expr {abs($integer)}]
+    # integer part
+    set try [expr {$integer>>(-$exp)}]
+    # floor(-n.xxxx)=-(n+1) when xxxx!=0
+    if {$try<<(-$exp)!=$integer} {
+        incr try
+    }
+    return [expr {-$try}]
+}
+
+
+################################################################################
+# returns a list formed by an integer and an exponent
+# x = (A +/- C) * 10 power B
+# return [list "F" A B C] (where F is the BigFloat tag)
+# A and C are BigInts, B is a raw integer
+# return also a BigInt when there is neither a dot, nor a 'e' exponent
+#
+# arguments : -base base integer
+#          or integer
+#          or float
+#          or float trailingZeros
+################################################################################
+proc ::math::bigfloat::fromstr {number {addzeros 0}} {
+    if {$addzeros<0} {
+        error "second argument has to be a positive integer"
+    }
+    # eliminate the sign problem
+    # added on 05/08/2005
+    # setting '$signe' to the sign of the number
+    set number [string trimleft $number +]
+    if {[string index $number 0]=="-"} {
+        set signe 1
+        set string [string range $number 1 end]
+    } else  {
+        set signe 0
+        set string $number
+    }
+    # integer case (not a floating-point number)
+    if {[string is digit $string]} {
+        if {$addzeros!=0} {
+            error "second argument not allowed with an integer"
+        }
+        # we have completed converting an integer to a BigInt
+        # please note that most math::bigfloat procs accept BigInts as arguments
+        return $number
+    }
+    # floating-point number : check for an exponent
+    # scientific notation
+    set tab [split $string e]
+    if {[llength $tab]>2} {
+        # there are more than one 'e' letter in the number
+        error "syntax error in number : $string"
+    }
+    if {[llength $tab]==2} {
+        set exp [lindex $tab 1]
+        # now exp can look like +099 so you need to handle octal numbers
+        # too bad...
+        # find the sign (if any?)
+        regexp {^[\+\-]?} $exp expsign
+        # trim the number with left-side 0's
+        set found [string length $expsign]
+        set exp $expsign[string trimleft [string range $exp $found end] 0]
+	if {$exp eq $expsign} { set exp ${expsign}0 }
+        set mantissa [lindex $tab 0]
+    } else {
+        set exp 0
+        set mantissa [lindex $tab 0]
+    }
+    # a floating-point number may have a dot
+    set tab [split [string trimleft $mantissa 0] .]
+    if {[llength $tab]>2} {error "syntax error in number : $string"}
+    if {[llength $tab]==2} {
+        set mantissa [join $tab ""]
+        # increment by the number of decimals (after the dot)
+        incr exp -[string length [lindex $tab 1]]
+    }
+    # this is necessary to ensure we can call fromstr (recursively) with
+    # the mantissa ($number)
+    if {![string is digit $mantissa]} {
+        error "$number is not a number"
+    }
+    # take account of trailing zeros
+    incr exp -$addzeros
+    # multiply $number by 10^$trailingZeros
+    append mantissa [string repeat 0 $addzeros]
+    # add the sign
+    # here we avoid octal numbers by trimming the leading zeros!
+    # 2005-10-28 S.ARNOLD
+    # note however, for a -0 we may be left with an empty mantissa
+    # Ticket [ca6a2cfef5d6e742177add4954c748170b86a02d]
+    if {$signe} {
+	set mantissa -[string trimleft $mantissa 0]
+	if {$mantissa eq "-"} { set mantissa -0 }
+    }
+    # the F tags a BigFloat
+    # a BigInt is like any other integer since Tcl 8.5,
+    # because expr now supports arbitrary length integers
+    return [_fromstr $mantissa $exp]
+}
+
+################################################################################
+# private procedure to transform decimal floats into binary ones
+# IN :
+#     - number : a BigInt representing the Mantissa
+#     - exp : the decimal exponent (a simple integer)
+# OUT :
+#     $number * 10^$exp, as the internal binary representation of a BigFloat
+################################################################################
+proc ::math::bigfloat::_fromstr {number exp} {
+    set number [string trimleft $number 0]
+    if {$number==""} {
+        return [list F 0 [expr {int($exp*log(10)/log(2))-15}] [expr {1<<15}]]
+    }
+    if {$exp==0} {
+        return [list F $number 0 1]
+    }
+    if {$exp>0} {
+        # mul by 10^exp, then normalize
+        set power [expr {10**$exp}]
+        set number [expr {$number*$power}]
+        return [normalize [list F $number 0 $power]]
+    }
+    # now exp is negative or null
+    # the closest power of 2 to the 'exp'th power of ten, but greater than it
+    # 10**$exp<2**$binaryExp
+    # $binaryExp>$exp*log(10)/log(2)
+    set binaryExp [expr {int(-$exp*log(10)/log(2))+1+16}]
+    # then compute n * 2^binaryExp / 10^(-exp)
+    # (exp is negative)
+    # equals n * 2^(binaryExp+exp) / 5^(-exp)
+    set diff [expr {$binaryExp+$exp}]
+    if {$diff<0} {
+        error "internal error"
+    }
+    set power [expr {5**(-$exp)}]
+    set number [expr {($number<<$diff)/$power}]
+    set delta [expr {(1<<$diff)/$power}]
+    return [normalize [list F $number [expr {-$binaryExp}] [incr delta]]]
+}
+
+
+################################################################################
+# fromdouble :
+# like fromstr, but for a double scalar value
+# arguments :
+# double - the number to convert to a BigFloat
+# exp (optional) - the total number of digits
+################################################################################
+proc ::math::bigfloat::fromdouble {double {exp {}}} {
+    set mantissa [lindex [split $double e] 0]
+    # line added by SArnold on 05/08/2005
+    set mantissa [string trimleft [string map {+ "" - ""} $mantissa] 0]
+    set precision [string length [string map {. ""} $mantissa]]
+    if { $exp != {} && [incr exp]>$precision } {
+        return [fromstr $double [expr {$exp-$precision}]]
+    } else {
+        # tests have failed : not enough precision or no exp argument
+        return [fromstr $double]
+    }
+}
+
+
+################################################################################
+# converts a BigInt into a BigFloat with a given decimal precision
+################################################################################
+proc ::math::bigfloat::int2float {int {decimals 1}} {
+    # it seems like we need some kind of type handling
+    # very odd in this Tcl world :-(
+    if {![isInt $int]} {
+        error "first argument is not an integer"
+    }
+    if {$decimals<1} {
+        error "non-positive decimals number"
+    }
+    # the lowest number of decimals is 1, because
+    # [tostr [fromstr 10.0]] returns 10.
+    # (we lose 1 digit when converting back to string)
+    set int [expr {$int*10**$decimals}]
+    return [_fromstr $int [expr {-$decimals}]]
+}
+
+
+
+################################################################################
+# multiplies 'leftop' by 'rightop' and rshift the result by 'shift'
+################################################################################
+proc ::math::bigfloat::intMulShift {leftop rightop shift} {
+    return [::math::bignum::rshift [::math::bignum::mul $leftop $rightop] $shift]
+}
+
+################################################################################
+# returns 1 if x is a BigFloat, 0 elsewhere
+################################################################################
+proc ::math::bigfloat::isFloat {x} {
+    # a BigFloat is a list of : "F" mantissa exponent delta
+    if {[llength $x]!=4} {
+        return 0
+    }
+    # the marker is the letter "F"
+    if {[string equal [lindex $x 0] F]} {
+        return 1
+    }
+    return 0
+}
+
+################################################################################
+# checks that n is a BigInt (a number create by math::bignum::fromstr)
+################################################################################
+proc ::math::bigfloat::isInt {n} {
+    set rc [catch {
+        expr {$n%2}
+    }]
+    return [expr {$rc == 0}]
+}
+
+
+
+################################################################################
+# returns 1 if x is null, 0 otherwise
+################################################################################
+proc ::math::bigfloat::iszero {x} {
+    if {[isInt $x]} {
+        return [expr {$x==0}]
+    }
+    checkFloat $x
+    # now we do some interval rounding : if a number's interval englobs 0,
+    # it is considered to be equal to zero
+    foreach {dummy integer exp delta} $x {break}
+    if {$delta>=abs($integer)} {return 1}
+    return 0
+}
+
+
+################################################################################
+# compute log(X)
+################################################################################
+proc ::math::bigfloat::log {x} {
+    checkFloat $x
+    foreach {dummy integer exp delta} $x {break}
+    if {$integer<=0} {
+        error "zero logarithm error"
+    }
+    if {[iszero $x]} {
+        error "number equals zero"
+    }
+    set precision [bits $integer]
+    # uncertainty of the logarithm
+    set delta [_logOnePlusEpsilon $delta $integer $precision]
+    incr delta
+    # we got : x = 1xxxxxx (binary number with 'precision' bits) * 2^exp
+    # we need : x = 0.1xxxxxx(binary) *2^(exp+precision)
+    incr exp $precision
+    foreach {integer deltaIncr} [_log $integer] {break}
+    incr delta $deltaIncr
+    # log(a * 2^exp)= log(a) + exp*log(2)
+    # result = log(x) + exp*log(2)
+    # as x<1 log(x)<0 but 'integer' (result of '_log') is the absolute value
+    # that is why we substract $integer to log(2)*$exp
+    set integer [expr {[_log2 $precision]*$exp-$integer}]
+    incr delta [expr {abs($exp)}]
+    return [normalize [list F $integer -$precision $delta]]
+}
+
+
+################################################################################
+# compute log(1-epsNum/epsDenom)=log(1-'epsilon')
+# Taylor development gives -x -x^2/2 -x^3/3 -x^4/4 ...
+# used by 'log' command because log(x+/-epsilon)=log(x)+log(1+/-(epsilon/x))
+# so the uncertainty equals abs(log(1-epsilon/x))
+# ================================================
+# arguments :
+# epsNum IN (the numerator of epsilon)
+# epsDenom IN (the denominator of epsilon)
+# precision IN (the number of bits after the dot)
+#
+# 'epsilon' = epsNum*2^-precision/epsDenom
+################################################################################
+proc ::math::bigfloat::_logOnePlusEpsilon {epsNum epsDenom precision} {
+    if {$epsNum>=$epsDenom} {
+        error "number is null"
+    }
+    set s [expr {($epsNum<<$precision)/$epsDenom}]
+    set divider 2
+    set t [expr {$s*$epsNum/$epsDenom}]
+    set u [expr {$t/$divider}]
+    # when u (the current term of the development) is zero, we have reached our goal
+    # it has converged
+    while {$u!=0} {
+        incr s $u
+        # divider = order of the term = 'n'
+        incr divider
+        # t = (epsilon)^n
+        set t [expr {$t*$epsNum/$epsDenom}]
+        # u = t/n = (epsilon)^n/n and is the nth term of the Taylor development
+        set u [expr {$t/$divider}]
+    }
+    return $s
+}
+
+
+################################################################################
+# compute log(0.xxxxxxxx) : log(1-epsilon)=-eps-eps^2/2-eps^3/3...-eps^n/n
+################################################################################
+proc ::math::bigfloat::_log {integer} {
+    # the uncertainty is nbSteps with nbSteps<=nbBits
+    # take nbSteps=nbBits (the worse case) and log(nbBits+increment)=increment
+    set precision [bits $integer]
+    set n [expr {int(log($precision+2*log($precision)))}]
+    set integer [expr {$integer<<$n}]
+    incr precision $n
+    set delta 3
+    # 1-epsilon=integer
+    set integer [expr {(1<<$precision)-$integer}]
+    set s $integer
+    # t=x^2
+    set t [expr {$integer*$integer>>$precision}]
+    set denom 2
+    # u=x^2/2 (second term)
+    set u [expr {$t/$denom}]
+    while {$u!=0} {
+        # while the current term is not zero, it has not converged
+        incr s $u
+        incr delta
+        # t=x^n
+        set t [expr {$t*$integer>>$precision}]
+        # denom = n (the order of the current development term)
+        # u = x^n/n (the nth term of Taylor development)
+        set u [expr {$t/[incr denom]}]
+    }
+    # shift right to restore the precision
+    set delta
+    return [list [expr {$s>>$n}] [expr {($delta>>$n)+1}]]
+}
+
+################################################################################
+# computes log(num/denom) with 'precision' bits
+# used to compute some analysis constants with a given accuracy
+# you might not call this procedure directly : it assumes 'num/denom'>4/5
+# and 'num/denom'<1
+################################################################################
+proc ::math::bigfloat::__log {num denom precision} {
+    # Please Note : we here need a precision increment, in order to
+    # keep accuracy at $precision digits. If we just hold $precision digits,
+    # each number being precise at the last digit +/- 1,
+    # we would lose accuracy because small uncertainties add to themselves.
+    # Example : 0.0001 + 0.0010 = 0.0011 +/- 0.0002
+    # This is quite the same reason that made tcl_precision defaults to 12 :
+    # internally, doubles are computed with 17 digits, but to keep precision
+    # we need to limit our results to 12.
+    # The solution : given a precision target, increment precision with a
+    # computed value so that all digits of he result are exacts.
+    #
+    # p is the precision
+    # pk is the precision increment
+    # 2 power pk is also the maximum number of iterations
+    # for a number close to 1 but lower than 1,
+    # (denom-num)/denum is (in our case) lower than 1/5
+    # so the maximum nb of iterations is for:
+    # 1/5*(1+1/5*(1/2+1/5*(1/3+1/5*(...))))
+    # the last term is 1/n*(1/5)^n
+    # for the last term to be lower than 2^(-p-pk)
+    # the number of iterations has to be
+    # 2^(-pk).(1/5)^(2^pk) < 2^(-p-pk)
+    # log(1/5).2^pk < -p
+    # 2^pk > p/log(5)
+    # pk > log(2)*log(p/log(5))
+    # now set the variable n to the precision increment i.e. pk
+    set n [expr {int(log(2)*log($precision/log(5)))+1}]
+    incr precision $n
+    # log(num/denom)=log(1-(denom-num)/denom)
+    # log(1+x) = x + x^2/2 + x^3/3 + ... + x^n/n
+    #          = x(1 + x(1/2 + x(1/3 + x(...+ x(1/(n-1) + x/n)...))))
+    set num [expr {$denom-$num}]
+    # $s holds the result
+    set s [expr {($num<<$precision)/$denom}]
+    # $t holds x^n
+    set t [expr {$s*$num/$denom}]
+    set d 2
+    # $u holds x^n/n
+    set u [expr {$t/$d}]
+    while {$u!=0} {
+        incr s $u
+        # get x^n * x
+        set t [expr {$t*$num/$denom}]
+        # get n+1
+        incr d
+        # then : $u = x^(n+1)/(n+1)
+        set u [expr {$t/$d}]
+    }
+    # see head of the proc : we return the value with its target precision
+    return [expr {$s>>$n}]
+}
+
+################################################################################
+# computes log(2) with 'precision' bits and caches it into a namespace variable
+################################################################################
+proc ::math::bigfloat::__logbis {precision} {
+    set increment [expr {int(log($precision)/log(2)+1)}]
+    incr precision $increment
+    # ln(2)=3*ln(1-4/5)+ln(1-125/128)
+    set a [__log 125 128 $precision]
+    set b [__log 4 5 $precision]
+    set r [expr {$b*3+$a}]
+    set ::math::bigfloat::Log2 [expr {$r>>$increment}]
+    # formerly (when BigFloats were stored in ten radix) we had to compute log(10)
+    # ln(10)=10.ln(1-4/5)+3*ln(1-125/128)
+}
+
+
+################################################################################
+# retrieves log(2) with 'precision' bits ; the result is cached
+################################################################################
+proc ::math::bigfloat::_log2 {precision} {
+    variable Log2
+    if {![info exists Log2]} {
+        __logbis $precision
+    } else {
+        # the constant is cached and computed again when more precision is needed
+        set l [bits $Log2]
+        if {$precision>$l} {
+            __logbis $precision
+        }
+    }
+    # return log(2) with 'precision' bits even when the cached value has more bits
+    return [_round $Log2 $precision]
+}
+
+
+################################################################################
+# returns A modulo B (like with fmod() math function)
+################################################################################
+proc ::math::bigfloat::mod {a b} {
+    checkNumber $a
+    checkNumber $b
+    if {[isInt $a] && [isInt $b]} {return [expr {$a%$b}]}
+    if {[isInt $a]} {error "trying to divide an integer by a BigFloat"}
+    set quotient [div $a $b]
+    # examples : fmod(3,2)=1 quotient=1.5
+    # fmod(1,2)=1 quotient=0.5
+    # quotient>0 and b>0 : get floor(quotient)
+    # fmod(-3,-2)=-1 quotient=1.5
+    # fmod(-1,-2)=-1 quotient=0.5
+    # quotient>0 and b<0 : get floor(quotient)
+    # fmod(-3,2)=-1 quotient=-1.5
+    # fmod(-1,2)=-1 quotient=-0.5
+    # quotient<0 and b>0 : get ceil(quotient)
+    # fmod(3,-2)=1 quotient=-1.5
+    # fmod(1,-2)=1 quotient=-0.5
+    # quotient<0 and b<0 : get ceil(quotient)
+    if {[sign $quotient]} {
+        set quotient [ceil $quotient]
+    } else  {
+        set quotient [floor $quotient]
+    }
+    return [sub $a [mul $quotient $b]]
+}
+
+################################################################################
+# returns A times B
+################################################################################
+proc ::math::bigfloat::mul {a b} {
+    checkNumber $a
+    checkNumber $b
+    # dispatch the command to appropriate commands regarding types (BigInt & BigFloat)
+    if {[isInt $a]} {
+        if {[isInt $b]} {
+            return [expr {$a*$b}]
+        }
+        return [mulFloatByInt $b $a]
+    }
+    if {[isInt $b]} {return [mulFloatByInt $a $b]}
+    # now we are sure that 'a' and 'b' are BigFloats
+    foreach {dummy integerA expA deltaA} $a {break}
+    foreach {dummy integerB expB deltaB} $b {break}
+    # 2^expA * 2^expB = 2^(expA+expB)
+    set exp [expr {$expA+$expB}]
+    # mantissas are multiplied
+    set integer [expr {$integerA*$integerB}]
+    # compute precisely the uncertainty
+    set delta [expr {$deltaA*(abs($integerB)+$deltaB)+abs($integerA)*$deltaB+1}]
+    # we have to normalize because 'delta' may be too big
+    return [normalize [list F $integer $exp $delta]]
+}
+
+################################################################################
+# returns A times B, where B is a positive integer
+################################################################################
+proc ::math::bigfloat::mulFloatByInt {a b} {
+    checkFloat $a
+    foreach {dummy integer exp delta} $a {break}
+    if {$b==0} {
+        return [list F 0 $exp $delta]
+    }
+    # Mantissa and Delta are simply multplied by $b
+    set integer [expr {$integer*$b}]
+    set delta [expr {$delta*$b}]
+    # We normalize because Delta could have seriously increased
+    return [normalize [list F $integer $exp $delta]]
+}
+
+################################################################################
+# normalizes a number : Delta (accuracy of the BigFloat)
+# has to be limited, because the memory use increase
+# quickly when we do some computations, as the Mantissa and Delta
+# increase together
+# The solution : limit the size of Delta to 16 bits
+################################################################################
+proc ::math::bigfloat::normalize {number} {
+    checkFloat $number
+    foreach {dummy integer exp delta} $number {break}
+    set l [bits $delta]
+    if {$l>16} {
+        incr l -16
+        # $l holds the supplementary size (in bits)
+        # now we can shift right by $l bits
+        # always round upper the Delta
+        set delta [expr {$delta>>$l}]
+        incr delta
+        set integer [expr {$integer>>$l}]
+        incr exp $l
+    }
+    return [list F $integer $exp $delta]
+}
+
+
+
+################################################################################
+# returns -A (the opposite)
+################################################################################
+proc ::math::bigfloat::opp {a} {
+    checkNumber $a
+    if {[iszero $a]} {
+        return $a
+    }
+    if {[isInt $a]} {
+        return [expr {-$a}]
+    }
+    # recursive call
+    lset a 1 [expr {-[lindex $a 1]}]
+    return $a
+}
+
+################################################################################
+# gets Pi with precision bits
+# after the dot (after you call [tostr] on the result)
+################################################################################
+proc ::math::bigfloat::pi {precision {binary 0}} {
+    if {![isInt $precision]} {
+        error "'$precision' expected to be an integer"
+    }
+    if {!$binary} {
+        # convert decimal digit length into bit length
+        set precision [expr {int(ceil($precision*log(10)/log(2)))}]
+    }
+    return [list F [_pi $precision] -$precision 1]
+}
+
+#
+# Procedure that resets the stored cached Pi constant
+#
+proc ::math::bigfloat::reset {} {
+    variable _pi0
+    if {[info exists _pi0]} {unset _pi0}
+}
+
+proc ::math::bigfloat::_pi {precision} {
+    # the constant Pi begins with 3.xxx
+    # so we need 2 digits to store the digit '3'
+    # and then we will have precision+2 bits in the mantissa
+    variable _pi0
+    if {![info exists _pi0]} {
+        set _pi0 [__pi $precision]
+    }
+    set lenPiGlobal [bits $_pi0]
+    if {$lenPiGlobal<$precision} {
+        set _pi0 [__pi $precision]
+    }
+    return [expr {$_pi0 >> [bits $_pi0]-2-$precision}]
+}
+
+################################################################################
+# computes an integer representing Pi in binary radix, with precision bits
+################################################################################
+proc ::math::bigfloat::__pi {precision} {
+    set safetyLimit 8
+    # for safety and for the better precision, we do so ...
+    incr precision $safetyLimit
+    # formula found in the Math litterature (on Wikipedia
+    # Pi/4 = 44.atan(1/57) + 7.atan(1/239) - 12.atan(1/682) + 24.atan(1/12943)
+    set a [expr {[_atanfract 57 $precision]*44}]
+    incr a [expr {[_atanfract 239 $precision]*7}]
+    set a [expr {$a - [_atanfract 682 $precision]*12}]
+    incr a [expr {[_atanfract 12943 $precision]*24}]
+    return [expr {$a>>$safetyLimit-2}]
+}
+
+################################################################################
+# shift right an integer until it haves $precision bits
+# round at the same time
+################################################################################
+proc ::math::bigfloat::_round {integer precision} {
+    set shift [expr {[bits $integer]-$precision}]
+    if {$shift==0} {
+        return $integer
+    }
+    # $result holds the shifted integer
+    set result [expr {$integer>>$shift}]
+    # $shift-1 is the bit just rights the last bit of the result
+    # Example : integer=1000010 shift=2
+    # => result=10000 and the tested bit is '1'
+    if {$integer & (1<<($shift-1))} {
+        # we round to the upper limit
+        return [incr result]
+    }
+    return $result
+}
+
+################################################################################
+# returns A power B, where B is a positive integer
+################################################################################
+proc ::math::bigfloat::pow {a b} {
+    checkNumber $a
+    if {$b<0} {
+        error "pow : exponent is not a positive integer"
+    }
+    # case where it is obvious that we should use the appropriate command
+    # from math::bignum (added 5th March 2005)
+    if {[isInt $a]} {
+        return [expr {$a**$b}]
+    }
+    # algorithm : exponent=$b = Sum(i=0..n) b(i)2^i
+    # $a^$b = $a^( b(0) + 2b(1) + 4b(2) + ... + 2^n*b(n) )
+    # we have $a^(x+y)=$a^x * $a^y
+    # then $a^$b = Product(i=0...n) $a^(2^i*b(i))
+    # b(i) is boolean so $a^(2^i*b(i))= 1 when b(i)=0 and = $a^(2^i) when b(i)=1
+    # then $a^$b = Product(i=0...n and b(i)=1) $a^(2^i) and 1 when $b=0
+    if {$b==0} {return 1}
+    # $res holds the result
+    set res 1
+    while {1} {
+        # at the beginning i=0
+        # $remainder is b(i)
+        set remainder [expr {$b&1}]
+        # $b 'rshift'ed by 1 bit : i=i+1
+        # so next time we will test bit b(i+1)
+        set b [expr {$b>>1}]
+        # if b(i)=1
+        if {$remainder} {
+            # mul the result by $a^(2^i)
+            # if i=0 we multiply by $a^(2^0)=$a^1=$a
+            set res [mul $res $a]
+        }
+        # no more bits at '1' in $b : $res is the result
+        if {$b==0} {
+            return [normalize $res]
+        }
+        # i=i+1 : $a^(2^(i+1)) = square of $a^(2^i)
+        set a [mul $a $a]
+    }
+}
+
+################################################################################
+# converts angles for radians to degrees
+################################################################################
+proc ::math::bigfloat::rad2deg {x} {
+    checkFloat $x
+    set xLen [expr {-[lindex $x 2]}]
+    if {$xLen<3} {
+        error "number too loose to convert to degrees"
+    }
+    # $rad/Pi=$deg/180
+    # so result in deg = $radians*180/Pi
+    return [div [mul $x 180] [pi $xLen 1]]
+}
+
+################################################################################
+# retourne la partie entière (ou 0) du nombre "number"
+################################################################################
+proc ::math::bigfloat::round {number} {
+    checkFloat $number
+    #set number [normalize $number]
+    # fetching integers (or BigInts) from the internal representation
+    foreach {dummy integer exp delta} $number {break}
+    if {$integer==0} {
+        return 0
+    }
+    if {$exp>=0} {
+        error "not enough precision to round (in round)"
+    }
+    set exp [expr {-$exp}]
+    # saving the sign, ...
+    set sign [expr {$integer<0}]
+    set integer [expr {abs($integer)}]
+    # integer part of the number
+    set try [expr {$integer>>$exp}]
+    # first bit after the dot
+    set way [expr {$integer>>($exp-1)&1}]
+    # delta is shifted so it gives the integer part of 2*delta
+    set delta [expr {$delta>>($exp-1)}]
+    # when delta is too big to compute rounded value (
+    if {$delta!=0} {
+        error "not enough precision to round (in round)"
+    }
+    if {$way} {
+        incr try
+    }
+    # ... restore the sign now
+    if {$sign} {return [expr {-$try}]}
+    return $try
+}
+
+################################################################################
+# round and divide by 10^n
+################################################################################
+proc ::math::bigfloat::roundshift {integer n} {
+    # $exp= 10^$n
+    incr n -1
+    set exp [expr {10**$n}]
+    set toround [expr {$integer/$exp}]
+    if {$toround%10>=5} {
+        return [expr {$toround/10+1}]
+    }
+    return [expr {$toround/10}]
+}
+
+################################################################################
+# gets the sign of either a bignum, or a BitFloat
+# we keep the bignum convention : 0 for positive, 1 for negative
+################################################################################
+proc ::math::bigfloat::sign {n} {
+    if {[isInt $n]} {
+        return [expr {$n<0}]
+    }
+    checkFloat $n
+    # sign of 0=0
+    if {[iszero $n]} {return 0}
+    # the sign of the Mantissa, which is a BigInt
+    return [sign [lindex $n 1]]
+}
+
+
+################################################################################
+# gets sin(x)
+################################################################################
+proc ::math::bigfloat::sin {x} {
+    checkFloat $x
+    foreach {dummy integer exp delta} $x {break}
+    if {$exp>-2} {
+        error "sin : not enough precision"
+    }
+    set precision [expr {-$exp}]
+    # sin(2kPi+x)=sin(x)
+    # $integer is now the modulo of the division of the mantissa by Pi/4
+    # and $n is the quotient
+    foreach {n integer} [divPiQuarter $integer $precision] {break}
+    incr delta $n
+    set d [expr {$n%4}]
+    # now integer>=0
+    # x = $n*Pi/4 + $integer and $n belongs to [0,3]
+    # sin(2Pi-x)=-sin(x)
+    # sin(Pi-x)=sin(x)
+    # sin(Pi/2+x)=cos(x)
+    set sign 0
+    switch  -- $d {
+        0 {set l [_sin2 $integer $precision $delta]}
+        1 {set l [_cos2 $integer $precision $delta]}
+        2 {set sign 1;set l [_sin2 $integer $precision $delta]}
+        3 {set sign 1;set l [_cos2 $integer $precision $delta]}
+        default {error "internal error"}
+    }
+    # $l is a list : {Mantissa Precision Delta}
+    # precision --> the opposite of the exponent
+    # 1.000 = 1000*10^-3 so exponent=-3 and precision=3 digits
+    lset l 1 [expr {-([lindex $l 1])}]
+    # the sign depends on the switch statement below
+    #::math::bignum::setsign integer $sign
+    if {$sign} {
+        lset l 0 [expr {-[lindex $l 0]}]
+    }
+    # we insert the Bigfloat tag (F) and normalize the final result
+    return [normalize [linsert $l 0 F]]
+}
+
+proc ::math::bigfloat::_sin2 {x precision delta} {
+    set pi [_pi $precision]
+    # shift right by 1 = divide by 2
+    # shift right by 2 = divide by 4
+    set pis2 [expr {$pi>>1}]
+    set pis4 [expr {$pis2>>1}]
+    if {$x>=$pis4} {
+        # sin(Pi/2-x)=cos(x)
+        incr delta
+        set x [expr {$pis2-$x}]
+        return [_cos $x $precision $delta]
+    }
+    return [_sin $x $precision $delta]
+}
+
+################################################################################
+# sin(x) with 'x' lower than Pi/4 and positive
+# 'x' is the Mantissa - 'delta' is Delta
+# 'precision' is the opposite of the exponent
+################################################################################
+proc ::math::bigfloat::_sin {x precision delta} {
+    # $s holds the result
+    set s $x
+    # sin(x) = x - x^3/3! + x^5/5! - ... + (-1)^n*x^(2n+1)/(2n+1)!
+    #        = x * (1 - x^2/(2*3) * (1 - x^2/(4*5) * (...* (1 - x^2/(2n*(2n+1)) )...)))
+    # The second expression allows us to compute the less we can
+
+    # $double holds the uncertainty (Delta) of x^2 : 2*(Mantissa*Delta) + Delta^2
+    # (Mantissa+Delta)^2=Mantissa^2 + 2*Mantissa*Delta + Delta^2
+    set double [expr {$x*$delta>>$precision-1}]
+    incr double [expr {1+$delta*$delta>>$precision}]
+    # $x holds the Mantissa of x^2
+    set x [expr {$x*$x>>$precision}]
+    set dt [expr {$x*$delta+$double*($s+$delta)>>$precision}]
+    incr dt
+    # $t holds $s * -(x^2) / (2n*(2n+1))
+    # mul by x^2
+    set t [expr {$s*$x>>$precision}]
+    set denom2 2
+    set denom3 3
+    # mul by -1 (opp) and divide by 2*3
+    set t [expr {-$t/($denom2*$denom3)}]
+    while {$t!=0} {
+        incr s $t
+        incr delta $dt
+        # incr n => 2n --> 2n+2 and 2n+1 --> 2n+3
+        incr denom2 2
+        incr denom3 2
+        # $dt is the Delta corresponding to $t
+        # $double ""     ""    ""     ""    $x (x^2)
+        # ($t+$dt) * ($x+$double) = $t*$x + ($dt*$x + $t*$double) + $dt*$double
+        #                   Mantissa^        ^--------Delta-------------------^
+        set dt [expr {$x*$dt+($t+$dt)*$double>>$precision}]
+        set t [expr {$t*$x>>$precision}]
+        # removed 2005/08/31 by sarnold75
+        #set dt [::math::bignum::add $dt $double]
+        set denom [expr {$denom2*$denom3}]
+        # now computing : div by -2n(2n+1)
+        set dt [expr {1+$dt/$denom}]
+        set t [expr {-$t/$denom}]
+    }
+    return [list $s $precision $delta]
+}
+
+
+################################################################################
+# procedure for extracting the square root of a BigFloat
+################################################################################
+proc ::math::bigfloat::sqrt {x} {
+    checkFloat $x
+    foreach {dummy integer exp delta} $x {break}
+    # if x=0, return 0
+    if {[iszero $x]} {
+        # return zero, taking care of its precision ($exp)
+        return [list F 0 $exp $delta]
+    }
+    # we cannot get sqrt(x) if x<0
+    if {[lindex $integer 0]<0} {
+        error "negative sqrt input"
+    }
+    # (1+epsilon)^p = 1 + epsilon*(p-1) + epsilon^2*(p-1)*(p-2)/2! + ...
+    #                   + epsilon^n*(p-1)*...*(p-n)/n!
+    # sqrt(1 + epsilon) = (1 + epsilon)^(1/2)
+    #                   = 1 - epsilon/2 - epsilon^2*3/(4*2!) - ...
+    #                       - epsilon^n*(3*5*..*(2n-1))/(2^n*n!)
+    # sqrt(1 - epsilon) = 1 + Sum(i=1..infinity) epsilon^i*(3*5*...*(2i-1))/(i!*2^i)
+    # sqrt(n +/- delta)=sqrt(n) * sqrt(1 +/- delta/n)
+    # so the uncertainty on sqrt(n +/- delta) equals sqrt(n) * (sqrt(1 - delta/n) - 1)
+    #         sqrt(1+eps) < sqrt(1-eps) because their logarithm compare as :
+    #       -ln(2)(1+eps) < -ln(2)(1-eps)
+    # finally :
+    # Delta = sqrt(n) * Sum(i=1..infinity) (delta/n)^i*(3*5*...*(2i-1))/(i!*2^i)
+    # here we compute the second term of the product by _sqrtOnePlusEpsilon
+    set delta [_sqrtOnePlusEpsilon $delta $integer]
+    set intLen [bits $integer]
+    # removed 2005/08/31 by sarnold75, readded 2005/08/31
+    set precision $intLen
+    # intLen + exp = number of bits before the dot
+    #set precision [expr {-$exp}]
+    # square root extraction
+    set integer [expr {$integer<<$intLen}]
+    incr exp -$intLen
+    incr intLen $intLen
+    # there is an exponent 2^$exp : when $exp is odd, we would need to compute sqrt(2)
+    # so we decrement $exp, in order to get it even, and we do not need sqrt(2) anymore !
+    if {$exp&1} {
+        incr exp -1
+        set integer [expr {$integer<<1}]
+        incr intLen
+        incr precision
+    }
+    # using a low-level (taken from math::bignum) root extraction procedure
+    # using binary operators
+    set integer [_sqrt $integer]
+    # delta has to be multiplied by the square root
+    set delta [expr {$delta*$integer>>$precision}]
+    # round to the ceiling the uncertainty (worst precision, the fastest to compute)
+    incr delta
+    # we are sure that $exp is even, see above
+    return [normalize [list F $integer [expr {$exp/2}] $delta]]
+}
+
+
+
+################################################################################
+# compute abs(sqrt(1-delta/integer)-1)
+# the returned value is a relative uncertainty
+################################################################################
+proc ::math::bigfloat::_sqrtOnePlusEpsilon {delta integer} {
+    # sqrt(1-x) - 1 = x/2 + x^2*3/(2^2*2!) + x^3*3*5/(2^3*3!) + ...
+    #               = x/2 * (1 + x*3/(2*2) * ( 1 + x*5/(2*3) *
+    #                     (...* (1 + x*(2n-1)/(2n) ) )...)))
+    set l [bits $integer]
+    # to compute delta/integer we have to shift left to keep the same precision level
+    # we have a better accuracy computing (delta << lg(integer))/integer
+    # than computing (delta/integer) << lg(integer)
+    set x [expr {($delta<<$l)/$integer}]
+    # denom holds 2n
+    set denom 4
+    # x/2
+    set result [expr {$x>>1}]
+    # x^2*3/(2!*2^2)
+    # numerator holds 2n-1
+    set numerator 3
+    set temp [expr {($result*$delta*$numerator)/($integer*$denom)}]
+    incr temp
+    while {$temp!=0} {
+        incr result $temp
+        incr numerator 2
+        incr denom 2
+        # n = n+1 ==> num=num+2 denom=denom+2
+        # num=2n+1 denom=2n+2
+        set temp [expr {($temp*$delta*$numerator)/($integer*$denom)}]
+    }
+    return $result
+}
+
+#
+# Computes the square root of an integer
+# Returns an integer
+#
+proc ::math::bigfloat::_sqrt {n} {
+    set i [expr {(([bits $n]-1)/2)+1}]
+    set b [expr {$i*2}] ; # Bit to set to get 2^i*2^i
+
+    set r 0 ; # guess
+    set x 0 ; # guess^2
+    set s 0 ; # guess^2 backup
+    set t 0 ; # intermediate result
+    for {} {$i >= 0} {incr i -1; incr b -2} {
+        set x [expr {$s+($t|(1<<$b))}]
+        if {abs($x)<= abs($n)} {
+            set s $x
+            set r [expr {$r|(1<<$i)}]
+            set t [expr {$t|(1<<$b+1)}]
+        }
+        set t [expr {$t>>1}]
+    }
+    return $r
+}
+
+################################################################################
+# substracts B to A
+################################################################################
+proc ::math::bigfloat::sub {a b} {
+    checkNumber $a
+    checkNumber $b
+    if {[isInt $a] && [isInt $b]} {
+        # the math::bignum::sub proc is designed to work with BigInts
+        return [expr {$a-$b}]
+    }
+    return [add $a [opp $b]]
+}
+
+################################################################################
+# tangent (trivial algorithm)
+################################################################################
+proc ::math::bigfloat::tan {x} {
+    return [::math::bigfloat::div [::math::bigfloat::sin $x] [::math::bigfloat::cos $x]]
+}
+
+################################################################################
+# returns a power of ten
+################################################################################
+proc ::math::bigfloat::tenPow {n} {
+    return [expr {10**$n}]
+}
+
+
+################################################################################
+# converts a BigInt to a double (basic floating-point type)
+# with respect to the global variable 'tcl_precision'
+################################################################################
+proc ::math::bigfloat::todouble {x} {
+    global tcl_precision
+    set precision $tcl_precision
+    if {$precision==0} {
+        # this is a cheat, I must admit, for Tcl 8.5
+        set precision 16
+    }
+    checkFloat $x
+    # get the string repr of x without the '+' sign
+    # please note: here we call math::bigfloat::tostr
+    set result [string trimleft [tostr $x] +]
+    set minus ""
+    if {[string index $result 0]=="-"} {
+        set minus -
+        set result [string range $result 1 end]
+    }
+
+    set l [split $result e]
+    set exp 0
+    if {[llength $l]==2} {
+        # exp : x=Mantissa*2^Exp
+        set exp [lindex $l 1]
+    }
+    # caution with octal numbers : we have to remove heading zeros
+    # but count them as digits
+    regexp {^0*} $result zeros
+    incr exp -[string length $zeros]
+    # Mantissa = integerPart.fractionalPart
+    set l [split [lindex $l 0] .]
+    set integerPart [lindex $l 0]
+    set integerLen [string length $integerPart]
+    set fractionalPart [lindex $l 1]
+    # The number of digits in Mantissa, excluding the dot and the leading zeros, of course
+    set integer [string trimleft $integerPart$fractionalPart 0]
+    if {$integer eq ""} {
+        set integer 0
+    }
+    set len [string length $integer]
+    # Now Mantissa is stored in $integer
+    if {$len>$precision} {
+        set lenDiff [expr {$len-$precision}]
+        # true when the number begins with a zero
+        set zeroHead 0
+        if {[string index $integer 0]==0} {
+            incr lenDiff -1
+            set zeroHead 1
+        }
+        set integer [roundshift $integer $lenDiff]
+        if {$zeroHead} {
+            set integer 0$integer
+        }
+        set len [string length $integer]
+        if {$len<$integerLen} {
+            set exp [expr {$integerLen-$len}]
+            # restore the true length
+            set integerLen $len
+        }
+    }
+    # number = 'sign'*'integer'*10^'exp'
+    if {$exp==0} {
+        # no scientific notation
+        set exp ""
+    } else {
+        # scientific notation
+        set exp e$exp
+    }
+    # place the dot just before the index $integerLen in the Mantissa
+    set result [string range $integer 0 [expr {$integerLen-1}]]
+    append result .[string range $integer $integerLen end]
+    # join the Mantissa with the sign before and the exponent after
+    return $minus$result$exp
+}
+
+################################################################################
+# converts a number stored as a list to a string in which all digits are true
+################################################################################
+proc ::math::bigfloat::tostr {args} {
+	if {[llength $args]==2} {
+		if {![string equal [lindex $args 0] -nosci]} {error "unknown option: should be -nosci"}
+		set nosci yes
+		set number [lindex $args 1]
+	} else {
+		if {[llength $args]!=1} {error "syntax error: should be tostr ?-nosci? number"}
+		set nosci no
+		set number [lindex $args 0]
+	}
+    if {[isInt $number]} {
+        return $number
+    }
+    checkFloat $number
+    foreach {dummy integer exp delta} $number {break}
+    if {[iszero $number]} {
+        # we do matter how much precision $number has :
+        # it can be 0.0000000 or 0.0, the result is not the same zero
+        #return 0
+    }
+    if {$exp>0} {
+        # the power of ten the closest but greater than 2^$exp
+        # if it was lower than the power of 2, we would have more precision
+        # than existing in the number
+        set newExp [expr {int(ceil($exp*log(2)/log(10)))}]
+        # 'integer' <- 'integer' * 2^exp / 10^newExp
+        # equals 'integer' * 2^(exp-newExp) / 5^newExp
+        set binExp [expr {$exp-$newExp}]
+        if {$binExp<0} {
+            # it cannot happen
+            error "internal error"
+        }
+        # 5^newExp
+        set fivePower [expr {5**$newExp}]
+        # 'lshift'ing $integer by $binExp bits is like multiplying it by 2^$binExp
+        # but much, much faster
+        set integer [expr {($integer<<$binExp)/$fivePower}]
+        # $integer is the Mantissa - Delta should follow the same operations
+        set delta [expr {($delta<<$binExp)/$fivePower}]
+        set exp $newExp
+    } elseif {$exp<0} {
+        # the power of ten the closest but lower than 2^$exp
+        # same remark about the precision
+        set newExp [expr {int(floor(-$exp*log(2)/log(10)))}]
+        # 'integer' <- 'integer' * 10^newExp / 2^(-exp)
+        # equals 'integer' * 5^(newExp) / 2^(-exp-newExp)
+        set binShift [expr {-$exp-$newExp}]
+        set fivePower [expr {5**$newExp}]
+        # rshifting is like dividing by 2^$binShift, but faster as we said above about lshift
+        set integer [expr {$integer*$fivePower>>$binShift}]
+        set delta [expr {$delta*$fivePower>>$binShift}]
+        set exp -$newExp
+    }
+    # saving the sign, to restore it into the result
+    set result [expr {abs($integer)}]
+    set sign [expr {$integer<0}]
+    # rounded 'integer' +/- 'delta'
+    set up [expr {$result+$delta}]
+    set down [expr {$result-$delta}]
+    if {($up<0 && $down>0)||($up>0 && $down<0)} {
+        # $up>0 and $down<0 or vice-versa : then the number is considered equal to zero
+        set isZero yes
+	# delta <= 2**n (n = bits(delta))
+	# 2**n  <= 10**exp , then
+	# exp >= n.log(2)/log(10)
+	# delta <= 10**(n.log(2)/log(10))
+        incr exp [expr {int(ceil([bits $delta]*log(2)/log(10)))}]
+        set result 0
+    } else {
+	# iterate until the convergence of the rounding
+	# we incr $shift until $up and $down are rounded to the same number
+	# at each pass we lose one digit of precision, so necessarly it will success
+	for {set shift 1} {
+	    [roundshift $up $shift]!=[roundshift $down $shift]
+	} {
+	    incr shift
+	} {}
+	incr exp $shift
+	set result [roundshift $up $shift]
+	set isZero no
+    }
+    set l [string length $result]
+    # now formatting the number the most nicely for having a clear reading
+    # would'nt we allow a number being constantly displayed
+    # as : 0.2947497845e+012 , would we ?
+    if {$nosci} {
+		if {$exp >= 0} {
+			append result [string repeat 0 $exp].
+		} elseif {$l + $exp > 0} {
+			set result [string range $result 0 end-[expr {-$exp}]].[string range $result end-[expr {-1-$exp}] end]
+		} else {
+			set result 0.[string repeat 0 [expr {-$exp-$l}]]$result
+		}
+	} else {
+		if {$exp>0} {
+			# we display 423*10^6 as : 4.23e+8
+			# Length of mantissa : $l
+			# Increment exp by $l-1 because the first digit is placed before the dot,
+			# the other ($l-1) digits following the dot.
+			incr exp [incr l -1]
+			set result [string index $result 0].[string range $result 1 end]
+			append result "e+$exp"
+		} elseif {$exp==0} {
+			# it must have a dot to be a floating-point number (syntaxically speaking)
+			append result .
+		} else {
+			set exp [expr {-$exp}]
+			if {$exp < $l} {
+				# we can display the number nicely as xxxx.yyyy*
+				# the problem of the sign is solved finally at the bottom of the proc
+				set n [string range $result 0 end-$exp]
+				incr exp -1
+				append n .[string range $result end-$exp end]
+				set result $n
+			} elseif {$l==$exp} {
+				# we avoid to use the scientific notation
+				# because it is harder to read
+				set result "0.$result"
+			} else  {
+				# ... but here there is no choice, we should not represent a number
+				# with more than one leading zero
+				set result [string index $result 0].[string range $result 1 end]e-[expr {$exp-$l+1}]
+			}
+		}
+	}
+    # restore the sign : we only put a minus on numbers that are different from zero
+    if {$sign==1 && !$isZero} {set result "-$result"}
+    return $result
+}
+
+################################################################################
+# PART IV
+# HYPERBOLIC FUNCTIONS
+################################################################################
+
+################################################################################
+# hyperbolic cosinus
+################################################################################
+proc ::math::bigfloat::cosh {x} {
+    # cosh(x) = (exp(x)+exp(-x))/2
+    # dividing by 2 is done faster by 'rshift'ing
+    return [floatRShift [add [exp $x] [exp [opp $x]]] 1]
+}
+
+################################################################################
+# hyperbolic sinus
+################################################################################
+proc ::math::bigfloat::sinh {x} {
+    # sinh(x) = (exp(x)-exp(-x))/2
+    # dividing by 2 is done faster by 'rshift'ing
+    return [floatRShift [sub [exp $x] [exp [opp $x]]] 1]
+}
+
+################################################################################
+# hyperbolic tangent
+################################################################################
+proc ::math::bigfloat::tanh {x} {
+    set up [exp $x]
+    set down [exp [opp $x]]
+    # tanh(x)=sinh(x)/cosh(x)= (exp(x)-exp(-x))/2/ [(exp(x)+exp(-x))/2]
+    #        =(exp(x)-exp(-x))/(exp(x)+exp(-x))
+    #        =($up-$down)/($up+$down)
+    return [div [sub $up $down] [add $up $down]]
+}
+
+# exporting public interface
+namespace eval ::math::bigfloat {
+    foreach function {
+        add mul sub div mod pow
+        iszero compare equal
+        fromstr tostr fromdouble todouble
+        int2float isInt isFloat
+        exp log sqrt round ceil floor
+        sin cos tan cotan asin acos atan
+        cosh sinh tanh abs opp
+        pi deg2rad rad2deg
+    } {
+        namespace export $function
+    }
+}
+
+# (AM) No "namespace import" - this should be left to the user!
+#namespace import ::math::bigfloat::*
+
+package provide math::bigfloat 2.0.4
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/bignum.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/bignum.tcl
new file mode 100644
index 00000000..38e1fbbd
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/bignum.tcl
@@ -0,0 +1,900 @@
+# bignum library in pure Tcl [VERSION 7Sep2004]
+# Copyright (C) 2004 Salvatore Sanfilippo <antirez at invece dot org>
+# Copyright (C) 2004 Arjen Markus <arjen dot markus at wldelft dot nl>
+#
+# LICENSE
+#
+# This software is:
+# Copyright (C) 2004 Salvatore Sanfilippo <antirez at invece dot org>
+# Copyright (C) 2004 Arjen Markus <arjen dot markus at wldelft dot nl>
+# The following terms apply to all files associated with the software
+# unless explicitly disclaimed in individual files.
+#
+# The authors hereby grant permission to use, copy, modify, distribute,
+# and license this software and its documentation for any purpose, provided
+# that existing copyright notices are retained in all copies and that this
+# notice is included verbatim in any distributions. No written agreement,
+# license, or royalty fee is required for any of the authorized uses.
+# Modifications to this software may be copyrighted by their authors
+# and need not follow the licensing terms described here, provided that
+# the new terms are clearly indicated on the first page of each file where
+# they apply.
+#
+# IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+# FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+# ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+# DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+# IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+# NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+# MODIFICATIONS.
+#
+# GOVERNMENT USE: If you are acquiring this software on behalf of the
+# U.S. government, the Government shall have only "Restricted Rights"
+# in the software and related documentation as defined in the Federal
+# Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+# are acquiring the software on behalf of the Department of Defense, the
+# software shall be classified as "Commercial Computer Software" and the
+# Government shall have only "Restricted Rights" as defined in Clause
+# 252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+# authors grant the U.S. Government and others acting in its behalf
+# permission to use and distribute the software in accordance with the
+# terms specified in this license.
+
+# TODO
+# - pow and powm should check if the exponent is zero in order to return one
+
+package require Tcl 8.4
+
+namespace eval ::math::bignum {}
+
+#################################### Misc ######################################
+
+# Don't change atombits define if you don't know what you are doing.
+# Note that it must be a power of two, and that 16 is too big
+# because expr may overflow in the product of two 16 bit numbers.
+set ::math::bignum::atombits 16
+set ::math::bignum::atombase [expr {1 << $::math::bignum::atombits}]
+set ::math::bignum::atommask [expr {$::math::bignum::atombase-1}]
+
+# Note: to change 'atombits' is all you need to change the
+# library internal representation base.
+
+# Return the max between a and b (not bignums)
+proc ::math::bignum::max {a b} {
+    expr {($a > $b) ? $a : $b}
+}
+
+# Return the min between a and b (not bignums)
+proc ::math::bignum::min {a b} {
+    expr {($a < $b) ? $a : $b}
+}
+
+############################ Basic bignum operations ###########################
+
+# Returns a new bignum initialized to the value of 0.
+#
+# The big numbers are represented as a Tcl lists
+# The all-is-a-string representation does not pay here
+# bignums in Tcl are already slow, we can't slow-down it more.
+#
+# The bignum representation is [list bignum <sign> <atom0> ... <atomN>]
+# Where the atom0 is the least significant. Atoms are the digits
+# of a number in base 2^$::math::bignum::atombits
+#
+# The sign is 0 if the number is positive, 1 for negative numbers.
+
+# Note that the function accepts an argument used in order to
+# create a bignum of <atoms> atoms. For default zero is
+# represented as a single zero atom.
+#
+# The function is designed so that "set b [zero [atoms $a]]" will
+# produce 'b' with the same number of atoms as 'a'.
+proc ::math::bignum::zero {{value 0}} {
+    set v [list bignum 0 0]
+    while { $value > 1 } {
+       lappend v 0
+       incr value -1
+    }
+    return $v
+}
+
+# Get the bignum sign
+proc ::math::bignum::sign bignum {
+    lindex $bignum 1
+}
+
+# Get the number of atoms in the bignum
+proc ::math::bignum::atoms bignum {
+    expr {[llength $bignum]-2}
+}
+
+# Get the i-th atom out of a bignum.
+# If the bignum is shorter than i atoms, the function
+# returns 0.
+proc ::math::bignum::atom {bignum i} {
+    if {[::math::bignum::atoms $bignum] < [expr {$i+1}]} {
+	return 0
+    } else {
+	lindex $bignum [expr {$i+2}]
+    }
+}
+
+# Set the i-th atom out of a bignum. If the bignum
+# has less than 'i+1' atoms, add zero atoms to reach i.
+proc ::math::bignum::setatom {bignumvar i atomval} {
+    upvar 1 $bignumvar bignum
+    while {[::math::bignum::atoms $bignum] < [expr {$i+1}]} {
+	lappend bignum 0
+    }
+    lset bignum [expr {$i+2}] $atomval
+}
+
+# Set the bignum sign
+proc ::math::bignum::setsign {bignumvar sign} {
+    upvar 1 $bignumvar bignum
+    lset bignum 1 $sign
+}
+
+# Remove trailing atoms with a value of zero
+# The normalized bignum is returned
+proc ::math::bignum::normalize bignumvar {
+    upvar 1 $bignumvar bignum
+    set atoms [expr {[llength $bignum]-2}]
+    set i [expr {$atoms+1}]
+    while {$atoms && [lindex $bignum $i] == 0} {
+	set bignum [lrange $bignum 0 end-1]
+	incr atoms -1
+	incr i -1
+    }
+    if {!$atoms} {
+	set bignum [list bignum 0 0]
+    }
+    return $bignum
+}
+
+# Return the absolute value of N
+proc ::math::bignum::abs n {
+    ::math::bignum::setsign n 0
+    return $n
+}
+
+################################# Comparison ###################################
+
+# Compare by absolute value. Called by ::math::bignum::cmp after the sign check.
+#
+# Returns 1 if |a| > |b|
+#         0 if a == b
+#        -1 if |a| < |b|
+#
+proc ::math::bignum::abscmp {a b} {
+    if {[llength $a] > [llength $b]} {
+	return 1
+    } elseif {[llength $a] < [llength $b]} {
+	return -1
+    }
+    set j [expr {[llength $a]-1}]
+    while {$j >= 2} {
+	if {[lindex $a $j] > [lindex $b $j]} {
+	    return 1
+	} elseif {[lindex $a $j] < [lindex $b $j]} {
+	    return -1
+	}
+	incr j -1
+    }
+    return 0
+}
+
+# High level comparison. Return values:
+#
+#  1 if a > b
+# -1 if a < b
+#  0 if a == b
+#
+proc ::math::bignum::cmp {a b} { ; # same sign case
+    set a [_treat $a]
+    set b [_treat $b]
+    if {[::math::bignum::sign $a] == [::math::bignum::sign $b]} {
+	if {[::math::bignum::sign $a] == 0} {
+	    ::math::bignum::abscmp $a $b
+	} else {
+	    expr {-([::math::bignum::abscmp $a $b])}
+	}
+    } else { ; # different sign case
+	if {[::math::bignum::sign $a]} {return -1}
+	return 1
+    }
+}
+
+# Return true if 'z' is zero.
+proc ::math::bignum::iszero z {
+    set z [_treat $z]
+    expr {[llength $z] == 3 && [lindex $z 2] == 0}
+}
+
+# Comparison facilities
+proc ::math::bignum::lt {a b} {expr {[::math::bignum::cmp $a $b] < 0}}
+proc ::math::bignum::le {a b} {expr {[::math::bignum::cmp $a $b] <= 0}}
+proc ::math::bignum::gt {a b} {expr {[::math::bignum::cmp $a $b] > 0}}
+proc ::math::bignum::ge {a b} {expr {[::math::bignum::cmp $a $b] >= 0}}
+proc ::math::bignum::eq {a b} {expr {[::math::bignum::cmp $a $b] == 0}}
+proc ::math::bignum::ne {a b} {expr {[::math::bignum::cmp $a $b] != 0}}
+
+########################### Addition / Subtraction #############################
+
+# Add two bignums, don't care about the sign.
+proc ::math::bignum::rawAdd {a b} {
+    while {[llength $a] < [llength $b]} {lappend a 0}
+    while {[llength $b] < [llength $a]} {lappend b 0}
+    set r [::math::bignum::zero [expr {[llength $a]-1}]]
+    set car 0
+    for {set i 2} {$i < [llength $a]} {incr i} {
+	set sum [expr {[lindex $a $i]+[lindex $b $i]+$car}]
+	set car [expr {$sum >> $::math::bignum::atombits}]
+	set sum [expr {$sum & $::math::bignum::atommask}]
+	lset r $i $sum
+    }
+    if {$car} {
+	lset r $i $car
+    }
+    ::math::bignum::normalize r
+}
+
+# Subtract two bignums, don't care about the sign. a > b condition needed.
+proc ::math::bignum::rawSub {a b} {
+    set atoms [::math::bignum::atoms $a]
+    set r [::math::bignum::zero $atoms]
+    while {[llength $b] < [llength $a]} {lappend b 0} ; # b padding
+    set car 0
+    incr atoms 2
+    for {set i 2} {$i < $atoms} {incr i} {
+	set sub [expr {[lindex $a $i]-[lindex $b $i]-$car}]
+	set car 0
+	if {$sub < 0} {
+	    incr sub $::math::bignum::atombase
+	    set car 1
+	}
+	lset r $i $sub
+    }
+    # Note that if a > b there is no car in the last for iteration
+    ::math::bignum::normalize r
+}
+
+# Higher level addition, care about sign and call rawAdd or rawSub
+# as needed.
+proc ::math::bignum::add {a b} {
+    set a [_treat $a]
+    set b [_treat $b]
+    # Same sign case
+    if {[::math::bignum::sign $a] == [::math::bignum::sign $b]} {
+	set r [::math::bignum::rawAdd $a $b]
+	::math::bignum::setsign r [::math::bignum::sign $a]
+    } else {
+	# Different sign case
+	set cmp [::math::bignum::abscmp $a $b]
+	# 's' is the sign, set accordingly to A or B negative
+	set s [expr {[::math::bignum::sign $a] == 1}]
+	switch -- $cmp {
+	    0 {return [::math::bignum::zero]}
+	    1 {
+		set r [::math::bignum::rawSub $a $b]
+		::math::bignum::setsign r $s
+		return $r
+	    }
+	    -1 {
+		set r [::math::bignum::rawSub $b $a]
+		::math::bignum::setsign r [expr {!$s}]
+		return $r
+	    }
+	}
+    }
+    return $r
+}
+
+# Higher level subtraction, care about sign and call rawAdd or rawSub
+# as needed.
+proc ::math::bignum::sub {a b} {
+    set a [_treat $a]
+    set b [_treat $b]
+    # Different sign case
+    if {[::math::bignum::sign $a] != [::math::bignum::sign $b]} {
+	set r [::math::bignum::rawAdd $a $b]
+	::math::bignum::setsign r [::math::bignum::sign $a]
+    } else {
+	# Same sign case
+	set cmp [::math::bignum::abscmp $a $b]
+	# 's' is the sign, set accordingly to A and B both negative or positive
+	set s [expr {[::math::bignum::sign $a] == 1}]
+	switch -- $cmp {
+	    0 {return [::math::bignum::zero]}
+	    1 {
+		set r [::math::bignum::rawSub $a $b]
+		::math::bignum::setsign r $s
+		return $r
+	    }
+	    -1 {
+		set r [::math::bignum::rawSub $b $a]
+		::math::bignum::setsign r [expr {!$s}]
+		return $r
+	    }
+	}
+    }
+    return $r
+}
+
+############################### Multiplication #################################
+
+set ::math::bignum::karatsubaThreshold 32
+
+# Multiplication. Calls Karatsuba that calls Base multiplication under
+# a given threshold.
+proc ::math::bignum::mul {a b} {
+    set a [_treat $a]
+    set b [_treat $b]
+    set r [::math::bignum::kmul $a $b]
+    # The sign is the xor between the two signs
+    ::math::bignum::setsign r [expr {[::math::bignum::sign $a]^[::math::bignum::sign $b]}]
+}
+
+# Karatsuba Multiplication
+proc ::math::bignum::kmul {a b} {
+    set n [expr {[::math::bignum::max [llength $a] [llength $b]]-2}]
+    set nmin [expr {[::math::bignum::min [llength $a] [llength $b]]-2}]
+    if {$nmin < $::math::bignum::karatsubaThreshold} {return [::math::bignum::bmul $a $b]}
+    set m [expr {($n+($n&1))/2}]
+
+    set x0 [concat [list bignum 0] [lrange $a 2 [expr {$m+1}]]]
+    set y0 [concat [list bignum 0] [lrange $b 2 [expr {$m+1}]]]
+    set x1 [concat [list bignum 0] [lrange $a [expr {$m+2}] end]]
+    set y1 [concat [list bignum 0] [lrange $b [expr {$m+2}] end]]
+
+    if {0} {
+    puts "m: $m"
+    puts "x0: $x0"
+    puts "x1: $x1"
+    puts "y0: $y0"
+    puts "y1: $y1"
+    }
+
+    set p1 [::math::bignum::kmul $x1 $y1]
+    set p2 [::math::bignum::kmul $x0 $y0]
+    set p3 [::math::bignum::kmul [::math::bignum::add $x1 $x0] [::math::bignum::add $y1 $y0]]
+
+    set p3 [::math::bignum::sub $p3 $p1]
+    set p3 [::math::bignum::sub $p3 $p2]
+    set p1 [::math::bignum::lshiftAtoms $p1 [expr {$m*2}]]
+    set p3 [::math::bignum::lshiftAtoms $p3 $m]
+    set p3 [::math::bignum::add $p3 $p1]
+    set p3 [::math::bignum::add $p3 $p2]
+    return $p3
+}
+
+# Base Multiplication.
+proc ::math::bignum::bmul {a b} {
+    set r [::math::bignum::zero [expr {[llength $a]+[llength $b]-3}]]
+    for {set j 2} {$j < [llength $b]} {incr j} {
+	set car 0
+	set t [list bignum 0 0]
+	for {set i 2} {$i < [llength $a]} {incr i} {
+	    # note that A = B * C + D + E
+	    # with A of N*2 bits and C,D,E of N bits
+	    # can't overflow since:
+	    # (2^N-1)*(2^N-1)+(2^N-1)+(2^N-1) == 2^(2*N)-1
+	    set t0 [lindex $a $i]
+	    set t1 [lindex $b $j]
+	    set t2 [lindex $r [expr {$i+$j-2}]]
+	    set mul [expr {wide($t0)*$t1+$t2+$car}]
+	    set car [expr {$mul >> $::math::bignum::atombits}]
+	    set mul [expr {$mul & $::math::bignum::atommask}]
+	    lset r [expr {$i+$j-2}] $mul
+	}
+	if {$car} {
+	    lset r [expr {$i+$j-2}] $car
+	}
+    }
+    ::math::bignum::normalize r
+}
+
+################################## Shifting ####################################
+
+# Left shift 'z' of 'n' atoms. Low-level function used by ::math::bignum::lshift
+# Exploit the internal representation to go faster.
+proc ::math::bignum::lshiftAtoms {z n} {
+    while {$n} {
+	set z [linsert $z 2 0]
+	incr n -1
+    }
+    return $z
+}
+
+# Right shift 'z' of 'n' atoms. Low-level function used by ::math::bignum::lshift
+# Exploit the internal representation to go faster.
+proc ::math::bignum::rshiftAtoms {z n} {
+    set z [lreplace $z 2 [expr {$n+1}]]
+}
+
+# Left shift 'z' of 'n' bits. Low-level function used by ::math::bignum::lshift.
+# 'n' must be <= $::math::bignum::atombits
+proc ::math::bignum::lshiftBits {z n} {
+    set atoms [llength $z]
+    set car 0
+    for {set j 2} {$j < $atoms} {incr j} {
+	set t [lindex $z $j]
+	lset z $j \
+	    [expr {wide($car)|((wide($t)<<$n)&$::math::bignum::atommask)}]
+	set car [expr {wide($t)>>($::math::bignum::atombits-$n)}]
+    }
+    if {$car} {
+	lappend z 0
+	lset z $j $car
+    }
+    return $z ; # No normalization needed
+}
+
+# Right shift 'z' of 'n' bits. Low-level function used by ::math::bignum::rshift.
+# 'n' must be <= $::math::bignum::atombits
+proc ::math::bignum::rshiftBits {z n} {
+    set atoms [llength $z]
+    set car 0
+    for {set j [expr {$atoms-1}]} {$j >= 2} {incr j -1} {
+	set t [lindex $z $j]
+	lset z $j [expr {wide($car)|(wide($t)>>$n)}]
+	set car \
+	    [expr {(wide($t)<<($::math::bignum::atombits-$n))&$::math::bignum::atommask}]
+    }
+    ::math::bignum::normalize z
+}
+
+# Left shift 'z' of 'n' bits.
+proc ::math::bignum::lshift {z n} {
+    set z [_treat $z]
+    set atoms [expr {$n / $::math::bignum::atombits}]
+    set bits [expr {$n & ($::math::bignum::atombits-1)}]
+    ::math::bignum::lshiftBits [math::bignum::lshiftAtoms $z $atoms] $bits
+}
+
+# Right shift 'z' of 'n' bits.
+proc ::math::bignum::rshift {z n} {
+    set z [_treat $z]
+    set atoms [expr {$n / $::math::bignum::atombits}]
+    set bits [expr {$n & ($::math::bignum::atombits-1)}]
+
+    #
+    # Correct for "arithmetic shift" - signed integers
+    #
+    set corr 0
+    if { [::math::bignum::sign $z] == 1 } {
+        for {set j [expr {$atoms+1}]} {$j >= 2} {incr j -1} {
+            set t [lindex $z $j]
+            if { $t != 0 } {
+                set corr 1
+            }
+        }
+        if { $corr == 0 } {
+            set t [lindex $z [expr {$atoms+2}]]
+            if { ( $t & ~($::math::bignum::atommask<<($bits)) ) != 0 } {
+                set corr 1
+            }
+        }
+    }
+
+    set newz [::math::bignum::rshiftBits [math::bignum::rshiftAtoms $z $atoms] $bits]
+    if { $corr } {
+        set newz [::math::bignum::sub $newz 1]
+    }
+    return $newz
+}
+
+############################## Bit oriented ops ################################
+
+# Set the bit 'n' of 'bignumvar'
+proc ::math::bignum::setbit {bignumvar n} {
+    upvar 1 $bignumvar z
+    set atom [expr {$n / $::math::bignum::atombits}]
+    set bit [expr {1 << ($n & ($::math::bignum::atombits-1))}]
+    incr atom 2
+    while {$atom >= [llength $z]} {lappend z 0}
+    lset z $atom [expr {[lindex $z $atom]|$bit}]
+}
+
+# Clear the bit 'n' of 'bignumvar'
+proc ::math::bignum::clearbit {bignumvar n} {
+    upvar 1 $bignumvar z
+    set atom [expr {$n / $::math::bignum::atombits}]
+    incr atom 2
+    if {$atom >= [llength $z]} {return $z}
+    set mask [expr {$::math::bignum::atommask^(1 << ($n & ($::math::bignum::atombits-1)))}]
+    lset z $atom [expr {[lindex $z $atom]&$mask}]
+    ::math::bignum::normalize z
+}
+
+# Test the bit 'n' of 'z'. Returns true if the bit is set.
+proc ::math::bignum::testbit {z n} {
+    set  atom [expr {$n / $::math::bignum::atombits}]
+    incr atom 2
+    if {$atom >= [llength $z]} {return 0}
+    set mask [expr {1 << ($n & ($::math::bignum::atombits-1))}]
+    expr {([lindex $z $atom] & $mask) != 0}
+}
+
+# does bitwise and between a and b
+proc ::math::bignum::bitand {a b} {
+    # The internal number rep is little endian. Appending zeros is
+    # equivalent to adding leading zeros to a regular big-endian
+    # representation. The two numbers are extended to the same length,
+    # then the operation is applied to the absolute value.
+    set a [_treat $a]
+    set b [_treat $b]
+    while {[llength $a] < [llength $b]} {lappend a 0}
+    while {[llength $b] < [llength $a]} {lappend b 0}
+    set r [::math::bignum::zero [expr {[llength $a]-1}]]
+    for {set i 2} {$i < [llength $a]} {incr i} {
+	set or [expr {[lindex $a $i] & [lindex $b $i]}]
+	lset r $i $or
+    }
+    ::math::bignum::normalize r
+}
+
+# does bitwise XOR between a and b
+proc ::math::bignum::bitxor {a b} {
+    # The internal number rep is little endian. Appending zeros is
+    # equivalent to adding leading zeros to a regular big-endian
+    # representation. The two numbers are extended to the same length,
+    # then the operation is applied to the absolute value.
+    set a [_treat $a]
+    set b [_treat $b]
+    while {[llength $a] < [llength $b]} {lappend a 0}
+    while {[llength $b] < [llength $a]} {lappend b 0}
+    set r [::math::bignum::zero [expr {[llength $a]-1}]]
+    for {set i 2} {$i < [llength $a]} {incr i} {
+	set or [expr {[lindex $a $i] ^ [lindex $b $i]}]
+	lset r $i $or
+    }
+    ::math::bignum::normalize r
+}
+
+# does bitwise or between a and b
+proc ::math::bignum::bitor {a b} {
+    # The internal number rep is little endian. Appending zeros is
+    # equivalent to adding leading zeros to a regular big-endian
+    # representation. The two numbers are extended to the same length,
+    # then the operation is applied to the absolute value.
+    set a [_treat $a]
+    set b [_treat $b]
+    while {[llength $a] < [llength $b]} {lappend a 0}
+    while {[llength $b] < [llength $a]} {lappend b 0}
+    set r [::math::bignum::zero [expr {[llength $a]-1}]]
+    for {set i 2} {$i < [llength $a]} {incr i} {
+	set or [expr {[lindex $a $i] | [lindex $b $i]}]
+	lset r $i $or
+    }
+    ::math::bignum::normalize r
+}
+
+# Return the number of bits needed to represent 'z'.
+proc ::math::bignum::bits z {
+    set atoms [::math::bignum::atoms $z]
+    set bits [expr {($atoms-1)*$::math::bignum::atombits}]
+    set atom [lindex $z [expr {$atoms+1}]]
+    while {$atom} {
+	incr bits
+	set atom [expr {$atom >> 1}]
+    }
+    return $bits
+}
+
+################################## Division ####################################
+
+# Division. Returns [list n/d n%d]
+#
+# I got this algorithm from PGP 2.6.3i (see the mp_udiv function).
+# Here is how it works:
+#
+# Input:  N=(Nn,...,N2,N1,N0)radix2
+#         D=(Dn,...,D2,D1,D0)radix2
+# Output: Q=(Qn,...,Q2,Q1,Q0)radix2 = N/D
+#         R=(Rn,...,R2,R1,R0)radix2 = N%D
+#
+# Assume: N >= 0, D > 0
+#
+# For j from 0 to n
+#      Qj <- 0
+#      Rj <- 0
+# For j from n down to 0
+#      R <- R*2
+#      if Nj = 1 then R0 <- 1
+#      if R => D then R <- (R - D), Qn <- 1
+#
+# Note that the doubling of R is usually done leftshifting one position.
+# The only operations needed are bit testing, bit setting and subtraction.
+#
+# This is the "raw" version, don't care about the sign, returns both
+# quotient and rest as a two element list.
+# This procedure is used by divqr, div, mod, rem.
+proc ::math::bignum::rawDiv {n d} {
+    set bit [expr {[::math::bignum::bits $n]-1}]
+    set r [list bignum 0 0]
+    set q [::math::bignum::zero [expr {[llength $n]-2}]]
+    while {$bit >= 0} {
+	set b_atom [expr {($bit / $::math::bignum::atombits) + 2}]
+	set b_bit [expr {1 << ($bit & ($::math::bignum::atombits-1))}]
+	set r [::math::bignum::lshiftBits $r 1]
+	if {[lindex $n $b_atom]&$b_bit} {
+	    lset r 2 [expr {[lindex $r 2] | 1}]
+	}
+	if {[::math::bignum::abscmp $r $d] >= 0} {
+	    set r [::math::bignum::rawSub $r $d]
+	    lset q $b_atom [expr {[lindex $q $b_atom]|$b_bit}]
+	}
+	incr bit -1
+    }
+    ::math::bignum::normalize q
+    list $q $r
+}
+
+# Divide by single-atom immediate. Used to speedup bignum -> string conversion.
+# The procedure returns a two-elements list with the bignum quotient and
+# the remainder (that's just a number being <= of the max atom value).
+proc ::math::bignum::rawDivByAtom {n d} {
+    set atoms [::math::bignum::atoms $n]
+    set t 0
+    set j $atoms
+    incr j -1
+    for {} {$j >= 0} {incr j -1} {
+	set t [expr {($t << $::math::bignum::atombits)+[lindex $n [expr {$j+2}]]}]
+	lset n [expr {$j+2}] [expr {$t/$d}]
+	set t [expr {$t % $d}]
+    }
+    ::math::bignum::normalize n
+    list $n $t
+}
+
+# Higher level division. Returns a list with two bignums, the first
+# is the quotient of n/d, the second the remainder n%d.
+# Note that if you want the *modulo* operator you should use ::math::bignum::mod
+#
+# The remainder sign is always the same as the divident.
+proc ::math::bignum::divqr {n d} {
+    set n [_treat $n]
+    set d [_treat $d]
+    if {[::math::bignum::iszero $d]} {
+	error "Division by zero"
+    }
+    foreach {q r} [::math::bignum::rawDiv $n $d] break
+    ::math::bignum::setsign q [expr {[::math::bignum::sign $n]^[::math::bignum::sign $d]}]
+    ::math::bignum::setsign r [::math::bignum::sign $n]
+    list $q $r
+}
+
+# Like divqr, but only the quotient is returned.
+proc ::math::bignum::div {n d} {
+    lindex [::math::bignum::divqr $n $d] 0
+}
+
+# Like divqr, but only the remainder is returned.
+proc ::math::bignum::rem {n d} {
+    lindex [::math::bignum::divqr $n $d] 1
+}
+
+# Modular reduction. Returns N modulo M
+proc ::math::bignum::mod {n m} {
+    set n [_treat $n]
+    set m [_treat $m]
+    set r [lindex [::math::bignum::divqr $n $m] 1]
+    if {[::math::bignum::sign $m] != [::math::bignum::sign $r]} {
+	set r [::math::bignum::add $r $m]
+    }
+    return $r
+}
+
+# Returns true if n is odd
+proc ::math::bignum::isodd n {
+    expr {[lindex $n 2]&1}
+}
+
+# Returns true if n is even
+proc ::math::bignum::iseven n {
+    expr {!([lindex $n 2]&1)}
+}
+
+############################# Power and Power mod N ############################
+
+# Returns b^e
+proc ::math::bignum::pow {b e} {
+    set b [_treat $b]
+    set e [_treat $e]
+    if {[::math::bignum::iszero $e]} {return [list bignum 0 1]}
+    # The power is negative is the base is negative and the exponent is odd
+    set sign [expr {[::math::bignum::sign $b] && [::math::bignum::isodd $e]}]
+    # Set the base to it's abs value, i.e. make it positive
+    ::math::bignum::setsign b 0
+    # Main loop
+    set r [list bignum 0 1]; # Start with result = 1
+    while {[::math::bignum::abscmp $e [list bignum 0 1]] > 0} { ;# While the exp > 1
+	if {[::math::bignum::isodd $e]} {
+	    set r [::math::bignum::mul $r $b]
+	}
+	set e [::math::bignum::rshiftBits $e 1] ;# exp = exp / 2
+	set b [::math::bignum::mul $b $b]
+    }
+    set r [::math::bignum::mul $r $b]
+    ::math::bignum::setsign r $sign
+    return $r
+}
+
+# Returns b^e mod m
+proc ::math::bignum::powm {b e m} {
+    set b [_treat $b]
+    set e [_treat $e]
+    set m [_treat $m]
+    if {[::math::bignum::iszero $e]} {return [list bignum 0 1]}
+    # The power is negative is the base is negative and the exponent is odd
+    set sign [expr {[::math::bignum::sign $b] && [::math::bignum::isodd $e]}]
+    # Set the base to it's abs value, i.e. make it positive
+    ::math::bignum::setsign b 0
+    # Main loop
+    set r [list bignum 0 1]; # Start with result = 1
+    while {[::math::bignum::abscmp $e [list bignum 0 1]] > 0} { ;# While the exp > 1
+	if {[::math::bignum::isodd $e]} {
+	    set r [::math::bignum::mod [::math::bignum::mul $r $b] $m]
+	}
+	set e [::math::bignum::rshiftBits $e 1] ;# exp = exp / 2
+	set b [::math::bignum::mod [::math::bignum::mul $b $b] $m]
+    }
+    set r [::math::bignum::mul $r $b]
+    ::math::bignum::setsign r $sign
+    set r [::math::bignum::mod $r $m]
+    return $r
+}
+
+################################## Square Root #################################
+
+# SQRT using the 'binary sqrt algorithm'.
+#
+# The basic algoritm consists in starting from the higer-bit
+# the real square root may have set, down to the bit zero,
+# trying to set every bit and checking if guess*guess is not
+# greater than 'n'. If it is greater we don't set the bit, otherwise
+# we set it. In order to avoid to compute guess*guess a trick
+# is used, so only addition and shifting are really required.
+proc ::math::bignum::sqrt n {
+    if {[lindex $n 1]} {
+	error "Square root of a negative number"
+    }
+    set i [expr {(([::math::bignum::bits $n]-1)/2)+1}]
+    set b [expr {$i*2}] ; # Bit to set to get 2^i*2^i
+
+    set r [::math::bignum::zero] ; # guess
+    set x [::math::bignum::zero] ; # guess^2
+    set s [::math::bignum::zero] ; # guess^2 backup
+    set t [::math::bignum::zero] ; # intermediate result
+    for {} {$i >= 0} {incr i -1; incr b -2} {
+	::math::bignum::setbit t $b
+	set x [::math::bignum::rawAdd $s $t]
+	::math::bignum::clearbit t $b
+	if {[::math::bignum::abscmp $x $n] <= 0} {
+	    set s $x
+	    ::math::bignum::setbit r $i
+	    ::math::bignum::setbit t [expr {$b+1}]
+	}
+	set t [::math::bignum::rshiftBits $t 1]
+    }
+    return $r
+}
+
+################################## Random Number ###############################
+
+# Returns a random number in the range [0,2^n-1]
+proc ::math::bignum::rand bits {
+    set atoms [expr {($bits+$::math::bignum::atombits-1)/$::math::bignum::atombits}]
+    set shift [expr {($atoms*$::math::bignum::atombits)-$bits}]
+    set r [list bignum 0]
+    while {$atoms} {
+	lappend r [expr {int(rand()*(1<<$::math::bignum::atombits))}]
+	incr atoms -1
+    }
+    set r [::math::bignum::rshiftBits $r $shift]
+    return $r
+}
+
+############################ Convertion to/from string #########################
+
+# The string representation charset. Max base is 36
+set ::math::bignum::cset "0123456789abcdefghijklmnopqrstuvwxyz"
+
+# Convert 'z' to a string representation in base 'base'.
+# Note that this is missing a simple but very effective optimization
+# that's to divide by the biggest power of the base that fits
+# in a Tcl plain integer, and then to perform divisions with [expr].
+proc ::math::bignum::tostr {z {base 10}} {
+    if {[string length $::math::bignum::cset] < $base} {
+	error "base too big for string convertion"
+    }
+    if {[::math::bignum::iszero $z]} {return 0}
+    set sign [::math::bignum::sign $z]
+    set str {}
+    while {![::math::bignum::iszero $z]} {
+	foreach {q r} [::math::bignum::rawDivByAtom $z $base] break
+	append str [string index $::math::bignum::cset $r]
+	set z $q
+    }
+    if {$sign} {append str -}
+    # flip the resulting string
+    set flipstr {}
+    set i [string length $str]
+    incr i -1
+    while {$i >= 0} {
+	append flipstr [string index $str $i]
+	incr i -1
+    }
+    return $flipstr
+}
+
+# Create a bignum from a string representation in base 'base'.
+proc ::math::bignum::fromstr {str {base 0}} {
+    set z [::math::bignum::zero]
+    set str [string trim $str]
+    set sign 0
+    if {[string index $str 0] eq {-}} {
+	set str [string range $str 1 end]
+	set sign 1
+    }
+    if {$base == 0} {
+	switch -- [string tolower [string range $str 0 1]] {
+	    0x {set base 16; set str [string range $str 2 end]}
+	    ox {set base 8 ; set str [string range $str 2 end]}
+	    bx {set base 2 ; set str [string range $str 2 end]}
+	    default {set base 10}
+	}
+    }
+    if {[string length $::math::bignum::cset] < $base} {
+	error "base too big for string convertion"
+    }
+    set bigbase [list bignum 0 $base] ; # Build a bignum with the base value
+    set basepow [list bignum 0 1] ; # multiply every digit for a succ. power
+    set i [string length $str]
+    incr i -1
+    while {$i >= 0} {
+	set digitval [string first [string index $str $i] $::math::bignum::cset]
+	if {$digitval == -1} {
+	    error "Illegal char '[string index $str $i]' for base $base"
+	}
+	set bigdigitval [list bignum 0 $digitval]
+	set z [::math::bignum::rawAdd $z [::math::bignum::mul $basepow $bigdigitval]]
+	set basepow [::math::bignum::mul $basepow $bigbase]
+	incr i -1
+    }
+    if {![::math::bignum::iszero $z]} {
+	::math::bignum::setsign z $sign
+    }
+    return $z
+}
+
+#
+# Pre-treatment of some constants : 0 and 1
+# Updated 19/11/2005 : abandon the 'upvar' command and its cost
+#
+proc ::math::bignum::_treat {num} {
+    if {[llength $num]<2} {
+        if {[string equal $num 0]} {
+            # set to the bignum 0
+            return {bignum 0 0}
+        } elseif {[string equal $num 1]} {
+            # set to the bignum 1
+            return {bignum 0 1}
+        }
+    }
+    return $num
+}
+
+namespace eval ::math::bignum {
+    namespace export *
+}
+
+# Announce the package
+
+package provide math::bignum 3.1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/calculus.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/calculus.tcl
new file mode 100644
index 00000000..2869da65
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/calculus.tcl
@@ -0,0 +1,1650 @@
+# calculus.tcl --
+#    Package that implements several basic numerical methods, such
+#    as the integration of a one-dimensional function and the
+#    solution of a system of first-order differential equations.
+#
+# Copyright (c) 2002, 2003, 2004, 2006 by Arjen Markus.
+# Copyright (c) 2004 by Kevin B. Kenny.  All rights reserved.
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: calculus.tcl,v 1.15 2008/10/08 03:30:48 andreas_kupries Exp $
+
+package require Tcl 8.5;# lrepeat
+package require math::interpolate
+package provide math::calculus 1.0
+
+# math::calculus --
+#    Namespace for the commands
+
+namespace eval ::math::calculus {
+
+    namespace import ::math::interpolate::neville
+
+    namespace import ::math::expectDouble ::math::expectInteger
+
+    namespace export \
+	integral integralExpr integral2D integral3D \
+	qk15 qk15_detailed \
+	eulerStep heunStep rungeKuttaStep           \
+	boundaryValueSecondOrder solveTriDiagonal   \
+	newtonRaphson newtonRaphsonParameters
+    namespace export \
+        integral2D_2accurate integral3D_accurate
+
+    namespace export romberg romberg_infinity
+    namespace export romberg_sqrtSingLower romberg_sqrtSingUpper
+    namespace export romberg_powerLawLower romberg_powerLawUpper
+    namespace export romberg_expLower romberg_expUpper
+
+    namespace export regula_falsi root_bisection root_secant root_brent root_chandrupatla
+
+    variable nr_maxiter    20
+    variable nr_tolerance   0.001
+
+}
+
+# integral --
+#    Integrate a function over a given interval using the Simpson rule
+#
+# Arguments:
+#    begin       Start of the interval
+#    end         End of the interval
+#    nosteps     Number of steps in which to divide the interval
+#    func        Name of the function to be integrated (takes one
+#                argument)
+# Return value:
+#    Computed integral
+#
+proc ::math::calculus::integral { begin end nosteps func } {
+
+   set delta    [expr {($end-$begin)/double($nosteps)}]
+   set hdelta   [expr {$delta/2.0}]
+   set result   0.0
+   set xval     $begin
+   set func_end [uplevel 1 $func $xval]
+   for { set i 1 } { $i <= $nosteps } { incr i } {
+      set func_begin  $func_end
+      set func_middle [uplevel 1 $func [expr {$xval+$hdelta}]]
+      set func_end    [uplevel 1 $func [expr {$xval+$delta}]]
+      set result      [expr  {$result+$func_begin+4.0*$func_middle+$func_end}]
+
+      set xval        [expr {$begin+double($i)*$delta}]
+   }
+
+   return [expr {$result*$delta/6.0}]
+}
+
+# integralExpr --
+#    Integrate an expression with "x" as the integrate according to the
+#    Simpson rule
+#
+# Arguments:
+#    begin       Start of the interval
+#    end         End of the interval
+#    nosteps     Number of steps in which to divide the interval
+#    expression  Expression with "x" as the integrate
+# Return value:
+#    Computed integral
+#
+proc ::math::calculus::integralExpr { begin end nosteps expression } {
+
+   set delta    [expr {($end-$begin)/double($nosteps)}]
+   set hdelta   [expr {$delta/2.0}]
+   set result   0.0
+   set x        $begin
+   # FRINK: nocheck
+   set func_end [expr $expression]
+   for { set i 1 } { $i <= $nosteps } { incr i } {
+      set func_begin  $func_end
+      set x           [expr {$x+$hdelta}]
+       # FRINK: nocheck
+      set func_middle [expr $expression]
+      set x           [expr {$x+$hdelta}]
+       # FRINK: nocheck
+      set func_end    [expr $expression]
+      set result      [expr {$result+$func_begin+4.0*$func_middle+$func_end}]
+
+      set x           [expr {$begin+double($i)*$delta}]
+   }
+
+   return [expr {$result*$delta/6.0}]
+}
+
+# integral2D --
+#    Integrate a given fucntion of two variables over a block,
+#    using bilinear interpolation (for this moment: block function)
+#
+# Arguments:
+#    xinterval   Start, stop and number of steps of the "x" interval
+#    yinterval   Start, stop and number of steps of the "y" interval
+#    func        Function of the two variables to be integrated
+# Return value:
+#    Computed integral
+#
+proc ::math::calculus::integral2D { xinterval yinterval func } {
+
+   foreach { xbegin xend xnumber } $xinterval { break }
+   foreach { ybegin yend ynumber } $yinterval { break }
+
+   set xdelta    [expr {($xend-$xbegin)/double($xnumber)}]
+   set ydelta    [expr {($yend-$ybegin)/double($ynumber)}]
+   set hxdelta   [expr {$xdelta/2.0}]
+   set hydelta   [expr {$ydelta/2.0}]
+   set result   0.0
+   set dxdy      [expr {$xdelta*$ydelta}]
+   for { set j 0 } { $j < $ynumber } { incr j } {
+      set y [expr {$ybegin+$hydelta+double($j)*$ydelta}]
+      for { set i 0 } { $i < $xnumber } { incr i } {
+         set x           [expr {$xbegin+$hxdelta+double($i)*$xdelta}]
+         set func_value  [uplevel 1 $func $x $y]
+         set result      [expr {$result+$func_value}]
+      }
+   }
+
+   return [expr {$result*$dxdy}]
+}
+
+# integral3D --
+#    Integrate a given fucntion of two variables over a block,
+#    using trilinear interpolation (for this moment: block function)
+#
+# Arguments:
+#    xinterval   Start, stop and number of steps of the "x" interval
+#    yinterval   Start, stop and number of steps of the "y" interval
+#    zinterval   Start, stop and number of steps of the "z" interval
+#    func        Function of the three variables to be integrated
+# Return value:
+#    Computed integral
+#
+proc ::math::calculus::integral3D { xinterval yinterval zinterval func } {
+
+   foreach { xbegin xend xnumber } $xinterval { break }
+   foreach { ybegin yend ynumber } $yinterval { break }
+   foreach { zbegin zend znumber } $zinterval { break }
+
+   set xdelta    [expr {($xend-$xbegin)/double($xnumber)}]
+   set ydelta    [expr {($yend-$ybegin)/double($ynumber)}]
+   set zdelta    [expr {($zend-$zbegin)/double($znumber)}]
+   set hxdelta   [expr {$xdelta/2.0}]
+   set hydelta   [expr {$ydelta/2.0}]
+   set hzdelta   [expr {$zdelta/2.0}]
+   set result   0.0
+   set dxdydz    [expr {$xdelta*$ydelta*$zdelta}]
+   for { set k 0 } { $k < $znumber } { incr k } {
+      set z [expr {$zbegin+$hzdelta+double($k)*$zdelta}]
+      for { set j 0 } { $j < $ynumber } { incr j } {
+         set y [expr {$ybegin+$hydelta+double($j)*$ydelta}]
+         for { set i 0 } { $i < $xnumber } { incr i } {
+            set x           [expr {$xbegin+$hxdelta+double($i)*$xdelta}]
+            set func_value  [uplevel 1 $func $x $y $z]
+            set result      [expr {$result+$func_value}]
+         }
+      }
+   }
+
+   return [expr {$result*$dxdydz}]
+}
+
+# integral2D_accurate --
+#    Integrate a given function of two variables over a block,
+#    using a four-point quadrature formula
+#
+# Arguments:
+#    xinterval   Start, stop and number of steps of the "x" interval
+#    yinterval   Start, stop and number of steps of the "y" interval
+#    func        Function of the two variables to be integrated
+# Return value:
+#    Computed integral
+#
+proc ::math::calculus::integral2D_accurate { xinterval yinterval func } {
+
+    foreach { xbegin xend xnumber } $xinterval { break }
+    foreach { ybegin yend ynumber } $yinterval { break }
+
+    set alpha     [expr {sqrt(2.0/3.0)}]
+    set minalpha  [expr {-$alpha}]
+    set dpoints   [list $alpha 0.0 $minalpha 0.0 0.0 $alpha 0.0 $minalpha]
+
+    set xdelta    [expr {($xend-$xbegin)/double($xnumber)}]
+    set ydelta    [expr {($yend-$ybegin)/double($ynumber)}]
+    set hxdelta   [expr {$xdelta/2.0}]
+    set hydelta   [expr {$ydelta/2.0}]
+    set result   0.0
+    set dxdy      [expr {0.25*$xdelta*$ydelta}]
+
+    for { set j 0 } { $j < $ynumber } { incr j } {
+        set y [expr {$ybegin+$hydelta+double($j)*$ydelta}]
+        for { set i 0 } { $i < $xnumber } { incr i } {
+            set x [expr {$xbegin+$hxdelta+double($i)*$xdelta}]
+
+            foreach {dx dy} $dpoints {
+                set x1          [expr {$x+$dx}]
+                set y1          [expr {$y+$dy}]
+                set func_value  [uplevel 1 $func $x1 $y1]
+                set result      [expr {$result+$func_value}]
+            }
+        }
+    }
+
+    return [expr {$result*$dxdy}]
+}
+
+# integral3D_accurate --
+#    Integrate a given function of three variables over a block,
+#    using an 8-point quadrature formula
+#
+# Arguments:
+#    xinterval   Start, stop and number of steps of the "x" interval
+#    yinterval   Start, stop and number of steps of the "y" interval
+#    zinterval   Start, stop and number of steps of the "z" interval
+#    func        Function of the three variables to be integrated
+# Return value:
+#    Computed integral
+#
+proc ::math::calculus::integral3D_accurate { xinterval yinterval zinterval func } {
+
+    foreach { xbegin xend xnumber } $xinterval { break }
+    foreach { ybegin yend ynumber } $yinterval { break }
+    foreach { zbegin zend znumber } $zinterval { break }
+
+    set alpha     [expr {sqrt(1.0/3.0)}]
+    set minalpha  [expr {-$alpha}]
+
+    set dpoints   [list $alpha    $alpha    $alpha    \
+                        $alpha    $alpha    $minalpha \
+                        $alpha    $minalpha $alpha    \
+                        $alpha    $minalpha $minalpha \
+                        $minalpha $alpha    $alpha    \
+                        $minalpha $alpha    $minalpha \
+                        $minalpha $minalpha $alpha    \
+                        $minalpha $minalpha $minalpha ]
+
+    set xdelta    [expr {($xend-$xbegin)/double($xnumber)}]
+    set ydelta    [expr {($yend-$ybegin)/double($ynumber)}]
+    set zdelta    [expr {($zend-$zbegin)/double($znumber)}]
+    set hxdelta   [expr {$xdelta/2.0}]
+    set hydelta   [expr {$ydelta/2.0}]
+    set hzdelta   [expr {$zdelta/2.0}]
+    set result    0.0
+    set dxdydz    [expr {0.125*$xdelta*$ydelta*$zdelta}]
+
+    for { set k 0 } { $k < $znumber } { incr k } {
+        set z [expr {$zbegin+$hzdelta+double($k)*$zdelta}]
+        for { set j 0 } { $j < $ynumber } { incr j } {
+            set y [expr {$ybegin+$hydelta+double($j)*$ydelta}]
+            for { set i 0 } { $i < $xnumber } { incr i } {
+                set x [expr {$xbegin+$hxdelta+double($i)*$xdelta}]
+
+                foreach {dx dy dz} $dpoints {
+                    set x1 [expr {$x+$dx}]
+                    set y1 [expr {$y+$dy}]
+                    set z1 [expr {$z+$dz}]
+                    set func_value  [uplevel 1 $func $x1 $y1 $z1]
+                    set result      [expr {$result+$func_value}]
+                }
+            }
+        }
+    }
+
+    return [expr {$result*$dxdydz}]
+}
+
+# eulerStep --
+#    Integrate a system of ordinary differential equations of the type
+#    x' = f(x,t), where x is a vector of quantities. Integration is
+#    done over a single step according to Euler's method.
+#
+# Arguments:
+#    t           Start value of independent variable (time for instance)
+#    tstep       Step size of interval
+#    xvec        Vector of dependent values at the start
+#    func        Function taking the arguments t and xvec to return
+#                the derivative of each dependent variable.
+# Return value:
+#    List of values at the end of the step
+#
+proc ::math::calculus::eulerStep { t tstep xvec func } {
+
+   set xderiv   [uplevel 1 $func $t [list $xvec]]
+   set result   {}
+   foreach xv $xvec dx $xderiv {
+      set xnew [expr {$xv+$tstep*$dx}]
+      lappend result $xnew
+   }
+
+   return $result
+}
+
+# heunStep --
+#    Integrate a system of ordinary differential equations of the type
+#    x' = f(x,t), where x is a vector of quantities. Integration is
+#    done over a single step according to Heun's method.
+#
+# Arguments:
+#    t           Start value of independent variable (time for instance)
+#    tstep       Step size of interval
+#    xvec        Vector of dependent values at the start
+#    func        Function taking the arguments t and xvec to return
+#                the derivative of each dependent variable.
+# Return value:
+#    List of values at the end of the step
+#
+proc ::math::calculus::heunStep { t tstep xvec func } {
+
+   #
+   # Predictor step
+   #
+   set funcq    [uplevel 1 namespace which -command $func]
+   set xpred    [eulerStep $t $tstep $xvec $funcq]
+
+   #
+   # Corrector step
+   #
+   set tcorr    [expr {$t+$tstep}]
+   set xcorr    [eulerStep $tcorr $tstep $xpred $funcq]
+
+   set result   {}
+   foreach xv $xvec xc $xcorr {
+      set xnew [expr {0.5*($xv+$xc)}]
+      lappend result $xnew
+   }
+
+   return $result
+}
+
+# rungeKuttaStep --
+#    Integrate a system of ordinary differential equations of the type
+#    x' = f(x,t), where x is a vector of quantities. Integration is
+#    done over a single step according to Runge-Kutta 4th order.
+#
+# Arguments:
+#    t           Start value of independent variable (time for instance)
+#    tstep       Step size of interval
+#    xvec        Vector of dependent values at the start
+#    func        Function taking the arguments t and xvec to return
+#                the derivative of each dependent variable.
+# Return value:
+#    List of values at the end of the step
+#
+proc ::math::calculus::rungeKuttaStep { t tstep xvec func } {
+
+   set funcq    [uplevel 1 namespace which -command $func]
+
+   #
+   # Four steps:
+   # - k1 = tstep*func(t,x0)
+   # - k2 = tstep*func(t+0.5*tstep,x0+0.5*k1)
+   # - k3 = tstep*func(t+0.5*tstep,x0+0.5*k2)
+   # - k4 = tstep*func(t+    tstep,x0+    k3)
+   # - x1 = x0 + (k1+2*k2+2*k3+k4)/6
+   #
+   set tstep2   [expr {$tstep/2.0}]
+   set tstep6   [expr {$tstep/6.0}]
+
+   set xk1      [$funcq $t $xvec]
+   set xvec2    {}
+   foreach x1 $xvec xv $xk1 {
+      lappend xvec2 [expr {$x1+$tstep2*$xv}]
+   }
+   set xk2      [$funcq [expr {$t+$tstep2}] $xvec2]
+
+   set xvec3    {}
+   foreach x1 $xvec xv $xk2 {
+      lappend xvec3 [expr {$x1+$tstep2*$xv}]
+   }
+   set xk3      [$funcq [expr {$t+$tstep2}] $xvec3]
+
+   set xvec4    {}
+   foreach x1 $xvec xv $xk3 {
+      lappend xvec4 [expr {$x1+$tstep*$xv}]
+   }
+   set xk4      [$funcq [expr {$t+$tstep}] $xvec4]
+
+   set result   {}
+   foreach x0 $xvec k1 $xk1 k2 $xk2 k3 $xk3 k4 $xk4 {
+      set dx [expr {$k1+2.0*$k2+2.0*$k3+$k4}]
+      lappend result [expr {$x0+$dx*$tstep6}]
+   }
+
+   return $result
+}
+
+# boundaryValueSecondOrder --
+#    Integrate a second-order differential equation and solve for
+#    given boundary values.
+#
+#    The equation is (see the documentation):
+#       d       dy   d
+#       -- A(x) -- + -- B(x) y + C(x) y = D(x)
+#       dx      dx   dx
+#
+#    The procedure uses finite differences and tridiagonal matrices to
+#    solve the equation. The boundary values are put in the matrix
+#    directly.
+#
+# Arguments:
+#    coeff_func  Name of triple-valued function for coefficients A, B, C
+#    force_func  Name of the function providing the force term D(x)
+#    leftbnd     Left boundary condition (list of: xvalue, boundary
+#                value or keyword zero-flux, zero-derivative)
+#    rightbnd    Right boundary condition (ditto)
+#    nostep      Number of steps
+# Return value:
+#    List of x-values and calculated values (x1, y1, x2, y2, ...)
+#
+proc ::math::calculus::boundaryValueSecondOrder {
+   coeff_func force_func leftbnd rightbnd nostep } {
+
+   set coeffq    [uplevel 1 namespace which -command $coeff_func]
+   set forceq    [uplevel 1 namespace which -command $force_func]
+
+   if { [llength $leftbnd] != 2 || [llength $rightbnd] != 2 } {
+      error "Boundary condition(s) incorrect"
+   }
+   if { $nostep < 1 } {
+      error "Number of steps must be larger/equal 1"
+   }
+
+   #
+   # Set up the matrix, as three different lists and the
+   # righthand side as the fourth
+   #
+   set xleft  [lindex $leftbnd 0]
+   set xright [lindex $rightbnd 0]
+   set xstep  [expr {($xright-$xleft)/double($nostep)}]
+
+   set acoeff {}
+   set bcoeff {}
+   set ccoeff {}
+   set dvalue {}
+
+   set x $xleft
+   foreach {A B C} [$coeffq $x] { break }
+
+   set A1 [expr {$A/$xstep-0.5*$B}]
+   set B1 [expr {$A/$xstep+0.5*$B+0.5*$C*$xstep}]
+   set C1 0.0
+
+   for { set i 1 } { $i <= $nostep } { incr i } {
+      set x [expr {$xleft+double($i)*$xstep}]
+      if { [expr {abs($x)-0.5*abs($xstep)}] < 0.0 } {
+         set x 0.0
+      }
+      foreach {A B C} [$coeffq $x] { break }
+
+      set A2 0.0
+      set B2 [expr {$A/$xstep-0.5*$B+0.5*$C*$xstep}]
+      set C2 [expr {$A/$xstep+0.5*$B}]
+      lappend acoeff [expr {$A1+$A2}]
+      lappend bcoeff [expr {-$B1-$B2}]
+      lappend ccoeff [expr {$C1+$C2}]
+      set A1 [expr {$A/$xstep-0.5*$B}]
+      set B1 [expr {$A/$xstep+0.5*$B+0.5*$C*$xstep}]
+      set C1 0.0
+   }
+   set xvec {}
+   for { set i 0 } { $i < $nostep } { incr i } {
+      set x [expr {$xleft+(0.5+double($i))*$xstep}]
+      if { [expr {abs($x)-0.25*abs($xstep)}] < 0.0 } {
+         set x 0.0
+      }
+      lappend xvec   $x
+      lappend dvalue [expr {$xstep*[$forceq $x]}]
+   }
+
+   #
+   # Substitute the boundary values
+   #
+   set A  [lindex $acoeff 0]
+   set D  [lindex $dvalue 0]
+   set D1 [expr {$D-$A*[lindex $leftbnd 1]}]
+   set C  [lindex $ccoeff end]
+   set D  [lindex $dvalue end]
+   set D2 [expr {$D-$C*[lindex $rightbnd 1]}]
+   set dvalue [concat $D1 [lrange $dvalue 1 end-1] $D2]
+
+   set yvec [solveTriDiagonal [lrange $acoeff 1 end] $bcoeff [lrange $ccoeff 0 end-1] $dvalue]
+
+   foreach x $xvec y $yvec {
+      lappend result $x $y
+   }
+   return $result
+}
+
+# solveTriDiagonal --
+#    Solve a system of equations Ax = b where A is a tridiagonal matrix
+#
+# Arguments:
+#    acoeff      Values on lower diagonal
+#    bcoeff      Values on main diagonal
+#    ccoeff      Values on upper diagonal
+#    dvalue      Values on righthand side
+# Return value:
+#    List of values forming the solution
+#
+proc ::math::calculus::solveTriDiagonal { acoeff bcoeff ccoeff dvalue } {
+
+   set nostep [llength $acoeff]
+   #
+   # First step: Gauss-elimination
+   #
+   set B [lindex $bcoeff 0]
+   set C [lindex $ccoeff 0]
+   set D [lindex $dvalue 0]
+   set acoeff  [concat 0.0 $acoeff]
+   set bcoeff2 [list $B]
+   set dvalue2 [list $D]
+   for { set i 1 } { $i <= $nostep } { incr i } {
+      set A2    [lindex $acoeff $i]
+      set B2    [lindex $bcoeff $i]
+      set D2    [lindex $dvalue $i]
+      set ratab [expr {$A2/double($B)}]
+      set B2    [expr {$B2-$ratab*$C}]
+      set D2    [expr {$D2-$ratab*$D}]
+      lappend bcoeff2 $B2
+      lappend dvalue2 $D2
+      set B     $B2
+      set C     [lindex $ccoeff $i]
+      set D     $D2
+   }
+
+   #
+   # Second step: substitution
+   #
+   set yvec {}
+   set B [lindex $bcoeff2 end]
+   set D [lindex $dvalue2 end]
+   set y [expr {$D/$B}]
+   for { set i [expr {$nostep-1}] } { $i >= 0 } { incr i -1 } {
+      set yvec  [concat $y $yvec]
+      set B     [lindex $bcoeff2 $i]
+      set C     [lindex $ccoeff  $i]
+      set D     [lindex $dvalue2 $i]
+      set y     [expr {($D-$C*$y)/$B}]
+   }
+   set yvec [concat $y $yvec]
+
+   return $yvec
+}
+
+# newtonRaphson --
+#    Determine the root of an equation via the Newton-Raphson method
+#
+# Arguments:
+#    func        Function (proc) in x
+#    deriv       Derivative (proc) of func w.r.t. x
+#    initval     Initial value for x
+# Return value:
+#    Estimate of root
+#
+proc ::math::calculus::newtonRaphson { func deriv initval } {
+   variable nr_maxiter
+   variable nr_tolerance
+
+   set funcq  [uplevel 1 namespace which -command $func]
+   set derivq [uplevel 1 namespace which -command $deriv]
+
+   set value $initval
+   set diff  [expr {10.0*$nr_tolerance}]
+
+   for { set i 0 } { $i < $nr_maxiter } { incr i } {
+      if { $diff < $nr_tolerance } {
+         break
+      }
+
+      set newval [expr {$value-[$funcq $value]/[$derivq $value]}]
+      if { $value != 0.0 } {
+         set diff   [expr {abs($newval-$value)/abs($value)}]
+      } else {
+         set diff   [expr {abs($newval-$value)}]
+      }
+      set value $newval
+   }
+
+   return $newval
+}
+
+# newtonRaphsonParameters --
+#    Set the parameters for the Newton-Raphson method
+#
+# Arguments:
+#    maxiter     Maximum number of iterations
+#    tolerance   Relative precisiion of the result
+# Return value:
+#    None
+#
+proc ::math::calculus::newtonRaphsonParameters { maxiter tolerance } {
+   variable nr_maxiter
+   variable nr_tolerance
+
+   if { $maxiter > 0 } {
+      set nr_maxiter $maxiter
+   }
+   if { $tolerance > 0 } {
+      set nr_tolerance $tolerance
+   }
+}
+
+#----------------------------------------------------------------------
+#
+# midpoint --
+#
+#	Perform one set of steps in evaluating an integral using the
+#	midpoint method.
+#
+# Usage:
+#	midpoint f a b s ?n?
+#
+# Parameters:
+#	f - function to integrate
+#	a - One limit of integration
+#	b - Other limit of integration.  a and b need not be in ascending
+#	    order.
+#	s - Value returned from a previous call to midpoint (see below)
+#	n - Step number (see below)
+#
+# Results:
+#	Returns an estimate of the integral obtained by dividing the
+#	interval into 3**n equal intervals and using the midpoint rule.
+#
+# Side effects:
+#	f is evaluated 2*3**(n-1) times and may have side effects.
+#
+# The 'midpoint' procedure is designed for successive approximations.
+# It should be called initially with n==0.  On this initial call, s
+# is ignored.  The function is evaluated at the midpoint of the interval, and
+# the value is multiplied by the width of the interval to give the
+# coarsest possible estimate of the integral.
+#
+# On each iteration except the first, n should be incremented by one,
+# and the previous value returned from [midpoint] should be supplied
+# as 's'.  The function will be evaluated at additional points
+# to give a total of 3**n equally spaced points, and the estimate
+# of the integral will be updated and returned
+#
+# Under normal circumstances, user code will not call this function
+# directly. Instead, it will use ::math::calculus::romberg to
+# do error control and extrapolation to a zero step size.
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::midpoint { f a b { n 0 } { s 0. } } {
+
+    if { $n == 0 } {
+
+	# First iteration.  Simply evaluate the function at the midpoint
+	# of the interval.
+
+	set cmd $f; lappend cmd [expr { 0.5 * ( $a + $b ) }]; set v [eval $cmd]
+	return [expr { ( $b - $a ) * $v }]
+
+    } else {
+
+	# Subsequent iterations. We've divided the interval into
+	# $it subintervals.  Evaluate the function at the 1/3 and
+	# 2/3 points of each subinterval.  Then update the estimate
+	# of the integral that we produced on the last step with
+	# the new sum.
+
+	set it [expr { pow( 3, $n-1 ) }]
+	set h [expr { ( $b - $a ) / ( 3. * $it ) }]
+	set h2 [expr { $h + $h }]
+	set x [expr { $a + 0.5 * $h }]
+	set sum 0
+	for { set j 0 } { $j < $it } { incr j } {
+	    set cmd $f; lappend cmd $x; set y [eval $cmd]
+	    set sum [expr { $sum + $y }]
+	    set x [expr { $x + $h2 }]
+	    set cmd $f; lappend cmd $x; set y [eval $cmd]
+	    set sum [expr { $sum + $y }]
+	    set x [expr { $x + $h}]
+	}
+	return [expr { ( $s + ( $b - $a ) * $sum / $it ) / 3. }]
+
+    }
+}
+
+#----------------------------------------------------------------------
+#
+# romberg --
+#
+#	Compute the integral of a function over an interval using
+#	Romberg's method.
+#
+# Usage:
+#	romberg f a b ?-option value?...
+#
+# Parameters:
+#	f - Function to integrate.  Must be a single Tcl command,
+#	    to which will be appended the abscissa at which the function
+#	    should be evaluated.  f should be analytic over the
+#	    region of integration, but may have a removable singularity
+#	    at either endpoint.
+#	a - One bound of the interval
+#	b - The other bound of the interval.  a and b need not be in
+#	    ascending order.
+#
+# Options:
+#	-abserror ABSERROR
+#		Requests that the integration be performed to make
+#		the estimated absolute error of the integral less than
+#		the given value.  Default is 1.e-10.
+#	-relerror RELERROR
+#		Requests that the integration be performed to make
+#		the estimated absolute error of the integral less than
+#		the given value.  Default is 1.e-6.
+#	-degree N
+#		Specifies the degree of the polynomial that will be
+#		used to extrapolate to a zero step size.  -degree 0
+#		requests integration with the midpoint rule; -degree 1
+#		is equivalent to Simpson's 3/8 rule; higher degrees
+#		are difficult to describe but (within reason) give
+#		faster convergence for smooth functions.  Default is
+#		-degree 4.
+#	-maxiter N
+#		Specifies the maximum number of triplings of the
+#		number of steps to take in integration.  At most
+#		3**N function evaluations will be performed in
+#		integrating with -maxiter N.  The integration
+#		will terminate at that time, even if the result
+#		satisfies neither the -relerror nor -abserror tests.
+#
+# Results:
+#	Returns a two-element list.  The first element is the estimated
+#	value of the integral; the second is the estimated absolute
+#	error of the value.
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::romberg { f a b args } {
+
+    # Replace f with a context-independent version
+
+    set f [lreplace $f 0 0 [uplevel 1 [list namespace which [lindex $f 0]]]]
+
+    # Assign default parameters
+
+    array set params {
+	-abserror 1.0e-10
+	-degree 4
+	-relerror 1.0e-6
+	-maxiter 14
+    }
+
+    # Extract parameters
+
+    if { ( [llength $args] % 2 ) != 0 } {
+        return -code error -errorcode [list romberg wrongNumArgs] \
+            "wrong \# args, should be\
+                 \"[lreplace [info level 0] 1 end \
+                         f x1 x2 ?-option value?...]\""
+    }
+    foreach { key value } $args {
+        if { ![info exists params($key)] } {
+            return -code error -errorcode [list romberg badoption $key] \
+                "unknown option \"$key\",\
+                     should be -abserror, -degree, -relerror, or -maxiter"
+        }
+        set params($key) $value
+    }
+
+    # Check params
+
+    if { ![string is double -strict $a] } {
+	return -code error [expectDouble $a]
+    }
+    if { ![string is double -strict $b] } {
+	return -code error [expectDouble $b]
+    }
+    if { ![string is double -strict $params(-abserror)] } {
+	return -code error [expectDouble $params(-abserror)]
+    }
+    if { ![string is integer -strict $params(-degree)] } {
+	return -code error [expectInteger $params(-degree)]
+    }
+    if { ![string is integer -strict $params(-maxiter)] } {
+	return -code error [expectInteger $params(-maxiter)]
+    }
+    if { ![string is double -strict $params(-relerror)] } {
+	return -code error [expectDouble $params(-relerror)]
+    }
+    foreach key {-abserror -degree -maxiter -relerror} {
+	if { $params($key) <= 0 } {
+	    return -code error -errorcode [list romberg notPositive $key] \
+		"$key must be positive"
+	}
+    }
+    if { $params(-maxiter) <= $params(-degree) } {
+	return -code error -errorcode [list romberg tooFewIter] \
+	    "-maxiter must be greater than -degree"
+    }
+
+    # Create lists of step size and sum with the given number of steps.
+
+    set x [list]
+    set y [list]
+    set s 0;				# Current best estimate of integral
+    set indx end-$params(-degree)
+    set pow3 1.;			# Current step size (times b-a)
+
+    # Perform successive integrations, tripling the number of steps each time
+
+    for { set i 0 } { $i < $params(-maxiter) } { incr i } {
+	set s [midpoint $f $a $b $i $s]
+	lappend x $pow3
+	lappend y $s
+	set pow3 [expr { $pow3 / 9. }]
+
+	# Once $degree steps have been done, start Richardson extrapolation
+	# to a zero step size.
+
+	if { $i >= $params(-degree) } {
+	    set x [lrange $x $indx end]
+	    set y [lrange $y $indx end]
+	    foreach {estimate err} [neville $x $y 0.] break
+	    if { $err < $params(-abserror)
+		 || $err < $params(-relerror) * abs($estimate) } {
+		return [list $estimate $err]
+	    }
+	}
+    }
+
+    # If -maxiter iterations have been done, give up, and return
+    # with the current error estimate.
+
+    return [list $estimate $err]
+}
+
+#----------------------------------------------------------------------
+#
+# u_infinity --
+#	Change of variable for integrating over a half-infinite
+#	interval
+#
+# Parameters:
+#	f - Function being integrated
+#	u - 1/x, where x is the abscissa where f is to be evaluated
+#
+# Results:
+#	Returns f(1/u)/(u**2)
+#
+# Side effects:
+#	Whatever f does.
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::u_infinity { f u } {
+    set cmd $f
+    lappend cmd [expr { 1.0 / $u }]
+    set y [eval $cmd]
+    return [expr { $y / ( $u * $u ) }]
+}
+
+#----------------------------------------------------------------------
+#
+# romberg_infinity --
+#	Evaluate a function on a half-open interval
+#
+# Usage:
+#	Same as 'romberg'
+#
+# The 'romberg_infinity' procedure performs Romberg integration on
+# an interval [a,b] where an infinite a or b may be represented by
+# a large number (e.g. 1.e30).  It operates by a change of variable;
+# instead of integrating f(x) from a to b, it makes a change
+# of variable u = 1/x, and integrates from 1/b to 1/a f(1/u)/u**2 du.
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::romberg_infinity { f a b args } {
+    if { ![string is double -strict $a] } {
+	return -code error [expectDouble $a]
+    }
+    if { ![string is double -strict $b] } {
+	return -code error [expectDouble $b]
+    }
+    if { $a * $b <= 0. } {
+        return -code error -errorcode {romberg_infinity cross-axis} \
+            "limits of integration have opposite sign"
+    }
+    set f [lreplace $f 0 0 [uplevel 1 [list namespace which [lindex $f 0]]]]
+    set f [list u_infinity $f]
+    return [eval [linsert $args 0 \
+                      romberg $f [expr { 1.0 / $b }] [expr { 1.0 / $a }]]]
+}
+
+#----------------------------------------------------------------------
+#
+# u_sqrtSingLower --
+#	Change of variable for integrating over an interval with
+#	an inverse square root singularity at the lower bound.
+#
+# Parameters:
+#	f - Function being integrated
+#	a - Lower bound
+#	u - sqrt(x-a), where x is the abscissa where f is to be evaluated
+#
+# Results:
+#	Returns 2 * u * f( a + u**2 )
+#
+# Side effects:
+#	Whatever f does.
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::u_sqrtSingLower { f a u } {
+    set cmd $f
+    lappend cmd [expr { $a + $u * $u }]
+    set y [eval $cmd]
+    return [expr { 2. * $u * $y }]
+}
+
+#----------------------------------------------------------------------
+#
+# u_sqrtSingUpper --
+#	Change of variable for integrating over an interval with
+#	an inverse square root singularity at the upper bound.
+#
+# Parameters:
+#	f - Function being integrated
+#	b - Upper bound
+#	u - sqrt(b-x), where x is the abscissa where f is to be evaluated
+#
+# Results:
+#	Returns 2 * u * f( b - u**2 )
+#
+# Side effects:
+#	Whatever f does.
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::u_sqrtSingUpper { f b u } {
+    set cmd $f
+    lappend cmd [expr { $b - $u * $u }]
+    set y [eval $cmd]
+    return [expr { 2. * $u * $y }]
+}
+
+#----------------------------------------------------------------------
+#
+# math::calculus::romberg_sqrtSingLower --
+#	Integrate a function with an inverse square root singularity
+#	at the lower bound
+#
+# Usage:
+#	Same as 'romberg'
+#
+# The 'romberg_sqrtSingLower' procedure is a wrapper for 'romberg'
+# for integrating a function with an inverse square root singularity
+# at the lower bound of the interval.  It works by making the change
+# of variable u = sqrt( x-a ).
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::romberg_sqrtSingLower { f a b args } {
+    if { ![string is double -strict $a] } {
+	return -code error [expectDouble $a]
+    }
+    if { ![string is double -strict $b] } {
+	return -code error [expectDouble $b]
+    }
+    if { $a >= $b } {
+	return -code error "limits of integration out of order"
+    }
+    set f [lreplace $f 0 0 [uplevel 1 [list namespace which [lindex $f 0]]]]
+    set f [list u_sqrtSingLower $f $a]
+    return [eval [linsert $args 0 \
+			     romberg $f 0 [expr { sqrt( $b - $a ) }]]]
+}
+
+#----------------------------------------------------------------------
+#
+# math::calculus::romberg_sqrtSingUpper --
+#	Integrate a function with an inverse square root singularity
+#	at the upper bound
+#
+# Usage:
+#	Same as 'romberg'
+#
+# The 'romberg_sqrtSingUpper' procedure is a wrapper for 'romberg'
+# for integrating a function with an inverse square root singularity
+# at the upper bound of the interval.  It works by making the change
+# of variable u = sqrt( b-x ).
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::romberg_sqrtSingUpper { f a b args } {
+    if { ![string is double -strict $a] } {
+	return -code error [expectDouble $a]
+    }
+    if { ![string is double -strict $b] } {
+	return -code error [expectDouble $b]
+    }
+    if { $a >= $b } {
+	return -code error "limits of integration out of order"
+    }
+    set f [lreplace $f 0 0 [uplevel 1 [list namespace which [lindex $f 0]]]]
+    set f [list u_sqrtSingUpper $f $b]
+    return [eval [linsert $args 0 \
+		      romberg $f 0. [expr { sqrt( $b - $a ) }]]]
+}
+
+#----------------------------------------------------------------------
+#
+# u_powerLawLower --
+#	Change of variable for integrating over an interval with
+#	an integrable power law singularity at the lower bound.
+#
+# Parameters:
+#	f - Function being integrated
+#	gammaover1mgamma - gamma / (1 - gamma), where gamma is the power
+#	oneover1mgamma - 1 / (1 - gamma), where gamma is the power
+#	a - Lower limit of integration
+#	u - Changed variable u == (x-a)**(1-gamma)
+#
+# Results:
+#	Returns u**(1/1-gamma) * f(a + u**(1/1-gamma) ).
+#
+# Side effects:
+#	Whatever f does.
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::u_powerLawLower { f gammaover1mgamma oneover1mgamma
+					 a u } {
+    set cmd $f
+    lappend cmd [expr { $a + pow( $u, $oneover1mgamma ) }]
+    set y [eval $cmd]
+    return [expr { $y * pow( $u, $gammaover1mgamma ) }]
+}
+
+#----------------------------------------------------------------------
+#
+# math::calculus::romberg_powerLawLower --
+#	Integrate a function with an integrable power law singularity
+#	at the lower bound
+#
+# Usage:
+#	romberg_powerLawLower gamma f a b ?-option value...?
+#
+# Parameters:
+#	gamma - Power (0<gamma<1) of the singularity
+#	f - Function to integrate.  Must be a single Tcl command,
+#	    to which will be appended the abscissa at which the function
+#	    should be evaluated.  f is expected to have an integrable
+#	    power law singularity at the lower endpoint; that is, the
+#	    integrand is expected to diverge as (x-a)**gamma.
+#	a - One bound of the interval
+#	b - The other bound of the interval.  a and b need not be in
+#	    ascending order.
+#
+# Options:
+#	-abserror ABSERROR
+#		Requests that the integration be performed to make
+#		the estimated absolute error of the integral less than
+#		the given value.  Default is 1.e-10.
+#	-relerror RELERROR
+#		Requests that the integration be performed to make
+#		the estimated absolute error of the integral less than
+#		the given value.  Default is 1.e-6.
+#	-degree N
+#		Specifies the degree of the polynomial that will be
+#		used to extrapolate to a zero step size.  -degree 0
+#		requests integration with the midpoint rule; -degree 1
+#		is equivalent to Simpson's 3/8 rule; higher degrees
+#		are difficult to describe but (within reason) give
+#		faster convergence for smooth functions.  Default is
+#		-degree 4.
+#	-maxiter N
+#		Specifies the maximum number of triplings of the
+#		number of steps to take in integration.  At most
+#		3**N function evaluations will be performed in
+#		integrating with -maxiter N.  The integration
+#		will terminate at that time, even if the result
+#		satisfies neither the -relerror nor -abserror tests.
+#
+# Results:
+#	Returns a two-element list.  The first element is the estimated
+#	value of the integral; the second is the estimated absolute
+#	error of the value.
+#
+# The 'romberg_sqrtSingLower' procedure is a wrapper for 'romberg'
+# for integrating a function with an integrable power law singularity
+# at the lower bound of the interval.  It works by making the change
+# of variable u = (x-a)**(1-gamma).
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::romberg_powerLawLower { gamma f a b args } {
+    if { ![string is double -strict $gamma] } {
+	return -code error [expectDouble $gamma]
+    }
+    if { $gamma <= 0.0 || $gamma >= 1.0 } {
+	return -code error -errorcode [list romberg gammaTooBig] \
+	    "gamma must lie in the interval (0,1)"
+    }
+    if { ![string is double -strict $a] } {
+	return -code error [expectDouble $a]
+    }
+    if { ![string is double -strict $b] } {
+	return -code error [expectDouble $b]
+    }
+    if { $a >= $b } {
+	return -code error "limits of integration out of order"
+    }
+    set f [lreplace $f 0 0 [uplevel 1 [list namespace which [lindex $f 0]]]]
+    set onemgamma [expr { 1. - $gamma }]
+    set f [list u_powerLawLower $f \
+	       [expr { $gamma / $onemgamma }] \
+	       [expr { 1 / $onemgamma }] \
+	       $a]
+
+    set limit [expr { pow( $b - $a, $onemgamma ) }]
+    set result {}
+    foreach v [eval [linsert $args 0 romberg $f 0 $limit]] {
+	lappend result [expr { $v / $onemgamma }]
+    }
+    return $result
+
+}
+
+#----------------------------------------------------------------------
+#
+# u_powerLawLower --
+#	Change of variable for integrating over an interval with
+#	an integrable power law singularity at the upper bound.
+#
+# Parameters:
+#	f - Function being integrated
+#	gammaover1mgamma - gamma / (1 - gamma), where gamma is the power
+#	oneover1mgamma - 1 / (1 - gamma), where gamma is the power
+#	b - Upper limit of integration
+#	u - Changed variable u == (b-x)**(1-gamma)
+#
+# Results:
+#	Returns u**(1/1-gamma) * f(b-u**(1/1-gamma) ).
+#
+# Side effects:
+#	Whatever f does.
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::u_powerLawUpper { f gammaover1mgamma oneover1mgamma
+					 b u } {
+    set cmd $f
+    lappend cmd [expr { $b - pow( $u, $oneover1mgamma ) }]
+    set y [eval $cmd]
+    return [expr { $y * pow( $u, $gammaover1mgamma ) }]
+}
+
+#----------------------------------------------------------------------
+#
+# math::calculus::romberg_powerLawUpper --
+#	Integrate a function with an integrable power law singularity
+#	at the upper bound
+#
+# Usage:
+#	romberg_powerLawLower gamma f a b ?-option value...?
+#
+# Parameters:
+#	gamma - Power (0<gamma<1) of the singularity
+#	f - Function to integrate.  Must be a single Tcl command,
+#	    to which will be appended the abscissa at which the function
+#	    should be evaluated.  f is expected to have an integrable
+#	    power law singularity at the upper endpoint; that is, the
+#	    integrand is expected to diverge as (b-x)**gamma.
+#	a - One bound of the interval
+#	b - The other bound of the interval.  a and b need not be in
+#	    ascending order.
+#
+# Options:
+#	-abserror ABSERROR
+#		Requests that the integration be performed to make
+#		the estimated absolute error of the integral less than
+#		the given value.  Default is 1.e-10.
+#	-relerror RELERROR
+#		Requests that the integration be performed to make
+#		the estimated absolute error of the integral less than
+#		the given value.  Default is 1.e-6.
+#	-degree N
+#		Specifies the degree of the polynomial that will be
+#		used to extrapolate to a zero step size.  -degree 0
+#		requests integration with the midpoint rule; -degree 1
+#		is equivalent to Simpson's 3/8 rule; higher degrees
+#		are difficult to describe but (within reason) give
+#		faster convergence for smooth functions.  Default is
+#		-degree 4.
+#	-maxiter N
+#		Specifies the maximum number of triplings of the
+#		number of steps to take in integration.  At most
+#		3**N function evaluations will be performed in
+#		integrating with -maxiter N.  The integration
+#		will terminate at that time, even if the result
+#		satisfies neither the -relerror nor -abserror tests.
+#
+# Results:
+#	Returns a two-element list.  The first element is the estimated
+#	value of the integral; the second is the estimated absolute
+#	error of the value.
+#
+# The 'romberg_PowerLawUpper' procedure is a wrapper for 'romberg'
+# for integrating a function with an integrable power law singularity
+# at the upper bound of the interval.  It works by making the change
+# of variable u = (b-x)**(1-gamma).
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::romberg_powerLawUpper { gamma f a b args } {
+    if { ![string is double -strict $gamma] } {
+	return -code error [expectDouble $gamma]
+    }
+    if { $gamma <= 0.0 || $gamma >= 1.0 } {
+	return -code error -errorcode [list romberg gammaTooBig] \
+	    "gamma must lie in the interval (0,1)"
+    }
+    if { ![string is double -strict $a] } {
+	return -code error [expectDouble $a]
+    }
+    if { ![string is double -strict $b] } {
+	return -code error [expectDouble $b]
+    }
+    if { $a >= $b } {
+	return -code error "limits of integration out of order"
+    }
+    set f [lreplace $f 0 0 [uplevel 1 [list namespace which [lindex $f 0]]]]
+    set onemgamma [expr { 1. - $gamma }]
+    set f [list u_powerLawUpper $f \
+	       [expr { $gamma / $onemgamma }] \
+	       [expr { 1. / $onemgamma }] \
+	       $b]
+
+    set limit [expr { pow( $b - $a, $onemgamma ) }]
+    set result {}
+    foreach v [eval [linsert $args 0 romberg $f 0 $limit]] {
+	lappend result [expr { $v / $onemgamma }]
+    }
+    return $result
+
+}
+
+#----------------------------------------------------------------------
+#
+# u_expUpper --
+#
+#	Change of variable to integrate a function that decays
+#	exponentially.
+#
+# Parameters:
+#	f - Function to integrate
+#	u - Changed variable u = exp(-x)
+#
+# Results:
+#	Returns (1/u)*f(-log(u))
+#
+# Side effects:
+#	Whatever f does.
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::u_expUpper { f u } {
+    set cmd $f
+    lappend cmd [expr { -log($u) }]
+    set y [eval $cmd]
+    return [expr { $y / $u }]
+}
+
+#----------------------------------------------------------------------
+#
+# romberg_expUpper --
+#
+#	Integrate a function that decays exponentially over a
+#	half-infinite interval.
+#
+# Parameters:
+#	Same as romberg.  The upper limit of integration, 'b',
+#	is expected to be very large.
+#
+# Results:
+#	Same as romberg.
+#
+# The romberg_expUpper function operates by making the change of
+# variable, u = exp(-x).
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::romberg_expUpper { f a b args } {
+    if { ![string is double -strict $a] } {
+	return -code error [expectDouble $a]
+    }
+    if { ![string is double -strict $b] } {
+	return -code error [expectDouble $b]
+    }
+    if { $a >= $b } {
+	return -code error "limits of integration out of order"
+    }
+    set f [lreplace $f 0 0 [uplevel 1 [list namespace which [lindex $f 0]]]]
+    set f [list u_expUpper $f]
+    return [eval [linsert $args 0 \
+		      romberg $f [expr {exp(-$b)}] [expr {exp(-$a)}]]]
+}
+
+#----------------------------------------------------------------------
+#
+# u_expLower --
+#
+#	Change of variable to integrate a function that grows
+#	exponentially.
+#
+# Parameters:
+#	f - Function to integrate
+#	u - Changed variable u = exp(x)
+#
+# Results:
+#	Returns (1/u)*f(log(u))
+#
+# Side effects:
+#	Whatever f does.
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::u_expLower { f u } {
+    set cmd $f
+    lappend cmd [expr { log($u) }]
+    set y [eval $cmd]
+    return [expr { $y / $u }]
+}
+
+#----------------------------------------------------------------------
+#
+# romberg_expLower --
+#
+#	Integrate a function that grows exponentially over a
+#	half-infinite interval.
+#
+# Parameters:
+#	Same as romberg.  The lower limit of integration, 'a',
+#	is expected to be very large and negative.
+#
+# Results:
+#	Same as romberg.
+#
+# The romberg_expUpper function operates by making the change of
+# variable, u = exp(x).
+#
+#----------------------------------------------------------------------
+
+proc ::math::calculus::romberg_expLower { f a b args } {
+    if { ![string is double -strict $a] } {
+	return -code error [expectDouble $a]
+    }
+    if { ![string is double -strict $b] } {
+	return -code error [expectDouble $b]
+    }
+    if { $a >= $b } {
+	return -code error "limits of integration out of order"
+    }
+    set f [lreplace $f 0 0 [uplevel 1 [list namespace which [lindex $f 0]]]]
+    set f [list u_expLower $f]
+    return [eval [linsert $args 0 \
+		      romberg $f [expr {exp($a)}] [expr {exp($b)}]]]
+}
+
+
+# regula_falsi --
+#    Compute the zero of a function via regula falsi
+# Arguments:
+#    f       Name of the procedure/command that evaluates the function
+#    xb      Start of the interval that brackets the zero
+#    xe      End of the interval that brackets the zero
+#    eps     Relative error that is allowed (default: 1.0e-4)
+# Result:
+#    Estimate of the zero, such that the estimated (!)
+#    error < eps * abs(xe-xb)
+# Note:
+#    f(xb)*f(xe) must be negative and eps must be positive
+#
+proc ::math::calculus::regula_falsi { f xb xe {eps 1.0e-4} } {
+    if { $eps <= 0.0 } {
+       return -code error "Relative error must be positive"
+    }
+
+    set fb [$f $xb]
+    set fe [$f $xe]
+
+    if { $fb * $fe > 0.0 } {
+       return -code error "Interval must be chosen such that the \
+function has a different sign at the beginning than at the end"
+    }
+
+    set max_error [expr {$eps * abs($xe-$xb)}]
+    set interval  [expr {abs($xe-$xb)}]
+
+    while { $interval > $max_error } {
+       set coeff [expr {($fe-$fb)/($xe-$xb)}]
+       set xi    [expr {$xb-$fb/$coeff}]
+       set fi    [$f $xi]
+
+       if { $fi == 0.0 } {
+          break
+       }
+       set diff1 [expr {abs($xe-$xi)}]
+       set diff2 [expr {abs($xb-$xi)}]
+       if { $diff1 > $diff2 } {
+          set interval $diff2
+       } else {
+          set interval $diff1
+       }
+
+       if { $fb*$fi < 0.0 } {
+          set xe $xi
+          set fe $fi
+       } else {
+          set xb $xi
+          set fb $fi
+       }
+    }
+
+    return $xi
+}
+
+#
+
+# qk15_basic --
+#     Apply the QK15 rule to a single interval and return all results
+#
+# Arguments:
+#     f             Function to integrate (name of procedure)
+#     xstart        Start of the interval
+#     xend          End of the interval
+#
+# Returns:
+#     List of the following:
+#     result        Estimated integral (I) of function f
+#     abserr        Estimate of the absolute error in "result"
+#     resabs        Estimated integral of the absolute value of f
+#     resasc        Estimated integral of abs(f - I/(xend-xstart))
+#
+# Note:
+#     Translation of the 15-point Gauss-Kronrod rule (QK15) as found
+#     in the SLATEC library (QUADPACK) into Tcl.
+#
+namespace eval ::math::calculus {
+    variable qk15_xgk
+    variable qk15_wgk
+    variable qk15_wg
+
+    set qk15_xgk {
+           0.9914553711208126e+00    0.9491079123427585e+00
+           0.8648644233597691e+00    0.7415311855993944e+00
+           0.5860872354676911e+00    0.4058451513773972e+00
+           0.2077849550078985e+00    0.0e+00               }
+    set qk15_wgk {
+           0.2293532201052922e-01    0.6309209262997855e-01
+           0.1047900103222502e+00    0.1406532597155259e+00
+           0.1690047266392679e+00    0.1903505780647854e+00
+           0.2044329400752989e+00    0.2094821410847278e+00}
+    set qk15_wg {
+           0.1294849661688697e+00    0.2797053914892767e+00
+           0.3818300505051189e+00    0.4179591836734694e+00}
+}
+
+if {[package vsatisfies [package present Tcl] 8.5]} {
+    proc ::math::calculus::Min {a b} { expr {min ($a, $b)} }
+    proc ::math::calculus::Max {a b} { expr {max ($a, $b)} }
+} else {
+    proc ::math::calculus::Min {a b} { if {$a < $b} { return $a } else { return $b }}
+    proc ::math::calculus::Max {a b} { if {$a > $b} { return $a } else { return $b }}
+}
+
+proc ::math::calculus::qk15_basic {xstart xend func} {
+    variable qk15_wg
+    variable qk15_wgk
+    variable qk15_xgk
+
+    #
+    # Use fixed values for epmach and uflow:
+    # - epmach is the largest relative spacing.
+    # - uflow is the smallest positive magnitude.
+
+    set epmach [expr {2.3e-308}]
+    set uflow  [expr {1.2e-16}]
+
+    set centr  [expr {0.5e+00*($xstart+$xend)}]
+    set hlgth  [expr {0.5e+00*($xend-$xstart)}]
+    set dhlgth [expr {abs($hlgth)}]
+
+    #
+    # Compute the 15-point Kronrod approximation to
+    # the integral, and estimate the absolute error.
+    #
+    set fc     [uplevel 2 $func $centr]
+    set resg   [expr {$fc*[lindex $qk15_wg 3]}]
+    set resk   [expr {$fc*[lindex $qk15_wgk 7]}]
+    set resabs [expr {abs($resk)}]
+
+    set fv1    [lrepeat 7 0.0]
+    set fv2    [lrepeat 7 0.0]
+
+    for {set j 0} {$j < 3} {incr j} {
+        set jtw [expr {$j*2 +1}]
+        set absc [expr {$hlgth*[lindex $qk15_xgk $jtw]}]
+        set fval1 [uplevel 2 $func [expr {$centr-$absc}]]
+        set fval2 [uplevel 2 $func [expr {$centr+$absc}]]
+        lset fv1 $jtw $fval1
+        lset fv2 $jtw $fval2
+        set fsum [expr {$fval1+$fval2}]
+        set resg [expr {$resg+[lindex $qk15_wg $j]*$fsum}]
+        set resk [expr {$resk+[lindex $qk15_wgk $jtw]*$fsum}]
+        set resabs [expr {$resabs+[lindex $qk15_wgk $jtw]*(abs($fval1)+abs($fval2))}]
+    }
+    for {set j 0} {$j < 4} {incr j} {
+        set jtwm1 [expr {$j*2}]
+        set absc [expr {$hlgth*[lindex $qk15_xgk $jtwm1]}]
+        set fval1 [uplevel 2 $func [expr {$centr-$absc}]]
+        set fval2 [uplevel 2 $func [expr {$centr+$absc}]]
+        lset fv1 $jtwm1 $fval1
+        lset fv2 $jtwm1 $fval2
+        set fsum [expr {$fval1+$fval2}]
+        set resk [expr {$resk+[lindex $qk15_wgk $jtwm1]*$fsum}]
+        set resabs [expr {$resabs+[lindex $qk15_wgk $jtwm1]*(abs($fval1)+abs($fval2))}]
+    }
+
+    set reskh [expr {$resk*0.5e+00}]
+    set resasc [expr {[lindex $qk15_wgk 7]*abs($fc-$reskh)}]
+
+    for {set j 0} {$j < 7} {incr j} {
+        set wgk    [lindex $qk15_wgk $j]
+        set FV1    [lindex $fv1      $j]
+        set FV2    [lindex $fv2      $j]
+        set resasc [expr {$resasc+$wgk*(abs($FV1-$reskh)+abs($FV2-$reskh))}]
+    }
+
+    set result [expr {$resk*$hlgth}]
+    set resabs [expr {$resabs*$dhlgth}]
+    set resasc [expr {$resasc*$dhlgth}]
+    set abserr [expr {abs(($resk-$resg)*$hlgth)}]
+    if { $resasc != 0.0e+00 && $abserr != 0.0e+00 } {
+        set abserr [expr {$resasc*[Min 0.1e+01 [expr {pow((0.2e+3*$abserr/$resasc),1.5e+00)}]]}]
+    }
+    if { $resabs > $uflow/(0.5e+02*$epmach) } {
+        set abserr [Max [expr {($epmach*0.5e+02)*$resabs}] $abserr]
+    }
+
+    return [list $result $abserr $resabs $resasc]
+}
+
+# qk15 --
+#     Apply the QK15 rule to an interval and return the estimated integral
+#
+# Arguments:
+#     xstart        Start of the interval
+#     xend          End of the interval
+#     func          Function to integrate (name of procedure)
+#     n             Number of subintervals (default: 1)
+#
+# Returns:
+#     Estimated integral of function func
+#
+proc ::math::calculus::qk15 {xstart xend func {n 1}} {
+    if { $n == 1 } {
+        return [lindex [qk15_basic $xstart $xend $func] 0]
+    } else {
+        set dx [expr {($xend-$xstart)/double($n)}]
+        set result 0.0
+        for {set i 0} {$i < $n} {incr i} {
+            set xb [expr {$xstart + $dx * $i}]
+            set xe [expr {$xstart + $dx * ($i+1)}]
+
+            set result [expr {$result + [lindex [qk15_basic $xb $xe $func] 0]}]
+        }
+    }
+
+    return $result
+}
+
+# qk15_detailed --
+#     Apply the QK15 rule to an interval and return the estimated integral
+#     as well as the other values
+#
+# Arguments:
+#     xstart        Start of the interval
+#     xend          End of the interval
+#     func          Function to integrate (name of procedure)
+#     n             Number of subintervals (default: 1)
+#
+# Returns:
+#     List of the following:
+#     result        Estimated integral (I) of function func
+#     abserr        Estimate of the absolute error in "result"
+#     resabs        Estimated integral of the absolute value of f
+#     resasc        Estimated integral of abs(f - I/(xend-xstart))
+#
+proc ::math::calculus::qk15_detailed {xstart xend func {n 1}} {
+    if { $n == 1 } {
+        return [qk15_basic $xstart $xend $func]
+    } else {
+        set dx [expr {($xend-$xstart)/double($n)}]
+        set result 0.0
+        set abserr 0.0
+        set resabs 0.0
+        set resasc 0.0
+        for {set i 0} {$i < $n} {incr i} {
+            set xb [expr {$xstart + $dx * $i}]
+            set xe [expr {$xstart + $dx * ($i+1)}]
+
+            foreach {dresult dabserr dresabs dresasc} [qk15_basic $xb $xe $func] break
+            set result [expr {$result + $dresult}]
+            set abserr [expr {$abserr + $dabserr}]
+            set resabs [expr {$resabs + $dresabs}]
+            set resasc [expr {$resasc + $dresasc}]
+        }
+    }
+
+    return [list $result $abserr $resabs $resasc]
+}
+
+#
+# Add the root finding procedures based on bracketing a root
+#
+source [file join [file dirname [info script]] rootfind.tcl]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/changepoint.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/changepoint.tcl
new file mode 100644
index 00000000..e080bb55
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/changepoint.tcl
@@ -0,0 +1,311 @@
+# changepoint.tcl --
+#     Statistical procedures for change point detection:
+#     - Implementation of the CUSUM procedure to detect changes in the
+#       mean of a series of data
+#
+#       Partly based on: https://www.itl.nist.gov/div898/handbook/pmc/section3/pmc323.htm
+#
+#       Note:
+#       Since there do not seem to be online resources for the finer details, the
+#       implementation uses simple guidelines as found for instance at
+#       https://en.wikipedia.org/wiki/CUSUM.
+#
+#       There are two commands:
+#       - One to examine a complete time series
+#       - One (OO style) to examine data from a time series online
+#
+#    - Implementation of the binary segmentation algorithm
+#
+
+package require Tcl 8.6
+package require TclOO
+package require math::statistics
+package provide math::changepoint 0.1
+
+namespace eval ::math::changepoint {
+    namespace export cusum-detect cusum-online binary-segmentation
+}
+
+# cusum-detect --
+#     Procedure to examine a given data series and return the location
+#     of the first change (if any)
+#
+# Arguments:
+#     data                    List of values to be examined
+#     args                    (Optional) key-value pairs to define the parameters:
+#                             -target value    -- the target (or mean) for the time series
+#                             -tolerance value -- the tolerated standard deviation
+#                             -kfactor         -- the factor by which to multiply the
+#                                                 standard deviation (defaults to 0.5,
+#                                                 typically between 0.5 and 1.0
+#                             -hfactor         -- the factor determining the limits
+#                                                 betweem which the "cusum" statistic
+#                                                 is accepted (typicaly 3.0-5.0, default 4.0)
+#
+# Result:
+#     Index of the location of the first change or an empty string
+#
+# Note:
+#     The CUSUM procedure is rather sensitive and details regarding the limits differ
+#     between descriptions. This is a straightforward implementation.
+#
+#     If no options are given, the given time series is used for the target and the
+#     tolerance.
+#
+#     Because of the senstivity using the raw data may give spurious results.
+#
+proc ::math::changepoint::cusum-detect {data args} {
+
+    set kfactor   0.5
+    set hfactor   4.0
+
+    set target    {}
+    set tolerance {}
+
+    foreach {key value} $args {
+        if { [string match "-*" $key] } {
+            set name [string range $key 1 end]
+            set $name $value
+        } else {
+            return -code error "Unknown/invalid option: $key"
+        }
+    }
+
+    if { $target eq {} } {
+        set target [::math::statistics::mean $data]
+    }
+
+    if { $tolerance eq {} } {
+        set tolerance [::math::statistics::stdev $data]
+    }
+
+    set k [expr {$kfactor * $tolerance}]
+    set h [expr {$hfactor * $tolerance}]
+
+    set Shi 0.0
+    set Slo 0.0
+
+    set location {}
+    set index    0
+    foreach value $data {
+        set Shi [expr {max( 0.0, $Shi + $value - $target - $k )}]
+        set Slo [expr {max( 0.0, $Slo + $target - $value - $k )}]
+
+        if { $Shi > $h || $Slo > $h } {
+            set location $index
+            break
+        }
+
+        incr index
+    }
+
+    return $location
+}
+
+# cusum-online --
+#     Class to examine data passed in against expected properties
+#
+# Arguments:
+#     data                    List of values to be examined
+#     args                    (Optional) key-value pairs to define the parameters:
+#                             -target value    -- the target (or mean) for the time series
+#                             -tolerance value -- the tolerated standard deviation
+#                             -kfactor         -- the factor by which to multiply the
+#                                                 standard deviation (defaults to 0.5,
+#                                                 typically between 0.5 and 1.0
+#                             -hfactor         -- the factor determining the limits
+#                                                 betweem which the "cusum" statistic
+#                                                 is accepted (typicaly 3.0-5.0, default 4.0)
+#
+# Result:
+#     Index of the location of the first change or an empty string
+#
+# Note:
+#     All parameters used in this algorithm are set to default values.
+#     The threshold are based on 3 * stdev and a quick detection of
+#     a change of 1 * stdev.
+#
+::oo::class create ::math::changepoint::cusum-online {
+    variable target    {}
+    variable tolerance {}
+    variable Slo       0.0
+    variable Shi       0.0
+    variable k         0.0
+    variable h         0.0
+
+    #
+    # Constructor:
+    # - two key-value pairs required: -target and -tolerance
+    #
+    constructor {args} {
+        variable target
+        variable tolerance
+        variable k
+        variable h
+
+        set kfactor 0.5
+        set hfactor 4.0
+
+        foreach {option value} $args {
+            switch -- $option {
+                "-target"    { set target    $value }
+                "-tolerance" { set tolerance $value }
+                "-kfactor"   { set kfactor   $value }
+                "-hfactor"   { set hfactor   $value }
+                default {
+                    return -code error "Unknown/invalid option: $option"
+                }
+            }
+        }
+
+        if { $target eq {} || $tolerance eq {} } {
+            return -code error "Values for target and tolerance are required"
+        }
+
+        set k [expr {$kfactor * $tolerance}]
+        set h [expr {$hfactor * $tolerance}]
+
+        set Shi 0.0
+        set Slo 0.0
+
+    }
+
+    #
+    # Restart the object
+    #
+    method reset {} {
+        variable Slo
+        variable Shi
+
+        set Shi 0.0
+        set Slo 0.0
+    }
+
+    #
+    # Add a new value to the object and examine it. If the cusum exceeds
+    # the range, 1 is returned, otherwise 0.
+    #
+    method examine {value} {
+        variable Slo
+        variable Shi
+        variable k
+        variable h
+
+        set Shi [expr {max( 0.0, $Shi + $value - $target - $k )}]
+        set Slo [expr {max( 0.0, $Slo + $target - $value - $k )}]
+
+        return [expr { $Shi > $h || $Slo > $h }]
+    }
+}
+
+# binary-segmentation --
+#     Apply the binary segmentation method recursively to find change points
+#
+# Arguments:
+#     series            The series in question
+#     args              Key-value pairs defining the options:
+#                       -minlength 5    Minimum number of points in each segment
+#                       -threshold 1.0  Factor applied to the standard deviation
+#                                       functioning as a threshold for accepting
+#                                       the change in cost function as an improvement
+# Result:
+#     List of indices where change points have been detected
+#
+proc ::math::changepoint::binary-segmentation {series args} {
+    set minlength 5
+    set threshold 1.0
+
+    foreach {key value} $args {
+        switch -- $key {
+            "-minlength" {
+                set minlength $value
+            }
+            "-threshold" {
+                set threshold $value
+            }
+            default {
+                return -error "Unknown keyword: $key"
+            }
+        }
+    }
+
+    if { [llength $series] < $minlength } {
+        return -error "Series too short - at least $minlength values expected"
+    }
+
+    #
+    # The real work is done by this procedure
+    #
+    set indices [BinSegRecursive 0 $series $minlength $threshold]
+
+    return $indices
+}
+
+# BinSegRecursive --
+#     Procedure for doing the actual work
+#
+# Arguments:
+#     first            Index of the first value in the segment wrt the original series
+#     series           Series/segment to be examined
+#     minlength        Minimum length
+#     threshold        Factor for the standard deviation
+#
+proc ::math::changepoint::BinSegRecursive {first series minlength threshold} {
+
+    set length [llength $series]
+
+    if { $length < $minlength } {
+        return {}
+    }
+
+    #
+    # Overall parameters
+    #
+    set stdev [::math::statistics::stdev $series]
+    set idxmin  -1
+    set maxcost [expr {$length * $stdev ** 2}]
+    set mincost $maxcost
+
+    #
+    # Calculate the cost function for each split of the series
+    #
+    for {set idx $minlength} {$idx < $length-$minlength} {incr idx} {
+        set segment1 [lrange $series 0 $idx]
+        set segment2 [lrange $series [expr {$idx+1}] end]
+
+        set stdev1   [::math::statistics::stdev $segment1]
+        set stdev2   [::math::statistics::stdev $segment2]
+
+        set cost     [expr {($idx+1) * $stdev1**2 + ($length-$idx) * $stdev2**2}]
+        if { $cost < $mincost } {
+            set mincost $cost
+            set idxmin  $idx
+        }
+    }
+
+    #
+    # Do we accept it?
+    #
+    set indices {}
+
+    if { $maxcost > $mincost + $threshold * $stdev ** 2 } {
+        set segment1 [lrange $series 0 $idxmin]
+        set segment2 [lrange $series [expr {$idxmin+1}] end]
+
+        set left  [BinSegRecursive [expr {$first+0}]       $segment1 $minlength $threshold]
+        set right [BinSegRecursive [expr {$first+$idxmin}] $segment2 $minlength $threshold]
+
+        set indices [list [expr {$first+$idxmin}]]
+
+        if { [llength $left] > 0 } {
+            set indices [concat $left $indices]
+        }
+
+        if { [llength $right] > 0 } {
+            set indices [concat $indices $right]
+        }
+    }
+
+    return $indices
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/classic_polyns.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/classic_polyns.tcl
new file mode 100644
index 00000000..1fd9cd00
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/classic_polyns.tcl
@@ -0,0 +1,200 @@
+# classic_polyns.tcl --
+#    Implement procedures for the classic orthogonal polynomials
+#
+package require math::polynomials
+
+namespace eval ::math::special {
+    if {[info commands addPolyn] == {} } {
+        namespace import ::math::polynomials::*
+    }
+}
+
+
+# legendre --
+#    Return the nth degree Legendre polynomial
+#
+# Arguments:
+#    n            The degree of the polynomial
+# Result:
+#    Polynomial definition
+#
+proc ::math::special::legendre {n} {
+    if { ! [string is integer -strict $n] || $n < 0 } {
+        return -code error "Degree must be a non-negative integer"
+    }
+
+    set pnm1   [polynomial 1.0]
+    set pn     [polynomial {0.0 1.0}]
+
+    if { $n == 0 } {return $pnm1}
+    if { $n == 1 } {return $pn}
+
+    set degree 1
+    while { $degree < $n } {
+        set an       [expr {(2.0*$degree+1.0)/($degree+1.0)}]
+        set bn       0.0
+        set cn       [expr {$degree/($degree+1.0)}]
+        set factor_n [polynomial [list $bn $an]]
+        set term_nm1 [multPolyn $pnm1 [expr {-1.0*$cn}]]
+        set term_n   [multPolyn $factor_n $pn]
+        set pnp1     [addPolyn $term_n $term_nm1]
+
+        set pnm1     $pn
+        set pn       $pnp1
+        incr degree
+    }
+
+    return $pnp1
+}
+
+# chebyshev --
+#    Return the nth degree Chebeyshev polynomial of the first kind
+#
+# Arguments:
+#    n            The degree of the polynomial
+# Result:
+#    Polynomial definition
+#
+proc ::math::special::chebyshev {n} {
+    if { ! [string is integer -strict $n] || $n < 0 } {
+        return -code error "Degree must be a non-negative integer"
+    }
+
+    set pnm1   [polynomial 1.0]
+    set pn     [polynomial {0.0 1.0}]
+
+    if { $n == 0 } {return $pnm1}
+    if { $n == 1 } {return $pn}
+
+    set degree 1
+    while { $degree < $n } {
+        set an       2.0
+        set bn       0.0
+        set cn       1.0
+        set factor_n [polynomial [list $bn $an]]
+        set term_nm1 [multPolyn $pnm1 [expr {-1.0*$cn}]]
+        set term_n   [multPolyn $factor_n $pn]
+        set pnp1     [addPolyn $term_n $term_nm1]
+
+        set pnm1     $pn
+        set pn       $pnp1
+        incr degree
+    }
+
+    return $pnp1
+}
+
+# laguerre --
+#    Return the nth degree Laguerre polynomial with parameter alpha
+#
+# Arguments:
+#    alpha        The parameter for the polynomial
+#    n            The degree of the polynomial
+# Result:
+#    Polynomial definition
+#
+proc ::math::special::laguerre {alpha n} {
+    if { ! [string is double -strict $alpha] } {
+        return -code error "Parameter must be a double"
+    }
+    if { ! [string is integer -strict $n] || $n < 0 } {
+        return -code error "Degree must be a non-negative integer"
+    }
+
+    set pnm1   [polynomial 1.0]
+    set pn     [polynomial [list [expr {1.0-$alpha}] -1.0]]
+
+    if { $n == 0 } {return $pnm1}
+    if { $n == 1 } {return $pn}
+
+    set degree 1
+    while { $degree < $n } {
+        set an       [expr {-1.0/($degree+1.0)}]
+        set bn       [expr {(2.0*$degree+$alpha+1)/($degree+1.0)}]
+        set cn       [expr {($degree+$alpha)/($degree+1.0)}]
+        set factor_n [polynomial [list $bn $an]]
+        set term_nm1 [multPolyn $pnm1 [expr {-1.0*$cn}]]
+        set term_n   [multPolyn $factor_n $pn]
+        set pnp1     [addPolyn $term_n $term_nm1]
+
+        set pnm1     $pn
+        set pn       $pnp1
+        incr degree
+    }
+
+    return $pnp1
+}
+
+# hermite --
+#    Return the nth degree Hermite polynomial
+#
+# Arguments:
+#    n            The degree of the polynomial
+# Result:
+#    Polynomial definition
+#
+proc ::math::special::hermite {n} {
+    if { ! [string is integer -strict $n] || $n < 0 } {
+        return -code error "Degree must be a non-negative integer"
+    }
+
+    set pnm1   [polynomial 1.0]
+    set pn     [polynomial {0.0 2.0}]
+
+    if { $n == 0 } {return $pnm1}
+    if { $n == 1 } {return $pn}
+
+    set degree 1
+    while { $degree < $n } {
+        set an       2.0
+        set bn       0.0
+        set cn       [expr {2.0*$degree}]
+        set factor_n [polynomial [list $bn $an]]
+        set term_n   [multPolyn $factor_n $pn]
+        set term_nm1 [multPolyn $pnm1 [expr {-1.0*$cn}]]
+        set pnp1     [addPolyn $term_n $term_nm1]
+
+        set pnm1     $pn
+        set pn       $pnp1
+        incr degree
+    }
+
+    return $pnp1
+}
+
+# some tests --
+#
+if { 0 } {
+set prec $::tcl_precision
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    set ::tcl_precision 17
+} else {
+    set ::tcl_precision 0
+}
+
+puts "Legendre:"
+foreach n {0 1 2 3 4} {
+    puts [::math::special::legendre $n]
+}
+
+puts "Chebyshev:"
+foreach n {0 1 2 3 4} {
+    puts [::math::special::chebyshev $n]
+}
+
+puts "Laguerre (alpha=0):"
+foreach n {0 1 2 3 4} {
+    puts [::math::special::laguerre 0.0 $n]
+}
+puts "Laguerre (alpha=1):"
+foreach n {0 1 2 3 4} {
+    puts [::math::special::laguerre 1.0 $n]
+}
+
+puts "Hermite:"
+foreach n {0 1 2 3 4} {
+    puts [::math::special::hermite $n]
+}
+
+set ::tcl_precision $prec
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/combinatorics.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/combinatorics.tcl
new file mode 100644
index 00000000..7e165e73
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/combinatorics.tcl
@@ -0,0 +1,443 @@
+#----------------------------------------------------------------------
+#
+# math/combinatorics.tcl --
+#
+#	This file contains definitions of mathematical functions
+#	useful in combinatorial problems.
+#
+#	Note: this is the original collection, an update is in combinatoricsExt.tcl
+#
+# Copyright (c) 2001, by Kevin B. Kenny.  All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: combinatorics.tcl,v 1.5 2004/02/09 19:31:54 hobbs Exp $
+#
+#----------------------------------------------------------------------
+
+package require Tcl 8.0
+
+namespace eval ::math {
+
+    # Commonly used combinatorial functions
+
+    # ln_Gamma is spelt thus because it's a capital gamma (\u0393)
+
+    namespace export ln_Gamma;		# Logarithm of the Gamma function
+    namespace export factorial;		# Factorial
+    namespace export choose;		# Binomial coefficient
+
+    # Note that Beta is spelt thus because it's conventionally a
+    # capital beta (\u0392).  It is exported from the package even
+    # though its name is capitalized.
+
+    namespace export Beta;		# Beta function
+
+}
+
+#----------------------------------------------------------------------
+#
+# ::math::InitializeFactorial --
+#
+#	Initialize a table of factorials for small integer arguments.
+#
+# Parameters:
+#	None.
+#
+# Results:
+#	None.
+#
+# Side effects:
+#	The variable, ::math::factorialList, is initialized to hold
+#	a table of factorial n for 0 <= n <= 170.
+#
+# This procedure is called once when the 'factorial' procedure is
+# being loaded.
+#
+#----------------------------------------------------------------------
+
+proc ::math::InitializeFactorial {} {
+
+    variable factorialList
+
+    set factorialList [list 1]
+    set f 1
+    for { set i 1 } { $i < 171 } { incr i } {
+	if { $i > 12. } {
+	    set f [expr { $f * double($i)}]
+	} else {
+	    set f [expr { $f * $i }]
+	}
+	lappend factorialList $f
+    }
+
+}
+
+#----------------------------------------------------------------------
+#
+# ::math::InitializePascal --
+#
+#	Precompute the first few rows of Pascal's triangle and store
+#	them in the variable ::math::pascal
+#
+# Parameters:
+#	None.
+#
+# Results:
+#	None.
+#
+# Side effects:
+#	::math::pascal is initialized to a flat list containing
+#	the first 34 rows of Pascal's triangle.	 C(n,k) is to be found
+#	at [lindex $pascal $i] where i = n * ( n + 1 ) + k.  No attempt
+#	is made to exploit symmetry.
+#
+#----------------------------------------------------------------------
+
+proc ::math::InitializePascal {} {
+
+    variable pascal
+
+    set pascal [list 1]
+    for { set n 1 } { $n < 34 } { incr n } {
+	lappend pascal 1
+	set l2 [list 1]
+	for { set k 1 } { $k < $n } { incr k } {
+	    set km1 [expr { $k - 1 }]
+	    set c [expr { [lindex $l $km1] + [lindex $l $k] }]
+	    lappend pascal $c
+	    lappend l2 $c
+	}
+	lappend pascal 1
+	lappend l2 1
+	set l $l2
+    }
+
+}
+
+#----------------------------------------------------------------------
+#
+# ::math::ln_Gamma --
+#
+#	Returns ln(Gamma(x)), where x >= 0
+#
+# Parameters:
+#	x - Argument to the Gamma function.
+#
+# Results:
+#	Returns the natural logarithm of Gamma(x).
+#
+# Side effects:
+#	None.
+#
+# Gamma(x) is defined as:
+#
+#		  +inf
+#		    _
+#		   |	x-1  -t
+#	Gamma(x)= _|   t    e	dt
+#
+#		   0
+#
+# The approximation used here is from Lanczos, SIAM J. Numerical Analysis,
+# series B, volume 1, p. 86.  For x > 1, the absolute error of the
+# result is claimed to be smaller than 5.5 * 10**-10 -- that is, the
+# resulting value of Gamma when exp( ln_Gamma( x ) ) is computed is
+# expected to be precise to better than nine significant figures.
+#
+#----------------------------------------------------------------------
+
+proc ::math::ln_Gamma { x } {
+
+    # Handle the common case of a real argument that's within the
+    # permissible range.
+
+    if { [string is double -strict $x]
+	 && ( $x > 0 )
+	 && ( $x <= 2.5563481638716906e+305 )
+     } {
+	set x [expr { $x - 1.0 }]
+	set tmp [expr { $x + 5.5 }]
+	set tmp [ expr { ( $x + 0.5 ) * log( $tmp ) - $tmp }]
+	set ser 1.0
+	foreach cof {
+	    76.18009173 -86.50532033 24.01409822
+	    -1.231739516 .00120858003 -5.36382e-6
+	} {
+	    set x [expr { $x + 1.0 }]
+	    set ser [expr { $ser + $cof / $x }]
+	}
+	return [expr { $tmp + log( 2.50662827465 * $ser ) }]
+    }
+
+    # Handle the error cases.
+
+    if { ![string is double -strict $x] } {
+	return -code error [expectDouble $x]
+    }
+
+    if { $x <= 0.0 } {
+	set proc [lindex [info level 0] 0]
+	return -code error \
+	    -errorcode [list ARITH DOMAIN \
+			"argument to $proc must be positive"] \
+	    "argument to $proc must be positive"
+    }
+
+    return -code error \
+	-errorcode [list ARITH OVERFLOW \
+		    "floating-point value too large to represent"] \
+	"floating-point value too large to represent"
+
+}
+
+#----------------------------------------------------------------------
+#
+# math::factorial --
+#
+#	Returns the factorial of the argument x.
+#
+# Parameters:
+#	x -- Number whose factorial is to be computed.
+#
+# Results:
+#	Returns x!, the factorial of x.
+#
+# Side effects:
+#	None.
+#
+# For integer x, 0 <= x <= 12, an exact integer result is returned.
+#
+# For integer x, 13 <= x <= 21, an exact floating-point result is returned
+# on machines with IEEE floating point.
+#
+# For integer x, 22 <= x <= 170, the result is exact to 1 ULP.
+#
+# For real x, x >= 0, the result is approximated by computing
+# Gamma(x+1) using the ::math::ln_Gamma function, and the result is
+# expected to be precise to better than nine significant figures.
+#
+# It is an error to present x <= -1 or x > 170, or a value of x that
+# is not numeric.
+#
+#----------------------------------------------------------------------
+
+proc ::math::factorial { x } {
+
+    variable factorialList
+
+    # Common case: factorial of a small integer
+
+    if { [string is integer -strict $x]
+	 && $x >= 0
+	 && $x < [llength $factorialList] } {
+	return [lindex $factorialList $x]
+    }
+
+    # Error case: not a number
+
+    if { ![string is double -strict $x] } {
+	return -code error [expectDouble $x]
+    }
+
+    # Error case: gamma in the left half plane
+
+    if { $x <= -1.0 } {
+	set proc [lindex [info level 0] 0]
+	set message "argument to $proc must be greater than -1.0"
+	return -code error -errorcode [list ARITH DOMAIN $message] $message
+    }
+
+    # Error case - gamma fails
+
+    if { [catch { expr {exp( [ln_Gamma [expr { $x + 1 }]] )} } result] } {
+	return -code error -errorcode $::errorCode $result
+    }
+
+    # Success - computed factorial n as Gamma(n+1)
+
+    return $result
+
+}
+
+#----------------------------------------------------------------------
+#
+# ::math::choose --
+#
+#	Returns the binomial coefficient C(n,k) = n!/k!(n-k)!
+#
+# Parameters:
+#	n -- Number of objects in the sampling pool
+#	k -- Number of objects to be chosen.
+#
+# Results:
+#	Returns C(n,k).
+#
+# Side effects:
+#	None.
+#
+# Results are expected to be accurate to ten significant figures.
+# If both parameters are integers and the result fits in 32 bits,
+# the result is rounded to an integer.
+#
+# Integer results are exact up to at least n = 34.
+# Floating point results are precise to better than nine significant
+# figures.
+#
+#----------------------------------------------------------------------
+
+proc ::math::choose { n k } {
+
+    variable pascal
+
+    # Use a precomputed table for small integer args
+
+    if { [string is integer -strict $n]
+	 && $n >= 0 && $n < 34
+	 && [string is integer -strict $k]
+	 && $k >= 0 && $k <= $n } {
+
+	set i [expr { ( ( $n * ($n + 1) ) / 2 ) + $k }]
+
+	return [lindex $pascal $i]
+
+    }
+
+    # Test bogus arguments
+
+    if { ![string is double -strict $n] } {
+	return -code error [expectDouble $n]
+    }
+    if { ![string is double -strict $k] } {
+	return -code error [expectDouble $k]
+    }
+
+    # Forbid negative n
+
+    if { $n < 0. } {
+	set proc [lindex [info level 0] 0]
+	set msg "first argument to $proc must be non-negative"
+	return -code error -errorcode [list ARITH DOMAIN $msg] $msg
+    }
+
+    # Handle k out of range
+
+    if { [string is integer -strict $k] && [string is integer -strict $n]
+	 && ( $k < 0 || $k > $n ) } {
+	return 0
+    }
+
+    if { $k < 0. } {
+	set proc [lindex [info level 0] 0]
+	set msg "second argument to $proc must be non-negative,\
+                 or both must be integers"
+	return -code error -errorcode [list ARITH DOMAIN $msg] $msg
+    }
+
+    # Compute the logarithm of the desired binomial coefficient.
+
+    if { [catch { expr { [ln_Gamma [expr { $n + 1 }]]
+			 - [ln_Gamma [expr { $k + 1 }]]
+			 - [ln_Gamma [expr { $n - $k + 1 }]] } } r] } {
+	return -code error -errorcode $::errorCode $r
+    }
+
+    # Compute the binomial coefficient itself
+
+    if { [catch { expr { exp( $r ) } } r] } {
+	return -code error -errorcode $::errorCode $r
+    }
+
+    # Round to integer if both args are integers and the result fits
+
+    if { $r <= 2147483647.5
+	       && [string is integer -strict $n]
+	       && [string is integer -strict $k] } {
+	return [expr { round( $r ) }]
+    }
+
+    return $r
+
+}
+
+#----------------------------------------------------------------------
+#
+# ::math::Beta --
+#
+#	Return the value of the Beta function of parameters z and w.
+#
+# Parameters:
+#	z, w : Two real parameters to the Beta function
+#
+# Results:
+#	Returns the value of the Beta function.
+#
+# Side effects:
+#	None.
+#
+# Beta( w, z ) is defined as:
+#
+#				  1_
+#				  |  (z-1)     (w-1)
+# Beta( w, z ) = Beta( z, w ) =	  | t	  (1-t)	     dt
+#				 _|
+#				  0
+#
+#	       = Gamma( z ) Gamma( w ) / Gamma( z + w )
+#
+# Results are returned as a floating point number precise to better
+# than nine significant figures for w, z > 1.
+#
+#----------------------------------------------------------------------
+
+proc ::math::Beta { z w } {
+
+    # Check form of both args so that domain check can be made
+
+    if { ![string is double -strict $z] } {
+	return -code error [expectDouble $z]
+    }
+    if { ![string is double -strict $w] } {
+	return -code error [expectDouble $w]
+    }
+
+    # Check sign of both args
+
+    if { $z <= 0.0 } {
+	set proc [lindex [info level 0] 0]
+	set msg "first argument to $proc must be positive"
+	return -code error -errorcode [list ARITH DOMAIN $msg] $msg
+    }
+    if { $w <= 0.0 } {
+	set proc [lindex [info level 0] 0]
+	set msg "second argument to $proc must be positive"
+	return -code error -errorcode [list ARITH DOMAIN $msg] $msg
+    }
+
+    # Compute beta using gamma function, keeping stack trace clean.
+
+    if { [catch { expr { exp( [ln_Gamma $z] + [ln_Gamma $w]
+			      - [ln_Gamma [ expr { $z + $w }]] ) } } beta] } {
+
+	return -code error -errorcode $::errorCode $beta
+
+    }
+
+    return $beta
+
+}
+
+#----------------------------------------------------------------------
+#
+# Initialization of this file:
+#
+#	Initialize the precomputed tables of factorials and binomial
+#	coefficients.
+#
+#----------------------------------------------------------------------
+
+namespace eval ::math {
+    InitializeFactorial
+    InitializePascal
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/combinatoricsExt.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/combinatoricsExt.tcl
new file mode 100644
index 00000000..1b9eff87
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/combinatoricsExt.tcl
@@ -0,0 +1,825 @@
+# combinatoricsExt.tcl --
+#     Procedures for combinatorial functions and generating combinatorial collections
+#
+#     Note:
+#     The older procedures factorial and choose assume Tcl 8.0, so no large integer support
+#     The versions in this package, permutations and combinations, depend on Tcl 8.6 and later
+#     for the large integer support and for TclOO.
+#
+#     Several parts based on: https://wiki.tcl-lang.org/page/Permutations and other Wiki pages
+#
+package require Tcl 8.6
+package require TclOO
+package provide math::combinatorics 2.0
+
+# ::math::combinatorics --
+#     Encompassing namespace and auxiliary variables
+#
+namespace eval ::math::combinatorics {
+    variable factorial
+    variable partition
+
+    set factorial {1 1 2 6 24 120 720}
+
+    set partition(0) 0
+    set partition(1) 1
+
+    namespace export permutations      variations      combinations      derangements      \
+                     list-permutations list-variations list-combinations list-derangements \
+                     catalan firstStirling secondStirling partitionP \
+                     permutationObj combinationObj
+}
+
+# permutations --
+#     Calculate the number of permutations
+#
+# Arguments:
+#     n           Size of the set
+#
+# Returns:
+#     Number of permutations of the set {0 ... n}
+#
+proc ::math::combinatorics::permutations {n} {
+    variable factorial
+
+    if { $n <= 1 } {
+        return 1
+    }
+
+    if { $n < [llength $factorial] } {
+        return [lindex $factorial $n]
+    }
+
+    set newfactorial [lindex $$factorial end]
+
+    for {set k [llength $factorial]} { $k <= $n} {incr k} {
+        set newfactorial [expr {$newfactorial * $k}]
+        lappend factorial $newfactorial
+    }
+
+    return $newfactorial
+}
+
+# variations --
+#     Calculate the number of variations
+#
+# Arguments:
+#     n           Size of the set
+#     k           Number of elements per subset
+#
+# Returns:
+#     Number of variations of the set {0 ... n}
+#
+proc ::math::combinatorics::variations {n k} {
+    if { $k < 0 || $k > $n } {
+        return 0
+    }
+
+    if { $n <= 1 || $k == 0 } {
+        return 1
+    }
+
+    set perms1 [permutations $n]
+    set perms2 [permutations [expr {$n-$k}]]
+
+    return [expr {$perms1 / $perms2}]
+}
+
+# combinations --
+#     Calculate the number of combinations
+#
+# Arguments:
+#     n           Size of the set
+#     k           Number of elements per subset
+#
+# Returns:
+#     Number of combinations of the set {0 ... n}
+#
+proc ::math::combinatorics::combinations {n k}  {
+    if { $k < 0 || $k > $n } {
+        return 0
+    }
+
+    if { $n <= 1 || $k == 0 || $k == $n } {
+        return 1
+    }
+
+    set perms1 [permutations $n]
+    set perms2 [permutations $k]
+    set perms3 [permutations [expr {$n - $k}]]
+
+    return [expr {$perms1 / $perms2 / $perms3}]
+}
+
+# derangements --
+#     Calculate the number of derangements
+#
+# Arguments:
+#     n           Size of the set
+#
+# Returns:
+#     Number of permutations of the set {0 ... n} where every
+#     element is displaced
+#
+proc ::math::combinatorics::derangements {n} {
+    if { $n <= 1 } {
+        return 0
+    }
+
+    if { $n == 2 } {
+        return 1
+    }
+
+    set dim2 0
+    set dim1 1
+
+    for {set i 3} {$i <= $n} {incr i} {
+        set di [expr {($i-1) * ($dim1 + $dim2)}]
+        set dim2 $dim1
+        set dim1 $di
+    }
+
+    return $di
+}
+
+# catalan --
+#     Return the n-th Catalan number
+#
+# Arguments:
+#     n           Index for the Catalan number (n >= 1)
+#
+# Result:
+#     The n-th Catalan number
+#
+proc ::math::combinatorics::catalan {n} {
+    if { $n < 0 || $n != int($n) } {
+        return -code error "The argument must be a non-negative integer"
+    }
+
+    set combin [combinations [expr {2*$n}] $n]
+
+    return [expr {$combin / ($n + 1)}]
+}
+
+# firstStirling --
+#     Calculate a Stirling number of the first kind
+#     (signed version, m cycles in a permutation of n items)
+#
+# Arguments:
+#     n           Number of items
+#     m           Number of cycles
+#
+# Note:
+#     The Stirling number returned is a signed number.
+#     For efficiency memoization is used.
+#
+proc ::math::combinatorics::firstStirling {n m} {
+    variable stirling
+
+    if { $n == $m } {
+        return 1
+    }
+
+    if { $n <= 0 || $m < 0 || $n < $m } {
+        return 0
+    }
+
+    if { [info exists stirling($n,$m)] } {
+        return $stirling($n,$m)
+    }
+
+    set nm1 [expr {$n-1}]
+    set mm1 [expr {$m-1}]
+
+    set Snm1_m   [firstStirling $nm1 $m]
+    set Snm1_mm1 [firstStirling $nm1 $mm1]
+
+    set stirling($n,$m) [expr {$Snm1_mm1 - $nm1 * $Snm1_m}]
+
+    return $stirling($n,$m)
+}
+
+# secondStirling --
+#     Calculate a Stirling number of the second kind
+#     (m non-empty subsets from n items)
+#
+# Arguments:
+#     n           Number of items
+#     m           Number of subsets
+#
+# Note:
+#     For efficiency memoization is used.
+#
+proc ::math::combinatorics::secondStirling {n m} {
+    variable stirlingSecond
+
+    if { $n == $m || $m == 1 } {
+        return 1
+    }
+
+    if { $n <= 0 || $m < 0 || $n < $m } {
+        return 0
+    }
+
+    if { [info exists stirlingSecond($n,$m)] } {
+        return $stirlingSecond($n,$m)
+    }
+
+    set nm1 [expr {$n-1}]
+    set mm1 [expr {$m-1}]
+
+    set Snm1_m   [secondStirling $nm1 $m]
+    set Snm1_mm1 [secondStirling $nm1 $mm1]
+
+    set stirlingSecond($n,$m) [expr {$Snm1_mm1 + $m * $Snm1_m}]
+
+    return $stirlingSecond($n,$m)
+}
+
+
+# partitionP --
+#     Calculate the partitionP function (wrapper)
+#
+# Arguments:
+#     n             The integer number to be partitioned
+#
+# Result:
+#     Number of partitions
+#
+proc ::math::combinatorics::partitionP {n} {
+    incr n
+    return [PartitionP $n]
+}
+
+# partitionQ --
+#     Calculate the partitionQ function (wrapper) - the number of partitions with distinct values
+#     (that is: an acceptable partition of 4 is (3,1) but not (2,2)
+#
+# Arguments:
+#     n             The integer number to be partitioned
+#
+# Result:
+#     Number of partitions
+#
+proc ::math::combinatorics::partitionQ {n} {
+    incr n
+    TODO - see https://mathworld.wolfram.com/PartitionFunctionQ.html
+
+    The calculation is not entirely trivial
+}
+
+# PartitionP --
+#     Calculate the partitionP function - see note
+#
+# Arguments:
+#     n             The integer number to be partitioned
+#
+# Result:
+#     Number of partitions
+#
+# Note:
+#     This code computes partitionP(n-1) rather than partitionP(n),
+#     so it should not be called directly.
+#
+proc ::math::combinatorics::PartitionP {n} {
+    variable partition
+
+    if { $n <= 0} {
+        return 0
+    }
+
+    if { [info exists partition($n)] } {
+        return $partition($n)
+    }
+
+    set part 0
+
+    for {set k 1} {$k <= $n} {incr k} {
+        set partm1 [PartitionP [expr {$n - $k*(3*$k-1)/2}]]
+        set partp1 [PartitionP [expr {$n - $k*(3*$k+1)/2}]]
+        set part [expr {$part + ($partm1 + $partp1) * (-1)**($k+1)}]
+    }
+
+    set partition($n) $part
+
+    return $part
+}
+
+
+# list-permutations --
+#     Generate a list of permutations
+#
+# Arguments:
+#     n           Size of the set
+#
+# Returns:
+#     List of all permutations of the set {0 ... n}
+#
+proc ::math::combinatorics::list-permutations {n} {
+    if { $n < 1 } {
+        return -error "Size n of the set must be positive"
+    }
+
+    if { $n == 1 } {
+        return [list 0]
+    }
+
+    set listperms [list-permutations [expr {$n-1}]]
+
+    set newlist {}
+
+    set nm1 [expr {$n-1}]
+    foreach perm $listperms {
+        for {set i 0} {$i < $n} {incr i} {
+            set newperm [linsert $perm $i $nm1]
+            lappend newlist $newperm
+        }
+    }
+
+    return $newlist
+}
+
+
+# list-variations --
+#     Generate a list of variations (permuted subsets)
+#
+# Arguments:
+#     n           Size of the set
+#     k           Number of elements per subset
+#
+# Returns:
+#     List of all permutations of the set {0 ... n}
+#
+proc ::math::combinatorics::list-variations {n k} {
+     set combinations [list-combinations $n $k]
+
+     set variations {}
+     foreach c $combinations {
+         lappend variations [List-permuted $c $k]
+     }
+
+     return [concat {*}$variations]
+}
+
+
+# List-permuted --
+#     Generate a list of permutations of given elements
+#
+# Arguments:
+#     list        List of elements
+#     size        Number of elements
+#
+# Returns:
+#     List of all permutations of the given set
+#
+# Note:
+#     Intended for private use only
+#
+#
+proc ::math::combinatorics::List-permuted {list size} {
+    if { $size == 0 } {
+        return [list [list]]
+    }
+    set retval {}
+
+    for { set i 0 } { $i < [llength $list] } { incr i } {
+        set firstElement [lindex $list $i]
+        set remainingElements [lreplace $list $i $i]
+        foreach subset [List-permuted $remainingElements [expr { $size - 1 }]] {
+            lappend retval [linsert $subset 0 $firstElement]
+       }
+    }
+    return $retval
+}
+
+
+# list-derangements --
+#     Generate a list of derangements - permutations where
+#     all elements are displaced
+#
+# Arguments:
+#     n           Size of the set
+#
+# Returns:
+#     List of all derangements of the set {0 ... n}
+#
+# Note:
+#     A naive implementation did not ork properly, so use
+#     brute force instead: filter out the permutations that are
+#     also derangements
+#
+proc ::math::combinatorics::list-derangements {n} {
+    set plist [::math::combinatorics::list-permutations $n]
+    set dlist {}
+
+    set numbers {}
+    for {set i 0} {$i < $n} {incr i} {
+        lappend numbers $i
+    }
+
+    foreach p $plist {
+        set accept 1
+        foreach n $numbers e $p {
+            if { $n == $e } {
+                set accept 0
+                break
+            }
+        }
+        if { $accept } {
+            lappend dlist $p
+        }
+    }
+    return $dlist
+}
+
+# list-combinations-deprecated --
+#     Generate a list of combinations - deprecated
+#
+# Arguments:
+#     n           Size of the set
+#     k           Number of elements per subset
+#
+# Returns:
+#     List of all combinations of the set {0 ... n}
+#
+# Note:
+#    This implementation is deprecated in cfavour of the Wiki implementation
+#
+proc ::math::combinatorics::list-combinations-deprecated {n k} {
+    if { $n < 1 } {
+        return -error "Size n of the set must be positive"
+    }
+    if { $k < 0 || $k > $n } {
+        return -error "Size k of the subsets must be positive and smaller/equal to n"
+    }
+
+    if { $n == 1 } {
+        if { $k == 0 } {
+            return [list]
+        } else {
+            return [list 0]
+        }
+    }
+
+    if { $k > 1 } {
+        set listperms [list-combinations-deprecated [expr {$n-1}] [expr {$k-1}]]
+
+        set newlist {}
+
+        set nm1 [expr {$n-1}]
+        foreach perm $listperms {
+           lappend newlist [concat $perm $nm1]
+        }
+        set newlist [concat $newlist [list-combinations-deprecated [expr {$n-1}] $k]]
+    } else {
+        set newlist {}
+        for {set i 0} {$i < $n} {incr i} {
+            lappend newlist [list $i]
+        }
+    }
+
+    return $newlist
+}
+
+# list-combinations --
+#     Generate a list of combinations
+#
+# Arguments:
+#     n           Size of the set
+#     k           Number of elements per subset
+#
+# Returns:
+#     List of all combinations of the set {0 ... n}
+#
+# Note:
+#      Copied from the WIki - the implementation is three times
+#      faster than the deprecated version
+#
+proc ::math::combinatorics::list-combinations {n k} {
+    set myList {}
+    for {set i 0} {$i < $n} {incr i} {
+        lappend myList $i
+    }
+
+    return [List-Combinations2 $myList $k]
+}
+
+# List-Combinations2 --
+#     Generate a list of combinations of a given list of elements
+#
+# Arguments:
+#     list        List of elements
+#     k           Number of elements per subset
+#
+# Returns:
+#     List of all combinations
+#
+proc ::math::combinatorics::List-Combinations2 {myList size {prefix {}}} {
+    #
+    # End recursion when size is 0 or equals our list size
+    #
+    if {$size == 0} {return [list $prefix]}
+    if {$size == [llength $myList]} {return [list [concat $prefix $myList]]}
+
+    set first [lindex $myList 0]
+    set rest [lrange $myList 1 end]
+
+    #
+    # Combine solutions w/ first element and solutions w/o first element
+    #
+    set ans1 [List-Combinations2 $rest [expr {$size-1}] [concat $prefix $first]]
+    set ans2 [List-Combinations2 $rest $size $prefix]
+    return [concat $ans1 $ans2]
+}
+
+# list-powerset --
+#     Generate a list representing the power set of {0 ... n}
+#
+# Arguments:
+#     n           Size of the set
+#
+# Returns:
+#     List of all subsets of the set {0 ... n}
+#
+proc ::math::combinatorics::list-powerset {n} {
+    set ret {{{}}}
+    for {set i 1} {$i <= $n} {incr i} {
+        lappend ret [list-combinations $n $i]
+    }
+    return [concat {*}$ret]
+}
+
+# permutationObj --
+#     Class for generating permutations one by one
+#
+::oo::class create ::math::combinatorics::permutationObj {
+    variable n
+    variable k
+    variable current
+    variable elements
+
+    # constructor --
+    #     Generate permutations of the set {0 .. n}
+    # Arguments:
+    #     n_in           Size of the set
+    #
+    constructor {n_in} {
+        variable n
+        variable k
+        variable current
+        variable start
+
+        if { $n_in < 1 } {
+            return -code error "Size of the set must be positive"
+        }
+
+        set n $n_in
+
+        set elements {}
+        for {set i 0} {$i < $n} {incr i} {
+            lappend elements $i
+        }
+
+        my reset
+    }
+
+    # method: reset --
+    #     Restart the object
+    #
+    # Arguments:
+    #     None
+    #
+    method reset {} {
+        variable current
+        variable start
+
+        set start   1
+        set current {}
+        for {set i 0} {$i < $n} {incr i} {
+            lappend current $i
+        }
+    }
+
+    # method: next
+    #     Return the next permutation
+    #
+    method next {} {
+        variable current
+        variable start
+
+        # Return the first permutation?
+        if { $start } {
+            set start 0
+            return $current
+        }
+
+        # Find the smallest subscript j such that we have already visited
+        # all permutations beginning with the first j elements.
+
+        set j [expr { [llength $current] - 1 }]
+        set ajp1 [lindex $current $j]
+        while { $j > 0 } {
+            incr j -1
+            set aj [lindex $current $j]
+            if { [string compare $ajp1 $aj] > 0 } {
+                set foundj {}
+                break
+            }
+            set ajp1 $aj
+        }
+        if { ![info exists foundj] } return
+
+        # Find the smallest element greater than the j'th among the elements
+        # following aj. Let its index be l, and interchange aj and al.
+
+        set l [expr { [llength $current] - 1 }]
+        while { $aj >= [set al [lindex $current $l]] } {
+            incr l -1
+        }
+        lset current $j $al
+        lset current $l $aj
+
+        # Reverse a_j+1 ... an
+
+        set k [expr {$j + 1}]
+        set l [expr { [llength $current] - 1 }]
+        while { $k < $l } {
+            set al [lindex $current $l]
+            lset current $l [lindex $current $k]
+            lset current $k $al
+            incr k
+            incr l -1
+        }
+
+        return $current
+    }
+
+    # method: setElements --
+    #     Register a list of elements to be permuted
+    #
+    # Arguments:
+    #     list           List of elements
+    #
+    method setElements {list} {
+        variable n
+        variable elements
+
+        if { [llength $list] != $n } {
+            return -code error "The number of elements should be $n"
+        }
+        set elements $list
+
+        # Implicit reset
+        my reset
+    }
+
+    #
+    # method: nextElements
+    #     Returns the next permutation of the given elements
+    #
+    # Arguments:
+    #    None
+    #
+    method nextElements {} {
+        variable elements
+
+        set permutation [my next]
+
+        set list {}
+
+        foreach idx $permutation {
+            lappend list [lindex $elements $idx]
+        }
+
+        return $list
+    }
+}
+
+# combinationObj --
+#     Class for generating combinations (k-subsets) one by one
+#
+::oo::class create ::math::combinatorics::combinationObj {
+    variable n
+    variable k
+    variable current
+    variable elements
+
+    # constructor --
+    #     Generate combinations of k elements out of the set {0 .. n}
+    # Arguments:
+    #     n_in           Size of the set
+    #     k_in           Size of the subsets
+    #
+    constructor {n_in k_in} {
+        variable n
+        variable k
+        variable current
+
+        if { $n_in < 1 || $k_in < 1 || $k_in > $n_in } {
+            return -code error "Sizes of the set and subset must be positive, subset may not be larger than the set"
+        }
+
+        set n $n_in
+        set k $k_in
+
+        set current {}
+
+        set elements {}
+        for {set i 0} {$i < $n} {incr i} {
+            lappend elements $i
+        }
+    }
+
+    # method: reset --
+    #     Restart the object
+    #
+    # Arguments:
+    #     None
+    #
+    method reset {} {
+        variable current
+
+        set current {}
+    }
+
+    #
+    # method: next --
+    #     Return the next combination
+    #
+    # Arguments:
+    #     None
+    #
+    method next {} {
+        variable n
+        variable k
+        variable current
+
+        if { [llength $current] == 0 } {
+            for {set i 1} {$i <= $k} {incr i} {
+                set c($i) $i
+            }
+        } else {
+            for {set i 1; set j 0} {$i <= $k} {incr i; incr j} {
+                set c($i) [lindex $current $j]
+            }
+            set ptr $k
+            while {$ptr > 0 && $c($ptr) == $n - $k + $ptr} {
+               incr ptr -1
+            }
+            if {$ptr == 0} {
+              return {}
+            }
+            incr c($ptr)
+            for {set i [expr {$ptr + 1}]} {$i <= $k} {incr i} {
+               set c($i) [expr $c([expr {$i - 1}]) + 1]
+            }
+        }
+        set cL      [list]
+        set current [list]
+        for {set i 1} {$i <= $k} {incr i} {
+               lappend cL      [expr {$c($i)-1}]
+               lappend current $c($i)
+        }
+        return $cL
+    }
+
+    # method: setElements --
+    #     Register a list of elements to be permuted and selected
+    #
+    # Arguments:
+    #     list           List of elements
+    #
+    method setElements {list} {
+        variable n
+        variable elements
+
+        if { [llength $list] != $n } {
+            return -code error "The number of elements should be $n"
+        }
+        set elements $list
+
+        # Implicit reset
+        my reset
+    }
+
+    #
+    # method: nextElements
+    #     Returns next k-subset of the given elements
+    #
+    # Arguments:
+    #    None
+    #
+    method nextElements {} {
+        variable elements
+
+        set combination [my next]
+
+        set list {}
+
+        foreach idx $combination {
+            lappend list [lindex $elements $idx]
+        }
+
+        return $list
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/constants.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/constants.tcl
new file mode 100644
index 00000000..79e6ea54
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/constants.tcl
@@ -0,0 +1,205 @@
+# constants.tcl --
+#    Module defining common mathematical and numerical constants
+#
+# Copyright (c) 2004 by Arjen Markus.  All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: constants.tcl,v 1.9 2011/01/18 07:49:53 arjenmarkus Exp $
+#
+#----------------------------------------------------------------------
+
+package require Tcl 8.2
+
+package provide math::constants 1.0.2
+
+# namespace constants
+#    Create a convenient namespace for the constants
+#
+namespace eval ::math::constants {
+    #
+    # List of constants and their description
+    #
+    variable constants {
+        pi        3.14159265358979323846   "ratio of circle circumference and diameter"
+        e         2.71828182845904523536   "base for natural logarithm"
+        ln10      2.30258509299404568402   "natural logarithm of 10"
+        phi       1.61803398874989484820   "golden ratio"
+        gamma     0.57721566490153286061   "Euler's constant"
+        sqrt2     1.41421356237309504880   "Square root of 2"
+        thirdrt2  1.25992104989487316477   "One-third power of 2"
+        sqrt3     1.73205080756887729533   "Square root of 3"
+        radtodeg  57.2957795131            "Conversion from radians to degrees"
+        degtorad  0.017453292519943        "Conversion from degrees to radians"
+        onethird  1.0/3.0                  "One third (0.3333....)"
+        twothirds 2.0/3.0                  "Two thirds (0.6666....)"
+        onesixth  1.0/6.0                  "One sixth (0.1666....)"
+        huge      [find_huge]              "(Approximately) largest number"
+        tiny      [find_tiny]              "(Approximately) smallest number not equal zero"
+        eps       [find_eps]               "Smallest number such that 1+eps != 1"
+    }
+    namespace export constants print-constants
+}
+
+# constants --
+#    Expose the constants in the caller's routine or namespace
+#
+# Arguments:
+#    args         List of constants to be exposed
+# Result:
+#    None
+#
+proc ::math::constants::constants {args} {
+
+    foreach const $args {
+        uplevel 1 [list variable $const [set ::math::constants::$const]]
+    }
+}
+
+# print-constants --
+#    Print the selected or all constants to the screen
+#
+# Arguments:
+#    args         List of constants to be exposed
+# Result:
+#    None
+#
+proc ::math::constants::print-constants {args} {
+    variable constants
+
+    if { [llength $args] != 0 } {
+        foreach const $args {
+            set idx [lsearch $constants $const]
+            if { $idx >= 0 } {
+                set descr [lindex $constants [expr {$idx+2}]]
+                puts "$const = [set ::math::constants::$const] = $descr"
+            } else {
+                puts "*** $const unknown ***"
+            }
+        }
+    } else {
+        foreach {const value descr} $constants {
+            puts "$const = [set ::math::constants::$const] = $descr"
+        }
+    }
+}
+
+# find_huge --
+#    Find the largest possible number
+#
+# Arguments:
+#    None
+# Result:
+#    Estimate of the largest possible number
+#
+proc ::math::constants::find_huge {} {
+
+    set result 1.0
+    set Inf Inf
+    while {1} {
+	if {[catch {expr {2.0 * $result}} result]} {
+	    break
+	}
+	if { $result == $Inf } {
+	    break
+	}
+	set prev_result $result
+    }
+    set result $prev_result
+    set adder [expr { $result / 2. }]
+    while { $adder != 0.0 } {
+	if {![catch {expr {$adder + $prev_result}} result]} {
+	    if { $result == $prev_result } break
+	    if { $result != $Inf } {
+		set prev_result $result
+	    }
+	}
+	set adder [expr { $adder / 2. }]
+    }
+    return $prev_result
+
+}
+
+# find_tiny --
+#    Find the smallest possible number
+#
+# Arguments:
+#    None
+# Result:
+#    Estimate of the smallest possible number
+#
+proc ::math::constants::find_tiny {} {
+
+    set result 1.0
+
+    while { ! [catch {set result [expr {$result/2.0}]}] && $result > 0.0 } {
+        set prev_result $result
+    }
+    return $prev_result
+}
+
+# find_eps --
+#    Find the smallest number eps such that 1+eps != 1
+#
+# Arguments:
+#    None
+# Result:
+#    Estimate of the machine epsilon
+#
+proc ::math::constants::find_eps { } {
+    set eps 1.0
+    while { [expr {1.0+$eps}] != 1.0 } {
+        set prev_eps $eps
+        set eps  [expr {0.5*$eps}]
+    }
+    return $prev_eps
+}
+
+# Create the variables from the list:
+# - By using expr we ensure that the best double precision
+#   approximation is assigned to the variable, rather than
+#   just the string
+# - It also allows us to rely on IEEE arithmetic if available,
+#   so that for instance 3.0*(1.0/3.0) is exactly 1.0
+#
+namespace eval ::math::constants {
+    foreach {const value descr} $constants {
+        # FRINK: nocheck
+        set [namespace current]::$const [expr 0.0+$value]
+    }
+    unset value
+    unset const
+    unset descr
+
+    rename find_eps  {}
+    rename find_tiny {}
+    rename find_huge {}
+}
+
+# some tests --
+#
+if { [info exists ::argv0]
+     && [string equal $::argv0 [info script]] } {
+    ::math::constants::constants pi e ln10 onethird eps
+    set prec $::tcl_precision
+    if {![package vsatisfies [package provide Tcl] 8.5]} {
+        set ::tcl_precision 17
+    } else {
+        set ::tcl_precision 0
+    }
+    puts "$pi - [expr {1.0/$pi}]"
+    puts $e
+    puts $ln10
+    puts "onethird: [expr {3.0*$onethird}]"
+    ::math::constants::print-constants onethird pi e
+    puts "All defined constants:"
+    ::math::constants::print-constants
+
+    if { 1.0+$eps == 1.0 } {
+        puts "Something went wrong with eps!"
+    } else {
+        puts "Difference: [set ee [expr {1.0+$eps}]] - 1.0 = [expr {$ee-1.0}]"
+    }
+    set ::tcl_precision $prec
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/decimal.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/decimal.tcl
new file mode 100644
index 00000000..43116c90
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/decimal.tcl
@@ -0,0 +1,1742 @@
+package require Tcl 8.5
+package provide math::decimal 1.0.4
+#
+# Copyright 2011, 2013 Mark Alston. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+#
+#   1. Redistributions of source code must retain the above copyright
+#      notice, this list of conditions and the following disclaimer.
+#
+#   2. Redistributions in binary form must reproduce the above copyright
+#      notice, this list of conditions and the following disclaimer in
+#      the documentation and/or other materials provided with the distribution.
+#
+#   THIS SOFTWARE IS PROVIDED BY Mark Alston ``AS IS'' AND ANY EXPRESS
+#   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+#   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#   ARE DISCLAIMED. IN NO EVENT SHALL Mark Alston OR CONTRIBUTORS
+#   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+#   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+#   EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#
+# decimal.tcl --
+#
+#     Tcl implementation of a General Decimal Arithmetic as defined
+#     by the IEEE 754 standard as given on http:://speleotrove.com/decimal
+#
+#     Decimal numbers are defined as a list of sign mantissa exponent
+#
+#     The following operations are current implemented:
+#
+#       fromstr tostr  -- for converting to and from decimal numbers.
+#
+#       add subtract divide multiply abs compare  -- basic operations
+#       max min plus minus copynegate copysign is-zero is-signed
+#       is-NaN is-infinite is-finite
+#
+#       round_half_even round_half_up round_half_down   -- rounding methods
+#       round_down round_up round_floor round_ceiling
+#       round_05up
+#
+#     By setting the extended variable to 0 you get the behavior of the decimal
+#     subset arithmetic X3.274 as defined on
+#     http://speleotrove.com/decimal/dax3274.html#x3274
+#
+#     This package passes all tests in test suites:
+#           http://speleotrove.com/decimal/dectest.html
+#      and  http://speleotrove.com/decimal/dectest0.html
+#
+#      with the following exceptions:
+#
+#     This version fails some tests that require setting the max
+#     or min exponent to force truncation or rounding.
+#
+#     This version fails some tests which require the sign of zero to be set
+#     correctly during rounding
+#
+#     This version cannot handle sNaN's (Not sure that they are of any use for
+#     tcl programmers anyway.
+#
+#     If you find errors in this code please let me know at
+#         mark at beernut dot com
+#
+# Decimal --
+#     Namespace for the decimal arithmetic procedures
+#
+namespace eval ::math::decimal {
+    variable precision 20
+    variable maxExponent 999
+    variable minExponent -998
+    variable tinyExponent [expr {$minExponent - ($precision - 1)}]
+    variable rounding half_up
+    variable extended 1
+
+    # Some useful variables to set.
+    variable zero [list 0 0 0]
+    variable one [list 0 1 0]
+    variable ten [list 0 1 1]
+    variable onehundred [list 0 1 2]
+    variable minusone [list 1 1 0]
+
+    namespace export tostr fromstr setVariable getVariable\
+	             add + subtract - divide / multiply * \
+                     divide-int  remainder \
+                     fma fused-multiply-add \
+                     plus minus copynegate negate copysign \
+                     abs compare max min \
+                     is-zero is-signed is-NaN is-infinite is-finite \
+                     round_half_even round_half_up round_half_down \
+                     round_down round_up round_floor round_ceiling round_05up
+
+}
+
+# setVariable
+#     Set the desired variable
+#
+# Arguments:
+#     variable setting
+#
+# Result:
+#     None
+#
+proc ::math::decimal::setVariable {variable setting} {
+    variable rounding
+    variable precision
+    variable extended
+    variable maxExponent
+    variable minExponent
+    variable tinyExponent
+
+    switch -nocase -- $variable {
+	rounding {set rounding $setting}
+	precision {set precision $setting}
+	extended {set extended $setting}
+	maxExponent {set maxExponent $setting}
+	minExponent {
+	    set minExponent $setting
+	    set tinyExponent [expr {$minExponent - ($precision - 1)}]
+	}
+	default {}
+    }
+}
+
+# setVariable
+#     Set the desired variable
+#
+# Arguments:
+#     variable setting
+#
+# Result:
+#     None
+#
+proc ::math::decimal::getVariable {variable} {
+    variable rounding
+    variable precision
+    variable extended
+    variable maxExponent
+    variable minExponent
+
+    switch -- $variable {
+	rounding {return $rounding}
+	precision {return $precision}
+	extended {return $extended}
+	maxExponent {return $maxExponent}
+	minExponent {return $minExponent}
+	default {}
+    }
+}
+
+# add or +
+#     Add two numbers
+#
+# Arguments:
+#     a          First operand
+#     b          Second operand
+#
+# Result:
+#     Sum of both (rescaled)
+#
+proc ::math::decimal::add {a b {rescale 1}} {
+    return [+ $a $b $rescale]
+}
+
+proc ::math::decimal::+ {a b {rescale 1}} {
+    variable extended
+    variable rounding
+    foreach {sa ma ea} $a {break}
+    foreach {sb mb eb} $b {break}
+
+    if {!$extended} {
+	if {$ma == 0 } {
+	    return $b
+	}
+	if {$mb == 0 } {
+	    return $a
+	}
+    }
+
+    if { $ma eq "NaN" || $mb eq "NaN" } {
+	return [list 0 "NaN" 0]
+    }
+
+    if { $ma eq "Inf" || $mb eq "Inf" } {
+	if { $ma ne "Inf" } {
+	    return $b
+	} elseif { $mb ne "Inf" } {
+	    return $a
+	} elseif { $sb != $sa } {
+	    return [list 0 "NaN" 0]
+	} else {
+	    return $a
+	}
+    }
+
+    if { $ea > $eb } {
+        set ma [expr {$ma * 10 ** ($ea-$eb)}]
+        set er $eb
+    } else {
+        set mb [expr {$mb * 10 ** ($eb-$ea)}]
+        set er $ea
+    }
+    if { $sa == $sb } {
+	# Both are either positive or negative
+	# Sign remains the same.
+	set mr [expr {$ma + $mb}]
+	set sr $sa
+    } else {
+	# one is negative and one is positive.
+	# Set sign to the same as the larger number
+	# and subract the smaller from the larger.
+	if { $ma > $mb } {
+	    set sr $sa
+	    set mr [expr {$ma - $mb}]
+	} elseif { $mb > $ma } {
+	    set sr $sb
+	    set mr [expr {$mb - $ma}]
+	} else {
+	    if { $rounding == "floor" } {
+		set sr 1
+	    } else {
+		set sr 0
+	    }
+	    set mr 0
+	}
+    }
+    if { $rescale } {
+	return [Rescale [list $sr $mr $er]]
+    } else {
+	return [list $sr $mr $er]
+    }
+}
+
+# copynegate --
+#     Takes one operand and returns a copy with the sign inverted.
+#     In this implementation it works nearly the same as minus
+#     but is probably much faster. The main difference is that no
+#     rescaling is done.
+#
+#
+# Arguments:
+#     a          operand
+#
+# Result:
+#     a with sign flipped
+#
+proc ::math::decimal::negate { a } {
+    return [copynegate $a]
+}
+
+proc ::math::decimal::copynegate { a } {
+    lset a 0 [expr {![lindex $a 0]}]
+    return $a
+}
+
+# copysign --
+#     Takes two operands and returns a copy of the first with the
+#     sign set to the sign of the second.
+#
+#
+# Arguments:
+#     a          operand
+#     b          operand
+#
+# Result:
+#     b with a's sign
+#
+proc ::math::decimal::copysign { a b } {
+    lset a 0 [lindex $b 0]
+    return $a
+}
+
+# minus --
+#     subtract 0 $a
+#
+#     Note: does not pass all tests on extended mode.
+#
+# Arguments:
+#     a          operand
+#
+# Result:
+#     0 - $a
+#
+proc ::math::decimal::minus { a } {
+    return [- [list 0 0 0] $a]
+}
+
+# plus --
+#     add 0 $a
+#
+#    Note: does not pass all tests on extended mode.
+#
+# Arguments:
+#     a          operand
+#
+# Result:
+#     0 + $a
+#
+proc ::math::decimal::plus {a} {
+    return [+ [list 0 0 0] $a]
+}
+
+
+
+# subtract or -
+#     Subtract two numbers (or unary minus)
+#
+# Arguments:
+#     a          First operand
+#     b          Second operand (optional)
+#
+# Result:
+#     Sum of both (rescaled)
+#
+proc ::math::decimal::subtract {a {b {}} {rescale 1}} {
+    return [- $a $b]
+}
+
+proc ::math::decimal::- {a {b {}} {rescale 1}} {
+    variable extended
+
+    if {!$extended} {
+	foreach {sa ma ea} $a {break}
+	foreach {sb mb eb} $b {break}
+	if {$ma == 0 } {
+	    lset b 0 [expr {![lindex $b 0]}]
+	    return $b
+	}
+	if {$mb == 0 } {
+	    return $a
+	}
+    }
+
+    if { $b == {} } {
+        lset a 0 [expr {![lindex $a 0]}]
+        return $a
+    } else {
+        lset b 0 [expr {![lindex $b 0]}]
+        return [+ $a $b $rescale]
+    }
+}
+
+
+# compare
+#     Compare two numbers.
+#
+# Arguments:
+#     a          First operand
+#     b          Second operand
+#
+# Result:
+#     1 if a is larger than b
+#     0 if a is equal to b
+#    -1 if a is smaller than b.
+#
+proc ::math::decimal::compare {a b} {
+    foreach {sa ma ea} $a {break}
+    foreach {sb mb eb} $b {break}
+
+    if { $sa != $sb } {
+	if {$ma != 0 } {
+	    set ma 1
+	    set ea 0
+	} elseif { $mb != 0 } {
+	    set mb 1
+	    set eb 0
+	} else {
+	    return 0
+	}
+    }
+    if { $ma eq "Inf" && $mb eq "Inf" } {
+	if { $sa == $sb } {
+	    return 0
+	} elseif { $sa > $sb } {
+	    return -1
+	} else {
+	    return 1
+	}
+    }
+
+    set comparison [- [list $sa $ma $ea] [list $sb $mb $eb] 0]
+
+    if { [lindex $comparison 0] && [lindex $comparison 1] != 0 } {
+	return -1
+    } elseif { [lindex $comparison 1] == 0 } {
+	return 0
+    } else {
+	return 1
+    }
+}
+
+# min
+#     Return the smaller of two numbers
+#
+# Arguments:
+#     a          First operand
+#     b          Second operand
+#
+# Result:
+#     smaller of a or b
+#
+proc ::math::decimal::min {a b} {
+    foreach {sa ma ea} $a {break}
+    foreach {sb mb eb} $b {break}
+
+    if { $sa != $sb } {
+	if {$ma != 0 } {
+	    set ma 1
+	    set ea 0
+	} elseif { $mb != 0 } {
+	    set mb 1
+	    set eb 0
+	}
+    }
+    if { $ma eq "Inf" && $mb eq "Inf" } {
+	if { $sa == $sb } {
+	    return [list $sa "Inf" 0]
+	} else {
+	    return [list 1 "Inf" 0]
+	}
+    }
+
+    set comparison [compare [list $sa $ma $ea] [list $sb $mb $eb]]
+
+    if { $comparison == 1 } {
+	return [Rescale $b]
+    } elseif { $comparison == -1 } {
+	return [Rescale $a]
+    } elseif { $sb != $sa } {
+	if { $sa } {
+	    return [Rescale $a]
+	} else {
+	    return [Rescale $b]
+	}
+    } elseif { $sb && $eb > $ea } {
+	# Both are negative and the same numerically. So return the one with the largest exponent.
+	return [Rescale $b]
+    } elseif { $sb }  {
+	# Negative with $eb < $ea now.
+	return [Rescale $a]
+    } elseif { $ea > $eb } {
+	# Both are positive so return the one with the smaller
+	return [Rescale $b]
+    } else {
+	return [Rescale $a]
+    }
+}
+
+# max
+#     Return the larger of two numbers
+#
+# Arguments:
+#     a          First operand
+#     b          Second operand
+#
+# Result:
+#     larger of a or b
+#
+proc ::math::decimal::max {a b} {
+    foreach {sa ma ea} $a {break}
+    foreach {sb mb eb} $b {break}
+
+    if { $sa != $sb } {
+	if {$ma != 0 } {
+	    set ma 1
+	    set ea 0
+	} elseif { $mb != 0 } {
+	    set mb 1
+	    set eb 0
+	}
+    }
+    if { $ma eq "Inf" && $mb eq "Inf" } {
+	if { $sa == $sb } {
+	    return [list $sa "Inf" 0]
+	} else {
+	    return [list 0 "Inf" 0]
+	}
+    }
+
+    set comparison [compare [list $sa $ma $ea] [list $sb $mb $eb]]
+
+    if { $comparison == 1 } {
+	return [Rescale $a]
+    } elseif { $comparison == -1 } {
+	return [Rescale $b]
+    } elseif { $sb != $sa } {
+	if { $sa } {
+	    return [Rescale $b]
+	} else {
+	    return [Rescale $a]
+	}
+    } elseif { $sb && $eb > $ea } {
+	# Both are negative and the same numerically. So return the one with the smallest exponent.
+	return [Rescale $a]
+    } elseif { $sb }  {
+	# Negative with $eb < $ea now.
+	return [Rescale $b]
+    } elseif { $ea > $eb } {
+	# Both are positive so return the one with the larger exponent
+	return [Rescale $a]
+    } else {
+	return [Rescale $b]
+    }
+}
+
+# maxmag -- max-magnitude
+#     Return the larger of two numbers ignoring their signs.
+#
+# Arguments:
+#     a          First operand
+#     b          Second operand
+#
+# Result:
+#     larger of a or b ignoring their signs.
+#
+proc ::math::decimal::maxmag {a b} {
+    foreach {sa ma ea} $a {break}
+    foreach {sb mb eb} $b {break}
+
+
+    if { $ma eq "Inf" && $mb eq "Inf" } {
+	if { $sa == 0 || $sb == 0 } {
+	    return [list 0 "Inf" 0]
+	} else {
+	    return [list 1 "Inf" 0]
+	}
+    }
+
+    set comparison [compare [list 0 $ma $ea] [list 0 $mb $eb]]
+
+    if { $comparison == 1 } {
+	return [Rescale $a]
+    } elseif { $comparison == -1 } {
+	return [Rescale $b]
+    } elseif { $sb != $sa } {
+	if { $sa } {
+	    return [Rescale $b]
+	} else {
+	    return [Rescale $a]
+	}
+    } elseif { $sb && $eb > $ea } {
+	# Both are negative and the same numerically. So return the one with the smallest exponent.
+	return [Rescale $a]
+    } elseif { $sb }  {
+	# Negative with $eb < $ea now.
+	return [Rescale $b]
+    } elseif { $ea > $eb } {
+	# Both are positive so return the one with the larger exponent
+	return [Rescale $a]
+    } else {
+	return [Rescale $b]
+    }
+}
+
+# minmag -- min-magnitude
+#     Return the smaller of two numbers ignoring their signs.
+#
+# Arguments:
+#     a          First operand
+#     b          Second operand
+#
+# Result:
+#     smaller  of a or b ignoring their signs.
+#
+proc ::math::decimal::minmag {a b} {
+    foreach {sa ma ea} $a {break}
+    foreach {sb mb eb} $b {break}
+
+    if { $ma eq "Inf" && $mb eq "Inf" } {
+	if { $sa == 1 || $sb == 1 } {
+	    return [list 1 "Inf" 0]
+	} else {
+	    return [list 0 "Inf" 0]
+	}
+    }
+
+    set comparison [compare [list 0 $ma $ea] [list 0 $mb $eb]]
+
+    if { $comparison == 1 } {
+	return [Rescale $b]
+    } elseif { $comparison == -1 } {
+	return [Rescale $a]
+    } else {
+	# They compared the same so now we use a normal comparison including the signs. This is per the specs.
+	if { $sa > $sb } {
+	    return [Rescale $a]
+	} elseif { $sb > $sa } {
+	    return [Rescale $b]
+	} elseif { $sb && $eb > $ea } {
+	    # Both are negative and the same numerically. So return the one with the largest exponent.
+	    return [Rescale $b]
+	} elseif { $sb }  {
+	    # Negative with $eb < $ea now.
+	    return [Rescale $a]
+	} elseif { $ea > $eb } {
+	    return [Rescale $b]
+	} else {
+	    return [Rescale $a]
+	}
+    }
+}
+
+# fma - fused-multiply-add
+#     Takes three operands. Multiplies the first two and then adds the third.
+#     Only one rounding (Rescaling) takes place at the end instead of after
+#     both the multiplication and again after the addition.
+#
+# Arguments:
+#     a          First operand
+#     b          Second operand
+#     c          Third operand
+#
+# Result:
+#     (a*b)+c
+#
+proc ::math::decimal::fused-multiply-add {a b c} {
+    return [fma $a $b $c]
+}
+
+proc ::math::decimal::fma {a b c} {
+    return [+ $c [* $a $b 0]]
+}
+
+# multiply or *
+#     Multiply two numbers
+#
+# Arguments:
+#     a          First operand
+#     b          Second operand
+#
+# Result:
+#     Product of both (rescaled)
+#
+proc ::math::decimal::multiply {a b {rescale 1}} {
+    return [* $a $b $rescale]
+}
+
+proc ::math::decimal::* {a b {rescale 1}} {
+    foreach {sa ma ea} $a {break}
+    foreach {sb mb eb} $b {break}
+
+    if { $ma eq "NaN" || $mb eq "NaN" } {
+	return [list 0 "NaN" 0]
+    }
+
+    set sr [expr {$sa^$sb}]
+
+    if { $ma eq "Inf" || $mb eq "Inf" } {
+	if { $ma == 0 || $mb == 0 } {
+	    return [list 0 "NaN" 0]
+	} else {
+	    return [list $sr "Inf" 0]
+	}
+    }
+
+    set mr [expr {$ma * $mb}]
+    set er [expr {$ea + $eb}]
+
+
+    if { $rescale } {
+	return [Rescale [list $sr $mr $er]]
+    } else {
+	return [list $sr $mr $er]
+    }
+}
+
+# divide or /
+#     Divide two numbers
+#
+# Arguments:
+#     a          First operand
+#     b          Second operand
+#
+# Result:
+#     Quotient of both (rescaled)
+#
+proc ::math::decimal::divide {a b {rescale 1}} {
+    return [/ $a $b]
+}
+
+proc ::math::decimal::/ {a b {rescale 1}} {
+    variable precision
+
+    foreach {sa ma ea} $a {break}
+    foreach {sb mb eb} $b {break}
+
+    if { $ma eq "NaN" || $mb eq "NaN" } {
+	return [list 0 "NaN" 0]
+    }
+
+    set sr [expr {$sa^$sb}]
+
+    if { $ma eq "Inf" } {
+	if { $mb ne "Inf"} {
+	    return [list $sr "Inf" 0]
+	} else {
+	    return [list 0 "NaN" 0]
+	}
+    }
+
+    if { $mb eq "Inf" } {
+	if { $ma ne "Inf"} {
+	    return [list $sr 0 0]
+	} else {
+	    return [list 0 "NaN" 0]
+	}
+    }
+
+    if { $mb == 0 } {
+	if { $ma == 0 } {
+	    return [list 0 "NaN" 0]
+	} else {
+	    return [list $sr "Inf" 0]
+	}
+    }
+    set adjust 0
+    set mr 0
+
+
+    if { $ma == 0 } {
+	set er [expr {$ea - $eb}]
+	return [list $sr 0 $er]
+    }
+    if { $ma < $mb } {
+	while { $ma < $mb } {
+	    set ma [expr {$ma * 10}]
+	    incr adjust
+	}
+    } elseif { $ma >= $mb * 10 } {
+	while { $ma >= [expr {$mb * 10}] } {
+	    set mb [expr {$mb * 10}]
+	    incr adjust -1
+	}
+    }
+
+    while { 1 } {
+	while { $mb <= $ma } {
+	    set ma [expr {$ma - $mb}]
+	    incr mr
+	}
+	if { ( $ma == 0 && $adjust >= 0 ) || [string length $mr] > $precision + 1 } {
+	    break
+	} else {
+	    set ma [expr {$ma * 10}]
+	    set mr [expr {$mr * 10}]
+	    incr adjust
+	}
+    }
+
+    set er [expr {$ea - ($eb + $adjust)}]
+
+    if { $rescale } {
+	return [Rescale [list $sr $mr $er]]
+    } else {
+	return [list $sr $mr $er]
+    }
+}
+
+# divideint -- Divide integer
+#     Divide a by b and return the integer part of the division.
+#
+#  Basically, if we send a and b to the divideint (which returns i)
+#  and remainder function (which returns r) then the following is true:
+#      a = i*b + r
+#
+# Arguments:
+#     a          First operand
+#     b          Second operand
+#
+#
+proc ::math::decimal::divideint { a b } {
+    foreach {sa ma ea} $a {break}
+    foreach {sb mb eb} $b {break}
+    set sr [expr {$sa^$sb}]
+
+
+
+    if { $sr == 1 } {
+	set sign_string "-"
+    } else {
+	set sign_string ""
+    }
+
+    if { ($ma eq "NaN" || $mb eq "NaN") || ($ma == 0 && $mb == 0 ) } {
+	return "NaN"
+    }
+
+    if { $ma eq "Inf" || $mb eq "Inf" } {
+	if { $ma eq $mb } {
+	    return "NaN"
+	} elseif { $mb eq "Inf" } {
+	    return "${sign_string}0"
+	} else {
+	    return "${sign_string}Inf"
+	}
+    }
+
+    if { $mb == 0 } {
+	return "${sign_string}Inf"
+    }
+    if { $mb == "Inf" } {
+	return "${sign_string}0"
+    }
+    set adjust [expr {abs($ea - $eb)}]
+    if { $ea < $eb } {
+	set a_adjust 0
+	set b_adjust $adjust
+    } elseif { $ea > $eb } {
+	set b_adjust 0
+	set a_adjust $adjust
+    } else {
+	set a_adjust 0
+	set b_adjust 0
+    }
+
+    set integer [expr {($ma*10**$a_adjust)/($mb*10**$b_adjust)}]
+    return $sign_string$integer
+}
+
+# remainder -- Remainder from integer division.
+#     Divide a by b and return the remainder part of the division.
+#
+#  Basically, if we send a and b to the divideint (which returns i)
+#  and remainder function (which returns r) then the following is true:
+#      a = i*b + r
+#
+# Arguments:
+#     a          First operand
+#     b          Second operand
+#
+#
+proc ::math::decimal::remainder { a b } {
+    foreach {sa ma ea} $a {break}
+    foreach {sb mb eb} $b {break}
+
+    if { $sa == 1 } {
+	set sign_string "-"
+    } else {
+	set sign_string ""
+    }
+
+    if { ($ma eq "NaN" || $mb eq "NaN") || ($ma == 0 && $mb == 0 ) } {
+	if { $mb eq "NaN" && $mb ne $ma } {
+	    if { $sb == 1 } {
+		set sign_string "-"
+	    } else {
+		set sign_string ""
+	    }
+	    return "${sign_string}NaN"
+	} elseif { $ma eq "NaN" } {
+	    return "${sign_string}NaN"
+	} else {
+	    return "NaN"
+	}
+    } elseif { $mb == 0 } {
+	return "NaN"
+    }
+
+    if { $ma eq "Inf" || $mb eq "Inf" } {
+	if { $ma eq $mb } {
+	    return "NaN"
+	} elseif { $mb eq "Inf" } {
+	    return [tostr $a]
+	} else {
+	    return "NaN"
+	}
+    }
+
+    if { $mb == 0 } {
+	return "${sign_string}Inf"
+    }
+    if { $mb == "Inf" } {
+	return "${sign_string}0"
+    }
+
+    lset a 0 0
+    lset b 0 0
+    if { $mb == 0 } {
+	return "${sign_string}Inf"
+    }
+    if { $mb == "Inf" } {
+	return "${sign_string}0"
+    }
+
+    set adjust [expr {abs($ea - $eb)}]
+    if { $ea < $eb } {
+	set a_adjust 0
+	set b_adjust $adjust
+    } elseif { $ea > $eb } {
+	set b_adjust 0
+	set a_adjust $adjust
+    } else {
+	set a_adjust 0
+	set b_adjust 0
+    }
+
+    set integer [expr {($ma*10**$a_adjust)/($mb*10**$b_adjust)}]
+
+    set remainder [tostr [- $a [* [fromstr $integer] $b 0]]]
+    return $sign_string$remainder
+}
+
+
+# abs --
+#     Returns the Absolute Value of a number
+#
+# Arguments:
+#     Number in the form of {sign mantisse exponent}
+#
+# Result:
+#     Absolute value (as a list)
+#
+ proc ::math::decimal::abs {a} {
+     lset a 0 0
+     return [Rescale $a]
+ }
+
+
+# Rescale --
+#     Rescale the number (using proper rounding)
+#
+# Arguments:
+#     a Number in decimal format
+#
+# Result:
+#     Rescaled number
+#
+proc ::math::decimal::Rescale { a } {
+
+
+
+    variable precision
+    variable rounding
+    variable maxExponent
+    variable minExponent
+    variable tinyExponent
+
+    foreach {sign mantisse exponent} $a {break}
+
+    set man_length [string length $mantisse]
+
+    set adjusted_exponent [expr {$exponent + ($man_length -1)}]
+
+    if { $adjusted_exponent < $tinyExponent } {
+	set mantisse [lindex [round_$rounding [list $sign $mantisse [expr {abs($tinyExponent) - abs($adjusted_exponent)}]] 0] 1]
+	return [list $sign $mantisse $tinyExponent]
+    } elseif { $adjusted_exponent > $maxExponent } {
+	if { $mantisse  == 0 } {
+	    return [list $sign 0 $maxExponent]
+	} else {
+	    switch -- $rounding {
+		half_even -
+		half_up { return [list $sign "Inf" 0] }
+		down -
+		05up {
+		    return [list $sign [string repeat 9 $precision] $maxExponent]
+		}
+		ceiling {
+		    if { $sign } {
+			return [list $sign [string repeat 9 $precision] $maxExponent]
+		    } else {
+			return [list 0 "Inf" 0]
+		    }
+		}
+		floor {
+		    if { !$sign } {
+			return [list $sign [string repeat 9 $precision] $maxExponent]
+		    } else {
+			return [list 1 "Inf" 0]
+		    }
+		}
+		default { }
+	    }
+	}
+    }
+
+    if { $man_length <= $precision } {
+        return [list $sign $mantisse $exponent]
+    }
+
+    set  mantisse [lindex [round_$rounding [list $sign $mantisse [expr {$precision - $man_length}]] 0] 1]
+    set exponent [expr {$exponent + ($man_length - $precision)}]
+
+    # it is possible now that our rounding gave us a new digit in our mantisse
+    # example rounding 999.9 to 1 digits  with precision 3 will give us
+    # 1000 back.
+    # This can only happen by adding a zero on the end of our mantisse however.
+    # So we just chomp it off.
+
+    set man_length_now [string length $mantisse]
+    if { $man_length_now > $precision } {
+	set mantisse [string range $mantisse 0 end-1]
+	incr exponent
+	# Check again to see if we have overflowed
+        # we change our test to >= because we have incremented exponent.
+	if { $adjusted_exponent >= $maxExponent } {
+	    switch -- $rounding {
+		half_even -
+		half_up { return [list $sign "Inf" 0] }
+		down -
+		05up {
+		    return [list $sign [string repeat 9 $precision] $maxExponent]
+		}
+		ceiling {
+		    if { $sign } {
+			return [list $sign [string repeat 9 $precision] $maxExponent]
+		    } else {
+			return [list 0 "Inf" 0]
+		    }
+		}
+		floor {
+		    if { !$sign } {
+			return [list $sign [string repeat 9 $precision] $maxExponent]
+		    } else {
+			return [list 1 "Inf" 0]
+		    }
+		}
+		default { }
+	    }
+	}
+    }
+    return [list $sign $mantisse $exponent]
+}
+
+# tostr --
+#     Convert number to string using appropriate method depending on extended
+#     attribute setting.
+#
+# Arguments:
+#     number     Number to be converted
+#
+# Result:
+#     Number in the form of a string
+#
+proc ::math::decimal::tostr { number } {
+    variable extended
+    switch -- $extended {
+	0 { return [tostr_numeric $number] }
+	1 { return [tostr_scientific $number] }
+    }
+}
+
+# tostr_scientific --
+#     Convert number to string using scientific notation as called for in
+#     Decmath specifications.
+#
+# Arguments:
+#     number     Number to be converted
+#
+# Result:
+#     Number in the form of a string
+#
+proc ::math::decimal::tostr_scientific {number} {
+    foreach {sign mantisse exponent} $number {break}
+
+    if { $sign } {
+	set sign_string "-"
+    } else {
+	set sign_string ""
+    }
+
+    if { $mantisse eq "NaN" } {
+	return "NaN"
+    }
+    if { $mantisse eq "Inf" } {
+	return ${sign_string}${mantisse}
+    }
+
+
+    set digits [string length $mantisse]
+    set adjusted_exponent [expr {$exponent + $digits - 1}]
+
+    # Why -6? Go read the specs on the website mentioned in the header.
+    # They choose it, I'm using it. They actually list some good reasons though.
+    if { $exponent <= 0 && $adjusted_exponent >= -6 } {
+	if { $exponent == 0 } {
+	    set string $mantisse
+	} else {
+	    set exponent [expr {abs($exponent)}]
+	    if { $digits > $exponent } {
+		set string [string range $mantisse 0 [expr {$digits-$exponent-1}]].[string range $mantisse [expr {$digits-$exponent}] end]
+		set exponent [expr {-$exponent}]
+	    } else {
+		set string 0.[string repeat 0 [expr {$exponent-$digits}]]$mantisse
+	    }
+	}
+    } elseif { $exponent <= 0 && $adjusted_exponent < -6 } {
+	if { $digits > 1 } {
+
+	    set string [string range $mantisse 0 0].[string range $mantisse 1 end]
+
+	    set exponent [expr {$exponent + $digits - 1}]
+	    set string "${string}E${exponent}"
+	}  else {
+	    set string "${mantisse}E${exponent}"
+	}
+    } else {
+	if { $adjusted_exponent >= 0 } {
+	    set adjusted_exponent "+$adjusted_exponent"
+	}
+	if { $digits > 1 } {
+	    set string "[string range $mantisse 0 0].[string range $mantisse 1 end]E$adjusted_exponent"
+	} else {
+	    set string "${mantisse}E$adjusted_exponent"
+	}
+    }
+    return $sign_string$string
+}
+
+# tostr_numeric --
+#     Convert number to string using the simplified number set conversion
+#     from the X3.274 subset of Decimal Arithmetic specifications.
+#
+# Arguments:
+#     number     Number to be converted
+#
+# Result:
+#     Number in the form of a string
+#
+proc ::math::decimal::tostr_numeric {number} {
+    variable precision
+    foreach {sign mantisse exponent} $number {break}
+
+    if { $sign } {
+	set sign_string "-"
+    } else {
+	set sign_string ""
+    }
+
+    if { $mantisse eq "NaN" } {
+	return "NaN"
+    }
+    if { $mantisse eq "Inf" } {
+	return ${sign_string}${mantisse}
+    }
+
+    set digits [string length $mantisse]
+    set adjusted_exponent [expr {$exponent + $digits - 1}]
+
+    if { $mantisse == 0 } {
+	set string 0
+	set sign_string ""
+    } elseif { $exponent <= 0 && $adjusted_exponent >= -6 } {
+	if { $exponent == 0 } {
+	    set string $mantisse
+	} else {
+	    set exponent [expr {abs($exponent)}]
+	    if { $digits > $exponent } {
+		set string [string range $mantisse 0 [expr {$digits-$exponent-1}]]
+		set decimal_part [string range $mantisse [expr {$digits-$exponent}] end]
+		set string ${string}.${decimal_part}
+		set exponent [expr {-$exponent}]
+	    } else {
+		set string 0.[string repeat 0 [expr {$exponent-$digits}]]$mantisse
+	    }
+	}
+    } elseif { $exponent <= 0 && $adjusted_exponent < -6 } {
+	if { $digits > 1 } {
+	    set string [string range $mantisse 0 0].[string range $mantisse 1 end]
+	    set exponent [expr {$exponent + $digits - 1}]
+	    set string "${string}E${exponent}"
+	}  else {
+	    set string "${mantisse}E${exponent}"
+	}
+    } else {
+	if { $adjusted_exponent >= 0 } {
+	    set adjusted_exponent "+$adjusted_exponent"
+	}
+	if { $digits > 1 && $adjusted_exponent >= $precision } {
+	    set string "[string range $mantisse 0 0].[string range $mantisse 1 end]E$adjusted_exponent"
+	} elseif { $digits + $exponent <= $precision } {
+	    set string ${mantisse}[string repeat 0 [expr {$exponent}]]
+	} else {
+	    set string "${mantisse}E$adjusted_exponent"
+	}
+    }
+    return $sign_string$string
+}
+
+# fromstr --
+#     Convert string to number
+#
+# Arguments:
+#     string      String to be converted
+#
+# Result:
+#     Number in the form of {sign mantisse exponent}
+#
+proc ::math::decimal::fromstr {string} {
+    variable extended
+
+    set string [string trim $string "'\""]
+
+    if { [string range $string 0 0] == "-" } {
+	set sign 1
+	set string [string trimleft $string -]
+	incr pos -1
+    } else  {
+	set sign 0
+    }
+
+    if { $string eq "Inf" || $string eq "NaN" } {
+	if {!$extended} {
+	    # we don't allow these strings in the subset arithmetic.
+	    # throw error.
+	    error "Infinities and NaN's not allowed in simplified decimal arithmetic"
+	} else {
+	    return [list $sign $string 0]
+	}
+    }
+
+    set string [string trimleft $string "+-"]
+    set echeck [string first "E" [string toupper $string]]
+    set epart 0
+    if { $echeck >= 0 } {
+	set epart [string range $string [expr {$echeck+1}] end]
+	set epart [scan $epart %d]
+	set string [string range $string 0 [expr {$echeck -1}]]
+    }
+
+    set pos [string first . $string]
+
+    if { $pos < 0 } {
+	if { $string == 0 } {
+	    set mantisse 0
+	    if { !$extended } {
+		set sign 0
+	    }
+	} else {
+	    set mantisse $string
+	}
+        set exponent 0
+    } else {
+	if { $string == "" } {
+	    return [list 0 0 0]
+	} else {
+	    #stripping the leading zeros here is required to avoid some octal issues.
+	    #However, it causes us to fail some tests with numbers like 0.00 and 0.0
+	    #which test differently but we can't deal with now.
+	    set mantisse [string trimleft [string map {. ""} $string] 0]
+	    if { $mantisse == "" } {
+		set mantisse 0
+		if {!$extended} {
+		    set sign 0
+		}
+	    }
+	    set fraction [string range $string [expr {$pos+1}] end]
+	    set exponent [expr {-[string length $fraction]}]
+	}
+    }
+    set exponent [expr {$exponent + $epart}]
+
+    if { $extended } {
+	return [list $sign $mantisse $exponent]
+    } else {
+	return [Rescale [list $sign $mantisse $exponent]]
+    }
+}
+
+# ipart --
+#     Return the integer part of a Decimal Number
+#
+# Arguments:
+#     Number in the form of {sign mantisse exponent}
+#
+#
+# Result:
+#     Integer
+#
+proc ::math::decimal::ipart { a } {
+
+    foreach {sa ma ea} $a {break}
+
+    if { $ea == 0 } {
+	if { $sa } {
+	    return -$ma
+	} else {
+	    return $ma
+	}
+    } elseif { $ea > 0 } {
+	if { $sa } {
+	    return [expr {-1 * $ma * 10**$ea}]
+	} else {
+	    return [expr {$ma * 10**$ea}]
+	}
+    } else {
+	if { [string length $ma] <= abs($ea) } {
+	    return 0
+	} else {
+	    if { $sa } {
+		set string_sign "-"
+	    } else {
+		set string_sign ""
+	    }
+	    set ea [expr {abs($ea)}]
+	    return "${string_sign}[string range $ma 0 end-$ea]"
+	}
+    }
+}
+
+# round_05_up --
+#     Round zero or five away from 0.
+#     The same as round-up, except that rounding up only occurs
+#     if the digit to be rounded up is 0 or 5, and after overflow
+#     the result is the same as for round-down.
+#
+#     Bias: away from zero
+#
+# Arguments:
+#     Number in the form of {sign mantisse exponent}
+#     Number of decimal points to round to.
+#
+# Result:
+#     Number in the form of {sign mantisse exponent}
+#
+proc ::math::decimal::round_05up {a digits} {
+    foreach {sa ma ea} $a {break}
+
+    if { -$ea== $digits } {
+	return $a
+    } elseif { $digits + $ea > 0 } {
+	set mantissa [expr { $ma * 10**($digits+$ea) }]
+	set exponent [expr {-1 * $digits}]
+    } else {
+	set round_exponent [expr {$digits + $ea}]
+	if { [string length $ma] <= $round_exponent } {
+	    if { $ma != 0 } {
+		set mantissa 1
+	    } else {
+		set mantissa 0
+	    }
+	    set exponent 0
+	} else {
+	    set integer_part [ipart [list 0 $ma $round_exponent]]
+
+	    if { [compare [list 0 $ma $round_exponent] [list 0 ${integer_part}0 -1]] == 0 } {
+		# We are rounding something with fractional part .0
+		set mantissa  $integer_part
+	    } elseif { [string index $integer_part end] eq 0 || [string index $integer_part end] eq 5 } {
+		set mantissa [expr {$integer_part + 1}]
+	    } else {
+		set mantissa  $integer_part
+	    }
+	    set exponent [expr {-1 * $digits}]
+	}
+    }
+    return [list $sa $mantissa $exponent]
+}
+
+# round_half_up --
+#
+#     Round to the nearest. If equidistant, round up.
+#
+#
+#     Bias: away from zero
+#
+# Arguments:
+#     Number in the form of {sign mantisse exponent}
+#     Number of decimal points to round to.
+#
+# Result:
+#     Number in the form of {sign mantisse exponent}
+#
+proc ::math::decimal::round_half_up {a digits} {
+    foreach {sa ma ea} $a {break}
+
+    if { $digits + $ea == 0 } {
+	return $a
+    } elseif { $digits + $ea > 0 } {
+	set mantissa [expr {$ma *10 **($digits+$ea)}]
+    } else {
+	set round_exponent [expr {$digits + $ea}]
+	set integer_part [ipart [list 0 $ma $round_exponent]]
+
+	switch -- [compare [list 0 $ma $round_exponent] [list 0 ${integer_part}5 -1]] {
+	    0 {
+		# We are rounding something with fractional part .5
+		set mantissa [expr {$integer_part + 1}]
+	    }
+	    -1 {
+		set mantissa $integer_part
+	    }
+	    1 {
+		set mantissa [expr {$integer_part + 1}]
+	    }
+
+	}
+    }
+    set exponent [expr {-1 * $digits}]
+    return [list $sa $mantissa $exponent]
+}
+
+# round_half_even --
+#     Round to the nearest. If equidistant, round so the final digit is even.
+#     Bias: none
+#
+# Arguments:
+#     Number in the form of {sign mantisse exponent}
+#     Number of decimal points to round to.
+#
+# Result:
+#     Number in the form of {sign mantisse exponent}
+#
+proc ::math::decimal::round_half_even {a digits} {
+
+    foreach {sa ma ea} $a {break}
+
+    if { $digits + $ea == 0 } {
+	return $a
+    } elseif { $digits + $ea > 0 } {
+	set mantissa [expr {$ma * 10**($digits+$ea)}]
+    } else {
+	set round_exponent [expr {$digits + $ea}]
+	set integer_part [ipart [list 0 $ma $round_exponent]]
+
+	switch -- [compare [list 0 $ma $round_exponent] [list 0 ${integer_part}5 -1]] {
+	    0 {
+		# We are rounding something with fractional part .5
+		if { $integer_part % 2 } {
+		    # We are odd so round up
+		    set mantissa [expr {$integer_part + 1}]
+		} else {
+		    # We are even so round down
+		    set mantissa $integer_part
+		}
+	    }
+	    -1 {
+		set mantissa $integer_part
+	    }
+	    1 {
+		set mantissa [expr {$integer_part + 1}]
+	    }
+	}
+    }
+    set exponent [expr {-1 * $digits}]
+    return [list $sa $mantissa $exponent]
+}
+
+# round_half_down --
+#
+#     Round to the nearest. If equidistant, round down.
+#
+#     Bias: towards zero
+#
+# Arguments:
+#     Number in the form of {sign mantisse exponent}
+#     Number of decimal points to round to.
+#
+# Result:
+#     Number in the form of {sign mantisse exponent}
+#
+proc ::math::decimal::round_half_down {a digits} {
+    foreach {sa ma ea} $a {break}
+
+    if { $digits + $ea == 0 } {
+	return $a
+    } elseif { $digits + $ea > 0 } {
+	set mantissa [expr {$ma * 10**($digits+$ea)}]
+    } else {
+	set round_exponent [expr {$digits + $ea}]
+	set integer_part [ipart [list 0 $ma $round_exponent]]
+	switch -- [compare [list 0 $ma $round_exponent] [list 0 ${integer_part}5 -1]] {
+	    0 {
+		# We are rounding something with fractional part .5
+		# The rule is to round half down.
+		set mantissa $integer_part
+	    }
+	    -1 {
+		set mantissa $integer_part
+	    }
+	    1 {
+		set mantissa [expr {$integer_part + 1}]
+	    }
+	}
+    }
+    set exponent [expr {-1 * $digits}]
+    return [list $sa $mantissa $exponent]
+}
+
+# round_down --
+#
+#     Round toward 0.  (Truncate)
+#
+#     Bias: towards zero
+#
+# Arguments:
+#     Number in the form of {sign mantisse exponent}
+#     Number of decimal points to round to.
+#
+# Result:
+#     Number in the form of {sign mantisse exponent}
+#
+proc ::math::decimal::round_down {a digits} {
+    foreach {sa ma ea} $a {break}
+
+
+    if { -$ea== $digits } {
+	return $a
+    } elseif { $digits + $ea > 0 } {
+	set mantissa [expr { $ma * 10**($digits+$ea) }]
+    } else {
+	set round_exponent [expr {$digits + $ea}]
+	set mantissa [ipart [list 0 $ma $round_exponent]]
+    }
+
+    set exponent [expr {-1 * $digits}]
+    return [list $sa $mantissa $exponent]
+}
+
+# round_floor --
+#
+#     Round toward -Infinity.
+#
+#     Bias: down toward -Inf.
+#
+# Arguments:
+#     Number in the form of {sign mantisse exponent}
+#     Number of decimal points to round to.
+#
+# Result:
+#     Number in the form of {sign mantisse exponent}
+#
+proc ::math::decimal::round_floor {a digits} {
+    foreach {sa ma ea} $a {break}
+
+    if { -$ea== $digits } {
+	return $a
+    } elseif { $digits + $ea > 0 } {
+	set mantissa [expr { $ma * 10**($digits+$ea) }]
+    } else {
+	set round_exponent [expr {$digits + $ea}]
+	if { $ma == 0 } {
+	    set mantissa 0
+	} elseif { !$sa } {
+	    set mantissa [ipart [list 0 $ma $round_exponent]]
+	} else {
+	    set mantissa [expr {[ipart [list 0 $ma $round_exponent]] + 1}]
+	}
+    }
+    set exponent [expr {-1 * $digits}]
+    return [list $sa $mantissa $exponent]
+}
+
+# round_up --
+#
+#     Round away from 0
+#
+#     Bias: away from 0
+#
+# Arguments:
+#     Number in the form of {sign mantisse exponent}
+#     Number of decimal points to round to.
+#
+# Result:
+#     Number in the form of {sign mantisse exponent}
+#
+proc ::math::decimal::round_up {a digits} {
+    foreach {sa ma ea} $a {break}
+
+
+    if { -$ea== $digits } {
+	return $a
+    } elseif { $digits + $ea > 0 } {
+	set mantissa [expr { $ma * 10**($digits+$ea) }]
+	set exponent [expr {-1 * $digits}]
+    } else {
+	set round_exponent [expr {$digits + $ea}]
+	if { [string length $ma] <= $round_exponent } {
+	    if { $ma != 0 } {
+		set mantissa 1
+	    } else {
+		set mantissa 0
+	    }
+	    set exponent 0
+	} else {
+	    set integer_part [ipart [list 0 $ma $round_exponent]]
+	    switch -- [compare [list 0 $ma $round_exponent] [list 0 ${integer_part}0 -1]] {
+		0 {
+		    # We are rounding something with fractional part .0
+		    set mantissa $integer_part
+		}
+		default {
+		    set mantissa [expr {$integer_part + 1}]
+		}
+	    }
+	    set exponent [expr {-1 * $digits}]
+	}
+    }
+    return [list $sa $mantissa $exponent]
+}
+
+# round_ceiling --
+#
+#     Round toward Infinity
+#
+#     Bias: up toward Inf.
+#
+# Arguments:
+#     Number in the form of {sign mantisse exponent}
+#     Number of decimal points to round to.
+#
+# Result:
+#     Number in the form of {sign mantisse exponent}
+#
+proc ::math::decimal::round_ceiling {a digits} {
+    foreach {sa ma ea} $a {break}
+    if { -$ea== $digits } {
+	return $a
+    } elseif { $digits + $ea > 0 } {
+	set mantissa [expr { $ma * 10**($digits+$ea) }]
+	set exponent [expr {-1 * $digits}]
+    } else {
+	set round_exponent [expr {$digits + $ea}]
+	if { [string length $ma] <= $round_exponent } {
+	    if { $ma != 0 } {
+		set mantissa 1
+	    } else {
+		set mantissa 0
+	    }
+	    set exponent 0
+	} else {
+	    set integer_part [ipart [list 0 $ma $round_exponent]]
+	    switch -- [compare [list 0 $ma $round_exponent] [list 0 ${integer_part}0 -1]] {
+		0 {
+		    # We are rounding something with fractional part .0
+		    set mantissa $integer_part
+		}
+		default {
+		    if { $sa } {
+			set mantissa [expr {$integer_part}]
+		    } else {
+			set mantissa [expr {$integer_part + 1}]
+		    }
+		}
+	    }
+	    set exponent [expr {-1 * $digits}]
+	}
+    }
+
+    return [list $sa $mantissa $exponent]
+}
+
+# is-finite
+#
+#     Takes one operand and returns: 1 if neither Inf or Nan otherwise 0.
+#
+#
+# Arguments:
+#     a - decimal number
+#
+# Returns:
+#
+proc ::math::decimal::is-finite { a } {
+    set mantissa [lindex $a 1]
+    if { $mantissa == "Inf" || $mantissa == "NaN" } {
+	return 0
+    } else {
+	return 1
+    }
+}
+
+# is-infinite
+#
+#     Takes one operand and returns: 1 if Inf otherwise 0.
+#
+#
+# Arguments:
+#     a - decimal number
+#
+# Returns:
+#
+proc ::math::decimal::is-infinite { a } {
+    set mantissa [lindex $a 1]
+    if { $mantissa == "Inf" } {
+	return 1
+    } else {
+	return 0
+    }
+}
+
+# is-NaN
+#
+#     Takes one operand and returns: 1 if NaN otherwise 0.
+#
+#
+# Arguments:
+#     a - decimal number
+#
+# Returns:
+#
+proc ::math::decimal::is-NaN { a } {
+    set mantissa [lindex $a 1]
+    if { $mantissa == "NaN" } {
+	return 1
+    } else {
+	return 0
+    }
+}
+
+# is-signed
+#
+#     Takes one operand and returns: 1 if sign is 1 (negative).
+#
+#
+# Arguments:
+#     a - decimal number
+#
+# Returns:
+#
+proc ::math::decimal::is-signed { a } {
+    set sign [lindex $a 0]
+    if { $sign } {
+	return 1
+    } else {
+	return 0
+    }
+}
+
+# is-zero
+#
+#     Takes one operand and returns: 1 if operand is zero otherwise 0.
+#
+#
+# Arguments:
+#     a - decimal number
+#
+# Returns:
+#
+proc ::math::decimal::is-zero { a } {
+    set mantisse [lindex $a 1]
+    if { $mantisse == 0 } {
+	return 1
+    } else {
+	return 0
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/elliptic.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/elliptic.tcl
new file mode 100644
index 00000000..e3149168
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/elliptic.tcl
@@ -0,0 +1,242 @@
+# elliptic.tcl --
+#    Compute elliptic functions and integrals
+#
+#    Computation of elliptic functions cn, dn and sn
+#    adapted from:
+#        Michael W. Pashea
+#        Numerical computation of elliptic functions
+#        Doctor Dobbs' Journal, May 2005
+#
+
+# namespace ::math::special
+#
+namespace eval ::math::special {
+    namespace export cn sn dn elliptic_K elliptic_E
+
+    ::math::constants::constants pi
+
+    variable halfpi [expr {$pi/2.0}]
+    variable tol
+
+    set tol 1.0e-10
+}
+
+# elliptic_K --
+#    Compute the complete elliptic integral of the first kind
+#
+# Arguments:
+#    k            Parameter of the integral
+# Result:
+#    Value of K(k)
+# Note:
+#    This relies on the arithmetic-geometric mean
+#
+proc ::math::special::elliptic_K {k} {
+    variable halfpi
+    if { $k < 0.0 || $k >= 1.0 } {
+        error "Domain error: must be between 0 (inclusive) and 1 (not inclusive)"
+    }
+
+    if { $k == 0.0 } {
+        return $halfpi
+    }
+
+    set a 1.0
+    set b [expr {sqrt(1.0-$k*$k)}]
+
+    for {set i 0} {$i < 10} {incr i} {
+        set anew [expr {($a+$b)/2.0}]
+        set bnew [expr {sqrt($a*$b)}]
+
+        set a $anew
+        set b $bnew
+        #puts "$a $b"
+    }
+
+    return [expr {$halfpi/$a}]
+}
+
+# elliptic_E --
+#    Compute the complete elliptic integral of the second kind
+#
+# Arguments:
+#    k            Parameter of the integral
+# Result:
+#    Value of E(k)
+# Note:
+#    This relies on the arithmetic-geometric mean
+#
+proc ::math::special::elliptic_E {k} {
+   variable halfpi
+   if { $k < 0.0 || $k >= 1.0 } {
+       error "Domain error: must be between 0 (inclusive) and 1 (not inclusive)"
+   }
+
+   if { $k == 0.0 } {
+       return $halfpi
+   }
+   if { $k == 1.0 } {
+       return 1.0
+   }
+
+   set a      1.0
+   set b      [expr {sqrt(1.0-$k*$k)}]
+   set sumc   [expr {$k*$k/2.0}]
+   set factor 0.25
+
+   for {set i 0} {$i < 10} {incr i} {
+       set anew   [expr {($a+$b)/2.0}]
+       set bnew   [expr {sqrt($a*$b)}]
+       set sumc   [expr {$sumc+$factor*($a-$b)*($a-$b)}]
+       set factor [expr {$factor*2.0}]
+
+       set a $anew
+       set b $bnew
+       #puts "$a $b"
+   }
+
+   set Kk [expr {$halfpi/$a}]
+   return [expr {(1.0-$sumc)*$Kk}]
+}
+
+namespace eval ::math::special {
+}
+
+# Nextk --
+#     Auxiliary function for computing next value of k
+#
+# Arguments:
+#     k           Parameter
+# Return value:
+#     Next value to be used
+#
+proc ::math::special::Nextk { k } {
+    set ksq [expr {sqrt(1.0-$k*$k)}]
+    return [expr {(1.0-$ksq)/(1+$ksq)}]
+}
+
+# IterateUK --
+#     Auxiliary function to compute the raw value (phi)
+#
+# Arguments:
+#     u           Independent variable
+#     k           Parameter
+# Return value:
+#     phi
+#
+proc ::math::special::IterateUK { u k } {
+    variable tol
+    set kvalues {}
+    set nmax    1
+    while { $k > $tol } {
+        set k [Nextk $k]
+        set kvalues [concat $k $kvalues]
+        set u [expr {$u*2.0/(1.0+$k)}]
+        incr nmax
+        #puts "$nmax -$u - $k"
+    }
+    foreach k $kvalues {
+        set u [expr {( $u + asin($k*sin($u)) )/2.0}]
+    }
+    return $u
+}
+
+# cn --
+#     Compute the elliptic function cn
+#
+# Arguments:
+#     u           Independent variable
+#     k           Parameter
+# Return value:
+#     cn(u,k)
+# Note:
+#     If k == 1, then the iteration does not stop
+#
+proc ::math::special::cn { u k } {
+    if { $k > 1.0 } {
+        return -code error "Parameter out of range - must be <= 1.0"
+    }
+    if { $k == 1.0 } {
+        return [expr {1.0/cosh($u)}]
+    } else {
+        set u [IterateUK $u $k]
+        return [expr {cos($u)}]
+    }
+}
+
+# sn --
+#     Compute the elliptic function sn
+#
+# Arguments:
+#     u           Independent variable
+#     k           Parameter
+# Return value:
+#     sn(u,k)
+# Note:
+#     If k == 1, then the iteration does not stop
+#
+proc ::math::special::sn { u k } {
+    if { $k > 1.0 } {
+        return -code error "Parameter out of range - must be <= 1.0"
+    }
+    if { $k == 1.0 } {
+        return [expr {tanh($u)}]
+    } else {
+        set u [IterateUK $u $k]
+        return [expr {sin($u)}]
+    }
+}
+
+# dn --
+#     Compute the elliptic function sn
+#
+# Arguments:
+#     u           Independent variable
+#     k           Parameter
+# Return value:
+#     dn(u,k)
+# Note:
+#     If k == 1, then the iteration does not stop
+#
+proc ::math::special::dn { u k } {
+    if { $k > 1.0 } {
+        return -code error "Parameter out of range - must be <= 1.0"
+    }
+    if { $k == 1.0 } {
+        return [expr {1.0/cosh($u)}]
+    } else {
+        set u [IterateUK $u $k]
+        return [expr {sqrt(1.0-($k*sin($u))**2)}]
+    }
+}
+
+
+# main --
+#    Simple tests
+#
+if { 0 } {
+puts "Special cases:"
+puts "cos(1):    [::math::special::cn 1.0 0.0] -- [expr {cos(1.0)}]"
+puts "1/cosh(1): [::math::special::cn 1.0 0.999] -- [expr {1.0/cosh(1.0)}]"
+}
+
+# some tests --
+#
+if { 0 } {
+set prec $::tcl_precision
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    set ::tcl_precision 17
+} else {
+    set ::tcl_precision 0
+}
+#foreach k {0.0 0.1 0.2 0.4 0.6 0.8 0.9} {
+#    puts "$k: [::math::special::elliptic_K $k]"
+#}
+foreach k2 {0.0 0.1 0.2 0.4 0.6 0.8 0.9} {
+    set k [expr {sqrt($k2)}]
+    puts "$k2: [::math::special::elliptic_K $k] \
+[::math::special::elliptic_E $k]"
+}
+set ::tcl_precision $prec
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/exact.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/exact.tcl
new file mode 100644
index 00000000..a947526a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/exact.tcl
@@ -0,0 +1,4060 @@
+# exact.tcl --
+#
+#	Tcl package for exact real arithmetic.
+#
+# Copyright (c) 2015 by Kevin B. Kenny
+#
+# See the file "license.terms" for information on usage and redistribution of
+# this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# This package provides a library for performing exact
+# computations over the computable real numbers. The algorithms
+# are largely based on the ones described in:
+#
+# Potts, Peter John. _Exact Real Arithmetic using Möbius Transformations._
+# PhD thesis, University of London, July 1998.
+# http://www.doc.ic.ac.uk/~ae/papers/potts-phd.pdf
+#
+# Some of the algorithms for the elementary functions are found instead
+# in:
+#
+# Menissier-Morain, Valérie. _Arbitrary Precision Real Arithmetic:
+# Design and Algorithms. J. Symbolic Computation 11 (1996)
+# http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.31.8983
+#
+#-----------------------------------------------------------------------------
+
+package require Tcl 8.6
+package require grammar::aycock 1.0
+
+namespace eval math::exact {
+
+    namespace eval function {
+	namespace path ::math::exact
+    }
+    namespace path ::tcl::mathop
+
+    # math::exact::parser --
+    #
+    #	Grammar for parsing expressions in the exact real calculator
+    #
+    # The expression syntax is almost exactly that of Tcl expressions,
+    # minus Tcl arrays, square-bracket substitution, and noncomputable
+    # operations such as equality, comparisons, bit and Boolean operations,
+    # and ?:.
+
+    variable parser [grammar::aycock::parser {
+
+	target ::= expression {
+	    lindex $_ 0
+	}
+
+	expression ::= expression addop term {
+	    {*}$_
+	}
+	expression ::= term {
+	    lindex $_ 0
+	}
+	addop ::= + {
+	    lindex $_ 0
+	}
+	addop ::= - {
+	    lindex $_ 0
+	}
+
+	term ::= term mulop factor {
+	    {*}$_
+	}
+	term ::= factor {
+	    lindex $_ 0
+	}
+	mulop ::= * {
+	    lindex $_ 0
+	}
+	mulop ::= / {
+	    lindex $_ 0
+	}
+
+	factor ::= addop factor {
+	    switch -exact -- [lindex $_ 0] {
+		+ {
+		    set result [lindex $_ 1]
+		}
+		- {
+		    set result [[lindex $_ 1] U-]
+		}
+	    }
+	    set result
+	}
+	factor ::= primary ** factor {
+	    {*}$_
+	}
+	factor ::= primary {
+	    lindex $_ 0
+	}
+
+	primary ::= {$} bareword {
+	    uplevel [dict get $clientData caller] set [lindex $_ 1]
+	}
+	primary ::= number {
+	    [dict get $clientData namespace]::V new [list [lindex $_ 0] 1]
+	}
+	primary ::= bareword ( ) {
+	    [dict get $clientData namespace]::function::[lindex $_ 0]
+	}
+	primary ::= bareword ( arglist ) {
+	    [dict get $clientData namespace]::function::[lindex $_ 0] \
+		{*}[lindex $_ 2]
+	}
+	primary ::= ( expression ) {
+	    lindex $_ 1
+	}
+	arglist ::= expression {
+	    set _
+	}
+	arglist ::= arglist , expression {
+	    linsert [lindex $_ 0] end [lindex $_ 2]
+	}
+
+    }]
+}
+
+# math::exact::Lexer --
+#
+#	Lexer for the arithmetic expressions that the 'math::exact' package
+#	can evaluate.
+#
+# Results:
+#	Returns a two element list. The first element is a list of the
+#	lexical values of the tokens that were found in the expression;
+#	the second is a list of the semantic values of the tokens. The
+#	two sublists are the same length.
+
+proc ::math::exact::Lexer {expression} {
+    set start 0
+    set tokens {}
+    set values {}
+    while {$expression ne {}} {
+	if {[regexp {^\*\*(.*)} $expression -> rest]} {
+
+	    # Exponentiation
+
+	    lappend tokens **
+	    lappend values **
+	} elseif {[regexp {^([-+/*$(),])(.*)} $expression -> token rest]} {
+
+	    # Single-character operators
+
+	    lappend tokens $token
+	    lappend values $token
+	} elseif {[regexp {^([[:alpha:]][[:alnum:]_]*)(.*)} \
+		       $expression -> token rest]} {
+
+	    # Variable and function names
+
+	    lappend tokens bareword
+	    lappend values $token
+	} elseif {[regexp -nocase {^([[:digit:]]+)(.*)} $expression -> \
+		       token rest] } {
+
+	    # Numbers
+
+	    lappend tokens number
+	    lappend values $token
+
+	} elseif {[regexp {^[[:space:]]+(.*)} $expression -> rest]} {
+
+	    # Whitespace
+
+	} else {
+
+	    # Anything else is an error
+
+	    return -code error \
+		-errorcode [list MATH EXACT EXPR INVCHAR \
+				[string index $expression 0]] \
+		[list invalid character [string index $expression 0]] \
+	}
+	set expression $rest
+    }
+    return [list $tokens $values]
+}
+
+# math::exact::K --
+#
+#	K combinator. Returns its first argumetn
+#
+# Parameters:
+#	a - Return value
+#	b - Value to discard
+#
+# Results:
+#	Returns the first argument
+
+proc ::math::exact::K {a b} {return $a}
+
+# math::exact::exactexpr --
+#
+#	Evaluates an exact real expression.
+#
+# Parameters:
+#	expr - Expression to evaluate. Variables in the expression are
+#	       assumed to be reals, which are represented as Tcl objects.
+#
+# Results:
+#	Returns a Tcl object representing the expression's value.
+#
+# The returned object must have its refcount incremented with [ref] if
+# the caller retains a reference, and in general it is expected that a
+# user of a real will [ref] the object when storing it in a variable and
+# [unref] it again when the variable goes out of scope or is overwritten.
+
+proc ::math::exact::exactexpr {expr} {
+    variable parser
+    set result [$parser parse {*}[Lexer $expr] \
+		    [dict create \
+			 caller "#[expr {[info level] - 1}]" \
+			 namespace [namespace current]]]
+}
+
+# Basic data types
+
+# A vector is a list {a b}. It can represent the rational number {a/b}
+
+# A matrix is a list of its columns {{a b} {c d}}. In addition to
+# the ordinary rules of linear algebra, it represents the linear
+# transform (ax+b)/(cx+d).
+
+# If x is presumed to lie in the interval [0, Inf) then this transform
+# applied to x will lie in the interval [b/d, a/c), so the matrix
+# {{a b} {c d}} can represent that interval. The interval [0,Inf)
+# can be represented by the identity matrix {{1 0} {0 1}}
+
+# Moreover, if x  = {p/q} is a rational number, then
+#    (ax+b)/(cx+d) = (a(p/q)+b)/(c(p/q)+d)
+#                  = ((ap+bq)/q)/(cp+dq)/q)
+#                  = (ap+bq)/(cp+dq)
+# which is the rational number represented by {{a c} {b d}} {p q}
+# using the conventional rule of vector-matrix multiplication.
+
+# Note that matrices used for this purpose are unique only up to scaling.
+# If (ax+b)/(cx+d) is a rational number, then (eax+eb)/(ecx+ed) represents
+# the same rational number. This means that matrix inversion may be replaced
+# by matrix reversion: for {{a b} {c d}}, simply form the list of cofactors
+# {{d -b} {-c a}}, without dividing by the determinant. The reverse of a matrix
+# is well defined even if the matrix is singular.
+
+# A tensor of the third degree is a list of its levels:
+#  {{{a b} {c d}} {{e f} {g h}}}
+
+# math::exact::gcd --
+#
+#	Greatest common divisor of a set of integers
+#
+# Parameters:
+#	The integers whose gcd is to be found
+#
+# Results:
+#	Returns the gcd
+
+proc ::math::exact::gcd {a args} {
+    foreach b $args {
+	if {$a > $b} {
+	    set t $b; set b $a; set a $t
+	}
+	while {$b > 0} {
+	    set t $b
+	    set b [expr {$a % $b}]
+	    set a $t
+	}
+    }
+    return $a
+}
+
+# math::exact::trans --
+#
+#	Transposes a 2x2 matrix or a 2x2x2 tensor
+#
+# Parameters:
+#	x - Object to transpose
+#
+# Results:
+#	Returns the transpose
+
+proc ::math::exact::trans {x} {
+    lassign $x ab cd
+    lassign $ab a b
+    lassign $cd c d
+    tailcall list [list $a $c] [list $b $d]
+}
+
+# math::exact::determinant --
+#
+#	Calculates the determinant of a 2x2 matrix
+#
+# Parameters:
+#	x - Matrix
+#
+# Results:
+#	Returns the determinant.
+
+proc ::math::exact::determinant {x} {
+    lassign $x ab cd
+    lassign $ab a b
+    lassign $cd c d
+    return [expr {$a*$d - $b*$c}]
+}
+
+# math::exact::reverse --
+#
+#	Calculates the reverse of a 2x2 matrix, which is its inverse times
+#	its determinant.
+#
+# Parameters:
+#	x - Matrix
+#
+# Results:
+#	Returns reverse[x].
+#
+# Notes:
+#	The reverse is well defined even for singular matrices.
+
+proc ::math::exact::reverse {x} {
+    lassign $x ab cd
+    lassign $ab a b
+    lassign $cd c d
+    tailcall list [list $d [expr {-$b}]] [list [expr {-$c}] $a]
+}
+
+# math::exact::veven --
+#
+#	Tests if both components of a 2-vector are even.
+#
+# Parameters:
+#	x - Vector to test
+#
+# Results:
+#	Returns 1 if both components are even, 0 otherwise.
+
+proc ::math::exact::veven {x} {
+    lassign $x a b
+    return [expr {($a % 2 == 0) && ($b % 2 == 0)}]
+}
+
+# math::exact::meven --
+#
+#	Tests if all components of a 2x2 matrix are even.
+#
+# Parameters:
+#	x - Matrix to test
+#
+# Results:
+#	Returns 1 if all components are even, 0 otherwise.
+
+proc ::math::exact::meven {x} {
+    lassign $x a b
+    return [expr {[veven $a] && [veven $b]}]
+}
+
+# math::exact::teven --
+#
+#	Tests if all components of a 2x2x2 tensor are even
+#
+# Parameters:
+#	x - Tensor to test
+#
+# Results:
+#	Returns 1 if all components are even, 0 otherwise
+
+proc ::math::exact::teven {x} {
+    lassign $x a b
+    return [expr {[meven $a] && [meven $b]}]
+}
+
+# math::exact::vhalf --
+#
+#	Divides both components of a 2-vector by 2
+#
+# Parameters:
+#	x - Vector to scale
+#
+# Results:
+#	Returns the scaled vector
+
+proc ::math::exact::vhalf {x} {
+    lassign $x a b
+    tailcall list [expr {$a / 2}] [expr {$b / 2}]
+}
+
+# math::exact::mhalf --
+#
+#	Divides all components of a 2x2 matrix by 2
+#
+# Parameters:
+#	x - Matrix to scale
+#
+# Results:
+#	Returns the scaled matrix
+
+proc ::math::exact::mhalf {x} {
+    lassign $x a b
+    tailcall list [vhalf $a] [vhalf $b]
+}
+
+# math::exact::thalf --
+#
+#	Divides all components of a 2x2x2 tensor by 2
+#
+# Parameters:
+#	x - Tensor to scale
+#
+# Results:
+#	Returns the scaled tensor
+
+proc ::math::exact::thalf {x} {
+    lassign $x a b
+    tailcall list [mhalf $a] [mhalf $b]
+}
+
+# math::exact::vscale --
+#
+#	Removes all common factors of 2 from the two components of a 2-vector
+#
+# Paramters:
+#	x - Vector to scale
+#
+# Results:
+#	Returns the scaled vector
+
+proc ::math::exact::vscale {x} {
+    while {[veven $x]} {
+	set x [vhalf $x]
+    }
+    return $x
+}
+
+# math::exact::mscale --
+#
+#	Removes all common factors of 2 from the two components of a
+#	2x2 matrix
+#
+# Paramters:
+#	x - Matrix to scale
+#
+# Results:
+#	Returns the scaled matrix
+
+proc ::math::exact::mscale {x} {
+    while {[meven $x]} {
+	set x [mhalf $x]
+    }
+    return $x
+}
+
+# math::exact::tscale --
+#
+#	Removes all common factors of 2 from the two components of a
+#	2x2x2 tensor
+#
+# Paramters:
+#	x - Tensor to scale
+#
+# Results:
+#	Returns the scaled tensor
+
+proc ::math::exact::tscale {x} {
+    while {[teven $x]} {
+	set x [thalf $x]
+    }
+    return $x
+}
+
+# math::exact::vreduce --
+#
+#	Reduces a vector (i.e., a rational number) to lowest terms
+#
+# Parameters:
+#	x - Vector to scale
+#
+# Results:
+#	Returns the scaled vector
+
+proc ::math::exact::vreduce {x} {
+    lassign $x a b
+    set g [gcd $a $b]
+    tailcall list [expr {$a / $g}] [expr {$b / $g}]
+}
+
+# math::exact::mreduce --
+#
+#	Removes all common factors from the two components of a
+#	2x2 matrix
+#
+# Paramters:
+#	x - Matrix to scale
+#
+# Results:
+#	Returns the scaled matrix
+#
+# This procedure suffices to reduce the matrix to lowest terms if the matrix
+# was constructed by pre- or post-multiplying a series of sign and digit
+# matrices.
+
+proc ::math::exact::mreduce {x} {
+    lassign $x ab cd
+    lassign $ab a b
+    lassign $cd c d
+    set g [gcd $a $b $c $d]
+    tailcall list \
+	[list [expr {$a / $g}] [expr {$b / $g}]] \
+	[list [expr {$c / $g}] [expr {$d / $g}]]
+}
+
+# math::exact::treduce --
+#
+#	Removes all common factors from the components of a
+#	2x2x2 tensor
+#
+# Paramters:
+#	x - Tensor to scale
+#
+# Results:
+#	Returns the scaled tensor
+#
+# This procedure suffices to reduce a tensor to lowest terms if it was
+# constructed by absorbing a digit matrix into a tensor that was already
+# in lowest terms.
+
+proc ::math::exact::treduce {x} {
+    lassign $x abcd efgh
+    lassign $abcd ab cd
+    lassign $ab a b
+    lassign $cd c d
+    lassign $efgh ef gh
+    lassign $ef e f
+    lassign $gh g h
+    set G [gcd $a $b $c $d $e $f $g $h]
+    tailcall list \
+	[list \
+	     [list [expr {$a / $G}] [expr {$b / $G}]] \
+	     [list [expr {$c / $G}] [expr {$d / $G}]]] \
+	[list \
+	     [list [expr {$e / $G}] [expr {$f / $G}]] \
+	     [list [expr {$g / $G}] [expr {$h / $G}]]]
+}
+
+# math::exact::vadd --
+#
+#	Adds two 2-vectors
+#
+# Parameters:
+#	x - First vector
+#	y - Second vector
+#
+# Results:
+#	Returns the vector sum
+
+proc ::math::exact::vadd {x y} {
+    lmap p $x q $y {expr {$p + $q}}
+}
+
+# math::exact::madd --
+#
+#	Adds two 2x2 matrices
+#
+# Parameters:
+#	A - First matrix
+#	B - Second matrix
+#
+# Results:
+#	Returns the matrix sum
+
+proc ::math::exact::madd {A B} {
+    lmap x $A y $B {
+	lmap p $x q $y {expr {$p + $q}}
+    }
+}
+
+# math::exact::tadd --
+#
+#	Adds two 2x2x2 tensors
+#
+# Parameters:
+#	U - First tensor
+#	V - Second tensor
+#
+# Results:
+#	Returns the tensor sum
+
+proc ::math::exact::tadd {U V} {
+    lmap A $U B $V {
+	lmap x $A y $B {
+	    lmap p $x q $y {expr {$p + $q}}
+	}
+    }
+}
+
+# math::exact::mdotv --
+#
+#	2x2 matrix times 2-vector
+#
+# Parameters;
+#	A - Matrix
+#	x - Vector
+#
+# Results:
+#	Returns the product vector
+
+proc ::math::exact::mdotv {A x} {
+    lassign $A ab cd
+    lassign $ab a b
+    lassign $cd c d
+    lassign $x e f
+    tailcall list [expr {$a*$e + $c*$f}] [expr {$b*$e + $d*$f}]
+}
+
+# math::exact::mdotm --
+#
+#	Product of two matrices
+#
+# Parameters:
+#	A - Left matrix
+#	B - Right matrix
+#
+# Results:
+#	Returns the matrix product
+
+proc ::math::exact::mdotm {A B} {
+    lassign $B x y
+    tailcall list [mdotv $A $x] [mdotv $A $y]
+}
+
+# math::exact::mdott --
+#
+#	Product of a matrix and a tensor
+#
+# Parameters:
+#	A - Matrix
+#	T - Tensor
+#
+# Results:
+#	Returns the product tensor
+
+proc ::math::exact::mdott {A T} {
+    lassign $T B C
+    tailcall list [mdotm $A $B] [mdotm $A $C]
+}
+
+# math::exact::trightv --
+#
+#	Right product of a tensor and a vector
+#
+# Parameters:
+#	T - Tensor
+#	v - Right-hand vector
+#
+# Results:
+#	Returns the product matrix
+
+proc ::math::exact::trightv {T v} {
+    lassign $T m n
+    tailcall list [mdotv $m $v] [mdotv $n $v]
+}
+
+# math::exact::trightm --
+#
+#	Right product of a tensor and a matrix
+#
+# Parameters:
+#	T - Tensor
+#	A - Right-hand matrix
+#
+# Results:
+#	Returns the product tensor
+
+proc ::math::exact::trightm {T A} {
+    lassign $T m n
+    tailcall list [mdotm $m $A] [mdotm $n $A]
+}
+
+# math::exact::tleftv --
+#
+#	Left product of a tensor and a vector
+#
+# Parameters:
+#	T - Tensor
+#	v - Left-hand vector
+#
+# Results:
+#	Returns the product matrix
+
+proc ::math::exact::tleftv {T v} {
+    tailcall trightv [trans $T] $v
+}
+
+# math::exact::tleftm --
+#
+#	Left product of a tensor and a matrix
+#
+# Parameters:
+#	T - Tensor
+#	A - Left-hand matrix
+#
+# Results:
+#	Returns the product tensor
+
+proc ::math::exact::tleftm {T A} {
+    tailcall trans [trightm [trans $T] $A]
+}
+
+# math::exact::vsign --
+#
+#	Computes the 'sign function' of a vector.
+#
+# Parameters:
+#	v - Vector whose sign function is needed
+#
+# Results:
+#	Returns the result of the sign function.
+#
+# a	b	sign
+# -	-	 -1
+# -	0	 -1
+# -	+	  0
+# 0	-	 -1
+# 0	0	  0
+# 0	+	  1
+# +	-	  0
+# +	0	  1
+# +	+	  1
+#
+# If the quotient a/b is negative or indeterminate, the result is zero.
+# If the quotient a/b is zero, the result is the sign of b.
+# If the quotient a/b is positive, the result is the common sign of the
+# operands, which are known to be of like sign
+# If the quotient a/b is infinite, the result is the sign of a.
+
+proc ::math::exact::sign {v} {
+    lassign $v a b
+    if {$a < 0} {
+	if {$b <= 0} {
+	    return -1
+	} else {
+	    return 0
+	}
+    } elseif {$a == 0} {
+	if {$b < 0} {
+	    return -1
+	} elseif {$b == 0} {
+	    return 0
+	} else {
+	    return 1
+	}
+    } else {
+	if {$b < 0} {
+	    return 0
+	} else {
+	    return 1
+	}
+    }
+}
+
+# math::exact::vrefines --
+#
+#	Test if a vector refines.
+#
+# Parameters:
+#	v - Vector to test
+#
+# Results:
+#	1 if the vector refines, 0 otherwise.
+
+proc ::math::exact::vrefines {v} {
+    return [expr {[sign $v] != 0}]
+}
+
+# math::exact::mrefines --
+#
+#	Test whether a matrix refines
+#
+# Parameters:
+#	A - Matrix to test
+#
+# Results:
+#	1 if the matrix refines, 0 otherwise.
+
+proc ::math::exact::mrefines {A} {
+    lassign $A v w
+    set a [sign $v]
+    set b [sign $w]
+    return [expr {$a == $b && $b != 0}]
+}
+
+# math::exact::trefines --
+#
+#	Tests whether a tensor refines
+#
+# Parameters:
+#	T - Tensor to test.
+#
+# Results:
+#	1 if the tensor refines, 0 otherwise.
+
+proc ::math::exact::trefines {T} {
+    lassign $T vw xy
+    lassign $vw v w
+    lassign $xy x y
+    set a [sign $v]
+    set b [sign $w]
+    set c [sign $x]
+    set d [sign $y]
+    return [expr {$a == $b && $b == $c && $c == $d && $d != 0}]
+}
+
+# math::exact::vlessv -
+#
+#	Test whether one rational is less than another
+#
+# Parameters:
+#	v, w - Two rational numbers
+#
+# Returns:
+#	The result of the comparison.
+
+proc ::math::exact::vlessv {v w} {
+    expr {[determinant [list $v $w]] < 0}
+}
+
+# math::exact::mlessv -
+#
+#	Tests whether a rational interval is less than a vector
+#
+# Parameters:
+#	m - Matrix representing the interval
+#	x - Rational to compare against
+#
+# Results:
+#	Returns 1 if m < x, 0 otherwise
+
+proc ::math::exact::mlessv {m x} {
+    lassign $m v w
+    expr {[vlessv $v $x] && [vlessv $w $x]}
+}
+
+# math::exact::mlessm -
+#
+#	Tests whether one rational interval is strictly less than another
+#
+# Parameters:
+#	m - First interval
+#	n - Second interval
+#
+# Results:
+#	Returns 1 if m < n, 0 otherwise
+
+proc ::math::exact::mlessm {m n} {
+    lassign $n v w
+    expr {[mlessv $m $v] && [mlessv $m $w]}
+}
+
+# math::exact::mdisjointm -
+#
+#	Tests whether two rational intervals are disjoint
+#
+# Parameters:
+#	m - First interval
+#	n - Second interval
+#
+# Results:
+#	Returns 1 if the intervals are disjoint, 0 otherwise
+
+proc ::math::exact::mdisjointm {m n} {
+    expr {[mlessm $m $n] || [mlessm $n $m]}
+}
+
+# math::exact::mAsFloat
+#
+#	Formats a matrix that represents a rational interval as a floating
+#	point number, stopping as soon as a digit is not determined.
+#
+# Parameters:
+#	m - Matrix to format
+#
+# Results:
+#	Returns the floating point number in scientific notation, with no
+#	digits to the left of the decimal point.
+
+proc ::math::exact::mAsFloat {m} {
+
+    # Special case: If a number is exact, the determinant is zero.
+
+    set d [determinant $m]
+    lassign [lindex $m 0] p q
+    if {$d == 0} {
+	if {$q < 0} {
+	    set p [expr {-$p}]
+	    set q [expr {-$q}]
+	}
+	if {$p == 0} {
+	    if {$q == 0} {
+		return NaN
+	    } else {
+		return 0
+	    }
+	} elseif {$q == 0} {
+	    return Inf
+	} elseif {$q == 1} {
+	    return $p
+	} else {
+	    set G [gcd $p $q]
+	    return [expr {$p/$G}]/[expr {$q/$G}]
+	}
+    } else {
+	tailcall eFormat [scientificNotation $m]
+    }
+}
+
+# math::exact::scientificNotation --
+#
+#	Takes a matrix representing a rational interval, and extracts as
+#	many decimal digits as can be determined unambiguously
+#
+# Parameters:
+#	m - Matrix to format
+#
+# Results:
+#	Returns a list comprising the decimal exponent, followed by a series of
+#	digits of the significand. The decimal point is to the left of the
+#	leftmost digit of the significand.
+#
+#	Returns the empty string if a number is entirely undetermined.
+
+proc ::math::exact::scientificNotation {m} {
+    variable iszer
+    set n 0
+    while {1} {
+	if {[vrefines [mdotv [reverse $m] {1 0}]]} {
+	    return {}
+	} elseif {[mrefines [mdotm $iszer $m]]} {
+	    return [linsert [mantissa $m] 0 $n]
+	} else {
+	    set m [mdotm {{1 0} {0 10}} $m]
+	    incr n
+	}
+    }
+}
+
+# math::exact::mantissa --
+#
+#	Given a matrix m that represents a rational interval whose
+#	endpoints are in [0,1), formats as many digits of the represented
+#	number as possible.
+#
+# Parameters:
+#	m - Matrix to format
+#
+# Results:
+#	Returns a list of digits
+
+proc ::math::exact::mantissa {m} {
+    set retval {}
+    set done 0
+    while {!$done} {
+	set done 1
+
+	# Brute force: try each digit in turn. This could no doubt be
+	# improved on.
+
+	for {set j -9} {$j <= 9} {incr j} {
+	    set digitMatrix \
+		[list [list [expr {$j+1}] 10] [list [expr {$j-1}] 10]]
+	    if {[mrefines [mdotm [reverse $digitMatrix] $m]]} {
+		lappend retval $j
+		set nextdigit [list {10 0} [list [expr {-$j}] 1]]
+		set m [mdotm $nextdigit $m]
+		set done 0
+		break
+	    }
+	}
+    }
+    return $retval
+}
+
+# math::exact::eFormat --
+#
+#	Formats a decimal exponent and significand in E format
+#
+# Parameters:
+#	expAndDigits - List whose first element is the exponent and
+#		       whose remaining elements are the digits of the
+#		       significand.
+
+proc ::math::exact::eFormat {expAndDigits} {
+
+    # An empty sequence of digits is an indeterminate number
+
+    if {[llength $expAndDigits] < 2} {
+	return Undetermined
+    }
+    set significand [lassign $expAndDigits exponent]
+
+    # Accumulate the digits
+    set v 0
+    foreach digit $significand {
+	set v [expr {10 * $v + $digit}]
+    }
+
+    # Adjust the exponent if the significand has too few digits.
+
+    set l [llength $significand]
+    while {$l > 0 && abs($v) < 10**($l-1)} {
+	incr l -1
+	incr exponent -1
+    }
+    incr exponent -1
+
+    # Put in the sign
+
+    if {$v < 0} {
+	set result -
+	set v [expr {-$v}]
+    } else {
+	set result {}
+    }
+
+    # Put in the significand with the decimal point after the leading digit.
+
+    if {$v == 0} {
+	append result 0
+    } else {
+	append result [string index $v 0] . [string range $v 1 end]
+    }
+
+    # Put in the exponent
+
+    append result e $exponent
+
+    return $result
+}
+
+# math::exact::showRat --
+#
+#	Formats an exact rational for printing in E format.
+#
+# Parameters:
+#	v - Two-element list of numerator and denominator.
+#
+# Results:
+#	Returns the quotient in E format.  Nonzero/zero == Infinity,
+#	0/0 == NaN.
+
+proc ::math::exact::showRat {v} {
+    lassign $v p q
+    if {$p != 0 || $q != 0} {
+	return [format %e [expr {double($p)/double($q)}]]
+    } else {
+	return NaN
+    }
+}
+
+# math::exact::showInterval --
+#
+#	Formats a rational interval for printing
+#
+# Parameters:
+#	m - Matrix representing the interval
+#
+# Results:
+#	Returns a string representing the interval in E format.
+
+proc ::math::exact::showInterval {m} {
+    lassign $m v w
+    return "\[[showRat $w] .. [showRat $v]\]"
+}
+
+# math::exact::showTensor --
+#
+#	Formats a tensor for printing
+#
+# Parameters:
+#	t - Tensor to print
+#
+# Results:
+#	Returns a string containing the left and right matrices of the
+#	tensor, each represented as an interval.
+
+proc ::math::exact::showTensor {t} {
+    lassign $t m n
+    return [list [showInterval $m] [showInterval $n]]
+}
+
+# math::exact::counted --
+#
+#	Reference counted object
+
+oo::class create math::exact::counted {
+    variable refcount_
+
+    # Constructor builds an object with a zero refcount.
+    constructor {} {
+	if 0 {
+	    puts {}
+	    puts "construct: [self object] refcount now 0"
+	    for {set i [info frame]} {$i > 0} {incr i -1} {
+		set frame [info frame $i]
+		if {[dict get $frame type] eq {source}} {
+		    set line [dict get $frame line]
+		    puts "\t[file tail [dict get $frame file]]:$line"
+		    if {$line < 0} {
+			if {[dict exists $frame proc]} {
+			    puts "\t\t[dict get $frame proc]"
+			}
+			puts "\t\t\[[dict get $frame cmd]\]"
+		    }
+		} else {
+		    puts $frame
+		}
+	    }
+	}
+	incr refcount_
+	set refcount_ 0
+    }
+
+    # The 'ref' method adds a reference to this object, and returns this object
+    method ref {} {
+	if 0 {
+	    puts {}
+	    puts "ref: [self object] refcount now [expr {$refcount_ + 1}]"
+	    if {$refcount_ == 0} {
+		puts "\t[my dump]"
+	    }
+	    for {set i [info frame]} {$i > 0} {incr i -1} {
+		set frame [info frame $i]
+		if {[dict get $frame type] eq {source}} {
+		    set line [dict get $frame line]
+		    puts "\t[file tail [dict get $frame file]]:$line"
+		    if {$line < 0} {
+			if {[dict exists $frame proc]} {
+			    puts "\t\t[dict get $frame proc]"
+			}
+			puts "\t\t\[[dict get $frame cmd]\]"
+		    }
+		} else {
+		    puts $frame
+		}
+	    }
+	}
+	incr refcount_
+	return [self]
+    }
+
+    # The 'unref' method removes a reference from this object, and destroys
+    # this object if the refcount becomes nonpositive.
+    method unref {} {
+	if 0 {
+	    puts {}
+	    puts "unref: [self object] refcount now [expr {$refcount_ - 1}]"
+	    for {set i [info frame]} {$i > 0} {incr i -1} {
+		set frame [info frame $i]
+		if {[dict get $frame type] eq {source}} {
+		    set line [dict get $frame line]
+		    puts "\t[file tail [dict get $frame file]]:$line"
+		    if {$line < 0} {
+			if {[dict exists $frame proc]} {
+			    puts "\t\t[dict get $frame proc]"
+			}
+			puts "\t\t\[[dict get $frame cmd]\]"
+		    }
+		}
+	    }
+	}
+
+	# Destroying this object can result in a long chain of object
+	# destruction and eventually a stack overflow. Instead of destroying
+	# immediately, list the objects to be destroyed in
+	# math::exact::deleteStack, and destroy them only from the outermost
+	# stack level that's running 'unref'.
+
+	if {[incr refcount_ -1] <= 0} {
+	    variable ::math::exact::deleteStack
+
+	    # Is this the outermost level?
+	    set queueActive [expr {[info exists deleteStack]}]
+
+	    # Schedule this object's destruction
+	    lappend deleteStack [self object]
+	    if {!$queueActive} {
+
+		# At outermost level, destroy all scheduled objects.
+		# Destroying one may schedule another.
+		while {[llength $deleteStack] != 0} {
+		    set obj [lindex $deleteStack end]
+		    set deleteStack \
+			[lreplace $deleteStack[set deleteStack {}] end end]
+		    $obj destroy
+		}
+
+		# Once everything quiesces, delete the list.
+		unset deleteStack
+	    }
+	}
+    }
+
+    # The 'refcount' method returns the reference count of this object for
+    # debugging.
+    method refcount {} {
+	return $refcount_
+    }
+
+    destructor {
+    }
+}
+
+# An expression is a vector, a matrix applied to an expression,
+# or a tensor applied to two expressions. The inner expressions
+# may be constructed lazily.
+
+oo::class create math::exact::Expression {
+    superclass math::exact::counted
+
+    # absorbed_, signAndMagnitude_, and leadingDigitAndRest_
+    # memoize the return values of the 'absorb', 'getSignAndMagnitude',
+    # and 'getLeadingDigitAndRest' methods.
+
+    variable absorbed_ signAndMagnitude_ leadingDigitAndRest_
+
+    # Constructor initializes refcount
+    constructor {} {
+	next
+    }
+
+    # Destructor releases memoized objects
+    destructor {
+	if {[info exists signAndMagnitude_]} {
+	    [lindex $signAndMagnitude_ 1] unref
+	}
+	if {[info exists absorbed_]} {
+	    $absorbed_ unref
+	}
+	if {[info exists leadingDigitAndRest_]} {
+	    [lindex $leadingDigitAndRest_ 1] unref
+	}
+	next
+    }
+
+    # getSignAndMagnitude returns a two-element list:
+    # the sign matrix, which is one of ispos, isneg, isinf, and iszer,
+    # the magnitude, which is another exact real.
+    method getSignAndMagnitude {} {
+	if {![info exists signAndMagnitude_]} {
+	    if {[my refinesM $::math::exact::ispos]} {
+		set signAndMagnitude_ \
+		    [list $::math::exact::spos \
+			 [[my applyM $::math::exact::ispos] ref]]
+	    } elseif {[my refinesM $::math::exact::isneg]} {
+		set signAndMagnitude_ \
+		    [list $::math::exact::sneg \
+			 [[my applyM $::math::exact::isneg] ref]]
+	    } elseif {[my refinesM $::math::exact::isinf]} {
+		set signAndMagnitude_ \
+		    [list $::math::exact::sinf \
+			 [[my applyM $::math::exact::isinf] ref]]
+	    } elseif {[my refinesM $::math::exact::iszer]} {
+		set signAndMagnitude_ \
+		    [list $::math::exact::szer \
+			 [[my applyM $::math::exact::iszer] ref]]
+	    } else {
+		set absorbed_ [my absorb]
+		set signAndMagnitude_ [$absorbed_ getSignAndMagnitude]
+		[lindex $signAndMagnitude_ 1] ref
+	    }
+	}
+	return $signAndMagnitude_
+    }
+
+    # The 'getLeadingDigitAndRest' method accepts a flag for whether
+    # a digit must be extracted (1) or a rational number may be returned
+    # directly (0). It returns a two-element list: a digit matrix, which
+    # is one of $dpos, $dneg or $dzer, and an exact real representing
+    # the number by which the given digit matrix must be postmultiplied.
+    method getLeadingDigitAndRest {needDigit} {
+	if {![info exists leadingDigitAndRest_]} {
+	    if {[my refinesM $::math::exact::idpos]} {
+		set leadingDigitAndRest_ \
+		    [list $::math::exact::dpos \
+			 [[my applyM $::math::exact::idpos] ref]]
+	    } elseif {[my refinesM $::math::exact::idneg]} {
+		set leadingDigitAndRest_ \
+		    [list $::math::exact::dneg \
+			 [[my applyM $::math::exact::idneg] ref]]
+	    } elseif {[my refinesM $::math::exact::idzer]} {
+		set leadingDigitAndRest_ \
+		    [list $::math::exact::dzer \
+			 [[my applyM $::math::exact::idzer] ref]]
+	    } else {
+		set absorbed_ [my absorb]
+		set newval $absorbed_
+		$newval ref
+		set leadingDigitAndRest_ \
+		    [$newval getLeadingDigitAndRest $needDigit]
+		if {[llength $leadingDigitAndRest_] >= 2} {
+		    [lindex $leadingDigitAndRest_ 1] ref
+		}
+		$newval unref
+	    }
+	}
+	return $leadingDigitAndRest_
+    }
+
+    # getInterval --
+    #	Accumulates 'nDigits' digit matrices, and returns their product,
+    #	which is a matrix representing the interval that the digits represent.
+    method getInterval {nDigits} {
+	lassign [my getSignAndMagnitude] interval e
+	$e ref
+	lassign [$e getLeadingDigitAndRest 1] ld f
+	set interval [math::exact::mdotm $interval $ld]
+	$f ref; $e unref; set e $f
+	set d $ld
+	while {[incr nDigits -1] > 0} {
+	    lassign [$e getLeadingDigitAndRest 1] d f
+	    set interval [math::exact::mdotm $interval $d]
+	    $f ref; $e unref; set e $f
+	}
+	$e unref
+	return $interval
+    }
+
+    # asReal --
+    #	Coerces an object from rational to real
+    #
+    # Parameters:
+    #	None.
+    #
+    # Results:
+    #	Returns this object
+    method asReal {} {self object}
+
+    # asFloat --
+    #	Represents this number in E format, after accumulating 'relDigits'
+    #	digit matrices.
+    method asFloat {relDigits} {
+	set v [[my asReal] ref]
+	set result [math::exact::mAsFloat [$v getInterval $relDigits]]
+	$v unref
+	return $result
+    }
+
+    # asPrint --
+    #	Represents this number for printing. Represents rationals exactly,
+    #   others after accumulating 'relDigits' digit matrices.
+    method asPrint {relDigits} {
+	tailcall math::exact::mAsFloat [my getInterval $relDigits]
+    }
+
+    # Derived classes are expected to implement the following methods:
+    # method dump {} {
+    #	# Formats the object for debugging
+    #	# Returns the formatted string
+    # }
+    method dump {} {
+	error "[info object class [self object]] does not implement the 'dump' method."
+    }
+
+    # method refinesM {m} {
+    #	# Returns 1 if premultiplying by the matrix m refines this object
+    #   # Returns 0 otherwise
+    # }
+    method refinesM {m} {
+	error "[info object class [self object]] does not implement the 'refinesM' method."
+    }
+
+    # method applyM {m} {
+    #	# Premultiplies this object by the matrix m
+    # }
+    method applyM {m} {
+	error "[info object class [self object]] does not implement the 'applyM' method."
+    }
+
+    # method applyTLeft {t r} {
+    # 	# Computes the left product of the tensor t with this object, and
+    #	# applies the result to the right operand r.
+    #	# Returns a new exact real representing the product
+    # }
+    method applyTLeft {t r} {
+	error "[info object class [self object]] does not implement the 'applyTLeft' method."
+    }
+
+    # method applyTRight {t l} {
+    # 	# Computes the right product of the tensor t with this object, and
+    #	# applies the result to the left operand l.
+    #	# Returns a new exact real representing the product
+    # }
+    method applyTRight {t l} {
+	error "[info object class [self object]] does not implement the 'applyTRight' method."
+    }
+
+    # method absorb {} {
+    #	# Absorbs the next subexpression or digit into this expression
+    #	# Returns the result of absorption, which always represents a
+    #	# smaller interval than this expression
+    # }
+    method absorb {} {
+	error "[info object class [self object]] does not implement the 'absorb' method."
+    }
+
+    # U- --
+    #
+    #   Unary - applied to this object
+    #
+    # Results:
+    #	Returns the negation.
+
+    method U- {} {
+	my ref
+	lassign [my getSignAndMagnitude] sA mA
+	set m [math::exact::mdotm {{-1 0} {0 1}} $sA]
+	set result [math::exact::Mstrict new $m $mA]
+	my unref
+	return $result
+    }; export U-
+
+    # + --
+    #	Adds this object to another.
+    #
+    # Parameters:
+    #	r - Right addend
+    #
+    # Results:
+    #	Returns the sum
+    #
+    # Either object may be rational (an instance of V) or real (any other
+    # Expression).
+    #
+    # This method is a Consumer with respect to the current object and to r.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method + {r} {
+	return [$r E+ [self object]]
+    }; export +
+
+    # E+ --
+    #	Adds two exact reals.
+    #
+    # Parameters:
+    #	l - Left addend
+    #
+    # Results:
+    #	Returns the sum.
+    #
+    # Neither object is an instance of V (that is, neither is a rational).
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method E+ {l} {
+	tailcall math::exact::+real $l [self object]
+    }; export E+
+
+    # V+ --
+    #	Adds a rational and an exact real
+    #
+    # Parameters:
+    #	l - Left addend
+    #
+    # Results:
+    #	Returns the sum.
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method V+ {l} {
+	tailcall math::exact::+real $l [self object]
+    }; export V+
+
+    # - --
+    #	Subtracts another object from this object
+    #
+    # Parameters:
+    #	r - Subtrahend
+    #
+    # Results:
+    #	Returns the difference
+    #
+    # Either object may be rational (an instance of V) or real (any other
+    # Expression).
+    #
+    # This method is a Consumer with respect to the current object and to r.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method - {r} {
+	return [$r E- [self object]]
+    }; export -
+
+    # E- --
+    #	Subtracts this exact real from another
+    #
+    # Parameters:
+    #	l - Minuend
+    #
+    # Results:
+    #	Returns the difference
+    #
+    # Neither object is an instance of V (that is, neither is a rational).
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method E- {l} {
+	tailcall math::exact::-real $l [self object]
+    }; export E-
+
+    # V- --
+    #	Subtracts this exact real from a rational
+    #
+    # Parameters:
+    #	l - Minuend
+    #
+    # Results:
+    #	Returns the difference
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method V- {l} {
+	tailcall math::exact::-real $l [self object]
+    }; export V-
+
+    # * --
+    #	Multiplies this object by another.
+    #
+    # Parameters:
+    #	r - Right argument to the multiplication
+    #
+    # Results:
+    #	Returns the product
+    #
+    # Either object may be rational (an instance of V) or real (any other
+    # Expression).
+    #
+    # This method is a Consumer with respect to the current object and to r.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method * {r} {
+	return [$r E* [self object]]
+    }; export *
+
+    # E* --
+    #	Multiplies two exact reals.
+    #
+    # Parameters:
+    #	l - Left argument to the multiplication
+    #
+    # Results:
+    #	Returns the product.
+    #
+    # Neither object is an instance of V (that is, neither is a rational).
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method E* {l} {
+	tailcall math::exact::*real $l [self object]
+    }; export E*
+
+    # V* --
+    #	Multiplies a rational and an exact real
+    #
+    # Parameters:
+    #	l - Left argument to the multiplication
+    #
+    # Results:
+    #	Returns the product.
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method V* {l} {
+	tailcall math::exact::*real $l [self object]
+    }; export V*
+
+    # / --
+    #	Divides this object by another.
+    #
+    # Parameters:
+    #	r - Divisor
+    #
+    # Results:
+    #	Returns the quotient
+    #
+    # Either object may be rational (an instance of V) or real (any other
+    # Expression).
+    #
+    # This method is a Consumer with respect to the current object and to r.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method / {r} {
+	return [$r E/ [self object]]
+    }; export /
+
+    # E/ --
+    #	Divides two exact reals.
+    #
+    # Parameters:
+    #	l - Dividend
+    #
+    # Results:
+    #	Returns the quotient.
+    #
+    # Neither object is an instance of V (that is, neither is a rational).
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method E/ {l} {
+	tailcall math::exact::/real $l [self object]
+    }; export E/
+
+    # V/ --
+    #	Divides a rational by an exact real
+    #
+    # Parameters:
+    #	l - Dividend
+    #
+    # Results:
+    #	Returns the product.
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method V/ {l} {
+	tailcall math::exact::/real $l [self object]
+    }; export V/
+
+    # ** -
+    #	Raises an exact real to a power
+    #
+    # Parameters:
+    #	r - Exponent
+    #
+    # Results:
+    #	Returns the power.
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method ** {r} {
+	tailcall $r E** [self object]
+    }; export **
+
+    # E** -
+    #	Raises an exact real to the power of an exact real
+    #
+    # Parameters:
+    #	l - Base to exponentiate
+    #
+    # Results:
+    #	Returns the power
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method E** {l} {
+	# This doesn't work as a tailcall, because this object could have
+	# been destroyed by the time we're trying to invoke the tailcall,
+	# and that will keep command names from resolving because the
+	# tailcall mechanism will try to find them in the destroyed namespace.
+	return [math::exact::function::exp \
+		    [my * [math::exact::function::log $l]]]
+    }; export E**
+
+    # V** -
+    #	Raises a rational to the power of an exact real
+    #
+    # Parameters:
+    #	l - Base to exponentiate
+    #
+    # Results:
+    #	Returns the power
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method V** {l} {
+	# This doesn't work as a tailcall, because this object could have
+	# been destroyed by the time we're trying to invoke the tailcall,
+	# and that will keep command names from resolving because the
+	# tailcall mechanism will try to find them in the destroyed namespace.
+	return [math::exact::function::exp \
+		    [my * [math::exact::function::log $l]]]
+    }; export V**
+
+    # sqrt --
+    #
+    #	Create an expression representing the square root of an exact
+    #	real argument.
+    #
+    # Results:
+    #	Returns the square root.
+    #
+    # This procedure is a Consumer with respect the the argument and a
+    # Constructor with respect to the result, returning a zero-reference
+    # result.
+
+    method sqrt {} {
+	variable ::math::exact::isneg
+	variable ::math::exact::idzer
+	variable ::math::exact::idneg
+	variable ::math::exact::idpos
+
+	# The algorithm is a modified Newton-Raphson from the Potts and
+	# Menissier-Morain papers. The algorithm for sqrt(x) converges
+	# rapidly only if x is close to 1, so we rescale to make sure that
+	# x is between 1/3 and 3. Specifically:
+	# - if x is known to be negative (that is, if $idneg refines it)
+	#   then error.
+	# - if x is close to 1, $idzer refines it, and we can calculate the
+	#   square root directly.
+	# - if x is less than 1, $idneg refines it, and we calculate sqrt(4*x)
+	#   and multiply by 1/2.
+	# - if x is greater than 1, $idpos refines it, and we calculate
+	#   sqrt(x/4) and multiply by 2.
+	# - if none of the above hold, we have insufficient information about
+	#   the magnitude of x and perform a digit exchange.
+
+	my ref
+	if {[my refinesM $isneg]} {
+	    # Negative argument is an error
+	    return -code error -errorcode {MATH EXACT SQRTNEGATIVE} \
+		"sqrt of negative argument"
+	} elseif {[my refinesM $idzer]} {
+	    # Argument close to 1
+	    set res [::math::exact::SqrtWorker new [self object]]
+	} elseif {[my refinesM $idneg]} {
+	    # Small argument - multiply by 4 and halve the square root
+	    set y [[my applyM {{4 0} {0 1}}] ref]
+	    set z [[$y sqrt] ref]
+	    set res [$z applyM {{1 0} {0 2}}]
+	    $z unref
+	    $y unref
+	} elseif {[my refinesM $idpos]} {
+	    # Large argument - divide by 4 and double the square root
+	    set y [[my applyM {{1 0} {0 4}}] ref]
+	    set z [[$y sqrt] ref]
+	    set res [$z applyM {{2 0} {0 1}}]
+	    $z unref
+	    $y unref
+	} else {
+	    # Unclassified argyment. Perform a digit exchange and try again.
+	    set y [[my absorb] ref]
+	    set res [$y sqrt]
+	    $y unref
+	}
+	my unref
+	return $res
+    }
+}
+
+# math::exact::V --
+#	Vector object
+#
+# A vector object represents a rational number. It is always strict; no
+# methods need to perform lazy evaluation.
+
+oo::class create math::exact::V {
+    superclass math::exact::Expression
+
+    # v_ is the vector represented.
+    variable v_
+
+    # Constructor accepts the vector as a two-element list {n d}
+    # where n is by convention the numerator and d the denominator.
+    # It is expected that either n or d is nonzero, and that gcd(n,d) == 0.
+    # It is also expected that the fraction will be in lowest terms.
+    constructor {v} {
+	next
+	set v_ $v
+    }
+
+    # Destructor need only update reference counts
+    destructor {
+	next
+    }
+
+    # If a rational is acceptable, getLeadingDigitAndRest may simply return
+    # this object.
+    method getLeadingDigitAndRest {needDigit} {
+	if {$needDigit} {
+	    return [next $needDigit]
+	} else {
+	    # Note that the result MUST NOT be memoized, as that would lead
+	    # to a circular reference, breaking the refcount system.
+	    return [self object]
+	}
+    }
+
+    # Print this object
+    method dump {} {
+	return "V($v_)"
+    }
+
+    # Test if the vector refines when premultiplied by a matrix
+    method refinesM {m} {
+	return [math::exact::vrefines [math::exact::mdotv $m $v_]]
+    }
+
+    # Apply a matrix to the vector.
+    # Precondition: v is in lowest terms
+
+    method applyM {m} {
+	set d [math::exact::determinant $m]
+	if {$d < 0} { set d [expr {-$d}] }
+	if {($d & ($d-1)) != 0} {
+	    return [math::exact::V new \
+			[math::exact::vreduce [math::exact::mdotv $m $v_]]]
+	} else {
+	    return [math::exact::V new \
+			[math::exact::vscale [math::exact::mdotv $m $v_]]]
+	}
+    }
+
+    # Left-multiply a tensor t by the vector, and apply the result to
+    # an expression 'r'
+    method applyTLeft {t r} {
+	set u [math::exact::mscale [math::exact::tleftv $t $v_]]
+	set det [math::exact::determinant $u]
+	if {$det < 0} { set det [expr {-$det}] }
+	if {($det & ($det-1)) == 0} {
+	    # determinant is a power of 2
+	    set res [$r applyM $u]
+	    return $res
+	} else {
+	    return [math::exact::Mstrict new $u $r]
+	}
+    }
+
+    # Right-multiply a tensor t by the vector, and apply the result
+    # to an expression 'l'
+    method applyTRight {t l} {
+	set u [math::exact::mscale [math::exact::trightv $t $v_]]
+	set det [math::exact::determinant $u]
+	if {$det < 0} { set det [expr {-$det}] }
+	if {($det & ($det-1)) == 0} {
+	    # determinant is a power of 2
+	    set res [$l applyM $u]
+	    return $res
+	} else {
+	    return [math::exact::Mstrict new $u $l]
+	}
+    }
+
+    # Get the vector components
+    method getV {} {
+	return $v_
+    }
+
+    # Get the (zero-width) interval that the vector represents.
+    method getInterval {nDigits} {
+	return [list $v_ $v_]
+    }
+
+    # Absorb more information
+    method absorb {} {
+	# Nothing should ever call this, because a vector's information is
+	# already complete.
+	error "cannot absorb anything into a vector"
+    }
+
+    # asReal --
+    #	Coerces an object from rational to real
+    #
+    # Parameters:
+    #	None.
+    #
+    # Results:
+    #	Returns this object converted to an exact real.
+    method asReal {} {
+	my ref
+	lassign [my getSignAndMagnitude] s m
+	set result [math::exact::Mstrict new $s $m]
+	my unref
+	return $result
+    }
+
+    # U- --
+    #
+    #   Unary - applied to this object
+    #
+    # Results:
+    #	Returns the negation.
+
+    method U- {} {
+	my ref
+	lassign $v_ p q
+	set result [math::exact::V new [list [expr {-$p}] $q]]
+	my unref
+	return $result
+    }; export U-
+
+    # + --
+    #	Adds a vector to another object
+    #
+    # Parameters:
+    #	r - Right addend
+    #
+    # Results:
+    #	Returns the sum
+    #
+    # The right-hand addend may be rational (an instance of V) or real
+    # (any other Expression).
+    #
+    # This method is a Consumer with respect to the current object and to r.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method + {r} {
+	return [$r V+ [self object]]
+    }; export +
+
+    # E+ --
+    #	Adds an exact real and a vector
+    #
+    # Parameters:
+    #	l - Left addend
+    #
+    # Results:
+    #	Returns the sim.
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method E+ {l} {
+	tailcall math::exact::+real $l [self object]
+    }; export E+
+
+    # V+ --
+    #	Adds two rationals
+    #
+    # Parameters:
+    #	l - Rational multiplicand
+    #
+    # Results:
+    #	Returns the product.
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+    method V+ {l} {
+	my ref
+	$l ref
+	lassign [$l getV] a b
+	lassign $v_ c d
+	$l unref
+	my unref
+	return [math::exact::V new \
+		    [math::exact::vreduce \
+			 [list [expr {$a*$d+$b*$c}] [expr {$b*$d}]]]]
+    }; export V+
+
+    # - --
+    #	Subtracts another object from a vector
+    #
+    # Parameters:
+    #	r - Subtrahend
+    #
+    # Results:
+    #	Returns the difference
+    #
+    # The right-hand operand may be rational (an instance of V) or real
+    # (any other Expression).
+    #
+    # This method is a Consumer with respect to the current object and to r.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method - {r} {
+	return [$r V- [self object]]
+    }; export -
+
+    # E- --
+    #	Subtracts this exact real from a rational
+    #
+    # Parameters:
+    #	l - Left addend
+    #
+    # Results:
+    #	Returns the difference.
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method E- {l} {
+	tailcall math::exact::-real $l [self object]
+    }; export E-
+
+    # V- --
+    #	Subtracts this rational from another
+    #
+    # Parameters:
+    #	l - Rational minuend
+    #
+    # Results:
+    #	Returns the difference.
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+    method V- {l} {
+	my ref
+	$l ref
+	lassign [$l getV] a b
+	lassign $v_ c d
+	$l unref
+	my unref
+	return [math::exact::V new \
+		    [math::exact::vreduce \
+			 [list [expr {$a*$d-$b*$c}] [expr {$b*$d}]]]]
+    }; export V-
+
+    # * --
+    #	Multiplies a rational by another object
+    #
+    # Parameters:
+    #	r - Right-hand factor
+    #
+    # Results:
+    #	Returns the difference
+    #
+    # The right-hand operand may be rational (an instance of V) or real
+    # (any other Expression).
+    #
+    # This method is a Consumer with respect to the current object and to r.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method * {r} {
+	return [$r V* [self object]]
+    }; export *
+
+    # E* --
+    #	Multiplies an exact real and a rational
+    #
+    # Parameters:
+    #	l - Multiplicand
+    #
+    # Results:
+    #	Returns the product.
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method E* {l} {
+	tailcall math::exact::*real $l [self object]
+    }; export E*
+
+    # V* --
+    #	Multiplies two rationals
+    #
+    # Parameters:
+    #	l - Rational multiplicand
+    #
+    # Results:
+    #	Returns the product.
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+    method V* {l} {
+	my ref
+	$l ref
+	lassign [$l getV] a b
+	lassign $v_ c d
+	$l unref
+	my unref
+	return [math::exact::V new \
+		    [math::exact::vreduce \
+			 [list [expr {$a*$c}] [expr {$b*$d}]]]]
+    }; export V*
+
+    # / --
+    #	Divides this object by another.
+    #
+    # Parameters:
+    #	r - Divisor
+    #
+    # Results:
+    #	Returns the quotient
+    #
+    # Either object may be rational (an instance of V) or real (any other
+    # Expression).
+    #
+    # This method is a Consumer with respect to the current object and to r.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method / {r} {
+	return [$r V/ [self object]]
+    }; export /
+
+   # E/ --
+    #	Divides an exact real and a rational
+    #
+    # Parameters:
+    #	l - Dividend
+    #
+    # Results:
+    #	Returns the quotient.
+    #
+    # The divisor is not a rationa.
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method E/ {l} {
+	tailcall math::exact::/real $l [self object]
+    }; export E/
+
+    # V/ --
+    #	Divides two rationals
+    #
+    # Parameters:
+    #	l - Dividend
+    #
+    # Results:
+    #	Returns the quotient.
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+    method V/ {l} {
+	my ref
+	$l ref
+	lassign [$l getV] a b
+	lassign $v_ c d
+	set result [math::exact::V new \
+			[math::exact::vreduce \
+			     [list [expr {$a*$d}] [expr {$b*$c}]]]]
+	$l unref
+	my unref
+	return $result
+    }; export V/
+
+    # ** -
+    #	Raises a rational to a power
+    #
+    # Parameters:
+    #	r - Exponent
+    #
+    # Results:
+    #	Returns the power.
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method ** {r} {
+	tailcall $r V** [self object]
+    }; export **
+
+    # E** -
+    #	Raises an exact real to a rational power
+    #
+    # Parameters:
+    #	l - Base to exponentiate
+    #
+    # Results:
+    #	Returns the power
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method E** {l} {
+
+	# Extract numerator and demominator of the exponent, and consume the
+	# exponent.
+	my ref
+	lassign $v_ c d
+	my unref
+
+	# Normalize the sign of the exponent
+	if {$d < 0} {
+	    set c [expr {-$c}]
+	    set d [expr {-$d}]
+	}
+
+	# Don't choke if somehow a 0/0 gets here.
+	if {$c == 0 && $d == 0} {
+	    $l unref
+	    return -code error -errorcode "MATH EXACT ZERODIVZERO" \
+		"zero divided by zero"
+	}
+
+	# Handle integer powers
+	if {$d == 1} {
+	    return [math::exact::real**int $l $c]
+	}
+
+	# Other rational powers come here.
+	# We know that $d > 0, and we're not just doing
+	# exponentiation by an integer
+
+	return [math::exact::real**rat $l $c $d]
+    }; export E**
+
+    # V** -
+    #	Raises a rational base to a rational power
+    #
+    # Parameters:
+    #	l - Base to exponentiate
+    #
+    # Results:
+    #	Returns the power
+    #
+    # This method is a Consumer with respect to the current object and to l.
+    # It is a Constructor with respect to its result, returning a zero-ref
+    # object.
+
+    method V** {l} {
+
+	# Extract the numerator and denominator of the base and consume
+	# the base.
+	$l ref
+	lassign [$l getV] a b
+	$l unref
+
+	# Extract numerator and demominator of the exponent, and consume the
+	# exponent.
+	my ref
+	lassign $v_ c d
+	my unref
+
+	# Normalize the signs of the arguments
+	if {$b < 0} {
+	    set a [expr {-$a}]
+	    set b [expr {-$b}]
+	}
+	if {$d < 0} {
+	    set c [expr {-$c}]
+	    set d [expr {-$d}]
+	}
+
+	# Don't choke if somehow a 0/0 gets here.
+	if {$a == 0 && $b == 0 || $c == 0 && $d == 0} {
+	    return -code error -errorcode "MATH EXACT ZERODIVZERO" \
+		"zero divided by zero"
+	}
+
+	# b >= 0 and d >= 0
+
+	if {$a == 0} {
+	    if {$c == 0} {
+		return -code error -errorcode "MATH EXACT ZEROPOWZERO" \
+		    "zero to zero power"
+	    } elseif {$d == 0} {
+		return -code error -errorcode "MATH EXACT ZEROPOWINF" \
+		    "zero to infinite power"
+	    } else {
+		return [math::exact::V new {0 1}]
+	    }
+	}
+
+	# a != 0, b >= 0, d >= 0
+
+	if {$b == 0} {
+	    if {$c == 0} {
+		return -code error -errorcode "MATH EXACT INFPOWZERO" \
+		    "infinity to zero power"
+	    } elseif {$c < 0} {
+		return [math::exact::V new {0 1}]
+	    } else {
+		return [math::exact::V new {1 0}]
+	    }
+	}
+
+	# a != 0, b > 0, d >= 0
+
+	if {$c == 0} {
+	    return [math::exact::V new {1 1}]
+	}
+
+	# handle integer exponents
+
+	if {$d == 1} {
+	    return [math::exact::rat**int $a $b $c]
+	}
+
+	# a != 0, b > 0, c != 0, d >= 0
+
+	return [math::exact::rat**rat $a $b $c $d]
+    }; export V**
+
+    # sqrt --
+    #
+    #	Calculates the square root of this object
+    #
+    # Results:
+    #	Returns the square root as an exact real.
+    #
+    # This method is a Consumer with respect to this object and a Constructor
+    # with respect to the result, returning a zero-ref object.
+    method sqrt {} {
+	my ref
+	if {([lindex $v_ 0] < 0) ^ ([lindex $v_ 1] < 0)} {
+	    return -code error -errorCode "MATH EXACT SQRTNEGATIVE" \
+		{square root of negative argument}
+	}
+	set result [::math::exact::Sqrtrat new {*}$v_]
+	my unref
+	return $result
+    }
+
+}
+
+# math::exact::M --
+#	Expression consisting of a matrix times another expression
+#
+# The matrix {a c} {b d} represents the homography (a*x + b) / (c*x + d).
+#
+# The inner expression may need to be evaluated lazily. Whether evaluation
+# is strict or lazy, the 'e' method will return the expression.
+
+oo::class create math::exact::M {
+    superclass math::exact::Expression
+
+    # m_ is the matrix; e_ the inner expression; absorbed_ a cache of the
+    # result of the 'absorb' method.
+    variable m_ e_ absorbed_
+
+    # constructor accepts the matrix only. The expression is managed in
+    # derived classes.
+    constructor {m} {
+	next
+	set m_ $m
+    }
+
+    # destructor deletes the memoized expression if one has been stored.
+    # The base class destructor handles cleaning up the result of 'absorb'
+    destructor {
+	if {[info exists e_]} {
+	    $e_ unref
+	}
+	next
+    }
+
+    # Test if the matrix refines when premultiplied by another matrix n
+    method refinesM {n} {
+	return [math::exact::mrefines [math::exact::mdotm $n $m_]]
+    }
+
+    # Premultiply the matrix by another matrix n
+    method applyM {n} {
+	set d [math::exact::determinant $n]
+	if {$d < 0} {set d [expr {-$d}]}
+	if {($d & ($d-1)) != 0} {
+	    return [math::exact::Mstrict new \
+			[math::exact::mreduce [math::exact::mdotm $n $m_]] \
+			[my e]]
+	} else {
+	    return [math::exact::Mstrict new \
+			[math::exact::mscale [math::exact::mdotm $n $m_]] \
+			[my e]]
+	}
+    }
+
+    # Compute the left product of a tensor t with this matrix, and
+    # apply the resulting tensor to the expression 'r'.
+    method applyTLeft {t r} {
+	return [math::exact::Tstrict new \
+		    [math::exact::tscale [math::exact::tleftm $t $m_]] \
+		    1 [my e] $r]
+    }
+
+    # Compute the right product of a tensor t with this matrix, and
+    # apply the resulting tensor to the expression 'l'.
+    method applyTRight {t l} {
+	return [math::exact::Tstrict new \
+		    [math::exact::tscale [math::exact::trightm $t $m_]] \
+		    0 $l [my e]]
+    }
+
+    # Absorb a digit into this matrix.
+    method absorb {} {
+	if {![info exists absorbed_]} {
+	    set absorbed_ [[[my e] applyM $m_] ref]
+	}
+	return $absorbed_
+    }
+
+    # Derived classes are expected to implement:
+    # method e {} {
+    #	# Returns the expression to which this matrix is applied.
+    #	# Optionally memoizes the result in $e_.
+    # }
+    method e {} {
+	error "[info object class [self object]] does not implement the 'e' method."
+    }
+}
+
+# math::exact::Mstrict --
+#
+#	Expression representing the product of a matrix and another
+#	expression.
+#
+# In this version of the class, the expression is known in advance -
+# evaluated strictly.
+
+oo::class create math::exact::Mstrict {
+    superclass math::exact::M
+
+    # m_ is the matrix.
+    # e_ is the expression
+    # absorbed_ caches the result of the 'absorb' method.
+    variable m_ e_ absorbed_
+
+    # Constructor accepts the matrix and the expression to which
+    # it applies.
+    constructor {m e} {
+	next $m
+	set e_ [$e ref]
+    }
+
+    # All the heavy lifting of destruction is performed in the base class.
+    destructor {
+	next
+    }
+
+    # The 'e' method returns the expression.
+    method e {} {
+	return $e_
+    }
+
+    # The 'dump' method formats this object for debugging.
+    method dump {} {
+	return "M($m_,[$e_ dump])"
+    }
+}
+
+# math::exact::T --
+#	Expression representing a 2x2x2 tensor of the third order,
+#	applied to two subexpressions.
+
+oo::class create math::exact::T {
+    superclass math::exact::Expression
+
+    # t_ - the tensor
+    # i_ A flag indicating whether the next 'absorb' should come from the
+    #    left (0) or the right (1).
+    # l_ - the left subexpression
+    # r_ - the right subexpression
+    # absorbed_ - the result of an 'absorb' operation
+
+    variable t_ i_ l_ r_ absorbed_
+
+    # constructor accepts the tensor and the initial state for absorption
+    constructor {t i} {
+	next
+	set t_ $t
+	set i_ $i
+    }
+
+    # destructor removes cached items.
+    destructor {
+	if {[info exists l_]} {
+	    $l_ unref
+	}
+	if {[info exists r_]} {
+	    $r_ unref
+	}
+	next;			# The base class will clean up absorbed_
+    }
+
+    # refinesM --
+    #
+    #	Tests if this tensor refines when premultiplied by a matrix
+    #
+    # Parameters:
+    #	m - matrix to test
+    #
+    # Results:
+    #	Returns a Boolean indicator that is true if the product refines.
+
+    method refinesM {m} {
+	return [math::exact::trefines [math::exact::mdott $m $t_]]
+    }
+
+    # applyM --
+    #
+    #	Left multiplies this tensor by a matrix
+    #
+    # Parameters:
+    #	m - Matrix to multiply
+    #
+    # Results:
+    #	Returns the product
+    #
+    # This operation has the side effect of making the product strict at
+    # the uppermost level, by calling [my l] [my r] to instantiate the
+    # subexpressions.
+
+    method applyM {m} {
+	set d [math::exact::determinant $m]
+	if {$d < 0} {set d [expr {-$d}]}
+	if {($d & ($d-1)) != 0} {
+	    return [math::exact::Tstrict new \
+			[math::exact::treduce [math::exact::mdott $m $t_]] \
+			0 [my l] [my r]]
+	} else {
+	    return [math::exact::Tstrict new \
+			[math::exact::tscale [math::exact::mdott $m $t_]] \
+			0 [my l] [my r]]
+	}
+    }
+
+    # absorb --
+    #
+    #	Absorbs information from the subexpressions.
+    #
+    # Results:
+    #	Returns a copy of the current object, with information from
+    #   at least one subexpression absorbed so that more information is
+    #	immediately available.
+
+    method absorb {} {
+	if {![info exists absorbed_]} {
+	    if {[math::exact::trefines $t_]} {
+		lassign [math::exact::trans $t_] m n
+		set side [math::exact::mdisjointm $m $n]
+	    } else {
+		set side $i_
+	    }
+	    if {$side} {
+		set absorbed_ [[[my r] applyTRight $t_ [my l]] ref]
+	    } else {
+		set absorbed_ [[[my l] applyTLeft $t_ [my r]] ref]
+	    }
+	}
+	return $absorbed_
+    }
+
+    # applyTRight --
+    #
+    #	Right-multiplies a tensor by this expression
+    #
+    # Results:
+    #	Returns 't' left-product l right-product $r_.
+
+    method applyTRight {t l} {
+	# This is the hard case of digit exchange. We have to
+	# get the leading digit from this tensor, absorbing as
+	# necessary, right-multiply it into the tensor $t, and
+	# compose the new object.
+	#
+	# Note that unless 'rest' is empty, 'ld' is a digit matrix,
+	# so we need to check only for powers of 2 when reducing to
+	# lowest terms
+	lassign [my getLeadingDigitAndRest 0] ld rest
+	if {$rest eq {}} {
+	    set u [math::exact::mreduce [math::exact::trightv $t $ld]]
+	    return [math::exact::Mstrict new $u $l]
+	} else {
+	    set u [math::exact::tscale [math::exact::trightm $t $ld]]
+	    return [math::exact::Tstrict new $u 0 $l $rest]
+	}
+    }
+
+    # applyTLeft --
+    #
+    #	Left-multiplies a tensor by this expression
+    #
+    # Results:
+    #	Returns 't' left-product $l_ right-product 'r'
+    method applyTLeft {t r} {
+	# This is the hard case of digit exchange. We have to
+	# get the leading digit from this tensor, absorbing as
+	# necessary, left-multiply it into the tensor $t, and
+	# compose the new object
+	#
+	# Note that unless 'rest' is empty, 'ld' is a digit matrix,
+	# so we need to check only for powers of 2 when reducing to
+	# lowest terms
+	lassign [my getLeadingDigitAndRest 0] ld rest
+	if {$rest eq {}} {
+	    set u [math::exact::mreduce [math::exact::tleftv $t $ld]]
+	    return [math::exact::Mstrict $u $r]
+	} else {
+	    set u [math::exact::tscale [math::exact::tleftm $t $ld]]
+	    return [math::exact::Tstrict new $u 1 $rest $r]
+	}
+    }
+
+    # Derived classes are expected to implement the following:
+    # l --
+    #
+    #	Returns the left operand
+    method l {} {
+	error "[info object class [self object]] does not implement the 'l' method"
+    }
+
+    # r --
+    #
+    #	Returns the right operand
+    method r {} {
+	error "[info object class [self object]] does not implement the 'r' method"
+    }
+
+}
+
+# math::exact::Tstrict --
+#
+#	A strict tensor - one where the subexpressions are both known in
+#	advance.
+
+oo::class create math::exact::Tstrict {
+    superclass math::exact::T
+
+    # t_ - the tensor
+    # i_ A flag indicating whether the next 'absorb' should come from the
+    #    left (0) or the right (1).
+    # l_ - the left subexpression
+    # r_ - the right subexpression
+    # absorbed_ - the result of an 'absorb' operation
+
+    variable t_ i_ l_ r_ absorbed_
+
+    # constructor accepts the tensor, the absorption state, and the
+    # left and right operands.
+    constructor {t i l r} {
+	next $t $i
+	set l_ [$l ref]
+	set r_ [$r ref]
+    }
+
+    # base class handles all cleanup
+    destructor {
+	next
+    }
+
+    # l --
+    #
+    #	Returns the left operand
+    method l {} {
+	return $l_
+    }
+
+    # r --
+    #
+    #	Returns the right operand
+    method r {} {
+	return $r_
+    }
+
+    # dump --
+    #
+    #	Formats this object for debugging
+    method dump {} {
+	return T($t_,$i_\;[$l_ dump],[$r_ dump])
+    }
+}
+
+# math::exact::opreal --
+#
+#	Applies a bihomography (bilinear fractional transformation)
+#	to two expressions.
+#
+# Parameters:
+#	op - Tensor {{{a b} {c d}} {{e f} {g h}}} representing the operation
+#	x - left operand
+#	y - right operand
+#
+# Results:
+#	Returns an expression that represents the form:
+#	(axy + cx + ey + g) / (bxy + dx + fy + h)
+#
+# Notes:
+#	Note that the four basic arithmetic operations are included here.
+#	In addition, this procedure may be used to craft other useful
+#	transformations. For example, (1 - u**2) / (1 + u**2)
+#	could be constructed as [opreal {{{-1 1} {0 0}} {{0 0} {1 1}}} $u $u]
+
+proc ::math::exact::opreal {op x y {kludge {}}} {
+    # split x and y into sign and magnitude
+    $x ref; $y ref
+    lassign [$x getSignAndMagnitude] sx mx
+    lassign [$y getSignAndMagnitude] sy my
+    $mx ref; $my ref
+    $x unref; $y unref
+    set t [tleftm [trightm $op $sy] $sx]
+    set r [math::exact::Tstrict new $t 0 $mx $my]
+    $mx unref; $my unref
+    return $r
+}
+
+# math::exact::+real --
+# math::exact::-real --
+# math::exact::*real --
+# math::exact::/real --
+#
+#	Sum, difference, product and quotient of exact reals
+#
+# Parameters:
+#	x - First operand
+#	y - Second operand
+#
+# Results:
+#	Returns x+y, x-y, x*y or x/y as requested.
+
+proc ::math::exact::+real {a b} { variable tadd; return [opreal $tadd $a $b] }
+proc ::math::exact::-real {a b} { variable tsub; return [opreal $tsub $a $b] }
+proc ::math::exact::*real {a b} { variable tmul; return [opreal $tmul $a $b] }
+proc ::math::exact::/real {a b} { variable tdiv; return [opreal $tdiv $a $b] }
+
+# real --
+#
+#	Coerce an argument to exact-real (possibly from rational)
+#
+# Parameters:
+#	x - Argument to coerce.
+#
+# Results:
+#	Returns the argument coerced to a real.
+#
+# This operation either does nothing and returns its argument, or is a
+# Consumer with respect to its argument and a Constructor with respect to
+# its result.
+
+proc ::math::exact::function::real {x} {
+    tailcall $x asReal
+}
+
+# SqrtWorker --
+#
+#	Class to calculate the square root of a real.
+
+
+oo::class create math::exact::SqrtWorker {
+    superclass math::exact::T
+    variable l_ r_
+
+    # e - The expression whose square root should be calculated.
+    #     e should be between close to 1 for good performance. The
+    #     'sqrtreal' procedure below handles the scaling.
+    constructor {e} {
+	next {{{1 0} {2 1}} {{1 2} {0 1}}} 0
+	set l_ [$e ref]
+    }
+    method l {} {
+	return $l_
+    }
+    method r {} {
+	if {![info exists r_]} {
+	    set r_ [[math::exact::SqrtWorker new $l_] ref]
+	}
+	return $r_
+    }
+    method dump {} {
+	return "sqrt([$l_ dump])"
+    }
+}
+
+# sqrt --
+#
+#	Returns the square root of a number
+#
+# Parameters:
+#	x - Exact real number whose square root is needed.
+#
+# Results:
+#	Returns the square root as an exact real.
+#
+# The number may be rational or real. There is a special optimization used
+# if the number is rational
+
+proc ::math::exact::function::sqrt {x} {
+    tailcall $x sqrt
+}
+
+# ExpWorker --
+#
+#	Class that evaluates the exponential function for small exact reals
+
+oo::class create math::exact::ExpWorker {
+    superclass math::exact::T
+    variable t_ l_ r_ n_
+
+    # Constructor --
+    #
+    # Parameters:
+    #	e - Argument whose exponential is to be computed. (What is
+    #	    actually passed in is S0'(x) = (1+x)/(1-x))
+    #	n - Number of the convergent of the continued fraction
+    #
+    # This class is implemented by expanding the continued fraction
+    # as needed for precision. Each successive step becomes a new right
+    # subexpression of the tensor product.
+
+    constructor {e {n 0}} {
+	next [list \
+		  [list \
+		       [list [expr {2*$n + 2}] [expr {2*$n + 1}]] \
+		       [list [expr {2*$n + 1}] [expr {2*$n}]]] \
+		  [list \
+		       [list [expr {2*$n}] [expr {2*$n + 1}]] \
+		       [list [expr {2*$n + 1}] [expr {2*$n + 2}]]]] 0
+	set l_ [$e ref]
+	set n_ [expr {$n + 1}]
+    }
+
+    # l --
+    #
+    #	Returns the left subexpression; that is, the argument to the
+    #	exponential
+    method l {} {
+	return $l_
+    }
+
+    # r --
+    #	Returns the right subexpresison - the next convergent, creating it
+    #	if necessary
+    method r {} {
+	if {![info exists r_]} {
+	    set r_ [[math::exact::ExpWorker new $l_ $n_] ref]
+	}
+	return $r_
+    }
+
+    # dump --
+    #
+    #	Displays this object for debugging
+    method dump {} {
+	return ExpWorker([$l_ dump],[expr {$n_-1}])
+    }
+}
+
+# exp --
+#
+#	Evaluates the exponential function of an exact real
+#
+# Parameters:
+#	x - Quantity to be exponentiated
+#
+# Results:
+#	Returns the exact real function value.
+#
+# This procedure is a Consumer with respect to its argument and a
+# Constructor with respect to its result, returning a zero-ref object.
+
+proc ::math::exact::function::exp {x} {
+    variable ::math::exact::iszer
+    variable ::math::exact::tmul
+
+    # The continued fraction converges only for arguments between -1 and 1.
+    # If $iszer refines the argument, then it is in the correct range and
+    # we launch ExpWorker to evaluate the continued fraction. If the argument
+    # is outside the range [-1/2..1/2], then we evaluate exp(x/2) and square
+    # the result. If neither of the above is true, then we perform a digit
+    # exchange to get more information about the magnitude of the argument.
+
+    $x ref
+    if {[$x refinesM $iszer]} {
+	# Argument's absolute value is small - evaluate the exponential
+	set y [$x applyM $iszer]
+	set result [ExpWorker new $y]
+    } elseif {[$x refinesM {{2 2} {-1 1}}]} {
+	# Argument's absolute value is large - evaluate exp(x/2)**2
+	set xover2 [$x applyM {{1 0} {0 2}}]
+	set expxover2 [exp $xover2]
+	set result [*real $expxover2 $expxover2]
+    } else {
+	# Argument's absolute value is uncharacterized - perform a digit
+	# exchange to get more information.
+	set result [exp [$x absorb]]
+    }
+    $x unref
+    return $result
+}
+
+# LogWorker --
+#
+#	Helper class for evaluating logarithm of an exact real argument.
+#
+# The algorithm used is a continued fraction representation from Peter Potts's
+# paper. This worker evaluates the second and subsequent convergents. The
+# first convergent is in the 'log' procedure below, and follows a different
+# pattern from the rest of them.
+
+oo::class create math::exact::LogWorker {
+    superclass math::exact::T
+    variable t_ l_ r_ n_
+
+    # Constructor -
+    #
+    # Parameters:
+    #	e - Argument whose log is to be extracted
+    #   n - Number of the convergent.
+    constructor {e {n 1}} {
+	next [list \
+		  [list \
+		       [list $n 0] \
+		       [list [expr {2*$n + 1}] [expr {$n+1}]]] \
+		  [list \
+		       [list [expr {$n + 1}] [expr {2*$n + 1}]] \
+		       [list 0 $n]]] 0
+	set l_ [$e ref]
+	set n_ [expr {$n + 1}]
+    }
+
+    # l -
+    #	Returns the argument whose log is to be extracted
+    method l {} {
+	return $l_
+    }
+
+    # r -
+    #	Returns the next convergent, constructing it if necessary.
+    method r {} {
+	if {![info exists r_]} {
+	    set r_ [[math::exact::LogWorker new $l_ $n_] ref]
+	}
+	return $r_
+    }
+
+    # dump -
+    #	Dumps this object for debugging
+    method dump {} {
+	return LogWorker([$l_ dump],[expr {$n_-1}])
+    }
+}
+
+# log -
+#
+#	Calculates the natural logarithm of an exact real argument.
+#
+# Parameters:
+#	x - Quantity whose log is to be extracted.
+#
+# Results:
+#	Returns the logarithm
+#
+# This procedure is a Consumer with respect to its argument and a Constructor
+# with respect to its result, returning a zero-ref object.
+
+proc ::math::exact::function::log {x} {
+    variable ::math::exact::ispos
+    variable ::math::exact::isneg
+    variable ::math::exact::idpos
+    variable ::math::exact::idneg
+    variable ::math::exact::log2
+
+    # If x is between 1/2 and 2, the continued fraction will converge. If
+    # y = LogWorker(x), then log(x) = (xy + x - y - 1)/(x + y), and the
+    # latter function is a bihomography that can be evaluated by 'opreal'
+    # directly.
+    #
+    # If x is negative, that's an error.
+    # If x > 1, idpos will refine it, and we compute log(x/2) + log(2)
+    # If x < 1, idneg will refine it, and we compute log(2x) - log(2)
+    # If none of the above can be proven, perform a digit exchange and
+    # try again.
+
+    $x ref
+    if {[$x refinesM {{2 -1} {-1 2}}]} {
+	# argument in bounds
+	set result [math::exact::opreal {{{1 0} {1 1}} {{-1 1} {-1 0}}} \
+			$x \
+			[LogWorker new $x]]
+    } elseif {[$x refinesM $isneg]} {
+	# domain error
+        return -code error -errorcode {MATH EXACT LOGNEGATIVE} \
+	    "log of negative argument"
+    } elseif {[$x refinesM $idpos]} {
+	# large argument, reduce it and try again
+	set result [+real [function::log [$x applyM {{1 0} {0 2}}]] $log2]
+    } elseif {[$x refinesM $idneg]} {
+	# small argument, increase it and try again
+	set result [-real [function::log [$x applyM {{2 0} {0 1}}]] $log2]
+    } else {
+	# too little information, perform digit exchange.
+	set result [function::log [$x absorb]]
+    }
+    $x unref
+    return $result
+}
+
+# TanWorker --
+#
+#	Auxiliary function for tangent of an exact real argument
+#
+# This class develops the second and subsequent convergents of the continued
+# fraction expansion in Potts's paper
+oo::class create math::exact::TanWorker {
+    superclass math::exact::T
+    variable t_ l_ r_ n_
+
+    # Constructor -
+    #
+    # Parameters:
+    #	e - S0'(x) = (1+x)/(1-x), where we wish to evaluate tan(x).
+    #   n - Ordinal position of the convergent
+    constructor {e {n 1}} {
+	next [list \
+		  [list \
+		       [list [expr {2*$n + 1}] [expr {2*$n + 3}]] \
+		       [list [expr {2*$n - 1}] [expr {2*$n + 1}]]] \
+		  [list \
+		       [list [expr {2*$n + 1}] [expr {2*$n - 1}]] \
+		       [list [expr {2*$n + 3}] [expr {2*$n + 1}]]]] 0
+	set l_ [$e ref]
+	set n_ [expr {$n + 1}]
+    }
+
+    # l -
+    #  	Returns the argument S0'(x)
+    method l {} {
+	return $l_
+    }
+
+    # r -
+    #	Returns the next convergent, constructing it if necessary
+    method r {} {
+	if {![info exists r_]} {
+	    set r_ [[math::exact::TanWorker new $l_ $n_] ref]
+	}
+	return $r_
+    }
+
+    # dump -
+    #	Displays this object for debugging
+    method dump {} {
+	return TanWorker([$l_ dump],[expr {$n_-1}])
+    }
+}
+
+# tan --
+#	Tangent of an exact real argument
+#
+# Parameters:
+#	x - Quantity whose tangent is to be computed.
+#
+# Results:
+#	Returns the tangent
+#
+# This procedure is a Consumer with respect to its argument and a Constructor
+# with respect to its result, returning a zero-ref object.
+
+proc ::math::exact::function::tan {x} {
+    variable ::math::exact::iszer
+
+    # If |x| < 1, then we use Potts's formula for the tangent.
+    # If |x| > 1/2, then we compute y = tan(x/2) and then use the
+    # trig identity tan(x) = 2*y/(1-y**2), recognizing that the latter
+    # expression can be expressed as a bihomography applied to y and itself,
+    # allowing opreal to do the job.
+    # If neither can be proven, we perform a digit exchange to get more
+    # information.
+    # tan((2*n+1)*pi/2), for n an integer, is a well-behaved pole.
+    # In particular, 1/tan(pi/2) will correctly return zero.
+
+    $x ref
+    if {[$x refinesM $iszer]} {
+	set xx [$x applyM $iszer]
+	set result [math::exact::Tstrict new {{{1 2} {1 0}} {{-1 0} {-1 2}}} 0 \
+			$xx [TanWorker new $xx]]
+    } elseif {[$x refinesM {{2 2} {-1 1}}]} {
+	set xover2 [$x applyM {{1 0} {0 2}}]
+	set tanxover2 [function::tan $xover2]
+	set result [opreal {{{0 -1} {1 0}} {{1 0} {0 1}}} $tanxover2 $tanxover2]
+    } else {
+	set result [function::tan [$x absorb]]
+    }
+    $x unref
+    return $result
+}
+
+# sin --
+#	Sine of an exact real argument
+#
+# Parameters:
+#	x - Quantity whose sine is to be computed.
+#
+# Results:
+#	Returns the sine
+#
+# This procedure is a Consumer with respect to its argument and a Constructor
+# with respect to its result, returning a zero-ref object.
+
+proc ::math::exact::function::sin {x} {
+    $x ref
+    set tanxover2 [tan [$x applyM {{1 0} {0 2}}]]
+    $x unref
+    return [opreal {{{0 1} {1 0}} {{1 0} {0 1}}} $tanxover2 $tanxover2]
+}
+
+# cos --
+#	Cosine of an exact real argument
+#
+# Parameters:
+#	x - Quantity whose cosine is to be computed.
+#
+# Results:
+#	Returns the cosine
+#
+# This procedure is a Consumer with respect to its argument and a Constructor
+# with respect to its result, returning a zero-ref object.
+
+proc ::math::exact::function::cos {x} {
+    $x ref
+    set tanxover2 [tan [$x applyM {{1 0} {0 2}}]]
+    $x unref
+    return [opreal {{{-1 1} {0 0}} {{0 0} {1 1}}} $tanxover2 $tanxover2]
+}
+
+# AtanWorker --
+#
+#	Auxiliary function for arctangent of an exact real argument
+#
+# This class develops the second and subsequent convergents of the continued
+# fraction expansion in Potts's paper. The argument lies in [-1,1].
+
+oo::class create math::exact::AtanWorker {
+    superclass math::exact::T
+    variable t_ l_ r_ n_
+    # Constructor -
+    #
+    # Parameters:
+    #	e - S0(x) = (x-1)/(x+1), where we wish to evaluate atan(x).
+    #   n - Ordinal position of the convergent
+    constructor {e {n 1}} {
+	next [list \
+		  [list \
+		       [list [expr {2*$n + 1}] [expr {$n + 1}]] \
+		       [list $n 0]] \
+		  [list \
+		       [list 0 $n] \
+		       [list [expr {$n + 1}] [expr {2*$n + 1}]]]] 0
+	set l_ [$e ref]
+	set n_ [expr {$n + 1}]
+    }
+
+    # l -
+    #  	Returns the argument S0(x)
+    method l {} {
+	return $l_
+    }
+
+    # r -
+    #	Returns the next convergent, constructing it if necessary
+    method r {} {
+	if {![info exists r_]} {
+	    set r_ [[math::exact::AtanWorker new $l_ $n_] ref]
+	}
+	return $r_
+    }
+
+    # dump -
+    #	Displays this object for debugging
+    method dump {} {
+	return AtanWorker([$l_ dump],[expr {$n_-1}])
+    }
+}
+
+# atanS0 -
+#
+#	Evaluates the arctangent of S0(x) = (x-1)/(x+1)
+#
+# Parameters:
+#	x - Exact real argumetn
+#
+# Results:
+#	Returns atan((x-1)/(x+1))
+#
+# This function is a Consumer with respect to its argument and a Constructor
+# with respect to its result, returning a 0-reference object.
+
+proc ::math::exact::atanS0 {x} {
+    return [opreal {{{1 2} {1 0}} {{-1 0} {-1 2}}} $x [AtanWorker new $x]]
+}
+
+# atan -
+#
+#	Arctangent of an exact real
+#
+# Parameters:
+#	x - Exact real argument
+#
+# Results:
+#	Returns atan(x)
+#
+# This function is a Consumer with respect to its argument and a Constructor
+# with respect to its result, returning a 0-reference object.
+#
+# atan(1/0) is undefined and may cause an infinite loop.
+
+proc ::math::exact::function::atan {x} {
+
+    # TODO - find p/q close to the real number x - can be done by
+    #        getting a few digits - and do
+    # arctan(p/q + eps) = arctan(p/q) + arctan(q**2*eps/(p*q*eps+p**q+q**2))
+    # using [$eps applyM] to compute the argument of the second arctan
+
+    variable ::math::exact::szer
+    variable ::math::exact::spos
+    variable ::math::exact::sinf
+    variable ::math::exact::sneg
+    variable ::math::exact::pi
+
+    # Four cases, depending on which octant the arctangent lies in.
+
+    $x ref
+    lassign [$x getSignAndMagnitude] signum mag
+    $mag ref
+    $x unref
+    set aS0x [atanS0 $mag]
+    $mag unref
+    if {$signum eq $szer} {
+	# -1 < x < 1
+	return $aS0x
+    } elseif {$signum eq $spos} {
+	# x > 0
+	return [opreal {{{0 0} {4 0}} {{1 0} {0 4}}} $aS0x $pi]
+    } elseif {$signum eq $sinf} {
+	# x < -1 or x > 1
+	return [opreal {{{0 0} {2 0}} {{1 0} {0 2}}} $aS0x $pi]
+    } elseif {$signum eq $sneg} {
+	# x < 0
+	return [opreal {{{0 0} {4 0}} {{-1 0} {0 4}}} $aS0x $pi]
+    } else {
+	# can't happen
+	error "wrong sign: $signum"
+    }
+}
+
+# asinreal -
+#
+#	Computes the arcsine of an exact real argument.
+#
+# The arcsine is computed from the arctangent by trigonometric identities
+#
+# This function is a Consumer with respect to its argument and a Constructor
+# with respect to its result, returning a 0-reference object.
+#
+# The function is defined only over the open interval (-1,1). Outside
+# that range INCLUDING AT THE ENDPOINTS, it may fail and give an infinite
+# loop or stack overflow.
+
+proc ::math::exact::asinreal {x} {
+    variable iszer
+    variable pi
+
+    # Potts's formula doesn't work here - it's singular at zero,
+    # and undefined over negative numbers. But some messing with the
+    # algebra gives us:
+    #     asin(S0*x) = 2*atan(sqrt(x)) - pi/2
+    #                = (4*atan(sqrt(x)) - pi) / 2
+    # which is continuous and computable over (-1..1)
+    $x ref
+    set y [$x applyM $iszer]
+    $x unref
+    return [opreal {{{0 0} {-1 0}} {{4 0} {0 2}}} \
+		$pi \
+		[function::atan [function::sqrt $y]]]
+}
+
+interp alias {} math::exact::function::asin {} math::exact::asinreal
+
+# acosreal -
+#
+#	Computes the arccosine of an exact real argument.
+#
+# The arccosine is computed from the arctangent by trigonometric identities
+#
+# This function is a Consumer with respect to its argument and a Constructor
+# with respect to its result, returning a 0-reference object.
+#
+# The function is defined only over the open interval (-1,1). Outside
+# that range INCLUDING AT THE ENDPOINTS, it may fail and give an infinite
+# loop or stack overflow.
+
+proc ::math::exact::acosreal {x} {
+    variable iszer
+    variable pi
+    # Potts's formula doesn't work here - it's singular at zero,
+    # and undefined over negative numbers. But some messing with the
+    # algebra gives us:
+    # acos(S0*x) = pi - 2*atan(sqrt(x))
+    $x ref
+    set y [$x applyM $iszer]
+    $x unref
+    return [opreal {{{0 0} {1 0}} {{-2 0} {0 1}}} \
+		$pi \
+		[function::atan [function::sqrt $y]]]
+}
+
+interp alias {} math::exact::function::acos {} math::exact::acosreal
+
+# sinhreal, coshreal, tanhreal --
+#
+#	Hyperbolic functions of exact real arguments
+#
+# Parameter:
+#	x - Argument at which to evaluate the function
+#
+# Results:
+#	Return sinh(x), cosh(x), tanh(x), respectively.
+#
+# These functions are all Consumers with respect to their arguments and
+# Constructors with respect to their results, returning zero-ref objects.
+#
+# The three functions are well defined over all the finite reals, but
+# are ill-behaved at infinity.
+
+proc ::math::exact::sinhreal {x} {
+    set expx [function::exp $x]
+    return [opreal {{{1 0} {0 1}} {{0 1} {-1 0}}} $expx $expx]
+}
+
+interp alias {} math::exact::function::sinh {} math::exact::sinhreal
+
+proc ::math::exact::coshreal {x} {
+    set expx [function::exp $x]
+    return [opreal {{{1 0} {0 1}} {{0 1} {1 0}}} $expx $expx]
+}
+
+interp alias {} math::exact::function::cosh {} math::exact::coshreal
+
+proc ::math::exact::tanhreal {x} {
+    set expx [function::exp $x]
+    return [opreal {{{1 1} {0 0}} {{0 0} {-1 1}}} $expx $expx]
+}
+
+interp alias {} math::exact::function::tanh {} math::exact::tanhreal
+
+# asinhreal, acoshreal, atanhreal --
+#
+#	Inverse hyperbolic functions of exact real arguments
+#
+# Parameter:
+#	x - Argument at which to evaluate the function
+#
+# Results:
+#	Return asinh(x), acosh(x), atanh(x), respectively.
+#
+# These functions are all Consumers with respect to their arguments and
+# Constructors with respect to their results, returning zero-ref objects.
+#
+# asinh is defined over the entire real number line, with the exception
+# of the point at infinity.  acosh is defined over x > 1 (NOT x=1, which
+# is singular). atanh is defined over (-1..1) (NOT the endpoints of the
+# interval.)
+
+proc ::math::exact::asinhreal {x} {
+    # domain (-Inf .. Inf)
+    # asinh(x) = log(x + sqrt(x**2 + 1))
+    $x ref
+    set retval [function::log \
+		    [+real $x \
+			 [function::sqrt \
+			      [opreal {{{1 0} {0 0}} {{0 0} {1 1}}} $x $x]]]]
+    $x unref
+    return $retval
+}
+
+interp alias {} math::exact::function::asinh {} math::exact::asinhreal
+
+proc ::math::exact::acoshreal {x} {
+    # domain (1 .. Inf)
+    # asinh(x) = log(x + sqrt(x**2 - 1))
+    $x ref
+    set retval [function::log \
+		    [+real $x \
+			 [function::sqrt \
+			      [opreal {{{1 0} {0 0}} {{0 0} {-1 1}}} $x $x]]]]
+    $x unref
+    return $retval
+}
+
+interp alias {} math::exact::function::acosh {} math::exact::acoshreal
+
+proc ::math::exact::atanhreal {x} {
+    # domain (-1 .. 1)
+    variable sinf
+    #atanh(x) = log(Sinf[x])/2
+
+    $x ref
+    set y [$x applyM $sinf]
+    $y ref
+    $x unref
+    set z [function::log $y]
+    $z ref
+    $y unref
+    set retval [$z applyM {{1 0} {0 2}}]
+    $z unref
+    return $retval
+}
+
+interp alias {} math::exact::function::atanh {} math::exact::atanhreal
+
+# EWorker --
+#
+#	Evaluates the constant 'e' (the base of the natural logarithms
+#
+# This class is intended to be singleton. It returns 2.71828.... (the
+# base of the natural logarithms) as an exact real.
+
+oo::class create math::exact::EWorker {
+    superclass math::exact::M
+    variable m_ e_ n_
+
+    # Constructor accepts the number of the continuant.
+
+    constructor {{n 0}} {
+	set n_ [expr {$n + 1}]
+	next [list [list [expr {2*$n + 2}] [expr {2*$n + 1}]] \
+		  [list [expr {2*$n + 1}] [expr {2*$n}]]]
+    }
+    destructor {
+	next
+    }
+
+    # e -- Returns the next continuant after this one.
+
+    method e {} {
+	if {![info exists e_]} {
+	    set e_ [[math::exact::EWorker new $n_] ref]
+	}
+	return $e_
+    }
+
+    # Formats this object for debugging
+
+    method dump {} {
+	return M($m_,EWorker($n_))
+    }
+}
+
+# PiWorker --
+#
+#	Auxiliary object used in evaluating pi.
+#
+# This class evaluates the second and subsequent continuants in
+# Ramanaujan's formula for sqrt(10005)/pi. The Potts paper presents
+# the algorithm, almost without commentary.
+
+oo::class create math::exact::PiWorker {
+    superclass math::exact::M
+    variable m_ e_ n_
+
+    # Constructor accepts the number of the continuant
+
+    constructor {{n 1}} {
+	set n_ [expr {$n + 1}]
+	set nsq [expr {$n * $n}]
+	set n4 [expr {$nsq * $nsq}]
+	set b [expr {(2*$n - 1) * (6*$n - 5) * (6*$n - 1)}]
+	set c [expr {$b * (545140134 * $n + 13591409)}]
+	set d [expr {$b * ($n + 1)}]
+	set e [expr {10939058860032000 * $n4}]
+	set p [list [expr {$e - $d - $c}] [expr {$e + $d + $c}]]
+	set q [list [expr {$e + $d - $c}] [expr {$e - $d + $c}]]
+	next [list $p $q]
+    }
+    destructor {
+	next
+    }
+
+    # e --
+    #
+    #	Returns the next continuant after this one
+
+    method e {} {
+	if {![info exists e_]} {
+	    set e_ [[math::exact::PiWorker new $n_] ref]
+	}
+	return $e_
+    }
+
+    # dump --
+    #
+    #	Formats this object for debugging
+    method dump {} {
+	return M($m_,PiWorker($n_))
+    }
+}
+
+# Log2Worker --
+#
+#	Auxiliary class for evaluating log(2).
+#
+# This object represents the constant (1-2*log(2))/(log(2)-1), the
+# product of the second, third, ... nth LFT's of the representation of log(2).
+
+oo::class create math::exact::Log2Worker {
+    superclass math::exact::M
+    variable m_ e_ n_
+
+    # Constructor accepts the number of the continuant
+    constructor {{n 1}} {
+	set n_ [expr {$n + 1}]
+	set a [expr {3*$n + 1}]
+	set b [expr {2*$n + 1}]
+	set c [expr {4*$n + 2}]
+	set d [expr {3*$n + 2}]
+	next [list [list $a $b] [list $c $d]]
+    }
+    destructor {
+	next
+    }
+
+    # e --
+    #
+    #	Returns the next continuant after this one.
+    method e {} {
+	if {![info exists e_]} {
+	    set e_ [[math::exact::Log2Worker new $n_] ref]
+	}
+	return $e_
+    }
+
+    # dump --
+    #
+    #	Displays this object for debugging
+    method dump {} {
+	return M($m_,Log2Worker($n_))
+    }
+}
+
+# Sqrtrat --
+#
+#	Class that evaluates the square root of a rational
+
+oo::class create math::exact::Sqrtrat {
+    superclass math::exact::M
+    variable m_ e_ a_ b_ c_
+
+    # Constructor accepts the numerator and denominator. The third argument
+    # is an intermediate result for the second and later continuants.
+    constructor {a b {c {}}} {
+	if {$c eq {}} {
+	    set c [expr {$a - $b}]
+	}
+	set d [expr {2*($b-$a) + $c}]
+	if {$d >= 0} {
+	    next $::math::exact::dneg
+	    set a_ [expr {4 * $a}]
+	    set b_ $d
+	    set c_ $c
+	} else {
+	    next $::math::exact::dpos
+	    set a_ [expr {-$d}]
+	    set b_ [expr {4 * $b}]
+	    set c_ $c
+	}
+    }
+    destructor {
+	next
+    }
+
+    # e --
+    #
+    #	Returns the next continuant after this one.
+    method e {} {
+	if {![info exists e_]} {
+	    set e_ [[math::exact::Sqrtrat new $a_ $b_ $c_] ref]
+	}
+	return $e_
+    }
+
+    # dump --
+    #	Formats this object for debugging.
+
+    method dump {} {
+	return "M($m_,Sqrtrat($a_,$b_,$c_))"
+    }
+}
+
+# math::exact::rat**int --
+#
+#	Service procedure to raise a rational number to an integer power
+#
+# Parameters:
+#	a - Numerator of the rational
+#	b - Denominator of the rational
+#	n - Power
+#
+# Preconditions:
+#	n is not zero, a is not zero, b is positive.
+#
+# Results:
+#	Returns the power
+#
+# This procedure is a Consumer with respect to its arguments and a
+# Constructor with respect to its result, returning a zero-ref object.
+
+proc ::math::exact::rat**int {a b n} {
+    if {$n < 0} {
+	return [V new [list [expr {$b**(-$n)}] [expr {$a**(-$n)}]]]
+    } elseif {$n > 0} {
+	return [V new [list [expr {$a**($n)}] [expr {$b**($n)}]]]
+    } else { ;# zero power shouldn't get here
+	return [V new {1 1}]
+    }
+}
+
+# math::exact::rat**rat --
+#
+#	Service procedure to raise a rational number to a rational power
+#
+# Parameters:
+#	a - Numerator of the base
+#	b - Denominator of the base
+#	m - Numerator of the exponent
+#	n - Denominator of the exponent
+#
+# Results:
+#	Returns the power as an exact real
+#
+# Preconditions:
+#	a != 0, b > 0, m != 0, n > 0
+#
+# This procedure is a Constructor with respect to its result
+
+proc ::math::exact::rat**rat {a b m n} {
+
+    # It would be attractive to special case this, but the real mechanism
+    # works as well for the moment.
+
+    tailcall real**rat [V new [list $a $b]] $m $n
+}
+
+# PowWorker --
+#
+#	Auxiliary class to compute
+#		((p/q)**n + b)**(m/n),
+#	where 0<m<n are integers, p, q are integers, b is an exact real
+
+oo::class create math::exact::PowWorker {
+    superclass math::exact::T
+
+    variable t_ l_ r_ delta_
+
+    # Self-method: start
+    #
+    #	Sets up to find z**(m/n) (1 <= m < n), with
+    #   z = (p/q)**n + y for integers p and q.
+    #
+    # Parameters:
+    #	p - numerator of the estimated nth root
+    #	q - denominator of the estimated nth root
+    #	y - residual of the quantity whose root is being extracted
+    #	m - numerator of the exponent
+    #	n - denominator of the exponent (1 <= m < n)
+    #
+    # Results:
+    #	Returns the power, as an exact real.
+
+    self method start {p q y m n} {
+	set pm [expr {$p ** $m}]
+	set pnmm [expr {$p ** ($n-$m)}]
+	set pn [expr {$pm * $pnmm}]
+	set qm [expr {$q ** $m}]
+	set qnmm [expr {$q ** ($n-$m)}]
+	set qn [expr {$qm * $qnmm}]
+
+	set t0 \
+	    [list \
+		 [list \
+		      [list [expr {$m * $qn}] [expr {$n*$pnmm*$qm}]] \
+		      [list 0 [expr {($n-$m) * $qn}]]] \
+		 [list \
+		      [list [expr {2 * $n * $pn}] 0] \
+		      [list [expr {2 * ($n-$m) * $pm * $qnmm}] 0]]]
+	set t1 \
+	    [list \
+		 [list \
+		      [list [expr {$n * $qn}] [expr {2*$n * $pnmm*$qm}]] \
+		      [list 0 [expr {$n * $qn}]]] \
+		 [list \
+		      [list [expr {4 * $n * $pn}] 0] \
+		      [list [expr {2 * $n * $pm * $qnmm}] 0]]]
+
+	set tinit \
+	    [list \
+		 [list \
+		      [list [expr {$m * $qn}] 0] \
+		      [list 0 0]] \
+		 [list \
+		      [list [expr {$n * $pn}] [expr {$n * $pnmm * $qm}]] \
+		      [list \
+			   [expr {($n-$m) * $pm * $qnmm}] \
+			   [expr {($n-$m) * $qn}]]]]
+	$y ref
+	set result [$y applyTLeft $tinit [my new $t0 $t1 $y]]
+	$y unref
+	return $result
+    }
+
+    # Constructor --
+    #
+    # Parameters:
+    #	t0 - Tensor from the previous iteration
+    #	delta - Increment to use
+    #	y - Residual
+    #
+    # The constructor should not be called directly. Instead, the 'start'
+    # method should be called to initialize the iteration
+
+    constructor {t0 delta y} {
+	set t [math::exact::tadd $t0 $delta]
+	next $t 0
+	set l_ [$y ref]
+	set delta_ $delta
+    }
+
+    # l --
+    #
+    #	Returns the left subexpression: that is, the 'y' parameter
+    method l {} {
+	return $l_
+    }
+
+    # r --
+    #
+    #	Returns the right subexpression: that is, the next continuant,
+    #	creating it if necessary
+    method r {} {
+	if {![info exists r_]} {
+	    set r_ [[math::exact::PowWorker new $t_ $delta_ $l_] ref]
+	}
+	return $r_
+    }
+
+    method dump {} {
+	set res "PowWorker($t_,$delta_,[$l_ dump],"
+	if {[info exists r_]} {
+	    append res [$r_ dump]
+	} else {
+	    append res ...
+	}
+	append res ")"
+	return $res
+    }
+
+}
+
+# math::exact::real**int --
+#
+#	Service procedure to raise a real number to an integer power.
+#
+# Parameters:
+#	b - Number to exponentiate
+#	e - Power to raise b to.
+#
+# Results:
+#	Returns the power.
+#
+# This procedure is a Consumer with respect to its arguments and a
+# Constructor with respect to its result, returning a zero-ref object.
+
+proc ::math::exact::real**int {b e} {
+
+    # Handle a negative power by raising the reciprocal of the base to
+    # a positive power
+    if {$e < 0} {
+	set e [expr {-$e}]
+	set b [K [[$b ref] applyM {{0 1} {1 0}}] [$b unref]]
+    }
+
+    # Reduce using square-and-add
+    $b ref
+    set result [V new {1 1}]
+    while {$e != 0} {
+	if {$e & 1} {
+	    set result [$b * $result]
+	    set e [expr {$e & ~1}]
+	}
+	if {$e == 0} break
+	set b [K [[$b * $b] ref] [$b unref]]
+	set e [expr {$e>>1}]
+    }
+    $b unref
+    return $result
+}
+
+# math::exact::real**rat --
+#
+#	Service procedure to raise a real number to a rational power.
+#
+# Parameters -
+#
+#	b - The base to be exponentiated
+#	m - The numerator of the power
+#	n - The denominator of the power
+#
+# Preconditions:
+#	n > 0
+#
+# Results:
+#	Returns the power.
+#
+# This procedure is a Consumer with respect to its arguments and a
+# Constructor with respect to its result, returning a zero-ref object.
+
+proc ::math::exact::real**rat {b m n} {
+
+    variable isneg
+    variable ispos
+
+    # At this point we need to know the sign of b. Try to determine it.
+    # (This can be an infinite loop if b is zero or infinite)
+    while {1} {
+	if {[$b refinesM $ispos]} {
+	    break
+	} elseif {[$b refinesM $isneg]} {
+	    # negative number to rational power. The denominator must be
+	    # odd.
+	    if {$n % 2 == 0} {
+		return -code error -errorCode {MATH EXACT NEGATIVEPOWREAL} \
+		    "negative number to real power"
+	    } else {
+		set b [K [[$b ref] U-] [$b unref]]
+		tailcall [math::exact::real**rat $b $m $n] U-
+	    }
+	} else {
+	    # can't determine positive or negative yet
+	    $b ref
+	    set nextb [$b absorb]
+	    set result [math::exact::real**rat $nextb $m $n]
+	    $b unref
+	    return $result
+	}
+    }
+
+    # Handle b(-m/n) by taking (1/b)(m/n)
+    if {$m < 0} {
+	set m [expr {-$m}]
+	set b [K [[$b ref] applyM {{0 1} {1 0}}] [$b unref]]
+    }
+
+    # Break m/n apart into integer and fractional parts
+    set i [expr {$m / $n}]
+    set m [expr {$m % $n}]
+
+    # Do the integer part
+    $b ref
+    set result [real**int $b $i]
+    if {$m == 0} {
+	# We really shouldn't get here if m/n is an integer, but don't choke
+	$b unref
+	return $result
+    }
+
+    # Come up with a rational approximation for b**(1/n)
+    # real: exp(log(b)/n)
+    set approx [[math::exact::function::exp \
+		     [[math::exact::function::log $b] \
+			  * [math::exact::V new [list 1 $n]]]] ref]
+    lassign [$approx getSignAndMagnitude] partial rest
+    $rest ref
+    $approx unref
+    while {1} {
+	lassign [$rest getLeadingDigitAndRest 0] digit y
+	$y ref
+	$rest unref
+	set partial [math::exact::mscale [math::exact::mdotm $partial $digit]]
+	set rest $y
+	lassign $partial pq rs
+	lassign $pq p q
+	lassign $rs r s
+	set qrn [expr {($q*$r)**$n}]
+	set t1 [expr {$qrn}]
+	set t2 [expr {2 * ($p*$s)**$n}]
+	set t3 [expr {4 * $qrn}]
+	if {$t1 < $t2 && $t2 < $t3} break
+    }
+    $y unref
+
+    # Get the residual
+
+    lassign [math::exact::vscale [list $r $s]] p q
+    set xn [math::exact::V new [list [expr {$p**$n}] [expr {$q**$n}]]]
+    set y [$b - $xn]; $b unref
+
+    # Launch a worker process to perform quasi-Newton iteration to refine
+    # the result
+
+    set retval [$result * [math::exact::PowWorker start $p $q $y $m $n]]
+    return $retval
+}
+
+# pi --
+#
+#	Returns pi as an exact real
+
+proc ::math::exact::function::pi {} {
+    variable ::math::exact::pi
+    return $pi
+}
+
+# e --
+#
+#	Returns e as an exact real
+
+proc ::math::exact::function::e {} {
+    variable ::math::exact::e
+    return $e
+}
+
+# math::exact::signum1 --
+#
+#	Tests an argument's sign.
+#
+# Parameters:
+#	x - Exact real number to test.
+#
+# Results:
+#	Returns -1 if x < -1. Returns 1 if x > 1. May return -1, 0 or 1 if
+#	-1 <= x <= 1.
+#
+# Equality of exact reals is not decidable, so a weaker version of comparison
+# testing is needed. This function provides the guts of such a thing. It
+# returns an approximation to the signum function that is exact for
+# |x| > 1, and arbitrary for |x| < 1.
+#
+# A typical use would be to replace a test p < q with a test that
+# looks like signum1((p-q) / epsilon) == -1. This test is decidable,
+# and becomes a test that is true if p < q - epsilon, false if p > q+epsilon,
+# and indeterminate if p lies within epsilon of q.  This test is enough for
+# most checks for convergence or for selecting a branch of a function.
+#
+# This function is not decidable if it is not decidable whether x is finite.
+
+proc ::math::exact::signum1 {x} {
+    variable ispos
+    variable isneg
+    variable iszer
+    while {1} {
+	if {[$x refinesM $ispos]} {
+	    return 1
+	} elseif {[$x refinesM $isneg]} {
+	    return -1
+	} elseif {[$x refinesM $iszer]} {
+	    return 0
+	} else {
+	    set x [$x absorb]
+	}
+    }
+}
+
+# math::exact::abs1 -
+#
+#	Test whether an exact real is 'small' in absolute value.
+#
+# Parameters:
+#	x - Exact real number to test
+#
+# Results:
+#	Returns 0 if |x| is 'close to zero', 1 if |x| is 'far from zero'
+#	and either 0, or 1 if |x| is close to 1.
+#
+# This function is another useful comparator for convergence testing.
+# It returns a three-way indication:
+#	|x| < 1/2 : 0
+#	|x| > 1 : 1
+#	1/2 <= |x| <= 2 : May return -1, 0, 1
+#
+# This function is useful for convergence testing, where it is desired
+# to know whether a given value has an absolute value less than a given
+# tolerance.
+
+proc ::math::exact::abs1 {x} {
+    variable iszer
+    while 1 {
+	if {[$x refinesM $iszer]} {
+	    return 0
+	} elseif {[$x refinesM {{2 1} {-2 1}}]} {
+	    return 1
+	} else {
+	    set x [$x absorb]
+	}
+    }
+}
+
+namespace eval ::math::exact {
+
+    # Constant vectors, matrices and tensors
+
+    ;				# the identity matrix
+    variable identity		{{ 1  0} { 0  1}}
+    ;				# sign matrices for exact floating point
+    variable spos		$identity
+    variable sinf		{{ 1 -1} { 1  1}}
+    variable sneg		{{ 0  1} {-1  0}}
+    variable szer		{{ 1  1} {-1  1}}
+
+    ;				# inverses of the sign matrices
+    variable ispos		[reverse $spos]
+    variable isinf		[reverse $sinf]
+    variable isneg		[reverse $sneg]
+    variable iszer		[reverse $szer]
+
+    ;				# digit matrices for exact floating point
+    variable dneg		{{ 1  1} { 0  2}}
+    variable dzer		{{ 3  1} { 1  3}}
+    variable dpos		{{ 2  0} { 1  1}}
+
+    ;				# inverses of the digit matrices
+    variable idneg 		[reverse $dneg]
+    variable idzer		[reverse $dzer]
+    variable idpos		[reverse $dpos]
+
+    ;				# aritmetic operators as tensors
+    variable tadd		{{{ 0  0} { 1  0}} {{ 1  0} { 0  1}}}
+    variable tsub		{{{ 0  0} { 1  0}} {{-1  0} { 0  1}}}
+    variable tmul		{{{ 1  0} { 0  0}} {{ 0  0} { 0  1}}}
+    variable tdiv		{{{ 0  0} { 1  0}} {{ 0  1} { 0  0}}}
+
+    proc init {} {
+
+	# Variables for fundamental constants e, pi, log2
+
+	variable e [[EWorker new] ref]
+
+	set worker \
+	    [[math::exact::Mstrict new {{6795705 213440} {6795704 213440}} \
+		  [math::exact::PiWorker new]] ref]
+	variable pi [[/real [function::sqrt [V new {10005 1}]] $worker] ref]
+	$worker unref
+
+	set worker [[Log2Worker new] ref]
+	variable log2 [[$worker applyM {{1 1} {1 2}}] ref]
+	$worker unref
+
+    }
+    init
+    rename init {}
+
+    namespace export exactexpr abs1 signum1
+}
+
+package provide math::exact 1.0.1
+
+#-----------------------------------------------------------------------
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/exponential.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/exponential.tcl
new file mode 100644
index 00000000..b90952a7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/exponential.tcl
@@ -0,0 +1,434 @@
+# exponential.tcl --
+#    Compute exponential integrals (E1, En, Ei, li, Shi, Chi, Si, Ci)
+#
+
+namespace eval ::math::special {
+    variable pi 3.1415926
+    variable gamma 0.57721566490153286
+    variable halfpi [expr {$pi/2.0}]
+
+# Euler's digamma function for small integer arguments
+
+    variable psi {
+        NaN
+        -0.57721566490153286 0.42278433509846713 0.92278433509846713
+        1.2561176684318005 1.5061176684318005 1.7061176684318005
+        1.8727843350984672 2.0156414779556102 2.1406414779556102
+        2.2517525890667214 2.3517525890667215 2.4426616799758123
+        2.5259950133091458 2.6029180902322229 2.6743466616607945
+        2.7410133283274614 2.8035133283274614 2.8623368577392259
+        2.9178924132947812 2.9705239922421498 3.0205239922421496
+        3.0681430398611971 3.1135975853157425 3.1570758461853079
+        3.1987425128519744 3.2387425128519745 3.2772040513135128
+        3.31424108835055 3.3499553740648356 3.3844381326855251
+        3.4177714660188583 3.4500295305349873 3.4812795305349873
+        3.5115825608380176 3.5409943255438998 3.5695657541153283
+        3.597343531893106 3.6243705589201332 3.6506863483938172
+        3.6763273740348428
+    }
+}
+
+# ComputeExponFG --
+#    Compute the auxiliary functions f and g
+#
+# Arguments:
+#    x            Parameter of the integral (x>=0)
+# Result:
+#    Approximate values for f and g
+# Note:
+#    See Abramowitz and Stegun
+#
+proc ::math::special::ComputeExponFG {x} {
+    set x2 [expr {$x*$x}]
+    set fx [expr {($x2*$x2+7.241163*$x2+2.463936)/
+                  ($x2*$x2+9.068580*$x2+7.157433)/$x}]
+    set gx [expr {($x2*$x2+7.547478*$x2+1.564072)/
+                  ($x2*$x2+12.723684*$x2+15.723606)/$x2}]
+    list $fx $gx
+}
+
+
+# exponential_Ei --
+#    Compute the exponential integral of the second kind, to relative
+#    error eps
+# Arguments:
+#    x       Value of the argument
+#    eps     Relative error
+# Result:
+#    Principal value of the integral exp(x)/x
+#    from -infinity to x
+#
+proc ::math::special::exponential_Ei { x { eps 1.0e-10 } } {
+    variable gamma
+
+    if { ![string is double -strict $x] } {
+        return -code error "expected a floating point number but found \"$x\""
+    }
+    if { $x < 0.0 } {
+        return [expr { -[exponential_En 1 [expr { - $x }] $eps] }]
+    }
+    if { $x == 0.0 } {
+       set message "Argument to exponential_Ei must not be zero"
+       return -code error -errorcode [list ARITH DOMAIN $message] $message
+    }
+    if { $x >= -log($eps) } {
+        # evaluate Ei(x) as an asymptotic series; the series is formally
+        # divergent, but the leading terms give the desired value to
+        # enough precision.
+        set sum 0.
+        set term 1.
+        set k 1
+        while { 1 } {
+            set p $term
+            set term [expr { $term * ( $k / $x ) }]
+            if { $term < $eps } {
+                break
+            }
+            if { $term < $p } {
+                set sum [expr { $sum + $term }]
+            } else {
+                set sum [expr { $sum - $p }]
+                break
+            }
+            incr k
+        }
+        return [expr { exp($x) * ( 1.0 + $sum ) / $x }]
+    } elseif { $x >= 1e-18 } {
+        # evaluate Ei(x) as a power series
+        set sum 0.
+        set fact 1.
+        set pow $x
+        set n 1
+        while { 1 } {
+            set fact [expr { $fact * $n }]
+            set term [expr { $pow / $n / $fact }]
+            set sum [expr { $sum + $term }]
+            if { $term < $eps * $sum } break
+            set pow [expr { $x * $pow }]
+            incr n
+        }
+        return [expr { $sum + $gamma + log($x) }]
+    } else {
+        # Ei(x) for small x
+        return [expr { log($x) + $gamma }]
+    }
+}
+
+
+# exponential_En --
+#    Compute the exponential integral of n-th order, to relative error
+#    epsilon
+#
+# Arguments:
+#    n            Order of the integral (n>=1, integer)
+#    x            Parameter of the integral (x>0)
+#    epsilon      Relative error
+# Result:
+#    Value of En(x) = integral from 0 to x of exp(-x)/x**n
+#
+proc ::math::special::exponential_En { n x { epsilon 1.0e-10 } } {
+    variable psi
+    variable gamma
+    if { ![string is integer -strict $n] || $n < 0 } {
+        return -code error "expected a non-negative integer but found \"$n\""
+    }
+    if { ![string is double -strict $x] } {
+        return -code error "expected a floating point number but found \"$x\""
+    }
+    if { $n == 0 } {
+        if { $x == 0.0 } {
+            return -code error "E0(0) is indeterminate"
+        }
+        return [expr { exp( -$x ) / $x }]
+    }
+    if { $n == 1 && $x < 0.0 } {
+        return [expr {- [exponential_Ei [expr { -$x }] $eps] }]
+    }
+    if { $x < 0.0 } {
+        return -code error "can't evaluate En(x) for negative x"
+    }
+    if { $x == 0.0 } {
+        return [expr { 1.0 / ( $n - 1 ) }]
+    }
+
+    if { $x > 1.0 } {
+        # evaluate En(x) as a continued fraction
+        set b [expr { $x + $n }]
+        set c 1.e308
+        set d [expr { 1.0 / $b }]
+        set h $d
+        set i 1
+        while { 1 } {
+            set a [expr { -$i * ( $n - 1 + $i ) }]
+            set b [expr { $b + 2.0 }]
+            set d [expr { 1.0 / ( $a * $d + $b ) }]
+            set c [expr { $b + $a / $c }]
+            set delta [expr { $c * $d }]
+            set h [expr { $h * $delta }]
+            if { abs( $delta - 1. ) < $epsilon } {
+                return [expr { $h * exp(-$x) }]
+            }
+            incr i
+        }
+    } else {
+        # evaluate En(x) as a series
+        if { $n == 1 } {
+            set a [expr { -log($x) - $gamma }]
+        } else {
+            set a [expr { 1.0 / ( $n - 1 ) }]
+        }
+        set f 1.0
+        set i 1
+        while { 1 } {
+            set f [expr { - $f *  $x / $i }]
+            if { $i == $n - 1 } {
+                set term [expr { $f * ([lindex $psi $n] - log($x)) }]
+            } else {
+                set term [expr { $f / ( $n - 1 - $i ) }]
+            }
+            set a [expr { $a + $term }]
+            if { abs($term) < $epsilon * abs($a) } {
+                return $a
+            }
+            incr i
+        }
+    }
+}
+
+# exponential_E1 --
+#    Compute the exponential integral
+#
+# Arguments:
+#    x            Parameter of the integral (x>0)
+# Result:
+#    Value of E1(x) = integral from x to infinity of exp(-x)/x
+# Note:
+#    This relies on a rational approximation (error ~ 2e-7 (x<1) or 5e-5 (x>1)
+#
+proc ::math::special::exponential_E1 {x} {
+    if { $x <= 0.0 } {
+        error "Domain error: x must be positive"
+    }
+
+   if { $x < 1.0 } {
+      return [expr {-log($x)+((((0.00107857*$x-0.00976004)*$x+0.05519968)*$x-0.24991055)*$x+0.99999193)*$x-0.57721566}]
+   } else {
+      set xexpe [expr {($x*$x+2.334733*$x+0.250621)/($x*$x+3.330657*$x+1.681534)}]
+      return [expr {$xexpe/($x*exp($x))}]
+   }
+}
+
+# exponential_li --
+#    Compute the logarithmic integral
+# Arguments:
+#    x       Value of the argument
+# Result:
+#    Value of the integral 1/ln(x) from 0 to x
+#
+proc ::math::special::exponential_li {x} {
+    if { $x < 0 } {
+        return -code error "Argument must be positive or zero"
+    } else {
+        if { $x == 0.0 } {
+            return 0.0
+        } else {
+            return [exponential_Ei [expr {log($x)}]]
+        }
+    }
+}
+
+# exponential_Shi --
+#    Compute the hyperbolic sine integral
+# Arguments:
+#    x       Value of the argument
+# Result:
+#    Value of the integral sinh(x)/x from 0 to x
+#
+proc ::math::special::exponential_Shi {x} {
+    if { $x < 0 } {
+        return -code error "Argument must be positive or zero"
+    } else {
+        if { $x == 0.0 } {
+            return 0.0
+        } else {
+            proc g {x} {
+               return [expr {sinh($x)/$x}]
+            }
+            return [lindex [::math::calculus::romberg g 0.0 $x] 0]
+        }
+    }
+}
+
+# exponential_Chi --
+#    Compute the hyperbolic cosine integral
+# Arguments:
+#    x       Value of the argument
+# Result:
+#    Value of the integral (cosh(x)-1)/x from 0 to x
+#
+proc ::math::special::exponential_Chi {x} {
+    variable gamma
+    if { $x < 0 } {
+        return -code error "Argument must be positive or zero"
+    } else {
+        if { $x == 0.0 } {
+            return 0.0
+        } else {
+            proc g {x} {
+               return [expr {(cosh($x)-1.0)/$x}]
+            }
+            set integral [lindex [::math::calculus::romberg g 0.0 $x] 0]
+            return [expr {$gamma+log($x)+$integral}]
+        }
+    }
+}
+
+# exponential_Si --
+#    Compute the sine integral
+# Arguments:
+#    x       Value of the argument
+# Result:
+#    Value of the integral sin(x)/x from 0 to x
+#
+proc ::math::special::exponential_Si {x} {
+    variable halfpi
+    if { $x < 0 } {
+        return -code error "Argument must be positive or zero"
+    } else {
+        if { $x == 0.0 } {
+            return 0.0
+        } else {
+            if { $x < 1.0 } {
+                proc g {x} {
+                    return [expr {sin($x)/$x}]
+                }
+                return [lindex [::math::calculus::romberg g 0.0 $x] 0]
+            } else {
+                foreach {f g} [ComputeExponFG $x] {break}
+                return [expr {$halfpi-$f*cos($x)-$g*sin($x)}]
+            }
+        }
+    }
+}
+
+# exponential_Ci --
+#    Compute the cosine integral
+# Arguments:
+#    x       Value of the argument
+# Result:
+#    Value of the integral (cosh(x)-1)/x from 0 to x
+#
+proc ::math::special::exponential_Ci {x} {
+    variable gamma
+
+    if { $x < 0 } {
+        return -code error "Argument must be positive or zero"
+    } else {
+        if { $x == 0.0 } {
+            return 0.0
+        } else {
+            if { $x < 1.0 } {
+                proc g {x} {
+                    return [expr {(cos($x)-1.0)/$x}]
+                }
+                set integral [lindex [::math::calculus::romberg g 0.0 $x] 0]
+                return [expr {$gamma+log($x)+$integral}]
+            } else {
+                foreach {f g} [ComputeExponFG $x] {break}
+                return [expr {$f*sin($x)-$g*cos($x)}]
+            }
+        }
+    }
+}
+
+# some tests --
+#    Reproduce tables 5.1, 5.2 from Abramowitz & Stegun,
+
+if { [info exists ::argv0] && ![string compare $::argv0 [info script]] } {
+namespace eval ::math::special {
+for { set i 0.01 } { $i < 0.505 } { set i [expr { $i + 0.01 }] } {
+    set ei [exponential_Ei $i]
+    set e1 [expr { - [exponential_Ei [expr { - $i }]] }]
+    puts [format "%9.6f\t%.10g\t%.10g" $i \
+              [expr {($ei - log($i) - 0.57721566490153286)/$i} ] \
+              [expr {($e1 + log($i) + 0.57721566490153286) / $i }]]
+}
+puts {}
+for { set i 0.5 } { $i < 2.005 } { set i [expr { $i + 0.01 }] } {
+    set ei [exponential_Ei $i]
+    set e1 [expr { - [exponential_Ei [expr { - $i }]] }]
+    puts [format "%9.6f\t%.10g\t%.10g" $i $ei $e1]
+}
+puts {}
+for {} { $i < 10.05 } { set i [expr { $i + 0.1 }] } {
+    set ei [exponential_Ei $i]
+    set e1 [expr { - [exponential_Ei [expr { - $i }]] }]
+    puts [format "%9.6f\t%.10g\t%.10g" $i \
+              [expr { $i * exp(-$i) * $ei }] \
+              [expr { $i * exp($i) * $e1 }]]
+
+}
+puts {}
+for {set ooi 0.1} { $ooi > 0.0046 } { set ooi [expr { $ooi - 0.005 }] } {
+    set i [expr { 1.0 / $ooi }]
+    set ri [expr { round($i) }]
+    set ei [exponential_Ei $i]
+    set e1 [expr { - [exponential_Ei [expr { - $i }]] }]
+    puts [format "%9.6f\t%.10g\t%.10g\t%d" $i \
+              [expr { $i * exp(-$i) * $ei }] \
+              [expr { $i * exp($i) * $e1 }] \
+              $ri]
+}
+puts {}
+
+# Reproduce table 5.4 from Abramowitz and Stegun
+
+for { set x 0.00 } { $x < 0.505 } { set x [expr { $x + 0.01 }] } {
+    set line [format %4.2f $x]
+    if { $x == 0.00 } {
+        append line { } 1.0000000
+    } else {
+        append line { } [format %9.7f \
+                             [expr { [exponential_En 2 $x] - $x * log($x) }]]
+    }
+    foreach n { 3 4 10 20 } {
+        append line { } [format %9.7f [exponential_En $n $x]]
+    }
+    puts $line
+}
+puts {}
+for { set x 0.50 } { $x < 2.005 } { set x [expr { $x + 0.01 }] } {
+    set line [format %4.2f $x]
+    foreach n { 2 3 4 10 20 } {
+        append line { } [format %9.7f [exponential_En $n $x]]
+    }
+    puts $line
+}
+puts {}
+
+for { set oox 0.5 } { $oox > 0.1025 } { set oox [expr { $oox - 0.05 }] } {
+    set line [format %4.2f $oox]
+    set x [expr { 1.0 / $oox }]
+    set rx [expr { round( $x ) }]
+    foreach n { 2 3 4 10 20 } {
+        set en [exponential_En $n [expr { 1.0 / $oox }]]
+        append line { } [format %9.7f [expr { ( $x + $n ) * exp($x) * $en }]]
+    }
+    append line { } [format %3d $rx]
+    puts $line
+}
+for { set oox 0.10 } { $oox > 0.005 } { set oox [expr { $oox - 0.01 }] } {
+    set line [format %4.2f $oox]
+    set x [expr { 1.0 / $oox }]
+    set rx [expr { round( $x ) }]
+    foreach n { 2 3 4 10 20 } {
+        set en [exponential_En $n $x]
+        append line { } [format %9.7f [expr { ( $x + $n ) * exp($x) * $en }]]
+    }
+    append line { } [format %3d $rx]
+    puts $line
+}
+puts {}
+catch {exponential_Ei 0.0} result; puts $result
+}
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/figurate.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/figurate.tcl
new file mode 100644
index 00000000..0f093c3e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/figurate.tcl
@@ -0,0 +1,294 @@
+# figurate.tcl --
+#     Package for evaluating expressions regarding so-called figurate numbers:
+#     - triangular numbers: sum of 1, 2, 3, ... n
+#     - hex numbers: sum of centred hexagons with sides of n long, sum of 1, 6, 12, 18, ..., 6n
+#     - etc.
+#     - also sums of kth powers of 1, 2, 3, ... n (k = 1 to 10)
+#
+#     Inspired by "gold", definitions of the figurate numbers following https://mathworld.wolfram.com/FigurateNumber.html
+#
+package require Tcl 8.6
+package provide math::figurate 1.0
+
+namespace eval ::math::figurate {
+    namespace export sum_sequence sum_squares sum_cubes sum_4th_power sum_5th_power sum_6th_power \
+              sum_7th_power sum_8th_power sum_9th_power sum_10th_power \
+              sum_sequence_odd sum_squares_odd sum_cubes_odd sum_4th_power_odd sum_5th_power_odd sum_6th_power_odd \
+              sum_7th_power_odd sum_8th_power_odd sum_9th_power_odd sum_10th_power_odd \
+              oblong pronic triangular square cubic biquadratic centeredSquare centeredCube centeredPentagonal \
+              centeredHexagonal decagonal heptagonal hexagonal octagonal octahedral pentagonal squarePyramidal \
+              tetrahedral pentatope centeredTriangular
+}
+
+# sum_* --
+#     Compute the sums of powers of integers 1 to n
+#
+# Arguments:
+#     n         Largest integer in the sum
+#
+# Returns:
+#     Sum 1**k + 2**k + ... + n**k
+#
+proc ::math::figurate::sum_sequence {n} {
+    expr {$n > 0 ? $n * ($n+1) / 2 : 0}
+}
+
+proc ::math::figurate::sum_squares {n} {
+    expr {$n > 0 ? $n*($n + 1) * (2*$n +1 ) / 6 : 0}
+}
+
+proc ::math::figurate::sum_cubes {n} {
+    expr {$n > 0 ? $n**2 * ($n + 1)**2 / 4 : 0}
+}
+
+proc ::math::figurate::sum_4th_power {n} {
+    expr {$n > 0 ? $n* ($n + 1) * (2*$n + 1) * (3*$n**2 + 3*$n -1 ) / 30 : 0}
+}
+
+proc ::math::figurate::sum_5th_power {n} {
+    expr {$n > 0 ? $n**2 * ($n + 1)**2 * (2*$n**2 + 2*$n - 1) / 12 : 0}
+}
+
+proc ::math::figurate::sum_6th_power {n} {
+    expr {$n > 0 ? $n * ($n + 1) * (2*$n + 1 ) * (3*$n**4 + 6*$n**3 - 3*$n + 1) / 42 : 0}
+}
+
+proc ::math::figurate::sum_7th_power {n} {
+    expr {$n > 0 ? $n**2 * ($n + 1)**2 * (3*$n**4 + 6*$n**3 - $n**2 - 4*$n + 2) / 24 : 0}
+}
+
+proc ::math::figurate::sum_8th_power {n} {
+    expr {$n > 0 ? $n * ($n + 1) * (2*$n + 1) * (5*$n**6 + 15*$n**5 + 5*$n**4 - 15*$n**3 - $n**2 + 9*$n - 3) / 90 : 0}
+}
+
+proc ::math::figurate::sum_9th_power {n} {
+    expr {$n > 0 ? $n**2 * ($n + 1)**2 * (2*$n**6 + 6*$n**5 + $n**4 - 8*$n**3 + $n**2 + 6*$n - 3) / 20 : 0}
+}
+
+proc ::math::figurate::sum_10th_power {n} {
+    expr {$n > 0 ? $n * ($n + 1) * (2*$n + 1) * (3*$n**8 + 12*$n**7 + 8*$n**6 - 18*$n**5 - 10*$n**4 + 24*$n**3 + 2*$n**2 - 15*$n + 5) / 66 : 0}
+}
+
+# calculate sums of odd integers:
+#
+# Arguments:
+#     n         Number of odd integers (not the largest number)
+#
+# Note:
+#     The procedures sum the values (2*k+1)**m from k = 1 to n
+#     The calculations rely on the following identity:
+#
+#     Sum (2k+1)**m = Sum j**m - 2**m Sum k**m, where k = 0,...,n, j = 0,..., 2*n+1
+#
+proc ::math::figurate::sum_sequence_odd {n} {
+    if { $n > 0 } {
+        set maxnum [expr {2 * $n - 1}]
+        set sum1 [sum_sequence [expr {$n-1}]]
+        set sum2 [sum_sequence $maxnum]
+
+        return [expr {$sum2 - 2 * $sum1}]
+    } else {
+        return 0
+    }
+}
+
+proc ::math::figurate::sum_squares_odd {n} {
+    if { $n > 0 } {
+        set maxnum [expr {2 * $n - 1}]
+        set sum1 [sum_squares [expr {$n-1}]]
+        set sum2 [sum_squares $maxnum]
+
+        return [expr {$sum2 - 4 * $sum1}]
+    } else {
+        return 0
+    }
+}
+
+proc ::math::figurate::sum_cubes_odd {n} {
+    if { $n > 0 } {
+        set maxnum [expr {2 * $n - 1}]
+        set sum1 [sum_cubes [expr {$n-1}]]
+        set sum2 [sum_cubes $maxnum]
+
+        return [expr {$sum2 - 8 * $sum1}]
+    } else {
+        return 0
+    }
+}
+
+proc ::math::figurate::sum_4th_power_odd {n} {
+    if { $n > 0 } {
+        set maxnum [expr {2 * $n - 1}]
+        set sum1 [sum_4th_power [expr {$n-1}]]
+        set sum2 [sum_4th_power $maxnum]
+
+        return [expr {$sum2 - 16 * $sum1}]
+    } else {
+        return 0
+    }
+}
+
+proc ::math::figurate::sum_5th_power_odd {n} {
+    if { $n > 0 } {
+        set maxnum [expr {2 * $n - 1}]
+        set sum1 [sum_5th_power [expr {$n-1}]]
+        set sum2 [sum_5th_power $maxnum]
+
+        return [expr {$sum2 - 32 * $sum1}]
+    } else {
+        return 0
+    }
+}
+
+proc ::math::figurate::sum_6th_power_odd {n} {
+    if { $n > 0 } {
+        set maxnum [expr {2 * $n - 1}]
+        set sum1 [sum_6th_power [expr {$n-1}]]
+        set sum2 [sum_6th_power $maxnum]
+
+        return [expr {$sum2 - 64 * $sum1}]
+    } else {
+        return 0
+    }
+}
+
+proc ::math::figurate::sum_7th_power_odd {n} {
+    if { $n > 0 } {
+        set maxnum [expr {2 * $n - 1}]
+        set sum1 [sum_7th_power [expr {$n-1}]]
+        set sum2 [sum_7th_power $maxnum]
+
+        return [expr {$sum2 - 128 * $sum1}]
+    } else {
+        return 0
+    }
+}
+
+proc ::math::figurate::sum_8th_power_odd {n} {
+    if { $n > 0 } {
+        set maxnum [expr {2 * $n - 1}]
+        set sum1 [sum_8th_power [expr {$n-1}]]
+        set sum2 [sum_8th_power $maxnum]
+
+        return [expr {$sum2 - 256 * $sum1}]
+    } else {
+        return 0
+    }
+}
+
+proc ::math::figurate::sum_9th_power_odd {n} {
+    if { $n > 0 } {
+        set maxnum [expr {2 * $n - 1}]
+        set sum1 [sum_9th_power [expr {$n-1}]]
+        set sum2 [sum_9th_power $maxnum]
+
+        return [expr {$sum2 - 512 * $sum1}]
+    } else {
+        return 0
+    }
+}
+
+proc ::math::figurate::sum_10th_power_odd {n} {
+    if { $n > 0 } {
+        set maxnum [expr {2 * $n - 1}]
+        set sum1 [sum_10th_power [expr {$n-1}]]
+        set sum2 [sum_10th_power $maxnum]
+
+        return [expr {$sum2 - 1024 * $sum1}]
+    } else {
+        return 0
+    }
+}
+
+# calculate figurate numbers --
+#
+# Arguments:
+#     n         Largest integer in the sum
+#
+# Notes:
+#     - pronic and oblong are identical (see Mathworld page)
+#     - definitions follow the Mathworld page, though in some cases a more verbose name has been chosen
+#       (instead of hex, centeredHexagonal)
+#     - there are some trivial procedures as well (square for instance)
+#     - for the interpretation: again see the Mathworld page
+#
+proc ::math::figurate::oblong {n} {
+    expr {$n > 0 ? $n * ($n + 1) : 0}
+}
+
+proc ::math::figurate::pronic {n} {
+    expr {$n > 0 ? $n * ($n + 1) : 0}
+}
+
+proc ::math::figurate::triangular {n} {
+    expr {$n > 0 ? $n * ($n + 1)/2 : 0}
+}
+
+proc ::math::figurate::square {n} {
+    expr {$n > 0 ? $n**2 : 0}
+}
+
+proc ::math::figurate::cubic {n} {
+    expr {$n > 0 ? $n**3 : 0}
+}
+
+proc ::math::figurate::biquadratic {n} {
+    expr {$n > 0 ? $n**4 : 0}
+}
+
+proc ::math::figurate::centeredTriangular {n} {
+    expr {$n > 0 ? (3*$n**2 - 3*$n + 2) / 2 : 0}
+}
+
+proc ::math::figurate::centeredSquare {n} {
+    expr {$n >0 ? $n**2 + ($n-1)**2 : 0}
+}
+
+proc ::math::figurate::centeredCube {n} {
+    expr {$n > 0 ? $n**3 + ($n-1)**3 : 0}
+}
+
+proc ::math::figurate::centeredPentagonal {n} {
+    expr {$n > 0 ? (5*($n-1)**2 + 5*($n-1) + 2) / 2 : 0}
+}
+
+proc ::math::figurate::centeredHexagonal {n} {
+    expr {$n > 0 ? 3*($n-1)**2 + 3*($n-1) + 1 : 0}
+}
+
+proc ::math::figurate::decagonal {n} {
+    expr {$n > 0 ? 4*$n**2 - 3*$n : 0}
+}
+
+proc ::math::figurate::heptagonal {n} {
+    expr {$n > 0 ? $n * (5*$n - 3) / 2 : 0}
+}
+
+proc ::math::figurate::hexagonal {n} {
+    expr {$n > 0 ? $n * (2*$n - 1) : 0}
+}
+
+proc ::math::figurate::octagonal {n} {
+    expr {$n > 0 ? $n * (3*$n - 2) : 0}
+}
+
+proc ::math::figurate::octahedral {n} {
+    expr {$n > 0 ? $n * (2*$n**2 + 1) / 3 : 0}
+}
+
+proc ::math::figurate::pentagonal {n} {
+    expr {$n > 0 ? $n * (3*$n - 1) / 2 : 0}
+}
+
+proc ::math::figurate::squarePyramidal {n} {
+    expr {$n > 0 ? $n * ($n + 1) * (2*$n + 1)/ 6 : 0}
+}
+
+proc ::math::figurate::tetrahedral {n} {
+    expr {$n > 0 ? $n * ($n + 1) *  ($n + 2) / 6 : 0}
+}
+
+proc ::math::figurate::pentatope {n} {
+    expr {$n > 0 ? $n * ($n + 1) *  ($n + 2) * ($n + 3) / 24 : 0}
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/filtergen.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/filtergen.tcl
new file mode 100644
index 00000000..0b498874
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/filtergen.tcl
@@ -0,0 +1,250 @@
+# filtergen.tcl --
+#     Package for digital filters
+#     filterButterworth:
+#         Generate the coefficients for a low-pass or high-pass Butterworth filter
+#     filter:
+#         Filter an entire series of data
+#     filterObject:
+#         Class to create filters
+#
+#     Derived from: https://www.meme.net.au/butterworth.html
+#
+#     Here is the license notice from this webpage:
+#
+#       @licstart  The following is the entire license notice for the
+#       JavaScript code in this page.
+#
+#       Copyright (C) 2013 Glenn McIntosh
+#
+#       The JavaScript code in this page is free software: you can
+#       redistribute it and/or modify it under the terms of the GNU
+#       General Public License (GNU GPL) as published by the Free Software
+#       Foundation, either version 3 of the License, or (at your option)
+#       any later version.  The code is distributed WITHOUT ANY WARRANTY;
+#       without even the implied warranty of MERCHANTABILITY or FITNESS
+#       FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+#
+#       As additional permission under GNU GPL version 3 section 7, you
+#       may distribute non-source (e.g., minimized or compacted) forms of
+#       that code without the copy of the GNU GPL normally required by
+#       section 4, provided you include this license notice and a URL
+#       through which recipients can access the Corresponding Source.
+#
+#       @licend  The above is the entire license notice
+#       for the JavaScript code in this page.
+#
+package require Tcl 8.6
+package require TclOO
+
+namespace eval ::math::filters {}
+
+# filterButterworth --
+#     Generate the coefficients for a low-pass/high-pass Butterworth filter
+#
+# Arguments:
+#     lowpass              Low-pass if 1, high-pass if 0
+#     order                Order of the filter
+#     samplefreq           Sample frequency
+#     cutofffreq           Cut-off frequency (3 dB point)
+#
+# Returns:
+#     List (nexted list) of coefficients for x and y and the scale factor
+#
+proc ::math::filters::filterButterworth {lowpass order samplefreq cutofffreq} {
+
+    if { $order <= 0 || ! [string is integer $order] } {
+        return -code error "The order must be a positive integer"
+    }
+    if { $samplefreq <= 0.0 || $cutofffreq <= 0.0 } {
+        return -code error "The frequencies must be positive"
+    }
+    if { $samplefreq < $cutofffreq } {
+        return -code error "The cutoff frequency must be lower than the sample frequency"
+    }
+
+    set pi     [expr {acos(-1.0)}]
+    set cutoff [expr {-$cutofffreq / double($samplefreq) * 2.0 * $pi}]
+
+    set yf0    [lrepeat [expr {$order+1}] 0.0]
+    set yf1    $yf0
+    set xf     $yf0
+
+    lset yf0   0 -1.0
+    lset yf1   0  0.0
+    lset xf    0  1.0
+
+    set scale  1.0
+    set invert [expr {$lowpass == 1? 1.0 : -1.0}]
+
+    for {set i 1} {$i <= $order} {incr i} {
+        set angle  [expr {($i-0.5) / $order * $pi}]
+        set sinsin [expr {1.0 - sin($cutoff) * sin($angle)}]
+        set rcof0  [expr {-cos($cutoff) / $sinsin}]
+        set rcof1  [expr { sin($cutoff) * cos($angle) / $sinsin}]
+
+        lset yf0 $i 0.0
+        lset yf1 $i 0.0
+
+        for {set j $i} {$j > 0} {incr j -1} {
+            set yf0jm1 [lindex $yf0 [expr {$j-1}]]
+            set yf1jm1 [lindex $yf1 [expr {$j-1}]]
+            set yf0j   [lindex $yf0 $j]
+            set yf1j   [lindex $yf1 $j]
+
+            lset yf0 $j [expr {$yf0j + $rcof0 * $yf0jm1 + $rcof1 * $yf1jm1}]
+            lset yf1 $j [expr {$yf1j + $rcof0 * $yf1jm1 - $rcof1 * $yf0jm1}]
+        }
+
+        set  scale [expr {$scale * $sinsin * 2.0 / (1.0 - cos($cutoff) * $invert)}]
+        set  xfim1 [lindex $xf [expr {$i-1}]]
+        lset xf $i [expr {$xfim1 * $invert * ($order-$i+1)/double($i)}]
+    }
+
+    set scale [expr {sqrt($scale)}]
+
+    for {set i 1} {$i <= $order} {incr i} {
+        set  yf0i   [lindex $yf0 $i]
+        lset yf0 $i [expr {$yf0i * $scale}]
+    }
+
+    return [list $xf [lrange $yf0 1 end] $scale]
+}
+
+# filter --
+#     Filter the data series based on the given coefficients
+#
+# Arguments:
+#     coeff           Filter coefficients, as generated by filtergen
+#     data            Data to be filtered
+#
+# Returns:
+#     The filtered data
+#
+# Note:
+#     The initial part of the filtered data is a list of zeroes
+#
+proc ::math::filters::filter {coeff data} {
+    lassign $coeff xcoeff ycoeff scale
+
+    set filtered {}
+
+    set yv [lrepeat [llength $ycoeff] [expr {0.0}]]
+
+    set noxcoeff [llength $xcoeff]
+    set xcoeff   [lreverse $xcoeff]
+    set ycoeff   [lreverse $ycoeff]
+
+    for {set i 0} {$i <= [llength $data]-$noxcoeff} {incr i} {
+        set xv [lrange $data $i [expr {$i+$noxcoeff-1}]]
+
+        set f  [expr {0.0}]
+
+        foreach x $xv c $xcoeff {
+            set f [expr {$f + $c * $x}]
+        }
+
+        foreach y $yv c $ycoeff {
+            set f [expr {$f + $c * $y}]
+        }
+
+        set f [expr {$f / $scale}]
+
+        lappend filtered $f
+
+        set yv [concat [lrange $yv 1 end] $f]
+    }
+
+    return $filtered
+}
+
+# filterObject --
+#     Create an object that can filter incoming data
+#
+# Arguments:
+#     coeff           Filter coefficients, as generated by filtergen
+#     yinit           (Optional) initial y-values
+#
+::oo::class create ::math::filters::filterObject {
+    variable xcoeff
+    variable ycoeff
+    variable yv
+    variable xv
+    variable xv_org
+    variable yv_org
+
+    #
+    # Constructor:
+    # - the arguments coeff and, optionally, yinit
+    # - prepare everything
+    #
+    constructor {coeff {yinit {}}} {
+        variable xcoeff
+        variable ycoeff
+        variable scale
+        variable yv
+        variable xv
+        variable yv_org
+        variable xv_org
+
+        lassign $coeff xcoeff ycoeff scale
+
+        set xcoeff   [lreverse $xcoeff]
+        set ycoeff   [lreverse $ycoeff]
+
+        if { $yinit eq {} } {
+            set yv [lrepeat [llength $ycoeff] [expr {0.0}]]
+        } else {
+            if { [llength $yinit] != [llength $ycoeff] } {
+                return -code error "Length of initial y-values must be equal to the number of y coefficients"
+            }
+            set yv $yinit
+        }
+        set xv [lrepeat [llength $xcoeff] [expr {0.0}]]
+
+        set xv_org $xv
+        set yv_org $yv
+    }
+
+    method filter {x} {
+        variable xcoeff
+        variable ycoeff
+        variable scale
+        variable yv
+        variable xv
+
+        set xv [concat [lrange $xv 1 end] $x]
+        set f  [expr {0.0}]
+
+        foreach x $xv c $xcoeff {
+            set f [expr {$f + $c * $x}]
+        }
+
+        foreach y $yv c $ycoeff {
+            set f [expr {$f + $c * $y}]
+        }
+
+        set f  [expr {$f / $scale}]
+
+        set yv [concat [lrange $yv 1 end] $f]
+
+        return $f
+    }
+
+    method reset {} {
+        variable yv
+        variable xv
+        variable xv_org
+        variable yv_org
+
+        set xv $xv_org
+        set yv $yv_org
+    }
+}
+
+# Publish the package
+
+namespace eval ::math::filters {
+    namespace export filterButterworth filter filterObject
+}
+
+package provide math::filters 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/fourier.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/fourier.tcl
new file mode 100644
index 00000000..bd455ad9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/fourier.tcl
@@ -0,0 +1,376 @@
+# fourier.tcl --
+#    Package for discrete (ordinary) and fast fourier transforms
+#
+# Author: Lars Hellstrom (...)
+#
+# The two top-level procedures defined are
+#
+#          dft data-list
+#          inverse_dft data-list
+#
+# which take a list of complex numbers and apply a Discrete Fourier
+# Transform (DFT) or its inverse respectively to these lists of numbers.
+# A "complex number" in this case is either (i) a pair (two element
+# list) of numbers, interpreted as the real and imaginary parts of the
+# complex number, or (ii) a single number, interpreted as the real
+# part of a complex number whose imaginary part is zero. The return
+# value is always in the first format. (The DFT generally produces
+# complex results even if the input is purely real.) Applying first
+# one and then the other of these procedures to a list of complex
+# numbers will (modulo rounding errors due to floating point
+# arithmetic) return the original list of numbers.
+#
+# If the input length N is a power of two then these procedures will
+# utilize the O(N log N) Fast Fourier Transform algorithm. If input
+# length is not a power of two then the DFT will instead be computed
+# using a the naive quadratic algorithm.
+#
+# Some examples:
+#
+#   % dft {1 2 3 4}
+#   {10 0.0} {-2.0 2.0} {-2 0.0} {-2.0 -2.0}
+#   % inverse_dft {{10 0.0} {-2.0 2.0} {-2 0.0} {-2.0 -2.0}}
+#   {1.0 0.0} {2.0 0.0} {3.0 0.0} {4.0 0.0}
+#   % dft {1 2 3 4 5}
+#   {15.0 0.0} {-2.5 3.44095480118} {-2.5 0.812299240582} {-2.5 -0.812299240582} {-2.5 -3.44095480118}
+#   % inverse_dft {{15.0 0.0} {-2.5 3.44095480118} {-2.5 0.812299240582} {-2.5 -0.812299240582} {-2.5 -3.44095480118}}
+#   {1.0 0.0} {2.0 8.881784197e-17} {3.0 4.4408920985e-17} {4.0 4.4408920985e-17} {5.0 -8.881784197e-17}
+                                   #
+# In the last case, the imaginary parts <1e-16 would have been zero in
+# exact arithmetic, but aren't here due to rounding errors.
+#
+# Internally, the procedures use a flat list format where every even
+# index element of a list is a real part and every odd index element is
+# an imaginary part. This is reflected in the variable names by Re_ and
+# Im_ prefixes.
+#
+
+namespace eval ::math::fourier {
+   #::math::constants pi
+
+   namespace export dft inverse_dft lowpass highpass
+}
+
+# dft --
+#     Return the discrete fourier transform as a list of complex numbers
+#
+# Arguments:
+#     in_data     List of data (either real or complex)
+# Returns:
+#     List of complex amplitudes for the Fourier components
+# Note:
+#     The procedure uses an ordinary DFT if the number of data is
+#     not a power of 2, otherwise it uses FFT.
+#
+proc ::math::fourier::dft {in_data} {
+    # First convert to internal format
+    set dataL [list]
+    set n 0
+    foreach datum $in_data {
+        if {[llength $datum] == 1} then {
+            lappend dataL $datum 0.0
+        } else {
+            lappend dataL [lindex $datum 0] [lindex $datum 1]
+        }
+        incr n
+    }
+
+    # Then compute a list of n'th roots of unity (explanation below)
+    set rootL [DFT_make_roots $n -1]
+
+    # Check if the input length is a power of two.
+    set p 1
+    while {$p < $n} {set p [expr {$p << 1}]}
+    # By construction, $p is a power of two. If $n==$p then $n is too.
+
+    # Finally compute the transform using Fast_DFT or Slow_DFT,
+    # and convert back to the input format.
+    set res [list]
+    foreach {Re Im} [
+        if {$p == $n} then {
+            Fast_DFT $dataL $rootL
+        } else {
+            Slow_DFT $dataL $rootL
+        }
+    ] {
+        lappend res [list $Re $Im]
+    }
+    return $res
+}
+
+# inverse_dft --
+#     Invert the discrete fourier transform and return the restored data
+#     as complex numbers
+#
+# Arguments:
+#     in_data     List of fourier coefficients (either real or complex)
+# Returns:
+#     List of complex amplitudes for the Fourier components
+# Note:
+#     The procedure uses an ordinary DFT if the number of data is
+#     not a power of 2, otherwise it uses FFT.
+#
+proc ::math::fourier::inverse_dft {in_data} {
+    # First convert to internal format
+    set dataL [list]
+    set n 0
+    foreach datum $in_data {
+        if {[llength $datum] == 1} then {
+            lappend dataL $datum 0.0
+        } else {
+            lappend dataL [lindex $datum 0] [lindex $datum 1]
+        }
+        incr n
+    }
+
+    # Then compute a list of n'th roots of unity (explanation below)
+    set rootL [DFT_make_roots $n 1]
+
+    # Check if the input length is a power of two.
+    set p 1
+    while {$p < $n} {set p [expr {$p << 1}]}
+    # By construction, $p is a power of two. If $n==$p then $n is too.
+
+    # Finally compute the transform using Fast_DFT or Slow_DFT,
+    # divide by input data length to correct the amplitudes,
+    # and convert back to the input format.
+    set res [list]
+    foreach {Re Im} [
+        # $p is power of two. If $n==$p then $n is too.
+        if {$p == $n} then {
+            Fast_DFT $dataL $rootL
+        } else {
+            Slow_DFT $dataL $rootL
+        }
+    ] {
+        lappend res [list [expr {$Re/$n}] [expr {$Im/$n}]]
+    }
+    return $res
+}
+
+# DFT_make_roots --
+#     Return a list of the complex roots of unity or of -1
+#
+# Arguments:
+#     n           Order of the roots
+#     sign        Whether to use 1 or -1 (for inverse transform)
+# Returns:
+#     List of complex roots of unity or -1
+#
+proc ::math::fourier::DFT_make_roots {n sign} {
+    set res [list]
+    for {set k 0} {2*$k < $n} {incr k} {
+        set alpha [expr {2*3.1415926535897931*$sign*$k/$n}]
+        lappend res [expr {cos($alpha)}] [expr {sin($alpha)}]
+    }
+    return $res
+}
+
+# Fast_DFT --
+#     Perform the fast Fourier transform
+#
+# Arguments:
+#     dataL       List of data
+#     rootL       Roots of unity or -1 to use in the transform
+# Returns:
+#     List of complex numbers
+#
+proc ::math::fourier::Fast_DFT {dataL rootL} {
+    if {[llength $dataL] == 8} then {
+        foreach {Re_z0 Im_z0 Re_z1 Im_z1 Re_z2 Im_z2 Re_z3 Im_z3} $dataL {break}
+        if {[lindex $rootL 3] > 0} then {
+            return [list\
+              [expr {$Re_z0 + $Re_z1 + $Re_z2 + $Re_z3}] [expr {$Im_z0 + $Im_z1 + $Im_z2 + $Im_z3}]\
+              [expr {$Re_z0 - $Im_z1 - $Re_z2 + $Im_z3}] [expr {$Im_z0 + $Re_z1 - $Im_z2 - $Re_z3}]\
+              [expr {$Re_z0 - $Re_z1 + $Re_z2 - $Re_z3}] [expr {$Im_z0 - $Im_z1 + $Im_z2 - $Im_z3}]\
+              [expr {$Re_z0 + $Im_z1 - $Re_z2 - $Im_z3}] [expr {$Im_z0 - $Re_z1 - $Im_z2 + $Re_z3}]]
+        } else {
+            return [list\
+              [expr {$Re_z0 + $Re_z1 + $Re_z2 + $Re_z3}] [expr {$Im_z0 + $Im_z1 + $Im_z2 + $Im_z3}]\
+              [expr {$Re_z0 + $Im_z1 - $Re_z2 - $Im_z3}] [expr {$Im_z0 - $Re_z1 - $Im_z2 + $Re_z3}]\
+              [expr {$Re_z0 - $Re_z1 + $Re_z2 - $Re_z3}] [expr {$Im_z0 - $Im_z1 + $Im_z2 - $Im_z3}]\
+              [expr {$Re_z0 - $Im_z1 - $Re_z2 + $Im_z3}] [expr {$Im_z0 + $Re_z1 - $Im_z2 - $Re_z3}]]
+        }
+    } elseif {[llength $dataL] > 8} then {
+        set evenL [list]
+        set oddL [list]
+        foreach {Re_z0 Im_z0 Re_z1 Im_z1} $dataL {
+            lappend evenL $Re_z0 $Im_z0
+            lappend oddL $Re_z1 $Im_z1
+        }
+        set squarerootL [list]
+        foreach {Re_omega0 Im_omega0 Re_omega1 Im_omega1} $rootL {
+            lappend squarerootL $Re_omega0 $Im_omega0
+        }
+        set lowL [list]
+        set highL [list]
+        foreach\
+          {Re_y0 Im_y0}       [Fast_DFT $evenL $squarerootL]\
+          {Re_y1 Im_y1}       [Fast_DFT $oddL $squarerootL]\
+          {Re_omega Im_omega} $rootL {
+            set Re_y1t [expr {$Re_y1 * $Re_omega - $Im_y1 * $Im_omega}]
+            set Im_y1t [expr {$Im_y1 * $Re_omega + $Re_y1 * $Im_omega}]
+            lappend lowL  [expr {$Re_y0 + $Re_y1t}] [expr {$Im_y0 + $Im_y1t}]
+            lappend highL [expr {$Re_y0 - $Re_y1t}] [expr {$Im_y0 - $Im_y1t}]
+        }
+        return [concat $lowL $highL]
+    } elseif {[llength $dataL] == 4} then {
+        foreach {Re_z0 Im_z0 Re_z1 Im_z1} $dataL {break}
+        return [list\
+          [expr {$Re_z0 + $Re_z1}] [expr {$Im_z0 + $Im_z1}]\
+          [expr {$Re_z0 - $Re_z1}] [expr {$Im_z0 - $Im_z1}]]
+    } else {
+        return $dataL
+    }
+}
+
+# Slow_DFT --
+#     Perform the ordinary discrete (slow) Fourier transform
+#
+# Arguments:
+#     dataL       List of data
+#     rootL       Roots of unity or -1 to use in the transform
+# Returns:
+#     List of complex numbers
+#
+proc ::math::fourier::Slow_DFT {dataL rootL} {
+    set n [expr {[llength $dataL] / 2}]
+
+    # The missing roots are computed by complex conjugating the given
+    # roots. If $n is even then -1 is also needed; it is inserted explicitly.
+    set k [llength $rootL]
+    if {$n % 2 == 0} then {
+        lappend rootL -1.0 0.0
+    }
+    for {incr k -2} {$k > 0} {incr k -2} {
+        lappend rootL [lindex $rootL $k]\
+          [expr {-[lindex $rootL [expr {$k+1}]]}]
+    }
+
+    # This is strictly following the naive formula.
+    # The product jk is kept as a separate counter variable.
+    set res [list]
+    for {set k 0} {$k < $n} {incr k} {
+        set Re_sum 0.0
+        set Im_sum 0.0
+        set jk 0
+        foreach {Re_z Im_z} $dataL {
+            set Re_omega [lindex $rootL [expr {2*$jk}]]
+            set Im_omega [lindex $rootL [expr {2*$jk+1}]]
+            set Re_sum [expr {$Re_sum +
+              $Re_z * $Re_omega - $Im_z * $Im_omega}]
+            set Im_sum [expr {$Im_sum +
+              $Im_z * $Re_omega + $Re_z * $Im_omega}]
+            incr jk $k
+            if {$jk >= $n} then {set jk [expr {$jk - $n}]}
+        }
+        lappend res $Re_sum $Im_sum
+    }
+    return $res
+}
+
+# lowpass --
+#     Apply a low-pass filter to the Fourier transform
+#
+# Arguments:
+#     cutoff      Cut-off frequency
+#     in_data     Input transform (complex data)
+# Returns:
+#     Filtered transform
+#
+proc ::math::fourier::lowpass {cutoff in_data} {
+    package require math::complexnumbers
+
+    set res    [list]
+    set cutoff [list $cutoff 0.0]
+    set f      0.0
+    foreach a $in_data {
+       set an [::math::complexnumbers::/ $a \
+                  [::math::complexnumbers::+ {1.0 0.0} \
+                      [::math::complexnumbers::/ [list 0.0 $f] $cutoff]]]
+       lappend res $an
+       set f [expr {$f+1.0}]
+    }
+
+    return $res
+}
+
+# highpass --
+#     Apply a high-pass filter to the Fourier transform
+#
+# Arguments:
+#     cutoff      Cut-off frequency
+#     in_data     Input transform (complex data)
+# Returns:
+#     Filtered transform (high-pass)
+#
+proc ::math::fourier::highpass {cutoff in_data} {
+    package require math::complexnumbers
+
+    set res    [list]
+    set cutoff [list $cutoff 0.0]
+    set f      0.0
+    foreach a $in_data {
+       set ff [::math::complexnumbers::/ [list 0.0 $f] $cutoff]
+       set an [::math::complexnumbers::/ $ff \
+                  [::math::complexnumbers::+ {1.0 0.0} $ff]]
+       lappend res $an
+       set f [expr {$f+1.0}]
+    }
+
+    return $res
+}
+
+#
+# Announce the package
+#
+package provide math::fourier 1.0.2
+
+# test --
+#
+proc test_dft {points {real 0} {iterations 20}} {
+    set in_dataL [list]
+    for {set k 0} {$k < $points} {incr k} {
+        if {$real} then {
+            lappend in_dataL [expr {2*rand()-1}]
+        } else {
+            lappend in_dataL [list [expr {2*rand()-1}] [expr {2*rand()-1}]]
+        }
+    }
+    set time1 [time {
+        set conv_dataL [::math::fourier::dft $in_dataL]
+    } $iterations]
+    set time2 [time {
+        set out_dataL [::math::fourier::inverse_dft $conv_dataL]
+    } $iterations]
+    set err 0.0
+    foreach iz $in_dataL oz $out_dataL {
+        if {$real} then {
+            foreach {o1 o2} $oz {break}
+            set err [expr {$err + ($i-$o1)*($i-$o1) + $o2*$o2}]
+        } else {
+            foreach i $iz o $oz {
+                set err [expr {$err + ($i-$o)*($i-$o)}]
+            }
+        }
+    }
+    return [format "Forward: %s\nInverse: %s\nAverage error: %g"\
+      $time1 $time2 [expr {sqrt($err/$points)}]]
+}
+
+# Note:
+# Add simple filters
+
+if { 0 } {
+puts [::math::fourier::dft {1 2 3 4}]
+puts [::math::fourier::inverse_dft {{10 0.0} {-2.0 2.0} {-2 0.0} {-2.0 -2.0}}]
+puts [::math::fourier::dft {1 2 3 4 5}]
+puts [::math::fourier::inverse_dft {{15.0 0.0} {-2.5 3.44095480118} {-2.5 0.812299240582} {-2.5 -0.812299240582} {-2.5 -3.44095480118}}]
+puts [test_dft 10]
+puts [test_dft 16]
+puts [test_dft 100]
+puts [test_dft 128]
+
+puts [::math::fourier::dft {1 2 3 4}]
+puts [::math::fourier::lowpass 1.5 [::math::fourier::dft {1 2 3 4}]]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/fuzzy.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/fuzzy.tcl
new file mode 100644
index 00000000..5b017b52
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/fuzzy.tcl
@@ -0,0 +1,173 @@
+# fuzzy.tcl --
+#
+#    Script to define tolerant floating-point comparisons
+#    (Tcl-only version)
+#
+#    version 0.2: improved and extended, march 2002
+#    version 0.2.1: fix bug #2933130, january 2010
+
+package provide math::fuzzy 0.2.1
+
+namespace eval ::math::fuzzy {
+   variable eps3 2.2e-16
+
+   namespace export teq tne tge tgt tle tlt tfloor tceil tround troundn
+
+# DetermineTolerance
+#    Determine the epsilon value
+#
+# Arguments:
+#    None
+#
+# Result:
+#    None
+#
+# Side effects:
+#    Sets variable eps3
+#
+proc DetermineTolerance { } {
+   variable eps3
+   set eps 1.0
+   while { [expr {1.0+$eps}] != 1.0 } {
+      set eps3 [expr 3.0*$eps]
+      set eps  [expr 0.5*$eps]
+   }
+   #set check [expr {1.0+2.0*$eps}]
+   #puts "Eps3: $eps3 ($eps) ([expr {1.0-$check}] [expr 1.0-$check]"
+}
+
+# Absmax --
+#    Return the absolute maximum of two numbers
+#
+# Arguments:
+#    first      First number
+#    second     Second number
+#
+# Result:
+#    Maximum of the absolute values
+#
+proc Absmax { first second } {
+   return [expr {abs($first) > abs($second)? abs($first) : abs($second)}]
+}
+
+# teq, tne, tge, tgt, tle, tlt --
+#    Compare two floating-point numbers and return the logical result
+#
+# Arguments:
+#    first      First number
+#    second     Second number
+#
+# Result:
+#    1 if the condition holds, 0 if not.
+#
+proc teq { first second } {
+   variable eps3
+   set scale [Absmax $first $second]
+   return [expr {abs($first-$second) <= $eps3 * $scale}]
+}
+
+proc tne { first second } {
+   variable eps3
+
+   return [expr {![teq $first $second]}]
+}
+
+proc tgt { first second } {
+   variable eps3
+   set scale [Absmax $first $second]
+   return [expr {($first-$second) > $eps3 * $scale}]
+}
+
+proc tle { first second } {
+   return [expr {![tgt $first $second]}]
+}
+
+proc tlt { first second } {
+   expr { [tle $first $second] && [tne $first $second] }
+}
+
+proc tge { first second } {
+   if { [tgt $first $second] } {
+      return 1
+   } else {
+      return [teq $first $second]
+   }
+}
+
+# tfloor --
+#    Determine the "floor" of a number and return the result
+#
+# Arguments:
+#    number     Number in question
+#
+# Result:
+#    Largest integer number that is tolerantly smaller than the given
+#    value
+#
+proc tfloor { number } {
+   variable eps3
+
+   set q      [expr {($number < 0.0)? (1.0-$eps3) : 1.0 }]
+   set rmax   [expr {$q / (2.0 - $eps3)}]
+   set eps5   [expr {$eps3/$q}]
+   set vmin1  [expr {$eps5*abs(1.0+floor($number))}]
+   set vmin2  [expr {($rmax < $vmin1)? $rmax : $vmin1}]
+   set vmax   [expr {($eps3 > $vmin2)? $eps3 : $vmin2}]
+   set result [expr {floor($number+$vmax)}]
+   if { $number <= 0.0 || ($result-$number) < $rmax } {
+      return $result
+   } else {
+      return [expr {$result-1.0}]
+   }
+}
+
+# tceil --
+#    Determine the "ceil" of a number and return the result
+#
+# Arguments:
+#    number     Number in question
+#
+# Result:
+#    Smallest integer number that is tolerantly greater than the given
+#    value
+#
+proc tceil { number } {
+   expr {-[tfloor [expr {-$number}]]}
+}
+
+# tround --
+#    Round off a number and return the result
+#
+# Arguments:
+#    number     Number in question
+#
+# Result:
+#    Nearest integer number
+#
+proc tround { number } {
+   tfloor [expr {$number+0.5}]
+}
+
+# troundn --
+#    Round off a number to a given precision and return the result
+#
+# Arguments:
+#    number     Number in question
+#    ndec       Number of decimals to keep
+#
+# Result:
+#    Nearest number with given precision
+#
+proc troundn { number ndec } {
+   set scale   [expr {pow(10.0,$ndec)}]
+   set rounded [tfloor [expr {$number*$scale+0.5}]]
+   expr {$rounded/$scale}
+}
+
+#
+# Determine the tolerance once and for all
+#
+DetermineTolerance
+rename DetermineTolerance {}
+
+} ;# End of namespace
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/geometry.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/geometry.tcl
new file mode 100644
index 00000000..f528042c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/geometry.tcl
@@ -0,0 +1,1572 @@
+# geometry.tcl --
+#
+#	Collection of geometry functions.
+#
+# Copyright (c) 2001 by Ideogramic ApS and other parties.
+# Copyright (c) 2004 Arjen Markus
+# Copyright (c) 2010 Andreas Kupries
+# Copyright (c) 2010 Kevin Kenny
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: geometry.tcl,v 1.12 2010/05/24 21:44:16 andreas_kupries Exp $
+
+namespace eval ::math::geometry {}
+
+package require Tcl 8.5
+package require math
+
+###
+#
+# POINTS
+#
+#    A point P consists of an x-coordinate, Px, and a y-coordinate, Py,
+#    and both coordinates are floating point values.
+#
+#    Points are usually denoted by A, B, C, P, or Q.
+#
+###
+#
+# LINES
+#
+#    There are basically three types of lines:
+#         line           A line is defined by two points A and B as the
+#                        _infinite_ line going through these two points.
+#                        Often a line is given as a list of 4 coordinates
+#                        instead of 2 points.
+#         line segment   A line segment is defined by two points A and B
+#                        as the _finite_ that starts in A and ends in B.
+#                        Often a line segment is given as a list of 4
+#                        coordinates instead of 2 points.
+#         polyline       A polyline is a sequence of connected line segments.
+#
+#    Please note that given a point P, the closest point on a line is given
+#    by the projection of P onto the line. The closest point on a line segment
+#    may be the projection, but it may also be one of the end points of the
+#    line segment.
+#
+###
+#
+# DISTANCES
+#
+#    The distances in this package are all floating point values.
+#
+###
+
+# Point constructor
+proc ::math::geometry::p {x y} {
+    return [list $x $y]
+}
+
+# Vector addition
+proc ::math::geometry::+ {pa pb} {
+    lassign $pa ax ay; lassign $pb bx by
+    return [list [expr {$ax + $bx}] [expr {$ay + $by}]]
+}
+
+# Vector difference
+proc ::math::geometry::- {pa pb} {
+    lassign $pa ax ay; lassign $pb bx by
+    return [list [expr {$ax - $bx}] [expr {$ay - $by}]]
+}
+
+# Distance between 2 points
+proc ::math::geometry::distance {pa pb} {
+    lassign $pa ax ay; lassign $pb bx by
+    return [expr {hypot($bx-$ax,$by-$ay)}]
+}
+
+# Length of a vector
+proc ::math::geometry::length {v} {
+    lassign $v x y
+    return [expr {hypot($x,$y)}]
+}
+
+# Scaling a vector by a factor
+proc ::math::geometry::s* {factor p} {
+    lassign $p x y
+    return [list [expr {$x * $factor}] [expr {$y * $factor}]]
+}
+
+# Unit vector into specific direction given by angle (degrees)
+proc ::math::geometry::direction {angle} {
+    variable torad
+    set x [expr {cos($angle * $torad)}]
+    set y [expr {sin($angle * $torad)}]
+    return [list $x $y]
+}
+
+# Vertical vector of specified length.
+proc ::math::geometry::v {h} {
+    return [list 0 $h]
+}
+
+# Horizontal vector of specified length.
+proc ::math::geometry::h {w} {
+    return [list $w 0]
+}
+
+# Find point on a line between 2 points at a distance
+# distance 0 => a, distance 1 => b
+proc ::math::geometry::between {pa pb s} {
+    return [+ $pa [s* $s [- $pb $pa]]]
+}
+
+# Find direction octant the point (vector) lies in.
+proc ::math::geometry::octant {p} {
+    variable todeg
+    lassign $p x y
+
+    set a [expr {(atan2($y,$x)*$todeg)}]
+    while {$a >  360} {set a [expr {$a - 360}]}
+    while {$a < -360} {set a [expr {$a + 360}]}
+    if {$a < 0} {set a [expr {360 + $a}]}
+
+    #puts "p ($x, $y) @ angle $a | [expr {atan2($y,$x)}] | [expr {atan2($y,$x)*$todeg}]"
+    # XXX : Add outer conditions to make a log2 tree of checks.
+
+    if {$a <= 157.5} {
+	if {$a <= 67.5} {
+	    if {$a <= 22.5} { return east }
+	    return northeast
+	}
+	if {$a <=  112.5} { return north }
+	return northwest
+    } else {
+	if {$a <=  247.5} {
+	    if {$a <=  202.5} { return west }
+	    return southwest
+	}
+	if {$a <=  337.5} {
+	    if {$a <=  292.5} { return south }
+	    return southeast
+	}
+	return east ; # a <= 360.0
+    }
+}
+
+# Return the NW and SE corners of the rectangle.
+proc ::math::geometry::nwse {rect} {
+    lassign $rect xnw ynw xse yse
+    return [list [p $xnw $ynw] [p $xse $yse]]
+}
+
+# Construct rectangle from NW and SE corners.
+proc ::math::geometry::rect {pa pb} {
+    lassign $pa ax ay; lassign $pb bx by
+    return [list $ax $ay $bx $by]
+}
+
+proc ::math::geometry::conjx {p} {
+    lassign $p x y
+    return [list [expr {- $x}] $y]
+}
+
+proc ::math::geometry::conjy {p} {
+    lassign $p x y
+    return [list $x [expr {- $y}]]
+}
+
+proc ::math::geometry::x {p} {
+    return [lindex $p 0]
+}
+
+proc ::math::geometry::y {p} {
+    return [lindex $p 1]
+}
+
+# ::math::geometry::calculateDistanceToLine
+#
+#       Calculate the distance between a point and a line.
+#
+# Arguments:
+#       P             a point
+#       line          a line
+#
+# Results:
+#       dist          the smallest distance between P and the line
+#
+# Examples:
+#     - calculateDistanceToLine {5 10} {0 0 10 10}
+#       Result: 3.53553390593
+#     - calculateDistanceToLine {-10 0} {0 0 10 10}
+#       Result: 7.07106781187
+#
+proc ::math::geometry::calculateDistanceToLine {P line} {
+    # solution based on FAQ 1.02 on comp.graphics.algorithms
+    # L = hypot( Bx-Ax, By-Ay )
+    #     (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay)
+    # s = -----------------------------
+    #                 L^2
+    # dist = |s|*L
+    #
+    # =>
+    #
+    #        | (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay) |
+    # dist = ---------------------------------
+    #                       L
+    set Ax [lindex $line 0]
+    set Ay [lindex $line 1]
+    set Bx [lindex $line 2]
+    set By [lindex $line 3]
+    set Cx [lindex $P 0]
+    set Cy [lindex $P 1]
+    if {$Ax==$Bx && $Ay==$By} {
+	return [lengthOfPolyline [concat $P [lrange $line 0 1]]]
+    } else {
+	set L [expr {hypot($Bx-$Ax,$By-$Ay)}]
+	return [expr {abs(($Ay-$Cy)*($Bx-$Ax)-($Ax-$Cx)*($By-$Ay)) / $L}]
+    }
+}
+
+# ::math::geometry::findClosestPointOnLine
+#
+#       Return the point on a line which is closest to a given point.
+#
+# Arguments:
+#       P             a point
+#       line          a line
+#
+# Results:
+#       Q             the point on the line that has the smallest
+#                     distance to P
+#
+# Examples:
+#     - findClosestPointOnLine {5 10} {0 0 10 10}
+#       Result: 7.5 7.5
+#     - findClosestPointOnLine {-10 0} {0 0 10 10}
+#       Result: -5.0 -5.0
+#
+proc ::math::geometry::findClosestPointOnLine {P line} {
+    return [lindex [findClosestPointOnLineImpl $P $line] 0]
+}
+
+# ::math::geometry::findClosestPointOnLineImpl
+#
+#       PRIVATE FUNCTION USED BY OTHER FUNCTIONS.
+#       Find the point on a line that is closest to a given point.
+#
+# Arguments:
+#       P             a point
+#       line          a line defined by points A and B
+#
+# Results:
+#       Q             the point on the line that has the smallest
+#                     distance to P
+#       r             r has the following meaning:
+#                        r=0      P = A
+#                        r=1      P = B
+#                        r<0      P is on the backward extension of AB
+#                        r>1      P is on the forward extension of AB
+#                        0<r<1    P is interior to AB
+#
+proc ::math::geometry::findClosestPointOnLineImpl {P line} {
+    # solution based on FAQ 1.02 on comp.graphics.algorithms - but avoid the
+    # chain of pow( sqrt(...) ,2) for better precision (& performance).
+    #   L^2 = (Bx-Ax)^2 + (By-Ay)^2
+    #        (Cx-Ax)(Bx-Ax) + (Cy-Ay)(By-Ay)
+    #   r = -------------------------------
+    #                     L^2
+    #   Px = Ax + r(Bx-Ax)
+    #   Py = Ay + r(By-Ay)
+    set Ax [lindex $line 0]
+    set Ay [lindex $line 1]
+    set Bx [lindex $line 2]
+    set By [lindex $line 3]
+    set Cx [lindex $P 0]
+    set Cy [lindex $P 1]
+    if {$Ax==$Bx && $Ay==$By} {
+	return [list [list $Ax $Ay] 0]
+    } else {
+	set Lsquared [expr {pow($Bx-$Ax,2) + pow($By-$Ay,2)}]
+	set r [expr {(($Cx-$Ax)*($Bx-$Ax) + ($Cy-$Ay)*($By-$Ay))/$Lsquared}]
+	set Px [expr {$Ax + $r*($Bx-$Ax)}]
+	set Py [expr {$Ay + $r*($By-$Ay)}]
+	return [list [list $Px $Py] $r]
+    }
+}
+
+# ::math::geometry::calculateDistanceToLineSegment
+#
+#       Calculate the distance between a point and a line segment.
+#
+# Arguments:
+#       P             a point
+#       linesegment   a line segment
+#
+# Results:
+#       dist          the smallest distance between P and any point
+#                     on the line segment
+#
+# Examples:
+#     - calculateDistanceToLineSegment {5 10} {0 0 10 10}
+#       Result: 3.53553390593
+#     - calculateDistanceToLineSegment {-10 0} {0 0 10 10}
+#       Result: 10.0
+#
+proc ::math::geometry::calculateDistanceToLineSegment {P linesegment} {
+    set result [calculateDistanceToLineSegmentImpl $P $linesegment]
+    set distToLine [lindex $result 0]
+    set r [lindex $result 1]
+    if {$r<0} {
+	return [lengthOfPolyline [concat $P [lrange $linesegment 0 1]]]
+    } elseif {$r>1} {
+	return [lengthOfPolyline [concat $P [lrange $linesegment 2 3]]]
+    } else {
+	return $distToLine
+    }
+}
+
+# ::math::geometry::calculateDistanceToLineSegmentImpl
+#
+#       PRIVATE FUNCTION USED BY OTHER FUNCTIONS.
+#       Find the distance between a point and a line.
+#
+# Arguments:
+#       P             a point
+#       linesegment   a line segment A->B
+#
+# Results:
+#       dist          the smallest distance between P and the line
+#       r             r has the following meaning:
+#                        r=0      P = A
+#                        r=1      P = B
+#                        r<0      P is on the backward extension of AB
+#                        r>1      P is on the forward extension of AB
+#                        0<r<1    P is interior to AB
+#
+proc ::math::geometry::calculateDistanceToLineSegmentImpl {P linesegment} {
+    # solution based on FAQ 1.02 on comp.graphics.algorithms
+    # L = hypot( Bx-Ax , By-Ay )
+    #     (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay)
+    # s = -----------------------------
+    #                 L^2
+    #      (Cx-Ax)(Bx-Ax) + (Cy-Ay)(By-Ay)
+    # r = -------------------------------
+    #                   L^2
+    # dist = |s|*L
+    #
+    # =>
+    #
+    #        | (Ay-Cy)(Bx-Ax)-(Ax-Cx)(By-Ay) |
+    # dist = ---------------------------------
+    #                       L
+    set Ax [lindex $linesegment 0]
+    set Ay [lindex $linesegment 1]
+    set Bx [lindex $linesegment 2]
+    set By [lindex $linesegment 3]
+    set Cx [lindex $P 0]
+    set Cy [lindex $P 1]
+    if {$Ax==$Bx && $Ay==$By} {
+	return [list [lengthOfPolyline [concat $P [lrange $linesegment 0 1]]] 0]
+    } else {
+	set L [expr {hypot($Bx-$Ax,$By-$Ay)}]
+	set r [expr {(($Cx-$Ax)*($Bx-$Ax) + ($Cy-$Ay)*($By-$Ay))/pow($L,2)}]
+	return [list [expr {abs(($Ay-$Cy)*($Bx-$Ax)-($Ax-$Cx)*($By-$Ay)) / $L}] $r]
+    }
+}
+
+# ::math::geometry::findClosestPointOnLineSegment
+#
+#       Return the point on a line segment which is closest to a given point.
+#
+# Arguments:
+#       P             a point
+#       linesegment   a line segment
+#
+# Results:
+#       Q             the point on the line segment that has the
+#                     smallest distance to P
+#
+# Examples:
+#     - findClosestPointOnLineSegment {5 10} {0 0 10 10}
+#       Result: 7.5 7.5
+#     - findClosestPointOnLineSegment {-10 0} {0 0 10 10}
+#       Result: 0 0
+#
+proc ::math::geometry::findClosestPointOnLineSegment {P linesegment} {
+    set result [findClosestPointOnLineImpl $P $linesegment]
+    set Q [lindex $result 0]
+    set r [lindex $result 1]
+    if {$r<0} {
+	return [lrange $linesegment 0 1]
+    } elseif {$r>1} {
+	return [lrange $linesegment 2 3]
+    } else {
+	return $Q
+    }
+
+}
+
+# ::math::geometry::calculateDistanceToPolyline
+#
+#       Calculate the distance between a point and a polyline.
+#
+# Arguments:
+#       P           a point
+#       polyline    a polyline
+#
+# Results:
+#       dist        the smallest distance between P and any point
+#                   on the polyline
+#
+# Examples:
+#     - calculateDistanceToPolyline {10 10} {0 0 10 5 20 0}
+#       Result: 5.0
+#     - calculateDistanceToPolyline {5 10} {0 0 10 5 20 0}
+#       Result: 6.7082039325
+#
+proc ::math::geometry::calculateDistanceToPolyline {P polyline} {
+    set minDist "Inf"
+    foreach {Bx By} [lassign $polyline Ax Ay] {
+	set dist [calculateDistanceToLineSegment $P [list $Ax $Ay $Bx $By]]
+	if {$dist < $minDist} {
+	    set minDist $dist
+	}
+	set Ax $Bx; set Ay $By
+    }
+    return $minDist
+}
+
+# ::math::geometry::calculateDistanceToPolygon
+#
+#       Calculate the distance between a point and a polygon.
+#
+# Arguments:
+#       P           a point
+#       polygon     a polygon
+#
+# Results:
+#       dist        the smallest distance between P and any point
+#                   on the polygon
+#
+# Note:
+#       The polygon does not need to be closed - this is taken
+#       care of in the procedure.
+#
+proc ::math::geometry::calculateDistanceToPolygon {P polygon} {
+    return [::math::geometry::calculateDistanceToPolyline $P [ClosedPolygon $polygon]]
+}
+
+# ::math::geometry::findClosestPointOnPolyline
+#
+#       Return the point on a polyline which is closest to a given point.
+#
+# Arguments:
+#       P           a point
+#       polyline    a polyline
+#
+# Results:
+#       Q           the point on the polyline that has the smallest
+#                   distance to P
+#
+# Examples:
+#     - findClosestPointOnPolyline {10 10} {0 0 10 5 20 0}
+#       Result: 10 5
+#     - findClosestPointOnPolyline {5 10} {0 0 10 5 20 0}
+#       Result: 8.0 4.0
+#
+proc ::math::geometry::findClosestPointOnPolyline {P polyline} {
+    set closestPoint "none"; set closestDistance "Inf"
+    foreach {Bx By} [lassign $polyline Ax Ay] {
+	set Q [findClosestPointOnLineSegment $P [list $Ax $Ay $Bx $By]]
+	set dist [distance $P $Q]
+	if {$dist<$closestDistance} {
+	    set closestPoint $Q
+	    set closestDistance $dist
+	}
+	set Ax $Bx; set Ay $By
+    }
+    return $closestPoint
+}
+
+
+
+
+
+
+# ::math::geometry::lengthOfPolyline
+#
+#       Find the length of a polyline, i.e., the sum of the
+#       lengths of the individual line segments.
+#
+# Arguments:
+#       polyline      a polyline
+#
+# Results:
+#       length        the length of the polyline
+#
+# Examples:
+#     - lengthOfPolyline {0 0 5 0 5 10}
+#       Result: 15.0
+#
+proc ::math::geometry::lengthOfPolyline {polyline} {
+    set length 0
+    foreach {x2 y2} [lassign $polyline x1 y1] {
+	set length [expr {$length + hypot($x1-$x2,$y1-$y2)}]
+	set x1 $x2; set y1 $y2
+    }
+    return $length
+}
+
+
+
+
+# ::math::geometry::movePointInDirection
+#
+#       Move a point in a given direction.
+#
+# Arguments:
+#       P             the starting point
+#       direction     the direction from P
+#                     The direction is in 360-degrees going counter-clockwise,
+#                     with "straight right" being 0 degrees
+#       dist          the distance from P
+#
+# Results:
+#       Q             the point which is found by starting in P and going
+#                     in the given direction, until the distance between
+#                     P and Q is dist
+#
+# Examples:
+#     - movePointInDirection {0 0} 45.0 10
+#       Result: 7.07106781187 7.07106781187
+#
+proc ::math::geometry::movePointInDirection {P direction dist} {
+    set x [lindex $P 0]
+    set y [lindex $P 1]
+    set pi [expr {4*atan(1)}]
+    set xt [expr {$x + $dist*cos(($direction*$pi)/180)}]
+    set yt [expr {$y + $dist*sin(($direction*$pi)/180)}]
+    return [list $xt $yt]
+}
+
+
+# ::math::geometry::angle
+#
+#       Calculates angle from the horizon (0,0)->(1,0) to a line.
+#
+# Arguments:
+#       line          a line defined by two points A and B
+#
+# Results:
+#       angle         the angle between the line (0,0)->(1,0) and (Ax,Ay)->(Bx,By).
+#                     Angle is in 360-degrees going counter-clockwise
+#
+# Examples:
+#     - angle {10 10 15 13}
+#       Result: 30.9637565321
+#
+proc ::math::geometry::angle {line} {
+    set x1 [lindex $line 0]
+    set y1 [lindex $line 1]
+    set x2 [lindex $line 2]
+    set y2 [lindex $line 3]
+    # - handle vertical lines
+    if {$x1==$x2} {if {$y1<$y2} {return 90} else {return 270}}
+    # - handle other lines
+    set a [expr {atan(abs((1.0*$y1-$y2)/(1.0*$x1-$x2)))}] ; # a is between 0 and pi/2
+    set pi [expr {4*atan(1)}]
+    if {$y1<=$y2} {
+	# line is going upwards
+	if {$x1<$x2} {set b $a} else {set b [expr {$pi-$a}]}
+    } else {
+	# line is going downwards
+	if {$x1<$x2} {set b [expr {2*$pi-$a}]} else {set b [expr {$pi+$a}]}
+    }
+    return [expr {$b/$pi*180}] ; # convert b to degrees
+}
+
+
+
+
+###
+#
+# Intersection procedures
+#
+###
+
+# ::math::geometry::lineSegmentsIntersect
+#
+#       Checks whether two line segments intersect.
+#
+# Arguments:
+#       linesegment1  the first line segment
+#       linesegment2  the second line segment
+#
+# Results:
+#       dointersect   a boolean saying whether the line segments intersect
+#                     (i.e., have any points in common)
+#
+# Examples:
+#     - lineSegmentsIntersect {0 0 10 10} {0 10 10 0}
+#       Result: 1
+#     - lineSegmentsIntersect {0 0 10 10} {20 20 20 30}
+#       Result: 0
+#     - lineSegmentsIntersect {0 0 10 10} {10 10 15 15}
+#       Result: 1
+#
+proc ::math::geometry::lineSegmentsIntersect {linesegment1 linesegment2} {
+    # Algorithm based on Sedgewick.
+    set l1x1 [lindex $linesegment1 0]
+    set l1y1 [lindex $linesegment1 1]
+    set l1x2 [lindex $linesegment1 2]
+    set l1y2 [lindex $linesegment1 3]
+    set l2x1 [lindex $linesegment2 0]
+    set l2y1 [lindex $linesegment2 1]
+    set l2x2 [lindex $linesegment2 2]
+    set l2y2 [lindex $linesegment2 3]
+
+    #
+    # First check the distance between the endpoints
+    #
+    set margin 1.0e-7
+    if { [calculateDistanceToLineSegment [lrange $linesegment1 0 1] $linesegment2] < $margin } {
+        return 1
+    }
+    if { [calculateDistanceToLineSegment [lrange $linesegment1 2 3] $linesegment2] < $margin } {
+        return 1
+    }
+    if { [calculateDistanceToLineSegment [lrange $linesegment2 0 1] $linesegment1] < $margin } {
+        return 1
+    }
+    if { [calculateDistanceToLineSegment [lrange $linesegment2 2 3] $linesegment1] < $margin } {
+        return 1
+    }
+
+    return [expr {([ccw [list $l1x1 $l1y1] [list $l1x2 $l1y2] [list $l2x1 $l2y1]]\
+	    *[ccw [list $l1x1 $l1y1] [list $l1x2 $l1y2] [list $l2x2 $l2y2]] <= 0) \
+	    && ([ccw [list $l2x1 $l2y1] [list $l2x2 $l2y2] [list $l1x1 $l1y1]]\
+	    *[ccw [list $l2x1 $l2y1] [list $l2x2 $l2y2] [list $l1x2 $l1y2]] <= 0)}]
+}
+
+# ::math::geometry::findLineSegmentIntersection
+#
+#       Returns the intersection point of two line segments.
+#       Note: may also return "coincident" and "none".
+#
+# Arguments:
+#       linesegment1  the first line segment
+#       linesegment2  the second line segment
+#
+# Results:
+#       P             the intersection point of linesegment1 and linesegment2.
+#                     If linesegment1 and linesegment2 have an infinite number
+#                     of points in common, the procedure returns "coincident".
+#                     If there are no intersection points, the procedure
+#                     returns "none".
+#
+# Examples:
+#     - findLineSegmentIntersection {0 0 10 10} {0 10 10 0}
+#       Result: 5.0 5.0
+#     - findLineSegmentIntersection {0 0 10 10} {20 20 20 30}
+#       Result: none
+#     - findLineSegmentIntersection {0 0 10 10} {10 10 15 15}
+#       Result: 10.0 10.0
+#     - findLineSegmentIntersection {0 0 10 10} {5 5 15 15}
+#       Result: coincident
+#
+proc ::math::geometry::findLineSegmentIntersection {linesegment1 linesegment2} {
+    if {[lineSegmentsIntersect $linesegment1 $linesegment2]} {
+	set lineintersect [findLineIntersection $linesegment1 $linesegment2]
+#puts ">>Intersect: $lineintersect"
+	switch -- $lineintersect {
+
+	    "coincident" {
+		# lines are coincident
+		set l1x1 [lindex $linesegment1 0]
+		set l1y1 [lindex $linesegment1 1]
+		set l1x2 [lindex $linesegment1 2]
+		set l1y2 [lindex $linesegment1 3]
+		set l2x1 [lindex $linesegment2 0]
+		set l2y1 [lindex $linesegment2 1]
+		set l2x2 [lindex $linesegment2 2]
+		set l2y2 [lindex $linesegment2 3]
+		# check if the line SEGMENTS overlap
+		# (NOT enough to check if the x-intervals overlap (vertical lines!))
+		set overlapx [intervalsOverlap $l1x1 $l1x2 $l2x1 $l2x2 1]
+		set overlapy [intervalsOverlap $l1y1 $l1y2 $l2y1 $l2y2 1]
+#puts ">>Overlap: $overlapx $overlapy"
+		if {$overlapx || $overlapy} {
+		    return "coincident"
+		} else {
+		    # If the line segments are adjacent, return the proper end point, otherwise "none"
+		    if { ( $l1x1 == $l2x1 && $l1y1 == $l2y1 ) || ( $l1x1 == $l2x2 && $l1y1 == $l2y2 ) } {
+		        return [list $l1x1 $l1y1]
+		    }
+		    if { ( $l1x2 == $l2x1 && $l1y2 == $l2y1 ) || ( $l1x2 == $l2x2 && $l1y2 == $l2y2 ) } {
+		        return [list $l1x2 $l1y2]
+		    }
+		    return "none"
+		}
+	    }
+
+	    "none" {
+		# should never happen, because we call "lineSegmentsIntersect" first
+		puts stderr "::math::geometry::findLineSegmentIntersection: suddenly no intersection?"
+		return "none"
+	    }
+
+	    default {
+		# lineintersect = the intersection point
+		return $lineintersect
+	    }
+	}
+    } else {
+	return "none"
+    }
+}
+
+# ::math::geometry::findLineIntersection {line1 line2}
+#
+#       Returns the intersection point of two lines.
+#       Note: may also return "coincident" and "none".
+#
+# Arguments:
+#       line1         the first line
+#       line2         the second line
+#
+# Results:
+#       P             the intersection point of line1 and line2.
+#                     If line1 and line2 have an infinite number of points
+#                     in common, the procedure returns "coincident".
+#                     If there are no intersection points, the procedure
+#                     returns "none".
+#
+# Examples:
+#     - findLineIntersection {0 0 10 10} {0 10 10 0}
+#       Result: 5.0 5.0
+#     - findLineIntersection {0 0 10 10} {20 20 20 30}
+#       Result: 20.0 20.0
+#     - findLineIntersection {0 0 10 10} {10 10 15 15}
+#       Result: coincident
+#     - findLineIntersection {0 0 10 10} {5 5 15 15}
+#       Result: coincident
+#     - findLineIntersection {0 0 10 10} {0 1 10 11}
+#       Result: none
+#
+proc ::math::geometry::findLineIntersection {line1 line2} {
+
+    # References:
+    # http://wiki.tcl.tk/12070 (Kevin Kenny)
+    # http://local.wasp.uwa.edu.au/~pbourke/geometry/lineline2d/
+
+    set l1x1 [lindex $line1 0]
+    set l1y1 [lindex $line1 1]
+    set l1x2 [lindex $line1 2]
+    set l1y2 [lindex $line1 3]
+
+    set l2x1 [lindex $line2 0]
+    set l2y1 [lindex $line2 1]
+    set l2x2 [lindex $line2 2]
+    set l2y2 [lindex $line2 3]
+
+    set d [expr {($l2y2 - $l2y1) * ($l1x2 - $l1x1) -
+		 ($l2x2 - $l2x1) * ($l1y2 - $l1y1)}]
+    set na [expr {($l2x2 - $l2x1) * ($l1y1 - $l2y1) -
+		  ($l2y2 - $l2y1) * ($l1x1 - $l2x1)}]
+
+    # http://local.wasp.uwa.edu.au/~pbourke/geometry/lineline2d/
+    if {$d == 0} {
+	if {$na == 0} {
+	    return "coincident"
+	} else {
+	    return "none"
+	}
+    }
+    set r [list \
+               [expr {$l1x1 + $na * ($l1x2 - $l1x1) / $d}] \
+               [expr {$l1y1 + $na * ($l1y2 - $l1y1) / $d}]]
+    return $r
+}
+
+
+# ::math::geometry::polylinesIntersect
+#
+#       Checks whether two polylines intersect.
+#
+# Arguments;
+#       polyline1     the first polyline
+#       polyline2     the second polyline
+#
+# Results:
+#       dointersect   a boolean saying whether the polylines intersect
+#
+# Examples:
+#     - polylinesIntersect {0 0 10 10 10 20} {0 10 10 0}
+#       Result: 1
+#     - polylinesIntersect {0 0 10 10 10 20} {5 4 10 4}
+#       Result: 0
+#
+proc ::math::geometry::polylinesIntersect {polyline1 polyline2} {
+    return [polylinesBoundingIntersect $polyline1 $polyline2 0]
+}
+
+# ::math::geometry::polylinesBoundingIntersect
+#
+#       Check whether two polylines intersect, but reduce
+#       the correctness of the result to the given granularity.
+#       Use this for faster, but weaker, intersection checking.
+#
+#       How it works:
+#          Each polyline is split into a number of smaller polylines,
+#          consisting of granularity points each. If a pair of those smaller
+#          lines' bounding boxes intersect, then this procedure returns 1,
+#          otherwise it returns 0.
+#
+# Arguments:
+#       polyline1     the first polyline
+#       polyline2     the second polyline
+#       granularity   the number of points in each part-polyline
+#                     granularity<=1 means full correctness
+#
+# Results:
+#       dointersect   a boolean saying whether the polylines intersect
+#
+# Examples:
+#     - polylinesBoundingIntersect {0 0 10 10 10 20} {0 10 10 0} 2
+#       Result: 1
+#     - polylinesBoundingIntersect {0 0 10 10 10 20} {5 4 10 4} 2
+#       Result: 1
+#
+proc ::math::geometry::polylinesBoundingIntersect {polyline1 polyline2 granularity} {
+    if {$granularity<=1} {
+	# Use perfect intersect
+	# => first pin down where an intersection point may be, and then
+	#    call MultilinesIntersectPerfect on those parts
+	set granularity 10 ; # optimal search granularity?
+	set perfectmatch 1
+    } else {
+	set perfectmatch 0
+    }
+
+    # split the lines into parts consisting of $granularity points
+    set polyline1parts {}
+    for {set i 0} {$i<[llength $polyline1]} {incr i [expr {2*$granularity-2}]} {
+	lappend polyline1parts [lrange $polyline1 $i [expr {$i+2*$granularity-1}]]
+    }
+    set polyline2parts {}
+    for {set i 0} {$i<[llength $polyline2]} {incr i [expr {2*$granularity-2}]} {
+	lappend polyline2parts [lrange $polyline2 $i [expr {$i+2*$granularity-1}]]
+    }
+
+    # do any of the parts overlap?
+    foreach part1 $polyline1parts {
+	foreach part2 $polyline2parts {
+	    set part1bbox [bbox $part1]
+	    set part2bbox [bbox $part2]
+	    if {[rectanglesOverlap [lrange $part1bbox 0 1] [lrange $part1bbox 2 3] \
+		    [lrange $part2bbox 0 1] [lrange $part2bbox 2 3] 0]} {
+		# the lines' bounding boxes intersect
+		if {$perfectmatch} {
+		    foreach {l1x2 l1y2} [lassign $part1 l1x1 l1y1] {
+			foreach {l2x2 l2y2} [lassign $part2 l2x1 l2y1] {
+			    if {[lineSegmentsIntersect [list $l1x1 $l1y1 $l1x2 $l1y2] \
+				    [list $l2x1 $l2y1 $l2x2 $l2y2]]} {
+				# two line segments overlap
+				return 1
+			    }
+			    set l2x1 $l2x2; set l2y1 $l2y2
+			}
+			set l1x1 $l1x2; set l1y1 $l1y2
+		    }
+		    return 0
+		} else {
+		    return 1
+		}
+	    }
+	}
+    }
+    return 0
+}
+
+# ::math::geometry::ccw
+#
+#       PRIVATE FUNCTION USED BY OTHER FUNCTIONS.
+#       Returns whether traversing from A to B to C is CounterClockWise
+#       Algorithm by Sedgewick.
+#
+# Arguments:
+#       A             first point
+#       B             second point
+#       C             third point
+#
+# Reeults:
+#       ccw           a boolean saying whether traversing from A to B to C
+#                     is CounterClockWise
+#
+proc ::math::geometry::ccw {A B C} {
+    set Ax [lindex $A 0]
+    set Ay [lindex $A 1]
+    set Bx [lindex $B 0]
+    set By [lindex $B 1]
+    set Cx [lindex $C 0]
+    set Cy [lindex $C 1]
+    set dx1 [expr {$Bx - $Ax}]
+    set dy1 [expr {$By - $Ay}]
+    set dx2 [expr {$Cx - $Ax}]
+    set dy2 [expr {$Cy - $Ay}]
+    if {$dx1*$dy2 > $dy1*$dx2} {return 1}
+    if {$dx1*$dy2 < $dy1*$dx2} {return -1}
+    if {($dx1*$dx2 < 0) || ($dy1*$dy2 < 0)} {return -1}
+    if {($dx1*$dx1 + $dy1*$dy1) < ($dx2*$dx2+$dy2*$dy2)} {return 1}
+    return 0
+}
+
+
+
+
+
+
+
+###
+#
+# Overlap procedures
+#
+###
+
+# ::math::geometry::intervalsOverlap
+#
+#       Check whether two intervals overlap.
+#       Examples:
+#         - (2,4) and (5,3) overlap with strict=0 and strict=1
+#         - (2,4) and (1,2) overlap with strict=0 but not with strict=1
+#
+# Arguments:
+#       y1,y2         the first interval
+#       y3,y4         the second interval
+#       strict        choosing strict or non-strict interpretation
+#
+# Results:
+#       dooverlap     a boolean saying whether the intervals overlap
+#
+# Examples:
+#     - intervalsOverlap 2 4 4 6 1
+#       Result: 0
+#     - intervalsOverlap 2 4 4 6 0
+#       Result: 1
+#     - intervalsOverlap 4 2 3 5 0
+#       Result: 1
+#
+proc ::math::geometry::intervalsOverlap {y1 y2 y3 y4 strict} {
+    if {$y1>$y2} {
+	set temp $y1
+	set y1 $y2
+	set y2 $temp
+    }
+    if {$y3>$y4} {
+	set temp $y3
+	set y3 $y4
+	set y4 $temp
+    }
+    if {$strict} {
+	return [expr {$y2>$y3 && $y4>$y1}]
+    } else {
+	return [expr {$y2>=$y3 && $y4>=$y1}]
+    }
+}
+
+# ::math::geometry::rectanglesOverlap
+#
+#       Check whether two rectangles overlap (see also intervalsOverlap).
+#
+# Arguments:
+#       P1            upper-left corner of the first rectangle
+#       P2            lower-right corner of the first rectangle
+#       Q1            upper-left corner of the second rectangle
+#       Q2            lower-right corner of the second rectangle
+#       strict        choosing strict or non-strict interpretation
+#
+# Results:
+#       dooverlap     a boolean saying whether the rectangles overlap
+#
+# Examples:
+#     - rectanglesOverlap {0 10} {10 0} {10 10} {20 0} 1
+#       Result: 0
+#     - rectanglesOverlap {0 10} {10 0} {10 10} {20 0} 0
+#       Result: 1
+#
+proc ::math::geometry::rectanglesOverlap {P1 P2 Q1 Q2 strict} {
+    set b1x1 [lindex $P1 0]
+    set b1y1 [lindex $P1 1]
+    set b1x2 [lindex $P2 0]
+    set b1y2 [lindex $P2 1]
+    set b2x1 [lindex $Q1 0]
+    set b2y1 [lindex $Q1 1]
+    set b2x2 [lindex $Q2 0]
+    set b2y2 [lindex $Q2 1]
+    # ensure b1x1<=b1x2 etc.
+    if {$b1x1 > $b1x2} {
+	set temp $b1x1
+	set b1x1 $b1x2
+	set b1x2 $temp
+    }
+    if {$b1y1 > $b1y2} {
+	set temp $b1y1
+	set b1y1 $b1y2
+	set b1y2 $temp
+    }
+    if {$b2x1 > $b2x2} {
+	set temp $b2x1
+	set b2x1 $b2x2
+	set b2x2 $temp
+    }
+    if {$b2y1 > $b2y2} {
+	set temp $b2y1
+	set b2y1 $b2y2
+	set b2y2 $temp
+    }
+    # Check if the boxes intersect
+    # (From: Cormen, Leiserson, and Rivests' "Algorithms", page 889)
+    if {$strict} {
+	return [expr {($b1x2>$b2x1) && ($b2x2>$b1x1) \
+		&& ($b1y2>$b2y1) && ($b2y2>$b1y1)}]
+    } else {
+	return [expr {($b1x2>=$b2x1) && ($b2x2>=$b1x1) \
+		&& ($b1y2>=$b2y1) && ($b2y2>=$b1y1)}]
+    }
+}
+
+
+
+# ::math::geometry::bbox
+#
+#       Calculate the bounding box of a polyline.
+#
+# Arguments:
+#       polyline      a polyline
+#
+# Results:
+#       x1,y1,x2,y2   four coordinates where (x1,y1) is the upper-left corner
+#                     of the bounding box, and (x2,y2) is the lower-right corner
+#
+# Examples:
+#     - bbox {0 10 4 1 6 23 -12 5}
+#       Result: -12 1 6 23
+#
+proc ::math::geometry::bbox {polyline} {
+    set minX [lindex $polyline 0]
+    set maxX $minX
+    set minY [lindex $polyline 1]
+    set maxY $minY
+    foreach {x y} $polyline {
+	if {$x < $minX} {set minX $x}
+	if {$x > $maxX} {set maxX $x}
+	if {$y < $minY} {set minY $y}
+	if {$y > $maxY} {set maxY $y}
+    }
+    return [list $minX $minY $maxX $maxY]
+}
+
+# ::math::geometry::ClosedPolygon
+#
+#       Return a closed polygon - used internally
+#
+# Arguments:
+#       polygon       a polygon
+#
+# Results:
+#       closedpolygon a polygon whose first and last vertices
+#                     coincide
+#
+proc ::math::geometry::ClosedPolygon {polygon} {
+
+    lassign $polygon x y
+    if { $x != [lindex $polygon end-1] ||
+         $y != [lindex $polygon end]     } {
+
+        lappend polygon $x $y
+
+    }
+    return $polygon
+}
+
+
+# ::math::geometry::pointInsidePolygon
+#
+#       Determine if a point is completely inside a polygon. If the point
+#       touches the polygon, then the point is not complete inside the
+#       polygon.
+#
+# Arguments:
+#       P             a point
+#       polygon       a polygon
+#
+# Results:
+#       isinside      a boolean saying whether the point is
+#                     completely inside the polygon or not
+#
+# Examples:
+#     - pointInsidePolygon {5 5} {4 4 4 6 6 6 6 4}
+#       Result: 1
+#     - pointInsidePolygon {5 5} {6 6 6 7 7 7}
+#       Result: 0
+#
+proc ::math::geometry::pointInsidePolygon {P polygon} {
+    # check if P is on one of the polygon's sides (if so, P is not
+    # inside the polygon)
+    set closedPolygon [ClosedPolygon $polygon]
+
+    foreach {x2 y2} [lassign $closedPolygon x1 y1] {
+	if {[calculateDistanceToLineSegment $P [list $x1 $y1 $x2 $y2]]<0.0000001} {
+	    return 0
+	}
+	set x1 $x2; set y1 $y2
+    }
+
+    # Algorithm
+    #
+    # Consider a straight line going from P to a point far away from both
+    # P and the polygon (in particular outside the polygon).
+    #   - If the line intersects with 0 of the polygon's sides, then
+    #     P must be outside the polygon.
+    #   - If the line intersects with 1 of the polygon's sides, then
+    #     P must be inside the polygon (since the other end of the line
+    #     is outside the polygon).
+    #   - If the line intersects with 2 of the polygon's sides, then
+    #     the line must pass into one polygon area and out of it again,
+    #     and hence P is outside the polygon.
+    #   - In general: if the line intersects with the polygon's sides an odd
+    #     number of times, then P is inside the polygon. Note: we also have
+    #     to check whether the line crosses one of the polygon's
+    #     bend points for the same reason.
+
+    # get point far away and define the line
+    set polygonBbox [bbox $polygon]
+
+    set pointFarAway [list \
+        [expr {[lindex $polygonBbox 0]-[lindex $polygonBbox 2]}] \
+        [expr {[lindex $polygonBbox 1]-0.1*[lindex $polygonBbox 3]}]]
+
+    set infinityLine [concat $pointFarAway $P]
+
+    # calculate number of intersections
+    set noOfIntersections 0
+    #   1. count intersections between the line and the polygon's sides
+    foreach {x2 y2} [lassign $closedPolygon x1 y1] {
+	if {[lineSegmentsIntersect $infinityLine [list $x1 $y1 $x2 $y2]]} {
+	    incr noOfIntersections
+	}
+	set x1 $x2; set y1 $y2
+    }
+    #   2. count intersections between the line and the polygon's points
+    foreach {x1 y1} $closedPolygon {
+	if {[calculateDistanceToLineSegment [list $x1 $y1] $infinityLine]<0.0000001} {
+	    incr noOfIntersections
+	}
+    }
+    return [expr {$noOfIntersections % 2}]
+}
+
+# See ticket [dc49af96c2]
+# Original code found at: https://www.ecse.rpi.edu/~wrf/Research/Short_Notes/pnpoly.html
+# Thanks to Christian Gollwitzer, Peter Lewerin and Eduard Zozuly
+# Replaced by:
+proc ::math::geometry::pointInsidePolygon {point polygon} {
+    lassign $point testx testy
+    foreach {x y} $polygon {
+        lappend vertx $x
+        lappend verty $y
+    }
+    set c 0
+    set nvert [llength $vertx]
+    for {set i 0 ; set j [expr {$nvert-1}]} {$i < $nvert} {set j $i ; incr i} {
+        if {
+            (([lindex $verty $i]>$testy) != ([lindex $verty $j]>$testy)) &&
+            ($testx < ([lindex $vertx $j] - [lindex $vertx $i]) *
+            ($testy - [lindex $verty $i]) /
+            ([lindex $verty $j] - [lindex $verty $i]) + [lindex $vertx $i])
+        } {
+            set c [expr {!$c}]
+        }
+    }
+    return $c
+}
+
+# ::math::geometry::pointInsidePolygonAlt
+#
+#       Determine if a point is completely inside a polygon. If the point
+#       touches the polygon, then the point is not complete inside the
+#       polygon.
+#       This alternative algorithm works with complex (self-intersecting)
+#       polygons in a "natural" way. It uses the winding number instead
+#       of the number of crossings.
+#
+#       See: http://geomalgorithms.com/a03-_inclusion.html
+#
+# Arguments:
+#       P             a point
+#       polygon       a polygon
+#
+# Results:
+#       isinside      a boolean saying whether the point is
+#                     completely inside the polygon or not
+#
+
+# Auxiliary procedure:
+#     > 0 if point 2 left of line through points 0 and 1
+#     < 0 if point 2 right of the line
+#     = 0 if point on the line
+#
+proc ::math::geometry::LeftOfEdge {x0 y0 x1 y1 x2 y2} {
+    expr {($x1 - $x0) * ($y2 - $y0) - ($x2 - $x0) * ($y1 - $y0)}
+}
+
+proc ::math::geometry::pointInsidePolygonAlt {point polygon} {
+    lassign $point testx testy
+    foreach {x y} $polygon {
+        lappend vertx $x
+        lappend verty $y
+    }
+    set w 0
+    set nvert [llength $vertx]
+    for {set i 0} {$i < $nvert} {incr i} {
+        set j [expr {$i+1}]
+        if { $j == $nvert } {
+            set j 0
+        }
+        if { [lindex $verty $i] <= $testy } {
+            if { [lindex $verty $j] > $testy } {
+                if { [LeftOfEdge [lindex $vertx $i] [lindex $verty $i] [lindex $vertx $j] [lindex $verty $j] $testx $testy] > 0.0 } {
+                    incr w
+                }
+            }
+        } else {
+            if { [lindex $verty $j] <= $testy } {
+                if { [LeftOfEdge [lindex $vertx $i] [lindex $verty $i] [lindex $vertx $j] [lindex $verty $j] $testx $testy] < 0.0 } {
+                    incr w -1
+                }
+            }
+        }
+    }
+    return [expr {$w != 0}]
+}
+
+# ::math::geometry::rectangleInsidePolygon
+#
+#       Determine if a rectangle is completely inside a polygon. If polygon
+#       touches the rectangle, then the rectangle is not complete inside the
+#       polygon.
+#
+# Arguments:
+#       P1            upper-left corner of the rectangle
+#       P2            lower-right corner of the rectangle
+#       polygon       a polygon
+#
+# Results:
+#       isinside      a boolean saying whether the rectangle is
+#                     completely inside the polygon or not
+#
+# Examples:
+#     - rectangleInsidePolygon {0 10} {10 0} {-10 -10 0 11 11 11 11 0}
+#       Result: 1
+#     - rectangleInsidePolygon {0 0} {0 0} {-16 14 5 -16 -16 -25 -21 16 -19 24}
+#       Result: 1
+#     - rectangleInsidePolygon {0 0} {0 0} {2 2 2 4 4 4 4 2}
+#       Result: 0
+#
+proc ::math::geometry::rectangleInsidePolygon {P1 P2 polygon} {
+    # get coordinates of rectangle
+    set bx1 [lindex $P1 0]
+    set by1 [lindex $P1 1]
+    set bx2 [lindex $P2 0]
+    set by2 [lindex $P2 1]
+
+    # if rectangle does not overlap with the bbox of polygon, then the
+    # rectangle cannot be inside the polygon (this is a quick way to
+    # get an answer in many cases)
+    set polygonBbox [bbox $polygon]
+    set polygonP1x [lindex $polygonBbox 0]
+    set polygonP1y [lindex $polygonBbox 1]
+    set polygonP2x [lindex $polygonBbox 2]
+    set polygonP2y [lindex $polygonBbox 3]
+    if {![rectanglesOverlap [list $bx1 $by1] [list $bx2 $by2] \
+	    [list $polygonP1x $polygonP1y] [list $polygonP2x $polygonP2y] 0]} {
+	return 0
+    }
+
+    # 1. if one of the points of the polygon is inside the rectangle,
+    # then the rectangle cannot be inside the polygon
+    foreach {x y} $polygon {
+	if {$bx1<$x && $x<$bx2 && $by1<$y && $y<$by2} {
+	    return 0
+	}
+    }
+
+    # 2. if one of the line segments of the polygon intersect with the
+    # rectangle, then the rectangle cannot be inside the polygon
+    set rectanglePolyline [list $bx1 $by1 $bx2 $by1 $bx2 $by2 $bx1 $by2 $bx1 $by1]
+    set closedPolygon [ClosedPolygon $polygon]
+    if {[polylinesIntersect $closedPolygon $rectanglePolyline]} {
+	return 0
+    }
+
+    # at this point we know that:
+    #  1. the polygon has no points inside the rectangle
+    #  2. the polygon's sides don't intersect with the rectangle
+    # therefore:
+    #  either the rectangle is (completely) inside the polygon, or
+    #  the rectangle is (completely) outside the polygon
+
+    # final test: if one of the points on the rectangle is inside the
+    # polygon, then the whole rectangle must be inside the rectangle
+    return [pointInsidePolygon [list $bx1 $by1] $polygon]
+}
+
+
+# ::math::geometry::areaPolygon
+#
+#       Determine the area enclosed by a (non-complex) polygon
+#
+# Arguments:
+#       polygon       a polygon
+#
+# Results:
+#       area          the area enclosed by the polygon
+#
+# Examples:
+#     - areaPolygon {-10 -10 10 -10 10 10 -10 10}
+#       Result: 400
+#
+proc ::math::geometry::areaPolygon {polygon} {
+
+    # get last pair of the polygon for start:
+    set b1 [lindex $polygon end-1]; set b2 [lindex $polygon end]
+
+    set area 0.0
+    foreach {c1 c2} $polygon {
+        set area [expr {$area + ($b1*$c2 - $b2*$c1)}]
+        set b1   $c1
+        set b2   $c2
+    }
+    expr {0.5*abs($area)}
+}
+
+# ::math::geometry::inproduct
+#
+#       Determine the inproduct of two vectors
+#
+# Arguments:
+#       vector1       first vector
+#       vector2       second vector
+#
+# Results:
+#       inproduct     the inproduct
+#
+proc ::math::geometry::inproduct {vector1 vector2} {
+
+    set inproduct 0.0
+    foreach v1 $vector1 v2 $vector2 {
+        set inproduct [expr {$inproduct + $v1 * $v2}]
+    }
+
+    return $inproduct
+}
+
+# ::math::geometry::angleBetween
+#
+#       Determine the angle between two vectors (degrees)
+#
+# Arguments:
+#       vector1       first vector
+#       vector2       second vector
+#
+# Results:
+#       angle         the angle in degrees
+#
+proc ::math::geometry::angleBetween {vector1 vector2} {
+    variable todeg
+
+    set inproduct 0.0
+    set length1   0.0
+    set length2   0.0
+    foreach v1 $vector1 v2 $vector2 {
+        set inproduct [expr {$inproduct + $v1 * $v2}]
+        set length1   [expr {$length1   + $v1 * $v1}]
+        set length2   [expr {$length2   + $v2 * $v2}]
+    }
+    set angle [expr {acos($inproduct/sqrt($length1 * $length2)) * $todeg}]
+
+    return $angle
+}
+
+# ::math::geometry::areaParallellogram
+#
+#       Determine the area of the parallellogram spanned by two vectors
+#
+# Arguments:
+#       vector1       first vector
+#       vector2       second vector
+#
+# Results:
+#       area          the area of the parallellogram
+#
+proc ::math::geometry::areaParallellogram {vector1 vector2} {
+
+    lassign $vector1 x1 y1; lassign $vector2 x2 y2
+
+    set area [expr {abs($x2 * $y1 - $x1 * $y2}]
+
+    return $area
+}
+
+# ::math::geometry::translate
+#
+#       Translate a polyline over a given vector
+#
+# Arguments:
+#       vector        Translation vector
+#       polyline      Polyline (or any list of coordinate pairs)
+#
+# Results:
+#       newPolyline   Translated poyline
+#
+proc ::math::geometry::translate {vector polyline} {
+
+    set newPolyline $polyline
+
+    lassign $vector xt yt
+
+    set idx 0
+    foreach {x y} $polyline {
+        lset newPolyline $idx [expr {$x + $xt}]
+        incr idx
+        lset newPolyline $idx [expr {$y + $yt}]
+        incr idx
+    }
+
+    return $newPolyline
+}
+
+# ::math::geometry::rotate
+#
+#       Rotate a polyline over a given angle (degrees) around the origin
+#
+# Arguments:
+#       angle         rotation angle (degrees)
+#       polyline      polyline (or any list of coordinate pairs)
+#
+# Results:
+#       newPolyline   rotated polyline
+#
+# Note:
+#       rotation is counterclockwise
+#
+proc ::math::geometry::rotate {angle polyline} {
+    variable torad
+
+    set angle [expr {$torad * $angle}]
+    set cosa  [expr {cos($angle)}]
+    set sina  [expr {sin($angle)}]
+
+    set newPolyline $polyline
+
+    set idx 0
+    foreach {x y} $polyline {
+        set newx [expr {$cosa * $x - $sina *$y}]
+        set newy [expr {$sina * $x + $cosa *$y}]
+
+        lset newPolyline $idx $newx
+        incr idx
+        lset newPolyline $idx $newy
+        incr idx
+    }
+
+    return $newPolyline
+}
+
+# ::math::geometry::reflect
+#
+#       Reflect a polyline in a line through the origin at a given angle to the x-axis
+#
+# Arguments:
+#       angle         angle of the line of reflection (degrees)
+#       polyline      polyline (or any list of coordinate pairs)
+#
+# Results:
+#       newPolyline   reflected polyline
+#
+# Note:
+#       the angle is used counterclockwise
+#
+proc ::math::geometry::reflect {angle polyline} {
+    variable torad
+
+    set angle [expr {2.0 * $torad * $angle}]
+    set cosa  [expr {cos($angle)}]
+    set sina  [expr {sin($angle)}]
+
+    set newPolyline $polyline
+
+    set idx 0
+    foreach {x y} $polyline {
+        set newx [expr {$cosa * $x + $sina *$y}]
+        set newy [expr {$sina * $x - $cosa *$y}]
+
+        lset newPolyline $idx $newx
+        incr idx
+        lset newPolyline $idx $newy
+        incr idx
+    }
+
+    return $newPolyline
+}
+
+# ::math::geometry::degToRad
+#
+#       Convert from degrees to radians
+#
+# Arguments:
+#       angle         angle (degrees)
+#
+# Results:
+#       angle         angle in radians
+#
+proc ::math::geometry::degToRad {angle} {
+    variable torad
+
+    return [expr {$angle * $torad}]
+}
+
+# ::math::geometry::radToDeg
+#
+#       Convert from radians to degrees
+#
+# Arguments:
+#       angle         angle (radians)
+#
+# Results:
+#       angle         angle in degrees
+#
+proc ::math::geometry::radToDeg {angle} {
+    variable todeg
+
+    return [expr {$angle * $todeg}]
+}
+
+# # ## ### ##### #############
+
+namespace eval ::math::geometry {
+    variable pi    [expr { 4 * atan(1) }]
+    variable torad [expr { (4 * atan(1)) / 180.0 }]
+    variable todeg [expr { 180.0 / (4 * atan(1)) }]
+
+    namespace export \
+	+ - s* direction v h p between distance length \
+	nwse rect octant findLineSegmentIntersection \
+	findLineIntersection bbox x y conjx conjy \
+	calculateDistanceToLine findClosestPointOnLine \
+	calculateDistanceToLineSegment findClosestPointOnLineSegment \
+	calculateDistanceToPolylineSegment findClosestPointOnPolyline lengthOfPolyline \
+	movePointInDirection lineSegmentsIntersect findLineSegmentIntersection findLineIntersection \
+	polylinesIntersect polylinesBoundingIntersect intervalsOverlap rectanglesOverlap pointInsidePolygon pointInsidePolygonAlt \
+	rectangleInsidePolygon areaPolygon translate rotate reflect degToRad radToDeg \
+	calculateDistanceToPolyline calculateDistanceToPolygon areaParallellogram angle inproduct angleBetween
+
+}
+
+source [file join [file dirname [info script]] geometry_circle.tcl]
+source [file join [file dirname [info script]] geometry_ext.tcl]
+
+package provide math::geometry 1.4.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/geometry_circle.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/geometry_circle.tcl
new file mode 100644
index 00000000..5f4b46a7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/geometry_circle.tcl
@@ -0,0 +1,382 @@
+# geometry_circle.tcl --
+#
+#     Geometry functions with an emphasis on circles
+#
+# Copyright (c) 2018 Arjen Markus
+#
+#     Part of the math::geometry package
+#
+
+package require Tcl 8.5
+package require math
+
+namespace eval ::math::geometry {
+    namespace export circle circleTwoPoints \
+        pointInsideCircle lineIntersectsCircle lineSegmentIntersectsCircle \
+        intersectionLineWithCircle intersectionCircleWithCircle tangentLinesToCircle \
+
+
+    variable margin 1.0e-10
+}
+
+# circles:
+#     List of three numbers, the first two are the x and y coordinates of the
+#     centre, the third is the radius
+#
+
+# circle --
+#     Return a list of numbers representing a circle
+#
+# Arguments:
+#     point         Coordinates of the centre
+#     radius        Radius of the circle
+#
+# Returns:
+#     Three-element list
+#
+proc ::math::geometry::circle {point radius} {
+    if { [llength $point] != 2 } {
+        return -code error "The first argument must be a point"
+    }
+    if { [llength $radius] != 1 } {
+        return -code error "The second argument must be a single value"
+    }
+
+    return [concat $point $radius]
+}
+
+# circleTwoPoints --
+#     Construct a circle from two points - they appear on the circumference
+#
+# Arguments:
+#     point1        Coordinates of one point
+#     point2        Coordinates of the second point
+#
+# Returns:
+#     Three-element list
+#
+proc ::math::geometry::circleTwoPoints {point1 point2} {
+    set centre [s* 0.5 [+ $point1 $point2]]
+    set radius [expr {[distance $point1 $point2] * 0.5}]
+
+
+    return [concat $centre $radius]
+}
+
+# pointInsideCircle --
+#     Return whether the given point lies in the circle or not
+#
+# Arguments:
+#     point         Point to be checked
+#     circle        Circle possibly containing the point
+#
+# Returns:
+#     1 if the point lies in or on the circle
+#     0 if not
+#
+proc ::math::geometry::pointInsideCircle {point circle} {
+    set centre [lrange $circle 0 1]
+    set radius [lindex $circle end]
+
+    if { [distance $point $centre] <= $radius } {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+# lineIntersectsCircle --
+#     Return whether the given (infinite) line intersects the circle or not
+#
+# Arguments:
+#     line          Infinite line to be checked
+#     circle        Circle to be checked
+#
+# Returns:
+#     1 if the line intersects the circle or is tangent to it
+#     0 if not
+#
+proc ::math::geometry::lineIntersectsCircle {line circle} {
+    set centre [lrange $circle 0 1]
+    set radius [lindex $circle end]
+
+    if { [calculateDistanceToLine $centre $line] <= $radius } {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+# lineSegmentIntersectsCircle --
+#     Return whether the given line segment intersects the circle or not
+#
+# Arguments:
+#     line          Line segment to be checked
+#     circle        Circle to be checked
+#
+# Returns:
+#     1 if the line segment intersects the circle or is tangent to it
+#     0 if not
+#
+proc ::math::geometry::lineSegmentIntersectsCircle {line circle} {
+    set centre [lrange $circle 0 1]
+    set radius [lindex $circle end]
+
+    if { [calculateDistanceToLineSegment $centre $line] <= $radius } {
+        #
+        # Check that not both end points are inside the circle
+        #
+        set point1  [lrange $line 0 1]
+        set point2  [lrange $line 2 3]
+
+        set inside1 [pointInsideCircle $point1 $circle]
+        set inside2 [pointInsideCircle $point2 $circle]
+
+        return [expr {$inside1+$inside2 <= 1 ? 1 : 0}]
+    } else {
+        return 0
+    }
+}
+
+# IntersectionVerticallineCircle --
+#     Calculate the intersection points of a vertical line and a circle
+#
+# Arguments:
+#     line          Vertical line right of y-axis
+#     circle        Circle with centre at (0,0)
+#
+# Returns:
+#     Zero, one or two points - the intersection points
+#
+# Note:
+#     The procedure is easiest when using a horizontal or vertical
+#     line and a circle with centre (0,0). To be used in combination
+#     with suitable transformations.
+#
+proc ::math::geometry::IntersectionVerticalLineCircle {line circle} {
+    set radius [lindex $circle end]
+    set xval   [lindex $line 0]
+
+    if { $xval > $radius } {
+        return {}
+    } elseif { $xval == $radius } {
+        return [list $radius 0.0]
+    }
+
+    set yval   [expr {sqrt($radius**2 - $xval**2)}]
+
+    return [list [list $xval $yval] [list $xval [expr {-$yval}]]]
+}
+
+# IntersectionCircleCircle --
+#     Calculate the intersection points of two circles
+#
+# Arguments:
+#     circle        Circle with centre at (0,0)
+#     circle1       Circle with centre on positive x-axis
+#
+# Returns:
+#     Zero, one or two points - the intersection points
+#
+# Note:
+#     The procedure is easiest when using a circle with centre (0,0)
+#     and the other with the centre on an axis. To be used in combination
+#     with suitable transformations.
+#
+# Note:
+#     The situation of two identical circles is not handled
+#
+proc ::math::geometry::IntersectionCircleCircle {circle1 circle2} {
+    set radius1 [lindex $circle1 end]
+    set xval    [lindex $circle2 0]
+    set radius2 [lindex $circle2 end]
+
+    if { $xval - $radius2 > $radius1 } {
+        return {}
+    } elseif { $xval - $radius2 == $radius1 } {
+        return [list $radius1 0.0]
+    } elseif { $xval - $radius2 == -$radius1 } {
+        return [list -$radius1 0.0]
+    } else {
+        # One circle inside the other circle
+        if { $radius2 > $radius1 } {
+            if { $xval - $radius2 < -$radius1 } {
+                return {}
+            }
+        } else {
+            if { $xval + $radius2 < $radius1 } {
+                return {}
+            }
+        }
+    }
+
+    set b [expr {0.5 * ($xval + ($radius1**2 - $radius2**2)/$xval) }]
+
+    set yval [expr {sqrt($radius1**2 - $b**2)}]
+
+    return [list [list $b $yval] [list $b [expr {-$yval}]]]
+}
+
+# intersectionLineWithCircle --
+#     Determine the points of intersection between a line and a circle
+#
+# Arguments:
+#     line          Line in question
+#     circle        Circle in question
+#
+# Returns:
+#     Zero, one or two points - the intersection points
+#
+# Note:
+#     Shift and rotate the line and circle first, then determine the
+#     intersection and transform back.
+#
+proc ::math::geometry::intersectionLineWithCircle {line circle} {
+    variable margin
+
+    set centre [lrange $circle 0 1]
+    set radius [lindex $circle end]
+
+    set midpoint [findClosestPointOnLine $centre $line]
+    set distance [distance $midpoint $centre]
+
+    if { $distance > $margin*$radius } { ;# Rather arbitrary margin
+        set vector   [s* [expr {1.0/$distance}] [- $midpoint $centre]]
+    } else {
+        lassign $line x1 y1 x2 y2
+        set vector    [list [expr {$y2-$y1}] [expr {$x1-$x2}]]
+        set distance2 [length $vector]
+        set vector    [s* [expr {1.0/$distance2}] $vector]
+    }
+
+    set newline      [list $distance [expr {1.0+$radius}] $distance [expr {-1.0-$radius}]]
+    set intersection [IntersectionVerticalLineCircle $newline $circle]
+
+    set newIntersection {}
+    lassign $vector vx vy
+    lassign $centre cx cy
+    if { [llength [lindex $intersection 0]] == 1 } {
+        set intersection [list $intersection]
+    }
+    foreach xy $intersection {
+        lassign $xy x y
+
+        set xn [expr {$vx * $x - $vy * $y + $cx}]
+        set yn [expr {$vy * $x + $vx * $y + $cy}]
+
+        lappend newIntersection [list $xn $yn]
+    }
+
+    return $newIntersection
+}
+
+# intersectionCircleWithCircle --
+#     Determine the points of intersection between two circles
+#
+# Arguments:
+#     circle1       First circle
+#     circle2       Second circle
+#
+# Returns:
+#     Zero, one or two points - the intersection points
+#
+# Note:
+#     Shift and rotate the circles first, then determine the
+#     intersection and transform back.
+#
+proc ::math::geometry::intersectionCircleWithCircle {circle1 circle2} {
+    variable margin
+
+    set centre1 [lrange $circle1 0 1]
+    set radius1 [lindex $circle1 end]
+    set centre2 [lrange $circle2 0 1]
+    set radius2 [lindex $circle2 end]
+
+    set distance [distance $centre1 $centre2]
+
+    if { $distance > 0.5*$margin*($radius1+$radius2) } { ;# Rather arbitrary margin
+        set vector   [s* [expr {1.0/$distance}] [- $centre2 $centre1]]
+    } else {
+        return {} ;# Bit of a hack: either the circles are concentric and have different
+                   # radii - no intersection - or they are identical, then we should
+                   # return the complete circle, but we don't do that ...
+    }
+
+    set newcircle    [list $distance 0.0 $radius2]
+    set intersection [IntersectionCircleCircle $circle1 $newcircle]
+
+    set newIntersection {}
+    lassign $vector  vx vy
+    lassign $centre1 cx cy
+    if { [llength [lindex $intersection 0]] == 1 } {
+        set intersection [list $intersection]
+    }
+    foreach xy $intersection {
+        lassign $xy x y
+
+        set xn [expr {$vx * $x - $vy * $y + $cx}]
+        set yn [expr {$vy * $x + $vx * $y + $cy}]
+
+        lappend newIntersection [list $xn $yn]
+    }
+
+    return $newIntersection
+}
+
+# tangentLinesToCircle --
+#     Determine the tangents from a point to a circle
+#
+# Arguments:
+#     point         Point in question
+#     circle        Second circle
+#
+# Returns:
+#     Zero, one or two points - the intersection points
+#
+# Note:
+#     Shift and rotate the point and circle first, then determine the
+#     intersection and transform back.
+#
+proc ::math::geometry::tangentLinesToCircle {point circle} {
+    variable margin
+
+    set centre [lrange $circle 0 1]
+    set radius [lindex $circle end]
+
+    set distance [distance $centre $point]
+
+    if { $distance < $radius } {
+        return {}
+    } else {
+        set vector [- $point $centre]
+        set vector [s* [expr {1.0/$distance}] [- $point $centre]]
+
+        if { abs($distance - $radius) < $margin*$radius } {
+            lassign $vector vx vy
+            return [list [concat $point [+ $point [list $vy [expr {-$vx}]]]]]
+                # The two tangent lines coincide
+        }
+    }
+
+    set halfdistance [expr {$distance / 2.0}]
+    set newcircle    [list $halfdistance 0.0 $halfdistance]
+    set intersection [IntersectionCircleCircle $circle $newcircle]
+
+    set newIntersection {}
+    lassign $vector vx vy
+    lassign $centre cx cy
+    if { [llength [lindex $intersection 0]] == 1 } {
+        set intersection [list $intersection]
+    }
+    foreach xy $intersection {
+        lassign $xy x y
+
+        set xn [expr {$vx * $x - $vy * $y + $cx}]
+        set yn [expr {$vy * $x + $vx * $y + $cy}]
+
+        lappend newIntersection [list $xn $yn]
+    }
+
+    return [list [concat $point [lindex $newIntersection 0]] \
+                 [concat $point [lindex $newIntersection 1]]]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/geometry_ext.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/geometry_ext.tcl
new file mode 100644
index 00000000..1b390a59
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/geometry_ext.tcl
@@ -0,0 +1,1023 @@
+ # geometry_ext.tcl --
+ #     Adapted from vectormath
+ #
+ ##+##########################################################################
+ #
+ # package: vectormath	->	vectormath.tcl
+ #
+ #   vectormath is software of Manfred ROSENBERGER
+ #       based on tclTk, BWidgets and tdom on their
+ #       own Licenses.
+ #
+ # Copyright (c) Manfred ROSENBERGER, 2010/10/24
+ #
+ # The author  hereby grant permission to use,  copy, modify, distribute,
+ # and  license this  software  and its  documentation  for any  purpose,
+ # provided that  existing copyright notices  are retained in  all copies
+ # and that  this notice  is included verbatim  in any  distributions. No
+ # written agreement, license, or royalty  fee is required for any of the
+ # authorized uses.  Modifications to this software may be copyrighted by
+ # their authors and need not  follow the licensing terms described here,
+ # provided that the new terms are clearly indicated on the first page of
+ # each file where they apply.
+ #
+ # IN NO  EVENT SHALL THE AUTHOR  OR DISTRIBUTORS BE LIABLE  TO ANY PARTY
+ # FOR  DIRECT, INDIRECT, SPECIAL,  INCIDENTAL, OR  CONSEQUENTIAL DAMAGES
+ # ARISING OUT  OF THE  USE OF THIS  SOFTWARE, ITS DOCUMENTATION,  OR ANY
+ # DERIVATIVES  THEREOF, EVEN  IF THE  AUTHOR  HAVE BEEN  ADVISED OF  THE
+ # POSSIBILITY OF SUCH DAMAGE.
+ #
+ # THE  AUTHOR  AND DISTRIBUTORS  SPECIFICALLY  DISCLAIM ANY  WARRANTIES,
+ # INCLUDING,   BUT   NOT  LIMITED   TO,   THE   IMPLIED  WARRANTIES   OF
+ # MERCHANTABILITY,    FITNESS   FOR    A    PARTICULAR   PURPOSE,    AND
+ # NON-INFRINGEMENT.  THIS  SOFTWARE IS PROVIDED  ON AN "AS  IS" BASIS,
+ # AND  THE  AUTHOR  AND  DISTRIBUTORS  HAVE  NO  OBLIGATION  TO  PROVIDE
+ # MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ #
+ # ---------------------------------------------------------------------------
+ #	namespace:  vectormath
+ # ---------------------------------------------------------------------------
+ #
+ #  0.7 ... proc tangent_2_circles ... exception on equal radius
+ #      ... proc angleVector (use proc angle)
+ #
+
+        #
+        #
+namespace eval ::math::geometry {
+        #
+    variable pi     $::math::geometry::pi
+    variable torad  $::math::geometry::torad
+    variable todeg  $::math::geometry::todeg
+        #
+    variable margin 1.0e-10
+        #
+
+    variable  CONST_PI [expr {4*atan(1)}]
+
+        #
+}
+    #
+    #
+    # ::math::geometry::cathetusPoint
+    #
+    #       Return point of rectangular triangle locating the rectangular angle.
+    #
+    # Arguments:
+    #       pa       starting point on hypotenuse
+    #       pb       ending point on hypotenuse
+    #       cathetus a cathetus of the triangle
+    #       location location of the given cathetus
+    #                    a means given cathetus shares point pa (default)
+    #                    b means given cathetus shares point pb
+    #
+    # Result:
+    #       pc point locating the rectangular angle
+    #
+    # Examples:
+    #     - cathetusPoint {1 1} {5 2} 3
+    #       Result: {3.6168 -0.4671}
+    #     - cathetusPoint {1 1} {5 2} 3 a
+    #       Result: {3.6168 -0.4671}
+    #     - cathetusPoint {1 1} {5 2} 3 b
+    #       Result: {3.3815 -0.5259}
+    #     - cathetusPoint {1 1} {5 2} 9 b
+    #       Result: {}
+    #
+proc ::math::geometry::cathetusPoint {pa pb cathetus {location {a}}} {
+    variable todeg
+    if {$location eq {close}} {set location a}
+    set length_c	[length [- $pa $pb]]
+    set angle_c	    [angle [concat $pa $pb]]
+    if {$length_c >= $cathetus} {
+        set angle_cath	[expr {acos($cathetus/$length_c) * $todeg}]
+    } else {
+        return {}
+    }
+    if {$location == {a}} { # cathetus next to pa
+      set angle_cath    [expr {$angle_c - $angle_cath}]
+      set pc            [+ $pa [s* $cathetus [direction $angle_cath]]]
+    } else {  # cathetus next to pb
+      set angle_cath    [expr {180 + $angle_c + $angle_cath}]
+      set vct_cath      [s* $cathetus [direction $angle_cath]]
+      set pc            [+ $pb [s* $cathetus [direction $angle_cath]]]
+    }
+    return $pc
+}
+    #
+    #
+    # ::math::geometry::parallel
+    #
+    #       Return line parallel to line by offset
+    #           direction is defined by the first two coordinates of line, e.g. [lrange $line 0 3]
+    # Arguments:
+    #       line
+    #       offset
+    #       orient   right (default), left
+    #
+    # Result:
+    #       pc point locating the rectangular angle
+    #
+    # Examples:
+    #     - parallel {1 1} {5 2} 3
+    #       Result: {1.7276 -1.9104 5.7276 -0.9104}
+    #     - parallel {1 1} {5 2} 3 a
+    #       Result: {1.7276 -1.9104 5.7276 -0.9104}
+    #     - parallel {1 1} {5 2} 3 b
+    #       Result: {0.2724 3.9104 4.2724 4.9104}
+    #
+proc ::math::geometry::parallel {line offset {orient {right}}} {
+    set a   [angle [lrange $line 0 3]]
+    if {$orient == {right}} { # cathetus next to p1
+        set a_p [expr {$a - 90}]
+    } else {  # cathetus next to p2
+        set a_p [expr {$a + 90}]
+    }
+    set parallel    {}
+    set v           [rotate $a_p [list $offset 0]]
+    foreach {x y} $line {
+        set p       [+ [list $x $y] $v]
+        lappend     parallel $p
+    }
+    return [join $parallel]
+}
+    #
+    #
+    # rotateAbout --
+    #
+    #       rotate a polyline
+    #           about a given position and angle
+    #
+    # Arguments:
+    #       p
+    #       angle
+    #       polyline
+    #
+    # Result:
+    #       rotated polyline
+    #
+    # Examples:
+    #     - rotateAbout    {10 10}  90 {20 0  20 20}
+    #       Result: {20.0 20.0 0.0 20.0}
+    #     - rotateAbout    {10 10} 180 {20 0  20 20}
+    #       Result: {0.0 20.0 0.0 0.0}
+    #
+proc ::math::geometry::rotateAbout {p angle polyline} {
+    lassign $p px py
+    set polyline    [translate [list [expr {- $px}] [expr {- $py}]] $polyline]
+    set polyline    [rotate $angle $polyline]
+    set polyline    [translate $p $polyline]
+    return $polyline
+}
+
+    #
+    #
+    # ::math::geometry::unitVector
+    #
+    #       Calculates unit vector from line.
+    #
+    # Arguments:
+    #       line/direction    a line defined by two points A and B
+    #                         a point defined by x and y
+    #
+    # Results:
+    #       x y         unit vector describing the angle between the line (0,0)->(1,0) and (Ax,Ay)->(Bx,By).
+    #                     Angle is in 360-degrees going counter-clockwise
+    #
+    # Examples:
+    #     - angle {10 10 15 15}
+    #       Result: 0.7071067811865476 0.7071067811865476
+    #     - angle {10 10}
+    #       Result: 0.7071067811865476 0.7071067811865476
+    #
+proc ::math::geometry::unitVector {line} {
+    return [::math::geometry::direction [::math::geometry::angle $line]]
+}
+
+    #
+    #
+    # tangentLinesToCircle --
+    #     Determine the tangents from a point to a circle
+    #
+    # Arguments:
+    #     point         Point in question
+    #     circle        Circle in question
+    #
+    # Returns:
+    #     The two tangent lines or an empty list if the point is inside the circle
+    #
+    # Note:
+    #     Shift and rotate the point and circle first, then determine the
+    #     intersection and transform back.
+    #
+proc ::math::geometry::tangentLinesToCircle {point circle} {
+    variable margin
+
+    set centre [lrange $circle 0 1]
+    set radius [lindex $circle end]
+
+    set distance [distance $centre $point]
+
+    if { $distance < $radius } {
+        return {}
+    } else {
+        set vector [- $point $centre]
+        set vector [s* [expr {1.0/$distance}] [- $point $centre]]
+
+        if { abs($distance - $radius) < $margin*$radius } {
+            lassign $vector vx vy
+            return [list [concat $point [+ $point [list $vy [expr {-$vx}]]]]]
+                # The two tangent lines coincide
+        }
+    }
+
+    set halfdistance [expr {$distance / 2.0}]
+    set newcircle    [list $halfdistance 0.0 $halfdistance]
+    set intersection [IntersectionCircleCircle $circle $newcircle]
+
+    set newIntersection {}
+    lassign $vector vx vy
+    lassign $centre cx cy
+    if { [llength [lindex $intersection 0]] == 1 } {
+        set intersection [list $intersection]
+    }
+    foreach xy $intersection {
+        lassign $xy x y
+
+        set xn [expr {$vx * $x - $vy * $y + $cx}]
+        set yn [expr {$vy * $x + $vx * $y + $cy}]
+
+        lappend newIntersection [list $xn $yn]
+    }
+
+    return [list [concat $point [lindex $newIntersection 0]] \
+                 [concat $point [lindex $newIntersection 1]]]
+}
+    #
+    #
+    # ::math::geometry::angle
+    #
+    #       Calculates angle from the horizon (0,0)->(1,0) to a line.
+    #
+    # Arguments:
+    #       line/direction    a line defined by two points A and B
+    #                         a direction defined by x and y
+    #
+    # Results:
+    #       angle         the angle between the line (0,0)->(1,0) and (Ax,Ay)->(Bx,By).
+    #                     Angle is in 360-degrees going counter-clockwise
+    #
+    # Examples:
+    #     - angle {10 10 15 13}
+    #       Result: 30.9637565321
+    #     - angle {10 10}
+    #       Result: 45.0
+    #
+proc ::math::geometry::angle {line} {
+    if {[llength $line] == 2} {
+        set x1 0
+        set y1 0
+        lassign $line x2 y2
+    } else {
+        lassign $line x1 y1 x2 y2
+    }
+        # set x1 [lindex $line 0]
+        # set y1 [lindex $line 1]
+        # set x2 [lindex $line 2]
+        # set y2 [lindex $line 3]
+    # - handle vertical lines
+    if {$x1==$x2} {if {$y1<$y2} {return 90} else {return 270}}
+    # - handle other lines
+    set a [expr {atan(abs((1.0*$y1-$y2)/(1.0*$x1-$x2)))}] ; # a is between 0 and pi/2
+    set pi [expr {4*atan(1)}]
+    if {$y1<=$y2} {
+	# line is going upwards
+	if {$x1<$x2} {set b $a} else {set b [expr {$pi-$a}]}
+    } else {
+	# line is going downwards
+	if {$x1<$x2} {set b [expr {2*$pi-$a}]} else {set b [expr {$pi+$a}]}
+    }
+    return [expr {$b/$pi*180}] ; # convert b to degrees
+}
+    #
+    #
+    # ::math::geometry::unitVector
+    #
+    #       Calculates unit vector from line.
+    #
+    # Arguments:
+    #       line/direction    a line defined by two points A and B
+    #                         a point defined by x and y
+    #
+    # Results:
+    #       x y         unit vector describing the angle between the line (0,0)->(1,0) and (Ax,Ay)->(Bx,By).
+    #                     Angle is in 360-degrees going counter-clockwise
+    #
+    # Examples:
+    #     - angle {10 10 15 15}
+    #       Result: 0.7071067811865476 0.7071067811865476
+    #     - angle {10 10}
+    #       Result: 0.7071067811865476 0.7071067811865476
+    #
+proc ::math::geometry::unitVector {line} {
+    return [::math::geometry::direction [::math::geometry::angle $line]]
+}
+    #
+    #
+    # Unit vector into specific direction given by angle (degrees)
+    #   ... opposite behaviour of ::math::geometry::direction
+proc ::math::geometry::direction {angle} {
+    variable torad
+    set x [expr {cos($angle * $torad)}]
+    set y [expr {sin($angle * $torad)}]
+    return [list $x $y]
+}
+    #
+    #
+    # Find direction octant the point (vector) lies in.
+    #   ... opposite behaviour of ::math::geometry::direction
+    #
+proc ::math::geometry::octant {p} {
+    variable todeg
+    lassign $p x y
+
+    set a [expr {(atan2(-$y,$x)*$todeg)}]
+    while {$a >  360} {set a [expr {$a - 360}]}
+    while {$a < -360} {set a [expr {$a + 360}]}
+    if {$a < 0} {set a [expr {360 + $a}]}
+
+    # puts "p ($x, $y) @ angle $a | [expr {atan2($y,$x)}] | [expr {atan2($y,$x)*$todeg}]"
+    # XXX : Add outer conditions to make a log2 tree of checks.
+
+    if {$a <= 157.5} {
+	if {$a <= 67.5} {
+	    if {$a <= 22.5} { return east }
+	    return southeast
+	}
+	if {$a <=  112.5} { return south }
+	return southwest
+    } else {
+	if {$a <=  247.5} {
+	    if {$a <=  202.5} { return west }
+	    return northwest
+	}
+	if {$a <=  337.5} {
+	    if {$a <=  292.5} { return north }
+	    return northeast
+	}
+	return east ; # a <= 360.0
+    }
+}
+    #
+    #
+    # ::math::geometry::intersectSegmentCircle
+    #
+proc ::math::geometry::intersectSegmentCircle {line circle} {
+    return [::math::geometry::lineSegmentIntersectsCircle $line $circle]
+}
+    #
+    #
+    # ::math::geometryExt::intersectLineCircle
+    #
+proc ::math::geometry::intersectLineCircle {line circle} {
+    return [::math::geometry::lineIntersectsCircle $line $circle]
+}
+    #
+    #
+    # ::math::geometry::intersectLineSegments
+    #
+proc ::math::geometry::intersectLineSegments {line1 line2} {
+    return [::math::geometry::lineSegmentsIntersect $line1 $line2]
+}
+    #
+    # ::math::geometry::intersectionLineCircle
+    #               ... intersectionLineWithCircle
+    #
+proc ::math::geometry::intersectionLineCircle {line circle} {
+    return [::math::geometry::intersectionLineWithCircle $line $circle]
+}
+    #
+    # ::math::geometry::intersectionLineCircle
+    #               ... findLineSegmentIntersection
+    #
+proc ::math::geometry::intersectionLineSegments {line1 line2} {
+    return [::math::geometry::findLineSegmentIntersection $line1 $line2]
+}
+    #
+    #
+    # ::math::geometry::intersectionSegmentCircle
+    #
+proc ::math::geometry::intersectionSegmentCircle {line circle} {
+    if [intersectLineCircle $line $circle] {
+        set posList {}
+        foreach pos [intersectionLineCircle $line $circle] {
+            if { [pointInsideBBox $line $pos] } {
+                lappend posList $pos
+            }
+        }
+        return $posList
+    } else {
+        return {}
+    }
+}
+    #
+    #
+    # ::math::geometry::intersectionPolylines
+    #
+    #       ... based on ::math::geometry::polylinesBoundingIntersect
+    #
+    #       Computes the first or all intersections of two polylines.
+    #
+    #       How it works:
+    #          Each polyline is split into a number of smaller polylines,
+    #          consisting of granularity points each. If a pair of those smaller
+    #          lines' bounding boxes intersect, then this procedure computes the
+    #          first {mode=first} or alls {mode=all} intersecting points.
+    #
+    # Arguments:
+    #       polyline1     the first polyline
+    #       polyline2     the second polyline
+    #       mode          [first|all] results
+    #
+    # Results:
+    #       posIntersect   ... pos of intersections or empty list in case of no intersection found
+    #
+    # Examples:
+    #     - intersectionPolylines {0 0 10 10 10 20} {0 10 10 0}
+    #       Result: {5 5}
+    #     - intersectionPolylines {0 0 10 10 10 20} {5 4 10 4}
+    #       Result: {}
+    #
+    #
+    #                               *
+    #                              /
+    #       +─────+               /
+    #              \       * - - *
+    #               \     /
+    #                +── o ───────── ─>
+    #                   /
+    #                  *
+    #
+proc ::math::geometry::___polylineIntersection {polyline1 polyline2 {mode first}} {
+    return [intersectionPolylines $polyline1 $polyline2 $mode]
+}
+proc ::math::geometry::intersectionPolylines {polyline1 polyline2 {mode first} {granularity 1}} {
+        #
+    #set granularity 10  ;   # the number of points in each part-polyline
+    #                        #   granularity<=1 means full correctness
+    #                        #   10 ... optimal search granularity?
+        #
+        # split the lines into parts consisting of $granularity points
+    if {$granularity > 1 } {
+        set polyline1parts {}
+        for {set i 0} {$i<[llength $polyline1]} {incr i [expr {2*$granularity-2}]} {
+            lappend polyline1parts [lrange $polyline1 $i [expr {$i+2*$granularity-1}]]
+        }
+        set polyline2parts {}
+        for {set i 0} {$i<[llength $polyline2]} {incr i [expr {2*$granularity-2}]} {
+            lappend polyline2parts [lrange $polyline2 $i [expr {$i+2*$granularity-1}]]
+        }
+    } else {
+        set polyline1parts [list $polyline1]
+        set polyline2parts [list $polyline2]
+    }
+        #
+    set posList    {}
+        #
+        # do any of the parts overlap?
+        #
+        #
+    foreach part1 $polyline1parts {
+            #
+            # puts "    -> \$part1    $part1"
+        set part1bbox [bbox $part1]
+            #
+        foreach part2 $polyline2parts {
+                # puts "    -> \$part2    $part2"
+            set part2bbox [bbox $part2]
+                # puts "      -> \$part1bbox $part1bbox"
+                # puts "      -> \$part2bbox $part2bbox"
+                #
+            if {[rectanglesOverlap  [lrange $part1bbox 0 1] [lrange $part1bbox 2 3]  [lrange $part2bbox 0 1] [lrange $part2bbox 2 3] 0]} {
+                    # puts " the lines' bounding boxes intersect"
+                foreach {l1x2 l1y2} [lassign $part1 l1x1 l1y1] {
+                    foreach {l2x2 l2y2} [lassign $part2 l2x1 l2y1] {
+                            #
+                            # puts "  -> try   [list $l1x1 $l1y1 $l1x2 $l1y2] 	<-?->   [list $l2x1 $l2y1 $l2x2 $l2y2]"
+                        if {[intersectLineSegments [list $l1x1 $l1y1 $l1x2 $l1y2] [list $l2x1 $l2y1 $l2x2 $l2y2]]} {
+                                # puts " two line segments overlap"
+                                # compute intersection
+                                # return position
+                                # puts "      -> intersect - A1: yes"
+                            set posIntersect    [intersectionLineSegments [list $l1x1 $l1y1 $l1x2 $l1y2] [list $l2x1 $l2y1 $l2x2 $l2y2]]
+                            if {$posIntersect eq "coincident" || $posIntersect eq "none"} {
+                                set posIntersect ""
+                            }
+                                # puts "      -> \$k: $k -> [list $l1x1 $l1y1 $l1x2 $l1y2]"
+                                # puts "      -> \$l: $l -> [list $l2x1 $l2y1 $l2x2 $l2y2]"
+                                # puts "      -> intersection: $posIntersect"
+                            if {$mode ne "first"} {
+                                lappend posList $posIntersect
+                            } else {
+                                return $posIntersect
+                            }
+                                #
+                        }
+                        set l2x1 $l2x2; set l2y1 $l2y2
+                            #
+                    }
+                    set l1x1 $l1x2; set l1y1 $l1y2
+                }
+            }
+        }
+    }
+        #
+        #
+    return $posList
+        #
+}
+    #
+    #
+    # ::math::geometry::intersectionPolylineCircle
+    #
+    #       ... based on ::math::geometry::polylinesBoundingIntersect
+    #
+    #       Computes the first or all intersections of polyline and circle.
+    #
+    #       How it works:
+    #          The polyline is split into a number of smaller polylines,
+    #          consisting of granularity points each. If a pair of those smaller
+    #          lines' bounding boxes intersect, then this procedure returns 1,
+    #          otherwise it returns 0.
+    #
+    # Arguments:
+    #       polyline1     the first polyline
+    #       polyline2     the second polyline
+    #       mode          return [first|all] intersections
+    #
+    # Results:
+    #       posIntersect   ... pos of intersections or empty list in case of no intersection found
+    #
+    # Examples:
+    #     - intersectionPolylineCircle {0 0  10 10  20 10  30 0} {40 0 20}
+    #       Result: {30.564404225837308 4.717797887081346}
+    #     - intersectionPolylineCircle {0 0  10 10  20 10  30 0} {20 0 15}
+    #       Result: {18.81966011250105 10.0}
+    #     - intersectionPolylineCircle {0 0  10 10  20 10  40 0} {20 0 15}
+    #       Result: {34.77032961426901 2.6148351928654963} {6.464466094067264 6.464466094067264}
+    #     - intersectionPolylineCircle {0 0  10 10  20 10  40 0} {20 0 15}
+    #       Result: {}
+    #
+    #
+    # Results:
+    #       posList ...... e.g: {34.77032961426901 2.6148351928654963} {6.464466094067264 6.464466094067264}
+    #
+    #
+    #
+    #                   \
+    #       +─────+      \
+    #              \     |
+    #               \    |
+    #                +── o ───────── ─>
+    #                   /
+    #                  /
+    #
+proc ::math::geometry::___polylineCircleIntersection {polyline circle {mode first}} {
+    return [intersectionPolylineCircle $polyline $circle $mode]
+}
+proc ::math::geometry::intersectionPolylineCircle {polyline circle {mode first} {granularity 1}} {
+        #
+        # puts "\n   -> ::math::geometry::polylineCircleIntersection \n"
+        #
+    #set granularity 5   ;   # the number of points in each part-polyline
+                             #   granularity<=1 means full correctness
+                             #   5 ... optimal search granularity?
+        #
+        # split the lines into parts consisting of $granularity points
+    set polylineAllParts {}
+    if { $granularity > 1 } {
+        for {set i 0} {$i<[llength $polyline]} {incr i [expr {2*$granularity-2}]} {
+            lappend polylineAllParts [lrange $polyline $i [expr {$i+2*$granularity-1}]]
+        }
+    } else {
+        set polylineAllParts [list $polyline]
+    }
+         #
+    lassign $circle x y r
+    set posCenter   [list $x $y]
+    set bboxCircle  [list [expr {$x - $r}] [expr {$y - $r}] [expr {$x + $r}] [expr {$y + $r}]]
+        #
+    set polylineUseParts    {}
+        #
+        # -- get parts of $polylineAllParts that might intersect circle
+    foreach part $polylineAllParts {
+            #
+        set part1bbox       [bbox $part]
+            #
+        if {[rectanglesOverlap  [lrange $part1bbox 0 1] [lrange $part1bbox 2 3]  [lrange $bboxCircle 0 1] [lrange $bboxCircle 2 3] 1]} {
+            lappend polylineUseParts    $part
+        }
+    }
+        #
+    if 0 {
+        puts "   -> llength \$polylineAllParts -> [llength $polylineAllParts]"
+        puts "   -> llength \$polylineUseParts -> [llength $polylineUseParts]"
+        foreach polylinePart $polylineUseParts {
+            puts "        \$polylineUseParts -> $polylinePart"
+        }
+    }
+        #
+        #
+        # -- iterate through $polylineUseParts
+        #
+    set posList {}
+        #
+    set m 0
+    foreach polylinePart $polylineUseParts {
+            #
+        incr m
+            #
+            # puts "--------------------"
+            # puts "    -> \$polylinePart    $polylinePart"
+        set n 0
+        foreach {seg_x2 seg_y2} [lassign $polylinePart seg_x1 seg_y1] {
+            incr n
+            set segment         [list $seg_x1 $seg_y1 $seg_x2 $seg_y2]
+            set posIntersect    [intersectionSegmentCircle $segment $circle]
+            if {$posIntersect != {}} {
+                    # puts "\n"
+                    # puts "         $m / $n -> \$segment:  $segment"
+                    # puts "         $m / $n -> \n\[::math::geometry::intersectionSegmentCircle \\\n    [list $segment] \\\n    [list $circle]\]"
+                    # puts "         $m / $n -> \$posIntersect: $posIntersect"
+                foreach pos $posIntersect {
+                    # puts "       -> $m / $n : $segment"
+                    # puts "       -> $m / $n : $pos"
+                    if {$mode ne "first"} {
+                        #lassign $pos _x_ _y_
+                        #lappend posList [list [format {%0.6f} $_x_] [format {%0.6f} $_y_]]
+                        lappend posList $pos
+                    } else {
+                        return $pos
+                    }
+                }
+            }
+            set seg_x1 $seg_x2; set seg_y1 $seg_y2
+        }
+    }
+        #
+        # puts "   -> \$posList $posList"
+        # set posList [lsort -unique $posList]
+        # puts "   -> \$posList $posList"
+        #
+    return $posList
+        #
+        #
+}
+    #
+    #
+    # ::math::geometry::polylineCutOrigin
+    #
+    # Arguments:
+    #       polyline1      the first polyline
+    #       polyline2      the second polyline
+    #       granularity    the coarseness for the procedure
+    #
+    # Return:
+    #       polyline       polyline from cut position to end
+    #
+proc ::math::geometry::polylineCutOrigin {polyline1 polyline2 {granularity 1}} {
+        #
+    #set granularity 10  ;   # the number of points in each part-polyline
+                             #   granularity<=1 means full correctness
+                             #   10 ... optimal search granularity?
+        #
+        # split the lines into parts consisting of $granularity points
+    set granularity [expr {min(2,$granularity+1)}];# We need the total number of points in the section
+
+    set polyline1parts {}
+    for {set i 0} {$i<[llength $polyline1]} {incr i [expr {2*$granularity-2}]} {
+        lappend polyline1parts [lrange $polyline1 $i [expr {$i+2*$granularity-1}]]
+    }
+    set polyline2parts {}
+    for {set i 0} {$i<[llength $polyline2]} {incr i [expr {2*$granularity-2}]} {
+        lappend polyline2parts [lrange $polyline2 $i [expr {$i+2*$granularity-1}]]
+    }
+        #
+    set posIntersect    {}
+    set polyline        {}
+        #
+        # do any of the parts overlap?
+        #
+        #
+    foreach part1 $polyline1parts {
+            # puts "    -> \$part1    $part1"
+        set part1bbox [bbox $part1]
+            #
+        foreach part2 $polyline2parts {
+                # puts "    -> \$part2    $part2"
+            set part2bbox [bbox $part2]
+                # puts "      -> \$part1bbox $part1bbox"
+                # puts "      -> \$part2bbox $part2bbox"
+                #
+            if {[rectanglesOverlap  [lrange $part1bbox 0 1] [lrange $part1bbox 2 3]  [lrange $part2bbox 0 1] [lrange $part2bbox 2 3] 0]} {
+                    # puts " the lines' bounding boxes intersect"
+                foreach {l1x2 l1y2} [lassign $part1 l1x1 l1y1] {
+                    if {$polyline eq {}} {
+                        foreach {l2x2 l2y2} [lassign $part2 l2x1 l2y1] {
+                                #
+                                # puts "  -> try   [list $l1x1 $l1y1 $l1x2 $l1y2] 	<-?->   [list $l2x1 $l2y1 $l2x2 $l2y2]"
+                            if {[intersectLineSegments [list $l1x1 $l1y1 $l1x2 $l1y2] [list $l2x1 $l2y1 $l2x2 $l2y2]]} {
+                                    # puts " two line segments overlap"
+                                    # compute intersection
+                                    # return position
+                                    # puts "      -> intersect - A1: yes"
+                                set posIntersect    [intersectionLineSegments [list $l1x1 $l1y1 $l1x2 $l1y2] [list $l2x1 $l2y1 $l2x2 $l2y2]]
+                                if {$posIntersect eq "coincident" || $posIntersect eq "none"} {
+                                    set posIntersect ""
+                                }
+                                    # puts "      -> \$k: $k -> [list $l1x1 $l1y1 $l1x2 $l1y2]"
+                                    # puts "      -> \$l: $l -> [list $l2x1 $l2y1 $l2x2 $l2y2]"
+                                    # puts "      -> intersection: $posIntersect"
+                                set polyline        [join "$posIntersect $l1x2 $l1y2"]
+                                    #
+                            }
+                            set l2x1 $l2x2; set l2y1 $l2y2
+                                #
+                        }
+                    } else {
+                        lappend polyline $l1x2 $l1y2
+                    }
+                        #
+                    set l1x1 $l1x2; set l1y1 $l1y2
+                        #
+                }
+            }
+        }
+    }
+        #
+        #
+    return $polyline
+        #
+}
+    #
+    #
+    # ::math::geometry::polylineCutEnd
+    #
+    # Arguments:
+    #       polyline1      the first polyline
+    #       polyline2      the second polyline
+    #       granularity    the coarseness for the procedure
+    #
+    # Return:
+    #       polyline       polyline from origin to cut position
+    #
+proc ::math::geometry::polylineCutEnd {polyline1 polyline2 {granularity 1}} {
+        #
+    #set granularity 10  ;   # the number of points in each part-polyline
+                             #   granularity<=1 means full correctness
+                             #   10 ... optimal search granularity?
+    set granularity [expr {min(2,$granularity+1)}];# We need the total number of points in the section
+        #
+        # split the lines into parts consisting of $granularity points
+    set polyline1parts {}
+    for {set i 0} {$i<[llength $polyline1]} {incr i [expr {2*$granularity-2}]} {
+        lappend polyline1parts [lrange $polyline1 $i [expr {$i+2*$granularity-1}]]
+    }
+    set polyline2parts {}
+    for {set i 0} {$i<[llength $polyline2]} {incr i [expr {2*$granularity-2}]} {
+        lappend polyline2parts [lrange $polyline2 $i [expr {$i+2*$granularity-1}]]
+    }
+        #
+    set posIntersect    {}
+    set polyline        [lrange $polyline1 0 1]
+        #
+        # do any of the parts overlap?
+        #
+        #
+    foreach part1 $polyline1parts {
+            # puts "    -> \$part1    $part1"
+        set part1bbox [bbox $part1]
+            #
+        foreach part2 $polyline2parts {
+                #puts "    -> \$part2    $part2"
+            set part2bbox [bbox $part2]
+                # puts "      -> \$part1bbox $part1bbox"
+                # puts "      -> \$part2bbox $part2bbox"
+                #
+            if {[rectanglesOverlap  [lrange $part1bbox 0 1] [lrange $part1bbox 2 3]  [lrange $part2bbox 0 1] [lrange $part2bbox 2 3] 0]} {
+                        # puts " the lines' bounding boxes intersect"
+                foreach {l1x2 l1y2} [lassign $part1 l1x1 l1y1] {
+                    foreach {l2x2 l2y2} [lassign $part2 l2x1 l2y1] {
+                            #
+                            # puts "  -> try   [list $l1x1 $l1y1 $l1x2 $l1y2] 	<-?->   [list $l2x1 $l2y1 $l2x2 $l2y2]"
+                        if {[intersectLineSegments [list $l1x1 $l1y1 $l1x2 $l1y2] [list $l2x1 $l2y1 $l2x2 $l2y2]]} {
+                                # puts " two line segments overlap"
+                                # compute intersection
+                                # return position
+                                # puts "      -> intersect - A1: yes"
+                            set posIntersect    [intersectionLineSegments [list $l1x1 $l1y1 $l1x2 $l1y2] [list $l2x1 $l2y1 $l2x2 $l2y2]]
+                            if {$posIntersect eq "coincident" || $posIntersect eq "none"} {
+                                continue
+                            }
+                                # puts "      -> \$k: $k -> [list $l1x1 $l1y1 $l1x2 $l1y2]"
+                                # puts "      -> \$l: $l -> [list $l2x1 $l2y1 $l2x2 $l2y2]"
+                                # puts "      ...    intersection found for part1 in part2 ->  $l1x1 $l1y1 $l1x2 $l1y2 -?- $l2x1 $l2y1 $l2x2 $l2y2"
+                            lappend polyline    $posIntersect
+                                #
+                            return [join $polyline]
+                                #
+                        } else {
+                            # puts "      ... no intersection found for part1 in part2 ->  $l1x1 $l1y1 $l1x2 $l1y2 -?- $l2x1 $l2y1 $l2x2 $l2y2"
+                        }
+                            #
+                        set l2x1 $l2x2; set l2y1 $l2y2
+                            #
+                    }
+                        #
+                    lappend polyline $l1x2 $l1y2
+                        #
+                    set l1x1 $l1x2; set l1y1 $l1y2
+                        #
+                }
+            } else {
+                    # puts "      ... no overlap found for part1 in part2 -> [lrange $part1 2 end]"
+                lappend polyline [lrange $part1 2 end]
+                    #
+            }
+        }
+            #
+    }
+        #
+        #
+    return [join $polyline]
+        #
+}
+    #
+    #
+    # ::math::geometry::splitPolyline
+    #
+    # Arguments:
+    #       polyline        the given polyline
+    #
+    # Return:
+    #       list of segments
+    #
+proc ::math::geometry::splitPolyline {polyline numbVertex} {
+        #
+    set listSegments        {}
+        #
+        # puts "    -> splitPolyline"
+        # puts "        -> \$numbVertex $numbVertex"
+        #
+    set myPolygon           [lassign $polyline x y]
+        #
+    set xy                  [list $x $y]
+        #
+    set i           0
+        #
+    set tmpPolyline         $xy
+        #
+        #
+    foreach {x y} $myPolygon {
+            #
+        lappend tmpPolyline $x $y
+            #
+            # puts "   -> $i: $tmpPolyline"
+            #
+        if {$i < $numbVertex} {
+                #
+            incr i
+                #
+        } else {
+                #
+            lappend listSegments    [join $tmpPolyline]
+                #
+            set tmpPolyline         [list $x $y]
+            set i 0
+                #
+        }
+            #
+    }
+        #
+    if {[lindex $listSegments end] != $tmpPolyline} {
+        lappend listSegments    $tmpPolyline
+    }
+        #
+    return $listSegments
+        #
+}
+    #
+    #
+    # ::math::geometry::enrichPolyline
+    #
+    # Arguments:
+    #       polyline      the given polyline
+    #       accuracy      divide each segment into $accuracy number of segments
+    #
+    # Results:
+    #       polyline      each segment divided in $accuracy number of segments
+    #
+    # Example:
+    #     - enrichPolyline  {0 0  40 0  40 20  80 20} 4
+    #       Result:         {0 0   10 0  20 0  30 0   40 0   40 5  40 10  40 15   40 20   50 20  60 20  70 20   80 20}
+    #
+proc ::math::geometry::enrichPolyline {polyline accuracy} {
+        #
+    set retValue    [lrange $polyline 0 1]
+        #
+    set accuracy    [expr {$accuracy + 0.0}] ;# Avoid division by an integer
+
+    foreach {x2 y2} [lassign $polyline x1 y1] {
+            # puts "       -> $x1 $y1  ->  $x2 $y2"
+        set dx      [expr {($x2 - $x1) / $accuracy}]
+        set dy      [expr {($y2 - $y1) / $accuracy}]
+         for {set i 1} {$i <= $accuracy} {incr i} {
+            lappend retValue [expr {$x1 + $i * $dx}] [expr {$y1 + $i * $dy}]
+        }
+        set x1 $x2
+        set y1 $y2
+    }
+        #
+    return $retValue
+        #
+}
+    #
+    #
+    # ::math::geometry::cleanupPolyline
+    #
+    # remove coincidencies of neighbored points
+    #
+    # Arguments:
+    #       polyline    the given polyline
+    #
+    # Results:
+    #       polyline
+    #
+    # Example:
+    #     - cleanupPolyline {0 0  40 0  40 20  40 20.0  80 20  80 20.0}
+    #       Result:         {0 0  40 0  40 20  80 20}
+    #
+proc ::math::geometry::cleanupPolyline {polyline} {
+        #
+    set retValue    [lrange $polyline 0 1]
+        #
+    foreach {x2 y2} [lassign $polyline x1 y1] {
+            # puts "       -> $x1 $y1  ->  $x2 $y2"
+        if {$x2 != $x1 || $y2 != $y1} {
+            # puts "     differ: $x2 -?- $x1  --- $y2  -?-  $y1"
+            lappend retValue $x2 $y2
+        }
+        set x1 $x2
+        set y1 $y2
+    }
+        #
+    return $retValue
+        #
+}
+    #
+    #
+    # ::math::geometry::pointInsideBBox
+    #
+    # check wether a point is inside or on BoundingBoy
+    #
+    # Arguments:
+    #       bbox        the given polyline
+    #       point       the point to be checked
+    #
+    # Results:
+    #       0 ... totally outside bbox
+    #       1 ... inside bbox
+    #
+    # Example:
+    #     - pointInsideBBox {0 0  40 20} {20 10}
+    #       Result:         1
+    #     - pointInsideBBox {0 0  40 20} {30 20}
+    #       Result:         1
+    #     - pointInsideBBox {0 0  40 20} {50 10}
+    #       Result:         0
+    #
+proc ::math::geometry::pointInsideBBox {bbox point} {
+    lassign $bbox  bb_x0 bb_y0 bb_x1 bb_y1
+    lassign $point x y
+    if {$x == [lindex [lsort -real -increasing "$bb_x0 $bb_x1 $x"] 1]} {
+        if {$y == [lindex [lsort -real -increasing "$bb_y0 $bb_y1 $y"] 1]} {
+            return 1
+        }
+    }
+    return 0
+}
+    #
+    #
+    # ::math::geometry::overlapBBox
+    #
+proc ::math::geometry::overlapBBox {polyline1 polyline2 {strict 0}} {
+        # puts "   -> \$polyline1 $polyline1"
+        # puts "   -> \$polyline2 $polyline2"
+    set bbox1   [bbox $polyline1]
+    set bbox2   [bbox $polyline2]
+        # puts "         -> \$bbox1 $bbox1"
+        # puts "         -> \$bbox2 $bbox2"
+        # puts "         -> [::math::geometry::rectanglesOverlap  [lrange $bbox1 0 1] [lrange $bbox1 2 3]  [lrange $bbox2 0 1] [lrange $bbox2 2 3] $strict]"
+    return [rectanglesOverlap  [lrange $bbox1 0 1] [lrange $bbox1 2 3]  [lrange $bbox2 0 1] [lrange $bbox2 2 3] $strict]
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/interpolate.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/interpolate.tcl
new file mode 100644
index 00000000..810b808c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/interpolate.tcl
@@ -0,0 +1,667 @@
+# interpolate.tcl --
+#
+#    Package for interpolation methods (one- and two-dimensional)
+#
+# Remarks:
+#    None of the methods deal gracefully with missing values
+#
+# To do:
+#    Add B-splines as methods
+#    For spatial interpolation in two dimensions also quadrant method?
+#    Method for destroying a table
+#    Proper documentation
+#    Proper test cases
+#
+# version 0.1: initial implementation, january 2003
+# version 0.2: added linear and Lagrange interpolation, straightforward
+#              spatial interpolation, april 2004
+# version 0.3: added Neville algorithm.
+# version 1.0: added cubic splines, september 2004
+#
+# Copyright (c) 2004 by Arjen Markus. All rights reserved.
+# Copyright (c) 2004 by Kevin B. Kenny.  All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: interpolate.tcl,v 1.10 2009/10/22 18:19:52 arjenmarkus Exp $
+#
+#----------------------------------------------------------------------
+
+package require Tcl 8.4
+package require struct::matrix
+
+# ::math::interpolate --
+#   Namespace holding the procedures and variables
+#
+
+namespace eval ::math::interpolate {
+   variable search_radius {}
+   variable inv_dist_pow  2
+
+   namespace export interp-1d-table interp-table interp-linear \
+                    interp-lagrange
+   namespace export neville
+}
+
+# defineTable --
+#    Define a two-dimensional table of data
+#
+# Arguments:
+#    name     Name of the table to be created
+#    cols     Names of the columns (for convenience and for counting)
+#    values   List of values to fill the table with (must be sorted
+#             w.r.t. first column or first column and first row)
+#
+# Results:
+#    Name of the new command
+#
+# Side effects:
+#    Creates a new command, which is used in subsequent calls
+#
+proc ::math::interpolate::defineTable { name cols values } {
+
+   set table ::math::interpolate::__$name
+   ::struct::matrix $table
+
+   $table add columns [llength $cols]
+   $table add row
+   $table set row 0 $cols
+
+   set row    1
+   set first  0
+   set nocols [llength $cols]
+   set novals [llength $values]
+   while { $first < $novals } {
+      set last [expr {$first+$nocols-1}]
+      $table add row
+      $table set row $row [lrange $values $first $last]
+
+      incr first $nocols
+      incr row
+   }
+
+   return $table
+}
+
+# inter-1d-table --
+#    Interpolate in a one-dimensional table
+#    (first column is independent variable, all others dependent)
+#
+# Arguments:
+#    table    Name of the table
+#    xval     Value of the independent variable
+#
+# Results:
+#    List of interpolated values, including the x-variable
+#
+proc ::math::interpolate::interp-1d-table { table xval } {
+
+   #
+   # Search for the records that enclose the x-value
+   #
+   set xvalues [lrange [$table get column 0] 2 end]
+
+   foreach {row row2} [FindEnclosingEntries $xval $xvalues] break
+   incr row
+   incr row2
+
+   set prev_values [$table get row $row]
+   set next_values [$table get row $row2]
+
+   set xprev       [lindex $prev_values 0]
+   set xnext       [lindex $next_values 0]
+
+   if { $row == $row2 } {
+      return [concat $xval [lrange $prev_values 1 end]]
+   } else {
+      set wprev [expr {($xnext-$xval)/double($xnext-$xprev)}]
+      set wnext [expr {1.0-$wprev}]
+      set results {}
+      foreach vprev $prev_values vnext $next_values {
+         set vint  [expr {$vprev*$wprev+$vnext*$wnext}]
+         lappend results $vint
+      }
+      return $results
+   }
+}
+
+# interp-table --
+#    Interpolate in a two-dimensional table
+#    (first column and first row are independent variables)
+#
+# Arguments:
+#    table    Name of the table
+#    xval     Value of the independent row-variable
+#    yval     Value of the independent column-variable
+#
+# Results:
+#    Interpolated value
+#
+# Note:
+#    Use bilinear interpolation
+#
+proc ::math::interpolate::interp-table { table xval yval } {
+
+   #
+   # Search for the records that enclose the x-value
+   #
+   set xvalues [lrange [$table get column 0] 2 end]
+
+   foreach {row row2} [FindEnclosingEntries $xval $xvalues] break
+   incr row
+   incr row2
+
+   #
+   # Search for the columns that enclose the y-value
+   #
+   set yvalues [lrange [$table get row 1] 1 end]
+
+   foreach {col col2} [FindEnclosingEntries $yval $yvalues] break
+
+   set yvalues [concat "." $yvalues] ;# Prepend a dummy column!
+
+   set prev_values [$table get row $row]
+   set next_values [$table get row $row2]
+
+   set x1          [lindex $prev_values 0]
+   set x2          [lindex $next_values 0]
+   set y1          [lindex $yvalues     $col]
+   set y2          [lindex $yvalues     $col2]
+
+   set v11         [lindex $prev_values $col]
+   set v12         [lindex $prev_values $col2]
+   set v21         [lindex $next_values $col]
+   set v22         [lindex $next_values $col2]
+
+   #
+   # value = v0 + a*(x-x1) + b*(y-y1) + c*(x-x1)*(y-y1)
+   # if x == x1 and y == y1: value = v11
+   # if x == x1 and y == y2: value = v12
+   # if x == x2 and y == y1: value = v21
+   # if x == x2 and y == y2: value = v22
+   #
+   set a 0.0
+   if { $x1 != $x2 } {
+      set a [expr {($v21-$v11)/($x2-$x1)}]
+   }
+   set b 0.0
+   if { $y1 != $y2 } {
+      set b [expr {($v12-$v11)/($y2-$y1)}]
+   }
+   set c 0.0
+   if { $x1 != $x2 && $y1 != $y2 } {
+      set c [expr {($v11+$v22-$v12-$v21)/($x2-$x1)/($y2-$y1)}]
+   }
+
+   set result \
+   [expr {$v11+$a*($xval-$x1)+$b*($yval-$y1)+$c*($xval-$x1)*($yval-$y1)}]
+
+   return $result
+}
+
+# FindEnclosingEntries --
+#    Search within a sorted list
+#
+# Arguments:
+#    val      Value to be searched
+#    values   List of values to be examined
+#
+# Results:
+#    Returns a list of the previous and next indices
+#
+proc FindEnclosingEntries { val values } {
+   set found 0
+   set row2  1
+   foreach v $values {
+      if { $val <= $v } {
+         set row   [expr {$row2-1}]
+         set found 1
+         break
+      }
+      incr row2
+   }
+
+   #
+   # Border cases: extrapolation needed
+   #
+   if { ! $found } {
+      incr row2 -1
+      set  row $row2
+   }
+   if { $row == 0 } {
+      set row $row2
+   }
+
+   return [list $row $row2]
+}
+
+# interp-linear --
+#    Use linear interpolation
+#
+# Arguments:
+#    xyvalues   List of x/y values to be interpolated
+#    xval       x-value for which a value is sought
+#
+# Results:
+#    Estimated value at $xval
+#
+# Note:
+#    The list xyvalues must be sorted w.r.t. the x-value
+#
+proc ::math::interpolate::interp-linear { xyvalues xval } {
+   #
+   # Border cases first
+   #
+   if { [lindex $xyvalues 0]+0.0 > $xval } {
+      return [lindex $xyvalues 1]
+   }
+   if { [lindex $xyvalues end-1]+0.0 < $xval } {
+      return [lindex $xyvalues end]
+   }
+
+   #
+   # The ordinary case
+   #
+   set idxx -2
+   set idxy -1
+   foreach { x y } $xyvalues {
+      if { $xval < $x } {
+         break
+      }
+      incr idxx 2
+      incr idxy 2
+   }
+
+   set x2 [lindex $xyvalues $idxx]
+   set y2 [lindex $xyvalues $idxy]
+
+   if { $x2 != $x } {
+      set yval [expr {$y+($y2-$y)*($xval-$x)/double($x2-$x)}]
+   } else {
+      set yval [expr {double($y)}]
+   }
+   return $yval
+}
+
+# interp-lagrange --
+#    Use the Lagrange interpolation method
+#
+# Arguments:
+#    xyvalues   List of x/y values to be interpolated
+#    xval       x-value for which a value is sought
+#
+# Results:
+#    Estimated value at $xval
+#
+# Note:
+#    The list xyvalues must be sorted w.r.t. the x-value
+#    Furthermore the Lagrange method is not a very practical
+#    method, as potentially the errors are unbounded
+#
+proc ::math::interpolate::interp-lagrange { xyvalues xval } {
+   #
+   # Border case: xval equals one of the "nodes"
+   #
+   foreach { x y } $xyvalues {
+      if { $x == $xval } {
+         return $y
+      }
+   }
+
+   #
+   # Ordinary case
+   #
+   set nonodes2 [llength $xyvalues]
+
+   set yval 0.0
+
+   for { set i 0 } { $i < $nonodes2 } { incr i 2 } {
+      set idxn 0
+      set xn   [lindex $xyvalues $i]
+      set yn   [lindex $xyvalues [expr {$i+1}]]
+
+      foreach { x y } $xyvalues {
+         if { $idxn != $i } {
+            set yn [expr {$yn*($x-$xval)/($x-$xn)}]
+         }
+         incr idxn 2
+      }
+
+      set yval [expr {$yval+$yn}]
+   }
+
+   return $yval
+}
+
+# interp-spatial --
+#    Use a straightforward interpolation method with weights as
+#    function of the inverse distance to interpolate in 2D and N-D
+#    space
+#
+# Arguments:
+#    xyvalues   List of coordinates and values at these coordinates
+#    coord      List of coordinates for which a value is sought
+#
+# Results:
+#    Estimated value(s) at $coord
+#
+# Note:
+#    The list xyvalues is a list of lists:
+#    { {x1 y1 z1 {v11 v12 v13 v14}
+#      {x2 y2 z2 {v21 v22 v23 v24}
+#      ...
+#    }
+#    The last element of each inner list is either a single number
+#    or a list in itself. In the latter case the return value is
+#    a list with the same number of elements.
+#
+#    The method is influenced by the search radius and the
+#    power of the inverse distance
+#
+proc ::math::interpolate::interp-spatial { xyvalues coord } {
+   variable search_radius
+   variable inv_dist_pow
+
+   set result {}
+   foreach v [lindex [lindex $xyvalues 0] end] {
+      lappend result 0.0
+   }
+
+   set total_weight 0.0
+
+   if { $search_radius != {} } {
+      set max_radius2  [expr {$search_radius*$search_radius}]
+   } else {
+      set max_radius2  {}
+   }
+
+   foreach point $xyvalues {
+      set dist 0.0
+      foreach c [lrange $point 0 end-1] cc $coord {
+         set dist [expr {$dist+($c-$cc)*($c-$cc)}]
+      }
+
+      #
+      # Take care of coincident points
+      #
+      if { $dist == 0.0 } {
+          return [lindex $point end]
+      }
+
+      #
+      # The general case
+      #
+      if { $max_radius2 == {} || $dist <= $max_radius2 } {
+         if { $inv_dist_pow == 1 } {
+            set dist [expr {sqrt($dist)}]
+         }
+         set total_weight [expr {$total_weight+1.0/$dist}]
+
+         set idx 0
+         foreach v [lindex $point end] r $result {
+            lset result $idx [expr {$r+$v/$dist}]
+            incr idx
+         }
+      }
+   }
+
+   if { $total_weight == 0.0 } {
+      set idx 0
+      foreach r $result {
+         lset result $idx {}
+         incr idx
+      }
+   } else {
+      set idx 0
+      foreach r $result {
+         lset result $idx [expr {$r/$total_weight}]
+         incr idx
+      }
+   }
+
+   return $result
+}
+
+# interp-spatial-params --
+#    Set the parameters for spatial interpolation
+#
+# Arguments:
+#    max_search   Search radius (if none: use {} or "")
+#    power        Power for the inverse distance (1 or 2, defaults to 2)
+#
+# Results:
+#    None
+#
+proc ::math::interpolate::interp-spatial-params { max_search {power 2} } {
+   variable search_radius
+   variable inv_dist_pow
+
+   set search_radius $max_search
+   if { $power == 1 } {
+      set inv_dist_pow 1
+   } else {
+      set inv_dist_pow 2
+   }
+}
+
+#----------------------------------------------------------------------
+#
+# neville --
+#
+#	Interpolate a function between tabulated points using Neville's
+#	algorithm.
+#
+# Parameters:
+#	xtable - Table of abscissae.
+#	ytable - Table of ordinates.  Must be a list of the same
+#		 length as 'xtable.'
+#	x - Abscissa for which the function value is desired.
+#
+# Results:
+#	Returns a two-element list.  The first element is the
+#	requested ordinate.  The second element is a rough estimate
+#	of the absolute error, that is, the magnitude of the first
+#	neglected term of a power series.
+#
+# Side effects:
+#	None.
+#
+#----------------------------------------------------------------------
+
+proc ::math::interpolate::neville { xtable ytable x } {
+
+    set n [llength $xtable]
+
+    # Initialization.  Set c and d to the ordinates, and set ns to the
+    # index of the nearest abscissa. Set y to the zero-order approximation
+    # of the nearest ordinate, and dif to the difference between x
+    # and the nearest tabulated abscissa.
+
+    set c [list]
+    set d [list]
+    set i 0
+    set ns 0
+    set dif [expr { abs( $x - [lindex $xtable 0] ) }]
+    set y [lindex $ytable 0]
+    foreach xi $xtable yi $ytable {
+	set dift [expr { abs ( $x - $xi ) }]
+	if { $dift < $dif } {
+	    set ns $i
+	    set y $yi
+	    set dif $dift
+	}
+	lappend c $yi
+	lappend d $yi
+	incr i
+    }
+
+    # Compute successively higher-degree approximations to the fit
+    # function by using the recurrence:
+    #   d_m[i] = ( c_{m-1}[i+1] - d{m-1}[i] ) * (x[i+m]-x) /
+    #			(x[i] - x[i+m])
+    #   c_m[i] = ( c_{m-1}[i+1] - d{m-1}[i] ) * (x[i]-x) /
+    #			(x[i] - x[i+m])
+
+    for { set m 1 } { $m < $n } { incr m } {
+	for { set i 0 } { $i < $n - $m } { set i $ip1 } {
+	    set ip1 [expr { $i + 1 }]
+	    set ipm [expr { $i + $m }]
+	    set ho [expr { [lindex $xtable $i] - $x }]
+	    set hp [expr { [lindex $xtable $ipm] - $x }]
+	    set w [expr { [lindex $c $ip1] - [lindex $d $i] }]
+	    set q [expr { $w / ( $ho - $hp ) }]
+	    lset d $i [expr { $hp * $q }]
+	    lset c $i [expr { $ho * $q }]
+	}
+
+	# Take the straighest path possible through the tableau of c
+	# and d approximations back to the tabulated value
+	if { 2 * $ns < $n - $m } {
+	    set dy [lindex $c $ns]
+	} else {
+	    incr ns -1
+	    set dy [lindex $d $ns]
+	}
+	set y [expr { $y + $dy }]
+    }
+
+    # Return the approximation and the highest-order correction term.
+
+    return [list $y [expr { abs($dy) }]]
+}
+
+# prepare-cubic-splines --
+#    Prepare interpolation based on cubic splines
+#
+# Arguments:
+#    xcoord    The x-coordinates
+#    ycoord    Y-values for these x-coordinates
+# Result:
+#    Intermediate parameters describing the spline function,
+#    to be used in the second step, interp-cubic-splines.
+# Note:
+#    Implicitly it is assumed that the function decribed by xcoord
+#    and ycoord has a second derivative 0 at the end points.
+#    To minimise the work if more than one value is needed, the
+#    algorithm is divided in two steps
+#    (Derived from the routine SPLINT in Davis and Rabinowitz:
+#    Methods for Numerical Integration, AP, 1984)
+#
+proc ::math::interpolate::prepare-cubic-splines {xcoord ycoord} {
+
+    if { [llength $xcoord] < 3 } {
+        return -code error "At least three points are required"
+    }
+    if { [llength $xcoord] != [llength $ycoord] } {
+        return -code error "Equal number of x and y values required"
+    }
+
+    set m2 [expr {[llength $xcoord]-1}]
+
+    set s  0.0
+    set h  {}
+    set c  {}
+    for { set i 0 } { $i < $m2 } { incr i } {
+        set ip1 [expr {$i+1}]
+        set h1  [expr {[lindex $xcoord $ip1]-[lindex $xcoord $i]}]
+        lappend h $h1
+        if { $h1 <= 0.0 } {
+            return -code error "X values must be strictly ascending"
+        }
+        set r [expr {([lindex $ycoord $ip1]-[lindex $ycoord $i])/$h1}]
+        lappend c [expr {$r-$s}]
+        set s $r
+    }
+    set s 0.0
+    set r 0.0
+    set t {--}
+    lset c 0 0.0
+
+    for { set i 1 } { $i < $m2 } { incr i } {
+        set ip1 [expr {$i+1}]
+        set im1 [expr {$i-1}]
+        set y2  [expr {[lindex $c $i]+$r*[lindex $c $im1]}]
+        set t1  [expr {2.0*([lindex $xcoord $im1]-[lindex $xcoord $ip1])-$r*$s}]
+        set s   [lindex $h $i]
+        set r   [expr {$s/$t1}]
+        lset c  $i $y2
+        lappend t  $t1
+    }
+    lappend c 0.0
+
+    for { set j 1 } { $j < $m2 } { incr j } {
+        set i   [expr {$m2-$j}]
+        set ip1 [expr {$i+1}]
+        set h1  [lindex $h $i]
+        set yp1 [lindex $c $ip1]
+        set y1  [lindex $c $i]
+        set t1  [lindex $t $i]
+        lset c  $i [expr {($h1*$yp1-$y1)/$t1}]
+    }
+
+    set b {}
+    set d {}
+    for { set i 0 } { $i < $m2 } { incr i } {
+        set ip1 [expr {$i+1}]
+        set s   [lindex $h $i]
+        set yp1 [lindex $c $ip1]
+        set y1  [lindex $c $i]
+        set r   [expr {$yp1-$y1}]
+        lappend d [expr {$r/$s}]
+        set y1    [expr {3.0*$y1}]
+        lset c $i $y1
+        lappend b [expr {([lindex $ycoord $ip1]-[lindex $ycoord $i])/$s
+                         -($y1+$r)*$s}]
+    }
+
+    lappend d 0.0
+    lappend b 0.0
+
+    return [list $d $c $b $ycoord $xcoord]
+}
+
+# interp-cubic-splines --
+#    Interpolate based on cubic splines
+#
+# Arguments:
+#    coeffs    Coefficients resulting from the preparation step
+#    x         The x-coordinate for which to estimate the value
+# Result:
+#    Interpolated value at x
+#
+proc ::math::interpolate::interp-cubic-splines {coeffs x} {
+    foreach {dcoef ccoef bcoef acoef xcoord} $coeffs {break}
+
+    #
+    # Check the bounds - no extrapolation
+    #
+    if { $x < [lindex $xcoord 0] } {error "X value too small"}
+    if { $x > [lindex $xcoord end] } {error "X value too large"}
+
+    #
+    # Which interval?
+    #
+    set idx -1
+    foreach xv $xcoord {
+        if { $xv > $x } {
+            break
+        }
+        incr idx
+    }
+
+    set a      [lindex $acoef $idx]
+    set b      [lindex $bcoef $idx]
+    set c      [lindex $ccoef $idx]
+    set d      [lindex $dcoef $idx]
+    set dx     [expr {$x-[lindex $xcoord $idx]}]
+
+    return [expr {(($d*$dx+$c)*$dx+$b)*$dx+$a}]
+}
+
+
+
+#
+# Announce our presence
+#
+package provide math::interpolate 1.1.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/kruskal.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/kruskal.tcl
new file mode 100644
index 00000000..bfada784
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/kruskal.tcl
@@ -0,0 +1,154 @@
+# kruskal.tcl --
+#     Procedures related to ranking and the Kruskal-Wallis test
+#
+
+# test-Kruskal-Wallis --
+#     Perform a one-way analysis of variance according
+#     to Kruskal-Wallis
+#
+# Arguments:
+#     confidence    Confidence level (between 0 and 1)
+#     args          Two or more lists of data
+#
+# Result:
+#     0 if the medians of the groups differ, 1 if they
+#     are the same (accept the null hypothesis)
+#
+proc ::math::statistics::test-Kruskal-Wallis {confidence args} {
+
+    foreach {H p} [eval analyse-Kruskal-Wallis $args] {break}
+
+    expr {$p < 1.0 - $confidence}
+}
+
+# analyse-Kruskal-Wallis --
+#     Perform a one-way analysis of variance according
+#     to Kruskal-Wallis and return the details
+#
+# Arguments:
+#     args          Two or more lists of data
+#
+# Result:
+#     Kruskal-Wallis statistic H and the probability p
+#     that this value occurs if the
+#
+proc ::math::statistics::analyse-Kruskal-Wallis {args} {
+
+    set setCount [llength $args]
+
+    #
+    # Rank the data with respect to the whole set
+    #
+    set rankList [eval group-rank $args]
+
+    set length [llength $rankList]
+
+    #
+    # Re-establish original sets of values, but using the ranks
+    #
+    foreach item $rankList {
+        lappend rankValues([lindex $item 0]) [lindex $item 2]
+    }
+
+    #
+    # Now compute H
+    #
+    set H 0
+    for {set i 0} {$i < $setCount} {incr i} {
+        set total [expr [join $rankValues($i) +]]
+        set count [llength $rankValues($i)]
+        set H [expr {$H + pow($total,2)/double($count)}]
+    }
+    set H [expr {$H*(12.0/($length*($length + 1))) - (3*($length + 1))}]
+    incr setCount -1
+    set p [expr {1 - [::math::statistics::cdf-chisquare $setCount $H]}]
+    return [list $H $p]
+}
+
+# group-rank --
+#     Rank groups of data with respect to the whole set
+#
+# Arguments:
+#     args          Two or more lists of data
+#
+# Result:
+#     List of ranking data: for each data item, the group-ID,
+#     the value and the rank (may be a fraction, in case of ties)
+#
+proc ::math::statistics::group-rank {args} {
+
+    set index 0
+    set rankList [list]
+    set setCount [llength $args]
+    #
+    # Read lists of values
+    #
+    foreach item $args {
+        set values($index) [lindex $args $index]
+        #
+        # Prepare ranking with rank=0
+        #
+        foreach value $values($index) {
+            lappend rankList [list $index $value 0]
+        }
+        incr index 1
+    }
+    #
+    # Sort the values
+    #
+    set rankList [lsort -real -index 1 $rankList]
+    #
+    # Assign the ranks (disregarding ties)
+    #
+    set length [llength $rankList]
+    for {set i 0} {$i < $length} {incr i} {
+        lset rankList $i 2 [expr {$i + 1}]
+    }
+    #
+    # Value of the previous list element
+    #
+    set prevValue {}
+
+    #
+    # List of indices of list elements having the same value (ties)
+    #
+    set equalIndex [list]
+
+    #
+    # Test for ties and re-assign mean ranks for tied values
+    #
+    for {set i 0} {$i < $length} {incr i} {
+        set value [lindex $rankList $i 1]
+        if {($value != $prevValue) && ($i > 0) && ([llength $equalIndex] > 0)} {
+            #
+            # We are still missing the first tied value
+            #
+            set j [lindex $equalIndex 0]
+            incr j -1
+            set equalIndex [linsert $equalIndex 0 $j]
+
+            #
+            # Re-assign rank as mean rank of tied values
+            #
+            set firstRank [lindex $rankList [lindex $equalIndex 0] 2]
+            set lastRank  [lindex $rankList [lindex $equalIndex end] 2]
+            set newRank   [expr {($firstRank+$lastRank)/2.0}]
+            foreach j $equalIndex {
+                lset rankList $j 2 $newRank
+            }
+
+            #
+            # Clear list of equal elements
+            #
+            set equalIndex [list]
+        } elseif {$value == $prevValue} {
+            #
+            # Remember index of equal value element
+            #
+            lappend equalIndex $i
+        }
+        set prevValue $value
+    }
+
+    return $rankList
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/linalg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/linalg.tcl
new file mode 100644
index 00000000..2f8aeb6a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/linalg.tcl
@@ -0,0 +1,2299 @@
+# linalg.tcl --
+#    Linear algebra package, based partly on Hume's LA package,
+#    partly on experiments with various representations of
+#    matrices. Also the functionality of the BLAS library has
+#    been taken into account.
+#
+#    General information:
+#    - The package provides both a high-level general interface and
+#      a lower-level specific interface for various LA functions
+#      and tasks.
+#    - The general procedures perform some checks and then call
+#      the various specific procedures. The general procedures are
+#      aimed at robustness and ease of use.
+#    - The specific procedures do not check anything, they are
+#      designed for speed. Failure to comply to the interface
+#      requirements will presumably lead to [expr] errors.
+#    - Vectors are represented as lists, matrices as lists of
+#      lists, where the rows are the innermost lists:
+#
+#      / a11 a12 a13 \
+#      | a21 a22 a23 | == { {a11 a12 a13} {a21 a22 a23} {a31 a32 a33} }
+#      \ a31 a32 a33 /
+#
+
+package require Tcl 8.5 ; # conforming uses 8.5+ features (`x ni list`).
+
+namespace eval ::math::linearalgebra {
+    # Define the namespace
+    namespace export dim shape conforming symmetric
+    namespace export norm norm_one norm_two norm_max normMatrix
+    namespace export dotproduct unitLengthVector normalizeStat
+    namespace export axpy axpy_vect axpy_mat crossproduct
+    namespace export add add_vect add_mat
+    namespace export sub sub_vect sub_mat
+    namespace export scale scale_vect scale_mat matmul transpose
+    namespace export rotate angle choleski
+    namespace export getrow getcol getelem setrow setcol setelem
+    namespace export mkVector mkMatrix mkIdentity mkDiagonal
+    namespace export mkHilbert mkDingdong mkBorder mkFrank
+    namespace export mkMoler mkWilkinsonW+ mkWilkinsonW-
+    namespace export solveGauss solveTriangular
+    namespace export solveGaussBand solveTriangularBand
+    namespace export solvePGauss
+    namespace export determineSVD eigenvectorsSVD
+    namespace export leastSquaresSVD
+    namespace export orthonormalizeColumns orthonormalizeRows
+    namespace export show to_LA from_LA
+    namespace export swaprows swapcols
+    namespace export dger dgetrf mkRandom mkTriangular
+    namespace export det largesteigen
+}
+
+# dim --
+#     Return the dimension of an object (scalar, vector or matrix)
+# Arguments:
+#     obj        Object like a scalar, vector or matrix
+# Result:
+#     Dimension: 0 for a scalar, 1 for a vector, 2 for a matrix
+#
+proc ::math::linearalgebra::dim { obj } {
+    set shape [shape $obj]
+    if { $shape != 1 } {
+        return [llength [shape $obj]]
+    } else {
+        return 0
+    }
+}
+
+# shape --
+#     Return the shape of an object (scalar, vector or matrix)
+# Arguments:
+#     obj        Object like a scalar, vector or matrix
+# Result:
+#     List of the sizes: 1 for a scalar, number of components
+#     for a vector, number of rows and columns for a matrix
+#
+proc ::math::linearalgebra::shape { obj } {
+    set result [llength $obj]
+    if { [llength [lindex $obj 0]] <= 1 } {
+       return $result
+    } else {
+       lappend result [llength [lindex $obj 0]]
+    }
+    return $result
+}
+
+# show --
+#     Return a string representing the vector or matrix,
+#     for easy printing
+# Arguments:
+#     obj        Object like a scalar, vector or matrix
+#     format     Format to be used (defaults to %6.4f)
+#     rowsep     Separator for rows (defaults to \n)
+#     colsep     Separator for columns (defaults to " ")
+# Result:
+#     String representing the vector or matrix
+#
+proc ::math::linearalgebra::show { obj {format %6.4f} {rowsep \n} {colsep " "} } {
+    set result ""
+    if { [llength [lindex $obj 0]] == 1 } {
+        foreach v $obj {
+            append result "[format $format $v]$rowsep"
+        }
+    } else {
+        foreach row $obj {
+            foreach v $row {
+                append result "[format $format $v]$colsep"
+            }
+            append result $rowsep
+        }
+    }
+    return $result
+}
+
+# conforming --
+#     Determine if two objects (vector or matrix) are conforming
+#     in shape, rows or for a matrix multiplication
+# Arguments:
+#     type       Type of conforming: shape, rows or matmul
+#     obj1       First object (vector or matrix)
+#     obj2       Second object (vector or matrix)
+# Result:
+#     1 if they conform, 0 if not
+#
+proc ::math::linearalgebra::conforming { type obj1 obj2 } {
+    set shape1 [shape $obj1]
+    set shape2 [shape $obj2]
+    set result 0
+
+    if { $type ni {shape rows matmul} } {
+        return -code error "Unknown type of conforming check - $type - should be one of: shape rows matmul"
+    }
+
+    if { $type == "shape" } {
+        set result [expr {[lindex $shape1 0] == [lindex $shape2 0] &&
+                          [lindex $shape1 1] == [lindex $shape2 1]}]
+    }
+    if { $type == "rows" } {
+        set result [expr {[lindex $shape1 0] == [lindex $shape2 0]}]
+    }
+    if { $type == "matmul" } {
+        if { [llength $shape1] == 2 } {
+            set result [expr {[lindex $shape1 1] == [lindex $shape2 0]}]
+        } elseif { [llength $shape2] == 2 } {
+            set result [expr {[lindex $shape1 0] == [lindex $shape2 0]}]
+        } else {
+            set result [expr {[lindex $shape1 0] == [lindex $shape2 0]}]
+        }
+    }
+    return $result
+}
+
+# crossproduct --
+#     Return the "cross product" of two 3D vectors
+# Arguments:
+#     vect1      First vector
+#     vect2      Second vector
+# Result:
+#     Cross product
+#
+proc ::math::linearalgebra::crossproduct { vect1 vect2 } {
+
+    if { [llength $vect1] == 3 && [llength $vect2] == 3 } {
+        foreach {v11 v12 v13} $vect1 {v21 v22 v23} $vect2 {break}
+        return [list \
+            [expr {$v12*$v23 - $v13*$v22}] \
+            [expr {$v13*$v21 - $v11*$v23}] \
+            [expr {$v11*$v22 - $v12*$v21}] ]
+    } else {
+        return -code error "Cross-product only defined for 3D vectors"
+    }
+}
+
+# angle --
+#     Return the "angle" between two vectors (in radians)
+# Arguments:
+#     vect1      First vector
+#     vect2      Second vector
+# Result:
+#     Angle between the two vectors
+#
+proc ::math::linearalgebra::angle { vect1 vect2 } {
+
+    set dp [dotproduct $vect1 $vect2]
+    set n1 [norm_two $vect1]
+    set n2 [norm_two $vect2]
+
+    if { $n1 == 0.0 || $n2 == 0.0 } {
+        return -code error "Angle not defined for null vector"
+    }
+
+    return [expr {acos($dp/$n1/$n2)}]
+}
+
+
+# norm --
+#     Compute the (1-, 2- or Inf-) norm of a vector
+# Arguments:
+#     vector     Vector (list of numbers)
+#     type       Either 1, 2 or max/inf to indicate the type of
+#                norm (default: 2, the euclidean norm)
+# Result:
+#     The (1-, 2- or Inf-) norm of a vector
+# Level-1 BLAS :
+#     if type = 1, corresponds to DASUM
+#     if type = 2, corresponds to DNRM2
+#
+proc ::math::linearalgebra::norm { vector {type 2} } {
+    if { $type == 2 } {
+       return [norm_two $vector]
+    }
+    if { $type == 1 } {
+       return [norm_one $vector]
+    }
+    if { $type == "max" || $type == "inf" } {
+       return [norm_max $vector]
+    }
+    return -code error "Unknown norm: $type"
+}
+
+# norm_one --
+#     Compute the 1-norm of a vector
+# Arguments:
+#     vector     Vector
+# Result:
+#     The 1-norm of a vector
+#
+proc ::math::linearalgebra::norm_one { vector } {
+    set sum 0.0
+    foreach c $vector {
+        set sum [expr {$sum+abs($c)}]
+    }
+    return $sum
+}
+
+# norm_two --
+#     Compute the 2-norm of a vector (euclidean norm)
+# Arguments:
+#     vector     Vector
+# Result:
+#     The 2-norm of a vector
+# Note:
+#     Rely on the function hypot() to make this robust
+#     against overflow and underflow
+#
+proc ::math::linearalgebra::norm_two { vector } {
+    set sum 0.0
+    foreach c $vector {
+        set sum [expr {hypot($c,$sum)}]
+    }
+    return $sum
+}
+
+# norm_max --
+#     Compute the inf-norm of a vector (maximum of its components)
+# Arguments:
+#     vector     Vector
+#     index, optional     if non zero, returns a list made of the maximum
+#                         value and the index where that maximum was found.
+#	                  if zero, returns the maximum value.
+# Result:
+#     The inf-norm of a vector
+# Level-1 BLAS :
+#     if index!=0, corresponds to IDAMAX
+#
+proc ::math::linearalgebra::norm_max { vector {index 0}} {
+    set max [lindex $vector 0]
+    set imax 0
+    set i 0
+    foreach c $vector {
+        if {[expr {abs($c)>$max}]} then {
+          set imax $i
+          set max [expr {abs($c)}]
+        }
+        incr i
+    }
+    if {$index == 0} then {
+      set result $max
+    } else {
+      set result [list $max $imax]
+    }
+    return $result
+}
+
+# normMatrix --
+#     Compute the (1-, 2- or Inf-) norm of a matrix
+# Arguments:
+#     matrix     Matrix (list of row vectors)
+#     type       Either 1, 2 or max/inf to indicate the type of
+#                norm (default: 2, the euclidean norm)
+# Result:
+#     The (1-, 2- or Inf-) norm of the matrix
+#
+proc ::math::linearalgebra::normMatrix { matrix {type 2} } {
+    set v {}
+
+    foreach row $matrix {
+        lappend v [norm $row $type]
+    }
+
+    return [norm $v $type]
+}
+
+# symmetric --
+#     Determine if the matrix is symmetric or not
+# Arguments:
+#     matrix     Matrix (list of row vectors)
+#     eps        Tolerance (defaults to 1.0e-8)
+# Result:
+#     1 if symmetric (within the tolerance), 0 if not
+#
+proc ::math::linearalgebra::symmetric { matrix {eps 1.0e-8} } {
+    set shape [shape $matrix]
+    if { [lindex $shape 0] != [lindex $shape 1] } {
+       return 0
+    }
+
+    set norm_org   [normMatrix $matrix]
+    set norm_asymm [normMatrix [sub $matrix [transpose $matrix]]]
+
+    if { $norm_asymm <= $eps*$norm_org } {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+# dotproduct --
+#     Compute the dot product of two vectors
+# Arguments:
+#     vect1      First vector
+#     vect2      Second vector
+# Result:
+#     The dot product of the two vectors
+# Level-1 BLAS : corresponds to DDOT
+#
+proc ::math::linearalgebra::dotproduct { vect1 vect2 } {
+    if { [llength $vect1] != [llength $vect2] } {
+       return -code error "Vectors must be of equal length"
+    }
+    set sum 0.0
+    foreach c1 $vect1 c2 $vect2 {
+        set sum [expr {$sum + $c1*$c2}]
+    }
+    return $sum
+}
+
+# unitLengthVector --
+#     Normalize a vector so that a length 1 results and return the new vector
+# Arguments:
+#     vector     Vector to be normalized
+# Result:
+#     A vector of length 1
+#
+proc ::math::linearalgebra::unitLengthVector { vector } {
+    set scale [norm_two $vector]
+    if { $scale == 0.0 } {
+        return -code error "Can not normalize a null-vector"
+    }
+    return [scale [expr {1.0/$scale}] $vector]
+}
+
+# normalizeStat --
+#     Normalize a matrix or vector in a statistical sense and return the result
+# Arguments:
+#     mv        Matrix or vector to be normalized
+# Result:
+#     A matrix or vector whose columns are normalised to have a mean of
+#     0 and a standard deviation of 1.
+#
+proc ::math::linearalgebra::normalizeStat { mv } {
+
+    if { [llength [lindex $mv 0]] > 1 } {
+        set result {}
+        foreach vector [transpose $mv] {
+            lappend result [NormalizeStat_vect $vector]
+        }
+        return [transpose $result]
+    } else {
+        return [NormalizeStat_vect $mv]
+    }
+}
+
+# NormalizeStat_vect --
+#     Normalize a vector in a statistical sense and return the result
+# Arguments:
+#     v        Vector to be normalized
+# Result:
+#     A vector whose elements are normalised to have a mean of
+#     0 and a standard deviation of 1. If all coefficients are equal,
+#     a null-vector is returned.
+#
+proc ::math::linearalgebra::NormalizeStat_vect { v } {
+    if { [llength $v] <= 1 } {
+        return -code error "Vector can not be normalised - too few coefficients"
+    }
+
+    set sum   0.0
+    set sum2  0.0
+    set count 0.0
+    foreach c $v {
+        set sum   [expr {$sum   + $c}]
+        set sum2  [expr {$sum2  + $c*$c}]
+        set count [expr {$count + 1.0}]
+    }
+    set corr   [expr {$sum/$count}]
+    set factor [expr {($sum2-$sum*$sum/$count)/($count-1)}]
+    if { $factor > 0.0 } {
+        set factor [expr {1.0/sqrt($factor)}]
+    } else {
+        set factor 0.0
+    }
+    set result {}
+    foreach c $v {
+        lappend result [expr {$factor*($c-$corr)}]
+    }
+    return $result
+}
+
+# axpy --
+#     Compute the sum of a scaled vector/matrix and another
+#     vector/matrix: a*x + y
+# Arguments:
+#     scale      Scale factor (a) for the first vector/matrix
+#     mv1        First vector/matrix (x)
+#     mv2        Second vector/matrix (y)
+# Result:
+#     The result of a*x+y
+# Level-1 BLAS : if mv1 is a vector, corresponds to DAXPY
+#
+proc ::math::linearalgebra::axpy { scale mv1 mv2 } {
+    if { [llength [lindex $mv1 0]] > 1 } {
+        return [axpy_mat $scale $mv1 $mv2]
+    } else {
+        return [axpy_vect $scale $mv1 $mv2]
+    }
+}
+
+# axpy_vect --
+#     Compute the sum of a scaled vector and another vector: a*x + y
+# Arguments:
+#     scale      Scale factor (a) for the first vector
+#     vect1      First vector (x)
+#     vect2      Second vector (y)
+# Result:
+#     The result of a*x+y
+# Level-1 BLAS : corresponds to DAXPY
+#
+proc ::math::linearalgebra::axpy_vect { scale vect1 vect2 } {
+    set result {}
+
+    foreach c1 $vect1 c2 $vect2 {
+        lappend result [expr {$scale*$c1+$c2}]
+    }
+    return $result
+}
+
+# axpy_mat --
+#     Compute the sum of a scaled matrix and another matrix: a*x + y
+# Arguments:
+#     scale      Scale factor (a) for the first matrix
+#     mat1       First matrix (x)
+#     mat2       Second matrix (y)
+# Result:
+#     The result of a*x+y
+#
+proc ::math::linearalgebra::axpy_mat { scale mat1 mat2 } {
+    set result {}
+    foreach row1 $mat1 row2 $mat2 {
+        lappend result [axpy_vect $scale $row1 $row2]
+    }
+    return $result
+}
+
+# add --
+#     Compute the sum of two vectors/matrices
+# Arguments:
+#     mv1        First vector/matrix (x)
+#     mv2        Second vector/matrix (y)
+# Result:
+#     The result of x+y
+#
+proc ::math::linearalgebra::add { mv1 mv2 } {
+    if { [llength [lindex $mv1 0]] > 1 } {
+        return [add_mat $mv1 $mv2]
+    } else {
+        return [add_vect $mv1 $mv2]
+    }
+}
+
+# add_vect --
+#     Compute the sum of two vectors
+# Arguments:
+#     vect1      First vector (x)
+#     vect2      Second vector (y)
+# Result:
+#     The result of x+y
+#
+proc ::math::linearalgebra::add_vect { vect1 vect2 } {
+    set result {}
+    foreach c1 $vect1 c2 $vect2 {
+        lappend result [expr {$c1+$c2}]
+    }
+    return $result
+}
+
+# add_mat --
+#     Compute the sum of two matrices
+# Arguments:
+#     mat1       First matrix (x)
+#     mat2       Second matrix (y)
+# Result:
+#     The result of x+y
+#
+proc ::math::linearalgebra::add_mat { mat1 mat2 } {
+    set result {}
+    foreach row1 $mat1 row2 $mat2 {
+        lappend result [add_vect $row1 $row2]
+    }
+    return $result
+}
+
+# sub --
+#     Compute the difference of two vectors/matrices
+# Arguments:
+#     mv1        First vector/matrix (x)
+#     mv2        Second vector/matrix (y)
+# Result:
+#     The result of x-y
+#
+proc ::math::linearalgebra::sub { mv1 mv2 } {
+    if { [llength [lindex $mv1 0]] > 0 } {
+        return [sub_mat $mv1 $mv2]
+    } else {
+        return [sub_vect $mv1 $mv2]
+    }
+}
+
+# sub_vect --
+#     Compute the difference of two vectors
+# Arguments:
+#     vect1      First vector (x)
+#     vect2      Second vector (y)
+# Result:
+#     The result of x-y
+#
+proc ::math::linearalgebra::sub_vect { vect1 vect2 } {
+    set result {}
+    foreach c1 $vect1 c2 $vect2 {
+        lappend result [expr {$c1-$c2}]
+    }
+    return $result
+}
+
+# sub_mat --
+#     Compute the difference of two matrices
+# Arguments:
+#     mat1       First matrix (x)
+#     mat2       Second matrix (y)
+# Result:
+#     The result of x-y
+#
+proc ::math::linearalgebra::sub_mat { mat1 mat2 } {
+    set result {}
+    foreach row1 $mat1 row2 $mat2 {
+        lappend result [sub_vect $row1 $row2]
+    }
+    return $result
+}
+
+# scale --
+#     Scale a vector or a matrix
+# Arguments:
+#     scale      Scale factor (scalar; a)
+#     mv         Vector/matrix (x)
+# Result:
+#     The result of a*x
+# Level-1 BLAS : if mv is a vector, corresponds to DSCAL
+#
+proc ::math::linearalgebra::scale { scale mv } {
+    if { [llength [lindex $mv 0]] > 1 } {
+        return [scale_mat $scale $mv]
+    } else {
+        return [scale_vect $scale $mv]
+    }
+}
+
+# scale_vect --
+#     Scale a vector
+# Arguments:
+#     scale      Scale factor to apply (a)
+#     vect       Vector to be scaled (x)
+# Result:
+#     The result of a*x
+# Level-1 BLAS : corresponds to DSCAL
+#
+proc ::math::linearalgebra::scale_vect { scale vect } {
+    set result {}
+    foreach c $vect {
+        lappend result [expr {$scale*$c}]
+    }
+    return $result
+}
+
+# scale_mat --
+#     Scale a matrix
+# Arguments:
+#     scale      Scale factor to apply
+#     mat        Matrix to be scaled
+# Result:
+#     The result of x+y
+#
+proc ::math::linearalgebra::scale_mat { scale mat } {
+    set result {}
+    foreach row $mat {
+        lappend result [scale_vect $scale $row]
+    }
+    return $result
+}
+
+# rotate --
+#     Apply a planar rotation to two vectors
+# Arguments:
+#     c          Cosine of the angle
+#     s          Sine of the angle
+#     vect1      First vector (x)
+#     vect2      Second vector (y)
+# Result:
+#     A list of two elements: c*x-s*y and s*x+c*y
+#
+proc ::math::linearalgebra::rotate { c s vect1 vect2 } {
+    set result1 {}
+    set result2 {}
+    foreach v1 $vect1 v2 $vect2 {
+        lappend result1 [expr {$c*$v1-$s*$v2}]
+        lappend result2 [expr {$s*$v1+$c*$v2}]
+    }
+    return [list $result1 $result2]
+}
+
+# transpose --
+#     Transpose a matrix
+# Arguments:
+#     matrix     Matrix to be transposed
+# Result:
+#     The transposed matrix
+# Note:
+#     The second transpose implementation is faster on large
+#     matrices (100x100 say), there is no significant difference
+#     on small ones (10x10 say).
+#
+#
+proc ::math::linearalgebra::transpose_old { matrix } {
+   set row {}
+   set transpose {}
+   foreach c [lindex $matrix 0] {
+      lappend row 0.0
+   }
+   foreach r $matrix {
+      lappend transpose $row
+   }
+
+   set nr 0
+   foreach r $matrix {
+      set nc 0
+      foreach c $r {
+         lset transpose $nc $nr $c
+         incr nc
+      }
+      incr nr
+   }
+   return $transpose
+}
+
+proc ::math::linearalgebra::transpose { matrix } {
+   set transpose {}
+   set c 0
+   foreach col [lindex $matrix 0] {
+       set newrow {}
+       foreach row $matrix {
+           lappend newrow [lindex $row $c]
+       }
+       lappend transpose $newrow
+       incr c
+   }
+   return $transpose
+}
+
+# MorV --
+#     Identify if the object is a row/column vector or a matrix
+# Arguments:
+#     obj        Object to be examined
+# Result:
+#     The letter R, C or M depending on the shape
+#     (just to make it all work fine: S for scalar)
+# Note:
+#     Private procedure to fix a bug in matmul
+#
+proc ::math::linearalgebra::MorV { obj } {
+    if { [llength $obj] > 1 } {
+        if { [llength [lindex $obj 0]] > 1 } {
+            return "M"
+        } else {
+            return "C"
+        }
+    } else {
+        if { [llength [lindex $obj 0]] > 1 } {
+            return "R"
+        } else {
+            return "S"
+        }
+    }
+}
+
+# matmul --
+#     Multiply a vector/matrix with another vector/matrix
+# Arguments:
+#     mv1        First vector/matrix (x)
+#     mv2        Second vector/matrix (y)
+# Result:
+#     The result of x*y
+#
+proc ::math::linearalgebra::matmul_org { mv1 mv2 } {
+    if { [llength [lindex $mv1 0]] > 1 } {
+        if { [llength [lindex $mv2 0]] > 1 } {
+            return [matmul_mm $mv1 $mv2]
+        } else {
+            return [matmul_mv $mv1 $mv2]
+        }
+    } else {
+        if { [llength [lindex $mv2 0]] > 1 } {
+            return [matmul_vm $mv1 $mv2]
+        } else {
+            return [matmul_vv $mv1 $mv2]
+        }
+    }
+}
+
+proc ::math::linearalgebra::matmul { mv1 mv2 } {
+    switch -exact -- "[MorV $mv1][MorV $mv2]" {
+    "MM" {
+         return [matmul_mm $mv1 $mv2]
+    }
+    "MC" {
+         return [matmul_mv $mv1 $mv2]
+    }
+    "MR" {
+         return -code error "Can not multiply a matrix with a row vector - wrong order"
+    }
+    "RM" {
+         return [matmul_vm [transpose $mv1] $mv2]
+    }
+    "RC" {
+         return [dotproduct [transpose $mv1] $mv2]
+    }
+    "RR" {
+         return -code error "Can not multiply a matrix with a row vector - wrong order"
+    }
+    "CM" {
+         return [transpose [matmul_vm $mv1 $mv2]]
+    }
+    "CR" {
+         return [matmul_vv $mv1 [transpose $mv2]]
+    }
+    "CC" {
+         return [matmul_vv $mv1 $mv2]
+    }
+    "SS" {
+        return [expr {$mv1 * $mv2}]
+    }
+    default {
+         return -code error "Can not use a scalar object"
+    }
+    }
+}
+
+# matmul_mv --
+#     Multiply a matrix and a column vector
+# Arguments:
+#     matrix     Matrix (applied left: A)
+#     vector     Vector (interpreted as column vector: x)
+# Result:
+#     The vector A*x
+# Level-2 BLAS : corresponds to DTRMV
+#
+proc ::math::linearalgebra::matmul_mv { matrix vector } {
+   set newvect {}
+   foreach row $matrix {
+      set sum 0.0
+      foreach v $vector c $row {
+         set sum [expr {$sum+$v*$c}]
+      }
+      lappend newvect $sum
+   }
+   return $newvect
+}
+
+# matmul_vm --
+#     Multiply a row vector with a matrix
+# Arguments:
+#     vector     Vector (interpreted as row vector: x)
+#     matrix     Matrix (applied right: A)
+# Result:
+#     The vector xtrans*A = Atrans*x
+#
+proc ::math::linearalgebra::matmul_vm { vector matrix } {
+   return [transpose [matmul_mv [transpose $matrix] $vector]]
+}
+
+# matmul_vv --
+#     Multiply two vectors to obtain a matrix
+# Arguments:
+#     vect1      First vector (column vector, x)
+#     vect2      Second vector (row vector, y)
+# Result:
+#     The "outer product" x*ytrans
+#
+proc ::math::linearalgebra::matmul_vv { vect1 vect2 } {
+   set newmat {}
+   foreach v1 $vect1 {
+      set newrow {}
+      foreach v2 $vect2 {
+         lappend newrow [expr {$v1*$v2}]
+      }
+      lappend newmat $newrow
+   }
+   return $newmat
+}
+
+# matmul_mm --
+#     Multiply two matrices
+# Arguments:
+#     mat1      First matrix (A)
+#     mat2      Second matrix (B)
+# Result:
+#     The matrix product A*B
+# Note:
+#     By transposing matrix B we can access the columns
+#     as rows - much easier and quicker, as they are
+#     the elements of the outermost list.
+# Level-3 BLAS :
+#     corresponds to DGEMM (alpha op(A) op(B) + beta C) when alpha=1, op(X)=X and beta=0
+#     corresponds to DTRMM (alpha op(A) B) when alpha = 1, op(X)=X
+#
+proc ::math::linearalgebra::matmul_mm { mat1 mat2 } {
+   set newmat {}
+   set tmat [transpose $mat2]
+   foreach row1 $mat1 {
+      set newrow {}
+      foreach row2 $tmat {
+         lappend newrow [dotproduct $row1 $row2]
+      }
+      lappend newmat $newrow
+   }
+   return $newmat
+}
+
+# mkVector --
+#     Make a vector of a given size
+# Arguments:
+#     ndim       Dimension of the vector
+#     value      Default value for all elements (default: 0.0)
+# Result:
+#     A list with ndim elements, representing a vector
+#
+proc ::math::linearalgebra::mkVector { ndim {value 0.0} } {
+    set result {}
+
+    while { $ndim > 0 } {
+        lappend result $value
+        incr ndim -1
+    }
+    return $result
+}
+
+# mkUnitVector --
+#     Make a unit vector in a given direction
+# Arguments:
+#     ndim       Dimension of the vector
+#     dir        The direction (0, ... ndim-1)
+# Result:
+#     A list with ndim elements, representing a unit vector
+#
+proc ::math::linearalgebra::mkUnitVector { ndim dir } {
+
+    if { $dir < 0 || $dir >= $ndim } {
+        return -code error "Invalid direction for unit vector - $dir"
+    } else {
+        set result [mkVector $ndim]
+        lset result $dir 1.0
+    }
+    return $result
+}
+
+# mkMatrix --
+#     Make a matrix of a given size
+# Arguments:
+#     nrows      Number of rows
+#     ncols      Number of columns
+#     value      Default value for all elements (default: 0.0)
+# Result:
+#     A nested list, representing an nrows x ncols matrix
+#
+proc ::math::linearalgebra::mkMatrix { nrows ncols {value 0.0} } {
+    set result {}
+
+    while { $nrows > 0 } {
+        lappend result [mkVector $ncols $value]
+        incr nrows -1
+    }
+    return $result
+}
+
+# mkIdent --
+#     Make an identity matrix of a given size
+# Arguments:
+#     size       Number of rows/columns
+# Result:
+#     A nested list, representing an size x size identity matrix
+#
+proc ::math::linearalgebra::mkIdentity { size } {
+    set result [mkMatrix $size $size 0.0]
+
+    while { $size > 0 } {
+        incr size -1
+        lset result $size $size 1.0
+    }
+    return $result
+}
+
+# mkDiagonal --
+#     Make a diagonal matrix of a given size
+# Arguments:
+#     diag       List of values to appear on the diagonal
+#
+# Result:
+#     A nested list, representing a diagonal matrix
+#
+proc ::math::linearalgebra::mkDiagonal { diag } {
+    set size   [llength $diag]
+    set result [mkMatrix $size $size 0.0]
+
+    while { $size > 0 } {
+        incr size -1
+        lset result $size $size [lindex $diag $size]
+    }
+    return $result
+}
+
+# mkHilbert --
+#     Make a Hilbert matrix of a given size
+# Arguments:
+#     size       Size of the matrix
+# Result:
+#     A nested list, representing a Hilbert matrix
+# Notes:
+#     Hilbert matrices are very ill-conditioned wrt
+#     eigenvalue/eigenvector problems. Therefore they
+#     are good candidates for testing the accuracy
+#     of algorithms and implementations.
+#
+proc ::math::linearalgebra::mkHilbert { size } {
+    set result {}
+    for { set j 0 } { $j < $size } { incr j } {
+        set row {}
+        for { set i 0 } { $i < $size } { incr i } {
+            lappend row [expr {1.0/($i+$j+1.0)}]
+        }
+        lappend result $row
+    }
+    return $result
+}
+
+# mkDingdong --
+#     Make a Dingdong matrix of a given size
+# Arguments:
+#     size       Size of the matrix
+# Result:
+#     A nested list, representing a Dingdong matrix
+# Notes:
+#     Dingdong matrices are imprecisely represented,
+#     but have the property of being very stable in
+#     such algorithms as Gauss elimination.
+#
+proc ::math::linearalgebra::mkDingdong { size } {
+    set result {}
+    for { set j 0 } { $j < $size } { incr j } {
+        set row {}
+        for { set i 0 } { $i < $size } { incr i } {
+            lappend row [expr {0.5/($size-$i-$j-0.5)}]
+        }
+        lappend result $row
+    }
+    return $result
+}
+
+# mkOnes --
+#     Make a square matrix consisting of ones
+# Arguments:
+#     size       Number of rows/columns
+# Result:
+#     A nested list, representing a size x size matrix,
+#     filled with 1.0
+#
+proc ::math::linearalgebra::mkOnes { size } {
+    return [mkMatrix $size $size 1.0]
+}
+
+# mkMoler --
+#     Make a Moler matrix
+# Arguments:
+#     size       Size of the matrix
+# Result:
+#     A nested list, representing a Moler matrix
+# Notes:
+#     Moler matrices have a very simple Choleski
+#     decomposition. It has one small eigenvalue
+#     and it can easily upset elimination methods
+#     for systems of linear equations
+#
+proc ::math::linearalgebra::mkMoler { size } {
+    set result {}
+    for { set j 0 } { $j < $size } { incr j } {
+        set row {}
+        for { set i 0 } { $i < $size } { incr i } {
+            if { $i == $j } {
+                lappend row [expr {$i+1}]
+            } else {
+                lappend row [expr {($i>$j?$j:$i)-1.0}]
+            }
+        }
+        lappend result $row
+    }
+    return $result
+}
+
+# mkFrank --
+#     Make a Frank matrix
+# Arguments:
+#     size       Size of the matrix
+# Result:
+#     A nested list, representing a Frank matrix
+#
+proc ::math::linearalgebra::mkFrank { size } {
+    set result {}
+    for { set j 0 } { $j < $size } { incr j } {
+        set row {}
+        for { set i 0 } { $i < $size } { incr i } {
+            lappend row [expr {($i>$j?$j:$i)-2.0}]
+        }
+        lappend result $row
+    }
+    return $result
+}
+
+# mkBorder --
+#     Make a bordered matrix
+# Arguments:
+#     size       Size of the matrix
+# Result:
+#     A nested list, representing a bordered matrix
+# Note:
+#     This matrix has size-2 eigenvalues at 1.
+#
+proc ::math::linearalgebra::mkBorder { size } {
+    set result {}
+    for { set j 0 } { $j < $size } { incr j } {
+        set row {}
+        for { set i 0 } { $i < $size } { incr i } {
+            set entry 0.0
+            if { $i == $j } {
+                set entry 1.0
+            } elseif { $j != $size-1 && $i == $size-1 } {
+                set entry [expr {pow(2.0,-$j)}]
+            } elseif { $i != $size-1 && $j == $size-1 } {
+                set entry [expr {pow(2.0,-$i)}]
+            } else {
+                set entry 0.0
+            }
+            lappend row $entry
+        }
+        lappend result $row
+    }
+    return $result
+}
+
+# mkWilkinsonW+ --
+#     Make a Wilkinson W+ matrix
+# Arguments:
+#     size       Size of the matrix
+# Result:
+#     A nested list, representing a Wilkinson W+ matrix
+# Note:
+#     This kind of matrix has pairs of eigenvalues that
+#     are very close together. Usually the order is odd.
+#
+proc ::math::linearalgebra::mkWilkinsonW+ { size } {
+    set result {}
+    for { set j 0 } { $j < $size } { incr j } {
+        set row {}
+        for { set i 0 } { $i < $size } { incr i } {
+            if { $i == $j } {
+                # int(n/2) + 1 - min(i,n-i+1)
+                set min   [expr {(($i+1)>$size-($i+1)+1? $size-($i+1)+1 : ($i+1))}]
+                set entry [expr {int($size/2) + 1 - $min}]
+            } elseif { $i == $j+1 || $i+1 == $j } {
+                set entry 1
+            } else {
+                set entry 0.0
+            }
+            lappend row $entry
+        }
+        lappend result $row
+    }
+    return $result
+}
+
+# mkWilkinsonW- --
+#     Make a Wilkinson W- matrix
+# Arguments:
+#     size       Size of the matrix
+# Result:
+#     A nested list, representing a Wilkinson W- matrix
+# Note:
+#     This kind of matrix has pairs of eigenvalues with
+#     opposite signs (if the order is odd).
+#
+proc ::math::linearalgebra::mkWilkinsonW- { size } {
+    set result {}
+    for { set j 0 } { $j < $size } { incr j } {
+        set row {}
+        for { set i 0 } { $i < $size } { incr i } {
+            if { $i == $j } {
+                set entry [expr {int($size/2) + 1 - ($i+1)}]
+            } elseif { $i == $j+1 || $i+1 == $j } {
+                set entry 1
+            } else {
+                set entry 0.0
+            }
+            lappend row $entry
+        }
+        lappend result $row
+    }
+    return $result
+}
+# mkRandom --
+#     Make a square matrix consisting of random numbers
+# Arguments:
+#     size       Number of rows/columns
+# Result:
+#     A nested list, representing a size x size matrix,
+#     filled with random numbers
+#
+proc ::math::linearalgebra::mkRandom { size } {
+    set result {}
+    for { set j 0 } { $j < $size } { incr j } {
+        set row {}
+        for { set i 0 } { $i < $size } { incr i } {
+            lappend row [expr {rand()}]
+        }
+        lappend result $row
+    }
+    return $result
+}
+# mkTriangular --
+#     Make a triangular matrix consisting of a constant
+# Arguments:
+#     size       Number of rows/columns
+#     uplo       U if the matrix is upper triangular (default), L if the
+#                matrix is lower triangular.
+#     value      Default value for all elements (default: 0.0)
+# Result:
+#     A nested list, representing a size x size matrix,
+#     filled with random numbers
+#
+proc ::math::linearalgebra::mkTriangular { size {uplo "U"} {value 1.0}} {
+    switch -- $uplo {
+        "U" {
+            set result {}
+            for { set j 0 } { $j < $size } { incr j } {
+                set row {}
+                for { set i 0 } { $i < $size } { incr i } {
+                    if {$i<$j} then {
+                        lappend row 0.
+                    } else {
+                        lappend row $value
+                    }
+                }
+                lappend result $row
+            }
+        }
+        "L" {
+            set result {}
+            for { set j 0 } { $j < $size } { incr j } {
+                set row {}
+                for { set i 0 } { $i < $size } { incr i } {
+                    if {$i>$j} then {
+                        lappend row 0.
+                    } else {
+                        lappend row $value
+                    }
+                }
+                lappend result $row
+            }
+        }
+        default {
+            error "Unknown value for parameter uplo : $uplo"
+        }
+    }
+    return $result
+}
+
+# getrow --
+#     Get the specified row from a matrix
+# Arguments:
+#     matrix     Matrix in question
+#     row        Index of the row
+#     imin       Minimum index of the column (default 0)
+#     imax       Maximum index of the column (default ncols-1)
+#
+# Result:
+#     A list with the values on the requested row
+#
+proc ::math::linearalgebra::getrow { matrix row {imin 0} {imax ""}} {
+    if {$imax==""} then {
+        foreach {nrows ncols} [shape $matrix] {break}
+        if {$ncols==""} then {
+            # the matrix is a vector
+            set imax 0
+        } else {
+            set imax [expr {$ncols - 1}]
+        }
+    }
+    set row [lindex $matrix $row]
+    return [lrange $row $imin $imax]
+}
+
+# setrow --
+#     Set the specified row in a matrix
+# Arguments:
+#     matrix     _Name_ of matrix in question
+#     row        Index of the row
+#     newvalues  New values for the row
+#     imin       Minimum column index (default 0)
+#     imax       Maximum column index (default ncols-1)
+#
+# Result:
+#     Updated matrix
+# Side effect:
+#     The matrix is updated
+#
+proc ::math::linearalgebra::setrow { matrix row newvalues {imin 0} {imax ""}} {
+    upvar $matrix mat
+    if {$imax==""} then {
+        foreach {nrows ncols} [shape $mat] {break}
+        if {$ncols==""} then {
+            # the matrix is a vector
+            set imax 0
+        } else {
+            set imax [expr {$ncols - 1}]
+        }
+    }
+    set icol $imin
+    foreach value $newvalues {
+        lset mat $row $icol $value
+        incr icol
+        if {$icol>$imax} then {
+            break
+        }
+    }
+    return $mat
+}
+
+# getcol --
+#     Get the specified column from a matrix
+# Arguments:
+#     matrix     Matrix in question
+#     col        Index of the column
+#     imin       Minimum row index (default 0)
+#     imax       Minimum row index (default nrows-1)
+#
+# Result:
+#     A list with the values on the requested column
+#
+proc ::math::linearalgebra::getcol { matrix col {imin 0} {imax ""}} {
+    if {$imax==""} then {
+        set nrows [llength $matrix]
+        set imax [expr {$nrows - 1}]
+    }
+    set result {}
+    set iline 0
+    foreach row $matrix {
+        if {$iline>=$imin && $iline<=$imax} then {
+            lappend result [lindex $row $col]
+        }
+        incr iline
+    }
+    return $result
+}
+
+# setcol --
+#     Set the specified column in a matrix
+# Arguments:
+#     matrix     _Name_ of matrix in question
+#     col        Index of the column
+#     newvalues  New values for the column
+#     imin       Minimum row index (default 0)
+#     imax       Minimum row index (default nrows-1)
+#
+# Result:
+#     Updated matrix
+# Side effect:
+#     The matrix is updated
+#
+proc ::math::linearalgebra::setcol { matrix col newvalues  {imin 0} {imax ""}} {
+    upvar $matrix mat
+    if {$imax==""} then {
+        set nrows [llength $mat]
+        set imax [expr {$nrows - 1}]
+    }
+    set index 0
+    for { set i $imin } { $i <= $imax } { incr i } {
+        lset mat $i $col [lindex $newvalues $index]
+        incr index
+    }
+    return $mat
+}
+
+# getelem --
+#     Get the specified element (row,column) from a matrix/vector
+# Arguments:
+#     matrix     Matrix in question
+#     row        Index of the row
+#     col        Index of the column (not present for vectors)
+#
+# Result:
+#     The matrix element (row,column)
+#
+proc ::math::linearalgebra::getelem { matrix row {col {}} } {
+    if { $col != {} } {
+        lindex $matrix $row $col
+    } else {
+        lindex $matrix $row
+    }
+}
+
+# setelem --
+#     Set the specified element (row,column) in a matrix or vector
+# Arguments:
+#     matrix     _Name_ of matrix/vector in question
+#     row        Index of the row
+#     col        Index of the column/new value
+#     newvalue   New value  for the element (not present for vectors)
+#
+# Result:
+#     Updated matrix
+# Side effect:
+#     The matrix is updated
+#
+proc ::math::linearalgebra::setelem { matrix row col {newvalue {}} } {
+    upvar $matrix mat
+    if { $newvalue != {} } {
+        lset mat $row $col $newvalue
+    } else {
+        lset mat $row $col
+    }
+    return $mat
+}
+# swaprows --
+#     Swap two rows of a matrix
+# Arguments:
+#     matrix     Matrix defining the coefficients
+#     irow1      Index of first row
+#     irow2      Index of second row
+#     imin       Minimum column index (default 0)
+#     imax       Maximum column index (default ncols-1)
+#
+# Result:
+#     The matrix with the two rows swaped.
+#
+proc ::math::linearalgebra::swaprows { matrix irow1 irow2 {imin 0} {imax ""}} {
+    upvar $matrix mat
+    #swaprows1 mat $irow1 $irow2 $imin $imax
+    swaprows2 mat $irow1 $irow2 $imin $imax
+}
+proc ::math::linearalgebra::swaprows1 { matrix irow1 irow2 {imin 0} {imax ""}} {
+    upvar $matrix mat
+    if {$imax==""} then {
+        foreach {nrows ncols} [shape $mat] {break}
+        if {$ncols==""} then {
+            # the matrix is a vector
+            set imax 0
+        } else {
+            set imax [expr {$ncols - 1}]
+        }
+    }
+    set row1 [getrow $mat $irow1 $imin $imax]
+    set row2 [getrow $mat $irow2 $imin $imax]
+    setrow mat $irow1 $row2 $imin $imax
+    setrow mat $irow2 $row1 $imin $imax
+    return $mat
+}
+proc ::math::linearalgebra::swaprows2 { matrix irow1 irow2 {imin 0} {imax ""}} {
+    upvar $matrix mat
+    if {$imax==""} then {
+        foreach {nrows ncols} [shape $mat] {break}
+        if {$ncols==""} then {
+            # the matrix is a vector
+            set imax 0
+        } else {
+            set imax [expr {$ncols - 1}]
+        }
+    }
+    set row1 [lrange [lindex $mat $irow1] $imin $imax]
+    set row2 [lrange [lindex $mat $irow2] $imin $imax]
+    setrow mat $irow1 $row2 $imin $imax
+    setrow mat $irow2 $row1 $imin $imax
+    return $mat
+}
+# swapcols --
+#     Swap two cols of a matrix
+# Arguments:
+#     matrix     Matrix defining the coefficients
+#     icol1      Index of first column
+#     icol2      Index of second column
+#     imin       Minimum row index (default 0)
+#     imax       Minimum row index (default nrows-1)
+#
+# Result:
+#     The matrix with the two columns swaped.
+#
+proc ::math::linearalgebra::swapcols { matrix icol1 icol2 {imin 0} {imax ""}} {
+    upvar $matrix mat
+    if {$imax==""} then {
+        set nrows [llength $mat]
+        set imax [expr {$nrows - 1}]
+    }
+    set col1 [getcol $mat $icol1 $imin $imax]
+    set col2 [getcol $mat $icol2 $imin $imax]
+    setcol mat $icol1 $col2 $imin $imax
+    setcol mat $icol2 $col1 $imin $imax
+    return $mat
+}
+
+# solveGauss --
+#     Solve a system of linear equations using Gauss elimination
+# Arguments:
+#     matrix     Matrix defining the coefficients
+#     bvect      Right-hand side (may be several columns)
+#
+# Result:
+#     Solution of the system or an error in case of singularity
+# LAPACK : corresponds to DGETRS, without row interchanges
+#
+proc ::math::linearalgebra::solveGauss { matrix bvect } {
+    set norows [llength $matrix]
+    set nocols $norows
+
+    for { set i 0 } { $i < $nocols } { incr i } {
+        set sweep_row   [getrow $matrix $i]
+        set bvect_sweep [getrow $bvect  $i]
+        # No pivoting yet
+        set sweep_fact  [expr {double([lindex $sweep_row $i])}]
+        for { set j [expr {$i+1}] } { $j < $norows } { incr j } {
+            set current_row   [getrow $matrix $j]
+            set bvect_current [getrow $bvect  $j]
+            set factor      [expr {-[lindex $current_row $i]/$sweep_fact}]
+
+            lset matrix $j [axpy_vect $factor $sweep_row   $current_row]
+            lset bvect  $j [axpy_vect $factor $bvect_sweep $bvect_current]
+        }
+    }
+
+    return [solveTriangular $matrix $bvect]
+}
+# solvePGauss --
+#     Solve a system of linear equations using Gauss elimination
+#     with partial pivoting
+# Arguments:
+#     matrix     Matrix defining the coefficients
+#     bvect      Right-hand side (may be several columns)
+#
+# Result:
+#     Solution of the system or an error in case of singularity
+# LAPACK : corresponds to DGETRS
+#
+proc ::math::linearalgebra::solvePGauss { matrix bvect } {
+
+    set ipiv [dgetrf matrix]
+    set norows [llength $matrix]
+    set nm1 [expr {$norows - 1}]
+
+    # Perform all permutations on b
+    for { set k 0 } { $k < $nm1 } { incr k } {
+        # Swap b(k) and b(mu) with mu = P(k)
+        set tmp [lindex $bvect $k]
+        set mu [lindex $ipiv $k]
+        setrow bvect $k [lindex $bvect $mu]
+        setrow bvect $mu $tmp
+    }
+
+    # Perform forward substitution
+    for { set k 0 } { $k < $nm1 } { incr k } {
+        set bk [lindex $bvect $k]
+        # Substitution
+        for { set iline [expr {$k+1}] } { $iline < $norows } { incr iline } {
+            set aik [lindex $matrix $iline $k]
+            set maik [expr {-1. * $aik}]
+            set bi [lindex $bvect $iline]
+            setrow bvect $iline [axpy $maik $bk $bi]
+        }
+    }
+
+    # Perform backward substitution
+    return [solveTriangular $matrix $bvect]
+}
+
+# solveTriangular --
+#     Solve a system of linear equations where the matrix is
+#     upper-triangular
+# Arguments:
+#     matrix     Matrix defining the coefficients
+#     bvect      Right-hand side (may be several columns)
+#     uplo       U if the matrix is upper triangular (default), L if the
+#                matrix is lower triangular.
+#
+# Result:
+#     Solution of the system or an error in case of singularity
+# LAPACK : corresponds to DTPTRS, but in the current command, the matrix
+#          is in regular format (unpacked).
+#
+proc ::math::linearalgebra::solveTriangular { matrix bvect {uplo "U"}} {
+    set norows [llength $matrix]
+    set nocols $norows
+
+    switch -- $uplo {
+        "U" {
+            for { set i [expr {$norows-1}] } { $i >= 0 } { incr i -1 } {
+                set sweep_row   [getrow $matrix $i]
+                set bvect_sweep [getrow $bvect  $i]
+                set sweep_fact  [expr {double([lindex $sweep_row $i])}]
+                set norm_fact   [expr {1.0/$sweep_fact}]
+
+                lset bvect $i [scale $norm_fact $bvect_sweep]
+
+                for { set j [expr {$i-1}] } { $j >= 0 } { incr j -1 } {
+                    set current_row   [getrow $matrix $j]
+                    set bvect_current [getrow $bvect  $j]
+                    set factor     [expr {-[lindex $current_row $i]/$sweep_fact}]
+
+                    lset bvect  $j [axpy_vect $factor $bvect_sweep $bvect_current]
+                }
+            }
+        }
+        "L" {
+            for { set i 0 } { $i < $norows } { incr i } {
+                set sweep_row   [getrow $matrix $i]
+                set bvect_sweep [getrow $bvect  $i]
+                set sweep_fact  [expr {double([lindex $sweep_row $i])}]
+                set norm_fact   [expr {1.0/$sweep_fact}]
+
+                lset bvect $i [scale $norm_fact $bvect_sweep]
+
+                for { set j 0 } { $j < $i } { incr j } {
+                set bvect_current [getrow $bvect  $i]
+                    set bvect_sweep [getrow $bvect  $j]
+                    set factor [lindex $sweep_row $j]
+                    set factor [expr { -1. * $factor * $norm_fact }]
+                    lset bvect  $i [axpy_vect $factor $bvect_sweep $bvect_current]
+                }
+            }
+        }
+        default {
+            error "Unknown value for parameter uplo : $uplo"
+        }
+    }
+    return $bvect
+}
+
+# solveGaussBand --
+#     Solve a system of linear equations using Gauss elimination,
+#     where the matrix is stored as a band matrix.
+# Arguments:
+#     matrix     Matrix defining the coefficients (in band form)
+#     bvect      Right-hand side (may be several columns)
+#
+# Result:
+#     Solution of the system or an error in case of singularity
+#
+proc ::math::linearalgebra::solveGaussBand { matrix bvect } {
+    set norows   [llength $matrix]
+    set nocols   $norows
+    set nodiags  [llength [lindex $matrix 0]]
+    set lowdiags [expr {($nodiags-1)/2}]
+
+    for { set i 0 } { $i < $nocols } { incr i } {
+        set sweep_row   [getrow $matrix $i]
+        set bvect_sweep [getrow $bvect  $i]
+
+        set sweep_fact [lindex $sweep_row [expr {$lowdiags-$i}]]
+
+        for { set j [expr {$i+1}] } { $j <= $lowdiags } { incr j } {
+            set sweep_row     [concat [lrange $sweep_row 1 end] 0.0]
+            set current_row   [getrow $matrix $j]
+            set bvect_current [getrow $bvect  $j]
+            set factor      [expr {-[lindex $current_row $i]/$sweep_fact}]
+
+            lset matrix $j [axpy_vect $factor $sweep_row   $current_row]
+            lset bvect  $j [axpy_vect $factor $bvect_sweep $bvect_current]
+        }
+    }
+
+    return [solveTriangularBand $matrix $bvect]
+}
+
+# solveTriangularBand --
+#     Solve a system of linear equations where the matrix is
+#     upper-triangular (stored as a band matrix)
+# Arguments:
+#     matrix     Matrix defining the coefficients (in band form)
+#     bvect      Right-hand side (may be several columns)
+#
+# Result:
+#     Solution of the system or an error in case of singularity
+#
+proc ::math::linearalgebra::solveTriangularBand { matrix bvect } {
+    set norows   [llength $matrix]
+    set nocols   $norows
+    set nodiags  [llength [lindex $matrix 0]]
+    set uppdiags [expr {($nodiags-1)/2}]
+    set middle   [expr {($nodiags-1)/2}]
+
+    for { set i [expr {$norows-1}] } { $i >= 0 } { incr i -1 } {
+        set sweep_row   [getrow $matrix $i]
+        set bvect_sweep [getrow $bvect  $i]
+        set sweep_fact  [lindex $sweep_row $middle]
+        set norm_fact   [expr {1.0/$sweep_fact}]
+
+        lset bvect $i [scale $norm_fact $bvect_sweep]
+
+        for { set j [expr {$i-1}] } { $j >= $i-$middle && $j >= 0 } \
+                { incr j -1 } {
+            set current_row   [getrow $matrix $j]
+            set bvect_current [getrow $bvect  $j]
+            set k             [expr {$i-$middle}]
+            set factor     [expr {-[lindex $current_row $k]/$sweep_fact}]
+
+            lset bvect  $j [axpy_vect $factor $bvect_sweep $bvect_current]
+        }
+    }
+
+    return $bvect
+}
+
+# determineSVD --
+#     Determine the singular value decomposition of a matrix
+# Arguments:
+#     A          Matrix to be examined
+#     epsilon    Tolerance for the procedure (defaults to 2.3e-16)
+#
+# Result:
+#     List of the three elements U, S and V, where:
+#     U, V orthogonal matrices, S a diagonal matrix (here a vector)
+#     such that A = USVt
+# Note:
+#     This is taken directly from Hume's LA package, and adjusted
+#     to fit the different matrix format. Also changes are applied
+#     that can be found in the second edition of Nash's book
+#     "Compact numerical methods for computers"
+#
+#     To be done: transpose the algorithm so that we can work
+#     on rows, rather than columns
+#
+proc ::math::linearalgebra::determineSVD { A {epsilon 2.3e-16} } {
+    foreach {m n} [shape $A] {break}
+    set tolerance [expr {$epsilon * $epsilon* $m * $n}]
+    set V [mkIdentity $n]
+
+    #
+    # Top of the iteration
+    #
+    set count 1
+    for {set isweep 0} {$isweep < 30 && $count > 0} {incr isweep} {
+        set count [expr {$n*($n-1)/2}] ;# count of rotations in a sweep
+        for {set j 0} {$j < [expr {$n-1}]} {incr j} {
+            for {set k [expr {$j+1}]} {$k < $n} {incr k} {
+                set p [set q [set r 0.0]]
+                for {set i 0} {$i < $m} {incr i} {
+                    set Aij [lindex $A $i $j]
+                    set Aik [lindex $A $i $k]
+                    set p [expr {$p + $Aij*$Aik}]
+                    set q [expr {$q + $Aij*$Aij}]
+                    set r [expr {$r + $Aik*$Aik}]
+                }
+                if { $q < $r } {
+                    set c 0.0
+                    set s 1.0
+                } elseif { $q * $r == 0.0 } {
+                    # Underflow of small elements
+                    incr count -1
+                    continue
+                } elseif { ($p*$p)/($q*$r) < $tolerance } {
+                    # Cols j,k are orthogonal
+                    incr count -1
+                    continue
+                } else {
+                    set q [expr {$q-$r}]
+                    set v [expr {sqrt(4.0*$p*$p + $q*$q)}]
+                    set c [expr {sqrt(($v+$q)/(2.0*$v))}]
+                    set s [expr {-$p/($v*$c)}]
+                    # s == sine of rotation angle, c == cosine
+                    # Note: -s in comparison with original LA!
+                }
+                #
+                # Rotation of A
+                #
+                set colj [getcol $A $j]
+                set colk [getcol $A $k]
+                foreach {colj colk} [rotate $c $s $colj $colk] {break}
+                setcol A $j $colj
+                setcol A $k $colk
+                #
+                # Rotation of V
+                #
+                set colj [getcol $V $j]
+                set colk [getcol $V $k]
+                foreach {colj colk} [rotate $c $s $colj $colk] {break}
+                setcol V $j $colj
+                setcol V $k $colk
+            } ;#k
+        } ;# j
+        #puts "pass=$isweep skipped rotations=$count"
+    } ;# isweep
+
+    set S {}
+    for {set j 0} {$j < $n} {incr j} {
+        set q [norm_two [getcol $A $j]]
+        lappend S $q
+        if { $q >= $tolerance } {
+            set newcol [scale [expr {1.0/$q}] [getcol $A $j]]
+            setcol A $j $newcol
+        }
+    } ;# j
+
+    #
+    # Prepare the output
+    #
+    set U $A
+
+    if { $m < $n } {
+        set U {}
+        incr m -1
+        foreach row $A {
+            lappend U [lrange $row 0 $m]
+        }
+        #puts $U
+    }
+    return [list $U $S $V]
+}
+
+# eigenvectorsSVD --
+#     Determine the eigenvectors and eigenvalues of a real
+#     symmetric matrix via the SVD
+# Arguments:
+#     A          Matrix to be examined
+#     eps        Tolerance for the procedure (defaults to 2.3e-16)
+#
+# Result:
+#     List of the matrix of eigenvectors and the vector of corresponding
+#     eigenvalues
+# Note:
+#     This is taken directly from Hume's LA package, and adjusted
+#     to fit the different matrix format. Also changes are applied
+#     that can be found in the second edition of Nash's book
+#     "Compact numerical methods for computers"
+#
+proc ::math::linearalgebra::eigenvectorsSVD { A {eps 2.3e-16} } {
+    foreach {m n} [shape $A] {break}
+    if { $m != $n } {
+       return -code error "Expected a square matrix"
+    }
+
+    #
+    # Determine the shift h so that the matrix A+hI is positive
+    # definite (the Gershgorin region)
+    #
+    set h {}
+    set i 0
+    foreach row $A {
+        set aii [lindex $row $i]
+        set sum [expr {$aii + abs($aii) - [norm_one $row]}]
+        incr i
+
+        if { $h == {} || $sum < $h } {
+            set h $sum
+        }
+    }
+    if { $h <= $eps } {
+        set h [expr {$h - sqrt($eps)}]
+        # try to make smallest eigenvalue positive and not too small
+        set A [sub $A [scale_mat $h [mkIdentity $m]]]
+    } else {
+        set h 0.0
+    }
+
+    #
+    # Determine the SVD decomposition: this holds the
+    # eigenvectors and eigenvalues
+    #
+    foreach {U S V} [determineSVD $A $eps] {break}
+
+    #
+    # Rescale and flip signs if all negative or zero
+    #
+    for {set j 0} {$j < $n} {incr j} {
+        set s 0.0
+        set notpositive 0
+        for {set i 0} {$i < $n} {incr i} {
+            set Uij [lindex $U $i $j]
+            if { $Uij <= 0.0 } {
+               incr notpositive
+            }
+            set s [expr {$s + $Uij*$Uij}]
+        }
+        set s [expr {sqrt($s)}]
+        if { $notpositive == $n } {
+            set sf [expr {-$s}]
+        } else {
+            set sf $s
+        }
+        set colv [getcol $U $j]
+        setcol U $j [scale_vect [expr {1.0/$sf}] $colv]
+    }
+    for {set j 0} {$j < $n} {incr j} {
+        lset S $j [expr {[lindex $S $j] + $h}]
+    }
+    return [list $U $S]
+}
+
+# leastSquaresSVD --
+#     Determine the solution to the least-squares problem Ax ~ y
+#     via the singular value decomposition
+# Arguments:
+#     A          Matrix to be examined
+#     y          Dependent variable
+#     qmin       Minimum singular value to be considered (defaults to 0)
+#     epsilon    Tolerance for the procedure (defaults to 2.3e-16)
+#
+# Result:
+#     Vector x as the solution of the least-squares problem
+#
+proc ::math::linearalgebra::leastSquaresSVD { A y {qmin 0.0} {epsilon 2.3e-16} } {
+
+    foreach {m n} [shape $A] {break}
+    foreach {U S V} [determineSVD $A $epsilon] {break}
+
+    set tol [expr {$epsilon * $epsilon * $n * $n}]
+    #
+    # form Utrans*y into g
+    #
+    set g {}
+    for {set j 0} {$j < $n} {incr j} {
+        set s 0.0
+        for {set i 0} {$i < $m} {incr i} {
+            set Uij [lindex $U $i $j]
+            set yi  [lindex $y $i]
+            set s [expr {$s + $Uij*$yi}]
+        }
+        lappend g $s ;# g[j] = $s
+    }
+
+    #
+    # form VS+g = VS+Utrans*g
+    #
+    set x {}
+    for {set j 0} {$j < $n} {incr j} {
+        set s 0.0
+        for {set i 0} {$i < $n} {incr i} {
+            set zi [lindex $S $i]
+            if { $zi > $qmin } {
+                set Vji [lindex $V $j $i]
+                set gi  [lindex $g $i]
+                set s   [expr {$s + $Vji*$gi/$zi}]
+            }
+        }
+        lappend x $s
+    }
+    return $x
+}
+
+# choleski --
+#     Determine the Choleski decomposition of a symmetric,
+#     positive-semidefinite matrix (this condition is not checked!)
+#
+# Arguments:
+#     matrix     Matrix to be treated
+#
+# Result:
+#     Lower-triangular matrix (L) representing the Choleski decomposition:
+#        L Lt = matrix
+#
+proc ::math::linearalgebra::choleski { matrix } {
+    foreach {rows cols} [shape $matrix] {break}
+
+    set result $matrix
+
+    for { set j 0 } { $j < $cols } { incr j } {
+        if { $j > 0 } {
+            for { set i $j } { $i < $cols } { incr i } {
+                set sum [lindex $result $i $j]
+                for { set k 0 } { $k <= $j-1 } { incr k } {
+                    set Aki [lindex $result $i $k]
+                    set Akj [lindex $result $j $k]
+                    set sum [expr {$sum-$Aki*$Akj}]
+                }
+                lset result $i $j $sum
+            }
+        }
+
+        #
+        # Take care of a singular matrix
+        #
+        if { [lindex $result $j $j] <= 0.0 } {
+            lset result $j $j 0.0
+        }
+
+        #
+        # Scale the column
+        #
+        set s [expr {sqrt([lindex $result $j $j])}]
+        for { set i 0 } { $i < $cols } { incr i } {
+            if { $i >= $j } {
+                if { $s == 0.0 } {
+                    lset result $i $j 0.0
+                } else {
+                    lset result $i $j [expr {[lindex $result $i $j]/$s}]
+                }
+            } else {
+                lset result $i $j 0.0
+            }
+        }
+    }
+
+    return $result
+}
+
+# orthonormalizeColumns --
+#     Orthonormalize the columns of a matrix, using the modified
+#     Gram-Schmidt method
+# Arguments:
+#     matrix     Matrix to be treated
+#
+# Result:
+#     Matrix with pairwise orthogonal columns, each having length 1
+#
+proc ::math::linearalgebra::orthonormalizeColumns { matrix } {
+    transpose [orthonormalizeRows [transpose $matrix]]
+}
+
+# orthonormalizeRows --
+#     Orthonormalize the rows of a matrix, using the modified
+#     Gram-Schmidt method
+# Arguments:
+#     matrix     Matrix to be treated
+#
+# Result:
+#     Matrix with pairwise orthogonal rows, each having length 1
+#
+proc ::math::linearalgebra::orthonormalizeRows { matrix } {
+    set result $matrix
+    set rowno  0
+    foreach r $matrix {
+        set newrow [unitLengthVector [getrow $result $rowno]]
+        setrow result $rowno $newrow
+        incr rowno
+        set  rowno2 $rowno
+
+        #
+        # Update the matrix immediately: this is numerically
+        # more stable
+        #
+        foreach nextrow [lrange $result $rowno end] {
+            set factor  [dotproduct $newrow $nextrow]
+            set nextrow [sub_vect $nextrow [scale_vect $factor $newrow]]
+            setrow result $rowno2 $nextrow
+            incr rowno2
+        }
+    }
+    return $result
+}
+
+# dger --
+#     Performs the rank 1 operation alpha*x*y' + A
+# Arguments:
+#     matrix     name of the matrix to process (the matrix must be square)
+#     alpha      a real value
+#     x          a vector
+#     y          a vector
+#     scope      if not provided, the operation is performed on all rows/columns of A
+#                if provided, it is expected to be the list [list imin imax jmin jmax]
+#                where :
+#                imin       Minimum  row index
+#                imax       Maximum  row index
+#                jmin       Minimum  column index
+#                jmax       Maximum  column index
+#
+# Result:
+#     Updated matrix
+# Level-3 BLAS : corresponds to DGER
+#
+proc ::math::linearalgebra::dger { matrix alpha x y {scope ""}} {
+    upvar $matrix mat
+    set nrows [llength $mat]
+    set ncols $nrows
+    if {$scope==""} then {
+        set imin 0
+        set imax [expr {$nrows - 1}]
+        set jmin 0
+        set jmax [expr {$ncols - 1}]
+    } else {
+        foreach {imin imax jmin jmax} $scope {break}
+    }
+    set xy [matmul $x $y]
+    set alphaxy [scale $alpha $xy]
+    for { set iline $imin } { $iline <= $imax } { incr iline } {
+        set ilineshift [expr {$iline - $imin}]
+        set matiline [lindex $mat $iline]
+        set alphailine [lindex $alphaxy $ilineshift]
+        for { set icol $jmin } { $icol <= $jmax } { incr icol } {
+            set icolshift [expr {$icol - $jmin}]
+            set aij [lindex $matiline $icol]
+            set shift [lindex $alphailine $icolshift]
+            setelem mat $iline $icol [expr {$aij + $shift}]
+        }
+    }
+    return $mat
+}
+# dgetrf --
+#     Computes an LU factorization of a general matrix, using partial,
+#     pivoting with row interchanges.
+#
+# Arguments:
+#     matrix     On entry, the matrix to be factored.
+#                On exit, the factors L and U from the factorization
+#                P*A = L*U; the unit diagonal elements of L are not stored.
+#
+# Result:
+#     Returns the permutation vector, as a list of length n-1.
+#     The last entry of the permutation is not stored, since it is
+#     implicitely known, with value n (the last row is not swapped
+#     with any other row).
+#     At index #i of the permutation is stored the index of the row #j
+#     which is swapped with row #i at step #i. That means that each
+#     index of the permutation gives the permutation at each step, not the
+#     cumulated permutation matrix, which is the product of permutations.
+#     The factorization has the form
+#        P * A = L * U
+#     where P is a permutation matrix, L is lower triangular with unit
+#     diagonal elements, and U is upper triangular.
+#
+# LAPACK : corresponds to DGETRF
+#
+proc ::math::linearalgebra::dgetrf { matrix } {
+    upvar $matrix mat
+    set norows [llength $mat]
+    set nocols $norows
+
+    # Initialize permutation
+    set nm1 [expr {$norows - 1}]
+    set ipiv {}
+    # Perform Gauss transforms
+    for { set k 0 } { $k < $nm1 } { incr k } {
+        # Search pivot in column n, from lines k to n
+        set column [getcol $mat $k $k $nm1]
+        foreach {abspivot murel} [norm_max $column 1] {break}
+        # Shift mu, because max returns with respect to the column (k:n,k)
+        set mu [expr {$murel + $k}]
+        # Swap lines k and mu from columns 1 to n
+        swaprows mat $k $mu
+        set akk [lindex $mat $k $k]
+        # Store permutation
+        lappend ipiv $mu
+        # Store pivots for lines k+1 to n in columns k+1 to n
+        set kp1 [expr {$k+1}]
+        set akp1 [getcol $mat $k $kp1 $nm1]
+        set mult [expr {1. / double($akk)}]
+        set akp1 [scale $mult $akp1]
+        setcol mat $k $akp1 $kp1 $nm1
+        # Perform transform for lines k+1 to n
+        set akp1k [getcol $mat $k $kp1 $nm1]
+        set akkp1 [lrange [lindex $mat $k] $kp1 $nm1]
+        set scope [list $kp1 $nm1 $kp1 $nm1]
+        dger mat -1. $akp1k $akkp1 $scope
+    }
+    return $ipiv
+}
+
+# det --
+#     Returns the determinant of the given matrix, based on PA=LU
+#     decomposition (i.e. dgetrf).
+#
+# Arguments:
+#     matrix     The matrix values.
+#     ipiv   The pivots (optionnal).
+#       If the pivots are not provided, a PA=LU decomposition
+#       is performed.
+#       If the pivots are provided, we assume that it
+#       contains the pivots and that the matrix A contains the
+#       L and U factors, as provided by dgterf.
+#
+# Result:
+#     Returns the determinant
+#
+proc ::math::linearalgebra::det { matrix {ipiv ""}} {
+    if { $ipiv == "" } then {
+        set ipiv [dgetrf matrix]
+    }
+    set det 1.0
+    set norows [llength $matrix]
+    set i 0
+    foreach row $matrix {
+        set uu [lindex $row $i]
+        set det [expr {$det * $uu}]
+        if { $i < $norows - 1 } then {
+            set ii [lindex $ipiv $i]
+            if {  $ii!=$i  } then {
+                set det [expr {-1.0 * $det}]
+            }
+        }
+        incr i
+    }
+    return $det
+}
+
+# largesteigen --
+#     Returns a list made of the largest eigenvalue (in magnitude)
+#     and associated eigenvector.
+#     Uses Power Method.
+#
+# Arguments:
+#     matrix     The matrix values.
+#     tolerance  The relative tolerance of the eigenvalue.
+#     maxiter    The maximum number of iterations
+#
+# Result:
+#     Returns a list of two items, where the first item
+#     is the eigenvalue and the second is the eigenvector.
+# Note
+#     This is algorithm #7.3.3 of Golub & Van Loan.
+#
+proc ::math::linearalgebra::largesteigen { matrix {tolerance 1.e-8} {maxiter 10}} {
+    set norows [llength $matrix]
+    set q [mkVector $norows 1.0]
+    set lambda 1.0
+    for { set k 0 } { $k < $maxiter } { incr k } {
+        set z [matmul $matrix $q]
+        set zn [norm $z]
+        if { $zn == 0.0 } then {
+            return -code error "Cannot continue power method : matrix is singular"
+        }
+        set s [expr {1.0 / $zn}]
+        set q [scale $s $z]
+        set prod [matmul $matrix $q]
+        set lambda_old $lambda
+        set lambda [dotproduct $q $prod]
+        if { abs($lambda - $lambda_old) < $tolerance * abs($lambda_old) } then {
+            break
+        }
+    }
+    return [list $lambda $q]
+}
+
+# to_LA --
+#     Convert a matrix or vector to the LA format
+# Arguments:
+#     mv         Matrix or vector to be converted
+#
+# Result:
+#     List according to LA conventions
+#
+proc ::math::linearalgebra::to_LA { mv } {
+    foreach {rows cols} [shape $mv] {
+        if { $cols == {} } {
+            set cols 0
+        }
+    }
+
+    set result [list 2 $rows $cols]
+    foreach row $mv {
+        set result [concat $result $row]
+    }
+    return $result
+}
+
+# from_LA --
+#     Convert a matrix or vector from the LA format
+# Arguments:
+#     mv         Matrix or vector to be converted
+#
+# Result:
+#     List according to current conventions
+#
+proc ::math::linearalgebra::from_LA { mv } {
+    foreach {rows cols} [lrange $mv 1 2] {break}
+
+    if { $cols != 0 } {
+        set result {}
+        set elem2  2
+        for { set i 0 } { $i < $rows } { incr i } {
+            set  elem1 [expr {$elem2+1}]
+            incr elem2 $cols
+            lappend result [lrange $mv $elem1 $elem2]
+        }
+    } else {
+        set result [lrange $mv 3 end]
+    }
+
+    return $result
+}
+
+#
+# Announce the package's presence
+#
+package provide math::linearalgebra 1.1.6
+
+if { 0 } {
+Te doen:
+behoorlijke testen!
+matmul
+solveGauss_band
+join_col, join_row
+kleinste-kwadraten met SVD en met Gauss
+PCA
+}
+
+if { 0 } {
+    set matrix {{1.0  2.0 -1.0}
+        {3.0  1.1  0.5}
+    {1.0 -2.0  3.0}}
+    set bvect  {{1.0  2.0 -1.0}
+        {3.0  1.1  0.5}
+    {1.0 -2.0  3.0}}
+    puts [join [::math::linearalgebra::solveGauss $matrix $bvect] \n]
+    set bvect  {{4.0   2.0}
+        {12.0  1.2}
+    {4.0  -2.0}}
+    puts [join [::math::linearalgebra::solveGauss $matrix $bvect] \n]
+}
+
+if { 0 } {
+
+   set vect1 {1.0 2.0}
+   set vect2 {3.0 4.0}
+   ::math::linearalgebra::axpy_vect 1.0 $vect1 $vect2
+   ::math::linearalgebra::add_vect      $vect1 $vect2
+   puts [time {::math::linearalgebra::axpy_vect 1.0 $vect1 $vect2} 50000]
+   puts [time {::math::linearalgebra::axpy_vect 2.0 $vect1 $vect2} 50000]
+   puts [time {::math::linearalgebra::axpy_vect 1.0 $vect1 $vect2} 50000]
+   puts [time {::math::linearalgebra::axpy_vect 1.1 $vect1 $vect2} 50000]
+   puts [time {::math::linearalgebra::add_vect      $vect1 $vect2} 50000]
+}
+
+if { 0 } {
+    set M {{1 2} {2 1}}
+    puts "[::math::linearalgebra::determineSVD $M]"
+}
+if { 0 } {
+    set M {{1 2} {2 1}}
+    puts "[::math::linearalgebra::normMatrix $M]"
+}
+if { 0 } {
+    set M {{1.3 2.3} {2.123 1}}
+    puts "[::math::linearalgebra::show $M]"
+    set M {{1.3 2.3 45 3.} {2.123 1 5.6 0.01}}
+    puts "[::math::linearalgebra::show $M]"
+    puts "[::math::linearalgebra::show $M %12.4f]"
+}
+if { 0 } {
+    set M {{1 0 0}
+        {1 1 0}
+    {1 1 1}}
+    puts [::math::linearalgebra::orthonormalizeRows $M]
+}
+if { 0 } {
+    set M [::math::linearalgebra::mkMoler 5]
+    puts [::math::linearalgebra::choleski $M]
+}
+if { 0 } {
+    set M [::math::linearalgebra::mkRandom 20]
+    set b [::math::linearalgebra::mkVector 20]
+    puts "Gauss A = LU"
+    puts [time {::math::linearalgebra::solveGauss $M $b} 5]
+    puts "Gauss PA = LU"
+    puts [time {::math::linearalgebra::solvePGauss $M $b} 5]
+    # Gauss A = LU
+    # 7607.4 microseconds per iteration
+    # Gauss PA = LU
+    # 17428.4 microseconds per iteration
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/liststat.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/liststat.tcl
new file mode 100644
index 00000000..d7b2e140
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/liststat.tcl
@@ -0,0 +1,95 @@
+# liststat.tcl --
+#
+#    Set of operations on lists, meant for the statistics package
+#
+# version 0.1: initial implementation, january 2003
+
+namespace eval ::math::statistics {}
+
+# filter --
+#    Filter a list based on whether an expression is true for
+#    an element or not
+#
+# Arguments:
+#    varname        Name of the variable that represents the data in the
+#                   expression
+#    data           List to be filtered
+#    expression     (Logical) expression that is to be evaluated
+#
+# Result:
+#    List of those elements for which the expression is true
+# TODO:
+#    Substitute local variables in caller
+#
+proc ::math::statistics::filter { varname data expression } {
+   upvar $varname _x_
+   set result {}
+   set _x_ \$_x_
+   set expression [uplevel subst -nocommands [list $expression]]
+   foreach _x_ $data {
+      # FRINK: nocheck
+      if $expression {
+
+         lappend result $_x_
+      }
+   }
+   return $result
+}
+
+# map --
+#    Map the elements of a list according to an expression
+#
+# Arguments:
+#    varname        Name of the variable that represents the data in the
+#                   expression
+#    data           List whose elements must be transformed (mapped)
+#    expression     Expression that is evaluated with $varname an
+#                   element in the list
+#
+# Result:
+#    List of transformed elements
+#
+proc ::math::statistics::map { varname data expression } {
+   upvar $varname _x_
+   set result {}
+   set _x_ \$_x_
+   set expression [uplevel subst -nocommands [list $expression]]
+   foreach _x_ $data {
+      # FRINK: nocheck
+      lappend result [expr $expression]
+   }
+   return $result
+}
+
+# samplescount --
+#    Count the elements in each sublist and return a list of counts
+#
+# Arguments:
+#    varname        Name of the variable that represents the data in the
+#                   expression
+#    list           List of lists
+#    expression     Expression in that is evaluated with $varname an
+#                   element in the sublist (defaults to "true")
+#
+# Result:
+#    List of transformed elements
+#
+proc ::math::statistics::samplescount { varname list {expression 1} } {
+   upvar $varname _x_
+   set result {}
+   set _x_ \$_x_
+   set expression [uplevel subst -nocommands [list $expression]]
+   foreach data $list {
+      set number 0
+      foreach _x_ $data {
+         # FRINK: nocheck
+         if $expression {
+            incr number
+         }
+      }
+      lappend result $number
+   }
+   return $result
+}
+
+# End of list procedures
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/machineparameters.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/machineparameters.tcl
new file mode 100644
index 00000000..7f2b6490
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/machineparameters.tcl
@@ -0,0 +1,378 @@
+# machineparameters.tcl --
+#   Compute double precision machine parameters.
+#
+# Description
+#   This the Tcl equivalent of the DLAMCH LAPCK function.
+#   In floating point systems, a floating point number is represented
+#   by
+#   x = +/- d1 d2 ... dt basis^e
+#   where digits satisfy
+#   0 <= di <= basis - 1, i = 1, t
+#   with the convention :
+#   - t is the size of the mantissa
+#   - basis is the basis (the "radix")
+#
+# References
+#
+#   "Algorithms to Reveal Properties of Floating-Point Arithmetic"
+#   Michael A. Malcolm
+#   Stanford University
+#   Communications of the ACM
+#   Volume 15 ,  Issue 11  (November 1972)
+#   Pages: 949 - 951
+#
+#   "More on Algorithms that Reveal Properties of Floating
+#   Point Arithmetic Units"
+#   W. Morven Gentleman, University of Waterloo
+#   Scott B. Marovich, Purdue University
+#   Communications of the ACM
+#   Volume 17 ,  Issue 5  (May 1974)
+#   Pages: 276 - 277
+#
+# Example
+#
+#   In the following example, one compute the parameters of a desktop
+#   under Linux with the following Tcl 8.4.19 properties :
+#
+#% parray tcl_platform
+#tcl_platform(byteOrder) = littleEndian
+#tcl_platform(machine)   = i686
+#tcl_platform(os)        = Linux
+#tcl_platform(osVersion) = 2.6.24-19-generic
+#tcl_platform(platform)  = unix
+#tcl_platform(tip,268)   = 1
+#tcl_platform(tip,280)   = 1
+#tcl_platform(user)      = <username>
+#tcl_platform(wordSize)  = 4
+#
+#   The following example creates a machineparameters object,
+#   computes the properties and displays it.
+#
+#     set pp [machineparameters create %AUTO%]
+#     $pp compute
+#     $pp print
+#     $pp destroy
+#
+#   This prints out :
+#
+#     Machine parameters
+#     Epsilon : 1.11022302463e-16
+#     Beta : 2
+#     Rounding : proper
+#     Mantissa : 53
+#     Maximum exponent : 1024
+#     Minimum exponent : -1021
+#     Overflow threshold : 8.98846567431e+307
+#     Underflow threshold : 2.22507385851e-308
+#
+#   That compares well with the results produced by Lapack 3.1.1 :
+#
+#     Epsilon                      =   1.11022302462515654E-016
+#     Safe minimum                 =   2.22507385850720138E-308
+#     Base                         =    2.0000000000000000
+#     Precision                    =   2.22044604925031308E-016
+#     Number of digits in mantissa =    53.000000000000000
+#     Rounding mode                =   1.00000000000000000
+#     Minimum exponent             =   -1021.0000000000000
+#     Underflow threshold          =   2.22507385850720138E-308
+#     Largest exponent             =    1024.0000000000000
+#     Overflow threshold           =   1.79769313486231571E+308
+#     Reciprocal of safe minimum   =   4.49423283715578977E+307
+#
+# Copyright 2008 Michael Baudin
+#
+package require Tcl 8.4
+package require snit
+package provide math::machineparameters 0.1
+
+snit::type machineparameters {
+  # Epsilon is the smallest value so that 1+epsilon>1 is false
+  variable epsilon 0
+  # basis is the basis of the floating-point representation.
+  # basis is usually 2, i.e. binary representation (for example IEEE 754 machines),
+  # but some machines (like HP calculators for example) uses 10, or 16, etc...
+  variable basis 0
+  # The rounding mode used on the machine.
+  # The rounding occurs when more than t digits would be required to
+  # represent the number.
+  # Two modes can be determined with the current system :
+  # "chop" means than only t digits are kept, no matter the value of the number
+  # "proper" means that another rounding mode is used, be it "round to nearest",
+  #   "round up", "round down".
+  variable rounding ""
+  # the size of the mantissa
+  variable mantissa 0
+  # The first non-integer is A = 2^m with m is the
+  # smallest positive integer so that fl(A+1)=A
+  variable firstnoninteger 0
+  # Maximum number of iterations in loops
+  option -maxiteration 10000
+  # Set to 1 to enable verbose logging
+  option -verbose -default 0
+  # The largest positive exponent before overflow occurs
+  variable exponentmax 0
+  # The largest negative exponent before (gradual) underflow occurs
+  variable exponentmin 0
+  # Largest positive value before overflow occurs
+  variable vmax
+  # Largest negative value before (gradual) underflow occurs
+  variable vmin
+  #
+  # compute --
+  #   Computes the machine parameters.
+  #
+  method compute {} {
+    $self log "compute"
+    $self computeepsilon
+    $self computefirstnoninteger
+    $self computebasis
+    $self computerounding
+    $self computemantissa
+    $self computeemax
+    $self computeemin
+    return ""
+  }
+  #
+  # computeepsilon --
+  #   Find epsilon the minimum value for which 1.0 + epsilon > 1.0
+  #
+  method computeepsilon {} {
+    $self log "computeepsilon"
+    set factor 2.
+    set epsilon 0.5
+    for {set i 0} {$i<$options(-maxiteration)} {incr i} {
+      $self log "$i/$options(-maxiteration) : $epsilon"
+      set epsilon [expr {$epsilon / $factor}]
+      set inequality [expr {1.0+$epsilon>1.0}]
+      if {$inequality==0} then {
+        break
+      }
+    }
+    $self log "epsilon : $epsilon (after $i loops)"
+    return ""
+  }
+  #
+  # computefirstnoninteger --
+  #   Compute the first positive non-integer real.
+  #   It is the smallest a such that (a+1)-a is different from 1
+  #
+  method computefirstnoninteger {} {
+    $self log "computefirstnoninteger"
+    set firstnoninteger 2.
+    for {set i 0} {$i < $options(-maxiteration)} {incr i} {
+      $self log "$i/$options(-maxiteration) : $firstnoninteger"
+      set firstnoninteger [expr {2.*$firstnoninteger}]
+      set one [expr {($firstnoninteger+1.)-$firstnoninteger}]
+      if {$one!=1.} then {
+        break
+      }
+    }
+    $self log "Found firstnoninteger : $firstnoninteger"
+    return ""
+  }
+  #
+  # computebasis --
+  #   Compute the basis (basis)
+  #
+  method computebasis {} {
+    $self log "computebasis"
+    #
+    # Compute b where b is the smallest real so that fl(a+b)> a,
+    # where a is the first non integer.
+    # Note :
+    #  With floating point numbers, a+1==a !
+    #  b is denoted by "B" in Malcolm's algorithm
+    #
+    set b 1
+    for {set i 0} {$i < $options(-maxiteration)} {incr i} {
+      $self log "$i/$options(-maxiteration) : $b"
+      set basis [expr {int(($firstnoninteger+$b)-$firstnoninteger)}]
+      if {$basis!=0.} then {
+        break
+      }
+      incr b
+    }
+    $self log "Found basis : $basis"
+    return ""
+  }
+  #
+  # computerounding --
+  #   Compute the rounding mode.
+  # Note:
+  #   This corresponds to DLAMCH implementation (DLAMC1 exactly).
+  #
+  method computerounding {} {
+    $self log "computerounding"
+    # Now determine whether rounding or chopping occurs,  by adding a
+    # bit  less  than  beta/2  and a  bit  more  than  beta/2  to  a (=firstnoninteger).
+    set F [expr {$basis/2.0 - $basis/100.0}]
+    set C [expr {$F + $firstnoninteger}]
+    if {$C==$firstnoninteger} then {
+      set rounding "proper"
+    } else {
+      set rounding "chop"
+    }
+    set F [expr {$basis/2.0 + $basis/100.0}]
+    set C [expr {$F + $firstnoninteger}]
+    if {$rounding=="proper" && $C==$firstnoninteger} then {
+      set rounding "chop"
+    }
+    $self log "Found rounding : $rounding"
+    return ""
+  }
+  #
+  # computemantissa --
+  #   Compute the mantissa size
+  #
+  method computemantissa {} {
+    $self log "computemantissa"
+    set a 1.
+    set mantissa 0
+    for {set i 0} {$i < $options(-maxiteration)} {incr i} {
+      incr mantissa
+      $self log "$i/$options(-maxiteration) : $mantissa"
+      set a [expr {$a * double($basis)}]
+      set one [expr {($a+1)-$a}]
+      if {$one!=1.} then {
+        break
+      }
+    }
+    $self log "Found mantissa : $mantissa"
+    return ""
+  }
+  #
+  # computeemax --
+  #   Compute the maximum exponent before overflow
+  #
+  method computeemax {} {
+    $self log "computeemax"
+    set vmax 1.
+    set exponentmax 1
+    for {set i 0} {$i < $options(-maxiteration)} {incr i} {
+      $self log "Iteration #$i , exponentmax = $exponentmax, vmax = $vmax"
+      incr exponentmax
+      # Condition #1 : no exception is generated
+      set errflag [catch {
+        set new [expr {$vmax * $basis}]
+      }]
+      if {$errflag!=0} then {
+        break
+      }
+      # Condition #2 : one can recover the original number
+      if {$new / $basis != $vmax} then {
+        break
+      }
+      set vmax $new
+    }
+    incr exponentmax -1
+    $self log "Exponent maximum : $exponentmax"
+    $self log "Value maximum : $vmax"
+    return ""
+  }
+  #
+  # computeemin --
+  #   Compute the minimum exponent before underflow
+  #
+  method computeemin {} {
+    $self log "computeemin"
+    set vmin 1.
+    set exponentmin 1
+    for {set i 0} {$i < $options(-maxiteration)} {incr i} {
+      $self log "Iteration #$i , exponentmin = $exponentmin, vmin = $vmin"
+      incr exponentmin -1
+      # Condition #1 : no exception is generated
+      set errflag [catch {
+        set new [expr {$vmin / $basis}]
+      }]
+      if {$errflag!=0} then {
+        break
+      }
+      # Condition #2 : one can recover the original number
+      if {$new * $basis != $vmin} then {
+        break
+      }
+      set vmin $new
+    }
+    incr exponentmin +1
+    # See in DMALCH.f, DLAMC2 relative to IEEE machines.
+    # TODO : what happens on non-IEEE machine ?
+    set exponentmin [expr {$exponentmin - 1 + $mantissa}]
+    set vmin [expr {$vmin * pow($basis,$mantissa-1)}]
+    $self log "Exponent minimum : $exponentmin"
+    $self log "Value minimum : $vmin"
+    return ""
+  }
+  #
+  # log --
+  #   Puts the given message on standard output.
+  #
+  method log {msg} {
+    if {$options(-verbose)==1} then {
+      puts "(mp) $msg"
+    }
+    return ""
+  }
+  #
+  # get --
+  #   Return value for key
+  #
+  method get {key} {
+    $self log "get $key"
+    switch -- $key {
+      -epsilon {
+        set result $epsilon
+      }
+      -rounding {
+        set result $rounding
+      }
+      -basis {
+        set result $basis
+      }
+      -mantissa {
+        set result $mantissa
+      }
+      -exponentmax {
+        set result $exponentmax
+      }
+      -exponentmin {
+        set result $exponentmin
+      }
+      -vmax {
+        set result $vmax
+      }
+      -vmin {
+        set result $vmin
+      }
+      default {
+        error "Unknown key $key"
+      }
+    }
+    return $result
+  }
+  #
+  # print --
+  #   Print machine parameters on standard output
+  #
+  method print {} {
+    set str [$self tostring]
+    puts "$str"
+    return ""
+  }
+  #
+  # tostring --
+  #   Return a report for machine parameters
+  #
+  method tostring {} {
+    set str ""
+    append str "Machine parameters\n"
+    append str  "Epsilon : $epsilon\n"
+    append str "Basis : $basis\n"
+    append str "Rounding : $rounding\n"
+    append str "Mantissa : $mantissa\n"
+    append str "Maximum exponent before overflow : $exponentmax\n"
+    append str "Minimum exponent before underflow : $exponentmin\n"
+    append str "Overflow threshold : $vmax\n"
+    append str "Underflow threshold : $vmin\n"
+    return $str
+  }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/math.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/math.tcl
new file mode 100644
index 00000000..aa173e06
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/math.tcl
@@ -0,0 +1,44 @@
+# math.tcl --
+#
+#	Main 'package provide' script for the package 'math'.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+# Copyright (c) 2002 by Kevin B. Kenny.  All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.2		;# uses [lindex $l end-$integer]
+
+# @mdgen OWNER: tclIndex
+# @mdgen OWNER: misc.tcl
+# @mdgen OWNER: combinatorics.tcl
+
+namespace eval ::math {
+    # misc.tcl
+
+    namespace export	cov		fibonacci	integrate
+    namespace export	max		mean		min
+    namespace export	product		random		sigma
+    namespace export	stats		sum
+    namespace export	expectDouble    expectInteger
+
+    # combinatorics.tcl
+
+    namespace export	ln_Gamma	factorial	choose
+    namespace export	Beta
+
+    # Set up for auto-loading
+
+    if { ![interp issafe {}]} {
+	variable home [file join [pwd] [file dirname [info script]]]
+	if {[lsearch -exact $::auto_path $home] == -1} {
+	    lappend ::auto_path $home
+	}
+    } else {
+	source [file join [file dirname [info script]] misc.tcl]
+	source [file join [file dirname [info script]] combinatorics.tcl]
+    }
+
+    package provide [namespace tail [namespace current]] 1.2.5
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/misc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/misc.tcl
new file mode 100644
index 00000000..acb54eae
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/misc.tcl
@@ -0,0 +1,385 @@
+# math.tcl --
+#
+#	Collection of math functions.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: misc.tcl,v 1.6 2005/10/10 14:02:47 arjenmarkus Exp $
+
+package require Tcl 8.2		;# uses [lindex $l end-$integer]
+namespace eval ::math {
+}
+
+# ::math::cov --
+#
+#	Return the coefficient of variation of three or more values
+#
+# Arguments:
+#	val1	first value
+#	val2	second value
+#	args	other values
+#
+# Results:
+#	cov	coefficient of variation expressed as percent value
+
+proc ::math::cov {val1 val2 args} {
+     set sum [ expr { $val1+$val2 } ]
+     set N [ expr { [ llength $args ] + 2 } ]
+     foreach val $args {
+        set sum [ expr { $sum+$val } ]
+     }
+     set mean [ expr { $sum/$N } ]
+     set sigma_sq 0
+     foreach val [ concat $val1 $val2 $args ] {
+        set sigma_sq [ expr { $sigma_sq+pow(($val-$mean),2) } ]
+     }
+     set sigma_sq [ expr { $sigma_sq/($N-1) } ]
+     set sigma [ expr { sqrt($sigma_sq) } ]
+     if { $mean != 0.0 } {
+        set cov [ expr { ($sigma/$mean)*100 } ]
+     } else {
+        return -code error -errorinfo "Cov undefined for data with zero mean" -errorcode {ARITH DOMAIN}
+     }
+     set cov
+}
+
+# ::math::fibonacci --
+#
+#	Return the n'th fibonacci number.
+#
+# Arguments:
+#	n	The index in the sequence to compute.
+#
+# Results:
+#	fib	The n'th fibonacci number.
+
+proc ::math::fibonacci {n} {
+    if { $n == 0 } {
+	return 0
+    } else {
+	set prev0 0
+	set prev1 1
+	for {set i 1} {$i < $n} {incr i} {
+	    set tmp $prev1
+	    incr prev1 $prev0
+	    set prev0 $tmp
+	}
+	return $prev1
+    }
+}
+
+# ::math::integrate --
+#
+#	calculate the area under a curve defined by a set of (x,y) data pairs.
+#	the x data must increase monotonically throughout the data set for the
+#	calculation to be meaningful, therefore the monotonic condition is
+#	tested, and an error is thrown if the x value is found to be
+#	decreasing.
+#
+# Arguments:
+#	xy_pairs	list of x y pairs (eg, 0 0 10 10 20 20 ...); at least 5
+#			data pairs are required, and if the number of data
+#			pairs is even, a padding value of (x0, 0) will be
+#			added.
+#
+# Results:
+#	result		A two-element list consisting of the area and error
+#			bound (calculation is "Simpson's rule")
+
+proc ::math::integrate { xy_pairs } {
+
+     set length [ llength $xy_pairs ]
+
+     if { $length < 10 } {
+        return -code error "at least 5 x,y pairs must be given"
+     }
+
+     ;## are we dealing with x,y pairs?
+     if { [ expr {$length % 2} ] } {
+        return -code error "unmatched xy pair in input"
+     }
+
+     ;## are there an even number of pairs?  Augment.
+     if { ! [ expr {$length % 4} ] } {
+        set xy_pairs [ concat [ lindex $xy_pairs 0 ] 0 $xy_pairs ]
+     }
+     set x0   [ lindex $xy_pairs 0     ]
+     set x1   [ lindex $xy_pairs 2     ]
+     set xn   [ lindex $xy_pairs end-1 ]
+     set xnminus1 [ lindex $xy_pairs end-3 ]
+
+     if { $x1 < $x0 } {
+        return -code error "monotonicity broken by x1"
+     }
+
+     if { $xn < $xnminus1 } {
+        return -code error "monotonicity broken by xn"
+     }
+
+     ;## handle the assymetrical elements 0, n, and n-1.
+     set sum [ expr {[ lindex $xy_pairs 1 ] + [ lindex $xy_pairs end ]} ]
+     set sum [ expr {$sum + (4*[ lindex $xy_pairs end-2 ])} ]
+
+     set data [ lrange $xy_pairs 2 end-4 ]
+
+     set xmax $x1
+     set i 1
+     foreach {x1 y1 x2 y2} $data {
+        incr i
+        if { $x1 < $xmax } {
+           return -code error "monotonicity broken by x$i"
+        }
+        set xmax $x1
+        incr i
+        if { $x2 < $xmax } {
+           return -code error "monotonicity broken by x$i"
+        }
+        set xmax $x2
+        set sum [ expr {$sum + (4*$y1) + (2*$y2)} ]
+     }
+
+     if { $xmax > $xnminus1 } {
+        return -code error "monotonicity broken by xn-1"
+     }
+
+     set h [ expr { ( $xn - $x0 ) / $i } ]
+     set area [ expr { ( $h / 3.0 ) * $sum } ]
+     set err_bound  [ expr { ( ( $xn - $x0 ) / 180.0 ) * pow($h,4) * $xn } ]
+     return [ list $area $err_bound ]
+}
+
+# ::math::max --
+#
+#	Return the maximum of two or more values
+#
+# Arguments:
+#	val	first value
+#	args	other values
+#
+# Results:
+#	max	maximum value
+
+proc ::math::max {val args} {
+    set max $val
+    foreach val $args {
+	if { $val > $max } {
+	    set max $val
+	}
+    }
+    set max
+}
+
+# ::math::mean --
+#
+#	Return the mean of two or more values
+#
+# Arguments:
+#	val	first value
+#	args	other values
+#
+# Results:
+#	mean	arithmetic mean value
+
+proc ::math::mean {val args} {
+    set sum $val
+    set N [ expr { [ llength $args ] + 1 } ]
+    foreach val $args {
+        set sum [ expr { $sum + $val } ]
+    }
+    set mean [expr { double($sum) / $N }]
+}
+
+# ::math::min --
+#
+#	Return the minimum of two or more values
+#
+# Arguments:
+#	val	first value
+#	args	other values
+#
+# Results:
+#	min	minimum value
+
+proc ::math::min {val args} {
+    set min $val
+    foreach val $args {
+	if { $val < $min } {
+	    set min $val
+	}
+    }
+    set min
+}
+
+# ::math::product --
+#
+#	Return the product of one or more values
+#
+# Arguments:
+#	val	first value
+#	args	other values
+#
+# Results:
+#	prod	 product of multiplying all values in the list
+
+proc ::math::product {val args} {
+    set prod $val
+    foreach val $args {
+        set prod [ expr { $prod*$val } ]
+    }
+    set prod
+}
+
+# ::math::random --
+#
+#	Return a random number in a given range.
+#
+# Arguments:
+#	args	optional arguments that specify the range within which to
+#		choose a number:
+#			(null)		choose a number between 0 and 1
+#			val		choose a number between 0 and val
+#			val1 val2	choose a number between val1 and val2
+#
+# Results:
+#	num	a random number in the range.
+
+proc ::math::random {args} {
+    set num [expr {rand()}]
+    if { [llength $args] == 0 } {
+	return $num
+    } elseif { [llength $args] == 1 } {
+	return [expr {int($num * [lindex $args 0])}]
+    } elseif { [llength $args] == 2 } {
+	foreach {lower upper} $args break
+	set range [expr {$upper - $lower}]
+	return [expr {int($num * $range) + $lower}]
+    } else {
+	set fn [lindex [info level 0] 0]
+	error "wrong # args: should be \"$fn ?value1? ?value2?\""
+    }
+}
+
+# ::math::sigma --
+#
+#	Return the standard deviation of three or more values
+#
+# Arguments:
+#	val1	first value
+#	val2	second value
+#	args	other values
+#
+# Results:
+#	sigma	population standard deviation value
+
+proc ::math::sigma {val1 val2 args} {
+     set sum [ expr { $val1+$val2 } ]
+     set N [ expr { [ llength $args ] + 2 } ]
+     foreach val $args {
+        set sum [ expr { $sum+$val } ]
+     }
+     set mean [ expr { $sum/$N } ]
+     set sigma_sq 0
+     foreach val [ concat $val1 $val2 $args ] {
+        set sigma_sq [ expr { $sigma_sq+pow(($val-$mean),2) } ]
+     }
+     set sigma_sq [ expr { $sigma_sq/($N-1) } ]
+     set sigma [ expr { sqrt($sigma_sq) } ]
+     set sigma
+}
+
+# ::math::stats --
+#
+#	Return the mean, standard deviation, and coefficient of variation as
+#	percent, as a list.
+#
+# Arguments:
+#	val1	first value
+#	val2	first value
+#	args	all other values
+#
+# Results:
+#	{mean stddev coefvar}
+
+proc ::math::stats {val1 val2 args} {
+     set sum [ expr { $val1+$val2 } ]
+     set N [ expr { [ llength $args ] + 2 } ]
+     foreach val $args {
+        set sum [ expr { $sum+$val } ]
+     }
+     set mean [ expr { $sum/double($N) } ]
+     set sigma_sq 0
+     foreach val [ concat $val1 $val2 $args ] {
+        set sigma_sq [ expr { $sigma_sq+pow(($val-$mean),2) } ]
+     }
+     set sigma_sq [ expr { $sigma_sq/double($N-1) } ]
+     set sigma [ expr { sqrt($sigma_sq) } ]
+     set cov [ expr { ($sigma/$mean)*100 } ]
+     return [ list $mean $sigma $cov ]
+}
+
+# ::math::sum --
+#
+#	Return the sum of one or more values
+#
+# Arguments:
+#	val	first value
+#	args	all other values
+#
+# Results:
+#	sum	arithmetic sum of all values in args
+
+proc ::math::sum {val args} {
+    set sum $val
+    foreach val $args {
+        set sum [ expr { $sum+$val } ]
+    }
+    set sum
+}
+
+#----------------------------------------------------------------------
+#
+# ::math::expectDouble --
+#
+#	Format an error message that an argument was expected to be
+#	double and wasn't
+#
+# Parameters:
+#	arg -- Misformatted argument
+#
+# Results:
+#	Returns an appropriate error message
+#
+# Side effects:
+#	None.
+#
+#----------------------------------------------------------------------
+
+proc ::math::expectDouble { arg } {
+    return [format "expected a floating-point number but found \"%.50s\"" $arg]
+}
+
+#----------------------------------------------------------------------
+#
+# ::math::expectInteger --
+#
+#	Format an error message that an argument was expected to be
+#	integer and wasn't
+#
+# Parameters:
+#	arg -- Misformatted argument
+#
+# Results:
+#	Returns an appropriate error message
+#
+# Side effects:
+#	None.
+#
+#----------------------------------------------------------------------
+
+proc ::math::expectInteger { arg } {
+    return [format "expected an integer but found \"%.50s\"" $arg]
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/mvlinreg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/mvlinreg.tcl
new file mode 100644
index 00000000..b234c709
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/mvlinreg.tcl
@@ -0,0 +1,265 @@
+# mvreglin.tcl --
+#     Addition to the statistics package
+#     Copyright 2007 Eric Kemp-Benedict
+#     Released under the BSD license under any terms
+#     that allow it to be compatible with tcllib
+
+package require math::linearalgebra 1.1.1
+
+# ::math::statistics --
+#     This file adds:
+#     mvlinreg = Multivariate Linear Regression
+#
+namespace eval ::math::statistics {
+    variable epsilon 1.0e-7
+
+    namespace export tstat mv-wls mv-ols
+
+    namespace import -force \
+        ::math::linearalgebra::mkMatrix \
+        ::math::linearalgebra::mkVector \
+        ::math::linearalgebra::mkIdentity \
+        ::math::linearalgebra::mkDiagonal \
+        ::math::linearalgebra::getrow \
+        ::math::linearalgebra::setrow \
+        ::math::linearalgebra::getcol \
+        ::math::linearalgebra::setcol \
+        ::math::linearalgebra::getelem \
+        ::math::linearalgebra::setelem \
+        ::math::linearalgebra::dotproduct \
+        ::math::linearalgebra::matmul \
+        ::math::linearalgebra::add \
+        ::math::linearalgebra::sub \
+        ::math::linearalgebra::solveGauss \
+        ::math::linearalgebra::transpose
+}
+
+# tstats --
+#     Returns inverse of the single-tailed t distribution
+#     given number of degrees of freedom & confidence
+#
+# Arguments:
+#     n        Number of degrees of freedom
+#     alpha    Confidence level (defaults to 0.05)
+#
+# Result:
+#     Inverse of the t-distribution
+#
+# Note:
+#     Iterates until result is within epsilon of the target.
+#     It is possible that the iteration does not converge
+#
+proc ::math::statistics::tstat {n {alpha 0.05}} {
+    variable epsilon
+    variable tvals
+
+    if [info exists tvals($n:$alpha)] {
+        return $tvals($n:$alpha)
+    }
+
+    set deltat [expr {100 * $epsilon}]
+    # For one-tailed distribution,
+    set ptarg [expr {1.000 - $alpha/2.0}]
+    set maxiter 100
+
+    # Initial value for t
+    set t 2.0
+
+    set niter 0
+    while {abs([::math::statistics::cdf-students-t $n $t] - $ptarg) > $epsilon} {
+        set pstar [::math::statistics::cdf-students-t $n $t]
+        set pl [::math::statistics::cdf-students-t $n [expr {$t - $deltat}]]
+        set ph [::math::statistics::cdf-students-t $n [expr {$t + $deltat}]]
+
+        set t [expr {$t + 2.0 * $deltat * ($ptarg - $pstar)/($ph - $pl)}]
+
+        incr niter
+        if {$niter == $maxiter} {
+            return -code error "::math::statistics::tstat: Did not converge after $niter iterations"
+        }
+    }
+
+    # Cache the result to shorten the call in future
+    set tvals($n:$alpha) $t
+
+    return $t
+}
+
+# mv-wls --
+#     Weighted Least Squares
+#
+# Arguments:
+#     data       Alternating list of weights and observations
+#
+# Result:
+#     List containing:
+#     * R-squared
+#     * Adjusted R-squared
+#     * Coefficients of x's in fit
+#     * Standard errors of the coefficients
+#     * 95% confidence bounds for coefficients
+#
+# Note:
+#     The observations are lists starting with the dependent variable y
+#     and then the values of the independent variables (x1, x2, ...):
+#
+#     mv-wls [list w [list y x's] w [list y x's] ...]
+#
+proc ::math::statistics::mv-wls {data} {
+
+    # Fill the matrices of x & y values, and weights
+    # For n points, k coefficients
+
+    # The number of points is equal to half the arguments (n weights, n points)
+    set n [expr {[llength $data]/2}]
+
+    set firstloop true
+    # Sum up all y values to take an average
+    set ysum 0
+    # Add up the weights
+    set wtsum 0
+    # Count over rows (points) as you go
+    set point 0
+    foreach {wt pt} $data {
+
+        # Check inputs
+        if {[string is double $wt] == 0} {
+            return -code error "::math::statistics::mv-wls: Weight \"$wt\" is not a number"
+            return {}
+        }
+
+        ## -- Check dimensions, initialize
+        if $firstloop {
+            # k = num of vals in pt = 1 + number of x's (because of constant)
+            set k [llength $pt]
+            if {$n <= [expr {$k + 1}]} {
+                return -code error "::math::statistics::mv-wls: Too few degrees of freedom: $k variables but only $n points"
+                return {}
+            }
+            set X [mkMatrix $n $k]
+            set y [mkVector $n]
+            set I_x [mkIdentity $k]
+            set I_y [mkIdentity $n]
+
+            set firstloop false
+
+        } else {
+            # Have to have same number of x's for all points
+            if {$k != [llength $pt]} {
+                return -code error "::math::statistics::mv-wls: Point \"$pt\" has wrong number of values (expected $k)"
+                # Clean up
+                return {}
+            }
+        }
+
+        ## -- Extract values from set of points
+        # Make a list of y values
+        set yval [expr {double([lindex $pt 0])}]
+        setelem y $point $yval
+        set ysum [expr {$ysum + $wt * $yval}]
+        set wtsum [expr {$wtsum + $wt}]
+        # Add x-values to the x-matrix
+        set xrow [lrange $pt 1 end]
+        # Add the constant (value = 1.0)
+        lappend xrow 1.0
+        setrow X $point $xrow
+        # Create list of weights & square root of weights
+        lappend w [expr {double($wt)}]
+        lappend sqrtw [expr {sqrt(double($wt))}]
+
+        incr point
+
+    }
+
+    set ymean [expr {double($ysum)/$wtsum}]
+    set W [mkDiagonal $w]
+    set sqrtW [mkDiagonal $sqrtw]
+
+    # Calculate sum os square differences for x's
+    for {set r 0} {$r < $k} {incr r} {
+        set xsqrsum 0.0
+        set xmeansum 0.0
+        # Calculate sum of squared differences as: sum(x^2) - (sum x)^2/n
+        for {set t 0} {$t < $n} {incr t} {
+            set xval [getelem $X $t $r]
+            set xmeansum [expr {$xmeansum + double($xval)}]
+            set xsqrsum [expr {$xsqrsum + double($xval * $xval)}]
+        }
+        lappend xsqr [expr {$xsqrsum - $xmeansum * $xmeansum/$n}]
+    }
+
+    ## -- Set up the X'WX matrix
+    set XtW [matmul [::math::linearalgebra::transpose $X] $W]
+    set XtWX [matmul $XtW $X]
+
+    # Invert
+    set M [solveGauss $XtWX $I_x]
+
+    set beta [matmul $M [matmul $XtW $y]]
+
+    ### -- Residuals & R-squared
+    # 1) Generate list of diagonals of the hat matrix
+    set H [matmul $X [matmul $M $XtW]]
+    for {set i 0} {$i < $n} {incr i} {
+        lappend h_ii [getelem $H $i $i]
+    }
+
+    set R [matmul $sqrtW [matmul [sub $I_y $H] $y]]
+    set yhat [matmul $H $y]
+
+    # 2) Generate list of residuals, sum of squared residuals, r-squared
+    set sstot 0.0
+    set ssreg 0.0
+    # Note: Relying on representation of Vector as a list for y, yhat
+    foreach yval $y wt $w yhatval $yhat {
+        set sstot [expr {$sstot + $wt * ($yval - $ymean) * ($yval - $ymean)}]
+        set ssreg [expr {$ssreg + $wt * ($yhatval - $ymean) * ($yhatval - $ymean)}]
+    }
+    if { $sstot != 0.0 } {
+        set r2 [expr {double($ssreg)/$sstot}]
+    } else {
+        set r2 1.0
+    }
+    set adjr2 [expr {1.0 - (1.0 - $r2) * ($n - 1)/($n - $k)}]
+    set sumsqresid [dotproduct $R $R]
+    set s2 [expr {double($sumsqresid) / double($n - $k)}]
+
+    ### -- Confidence intervals for coefficients
+    set tvalue [tstat [expr {$n - $k}]]
+    for {set i 0} {$i < $k} {incr i} {
+        set stderr [expr {sqrt($s2 * [getelem $M $i $i])}]
+        set mid [lindex $beta $i]
+        lappend stderrs $stderr
+        lappend confinterval [list [expr {$mid - $tvalue * $stderr}] [expr {$mid + $tvalue * $stderr}]]
+    }
+
+    return [list $r2 $adjr2 $beta $stderrs $confinterval]
+}
+
+# mv-ols --
+#     Ordinary Least Squares
+#
+# Arguments:
+#     data       List of observations, list of lists
+#
+# Result:
+#     List containing:
+#     * R-squared
+#     * Adjusted R-squared
+#     * Coefficients of x's in fit
+#     * Standard errors of the coefficients
+#     * 95% confidence bounds for coefficients
+#
+# Note:
+#     The observations are lists starting with the dependent variable y
+#     and then the values of the independent variables (x1, x2, ...):
+#
+#     mv-ols [list y x's] [list y x's] ...
+#
+proc ::math::statistics::mv-ols {data} {
+    set newdata {}
+    foreach pt $data {
+        lappend newdata 1 $pt
+    }
+    return [mv-wls $newdata]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/numtheory.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/numtheory.tcl
new file mode 100644
index 00000000..398901f3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/numtheory.tcl
@@ -0,0 +1,82 @@
+##
+## This is the file `numtheory.tcl',
+## generated with the SAK utility
+## (sak docstrip/regen).
+##
+## The original source files were:
+##
+## numtheory.dtx  (with options: `pkg pkg_common')
+##
+## In other words:
+## **************************************
+## * This Source is not the True Source *
+## **************************************
+## the true source is the file from which this one was generated.
+##
+# Copyright (c) 2010 by Lars Hellstrom.  All rights reserved.
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+package require Tcl 8.5
+package provide math::numtheory 1.1.3
+namespace eval ::math::numtheory {
+   namespace export isprime
+}
+proc ::math::numtheory::prime_trialdivision {n} {
+    if {$n<2}      then {return -code return 0}
+    if {$n<4}      then {return -code return 1}
+    if {$n%2 == 0} then {return -code return 0}
+    if {$n<9}      then {return -code return 1}
+    if {$n%3 == 0} then {return -code return 0}
+    if {$n%5 == 0} then {return -code return 0}
+    if {$n%7 == 0} then {return -code return 0}
+    if {$n<121}    then {return -code return 1}
+}
+proc ::math::numtheory::Miller--Rabin {n s d a} {
+    set x 1
+    while {$d>1} {
+        if {$d & 1} then {set x [expr {$x*$a % $n}]}
+        set a [expr {$a*$a % $n}]
+        set d [expr {$d >> 1}]
+    }
+    set x [expr {$x*$a % $n}]
+    if {$x == 1} then {return 0}
+    for {} {$s>1} {incr s -1} {
+        if {$x == $n-1} then {return 0}
+        set x [expr {$x*$x % $n}]
+        if {$x == 1} then {return 1}
+    }
+    return [expr {$x != $n-1}]
+}
+proc ::math::numtheory::isprime {n args} {
+    prime_trialdivision $n
+    set d [expr {$n-1}]; set s 0
+    while {($d&1) == 0} {
+        incr s
+        set d [expr {$d>>1}]
+    }
+    if {[Miller--Rabin $n $s $d 2]} then {return 0}
+    if {$n < 2047} then {return 1}
+    if {[Miller--Rabin $n $s $d 3]} then {return 0}
+    if {$n < 1373653} then {return 1}
+    if {[Miller--Rabin $n $s $d 5]} then {return 0}
+    if {$n < 25326001} then {return 1}
+    if {[Miller--Rabin $n $s $d 7] || $n==3215031751} then {return 0}
+    if {$n < 118670087467} then {return 1}
+    array set O {-randommr 4}
+    array set O $args
+    for {set i $O(-randommr)} {$i >= 1} {incr i -1} {
+        if {[Miller--Rabin $n $s $d [expr {(
+           (round(rand()*0x100000000)-1)
+           *3 | 1)
+           + 10
+        }]]} then {return 0}
+    }
+    return on
+}
+
+# Add the additional procedures
+#
+source [file join [file dirname [info script]] primes.tcl]
+##
+##
+## End of file `numtheory.tcl'.
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/optimize.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/optimize.tcl
new file mode 100644
index 00000000..b5ddafed
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/optimize.tcl
@@ -0,0 +1,1319 @@
+#----------------------------------------------------------------------
+#
+# math/optimize.tcl --
+#
+#	This file contains functions for optimization of a function
+#	or expression.
+#
+# Copyright (c) 2004, by Arjen Markus.
+# Copyright (c) 2004, 2005 by Kevin B. Kenny.  All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: optimize.tcl,v 1.12 2011/01/18 07:49:53 arjenmarkus Exp $
+#
+#----------------------------------------------------------------------
+
+package require Tcl 8.4
+
+# math::optimize --
+#    Namespace for the commands
+#
+namespace eval ::math::optimize {
+   namespace export minimum  maximum solveLinearProgram linearProgramMaximum
+   namespace export min_bound_1d min_unbound_1d
+
+   # Possible extension: minimumExpr, maximumExpr
+}
+
+# minimum --
+#    Minimize a given function over a given interval
+#
+# Arguments:
+#    begin       Start of the interval
+#    end         End of the interval
+#    func        Name of the function to be minimized (takes one
+#                argument)
+#    maxerr      Maximum relative error (defaults to 1.0e-4)
+# Return value:
+#    Computed value for which the function is minimal
+# Notes:
+#    The function needs not to be differentiable, but it is supposed
+#    to be continuous. There is no provision for sub-intervals where
+#    the function is constant (this might happen when the maximum
+#    error is very small, < 1.0e-15)
+#
+# Warning:
+#    This procedure is deprecated - use min_bound_1d instead
+#
+proc ::math::optimize::minimum { begin end func {maxerr 1.0e-4} } {
+
+   set nosteps  [expr {3+int(-log($maxerr)/log(2.0))}]
+   set delta    [expr {0.5*($end-$begin)*$maxerr}]
+
+   for { set step 0 } { $step < $nosteps } { incr step } {
+      set x1 [expr {($end+$begin)/2.0}]
+      set x2 [expr {$x1+$delta}]
+
+      set fx1 [uplevel 1 $func $x1]
+      set fx2 [uplevel 1 $func $x2]
+
+      if {$fx1 < $fx2} {
+         set end   $x1
+      } else {
+         set begin $x1
+      }
+   }
+   return $x1
+}
+
+# maximum --
+#    Maximize a given function over a given interval
+#
+# Arguments:
+#    begin       Start of the interval
+#    end         End of the interval
+#    func        Name of the function to be maximized (takes one
+#                argument)
+#    maxerr      Maximum relative error (defaults to 1.0e-4)
+# Return value:
+#    Computed value for which the function is maximal
+# Notes:
+#    The function needs not to be differentiable, but it is supposed
+#    to be continuous. There is no provision for sub-intervals where
+#    the function is constant (this might happen when the maximum
+#    error is very small, < 1.0e-15)
+#
+# Warning:
+#    This procedure is deprecated - use max_bound_1d instead
+#
+proc ::math::optimize::maximum { begin end func {maxerr 1.0e-4} } {
+
+   set nosteps  [expr {3+int(-log($maxerr)/log(2.0))}]
+   set delta    [expr {0.5*($end-$begin)*$maxerr}]
+
+   for { set step 0 } { $step < $nosteps } { incr step } {
+      set x1 [expr {($end+$begin)/2.0}]
+      set x2 [expr {$x1+$delta}]
+
+      set fx1 [uplevel 1 $func $x1]
+      set fx2 [uplevel 1 $func $x2]
+
+      if {$fx1 > $fx2} {
+         set end   $x1
+      } else {
+         set begin $x1
+      }
+   }
+   return $x1
+}
+
+#----------------------------------------------------------------------
+#
+# min_bound_1d --
+#
+#       Find a local minimum of a function between two given
+#       abscissae. Derivative of f is not required.
+#
+# Usage:
+#       min_bound_1d f x1 x2 ?-option value?,,,
+#
+# Parameters:
+#       f - Function to minimize.  Must be expressed as a Tcl
+#           command, to which will be appended the value at which
+#           to evaluate the function.
+#       x1 - Lower bound of the interval in which to search for a
+#            minimum
+#       x2 - Upper bound of the interval in which to search for a minimum
+#
+# Options:
+#       -relerror value
+#               Gives the tolerance desired for the returned
+#               abscissa.  Default is 1.0e-7.  Should never be less
+#               than the square root of the machine precision.
+#       -maxiter n
+#               Constrains minimize_bound_1d to evaluate the function
+#               no more than n times.  Default is 100.  If convergence
+#               is not achieved after the specified number of iterations,
+#               an error is thrown.
+#       -guess value
+#               Gives a point between x1 and x2 that is an initial guess
+#               for the minimum.  f(guess) must be at most f(x1) or
+#               f(x2).
+#        -fguess value
+#                Gives the value of the ordinate at the value of '-guess'
+#                if known.  Default is to evaluate the function
+#       -abserror value
+#               Gives the desired absolute error for the returned
+#               abscissa.  Default is 1.0e-10.
+#       -trace boolean
+#               A true value causes a trace to the standard output
+#               of the function evaluations. Default is 0.
+#
+# Results:
+#       Returns a two-element list comprising the abscissa at which
+#       the function reaches a local minimum within the interval,
+#       and the value of the function at that point.
+#
+# Side effects:
+#       Whatever side effects arise from evaluating the given function.
+#
+#----------------------------------------------------------------------
+
+proc ::math::optimize::min_bound_1d { f x1 x2 args } {
+
+    set f [lreplace $f 0 0 [uplevel 1 [list namespace which [lindex $f 0]]]]
+
+    set phim1 0.6180339887498949
+    set twomphi 0.3819660112501051
+
+    array set params {
+        -relerror 1.0e-7
+        -abserror 1.0e-10
+        -maxiter 100
+        -trace 0
+        -fguess {}
+    }
+    set params(-guess) [expr { $phim1 * $x1 + $twomphi * $x2 }]
+
+    if { ( [llength $args] % 2 ) != 0 } {
+        return -code error -errorcode [list min_bound_1d wrongNumArgs] \
+            "wrong \# args, should be\
+                 \"[lreplace [info level 0] 1 end f x1 x2 ?-option value?...]\""
+    }
+    foreach { key value } $args {
+        if { ![info exists params($key)] } {
+            return -code error -errorcode [list min_bound_1d badoption $key] \
+                "unknown option \"$key\",\
+                     should be -abserror,\
+                     -fguess, -guess, -initial, -maxiter, -relerror,\
+                     or -trace"
+        }
+	set params($key) $value
+    }
+
+    # a and b presumably bracket the minimum of the function.  Make sure
+    # they're in ascending order.
+
+    if { $x1 < $x2 } {
+        set a $x1; set b $x2
+    } else {
+        set b $x1; set a $x2
+    }
+
+    set x $params(-guess);              # Best abscissa found so far
+    set w $x;                           # Second best abscissa found so far
+    set v $x;                           # Most recent earlier value of w
+
+    set e 0.0;                          # Distance moved on the step before
+					# last.
+
+    # Evaluate the function at the initial guess
+
+    if { $params(-fguess) ne {} } {
+        set fx $params(-fguess)
+    } else {
+        set s $f; lappend s $x; set fx [eval $s]
+        if { $params(-trace) } {
+            puts stdout "f($x) = $fx (initialisation)"
+        }
+    }
+    set fw $fx
+    set fv $fx
+
+    for { set iter 0 } { $iter < $params(-maxiter) } { incr iter } {
+
+        # Find the midpoint of the current interval
+
+        set xm [expr { 0.5 * ( $a + $b ) }]
+
+        # Compute the current tolerance for x, and twice its value
+
+        set tol [expr { $params(-relerror) * abs($x) + $params(-abserror) }]
+        set tol2 [expr { $tol + $tol }]
+        if { abs( $x - $xm ) <= $tol2 - 0.5 * ($b - $a) } {
+            return [list $x $fx]
+        }
+        set golden 1
+        if { abs($e) > $tol } {
+
+            # Use parabolic interpolation to find a minimum determined
+            # by the evaluations at x, v, and w.  The size of the step
+            # to take will be $p/$q.
+
+            set r [expr { ( $x - $w ) * ( $fx - $fv ) }]
+            set q [expr { ( $x - $v ) * ( $fx - $fw ) }]
+            set p [expr { ( $x - $v ) * $q - ( $x - $w ) * $r }]
+            set q [expr { 2. * ( $q - $r ) }]
+            if { $q > 0 } {
+                set p [expr { - $p }]
+            } else {
+                set q [expr { - $q }]
+            }
+            set olde $e
+            set e $d
+
+            # Test if parabolic interpolation results in less than half
+            # the movement of the step two steps ago.
+
+            if { abs($p) < abs( .5 * $q * $olde )
+                 && $p > $q * ( $a - $x )
+                 && $p < $q * ( $b - $x ) } {
+
+                set d [expr { $p / $q }]
+                set u [expr { $x + $d }]
+                if { ( $u - $a ) < $tol2 || ( $b - $u ) < $tol2 } {
+                    if { $xm-$x < 0 } {
+                        set d [expr { - $tol }]
+                    } else {
+                        set d $tol
+                    }
+                }
+                set golden 0
+            }
+        }
+
+        # If parabolic interpolation didn't come up with an acceptable
+        # result, use Golden Section instead.
+
+        if { $golden } {
+            if { $x >= $xm } {
+                set e [expr { $a - $x }]
+            } else {
+                set e [expr { $b - $x }]
+            }
+            set d [expr { $twomphi * $e }]
+        }
+
+        # At this point, d is the size of the step to take.  Make sure
+        # that it's at least $tol.
+
+        if { abs($d) >= $tol } {
+            set u [expr { $x + $d }]
+        } elseif { $d < 0 } {
+            set u [expr { $x - $tol }]
+        } else {
+            set u [expr { $x + $tol }]
+        }
+
+        # Evaluate the function
+
+        set s $f; lappend s $u; set fu [eval $s]
+        if { $params(-trace) } {
+            if { $golden } {
+                puts stdout "f($u)=$fu (golden section)"
+            } else {
+                puts stdout "f($u)=$fu (parabolic interpolation)"
+            }
+        }
+
+        if { $fu <= $fx } {
+            # We've the best abscissa so far.
+
+            if { $u >= $x } {
+                set a $x
+            } else {
+                set b $x
+            }
+            set v $w
+            set fv $fw
+            set w $x
+            set fw $fx
+            set x $u
+            set fx $fu
+        } else {
+
+            if { $u < $x } {
+                set a $u
+            } else {
+                set b $u
+            }
+            if { $fu <= $fw || $w == $x } {
+                # We've the second-best abscissa so far
+                set v $w
+                set fv $fw
+                set w $u
+                set fw $fu
+            } elseif { $fu <= $fv || $v == $x || $v == $w } {
+                # We've the third-best so far
+                set v $u
+                set fv $fu
+            }
+        }
+    }
+
+    return -code error -errorcode [list min_bound_1d noconverge $iter] \
+        "[lindex [info level 0] 0] failed to converge after $iter steps."
+
+}
+
+#----------------------------------------------------------------------
+#
+# brackmin --
+#
+#       Find a place along the number line where a given function has
+#       a local minimum.
+#
+# Usage:
+#       brackmin f x1 x2 ?trace?
+#
+# Parameters:
+#       f - Function to minimize
+#       x1 - Abscissa thought to be near the minimum
+#       x2 - Additional abscissa thought to be near the minimum
+#	trace - Boolean variable that, if true,
+#               causes 'brackmin' to print a trace of its function
+#               evaluations to the standard output.  Default is 0.
+#
+# Results:
+#       Returns a three element list {x1 y1 x2 y2 x3 y3} where
+#       y1=f(x1), y2=f(x2), y3=f(x3).  x2 lies between x1 and x3, and
+#       y1>y2, y3>y2, proving that there is a local minimum somewhere
+#       in the interval (x1,x3).
+#
+# Side effects:
+#       Whatever effects the evaluation of f has.
+#
+#----------------------------------------------------------------------
+
+proc ::math::optimize::brackmin { f x1 x2 {trace 0} } {
+
+    set f [lreplace $f 0 0 [uplevel 1 [list namespace which [lindex $f 0]]]]
+
+    set phi 1.6180339887498949
+    set epsilon 1.0e-20
+    set limit 50.
+
+    # Choose a and b so that f(a) < f(b)
+
+    set cmd $f; lappend cmd $x1; set fx1 [eval $cmd]
+    if { $trace } {
+        puts "f($x1) = $fx1 (initialisation)"
+    }
+    set cmd $f; lappend cmd $x2; set fx2 [eval $cmd]
+    if { $trace } {
+        puts "f($x2) = $fx2 (initialisation)"
+    }
+    if { $fx1 > $fx2 } {
+        set a $x1; set fa $fx1
+        set b $x2; set fb $fx2
+    } else {
+        set a $x2; set fa $fx2
+        set b $x1; set fb $fx1
+    }
+
+    # Choose a c in the downhill direction
+
+    set c [expr { $b + $phi * ($b - $a) }]
+    set cmd $f; lappend cmd $c; set fc [eval $cmd]
+    if { $trace } {
+        puts "f($c) = $fc (initial dilatation by phi)"
+    }
+
+    while { $fb >= $fc } {
+
+        # Try to do parabolic extrapolation to the minimum
+
+        set r [expr { ($b - $a) * ($fb - $fc) }]
+        set q [expr { ($b - $c) * ($fb - $fa) }]
+        if { abs( $q - $r ) > $epsilon } {
+            set denom [expr { $q - $r }]
+        } elseif { $q > $r } {
+            set denom $epsilon
+        } else {
+            set denom -$epsilon
+        }
+        set u [expr { $b - ( (($b - $c) * $q - ($b - $a) * $r)
+                             / (2. * $denom) ) }]
+        set ulimit [expr { $b + $limit * ( $c - $b ) }]
+
+        # Test the extrapolated abscissa
+
+        if { ($b - $u) * ($u - $c) > 0 } {
+
+            # u lies between b and c.  Try to interpolate
+
+            set cmd $f; lappend cmd $u; set fu [eval $cmd]
+            if { $trace } {
+                puts "f($u) = $fu (parabolic interpolation)"
+            }
+
+            if { $fu < $fc } {
+
+                # fb > fu and fc > fu, so there is a minimum between b and c
+                # with u as a starting guess.
+
+                return [list $b $fb $u $fu $c $fc]
+
+            }
+
+            if { $fu > $fb } {
+
+                # fb < fu, fb < fa, and u cannot lie between a and b
+                # (because it lies between a and c).  There is a minimum
+                # somewhere between a and u, with b a starting guess.
+
+                return [list $a $fa $b $fb $u $fu]
+
+            }
+
+            # Parabolic interpolation was useless. Expand the
+            # distance by a factor of phi and try again.
+
+            set u [expr { $c + $phi * ($c - $b) }]
+            set cmd $f; lappend cmd $u; set fu [eval $cmd]
+            if { $trace } {
+                puts "f($u) = $fu (parabolic interpolation failed)"
+            }
+
+
+        } elseif { ( $c - $u ) * ( $u - $ulimit ) > 0 } {
+
+            # u lies between $c and $ulimit.
+
+            set cmd $f; lappend cmd $u; set fu [eval $cmd]
+            if { $trace } {
+                puts "f($u) = $fu (parabolic extrapolation)"
+            }
+
+            if { $fu > $fc } {
+
+                # minimum lies between b and u, with c an initial guess.
+
+                return [list $b $fb $c $fc $u $fu]
+
+            }
+
+            # function is still decreasing fa > fb > fc > fu. Take
+            # another factor-of-phi step.
+
+            set b $c; set fb $fc
+            set c $u; set fc $fu
+            set u [expr { $c + $phi * ( $c - $b ) }]
+            set cmd $f; lappend cmd $u; set fu [eval $cmd]
+            if { $trace } {
+                puts "f($u) = $fu (parabolic extrapolation ok)"
+            }
+
+        } elseif { ($u - $ulimit) * ( $ulimit - $c ) >= 0 } {
+
+            # u went past ulimit.  Pull in to ulimit and evaluate there.
+
+            set u $ulimit
+            set cmd $f; lappend cmd $u; set fu [eval $cmd]
+            if { $trace } {
+                puts "f($u) = $fu (limited step)"
+            }
+
+        } else {
+
+            # parabolic extrapolation gave a useless value.
+
+            set u [expr { $c + $phi * ( $c - $b ) }]
+            set cmd $f; lappend cmd $u; set fu [eval $cmd]
+            if { $trace } {
+                puts "f($u) = $fu (parabolic extrapolation failed)"
+            }
+
+        }
+
+        set a $b; set fa $fb
+        set b $c; set fb $fc
+        set c $u; set fc $fu
+    }
+
+    return [list $a $fa $b $fb $c $fc]
+}
+
+#----------------------------------------------------------------------
+#
+# min_unbound_1d --
+#
+#	Minimize a function of one variable, unconstrained, derivatives
+#	not required.
+#
+# Usage:
+#       min_bound_1d f x1 x2 ?-option value?,,,
+#
+# Parameters:
+#       f - Function to minimize.  Must be expressed as a Tcl
+#           command, to which will be appended the value at which
+#           to evaluate the function.
+#       x1 - Initial guess at the minimum
+#       x2 - Second initial guess at the minimum, used to set the
+#	     initial length scale for the search.
+#
+# Options:
+#       -relerror value
+#               Gives the tolerance desired for the returned
+#               abscissa.  Default is 1.0e-7.  Should never be less
+#               than the square root of the machine precision.
+#       -maxiter n
+#               Constrains min_bound_1d to evaluate the function
+#               no more than n times.  Default is 100.  If convergence
+#               is not achieved after the specified number of iterations,
+#               an error is thrown.
+#       -abserror value
+#               Gives the desired absolute error for the returned
+#               abscissa.  Default is 1.0e-10.
+#       -trace boolean
+#               A true value causes a trace to the standard output
+#               of the function evaluations. Default is 0.
+#
+#----------------------------------------------------------------------
+
+proc ::math::optimize::min_unbound_1d { f x1 x2 args } {
+
+    set f [lreplace $f 0 0 [uplevel 1 [list namespace which [lindex $f 0]]]]
+
+    array set params {
+	-relerror 1.0e-7
+	-abserror 1.0e-10
+	-maxiter 100
+        -trace 0
+    }
+    if { ( [llength $args] % 2 ) != 0 } {
+        return -code error -errorcode [list min_unbound_1d wrongNumArgs] \
+            "wrong \# args, should be\
+                 \"[lreplace [info level 0] 1 end \
+                         f x1 x2 ?-option value?...]\""
+    }
+    foreach { key value } $args {
+        if { ![info exists params($key)] } {
+            return -code error -errorcode [list min_unbound_1d badoption $key] \
+                "unknown option \"$key\",\
+                     should be -trace"
+        }
+        set params($key) $value
+    }
+    foreach { a fa b fb c fc } [brackmin $f $x1 $x2 $params(-trace)] {
+	break
+    }
+    return [eval [linsert [array get params] 0 \
+		      min_bound_1d $f $a $c -guess $b -fguess $fb]]
+}
+
+#----------------------------------------------------------------------
+#
+# nelderMead --
+#
+#	Attempt to minimize/maximize a function using the downhill
+#	simplex method of Nelder and Mead.
+#
+# Usage:
+#	nelderMead f x ?-keyword value?
+#
+# Parameters:
+#	f - The function to minimize.  The function must be an incomplete
+#	    Tcl command, to which will be appended N parameters.
+#	x - The starting guess for the minimum; a vector of N parameters
+#	    to be passed to the function f.
+#
+# Options:
+#	-scale xscale
+#		Initial guess as to the problem scale.  If '-scale' is
+#		supplied, then the parameters will be varied by the
+#	        specified amounts.  The '-scale' parameter must of the
+#		same dimension as the 'x' vector, and all elements must
+#		be nonzero.  Default is 0.0001 times the 'x' vector,
+#		or 0.0001 for zero elements in the 'x' vector.
+#
+#	-ftol epsilon
+#		Requested tolerance in the function value; nelderMead
+#		returns if N+1 consecutive iterates all differ by less
+#		than the -ftol value.  Default is 1.0e-7
+#
+#	-maxiter N
+#		Maximum number of iterations to attempt.  Default is
+#		500.
+#
+#	-trace flag
+#		If '-trace 1' is supplied, nelderMead writes a record
+#		of function evaluations to the standard output as it
+#		goes.  Default is 0.
+#
+#----------------------------------------------------------------------
+
+proc ::math::optimize::nelderMead { f startx args } {
+    array set params {
+	-ftol 1.e-7
+	-maxiter 500
+	-scale {}
+	-trace 0
+    }
+
+    # Check arguments
+
+    if { ( [llength $args] % 2 ) != 0 } {
+        return -code error -errorcode [list nelderMead wrongNumArgs] \
+            "wrong \# args, should be\
+                 \"[lreplace [info level 0] 1 end \
+                         f x1 x2 ?-option value?...]\""
+    }
+    foreach { key value } $args {
+        if { ![info exists params($key)] } {
+            return -code error -errorcode [list nelderMead badoption $key] \
+                "unknown option \"$key\",\
+                     should be -ftol, -maxiter, -scale or -trace"
+        }
+        set params($key) $value
+    }
+
+    # Construct the initial simplex
+
+    set vertices [list $startx]
+    if { [llength $params(-scale)] == 0 } {
+	set i 0
+	foreach x0 $startx {
+	    if { $x0 == 0 } {
+		set x1 0.0001
+	    } else {
+		set x1 [expr {1.0001 * $x0}]
+	    }
+	    lappend vertices [lreplace $startx $i $i $x1]
+	    incr i
+	}
+    } elseif { [llength $params(-scale)] != [llength $startx] } {
+	return -code error -errorcode [list nelderMead badOption -scale] \
+	    "-scale vector must be of same size as starting x vector"
+    } else {
+	set i 0
+	foreach x0 $startx s $params(-scale) {
+	    lappend vertices [lreplace $startx $i $i [expr { $x0 + $s }]]
+	    incr i
+	}
+    }
+
+    # Evaluate at the initial points
+
+    set n [llength $startx]
+    foreach x $vertices {
+	set cmd $f
+	foreach xx $x {
+	    lappend cmd $xx
+	}
+	set y [uplevel 1 $cmd]
+	if {$params(-trace)} {
+	    puts "nelderMead: evaluating initial point: x=[list $x] y=$y"
+	}
+	lappend yvec $y
+    }
+
+
+    # Loop adjusting the simplex in the 'vertices' array.
+
+    set nIter 0
+    while { 1 } {
+
+	# Find the highest, next highest, and lowest value in y,
+	# and save the indices.
+
+	set iBot 0
+	set yBot [lindex $yvec 0]
+	set iTop -1
+	set yTop [lindex $yvec 0]
+	set iNext -1
+	set i 0
+	foreach y $yvec {
+	    if { $y <= $yBot } {
+		set yBot $y
+		set iBot $i
+	    }
+	    if { $iTop < 0 || $y >= $yTop } {
+		set iNext $iTop
+		set yNext $yTop
+		set iTop $i
+		set yTop $y
+	    } elseif { $iNext < 0 || $y >= $yNext } {
+		set iNext $i
+		set yNext $y
+	    }
+	    incr i
+	}
+
+	# Return if the relative error is within an acceptable range
+
+	set rerror [expr { 2. * abs( $yTop - $yBot )
+			   / ( abs( $yTop ) + abs( $yBot ) + $params(-ftol) ) }]
+	if { $rerror < $params(-ftol) } {
+	    set status ok
+	    break
+	}
+
+	# Count iterations
+
+	if { [incr nIter] > $params(-maxiter) } {
+	    set status too-many-iterations
+	    break
+	}
+	incr nIter
+
+	# Find the centroid of the face opposite the vertex that
+	# maximizes the function value.
+
+	set centroid {}
+	for { set i 0 } { $i < $n } { incr i } {
+	    lappend centroid 0.0
+	}
+	set i 0
+	foreach v $vertices {
+	    if { $i != $iTop } {
+		set newCentroid {}
+		foreach x0 $centroid x1 $v {
+		    lappend newCentroid [expr { $x0 + $x1 }]
+		}
+		set centroid $newCentroid
+	    }
+	    incr i
+	}
+	set newCentroid {}
+	foreach x $centroid {
+	    lappend newCentroid [expr { $x / $n }]
+	}
+	set centroid $newCentroid
+
+	# The first trial point is a reflection of the high point
+	# around the centroid
+
+	set trial {}
+	foreach x0 [lindex $vertices $iTop] x1 $centroid {
+	    lappend trial [expr {$x1 + ($x1 - $x0)}]
+	}
+	set cmd $f
+	foreach xx $trial {
+	    lappend cmd $xx
+	}
+	set yTrial [uplevel 1 $cmd]
+	if { $params(-trace) } {
+	    puts "nelderMead: trying reflection: x=[list $trial] y=$yTrial"
+	}
+
+	# If that reflection yields a new minimum, replace the high point,
+	# and additionally try dilating in the same direction.
+
+	if { $yTrial < $yBot } {
+	    set trial2 {}
+	    foreach x0 $centroid x1 $trial {
+		lappend trial2 [expr { $x1 + ($x1 - $x0) }]
+	    }
+	    set cmd $f
+	    foreach xx $trial2 {
+		lappend cmd $xx
+	    }
+	    set yTrial2 [uplevel 1 $cmd]
+	    if { $params(-trace) } {
+		puts "nelderMead: trying dilated reflection:\
+                      x=[list $trial2] y=$y"
+	    }
+	    if { $yTrial2 < $yBot } {
+
+		# Additional dilation yields a new minimum
+
+		lset vertices $iTop $trial2
+		lset yvec $iTop $yTrial2
+	    } else {
+
+		# Additional dilation failed, but we can still use
+		# the first trial point.
+
+		lset vertices $iTop $trial
+		lset yvec $iTop $yTrial
+
+	    }
+	} elseif { $yTrial < $yNext } {
+
+	    # The reflected point isn't a new minimum, but it's
+	    # better than the second-highest.  Replace the old high
+	    # point and try again.
+
+	    lset vertices $iTop $trial
+	    lset yvec $iTop $yTrial
+
+	} else {
+
+	    # The reflected point is worse than the second-highest point.
+	    # If it's better than the highest, keep it... but in any case,
+	    # we want to try contracting the simplex, because a further
+	    # reflection will simply bring us back to the starting point.
+
+	    if { $yTrial < $yTop } {
+		lset vertices $iTop $trial
+		lset yvec $iTop $yTrial
+		set yTop $yTrial
+	    }
+	    set trial {}
+	    foreach x0 [lindex $vertices $iTop] x1 $centroid {
+		lappend trial [expr { ( $x0 + $x1 ) / 2. }]
+	    }
+	    set cmd $f
+	    foreach xx $trial {
+		lappend cmd $xx
+	    }
+	    set yTrial [uplevel 1 $cmd]
+	    if { $params(-trace) } {
+		puts "nelderMead: contracting from high point:\
+                      x=[list $trial] y=$y"
+	    }
+	    if { $yTrial < $yTop } {
+
+		# Contraction gave an improvement, so continue with
+		# the smaller simplex
+
+		lset vertices $iTop $trial
+		lset yvec $iTop $yTrial
+
+	    } else {
+
+		# Contraction gave no improvement either; we seem to
+		# be in a valley of peculiar topology.  Contract the
+		# simplex about the low point and try again.
+
+		set newVertices {}
+		set newYvec {}
+		set i 0
+		foreach v $vertices y $yvec {
+		    if { $i == $iBot } {
+			lappend newVertices $v
+			lappend newYvec $y
+		    } else {
+			set newv {}
+			foreach x0 $v x1 [lindex $vertices $iBot] {
+			    lappend newv [expr { ($x0 + $x1) / 2. }]
+			}
+			lappend newVertices $newv
+			set cmd $f
+			foreach xx $newv {
+			    lappend cmd $xx
+			}
+			lappend newYvec [uplevel 1 $cmd]
+			if { $params(-trace) } {
+			    puts "nelderMead: contracting about low point:\
+                                  x=[list $newv] y=$y"
+			}
+		    }
+		    incr i
+		}
+		set vertices $newVertices
+		set yvec $newYvec
+	    }
+
+	}
+
+    }
+    return [list y $yBot x [lindex $vertices $iBot] vertices $vertices yvec $yvec nIter $nIter status $status]
+
+}
+
+# solveLinearProgram
+#    Solve a linear program in standard form
+#
+# Arguments:
+#    objective     Vector defining the objective function
+#    constraints   Matrix of constraints (as a list of lists)
+#
+# Return value:
+#    Computed values for the coordinates or "unbounded" or "infeasible"
+#
+proc ::math::optimize::solveLinearProgram { objective constraints } {
+    #
+    # Check the arguments first and then put them in a more convenient
+    # form
+    #
+
+    foreach {nconst nvars matrix} \
+        [SimplexPrepareMatrix $objective $constraints] {break}
+
+    set solution [SimplexSolve $nconst nvars $matrix]
+
+    if { [llength $solution] > 1 } {
+        return [lrange $solution 0 [expr {$nvars-1}]]
+    } else {
+        return $solution
+    }
+}
+
+# linearProgramMaximum --
+#    Compute the value attained at the optimum
+#
+# Arguments:
+#    objective     The coefficients of the objective function
+#    result        The coordinate values as obtained by solving the program
+#
+# Return value:
+#    Value at the maximum point
+#
+proc ::math::optimize::linearProgramMaximum {objective result} {
+
+    set value    0.0
+
+    foreach coeff $objective coord $result {
+        set value [expr {$value+$coeff*$coord}]
+    }
+
+    return $value
+}
+
+# SimplexPrintMatrix
+#    Debugging routine: print the matrix in easy to read form
+#
+# Arguments:
+#    matrix        Matrix to be printed
+#
+# Return value:
+#    None
+#
+# Note:
+#    The tableau should be transposed ...
+#
+proc ::math::optimize::SimplexPrintMatrix {matrix} {
+    puts "\nBasis:\t[join [lindex $matrix 0] \t]"
+    foreach col [lrange $matrix 1 end] {
+        puts "      \t[join $col \t]"
+    }
+}
+
+# SimplexPrepareMatrix
+#    Prepare the standard tableau from all program data
+#
+# Arguments:
+#    objective     Vector defining the objective function
+#    constraints   Matrix of constraints (as a list of lists)
+#
+# Return value:
+#    List of values as a standard tableau and two values
+#    for the sizes
+#
+proc ::math::optimize::SimplexPrepareMatrix {objective constraints} {
+
+    #
+    # Check the arguments first
+    #
+    set nconst [llength $constraints]
+    set ncols {}
+    foreach row $constraints {
+        if { $ncols == {} } {
+            set ncols [llength $row]
+        } else {
+            if { $ncols != [llength $row] } {
+                return -code error -errorcode ARGS "Incorrectly formed constraints matrix"
+            }
+        }
+    }
+
+    set nvars [expr {$ncols-1}]
+
+    if { [llength $objective] != $nvars } {
+        return -code error -errorcode ARGS "Incorrect length for objective vector"
+    }
+
+    #
+    # Set up the tableau:
+    # Easiest manipulations if we store the columns first
+    # So:
+    # - First column is the list of variable indices in the basis
+    # - Second column is the list of maximum values
+    # - "nvars" columns that follow: the coefficients for the actual
+    #   variables
+    # - last "nconst" columns: the slack variables
+    #
+    set matrix   [list]
+    set lastrow  [concat $objective [list 0.0]]
+
+    set newcol   [list]
+    for {set idx 0} {$idx < $nconst} {incr idx} {
+        lappend newcol [expr {$nvars+$idx}]
+    }
+    lappend newcol "?"
+    lappend matrix $newcol
+
+    set zvector [list]
+    foreach row $constraints {
+        lappend zvector [lindex $row end]
+    }
+    lappend zvector 0.0
+    lappend matrix $zvector
+
+    for {set idx 0} {$idx < $nvars} {incr idx} {
+        set newcol [list]
+        foreach row $constraints {
+            lappend newcol [expr {double([lindex $row $idx])}]
+        }
+        lappend newcol [expr {-double([lindex $lastrow $idx])}]
+         lappend matrix $newcol
+    }
+
+    #
+    # Add the columns for the slack variables
+    #
+    set zeros {}
+    for {set idx 0} {$idx <= $nconst} {incr idx} {
+        lappend zeros 0.0
+    }
+    for {set idx 0} {$idx < $nconst} {incr idx} {
+        lappend matrix [lreplace $zeros $idx $idx 1.0]
+    }
+
+    return [list $nconst $nvars $matrix]
+}
+
+# SimplexSolve --
+#    Solve the given linear program using the simplex method
+#
+# Arguments:
+#    nconst        Number of constraints
+#    nvars         Number of actual variables
+#    tableau       Standard tableau (as a list of columns)
+#
+# Return value:
+#    List of values for the actual variables
+#
+proc ::math::optimize::SimplexSolve {nconst nvars tableau} {
+    set end 0
+    while { !$end } {
+
+        #
+        # Find the new variable to put in the basis
+        #
+        set nextcol [SimplexFindNextColumn $tableau]
+        if { $nextcol == -1 } {
+            set end 1
+            continue
+        }
+
+        #
+        # Now determine which one should leave
+        # TODO: is a lack of a proper row indeed an
+        #       indication of the infeasibility?
+        #
+        set nextrow [SimplexFindNextRow $tableau $nextcol]
+        if { $nextrow == -1 } {
+            return "unbounded"
+        }
+
+        #
+        # Make the vector for sweeping through the tableau
+        #
+        set vector [SimplexMakeVector $tableau $nextcol $nextrow]
+
+        #
+        # Sweep through the tableau
+        #
+        set tableau [SimplexNewTableau $tableau $nextcol $nextrow $vector]
+    }
+
+    #
+    # Now we can return the result
+    #
+    SimplexResult $tableau
+}
+
+# SimplexResult --
+#    Reconstruct the result vector
+#
+# Arguments:
+#    tableau       Standard tableau (as a list of columns)
+#
+# Return value:
+#    Vector of values representing the maximum point
+#
+proc ::math::optimize::SimplexResult {tableau} {
+    set result {}
+
+    set firstcol  [lindex $tableau 0]
+    set secondcol [lindex $tableau 1]
+    set result    {}
+
+    set nvars     [expr {[llength $tableau]-2}]
+    for {set i 0} {$i < $nvars } { incr i } {
+        lappend result 0.0
+    }
+
+    set idx 0
+    foreach col [lrange $firstcol 0 end-1] {
+        set value [lindex $secondcol $idx]
+        if { $value >= 0.0 } {
+            set result [lreplace $result $col $col [lindex $secondcol $idx]]
+            incr idx
+        } else {
+            # If a negative component, then the problem was not feasible
+            return "infeasible"
+        }
+    }
+
+    return $result
+}
+
+# SimplexFindNextColumn --
+#    Find the next column - the one with the largest negative
+#    coefficient
+#
+# Arguments:
+#    tableau       Standard tableau (as a list of columns)
+#
+# Return value:
+#    Index of the column
+#
+proc ::math::optimize::SimplexFindNextColumn {tableau} {
+    set idx        0
+    set minidx    -1
+    set mincoeff   0.0
+
+    foreach col [lrange $tableau 2 end] {
+        set coeff [lindex $col end]
+        if { $coeff < 0.0 } {
+            if { $coeff < $mincoeff } {
+                set minidx $idx
+               set mincoeff $coeff
+            }
+        }
+        incr idx
+    }
+
+    return $minidx
+}
+
+# SimplexFindNextRow --
+#    Find the next row - the one with the largest negative
+#    coefficient
+#
+# Arguments:
+#    tableau       Standard tableau (as a list of columns)
+#    nextcol       Index of the variable that will replace this one
+#
+# Return value:
+#    Index of the row
+#
+proc ::math::optimize::SimplexFindNextRow {tableau nextcol} {
+    set idx        0
+    set minidx    -1
+    set mincoeff   {}
+
+    set bvalues [lrange [lindex $tableau 1] 0 end-1]
+    set yvalues [lrange [lindex $tableau [expr {2+$nextcol}]] 0 end-1]
+
+    foreach rowcoeff $bvalues divcoeff $yvalues {
+        if { $divcoeff > 0.0 } {
+            set coeff [expr {$rowcoeff/$divcoeff}]
+
+            if { $mincoeff == {} || $coeff < $mincoeff } {
+                set minidx $idx
+                set mincoeff $coeff
+            }
+        }
+        incr idx
+    }
+
+    return $minidx
+}
+
+# SimplexMakeVector --
+#    Make the "sweep" vector
+#
+# Arguments:
+#    tableau       Standard tableau (as a list of columns)
+#    nextcol       Index of the variable that will replace this one
+#    nextrow       Index of the variable in the base that will be replaced
+#
+# Return value:
+#    Vector to be used to update the coefficients of the tableau
+#
+proc ::math::optimize::SimplexMakeVector {tableau nextcol nextrow} {
+
+    set idx      0
+    set vector   {}
+    set column   [lindex $tableau [expr {2+$nextcol}]]
+    set divcoeff [lindex $column $nextrow]
+
+    foreach colcoeff $column {
+        if { $idx != $nextrow } {
+            set coeff [expr {-$colcoeff/$divcoeff}]
+        } else {
+            set coeff [expr {1.0/$divcoeff-1.0}]
+        }
+        lappend vector $coeff
+        incr idx
+    }
+
+    return $vector
+}
+
+# SimplexNewTableau --
+#    Sweep through the tableau and create the new one
+#
+# Arguments:
+#    tableau       Standard tableau (as a list of columns)
+#    nextcol       Index of the variable that will replace this one
+#    nextrow       Index of the variable in the base that will be replaced
+#    vector        Vector to sweep with
+#
+# Return value:
+#    New tableau
+#
+proc ::math::optimize::SimplexNewTableau {tableau nextcol nextrow vector} {
+
+    #
+    # The first column: replace the nextrow-th element
+    # The second column: replace the value at the nextrow-th element
+    # For all the others: the same receipe
+    #
+    set firstcol   [lreplace [lindex $tableau 0] $nextrow $nextrow $nextcol]
+    set newtableau [list $firstcol]
+
+    #
+    # The rest of the matrix
+    #
+    foreach column [lrange $tableau 1 end] {
+        set yval   [lindex $column $nextrow]
+        set newcol {}
+        foreach c $column vcoeff $vector {
+            set newval [expr {$c+$yval*$vcoeff}]
+            lappend newcol $newval
+        }
+        lappend newtableau $newcol
+    }
+
+    return $newtableau
+}
+
+# Now we can announce our presence
+package provide math::optimize 1.0.1
+
+if { ![info exists ::argv0] || [string compare $::argv0 [info script]] } {
+    return
+}
+
+namespace import math::optimize::min_bound_1d
+namespace import math::optimize::maximum
+namespace import math::optimize::nelderMead
+
+proc f {x y} {
+    set xx [expr { $x - 3.1415926535897932 / 2. }]
+    set v1 [expr { 0.3 * exp( -$xx*$xx / 2. ) }]
+    set d [expr { 10. * $y - sin(9. * $x) }]
+    set v2 [expr { exp(-10.*$d*$d)}]
+    set rv [expr { -$v1 - $v2 }]
+    return $rv
+}
+
+proc g {a b} {
+    set x1 [expr {0.1 - $a + $b}]
+    set x2 [expr {$a + $b - 1.}]
+    set x3 [expr {3.-8.*$a+8.*$a*$a-8.*$b+8.*$b*$b}]
+    set x4 [expr {$a/10. + $b/10. + $x1*$x1/3. + $x2*$x2 - $x2 * exp(1-$x3*$x3)}]
+    return $x4
+}
+
+set prec $::tcl_precision
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    set ::tcl_precision 17
+} else {
+    set ::tcl_precision 0
+}
+
+puts "f"
+puts [math::optimize::nelderMead f {1. 0.} -scale {0.1 0.01} -trace 1]
+puts "g"
+puts [math::optimize::nelderMead g {0. 0.} -scale {1. 1.} -trace 1]
+
+set ::tcl_precision $prec
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/pca.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/pca.tcl
new file mode 100644
index 00000000..7eb5ebf4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/pca.tcl
@@ -0,0 +1,402 @@
+# pca.tcl --
+#     Package for principal component analysis
+#
+package require Tcl 8.6
+package require math::linearalgebra
+
+namespace eval ::math::PCA {
+    namespace export createPCA
+}
+
+# createPCA --
+#     Create a PCA object. Based on the observations the principal
+#     components are determined.
+#
+# Arguments:
+#     data           List of observations to be analysed
+#     args           Option-value pairs:
+#                    -covariance 1/0 - use covariances instead of correlations
+#
+# Returns:
+#     New object holding all information that is needed
+#
+proc ::math::PCA::createPCA {data args} {
+
+    return [pcaClass new $data $args]
+}
+
+# pcaClass --
+#     Class holding the variables and methods for PCA
+#
+::oo::class create ::math::PCA::pcaClass {
+     variable eigenValues      {}
+     variable eigenVectors     {}
+     variable retainedValues   {}
+     variable retainedVectors  {}
+     variable numberComponents 0
+     variable numberUsed       0
+     variable numberData       0
+     variable mean             {}
+     variable scale            {}
+     variable originalData     {}
+
+     constructor {data options} {
+         variable numberComponents
+         variable numberUsed
+
+         set originalData     $data
+         set numberComponents [llength [lindex $data 0]]
+         set numberUsed       $numberComponents
+         set numberData       [llength $data]
+
+         if { $numberComponents < 2 } {
+             return -code error "The data should contain at least two components"
+         }
+
+         set correlation 1
+
+         foreach {option value} $options {
+             switch -- $option {
+                 "" {
+                     # Use default
+                 }
+                 "-covariance" {
+                     set correlation [expr {$value? 0 : 1}]
+                 }
+                 default {
+                     return -code error "Unknown option: $option"
+                 }
+             }
+         }
+
+         lassign [::math::PCA::Transform $data $correlation] observations mean scale
+
+         #
+         # Determine the singular value decomposition
+         # Square and scale the singular values to get the proper eigenvalues
+         #
+         set usv          [::math::linearalgebra::determineSVD $observations]
+         set eigenVectors [lindex $usv 2]
+         set singular     [lindex $usv 1]
+
+         set factor       [expr {1.0 / ([llength $data] - 1)}]
+         set eigenValues  {}
+         foreach c $singular {
+             lappend eigenValues [expr {$c**2 * $factor}]
+         }
+
+         #
+         # By default we use all principal components
+         #
+         set retainedVectors $eigenVectors
+         set retainedValues  $eigenValues
+     }
+
+     #
+     # Get the eigenvectors - either the ones to be used or all vectors
+     #
+     method eigenvectors {{option {}}} {
+         variable eigenVectors
+         variable retainedVectors
+
+         if { $option eq "-all" } {
+             return $eigenVectors
+         } else {
+             return $retainedVectors
+         }
+     }
+
+     #
+     # Get the eigenvalues - either the ones to be used or all values
+     #
+     method eigenvalues {{option {}}} {
+         variable eigenValues
+         variable retainedValues
+
+         if { $option eq "-all" } {
+             return $eigenValues
+         } else {
+             return $retainedValues
+         }
+     }
+
+     #
+     # Approximate an observation vector using the selected components
+     #
+     method approximate {observation} {
+         variable retainedVectors
+         variable mean
+         variable scale
+
+         set z      [::math::PCA::Normalise $observation $mean $scale]
+         set t      [::math::linearalgebra::matmul $z $retainedVectors]
+         set zhat   [::math::linearalgebra::matmul $t [::math::linearalgebra::transpose $retainedVectors]]
+         set obshat [::math::PCA::Denormalise $zhat $mean $scale]
+
+         return $obshat
+     }
+
+     #
+     # Approximate the original data - convenience method
+     #
+     method approximateOriginal {} {
+         variable originalData
+
+         set approximation {}
+
+         foreach observation $originalData {
+             lappend approximation [my approximate $observation]
+         }
+
+         return $approximation
+     }
+
+     #
+     # Return the scores
+     #
+     method scores {observation} {
+         variable retainedVectors
+         variable mean
+         variable scale
+
+         set z [::math::PCA::Normalise $observation $mean $scale]
+         return [::math::linearalgebra::matmul $z $retainedVectors]
+     }
+
+     #
+     # Return the distance
+     #
+     method distance {observation} {
+         variable retainedVectors
+         variable mean
+         variable scale
+
+         set z          [normalise $observation $mean $scale]
+         set t          [::math::linearalgebra::matmul $z $retainedVectors]
+         set zhat       [::math::linearalgebra::matmul $t [::math::linearalgebra::transpose $retainedVectors]]
+         set difference [::math::linearalgebra::sub $z $zhat]
+         return [::math::linearalgebra::norm [::math::PCA::Denormalise $difference $mean $scale]]
+     }
+
+     #
+     # Return the Q statistic
+     #
+     method qstatistic {observation {option {}}} {
+         variable mean
+         variable scale
+
+         set z          [::math::PCA::Normalise $observation $mean $scale]
+         set t          [::math::linearalgebra::matmul $z $retainedVectors]
+         set zhat       [::math::linearalgebra::matmul $t [::math::linearalgebra::transpose $retainedVectors]]
+         set difference [::math::linearalgebra::sub $z $zhat]
+
+         set qstat      [::math::linearalgebra::dotproduct $difference $difference]
+         if { $option eq "" } {
+             return $qstat
+         } elseif { $option eq "-original" } {
+             return [expr {$qstat * double($numberData) / double($numberData - $numberUsed - 1)}]
+         } else {
+             return -code error "Unknown option: $option - should be \"-original\""
+         }
+     }
+
+     #
+     # Get the proportions - the amount of variation explained by the components
+     #
+     method proportions {} {
+         variable retainedValues
+
+         set unscaledProportions {}
+         foreach e $retainedValues {
+             lappend unscaledProportions [expr {$e**2}]
+         }
+
+         set scale [lindex $unscaledProportions end]
+
+         foreach p $unscaledProportions {
+             lappend proportions [expr {$p / $scale}]
+         }
+         return $proportions
+     }
+
+     #
+     # Set/get number of components to be used
+     #
+     method using {args} {
+         variable numberComponents
+         variable numberUsed
+         variable eigenVectors
+         variable retainedVectors
+
+         if { [llength $args] == 0 } {
+
+             return $numberUsed
+
+         } elseif { [llength $args] == 1 } {
+
+             set numberUsed [lindex $args 0]
+             if { ![string is integer $numberUsed] || $numberUsed < 1 || $numberUsed > $numberComponents } {
+                 return -code error "Number of components to be used must be between 1 and $numberComponents"
+             }
+
+         } elseif { [llength $args] == 2 } {
+
+             if { [lindex $args 0] == "-minproportion" } {
+                 set minimum [lindex $args 1]
+                 if { [string is double $minimum] || $minimum <= 0.0 || $minimum > 1.0 } {
+                     return -code error "Wrong arguments: the minimum proportion must be a number between 0 and 1 - it is \"$minimum\""
+                 }
+
+                 set sum    0.0
+                 set number 0
+                 foreach proportion [my proportions] {
+                     set  sum    [expr {$sum + $proportion}]
+                     incr number
+
+                     if { $sum >= $minimum } {
+                         break
+                     }
+                 }
+             }
+             if { $number == 0 } {
+                 set number 1
+             }
+             set numberUsed $number
+
+         } else {
+             return -code error "Wrong arguments: use either the number of components or the minimal proportion"
+         }
+
+         if { $numberUsed < $numberComponents } {
+             set retainedValues  [lrange $eigenValues 0 [expr {$numberUsed-1}]]
+             set retainedVectors {}
+             foreach row $eigenVectors {
+                 lappend retainedVectors [lrange $row 0 [expr {$numberUsed-1}]]
+             }
+         } else {
+             set retainedValues  $eigenValues
+             set retainedVectors $eigenVectors
+         }
+
+         return $numberUsed
+     }
+}
+
+# Normalise --
+#     Normalise a vector, given mean and standard deviation
+#
+# Arguments:
+#     observation       Observation vector to be normalised
+#     mean              Mean value to be subtracted
+#     scale             Scale factor for dividing the values by
+#
+proc ::math::PCA::Normalise {observation mean scale} {
+    set result {}
+
+    foreach o $observation m $mean s $scale {
+        lappend result [expr {($o - $m) / $s}]
+    }
+
+    return $result
+}
+
+# Denormalise --
+#     Denormalise a vector, given mean and standard deviation
+#
+# Arguments:
+#     observation       Normalised observation vector
+#     mean              Mean value to be added
+#     scale             Scale factor for multiplying the values by
+#
+proc ::math::PCA::Denormalise {observation mean scale} {
+    set result {}
+
+    foreach o $observation m $mean s $scale {
+        lappend result [expr {$o * $s + $m}]
+    }
+
+    return $result
+}
+
+# Transform
+#     Transform the given observations and return the transformation parameters
+#
+# Arguments:
+#     observations      List of observation vectors
+#     correlation       Use correlation (1) or not
+#
+proc ::math::PCA::Transform {observations correlation} {
+    set columns [llength [lindex $observations 0]]
+    set number  [llength $observations]
+    set mean    [lrepeat $columns [expr {0.0}]]
+    set scale   [lrepeat $columns [expr {0.0}]]
+
+    foreach observation $observations {
+        set newMean  {}
+        set newScale {}
+        foreach o $observation m $mean s $scale {
+            lappend newMean  [expr {$m + $o}]
+            lappend newScale [expr {$s + $o**2}]
+        }
+        set mean  $newMean
+        set scale $newScale
+    }
+
+    set mean  {}
+    set scale {}
+
+    foreach m $newMean s $newScale {
+        lappend mean  [expr {$m / $number}]
+        if { $correlation } {
+            set sum [expr {($s - $m**2/$number)/($number-1)}]
+            lappend scale [expr {$sum >= 0.0 ? sqrt($sum) : 0.0}]
+        } else {
+            lappend scale 1.0
+        }
+    }
+
+    set result {}
+    foreach observation $observations {
+         lappend result [Normalise $observation $mean $scale]
+    }
+    return [list $result $mean $scale]
+}
+
+package provide math::PCA 1.0
+
+# Test
+if {0} {
+set data {
+    {7 4 3}
+    {4 1 8}
+    {6 3 5}
+    {8 6 1}
+    {8 5 7}
+    {7 2 9}
+    {5 3 3}
+    {9 5 8}
+    {7 4 5}
+    {8 2 2}
+}
+
+set pca [::math::PCA::createPCA $data]
+
+puts [$pca using]
+puts [$pca using 2]
+
+puts [::math::PCA::Transform $data 1]
+puts [::math::PCA::Normalise {1.0 2.0 3.0} {0.0 1.0 2.0} {2.0 2.0 2.0}]
+puts [::math::PCA::Denormalise {0.5 0.5 0.5} {0.0 1.0 2.0} {2.0 2.0 2.0}]
+
+puts "Eigenvalues:  [$pca eigenvalues]"
+puts "Eigenvectors: [::math::linearalgebra::show [$pca eigenvectors]]"
+#puts [$pca proportions] -- check the definition!
+$pca using 2
+puts "Observation:   [lindex $data 0]"
+puts "Approximation: [$pca approximate [lindex $data 0]]"
+puts "Scores:        [$pca scores [lindex $data 0]]"
+puts "Q-statistic:   [$pca qstatistic [lindex $data 0]]"
+puts "(corrected)    [$pca qstatistic [lindex $data 0] -original]"
+
+#puts [::math::PCA::createPCA $data -x 1]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/pdf_stat.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/pdf_stat.tcl
new file mode 100644
index 00000000..77af5b43
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/pdf_stat.tcl
@@ -0,0 +1,2676 @@
+# pdf_stat.tcl --
+#
+#    Collection of procedures for evaluating probability and
+#    cumulative density functions
+#    Part of "math::statistics"
+#
+#    january 2008: added procedures by Eric Kemp Benedict for
+#                  Gamma, Poisson and t-distributed variables.
+#                  Replacing some older versions.
+#
+
+# ::math::statistics --
+#   Namespace holding the procedures and variables
+#
+namespace eval ::math::statistics {
+
+    namespace export pdf-normal pdf-uniform pdf-lognormal \
+	    pdf-exponential pdf-triangular pdf-symmetric-triangular \
+	    cdf-normal cdf-uniform cdf-lognormal \
+	    cdf-exponential cdf-triangular cdf-symmetric-triangular \
+	    cdf-students-t \
+	    random-normal random-uniform random-lognormal \
+	    random-exponential random-triangular \
+	    histogram-uniform \
+	    pdf-gamma pdf-poisson pdf-chisquare pdf-students-t pdf-beta \
+	    pdf-weibull pdf-gumbel pdf-pareto pdf-cauchy \
+	    pdf-laplace pdf-kumaraswamy pdf-negative-binomial \
+	    cdf-gamma cdf-poisson cdf-chisquare cdf-beta cdf-F \
+	    cdf-weibull cdf-gumbel cdf-pareto cdf-cauchy \
+	    cdf-laplace cdf-kumaraswamy cdf-negative-binomial \
+	    random-gamma random-poisson random-chisquare random-students-t random-beta \
+	    random-weibull random-gumbel random-pareto random-cauchy \
+	    random-laplace random-kumaraswamy random-negative-binomial \
+	    incompleteGamma incompleteBeta \
+	    estimate-pareto empirical-distribution bootstrap estimate-exponential \
+	    estimate-laplace estimate-negative-binomial
+
+    variable cdf_normal_prob     {}
+    variable cdf_normal_x        {}
+    variable cdf_toms322_cached  {}
+    variable initialised_cdf     0
+    variable twopi               [expr {2.0*acos(-1.0)}]
+    variable pi                  [expr {acos(-1.0)}]
+}
+
+
+# pdf-normal --
+#    Return the probabilities belonging to a normal distribution
+#
+# Arguments:
+#    mean     Mean of the distribution
+#    stdev    Standard deviation
+#    x        Value for which the probability must be determined
+#
+# Result:
+#    Probability of value x under the given distribution
+#
+proc ::math::statistics::pdf-normal { mean stdev x } {
+    variable NEGSTDEV
+    variable factorNormalPdf
+
+    if { $stdev <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $NEGSTDEV $NEGSTDEV
+    }
+
+    set xn   [expr {($x-$mean)/$stdev}]
+    set prob [expr {exp(-$xn*$xn/2.0)/$stdev/$factorNormalPdf}]
+
+    return $prob
+}
+
+# pdf-lognormal --
+#    Return the probabilities belonging to a log-normal distribution
+#
+# Arguments:
+#    mean     Mean of the distribution
+#    stdev    Standard deviation
+#    x        Value for which the probability must be determined
+#
+# Result:
+#    Probability of value x under the given distribution
+#
+proc ::math::statistics::pdf-lognormal { mean stdev x } {
+    variable NEGSTDEV
+    variable factorNormalPdf
+
+    if { $stdev <= 0.0 || $mean <= 0.0 } {
+	return -code error -errorcode ARG \
+		-errorinfo "Standard deviation and mean must be positive" \
+		"Standard deviation and mean must be positive"
+    }
+
+    set sigma [expr {sqrt(log(1.0 + $stdev*$stdev /double($mean*$mean)))}]
+    set mu    [expr {log($mean) - 0.5 * $sigma * $sigma}]
+
+    set xn   [expr {(log($x)-$mu)/$sigma}]
+    set prob [expr {exp(-$xn*$xn/2.0)/$sigma/$factorNormalPdf}]
+
+    return $prob
+}
+
+
+# pdf-uniform --
+#    Return the probabilities belonging to a uniform distribution
+#    (parameters as minimum/maximum)
+#
+# Arguments:
+#    pmin      Minimum of the distribution
+#    pmax      Maximum of the distribution
+#    x         Value for which the probability must be determined
+#
+# Result:
+#    Probability of value x under the given distribution
+#
+proc ::math::statistics::pdf-uniform { pmin pmax x } {
+
+    if { $pmin >= $pmax } {
+	return -code error -errorcode ARG \
+		-errorinfo "Wrong order or zero range" \
+		"Wrong order or zero range"
+    }
+
+    set prob [expr {1.0/($pmax-$pmin)}]
+
+    if { $x < $pmin || $x > $pmax } { return 0.0 }
+
+    return $prob
+}
+
+
+# pdf-triangular --
+#    Return the probabilities belonging to a triangular distribution
+#    (parameters as minimum/maximum)
+#
+# Arguments:
+#    pmin      Minimum of the distribution
+#    pmax      Maximum of the distribution
+#    x         Value for which the probability must be determined
+#
+# Result:
+#    Probability of value x under the given distribution
+#
+# Note:
+#    If pmin > pmax, the main weight will be at the larger
+#    values.
+#
+proc ::math::statistics::pdf-triangular { pmin pmax x } {
+
+    if { $pmin == $pmax } {
+	return -code error -errorcode ARG \
+		-errorinfo "Zero range" \
+		"Zero range"
+    }
+
+    if { $pmin < $pmax } {
+        if { $x < $pmin || $x > $pmax } { return 0.0 }
+    } else {
+        if { $x < $pmax || $x > $pmin } { return 0.0 }
+    }
+
+    set prob [expr {2.0*(1.0-($x-$pmin)/($pmax-$pmin))}]
+
+
+    return $prob
+}
+
+
+# pdf-symmetric-triangular --
+#    Return the probabilities belonging to a symmetric triangular distribution
+#    (parameters as minimum/maximum)
+#
+# Arguments:
+#    pmin      Minimum of the distribution
+#    pmax      Maximum of the distribution
+#    x         Value for which the probability must be determined
+#
+# Result:
+#    Probability of value x under the given distribution
+#
+proc ::math::statistics::pdf-symmetric-triangular { pmin pmax x } {
+
+    if { $pmin == $pmax } {
+	return -code error -errorcode ARG \
+		-errorinfo "Zero range" \
+		"Zero range"
+    }
+
+    if { $pmin < $pmax } {
+        if { $x < $pmin || $x > $pmax } { return 0.0 }
+    } else {
+        if { $x < $pmax || $x > $pmin } { return 0.0 }
+    }
+
+    set diff   [expr {abs($pmax-$pmin)}]
+    set centre [expr {($pmax+$pmin)/2.0}]
+
+    set prob [expr {2./$diff * (1.0 - 2.*abs($x-$centre)/$diff)}]
+
+    return $prob
+}
+
+
+# pdf-exponential --
+#    Return the probabilities belonging to an exponential
+#    distribution
+#
+# Arguments:
+#    mean     Mean of the distribution
+#    x        Value for which the probability must be determined
+#
+# Result:
+#    Probability of value x under the given distribution
+#
+proc ::math::statistics::pdf-exponential { mean x } {
+    variable NEGSTDEV
+    variable OUTOFRANGE
+
+    if { $mean <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE \
+		"$OUTOFRANGE: mean must be positive"
+    }
+
+    if { $x < 0.0 } { return 0.0 }
+    if { $x > 700.0*$mean } { return 0.0 }
+
+    set prob [expr {exp(-$x/double($mean))/$mean}]
+
+    return $prob
+}
+
+
+# pdf-laplace --
+#    Return the probabilities belonging to a Laplace
+#    distribution
+#
+# Arguments:
+#    mean     Mean of the distribution
+#    scale    Scale (the spreading) of the distribution
+#    x        Value for which the probability must be determined
+#
+# Result:
+#    Probability of value x under the given distribution
+#
+proc ::math::statistics::pdf-laplace { mean scale x } {
+    variable NEGSTDEV
+    variable OUTOFRANGE
+
+    if { $scale <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE \
+		"$OUTOFRANGE: scale must be positive"
+    }
+
+    set prob [expr {exp(-($x-$mean)/double($scale))/(2.0*$scale)}]
+
+    return $prob
+}
+
+
+# pdf-kumaraswamy --
+#    Return the probabilities belonging to a Kumaraswamy
+#    distribution (akin to the Beta distribution, but tractable)
+#
+#    Arguments:
+#    a         First parameter of the Kumaraswamy distribution
+#    b         Second parameter of the Kumaraswamy distribution
+#    x         Value of variate
+#
+# Result:
+#    Probability of value x under the given distribution
+#
+proc ::math::statistics::pdf-kumaraswamy { a b x } {
+    variable OUTOFRANGE
+
+    if { $a <= 0.0 || $b <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE \
+		"$OUTOFRANGE: parameters a and b must be positive"
+    }
+
+    set prob [expr {$a * $b * $x**($a-1) * (1.0 -$x**$a)**($b-1)}]
+
+    return $prob
+}
+
+
+# pdf-negative-binomial --
+#    Return the probability belonging to a negative binomial
+#    distribution
+#
+#    Arguments:
+#    r         Allowed number of failures for the distribution
+#    p         Probability of success for the negative bionomial distribution
+#    k         Value of variate (integer)
+#
+# Result:
+#    Probability of k successes under the given distribution
+#
+proc ::math::statistics::pdf-negative-binomial { r p k } {
+    variable OUTOFRANGE
+    variable INVALID
+
+    if { $p < 0.0 || $p >= 1.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE \
+		"$OUTOFRANGE: parameter p must be non-negative and lower than 1"
+    }
+
+    if { int($r) != $r || $r < 1 } {
+	return -code error -errorcode ARG -errorinfo $INVALIDE \
+		"$INVALID: parameter r must be a positive integer"
+    }
+
+    set coeff [::math::choose [expr {$k+$r-1}] $k]
+    set prob  [expr {$coeff * (1.0 - $p)**$r * $p ** $k}]
+
+    return $prob
+}
+
+
+# cdf-normal --
+#    Return the cumulative probability belonging to a normal distribution
+#
+# Arguments:
+#    mean     Mean of the distribution
+#    stdev    Standard deviation
+#    x        Value for which the probability must be determined
+#
+# Result:
+#    Cumulative probability of value x under the given distribution
+#
+proc ::math::statistics::cdf-normal { mean stdev x } {
+    variable NEGSTDEV
+
+    if { $stdev <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $NEGSTDEV $NEGSTDEV
+    }
+
+    set xn    [expr {($x-double($mean))/$stdev}]
+    set prob1 [Cdf-toms322 1 5000 [expr {$xn*$xn}]]
+    if { $xn > 0.0 } {
+	set prob [expr {0.5+0.5*$prob1}]
+    } else {
+	set prob [expr {0.5-0.5*$prob1}]
+    }
+
+    return $prob
+}
+
+
+# cdf-lognormal --
+#    Return the cumulative probability belonging to a log-normal distribution
+#
+# Arguments:
+#    mean     Mean of the distribution
+#    stdev    Standard deviation
+#    x        Value for which the probability must be determined
+#
+# Result:
+#    Probability of value x under the given distribution
+#
+proc ::math::statistics::cdf-lognormal { mean stdev x } {
+    variable NEGSTDEV
+
+    if { $stdev <= 0.0 || $mean <= 0.0 } {
+	return -code error -errorcode ARG \
+		-errorinfo "Standard deviation and mean must be positive" \
+		"Standard deviation and mean must be positive"
+    }
+
+    set sigma [expr {sqrt(log(1.0 + $stdev*$stdev /double($mean*$mean)))}]
+    set mu    [expr {log($mean) - 0.5 * $sigma * $sigma}]
+
+    set xn   [expr {(log($x)-$mu)/$sigma}]
+    set prob1 [Cdf-toms322 1 5000 [expr {$xn*$xn}]]
+    if { $xn > 0.0 } {
+	set prob [expr {0.5+0.5*$prob1}]
+    } else {
+	set prob [expr {0.5-0.5*$prob1}]
+    }
+
+    return $prob
+}
+
+
+# cdf-students-t --
+#    Return the cumulative probability belonging to the
+#    Student's t distribution
+#
+# Arguments:
+#    degrees  Number of degrees of freedom
+#    x        Value for which the probability must be determined
+#
+# Result:
+#    Cumulative probability of value x under the given distribution
+#
+proc ::math::statistics::cdf-students-t { degrees x } {
+
+    if { $degrees <= 0 } {
+	return -code error -errorcode ARG -errorinfo \
+		"Number of degrees of freedom must be positive" \
+		"Number of degrees of freedom must be positive"
+    }
+
+    set prob1 [Cdf-toms322 1 $degrees [expr {$x*$x}]]
+    set prob  [expr {0.5+0.5*$prob1}]
+
+    return $prob
+}
+
+
+# cdf-uniform --
+#    Return the cumulative probabilities belonging to a uniform
+#    distribution (parameters as minimum/maximum)
+#
+# Arguments:
+#    pmin      Minimum of the distribution
+#    pmax      Maximum of the distribution
+#    x         Value for which the probability must be determined
+#
+# Result:
+#    Cumulative probability of value x under the given distribution
+#
+proc ::math::statistics::cdf-uniform { pmin pmax x } {
+
+    if { $pmin >= $pmax } {
+	return -code error -errorcode ARG \
+		-errorinfo "Wrong order or zero range" \
+	    }
+
+    set prob [expr {($x-$pmin)/double($pmax-$pmin)}]
+
+    if { $x < $pmin } { return 0.0 }
+    if { $x > $pmax } { return 1.0 }
+
+    return $prob
+}
+
+
+# cdf-triangular --
+#    Return the cumulative probabilities belonging to a triangular distribution
+#    (parameters as minimum/maximum)
+#
+# Arguments:
+#    pmin      Minimum of the distribution
+#    pmax      Maximum of the distribution
+#    x         Value for which the probability must be determined
+#
+# Result:
+#    Probability of value x under the given distribution
+#
+# Note:
+#    If pmin > pmax, the main weight will be at the larger
+#    values.
+#
+proc ::math::statistics::cdf-triangular { pmin pmax x } {
+
+    if { $pmin == $pmax } {
+	return -code error -errorcode ARG \
+		-errorinfo "Zero range" \
+		"Zero range"
+    }
+
+
+    if { $pmin < $pmax } {
+        if { $x < $pmin } { return 0.0 }
+        if { $x > $pmax } { return 1.0 }
+        set xm   [expr {($x - $pmin) / ($pmax - $pmin)}]
+        set prob [expr {2.0*$xm - $xm**2}]
+    } else {
+        if { $x < $pmax } { return 0.0 }
+        if { $x > $pmin } { return 1.0 }
+        set xm   [expr {($x - $pmax) / ($pmin - $pmax)}]
+        set prob [expr {$xm**2}]
+    }
+
+    return $prob
+}
+
+
+# cdf-symmetric-triangular --
+#    Return the cumulative probabilities belonging to a symmetric triangular distribution
+#    (parameters as minimum/maximum)
+#
+# Arguments:
+#    pmin      Minimum of the distribution
+#    pmax      Maximum of the distribution
+#    x         Value for which the probability must be determined
+#
+# Result:
+#    Probability of value x under the given distribution
+#
+proc ::math::statistics::cdf-symmetric-triangular { pmin pmax x } {
+
+    if { $pmin == $pmax } {
+	return -code error -errorcode ARG \
+		-errorinfo "Zero range" \
+		"Zero range"
+    }
+
+
+    set diff   [expr {abs($pmax-$pmin)/2.0}]
+    set centre [expr {($pmax+$pmin)/2.0}]
+
+    if { $pmin < $pmax } {
+        if { $x < $pmin } { return 0.0 }
+        if { $x > $pmax } { return 1.0 }
+    } else {
+        if { $x < $pmax } { return 0.0 }
+        if { $x > $pmin } { return 1.0 }
+    }
+
+    if { $x < $centre } {
+        set xm   [expr {($x - $centre + $diff) / $diff}]
+        set prob [expr {0.5 * $xm**2}]
+    } else {
+        set xm   [expr {($x - $centre - $diff) / $diff}]
+        set prob [expr {1.0 - 0.5 * $xm**2}]
+    }
+
+    return $prob
+}
+
+
+# cdf-exponential --
+#    Return the cumulative probabilities belonging to an exponential
+#    distribution
+#
+# Arguments:
+#    mean     Mean of the distribution
+#    x        Value for which the probability must be determined
+#
+# Result:
+#    Cumulative probability of value x under the given distribution
+#
+proc ::math::statistics::cdf-exponential { mean x } {
+    variable NEGSTDEV
+    variable OUTOFRANGE
+
+    if { $mean <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE \
+		"$OUTOFRANGE: mean must be positive"
+    }
+
+    if { $x <  0.0 } { return 0.0 }
+    if { $x > 30.0*$mean } { return 1.0 }
+
+    set prob [expr {1.0-exp(-$x/double($mean))}]
+
+    return $prob
+}
+
+
+# cdf-laplace --
+#    Return the cumulative probabilities belonging to a Laplace
+#    distribution
+#
+# Arguments:
+#    mean     Mean of the distribution
+#    scale    Scale (the spreading) of the distribution
+#    x        Value for which the probability must be determined
+#
+# Result:
+#    Cumulative probability of value x under the given distribution
+#
+proc ::math::statistics::cdf-laplace { mean scale x } {
+    variable NEGSTDEV
+    variable OUTOFRANGE
+
+    if { $scale <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE \
+		"$OUTOFRANGE: scale must be positive"
+    }
+
+    if { $x < $mean } {
+        set prob [expr {0.5 * exp(($x-$mean)/double($scale))}]
+    } else {
+        set prob [expr {1.0 - 0.5 * exp(($mean-$x)/double($scale))}]
+    }
+
+    return $prob
+}
+
+
+# cdf-kumaraswamy --
+#    Return the cumulative probabilities belonging to a Kumaraswamy
+#    distribution (akin to the Beta distribution, but tractable)
+#
+#    Arguments:
+#    a         First parameter of the Kumaraswamy distribution
+#    b         Second parameter of the Kumaraswamy distribution
+#    x         Value of variate
+#
+# Result:
+#    Cumulative probability of value x under the given distribution
+#
+proc ::math::statistics::cdf-kumaraswamy { a b x } {
+    variable OUTOFRANGE
+
+    if { $a <= 0.0 || $b <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE \
+		"$OUTOFRANGE: parameters a and b must be positive"
+    }
+
+    set prob [expr {1.0 - (1.0-$x**$a) ** $b}]
+
+    return $prob
+}
+
+
+# cdf-negative-binomial --
+#    Return the cumulative probability for a negative binomial distribution
+#
+#    Arguments:
+#    r         Allowed number of failures for the distribution
+#    p         Probability of success for the negative bionomial distribution
+#    k         Value of variate (integer)
+#
+# Result:
+#    Cumulative probability for up to k successes under the given distribution
+#
+proc ::math::statistics::cdf-negative-binomial { r p k } {
+    variable OUTOFRANGE
+    variable INVALID
+
+    if { $p < 0.0 || $p >= 1.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE \
+		"$OUTOFRANGE: parameter p must be non-negative and lower than 1"
+    }
+
+    if { int($r) != $r || $r < 1 } {
+	return -code error -errorcode ARG -errorinfo $INVALIDE \
+		"$INVALID: parameter r must be a positive integer"
+    }
+
+    set sum 0.0
+
+    for { set i 0 } { $i <= $k } { incr i } {
+        set prob [pdf-negative-binomial $r $p $i]
+        set sum  [expr {$sum + $prob}]
+    }
+
+    return $sum
+}
+
+
+# Inverse-cdf-uniform --
+#    Return the argument belonging to the cumulative probability
+#    for a uniform distribution (parameters as minimum/maximum)
+#
+# Arguments:
+#    pmin      Minimum of the distribution
+#    pmax      Maximum of the distribution
+#    prob      Cumulative probability for which the "x" value must be
+#              determined
+#
+# Result:
+#    X value that gives the cumulative probability under the
+#    given distribution
+#
+proc ::math::statistics::Inverse-cdf-uniform { pmin pmax prob } {
+
+    if {0} {
+	if { $pmin >= $pmax } {
+	    return -code error -errorcode ARG \
+		    -errorinfo "Wrong order or zero range" \
+		    "Wrong order or zero range"
+	}
+    }
+
+    set x [expr {$pmin+$prob*($pmax-$pmin)}]
+
+    if { $x < $pmin } { return $pmin }
+    if { $x > $pmax } { return $pmax }
+
+    return $x
+}
+
+
+# Inverse-cdf-exponential --
+#    Return the argument belonging to the cumulative probability
+#    for an exponential distribution
+#
+# Arguments:
+#    mean      Mean of the distribution
+#    prob      Cumulative probability for which the "x" value must be
+#              determined
+#
+# Result:
+#    X value that gives the cumulative probability under the
+#    given distribution
+#
+proc ::math::statistics::Inverse-cdf-exponential { mean prob } {
+
+    if {0} {
+	if { $mean <= 0.0 } {
+	    return -code error -errorcode ARG \
+		    -errorinfo "Mean must be positive" \
+		    "Mean must be positive"
+	}
+    }
+
+    set x [expr {-$mean*log(1.0-$prob)}]
+
+    return $x
+}
+
+
+# Inverse-cdf-normal --
+#    Return the argument belonging to the cumulative probability
+#    for a normal distribution
+#
+# Arguments:
+#    mean      Mean of the distribution
+#    stdev     Standard deviation of the distribution
+#    prob      Cumulative probability for which the "x" value must be
+#              determined
+#
+# Result:
+#    X value that gives the cumulative probability under the
+#    given distribution
+#
+proc ::math::statistics::Inverse-cdf-normal { mean stdev prob } {
+    variable cdf_normal_prob
+    variable cdf_normal_x
+
+    variable initialised_cdf
+    if { $initialised_cdf == 0 } {
+       Initialise-cdf-normal
+    }
+
+    # Look for the proper probability level first,
+    # then interpolate
+    #
+    # Note: the numerical data are connected to the length of
+    #       the lists - see Initialise-cdf-normal
+    #
+    set size 32
+    set idx  64
+    for { set i 0 } { $i <= 7 } { incr i } {
+	set upper [lindex $cdf_normal_prob $idx]
+	if { $prob > $upper } {
+	    set idx  [expr {$idx+$size}]
+	} else {
+	    set idx  [expr {$idx-$size}]
+	}
+	set size [expr {$size/2}]
+    }
+    #
+    # We have found a value that is close to the one we need,
+    # now find the enclosing interval
+    #
+    if { $upper < $prob } {
+	incr idx
+    }
+    set p1 [lindex $cdf_normal_prob [expr {$idx-1}]]
+    set p2 [lindex $cdf_normal_prob $idx]
+    set x1 [lindex $cdf_normal_x    [expr {$idx-1}]]
+    set x2 [lindex $cdf_normal_x    $idx           ]
+
+    set x  [expr {$x1+($x2-$x1)*($prob-$p1)/double($p2-$p1)}]
+
+    return [expr {$mean+$stdev*$x}]
+}
+
+
+# Initialise-cdf-normal --
+#    Initialise the private data for the normal cdf
+#
+# Arguments:
+#    None
+# Result:
+#    None
+# Side effect:
+#    Variable cdf_normal_prob and cdf_normal_x are filled
+#    so that we can use these as a look-up table
+#
+proc ::math::statistics::Initialise-cdf-normal { } {
+    variable cdf_normal_prob
+    variable cdf_normal_x
+
+    variable initialised_cdf
+    set initialised_cdf 1
+
+    set dx [expr {10.0/128.0}]
+
+    set cdf_normal_prob 0.5
+    set cdf_normal_x    0.0
+    for { set i 1 } { $i <= 64 } { incr i } {
+	set x    [expr {$i*$dx}]
+	if { $x != 0.0 } {
+	    set prob [Cdf-toms322 1 5000 [expr {$x*$x}]]
+	} else {
+	    set prob 0.0
+	}
+
+	set cdf_normal_x    [concat [expr {-$x}] $cdf_normal_x $x]
+	set cdf_normal_prob \
+		[concat [expr {0.5-0.5*$prob}] $cdf_normal_prob \
+		[expr {0.5+0.5*$prob}]]
+    }
+}
+
+
+# random-uniform --
+#    Return a list of random numbers satisfying a uniform
+#    distribution (parameters as minimum/maximum)
+#
+# Arguments:
+#    pmin      Minimum of the distribution
+#    pmax      Maximum of the distribution
+#    number    Number of values to generate
+#
+# Result:
+#    List of random numbers
+#
+proc ::math::statistics::random-uniform { pmin pmax number } {
+
+    if { $pmin >= $pmax } {
+	return -code error -errorcode ARG \
+		-errorinfo "Wrong order or zero range" \
+		"Wrong order or zero range"
+    }
+
+    set result {}
+    for { set i 0 }  {$i < $number } { incr i } {
+	lappend result [Inverse-cdf-uniform $pmin $pmax [expr {rand()}]]
+    }
+
+    return $result
+}
+
+
+# random-triangular --
+#    Return a list of random numbers satisfying a triangular
+#    distribution (parameters as minimum/maximum)
+#
+# Arguments:
+#    pmin      Minimum of the distribution
+#    pmax      Maximum of the distribution
+#    number    Number of values to generate
+#
+# Result:
+#    List of random numbers
+#
+proc ::math::statistics::random-triangular { pmin pmax number } {
+
+    if { $pmin == $pmax } {
+	return -code error -errorcode ARG \
+		-errorinfo "Zero range" \
+		"Zero range"
+    }
+
+    set diff [expr {$pmax - $pmin}]
+    if { $pmin < $pmax } {
+        set result {}
+        for { set i 0 }  {$i < $number } { incr i } {
+	    set r [expr {1.0 - sqrt(1.0 - rand())}]
+	    lappend result [expr {$pmin + $r * $diff}]
+        }
+    } else {
+        set result {}
+        for { set i 0 }  {$i < $number } { incr i } {
+	    lappend result [expr {$pmax - sqrt(rand()) * $diff}]
+        }
+    }
+
+    return $result
+}
+
+
+# random-symmetric-triangular --
+#    Return a list of random numbers satisfying a symmetric triangular
+#    distribution (parameters as minimum/maximum)
+#
+# Arguments:
+#    pmin      Minimum of the distribution
+#    pmax      Maximum of the distribution
+#    number    Number of values to generate
+#
+# Result:
+#    List of random numbers
+#
+proc ::math::statistics::random-symmetric-triangular { pmin pmax number } {
+
+    if { $pmin == $pmax } {
+	return -code error -errorcode ARG \
+		-errorinfo "Zero range" \
+		"Zero range"
+    }
+
+    set diff2 [expr {0.5 * ($pmax - $pmin)}]
+
+    set result {}
+    for { set i 0 }  {$i < $number } { incr i } {
+	lappend result [expr {$pmin + $diff2 * (rand() + rand())}]
+    }
+
+    return $result
+}
+
+
+# random-exponential --
+#    Return a list of random numbers satisfying an exponential
+#    distribution
+#
+# Arguments:
+#    mean      Mean of the distribution
+#    number    Number of values to generate
+#
+# Result:
+#    List of random numbers
+#
+proc ::math::statistics::random-exponential { mean number } {
+
+    if { $mean <= 0.0 } {
+	return -code error -errorcode ARG \
+		-errorinfo "Mean must be positive" \
+		"Mean must be positive"
+    }
+
+    set result {}
+    for { set i 0 }  {$i < $number } { incr i } {
+	lappend result [Inverse-cdf-exponential $mean [expr {rand()}]]
+    }
+
+    return $result
+}
+
+
+# random-normal --
+#    Return a list of random numbers satisfying a normal
+#    distribution
+#
+# Arguments:
+#    mean      Mean of the distribution
+#    stdev     Standard deviation of the distribution
+#    number    Number of values to generate
+#
+# Result:
+#    List of random numbers
+#
+# Note:
+#    This version uses the Box-Muller transformation,
+#    a quick and robust method for generating normally-
+#    distributed numbers.
+#
+proc ::math::statistics::random-normal { mean stdev number } {
+    variable twopi
+
+    if { $stdev <= 0.0 } {
+	return -code error -errorcode ARG \
+		-errorinfo "Standard deviation must be positive" \
+		"Standard deviation must be positive"
+    }
+
+#    set result {}
+#    for { set i 0 }  {$i < $number } { incr i } {
+#        lappend result [Inverse-cdf-normal $mean $stdev [expr {rand()}]]
+#    }
+
+    set result {}
+
+    for { set i 0 }  {$i < $number } { incr i 2 } {
+        set angle [expr {$twopi * rand()}]
+        set rad   [expr {sqrt(-2.0*log(rand()))}]
+        set xrand [expr {$rad * cos($angle)}]
+        set yrand [expr {$rad * sin($angle)}]
+        lappend result [expr {$mean + $stdev * $xrand}]
+        if { $i < $number-1 } {
+            lappend result [expr {$mean + $stdev * $yrand}]
+        }
+    }
+
+    return $result
+}
+
+
+
+# random-lognormal --
+#    Return a list of random numbers satisfying a log-normal
+#    distribution
+#
+# Arguments:
+#    mean      Mean of the distribution
+#    stdev     Standard deviation of the distribution
+#    number    Number of values to generate
+#
+# Result:
+#    List of random numbers
+#
+# Note:
+#    This version uses the Box-Muller transformation,
+#    a quick and robust method for generating normally-
+#    distributed numbers.
+#
+proc ::math::statistics::random-lognormal { mean stdev number } {
+    variable twopi
+
+    if { $stdev <= 0.0 || $mean <= 0.0 } {
+	return -code error -errorcode ARG \
+		-errorinfo "Standard deviation and mean must be positive" \
+		"Standard deviation and mean must be positive"
+    }
+
+    set sigma [expr {sqrt(log(1.0 + $stdev*$stdev /double($mean*$mean)))}]
+    set mu    [expr {log($mean) - 0.5 * $sigma * $sigma}]
+
+#    set result {}
+#    for { set i 0 }  {$i < $number } { incr i } {
+#        lappend result [Inverse-cdf-normal $mean $stdev [expr {rand()}]]
+#    }
+
+    #puts "Random-lognormal: $mu -- $sigma"
+
+    set result {}
+
+    for { set i 0 }  {$i < $number } { incr i 2 } {
+        set angle [expr {$twopi * rand()}]
+        set rad   [expr {sqrt(-2.0*log(rand()))}]
+        set xrand [expr {$rad * cos($angle)}]
+        set yrand [expr {$rad * sin($angle)}]
+        lappend result [expr {exp($mu + $sigma * $xrand)}]
+        if { $i < $number-1 } {
+            lappend result [expr {exp($mu + $sigma * $yrand)}]
+        }
+    }
+
+    return $result
+}
+
+# Cdf-toms322 --
+#    Calculate the cumulative density function for several distributions
+#    according to TOMS322
+#
+# Arguments:
+#    m         First number of degrees of freedom
+#    n         Second number of degrees of freedom
+#    x         Value for which the cdf must be calculated
+#
+# Result:
+#    Cumulatve density at x - details depend on distribution
+#
+# Notes:
+#    F-ratios:
+#        m - degrees of freedom for numerator
+#        n - degrees of freedom for denominator
+#        x - F-ratio
+#    Student's t (two-tailed):
+#        m - 1
+#        n - degrees of freedom
+#        x - square of t
+#    Normal deviate (two-tailed):
+#        m - 1
+#        n - 5000
+#        x - square of deviate
+#    Chi-square:
+#        m - degrees of freedom
+#        n - 5000
+#        x - chi-square/m
+#    The original code can be found at <http://www.netlib.org>
+#
+proc ::math::statistics::Cdf-toms322 { m n x } {
+    if { $x == 0.0 } {
+        return 0.0
+    }
+    set m [expr {$m < 300?  int($m) : 300}]
+    set n [expr {$n < 5000? int($n) : 5000}]
+    if { $m < 1 || $n < 1 } {
+	return -code error -errorcode ARG \
+		-errorinfo "Arguments m anf n must be greater/equal 1"
+    }
+
+    set a [expr {2*($m/2)-$m+2}]
+    set b [expr {2*($n/2)-$n+2}]
+    set w [expr {$x*double($m)/double($n)}]
+    set z [expr {1.0/(1.0+$w)}]
+
+    if { $a == 1 } {
+	if { $b == 1 } {
+	    set p [expr {sqrt($w)}]
+	    set y 0.3183098862
+	    set d [expr {$y*$z/$p}]
+	    set p [expr {2.0*$y*atan($p)}]
+	} else {
+	    set p [expr {sqrt($w*$z)}]
+	    set d [expr {$p*$z/(2.0*$w)}]
+	}
+    } else {
+	if { $b == 1 } {
+	    set p [expr {sqrt($z)}]
+	    set d [expr {$z*$p/2.0}]
+	    set p [expr {1.0-$p}]
+	} else {
+	    set d [expr {$z*$z}]
+	    set p [expr {$z*$w}]
+	}
+    }
+
+    set y [expr {2.0*$w/$z}]
+
+    if { $a == 1 } {
+	for { set j [expr {$b+2}] } { $j <= $n } { incr j 2 } {
+	    set d [expr {(1.0+double($a)/double($j-2)) * $d*$z}]
+	    set p [expr {$p+$d*$y/double($j-1)}]
+	}
+    } else {
+	set power [expr {($n-1)/2}]
+	set zk    [expr {pow($z,$power)}]
+	set d     [expr {($d*$zk*$n)/$b}]
+	set p     [expr {$p*$zk + $w*$z * ($zk-1.0)/($z-1.0)}]
+    }
+
+    set y [expr {$w*$z}]
+    set z [expr {2.0/$z}]
+    set b [expr {$n-2}]
+
+    for { set i [expr {$a+2}] } { $i <= $m } { incr i 2 } {
+	set j [expr {$i+$b}]
+	set d [expr {$y*$d*double($j)/double($i-2)}]
+	set p [expr {$p-$z*$d/double($j)}]
+    }
+    set prob $p
+    if  { $prob < 0.0 } { set prob 0.0 }
+    if  { $prob > 1.0 } { set prob 1.0 }
+
+    return $prob
+}
+
+
+# Inverse-cdf-toms322 --
+#    Return the argument belonging to the cumulative probability
+#    for an F, chi-square or t distribution
+#
+# Arguments:
+#    m         First number of degrees of freedom
+#    n         Second number of degrees of freedom
+#    prob      Cumulative probability for which the "x" value must be
+#              determined
+#
+# Result:
+#    X value that gives the cumulative probability under the
+#    given distribution
+#
+# Note:
+#    See the procedure Cdf-toms322 for more details
+#
+proc ::math::statistics::Inverse-cdf-toms322 { m n prob } {
+    variable cdf_toms322_cached
+    variable OUTOFRANGE
+
+    if { $prob <= 0 || $prob >= 1 } {
+	return -code error -errorcode $OUTOFRANGE $OUTOFRANGE
+    }
+
+    # Is the combination in cache? Then we can simply rely
+    # on that
+    #
+    foreach {m1 n1 prob1 x1} $cdf_toms322_cached {
+	if { $m1 == $m && $n1 == $n && $prob1 == $prob } {
+	    return $x1
+	}
+    }
+
+    #
+    # Otherwise first find a value of x for which Cdf(x) exceeds prob
+    #
+    set x1  1.0
+    set dx1 1.0
+    while { [Cdf-toms322 $m $n $x1] < $prob } {
+	set x1  [expr {$x1+$dx1}]
+	set dx1 [expr {2.0*$dx1}]
+    }
+
+    #
+    # Now, look closer
+    #
+    while { $dx1 > 0.0001 } {
+	set p1 [Cdf-toms322 $m $n $x1]
+	if { $p1 > $prob } {
+	    set x1  [expr {$x1-$dx1}]
+	} else {
+	    set x1  [expr {$x1+$dx1}]
+	}
+	set dx1 [expr {$dx1/2.0}]
+    }
+
+    #
+    # Cache the result
+    #
+    set last end
+    if { [llength $cdf_toms322_cached] > 27 } {
+	set last 26
+    }
+    set cdf_toms322_cached \
+	    [concat [list $m $n $prob $x1] [lrange $cdf_toms322_cached 0 $last]]
+
+    return $x1
+}
+
+
+# HistogramMake --
+#    Distribute the "observations" according to the cdf
+#
+# Arguments:
+#    cdf-values   Values for the cdf (relative number of observations)
+#    number       Total number of "observations" in the histogram
+#
+# Result:
+#    List of numbers, distributed over the buckets
+#
+proc ::math::statistics::HistogramMake { cdf-values number } {
+
+    set assigned  0
+    set result    {}
+    set residue   0.0
+    foreach cdfv $cdf-values {
+	set sum      [expr {$number*($cdfv + $residue)}]
+	set bucket   [expr {int($sum)}]
+	set residue  [expr {$sum-$bucket}]
+	set assigned [expr {$assigned-$bucket}]
+	lappend result $bucket
+    }
+    set remaining [expr {$number-$assigned}]
+    if { $remaining > 0 } {
+	lappend result $remaining
+    } else {
+	lappend result 0
+    }
+
+    return $result
+}
+
+
+# histogram-uniform --
+#    Return the expected histogram for a uniform distribution
+#
+# Arguments:
+#    min       Minimum the distribution
+#    max       Maximum the distribution
+#    limits    upper limits for the histogram buckets
+#    number    Total number of "observations" in the histogram
+#
+# Result:
+#    List of expected number of observations
+#
+proc ::math::statistics::histogram-uniform { min max limits number } {
+    if { $min >= $max } {
+	return -code error -errorcode ARG \
+		-errorinfo "Wrong order or zero range" \
+		"Wrong order or zero range"
+    }
+
+    set cdf_result {}
+    foreach limit $limits {
+	lappend cdf_result [cdf-uniform $min $max $limit]
+    }
+
+    return [HistogramMake $cdf_result $number]
+}
+
+
+# incompleteGamma --
+#     Evaluate the incomplete Gamma function Gamma(p,x)
+#
+# Arguments:
+#     x         X-value
+#     p         Parameter
+#
+# Result:
+#     Value of Gamma(p,x)
+#
+# Note:
+#     Implementation by Eric K. Benedict (2007)
+#     Adapted from Fortran code in the Royal Statistical Society's StatLib
+#     library (http://lib.stat.cmu.edu/apstat/), algorithm AS 32 (with
+#     some modifications from AS 239)
+#
+#     Calculate normalized incomplete gamma function
+#
+#                     1       / x               p-1
+#       P(p,x) =  --------   |   dt exp(-t) * t
+#                 Gamma(p)  / 0
+#
+#     Tested some values against R's pgamma function
+#
+proc ::math::statistics::incompleteGamma {x p {tol 1.0e-9}} {
+    set overflow 1.0e37
+
+    if {$x < 0} {
+        return -code error -errorcode ARG -errorinfo "x must be positive"
+    }
+    if {$p <= 0} {
+        return -code error -errorcode ARG -errorinfo "p must be greater than or equal to zero"
+    }
+
+    # If x is zero, incGamma is zero
+    if {$x == 0.0} {
+        return 0.0
+    }
+
+    # Use normal approx is p > 1000
+    if {$p > 1000} {
+        set pn1 [expr {3.0 * sqrt($p) * (pow(1.0 * $x/$p, 1.0/3.0) + 1.0/(9.0 * $p) - 1.0)}]
+        # pnorm is not robust enough for this calculation (overflows); cdf-normal could also be used
+        return [::math::statistics::pnorm_quicker $pn1]
+    }
+
+    # If x is extremely large compared to a (and now know p < 1000), then return 1.0
+    if {$x > 1.e8} {
+        return 1.0
+    }
+
+    set factor [expr {exp($p * log($x) -$x - [::math::ln_Gamma $p])}]
+
+    # Use series expansion (first option) or continued fraction
+    if {$x <= 1.0 || $x < $p} {
+        set gin 1.0
+        set term 1.0
+        set rn $p
+        while {1} {
+            set rn [expr {$rn + 1.0}]
+            set term [expr {1.0 * $term * $x/$rn}]
+            set gin [expr {$gin + $term}]
+            if {$term < $tol} {
+                set gin [expr {1.0 * $gin * $factor/$p}]
+                break
+            }
+        }
+    } else {
+        set a [expr {1.0 - $p}]
+        set b [expr {$a + $x + 1.0}]
+        set term 0.0
+        set pn1 1.0
+        set pn2 $x
+        set pn3 [expr {$x + 1.0}]
+        set pn4 [expr {$x * $b}]
+        set gin [expr {1.0 * $pn3/$pn4}]
+        while {1} {
+            set a [expr {$a + 1.0}]
+            set b [expr {$b + 2.0}]
+            set term [expr {$term + 1.0}]
+            set an [expr {$a * $term}]
+            set pn5 [expr {$b * $pn3 - $an * $pn1}]
+            set pn6 [expr {$b * $pn4 - $an * $pn2}]
+            if {$pn6 != 0.0} {
+                set rn [expr {1.0 * $pn5/$pn6}]
+                set dif [expr {abs($gin - $rn)}]
+                if {$dif <= $tol && $dif <= $tol * $rn} {
+                    break
+                }
+                set gin $rn
+            }
+            set pn1 $pn3
+            set pn2 $pn4
+            set pn3 $pn5
+            set pn4 $pn6
+            # Too big? Rescale
+            if {abs($pn5) >= $overflow} {
+                set pn1 [expr {$pn1 / $overflow}]
+                set pn2 [expr {$pn2 / $overflow}]
+                set pn3 [expr {$pn3 / $overflow}]
+                set pn4 [expr {$pn4 / $overflow}]
+            }
+        }
+        set gin [expr {1.0 - $factor * $gin}]
+    }
+
+    return $gin
+
+}
+
+
+# pdf-gamma --
+#    Return the probabilities belonging to a gamma distribution
+#
+# Arguments:
+#    alpha     Shape parameter
+#    beta      Rate parameter
+#    x         Value of variate
+#
+# Result:
+#    Probability density of the given value of x to occur
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2007
+#
+#    This uses the following parameterization for the gamma:
+#        GammaDist(x) = beta * (beta * x)^(alpha-1) e^(-beta * x) / GammaFunc(alpha)
+#    Here, alpha is the shape parameter, and beta is the rate parameter
+#    Alternatively, a "scale parameter" theta = 1/beta is sometimes used
+#
+proc ::math::statistics::pdf-gamma { alpha beta x } {
+
+    if {$beta < 0} {
+        return -code error -errorcode ARG -errorinfo "Rate parameter 'beta' must be positive"
+    }
+    if {$x < 0.0} {
+        return 0.0
+    }
+
+    set prod [expr {1.0 * $x * $beta}]
+    set Galpha [expr {exp([::math::ln_Gamma $alpha])}]
+
+    expr {(1.0 * $beta/$Galpha) * pow($prod, ($alpha - 1.0)) * exp(-$prod)}
+}
+
+
+# pdf-poisson --
+#    Return the probabilities belonging to a Poisson
+#    distribution
+#
+# Arguments:
+#    mu       Mean of the distribution
+#    k        Number of occurrences
+#
+# Result:
+#    Probability of k occurrences under the given distribution
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2007
+#
+proc ::math::statistics::pdf-poisson { mu k } {
+    set intk [expr {int($k)}]
+    expr {exp(-$mu + floor($k) * log($mu) - [::math::ln_Gamma [incr intk]])}
+}
+
+
+# pdf-chisquare --
+#    Return the probabilities belonging to a chi square distribution
+#
+# Arguments:
+#    df        Degree of freedom
+#    x         Value of variate
+#
+# Result:
+#    Probability density of the given value of x to occur
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2007
+#
+proc ::math::statistics::pdf-chisquare { df x } {
+
+    if {$df <= 0} {
+        return -code error -errorcode ARG -errorinfo "Degrees of freedom must be positive"
+    }
+
+    return [pdf-gamma [expr {0.5*$df}] 0.5 $x]
+}
+
+
+# pdf-students-t --
+#    Return the probabilities belonging to a Student's t distribution
+#
+# Arguments:
+#    degrees   Degree of freedom
+#    x         Value of variate
+#
+# Result:
+#    Probability density of the given value of x to occur
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2007
+#
+proc ::math::statistics::pdf-students-t { degrees x } {
+    variable pi
+
+    if {$degrees <= 0} {
+        return -code error -errorcode ARG -errorinfo "Degrees of freedom must be positive"
+    }
+
+    set nplus1over2 [expr {0.5 * ($degrees + 1)}]
+    set f1 [expr {exp([::math::ln_Gamma $nplus1over2] - \
+        [::math::ln_Gamma [expr {$nplus1over2 - 0.5}]])}]
+    set f2 [expr {1.0/sqrt($degrees * $pi)}]
+
+    expr {$f1 * $f2 * pow(1.0 + $x * $x/double($degrees), -$nplus1over2)}
+
+}
+
+
+# pdf-beta --
+#    Return the probabilities belonging to a Beta distribution
+#
+# Arguments:
+#    a         First parameter of the Beta distribution
+#    b         Second parameter of the Beta distribution
+#    x         Value of variate
+#
+# Result:
+#    Probability density of the given value of x to occur
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2008
+#
+proc ::math::statistics::pdf-beta { a b x } {
+    if {$x < 0.0 || $x > 1.0} {
+        return -code error "Value out of range in Beta density: x = $x, not in \[0, 1\]"
+    }
+    if {$a <= 0.0} {
+        return -code error "Value out of range in Beta density: a = $a, must be > 0"
+    }
+    if {$b <= 0.0} {
+        return -code error "Value out of range in Beta density: b = $b, must be > 0"
+    }
+    #
+    # Corner cases ... need to check these!
+    #
+    if {$x == 0.0} {
+        return [expr {$a > 1.0? 0.0 : Inf}]
+    }
+    if {$x == 1.0} {
+        return [expr {$b > 1.0? 0.0 : Inf}]
+    }
+    set aplusb [expr {$a + $b}]
+    set term1 [expr {[::math::ln_Gamma $aplusb]- [::math::ln_Gamma $a] - [::math::ln_Gamma $b]}]
+    set term2 [expr {($a - 1.0) * log($x) + ($b - 1.0) * log(1.0 - $x)}]
+
+    set term [expr {$term1 + $term2}]
+    if { $term > -200.0 } {
+        return [expr {exp($term)}]
+    } else {
+        return 0.0
+    }
+}
+
+
+# incompleteBeta --
+#    Evaluate the incomplete Beta integral
+#
+# Arguments:
+#    a         First parameter of the Beta integral
+#    b         Second parameter of the Beta integral
+#    x         Integration limit
+#    tol       (Optional) error tolerance (defaults to 1.0e-9)
+#
+# Result:
+#    Probability density of the given value of x to occur
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2008
+#
+proc ::math::statistics::incompleteBeta {a b x {tol 1.0e-9}} {
+    if {$x < 0.0 || $x > 1.0} {
+        return -code error "Value out of range in incomplete Beta function: x = $x, not in \[0, 1\]"
+    }
+    if {$a <= 0.0} {
+        return -code error "Value out of range in incomplete Beta function: a = $a, must be > 0"
+    }
+    if {$b <= 0.0} {
+        return -code error "Value out of range in incomplete Beta function: b = $b, must be > 0"
+    }
+
+    if {$x < $tol} {
+        return 0.0
+    }
+    if {$x > 1.0 - $tol} {
+        return 1.0
+    }
+
+    # Rearrange if necessary to get continued fraction to behave
+    if {$x < 0.5} {
+        return [beta_cont_frac $a $b $x $tol]
+    } else {
+        set z [beta_cont_frac $b $a [expr {1.0 - $x}] $tol]
+        return [expr {1.0 - $z}]
+    }
+}
+
+
+# beta_cont_frac --
+#    Evaluate the incomplete Beta integral via a continued fraction
+#
+# Arguments:
+#    a         First parameter of the Beta integral
+#    b         Second parameter of the Beta integral
+#    x         Integration limit
+#    tol       (Optional) error tolerance (defaults to 1.0e-9)
+#
+# Result:
+#    Probability density of the given value of x to occur
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2008
+#
+#    Continued fraction for Ix(a,b)
+#    Abramowitz & Stegun 26.5.9
+#
+proc ::math::statistics::beta_cont_frac {a b x {tol 1.0e-9}} {
+    set max_iter 512
+
+    set aplusb [expr {$a + $b}]
+    set amin1 [expr {$a - 1}]
+    set lnGapb [::math::ln_Gamma $aplusb]
+    set term1 [expr {$lnGapb- [::math::ln_Gamma $a] - [::math::ln_Gamma $b]}]
+    set term2 [expr {$a * log($x) + ($b - 1.0) * log(1.0 - $x)}]
+    set pref [expr {exp($term1 + $term2)/$a}]
+
+    set z [expr {$x / (1.0 - $x)}]
+
+    set v 1.0
+    set h_1 1.0
+    set h_2 0.0
+    set k_1 1.0
+    set k_2 1.0
+
+    for {set m 1} {$m < $max_iter} {incr m} {
+        set f1 [expr {$amin1 + 2 * $m}]
+        set e2m [expr {-$z * double(($amin1 + $m) * ($b - $m))/ \
+            double(($f1 - 1) * $f1)}]
+        set e2mp1 [expr {$z * double($m * ($aplusb - 1 + $m)) / \
+            double($f1 * ($f1 + 1))}]
+        set h_2m [expr {$h_1 + $e2m * $h_2}]
+        set k_2m [expr {$k_1 + $e2m * $k_2}]
+
+        set h_2 $h_2m
+        set k_2 $k_2m
+
+        set h_1 [expr {$h_2m + $e2mp1 * $h_1}]
+        set k_1 [expr {$k_2m + $e2mp1 * $k_1}]
+
+        set vprime [expr {$h_1/$k_1}]
+
+        if {abs($v - $vprime) < $tol} {
+            break
+        }
+
+        set v $vprime
+
+    }
+
+    if {$m == $max_iter} {
+        return -code error "beta_cont_frac: Exceeded maximum number of iterations"
+    }
+
+    set retval [expr {$pref * $v}]
+
+    # Because of imprecision in underlying Tcl calculations, may fall out of bounds
+    if {$retval < 0.0} {
+        set retval 0.0
+    } elseif {$retval > 1.0} {
+        set retval 1.0
+    }
+
+    return $retval
+}
+
+
+# pdf-weibull --
+#    Return the probabilities belonging to a Weibull distribution
+#
+# Arguments:
+#    scale     Scale parameter of the Weibull distribution
+#    shape     Shape parameter of the Weibull distribution
+#    x         Value of variate
+#
+# Result:
+#    Probability density of the given value of x to occur
+#
+# Note:
+#    "-$x ** $shape" is evaluated as "(-$x)**$shape", hence use a division
+#
+proc ::math::statistics::pdf-weibull { scale shape x } {
+    variable OUTOFRANGE
+
+    if { $x < 0 } {
+        return 0.0
+    }
+    if { $scale <= 0.0 || $shape <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE $OUTOFRANGE
+    }
+    set x [expr {$x / double($scale)}]
+    return [expr {$shape/double($scale) * pow($x,($shape-1.0)) / exp(pow($x,$shape))}]
+}
+
+
+# pdf-gumbel --
+#    Return the probabilities belonging to a Gumbel distribution
+#
+# Arguments:
+#    location  Location parameter of the Gumbel distribution
+#    scale     Scale parameter of the Gumbel distribution
+#    x         Value of variate
+#
+# Result:
+#    Probability density of the given value of x to occur
+#
+proc ::math::statistics::pdf-gumbel { location scale x } {
+    variable OUTOFRANGE
+
+    if { $scale <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE $OUTOFRANGE
+    }
+    set x [expr {($x - $location) / double($scale)}]
+    return [expr {exp(-$x - exp(-$x)) / $scale}]
+}
+
+
+# pdf-pareto --
+#    Return the probabilities belonging to a Pareto distribution
+#
+# Arguments:
+#    scale     Scale parameter of the Pareto distribution
+#    shape     Shape parameter of the Pareto distribution
+#    x         Value of variate
+#
+# Result:
+#    Probability density of the given value of x to occur
+#
+proc ::math::statistics::pdf-pareto { scale shape x } {
+    variable OUTOFRANGE
+
+    if { $x <= $scale } {
+        return 0.0
+    }
+    if { $scale <= 0.0 || $shape <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE $OUTOFRANGE
+    }
+    set x [expr {$x / double($scale)}]
+    return [expr {$shape / double($scale) / pow($x,($shape + 1.0))}]
+}
+
+
+# pdf-cauchy --
+#    Return the probabilities belonging to a Cauchy distribution
+#
+# Arguments:
+#    location  Location parameter of the Cauchy distribution
+#    scale     Scale parameter of the Cauchy distribution
+#    x         Value of variate
+#
+# Result:
+#    Probability density of the given value of x to occur
+#
+# Note:
+#    The Cauchy distribution does not have finite higher-order moments
+#
+proc ::math::statistics::pdf-cauchy { location scale x } {
+    variable OUTOFRANGE
+    variable pi
+
+    if { $scale <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE $OUTOFRANGE
+    }
+    set x [expr {($x - $location) / double($scale)}]
+    return [expr {1.0 / $pi / $scale / (1.0 +$x*$x)}]
+}
+
+
+# cdf-gamma --
+#    Return the cumulative probabilities belonging to a gamma distribution
+#
+# Arguments:
+#    alpha     Shape parameter
+#    beta      Rate parameter
+#    x         Value of variate
+#
+# Result:
+#    Cumulative probability of the given value of x to occur
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2007
+#
+proc ::math::statistics::cdf-gamma { alpha beta x } {
+    if { $x <= 0 } {
+        return 0.0
+    }
+    incompleteGamma [expr {$beta * $x}] $alpha
+}
+
+
+# cdf-poisson --
+#    Return the cumulative probabilities belonging to a Poisson
+#    distribution
+#
+# Arguments:
+#    mu       Mean of the distribution
+#    x        Number of occurrences
+#
+# Result:
+#    Probability of k occurrences under the given distribution
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2007
+#
+proc ::math::statistics::cdf-poisson { mu x } {
+    return [expr {1.0 - [incompleteGamma $mu [expr {floor($x) + 1}]]}]
+}
+
+
+# cdf-chisquare --
+#    Return the cumulative probabilities belonging to a chi square distribution
+#
+# Arguments:
+#    df        Degree of freedom
+#    x         Value of variate
+#
+# Result:
+#    Cumulative probability of the given value of x to occur
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2007
+#
+proc ::math::statistics::cdf-chisquare { df x } {
+
+    if {$df <= 0} {
+        return -code error -errorcode ARG -errorinfo "Degrees of freedom must be positive"
+    }
+
+    return [cdf-gamma [expr {0.5*$df}] 0.5 $x]
+}
+
+
+# cdf-beta --
+#    Return the cumulative probabilities belonging to a Beta distribution
+#
+# Arguments:
+#    a         First parameter of the Beta distribution
+#    b         Second parameter of the Beta distribution
+#    x         Value of variate
+#
+# Result:
+#    Cumulative probability of the given value of x to occur
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2008
+#
+proc ::math::statistics::cdf-beta { a b x } {
+        incompleteBeta $a $b $x
+}
+
+
+# cdf-F --
+#    Return the cumulative probabilities belonging to an Fisher F distribution
+#
+# Arguments:
+#    nf1       Degrees of freedom for numerator
+#    nf2       Degrees of freedom for denominator
+#    x         Value of variate
+#
+# Result:
+#    Cumulative probability of the given value of x to occur
+#
+proc ::math::statistics::cdf-F { nf1 nf2 x } {
+    set dx          [expr {$nf1 * double($x) / ($nf1 * $x + $nf2)}]
+    incompleteBeta [expr {$nf1/2.0}] [expr {$nf2/2.0}] $dx
+}
+
+
+# cdf-weibull --
+#    Return the cumulative probabilities belonging to a Weibull distribution
+#
+# Arguments:
+#    scale     Scale parameter of the Weibull distribution
+#    shape     Shape parameter of the Weibull distribution
+#    x         Value of variate
+#
+# Result:
+#    Cumulative probability of the given value of x to occur
+#
+proc ::math::statistics::cdf-weibull { scale shape x } {
+    variable OUTOFRANGE
+
+    if { $x <= 0 } {
+        return 0.0
+    }
+    if { $scale <= 0.0 || $shape <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE $OUTOFRANGE
+    }
+    set x [expr {$x / double($scale)}]
+    return [expr {1.0 - 1.0 / exp(pow($x,$shape))}]
+}
+
+
+# cdf-gumbel --
+#    Return the cumulative probabilities belonging to a Gumbel distribution
+#
+# Arguments:
+#    location  Location parameter of the Gumbel distribution
+#    scale     Scale parameter of the Gumbel distribution
+#    x         Value of variate
+#
+# Result:
+#    Cumulative probability of the given value of x to occur
+#
+proc ::math::statistics::cdf-gumbel { location scale x } {
+    variable OUTOFRANGE
+
+    if { $scale <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE $OUTOFRANGE
+    }
+    set x [expr {($x - $location) / double($scale)}]
+    return [expr {exp( -exp(-$x) )}]
+}
+
+
+# cdf-pareto --
+#    Return the cumulative probabilities belonging to a Pareto distribution
+#
+# Arguments:
+#    scale     Scale parameter of the Pareto distribution
+#    shape     Shape parameter of the Pareto distribution
+#    x         Value of variate
+#
+# Result:
+#    Cumulative probability density of the given value of x to occur
+#
+proc ::math::statistics::cdf-pareto { scale shape x } {
+    variable OUTOFRANGE
+
+    if { $x <= $scale } {
+        return 0.0
+    }
+    if { $scale <= 0.0 || $shape <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE $OUTOFRANGE
+    }
+    set x [expr {$x / double($scale)}]
+    return [expr {1.0 - 1.0 / pow($x,$shape)}]
+}
+
+
+# cdf-cauchy --
+#    Return the cumulative probabilities belonging to a Cauchy distribution
+#
+# Arguments:
+#    location  Scale parameter of the Cauchy distribution
+#    scale     Shape parameter of the Cauchy distribution
+#    x         Value of variate
+#
+# Result:
+#    Cumulative probability density of the given value of x to occur
+#
+proc ::math::statistics::cdf-cauchy { location scale x } {
+    variable OUTOFRANGE
+    variable pi
+
+    if { $scale <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE $OUTOFRANGE
+    }
+    set x [expr {($x - $location) / double($scale)}]
+    return [expr {0.5 + atan($x) / $pi}]
+}
+
+
+# random-gamma --
+#    Generate a list of gamma-distributed deviates
+#
+# Arguments:
+#    alpha     Shape parameter
+#    beta      Rate parameter
+#    number    Number of values to return
+#
+# Result:
+#    List of random values
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2007
+#    Generate a list of gamma-distributed random deviates
+#    Use Cheng's envelope rejection method, as documented in:
+#        Dagpunar, J.S. 2007
+#           "Simulation and Monte Carlo: With Applications in Finance and MCMC"
+#
+proc ::math::statistics::random-gamma {alpha beta number} {
+    if {$alpha <= 1} {
+        set lambda $alpha
+    } else {
+        set lambda [expr {sqrt(2.0 * $alpha - 1.0)}]
+    }
+    set retval {}
+    for {set i 0} {$i < $number} {incr i} {
+        while {1} {
+            # Two rands: one for deviate, one for acceptance/rejection
+            set r1 [expr {rand()}]
+            set r2 [expr {rand()}]
+            # Calculate deviate from enveloping proposal distribution (a Lorenz distribution)
+            set lnxovera [expr {(1.0/$lambda) * (log(1.0 - $r1) - log($r1))}]
+            if {![catch {expr {$alpha * exp($lnxovera)}} x]} {
+                # Apply acceptance criterion
+                if {log(4.0*$r1*$r1*$r2) < ($alpha - $lambda) * $lnxovera + $alpha - $x} {
+                    break
+                }
+            }
+        }
+        lappend retval [expr {1.0 * $x/$beta}]
+    }
+
+    return $retval
+}
+
+
+# random-poisson --
+#    Generate a list of Poisson-distributed deviates
+#
+# Arguments:
+#    mu        Mean value
+#    number    Number of deviates to return
+#
+# Result:
+#    List of random values
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2007
+#
+proc ::math::statistics::random-poisson {mu number} {
+    if {$mu < 20} {
+        return [Randp_invert $mu $number]
+    } else {
+        return [Randp_PTRS $mu $number]
+    }
+}
+
+
+# random-chisquare --
+#    Return a list of random numbers according to a chi square distribution
+#
+# Arguments:
+#    df        Degree of freedom
+#    number    Number of values to return
+#
+# Result:
+#    List of random numbers
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2007
+#
+proc ::math::statistics::random-chisquare { df number } {
+
+    if {$df <= 0} {
+        return -code error -errorcode ARG -errorinfo "Degrees of freedom must be positive"
+    }
+
+    return [random-gamma [expr {0.5*$df}] 0.5 $number]
+}
+
+
+# random-students-t --
+#    Return a list of random numbers according to a chi square distribution
+#
+# Arguments:
+#    degrees   Degree of freedom
+#    number    Number of values to return
+#
+# Result:
+#    List of random numbers
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2007
+#
+#    Use method from Appendix 4.3 in Dagpunar, J.S.,
+#    "Simulation and Monte Carlo: With Applications in Finance and MCMC"
+#
+proc ::math::statistics::random-students-t { degrees number } {
+    variable pi
+
+    if {$degrees < 1} {
+        return -code error -errorcode ARG -errorinfo "Degrees of freedom must be at least 1"
+    }
+
+    set dd [expr {double($degrees)}]
+    set k [expr {2.0/($dd - 1.0)}]
+
+    for {set i 0} {$i < $number} {incr i} {
+        set r1 [expr {rand()}]
+        if {$degrees > 1} {
+            set r2 [expr {rand()}]
+            set c [expr {cos(2.0 * $pi * $r2)}]
+            lappend retval [expr {sqrt($dd/ \
+                (1.0/(1.0 - pow($r1, $k)) \
+                - $c * $c)) * $c}]
+        } else {
+            lappend retval [expr {tan(0.5 * $pi * ($r1 + $r1 - 1))}]
+        }
+    }
+    set retval
+}
+
+
+# random-beta --
+#    Return a list of random numbers according to a Beta distribution
+#
+# Arguments:
+#    a         First parameter of the Beta distribution
+#    b         Second parameter of the Beta distribution
+#    number    Number of values to return
+#
+# Result:
+#    Cumulative probability of the given value of x to occur
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2008
+#
+#    Use trick from J.S. Dagpunar, "Simulation and
+#        Monte Carlo: With Applications in Finance
+#        and MCMC", Section 4.5
+#
+proc ::math::statistics::random-beta { a b number } {
+    set retval {}
+    foreach w [random-gamma $a 1.0 $number] y [random-gamma $b 1.0 $number] {
+        lappend retval [expr {$w / ($w + $y)}]
+    }
+    return $retval
+}
+
+
+# Random_invert --
+#    Generate a list of Poisson-distributed deviates - method 1
+#
+# Arguments:
+#    mu        Mean value
+#    number    Number of deviates to return
+#
+# Result:
+#    List of random values
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2007
+#
+#    Generate a poisson-distributed random deviate
+#    Use algorithm in section 4.9 of Dagpunar, J.S,
+#       "Simulation and Monte Carlo: With Applications
+#       in Finance and MCMC", pub. 2007 by Wiley
+#    This inverts the cdf using a "chop-down" search
+#    to avoid storing an extra intermediate value.
+#    It is only good for small mu.
+#
+proc ::math::statistics::Randp_invert {mu number} {
+    set W0 [expr {exp(-$mu)}]
+
+    set retval {}
+
+    for {set i 0} {$i < $number} {incr i} {
+        set W $W0
+        set R [expr {rand()}]
+        set X 0
+
+        while {$R > $W} {
+            set R [expr {$R - $W}]
+            incr X
+            set W [expr {$W * $mu/double($X)}]
+        }
+
+        lappend retval $X
+    }
+
+    return $retval
+}
+
+
+# Random_PTRS --
+#    Generate a list of Poisson-distributed deviates - method 2
+#
+# Arguments:
+#    mu        Mean value
+#    number    Number of deviates to return
+#
+# Result:
+#    List of random values
+#
+# Note:
+#    Implemented by Eric Kemp-Benedict, 2007
+#    Generate a poisson-distributed random deviate
+#    Use the transformed rejection method with
+#    squeeze of Hoermann:
+#        Wolfgang Hoermann, "The Transformed Rejection Method
+#        for Generating Poisson Random Variables,"
+#        Preprint #2, Dept of Applied Statistics and
+#        Data Processing, Wirtshcaftsuniversitaet Wien,
+#        http://statistik.wu-wien.ac.at/
+#    This method works for mu >= 10.
+#
+proc ::math::statistics::Randp_PTRS {mu number} {
+    set smu [expr {sqrt($mu)}]
+    set b [expr {0.931 + 2.53 * $smu}]
+    set a [expr {-0.059 + 0.02483 * $b}]
+    set vr [expr {0.9277 - 3.6224/($b - 2.0)}]
+    set invalpha [expr {1.1239 + 1.1328/($b - 3.4)}]
+    set lnmu [expr {log($mu)}]
+
+    set retval {}
+    for {set i 0} {$i < $number} {incr i} {
+        while 1 {
+            set U [expr {rand() - 0.5}]
+            set V [expr {rand()}]
+
+            set us [expr {0.5 - abs($U)}]
+            set k [expr {int(floor((2.0 * $a/$us + $b) * $U + $mu + 0.43))}]
+
+            if {$us >= 0.07 && $V <= $vr} {
+                break
+            }
+
+            if {$k < 0} {
+                continue
+            }
+
+            if {$us < 0.013 && $V > $us} {
+                continue
+            }
+
+            set kp1 [expr {$k+1}]
+            if {log($V * $invalpha / ($a/($us * $us) + $b)) <= -$mu + $k * $lnmu - [::math::ln_Gamma $kp1]} {
+                break
+            }
+        }
+
+        lappend retval $k
+    }
+    return $retval
+}
+
+
+# random-weibull --
+#    Generate a list of Weibull distributed deviates
+#
+# Arguments:
+#    scale     Scale parameter of the Weibull distribution
+#    shape     Shape parameter of the Weibull distribution
+#    number    Number of values to return
+#
+# Result:
+#    List of random values
+#
+proc ::math::statistics::random-weibull { scale shape number } {
+    variable OUTOFRANGE
+
+    if { $scale <= 0.0 || $shape <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE $OUTOFRANGE
+    }
+    set rshape [expr {1.0/$shape}]
+    set retval {}
+    for {set i 0} {$i < $number} {incr i} {
+        lappend retval [expr {$scale * pow( (-log(rand())),$rshape)}]
+    }
+    return $retval
+}
+
+
+# random-gumbel --
+#    Generate a list of Weibull distributed deviates
+#
+# Arguments:
+#    location  Location parameter of the Gumbel distribution
+#    scale     Scale parameter of the Gumbel distribution
+#    number    Number of values to return
+#
+# Result:
+#    List of random values
+#
+proc ::math::statistics::random-gumbel { location scale number } {
+    variable OUTOFRANGE
+
+    if { $scale <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE $OUTOFRANGE
+    }
+    set retval {}
+    for {set i 0} {$i < $number} {incr i} {
+        lappend retval [expr {$location - $scale * log(-log(rand()))}]
+    }
+    return $retval
+}
+
+
+# random-pareto --
+#    Generate a list of Pareto distributed deviates
+#
+# Arguments:
+#    scale     Scale parameter of the Pareto distribution
+#    shape     Shape parameter of the Pareto distribution
+#    number    Number of values to return
+#
+# Result:
+#    List of random values
+#
+proc ::math::statistics::random-pareto { scale shape number } {
+    variable OUTOFRANGE
+
+    if { $scale <= 0.0 || $shape <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE $OUTOFRANGE
+    }
+    set rshape [expr {1.0/$shape}]
+    set retval {}
+    for {set i 0} {$i < $number} {incr i} {
+        lappend retval [expr {$scale / pow(rand(),$rshape)}]
+    }
+    return $retval
+}
+
+
+# random-cauchy --
+#    Generate a list of Cauchy distributed deviates
+#
+# Arguments:
+#    location  Location parameter of the Cauchy distribution
+#    scale     Shape parameter of the Cauchy distribution
+#    number    Number of values to return
+#
+# Result:
+#    List of random values
+#
+proc ::math::statistics::random-cauchy { location scale number } {
+    variable OUTOFRANGE
+    variable pi
+
+    if { $scale <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE $OUTOFRANGE
+    }
+    set retval {}
+    for {set i 0} {$i < $number} {incr i} {
+        lappend retval [expr {$location + $scale * tan( $pi * (rand() - 0.5))}]
+    }
+    return $retval
+}
+
+
+# random-laplace --
+#    Generate a list of Laplace distributed deviates
+#
+# Arguments:
+#    mean     Mean of the distribution
+#    scale    Scale (the spreading) of the distribution
+#    number   Number of values to return
+#
+# Result:
+#    List of random numbers
+#
+proc ::math::statistics::random-laplace { mean scale number } {
+    variable NEGSTDEV
+    variable OUTOFRANGE
+
+    if { $scale <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE \
+		"$OUTOFRANGE: scale must be positive"
+    }
+
+    set retval {}
+    for {set i 0} {$i < $number} {incr i} {
+        set p [expr {rand()}]
+        if { $p < 0.5 } {
+            set x [expr {$mean + $scale * log(1.0 - 2.0*abs($p-0.5))}]
+        } else {
+            set x [expr {$mean - $scale * log(1.0 - 2.0*abs($p-0.5))}]
+        }
+        lappend retval $x
+    }
+
+    return $retval
+}
+
+
+# random-kumaraswamy --
+#    Generate a list of Kumaraswamy distributed deviates
+#
+#    Arguments:
+#    a         First parameter of the Kumaraswamy distribution
+#    b         Second parameter of the Kumaraswamy distribution
+#    number    Number of values to return
+#
+# Result:
+#    List of random numbers
+#
+proc ::math::statistics::random-kumaraswamy { a b number } {
+    variable OUTOFRANGE
+
+    if { $a <= 0.0 || $b <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE \
+		"$OUTOFRANGE: parameters a and b must be positive"
+    }
+
+    set ra [expr {1.0 / $a}]
+    set rb [expr {1.0 / $b}]
+
+    set retval {}
+    for {set i 0} {$i < $number} {incr i} {
+        set p [expr {rand()}]
+        set x [expr {( 1.0 - (1.0-$p) ** $rb ) ** $ra}]
+
+        lappend retval $x
+    }
+
+    return $retval
+}
+
+
+# random-negative-binomial --
+#    Generate a list of deviates according to the negative binomial distribution
+#
+#    Arguments:
+#    r         Allowed number of failures for the distribution
+#    p         Probability of success for the negative bionomial distribution
+#    number    Number of values to return
+#
+# Result:
+#    List of random numbers
+#
+proc ::math::statistics::random-negative-binomial { r p number } {
+    variable OUTOFRANGE
+    variable INVALID
+
+    if { $p < 0.0 || $p >= 1.0 } {
+	return -code error -errorcode ARG -errorinfo $OUTOFRANGE \
+		"$OUTOFRANGE: parameter p must be non-negative and lower than 1"
+    }
+
+    if { int($r) != $r || $r < 1} {
+	return -code error -errorcode ARG -errorinfo $INVALIDE \
+		"$INVALID: parameter r must be a positive integer"
+    }
+
+    set retval {}
+    for {set i 0} {$i < $number} {incr i} {
+        set success 0
+        set failure 0
+
+        while { $failure < $r } {
+            if { rand() <= $p } {
+                incr success
+            } else {
+                incr failure
+            }
+        }
+
+        lappend retval $success
+    }
+
+    return $retval
+}
+
+
+# estimate-pareto --
+#    Estimate the parameters of a Pareto distribution
+#
+# Arguments:
+#    values    Values that are supposed to be distributed according to Pareto
+#
+# Result:
+#    Estimates of the scale and shape parameters as well as the standard error
+#    for the shape parameter.
+#
+proc ::math::statistics::estimate-pareto { values } {
+    variable OUTOFRANGE
+    variable TOOFEWDATA
+
+    set nvalues  {}
+    set negative 0
+
+    foreach v $values {
+        if { $v != {} } {
+            lappend nvalues $v
+            if { $v <= 0.0 } {
+                set negative 1
+            }
+        }
+    }
+    if { [llength $nvalues] == 0 } {
+        return -code error -errorcode ARG -errorinfo $TOOFEWDATA $TOOFEWDATA
+    }
+    if { $negative } {
+        return -code error -errorcode ARG -errorinfo "One or more negative or zero values" $OUTOFRANGE
+    }
+
+    #
+    # Scale parameter
+    #
+    set scale [min $nvalues]
+
+    #
+    # Shape parameter
+    #
+    set n   [llength $nvalues]
+    set sum 0.0
+    foreach v $nvalues {
+        set sum [expr {$sum + log($v) - log($scale)}]
+    }
+    set shape [expr {$n / $sum}]
+
+    return [list $scale $shape [expr {$shape/sqrt($n)}]]
+}
+
+
+# estimate-exponential --
+#    Estimate the parameter of an exponential distribution
+#
+# Arguments:
+#    values    Values that are supposed to be exponentially distributed
+#
+# Result:
+#    Estimate of the one parameter of the exponential distribution
+#    as well as the asymptotic standard deviation
+#    (See https://www.statlect.com/fundamentals-of-statistics/exponential-distribution-maximum-likelihood)
+#
+proc ::math::statistics::estimate-exponential { values } {
+
+    set sum   0.0
+    set count 0
+
+    foreach v $values {
+        if { $v != "" } {
+            set  sum [expr {$sum + $v}]
+            incr count
+        }
+    }
+
+    set parameter [expr {$sum/double($count)}]
+    set stdev     [expr {$parameter / sqrt($count)}]
+
+    return [list $parameter $stdev]
+}
+
+
+# estimate-laplace --
+#    Estimate the parameter of a Laplace distribution
+#
+# Arguments:
+#    values    Values that are supposed to be Laplace distributed
+#
+# Result:
+#    Estimates of respectively the mean and the scale of the Laplace distribution
+#    (See https://en.wikipedia.org/wiki/Laplace_distribution)
+#
+# Note:
+#    According to Wikipedia the estimators are maximum-likelihood estimators
+#
+proc ::math::statistics::estimate-laplace { values } {
+
+    set mean [median $values]
+
+    set sum   0.0
+    set count 0
+
+    foreach v $values {
+        if { $v != "" } {
+            set  sum [expr {$sum + abs($v-$mean)}]
+            incr count
+        }
+    }
+
+    set scale [expr {$sum/double($count)}]
+
+    return [list $mean $scale]
+}
+
+
+# estimate-negative-binomial --
+#    Estimate the parameter p of a negative binomial distribution,
+#    given the allowed number of failures
+#
+# Arguments:
+#    r         Allowed number of failures
+#    values    Values that are supposed to be distributed according to a negative binomial distribution
+#
+# Result:
+#    Estimate of the probability of success for the distribution
+#
+# Note:
+#    According to Wikipedia the estimators are maximum-likelihood estimators
+#
+proc ::math::statistics::estimate-negative-binomial { r values } {
+
+    set sum   0.0
+    set count 0
+
+    foreach v $values {
+        if { $v != "" } {
+            set  sum [expr {$sum + $v}]
+            incr count
+        }
+    }
+
+    return [expr {$sum/double($count * $r + $sum)}]
+}
+
+
+# empirical-distribution --
+#    Determine the empirical distribution
+#
+# Arguments:
+#    values    Values that are to be examined
+#
+# Result:
+#    List of sorted values and their empirical probability
+#
+# Note:
+#    The value of "a" is adopted from the corresponding Wikipedia page,
+#    which in turn adopted it from the R "stats" package (qqnorm function)
+#
+proc ::math::statistics::empirical-distribution { values } {
+    variable TOOFEWDATA
+
+    set n   [llength $values]
+
+    if { $n < 5 } {
+        return -code error -errorcode ARG -errorinfo $TOOFEWDATA $TOOFEWDATA
+    }
+
+    set a   0.375
+    if { $n > 10 } {
+        set a 0.5
+    }
+
+    set distribution {}
+    set idx          1
+    foreach x [lsort -real -increasing $values] {
+        if { $x != {} } {
+            set p [expr {($idx - $a) / ($n + 1 - 2.0 * $a)}]
+
+            lappend distribution $x $p
+            incr idx
+        }
+    }
+
+    return $distribution
+}
+
+
+# bootstrap --
+#     Return samples according to the "bootstrap" method
+#
+# Arguments:
+#     data           List of data from which to construct the new sample or samples
+#     sampleSize     Number of values to draw for each sample
+#     numberSamples  Number of samples (defaults to 1)
+#
+# Result:
+#     Either a list of "sampleSize" values (if only one sample is required) or
+#     a list of "numberSamples" each of which is a list of "sampleSize" values.
+#
+proc ::math::statistics::bootstrap {data sampleSize {numberSamples 1}} {
+    if { $numberSamples > 1 } {
+        set samples {}
+        for {set i 0} {$i < $numberSamples} {incr i} {
+            lappend samples [bootstrap $data $sampleSize 1]
+        }
+        return $samples
+
+    } else {
+        set sample     {}
+        set numberData [llength $data]
+        for {set i 0} {$i < $sampleSize} {incr i} {
+            set idx [expr {int(rand() * $numberData)}]
+            lappend sample [lindex $data $idx]
+        }
+        return $sample
+    }
+}
+
+
+#
+# Simple numerical tests
+#
+if { [info exists ::argv0] && ([file tail [info script]] == [file tail $::argv0]) } {
+
+    #
+    # Apparent accuracy: at least one digit more than the ones in the
+    # given numbers
+    #
+    puts "Normal distribution - two-tailed"
+    foreach z    {4.417 3.891 3.291 2.576 2.241 1.960 1.645 1.150 0.674
+    0.319 0.126 0.063 0.0125} \
+	    pexp {1.e-5 1.e-4 1.e-3 1.e-2 0.025 0.050 0.100 0.250 0.500
+    0.750 0.900 0.950 0.990 } {
+	set prob [::math::statistics::Cdf-toms322 1 5000 [expr {$z*$z}]]
+	puts "$z - $pexp - [expr {1.0-$prob}]"
+    }
+    puts "Normal distribution (inverted; one-tailed)"
+    foreach p {0.001 0.01 0.1 0.25 0.5 0.75 0.9 0.99 0.999} {
+	puts "$p - [::math::statistics::Inverse-cdf-normal 0.0 1.0 $p]"
+    }
+    puts "Normal random variables"
+    set rndvars [::math::statistics::random-normal 1.0 2.0 20]
+    puts $rndvars
+    puts "Normal uniform variables"
+    set rndvars [::math::statistics::random-uniform 1.0 2.0 20]
+    puts $rndvars
+    puts "Normal exponential variables"
+    set rndvars [::math::statistics::random-exponential 2.0 20]
+    puts $rndvars
+
+    puts [::math::statistics::cdf-F 3 3 0.05]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/pkgIndex.tcl
new file mode 100644
index 00000000..6d6b10ac
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/pkgIndex.tcl
@@ -0,0 +1,42 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded math                    1.2.5 [list source [file join $dir math.tcl]]
+package ifneeded math::fuzzy             0.2.1 [list source [file join $dir fuzzy.tcl]]
+package ifneeded math::complexnumbers    1.0.2 [list source [file join $dir qcomplex.tcl]]
+package ifneeded math::constants         1.0.2 [list source [file join $dir constants.tcl]]
+package ifneeded math::polynomials       1.0.1 [list source [file join $dir polynomials.tcl]]
+package ifneeded math::rationalfunctions 1.0.1 [list source [file join $dir rational_funcs.tcl]]
+package ifneeded math::fourier           1.0.2 [list source [file join $dir fourier.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.3]} {return}
+package ifneeded math::roman             1.0   [list source [file join $dir romannumerals.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded math::optimize          1.0.1 [list source [file join $dir optimize.tcl]]
+package ifneeded math::interpolate       1.1.2 [list source [file join $dir interpolate.tcl]]
+package ifneeded math::bignum            3.1.1 [list source [file join $dir bignum.tcl]]
+package ifneeded math::bigfloat          1.2.3 [list source [file join $dir bigfloat.tcl]]
+package ifneeded math::machineparameters 0.1   [list source [file join $dir machineparameters.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded math::calculus          1.0   [list source [file join $dir calculus.tcl]]
+# statistics depends on linearalgebra (for multi-variate linear regression).
+# statistics depends on optimize (for logistic regression).
+package ifneeded math::statistics        1.5.0 [list source [file join $dir statistics.tcl]]
+package ifneeded math::linearalgebra     1.1.6 [list source [file join $dir linalg.tcl]]
+package ifneeded math::calculus::symdiff 1.0.1 [list source [file join $dir symdiff.tcl]]
+package ifneeded math::bigfloat          2.0.4 [list source [file join $dir bigfloat2.tcl]]
+package ifneeded math::numtheory         1.1.3 [list source [file join $dir numtheory.tcl]]
+package ifneeded math::decimal           1.0.4 [list source [file join $dir decimal.tcl]]
+package ifneeded math::geometry          1.4.1 [list source [file join $dir geometry.tcl]]
+package ifneeded math::trig              1.0   [list source [file join $dir trig.tcl]]
+package ifneeded math::quasirandom       1.0   [list source [file join $dir quasirandom.tcl]]
+package ifneeded math::special           0.5.2 [list source [file join $dir special.tcl]]
+
+if {![package vsatisfies [package require Tcl] 8.6]} {return}
+package ifneeded math::exact             1.0.1 [list source [file join $dir exact.tcl]]
+package ifneeded math::PCA               1.0   [list source [file join $dir pca.tcl]]
+package ifneeded math::figurate          1.0   [list source [file join $dir figurate.tcl]]
+package ifneeded math::filters           0.1   [list source [file join $dir filtergen.tcl]]
+package ifneeded math::probopt           1.0   [list source [file join $dir probopt.tcl]]
+package ifneeded math::changepoint       0.1   [list source [file join $dir changepoint.tcl]]
+package ifneeded math::combinatorics     2.0   [list source [file join $dir combinatoricsExt.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/plotstat.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/plotstat.tcl
new file mode 100644
index 00000000..1c38fcb0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/plotstat.tcl
@@ -0,0 +1,312 @@
+# plotstat.tcl --
+#
+#    Set of very simple drawing routines, belonging to the statistics
+#    package
+#
+# version 0.1: initial implementation, january 2003
+
+namespace eval ::math::statistics {}
+
+# plot-scale
+#    Set the scale for a plot in the given canvas
+#
+# Arguments:
+#    canvas   Canvas widget to use
+#    xmin     Minimum x value
+#    xmax     Maximum x value
+#    ymin     Minimum y value
+#    ymax     Maximum y value
+#
+# Result:
+#    None
+#
+# Side effect:
+#    Array elements set
+#
+proc ::math::statistics::plot-scale { canvas xmin xmax ymin ymax } {
+    variable plot
+
+    if { $xmin == $xmax } { set xmax [expr {1.1*$xmin+1.0}] }
+    if { $ymin == $ymax } { set ymax [expr {1.1*$ymin+1.0}] }
+
+    set plot($canvas,xmin) $xmin
+    set plot($canvas,xmax) $xmax
+    set plot($canvas,ymin) $ymin
+    set plot($canvas,ymax) $ymax
+
+    set cwidth  [$canvas cget -width]
+    set cheight [$canvas cget -height]
+    set cx      20
+    set cy      20
+    set cx2     [expr {$cwidth-$cx}]
+    set cy2     [expr {$cheight-$cy}]
+
+    set plot($canvas,cx)   $cx
+    set plot($canvas,cy)   $cy
+
+    set plot($canvas,dx)   [expr {($cwidth-2*$cx)/double($xmax-$xmin)}]
+    set plot($canvas,dy)   [expr {($cheight-2*$cy)/double($ymax-$ymin)}]
+    set plot($canvas,cx2)  $cx2
+    set plot($canvas,cy2)  $cy2
+
+    $canvas create line $cx $cy $cx $cy2 $cx2 $cy2 -tag axes
+}
+
+# plot-xydata
+#    Create a simple XY plot in the given canvas (collection of dots)
+#
+# Arguments:
+#    canvas   Canvas widget to use
+#    xdata    Series of independent data
+#    ydata    Series of dependent data
+#    tag      Tag to give to the plotted data (defaults to xyplot)
+#
+# Result:
+#    None
+#
+# Side effect:
+#    Simple xy graph in the canvas
+#
+# Note:
+#    The tag can be used to manipulate the xy graph
+#
+proc ::math::statistics::plot-xydata { canvas xdata ydata {tag xyplot} } {
+    PlotXY $canvas points $tag $xdata $ydata
+}
+
+# plot-xyline
+#    Create a simple XY plot in the given canvas (continuous line)
+#
+# Arguments:
+#    canvas   Canvas widget to use
+#    xdata    Series of independent data
+#    ydata    Series of dependent data
+#    tag      Tag to give to the plotted data (defaults to xyplot)
+#
+# Result:
+#    None
+#
+# Side effect:
+#    Simple xy graph in the canvas
+#
+# Note:
+#    The tag can be used to manipulate the xy graph
+#
+proc ::math::statistics::plot-xyline { canvas xdata ydata {tag xyplot} } {
+    PlotXY $canvas line $tag $xdata $ydata
+}
+
+# plot-tdata
+#    Create a simple XY plot in the given canvas (the index in the list
+#    is the horizontal coordinate; points)
+#
+# Arguments:
+#    canvas   Canvas widget to use
+#    tdata    Series of dependent data
+#    tag      Tag to give to the plotted data (defaults to xyplot)
+#
+# Result:
+#    None
+#
+# Side effect:
+#    Simple xy graph in the canvas
+#
+# Note:
+#    The tag can be used to manipulate the xy graph
+#
+proc ::math::statistics::plot-tdata { canvas tdata {tag xyplot} } {
+    PlotXY $canvas points $tag {} $tdata
+}
+
+# plot-tline
+#    Create a simple XY plot in the given canvas (the index in the list
+#    is the horizontal coordinate; line)
+#
+# Arguments:
+#    canvas   Canvas widget to use
+#    tdata    Series of dependent data
+#    tag      Tag to give to the plotted data (defaults to xyplot)
+#
+# Result:
+#    None
+#
+# Side effect:
+#    Simple xy graph in the canvas
+#
+# Note:
+#    The tag can be used to manipulate the xy graph
+#
+proc ::math::statistics::plot-tline { canvas tdata {tag xyplot} } {
+    PlotXY $canvas line $tag {} $tdata
+}
+
+# PlotXY
+#    Create a simple XY plot (points or lines) in the given canvas
+#
+# Arguments:
+#    canvas   Canvas widget to use
+#    type     Type: points or line
+#    tag      Tag to give to the plotted data
+#    xdata    Series of independent data (if empty: index used instead)
+#    ydata    Series of dependent data
+#
+# Result:
+#    None
+#
+# Side effect:
+#    Simple xy graph in the canvas
+#
+# Note:
+#    This is the actual routine
+#
+proc ::math::statistics::PlotXY { canvas type tag xdata ydata } {
+    variable plot
+
+    if { ![info exists plot($canvas,xmin)] } {
+	return -code error -errorcode "No scaling given for canvas $canvas"
+    }
+
+    set xmin $plot($canvas,xmin)
+    set xmax $plot($canvas,xmax)
+    set ymin $plot($canvas,ymin)
+    set ymax $plot($canvas,ymax)
+    set dx   $plot($canvas,dx)
+    set dy   $plot($canvas,dy)
+    set cx   $plot($canvas,cx)
+    set cy   $plot($canvas,cy)
+    set cx2  $plot($canvas,cx2)
+    set cy2  $plot($canvas,cy2)
+
+    set plotpoints [expr {$type == "points"}]
+    set xpresent   [expr {[llength $xdata] > 0}]
+    set idx        0
+    set coords     {}
+
+    foreach y $ydata {
+	if { $xpresent } {
+	    set x [lindex $xdata $idx]
+	} else {
+	    set x $idx
+	}
+	incr idx
+
+	if { $x == {}    } continue
+	if { $y == {}    } continue
+	if { $x >  $xmax } continue
+	if { $x <  $xmin } continue
+	if { $y >  $ymax } continue
+	if { $y <  $ymin } continue
+
+	if { $plotpoints } {
+	    set xc [expr {$cx+$dx*($x-$xmin)-2}]
+	    set yc [expr {$cy2-$dy*($y-$ymin)-2}]
+	    set xc2 [expr {$xc+4}]
+	    set yc2 [expr {$yc+4}]
+	    $canvas create oval $xc $yc $xc2 $yc2 -tag $tag -fill black
+	} else {
+	    set xc [expr {$cx+$dx*($x-$xmin)}]
+	    set yc [expr {$cy2-$dy*($y-$ymin)}]
+	    lappend coords $xc $yc
+	}
+    }
+
+    if { ! $plotpoints } {
+	$canvas create line $coords -tag $tag
+    }
+}
+
+# plot-histogram
+#    Create a simple histogram in the given canvas
+#
+# Arguments:
+#    canvas   Canvas widget to use
+#    counts   Series of bucket counts
+#    limits   Series of upper limits for the buckets
+#    tag      Tag to give to the plotted data (defaults to xyplot)
+#
+# Result:
+#    None
+#
+# Side effect:
+#    Simple histogram in the canvas
+#
+# Note:
+#    The number of limits determines how many bars are drawn,
+#    the number of counts that is expected is one larger. The
+#    lower and upper limits of the first and last bucket are
+#    taken to be equal to the scale's extremes
+#
+proc ::math::statistics::plot-histogram { canvas counts limits {tag xyplot} } {
+    variable plot
+
+    if { ![info exists plot($canvas,xmin)] } {
+	return -code error -errorcode DATA "No scaling given for canvas $canvas"
+    }
+
+    if { ([llength $counts]-[llength $limits]) != 1 } {
+	return -code error -errorcode ARG \
+		"Number of counts does not correspond to number of limits"
+    }
+
+    set xmin $plot($canvas,xmin)
+    set xmax $plot($canvas,xmax)
+    set ymin $plot($canvas,ymin)
+    set ymax $plot($canvas,ymax)
+    set dx   $plot($canvas,dx)
+    set dy   $plot($canvas,dy)
+    set cx   $plot($canvas,cx)
+    set cy   $plot($canvas,cy)
+    set cx2  $plot($canvas,cx2)
+    set cy2  $plot($canvas,cy2)
+
+    #
+    # Construct a sufficiently long list of x-coordinates
+    #
+    set xdata [concat $xmin $limits $xmax]
+
+    set idx   0
+    foreach x $xdata y $counts {
+	incr idx
+
+	if { $y == {}    } continue
+
+	set x1 $x
+	if { $x <  $xmin } { set x1 $xmin }
+	if { $x >  $xmax } { set x1 $xmax }
+
+	if { $y >  $ymax } { set y $ymax }
+	if { $y <  $ymin } { set y $ymin }
+
+	set x2  [lindex $xdata $idx]
+	if { $x2 <  $xmin } { set x2 $xmin }
+	if { $x2 >  $xmax } { set x2 $xmax }
+
+	set xc  [expr {$cx+$dx*($x1-$xmin)}]
+	set xc2 [expr {$cx+$dx*($x2-$xmin)}]
+	set yc  [expr {$cy2-$dy*($y-$ymin)}]
+	set yc2 $cy2
+
+	$canvas create rectangle $xc $yc $xc2 $yc2 -tag $tag -fill blue
+    }
+}
+
+#
+# Simple test code
+#
+if { [info exists ::argv0] && ([file tail [info script]] == [file tail $::argv0]) } {
+
+    set xdata {1 2 3 4 5 10 20 6 7 8 1 3 4 5 6 7}
+    set ydata {2 3 4 5 6 10 20 7 8 1 3 4 5 6 7 1}
+
+    canvas .c
+    canvas .c2
+    pack   .c .c2 -side top -fill both
+    ::math::statistics::plot-scale .c  0 10 0 10
+    ::math::statistics::plot-scale .c2 0 20 0 10
+
+    ::math::statistics::plot-xydata .c  $xdata $ydata
+    ::math::statistics::plot-xyline .c  $xdata $ydata
+    ::math::statistics::plot-histogram .c2 {1 3 2 0.1 4 2} {-1 3 10 11 23}
+    ::math::statistics::plot-tdata  .c2 $xdata
+    ::math::statistics::plot-tline  .c2 $xdata
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/polynomials.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/polynomials.tcl
new file mode 100644
index 00000000..928d3c86
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/polynomials.tcl
@@ -0,0 +1,560 @@
+# polynomials.tcl --
+#    Implement procedures to deal with polynomial functions
+#
+namespace eval ::math::polynomials {
+    variable count 0  ;# Count the number of specific commands
+    namespace eval v {}
+
+    namespace export polynomial polynCmd evalPolyn \
+                     degreePolyn coeffPolyn allCoeffsPolyn \
+                     derivPolyn  primitivePolyn \
+                     addPolyn    subPolyn multPolyn \
+                     divPolyn    remainderPolyn
+}
+
+
+# polynomial --
+#    Return a polynomial definition
+#
+# Arguments:
+#    coeffs       The coefficients of the polynomial
+# Result:
+#    Polynomial definition
+#
+proc ::math::polynomials::polynomial {coeffs} {
+
+    set rev_coeffs {}
+    set degree     -1
+    set index       0
+    foreach coeff $coeffs {
+        if { ! [string is double -strict $coeff] } {
+            return -code error "Coefficients must be real numbers"
+        }
+        set rev_coeffs [concat $coeff $rev_coeffs]
+        if { $coeff != 0.0 } {
+            set degree $index
+        }
+        incr index
+    }
+
+    #
+    # The leading coefficient must be non-zero
+    #
+    return [list POLYNOMIAL [lrange $rev_coeffs end-$degree end]]
+}
+
+# polynCmd --
+#    Return a procedure that implements a polynomial evaluation
+#
+# Arguments:
+#    coeffs       The coefficients of the polynomial (or a definition)
+# Result:
+#    New procedure
+#
+proc ::math::polynomials::polynCmd {coeffs} {
+    variable count
+
+    if { [lindex $coeffs 0] == "POLYNOMIAL" } {
+        set coeffs [allCoeffsPolyn $coeffs]
+    }
+
+    set degree [expr {[llength $coeffs]-1}]
+    set body "expr \{[join $coeffs +\$x*(][string repeat ) $degree]\}"
+
+    incr count
+    set name "::math::polynomials::v::POLYN$count"
+    proc $name {x} $body
+    return $name
+}
+
+# evalPolyn --
+#    Evaluate a polynomial at a given coordinate
+#
+# Arguments:
+#    polyn        Polynomial definition
+#    x            Coordinate
+# Result:
+#    Value at x
+#
+proc ::math::polynomials::evalPolyn {polyn x} {
+    if { [lindex $polyn 0] != "POLYNOMIAL" } {
+        return -code error "Not a polynomial"
+    }
+    if { ! [string is double $x] } {
+        return -code error "Coordinate must be a real number"
+    }
+
+    set result 0.0
+    foreach c [lindex $polyn 1] {
+        set result [expr {$result*$x+$c}]
+    }
+    return $result
+}
+
+# degreePolyn --
+#    Return the degree of the polynomial
+#
+# Arguments:
+#    polyn        Polynomial definition
+# Result:
+#    The degree
+#
+proc ::math::polynomials::degreePolyn {polyn} {
+    if { [lindex $polyn 0] != "POLYNOMIAL" } {
+        return -code error "Not a polynomial"
+    }
+    return [expr {[llength [lindex $polyn 1]]-1}]
+}
+
+# coeffPolyn --
+#    Return the coefficient of the index'th degree of the polynomial
+#
+# Arguments:
+#    polyn        Polynomial definition
+#    index        Degree for which to return the coefficient
+# Result:
+#    The coefficient of degree "index"
+#
+proc ::math::polynomials::coeffPolyn {polyn index} {
+    if { [lindex $polyn 0] != "POLYNOMIAL" } {
+        return -code error "Not a polynomial"
+    }
+    set coeffs [lindex $polyn 1]
+    if { $index < 0 || $index > [llength $coeffs] } {
+        return -code error "Index must be between 0 and [llength $coeffs]"
+    }
+    return [lindex $coeffs end-$index]
+}
+
+# allCoeffsPolyn --
+#    Return the coefficients of the polynomial
+#
+# Arguments:
+#    polyn        Polynomial definition
+# Result:
+#    The coefficients in ascending order
+#
+proc ::math::polynomials::allCoeffsPolyn {polyn} {
+    if { [lindex $polyn 0] != "POLYNOMIAL" } {
+        return -code error "Not a polynomial"
+    }
+    set rev_coeffs [lindex $polyn 1]
+    set coeffs {}
+    foreach c $rev_coeffs {
+        set coeffs [concat $c $coeffs]
+    }
+    return $coeffs
+}
+
+# derivPolyn --
+#    Return the derivative of the polynomial
+#
+# Arguments:
+#    polyn        Polynomial definition
+# Result:
+#    The new polynomial
+#
+proc ::math::polynomials::derivPolyn {polyn} {
+    if { [lindex $polyn 0] != "POLYNOMIAL" } {
+        return -code error "Not a polynomial"
+    }
+    set coeffs [lindex $polyn 1]
+    set new_coeffs {}
+    set idx        [degreePolyn $polyn]
+    foreach c [lrange $coeffs 0 end-1] {
+        lappend new_coeffs [expr {$idx*$c}]
+        incr idx -1
+    }
+    return [list POLYNOMIAL $new_coeffs]
+}
+
+# primitivePolyn --
+#    Return the primitive of the polynomial
+#
+# Arguments:
+#    polyn        Polynomial definition
+# Result:
+#    The new polynomial
+#
+proc ::math::polynomials::primitivePolyn {polyn} {
+    if { [lindex $polyn 0] != "POLYNOMIAL" } {
+        return -code error "Not a polynomial"
+    }
+    set coeffs [lindex $polyn 1]
+    set new_coeffs {}
+    set idx        [llength $coeffs]
+    foreach c [lrange $coeffs 0 end] {
+        lappend new_coeffs [expr {$c/double($idx)}]
+        incr idx -1
+    }
+    return [list POLYNOMIAL [concat $new_coeffs 0.0]]
+}
+
+# addPolyn --
+#    Add two polynomials and return the result
+#
+# Arguments:
+#    polyn1       First polynomial or a scalar
+#    polyn2       Second polynomial or a scalar
+# Result:
+#    The sum of the two polynomials
+# Note:
+#    Make sure that the first coefficient is not zero
+#
+proc ::math::polynomials::addPolyn {polyn1 polyn2} {
+    if { [llength $polyn1] == 1 && [string is double -strict $polyn1] } {
+        set polyn1 [polynomial $polyn1]
+    }
+    if { [llength $polyn2] == 1 && [string is double -strict $polyn2] } {
+        set polyn2 [polynomial $polyn2]
+    }
+    if { [lindex $polyn1 0] != "POLYNOMIAL" ||
+         [lindex $polyn2 0] != "POLYNOMIAL"    } {
+        return -code error "Both arguments must be polynomials or a real number"
+    }
+    set coeffs1 [lindex $polyn1 1]
+    set coeffs2 [lindex $polyn2 1]
+
+    set extra1  [expr {[llength $coeffs2]-[llength $coeffs1]}]
+    while { $extra1 > 0 } {
+        set coeffs1 [concat 0.0 $coeffs1]
+        incr extra1 -1
+    }
+
+    set extra2  [expr {[llength $coeffs1]-[llength $coeffs2]}]
+    while { $extra2 > 0 } {
+        set coeffs2 [concat 0.0 $coeffs2]
+        incr extra2 -1
+    }
+
+    set new_coeffs {}
+    foreach c1 $coeffs1 c2 $coeffs2 {
+        lappend new_coeffs [expr {$c1+$c2}]
+    }
+    while { [lindex $new_coeffs 0] == 0.0 } {
+        set new_coeffs [lrange $new_coeffs 1 end]
+    }
+    return [list POLYNOMIAL $new_coeffs]
+}
+
+# subPolyn --
+#    Subtract two polynomials and return the result
+#
+# Arguments:
+#    polyn1       First polynomial or a scalar
+#    polyn2       Second polynomial or a scalar
+# Result:
+#    The difference of the two polynomials
+# Note:
+#    Make sure that the first coefficient is not zero
+#
+proc ::math::polynomials::subPolyn {polyn1 polyn2} {
+    if { [llength $polyn1] == 1 && [string is double -strict $polyn1] } {
+        set polyn1 [polynomial $polyn1]
+    }
+    if { [llength $polyn2] == 1 && [string is double -strict $polyn2] } {
+        set polyn2 [polynomial $polyn2]
+    }
+    if { [lindex $polyn1 0] != "POLYNOMIAL" ||
+         [lindex $polyn2 0] != "POLYNOMIAL"    } {
+        return -code error "Both arguments must be polynomials or a real number"
+    }
+    set coeffs1 [lindex $polyn1 1]
+    set coeffs2 [lindex $polyn2 1]
+
+    set extra1  [expr {[llength $coeffs2]-[llength $coeffs1]}]
+    while { $extra1 > 0 } {
+        set coeffs1 [concat 0.0 $coeffs1]
+        incr extra1 -1
+    }
+
+    set extra2  [expr {[llength $coeffs1]-[llength $coeffs2]}]
+    while { $extra2 > 0 } {
+        set coeffs2 [concat 0.0 $coeffs2]
+        incr extra2 -1
+    }
+
+    set new_coeffs {}
+    foreach c1 $coeffs1 c2 $coeffs2 {
+        lappend new_coeffs [expr {$c1-$c2}]
+    }
+    while { [lindex $new_coeffs 0] == 0.0 } {
+        set new_coeffs [lrange $new_coeffs 1 end]
+    }
+    return [list POLYNOMIAL $new_coeffs]
+}
+
+# multPolyn --
+#    Multiply two polynomials and return the result
+#
+# Arguments:
+#    polyn1       First polynomial or a scalar
+#    polyn2       Second polynomial or a scalar
+# Result:
+#    The difference of the two polynomials
+# Note:
+#    Make sure that the first coefficient is not zero
+#
+proc ::math::polynomials::multPolyn {polyn1 polyn2} {
+    if { [llength $polyn1] == 1 && [string is double -strict $polyn1] } {
+        set polyn1 [polynomial $polyn1]
+    }
+    if { [llength $polyn2] == 1 && [string is double -strict $polyn2] } {
+        set polyn2 [polynomial $polyn2]
+    }
+    if { [lindex $polyn1 0] != "POLYNOMIAL" ||
+         [lindex $polyn2 0] != "POLYNOMIAL"    } {
+        return -code error "Both arguments must be polynomials or a real number"
+    }
+
+    set coeffs1 [lindex $polyn1 1]
+    set coeffs2 [lindex $polyn2 1]
+
+    #
+    # Take care of the null polynomial
+    #
+    if { $coeffs1 == {} || $coeffs2 == {} } {
+        return [polynomial {}]
+    }
+
+    set zeros {}
+    foreach c $coeffs1 {
+        lappend zeros 0.0
+    }
+
+    set new_coeffs [lrange $zeros 1 end]
+    foreach c $coeffs2 {
+        lappend new_coeffs 0.0
+    }
+
+    set idx        0
+    foreach c $coeffs1 {
+        set term_coeffs {}
+        foreach c2 $coeffs2 {
+            lappend term_coeffs [expr {$c*$c2}]
+        }
+        set term_coeffs [concat [lrange $zeros 0 [expr {$idx-1}]] \
+                                $term_coeffs \
+                                [lrange $zeros [expr {$idx+1}] end]]
+
+        set sum_coeffs {}
+        foreach t $term_coeffs n $new_coeffs {
+            lappend sum_coeffs [expr {$t+$n}]
+        }
+        set new_coeffs $sum_coeffs
+        incr idx
+    }
+
+    return [list POLYNOMIAL $new_coeffs]
+}
+
+# divPolyn --
+#    Divide two polynomials and return the quotient
+#
+# Arguments:
+#    polyn1       First polynomial or a scalar
+#    polyn2       Second polynomial or a scalar
+# Result:
+#    The difference of the two polynomials
+# Note:
+#    Make sure that the first coefficient is not zero
+#
+proc ::math::polynomials::divPolyn {polyn1 polyn2} {
+    if { [llength $polyn1] == 1 && [string is double -strict $polyn1] } {
+        set polyn1 [polynomial $polyn1]
+    }
+    if { [llength $polyn2] == 1 && [string is double -strict $polyn2] } {
+        set polyn2 [polynomial $polyn2]
+    }
+    if { [lindex $polyn1 0] != "POLYNOMIAL" ||
+         [lindex $polyn2 0] != "POLYNOMIAL"    } {
+        return -code error "Both arguments must be polynomials or a real number"
+    }
+
+    set coeffs1 [lindex $polyn1 1]
+    set coeffs2 [lindex $polyn2 1]
+
+    #
+    # Take care of the null polynomial
+    #
+    if { $coeffs1 == {} } {
+        return [polynomial {}]
+    }
+    if { $coeffs2 == {} } {
+        return -code error "Denominator can not be zero"
+    }
+
+    foreach {quotient remainder} [DivRemPolyn $polyn1 $polyn2] {break}
+    return $quotient
+}
+
+# remainderPolyn --
+#    Divide two polynomials and return the remainder
+#
+# Arguments:
+#    polyn1       First polynomial or a scalar
+#    polyn2       Second polynomial or a scalar
+# Result:
+#    The difference of the two polynomials
+# Note:
+#    Make sure that the first coefficient is not zero
+#
+proc ::math::polynomials::remainderPolyn {polyn1 polyn2} {
+    if { [llength $polyn1] == 1 && [string is double -strict $polyn1] } {
+        set polyn1 [polynomial $polyn1]
+    }
+    if { [llength $polyn2] == 1 && [string is double -strict $polyn2] } {
+        set polyn2 [polynomial $polyn2]
+    }
+    if { [lindex $polyn1 0] != "POLYNOMIAL" ||
+         [lindex $polyn2 0] != "POLYNOMIAL"    } {
+        return -code error "Both arguments must be polynomials or a real number"
+    }
+
+    set coeffs1 [lindex $polyn1 1]
+    set coeffs2 [lindex $polyn2 1]
+
+    #
+    # Take care of the null polynomial
+    #
+    if { $coeffs1 == {} } {
+        return [polynomial {}]
+    }
+    if { $coeffs2 == {} } {
+        return -code error "Denominator can not be zero"
+    }
+
+    foreach {quotient remainder} [DivRemPolyn $polyn1 $polyn2] {break}
+    return $remainder
+}
+
+# DivRemPolyn --
+#    Divide two polynomials and return the quotient and remainder
+#
+# Arguments:
+#    polyn1       First polynomial or a scalar
+#    polyn2       Second polynomial or a scalar
+# Result:
+#    The difference of the two polynomials
+# Note:
+#    Make sure that the first coefficient is not zero
+#
+proc ::math::polynomials::DivRemPolyn {polyn1 polyn2} {
+
+    set coeffs1 [lindex $polyn1 1]
+    set coeffs2 [lindex $polyn2 1]
+
+    set steps [expr { [degreePolyn $polyn1] - [degreePolyn $polyn2] + 1 }]
+
+    #
+    # Special case: polynomial 1 has lower degree than polynomial 2
+    #
+    if { $steps <= 0 } {
+        return [list [polynomial 0.0] $polyn1]
+    } else {
+        set extra_coeffs {}
+        for { set i 1 } { $i < $steps } { incr i } {
+            lappend extra_coeffs 0.0
+        }
+        lappend extra_coeffs 1.0
+    }
+
+    set c2 [lindex $coeffs2 0]
+    set quot_coeffs {}
+
+    for { set i 0 } { $i < $steps } { incr i } {
+        set c1     [lindex $coeffs1 0]
+        set factor [expr {$c1/$c2}]
+
+        set fpolyn [multPolyn $polyn2 \
+                              [polynomial [lrange $extra_coeffs $i end]]]
+
+        set newpol [subPolyn $polyn1 [multPolyn $fpolyn $factor]]
+
+        #
+        # Due to rounding errors, a very small, parasitical
+        # term may still exist. Remove it
+        #
+        if { [degreePolyn $newpol] == [degreePolyn $polyn1] } {
+            set new_coeffs [lrange [allCoeffsPolyn $newpol] 0 end-1]
+            set newpol     [polynomial $new_coeffs]
+        }
+        set polyn1 $newpol
+        set coeffs1 [lindex $polyn1 1]
+        set quot_coeffs [concat $factor $quot_coeffs]
+    }
+    set quotient [polynomial $quot_coeffs]
+
+    return [list $quotient $polyn1]
+}
+
+#
+# Announce our presence
+#
+package provide math::polynomials 1.0.1
+
+# some tests --
+#
+if { 0 } {
+set prec $::tcl_precision
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    set ::tcl_precision 17
+} else {
+    set ::tcl_precision 0
+}
+
+set f1    [::math::polynomials::polynomial {1 2 3}]
+set f2    [::math::polynomials::polynomial {1 2 3 0}]
+set f3    [::math::polynomials::polynomial {0 0 0 0}]
+set f4    [::math::polynomials::polynomial {5 7}]
+set cmdf1 [::math::polynomials::polynCmd {1 2 3}]
+
+foreach x {0 1 2 3 4 5} {
+    puts "[::math::polynomials::evalPolyn $f1 $x] -- \
+[expr {1.0+2.0*$x+3.0*$x*$x}] -- \
+[$cmdf1 $x] -- [::math::polynomials::evalPolyn $f3 $x]"
+}
+
+puts "Degree: [::math::polynomials::degreePolyn $f1] (expected: 2)"
+puts "Degree: [::math::polynomials::degreePolyn $f2] (expected: 2)"
+foreach d {0 1 2} {
+    puts "Coefficient $d = [::math::polynomials::coeffPolyn $f2 $d]"
+}
+puts "All coefficients = [::math::polynomials::allCoeffsPolyn $f2]"
+
+puts "Derivative = [::math::polynomials::derivPolyn $f1]"
+puts "Primitive  = [::math::polynomials::primitivePolyn $f1]"
+
+puts "Add:       [::math::polynomials::addPolyn $f1 $f4]"
+puts "Add:       [::math::polynomials::addPolyn $f4 $f1]"
+puts "Subtract:  [::math::polynomials::subPolyn $f1 $f4]"
+puts "Multiply:  [::math::polynomials::multPolyn $f1 $f4]"
+
+set f1    [::math::polynomials::polynomial {1 2 3}]
+set f2    [::math::polynomials::polynomial {0 1}]
+
+puts "Divide:    [::math::polynomials::divPolyn $f1 $f2]"
+puts "Remainder: [::math::polynomials::remainderPolyn $f1 $f2]"
+
+set f1    [::math::polynomials::polynomial {1 2 3}]
+set f2    [::math::polynomials::polynomial {1 1}]
+
+puts "Divide:    [::math::polynomials::divPolyn $f1 $f2]"
+puts "Remainder: [::math::polynomials::remainderPolyn $f1 $f2]"
+
+set f1 [::math::polynomials::polynomial {1 2 3}]
+set f2 [::math::polynomials::polynomial {0 1}]
+set f3 [::math::polynomials::divPolyn $f2 $f1]
+set coeffs [::math::polynomials::allCoeffsPolyn $f3]
+puts "Coefficients: $coeffs"
+set f3 [::math::polynomials::divPolyn $f1 $f2]
+set coeffs [::math::polynomials::allCoeffsPolyn $f3]
+puts "Coefficients: $coeffs"
+set f1 [::math::polynomials::polynomial {1 2 3}]
+set f2 [::math::polynomials::polynomial {0}]
+set f3 [::math::polynomials::divPolyn $f2 $f1]
+set coeffs [::math::polynomials::allCoeffsPolyn $f3]
+puts "Coefficients: $coeffs"
+
+set ::tcl_precision $prec
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/primes.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/primes.tcl
new file mode 100644
index 00000000..073414e4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/primes.tcl
@@ -0,0 +1,569 @@
+##
+## This is the file `primes.tcl',
+## generated with the SAK utility
+## (sak docstrip/regen).
+##
+## The original source files were:
+##
+## numtheory.dtx  (with options: `pkg_primes pkg_common')
+##
+## In other words:
+## **************************************
+## * This Source is not the True Source *
+## **************************************
+## the true source is the file from which this one was generated.
+##
+# Copyright (c) 2010 by Lars Hellstrom.  All rights reserved.
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# primes.tcl --
+#     Provide additional procedures for the number theory package
+#
+namespace eval ::math::numtheory {
+    variable primes {2 3 5 7 11 13 17}
+    variable nextPrimeCandidate 19
+    variable nextPrimeIncrement  1 ;# Examine numbers 6n+1 and 6n+5
+
+    namespace export firstNprimes primesLowerThan primeFactors uniquePrimeFactors factors \
+                     totient moebius legendre jacobi gcd lcm \
+                     numberPrimesGauss numberPrimesLegendre numberPrimesLegendreModified \
+                     differenceNumberPrimesLegendreModified listPrimeProgressions
+}
+
+# ComputeNextPrime --
+#     Determine the next prime
+#
+# Arguments:
+#     None
+#
+# Result:
+#     None
+#
+# Side effects:
+#     One prime added to the list of primes
+#
+# Note:
+#     Using a true sieve of Erathostenes might be faster, but
+#     this does work. Even computing the first ten thousand
+#     does not seem to be slow.
+#
+proc ::math::numtheory::ComputeNextPrime {} {
+    variable primes
+    variable nextPrimeCandidate
+    variable nextPrimeIncrement
+
+    while {1} {
+        #
+        # Test the current candidate
+        #
+        set sqrtCandidate [expr {sqrt($nextPrimeCandidate)}]
+
+        set isprime 1
+        foreach p $primes {
+            if { $p > $sqrtCandidate } {
+                break
+            }
+            if { $nextPrimeCandidate % $p == 0 } {
+                set isprime 0
+                break
+            }
+        }
+
+        if { $isprime } {
+            lappend primes $nextPrimeCandidate
+        }
+
+        #
+        # In any case get the next candidate
+        #
+        if { $nextPrimeIncrement == 1 } {
+            set nextPrimeIncrement 5
+            set nextPrimeCandidate [expr {$nextPrimeCandidate + 4}]
+        } else {
+            set nextPrimeIncrement 1
+            set nextPrimeCandidate [expr {$nextPrimeCandidate + 2}]
+        }
+
+        if { $isprime } {
+            break
+        }
+    }
+}
+
+# firstNprimes --
+#     Return the first N primes
+#
+# Arguments:
+#     number           Number of primes to return
+#
+# Result:
+#     List of the first $number primes
+#
+proc ::math::numtheory::firstNprimes {number} {
+    variable primes
+
+    while { [llength $primes] < $number } {
+        ComputeNextPrime
+    }
+
+    return [lrange $primes 0 [expr {$number-1}]]
+}
+
+# primesLowerThan --
+#     Return the primes lower than some threshold
+#
+# Arguments:
+#     threshold        Threshold for the primes
+#
+# Result:
+#     List of primes lower/equal to the threshold
+#
+proc ::math::numtheory::primesLowerThan {threshold} {
+    variable primes
+
+    while { [lindex $primes end] < $threshold } {
+        ComputeNextPrime
+    }
+
+    set n 0
+    foreach p $primes {
+        if { $p > $threshold } {
+            break
+        } else {
+            incr n
+        }
+    }
+    return [lrange $primes 0 [expr {$n-1}]]
+}
+
+# primeFactors --
+#     Determine the prime factors of a number
+#
+# Arguments:
+#     number           Number to factorise
+#
+# Result:
+#     List of prime factors
+#
+proc ::math::numtheory::primeFactors {number} {
+    variable primes
+
+    #
+    # Make sure we have enough primes
+    #
+    primesLowerThan [expr {sqrt($number)}]
+
+    set factors {}
+
+    set idx 0
+
+    while { $number > 1 } {
+        set p [lindex $primes $idx]
+        if {$p == {}} {
+            lappend factors $number
+            break
+        }
+        if { $number % $p == 0 } {
+            lappend factors $p
+            set number [expr {$number/$p}]
+        } else {
+            incr idx
+        }
+    }
+
+    return $factors
+}
+
+# uniquePrimeFactors --
+#     Determine the unique prime factors of a number
+#
+# Arguments:
+#     number           Number to factorise
+#
+# Result:
+#     List of unique prime factors
+#
+proc ::math::numtheory::uniquePrimeFactors {number} {
+    return [lsort -unique -integer [primeFactors $number]]
+}
+
+# totient --
+#     Evaluate the Euler totient function for a number
+#
+# Arguments:
+#     number           Number in question
+#
+# Result:
+#     Totient of the given number (number of numbers
+#     relatively prime to the number)
+#
+proc ::math::numtheory::totient {number} {
+    set factors [uniquePrimeFactors $number]
+
+    set totient $number
+
+    foreach f $factors {
+        set totient [expr {($totient * ($f-1)) / $f}]
+    }
+
+    return $totient
+}
+
+# factors --
+#     Return all (unique) factors of a number
+#
+# Arguments:
+#     number           Number in question
+#
+# Result:
+#     List of factors including 1 and the number itself
+#
+# Note:
+#     The algorithm for constructing the power set was taken from
+#     wiki.tcl.tk/2877 (algorithm subsets2b).
+#
+proc ::math::numtheory::factors {number} {
+    set factors [primeFactors $number]
+
+    #
+    # Iterate over the power set of this list
+    #
+    set result [list 1 $number]
+    for {set n 1} {$n < [llength $factors]} {incr n} {
+        set subsets [list [list]]
+        foreach f $factors {
+            foreach subset $subsets {
+                lappend subset $f
+                if {[llength $subset] == $n} {
+                    lappend result [Product $subset]
+                } else {
+                    lappend subsets $subset
+                }
+            }
+        }
+    }
+    return [lsort -unique -integer $result]
+}
+
+# Product --
+#     Auxiliary function: return the product of a list of numbers
+#
+# Arguments:
+#     list           List of numbers
+#
+# Result:
+#     The product of all the numbers
+#
+proc ::math::numtheory::Product {list} {
+    set product 1
+    foreach e $list {
+        set product [expr {$product * $e}]
+    }
+    return $product
+}
+
+# moebius --
+#     Return the value of the Moebius function for "number"
+#
+# Arguments:
+#     number         Number in question
+#
+# Result:
+#     The product of all the numbers
+#
+proc ::math::numtheory::moebius {number} {
+    if { $number < 1 } {
+        return -code error "The number must be positive"
+    }
+    if { $number == 1 } {
+        return 1
+    }
+
+    set primefactors [primeFactors $number]
+    if { [llength $primefactors] != [llength [lsort -unique -integer $primefactors]] } {
+        return 0
+    } else {
+        return [expr {(-1)**([llength $primefactors]%2)}]
+    }
+}
+
+# legendre --
+#     Return the value of the Legendre symbol (a/p)
+#
+# Arguments:
+#     a              Upper number in the symbol
+#     p              Lower number in the symbol
+#
+# Result:
+#     The Legendre symbol
+#
+proc ::math::numtheory::legendre {a p} {
+    if { $p == 0 } {
+        return -code error "The number p must be non-zero"
+    }
+
+    if { $a % $p == 0 } {
+        return 0
+    }
+
+    #
+    # Just take the brute force route
+    # (Negative values of a present a small problem, but only a small one)
+    #
+    while { $a < 0 } {
+        set a [expr {$p + $a}]
+    }
+
+    set legendre -1
+    for {set n 1} {$n < $p} {incr n} {
+        if { $n**2 % $p == $a } {
+            set legendre 1
+            break
+        }
+    }
+
+    return $legendre
+}
+
+# jacobi --
+#     Return the value of the Jacobi symbol (a/b)
+#
+# Arguments:
+#     a              Upper number in the symbol
+#     b              Lower number in the symbol
+#
+# Result:
+#     The Jacobi symbol
+#
+# Note:
+#     Implementation adopted from the Wiki - http://wiki.tcl.tk/36990
+#     encoded by rmelton 9/25/12
+#     Further references:
+#     http://en.wikipedia.org/wiki/Jacobi_symbol
+#     http://2000clicks.com/mathhelp/NumberTh27JacobiSymbolAlgorithm.aspx
+#
+proc ::math::numtheory::jacobi {a b} {
+    if { $b<=0 || ($b&1)==0 } {
+        return 0;
+    }
+
+    set j 1
+    if {$a<0} {
+        set a [expr {0-$a}]
+        set j [expr {0-$j}]
+    }
+    while {$a != 0} {
+        while {($a&1) == 0} {
+            ##/* Process factors of 2: Jacobi(2,b)=-1 if b=3,5 (mod 8) */
+            set a [expr {$a>>1}]
+            if {(($b & 7)==3) || (($b & 7)==5)} {
+                set j [expr {0-$j}]
+            }
+        }
+        ##/* Quadratic reciprocity: Jacobi(a,b)=-Jacobi(b,a) if a=3,b=3 (mod 4) */
+        lassign [list $a $b] b a
+        if {(($a & 3)==3) && (($b & 3)==3)} {
+            set j [expr {0-$j}]
+        }
+        set a [expr {$a % $b}]
+    }
+    if {$b==1} {
+        return $j
+    } else {
+        return 0
+    }
+}
+
+# gcd --
+#     Return the greatest common divisor of two numbers n and m
+#
+# Arguments:
+#     n              First number
+#     m              Second number
+#
+# Result:
+#     The greatest common divisor
+#
+proc ::math::numtheory::gcd {n m} {
+    #
+    # Apply Euclid's good old algorithm
+    #
+    if { $n > $m } {
+        set t $n
+        set n $m
+        set m $t
+    }
+
+    while { $n > 0 } {
+        set r [expr {$m % $n}]
+        set m $n
+        set n $r
+    }
+
+    return $m
+}
+
+# lcm --
+#     Return the lowest common multiple of two numbers n and m
+#
+# Arguments:
+#     n              First number
+#     m              Second number
+#
+# Result:
+#     The lowest common multiple
+#
+proc ::math::numtheory::lcm {n m} {
+    set gcd [gcd $n $m]
+    return [expr {$n*$m/$gcd}]
+}
+
+# numberPrimesGauss --
+#     Return the approximate number of primes lower than the given value based on the formula by Gauss
+#
+# Arguments:
+#     limit            The limit for the largest prime to be included in the estimate
+#
+# Returns:
+#     Approximate number of primes
+#
+proc ::math::numtheory::numberPrimesGauss {limit} {
+    if { $limit <= 1 } {
+        return -code error "The limit must be larger than 1"
+    }
+    expr {$limit / log($limit)}
+}
+
+# numberPrimesLegendre --
+#     Return the approximate number of primes lower than the given value based on the formula by Legendre
+#
+# Arguments:
+#     limit            The limit for the largest prime to be included in the estimate
+#
+# Returns:
+#     Approximate number of primes
+#
+proc ::math::numtheory::numberPrimesLegendre {limit} {
+    if { $limit <= 1 } {
+        return -code error "The limit must be larger than 1"
+    }
+    expr {$limit / (log($limit) - 1.0)}
+}
+
+# numberPrimesLegendreModified --
+#     Return the approximate number of primes lower than the given value based on the
+#     modified formula by Legendre
+#
+# Arguments:
+#     limit            The limit for the largest prime to be included in the estimate
+#
+# Returns:
+#     Approximate number of primes
+#
+proc ::math::numtheory::numberPrimesLegendreModified {limit} {
+    if { $limit <= 1 } {
+        return -code error "The limit must be larger than 1"
+    }
+    expr {$limit / (log($limit) - 1.08366)}
+}
+
+# differenceNumberPrimesLegendreModified --
+#     Return the approximate difference number of primes
+#     between a lower and higher limit as given values
+#     for approximate number of primes based on the
+#     modified formula by Legendre
+#
+# Arguments:
+#     limit1     The lower limit for the interval, largest prime to be included in the l.limit
+#     limit2     The upper limit for the interval, largest prime to be included in the u.mlimit
+#
+# Returns:
+#     Approximate difference number of primes
+#
+proc ::math::numtheory::differenceNumberPrimesLegendreModified {limit1 limit2} {
+    if { $limit1 <= 1 } {
+        return -code error "The lower limit must be larger than 1"
+    }
+    if { $limit2 <= 1 } {
+        return -code error "The upper limit must be larger than 1"
+    }
+
+     set aa [::math::numtheory::numberPrimesLegendreModified [expr ($limit1)]]
+     set bb [::math::numtheory::numberPrimesLegendreModified [expr ($limit2)]]
+     expr {abs($bb-$aa)}
+}
+
+# listPrimeProgressions --
+#     Return a list of arithmetic progressions of primes that differ by a given number
+#
+# Arguments:
+#     lower      The lower limit for the interval from which to chose the primes
+#     upper      The upper limit for the interval
+#     step       The difference between sucessive primes (default to 2)
+#
+# Returns:
+#     A list of lists of successive primes differing the given step
+#
+proc ::math::numtheory::listPrimeProgressions {lower upper {step 2}} {
+    if { $upper <= $lower } {
+        return -code error "The upper limit must be larger than the lower limit"
+    }
+    if { $step <= 0 } {
+        return -code error "The step must be at least 1"
+    }
+
+    set output {}
+    set found  {}
+    for {set i $lower} {$i <= $upper} {incr i 1} {
+        if { [isprime $i] } {
+            set newset $i
+            for { set j [expr {$i + $step}]} {$j <= $upper} {incr j $step} {
+                if { [isprime $j] && $j ni $found } {
+                    lappend newset $j
+                    lappend found  $j
+                } else {
+                    break
+                }
+            }
+            if { [llength $newset] > 1 } {
+                lappend output $newset
+            }
+        }
+    }
+
+    return $output
+}
+
+# listPrimePairs --
+#     Return a list of pairso of primes that differ by a given number
+#
+# Arguments:
+#     lower      The lower limit for the interval from which to chose the primes
+#     upper      The upper limit for the interval
+#     step       The difference between sucessive primes (default to 2)
+#
+# Returns:
+#     A list of pairs of primes differing the given step
+#
+proc ::math::numtheory::listPrimePairs {lower upper {step 2}} {
+    if { $upper <= $lower } {
+        return -code error "The upper limit must be larger than the lower limit"
+    }
+    if { $step <= 0 } {
+        return -code error "The step must be at least 1"
+    }
+
+    set output {}
+    for {set i $lower} {$i <= $upper} {incr i 1} {
+        set next [expr {$i + $step}]
+        if { [isprime $i] && [isprime $next] } {
+            lappend output [list $i $next]
+        }
+    }
+
+    return $output
+}
+
+##
+##
+## End of file `primes.tcl'.
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt.tcl
new file mode 100644
index 00000000..83ab73cb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt.tcl
@@ -0,0 +1,19 @@
+# probopt.tcl --
+#     Define the right workspace and load the three source files
+#     comprising the package for probabilistic optimisation:
+#
+#     1. Minimisation via Particle Swarm Optimisation
+#     2. Minimisation via Shuffled Complex Evolution
+#     3. Maximisation via Lipschitz Optimisation
+#
+package require Tcl 8.5
+package provide math::probopt 1.0
+
+namespace eval ::math::probopt {}
+
+set dir [file dirname [info script]]
+
+source [file join [file dirname [info script]] probopt_pso.tcl]
+source [file join [file dirname [info script]] probopt_sce.tcl]
+source [file join [file dirname [info script]] probopt_lipo.tcl]
+source [file join [file dirname [info script]] probopt_diffev.tcl]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt_diffev.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt_diffev.tcl
new file mode 100644
index 00000000..55100f1f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt_diffev.tcl
@@ -0,0 +1,275 @@
+# probopt_diffev.tcl --
+#     Implementation of the differential probopt algorithm
+#     for optimising functions
+#
+#     Note:
+#     The algorithm does not confine the points to the given
+#     hyper block - it is merely used to initialise it.
+#
+namespace eval ::math::probopt {}
+
+# diffev --
+#      Optimise a function using the differential probopt algorithm
+#
+# Arguments:
+#     func            Function for which the global minimum is to be found
+#     bounds          Boundaries for all independent variables of the function,
+#                     as a list of pairs of minimum and maximum
+#     args            Set of options - key-value pairs
+#
+# Result:
+#     Estimate of the global minimum as found via the procedure
+#
+proc ::math::probopt::diffev {func bounds args} {
+    #
+    # Set the default options
+    #
+    set dims [llength $bounds]
+    set options [dict create -number 0 -factor 0.6 -lambda 0.0 -crossover 0.5 \
+         -iterations 100 -maxevaluations 1.0e9 -abstolerance 0.0 -reltolerance 0.001]
+
+    #
+    # Handle the options
+    #
+
+    foreach {key value} $args {
+        if { [dict exists $options $key] } {
+                dict set options $key $value
+        } else {
+            return -code error "Unknown option: $key"
+        }
+    }
+
+    dict with options {}
+
+    if { ${-number} == 0 } {
+        set -number [expr {4 * $dims}]
+        dict set options -number ${-number}
+    }
+
+    #
+    # Set up the initial collections of points
+    #
+    set evals  0
+    set points {}
+    for {set i 0} {$i < ${-number}} {incr i} {
+        set coords [GeneratePoint $bounds]
+        lappend points [list $coords [$func $coords]]
+        incr evals
+    }
+    #puts [join $points \n]
+
+    #
+    # Iteration over the generations:
+    # - For each point, construct a new estimate and check if it is better
+    # - If it is, replace the original point by the new point
+    #
+    set oldIndex [IndexBestPoint $points]
+    set oldValue [lindex $points $oldIndex 1]
+    set bestPerGeneration {}
+
+    for {set generation 0} {$generation < ${-iterations}} {incr generation} {
+        #puts "$generation"
+        set newPoints {}
+        set renewed   0   ;# Keep track of the replacement of points to avoid
+                           # a premature ending
+
+        for {set i 0} {$i < ${-number}} {incr i} {
+            set point [lindex $points $i]
+
+            set newCoords [ConstructNewCoords $points ${-factor} ${-lambda} ${-crossover} $i $oldIndex]
+
+            set fvalue    [$func $newCoords]
+            incr evals
+            #puts "$newCoords -- $fvalue -- $evals"
+
+            if { $fvalue < [lindex $point 1] } {
+                set renewed  [expr {$i == $oldIndex? 1 : 0}] ;# Is the best estimate being replaced?
+                set newPoint [list $newCoords $fvalue]
+            } else {
+                set newPoint $point
+            }
+
+            #puts "$newPoint -- $evals"
+            lappend newPoints $newPoint
+        }
+
+        #
+        # Check the number of evaluations ... not quite accurate, but it will do
+        #
+        # Hm, this will fail if this happens in the first generation
+        #
+        if { $evals >= ${-maxevaluations} } {
+            #puts "Maximum evaluations reached"
+            break
+        }
+
+        #
+        # Get the best point in the current generation
+        #
+        set bestIndex [IndexBestPoint $newPoints]
+        set bestValue [lindex $newPoints $bestIndex 1]
+
+        #puts "$oldIndex -- $oldValue -- $bestIndex -- $bestValue"
+        #if { $renewed } {}
+        if { ( $oldValue != $bestValue || $oldIndex != $bestIndex ) &&
+             ( ($oldValue - $bestValue) <= ${-abstolerance} ||
+               ($oldValue - $bestValue) <= 0.5 * ${-reltolerance} * (abs($oldValue) + abs($bestValue)) ) } {
+            #puts "Values: $oldValue -- $bestValue"
+            break
+        } else {
+            set points   $newPoints
+            set oldIndex $bestIndex
+            set oldValue $bestValue
+            lappend bestPerGeneration $bestValue
+        }
+
+        #puts "$oldIndex -- $oldValue -- $bestIndex -- $bestValue"
+    }
+
+    return [dict create optimum-coordinates [lindex $newPoints $bestIndex 0] \
+                        optimum-value [lindex $newPoints $bestIndex 1] evaluations $evals best-values $bestPerGeneration]
+}
+
+# ConstructNewCoords --
+#     Constructs the coordinates of a new point using the DE method
+#
+# Arguments:
+#     points         Current set of points (each together with the function value)
+#     factor         Weight for the difference vector
+#     lambda         Weight for the best vector
+#     crossover      Probability of cross-over
+#     idx            Current index
+#     bestIdx        Index of the current best vector
+#
+# Result:
+#     List of coordinates
+#
+proc ::math::probopt::ConstructNewCoords {points factor lambda crossover idx bestIdx} {
+    set number [llength $points]
+    set dims   [llength [lindex $points 0 0]]
+    set r1     [SelectIndex $idx $number]
+    set r2     [SelectIndex $idx $number]
+    set r3     [SelectIndex $idx $number]
+
+    if { $lambda == 0.0 } {
+        set vcoords {}
+        foreach c1 [lindex $points $r1 0] \
+                c2 [lindex $points $r2 0] \
+                c3 [lindex $points $r3 0] {
+            set vc [expr {$c1 + $factor * ($c2 - $c3)}]
+            lappend vcoords $vc
+        }
+    } else {
+        set vcoords {}
+        foreach c1 [lindex $points $idx 0]       \
+                cb [lindex $points $bestIndex 0] \
+                c2 [lindex $points $r2 0]        \
+                c3 [lindex $points $r3 0]        {
+            set vc [expr {$c1 + $lambda * ($cb - $c1) + $factor * ($c2 - $c3)}]
+            lappend vcoords $vc
+        }
+    }
+
+    #
+    # Now the cross-over per dimension
+    #
+    set start  [SelectIndex {} $number]
+    set length [SelectLength $crossover $dims]
+
+    set combined $vcoords
+    for {set i $start} {$i < $start+$length} {incr i} {
+        set j [expr {$i % $dims}]
+        lset combined $j [lindex $vcoords $j]
+    }
+
+    return $combined
+}
+
+# SelectIndex --
+#     Select a random index unequal to a given index
+#
+# Arguments:
+#     avoidIdx       Index to be avoided
+#     maximum        Maximum + 1 for the index
+#
+# Result:
+#     Random index in [0,maximum-1], not equal avoidIdx
+#
+proc ::math::probopt::SelectIndex {avoidIdx maximum} {
+
+    set idx $avoidIdx
+    while { $idx == $avoidIdx } {
+        set idx [expr {int($maximum * rand())}]
+    }
+
+    return $idx
+}
+
+# SelectLength --
+#     Select a random length using a cross-over probability
+#
+# Arguments:
+#     crossover      Cross-over probability
+#     maximum        Maximum + 1 for the index
+#
+# Result:
+#     Random index in [0,maximum-1]
+#
+proc ::math::probopt::SelectLength {crossover maximum} {
+
+    set length 0
+    while {1} {
+        incr length
+        if { rand() > $crossover || $length >= $maximum } {
+            break
+        }
+    }
+
+    return $length
+}
+
+# GeneratePoint --
+#     Generate the coordinates of a random point within the given bounds
+#
+# Arguments:
+#     bounds         Bounds on all coordinates
+#
+# Result:
+#     List of coordinates
+#
+proc ::math::probopt::GeneratePoint {bounds} {
+
+    set coords {}
+    foreach bound $bounds {
+        lassign $bound cmin cmax
+        lappend coords [expr {$cmin + ($cmax - $cmin) * rand()}]
+    }
+
+    return $coords
+}
+
+# IndexBestPoint --
+#     Find the index of the best point (lowest function value)
+#
+# Arguments:
+#     points         List of points (each is a pair of coordinates and the function value)
+#
+# Result:
+#     Index of the best point
+#
+proc ::math::probopt::IndexBestPoint {points} {
+
+    set index     0
+    set bestValue [lindex $points 0 1]
+
+    for {set i 1} {$i < [llength $points]} {incr i} {
+        set newValue [lindex $points $i 1]
+        if { $newValue < $bestValue } {
+            set index     $i
+            set bestValue $newValue
+        }
+    }
+
+    return $index
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt_lipo.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt_lipo.tcl
new file mode 100644
index 00000000..39596e4d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt_lipo.tcl
@@ -0,0 +1,241 @@
+# probopt_lipo.tcl --
+#     Implementation of the LIPO algorithm to find
+#     the global maximum of a function in a given region
+#
+#     Based on:
+#     Cedric Malherbe and Nicolas Vayatis, Global optimization of Lipschitz functions,
+#          june 2017, https://arxiv.org/pdf/1703.02628.pdf
+#
+
+# namespace --
+#
+namespace eval ::math::probopt {}
+
+# Dist --
+#     Determine the Euclidean distance between two points in N-dimensional space
+#
+# Arguments:
+#     x                List of coordinates for the first point
+#     y                List of coordinates for the second point
+#
+# Returns:
+#     Euclidean distance between the two points
+#
+proc ::math::probopt::Dist {x y} {
+    set dist 0.0
+
+    foreach xc $x yc $y {
+        set dist [expr {$dist + ($xc-$yc) ** 2}]
+    }
+    return $dist
+}
+
+# lipoMax --
+#     Find the global maximum of a function in a given region
+#
+# Arguments:
+#     f           Name of the procedure implementing the function
+#     bounds      List of pairs of minimum and maximum per dimension
+#     args        Key-value pairs for the options:
+#                 -iterations number     Number of iterations (function evaluations; default: 100)
+#                 -lipschitz  value      Estimate of the Lipschitz parameter (default: 10.0)
+#
+# Returns:
+#     The coordinates of the point where the function attains the maximum
+#     value that was encountered
+#
+proc ::math::probopt::lipoMax {f bounds args} {
+    set options [dict create -iterations 100 -lipschitz 10.0]
+
+    foreach {key value} $args {
+        if { [dict key $options $key] != "" } {
+            dict set options $key $value
+        } else {
+            return -code error "Unknown option: $key"
+        }
+    }
+
+    set k [dict get $options -lipschitz]
+    set n [dict get $options -iterations]
+
+    #
+    # Convert the region
+    #
+    set region {}
+    foreach b $bounds {
+        lassign $b min max
+        lappend region $min $max
+    }
+
+    #
+    # Initial guess
+    #
+    set coords  {}
+    set fvalues {}
+    foreach {min max} $region {
+        set c [expr {$min + ($max-$min) * rand()}]
+        lappend coords $c
+    }
+
+    set fval   [$f $coords]
+    set maxval $fval
+    set maxcrd $coords
+    set nevals 1
+
+    lappend fvalues    $fval
+    lappend samples    $coords
+    set     bestValues {}
+
+    set numberSamples 1
+    while { $numberSamples < $n } {
+        # New guess
+        set coords  {}
+        foreach {min max} $region {
+            set c [expr {$min + ($max-$min) * rand()}]
+            lappend coords $c
+        }
+
+        # Check via Lipschitz condition
+        foreach csample $samples fval $fvalues {
+            set estimate [expr {$fval + $k * [Dist $coords $csample]}]
+
+            if { $estimate > $maxval } {
+                incr numberSamples
+                set fval [$f $coords]
+                incr nevals
+
+                lappend samples $coords
+                lappend fvalues $fval
+
+                if { $fval > $maxval } {
+                    set maxval $fval
+                    set maxcrd $coords
+                    #puts "$maxval -- $maxcrd"
+                    lappend bestValues $maxval
+                }
+                break
+            }
+        }
+    }
+
+    return [dict create optimum-coordinates $maxcrd optimum-value $maxval evaluations $nevals best-values $bestValues]
+}
+
+# adaLipoMax --
+#     Find the global maximum of a function in a given region,
+#     using a heuristic estimate of the Lipschitz constant
+#
+# Arguments:
+#     f           Name of the procedure implementing the function
+#     bounds      List of minimum and maximum per dimension
+#     args        Key-value pairs for the options:
+#                 -iterations number     Number of iterations (function evaluations; default: 100)
+#                 -bernoulli  value      Parameter for random decisions (default: 0.1)
+#
+# Returns:
+#     The coordinates of the point where the function attains the maximum
+#     value that was encountered
+#
+proc ::math::probopt::adaLipoMax {f bounds args} {
+    set options [dict create -iterations 100 -bernoulli 0.1]
+
+    foreach {key value} $args {
+        if { [dict key $options $key] != "" } {
+            dict set options $key $value
+        } else {
+            return -code error "Unknown option: $key"
+        }
+    }
+
+    set p [dict get $options -bernoulli]
+    set n [dict get $options -iterations]
+
+    set kparam [expr {1.0 + 0.01/([llength $bounds])}]
+
+    #
+    # Convert the region
+    #
+    set region {}
+    foreach b $bounds {
+        lassign $b min max
+        lappend region $min $max
+    }
+
+    #
+    # Initial guess
+    #
+    set k       0.0
+    set kmax    0.0
+    set coords  {}
+    set fvalues {}
+    foreach {min max} $region {
+        set c [expr {$min + ($max-$min) * rand()}]
+        lappend coords $c
+    }
+
+    set fval   [$f $coords]
+    set maxval $fval
+    set maxcrd $coords
+    set nevals 1
+
+    lappend fvalues    $fval
+    lappend samples    $coords
+    set     bestValues {}
+
+    set numberSamples 1
+    while { $numberSamples < $n } {
+        # New guess
+        set coords  {}
+        foreach {min max} $region {
+            set c [expr {$min + ($max-$min) * rand()}]
+            lappend coords $c
+        }
+
+        set added 0
+        if { rand() < $p } {
+            # Exploration ...
+            set     added 1
+            incr    numberSamples
+            set     fval [$f $coords]
+            incr    nevals
+
+            lappend samples $coords
+            lappend fvalues $fval
+        } else {
+            # Exploitation - check via Lipschitz condition
+            foreach csample $samples fval $fvalues {
+                set estimate [expr {$fval + $k * [Dist $coords $csample]}]
+
+                if { $estimate > $maxval } {
+                    set     added 1
+                    incr    numberSamples
+                    set     fval [$f $coords]
+                    incr    nevals
+                    lappend samples $coords
+                    lappend fvalues $fval
+
+                    if { $fval > $maxval } {
+                        set maxval $fval
+                        set maxcrd $coords
+                        #puts "$maxval -- $maxcrd"
+                        lappend bestValues $maxval
+                    }
+                    break
+                }
+            }
+        }
+
+        # Update the estimate of the Lipschitz constant
+        foreach csample [lrange $samples 0 end-$added] fsample [lrange $fvalues 0 end-$added] {
+            set estimate [expr {abs($fval - $fsample) / [Dist $coords $csample]}]
+
+            if { $estimate > $kmax } {
+                set kmax $estimate
+            }
+        }
+
+        set k [expr {$kparam ** int($estimate/log($kparam)+0.99)}]
+    }
+
+    return [dict create optimum-coordinates $maxcrd optimum-value $maxval evaluations $nevals best-values $bestValues]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt_pso.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt_pso.tcl
new file mode 100644
index 00000000..b47d2a28
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt_pso.tcl
@@ -0,0 +1,427 @@
+# probopt_pso.tcl --
+#     Straightforward implementation of particle swarm optimisation
+#
+#     Options:
+#     - The "best" is taken to be the globally best particle (global)
+#     - The "best" is taken to be the best of the neighbourhood of
+#       each particle
+#
+#     For more information see: https://en.wikipedia.org/wiki/Particle_swarm_optimization
+#
+
+# namespace --
+#
+namespace eval ::math::probopt {}
+
+
+
+# pso --
+#     Public interface to the PSO implementations
+#
+# Arguments:
+#     func          Function to be minimized
+#     bounds        List of pairs of minimum and maximum per dimension
+#     args          Key-value pairs:
+#                   -swarmsize  number        Number of particles to consider (default: 50)
+#                   -vweight    value         Weight for the current "velocity" (0-1, default: 0.5)
+#                   -pweight    value         Weight for the individual particle's best position (0-1, default: 0.3)
+#                   -gweight    value         Weight for the "best" overall position as per particle (0-1, default: 0.3)
+#                   -type       local/global  Type of optimisation
+#                   -neighbours number        Size of the neighbourhood (default: 5, used if "local")
+#                   -iterations number        Maximum number of iterations
+#                   -tolerance  value         Absolute minimal improvement for minimum value
+#
+# Result:
+#     Dictionary with the coordinates of the "best" position and the value as well as
+#     list of best values per iteration and the number of function evaluations.
+#
+proc ::math::probopt::pso {func bounds args} {
+
+    set func [uplevel 1 [list namespace which -command $func]]
+
+    set options [dict create -swarmsize 50 -vweight 0.5 -pweight 0.3 -gweight 0.3 \
+                     -type global -neighbours 5 -iterations 50 -tolerance 0.0]
+
+    foreach {key value} $args {
+        if { [dict key $options $key] != "" } {
+            dict set options $key $value
+        } else {
+            return -code error "Unknown option: $key"
+        }
+    }
+
+    set xmin {}
+    set xmax {}
+
+    foreach bound $bounds {
+        lappend xmin [lindex $bound 0]
+        lappend xmax [lindex $bound 1]
+    }
+
+    set type [dict get $options -type]
+
+    if { $type == "global" } {
+        return [Pso_global $func $xmin $xmax $options]
+    }
+    if { $type == "local" } {
+        return [Pso_local $func $xmin $xmax $options]
+    }
+
+    return -code error "Unknown type: $type"
+}
+
+# Pso_global --
+#     Use the "global" PSO algorithm
+#
+# Arguments:
+#     func          Function to be minimized
+#     xmin          Minimum values for the coordinates
+#     xmax          Maximum values for the coordinates
+#     options       Dictionary of options
+#
+proc ::math::probopt::Pso_global {func xmin xmax options} {
+    #
+    # Set up the initial positions
+    #
+    set swarmsize [dict get $options -swarmsize]
+    set maxiters  [dict get $options -iterations]
+
+    set particle_bests     {}
+    set positions          {}
+    set velocities         {}
+    set global_best        -1
+    set global_best_value  {}
+    set evaluations         0
+    set best_values        {}
+
+    for {set i 0} {$i < $swarmsize} {incr i} {
+        set coords [Pso_position $xmin $xmax]
+
+        set fvalue [$func $coords]
+        incr evaluations
+
+        lappend positions      $coords
+        lappend velocities     [lrepeat [llength $coords] 0.0]
+        lappend particle_bests [list $fvalue $coords]
+
+        if { $global_best == -1 || $global_best_value > $fvalue } {
+            set global_best       $i
+            set global_best_value $fvalue
+        }
+    }
+
+    set vweight   [dict get $options -vweight]
+    set pweight   [dict get $options -pweight]
+    set gweight   [dict get $options -gweight]
+    set tolerance [dict get $options -tolerance]
+
+    for {set iteration 0} {$iteration < $maxiters} {incr iteration} {
+
+        set new_positions      {}
+        set new_velocities     {}
+        set new_particle_bests {}
+
+        #
+        # Determine the new positions for all particles
+        #
+        for {set i 0} {$i < $swarmsize} {incr i} {
+            set old_velocity  [lindex $velocities $i]
+            set old_position  [lindex $positions  $i]
+            set old_bestvalue [lindex $particle_bests $i 0]
+            set old_bestpos   [lindex $particle_bests $i 1]
+
+            set velocity      [Pso_update_vel $vweight $pweight $gweight $old_velocity $old_position $old_bestpos [lindex $positions $global_best]]
+
+            set position      [Pso_new_position $old_position $velocity]
+            set fvalue        [$func $position]
+            incr evaluations
+
+            lappend new_positions  $position
+            lappend new_velocities $velocity
+
+            if { $fvalue < $old_bestvalue } {
+                lappend new_particle_bests [list $fvalue $position]
+            } else {
+                lappend new_particle_bests [list $old_bestvalue $old_position]
+            }
+        }
+
+        set positions      $new_positions
+        set velocities     $new_velocities
+        set particle_bests $new_particle_bests
+
+        #
+        # Determine the globally best position
+        #
+        for {set i 0} {$i < $swarmsize} {incr i} {
+            set fvalue [lindex $particle_bests $i 0]
+
+            if { $fvalue < $global_best_value } {
+                set global_best_value $fvalue
+                set global_best       $i
+                set global_best_pos   [lindex $particle_bests $i 1]
+            }
+        }
+
+        #
+        # Have we reached the tolerance yet?
+        #
+        if { $iteration > 0 } {
+            if { abs($prev_best_value - $global_best_value) < $tolerance &&
+                 $prev_best_value > $global_best_value } {
+                break
+            }
+        }
+        set prev_best_value $global_best_value
+        lappend best_values $global_best_value
+    }
+
+    return [dict create optimum-coordinates $global_best_pos optimum-value $global_best_value evaluations $evaluations best-values $best_values]
+}
+
+# Pso_local --
+#     Use the "local" PSO algorithm, i.e. look only at the "neighbours"
+#
+# Arguments:
+#     func          Function to be minimized
+#     xmin          Minimum values for the coordinates
+#     xmax          Maximum values for the coordinates
+#     options       Dictionary of options
+#
+proc ::math::probopt::Pso_local {func xmin xmax options} {
+    #
+    # Set up the initial positions
+    #
+    set swarmsize  [dict get $options -swarmsize]
+    set maxiters   [dict get $options -iterations]
+    set neighbours [dict get $options -neighbours]
+
+    set particle_bests     {}
+    set positions          {}
+    set velocities         {}
+    set global_best        -1
+    set global_best_value  {}
+    set evaluations         0
+    set best_values        {}
+
+    for {set i 0} {$i < $swarmsize+$neighbours} {incr i} {
+        lappend neighbours_idx [expr {$i % $swarmsize}]
+    }
+
+    for {set i 0} {$i < $swarmsize} {incr i} {
+        set coords [Pso_position $xmin $xmax]
+
+        set fvalue [$func $coords]
+        incr evaluations
+
+        lappend positions        $coords
+        lappend velocities       [lrepeat [llength $coords] 0.0]
+        lappend particle_bests   [list $fvalue $coords]
+
+        lappend local_best       $i
+        lappend local_best_value $fvalue
+        lappend local_best_pos   $coords
+        lappend prev_best_value  $fvalue
+    }
+
+    #
+    # Initial estimates:
+    # Examine the neighbouring particles and determine which holds the best result
+    #
+    for {set i 0} {$i < $swarmsize} {incr i} {
+        set current_best       [lindex $local_best $i]
+        set current_best_value [lindex $particle_bests $current_best 0]
+        set current_best_pos   [lindex $particle_bests $current_best 1]
+
+        for {set n 0} {$n < $neighbours} {incr n} {
+            set nth     [lindex $neighbours_idx [expr {$i+$n}]]
+            set fvalue [lindex $particle_bests $nth 0]
+
+            if { $current_best_value > $fvalue } {
+                set current_best       $nth
+                set current_best_value $fvalue
+                set current_best_pos   [lindex $particle_bests $nth 1]
+            }
+        }
+
+        lset local_best       $i $current_best
+        lset local_best_value $i $current_best_value
+        lset local_best_pos   $i $current_best_pos
+    }
+
+    #
+    # Actual loop
+    #
+    set vweight   [dict get $options -vweight]
+    set pweight   [dict get $options -pweight]
+    set gweight   [dict get $options -gweight]
+    set tolerance [dict get $options -tolerance]
+
+    set stop      0
+
+    for {set iteration 0} {$iteration < $maxiters && $stop == 0} {incr iteration} {
+
+        set new_positions      {}
+        set new_velocities     {}
+        set new_particle_bests {}
+
+        #
+        # Determine the new positions for all particles
+        #
+        for {set i 0} {$i < $swarmsize} {incr i} {
+            set old_velocity  [lindex $velocities $i]
+            set old_position  [lindex $positions  $i]
+            set old_bestvalue [lindex $particle_bests $i 0]
+            set old_bestpos   [lindex $particle_bests $i 1]
+
+            set idx [lindex $local_best $i]
+
+            set velocity      [Pso_update_vel $vweight $pweight $gweight $old_velocity $old_position $old_bestpos [lindex $positions $idx]]
+
+            set position      [Pso_new_position $old_position $velocity]
+            set fvalue        [$func $position]
+            incr evaluations
+
+            lappend new_positions  $position
+            lappend new_velocities $velocity
+
+            if { $fvalue < $old_bestvalue } {
+                lappend new_particle_bests [list $fvalue $position]
+            } else {
+                lappend new_particle_bests [list $old_bestvalue $old_position]
+            }
+        }
+
+        set positions      $new_positions
+        set velocities     $new_velocities
+        set particle_bests $new_particle_bests
+
+        #
+        # Examine the neighbouring particles and determine which holds the best result
+        #
+        for {set i 0} {$i < $swarmsize} {incr i} {
+            set current_best       [lindex $local_best $i]
+            set current_best_value [lindex $local_best_value $i]
+            set current_best_pos   [lindex $local_best_pos $i]
+
+            for {set n 0} {$n < $neighbours} {incr n} {
+                set nth     [lindex $neighbours_idx [expr {$i+$n}]]
+                set fvalue [lindex $particle_bests $nth 0]
+
+                if { $current_best_value > $fvalue } {
+                    set current_best       $nth
+                    set current_best_value $fvalue
+                    set current_best_pos   [lindex $particle_bests $nth 1]
+                }
+            }
+
+            lset local_best       $i $current_best
+            lset local_best_value $i $current_best_value
+            lset local_best_pos   $i $current_best_pos
+
+            #
+            # Have we reached the tolerance yet?
+            # Note: local citerium - one group reaching a minimum? Then stop
+            #
+            if { $iteration > 0 } {
+                if { abs([lindex $prev_best_value $i] - $current_best_value) < $tolerance &&
+                     [lindex $prev_best_value $i] > $current_best_value } {
+                    set stop 1
+                    break
+                }
+            }
+            lset prev_best_value $i $current_best_value
+        }
+
+        #
+        # Now determine the overall best position - within this iteration
+        # (to have a history)
+        #
+        set global_best_value [lindex $local_best_value 0]
+        set global_best_pos   [lindex $local_best_pos   0]
+
+        for {set i 1} {$i <$swarmsize} {incr i} {
+            set particle_best_value [lindex $local_best_value $i]
+
+            if { $global_best_value > $particle_best_value } {
+                set global_best_value $particle_best_value
+                set global_best_pos   [lindex $local_best_pos $i]
+            }
+        }
+
+        lappend best_values $global_best_value
+    }
+
+    return [dict create optimum-coordinates $global_best_pos optimum-value $global_best_value evaluations $evaluations best-values $best_values]
+}
+
+# Pso_position --
+#     Determine the initial position
+#
+# Arguments:
+#     xmin              Minimum values for the coordinates
+#     xmax              Maximum values for the coordinates
+#
+# Result:
+#     Vector of coordinates
+#
+proc ::math::probopt::Pso_position {xmin xmax} {
+
+    set new_position {}
+
+    foreach min $xmin max $xmax {
+        lappend new_position [expr {$min + ($max - $min) * rand()}]
+    }
+
+    return $new_position
+}
+
+# Pso_new_position --
+#     Update the position
+#
+# Arguments:
+#     position          Position vector
+#     velocity          Velocity vector
+#
+# Result:
+#     Vector of new coordinates
+#
+proc ::math::probopt::Pso_new_position {position velocity} {
+
+    set new_position {}
+
+    foreach p $position v $velocity {
+        lappend new_position [expr {$p + $v}]
+    }
+
+    return $new_position
+}
+
+# Pso_update_vel --
+#     Update the velocity
+#
+# Arguments:
+#     vweight           Weight for the old vector
+#     pweight           Weight for the particle's best position
+#     gweight           Weight for the globally (locally) best position
+#     old_velocity      Old velocity vector
+#     old_position      Old position vector
+#     old_particle_best Old best vector for the particle
+#     old_global_best   Old globally (locally) best vector
+#
+# Result:
+#     Vector of new coordinates
+#
+proc ::math::probopt::Pso_update_vel {vweight pweight gweight old_velocity old_position old_particle_best old_global_best} {
+
+    set new_velocity {}
+
+    set pw [expr {$pweight * rand()}]
+    set gw [expr {$gweight * rand()}]
+
+    foreach v $old_velocity p $old_position b $old_particle_best g $old_global_best {
+        lappend new_velocity [expr {$vweight * $v + $pw * ($b - $p) + $gw * ($g - $p)}]
+    }
+
+    return $new_velocity
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt_sce.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt_sce.tcl
new file mode 100644
index 00000000..d223a601
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/probopt_sce.tcl
@@ -0,0 +1,378 @@
+# probopt_sce.tcl --
+#     Implementation of the "shuffled complexes evolution" optimisation method in Tcl
+#
+#     Note:
+#     This implementation is based on:
+#     - Qingyuan Duan, Soroosh Sorooshian and Vijai Gupta:
+#       Optimal use of the SCE-UA global optimisation method for calibrating
+#       watershed models, Journal of Hydrology, volume 158, 1994, pp. 265-284
+#
+#     - Q.Y. Duan, V.K. Gupta and S. Sorooshian:
+#       Shuffled Comples Evolution Approach for Effective and Efficient
+#       Global Minimization, Journal of Optimization Theory and Applications,
+#       volume 76, no. 3, 1993, pp. 501-521
+#
+#     TODO:
+#     - Limit the number of iterations
+#     - Provide a dictionary of calculation results
+#
+
+# namespace --
+#
+namespace eval ::math::probopt {
+    variable sceNevals 0
+}
+
+# sce --
+#     Front-end procedure for the SCE algorithm
+#
+# Arguments:
+#     func            Function for which the global minimum is to be found
+#     bounds          Boundaries for all independent variables of the function,
+#                     as a list of pairs of minimum and maximum
+#     args            Set of options - key-value pairs
+#
+# Result:
+#     Estimate of the global minimum as found via the procedure
+#
+proc ::math::probopt::sce {func bounds args} {
+    variable sceNevals
+    #
+    # Set the default options
+    #
+    set dims [llength $bounds]
+    set options [dict create -complexes 2 -mincomplexes 2 -newpoints 1 -shuffle 0 -pointspercomplex 0 -pointspersubcomplex 0 \
+                             -iterations 100 -maxevaluations 1.0e9 -abstolerance 0.0 -reltolerance 0.001]
+    #
+    # Handle the options
+    #
+
+    foreach {key value} $args {
+        if { [dict exists $options $key] } {
+                dict set options $key $value
+        } else {
+            return -code error "Unknown option: $key"
+        }
+    }
+
+    dict with options {}
+
+    #
+    # Recalculate a few options
+    #
+    foreach v {-shuffle -pointspercomplex} {
+        if { [set $v] == 0 } {
+            set $v [expr {2*$dims + 1}]
+            dict set options $v [set $v]
+        }
+    }
+    set v "-pointspersubcomplex"
+    if { [set $v] == 0 } {
+        set $v [expr {$dims + 1}]
+        dict set options $v [set $v]
+    }
+
+    #
+    # Ready to call the actual procedure
+    #
+    set sceNEvals 0
+
+    return [SceCompute $func $bounds $options]
+
+    #SceCompute $func $bounds $options
+}
+
+# SceCompute --
+#     Actually compute the global optimum using the SCE algorithm
+#
+# Arguments:
+#     func            Function for which the global minimum is to be found
+#     bounds          Boundaries for all independent variables of the function,
+#                     as a list of pairs of minimum and maximum
+#     options         Dictionary of options
+#
+# Result:
+#     Dictionary containing among other things the estimate of the
+#     global minimum as found via the procedure
+#
+proc ::math::probopt::SceCompute {func bounds options} {
+    variable sceNEvals
+
+    set dims         [llength $bounds]
+    set npcomplex    [dict get $options -pointspercomplex]
+    set p            [dict get $options -complexes]
+    set pmin         [dict get $options -mincomplexes]
+    set npsubcomplex [dict get $options -pointspersubcomplex]
+    set nnewpoints   [dict get $options -newpoints]
+    set nshuffle     [dict get $options -shuffle]
+    set niterations  [dict get $options -iterations]
+    set abstol       [dict get $options -abstolerance]
+    set reltol       [dict get $options -reltolerance]
+
+    set npoints [expr {$npcomplex * $p}]
+
+    #
+    # Generate the initial set of points
+    #
+    set points {}
+    for {set i 0} {$i < $p} {incr i} {
+        for {set k 0} {$k < $npcomplex} {incr k} {
+            set coords [GeneratePoint $bounds]
+            lappend points [list $coords [$func $coords]]
+            incr sceNEvals
+        }
+    }
+
+    for {set iteration 0} {$iteration < $niterations} {incr iteration} {
+        #
+        # Sort the points and create subcomplexes
+        #
+        set points [lsort -index 1 -increasing $points]
+
+        array unset complex
+        for {set i 0} {$i < $p} {incr i} {
+            for {set k 0} {$k < $npcomplex} {incr k} {
+                lappend complex($i) [lindex $points [expr {$k*$p + $i}]]
+            }
+        }
+
+        #
+        # Optimise the subcomplexes
+        #
+        for {set i 0} {$i < $p} {incr i} {
+            for {set shuffle 0} {$shuffle < $nshuffle} {incr shuffle} {
+                set complex($i) [OptimiseComplex $complex($i) $npsubcomplex $nnewpoints $func $bounds]
+            }
+        }
+
+        #
+        # Join the subcomplexes into a list of points and sort the points
+        #
+        set points {}
+
+        for {set i 0} {$i < $p} {incr i} {
+            set points [concat $points $complex($i)]
+        }
+
+        if { $iteration == 0 } {
+            set oldminimum [lindex [lsort -index 1 -increasing $points] 0 1]
+        } else {
+            set newminimum [lindex [lsort -index 1 -increasing $points] 0 1]
+            if { abs($oldminimum-$newminimum) != 0.0 &&
+                 ( abs($oldminimum-$newminimum) < $abstol ||
+                   abs($oldminimum-$newminimum) < 0.5 * $reltol * (abs($oldminimum)+abs($newminimum)) ) } {
+                break
+            } else {
+                set oldminimum $newminimum
+            }
+        }
+    }
+
+    #
+    # Sort the points and return the best one
+    #
+    set result [lsort -index 1 -increasing $points]
+    set optimum_coords [lindex $result 0 0]
+    set optimum_value  [lindex $result 0 1]
+    set best_values    {}
+    foreach r $result {
+        set best_values [concat [lindex $r 1] $best_values]
+    }
+    return [dict create optimum-coordinates $optimum_coords optimum-value $optimum_value evaluations $sceNEvals best-values $best_values]
+}
+
+# OptimiseComplex --
+#     Optimise the complex, using subcomplexes
+#
+# Arguments:
+#     complex           The points (and the function values) making up the full complex
+#     nsubcomplex       The number of points to be selected for the subcomplex
+#     nnewpoints        The number of new points to be generated
+#     bounds            The bounds on the coordinates defining the feasible region
+#
+# Result:
+#     A new set of points
+#
+proc ::math::probopt::OptimiseComplex {complex nsubcomplex nnewpoints func bounds} {
+    variable sceNEvals
+    #
+    # Construct the subcomplex
+    #
+    set subcomplex [lsort -index 1 -increasing [TriangularSelect $complex $nsubcomplex]]
+
+    #
+    # Construct new points:
+    # - Determine the centroid, excluding the worst point
+    # - Reflect the worst point
+    # - Make sure the result is within the feasible region, otherwise
+    #   select a new point
+    # - Keep the new point if it has a lower function value
+    # - Otherwise try a contraction step
+    #
+    for {set new 0} {$new < $nnewpoints} {incr new} {
+        set centroid [Centroid [lrange $complex 0 end-1]]
+        set newPoint [ReflectPointInPoint $centroid [lindex $complex end 0]]
+
+        if { ! [WithinBounds $bounds $newPoint] } {
+            set newPoint [GeneratePoint $bounds]
+            set fvalue [$func $newPoint]
+            incr sceNEvals
+        } else {
+            set fvalue [$func $newPoint]
+            incr sceNEvals
+
+            #
+            # If the point is better, keep it, otherwise attempt a contraction step
+            #
+            if { $fvalue > [lindex $complex end 1] } {
+                set newPoint [Centroid [list [list $centroid 0.0] [list $newPoint $fvalue]]]
+                set fvalue [$func $newPoint]
+                incr sceNEvals
+
+                if { $fvalue > [lindex $complex end 1] } {
+                    set newPoint [GeneratePoint $bounds]
+                    set fvalue [$func $newPoint]
+                    incr sceNEvals
+                }
+            }
+        }
+
+        lset complex end [list $newPoint $fvalue]
+
+        set complex [lsort -index 1 -increasing $complex]
+    }
+
+    return $complex
+}
+
+# GeneratePoint --
+#     Generate the coordinates of a random point within the given bounds
+#
+# Arguments:
+#     bounds         Bounds on all coordinates
+#
+# Result:
+#     List of coordinates
+#
+proc ::math::probopt::GeneratePoint {bounds} {
+
+    set coords {}
+    foreach bound $bounds {
+        lassign $bound cmin cmax
+        lappend coords [expr {$cmin + ($cmax - $cmin) * rand()}]
+    }
+
+    return $coords
+}
+
+# WithinBounds --
+#     Determine if the coordinates of a point are within the given bounds
+#
+# Arguments:
+#     bounds         Bounds on all coordinates
+#     point          Coordinates of the point
+#
+# Result:
+#     1 if the point is within the hyperrectangle, 0 otherwise
+#
+proc ::math::probopt::WithinBounds {bounds point} {
+
+    set within 1
+
+    foreach c $point bound $bounds {
+        lassign $bound cmin cmax
+        if { $c < $cmin || $c > $cmax } {
+            set within 0
+            break
+        }
+    }
+
+    return $within
+}
+
+# Centroid --
+#     Calculate the centroid of a set of points in N dimensions
+#
+# Arguments:
+#     points         List of point coordinates
+#
+# Result:
+#     Coordinates of the centroid
+#
+# Note:
+#     As this is to be used in the SCE algorithm, the list of
+#     point coordinates is slightly more complicated than
+#     just the coordinates.
+#
+proc ::math::probopt::Centroid {points} {
+    set dims   [llength [lindex $points 0 0]]
+    set number [llength $points]
+
+    set centroid [lrepeat $dims 0]
+
+    foreach point $points {
+        set coords [lindex $point 0]
+
+        set idx 0
+        foreach c $coords sum $centroid {
+            set sum [expr {$sum + $c}]
+            lset centroid $idx $sum
+            incr idx
+        }
+    }
+
+    set idx 0
+    foreach c $centroid {
+        lset centroid $idx [expr {$c / double($number)}]
+        incr idx
+    }
+
+    return $centroid
+}
+
+# ReflectPointInPoint --
+#     Reflect a point in another point and return the result
+#
+# Arguments:
+#     centre         Point that serves as the reflection center
+#     point          Point to be reflected (list of coordinates)
+#
+# Result:
+#     Coordinates of the new point
+#
+proc ::math::probopt::ReflectPointInPoint {centre point} {
+
+    set newPoint {}
+
+    foreach c $centre p $point {
+        lappend newPoint [expr {2.0 * $c - $p}]
+    }
+
+    return $newPoint
+}
+
+# TriangularSelect --
+#     Select "number" values from a list of values
+#     - the probability is triangular
+#
+# Arguments:
+#     values       List of values to choose from
+#     number       Number of values to choose (must be smaller than length of the list)
+#
+# Result:
+#     Selected values
+#
+proc ::math::probopt::TriangularSelect {values number} {
+    set selected {}
+
+    for {set i 0} {$i < $number} {incr i} {
+        set n [llength $values]
+
+        set r   [expr {1.0 - sqrt(1.0 - rand())}]
+        set idx [expr {int($r * $n)}]
+        lappend selected [lindex $values $idx]
+        set values [lreplace $values $idx $idx]
+    }
+
+    return $selected
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/qcomplex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/qcomplex.tcl
new file mode 100644
index 00000000..ac3cbf7c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/qcomplex.tcl
@@ -0,0 +1,178 @@
+# qcomplex.tcl --
+#    Small module for dealing with complex numbers
+#    The design goal was to make the operations as fast
+#    as possible, not to offer a nice interface. So:
+#    - complex numbers are represented as lists of two elements
+#    - there is hardly any error checking, all arguments are assumed
+#      to be complex numbers already (with a few obvious exceptions)
+#    Missing:
+#    the inverse trigonometric functions and the hyperbolic functions
+#
+
+namespace eval ::math::complexnumbers {
+    namespace export + - / * conj exp sin cos tan real imag mod arg log pow sqrt tostring
+}
+
+# complex --
+#    Create a new complex number
+# Arguments:
+#    real      The real part
+#    imag      The imaginary part
+# Result:
+#    New complex number
+#
+proc ::math::complexnumbers::complex {real imag} {
+    return [list $real $imag]
+}
+
+# binary operations --
+#    Implement the basic binary operations
+# Arguments:
+#    z1        First argument
+#    z2        Second argument
+# Result:
+#    New complex number
+#
+proc ::math::complexnumbers::+ {z1 z2} {
+    set result {}
+    foreach c $z1 d $z2 {
+        lappend result [expr {$c+$d}]
+    }
+    return $result
+}
+proc ::math::complexnumbers::- {z1 {z2 {}}} {
+    if { $z2 == {} } {
+        set z2 $z1
+        set z1 {0.0 0.0}
+    }
+    set result {}
+    foreach c $z1 d $z2 {
+        lappend result [expr {$c-$d}]
+    }
+    return $result
+}
+proc ::math::complexnumbers::* {z1 z2} {
+    set result {}
+    foreach {c1 d1} $z1 {break}
+    foreach {c2 d2} $z2 {break}
+
+    return [list [expr {$c1*$c2-$d1*$d2}] [expr {$c1*$d2+$c2*$d1}]]
+}
+proc ::math::complexnumbers::/ {z1 z2} {
+    set result {}
+    foreach {c1 d1} $z1 {break}
+    foreach {c2 d2} $z2 {break}
+
+    set denom [expr {$c2*$c2+$d2*$d2}]
+    return [list [expr {($c1*$c2+$d1*$d2)/$denom}] \
+                 [expr {(-$c1*$d2+$c2*$d1)/$denom}]]
+}
+
+# unary operations --
+#    Implement the basic unary operations
+# Arguments:
+#    z1        Argument
+# Result:
+#    New complex number
+#
+proc ::math::complexnumbers::conj {z1} {
+    foreach {c d} $z1 {break}
+    return [list $c [expr {-$d}]]
+}
+proc ::math::complexnumbers::real {z1} {
+    foreach {c d} $z1 {break}
+    return $c
+}
+proc ::math::complexnumbers::imag {z1} {
+    foreach {c d} $z1 {break}
+    return $d
+}
+proc ::math::complexnumbers::mod {z1} {
+    foreach {c d} $z1 {break}
+    return [expr {hypot($c,$d)}]
+}
+proc ::math::complexnumbers::arg {z1} {
+    foreach {c d} $z1 {break}
+    if { $c != 0.0 || $d != 0.0 } {
+        return [expr {atan2($d,$c)}]
+    } else {
+        return 0.0
+    }
+}
+
+# elementary functions --
+#    Implement the elementary functions
+# Arguments:
+#    z1        Argument
+#    z2        Second argument (if any)
+# Result:
+#    New complex number
+#
+proc ::math::complexnumbers::exp {z1} {
+    foreach {c d} $z1 {break}
+    return [list [expr {exp($c)*cos($d)}] [expr {exp($c)*sin($d)}]]
+}
+proc ::math::complexnumbers::cos {z1} {
+    foreach {c d} $z1 {break}
+    return [list [expr {cos($c)*cosh($d)}] [expr {-sin($c)*sinh($d)}]]
+}
+proc ::math::complexnumbers::sin {z1} {
+    foreach {c d} $z1 {break}
+    return [list [expr {sin($c)*cosh($d)}] [expr {cos($c)*sinh($d)}]]
+}
+proc ::math::complexnumbers::tan {z1} {
+    return [/ [sin $z1] [cos $z1]]
+}
+proc ::math::complexnumbers::log {z1} {
+    return [list [expr {log([mod $z1])}] [arg $z1]]
+}
+proc ::math::complexnumbers::sqrt {z1} {
+    set argz [expr {0.5*[arg $z1]}]
+    set modz [expr {sqrt([mod $z1])}]
+    return [list [expr {$modz*cos($argz)}] [expr {$modz*sin($argz)}]]
+}
+proc ::math::complexnumbers::pow {z1 z2} {
+    return [exp [* [log $z1] $z2]]
+}
+# transformational functions --
+#    Implement transformational functions
+# Arguments:
+#    z1        Argument
+# Result:
+#    String like 1+i
+#
+proc ::math::complexnumbers::tostring {z1} {
+    foreach {c d} $z1 {break}
+    if { $d == 0.0 } {
+        return "$c"
+    } else {
+        if { $c == 0.0 } {
+            if { $d == 1.0 } {
+                return "i"
+            } elseif { $d == -1.0 } {
+                return "-i"
+            } else {
+                return "${d}i"
+            }
+        } else {
+            if { $d > 0.0 } {
+                if { $d == 1.0 } {
+                    return "$c+i"
+                } else {
+                    return "$c+${d}i"
+                }
+            } else {
+                if { $d == -1.0 } {
+                    return "$c-i"
+                } else {
+                    return "$c${d}i"
+                }
+            }
+        }
+    }
+}
+
+#
+# Announce our presence
+#
+package provide math::complexnumbers 1.0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/quasirandom.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/quasirandom.tcl
new file mode 100644
index 00000000..5885c325
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/quasirandom.tcl
@@ -0,0 +1,517 @@
+# quasirandom.tcl --
+#     Generate quasi-random points in n dimensions and provide simple
+#     methods to evaluate an integral
+#
+#     Note: provide a OO-style interface
+#
+#     TODO: integral-detailed, minimum, maximum
+#
+#     Based on the blog "The Unreasonable Effectiveness of Quasirandom Sequences" by Martin Roberts,
+#     http://extremelearning.com.au/unreasonable-effectiveness-of-quasirandom-sequences/
+#
+
+package require Tcl 8.5
+package require TclOO
+
+package provide math::quasirandom 1.0
+
+namespace eval ::math::quasirandom {
+
+# qrpoints --
+#     Create the class
+#
+::oo::class create qrpoints {
+
+    # constructor --
+    #     Construct a new instance of the qrpoints class
+    #
+    # Arguments:
+    #     dim             Number of dimensions, or one of: circle, disk, sphere, ball
+    #     args            Zero or more key-value pairs:
+    #                     -start       - start the generation with the given multiplier (integer)
+    #                     -evaluations - default number of evaluations for the integration
+    #                     (possibly others as well)
+    #
+    constructor {dimin args} {
+        my variable dim
+        my variable coord_factors
+        my variable step
+        my variable evaluations
+        my variable use_radius
+        my variable effective_dim
+
+        if { ( ![string is integer -strict $dimin] || $dimin <= 0 ) && $dimin ni {circle disk sphere ball} } {
+            return -code error "The dimension argument should be a positive integer value or one of circle, disk, sphere or ball"
+        }
+
+        set use_radius 1
+        switch -- $dimin {
+            "circle" {
+                set dim 1
+                set effective_dim 2
+                ::oo::objdefine [self] {
+                    forward next   my CircleNext
+                    forward Volume my CircleVolume
+                }
+            }
+            "disk" {
+                set dim 2
+                set effective_dim 2
+                ::oo::objdefine [self] {
+                    forward next   my DiskNext
+                    forward Volume my DiskVolume
+                }
+            }
+            "sphere" {
+                set dim 2
+                set effective_dim 3
+                ::oo::objdefine [self] {
+                    forward next   my SphereNext
+                    forward Volume my SphereVolume
+                }
+            }
+            "ball" {
+                set dim 3
+                set effective_dim 3
+                ::oo::objdefine [self] {
+                    forward next   my BallNext
+                    forward Volume my BallVolume
+                }
+            }
+            default {
+                set dim $dimin
+                set use_radius 0
+                ::oo::objdefine [self] {
+                    forward next   my PlainNext
+                    forward Volume my PlainVolume
+                }
+            }
+        }
+
+        set step        1
+        set evaluations 100
+
+        set coord_factors [::math::quasirandom::CoordFactors $dim]
+
+        foreach {key value} $args {
+            switch -- $key {
+            "-start" {
+
+                 my set-step $value
+            }
+            "-evaluations" {
+                 if { ![string is -strict integer $value] || $value <= 0 } {
+                     return -code error "The value for the option $key should be a positive integer value"
+                 }
+
+                 my set-evaluations $value
+            }
+            default {
+                return -code error "Unknown option: $key -- value: $value"
+            }
+            }
+        }
+    }
+
+    # PlainNext --
+    #     Generate the next point - for a hyperblock
+    #
+    method PlainNext {} {
+        my variable step
+        my variable coord_factors
+
+        set coords {}
+        foreach f $coord_factors {
+            lappend coords [expr {fmod( $f * $step, 1.0 )}]
+        }
+
+        incr step
+
+        return $coords
+    }
+
+    # PlainVolume --
+    #     Calculate the volume of a hyperblock
+    #
+    # Arguments:
+    #     minmax              List of minimum and maximum per dimension
+    #
+    # Returns:
+    #     The volume
+    #
+    method PlainVolume {minmax} {
+        set volume 1.0
+        foreach range $minmax {
+            lassign $range xmin xmax
+            set volume [expr {$volume * ($xmax-$xmin)}]
+        }
+        return $volume
+    }
+
+    # CircleNext --
+    #     Generate the next point on a unit circle
+    #
+    method CircleNext {} {
+
+        set f      [lindex [my PlainNext] 0]
+        set rad    [expr {2.0 * acos(-1.0) * $f}]
+
+        set coords [list [expr {cos($rad)}] [expr {sin($rad)}]]
+
+        return $coords
+    }
+
+    # CircleVolume --
+    #     Calculate the "volume" of the unit circle
+    #
+    # Arguments:
+    #     radius        Radius of the circle
+    #
+    method CircleVolume {radius} {
+         return [expr {$radius * 2.0*cos(-1.0)}]
+    }
+
+    # DiskNext --
+    #     Generate the next point on a unit disk
+    #
+    method DiskNext {} {
+
+        while {1} {
+            set coords [my PlainNext]
+
+            lassign $coords x y
+
+            if { hypot($x-0.5,$y-0.5) <= 0.25 } {
+                set coords [list [expr {2.0*$x-1.0}] [expr {2.0*$y-1.0}]]
+                break
+            }
+        }
+        return $coords
+    }
+
+    # DiskVolume --
+    #     Calculate the "volume" of the unit disk
+    #
+    # Arguments:
+    #     radius        Radius of the disk
+    #
+    method DiskVolume {radius} {
+         return [expr {$radius**2 * cos(-1.0)}]
+    }
+
+    # BallNext --
+    #     Generate the next point on a unit ball
+    #
+    method BallNext {} {
+
+        while {1} {
+            set coords [my PlainNext]
+
+            lassign $coords x y z
+
+            set r [expr {($x-0.5)**2 + ($y-0.5)**2 + ($z-0.5)**2}]
+            if { $r <= 0.25 } {
+                set coords [list [expr {2.0*$x-1.0}] [expr {2.0*$y-1.0}] [expr {2.0*$z-1.0}]]
+                break
+            }
+        }
+
+        return $coords
+    }
+
+    # BallVolume --
+    #     Calculate the volume of the unit ball
+    #
+    # Arguments:
+    #     radius        Radius of the ball
+    #
+    method BallVolume {radius} {
+         return [expr {4.0/3.0 * $radius**3 * cos(-1.0)}]
+    }
+
+    # SphereNext --
+    #     Generate the next point on a unit sphere
+    #
+    method SphereNext {} {
+
+        set coords [my PlainNext]
+
+        lassign $coords u v
+
+        set phi    [expr {2.0 * acos(-1.0) * $v}]
+        set lambda [expr {acos(2.0 * $u - 1.0) + 0.5 * acos(-1.0)}]
+
+        set x      [expr {cos($lambda) * cos($phi)}]
+        set y      [expr {cos($lambda) * sin($phi)}]
+        set z      [expr {sin($lambda)}]
+
+        return [list $x $y $z]
+    }
+
+    # SphereVolume --
+    #     Calculate the "volume" of the unit sphere
+    #
+    # Arguments:
+    #     radius        Radius of the sphere
+    #
+    method SphereVolume {radius} {
+         return [expr {4.0 * $radius**2 * cos(-1.0)}]
+    }
+
+    # set-step --
+    #     Set the first step to be used
+    #
+    method set-step {{value ""}} {
+        my variable step
+
+        if { $value eq "" } {
+            return $step
+        }
+
+        if { ![string is integer -strict $value] } {
+            return -code error "The value for the option $key should be an integer value"
+        }
+
+        set step [expr {int($value)}]
+    }
+
+    # set-evaluations --
+    #     Set the number of evaluations for integration
+    #
+    method set-evaluations {{value ""}} {
+        my variable evaluations
+
+        if { $value eq "" } {
+            return $evaluations
+        }
+
+        if { ![string is integer -strict $value] || $value <= 0 } {
+            return -code error "The value for the option $key should be a positive integer value"
+        }
+
+        set evaluations [expr {4*int(($value+3)/4)}]  ;# Make sure it is a 4-fold
+    }
+
+    # integral --
+    #     Evaluate the integral of a function over a given (rectangular) domain
+    #
+    # Arguments:
+    #     func              Function to be integrated
+    #     minmax            List of minimum and maximum bounds for each coordinate
+    #     args              Key-value pair: number of evaluations
+    #
+    # Returns:
+    #     Estimate of the integral based on "evaluations" evaluations
+    #     Note: no error estimate
+    #
+    method integral {func minmax args} {
+        my variable dim
+        my variable step
+        my variable coord_factors
+        my variable evaluations
+        my variable use_radius
+        my variable effective_dim
+
+        set evals $evaluations
+
+        set func [uplevel 1 [list namespace which -command $func]]
+
+        foreach {key value} $args {
+            switch -- $key {
+            "-evaluations" {
+                 if { ![string is integer -strict $value] || $value <= 0 } {
+                     return -code error "The value for the option $key should be a positive integer value"
+                 }
+
+                 set evals $value ;# Local only!
+            }
+            default {
+                return -code error "Unknown option: $key -- value: $value"
+            }
+            }
+        }
+
+        if { ! $use_radius } {
+            if { [llength $minmax] != $dim } {
+                return -code error "The number of ranges (minmax) should be equal to the dimension ($dim)"
+            } else {
+                set volume [my Volume $minmax]
+            }
+        } else {
+            if { ! [string is double $minmax] } {
+                return -code error "For a circle, disk, sphere or ball only the radius should be given"
+            } else {
+                set radius $minmax
+                set minmax [lrepeat $effective_dim [list 0.0 $radius]]
+                set volume [my Volume $radius]
+            }
+        }
+
+        set sum 0.0
+
+        for {set i 0} {$i < $evals} {incr i} {
+            set coords {}
+            foreach c [my next] range $minmax {
+                lassign $range xmin xmax
+                lappend coords [expr {$xmin + ($xmax-$xmin) * $c}]
+            }
+            set sum [expr {$sum + [$func $coords]}]
+        }
+
+        return [expr {$sum * $volume / $evals}]
+    }
+
+    # integral-detailed --
+    #     Evaluate the integral of a function over a given (rectangular) domain
+    #     and provide detailed information
+    #
+    # Arguments:
+    #     func              Function to be integrated
+    #     minmax            List of minimum and maximum bounds for each coordinate
+    #     args              Key-value pair: number of evaluations
+    #
+    # Returns:
+    #     Dictionary of:
+    #     -estimate value     - estimate of the integral
+    #     -evaluations number - total number of evaluations
+    #     -error value        - estimate of the error
+    #     -rawvalues list     - list of raw values obtained for the integral
+    #
+    method integral-detailed {func minmax args} {
+        my variable evaluations
+
+        set evals $evaluations
+
+        set func [uplevel 1 [list namespace which -command $func]]
+
+        foreach {key value} $args {
+            switch -- $key {
+            "-evaluations" {
+                 if { ![string is integer -strict $value] || $value <= 0 } {
+                     return -code error "The value for the option $key should be a positive integer value"
+                 }
+
+                 set evals $value ;# Local only!
+            }
+            default {
+                return -code error "Unknown option: $key -- value: $value"
+            }
+            }
+        }
+
+        lappend args -evaluations [expr {($evals+3)/4}]
+
+        for {set i 0} {$i < 4} {incr i} {
+            lappend rawvalues [my integral $func $minmax {*}$args]
+        }
+
+        set sum   0.0
+        set sqsum 0.0
+
+        foreach value $rawvalues {
+            set sum   [expr {$sum + $value}]
+            set sqsum [expr {$sqsum + $value**2}]
+        }
+
+        set stdev [expr {sqrt(($sqsum - $sum**2/4.0)/3.0)}]
+        set sum   [expr {$sum / 4.0}]
+                                            # Standard error of mean
+        return [dict create -estimate $sum -error [expr {$stdev/2.0}] -rawvalues $rawvalues -evaluations [expr {4*(($evals+3)/4)}]]
+    }
+
+} ;# End of class
+
+} ;# End of namespace eval
+
+# CoordFactors --
+#     Determine the factors for the coordinates
+#
+# Arguments:
+#     dim         Number of dimensions
+#
+proc ::math::quasirandom::CoordFactors {dim} {
+    set n [expr {$dim + 1}]
+
+    set f 1.0
+    for {set i 0} {$i < 10} {incr i} {
+        set f [expr {$f - ($f**$n-$f-1.0) / ($n*$f**($n-1)-1.0)}]
+    }
+
+    set factors {}
+    set af      1.0
+
+    for {set i 0} {$i < $dim} {incr i} {
+        set af [expr {$af/$f}]
+        lappend factors $af
+    }
+
+    return $factors
+}
+
+# End of code for package
+
+# --------------------------------------------
+# test --
+#
+
+if {0} {
+
+::math::quasirandom::qrpoints create square 2
+
+puts [square next]
+puts [square next]
+puts [square next]
+
+
+proc f {coords} {
+    lassign $coords x y
+
+    expr {$x**2+$y**2}
+}
+
+proc g {coords} {
+    lassign $coords x y
+
+    expr {(1.0-cos($x))**2 * (1.0-cos($y))**2}
+}
+
+# Print four estimates - should not deviate too much from 10.0
+puts [square integral f {{0 1} {0 3}}]
+puts [square integral f {{0 1} {0 3}}]
+puts [square integral f {{0 1} {0 3}}]
+puts [square integral f {{0 1} {0 3}}]
+
+# Print a sequence of estimates - should converge to (3pi/2)**2
+foreach n {20 40 100 300 1000} {
+    square set-evaluations $n
+
+    puts "$n: [square integral g [list [list 0.0 [expr {acos(-1)}]] [list 0.0 [expr {acos(-1)}]]]]"
+}
+
+
+::math::quasirandom::qrpoints create block 3
+puts [block next]
+
+puts "Circle ..."
+::math::quasirandom::qrpoints create circle circle
+puts [circle next]
+puts [circle next]
+puts [circle next]
+
+# Test values for CoordFactors
+# dim = 1: 1.6180339887498948482045...
+# dim = 2: 1.3247179572447460259609...
+# dim = 3: 1.2207440846057594753616...
+
+set f [::math::quasirandom::CoordFactors 1]
+puts 1.6180339887498948482045...
+puts [expr {1.0/$f}]
+
+set f [lindex [::math::quasirandom::CoordFactors 2] 0]
+puts 1.3247179572447460259609...
+puts [expr {1.0/$f}]
+
+set f [lindex [::math::quasirandom::CoordFactors 3] 0]
+puts 1.2207440846057594753616...
+puts [expr {1.0/$f}]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/rational_funcs.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/rational_funcs.tcl
new file mode 100644
index 00000000..2dae3971
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/rational_funcs.tcl
@@ -0,0 +1,364 @@
+# rational_funcs.tcl --
+#    Implement procedures to deal with rational functions
+#
+
+package require math::polynomials
+
+namespace eval ::math::rationalfunctions {
+    variable count 0  ;# Count the number of specific commands
+    namespace eval v {}
+
+    namespace export rationalFunction ratioCmd evalRatio \
+                     coeffsNumerator coeffsDenominator \
+                     derivRatio  \
+                     addRatio    subRatio multRatio \
+                     divRatio
+
+    namespace import ::math::polynomials::*
+}
+
+
+# rationalFunction --
+#    Return a rational function definition
+#
+# Arguments:
+#    num          The coefficients of the numerator
+#    den          The coefficients of the denominator
+# Result:
+#    Rational function definition
+#
+proc ::math::rationalfunctions::rationalFunction {num den} {
+
+    foreach coeffs [list $num $den] {
+        foreach coeff $coeffs {
+            if { ! [string is double -strict $coeff] } {
+                return -code error "Coefficients must be real numbers"
+            }
+        }
+    }
+
+    #
+    # The leading coefficient must be non-zero
+    #
+    return [list RATIONAL_FUNCTION [polynomial $num] [polynomial $den]]
+}
+
+# ratioCmd --
+#    Return a procedure that implements a rational function evaluation
+#
+# Arguments:
+#    num          The coefficients of the numerator
+#    den          The coefficients of the denominator
+# Result:
+#    New procedure
+#
+proc ::math::rationalfunctions::ratioCmd {num {den {}}} {
+    variable count
+
+    if { [llength $den] == 0 } {
+        if { [lindex $num 0] == "RATIONAL_FUNCTION" } {
+            set den [lindex $num 2]
+            set num [lindex $num 1]
+        }
+    }
+
+    set degree1 [expr {[llength $num]-1}]
+    set degree2 [expr {[llength $num]-1}]
+    set body "expr \{([join $num +\$x*(][string repeat ) $degree1])/\
+(double([join $den +\$x*(][string repeat ) $degree2])\}"
+
+    incr count
+    set name "::math::rationalfunctions::v::RATIO$count"
+    proc $name {x} $body
+    return $name
+}
+
+# evalRatio --
+#    Evaluate a rational function at a given coordinate
+#
+# Arguments:
+#    ratio        Rational function definition
+#    x            Coordinate
+# Result:
+#    Value at x
+#
+proc ::math::rationalfunctions::evalRatio {ratio x} {
+    if { [lindex $ratio 0] != "RATIONAL_FUNCTION" } {
+        return -code error "Not a rational function"
+    }
+    if { ! [string is double $x] } {
+        return -code error "Coordinate must be a real number"
+    }
+
+    set num 0.0
+    foreach c [lindex [lindex $ratio 1] 1] {
+        set num [expr {$num*$x+$c}]
+    }
+
+    set den 0.0
+    foreach c [lindex [lindex $ratio 2] 1] {
+        set den [expr {$den*$x+$c}]
+    }
+    return [expr {$num/double($den)}]
+}
+
+# coeffsNumerator --
+#    Return the coefficients of the numerator
+#
+# Arguments:
+#    ratio        Rational function definition
+# Result:
+#    The coefficients in ascending order
+#
+proc ::math::rationalfunctions::coeffsNumerator {ratio} {
+    if { [lindex $ratio 0] != "RATIONAL_FUNCTION" } {
+        return -code error "Not a rational function"
+    }
+    set polyn [lindex $ratio 1]
+    return [allCoeffsPolyn $polyn]
+}
+
+# coeffsDenominator --
+#    Return the coefficients of the denominator
+#
+# Arguments:
+#    ratio        Rational function definition
+# Result:
+#    The coefficients in ascending order
+#
+proc ::math::rationalfunctions::coeffsDenominator {ratio} {
+    if { [lindex $ratio 0] != "RATIONAL_FUNCTION" } {
+        return -code error "Not a rational function"
+    }
+    set polyn [lindex $ratio 2]
+    return [allCoeffsPolyn $polyn]
+}
+
+# derivRatio --
+#    Return the derivative of the rational function
+#
+# Arguments:
+#    polyn        Polynomial definition
+# Result:
+#    The new polynomial
+#
+proc ::math::rationalfunctions::derivRatio {ratio} {
+    if { [lindex $ratio 0] != "RATIONAL_FUNCTION" } {
+        return -code error "Not a rational function"
+    }
+    set num_polyn [lindex $ratio 1]
+    set den_polyn [lindex $ratio 2]
+    set num_deriv [derivPolyn $num_polyn]
+    set den_deriv [derivPolyn $den_polyn]
+    set num       [subPolyn [multPolyn $num_deriv $den_polyn] \
+                            [multPolyn $den_deriv $num_polyn] ]
+    set den       [multPolyn $den_polyn $den_polyn]
+
+    return [list RATIONAL_FUNCTION $num $den]
+}
+
+# addRatio --
+#    Add two rational functions and return the result
+#
+# Arguments:
+#    ratio1       First rational function or a scalar
+#    ratio2       Second rational function or a scalar
+# Result:
+#    The sum of the two functions
+# Note:
+#    TODO: Check for the same denominator
+#
+proc ::math::rationalfunctions::addRatio {ratio1 ratio2} {
+    if { [llength $ratio1] == 1 && [string is double -strict $ratio1] } {
+        set polyn1 [rationalFunction $ratio1 1.0]
+    }
+    if { [llength $ratio2] == 1 && [string is double -strict $ratio2] } {
+        set ratio2 [rationalFunction $ratio1 1.0]
+    }
+    if { [lindex $ratio1 0] != "RATIONAL_FUNCTION" ||
+         [lindex $ratio2 0] != "RATIONAL_FUNCTION" } {
+        return -code error "Both arguments must be rational functions or a real number"
+    }
+
+    set num1    [lindex $ratio1 1]
+    set den1    [lindex $ratio1 2]
+    set num2    [lindex $ratio2 1]
+    set den2    [lindex $ratio2 2]
+
+    set newnum  [addPolyn [multPolyn $num1 $den2] \
+                          [multPolyn $num2 $den1] ]
+
+    set newden  [multPolyn $den1 $den2]
+
+    return [list RATIONAL_FUNCTION $newnum $newden]
+}
+
+# subRatio --
+#    Subtract two rational functions and return the result
+#
+# Arguments:
+#    ratio1       First rational function or a scalar
+#    ratio2       Second rational function or a scalar
+# Result:
+#    The difference of the two functions
+# Note:
+#    TODO: Check for the same denominator
+#
+proc ::math::rationalfunctions::subRatio {ratio1 ratio2} {
+    if { [llength $ratio1] == 1 && [string is double -strict $ratio1] } {
+        set polyn1 [rationalFunction $ratio1 1.0]
+    }
+    if { [llength $ratio2] == 1 && [string is double -strict $ratio2] } {
+        set ratio2 [rationalFunction $ratio1 1.0]
+    }
+    if { [lindex $ratio1 0] != "RATIONAL_FUNCTION" ||
+         [lindex $ratio2 0] != "RATIONAL_FUNCTION" } {
+        return -code error "Both arguments must be rational functions or a real number"
+    }
+
+    set num1    [lindex $ratio1 1]
+    set den1    [lindex $ratio1 2]
+    set num2    [lindex $ratio2 1]
+    set den2    [lindex $ratio2 2]
+
+    set newnum  [subPolyn [multPolyn $num1 $den2] \
+                          [multPolyn $num2 $den1] ]
+
+    set newden  [multPolyn $den1 $den2]
+
+    return [list RATIONAL_FUNCTION $newnum $newden]
+}
+
+# multRatio --
+#    Multiply two rational functions and return the result
+#
+# Arguments:
+#    ratio1       First rational function or a scalar
+#    ratio2       Second rational function or a scalar
+# Result:
+#    The product of the two functions
+# Note:
+#    TODO: Check for the same denominator
+#
+proc ::math::rationalfunctions::multRatio {ratio1 ratio2} {
+    if { [llength $ratio1] == 1 && [string is double -strict $ratio1] } {
+        set polyn1 [rationalFunction $ratio1 1.0]
+    }
+    if { [llength $ratio2] == 1 && [string is double -strict $ratio2] } {
+        set ratio2 [rationalFunction $ratio1 1.0]
+    }
+    if { [lindex $ratio1 0] != "RATIONAL_FUNCTION" ||
+         [lindex $ratio2 0] != "RATIONAL_FUNCTION" } {
+        return -code error "Both arguments must be rational functions or a real number"
+    }
+
+    set num1    [lindex $ratio1 1]
+    set den1    [lindex $ratio1 2]
+    set num2    [lindex $ratio2 1]
+    set den2    [lindex $ratio2 2]
+
+    set newnum  [multPolyn $num1 $num2]
+    set newden  [multPolyn $den1 $den2]
+
+    return [list RATIONAL_FUNCTION $newnum $newden]
+}
+
+# divRatio --
+#    Divide two rational functions and return the result
+#
+# Arguments:
+#    ratio1       First rational function or a scalar
+#    ratio2       Second rational function or a scalar
+# Result:
+#    The quotient of the two functions
+# Note:
+#    TODO: Check for the same denominator
+#
+proc ::math::rationalfunctions::divRatio {ratio1 ratio2} {
+    if { [llength $ratio1] == 1 && [string is double -strict $ratio1] } {
+        set polyn1 [rationalFunction $ratio1 1.0]
+    }
+    if { [llength $ratio2] == 1 && [string is double -strict $ratio2] } {
+        set ratio2 [rationalFunction $ratio1 1.0]
+    }
+    if { [lindex $ratio1 0] != "RATIONAL_FUNCTION" ||
+         [lindex $ratio2 0] != "RATIONAL_FUNCTION" } {
+        return -code error "Both arguments must be rational functions or a real number"
+    }
+
+    set num1    [lindex $ratio1 1]
+    set den1    [lindex $ratio1 2]
+    set num2    [lindex $ratio2 1]
+    set den2    [lindex $ratio2 2]
+
+    set newnum  [multPolyn $num1 $den2]
+    set newden  [multPolyn $num2 $den1]
+
+    return [list RATIONAL_FUNCTION $newnum $newden]
+}
+
+#
+# Announce our presence
+#
+package provide math::rationalfunctions 1.0.1
+
+# some tests --
+#
+if { 0 } {
+set prec $::tcl_precision
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    set ::tcl_precision 17
+} else {
+    set ::tcl_precision 0
+}
+
+
+set f1    [::math::rationalfunctions::rationalFunction {1 2 3} {1 4}]
+set f2    [::math::rationalfunctions::rationalFunction {1 2 3 0} {1 4}]
+set f3    [::math::rationalfunctions::rationalFunction {0 0 0 0} {1}]
+set f4    [::math::rationalfunctions::rationalFunction {5 7} {1}]
+set cmdf1 [::math::rationalfunctions::ratioCmd {1 2 3} {1 4}]
+
+foreach x {0 1 2 3 4 5} {
+    puts "[::math::rationalfunctions::evalRatio $f1 $x] -- \
+[expr {(1.0+2.0*$x+3.0*$x*$x)/double(1.0+4.0*$x)}] -- \
+[$cmdf1 $x] -- [::math::rationalfunctions::evalRatio $f3 $x]"
+}
+
+puts "All coefficients = [::math::rationalfunctions::coeffsNumerator $f2]"
+puts "                   [::math::rationalfunctions::coeffsDenominator $f2]"
+
+puts "Derivative = [::math::rationalfunctions::derivRatio $f1]"
+
+puts "Add:       [::math::rationalfunctions::addRatio $f1 $f4]"
+puts "Add:       [::math::rationalfunctions::addRatio $f4 $f1]"
+puts "Subtract:  [::math::rationalfunctions::subRatio $f1 $f4]"
+puts "Multiply:  [::math::rationalfunctions::multRatio $f1 $f4]"
+
+set f1    [::math::rationalfunctions::rationalFunction {1 2 3} 1]
+set f2    [::math::rationalfunctions::rationalFunction {0 1} 1]
+
+puts "Divide:    [::math::rationalfunctions::divRatio $f1 $f2]"
+
+set f1    [::math::rationalfunctions::rationalFunction {1 2 3} 1]
+set f2    [::math::rationalfunctions::rationalFunction {1 1} {1 2}]
+
+puts "Divide:    [::math::rationalfunctions::divRatio $f1 $f2]"
+
+set f1 [::math::rationalfunctions::rationalFunction {1 2 3} 1]
+set f2 [::math::rationalfunctions::rationalFunction {0 1} {0 0 1}]
+set f3 [::math::rationalfunctions::divRatio $f2 $f1]
+set coeffs [::math::rationalfunctions::coeffsNumerator $f3]
+puts "Coefficients: $coeffs"
+set f3 [::math::rationalfunctions::divRatio $f1 $f2]
+set coeffs [::math::rationalfunctions::coeffsNumerator $f3]
+puts "Coefficients: $coeffs"
+set f1 [::math::rationalfunctions::rationalFunction {1 2 3} {1 2}]
+set f2 [::math::rationalfunctions::rationalFunction {0} {1}]
+set f3 [::math::rationalfunctions::divRatio $f2 $f1]
+set coeffs [::math::rationalfunctions::coeffsNumerator $f3]
+puts "Coefficients: $coeffs"
+puts "Eval null function: [::math::rationalfunctions::evalRatio $f2 1]"
+
+set ::tcl_precision $prec
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/romannumerals.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/romannumerals.tcl
new file mode 100644
index 00000000..a67d2599
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/romannumerals.tcl
@@ -0,0 +1,164 @@
+#==========================================================================
+# Roman Numeral Utility Functions
+#==========================================================================
+# Description
+#
+#   A set of utility routines for handling and manipulating
+#   roman numerals.
+#-------------------------------------------------------------------------
+# Copyright/License
+#
+#   This code was originally harvested from the Tcler's
+#   wiki at http://wiki.tcl.tk/1823 and as such is free
+#   for any use for any purpose.
+#-------------------------------------------------------------------------
+# Modification history
+#
+#   27 Sep 2005 Kenneth Green
+#       Original version derived from wiki code
+#-------------------------------------------------------------------------
+
+package provide math::roman 1.0
+
+#==========================================================================
+# Namespace
+#==========================================================================
+namespace eval ::math::roman {
+    namespace export tointeger toroman
+
+    # We dont export 'sort' or 'expr' to prevent collision
+    # with existing commands. These functions are less likely to be
+    # commonly used and have to be accessed as fully-scoped names.
+
+    # romanvalues - array that maps roman letters to integer values.
+    #
+    variable romanvalues
+
+    # i2r - list of integer-roman tuples
+    variable i2r {1000 M 900 CM 500 D 400 CD 100 C 90 XC 50 L 40 XL 10 X 9 IX 5 V 4 IV 1 I}
+
+    # sortkey - list of patterns to supporting sorting of roman numerals
+    variable sortkey {IX VIIII L Y XC YXXXX C Z D {\^} ZM {\^ZZZZ} M _}
+    variable rsortkey {_ M {\^ZZZZ} ZM {\^} D Z C YXXXX XC Y L VIIII IX}
+
+    # Initialise array variables
+    array set romanvalues {M 1000 D 500 C 100 L 50 X 10 V 5 I 1}
+}
+
+#==========================================================================
+# Public Functions
+#==========================================================================
+
+#----------------------------------------------------------
+# Roman numerals sorted
+#
+proc ::math::roman::sort list {
+    variable sortkey
+    variable rsortkey
+
+    foreach {from to} $sortkey {
+        regsub -all $from $list $to list
+    }
+    set list [lsort $list]
+    foreach {from to} $rsortkey {
+        regsub -all $from $list $to list
+    }
+    return $list
+}
+
+#----------------------------------------------------------
+# Roman numerals from integer
+#
+proc ::math::roman::toroman {i} {
+    variable i2r
+
+    set res ""
+    foreach {value roman} $i2r {
+        while {$i>=$value} {
+            append res $roman
+            incr i -$value
+        }
+    }
+    return $res
+}
+
+#----------------------------------------------------------
+# Roman numerals parsed into integer:
+#
+proc ::math::roman::tointeger {s} {
+    variable romanvalues
+
+    set last 99999
+    set res  0
+    foreach i [split [string toupper $s] ""] {
+        if { [catch {set val $romanvalues($i)}] } {
+            return -code error "roman::tointeger - un-Roman digit $i in $s"
+        }
+        incr res $val
+        if { $val > $last } {
+            incr res [::expr -2*$last]
+        }
+        set last $val
+    }
+    return $res
+}
+
+#----------------------------------------------------------
+# Roman numeral arithmetic
+#
+proc ::math::roman::expr args {
+
+    if { [string first \$ $args] >= 0 } {
+        set args [uplevel subst $args]
+    }
+
+    regsub -all {[^IVXLCDM]} $args { & } args
+    foreach i $args {
+        catch {set i [tointeger $i]}
+        lappend res $i
+    }
+    return [toroman [::expr $res]]
+}
+
+#==========================================================
+# Developer test code
+#
+if { 0 } {
+
+    puts "Basic int-to-roman-to-int conversion test"
+    for { set i 0 } {$i < 50} {incr i} {
+        set r [::math::roman::toroman   $i]
+        set j [::math::roman::tointeger $r]
+        puts [format "%5d   %-15s %s" $i $r $j]
+        if { $i != $j } {
+            error "Invalid conversion: $i -> $r -> $j"
+        }
+    }
+
+    puts ""
+    puts "roman arithmetic test"
+    set x 23
+    set xr [::math::roman::toroman $x]
+    set y 77
+    set yr [::math::roman::toroman $y]
+    set xr+yr [::math::roman::expr $xr + $yr]
+    set yr-xr [::math::roman::expr $yr - $xr]
+    set xr*yr [::math::roman::expr $xr * $yr]
+    set yr/xr [::math::roman::expr $yr / $xr]
+    set yr/xr2 [::math::roman::expr {$yr / $xr}]
+    puts "$x + $y\t\t= [expr $x + $y]"
+    puts "$x * $y\t\t= [expr $x * $y]"
+    puts "$y - $x\t\t= [expr $y - $x]"
+    puts "$y / $x\t\t= [expr $y / $x]"
+    puts "$xr + $yr\t= ${xr+yr} = [::math::roman::tointeger ${xr+yr}]"
+    puts "$xr * $yr\t= ${xr*yr} = [::math::roman::tointeger ${xr*yr}]"
+    puts "$yr - $xr\t= ${yr-xr} = [::math::roman::tointeger ${yr-xr}]"
+    puts "$yr / $xr\t= ${yr/xr} = [::math::roman::tointeger ${yr/xr}]"
+    puts "$yr / $xr\t= ${yr/xr2} = [::math::roman::tointeger ${yr/xr2}]"
+
+    puts ""
+    puts "roman sorting test"
+    set l {X III IV I V}
+    puts "IN : $l"
+    puts "OUT: [::math::roman::sort $l]"
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/rootfind.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/rootfind.tcl
new file mode 100644
index 00000000..5804fb0c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/rootfind.tcl
@@ -0,0 +1,343 @@
+# rootfind.tcl --
+#     Root-finding procedures:
+#     - Bisection
+#     - Secant
+#     - Brent
+#     - Chandrupatla
+#
+#     TODO: f(root), number of steps, converged or not
+#
+#     TOMS748? Seems quite complicated
+#     Brent in stead of secant - more robust, Chandrupatla is supposed to be faster
+#
+
+namespace eval ::math::calculus {}
+
+# root_bisection --
+#     Find a root of a function of one variable via bisection
+#
+# Arguments:
+#     f                Procedure implementing the function
+#     a                Left point of the interval
+#     b                Right point of the interval
+#     tol              Tolerance (optional)
+#
+# Returns:
+#     The approximation of the root
+#
+# Note:
+#     The interval [a,b] must enclose an odd number of roots,
+#     that is: f(a)*f(b) < 0
+#
+proc ::math::calculus::root_bisection {f a b {tol 1.0e-7}} {
+
+    if { $tol <= 0.0 } {
+        return -code error "The tolerance must be a small positive value"
+    }
+
+    set fa [$f $a]
+    set fb [$f $b]
+
+    if { ($fa < 0.0 && $fb < 0.0) || ($fa > 0.0 && $fb > 0.0) } {
+        return -code error "The given interval does not enclose an odd number of roots: f($a) = $fa, f($b) = $fb"
+    }
+
+    set steps    0
+
+    set reduction [expr {min( 2.0e16, abs($b-$a)/$tol )}]
+    set maxsteps [expr {int( log($reduction)/log(2.0) )}] ;# Maximum number of halvings that makes sense
+
+    while { $steps < $maxsteps } {
+        incr steps
+
+        set c  [expr {($a + $b)/ 2.0}]
+        set fc [$f $c]
+
+        if { ($fc <= 0.0 && $fa <= 0.0) || ($fc >= 0.0 && $fa >= 0.0) } {
+            set a  $c
+            set fa $fc
+        } else {
+            set b $c
+            set fb $fc
+        }
+
+        # Special case ...
+        if { $fc == 0.0 } {
+            return $c
+        }
+    }
+
+    return $c
+}
+
+# root_secant --
+#     Find a root of a function of one variable via the secant method
+#
+# Arguments:
+#     f                Procedure implementing the function
+#     a                Left point of the interval
+#     b                Right point of the interval
+#     tol              Tolerance (optional)
+#
+# Returns:
+#     The approximation of the root
+#
+# Note:
+#     The method is not guranteed to converge, but if it does, it does so
+#     quicker than linear. The maximum number of steps is derived from the
+#     idea that the interval will be roughly halved in length.
+#
+proc ::math::calculus::root_secant {f a b {tol 1.0e-7}} {
+
+    if { $tol <= 0.0 } {
+        return -code error "The tolerance must be a small positive value"
+    }
+
+    set fa [$f $a]
+    set fb [$f $b]
+
+    if { ($fa < 0.0 && $fb < 0.0) || ($fa > 0.0 && $fb > 0.0) } {
+        return -code error "The given interval does not enclose an odd number of roots: f($a) = $fa, f($b) = $fb"
+    }
+
+    set steps    0
+
+    set reduction [expr {min( 2.0e16, abs($b-$a)/$tol )}]
+    set maxsteps [expr {int( log($reduction)/log(2.0) )}] ;# Maximum number of halvings that makes sense
+
+
+    while { $steps < $maxsteps } {
+        incr steps
+
+        set c  [expr {($a * $fb - $b * $fa) / double($fb - $fa)}]
+        set fc [$f $c]
+
+        if { abs($c - $b) <= $tol } {
+            break
+        }
+
+        set a  $b
+        set fa $fb
+        set b  $c
+        set fb $fc
+    }
+
+    return $c
+}
+
+# root_chandrupatla --
+#     Find a root of a function of one variable via the method by Chandrupatla (variation on Brent's method)
+#
+# Arguments:
+#     f                Procedure implementing the function
+#     x0               Left point of the interval
+#     x1               Right point of the interval
+#     tol              Tolerance (optional)
+#
+# Returns:
+#     The approximation of the root
+#
+# Note:
+#     The method brackets a root, like the bisection method.
+#
+#     Adopted from www.embeddedrelated.com/showarticle/855.php
+#
+proc ::math::calculus::root_chandrupatla {f x0 x1 {tol 1.0e-7}} {
+
+    if { $tol <= 0.0 } {
+        return -code error "The tolerance must be a small positive value"
+    }
+
+    set b $x0
+    set a $x1
+    set c $x1
+
+    set fa [$f $a]
+    set fb [$f $b]
+    set fc $fa
+
+    if { ($fa < 0.0 && $fb < 0.0) || ($fa > 0.0 && $fb > 0.0) } {
+        return -code error "The given interval does not enclose an odd number of roots: f($a) = $fa, f($b) = $fb"
+    }
+
+    set steps 0
+
+    set t 0.5
+
+    set eps_m $tol
+    set eps_a [expr {2.0 * $tol}] ;# TODO
+
+    while { 1 } {
+        incr steps
+
+        #
+        # Get a new estimate of the root via interpolation
+        #
+        set xt [expr {$a + $t * ($b - $a)}]
+        set ft [$f $xt]
+
+        #
+        # Update the three points we keep track of
+        #
+        if { ($ft < 0.0 && $fa < 0.0) || ($ft > 0.0 && $fa > 0.0) } {
+            set c  $a
+            set fc $fa
+        } else {
+            set c  $b
+            set fc $fb
+            set b  $a
+            set fb $fa
+        }
+
+        set a  $xt
+        set fa $ft
+
+        #
+        # Determine the point with the smallest function value
+        #
+        if { abs($fa) < abs($fb) } {
+            set xm $a
+            set fm $fa
+        } else {
+            set xm $b
+            set fm $fb
+        }
+
+        if { $fm == 0.0 } {
+            return $xm
+        }
+
+        #
+        # Critical values xi and phi (decisions on how to proceed)
+        #
+        set phtol [expr {2.0*$eps_m * abs($xm) + $eps_a}]
+        set tlim  [expr {$phtol / abs($b-$c)}]
+
+        if { $tlim > 0.5 } {
+            return $xm
+        }
+
+        set xi     [expr {($a - $b) / ($c - $b)}]
+        set phi    [expr {($fa - $fb) / ($fc - $fb)}]
+        set do_iqi [expr {$phi**2 < $xi && (1.0 - $phi)**2 < 1.0 - $xi}]
+
+        if { $do_iqi } {
+            #
+            # Inverse quadratic interpolation
+            #
+            set t [expr {$fa / ($fb-$fa) * $fc / ($fb-$fc) +
+                         ($c-$a) / ($b-$a) * $fa / ($fc-$a) * $fb / ($fc-$fb)}]
+        } else {
+            #
+            # Bisection
+            #
+            set t 0.5
+        }
+
+        #
+        # Limit t between (tlim,1-tlim)
+        #
+        set t [expr {min( 1.0 -$tlim, max($tlim, $t) )}]
+    }
+}
+
+# root_brent --
+#     Find a root of a function of one variable via Brent's method
+#
+# Arguments:
+#     f                Procedure implementing the function
+#     x0               Left point of the interval
+#     x1               Right point of the interval
+#     tol              Tolerance (optional)
+#
+# Returns:
+#     The approximation of the root
+#
+# Note:
+#     The method brackets a root, like the bisection method but combines it with the secant method and
+#     inverse quadratic interpolation.
+#
+#     Adopted from Wikipedia
+#
+proc ::math::calculus::root_brent {f x0 x1 {tol 1.0e-7}} {
+
+    if { $tol <= 0.0 } {
+        return -code error "The tolerance must be a small positive value"
+    }
+
+    set b $x0
+    set a $x1
+    set c $x1
+
+    #
+    # Minimal distance between points at which to calculate the function
+    #
+    set delta [expr {1.0e-8 * (abs($x0) + abs($x1)) + $tol/3.0}]
+
+    set fa [$f $a]
+    set fb [$f $b]
+
+    if { ($fa < 0.0 && $fb < 0.0) || ($fa > 0.0 && $fb > 0.0) } {
+        return -code error "The given interval does not enclose an odd number of roots: f($a) = $fa, f($b) = $fb"
+    }
+
+    if { abs($fa) < abs($fb) } {
+        set tmp $a    ; set tmpf $fa
+        set a   $b    ; set fa   $fb
+        set b   $tmp  ; set fb   $tmpf
+    }
+
+    set c    $a
+    set fc   $fa
+
+    set flag 1
+    set d    0.0 ;# Dummy for the first iteration step
+
+    set s    $b  ;# Make sure s is defined
+    set fs   $fb
+
+    #set step 0
+
+    while { abs($b - $a) > $tol && $fb != 0.0 && $fs != 0.0 } {
+        #incr step
+        if { $fa != $fc && $fb != $fc } {
+            set s [expr { $a * $fb * $fc / (($fa-$fb)*($fa-$fc)) +
+                          $b * $fa * $fc / (($fb-$fa)*($fb-$fc)) +
+                          $c * $fa * $fb / (($fc-$fa)*($fc-$fb)) }]
+        } else {
+            set s [expr {$b - $fb * ($b-$a) / ($fb -$fa)}]
+        }
+
+        # Check the conditions for the next step
+        if { ( ((3.0*$a+$b) / 4.0 - $s) * ($s - $b) < 0.0 ) ||
+             ( $flag  && abs($s-$b) >= abs($b-$c)/2.0 )     ||
+             ( !$flag && abs($s-$b) >= abs($c-$d)/2.0 )     ||
+             ( $flag  && abs($b-$c) <  abs($delta) )        ||
+             ( !$flag && abs($c-$d) <  abs($delta) )           } {
+            set s    [expr {($a + $b) / 2.0}]
+            set flag 1
+        } else {
+            set flag 0
+        }
+
+        set fs [$f $s]
+        set d  $c
+        set c  $b
+
+        if { $fa * $fs < 0.0 } {
+            set b  $s
+            set fb $fs
+        } else {
+            set a  $s
+            set fa $fs
+        }
+
+        if { abs($a) < abs($fb) } {
+            set tmp $a    ; set tmpf $fa
+            set a   $b    ; set fa   $fb
+            set b   $tmp  ; set fb   $tmpf
+        }
+    }
+
+    return $s
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/special.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/special.tcl
new file mode 100644
index 00000000..34bd0ceb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/special.tcl
@@ -0,0 +1,463 @@
+# special.tcl --
+#    Provide well-known special mathematical functions
+#
+# This file contains a collection of tests for one or more of the Tcllib
+# procedures.  Sourcing this file into Tcl runs the tests and
+# generates output for errors.  No output means no errors were found.
+#
+# Copyright (c) 2004 by Arjen Markus. All rights reserved.
+#
+# RCS: @(#) $Id: special.tcl,v 1.13 2008/08/13 07:28:47 arjenmarkus Exp $
+#
+package require math
+package require math::constants
+package require math::statistics
+
+# namespace special
+#    Create a convenient namespace for the "special" mathematical functions
+#
+namespace eval ::math::special {
+    #
+    # Define a number of common mathematical constants
+    #
+    ::math::constants::constants pi
+    variable halfpi [expr {$pi/2.0}]
+    variable tiny 1.0e-30
+
+    #
+    # Functions defined in other math submodules
+    #
+    if { [info commands Beta] == {} } {
+       namespace import ::math::Beta
+       namespace import ::math::ln_Gamma
+    }
+
+    #
+    # Export the various functions
+    #
+    namespace export Beta ln_Gamma Gamma erf erfc fresnel_C fresnel_S sinc invnorm
+    namespace export incBeta regIncBeta digamma eulerNumber bernoulliNumber
+}
+
+# Gamma --
+#    The Gamma function - synonym for "factorial"
+#
+proc ::math::special::Gamma {x} {
+    if { [catch { expr {exp( [ln_Gamma $x] )} } result] } {
+        return -code error -errorcode $::errorCode $result
+    }
+    return $result
+}
+
+# erf --
+#    The error function
+# Arguments:
+#    x          The value for which the function must be evaluated
+# Result:
+#    erf(x)
+# Note:
+#    The algoritm used is due to George Marsaglia
+#    See: http://www.velocityreviews.com/forums/t317358-erf-function-in-c.html
+#    I did not want to copy and convert the even more accurate but
+#    rather lengthy algorithm used by lcc-win32/Sun
+#
+proc ::math::special::erf {x} {
+    set x    [expr {$x*sqrt(2.0)}]
+
+    if { $x >  10.0 } { return  1.0 }
+    if { $x < -10.0 } { return -1.0 }
+
+    set a    1.2533141373155
+    set b   -1.0
+    set pwr  1.0
+    set t    0.0
+    set z    0.0
+
+    set s [expr {$a+$b*$x}]
+
+    set i 2
+    while { $s != $t } {
+        set a   [expr {($a+$z*$b)/double($i)}]
+        set b   [expr {($b+$z*$a)/double($i+1)}]
+        set pwr [expr {$pwr*$x*$x}]
+        set t   $s
+        set s   [expr {$s+$pwr*($a+$x*$b)}]
+
+        incr i 2
+   }
+
+   return [expr {1.0-2.0*$s*exp(-0.5*$x*$x-0.9189385332046727418)}]
+}
+
+
+
+# erfc --
+#    The complement of the error function
+# Arguments:
+#    x          The value for which the function must be evaluated
+# Result:
+#    erfc(x) = 1.0-erf(x)
+#
+proc ::math::special::erfc {x} {
+    set x    [expr {$x*sqrt(2.0)}]
+
+    if { $x >  10.0 } { return  0.0 }
+    if { $x < -10.0 } { return  0.0 }
+
+    set a    1.2533141373155
+    set b   -1.0
+    set pwr  1.0
+    set t    0.0
+    set z    0.0
+
+    set s [expr {$a+$b*$x}]
+
+    set i 2
+    while { $s != $t } {
+        set a   [expr {($a+$z*$b)/double($i)}]
+        set b   [expr {($b+$z*$a)/double($i+1)}]
+        set pwr [expr {$pwr*$x*$x}]
+        set t   $s
+        set s   [expr {$s+$pwr*($a+$x*$b)}]
+
+        incr i 2
+   }
+
+   return [expr {2.0*$s*exp(-0.5*$x*$x-0.9189385332046727418)}]
+}
+
+
+# ComputeFG --
+#    Compute the auxiliary functions f and g
+#
+# Arguments:
+#    x            Parameter of the integral (x>=0)
+# Result:
+#    Approximate values for f and g
+# Note:
+#    See Abramowitz and Stegun. The accuracy is 2.0e-3.
+#
+proc ::math::special::ComputeFG {x} {
+    list [expr {(1.0+0.926*$x)/(2.0+1.792*$x+3.104*$x*$x)}] \
+        [expr {1.0/(2.0+4.142*$x+3.492*$x*$x+6.670*$x*$x*$x)}]
+}
+
+# fresnel_C --
+#    Compute the Fresnel cosine integral
+#
+# Arguments:
+#    x            Parameter of the integral (x>=0)
+# Result:
+#    Value of C(x) = integral from 0 to x of cos(0.5*pi*x^2)
+# Note:
+#    This relies on a rational approximation of the two auxiliary functions f and g
+#
+proc ::math::special::fresnel_C {x} {
+    variable halfpi
+    if { $x < 0.0 } {
+        error "Domain error: x must be non-negative"
+    }
+
+    if { $x == 0.0 } {
+        return 0.0
+    }
+
+    foreach {f g} [ComputeFG $x] {break}
+
+    set xarg [expr {$halfpi*$x*$x}]
+
+    return [expr {0.5+$f*sin($xarg)-$g*cos($xarg)}]
+}
+
+# fresnel_S --
+#    Compute the Fresnel sine integral
+#
+# Arguments:
+#    x            Parameter of the integral (x>=0)
+# Result:
+#    Value of S(x) = integral from 0 to x of sin(0.5*pi*x^2)
+# Note:
+#    This relies on a rational approximation of the two auxiliary functions f and g
+#
+proc ::math::special::fresnel_S {x} {
+    variable halfpi
+    if { $x < 0.0 } {
+        error "Domain error: x must be non-negative"
+    }
+
+    if { $x == 0.0 } {
+        return 0.0
+    }
+
+    foreach {f g} [ComputeFG $x] {break}
+
+    set xarg [expr {$halfpi*$x*$x}]
+
+    return [expr {0.5-$f*cos($xarg)-$g*sin($xarg)}]
+}
+
+# sinc --
+#    Compute the sinc function
+# Arguments:
+#    x       Value of the argument
+# Result:
+#    sin(x)/x
+#
+proc ::math::special::sinc {x} {
+    if { $x == 0.0 } {
+        return 1.0
+    } else {
+        return [expr {sin($x)/$x}]
+    }
+}
+
+# invnorm --
+#     Compute the inverse of the cumulative normal distribution
+#
+# Arguments:
+#     p               Value of erf(x) for x must be found
+#
+# Returns:
+#     Value of x
+#
+# Notes:
+#     Implementation in Tcl by Christian Gollwitzer
+#     Uses rational approximation from
+#     http://home.online.no/~pjacklam/notes/invnorm/#Pseudo_code_for_rational_approximation
+#     relative precision 1.2*10^-9 in the full range
+#
+proc ::math::special::invnorm {p} {
+    # inverse normal distribution
+    # rational approximation from
+    # http://home.online.no/~pjacklam/notes/invnorm/#Pseudo_code_for_rational_approximation
+    # precision 1.2*10^-9
+
+    if {$p<=0 || $p>=1} {
+        return -code error "Domain error (invnorm)"
+    }
+    # Coefficients in rational approximations.
+    set a1  -3.969683028665376e+01
+    set a2   2.209460984245205e+02
+    set a3  -2.759285104469687e+02
+    set a4   1.383577518672690e+02
+    set a5  -3.066479806614716e+01
+    set a6   2.506628277459239e+00
+
+    set b1  -5.447609879822406e+01
+    set b2   1.615858368580409e+02
+    set b3  -1.556989798598866e+02
+    set b4   6.680131188771972e+01
+    set b5  -1.328068155288572e+01
+
+    set c1  -7.784894002430293e-03
+    set c2  -3.223964580411365e-01
+    set c3  -2.400758277161838e+00
+    set c4  -2.549732539343734e+00
+    set c5   4.374664141464968e+00
+    set c6   2.938163982698783e+00
+
+    set d1   7.784695709041462e-03
+    set d2   3.224671290700398e-01
+    set d3   2.445134137142996e+00
+    set d4   3.754408661907416e+00
+
+    # Define break-points.
+
+    set p_low  0.02425
+    set p_high [expr {1-$p_low}]
+
+    # Rational approximation for lower region.
+
+    if {$p < $p_low} {
+        set q [expr {sqrt(-2*log($p))}]
+        set x [expr {((((($c1*$q+$c2)*$q+$c3)*$q+$c4)*$q+$c5)*$q+$c6) / \
+        (((($d1*$q+$d2)*$q+$d3)*$q+$d4)*$q+1)}]
+        return $x
+    }
+
+    # Rational approximation for central region.
+
+    if {$p <= $p_high} {
+        set q  [expr {$p - 0.5}]
+        set r  [expr {$q*$q}]
+        set x  [expr {((((($a1*$r+$a2)*$r+$a3)*$r+$a4)*$r+$a5)*$r+$a6)*$q / \
+        ((((($b1*$r+$b2)*$r+$b3)*$r+$b4)*$r+$b5)*$r+1)}]
+        return $x
+    }
+
+    # Rational approximation for upper region.
+
+    set q  [expr {sqrt(-2*log(1-$p))}]
+    set x  [expr {-((((($c1*$q+$c2)*$q+$c3)*$q+$c4)*$q+$c5)*$q+$c6) /
+    (((($d1*$q+$d2)*$q+$d3)*$q+$d4)*$q+1)}]
+    return $x
+}
+
+
+# incBeta --
+#     Incomplete Beta funtion (not regularized)
+#
+# Arguments:
+#     a, b        Parameters a and b (both > 0)
+#     x           Value of the x argument (between 0 and 1)
+#
+# Notes:
+#     Implementation taken from http://codeplea.com/incomplete-beta-function-in-c
+#     Accuracy: at least 1.0e-8
+#     Test values: https://keisan.casio.com/exec/system/1180573396
+#
+proc ::math::special::incBeta {a b x} {
+    variable tiny
+
+    if { $x < 0.0 || $x > 1.0 } {
+        return -code error "Incomplete Beta function: x out of bounds (must be between 0 and 1)"
+    }
+    if { $a <= 0.0 || $b <= 0.0 } {
+        return -code error "Incomplete Beta function: parameter a or b out of bounds (both must be > 0)"
+    }
+
+    #
+    # Make sure the continued fraction converges fast
+    #
+    if { $x > ($a+1.0) / ($a+$b+2.0) } {
+        set beta1      [Beta $a $b]
+        set complement [incBeta $b $a [expr {1.-$x}]]
+        return [expr {$beta1 - $complement}]
+    }
+
+    set f 1.0
+    set c 1.0
+    set d 0.0
+
+    for { set i 0 } { $i <= 200 } { incr i } {
+
+        set m [expr {$i/2}]
+
+        #
+        # Coefficients of the continued fraction
+        #
+        if { $i == 0 } {
+            set numerator 1.0
+        } elseif { $i % 2 == 0 } {
+            set numerator [expr {$m * ($b-$m) * $x / ( ($a+2.0*$m-1.0) * ($a+2.0*$m) )}]
+        } else {
+            set numerator [expr {-($a+$m) * ($a+$b+$m) * $x / ( ($a+2.0*$m) * ($a+2.0*$m+1.0) )}]
+        }
+
+        #
+        # Iteration (Lentz's algorithm)
+        #
+        set d [expr {1.0 + $numerator * $d}]
+        if { abs($d) < $tiny } {
+            set d $tiny
+        }
+
+        set d [expr {1.0 / $d}]
+        set c [expr {1.0 + $numerator / $c}]
+
+        if { abs($c) < $tiny } {
+            set c $tiny
+        }
+
+        set cd [expr {$c * $d}]
+
+        set f  [expr {$cd * $f}]
+
+        #
+        # Stopping criterium
+        #
+        if { abs(1.0 - $cd) < 1.0e-8 } {
+            set factor [expr {$x ** $a * (1.0-$x) ** $b / $a}]
+            return [expr {$factor * ($f - 1.0)}]
+        }
+    }
+
+    return -code error "Incomplete Beta function: convergence not reached"
+}
+
+# regIncBeta --
+#     Regularized incomplete Beta funtion
+#
+# Arguments:
+#     a, b        Parameters a and b (both > -1)
+#     x           Value of the x argument (between 0 and 1)
+#
+proc ::math::special::regIncBeta {a b x} {
+
+    set incbeta [incBeta $a $b $x]
+    set factor  [Beta $a $b]
+
+    return [expr {$incbeta / $factor}]
+}
+
+
+# digamma --
+#     Evaluate the digamma function - approximate via a power series
+#
+# Arguments
+#     x                   Argument of the function
+#
+# Result:
+#     Value of digamma function at x
+#
+# Notes;
+#     Test values: https://keisan.casio.com/exec/system/1180573446
+#     Formula taken from: https://math.stackexchange.com/questions/1441753/approximating-the-digamma-function
+#
+proc ::math::special::digamma {x} {
+    if { $x >= 10.0 } {
+        set x [expr {$x - 1.0}]
+        return [expr {log($x) + 1.0 / (2.0 * $x) - 1.0 / (12.0 * $x**2) + 1.0 / (120.0 * $x**4) - 1.0 / (252.0 * $x**6)
+                              + 1.0 / (240.0 * $x**8) - 5.0 / (660.0 * $x**10) + 691.0 / (32760.0 * $x**12) - 1.0 / (12.0 * $x**14)}]
+    } else {
+        set n [expr {int(11.0 - $x)}]
+        set correction 0.0
+        for {set i 0} {$i < $n} {incr i} {
+            set correction [expr {$correction + 1.0 / ($x + $i)}]
+        }
+
+        set newx [expr {$x + $n}]
+
+        return [expr {[digamma $newx] - $correction}]
+    }
+}
+
+# eulerNumber and bernoulliNumber --
+#     Return the nth Euler number or Bernoulli number
+#
+# Arguments:
+#     index           The index of the number to be returned
+#
+# Note:
+#     If the index is outside the range, then an error is raised:
+#     For Euler numbers: index should be between 0 and 54
+#     For Bernoulli numbers: index should be between 0 and 52
+#     - even though for odd indices the numbers are mostly zero
+#     and could be returned as such
+#
+# Note:
+#     The tables were found in Nelson H.F. Beebe - The Mathematical Function Computation Handbook
+#
+proc ::math::special::eulerNumber {index} {
+    if { $index < 0 || $index > 54 } {
+        return -code error "Index ($index) out of range - should be between 0 and 54"
+    } else {
+        return [lindex {1 0 -1 0 5 0 -61 0 1385 0 -50521 0 2702765 0 -199360981 0 19391512145 0 -2404879675441 0 370371188237525 0 -69348874393137901 0 15514534163557086905 0 -4087072509293123892361 0 1252259641403629865468285 0 -441543893249023104553682821 0 177519391579539289436664789665 0 -80723299235887898062168247453281 0 41222060339517702122347079671259045 0 -23489580527043108252017828576198947741 0 14851150718114980017877156781405826684425 0 -10364622733519612119397957304745185976310201 0 7947579422597592703608040510088070619519273805 0 -6667537516685544977435028474773748197524107684661 0 6096278645568542158691685742876843153976539044435185 0 -6053285248188621896314383785111649088103498225146815121 0 6506162486684608847715870634080822983483644236765385576565 0 -7546659939008739098061432565889736744212240024711699858645581} $index]
+    }
+}
+proc ::math::special::bernoulliNumber {index} {
+    if { $index < 0 || $index > 52 } {
+        return -code error "Index ($index) out of range - should be between 0 and 52"
+    } else {
+        return [lindex {1.0 -0.5 0.16666666666666666 0.0 -0.03333333333333333 0.0 0.023809523809523808 0.0 -0.03333333333333333 0.0 0.07575757575757576 0.0 -0.2531135531135531 0.0 1.1666666666666667 0.0 -7.092156862745098 0.0 54.971177944862156 0.0 -529.1242424242424 0.0 6192.123188405797 0.0 -86580.25311355312 0.0 1425517.1666666667 0.0 -27298231.067816094 0.0 601580873.9006424 0.0 -15116315767.092157 0.0 429614643061.1667 0.0 -13711655205088.334 0.0 488332318973593.2 0.0 -19296579341940068.0 0.0 8.416930475736827e+17 0.0 -4.0338071854059454e+19 0.0 2.1150748638081993e+21 0.0 -1.2086626522296526e+23 0.0 7.500866746076964e+24 0.0 -5.038778101481068e+26} $index]
+    }
+}
+
+# Bessel functions and elliptic integrals --
+#
+source [file join [file dirname [info script]] "bessel.tcl"]
+source [file join [file dirname [info script]] "classic_polyns.tcl"]
+source [file join [file dirname [info script]] "elliptic.tcl"]
+source [file join [file dirname [info script]] "exponential.tcl"]
+
+package provide math::special 0.5.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/stat_kernel.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/stat_kernel.tcl
new file mode 100644
index 00000000..1d1f219b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/stat_kernel.tcl
@@ -0,0 +1,217 @@
+# stat_kernel.tcl --
+#
+#    Part of the statistics package for basic statistical analysis
+#    Based on http://en.wikipedia.org/wiki/Kernel_(statistics) and
+#             http://en.wikipedia.org/wiki/Kernel_density_estimation
+#
+# version 0.1:   initial implementation, january 2014
+
+# kernel-density --
+#     Estimate the probability density using the kernel density
+#     estimation method
+#
+# Arguments:
+#     data            List of univariate data
+#     args            List of options in the form of keyword-value pairs:
+#                     -weights weights: per data point the weight
+#                     -bandwidth value: bandwidth to be used for the estimation
+#                     -number value: number of bins to be returned
+#                     -interval {begin end}: begin and end of the interval for
+#                         which the density is returned
+#                     -kernel function: kernel to be used (gaussian, cosine,
+#                         epanechnikov, uniform, triangular, biweight,
+#                         logistic)
+#                     For all options more or less sensible defaults are
+#                     provided.
+#
+# Result:
+#     A list of the bin centres, a list of the corresponding density
+#     estimates and a list containing several computational parameters:
+#     begin and end of the interval, mean, standard deviation and bandwidth
+#
+# Note:
+#     The conditions for the kernel function are fairly weak:
+#     - It should integrate to 1
+#     - It should be symmetric around 0
+#
+#     As for the implementation in Tcl: it should be reachable in the
+#     ::math::statistics namespace. As a consequence, you can define
+#     your own kernel function too. Hence there is no check.
+#
+proc ::math::statistics::kernel-density {data args} {
+
+    #
+    # Determine the basic statistics
+    #
+    set basicStats [BasicStats all $data]
+
+    set mean       [lindex $basicStats 0]
+    set ndata      [lindex $basicStats 3]
+    set stdev      [lindex $basicStats 4]
+
+    if { $ndata < 1 } {
+        return -code error -errorcode ARG -errorinfo "Too few actual data"
+    }
+
+    #
+    # Get the options (providing defaults as needed)
+    #
+    set opt(-weights)   {}
+    set opt(-number)    100
+    set opt(-kernel)    gaussian
+
+    #
+    # The default bandwidth is set via a simple expression, which
+    # is supposed to be optimal for the Gaussian kernel.
+    # Perhaps a more sophisticated method should be provided as well
+    #
+    set opt(-bandwidth) [expr {1.06 * $stdev / pow($ndata,0.2)}]
+
+    #
+    # The default interval is derived from the mean and the
+    # standard deviation
+    #
+    set opt(-interval) [list [expr {$mean - 3.0 * $stdev}] [expr {$mean + 3.0 * $stdev}]]
+
+    #
+    # Retrieve the given options from $args
+    #
+    if { [llength $args] % 2 != 0 } {
+        return -code error -errorcode ARG -errorinfo "The options must all have a value"
+    }
+    array set opt $args
+
+    #
+    # Elementary checks
+    #
+    if { $opt(-bandwidth) <= 0.0 } {
+        return -code error -errorcode ARG -errorinfo "The bandwidth must be positive: $opt(-bandwidth)"
+    }
+
+    if { $opt(-number) <= 0.0 } {
+        return -code error -errorcode ARG -errorinfo "The number of bins must be positive: $opt(-number)"
+    }
+
+    if { [lindex $opt(-interval) 0] == [lindex $opt(-interval) 1] } {
+        return -code error -errorcode ARG -errorinfo "The interval has length zero: $opt(-interval)"
+    }
+
+    if { [llength [info proc $opt(-kernel)]] == 0 } {
+        return -code error -errorcode ARG -errorinfo "Unknown kernel function: $opt(-kernel)"
+    }
+
+    #
+    # Construct the weights
+    #
+    if { [llength $opt(-weights)] > 0 } {
+        if { [llength $data] != [llength $opt(-weights)] } {
+            return -code error -errorcode ARG -errorinfo "The list of weights must match the data"
+        }
+
+        set sum 0.0
+        foreach d $data w $opt(-weights) {
+            if { $d != {} } {
+                set sum [expr {$sum + $w}]
+            }
+        }
+        set scale [expr {1.0/$sum/$ndata}]
+
+        set weight {}
+        foreach w $opt(-weights) {
+            if { $d != {} } {
+                lappend weight [expr {$w / $scale}]
+            } else {
+                lappend weight {}
+            }
+        }
+    } else {
+        set weight [lrepeat [llength $data] [expr {1.0/$ndata}]] ;# Note: missing values have weight zero
+    }
+
+    #
+    # Construct the centres of the bins
+    #
+    set xbegin [lindex $opt(-interval) 0]
+    set xend   [lindex $opt(-interval) 1]
+    set dx     [expr {($xend - $xbegin) / double($opt(-number))}]
+    set xb     [expr {$xbegin + 0.5 * $dx}]
+    set xvalue {}
+    for {set i 0} {$i < $opt(-number)} {incr i} {
+        lappend xvalue [expr {$xb + $i * $dx}]
+    }
+
+    #
+    # Construct the density function
+    #
+    set density {}
+    set scale   [expr {1.0/$opt(-bandwidth)}]
+    foreach x $xvalue {
+        set sum 0.0
+        foreach d $data w $weight {
+            if { $d != {} } {
+                set kvalue [$opt(-kernel) [expr {$scale * ($x-$d)}]]
+                set sum [expr {$sum + $w * $kvalue}]
+            }
+        }
+        lappend density [expr {$sum * $scale}]
+    }
+
+    #
+    # Return the result
+    #
+    return [list $xvalue $density [list $xbegin $xend $mean $stdev $opt(-bandwidth)]]
+}
+
+# gaussian, uniform, triangular, epanechnikov, biweight, cosine, logistic --
+#    The Gaussian kernel
+#
+# Arguments:
+#    x            (Scaled) argument
+#
+# Result:
+#    Value of the kernel
+#
+# Note:
+#    The standard deviation is 1.
+#
+proc ::math::statistics::gaussian {x} {
+    return [expr {exp(-0.5*$x*$x) / sqrt(2.0*acos(-1.0))}]
+}
+proc ::math::statistics::uniform {x} {
+    if { abs($x) <= 1.0 } {
+        return 0.5
+    } else {
+        return 0.0
+    }
+}
+proc ::math::statistics::triangular {x} {
+    if { abs($x) < 1.0 } {
+        return [expr {1.0 - abs($x)}]
+    } else {
+        return 0.0
+    }
+}
+proc ::math::statistics::epanechnikov {x} {
+    if { abs($x) < 1.0 } {
+        return [expr {0.75 * (1.0 - abs($x)*abs($x))}]
+    } else {
+        return 0.0
+    }
+}
+proc ::math::statistics::biweight {x} {
+    if { abs($x) < 1.0 } {
+        return [expr {0.9375 * pow((1.0 - abs($x)*abs($x)),2)}]
+    } else {
+        return 0.0
+    }
+}
+proc ::math::statistics::cosine {x} {
+    if { abs($x) < 1.0 } {
+        return [expr {0.25 * acos(-1.0) * cos(0.5 * acos(-1.0) * $x)}]
+    } else {
+        return 0.0
+    }
+}
+proc ::math::statistics::logistic {x} {
+    return [expr {1.0 / (exp($x) + 2.0 + exp(-$x))}]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/stat_logit.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/stat_logit.tcl
new file mode 100644
index 00000000..30846141
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/stat_logit.tcl
@@ -0,0 +1,120 @@
+# stat_logit.tcl --
+#     Logistic regression functions - part of the statistics package
+#
+#     Note:
+#     The implementation was derived from the Wikipedia page on logistic regression,
+#     (https://en.wikipedia.org/wiki/Logistic_regression) as is the test case.
+#
+#     TODO:
+#     - Deviance to evaluate the goodness of fit
+#     - Evaluate the probability
+#
+
+package require math::optimize
+
+namespace eval ::math::statistics {
+     variable xLogit {}
+     variable yLogit {}
+}
+
+# logistic-model --
+#     Fit 1/0 data to a logistic model
+#
+# Arguments:
+#     xdata        Independent variables (list of lists if there are more than one)
+#     ydata        Corresponding scores (0 or 1)
+#
+# Result:
+#     Estimate of the parameters for a logistic model
+#
+# Note:
+#     It is expected that the independent variables have roughly the same scale
+#
+proc ::math::statistics::logistic-model {xdata ydata} {
+    variable xLogit
+    variable yLogit
+
+    set xLogit {}
+    foreach coords $xdata {
+        lappend xLogit [concat 1.0 $coords]
+    }
+    set yLogit $ydata
+
+    #
+    # Use a trivial starting point
+    #
+    set startx [lrepeat [llength [lindex $xLogit 0]] 0.0]
+
+    set result [::math::optimize::nelderMead LogisticML_NM $startx]
+
+    return [dict get $result x]
+}
+
+
+# LogisticML_NM --
+#     Calculate the (log) maximum likelihood for the given logistic model
+#     using Nelder-Mead
+#
+# Arguments:
+#     args        Vector of the current regression coefficients
+#
+# Returns:
+#     Log maximum likelihood
+#
+proc ::math::statistics::LogisticML_NM {args} {
+    variable xLogit
+    variable yLogit
+
+    set loglike 0.0
+    foreach coords $xLogit score $yLogit {
+        set sum 0.0
+
+        foreach c $coords v $args {
+            set sum [expr {$sum + $v * $c}]
+        }
+        set exp [expr {exp(-$sum)}]
+
+        if { $score == 1 } {
+            set loglike [expr {$loglike - log(1.0 + $exp)}]
+        } else {
+            set loglike [expr {$loglike - $sum - log(1.0 + $exp)}]
+        }
+    }
+    return [expr {-$loglike}]
+}
+
+# logistic-probability --
+#     Calculate the probability of a positive score (1) given the model
+#
+# Arguments:
+#     coeffs      Coefficients of the logistic model (for instance outcome of model fit)
+#     values      Values of the independent variables
+#
+# Returns:
+#     Probability
+#
+proc ::math::statistics::logistic-probability {coeffs values} {
+    set sum 0.0
+
+    foreach c $coeffs v [concat 1.0 $values] {
+        set sum [expr {$sum + $c * $v}]
+    }
+
+    return [expr {1.0 / (1.0 + exp(-$sum))}]
+}
+
+# test case: from Wikipedia
+if {0} {
+set xdata {0.50 0.75 1.00 1.25 1.50 1.75 1.75 2.00 2.25 2.50 2.75 3.00 3.25 3.50 4.00 4.25 4.50 4.75 5.00 5.50}
+set ydata {0    0    0    0    0    0    1    0    1    0    1    0    1    0    1    1    1    1    1    1   }
+
+set coeffs [::math::statistics::logistic-model $xdata $ydata]
+
+puts "Model fit: $coeffs"
+
+puts "Probabilities:"
+
+foreach x {1 2 3 4 5} {
+    puts "$x - [::math::statistics::logistic-probability $coeffs $x]"
+}
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/stat_wasserstein.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/stat_wasserstein.tcl
new file mode 100644
index 00000000..6c3bb08f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/stat_wasserstein.tcl
@@ -0,0 +1,214 @@
+# stat-wasserstein.tcl --
+#     Determine the Wasserstein distance between two probability distributions
+#
+#     Note:
+#     This is an implementation for one-dimensional distributions (or better:
+#     non-negative patterns)
+#
+#     Note 2:
+#     The lower bound of 1.0e-10 is probably not at all necessary
+#
+
+# LastNonZero --
+#     Auxiliary procedure to find the last non-zero entry
+#
+# Arguments:
+#     prob           Probability distribution
+#
+# Result:
+#     Index in the list of the last non-zero entry
+#
+# Note:
+#     To avoid numerical problems any value smaller than 1.0e-10 is considered to
+#     be zero
+#
+proc ::math::statistics::LastNonZero {prob} {
+    set maxidx [expr {[llength $prob] - 1}]
+
+    for {set idx $maxidx} {$idx >= 0} {incr idx -1} {
+        if { [lindex $prob $idx] > 1.0e-10 } {
+            return $idx
+        }
+    }
+
+    return -1 ;# No non-zero entry
+}
+
+# Normalise --
+#     Auxiliary procedure to normalise the probability distribution
+#
+# Arguments:
+#     prob           Probability distribution
+#
+# Result:
+#     Normalised distribution (i.e. the entries sum to 1)
+#
+# Note:
+#     To avoid numerical problems any value smaller than 1.0e-10 is set to zero
+#
+proc ::math::statistics::Normalise {prob} {
+
+    set newprob {}
+    set sum     0.0
+
+    foreach p $prob {
+        set sum [expr {$sum + $p}]
+    }
+
+    if { $sum == 0.0 } {
+        return -code error "Probability distribution should not consist of only zeroes"
+    }
+
+    foreach p $prob {
+        lappend newprob [expr {$p > 1.0e-10? ($p/$sum) : 0.0}]
+    }
+
+    return $newprob
+}
+
+# wasserstein-distance --
+#     Determine the Wasserstein distance using a "greedy" algorithm.
+#
+# Arguments:
+#     prob1          First probability distribution, interpreted as a histogram
+#                    with uniform bin width
+#     prob2          Second probability distribution
+#
+# Result:
+#     Distance between the two distributions
+#
+proc ::math::statistics::wasserstein-distance {prob1 prob2} {
+    #
+    # First step: make sure the histograms have the same length and the
+    # same cumulative weight.
+    #
+    if { [llength $prob1] != [llength $prob2] } {
+        return -code error "Lengths of the probability histograms must be the same"
+    }
+
+    set prob1 [Normalise $prob1]
+    set prob2 [Normalise $prob2]
+
+    set distance 0.0
+
+    #
+    # Determine the last non-zero bin - this bin will be shifted to the second
+    # distribution
+    #
+    while {1} {
+        set idx1 [LastNonZero $prob1]
+        set idx2 [LastNonZero $prob2]
+
+        if { $idx1 < 0 } {
+            break ;# We are done
+        }
+
+        set bin1 [lindex $prob1 $idx1]
+        set bin2 [lindex $prob2 $idx2]
+
+        if { $bin1 <= $bin2 } {
+            lset prob1 $idx1 0.0
+            lset prob2 $idx2 [expr {$bin2 - $bin1}]
+            set distance [expr {$distance + abs($idx2-$idx1) * $bin1}]
+        } else {
+            lset prob1 $idx1 [expr {$bin1 - $bin2}]
+            lset prob2 $idx2 0.0
+            set distance [expr {$distance + abs($idx2-$idx1) * $bin2}]
+        }
+    }
+
+    return $distance
+}
+
+# kl-divergence --
+#     Calculate the Kullback-Leibler (KL) divergence for two discrete distributions
+#
+# Arguments:
+#     prob1          First probability distribution - the divergence is calculated
+#                    with this one as the basis
+#     prob2          Second probability distribution - the divergence of this
+#                    distribution wrt the first is calculated
+#
+# Notes:
+#     - The KL divergence is an asymmetric measure
+#     - It is actually only defined if prob2 is only zero when prob1 is too
+#     - The number of elements in the two distributions must be the same and
+#       bins must be the same
+#
+proc ::math::statistics::kl-divergence {prob1 prob2} {
+    if { [llength $prob1] != [llength $prob2] } {
+        return -code error "Lengths of the two probability histograms must be the same"
+    }
+
+    #
+    # Normalise the probability histograms
+    #
+    set prob1 [Normalise $prob1]
+    set prob2 [Normalise $prob2]
+
+    #
+    # Check for well-definedness while going along
+    #
+    set sum 0.0
+    foreach p1 $prob1 p2 $prob2 {
+        if { $p2 == 0.0 && $p1 != 0.0 } {
+            return -code error "Second probability histogram contains unmatched zeroes"
+        }
+
+        if { $p1 != 0.0 } {
+            set sum [expr {$sum - $p1 * log($p2/$p1)}]
+        }
+    }
+
+    return $sum
+}
+
+if {0} {
+# tests --
+#
+
+# Almost trivial
+set prob1 {0.0 0.0 0.0 1.0}
+set prob2 {0.0 0.0 1.0 0.0}
+
+puts "Expected distance: 1"
+puts "Calculated: [wasserstein-distance $prob1 $prob2]"
+puts "Symmetric:  [wasserstein-distance $prob2 $prob1]"
+
+# Less trivial
+set prob1 {0.0 0.75 0.25 0.0}
+set prob2 {0.0 0.0  1.0  0.0}
+
+puts "Expected distance: 0.75"
+puts "Calculated: [wasserstein-distance $prob1 $prob2]"
+puts "Symmetric:  [wasserstein-distance $prob2 $prob1]"
+
+# Shift trivial
+set prob1 {0.0 0.1 0.2 0.4 0.2 0.1 0.0 0.0}
+set prob2 {0.0 0.0 0.0 0.1 0.2 0.4 0.2 0.1}
+
+puts "Expected distance: 2"
+puts "Calculated: [wasserstein-distance $prob1 $prob2]"
+puts "Symmetric:  [wasserstein-distance $prob2 $prob1]"
+
+
+# KL-divergence
+set prob1 {0.0 0.1 0.2 0.4 0.2 0.1 0.0 0.0}
+set prob2 {0.0 0.1 0.2 0.4 0.2 0.1 0.0 0.0}
+
+puts "KL-divergence for equal distributions: 0"
+puts "KL-divergence: [kl-divergence $prob1 $prob2]"
+
+set prob1 {0.1e-8 0.1    0.2 0.4 0.2 0.1 0.0 0.0    0.0}
+set prob2 {0.1e-8 0.1e-8 0.1 0.2 0.4 0.2 0.1 0.1e-8 0.1e-8}
+
+puts "KL-divergence for shifted distributions: ??"
+puts "KL-divergence: [kl-divergence $prob1 $prob2]"
+
+# Hm, the normalisation proc causes a slight problem with elements of 1.0e-10
+set prob1 {0.1e-8 0.1  0.2  0.4 0.2  0.1  0.0     0.0}
+set prob2 {0.1e-8 0.11 0.19 0.4 0.24 0.06 0.1e-8  0.1e-8}
+
+puts "KL-divergence slightly dififerent distributions: ??"
+puts "KL-divergence: [kl-divergence $prob1 $prob2]"
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/statistics.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/statistics.tcl
new file mode 100644
index 00000000..08775ae0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/statistics.tcl
@@ -0,0 +1,2037 @@
+# statistics.tcl --
+#
+#    Package for basic statistical analysis
+#
+# version 0.1:   initial implementation, january 2003
+# version 0.1.1: added linear regres
+# version 0.1.2: border case in stdev taken care of
+# version 0.1.3: moved initialisation of CDF to first call, november 2004
+# version 0.3:   added test for normality (as implemented by Torsten Reincke), march 2006
+#                (also fixed an error in the export list)
+# version 0.4:   added the multivariate linear regression procedures by
+#                Eric Kemp-Benedict, february 2007
+# version 0.5:   added the population standard deviation and variance,
+#                as suggested by Dimitrios Zachariadis
+# version 0.6:   added pdf and cdf procedures for various distributions
+#                (provided by Eric Kemp-Benedict)
+# version 0.7:   added Kruskal-Wallis test (by Torsten Berg)
+# version 0.8:   added Wilcoxon test and Spearman rank correlation
+# version 0.9:   added kernel density estimation
+# version 0.9.3: added histogram-alt, corrected test-normal
+# version 1.0:   added test-anova-F
+# version 1.0.1: correction in pdf-lognormal and cdf-lognormal
+# version 1.1:   added test-Tukey-range and test-Dunnett
+# version 1.3:   added wasserstein-distance, kl-divergence and logit regression
+
+package require Tcl 8.5 ; # 8.5+ feature in test-anova-F and others: **-operator
+package provide math::statistics 1.5.0
+package require math
+
+if {![llength [info commands ::lrepeat]]} {
+    # Forward portability, emulate lrepeat
+    proc ::lrepeat {n args} {
+	if {$n < 1} {
+	    return -code error "must have a count of at least 1"
+	}
+	set res {}
+	while {$n} {
+	    foreach x $args { lappend res $x }
+	    incr n -1
+	}
+	return $res
+    }
+}
+
+# ::math::statistics --
+#   Namespace holding the procedures and variables
+#
+
+namespace eval ::math::statistics {
+    #
+    # Safer: change to short procedures
+    #
+    namespace export mean min max number var stdev pvar pstdev basic-stats corr \
+	    histogram histogram-alt interval-mean-stdev t-test-mean quantiles \
+	    test-normal lillieforsFit \
+	    autocorr crosscorr filter map samplescount median \
+	    test-2x2 print-2x2 control-xbar test_xbar \
+	    control-Rchart test-Rchart \
+	    test-Kruskal-Wallis analyse-Kruskal-Wallis group-rank \
+	    test-Wilcoxon spearman-rank spearman-rank-extended \
+	    test-Duckworth test-anova-F test-Tukey-range test-Dunnett
+    #
+    # Error messages
+    #
+    variable NEGSTDEV   {Zero or negative standard deviation}
+    variable TOOFEWDATA {Too few or invalid data}
+    variable OUTOFRANGE {Argument out of range}
+    variable INVALID    {Argument invalid}
+
+    #
+    # Coefficients involved
+    #
+    variable factorNormalPdf
+    set factorNormalPdf [expr {sqrt(8.0*atan(1.0))}]
+
+    # xbar/R-charts:
+    # Data from:
+    #    Peter W.M. John:
+    #    Statistical methods in engineering and quality assurance
+    #    Wiley and Sons, 1990
+    #
+    variable control_factors {
+        A2 {1.880 1.093 0.729 0.577 0.483 0.419 0.419}
+        D3 {0.0   0.0   0.0   0.0   0.0   0.076 0.076}
+        D4 {3.267 2.574 2.282 2.114 2.004 1.924 1.924}
+    }
+}
+
+# mean, min, max, number, var, stdev, pvar, pstdev --
+#    Return the mean (minimum, maximum) value of a list of numbers
+#    or number of non-missing values
+#
+# Arguments:
+#    type     Type of value to be returned
+#    values   List of values to be examined
+#
+# Results:
+#    Value that was required
+#
+#
+namespace eval ::math::statistics {
+    foreach type {mean min max number stdev var pstdev pvar} {
+	proc $type { values } "BasicStats $type \$values"
+    }
+    proc basic-stats { values } "BasicStats all \$values"
+}
+
+# BasicStats --
+#    Return the one or all of the basic statistical properties
+#
+# Arguments:
+#    type     Type of value to be returned
+#    values   List of values to be examined
+#
+# Results:
+#    Value that was required
+#
+proc ::math::statistics::BasicStats { type values } {
+    variable TOOFEWDATA
+
+    if { [lsearch {all mean min max number stdev var pstdev pvar} $type] < 0 } {
+	return -code error \
+		-errorcode ARG -errorinfo [list unknown type of statistic -- $type] \
+		[list unknown type of statistic -- $type]
+    }
+
+    set min    {}
+    set max    {}
+    set mean   {}
+    set stdev  {}
+    set var    {}
+
+    set sum    0.0
+    set sumsq  0.0
+    set number 0
+    set first  {}
+
+    foreach value $values {
+	if { $value == {} } {
+	    continue
+	}
+	set value [expr {double($value)}]
+
+	if { $first == {} } {
+	    set first $value
+	}
+
+	incr number
+	set  sum    [expr {$sum+$value}]
+	set  sumsq  [expr {$sumsq+($value-$first)*($value-$first)}]
+
+	if { $min == {} || $value < $min } {
+	    set min $value
+	}
+	if { $max == {} || $value > $max } {
+	    set max $value
+	}
+    }
+
+    if { $number > 0 } {
+	set mean [expr {$sum/$number}]
+    } else {
+	return -code error -errorcode DATA -errorinfo $TOOFEWDATA $TOOFEWDATA
+    }
+
+    if { $number > 1 } {
+	set var    [expr {($sumsq-($mean-$first)*($sum-$number*$first))/double($number-1)}]
+        #
+        # Take care of a rare situation: uniform data might
+        # cause a tiny negative difference
+        #
+        if { $var < 0.0 } {
+           set var 0.0
+        }
+	set stdev  [expr {sqrt($var)}]
+    }
+	set pvar [expr {($sumsq-($mean-$first)*($sum-$number*$first))/double($number)}]
+        #
+        # Take care of a rare situation: uniform data might
+        # cause a tiny negative difference
+        #
+        if { $pvar < 0.0 } {
+           set pvar 0.0
+        }
+	set pstdev  [expr {sqrt($pvar)}]
+
+    set all [list $mean $min $max $number $stdev $var $pstdev $pvar]
+
+    #
+    # Return the appropriate value
+    #
+    set $type
+}
+
+# histogram --
+#    Return histogram information from a list of numbers
+#
+# Arguments:
+#    limits   Upper limits for the buckets (in increasing order)
+#    values   List of values to be examined
+#    weights  List of weights, one per value (optional)
+#
+# Results:
+#    List of number of values in each bucket (length is one more than
+#    the number of limits)
+#
+#
+proc ::math::statistics::histogram { limits values {weights {}} } {
+
+    if { [llength $limits] < 1 } {
+	return -code error -errorcode ARG -errorinfo {No limits given} {No limits given}
+    }
+    if { [llength $weights] > 0 && [llength $values] != [llength $weights] } {
+	return -code error -errorcode ARG -errorinfo {Number of weights be equal to number of values} {Weights and values differ in length}
+    }
+
+    set limits [lsort -real -increasing $limits]
+
+    for { set index 0 } { $index <= [llength $limits] } { incr index } {
+	set buckets($index) 0
+    }
+
+    set last [llength $limits]
+
+    # Will do integer arithmetic if unset
+    if {$weights eq ""} {
+       set weights [lrepeat [llength $values] 1]
+    }
+
+    foreach value $values weight $weights {
+	if { $value == {} } {
+	    continue
+	}
+
+	set index 0
+	set found 0
+	foreach limit $limits {
+	    if { $value <= $limit } {
+		set found 1
+		set buckets($index) [expr $buckets($index)+$weight]
+		break
+	    }
+	    incr index
+	}
+
+	if { $found == 0 } {
+	    set buckets($last) [expr $buckets($last)+$weight]
+	}
+    }
+
+    set result {}
+    for { set index 0 } { $index <= $last } { incr index } {
+	lappend result $buckets($index)
+    }
+
+    return $result
+}
+
+# histogram-alt --
+#    Return histogram information from a list of numbers -
+#    intervals are open-ended at the lower bound instead of at the upper bound
+#
+# Arguments:
+#    limits   Upper limits for the buckets (in increasing order)
+#    values   List of values to be examined
+#    weights  List of weights, one per value (optional)
+#
+# Results:
+#    List of number of values in each bucket (length is one more than
+#    the number of limits)
+#
+#
+proc ::math::statistics::histogram-alt { limits values {weights {}} } {
+
+    if { [llength $limits] < 1 } {
+	return -code error -errorcode ARG -errorinfo {No limits given} {No limits given}
+    }
+    if { [llength $weights] > 0 && [llength $values] != [llength $weights] } {
+	return -code error -errorcode ARG -errorinfo {Number of weights be equal to number of values} {Weights and values differ in length}
+    }
+
+    set limits [lsort -real -increasing $limits]
+
+    for { set index 0 } { $index <= [llength $limits] } { incr index } {
+	set buckets($index) 0
+    }
+
+    set last [llength $limits]
+
+    # Will do integer arithmetic if unset
+    if {$weights eq ""} {
+       set weights [lrepeat [llength $values] 1]
+    }
+
+    foreach value $values weight $weights {
+	if { $value == {} } {
+	    continue
+	}
+
+	set index 0
+	set found 0
+	foreach limit $limits {
+	    if { $value < $limit } {
+		set found 1
+		set buckets($index) [expr $buckets($index)+$weight]
+		break
+	    }
+	    incr index
+	}
+
+	if { $found == 0 } {
+	    set buckets($last) [expr $buckets($last)+$weight]
+	}
+    }
+
+    set result {}
+    for { set index 0 } { $index <= $last } { incr index } {
+	lappend result $buckets($index)
+    }
+
+    return $result
+}
+
+# corr --
+#    Return the correlation coefficient of two sets of data
+#
+# Arguments:
+#    data1    List with the first set of data
+#    data2    List with the second set of data
+#
+# Result:
+#    Correlation coefficient of the two
+#
+proc ::math::statistics::corr { data1 data2 } {
+    variable TOOFEWDATA
+
+    set number  0
+    set sum1    0.0
+    set sum2    0.0
+    set sumsq1  0.0
+    set sumsq2  0.0
+    set sumprod 0.0
+
+    foreach value1 $data1 value2 $data2 {
+	if { $value1 == {} || $value2 == {} } {
+	    continue
+	}
+	set  value1  [expr {double($value1)}]
+	set  value2  [expr {double($value2)}]
+
+	set  sum1    [expr {$sum1+$value1}]
+	set  sum2    [expr {$sum2+$value2}]
+	set  sumsq1  [expr {$sumsq1+$value1*$value1}]
+	set  sumsq2  [expr {$sumsq2+$value2*$value2}]
+	set  sumprod [expr {$sumprod+$value1*$value2}]
+	incr number
+    }
+    if { $number > 0 } {
+	set numerator   [expr {$number*$sumprod-$sum1*$sum2}]
+	set denom1      [expr {sqrt($number*$sumsq1-$sum1*$sum1)}]
+	set denom2      [expr {sqrt($number*$sumsq2-$sum2*$sum2)}]
+	if { $denom1 != 0.0 && $denom2 != 0.0 } {
+	    set corr_coeff  [expr {$numerator/$denom1/$denom2}]
+	} elseif { $denom1 != 0.0 || $denom2 != 0.0 } {
+	    set corr_coeff  0.0 ;# Uniform against non-uniform
+	} else {
+	    set corr_coeff  1.0 ;# Both uniform
+	}
+
+    } else {
+	return -code error -errorcode DATA -errorinfo $TOOFEWDATA $TOOFEWDATA
+    }
+    return $corr_coeff
+}
+
+# lillieforsFit --
+#     Calculate the goodness of fit according to Lilliefors
+#     (goodness of fit to a normal distribution)
+#
+# Arguments:
+#     values          List of values to be tested for normality
+#
+# Result:
+#     Value of the statistic D
+#
+proc ::math::statistics::lillieforsFit {values} {
+    #
+    # calculate the goodness of fit according to Lilliefors
+    # (goodness of fit to a normal distribution)
+    #
+    # values -> list of values to be tested for normality
+    # (these values are sampled counts)
+    #
+
+    # calculate standard deviation and mean of the sample:
+    set n [llength $values]
+    if { $n < 5 } {
+        return -code error "Insufficient number of data (at least five required)"
+    }
+    set sd   [stdev $values]
+    set mean [mean $values]
+
+    # sort the sample for further processing:
+    set values [lsort -real $values]
+
+    # standardize the sample data (Z-scores):
+    foreach x $values {
+        lappend stdData [expr {($x - $mean)/double($sd)}]
+    }
+
+    # compute the value of the distribution function at every sampled point:
+    foreach x $stdData {
+        lappend expData [pnorm $x]
+    }
+
+    # compute D+:
+    set i 0
+    foreach x $expData {
+        incr i
+        lappend dplus [expr {$i/double($n)-$x}]
+    }
+    set dplus [lindex [lsort -real $dplus] end]
+
+    # compute D-:
+    set i 0
+    foreach x $expData {
+        incr i
+        lappend dminus [expr {$x-($i-1)/double($n)}]
+    }
+    set dminus [lindex [lsort -real $dminus] end]
+
+    # Calculate the test statistic D
+    # by finding the maximal vertical difference
+    # between the sample and the expectation:
+    #
+    set D [expr {$dplus > $dminus ? $dplus : $dminus}]
+
+    # We now use the modified statistic Z,
+    # because D is only reliable
+    # if the p-value is smaller than 0.1
+    return [expr {$D * (sqrt($n) - 0.01 + 0.831/sqrt($n))}]
+}
+
+# pnorm --
+#     Calculate the cumulative distribution function (cdf)
+#     for the standard normal distribution like in the statistical
+#     software 'R' (mean=0 and sd=1)
+#
+# Arguments:
+#     x               Value fro which the cdf should be calculated
+#
+# Result:
+#     Value of the statistic D
+#
+proc ::math::statistics::pnorm {x} {
+    #
+    # cumulative distribution function (cdf)
+    # for the standard normal distribution like in the statistical software 'R'
+    # (mean=0 and sd=1)
+    #
+    # x -> value for which the cdf should be calculated
+    #
+    set sum [expr {double($x)}]
+    set oldSum 0.0
+    set i 1
+    set denom 1.0
+    while {$sum != $oldSum} {
+            set oldSum $sum
+            incr i 2
+            set denom [expr {$denom*$i}]
+            #puts "$i - $denom"
+            set sum [expr {$oldSum + pow($x,$i)/$denom}]
+    }
+    return [expr {0.5 + $sum * exp(-0.5 * $x*$x - 0.91893853320467274178)}]
+}
+
+# pnorm_quicker --
+#     Calculate the cumulative distribution function (cdf)
+#     for the standard normal distribution - quicker alternative
+#     (less accurate)
+#
+# Arguments:
+#     x               Value for which the cdf should be calculated
+#
+# Result:
+#     Value of the statistic D
+#
+proc ::math::statistics::pnorm_quicker {x} {
+
+    set n [expr {abs($x)}]
+    set n [expr {1.0 + $n*(0.04986735 + $n*(0.02114101 + $n*(0.00327763 \
+            + $n*(0.0000380036 + $n*(0.0000488906 + $n*0.000005383)))))}]
+    set n [expr {1.0/pow($n,16)}]
+    #
+    if {$x >= 0} {
+        return [expr {1 - $n/2.0}]
+    } else {
+        return [expr {$n/2.0}]
+    }
+}
+
+# test-normal --
+#     Test for normality (using method Lilliefors)
+#
+# Arguments:
+#     data            Values that need to be tested
+#     significance    Level at which the discrepancy from normality is tested
+#
+# Result:
+#     1 if the Lilliefors statistic D is larger than the critical level
+#
+# Note:
+#     There was a mistake in the implementation before 0.9.3: confidence (wrong word)
+#     instead of significance. To keep compatibility with earlier versions, both
+#     significance and 1-significance are accepted.
+#
+proc ::math::statistics::test-normal {data significance} {
+    set D [lillieforsFit $data]
+
+    if { $significance > 0.5 } {
+        set significance [expr {1.0-$significance}] ;# Convert the erroneous levels pre 0.9.3
+    }
+
+    set Dcrit --
+    if { abs($significance-0.20) < 0.0001 } {
+        set Dcrit 0.741
+    }
+    if { abs($significance-0.15) < 0.0001 } {
+        set Dcrit 0.775
+    }
+    if { abs($significance-0.10) < 0.0001 } {
+        set Dcrit 0.819
+    }
+    if { abs($significance-0.05) < 0.0001 } {
+        set Dcrit 0.895
+    }
+    if { abs($significance-0.01) < 0.0001 } {
+        set Dcrit 1.035
+    }
+    if { $Dcrit != "--" } {
+        return [expr {$D > $Dcrit ? 1 : 0 }]
+    } else {
+        return -code error "Significancce level must be one of: 0.20, 0.15, 0.10, 0.05 or 0.01"
+    }
+}
+
+# t-test-mean --
+#    Test whether the mean value of a sample is in accordance with the
+#    estimated normal distribution with a certain probability
+#    (Student's t test)
+#
+# Arguments:
+#    data         List of raw data values (small sample)
+#    est_mean     Estimated mean of the distribution
+#    est_stdev    Estimated stdev of the distribution
+#    alpha        Probability level (0.95 or 0.99 for instance)
+#
+# Result:
+#    1 if the test is positive, 0 otherwise. If there are too few data,
+#    returns an empty string
+#
+proc ::math::statistics::t-test-mean { data est_mean est_stdev alpha } {
+    variable NEGSTDEV
+    variable TOOFEWDATA
+
+    if { $est_stdev <= 0.0 } {
+	return -code error -errorcode ARG -errorinfo $NEGSTDEV $NEGSTDEV
+    }
+
+    set allstats        [BasicStats all $data]
+
+    set alpha2          [expr {(1.0+$alpha)/2.0}]
+
+    set sample_mean     [lindex $allstats 0]
+    set sample_number   [lindex $allstats 3]
+
+    if { $sample_number > 1 } {
+	set tzero   [expr {abs($sample_mean-$est_mean)/$est_stdev * \
+		sqrt($sample_number-1)}]
+	set degrees [expr {$sample_number-1}]
+	set prob    [cdf-students-t $degrees $tzero]
+
+	return [expr {$prob<$alpha2}]
+
+    } else {
+	return -code error -errorcode DATA -errorinfo $TOOFEWDATA $TOOFEWDATA
+    }
+}
+
+# interval-mean-stdev --
+#    Return the interval containing the mean value and one
+#    containing the standard deviation with a certain
+#    level of confidence (assuming a normal distribution)
+#
+# Arguments:
+#    data         List of raw data values
+#    confidence   Confidence level (0.95 or 0.99 for instance)
+#
+# Result:
+#    List having the following elements: lower and upper bounds of
+#    mean, lower and upper bounds of stdev
+#
+#
+proc ::math::statistics::interval-mean-stdev { data confidence } {
+    variable TOOFEWDATA
+
+    set allstats [BasicStats all $data]
+
+    set conf2    [expr {(1.0+$confidence)/2.0}]
+    set mean     [lindex $allstats 0]
+    set number   [lindex $allstats 3]
+    set stdev    [lindex $allstats 4]
+
+    if { $number > 1 } {
+	set degrees    [expr {$number-1}]
+	set student_t  [expr {sqrt([Inverse-cdf-toms322 1 $degrees $conf2])}]
+	set mean_lower [expr {$mean-$student_t*$stdev/sqrt($number)}]
+	set mean_upper [expr {$mean+$student_t*$stdev/sqrt($number)}]
+	set stdev_lower {}
+	set stdev_upper {}
+	return [list $mean_lower $mean_upper $stdev_lower $stdev_upper]
+    } else {
+	return -code error -errorcode DATA -errorinfo $TOOFEWDATA $TOOFEWDATA
+    }
+}
+
+# quantiles --
+#    Return the quantiles for a given set of data or histogram
+#
+# Arguments:
+#    (two arguments)
+#    data         List of raw data values
+#    confidence   Confidence level (0.95 or 0.99 for instance)
+#    (three arguments)
+#    limits       List of upper limits from histogram
+#    counts       List of counts for for each interval in histogram
+#    confidence   Confidence level (0.95 or 0.99 for instance)
+#
+# Result:
+#    List of quantiles
+#
+proc ::math::statistics::quantiles { arg1 arg2 {arg3 {}} } {
+    variable TOOFEWDATA
+
+    if { [catch {
+	if { $arg3 == {} } {
+	    set result \
+		    [::math::statistics::QuantilesRawData $arg1 $arg2]
+	} else {
+	    set result \
+		    [::math::statistics::QuantilesHistogram $arg1 $arg2 $arg3]
+	}
+    } msg] } {
+	return -code error -errorcode $msg $msg
+    }
+    return $result
+}
+
+# QuantilesRawData --
+#    Return the quantiles based on raw data
+#
+# Arguments:
+#    data         List of raw data values
+#    confidence   Confidence level (0.95 or 0.99 for instance)
+#
+# Result:
+#    List of quantiles
+#
+proc ::math::statistics::QuantilesRawData { data confidence } {
+    variable TOOFEWDATA
+    variable OUTOFRANGE
+
+    if { [llength $confidence] <= 0 } {
+	return -code error -errorcode ARG "$TOOFEWDATA - quantiles"
+    }
+
+    if { [llength $data] <= 0 } {
+	return -code error -errorcode ARG "$TOOFEWDATA - raw data"
+    }
+
+    foreach cond $confidence {
+	if { $cond <= 0.0 || $cond >= 1.0 } {
+	    return -code error -errorcode ARG "$OUTOFRANGE - quantiles"
+	}
+    }
+
+    #
+    # Sort the data first
+    #
+    set sorted_data [lsort -real -increasing $data]
+
+    #
+    # Determine the list element lower or equal to the quantile
+    # and return the corresponding value
+    #
+    set result      {}
+    set number_data [llength $sorted_data]
+    foreach cond $confidence {
+	set elem [expr {round($number_data*$cond)-1}]
+	if { $elem < 0 } {
+	    set elem 0
+	}
+	lappend result [lindex $sorted_data $elem]
+    }
+
+    return $result
+}
+
+# QuantilesHistogram --
+#    Return the quantiles based on histogram information only
+#
+# Arguments:
+#    limits       Upper limits for histogram intervals
+#    counts       Counts for each interval
+#    confidence   Confidence level (0.95 or 0.99 for instance)
+#
+# Result:
+#    List of quantiles
+#
+proc ::math::statistics::QuantilesHistogram { limits counts confidence } {
+    variable TOOFEWDATA
+    variable OUTOFRANGE
+
+    if { [llength $confidence] <= 0 } {
+	return -code error -errorcode ARG "$TOOFEWDATA - quantiles"
+    }
+
+    if { [llength $confidence] <= 0 } {
+	return -code error -errorcode ARG "$TOOFEWDATA - histogram limits"
+    }
+
+    if { [llength $counts] <= [llength $limits] } {
+	return -code error -errorcode ARG "$TOOFEWDATA - histogram counts"
+    }
+
+    foreach cond $confidence {
+	if { $cond <= 0.0 || $cond >= 1.0 } {
+	    return -code error -errorcode ARG "$OUTOFRANGE - quantiles"
+	}
+    }
+
+    #
+    # Accumulate the histogram counts first
+    #
+    set sum 0
+    set accumulated_counts {}
+    foreach count $counts {
+	set sum [expr {$sum+$count}]
+	lappend accumulated_counts $sum
+    }
+    set total_counts $sum
+
+    #
+    # Determine the list element lower or equal to the quantile
+    # and return the corresponding value (use interpolation if
+    # possible)
+    #
+    set result      {}
+    foreach cond $confidence {
+	set found       0
+	set bound       [expr {round($total_counts*$cond)}]
+	set lower_limit {}
+	set lower_count 0
+	foreach acc_count $accumulated_counts limit $limits {
+	    if { $acc_count >= $bound } {
+		set found 1
+		break
+	    }
+	    set lower_limit $limit
+	    set lower_count $acc_count
+	}
+
+	if { $lower_limit == {} || $limit == {} || $found == 0 } {
+	    set quant $limit
+	    if { $limit == {} } {
+		set quant $lower_limit
+	    }
+	} else {
+	    set quant [expr {$limit+($lower_limit-$limit) *
+	    ($acc_count-$bound)/($acc_count-$lower_count)}]
+	}
+	lappend result $quant
+    }
+
+    return $result
+}
+
+# autocorr --
+#    Return the autocorrelation function (assuming equidistance between
+#    samples)
+#
+# Arguments:
+#    data         Raw data for which the autocorrelation must be determined
+#
+# Result:
+#    List of autocorrelation values (about 1/2 the number of raw data)
+#
+proc ::math::statistics::autocorr { data } {
+    variable TOOFEWDATA
+
+    if { [llength $data] <= 1 } {
+	return -code error -errorcode ARG "$TOOFEWDATA"
+    }
+
+    return [crosscorr $data $data]
+}
+
+# crosscorr --
+#    Return the cross-correlation function (assuming equidistance
+#    between samples)
+#
+# Arguments:
+#    data1        First set of raw data
+#    data2        Second set of raw data
+#
+# Result:
+#    List of cross-correlation values (about 1/2 the number of raw data)
+#
+# Note:
+#    The number of data pairs is not kept constant - because tests
+#    showed rather awkward results when it was kept constant.
+#
+proc ::math::statistics::crosscorr { data1 data2 } {
+    variable TOOFEWDATA
+
+    if { [llength $data1] <= 1 || [llength $data2] <= 1 } {
+	return -code error -errorcode ARG "$TOOFEWDATA"
+    }
+
+    #
+    # First determine the number of data pairs
+    #
+    set number1 [llength $data1]
+    set number2 [llength $data2]
+
+    set basic_stat1 [basic-stats $data1]
+    set basic_stat2 [basic-stats $data2]
+    set vmean1      [lindex $basic_stat1 0]
+    set vmean2      [lindex $basic_stat2 0]
+    set vvar1       [lindex $basic_stat1 end]
+    set vvar2       [lindex $basic_stat2 end]
+
+    set number_pairs $number1
+    if { $number1 > $number2 } {
+	set number_pairs $number2
+    }
+    set number_values $number_pairs
+    set number_delays [expr {$number_values/2.0}]
+
+    set scale [expr {sqrt($vvar1*$vvar2)}]
+
+    set result {}
+    for { set delay 0 } { $delay < $number_delays } { incr delay } {
+	set sumcross 0.0
+	set no_cross 0
+	for { set idx 0 } { $idx < $number_values } { incr idx } {
+	    set value1 [lindex $data1 $idx]
+	    set value2 [lindex $data2 [expr {$idx+$delay}]]
+	    if { $value1 != {} && $value2 != {} } {
+		set  sumcross \
+			[expr {$sumcross+($value1-$vmean1)*($value2-$vmean2)}]
+		incr no_cross
+	    }
+	}
+	lappend result [expr {$sumcross/($no_cross*$scale)}]
+
+	incr number_values -1
+    }
+
+    return $result
+}
+
+# mean-histogram-limits
+#    Determine reasonable limits based on mean and standard deviation
+#    for a histogram
+#
+# Arguments:
+#    mean         Mean of the data
+#    stdev        Standard deviation
+#    number       Number of limits to generate (defaults to 8)
+#
+# Result:
+#    List of limits
+#
+proc ::math::statistics::mean-histogram-limits { mean stdev {number 8} } {
+    variable NEGSTDEV
+
+    if { $stdev <= 0.0 } {
+	return -code error -errorcode ARG "$NEGSTDEV"
+    }
+    if { $number < 1 } {
+	return -code error -errorcode ARG "Number of limits must be positive"
+    }
+
+    #
+    # Always: between mean-3.0*stdev and mean+3.0*stdev
+    # number = 2: -0.25, 0.25
+    # number = 3: -0.25, 0, 0.25
+    # number = 4: -1, -0.25, 0.25, 1
+    # number = 5: -1, -0.25, 0, 0.25, 1
+    # number = 6: -2, -1, -0.25, 0.25, 1, 2
+    # number = 7: -2, -1, -0.25, 0, 0.25, 1, 2
+    # number = 8: -3, -2, -1, -0.25, 0.25, 1, 2, 3
+    #
+    switch -- $number {
+	"1" { set limits {0.0} }
+	"2" { set limits {-0.25 0.25} }
+	"3" { set limits {-0.25 0.0 0.25} }
+	"4" { set limits {-1.0 -0.25 0.25 1.0} }
+	"5" { set limits {-1.0 -0.25 0.0 0.25 1.0} }
+	"6" { set limits {-2.0 -1.0 -0.25 0.25 1.0 2.0} }
+	"7" { set limits {-2.0 -1.0 -0.25 0.0 0.25 1.0 2.0} }
+	"8" { set limits {-3.0 -2.0 -1.0 -0.25 0.25 1.0 2.0 3.0} }
+	"9" { set limits {-3.0 -2.0 -1.0 -0.25 0.0 0.25 1.0 2.0 3.0} }
+	default {
+	    set dlim [expr {6.0/double($number-1)}]
+	    for {set i 0} {$i <$number} {incr i} {
+		lappend limits [expr {$dlim*($i-($number-1)/2.0)}]
+	    }
+	}
+    }
+
+    set result {}
+    foreach limit $limits {
+	lappend result [expr {$mean+$limit*$stdev}]
+    }
+
+    return $result
+}
+
+# minmax-histogram-limits
+#    Determine reasonable limits based on minimum and maximum bounds
+#    for a histogram
+#
+# Arguments:
+#    min          Estimated minimum
+#    max          Estimated maximum
+#    number       Number of limits to generate (defaults to 8)
+#
+# Result:
+#    List of limits
+#
+proc ::math::statistics::minmax-histogram-limits { min max {number 8} } {
+    variable NEGSTDEV
+
+    if { $number < 1 } {
+	return -code error -errorcode ARG "Number of limits must be positive"
+    }
+    if { $min >= $max } {
+	return -code error -errorcode ARG "Minimum must be lower than maximum"
+    }
+
+    set result {}
+    set dlim [expr {($max-$min)/double($number-1)}]
+    for {set i 0} {$i <$number} {incr i} {
+	lappend result [expr {$min+$dlim*$i}]
+    }
+
+    return $result
+}
+
+# linear-model
+#    Determine the coefficients for a linear regression between
+#    two series of data (the model: Y = A + B*X)
+#
+# Arguments:
+#    xdata        Series of independent (X) data
+#    ydata        Series of dependent (Y) data
+#    intercept    Whether to use an intercept or not (optional)
+#
+# Result:
+#    List of the following items:
+#    - (Estimate of) Intercept A
+#    - (Estimate of) Slope B
+#    - Standard deviation of Y relative to fit
+#    - Correlation coefficient R2
+#    - Number of degrees of freedom df
+#    - Standard error of the intercept A
+#    - Significance level of A
+#    - Standard error of the slope B
+#    - Significance level of B
+#
+#
+proc ::math::statistics::linear-model { xdata ydata {intercept 1} } {
+   variable TOOFEWDATA
+
+   if { [llength $xdata] < 3 } {
+      return -code error -errorcode ARG "$TOOFEWDATA: not enough independent data"
+   }
+   if { [llength $ydata] < 3 } {
+      return -code error -errorcode ARG "$TOOFEWDATA: not enough dependent data"
+   }
+   if { [llength $xdata] != [llength $ydata] } {
+      return -code error -errorcode ARG "$TOOFEWDATA: number of dependent data differs from number of independent data"
+   }
+
+   set sumx  0.0
+   set sumy  0.0
+   set sumx2 0.0
+   set sumy2 0.0
+   set sumxy 0.0
+   set df    0
+   foreach x $xdata y $ydata {
+      if { $x != "" && $y != "" } {
+         set sumx  [expr {$sumx+$x}]
+         set sumy  [expr {$sumy+$y}]
+         set sumx2 [expr {$sumx2+$x*$x}]
+         set sumy2 [expr {$sumy2+$y*$y}]
+         set sumxy [expr {$sumxy+$x*$y}]
+         incr df
+      }
+   }
+
+   if { $df <= 2 } {
+      return -code error -errorcode ARG "$TOOFEWDATA: too few valid data"
+   }
+   if { $sumx2 == 0.0 } {
+      return -code error -errorcode ARG "$TOOFEWDATA: independent values are all the same"
+   }
+
+   #
+   # Calculate the intermediate quantities
+   #
+   set sx  [expr {$sumx2-$sumx*$sumx/$df}]
+   set sy  [expr {$sumy2-$sumy*$sumy/$df}]
+   set sxy [expr {$sumxy-$sumx*$sumy/$df}]
+
+   #
+   # Calculate the coefficients
+   #
+   if { $intercept } {
+      set B [expr {$sxy/$sx}]
+      set A [expr {($sumy-$B*$sumx)/$df}]
+   } else {
+      set B [expr {$sumxy/$sumx2}]
+      set A 0.0
+   }
+
+   #
+   # Calculate the error estimates
+   #
+   set stdevY 0.0
+   set varY   0.0
+
+   if { $intercept } {
+      set ve [expr {$sy-$B*$sxy}]
+      if { $ve >= 0.0 } {
+         set varY [expr {$ve/($df-2)}]
+      }
+   } else {
+      set ve [expr {$sumy2-$B*$sumxy}]
+      if { $ve >= 0.0 } {
+         set varY [expr {$ve/($df-1)}]
+      }
+   }
+   set seY [expr {sqrt($varY)}]
+
+   if { $intercept } {
+      set R2    [expr {$sxy*$sxy/($sx*$sy)}]
+      set seA   [expr {$seY*sqrt(1.0/$df+$sumx*$sumx/($sx*$df*$df))}]
+      set seB   [expr {sqrt($varY/$sx)}]
+      set tA    {}
+      set tB    {}
+      if { $seA != 0.0 } {
+         set tA    [expr {$A/$seA*sqrt($df-2)}]
+      }
+      if { $seB != 0.0 } {
+         set tB    [expr {$B/$seB*sqrt($df-2)}]
+      }
+   } else {
+      set R2    [expr {$sumxy*$sumxy/($sumx2*$sumy2)}]
+      set seA   {}
+      set tA    {}
+      set tB    {}
+      set seB   [expr {sqrt($varY/$sumx2)}]
+      if { $seB != 0.0 } {
+         set tB    [expr {$B/$seB*sqrt($df-1)}]
+      }
+   }
+
+   #
+   # Return the list of parameters
+   #
+   return [list $A $B $seY $R2 $df $seA $tA $seB $tB]
+}
+
+# linear-residuals
+#    Determine the difference between actual data and predicted from
+#    the linear model
+#
+# Arguments:
+#    xdata        Series of independent (X) data
+#    ydata        Series of dependent (Y) data
+#    intercept    Whether to use an intercept or not (optional)
+#
+# Result:
+#    List of differences
+#
+proc ::math::statistics::linear-residuals { xdata ydata {intercept 1} } {
+   variable TOOFEWDATA
+
+   if { [llength $xdata] < 3 } {
+      return -code error -errorcode ARG "$TOOFEWDATA: no independent data"
+   }
+   if { [llength $ydata] < 3 } {
+      return -code error -errorcode ARG "$TOOFEWDATA: no dependent data"
+   }
+   if { [llength $xdata] != [llength $ydata] } {
+      return -code error -errorcode ARG "$TOOFEWDATA: number of dependent data differs from number of independent data"
+   }
+
+   foreach {A B} [linear-model $xdata $ydata $intercept] {break}
+
+   set result {}
+   foreach x $xdata y $ydata {
+      set residue [expr {$y-$A-$B*$x}]
+      lappend result $residue
+   }
+   return $result
+}
+
+# median
+#    Determine the median from a list of data
+#
+# Arguments:
+#    data         (Unsorted) list of data
+#
+# Result:
+#    Median (either the middle value or the mean of two values in the
+#    middle)
+#
+# Note:
+#    Adapted from the Wiki page "Stats", code provided by JPS
+#
+proc ::math::statistics::median { data } {
+    set org_data $data
+    set data     {}
+    foreach value $org_data {
+        if { $value != {} } {
+            lappend data $value
+        }
+    }
+    set len [llength $data]
+
+    set data [lsort -real $data]
+    if { $len % 2 } {
+        lindex $data [expr {($len-1)/2}]
+    } else {
+        expr {([lindex $data [expr {($len / 2) - 1}]] \
+		+ [lindex $data [expr {$len / 2}]]) / 2.0}
+    }
+}
+
+# test-2x2 --
+#     Compute the chi-square statistic for a 2x2 table
+#
+# Arguments:
+#     a           Element upper-left
+#     b           Element upper-right
+#     c           Element lower-left
+#     d           Element lower-right
+# Return value:
+#     Chi-square
+# Note:
+#     There is only one degree of freedom - this is important
+#     when comparing the value to the tabulated values
+#     of chi-square
+#
+proc ::math::statistics::test-2x2 { a b c d } {
+    set ab     [expr {$a+$b}]
+    set ac     [expr {$a+$c}]
+    set bd     [expr {$b+$d}]
+    set cd     [expr {$c+$d}]
+    set N      [expr {$a+$b+$c+$d}]
+    set det    [expr {$a*$d-$b*$c}]
+    set result [expr {double($N*$det*$det)/double($ab*$cd*$ac*$bd)}]
+}
+
+# print-2x2 --
+#     Print a 2x2 table
+#
+# Arguments:
+#     a           Element upper-left
+#     b           Element upper-right
+#     c           Element lower-left
+#     d           Element lower-right
+# Return value:
+#     Printed version with marginals
+#
+proc ::math::statistics::print-2x2 { a b c d } {
+    set ab     [expr {$a+$b}]
+    set ac     [expr {$a+$c}]
+    set bd     [expr {$b+$d}]
+    set cd     [expr {$c+$d}]
+    set N      [expr {$a+$b+$c+$d}]
+    set chisq  [test-2x2 $a $b $c $d]
+
+    set    line   [string repeat - 10]
+    set    result [format "%10d%10d | %10d\n" $a $b $ab]
+    append result [format "%10d%10d | %10d\n" $c $d $cd]
+    append result [format "%10s%10s + %10s\n" $line $line $line]
+    append result [format "%10d%10d | %10d\n" $ac $bd $N]
+    append result "Chisquare = $chisq\n"
+    append result "Difference is significant?\n"
+    append result "   at 95%: [expr {$chisq<3.84146? "no":"yes"}]\n"
+    append result "   at 99%: [expr {$chisq<6.63490? "no":"yes"}]"
+}
+
+# control-xbar --
+#     Determine the control lines for an x-bar chart
+#
+# Arguments:
+#     data        List of observed values (at least 20*nsamples)
+#     nsamples    Number of data per subsamples (default: 4)
+# Return value:
+#     List of: mean, lower limit, upper limit, number of data per
+#     subsample. Can be used in the test-xbar procedure
+#
+proc ::math::statistics::control-xbar { data {nsamples 4} } {
+    variable TOOFEWDATA
+    variable control_factors
+
+    #
+    # Check the number of data
+    #
+    if { $nsamples <= 1 } {
+        return -code error -errorcode DATA -errorinfo $OUTOFRANGE \
+            "Number of data per subsample must be at least 2"
+    }
+    if { [llength $data] < 20*$nsamples } {
+        return -code error -errorcode DATA -errorinfo $TOOFEWDATA $TOOFEWDATA
+    }
+
+    set nogroups [expr {[llength $data]/$nsamples}]
+    set mrange   0.0
+    set xmeans   0.0
+    for { set i 0 } { $i < $nogroups } { incr i } {
+        set subsample [lrange $data [expr {$i*$nsamples}] [expr {$i*$nsamples+$nsamples-1}]]
+
+        set xmean 0.0
+        set xmin  [lindex $subsample 0]
+        set xmax  $xmin
+        foreach d $subsample {
+            set xmean [expr {$xmean+$d}]
+            set xmin  [expr {$xmin<$d? $xmin : $d}]
+            set xmax  [expr {$xmax>$d? $xmax : $d}]
+        }
+        set xmean [expr {$xmean/double($nsamples)}]
+
+        set xmeans [expr {$xmeans+$xmean}]
+        set mrange [expr {$mrange+($xmax-$xmin)}]
+    }
+
+    #
+    # Determine the control lines
+    #
+    set xmeans [expr {$xmeans/double($nogroups)}]
+    set mrange [expr {$mrange/double($nogroups)}]
+    set A2     [lindex [lindex $control_factors 1] $nsamples]
+    if { $A2 == "" } { set A2 [lindex [lindex $control_factors 1] end] }
+
+    return [list $xmeans [expr {$xmeans-$A2*$mrange}] \
+                         [expr {$xmeans+$A2*$mrange}] $nsamples]
+}
+
+# test-xbar --
+#     Determine if any data points lie outside the x-bar control limits
+#
+# Arguments:
+#     control     List returned by control-xbar with control data
+#     data        List of observed values
+# Return value:
+#     Indices of any subsamples that violate the control limits
+#
+proc ::math::statistics::test-xbar { control data } {
+    foreach {xmean xlower xupper nsamples} $control {break}
+
+    if { [llength $data] < 1 } {
+        return -code error -errorcode DATA -errorinfo $TOOFEWDATA $TOOFEWDATA
+    }
+
+    set nogroups [expr {[llength $data]/$nsamples}]
+    if { $nogroups <= 0 } {
+        set nogroup  1
+        set nsamples [llength $data]
+    }
+
+    set result {}
+
+    for { set i 0 } { $i < $nogroups } { incr i } {
+        set subsample [lrange $data [expr {$i*$nsamples}] [expr {$i*$nsamples+$nsamples-1}]]
+
+        set xmean 0.0
+        foreach d $subsample {
+            set xmean [expr {$xmean+$d}]
+        }
+        set xmean [expr {$xmean/double($nsamples)}]
+
+        if { $xmean < $xlower } { lappend result $i }
+        if { $xmean > $xupper } { lappend result $i }
+    }
+
+    return $result
+}
+
+# control-Rchart --
+#     Determine the control lines for an R chart
+#
+# Arguments:
+#     data        List of observed values (at least 20*nsamples)
+#     nsamples    Number of data per subsamples (default: 4)
+# Return value:
+#     List of: mean range, lower limit, upper limit, number of data per
+#     subsample. Can be used in the test-Rchart procedure
+#
+proc ::math::statistics::control-Rchart { data {nsamples 4} } {
+    variable TOOFEWDATA
+    variable control_factors
+
+    #
+    # Check the number of data
+    #
+    if { $nsamples <= 1 } {
+        return -code error -errorcode DATA -errorinfo $OUTOFRANGE \
+            "Number of data per subsample must be at least 2"
+    }
+    if { [llength $data] < 20*$nsamples } {
+        return -code error -errorcode DATA -errorinfo $TOOFEWDATA $TOOFEWDATA
+    }
+
+    set nogroups [expr {[llength $data]/$nsamples}]
+    set mrange   0.0
+    for { set i 0 } { $i < $nogroups } { incr i } {
+        set subsample [lrange $data [expr {$i*$nsamples}] [expr {$i*$nsamples+$nsamples-1}]]
+
+        set xmin  [lindex $subsample 0]
+        set xmax  $xmin
+        foreach d $subsample {
+            set xmin  [expr {$xmin<$d? $xmin : $d}]
+            set xmax  [expr {$xmax>$d? $xmax : $d}]
+        }
+        set mrange [expr {$mrange+($xmax-$xmin)}]
+    }
+
+    #
+    # Determine the control lines
+    #
+    set mrange [expr {$mrange/double($nogroups)}]
+    set D3     [lindex [lindex $control_factors 3] $nsamples]
+    set D4     [lindex [lindex $control_factors 5] $nsamples]
+    if { $D3 == "" } { set D3 [lindex [lindex $control_factors 3] end] }
+    if { $D4 == "" } { set D4 [lindex [lindex $control_factors 5] end] }
+
+    return [list $mrange [expr {$D3*$mrange}] \
+                         [expr {$D4*$mrange}] $nsamples]
+}
+
+# test-Rchart --
+#     Determine if any data points lie outside the R-chart control limits
+#
+# Arguments:
+#     control     List returned by control-xbar with control data
+#     data        List of observed values
+# Return value:
+#     Indices of any subsamples that violate the control limits
+#
+proc ::math::statistics::test-Rchart { control data } {
+    foreach {rmean rlower rupper nsamples} $control {break}
+
+    #
+    # Check the number of data
+    #
+    if { [llength $data] < 1 } {
+        return -code error -errorcode DATA -errorinfo $TOOFEWDATA $TOOFEWDATA
+    }
+
+    set nogroups [expr {[llength $data]/$nsamples}]
+
+    set result {}
+    for { set i 0 } { $i < $nogroups } { incr i } {
+        set subsample [lrange $data [expr {$i*$nsamples}] [expr {$i*$nsamples+$nsamples-1}]]
+
+        set xmin  [lindex $subsample 0]
+        set xmax  $xmin
+        foreach d $subsample {
+            set xmin  [expr {$xmin<$d? $xmin : $d}]
+            set xmax  [expr {$xmax>$d? $xmax : $d}]
+        }
+        set range [expr {$xmax-$xmin}]
+
+        if { $range < $rlower } { lappend result $i }
+        if { $range > $rupper } { lappend result $i }
+    }
+
+    return $result
+}
+
+# test-Duckworth --
+#     Determine if two data sets have the same median according to the Tukey-Duckworth test
+#
+# Arguments:
+#     list1           Values in the first data set
+#     list2           Values in the second data set
+#     significance    Significance level (either 0.05, 0.01 or 0.001)
+#
+# Returns:
+#     0 if the medians are unequal, 1 if they are equal, -1 if the test can not
+#     be conducted (the smallest value must be in a different set than the greatest value)
+#
+proc ::math::statistics::test-Duckworth {list1 list2 significance} {
+    set sorted1   [lsort -real $list1]
+    set sorted2   [lsort -real -decreasing $list2]
+
+    set lowest1   [lindex $sorted1 0]
+    set lowest2   [lindex $sorted2 end]
+    set greatest1 [lindex $sorted1 end]
+    set greatest2 [lindex $sorted2 0]
+
+    if { $lowest1 <= $lowest2 && $greatest1 >= $greatest2 } {
+        return -1
+    }
+    if { $lowest1 >= $lowest2 && $greatest1 <= $greatest2 } {
+        return -1
+    }
+
+    #
+    # Determine how many elements of set 1 are lower than the lowest of set 2
+    # Ditto for the number of elements of set 2 greater than the greatest of set 1
+    # (Or vice versa)
+    #
+    if { $lowest1 < $lowest2 } {
+        set lowest   $lowest2
+        set greatest $greatest1
+    } else {
+        set lowest   $lowest1
+        set greatest $greatest2
+        set sorted1   [lsort -real $list2]
+        set sorted2   [lsort -real -decreasing $list1]
+        #lassign [list $sorted1 $sorted2] sorted2 sorted1
+    }
+
+    set count1 0
+    set count2 0
+    foreach v1 $sorted1 {
+        if { $v1 >= $lowest } {
+            break
+        }
+        incr count1
+    }
+    foreach v2 $sorted2 {
+        if { $v2 <= $greatest } {
+            break
+        }
+        incr count2
+    }
+
+    #
+    # Determine the statistic D, possibly with correction
+    #
+    set n1 [llength $list1]
+    set n2 [llength $list2]
+
+    set correction 0
+    if { 3 + 4*$n1/3 <= $n2 && $n2 <= 2*$n1 } {
+        set correction -1
+    }
+    if { 3 + 4*$n2/3 <= $n1 && $n1 <= 2*$n2 } {
+        set correction -1
+    }
+
+    set D [expr {$count1 + $count2 + $correction}]
+
+    switch -- [string trim $significance 0] {
+        ".05" {
+             return [expr {$D >= 7? 0 : 1}]
+        }
+        ".01" {
+             return [expr {$D >= 10? 0 : 1}]
+        }
+        ".001" {
+             return [expr {$D >= 13? 0 : 1}]
+        }
+        default {
+             return -code error "Significance level must be 0.05, 0.01 or 0.001"
+        }
+    }
+}
+
+# test-anova-F --
+#     Check if two or more groups with normally distributed data have the same
+#     means
+#
+# Arguments:
+#     alpha            Significance level
+#     args             One or more lists containing the data for the
+#                      other groups
+#
+# Returns:
+#     Whether the mean for the groups is likely to be the same (1)
+#     or not (0).
+#
+# Note:
+#     args may be a nested list
+#
+#     Implementation based on Wikipedia page on the F-test, one-way ANOVA
+#
+#     Possibly of interest: the ratio itself.
+#
+proc ::math::statistics::test-anova-F {alpha args} {
+    if { [llength $args] == 1 } {
+        set args [lindex $args 0]
+    }
+
+    if { [llength $args] < 2 } {
+        return -code error -errorcode ARG -errorinfo "At least two groups are required" \
+                                                     "At least two groups are required"
+    }
+
+    #
+    # Determine the variance within the groups and the variance between the groups
+    #
+    set meanPerGroup {}
+    set varPerGroup  {}
+    set allData   {}
+    foreach group $args {
+        lappend meanPerGroup [::math::statistics::mean $group]
+        lappend varPerGroup  [::math::statistics::pvar $group]
+        set allData          [concat $allData $group]
+    }
+    set meanOverall [::math::statistics::mean $allData]
+
+    set varBetween 0.0
+    foreach group $args mean $meanPerGroup {
+        set varBetween [expr {$varBetween + [llength $group] * ($mean - $meanOverall)**2}]
+    }
+    set varBetween [expr {$varBetween / ([llength $args] - 1)}]
+
+    set varWithin 0.0
+    foreach group $args var $varPerGroup {
+        set varWithin [expr {$varWithin + [llength $group] * $var}]
+    }
+    set varWithin [expr {$varWithin / ([llength $allData] - [llength $args])}]
+
+    #
+    # Finally compare the ratio to the F-distribution
+    #
+    set ratio [expr {$varBetween / $varWithin}]
+    set nf1   [expr {[llength $args]    - 1}]
+    set nf2   [expr {[llength $allData] - [llength $args]}]
+
+    expr {[::math::statistics::cdf-F $nf1 $nf2 $ratio] <= 1.0 - $alpha}
+}
+
+# test-Tukey-range --
+#     Check if two or more groups with normally distributed data have different
+#     means or not, using Tukey's range test
+#
+# Arguments:
+#     alpha            Significance level
+#     args             Two or more lists containing the data for the
+#                      other groups
+#
+# Returns:
+#     For each pair of groups a list of:
+#     - group indices
+#     - whether the means differ (1) or not (0)
+#     - limits of the confidence interval (for closer investigation)
+#
+# Note:
+#     args may be a nested list
+#
+#     Implementation based on Wikipedia page on Tukey's range test
+#
+proc ::math::statistics::test-Tukey-range {alpha args} {
+    if { [llength $args] == 1 } {
+        set args [lindex $args 0]
+    }
+
+    if { [llength $args] < 2 } {
+        return -code error -errorcode ARG -errorinfo "At least two groups are required" \
+                                                     "At least two groups are required"
+    }
+
+    if { $alpha != 0.05 && $alpha != 0.01 } {
+        return -code error -errorcode ARG -errorinfo "Alpha must 0.05 or 0.01"
+    }
+
+    #
+    # Determine the mean per group and the pooled variance of the data
+    #
+    set meanPerGroup {}
+    set allData      {}
+    set sumVar       0.0
+    foreach group $args {
+        lappend meanPerGroup  [mean $group]
+        set sumVar            [expr {$sumVar + ([llength $group]-1) * [var $group]}]
+        set allData           [concat $allData $group]
+    }
+
+    set n          [llength $allData]
+    set stdOverall [expr {sqrt($sumVar /($n - [llength $args]))}]
+
+    set qcrit      [Qcrit-Tukey $alpha $n [llength $args]]
+
+    set result {}
+
+    for {set g 0} {$g < [llength $args]} {incr g} {
+        set ggroup [lindex $args $g]
+        set gmean  [mean $ggroup]
+        set ng     [llength $ggroup]
+
+        for {set h [expr {$g+1}]} {$h < [llength $args]} {incr h} {
+            set hgroup    [lindex $args $h]
+            set hmean     [mean $hgroup]
+            set nh        [llength $hgroup]
+
+            set halfwidth [expr {$qcrit * $stdOverall / sqrt(2.0) * sqrt( 1.0/$ng + 1.0/$nh )}]
+            set lower     [expr {$hmean - $gmean - $halfwidth}]
+            set upper     [expr {$hmean - $gmean + $halfwidth}]
+            set unequal   1
+            if { $lower < 0.0 && $upper > 0.0 } {
+                set unequal 0
+            }
+            lappend result [list $g $h $unequal $lower $upper]
+        }
+    }
+
+    return $result
+}
+
+# Qcrit-Tukey --
+#     Determine the critical value for the Tukey range test
+#
+# Arguments:
+#     alpha            Significance level
+#     numberData       Total number of data
+#     numberGroups     Number of groups
+#
+# Returns:
+#     Critical value
+#
+# Note:
+#     If there are more than 10 groups, simply use 10 groups
+#
+proc ::math::statistics::Qcrit-Tukey {alpha numberData numberGroups} {
+    variable tukey_table_05
+    variable tukey_table_01
+
+    if { $alpha == 0.05 } {
+        upvar 0 tukey_table_05 tukey_table
+    } else {
+        upvar 0 tukey_table_05 tukey_table
+    }
+
+    set df [expr {$numberData - $numberGroups}]
+
+    if { $numberGroups > 10 } {
+        set numberGroups 10
+    }
+    incr numberGroups -1 ;# Offset because of 0-based numbering
+
+    if { $df > 120 } {
+        return [lindex $tukey_table end $numberGroups]
+    }
+
+    foreach {dfe values} $tukey_table {
+        if { $df <= $dfe } {
+            return [lindex $values $numberGroups]
+        }
+    }
+}
+
+# test-Dunnett --
+#     Check if one or more groups with normally distributed data have different
+#     means from the control group or not, using Dunnett's test
+#
+# Arguments:
+#     alpha            Significance level
+#     control          Control group
+#     args             One or more lists containing the data for the
+#                      other groups
+#
+# Returns:
+#     For each group a list of:
+#     - whether the mean differs (1) from the control or not (0)
+#     - the confidence interval
+#
+# Note:
+#     args may be a nested list
+#
+#     Implementation based on Wikipedia page on Dunnett's test
+#     The test is two-sided.
+#
+proc ::math::statistics::test-Dunnett {alpha control args} {
+    if { [llength $args] == 1 } {
+        set args [lindex $args 0]
+    }
+
+    if { [llength $args] < 1 } {
+        return -code error -errorcode ARG -errorinfo "At least one additional group is required" \
+                                                     "At least one additional group is required"
+    }
+
+    if { $alpha != 0.05 && $alpha != 0.01 } {
+        return -code error -errorcode ARG -errorinfo "Alpha must 0.05 or 0.01"
+    }
+
+    #
+    # Determine the mean per group and the pooled variance
+    #
+    set allData      $control
+    set sumVar       [expr {([llength $control]-1)*[var $control]}]
+    foreach group $args {
+        set sumVar            [expr {$sumVar + ([llength $group]-1) * [var $group]}]
+        set allData           [concat $allData $group]
+    }
+
+    set n          [llength $allData]
+    set stdOverall [expr {sqrt($sumVar /($n - [llength $args] - 1))}]
+
+    set tcrit [Tcrit-Dunnett $alpha $n [llength $args]]
+
+    set result {}
+
+    set cmean  [mean $control]
+    set nc     [llength $control]
+
+    for {set g 0} {$g < [llength $args]} {incr g} {
+        set ggroup    [lindex $args $g]
+        set gmean     [mean $ggroup]
+        set ng        [llength $ggroup]
+
+        set halfwidth [expr {$tcrit * $stdOverall * sqrt( 1.0/$nc + 1.0/$ng )}]
+        set lower     [expr {$gmean - $cmean - $halfwidth}]
+        set upper     [expr {$gmean - $cmean + $halfwidth}]
+        set unequal   1
+        if { $lower < 0.0 && $upper > 0.0 } {
+            set unequal 0
+        }
+        lappend result [list $unequal $lower $upper]
+    }
+
+    return $result
+}
+
+# Tcrit-Dunnett --
+#     Determine the critical value for the Dunnett test
+#
+# Arguments:
+#     alpha            Significance level
+#     numberData       Total number of data
+#     numberGroups     Number of groups to compare against the control
+#
+# Returns:
+#     Critical value
+#
+# Note:
+#     If there are more than 10 groups, simply use 10 groups
+#
+proc ::math::statistics::Tcrit-Dunnett {alpha numberData numberGroups} {
+    variable dunnett_table_05
+    variable dunnett_table_01
+
+    if { $alpha == 0.05 } {
+        upvar 0 dunnett_table_05 dunnett_table
+    } else {
+        upvar 0 dunnett_table_05 dunnett_table
+    }
+
+    set df [expr {$numberData - $numberGroups - 1}]
+
+    incr numberGroups 1 ;# Add the control group
+    if { $numberGroups > 10 } {
+        set numberGroups 10
+    }
+    incr numberGroups -2 ;# Offset because of 0-based numbering and start at 2
+
+    if { $df > 60 } {
+        return [lindex $dunnett_table end $numberGroups]
+    }
+
+    foreach {dfe values} $dunnett_table {
+        if { $df <= $dfe } {
+            return [lindex $values $numberGroups]
+        }
+    }
+}
+
+#
+# Load the auxiliary scripts
+#
+source [file join [file dirname [info script]] pdf_stat.tcl]
+source [file join [file dirname [info script]] plotstat.tcl]
+source [file join [file dirname [info script]] liststat.tcl]
+source [file join [file dirname [info script]] mvlinreg.tcl]
+source [file join [file dirname [info script]] kruskal.tcl]
+source [file join [file dirname [info script]] wilcoxon.tcl]
+source [file join [file dirname [info script]] stat_kernel.tcl]
+source [file join [file dirname [info script]] stat_wasserstein.tcl]
+source [file join [file dirname [info script]] stat_logit.tcl]
+
+#
+# Define the tables
+#
+namespace eval ::math::statistics {
+    variable tukey_table_05
+    variable tukey_table_01
+    variable dunnett_table_05
+    variable dunnett_table_01
+
+    #alpha = 0.05
+    #k 2 3 4 5 6 7 8 9 10
+    #df
+    set tukey_table_05 {
+        1  {18.0 27.0 32.8 37.1 40.4 43.1 45.4 47.4 49.1}
+        2  {6.08 8.33 9.80 10.88 11.73 12.43 13.03 13.54 13.99}
+        3  {4.50 5.91 6.82 7.50 8.04 8.48 8.85 9.18 9.46}
+        4  {3.93 5.04 5.76 6.29 6.71 7.05 7.35 7.60 7.83}
+        5  {3.64 4.60 5.22 5.67 6.03 6.33 6.58 6.80 6.99}
+        6  {3.46 4.34 4.90 5.30 5.63 5.90 6.12 6.32 6.49}
+        7  {3.34 4.16 4.68 5.06 5.36 5.61 5.82 6.00 6.16}
+        8  {3.26 4.04 4.53 4.89 5.17 5.40 5.60 5.77 5.92}
+        9  {3.20 3.95 4.41 4.76 5.02 5.24 5.43 5.59 5.74}
+        10 {3.15 3.88 4.33 4.65 4.91 5.12 5.30 5.46 5.60}
+        11 {3.11 3.82 4.26 4.57 4.82 5.03 5.20 5.35 5.49}
+        12 {3.08 3.77 4.20 4.51 4.75 4.95 5.12 5.27 5.39}
+        13 {3.06 3.73 4.15 4.45 4.69 4.88 5.05 5.19 5.32}
+        14 {3.03 3.70 4.11 4.41 4.64 4.83 4.99 5.13 5.25}
+        15 {3.01 3.67 4.08 4.37 4.59 4.78 4.94 5.08 5.20}
+        16 {3.00 3.65 4.05 4.33 4.56 4.74 4.90 5.03 5.15}
+        17 {2.98 3.63 4.02 4.30 4.52 4.70 4.86 4.99 5.11}
+        18 {2.97 3.61 4.00 4.28 4.49 4.67 4.82 4.96 5.07}
+        19 {2.96 3.59 3.98 4.25 4.47 4.65 4.79 4.92 5.04}
+        20 {2.95 3.58 3.96 4.23 4.45 4.62 4.77 4.90 5.01}
+        24 {2.92 3.53 3.90 4.17 4.37 4.54 4.68 4.81 4.92}
+        30 {2.89 3.49 3.85 4.10 4.30 4.46 4.60 4.72 4.82}
+        40 {2.86 3.44 3.79 4.04 4.23 4.39 4.52 4.63 4.73}
+        60 {2.83 3.40 3.74 3.98 4.16 4.31 4.44 4.55 4.65}
+        120 {2.80 3.36 3.68 3.92 4.10 4.24 4.36 4.47 4.56}
+        inf {2.77 3.31 3.63 3.86 4.03 4.17 4.29 4.39 4.47}}
+
+    #alpha = 0.01
+    #k 2 3 4 5 6 7 8 9 10
+    #df
+    set tukey_table_01 {
+        1  {90.0 135 164 186 202 216 227 237 246}
+        2  {13.90 19.02 22.56 25.37 27.76 29.86 31.73 33.41 34.93}
+        3  {8.26 10.62 12.17 13.32 14.24 15.00 15.65 16.21 16.71}
+        4  {6.51 8.12 9.17 9.96 10.58 11.10 11.54 11.92 12.26}
+        5  {5.70 6.98 7.80 8.42 8.91 9.32 9.67 9.97 10.24}
+        6  {5.24 6.33 7.03 7.56 7.97 8.32 8.61 8.87 9.10}
+        7  {4.95 5.92 6.54 7.00 7.37 7.68 7.94 8.17 8.37}
+        8  {4.75 5.64 6.20 6.62 6.96 7.24 7.47 7.68 7.86}
+        9  {4.60 5.43 5.96 6.35 6.66 6.91 7.13 7.33 7.49}
+        10 {4.48 5.27 5.77 6.14 6.43 6.67 6.87 7.05 7.21}
+        11 {4.39 5.15 5.62 5.97 6.25 6.48 6.67 6.84 6.99}
+        12 {4.32 5.05 5.50 5.84 6.10 6.32 6.51 6.67 6.81}
+        13 {4.26 4.96 5.40 5.73 5.98 6.19 6.37 6.53 6.67}
+        14 {4.21 4.89 5.32 5.63 5.88 6.08 6.26 6.41 6.54}
+        15 {4.17 4.84 5.25 5.56 5.80 5.99 6.16 6.31 6.44}
+        16 {4.13 4.79 5.19 5.49 5.72 5.92 6.08 6.22 6.35}
+        17 {4.10 4.74 5.14 5.43 5.66 5.85 6.01 6.15 6.27}
+        18 {4.07 4.70 5.09 5.38 5.60 5.79 5.94 6.08 6.20}
+        19 {4.05 4.67 5.05 5.33 5.55 5.73 5.89 6.02 6.14}
+        20 {4.02 4.64 5.02 5.29 5.51 5.69 5.84 5.97 6.09}
+        24 {3.96 4.55 4.91 5.17 5.37 5.54 5.69 5.81 5.92}
+        30 {3.89 4.45 4.80 5.05 5.24 5.40 5.54 5.65 5.76}
+        40 {3.82 4.37 4.70 4.93 5.11 5.26 5.39 5.50 5.60}
+        60 {3.76 4.28 4.59 4.82 4.99 5.13 5.25 5.36 5.45}
+        120 {3.70 4.20 4.50 4.71 4.87 5.01 5.12 5.21 5.30}
+        inf {3.64 4.12 4.40 4.60 4.76 4.88 4.99 5.08 5.16}}
+
+    #From: http://davidmlane.com/hyperstat/table_Dunnett.html
+    #Dunnett Table
+    #Number of Groups Including Control Group
+    #dfe     alpha = 0.05
+    #         2       3       4       5       6       7       8       9       10
+    set dunnett_table_05 {
+    5        {2.57    3.03    3.29    3.48    3.62    3.73    3.82    3.9     3.97}
+    6        {2.45    2.86    3.1     3.26    3.39    3.49    3.57    3.64    3.71}
+    7        {2.36    2.75    2.97    3.12    3.24    3.33    3.41    3.47    3.53}
+    8        {2.31    2.67    2.88    3.02    3.13    3.22    3.29    3.35    3.41}
+    9        {2.26    2.61    2.81    2.95    3.05    3.14    3.2     3.26    3.32}
+    10       {2.23    2.57    2.76    2.89    2.99    3.07    3.14    3.19    3.24}
+    11       {2.2     2.53    2.72    2.84    2.94    3.02    3.08    3.14    3.19}
+    12       {2.18    2.5     2.68    2.81    2.9     2.98    3.04    3.09    3.14}
+    13       {2.16    2.48    2.65    2.78    2.87    2.94    3       3.06    3.1}
+    14       {2.14    2.46    2.63    2.75    2.84    2.91    2.97    3.02    3.07}
+    15       {2.13    2.44    2.61    2.73    2.82    2.89    2.95    3       3.04}
+    16       {2.12    2.42    2.59    2.71    2.8     2.87    2.92    2.97    3.02}
+    17       {2.11    2.41    2.58    2.69    2.78    2.85    2.9     2.95    3}
+    18       {2.1     2.4     2.56    2.68    2.76    2.83    2.89    2.94    2.98}
+    19       {2.09    2.39    2.55    2.66    2.75    2.81    2.87    2.92    2.96}
+    20       {2.09    2.38    2.54    2.65    2.73    2.8     2.86    2.9     2.95}
+    24       {2.06    2.35    2.51    2.61    2.7     2.76    2.81    2.86    2.9}
+    30       {2.04    2.32    2.47    2.58    2.66    2.72    2.77    2.82    2.86}
+    40       {2.02    2.29    2.44    2.54    2.62    2.68    2.73    2.77    2.81}
+    60       {2       2.27    2.41    2.51    2.58    2.64    2.69    2.73    2.77}}
+
+    set dunnett_table_01 {
+    5        {4.03    4.63    4.98    5.22    5.41    5.56    5.69    5.8     5.89}
+    6        {3.71    4.21    4.51    4.71    4.87    5       5.1     5.2     5.28}
+    7        {3.5     3.95    4.21    4.39    4.53    4.64    4.74    4.82    4.89}
+    8        {3.36    3.77    4       4.17    4.29    4.4     4.48    4.56    4.62}
+    9        {3.25    3.63    3.85    4.01    4.12    4.22    4.3     4.37    4.43}
+    10       {3.17    3.53    3.74    3.88    3.99    4.08    4.16    4.22    4.28}
+    11       {3.11    3.45    3.65    3.79    3.89    3.98    4.05    4.11    4.16}
+    12       {3.05    3.39    3.58    3.71    3.81    3.89    3.96    4.02    4.07}
+    13       {3.01    3.33    3.52    3.65    3.74    3.82    3.89    3.94    3.99}
+    14       {2.98    3.29    3.47    3.59    3.69    3.76    3.83    3.88    3.93}
+    15       {2.95    3.25    3.43    3.55    3.64    3.71    3.78    3.83    3.88}
+    16       {2.92    3.22    3.39    3.51    3.6     3.67    3.73    3.78    3.83}
+    17       {2.9     3.19    3.36    3.47    3.56    3.63    3.69    3.74    3.79}
+    18       {2.88    3.17    3.33    3.44    3.53    3.6     3.66    3.71    3.75}
+    19       {2.86    3.15    3.31    3.42    3.5     3.57    3.63    3.68    3.72}
+    20       {2.85    3.13    3.29    3.4     3.48    3.55    3.6     3.65    3.69}
+    24       {2.8     3.07    3.22    3.32    3.4     3.47    3.52    3.57    3.61}
+    30       {2.75    3.01    3.15    3.25    3.33    3.39    3.44    3.49    3.52}
+    40       {2.7     2.95    3.09    3.19    3.26    3.32    3.37    3.41    3.44}
+    60       {2.66    2.9     3.03    3.12    3.19    3.25    3.29    3.33    3.37}}
+
+}
+
+#
+# Simple test code
+#
+if { [info exists ::argv0] && ([file tail [info script]] == [file tail $::argv0]) } {
+
+    console show
+    puts [interp aliases]
+
+    set values {1 1 1 1 {}}
+    puts [::math::statistics::basic-stats $values]
+    set values {1 2 3 4}
+    puts [::math::statistics::basic-stats $values]
+    set values {1 -1 1 -2}
+    puts [::math::statistics::basic-stats $values]
+    puts [::math::statistics::mean   $values]
+    puts [::math::statistics::min    $values]
+    puts [::math::statistics::max    $values]
+    puts [::math::statistics::number $values]
+    puts [::math::statistics::stdev  $values]
+    puts [::math::statistics::var    $values]
+
+    set novals 100
+    #set maxvals 100001
+    set maxvals 1001
+    while { $novals < $maxvals } {
+	set values {}
+	for { set i 0 } { $i < $novals } { incr i } {
+	    lappend values [expr {rand()}]
+	}
+	puts [::math::statistics::basic-stats $values]
+	puts [::math::statistics::histogram {0.0 0.2 0.4 0.6 0.8 1.0} $values]
+	set novals [expr {$novals*10}]
+    }
+
+    puts "Normal distribution:"
+    puts "X=0:  [::math::statistics::pdf-normal 0.0 1.0 0.0]"
+    puts "X=1:  [::math::statistics::pdf-normal 0.0 1.0 1.0]"
+    puts "X=-1: [::math::statistics::pdf-normal 0.0 1.0 -1.0]"
+
+    set data1 {0.0 1.0 3.0 4.0 100.0 -23.0}
+    set data2 {1.0 2.0 4.0 5.0 101.0 -22.0}
+    set data3 {0.0 2.0 6.0 8.0 200.0 -46.0}
+    set data4 {2.0 6.0 8.0 200.0 -46.0 1.0}
+    set data5 {100.0 99.0 90.0 93.0 5.0 123.0}
+    puts "Correlation data1 and data1: [::math::statistics::corr $data1 $data1]"
+    puts "Correlation data1 and data2: [::math::statistics::corr $data1 $data2]"
+    puts "Correlation data1 and data3: [::math::statistics::corr $data1 $data3]"
+    puts "Correlation data1 and data4: [::math::statistics::corr $data1 $data4]"
+    puts "Correlation data1 and data5: [::math::statistics::corr $data1 $data5]"
+
+    #   set data {1.0 2.0 2.3 4.0 3.4 1.2 0.6 5.6}
+    #   puts [::math::statistics::basicStats $data]
+    #   puts [::math::statistics::interval-mean-stdev $data 0.90]
+    #   puts [::math::statistics::interval-mean-stdev $data 0.95]
+    #   puts [::math::statistics::interval-mean-stdev $data 0.99]
+
+    #   puts "\nTest mean values:"
+    #   puts [::math::statistics::test-mean $data 2.0 0.1 0.90]
+    #   puts [::math::statistics::test-mean $data 2.0 0.5 0.90]
+    #   puts [::math::statistics::test-mean $data 2.0 1.0 0.90]
+    #   puts [::math::statistics::test-mean $data 2.0 2.0 0.90]
+
+    set rc [catch {
+	set m [::math::statistics::mean {}]
+    } msg ] ; # {}
+    puts "Result: $rc $msg"
+
+    puts "\nTest quantiles:"
+    set data      {1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0}
+    set quantiles {0.11 0.21 0.51 0.91 0.99}
+    set limits    {2.1 4.1 6.1 8.1}
+    puts [::math::statistics::quantiles $data $quantiles]
+
+    set histogram [::math::statistics::histogram $limits $data]
+    puts [::math::statistics::quantiles $limits $histogram $quantiles]
+
+    puts "\nTest autocorrelation:"
+    set data      {1.0 -1.0 1.0 -1.0 1.0 -1.0 1.0 -1.0 1.0}
+    puts [::math::statistics::autocorr $data]
+    set data      {1.0 -1.1 2.0 -0.6 3.0 -4.0 0.5 0.9 -1.0}
+    puts [::math::statistics::autocorr $data]
+
+    puts "\nTest histogram limits:"
+    puts [::math::statistics::mean-histogram-limits   1.0 1.0]
+    puts [::math::statistics::mean-histogram-limits   1.0 1.0 4]
+    puts [::math::statistics::minmax-histogram-limits 1.0 10.0 10]
+
+}
+
+#
+# Test xbar/R-chart procedures
+#
+if { 0 } {
+    set data {}
+    for { set i 0 } { $i < 500 } { incr i } {
+        lappend data [expr {rand()}]
+    }
+    set limits [::math::statistics::control-xbar $data]
+    puts $limits
+
+    puts "Outliers? [::math::statistics::test-xbar $limits $data]"
+
+    set newdata {1.0 1.0 1.0 1.0 0.5 0.5 0.5 0.5 10.0 10.0 10.0 10.0}
+    puts "Outliers? [::math::statistics::test-xbar $limits $newdata] -- 0 2"
+
+    set limits [::math::statistics::control-Rchart $data]
+    puts $limits
+
+    puts "Outliers? [::math::statistics::test-Rchart $limits $data]"
+
+    set newdata {0.0 1.0 2.0 1.0 0.4 0.5 0.6 0.5 10.0  0.0 10.0 10.0}
+    puts "Outliers? [::math::statistics::test-Rchart $limits $newdata] -- 0 2"
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/symdiff.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/symdiff.tcl
new file mode 100644
index 00000000..add21a24
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/symdiff.tcl
@@ -0,0 +1,1229 @@
+# symdiff.tcl --
+#
+#       Symbolic differentiation package for Tcl
+#
+# This package implements a command, "math::calculus::symdiff::symdiff",
+# which accepts a Tcl expression and a variable name, and if the expression
+# is readily differentiable, returns a Tcl expression that evaluates the
+# derivative.
+#
+# Copyright (c) 2005, 2010 by Kevin B. Kenny.  All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: symdiff.tcl,v 1.2 2011/01/13 02:49:53 andreas_kupries Exp $
+
+
+# This package requires the 'tclparser' from http://tclpro.sf.net/
+# to analyze the expressions presented to it.
+
+package require Tcl 8.4
+package require grammar::aycock 1.0
+package provide math::calculus::symdiff 1.0.1
+
+namespace eval math {}
+namespace eval math::calculus {}
+namespace eval math::calculus::symdiff {
+    namespace export jacobian symdiff
+    namespace eval differentiate {}
+}
+
+# math::calculus::symdiff::jacobian --
+#
+#	Differentiate a set of expressions with respect to a set of
+#	model variables
+#
+# Parameters:
+#	model -- A list of alternating {variable name} {expr}
+#
+# Results:
+#	Returns a list of lists.  The ith sublist is the gradient vector
+#	of the ith expr in the model; that is, the jth element of
+#	the ith sublist is the derivative of the ith expr with respect
+#	to the jth variable.
+#
+#	Returns an error if any expression cannot be differentiated with
+#	respect to any of the elements of the list, or if the list has
+#	no elements or an odd number of elements.
+
+proc math::calculus::symdiff::jacobian {list} {
+    set l [llength $list]
+    if {$l == 0 || $l%2 != 0} {
+	return -code error "list of variables and expressions must have an odd number of elements"
+    }
+    set J {}
+    foreach {- expr} $list {
+	set gradient {}
+	foreach {var -} $list {
+	    lappend gradient [symdiff $expr $var]
+	}
+	lappend J $gradient
+    }
+    return $J
+}
+
+# math::calculus::symdiff::symdiff --
+#
+#       Differentiate an expression with respect to a variable.
+#
+# Parameters:
+#       expr -- expression to differentiate (Must be a Tcl expression,
+#               without command substitution.)
+#       var -- Name of the variable to differentiate the expression
+#              with respect to.
+#
+# Results:
+#       Returns a Tcl expression that evaluates the derivative.
+
+proc math::calculus::symdiff::symdiff {expr var} {
+    variable parser
+    set parsetree [$parser parse {*}[Lexer $expr] [namespace current]]
+    return [ToInfix [differentiate::MakeDeriv $parsetree $var]]
+}
+
+# math::calculus::symdiff::Parser --
+#
+#	Parser for the mathematical expressions that this package can
+#	differentiate.
+
+namespace eval math::calculus::symdiff {
+    variable parser [grammar::aycock::parser {
+	expression ::= expression addop term {
+	    set result [${clientData}::MakeOperator [lindex $_ 1]]
+	    lappend result [lindex $_ 0] [lindex $_ 2]
+	}
+	expression ::= term {
+	    lindex $_ 0
+	}
+
+	addop ::= + {
+	    lindex $_ 0
+	}
+	addop ::= - {
+	    lindex $_ 0
+	}
+
+	term ::= term mulop factor {
+	    set result [${clientData}::MakeOperator [lindex $_ 1]]
+	    lappend result [lindex $_ 0] [lindex $_ 2]
+	}
+	term ::= factor {
+	    lindex $_ 0
+	}
+	mulop ::= * {
+	    lindex $_ 0
+	}
+	mulop ::= / {
+	    lindex $_ 0
+	}
+
+	factor ::= addop factor {
+	    set result [${clientData}::MakeOperator [lindex $_ 0]]
+	    lappend result [lindex $_ 1]
+	}
+	factor ::= expon {
+	    lindex $_ 0
+	}
+
+	expon ::= primary ** expon {
+	    set result [${clientData}::MakeOperator [lindex $_ 1]]
+	    lappend result [lindex $_ 0] [lindex $_ 2]
+	}
+	expon ::= primary {
+	    lindex $_ 0
+	}
+
+	primary ::= {$} bareword {
+	    ${clientData}::MakeVariable [lindex $_ 1]
+	}
+	primary ::= number {
+	    ${clientData}::MakeConstant [lindex $_ 0]
+	}
+	primary ::= bareword ( arglist ) {
+	    set result [${clientData}::MakeOperator [lindex $_ 0]]
+	    lappend result {*}[lindex $_ 2]
+	}
+	primary ::= ( expression ) {
+	    lindex $_ 1
+	}
+
+	arglist ::= expression {
+	    set _
+	}
+	arglist ::= arglist , expression {
+	    linsert [lindex $_ 0] end [lindex $_ 2]
+	}
+    }]
+}
+
+# math::calculus::symdiff::Lexer --
+#
+#	Lexer for the arithmetic expressions that the 'symdiff' package
+#	can differentiate.
+#
+# Results:
+#	Returns a two element list. The first element is a list of the
+#	lexical values of the tokens that were found in the expression;
+#	the second is a list of the semantic values of the tokens. The
+#	two sublists are the same length.
+
+proc math::calculus::symdiff::Lexer {expression} {
+    set start 0
+    set tokens {}
+    set values {}
+    while {$expression ne {}} {
+	if {[regexp {^\*\*(.*)} $expression -> rest]} {
+
+	    # Exponentiation
+
+	    lappend tokens **
+	    lappend values **
+	} elseif {[regexp {^([-+/*$(),])(.*)} $expression -> token rest]} {
+
+	    # Single-character operators
+
+	    lappend tokens $token
+	    lappend values $token
+	} elseif {[regexp {^([[:alpha:]][[:alnum:]_]*)(.*)} \
+		       $expression -> token rest]} {
+
+	    # Variable and function names
+
+	    lappend tokens bareword
+	    lappend values $token
+	} elseif {[regexp -nocase -expanded {
+	    ^((?:
+	       (?: [[:digit:]]+ (?:[.][[:digit:]]*)? )
+	       | (?: [.][[:digit:]]+ ) )
+	      (?: e [-+]? [[:digit:]]+ )? )
+	    (.*)
+	}\
+		       $expression -> token rest]} {
+
+	    # Numbers
+
+	    lappend tokens number
+	    lappend values $token
+	} elseif {[regexp {^[[:space:]]+(.*)} $expression -> rest]} {
+
+	    # Whitespace
+
+	} else {
+
+	    # Anything else is an error
+
+	    return -code error \
+		-errorcode [list MATH SYMDIFF INVCHAR \
+				[string index $expression 0]] \
+		[list invalid character [string index $expression 0]] \
+	}
+	set expression $rest
+    }
+    return [list $tokens $values]
+}
+
+# math::calculus::symdiff::ToInfix --
+#
+#       Converts a parse tree to infix notation.
+#
+# Parameters:
+#       tree - Parse tree to convert
+#
+# Results:
+#       Returns the parse tree as a Tcl expression.
+
+proc math::calculus::symdiff::ToInfix {tree} {
+    set a [lindex $tree 0]
+    set kind [lindex $a 0]
+    switch -exact $kind {
+        constant -
+        text {
+            set result [lindex $tree 1]
+        }
+        var {
+            set result \$[lindex $tree 1]
+        }
+        operator {
+            set name [lindex $a 1]
+            if {([string is alnum $name] && $name ne {eq} && $name ne {ne})
+                || [llength $tree] == 2} {
+                set result $name
+                append result \(
+                set sep ""
+                foreach arg [lrange $tree 1 end] {
+                    append result $sep [ToInfix $arg]
+                    set sep ", "
+                }
+                append result \)
+            } elseif {[llength $tree] == 3} {
+                set result \(
+                append result [ToInfix [lindex $tree 1]]
+                append result " " $name " "
+                append result [ToInfix [lindex $tree 2]]
+                append result \)
+            } else {
+                error "symdiff encountered a malformed parse, can't happen"
+            }
+        }
+        default {
+            error "symdiff can't synthesize a $kind expression"
+        }
+    }
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::MakeDeriv --
+#
+#       Differentiates a Tcl expression represented as a parse tree.
+#
+# Parameters:
+#       tree -- Parse tree from MakeParseTreeForExpr
+#       var -- Variable to differentiate with respect to
+#
+# Results:
+#       Returns the parse tree of the derivative.
+
+proc math::calculus::symdiff::differentiate::MakeDeriv {tree var} {
+    return [eval [linsert $tree 1 $var]]
+}
+
+# math::calculus::symdiff::differentiate::ChainRule --
+#
+#       Applies the Chain Rule to evaluate the derivative of a unary
+#       function.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       derivMaker -- Command prefix for differentiating the function.
+#       u -- Function argument.
+#
+# Results:
+#       Returns a parse tree representing the derivative of f($u).
+#
+# ChainRule differentiates $u with respect to $var by calling MakeDeriv,
+# makes the derivative of f($u) with respect to $u by calling derivMaker
+# passing $u as a parameter, and then returns a parse tree representing
+# the product of the results.
+
+proc math::calculus::symdiff::differentiate::ChainRule {var derivMaker u} {
+    lappend derivMaker $u
+    set result [MakeProd [MakeDeriv $u $var] [eval $derivMaker]]
+}
+
+# math::calculus::symdiff::differentiate::constant --
+#
+#       Differentiate a constant.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to - unused
+#       constant -- Constant expression to differentiate - ignored
+#
+# Results:
+#       Returns a parse tree of the derivative, which is, of course, the
+#       constant zero.
+
+proc math::calculus::symdiff::differentiate::constant {var constant} {
+    return [MakeConstant 0.0]
+}
+
+# math::calculus::symdiff::differentiate::var --
+#
+#       Differentiate a variable expression.
+#
+# Parameters:
+#       var - Variable with which to differentiate.
+#       exprVar - Expression being differentiated, which is a single
+#                 variable.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# The derivative is the constant unity if the variables are the same
+# and the constant zero if they are different.
+
+proc math::calculus::symdiff::differentiate::var {var exprVar} {
+    if {$exprVar eq $var} {
+        return [MakeConstant 1.0]
+    } else {
+        return [MakeConstant 0.0]
+    }
+}
+
+# math::calculus::symdiff::differentiate::operator + --
+#
+#       Forms the derivative of a sum.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       args -- One or two arguments giving augend and addend. If only
+#               one argument is supplied, this is unary +.
+#
+# Results:
+#       Returns a parse tree representing the derivative.
+#
+# Of course, the derivative of a sum is the sum of the derivatives.
+
+proc {math::calculus::symdiff::differentiate::operator +} {var args} {
+    if {[llength $args] == 1} {
+        set u [lindex $args 0]
+        set result [eval [linsert $u 1 $var]]
+    } elseif {[llength $args] == 2} {
+        foreach {u v} $args break
+        set du [eval [linsert $u 1 $var]]
+        set dv [eval [linsert $v 1 $var]]
+        set result [MakeSum $du $dv]
+    } else {
+        error "symdiff encountered a malformed parse, can't happen"
+    }
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::operator - --
+#
+#       Forms the derivative of a difference.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       args -- One or two arguments giving minuend and subtrahend. If only
+#               one argument is supplied, this is unary -.
+#
+# Results:
+#       Returns a parse tree representing the derivative.
+#
+# Of course, the derivative of a sum is the sum of the derivatives.
+
+proc {math::calculus::symdiff::differentiate::operator -} {var args} {
+    if {[llength $args] == 1} {
+        set u [lindex $args 0]
+        set du [eval [linsert $u 1 $var]]
+        set result [MakeUnaryMinus $du]
+    } elseif {[llength $args] == 2} {
+        foreach {u v} $args break
+        set du [eval [linsert $u 1 $var]]
+        set dv [eval [linsert $v 1 $var]]
+        set result [MakeDifference $du $dv]
+    } else {
+        error "symdiff encounered a malformed parse, can't happen"
+    }
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::operator * --
+#
+#       Forms the derivative of a product.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u, v -- Multiplicand and multiplier.
+#
+# Results:
+#       Returns a parse tree representing the derivative.
+#
+# The familiar freshman calculus product rule.
+
+proc {math::calculus::symdiff::differentiate::operator *} {var u v} {
+    set du [eval [linsert $u 1 $var]]
+    set dv [eval [linsert $v 1 $var]]
+    set result [MakeSum [MakeProd $dv $u] [MakeProd $du $v]]
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::operator / --
+#
+#       Forms the derivative of a quotient.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u, v -- Dividend and divisor.
+#
+# Results:
+#       Returns a parse tree representing the derivative.
+#
+# The familiar freshman calculus quotient rule.
+
+proc {math::calculus::symdiff::differentiate::operator /} {var u v} {
+    set du [eval [linsert $u 1 $var]]
+    set dv [eval [linsert $v 1 $var]]
+    set result [MakeQuotient \
+                    [MakeDifference \
+                         $du \
+                         [MakeQuotient \
+                              [MakeProd $dv $u] \
+                              $v]] \
+                    $v]
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::operator acos --
+#
+#       Differentiates the 'acos' function.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u -- Argument to the acos() function.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# Applies the Chain Rule: D(acos(u))=-D(u)/sqrt(1 - u*u)
+# (Might it be better to factor 1-u*u into (1+u)(1-u)? Less likely to be
+# catastrophic cancellation if u is near 1?)
+
+proc {math::calculus::symdiff::differentiate::operator acos} {var u} {
+    set du [eval [linsert $u 1 $var]]
+    set result [MakeQuotient [MakeUnaryMinus $du] \
+                    [MakeFunCall sqrt \
+                         [MakeDifference [MakeConstant 1.0] \
+                              [MakeProd $u $u]]]]
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::operator asin --
+#
+#       Differentiates the 'asin' function.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u -- Argument to the asin() function.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# Applies the Chain Rule: D(asin(u))=D(u)/sqrt(1 - u*u)
+# (Might it be better to factor 1-u*u into (1+u)(1-u)? Less likely to be
+# catastrophic cancellation if u is near 1?)
+
+proc {math::calculus::symdiff::differentiate::operator asin} {var u} {
+    set du [eval [linsert $u 1 $var]]
+    set result [MakeQuotient $du \
+                    [MakeFunCall sqrt \
+                         [MakeDifference [MakeConstant 1.0] \
+                              [MakeProd $u $u]]]]
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::operator atan --
+#
+#       Differentiates the 'atan' function.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u -- Argument to the atan() function.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# Applies the Chain Rule: D(atan(u))=D(u)/(1 + $u*$u)
+
+proc {math::calculus::symdiff::differentiate::operator atan} {var u} {
+    set du [eval [linsert $u 1 $var]]
+    set result [MakeQuotient $du \
+                    [MakeSum [MakeConstant 1.0] \
+                         [MakeProd $u $u]]]
+}
+
+# math::calculus::symdiff::differentiate::operator atan2 --
+#
+#       Differentiates the 'atan2' function.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       f, g -- Arguments to the atan() function.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# Applies the Chain and Quotient Rules:
+#       D(atan2(f, g)) = (D(f)*g - D(g)*f)/(f*f + g*g)
+
+proc {math::calculus::symdiff::differentiate::operator atan2} {var f g} {
+    set df [eval [linsert $f 1 $var]]
+    set dg [eval [linsert $g 1 $var]]
+    return [MakeQuotient \
+                [MakeDifference \
+                     [MakeProd $df $g] \
+                     [MakeProd $f $dg]] \
+                [MakeSum \
+                     [MakeProd $f $f] \
+                     [MakeProd $g $g]]]
+}
+
+# math::calculus::symdiff::differentiate::operator cos --
+#
+#       Differentiates the 'cos' function.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u -- Argument to the cos() function.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# Applies the Chain Rule: D(cos(u))=-sin(u)*D(u)
+
+proc {math::calculus::symdiff::differentiate::operator cos} {var u} {
+    return [ChainRule $var MakeMinusSin $u]
+}
+proc math::calculus::symdiff::differentiate::MakeMinusSin {operand} {
+    return [MakeUnaryMinus [MakeFunCall sin $operand]]
+}
+
+# math::calculus::symdiff::differentiate::operator cosh --
+#
+#       Differentiates the 'cosh' function.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u -- Argument to the cosh() function.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# Applies the Chain Rule: D(cosh(u))=sinh(u)*D(u)
+
+proc {math::calculus::symdiff::differentiate::operator cosh} {var u} {
+    set result [ChainRule $var [list MakeFunCall sinh] $u]
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::operator exp --
+#
+#       Differentiate the exponential function
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u -- Argument of the exponential function.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# Uses the Chain Rule D(exp(u)) = exp(u)*D(u).
+
+proc {math::calculus::symdiff::differentiate::operator exp} {var u} {
+    set result [ChainRule $var [list MakeFunCall exp] $u]
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::operator hypot --
+#
+#       Differentiate the 'hypot' function
+#
+# Parameters:
+#       var - Variable to differentiate with respect to.
+#       f, g - Arguments to the 'hypot' function
+#
+# Results:
+#       Returns a parse tree of the derivative
+#
+# Uses a number of algebraic simplifications to arrive at:
+#       D(hypot(f,g)) = (f*D(f)+g*D(g))/hypot(f,g)
+
+proc {math::calculus::symdiff::differentiate::operator hypot} {var f g} {
+    set df [eval [linsert $f 1 $var]]
+    set dg [eval [linsert $g 1 $var]]
+    return [MakeQuotient \
+                [MakeSum \
+                     [MakeProd $df $f] \
+                     [MakeProd $dg $g]] \
+                [MakeFunCall hypot $f $g]]
+}
+
+# math::calculus::symdiff::differentiate::operator log --
+#
+#       Differentiates a logarithm.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u -- Argument to the log() function.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# D(log(u))==D(u)/u
+
+proc {math::calculus::symdiff::differentiate::operator log} {var u} {
+    set du [eval [linsert $u 1 $var]]
+    set result [MakeQuotient $du $u]
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::operator log10 --
+#
+#       Differentiates a common logarithm.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u -- Argument to the log10() function.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# D(log(u))==D(u)/(u * log(10))
+
+proc {math::calculus::symdiff::differentiate::operator log10} {var u} {
+    set du [eval [linsert $u 1 $var]]
+    set result [MakeQuotient $du \
+                    [MakeProd [MakeConstant [expr log(10.)]] $u]]
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::operator ** --
+#
+#       Differentiate an exponential.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to
+#       f, g -- Base and exponent
+#
+# Results:
+#       Returns the parse tree of the derivative.
+#
+# Handles the special case where g is constant as
+#    D(f**g) == g*f**(g-1)*D(f)
+# Otherwise, uses the general power formula
+#    D(f**g) == (f**g) * (((D(f)*g)/f) + (D(g)*log(f)))
+
+proc {math::calculus::symdiff::differentiate::operator **} {var f g} {
+    set df [eval [linsert $f 1 $var]]
+    if {[IsConstant $g]} {
+        set gm1 [MakeConstant [expr {[ConstantValue $g] - 1}]]
+        set result [MakeProd $df [MakeProd $g [MakePower $f $gm1]]]
+
+    } else {
+        set dg [eval [linsert $g 1 $var]]
+        set result [MakeProd [MakePower $f $g] \
+                        [MakeSum \
+                             [MakeQuotient [MakeProd $df $g] $f] \
+                             [MakeProd $dg [MakeFunCall log $f]]]]
+    }
+    return $result
+}
+interp alias {} {math::calculus::symdiff::differentiate::operator pow} \
+    {} {math::calculus::symdiff::differentiate::operator **}
+
+# math::calculus::symdiff::differentiate::operator sin --
+#
+#       Differentiates the 'sin' function.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u -- Argument to the sin() function.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# Applies the Chain Rule: D(sin(u))=cos(u)*D(u)
+
+proc {math::calculus::symdiff::differentiate::operator sin} {var u} {
+    set result [ChainRule $var [list MakeFunCall cos] $u]
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::operator sinh --
+#
+#       Differentiates the 'sinh' function.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u -- Argument to the sinh() function.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# Applies the Chain Rule: D(sin(u))=cosh(u)*D(u)
+
+proc {math::calculus::symdiff::differentiate::operator sinh} {var u} {
+    set result [ChainRule $var [list MakeFunCall cosh] $u]
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::operator sqrt --
+#
+#       Differentiate the 'sqrt' function.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to
+#       u -- Parameter of 'sqrt' as a parse tree.
+#
+# Results:
+#       Returns a parse tree representing the derivative.
+#
+# D(sqrt(u))==D(u)/(2*sqrt(u))
+
+proc {math::calculus::symdiff::differentiate::operator sqrt} {var u} {
+    set du [eval [linsert $u 1 $var]]
+    set result [MakeQuotient $du [MakeProd [MakeConstant 2.0] \
+                                      [MakeFunCall sqrt $u]]]
+    return $result
+}
+
+# math::calculus::symdiff::differentiate::operator tan --
+#
+#       Differentiates the 'tan' function.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u -- Argument to the tan() function.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# Applies the Chain Rule: D(tan(u))=D(u)/(cos(u)*cos(u))
+
+proc {math::calculus::symdiff::differentiate::operator tan} {var u} {
+    set du [eval [linsert $u 1 $var]]
+    set cosu [MakeFunCall cos $u]
+    return [MakeQuotient $du [MakeProd $cosu $cosu]]
+}
+
+# math::calculus::symdiff::differentiate::operator tanh --
+#
+#       Differentiates the 'tanh' function.
+#
+# Parameters:
+#       var -- Variable to differentiate with respect to.
+#       u -- Argument to the tanh() function.
+#
+# Results:
+#       Returns a parse tree of the derivative.
+#
+# Applies the Chain Rule: D(tanh(u))=D(u)/(cosh(u)*cosh(u))
+
+proc {math::calculus::symdiff::differentiate::operator tanh} {var u} {
+    set du [eval [linsert $u 1 $var]]
+    set coshu [MakeFunCall cosh $u]
+    return [MakeQuotient $du [MakeProd $coshu $coshu]]
+}
+
+# math::calculus::symdiff::MakeFunCall --
+#
+#       Makes a parse tree for a function call
+#
+# Parameters:
+#       fun -- Name of the function to call
+#       args -- Arguments to the function, expressed as parse trees
+#
+# Results:
+#       Returns a parse tree for the result of calling the function.
+#
+# Performs the peephole optimization of replacing a function with
+# constant parameters with its value.
+
+proc math::calculus::symdiff::MakeFunCall {fun args} {
+    set constant 1
+    set exp $fun
+    append exp \(
+    set sep ""
+    foreach a $args {
+        if {[IsConstant $a]} {
+            append exp $sep [ConstantValue $a]
+            set sep ","
+        } else {
+            set constant 0
+            break
+        }
+    }
+    if {$constant} {
+        append exp \)
+        return [MakeConstant [expr $exp]]
+    }
+    set result [MakeOperator $fun]
+    foreach arg $args {
+        lappend result $arg
+    }
+    return $result
+}
+
+# math::calculus::symdiff::MakeSum --
+#
+#       Makes the parse tree for a sum.
+#
+# Parameters:
+#       left, right -- Parse trees for augend and addend
+#
+# Results:
+#       Returns the parse tree for the sum.
+#
+# Performs the following peephole optimizations:
+# (1) a + (-b) = a - b
+# (2) (-a) + b = b - a
+# (3) 0 + a = a
+# (4) a + 0 = a
+# (5) The sum of two constants may be reduced to a constant
+
+proc math::calculus::symdiff::MakeSum {left right} {
+    if {[IsUnaryMinus $right]} {
+        return [MakeDifference $left [UnaryMinusArg $right]]
+    }
+    if {[IsUnaryMinus $left]} {
+        return [MakeDifference $right [UnaryMinusArg $left]]
+    }
+    if {[IsConstant $left]} {
+        set v [ConstantValue $left]
+        if {$v == 0} {
+            return $right
+        } elseif {[IsConstant $right]} {
+            return [MakeConstant [expr {[ConstantValue $left]
+                                        + [ConstantValue $right]}]]
+        }
+    } elseif {[IsConstant $right]} {
+        set v [ConstantValue $right]
+        if {$v == 0} {
+            return $left
+        }
+    }
+    set result [MakeOperator +]
+    lappend result $left $right
+    return $result
+}
+
+# math::calculus::symdiff::MakeDifference --
+#
+#       Makes the parse tree for a difference
+#
+# Parameters:
+#       left, right -- Minuend and subtrahend, expressed as parse trees
+#
+# Results:
+#       Returns a parse tree expressing the difference
+#
+# Performs the following peephole optimizations:
+# (1) a - (-b) = a + b
+# (2) -a - b = -(a + b)
+# (3) 0 - b = -b
+# (4) a - 0 = a
+# (5) The difference of any two constants can be reduced to a constant.
+
+proc math::calculus::symdiff::MakeDifference {left right} {
+    if {[IsUnaryMinus $right]} {
+        return [MakeSum $left [UnaryMinusArg $right]]
+    }
+    if {[IsUnaryMinus $left]} {
+        return [MakeUnaryMinus [MakeSum [UnaryMinusArg $left] $right]]
+    }
+    if {[IsConstant $left]} {
+        set v [ConstantValue $left]
+        if {$v == 0} {
+            return [MakeUnaryMinus $right]
+        } elseif {[IsConstant $right]} {
+            return [MakeConstant [expr {[ConstantValue $left]
+                                        - [ConstantValue $right]}]]
+        }
+    } elseif {[IsConstant $right]} {
+        set v [ConstantValue $right]
+        if {$v == 0} {
+            return $left
+        }
+    }
+    set result [MakeOperator -]
+    lappend result $left $right
+    return $result
+}
+
+# math::calculus::symdiff::MakeProd --
+#
+#       Constructs the parse tree for a product, left*right.
+#
+# Parameters:
+#       left, right - Multiplicand and multiplier
+#
+# Results:
+#       Returns the parse tree for the result.
+#
+# Performs the following peephole optimizations.
+# (1) If either operand is a unary minus, it is hoisted out of the
+#     expression.
+# (2) If either operand is the constant 0, the result is the constant 0
+# (3) If either operand is the constant 1, the result is the other operand.
+# (4) If either operand is the constant -1, the result is unary minus
+#     applied to the other operand
+# (5) If both operands are constant, the result is a constant containing
+#     their product.
+
+proc math::calculus::symdiff::MakeProd {left right} {
+    if {[IsUnaryMinus $left]} {
+        return [MakeUnaryMinus [MakeProd [UnaryMinusArg $left] $right]]
+    }
+    if {[IsUnaryMinus $right]} {
+        return [MakeUnaryMinus [MakeProd $left [UnaryMinusArg $right]]]
+    }
+    if {[IsConstant $left]} {
+        set v [ConstantValue $left]
+        if {$v == 0} {
+            return [MakeConstant 0.0]
+        } elseif {$v == 1} {
+            return $right
+        } elseif {$v == -1} {
+            return [MakeUnaryMinus $right]
+        } elseif {[IsConstant $right]} {
+            return [MakeConstant [expr {[ConstantValue $left]
+                                        * [ConstantValue $right]}]]
+        }
+    } elseif {[IsConstant $right]} {
+        set v [ConstantValue $right]
+        if {$v == 0} {
+            return [MakeConstant 0.0]
+        } elseif {$v == 1} {
+            return $left
+        } elseif {$v == -1} {
+            return [MakeUnaryMinus $left]
+        }
+    }
+    set result [MakeOperator *]
+    lappend result $left $right
+    return $result
+}
+
+# math::calculus::symdiff::MakeQuotient --
+#
+#       Makes a parse tree for a quotient, n/d
+#
+# Parameters:
+#       n, d - Parse trees for numerator and denominator
+#
+# Results:
+#       Returns the parse tree for the quotient.
+#
+# Performs peephole optimizations:
+# (1) If either operand is a unary minus, it is hoisted out.
+# (2) If the numerator is the constant 0, the result is the constant 0.
+# (3) If the demominator is the constant 1, the result is the numerator
+# (4) If the denominator is the constant -1, the result is the unary
+#     negation of the numerator.
+# (5) If both numerator and denominator are constant, the result is
+#     a constant representing their quotient.
+
+proc math::calculus::symdiff::MakeQuotient {n d} {
+    if {[IsUnaryMinus $n]} {
+        return [MakeUnaryMinus [MakeQuotient [UnaryMinusArg $n] $d]]
+    }
+    if {[IsUnaryMinus $d]} {
+        return [MakeUnaryMinus [MakeQuotient $n [UnaryMinusArg $d]]]
+    }
+    if {[IsConstant $n]} {
+        set v [ConstantValue $n]
+        if {$v == 0} {
+            return [MakeConstant 0.0]
+        } elseif {[IsConstant $d]} {
+            return [MakeConstant [expr {[ConstantValue $n]
+                                        * [ConstantValue $d]}]]
+        }
+    } elseif {[IsConstant $d]} {
+        set v [ConstantValue $d]
+        if {$v == 0} {
+            return -code error "requested expression will result in division by zero at run time"
+        } elseif {$v == 1} {
+            return $n
+        } elseif {$v == -1} {
+            return [MakeUnaryMinus $n]
+        }
+    }
+    set result [MakeOperator /]
+    lappend result $n $d
+    return $result
+}
+
+# math::calculus::symdiff::MakePower --
+#
+#       Make a parse tree for an exponentiation operation
+#
+# Parameters:
+#       a -- Base, expressed as a parse tree
+#       b -- Exponent, expressed as a parse tree
+#
+# Results:
+#       Returns a parse tree for the expression
+#
+# Performs peephole optimizations:
+# (1) The constant zero raised to any non-zero power is 0
+# (2) The constant 1 raised to any power is 1
+# (3) Any non-zero quantity raised to the zero power is 1
+# (4) Any non-zero quantity raised to the first power is the base itself.
+# (5) MakeFunCall will optimize any other case of a constant raised
+#     to a constant power.
+
+proc math::calculus::symdiff::MakePower {a b} {
+    if {[IsConstant $a]} {
+        if {[ConstantValue $a] == 0} {
+            if {[IsConstant $b] && [ConstantValue $b] == 0} {
+                error "requested expression will result in zero to zero power at run time"
+            }
+            return [MakeConstant 0.0]
+        } elseif {[ConstantValue $a] == 1} {
+            return [MakeConstant 1.0]
+        }
+    }
+    if {[IsConstant $b]} {
+        if {[ConstantValue $b] == 0} {
+            return [MakeConstant 1.0]
+        } elseif {[ConstantValue $b] == 1} {
+            return $a
+        }
+    }
+    return [MakeFunCall pow $a $b]
+}
+
+# math::calculus::symdiff::MakeUnaryMinus --
+#
+#       Makes the parse tree for a unary negation.
+#
+# Parameters:
+#       operand -- Parse tree for the operand
+#
+# Results:
+#       Returns the parse tree for the expression
+#
+# Performs the following peephole optimizations:
+# (1) -(-$a) = $a
+# (2) The unary negation of a constant is another constant
+
+proc math::calculus::symdiff::MakeUnaryMinus {operand} {
+    if {[IsUnaryMinus $operand]} {
+        return [UnaryMinusArg $operand]
+    }
+    if {[IsConstant $operand]} {
+        return [MakeConstant [expr {-[ConstantValue $operand]}]]
+    } else {
+        return [list [list operator -] $operand]
+    }
+}
+
+# math::calculus::symdiff::IsUnaryMinus --
+#
+#       Determines whether a parse tree represents a unary negation
+#
+# Parameters:
+#       x - Parse tree to examine
+#
+# Results:
+#       Returns 1 if the parse tree represents a unary minus, 0 otherwise
+
+proc math::calculus::symdiff::IsUnaryMinus {x} {
+    return [expr {[llength $x] == 2
+                  && [lindex $x 0] eq [list operator -]}]
+}
+
+# math::calculus::symdiff::UnaryMinusArg --
+#
+#       Extracts the argument from a unary negation.
+#
+# Parameters:
+#       x - Parse tree to examine, known to represent a unary negation
+#
+# Results:
+#       Returns a parse tree representing the operand.
+
+proc math::calculus::symdiff::UnaryMinusArg {x} {
+    return [lindex $x 1]
+}
+
+# math::calculus::symdiff::MakeOperator --
+#
+#       Makes a partial parse tree for an operator
+#
+# Parameters:
+#       op -- Name of the operator
+#
+# Results:
+#       Returns the resulting parse tree.
+#
+# The caller may use [lappend] to place any needed operands
+
+proc math::calculus::symdiff::MakeOperator {op} {
+    if {$op eq {?}} {
+        return -code error "symdiff can't differentiate the ternary ?: operator"
+    } elseif {[namespace which [list differentiate::operator $op]] ne {}} {
+        return [list [list operator $op]]
+    } elseif {[string is alnum $op] && ($op ni {eq ne in ni})} {
+        return -code error "symdiff can't differentiate the \"$op\" function"
+    } else {
+        return -code error "symdiff can't differentiate the \"$op\" operator"
+    }
+}
+
+# math::calculus::symdiff::MakeVariable --
+#
+#       Makes a partial parse tree for a single variable
+#
+# Parameters:
+#       name -- Name of the variable
+#
+# Results:
+#       Returns a partial parse tree giving the variable
+
+proc math::calculus::symdiff::MakeVariable {name} {
+    return [list var $name]
+}
+
+# math::calculus::symdiff::MakeConstant --
+#
+#       Make the parse tree for a constant.
+#
+# Parameters:
+#       value -- The constant's value
+#
+# Results:
+#       Returns a parse tree.
+
+proc math::calculus::symdiff::MakeConstant {value} {
+    return [list constant $value]
+}
+
+# math::calculus::symdiff::IsConstant --
+#
+#       Test if an expression represented by a parse tree is a constant.
+#
+# Parameters:
+#       Item - Parse tree to test
+#
+# Results:
+#       Returns 1 for a constant, 0 for anything else
+
+proc math::calculus::symdiff::IsConstant {item} {
+    return [expr {[lindex $item 0] eq {constant}}]
+}
+
+# math::calculus::symdiff::ConstantValue --
+#
+#       Recovers a constant value from the parse tree representing a constant
+#       expression.
+#
+# Parameters:
+#       item -- Parse tree known to be a constant.
+#
+# Results:
+#       Returns the constant value.
+
+proc math::calculus::symdiff::ConstantValue {item} {
+    return [lindex $item 1]
+}
+
+# Define the parse tree fabrication routines in the 'differentiate'
+# namespace as well as the 'symdiff' namespace, without exporting them
+# from the package.
+
+interp alias {} math::calculus::symdiff::differentiate::IsConstant \
+    {} math::calculus::symdiff::IsConstant
+interp alias {} math::calculus::symdiff::differentiate::ConstantValue \
+    {} math::calculus::symdiff::ConstantValue
+interp alias {} math::calculus::symdiff::differentiate::MakeConstant \
+    {} math::calculus::symdiff::MakeConstant
+interp alias {} math::calculus::symdiff::differentiate::MakeDifference \
+    {} math::calculus::symdiff::MakeDifference
+interp alias {} math::calculus::symdiff::differentiate::MakeFunCall \
+    {} math::calculus::symdiff::MakeFunCall
+interp alias {} math::calculus::symdiff::differentiate::MakePower \
+    {} math::calculus::symdiff::MakePower
+interp alias {} math::calculus::symdiff::differentiate::MakeProd \
+    {} math::calculus::symdiff::MakeProd
+interp alias {} math::calculus::symdiff::differentiate::MakeQuotient \
+    {} math::calculus::symdiff::MakeQuotient
+interp alias {} math::calculus::symdiff::differentiate::MakeSum \
+    {} math::calculus::symdiff::MakeSum
+interp alias {} math::calculus::symdiff::differentiate::MakeUnaryMinus \
+    {} math::calculus::symdiff::MakeUnaryMinus
+interp alias {} math::calculus::symdiff::differentiate::MakeVariable \
+    {} math::calculus::symdiff::MakeVariable
+interp alias {} math::calculus::symdiff::differentiate::ExtractExpression \
+    {} math::calculus::symdiff::ExtractExpression
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/tclIndex b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/tclIndex
new file mode 100644
index 00000000..49f0bd19
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/tclIndex
@@ -0,0 +1,26 @@
+# Tcl autoload index file, version 2.0
+# This file is generated by the "auto_mkindex" command
+# and sourced to set up indexing information for one or
+# more commands.  Typically each line is a command that
+# sets an element in the auto_index array, where the
+# element name is the name of a command and the value is
+# a script that loads the command.
+
+set auto_index(::math::cov) [list source [file join $dir misc.tcl]]
+set auto_index(::math::fibonacci) [list source [file join $dir misc.tcl]]
+set auto_index(::math::integrate) [list source [file join $dir misc.tcl]]
+set auto_index(::math::max) [list source [file join $dir misc.tcl]]
+set auto_index(::math::mean) [list source [file join $dir misc.tcl]]
+set auto_index(::math::min) [list source [file join $dir misc.tcl]]
+set auto_index(::math::product) [list source [file join $dir misc.tcl]]
+set auto_index(::math::random) [list source [file join $dir misc.tcl]]
+set auto_index(::math::sigma) [list source [file join $dir misc.tcl]]
+set auto_index(::math::stats) [list source [file join $dir misc.tcl]]
+set auto_index(::math::sum) [list source [file join $dir misc.tcl]]
+set auto_index(::math::expectDouble) [list source [file join $dir misc.tcl]]
+set auto_index(::math::InitializeFactorial) [list source [file join $dir combinatorics.tcl]]
+set auto_index(::math::InitializePascal) [list source [file join $dir combinatorics.tcl]]
+set auto_index(::math::ln_Gamma) [list source [file join $dir combinatorics.tcl]]
+set auto_index(::math::factorial) [list source [file join $dir combinatorics.tcl]]
+set auto_index(::math::choose) [list source [file join $dir combinatorics.tcl]]
+set auto_index(::math::Beta) [list source [file join $dir combinatorics.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/trig.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/trig.tcl
new file mode 100644
index 00000000..a1488e7a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/trig.tcl
@@ -0,0 +1,290 @@
+# trig.tcl --
+#     Package for additional trigonometric and hyperbolic functions
+#
+#     Besides the ordinary functions that take/return angles in radians,
+#     also versions that use angles in degrees.
+#
+#     See tickets https://core.tcl-lang.org/tcllib/tktview/df3676c9821ba917c5cfda68c2ea0ad7a6947ac9
+#     and https://core.tcl-lang.org/tcllib/tktview/21fef042b91ca252fc2a20ead5cd05c2b51b1776
+#
+package provide math::trig 1.0
+
+# ::math::trig --
+#     Create the namespace
+#
+namespace eval ::math::trig {
+    namespace export radian_reduced degree_reduced \
+                     cosec sec cotan acosec asec acotan \
+                     cosech sech cotanh asinh acosh atanh acosech asech acotanh \
+                     sind cosd tand cosecd secd cotand acosecd asecd acotand
+
+    variable pi     [expr {acos(-1.0)}]
+    variable twopi  [expr {2.0 * acos(-1.0)}]
+    variable halfpi [expr {0.5 * acos(-1.0)}]
+    variable torad  [expr {acos(-1.0) / 180.0}]
+    variable todeg  [expr {180.0 / acos(-1.0)}]
+}
+
+# radian_reduced --
+#     Reduce the given value to a value in the interval [0,2pi]
+#
+# Arguments:
+#     angle      Angle in radians that should be reduced
+#
+# Note:
+#     If the angle is very large, then numerical accuracy will
+#     diminish, up to a point where the answer is meaningless.
+#     This is not (yet) taken care of.
+#
+proc ::math::trig::radian_reduced {angle} {
+    variable twopi
+
+    set n       [expr {int($angle/$twopi)}]
+    set reduced [expr {$angle - $n * $twopi}]
+    if { $reduced < 0.0 } {
+        set reduced [expr {$reduced + $twopi}]
+    }
+
+    return $reduced
+}
+
+# degree_reduced --
+#     Reduce the given value to a value in the interval [0,360]
+#
+# Arguments:
+#     angle      Angle in degrees that should be reduced
+#
+# Note:
+#     If the angle is very large, then numerical accuracy will
+#     diminish, up to a point where the answer is meaningless.
+#     This is not (yet) taken care of.
+#
+proc ::math::trig::degree_reduced {angle} {
+
+    set n       [expr {int($angle/360.0)}]
+    set reduced [expr {$angle - $n * 360.0}]
+    if { $reduced < 0.0 } {
+        set reduced [expr {$reduced + 360.0}]
+    }
+
+    return $reduced
+}
+
+
+# cosec, sec, cotan --
+#     Calculate the cosecans, secans and cotangent
+#
+# Arguments:
+#     angle      Angle in radians
+#
+proc ::math::trig::cosec {angle} {
+    return [expr {1.0 / sin($angle)}]
+}
+
+proc ::math::trig::sec {angle} {
+    return [expr {1.0 / cos($angle)}]
+}
+
+proc ::math::trig::cotan {angle} {
+    variable halfpi
+    return [expr {tan($halfpi - $angle)}]
+}
+
+
+# cosech, sech, cotanh --
+#     Calculate the hyperbolic cosecans, secans and cotangent
+#
+# Arguments:
+#     value      Argument value
+#
+proc ::math::trig::cosech {value} {
+    return [expr {1.0 / sinh($value)}]
+}
+
+proc ::math::trig::sech {value} {
+    return [expr {1.0 / cosh($value)}]
+}
+
+proc ::math::trig::cotanh {value} {
+    return [expr {1.0/tanh($value)}]
+}
+
+
+# asinh, acosh, atanh --
+#     Calculate the arc hyperbolic sine, cosine and tangent
+#
+# Arguments:
+#     value      Argument value
+#
+proc ::math::trig::asinh {value} {
+    return [expr {log($value + sqrt($value**2 + 1.0))}]
+}
+
+proc ::math::trig::acosh {value} {
+    if { $value < 1.0 } {
+        return -code error "acosh: argument should be larger/equal 1.0"
+    }
+    return [expr {log($value + sqrt($value**2 - 1.0))}]
+}
+
+proc ::math::trig::atanh {value} {
+    if { $value <= -1.0 || $value >= 1.0} {
+        return -code error "atanh: argument should be between -1.0 and 1.0"
+    }
+    return [expr {0.5 * log((1.0 + $value) / (1.0 - $value))}]
+}
+
+
+# acosec, asec, acotan --
+#     Calculate the arc cosecans, secans and cotangent
+#
+# Arguments:
+#     value      Value for which the angle is sought
+#
+proc ::math::trig::acosec {value} {
+    return [expr {asin(1.0/$value)}]
+}
+
+proc ::math::trig::asec {value} {
+    return [expr {1.0 / acos($value)}]
+}
+
+proc ::math::trig::acotan {value} {
+    variable halfpi
+    return [expr {atan($halfpi - $angle)}]
+}
+
+
+# acosech, asech, acotanh --
+#     Calculate the arc hyperbolic cosecans, secans and cotangent
+#
+# Arguments:
+#     value      Value for which the angle is sought
+#
+proc ::math::trig::acosech {value} {
+    return [asinh [expr {1.0/$value}]]
+}
+
+proc ::math::trig::asech {value} {
+    return [acosh [expr {1.0/$value}]]
+}
+
+proc ::math::trig::acotanh {value} {
+    return [atanh [expr {1.0/$value}]]
+}
+
+# cossind --
+#     Reduce the angle (in degrees) to ensure exact results
+#     for multiples of 90 degrees.
+#
+# Arguments:
+#     angle           Angle in degrees
+#
+# Result:
+#     sine and cosine of the angle
+#
+proc ::math::trig::cossind {angle} {
+    variable torad
+
+    set angle [::math::trig::degree_reduced $angle]
+
+    if { $angle <= 45.0 || $angle >= 315.0 } {
+        set sind [expr {sin($angle*$torad)}]
+        set cosd [expr {cos($angle*$torad)}]
+    } elseif { $angle <= 135.0 } {
+        set sind [expr {cos(($angle-90.0)*$torad)}]
+        set cosd [expr {-sin(($angle-90.0)*$torad)}]
+    } elseif { $angle <= 225.0 } {
+        set sind [expr {-sin(($angle-180.0)*$torad)}]
+        set cosd [expr {-cos(($angle-180.0)*$torad)}]
+    } else { ;#elseif { $angle <= 315.0 }
+        set sind [expr {-cos(($angle-270.0)*$torad)}]
+        set cosd [expr {sin(($angle-270.0)*$torad)}]
+    }
+
+    return [list $sind $cosd]
+}
+
+# cosd, sind, tand, cosecd, secd, cotand --
+#     Trigonometric functions taking the angle in degrees
+#
+# Arguments:
+#     angle            Angle in degrees
+#
+# Result:
+#     cosine, sine, etc. of the given angle
+#
+proc ::math::trig::cosd {angle} {
+    return [lindex [cossind $angle] 1]
+}
+
+proc ::math::trig::sind {angle} {
+    return [lindex [cossind $angle] 0]
+}
+
+proc ::math::trig::tand {angle} {
+    lassign [cossind $angle] s c
+    return [expr {$s / $c}]
+}
+
+proc ::math::trig::cosecd {angle} {
+    lassign [cossind $angle] s c
+    return [expr {1.0 / $s}]
+}
+
+proc ::math::trig::secd {angle} {
+    lassign [cossind $angle] s c
+    return [expr {1.0 / $c}]
+}
+
+proc ::math::trig::cotand {angle} {
+    lassign [cossind $angle] s c
+    return [expr {$c / $s}]
+}
+
+# inverse trigonometric functions
+# Do not bother with exactitude in this case
+#
+proc ::math::trig::acosd {value} {
+    variable todeg
+    return [expr {$todeg * acos($value)}]
+}
+
+proc ::math::trig::asind {value} {
+    variable todeg
+    return [expr {$todeg * asin($value)}]
+}
+
+proc ::math::trig::atand {value} {
+    variable todeg
+    return [expr {$todeg * atan($value)}]
+}
+
+proc ::math::trig::acosecd {value} {
+    variable todeg
+    return [expr {$todeg * asin(1.0/$value)}]
+}
+
+proc ::math::trig::asecd {value} {
+    variable todeg
+    return [expr {$todeg * acos(1.0/$value)}]
+}
+proc ::math::trig::acotand {value} {
+    variable todeg
+    return [expr {$todeg * atan(1.0/$value)}]
+}
+
+# tests --
+if {0} {
+foreach angle {0 30 45 60 90 120 135 150 180 210 225 240 270 300 315 330 360} {
+    puts "$angle -- [::math::trig::sind $angle] -- [::math::trig::cosd $angle] [::math::trig::tand $angle]"
+}
+
+# simple test
+foreach angle {-10 -7 -4 -1 0 2 5 8 11} {
+    puts "$angle -- [::math::trig::radian_reduced $angle]"
+}
+foreach angle {-10 -7 -4 -1 0 2 5 8 11} {
+    puts "$angle -- [expr {101.0*$angle}] -- [::math::trig::degree_reduced [expr {101.0*$angle}]]"
+}
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/wilcoxon.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/wilcoxon.tcl
new file mode 100644
index 00000000..374ae9b7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/math/wilcoxon.tcl
@@ -0,0 +1,338 @@
+# wilcoxon.tcl --
+#     Implementation of the Wilcoxon test: test if the medians
+#     of two samples are the same
+#
+#     Also: Levene's and Brown-Forsythe's test
+#
+
+# test-Wilcoxon
+#     Compute the statistic that indicates if the medians of two
+#     samples are the same
+#
+# Arguments:
+#     sample_a       List of values in the first sample
+#     sample_b       List of values in the second sample
+#
+# Result:
+#     Statistic for the test (if both samples have 10 or more
+#     values, the statistic behaves as a standard normal variable)
+#
+proc ::math::statistics::test-Wilcoxon {sample_a sample_b} {
+
+    #
+    # Construct the sorted list for both
+    #
+    set sorted  {}
+    set count_a 0
+    set count_b 0
+    foreach sample {sample_a sample_b} code {0 1} count {count_a count_b} {
+        foreach v [set $sample] {
+            if { $v ne {} } {
+                incr $count
+                lappend sorted [list $v $code]
+            }
+        }
+    }
+
+    set raw_sorted [lsort -index 0 -real $sorted]
+
+    #
+    # Resolve the ties (TODO)
+    # - Make sure the previous value is never equal to the first
+    # - Take care of the last part of the sorted samples
+    #
+    set previous [expr {0.5*[lindex $raw_sorted 0 0] - 1.0}]
+
+    set sorted    $raw_sorted
+    set rank      0
+    set sum_ranks 0
+    set count     0
+    set first     0
+    set index     0
+    foreach v [concat $raw_sorted {{} -1}] {
+        set  sum_ranks [expr {$sum_ranks + $rank}]
+        incr count
+        set  current [lindex $v 0]
+        if { $current != $previous } {
+            set new_rank [expr {$sum_ranks / $count}]
+
+            if { $index > [llength $raw_sorted] } {
+                set index [llength $raw_sorted]
+            }
+
+            for {set elem $first} {$elem < $index} {incr elem} {
+                lset sorted $elem 0 $new_rank
+            }
+
+            set previous  $current
+            set first     $index
+            set count     0
+            set sum_ranks 0
+        }
+
+        incr index
+        incr rank
+    }
+
+    #
+    # Sum the ranks for the first sample and determine
+    # the statistic
+    #
+    if { $count_a < 2 || $count_b < 2 } {
+        return -code error \
+               -errorcode DATA -errorinfo {Too few data in one or both samples}
+    }
+
+    set sum  0
+    foreach v $sorted {
+        if { [lindex $v 1] == 0 } {
+            set rank [lindex $v 0]
+            set sum  [expr {$sum + $rank}]
+        }
+    }
+
+    set expected  [expr {$count_a * ($count_a + $count_b + 1)/2.0}]
+    set stdev     [expr {sqrt($count_b * $expected/6.0)}]
+    set statistic [expr {($sum-$expected)/$stdev}]
+
+    return $statistic
+}
+
+# SpearmanRankData --
+#     Auxiliary procedure to rank the data
+#
+# Arguments:
+#     sample             Series of data to be ranked
+#
+# Returns:
+#     Ranks of the data
+#
+proc ::math::statistics::SpearmanRankData {sample} {
+
+    set counted_sample {}
+    set count          0
+    foreach v $sample {
+        if { $v ne {} } {
+            incr count
+            lappend counted_sample [list $v 0 $count]
+        }
+    }
+
+    set raw_sorted [lsort -index 0 -real $counted_sample]
+
+    #
+    # Resolve the ties (TODO)
+    # - Make sure the previous value is never equal to the first
+    # - Take care of the last part of the sorted samples
+    #
+    set previous [expr {0.5*[lindex $raw_sorted 0 0] - 1.0}]
+
+    set sorted    $raw_sorted
+    set rank      0
+    set sum_ranks 0
+    set count     0
+    set first     0
+    set index     0
+    foreach v [concat $raw_sorted {{} -1}] {
+        set  sum_ranks [expr {$sum_ranks + $rank}]
+        incr count
+        set  current [lindex $v 0]
+        if { $current != $previous } {
+            set new_rank [expr {$sum_ranks / $count}]
+
+            if { $index > [llength $raw_sorted] } {
+                set index [llength $raw_sorted]
+            }
+
+            for {set elem $first} {$elem < $index} {incr elem} {
+                lset sorted $elem 1 $new_rank
+            }
+
+            set previous  $current
+            set first     $index
+            set count     0
+            set sum_ranks 0
+        }
+
+        incr index
+        incr rank
+    }
+
+    #
+    # Return the ranks of the data in the original order
+    #
+    set ranks {}
+    foreach values [lsort -index 2 -integer $sorted] {
+        lappend ranks [lindex $values 1]
+    }
+
+    return $ranks
+}
+
+# spearman-rank-extended --
+#     Compute the Spearman's rank correlation coefficient and
+#     associated parameters
+#
+# Arguments:
+#     sample_a       List of values in the first sample
+#     sample_b       List of values in the second sample
+#
+# Result:
+#     List of:
+#     - Rank correlation coefficient
+#     - Number of data
+#     - z-score to test the null hyothesis
+#
+proc ::math::statistics::spearman-rank-extended {sample_a sample_b} {
+
+    #
+    # Filter out missing data
+    #
+    if { [llength $sample_a] != [llength $sample_b] } {
+        return -code error \
+               -errorcode DATA -errorinfo {The two samples should have the same number of data}
+    }
+
+    set new_sample_a {}
+    set new_sample_b {}
+    foreach a $sample_a b $sample_b {
+        if { $a != {} && $b != {} } {
+            lappend new_sample_a $a
+            lappend new_sample_b $b
+        }
+    }
+
+    #
+    # Construct the ranks
+    #
+    set rank_a [SpearmanRankData $new_sample_a]
+    set rank_b [SpearmanRankData $new_sample_b]
+
+    set rcorr  [corr $rank_a $rank_b]
+    set number [llength $new_sample_a]
+    set zscore [expr {sqrt(($number-3)/1.06) * 0.5 * log((1.0+$rcorr)/(1.0-$rcorr))}]
+
+    return [list $rcorr $number $zscore]
+}
+
+# spearman-rank --
+#     Compute the Spearman's rank correlation coefficient
+#
+# Arguments:
+#     sample_a       List of values in the first sample
+#     sample_b       List of values in the second sample
+#
+# Result:
+#     Rank correlation coefficient
+#
+proc ::math::statistics::spearman-rank {sample_a sample_b} {
+    return [lindex [spearman-rank-extended $sample_a $sample_b] 0]
+}
+
+# test-Levene --
+#     Compute the Levene statistic that indicates if the variances of
+#     groups of data are the same
+#
+# Arguments:
+#     groups         List of groups of values to be examined
+#
+# Result:
+#     Statistic for the test (an F statistic with k-1, N-k degrees
+#     of freedom - k the number of groups and N the total number
+#     of values)
+#     The test uses the mean of the values in the groups.
+#
+proc ::math::statistics::test-Levene {groups} {
+
+    return [Test-Levene-Brown-Forsythe 0 $groups]
+}
+
+# test-Brown-Forsythe --
+#     Compute the Brown-Forsythe statistic that indicates if the variances of
+#     groups of data are the same
+#
+# Arguments:
+#     groups         List of groups of values to be examined
+#
+# Result:
+#     Statistic for the test (an F statistic with k-1, N-k degrees
+#     of freedom - k the number of groups and N the total number
+#     of values)
+#     The test uses the median of the values in the groups.
+#
+proc ::math::statistics::test-Brown-Forsythe {groups} {
+
+    return [Test-Levene-Brown-Forsythe 1 $groups]
+}
+
+# Test-Levene-Brown-Forsythe --
+#     Compute either the Levene or the Brown-Forsythe statistic that indicates
+#     if the variances of groups of data are the same
+#
+# Arguments:
+#     choice         Which of the two versions
+#     groups         List of groups of values to be examined
+#
+# Result:
+#     Statistic for the test
+#     The test uses either the mean or the median of the values in the groups.
+#
+proc ::math::statistics::Test-Levene-Brown-Forsythe {choice groups} {
+
+    #
+    # Compute the deviations from the mean/median within each group
+    #
+    set alldevs {}
+    set zscores {}
+    set zmeans  {}
+    foreach group $groups {
+        if { $choice } {
+            set zm [median $group]
+        } else {
+            set zm [mean $group]
+        }
+        set zgroup {}
+        foreach element $group {
+            lappend zgroup [expr {abs($element-$zm)}]
+        }
+
+        set alldevs [concat $alldevs $zgroup]
+        lappend zscores $zgroup
+        lappend zmeans  [mean $zgroup]
+    }
+
+    set zoverall [mean $alldevs]
+
+    set ndata   [llength $alldevs]
+    set ngroups [llength $groups]
+
+    #
+    # Compute the numerator of the statistic
+    #
+    set sumsqmeans 0.0
+
+    foreach zm $zmeans group $groups {
+        set n          [llength $group]
+        set sumsqmeans [expr { $sumsqmeans + $n * ($zm - $zoverall)**2 }]
+    }
+
+    #
+    # Compute the denominator
+    #
+    set sumsqpergroup 0.0
+
+    foreach zm $zmeans zs $zscores {
+        set sumsq 0.0
+        foreach z $zs {
+            set sumsq [expr {$sumsq + ($z-$zm)**2}]
+        }
+
+        set sumsqpergroup [expr { $sumsqpergroup + $sumsq }]
+    }
+
+    #
+    # Finally, the statistic
+    #
+
+    return [expr { ($ndata-$ngroups) * $sumsqmeans / double( ($ngroups-1) * $sumsqpergroup ) }]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md4/md4.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md4/md4.tcl
new file mode 100644
index 00000000..d681c94d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md4/md4.tcl
@@ -0,0 +1,569 @@
+# md4.tcl - Copyright (C) 2003 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# This is a Tcl-only implementation of the MD4 hash algorithm as described in 
+# RFC 1320 ( http://www.ietf.org/rfc/rfc1320.txt )
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2;                # tcl minimum version
+
+# @mdgen EXCLUDE: md4c.tcl
+
+namespace eval ::md4 {
+    variable  accel
+    array set accel {critcl 0 cryptkit 0}
+
+    namespace export md4 hmac MD4Init MD4Update MD4Final
+
+    variable uid
+    if {![info exists uid]} {
+        set uid 0
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# MD4Init - create and initialize an MD4 state variable. This will be
+# cleaned up when we call MD4Final
+#
+proc ::md4::MD4Init {} {
+    variable uid
+    variable accel
+    set token [namespace current]::[incr uid]
+    upvar #0 $token state
+
+    # RFC1320:3.3 - Initialize MD4 state structure
+    array set state \
+        [list \
+             A [expr {0x67452301}] \
+             B [expr {0xefcdab89}] \
+             C [expr {0x98badcfe}] \
+             D [expr {0x10325476}] \
+             n 0 i "" ]
+    if {$accel(cryptkit)} {
+        cryptkit::cryptCreateContext state(ckctx) CRYPT_UNUSED CRYPT_ALGO_MD4
+    }
+    return $token
+}
+
+proc ::md4::MD4Update {token data} {
+    variable accel
+    upvar #0 $token state
+
+    if {$accel(critcl)} {
+        if {[info exists state(md4c)]} {
+            set state(md4c) [md4c $data $state(md4c)]
+        } else {
+            set state(md4c) [md4c $data]
+        }
+        return
+    } elseif {[info exists state(ckctx)]} {
+        if {[string length $data] > 0} {
+            cryptkit::cryptEncrypt $state(ckctx) $data
+        }
+        return
+    }
+
+    # Update the state values
+    incr state(n) [string length $data]
+    append state(i) $data
+
+    # Calculate the hash for any complete blocks
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        MD4Hash $token [string range $state(i) $n [incr n 64]]
+    }
+
+    # Adjust the state for the blocks completed.
+    set state(i) [string range $state(i) $n end]
+    return
+}
+
+proc ::md4::MD4Final {token} {
+    upvar #0 $token state
+
+    if {[info exists state(md4c)]} {
+        set r $state(md4c)
+        unset state
+        return $r
+    } elseif {[info exists state(ckctx)]} {
+        cryptkit::cryptEncrypt $state(ckctx) ""
+        cryptkit::cryptGetAttributeString $state(ckctx) \
+            CRYPT_CTXINFO_HASHVALUE r 16
+        cryptkit::cryptDestroyContext $state(ckctx)
+        # If nothing was hashed, we get no r variable set!
+        if {[info exists r]} {
+            unset state
+            return $r
+        }
+    }
+
+    # RFC1320:3.1 - Padding
+    #
+    set len [string length $state(i)]
+    set pad [expr {56 - ($len % 64)}]
+    if {$len % 64 > 56} {
+        incr pad 64
+    }
+    if {$pad == 0} {
+        incr pad 64
+    }
+    append state(i) [binary format a$pad \x80]
+
+    # RFC1320:3.2 - Append length in bits as little-endian wide int.
+    append state(i) [binary format ii [expr {8 * $state(n)}] 0]
+
+    # Calculate the hash for the remaining block.
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        MD4Hash $token [string range $state(i) $n [incr n 64]]
+    }
+
+    # RFC1320:3.5 - Output
+    set r [bytes $state(A)][bytes $state(B)][bytes $state(C)][bytes $state(D)]
+    unset state
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# HMAC Hashed Message Authentication (RFC 2104)
+#
+# hmac = H(K xor opad, H(K xor ipad, text))
+#
+proc ::md4::HMACInit {K} {
+
+    # Key K is adjusted to be 64 bytes long. If K is larger, then use
+    # the MD4 digest of K and pad this instead.
+    set len [string length $K]
+    if {$len > 64} {
+        set tok [MD4Init]
+        MD4Update $tok $K
+        set K [MD4Final $tok]
+        set len [string length $K]
+    }
+    set pad [expr {64 - $len}]
+    append K [string repeat \0 $pad]
+
+    # Cacluate the padding buffers.
+    set Ki {}
+    set Ko {}
+    binary scan $K i16 Ks
+    foreach k $Ks {
+        append Ki [binary format i [expr {$k ^ 0x36363636}]]
+        append Ko [binary format i [expr {$k ^ 0x5c5c5c5c}]]
+    }
+
+    set tok [MD4Init]
+    MD4Update $tok $Ki;                 # initialize with the inner pad
+    
+    # preserve the Ko value for the final stage.
+    # FRINK: nocheck
+    set [subst $tok](Ko) $Ko
+
+    return $tok
+}
+
+proc ::md4::HMACUpdate {token data} {
+    MD4Update $token $data
+    return
+}
+
+proc ::md4::HMACFinal {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set tok [MD4Init];                  # init the outer hashing function
+    MD4Update $tok $state(Ko);          # prepare with the outer pad.
+    MD4Update $tok [MD4Final $token];   # hash the inner result
+    return [MD4Final $tok]
+}
+
+# -------------------------------------------------------------------------
+
+set ::md4::MD4Hash_body {
+    variable $token
+    upvar 0 $token state
+
+    # RFC1320:3.4 - Process Message in 16-Word Blocks
+    binary scan $msg i* blocks
+    foreach {X0 X1 X2 X3 X4 X5 X6 X7 X8 X9 X10 X11 X12 X13 X14 X15} $blocks {
+        set A $state(A)
+        set B $state(B)
+        set C $state(C)
+        set D $state(D)
+
+        # Round 1
+        # Let [abcd k s] denote the operation
+        #   a = (a + F(b,c,d) + X[k]) <<< s.
+        # Do the following 16 operations.
+        # [ABCD  0  3]  [DABC  1  7]  [CDAB  2 11]  [BCDA  3 19]
+        set A [expr {($A + [F $B $C $D] + $X0) <<< 3}]
+        set D [expr {($D + [F $A $B $C] + $X1) <<< 7}]
+        set C [expr {($C + [F $D $A $B] + $X2) <<< 11}]
+        set B [expr {($B + [F $C $D $A] + $X3) <<< 19}]
+        # [ABCD  4  3]  [DABC  5  7]  [CDAB  6 11]  [BCDA  7 19]
+        set A [expr {($A + [F $B $C $D] + $X4) <<< 3}]
+        set D [expr {($D + [F $A $B $C] + $X5) <<< 7}]
+        set C [expr {($C + [F $D $A $B] + $X6) <<< 11}]
+        set B [expr {($B + [F $C $D $A] + $X7) <<< 19}]
+        # [ABCD  8  3]  [DABC  9  7]  [CDAB 10 11]  [BCDA 11 19]
+        set A [expr {($A + [F $B $C $D] + $X8) <<< 3}]
+        set D [expr {($D + [F $A $B $C] + $X9) <<< 7}]
+        set C [expr {($C + [F $D $A $B] + $X10) <<< 11}]
+        set B [expr {($B + [F $C $D $A] + $X11) <<< 19}]
+        # [ABCD 12  3]  [DABC 13  7]  [CDAB 14 11]  [BCDA 15 19]
+        set A [expr {($A + [F $B $C $D] + $X12) <<< 3}]
+        set D [expr {($D + [F $A $B $C] + $X13) <<< 7}]
+        set C [expr {($C + [F $D $A $B] + $X14) <<< 11}]
+        set B [expr {($B + [F $C $D $A] + $X15) <<< 19}]
+
+        # Round 2.
+        # Let [abcd k s] denote the operation
+        #   a = (a + G(b,c,d) + X[k] + 5A827999) <<< s
+        # Do the following 16 operations.
+        # [ABCD  0  3]  [DABC  4  5]  [CDAB  8  9]  [BCDA 12 13]
+        set A [expr {($A + [G $B $C $D] + $X0  + 0x5a827999) <<< 3}]
+        set D [expr {($D + [G $A $B $C] + $X4  + 0x5a827999) <<< 5}]
+        set C [expr {($C + [G $D $A $B] + $X8  + 0x5a827999) <<< 9}]
+        set B [expr {($B + [G $C $D $A] + $X12 + 0x5a827999) <<< 13}]
+        # [ABCD  1  3]  [DABC  5  5]  [CDAB  9  9]  [BCDA 13 13]
+        set A [expr {($A + [G $B $C $D] + $X1  + 0x5a827999) <<< 3}]
+        set D [expr {($D + [G $A $B $C] + $X5  + 0x5a827999) <<< 5}]
+        set C [expr {($C + [G $D $A $B] + $X9  + 0x5a827999) <<< 9}]
+        set B [expr {($B + [G $C $D $A] + $X13 + 0x5a827999) <<< 13}]
+        # [ABCD  2  3]  [DABC  6  5]  [CDAB 10  9]  [BCDA 14 13]
+        set A [expr {($A + [G $B $C $D] + $X2  + 0x5a827999) <<< 3}]
+        set D [expr {($D + [G $A $B $C] + $X6  + 0x5a827999) <<< 5}]
+        set C [expr {($C + [G $D $A $B] + $X10 + 0x5a827999) <<< 9}]
+        set B [expr {($B + [G $C $D $A] + $X14 + 0x5a827999) <<< 13}]
+        # [ABCD  3  3]  [DABC  7  5]  [CDAB 11  9]  [BCDA 15 13]
+        set A [expr {($A + [G $B $C $D] + $X3  + 0x5a827999) <<< 3}]
+        set D [expr {($D + [G $A $B $C] + $X7  + 0x5a827999) <<< 5}]
+        set C [expr {($C + [G $D $A $B] + $X11 + 0x5a827999) <<< 9}]
+        set B [expr {($B + [G $C $D $A] + $X15 + 0x5a827999) <<< 13}]
+        
+        # Round 3.
+        # Let [abcd k s] denote the operation
+        #   a = (a + H(b,c,d) + X[k] + 6ED9EBA1) <<< s.
+        # Do the following 16 operations.
+        # [ABCD  0  3]  [DABC  8  9]  [CDAB  4 11]  [BCDA 12 15]
+        set A [expr {($A + [H $B $C $D] + $X0  + 0x6ed9eba1) <<< 3}]
+        set D [expr {($D + [H $A $B $C] + $X8  + 0x6ed9eba1) <<< 9}]
+        set C [expr {($C + [H $D $A $B] + $X4  + 0x6ed9eba1) <<< 11}]
+        set B [expr {($B + [H $C $D $A] + $X12 + 0x6ed9eba1) <<< 15}]
+        # [ABCD  2  3]  [DABC 10  9]  [CDAB  6 11]  [BCDA 14 15]
+        set A [expr {($A + [H $B $C $D] + $X2  + 0x6ed9eba1) <<< 3}]
+        set D [expr {($D + [H $A $B $C] + $X10 + 0x6ed9eba1) <<< 9}]
+        set C [expr {($C + [H $D $A $B] + $X6  + 0x6ed9eba1) <<< 11}]
+        set B [expr {($B + [H $C $D $A] + $X14 + 0x6ed9eba1) <<< 15}]
+        # [ABCD  1  3]  [DABC  9  9]  [CDAB  5 11]  [BCDA 13 15]
+        set A [expr {($A + [H $B $C $D] + $X1  + 0x6ed9eba1) <<< 3}]
+        set D [expr {($D + [H $A $B $C] + $X9  + 0x6ed9eba1) <<< 9}]
+        set C [expr {($C + [H $D $A $B] + $X5  + 0x6ed9eba1) <<< 11}]
+        set B [expr {($B + [H $C $D $A] + $X13 + 0x6ed9eba1) <<< 15}]
+        # [ABCD  3  3]  [DABC 11  9]  [CDAB  7 11]  [BCDA 15 15]
+        set A [expr {($A + [H $B $C $D] + $X3  + 0x6ed9eba1) <<< 3}]
+        set D [expr {($D + [H $A $B $C] + $X11 + 0x6ed9eba1) <<< 9}]
+        set C [expr {($C + [H $D $A $B] + $X7  + 0x6ed9eba1) <<< 11}]
+        set B [expr {($B + [H $C $D $A] + $X15 + 0x6ed9eba1) <<< 15}]
+
+        # Then perform the following additions. (That is, increment each
+        # of the four registers by the value it had before this block
+        # was started.)
+        incr state(A) $A
+        incr state(B) $B
+        incr state(C) $C
+        incr state(D) $D
+    }
+
+    return
+}
+
+proc ::md4::byte {n v} {expr {((0xFF << (8 * $n)) & $v) >> (8 * $n)}}
+proc ::md4::bytes {v} { 
+    #format %c%c%c%c [byte 0 $v] [byte 1 $v] [byte 2 $v] [byte 3 $v]
+    format %c%c%c%c \
+        [expr {0xFF & $v}] \
+        [expr {(0xFF00 & $v) >> 8}] \
+        [expr {(0xFF0000 & $v) >> 16}] \
+        [expr {((0xFF000000 & $v) >> 24) & 0xFF}]
+}
+
+# 32bit rotate-left
+proc ::md4::<<< {v n} {
+    return [expr {((($v << $n) \
+                        | (($v >> (32 - $n)) \
+                               & (0x7FFFFFFF >> (31 - $n))))) \
+                      & 0xFFFFFFFF}]
+}
+
+# Convert our <<< pseudo-operator into a procedure call.
+regsub -all -line \
+    {\[expr {(.*) <<< (\d+)}\]} \
+    $::md4::MD4Hash_body \
+    {[<<< [expr {\1}] \2]} \
+    ::md4::MD4Hash_body
+
+# RFC1320:3.4 - function F
+proc ::md4::F {X Y Z} {
+    return [expr {($X & $Y) | ((~$X) & $Z)}]
+}
+
+# Inline the F function
+regsub -all -line \
+    {\[F (\$[ABCD]) (\$[ABCD]) (\$[ABCD])\]} \
+    $::md4::MD4Hash_body \
+    {( (\1 \& \2) | ((~\1) \& \3) )} \
+    ::md4::MD4Hash_body
+    
+# RFC1320:3.4 - function G
+proc ::md4::G {X Y Z} {
+    return [expr {($X & $Y) | ($X & $Z) | ($Y & $Z)}]
+}
+
+# Inline the G function
+regsub -all -line \
+    {\[G (\$[ABCD]) (\$[ABCD]) (\$[ABCD])\]} \
+    $::md4::MD4Hash_body \
+    {((\1 \& \2) | (\1 \& \3) | (\2 \& \3))} \
+    ::md4::MD4Hash_body
+
+# RFC1320:3.4 - function H
+proc ::md4::H {X Y Z} {
+    return [expr {$X ^ $Y ^ $Z}]
+}
+
+# Inline the H function
+regsub -all -line \
+    {\[H (\$[ABCD]) (\$[ABCD]) (\$[ABCD])\]} \
+    $::md4::MD4Hash_body \
+    {(\1 ^ \2 ^ \3)} \
+    ::md4::MD4Hash_body
+
+# Define the MD4 hashing procedure with inline functions.
+proc ::md4::MD4Hash {token msg} $::md4::MD4Hash_body
+unset ::md4::MD4Hash_body
+
+# -------------------------------------------------------------------------
+
+if {[package provide Trf] != {}} {
+    interp alias {} ::md4::Hex {} ::hex -mode encode --
+} else {
+    proc ::md4::Hex {data} {
+        binary scan $data H* result
+        return [string toupper $result]
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# LoadAccelerator --
+#
+#	This package can make use of a number of compiled extensions to
+#	accelerate the digest computation. This procedure manages the
+#	use of these extensions within the package. During normal usage
+#	this should not be called, but the test package manipulates the
+#	list of enabled accelerators.
+#
+proc ::md4::LoadAccelerator {name} {
+    variable accel
+    set r 0
+    switch -exact -- $name {
+        critcl {
+            if {![catch {package require tcllibc}]
+                || ![catch {package require md4c}]} {
+                set r [expr {[info commands ::md4::md4c] != {}}]
+            }
+        }
+        cryptkit {
+            if {![catch {package require cryptkit}]} {
+                set r [expr {![catch {cryptkit::cryptInit}]}]
+            }
+        }
+        #trf {
+        #    if {![catch {package require Trf}]} {
+        #        set r [expr {![catch {::md4 aa} msg]}]
+        #    }
+        #}
+        default {
+            return -code error "invalid accelerator package:\
+                must be one of [join [array names accel] {, }]"
+        }
+    }
+    set accel($name) $r
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::md4::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# fileevent handler for chunked file hashing.
+#
+proc ::md4::Chunk {token channel {chunksize 4096}} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+    
+    if {[eof $channel]} {
+        fileevent $channel readable {}
+        set state(reading) 0
+    }
+        
+    MD4Update $token [read $channel $chunksize]
+}
+
+# -------------------------------------------------------------------------
+
+proc ::md4::md4 {args} {
+    array set opts {-hex 0 -filename {} -channel {} -chunksize 4096}
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -hex       { set opts(-hex) 1 }
+            -file*     { set opts(-filename) [Pop args 1] }
+            -channel   { set opts(-channel) [Pop args 1] }
+            -chunksize { set opts(-chunksize) [Pop args 1] }
+            default {
+                if {[llength $args] == 1} { break }
+                if {[string compare $option "--"] == 0 } { Pop args; break }
+                set err [join [lsort [array names opts]] ", "]
+                return -code error "bad option $option:\
+                    must be one of $err"
+            }
+        }
+        Pop args
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"md4 ?-hex? -filename file | string\""
+        }
+        set tok [MD4Init]
+        MD4Update $tok [lindex $args 0]
+        set r [MD4Final $tok]
+
+    } else {
+
+        set tok [MD4Init]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        vwait [subst $tok](reading)
+        set r [MD4Final $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+proc ::md4::hmac {args} {
+    array set opts {-hex 0 -filename {} -channel {} -chunksize 4096}
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -key       { set opts(-key) [Pop args 1] }
+            -hex       { set opts(-hex) 1 }
+            -file*     { set opts(-filename) [Pop args 1] }
+            -channel   { set opts(-channel) [Pop args 1] }
+            -chunksize { set opts(-chunksize) [Pop args 1] }
+            default {
+                if {[llength $args] == 1} { break }
+                if {[string compare $option "--"] == 0 } { Pop args; break }
+                set err [join [lsort [array names opts]] ", "]
+                return -code error "bad option $option:\
+                    must be one of $err"
+            }
+        }
+        Pop args
+    }
+
+    if {![info exists opts(-key)]} {
+        return -code error "wrong # args:\
+            should be \"hmac ?-hex? -key key -filename file | string\""
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"hmac ?-hex? -key key -filename file | string\""
+        }
+        set tok [HMACInit $opts(-key)]
+        HMACUpdate $tok [lindex $args 0]
+        set r [HMACFinal $tok]
+
+    } else {
+
+        set tok [HMACInit $opts(-key)]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        vwait [subst $tok](reading)
+        set r [HMACFinal $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# Try and load a compiled extension to help.
+namespace eval ::md4 {
+    variable e {}
+    foreach e {critcl cryptkit} { if {[LoadAccelerator $e]} { break } }
+    unset e
+}
+
+package provide md4 1.0.7
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
+
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md4/md4c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md4/md4c.tcl
new file mode 100644
index 00000000..fa89b616
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md4/md4c.tcl
@@ -0,0 +1,120 @@
+# md4c.tcl - Copyright (C) 2003 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# This provides a C implementation of MD4 using the sample code from RFC1320
+# and wrapping this up in a Tcl package.
+#
+# The tcl interface code is based upon the md5c code from critcl by JCW.
+#
+# INSTALLATION
+# ------------
+# This package uses critcl (http://wiki.tcl.tk/critcl). To build do:
+#  critcl -libdir <your-tcl-lib-dir> -pkg md4c md4c
+#
+# $Id: md4c.tcl,v 1.6 2009/05/06 22:57:50 patthoyts Exp $
+
+package require critcl
+# @sak notprovided md4c
+package provide md4c 1.1.0
+
+critcl::cheaders md4.h
+critcl::csources md4.c
+
+namespace eval ::md4 {
+
+    critcl::ccode {
+        #include <string.h>
+        #include "md4.h"
+
+        /*
+         * define a Tcl object type for the MD4 state 
+         */
+        static Tcl_ObjType md4_type;
+    
+        static void md4_free_rep(Tcl_Obj *obj)
+        {
+            MD4_CTX *ctx = (MD4_CTX *)obj->internalRep.otherValuePtr;
+            Tcl_Free((char *)ctx);
+        }
+
+        static void md4_dup_rep(Tcl_Obj *obj, Tcl_Obj *dup)
+        {
+            MD4_CTX *ctx = (MD4_CTX *)obj->internalRep.otherValuePtr;
+            dup->internalRep.otherValuePtr = (MD4_CTX *)Tcl_Alloc(sizeof(MD4_CTX));
+            memcpy(dup->internalRep.otherValuePtr, ctx, sizeof(MD4_CTX));
+            dup->typePtr = &md4_type;
+        }
+
+        static void md4_string_rep(Tcl_Obj* obj)
+        {
+            unsigned char buf[16];
+            Tcl_Obj* temp;
+            char* str;
+            MD4_CTX *dup = (MD4_CTX *)obj->internalRep.otherValuePtr;
+            
+            MD4Final(buf, dup);
+            
+            /* convert via a byte array to properly handle null bytes */
+            temp = Tcl_NewByteArrayObj(buf, sizeof buf);
+            Tcl_IncrRefCount(temp);
+            
+            str = Tcl_GetStringFromObj(temp, &obj->length);
+            obj->bytes = Tcl_Alloc(obj->length + 1);
+            memcpy(obj->bytes, str, obj->length + 1);
+            
+            Tcl_DecrRefCount(temp);
+        }
+    
+        static int md4_from_any(Tcl_Interp* interp, Tcl_Obj* obj)
+        {
+            /* assert(0); */
+            return TCL_ERROR;
+        }
+        
+        static Tcl_ObjType md4_type = {
+            "md4c", md4_free_rep, md4_dup_rep, md4_string_rep, md4_from_any
+        };
+
+    }
+
+    critcl::ccommand md4c {dummy interp objc objv} {
+        MD4_CTX *ctx;
+        unsigned char *data;
+        int size;
+        Tcl_Obj *obj;
+        
+        if (objc < 2 || objc > 3) {
+            Tcl_WrongNumArgs(interp, 1, objv, "data ?context?");
+            return TCL_ERROR;
+        }
+        
+        if (objc == 3) {
+            if (objv[2]->typePtr != &md4_type 
+                && md4_from_any(interp, objv[2]) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            obj = objv[2];
+            if (Tcl_IsShared(obj)) {
+                obj = Tcl_DuplicateObj(obj);
+            }
+        } else {
+            ctx = (MD4_CTX *)Tcl_Alloc(sizeof(MD4_CTX));
+            MD4Init(ctx);
+            obj = Tcl_NewObj();
+	    Tcl_InvalidateStringRep(obj);
+            obj->internalRep.otherValuePtr = ctx;
+            obj->typePtr = &md4_type;
+        }
+    
+        ctx = (MD4_CTX *)obj->internalRep.otherValuePtr;
+        data = Tcl_GetByteArrayFromObj(objv[1], &size);
+        MD4Update(ctx, data, size);
+        Tcl_SetObjResult(interp, obj);
+
+        return TCL_OK;
+    }
+}
+
+# Local variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md4/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md4/pkgIndex.tcl
new file mode 100644
index 00000000..d2a4b20f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md4/pkgIndex.tcl
@@ -0,0 +1,3 @@
+# This package has been tested with tcl 8.2.3 and above.
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded md4 1.0.7 [list source [file join $dir md4.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5/md5.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5/md5.tcl
new file mode 100644
index 00000000..79f3d015
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5/md5.tcl
@@ -0,0 +1,457 @@
+##################################################
+#
+# md5.tcl - MD5 in Tcl
+# Author: Don Libes <libes@nist.gov>, July 1999
+# Version 1.2.0
+#
+# MD5  defined by RFC 1321, "The MD5 Message-Digest Algorithm"
+# HMAC defined by RFC 2104, "Keyed-Hashing for Message Authentication"
+#
+# Most of the comments below come right out of RFC 1321; That's why
+# they have such peculiar numbers.  In addition, I have retained
+# original syntax, bugs in documentation (yes, really), etc. from the
+# RFC.  All remaining bugs are mine.
+#
+# HMAC implementation by D. J. Hagberg <dhagberg@millibits.com> and
+# is based on C code in RFC 2104.
+#
+# For more info, see: http://expect.nist.gov/md5pure
+#
+# - Don
+#
+# Modified by Miguel Sofer to use inlines and simple variables
+##################################################
+
+# @mdgen EXCLUDE: md5c.tcl
+
+package require Tcl 8.2
+namespace eval ::md5 {
+}
+
+if {![catch {package require Trf 2.0}] && ![catch {::md5 -- test}]} {
+    # Trf is available, so implement the functionality provided here
+    # in terms of calls to Trf for speed.
+
+    proc ::md5::md5 {msg} {
+	string tolower [::hex -mode encode -- [::md5 -- $msg]]
+    }
+
+    # hmac: hash for message authentication
+
+    # MD5 of Trf and MD5 as defined by this package have slightly
+    # different results. Trf returns the digest in binary, here we get
+    # it as hex-string. In the computation of the HMAC the latter
+    # requires back conversion into binary in some places. With Trf we
+    # can use omit these.
+
+    proc ::md5::hmac {key text} {
+	# if key is longer than 64 bytes, reset it to MD5(key).  If shorter, 
+	# pad it out with null (\x00) chars.
+	set keyLen [string length $key]
+	if {$keyLen > 64} {
+	    #old: set key [binary format H32 [md5 $key]]
+	    set key [::md5 -- $key]
+	    set keyLen [string length $key]
+	}
+    
+	# ensure the key is padded out to 64 chars with nulls.
+	set padLen [expr {64 - $keyLen}]
+	append key [binary format "a$padLen" {}]
+
+	# Split apart the key into a list of 16 little-endian words
+	binary scan $key i16 blocks
+
+	# XOR key with ipad and opad values
+	set k_ipad {}
+	set k_opad {}
+	foreach i $blocks {
+	    append k_ipad [binary format i [expr {$i ^ 0x36363636}]]
+	    append k_opad [binary format i [expr {$i ^ 0x5c5c5c5c}]]
+	}
+    
+	# Perform inner md5, appending its results to the outer key
+	append k_ipad $text
+	#old: append k_opad [binary format H* [md5 $k_ipad]]
+	append k_opad [::md5 -- $k_ipad]
+
+	# Perform outer md5
+	#old: md5 $k_opad
+	string tolower [::hex -mode encode -- [::md5 -- $k_opad]]
+    }
+
+} else {
+    # Without Trf use the all-tcl implementation by Don Libes.
+
+    # T will be inlined after the definition of md5body
+
+    # test md5
+    #
+    # This proc is not necessary during runtime and may be omitted if you
+    # are simply inserting this file into a production program.
+    #
+    proc ::md5::test {} {
+	foreach {msg expected} {
+	    ""
+	    "d41d8cd98f00b204e9800998ecf8427e"
+	    "a"
+	    "0cc175b9c0f1b6a831c399e269772661"
+	    "abc"
+	    "900150983cd24fb0d6963f7d28e17f72"
+	    "message digest"
+	    "f96b697d7cb7938d525a2f31aaf161d0"
+	    "abcdefghijklmnopqrstuvwxyz"
+	    "c3fcd3d76192e4007dfb496cca67e13b"
+	    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+	    "d174ab98d277d9f5a5611c2c9f419d9f"
+	    "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+	    "57edf4a22be3c955ac49da2e2107b67a"
+	} {
+	    puts "testing: md5 \"$msg\""
+	    set computed [md5 $msg]
+	    puts "expected: $expected"
+	    puts "computed: $computed"
+	    if {0 != [string compare $computed $expected]} {
+		puts "FAILED"
+	    } else {
+		puts "SUCCEEDED"
+	    }
+	}
+    }
+
+    # time md5
+    #
+    # This proc is not necessary during runtime and may be omitted if you
+    # are simply inserting this file into a production program.
+    #
+    proc ::md5::time {} {
+	foreach len {10 50 100 500 1000 5000 10000} {
+	    set time [::time {md5 [format %$len.0s ""]} 100]
+	    set msec [lindex $time 0]
+	    puts "input length $len: [expr {$msec/1000}] milliseconds per interation"
+	}
+    }
+
+    #
+    # We just define the body of md5pure::md5 here; later we
+    # regsub to inline a few function calls for speed
+    #
+
+    set ::md5::md5body {
+
+	#
+	# 3.1 Step 1. Append Padding Bits
+	#
+
+	set msgLen [string length $msg]
+
+	set padLen [expr {56 - $msgLen%64}]
+	if {$msgLen % 64 > 56} {
+	    incr padLen 64
+	}
+
+	# pad even if no padding required
+	if {$padLen == 0} {
+	    incr padLen 64
+	}
+
+	# append single 1b followed by 0b's
+	append msg [binary format "a$padLen" \200]
+
+	#
+	# 3.2 Step 2. Append Length
+	#
+
+	# RFC doesn't say whether to use little- or big-endian
+	# code demonstrates little-endian
+	# This step limits our input to size 2^32b or 2^24B
+	append msg [binary format "i1i1" [expr {8*$msgLen}] 0]
+	
+	#
+	# 3.3 Step 3. Initialize MD Buffer
+	#
+
+	set A [expr 0x67452301]
+	set B [expr 0xefcdab89]
+	set C [expr 0x98badcfe]
+	set D [expr 0x10325476]
+
+	#
+	# 3.4 Step 4. Process Message in 16-Word Blocks
+	#
+
+	# process each 16-word block
+	# RFC doesn't say whether to use little- or big-endian
+	# code says little-endian
+	binary scan $msg i* blocks
+
+	# loop over the message taking 16 blocks at a time
+
+	foreach {X0 X1 X2 X3 X4 X5 X6 X7 X8 X9 X10 X11 X12 X13 X14 X15} $blocks {
+
+	    # Save A as AA, B as BB, C as CC, and D as DD.
+	    set AA $A
+	    set BB $B
+	    set CC $C
+	    set DD $D
+
+	    # Round 1.
+	    # Let [abcd k s i] denote the operation
+	    #      a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s).
+	    # [ABCD  0  7  1]  [DABC  1 12  2]  [CDAB  2 17  3]  [BCDA  3 22  4]
+	    set A [expr {($B + [<<< [expr {$A + [F $B $C $D] + $X0  + $T01}]  7]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [F $A $B $C] + $X1  + $T02}] 12]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [F $D $A $B] + $X2  + $T03}] 17]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [F $C $D $A] + $X3  + $T04}] 22]) & 0xffffffff}]
+	    # [ABCD  4  7  5]  [DABC  5 12  6]  [CDAB  6 17  7]  [BCDA  7 22  8]
+	    set A [expr {($B + [<<< [expr {$A + [F $B $C $D] + $X4  + $T05}]  7]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [F $A $B $C] + $X5  + $T06}] 12]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [F $D $A $B] + $X6  + $T07}] 17]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [F $C $D $A] + $X7  + $T08}] 22]) & 0xffffffff}]
+	    # [ABCD  8  7  9]  [DABC  9 12 10]  [CDAB 10 17 11]  [BCDA 11 22 12]
+	    set A [expr {($B + [<<< [expr {$A + [F $B $C $D] + $X8  + $T09}]  7]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [F $A $B $C] + $X9  + $T10}] 12]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [F $D $A $B] + $X10 + $T11}] 17]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [F $C $D $A] + $X11 + $T12}] 22]) & 0xffffffff}]
+	    # [ABCD 12  7 13]  [DABC 13 12 14]  [CDAB 14 17 15]  [BCDA 15 22 16]
+	    set A [expr {($B + [<<< [expr {$A + [F $B $C $D] + $X12 + $T13}]  7]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [F $A $B $C] + $X13 + $T14}] 12]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [F $D $A $B] + $X14 + $T15}] 17]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [F $C $D $A] + $X15 + $T16}] 22]) & 0xffffffff}]
+
+	    # Round 2.
+	    # Let [abcd k s i] denote the operation
+	    #      a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s).
+	    # Do the following 16 operations.
+	    # [ABCD  1  5 17]  [DABC  6  9 18]  [CDAB 11 14 19]  [BCDA  0 20 20]
+	    set A [expr {($B + [<<< [expr {$A + [G $B $C $D] + $X1  + $T17}]  5]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [G $A $B $C] + $X6  + $T18}]  9]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [G $D $A $B] + $X11 + $T19}] 14]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [G $C $D $A] + $X0  + $T20}] 20]) & 0xffffffff}]
+	    # [ABCD  5  5 21]  [DABC 10  9 22]  [CDAB 15 14 23]  [BCDA  4 20 24]
+	    set A [expr {($B + [<<< [expr {$A + [G $B $C $D] + $X5  + $T21}]  5]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [G $A $B $C] + $X10 + $T22}]  9]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [G $D $A $B] + $X15 + $T23}] 14]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [G $C $D $A] + $X4  + $T24}] 20]) & 0xffffffff}]
+	    # [ABCD  9  5 25]  [DABC 14  9 26]  [CDAB  3 14 27]  [BCDA  8 20 28]
+	    set A [expr {($B + [<<< [expr {$A + [G $B $C $D] + $X9  + $T25}]  5]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [G $A $B $C] + $X14 + $T26}]  9]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [G $D $A $B] + $X3  + $T27}] 14]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [G $C $D $A] + $X8  + $T28}] 20]) & 0xffffffff}]
+	    # [ABCD 13  5 29]  [DABC  2  9 30]  [CDAB  7 14 31]  [BCDA 12 20 32]
+	    set A [expr {($B + [<<< [expr {$A + [G $B $C $D] + $X13 + $T29}]  5]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [G $A $B $C] + $X2  + $T30}]  9]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [G $D $A $B] + $X7  + $T31}] 14]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [G $C $D $A] + $X12 + $T32}] 20]) & 0xffffffff}]
+
+	    # Round 3.
+	    # Let [abcd k s t] [sic] denote the operation
+	    #     a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s).
+	    # Do the following 16 operations.
+	    # [ABCD  5  4 33]  [DABC  8 11 34]  [CDAB 11 16 35]  [BCDA 14 23 36]
+	    set A [expr {($B + [<<< [expr {$A + [H $B $C $D] + $X5  + $T33}]  4]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [H $A $B $C] + $X8  + $T34}] 11]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [H $D $A $B] + $X11 + $T35}] 16]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [H $C $D $A] + $X14 + $T36}] 23]) & 0xffffffff}]
+	    # [ABCD  1  4 37]  [DABC  4 11 38]  [CDAB  7 16 39]  [BCDA 10 23 40]
+	    set A [expr {($B + [<<< [expr {$A + [H $B $C $D] + $X1  + $T37}]  4]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [H $A $B $C] + $X4  + $T38}] 11]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [H $D $A $B] + $X7  + $T39}] 16]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [H $C $D $A] + $X10 + $T40}] 23]) & 0xffffffff}]
+	    # [ABCD 13  4 41]  [DABC  0 11 42]  [CDAB  3 16 43]  [BCDA  6 23 44]
+	    set A [expr {($B + [<<< [expr {$A + [H $B $C $D] + $X13 + $T41}]  4]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [H $A $B $C] + $X0  + $T42}] 11]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [H $D $A $B] + $X3  + $T43}] 16]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [H $C $D $A] + $X6  + $T44}] 23]) & 0xffffffff}]
+	    # [ABCD  9  4 45]  [DABC 12 11 46]  [CDAB 15 16 47]  [BCDA  2 23 48]
+	    set A [expr {($B + [<<< [expr {$A + [H $B $C $D] + $X9  + $T45}]  4]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [H $A $B $C] + $X12 + $T46}] 11]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [H $D $A $B] + $X15 + $T47}] 16]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [H $C $D $A] + $X2  + $T48}] 23]) & 0xffffffff}]
+
+	    # Round 4.
+	    # Let [abcd k s t] [sic] denote the operation
+	    #     a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s).
+	    # Do the following 16 operations.
+	    # [ABCD  0  6 49]  [DABC  7 10 50]  [CDAB 14 15 51]  [BCDA  5 21 52]
+	    set A [expr {($B + [<<< [expr {$A + [I $B $C $D] + $X0  + $T49}]  6]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [I $A $B $C] + $X7  + $T50}] 10]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [I $D $A $B] + $X14 + $T51}] 15]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [I $C $D $A] + $X5  + $T52}] 21]) & 0xffffffff}]
+	    # [ABCD 12  6 53]  [DABC  3 10 54]  [CDAB 10 15 55]  [BCDA  1 21 56]
+	    set A [expr {($B + [<<< [expr {$A + [I $B $C $D] + $X12 + $T53}]  6]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [I $A $B $C] + $X3  + $T54}] 10]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [I $D $A $B] + $X10 + $T55}] 15]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [I $C $D $A] + $X1  + $T56}] 21]) & 0xffffffff}]
+	    # [ABCD  8  6 57]  [DABC 15 10 58]  [CDAB  6 15 59]  [BCDA 13 21 60]
+	    set A [expr {($B + [<<< [expr {$A + [I $B $C $D] + $X8  + $T57}]  6]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [I $A $B $C] + $X15 + $T58}] 10]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [I $D $A $B] + $X6  + $T59}] 15]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [I $C $D $A] + $X13 + $T60}] 21]) & 0xffffffff}]
+	    # [ABCD  4  6 61]  [DABC 11 10 62]  [CDAB  2 15 63]  [BCDA  9 21 64]
+	    set A [expr {($B + [<<< [expr {$A + [I $B $C $D] + $X4  + $T61}]  6]) & 0xffffffff}]
+	    set D [expr {($A + [<<< [expr {$D + [I $A $B $C] + $X11 + $T62}] 10]) & 0xffffffff}]
+	    set C [expr {($D + [<<< [expr {$C + [I $D $A $B] + $X2  + $T63}] 15]) & 0xffffffff}]
+	    set B [expr {($C + [<<< [expr {$B + [I $C $D $A] + $X9  + $T64}] 21]) & 0xffffffff}]
+
+	    # Then perform the following additions. (That is increment each
+	    #   of the four registers by the value it had before this block
+	    #   was started.)
+	    incr A $AA
+	    incr B $BB
+	    incr C $CC
+	    incr D $DD
+	}
+	# 3.5 Step 5. Output
+
+	# ... begin with the low-order byte of A, and end with the high-order byte
+	# of D.
+
+	return [bytes $A][bytes $B][bytes $C][bytes $D]
+    }
+
+    #
+    # Here we inline/regsub the functions F, G, H, I and <<< 
+    #
+
+    namespace eval ::md5 {
+	#proc md5pure::F {x y z} {expr {(($x & $y) | ((~$x) & $z))}}
+	regsub -all -- {\[ *F +(\$.) +(\$.) +(\$.) *\]} $md5body {((\1 \& \2) | ((~\1) \& \3))} md5body
+
+	#proc md5pure::G {x y z} {expr {(($x & $z) | ($y & (~$z)))}}
+	regsub -all -- {\[ *G +(\$.) +(\$.) +(\$.) *\]} $md5body {((\1 \& \3) | (\2 \& (~\3)))} md5body
+
+	#proc md5pure::H {x y z} {expr {$x ^ $y ^ $z}}
+	regsub -all -- {\[ *H +(\$.) +(\$.) +(\$.) *\]} $md5body {(\1 ^ \2 ^ \3)} md5body
+
+	#proc md5pure::I {x y z} {expr {$y ^ ($x | (~$z))}}
+	regsub -all -- {\[ *I +(\$.) +(\$.) +(\$.) *\]} $md5body {(\2 ^ (\1 | (~\3)))} md5body
+
+	# bitwise left-rotate
+	if {0} {
+	    proc md5pure::<<< {x i} {
+		# This works by bitwise-ORing together right piece and left
+		# piece so that the (original) right piece becomes the left
+		# piece and vice versa.
+		#
+		# The (original) right piece is a simple left shift.
+		# The (original) left piece should be a simple right shift
+		# but Tcl does sign extension on right shifts so we
+		# shift it 1 bit, mask off the sign, and finally shift
+		# it the rest of the way.
+		
+		# expr {($x << $i) | ((($x >> 1) & 0x7fffffff) >> (31-$i))}
+
+		#
+		# New version, faster when inlining
+		# We replace inline (computing at compile time):
+		#   R$i -> (32 - $i)
+		#   S$i -> (0x7fffffff >> (31-$i))
+		#
+
+		expr { ($x << $i) | (($x >> [set R$i]) & [set S$i])}
+	    }
+	}
+	# inline <<<
+	regsub -all -- {\[ *<<< +\[ *expr +({[^\}]*})\] +([0-9]+) *\]} $md5body {(([set x [expr \1]] << \2) |  (($x >> R\2) \& S\2))} md5body
+
+	# now replace the R and S
+	variable map {}
+	variable i
+	foreach i { 
+	    7 12 17 22
+	    5  9 14 20
+	    4 11 16 23
+	    6 10 15 21 
+	} {
+	    lappend map R$i [expr {32 - $i}] S$i [expr {0x7fffffff >> (31-$i)}]
+	}
+	
+	# inline the values of T
+	variable tVal
+	variable tName
+	foreach \
+		tName {
+	    T01 T02 T03 T04 T05 T06 T07 T08 T09 T10 
+	    T11 T12 T13 T14 T15 T16 T17 T18 T19 T20 
+	    T21 T22 T23 T24 T25 T26 T27 T28 T29 T30 
+	    T31 T32 T33 T34 T35 T36 T37 T38 T39 T40 
+	    T41 T42 T43 T44 T45 T46 T47 T48 T49 T50 
+	    T51 T52 T53 T54 T55 T56 T57 T58 T59 T60 
+	    T61 T62 T63 T64 } \
+		tVal {
+	    0xd76aa478 0xe8c7b756 0x242070db 0xc1bdceee
+	    0xf57c0faf 0x4787c62a 0xa8304613 0xfd469501
+	    0x698098d8 0x8b44f7af 0xffff5bb1 0x895cd7be
+	    0x6b901122 0xfd987193 0xa679438e 0x49b40821
+
+	    0xf61e2562 0xc040b340 0x265e5a51 0xe9b6c7aa
+	    0xd62f105d 0x2441453  0xd8a1e681 0xe7d3fbc8
+	    0x21e1cde6 0xc33707d6 0xf4d50d87 0x455a14ed
+	    0xa9e3e905 0xfcefa3f8 0x676f02d9 0x8d2a4c8a
+
+	    0xfffa3942 0x8771f681 0x6d9d6122 0xfde5380c
+	    0xa4beea44 0x4bdecfa9 0xf6bb4b60 0xbebfbc70
+	    0x289b7ec6 0xeaa127fa 0xd4ef3085 0x4881d05
+	    0xd9d4d039 0xe6db99e5 0x1fa27cf8 0xc4ac5665
+
+	    0xf4292244 0x432aff97 0xab9423a7 0xfc93a039
+	    0x655b59c3 0x8f0ccc92 0xffeff47d 0x85845dd1
+	    0x6fa87e4f 0xfe2ce6e0 0xa3014314 0x4e0811a1
+	    0xf7537e82 0xbd3af235 0x2ad7d2bb 0xeb86d391
+	} {
+	    lappend map \$$tName $tVal
+	}
+	set md5body [string map $map $md5body]
+	
+
+	# Finally, define the proc
+	proc md5 {msg} $md5body
+
+	# unset auxiliary variables
+	unset md5body tName tVal map i
+    }
+
+    proc ::md5::byte0 {i} {expr {0xff & $i}}
+    proc ::md5::byte1 {i} {expr {(0xff00 & $i) >> 8}}
+    proc ::md5::byte2 {i} {expr {(0xff0000 & $i) >> 16}}
+    proc ::md5::byte3 {i} {expr {((0xff000000 & $i) >> 24) & 0xff}}
+
+    proc ::md5::bytes {i} {
+	format %0.2x%0.2x%0.2x%0.2x [byte0 $i] [byte1 $i] [byte2 $i] [byte3 $i]
+    }
+
+    # hmac: hash for message authentication
+    proc ::md5::hmac {key text} {
+	# if key is longer than 64 bytes, reset it to MD5(key).  If shorter, 
+	# pad it out with null (\x00) chars.
+	set keyLen [string length $key]
+	if {$keyLen > 64} {
+	    set key [binary format H32 [md5 $key]]
+	    set keyLen [string length $key]
+	}
+
+	# ensure the key is padded out to 64 chars with nulls.
+	set padLen [expr {64 - $keyLen}]
+	append key [binary format "a$padLen" {}]
+	
+	# Split apart the key into a list of 16 little-endian words
+	binary scan $key i16 blocks
+
+	# XOR key with ipad and opad values
+	set k_ipad {}
+	set k_opad {}
+	foreach i $blocks {
+	    append k_ipad [binary format i [expr {$i ^ 0x36363636}]]
+	    append k_opad [binary format i [expr {$i ^ 0x5c5c5c5c}]]
+	}
+    
+	# Perform inner md5, appending its results to the outer key
+	append k_ipad $text
+	append k_opad [binary format H* [md5 $k_ipad]]
+
+	# Perform outer md5
+	md5 $k_opad
+    }
+}
+
+package provide md5 1.4.5
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5/md5c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5/md5c.tcl
new file mode 100644
index 00000000..240f29a9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5/md5c.tcl
@@ -0,0 +1,148 @@
+# md5c.tcl - 
+#
+# Wrapper for RSA's Message Digest in C
+#
+# Written by Jean-Claude Wippler <jcw@equi4.com>
+#
+# $Id: md5c.tcl,v 1.5 2009/05/06 22:46:10 patthoyts Exp $
+
+package require critcl;                 # needs critcl
+# @sak notprovided md5c
+package provide md5c 0.12;              # 
+
+critcl::cheaders md5.h;                 # The RSA header file
+critcl::csources md5.c;                 # The RSA MD5 implementation.
+
+namespace eval ::md5 {
+
+    critcl::ccode {
+        #include <string.h>
+        #include "md5.h"
+        #include <assert.h>
+
+        static
+        Tcl_ObjType md5_type; /* fast internal access representation */
+        
+        static void 
+        md5_free_rep(Tcl_Obj *obj)
+        {
+            MD5_CTX *mp = (MD5_CTX *) obj->internalRep.otherValuePtr;
+            Tcl_Free((char*)mp);
+        }
+        
+        static void
+        md5_dup_rep(Tcl_Obj *obj, Tcl_Obj *dup)
+        {
+            MD5_CTX *mp = (MD5_CTX *) obj->internalRep.otherValuePtr;
+            dup->internalRep.otherValuePtr = Tcl_Alloc(sizeof *mp);
+            memcpy(dup->internalRep.otherValuePtr, mp, sizeof *mp);
+            dup->typePtr = &md5_type;
+        }
+        
+        static void
+        md5_string_rep(Tcl_Obj *obj)
+        {
+            unsigned char buf[16];
+            Tcl_Obj *temp;
+            char *str;
+            MD5_CTX dup = *(MD5_CTX *) obj->internalRep.otherValuePtr;
+            
+            MD5Final(buf, &dup);
+            
+            /* convert via a byte array to properly handle null bytes */
+            temp = Tcl_NewByteArrayObj(buf, sizeof buf);
+            Tcl_IncrRefCount(temp);
+            
+            str = Tcl_GetStringFromObj(temp, &obj->length);
+            obj->bytes = Tcl_Alloc(obj->length + 1);
+            memcpy(obj->bytes, str, obj->length + 1);
+            
+            Tcl_DecrRefCount(temp);
+        }
+        
+        static int
+        md5_from_any(Tcl_Interp* ip, Tcl_Obj* obj)
+        {
+            assert(0);
+            return TCL_ERROR;
+        }
+        
+        static
+        Tcl_ObjType md5_type = {
+            "md5c", md5_free_rep, md5_dup_rep, md5_string_rep, md5_from_any
+        };
+    }
+    
+    critcl::ccommand md5c {dummy ip objc objv} {
+        MD5_CTX *mp;
+        unsigned char *data;
+        int size;
+        Tcl_Obj *obj;
+        
+        if (objc < 2 || objc > 3) {
+            Tcl_WrongNumArgs(ip, 1, objv, "data ?context?");
+            return TCL_ERROR;
+        }
+        
+        if (objc == 3) {
+            if (objv[2]->typePtr != &md5_type && md5_from_any(ip, objv[2]) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            obj = objv[2];
+            if (Tcl_IsShared(obj)) {
+                obj = Tcl_DuplicateObj(obj);
+            }
+        } else {
+            mp = (MD5_CTX *)Tcl_Alloc(sizeof *mp);
+            MD5Init(mp);
+            obj = Tcl_NewObj();
+            Tcl_InvalidateStringRep(obj);
+            obj->internalRep.otherValuePtr = mp;
+            obj->typePtr = &md5_type;
+        }
+        
+        mp = (MD5_CTX *) obj->internalRep.otherValuePtr;
+        data = Tcl_GetByteArrayFromObj(objv[1], &size);
+        MD5Update(mp, data, size);
+        Tcl_SetObjResult(ip, obj);
+        
+        return TCL_OK;
+    }
+}
+
+if {[info exists pkgtest] && $pkgtest} {
+
+  proc md5c_try {} {
+    foreach {msg expected} {
+      ""
+      "d41d8cd98f00b204e9800998ecf8427e"
+      "a"
+      "0cc175b9c0f1b6a831c399e269772661"
+      "abc"
+      "900150983cd24fb0d6963f7d28e17f72"
+      "message digest"
+      "f96b697d7cb7938d525a2f31aaf161d0"
+      "abcdefghijklmnopqrstuvwxyz"
+      "c3fcd3d76192e4007dfb496cca67e13b"
+      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+      "d174ab98d277d9f5a5611c2c9f419d9f"
+      "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+      "57edf4a22be3c955ac49da2e2107b67a"
+    } {
+      puts "testing: ::md5::md5c \"$msg\""
+      binary scan [::md5::md5c $msg] H* computed
+      puts "computed: $computed"
+      if {0 != [string compare $computed $expected]} {
+	puts "expected: $expected"
+	puts "FAILED"
+      }
+    }
+
+    foreach len {10 50 100 500 1000 5000 10000} {
+      set blanks [format %$len.0s ""]
+      puts "input length $len: [time {md5c $blanks} 1000]"
+    }
+  }
+
+  md5c_try
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5/md5x.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5/md5x.tcl
new file mode 100644
index 00000000..f021c0ac
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5/md5x.tcl
@@ -0,0 +1,739 @@
+# md5.tcl - Copyright (C) 2003 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# MD5  defined by RFC 1321, "The MD5 Message-Digest Algorithm"
+# HMAC defined by RFC 2104, "Keyed-Hashing for Message Authentication"
+#
+# This is an implementation of MD5 based upon the example code given in
+# RFC 1321 and upon the tcllib MD4 implementation and taking some ideas
+# from the earlier tcllib md5 version by Don Libes.
+#
+# This implementation permits incremental updating of the hash and 
+# provides support for external compiled implementations either using
+# critcl (md5c) or Trf.
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2;                # tcl minimum version
+
+namespace eval ::md5 {
+    variable  accel
+    array set accel {critcl 0 cryptkit 0 trf 0}
+
+    namespace export md5 hmac MD5Init MD5Update MD5Final
+
+    variable uid
+    if {![info exists uid]} {
+        set uid 0
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# MD5Init --
+#
+#   Create and initialize an MD5 state variable. This will be
+#   cleaned up when we call MD5Final
+#
+proc ::md5::MD5Init {} {
+    variable accel
+    variable uid
+    set token [namespace current]::[incr uid]
+    upvar #0 $token state
+
+    # RFC1321:3.3 - Initialize MD5 state structure
+    array set state \
+        [list \
+             A [expr {0x67452301}] \
+             B [expr {0xefcdab89}] \
+             C [expr {0x98badcfe}] \
+             D [expr {0x10325476}] \
+             n 0 i "" ]
+    if {$accel(cryptkit)} {
+        cryptkit::cryptCreateContext state(ckctx) CRYPT_UNUSED CRYPT_ALGO_MD5
+    } elseif {$accel(trf)} {
+        set s {}
+        switch -exact -- $::tcl_platform(platform) {
+            windows { set s [open NUL w] }
+            unix    { set s [open /dev/null w] }
+        }
+        if {$s != {}} {
+            fconfigure $s -translation binary -buffering none
+            ::md5 -attach $s -mode write \
+                -read-type variable \
+                -read-destination [subst $token](trfread) \
+                -write-type variable \
+                -write-destination [subst $token](trfwrite)
+            array set state [list trfread 0 trfwrite 0 trf $s]
+        }
+    }
+    return $token
+}
+
+# MD5Update --
+#
+#   This is called to add more data into the hash. You may call this
+#   as many times as you require. Note that passing in "ABC" is equivalent
+#   to passing these letters in as separate calls -- hence this proc 
+#   permits hashing of chunked data
+#
+#   If we have a C-based implementation available, then we will use
+#   it here in preference to the pure-Tcl implementation.
+#
+proc ::md5::MD5Update {token data} {
+    variable accel
+    upvar #0 $token state
+
+    if {$accel(critcl)} {
+        if {[info exists state(md5c)]} {
+            set state(md5c) [md5c $data $state(md5c)]
+        } else {
+            set state(md5c) [md5c $data]
+        }
+        return
+    } elseif {[info exists state(ckctx)]} {
+        if {[string length $data] > 0} {
+            cryptkit::cryptEncrypt $state(ckctx) $data
+        }
+        return
+    } elseif {[info exists state(trf)]} {
+        puts -nonewline $state(trf) $data
+        return
+    }
+
+    # Update the state values
+    incr state(n) [string length $data]
+    append state(i) $data
+
+    # Calculate the hash for any complete blocks
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        MD5Hash $token [string range $state(i) $n [incr n 64]]
+    }
+
+    # Adjust the state for the blocks completed.
+    set state(i) [string range $state(i) $n end]
+    return
+}
+
+# MD5Final --
+#
+#    This procedure is used to close the current hash and returns the
+#    hash data. Once this procedure has been called the hash context
+#    is freed and cannot be used again.
+#
+#    Note that the output is 128 bits represented as binary data.
+#
+proc ::md5::MD5Final {token} {
+    upvar #0 $token state
+
+    # Check for either of the C-compiled versions.
+    if {[info exists state(md5c)]} {
+        set r $state(md5c)
+        unset state
+        return $r
+    } elseif {[info exists state(ckctx)]} {
+        cryptkit::cryptEncrypt $state(ckctx) ""
+        cryptkit::cryptGetAttributeString $state(ckctx) \
+            CRYPT_CTXINFO_HASHVALUE r 16
+        cryptkit::cryptDestroyContext $state(ckctx)
+        # If nothing was hashed, we get no r variable set!
+        if {[info exists r]} {
+            unset state
+            return $r
+        }
+    } elseif {[info exists state(trf)]} {
+        close $state(trf)
+        set r $state(trfwrite)
+        unset state
+        return $r
+    }
+
+    # RFC1321:3.1 - Padding
+    #
+    set len [string length $state(i)]
+    set pad [expr {56 - ($len % 64)}]
+    if {$len % 64 > 56} {
+        incr pad 64
+    }
+    if {$pad == 0} {
+        incr pad 64
+    }
+
+    #puts "P $pad|bits=[expr {8 * $state(n)}]"
+
+    append state(i) [binary format a$pad \x80]
+
+    # RFC1321:3.2 - Append length in bits as little-endian wide int.
+    append state(i) [binary format ii [expr {8 * $state(n)}] 0]
+
+    #puts DATA=[Hex $state(i)]([string length $state(i)])
+
+    # Calculate the hash for the remaining block.
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        MD5Hash $token [string range $state(i) $n [incr n 64]]
+    }
+
+    #puts md5-post__________________________________________
+    #parray ::${token}
+
+    # RFC1321:3.5 - Output
+    set r [bytes $state(A)][bytes $state(B)][bytes $state(C)][bytes $state(D)]
+    unset state
+
+    #puts HASH=[Hex $r]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# HMAC Hashed Message Authentication (RFC 2104)
+#
+# hmac = H(K xor opad, H(K xor ipad, text))
+#
+
+# HMACInit --
+#
+#    This is equivalent to the MD5Init procedure except that a key is
+#    added into the algorithm
+#
+proc ::md5::HMACInit {K} {
+
+    # Key K is adjusted to be 64 bytes long. If K is larger, then use
+    # the MD5 digest of K and pad this instead.
+    set len [string length $K]
+    if {$len > 64} {
+        set tok [MD5Init]
+        MD5Update $tok $K
+        set K [MD5Final $tok]
+        set len [string length $K]
+    }
+    set pad [expr {64 - $len}]
+    append K [string repeat \0 $pad]
+
+    # Cacluate the padding buffers.
+    set Ki {}
+    set Ko {}
+    binary scan $K i16 Ks
+    foreach k $Ks {
+        append Ki [binary format i [expr {$k ^ 0x36363636}]]
+        append Ko [binary format i [expr {$k ^ 0x5c5c5c5c}]]
+    }
+
+    set tok [MD5Init]
+    MD5Update $tok $Ki;                 # initialize with the inner pad
+    
+    # preserve the Ko value for the final stage.
+    # FRINK: nocheck
+    set [subst $tok](Ko) $Ko
+
+    return $tok
+}
+
+# HMACUpdate --
+#
+#    Identical to calling MD5Update
+#
+proc ::md5::HMACUpdate {token data} {
+    MD5Update $token $data
+    return
+}
+
+# HMACFinal --
+#
+#    This is equivalent to the MD5Final procedure. The hash context is
+#    closed and the binary representation of the hash result is returned.
+#
+proc ::md5::HMACFinal {token} {
+    upvar #0 $token state
+
+    set tok [MD5Init];                  # init the outer hashing function
+    MD5Update $tok $state(Ko);          # prepare with the outer pad.
+    MD5Update $tok [MD5Final $token];   # hash the inner result
+    return [MD5Final $tok]
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  This is the core MD5 algorithm. It is a lot like the MD4 algorithm but
+#  includes an extra round and a set of constant modifiers throughout.
+# 
+# Note:
+#  This function body is substituted later on to inline some of the 
+#  procedures and to make is a bit more comprehensible.
+#
+set ::md5::MD5Hash_body {
+    variable $token
+    upvar 0 $token state
+
+    #puts TR__=[Hex $msg]([string length $msg])
+
+    # RFC1321:3.4 - Process Message in 16-Word Blocks
+    binary scan $msg i* blocks
+    foreach {X0 X1 X2 X3 X4 X5 X6 X7 X8 X9 X10 X11 X12 X13 X14 X15} $blocks {
+        #puts BL
+
+        set A $state(A)
+        set B $state(B)
+        set C $state(C)
+        set D $state(D)
+
+        # Round 1
+        # Let [abcd k s i] denote the operation
+        #   a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s).
+        # Do the following 16 operations.
+        # [ABCD  0  7  1]  [DABC  1 12  2]  [CDAB  2 17  3]  [BCDA  3 22  4]
+        set A [expr {$B + (($A + [F $B $C $D] + $X0 + $T01) <<< 7)}]
+        set D [expr {$A + (($D + [F $A $B $C] + $X1 + $T02) <<< 12)}]
+        set C [expr {$D + (($C + [F $D $A $B] + $X2 + $T03) <<< 17)}]
+        set B [expr {$C + (($B + [F $C $D $A] + $X3 + $T04) <<< 22)}]
+        # [ABCD  4  7  5]  [DABC  5 12  6]  [CDAB  6 17  7]  [BCDA  7 22  8]
+        set A [expr {$B + (($A + [F $B $C $D] + $X4 + $T05) <<< 7)}]
+        set D [expr {$A + (($D + [F $A $B $C] + $X5 + $T06) <<< 12)}]
+        set C [expr {$D + (($C + [F $D $A $B] + $X6 + $T07) <<< 17)}]
+        set B [expr {$C + (($B + [F $C $D $A] + $X7 + $T08) <<< 22)}]
+        # [ABCD  8  7  9]  [DABC  9 12 10]  [CDAB 10 17 11]  [BCDA 11 22 12]
+        set A [expr {$B + (($A + [F $B $C $D] + $X8 + $T09) <<< 7)}]
+        set D [expr {$A + (($D + [F $A $B $C] + $X9 + $T10) <<< 12)}]
+        set C [expr {$D + (($C + [F $D $A $B] + $X10 + $T11) <<< 17)}]
+        set B [expr {$C + (($B + [F $C $D $A] + $X11 + $T12) <<< 22)}]
+        # [ABCD 12  7 13]  [DABC 13 12 14]  [CDAB 14 17 15]  [BCDA 15 22 16]
+        set A [expr {$B + (($A + [F $B $C $D] + $X12 + $T13) <<< 7)}]
+        set D [expr {$A + (($D + [F $A $B $C] + $X13 + $T14) <<< 12)}]
+        set C [expr {$D + (($C + [F $D $A $B] + $X14 + $T15) <<< 17)}]
+        set B [expr {$C + (($B + [F $C $D $A] + $X15 + $T16) <<< 22)}]
+
+        # Round 2.
+        # Let [abcd k s i] denote the operation
+        #   a = b + ((a + G(b,c,d) + X[k] + Ti) <<< s)
+        # Do the following 16 operations.
+        # [ABCD  1  5 17]  [DABC  6  9 18]  [CDAB 11 14 19]  [BCDA  0 20 20]
+        set A [expr {$B + (($A + [G $B $C $D] + $X1  + $T17) <<<  5)}]
+        set D [expr {$A + (($D + [G $A $B $C] + $X6  + $T18) <<<  9)}]
+        set C [expr {$D + (($C + [G $D $A $B] + $X11 + $T19) <<< 14)}]
+        set B [expr {$C + (($B + [G $C $D $A] + $X0  + $T20) <<< 20)}]
+        # [ABCD  5  5 21]  [DABC 10  9 22]  [CDAB 15 14 23]  [BCDA  4 20 24]
+        set A [expr {$B + (($A + [G $B $C $D] + $X5  + $T21) <<<  5)}]
+        set D [expr {$A + (($D + [G $A $B $C] + $X10 + $T22) <<<  9)}]
+        set C [expr {$D + (($C + [G $D $A $B] + $X15 + $T23) <<< 14)}]
+        set B [expr {$C + (($B + [G $C $D $A] + $X4  + $T24) <<< 20)}]
+        # [ABCD  9  5 25]  [DABC 14  9 26]  [CDAB  3 14 27]  [BCDA  8 20 28]
+        set A [expr {$B + (($A + [G $B $C $D] + $X9  + $T25) <<<  5)}]
+        set D [expr {$A + (($D + [G $A $B $C] + $X14 + $T26) <<<  9)}]
+        set C [expr {$D + (($C + [G $D $A $B] + $X3  + $T27) <<< 14)}]
+        set B [expr {$C + (($B + [G $C $D $A] + $X8  + $T28) <<< 20)}]
+        # [ABCD 13  5 29]  [DABC  2  9 30]  [CDAB  7 14 31]  [BCDA 12 20 32]
+        set A [expr {$B + (($A + [G $B $C $D] + $X13 + $T29) <<<  5)}]
+        set D [expr {$A + (($D + [G $A $B $C] + $X2  + $T30) <<<  9)}]
+        set C [expr {$D + (($C + [G $D $A $B] + $X7  + $T31) <<< 14)}]
+        set B [expr {$C + (($B + [G $C $D $A] + $X12 + $T32) <<< 20)}]
+        
+        # Round 3.
+        # Let [abcd k s i] denote the operation
+        #   a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s)
+        # Do the following 16 operations.
+        # [ABCD  5  4 33]  [DABC  8 11 34]  [CDAB 11 16 35]  [BCDA 14 23 36]
+        set A [expr {$B + (($A + [H $B $C $D] + $X5  + $T33) <<<  4)}]
+        set D [expr {$A + (($D + [H $A $B $C] + $X8  + $T34) <<< 11)}]
+        set C [expr {$D + (($C + [H $D $A $B] + $X11 + $T35) <<< 16)}]
+        set B [expr {$C + (($B + [H $C $D $A] + $X14 + $T36) <<< 23)}]
+        # [ABCD  1  4 37]  [DABC  4 11 38]  [CDAB  7 16 39]  [BCDA 10 23 40]
+        set A [expr {$B + (($A + [H $B $C $D] + $X1  + $T37) <<<  4)}]
+        set D [expr {$A + (($D + [H $A $B $C] + $X4  + $T38) <<< 11)}]
+        set C [expr {$D + (($C + [H $D $A $B] + $X7  + $T39) <<< 16)}]
+        set B [expr {$C + (($B + [H $C $D $A] + $X10 + $T40) <<< 23)}]
+        # [ABCD 13  4 41]  [DABC  0 11 42]  [CDAB  3 16 43]  [BCDA  6 23 44]
+        set A [expr {$B + (($A + [H $B $C $D] + $X13 + $T41) <<<  4)}]
+        set D [expr {$A + (($D + [H $A $B $C] + $X0  + $T42) <<< 11)}]
+        set C [expr {$D + (($C + [H $D $A $B] + $X3  + $T43) <<< 16)}]
+        set B [expr {$C + (($B + [H $C $D $A] + $X6  + $T44) <<< 23)}]
+        # [ABCD  9  4 45]  [DABC 12 11 46]  [CDAB 15 16 47]  [BCDA  2 23 48]
+        set A [expr {$B + (($A + [H $B $C $D] + $X9  + $T45) <<<  4)}]
+        set D [expr {$A + (($D + [H $A $B $C] + $X12 + $T46) <<< 11)}]
+        set C [expr {$D + (($C + [H $D $A $B] + $X15 + $T47) <<< 16)}]
+        set B [expr {$C + (($B + [H $C $D $A] + $X2  + $T48) <<< 23)}]
+
+        # Round 4.
+        # Let [abcd k s i] denote the operation
+        #   a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s)
+        # Do the following 16 operations.
+        # [ABCD  0  6 49]  [DABC  7 10 50]  [CDAB 14 15 51]  [BCDA  5 21 52]
+        set A [expr {$B + (($A + [I $B $C $D] + $X0  + $T49) <<<  6)}]
+        set D [expr {$A + (($D + [I $A $B $C] + $X7  + $T50) <<< 10)}]
+        set C [expr {$D + (($C + [I $D $A $B] + $X14 + $T51) <<< 15)}]
+        set B [expr {$C + (($B + [I $C $D $A] + $X5  + $T52) <<< 21)}]
+        # [ABCD 12  6 53]  [DABC  3 10 54]  [CDAB 10 15 55]  [BCDA  1 21 56]
+        set A [expr {$B + (($A + [I $B $C $D] + $X12 + $T53) <<<  6)}]
+        set D [expr {$A + (($D + [I $A $B $C] + $X3  + $T54) <<< 10)}]
+        set C [expr {$D + (($C + [I $D $A $B] + $X10 + $T55) <<< 15)}]
+        set B [expr {$C + (($B + [I $C $D $A] + $X1  + $T56) <<< 21)}]
+        # [ABCD  8  6 57]  [DABC 15 10 58]  [CDAB  6 15 59]  [BCDA 13 21 60]
+        set A [expr {$B + (($A + [I $B $C $D] + $X8  + $T57) <<<  6)}]
+        set D [expr {$A + (($D + [I $A $B $C] + $X15 + $T58) <<< 10)}]
+        set C [expr {$D + (($C + [I $D $A $B] + $X6  + $T59) <<< 15)}]
+        set B [expr {$C + (($B + [I $C $D $A] + $X13 + $T60) <<< 21)}]
+        # [ABCD  4  6 61]  [DABC 11 10 62]  [CDAB  2 15 63]  [BCDA  9 21 64]
+        set A [expr {$B + (($A + [I $B $C $D] + $X4  + $T61) <<<  6)}]
+        set D [expr {$A + (($D + [I $A $B $C] + $X11 + $T62) <<< 10)}]
+        set C [expr {$D + (($C + [I $D $A $B] + $X2  + $T63) <<< 15)}]
+        set B [expr {$C + (($B + [I $C $D $A] + $X9  + $T64) <<< 21)}]
+
+        # Then perform the following additions. (That is, increment each
+        # of the four registers by the value it had before this block
+        # was started.)
+        incr state(A) $A
+        incr state(B) $B
+        incr state(C) $C
+        incr state(D) $D
+    }
+
+    return
+}
+
+proc ::md5::byte {n v} {expr {((0xFF << (8 * $n)) & $v) >> (8 * $n)}}
+proc ::md5::bytes {v} { 
+    #format %c%c%c%c [byte 0 $v] [byte 1 $v] [byte 2 $v] [byte 3 $v]
+    format %c%c%c%c \
+        [expr {0xFF & $v}] \
+        [expr {(0xFF00 & $v) >> 8}] \
+        [expr {(0xFF0000 & $v) >> 16}] \
+        [expr {((0xFF000000 & $v) >> 24) & 0xFF}]
+}
+
+# 32bit rotate-left
+proc ::md5::<<< {v n} {
+    return [expr {((($v << $n) \
+                        | (($v >> (32 - $n)) \
+                               & (0x7FFFFFFF >> (31 - $n))))) \
+                      & 0xFFFFFFFF}]
+}
+
+# Convert our <<< pseudo-operator into a procedure call.
+regsub -all -line \
+    {\[expr {(\$[ABCD]) \+ \(\((.*)\)\s+<<<\s+(\d+)\)}\]} \
+    $::md5::MD5Hash_body \
+    {[expr {int(\1 + [<<< [expr {\2}] \3])}]} \
+    ::md5::MD5Hash_body
+
+# RFC1321:3.4 - function F
+proc ::md5::F {X Y Z} {
+    return [expr {($X & $Y) | ((~$X) & $Z)}]
+}
+
+# Inline the F function
+regsub -all -line \
+    {\[F (\$[ABCD]) (\$[ABCD]) (\$[ABCD])\]} \
+    $::md5::MD5Hash_body \
+    {( (\1 \& \2) | ((~\1) \& \3) )} \
+    ::md5::MD5Hash_body
+    
+# RFC1321:3.4 - function G
+proc ::md5::G {X Y Z} {
+    return [expr {(($X & $Z) | ($Y & (~$Z)))}]
+}
+
+# Inline the G function
+regsub -all -line \
+    {\[G (\$[ABCD]) (\$[ABCD]) (\$[ABCD])\]} \
+    $::md5::MD5Hash_body \
+    {(((\1 \& \3) | (\2 \& (~\3))))} \
+    ::md5::MD5Hash_body
+
+# RFC1321:3.4 - function H
+proc ::md5::H {X Y Z} {
+    return [expr {$X ^ $Y ^ $Z}]
+}
+
+# Inline the H function
+regsub -all -line \
+    {\[H (\$[ABCD]) (\$[ABCD]) (\$[ABCD])\]} \
+    $::md5::MD5Hash_body \
+    {(\1 ^ \2 ^ \3)} \
+    ::md5::MD5Hash_body
+
+# RFC1321:3.4 - function I
+proc ::md5::I {X Y Z} {
+    return [expr {$Y ^ ($X | (~$Z))}]
+}
+
+# Inline the I function
+regsub -all -line \
+    {\[I (\$[ABCD]) (\$[ABCD]) (\$[ABCD])\]} \
+    $::md5::MD5Hash_body \
+    {(\2 ^ (\1 | (~\3)))} \
+    ::md5::MD5Hash_body
+
+
+# RFC 1321:3.4 step 4: inline the set of constant modifiers.
+namespace eval md5 {
+    variable tName
+    variable tVal
+    variable map
+    foreach tName {
+        T01 T02 T03 T04 T05 T06 T07 T08 T09 T10 
+        T11 T12 T13 T14 T15 T16 T17 T18 T19 T20 
+        T21 T22 T23 T24 T25 T26 T27 T28 T29 T30 
+        T31 T32 T33 T34 T35 T36 T37 T38 T39 T40 
+        T41 T42 T43 T44 T45 T46 T47 T48 T49 T50 
+        T51 T52 T53 T54 T55 T56 T57 T58 T59 T60 
+        T61 T62 T63 T64 
+    }  tVal {
+        0xd76aa478 0xe8c7b756 0x242070db 0xc1bdceee
+        0xf57c0faf 0x4787c62a 0xa8304613 0xfd469501
+        0x698098d8 0x8b44f7af 0xffff5bb1 0x895cd7be
+        0x6b901122 0xfd987193 0xa679438e 0x49b40821
+        
+        0xf61e2562 0xc040b340 0x265e5a51 0xe9b6c7aa
+        0xd62f105d 0x2441453  0xd8a1e681 0xe7d3fbc8
+        0x21e1cde6 0xc33707d6 0xf4d50d87 0x455a14ed
+        0xa9e3e905 0xfcefa3f8 0x676f02d9 0x8d2a4c8a
+        
+        0xfffa3942 0x8771f681 0x6d9d6122 0xfde5380c
+        0xa4beea44 0x4bdecfa9 0xf6bb4b60 0xbebfbc70
+        0x289b7ec6 0xeaa127fa 0xd4ef3085 0x4881d05
+        0xd9d4d039 0xe6db99e5 0x1fa27cf8 0xc4ac5665
+        
+        0xf4292244 0x432aff97 0xab9423a7 0xfc93a039
+        0x655b59c3 0x8f0ccc92 0xffeff47d 0x85845dd1
+        0x6fa87e4f 0xfe2ce6e0 0xa3014314 0x4e0811a1
+        0xf7537e82 0xbd3af235 0x2ad7d2bb 0xeb86d391
+    } {
+        lappend map \$$tName $tVal
+    }
+    set ::md5::MD5Hash_body [string map $map $::md5::MD5Hash_body]
+    unset map tName tVal
+}
+
+# Define the MD5 hashing procedure with inline functions.
+proc ::md5::MD5Hash {token msg} $::md5::MD5Hash_body
+unset ::md5::MD5Hash_body
+
+# -------------------------------------------------------------------------
+
+if {[package provide Trf] != {}} {
+    interp alias {} ::md5::Hex {} ::hex -mode encode --
+} else {
+    proc ::md5::Hex {data} {
+        binary scan $data H* result
+        return [string toupper $result]
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# LoadAccelerator --
+#
+#	This package can make use of a number of compiled extensions to
+#	accelerate the digest computation. This procedure manages the
+#	use of these extensions within the package. During normal usage
+#	this should not be called, but the test package manipulates the
+#	list of enabled accelerators.
+#
+proc ::md5::LoadAccelerator {name} {
+    variable accel
+    set r 0
+    switch -exact -- $name {
+        critcl {
+            if {![catch {package require tcllibc}]
+                || ![catch {package require md5c}]} {
+                set r [expr {[info commands ::md5::md5c] != {}}]
+            }
+        }
+        cryptkit {
+            if {![catch {package require cryptkit}]} {
+                set r [expr {![catch {cryptkit::cryptInit}]}]
+            }
+        }
+        trf {
+            if {![catch {package require Trf}]} {
+                set r [expr {![catch {::md5 aa} msg]}]
+            }
+        }
+        default {
+            return -code error "invalid accelerator package:\
+                must be one of [join [array names accel] {, }]"
+        }
+    }
+    set accel($name) $r
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::md5::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# fileevent handler for chunked file hashing.
+#
+proc ::md5::Chunk {token channel {chunksize 4096}} {
+    upvar #0 $token state
+    
+    if {[eof $channel]} {
+        fileevent $channel readable {}
+        set state(reading) 0
+    }
+        
+    MD5Update $token [read $channel $chunksize]
+}
+
+# -------------------------------------------------------------------------
+
+proc ::md5::md5 {args} {
+    array set opts {-hex 0 -filename {} -channel {} -chunksize 4096}
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -hex       { set opts(-hex) 1 }
+            -file*     { set opts(-filename) [Pop args 1] }
+            -channel   { set opts(-channel) [Pop args 1] }
+            -chunksize { set opts(-chunksize) [Pop args 1] }
+            default {
+                if {[llength $args] == 1} { break }
+                if {[string compare $option "--"] == 0} { Pop args; break }
+                set err [join [lsort [array names opts]] ", "]
+                return -code error "bad option $option:\
+                    must be one of $err\nlen: [llength $args]"
+            }
+        }
+        Pop args
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"md5 ?-hex? -filename file | string\""
+        }
+        set tok [MD5Init]
+
+        #puts md5_______________________________________________
+        #parray ::${tok}
+
+        #puts IN=(([lindex $args 0]))
+        MD5Update $tok [lindex $args 0]
+
+        #puts md5-final_________________________________________
+        #parray ::${tok}
+
+        set r [MD5Final $tok]
+
+    } else {
+
+        set tok [MD5Init]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        vwait [subst $tok](reading)
+        set r [MD5Final $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+proc ::md5::hmac {args} {
+    array set opts {-hex 0 -filename {} -channel {} -chunksize 4096}
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -key       { set opts(-key) [Pop args 1] }
+            -hex       { set opts(-hex) 1 }
+            -file*     { set opts(-filename) [Pop args 1] }
+            -channel   { set opts(-channel) [Pop args 1] }
+            -chunksize { set opts(-chunksize) [Pop args 1] }
+            default {
+                if {[llength $args] == 1} { break }
+                if {[string compare $option "--"] == 0} { Pop args; break }
+                set err [join [lsort [array names opts]] ", "]
+                return -code error "bad option $option:\
+                    must be one of $err"
+            }
+        }
+        Pop args
+    }
+
+    if {![info exists opts(-key)]} {
+        return -code error "wrong # args:\
+            should be \"hmac ?-hex? -key key -filename file | string\""
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"hmac ?-hex? -key key -filename file | string\""
+        }
+        set tok [HMACInit $opts(-key)]
+        HMACUpdate $tok [lindex $args 0]
+        set r [HMACFinal $tok]
+
+    } else {
+
+        set tok [HMACInit $opts(-key)]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        vwait [subst $tok](reading)
+        set r [HMACFinal $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# Try and load a compiled extension to help.
+namespace eval ::md5 {
+    variable e
+    foreach  e {critcl cryptkit trf} { if {[LoadAccelerator $e]} { break } }
+    unset    e
+}
+
+package provide md5 2.0.8
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
+
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5/pkgIndex.tcl
new file mode 100644
index 00000000..898f7f9e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded md5 2.0.8 [list source [file join $dir md5x.tcl]]
+package ifneeded md5 1.4.5 [list source [file join $dir md5.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5crypt/md5crypt.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5crypt/md5crypt.tcl
new file mode 100644
index 00000000..47d9a0a5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5crypt/md5crypt.tcl
@@ -0,0 +1,152 @@
+# md5crypt.tcl - Copyright (C) 2003 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# This file provides a pure tcl implementation of the BSD MD5 crypt algorithm.
+# The implementation is based upon the OpenBSD code which is in turn based upon
+# the original code by Poul-Henning Kamp. 
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+# @mdgen EXCLUDE: md5cryptc.tcl
+
+package require Tcl 8.2;                # tcl minimum version
+package require md5 2;                  # tcllib 1.5
+
+# Try and load a compiled extension to help.
+if {[catch {package require tcllibc}]} {
+    catch {package require md5cryptc}
+}
+
+namespace eval md5crypt {
+    variable itoa64 \
+        {./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz}
+
+    namespace import -force ::md5::MD5Init ::md5::MD5Update ::md5::MD5Final
+    namespace export md5crypt
+}
+
+proc ::md5crypt::to64_tcl {v n} {
+    variable itoa64
+    for {} {$n > 0} {incr n -1} {
+        set i [expr {$v & 0x3f}]
+        append s [string index $itoa64 $i]
+        set v [expr {($v >> 6) & 0x3FFFFFFF}]
+    }
+    return $s
+}
+
+# ::md5crypt::salt --
+#	Generate a salt string suitable for use with the md5crypt command.
+proc ::md5crypt::salt {{len 8}} {
+    variable itoa64
+    set salt ""
+    for {set n 0} {$n < $len} {incr n} {
+        append salt [string index $itoa64 [expr {int(rand() * 64)}]]
+    }
+    return $salt
+}
+
+proc ::md5crypt::md5crypt_tcl {magic pw salt} {
+    set sp 0
+
+    set start 0
+    if {[string match "${magic}*" $salt]} {
+        set start [string length $magic]
+    }
+    set end [string first $ $salt $start]
+    if {$end < 0} {set end [string length $salt]} else {incr end -1}
+    if {$end - $start > 7} {set end [expr {$start + 7}]}
+    set salt [string range $salt $start $end]
+
+    set ctx [MD5Init]
+    MD5Update $ctx $pw
+    MD5Update $ctx $magic
+    MD5Update $ctx $salt
+
+    set ctx2 [MD5Init]
+    MD5Update $ctx2 $pw
+    MD5Update $ctx2 $salt
+    MD5Update $ctx2 $pw
+    set H2 [MD5Final $ctx2]
+
+    for {set pl [string length $pw]} {$pl > 0} {incr pl -16} {
+        set tl [expr {($pl > 16 ? 16 : $pl) - 1}]
+        MD5Update $ctx [string range $H2 0 $tl]
+    }
+    
+    for {set i [string length $pw]} {$i != 0} {set i [expr {$i >> 1}]} {
+        if {$i & 1} {
+            set c \0
+        } else {
+            set c [string index $pw 0]
+        }
+        MD5Update $ctx $c
+    }
+    
+    set result "${magic}${salt}\$"
+    
+    set H [MD5Final $ctx]
+
+    for {set i 0} {$i < 1000} {incr i} {
+        set ctx [MD5Init]
+        if {$i & 1} {
+            MD5Update $ctx $pw
+        } else {
+            MD5Update $ctx $H
+        }
+        if {$i % 3} {
+            MD5Update $ctx $salt
+        }
+        if {$i % 7} {
+            MD5Update $ctx $pw
+        }
+        if {$i & 1} {
+            MD5Update $ctx $H
+        } else {
+            MD5Update $ctx $pw
+        }
+        set H [MD5Final $ctx]
+    }
+
+    binary scan $H c* Vs
+    foreach v $Vs {lappend V [expr {$v & 0xFF}]}
+    set l [expr {([lindex $V 0] << 16) | ([lindex $V  6] << 8) | [lindex $V 12]}]
+    append result [to64 $l 4]
+    set l [expr {([lindex $V 1] << 16) | ([lindex $V  7] << 8) | [lindex $V 13]}]
+    append result [to64 $l 4]
+    set l [expr {([lindex $V 2] << 16) | ([lindex $V  8] << 8) | [lindex $V 14]}]
+    append result [to64 $l 4]
+    set l [expr {([lindex $V 3] << 16) | ([lindex $V  9] << 8) | [lindex $V 15]}]
+    append result [to64 $l 4]
+    set l [expr {([lindex $V 4] << 16) | ([lindex $V 10] << 8) | [lindex $V  5]}]
+    append result [to64 $l 4]
+    set l [expr {[lindex $V 11]}]
+    append result [to64 $l 2]
+    
+    return $result
+}
+
+if {[info commands ::md5crypt::to64_c] == {}} {
+    interp alias {} ::md5crypt::to64 {} ::md5crypt::to64_tcl
+} else {
+    interp alias {} ::md5crypt::to64 {} ::md5crypt::to64_c
+}
+
+if {[info commands ::md5crypt::md5crypt_c] == {}} {
+    interp alias {} ::md5crypt::md5crypt {} ::md5crypt::md5crypt_tcl {$1$}
+    interp alias {} ::md5crypt::aprcrypt {} ::md5crypt::md5crypt_tcl {$apr1$}
+} else {
+    interp alias {} ::md5crypt::md5crypt {} ::md5crypt::md5crypt_c {$1$}
+    interp alias {} ::md5crypt::aprcrypt {} ::md5crypt::md5crypt_c {$apr1$}
+}
+
+# -------------------------------------------------------------------------
+
+package provide md5crypt 1.1.0
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5crypt/md5cryptc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5crypt/md5cryptc.tcl
new file mode 100644
index 00000000..e1facd82
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5crypt/md5cryptc.tcl
@@ -0,0 +1,174 @@
+# md5cryptc.tcl - Copyright (C) 2003 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# This is a critcl-based wrapper to provide a Tcl implementation of the md5crypt
+# function. The C code here is based upon the OpenBSD source, which is in turn
+# derived from the original implementation by Poul-Henning Kamp
+#
+# The original C source license reads:
+#/*
+# * ----------------------------------------------------------------------------
+# * "THE BEER-WARE LICENSE" (Revision 42):
+# * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
+# * can do whatever you want with this stuff. If we meet some day, and you think
+# * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
+# * ----------------------------------------------------------------------------
+# */
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+
+package require critcl
+# @sak notprovided md5cryptc
+package provide md5cryptc 1.0
+
+critcl::cheaders ../md5/md5.h
+#critcl::csources ../md5/md5.c
+
+namespace eval ::md5crypt {
+    critcl::ccode {
+#include <string.h>
+#include "md5.h"
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+        static unsigned char itoa64[] =
+            "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+        
+        static void to64(char *s, unsigned int v, int n)
+        {
+            while (--n >= 0) {
+                *s++ = itoa64[v&0x3f];
+                v >>= 6;
+            }
+        }
+        
+        static void dump(const char *s, unsigned int len) 
+        {
+            unsigned int i;
+            for (i = 0; i < len; i++)
+                printf("%02X", s[i]&0xFF);
+            putchar('\n');
+        }
+        
+        static char * md5crypt(const char *pw,
+                               const char *salt,
+                               const char *magic)
+        {
+            static char     passwd[120], *p;
+            static const unsigned char *sp,*ep;
+            unsigned char	final[16];
+            int sl,pl,i;
+            MD5_CTX	ctx,ctx1;
+            unsigned long l;
+            
+            /* Refine the Salt first */
+            sp = (const unsigned char *)salt;
+            
+            /* If it starts with the magic string, then skip that */
+            if(!strncmp((const char *)sp,(const char *)magic,strlen((const char *)magic)))
+                sp += strlen((const char *)magic);
+            
+            /* It stops at the first '$', max 8 chars */
+            for(ep=sp;*ep && *ep != '$' && ep < (sp+8);ep++)
+                continue;
+            
+            /* get the length of the true salt */
+            sl = ep - sp;
+            
+            MD5Init(&ctx);
+            
+            /* The password first, since that is what is most unknown */
+            MD5Update(&ctx,(unsigned char *)pw,strlen(pw));
+            
+            /* Then our magic string */
+            MD5Update(&ctx,(unsigned char *)magic,strlen((const char *)magic));
+            
+            /* Then the raw salt */
+            MD5Update(&ctx,(unsigned char*)sp,sl);
+            
+            /* Then just as many characters of the MD5(pw,salt,pw) */
+            MD5Init(&ctx1);
+            MD5Update(&ctx1,(unsigned char *)pw,strlen(pw));
+            MD5Update(&ctx1,(unsigned char *)sp,sl);
+            MD5Update(&ctx1,(unsigned char *)pw,strlen(pw));
+            MD5Final(final,&ctx1);
+            
+            for(pl = strlen(pw); pl > 0; pl -= 16) {
+                int tl = pl > 16 ? 16 : pl;
+                MD5Update(&ctx,final,pl>16 ? 16 : pl);
+            }
+            
+            /* Don't leave anything around in vm they could use. */
+            memset(final,0,sizeof final);
+            
+            /* Then something really weird... */
+            for (i = strlen(pw); i ; i >>= 1) {
+                if(i&1)
+                    MD5Update(&ctx, final, 1);
+                else
+                    MD5Update(&ctx, (unsigned char *)pw, 1);
+            }
+            
+            /* Now make the output string */
+            snprintf(passwd, sizeof(passwd), "%s%.*s$", (char *)magic,
+                    sl, (const char *)sp);
+            
+            MD5Final(final,&ctx);
+            
+            /*
+             * and now, just to make sure things don't run too fast
+             * On a 60 Mhz Pentium this takes 34 msec, so you would
+             * need 30 seconds to build a 1000 entry dictionary...
+             */
+            for(i=0;i<1000;i++) {
+                MD5Init(&ctx1);
+                if(i & 1)
+                    MD5Update(&ctx1,(unsigned char *)pw,strlen(pw));
+                else
+                    MD5Update(&ctx1,final,16);
+                
+                if(i % 3)
+                    MD5Update(&ctx1,(unsigned char *)sp,sl);
+                
+                if(i % 7)
+                    MD5Update(&ctx1,(unsigned char *)pw,strlen(pw));
+                
+                if(i & 1)
+                    MD5Update(&ctx1,final,16);
+                else
+                    MD5Update(&ctx1,(unsigned char *)pw,strlen(pw));
+                MD5Final(final,&ctx1);
+            }
+
+            p = passwd + strlen(passwd);
+            
+            l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; to64(p,l,4); p += 4;
+            l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; to64(p,l,4); p += 4;
+            l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; to64(p,l,4); p += 4;
+            l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; to64(p,l,4); p += 4;
+            l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; to64(p,l,4); p += 4;
+            l =		       final[11]		; to64(p,l,2); p += 2;
+            *p = '\0';
+            
+            /* Don't leave anything around in vm they could use. */
+            memset(final,0,sizeof final);
+            
+            return passwd;
+        }            
+    }
+    critcl::cproc to64_c {Tcl_Interp* interp int v int n} ok {
+        char s[5];
+        to64(s, (unsigned int)v, n); 
+        Tcl_SetObjResult(interp, Tcl_NewStringObj(s, n));
+        return TCL_OK;
+    }
+
+    critcl::cproc md5crypt_c {Tcl_Interp* interp char* magic char* pw char* salt} ok {
+        char* s = md5crypt(pw, salt, magic);
+        Tcl_SetObjResult(interp, Tcl_NewStringObj(s, strlen(s)));
+        return TCL_OK;
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5crypt/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5crypt/pkgIndex.tcl
new file mode 100644
index 00000000..487ff9d4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/md5crypt/pkgIndex.tcl
@@ -0,0 +1,3 @@
+# package index for md5crypt
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded md5crypt 1.1.0 [list source [file join $dir md5crypt.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mime/mime.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mime/mime.tcl
new file mode 100644
index 00000000..b4b0d61d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mime/mime.tcl
@@ -0,0 +1,3934 @@
+# mime.tcl - MIME body parts
+#
+# (c) 1999-2000 Marshall T. Rose
+# (c) 2000      Brent Welch
+# (c) 2000      Sandeep Tamhankar
+# (c) 2000      Dan Kuchler
+# (c) 2000-2001 Eric Melski
+# (c) 2001      Jeff Hobbs
+# (c) 2001-2008 Andreas Kupries
+# (c) 2002-2003 David Welton
+# (c) 2003-2008 Pat Thoyts
+# (c) 2005      Benjamin Riefenstahl
+# (c) 2013-2021 Poor Yorick
+#
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# Influenced by Borenstein's/Rose's safe-tcl (circa 1993) and Darren New's
+# unpublished package of 1999.
+#
+
+# new string features and inline scan are used, requiring 8.3.
+package require Tcl 8.5
+
+package provide mime 1.7.1
+package require tcl::chan::memchan
+
+
+if {[catch {package require Trf 2.0}]} {
+
+    # Fall-back to tcl-based procedures of base64 and quoted-printable
+    # encoders
+    ##
+    # Warning!
+    ##
+    # These are a fragile emulations of the more general calling
+    # sequence that appears to work with this code here.
+    ##
+    # The `__ignored__` arguments are expected to be `--` options on
+    # the caller's side. (See the uses in `copymessageaux`,
+    # `buildmessageaux`, `parsepart`, and `getbody`).
+
+    package require base64 2.0
+    set ::major [lindex [split [package require md5] .] 0]
+
+    # Create these commands in the mime namespace so that they
+    # won't collide with things at the global namespace level
+
+    namespace eval ::mime {
+        proc base64 {-mode what __ignored__ chunk} {
+            return [base64::$what $chunk]
+        }
+        proc quoted-printable {-mode what __ignored__ chunk} {
+            return [mime::qp_$what $chunk]
+        }
+
+        if {$::major < 2} {
+            # md5 v1, result is hex string ready for use.
+            proc md5 {__ignored__ string} {
+                return [md5::md5 $string]
+            }
+        } else {
+            # md5 v2, need option to get hex string
+            proc md5 {__ignored__ string} {
+                return [md5::md5 -hex $string]
+            }
+        }
+    }
+
+    unset ::major
+}
+
+#
+# state variables:
+#
+#     canonicalP: input is in its canonical form
+#     content: type/subtype
+#     params: dictionary (keys are lower-case)
+#     encoding: transfer encoding
+#     version: MIME-version
+#     header: dictionary (keys are lower-case)
+#     lowerL: list of header keys, lower-case
+#     mixedL: list of header keys, mixed-case
+#     value: either "file", "parts", or "string"
+#
+#     file: input file
+#     fd: cached file-descriptor, typically for root
+#     root: token for top-level part, for (distant) subordinates
+#     offset: number of octets from beginning of file/string
+#     count: length in octets of (encoded) content
+#
+#     parts: list of bodies (tokens)
+#
+#     string: input string
+#
+#     cid: last child-id assigned
+#
+
+
+namespace eval ::mime {
+    variable mime
+    array set mime {uid 0 cid 0}
+
+    # RFC 822 lexemes
+    variable addrtokenL
+    lappend addrtokenL \; , < > : . ( ) @ \" \[ ] \\
+    variable addrlexemeL {
+        LX_SEMICOLON LX_COMMA
+        LX_LBRACKET  LX_RBRACKET
+        LX_COLON     LX_DOT
+        LX_LPAREN    LX_RPAREN
+        LX_ATSIGN    LX_QUOTE
+        LX_LSQUARE   LX_RSQUARE
+        LX_QUOTE
+    }
+
+    # RFC 2045 lexemes
+    variable typetokenL
+    lappend typetokenL \; , < > : ? ( ) @ \" \[ \] = / \\
+    variable typelexemeL {
+        LX_SEMICOLON LX_COMMA
+        LX_LBRACKET  LX_RBRACKET
+        LX_COLON     LX_QUESTION
+        LX_LPAREN    LX_RPAREN
+        LX_ATSIGN    LX_QUOTE
+        LX_LSQUARE   LX_RSQUARE
+        LX_EQUALS    LX_SOLIDUS
+        LX_QUOTE
+    }
+
+    variable encList {
+        ascii US-ASCII
+        big5 Big5
+        cp1250 Windows-1250
+        cp1251 Windows-1251
+        cp1252 Windows-1252
+        cp1253 Windows-1253
+        cp1254 Windows-1254
+        cp1255 Windows-1255
+        cp1256 Windows-1256
+        cp1257 Windows-1257
+        cp1258 Windows-1258
+        cp437 IBM437
+        cp737 {}
+        cp775 IBM775
+        cp850 IBM850
+        cp852 IBM852
+        cp855 IBM855
+        cp857 IBM857
+        cp860 IBM860
+        cp861 IBM861
+        cp862 IBM862
+        cp863 IBM863
+        cp864 IBM864
+        cp865 IBM865
+        cp866 IBM866
+        cp869 IBM869
+        cp874 {}
+        cp932 {}
+        cp936 GBK
+        cp949 {}
+        cp950 {}
+        dingbats {}
+        ebcdic {}
+        euc-cn EUC-CN
+        euc-jp EUC-JP
+        euc-kr EUC-KR
+        gb12345 GB12345
+        gb1988 GB1988
+        gb2312 GB2312
+        iso2022 ISO-2022
+        iso2022-jp ISO-2022-JP
+        iso2022-kr ISO-2022-KR
+        iso8859-1 ISO-8859-1
+        iso8859-2 ISO-8859-2
+        iso8859-3 ISO-8859-3
+        iso8859-4 ISO-8859-4
+        iso8859-5 ISO-8859-5
+        iso8859-6 ISO-8859-6
+        iso8859-7 ISO-8859-7
+        iso8859-8 ISO-8859-8
+        iso8859-9 ISO-8859-9
+        iso8859-10 ISO-8859-10
+        iso8859-13 ISO-8859-13
+        iso8859-14 ISO-8859-14
+        iso8859-15 ISO-8859-15
+        iso8859-16 ISO-8859-16
+        jis0201 JIS_X0201
+        jis0208 JIS_C6226-1983
+        jis0212 JIS_X0212-1990
+        koi8-r KOI8-R
+        koi8-u KOI8-U
+        ksc5601 KS_C_5601-1987
+        macCentEuro {}
+        macCroatian {}
+        macCyrillic {}
+        macDingbats {}
+        macGreek {}
+        macIceland {}
+        macJapan {}
+        macRoman {}
+        macRomania {}
+        macThai {}
+        macTurkish {}
+        macUkraine {}
+        shiftjis Shift_JIS
+        symbol {}
+        tis-620 TIS-620
+        unicode {}
+        utf-8 UTF-8
+    }
+
+    variable encodings
+    array set encodings $encList
+    variable reversemap
+    # Initialized at the bottom of the file
+
+    variable encAliasList {
+        ascii ANSI_X3.4-1968
+        ascii iso-ir-6
+        ascii ANSI_X3.4-1986
+        ascii ISO_646.irv:1991
+        ascii ASCII
+        ascii ISO646-US
+        ascii us
+        ascii IBM367
+        ascii cp367
+        cp437 cp437
+        cp437 437
+        cp775 cp775
+        cp850 cp850
+        cp850 850
+        cp852 cp852
+        cp852 852
+        cp855 cp855
+        cp855 855
+        cp857 cp857
+        cp857 857
+        cp860 cp860
+        cp860 860
+        cp861 cp861
+        cp861 861
+        cp861 cp-is
+        cp862 cp862
+        cp862 862
+        cp863 cp863
+        cp863 863
+        cp864 cp864
+        cp865 cp865
+        cp865 865
+        cp866 cp866
+        cp866 866
+        cp869 cp869
+        cp869 869
+        cp869 cp-gr
+        cp936 CP936
+        cp936 MS936
+        cp936 Windows-936
+        iso8859-1 ISO_8859-1:1987
+        iso8859-1 iso-ir-100
+        iso8859-1 ISO_8859-1
+        iso8859-1 latin1
+        iso8859-1 l1
+        iso8859-1 IBM819
+        iso8859-1 CP819
+        iso8859-2 ISO_8859-2:1987
+        iso8859-2 iso-ir-101
+        iso8859-2 ISO_8859-2
+        iso8859-2 latin2
+        iso8859-2 l2
+        iso8859-3 ISO_8859-3:1988
+        iso8859-3 iso-ir-109
+        iso8859-3 ISO_8859-3
+        iso8859-3 latin3
+        iso8859-3 l3
+        iso8859-4 ISO_8859-4:1988
+        iso8859-4 iso-ir-110
+        iso8859-4 ISO_8859-4
+        iso8859-4 latin4
+        iso8859-4 l4
+        iso8859-5 ISO_8859-5:1988
+        iso8859-5 iso-ir-144
+        iso8859-5 ISO_8859-5
+        iso8859-5 cyrillic
+        iso8859-6 ISO_8859-6:1987
+        iso8859-6 iso-ir-127
+        iso8859-6 ISO_8859-6
+        iso8859-6 ECMA-114
+        iso8859-6 ASMO-708
+        iso8859-6 arabic
+        iso8859-7 ISO_8859-7:1987
+        iso8859-7 iso-ir-126
+        iso8859-7 ISO_8859-7
+        iso8859-7 ELOT_928
+        iso8859-7 ECMA-118
+        iso8859-7 greek
+        iso8859-7 greek8
+        iso8859-8 ISO_8859-8:1988
+        iso8859-8 iso-ir-138
+        iso8859-8 ISO_8859-8
+        iso8859-8 hebrew
+        iso8859-9 ISO_8859-9:1989
+        iso8859-9 iso-ir-148
+        iso8859-9 ISO_8859-9
+        iso8859-9 latin5
+        iso8859-9 l5
+        iso8859-10 iso-ir-157
+        iso8859-10 l6
+        iso8859-10 ISO_8859-10:1992
+        iso8859-10 latin6
+        iso8859-14 iso-ir-199
+        iso8859-14 ISO_8859-14:1998
+        iso8859-14 ISO_8859-14
+        iso8859-14 latin8
+        iso8859-14 iso-celtic
+        iso8859-14 l8
+        iso8859-15 ISO_8859-15
+        iso8859-15 Latin-9
+        iso8859-16 iso-ir-226
+        iso8859-16 ISO_8859-16:2001
+        iso8859-16 ISO_8859-16
+        iso8859-16 latin10
+        iso8859-16 l10
+        jis0201 X0201
+        jis0208 iso-ir-87
+        jis0208 x0208
+        jis0208 JIS_X0208-1983
+        jis0212 x0212
+        jis0212 iso-ir-159
+        ksc5601 iso-ir-149
+        ksc5601 KS_C_5601-1989
+        ksc5601 KSC5601
+        ksc5601 korean
+        shiftjis MS_Kanji
+        utf-8 UTF8
+    }
+
+    namespace export {*}{
+	copymessage finalize getbody getheader getproperty initialize
+	mapencoding parseaddress parsedatetime reversemapencoding setheader
+	uniqueID
+    }
+}
+
+# ::mime::initialize --
+#
+#    Creates a MIME part, and returnes the MIME token for that part.
+#
+# Arguments:
+#    args   Args can be any one of the following:
+#                  ?-canonical type/subtype
+#                  ?-param    {key value}?...
+#                  ?-encoding value?
+#                  ?-header   {key value}?... ?
+#                  (-file name | -string value | -parts {token1 ... tokenN})
+#
+#       If the -canonical option is present, then the body is in
+#       canonical (raw) form and is found by consulting either the -file,
+#       -string, or -parts option.
+#
+#       In addition, both the -param and -header options may occur zero
+#       or more times to specify "Content-Type" parameters (e.g.,
+#       "charset") and header keyword/values (e.g.,
+#       "Content-Disposition"), respectively.
+#
+#       Also, -encoding, if present, specifies the
+#       "Content-Transfer-Encoding" when copying the body.
+#
+#       If the -canonical option is not present, then the MIME part
+#       contained in either the -file or the -string option is parsed,
+#       dynamically generating subordinates as appropriate.
+#
+# Results:
+#    An initialized mime token.
+
+proc ::mime::initialize args {
+    global errorCode errorInfo
+
+    variable mime
+
+    set token [namespace current]::[incr mime(uid)]
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    if {[catch [list mime::initializeaux $token {*}$args] result eopts]} {
+        catch {mime::finalize $token -subordinates dynamic}
+        return -options $eopts $result
+    }
+    return $token
+}
+
+# ::mime::initializeaux --
+#
+#    Configures the MIME token created in mime::initialize based on
+#       the arguments that mime::initialize supports.
+#
+# Arguments:
+#       token  The MIME token to configure.
+#    args   Args can be any one of the following:
+#                  ?-canonical type/subtype
+#                  ?-param    {key value}?...
+#                  ?-encoding value?
+#                  ?-header   {key value}?... ?
+#                  (-file name | -string value | -parts {token1 ... tokenN})
+#
+# Results:
+#       Either configures the mime token, or throws an error.
+
+proc ::mime::initializeaux {token args} {
+    global errorCode errorInfo
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    array set params [set state(params) {}]
+    set state(encoding) {}
+    set state(version) 1.0
+
+    set state(header) {}
+    set state(lowerL) {}
+    set state(mixedL) {}
+
+    set state(cid) 0
+
+    set userheader 0
+
+    set argc [llength $args]
+    for {set argx 0} {$argx < $argc} {incr argx} {
+        set option [lindex $args $argx]
+        if {[incr argx] >= $argc} {
+            error "missing argument to $option"
+        }
+        set value [lindex $args $argx]
+
+        switch -- $option {
+            -canonical {
+                set state(content) [string tolower $value]
+            }
+
+            -param {
+                if {[llength $value] != 2} {
+		    error "-param expects a key and a value, not $value"
+                }
+                set lower [string tolower [set mixed [lindex $value 0]]]
+                if {[info exists params($lower)]} {
+                    error "the $mixed parameter may be specified at most once"
+                }
+
+                set params($lower) [lindex $value 1]
+                set state(params) [array get params]
+            }
+
+            -encoding {
+		set value [string tolower $value[set value {}]]
+
+                switch -- $value {
+                    7bit - 8bit - binary - quoted-printable - base64 {
+                    }
+
+                    default {
+                        error "unknown value for -encoding $state(encoding)"
+                    }
+                }
+                set state(encoding) [string tolower $value]
+            }
+
+            -header {
+                if {[llength $value] != 2} {
+                    error "-header expects a key and a value, not $value"
+                }
+                set lower [string tolower [set mixed [lindex $value 0]]]
+                if {$lower eq {content-type}} {
+                    error "use -canonical instead of -header $value"
+                }
+                if {$lower eq {content-transfer-encoding}} {
+                    error "use -encoding instead of -header $value"
+                }
+                if {$lower in {content-md5 mime-version}} {
+                    error {don't go there...}
+                }
+                if {$lower ni $state(lowerL)} {
+                    lappend state(lowerL) $lower
+                    lappend state(mixedL) $mixed
+                }
+
+		set userheader 1
+
+                array set header $state(header)
+                lappend header($lower) [lindex $value 1]
+                set state(header) [array get header]
+            }
+
+            -file {
+                set state(file) $value
+            }
+
+            -parts {
+                set state(parts) $value
+            }
+
+            -string {
+                set state(string) $value
+
+                set state(lines) [split $value \n]
+                set state(lines.count) [llength $state(lines)]
+                set state(lines.current) 0
+            }
+
+            -root {
+                # the following are internal options
+
+                set state(root) $value
+            }
+
+            -offset {
+                set state(offset) $value
+            }
+
+            -count {
+                set state(count) $value
+            }
+
+            -lineslist {
+                set state(lines) $value
+                set state(lines.count) [llength $state(lines)]
+                set state(lines.current) 0
+                #state(string) is needed, but will be built when required
+                set state(string) {}
+            }
+
+            default {
+                error "unknown option $option"
+            }
+        }
+    }
+
+    #We only want one of -file, -parts or -string:
+    set valueN 0
+    foreach value {file parts string} {
+        if {[info exists state($value)]} {
+            set state(value) $value
+            incr valueN
+        }
+    }
+    if {$valueN != 1 && ![info exists state(lines)]} {
+        error {specify exactly one of -file, -parts, or -string}
+    }
+
+    if {[set state(canonicalP) [info exists state(content)]]} {
+        switch -- $state(value) {
+            file {
+                set state(offset) 0
+            }
+
+            parts {
+                switch -glob -- $state(content) {
+                    text/*
+                        -
+                    image/*
+                        -
+                    audio/*
+                        -
+                    video/* {
+                        error "-canonical $state(content) and -parts do not mix"
+                    }
+
+                    default {
+                        if {$state(encoding) ne {}} {
+                            error {-encoding and -parts do not mix}
+                        }
+                    }
+                }
+            }
+            default {# Go ahead}
+        }
+
+        if {[lsearch -exact $state(lowerL) content-id] < 0} {
+            lappend state(lowerL) content-id
+            lappend state(mixedL) Content-ID
+
+            array set header $state(header)
+            lappend header(content-id) [uniqueID]
+            set state(header) [array get header]
+        }
+
+        set state(version) 1.0
+        return
+    }
+
+    if {$state(params) ne {}} {
+        error {-param requires -canonical}
+    }
+    if {$state(encoding) ne {}} {
+        error {-encoding requires -canonical}
+    }
+    if {$userheader} {
+        error {-header requires -canonical}
+    }
+    if {[info exists state(parts)]} {
+        error {-parts requires -canonical}
+    }
+
+    if {[set fileP [info exists state(file)]]} {
+        if {[set openP [info exists state(root)]]} {
+            # FRINK: nocheck
+            variable $state(root)
+            upvar 0 $state(root) root
+
+            set state(fd) $root(fd)
+        } else {
+            set state(root) $token
+            set state(fd) [open $state(file) RDONLY]
+            set state(offset) 0
+            seek $state(fd) 0 end
+            set state(count) [tell $state(fd)]
+
+            fconfigure $state(fd) -translation binary
+        }
+    }
+
+    set code [catch {mime::parsepart $token} result]
+    set ecode $errorCode
+    set einfo $errorInfo
+
+    if {$fileP} {
+        if {!$openP} {
+            unset state(root)
+            catch {close $state(fd)}
+        }
+        unset state(fd)
+    }
+
+    return -code $code -errorinfo $einfo -errorcode $ecode $result
+}
+
+# ::mime::parsepart --
+#
+#       Parses the MIME headers and attempts to break up the message
+#       into its various parts, creating a MIME token for each part.
+#
+# Arguments:
+#       token  The MIME token to parse.
+#
+# Results:
+#       Throws an error if it has problems parsing the MIME token,
+#       otherwise it just sets up the appropriate variables.
+
+proc ::mime::parsepart {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    if {[set fileP [info exists state(file)]]} {
+        seek $state(fd) [set pos $state(offset)] start
+        set last [expr {$state(offset) + $state(count) - 1}]
+    } else {
+        set string $state(string)
+    }
+
+    set vline {}
+    while 1 {
+        set blankP 0
+        if {$fileP} {
+            if {($pos > $last) || ([set x [gets $state(fd) line]] <= 0)} {
+                set blankP 1
+            } else {
+                incr pos [expr {$x + 1}]
+            }
+        } else {
+	    if {$state(lines.current) >= $state(lines.count)} {
+		set blankP 1
+		set line {}
+	    } else {
+		set line [lindex $state(lines) $state(lines.current)]
+		incr state(lines.current)
+		set x [string length $line]
+		if {$x == 0} {set blankP 1}
+	    }
+        }
+
+         if {!$blankP && [string match *\r $line]} {
+             set line [string range $line 0 $x-2]
+             if {$x == 1} {
+                 set blankP 1
+             }
+         }
+
+        if {!$blankP && (
+	    [string first { } $line] == 0
+	    ||
+	    [string first \t $line] == 0
+	)} {
+            append vline \n $line
+            continue
+        }
+
+        if {$vline eq {}} {
+            if {$blankP} {
+                break
+            }
+
+            set vline $line
+            continue
+        }
+
+        if {
+	    [set x [string first : $vline]] <= 0
+	    ||
+	    [set mixed [string trimright [
+		string range $vline 0 [expr {$x - 1}]]]] eq {}
+	} {
+            error "improper line in header: $vline"
+        }
+        set value [string trim [string range $vline [expr {$x + 1}] end]]
+        switch -- [set lower [string tolower $mixed]] {
+            content-type {
+                if {[info exists state(content)]} {
+                    error "multiple Content-Type fields starting with $vline"
+                }
+
+                if {![catch {set x [parsetype $token $value]}]} {
+                    set state(content) [lindex $x 0]
+                    set state(params) [lindex $x 1]
+                }
+            }
+
+            content-md5 {
+            }
+
+            content-transfer-encoding {
+                if {
+		    $state(encoding) ne {}
+		    &&
+		    $state(encoding) ne [string tolower $value]
+		} {
+                    error "multiple Content-Transfer-Encoding fields starting with $vline"
+                }
+
+                set state(encoding) [string tolower $value]
+            }
+
+            mime-version {
+                set state(version) $value
+            }
+
+            default {
+                if {[lsearch -exact $state(lowerL) $lower] < 0} {
+                    lappend state(lowerL) $lower
+                    lappend state(mixedL) $mixed
+                }
+
+                array set header $state(header)
+                lappend header($lower) $value
+                set state(header) [array get header]
+            }
+        }
+
+        if {$blankP} {
+            break
+        }
+        set vline $line
+    }
+
+    if {![info exists state(content)]} {
+        set state(content) text/plain
+        set state(params) [list charset us-ascii]
+    }
+
+    if {![string match multipart/* $state(content)]} {
+        if {$fileP} {
+            set x [tell $state(fd)]
+            incr state(count) [expr {$state(offset) - $x}]
+            set state(offset) $x
+        } else {
+            # rebuild string, this is cheap and needed by other functions
+            set state(string) [join [
+                lrange $state(lines) $state(lines.current) end] \n]
+        }
+
+        if {[string match message/* $state(content)]} {
+            # FRINK: nocheck
+            variable [set child $token-[incr state(cid)]]
+
+            set state(value) parts
+            set state(parts) $child
+            if {$fileP} {
+                mime::initializeaux $child \
+                    -file $state(file) -root $state(root) \
+                    -offset $state(offset) -count $state(count)
+            } else {
+                if {[info exists state(encoding)]} {
+                    set strng [join [
+                        lrange $state(lines) $state(lines.current) end] \n]
+                    switch -- $state(encoding) {
+                        base64 -
+                        quoted-printable {
+                            set strng [$state(encoding) -mode decode -- $strng]
+                        }
+                        default {}
+                    }
+                    mime::initializeaux $child -string $strng
+                } else {
+                    mime::initializeaux $child -lineslist [
+                        lrange $state(lines) $state(lines.current) end]
+                }
+            }
+        }
+
+        return
+    }
+
+    set state(value) parts
+
+    set boundary {}
+    foreach {k v} $state(params) {
+        if {$k eq {boundary}} {
+            set boundary $v
+            break
+        }
+    }
+    if {$boundary eq {}} {
+        error "boundary parameter is missing in $state(content)"
+    }
+    if {[string trim $boundary] eq {}} {
+        error "boundary parameter is empty in $state(content)"
+    }
+
+    if {$fileP} {
+        set pos [tell $state(fd)]
+            # This variable is like 'start', for the reasons laid out
+            # below, in the other branch of this conditional.
+            set initialpos $pos
+        } else {
+            # This variable is like 'start', a list of lines in the
+            # part. This record is made even before we find a starting
+            # boundary and used if we run into the terminating boundary
+            # before a starting boundary was found. In that case the lines
+            # before the terminator as recorded by tracelines are seen as
+            # the part, or at least we attempt to parse them as a
+            # part. See the forceoctet and nochild flags later. We cannot
+            # use 'start' as that records lines only after the starting
+            # boundary was found.
+            set tracelines [list]
+    }
+
+    set inP 0
+    set moreP 1
+    set forceoctet 0
+    while {$moreP} {
+        if {$fileP} {
+            if {$pos > $last} {
+                # We have run over the end of the part per the outer
+                # information without finding a terminating boundary.
+                # We now fake the boundary and force the parser to
+                # give any new part coming of this a mime-type of
+                # application/octet-stream regardless of header
+                # information.
+                set line "--$boundary--"
+                set x [string length $line]
+                set forceoctet 1
+            } else {
+                if {[set x [gets $state(fd) line]] < 0} {
+                    error "end-of-file encountered while parsing $state(content)"
+                }
+            }
+            incr pos [expr {$x + 1}]
+        } else {
+            if {$state(lines.current) >= $state(lines.count)} {
+                error "end-of-string encountered while parsing $state(content)"
+            } else {
+                set line [lindex $state(lines) $state(lines.current)]
+                incr state(lines.current)
+                set x [string length $line]
+            }
+            set x [string length $line]
+        }
+        if {[string last \r $line] == $x - 1} {
+            set line [string range $line 0 [expr {$x - 2}]]
+            set crlf 2
+        } else {
+            set crlf 1
+        }
+
+        if {[string first --$boundary $line] != 0} {
+             if {$inP && !$fileP} {
+                 lappend start $line
+             }
+             continue
+        } else {
+            lappend tracelines $line
+        }
+
+        if {!$inP} {
+            # Haven't seen the starting boundary yet. Check if the
+            # current line contains this starting boundary.
+
+            if {$line eq "--$boundary"} {
+                # Yes. Switch parser state to now search for the
+                # terminating boundary of the part and record where
+                # the part begins (or initialize the recorder for the
+                # lines in the part).
+                set inP 1
+                if {$fileP} {
+                    set start $pos
+                } else {
+                    set start [list]
+                }
+                continue
+            } elseif {$line eq "--$boundary--"} {
+                # We just saw a terminating boundary before we ever
+                # saw the starting boundary of a part. This forces us
+                # to stop parsing, we do this by forcing the parser
+                # into an accepting state. We will try to create a
+                # child part based on faked start position or recorded
+                # lines, or, if that fails, let the current part have
+                # no children.
+
+                # As an example note the test case mime-3.7 and the
+                # referenced file "badmail1.txt".
+
+                set inP 1
+                if {$fileP} {
+                    set start $initialpos
+                } else {
+                    set start $tracelines
+                }
+                set forceoctet 1
+                # Fall through. This brings to the creation of the new
+                # part instead of searching further and possible
+                # running over the end.
+            } else {
+                continue
+            }
+        }
+
+        # Looking for the end of the current part. We accept both a
+        # terminating boundary and the starting boundary of the next
+        # part as the end of the current part.
+
+        if {[set moreP [string compare $line --$boundary--]]
+	    && $line ne "--$boundary"} {
+
+            # The current part has not ended, so we record the line
+            # if we are inside a part and doing string parsing.
+            if {$inP && !$fileP} {
+                lappend start $line
+            }
+            continue
+        }
+
+        # The current part has ended. We now determine the exact
+        # boundaries, create a mime part object for it and recursively
+        # parse it deeper as part of that action.
+
+        # FRINK: nocheck
+        variable [set child $token-[incr state(cid)]]
+
+        lappend state(parts) $child
+
+        set nochild 0
+        if {$fileP} {
+            if {[set count [expr {$pos - ($start + $x + $crlf + 1)}]] < 0} {
+                set count 0
+            }
+            if {$forceoctet} {
+                set ::errorInfo {}
+                if {[catch {
+                    mime::initializeaux $child \
+                        -file $state(file) -root $state(root) \
+                        -offset $start -count $count
+                }]} {
+                    set nochild 1
+                    set state(parts) [lrange $state(parts) 0 end-1]
+                } } else {
+                mime::initializeaux $child \
+                    -file $state(file) -root $state(root) \
+                    -offset $start -count $count
+            }
+            seek $state(fd) [set start $pos] start
+        } else {
+            if {$forceoctet} {
+                if {[catch {
+                    mime::initializeaux $child -lineslist $start
+                }]} {
+                    set nochild 1
+                    set state(parts) [lrange $state(parts) 0 end-1]
+                }
+            } else {
+                mime::initializeaux $child -lineslist $start
+            }
+            set start {}
+        }
+        if {$forceoctet && !$nochild} {
+            variable $child
+            upvar 0  $child childstate
+            set childstate(content) application/octet-stream
+        }
+        set forceoctet 0
+    }
+}
+
+# ::mime::parsetype --
+#
+#       Parses the string passed in and identifies the content-type and
+#       params strings.
+#
+# Arguments:
+#       token  The MIME token to parse.
+#       string The content-type string that should be parsed.
+#
+# Results:
+#       Returns the content and params for the string as a two element
+#       tcl list.
+
+proc ::mime::parsetype {token string} {
+    global errorCode errorInfo
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    variable typetokenL
+    variable typelexemeL
+
+    set state(input)   $string
+    set state(buffer)  {}
+    set state(lastC)   LX_END
+    set state(comment) {}
+    set state(tokenL)  $typetokenL
+    set state(lexemeL) $typelexemeL
+
+    set code [catch {mime::parsetypeaux $token $string} result]
+    set ecode $errorCode
+    set einfo $errorInfo
+
+    unset {*}{
+	state(input)
+	state(buffer)
+	state(lastC)
+	state(comment)
+	state(tokenL)
+	state(lexemeL)
+    }
+
+    return -code $code -errorinfo $einfo -errorcode $ecode $result
+}
+
+# ::mime::parsetypeaux --
+#
+#       A helper function for mime::parsetype.  Parses the specified
+#       string looking for the content type and params.
+#
+# Arguments:
+#       token  The MIME token to parse.
+#       string The content-type string that should be parsed.
+#
+# Results:
+#       Returns the content and params for the string as a two element
+#       tcl list.
+
+proc ::mime::parsetypeaux {token string} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    if {[parselexeme $token] ne {LX_ATOM}} {
+        error [format {expecting type (found %s)} $state(buffer)]
+    }
+    set type [string tolower $state(buffer)]
+
+    switch -- [parselexeme $token] {
+        LX_SOLIDUS {
+        }
+
+        LX_END {
+            if {$type ne {message}} {
+                error "expecting type/subtype (found $type)"
+            }
+
+            return [list message/rfc822 {}]
+        }
+
+        default {
+            error [format "expecting \"/\" (found %s)" $state(buffer)]
+        }
+    }
+
+    if {[parselexeme $token] ne {LX_ATOM}} {
+        error [format "expecting subtype (found %s)" $state(buffer)]
+    }
+    append type [string tolower /$state(buffer)]
+
+    array set params {}
+    while 1 {
+        switch -- [parselexeme $token] {
+            LX_END {
+                return [list $type [array get params]]
+            }
+
+            LX_SEMICOLON {
+            }
+
+            default {
+                error [format "expecting \";\" (found %s)" $state(buffer)]
+            }
+        }
+
+        switch -- [parselexeme $token] {
+            LX_END {
+                return [list $type [array get params]]
+            }
+
+            LX_ATOM {
+            }
+
+            default {
+                error [format "expecting attribute (found %s)" $state(buffer)]
+            }
+        }
+
+        set attribute [string tolower $state(buffer)]
+
+        if {[parselexeme $token] ne {LX_EQUALS}} {
+            error [format {expecting "=" (found %s)} $state(buffer)]
+        }
+
+        switch -- [parselexeme $token] {
+            LX_ATOM {
+            }
+
+            LX_QSTRING {
+                set state(buffer) [
+                    string range $state(buffer) 1 [
+                        expr {[string length $state(buffer)] - 2}]]
+            }
+
+            default {
+                error [format {expecting value (found %s)} $state(buffer)]
+            }
+        }
+        set params($attribute) $state(buffer)
+    }
+}
+
+# ::mime::finalize --
+#
+#   mime::finalize destroys a MIME part.
+#
+#   If the -subordinates option is present, it specifies which
+#   subordinates should also be destroyed. The default value is
+#   "dynamic".
+#
+# Arguments:
+#       token  The MIME token to parse.
+#       args   Args can be optionally be of the following form:
+#              ?-subordinates "all" | "dynamic" | "none"?
+#
+# Results:
+#       Returns an empty string.
+
+proc ::mime::finalize {token args} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    array set options [list -subordinates dynamic]
+    array set options $args
+
+    switch -- $options(-subordinates) {
+        all {
+            #TODO: this code path is untested
+            if {$state(value) eq {parts}} {
+                foreach part $state(parts) {
+                    eval [linsert $args 0 mime::finalize $part]
+                }
+            }
+        }
+
+        dynamic {
+            for {set cid $state(cid)} {$cid > 0} {incr cid -1} {
+                eval [linsert $args 0 mime::finalize $token-$cid]
+            }
+        }
+
+        none {
+        }
+
+        default {
+            error "unknown value for -subordinates $options(-subordinates)"
+        }
+    }
+
+    foreach name [array names state] {
+        unset state($name)
+    }
+    # FRINK: nocheck
+    unset $token
+}
+
+# ::mime::getproperty --
+#
+#   mime::getproperty returns the properties of a MIME part.
+#
+#   The properties are:
+#
+#       property    value
+#       ========    =====
+#       content     the type/subtype describing the content
+#       encoding    the "Content-Transfer-Encoding"
+#       params      a list of "Content-Type" parameters
+#       parts       a list of tokens for the part's subordinates
+#       size        the approximate size of the content (unencoded)
+#
+#   The "parts" property is present only if the MIME part has
+#   subordinates.
+#
+#   If mime::getproperty is invoked with the name of a specific
+#   property, then the corresponding value is returned; instead, if
+#   -names is specified, a list of all properties is returned;
+#   otherwise, a dictionary of properties is returned.
+#
+# Arguments:
+#       token      The MIME token to parse.
+#       property   One of 'content', 'encoding', 'params', 'parts', and
+#                  'size'. Defaults to returning a dictionary of
+#                  properties.
+#
+# Results:
+#       Returns the properties of a MIME part
+
+proc ::mime::getproperty {token {property {}}} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    switch -- $property {
+        {} {
+            array set properties [list content  $state(content) \
+                                       encoding $state(encoding) \
+                                       params   $state(params) \
+                                       size     [getsize $token]]
+            if {[info exists state(parts)]} {
+                set properties(parts) $state(parts)
+            }
+
+            return [array get properties]
+        }
+
+        -names {
+            set names [list content encoding params]
+            if {[info exists state(parts)]} {
+                lappend names parts
+            }
+
+            return $names
+        }
+
+        content
+            -
+        encoding
+            -
+        params {
+            return $state($property)
+        }
+
+        parts {
+            if {![info exists state(parts)]} {
+                error {MIME part is a leaf}
+            }
+
+            return $state(parts)
+        }
+
+        size {
+            return [getsize $token]
+        }
+
+        default {
+            error "unknown property $property"
+        }
+    }
+}
+
+# ::mime::getsize --
+#
+#    Determine the size (in bytes) of a MIME part/token
+#
+# Arguments:
+#       token      The MIME token to parse.
+#
+# Results:
+#       Returns the size in bytes of the MIME token.
+
+proc ::mime::getsize {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    switch -- $state(value)/$state(canonicalP) {
+        file/0 {
+            set size $state(count)
+        }
+
+        file/1 {
+            return [file size $state(file)]
+        }
+
+        parts/0
+            -
+        parts/1 {
+            set size 0
+            foreach part $state(parts) {
+                incr size [getsize $part]
+            }
+
+            return $size
+        }
+
+        string/0 {
+            set size [string length $state(string)]
+        }
+
+        string/1 {
+            return [string length $state(string)]
+        }
+        default {
+            error "Unknown combination \"$state(value)/$state(canonicalP)\""
+        }
+    }
+
+    if {$state(encoding) eq {base64}} {
+        set size [expr {($size * 3 + 2) / 4}]
+    }
+
+    return $size
+}
+
+
+proc ::mime::getContentType token {
+    variable $token
+    upvar 0 $token state
+    set res $state(content)
+
+    set boundary {}
+    foreach {k v} $state(params) {
+        if {$k eq {boundary}} {
+	    set boundary $v
+	}
+        append res ";\n              $k=\"$v\""
+    }
+
+    # Save boundary separate from the params
+    set state(boundary) $boundary
+
+    if {([string match multipart/* $state(content)]) \
+        && ($boundary eq {})} {
+        # we're doing everything in one pass...
+        set key [clock seconds]$token[info hostname][array get state]
+        set seqno 8
+        while {[incr seqno -1] >= 0} {
+            set key [md5 -- $key]
+        }
+        set boundary "----- =_[string trim [base64 -mode encode -- $key]]"
+
+	set state(boundary) $boundary
+
+        append res ";\n              boundary=\"$boundary\""
+    }
+    return $res
+}
+
+# ::mime::getheader --
+#
+#    mime::getheader returns the header of a MIME part.
+#
+#    A header consists of zero or more key/value pairs. Each value is a
+#    list containing one or more strings.
+#
+#    If mime::getheader is invoked with the name of a specific key, then
+#    a list containing the corresponding value(s) is returned; instead,
+#    if -names is specified, a list of all keys is returned; otherwise, a
+#    dictionary is returned. Note that when a
+#    key is specified (e.g., "Subject"), the list returned usually
+#    contains exactly one string; however, some keys (e.g., "Received")
+#    often occur more than once in the header, accordingly the list
+#    returned usually contains more than one string.
+#
+# Arguments:
+#       token      The MIME token to parse.
+#       key        Either a key or '-names'.  If it is '-names' a list
+#                  of all keys is returned.
+#
+# Results:
+#       Returns the header of a MIME part.
+
+proc ::mime::getheader {token {key {}}} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    array set header $state(header)
+    switch -- $key {
+        {} {
+            set result {}
+	    lappend result MIME-Version $state(version)
+            foreach lower $state(lowerL) mixed $state(mixedL) {
+		foreach value $header($lower) {
+		    lappend result $mixed $value
+		}
+            }
+	    set tencoding [getTransferEncoding $token]
+	    if {$tencoding ne {}} {
+		lappend result Content-Transfer-Encoding $tencoding
+	    }
+	    lappend result Content-Type [getContentType $token]
+            return $result
+        }
+
+        -names {
+            return $state(mixedL)
+        }
+
+        default {
+            set lower [string tolower $key]
+
+	    switch $lower {
+		content-transfer-encoding {
+		    return [getTransferEncoding $token]
+		}
+		content-type {
+		    return [list [getContentType $token]]
+		}
+		mime-version {
+		    return [list $state(version)]
+		}
+		default {
+		    if {![info exists header($lower)]} {
+			error "key $key not in header"
+		    }
+		    return $header($lower)
+		}
+	    }
+        }
+    }
+}
+
+
+proc ::mime::getTransferEncoding token {
+    variable $token
+    upvar 0 $token state
+    set res {}
+    if {[set encoding $state(encoding)] eq {}} {
+	set encoding [encoding $token]
+    }
+    if {$encoding ne {}} {
+	set res $encoding
+    }
+    switch -- $encoding {
+	base64
+	    -
+	quoted-printable {
+	    set converter $encoding
+	}
+	7bit - 8bit - binary - {} {
+	    # Bugfix for [#477088], also [#539952]
+	    # Go ahead
+	}
+	default {
+	    error "Can't handle content encoding \"$encoding\""
+	}
+    }
+    return $res
+}
+
+# ::mime::setheader --
+#
+#    mime::setheader writes, appends to, or deletes the value associated
+#    with a key in the header.
+#
+#    The value for -mode is one of:
+#
+#       write: the key/value is either created or overwritten (the
+#       default);
+#
+#       append: a new value is appended for the key (creating it as
+#       necessary); or,
+#
+#       delete: all values associated with the key are removed (the
+#       "value" parameter is ignored).
+#
+#    Regardless, mime::setheader returns the previous value associated
+#    with the key.
+#
+# Arguments:
+#       token      The MIME token to parse.
+#       key        The name of the key whose value should be set.
+#       value      The value for the header key to be set to.
+#       args       An optional argument of the form:
+#                  ?-mode "write" | "append" | "delete"?
+#
+# Results:
+#       Returns previous value associated with the specified key.
+
+proc ::mime::setheader {token key value args} {
+    # FRINK: nocheck
+    variable internal
+    variable $token
+    upvar 0 $token state
+
+    array set options [list -mode write]
+    array set options $args
+
+    set lower [string tolower $key]
+    array set header $state(header)
+    if {[set x [lsearch -exact $state(lowerL) $lower]] < 0} {
+        #TODO: this code path is not tested
+        if {$options(-mode) eq {delete}} {
+            error "key $key not in header"
+        }
+
+        lappend state(lowerL) $lower
+        lappend state(mixedL) $key
+
+        set result {}
+    } else {
+        set result $header($lower)
+    }
+    switch -- $options(-mode) {
+	append - write {
+	    if {!$internal} {
+		switch -- $lower {
+		    content-md5
+			-
+		    content-type
+			-
+		    content-transfer-encoding
+			-
+		    mime-version {
+			set values [getheader $token $lower]
+			if {$value ni $values} {
+			    error "key $key may not be set"
+			}
+		    }
+		    default {# Skip key}
+		}
+	    }
+	    switch -- $options(-mode) {
+		append {
+		    lappend header($lower) $value
+		}
+		write {
+		    set header($lower) [list $value]
+		}
+	    }
+	}
+        delete {
+            unset header($lower)
+            set state(lowerL) [lreplace $state(lowerL) $x $x]
+            set state(mixedL) [lreplace $state(mixedL) $x $x]
+        }
+
+        default {
+            error "unknown value for -mode $options(-mode)"
+        }
+    }
+
+    set state(header) [array get header]
+    return $result
+}
+
+# ::mime::getbody --
+#
+#    mime::getbody returns the body of a leaf MIME part in canonical form.
+#
+#    If the -command option is present, then it is repeatedly invoked
+#    with a fragment of the body as this:
+#
+#        uplevel #0 $callback [list "data" $fragment]
+#
+#    (The -blocksize option, if present, specifies the maximum size of
+#    each fragment passed to the callback.)
+#    When the end of the body is reached, the callback is invoked as:
+#
+#        uplevel #0 $callback "end"
+#
+#    Alternatively, if an error occurs, the callback is invoked as:
+#
+#        uplevel #0 $callback [list "error" reason]
+#
+#    Regardless, the return value of the final invocation of the callback
+#    is propagated upwards by mime::getbody.
+#
+#    If the -command option is absent, then the return value of
+#    mime::getbody is a string containing the MIME part's entire body.
+#
+# Arguments:
+#       token      The MIME token to parse.
+#       args       Optional arguments of the form:
+#                  ?-decode? ?-command callback ?-blocksize octets? ?
+#
+# Results:
+#       Returns a string containing the MIME part's entire body, or
+#       if '-command' is specified, the return value of the command
+#       is returned.
+
+proc ::mime::getbody {token args} {
+    global errorCode errorInfo
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set decode 0
+    if {[set pos [lsearch -exact $args -decode]] >= 0} {
+        set decode 1
+        set args [lreplace $args $pos $pos]
+    }
+
+    array set options [list -command [
+        list mime::getbodyaux $token] -blocksize 4096]
+    array set options $args
+    if {$options(-blocksize) < 1} {
+        error "-blocksize expects a positive integer, not $options(-blocksize)"
+    }
+
+    set code 0
+    set ecode {}
+    set einfo {}
+
+    switch -- $state(value)/$state(canonicalP) {
+        file/0 {
+            set fd [open $state(file) RDONLY]
+
+            set code [catch {
+                fconfigure $fd -translation binary
+                seek $fd [set pos $state(offset)] start
+                set last [expr {$state(offset) + $state(count) - 1}]
+
+                set fragment {}
+                while {$pos <= $last} {
+                    if {[set cc [
+                        expr {($last - $pos) + 1}]] > $options(-blocksize)} {
+                        set cc $options(-blocksize)
+                    }
+                    incr pos [set len [
+                        string length [set chunk [read $fd $cc]]]]
+                    switch -exact -- $state(encoding) {
+                        base64
+                            -
+                        quoted-printable {
+                            if {([set x [string last \n $chunk]] > 0) \
+                                    && ($x + 1 != $len)} {
+                                set chunk [string range $chunk 0 $x]
+                                seek $fd [incr pos [expr {($x + 1) - $len}]] start
+                            }
+                            set chunk [
+                                $state(encoding) -mode decode -- $chunk]
+                        }
+                        7bit - 8bit - binary - {} {
+                            # Bugfix for [#477088]
+                            # Go ahead, leave chunk alone
+                        }
+                        default {
+                            error "Can't handle content encoding \"$state(encoding)\""
+                        }
+                    }
+                    append fragment $chunk
+
+                    set cc [expr {$options(-blocksize) - 1}]
+                    while {[string length $fragment] > $options(-blocksize)} {
+                        uplevel #0 $options(-command) [
+                            list data [string range $fragment 0 $cc]]
+
+                        set fragment [
+                            string range $fragment $options(-blocksize) end]
+                    }
+                }
+                if {[string length $fragment] > 0} {
+                    uplevel #0 $options(-command) [list data $fragment]
+                }
+            } result]
+            set ecode $errorCode
+            set einfo $errorInfo
+
+            catch {close $fd}
+        }
+
+        file/1 {
+            set fd [open $state(file) RDONLY]
+
+            set code [catch {
+                fconfigure $fd -translation binary
+
+                while {[string length [
+                    set fragment [read $fd $options(-blocksize)]]] > 0} {
+                        uplevel #0 $options(-command) [list data $fragment]
+                    }
+            } result]
+            set ecode $errorCode
+            set einfo $errorInfo
+
+            catch {close $fd}
+        }
+
+        parts/0
+            -
+        parts/1 {
+            error {MIME part isn't a leaf}
+        }
+
+        string/0
+            -
+        string/1 {
+            switch -- $state(encoding)/$state(canonicalP) {
+                base64/0
+                    -
+                quoted-printable/0 {
+                    set fragment [
+                        $state(encoding) -mode decode -- $state(string)]
+                }
+
+                default {
+                    # Not a bugfix for [#477088], but clarification
+                    # This handles no-encoding, 7bit, 8bit, and binary.
+                    set fragment $state(string)
+                }
+            }
+
+            set code [catch {
+                set cc [expr {$options(-blocksize) -1}]
+                while {[string length $fragment] > $options(-blocksize)} {
+                    uplevel #0 $options(-command) [
+                        list data [string range $fragment 0 $cc]]
+
+                    set fragment [
+                        string range $fragment $options(-blocksize) end]
+                }
+                if {[string length $fragment] > 0} {
+                    uplevel #0 $options(-command) [list data $fragment]
+                }
+            } result]
+            set ecode $errorCode
+            set einfo $errorInfo
+        }
+        default {
+            error "Unknown combination \"$state(value)/$state(canonicalP)\""
+        }
+    }
+
+    set code [catch {
+        if {$code} {
+            uplevel #0 $options(-command) [list error $result]
+        } else {
+            uplevel #0 $options(-command) [list end]
+        }
+    } result]
+    set ecode $errorCode
+    set einfo $errorInfo
+
+    if {$code} {
+        return -code $code -errorinfo $einfo -errorcode $ecode $result
+    }
+
+    if {$decode} {
+        array set params [mime::getproperty $token params]
+
+        if {[info exists params(charset)]} {
+            set charset $params(charset)
+        } else {
+            set charset US-ASCII
+        }
+
+        set enc [reversemapencoding $charset]
+        if {$enc ne {}} {
+            set result [::encoding convertfrom $enc $result]
+        } else {
+            return -code error "-decode failed: can't reversemap charset $charset"
+        }
+    }
+
+    return $result
+}
+
+# ::mime::getbodyaux --
+#
+#    Builds up the body of the message, fragment by fragment.  When
+#    the entire message has been retrieved, it is returned.
+#
+# Arguments:
+#       token      The MIME token to parse.
+#       reason     One of 'data', 'end', or 'error'.
+#       fragment   The section of data data fragment to extract a
+#                  string from.
+#
+# Results:
+#       Returns nothing, except when called with the 'end' argument
+#       in which case it returns a string that contains all of the
+#       data that 'getbodyaux' has been called with.  Will throw an
+#       error if it is called with the reason of 'error'.
+
+proc ::mime::getbodyaux {token reason {fragment {}}} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    switch $reason {
+        data {
+            append state(getbody) $fragment
+            return {}
+        }
+
+        end {
+            if {[info exists state(getbody)]} {
+                set result $state(getbody)
+                unset state(getbody)
+            } else {
+                set result {}
+            }
+
+            return $result
+        }
+
+        error {
+            catch {unset state(getbody)}
+            error $reason
+        }
+
+        default {
+            error "Unknown reason \"$reason\""
+        }
+    }
+}
+
+# ::mime::copymessage --
+#
+#    mime::copymessage copies the MIME part to the specified channel.
+#
+#    mime::copymessage operates synchronously, and uses fileevent to
+#    allow asynchronous operations to proceed independently.
+#
+# Arguments:
+#       token      The MIME token to parse.
+#       channel    The channel to copy the message to.
+#
+# Results:
+#       Returns nothing unless an error is thrown while the message
+#       is being written to the channel.
+
+proc ::mime::copymessage {token channel} {
+    global errorCode errorInfo
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set openP [info exists state(fd)]
+
+    set code [catch {mime::copymessageaux $token $channel} result]
+    set ecode $errorCode
+    set einfo $errorInfo
+
+    if {!$openP && [info exists state(fd)]} {
+        if {![info exists state(root)]} {
+            catch {close $state(fd)}
+        }
+        unset state(fd)
+    }
+
+    return -code $code -errorinfo $einfo -errorcode $ecode $result
+}
+
+# ::mime::copymessageaux --
+#
+#    mime::copymessageaux copies the MIME part to the specified channel.
+#
+# Arguments:
+#       token      The MIME token to parse.
+#       channel    The channel to copy the message to.
+#
+# Results:
+#       Returns nothing unless an error is thrown while the message
+#       is being written to the channel.
+
+proc ::mime::copymessageaux {token channel} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    array set header $state(header)
+
+    set result {}
+    foreach {mixed value} [getheader $token] {
+	puts $channel "$mixed: $value"
+    }
+
+    set boundary $state(boundary) ;# computed by `getheader`
+
+    set converter {}
+    set encoding {}
+    if {$state(value) ne {parts}} {
+        if {$state(canonicalP)} {
+            if {[set encoding $state(encoding)] eq {}} {
+                set encoding [encoding $token]
+            }
+            if {$encoding ne {}} {
+                puts $channel "Content-Transfer-Encoding: $encoding"
+            }
+            switch -- $encoding {
+                base64
+                    -
+                quoted-printable {
+                    set converter $encoding
+                }
+                7bit - 8bit - binary - {} {
+                    # Bugfix for [#477088], also [#539952]
+                    # Go ahead
+                }
+                default {
+                    error "Can't handle content encoding \"$encoding\""
+                }
+            }
+        }
+    }
+
+    if {[info exists state(error)]} {
+        unset state(error)
+    }
+
+    switch -- $state(value) {
+        file {
+            set closeP 1
+            if {[info exists state(root)]} {
+                # FRINK: nocheck
+                variable $state(root)
+                upvar 0 $state(root) root
+
+                if {[info exists root(fd)]} {
+                    set fd $root(fd)
+                    set closeP 0
+                } else {
+                    set fd [set state(fd) [open $state(file) RDONLY]]
+                }
+                set size $state(count)
+            } else {
+                set fd [set state(fd) [open $state(file) RDONLY]]
+                # read until eof
+                set size -1
+            }
+            seek $fd $state(offset) start
+            if {$closeP} {
+                fconfigure $fd -translation binary
+            }
+
+            puts $channel {}
+
+            while {$size != 0 && ![eof $fd]} {
+                if {$size < 0 || $size > 32766} {
+                    set X [read $fd 32766]
+                } else {
+                    set X [read $fd $size]
+                }
+                if {$size > 0} {
+                    set size [expr {$size - [string length $X]}]
+                }
+                if {$converter eq {}} {
+                    puts -nonewline $channel $X
+                } else {
+                    puts -nonewline $channel [$converter -mode encode -- $X]
+                }
+            }
+
+            if {$closeP} {
+                catch {close $state(fd)}
+                unset state(fd)
+            }
+        }
+
+        parts {
+            if {
+		![info exists state(root)]
+		&&
+		[info exists state(file)]
+	    } {
+                set state(fd) [open $state(file) RDONLY]
+                fconfigure $state(fd) -translation binary
+            }
+
+            switch -glob -- $state(content) {
+                message/* {
+                    puts $channel {}
+                    foreach part $state(parts) {
+                        mime::copymessage $part $channel
+                        break
+                    }
+                }
+
+                default {
+                    # Note RFC 2046: See buildmessageaux for details.
+                    #
+                    # The boundary delimiter MUST occur at the
+                    # beginning of a line, i.e., following a CRLF, and
+                    # the initial CRLF is considered to be attached to
+                    # the boundary delimiter line rather than part of
+                    # the preceding part.
+                    #
+                    # - The above means that the CRLF before $boundary
+                    #   is needed per the RFC, and the parts must not
+                    #   have a closing CRLF of their own. See Tcllib bug
+                    #   1213527, and patch 1254934 for the problems when
+                    #   both file/string branches added CRLF after the
+                    #   body parts.
+
+
+                    foreach part $state(parts) {
+                        puts $channel \n--$boundary
+                        mime::copymessage $part $channel
+                    }
+                    puts $channel \n--$boundary--
+                }
+            }
+
+            if {[info exists state(fd)]} {
+                catch {close $state(fd)}
+                unset state(fd)
+            }
+        }
+
+        string {
+            if {[catch {fconfigure $channel -buffersize} blocksize]} {
+                set blocksize 4096
+            } elseif {$blocksize < 512} {
+                set blocksize 512
+            }
+            set blocksize [expr {($blocksize / 4) * 3}]
+
+            # [893516]
+            fconfigure $channel -buffersize $blocksize
+
+            puts $channel {}
+
+            #TODO: tests don't cover these paths
+            if {$converter eq {}} {
+                puts -nonewline $channel $state(string)
+            } else {
+                puts -nonewline $channel [$converter -mode encode -- $state(string)]
+            }
+        }
+        default {
+            error "Unknown value \"$state(value)\""
+        }
+    }
+
+    flush $channel
+
+    if {[info exists state(error)]} {
+        error $state(error)
+    }
+}
+
+# ::mime::buildmessage --
+#
+#     Like copymessage, but produces a string rather than writing the message into a channel.
+#
+# Arguments:
+#       token      The MIME token to parse.
+#
+# Results:
+#       The message.
+
+proc ::mime::buildmessage token {
+    global errorCode errorInfo
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set openP [info exists state(fd)]
+
+    set code [catch {mime::buildmessageaux $token} result]
+    if {![info exists errorCode]} {
+        set ecode {}
+    } else {
+        set ecode $errorCode
+    }
+    set einfo $errorInfo
+
+    if {!$openP && [info exists state(fd)]} {
+        if {![info exists state(root)]} {
+            catch {close $state(fd)}
+        }
+        unset state(fd)
+    }
+
+    return -code $code -errorinfo $einfo -errorcode $ecode $result
+}
+
+
+proc ::mime::buildmessageaux token {
+	set chan [tcl::chan::memchan]
+	chan configure $chan -translation crlf
+	copymessageaux $token $chan
+	seek $chan 0
+	chan configure $chan -translation binary
+	set res [read $chan]
+	close $chan
+	return $res
+}
+
+# ::mime::encoding --
+#
+#     Determines how a token is encoded.
+#
+# Arguments:
+#       token      The MIME token to parse.
+#
+# Results:
+#       Returns the encoding of the message (the null string, base64,
+#       or quoted-printable).
+
+proc ::mime::encoding {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    switch -glob -- $state(content) {
+        audio/*
+            -
+        image/*
+            -
+        video/* {
+            return base64
+        }
+
+        message/*
+            -
+        multipart/* {
+            return {}
+        }
+        default {# Skip}
+    }
+
+    set asciiP 1
+    set lineP 1
+    switch -- $state(value) {
+        file {
+            set fd [open $state(file) RDONLY]
+            fconfigure $fd -translation binary
+
+            while {[gets $fd line] >= 0} {
+                if {$asciiP} {
+                    set asciiP [encodingasciiP $line]
+                }
+                if {$lineP} {
+                    set lineP [encodinglineP $line]
+                }
+                if {(!$asciiP) && (!$lineP)} {
+                    break
+                }
+            }
+
+            catch {close $fd}
+        }
+
+        parts {
+            return {}
+        }
+
+        string {
+            foreach line [split $state(string) "\n"] {
+                if {$asciiP} {
+                    set asciiP [encodingasciiP $line]
+                }
+                if {$lineP} {
+                    set lineP [encodinglineP $line]
+                }
+                if {(!$asciiP) && (!$lineP)} {
+                    break
+                }
+            }
+        }
+        default {
+            error "Unknown value \"$state(value)\""
+        }
+    }
+
+    switch -glob -- $state(content) {
+        text/* {
+            if {!$asciiP} {
+                #TODO: this path is not covered by tests
+                foreach {k v} $state(params) {
+                    if {$k eq "charset"} {
+                        set v [string tolower $v]
+                        if {($v ne "us-ascii") \
+                                && (![string match {iso-8859-[1-8]} $v])} {
+                            return base64
+                        }
+
+                        break
+                    }
+                }
+            }
+
+            if {!$lineP} {
+                return quoted-printable
+            }
+        }
+
+
+        default {
+            if {(!$asciiP) || (!$lineP)} {
+                return base64
+            }
+        }
+    }
+
+    return {}
+}
+
+# ::mime::encodingasciiP --
+#
+#     Checks if a string is a pure ascii string, or if it has a non-standard
+#     form.
+#
+# Arguments:
+#       line    The line to check.
+#
+# Results:
+#       Returns 1 if \r only occurs at the end of lines, and if all
+#       characters in the line are between the ASCII codes of 32 and 126.
+
+proc ::mime::encodingasciiP {line} {
+    foreach c [split $line {}] {
+        switch -- $c {
+            { } - \t - \r - \n {
+            }
+
+            default {
+                binary scan $c c c
+                if {($c < 32) || ($c > 126)} {
+                    return 0
+                }
+            }
+        }
+    }
+    if {
+	[set r [string first \r $line]] < 0
+	||
+	$r == {[string length $line] - 1}
+    } {
+        return 1
+    }
+
+    return 0
+}
+
+# ::mime::encodinglineP --
+#
+#     Checks if a string is a line is valid to be processed.
+#
+# Arguments:
+#       line    The line to check.
+#
+# Results:
+#       Returns 1 the line is less than 76 characters long, the line
+#       contains more characters than just whitespace, the line does
+#       not start with a '.', and the line does not start with 'From '.
+
+proc ::mime::encodinglineP {line} {
+    if {([string length $line] > 76) \
+            || ($line ne [string trimright $line]) \
+            || ([string first . $line] == 0) \
+            || ([string first {From } $line] == 0)} {
+        return 0
+    }
+
+    return 1
+}
+
+# ::mime::fcopy --
+#
+#    Appears to be unused.
+#
+# Arguments:
+#
+# Results:
+#
+
+proc ::mime::fcopy {token count {error {}}} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    if {$error ne {}} {
+        set state(error) $error
+    }
+    set state(doneP) 1
+}
+
+# ::mime::scopy --
+#
+#    Copy a portion of the contents of a mime token to a channel.
+#
+# Arguments:
+#    token     The token containing the data to copy.
+#       channel   The channel to write the data to.
+#       offset    The location in the string to start copying
+#                 from.
+#       len       The amount of data to write.
+#       blocksize The block size for the write operation.
+#
+# Results:
+#    The specified portion of the string in the mime token is
+#       copied to the specified channel.
+
+proc ::mime::scopy {token channel offset len blocksize} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    if {$len <= 0} {
+        set state(doneP) 1
+        fileevent $channel writable {}
+        return
+    }
+
+    if {[set cc $len] > $blocksize} {
+        set cc $blocksize
+    }
+
+    if {[catch {
+	    puts -nonewline $channel [
+		string range $state(string) $offset [expr {$offset + $cc - 1}]]
+	    fileevent $channel writable [
+		list mime::scopy $token $channel [
+		    incr offset $cc] [incr len -$cc] $blocksize]
+	} result]
+    } {
+        set state(error) $result
+        set state(doneP) 1
+        fileevent $channel writable {}
+    }
+    return
+}
+
+# ::mime::qp_encode --
+#
+#    Tcl version of quote-printable encode
+#
+# Arguments:
+#    string        The string to quote.
+#       encoded_word  Boolean value to determine whether or not encoded words
+#                     (RFC 2047) should be handled or not. (optional)
+#
+# Results:
+#    The properly quoted string is returned.
+
+proc ::mime::qp_encode {string {encoded_word 0} {no_softbreak 0}} {
+    # 8.1+ improved string manipulation routines used.
+    # Replace outlying characters, characters that would normally
+    # be munged by EBCDIC gateways, and special Tcl characters "[\]{}
+    # with =xx sequence
+
+    if {$encoded_word} {
+        # Special processing for encoded words (RFC 2047)
+        set regexp {[\x00-\x08\x0B-\x1E\x21-\x24\x3D\x40\x5B-\x5E\x60\x7B-\xFF\x09\x5F\x3F]}
+	lappend mapChars { } _
+    } else {
+        set regexp {[\x00-\x08\x0B-\x1E\x21-\x24\x3D\x40\x5B-\x5E\x60\x7B-\xFF]}
+    }
+    regsub -all -- $regexp $string {[format =%02X [scan "\\&" %c]]} string
+
+    # Replace the format commands with their result
+
+    set string [subst -novariables $string]
+
+    # soft/hard newlines and other
+    # Funky cases for SMTP compatibility
+    lappend mapChars " \n" =20\n \t\n =09\n \n\.\n =2E\n "\nFrom " "\n=46rom "
+
+    set string [string map $mapChars $string]
+
+    # Break long lines - ugh
+
+    # Implementation of FR #503336
+    if {$no_softbreak} {
+        set result $string
+    } else {
+        set result {}
+        foreach line [split $string \n] {
+            while {[string length $line] > 72} {
+                set chunk [string range $line 0 72]
+                if {[regexp -- (=|=.)$ $chunk dummy end]} {
+
+                    # Don't break in the middle of a code
+
+                    set len [expr {72 - [string length $end]}]
+                    set chunk [string range $line 0 $len]
+                    incr len
+                    set line [string range $line $len end]
+                } else {
+                    set line [string range $line 73 end]
+                }
+                append result $chunk=\n
+            }
+            append result $line\n
+        }
+
+        # Trim off last \n, since the above code has the side-effect
+        # of adding an extra \n to the encoded string and return the
+        # result.
+        set result [string range $result 0 end-1]
+    }
+
+    # If the string ends in space or tab, replace with =xx
+
+    set lastChar [string index $result end]
+    if {$lastChar eq { }} {
+        set result [string replace $result end end =20]
+    } elseif {$lastChar eq "\t"} {
+        set result [string replace $result end end =09]
+    }
+
+    return $result
+}
+
+# ::mime::qp_decode --
+#
+#    Tcl version of quote-printable decode
+#
+# Arguments:
+#    string        The quoted-printable string to decode.
+#       encoded_word  Boolean value to determine whether or not encoded words
+#                     (RFC 2047) should be handled or not. (optional)
+#
+# Results:
+#    The decoded string is returned.
+
+proc ::mime::qp_decode {string {encoded_word 0}} {
+    # 8.1+ improved string manipulation routines used.
+    # Special processing for encoded words (RFC 2047)
+
+    if {$encoded_word} {
+        # _ == \x20, even if SPACE occupies a different code position
+        set string [string map [list _ \u0020] $string]
+    }
+
+    # smash the white-space at the ends of lines since that must've been
+    # generated by an MUA.
+
+    regsub -all -- {[ \t]+\n} $string \n string
+    set string [string trimright $string " \t"]
+
+    # Protect the backslash for later subst and
+    # smash soft newlines, has to occur after white-space smash
+    # and any encoded word modification.
+
+    #TODO: codepath not tested
+    set string [string map [list \\ {\\} =\n {}] $string]
+
+    # Decode specials
+
+    regsub -all -nocase {=([a-f0-9][a-f0-9])} $string {\\u00\1} string
+
+    # process \u unicode mapped chars
+
+    return [subst -novariables -nocommands $string]
+}
+
+# ::mime::parseaddress --
+#
+#       This was originally written circa 1982 in C. we're still using it
+#       because it recognizes virtually every buggy address syntax ever
+#       generated!
+#
+#       mime::parseaddress takes a string containing one or more 822-style
+#       address specifications and returns a list of dictionaries, for each
+#       address specified in the argument.
+#
+#    Each dictionary contains these properties:
+#
+#       property    value
+#       ========    =====
+#       address     local@domain
+#       comment     822-style comment
+#       domain      the domain part (rhs)
+#       error       non-empty on a parse error
+#       group       this address begins a group
+#       friendly    user-friendly rendering
+#       local       the local part (lhs)
+#       memberP     this address belongs to a group
+#       phrase      the phrase part
+#       proper      822-style address specification
+#       route       822-style route specification (obsolete)
+#
+#    Note that one or more of these properties may be empty.
+#
+# Arguments:
+#    string        The address string to parse
+#
+# Results:
+#    Returns a list of dictionaries, one element for each address
+#       specified in the argument.
+
+proc ::mime::parseaddress {string} {
+    global errorCode errorInfo
+
+    variable mime
+
+    set token [namespace current]::[incr mime(uid)]
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set code [catch {mime::parseaddressaux $token $string} result]
+    set ecode $errorCode
+    set einfo $errorInfo
+
+    foreach name [array names state] {
+        unset state($name)
+    }
+    # FRINK: nocheck
+    catch {unset $token}
+
+    return -code $code -errorinfo $einfo -errorcode $ecode $result
+}
+
+# ::mime::parseaddressaux --
+#
+#       This was originally written circa 1982 in C. we're still using it
+#       because it recognizes virtually every buggy address syntax ever
+#       generated!
+#
+#       mime::parseaddressaux does the actually parsing for mime::parseaddress
+#
+#    Each dictionary contains these properties:
+#
+#       property    value
+#       ========    =====
+#       address     local@domain
+#       comment     822-style comment
+#       domain      the domain part (rhs)
+#       error       non-empty on a parse error
+#       group       this address begins a group
+#       friendly    user-friendly rendering
+#       local       the local part (lhs)
+#       memberP     this address belongs to a group
+#       phrase      the phrase part
+#       proper      822-style address specification
+#       route       822-style route specification (obsolete)
+#
+#    Note that one or more of these properties may be empty.
+#
+# Arguments:
+#    token         The MIME token to work from.
+#    string        The address string to parse
+#
+# Results:
+#    Returns a list of dictionaries, one for each address specified in the
+#    argument.
+
+proc ::mime::parseaddressaux {token string} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    variable addrtokenL
+    variable addrlexemeL
+
+    set state(input)   $string
+    set state(glevel)  0
+    set state(buffer)  {}
+    set state(lastC)   LX_END
+    set state(tokenL)  $addrtokenL
+    set state(lexemeL) $addrlexemeL
+
+    set result {}
+    while {[addr_next $token]} {
+        if {[set tail $state(domain)] ne {}} {
+            set tail @$state(domain)
+        } else {
+            set tail @[info hostname]
+        }
+        if {[set address $state(local)] ne {}} {
+            #TODO: this path is not covered by tests
+            append address $tail
+        }
+
+        if {$state(phrase) ne {}} {
+            #TODO: this path is not covered by tests
+            set state(phrase) [string trim $state(phrase) \"]
+            foreach t $state(tokenL) {
+                if {[string first $t $state(phrase)] >= 0} {
+                    #TODO:  is this quoting robust enough?
+                    set state(phrase) \"$state(phrase)\"
+                    break
+                }
+            }
+
+            set proper "$state(phrase) <$address>"
+        } else {
+            set proper $address
+        }
+
+        if {[set friendly $state(phrase)] eq {}} {
+            #TODO: this path is not covered by tests
+            if {[set note $state(comment)] ne {}} {
+                if {[string first ( $note] == 0} {
+                    set note [string trimleft [string range $note 1 end]]
+                }
+                if {
+		    [string last ) $note]
+                        == [set len [expr {[string length $note] - 1}]]
+		} {
+                    set note [string range $note 0 [expr {$len - 1}]]
+                }
+                set friendly $note
+            }
+
+            if {
+		$friendly eq {}
+		&&
+		[set mbox $state(local)] ne {}
+	    } {
+                #TODO: this path is not covered by tests
+                set mbox [string trim $mbox \"]
+
+                if {[string first / $mbox] != 0} {
+                    set friendly $mbox
+                } elseif {[set friendly [addr_x400 $mbox PN]] ne {}} {
+                } elseif {
+		    [set friendly [addr_x400 $mbox S]] ne {}
+                    &&
+		    [set g [addr_x400 $mbox G]] ne {}
+		} {
+                    set friendly "$g $friendly"
+                }
+
+                if {$friendly eq {}} {
+                    set friendly $mbox
+                }
+            }
+        }
+        set friendly [string trim $friendly \"]
+
+        lappend result [list address  $address        \
+                             comment  $state(comment) \
+                             domain   $state(domain)  \
+                             error    $state(error)   \
+                             friendly $friendly       \
+                             group    $state(group)   \
+                             local    $state(local)   \
+                             memberP  $state(memberP) \
+                             phrase   $state(phrase)  \
+                             proper   $proper         \
+                             route    $state(route)]
+
+    }
+
+    unset {*}{
+	state(input)
+	state(glevel)
+	state(buffer)
+	state(lastC)
+	state(tokenL)
+	state(lexemeL)
+    }
+
+    return $result
+}
+
+# ::mime::addr_next --
+#
+#       Locate the next address in a mime token.
+#
+# Arguments:
+#       token         The MIME token to work from.
+#
+# Results:
+#    Returns 1 if there is another address, and 0 if there is not.
+
+proc ::mime::addr_next {token} {
+    global errorCode errorInfo
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+    set nocomplain [package vsatisfies [package provide Tcl] 8.4]
+    foreach prop {comment domain error group local memberP phrase route} {
+        if {$nocomplain} {
+            unset -nocomplain state($prop)
+        } else {
+            if {[catch {unset state($prop)}]} {set ::errorInfo {}}
+        }
+    }
+
+    switch -- [set code [catch {mime::addr_specification $token} result]] {
+        0 {
+            if {!$result} {
+                return 0
+            }
+
+            switch -- $state(lastC) {
+                LX_COMMA
+                    -
+                LX_END {
+                }
+                default {
+                    # catch trailing comments...
+                    set lookahead $state(input)
+                    mime::parselexeme $token
+                    set state(input) $lookahead
+                }
+            }
+        }
+
+        7 {
+            set state(error) $result
+
+            while {1} {
+                switch -- $state(lastC) {
+                    LX_COMMA
+                        -
+                    LX_END {
+                        break
+                    }
+
+                    default {
+                        mime::parselexeme $token
+                    }
+                }
+            }
+        }
+
+        default {
+            set ecode $errorCode
+            set einfo $errorInfo
+
+            return -code $code -errorinfo $einfo -errorcode $ecode $result
+        }
+    }
+
+    foreach prop {comment domain error group local memberP phrase route} {
+        if {![info exists state($prop)]} {
+            set state($prop) {}
+        }
+    }
+
+    return 1
+}
+
+# ::mime::addr_specification --
+#
+#   Uses lookahead parsing to determine whether there is another
+#   valid e-mail address or not.  Throws errors if unrecognized
+#   or invalid e-mail address syntax is used.
+#
+# Arguments:
+#       token         The MIME token to work from.
+#
+# Results:
+#    Returns 1 if there is another address, and 0 if there is not.
+
+proc ::mime::addr_specification {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set lookahead $state(input)
+    switch -- [parselexeme $token] {
+        LX_ATOM
+            -
+        LX_QSTRING {
+            set state(phrase) $state(buffer)
+        }
+
+        LX_SEMICOLON {
+            if {[incr state(glevel) -1] < 0} {
+                return -code 7 "extraneous semi-colon"
+            }
+
+            catch {unset state(comment)}
+            return [addr_specification $token]
+        }
+
+        LX_COMMA {
+            catch {unset state(comment)}
+            return [addr_specification $token]
+        }
+
+        LX_END {
+            return 0
+        }
+
+        LX_LBRACKET {
+            return [addr_routeaddr $token]
+        }
+
+        LX_ATSIGN {
+            set state(input) $lookahead
+            return [addr_routeaddr $token 0]
+        }
+
+        default {
+            return -code 7 [
+		format "unexpected character at beginning (found %s)" \
+		   $state(buffer)]
+        }
+    }
+
+    switch -- [parselexeme $token] {
+        LX_ATOM
+            -
+        LX_QSTRING {
+            append state(phrase) " " $state(buffer)
+
+            return [addr_phrase $token]
+        }
+
+        LX_LBRACKET {
+            return [addr_routeaddr $token]
+        }
+
+        LX_COLON {
+            return [addr_group $token]
+        }
+
+        LX_DOT {
+            set state(local) "$state(phrase)$state(buffer)"
+            unset state(phrase)
+            mime::addr_routeaddr $token 0
+            mime::addr_end $token
+        }
+
+        LX_ATSIGN {
+            set state(memberP) $state(glevel)
+            set state(local) $state(phrase)
+            unset state(phrase)
+            mime::addr_domain $token
+            mime::addr_end $token
+        }
+
+        LX_SEMICOLON
+            -
+        LX_COMMA
+            -
+        LX_END {
+            set state(memberP) $state(glevel)
+            if {
+		$state(lastC) eq "LX_SEMICOLON"
+		&&
+		([incr state(glevel) -1] < 0)
+	    } {
+                #TODO: this path is not covered by tests
+                return -code 7 "extraneous semi-colon"
+            }
+
+            set state(local) $state(phrase)
+            unset state(phrase)
+        }
+
+        default {
+            return -code 7 [
+                format "expecting mailbox (found %s)" $state(buffer)]
+        }
+    }
+
+    return 1
+}
+
+# ::mime::addr_routeaddr --
+#
+#       Parses the domain portion of an e-mail address.  Finds the '@'
+#       sign and then calls mime::addr_route to verify the domain.
+#
+# Arguments:
+#       token         The MIME token to work from.
+#
+# Results:
+#    Returns 1 if there is another address, and 0 if there is not.
+
+proc ::mime::addr_routeaddr {token {checkP 1}} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set lookahead $state(input)
+    if {[parselexeme $token] eq "LX_ATSIGN"} {
+        #TODO: this path is not covered by tests
+        mime::addr_route $token
+    } else {
+        set state(input) $lookahead
+    }
+
+    mime::addr_local $token
+
+    switch -- $state(lastC) {
+        LX_ATSIGN {
+            mime::addr_domain $token
+        }
+
+        LX_SEMICOLON
+            -
+        LX_RBRACKET
+            -
+        LX_COMMA
+            -
+        LX_END {
+        }
+
+        default {
+            return -code 7 [
+                format "expecting at-sign after local-part (found %s)" \
+                $state(buffer)]
+        }
+    }
+
+    if {($checkP) && ($state(lastC) ne "LX_RBRACKET")} {
+        return -code 7 [
+            format "expecting right-bracket (found %s)" $state(buffer)]
+    }
+
+    return 1
+}
+
+# ::mime::addr_route --
+#
+#    Attempts to parse the portion of the e-mail address after the @.
+#    Tries to verify that the domain definition has a valid form.
+#
+# Arguments:
+#       token         The MIME token to work from.
+#
+# Results:
+#    Returns nothing if successful, and throws an error if invalid
+#       syntax is found.
+
+proc ::mime::addr_route {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set state(route) @
+
+    while 1 {
+        switch -- [parselexeme $token] {
+            LX_ATOM
+                -
+            LX_DLITERAL {
+                append state(route) $state(buffer)
+            }
+
+            default {
+                return -code 7 \
+                       [format "expecting sub-route in route-part (found %s)" \
+                               $state(buffer)]
+            }
+        }
+
+        switch -- [parselexeme $token] {
+            LX_COMMA {
+                append state(route) $state(buffer)
+                while 1 {
+                    switch -- [parselexeme $token] {
+                        LX_COMMA {
+                        }
+
+                        LX_ATSIGN {
+                            append state(route) $state(buffer)
+                            break
+                        }
+
+                        default {
+                            return -code 7 \
+                                   [format "expecting at-sign in route (found %s)" \
+                                           $state(buffer)]
+                        }
+                    }
+                }
+            }
+
+            LX_ATSIGN
+                -
+            LX_DOT {
+                append state(route) $state(buffer)
+            }
+
+            LX_COLON {
+                append state(route) $state(buffer)
+                return
+            }
+
+            default {
+                return -code 7 [
+		    format "expecting colon to terminate route (found %s)" \
+			$state(buffer)]
+            }
+        }
+    }
+}
+
+# ::mime::addr_domain --
+#
+#    Attempts to parse the portion of the e-mail address after the @.
+#    Tries to verify that the domain definition has a valid form.
+#
+# Arguments:
+#       token         The MIME token to work from.
+#
+# Results:
+#    Returns nothing if successful, and throws an error if invalid
+#       syntax is found.
+
+proc ::mime::addr_domain {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    while 1 {
+        switch -- [parselexeme $token] {
+            LX_ATOM
+                -
+            LX_DLITERAL {
+                append state(domain) $state(buffer)
+            }
+
+            default {
+                return -code 7 [
+		    format "expecting sub-domain in domain-part (found %s)" \
+			$state(buffer)]
+            }
+        }
+
+        switch -- [parselexeme $token] {
+            LX_DOT {
+                append state(domain) $state(buffer)
+            }
+
+            LX_ATSIGN {
+                append state(local) % $state(domain)
+                unset state(domain)
+            }
+
+            default {
+                return
+            }
+        }
+    }
+}
+
+# ::mime::addr_local --
+#
+#
+# Arguments:
+#       token         The MIME token to work from.
+#
+# Results:
+#    Returns nothing if successful, and throws an error if invalid
+#       syntax is found.
+
+proc ::mime::addr_local {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set state(memberP) $state(glevel)
+
+    while 1 {
+        switch -- [parselexeme $token] {
+            LX_ATOM
+                -
+            LX_QSTRING {
+                append state(local) $state(buffer)
+            }
+
+            default {
+                return -code 7 \
+                       [format "expecting mailbox in local-part (found %s)" \
+                               $state(buffer)]
+            }
+        }
+
+        switch -- [parselexeme $token] {
+            LX_DOT {
+                append state(local) $state(buffer)
+            }
+
+            default {
+                return
+            }
+        }
+    }
+}
+
+# ::mime::addr_phrase --
+#
+#
+# Arguments:
+#       token         The MIME token to work from.
+#
+# Results:
+#    Returns nothing if successful, and throws an error if invalid
+#       syntax is found.
+
+
+proc ::mime::addr_phrase {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    while {1} {
+        switch -- [parselexeme $token] {
+            LX_ATOM
+                -
+            LX_QSTRING {
+                append state(phrase) " " $state(buffer)
+            }
+
+            default {
+                break
+            }
+        }
+    }
+
+    switch -- $state(lastC) {
+        LX_LBRACKET {
+            return [addr_routeaddr $token]
+        }
+
+        LX_COLON {
+            return [addr_group $token]
+        }
+
+        LX_DOT {
+            append state(phrase) $state(buffer)
+            return [addr_phrase $token]
+        }
+
+        default {
+            return -code 7 [
+		format "found phrase instead of mailbox (%s%s)" \
+		    $state(phrase) $state(buffer)]
+        }
+    }
+}
+
+# ::mime::addr_group --
+#
+#
+# Arguments:
+#       token         The MIME token to work from.
+#
+# Results:
+#    Returns nothing if successful, and throws an error if invalid
+#       syntax is found.
+
+proc ::mime::addr_group {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    if {[incr state(glevel)] > 1} {
+        return -code 7 [
+	    format "nested groups not allowed (found %s)" $state(phrase)]
+    }
+
+    set state(group) $state(phrase)
+    unset state(phrase)
+
+    set lookahead $state(input)
+    while 1 {
+        switch -- [parselexeme $token] {
+            LX_SEMICOLON
+                -
+            LX_END {
+                set state(glevel) 0
+                return 1
+            }
+
+            LX_COMMA {
+            }
+
+            default {
+                set state(input) $lookahead
+                return [addr_specification $token]
+            }
+        }
+    }
+}
+
+# ::mime::addr_end --
+#
+#
+# Arguments:
+#       token         The MIME token to work from.
+#
+# Results:
+#    Returns nothing if successful, and throws an error if invalid
+#       syntax is found.
+
+proc ::mime::addr_end {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    switch -- $state(lastC) {
+        LX_SEMICOLON {
+            if {[incr state(glevel) -1] < 0} {
+                return -code 7 "extraneous semi-colon"
+            }
+        }
+
+        LX_COMMA
+            -
+        LX_END {
+        }
+
+        default {
+            return -code 7 [
+		format "junk after local@domain (found %s)" $state(buffer)]
+        }
+    }
+}
+
+# ::mime::addr_x400 --
+#
+#
+# Arguments:
+#       token         The MIME token to work from.
+#
+# Results:
+#    Returns nothing if successful, and throws an error if invalid
+#       syntax is found.
+
+proc ::mime::addr_x400 {mbox key} {
+    if {[set x [string first /$key= [string toupper $mbox]]] < 0} {
+        return {}
+    }
+    set mbox [string range $mbox [expr {$x + [string length $key] + 2}] end]
+
+    if {[set x [string first / $mbox]] > 0} {
+        set mbox [string range $mbox 0 [expr {$x - 1}]]
+    }
+
+    return [string trim $mbox \"]
+}
+
+# ::mime::parsedatetime --
+#
+#    Fortunately the clock command in the Tcl 8.x core does all the heavy
+#    lifting for us (except for timezone calculations).
+#
+#    mime::parsedatetime takes a string containing an 822-style date-time
+#    specification and returns the specified property.
+#
+#    The list of properties and their ranges are:
+#
+#       property     range
+#       ========     =====
+#       clock        raw result of "clock scan"
+#       hour         0 .. 23
+#       lmonth       January, February, ..., December
+#       lweekday     Sunday, Monday, ... Saturday
+#       mday         1 .. 31
+#       min          0 .. 59
+#       mon          1 .. 12
+#       month        Jan, Feb, ..., Dec
+#       proper       822-style date-time specification
+#       rclock       elapsed seconds between then and now
+#       sec          0 .. 59
+#       wday         0 .. 6 (Sun .. Mon)
+#       weekday      Sun, Mon, ..., Sat
+#       yday         1 .. 366
+#       year         1900 ...
+#       zone         -720 .. 720 (minutes east of GMT)
+#
+# Arguments:
+#       value       Either a 822-style date-time specification or '-now'
+#                   if the current date/time should be used.
+#       property    The property (from the list above) to return
+#
+# Results:
+#    Returns the string value of the 'property' for the date/time that was
+#       specified in 'value'.
+
+namespace eval ::mime {
+        variable WDAYS_SHORT  [list Sun Mon Tue Wed Thu Fri Sat]
+        variable WDAYS_LONG   [list Sunday Monday Tuesday Wednesday Thursday \
+                                    Friday Saturday]
+
+        # Counting months starts at 1, so just insert a dummy element
+        # at index 0.
+        variable MONTHS_SHORT [list {} \
+                                    Jan Feb Mar Apr May Jun \
+                                    Jul Aug Sep Oct Nov Dec]
+        variable MONTHS_LONG  [list {} \
+                                    January February March April May June July \
+                                    August Sepember October November December]
+}
+proc ::mime::parsedatetime {value property} {
+    if {$value eq "-now"} {
+        set clock [clock seconds]
+    } elseif {[regexp {^(.*) ([+-])([0-9][0-9])([0-9][0-9])$} $value \
+	-> value zone_sign zone_hour zone_min]
+    } {
+        set clock [clock scan $value -gmt 1]
+        if {[info exists zone_min]} {
+            set zone_min [scan $zone_min %d]
+            set zone_hour [scan $zone_hour %d]
+            set zone [expr {60 * ($zone_min + 60 * $zone_hour)}]
+            if {$zone_sign eq "+"} {
+                set zone -$zone
+            }
+            incr clock $zone
+        }
+    } else {
+        set clock [clock scan $value]
+    }
+
+    switch -- $property {
+        clock {
+            return $clock
+        }
+
+        hour {
+            set value [clock format $clock -format %H]
+        }
+
+        lmonth {
+            variable MONTHS_LONG
+            return [lindex $MONTHS_LONG \
+                            [scan [clock format $clock -format %m] %d]]
+        }
+
+        lweekday {
+            variable WDAYS_LONG
+            return [lindex $WDAYS_LONG [clock format $clock -format %w]]
+        }
+
+        mday {
+            set value [clock format $clock -format %d]
+        }
+
+        min {
+            set value [clock format $clock -format %M]
+        }
+
+        mon {
+            set value [clock format $clock -format %m]
+        }
+
+        month {
+            variable MONTHS_SHORT
+            return [lindex $MONTHS_SHORT [
+		scan [clock format $clock -format %m] %d]]
+        }
+
+        proper {
+            set gmt [clock format $clock -format "%Y-%m-%d %H:%M:%S" -gmt true]
+            if {[set diff [expr {($clock-[clock scan $gmt]) / 60}]] < 0} {
+                set s -
+                set diff [expr {-($diff)}]
+            } else {
+                set s +
+            }
+            set zone [format %s%02d%02d $s [
+                expr {$diff / 60}] [expr {$diff % 60}]]
+
+            variable WDAYS_SHORT
+            set wday [lindex $WDAYS_SHORT [clock format $clock -format %w]]
+            variable MONTHS_SHORT
+            set mon [lindex $MONTHS_SHORT [
+		scan [clock format $clock -format %m] %d]]
+
+            return [
+		clock format $clock -format "$wday, %d $mon %Y %H:%M:%S $zone"]
+        }
+
+        rclock {
+            #TODO: these paths are not covered by tests
+            if {$value eq "-now"} {
+                return 0
+            } else {
+                return [expr {[clock seconds] - $clock}]
+            }
+        }
+
+        sec {
+            set value [clock format $clock -format %S]
+        }
+
+        wday {
+            return [clock format $clock -format %w]
+        }
+
+        weekday {
+            variable WDAYS_SHORT
+            return [lindex $WDAYS_SHORT [clock format $clock -format %w]]
+        }
+
+        yday {
+            set value [clock format $clock -format %j]
+        }
+
+        year {
+            set value [clock format $clock -format %Y]
+        }
+
+        zone {
+            set value [string trim [string map [list \t { }] $value]]
+            if {[set x [string last { } $value]] < 0} {
+                return 0
+            }
+            set value [string range $value [expr {$x + 1}] end]
+            switch -- [set s [string index $value 0]] {
+                + - - {
+                    if {$s eq "+"} {
+                        #TODO: This path is not covered by tests
+                        set s {}
+                    }
+                    set value [string trim [string range $value 1 end]]
+                    if {(
+			    [string length $value] != 4)
+			||
+			    [scan $value %2d%2d h m] != 2
+			||
+			    $h > 12
+			||
+			    $m > 59
+			||
+			    ($h == 12 && $m > 0)
+		    } {
+                        error "malformed timezone-specification: $value"
+                    }
+                    set value $s[expr {$h * 60 + $m}]
+                }
+
+                default {
+                    set value [string toupper $value]
+                    set z1 [list  UT GMT EST EDT CST CDT MST MDT PST PDT]
+                    set z2 [list   0   0  -5  -4  -6  -5  -7  -6  -8  -7]
+                    if {[set x [lsearch -exact $z1 $value]] < 0} {
+                        error "unrecognized timezone-mnemonic: $value"
+                    }
+                    set value [expr {[lindex $z2 $x] * 60}]
+                }
+            }
+        }
+
+        date2gmt
+            -
+        date2local
+            -
+        dst
+            -
+        sday
+            -
+        szone
+            -
+        tzone
+            -
+        default {
+            error "unknown property $property"
+        }
+    }
+
+    if {[set value [string trimleft $value 0]] eq {}} {
+        #TODO: this path is not covered by tests
+        set value 0
+    }
+    return $value
+}
+
+# ::mime::uniqueID --
+#
+#    Used to generate a 'globally unique identifier' for the content-id.
+#    The id is built from the pid, the current time, the hostname, and
+#    a counter that is incremented each time a message is sent.
+#
+# Arguments:
+#
+# Results:
+#    Returns the a string that contains the globally unique identifier
+#       that should be used for the Content-ID of an e-mail message.
+
+proc ::mime::uniqueID {} {
+    variable mime
+
+    return <[pid].[clock seconds].[incr mime(cid)]@[info hostname]>
+}
+
+# ::mime::parselexeme --
+#
+#    Used to implement a lookahead parser.
+#
+# Arguments:
+#       token    The MIME token to operate on.
+#
+# Results:
+#    Returns the next token found by the parser.
+
+proc ::mime::parselexeme {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set state(input) [string trimleft $state(input)]
+
+    set state(buffer) {}
+    if {$state(input) eq {}} {
+        set state(buffer) end-of-input
+        return [set state(lastC) LX_END]
+    }
+
+    set c [string index $state(input) 0]
+    set state(input) [string range $state(input) 1 end]
+
+    if {$c eq "("} {
+        set noteP 0
+        set quoteP 0
+
+        while 1 {
+            append state(buffer) $c
+
+            #TODO: some of these paths are not covered by tests
+            switch -- $c/$quoteP {
+                (/0 {
+                    incr noteP
+                }
+
+                \\/0 {
+                    set quoteP 1
+                }
+
+                )/0 {
+                    if {[incr noteP -1] < 1} {
+                        if {[info exists state(comment)]} {
+                            append state(comment) { }
+                        }
+                        append state(comment) $state(buffer)
+
+                        return [parselexeme $token]
+                    }
+                }
+
+                default {
+                    set quoteP 0
+                }
+            }
+
+            if {[set c [string index $state(input) 0]] eq {}} {
+                set state(buffer) "end-of-input during comment"
+                return [set state(lastC) LX_ERR]
+            }
+            set state(input) [string range $state(input) 1 end]
+        }
+    }
+
+    if {$c eq "\""} {
+        set firstP 1
+        set quoteP 0
+
+        while 1 {
+            append state(buffer) $c
+
+            switch -- $c/$quoteP {
+                "\\/0" {
+                    set quoteP 1
+                }
+
+                "\"/0" {
+                    if {!$firstP} {
+                        return [set state(lastC) LX_QSTRING]
+                    }
+                    set firstP 0
+                }
+
+                default {
+                    set quoteP 0
+                }
+            }
+
+            if {[set c [string index $state(input) 0]] eq {}} {
+                set state(buffer) "end-of-input during quoted-string"
+                return [set state(lastC) LX_ERR]
+            }
+            set state(input) [string range $state(input) 1 end]
+        }
+    }
+
+    if {$c eq {[}} {
+        set quoteP 0
+
+        while 1 {
+            append state(buffer) $c
+
+            switch -- $c/$quoteP {
+                \\/0 {
+                    set quoteP 1
+                }
+
+                ]/0 {
+                    return [set state(lastC) LX_DLITERAL]
+                }
+
+                default {
+                    set quoteP 0
+                }
+            }
+
+            if {[set c [string index $state(input) 0]] eq {}} {
+                set state(buffer) "end-of-input during domain-literal"
+                return [set state(lastC) LX_ERR]
+            }
+            set state(input) [string range $state(input) 1 end]
+        }
+    }
+
+    if {[set x [lsearch -exact $state(tokenL) $c]] >= 0} {
+        append state(buffer) $c
+
+        return [set state(lastC) [lindex $state(lexemeL) $x]]
+    }
+
+    while 1 {
+        append state(buffer) $c
+
+        switch -- [set c [string index $state(input) 0]] {
+            {} - " " - "\t" - "\n" {
+                break
+            }
+
+            default {
+                if {[lsearch -exact $state(tokenL) $c] >= 0} {
+                    break
+                }
+            }
+        }
+
+        set state(input) [string range $state(input) 1 end]
+    }
+
+    return [set state(lastC) LX_ATOM]
+}
+
+# ::mime::mapencoding --
+#
+#    mime::mapencodings maps tcl encodings onto the proper names for their
+#    MIME charset type.  This is only done for encodings whose charset types
+#    were known.  The remaining encodings return {} for now.
+#
+# Arguments:
+#       enc      The tcl encoding to map.
+#
+# Results:
+#    Returns the MIME charset type for the specified tcl encoding, or {}
+#       if none is known.
+
+proc ::mime::mapencoding {enc} {
+
+    variable encodings
+
+    if {[info exists encodings($enc)]} {
+        return $encodings($enc)
+    }
+    return {}
+}
+
+# ::mime::reversemapencoding --
+#
+#    mime::reversemapencodings maps MIME charset types onto tcl encoding names.
+#    Those that are unknown return {}.
+#
+# Arguments:
+#       mimeType  The MIME charset to convert into a tcl encoding type.
+#
+# Results:
+#    Returns the tcl encoding name for the specified mime charset, or {}
+#       if none is known.
+
+proc ::mime::reversemapencoding {mimeType} {
+
+    variable reversemap
+
+    set lmimeType [string tolower $mimeType]
+    if {[info exists reversemap($lmimeType)]} {
+        return $reversemap($lmimeType)
+    }
+    return {}
+}
+
+# ::mime::word_encode --
+#
+#    Word encodes strings as per RFC 2047.
+#
+# Arguments:
+#       charset   The character set to encode the message to.
+#       method    The encoding method (base64 or quoted-printable).
+#       string    The string to encode.
+#       ?-charset_encoded   0 or 1      Whether the data is already encoded
+#                                       in the specified charset (default 1)
+#       ?-maxlength         maxlength   The maximum length of each encoded
+#                                       word to return (default 66)
+#
+# Results:
+#    Returns a word encoded string.
+
+proc ::mime::word_encode {charset method string {args}} {
+
+    variable encodings
+
+    if {![info exists encodings($charset)]} {
+        error "unknown charset '$charset'"
+    }
+
+    if {$encodings($charset) eq {}} {
+        error "invalid charset '$charset'"
+    }
+
+    if {$method ne "base64" && $method ne "quoted-printable"} {
+        error "unknown method '$method', must be base64 or quoted-printable"
+    }
+
+    # default to encoded and a length that won't make the Subject header to long
+    array set options [list -charset_encoded 1 -maxlength 66]
+    array set options $args
+
+    if {$options(-charset_encoded)} {
+        set unencoded_string [::encoding convertfrom $charset $string]
+    } else {
+        set unencoded_string $string
+    }
+
+    set string_length [string length $unencoded_string]
+
+    if {!$string_length} {
+        return {}
+    }
+
+    set string_bytelength [string bytelength $unencoded_string]
+
+    # the 7 is for =?, ?Q?, ?= delimiters of the encoded word
+    set maxlength [expr {$options(-maxlength) - [string length $encodings($charset)] - 7}]
+    switch -exact -- $method {
+        base64 {
+            if {$maxlength < 4} {
+                error "maxlength $options(-maxlength) too short for chosen charset and encoding"
+            }
+            set count 0
+            set maxlength [expr {($maxlength / 4) * 3}]
+            while {$count < $string_length} {
+                set length 0
+                set enc_string {}
+                while {$length < $maxlength && $count < $string_length} {
+                    set char [string range $unencoded_string $count $count]
+                    set enc_char [::encoding convertto $charset $char]
+                    if {$length + [string length $enc_char] > $maxlength} {
+                        set length $maxlength
+                    } else {
+                        append enc_string $enc_char
+                        incr count
+                        incr length [string length $enc_char]
+                    }
+                }
+                set encoded_word [string map [
+                    list \n {}] [base64 -mode encode -- $enc_string]]
+                append result "=?$encodings($charset)?B?$encoded_word?=\n "
+            }
+            # Trim off last "\n ", since the above code has the side-effect
+            # of adding an extra "\n " to the encoded string.
+
+            set result [string range $result 0 end-2]
+        }
+        quoted-printable {
+            if {$maxlength < 1} {
+                error "maxlength $options(-maxlength) too short for chosen charset and encoding"
+            }
+            set count 0
+            while {$count < $string_length} {
+                set length 0
+                set encoded_word {}
+                while {$length < $maxlength && $count < $string_length} {
+                    set char [string range $unencoded_string $count $count]
+                    set enc_char [::encoding convertto $charset $char]
+                    set qp_enc_char [qp_encode $enc_char 1]
+                    set qp_enc_char_length [string length $qp_enc_char]
+                    if {$qp_enc_char_length > $maxlength} {
+                        error "maxlength $options(-maxlength) too short for chosen charset and encoding"
+                    }
+                    if {
+			$length + [string length $qp_enc_char] > $maxlength
+		    } {
+                        set length $maxlength
+                    } else {
+                        append encoded_word $qp_enc_char
+                        incr count
+                        incr length [string length $qp_enc_char]
+                    }
+                }
+                append result "=?$encodings($charset)?Q?$encoded_word?=\n "
+            }
+            # Trim off last "\n ", since the above code has the side-effect
+            # of adding an extra "\n " to the encoded string.
+
+            set result [string range $result 0 end-2]
+        }
+        {} {
+            # Go ahead
+        }
+        default {
+            error "Can't handle content encoding \"$method\""
+        }
+    }
+    return $result
+}
+
+# ::mime::word_decode --
+#
+#    Word decodes strings that have been word encoded as per RFC 2047.
+#
+# Arguments:
+#       encoded   The word encoded string to decode.
+#
+# Results:
+#    Returns the string that has been decoded from the encoded message.
+
+proc ::mime::word_decode {encoded} {
+
+    variable reversemap
+
+    if {[regexp -- {=\?([^?]+)\?(.)\?([^?]*)\?=} $encoded \
+	- charset method string] != 1
+    } {
+        error "malformed word-encoded expression '$encoded'"
+    }
+
+    set enc [reversemapencoding $charset]
+    if {$enc eq {}} {
+        error "unknown charset '$charset'"
+    }
+
+    switch -exact -- $method {
+        b -
+        B {
+            set method base64
+        }
+        q -
+        Q {
+            set method quoted-printable
+        }
+        default {
+            error "unknown method '$method', must be B or Q"
+        }
+    }
+
+    switch -exact -- $method {
+        base64 {
+            set result [base64 -mode decode -- $string]
+        }
+        quoted-printable {
+            set result [qp_decode $string 1]
+        }
+        {} {
+            # Go ahead
+        }
+        default {
+            error "Can't handle content encoding \"$method\""
+        }
+    }
+
+    return [list $enc $method $result]
+}
+
+# ::mime::field_decode --
+#
+#    Word decodes strings that have been word encoded as per RFC 2047
+#    and converts the string from the original encoding/charset to UTF.
+#
+# Arguments:
+#       field     The string to decode
+#
+# Results:
+#    Returns the decoded string in UTF.
+
+proc ::mime::field_decode {field} {
+    # ::mime::field_decode is broken.  Here's a new version.
+    # This code is in the public domain.  Don Libes <don@libes.com>
+
+    # Step through a field for mime-encoded words, building a new
+    # version with unencoded equivalents.
+
+    # Sorry about the grotesque regexp.  Most of it is sensible.  One
+    # notable fudge: the final $ is needed because of an apparent bug
+    # in the regexp engine where the preceding .* otherwise becomes
+    # non-greedy - perhaps because of the earlier ".*?", sigh.
+
+    while {[regexp {(.*?)(=\?(?:[^?]+)\?(?:.)\?(?:[^?]*)\?=)(.*)$} $field \
+	ignore prefix encoded field]
+    } {
+        # don't allow whitespace between encoded words per RFC 2047
+        if {{} ne $prefix} {
+            if {![string is space $prefix]} {
+                append result $prefix
+            }
+        }
+
+        set decoded [word_decode $encoded]
+        foreach {charset - string} $decoded break
+
+        append result [::encoding convertfrom $charset $string]
+    }
+    append result $field
+    return $result
+}
+
+## One-Shot Initialization
+
+::apply {{} {
+    variable encList
+    variable encAliasList
+    variable reversemap
+
+    foreach {enc mimeType} $encList {
+        if {$mimeType eq {}} continue
+	set reversemap([string tolower $mimeType]) $enc
+    }
+
+    foreach {enc mimeType} $encAliasList {
+        set reversemap([string tolower $mimeType]) $enc
+    }
+
+    # Drop the helper variables
+    unset encList encAliasList
+
+} ::mime}
+
+
+variable ::mime::internal 0
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mime/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mime/pkgIndex.tcl
new file mode 100644
index 00000000..ce7078d2
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mime/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package provide Tcl] 8.3]} {return}
+package ifneeded smtp 1.5.1 [list source [file join $dir smtp.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded mime 1.7.1 [list source [file join $dir mime.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mime/smtp.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mime/smtp.tcl
new file mode 100644
index 00000000..f0d93f7b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mime/smtp.tcl
@@ -0,0 +1,1508 @@
+# smtp.tcl - SMTP client
+#
+# Copyright (c) 1999-2000 Marshall T. Rose
+# Copyright (c) 2003-2006 Pat Thoyts
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+
+package require Tcl 8.3
+package require mime 1.4.1
+
+catch {
+    package require SASL 1.0;           # tcllib 1.8
+    package require SASL::NTLM 1.0;     # tcllib 1.8
+}
+
+#
+# state variables:
+#
+#    sd: socket to server
+#    afterID: afterID associated with ::smtp::timer
+#    options: array of user-supplied options
+#    readable: semaphore for vwait
+#    addrs: number of recipients negotiated
+#    error: error during read
+#    line: response read from server
+#    crP: just put a \r in the data
+#    nlP: just put a \n in the data
+#    size: number of octets sent in DATA
+#
+
+namespace eval ::smtp {
+    variable  trf 1
+    variable  smtp
+    array set smtp { uid 0 }
+
+    namespace export sendmessage
+}
+
+if {[catch {package require Trf  2.0}]} {
+    # Trf is not available, but we can live without it as long as the
+    # transform and unstack procs are defined.
+
+    # Warning!
+    # This is a fragile emulation of the more general calling sequence
+    # that appears to work with this code here.
+
+    proc transform {args} {
+	upvar state mystate
+	set mystate(size) 1
+    }
+    proc unstack {channel} {
+        # do nothing
+        return
+    }
+    set ::smtp::trf 0
+}
+
+
+# ::smtp::sendmessage --
+#
+#	Sends a mime object (containing a message) to some recipients
+#
+# Arguments:
+#	part  The MIME object containing the message to send
+#       args  A list of arguments specifying various options for sending the
+#             message:
+#             -atleastone  A boolean specifying whether or not to send the
+#                          message at all if any of the recipients are
+#                          invalid.  A value of false (as defined by
+#                          ::smtp::boolean) means that ALL recipients must be
+#                          valid in order to send the message.  A value of
+#                          true means that as long as at least one recipient
+#                          is valid, the message will be sent.
+#             -debug       A boolean specifying whether or not debugging is
+#                          on.  If debugging is enabled, status messages are
+#                          printed to stderr while trying to send mail.
+#             -queue       A boolean specifying whether or not the message
+#                          being sent should be queued for later delivery.
+#             -header      A single RFC 822 header key and value (as a list),
+#                          used to specify to whom to send the message
+#                          (To, Cc, Bcc), the "From", etc.
+#             -originator  The originator of the message (equivalent to
+#                          specifying a From header).
+#             -recipients  A string containing recipient e-mail addresses.
+#                          NOTE: This option overrides any recipient addresses
+#                          specified with -header.
+#             -servers     A list of mail servers that could process the
+#                          request.
+#             -ports       A list of SMTP ports to use for each SMTP server
+#                          specified
+#             -client      The string to use as our host name for EHLO or HELO
+#                          This defaults to 'localhost' or [info hostname]
+#             -maxsecs     Maximum number of seconds to allow the SMTP server
+#                          to accept the message. If not specified, the default
+#                          is 120 seconds.
+#             -usetls      A boolean flag. If the server supports it and we
+#                          have the package, use TLS to secure the connection.
+#             -tlspolicy   A command to call if the TLS negotiation fails for
+#                          some reason. Return 'insecure' to continue with
+#                          normal SMTP or 'secure' to close the connection and
+#                          try another server.
+#             -tlsimport   after a succesfull socket command, import tls on
+#                          channel - used for native smtps negotiation
+#             -username    These are needed if your SMTP server requires
+#             -password    authentication.
+#
+# Results:
+#	Message is sent.  On success, return "".  On failure, throw an
+#       exception with an error code and error message.
+
+proc ::smtp::sendmessage {part args} {
+    global errorCode errorInfo
+
+    # Here are the meanings of the following boolean variables:
+    # aloP -- value of -atleastone option above.
+    # debugP -- value of -debug option above.
+    # origP -- 1 if -originator option was specified, 0 otherwise.
+    # queueP -- value of -queue option above.
+
+    set aloP 0
+    set debugP 0
+    set origP 0
+    set queueP 0
+    set maxsecs 120
+    set originator ""
+    set recipients ""
+    set servers [list localhost]
+    set client "" ;# default is set after options processing
+    set ports [list 25]
+    set tlsP 1
+    set tlspolicy {}
+    set tlsimport 0
+    set username {}
+    set password {}
+
+    array set header ""
+
+    # lowerL will contain the list of header keys (converted to lower case)
+    # specified with various -header options.  mixedL is the mixed-case version
+    # of the list.
+    set lowerL ""
+    set mixedL ""
+
+    # Parse options (args).
+
+    if {[expr {[llength $args]%2}]} {
+        # Some option didn't get a value.
+        error "Each option must have a value!  Invalid option list: $args"
+    }
+
+    foreach {option value} $args {
+        switch -- $option {
+            -atleastone {set aloP   [boolean $value]}
+            -debug      {set debugP [boolean $value]}
+            -queue      {set queueP [boolean $value]}
+            -usetls     {set tlsP   [boolean $value]}
+            -tlspolicy  {set tlspolicy $value}
+            -tlsimport  {set tlsimport [boolean $value]}
+	    -maxsecs    {set maxsecs [expr {$value < 0 ? 0 : $value}]}
+            -header {
+                if {[llength $value] != 2} {
+                    error "-header expects a key and a value, not $value"
+                }
+                set mixed [lindex $value 0]
+                set lower [string tolower $mixed]
+                set disallowedHdrList \
+                    [list content-type \
+                          content-transfer-encoding \
+                          content-md5 \
+                          mime-version]
+                if {[lsearch -exact $disallowedHdrList $lower] > -1} {
+                    error "Content-Type, Content-Transfer-Encoding,\
+                        Content-MD5, and MIME-Version cannot be user-specified."
+                }
+                if {[lsearch -exact $lowerL $lower] < 0} {
+                    lappend lowerL $lower
+                    lappend mixedL $mixed
+                }
+
+                lappend header($lower) [lindex $value 1]
+            }
+
+            -originator {
+                set originator $value
+                if {$originator == ""} {
+                    set origP 1
+                }
+            }
+
+            -recipients {
+                set recipients $value
+            }
+
+            -servers {
+                set servers $value
+            }
+
+            -client {
+                set client $value
+            }
+
+            -ports {
+                set ports $value
+            }
+
+            -username { set username $value }
+            -password { set password $value }
+
+            default {
+                error "unknown option $option"
+            }
+        }
+    }
+
+    if {[lsearch -glob $lowerL resent-*] >= 0} {
+        set prefixL resent-
+        set prefixM Resent-
+    } else {
+        set prefixL ""
+        set prefixM ""
+    }
+
+    # Set a bunch of variables whose value will be the real header to be used
+    # in the outbound message (with proper case and prefix).
+
+    foreach mixed {From Sender To cc Dcc Bcc Date Message-ID} {
+        set lower [string tolower $mixed]
+	# FRINK: nocheck
+        set ${lower}L $prefixL$lower
+	# FRINK: nocheck
+        set ${lower}M $prefixM$mixed
+    }
+
+    if {$origP} {
+        # -originator was specified with "", so SMTP sender should be marked "".
+        set sender ""
+    } else {
+        # -originator was specified with a value, OR -originator wasn't
+        # specified at all.
+
+        # If no -originator was provided, get the originator from the "From"
+        # header.  If there was no "From" header get it from the username
+        # executing the script.
+
+        set who "-originator"
+        if {$originator == ""} {
+            if {![info exists header($fromL)]} {
+                set originator $::tcl_platform(user)
+            } else {
+                set originator [join $header($fromL) ,]
+
+                # Indicate that we're using the From header for the originator.
+
+                set who $fromM
+            }
+        }
+
+	# If there's no "From" header, create a From header with the value
+	# of -originator as the value.
+
+        if {[lsearch -exact $lowerL $fromL] < 0} {
+            lappend lowerL $fromL
+            lappend mixedL $fromM
+            lappend header($fromL) $originator
+        }
+
+	# ::mime::parseaddress returns a list whose elements are huge key-value
+	# lists with info about the addresses.  In this case, we only want one
+	# originator, so we want the length of the main list to be 1.
+
+        set addrs [::mime::parseaddress $originator]
+        if {[llength $addrs] > 1} {
+            error "too many mailboxes in $who: $originator"
+        }
+        array set aprops {error "invalid address \"$from\""}
+        array set aprops [lindex $addrs 0]
+        if {$aprops(error) != ""} {
+            error "error in $who: $aprops(error)"
+        }
+
+	# sender = validated originator or the value of the From header.
+
+        set sender $aprops(address)
+
+	# If no Sender header has been specified and From is different from
+	# originator, then set the sender header to the From.  Otherwise, don't
+	# specify a Sender header.
+        set from [join $header($fromL) ,]
+        if {[lsearch -exact $lowerL $senderL] < 0 && \
+                [string compare $originator $from]} {
+            if {[info exists aprops]} {
+                unset aprops
+            }
+            array set aprops {error "invalid address \"$from\""}
+            array set aprops [lindex [::mime::parseaddress $from] 0]
+            if {$aprops(error) != ""} {
+                error "error in $fromM: $aprops(error)"
+            }
+            if {[string compare $aprops(address) $sender]} {
+                lappend lowerL $senderL
+                lappend mixedL $senderM
+                lappend header($senderL) $aprops(address)
+            }
+        }
+    }
+
+    # We're done parsing the arguments.
+
+    if {$recipients != ""} {
+        set who -recipients
+    } elseif {![info exists header($toL)]} {
+        error "need -header \"$toM ...\""
+    } else {
+        set recipients [join $header($toL) ,]
+	# Add Cc values to recipients list
+	set who $toM
+        if {[info exists header($ccL)]} {
+            append recipients ,[join $header($ccL) ,]
+            append who /$ccM
+        }
+
+        set dccInd [lsearch -exact $lowerL $dccL]
+        if {$dccInd >= 0} {
+	    # Add Dcc values to recipients list, and get rid of Dcc header
+	    # since we don't want to output that.
+            append recipients ,[join $header($dccL) ,]
+            append who /$dccM
+
+            unset header($dccL)
+            set lowerL [lreplace $lowerL $dccInd $dccInd]
+            set mixedL [lreplace $mixedL $dccInd $dccInd]
+        }
+    }
+
+    set brecipients ""
+    set bccInd [lsearch -exact $lowerL $bccL]
+    if {$bccInd >= 0} {
+        set bccP 1
+
+	# Build valid bcc list and remove bcc element of header array (so that
+	# bcc info won't be sent with mail).
+        foreach addr [::mime::parseaddress [join $header($bccL) ,]] {
+            if {[info exists aprops]} {
+                unset aprops
+            }
+            array set aprops {error "invalid address \"$from\""}
+            array set aprops $addr
+            if {$aprops(error) != ""} {
+                error "error in $bccM: $aprops(error)"
+            }
+            lappend brecipients $aprops(address)
+        }
+
+        unset header($bccL)
+        set lowerL [lreplace $lowerL $bccInd $bccInd]
+        set mixedL [lreplace $mixedL $bccInd $bccInd]
+    } else {
+        set bccP 0
+    }
+
+    # If there are no To headers, add "" to bcc list.  WHY??
+    if {[lsearch -exact $lowerL $toL] < 0} {
+        lappend lowerL $bccL
+        lappend mixedL $bccM
+        lappend header($bccL) ""
+    }
+
+    # Construct valid recipients list from recipients list.
+
+    set vrecipients ""
+    foreach addr [::mime::parseaddress $recipients] {
+        if {[info exists aprops]} {
+            unset aprops
+        }
+        array set aprops {error "invalid address \"$from\""}
+        array set aprops $addr
+        if {$aprops(error) != ""} {
+            error "error in $who: $aprops(error)"
+        }
+        lappend vrecipients $aprops(address)
+    }
+
+    # If there's no date header, get the date from the mime message.  Same for
+    # the message-id.
+
+    if {([lsearch -exact $lowerL $dateL] < 0) \
+            && ([catch {::mime::getheader $part $dateL}])} {
+        lappend lowerL $dateL
+        lappend mixedL $dateM
+        lappend header($dateL) [::mime::parsedatetime -now proper]
+    }
+
+    if {([lsearch -exact $lowerL ${message-idL}] < 0) \
+            && ([catch {::mime::getheader $part ${message-idL}}])} {
+        lappend lowerL ${message-idL}
+        lappend mixedL ${message-idM}
+        lappend header(${message-idL}) [::mime::uniqueID]
+
+    }
+
+	set origheaders {}
+	set orignames [join [lmap name [::mime::getheader $part -names] {
+		list [string tolower $name] $name
+	}]]
+
+    # Take all the headers defined earlier and add them to the MIME message.
+    foreach lower $lowerL mixed $mixedL {
+        foreach value $header($lower) {
+			if {![dict exists $origheaders $lower]} {
+				if {![catch {::mime::getheader $part $lower} cres]} {
+					dict set origheaderx $lower $cres
+				}
+			}
+            ::mime::setheader $part $mixed $value -mode append
+        }
+    }
+
+    if {[string length $client] < 1} {
+        if {![string compare $servers localhost]} {
+            set client localhost
+        } else {
+            set client [info hostname]
+        }
+    }
+
+    # Create smtp token, which essentially means begin talking to the SMTP
+    # server.
+    set token [initialize -debug $debugP -client $client \
+		                -maxsecs $maxsecs -usetls $tlsP \
+                                -multiple $bccP -queue $queueP \
+                                -servers $servers -ports $ports \
+                                -tlspolicy $tlspolicy -tlsimport $tlsimport \
+                                -username $username -password $password]
+
+    if {![string match "::smtp::*" $token]} {
+	# An error occurred and $token contains the error info
+	array set respArr $token
+	return -code error $respArr(diagnostic)
+    }
+
+    set code [catch { sendmessageaux $token $part \
+                                           $sender $vrecipients $aloP } \
+                    cres copts]
+
+    # Send the message to bcc recipients as a MIME attachment.
+
+    if {($code == 0) && ($bccP)} {
+        set inner [::mime::initialize -canonical message/rfc822 \
+                                    -header [list Content-Description \
+                                                  "Original Message"] \
+                                    -parts [list $part]]
+
+        set subject "\[$bccM\]"
+        if {[info exists header(subject)]} {
+            append subject " " [lindex $header(subject) 0]
+        }
+
+        set outer [::mime::initialize \
+                         -canonical multipart/digest \
+                         -header [list From $originator] \
+                         -header [list Bcc ""] \
+                         -header [list Date \
+                                       [::mime::parsedatetime -now proper]] \
+                         -header [list Subject $subject] \
+                         -header [list Message-ID [::mime::uniqueID]] \
+                         -header [list Content-Description \
+                                       "Blind Carbon Copy"] \
+                         -parts [list $inner]]
+
+
+        set code [catch { sendmessageaux $token $outer \
+                                               $sender $brecipients \
+                                               $aloP } cres2 copts2]
+        if {$code == 0} {
+            append cres $cres2
+        } 
+
+        catch { ::mime::finalize $inner -subordinates none }
+        catch { ::mime::finalize $outer -subordinates none }
+    }
+
+    # Determine if there was any error in prior operations and set errorcodes
+    # and error messages appropriately.
+
+    switch -- $code {
+        0 {
+            set status orderly
+        }
+        default {
+            set status abort
+        }
+    }
+
+    # Destroy SMTP token 'cause we're done with it.
+    catch { finalize $token -close $status }
+
+	# Restore provided MIME object to original state (without the SMTP
+	# headers).  To avoid an incorect attempt to set a read-only header like
+	# "Content-Type', the only original headers that were saved were those that
+	# were later modified.
+	foreach {key value} $origheaders {
+		mime::setheader $part $key {} -mode delete
+		::mime::setheader $part [dict get orignames $key] $value -mode append
+	}
+
+    return -options $copts $cres
+}
+
+# ::smtp::sendmessageaux --
+#
+#	Sends a mime object (containing a message) to some recipients using an
+#       existing SMTP token.
+#
+# Arguments:
+#       token       SMTP token that has an open connection to the SMTP server.
+#	part        The MIME object containing the message to send.
+#       originator  The e-mail address of the entity sending the message,
+#                   usually the From clause.
+#       recipients  List of e-mail addresses to whom message will be sent.
+#       aloP        Boolean "atleastone" setting; see the -atleastone option
+#                   in ::smtp::sendmessage for details.
+#
+# Results:
+#	Message is sent.  On success, return "".  On failure, throw an
+#       exception with an error code and error message.
+
+proc ::smtp::sendmessageaux {token part originator recipients aloP} {
+    global errorCode errorInfo
+
+    winit $token $part $originator
+
+    set goodP 0
+    set badP 0
+    set oops ""
+    foreach recipient $recipients {
+        set code [catch { waddr $token $recipient } result]
+        set ecode $errorCode
+        set einfo $errorInfo
+
+        switch -- $code {
+            0 {
+                incr goodP
+            }
+
+            7 {
+                incr badP
+
+                array set response $result
+                lappend oops [list $recipient $response(code) \
+                                   $response(diagnostic)]
+            }
+
+            default {
+                return -code $code -errorinfo $einfo -errorcode $ecode $result
+            }
+        }
+    }
+
+    if {($goodP) && ((!$badP) || ($aloP))} {
+        wtext $token $part
+    } else {
+        catch { talk $token 300 RSET }
+    }
+
+    return $oops
+}
+
+# ::smtp::initialize --
+#
+#	Create an SMTP token and open a connection to the SMTP server.
+#
+# Arguments:
+#       args  A list of arguments specifying various options for sending the
+#             message:
+#             -debug       A boolean specifying whether or not debugging is
+#                          on.  If debugging is enabled, status messages are
+#                          printed to stderr while trying to send mail.
+#             -client      Either localhost or the name of the local host.
+#             -multiple    Multiple messages will be sent using this token.
+#             -queue       A boolean specifying whether or not the message
+#                          being sent should be queued for later delivery.
+#             -servers     A list of mail servers that could process the
+#                          request.
+#             -ports       A list of ports on mail servers that could process
+#                          the request (one port per server-- defaults to 25).
+#             -usetls      A boolean to indicate we will use TLS if possible.
+#             -tlspolicy   Command called if TLS setup fails.
+#             -tlsimport   after a succesfull socket command, import tls on
+#                          channel - used for native smtps negotiation
+#             -username    These provide the authentication information
+#             -password    to be used if needed by the SMTP server.
+#
+# Results:
+#	On success, return an smtp token.  On failure, throw
+#       an exception with an error code and error message.
+
+proc ::smtp::initialize {args} {
+    global errorCode errorInfo
+
+    variable smtp
+
+    set token [namespace current]::[incr smtp(uid)]
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    array set state [list afterID "" options "" readable 0]
+    array set options [list -debug 0 -client localhost -multiple 1 \
+                            -maxsecs 120 -queue 0 -servers localhost \
+                            -ports 25 -usetls 1 -tlspolicy {} \
+                            -tlsimport 0 \
+                            -username {} -password {}]
+    array set options $args
+    set state(options) [array get options]
+
+    # Iterate through servers until one accepts a connection (and responds
+    # nicely).
+
+    foreach server $options(-servers) port $options(-ports) {
+        if {$server == ""} continue
+
+	set state(readable) 0
+        if {$port == ""} { set port 25 }
+
+        if {$options(-debug)} {
+            puts stderr "Trying $server..."
+            flush stderr
+        }
+
+        if {[info exists state(sd)]} {
+            unset state(sd)
+        }
+
+        if {[set code [catch {
+            set state(sd) [socket -async $server $port]
+            if { $options(-tlsimport) } {
+                package require tls
+                tls::import $state(sd)
+            }
+            fconfigure $state(sd) -blocking off -translation binary
+            fileevent $state(sd) readable [list ::smtp::readable $token]
+        } result]]} {
+            set ecode $errorCode
+            set einfo $errorInfo
+
+            catch { close $state(sd) }
+            continue
+        }
+
+        if {[set code [catch { hear $token 600 } result]]} {
+            array set response [list code 400 diagnostic $result]
+        } else {
+            array set response $result
+        }
+        set ecode $errorCode
+        set einfo $errorInfo
+        switch -- $response(code) {
+            220 {
+            }
+
+            421 - default {
+                # 421 - Temporary problem on server
+                catch {close $state(sd)}
+                continue
+            }
+        }
+
+        set r [initialize_ehlo $token]
+        if {$r != {}} {
+            return $r
+        }
+    }
+
+    # None of the servers accepted our connection, so close everything up and
+    # return an error.
+    finalize $token -close drop
+
+    return -code $code -errorinfo $einfo -errorcode $ecode $result
+}
+
+# If we cannot load the tls package, ignore the error
+# Result value is a Tcl return code, not a bool.
+# 0 == OK
+proc ::smtp::load_tls {} {
+    set r [catch {package require tls}]
+    if {$r} {set ::errorInfo ""}
+    return $r
+}
+
+proc ::smtp::initialize_ehlo {token} {
+    global errorCode errorInfo
+    upvar einfo einfo
+    upvar ecode ecode
+    upvar code  code
+
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+    array set options $state(options)
+
+    # Try enhanced SMTP first.
+
+    if {[set code [catch {smtp::talk $token 300 "EHLO $options(-client)"} \
+                       result]]} {
+        array set response [list code 400 diagnostic $result args ""]
+    } else {
+        array set response $result
+    }
+    set ecode $errorCode
+    set einfo $errorInfo
+    if {(500 <= $response(code)) && ($response(code) <= 599)} {
+        if {[set code [catch { talk $token 300 \
+                                   "HELO $options(-client)" } \
+                           result]]} {
+            array set response [list code 400 diagnostic $result args ""]
+        } else {
+            array set response $result
+        }
+        set ecode $errorCode
+        set einfo $errorInfo
+    }
+
+    if {$response(code) == 250} {
+        # Successful response to HELO or EHLO command, so set up queuing
+        # and whatnot and return the token.
+
+        set state(esmtp) $response(args)
+
+        if {(!$options(-multiple)) \
+                && ([lsearch $response(args) ONEX] >= 0)} {
+            catch {smtp::talk $token 300 ONEX}
+        }
+        if {($options(-queue)) \
+                && ([lsearch $response(args) XQUE] >= 0)} {
+            catch {smtp::talk $token 300 QUED}
+        }
+
+        # Support STARTTLS extension.
+        # The state(tls) item is used to see if we have already tried this.
+        if {($options(-usetls)) && ![info exists state(tls)] \
+                && (([lsearch $response(args) STARTTLS] >= 0)
+                    || ([lsearch $response(args) TLS] >= 0))} {
+            if {[load_tls] == 0} {
+                set state(tls) 0
+                if {![catch {smtp::talk $token 300 STARTTLS} resp]} {
+                    array set starttls $resp
+                    if {$starttls(code) == 220} {
+                        fileevent $state(sd) readable {}
+                        catch {
+                            ::tls::import $state(sd)
+                            catch {::tls::handshake $state(sd)} msg
+                            set state(tls) 1
+                        }
+                        fileevent $state(sd) readable \
+                            [list ::smtp::readable $token]
+                        return [initialize_ehlo $token]
+                    } else {
+                        # Call a TLS client policy proc here
+                        #  returns secure   - close and try another server.
+                        #  returns insecure - continue on current socket
+                        set policy insecure
+                        if {$options(-tlspolicy) != {}} {
+                            catch {
+                                eval $options(-tlspolicy) \
+                                    [list $starttls(code)] \
+                                    [list $starttls(diagnostic)]
+                            } policy
+                        }
+                        if {$policy != "insecure"} {
+                            set code error
+                            set ecode $starttls(code)
+                            set einfo $starttls(diagnostic)
+                            catch {close $state(sd)}
+                            return {}
+                        }
+                    }
+                }
+            }
+        }
+
+        # If we have not already tried and the server supports it and we
+        # have a username -- lets try to authenticate.
+        #
+        if {![info exists state(auth)]
+            && [llength [package provide SASL]] != 0
+            && [set andx [lsearch -glob $response(args) "AUTH*"]] >= 0
+            && [string length $options(-username)] > 0 } {
+
+            # May be AUTH mech or AUTH=mech
+            # We want to use the strongest mechanism that has been offered
+            # and that we support. If we cannot find a mechanism that
+            # succeeds, we will go ahead and try to carry on unauthenticated.
+            # This may still work else we'll get an unauthorised error later.
+
+            set mechs [string range [lindex $response(args) $andx] 5 end]
+            foreach mech [SASL::mechanisms] {
+                if {[lsearch -exact $mechs $mech] == -1} { continue }
+                if {[catch {
+                    Authenticate $token $mech
+                } msg]} {
+                    if {$options(-debug)} {
+                        puts stderr "AUTH $mech failed: $msg "
+                        flush stderr
+                    }
+                }
+                if {[info exists state(auth)] && $state(auth)} {
+                    if {$state(auth) == 1} {
+                        break
+                    } else {
+                        # After successful AUTH we are supposed to redo
+                        # our connection for mechanisms that setup a new
+                        # security layer -- these should set state(auth)
+                        # greater than 1
+                        fileevent $state(sd) readable \
+                            [list ::smtp::readable $token]
+                        return [initialize_ehlo $token]
+                    }
+                }
+            }
+        }
+
+        return $token
+    } else {
+        # Bad response; close the connection and hope the next server
+        # is happier.
+        catch {close $state(sd)}
+    }
+    return {}
+}
+
+proc ::smtp::SASLCallback {token context command args} {
+    upvar #0 $token state
+    upvar #0 $context ctx
+    array set options $state(options)
+    switch -exact -- $command {
+        login    { return "" }
+        username { return $options(-username) }
+        password { return $options(-password) }
+        hostname { return [info host] }
+        realm    {
+            if {[string equal $ctx(mech) "NTLM"] \
+                    && [info exists ::env(USERDOMAIN)]} {
+                return $::env(USERDOMAIN)
+            } else {
+                return ""
+            }
+        }
+        default  {
+            return -code error "error: unsupported SASL information requested"
+        }
+    }
+}
+
+proc ::smtp::Authenticate {token mechanism} {
+    upvar 0 $token state
+    package require base64
+    set ctx [SASL::new -mechanism $mechanism \
+                 -callback [list [namespace origin SASLCallback] $token]]
+
+    set state(auth) 0
+    set result [smtp::talk $token 300 "AUTH $mechanism"]
+    array set response $result
+
+    while {$response(code) == 334} {
+        # The NTLM initial response is not base64 encoded so handle it.
+        if {[catch {base64::decode $response(diagnostic)} challenge]} {
+            set challenge $response(diagnostic)
+        }
+        SASL::step $ctx $challenge
+        set result [smtp::talk $token 300 \
+                        [base64::encode -maxlen 0 [SASL::response $ctx]]]
+        array set response $result
+    }
+
+    if {$response(code) == 235} {
+        set state(auth) 1
+        return $result
+    } else {
+        return -code 7 $result
+    }
+}
+
+# ::smtp::finalize --
+#
+#	Deletes an SMTP token by closing the connection to the SMTP server,
+#       cleanup up various state.
+#
+# Arguments:
+#       token   SMTP token that has an open connection to the SMTP server.
+#       args    Optional arguments, where the only useful option is -close,
+#               whose valid values are the following:
+#               orderly     Normal successful completion.  Close connection and
+#                           clear state variables.
+#               abort       A connection exists to the SMTP server, but it's in
+#                           a weird state and needs to be reset before being
+#                           closed.  Then clear state variables.
+#               drop        No connection exists, so we just need to clean up
+#                           state variables.
+#
+# Results:
+#	SMTP connection is closed and state variables are cleared.  If there's
+#       an error while attempting to close the connection to the SMTP server,
+#       throw an exception with the error code and error message.
+
+proc ::smtp::finalize {token args} {
+    global errorCode errorInfo
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    array set options [list -close orderly]
+    array set options $args
+
+    switch -- $options(-close) {
+        orderly {
+            set code [catch { talk $token 120 QUIT } result]
+        }
+
+        abort {
+            set code [catch {
+                talk $token 0 RSET
+                talk $token 0 QUIT
+            } result]
+        }
+
+        drop {
+            set code 0
+            set result ""
+        }
+
+        default {
+            error "unknown value for -close $options(-close)"
+        }
+    }
+    set ecode $errorCode
+    set einfo $errorInfo
+
+    catch { close $state(sd) }
+
+    if {$state(afterID) != ""} {
+        catch { after cancel $state(afterID) }
+    }
+
+    foreach name [array names state] {
+        unset state($name)
+    }
+    # FRINK: nocheck
+    unset $token
+
+    return -code $code -errorinfo $einfo -errorcode $ecode $result
+}
+
+# ::smtp::winit --
+#
+#	Send originator info to SMTP server.  This occurs after HELO/EHLO
+#       command has completed successfully (in ::smtp::initialize).  This function
+#       is called by ::smtp::sendmessageaux.
+#
+# Arguments:
+#       token       SMTP token that has an open connection to the SMTP server.
+#       part        MIME token for the message to be sent. May be used for
+#                   handling some SMTP extensions.
+#       originator  The e-mail address of the entity sending the message,
+#                   usually the From clause.
+#       mode        SMTP command specifying the mode of communication.  Default
+#                   value is MAIL.
+#
+# Results:
+#	Originator info is sent and SMTP server's response is returned.  If an
+#       error occurs, throw an exception.
+
+proc ::smtp::winit {token part originator {mode MAIL}} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    if {[lsearch -exact [list MAIL SEND SOML SAML] $mode] < 0} {
+        error "unknown origination mode $mode"
+    }
+
+    set from "$mode FROM:<$originator>"
+
+    # RFC 1870 -  SMTP Service Extension for Message Size Declaration
+    if {[info exists state(esmtp)]
+        && [lsearch -glob $state(esmtp) "SIZE*"] != -1} {
+        catch {
+            set size [string length [mime::buildmessage $part]]
+            append from " SIZE=$size"
+        }
+    }
+
+    array set response [set result [talk $token 600 $from]]
+
+    if {$response(code) == 250} {
+        set state(addrs) 0
+        return $result
+    } else {
+        return -code 7 $result
+    }
+}
+
+# ::smtp::waddr --
+#
+#	Send recipient info to SMTP server.  This occurs after originator info
+#       is sent (in ::smtp::winit).  This function is called by
+#       ::smtp::sendmessageaux.
+#
+# Arguments:
+#       token       SMTP token that has an open connection to the SMTP server.
+#       recipient   One of the recipients to whom the message should be
+#                   delivered.
+#
+# Results:
+#	Recipient info is sent and SMTP server's response is returned.  If an
+#       error occurs, throw an exception.
+
+proc ::smtp::waddr {token recipient} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set result [talk $token 3600 "RCPT TO:<$recipient>"]
+    array set response $result
+
+    switch -- $response(code) {
+        250 - 251 {
+            incr state(addrs)
+            return $result
+        }
+
+        default {
+            return -code 7 $result
+        }
+    }
+}
+
+# ::smtp::wtext --
+#
+#	Send message to SMTP server.  This occurs after recipient info
+#       is sent (in ::smtp::winit).  This function is called by
+#       ::smtp::sendmessageaux.
+#
+# Arguments:
+#       token       SMTP token that has an open connection to the SMTP server.
+#	part        The MIME object containing the message to send.
+#
+# Results:
+#	MIME message is sent and SMTP server's response is returned.  If an
+#       error occurs, throw an exception.
+
+proc ::smtp::wtext {token part} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+    array set options $state(options)
+
+    set result [talk $token 300 DATA]
+    array set response $result
+    if {$response(code) != 354} {
+        return -code 7 $result
+    }
+
+    if {[catch { wtextaux $token $part } result]} {
+        catch { puts -nonewline $state(sd) "\r\n.\r\n" ; flush $state(sd) }
+        return -code 7 [list code 400 diagnostic $result]
+    }
+
+    set secs $options(-maxsecs)
+
+    set result [talk $token $secs .]
+    array set response $result
+    switch -- $response(code) {
+        250 - 251 {
+            return $result
+        }
+
+        default {
+            return -code 7 $result
+        }
+    }
+}
+
+# ::smtp::wtextaux --
+#
+#	Helper function that coordinates writing the MIME message to the socket.
+#       In particular, it stacks the channel leading to the SMTP server, sets up
+#       some file events, sends the message, unstacks the channel, resets the
+#       file events to their original state, and returns.
+#
+# Arguments:
+#       token       SMTP token that has an open connection to the SMTP server.
+#	part        The MIME object containing the message to send.
+#
+# Results:
+#	Message is sent.  If anything goes wrong, throw an exception.
+
+proc ::smtp::wtextaux {token part} {
+    global errorCode errorInfo
+
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    # Workaround a bug with stacking channels on top of TLS.
+    # FRINK: nocheck
+    set trf [set [namespace current]::trf]
+    if {[info exists state(tls)] && $state(tls)} {
+        set trf 0
+    }
+
+    flush $state(sd)
+    fileevent $state(sd) readable ""
+    if {$trf} {
+        transform -attach $state(sd) -command [list ::smtp::wdata $token]
+        fconfigure $state(sd) -blocking on
+    } else {
+        set state(size) 1
+    }
+    fileevent $state(sd) readable [list ::smtp::readable $token]
+
+    # If trf is not available, get the contents of the message,
+    # replace all '.'s that start their own line with '..'s, and
+    # then write the mime body out to the filehandle. Do not forget to
+    # deal with bare LF's here too (SF bug #499242).
+
+    if {$trf} {
+        set code [catch { ::mime::copymessage $part $state(sd) } result]
+    } else {
+        set code [catch { ::mime::buildmessage $part } result]
+        if {$code == 0} {
+	    # Detect and transform bare LF's into proper CR/LF
+	    # sequences.
+
+	    while {[regsub -all -- {([^\r])\n} $result "\\1\r\n" result]} {}
+            regsub -all -- {\n\.}      $result "\n.."   result
+
+            # Fix for bug #827436 - mail data must end with CRLF.CRLF
+            if {[string compare [string index $result end] "\n"] != 0} {
+                append result "\r\n"
+            }
+            set state(size) [string length $result]
+            puts -nonewline $state(sd) $result
+            set result ""
+	}
+    }
+    set ecode $errorCode
+    set einfo $errorInfo
+
+    flush $state(sd)
+    fileevent $state(sd) readable ""
+    if {$trf} {
+        unstack $state(sd)
+        fconfigure $state(sd) -blocking off
+    }
+    fileevent $state(sd) readable [list ::smtp::readable $token]
+
+    return -code $code -errorinfo $einfo -errorcode $ecode $result
+}
+
+# ::smtp::wdata --
+#
+#	This is the custom transform using Trf to do CR/LF translation.  If Trf
+#       is not installed on the system, then this function never gets called and
+#       no translation occurs.
+#
+# Arguments:
+#       token       SMTP token that has an open connection to the SMTP server.
+#       command     Trf provided command for manipulating socket data.
+#	buffer      Data to be converted.
+#
+# Results:
+#	buffer is translated, and state(size) is set.  If Trf is not installed
+#       on the system, the transform proc defined at the top of this file sets
+#       state(size) to 1.  state(size) is used later to determine a timeout
+#       value.
+
+proc ::smtp::wdata {token command buffer} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    switch -- $command {
+        create/write -
+        clear/write  -
+        delete/write {
+            set state(crP) 0
+            set state(nlP) 1
+            set state(size) 0
+        }
+
+        write {
+            set result ""
+
+            foreach c [split $buffer ""] {
+                switch -- $c {
+                    "." {
+                        if {$state(nlP)} {
+                            append result .
+                        }
+                        set state(crP) 0
+                        set state(nlP) 0
+                    }
+
+                    "\r" {
+                        set state(crP) 1
+                        set state(nlP) 0
+                    }
+
+                    "\n" {
+                        if {!$state(crP)} {
+                            append result "\r"
+                        }
+                        set state(crP) 0
+                        set state(nlP) 1
+                    }
+
+                    default {
+                        set state(crP) 0
+                        set state(nlP) 0
+                    }
+                }
+
+                append result $c
+            }
+
+            incr state(size) [string length $result]
+            return $result
+        }
+
+        flush/write {
+            set result ""
+
+            if {!$state(nlP)} {
+                if {!$state(crP)} {
+                    append result "\r"
+                }
+                append result "\n"
+            }
+
+            incr state(size) [string length $result]
+            return $result
+        }
+
+	create/read -
+        delete/read {
+	    # Bugfix for [#539952]
+        }
+
+	query/ratio {
+	    # Indicator for unseekable channel,
+	    # for versions of Trf which ask for
+	    # this.
+	    return {0 0}
+	}
+	query/maxRead {
+	    # No limits on reading bytes from the channel below, for
+	    # versions of Trf which ask for this information
+	    return -1
+	}
+
+	default {
+	    # Silently pass all unknown commands.
+	    #error "Unknown command \"$command\""
+	}
+    }
+
+    return ""
+}
+
+# ::smtp::talk --
+#
+#	Sends an SMTP command to a server
+#
+# Arguments:
+#       token       SMTP token that has an open connection to the SMTP server.
+#	secs        Timeout after which command should be aborted.
+#       command     Command to send to SMTP server.
+#
+# Results:
+#	command is sent and response is returned.  If anything goes wrong, throw
+#       an exception.
+
+proc ::smtp::talk {token secs command} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    array set options $state(options)
+
+    if {$options(-debug)} {
+        puts stderr "--> $command (wait upto $secs seconds)"
+        flush stderr
+    }
+
+    if {[catch { puts -nonewline $state(sd) "$command\r\n"
+                 flush $state(sd) } result]} {
+        return [list code 400 diagnostic $result]
+    }
+
+    if {$secs == 0} {
+        return ""
+    }
+
+    return [hear $token $secs]
+}
+
+# ::smtp::hear --
+#
+#	Listens for SMTP server's response to some prior command.
+#
+# Arguments:
+#       token       SMTP token that has an open connection to the SMTP server.
+#	secs        Timeout after which we should stop waiting for a response.
+#
+# Results:
+#	Response is returned.
+
+proc ::smtp::hear {token secs} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    array set options $state(options)
+
+    array set response [list args ""]
+
+    set firstP 1
+    while {1} {
+        if {$secs >= 0} {
+	    ## SF [ 836442 ] timeout with large data
+	    ## correction, aotto 031105 -
+	    if {$secs > 600} {set secs 600}
+            set state(afterID) [after [expr {$secs*1000}] \
+                                      [list ::smtp::timer $token]]
+        }
+
+        if {!$state(readable)} {
+            vwait ${token}(readable)
+        }
+
+        # Wait until socket is readable.
+        if {$state(readable) !=  -1} {
+            catch { after cancel $state(afterID) }
+            set state(afterID) ""
+        }
+
+        if {$state(readable) < 0} {
+            array set response [list code 400 diagnostic $state(error)]
+            break
+        }
+        set state(readable) 0
+
+        if {$options(-debug)} {
+            puts stderr "<-- $state(line)"
+            flush stderr
+        }
+
+        if {[string length $state(line)] < 3} {
+            array set response \
+                  [list code 500 \
+                        diagnostic "response too short: $state(line)"]
+            break
+        }
+
+        if {$firstP} {
+            set firstP 0
+
+            if {[scan [string range $state(line) 0 2] %d response(code)] \
+                    != 1} {
+                array set response \
+                      [list code 500 \
+                            diagnostic "unrecognizable code: $state(line)"]
+                break
+            }
+
+            set response(diagnostic) \
+                [string trim [string range $state(line) 4 end]]
+        } else {
+            lappend response(args) \
+                    [string trim [string range $state(line) 4 end]]
+        }
+
+        # When status message line ends in -, it means the message is complete.
+
+        if {[string compare [string index $state(line) 3] -]} {
+            break
+        }
+    }
+
+    return [array get response]
+}
+
+# ::smtp::readable --
+#
+#	Reads a line of data from SMTP server when the socket is readable.  This
+#       is the callback of "fileevent readable".
+#
+# Arguments:
+#       token       SMTP token that has an open connection to the SMTP server.
+#
+# Results:
+#	state(line) contains the line of data and state(readable) is reset.
+#       state(readable) gets the following values:
+#       -3  if there's a premature eof,
+#       -2  if reading from socket fails.
+#       1   if reading from socket was successful
+
+proc ::smtp::readable {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    if {[catch { array set options $state(options) }]} {
+        return
+    }
+
+    set state(line) ""
+    if {[catch { gets $state(sd) state(line) } result]} {
+        set state(readable) -2
+        set state(error) $result
+    } elseif {$result == -1} {
+        if {[eof $state(sd)]} {
+            set state(readable) -3
+            set state(error) "premature end-of-file from server"
+        }
+    } else {
+        # If the line ends in \r, remove the \r.
+        if {![string compare [string index $state(line) end] "\r"]} {
+            set state(line) [string range $state(line) 0 end-1]
+        }
+        set state(readable) 1
+    }
+
+    if {$state(readable) < 0} {
+        if {$options(-debug)} {
+            puts stderr "    ... $state(error) ..."
+            flush stderr
+        }
+
+        catch { fileevent $state(sd) readable "" }
+    }
+}
+
+# ::smtp::timer --
+#
+#	Handles timeout condition on any communication with the SMTP server.
+#
+# Arguments:
+#       token       SMTP token that has an open connection to the SMTP server.
+#
+# Results:
+#	Sets state(readable) to -1 and state(error) to an error message.
+
+proc ::smtp::timer {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    array set options $state(options)
+
+    set state(afterID) ""
+    set state(readable) -1
+    set state(error) "read from server timed out"
+
+    if {$options(-debug)} {
+        puts stderr "    ... $state(error) ..."
+        flush stderr
+    }
+}
+
+# ::smtp::boolean --
+#
+#	Helper function for unifying boolean values to 1 and 0.
+#
+# Arguments:
+#       value   Some kind of value that represents true or false (i.e. 0, 1,
+#               false, true, no, yes, off, on).
+#
+# Results:
+#	Return 1 if the value is true, 0 if false.  If the input value is not
+#       one of the above, throw an exception.
+
+proc ::smtp::boolean {value} {
+    switch -- [string tolower $value] {
+        0 - false - no - off {
+            return 0
+        }
+
+        1 - true - yes - on {
+            return 1
+        }
+
+        default {
+            error "unknown boolean value: $value"
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+
+package provide smtp 1.5.1
+
+# -------------------------------------------------------------------------
+# Local variables:
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mkdoc/mkdoc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mkdoc/mkdoc.tcl
new file mode 100644
index 00000000..3ec39d13
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mkdoc/mkdoc.tcl
@@ -0,0 +1,701 @@
+# -*- mode: tcl ; fill-column: 80 -*-
+##############################################################################
+#  Author        : Dr. Detlef Groth
+#  Created       : Fri Nov 15 10:20:22 2019
+#  Last Modified : <220423.0622>
+#
+#  Description	 : Command line utility and package to extract Markdown documentation 
+#                  from programming code if embedded as after comment sequence #' 
+#                  manual pages and installation of Tcl files as Tcl modules.
+#                  Copy and adaptation of dgw/dgwutils.tcl
+#
+#  History       : 2019-11-08 version 0.1
+#                  2019-11-28 version 0.2
+#                  2020-02-26 version 0.3
+#                  2020-11-10 Release 0.4
+#                  2020-12-30 Release 0.5 (rox2md)
+#                  2022-02-09 Release 0.6
+#                  2022-04-XX Release 0.7 (minimal)
+#	
+##############################################################################
+#
+# Copyright (c) 2019-2022  Dr. Detlef Groth, E-mail: detlef(at)dgroth(dot)de
+# 
+# This library is free software; you can use, modify, and redistribute it for
+# any purpose, provided that existing copyright notices are retained in all
+# copies and that this notice is included verbatim in any distributions.
+# 
+# This software is distributed WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+#' ---
+#' title: mkdoc::mkdoc 0.7.0
+#' author: Detlef Groth, Schwielowsee, Germany
+#' css: mkdoc.css
+#' ---
+#' 
+#' <center> Manual: [short (doctools)](mkdoc.html) - [long (mkdoc)](mkdoc-mkdoc.html) </center>
+#'
+#' ## NAME
+#'
+#' **mkdoc::mkdoc**  - Tcl package and command line application to extract and format 
+#' embedded programming documentation from source code files written in Markdown or
+#' doctools format and optionally converting it into HTML.
+#'
+#' ## <a name='toc'></a>TABLE OF CONTENTS
+#' 
+#'  - [SYNOPSIS](#synopsis)
+#'  - [DESCRIPTION](#description)
+#'  - [COMMAND](#command)
+#'      - [mkdoc::mkdoc](#mkdoc)
+#'      - [mkdoc::run](#run)
+#'  - [EXAMPLE](#example)
+#'  - [BASIC FORMATTING](#format)
+#'  - [INSTALLATION](#install)
+#'  - [SEE ALSO](#see)
+#'  - [CHANGES](#changes)
+#'  - [TODO](#todo)
+#'  - [AUTHOR](#authors)
+#'  - [LICENSE AND COPYRIGHT](#license)
+#'
+#' ## <a name='synopsis'>SYNOPSIS</a>
+#' 
+#' Usage as package:
+#'
+#' ```
+#' package require mkdoc::mkdoc
+#' mkdoc::mkdoc inputfile outputfile ?-css file.css?
+#' ```
+#'
+#' Usage as command line application for extraction of Markdown comments prefixed with `#'`:
+#'
+#' ```
+#' mkdoc inputfile outputfile ?--css file.css?
+#' ```
+#'
+#' Usage as command line application for conversion of Markdown to HTML:
+#'
+#' ```
+#' mkdoc inputfile.md outputfile.html ?--css file.css?
+#' ```
+#'
+#' ## <a name='description'>DESCRIPTION</a>
+#' 
+#' **mkdoc::mkdoc**  extracts embedded Markdown or doctools documentation from source code files
+#' and  as well converts Markdown the output to HTML if desired.
+#' The documentation inside the source code must be prefixed with the `#'` character sequence.
+#' The file extension of the output file determines the output format. 
+#' File extensions can bei either `.md` for Markdown output, `.man` for doctools output or `.html` for html output.
+#' The latter requires the tcllib Markdown or the doctools extensions to be installed.
+#' If the file extension of the inputfile is *.md* and file extension of the output files is *.html* 
+#' there will be simply a conversion from a Markdown to a HTML file.
+#'
+#' The file `mkdoc.tcl` can be as well directly used as a console application. 
+#' An explanation on how to do this, is given in the section [Installation](#install).
+#'
+#' ## <a name='command'>COMMAND</a>
+#'
+#'  <a name="mkdoc"> </a>
+#' **mkdoc::mkdoc** *infile outfile ?-css file.css?*
+#' 
+#' > Extracts the documentation in Markdown format from *infile* and writes the documentation 
+#'    to *outfile* either in Markdown, Doctools  or HTML format. 
+#' 
+#' > - *infile* - file with embedded markdown documentation
+#'   - *outfile* -  name of output file extension
+#'   - *-css cssfile* if outfile is an HTML file use the given *cssfile*
+#'     
+#' > If the file extension of the outfile is either html or htm a HTML file is created. If the output file has other 
+#'   file extension the documentation after _#'_ comments is simply extracted and stored in the given _outfile_, *-mode* flag  (one of -html, -md, -pandoc) is not given, the output format is taken from the file extension of the output file, either *.html* for HTML or *.md* for Markdown format. This deduction from the filetype can be overwritten giving either `-html` or `-md` as command line flags. If as mode `-pandoc` is given, the Markdown markup code as well contains the YAML header.
+#'   If infile has the extension .md (Markdown) or -man (Doctools) than conversion to html will be performed, outfile file extension
+#'   In this case must be .html. If output is html a *-css* flag can be given to use the given stylesheet file instead of the default style sheet embedded within the mkdoc code.
+#'  
+#' > Example:
+#'
+#' > ```
+#' package require mkdoc::mkdoc
+#' mkdoc::mkdoc mkdoc.tcl mkdoc.html
+#' mkdoc::mkdoc mkdoc.tcl mkdoc.md 
+#' > ```
+
+package require Tcl 8.6
+
+package require yaml
+package require Markdown
+package require hook
+
+package provide mkdoc 0.7.0
+
+namespace eval mkdoc {
+    variable deindent [list \n\t \n "\n    " \n]
+    
+    variable htmltemplate [string map $deindent {
+	<!DOCTYPE html>
+	<html>
+	<head>
+	<meta http-equiv="Content-Security-Policy" content="default-src 'self' data: ; script-src 'self' 'nonce-d717cfb5d902616b7024920ae20346a8494f7832145c90e0' ; style-src 'self' 'unsafe-inline'" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta name="title" content="$document(title)">
+	<meta name="author" content="$document(author)">
+	<title>$document(title)</title>
+	$style
+	</head>
+	<body>
+    }]
+
+    variable htmlstart [string map $deindent {
+	<h1 class="title">$document(title)</h1>
+	<h2 class="author">$document(author)</h2>
+	<h2 class="date">$document(date)</h2>
+    }]
+
+    variable mkdocstyle [string map $deindent {
+	body {
+	    margin-left: 10%; margin-right: 10%;
+	    font-family: Palatino, "Palatino Linotype", "Palatino LT STD", "Book Antiqua", Georgia, serif;
+	    max-width: 90%;
+	}
+	pre {
+	    padding-top:	1ex;
+	    padding-bottom:	1ex;
+	    padding-left:	2ex;
+	    padding-right:	1ex;
+	    width:		100%;
+	    color: 		black;
+	    background: 	#fff4e4;
+	    border-top:		1px solid black;
+	    border-bottom:		1px solid black;
+	    font-family: Monaco, Consolas, "Liberation Mono", Menlo, Courier, monospace;
+	}
+	a {
+	    text-decoration: none
+	}
+	pre.synopsis {
+	    background: #cceeff;
+	}
+	pre.code code.tclin {
+	    background-color: #ffeeee;
+	}
+	pre.code code.tclout {
+	    background-color: #ffffee;
+	}
+	code {
+	    font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+	}
+	h1,h2, h3,h4 {
+	    font-family:	sans-serif;
+	    background: 	transparent;
+	}
+	h1 {
+	    font-size: 120%;
+	    text-align: center;
+	}
+
+	h2.author, h2.date {
+	    text-align: center;
+	    color: black;
+	}
+	h2 {    font-size: 110%; }
+	h3, h4 {  font-size: 100% }
+	div.title h1 {
+	    font-family: sans-serif;
+	    font-size:   120%;
+	    background:  transparent;
+	    text-align:  center;
+	    color:       black;
+	}
+	div.author h3, div.date h3 {
+	    font-family:	sans-serif;
+	    font-size:	110%;
+	    background: 	transparent;
+	    text-align:	center;
+	    color: black ;
+	}
+	h2, h3 {
+	    margin-top:  1em;
+	    font-family: sans-serif;
+	    font-size:	 110%;
+	    color:	 #005A9C;
+	    background:  transparent;
+	    text-align:	 left;
+	}
+    }]
+} 
+
+proc mkdoc::mkdoc {filename outfile args} {
+    variable htmltemplate
+    variable htmlstart
+    variable mkdocstyle
+
+    array set arg [list -css ""]
+    array set arg $args
+    if {[file extension $filename] eq [file extension $outfile]} {
+	return -code error "Error: infile and outfile must have different file extensions!"
+    }
+    set outmode html
+    if {[file extension $outfile] in [list .md .man]} {
+        set outmode markup
+    }
+    set inmode  code
+    if {[file extension $filename] in [list .md .man]} {
+        set inmode markup
+    }
+
+    hook call mkdoc::mkdoc Processing $filename $inmode $outmode
+    
+    set markdown ""
+    if [catch {
+	open $filename r
+    } infh] {
+        return -code error "Cannot open $filename: $infh"
+    } else {
+        set flag false
+        while {[gets $infh line] >= 0} {
+	    if {[regexp {^\s*#' +#include +"(.*)"} $line -> include]} {
+                if [catch {
+		    open $include r
+		} iinfh] {
+                    return -code error "Cannot open include file $include: $iinfh"
+                } else {
+                    #set ilines [read $iinfh]
+                    while {[gets $iinfh iline] >= 0} {
+                        # Process line
+                        append markdown "$iline\n"
+                    }
+                    close $iinfh
+                }
+            } elseif {$inmode eq "code" && [regexp {^\s*#' ?(.*)} $line -> md]} {
+                append markdown "$md\n"
+            } elseif {$inmode eq "markup"} {
+                append markdown "$line\n"
+            }
+        }
+        close $infh
+        set yamldict \
+	    [dict create \
+		 title  "Documentation [file tail [file rootname $filename]]" \
+		 author NN \
+		 date   [clock format [clock seconds] -format "%Y-%m-%d"] \
+		 css    mkdoc.css]
+
+	hook call mkdoc::mkdoc Header/Defaults $yamldict
+
+	set mdhtml ""
+        set yamlflag false
+        set yamltext ""
+        set hasyaml false
+        set indent ""
+        set header $htmltemplate
+        set lnr 0
+        foreach line [split $markdown "\n"] {
+            incr lnr 
+            if {$lnr < 5 && !$yamlflag && [regexp {^---} $line]} {
+                set yamlflag true
+            } elseif {$yamlflag && [regexp {^---} $line]} {
+                set hasyaml true
+		
+                set yamldict [dict merge $yamldict [yaml::yaml2dict $yamltext]]
+
+		hook call mkdoc::mkdoc Header/YAML $yamldict
+
+                set yamlflag false
+            } elseif {$yamlflag} {
+                append yamltext "$line\n"
+            } else {
+                set line [regsub -all {!\[\]\((.+?)\)} $line "<image src=\"\\1\"></img>"]
+                append mdhtml "$indent$line\n"
+            }
+        }
+        if {$arg(-css) ne ""} {
+            dict set yamldict css $arg(-css)
+        }
+
+	# Regenerate yamltext from the final dict (to report the final CSS reference)
+	set yamltext "---\n"
+	foreach k [lsort -dict [dict keys $yamldict]] {
+	    append yamltext "${k}: [dict get $yamldict $k]\n"
+	}
+	append yamltext "---"
+
+	hook call mkdoc::mkdoc Header/Final $yamldict
+	
+	set style <style>$mkdocstyle</style>
+
+        if {$outmode eq "html"} {
+            if {[dict get $yamldict css] ne "mkdoc.css"} {
+		# Switch from embedded style to external link
+                set style "<link rel=\"stylesheet\" href=\"[dict get $yamldict css]\">"
+            }
+            set html [Markdown::convert $mdhtml]
+            set out [open $outfile w 0644]
+            foreach key [dict keys $yamldict] {
+                set document($key) [dict get $yamldict $key]
+            }
+            if {![dict exists $yamldict date]} {
+                dict set yamldict date [clock format [clock seconds]]
+            }
+            set header [subst -nobackslashes -nocommands $header]
+            puts $out $header
+            if {$hasyaml} {
+                set start [subst -nobackslashes -nocommands $htmlstart]            
+                puts $out $start
+            }
+            puts $out $html
+            puts $out "</body>\n</html>"
+            close $out
+        } else {
+            set out [open $outfile w 0644]
+            puts $out $yamltext
+            puts $out $mdhtml
+            close $out
+        }
+
+	hook call mkdoc::mkdoc Done $outfile
+    }
+}
+
+#' 
+#' <a name="run"> </a>
+#' **mkdoc::run** *infile* 
+#' 
+#' > Source the code in infile and runs the examples in the documentation section
+#'    written with Markdown documentation. Below follows an example section which can be
+#'    run with `tclsh mkdoc.tcl mkdoc.tcl --run`
+#' 
+#' ## <a name="example">EXAMPLE</a>
+#' 
+#' ```
+#' puts "Hello mkdoc package"
+#' puts "I am in the example section"
+#' ```
+#' 
+proc ::mkdoc::run {argv} {
+    set filename [lindex $argv 0]
+    if {[llength $argv] == 3} {
+        set t [lindex $argv 2]
+    } else {
+        set t 1
+    }
+    source $filename
+    set extext ""
+    set example false
+    set excode false
+    if [catch {
+	open $filename r
+    } infh] {
+	return -code error "Cannot open $filename: $infh"
+    } else {
+	while {[gets $infh line] >= 0} {
+	    # Process line
+	    if {$extext eq "" && \
+		    [regexp -nocase {^\s*#'\s+#{2,3}\s.+Example} $line]} {
+                set example true
+            } elseif {$extext ne "" && \
+			  [regexp -nocase "^\\s*#'.*\\s# demo: $extext" $line]} {
+                set excode true
+            } elseif {$example && [regexp {^\s*#'\s+>?\s*```} $line]} {
+                set example false
+                set excode true
+            } elseif {$excode && [regexp {^\s*#'\s+>?\s*```} $line]} {
+                namespace eval :: $code
+                break
+                # eval code
+            } elseif {$excode && [regexp {^\s*#'\s(.+)} $line -> c]} {
+                append code "$c\n"
+            }
+        }
+        close $infh
+        if {$t > -1} {
+            catch {
+                update idletasks
+                after [expr {$t*1000}]
+                destroy .
+            }
+        }
+    }
+}
+
+#'
+#' ## <a name='format'>BASIC FORMATTING</a>
+#' 
+#' For a complete list of Markdown formatting commands consult the basic Markdown syntax at [https://daringfireball.net](https://daringfireball.net/projects/markdown/syntax). 
+#' Here just the most basic essentials  to create documentation are described.
+#' Please note, that formatting blocks in Markdown are separated by an empty line, and empty line in this documenting mode is a line prefixed with the `#'` and nothing thereafter. 
+#'
+#' **Title and Author**
+#' 
+#' Title and author can be set at the beginning of the documentation in a so called YAML header. 
+#' This header will be as well used by the document converter [pandoc](https://pandoc.org)  to handle various options for later processing if you extract not HTML but Markdown code from your documentation.
+#'
+#' A YAML header starts and ends with three hyphens. Here is the YAML header of this document:
+#' 
+#' ```
+#' #' ---
+#' #' title: mkdoc - Markdown extractor and formatter
+#' #' author: Dr. Detlef Groth, Schwielowsee, Germany
+#' #' ---
+#' ```
+#' 
+#' Those four lines produce the two lines on top of this document. You can extend the header if you would like to process your document after extracting the Markdown with other tools, for instance with Pandoc.
+#' 
+#' You can as well specify an other style sheet, than the default by adding
+#' the following style information:
+#'
+#' ```
+#' #' ---
+#' #' title: mkdoc - Markdown extractor and formatter
+#' #' author: Dr. Detlef Groth, Schwielowsee, Germany
+#' #' css: tufte.css
+#' #' ---
+#' ```
+#' 
+#' Please note, that the indentation is required and it is two spaces.
+#'
+#' **Headers**
+#'
+#' Headers are prefixed with the hash symbol, single hash stands for level 1 heading, double hashes for level 2 heading, etc.
+#' Please note, that the embedded style sheet centers level 1 and level 3 headers, there are intended to be used
+#' for the page title (h1), author (h3) and date information (h3) on top of the page.
+#' 
+#' ```
+#'   #'  ## <a name="sectionname">Section title</a>
+#'   #'    
+#'   #'  Some free text that follows after the required empty 
+#'   #'  line above ...
+#' ```
+#'
+#' This produces a level 2 header. Please note, if you have a section name `synopsis` the code fragments thereafer will be hilighted different than the other code fragments. You should only use level 2 and 3 headers for the documentation. Level 1 header are reserved for the title.
+#' 
+#' **Lists**
+#'
+#' Lists can be given either using hyphens or stars at the beginning of a line.
+#'
+#' ```
+#' #' - item 1
+#' #' - item 2
+#' #' - item 3
+#' ```
+#' 
+#' Here the output:
+#'
+#' - item 1
+#' - item 2
+#' - item 3
+#' 
+#' A special list on top of the help page could be the table of contents list. Here is an example:
+#'
+#' ```
+#' #' ## Table of Contents
+#' #'
+#' #' - [Synopsis](#synopsis)
+#' #' - [Description](#description)
+#' #' - [Command](#command)
+#' #' - [Example](#example)
+#' #' - [Authors](#author)
+#' ```
+#'
+#' This will produce in HTML mode a clickable hyperlink list. You should however create
+#' the name targets using html code like so:
+#'
+#' ```
+#' ## <a name='synopsis'>Synopsis</a> 
+#' ```
+#' 
+#' **Hyperlinks**
+#'
+#' Hyperlinks are written with the following markup code:
+#'
+#' ```
+#' [Link text](URL)
+#' ```
+#' 
+#' Let's link to the Tcler's Wiki:
+#' 
+#' ```
+#' [Tcler's Wiki](https://wiki.tcl-lang.org/)
+#' ```
+#' 
+#' produces: [Tcler's Wiki](https://wiki.tcl-lang.org/)
+#'
+#' **Indentations**
+#'
+#' Indentations are achieved using the greater sign:
+#' 
+#' ```
+#' #' Some text before
+#' #'
+#' #' > this will be indented
+#' #'
+#' #' This will be not indented again
+#' ```
+#' 
+#' Here the output:
+#'
+#' Some text before
+#' 
+#' > this will be indented
+#' 
+#' This will be not indented again
+#'
+#' Also lists can be indented:
+#' 
+#' ```
+#' > - item 1
+#'   - item 2
+#'   - item 3
+#' ```
+#'
+#' produces:
+#'
+#' > - item 1
+#'   - item 2
+#'   - item 3
+#'
+#' **Fontfaces**
+#' 
+#' Italic font face can be requested by using single stars or underlines at the beginning 
+#' and at the end of the text. Bold is achieved by dublicating those symbols:
+#' Monospace font appears within backticks.
+#' Here an example:
+#' 
+#' ```
+#' #' > I am _italic_ and I am __bold__! But I am programming code: `ls -l`
+#' ```
+#'
+#' > I am _italic_ and I am __bold__! But I am programming code: `ls -l`
+#' 
+#' **Code blocks**
+#'
+#' Code blocks can be started using either three or more spaces after the #' sequence 
+#' or by embracing the code block with triple backticks on top and on bottom. Here an example:
+#' 
+#' ```
+#' #' ```
+#' #' puts "Hello World!"
+#' #' ```
+#' ```
+#'
+#' Here the output:
+#'
+#' ```
+#' puts "Hello World!"
+#' ```
+#'
+#' **Images**
+#'
+#' If you insist on images in your documentation, images can be embedded in Markdown with a syntax close to links.
+#' The links here however start with an exclamation mark:
+#' 
+#' ```
+#' #' ![image caption](filename.png)
+#' ```
+#' 
+#' The source code of mkdoc.tcl is a good example for usage of this source code 
+#' annotation tool. Don't overuse the possibilities of Markdown, sometimes less is more. 
+#' Write clear and concise, don't use fancy visual effects.
+#' 
+#' **Includes**
+#' 
+#' mkdoc in contrast to standard markdown as well support includes. Using the `#' #include "filename.md"` syntax 
+#' it is possible to include other markdown files. This might be useful for instance to include the same 
+#' header or a footer in a set of related files.
+#'
+#' ## <a name='install'>INSTALLATION</a>
+#' 
+#' The mkdoc::mkdoc package can be installed either as command line application or as a Tcl module. It requires the markdown, cmdline, yaml and textutils packages from tcllib to be installed.
+#' 
+#' Installation as command line application is easiest by downloading the file [mkdoc-0.6.bin](https://raw.githubusercontent.com/mittelmark/DGTcl/master/bin/mkdoc-0.6.bin), which
+#' contains the main script file and all required libraries, to your local machine. Rename this file to mkdoc, make it executable and coy it to a folder belonging to your PATH variable.
+#' 
+#' Installation as command line application can be as well done by copying the `mkdoc.tcl` as 
+#' `mkdoc` to a directory which is in your executable path. You should make this file executable using `chmod`. 
+#' 
+#' Installation as Tcl package by copying the mkdoc folder to a folder 
+#' which is in your library path for Tcl. Alternatively you can install it as Tcl mode by copying it 
+#' in your module path as `mkdoc-0.6.0.tm` for instance. See the [tm manual page](https://www.tcl.tk/man/tcl8.6/TclCmd/tm.htm)
+#'
+#' ## <a name='see'>SEE ALSO</a>
+#' 
+#' - [tcllib](https://core.tcl-lang.org/tcllib/doc/trunk/embedded/index.md) for the Markdown and the textutil packages
+#' - [pandoc](https://pandoc.org) - a universal document converter
+#' - [Ruff!](https://github.com/apnadkarni/ruff) Ruff! documentation generator for Tcl using Markdown syntax as well
+
+#' 
+#' ## <a name='changes'>CHANGES</a>
+#'
+#' - 2019-11-19 Release 0.1
+#' - 2019-11-22 Adding direct conversion from Markdown files to HTML files.
+#' - 2019-11-27 Documentation fixes
+#' - 2019-11-28 Kit version
+#' - 2019-11-28 Release 0.2 to fossil
+#' - 2019-12-06 Partial R-Roxygen/Markdown support
+#' - 2020-01-05 Documentation fixes and version information
+#' - 2020-02-02 Adding include syntax
+#' - 2020-02-26 Adding stylesheet option --css 
+#' - 2020-02-26 Adding files pandoc.css and dgw.css
+#' - 2020-02-26 Making standalone file using pkgDeps and mk_tm
+#' - 2020-02-26 Release 0.3 to fossil
+#' - 2020-02-27 support for \_\_DATE\_\_, \_\_PKGNAME\_\_, \_\_PKGVERSION\_\_ macros  in Tcl code based on package provide line
+#' - 2020-09-01 Roxygen2 plugin
+#' - 2020-11-09 argument --run supprt
+#' - 2020-11-10 Release 0.4
+#' - 2020-11-11 command line option  --run with seconds
+#' - 2020-12-30 Release 0.5 (rox2md @section support with preformatted, emph and strong/bold)
+#' - 2022-02-11 Release 0.6.0 
+#'      - parsing yaml header
+#'      - workaround for images
+#'      - making standalone using tpack.tcl [mkdoc-0.6.bin](https://github.com/mittelmark/DGTcl/blob/master/bin/mkdoc-0.6.bin)
+#'      - terminal help update and cleanup
+#'      - moved to Github in Wiki
+#'      - code cleanup
+#' - 2022-04-XX Release 0.7.0
+#'      - removing features to simplify the code, so removed plugin support, underline placeholder and sorting facilitites to reduce code size
+#'      - creating tcllib compatible manual page
+#'
+#' ## <a name='todo'>TODO</a>
+#'
+#' - dtplite support ?
+#'
+#' ## <a name='authors'>AUTHOR(s)</a>
+#'
+#' The **mkdoc::mkdoc** package was written by Dr. Detlef Groth, Schwielowsee, Germany.
+#'
+#' ## <a name='license'>LICENSE AND COPYRIGHT</a>
+#'
+#' Markdown extractor and converter mkdoc::mkdoc, version 0.7.0
+#'
+#' Copyright (c) 2019-22  Detlef Groth, E-mail: <detlef(at)dgroth(dot)de>
+#' 
+#' BSD License type:
+
+#' Sun Microsystems, Inc. The following terms apply to all files a ssociated
+#' with the software unless explicitly disclaimed in individual files. 
+
+#' The authors hereby grant permission to use, copy, modify, distribute, and
+#' license this software and its documentation for any purpose, provided that
+#' existing copyright notices are retained in all copies and that this notice
+#' is included verbatim in any distributions. No written agreement, license,
+#' or royalty fee is required for any of the authorized uses. Modifications to
+#' this software may be copyrighted by their authors and need not follow the
+#' licensing terms described here, provided that the new terms are clearly
+#' indicated on the first page of each file where they apply. 
+#'
+#' In no event shall the authors or distributors be liable to any party for
+#' direct, indirect, special, incidental, or consequential damages arising out
+#' of the use of this software, its documentation, or any derivatives thereof,
+#' even if the authors have been advised of the possibility of such damage. 
+#'
+#' The authors and distributors specifically disclaim any warranties,
+#' including, but not limited to, the implied warranties of merchantability,
+#' fitness for a particular purpose, and non-infringement. This software is
+#' provided on an "as is" basis, and the authors and distributors have no
+#' obligation to provide maintenance, support, updates, enhancements, or
+#' modifications. 
+#'
+#' RESTRICTED RIGHTS: Use, duplication or disclosure by the government is
+#' subject to the restrictions as set forth in subparagraph (c) (1) (ii) of
+#' the Rights in Technical Data and Computer Software Clause as DFARS
+#' 252.227-7013 and FAR 52.227-19. 
+
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mkdoc/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mkdoc/pkgIndex.tcl
new file mode 100644
index 00000000..9e228dca
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/mkdoc/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package require Tcl] 8.6]} {return}
+package ifneeded mkdoc 0.7.0 [list source [file join $dir mkdoc.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/multiplexer/multiplexer.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/multiplexer/multiplexer.tcl
new file mode 100644
index 00000000..e5dfe4bb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/multiplexer/multiplexer.tcl
@@ -0,0 +1,291 @@
+# multiplexer.tcl -- one-to-many comunication with sockets
+#
+#	Implementation of a one-to-many multiplexer in Tcl utilizing
+#	sockets.
+
+# Copyright (c) 2001-2003 by David N. Welton <davidw@dedasys.com>
+
+# This file may be distributed under the same terms as Tcl.
+
+# $Id: multiplexer.tcl,v 1.4 2004/01/15 06:36:13 andreas_kupries Exp $
+
+package provide multiplexer 0.2
+package require logger
+
+namespace eval ::multiplexer {
+    variable Unique 0
+}
+
+proc ::multiplexer::create {} {
+    variable Unique
+    set ns ::multiplexer::mp$Unique
+
+    namespace eval $ns {
+	# Use the namespace as the logger name.
+	set log [logger::init [string trimleft [namespace current] ::]]
+	# list of connected clients
+	array set clients {}
+
+	# filters to run at access (socket accept) time
+	set accessfilters {}
+
+	# filters to run on data
+	set filters {}
+
+	# hook to run at exit time
+	set exitfilters {}
+
+	# config options
+	array set config {}
+	set config(sendtoorigin) 0
+	set config(debuglevel) warn
+	${log}::disable $config(debuglevel)
+	${log}::enable $config(debuglevel)
+
+	# AddAccessFilter --
+	#
+	# Command to add an access filter that will be called like so:
+	#
+	# AccessFilter chan clientaddress clientport
+	#
+	# Arguments:
+	#
+	# function: proc to filter access to the multiplexer.  Takes chan,
+	# clientaddress and clientport arguments.  Returns 0 on success, -1 on
+	# failure.
+
+	proc AddAccessFilter { function } {
+	    variable accessfilters
+	    lappend accessfilters $function
+	}
+
+	# AddFilter --
+
+	# Command to add a filter for data that passes through the
+	# multiplexer.  The filter proc is called like this:
+
+	# Filter data chan clientaddress clientport
+
+	# Arguments:
+
+	# function: proc to filter data that arrives to the
+	# multiplexer.
+	# Takes data, chan, clientaddress, and clientport arguments.  Returns
+	# filtered version of data.
+
+	proc AddFilter { function } {
+	    variable filters
+	    lappend filters $function
+	}
+
+	# AddExitFilter --
+
+	# Adds filter to be run when client socket generates an EOF condition.
+	# ExitFilter functions look like the following:
+
+	# ExitFilter chan clientaddress clientport
+
+	# Arguments:
+
+	# function: hook to be run when clients exit by generating an EOF.
+	# Takes chan, clientaddress and clientport arguments, and returns
+	# nothing.
+
+	proc AddExitFilter { function } {
+	    variable exitfilters
+	    lappend exitfilters $function
+	}
+
+	# DelClient --
+
+	# Deletes a client from the client list, and runs exit filters.
+
+	# Arguments:
+
+	# chan: channel that is closed.
+
+	# client: address of client
+
+	# clientport: port number of client.
+
+	proc DelClient { chan client clientport } {
+	    variable clients
+	    variable exitfilters
+	    variable config
+	    variable log
+	    foreach ef $exitfilters {
+		catch {
+		    $ef $chan $client $clientport
+		} err
+		${log}::debug "Error in DelClient: $err"
+	    }
+	    unset clients($chan)
+	    close $chan
+	}
+
+
+	# MultiPlex --
+
+	# Multiplex data
+
+	# Arguments:
+
+	# data - data to multiplex
+
+	proc MultiPlex { data {chan ""} } {
+	    variable clients
+	    variable config
+	    variable log
+
+	    foreach c [array names clients] {
+		if { $config(sendtoorigin) } {
+		    puts -nonewline $c "$data"
+		} else {
+		    if { $chan != $c } {
+			${log}::debug "Sending '$data' to $c"
+			puts -nonewline $c "$data"
+		    }
+		}
+	    }
+	}
+
+
+	# GetData --
+
+	# Get data from clients, filter it, redistribute it.
+
+	# Arguments:
+
+	# chan: open channel
+
+	# client: client address
+
+	# clientport: port number of client
+
+	proc GetData { chan client clientport } {
+	    variable filters
+	    variable clients
+	    variable config
+	    variable log
+	    if { ! [eof $chan] } {
+		set data [read $chan]
+	#	gets $chan data
+		${log}::debug "Tcl chan $chan from host $client and port $clientport sends: $data"
+		# do data filters
+		foreach f $filters {
+		    catch {
+			set data [$f $data $chan $client $clientport]
+		    } err
+		    ${log}::debug "GetData filter: $err"
+		}
+		set chans [array names clients]
+		MultiPlex $data $chan
+	    } else {
+		${log}::debug "Deleting client $chan from host $client and port $clientport."
+		DelClient $chan $client $clientport
+	    }
+	}
+
+	# NewClient --
+
+	# Sets up newly created connection after running access filters
+
+	# Arguments:
+
+	# chan: open channel
+
+	# client: client address
+
+	# clientport: port number of client
+
+	proc NewClient { chan client clientport } {
+	    variable clients
+	    variable config
+	    variable accessfilters
+	    variable log
+	    # run through access filters
+	    foreach af $accessfilters {
+		if { [$af $chan $client $clientport] == -1 } {
+		    ${log}::debug "Access denied to $chan $client $clientport"
+		    close $chan
+		    return
+		}
+	    }
+	    set clients($chan) $client
+
+	    # We want to read data and immediately send it out again.
+	    fconfigure $chan -blocking 0
+	    fconfigure $chan -buffering none
+	    fconfigure $chan -translation binary
+	    fileevent $chan readable [list [namespace current]::GetData $chan $client $clientport]
+	    ${log}::debug "Tcl channel $chan is host $client and port $clientport."
+	}
+
+	# Config --
+	#
+	# Configure global options, which currently include the
+	# following:
+	#
+	# sendtoorigin: if 1, resend the data to all clients, including the
+	# sender.  Defaults to 0
+	#
+	# debuglevel: a debug level understood by logger.
+	#
+	# Arguments:
+	#
+	# key: name of option to configure
+	#
+	# value: value for option.
+
+	proc Config { key value } {
+	    variable config
+	    variable log
+	    if { $key == "debuglevel" } {
+		${log}::disable $config(debuglevel)
+		${log}::enable $value
+	    }
+	    set config($key) $value
+	}
+
+	# Init --
+	#
+	# Start the server
+	#
+	# Arguments:
+	#
+	# port: port to listen on.
+
+	proc Init { port } {
+	    variable serversock
+	    set serversock [socket -server [namespace current]::NewClient $port]
+	}
+
+	# destroy --
+	#
+	#	Destroy multiplexer instance.  It is important to do
+	#	this, to free the resources used.
+	#
+	# Side Effects:
+	#	Deletes namespace associated with multiplexer
+	#	instance.
+
+
+	proc destroy { } {
+	    variable serversock
+	    foreach c [array names clients] {
+	        catch { close $c }
+	    }
+	    catch {
+		close $serversock
+	    }
+	    namespace delete [namespace current]
+	}
+
+    }
+    incr Unique
+    return $ns
+}
+
+namespace eval multiplexer {
+    namespace export create destroy
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/multiplexer/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/multiplexer/pkgIndex.tcl
new file mode 100644
index 00000000..51f2ad4b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/multiplexer/pkgIndex.tcl
@@ -0,0 +1,12 @@
+# Tcl package index file, version 1.1
+# This file is generated by the "pkg_mkIndex" command
+# and sourced either when an application starts up or
+# by a "package unknown" script.  It invokes the
+# "package ifneeded" command to set up package-related
+# information so that packages will be loaded automatically
+# in response to "package require" commands.  When this
+# script is sourced, the variable $dir must contain the
+# full path name of this file's directory.
+
+if { ![package vsatisfies [package provide Tcl] 8.2] } { return }
+package ifneeded multiplexer 0.2 [list source [file join $dir multiplexer.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/namespacex/namespacex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/namespacex/namespacex.tcl
new file mode 100644
index 00000000..2a79bb0a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/namespacex/namespacex.tcl
@@ -0,0 +1,335 @@
+## -*- tcl -*-
+## (C) 2010 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+## 'unknown hook' code -- Derived from http://wiki.tcl.tk/12790 (Neil Madden).
+## 'var/state' code    -- Derived from http://wiki.tcl.tk/1489 (various).
+## BSD Licensed
+# # ## ### ##### ######## ############# ######################
+
+# namespacex hook  - Easy extensibility of 'namespace unknown'.
+# namespacex info  - Get all variables/children, direct and indirect
+# namespacex state - Save/restore the variable-based state of namespaces.
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5  ; # namespace ensembles, {*}
+
+# The try command is used in the namespacex::import command. For
+# backward compatibility we will use the try package from tcllib if
+# running on a platform that does not have it as a core command,
+# i.e. before 8.6.
+
+if {![llength [info commands try]]} {
+    package require try ; # tcllib
+}
+
+namespace eval ::namespacex {
+    namespace export add hook info import normalize strip state
+    namespace ensemble create
+
+    namespace eval hook {
+	namespace export add proc on next
+	namespace ensemble create
+
+	# add - hook a command prefix into the chain of unknown handlers for a
+	#       namespace. The prefix will be run with whatever args there are, so
+	#       it should use 'args' to accomodate? to everything.
+
+	# on  - ditto for separate guard and action command prefixes.
+	#       If the guard fails it chains via next, otherwise the
+	#       action runs. The action can asume that the guard checked for proper
+	#       number of arguments, maybe even types. Whatever fits.
+
+	# proc - like add, but an unamed procedure, with arguments and
+	#        body. Not much use, except maybe to handle the exact way
+	#        of chaining on your own (next can take a rewritten
+	#        command, the 'on' compositor makes no use of that.
+
+	# Both 'proc' and 'on' are based on 'add'.
+    }
+
+    namespace eval info {
+	namespace export allvars allchildren vars
+	namespace ensemble create
+    }
+
+    namespace eval state {
+	namespace export drop set get
+	namespace ensemble create
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Implementation :: Hooks - Visible API
+
+# # ## ### ##### ######## ############# ######################
+## (1) Core: Register a command prefix to be run by 
+##           namespace unknown of a namespace FOO.
+##           FOO defaults to the current namespace.
+##
+##     The prefixes are executed in reverse order of registrations,
+##     i.e. the prefix registered last is executed first. The next
+##     is run if and only if the current prefix forced this via
+##    '::namespacex::hook::next'. IOW the chain is managed cooperatively.
+
+proc ::namespacex::hook::add {args} {
+    # syntax: ?namespace? cmdprefix
+
+    if {[llength $args] > 2} {
+	return -code error "wrong\#args, should be \"?namespace? cmdprefix\""
+    } elseif {[llength $args] == 2} {
+	lassign $args namespace cmdprefix
+    } else { # [llength $args] == 1
+	lassign $args cmdprefix
+	set namespace [uplevel 1 { namespace current }]
+    }
+
+    #puts UH|ADD|for|$namespace|
+    #puts UH|ADD|old|<<[Get $namespace]>>
+    #puts UH|ADD|cmd|<<$cmdprefix>>
+
+    Set $namespace [namespace code [list Handle $cmdprefix [Get $namespace]]]
+    return
+}
+
+proc ::namespacex::hook::proc {args} {
+    # syntax: ?namespace? arguments body
+
+    set procNamespace [uplevel 1 { namespace current }]
+
+    if {([llength $args] < 2) ||
+	([llength $args] > 3)} {
+	return -code error "wrong\#args, should be \"?namespace? arguments body\""
+    } elseif {[llength $args] == 3} {
+	lassign $args namespace arguments body
+    } else { # [llength $args] == 2
+	lassign $args arguments body
+	set namespace $procNamespace
+    }
+
+    add $namespace [list ::apply [list $arguments $body $procNamespace]]
+    return
+}
+
+proc ::namespacex::hook::on {args} {
+    # syntax: ?namespace? guardcmd actioncmd
+
+    if {([llength $args] < 2) ||
+	([llength $args] > 3)} {
+	return -code error "wrong\#args, should be \"?namespace? guard action\""
+    } elseif {[llength $args] == 3} {
+	lassign $args namespace guard action
+    } else { # [llength $args] == 2
+	lassign $args guard action
+	set namespace [uplevel 1 { namespace current }]
+    }
+
+    add $namespace [list ::apply [list {guard action args} {
+	if {![{*}$guard {*}$args]} {
+	    # This is what requires '[ns current]' as context.
+	    next
+	}
+	return [{*}$action {*}$args]
+    } [namespace current]] $guard $action]
+    return
+}
+
+proc ::namespacex::hook::next {args} {
+    #puts UH|NEXT|$args|
+    return -code continue -level 2 $args
+}
+
+# # ## ### ##### ######## ############# ######################
+## Implementation :: Hooks - Internal Helpers.
+## Get and set the unknown handler for a specified namespace.
+
+# Generic handler with the user's handler and previous handler as
+# arguments. The latter is an invokation of the internal handler
+# again, with its own arguments. In this way 'Handle' forms the spine
+# of the chain of handlers, running them and handling 'next' to
+# traverse the chain. From a data structure perspective we have deeply
+# nested list here, which is recursed into as the chain is traversed.
+
+proc ::namespacex::hook::Get {ns} {
+    return [namespace eval $ns { namespace unknown }]
+}
+
+proc ::namespacex::hook::Set {ns handler} {
+    #puts UH|SET|$ns|<<$handler>>
+
+    namespace eval $ns [list namespace unknown $handler]
+    return
+}
+
+proc ::namespacex::hook::Handle {handler old args} {
+    #puts UH|HDL|$handler|||old|$old||args||$args|
+
+    set rc [catch {
+	uplevel 1 $handler $args
+    } result]
+
+    #puts UH|HDL|rc=$rc|result=$result|
+
+    if {$rc == 4} {
+        # continue - invoke next handler
+
+	if {$old eq {}} {
+	    # no next handler available - stop
+	    #puts UH|HDL|STOP
+	    return -code error "invalid command name \"[lindex $args 0]\""
+	}
+
+        if {![llength $result]} {
+            uplevel 1 $old $args
+        } else {
+            uplevel 1 $old $result
+        }
+    } else {
+        return -code $rc $result
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Implementation :: Info - Visible API
+
+proc ::namespacex::import {from args} {
+    set upns [uplevel 1 {::namespace current}]
+    if {![string match ::* $from]} {
+	set from ${upns}::$from[set from {}]
+    }
+    set orig [namespace eval $from {::namespace export}]
+    try {
+	namespace eval $from {::namespace export *}
+	set tmp [::namespace current]::[::info cmdcount]
+	namespace eval $tmp [list ::namespace import ${from}::*]
+	if {[llength $args] == 1} {
+	    lappend args [lindex $args 0]
+	}
+	dict size $args
+	foreach {old new} $args {
+	    rename ${tmp}::$old ${upns}::$new
+	}
+	namespace delete $tmp
+    } finally {
+	namespace eval $from [list ::namespace export -clear {*}$orig]
+    }
+    return
+}
+
+proc ::namespacex::info::allvars {ns} {
+    set ns [uplevel 1 [list [namespace parent] normalize $ns]]
+    ::set result [::info vars ${ns}::*]
+    foreach cns [allchildren $ns] {
+	lappend result {*}[::info vars ${cns}::*]
+    }
+    return [::namespacex::Strip $ns $result]
+}
+
+proc ::namespacex::info::allchildren {ns} {
+    set ns [uplevel 1 [list [namespace parent] normalize $ns]]
+    ::set result [list]
+    foreach cns [::namespace children $ns] {
+	lappend result {*}[allchildren $cns]
+	lappend result $cns
+    }
+    return $result
+}
+
+proc ::namespacex::info::vars {ns {pattern *}} {
+    set ns [uplevel 1 [list [namespace parent] normalize $ns]]
+    return [::namespacex::Strip $ns [::info vars ${ns}::$pattern]]
+}
+
+# this implementation avoids string operations
+proc ::namespacex::normalize {ns} {
+    if {[uplevel 1 [list ::namespace exists $ns]]} {
+	return [uplevel 1 [list namespace eval $ns {::namespace current}]]
+    }
+    if {![string match ::* $ns]} {
+	set ns [uplevel 1 {::namespace current}]::$ns
+    }
+    regsub {::+} $ns :: ns
+    return $ns
+}
+
+proc ::namespacex::strip {ns itemlist} {
+    set ns [uplevel 1 [list [namespace current] normalize $ns]]
+    set n [string length $ns]
+    incr n -1
+    foreach i $itemlist {
+	if {[string range $i 0 $n] eq "$ns"} continue
+	return -code error "Expected $ns as prefix for $i, not found"
+    }
+    return [Strip $ns $itemlist]
+}
+
+proc ::namespacex::Strip {ns itemlist} {
+    # Assert: is-fqn (ns)
+    if {![string match {::*} $ns]} { error "Expected fqn for ns" }
+    
+    set n [string length $ns]
+    incr n 2
+
+    set result {}
+    foreach i $itemlist {
+	lappend result [string range $i $n end]
+    }
+    return $result
+}
+
+# # ## ### ##### ######## ############# ######################
+## Implementation :: State - Visible API
+
+proc ::namespacex::state::drop {ns} {
+    ::set ns [uplevel 1 [list [namespace parent] normalize $ns]]
+    namespace eval $ns [list ::unset {*}[::namespacex info allvars $ns]]
+    return
+}
+
+proc ::namespacex::state::get {ns} {
+    ::set ns [uplevel 1 [list [namespace parent] normalize $ns]]
+    ::set result {}
+    foreach v [::namespacex info allvars $ns] {
+	namespace upvar $ns $v value
+	if {[array exists value]} {
+	    lappend result [list A $v] [array get value]
+	} else {
+	    lappend result [list S $v] $value
+	}
+    }
+    return $result
+}
+
+proc ::namespacex::state::set {ns state} {
+    ::set ns [uplevel 1 [list [namespace parent] normalize $ns]]
+    # Inlined 'state drop'.
+    namespace eval $ns [list ::unset {*}[::namespacex info allvars $ns]]
+
+    foreach {var value} $state {
+	if {[llength $var] == 2} {
+	    # test for type-tagged variables
+	    switch -exact -- [lindex $var 0] {
+		A {
+		    namespace upvar $ns [lindex $var 1] nsvar
+		    array set nsvar $value
+		    continue
+		}
+		S {
+		    namespace upvar $ns [lindex $var 1] nsvar
+		    ::set nsvar $value
+		    continue
+		}
+	    }
+	    # If tag is unknown assume untagged variable whose name contains spaces
+	}
+	# old-style state with untagged variable names. Assume scalar.
+	namespace upvar $ns $var nsvar
+	::set nsvar $value
+    }
+    return
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide namespacex 0.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/namespacex/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/namespacex/pkgIndex.tcl
new file mode 100644
index 00000000..c1e567a6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/namespacex/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded namespacex 0.3 [list source [file join $dir namespacex.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ncgi/ncgi.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ncgi/ncgi.tcl
new file mode 100644
index 00000000..1aea5110
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ncgi/ncgi.tcl
@@ -0,0 +1,1119 @@
+# ncgi.tcl
+#
+# Basic support for CGI programs
+#
+# Copyright (c) 2000 Ajuba Solutions.
+# Copyright (c) 2012 Richard Hipp, Andreas Kupries
+# Copyright (c) 2013-2014 Andreas Kupries
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+
+# Please note that Don Libes' has a "cgi.tcl" that implements version 1.0
+# of the cgi package.  That implementation provides a bunch of cgi_ procedures
+# (it doesn't use the ::cgi:: namespace) and has a wealth of procedures for
+# generating HTML.  In contract, the package provided here is primarly
+# concerned with processing input to CGI programs.  I have tried to mirror his
+# API's where possible.  So, ncgi::input is equivalent to cgi_input, and so
+# on.  There are also some different APIs for accessing values (ncgi::list,
+# ncgi::parse and ncgi::value come to mind)
+
+# Note, I use the term "query data" to refer to the data that is passed in
+# to a CGI program.  Typically this comes from a Form in an HTML browser.
+# The query data is composed of names and values, and the names can be
+# repeated.  The names and values are encoded, and this module takes care
+# of decoding them.
+
+# We use newer string routines
+package require Tcl 8.4
+package require fileutil ; # Required by importFile.
+package require uri
+
+package provide ncgi 1.4.4
+
+namespace eval ::ncgi {
+
+    # "query" holds the raw query (i.e., form) data
+    # This is treated as a cache, too, so you can call ncgi::query more than
+    # once
+
+    variable query
+
+    # This is the content-type which affects how the query is parsed
+
+    variable contenttype
+
+    # value is an array of parsed query data.  Each array element is a list
+    # of values, and the array index is the form element name.
+    # See the differences among ncgi::parse, ncgi::input, ncgi::value
+    # and ncgi::valuelist for the various approaches to handling these values.
+
+    variable value
+
+    # This lists the names that appear in the query data
+
+    variable varlist
+
+    # This holds the URL coresponding to the current request
+    # This does not include the server name.
+
+    variable urlStub
+
+    # This flags compatibility with Don Libes cgi.tcl when dealing with
+    # form values that appear more than once.  This bit gets flipped when
+    # you use the ncgi::input procedure to parse inputs.
+
+    variable listRestrict 0
+
+    # This is the set of cookies that are pending for output
+
+    variable cookieOutput
+
+    # Support for x-www-urlencoded character mapping
+    # The spec says: "non-alphanumeric characters are replaced by '%HH'"
+ 
+    variable i
+    variable c
+    variable map
+
+    for {set i 1} {$i <= 256} {incr i} {
+	set c [format %c $i]
+	if {![string match \[a-zA-Z0-9\] $c]} {
+	    set map($c) %[format %.2X $i]
+	}
+    }
+     
+    # These are handled specially
+    array set map {
+	" " +   \n %0D%0A
+    }
+
+    # Map of transient files
+
+    variable  _tmpfiles
+    array set _tmpfiles {}
+
+    # I don't like importing, but this makes everything show up in 
+    # pkgIndex.tcl
+
+    namespace export reset urlStub query type decode encode
+    namespace export nvlist parse input value valueList names
+    namespace export setValue setValueList setDefaultValue setDefaultValueList
+    namespace export empty import importAll importFile redirect header
+    namespace export parseMimeValue multipart cookie setCookie
+}
+
+# ::ncgi::reset
+#
+#	This resets the state of the CGI input processor.  This is primarily
+#	used for tests, although it is also designed so that TclHttpd can
+#	call this with the current query data
+#	so the ncgi package can be shared among TclHttpd and CGI scripts.
+#
+#	DO NOT CALL this in a standard cgi environment if you have not
+#	yet processed the query data, which will not be used after a
+#	call to ncgi::reset is made.  Instead, just call ncgi::parse
+#
+# Arguments:
+#	newquery	The query data to be used instead of external CGI.
+#	newtype		The raw content type.
+#
+# Side Effects:
+#	Resets the cached query data and wipes any environment variables
+#	associated with CGI inputs (like QUERY_STRING)
+
+proc ::ncgi::reset {args} {
+    global env
+    variable _tmpfiles
+    variable query
+    variable contenttype
+    variable cookieOutput
+
+    # array unset _tmpfiles -- Not a Tcl 8.2 idiom
+    unset _tmpfiles ; array set _tmpfiles {}
+
+    set cookieOutput {}
+    if {[llength $args] == 0} {
+
+	# We use and test args here so we can detect the
+	# difference between empty query data and a full reset.
+
+	if {[info exists query]} {
+	    unset query
+	}
+	if {[info exists contenttype]} {
+	    unset contenttype
+	}
+    } else {
+	set query [lindex $args 0]
+	set contenttype [lindex $args 1]
+    }
+}
+
+# ::ncgi::urlStub
+#
+#	Set or return the URL associated with the current page.
+#	This is for use by TclHttpd to override the default value
+#	that otherwise comes from the CGI environment
+#
+# Arguments:
+#	url	(option) The url of the page, not counting the server name.
+#		If not specified, the current urlStub is returned
+#
+# Side Effects:
+#	May affects future calls to ncgi::urlStub
+
+proc ::ncgi::urlStub {{url {}}} {
+    global   env
+    variable urlStub
+    if {[string length $url]} {
+	set urlStub $url
+	return ""
+    } elseif {[info exists urlStub]} {
+	return $urlStub
+    } elseif {[info exists env(SCRIPT_NAME)]} {
+	set urlStub $env(SCRIPT_NAME)
+	return $urlStub
+    } else {
+	return ""
+    }
+}
+
+# ::ncgi::query
+#
+#	This reads the query data from the appropriate location, which depends
+#	on if it is a POST or GET request.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	The raw query data.
+
+proc ::ncgi::query {} {
+    global env
+    variable query
+
+    if {[info exists query]} {
+	# This ensures you can call ncgi::query more than once,
+	# and that you can use it with ncgi::reset
+	return $query
+    }
+
+    set query ""
+    if {[info exists env(REQUEST_METHOD)]} {
+	if {$env(REQUEST_METHOD) == "GET"} {
+	    if {[info exists env(QUERY_STRING)]} {
+		set query $env(QUERY_STRING)
+	    }
+	} elseif {$env(REQUEST_METHOD) == "POST"} {
+	    if {[info exists env(CONTENT_LENGTH)] &&
+		    [string length $env(CONTENT_LENGTH)] != 0} {
+ 		## added by Steve Cassidy to try to fix binary file upload
+ 		fconfigure stdin -translation binary -encoding binary
+		set query [read stdin $env(CONTENT_LENGTH)]
+	    }
+	}
+    }
+    return $query
+}
+
+# ::ncgi::type
+#
+#	This returns the content type of the query data.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	The content type of the query data.
+
+proc ::ncgi::type {} {
+    global env
+    variable contenttype
+
+    if {![info exists contenttype]} {
+	if {[info exists env(CONTENT_TYPE)]} {
+	    set contenttype $env(CONTENT_TYPE)
+	} else {
+	    return ""
+	}
+    }
+    return $contenttype
+}
+
+# ::ncgi::decode
+#
+#	This decodes data in www-url-encoded format.
+#
+# Arguments:
+#	An encoded value
+#
+# Results:
+#	The decoded value
+
+if {[package vsatisfies [package present Tcl] 8.6]} {
+    # 8.6+, use 'binary decode hex'
+    proc ::ncgi::DecodeHex {hex} {
+	return [binary decode hex $hex]
+    }
+} else {
+    # 8.4+. More complex way of handling the hex conversion.
+    proc ::ncgi::DecodeHex {hex} {
+	return [binary format H* $hex]
+    }
+}
+
+proc ::ncgi::decode {str} {
+    # rewrite "+" back to space
+    # protect \ from quoting another '\'
+    set str [string map [list + { } "\\" "\\\\" \[ \\\[ \] \\\]] $str]
+
+    # prepare to process all %-escapes
+    regsub -all -nocase -- {%([E][A-F0-9])%([89AB][A-F0-9])%([89AB][A-F0-9])} \
+	$str {[encoding convertfrom utf-8 [DecodeHex \1\2\3]]} str
+    regsub -all -nocase -- {%([CDcd][A-F0-9])%([89AB][A-F0-9])} \
+	$str {[encoding convertfrom utf-8 [DecodeHex \1\2]]} str
+    regsub -all -nocase -- {%([A-F0-9][A-F0-9])} $str {\\u00\1} str
+
+    # process \u unicode mapped chars
+    return [subst -novar $str]
+}
+
+# ::ncgi::encode
+#
+#	This encodes data in www-url-encoded format.
+#
+# Arguments:
+#	A string
+#
+# Results:
+#	The encoded value
+
+proc ::ncgi::encode {string} {
+    variable map
+
+    # 1 leave alphanumerics characters alone
+    # 2 Convert every other character to an array lookup
+    # 3 Escape constructs that are "special" to the tcl parser
+    # 4 "subst" the result, doing all the array substitutions
+
+    regsub -all -- \[^a-zA-Z0-9\] $string {$map(&)} string
+    # This quotes cases like $map([) or $map($) => $map(\[) ...
+    regsub -all -- {[][{})\\]\)} $string {\\&} string
+    return [subst -nocommand $string]
+}
+
+# ::ncgi::names
+#
+#	This parses the query data and returns a list of the names found therein.
+#
+# 	Note: If you use ncgi::setValue or ncgi::setDefaultValue, this
+#	names procedure doesn't see the effect of that.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	A list of names
+
+proc ::ncgi::names {} {
+    array set names {}
+    foreach {name val} [nvlist] {
+        if {![string equal $name "anonymous"]} {
+            set names($name) 1
+        }
+    }
+    return [array names names]
+}
+
+# ::ncgi::nvlist
+#
+#	This parses the query data and returns it as a name, value list
+#
+# 	Note: If you use ncgi::setValue or ncgi::setDefaultValue, this
+#	nvlist procedure doesn't see the effect of that.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	An alternating list of names and values
+
+proc ::ncgi::nvlist {} {
+    set query [query]
+    set type  [type]
+    switch -glob -- $type {
+	"" -
+	text/xml* -
+	application/x-www-form-urlencoded* -
+	application/x-www-urlencoded* {
+	    set result {}
+
+	    # Any whitespace at the beginning or end of urlencoded data is not
+	    # considered to be part of that data, so we trim it off.  One special
+	    # case in which post data is preceded by a \n occurs when posting
+	    # with HTTPS in Netscape.
+
+	    foreach {x} [split [string trim $query] &] {
+		# Turns out you might not get an = sign,
+		# especially with <isindex> forms.
+
+		set pos [string first = $x]
+		set len [string length $x]
+
+		if { $pos>=0 } {
+		    if { $pos == 0 } { # if the = is at the beginning ...
+		        if { $len>1 } { 
+                            # ... and there is something to the right ...
+		            set varname anonymous
+		            set val [string range $x 1 end]
+		        } else { 
+                            # ... otherwise, all we have is an =
+		            set varname anonymous
+		            set val ""
+		        }
+		    } elseif { $pos==[expr {$len-1}] } { 
+                        # if the = is at the end ...
+		        set varname [string range $x 0 [expr {$pos-1}]]
+			set val ""
+		    } else {
+		        set varname [string range $x 0 [expr {$pos-1}]]
+		        set val [string range $x [expr {$pos+1}] end]
+		    }
+		} else { # no = was found ...
+		    set varname anonymous
+		    set val $x
+		}		
+		lappend result [decode $varname] [decode $val]
+	    }
+	    return $result
+	}
+	multipart/* {
+	    return [multipart $type $query]
+	}
+	default {
+	    return -code error "Unknown Content-Type: $type"
+	}
+    }
+}
+
+# ::ncgi::parse
+#
+#	The parses the query data and stores it into an array for later retrieval.
+#	You should use the ncgi::value or ncgi::valueList procedures to get those
+#	values, or you are allowed to access the ncgi::value array directly.
+#
+#	Note - all values have a level of list structure associated with them
+#	to allow for multiple values for a given form element (e.g., a checkbox)
+#
+# Arguments:
+#	none
+#
+# Results:
+#	A list of names of the query values
+
+proc ::ncgi::parse {} {
+    variable value
+    variable listRestrict 0
+    variable varlist {}
+    if {[info exists value]} {
+	unset value
+    }
+    foreach {name val} [nvlist] {
+	if {![info exists value($name)]} {
+	    lappend varlist $name
+	}
+	lappend value($name) $val
+    }
+    return $varlist
+} 
+
+# ::ncgi::input
+#
+#	Like ncgi::parse, but with Don Libes cgi.tcl semantics.
+#	Form elements must have a trailing "List" in their name to be
+#	listified, otherwise this raises errors if an element appears twice.
+#
+# Arguments:
+#	fakeinput	See ncgi::reset
+#	fakecookie	The raw cookie string to use when testing.
+#
+# Results:
+#	The list of element names in the form
+
+proc ::ncgi::input {{fakeinput {}} {fakecookie {}}} {
+    variable value
+    variable varlist {}
+    variable listRestrict 1
+    if {[info exists value]} {
+	unset value
+    }
+    if {[string length $fakeinput]} {
+	ncgi::reset $fakeinput
+    }
+    foreach {name val} [nvlist] {
+	set exists [info exists value($name)]
+	if {!$exists} {
+	    lappend varlist $name
+	}
+	if {[string match "*List" $name]} {
+	    # Accumulate a list of values for this name
+	    lappend value($name) $val
+	} elseif {$exists} {
+	    error "Multiple definitions of $name encountered in input.\
+	    If you're trying to do this intentionally (such as with select),\
+	    the variable must have a \"List\" suffix."
+	} else {
+	    # Capture value with no list structure
+	    set value($name) $val
+	}
+    }
+    return $varlist
+} 
+
+# ::ncgi::value
+#
+#	Return the value of a named query element, or the empty string if
+#	it was not not specified.  This only returns the first value of
+#	associated with the name.  If you want them all (like all values
+#	of a checkbox), use ncgi::valueList
+#
+# Arguments:
+#	key	The name of the query element
+#	default	The value to return if the value is not present
+#
+# Results:
+#	The first value of the named element, or the default
+
+proc ::ncgi::value {key {default {}}} {
+    variable value
+    variable listRestrict
+    variable contenttype
+    if {[info exists value($key)]} {
+	if {$listRestrict} {
+
+	    # ::ncgi::input was called, and it already figured out if the
+	    # user wants list structure or not.
+
+	    set val $value($key)
+	} else {
+
+	    # Undo the level of list structure done by ncgi::parse
+
+	    set val [lindex $value($key) 0]
+	}
+	if {[string match multipart/* [type]]} {
+
+	    # Drop the meta-data information associated with each part
+
+	    set val [lindex $val 1]
+	}
+	return $val
+    } else {
+	return $default
+    }
+}
+
+# ::ncgi::valueList
+#
+#	Return all the values of a named query element as a list, or
+#	the empty list if it was not not specified.  This always returns
+#	lists - if you do not want the extra level of listification, use
+#	ncgi::value instead.
+#
+# Arguments:
+#	key	The name of the query element
+#
+# Results:
+#	The first value of the named element, or ""
+
+proc ::ncgi::valueList {key {default {}}} {
+    variable value
+    if {[info exists value($key)]} {
+	return $value($key)
+    } else {
+	return $default
+    }
+}
+
+# ::ncgi::setValue
+#
+#	Jam a new value into the CGI environment.  This is handy for preliminary
+#	processing that does data validation and cleanup.
+#
+# Arguments:
+#	key	The name of the query element
+#	value	This is a single value, and this procedure wraps it up in a list
+#		for compatibility with the ncgi::value array usage.  If you
+#		want a list of values, use ngci::setValueList
+#		
+#
+# Side Effects:
+#	Alters the ncgi::value and possibly the ncgi::valueList variables
+
+proc ::ncgi::setValue {key value} {
+    variable listRestrict
+    if {$listRestrict} {
+	ncgi::setValueList $key $value
+    } else {
+	ncgi::setValueList $key [list $value]
+    }
+}
+
+# ::ncgi::setValueList
+#
+#	Jam a list of new values into the CGI environment.
+#
+# Arguments:
+#	key		The name of the query element
+#	valuelist	This is a list of values, e.g., for checkbox or multiple
+#			selections sets.
+#		
+# Side Effects:
+#	Alters the ncgi::value and possibly the ncgi::valueList variables
+
+proc ::ncgi::setValueList {key valuelist} {
+    variable value
+    variable varlist
+    if {![info exists value($key)]} {
+	lappend varlist $key
+    }
+
+    # This if statement is a workaround for another hack in
+    # ::ncgi::value that treats multipart form data
+    # differently.
+    if {[string match multipart/* [type]]} {
+	set value($key) [list [list {} [join $valuelist]]]
+    } else {
+	set value($key) $valuelist
+    }
+    return ""
+}
+
+# ::ncgi::setDefaultValue
+#
+#	Set a new value into the CGI environment if there is not already one there.
+#
+# Arguments:
+#	key	The name of the query element
+#	value	This is a single value, and this procedure wraps it up in a list
+#		for compatibility with the ncgi::value array usage.
+#		
+#
+# Side Effects:
+#	Alters the ncgi::value and possibly the ncgi::valueList variables
+
+proc ::ncgi::setDefaultValue {key value} {
+    ncgi::setDefaultValueList $key [list $value]
+}
+
+# ::ncgi::setDefaultValueList
+#
+#	Jam a list of new values into the CGI environment if the CGI value
+#	is not already defined.
+#
+# Arguments:
+#	key		The name of the query element
+#	valuelist	This is a list of values, e.g., for checkbox or multiple
+#			selections sets.
+#		
+# Side Effects:
+#	Alters the ncgi::value and possibly the ncgi::valueList variables
+
+proc ::ncgi::setDefaultValueList {key valuelist} {
+    variable value
+    if {![info exists value($key)]} {
+	ncgi::setValueList $key $valuelist
+	return ""
+    } else {
+	return ""
+    }
+}
+
+# ::ncgi::exists --
+#
+#	Return false if the CGI variable doesn't exist.
+#
+# Arguments:
+#	name	Name of the CGI variable
+#
+# Results:
+#	0 if the variable doesn't exist
+
+proc ::ncgi::exists {var} {
+    variable value
+    return [info exists value($var)]
+}
+
+# ::ncgi::empty --
+#
+#	Return true if the CGI variable doesn't exist or is an empty string
+#
+# Arguments:
+#	name	Name of the CGI variable
+#
+# Results:
+#	1 if the variable doesn't exist or has the empty value
+
+proc ::ncgi::empty {name} {
+    return [expr {[string length [string trim [value $name]]] == 0}]
+}
+
+# ::ncgi::import
+#
+#	Map a CGI input into a Tcl variable.  This creates a Tcl variable in
+#	the callers scope that has the value of the CGI input.  An alternate
+#	name for the Tcl variable can be specified.
+#
+# Arguments:
+#	cginame		The name of the form element
+#	tclname		If present, an alternate name for the Tcl variable,
+#			otherwise it is the same as the form element name
+
+proc ::ncgi::import {cginame {tclname {}}} {
+    if {[string length $tclname]} {
+	upvar 1 $tclname var
+    } else {
+	upvar 1 $cginame var
+    }
+    set var [value $cginame]
+}
+
+# ::ncgi::importAll
+#
+#	Map a CGI input into a Tcl variable.  This creates a Tcl variable in
+#	the callers scope for every CGI value, or just for those named values.
+#
+# Arguments:
+#	args	A list of form element names.  If this is empty,
+#		then all form value are imported.
+
+proc ::ncgi::importAll {args} {
+    variable varlist
+    if {[llength $args] == 0} {
+	set args $varlist
+    }
+    foreach cginame $args {
+	upvar 1 $cginame var
+	set var [value $cginame]
+    }
+}
+
+# ::ncgi::redirect
+#
+#	Generate a redirect by returning a header that has a Location: field.
+#	If the URL is not absolute, this automatically qualifies it to
+#	the current server
+#
+# Arguments:
+#	url		The url to which to redirect
+#
+# Side Effects:
+#	Outputs a redirect header
+
+proc ::ncgi::redirect {url} {
+    global env
+
+    if {![regexp -- {^[^:]+://} $url]} {
+
+	# The url is relative (no protocol/server spec in it), so
+	# here we create a canonical URL.
+
+	# request_uri	The current URL used when dealing with relative URLs.  
+	# proto		http or https
+	# server 	The server, which we are careful to match with the
+	#		current one in base Basic Authentication is being used.
+	# port		This is set if it is not the default port.
+
+	if {[info exists env(REQUEST_URI)]} {
+	    # Not all servers have the leading protocol spec
+	    #regsub -- {^https?://[^/]*/} $env(REQUEST_URI) / request_uri
+	    array set u [uri::split $env(REQUEST_URI)]
+	    set request_uri /$u(path)
+	    unset u
+	} elseif {[info exists env(SCRIPT_NAME)]} {
+	    set request_uri $env(SCRIPT_NAME)
+	} else {
+	    set request_uri /
+	}
+
+	set port ""
+	if {[info exists env(HTTPS)] && $env(HTTPS) == "on"} {
+	    set proto https
+	    if {$env(SERVER_PORT) != 443} {
+		set port :$env(SERVER_PORT)
+	    }
+	} else {
+	    set proto http
+	    if {$env(SERVER_PORT) != 80} {
+		set port :$env(SERVER_PORT)
+	    }
+	}
+	# Pick the server from REQUEST_URI so it matches the current
+	# URL.  Otherwise use SERVER_NAME.  These could be different, e.g.,
+	# "pop.scriptics.com" vs. "pop"
+
+	if {[info exists env(REQUEST_URI)]} {
+	    # Not all servers have the leading protocol spec
+	    if {![regexp -- {^https?://([^/:]*)} $env(REQUEST_URI) x server]} {
+		set server $env(SERVER_NAME)
+	    }
+	} else {
+	    set server $env(SERVER_NAME)
+	}
+	if {[string match /* $url]} {
+	    set url $proto://$server$port$url
+	} else {
+	    regexp -- {^(.*/)[^/]*$} $request_uri match dirname
+	    set url $proto://$server$port$dirname$url
+	}
+    }
+    ncgi::header text/html Location $url
+    puts "Please go to <a href=\"$url\">$url</a>"
+}
+
+# ncgi:header
+#
+#	Output the Content-Type header.
+#
+# Arguments:
+#	type	The MIME content type
+#	args	Additional name, value pairs to specifiy output headers
+#
+# Side Effects:
+#	Outputs a normal header
+
+proc ::ncgi::header {{type text/html} args} {
+    variable cookieOutput
+    puts "Content-Type: $type"
+    foreach {n v} $args {
+	puts "$n: $v"
+    }
+    if {[info exists cookieOutput]} {
+	foreach line $cookieOutput {
+	    puts "Set-Cookie: $line"
+	}
+    }
+    puts ""
+    flush stdout
+}
+
+# ::ncgi::parseMimeValue
+#
+#	Parse a MIME header value, which has the form
+#	value; param=value; param2="value2"; param3='value3'
+#
+# Arguments:
+#	value	The mime header value.  This does not include the mime
+#		header field name, but everything after it.
+#
+# Results:
+#	A two-element list, the first is the primary value,
+#	the second is in turn a name-value list corresponding to the
+#	parameters.  Given the above example, the return value is
+#	{
+#		value
+#		{param value param2 value2 param3 value3}
+#	}
+
+proc ::ncgi::parseMimeValue {value} {
+    set parts [split $value \;]
+    set results [list [string trim [lindex $parts 0]]]
+    set paramList [list]
+    foreach sub [lrange $parts 1 end] {
+	if {[regexp -- {([^=]+)=(.+)} $sub match key val]} {
+            set key [string trim [string tolower $key]]
+            set val [string trim $val]
+            # Allow single as well as double quotes
+            if {[regexp -- {^(['"])(.*)\1} $val x quote val2]} { ; # need a " for balance
+               # Trim quotes and any extra crap after close quote
+               # remove quoted quotation marks
+               set val [string map {\\" "\"" \\' "\'"} $val2]
+            }
+            lappend paramList $key $val
+	}
+    }
+    if {[llength $paramList]} {
+	lappend results $paramList
+    }
+    return $results
+}
+
+# ::ncgi::multipart
+#
+#	This parses multipart form data.
+#	Based on work by Steve Ball for TclHttpd, but re-written to use
+#	string first with an offset to iterate through the data instead
+#	of using a regsub/subst combo.
+#
+# Arguments:
+#	type	The Content-Type, because we need boundary options
+#	query	The raw multipart query data
+#
+# Results:
+#	An alternating list of names and values
+#	In this case, the value is a two element list:
+#		headers, which in turn is a list names and values
+#		content, which is the main value of the element
+#	The header name/value pairs come primarily from the MIME headers
+#	like Content-Type that appear in each part.  However, the
+#	Content-Disposition header is handled specially.  It has several
+#	parameters like "name" and "filename" that are important, so they
+#	are promoted to to the same level as Content-Type.  Otherwise,
+#	if a header like Content-Type has parameters, they appear as a list
+#	after the primary value of the header.  For example, if the
+#	part has these two headers:
+#
+#	Content-Disposition: form-data; name="Foo"; filename="/a/b/C.txt"
+#	Content-Type: text/html; charset="iso-8859-1"; mumble='extra'
+#	
+#	Then the header list will have this structure:
+#	{
+#		content-disposition form-data
+#		name Foo
+#		filename /a/b/C.txt
+#		content-type {text/html {charset iso-8859-1 mumble extra}}
+#	}
+#	Note that the header names are mapped to all lowercase.  You can
+#	use "array set" on the header list to easily find things like the
+#	filename or content-type.  You should always use [lindex $value 0]
+#	to account for values that have parameters, like the content-type
+#	example above.  Finally, not that if the value has a second element,
+#	which are the parameters, you can "array set" that as well.
+#	
+proc ::ncgi::multipart {type query} {
+
+    set parsedType [parseMimeValue $type]
+    if {![string match multipart/* [lindex $parsedType 0]]} {
+	return -code error "Not a multipart Content-Type: [lindex $parsedType 0]"
+    }
+    array set options [lindex $parsedType 1]
+    if {![info exists options(boundary)]} {
+	return -code error "No boundary given for multipart document"
+    }
+    set boundary $options(boundary)
+
+    # The query data is typically read in binary mode, which preserves
+    # the \r\n sequence from a Windows-based browser.
+    # Also, binary data may contain \r\n sequences.
+
+    if {[string match "*$boundary\r\n*" $query]} {
+        set lineDelim "\r\n"
+	#	puts "DELIM"
+    } else {
+        set lineDelim "\n"
+	#	puts "NO"
+    }
+
+    # Iterate over the boundary string and chop into parts
+
+    set len [string length $query]
+    # [string length $lineDelim]+2 is for "$lineDelim--"
+    set blen [expr {[string length $lineDelim] + 2 + \
+            [string length $boundary]}]
+    set first 1
+    set results [list]
+    set offset 0
+
+    # Ensuring the query data starts
+    # with a newline makes the string first test simpler
+    if {[string first $lineDelim $query 0]!=0} {
+        set query $lineDelim$query
+    }
+    while {[set offset [string first $lineDelim--$boundary $query $offset]] \
+            >= 0} {
+	if {!$first} {
+	    lappend results $formName [list $headers \
+		[string range $query $off2 [expr {$offset -1}]]]
+	} else {
+	    set first 0
+	}
+	incr offset $blen
+
+	# Check for the ending boundary, which is signaled by --$boundary--
+
+	if {[string equal "--" \
+		[string range $query $offset [expr {$offset + 1}]]]} {
+	    break
+	}
+
+	# Split headers out from content
+	# The headers become a nested list structure:
+	#	{header-name {
+	#		value {
+	#			paramname paramvalue ... }
+	#		}
+	#	}
+
+        set off2 [string first "$lineDelim$lineDelim" $query $offset]
+	set headers [list]
+	set formName ""
+        foreach line [split [string range $query $offset $off2] $lineDelim] {
+	    if {[regexp -- {([^:	 ]+):(.*)$} $line x hdrname value]} {
+		set hdrname [string tolower $hdrname]
+		set valueList [parseMimeValue $value]
+		if {[string equal $hdrname "content-disposition"]} {
+
+		    # Promote Conent-Disposition parameters up to headers,
+		    # and look for the "name" that identifies the form element
+
+		    lappend headers $hdrname [lindex $valueList 0]
+		    foreach {n v} [lindex $valueList 1] {
+			lappend headers $n $v
+			if {[string equal $n "name"]} {
+			    set formName $v
+			}
+		    }
+		} else {
+		    lappend headers $hdrname $valueList
+		}
+	    }
+	}
+
+	if {$off2 > 0} {
+            # +[string length "$lineDelim$lineDelim"] for the
+            # $lineDelim$lineDelim
+            incr off2 [string length "$lineDelim$lineDelim"]
+	    set offset $off2
+	} else {
+	    break
+	}
+    }
+    return $results
+}
+
+# ::ncgi::importFile --
+#
+#   get information about a file upload field
+#
+# Arguments:
+#   cmd         one of '-server' '-client' '-type' '-data'
+#   var         cgi variable name for the file field
+#   filename    filename to write to for -server
+# Results:
+#   -server returns the name of the file on the server: side effect
+#      is that the file gets stored on the server and the 
+#      script is responsible for deleting/moving the file
+#   -client returns the name of the file sent from the client 
+#   -type   returns the mime type of the file
+#   -data   returns the contents of the file 
+
+proc ::ncgi::importFile {cmd var {filename {}}} {
+
+    set vlist [valueList $var]
+
+    array set fileinfo [lindex [lindex $vlist 0] 0]
+    set contents [lindex [lindex $vlist 0] 1]
+
+    switch -exact -- $cmd {
+	-server {
+	    ## take care not to write it out more than once
+	    variable _tmpfiles
+	    if {![info exists _tmpfiles($var)]} {
+		if {$filename != {}} {
+		    ## use supplied filename 
+		    set _tmpfiles($var) $filename
+		} else {
+		    ## create a tmp file 
+		    set _tmpfiles($var) [::fileutil::tempfile ncgi]
+		}
+
+		# write out the data only if it's not been done already
+		if {[catch {open $_tmpfiles($var) w} h]} {
+		    error "Can't open temporary file in ncgi::importFile ($h)"
+		} 
+
+		fconfigure $h -translation binary -encoding binary
+		puts -nonewline $h $contents 
+		close $h
+	    }
+	    return $_tmpfiles($var)
+	}
+	-client {
+	    if {![info exists fileinfo(filename)]} {return {}}
+	    return $fileinfo(filename)
+	}
+	-type {
+	    if {![info exists fileinfo(content-type)]} {return {}}
+	    return $fileinfo(content-type)
+	}
+	-data {
+	    return $contents
+	}
+	default {
+	    error "Unknown subcommand to ncgi::import_file: $cmd"
+	}
+    }
+}
+
+
+# ::ncgi::cookie
+#
+#	Return a *list* of cookie values, if present, else ""
+#	It is possible for multiple cookies with the same key
+#	to be present, so we return a list.
+#
+# Arguments:
+#	cookie	The name of the cookie (the key)
+#
+# Results:
+#	A list of values for the cookie
+
+proc ::ncgi::cookie {cookie} {
+    global env
+    set result ""
+    if {[info exists env(HTTP_COOKIE)]} {
+	foreach pair [split $env(HTTP_COOKIE) \;] {
+	    foreach {key value} [split [string trim $pair] =] { break ;# lassign }
+	    if {[string compare $cookie $key] == 0} {
+		lappend result $value
+	    }
+	}
+    }
+    return $result
+}
+
+# ::ncgi::setCookie
+#
+#	Set a return cookie.  You must call this before you call
+#	ncgi::header or ncgi::redirect
+#
+# Arguments:
+#	args	Name value pairs, where the names are:
+#		-name	Cookie name
+#		-value	Cookie value
+#		-path	Path restriction
+#		-domain	domain restriction
+#		-expires	Time restriction
+#
+# Side Effects:
+#	Formats and stores the Set-Cookie header for the reply.
+
+proc ::ncgi::setCookie {args} {
+    variable cookieOutput
+    array set opt $args
+    set line "$opt(-name)=$opt(-value) ;"
+    foreach extra {path domain} {
+	if {[info exists opt(-$extra)]} {
+	    append line " $extra=$opt(-$extra) ;"
+	}
+    }
+    if {[info exists opt(-expires)]} {
+	switch -glob -- $opt(-expires) {
+	    *GMT {
+		set expires $opt(-expires)
+	    }
+	    default {
+		set expires [clock format [clock scan $opt(-expires)] \
+			-format "%A, %d-%b-%Y %H:%M:%S GMT" -gmt 1]
+	    }
+	}
+	append line " expires=$expires ;"
+    }
+    if {[info exists opt(-secure)]} {
+	append line " secure "
+    }
+    lappend cookieOutput $line
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ncgi/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ncgi/pkgIndex.tcl
new file mode 100644
index 00000000..ce2b34d6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ncgi/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded ncgi 1.4.4 [list source [file join $dir ncgi.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nettool/nettool.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nettool/nettool.tcl
new file mode 100644
index 00000000..e63485e3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nettool/nettool.tcl
@@ -0,0 +1,1814 @@
+###
+# Amalgamated package for nettool
+# Do not edit directly, tweak the source in src/ and rerun
+# build.tcl
+###
+package require Tcl 8.5
+package provide nettool 0.5.2
+namespace eval ::nettool {}
+set ::nettool::version 0.5.2
+
+###
+# START: core.tcl
+###
+# @mdgen OWNER: generic.tcl
+# @mdgen OWNER: available_ports.tcl
+# @mdgen OWNER: locateport.tcl
+# @mdgen OWNER: platform_unix_linux.tcl
+# @mdgen OWNER: platform_unix_macosx.tcl
+# @mdgen OWNER: platform_unix.tcl
+# @mdgen OWNER: platform_windows.tcl
+
+
+package require platform
+# Uses the "ip" package from tcllib
+package require ip
+
+if {[info commands ::ladd] eq {}} {
+  proc ::ladd {varname args} {
+    upvar 1 $varname var
+    if ![info exists var] {
+        set var {}
+    }
+    foreach item $args {
+      if {$item in $var} continue
+      lappend var $item
+    }
+    return $var
+  }
+}
+if {[info commands ::get] eq {}} {
+  proc ::get varname {
+    upvar 1 $varname var
+    if {[info exists var]} {
+      return [set var]
+    }
+    return {}
+  }
+}
+if {[info commands ::cat] eq {}} {
+  proc ::cat filename {
+    set fin [open $filename r]
+    set dat [read $fin]
+    close $fin
+    return $dat
+  }
+}
+
+
+set here [file dirname [file normalize [info script]]]
+
+::namespace eval ::nettool {}
+
+set genus [lindex [split [::platform::generic] -] 0]
+dict set ::nettool::platform tcl_os  $::tcl_platform(os)
+dict set ::nettool::platform odie_class   $::tcl_platform(platform)
+dict set ::nettool::platform odie_genus   $genus
+dict set ::nettool::platform odie_target  [::platform::generic]
+dict set ::nettool::platform odie_species [::platform::identify]
+
+
+
+###
+# END: core.tcl
+###
+###
+# START: generic.tcl
+###
+::namespace eval ::nettool {}
+
+###
+# topic: 825cd25953c2cc896a96006b7f454e00
+# title: Return pairings of MAC numbers to IP addresses on the local network
+###
+proc ::nettool::arp_table {} {}
+
+###
+# topic: 92ebbfa155883ad41c37d3f843392be4
+# title: Return list of broadcast addresses for local networks
+###
+proc ::nettool::broadcast_list {} {
+  return 127.0.0.1
+}
+
+###
+# topic: 15d9bc96ec6ce31d4c8f99a425a9c02c
+# description: Return Processor utilization
+###
+proc ::nettool::busy {} {}
+
+###
+# topic: 187cfa1827097c5cdf1c40c656cedfcc
+# description: Return time since booted
+###
+proc ::nettool::cpuinfo {} {}
+
+###
+# Clear discovered info
+###
+proc ::nettool::discover {} {
+  unset -nocomplain ::nettool::ipinfo ::nettool::macinfo
+}
+
+###
+# topic: 58295f2544f43827e855d09dc3ee625a
+###
+proc ::nettool::diskless_client {} {
+  return 0
+}
+
+###
+# topic: 57fdc331bc60c7bf2bd3f3214e9a906f
+###
+proc ::nettool::hwaddr_to_ipaddr {hwaddr args} {}
+
+###
+# topic: dd2e2c0810cea69909399808f2a68949
+# title: Return a list of unique hardware ids
+###
+proc ::nettool::hwid_list {} {
+  set result {}
+  foreach mac [::nettool::mac_list] {
+    lappend result 0x[string map {: {}} $mac]
+  }
+  if {[llength $result]} {
+    return $result
+  }
+  return 0x010203040506
+}
+
+###
+# topic: 4b87d977492bd10802bfc0327cd07ac2
+# title: Return list of network interfaces
+###
+proc ::nettool::if_list {} {}
+
+###
+# topic: d2932eb0ea8cc9f6a865c1ab7cdd4572
+# description:
+#    Called on package load to build any static
+#    structures to cache data that would be time
+#    consuming to call on the fly
+###
+proc ::nettool::init {} {}
+
+###
+# topic: 417672d3f31b80d749588365af88baf6
+# title: Return list of ip addresses for this computer (primary first)
+###
+proc ::nettool::ip_list {} {}
+
+###
+# topic: ac9d6815d47f60d45930f0c8c8ae8f16
+# title: Return list of mac numbers for this computer (primary first)
+###
+proc ::nettool::mac_list {} {}
+
+###
+# topic: c42343f20e3afd2884a5dd1c219e4415
+###
+proc ::nettool::platform {} {
+  variable platform
+  return $platform
+}
+
+proc ::nettool::user_data_root {appname} {
+  return [file join $::env(HOME) .$appname]
+}
+
+###
+# END: generic.tcl
+###
+###
+# START: available_ports.tcl
+###
+###
+# topic: 868a79cedf28924191fd86aa85f6dd1d
+###
+namespace eval ::nettool {
+  set blocks {}
+}
+
+lappend ::nettool::blocks 1028 1028
+lappend ::nettool::blocks 1067 1068
+lappend ::nettool::blocks 1109 1109
+lappend ::nettool::blocks 1138 1138
+lappend ::nettool::blocks 1313 1313
+lappend ::nettool::blocks 1382 1382
+lappend ::nettool::blocks 1385 1385
+lappend ::nettool::blocks 1416 1416
+lappend ::nettool::blocks 1454 1454
+lappend ::nettool::blocks 1461 1461
+lappend ::nettool::blocks 1464 1464
+lappend ::nettool::blocks 1486 1486
+lappend ::nettool::blocks 1491 1491
+lappend ::nettool::blocks 1493 1493
+lappend ::nettool::blocks 1528 1528
+lappend ::nettool::blocks 1556 1556
+lappend ::nettool::blocks 1587 1587
+lappend ::nettool::blocks 1651 1651
+lappend ::nettool::blocks 1783 1783
+lappend ::nettool::blocks 1895 1895
+lappend ::nettool::blocks 2083 2083
+lappend ::nettool::blocks 2194 2196
+lappend ::nettool::blocks 2222 2222
+lappend ::nettool::blocks 2259 2259
+lappend ::nettool::blocks 2340 2340
+lappend ::nettool::blocks 2346 2349
+lappend ::nettool::blocks 2369 2369
+lappend ::nettool::blocks 2377 2378
+lappend ::nettool::blocks 2395 2395
+lappend ::nettool::blocks 2426 2426
+lappend ::nettool::blocks 2446 2446
+lappend ::nettool::blocks 2528 2528
+lappend ::nettool::blocks 2640 2640
+lappend ::nettool::blocks 2654 2654
+lappend ::nettool::blocks 2682 2682
+lappend ::nettool::blocks 2693 2693
+lappend ::nettool::blocks 2794 2794
+lappend ::nettool::blocks 2825 2825
+lappend ::nettool::blocks 2873 2873
+lappend ::nettool::blocks 2916 2917
+lappend ::nettool::blocks 2925 2925
+lappend ::nettool::blocks 3014 3014
+lappend ::nettool::blocks 3016 3019
+lappend ::nettool::blocks 3024 3024
+lappend ::nettool::blocks 3027 3029
+lappend ::nettool::blocks 3050 3050
+lappend ::nettool::blocks 3080 3080
+lappend ::nettool::blocks 3092 3092
+lappend ::nettool::blocks 3126 3126
+lappend ::nettool::blocks 3300 3301
+lappend ::nettool::blocks 3396 3396
+lappend ::nettool::blocks 3403 3404
+lappend ::nettool::blocks 3546 3546
+lappend ::nettool::blocks 3693 3694
+lappend ::nettool::blocks 3876 3876
+lappend ::nettool::blocks 3900 3900
+lappend ::nettool::blocks 3938 3938
+lappend ::nettool::blocks 3970 3970
+lappend ::nettool::blocks 3986 3986
+lappend ::nettool::blocks 3994 3994
+lappend ::nettool::blocks 4000 4000
+lappend ::nettool::blocks 4048 4048
+lappend ::nettool::blocks 4060 4060
+lappend ::nettool::blocks 4065 4065
+lappend ::nettool::blocks 4120 4120
+lappend ::nettool::blocks 4132 4133
+lappend ::nettool::blocks 4140 4140
+lappend ::nettool::blocks 4144 4144
+lappend ::nettool::blocks 4151 4152
+lappend ::nettool::blocks 4184 4184
+lappend ::nettool::blocks 4194 4198
+lappend ::nettool::blocks 4315 4315
+lappend ::nettool::blocks 4317 4319
+lappend ::nettool::blocks 4332 4332
+lappend ::nettool::blocks 4334 4339
+lappend ::nettool::blocks 4363 4367
+lappend ::nettool::blocks 4370 4370
+lappend ::nettool::blocks 4380 4388
+lappend ::nettool::blocks 4397 4399
+lappend ::nettool::blocks 4412 4424
+lappend ::nettool::blocks 4434 4440
+lappend ::nettool::blocks 4459 4483
+lappend ::nettool::blocks 4489 4499
+lappend ::nettool::blocks 4501 4501
+lappend ::nettool::blocks 4503 4533
+lappend ::nettool::blocks 4539 4544
+lappend ::nettool::blocks 4560 4562
+lappend ::nettool::blocks 4564 4565
+lappend ::nettool::blocks 4569 4569
+lappend ::nettool::blocks 4571 4589
+lappend ::nettool::blocks 4606 4657
+lappend ::nettool::blocks 4693 4699
+lappend ::nettool::blocks 4705 4724
+lappend ::nettool::blocks 4734 4736
+lappend ::nettool::blocks 4746 4746
+lappend ::nettool::blocks 4748 4748
+lappend ::nettool::blocks 4754 4783
+lappend ::nettool::blocks 4792 4799
+lappend ::nettool::blocks 4805 4826
+lappend ::nettool::blocks 4828 4836
+lappend ::nettool::blocks 4846 4846
+lappend ::nettool::blocks 4852 4866
+lappend ::nettool::blocks 4872 4875
+lappend ::nettool::blocks 4886 4893
+lappend ::nettool::blocks 4895 4898
+lappend ::nettool::blocks 4903 4911
+lappend ::nettool::blocks 4916 4935
+lappend ::nettool::blocks 4938 4939
+lappend ::nettool::blocks 4943 4948
+lappend ::nettool::blocks 4954 4968
+lappend ::nettool::blocks 4971 4983
+lappend ::nettool::blocks 4992 4998
+lappend ::nettool::blocks 5016 5019
+lappend ::nettool::blocks 5033 5041
+lappend ::nettool::blocks 5076 5077
+lappend ::nettool::blocks 5088 5089
+lappend ::nettool::blocks 5095 5098
+lappend ::nettool::blocks 5107 5110
+lappend ::nettool::blocks 5113 5113
+lappend ::nettool::blocks 5118 5119
+lappend ::nettool::blocks 5121 5132
+lappend ::nettool::blocks 5138 5145
+lappend ::nettool::blocks 5147 5149
+lappend ::nettool::blocks 5151 5151
+lappend ::nettool::blocks 5158 5160
+lappend ::nettool::blocks 5165 5165
+lappend ::nettool::blocks 5169 5171
+lappend ::nettool::blocks 5173 5189
+lappend ::nettool::blocks 5197 5199
+lappend ::nettool::blocks 5204 5208
+lappend ::nettool::blocks 5210 5214
+lappend ::nettool::blocks 5216 5220
+lappend ::nettool::blocks 5238 5244
+lappend ::nettool::blocks 5254 5263
+lappend ::nettool::blocks 5266 5268
+lappend ::nettool::blocks 5273 5279
+lappend ::nettool::blocks 5283 5297
+lappend ::nettool::blocks 5311 5311
+lappend ::nettool::blocks 5316 5316
+lappend ::nettool::blocks 5319 5319
+lappend ::nettool::blocks 5322 5342
+lappend ::nettool::blocks 5345 5348
+lappend ::nettool::blocks 5365 5396
+lappend ::nettool::blocks 5438 5442
+lappend ::nettool::blocks 5444 5444
+lappend ::nettool::blocks 5446 5452
+lappend ::nettool::blocks 5457 5460
+lappend ::nettool::blocks 5466 5499
+lappend ::nettool::blocks 5507 5552
+lappend ::nettool::blocks 5558 5565
+lappend ::nettool::blocks 5570 5572
+lappend ::nettool::blocks 5576 5578
+lappend ::nettool::blocks 5587 5596
+lappend ::nettool::blocks 5606 5617
+lappend ::nettool::blocks 5619 5626
+lappend ::nettool::blocks 5640 5645
+lappend ::nettool::blocks 5647 5669
+lappend ::nettool::blocks 5685 5686
+lappend ::nettool::blocks 5690 5692
+lappend ::nettool::blocks 5694 5695
+lappend ::nettool::blocks 5697 5712
+lappend ::nettool::blocks 5731 5740
+lappend ::nettool::blocks 5749 5749
+lappend ::nettool::blocks 5751 5754
+lappend ::nettool::blocks 5756 5756
+lappend ::nettool::blocks 5758 5765
+lappend ::nettool::blocks 5772 5776
+lappend ::nettool::blocks 5778 5779
+lappend ::nettool::blocks 5788 5792
+lappend ::nettool::blocks 5795 5812
+lappend ::nettool::blocks 5815 5840
+lappend ::nettool::blocks 5843 5858
+lappend ::nettool::blocks 5860 5862
+lappend ::nettool::blocks 5864 5867
+lappend ::nettool::blocks 5869 5882
+lappend ::nettool::blocks 5884 5899
+lappend ::nettool::blocks 5901 5909
+lappend ::nettool::blocks 5914 5962
+lappend ::nettool::blocks 5964 5967
+lappend ::nettool::blocks 5970 5983
+lappend ::nettool::blocks 5993 5998
+lappend ::nettool::blocks 6067 6067
+lappend ::nettool::blocks 6078 6080
+lappend ::nettool::blocks 6089 6098
+lappend ::nettool::blocks 6119 6120
+lappend ::nettool::blocks 6125 6129
+lappend ::nettool::blocks 6131 6132
+lappend ::nettool::blocks 6134 6139
+lappend ::nettool::blocks 6150 6158
+lappend ::nettool::blocks 6164 6199
+lappend ::nettool::blocks 6202 6221
+lappend ::nettool::blocks 6223 6240
+lappend ::nettool::blocks 6245 6250
+lappend ::nettool::blocks 6254 6266
+lappend ::nettool::blocks 6270 6299
+lappend ::nettool::blocks 6301 6305
+lappend ::nettool::blocks 6307 6314
+lappend ::nettool::blocks 6318 6319
+lappend ::nettool::blocks 6323 6323
+lappend ::nettool::blocks 6327 6342
+lappend ::nettool::blocks 6345 6345
+lappend ::nettool::blocks 6348 6349
+lappend ::nettool::blocks 6351 6354
+lappend ::nettool::blocks 6356 6359
+lappend ::nettool::blocks 6361 6362
+lappend ::nettool::blocks 6364 6369
+lappend ::nettool::blocks 6371 6381
+lappend ::nettool::blocks 6383 6388
+lappend ::nettool::blocks 6391 6399
+lappend ::nettool::blocks 6411 6416
+lappend ::nettool::blocks 6422 6431
+lappend ::nettool::blocks 6433 6441
+lappend ::nettool::blocks 6444 6445
+lappend ::nettool::blocks 6447 6454
+lappend ::nettool::blocks 6457 6470
+lappend ::nettool::blocks 6472 6479
+lappend ::nettool::blocks 6490 6499
+lappend ::nettool::blocks 6501 6508
+lappend ::nettool::blocks 6512 6512
+lappend ::nettool::blocks 6516 6542
+lappend ::nettool::blocks 6545 6546
+lappend ::nettool::blocks 6552 6557
+lappend ::nettool::blocks 6559 6565
+lappend ::nettool::blocks 6569 6578
+lappend ::nettool::blocks 6584 6599
+lappend ::nettool::blocks 6603 6618
+lappend ::nettool::blocks 6629 6631
+lappend ::nettool::blocks 6635 6639
+lappend ::nettool::blocks 6641 6652
+lappend ::nettool::blocks 6654 6654
+lappend ::nettool::blocks 6658 6664
+lappend ::nettool::blocks 6672 6677
+lappend ::nettool::blocks 6680 6686
+lappend ::nettool::blocks 6690 6695
+lappend ::nettool::blocks 6698 6700
+lappend ::nettool::blocks 6707 6713
+lappend ::nettool::blocks 6717 6766
+lappend ::nettool::blocks 6772 6776
+lappend ::nettool::blocks 6779 6783
+lappend ::nettool::blocks 6792 6800
+lappend ::nettool::blocks 6802 6816
+lappend ::nettool::blocks 6818 6830
+lappend ::nettool::blocks 6832 6840
+lappend ::nettool::blocks 6843 6849
+lappend ::nettool::blocks 6851 6867
+lappend ::nettool::blocks 6869 6887
+lappend ::nettool::blocks 6889 6900
+lappend ::nettool::blocks 6902 6934
+lappend ::nettool::blocks 6937 6945
+lappend ::nettool::blocks 6947 6950
+lappend ::nettool::blocks 6952 6960
+lappend ::nettool::blocks 6967 6968
+lappend ::nettool::blocks 6971 6996
+lappend ::nettool::blocks 7016 7017
+lappend ::nettool::blocks 7026 7029
+lappend ::nettool::blocks 7032 7039
+lappend ::nettool::blocks 7041 7069
+lappend ::nettool::blocks 7072 7072
+lappend ::nettool::blocks 7074 7079
+lappend ::nettool::blocks 7081 7094
+lappend ::nettool::blocks 7096 7098
+lappend ::nettool::blocks 7102 7106
+lappend ::nettool::blocks 7108 7120
+lappend ::nettool::blocks 7122 7127
+lappend ::nettool::blocks 7130 7160
+lappend ::nettool::blocks 7175 7180
+lappend ::nettool::blocks 7182 7199
+lappend ::nettool::blocks 7202 7226
+lappend ::nettool::blocks 7230 7234
+lappend ::nettool::blocks 7238 7261
+lappend ::nettool::blocks 7263 7271
+lappend ::nettool::blocks 7284 7299
+lappend ::nettool::blocks 7360 7364
+lappend ::nettool::blocks 7366 7390
+lappend ::nettool::blocks 7396 7396
+lappend ::nettool::blocks 7398 7399
+lappend ::nettool::blocks 7403 7409
+lappend ::nettool::blocks 7412 7420
+lappend ::nettool::blocks 7422 7425
+lappend ::nettool::blocks 7432 7436
+lappend ::nettool::blocks 7438 7442
+lappend ::nettool::blocks 7444 7470
+lappend ::nettool::blocks 7472 7472
+lappend ::nettool::blocks 7475 7490
+lappend ::nettool::blocks 7492 7499
+lappend ::nettool::blocks 7502 7507
+lappend ::nettool::blocks 7512 7541
+lappend ::nettool::blocks 7551 7559
+lappend ::nettool::blocks 7561 7562
+lappend ::nettool::blocks 7564 7565
+lappend ::nettool::blocks 7567 7568
+lappend ::nettool::blocks 7571 7573
+lappend ::nettool::blocks 7575 7587
+lappend ::nettool::blocks 7589 7623
+lappend ::nettool::blocks 7625 7625
+lappend ::nettool::blocks 7632 7632
+lappend ::nettool::blocks 7634 7647
+lappend ::nettool::blocks 7649 7671
+lappend ::nettool::blocks 7678 7679
+lappend ::nettool::blocks 7681 7688
+lappend ::nettool::blocks 7690 7696
+lappend ::nettool::blocks 7698 7699
+lappend ::nettool::blocks 7701 7706
+lappend ::nettool::blocks 7709 7719
+lappend ::nettool::blocks 7721 7723
+lappend ::nettool::blocks 7728 7733
+lappend ::nettool::blocks 7735 7737
+lappend ::nettool::blocks 7739 7740
+lappend ::nettool::blocks 7745 7746
+lappend ::nettool::blocks 7748 7776
+lappend ::nettool::blocks 7780 7780
+lappend ::nettool::blocks 7782 7785
+lappend ::nettool::blocks 7788 7788
+lappend ::nettool::blocks 7790 7793
+lappend ::nettool::blocks 7795 7796
+lappend ::nettool::blocks 7803 7809
+lappend ::nettool::blocks 7811 7844
+lappend ::nettool::blocks 7848 7868
+lappend ::nettool::blocks 7873 7877
+lappend ::nettool::blocks 7879 7879
+lappend ::nettool::blocks 7881 7886
+lappend ::nettool::blocks 7888 7899
+lappend ::nettool::blocks 7904 7912
+lappend ::nettool::blocks 7914 7931
+lappend ::nettool::blocks 7934 7961
+lappend ::nettool::blocks 7963 7966
+lappend ::nettool::blocks 7968 7978
+lappend ::nettool::blocks 7983 7996
+lappend ::nettool::blocks 8004 8004
+lappend ::nettool::blocks 8006 8007
+lappend ::nettool::blocks 8009 8018
+lappend ::nettool::blocks 8023 8024
+lappend ::nettool::blocks 8027 8031
+lappend ::nettool::blocks 8035 8039
+lappend ::nettool::blocks 8041 8041
+lappend ::nettool::blocks 8045 8050
+lappend ::nettool::blocks 8061 8065
+lappend ::nettool::blocks 8067 8073
+lappend ::nettool::blocks 8075 8079
+lappend ::nettool::blocks 8084 8085
+lappend ::nettool::blocks 8089 8090
+lappend ::nettool::blocks 8092 8096
+lappend ::nettool::blocks 8098 8099
+lappend ::nettool::blocks 8103 8114
+lappend ::nettool::blocks 8119 8120
+lappend ::nettool::blocks 8123 8127
+lappend ::nettool::blocks 8133 8139
+lappend ::nettool::blocks 8141 8147
+lappend ::nettool::blocks 8150 8152
+lappend ::nettool::blocks 8154 8159
+lappend ::nettool::blocks 8163 8180
+lappend ::nettool::blocks 8185 8190
+lappend ::nettool::blocks 8193 8193
+lappend ::nettool::blocks 8196 8198
+lappend ::nettool::blocks 8203 8203
+lappend ::nettool::blocks 8209 8229
+lappend ::nettool::blocks 8231 8242
+lappend ::nettool::blocks 8244 8275
+lappend ::nettool::blocks 8277 8279
+lappend ::nettool::blocks 8281 8291
+lappend ::nettool::blocks 8295 8299
+lappend ::nettool::blocks 8302 8312
+lappend ::nettool::blocks 8314 8319
+lappend ::nettool::blocks 8322 8350
+lappend ::nettool::blocks 8352 8375
+lappend ::nettool::blocks 8381 8382
+lappend ::nettool::blocks 8384 8399
+lappend ::nettool::blocks 8406 8414
+lappend ::nettool::blocks 8418 8441
+lappend ::nettool::blocks 8446 8449
+lappend ::nettool::blocks 8451 8456
+lappend ::nettool::blocks 8458 8469
+lappend ::nettool::blocks 8475 8499
+lappend ::nettool::blocks 8503 8553
+lappend ::nettool::blocks 8556 8566
+lappend ::nettool::blocks 8568 8599
+lappend ::nettool::blocks 8601 8608
+lappend ::nettool::blocks 8616 8664
+lappend ::nettool::blocks 8667 8674
+lappend ::nettool::blocks 8676 8685
+lappend ::nettool::blocks 8687 8687
+lappend ::nettool::blocks 8689 8698
+lappend ::nettool::blocks 8700 8710
+lappend ::nettool::blocks 8712 8731
+lappend ::nettool::blocks 8734 8749
+lappend ::nettool::blocks 8751 8762
+lappend ::nettool::blocks 8767 8769
+lappend ::nettool::blocks 8771 8777
+lappend ::nettool::blocks 8779 8785
+lappend ::nettool::blocks 8788 8792
+lappend ::nettool::blocks 8794 8799
+lappend ::nettool::blocks 8801 8803
+lappend ::nettool::blocks 8805 8872
+lappend ::nettool::blocks 8874 8879
+lappend ::nettool::blocks 8882 8882
+lappend ::nettool::blocks 8884 8887
+lappend ::nettool::blocks 8895 8898
+lappend ::nettool::blocks 8902 8909
+lappend ::nettool::blocks 8914 8936
+lappend ::nettool::blocks 8938 8952
+lappend ::nettool::blocks 8955 8988
+lappend ::nettool::blocks 8992 8997
+lappend ::nettool::blocks 9003 9006
+lappend ::nettool::blocks 9011 9019
+lappend ::nettool::blocks 9027 9049
+lappend ::nettool::blocks 9052 9079
+lappend ::nettool::blocks 9081 9081
+lappend ::nettool::blocks 9094 9099
+lappend ::nettool::blocks 9108 9118
+lappend ::nettool::blocks 9120 9121
+lappend ::nettool::blocks 9124 9130
+lappend ::nettool::blocks 9132 9159
+lappend ::nettool::blocks 9165 9190
+lappend ::nettool::blocks 9192 9199
+lappend ::nettool::blocks 9218 9221
+lappend ::nettool::blocks 9223 9254
+lappend ::nettool::blocks 9256 9276
+lappend ::nettool::blocks 9288 9291
+lappend ::nettool::blocks 9296 9299
+lappend ::nettool::blocks 9301 9305
+lappend ::nettool::blocks 9307 9311
+lappend ::nettool::blocks 9313 9317
+lappend ::nettool::blocks 9319 9320
+lappend ::nettool::blocks 9322 9342
+lappend ::nettool::blocks 9345 9345
+lappend ::nettool::blocks 9347 9373
+lappend ::nettool::blocks 9375 9379
+lappend ::nettool::blocks 9381 9386
+lappend ::nettool::blocks 9391 9395
+lappend ::nettool::blocks 9398 9399
+lappend ::nettool::blocks 9403 9417
+lappend ::nettool::blocks 9419 9442
+lappend ::nettool::blocks 9446 9449
+lappend ::nettool::blocks 9451 9499
+lappend ::nettool::blocks 9501 9521
+lappend ::nettool::blocks 9523 9534
+lappend ::nettool::blocks 9537 9554
+lappend ::nettool::blocks 9556 9591
+lappend ::nettool::blocks 9601 9611
+lappend ::nettool::blocks 9613 9613
+lappend ::nettool::blocks 9615 9615
+lappend ::nettool::blocks 9619 9627
+lappend ::nettool::blocks 9633 9639
+lappend ::nettool::blocks 9641 9665
+lappend ::nettool::blocks 9669 9693
+lappend ::nettool::blocks 9696 9699
+lappend ::nettool::blocks 9701 9746
+lappend ::nettool::blocks 9748 9749
+lappend ::nettool::blocks 9751 9752
+lappend ::nettool::blocks 9754 9761
+lappend ::nettool::blocks 9763 9799
+lappend ::nettool::blocks 9803 9874
+lappend ::nettool::blocks 9877 9877
+lappend ::nettool::blocks 9879 9887
+lappend ::nettool::blocks 9890 9897
+lappend ::nettool::blocks 9904 9908
+lappend ::nettool::blocks 9910 9910
+lappend ::nettool::blocks 9912 9924
+lappend ::nettool::blocks 9926 9949
+lappend ::nettool::blocks 9957 9965
+lappend ::nettool::blocks 9967 9977
+lappend ::nettool::blocks 9979 9986
+lappend ::nettool::blocks 9989 9989
+lappend ::nettool::blocks 10003 10003
+lappend ::nettool::blocks 10011 10022
+lappend ::nettool::blocks 10024 10049
+lappend ::nettool::blocks 10052 10054
+lappend ::nettool::blocks 10056 10079
+lappend ::nettool::blocks 10082 10099
+lappend ::nettool::blocks 10105 10106
+lappend ::nettool::blocks 10108 10109
+lappend ::nettool::blocks 10112 10112
+lappend ::nettool::blocks 10118 10127
+lappend ::nettool::blocks 10130 10159
+lappend ::nettool::blocks 10163 10199
+lappend ::nettool::blocks 10202 10251
+lappend ::nettool::blocks 10253 10259
+lappend ::nettool::blocks 10261 10287
+lappend ::nettool::blocks 10289 10320
+lappend ::nettool::blocks 10322 10438
+lappend ::nettool::blocks 10440 10499
+lappend ::nettool::blocks 10501 10539
+lappend ::nettool::blocks 10545 10630
+lappend ::nettool::blocks 10632 10799
+lappend ::nettool::blocks 10801 10804
+lappend ::nettool::blocks 10806 10808
+lappend ::nettool::blocks 10811 10859
+lappend ::nettool::blocks 10861 10879
+lappend ::nettool::blocks 10881 10989
+lappend ::nettool::blocks 10991 10999
+lappend ::nettool::blocks 11002 11094
+lappend ::nettool::blocks 11096 11102
+lappend ::nettool::blocks 11107 11107
+lappend ::nettool::blocks 11113 11160
+lappend ::nettool::blocks 11166 11170
+lappend ::nettool::blocks 11176 11200
+lappend ::nettool::blocks 11203 11207
+lappend ::nettool::blocks 11209 11210
+lappend ::nettool::blocks 11212 11318
+lappend ::nettool::blocks 11322 11366
+lappend ::nettool::blocks 11368 11370
+lappend ::nettool::blocks 11372 11429
+lappend ::nettool::blocks 11431 11488
+lappend ::nettool::blocks 11490 11599
+lappend ::nettool::blocks 11601 11622
+lappend ::nettool::blocks 11624 11719
+lappend ::nettool::blocks 11721 11722
+lappend ::nettool::blocks 11724 11750
+lappend ::nettool::blocks 11752 11795
+lappend ::nettool::blocks 11797 11875
+lappend ::nettool::blocks 11878 11966
+lappend ::nettool::blocks 11968 11996
+lappend ::nettool::blocks 12011 12011
+lappend ::nettool::blocks 12014 12108
+lappend ::nettool::blocks 12110 12120
+lappend ::nettool::blocks 12122 12167
+lappend ::nettool::blocks 12169 12171
+lappend ::nettool::blocks 12173 12299
+lappend ::nettool::blocks 12301 12301
+lappend ::nettool::blocks 12303 12320
+lappend ::nettool::blocks 12323 12344
+lappend ::nettool::blocks 12346 12752
+lappend ::nettool::blocks 12754 12864
+lappend ::nettool::blocks 12866 13159
+lappend ::nettool::blocks 13161 13215
+lappend ::nettool::blocks 13219 13222
+lappend ::nettool::blocks 13225 13399
+lappend ::nettool::blocks 13401 13719
+lappend ::nettool::blocks 13723 13723
+lappend ::nettool::blocks 13725 13781
+lappend ::nettool::blocks 13784 13784
+lappend ::nettool::blocks 13787 13817
+lappend ::nettool::blocks 13824 13893
+lappend ::nettool::blocks 13895 13928
+lappend ::nettool::blocks 13931 13999
+lappend ::nettool::blocks 14003 14032
+lappend ::nettool::blocks 14035 14140
+lappend ::nettool::blocks 14143 14144
+lappend ::nettool::blocks 14146 14148
+lappend ::nettool::blocks 14151 14153
+lappend ::nettool::blocks 14155 14249
+lappend ::nettool::blocks 14251 14413
+lappend ::nettool::blocks 14415 14935
+lappend ::nettool::blocks 14938 14999
+lappend ::nettool::blocks 15001 15001
+lappend ::nettool::blocks 15003 15117
+lappend ::nettool::blocks 15119 15344
+lappend ::nettool::blocks 15346 15362
+lappend ::nettool::blocks 15364 15554
+lappend ::nettool::blocks 15556 15659
+lappend ::nettool::blocks 15661 15739
+lappend ::nettool::blocks 15741 15997
+lappend ::nettool::blocks 16004 16019
+lappend ::nettool::blocks 16022 16160
+lappend ::nettool::blocks 16163 16308
+lappend ::nettool::blocks 16312 16359
+lappend ::nettool::blocks 16362 16366
+lappend ::nettool::blocks 16369 16383
+lappend ::nettool::blocks 16385 16618
+lappend ::nettool::blocks 16620 16664
+lappend ::nettool::blocks 16667 16899
+lappend ::nettool::blocks 16901 16949
+lappend ::nettool::blocks 16951 16990
+lappend ::nettool::blocks 16996 17006
+lappend ::nettool::blocks 17008 17183
+lappend ::nettool::blocks 17186 17218
+lappend ::nettool::blocks 17223 17233
+lappend ::nettool::blocks 17236 17499
+lappend ::nettool::blocks 17501 17554
+lappend ::nettool::blocks 17556 17728
+lappend ::nettool::blocks 17730 17753
+lappend ::nettool::blocks 17757 17776
+lappend ::nettool::blocks 17778 17999
+lappend ::nettool::blocks 18001 18103
+lappend ::nettool::blocks 18105 18135
+lappend ::nettool::blocks 18137 18180
+lappend ::nettool::blocks 18188 18240
+lappend ::nettool::blocks 18244 18261
+lappend ::nettool::blocks 18263 18462
+lappend ::nettool::blocks 18464 18633
+lappend ::nettool::blocks 18636 18768
+lappend ::nettool::blocks 18770 18880
+lappend ::nettool::blocks 18882 18887
+lappend ::nettool::blocks 18889 18999
+lappend ::nettool::blocks 19001 19006
+lappend ::nettool::blocks 19008 19019
+lappend ::nettool::blocks 19021 19190
+lappend ::nettool::blocks 19192 19193
+lappend ::nettool::blocks 19195 19282
+lappend ::nettool::blocks 19284 19314
+lappend ::nettool::blocks 19316 19397
+lappend ::nettool::blocks 19399 19409
+lappend ::nettool::blocks 19413 19538
+lappend ::nettool::blocks 19542 19787
+lappend ::nettool::blocks 19789 19997
+lappend ::nettool::blocks 20004 20004
+lappend ::nettool::blocks 20006 20011
+lappend ::nettool::blocks 20015 20045
+lappend ::nettool::blocks 20047 20047
+lappend ::nettool::blocks 20050 20166
+lappend ::nettool::blocks 20168 20201
+lappend ::nettool::blocks 20203 20221
+lappend ::nettool::blocks 20223 20479
+lappend ::nettool::blocks 20481 20669
+lappend ::nettool::blocks 20671 20998
+lappend ::nettool::blocks 21001 21009
+lappend ::nettool::blocks 21011 21552
+lappend ::nettool::blocks 21555 21589
+lappend ::nettool::blocks 21591 21799
+lappend ::nettool::blocks 21801 21844
+lappend ::nettool::blocks 21850 21999
+lappend ::nettool::blocks 22006 22124
+lappend ::nettool::blocks 22126 22127
+lappend ::nettool::blocks 22129 22221
+lappend ::nettool::blocks 22223 22272
+lappend ::nettool::blocks 22274 22304
+lappend ::nettool::blocks 22306 22342
+lappend ::nettool::blocks 22344 22346
+lappend ::nettool::blocks 22348 22349
+lappend ::nettool::blocks 22352 22536
+lappend ::nettool::blocks 22538 22554
+lappend ::nettool::blocks 22556 22762
+lappend ::nettool::blocks 22764 22799
+lappend ::nettool::blocks 22801 22950
+lappend ::nettool::blocks 22952 22999
+lappend ::nettool::blocks 23006 23052
+lappend ::nettool::blocks 23054 23271
+lappend ::nettool::blocks 23273 23332
+lappend ::nettool::blocks 23334 23399
+lappend ::nettool::blocks 23403 23455
+lappend ::nettool::blocks 23458 23545
+lappend ::nettool::blocks 23547 23999
+lappend ::nettool::blocks 24007 24241
+lappend ::nettool::blocks 24243 24248
+lappend ::nettool::blocks 24250 24320
+lappend ::nettool::blocks 24323 24464
+lappend ::nettool::blocks 24466 24553
+lappend ::nettool::blocks 24555 24576
+lappend ::nettool::blocks 24578 24675
+lappend ::nettool::blocks 24679 24679
+lappend ::nettool::blocks 24681 24753
+lappend ::nettool::blocks 24755 24849
+lappend ::nettool::blocks 24851 24921
+lappend ::nettool::blocks 24923 24999
+lappend ::nettool::blocks 25010 25470
+lappend ::nettool::blocks 25472 25575
+lappend ::nettool::blocks 25577 25603
+lappend ::nettool::blocks 25605 25792
+lappend ::nettool::blocks 25794 25899
+lappend ::nettool::blocks 25904 25953
+lappend ::nettool::blocks 25956 25999
+lappend ::nettool::blocks 26001 26132
+lappend ::nettool::blocks 26134 26207
+lappend ::nettool::blocks 26209 26259
+lappend ::nettool::blocks 26264 26485
+lappend ::nettool::blocks 26488 26488
+lappend ::nettool::blocks 26490 26999
+lappend ::nettool::blocks 27010 27344
+lappend ::nettool::blocks 27346 27441
+lappend ::nettool::blocks 27443 27503
+lappend ::nettool::blocks 27505 27781
+lappend ::nettool::blocks 27783 27875
+lappend ::nettool::blocks 27877 27998
+lappend ::nettool::blocks 28002 28118
+lappend ::nettool::blocks 28120 28199
+lappend ::nettool::blocks 28201 28239
+lappend ::nettool::blocks 28241 29117
+lappend ::nettool::blocks 29119 29166
+lappend ::nettool::blocks 29170 29998
+lappend ::nettool::blocks 30005 30259
+lappend ::nettool::blocks 30261 30831
+lappend ::nettool::blocks 30833 30998
+lappend ::nettool::blocks 31000 31019
+lappend ::nettool::blocks 31021 31028
+lappend ::nettool::blocks 31030 31399
+lappend ::nettool::blocks 31401 31415
+lappend ::nettool::blocks 31417 31456
+lappend ::nettool::blocks 31458 31619
+lappend ::nettool::blocks 31621 31684
+lappend ::nettool::blocks 31686 31764
+lappend ::nettool::blocks 31766 32033
+lappend ::nettool::blocks 32035 32248
+lappend ::nettool::blocks 32250 32482
+lappend ::nettool::blocks 32484 32634
+lappend ::nettool::blocks 32637 32766
+lappend ::nettool::blocks 32778 32800
+lappend ::nettool::blocks 32802 32810
+lappend ::nettool::blocks 32812 32895
+lappend ::nettool::blocks 32897 33122
+lappend ::nettool::blocks 33124 33330
+lappend ::nettool::blocks 33332 33332
+lappend ::nettool::blocks 33335 33433
+lappend ::nettool::blocks 33435 33655
+lappend ::nettool::blocks 33657 34248
+lappend ::nettool::blocks 34250 34377
+lappend ::nettool::blocks 34380 34566
+lappend ::nettool::blocks 34568 34961
+lappend ::nettool::blocks 34965 34979
+lappend ::nettool::blocks 34981 34999
+lappend ::nettool::blocks 35007 35353
+lappend ::nettool::blocks 35358 36000
+lappend ::nettool::blocks 36002 36411
+lappend ::nettool::blocks 36413 36421
+lappend ::nettool::blocks 36423 36442
+lappend ::nettool::blocks 36445 36523
+lappend ::nettool::blocks 36525 36601
+lappend ::nettool::blocks 36603 36699
+lappend ::nettool::blocks 36701 36864
+lappend ::nettool::blocks 36866 37474
+lappend ::nettool::blocks 37476 37482
+lappend ::nettool::blocks 37484 37653
+lappend ::nettool::blocks 37655 37999
+lappend ::nettool::blocks 38002 38200
+lappend ::nettool::blocks 38204 38799
+lappend ::nettool::blocks 38801 38864
+lappend ::nettool::blocks 38866 39680
+lappend ::nettool::blocks 39682 39999
+lappend ::nettool::blocks 40001 40403
+lappend ::nettool::blocks 40405 40840
+lappend ::nettool::blocks 40844 40852
+lappend ::nettool::blocks 40854 41110
+lappend ::nettool::blocks 41112 41120
+lappend ::nettool::blocks 41122 41793
+lappend ::nettool::blocks 41798 42507
+lappend ::nettool::blocks 42511 42999
+lappend ::nettool::blocks 43001 44320
+lappend ::nettool::blocks 44323 44443
+lappend ::nettool::blocks 44445 44543
+lappend ::nettool::blocks 44545 44552
+lappend ::nettool::blocks 44554 44599
+lappend ::nettool::blocks 44601 44899
+lappend ::nettool::blocks 44901 44999
+lappend ::nettool::blocks 45002 45044
+lappend ::nettool::blocks 45046 45053
+lappend ::nettool::blocks 45055 45677
+lappend ::nettool::blocks 45679 45823
+lappend ::nettool::blocks 45826 45965
+lappend ::nettool::blocks 45967 46997
+lappend ::nettool::blocks 47002 47099
+lappend ::nettool::blocks 47101 47556
+lappend ::nettool::blocks 47558 47623
+lappend ::nettool::blocks 47625 47805
+lappend ::nettool::blocks 47807 47807
+lappend ::nettool::blocks 47810 47999
+lappend ::nettool::blocks 48006 48048
+lappend ::nettool::blocks 48051 48127
+lappend ::nettool::blocks 48130 48555
+lappend ::nettool::blocks 48557 48618
+lappend ::nettool::blocks 48620 48652
+lappend ::nettool::blocks 48654 48999
+lappend ::nettool::blocks 49001 65535
+
+
+###
+# END: available_ports.tcl
+###
+###
+# START: locateport.tcl
+###
+::namespace eval ::nettool {}
+
+###
+# topic: fc6f8b9587dd5524f143f9df4be4755b63eb6cd5
+###
+proc ::nettool::allocate_port startingport {
+  foreach {start end} $::nettool::blocks {
+    if { $end <= $startingport } continue
+    if { $start > $startingport } {
+      set i $start
+    } else {
+      set i $startingport
+    }
+    for {} {$i <= $end} {incr i} {
+      if {[string is true -strict [get ::nettool::used_ports($i)]]} continue
+      if {[catch {socket -server NOOP $i} chan]} continue
+      close $chan
+      set ::nettool::used_ports($i) 1
+      return $i
+    }
+  }
+  error "Could not locate a port"
+}
+
+###
+# topic: 3286fdbd0a3fdebbb26414475754bcf3dea67b0f
+###
+proc ::nettool::claim_port {port {protocol tcp}} {
+  set ::nettool::used_ports($port) 1
+}
+
+###
+# topic: 1d1f8a65a9aef8765c9b4f2b0ee0ebaf42e99d46
+###
+proc ::nettool::find_port startingport {
+  foreach {start end} $::nettool::blocks {
+    if { $end <= $startingport } continue
+    if { $start > $startingport } {
+      set i $start
+    } else {
+      set i $startingport
+    }
+    for {} {$i <= $end} {incr i} {
+      if {[string is true -strict [get ::nettool::used_ports($i)]]} continue
+      return $i
+    }
+  }
+  error "Could not locate a port"
+}
+
+###
+# topic: ded1c51260e009effb1f77044f8d0dec3d030b91
+###
+proc ::nettool::port_busy port {
+  ###
+  # Check our private list of used ports
+  ###
+  if {[string is true -strict [get ::nettool::used_ports($port)]]} {
+    return 1
+  }
+  foreach {start end} $::nettool::blocks {
+    if { $port >= $start && $port <= $end } {
+      return 0
+    }
+  }
+  return 1
+}
+
+###
+# topic: b5407b084aa09f9efa4f58a337af6186418fddf2
+###
+proc ::nettool::release_port {port {protocol tcp}} {
+  set ::nettool::used_ports($port) 0
+}
+
+
+###
+# END: locateport.tcl
+###
+###
+# START: platform_unix.tcl
+###
+###
+# Generic answers that can be answered on most if not all unix platforms
+###
+
+if {$::tcl_platform(platform) eq "unix"} {
+###
+# topic: 825cd25953c2cc896a96006b7f454e00
+# title: Return pairings of MAC numbers to IP addresses on the local network
+# description: Under unix, we call the arp command for arp table resolution
+###
+proc ::nettool::arp_table {} {
+  set result {}
+  set dat [exec arp -a]
+  foreach line [split $dat \n] {
+    set host [lindex $line 0]
+    set ip [lindex $line 1]
+    set macid [lindex $line 3]
+    lappend result $macid [string range $ip 1 end-1]
+  }
+  return $result
+}
+}
+
+###
+# END: platform_unix.tcl
+###
+###
+# START: platform_unix_linux.tcl
+###
+if {$::tcl_platform(platform) eq "unix" && $genus eq "linux"} {
+
+###
+# topic: 92ebbfa155883ad41c37d3f843392be4
+# title: Return list of broadcast addresses for local networks
+###
+proc ::nettool::broadcast_list {} {
+  set result {}
+  lappend result 127.0.0.1
+  foreach {iface info} [dump] {
+    if {[dict exists $info ipv4 Bcast:]} {
+      lappend result [dict get $info ipv4 Bcast:]
+    }
+  }
+  return [lsort -unique -dictionary $result]
+}
+
+###
+# topic: 187cfa1827097c5cdf1c40c656cedfcc
+# description: Return time since booted
+###
+proc ::nettool::cpuinfo args {
+  variable cpuinfo
+  if {![info exists cpuinfo]} {
+    set cpuinfo {}
+    set dat [cat /proc/meminfo]
+    foreach line [split $dat \n] {
+      switch [lindex $line 0] {
+        MemTotal: {
+          # Normalize to MB
+          dict set cpuinfo memory [lindex $line 1]/1024
+        }
+      }
+    }
+    set cpus 0
+    set dat [cat /proc/cpuinfo]
+    foreach line [split $dat \n] {
+      set idx [string first : $line]
+      set field [string trim [string range $line 0 $idx-1]]
+      set value [string trim [string range $line $idx+1 end]]
+      switch $field {
+        processor {
+          incr cpus
+        }
+        {cpu family} {
+          dict set cpuinfo family $value
+        }
+        model {
+          dict set cpuinfo model $value
+        }
+        stepping {
+          dict set cpuinfo stepping $value
+        }
+        vendor_id {
+          dict set cpuinfo vendor $value
+        }
+        {model name} {
+          dict set cpuinfo brand $value
+        }
+        {cpu MHz} {
+          dict set cpuinfo speed $value
+        }
+        flags {
+          dict set cpuinfo features $value
+        }
+      }
+    }
+    dict set cpuinfo cpus $cpus
+  }
+  if {$args eq "<list>"} {
+    return [dict keys $cpuinfo]
+  }
+  if {[llength $args]==0} {
+    return $cpuinfo
+  }
+  if {[llength $args]==1} {
+    return [dict get $cpuinfo [lindex $args 0]]
+  }
+  set result {}
+  foreach item $args {
+    if {[dict exists $cpuinfo $item]} {
+      dict set result $item [dict get $cpuinfo $item]
+    } else {
+      dict set result $item {}
+    }
+  }
+  return $result
+}
+
+###
+# topic: aa8eda4fb59296a1a34d8d600ca54e28
+# description: Dump interfaces
+###
+proc ::nettool::dump {} {
+  set data [exec ifconfig]
+  set iface {}
+  set result {}
+  foreach line [split $data \n] {
+    if {[string index $line 0] in {" " "\t"} } {
+      # Indented line appends the prior iface
+      switch [lindex $line 0] {
+        inet {
+          foreach tuple [lrange $line 1 end] {
+	    set idx [string first : $tuple]
+            set field [string trim [string range $tuple 0 $idx]]
+            set value [string trim [string range $tuple $idx+1 end]]
+            dict set result $iface ipv4 [string trim $field] [string trim $value]
+          }
+        }
+        inet6 {
+          dict set result $iface ipv6 addr: [lindex $line 2]
+          foreach tuple [lrange $line 3 end] {
+	    set idx [string first : $tuple]
+            set field [string trim [string range $tuple 0 $idx]]
+            set value [string trim [string range $tuple $idx+1 end]]
+            dict set result $iface ipv6 [string trim $field] [string trim $value]
+          }
+	}
+      }
+    } else {
+      # Non-intended line - new iface
+      set iface [lindex $line 0]
+      set idx [lsearch $line HWaddr]
+      if {$idx >= 0 } {
+        dict set result $iface ether: [lindex $line $idx+1]
+      }
+    }
+  }
+  return $result
+}
+
+###
+# topic: 417672d3f31b80d749588365af88baf6
+# title: Return list of ip addresses for this computer (primary first)
+###
+proc ::nettool::ip_list {} {
+  set result {}
+  foreach {iface info} [dump] {
+    if {[dict exists $info ipv4 addr:]} {
+      lappend result [dict get $info ipv4 addr:]
+    }
+  }
+  ldelete result 127.0.0.1
+  return $result
+}
+
+###
+# topic: ac9d6815d47f60d45930f0c8c8ae8f16
+# title: Return list of mac numbers for this computer (primary first)
+###
+proc ::nettool::mac_list {} {
+  set result {}
+  foreach {iface info} [dump] {
+    if {[dict exists $info ether:]} {
+      lappend result [dict get $info ether:]
+    }
+  }
+  return $result
+}
+
+###
+# topic: a43b6f42141820e0ba1094840d0f6fc0
+###
+proc ::nettool::network_list {} {
+  foreach {iface info} [dump] {
+    if {![dict exists $info ipv4 addr:]} continue
+    if {![dict exists $info ipv4 Mask:]} continue
+    #set mask [::ip::maskToInt $netmask]
+    set addr [dict get $info ipv4 addr:]
+    set mask [dict get $info ipv4 Mask:]
+    set addri [::ip::toInteger $addr]
+    lappend result [ip::nativeToPrefix [list [expr {$addri & $mask}] $mask] -ipv4]
+  }
+  return $result
+}
+
+###
+# topic: e7db1ae1b5b98a1bb4384f0a4fe81f42
+###
+proc ::nettool::status {} {
+  set result {}
+  set dat [cat /proc/loadavg]
+  dict set result load_average    [lrange $dat 0 2]
+  set cpus [cpuinfo cpus].0
+  dict set result load [expr {[lindex $dat 0]/$cpus}]
+
+  set processes [split [lindex $dat 3] /]
+  dict set result processes_running [lindex $processes 0]
+  dict set result processes_total [lindex $processes 1]
+
+  set dat [cat /proc/meminfo]
+  foreach line [split $dat \n] {
+    switch [lindex $line 0] {
+      MemTotal: {
+        # Normalize to MB
+        dict set result memory_total [expr {[lindex $line 1]/1024}]
+      }
+      MemFree: {
+        # Normalize to MB
+        dict set result memory_free [expr {[lindex $line 1]/1024}]
+      }
+    }
+  }
+  return $result
+}
+
+###
+# topic: 59bf977ad7287b4d90346fad639aed34
+###
+proc ::nettool::uptime_report {} {
+  set result {}
+  set dat [split [exec uptime] ,]
+  puts $dat
+  dict set result time   [lindex [lindex $dat 0] 0]
+  dict set result uptime [lrange [lindex $dat 0] 1 end]
+  dict set result users  [lindex [lindex $dat 2] 0]
+  dict set result load_1_minute  [lindex [lindex $dat 3] end]
+  dict set result load_5_minute  [lindex [lindex $dat 4] end]
+  dict set result load_15_minute  [lindex [lindex $dat 5] end]
+  return $result
+}
+
+unset -nocomplain ::nettool::cpuinfo
+}
+
+###
+# END: platform_unix_linux.tcl
+###
+###
+# START: platform_unix_macosx.tcl
+###
+if {$::tcl_platform(platform) eq "unix" && $genus eq "macosx"} {
+
+###
+# topic: 825cd25953c2cc896a96006b7f454e00
+# title: Return pairings of MAC numbers to IP addresses on the local network
+# description: Under macosx, we call the arp command for arp table resolution
+###
+proc ::nettool::arp_table {} {
+  set result {}
+  set dat [exec arp -a]
+  foreach line [split $dat \n] {
+    set host [lindex $line 0]
+    set ip [lindex $line 1]
+    set macid [lindex $line 3]
+    lappend result $macid [string range $ip 1 end-1]
+  }
+  return $result
+}
+
+###
+# topic: 92ebbfa155883ad41c37d3f843392be4
+# title: Return list of broadcast addresses for local networks
+###
+proc ::nettool::broadcast_list {} {
+  set result {}
+  lappend result 127.0.0.1
+  foreach {iface info} [dump] {
+    if {[dict exists $info broadcast:]} {
+      lappend result [dict get $info broadcast:]
+    }
+  }
+  return [lsort -unique -dictionary $result]
+}
+
+###
+# topic: 187cfa1827097c5cdf1c40c656cedfcc
+# description: Return time since booted
+###
+proc ::nettool::cpuinfo args {
+  variable cpuinfo
+  if {![info exists cpuinfo]} {
+    set cpuinfo {}
+    dict set cpuinfo machine  [exec sysctl -n hw.machine]
+    dict set cpuinfo cpus     [exec sysctl -n hw.ncpu]
+    # Normalize to MB
+    dict set cpuinfo memory   [expr {[exec sysctl -n hw.memsize] / 1048576}]
+
+    dict set cpuinfo vendor   [exec sysctl -n machdep.cpu.vendor]
+    dict set cpuinfo brand    [exec sysctl -n machdep.cpu.brand_string]
+
+    dict set cpuinfo model    [exec sysctl -n machdep.cpu.model]
+    dict set cpuinfo speed    [expr {[exec sysctl -n hw.cpufrequency]/1000000}]
+
+    dict set cpuinfo family   [exec sysctl -n machdep.cpu.family]
+    dict set cpuinfo stepping [exec sysctl -n machdep.cpu.stepping]
+    dict set cpuinfo features [exec sysctl -n machdep.cpu.features]
+    dict set cpuinfo diskless []
+  }
+  if {$args eq "<list>"} {
+    return [dict keys $cpuinfo]
+  }
+  if {[llength $args]==0} {
+    return $cpuinfo
+  }
+  if {[llength $args]==1} {
+    return [dict get $cpuinfo [lindex $args 0]]
+  }
+  set result {}
+  foreach item $args {
+    if {[dict exists $cpuinfo $item]} {
+      dict set result $item [dict get $cpuinfo $item]
+    } else {
+      dict set result $item {}
+    }
+  }
+  return $result
+}
+
+###
+# topic: aa8eda4fb59296a1a34d8d600ca54e28
+# description: Dump interfaces
+###
+proc ::nettool::dump {} {
+  set data [exec ifconfig]
+  set iface {}
+  set result {}
+  foreach line [split $data \n] {
+    if {[string index $line 0] in {" " "\t"} } {
+      # Indented line appends the prior iface
+      foreach {field value} $line {
+        dict set result $iface [string trimright $field :]: $value
+      }
+    } else {
+      # Non-intended line - new iface
+      set iface [lindex $line 0]
+    }
+  }
+  return $result
+}
+
+###
+# topic: dd2e2c0810cea69909399808f2a68949
+# title: Return a list of unique hardware addresses
+###
+proc ::nettool::hwid_list {} {
+  variable cached_data
+  set result {}
+  if {![info exists cached_data]} {
+    if {[catch {exec system_profiler SPHardwareDataType} hwlist]} {
+      set cached_data {}
+    } else {
+      set cached_data $hwlist
+
+    }
+  }
+  set serial {}
+  set hwuuid {}
+  set result {}
+  catch {
+  foreach line [split $cached_data \n] {
+    if { [lindex $line 0] == "Serial" && [lindex $line 1] == "Number" } {
+      set serial [lindex $line end]
+    }
+    if { [lindex $line 0] == "Hardware" && [lindex $line 1] == "UUID:" } {
+      set hwuuid [lindex $line end]
+    }
+  }
+  }
+  if { $hwuuid != {} } {
+    lappend result 0x[string map {- {}} $hwuuid]
+  }
+  # Blank serial number?
+  if { $serial != {} } {
+    set sn [binary scan $serial H* hash]
+    lappend result 0x$hash
+  }
+  if {[llength $result]} {
+    return $result
+  }
+  foreach mac [::nettool::mac_list] {
+    lappend result 0x[string map {: {}} $mac]
+  }
+  if {[llength $result]} {
+    return $result
+  }
+  return 0x010203040506
+}
+
+###
+# topic: d2932eb0ea8cc9f6a865c1ab7cdd4572
+# description:
+#    Called on package load to build any static
+#    structures to cache data that would be time
+#    consuming to call on the fly
+###
+proc ::nettool::init {} {
+  unset -nocomplain [namespace current]::cpuinfo
+
+}
+
+###
+# topic: 417672d3f31b80d749588365af88baf6
+# title: Return list of ip addresses for this computer (primary first)
+###
+proc ::nettool::ip_list {} {
+  set result {}
+  foreach {iface info} [dump] {
+    if {[dict exists $info inet:]} {
+      lappend result [dict get $info inet:]
+    }
+  }
+  ldelete result 127.0.0.1
+  return $result
+}
+
+###
+# topic: ac9d6815d47f60d45930f0c8c8ae8f16
+# title: Return list of mac numbers for this computer (primary first)
+###
+proc ::nettool::mac_list {} {
+  set result {}
+  foreach {iface info} [dump] {
+    if {[dict exists $info ether:]} {
+      lappend result [dict get $info ether:]
+    }
+  }
+  return $result
+}
+
+###
+# topic: a43b6f42141820e0ba1094840d0f6fc0
+###
+proc ::nettool::network_list {} {
+  foreach {iface info} [dump] {
+    if {![dict exists $info inet:]} continue
+    if {![dict exists $info netmask:]} continue
+    #set mask [::ip::maskToInt $netmask]
+    set addr [dict get $info inet:]
+    set mask [dict get $info netmask:]
+    set addri [::ip::toInteger $addr]
+    lappend result [ip::nativeToPrefix [list [expr {$addri & $mask}] $mask] -ipv4]
+  }
+  return $result
+}
+
+###
+# topic: e7db1ae1b5b98a1bb4384f0a4fe81f42
+###
+proc ::nettool::status {} {
+  set result {}
+  set loaddat [lindex [exec sysctl -n vm.loadavg] 0]
+  set cpus [cpuinfo cpus]
+  dict set result cpus $cpus
+  dict set result load [expr {[lindex $loaddat 0]*100.0/$cpus}]
+  dict set result load_average_1 [lindex $loaddat 0]
+  dict set result load_average_5 [lindex $loaddat 1]
+  dict set result load_average_15 [lindex $loaddat 2]
+
+  set total [exec sysctl -n hw.memsize]
+  dict set result memory_total [expr {$total / 1048576}]
+  set used 0
+  foreach {amt} [exec sysctl -n machdep.memmap] {
+    incr used $amt
+  }
+  dict set result memory_free [expr {($total - $used) / 1048576}]
+
+  return $result
+}
+
+proc ::nettool::user_data_root {appname} {
+  return [file join $::env(HOME) Library {Application Support} $appname]
+}
+}
+
+###
+# END: platform_unix_macosx.tcl
+###
+###
+# START: platform_windows.tcl
+###
+if {$::tcl_platform(platform) eq "windows"} {
+
+###
+# topic: dd2e2c0810cea69909399808f2a68949
+# title: Return a list of unique hardware ids
+###
+proc ::nettool::hwid_list {} {
+  # Use the serial number on the hard drive
+  catch {exec {*}[auto_execok vol] c:} voldat
+  set num [lindex [lindex [split $voldat \n] end] end]
+  return 0x[string map {- {}} $num]
+}
+
+###
+# topic: 92ebbfa155883ad41c37d3f843392be4
+# title: Return list of broadcast addresses for local networks
+###
+proc ::nettool::broadcast_list {} {
+  set result {}
+  lappend result 127.0.0.1
+  foreach net [network_list] {
+    if {$net in {224.0.0.0/4 127.0.0.0/8}} continue
+    lappend result [::ip::broadcastAddress $net]
+  }
+  return [lsort -unique -dictionary $result]
+}
+
+###
+# Provide a limited subset using data gleaned from exec
+# These calls work in Windows NT 4 and above
+###
+
+
+proc ::nettool::IPINFO {} {
+  if {![info exists ::nettool::ipinfo]} {
+    set ::nettool::ipinfo [exec ipconfig /all]
+  }
+  return $::nettool::ipinfo
+}
+
+proc ::nettool::if_list {} {
+  return [mac_list]
+}
+
+proc ::nettool::ip_list {} {
+  set result {}
+  foreach line [split [IPINFO] \n] {
+    if {![regexp {IPv4 Address} $line]} continue
+    set line [string range $line [string first ":" $line]+2 end]
+    if {[scan $line %d.%d.%d.%d A B C D]!=4} continue
+    lappend result $A.$B.$C.$D
+  }
+  return $result
+}
+
+proc ::nettool::mac_list {} {
+  set result {}
+  foreach line [split [IPINFO] \n] {
+    if {![regexp {Physical Address} $line]} continue
+    set line [string range $line [string first ":" $line]+2 end]
+    if {[scan $line %02x-%02x-%02x-%02x-%02x-%02x A B C D E F] != 6} continue
+    if {$A==0 && $B==0 && $C==0 && $D==0 && $E==0 && $F==0} continue
+    lappend result [format %02x:%02x:%02x:%02x:%02x:%02x $A $B $C $D $E $F]
+  }
+  return $result
+}
+
+proc ::nettool::network_list {} {
+  set masks {}
+  foreach line [split [IPINFO] \n] {
+    if {![regexp {Subnet Mask} $line]} continue
+    set line [string range $line [string first ":" $line]+2 end]
+    if {[scan $line %d.%d.%d.%d A B C D]!=4} continue
+    lappend masks $A.$B.$C.$D
+  }
+  set result {}
+  set idx -1
+  foreach addr [ip_list] {
+    set netmask [lindex $masks [incr idx]]
+    set mask   [::ip::maskToInt $netmask]
+    set addri [::ip::toInteger $addr]
+    lappend result [ip::nativeToPrefix [list [expr {$addri & $mask}] $netmask] -ipv4]
+  }
+  return $result
+}
+
+proc ::nettool::status {} {
+}
+
+proc ::nettool::user_data_root {appname} {
+  return [file join $::env(APPDATA) $appname]
+}
+}
+
+###
+# END: platform_windows.tcl
+###
+###
+# START: platform_windows_twapi.tcl
+###
+if {$::tcl_platform(platform) eq "windows" && ![catch {package require twapi}]} {
+# TWAPI Based implementation
+
+::namespace eval ::nettool {}
+
+###
+# topic: 825cd25953c2cc896a96006b7f454e00
+# title: Return pairings of MAC numbers to IP addresses on the local network
+# description: Under macosx, we call the arp command for arp table resolution
+###
+proc ::nettool::arp_table {} {
+  set result {}
+  catch {
+  foreach element [::twapi::get_arp_table] {
+    foreach {ifidx macid ipaddr type} {
+      lappend result [string map {- :} $macid] $ipaddr
+    }
+  }
+  }
+  return $result
+}
+
+
+###
+# topic: 57fdc331bc60c7bf2bd3f3214e9a906f
+###
+proc ::nettool::hwaddr_to_ipaddr args {
+  return [::twapi::hwaddr_to_ipaddr {*}$args]
+}
+
+
+
+if {[info command ::twapi::get_netif_indices] ne {}} {
+###
+# topic: 4b87d977492bd10802bfc0327cd07ac2
+# title: Return list of network interfaces
+###
+proc ::nettool::if_list {} {
+  return [::twapi::get_netif_indices]
+}
+
+
+###
+# topic: ac9d6815d47f60d45930f0c8c8ae8f16
+# title: Return list of mac numbers for this computer (primary first)
+###
+proc ::nettool::mac_list {} {
+  set result {}
+  foreach iface [::twapi::get_netif_indices] {
+    foreach {field value} [::twapi::get_netif_info $iface -physicaladdress] {
+      if { $value eq {} } continue
+      lappend result [string map {- :} $value]
+    }
+  }
+  return $result
+}
+
+###
+# topic: a43b6f42141820e0ba1094840d0f6fc0
+###
+proc ::nettool::network_list {} {
+  set result {}
+  foreach iface [::twapi::get_netif_indices] {
+    set dat [::twapi::GetIpAddrTable $iface]
+    foreach element $dat {
+      foreach {addr ifindx netmask broadcast reamsize} $element break;
+      set mask [::ip::maskToInt $netmask]
+      set addri [::ip::toInteger $addr]
+      lappend result [ip::nativeToPrefix [list [expr {$addri & $mask}] $netmask] -ipv4]
+    }
+  }
+  return [lsort -unique $result]
+}
+} else {
+
+if {[info commands ::twapi::get_network_adapters] ne {}} {
+proc ::nettool::if_list {} {
+  return [::twapi::get_network_adapters]
+}
+}
+
+if {[info commands ::twapi::get_network_adapter_info] ne {}} {
+proc ::nettool::mac_list {} {
+
+  set result {}
+  foreach iface [if_list] {
+    set dat [::twapi::get_network_adapter_info $iface -physicaladdress]
+    set addr [string map {- :} [lindex $dat 1]]
+    if {[string length $addr] eq 0} continue
+    if {[string range $addr 0 5] eq "00:00:"} continue
+    lappend result $addr
+  }
+  return $result
+}
+
+proc ::nettool::network_list {} {
+  set result {}
+  foreach iface [if_list] {
+    set dat [::twapi::get_network_adapter_info $iface -prefixes]
+    foreach kvlist [lindex $dat 1] {
+      if {![dict exists $kvlist -address]} continue
+      if {![dict exists $kvlist -prefixlength]} continue
+      set length [dict get $kvlist -prefixlength]
+      if {$length>31} continue
+      set address [dict get $kvlist -address]
+      if {[string range $address 0 1] eq "ff"} continue
+      lappend result $address/$length
+    }
+  }
+  return [lsort -unique $result]
+}
+
+}
+}
+
+###
+# topic: 417672d3f31b80d749588365af88baf6
+# title: Return list of ip addresses for this computer (primary first)
+###
+set body {}
+if {[info commands ::twapi::get_ip_addresses] ne {}} {
+proc ::nettool::ip_list {} {
+  set result [::twapi::get_ip_addresses]
+  ldelete result 127.0.0.1
+  return $result
+}
+} elseif {[info commands ::twapi::get_system_ipaddrs] ne {}} {
+# They changed commands names on me...
+if {[catch {::twapi::get_system_ipaddrs -version 4}]} {
+# THEY CHANGED THE API ON ME!
+proc ::nettool::ip_list {} {
+  set result [::twapi::get_system_ipaddrs -ipversion 4]
+  ldelete result 127.0.0.1
+  return $result
+}
+} else {
+proc ::nettool::ip_list {} {
+  set result [::twapi::get_system_ipaddrs -version 4]
+  ldelete result 127.0.0.1
+  return $result
+}
+}
+}
+
+
+proc ::nettool::status {} {
+  set result {}
+  #dict set result load [::twapi::]
+  set cpus [::twapi::get_processor_count]
+  set usage 0
+  for {set p 0} {$p < $cpus} {incr p} {
+    if [catch {
+    set pu  [lindex [::twapi::get_processor_info $p  -processorutilization] 1]
+    while {$pu eq {}} {
+      after 100 {set pause 0}
+      vwait pause
+      set pu  [lindex [::twapi::get_processor_info $p  -processorutilization] 1]
+    }
+    set usage [expr {$usage+$pu}]
+    } err] {
+      set usage -1
+    }
+  }
+  dict set result cpus $cpus
+  dict set result load [expr {$usage/$cpus}]
+  dict set result uptime [::twapi::get_system_uptime]
+}
+}
+
+###
+# END: platform_windows_twapi.tcl
+###
+
+namespace eval ::nettool {
+    namespace export *
+}
+###
+# Perform any one-time discovery we might need
+###
+::nettool::discover
+::nettool::init
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nettool/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nettool/pkgIndex.tcl
new file mode 100644
index 00000000..0871276d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nettool/pkgIndex.tcl
@@ -0,0 +1,6 @@
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+# Backward compatible alias
+package ifneeded nettool::available_ports 0.1 {package require nettool ; package provide nettool::available_ports 0.1}
+package ifneeded nettool 0.5.2 [list source [file join $dir nettool.tcl]]
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nmea/nmea.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nmea/nmea.tcl
new file mode 100644
index 00000000..884b4a58
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nmea/nmea.tcl
@@ -0,0 +1,197 @@
+# nmea.tcl --
+#
+# NMEA protocol implementation
+#
+# Copyright (c) 2006-2009 Aaron Faupell
+#
+# RCS: @(#) $Id: nmea.tcl,v 1.5 2009/01/09 06:49:25 afaupell Exp $
+
+package require Tcl 8.4
+package provide nmea 1.0.0
+
+namespace eval ::nmea {
+    array set ::nmea::nmea [list checksum 1 log {} rate 0]
+    array set ::nmea::dispatch ""
+}
+
+proc ::nmea::open_port {port {speed 4800}} {
+    variable nmea
+    if {[info exists nmea(fh)]} { ::nmea::close }
+    set nmea(fh) [open $port]
+    fconfigure $nmea(fh) -mode $speed,n,8,1 -handshake xonxoff -buffering line -translation crlf
+    fileevent $nmea(fh) readable [list ::nmea::read_port $nmea(fh)]
+    return $port
+}
+
+proc ::nmea::open_file {file {rate {}}} {
+    variable nmea
+    if {[info exists nmea(fh)]} { ::nmea::close }
+    set nmea(fh) [open $file]
+    if {[string is integer -strict $rate]} {
+        if {$rate < 0} { set rate 0 }
+        set nmea(rate) $rate
+    }
+    fconfigure $nmea(fh) -buffering line -blocking 0 -translation auto
+    if {$nmea(rate) > 0} {
+        after $nmea(rate) [list ::nmea::read_file $nmea(fh)]
+    }
+    return $file
+}
+
+proc ::nmea::configure_port {settings} {
+    variable nmea
+    fconfigure $nmea(fh) -mode $settings
+}
+
+proc ::nmea::close {} {
+    variable nmea
+    catch {::close $nmea(fh)}
+    unset -nocomplain nmea(fh)
+    foreach x [after info] {
+        if {[lindex [after info $x] 0 0] == "::nmea::read_file"} {
+            after cancel $x
+        }
+    }
+}
+
+proc ::nmea::read_port {f} {
+    if {[catch {gets $f} line] || [eof $f]} {
+        if {[info exists ::nmea::dispatch(EOF)]} {
+            $::nmea::dispatch(EOF)
+        }
+        nmea::close
+    }
+    if {$::nmea::nmea(log) != ""} {
+        puts $::nmea::nmea(log) $line
+    }
+    ::nmea::parse_nmea $line
+}
+
+proc ::nmea::read_file {f {auto 1}} {
+    variable nmea
+    set line [gets $f]
+    if {[eof $f]} {
+        if {[info exists ::nmea::dispatch(EOF)]} {
+            $::nmea::dispatch(EOF)
+        }
+        nmea::close
+        return 0
+    }
+    if {[string match {$*} $line]} {
+        ::nmea::parse_nmea $line
+    } else {
+        ::nmea::parse_nmea \$$line
+    }
+    if {$auto} {
+        after $nmea(rate) [list ::nmea::read_file $f]
+    }
+    return 1
+}
+
+proc ::nmea::do_line {} {
+    variable nmea
+    if {![info exists nmea(fh)]} { return -code error "there is no currently open file" }
+    return [::nmea::read_file $nmea(fh) 0]
+}
+
+proc ::nmea::configure {opt {val {}}} {
+    variable nmea
+    switch -exact -- $opt {
+        rate {
+            if {$val == ""} { return $nmea(rate) }
+            if {![string is integer $val]} { return -code error "rate must be an integer value" }
+            if {$val <= 0} {
+                foreach x [after info] {
+                    if {[lindex [after info $x] 0 0] == "::nmea::read_file"} {
+                        after cancel $x
+                    }
+                }
+                set val 0
+            }
+            if {$nmea(rate) == 0 && $val > 0} {
+                after $val [list ::nmea::read_file $nmea(fh)]
+            }
+            set nmea(rate) $val
+            return $val
+        }
+        checksum {
+            if {$val == ""} { return $nmea(checksum) }
+            if {![string is bool $val]} { return -code error "checksum must be a boolean value" }
+            set nmea(checksum) $val
+            return $val
+        }
+        default {
+            return -code error "unknown option $opt"
+        }
+    }
+}
+
+proc ::nmea::input {sentence} {
+    if {![string match "*,*" $sentence]} { set sentence [join $sentence ,] }
+    if {[string match {$*} $sentence]} {
+        ::nmea::parse_nmea $sentence
+    } else {
+        ::nmea::parse_nmea \$$sentence
+    }
+}
+
+proc ::nmea::log {{file _X}} {
+    variable nmea
+    if {$file == "_X"} { return [expr {$nmea(log) != ""}] }
+    if {$file != ""} {
+        if {$nmea(log) != ""} { ::nmea::log {} }
+        set nmea(log) [open $file a]
+    } else {
+        catch {::close $nmea(log)}
+        set nmea(log) ""
+    }
+    return $file
+}
+
+proc ::nmea::parse_nmea {line} {
+    set line [split $line \$*]
+    set cksum [lindex $line 2]
+    set line [lindex $line 1]
+    if {$cksum == "" || !$::nmea::nmea(checksum) || [checksum $line] == $cksum} {
+        set line [split $line ,]
+        set sentence [lindex $line 0]
+        set line [lrange $line 1 end]
+        if {[info exists ::nmea::dispatch($sentence)]} {
+            $::nmea::dispatch($sentence) $line
+        } elseif {[info exists ::nmea::dispatch(DEFAULT)]} {
+            $::nmea::dispatch(DEFAULT) $sentence $line
+        }
+    }
+}
+
+proc ::nmea::checksum {line} {
+    set sum 0
+    binary scan $line c* line
+    foreach char $line {
+        set sum [expr {$sum ^ ($char % 128)}]
+    }
+    return [format %02X [expr {$sum % 256}]]
+}
+
+proc ::nmea::write {type args} {
+    variable nmea
+    set data $type,[join $args ,]
+    puts $nmea(fh) \$$data*[checksum $data]
+}
+
+proc ::nmea::event {sentence {command _X}} {
+    variable dispatch
+    set sentence [string toupper $sentence]
+    if {$command == "_X"} {
+        if {[info exists dispatch($sentence)]} {
+            return $dispatch($sentence)
+        }
+        return {}
+    }
+    if {$command == ""} {
+        unset -nocomplain dispatch($sentence)
+        return {}
+    }
+    set dispatch($sentence) $command
+    return $command
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nmea/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nmea/pkgIndex.tcl
new file mode 100644
index 00000000..200dd5df
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nmea/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded nmea 1.0.0 [list source [file join $dir nmea.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/common.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/common.tcl
new file mode 100644
index 00000000..5c3e1cac
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/common.tcl
@@ -0,0 +1,38 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Name service - Common/shared information.
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+namespace eval ::nameserv::common {}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::nameserv::common::port {} {
+    variable port
+    return  $port
+}
+
+namespace eval ::nameserv::common {
+    # Derivation of the standard port number for this service.
+
+    # nameserv::server
+    # -> nameservserver  / remove ':'
+    # -> 62637378737837  / phonecode
+    # -> 38573           / mod 65536
+
+    variable port 38573
+
+    # The modulo operation is required because IP port numbers are
+    # restricted to unsigned short (16 bit), i.e. 1 ... 65535.
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide nameserv::common 0.1
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/nns.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/nns.tcl
new file mode 100644
index 00000000..e2562068
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/nns.tcl
@@ -0,0 +1,432 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Name Service - Client side access
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.4
+package require comm             ; # Generic message transport
+package require interp           ; # Interpreter helpers.
+package require logger           ; # Tracing internal activity
+package require nameserv::common ; # Common/shared utilities
+package require snit             ; # OO support, for streaming search class
+package require uevent           ; # Generate events for connection-loss
+
+namespace eval ::nameserv {}
+
+# ### ### ### ######### ######### #########
+## API: Write, Read, Search
+
+proc ::nameserv::bind {name data} {
+    # Registers this application at the configured name service under
+    # the specified name, and provides a value.
+    #
+    # Note: The application is allowed register multiple names.
+    #
+    # Note: A registered name is automatically removed by the server
+    #       when the connection to it collapses.
+
+    DO Bind $name $data
+    return
+}
+
+proc ::nameserv::release {} {
+    # Releases all names the application has registered at the
+    # configured name service.
+
+    DO Release
+    return
+}
+
+proc ::nameserv::search {args} {
+    # Searches the configured name service for applications whose name
+    # matches the given pattern. Returns a dictionary mapping from the
+    # names to the data they provided at 'bind' time.
+
+    # In continuous and async modes it returns an object whose
+    # contents reflect the current set of matching entries.
+
+    array set a [search-parseargs $args]
+    upvar 0 a(oneshot)    oneshot
+    upvar 0 a(continuous) continuous
+    upvar 0 a(pattern)    pattern
+
+    if {$continuous} {
+	variable search
+	# This client uses the receiver object as tag for the search
+	# in the service. This is easily unique, and makes dispatch of
+	# incoming results later easy too.
+
+	set receiver [receiver %AUTO% $oneshot]
+	if {[catch {
+	    ASYNC Search/Continuous/Start $receiver $pattern
+	} err]} {
+	    # Release the allocated object to prevent a leak, then
+	    # rethrow the error.
+	    $receiver destroy
+	    return -code error $err
+	}
+
+	set search($receiver) .
+	return $receiver
+    } else {
+	return [DO Search $pattern]
+    }
+}
+
+proc ::nameserv::protocol {} {
+    return 1
+}
+
+proc ::nameserv::server_protocol {} {
+    return [DO ProtocolVersion]
+}
+
+proc ::nameserv::server_features {} {
+    return [DO ProtocolFeatures]
+}
+
+# ### ### ### ######### ######### #########
+## semi-INT: search argument processing.
+
+proc ::nameserv::search-parseargs {arguments} {
+    # This command is semi-public. It is not documented for public
+    # use, however the package nameserv::auto uses as helper in its
+    # implementation of the search command.
+
+    switch -exact [llength $arguments] {
+	0 {
+	    set oneshot    0
+	    set continuous 0
+	    set pattern    *
+	}
+	1 {
+	    set opt [lindex $arguments 0]
+	    if {$opt eq "-continuous"} {
+		set oneshot    0
+		set continuous 1
+		set pattern    *
+	    } elseif {$opt eq "-async"} {
+		set oneshot    1
+		set continuous 1
+		set pattern    *
+	    } else {
+		set oneshot    0
+		set continuous 0
+		set pattern    $opt
+	    }
+	}
+	2 {
+	    set opt [lindex $arguments 0]
+	    if {$opt eq "-continuous"} {
+		set oneshot    0
+		set continuous 1
+		set pattern    [lindex $arguments 1]
+	    } elseif {$opt eq "-async"} {
+		set oneshot    1
+		set continuous 1
+		set pattern    [lindex $arguments 1]
+	    } else {
+		return -code error "wrong\#args: Expected ?-continuous|-async? ?pattern?"
+	    }
+	}
+	default {
+	    return -code error "wrong\#args: Expected ?-continuous|-async? ?pattern?"
+	}
+    }
+
+    return [list oneshot $oneshot continuous $continuous pattern $pattern]
+}
+
+# ### ### ### ######### ######### #########
+## INT: Communication setup / teardown / use
+
+proc ::nameserv::DO {args} {
+    variable sid
+    log::debug [linsert $args end @ $sid]
+
+    if {[catch {
+	[SERV] send $sid $args
+	#eval [linsert $args 0 [SERV] send $sid] ;# $args
+    } msg]} {
+	if {[string match "*refused*" $msg]} {
+	    return -code error "No name server present @ $sid"
+	} else {
+	    return -code error $msg
+	}
+    }
+    # Result of the call
+    return $msg
+}
+
+proc ::nameserv::ASYNC {args} {
+    variable sid
+    log::debug [linsert $args end @ $sid]
+
+    if {[catch {
+	[SERV] send -async $sid $args
+	#eval [linsert $args 0 [SERV] send $sid] ;# $args
+    } msg]} {
+	if {[string match "*refused*" $msg]} {
+	    return -code error "No name server present @ $sid"
+	} else {
+	    return -code error $msg
+	}
+    }
+    # No result to return
+    return
+}
+
+proc ::nameserv::SERV {} {
+    variable comm
+    variable sid
+    variable host
+    variable port
+    if {$comm ne ""} {return $comm}
+
+    # NOTE
+    # -local 1 means that clients can only talk to a local
+    #          name service. Might make sense to auto-force
+    #          -local 0 for host ne "localhost".
+
+    set     interp [interp::createEmpty]
+    foreach msg {
+	Search/Continuous/Change
+    } {
+	interp alias $interp $msg {} ::nameserv::$msg
+    }
+
+    set sid  [list $port $host]
+    set comm [comm::comm new ::nameserv::CSERV \
+		  -interp $interp \
+		  -local  1 \
+		  -listen 1]
+
+    $comm hook lost ::nameserv::LOST
+
+    log::debug [list SERV @ $sid : $comm]
+    return $comm
+}
+
+proc ::nameserv::LOST {args} {
+    upvar 1 id id chan chan reason reason
+    variable comm
+    variable sid
+    variable search
+
+    log::debug [list LOST @ $sid - $reason]
+
+    $comm destroy
+
+    set comm {}
+    set sid  {}
+
+    # Notify async/cont search of the loss.
+    foreach r [array names search] {
+	$r DATA stop
+	unset search($r)
+    }
+
+    uevent::generate nameserv lost-connection [list reason $reason]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Initialization - System state
+
+namespace eval ::nameserv {
+    # Object command of the communication channel to the server.
+    # If present re-configuration is not possible. Also the comm
+    # id of the server.
+
+    variable comm {}
+    variable sid  {}
+
+    # Table of active async/cont searches
+
+    variable search ; array set search {}
+}
+
+# ### ### ### ######### ######### #########
+## API: Configuration management (host, port)
+
+proc ::nameserv::cget {option} {
+    return [configure $option]
+}
+
+proc ::nameserv::configure {args} {
+    variable host
+    variable port
+    variable comm
+
+    if {![llength $args]} {
+	return [list -host $host -port $port]
+    }
+    if {[llength $args] == 1} {
+	# cget
+	set opt [lindex $args 0]
+	switch -exact -- $opt {
+	    -host { return $host }
+	    -port { return $port }
+	    default {
+		return -code error "bad option \"$opt\", expected -host, or -port"
+	    }
+	}
+    }
+
+    if {$comm ne ""} {
+	return -code error "Unable to configure an active connection"
+    }
+
+    # Note: Should -port/-host be made configurable after
+    # communication has started it will be necessary to provide code
+    # which retracts everything from the old server and re-initializes
+    # the new one.
+
+    while {[llength $args]} {
+	set opt [lindex $args 0]
+	switch -exact -- $opt {
+	    -host {
+		if {[llength $args] < 2} {
+		    return -code error "value for \"$opt\" is missing"
+		}
+		set host [lindex $args 1]
+		set args [lrange $args 2 end]
+	    }
+	    -port {
+		if {[llength $args] < 2} {
+		    return -code error "value for \"$opt\" is missing"
+		}
+		set port [lindex $args 1]
+		# Todo: Check non-zero unsigned short integer
+		set args [lrange $args 2 end]
+	    }
+	    default {
+		return -code error "bad option \"$opt\", expected -host, or -port"
+	    }
+	}
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Receiver for continuous and async searches
+
+proc ::nameserv::Search/Continuous/Change {tag type response} {
+
+    # Ignore messages for searches which were canceled already.
+    #
+    # Due to the async nature of the messages for cont/async search
+    # the client may have canceled the receiver object already, sent
+    # the stop message already, but still has to process search
+    # results which were already in flight. We ignore them.
+
+    if {![llength [info commands $tag]]} return
+
+    # This client uses the receiver object as tag, dispatch the
+    # received notification to it.
+
+    $tag DATA $type $response
+    return
+}
+
+snit::type ::nameserv::receiver {
+    option -command -default {}
+
+    constructor {{once 0}} {
+	set singleshot $once
+	return
+    }
+
+    destructor {
+	if {$singleshot} return
+	::nameserv::ASYNC Search/Continuous/Stop $self
+	Callback stop {}
+	return
+    }
+
+    method get {k} {
+	if {![info exists current($k)]} {return -code error "Unknown key \"$k\""}
+	return $current($k)
+    }
+
+    method names {} {
+	return [array names current]
+    }
+
+    method size {} {
+	return [array size current]
+    }
+
+    method getall {{pattern *}} {
+	return [array get current $pattern]
+    }
+
+    method filled {} {
+	return $filled
+    }
+
+    method {DATA stop} {} {
+	if {$filled && $singleshot} return
+	set singleshot 1 ; # Prevent 'stop' again during destruction.
+	Callback stop {}
+	return
+    }
+
+    method {DATA add} {response} {
+	set filled 1
+	if {$singleshot} {
+	    ASYNC Search/Continuous/Stop $self
+	}
+	array set current $response
+	Callback add $response
+	if {$singleshot} {
+	    Callback stop {}
+	}
+	return
+    }
+
+    method {DATA remove} {response} {
+	set filled 1
+	foreach {k v} $response {
+	    unset -nocomplain current($k)
+	}
+	Callback remove $response
+	return
+    }
+
+    proc Callback {type response} {
+	upvar 1 options options
+	if {$options(-command) eq ""} return
+	# Defer execution to event loop
+	after 0 [linsert $options(-command) end $type $response]
+	return
+    }
+
+    variable singleshot 0
+    variable current -array {}
+    variable filled 0
+}
+
+# ### ### ### ######### ######### #########
+## Initialization - Tracing, Configuration
+
+logger::initNamespace ::nameserv
+namespace eval        ::nameserv {
+    # Host and port to connect to, to get access to the nameservice.
+
+    variable host localhost
+    variable port [nameserv::common::port]
+
+    namespace export bind release search protocol \
+	server_protocol server_features configure cget
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide nameserv 0.4.2
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/nns_auto.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/nns_auto.tcl
new file mode 100644
index 00000000..b0817410
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/nns_auto.tcl
@@ -0,0 +1,443 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Name Service - Client side connection monitor
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require nameserv 0.4.1 ; # Name service client-side core
+package require uevent   ; # Watch for connection-loss
+
+namespace eval ::nameserv::auto {}
+
+# ### ### ### ######### ######### #########
+## API: Write, Read, Search
+
+proc ::nameserv::auto::bind {name data} {
+    # See nameserv::bind. Remembers the information, for re-binding
+    # when the connection was lost, and later restored.
+
+    # Note: Enter has a return value we do not want, bind has no
+    # return value. Otherwise 'Enter' would not be necessary and
+    # simply be 'bind'.
+
+    Enter $name $data normal
+    return
+}
+
+proc ::nameserv::auto::release {} {
+    # Releases all names the application has registered at the
+    # configured name service.
+    variable bindings
+    variable timer
+
+    array unset bindings *
+    if {$timer ne ""} {
+	# Actually release the data only if the connection is
+	# currently not lost. Otherwise they are gone already, and
+	# just forgetting them here (see above) was enough.
+	nameserv::release
+    }
+    return
+}
+
+proc ::nameserv::auto::search {args} {
+    variable searches
+
+    # Note: Here we are using a semi-public command of 'nameserv' to
+    # parse the search arguments on our own to determine if we need
+    # the persistence or not.
+
+    array set a [nameserv::search-parseargs $args]
+    upvar 0 a(oneshot)    oneshot
+    upvar 0 a(continuous) continuous
+    upvar 0 a(pattern)    pattern
+
+    if {!$continuous} {
+	# Result is direct result of the search, pass through to
+	# caller, nothing to persist.
+
+	return [eval [linsert $args 0 ::nameserv::search]]
+	# 8.5: return [nameserv::search {*}$args]
+    }
+
+    # Continuous or async search. The result we got is a receiver
+    # object. Wrap our own persistent receiver around it so that it
+    # can handle a loss of connection while we are waiting for the
+    # search result.
+
+    return [receiver %AUTO% $oneshot $args]
+}
+
+proc ::nameserv::auto::protocol {} {
+    return [nameserv::protocol]
+}
+
+proc ::nameserv::auto::server_protocol {} {
+    return [nameserv::server_protocol]
+}
+
+proc ::nameserv::auto::server_features {} {
+    return [nameserv::server_features]
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper commands.
+
+proc ::nameserv::auto::Reconnect {args} {
+    # args = <>|<tags event details>
+    # <tag,event> = <'nameserv','lost'>
+    #     details = dict ('reason' -> string)
+
+    StopReconnect
+
+    if {![catch {
+	::nameserv::server_features
+    }]} {
+	# Note: Reloss of connection during Rebind will also
+	# StartReconnect
+	Rebind
+	return
+    }
+
+    StartReconnect
+    return
+}
+
+proc ::nameserv::auto::Rebind {} {
+    variable bindings
+    variable searches
+
+    foreach {name data} [array get bindings] {
+	if {![Enter $name $data restore]} return
+    }
+
+    foreach receiver [array names searches] {
+	if {![$receiver restore]} return
+    }
+
+    # Fully restored, time to notify interested parties
+    uevent::generate nameserv re-connection {}
+    return
+}
+
+proc ::nameserv::auto::Enter {name data how} {
+    variable bindings
+
+    # Remember locally for possible loss of connection ...
+    set bindings($name) $data
+
+    # ... then forward to name server
+    if {[catch {
+	nameserv::bind $name $data
+    } msg]} {
+	# Problem with server while (re)binding a name.
+
+	if {[string match {*No name server*} $msg]} {
+	    # Lost the server (again), while (re)binding a name. Abort
+	    # and restart the watcher waiting for the server to come
+	    # back.
+	    StartReconnect
+	    return 0
+	}
+
+	# Other error => (name already bound). This means that someone
+	# else took the name while we were not connected to the
+	# service, or the name was bound before the call anyway. The
+	# reaction depends on our entry point. For regular bind we
+	# return the error as is to keep API compatibility. During
+	# restoration OTOH the best effort we can do is to deliver a
+	# note about the total loss of this binding to all interested
+	# observers via event. Additionally remove the lost item from
+	# the set of names to remember. Note that there is no need to
+	# restart the watcher, the server was _not_ lost.
+
+	unset bindings($name)
+	if {$how eq "normal"} {
+	    return -code $msg
+	} else {
+	    uevent::generate nameserv lost-name [list name $name data $data]
+	    return 1
+	}
+    }
+
+    # Success, nothing further to do.
+    return 1
+}
+
+# ### ### ### ######### ######### #########
+## Management of the reconnect timer.
+
+proc ::nameserv::auto::StartReconnect {} {
+    variable timer
+    variable delay
+    if {$timer ne ""} return
+    set timer [after $delay ::nameserv::auto::Reconnect]
+    return
+}
+
+proc ::nameserv::auto::StopReconnect {} {
+    variable timer ""
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Persistent receiver for continuous and async searches.
+
+snit::type ::nameserv::auto::receiver {
+
+    option -command -default {}
+
+    constructor {once search} {
+	set mysingleshot $once
+	set mysearch     $search
+	$self restore ; # Create internal volatile receiver.
+	return
+    }
+
+    destructor {
+	if {$myreceiver ne ""} { $myreceiver destroy }
+	if {$mysingleshot} return
+	Callback stop {}
+	return
+    }
+
+    method restore {} {
+	set nameserv::auto::searches($self) .
+
+	if {[catch {
+	    set result [eval [linsert $mysearch 0 ::nameserv::search]]
+	    # 8.5: set result [nameserv::search {*}$mysearch]
+	} msg]} {
+	    # Problem with server while restoring a search.
+
+	    if {[string match {*No name server*} $msg]} {
+		# Lost the server (again), while restoring the search.
+		# Abort and restart the watcher waiting for the server
+		# to come back.
+		::nameserv::auto::StartReconnect
+		return 0
+	    }
+
+	    # Rethrow other problems.
+	    return -code error $msg
+	}
+
+	# Restored, prepare ourselves
+	set myreceiver $result
+	set myclear    1       ; # Have to clear previous data when
+				 # the new set comes in.
+	$myreceiver configure -command [mymethod DATA]
+	return 1
+    }
+
+    method get {k} {
+	if {![info exists mycurrent($k)]} {return -code error "Unknown key \"$k\""}
+	return $current($k)
+    }
+
+    method names {} {
+	return [array names mycurrent]
+    }
+
+    method size {} {
+	return [array size mycurrent]
+    }
+
+    method getall {{pattern *}} {
+	return [array get mycurrent $pattern]
+    }
+
+    method filled {} {
+	return $myfilled
+    }
+
+    # Handler for events coming from the breakable search.
+
+    method {DATA stop} {args} {
+	# Ignore the response dict, it is empty anyway.
+	# Get rid of the volatile receiver.
+	if {$myreceiver ne ""} { $myreceiver destroy }
+	#  Oneshot handling happened already.
+	return
+    }
+
+    method {DATA add} {response} {
+	# New entries to handle
+	set myfilled 1
+	if {$mysingleshot} {
+	    # The search was async and is now done, therefore we can
+	    # get rid of the volatile receiver and do not have to care
+	    # about the loss of the connection any longer.
+	    $myreceiver destroy
+	    set myreceiver ""
+	    unset ::nameserv::auto::searches($self)
+	}
+	if {$myclear} {
+	    # Handle a refill after a connection loss, the new data
+	    # overwrites everything known before.
+	    array unset mycurrent *
+	    set myclear 0
+	}
+	array set mycurrent $response
+	Callback add $response
+	if {$mysingleshot} {
+	    Callback stop {}
+	}
+	return
+    }
+
+    method {DATA remove} {response} {
+	set myfilled 1
+	foreach {k v} $response {
+	    unset -nocomplain mycurrent($k)
+	}
+	Callback remove $response
+	return
+    }
+
+    # Run our own callback.
+
+    proc Callback {type response} {
+	upvar 1 options options
+	if {$options(-command) eq ""} return
+	# Defer execution to event loop
+	after 0 [linsert $options(-command) end $type $response]
+	return
+    }
+
+    # Search state
+
+    variable mysingleshot     0  ; # Bool flag, set if search is
+				   # async, not continous.
+    variable mycurrent -array {} ; # Current state of search results
+    variable myfilled         0  ; # Bool flag, set when result has arrived.
+
+    variable mysearch         "" ; # Copy of search definition, for
+				   # its restoration after our
+				   # connection to the service was
+				   # restored.
+    variable myclear          0  ; # Bool flag, set when state has to
+				   # be cleared before adding new
+				   # data, for refill after a
+				   # connection has been restored.
+    variable myreceiver       "" ; # Volatile breakable regular search
+				   # receiver.
+}
+
+# ### ### ### ######### ######### #########
+## Initialization - System state
+
+namespace eval ::nameserv::auto {
+    # In-memory database of bindings to restore after connection was
+    # lost and restored.
+
+    variable bindings ; array set bindings {}
+
+    # In-memory database of continuous and unfulfilled async searches
+    # to restore after the connection was lost and restored.
+
+    variable searches ; array set searches {}
+
+    # Handle of the timer used to periodically try to reconnect with
+    # the server in the case it was lost.
+
+    variable timer ""
+}
+
+# ### ### ### ######### ######### #########
+## API: Configuration management (host, port)
+
+proc ::nameserv::auto::cget {option} {
+    return [configure $option]
+}
+
+proc ::nameserv::auto::configure {args} {
+    variable delay
+
+    if {![llength $args]} {
+	# Merge the underlying configuration with the local settings
+	# before returning.
+	return [linsert [nameserv::configure] 0 -delay $delay]
+    }
+    if {[llength $args] == 1} {
+	# cget
+	set opt [lindex $args 0]
+	switch -exact -- $opt {
+	    -delay { return $delay }
+	    default {
+		# Not a local option, check with underlying package
+		# before throwing an error.
+		if {![catch {
+		    nameserv::cget $opt
+		} v]} {
+		    return $v
+		}
+		return -code error "[string map {{expected } {expected -delay, }} $v]"
+	    }
+	}
+    }
+
+    while {[llength $args]} {
+	set opt [lindex $args 0]
+	switch -exact -- $opt {
+	    -delay {
+		if {[llength $args] < 2} {
+		    return -code error "value for \"$opt\" is missing"
+		}
+		set delay [lindex $args 1]
+		set args  [lrange $args 2 end]
+
+		# Using the 'incr' hack instead of 'string is integer'
+		# allows delays larger than 32bit in Tcl 8.5.
+		if {[catch {incr delay 0}]} {
+		    return -code error "bad value for \"$opt\", expected integer, got \"$delay\""
+		} elseif {$delay <= 0} {
+		    return -code error "bad value for \"$opt\", is not greater than zero"
+		}
+	    }
+	    default {
+		# Not a local option, check with underlying package
+		# before throwing an error.
+		if {[catch {
+		    nameserv::configure $opt [lindex $args 1]
+		} v]} {
+		    if {[string match {bad option*} $v]} {
+			# Fix list of options in error before rethrowing.
+			return -code error "[string map {{expected } {expected -delay, }} $v]"
+		    } else {
+			# Rethrow error unchanged
+			return -code error $v
+		    }
+		}
+		# No error, option is processed, continue after it.
+		set args [lrange $args 2 end]
+	    }
+	}
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Initialization - Tracing, Configuration
+
+logger::initNamespace ::nameserv::auto
+namespace eval        ::nameserv::auto {
+    # Interval between reconnection attempts when connection was lost.
+
+    variable delay 1000 ; # One second
+
+    namespace export bind release search protocol \
+	server_protocol server_features configure cget
+}
+
+# Watch the base client for the loss of the connection.
+uevent::bind nameserv lost-connection ::nameserv::auto::Reconnect
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide nameserv::auto 0.3
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/pkgIndex.tcl
new file mode 100644
index 00000000..173fbe50
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/pkgIndex.tcl
@@ -0,0 +1,7 @@
+if {![package vsatisfies [package provide Tcl] 8]} {return}
+package ifneeded nameserv::common 0.1 [list source [file join $dir common.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded nameserv         0.4.2 [list source [file join $dir nns.tcl]]
+package ifneeded nameserv::server 0.3.2 [list source [file join $dir server.tcl]]
+package ifneeded nameserv::auto   0.3   [list source [file join $dir nns_auto.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/server.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/server.tcl
new file mode 100644
index 00000000..54ee6885
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nns/server.tcl
@@ -0,0 +1,385 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Name Service - Server (Singleton)
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.4
+package require comm             ; # Generic message transport
+package require interp           ; # Interpreter helpers.
+package require logger           ; # Tracing internal activity
+package require nameserv::common ; # Common/shared utilities
+
+namespace eval ::nameserv::server {}
+
+# ### ### ### ######### ######### #########
+## API: Start, Stop
+
+proc ::nameserv::server::start {} {
+    variable comm
+    variable port
+    variable localonly
+
+    log::debug "start"
+    if {$comm ne ""} return
+
+    log::debug "start /granted"
+
+    set     interp [interp::createEmpty]
+    foreach msg {
+	Bind
+	Release
+	Search
+	Search/Continuous/Start
+	Search/Continuous/Stop
+	ProtocolVersion
+	ProtocolFeatures
+    } {
+	interp alias $interp $msg {} ::nameserv::server::$msg
+    }
+
+    set comm [comm::comm new ::nameserv::server::COMM \
+		  -interp $interp \
+		  -port   $port \
+		  -listen 1 \
+		  -local  $localonly]
+
+    $comm hook lost ::nameserv::server::LOST
+
+    log::debug "UP @$port local-only $localonly"
+    return
+}
+
+proc ::nameserv::server::stop {} {
+    variable comm
+    variable names
+    variable data
+
+    log::debug "stop"
+    if {$comm eq ""} return
+
+    log::debug "stop /granted"
+
+    # This kills all existing connection and destroys the configured
+    # -interp as well.
+
+    $comm destroy
+    set comm ""
+
+    array unset names *
+    array unset data  *
+
+    log::debug "DOWN"
+    return
+}
+
+proc ::nameserv::server::active? {} {
+    variable comm
+    return [expr {$comm ne ""}]
+}
+
+# ### ### ### ######### ######### #########
+## INT: Protocol operations
+
+proc ::nameserv::server::ProtocolVersion  {} {return 1}
+proc ::nameserv::server::ProtocolFeatures {} {return {Core Search/Continuous}}
+
+proc ::nameserv::server::Bind {name cdata} {
+    variable comm
+    variable names
+    variable data
+
+    set id [$comm remoteid]
+
+    log::debug "bind ([list $name -> $cdata]), for $id"
+
+    if {[info exists data($name)]} {
+	log::debug "bind failed, \"$name\" is already bound"
+	return -code error "Name \"$name\" is already bound"
+    }
+
+    lappend names($id)  $name
+    set     data($name) $cdata
+
+    Search/Continuous/NotifyAdd $name $cdata
+    return
+}
+
+proc ::nameserv::server::Release {} {
+    variable comm
+    ReleaseId [$comm remoteid]
+    return
+}
+
+proc ::nameserv::server::Search {pattern} {
+    variable data
+    return [array get data $pattern]
+}
+
+proc ::nameserv::server::ReleaseId {id} {
+    variable names
+    variable data
+    variable searchi
+
+    log::debug "release id $id"
+
+    # Two steps. Release all searches the client may have open, then
+    # all names it may have bound. That last step may trigger
+    # notifications for searches by other clients. It must not trigger
+    # searches from the client just going away, hence their release
+    # first.
+
+    foreach k [array names searchi [list $id *]] {
+	Search/Release $k
+    }
+
+    if {[info exists names($id)]} {
+	set gone {}
+	foreach n $names($id) {
+	    lappend gone $n $data($n)
+	    catch {unset data($n)}
+
+	    log::debug "release name <$n>"
+	}
+	unset names($id)
+
+	Search/Continuous/NotifyRelease $gone
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Support for continuous and async searches
+
+proc ::nameserv::server::Search/Continuous/Start {tag pattern} {
+    variable data
+    variable searchi
+    variable searchp
+    variable comm
+
+    set id [$comm remoteid]
+
+    # Register the search, then generate the initial response.
+    # Non-unique tags are silently discarded. Clients will wait
+    # forever.
+
+    set k [list $id $tag]
+
+    log::debug "search <$k>"
+
+    if {[info exists searchi($k)]} {
+	log::debug "search already known"
+	return
+    }
+
+    log::debug "search added"
+
+    set searchi($k) $pattern
+    lappend searchp($pattern) $k
+
+    $comm send -async $id [list Search/Continuous/Change \
+			       $tag add [array get data $pattern]]
+    return
+}
+
+proc ::nameserv::server::Search/Continuous/Stop {tag} {
+    Search/Release [list [$comm remoteid] $tag]
+    return
+}
+
+proc ::nameserv::server::Search/Release {k} {
+    variable searchi
+    variable searchp
+
+    # Remove search information from the data store
+
+    if {![info exists searchi($k)]} return
+
+    log::debug "release search <$k>"
+
+    set pattern $searchi($k)
+    unset searchi($k)
+
+    set pos [lsearch -exact $searchp($pattern) $k]
+    if {$pos < 0} return
+    set new [lreplace $searchp($pattern) $pos $pos]
+    if {[llength $new]} {
+	# Shorten the callback list.
+	set searchp($pattern) $new
+    } else {
+	# Nothing monitors that pattern anymore, remove it completely.
+	unset searchp($pattern)
+    }
+    return
+}
+
+proc ::nameserv::server::Search/Continuous/NotifyAdd {name val} {
+    variable searchp
+
+    # Abort quickly if there are no searches waiting.
+    if {![array size searchp]} return
+
+    foreach p [array names searchp] {
+	if {![string match $p $name]} continue
+	Notify $p add [list $name $val]
+    }
+    return
+}
+
+proc ::nameserv::server::Search/Continuous/NotifyRelease {gone} {
+    variable searchp
+
+    # Abort quickly if there are no searches waiting.
+    if {![array size searchp]} return
+
+    array set m $gone
+    foreach p [array names searchp] {
+	set response [array get m $p]
+	if {![llength $response]} continue
+	Notify $p remove $response
+    }
+    return
+}
+
+proc ::nameserv::server::Notify {p type response} {
+    variable searchp
+    variable comm
+
+    foreach item $searchp($p) {
+	foreach {id tag} $item break
+	$comm send -async $id \
+	    [list Search/Continuous/Change $tag $type $response]
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Initialization - In-memory database
+
+namespace eval ::nameserv::server {
+    # Database
+    # search = list (id tag) : Searches are identified by client and a tag.
+    #
+    # array (id   -> list (name))      : Names under which a connection is known.
+    # array (name -> data)             : Data associated with a name.
+    #
+    # array (pattern -> list (search)) : Per pattern the list of searches using it.
+    # array (search -> pattern)        : Pattern per active search.
+    #
+    # searchp <~~> names
+    # searchi <~~> data
+
+    variable names   ; array set names {}
+    variable data    ; array set data  {}
+    variable searchp ; array set searchp {}
+    variable searchi ; array set searchi {}
+}
+
+# ### ### ### ######### ######### #########
+## INT: Connection management
+
+proc ::nameserv::server::LOST {args} {
+    # Currently just to see when a client goes away.
+
+    upvar 1 id id chan chan reason reason
+    ReleaseId $id
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Initialization - System state
+
+namespace eval ::nameserv::server {
+    # Object command of the communication channel of the server.
+    # If present re-configuration is not possible.
+
+    variable comm {}
+}
+
+# ### ### ### ######### ######### #########
+## API: Configuration management (host, port)
+
+proc ::nameserv::server::cget {option} {
+    return [configure $option]
+}
+
+proc ::nameserv::server::configure {args} {
+    variable localonly
+    variable port
+    variable comm
+
+    if {![llength $args]} {
+	return [list -localonly $localonly -port $port]
+    }
+    if {[llength $args] == 1} {
+	# cget
+	set opt [lindex $args 0]
+	switch -exact -- $opt {
+	    -localonly { return $localonly }
+	    -port      { return $port }
+	    default {
+		return -code error "bad option \"$opt\", expected -localonly, or -port"
+	    }
+	}
+    }
+
+    # Note: Should -port be made configurable after communication has
+    # started it might be necessary to provide code to re-initialize
+    # the connections to all known clients using the new
+    # configuration.
+
+    while {[llength $args]} {
+	set opt [lindex $args 0]
+	switch -exact -- $opt {
+	    -localonly {
+		if {[llength $args] < 2} {
+		    return -code error "value for \"$opt\" is missing"
+		}
+		# Todo: Check boolean 
+		set new  [lindex $args 1]
+		set args [lrange $args 2 end]
+
+		if {$new == $localonly} continue
+		set localonly $new
+		if {$comm eq ""} continue
+		$comm configure -local $localonly
+	    }
+	    -port {
+		if {$comm ne ""} {
+		    return -code error "Unable to configure an active server"
+		}
+		if {[llength $args] < 2} {
+		    return -code error "value for \"$opt\" is missing"
+		}
+		# Todo: Check non-zero unsigned short integer
+		set port [lindex $args 1]
+		set args [lrange $args 2 end]
+	    }
+	    default {
+		return -code error "bad option \"$opt\", expected -localonly, or -port"
+	    }
+	}
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Initialization - Tracing, Configuration
+
+logger::initNamespace ::nameserv::server
+namespace eval        ::nameserv::server {
+    # Port the server will listen on, and boolean flag determining
+    # acceptance of non-local connections.
+
+    variable port      [nameserv::common::port]
+    variable localonly 1
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide nameserv::server 0.3.2
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nntp/nntp.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nntp/nntp.tcl
new file mode 100644
index 00000000..58b1c73d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nntp/nntp.tcl
@@ -0,0 +1,979 @@
+# nntp.tcl --
+#
+#       nntp implementation for Tcl.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+# All rights reserved.
+# 
+# RCS: @(#) $Id: nntp.tcl,v 1.13 2004/05/03 22:56:25 andreas_kupries Exp $
+
+package require Tcl 8.2
+package provide nntp 0.2.1
+
+namespace eval ::nntp {
+    # The socks variable holds the handle to the server connections
+    variable socks
+
+    # The counter is used to help create unique connection names
+    variable counter 0
+
+    # commands is the list of subcommands recognized by nntp
+    variable commands [list \
+            "article"     \
+            "authinfo"    \
+            "body"        \
+            "date"        \
+            "group"       \
+            "head"        \
+            "help"        \
+            "last"        \
+            "list"        \
+            "listgroup"   \
+            "mode_reader" \
+            "newgroups"   \
+            "newnews"     \
+            "next"        \
+            "post"        \
+            "stat"        \
+            "quit"        \
+            "xgtitle"     \
+            "xhdr"        \
+            "xover"       \
+            "xpat"        \
+            ]
+
+    set ::nntp::eol "\n"
+
+    # only export one command, the one used to instantiate a new
+    # nntp connection 
+    namespace export nntp
+
+}
+
+# ::nntp::nntp --
+#
+#       Create a new nntp connection.
+#
+# Arguments:
+#        server -   The name of the nntp server to connect to (optional).
+#        port -     The port number to connect to (optional).
+#        name -     The name of the nntp connection to create (optional).
+#
+# Results:
+#    Creates a connection to the a nntp server.  By default the
+#    connection is established with the machine 'news' at port '119'
+#    These defaults can be overridden with the environment variables
+#    NNTPPORT and NNTPHOST, or can be passed as optional arguments
+
+proc ::nntp::nntp {{server ""} {port ""} {name ""}} {
+    global env
+    variable connections
+    variable counter
+    variable socks
+
+    # If a name wasn't specified for the connection, create a new 'unique'
+    # name for the connection 
+
+    if { [llength [info level 0]] < 4 } {
+        set counter 0
+        set name "nntp${counter}"
+        while {[lsearch -exact [info commands] $name] >= 0} {
+            incr counter
+            set name "nntp${counter}"
+        }
+    }
+
+    if { ![string equal [info commands ::$name] ""] } {
+        error "command \"$name\" already exists, unable to create nntp connection"
+    }
+
+    upvar 0 ::nntp::${name}data data
+
+    set socks($name) [list ]
+
+    # Initialize instance specific variables
+
+    set data(debug) 0
+    set data(eol) "\n"
+
+    # Logic to determine whether to use the specified nntp server, or to use
+    # the default
+
+    if {$server == ""} {
+        if {[info exists env(NNTPSERVER)]} {
+            set data(host) "$env(NNTPSERVER)"
+        } else {
+            set data(host) "news"
+        }
+    } else {
+        set data(host) $server
+    }
+
+    # Logic to determine whether to use the specified nntp port, or to use the
+    # default.
+
+    if {$port == ""} {
+        if {[info exists env(NNTPPORT)]} {
+            set data(port) $env(NNTPPORT)
+        } else {    
+            set data(port) 119
+        }
+    } else {
+        set data(port) $port
+    }
+ 
+    set data(code) 0
+    set data(mesg) ""
+    set data(addr) ""
+    set data(binary) 0
+
+    set sock [socket $data(host) $data(port)]
+
+    set data(sock) $sock
+
+    # Create the command to manipulate the nntp connection
+
+    interp alias {} ::$name {} ::nntp::NntpProc $name
+    
+    ::nntp::response $name
+
+    return $name
+}
+
+# ::nntp::NntpProc --
+#
+#       Command that processes all nntp object commands.
+#
+# Arguments:
+#       name    name of the nntp object to manipulate.
+#       args    command name and args for the command.
+#
+# Results:
+#       Calls the appropriate nntp procedure for the command specified in
+#       'args' and passes 'args' to the command/procedure.
+
+proc ::nntp::NntpProc {name {cmd ""} args} {
+
+    # Do minimal args checks here
+
+    if { [llength [info level 0]] < 3 } {
+        error "wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+
+    if { [llength [info commands ::nntp::_$cmd]] == 0 } {
+        variable commands
+        set optlist [join $commands ", "]
+        set optlist [linsert $optlist "end-1" "or"]
+        error "bad option \"$cmd\": must be $optlist"
+    }
+
+    # Call the appropriate command with its arguments
+
+    return [eval [linsert $args 0 ::nntp::_$cmd $name]]
+}
+
+# ::nntp::okprint --
+#
+#       Used to test the return code stored in data(code) to
+#       make sure that it is alright to right to the socket.
+#
+# Arguments:
+#       name    name of the nntp object.
+#
+# Results:
+#       Either throws an error describing the failure, or
+#       'args' and passes 'args' to the command/procedure or
+#       returns 1 for 'OK' and 0 for error states.   
+
+proc ::nntp::okprint {name} {
+    upvar 0 ::nntp::${name}data data
+
+    if {$data(code) >=400} {
+        set val [expr {(0 < $data(code)) && ($data(code) < 400)}]
+        error "NNTPERROR: $data(code) $data(mesg)"
+    }
+
+    # Codes less than 400 are good
+
+    return [expr {(0 < $data(code)) && ($data(code) < 400)}]
+}
+
+# ::nntp::message --
+#
+#       Used to format data(mesg) for printing to the socket
+#       by appending the appropriate end of line character which
+#       is stored in data(eol).
+#
+# Arguments:
+#       name    name of the nntp object.
+#
+# Results:
+#       Returns a string containing the message from data(mesg) followed
+#       by the eol character(s) stored in data(eol)
+
+proc ::nntp::message {name} {
+    upvar 0 ::nntp::${name}data data
+
+    return "$data(mesg)$data(eol)"
+}
+
+#################################################
+#
+# NNTP Methods
+#
+
+proc ::nntp::_cget {name option} {
+    upvar 0 ::nntp::${name}data data
+
+    if {[string equal $option -binary]} {
+	return $data(binary)
+    } else {
+	return -code error \
+		"Illegal option \"$option\", expected \"-binary\""
+    }
+}
+
+proc ::nntp::_configure {name args} {
+    upvar 0 ::nntp::${name}data data
+
+    if {[llength $args] == 0} {
+	return [list -binary $data(binary)]
+    }
+    if {[llength $args] == 1} {
+	return [_cget $name [lindex $args 0]]
+    }
+    if {([llength $args] % 2) == 1} {
+	return -code error \
+		"wrong#args: expected even number of elements"
+    }
+    foreach {o v} $args {
+	if {[string equal $o -binary]} {
+	    if {![string is boolean -strict $v]} {
+		return -code error \
+			"Expected boolean, got \"$v\""
+	    }
+	    set data(binary) $v
+	} else {
+	    return -code error \
+		    "Illegal option \"$o\", expected \"-binary\""
+	}
+    }
+    return {}
+}
+
+
+# ::nntp::_article --
+#
+#       Internal article proc.  Called by the 'nntpName article' command.
+#       Retrieves the article specified by msgid, in the group specified by
+#       the 'nntpName group' command.  If no msgid is specified the current 
+#       (or first) article in the group is retrieved
+#
+# Arguments:
+#       name    name of the nntp object.
+#       msgid   The article number to retrieve
+#
+# Results:
+#       Returns the message (if there is one) from the specified group as
+#       a valid tcl list where each element is a line of the message.
+#       If no article is found, the "" string is returned.
+#
+# According to RFC 977 the responses are:
+#
+#   220 n  article retrieved - head and body follow
+#           (n = article number,  = message-id)
+#   221 n  article retrieved - head follows
+#   222 n  article retrieved - body follows
+#   223 n  article retrieved - request text separately
+#   412 no newsgroup has been selected
+#   420 no current article has been selected
+#   423 no such article number in this group
+#   430 no such article found
+#
+ 
+proc ::nntp::_article {name {msgid ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "ARTICLE $msgid"]
+}
+
+# ::nntp::_authinfo --
+#
+#       Internal authinfo proc.  Called by the 'nntpName authinfo' command.
+#       Passes the username and password for a nntp server to the nntp server. 
+#
+# Arguments:
+#       name    Name of the nntp object.
+#       user    The username for the nntp server.
+#       pass    The password for 'username' on the nntp server.
+#
+# Results:
+#       Returns the result of the attempts to set the username and password
+#       on the nntp server ( 1 if successful, 0 if failed).
+
+proc ::nntp::_authinfo {name {user "guest"} {pass "foobar"}} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) ""
+    set res [::nntp::command $name "AUTHINFO USER $user"]
+    if {$res} {
+        set res [expr {$res && [::nntp::command $name "AUTHINFO PASS $pass"]}]
+    }
+    return $res
+}
+
+# ::nntp::_body --
+#
+#       Internal body proc.  Called by the 'nntpName body' command.
+#       Retrieves the body of the article specified by msgid from the group
+#       specified by the 'nntpName group' command. If no msgid is specified
+#       the current (or first) message body is returned  
+#
+# Arguments:
+#       name    Name of the nntp object.
+#       msgid   The number of the body of the article to retrieve
+#
+# Results:
+#       Returns the body of article 'msgid' from the group specified through
+#       'nntpName group'. If msgid is not specified or is "" then the body of
+#       the current (or the first) article in the newsgroup will be returned 
+#       as a valid tcl list.  The "" string will be returned if there is no
+#       article 'msgid' or if no group has been specified.
+
+proc ::nntp::_body {name {msgid ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "BODY $msgid"]
+}
+
+# ::nntp::_group --
+#
+#       Internal group proc.  Called by the 'nntpName group' command.
+#       Sets the current group on the nntp server to the group passed in.
+#
+# Arguments:
+#       name    Name of the nntp object.
+#       group   The name of the group to set as the default group.
+#
+# Results:
+#    Sets the default group to the group specified. If no group is specified
+#    or if an invalid group is specified an error is thrown.
+#
+# According to RFC 977 the responses are:
+#
+#  211 n f l s group selected
+#           (n = estimated number of articles in group,
+#           f = first article number in the group,
+#           l = last article number in the group,
+#           s = name of the group.)
+#  411 no such news group
+
+proc ::nntp::_group {name {group ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "groupinfo"
+    if {$group == ""} {
+        set group $data(group)
+    }
+    return [::nntp::command $name "GROUP $group"]
+}
+
+# ::nntp::_head --
+#
+#       Internal head proc.  Called by the 'nntpName head' command.
+#       Retrieves the header of the article specified by msgid from the group
+#       specified by the 'nntpName group' command. If no msgid is specified
+#       the current (or first) message header is returned  
+#
+# Arguments:
+#       name    Name of the nntp object.
+#       msgid   The number of the header of the article to retrieve
+#
+# Results:
+#       Returns the header of article 'msgid' from the group specified through
+#       'nntpName group'. If msgid is not specified or is "" then the header of
+#       the current (or the first) article in the newsgroup will be returned 
+#       as a valid tcl list.  The "" string will be returned if there is no
+#       article 'msgid' or if no group has been specified.
+
+proc ::nntp::_head {name {msgid ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "HEAD $msgid"]
+}
+
+# ::nntp::_help --
+#
+#       Internal help proc.  Called by the 'nntpName help' command.
+#       Retrieves a list of the valid nntp commands accepted by the server.
+#
+# Arguments:
+#       name    Name of the nntp object.
+#
+# Results:
+#       Returns the NNTP commands expected by the NNTP server.
+
+proc ::nntp::_help {name} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "HELP"]
+}
+
+proc ::nntp::_ihave {name {msgid ""} args} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "fetch"
+    if {![::nntp::command $name "IHAVE $msgid"]} {
+        return ""
+    }
+    return [::nntp::squirt $name "$args"]    
+}
+
+# ::nntp::_last --
+#
+#       Internal last proc.  Called by the 'nntpName last' command.
+#       Sets the current message to the message before the current message.
+#
+# Arguments:
+#       name    Name of the nntp object.
+#
+# Results:
+#       None.
+
+proc ::nntp::_last {name} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "msgid"
+    return [::nntp::command $name "LAST"]
+}
+
+# ::nntp::_list --
+#
+#       Internal list proc.  Called by the 'nntpName list' command.
+#       Lists all groups or (optionally) all groups of a specified type.
+#
+# Arguments:
+#       name    Name of the nntp object.
+#       Type    The type of groups to return (active active.times newsgroups
+#               distributions distrib.pats moderators overview.fmt
+#               subscriptions) - optional.
+#
+# Results:
+#       Returns a tcl list of all groups or the groups that match 'type' if
+#       a type is specified.
+
+proc ::nntp::_list {name {type ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "LIST $type"]
+}
+
+# ::nntp::_newgroups --
+#
+#       Internal newgroups proc.  Called by the 'nntpName newgroups' command.
+#       Lists all new groups since a specified time.
+#
+# Arguments:
+#       name    Name of the nntp object.
+#       since   The time to find new groups since.  The time can be in any
+#               format that is accepted by 'clock scan' in tcl.
+#
+# Results:
+#       Returns a tcl list of all new groups added since the time specified. 
+
+proc ::nntp::_newgroups {name since args} {
+    upvar 0 ::nntp::${name}data data
+
+    set since [clock format [clock scan "$since"] -format "%y%m%d %H%M%S"]
+    set dist ""
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "NEWGROUPS $since $dist"]
+}
+
+# ::nntp::_newnews --
+#
+#       Internal newnews proc.  Called by the 'nntpName newnews' command.
+#       Lists all new news in the specified group since a specified time.
+#
+# Arguments:
+#       name    Name of the nntp object.
+#       group   Name of the newsgroup to query.
+#       since   The time to find new groups since.  The time can be in any
+#               format that is accepted by 'clock scan' in tcl. Defaults to
+#               "1 day ago"
+#
+# Results:
+#       Returns a tcl list of all new messages since the time specified. 
+
+proc ::nntp::_newnews {name {group ""} {since ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    if {$group != ""} {
+        if {[regexp -- {^[\w\.\-]+$} $group] == 0} {
+            set since $group
+            set group ""
+        }
+    }
+    if {![info exists group] || ($group == "")} {
+        if {[info exists data(group)] && ($data(group) != "")} {
+            set group $data(group)
+        } else {
+            set group "*"
+        }
+    }
+    if {"$since" == ""} {
+        set since [clock format [clock scan "now - 1 day"]]
+    }
+    set since [clock format [clock scan $since] -format "%y%m%d %H%M%S"]
+    set dist "" 
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "NEWNEWS $group $since $dist"]
+}
+
+# ::nntp::_next --
+#
+#       Internal next proc.  Called by the 'nntpName next' command.
+#       Sets the current message to the next message after the current message.
+#
+# Arguments:
+#       name    Name of the nntp object.
+#
+# Results:
+#       None.
+
+proc ::nntp::_next {name} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "msgid"
+    return [::nntp::command $name "NEXT"]
+}
+
+# ::nntp::_post --
+#
+#       Internal post proc.  Called by the 'nntpName post' command.
+#       Posts a message to a newsgroup.
+#
+# Responses (according to RFC 977) to a post request:
+#  240 article posted ok
+#  340 send article to be posted. End with .
+#  440 posting not allowed
+#  441 posting failed
+#
+# Arguments:
+#       name    Name of the nntp object.
+#       article A message of the form specified in RFC 850
+#
+# Results:
+#       None.
+
+proc ::nntp::_post {name article} {
+    
+    if {![::nntp::command $name "POST"]} {
+        return ""
+    }
+    return [::nntp::squirt $name "$article"]
+}
+
+# ::nntp::_slave --
+#
+#       Internal slave proc.  Called by the 'nntpName slave' command.
+#       Identifies a connection as being made from a slave nntp server.
+#       This might be used to indicate that the connection is serving
+#       multiple people and should be given priority.  Actual use is 
+#       entirely implementation dependant and may vary from server to
+#       server.
+#
+# Arguments:
+#       name    Name of the nntp object.
+#
+# Results:
+#       None.
+#
+# According to RFC 977 the only response is:
+#
+#    202 slave status noted
+
+proc ::nntp::_slave {name} {
+    return [::nntp::command $name "SLAVE"]
+}
+
+# ::nntp::_stat --
+#
+#       Internal stat proc.  Called by the 'nntpName stat' command.
+#       The stat command is similar to the article command except that no
+#       text is returned.  When selecting by message number within a group,
+#       the stat command serves to set the current article pointer without
+#       sending text. The returned acknowledgement response will contain the
+#       message-id, which may be of some value.  Using the stat command to
+#       select by message-id is valid but of questionable value, since a
+#       selection by message-id does NOT alter the "current article pointer"
+#
+# Arguments:
+#       name    Name of the nntp object.
+#       msgid   The number of the message to stat (optional) default is to
+#               stat the current article
+#
+# Results:
+#       Returns the statistics for the article.
+
+proc ::nntp::_stat {name {msgid ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "status"
+    return [::nntp::command $name "STAT $msgid"]
+}
+
+# ::nntp::_quit --
+#
+#       Internal quit proc.  Called by the 'nntpName quit' command.
+#       Quits the nntp session and closes the socket.  Deletes the command
+#       that was created for the connection.
+#
+# Arguments:
+#       name    Name of the nntp object.
+#
+# Results:
+#       Returns the return value from the quit command.
+
+proc ::nntp::_quit {name} {
+    upvar 0 ::nntp::${name}data data
+
+    set ret [::nntp::command $name "QUIT"]
+    close $data(sock)
+    rename ${name} {}
+    return $ret
+}
+
+#############################################################
+#
+# Extended methods (not available on all NNTP servers
+#
+
+proc ::nntp::_date {name} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "msg"
+    return [::nntp::command $name "DATE"]
+}
+
+proc ::nntp::_listgroup {name {group ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "LISTGROUP $group"]
+}
+
+proc ::nntp::_mode_reader {name} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "msg"
+    return [::nntp::command $name "MODE READER"]
+}
+
+proc ::nntp::_xgtitle {name {group_pattern ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "XGTITLE $group_pattern"]
+}
+
+proc ::nntp::_xhdr {name {header "message-id"} {list ""} {last ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    if {![regexp -- {\d+-\d+} $list]} {
+        if {"$last" != ""} {
+            set list "$list-$last"
+        } else {
+            set list ""
+	}
+    }
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "XHDR $header $list"]    
+}
+
+proc ::nntp::_xindex {name {group ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    if {("$group" == "") && [info exists data(group)]} {
+        set group $data(group)
+    }
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "XINDEX $group"]    
+}
+
+proc ::nntp::_xmotd {name {since ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    if {"$since" != ""} {
+        set since [clock seconds]
+    }
+    set since [clock format [clock scan $since] -format "%y%m%d %H%M%S"]
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "XMOTD $since"]    
+}
+
+proc ::nntp::_xover {name {list ""} {last ""}} {
+    upvar 0 ::nntp::${name}data data
+    if {![regexp -- {\d+-\d+} $list]} {
+        if {"$last" != ""} {
+            set list "$list-$last"
+        } else {
+            set list ""
+	}
+    }
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "XOVER $list"]
+}
+
+proc ::nntp::_xpat {name {header "subject"} {list 1} {last ""} args} {
+    upvar 0 ::nntp::${name}data data
+
+    set patterns ""
+
+    if {![regexp -- {\d+-\d+} $list]} {
+        if {("$last" != "") && ([string is digit $last])} {
+            set list "$list-$last"
+        }
+    } elseif {"$last" != ""} {
+        set patterns "$last"
+    }
+    
+    if {[llength $args] > 0} {
+        set patterns "$patterns $args"
+    }
+
+    if {"$patterns" == ""} {
+        set patterns "*"
+    }
+    
+    set data(cmnd) "fetch"
+    return [::nntp::command $name "XPAT $header $list $patterns"]
+}
+
+proc ::nntp::_xpath {name {msgid ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(cmnd) "msg"
+    return [::nntp::command $name "XPATH $msgid"]
+}
+
+proc ::nntp::_xsearch {name args} {
+    set res [::nntp::command $name "XSEARCH"]
+    if {!$res} {
+        return ""
+    }
+    return [::nntp::squirt $name "$args"]    
+}
+
+proc ::nntp::_xthread {name args} {
+    upvar 0 ::nntp::${name}data data
+
+    if {[llength $args] > 0} {
+        set filename "dbinit"
+    } else {
+        set filename "thread"
+    }
+    set data(cmnd) "fetchbinary"
+    return [::nntp::command $name "XTHREAD $filename"]
+}
+
+######################################################
+#
+# Helper methods
+#
+
+proc ::nntp::cmd {name cmd} {
+    upvar 0 ::nntp::${name}data data
+
+    set eol "\015\012"
+    set sock $data(sock)
+    if {$data(debug)} {
+        puts stderr "$sock command $cmd"
+    }
+    puts $sock "$cmd"
+    flush $sock
+    return
+}
+
+proc ::nntp::command {name args} {
+    set res [eval [linsert $args 0 ::nntp::cmd $name]]
+    
+    return [::nntp::response $name]
+}
+
+proc ::nntp::msg {name} {
+    upvar 0 ::nntp::${name}data data
+
+    set res [::nntp::okprint $name]
+    if {!$res} {
+        return ""
+    }
+    return $data(mesg)
+}
+
+proc ::nntp::groupinfo {name} {
+    upvar 0 ::nntp::${name}data data
+
+    set data(group) ""
+
+    if {[::nntp::okprint $name] && [regexp -- {(\d+)\s+(\d+)\s+(\d+)\s+([\w\.]+)} \
+            $data(mesg) match count first last data(group)]} {
+        return [list $count $first $last $data(group)]
+    }
+    return ""
+}
+
+proc ::nntp::msgid {name} {
+    upvar 0 ::nntp::${name}data data
+
+    set result ""
+    if {[::nntp::okprint $name] && \
+            [regsub -- {\s+<[^>]+>} $data(mesg) {} result]} {
+        return $result
+    } else {
+        return ""
+    }
+}
+
+proc ::nntp::status {name} {
+    upvar 0 ::nntp::${name}data data
+
+    set result ""
+    if {[::nntp::okprint $name] && \
+            [regexp -- {\d+\s+<[^>]+>} $data(mesg) result]} {
+        return $result
+    } else {
+        return ""
+    }
+}
+
+proc ::nntp::fetch {name} {
+    upvar 0 ::nntp::${name}data data
+
+    set eol "\012"
+
+    if {![::nntp::okprint $name]} {
+        return ""
+    }
+    set sock $data(sock)
+
+    if {$data(binary)} {
+	set oldenc [fconfigure $sock -encoding]
+	fconfigure $sock -encoding binary
+    }
+
+    set result [list ]
+    while {![eof $sock]} {
+        gets $sock line
+        regsub -- {\015?\012$} $line $data(eol) line
+
+        if {[string match "." $line]} {
+            break
+        }
+	if { [string match "..*" $line] } {
+	    lappend result [string range $line 1 end]
+	} else {
+	    lappend result $line
+	}
+    }
+
+    if {$data(binary)} {
+	fconfigure $sock -encoding $oldenc
+    }
+
+    return $result
+}
+
+proc ::nntp::response {name} {
+    upvar 0 ::nntp::${name}data data
+
+    set eol "\012"
+
+    set sock $data(sock)
+
+    gets $sock line
+    set data(code) 0
+    set data(mesg) ""
+
+    if {$line == ""} {
+        error "nntp: unexpected EOF on $sock\n"
+    }
+
+    regsub -- {\015?\012$} $line "" line
+
+    set result [regexp -- {^((\d\d)(\d))\s*(.*)} $line match \
+            data(code) val1 val2 data(mesg)]
+    
+    if {$result == 0} {
+        puts stderr "nntp garbled response: $line\n";
+        return ""
+    }
+
+    if {$val1 == 20} {
+        set data(post) [expr {!$val2}]
+    }
+
+    if {$data(debug)} {
+        puts stderr "val1 $val1 val2 $val2"
+        puts stderr "code '$data(code)'"
+        puts stderr "mesg '$data(mesg)'"
+        if {[info exists data(post)]} {
+            puts stderr "post '$data(post)'"
+        }
+    } 
+
+    return [::nntp::returnval $name]
+}
+
+proc ::nntp::returnval {name} {
+    upvar 0 ::nntp::${name}data data
+
+    if {([info exists data(cmnd)]) \
+            && ($data(cmnd) != "")} {
+        set command $data(cmnd)
+    } else {
+        set command okprint
+    }
+    
+    if {$data(debug)} {
+        puts stderr "returnval command '$command'"
+    }
+
+    set data(cmnd) ""
+    return [::nntp::$command $name]
+}
+
+proc ::nntp::squirt {name {body ""}} {
+    upvar 0 ::nntp::${name}data data
+
+    set body [split $body \n]
+
+    if {$data(debug)} {
+        puts stderr "$data(sock) sending [llength $body] lines\n";
+    }
+
+    foreach line $body {
+        # Print each line, possibly prepending a dot for lines
+        # starting with a dot and trimming any trailing \n.
+	if { [string match ".*" $line] } {
+	    set line ".$line"
+	}
+        puts $data(sock) $line
+    }
+    puts $data(sock) "."
+    flush $data(sock)
+
+    if {$data(debug)} {
+        puts stderr "$data(sock) is finished sending"
+    }
+    return [::nntp::response $name]
+}
+#eof
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nntp/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nntp/pkgIndex.tcl
new file mode 100644
index 00000000..ac36bfef
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/nntp/pkgIndex.tcl
@@ -0,0 +1,12 @@
+# Tcl package index file, version 1.1
+# This file is generated by the "pkg_mkIndex" command
+# and sourced either when an application starts up or
+# by a "package unknown" script.  It invokes the
+# "package ifneeded" command to set up package-related
+# information so that packages will be loaded automatically
+# in response to "package require" commands.  When this
+# script is sourced, the variable $dir must contain the
+# full path name of this file's directory.
+
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded nntp 0.2.1 [list source [file join $dir nntp.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ntp/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ntp/pkgIndex.tcl
new file mode 100644
index 00000000..21a47f44
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ntp/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded time 1.2.1 [list source [file join $dir time.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ntp/time.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ntp/time.tcl
new file mode 100644
index 00000000..3e6d0f2b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ntp/time.tcl
@@ -0,0 +1,382 @@
+# time.tcl - Copyright (C) 2003 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# Client for the Time protocol. See RFC 868
+# Client for Simple Network Time Protocol - RFC 2030
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.0;                # tcl minimum version
+package require log;                    # tcllib 1.3
+
+namespace eval ::time {
+    namespace export configure gettime server cleanup
+
+    variable options
+    if {![info exists options]} {
+        array set options {
+            -timeserver {}
+            -port       37
+            -protocol   tcp
+            -timeout    10000
+            -command    {}
+            -loglevel   warning
+        }
+        if {![catch {package require udp}]} {
+            set options(-protocol) udp
+        } else {
+            if {![catch {package require ceptcl}]} {
+                set options(-protocol) udp
+            }
+        }
+        log::lvSuppressLE emergency 0
+        log::lvSuppressLE $options(-loglevel) 1
+        log::lvSuppress $options(-loglevel) 0
+    }
+
+    # Store conversions for other epochs. Currently only unix - but maybe
+    # there are some others out there.
+    variable epoch
+    if {![info exists epoch]} {
+        array set epoch {
+            unix 2208988800
+        }
+    }
+
+    # The id for the next token.
+    variable uid
+    if {![info exists uid]} {
+        set uid 0
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Retrieve configuration settings for the time package.
+#
+proc ::time::cget {optionname} {
+    return [configure $optionname]
+}
+
+# Description:
+#  Configure the package.
+#  With no options, returns a list of all current settings.
+#
+proc ::time::configure {args} {
+    variable options
+    set r {}
+    set cget 0
+
+    if {[llength $args] < 1} {
+        foreach opt [lsort [array names options]] {
+            lappend r $opt $options($opt)
+        }
+        return $r
+    }
+
+    if {[llength $args] == 1} {
+        set cget 1
+    }
+
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -port     { set r [SetOrGet -port $cget] }
+            -timeout  { set r [SetOrGet -timeout $cget] }
+            -protocol { set r [SetOrGet -protocol $cget] }
+            -command  { set r [SetOrGet -command $cget] }
+            -loglevel {
+                if {$cget} {
+                    return $options(-loglevel)
+                } else {
+                    set options(-loglevel) [Pop args 1]
+                    log::lvSuppressLE emergency 0
+                    log::lvSuppressLE $options(-loglevel) 1
+                    log::lvSuppress $options(-loglevel) 0
+                }
+            }
+            --        { Pop args ; break }
+            default {
+                set err [join [lsort [array names options -*]] ", "]
+                return -code error "bad option \"$option\": must be $err"
+            }
+        }
+        Pop args
+    }
+    
+    return $r
+}
+
+# Set/get package options.
+proc ::time::SetOrGet {option {cget 0}} {
+    upvar options options
+    upvar args args
+    if {$cget} {
+        return $options($option)
+    } else {
+        set options($option) [Pop args 1]
+    }
+    return {}
+}
+
+# -------------------------------------------------------------------------
+
+proc ::time::getsntp {args} {
+    set token [eval [linsert $args 0 CommonSetup -port 123]]
+    upvar #0 $token State
+    set State(rfc) 2030
+    return [QueryTime $token]
+}
+
+proc ::time::gettime {args} {
+    set token [eval [linsert $args 0 CommonSetup -port 37]]
+    upvar #0 $token State
+    set State(rfc) 868
+    return [QueryTime $token]
+}
+
+proc ::time::CommonSetup {args} {
+    variable options
+    variable uid
+    set token [namespace current]::[incr uid]
+    variable $token
+    upvar 0 $token State
+
+    array set State [array get options]
+    set State(status) unconnected
+    set State(data) {}
+    
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -port     { set State(-port) [Pop args 1] }
+            -timeout  { set State(-timeout) [Pop args 1] }
+            -proto*   { set State(-protocol) [Pop args 1] }
+            -command  { set State(-command) [Pop args 1] }
+            --        { Pop args ; break }
+            default {
+                set err [join [lsort [array names State -*]] ", "]
+                return -code error "bad option \"$option\":\
+                    must be $err."
+            }
+        }
+        Pop args
+    }
+
+    set len [llength $args]
+    if {$len < 1 || $len > 2} {
+        if {[catch {info level -1} arg0]} {
+            set arg0 [info level 0]
+        }
+        return -code error "wrong # args: should be\
+              \"[lindex $arg0 0] ?options? timeserver ?port?\""
+    }
+
+    set State(-timeserver) [lindex $args 0]
+    if {$len == 2} {
+        set State(-port) [lindex $args 1]
+    }
+
+    return $token
+}
+
+proc ::time::QueryTime {token} {
+    variable $token
+    upvar 0 $token State
+
+    if {[string equal $State(-protocol) "udp"]} {
+        if {[llength [package provide ceptcl]] == 0 \
+                && [llength [package provide udp]] == 0} {
+            set State(status) error
+            set State(error) "udp support is not available, \
+                either ceptcl or tcludp required"
+            return $token
+        }
+    }
+
+    if {[catch {
+        if {[string equal $State(-protocol) "udp"]} {
+            if {[llength [package provide ceptcl]] > 0} {
+                # using ceptcl
+                set State(sock) [cep -type datagram \
+                                     $State(-timeserver) $State(-port)]
+                fconfigure $State(sock) -blocking 0
+            } else {
+                # using tcludp
+                set State(sock) [udp_open]
+                udp_conf $State(sock) $State(-timeserver) $State(-port)
+            }
+        } else {
+            set State(sock) [socket $State(-timeserver) $State(-port)]
+        }
+    } sockerr]} {
+        set State(status) error
+        set State(error) $sockerr
+        return $token
+    }
+
+    # setup the timeout
+    if {$State(-timeout) > 0} {
+        set State(after) [after $State(-timeout) \
+                              [list [namespace origin reset] $token timeout]]
+    }
+
+    set State(status) connect
+    fconfigure $State(sock) -translation binary -buffering none
+
+    # SNTP wants a 48 byte request while TIME doesn't care and is happy
+    # to accept any old rubbish. If protocol is TCP then merely connecting
+    # is sufficient to elicit a response.
+    if {[string equal $State(-protocol) "udp"]} {
+        set len [expr {($State(rfc) == 2030) ? 47 : 3}]
+        puts -nonewline $State(sock) \x0b[string repeat \0 $len]
+    }
+
+    fileevent $State(sock) readable \
+        [list [namespace origin ClientReadEvent] $token]
+
+    if {$State(-command) == {}} {
+        wait $token
+    }
+
+    return $token
+}
+
+proc ::time::unixtime {{token {}}} {
+    variable $token
+    variable epoch
+    upvar 0 $token State
+    if {$State(status) != "ok"} {
+        return -code error $State(error)
+    }
+    
+    # SNTP returns 48+ bytes while TIME always returns 4.
+    if {[string length $State(data)] == 4} {
+        # RFC848 TIME
+        if {[binary scan $State(data) I r] < 1} {
+            return -code error "Unable to scan data"
+        }
+        return [expr {int($r - $epoch(unix))&0xffffffff}]
+    } elseif {[string length $State(data)] > 47} {
+        # SNTP TIME
+        if {[binary scan $State(data) c40II -> sec frac] < 1} {
+            return -code error "Failed to decode result"
+        }
+        return [expr {int($sec - $epoch(unix))&0xffffffff}]
+    } else {
+        return -code error "error: data format not recognised"
+    }
+}
+
+proc ::time::status {token} {
+    variable $token
+    upvar 0 $token State
+    return $State(status)
+}
+
+proc ::time::error {token} {
+    variable $token
+    upvar 0 $token State
+    set r {}
+    if {[info exists State(error)]} {
+        set r $State(error)
+    }
+    return $r
+}
+
+proc ::time::wait {token} {
+    variable $token
+    upvar 0 $token State
+
+    if {$State(status) == "connect"} {
+        vwait [subst $token](status)
+    }
+
+    return $State(status)
+}
+
+proc ::time::reset {token {why reset}} {
+    variable $token
+    upvar 0 $token State
+    set reason {}
+    set State(status) $why
+    catch {fileevent $State(sock) readable {}}
+    if {$why == "timeout"} {
+        set reason "timeout ocurred"
+    }
+    Finish $token $reason
+}
+
+# Description:
+#  Remove any state associated with this token.
+#
+proc ::time::cleanup {token} {
+    variable $token
+    upvar 0 $token State
+    if {[info exists State]} {
+        unset State
+    }
+}
+
+# -------------------------------------------------------------------------
+
+proc ::time::ClientReadEvent {token} {
+    variable $token
+    upvar 0 $token State
+
+    append State(data) [read $State(sock)]
+    set expected [expr {($State(rfc) == 868) ? 4 : 48}]
+    if {[string length $State(data)] < $expected} { return }
+
+    #FIX ME: acquire peer data?
+
+    set State(status) ok
+    Finish $token
+    return
+}
+
+proc ::time::Finish {token {errormsg {}}} {
+    variable $token
+    upvar 0 $token State
+    global errorInfo errorCode
+
+    if {[string length $errormsg] > 0} {
+	set State(error) $errormsg
+	set State(status) error
+    }
+    catch {close $State(sock)}
+    catch {after cancel $State(after)}
+    if {[info exists State(-command)] && $State(-command) != {}} {
+        if {[catch {eval $State(-command) {$token}} err]} {
+            if {[string length $errormsg] == 0} {
+                set State(error) [list $err $errorInfo $errorCode]
+                set State(status) error
+            }
+        }
+        if {[info exists State(-command)]} {
+            unset State(-command)
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::time::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+package provide time 1.2.1
+
+# -------------------------------------------------------------------------
+# Local variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oauth/oauth.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oauth/oauth.tcl
new file mode 100644
index 00000000..da69c96e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oauth/oauth.tcl
@@ -0,0 +1,304 @@
+#!/bin/sh
+# the next line will restart with tclsh wherever it is \
+exec tclsh "$0" "$@"
+
+# oauth.tcl -*- tcl -*-
+# 		This module pretend give full support to API version 1.1 of Twitter
+#		according to API v1.1’s Authentication Model
+#
+# Copyright (c) 2014 Javier Pérez - <hxm@eggdrop.es>
+#   gave to tcllib
+#
+# About OAuthv1.0a
+#       There are 3 steps we need complete to get authenticated with OAuth.
+# Steps:
+#   1. Authorizing a request: we need 7 parameters.
+#       1.1 Consumer key (oauth_consumer_key) from your app (dev.twitter.com/apps)
+#       1.2 Nonce (oauth_nonce) unique&random token autogenerated by base64 32bits
+#       1.3 Signature (oauth_signature) all the other requests and 2 secret values
+#            trought a signing algorithm.
+#       1.4 Signature method (oauth_signature_method) which is HMAC-SHA1
+#       1.5 Timestamp (oauth_timestamp) time in unix format of the request
+#       1.6 Token (oauth_token) a parameter you can obtain in your account settings
+#       1.7 Version (oauth_version) the OAuth version, actually 1.0
+
+#  TODO: create online documentation
+
+package require Tcl 8.5
+package provide oauth 1.0.3
+
+package require http
+package require tls
+package require base64
+package require sha1
+
+http::register https 443 ::tls::socket
+    
+namespace eval ::oauth {
+    namespace export query
+
+    variable commands [namespace export]
+    variable project {OAuth1.0}
+    variable version [package present oauth]
+    variable description {OAuth authentication for Twitter support.}
+    variable author {Javier Pérez <hxm@eggdrop.es>}
+    # AK: changed to ISO date format.
+    variable created {2012-12-30, published 2014-02-10}
+    variable script [info script]
+    variable contact "$project $version ~ $description ($author)"
+
+    variable oauth
+    if {![info exists oauth]} {
+        array set oauth {
+            -accesstoken        {}
+            -accesstokensecret  {}
+            -consumerkey        {}
+            -consumersecret     {}
+            -debug              0
+            -oauthversion       1.0
+            -proxyhost          {}
+            -proxyport          {}
+            -ratelimit          1
+            -signmethod         HMAC-SHA1
+            -timeout            6000
+            -urlencoding        utf-8
+        }
+        set oauth(-useragent) "Mozilla/5.0\
+                ([string totitle $::tcl_platform(platform)]; U;\
+                $::tcl_platform(os) $::tcl_platform(osVersion))\
+                oauth/${version} Tcl/[package provide Tcl]"
+    }
+}
+
+# config --
+#
+#   See documentation for details.
+#
+# Arguments:
+#   args    options parsed by the procedure.
+# Results:
+#   This procedure returns the array with the current configuration
+#   In order to create an array with the result of this procedure you can do
+#   it in this way: array set settings [oauth::config ...]
+proc ::oauth::config {args} {
+    variable oauth
+    set options [array names oauth -*]
+    set usage [join $options {, }]
+    if {$args eq {}} {
+	return [array get oauth]
+    }
+    foreach {flag value} $args {
+	set optionflag [lsearch -inline -nocase $options $flag]
+	if {$optionflag eq ""} {
+	    Error "Unknown option \"${flag}\", must be: $usage" BAD OPTION
+	}
+	set oauth($optionflag) $value
+    }
+    return [array get oauth]
+}
+
+# header --
+#       Following OAuth1.0a rules, this procedure collects all
+#       information required for get the authentication.  All we need
+#       is a header for our api queries with our user and app
+#       information for the verification of who we are. Collect it,
+#       encode it as the protocol says and add it to the geturl
+#       command.  If you want, you can use this procedure for your
+#       own queries, just use it as header. Example:
+#           http::geturl $twitter(url) -header [oauth::header <...>] <...>
+#
+# You can get more information about how twitter api works reading this:
+#   https://dev.twitter.com/overview/documentation
+#
+# Arguments:
+#       baseURL:     full url path of twitter api. If it should be sent
+#                    as GET, add the query string.
+#       postQuery:   arguments passed at the request body as POST. This
+#                    should be in http query format.
+# Result:
+#       This proc will return a list of values like this:
+#   Authorization: 
+#       OAuth oauth_consumer_key="xvz1evFS4wEEPTGEFPHBog", 
+#             oauth_nonce="kYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg", 
+#             oauth_signature="tnnArxj06cWHq44gCs1OSKk%2FjLY%3D", 
+#             oauth_signature_method="HMAC-SHA1", 
+#             oauth_timestamp="1318622958", 
+#             oauth_token="370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb", 
+#             oauth_version="1.0"
+proc ::oauth::header {baseURL {postQuery {}}} {
+    variable oauth
+
+    if {$oauth(-signmethod) eq ""} {
+	Error "ERROR: invalid argument for -signmethod." BAD SIGN-METHOD
+    }
+    if {[package vcompare $oauth(-oauthversion) 1.0] != 0} {
+	Error "ERROR: this script only supports oauth_version 1.0" \
+	    BAD OAUTH-VERSION
+    }
+    if {$oauth(-consumerkey) eq ""} {
+	Error "ERROR: please define your consumer key.\
+             [namespace current]::config -consumerkey <...>" \
+	    BAD CONSUMER-KEY
+    }
+    if {$oauth(-accesstoken) eq ""} {
+	Error "ERROR: please define your app's access token.\
+             [namespace current]::config -accesstoken <...>" \
+	    BAD ACCESS-TOKEN
+    }
+
+    set randomKey [sha1::sha1 [expr {[clock milliseconds] + round(rand()*50000)}]]
+    set timestamp [clock seconds]
+
+    lappend paramList "oauth_consumer_key=$oauth(-consumerkey)"
+    lappend paramList "oauth_nonce=$randomKey"
+    lappend paramList "oauth_signature_method=$oauth(-signmethod)"
+    lappend paramList "oauth_timestamp=$timestamp"
+    lappend paramList "oauth_token=$oauth(-accesstoken)"
+    lappend paramList "oauth_version=$oauth(-oauthversion)"
+
+    set header $paramList
+
+    if {$postQuery eq {}} {
+	lassign [Split $baseURL ?] url queryString
+	set httpMethod GET
+    } else {
+	set url         $baseURL
+	set queryString $postQuery
+	set httpMethod POST
+    }
+    lappend paramList {*}[split $queryString &]
+
+    set headerQ [QuoteValues $header]
+    set paramString [join [lsort -dictionary $paramList] &]
+    
+    lappend baseList $httpMethod
+    lappend baseList [PercentEncode $url]
+    lappend baseList [PercentEncode $paramString]
+    set signString [join $baseList &]
+    
+    set signKey "[PercentEncode $oauth(-consumersecret)]&[PercentEncode $oauth(-accesstokensecret)]"
+    set signature [base64::encode [sha1::hmac -bin -key $signKey $signString]]
+
+    lappend headerQ "oauth_signature=\"[PercentEncode $signature]\""
+    if {$oauth(-debug) == 1} {
+	puts {oauth::header: Authorization Oauth}
+	foreach line $header {
+	    puts "\t$line"
+	}
+	puts "\nBaseString: $signString"
+    }
+    return "Authorization [list [concat OAuth [join [lsort -dictionary $headerQ] {, }]]]"
+}
+
+# query --
+#       Sends to oauth API url the proper oauth header and querybody
+#       returning the raw data from Twitter for your parse.
+# Arguments:
+#       baseURL     api host URL with ?arguments if it's a GET request
+#       postQuery   POST query if it's a POST query
+# Result:
+#       The result will be list with 2 arguments.
+#       The first argument is an array with the http's header
+#       and the second one is JSON data received from the server. The header is
+#       very important because it reports your rest API limit and will
+#       inform you if you can get your account suspended.
+proc ::oauth::query {baseURL {postQuery {}}} {
+    variable oauth
+    if {$oauth(-consumerkey) eq ""} {
+	Error "ERROR: please define your consumer key.\
+            [namespace current]::config -consumerkey <...>" \
+	    BAD CONSUMER-KEY
+    }
+    if {$oauth(-consumersecret) eq ""} {
+	Error "ERROR: please define your app's consumer secret.\
+            [namespace current]::config -consumersecret <...>" \
+	    BAD CONSUMER-SECRET
+    }
+    if {$oauth(-accesstoken) eq ""} {
+	Error "ERROR: please define your access token.\
+            [namespace current]::config -accesstoken <...>" \
+	    BAD ACCESS-TOKEN
+    }
+    if {$oauth(-accesstokensecret) eq ""} {
+	Error "ERROR: please define your app's access token secret.\
+            [namespace current]::config -accesstokensecret <...>" \
+	    BAD ACCESS-TOKEN-SECRET
+    }
+    if {$postQuery eq ""} {
+	lassign [Split $baseURL ?] url queryString
+	set httpMethod GET
+    } else {
+	set url $baseURL
+	set queryString $postQuery
+	set httpMethod POST
+    }
+    
+    if {$httpMethod eq "GET"} {
+	if {$queryString ne {}} {
+	    append url ? $queryString
+	}
+	set requestBody {}
+    } else {
+	set requestBody $queryString
+    }
+    if {$queryString ne {}} {
+	set header [header $url $queryString]
+    } else {
+	set header [header $url]
+    }
+
+    http::config \
+	-proxyhost $oauth(-proxyhost) \
+	-proxyport $oauth(-proxyport) \
+	-useragent $oauth(-useragent)
+
+    set token [http::geturl $baseURL \
+		   -headers $header \
+		   -query   $requestBody \
+		   -method  $httpMethod \
+		   -timeout $oauth(-timeout)]
+    set ncode [http::ncode $token]
+    set data  [http::data $token]
+    upvar #0 $token state
+    lappend result [array names state]
+    lappend result $data
+    http::cleanup $token
+
+    return $result
+}
+
+# QuoteValues --
+#    Add double-quotes around all values in the parameter string
+#    and return a list of modified parameter assignments.
+proc ::oauth::QuoteValues {params} {
+    set tmp {}
+    foreach parameter $params {
+	lassign [Split $parameter =] key value
+	lappend tmp "${key}=\"${value}\""
+    }
+    return $tmp
+}
+
+# Split -
+#	Split the string on the first separator
+#       and return both parts as a list.
+proc ::oauth::Split {string sep} {
+    regexp "^(\[^${sep}\]+)${sep}(.*)\$" $string -> key value
+    list $key $value
+}
+
+# PercentEncode --
+#       Encoding process in http://tools.ietf.org/html/rfc3986#section-2.1
+#       for Twitter authentication. (http::formatQuery is lowcase)
+proc ::oauth::PercentEncode {string} {
+    set utf8String [encoding convertto utf-8 $string]
+    return [string map {"\n" "%0A"} \
+		[subst [regsub -all \
+			    {[^-A-Za-z0-9._~\n]} $utf8String \
+			    {%[format "%02X" [scan "\\\0" "%c"]]}]]]
+}
+
+proc ::oauth::Error {string args} {
+    return -code error -errorcode [linsert $args 0 OAUTH] $string
+}
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oauth/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oauth/pkgIndex.tcl
new file mode 100644
index 00000000..e2203ef4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oauth/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded oauth 1.0.3 [list source [file join $dir oauth.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oodialect/oodialect.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oodialect/oodialect.tcl
new file mode 100644
index 00000000..68bdb146
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oodialect/oodialect.tcl
@@ -0,0 +1,265 @@
+###
+# oodialect.tcl
+#
+# Copyright (c) 2015-2018 Sean Woods
+# Copyright (c) 2015 Donald K Fellows
+#
+# BSD License
+###
+# @@ Meta Begin
+# Package oo::dialect 0.3.3
+# Meta platform     tcl
+# Meta summary      A utility for defining a domain specific language for TclOO systems
+# Meta description  This package allows developers to generate
+# Meta description  domain specific languages to describe TclOO
+# Meta description  classes and objects.
+# Meta category     TclOO
+# Meta subject      oodialect
+# Meta require      {Tcl 8.6}
+# Meta author       Sean Woods
+# Meta author       Donald K. Fellows
+# Meta license      BSD
+# @@ Meta End
+
+package require TclOO
+
+namespace eval ::oo::dialect {
+  namespace export create
+}
+
+# A stack of class names
+proc ::oo::dialect::Push {class} {
+  ::variable class_stack
+  lappend class_stack $class
+}
+proc ::oo::dialect::Peek {} {
+  ::variable class_stack
+  return [lindex $class_stack end]
+}
+proc ::oo::dialect::Pop {} {
+  ::variable class_stack
+  set class_stack [lrange $class_stack 0 end-1]
+}
+
+###
+# This proc will generate a namespace, a "mother of all classes", and a
+# rudimentary set of policies for this dialect.
+###
+proc ::oo::dialect::create {name {parent ""}} {
+  set NSPACE [NSNormalize [uplevel 1 {namespace current}] $name]
+  ::namespace eval $NSPACE {::namespace eval define {}}
+  ###
+  # Build the "define" namespace
+  ###
+  if {$parent eq ""} {
+  	###
+  	# With no "parent" language, begin with all of the keywords in
+  	# oo::define
+  	###
+  	foreach command [info commands ::oo::define::*] {
+	    set procname [namespace tail $command]
+	    interp alias {} ${NSPACE}::define::$procname {} \
+    		::oo::dialect::DefineThunk $procname
+  	}
+  	# Create an empty dynamic_methods proc
+    proc ${NSPACE}::dynamic_methods {class} {}
+    namespace eval $NSPACE {
+      ::namespace export dynamic_methods
+      ::namespace eval define {::namespace export *}
+    }
+    set ANCESTORS {}
+  } else {
+    ###
+  	# If we have a parent language, that language already has the
+  	# [oo::define] keywords as well as additional keywords and behaviors.
+  	# We should begin with that
+  	###
+  	set pnspace [NSNormalize [uplevel 1 {namespace current}] $parent]
+    apply [list parent {
+  	  ::namespace export dynamic_methods
+  	  ::namespace import -force ${parent}::dynamic_methods
+  	} $NSPACE] $pnspace
+	
+    apply [list parent {
+  	  ::namespace import -force ${parent}::define::*
+  	  ::namespace export *
+  	} ${NSPACE}::define] $pnspace
+      set ANCESTORS [list ${pnspace}::object]
+  }  
+  ###
+  # Build our dialect template functions
+  ###
+  proc ${NSPACE}::define {oclass args} [string map [list %NSPACE% $NSPACE] {
+	###
+	# To facilitate library reloading, allow
+	# a dialect to create a class from DEFINE
+	###
+  set class [::oo::dialect::NSNormalize [uplevel 1 {namespace current}] $oclass]
+    if {[info commands $class] eq {}} {      
+	    %NSPACE%::class create $class {*}${args}
+    } else {
+	    ::oo::dialect::Define %NSPACE% $class {*}${args}
+    }
+}]
+  interp alias {} ${NSPACE}::define::current_class {} \
+    ::oo::dialect::Peek
+  interp alias {} ${NSPACE}::define::aliases {} \
+    ::oo::dialect::Aliases $NSPACE
+  interp alias {} ${NSPACE}::define::superclass {} \
+    ::oo::dialect::SuperClass $NSPACE
+
+  if {[info command ${NSPACE}::class] ne {}} {
+    ::rename ${NSPACE}::class {}
+  }
+  ###
+  # Build the metaclass for our language
+  ###
+  ::oo::class create ${NSPACE}::class {
+    superclass ::oo::dialect::MotherOfAllMetaClasses
+  }
+  # Wire up the create method to add in the extra argument we need; the
+  # MotherOfAllMetaClasses will know what to do with it.
+  ::oo::objdefine ${NSPACE}::class \
+    method create {name {definitionScript ""}} \
+      "next \$name [list ${NSPACE}::define] \$definitionScript"
+
+  ###
+  # Build the mother of all classes. Note that $ANCESTORS is already
+  # guaranteed to be a list in canonical form.
+  ###
+  uplevel #0 [string map [list %NSPACE% [list $NSPACE] %name% [list $name] %ANCESTORS% $ANCESTORS] {
+    %NSPACE%::class create %NSPACE%::object {
+     superclass %ANCESTORS%
+      # Put MOACish stuff in here
+    }
+  }]
+  if {[info exists ::oo::meta::core_classes]} {
+    if { "${NSPACE}::class" ni $::oo::meta::core_classes } {
+      lappend ::oo::meta::core_classes "${NSPACE}::class"
+    }
+    if { "${NSPACE}::object" ni $::oo::meta::core_classes } {
+      lappend ::oo::meta::core_classes "${NSPACE}::object"
+    }
+  }
+}
+
+# Support commands; not intended to be called directly.
+proc ::oo::dialect::NSNormalize {namespace qualname} {
+  if {![string match ::* $qualname]} {
+    set qualname ${namespace}::$qualname
+  }
+  regsub -all {::+} $qualname "::"
+}
+
+proc ::oo::dialect::DefineThunk {target args} {
+  tailcall ::oo::define [Peek] $target {*}$args
+}
+
+proc ::oo::dialect::Canonical {namespace NSpace class} {
+  namespace upvar $namespace cname cname
+  #if {[string match ::* $class]} {
+  #  return $class
+  #}
+  if {[info exists cname($class)]} {
+    return $cname($class)
+  }
+  if {[info exists ::oo::dialect::cname($class)]} {
+    return $::oo::dialect::cname($class)
+  }
+  if {[info exists ::oo::dialect::cname(${NSpace}::${class})]} {
+    return $::oo::dialect::cname(${NSpace}::${class})
+  }
+  foreach item [list "${NSpace}::$class" "::$class"] {
+    if {[info commands $item] ne {}} {
+      return $item
+    }
+  }
+  return ${NSpace}::$class
+}
+
+###
+# Implementation of the languages' define command
+###
+proc ::oo::dialect::Define {namespace class args} {
+  Push $class
+  try {
+  	if {[llength $args]==1} {
+      namespace eval ${namespace}::define [lindex $args 0]
+    } else {
+      ${namespace}::define::[lindex $args 0] {*}[lrange $args 1 end]
+    }
+  	${namespace}::dynamic_methods $class
+  } finally {
+    Pop
+  }
+}
+
+###
+# Implementation of how we specify the other names that this class will answer
+# to
+###
+
+proc ::oo::dialect::Aliases {namespace args} {
+  set class [Peek]
+  namespace upvar $namespace cname cname
+  set NSpace [join [lrange [split $class ::] 1 end-2] ::]
+  set cname($class) $class
+  foreach name $args {
+    set cname($name) $class
+    #set alias $name
+    set alias [NSNormalize $NSpace $name]
+    # Add a local metaclass reference
+    if {![info exists ::oo::dialect::cname($alias)]} {
+      lappend ::oo::dialect::aliases($class) $alias
+      ##
+      # Add a global reference, first come, first served
+      ##
+      set ::oo::dialect::cname($alias) $class
+    }
+  }
+}
+
+###
+# Implementation of a superclass keyword which will enforce the inheritance of
+# our language's mother of all classes
+###
+
+proc ::oo::dialect::SuperClass {namespace args} {
+  set class [Peek]
+  namespace upvar $namespace class_info class_info
+  dict set class_info($class) superclass 1
+  set ::oo::dialect::cname($class) $class
+  set NSpace [join [lrange [split $class ::] 1 end-2] ::]
+  set unique {}
+  foreach item $args {
+    set Item [Canonical $namespace $NSpace $item]
+    dict set unique $Item $item
+  }
+  set root ${namespace}::object
+  if {$class ne $root} {
+    dict set unique $root $root
+  }
+  tailcall ::oo::define $class superclass {*}[dict keys $unique]
+}
+
+###
+# Implementation of the common portions of the the metaclass for our
+# languages.
+###
+
+::oo::class create ::oo::dialect::MotherOfAllMetaClasses {
+  superclass ::oo::class
+  constructor {define definitionScript} {
+    $define [self] {
+      superclass
+    }
+    $define [self] $definitionScript
+  }
+  method aliases {} {
+    if {[info exists ::oo::dialect::aliases([self])]} {
+      return $::oo::dialect::aliases([self])
+    }
+  }
+}
+
+package provide oo::dialect 0.3.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oodialect/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oodialect/pkgIndex.tcl
new file mode 100644
index 00000000..ea6aa989
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oodialect/pkgIndex.tcl
@@ -0,0 +1 @@
+package ifneeded oo::dialect 0.3.3 [list source [file join $dir oodialect.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oometa/oometa.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oometa/oometa.tcl
new file mode 100644
index 00000000..7fd13eff
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oometa/oometa.tcl
@@ -0,0 +1,503 @@
+###
+# Author: Sean Woods, yoda@etoyoc.com
+##
+# TclOO routines to implement property tracking by class and object
+###
+package require Tcl 8.6 ;# tailcall
+package require dicttool
+package provide oo::meta 0.7.1
+
+namespace eval ::oo::meta {
+  variable dirty_classes {}
+  variable core_classes {::oo::class ::oo::object}
+}
+
+proc ::oo::meta::args_to_dict args {
+  if {[llength $args]==1} {
+    return [lindex $args 0]
+  }
+  return $args
+}
+
+proc ::oo::meta::args_to_options args {
+  set result {}
+  foreach {var val} [args_to_dict {*}$args] {
+    lappend result [string trimleft $var -] $val
+  }
+  return $result
+}
+
+proc ::oo::meta::ancestors class {
+  variable core_classes
+  set class [::oo::meta::normalize $class]
+  set core_result {}
+  set queue $class
+  set result {}
+  # Rig things such that that the top superclasses
+  # are evaluated first
+  while {[llength $queue]} {
+    set tqueue $queue
+    set queue {}
+    foreach qclass $tqueue {
+      if {$qclass in $core_classes} {
+        if {$qclass ni $core_result} {
+          lappend core_result $qclass
+        }
+        continue
+      }
+      foreach aclass [::info class superclasses $qclass] {
+        if { $aclass in $result } continue
+        if { $aclass in $core_result } continue
+        if { $aclass in $queue } continue
+        lappend queue $aclass
+      }
+    }
+    foreach item $tqueue {
+      if {$item in $core_result} continue
+      if { $item ni $result } {
+        set result [linsert $result 0 $item]
+      }
+    }
+  }
+  # Handle core classes last
+  set queue $core_result
+  while {[llength $queue]} {
+    set tqueue $queue
+    set queue {}
+    foreach qclass $tqueue {
+      foreach aclass [::info class superclasses $qclass] {
+        if { $aclass in $result } continue
+        if { $aclass in $queue } continue
+        lappend queue $aclass
+      }
+    }
+    foreach item $tqueue {
+      if { $item ni $result } {
+        set result [linsert $result 0 $item]
+      }
+    }
+  }
+  return $result
+}
+
+proc oo::meta::info {class submethod args} {
+  set class [::oo::meta::normalize $class]
+  switch $submethod {
+    cget {
+      ###
+      # submethod: cget
+      # arguments: ?*path* ...? *field*
+      # format: markdown
+      # description:
+      # Retrieve a value from the class' meta data. Values are searched in the
+      # following order:
+      # 1. From class meta data as const **path** **field:**
+      # 2. From class meta data as const **path** **field**
+      # 3. From class meta data as **path** **field:**
+      # 4. From class meta data as **path** **field**
+      ###
+      set path [lrange $args 0 end-1]
+      set field [string trimright [lindex $args end] :]
+      foreach mclass [lreverse [::oo::meta::ancestors $class]] {
+        if {![::info exists ::oo::meta::local_property($mclass)]} continue
+        set class_metadata $::oo::meta::local_property($mclass)
+        if {[dict exists $class_metadata const {*}$path $field:]} {
+          return [dict get $class_metadata const {*}$path $field:]
+        }
+        if {[dict exists $class_metadata const {*}$path $field]} {
+          return [dict get $class_metadata const {*}$path $field]
+        }
+        if {[dict exists $class_metadata {*}$path $field:]} {
+          return [dict get $class_metadata {*}$path $field:]
+        }
+        if {[dict exists $class_metadata {*}$path $field]} {
+          return [dict get $class_metadata {*}$path $field]
+        }
+      }
+      return {}
+    }
+    rebuild {
+      ::oo::meta::rebuild $class
+    }
+    is {
+      set info [metadata $class]
+      return [string is [lindex $args 0] -strict [dict getnull $info {*}[lrange $args 1 end]]]
+    }
+    for -
+    map {
+      set info [metadata $class]
+      uplevel 1 [list ::dict $submethod [lindex $args 0] [dict get $info {*}[lrange $args 1 end-1]] [lindex $args end]]
+    }
+    with {
+      upvar 1 TEMPVAR info
+      set info [metadata $class]
+      return [uplevel 1 [list ::dict with TEMPVAR {*}$args]]
+    }
+    branchget {
+      set info [metadata $class]
+      set result {}
+      foreach {field value} [dict getnull $info {*}$args] {
+        dict set result [string trimright $field :] $value
+      }
+      return $result
+    }
+    branchset {
+      ::oo::meta::rebuild $class
+      foreach {field value} [lindex $args end] {
+        ::dict set ::oo::meta::local_property($class) {*}[lrange $args 0 end-1] [string trimright $field :]: $value
+      }
+    }
+    leaf_add {
+      if {[::info exists ::oo::meta::local_property($class)]} {
+        set result [dict getnull $::oo::meta::local_property($class) {*}[lindex $args 0]]
+      }
+      ladd result {*}[lrange $args 1 end]
+      dict set ::oo::meta::local_property($class) {*}[lindex $args 0] $result
+    }
+    leaf_remove {
+      if {![::info exists ::oo::meta::local_property($class)]} return
+      set result {}
+      forearch element [dict getnull $::oo::meta::local_property($class) {*}[lindex $args 0]] {
+        if { $element in [lrange $args 1 end]} continue
+        lappend result $element
+      }
+      dict set ::oo::meta::local_property($class) {*}[lindex $args 0] $result
+    }
+    append -
+    incr -
+    lappend -
+    set -
+    unset -
+    update {
+      ::oo::meta::rebuild $class
+      ::dict $submethod ::oo::meta::local_property($class) {*}$args
+    }
+    merge {
+      ::oo::meta::rebuild $class
+      set ::oo::meta::local_property($class) [dict rmerge $::oo::meta::local_property($class) {*}$args]
+    }
+    dump {
+      set info [metadata $class]
+      return $info
+    }
+    default {
+      set info [metadata $class]
+      return [::dict $submethod $info {*}$args] 
+    }
+  }
+}
+
+proc ::oo::meta::localdata {class args} {
+  if {![::info exists ::oo::meta::local_property($class)]} {
+    return {}
+  }
+  if {[::llength $args]==0} {
+    return $::oo::meta::local_property($class)
+  }
+  return [::dict getnull $::oo::meta::local_property($class) {*}$args]
+}
+
+proc ::oo::meta::normalize class {
+  set class ::[string trimleft $class :]
+}
+
+proc ::oo::meta::metadata {class {force 0}} {
+  set class [::oo::meta::normalize $class]
+  ###
+  # Destroy the cache of all derivitive classes
+  ###
+  if {$force} {
+    unset -nocomplain ::oo::meta::cached_property
+    unset -nocomplain ::oo::meta::cached_hierarchy
+  } else {
+    variable dirty_classes
+    foreach dclass $dirty_classes {
+      foreach {cclass cancestors} [array get ::oo::meta::cached_hierarchy] {
+        if {$dclass in $cancestors} {
+          unset -nocomplain ::oo::meta::cached_property($cclass)
+          unset -nocomplain ::oo::meta::cached_hierarchy($cclass)
+        }
+      }
+      if {![::info exists ::oo::meta::local_property($dclass)]} continue
+      if {[dict getnull $::oo::meta::local_property($dclass) classinfo type:] eq "core"} {
+        if {$dclass ni $::oo::meta::core_classes} {
+          lappend ::oo::meta::core_classes $dclass
+        }
+      }
+    }
+    set dirty_classes {}
+  }
+
+  ###
+  # If the cache is available, use it
+  ###
+  variable cached_property
+  if {[::info exists cached_property($class)]} {
+    return $cached_property($class)
+  }
+  ###
+  # Build a cache of the hierarchy and the
+  # aggregate metadata for this class and store
+  # them for future use
+  ###
+  variable cached_hierarchy
+  set metadata {}
+  set stack {}
+  variable local_property
+  set cached_hierarchy($class) [::oo::meta::ancestors $class]
+  foreach class $cached_hierarchy($class) {
+    if {[::info exists local_property($class)]} {
+      lappend metadata $local_property($class)
+    }
+  }
+  #foreach aclass [lreverse [::info class superclasses $class]] {
+  #  lappend metadata [::oo::meta::metadata $aclass]
+  #}
+
+  lappend metadata {classinfo {type: {}}}
+  if {[::info exists local_property($class)]} {
+    lappend metadata $local_property($class)
+  }
+  set metadata [dict rmerge {*}$metadata]
+  set cached_property($class) $metadata
+  return $metadata
+}
+
+proc ::oo::meta::rebuild args {
+  foreach class $args {
+    if {$class ni $::oo::meta::dirty_classes} {
+      lappend ::oo::meta::dirty_classes $class
+    }
+  }
+}
+
+proc ::oo::meta::search args {
+  variable local_property
+
+  set path [lrange $args 0 end-1]
+  set value [lindex $args end]
+
+  set result {}
+  foreach {class info} [array get local_property] {
+    if {[dict exists $info {*}$path:]} {
+      if {[string match [dict get $info {*}$path:] $value]} {
+        lappend result $class
+      }
+      continue
+    }
+    if {[dict exists $info {*}$path]} {
+      if {[string match [dict get $info {*}$path] $value]} {
+        lappend result $class
+      }
+    }
+  }
+  return $result
+}
+
+proc ::oo::define::meta {args} {
+  set class [lindex [::info level -1] 1]
+  if {[lindex $args 0] in "cget set branchset"} {
+    ::oo::meta::info $class {*}$args
+  } else {
+    ::oo::meta::info $class set {*}$args
+  }
+}
+
+oo::define oo::class {
+  method meta {submethod args} {
+    tailcall ::oo::meta::info [self] $submethod {*}$args
+  }
+}
+
+oo::define oo::object {
+  ###
+  # title: Provide access to meta data
+  # format: markdown
+  # description:
+  # The *meta* method allows an object access
+  # to a combination of its own meta data as
+  # well as to that of its class
+  ###
+  method meta {submethod args} {
+    my variable meta MetaMixin
+    if {![info exists MetaMixin]} {
+      set MetaMixin {}
+    }
+    set class [::info object class [self object]]
+    set classlist [list $class {*}$MetaMixin]
+    switch $submethod {
+      cget {
+        ###
+        # submethod: cget
+        # arguments: ?*path* ...? *field*
+        # format: markdown
+        # description:
+        # Retrieve a value from the local objects **meta** dict
+        # or from the class' meta data. Values are searched in the
+        # following order:
+        # 0. (If path length==1) From the _config array
+        # 1. From the local dict as **path** **field:**
+        # 2. From the local dict as **path** **field**
+        # 3. From class meta data as const **path** **field:**
+        # 4. From class meta data as const **path** **field**
+        # 5. From class meta data as **path** **field:**
+        # 6. From class meta data as **path** **field**
+        ###
+        set path [lrange $args 0 end-1]
+        set field [string trim [lindex $args end] :]
+        if {[dict exists $meta {*}$path $field:]} {
+          return [dict get $meta {*}$path $field:]
+        }
+        if {[dict exists $meta {*}$path $field]} {
+          return [dict get $meta {*}$path $field]
+        }
+        foreach mclass [lreverse $classlist] {
+          set class_metadata [::oo::meta::metadata $mclass]
+          if {[dict exists $class_metadata const {*}$path $field:]} {
+            return [dict get $class_metadata const {*}$path $field:]
+          }
+          if {[dict exists $class_metadata const {*}$path $field]} {
+            return [dict get $class_metadata const {*}$path $field]
+          }
+          if {[dict exists $class_metadata {*}$path $field:]} {
+            return [dict get $class_metadata {*}$path $field:]
+          }
+          if {[dict exists $class_metadata {*}$path $field]} {
+            return [dict get $class_metadata {*}$path $field]
+          }
+        }
+        return {}
+      }
+      is {
+        set value [my meta cget {*}[lrange $args 1 end]]
+        return [string is [lindex $args 0] -strict $value]
+      }
+      for -
+      map {
+        foreach mclass $classlist {
+          lappend mdata [::oo::meta::metadata $mclass]
+        }
+        set info [dict rmerge {*}$mdata $meta]
+        uplevel 1 [list ::dict $submethod [lindex $args 0] [dict get $info {*}[lrange $args 1 end-1]] [lindex $args end]]
+      }
+      with {
+        upvar 1 TEMPVAR info
+        foreach mclass $classlist {
+          lappend mdata [::oo::meta::metadata $mclass]
+        }
+        set info [dict rmerge {*}$mdata $meta]
+        return [uplevel 1 [list dict with TEMPVAR {*}$args]]
+      }
+      dump {
+        foreach mclass $classlist {
+          lappend mdata [::oo::meta::metadata $mclass]
+        }
+        return [dict rmerge {*}$mdata $meta]
+      }
+      append -
+      incr -
+      lappend -
+      set -
+      unset -
+      update {
+        return [dict $submethod meta {*}$args]
+      }
+      branchset {
+        foreach {field value} [lindex $args end] {
+          dict set meta {*}[lrange $args 0 end-1] [string trimright $field :]: $value
+        }
+      }
+      rmerge -
+      merge {
+        set meta [dict rmerge $meta {*}$args]
+        return $meta
+      }
+      exists {
+        foreach mclass $classlist {
+          if {[dict exists [::oo::meta::metadata $mclass] {*}$args]} {
+            return 1
+          }
+        }
+        if {[dict exists $meta {*}$args]} {
+          return 1
+        }
+        return 0
+      }
+      get -
+      getnull {
+        if {[string index [lindex $args end] end]==":"} {
+          # Looking for a leaf node
+          if {[dict exists $meta {*}$args]} {
+            return [dict get $meta {*}$args]
+          }
+          foreach mclass [lreverse $classlist] {
+            set mdata [::oo::meta::metadata $mclass]
+            if {[dict exists $mdata {*}$args]} {
+              return [dict get $mdata {*}$args]
+            }
+          }
+          if {$submethod == "get"} {
+            error "key \"$args\" not known in metadata"
+          }
+          return {}
+        }
+        # Looking for a branch node
+        # So we need to composite the result
+        set found 0
+        foreach mclass $classlist {
+          set mdata [::oo::meta::metadata $mclass]
+          if {[dict exists $mdata {*}$args]} {
+            set found 1
+            lappend result [dict get $mdata {*}$args]
+          }
+        }
+        if {[dict exists $meta {*}$args]} {
+          set found 1
+          lappend result [dict get $meta {*}$args]
+        }
+        if {!$found} {
+          if {$submethod == "get"} {
+            error "key \"$args\" not known in metadata"
+          }
+          return {}
+        }
+        return [dict rmerge {*}$result]
+      }
+      branchget {
+        set result {}
+        foreach mclass [lreverse $classlist] {
+          foreach {field value} [dict getnull [::oo::meta::metadata $mclass] {*}$args] {
+            dict set result [string trimright $field :] $value
+          }
+        }
+        foreach {field value} [dict getnull $meta {*}$args] {
+          dict set result [string trimright $field :] $value
+        }
+        return $result
+      }
+      mixin {
+        foreach mclass $args {
+          set mclass [::oo::meta::normalize $mclass]
+          if {$mclass ni $MetaMixin} {
+            lappend MetaMixin $mclass
+          }
+        }
+      }
+      mixout {
+        foreach mclass $args {
+          set mclass [::oo::meta::normalize $mclass]
+          while {[set i [lsearch $MetaMixin $mclass]]>=0} {
+            set MetaMixin [lreplace $MetaMixin $i $i]
+          }
+        }
+      }
+      default {
+        foreach mclass $classlist {
+          lappend mdata [::oo::meta::metadata $mclass]
+        }
+        set info [dict rmerge {*}$mdata $meta]
+        return [dict $submethod $info {*}$args] 
+      }
+    }
+  }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oometa/oooption.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oometa/oooption.tcl
new file mode 100644
index 00000000..df7c9d14
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oometa/oooption.tcl
@@ -0,0 +1,169 @@
+###
+# Option handling for TclOO
+###
+package require Tcl 8.6 ;# due oo::meta
+package require oo::meta 0.4
+
+proc ::oo::define::option {field argdict} {
+  set class [lindex [::info level -1] 1]
+  foreach {prop value} $argdict {
+    ::oo::meta::info $class set option $field [string trim $prop :]: $value
+  }
+}
+
+oo::define oo::object {
+  
+  ###
+  # topic: 3c4893b65a1c79b2549b9ee88f23c9e3
+  # description:
+  #    Provide a default value for all options and
+  #    publically declared variables, and locks the
+  #    pipeline mutex to prevent signal processing
+  #    while the contructor is still running.
+  #    Note, by default an odie object will ignore
+  #    signals until a later call to <i>my lock remove pipeline</i>
+  ###
+  method _staticInit {} {
+    my variable meta
+    if {![info exists meta]} {
+      set meta {}
+    }
+    set dat [my meta getnull option]
+    foreach {var info} $dat {
+      if {[dict exists $info set-command:]} {
+        if {[catch {my cget $var} value]} {
+          dict set meta $var [my cget $var default:]
+        } else {
+          if { $value eq {} } {
+            dict set meta $var [my cget $var default:]
+          }
+        }
+      }
+      if {![dict exists $meta $var]} {
+        dict set meta $var [my cget $var default:]
+      }
+    }
+    foreach {var info} [my meta getnull variable] {
+      if { $var eq "meta" } continue
+      my variable $var
+      if {![info exists $var]} {
+        if {[dict exists $info default:]} {
+          set $var [dict get $info default:]
+        } else {
+          set $var {}
+        }
+      }
+    }
+    foreach {var info} [my meta getnull array] {
+      if { $var eq "meta" } continue
+      my variable $var
+      if {![info exists $var]} {
+        if {[dict exists $info default:]} {
+          array set $var [dict get $info default:]
+        } else {
+          array set $var {}
+        }
+      }
+    }
+  }
+
+  ###
+  # topic: 86a1b968cea8d439df87585afdbdaadb
+  ###
+  method cget {field {default {}}} {
+    my variable _config
+    set field [string trimleft $field -]
+    set dat [my meta getnull option]
+  
+    if {[my meta is true const options_strict:] && ![dict exists $dat $field]} {
+      error "Invalid option -$field. Valid: [dict keys $dat]"
+    }
+    set info [dict getnull $dat $field]    
+    if {$default eq "default"} {
+      set getcmd [dict getnull $info default-command:]
+      if {$getcmd ne {}} {
+        return [{*}[string map [list %field% $field %self% [namespace which my]] $getcmd]]
+      } else {
+        return [dict getnull $info default:]
+      }
+    }
+    if {[dict exists $dat $field]} {
+      set getcmd [dict getnull $info get-command:]
+      if {$getcmd ne {}} {
+        return [{*}[string map [list %field% $field %self% [namespace which my]] $getcmd]]
+      }
+      if {![info exists _config($field)]} {
+        set getcmd [dict getnull $info default-command:]
+        if {$getcmd ne {}} {
+          set _config($field) [{*}[string map [list %field% $field %self% [namespace which my]] $getcmd]]
+        } else {
+          set _config($field) [dict getnull $info default:]
+        }
+      }
+      if {$default eq "varname"} {
+        set varname [my varname _config]
+        return "${varname}($field)"
+      }
+      return $_config($field)
+    }
+    return [my meta cget $field]
+  }
+  
+  ###
+  # topic: 73e2566466b836cc4535f1a437c391b0
+  ###
+  method configure args {
+    # Will be removed at the end of "configurelist_triggers"
+    set dictargs [::oo::meta::args_to_options {*}$args]
+    if {[llength $dictargs] == 1} {
+      return [my cget [lindex $dictargs 0]]
+    }
+    my configurelist $dictargs
+    my configurelist_triggers $dictargs
+  }
+
+  ###
+  # topic: dc9fba12ec23a3ad000c66aea17135a5
+  ###
+  method configurelist dictargs {
+    my variable _config
+    set dat [my meta getnull option]
+    if {[my meta is true const options_strict:]} {
+      foreach {field val} $dictargs {
+        if {![dict exists $dat $field]} {
+          error "Invalid option $field. Valid: [dict keys $dat]"
+        }
+      }
+    }
+    ###
+    # Validate all inputs
+    ###
+    foreach {field val} $dictargs {
+      set script [dict getnull $dat $field validate-command:]
+      if {$script ne {}} {
+        {*}[string map [list %field% [list $field] %value% [list $val] %self% [namespace which my]] $script]
+      }
+    }
+    ###
+    # Apply all inputs with special rules
+    ###
+    array set _config $dictargs
+  }
+
+  ###
+  # topic: 543c936485189593f0b9ed79b5d5f2c0
+  ###
+  method configurelist_triggers dictargs {
+    set dat [my meta getnull option]
+    ###
+    # Apply all inputs with special rules
+    ###
+    foreach {field val} $dictargs {
+      set script [dict getnull $dat $field set-command:]
+      if {$script ne {}} {
+        {*}[string map [list %field% [list $field] %value% [list $val] %self% [namespace which my]] $script]
+      }
+    }
+  }
+}
+package provide oo::option 0.3.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oometa/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oometa/pkgIndex.tcl
new file mode 100644
index 00000000..e9d8820f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/oometa/pkgIndex.tcl
@@ -0,0 +1,8 @@
+#checker -scope global exclude warnUndefinedVar
+# var in question is 'dir'.
+if {![package vsatisfies [package provide Tcl] 8.6]} {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded oo::meta   0.7.1 [list source [file join $dir oometa.tcl]]
+package ifneeded oo::option 0.3.1 [list source [file join $dir oooption.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ooutil/ooutil.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ooutil/ooutil.tcl
new file mode 100644
index 00000000..3e7d4e33
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ooutil/ooutil.tcl
@@ -0,0 +1,189 @@
+# # ## ### ##### ######## ############# ####################
+## -*- tcl -*-
+## (C) 2011-2015 Andreas Kupries, BSD licensed.
+
+# # ## ### ##### ######## ############# ####################
+## Requisites
+
+package require Tcl 8.5
+package require TclOO
+
+# # ## ### ##### ######## ############# #####################
+## Public API implementation
+
+# # ## ### ##### ######## ############# ####################
+## Easy callback support.
+## http://wiki.tcl.tk/21595. v20, Donal Fellows
+
+proc ::oo::Helpers::mymethod {method args} {
+    list [uplevel 1 {namespace which my}] $method {*}$args
+}
+
+# # ## ### ##### ######## ############# ####################
+## Class variable support. Use within instance methods.
+## No use in class definitions.
+## http://wiki.tcl.tk/21595. v63, Donal Fellows, tweaked name, comments
+
+proc ::oo::Helpers::classvariable {name args} {
+    # Get a reference to the class's namespace
+    set ns [info object namespace [uplevel 1 {self class}]]
+
+    # Double up the list of variable names
+    set vs [list $name $name]
+    foreach v $args {lappend vs $v $v}
+
+    # Lastly, link the caller's local variables to the class's
+    # variables
+    uplevel 1 [list namespace upvar $ns {*}$vs]
+}
+
+#==================================
+# Demonstration
+#==================================
+# % oo::class create Foo {
+#     method bar {z} {
+#         classvar x y
+#         return [incr x $z],[incr y]
+#     }
+# }
+# ::Foo
+# % Foo create a
+# ::a
+# % Foo create b
+# ::b
+# % a bar 2
+# 2,1
+# % a bar 3
+# 5,2
+# % b bar 7
+# 12,3
+# % b bar -1
+# 11,4
+# % a bar 0
+# 11,5
+
+# # ## ### ##### ######## ############# ####################
+## Class method support, with access in derived classes
+## http://wiki.tcl.tk/21595. v63, Donal Fellows
+
+proc ::oo::define::classmethod {name {args ""} {body ""}} {
+    # Create the method on the class if the caller gave arguments and body
+    set argc [llength [info level 0]]
+    if {$argc == 3} {
+        return -code error "wrong # args: should be \"[lindex [info level 0] 0] name ?args body?\""
+    }
+
+    # Get the name of the current class or class delegate 
+    set cls [namespace which [lindex [info level -1] 1]]
+    set d $cls.Delegate
+    if {[info object isa object $d] && [info object isa class $d]} {
+        set cls $d
+    }
+
+    if {$argc == 4} {
+        oo::define $cls method $name $args $body
+    }
+
+    # Make the connection by forwarding
+    uplevel 1 [list forward $name [info object namespace $cls]::my $name]
+}
+
+# Build this *almost* like a class method, but with extra care to avoid nuking
+# the existing method.
+oo::class create oo::class.Delegate {
+    method create {name args} {
+        if {![string match ::* $name]} {
+            set ns [uplevel 1 {namespace current}]
+            if {$ns eq "::"} {set ns ""}
+            set name ${ns}::${name}
+        }
+        if {[string match *.Delegate $name]} {
+            return [next $name {*}$args]
+        }
+        set delegate [oo::class create $name.Delegate]
+        set cls [next $name {*}$args]
+        set superdelegates [list $delegate]
+        foreach c [info class superclass $cls] {
+            set d $c.Delegate
+            if {[info object isa object $d] && [info object isa class $d]} {
+                lappend superdelegates $d
+            }
+        }
+        oo::objdefine $cls mixin {*}$superdelegates
+        return $cls
+    }
+}
+
+oo::define oo::class self mixin oo::class.Delegate
+
+# Demonstrating…
+# ======
+# oo::class create ActiveRecord {
+#     classmethod find args { puts "[self] called with arguments: $args" }
+# }
+# oo::class create Table {
+#     superclass ActiveRecord
+# }
+# Table find foo bar
+# ======
+# which will write this out (I tested it):
+# ======none
+# ::Table called with arguments: foo bar
+# ======
+
+# # ## ### ##### ######## ############# ####################
+## Singleton Metaclass
+## http://wiki.tcl.tk/21595. v63, Donal Fellows
+
+oo::class create ooutil::singleton {
+   superclass oo::class
+   variable object
+   method create {name args} {
+      if {![info exists object]} {
+         set object [next $name {*}$args]
+      }
+      return $object
+   }
+   method new args {
+      if {![info exists object]} {
+         set object [next {*}$args]
+      }
+      return $object
+   }
+}
+
+# ======
+# Demonstration
+# ======
+# % oo::class create example {
+#    self mixin singleton
+#    method foo {} {self}
+# }
+# ::example
+# % [example new] foo
+# ::oo::Obj22
+# % [example new] foo
+# ::oo::Obj22
+
+# # ## ### ##### ######## ############# ####################
+## Linking instance methods into instance namespace for access without 'my'
+## http://wiki.tcl.tk/27999, AK
+
+proc ::oo::Helpers::link {args} {
+    set ns [uplevel 1 {namespace current}]
+    foreach link $args {
+	if {[llength $link] == 2} {
+	    lassign $link src dst
+	} else {
+	    lassign $link src
+	    set dst $src
+	}
+	interp alias {} ${ns}::$src {} ${ns}::my $dst
+    }
+    return
+}
+
+# # ## ### ##### ######## ############# ####################
+## Ready
+
+package provide oo::util 1.2.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ooutil/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ooutil/pkgIndex.tcl
new file mode 100644
index 00000000..d9756be7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ooutil/pkgIndex.tcl
@@ -0,0 +1,7 @@
+#checker -scope global exclude warnUndefinedVar
+# var in question is 'dir'.
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded oo::util 1.2.2 [list source [file join $dir ooutil.tcl]]
\ No newline at end of file
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/otp/otp.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/otp/otp.tcl
new file mode 100644
index 00000000..dede029d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/otp/otp.tcl
@@ -0,0 +1,430 @@
+# otp.tcl - Copyright (C) 2006 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# Tcl implementation of RFC 2289: A One-Time Password System
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+
+package require Tcl 8.2;                # tcl minimum version
+
+namespace eval ::otp {
+    namespace export otp-md4 otp-md5 otp-sha1 otp-rmd160
+
+    variable Words {
+        "A"     "ABE"   "ACE"   "ACT"   "AD"    "ADA"   "ADD"
+        "AGO"   "AID"   "AIM"   "AIR"   "ALL"   "ALP"   "AM"    "AMY"
+        "AN"    "ANA"   "AND"   "ANN"   "ANT"   "ANY"   "APE"   "APS"
+        "APT"   "ARC"   "ARE"   "ARK"   "ARM"   "ART"   "AS"    "ASH"
+        "ASK"   "AT"    "ATE"   "AUG"   "AUK"   "AVE"   "AWE"   "AWK"
+        "AWL"   "AWN"   "AX"    "AYE"   "BAD"   "BAG"   "BAH"   "BAM"
+        "BAN"   "BAR"   "BAT"   "BAY"   "BE"    "BED"   "BEE"   "BEG"
+        "BEN"   "BET"   "BEY"   "BIB"   "BID"   "BIG"   "BIN"   "BIT"
+        "BOB"   "BOG"   "BON"   "BOO"   "BOP"   "BOW"   "BOY"   "BUB"
+        "BUD"   "BUG"   "BUM"   "BUN"   "BUS"   "BUT"   "BUY"   "BY"
+        "BYE"   "CAB"   "CAL"   "CAM"   "CAN"   "CAP"   "CAR"   "CAT"
+        "CAW"   "COD"   "COG"   "COL"   "CON"   "COO"   "COP"   "COT"
+        "COW"   "COY"   "CRY"   "CUB"   "CUE"   "CUP"   "CUR"   "CUT"
+        "DAB"   "DAD"   "DAM"   "DAN"   "DAR"   "DAY"   "DEE"   "DEL"
+        "DEN"   "DES"   "DEW"   "DID"   "DIE"   "DIG"   "DIN"   "DIP"
+        "DO"    "DOE"   "DOG"   "DON"   "DOT"   "DOW"   "DRY"   "DUB"
+        "DUD"   "DUE"   "DUG"   "DUN"   "EAR"   "EAT"   "ED"    "EEL"
+        "EGG"   "EGO"   "ELI"   "ELK"   "ELM"   "ELY"   "EM"    "END"
+        "EST"   "ETC"   "EVA"   "EVE"   "EWE"   "EYE"   "FAD"   "FAN"
+        "FAR"   "FAT"   "FAY"   "FED"   "FEE"   "FEW"   "FIB"   "FIG"
+        "FIN"   "FIR"   "FIT"   "FLO"   "FLY"   "FOE"   "FOG"   "FOR"
+        "FRY"   "FUM"   "FUN"   "FUR"   "GAB"   "GAD"   "GAG"   "GAL"
+        "GAM"   "GAP"   "GAS"   "GAY"   "GEE"   "GEL"   "GEM"   "GET"
+        "GIG"   "GIL"   "GIN"   "GO"    "GOT"   "GUM"   "GUN"   "GUS"
+        "GUT"   "GUY"   "GYM"   "GYP"   "HA"    "HAD"   "HAL"   "HAM"
+        "HAN"   "HAP"   "HAS"   "HAT"   "HAW"   "HAY"   "HE"    "HEM"
+        "HEN"   "HER"   "HEW"   "HEY"   "HI"    "HID"   "HIM"   "HIP"
+        "HIS"   "HIT"   "HO"   "HOB"   "HOC"   "HOE"   "HOG"   "HOP"
+        "HOT"   "HOW"   "HUB"   "HUE"   "HUG"   "HUH"   "HUM"   "HUT"
+        "I"     "ICY"   "IDA"   "IF"    "IKE"   "ILL"   "INK"   "INN"
+        "IO"    "ION"   "IQ"   "IRA"   "IRE"   "IRK"   "IS"    "IT"
+        "ITS"   "IVY"   "JAB"   "JAG"   "JAM"   "JAN"   "JAR"   "JAW"
+        "JAY"   "JET"   "JIG"   "JIM"   "JO"    "JOB"   "JOE"   "JOG"
+        "JOT"   "JOY"   "JUG"   "JUT"   "KAY"   "KEG"   "KEN"   "KEY"
+        "KID"   "KIM"   "KIN"   "KIT"   "LA"    "LAB"   "LAC"   "LAD"
+        "LAG"   "LAM"   "LAP"   "LAW"   "LAY"   "LEA"   "LED"   "LEE"
+        "LEG"   "LEN"   "LEO"   "LET"   "LEW"   "LID"   "LIE"   "LIN"
+        "LIP"   "LIT"   "LO"   "LOB"   "LOG"   "LOP"   "LOS"   "LOT"
+        "LOU"   "LOW"   "LOY"   "LUG"   "LYE"   "MA"    "MAC"   "MAD"
+        "MAE"   "MAN"   "MAO"   "MAP"   "MAT"   "MAW"   "MAY"   "ME"
+        "MEG"   "MEL"   "MEN"   "MET"   "MEW"   "MID"   "MIN"   "MIT"
+        "MOB"   "MOD"   "MOE"   "MOO"   "MOP"   "MOS"   "MOT"   "MOW"
+        "MUD"   "MUG"   "MUM"   "MY"    "NAB"   "NAG"   "NAN"   "NAP"
+        "NAT"   "NAY"   "NE"   "NED"   "NEE"   "NET"   "NEW"   "NIB"
+        "NIL"   "NIP"   "NIT"   "NO"    "NOB"   "NOD"   "NON"   "NOR"
+        "NOT"   "NOV"   "NOW"   "NU"    "NUN"   "NUT"   "O"     "OAF"
+        "OAK"   "OAR"   "OAT"   "ODD"   "ODE"   "OF"    "OFF"   "OFT"
+        "OH"    "OIL"   "OK"   "OLD"   "ON"    "ONE"   "OR"    "ORB"
+        "ORE"   "ORR"   "OS"   "OTT"   "OUR"   "OUT"   "OVA"   "OW"
+        "OWE"   "OWL"   "OWN"   "OX"    "PA"    "PAD"   "PAL"   "PAM"
+        "PAN"   "PAP"   "PAR"   "PAT"   "PAW"   "PAY"   "PEA"   "PEG"
+        "PEN"   "PEP"   "PER"   "PET"   "PEW"   "PHI"   "PI"    "PIE"
+        "PIN"   "PIT"   "PLY"   "PO"    "POD"   "POE"   "POP"   "POT"
+        "POW"   "PRO"   "PRY"   "PUB"   "PUG"   "PUN"   "PUP"   "PUT"
+        "QUO"   "RAG"   "RAM"   "RAN"   "RAP"   "RAT"   "RAW"   "RAY"
+        "REB"   "RED"   "REP"   "RET"   "RIB"   "RID"   "RIG"   "RIM"
+        "RIO"   "RIP"   "ROB"   "ROD"   "ROE"   "RON"   "ROT"   "ROW"
+        "ROY"   "RUB"   "RUE"   "RUG"   "RUM"   "RUN"   "RYE"   "SAC"
+        "SAD"   "SAG"   "SAL"   "SAM"   "SAN"   "SAP"   "SAT"   "SAW"
+        "SAY"   "SEA"   "SEC"   "SEE"   "SEN"   "SET"   "SEW"   "SHE"
+        "SHY"   "SIN"   "SIP"   "SIR"   "SIS"   "SIT"   "SKI"   "SKY"
+        "SLY"   "SO"    "SOB"   "SOD"   "SON"   "SOP"   "SOW"   "SOY"
+        "SPA"   "SPY"   "SUB"   "SUD"   "SUE"   "SUM"   "SUN"   "SUP"
+        "TAB"   "TAD"   "TAG"   "TAN"   "TAP"   "TAR"   "TEA"   "TED"
+        "TEE"   "TEN"   "THE"   "THY"   "TIC"   "TIE"   "TIM"   "TIN"
+        "TIP"   "TO"    "TOE"   "TOG"   "TOM"   "TON"   "TOO"   "TOP"
+        "TOW"   "TOY"   "TRY"   "TUB"   "TUG"   "TUM"   "TUN"   "TWO"
+        "UN"    "UP"    "US"   "USE"   "VAN"   "VAT"   "VET"   "VIE"
+        "WAD"   "WAG"   "WAR"   "WAS"   "WAY"   "WE"    "WEB"   "WED"
+        "WEE"   "WET"   "WHO"   "WHY"   "WIN"   "WIT"   "WOK"   "WON"
+        "WOO"   "WOW"   "WRY"   "WU"    "YAM"   "YAP"   "YAW"   "YE"
+        "YEA"   "YES"   "YET"   "YOU"   "ABED"  "ABEL"  "ABET"  "ABLE"
+        "ABUT"  "ACHE"  "ACID"  "ACME"  "ACRE"  "ACTA"  "ACTS"  "ADAM"
+        "ADDS"  "ADEN"  "AFAR"  "AFRO"  "AGEE"  "AHEM"  "AHOY"  "AIDA"
+        "AIDE"  "AIDS"  "AIRY"  "AJAR"  "AKIN"  "ALAN"  "ALEC"  "ALGA"
+        "ALIA"  "ALLY"  "ALMA"  "ALOE"  "ALSO"  "ALTO"  "ALUM"  "ALVA"
+        "AMEN"  "AMES"  "AMID"  "AMMO"  "AMOK"  "AMOS"  "AMRA"  "ANDY"
+        "ANEW"  "ANNA"  "ANNE"  "ANTE"  "ANTI"  "AQUA"  "ARAB"  "ARCH"
+        "AREA"  "ARGO"  "ARID"  "ARMY"  "ARTS"  "ARTY"  "ASIA"  "ASKS"
+        "ATOM"  "AUNT"  "AURA"  "AUTO"  "AVER"  "AVID"  "AVIS"  "AVON"
+        "AVOW"  "AWAY"  "AWRY"  "BABE"  "BABY"  "BACH"  "BACK"  "BADE"
+        "BAIL"  "BAIT"  "BAKE"  "BALD"  "BALE"  "BALI"  "BALK"  "BALL"
+        "BALM"  "BAND"  "BANE"  "BANG"  "BANK"  "BARB"  "BARD"  "BARE"
+        "BARK"  "BARN"  "BARR"  "BASE"  "BASH"  "BASK"  "BASS"  "BATE"
+        "BATH"  "BAWD"  "BAWL"  "BEAD"  "BEAK"  "BEAM"  "BEAN"  "BEAR"
+        "BEAT"  "BEAU"  "BECK"  "BEEF"  "BEEN"  "BEER"  "BEET"  "BELA"
+        "BELL"  "BELT"  "BEND"  "BENT"  "BERG"  "BERN"  "BERT"  "BESS"
+        "BEST"  "BETA"  "BETH"  "BHOY"  "BIAS"  "BIDE"  "BIEN"  "BILE"
+        "BILK"  "BILL"  "BIND"  "BING"  "BIRD"  "BITE"  "BITS"  "BLAB"
+        "BLAT"  "BLED"  "BLEW"  "BLOB"  "BLOC"  "BLOT"  "BLOW"  "BLUE"
+        "BLUM"  "BLUR"  "BOAR"  "BOAT"  "BOCA"  "BOCK"  "BODE"  "BODY"
+        "BOGY"  "BOHR"  "BOIL"  "BOLD"  "BOLO"  "BOLT"  "BOMB"  "BONA"
+        "BOND"  "BONE"  "BONG"  "BONN"  "BONY"  "BOOK"  "BOOM"  "BOON"
+        "BOOT"  "BORE"  "BORG"  "BORN"  "BOSE"  "BOSS"  "BOTH"  "BOUT"
+        "BOWL"  "BOYD"  "BRAD"  "BRAE"  "BRAG"  "BRAN"  "BRAY"  "BRED"
+        "BREW"  "BRIG"  "BRIM"  "BROW"  "BUCK"  "BUDD"  "BUFF"  "BULB"
+        "BULK"  "BULL"  "BUNK"  "BUNT"  "BUOY"  "BURG"  "BURL"  "BURN"
+        "BURR"  "BURT"  "BURY"  "BUSH"  "BUSS"  "BUST"  "BUSY"  "BYTE"
+        "CADY"  "CAFE"  "CAGE"  "CAIN"  "CAKE"  "CALF"  "CALL"  "CALM"
+        "CAME"  "CANE"  "CANT"  "CARD"  "CARE"  "CARL"  "CARR"  "CART"
+        "CASE"  "CASH"  "CASK"  "CAST"  "CAVE"  "CEIL"  "CELL"  "CENT"
+        "CERN"  "CHAD"  "CHAR"  "CHAT"  "CHAW"  "CHEF"  "CHEN"  "CHEW"
+        "CHIC"  "CHIN"  "CHOU"  "CHOW"  "CHUB"  "CHUG"  "CHUM"  "CITE"
+        "CITY"  "CLAD"  "CLAM"  "CLAN"  "CLAW"  "CLAY"  "CLOD"  "CLOG"
+        "CLOT"  "CLUB"  "CLUE"  "COAL"  "COAT"  "COCA"  "COCK"  "COCO"
+        "CODA"  "CODE"  "CODY"  "COED"  "COIL"  "COIN"  "COKE"  "COLA"
+        "COLD"  "COLT"  "COMA"  "COMB"  "COME"  "COOK"  "COOL"  "COON"
+        "COOT"  "CORD"  "CORE"  "CORK"  "CORN"  "COST"  "COVE"  "COWL"
+        "CRAB"  "CRAG"  "CRAM"  "CRAY"  "CREW"  "CRIB"  "CROW"  "CRUD"
+        "CUBA"  "CUBE"  "CUFF"  "CULL"  "CULT"  "CUNY"  "CURB"  "CURD"
+        "CURE"  "CURL"  "CURT"  "CUTS"  "DADE"  "DALE"  "DAME"  "DANA"
+        "DANE"  "DANG"  "DANK"  "DARE"  "DARK"  "DARN"  "DART"  "DASH"
+        "DATA"  "DATE"  "DAVE"  "DAVY"  "DAWN"  "DAYS"  "DEAD"  "DEAF"
+        "DEAL"  "DEAN"  "DEAR"  "DEBT"  "DECK"  "DEED"  "DEEM"  "DEER"
+        "DEFT"  "DEFY"  "DELL"  "DENT"  "DENY"  "DESK"  "DIAL"  "DICE"
+        "DIED"  "DIET"  "DIME"  "DINE"  "DING"  "DINT"  "DIRE"  "DIRT"
+        "DISC"  "DISH"  "DISK"  "DIVE"  "DOCK"  "DOES"  "DOLE"  "DOLL"
+        "DOLT"  "DOME"  "DONE"  "DOOM"  "DOOR"  "DORA"  "DOSE"  "DOTE"
+        "DOUG"  "DOUR"  "DOVE"  "DOWN"  "DRAB"  "DRAG"  "DRAM"  "DRAW"
+        "DREW"  "DRUB"  "DRUG"  "DRUM"  "DUAL"  "DUCK"  "DUCT"  "DUEL"
+        "DUET"  "DUKE"  "DULL"  "DUMB"  "DUNE"  "DUNK"  "DUSK"  "DUST"
+        "DUTY"  "EACH"  "EARL"  "EARN"  "EASE"  "EAST"  "EASY"  "EBEN"
+        "ECHO"  "EDDY"  "EDEN"  "EDGE"  "EDGY"  "EDIT"  "EDNA"  "EGAN"
+        "ELAN"  "ELBA"  "ELLA"  "ELSE"  "EMIL"  "EMIT"  "EMMA"  "ENDS"
+        "ERIC"  "EROS"  "EVEN"  "EVER"  "EVIL"  "EYED"  "FACE"  "FACT"
+        "FADE"  "FAIL"  "FAIN"  "FAIR"  "FAKE"  "FALL"  "FAME"  "FANG"
+        "FARM"  "FAST"  "FATE"  "FAWN"  "FEAR"  "FEAT"  "FEED"  "FEEL"
+        "FEET"  "FELL"  "FELT"  "FEND"  "FERN"  "FEST"  "FEUD"  "FIEF"
+        "FIGS"  "FILE"  "FILL"  "FILM"  "FIND"  "FINE"  "FINK"  "FIRE"
+        "FIRM"  "FISH"  "FISK"  "FIST"  "FITS"  "FIVE"  "FLAG"  "FLAK"
+        "FLAM"  "FLAT"  "FLAW"  "FLEA"  "FLED"  "FLEW"  "FLIT"  "FLOC"
+        "FLOG"  "FLOW"  "FLUB"  "FLUE"  "FOAL"  "FOAM"  "FOGY"  "FOIL"
+        "FOLD"  "FOLK"  "FOND"  "FONT"  "FOOD"  "FOOL"  "FOOT"  "FORD"
+        "FORE"  "FORK"  "FORM"  "FORT"  "FOSS"  "FOUL"  "FOUR"  "FOWL"
+        "FRAU"  "FRAY"  "FRED"  "FREE"  "FRET"  "FREY"  "FROG"  "FROM"
+        "FUEL"  "FULL"  "FUME"  "FUND"  "FUNK"  "FURY"  "FUSE"  "FUSS"
+        "GAFF"  "GAGE"  "GAIL"  "GAIN"  "GAIT"  "GALA"  "GALE"  "GALL"
+        "GALT"  "GAME"  "GANG"  "GARB"  "GARY"  "GASH"  "GATE"  "GAUL"
+        "GAUR"  "GAVE"  "GAWK"  "GEAR"  "GELD"  "GENE"  "GENT"  "GERM"
+        "GETS"  "GIBE"  "GIFT"  "GILD"  "GILL"  "GILT"  "GINA"  "GIRD"
+        "GIRL"  "GIST"  "GIVE"  "GLAD"  "GLEE"  "GLEN"  "GLIB"  "GLOB"
+        "GLOM"  "GLOW"  "GLUE"  "GLUM"  "GLUT"  "GOAD"  "GOAL"  "GOAT"
+        "GOER"  "GOES"  "GOLD"  "GOLF"  "GONE"  "GONG"  "GOOD"  "GOOF"
+        "GORE"  "GORY"  "GOSH"  "GOUT"  "GOWN"  "GRAB"  "GRAD"  "GRAY"
+        "GREG"  "GREW"  "GREY"  "GRID"  "GRIM"  "GRIN"  "GRIT"  "GROW"
+        "GRUB"  "GULF"  "GULL"  "GUNK"  "GURU"  "GUSH"  "GUST"  "GWEN"
+        "GWYN"  "HAAG"  "HAAS"  "HACK"  "HAIL"  "HAIR"  "HALE"  "HALF"
+        "HALL"  "HALO"  "HALT"  "HAND"  "HANG"  "HANK"  "HANS"  "HARD"
+        "HARK"  "HARM"  "HART"  "HASH"  "HAST"  "HATE"  "HATH"  "HAUL"
+        "HAVE"  "HAWK"  "HAYS"  "HEAD"  "HEAL"  "HEAR"  "HEAT"  "HEBE"
+        "HECK"  "HEED"  "HEEL"  "HEFT"  "HELD"  "HELL"  "HELM"  "HERB"
+        "HERD"  "HERE"  "HERO"  "HERS"  "HESS"  "HEWN"  "HICK"  "HIDE"
+        "HIGH"  "HIKE"  "HILL"  "HILT"  "HIND"  "HINT"  "HIRE"  "HISS"
+        "HIVE"  "HOBO"  "HOCK"  "HOFF"  "HOLD"  "HOLE"  "HOLM"  "HOLT"
+        "HOME"  "HONE"  "HONK"  "HOOD"  "HOOF"  "HOOK"  "HOOT"  "HORN"
+        "HOSE"  "HOST"  "HOUR"  "HOVE"  "HOWE"  "HOWL"  "HOYT"  "HUCK"
+        "HUED"  "HUFF"  "HUGE"  "HUGH"  "HUGO"  "HULK"  "HULL"  "HUNK"
+        "HUNT"  "HURD"  "HURL"  "HURT"  "HUSH"  "HYDE"  "HYMN"  "IBIS"
+        "ICON"  "IDEA"  "IDLE"  "IFFY"  "INCA"  "INCH"  "INTO"  "IONS"
+        "IOTA"  "IOWA"  "IRIS"  "IRMA"  "IRON"  "ISLE"  "ITCH"  "ITEM"
+        "IVAN"  "JACK"  "JADE"  "JAIL"  "JAKE"  "JANE"  "JAVA"  "JEAN"
+        "JEFF"  "JERK"  "JESS"  "JEST"  "JIBE"  "JILL"  "JILT"  "JIVE"
+        "JOAN"  "JOBS"  "JOCK"  "JOEL"  "JOEY"  "JOHN"  "JOIN"  "JOKE"
+        "JOLT"  "JOVE"  "JUDD"  "JUDE"  "JUDO"  "JUDY"  "JUJU"  "JUKE"
+        "JULY"  "JUNE"  "JUNK"  "JUNO"  "JURY"  "JUST"  "JUTE"  "KAHN"
+        "KALE"  "KANE"  "KANT"  "KARL"  "KATE"  "KEEL"  "KEEN"  "KENO"
+        "KENT"  "KERN"  "KERR"  "KEYS"  "KICK"  "KILL"  "KIND"  "KING"
+        "KIRK"  "KISS"  "KITE"  "KLAN"  "KNEE"  "KNEW"  "KNIT"  "KNOB"
+        "KNOT"  "KNOW"  "KOCH"  "KONG"  "KUDO"  "KURD"  "KURT"  "KYLE"
+        "LACE"  "LACK"  "LACY"  "LADY"  "LAID"  "LAIN"  "LAIR"  "LAKE"
+        "LAMB"  "LAME"  "LAND"  "LANE"  "LANG"  "LARD"  "LARK"  "LASS"
+        "LAST"  "LATE"  "LAUD"  "LAVA"  "LAWN"  "LAWS"  "LAYS"  "LEAD"
+        "LEAF"  "LEAK"  "LEAN"  "LEAR"  "LEEK"  "LEER"  "LEFT"  "LEND"
+        "LENS"  "LENT"  "LEON"  "LESK"  "LESS"  "LEST"  "LETS"  "LIAR"
+        "LICE"  "LICK"  "LIED"  "LIEN"  "LIES"  "LIEU"  "LIFE"  "LIFT"
+        "LIKE"  "LILA"  "LILT"  "LILY"  "LIMA"  "LIMB"  "LIME"  "LIND"
+        "LINE"  "LINK"  "LINT"  "LION"  "LISA"  "LIST"  "LIVE"  "LOAD"
+        "LOAF"  "LOAM"  "LOAN"  "LOCK"  "LOFT"  "LOGE"  "LOIS"  "LOLA"
+        "LONE"  "LONG"  "LOOK"  "LOON"  "LOOT"  "LORD"  "LORE"  "LOSE"
+        "LOSS"  "LOST"  "LOUD"  "LOVE"  "LOWE"  "LUCK"  "LUCY"  "LUGE"
+        "LUKE"  "LULU"  "LUND"  "LUNG"  "LURA"  "LURE"  "LURK"  "LUSH"
+        "LUST"  "LYLE"  "LYNN"  "LYON"  "LYRA"  "MACE"  "MADE"  "MAGI"
+        "MAID"  "MAIL"  "MAIN"  "MAKE"  "MALE"  "MALI"  "MALL"  "MALT"
+        "MANA"  "MANN"  "MANY"  "MARC"  "MARE"  "MARK"  "MARS"  "MART"
+        "MARY"  "MASH"  "MASK"  "MASS"  "MAST"  "MATE"  "MATH"  "MAUL"
+        "MAYO"  "MEAD"  "MEAL"  "MEAN"  "MEAT"  "MEEK"  "MEET"  "MELD"
+        "MELT"  "MEMO"  "MEND"  "MENU"  "MERT"  "MESH"  "MESS"  "MICE"
+        "MIKE"  "MILD"  "MILE"  "MILK"  "MILL"  "MILT"  "MIMI"  "MIND"
+        "MINE"  "MINI"  "MINK"  "MINT"  "MIRE"  "MISS"  "MIST"  "MITE"
+        "MITT"  "MOAN"  "MOAT"  "MOCK"  "MODE"  "MOLD"  "MOLE"  "MOLL"
+        "MOLT"  "MONA"  "MONK"  "MONT"  "MOOD"  "MOON"  "MOOR"  "MOOT"
+        "MORE"  "MORN"  "MORT"  "MOSS"  "MOST"  "MOTH"  "MOVE"  "MUCH"
+        "MUCK"  "MUDD"  "MUFF"  "MULE"  "MULL"  "MURK"  "MUSH"  "MUST"
+        "MUTE"  "MUTT"  "MYRA"  "MYTH"  "NAGY"  "NAIL"  "NAIR"  "NAME"
+        "NARY"  "NASH"  "NAVE"  "NAVY"  "NEAL"  "NEAR"  "NEAT"  "NECK"
+        "NEED"  "NEIL"  "NELL"  "NEON"  "NERO"  "NESS"  "NEST"  "NEWS"
+        "NEWT"  "NIBS"  "NICE"  "NICK"  "NILE"  "NINA"  "NINE"  "NOAH"
+        "NODE"  "NOEL"  "NOLL"  "NONE"  "NOOK"  "NOON"  "NORM"  "NOSE"
+        "NOTE"  "NOUN"  "NOVA"  "NUDE"  "NULL"  "NUMB"  "OATH"  "OBEY"
+        "OBOE"  "ODIN"  "OHIO"  "OILY"  "OINT"  "OKAY"  "OLAF"  "OLDY"
+        "OLGA"  "OLIN"  "OMAN"  "OMEN"  "OMIT"  "ONCE"  "ONES"  "ONLY"
+        "ONTO"  "ONUS"  "ORAL"  "ORGY"  "OSLO"  "OTIS"  "OTTO"  "OUCH"
+        "OUST"  "OUTS"  "OVAL"  "OVEN"  "OVER"  "OWLY"  "OWNS"  "QUAD"
+        "QUIT"  "QUOD"  "RACE"  "RACK"  "RACY"  "RAFT"  "RAGE"  "RAID"
+        "RAIL"  "RAIN"  "RAKE"  "RANK"  "RANT"  "RARE"  "RASH"  "RATE"
+        "RAVE"  "RAYS"  "READ"  "REAL"  "REAM"  "REAR"  "RECK"  "REED"
+        "REEF"  "REEK"  "REEL"  "REID"  "REIN"  "RENA"  "REND"  "RENT"
+        "REST"  "RICE"  "RICH"  "RICK"  "RIDE"  "RIFT"  "RILL"  "RIME"
+        "RING"  "RINK"  "RISE"  "RISK"  "RITE"  "ROAD"  "ROAM"  "ROAR"
+        "ROBE"  "ROCK"  "RODE"  "ROIL"  "ROLL"  "ROME"  "ROOD"  "ROOF"
+        "ROOK"  "ROOM"  "ROOT"  "ROSA"  "ROSE"  "ROSS"  "ROSY"  "ROTH"
+        "ROUT"  "ROVE"  "ROWE"  "ROWS"  "RUBE"  "RUBY"  "RUDE"  "RUDY"
+        "RUIN"  "RULE"  "RUNG"  "RUNS"  "RUNT"  "RUSE"  "RUSH"  "RUSK"
+        "RUSS"  "RUST"  "RUTH"  "SACK"  "SAFE"  "SAGE"  "SAID"  "SAIL"
+        "SALE"  "SALK"  "SALT"  "SAME"  "SAND"  "SANE"  "SANG"  "SANK"
+        "SARA"  "SAUL"  "SAVE"  "SAYS"  "SCAN"  "SCAR"  "SCAT"  "SCOT"
+        "SEAL"  "SEAM"  "SEAR"  "SEAT"  "SEED"  "SEEK"  "SEEM"  "SEEN"
+        "SEES"  "SELF"  "SELL"  "SEND"  "SENT"  "SETS"  "SEWN"  "SHAG"
+        "SHAM"  "SHAW"  "SHAY"  "SHED"  "SHIM"  "SHIN"  "SHOD"  "SHOE"
+        "SHOT"  "SHOW"  "SHUN"  "SHUT"  "SICK"  "SIDE"  "SIFT"  "SIGH"
+        "SIGN"  "SILK"  "SILL"  "SILO"  "SILT"  "SINE"  "SING"  "SINK"
+        "SIRE"  "SITE"  "SITS"  "SITU"  "SKAT"  "SKEW"  "SKID"  "SKIM"
+        "SKIN"  "SKIT"  "SLAB"  "SLAM"  "SLAT"  "SLAY"  "SLED"  "SLEW"
+        "SLID"  "SLIM"  "SLIT"  "SLOB"  "SLOG"  "SLOT"  "SLOW"  "SLUG"
+        "SLUM"  "SLUR"  "SMOG"  "SMUG"  "SNAG"  "SNOB"  "SNOW"  "SNUB"
+        "SNUG"  "SOAK"  "SOAR"  "SOCK"  "SODA"  "SOFA"  "SOFT"  "SOIL"
+        "SOLD"  "SOME"  "SONG"  "SOON"  "SOOT"  "SORE"  "SORT"  "SOUL"
+        "SOUR"  "SOWN"  "STAB"  "STAG"  "STAN"  "STAR"  "STAY"  "STEM"
+        "STEW"  "STIR"  "STOW"  "STUB"  "STUN"  "SUCH"  "SUDS"  "SUIT"
+        "SULK"  "SUMS"  "SUNG"  "SUNK"  "SURE"  "SURF"  "SWAB"  "SWAG"
+        "SWAM"  "SWAN"  "SWAT"  "SWAY"  "SWIM"  "SWUM"  "TACK"  "TACT"
+        "TAIL"  "TAKE"  "TALE"  "TALK"  "TALL"  "TANK"  "TASK"  "TATE"
+        "TAUT"  "TEAL"  "TEAM"  "TEAR"  "TECH"  "TEEM"  "TEEN"  "TEET"
+        "TELL"  "TEND"  "TENT"  "TERM"  "TERN"  "TESS"  "TEST"  "THAN"
+        "THAT"  "THEE"  "THEM"  "THEN"  "THEY"  "THIN"  "THIS"  "THUD"
+        "THUG"  "TICK"  "TIDE"  "TIDY"  "TIED"  "TIER"  "TILE"  "TILL"
+        "TILT"  "TIME"  "TINA"  "TINE"  "TINT"  "TINY"  "TIRE"  "TOAD"
+        "TOGO"  "TOIL"  "TOLD"  "TOLL"  "TONE"  "TONG"  "TONY"  "TOOK"
+        "TOOL"  "TOOT"  "TORE"  "TORN"  "TOTE"  "TOUR"  "TOUT"  "TOWN"
+        "TRAG"  "TRAM"  "TRAY"  "TREE"  "TREK"  "TRIG"  "TRIM"  "TRIO"
+        "TROD"  "TROT"  "TROY"  "TRUE"  "TUBA"  "TUBE"  "TUCK"  "TUFT"
+        "TUNA"  "TUNE"  "TUNG"  "TURF"  "TURN"  "TUSK"  "TWIG"  "TWIN"
+        "TWIT"  "ULAN"  "UNIT"  "URGE"  "USED"  "USER"  "USES"  "UTAH"
+        "VAIL"  "VAIN"  "VALE"  "VARY"  "VASE"  "VAST"  "VEAL"  "VEDA"
+        "VEIL"  "VEIN"  "VEND"  "VENT"  "VERB"  "VERY"  "VETO"  "VICE"
+        "VIEW"  "VINE"  "VISE"  "VOID"  "VOLT"  "VOTE"  "WACK"  "WADE"
+        "WAGE"  "WAIL"  "WAIT"  "WAKE"  "WALE"  "WALK"  "WALL"  "WALT"
+        "WAND"  "WANE"  "WANG"  "WANT"  "WARD"  "WARM"  "WARN"  "WART"
+        "WASH"  "WAST"  "WATS"  "WATT"  "WAVE"  "WAVY"  "WAYS"  "WEAK"
+        "WEAL"  "WEAN"  "WEAR"  "WEED"  "WEEK"  "WEIR"  "WELD"  "WELL"
+        "WELT"  "WENT"  "WERE"  "WERT"  "WEST"  "WHAM"  "WHAT"  "WHEE"
+        "WHEN"  "WHET"  "WHOA"  "WHOM"  "WICK"  "WIFE"  "WILD"  "WILL"
+        "WIND"  "WINE"  "WING"  "WINK"  "WINO"  "WIRE"  "WISE"  "WISH"
+        "WITH"  "WOLF"  "WONT"  "WOOD"  "WOOL"  "WORD"  "WORE"  "WORK"
+        "WORM"  "WORN"  "WOVE"  "WRIT"  "WYNN"  "YALE"  "YANG"  "YANK"
+        "YARD"  "YARN"  "YAWL"  "YAWN"  "YEAH"  "YEAR"  "YELL"  "YOGA"
+        "YOKE"   
+    }
+}
+
+# Encode 64 bits as words selected from the RFC 2289 dictionary.
+# See the RFC for details. Briefly the input is broken into 11 bit
+# chunks + 2bits of checksum and each chunk selects a word from the 
+# 2048 word table.
+#
+proc ::otp::otp_encode {data} {
+    variable Words
+    if {[string length $data] != 8} {
+        set bc [expr {[string length $data] * 8}]
+        return -code error "invalid input: 64 bits of data\
+            required and $bc  bits provided"
+    }
+    binary scan $data II A B
+
+    set cksum 0
+    foreach w [list $A $B] {
+        for {set n 0} {$n < 32} {incr n 2} {
+            incr cksum [expr {($w >> $n) & 3}]
+        }
+    }
+
+    set W0 [expr { (($A & 0xFFE00000) >> 21) & 0x07ff}]
+    set W1 [expr { (($A & 0x001FFC00) >> 10)}]
+    set W2 [expr { (($A & 0x000003FF) << 1)  | (($B >> 31) & 0x1)}]
+    set W3 [expr {  ($B & 0x7FF00000) >> 20}]
+    set W4 [expr {  ($B & 0x000FFE00) >> 9}]
+    set W5 [expr { (($B & 0x000001FF) << 2) | ($cksum & 3)}]
+    
+    foreach w [list $W0 $W1 $W2 $W3 $W4 $W5] {
+        lappend words [lindex $Words $w]
+    }
+
+    return $words
+}
+
+# Fold a 128 bit digest in little-endian format into a 64 bit
+# little-endian output
+proc ::otp::Fold64LE {digest} {
+    binary scan $digest iiii A B C D
+    set w0 [expr {($A ^ $C) & 0xffffffff}]
+    set w1 [expr {($B ^ $D) & 0xffffffff}]
+    binary format ii $w0 $w1
+}
+
+# Fold a160 bit big-endian digest (SHA-1) into a 64 bit 
+# little-endian output
+proc ::otp::Fold160BE {digest} {
+    binary scan $digest IIIII A B C D E
+    set w0 [expr {(($A ^ $C) ^ $E) & 0xffffffff}]
+    set w1 [expr { ($B ^ $D)       & 0xffffffff}]
+    binary format ii $w0 $w1
+}
+
+# Fold a 160 bit little-endian digest into a 64 bit 
+# little-endian output.
+proc ::otp::Fold160LE {digest} {
+    binary scan $digest iiiii A B C D E
+    set w0 [expr {(($A ^ $C) ^ $E) & 0xffffffff}]
+    set w1 [expr { ($B ^ $D)       & 0xffffffff}]
+    binary format ii $w0 $w1
+}
+
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::otp::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+proc ::otp::otp {args} {
+    array set opts {-hash md5 -seed {} -count 0 -hex 0 -words 0}
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -exact -- $option {
+            -hex   { set opts(-hex) 1}
+            -word - 
+            -words { set opts(-words) 1 }
+            -hash  { set opts(-hash) [Pop args 1] }
+            -seed  { set opts(-seed) [Pop args 1] }
+            -count { set opts(-count) [Pop args 1] }
+            default {
+                if {[llength $args] == 1} { break }
+                if {[string compare $option "--"] == 0} { Pop args; break }
+                set err [join [lsort [array names opts]] ", "]
+                return -code error "bad option \"$option\":\
+                    must be one of $err"
+            }
+        }
+        Pop args
+    }
+    
+    set data [lindex $args 0]
+
+    if {[string length $opts(-seed)] < 1 || [string length $opts(-seed)] > 16} {
+        return -code error "seed must be between 1 and 16 characters in length"
+    }
+    switch -exact -- $opts(-hash) {
+        md4  { set func ::md4::md4  ; set fold ::otp::Fold64LE }
+        md5  { set func ::md5::md5  ; set fold ::otp::Fold64LE }
+        sha1 { set func ::otp::sha1 ; set fold ::otp::Fold160BE }
+        rmd160 { set func ::ripemd::ripemd160 ; set fold ::otp::Fold160LE }
+        default {
+            return -code error "invalid hash type \"$opts(-hash)\":\
+                must be one of md4, md5, rmd160 or sha1"
+        }
+    }
+    # RFC 2289: Initial step
+    set S [$fold [$func [string tolower $opts(-seed)]$data]]
+    
+    # RFC2289:6 Computation step
+    for {set n 0} {$n < $opts(-count)} {incr n} {
+        set S [$fold [$func $S]]
+    }
+
+    if {$opts(-hex)} {
+        binary scan $S H* S 
+    } elseif {$opts(-words)} {
+        set S [otp_encode $S] 
+    }
+    return $S
+}
+
+proc ::otp::otp-md4 {args} {
+    package require md4
+    return [eval [linsert $args 0 [namespace current]::otp -hash md4]]
+}
+
+proc ::otp::otp-md5 {args} {
+    package require md5
+    return [eval [linsert $args 0 [namespace current]::otp -hash md5]]
+}
+
+proc ::otp::otp-sha1 {args} {
+    package require sha1
+    interp alias {} ::otp::sha1 {} ::sha1::sha1 -bin
+    return [eval [linsert $args 0 [namespace current]::otp -hash sha1]]
+}
+
+proc ::otp::otp-rmd160 {args} {
+    package require ripemd160
+    return [eval [linsert $args 0 [namespace current]::otp -hash rmd160]]
+}
+
+# -------------------------------------------------------------------------
+
+package provide otp 1.0.0
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/otp/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/otp/pkgIndex.tcl
new file mode 100644
index 00000000..803854b3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/otp/pkgIndex.tcl
@@ -0,0 +1,3 @@
+# pkgIndex.tcl -*- tcl -*-
+if {![package vsatisfies [package provide Tcl] 8.2]} { return }
+package ifneeded otp 1.0.0 [list source [file join $dir otp.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/analysis_peg_emodes.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/analysis_peg_emodes.tcl
new file mode 100644
index 00000000..a6b224e4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/analysis_peg_emodes.tcl
@@ -0,0 +1,458 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+
+# Perform mode analysis (x) on the PE grammar delivered by the
+# frontend. The grammar is in normalized form (*).
+#
+# (x) = See "doc_emodes.txt".
+#       and "doc_emodes_alg.txt".
+# (*) = See "doc_normalize.txt".
+
+# This package assumes to be used from within a PAGE plugin. It uses
+# the API commands listed below. These are identical across the major
+# types of PAGE plugins, allowing this package to be used in reader,
+# transform, and writer plugins. It cannot be used in a configuration
+# plugin, and this makes no sense either.
+#
+# To ensure that our assumption is ok we require the relevant pseudo
+# package setup by the PAGE plugin management code.
+#
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: page::plugin
+
+package require page::plugin     ; # S.a. pseudo-package.
+package require page::util::flow ; # Dataflow walking.
+package require page::util::peg  ; # General utilities.
+package require treeql
+
+namespace eval ::page::analysis::peg::emodes {
+    namespace import ::page::util::peg::*
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::analysis::peg::emodes::compute {t} {
+
+    # Ignore call if already done before
+    if {[$t keyexists root page::analysis::peg::emodes]} {return 1}
+
+    # We do not actually compute per node a mode, but rather their
+    # gen'erate and acc'eptance properties, as described in
+    # "doc_emodes.txt".
+
+    # Note: This implementation will not compute acc/gen information
+    # for unreachable nodes.
+
+    # --- --- --- --------- --------- ---------
+
+    array set acc  {} ; # Per node X, acc(X), undefined if no element
+    array set call {} ; # Per definition node, number of users
+    array set cala {} ; # Per definition node, number of (non-)accepting users
+
+    foreach {sym def} [$t get root definitions] {
+	set call($def)   [llength [$t get $def users]]
+	set cala(0,$def) 0
+	set cala(1,$def) 0
+    }
+
+    set acc(root) 1 ; # Sentinel for root of start expression.
+
+    # --- --- --- --------- --------- ---------
+
+    #puts stderr ~~~~\t~~~\t~~~\t~~~\t~~~
+    #puts stderr Node\tAcc\tNew\tWhat\tOp
+    #puts stderr ~~~~\t~~~\t~~~\t~~~\t~~~
+
+    # A node is visited if its value for acc() is either undefined or
+    # may have changed. Basic flow is top down, from the start
+    # expression and a definition a child of its invokers.
+
+    set gstart [$t get root start]
+    if {$gstart eq ""} {
+	page_error "  No start expression, unable to compute accept/generate properties"
+	return 0
+    }
+
+    page::util::flow [list $gstart] flow n {
+	# Determine first or new value.
+
+	#puts -nonewline stderr [string replace $n 1 3]
+
+	if {![info exists acc($n)]} {
+	    set a [Accepting $t $n acc call cala]
+	    set acc($n) $a
+	    set change 0
+
+	    #puts -nonewline stderr \t-\t$a\t^
+	} else {
+	    set a   [Accepting $t $n acc call cala]
+	    set old $acc($n)
+	    if {$a == $old} {
+		#puts stderr \t$old\t$a\t\ =
+		continue
+	    }
+	    set change 1
+	    set acc($n) $a
+
+	    #puts -nonewline stderr \t$old\t$a\t\ \ *
+	}
+
+	# Update counters in definitions, if the node invokes them.
+	# Also, schedule the children for their (re)definition.
+
+	if {[$t keyexists $n symbol]} {
+	    #puts -nonewline stderr \t\ DEF\t[$t get $n symbol]\t[$t get $n mode]
+	} else {
+	    #puts -nonewline stderr \t[$t get $n op]\t\t
+	}
+
+	if {[$t keyexists $n op] && ([$t get $n op] eq "n")} {
+	    #puts -nonewline stderr ->\ [$t get $n sym]
+	    set def [$t get $n def]
+	    if {$def eq ""} continue
+
+	    if {$change} {
+		incr cala($old,$def) -1
+	    }
+	    incr cala($a,$def)
+	    $flow visit $def
+
+	    #puts -nonewline stderr @$def\t(0a$cala(0,$def),\ 1a$cala(1,$def),\ #$call($def))\tv($def)
+	    #puts stderr ""
+	    continue
+	}
+
+	#puts stderr \t\t\t\tv([$t children $n])
+	$flow visitl [$t children $n]
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    array set gen {} ; # Per node X, gen(X), undefined if no element
+    array set nc  {} ; # Per node, number of children
+    array set ng  {} ; # Per node, number of (non-)generating children
+
+    foreach n [$t nodes] {
+	set nc($n)       [$t numchildren $n]
+	set ng(0,$n)     0
+	set ng(1,$n)     0
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    #puts stderr ~~~~\t~~~\t~~~\t~~~\t~~~
+    #puts stderr Node\tGen\tNew\tWhat\tOp
+    #puts stderr ~~~~\t~~~\t~~~\t~~~\t~~~
+
+    # A node is visited if its value for gen() is either undefined or
+    # may have changed. Basic flow is bottom up, from the all
+    # leaves (and lookahead operators). Users of a definition are
+    # considered as its parents.
+
+    set start [$t leaves]
+    set q [treeql q -tree $t]
+    q query tree withatt op ! over n {lappend start $n}
+    q query tree withatt op & over n {lappend start $n}
+    q destroy
+
+    page::util::flow $start flow n {
+	# Ignore root.
+
+	if {$n eq "root"} continue
+
+	#puts -nonewline stderr [string replace $n 1 3]
+
+	# Determine first or new value.
+
+	if {![info exists gen($n)]} {
+	    set g [Generating $t $n gen nc ng acc call cala]
+	    set gen($n) $g
+
+	    #puts -nonewline stderr \t-\t$g\t^
+
+	} else {
+	    set g   [Generating $t $n gen nc ng acc call cala]
+	    set old $gen($n)
+	    if {$g eq $old} {
+		#puts stderr \t$old\t$g\t\ =
+		continue
+	    }
+	    set gen($n) $g
+
+	    #puts -nonewline stderr \t$old\t$g\t\ \ *
+	}
+
+	if {($g ne "maybe") && !$g && $acc($n)} {
+	    # No generate here implies that none of our children will
+	    # generate anything either. So the current acceptance of
+	    # these non-existing values can be safely forced to
+	    # non-acceptance.
+
+	    set acc($n) 0
+	    #puts -nonewline stderr "-a"
+	}
+
+	if {0} {
+	    if {[$t keyexists $n symbol]} {
+		#puts -nonewline stderr \t\ DEF\t[$t get $n symbol]\t[$t get $n mode]
+	    } else {
+		#puts -nonewline stderr \t[$t get $n op]\t\t
+	    }
+	}
+
+	#puts -nonewline stderr \t(0g$ng(0,$n),1g$ng(1,$n),\ #$nc($n))
+
+	# Update counters in the (virtual) parents, and schedule them
+	# for a visit.
+
+	if {[$t keyexists $n symbol]} {
+	    # Users are virtual parents.
+
+	    set users  [$t get $n users]
+	    $flow visitl $users
+
+	    if {$g ne "maybe"} {
+		foreach u $users {incr ng($g,$u)}
+	    }
+	    #puts stderr \tv($users)
+	    continue
+	}
+
+	set p [$t parent $n]
+	$flow visit $p
+	if {$g ne "maybe"} {
+	    incr ng($g,$p)
+	}
+
+	#puts stderr \tv($p)
+    }
+
+    # --- --- --- --------- --------- ---------
+
+    # Copy the calculated data over into the tree.
+    # Note: There will be no data for unreachable nodes.
+
+    foreach n [$t nodes] {
+	if {$n eq "root"}           continue
+	if {![info exists acc($n)]} continue
+	$t set $n acc $acc($n)
+	$t set $n gen $gen($n)
+    }
+
+    # Recompute the modes based on the current
+    # acc/gen status of the definitions.
+
+    #puts stderr ~~~~\t~~~\t~~~~\t~~~\t~~~\t~~~
+    #puts stderr Node\tSym\tMode\tNew\tGen\tAcc
+    #puts stderr ~~~~\t~~~\t~~~~\t~~~\t~~~\t~~~
+
+    foreach {sym def} [$t get root definitions] {
+	set m {}
+
+	set old [$t get $def mode]
+
+	if {[info exists acc($def)]} {
+	    switch -exact -- $gen($def)/$acc($def) {
+		0/0     {set m discard}
+		0/1     {error "Bad gen/acc for $sym"}
+		1/0     {# don't touch (match, leaf)}
+		1/1     {set m value}
+		maybe/0 {error "Bad gen/acc for $sym"}
+		maybe/1 {set m value}
+	    }
+	    if {$m ne ""} {
+		# Should check correctness of change, if any (We can drop
+		# to discard, nothing else).
+		$t set $def mode $m
+	    }
+	    #puts stderr [string replace $def 1 3]\t$sym\t$old\t[$t get $def mode]\t[$t get $def gen]\t[$t get $def acc]
+	} else {
+	    #puts stderr [string replace $def 1 3]\t$sym\t$old\t\t\t\tNOT_REACHED
+	}
+    }
+
+    #puts stderr ~~~~\t~~~\t~~~~\t~~~\t~~~\t~~~
+
+    # Wrap up the whole state and save it in the tree. No need to
+    # throw this away, useful for other mode based transforms and
+    # easier to get in this way than walking the tree again.
+
+    $t set root page::analysis::peg::emodes [list \
+	    [array get acc] \
+	    [array get call] \
+	    [array get cala] \
+	    [array get gen] \
+	    [array get nc] \
+	    [array get ng]]
+    return 1
+}
+
+proc ::page::analysis::peg::emodes::reset {t} {
+    # Remove marker, allow recalculation of emodesness after changes.
+
+    $t unset root page::analysis::peg::emodes
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal
+
+proc ::page::analysis::peg::emodes::Accepting {t n av cv cav} {
+    upvar 1 $av acc $cv call $cav cala
+
+    # Definitions accept based on how they are called first, and on
+    # their mode if that is not possible.
+
+    if {[$t keyexists $n symbol]} {
+	# Call based acceptance.
+	# !acc if all callers do not accept.
+
+	if {$cala(0,$n) >= $call($n)} {
+	    return 0
+	}
+
+	# Falling back to mode specific accptance
+	return [expr {([$t get $n mode] eq "value") ? 1 : 0}]
+    }
+
+    set op [$t get $n op]
+
+    # Lookahead operators will never accept.
+
+    if {($op eq "!") || ($op eq "&")} {
+	return 0
+    }
+
+    # All other operators inherit the acceptance
+    # of their parent.
+
+    return $acc([$t parent $n])
+}
+
+proc ::page::analysis::peg::emodes::Generating {t n gv ncv ngv av cv cav} {
+    upvar 1 $gv gen $ncv nc $ngv ng $av acc $cv call $cav cala
+    #           ~~~      ~~      ~~     ~~~     ~~~~      ~~~~
+
+    # Definitions generate based on their mode, their defining
+    # expression, and the acceptance of their callers.
+
+    if {[$t keyexists $n symbol]} {
+
+	# If no caller accepts a value, then this definition will not
+	# generate one, even if its own mode asked it to do so.
+
+	if {$cala(0,$n) >= $call($n)} {
+	    return 0
+	}
+
+	# The definition has callers accepting values and callres not
+	# doing so. It will generate as per its own mode and defining
+	# expression.
+
+	# The special modes know if they generate a value or not.
+	# The pass through mode looks at the expression for the
+	# information.
+
+	switch -exact -- [$t get $n mode] {
+	    value   {return $gen([lindex [$t children $n] 0])}
+	    match   {return 1}
+	    leaf    {return 1}
+	    discard {return 0}
+	}
+	error PANIC
+    }
+
+    set op [$t get $n op]
+
+    # Inner nodes generate based on operator and children.
+
+    if {$nc($n)} {
+	switch -exact -- $op {
+	    ! - & {return 0}
+	    ? - * {
+		# No for all children --> no
+		# Otherwise           --> maybe
+
+		if {$ng(0,$n) >= $nc($n)} {
+		    return 0
+		} else {
+		    return maybe
+		}
+	    }
+	    + - / - | {
+		# Yes for all children --> yes
+		# No for all children  --> no
+		# Otherwise            --> maybe
+
+		if {$ng(1,$n) >= $nc($n)} {
+		    return 1
+		} elseif {$ng(0,$n) >= $nc($n)} {
+		    return 0
+		} else {
+		    return maybe
+		}
+	    }
+	    x {
+		# Yes for some children --> yes
+		# No for all children   --> no
+		# Otherwise             --> maybe
+
+		if {$ng(1,$n) > 0} {
+		    return 1
+		} elseif {$ng(0,$n) >= $nc($n)} {
+		    return 0
+		} else {
+		    return maybe
+		}
+	    }
+	}
+	error PANIC
+    }
+
+    # Nonterminal leaves generate based on acceptance from their
+    # parent and the referenced definition.
+
+    # As acc(X) == acc(parent(X)) the test doesn't have to go to the
+    # parent itself.
+
+    if {$op eq "n"} {
+	if {[info exists acc($n)] && !$acc($n)} {return 0}
+
+	set def [$t get $n def]
+
+	# Undefine symbols do not generate anything.
+	if {$def eq ""} {return 0}
+
+	# Inherit directly from the definition, if existing.
+	if {![info exists gen($def)]} {
+	    return maybe
+	}
+
+	return $gen($def)
+    }
+
+    # Terminal leaves generate values if and only if such values are
+    # accepted by their parent. As acc(X) == acc(parent(X) the test
+    # doesn't have to go to the parent itself.
+
+
+    return $acc($n)
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::analysis::peg::emodes 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/analysis_peg_minimize.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/analysis_peg_minimize.tcl
new file mode 100644
index 00000000..84cf07ec
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/analysis_peg_minimize.tcl
@@ -0,0 +1,51 @@
+# -*- tcl -*-
+# Transform - Minimize the grammar, through the removal of the
+# unreachable and not useful nonterminals (and expressions).
+
+# This package assumes to be used from within a PAGE plugin. It uses
+# the API commands listed below. These are identical across the major
+# types of PAGE plugins, allowing this package to be used in reader,
+# transform, and writer plugins. It cannot be used in a configuration
+# plugin, and this makes no sense either.
+#
+# To ensure that our assumption is ok we require the relevant pseudo
+# package setup by the PAGE plugin management code.
+#
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: page::plugin
+
+package require page::plugin ; # S.a. pseudo-package.
+package require page::analysis::peg::reachable
+package require page::analysis::peg::realizable
+
+namespace eval ::page::analysis::peg {}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::analysis::peg::minimize {t} {
+    page_info {[PEG Minimization]}
+    page_log_info ..Reachability  ; ::page::analysis::peg::reachable::remove!
+    page_log_info ..Realizability ; ::page::analysis::peg::realizable::remove!
+
+    page_log_info Ok
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::analysis::peg::minimize 0.1
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/analysis_peg_reachable.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/analysis_peg_reachable.tcl
new file mode 100644
index 00000000..27d12ff9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/analysis_peg_reachable.tcl
@@ -0,0 +1,150 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+
+# Perform reachability analysis on the PE grammar delivered by the
+# frontend. The grammar is in normalized form (reduced to essentials,
+# graph like node-x-references, expression trees).
+
+# This package assumes to be used from within a PAGE plugin. It uses
+# the API commands listed below. These are identical across the major
+# types of PAGE plugins, allowing this package to be used in reader,
+# transform, and writer plugins. It cannot be used in a configuration
+# plugin, and this makes no sense either.
+#
+# To ensure that our assumption is ok we require the relevant pseudo
+# package setup by the PAGE plugin management code.
+#
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: page::plugin
+
+package require page::plugin     ; # S.a. pseudo-package.
+package require page::util::flow ; # Dataflow walking.
+package require page::util::peg  ; # General utilities.
+
+namespace eval ::page::analysis::peg::reachable {
+    namespace import ::page::util::peg::*
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::analysis::peg::reachable::compute {t} {
+
+    # Ignore call if already done before
+    if {[$t keyexists root page::analysis::peg::reachable]} return
+
+    # We compute the set of all nodes which are reachable from the
+    # root node of the start expression. This is a simple topdown walk
+    # where the children of all reachable nodes are mode reachable as
+    # well, and invokations of nonterminals symbols are treated as
+    # children as well. At the end of the flow all reachable non-
+    # terminal symbols and their expressions are marked, and none
+    # other.
+
+    # Initialize walking state: 2 arrays, all nodes (except root) are
+    # in or the other array, and their location tells if they are
+    # reachable or not. In the beginning no node is reachable. The
+    # goal array (reach) also serves as minder of which nodes have
+    # been seen, to cut multiple visits short.
+
+    array set unreach {} ; foreach n [$t nodes] {set unreach($n) .}
+    unset     unreach(root)
+    array set reach   {}
+
+    # A node is visited if it has been determined that it is indeed
+    # reachable.
+
+    page::util::flow [list [$t get root start]] flow n {
+	# Ignore nodes already reached.
+	if {[info exists reach($n)]} continue
+
+	# Reclassify node, has been reached now.
+	unset unreach($n)
+	set   reach($n) .
+
+	# Schedule children for visit --> topdown flow.
+	$flow visitl [$t children $n]
+
+	# Treat n-Nodes as special, their definition as indirect
+	# child. But ignore invokations of undefined nonterminal
+	# symbols, or those already marked as reachable.
+
+	if {![$t keyexists $n op]} continue
+	if {[$t get $n op] ne "n"} continue
+
+	set def [$t get $n def]
+	if {$def eq ""}                continue
+	if {[info exists reach($def)]} continue
+	$flow visit $def
+    }
+
+    # Store results. This also serves as marker.
+
+    $t set root page::analysis::peg::reachable   [array names reach]
+    $t set root page::analysis::peg::unreachable [array names unreach]
+    return
+}
+
+proc ::page::analysis::peg::reachable::remove! {t} {
+
+    # Determine which nonterminal symbols are reachable from the root
+    # of the start expression.
+
+    compute $t
+
+    # Remove all nodes which are not reachable.
+
+    set unreach [$t get root page::analysis::peg::unreachable]
+    foreach n [lsort $unreach] {
+	if {[$t exists $n]} {
+	    $t delete $n
+	}
+    }
+
+    # Notify the user of the definitions which were among the removed
+    # nodes. Keep only the still-existing definitions.
+
+    set res {}
+    foreach {sym def} [$t get root definitions] {
+	if {![$t exists $def]} {
+	    page_warning "  $sym: Unreachable nonterminal symbol, deleting"
+	} else {
+	    lappend res $sym $def
+	}
+    }
+
+    # Clear computation results.
+
+    $t unset root page::analysis::peg::reachable
+    $t unset root page::analysis::peg::unreachable
+
+    $t set root definitions $res
+    updateUndefinedDueRemoval $t
+    return
+}
+
+proc ::page::analysis::peg::reachable::reset {t} {
+    # Remove marker, allow recalculation of reachability after
+    # changes.
+
+    $t unset root page::analysis::peg::reachable
+    $t unset root page::analysis::peg::unreachable
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::analysis::peg::reachable 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/analysis_peg_realizable.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/analysis_peg_realizable.tcl
new file mode 100644
index 00000000..ef32a68b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/analysis_peg_realizable.tcl
@@ -0,0 +1,257 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+
+# Perform realizability analysis (x) on the PE grammar delivered by
+# the frontend. The grammar is in normalized form (reduced to
+# essentials, graph like node-x-references, expression trees).
+#
+# (x) = See "doc_realizable.txt".
+
+# This package assumes to be used from within a PAGE plugin. It uses
+# the API commands listed below. These are identical across the major
+# types of PAGE plugins, allowing this package to be used in reader,
+# transform, and writer plugins. It cannot be used in a configuration
+# plugin, and this makes no sense either.
+#
+# To ensure that our assumption is ok we require the relevant pseudo
+# package setup by the PAGE plugin management code.
+#
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: page::plugin
+
+package require page::plugin     ; # S.a. pseudo-package.
+package require page::util::flow ; # Dataflow walking.
+package require page::util::peg  ; # General utilities.
+package require treeql
+
+namespace eval ::page::analysis::peg::realizable {
+    namespace import ::page::util::peg::*
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::analysis::peg::realizable::compute {t} {
+
+    # Ignore call if already done before
+
+    if {[$t keyexists root page::analysis::peg::realizable]} return
+
+    # We compute the set of realizable nonterminal symbols by doing the
+    # computation for all partial PE's in the grammar. We start at the
+    # leaves and then iteratively propagate the property as far as
+    # possible using the rules defining it, see the specification.
+
+    # --- --- --- --------- --------- ---------
+
+    # Initialize all nodes and the local arrays. Everything is not
+    # realizable, except for the terminal leafs of the tree. Their parents
+    # are scheduled to be visited as well.
+
+    array set realizable   {} ; # Place where realizable nodes are held
+    array set unrealizable {} ; # Place where unrealizable nodes are held
+    array set nc           {} ; # Per node, number of children.
+    array set uc           {} ; # Per node, number of realizable children.
+
+    set nodeset [$t leaves]
+
+    set q [treeql q -tree $t]
+    $q query tree withatt op * over n {lappend nodeset $n}
+    $q query tree withatt op ? over n {lappend nodeset $n}
+    q destroy
+
+    foreach n [$t nodes] {
+	set unrealizable($n) .
+	set nc($n)       [$t numchildren $n]
+	set uc($n)       0
+    }
+
+    # A node is visited if it _may_ have changed its status (to
+    # realizability).
+
+    page::util::flow $nodeset flow n {
+	# Realizable nodes cannot change, ignore them.
+
+	if {[info exists realizable($n)]} continue
+
+	# Determine new state of realizability, ignore a node if it is
+	# unchanged.
+
+	if {![Realizable $t $n nc uc realizable]} continue
+
+	# Reclassify changed node, it is now realizable.
+	unset unrealizable($n)
+	set   realizable($n) .
+
+	# Schedule visits to nodes which may have been affected by
+	# this change. Update the relevant counters as well.
+
+	# @ root       - none
+	# @ definition - users of the definition
+	# otherwise    - parent of operator.
+
+	if {$n eq "root"} continue
+
+	if {[$t keyexists $n symbol]} {
+	    set users [$t get $n users]
+	    $flow visitl $users
+	    foreach u $users {
+		incr uc($u)
+	    }
+	    continue
+	}
+
+	set p [$t parent $n]
+	incr uc($p)
+	$flow visit $p
+    }
+
+    # Set marker preventing future calls.
+    $t set root page::analysis::peg::realizable   [array names realizable]
+    $t set root page::analysis::peg::unrealizable [array names unrealizable]
+    return
+}
+
+proc ::page::analysis::peg::realizable::remove! {t} {
+    # Determine which parts of the grammar are realizable
+
+    compute $t
+
+    # Remove anything which is not realizable (and all their children),
+    # except for the root itself, should it be unrealizablel.
+
+    set unreal [$t get root page::analysis::peg::unrealizable]
+    foreach n [lsort $unreal] {
+	if {$n eq "root"} continue
+	if {[$t exists $n]} {
+	    $t delete $n
+	}
+    }
+
+    # Notify the user of the definitions which were among the removed
+    # nodes. Keep only the still-existing definitions.
+
+    set res {}
+    foreach {sym def} [$t get root definitions] {
+	if {![$t exists $def]} {
+	    page_warning "  $sym: Nonterminal symbol is not realizable, removed."
+	} else {
+	    lappend res $sym $def
+	}
+    }
+    $t set root definitions $res
+
+    if {![$t exists [$t get root start]]} {
+	page_warning "  <Start expression>: Is not realizable, removed."
+	$t set root start {}
+    }
+
+    # Find and cut operator chains, very restricted. Cut only chains
+    # of x- and /-operators. The other operators have only one child
+    # by definition and are thus not chains.
+
+    set q [treeql q -tree $t]
+    # q query tree over n
+    foreach n [$t children -all root] {
+	if {[$t keyexists $n symbol]}        continue
+	if {[llength [$t children $n]] != 1} continue
+	set op [$t get $n op]
+	if {($op ne "/") && ($op ne "x")} continue
+	$t cut $n
+    }
+
+    flatten $q $t
+    q destroy
+
+    # Clear computation results.
+
+    $t unset root page::analysis::peg::realizable
+    $t unset root page::analysis::peg::unrealizable
+
+    updateUndefinedDueRemoval $t
+    return
+}
+
+proc ::page::analysis::peg::realizable::reset {t} {
+    # Remove marker, allow recalculation of realizability after changes.
+
+    $t unset root page::analysis::peg::realizable
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal
+
+proc ::page::analysis::peg::realizable::First {v} {
+    upvar 1 $v visit
+
+    set id    [array startsearch visit]
+    set first [array nextelement visit $id]
+    array donesearch visit $id
+
+    unset visit($first)
+    return $first
+}
+
+proc ::page::analysis::peg::realizable::Realizable {t node ncv ucv uv} {
+    upvar 1 $ncv nc $ucv uc $uv realizable
+
+    if {$node eq "root"} {
+	# Root inherits realizability of the start expression.
+
+	return [info exists realizable([$t get root start])]
+    }
+
+    if {[$t keyexists $node symbol]} {
+	# Symbol definitions inherit the realizability of their
+	# expression.
+
+	return [expr {$uc($node) >= $nc($node)}]
+    }
+
+    switch -exact -- [$t get $node op] {
+	t - .. - epsilon - alpha - alnum - dot - * - ? {
+	    # The terminal symbols are all realizable.
+	    return 1
+	}
+	n {
+	    # Symbol invokation inherits realizability of its definition.
+	    # Calls to undefined symbols are not realizable.
+
+	    set def [$t get $node def]
+	    if {$def eq ""} {return 0}
+	    return [info exists realizable($def)]
+	}
+	/ - | {
+	    # Choice, ordered and unordered. Realizable if we have at
+	    # least one realizable branch. A quick test based on the count
+	    # of realizable children is used.
+
+	    return [expr {$uc($node) > 0}]
+	}
+	default {
+	    # Sequence, and all other operators, are realizable if and
+	    # only if all its children are realizable. A quick test based
+	    # on the count of realizable children is used.
+
+	    return [expr {$uc($node) >= $nc($node)}]
+	}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::analysis::peg::realizable 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/compiler_peg_mecpu.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/compiler_peg_mecpu.tcl
new file mode 100644
index 00000000..123c6da3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/compiler_peg_mecpu.tcl
@@ -0,0 +1,1642 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / Transformation - Compile grammar to ME cpu instructions.
+
+# This package assumes to be used from within a PAGE plugin. It uses
+# the API commands listed below. These are identical across the major
+# types of PAGE plugins, allowing this package to be used in reader,
+# transform, and writer plugins. It cannot be used in a configuration
+# plugin, and this makes no sense either.
+#
+# To ensure that our assumption is ok we require the relevant pseudo
+# package setup by the PAGE plugin management code.
+#
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Dumping the input grammar. But not as Tcl or other code. In PEG
+## format again, pretty printing.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: page::plugin
+
+package require page::plugin ; # S.a. pseudo-package.
+
+package require grammar::me::cpu::gasm
+package require textutil
+package require struct::graph
+
+package require page::analysis::peg::emodes
+package require page::util::quote
+package require page::util::peg
+
+namespace eval ::page::compiler::peg::mecpu {
+    # Get the peg char de/encoder commands.
+    # (unquote, quote'tcl)
+
+    namespace import ::page::util::quote::*
+    namespace import ::page::util::peg::*
+
+
+    namespace eval gas {
+	namespace import ::grammar::me::cpu::gas::begin
+	namespace import ::grammar::me::cpu::gas::done
+	namespace import ::grammar::me::cpu::gas::lift
+	namespace import ::grammar::me::cpu::gas::state
+	namespace import ::grammar::me::cpu::gas::state!
+    }
+    namespace import ::grammar::me::cpu::gas::*
+    rename begin  {}
+    rename done   {}
+    rename lift   {}
+    rename state  {}
+    rename state! {}
+}
+
+# ### ### ### ######### ######### #########
+## Data structures for the generated code.
+
+## All data is held in node attributes of the tree. Per node:
+##
+## asm - List of instructions implementing the node.
+
+
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::compiler::peg::mecpu {t} {
+    # Resolve the mode hints. Every gen(X) having a value of 'maybe'
+    # (or missing) is for the purposes of this code a 'yes'.
+
+    if {![page::analysis::peg::emodes::compute $t]} {
+	page_error "  Unable to generate a ME parser without accept/generate properties"
+	return
+    }
+
+    foreach n [$t nodes] {
+	if {![$t keyexists $n gen] || ([$t get $n gen] eq "maybe")} {
+	    $t set $n gen 1
+	}
+	if {![$t keyexists $n acc]} {$t set $n acc 1}
+    }
+
+    # Synthesize a program, then the assembly code.
+
+    mecpu::Synth $t
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Helpers
+
+proc ::page::compiler::peg::mecpu::Synth {t} {
+    # Phase 2: Bottom-up, synthesized attributes
+
+    # We use a global graph to capture instructions and their
+    # relations. The graph is then converted into a linear list of
+    # instructions, with proper labeling and jump instructions to
+    # handle all non-linear control-flow.
+
+    set g [struct::graph g]
+    $t set root gas::called {}
+
+    page_info "* Synthesize graph code"
+
+    $t walk root -order post -type dfs n {
+	SynthNode $n
+    }
+
+    status             $g  ;  gdump $g synth
+    remove_unconnected $g  ;  gdump $g nounconnected
+    remove_dead        $g  ;  gdump $g nodead
+    denop              $g  ;  gdump $g nonops
+    parcmerge          $g  ;  gdump $g parcmerge
+    forwmerge          $g  ;  gdump $g fmerge
+    backmerge          $g  ;  gdump $g bmerge
+    status             $g  
+    pathlengths        $g  ;  gdump $g pathlen
+    jumps              $g  ;  gdump $g jumps
+    status             $g
+    symbols            $g $t
+
+    set cc [2code $t $g]
+    #write asm/mecode [join $cc \n]
+
+    statistics $cc
+
+    $t set root asm $cc
+    $g destroy
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode {n} {
+    upvar 1 t t g g
+    if {$n eq "root"} {
+	set code Root
+    } elseif {[$t keyexists $n symbol]} {
+	set code Nonterminal
+    } elseif {[$t keyexists $n op]} {
+	set code [$t get $n op]
+    } else {
+	return -code error "PANIC. Bad node $n, cannot classify"
+    }
+
+    page_log_info "  [np $n] := ([linsert [$t children $n] 0 $code])"
+
+    SynthNode/$code $n
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/Root {n} {
+    upvar 1 t t g g
+
+    # Root is the grammar itself.
+
+    set gstart [$t get root start]
+    set gname  [$t get root name]
+
+    if {$gstart eq ""} {
+	page_error "  No start expression."
+	return
+    }
+
+    gas::begin $g $n halt "<Start Expression> '$gname'"
+    $g node set [Who entry] instruction .C
+    $g node set [Who entry] START .
+
+    Inline $t $gstart sexpr
+    /At sexpr/exit/ok   ; /Ok   ; Jmp exit/return
+    /At sexpr/exit/fail ; /Fail ; Jmp exit/return
+
+    gas::done --> $t
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/Nonterminal {n} {
+    upvar 1 t t g g
+
+    # This is the root of a definition.
+    #
+    # The text is a procedure wrapping the match code of its
+    # expression into the required the nonterminal handling (caching
+    # and such), plus the support code for the expression matcher.
+
+    set sym      [$t get $n symbol]
+    set label    [$t get $n label]
+    set gen      [$t get $n gen]
+    set mode     [$t get $n mode]
+
+    set pe       [lindex [$t children $n] 0]
+    set egen     [$t get $pe gen]
+
+    # -> inc_restore -found-> NOP  gen:  -> ok -> ias_push -> RETURN
+    #               /!found             \                  /
+    #              /                     \-fail --------->/
+    #             /               !gen: -> RETURN
+    #            /
+    #            \-> icl_push (-> ias_mark) -> (*) -> SV -> inc_save (-> ias_mrewind) -X
+    #
+    # X -ok----> ias_push -> ier_nonterminal
+    #  \                  /
+    #   \-fail ----------/
+
+    # Poking into the generated instructions, converting the initial
+    # .NOP into a .C'omment.
+
+    set first [gas::begin $g $n !okfail "Nonterminal '$sym'"]
+    $g node set [Who entry] instruction .C
+    $g node set [Who entry] START .
+
+    Cmd inc_restore $label ; /Label restore ; /Ok
+
+    if {$gen} {
+	Bra ; /Label @
+	/Fail ; Nop          ; Exit
+	/At @
+	/Ok   ; Cmd ias_push ; Exit
+    } else {
+	Nop ; Exit
+    }
+
+    /At restore ; /Fail
+    Cmd icl_push ; # Balanced by inc_save (XX)
+    Cmd icl_push ; # Balanced by pop after ier_terminal
+
+    if {$egen} {
+	# [*] Needed for removal of SV's from stack after handling by
+	# this symbol, only if expression actually generates an SV.
+
+	Cmd ias_mark
+    }
+
+    Inline $t $pe subexpr ; /Ok   ; Nop ; /Label unified
+    /At subexpr/exit/fail ; /Fail ; Jmp unified
+    /At unified
+
+    switch -exact -- $mode {
+	value   {Cmd isv_nonterminal_reduce $label}
+	match   {Cmd isv_nonterminal_range  $label}
+	leaf    {Cmd isv_nonterminal_leaf   $label}
+	discard {Cmd isv_clear}
+	default {return -code error "Bad nonterminal mode \"$mode\""}
+    }
+
+    Cmd inc_save $label ; # Implied icl_pop (XX)
+
+    if {$egen} {
+	# See [*], this is the removal spoken about before.
+	Cmd ias_mrewind
+    }
+
+    /Label hold
+
+    if {$gen} {
+	/Ok
+	Cmd ias_push
+	Nop           ; /Label merge
+	/At hold ; /Fail ; Jmp merge
+	/At merge
+    }
+
+    Cmd ier_nonterminal "Expected $label"
+    Cmd icl_pop
+    Exit
+
+    gas::done --> $t
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/? {n} {
+    upvar 1 t t g g
+
+    # The expression e? is equivalent to e/epsilon.
+    # And like this it is compiled.
+
+    set pe       [lindex [$t children $n] 0]
+
+    gas::begin $g $n okfail ?
+
+    # -> icl_push -> ier_push -> (*) -ok--> ier_merge/ok --> icl_pop -ok----------------> OK
+    #                             \                                                    /
+    #                              \-fail-> ier_merge/f ---> icl_rewind -> iok_ok -ok-/
+
+    Cmd icl_push
+    Cmd ier_push
+
+    Inline $t $pe subexpr
+
+    /Ok
+    Cmd ier_merge
+    Cmd icl_pop
+    /Ok ; Exit
+
+    /At subexpr/exit/fail ; /Fail
+    Cmd ier_merge
+    Cmd icl_rewind
+    Cmd iok_ok
+    /Ok ; Exit
+
+    gas::done --> $t
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/* {n} {
+    upvar 1 t t g g
+
+    # Kleene star is like a repeated ?
+
+    # Note: Compilation as while loop, as done now
+    # means that the parser has no information about
+    # the intermediate structure of the input in his
+    # cache.
+
+    # Future: Create a helper symbol X and compile
+    # the expression e = e'* as:
+    #     e = X; X <- (e' X)?
+    # with match data for X put into the cache. This
+    # is not exactly equivalent, the structure of the
+    # AST is different (right-nested tree instead of
+    # a list). This however can be handled with a
+    # special nonterminal mode to expand the current
+    # SV on the stack.
+
+    # Note 2: This is a transformation which can be
+    # done on the grammar itself, before the actual
+    # backend is let loose. This "strength reduction"
+    # allows us to keep this code here.
+
+    set pe       [lindex [$t children $n] 0]
+    set egen     [$t get $pe gen]
+
+    # Build instruction graph.
+
+    #  /<---------------------------------------------------------------\
+    #  \_                                                                \_
+    # ---> icl_push -> ier_push -> (*) -ok--> ier_merge/ok --> icl_pop ->/
+    #                               \
+    #                                \-fail-> ier_merge/f ---> icl_rewind -> iok_ok -> OK
+
+    gas::begin $g $n okfail *
+
+    Cmd icl_push ; /Label header
+    Cmd ier_push
+
+    Inline $t $pe loop
+
+    /Ok
+    Cmd ier_merge
+    Cmd icl_pop
+    Jmp header ; /CloseLoop
+
+    /At loop/exit/fail ; /Fail
+    Cmd ier_merge
+    Cmd icl_rewind
+    Cmd iok_ok
+    /Ok ; Exit
+
+    gas::done --> $t
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/+ {n} {
+    upvar 1 t t g g
+
+    # Positive Kleene star x+ is equivalent to x x*
+    # This is how it is compiled. See also the notes
+    # at the * above, they apply in essence here as
+    # well, except that the transformat scheme is
+    # slighty different:
+    #
+    # e = e'*  ==> e = X; X <- e' X?
+
+    set pe [lindex [$t children $n] 0]
+
+    # Build instruction graph.
+
+    # icl_push -> ier_push -> (*) -fail-> ier_merge/fl -> icl_rewind -> FAIL
+    #                          \
+    #                           \--ok---> ier_merge/ok -> icl_pop ->\_
+    #                                                               /
+    #    /<--------------------------------------------------------/
+    #   /
+    #  /<---------------------------------------------------------------\
+    #  \_                                                                \_
+    #   -> icl_push -> ier_push -> (*) -ok--> ier_merge/ok --> icl_pop ->/
+    #                               \
+    #                                \-fail-> ier_merge/f ---> icl_rewind -> iok_ok -> OK
+
+    gas::begin $g $n okfail +
+
+    Cmd icl_push
+    Cmd ier_push
+
+    Inline $t $pe first
+    /At first/exit/fail ; /Fail
+    Cmd ier_merge
+    Cmd icl_rewind
+    /Fail ; Exit
+
+    /At first/exit/ok ; /Ok
+    Cmd ier_merge
+    Cmd icl_pop
+
+    # Loop copied from Kleene *, it is *
+
+    Cmd icl_push ; /Label header
+    Cmd ier_push
+
+    # For the loop we create the sub-expression instruction graph a
+    # second time. This is done by walking the subtree a second time
+    # and constructing a completely new node set. The result is
+    # imported under a new name.
+
+    set save [gas::state]
+    $t walk $pe -order post -type dfs n {SynthNode $n}
+    gas::state! $save
+    Inline $t $pe loop
+
+    /Ok
+    Cmd ier_merge
+    Cmd icl_pop
+    Jmp header ; /CloseLoop
+
+    /At loop/exit/fail ; /Fail
+    Cmd ier_merge
+    Cmd icl_rewind
+    Cmd iok_ok
+    /Ok ; Exit
+
+    gas::done --> $t
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode// {n} {
+    upvar 1 t t g g
+
+    set args [$t children $n]
+
+    if {![llength $args]} {
+	error "PANIC. Empty choice."
+
+    } elseif {[llength $args] == 1} {
+	# A choice over one branch is no real choice. The code
+	# generated for the child applies here as well.
+
+	gas::lift $t $n <-- [lindex $args 0]
+	return
+    }
+
+    # Choice over at least two branches.
+    # Build instruction graph.
+
+    # -> BRA
+    #
+    # BRA -> icl_push (-> ias_mark) -> ier_push -> (*) -ok -> ier_merge -> BRA'OK
+    #                                              \-fail -> ier_merge (-> ias_mrewind) -> icl_rewind -> BRA'FAIL
+    #
+    # BRA'FAIL -> BRA
+    # BRA'FAIL -> FAIL (last branch)
+    #
+    # BRA'OK -> icl_pop -> OK
+
+    gas::begin $g $n okfail /
+
+    /Clear
+    Cmd icl_pop ; /Label BRA'OK ; /Ok ; Exit
+    /At entry
+
+    foreach pe $args {
+	set egen [$t get $pe gen]
+
+	# Note: We do not check for static match results. Doing so is
+	# an optimization we can do earlier, directly on the tree.
+
+	Cmd icl_push
+	if {$egen} {Cmd ias_mark}
+
+	Cmd ier_push
+	Inline $t $pe subexpr
+
+	/Ok
+	Cmd ier_merge
+	Jmp BRA'OK
+
+	/At subexpr/exit/fail ; /Fail
+	Cmd ier_merge
+	if {$egen} {Cmd ias_mrewind}
+	Cmd icl_rewind
+
+	# Branch failed. Go to the next branch. Fail completely at
+	# last branch.
+    }
+
+    /Fail ; Exit
+
+    gas::done --> $t
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/x {n} {
+    upvar 1 t t g g
+
+    set args [$t children $n]
+
+    if {![llength $args]} {
+	error "PANIC. Empty sequence."
+
+    } elseif {[llength $args] == 1} {
+	# A sequence of one element is no real sequence. The code
+	# generated for the child applies here as well.
+
+	gas::lift $t $n <-- [lindex $args 0]
+	return
+    }
+
+    # Sequence of at least two elements.
+    # Build instruction graph.
+
+    # -> icl_push -> SEG
+    #
+    # SEG (-> ias_mark) -> ier_push -> (*) -ok -> ier_merge -> SEG'OK
+    #                                  \-fail -> ier_merge -> SEG'FAIL
+    #
+    # SEG'OK -> SEG
+    # SEG'OK -> icl_pop -> OK (last segment)
+    #
+    # SEG'FAIL (-> ias_mrewind) -> icl_rewind -> FAIL
+
+    gas::begin $g $n okfail x
+
+    /Clear
+    Cmd icl_rewind ; /Label SEG'FAIL ; /Fail ; Exit
+
+    /At entry
+    Cmd icl_push
+
+    set gen 0
+    foreach pe $args {
+	set egen [$t get $pe gen]
+	if {$egen && !$gen} {
+	    set gen 1
+
+	    # From here on out is the sequence able to generate
+	    # semantic values which have to be canceled when
+	    # backtracking.
+
+	    Cmd ias_mark ; /Label @mark
+
+	    /Clear
+	    Cmd ias_mrewind ; Jmp SEG'FAIL ; /Label SEG'FAIL
+
+	    /At @mark
+	}
+
+	Cmd ier_push
+	Inline $t $pe subexpr
+
+	/At subexpr/exit/fail ; /Fail
+	Cmd ier_merge
+	Jmp SEG'FAIL
+
+	/At subexpr/exit/ok ; /Ok
+	Cmd ier_merge 
+    }
+
+    Cmd icl_pop
+    /Ok ; Exit
+
+    gas::done --> $t
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/& {n} {
+    upvar 1 t t g g
+    SynthLookahead $n no
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/! {n} {
+    upvar 1 t t g g
+    SynthLookahead $n yes
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/dot {n} {
+    upvar 1 t t g g
+    SynthTerminal $n {} "any character"
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/epsilon {n} {
+    upvar 1 t t g g
+
+    gas::begin $g $n okfail epsilon
+
+    Cmd iok_ok ; /Ok ; Exit
+
+    gas::done --> $t
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/alnum {n} {
+    upvar 1 t t g g
+    SynthClass $n alnum
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/alpha {n} {
+    upvar 1 t t g g
+    SynthClass $n alpha
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/digit {n} {
+    upvar 1 t t g g
+    SynthClass $n digit
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/xdigit {n} {
+    upvar 1 t t g g
+    SynthClass $n xdigit
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/punct {n} {
+    upvar 1 t t g g
+    SynthClass $n punct
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/space {n} {
+    upvar 1 t t g g
+    SynthClass $n space
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/.. {n} {
+    upvar 1 t t g g
+    # Range is [x-y]
+
+    set b [$t get $n begin]
+    set e [$t get $n end]
+
+    set tb [quote'tcl $b]
+    set te [quote'tcl $e]
+
+    set pb [quote'tclstr $b]
+    set pe [quote'tclstr $e]
+
+    SynthTerminal $n [list ict_match_tokrange $tb $te] "\\\[${pb}..${pe}\\\]"
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/t {n} {
+    upvar 1 t t g g
+
+    # Terminal node. Primitive matching.
+    # Code is parameterized by gen(X) of this node X.
+
+    set ch  [$t get $n char]
+    set tch [quote'tcl    $ch]
+    set pch [quote'tclstr $ch]
+
+    SynthTerminal $n [list ict_match_token $tch] $pch
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthNode/n {n} {
+    upvar 1 t t g g
+
+    # Nonterminal node. Primitive matching.
+    # The code is parameterized by acc(X) of this node X, and gen(D)
+    # of the invoked nonterminal D.
+
+    set sym   [$t get $n sym]
+    set def   [$t get $n def]
+
+    gas::begin $g $n okfail call'$sym'
+
+    if {$def eq ""} {
+	# Invokation of an undefined nonterminal. This will always fail.
+
+	Note "Match for undefined symbol '$sym'"
+	Cmdd iok_fail ; /Fail ; Exit
+	gas::done --> $t
+
+    } else {
+	# Combinations
+	# Acc Gen Action
+	# --- --- ------
+	#   0   0 Plain match
+	#   0   1 Match with canceling of the semantic value.
+	#   1   0 Plain match
+	#   1   1 Plain match
+	# --- --- ------
+
+	if {[$t get $n acc] || ![$t get $def gen]} {
+	    Cmd icf_ntcall sym_$sym ; /Label CALL
+	    /Ok   ; Exit
+	    /Fail ; Exit
+
+	} else {
+	    Cmd ias_mark
+	    Cmd icf_ntcall sym_$sym ; /Label CALL
+	    Cmd ias_mrewind
+	    /Ok   ; Exit
+	    /Fail ; Exit
+	}
+
+	set caller [Who CALL]
+	gas::done --> $t
+
+	$t lappend $def gas::callers $caller
+	$t lappend root gas::called  $def
+    }
+
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthLookahead {n negated} {
+    upvar 1 g g t t
+
+    # Note: Per the rules about expression modes (! is a lookahead
+    # ____| operator) this node has a mode of 'discard', and its child
+    # ____| has so as well.
+
+    # assert t get n  mode == discard
+    # assert t get pe mode == discard
+
+    set op       [$t get $n op]
+    set pe       [lindex [$t children $n] 0]
+    set eop      [$t get $pe op]
+
+    # -> icl_push -> (*) -ok--> icl_rewind -> OK
+    #                 \--fail-> icl_rewind -> FAIL
+
+    # -> icl_push -> (*) -ok--> icl_rewind -> iok_negate -> FAIL
+    #                 \--fail-> icl_rewind -> iok_negate -> OK
+
+    gas::begin $g $n okfail [expr {$negated ? "!" : "&"}]
+
+    Cmd icl_push
+    Inline $t $pe subexpr
+
+    /Ok
+    Cmd icl_rewind
+    if {$negated} { Cmd iok_negate ; /Fail } else /Ok ; Exit
+
+    /At subexpr/exit/fail ; /Fail
+    Cmd icl_rewind
+    if {$negated} { Cmd iok_negate ; /Ok } else /Fail ; Exit
+
+    gas::done --> $t
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthClass {n op} {
+    upvar 1 t t g g
+    SynthTerminal $n [list ict_match_tokclass $op] <$op>
+    return
+}
+
+proc ::page::compiler::peg::mecpu::SynthTerminal {n cmd msg} {
+    upvar 1 t t g g
+
+    # 4 cases (+/- cmd, +/- sv).
+    #
+    # (A) +cmd+sv
+    #     entry -> advance -ok-> match -ok-> sv -> OK
+    #              \             \
+    #               \             \-fail----------> FAIL
+    #                \-fail----------------------/
+    #
+    # (B) -cmd+sv
+    #     entry -> advance -ok-> sv -> OK
+    #              \
+    #               \-fail-----------> FAIL
+    #
+    # (C) +cmd-sv
+    #     entry -> advance -ok-> match -ok-> OK
+    #              \             \
+    #               \             \-fail---> FAIL
+    #                \-fail---------------/
+    #
+    # (D) -cmd-sv
+    #     entry -> advance -ok-> OK
+    #              \
+    #               \-fail-----> FAIL
+
+    gas::begin $g $n okfail M'[lindex $cmd 0]
+
+    Cmd ict_advance "Expected $msg (got EOF)"
+    /Fail ; Exit
+    /Ok
+
+    if {[llength $cmd]} {
+	lappend cmd "Expected $msg"
+	eval [linsert $cmd 0 Cmd]
+	/Fail ; Exit
+	/Ok
+    }
+
+    if {[$t get $n gen]} {
+	Cmd isv_terminal
+	/Ok
+    }
+
+    Exit
+
+    gas::done --> $t
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Extending the graph of instructions (expression
+## framework, new instructions, (un)conditional sequencing).
+
+# ### ### ### ######### ######### #########
+## Internal. Working on the graph of instructions.
+
+proc ::page::compiler::peg::mecpu::2code {t g} {
+    page_info "* Generating ME assembler code"
+
+    set insn  {}
+    set start [$t get root gas::entry]
+    set cat 0
+    set calls [list $start]
+
+    while {$cat < [llength $calls]} {
+	set  now [lindex $calls $cat]
+	incr cat
+
+	set at 0
+	set pending [list $now]
+
+	while {$at < [llength $pending]} {
+	    set  current [lindex $pending $at]
+	    incr at
+
+	    while {$current ne ""} {
+		if {[$g node keyexists $current WRITTEN]} break
+
+		insn $g $current insn
+		$g node set $current WRITTEN .
+
+		if {[$g node keyexists $current SAVE]} {
+		    lappend pending [$g node get $current SAVE]
+		}
+		if {[$g node keyexists $current CALL]} {
+		    lappend calls [$g node get $current CALL]
+		}
+
+		set  current [$g node get $current NEXT]
+		if {$current eq ""} break
+		if {[$g node keyexists $current WRITTEN]} {
+		    lappend insn [list {} icf_jalways \
+			    [$g node get $current LABEL]]
+		    break
+		}
+
+		# Process the following instruction,
+		# if there is any.
+	    }
+	}
+    }
+
+    return $insn
+}
+
+proc ::page::compiler::peg::mecpu::insn {g current iv} {
+    upvar 1 $iv insn
+
+    set code [$g node get $current instruction]
+    set args [$g node get $current arguments]
+
+    set label {}
+    if {[$g node keyexists $current LABEL]} {
+	set label [$g node get $current LABEL]
+    }
+
+    lappend insn [linsert $args 0 $label $code]
+    return
+}
+
+if 0 {
+    if {[lindex $ins 0] eq "icf_ntcall"} {
+	set tmp {}
+	foreach b $branches {
+	    if {[$g node keyexists $b START]} {
+		set sym [$g node get $b symbol]
+		lappend ins     sym_$sym
+	    } else {
+		lappend tmp $b
+	    }
+	}
+	set branches $tmp
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Optimizations.
+#
+## I. Remove all nodes which are not connected to anything.
+##    There should be none.
+
+proc ::page::compiler::peg::mecpu::remove_unconnected {g} {
+    page_info "* Remove unconnected instructions"
+
+    foreach n [$g nodes] {
+	if {[$g node degree $n] == 0} {
+	    page_error "$n ([printinsn $g $n])"
+	    page_error "Found unconnected node. This should not have happened."
+	    page_error "Removing the bad node."
+
+	    $g node delete $n
+	}
+    }
+}
+
+proc ::page::compiler::peg::mecpu::remove_dead {g} {
+    page_info "* Remove dead instructions"
+
+    set count 0
+    set runs 0
+    set hasdead 1
+    while {$hasdead} {
+	set hasdead 0
+	foreach n [$g nodes] {
+	    if {[$g node keyexists $n START]} continue
+	    if {[$g node degree -in $n] > 0}  continue
+
+	    page_log_info "    [np $n] removed, dead ([printinsn $g $n])"
+
+	    $g node delete $n
+
+	    set hasdead 1
+	    incr count
+	}
+	incr runs
+    }
+
+    page_info "  Removed [plural $count instruction] in [plural $runs run]"
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Optimizations.
+#
+## II. We have lots of .NOP instructions in the control flow, as part
+##     of the framework. They made the handling of expressions easier,
+##     providing clear and fixed anchor nodes to connect to from
+##     inside and outside, but are rather like the epsilon-transitions
+##     in a (D,N)FA. Now is the time to get rid of them.
+#
+##     We keep the .C'omments, and explicit .BRA'nches.
+##     We should not have any .NOP which is a dead-end (without
+##     successor), nor should we find .NOPs with more than one
+##     successor. The latter should have been .BRA'nches. Both
+##     situations are reported on. Dead-ends we
+##     remove. Multi-destination NOPs we keep.
+#
+##     Without the nops in place to confus the flow we can perform a
+##     series peep-hole optimizations to merge/split branches.
+
+proc ::page::compiler::peg::mecpu::denop {g} {
+    # Remove the .NOPs and reroute control flow. We keep the pseudo
+    # instructions for comments (.C) and the explicit branch points
+    # (.BRA).
+
+    page_info "* Removing the helper .NOP instructions."
+
+    set count 0
+    foreach n [$g nodes] {
+	# Skip over nodes already deleted by a previous iteration.
+	if {[$g node get $n instruction] ne ".NOP"} continue
+
+	# We keep branching .NOPs, and warn user. There shouldn't be
+	# any. such should explicit bnrachpoints.
+
+	set destinations [$g arcs -out $n]
+
+	if {[llength $destinations] > 1} {
+	    page_error "$n ([printinsn $g $n])"
+	    page_error "Found a .NOP with more than one destination."
+	    page_error "This should have been a .BRA instruction."
+	    page_error "Not removed. Internal error. Fix the transformation."
+	    continue
+	}
+
+	# Nops without a destination, dead-end's are not wanted. They
+	# should not exist either too. We will do a general dead-end
+	# and dead-start removal as well.
+
+	if {[llength $destinations] < 1} {
+	    page_error "$n ([printinsn $g $n])"
+	    page_error "Found a .NOP without any destination, i.e. a dead end."
+	    page_error "This should not have happened. Removed the node."
+
+	    $g node delete $n
+	    continue
+	}
+
+	page_log_info "    [np $n] removed, updated cflow ([printinsn $g $n])"
+
+	# As there is exactly one destination we can now reroute all
+	# incoming arcs around the nop to the new destination.
+
+	set target [$g arc target [lindex $destinations 0]]
+	foreach a [$g arcs -in $n] {
+	    $g arc move-target $a $target
+	}
+
+	$g node delete $n
+	incr count
+    }
+
+    page_info "  Removed [plural $count instruction]"
+    return
+}
+
+
+# ### ### ### ######### ######### #########
+## Optimizations.
+#
+
+# Merge parallel arcs (remove one, make the other unconditional).
+
+proc ::page::compiler::peg::mecpu::parcmerge {g} {
+    page_info "* Search for identical parallel arcs and merge them"
+
+    #puts [join  [info loaded] \n] /seg.fault induced with tcllibc! - tree!
+
+    set count 0
+    foreach n [$g nodes] {
+	set arcs [$g arcs -out $n]
+
+	if {[llength $arcs] < 2} continue
+	if {[llength $arcs] > 2} {
+	    page_error "  $n ([printinsn $g $n])"
+	    page_error "  Instruction has more than two destinations."
+	    page_error "  That is not possible. Internal error."
+	    continue
+	}
+	# Two way branch. Both targets the same ?
+
+	foreach {a b} $arcs break
+
+	if {[$g arc target $a] ne [$g arc target $b]} continue
+
+	page_log_info "    [np $n] outbound arcs merged ([printinsn $g $n])"
+
+	$g arc set $a condition always
+	$g arc delete $b
+
+	incr count 2
+    }
+
+    page_info "  Merged [plural $count arc]"
+    return
+}
+
+# Use knowledge of the match status before and after an instruction to
+# label the arcs a bit better (This may guide the forward and backward
+# merging.).
+
+# Forward merging of instructions.
+# An ok/fail decision is done as late as possible.
+#
+#  /- ok ---> Y -> U               /- ok ---> U
+# X                    ==>   X -> Y
+#  \- fail -> Y -> V               \- fail -> V
+
+# The Y must not have additional inputs. This more complex case we
+# will look at later.
+
+proc ::page::compiler::peg::mecpu::forwmerge {g} {
+    page_info "* Forward merging of identical instructions"
+    page_info "  Delaying decisions"
+    set count 0
+    set runs 0
+
+    set merged 1
+    while {$merged} {
+	set merged 0
+	foreach n [$g nodes] {
+	    # Skip nodes already killed in previous rounds.
+	    if {![$g node exists $n]} continue
+
+	    set outbound [$g arcs -out $n]
+	    if {[llength $outbound] != 2} continue
+
+	    foreach {aa ab} $outbound break
+	    set na [$g arc target $aa]
+	    set nb [$g arc target $ab]
+
+	    set ia [$g node get $na instruction][$g node get $na arguments]
+	    set ib [$g node get $nb instruction][$g node get $nb arguments]
+	    if {$ia ne $ib} continue
+
+	    # Additional condition: Inbounds in the targets not > 1
+
+	    if {([$g node degree -in $na] > 1) ||
+		([$g node degree -in $nb] > 1)} continue
+
+	    page_log_info "    /Merge [np $n] : [np $na] <- [np $nb] ([printinsn $g $na])"
+
+	    # Label all arcs out of na with the condition of the arc
+	    # into it.  Ditto for the arcs out of nb. The latter also
+	    # get na as their new origin. The arcs out of n relabeled
+	    # to always. The nb is deleted. This creates the desired
+	    # control structure without having to create a new node
+	    # and filling it. We simply use na, discard nb, and
+	    # properly rewrite the arcs to have the correct
+	    # conditions.
+
+	    foreach a [$g arcs -out $na] {
+		$g arc set $a condition [$g arc get $aa condition]
+	    }
+	    foreach a [$g arcs -out $nb] {
+		$g arc set $a condition [$g arc get $ab condition]
+		$g arc move-source $a $na
+	    }
+	    $g arc set     $aa condition always
+	    $g node delete $nb
+	    set merged 1
+	    incr count
+	}
+	incr runs
+    }
+
+    # NOTE: This may require a parallel arc merge, with identification
+    #       of merge-able arcs based on the arc condition, i.e. labeling.
+
+    page_info "  Merged [plural $count instruction] in [plural $runs run]"
+    return
+}
+
+# Backward merging of instructions.
+# Common backends are put together.
+#
+# U -> Y ->\             U ->\
+#           -> X   ==>        -> Y -> X
+# V -> Y ->/             V ->/
+
+# Note. It is possible for an instruction to be amenable to both for-
+# and backward merging. No heuristics are known to decide which is
+# better.
+
+proc ::page::compiler::peg::mecpu::backmerge {g} {
+    page_info "* Backward merging of identical instructions"
+    page_info "  Unifying paths"
+    set count 0
+    set runs 0
+
+    set merged 1
+    while {$merged} {
+	set merged 0
+	foreach n [$g nodes] {
+	    # Skip nodes already killed in previous rounds.
+	    if {![$g node exists $n]} continue
+
+	    set inbound [$g arcs -in $n]
+	    if {[llength $inbound] < 2} continue
+
+	    # We have more than 1 inbound arcs on this node. Check all
+	    # pairs of pre-decessors for possible unification.
+
+	    # Additional condition: Outbounds in the targets not > 1
+	    # We check in different levels, to avoid redundant calls.
+
+	    while {[llength $inbound] > 2} {
+		set aa   [lindex $inbound 0]
+		set tail [lrange $inbound 1 end]
+
+		set na [$g arc source $aa]
+		if {[$g node degree -out $na] > 1} {
+		    set inbound $tail
+		    continue
+		}
+
+		set inbound {}
+		foreach ab $tail {
+		    set nb [$g arc source $ab]
+		    if {[$g node degree -out $nb] > 1} continue
+
+		    set ia [$g node get $na instruction][$g node get $na arguments]
+		    set ib [$g node get $nb instruction][$g node get $nb arguments]
+
+		    if {$ia ne $ib} {
+			lappend inbound $ab
+			continue
+		    }
+
+		    page_log_info "    \\Merge [np $n] : [np $na] <- [np $nb] ([printinsn $g $na])"
+
+		    # Discard the second node in the pair. Move all
+		    # arcs inbound into it so that they reach the
+		    # first node instead.
+
+		    foreach a [$g arcs -in $nb] {$g arc move-target $a $na}
+		    $g node delete $nb
+		    set merged 1
+		    incr count
+		}
+	    }
+	}
+	incr runs
+    }
+
+    page_info "  Merged [plural $count instruction] in [plural $runs run]"
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::page::compiler::peg::mecpu::pathlengths {g} {
+    page_info "* Find maximum length paths"
+
+    set pending [llength [$g nodes]]
+
+    set nodes {}
+    set loops {}
+    foreach n [$g nodes] {
+	$g node set $n WAIT [$g node degree -out $n]
+	set insn [$g node get $n instruction]
+	if {($insn eq "icf_halt") || ($insn eq "icf_ntreturn")} {
+	    lappend nodes $n
+	}
+	if {[$g node keyexists $n LOOP]} {
+	    lappend loops $n
+	}
+    }
+
+    set level 0
+    while {[llength $nodes]} {
+	incr pending -[llength $nodes]
+	set nodes [closure $g $nodes $level]
+	incr level
+    }
+
+    if {[llength $loops]} {
+	page_info "  Loop levels"
+
+	set nodes $loops
+	while {[llength $nodes]} {
+	    incr pending -[llength $nodes]
+	    set nodes [closure $g $nodes $level]
+	    incr level
+	}
+    }
+
+    if {$pending} {
+	page_info  "  Remainder"
+
+	while {$pending} {
+	    set nodes {}
+	    foreach n [$g nodes] {
+		if {[$g node keyexists $n LEVEL]} continue
+		if {[$g node get $n WAIT] < [$g node degree -out $n]} {
+		    lappend nodes $n
+		}
+	    }
+	    while {[llength $nodes]} {
+		incr pending -[llength $nodes]
+		set nodes [closure $g $nodes $level]
+		incr level
+	    }
+	}
+    }
+    return
+}
+
+proc ::page::compiler::peg::mecpu::closure {g nodes level} {
+    page_log_info "  \[[format %6d $level]\] : $nodes"
+
+    foreach n $nodes {$g node set $n LEVEL $level}
+
+    set tmp {}
+    foreach n $nodes {
+	foreach pre [$g nodes -in $n] {
+	    # Ignore instructions already given a level.
+	    if {[$g node keyexists $pre LEVEL]} continue
+	    $g node set $pre WAIT [expr {[$g node get $pre WAIT] - 1}]
+	    if {[$g node get $pre WAIT] > 0} continue
+	    lappend tmp $pre
+	}
+    }
+    return [lsort -uniq -dict $tmp]
+}
+
+proc ::page::compiler::peg::mecpu::jumps {g} {
+    page_info "* Insert explicit jumps and branches"
+
+    foreach n [$g nodes] {
+	# Inbound > 1, at least one is from a jump, so a label is
+	# needed.
+
+	if {[llength [$g arcs -in $n]] > 1} {
+	    set go bra[string range $n 4 end]
+	    $g node set $n LABEL $go
+	}
+
+	set darcs [$g arcs -out $n]
+
+	if {[llength $darcs] == 0} {
+	    $g node set $n NEXT ""
+	    continue
+	}
+
+	if {[llength $darcs] == 1} {
+	    set da [lindex $darcs 0]
+	    set dn [$g arc target $da]
+
+	    if {[$g node get $dn LEVEL] > [$g node get $n LEVEL]} {
+		# Flow is backward, an uncond. jump
+		# is needed here.
+
+		set go bra[string range $dn 4 end]
+		$g node set $dn LABEL $go
+		set j [$g node insert]
+		$g arc move-target $da $j
+		$g node set $j instruction icf_jalways
+		$g node set $j arguments   $go
+
+		$g arc insert $j $dn
+
+		$g node set $n NEXT $j
+		$g node set $j NEXT ""
+	    } else {
+		$g node set $n NEXT $dn
+	    }
+	    continue
+	}
+
+	set aok {}
+	set afl {}
+	foreach a $darcs {
+	    if {[$g arc get $a condition] eq "ok"} {
+		set aok $a
+	    } else {
+		set afl $a
+	    }
+	}
+	set nok [$g arc target $aok]
+	set nfl [$g arc target $afl]
+
+	if {[$g node get $n instruction] eq "inc_restore"} {
+	    set go bra[string range $nok 4 end]
+	    $g node set $nok LABEL $go
+
+	    $g node set $n NEXT $nfl
+	    $g node set $n SAVE $nok
+
+	    $g node set $n arguments [linsert [$g node get $n arguments] 0 $go]
+	    continue
+	}
+
+	if {[$g node get $n instruction] ne ".BRA"} {
+	    set bra [$g node insert]
+	    $g arc move-source $aok $bra
+	    $g arc move-source $afl $bra
+	    $g arc insert $n $bra
+	    $g node set $n NEXT $bra
+	    set n $bra
+	}
+
+	if {[$g node get $nok LEVEL] > [$g node get $nfl LEVEL]} {
+	    # Ok branch is direct, Fail is jump.
+
+	    $g node set $n NEXT $nok
+	    $g node set $n SAVE $nfl
+
+	    set go bra[string range $nfl 4 end]
+	    $g node set $nfl LABEL $go
+	    $g node set $n instruction icf_jfail
+	    $g node set $n arguments   $go
+	} else {
+
+	    # Fail branch is direct, Ok is jump.
+
+	    $g node set $n NEXT $nfl
+	    $g node set $n SAVE $nok
+
+	    set go bra[string range $nok 4 end]
+	    $g node set $nok LABEL $go
+	    $g node set $n instruction icf_jok
+	    $g node set $n arguments   $go
+	}
+    }
+}
+
+proc ::page::compiler::peg::mecpu::symbols {g t} {
+    page_info "* Label subroutine heads"
+
+    # Label and mark the instructions where subroutines begin.
+    # These markers are used by 2code to locate all actually
+    # used subroutines.
+
+    foreach def [lsort -uniq [$t get root gas::called]] {
+	set gdef [$t get $def gas::entry]
+	foreach caller [$t get $def gas::callers] {
+
+	    # Skip callers which are gone because of optimizations.
+	    if {![$g node exists $caller]} continue
+
+	    $g node set $caller CALL $gdef
+	    $g node set $gdef LABEL \
+		    [lindex [$g node set $caller arguments] 0]
+	}
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::page::compiler::peg::mecpu::statistics {code} {
+    return
+    # disabled
+    page_info "* Statistics"
+    statistics_si $code
+
+    # All higher order statistics are done only on the instructions in
+    # a basic block, i.e. a linear sequence. We are looking for
+    # high-probability blocks in itself, and then also for
+    # high-probability partials.
+
+    set blocks [basicblocks $code]
+
+    # Basic basic block statistics (full blocks)
+
+    Init bl
+    foreach b $blocks {Incr bl($b)}
+    wrstat  bl asm/statistics_bb.txt
+    wrstatk bl asm/statistics_bbk.txt
+
+    # Statistics of all partial blocks, i.e. all possible
+    # sub-sequences with length > 1.
+
+    Init ps
+    foreach b $blocks {
+	for {set s 0} {$s < [llength $b]} {incr s} {
+	    for {set e [expr {$s + 1}]} {$e < [llength $b]} {incr e} {
+		Incr ps([lrange $b $s $e]) $bl($b)
+	    }
+	}
+    }
+
+    wrstat  ps asm/statistics_ps.txt
+    wrstatk ps asm/statistics_psk.txt
+    return
+}
+
+proc ::page::compiler::peg::mecpu::statistics_si {code} {
+    page_info "  Single instruction probabilities."
+
+    # What are the most used instructions, statically speaking,
+    # without considering context ?
+
+    Init si
+    foreach i $code {
+	foreach {label name} $i break
+	if {$name eq ".C"} continue
+	Incr si($name)
+    }
+
+    wrstat si asm/statistics_si.txt
+    return
+}
+
+proc ::page::compiler::peg::mecpu::Init {v} {
+    upvar 1 $v var total total
+    array set var {}
+    set total 0
+    return
+}
+
+proc ::page::compiler::peg::mecpu::Incr {v {n 1}} {
+    upvar 1 $v var total total
+    if {![info exists var]} {set var $n ; incr total ; return}
+    incr var $n
+    incr total $n
+    return
+}
+
+proc ::page::compiler::peg::mecpu::wrstat {bv file} {
+    upvar 1 $bv buckets total total
+
+    set tmp  {}
+    foreach {name count} [array get buckets] {
+	lappend tmp [list $name $count]
+    }
+
+    set     lines {}
+    lappend lines "Total: $total"
+
+    set half [expr {$total / 2}]
+    set down $total
+
+    foreach item [lsort -index 1 -decreasing -integer [lsort -index 0 $tmp]] {
+	foreach {key count} $item break
+
+	set percent [format %6.2f [expr {$count*100.0/$total}]]%
+	set fcount  [format %8d $count]
+
+	lappend lines "  $fcount $percent $key"
+	incr down -$count
+	if {$half && ($down < $half)} {
+	    lappend lines **
+	    set half 0
+	}
+    }
+
+    write $file [join $lines \n]\n
+    return
+}
+
+proc ::page::compiler::peg::mecpu::wrstatk {bv file} {
+    upvar 1 $bv buckets total total
+
+    set tmp  {}
+    foreach {name count} [array get buckets] {
+	lappend tmp [list $name $count]
+    }
+
+    set     lines {}
+    lappend lines "Total: $total"
+
+    set half [expr {$total / 2}]
+    set down $total
+
+    foreach item  [lsort -index 0 [lsort -index 1 -decreasing -integer $tmp]] {
+	foreach {key count} $item break
+
+	set percent [format %6.2f [expr {$count*100.0/$total}]]%
+	set fcount  [format %8d $count]
+
+	lappend lines "  $fcount $percent $key"
+	incr down -$count
+	if {$down < $half} {
+	    lappend lines **
+	    set half -1
+	}
+    }
+
+    write $file [join $lines \n]\n
+    return
+}
+
+proc ::page::compiler::peg::mecpu::basicblocks {code} {
+    set blocks {}
+    set block {}
+
+    foreach i $code {
+	foreach {label name} $i break
+	if {
+	    ($name eq ".C")          ||
+	    ($name eq "icf_jok")     ||
+	    ($name eq "icf_jfail")   ||
+	    ($name eq "icf_jalways") ||
+	    ($name eq "icf_ntreturn")
+	} {
+	    # Jumps stop a block, and are not put into the block
+	    # Except if the block is of length 1. Then it is of
+	    # interest to see if certain combinations are used
+	    # often.
+
+	    if {[llength $block]} {
+		if {[llength $block] == 1} {lappend block $name}
+		lappend blocks $block
+	    }
+	    set block {}
+	    continue
+	} elseif {$label ne ""} {
+	    # A labeled instruction starts a new block and belongs to
+	    # it. Note that the previous block is saved only if it is
+	    # of length > 1. A single instruction block is not
+	    # something we can optimize.
+
+	    if {[llength $block] > 1} {lappend blocks $block}
+	    set block [list $name]
+	    continue
+	}
+	# Extend current block
+	lappend block $name
+    }
+
+    if {[llength $block]} {lappend blocks $block}
+    return $blocks
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::page::compiler::peg::mecpu::printinsn {g n} {
+    return "[$g node get $n instruction] <[$g node get $n arguments]>"
+}
+
+proc ::page::compiler::peg::mecpu::plural {n prefix} {
+    return "$n ${prefix}[expr {$n == 1 ? "" : "s"}]"
+}
+
+proc ::page::compiler::peg::mecpu::np {n} {
+    format %-*s 8 $n
+}
+
+proc ::page::compiler::peg::mecpu::status {g} {
+    page_info "[plural [llength [$g nodes]] instruction]"
+    return
+}
+
+proc ::page::compiler::peg::mecpu::gdump {g file} {
+    return
+    # disabled
+    variable gnext
+    page_info "  %% Saving graph to \"$file\" %%"
+    write asm/[format %02d $gnext]_${file}.sgr [$g serialize]
+    incr gnext
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Strings.
+
+namespace eval ::page::compiler::peg::mecpu {
+    variable gnext 0
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::compiler::peg::mecpu 0.1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_canon.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_canon.tcl
new file mode 100644
index 00000000..27d5f4b9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_canon.tcl
@@ -0,0 +1,481 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / Backend - PEG as ... PEG
+
+# ### ### ### ######### ######### #########
+## Dumping the input grammar. But not as Tcl or other code. In PEG
+## format again, pretty printing.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require textutil
+
+namespace eval ::page::gen::peg::canon {}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::gen::peg::canon {t chan} {
+
+    # Generate data for inherited attributes
+    # used during synthesis.
+    canon::Setup $t
+
+    # Synthesize all text fragments we need.
+    canon::Synth $t
+
+    # And write the grammar text.
+    puts $chan [$t get root TEXT]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Helpers
+
+proc ::page::gen::peg::canon::Setup {t} {
+    # Phase 1: Top-down, inherited attributes:
+    #
+    # - Max length of nonterminal symbols defined by the grammar.
+    #
+    # - Indentation put on all rules to get enough space for
+    #   definition attributes.
+
+    set       max   -1
+    array set modes {}
+
+    foreach {sym def} [$t get root definitions] {
+	set l [string length $sym]
+	if {$l > $max} {set max $l}
+
+	set mode [string index [$t get $def mode] 0]
+	set modes($mode) .
+    }
+    set modeset [join [lsort [array names modes]] ""]
+    set mlen    [AttrFieldLength $modeset]
+    set heading [expr {$max + $mlen + 4}]
+    # The constant 4 is for ' <- ', see
+    # SynthNode/Nonterminal
+
+    # Save the computed information for access by the definitions and
+    # other operators.
+
+    $t set root SYM_FIELDLEN $max
+    $t set root ATT_FIELDLEN $mlen
+    $t set root ATT_BASE     $modeset
+    $t set root HEADLEN      $heading
+    return
+}
+
+proc ::page::gen::peg::canon::Synth {t} {
+    # Phase 2: Bottom-up, synthesized attributes
+    #
+    # - Text block per node, length and height.
+
+    $t walk root -order post -type dfs n {
+	SynthNode $t $n
+    }
+    return
+}
+
+proc ::page::gen::peg::canon::SynthNode {t n} {
+    if {$n eq "root"} {
+	set code Root
+    } elseif {[$t keyexists $n symbol]} {
+	set code Nonterminal
+    } elseif {[$t keyexists $n op]} {
+	set code [$t get $n op]
+    } else {
+	return -code error "PANIC. Bad node $n, cannot classify"
+    }
+
+    #puts stderr "SynthNode/$code $t $n"
+
+    SynthNode/$code $t $n
+
+    #SHOW [$t get $n TEXT] 1 0
+    #catch {puts stderr "\t.[$t get $n W]x[$t get $n H]"}
+    return
+}
+
+proc ::page::gen::peg::canon::SynthNode/Root {t n} {
+    # Root is the grammar itself.
+
+    # Get the data we need from our children, which are start
+    # expression and nonterminal definitions.
+
+    set gname  [$t get root name]
+    set gstart [$t get root start]
+    if {$gstart ne ""} {
+	set stext  [$t get $gstart TEXT]
+    } else {
+	puts stderr "No start expression."
+	set stext ""
+    }
+    set rules  {}
+    foreach {sym def} [$t get root definitions] {
+	lappend rules [list $sym [$t get $def TEXT]]
+    }
+
+    # Combine them into a text for the whole grammar.
+
+    set intro  "PEG $gname \("
+    set ispace [::textutil::blank [string length $intro]]
+
+    set    out ""
+    append out "# -*- text -*-" \n
+    append out "## Parsing Expression Grammar '$gname'." \n
+    append out "## Layouted by the PG backend 'PEGwriter'." \n
+    append out \n
+    append out $intro[::textutil::indent $stext $ispace 1]\)
+    append out \n
+    append out \n
+
+    foreach e [lsort -dict -index 0 $rules] {
+	foreach {sym text} $e break
+	append out $text \n
+	append out \n
+    }
+
+    append out "END\;" \n
+
+    $t set root TEXT $out
+    return
+}
+
+proc ::page::gen::peg::canon::SynthNode/Nonterminal {t n} {
+    # This is the root of a definition. We now
+    # have to combine the text block for the
+    # expression with nonterminal and attribute
+    # data.
+
+    variable ms
+
+    set abase [$t get root ATT_BASE]
+    set sfl   [$t get root SYM_FIELDLEN]
+    set mode  [$t get $n mode]
+    set sym   [$t get $n symbol]
+    set etext [$t get [lindex [$t children $n] 0] TEXT]
+
+    set    out ""
+    append out $ms($abase,$mode)
+    append out $sym
+    append out [::textutil::blank [expr {$sfl - [string length $sym]}]]
+    append out " <- "
+
+    set ispace [::textutil::blank [string length $out]]
+
+    append out [::textutil::indent $etext $ispace 1]
+    append out " ;"
+
+    $t set $n TEXT $out
+    return
+}
+
+proc ::page::gen::peg::canon::SynthNode/t {t n} {
+    # Terminal node. Primitive layout.
+    # Put the char into single or double quotes.
+
+    set ch [$t get $n char]
+    if {$ch eq "'"} {set q "\""} else {set q '}
+
+    set text $q$ch$q
+
+    SetBlock $t $n $text
+    return
+}
+
+proc ::page::gen::peg::canon::SynthNode/n {t n} {
+    # Nonterminal node. Primitive layout. Text is the name of smybol
+    # itself.
+
+    SetBlock $t $n [$t get $n sym]
+    return
+}
+
+proc ::page::gen::peg::canon::SynthNode/.. {t n} {
+    # Range is [x-y]
+    set b [$t get $n begin]
+    set e [$t get $n end]
+    SetBlock $t $n "\[${b}-${e}\]"
+    return
+}
+
+proc ::page::gen::peg::canon::SynthNode/alnum   {t n} {SetBlock $t $n <alnum>}
+proc ::page::gen::peg::canon::SynthNode/alpha   {t n} {SetBlock $t $n <alpha>}
+proc ::page::gen::peg::canon::SynthNode/dot     {t n} {SetBlock $t $n .}
+proc ::page::gen::peg::canon::SynthNode/epsilon {t n} {SetBlock $t $n ""}
+
+proc ::page::gen::peg::canon::SynthNode/? {t n} {SynthSuffix $t $n ?}
+proc ::page::gen::peg::canon::SynthNode/* {t n} {SynthSuffix $t $n *}
+proc ::page::gen::peg::canon::SynthNode/+ {t n} {SynthSuffix $t $n +}
+
+proc ::page::gen::peg::canon::SynthNode/! {t n} {SynthPrefix $t $n !}
+proc ::page::gen::peg::canon::SynthNode/& {t n} {SynthPrefix $t $n &}
+
+proc ::page::gen::peg::canon::SynthSuffix {t n op} {
+
+    set sub   [lindex [$t children $n] 0]
+    set sop   [$t get $sub op]
+    set etext [$t get $sub TEXT]
+
+    WrapParens $op $sop etext
+    SetBlock $t $n $etext$op
+    return
+}
+
+proc ::page::gen::peg::canon::SynthPrefix {t n op} {
+
+    set sub   [lindex [$t children $n] 0]
+    set sop   [$t get $sub op]
+    set etext [$t get $sub TEXT]
+
+    WrapParens $op $sop etext
+    SetBlock $t $n $op$etext
+    return
+}
+
+proc ::page::gen::peg::canon::SynthNode/x {t n} {
+    variable llen
+
+    # Space given to us for an expression.
+    set lend [expr {$llen - [$t get root HEADLEN]}]
+
+    set clist [$t children $n]
+    if {[llength $clist] == 1} {
+	# Implicit cutting out of chains.
+
+	CopyBlock $t $n [lindex $clist 0]
+
+	#puts stderr <<implicit>>
+	return
+    }
+
+    set out ""
+
+    # We are not tracking the total width of the block, but only the
+    # width of the current line, as that is where we may have to
+    # wrap. The height however is the total height.
+
+    #puts stderr <<$clist>>
+    #puts stderr \t___________________________________
+
+    set w 0
+    set h 0
+    foreach c $clist {
+	set sop   [$t get $c op]
+	set sub   [$t get $c TEXT]
+	set sw    [$t get $c W]
+	set slw   [$t get $c Wlast]
+	set sh    [$t get $c H]
+
+	#puts stderr \t<$sop/$sw/$slw/$sh>___________________________________
+	#SHOW $sub $slw $sh
+
+	if {[Paren x $sop]} {
+	    set sub "([::textutil::indent $sub " " 1])"
+	    incr slw 2
+	    incr sw  2
+
+	    #puts stderr /paren/
+	    #SHOW $sub $slw $sh
+	}
+
+	# Empty buffer ... Put element, and extend dimensions
+
+	#puts stderr \t.=============================
+	#SHOW $out $w $h
+
+	if {$w == 0} {
+	    #puts stderr /init
+	    append out $sub
+	    set w $slw
+	    set h $sh
+	} elseif {($w + $sw + 1) > $lend} {
+	    #puts stderr /wrap/[expr {($w + $sw + 1)}]/$lend
+	    # To large, wrap into next line.
+	    append out \n $sub
+	    incr h $sh
+	    set  w $slw
+	} else {
+	    # We have still space to put the block in. Either by
+	    # simply appending, or by indenting a multiline block
+	    # properly so that its parts stay aligned with each other.
+	    if {$sh == 1} {
+		#puts stderr /add/line
+		append out " " $sub
+		incr w ; incr w $slw
+	    } else {
+		append out " "  ; incr w
+		#puts stderr /add/block/$w
+		append out [::textutil::indent $sub [::textutil::blank $w] 1]
+		incr w $slw
+		incr h $sh ; incr h -1
+	    }
+	}
+
+	#puts stderr \t.~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	#SHOW $out $w $h
+    }
+
+    SetBlock $t $n $out
+    return
+}
+
+proc ::page::gen::peg::canon::SynthNode// {t n} {
+    # We take all branches and put them together, nicely aligned under
+    # each other.
+
+    set clist [$t children $n]
+    if {[llength $clist] == 1} {
+	# Implicit cutting out of chains.
+
+	CopyBlock $t $n [lindex $clist 0]
+	return
+    }
+
+    set out ""
+    foreach c $clist {
+	set sop   [$t get $c op]
+	set sub   [$t get $c TEXT]
+	WrapParens / $sop sub
+	append out "/ [::textutil::indent $sub "  " 1]" \n
+    }
+
+    SetBlock $t $n " [string range $out 1 end]"
+    return
+}
+
+proc ::page::gen::peg::canon::WrapParens {op sop tvar} {
+    if {[Paren $op $sop]} {
+	upvar 1 $tvar text
+	set text "([::textutil::indent $text " " 1])"
+    }
+}
+
+proc ::page::gen::peg::canon::Paren {op sop} {
+    # sop is nested under op.
+    # Parens are required if sop has a lower priority than op.
+
+    return [expr {[Priority $sop] < [Priority $op]}]
+}
+
+proc ::page::gen::peg::canon::Priority {op} {
+    switch -exact -- $op {
+	t        -
+	n        -
+	..       -
+	alnum    -
+	alpha    -
+	dot      -
+	epsilon  {return 4}
+	? -
+	* -
+	+        {return 3}
+	! -
+	&        {return 2}
+	x        {return 1}
+	/        {return 0}
+    }
+    return -code error "Internal error, bad operator \"$op\""
+}
+
+proc ::page::gen::peg::canon::CopyBlock {t n src} {
+    $t set $n TEXT  [$t get $src TEXT]
+    $t set $n W     [$t get $src W]
+    $t set $n Wlast [$t get $src Wlast]
+    $t set $n H     [$t get $src H]
+    return
+}
+
+proc ::page::gen::peg::canon::SetBlock {t n text} {
+    set text   [string trimright $text]
+    set lines  [split $text \n]
+    set height [llength $lines]
+
+    if {$height > 1} {
+	set max -1
+	set ntext {}
+
+	foreach line $lines {
+	    set line [string trimright $line]
+	    set l [string length $line]
+	    if {$l > $max} {set max $l}
+	    lappend ntext $line
+	    set wlast $l
+	}
+	set text  [join $ntext \n]
+	set width $max
+    } else {
+	set width [string length $text]
+	set wlast $width
+    }
+
+    $t set $n TEXT $text
+    $t set $n W     $width
+    $t set $n Wlast $wlast
+    $t set $n H     $height
+    return
+}
+
+proc ::page::gen::peg::canon::AttrFieldLength {modeset} {
+    variable ms
+    return  $ms($modeset,*)
+}
+
+if {0} {
+    proc ::page::gen::peg::canon::SHOW {text w h} {
+	set wl $w ; incr wl -1
+	puts stderr "\t/$h"
+	puts stderr "[textutil::indent $text \t|]"
+	puts stderr "\t\\[string repeat "-" $wl]^ ($w)"
+	return
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Strings.
+
+namespace eval ::page::gen::peg::canon {
+    variable llen 80
+    variable ms ; array set ms {
+	dlmv,discard {void:  }
+	dlmv,leaf    {leaf:  }
+	dlmv,match   {match: }
+	dlmv,value   {       }
+	dlmv,*       7
+
+	dlm,discard  {void:  }		dlv,discard  {void: }
+	dlm,leaf     {leaf:  }		dlv,leaf     {leaf: }
+	dlm,match    {match: }		dlv,value    {      }
+	dlm,*        7			dlv,*        6
+
+	dmv,discard  {void:  }		lmv,leaf     {leaf:  }
+	dmv,match    {match: }		lmv,match    {match: }
+	dmv,value    {       }		lmv,value    {       }
+	dmv,*        7			lmv,*        7
+
+	dl,discard   {void: }		dm,discard   {void:  }
+	dl,leaf      {leaf: }		dm,match     {match: }
+	dl,*         6			dm,*         7
+
+	lm,leaf      {leaf:  }		dv,discard   {void: }
+	lm,match     {match: }		dv,value     {      }
+	lm,*         7			dv,*         6
+
+	lv,leaf      {leaf: }		mv,match     {match: }
+	lv,value     {      }		mv,value     {       }
+	lv,*         6			mv,*         7
+
+	d,discard    {void: }		d,*       6
+	l,leaf       {leaf: }		l,*       6
+	m,match      {match: }		m,*       7
+	v,value      {}			v,*       0
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::gen::peg::canon 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_cpkg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_cpkg.tcl
new file mode 100644
index 00000000..5776f96b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_cpkg.tcl
@@ -0,0 +1,171 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / Backend - PEG as Tcl script.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::util::peg
+
+namespace eval ::page::gen::peg::cpkg {
+    # Get various utilities.
+
+    namespace import ::page::util::peg::*
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::gen::peg::cpkg {t chan} {
+    cpkg::printWarnings [cpkg::getWarnings $t]
+
+    set grname [$t get root name]
+
+    cpkg::Header  $chan $grname
+
+    set gstart [$t get root start]
+    if {$gstart ne ""} {
+	set gstart [cpkg::peOf $t $gstart]
+    } else {
+	puts stderr "No start expression."
+    }
+
+    cpkg::Start   $chan $gstart
+
+    set temp {}
+    set max -1
+
+    foreach {sym def} [$t get root definitions] {
+	set eroot [lindex [$t children $def] 0]
+	set l [string length [list $sym]]
+	if {$l > $max} {set max $l}
+	lappend temp \
+	    [list $sym [$t get $def mode] [cpkg::peOf $t $eroot] $l]
+    }
+
+    foreach e [lsort -dict -index 0 $temp] {
+	foreach {sym mode rule l} $e break
+	cpkg::Rule $chan $sym $mode $rule [expr {$max - $l}]
+    }
+
+    cpkg::Trailer $chan $grname
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Helpers
+
+proc ::page::gen::peg::cpkg::Header {chan grname} {
+    variable header
+    variable headerb
+
+    set stem [namespace tail $grname]
+    puts $chan [string map \
+		    [list \
+			 @@ [list $grname] \
+			 @stem@ [list $stem] \
+			 "\n\t" "\n"
+			] \
+		    $header\n$headerb]
+}
+
+proc ::page::gen::peg::cpkg::Start {chan pe} {
+    puts $chan "    Start  [printTclExpr $pe]\n"
+    return
+}
+
+proc ::page::gen::peg::cpkg::Rule {chan sym mode pe off} {
+    variable ms
+    set off [string repeat " " $off]
+    puts $chan "    Define $ms($mode) $sym$off [printTclExpr $pe]"
+    return
+}
+
+proc ::page::gen::peg::cpkg::Trailer {chan grname} {
+    variable trailer
+    variable trailerb
+    puts $chan [string map \
+		    [list \
+			 @@ [list $grname] \
+			 "\n\t" "\n"
+			] \
+		    $trailer\n$trailerb]
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Strings.
+
+namespace eval ::page::gen::peg::cpkg {
+    variable ms ; array set ms {
+	value   {value  }
+	discard {discard}
+	match   {match  }
+	leaf    {leaf   }
+    }
+    variable header {# -*- tcl -*-
+	## Parsing Expression Grammar '@@'.
+
+	# ### ### ### ######### ######### #########
+	## Package description
+
+	## It provides a single command returning the handle of a
+	## grammar container in which the grammar '@@'
+	## is stored. The container is usable by a PEG interpreter
+	## or other packages taking PE grammars.
+
+	# ### ### ### ######### ######### #########
+	## Requisites.
+	## - PEG container type
+
+	package require grammar::peg
+
+	namespace eval ::@@ {}
+
+	# ### ### ### ######### ######### #########
+	## API
+
+	proc ::@@ {} {
+	    return $@stem@::gr
+	}
+
+	# ### ### ### ######### ######### #########
+	# ### ### ### ######### ######### #########
+	## Data and helpers.
+
+	namespace eval ::@@ {
+	    # Grammar container
+	    variable gr [::grammar::peg gr]
+	}
+
+	proc ::@@::Start {pe} {
+	    variable gr
+	    $gr start $pe
+	    return
+	}
+
+	proc ::@@::Define {mode sym pe} {
+	    variable gr
+	    $gr nonterminal add  $sym $pe
+	    $gr nonterminal mode $sym $mode
+	    return
+	}
+
+	# ### ### ### ######### ######### #########
+	## Initialization = Grammar definition
+    }
+    variable headerb	"namespace eval ::@@ \{"
+
+    variable trailer "\}"
+    variable trailerb {
+	# ### ### ### ######### ######### #########
+	## Package Management - Ready
+
+	package provide @@ 0.1
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::gen::peg::cpkg 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_hb.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_hb.tcl
new file mode 100644
index 00000000..a4cbf6f9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_hb.tcl
@@ -0,0 +1,79 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / Backend - PEG in half baked form for PEG container.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::util::peg
+
+namespace eval ::page::gen::peg::hb {
+    # Get various utilities.
+
+    namespace import ::page::util::peg::*
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::gen::peg::hb {t chan} {
+    hb::printWarnings [hb::getWarnings $t]
+
+    set gstart [$t get root start]
+    if {$gstart ne ""} {
+	set gstart [hb::peOf $t $gstart]
+    } else {
+	puts stderr "No start expression."
+    }
+
+    hb::Start $chan $gstart
+
+    set temp {}
+    set max -1
+    foreach {sym def} [$t get root definitions] {
+	set eroot [lindex [$t children $def] 0]
+	set l [string length [list $sym]]
+	if {$l > $max} {set max $l}
+	lappend temp \
+	    [list $sym [$t get $def mode] [hb::peOf $t $eroot] $l]
+    }
+
+    foreach e [lsort -dict -index 0 $temp] {
+	foreach {sym mode rule l} $e break
+	hb::Rule $chan $sym $mode $rule [expr {$max - $l}]
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Helpers
+
+proc ::page::gen::peg::hb::Start {chan pe} {
+    puts $chan "Start  [printTclExpr $pe]\n"
+    return
+}
+
+proc ::page::gen::peg::hb::Rule {chan sym mode pe off} {
+    variable ms
+    set off [string repeat " " $off]
+    puts $chan "Define $ms($mode) $sym$off [printTclExpr $pe]"
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Strings.
+
+namespace eval ::page::gen::peg::hb {
+    variable ms ; array set ms {
+	value   {value  }
+	discard {discard}
+	match   {match  }
+	leaf    {leaf   }
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::gen::peg::hb 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_me.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_me.tcl
new file mode 100644
index 00000000..bb98902b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_me.tcl
@@ -0,0 +1,888 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / Backend - Generate a grammar::mengine based parser.
+
+# This package assumes to be used from within a PAGE plugin. It uses
+# the API commands listed below. These are identical across the major
+# types of PAGE plugins, allowing this package to be used in reader,
+# transform, and writer plugins. It cannot be used in a configuration
+# plugin, and this makes no sense either.
+#
+# To ensure that our assumption is ok we require the relevant pseudo
+# package setup by the PAGE plugin management code.
+#
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Dumping the input grammar. But not as Tcl or other code. In PEG
+## format again, pretty printing.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: page::plugin
+
+package require page::plugin ; # S.a. pseudo-package.
+
+package require textutil
+package require page::analysis::peg::emodes
+package require page::util::quote
+package require page::util::peg
+
+namespace eval ::page::gen::peg::me {
+    # Get the peg char de/encoder commands.
+    # (unquote, quote'tcl)
+
+    namespace import ::page::util::quote::*
+    namespace import ::page::util::peg::*
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::gen::peg::me::package {text} {
+    variable package $text
+    return
+}
+
+proc ::page::gen::peg::me::copyright {text} {
+    variable copyright $text
+    return
+}
+
+proc ::page::gen::peg::me {t chan} {
+    variable me::package
+    variable me::copyright
+
+    # Resolve the mode hints. Every gen(X) having a value of 'maybe'
+    # (or missing) is for the purposes of this code a 'yes'.
+
+    if {![page::analysis::peg::emodes::compute $t]} {
+	page_error "  Unable to generate a ME parser without accept/generate properties"
+	return
+    }
+
+    foreach n [$t nodes] {
+	if {![$t keyexists $n gen] || ([$t get $n gen] eq "maybe")} {
+	    $t set $n gen 1
+	}
+	if {![$t keyexists $n acc]} {$t set $n acc 1}
+    }
+
+    $t set root Pcount 0
+
+    $t set root package   $package
+    $t set root copyright $copyright
+
+    # Synthesize all text fragments we need.
+    me::Synth $t
+
+    # And write the grammar text.
+    puts $chan [$t get root TEXT]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Helpers
+
+proc ::page::gen::peg::me::Synth {t} {
+    # Phase 2: Bottom-up, synthesized attributes
+    #
+    # - Text blocks per node.
+
+    $t walk root -order post -type dfs n {
+	SynthNode $t $n
+    }
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode {t n} {
+    if {$n eq "root"} {
+	set code Root
+    } elseif {[$t keyexists $n symbol]} {
+	set code Nonterminal
+    } elseif {[$t keyexists $n op]} {
+	set code [$t get $n op]
+    } else {
+	return -code error "PANIC. Bad node $n, cannot classify"
+    }
+
+    #puts stderr "SynthNode/$code $t $n"
+
+    SynthNode/$code $t $n
+
+    #SHOW [$t get $n TEXT] 1 0
+    #catch {puts stderr "\t.[$t get $n W]x[$t get $n H]"}
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/Root {t n} {
+    variable template
+
+    # Root is the grammar itself.
+
+    # Text blocks we have to combine:
+    # - Code for matching the start expression
+    # - Supporting code for the above.
+    # - Code per Nonterminal definition.
+
+    set gname    [$t get root name]
+    set gstart   [$t get root start]
+    set gpackage [$t get root package]
+    set gcopy    [$t get root copyright]
+
+    if {$gcopy ne ""} {
+	set gcopyright "## (C) $gcopy\n"
+    } else {
+	set gcopyright ""
+    }
+    if {$gpackage eq ""} {
+	set gpackage $gname
+    }
+
+    page_info "  Grammar:   $gname"
+    page_info "  Package:   $gpackage"
+    if {$gcopy ne ""} {
+	page_info "  Copyright: $gcopy"
+    }
+
+    if {$gstart ne ""} {
+	set match   [textutil::indent \
+		[$t get $gstart MATCH] \
+		"    "]
+    } else {
+	page_error "  No start expression."
+	set match ""
+    }
+
+    set crules {}
+    set rules  {}
+    set support [$t get [$t get root start] SUPPORT]
+    if {[string length $support]} {
+	lappend rules $support
+	lappend rules {}
+    }
+
+    lappend crules "# Grammar '$gname'"
+    lappend crules {#}
+
+    array set def [$t get root definitions]
+    foreach sym [lsort -dict [array names def]]  {
+	lappend crules [Pfx "# " [$t get $def($sym) EXPR]]
+	lappend crules {#}
+
+	lappend rules  [$t get $def($sym) TEXT]
+	lappend rules {}
+    }
+    set rules [join [lrange $rules 0 end-1] \n]
+
+    lappend crules {}
+    lappend crules $rules
+
+    set crules [join $crules \n]
+
+    # @PKG@ and @NAME@ are handled after the other expansions as their
+    # contents may insert additional instances of these placeholders.
+
+    $t set root TEXT \
+	[string map \
+	    [list \
+	        @NAME@ $gname \
+	        @PKG@  $gpackage \
+	        @COPY@ $gcopyright] \
+	    [string map \
+	        [list \
+		    @MATCH@ $match \
+		    @RULES@ $crules \
+		    ] $template]]
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/Nonterminal {t n} {
+    # This is the root of a definition.
+    #
+    # The text is a procedure wrapping the match code of its
+    # expression into the required the nonterminal handling (caching
+    # and such), plus the support code for the expression matcher.
+
+    set sym      [$t get $n symbol]
+    set label    [$t get $n label]
+    set gen      [$t get $n gen]
+    set mode     [$t get $n mode]
+
+    set pe       [lindex [$t children $n] 0]
+    set egen     [$t get $pe gen]
+    set esupport [$t get $pe SUPPORT]
+    set ematch   [$t get $pe MATCH]
+    set eexpr    [$t get $pe EXPR]
+
+    # Combine the information.
+
+    set sexpr    [Cat "$sym = " $eexpr]
+
+    set match {}
+    #lappend match "puts stderr \"$label << \[icl_get\]\""
+    #lappend match {}
+    lappend match [Pfx "# " $sexpr]
+    lappend match {}
+    if {$gen} {
+	lappend match {variable ok}
+	lappend match "if \{\[inc_restore $label\]\} \{"
+	lappend match "    if \{\$ok\} ias_push"
+	#lappend match "    puts stderr \">> $label = \$ok (c) \[icl_get\]\""
+	lappend match "    return"
+	lappend match "\}"
+    } else {
+	set eop [$t get $pe op]
+	if {
+	    ($eop eq "t")     || ($eop eq "..") ||
+	    ($eop eq "alpha") || ($eop eq "alnum")
+	} {
+	    # Required iff !dot
+	    # Support for terminal expression 
+	    lappend match {variable ok}
+	}
+
+	#lappend match "variable ok"
+	lappend match "if \{\[inc_restore $label\]\} return"
+	#lappend match "if \{\[inc_restore $label\]\} \{"
+	#lappend match "    puts stderr \">> $label = \$ok (c) \[icl_get\]\""
+	#lappend match "    return"
+	#lappend match "\}"
+    }
+    lappend match {}
+    lappend match {set pos [icl_get]}
+    if {$egen} {
+	# [*] Needed for removal of SV's from stack after handling by
+	# this symbol, only if expression actually generates an SV.
+	lappend match {set mrk [ias_mark]}
+    }
+    lappend match {}
+    lappend match $ematch
+    lappend match {}
+
+    switch -exact -- $mode {
+	value   {lappend match "isv_nonterminal_reduce $label \$pos \$mrk"}
+	match   {lappend match "isv_nonterminal_range  $label \$pos"}
+	leaf    {lappend match "isv_nonterminal_leaf   $label \$pos"}
+	discard {lappend match "isv_clear"}
+	default {return -code error "Bad nonterminal mode \"$mode\""}
+    }
+
+    lappend match "inc_save               $label \$pos"
+    if {$egen} {
+	# See [*], this is the removal spoken about before.
+	lappend match {ias_pop2mark             $mrk}
+    }
+    if {$gen} {
+	lappend match {if {$ok} ias_push}
+    }
+    lappend match "ier_nonterminal        \"Expected $label\" \$pos"
+    #lappend match "puts stderr \">> $label = \$ok \[icl_get\]\""
+    lappend match return
+
+    # Final assembly
+
+    set pname [Call $sym]
+    set match [list [Proc $pname [join $match \n]]]
+
+    if {[string length $esupport]} {
+	lappend match {}
+	lappend match $esupport
+    }
+
+    $t set $n TEXT [join $match \n]
+    $t set $n EXPR $sexpr
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/? {t n} {
+    # The expression e? is equivalent to e/epsilon.
+    # And like this it is compiled.
+
+    set pe       [lindex [$t children $n] 0]
+    set ematch   [$t get $pe MATCH]
+    set esupport [$t get $pe SUPPORT]
+    set eexpr    [$t get $pe EXPR]
+    set egen     [$t get $pe gen]
+    set sexpr    "[Cat "(? " $eexpr])"
+
+    set     match {}
+    lappend match {}
+    lappend match [Pfx "# " $sexpr]
+    lappend match {}
+    lappend match {variable ok}
+    lappend match {}
+    lappend match {set pos [icl_get]}
+    lappend match {}
+    lappend match {set old [ier_get]}
+    lappend match $ematch
+    lappend match {ier_merge $old}
+    lappend match {}
+    lappend match {if {$ok} return}
+    lappend match {icl_rewind $pos}
+    lappend match {iok_ok}
+    lappend match {return}
+
+    # Final assembly
+
+    set pname [NextProc $t opt]
+    set match [list [Proc $pname [join $match \n]]]
+    if {[string length $esupport]} {
+	lappend match {}
+	lappend match $esupport
+    }
+
+    $t set $n EXPR    $sexpr
+    $t set $n MATCH   [Cat "$pname                ; " [Pfx "# " $sexpr]]
+    $t set $n SUPPORT [join $match \n]
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/* {t n} {
+    # Kleene star is like a repeated ?
+
+    # Note: Compilation as while loop, as done now
+    # means that the parser has no information about
+    # the intermediate structure of the input in his
+    # cache.
+
+    # Future: Create a helper symbol X and compile
+    # the expression e = e'* as:
+    #     e = X; X <- (e' X)?
+    # with match data for X put into the cache. This
+    # is not exactly equivalent, the structure of the
+    # AST is different (right-nested tree instead of
+    # a list). This however can be handled with a
+    # special nonterminal mode to expand the current
+    # SV on the stack.
+
+    # Note 2: This is a transformation which can be
+    # done on the grammar itself, before the actual
+    # backend is let loose. This "strength reduction"
+    # allows us to keep this code here.
+
+    set pe       [lindex [$t children $n] 0]
+    set ematch   [$t get $pe MATCH]
+    set esupport [$t get $pe SUPPORT]
+    set eexpr    [$t get $pe EXPR]
+    set egen     [$t get $pe gen]
+    set sexpr    "[Cat "(* " $eexpr])"
+
+    set     match {}
+    lappend match {}
+    lappend match [Pfx "# " $sexpr]
+    lappend match {}
+    lappend match {variable ok}
+    lappend match {}
+    lappend match "while \{1\} \{"
+    lappend match {    set pos [icl_get]}
+    lappend match {}
+    lappend match {    set old [ier_get]}
+    lappend match [textutil::indent $ematch "    "]
+    lappend match {    ier_merge $old}
+    lappend match {}
+    lappend match {    if {$ok} continue}
+    lappend match {    break}
+    lappend match "\}"
+    lappend match {}
+    lappend match {icl_rewind $pos}
+    lappend match {iok_ok}
+    lappend match {return}
+
+    # Final assembly
+
+    set pname [NextProc $t kleene]
+    set match [list [Proc $pname [join $match \n]]]
+    if {[string length $esupport]} {
+	lappend match {}
+	lappend match $esupport
+    }
+
+    $t set $n MATCH   [Cat "$pname                ; " [Pfx "# " $sexpr]]
+    $t set $n SUPPORT [join $match \n]
+    $t set $n EXPR    $sexpr
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/+ {t n} {
+    # Positive Kleene star x+ is equivalent to x x*
+    # This is how it is compiled. See also the notes
+    # at the * above, they apply in essence here as
+    # well, except that the transformat scheme is
+    # slighty different:
+    #
+    # e = e'*  ==> e = X; X <- e' X?
+
+    set pe       [lindex [$t children $n] 0]
+    set ematch   [$t get $pe MATCH]
+    set esupport [$t get $pe SUPPORT]
+    set eexpr    [$t get $pe EXPR]
+    set egen     [$t get $pe gen]
+    set sexpr    "[Cat "(+ " $eexpr])"
+
+    set     match {}
+    lappend match {}
+    lappend match [Pfx "# " $sexpr]
+    lappend match {}
+    lappend match {variable ok}
+    lappend match {}
+    lappend match {set pos [icl_get]}
+    lappend match {}
+    lappend match {set old [ier_get]}
+    lappend match $ematch
+    lappend match {ier_merge $old}
+    lappend match {}
+    lappend match "if \{!\$ok\} \{"
+    lappend match {    icl_rewind $pos}
+    lappend match {    return}
+    lappend match "\}"
+    lappend match {}
+    lappend match "while \{1\} \{"
+    lappend match {    set pos [icl_get]}
+    lappend match {}
+    lappend match {    set old [ier_get]}
+    lappend match [textutil::indent $ematch "    "]
+    lappend match {    ier_merge $old}
+    lappend match {}
+    lappend match {    if {$ok} continue}
+    lappend match {    break}
+    lappend match "\}"
+    lappend match {}
+    lappend match {icl_rewind $pos}
+    lappend match {iok_ok}
+    lappend match {return}
+
+    # Final assembly
+
+    set pname [NextProc $t pkleene]
+    set match [list [Proc $pname [join $match \n]]]
+    if {[string length $esupport]} {
+	lappend match {}
+	lappend match $esupport
+    }
+
+    $t set $n MATCH   [Cat "$pname                ; " [Pfx "# " $sexpr]]
+    $t set $n SUPPORT [join $match \n]
+    $t set $n EXPR    $sexpr
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode// {t n} {
+    set args [$t children $n]
+
+    if {![llength $args]} {
+	error "PANIC. Empty choice."
+
+    } elseif {[llength $args] == 1} {
+	# A choice over one branch is no real choice. The code
+	# generated for the child applies here as well.
+
+	set pe [lindex $args 0]
+	$t set $n MATCH   [$t get $pe MATCH]
+	$t set $n SUPPORT [$t get $pe SUPPORT]
+	return
+    }
+
+    # Choice over at least two branches.
+
+    set match   {}
+    set support {}
+    set sexpr   {}
+
+    lappend match {}
+    lappend match {}
+    lappend match {variable ok}
+    lappend match {}
+    lappend match {set pos [icl_get]}
+    foreach pe $args {
+	lappend match {}
+
+	set ematch   [$t get $pe MATCH]
+	set esupport [$t get $pe SUPPORT]
+	set eexpr    [$t get $pe EXPR]
+	set egen     [$t get $pe gen]
+
+	# Note: We do not check for static match results. Doing so is
+	# an optimization we can do earlier, directly on the tree.
+
+	lappend sexpr $eexpr
+
+	if {[string length $esupport]} {
+	    lappend support {}
+	    lappend support $esupport
+	}
+
+	if {$egen} {
+	    lappend match "set mrk \[ias_mark\]"
+	}
+
+	lappend match "set old \[ier_get\]"
+	lappend match $ematch
+	lappend match "ier_merge \$old"
+	lappend match {}
+	lappend match "if \{\$ok\} return"
+
+	if {$egen} {
+	    lappend match "ias_pop2mark \$mrk"
+	}
+	lappend match "icl_rewind   \$pos"
+    }
+    lappend match {}
+    lappend match return
+
+    # Final assembly
+
+    set sexpr "[Cat "(/ " [join $sexpr \n]])"
+    set match [linsert $match 1 [Pfx "# " $sexpr]]
+
+    set pname [NextProc $t bra]
+    set match [list [Proc $pname [join $match \n]]]
+    if {[llength $support]} {
+	lappend match {}
+	lappend match [join [lrange $support 1 end] \n]
+    }
+
+    $t set $n MATCH   [Cat "$pname                ; " [Pfx "# " $sexpr]]
+    $t set $n SUPPORT [join $match \n]
+    $t set $n EXPR    $sexpr
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/x {t n} {
+    set args [$t children $n]
+
+    if {![llength $args]} {
+	error "PANIC. Empty sequence."
+
+    } elseif {[llength $args] == 1} {
+	# A sequence of one element is no real sequence. The code
+	# generated for the child applies here as well.
+
+	set pe [lindex $args 0]
+	$t set $n MATCH   [$t get $pe MATCH]
+	$t set $n SUPPORT [$t get $pe SUPPORT]
+	$t set $n EXPR    [$t get $pe EXPRE]
+	return
+    }
+
+    # Sequence of at least two elements.
+
+    set match   {}
+    set support {}
+    set sexpr   {}
+    set gen     0
+
+    lappend match {}
+    lappend match {}
+    lappend match {variable ok}
+    lappend match {}
+    lappend match {set pos [icl_get]}
+
+    foreach pe $args {
+	lappend match {}
+
+	set ematch   [$t get $pe MATCH]
+	set esupport [$t get $pe SUPPORT]
+	set eexpr    [$t get $pe EXPR]
+	set egen     [$t get $pe gen]
+
+	lappend sexpr $eexpr
+
+	if {[string length $esupport]} {
+	    lappend support {}
+	    lappend support $esupport
+	}
+
+	if {$egen && !$gen} {
+	    # From here on out is the sequence
+	    # able to generate semantic values
+	    # which have to be canceled when
+	    # backtracking.
+
+	    lappend match "set mrk \[ias_mark\]"
+	    lappend match {}
+	    set gen 1
+	}
+
+	lappend match "set old \[ier_get\]"
+	lappend match $ematch
+	lappend match "ier_merge \$old"
+	lappend match {}
+
+	if {$gen} {
+	    lappend match "if \{!\$ok\} \{"
+	    lappend match "    ias_pop2mark \$mrk"
+	    lappend match "    icl_rewind   \$pos"
+	    lappend match "    return"
+	    lappend match "\}"
+	} else {
+	    lappend match "if \{!\$ok\} \{icl_rewind \$pos \; return\}"
+	}
+    }
+    lappend match {}
+    lappend match return
+
+    # Final assembly
+
+    set sexpr "[Cat "(x " [join $sexpr \n]])"
+    set match [linsert $match 1 [Pfx "# " $sexpr]]
+
+    set pname [NextProc $t seq]
+    set match [list [Proc $pname [join $match \n]]]
+    if {[llength $support]} {
+	lappend match {}
+	lappend match [join [lrange $support 1 end] \n]
+    }
+
+    $t set $n MATCH   [Cat "$pname                ; " [Pfx "# " $sexpr]]
+    $t set $n SUPPORT [join $match \n]
+    $t set $n EXPR    $sexpr
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/& {t n} {
+    SynthLookahead $t $n no
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/! {t n} {
+    SynthLookahead $t $n yes
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/dot {t n} {
+    SynthTerminal $t $n \
+	    "any character" {}
+    $t set $n EXPR "(dot)"
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/epsilon {t n} {
+    $t set $n MATCH   iok_ok
+    $t set $n SUPPORT {}
+    $t set $n EXPR "(epsilon)"
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/alnum {t n} {
+    SynthClass $t $n alnum
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/alpha {t n} {
+    SynthClass $t $n alpha
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/.. {t n} {
+    # Range is [x-y]
+
+    set b [$t get $n begin]
+    set e [$t get $n end]
+
+    set tb [quote'tcl $b]
+    set te [quote'tcl $e]
+
+    set pb [quote'tclstr $b]
+    set pe [quote'tclstr $e]
+
+    set cb [quote'tclcom $b]
+    set ce [quote'tclcom $e]
+
+    SynthTerminal $t $n \
+	    "\\\[${pb}..${pe}\\\]" \
+	    "ict_match_tokrange $tb $te"
+    $t set $n EXPR "(.. $cb $ce)"
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/t {t n} {
+    # Terminal node. Primitive matching.
+    # Code is parameterized by gen(X) of this node X.
+
+    set ch  [$t get $n char]
+    set tch [quote'tcl    $ch]
+    set pch [quote'tclstr $ch]
+    set cch [quote'tclcom $ch]
+
+    SynthTerminal $t $n \
+	    $pch \
+	    "ict_match_token $tch"
+    $t set $n EXPR    "(t $cch)"
+    return
+}
+
+proc ::page::gen::peg::me::SynthNode/n {t n} {
+    # Nonterminal node. Primitive matching.
+    # The code is parameterized by acc(X) of this node X, and gen(D)
+    # of the invoked nonterminal D.
+
+    set sym   [$t get $n sym]
+    set def   [$t get $n def]
+
+    if {$def eq ""} {
+	# Invokation of an undefined nonterminal. This will always fail.
+	set match "iok_fail ; # Match for undefined symbol '$sym'."
+    } else {
+	# Combinations
+	# Acc Gen Action
+	# --- --- ------
+	#   0   0 Plain match
+	#   0   1 Match with canceling of the semantic value.
+	#   1   0 Plain match
+	#   1   1 Plain match
+	# --- --- ------
+
+	if {[$t get $n acc] || ![$t get $def gen]} {
+	    set match [Call $sym]
+	} else {
+	    set     match {}
+	    lappend match "set p$sym \[ias_mark\]"
+	    lappend match [Call $sym]
+	    lappend match "ias_pop2mark \$p$sym"
+	    set match [join $match \n]
+	}
+    }
+
+    set sexpr "(n $sym)"
+    $t set $n EXPR    $sexpr
+    $t set $n MATCH   "$match    ; # $sexpr"
+    $t set $n SUPPORT {}
+    return
+}
+
+proc ::page::gen::peg::me::SynthLookahead {t n negated} {
+    # Note: Per the rules about expression modes (! is a lookahead
+    # ____| operator) this node has a mode of 'discard', and its child
+    # ____| has so as well.
+
+    # assert t get n  mode == discard
+    # assert t get pe mode == discard
+
+    set op       [$t get $n op]
+    set pe       [lindex [$t children $n] 0]
+    set eop      [$t get $pe op]
+    set ematch   [$t get $pe MATCH]
+    set esupport [$t get $pe SUPPORT]
+    set eexpr    [$t get $pe EXPR]
+    set pname    [NextProc $t bang]
+
+    set     match {}
+
+    if {
+	($eop eq "t")     || ($eop eq "..") ||
+	($eop eq "alpha") || ($eop eq "alnum")
+    } {
+	# Required iff !dot
+	# Support for terminal expression 
+	lappend match {variable ok}
+	lappend match {}
+    }
+
+    lappend match {set pos [icl_get]}
+    lappend match {}
+    lappend match $ematch
+    lappend match {}
+    lappend match {icl_rewind $pos}
+
+    if {$negated} {
+	lappend match {iok_negate}
+    }
+
+    lappend match return
+
+    set match [list [Proc $pname [join $match \n]]]
+    if {[string length $esupport]} {
+	lappend match {}
+	lappend match $esupport
+    }
+
+    $t set $n MATCH   $pname
+    $t set $n SUPPORT [join $match \n]
+    $t set $n EXPR    "($op $eexpr)"
+    return
+}
+
+proc ::page::gen::peg::me::SynthClass {t n op} {
+    SynthTerminal $t $n \
+	    <$op> \
+	    "ict_match_tokclass $op"
+    $t set $n EXPR ($op)
+    return
+}
+
+proc ::page::gen::peg::me::SynthTerminal {t n msg cmd} {
+    set     match {}
+    lappend match "ict_advance \"Expected $msg (got EOF)\""
+
+    if {$cmd ne ""} {
+	lappend match "if \{\$ok\} \{$cmd \"Expected $msg\"\}"
+    }
+    if {[$t get $n gen]} {
+	lappend match "if \{\$ok\} isv_terminal"
+    }
+
+    $t set $n MATCH   [join $match \n]
+    $t set $n SUPPORT {}
+    return
+}
+
+proc ::page::gen::peg::me::Call {sym} {
+    # Generator for proc names (nonterminal symbols).
+    return matchSymbol_$sym
+}
+
+proc ::page::gen::peg::me::NextProc {t {mark {}}} {
+    set  count [$t get root Pcount]
+    incr count
+    $t set root Pcount $count
+    return e$mark$count
+}
+
+proc ::page::gen::peg::me::Proc {name body} {
+    set     script {}
+    lappend script "proc ::@PKG@::$name \{\} \{"
+    lappend script [::textutil::indent $body "    "]
+    lappend script "\}"
+    return [join $script \n]
+}
+
+proc ::page::gen::peg::me::Cat {prefix suffix} {
+    return "$prefix[textutil::indent $suffix [textutil::blank [string length $prefix]] 1]"
+}
+
+proc ::page::gen::peg::me::Pfx {prefix suffix} {
+    return [textutil::indent $suffix $prefix]
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Strings.
+
+namespace eval ::page::gen::peg::me {
+
+    variable here          [file dirname [info script]]
+    variable template_file [file join $here gen_peg_me.template]
+
+    variable ch
+    variable template \
+	[string trimright [read [set ch [open $template_file r]]][close $ch]]
+    unset ch
+
+    variable package   ""
+    variable copyright ""
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::gen::peg::me 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_me.template b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_me.template
new file mode 100644
index 00000000..070e671d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_me.template
@@ -0,0 +1,61 @@
+# -*- tcl -*-
+## Parsing Expression Grammar '@NAME@'.
+## Recursive Descent Packrat parser generated
+## by the PAGE writer plugin 'me'.
+@COPY@
+# ### ### ### ######### ######### #########
+## Package description
+
+# The commands provided here match an input provided through a buffer
+# command to the PE grammar '@NAME@'. The parser is based on the package
+# 'grammar::me::tcl' (recursive-descent, packrat, pulling chars,
+# pushing the generated AST).
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require grammar::me::tcl
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+namespace eval ::@PKG@ {
+    # Import the virtual machine for matching.
+
+    namespace import ::grammar::me::tcl::*
+    upvar #0 ::grammar::me::tcl::ok ok
+}
+
+# ### ### ### ######### ######### #########
+## API Implementation.
+
+proc ::@PKG@::parse {nxcmd emvar astvar} {
+    variable ok
+    variable se
+
+    upvar 1 $emvar emsg $astvar ast
+
+    init $nxcmd
+
+@MATCH@
+
+    isv_nonterminal_reduce ALL -1
+    set ast [sv]
+    if {!$ok} {
+        foreach {l m} [ier_get] break
+        lappend l [lc $l]
+        set emsg [list $l $m]
+    }
+
+    return $ok
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper methods
+
+@RULES@
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide @PKG@ 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_mecpu.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_mecpu.tcl
new file mode 100644
index 00000000..e0b49aa8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_mecpu.tcl
@@ -0,0 +1,289 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2006 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / Backend - Generate a grammar::me::cpu based parser.
+
+# This package assumes to be used from within a PAGE plugin. It uses
+# the API commands listed below. These are identical across the major
+# types of PAGE plugins, allowing this package to be used in reader,
+# transform, and writer plugins. It cannot be used in a configuration
+# plugin, and this makes no sense either.
+#
+# To ensure that our assumption is ok we require the relevant pseudo
+# package setup by the PAGE plugin management code.
+#
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+
+## The input is a grammar, not as tree, but as a list of instructions
+## (symbolic form). This backend converts that into machinecode for
+## grammar::m::cpu::core and inserts the result into a template file.
+
+## The translation from grammar tree to assembler code was done in a
+## preceding transformation.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: page::plugin
+
+package require page::plugin ; # S.a. pseudo-package.
+
+package require grammar::me::cpu::core
+package require textutil
+
+#package require page::analysis::peg::emodes
+#package require page::util::quote
+#package require page::util::peg
+
+namespace eval ::page::gen::peg::mecpu {}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::gen::peg::mecpu::package {text} {
+    variable package $text
+    return
+}
+
+proc ::page::gen::peg::mecpu::copyright {text} {
+    variable copyright $text
+    return
+}
+
+proc ::page::gen::peg::mecpu::template {path} {
+    variable template $path
+    return
+}
+
+proc ::page::gen::peg::mecpu::cmarker {list} {
+    variable cmarker $list
+    return
+}
+
+proc ::page::gen::peg::mecpu {asmcode chan} {
+
+    # asmcode     = list (name code)
+    # code        = list (instruction)
+    # instruction = list (label name arg...)
+
+    variable mecpu::package
+    variable mecpu::copyright
+    variable mecpu::cmarker
+    variable mecpu::template
+    variable mecpu::template_file
+
+    # Import the config options, provide fallback to defaults for the
+    # unspecified parts.
+
+    set gname [lindex $asmcode 0]
+    set gcode [lindex $asmcode 1]
+
+    if {$package eq ""} {set package $gname}
+
+    page_info "  Grammar:   $gname"
+    page_info "  Package:   $package"
+
+    if {$copyright ne ""} {
+	page_info "  Copyright: $copyright"
+	set copyright "\#\# (C) $copyright\n"
+    }
+
+    if {$template eq ""} {
+	set template $template_file
+    }
+
+    page_info "  Template:  $template"
+
+    # Translate the incoming assembler to machine code.
+
+    set mcode [grammar::me::cpu::core::asm $gcode]
+
+    # We know that the machine code has three parts (instructions,
+    # string pool, token map). We take the data apart to allow separate
+    # insertion if the template so chooses (like for readability).
+
+    foreach {minsn mpool mtmap} $mcode break
+
+    set fminsn {} ; set i 0 ; set j 19
+    while {$i < [llength $minsn]} {
+	append fminsn "         [lrange $minsn $i $j]\n"
+	incr i 20 ; incr j 20
+    }
+
+    set fmpool {} ; set i 0 ; set j 4
+    while {$i < [llength $mpool]} {
+	append fmpool "         [lrange $mpool $i $j]\n"
+	incr i 5 ; incr j 5
+    }
+
+    # ------------------------------------
+    # We also generate a readable representation of the assembler
+    # instructions for insertion into a comment area.
+
+    set asmp [mecpu::2readable $gcode $minsn]
+
+    # ------------------------------------
+
+    # And write the modified template
+    puts $chan [string map [list  \
+		@NAME@ $gname     \
+	        @PKG@  $package   \
+	        @COPY@ $copyright \
+		@CODE@ $mcode     \
+		@INSN@ $minsn     \
+		@FNSN@ $fminsn    \
+		@POOL@ $mpool     \
+		@FPOL@ $fmpool    \
+		@TMAP@ $mtmap     \
+		@ASMP@ $asmp      \
+	       ] [mecpu::Template]]
+    return
+}
+
+proc ::page::gen::peg::mecpu::Template {} {
+    variable template
+    return [string trimright [read [set ch [open $template r]]][close $ch]]
+}
+
+proc ::page::gen::peg::mecpu::2readable {asmcode mecode} {
+    return [2print $asmcode $mecode max [widths $asmcode max]]
+}
+
+proc ::page::gen::peg::mecpu::widths {asmcode mv} {
+    upvar 1 $mv max
+
+    # First iteration, column widths (instructions, and arguments).
+    # Ignore comments, they go across all columns.
+    # Also ignore labels (lrange 1 ..).
+
+    set mc 0
+    foreach insn $asmcode {
+	set i [lindex $insn 1]
+	if {$i eq ".C"} continue
+	set col 0
+
+	foreach x [lrange $insn 1 end] {
+	    set xlen [string length $x]
+	    if {![info exists max($col)] || ($xlen > $max($col))} {set max($col) $xlen}
+	    incr col
+
+	    # Shift the strings of various commands into the third
+	    # column, if they are not already there.
+
+	    if {$i eq "ier_nonterminal"}        {incr col ; set i ""}
+	    if {$i eq "isv_nonterminal_leaf"}   {incr col ; set i ""}
+	    if {$i eq "isv_nonterminal_range"}  {incr col ; set i ""}
+	    if {$i eq "isv_nonterminal_reduce"} {incr col ; set i ""}
+	    if {$i eq "inc_save"}               {incr col ; set i ""}
+	    if {$i eq "ict_advance"}            {incr col ; set i ""}
+	}
+	if {$col > $mc} {set mc $col}
+    }
+
+    set max($mc) 0
+    return $mc
+}
+
+proc ::page::gen::peg::mecpu::2print {asmcode mecode mv mc} {
+    variable cmarker
+    upvar 1 $mv max
+
+    set lines {}
+    set pc    0
+
+    foreach insn $asmcode {
+	foreach {label name} $insn break
+	if {$name  eq ".C"} {lappend lines "" "--  [join [lrange $insn 2 end] " "]" ""}
+	if {$label ne ""}   {lappend lines "       ${label}:" }
+	if {$name  eq ".C"} continue
+
+	set line  " [format %05d $pc]      "
+
+	set  pcs $pc
+	incr pc [llength $insn] ; incr pc -1
+	set  pce $pc ; incr pce -1
+	set  imecode [lrange $mecode $pcs $pce]
+
+	if {
+	    ($name eq "ier_nonterminal") ||
+	    ($name eq "isv_nonterminal_leaf") ||
+	    ($name eq "isv_nonterminal_range") ||
+	    ($name eq "isv_nonterminal_reduce") ||
+	    ($name eq "inc_save") ||
+	    ($name eq "ict_advance")
+	} {
+	    # Shift first argument into 2nd column, and quote it as well.
+	    set insn [lreplace $insn 2 2 "" '[lindex $insn 2]']
+	} elseif {
+	    ($name eq "inc_restore") ||
+	    ($name eq "ict_match_token") ||
+	    ($name eq "ict_match_tokclass")
+	} {
+	    # Command with quoted arguments, no shifting.
+	    set insn [lreplace $insn 3 3 '[lindex $insn 3]']
+	} elseif {
+	    ($name eq "ict_match_tokrange")
+	} {
+	    # Command with quoted arguments, no shifting.
+	    set insn [lreplace $insn 4 4 '[lindex $insn 4]']
+	}
+
+	while {[llength $insn] <= $mc} {lappend insn ""}
+	lappend insn "-- $imecode"
+
+	set col 0
+	foreach x [lrange $insn 1 end] {
+	    set xlen [string length $x]
+	    append line " "
+	    append line $x
+	    append line [string repeat " " [expr {$max($col) - $xlen}]]
+	    incr col
+	}
+
+	lappend lines $line
+    }
+
+    # Wrap the lines into a comment.
+
+    if {$cmarker eq ""} {set cmarker "\#"}
+
+    if {[llength $cmarker] > 1} {
+	# Comments are explictly closed as well.
+
+	foreach {cs ce} $cmarker break
+	return "$cs [join $lines " $ce\n$cs "] $ce"
+    } else {
+	# Comments are not explicitly closed. Implicit by end-of-line
+
+	return "$cmarker [join $lines "\n$cmarker "]"
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Strings.
+
+namespace eval ::page::gen::peg::mecpu {
+
+    variable here          [file dirname [info script]]
+    variable template_file [file join $here gen_peg_mecpu.template]
+
+    variable package   ""
+    variable copyright ""
+    variable template  ""
+    variable cmarker   ""
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::gen::peg::mecpu 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_mecpu.template b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_mecpu.template
new file mode 100644
index 00000000..38cf9016
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_mecpu.template
@@ -0,0 +1,48 @@
+# -*- tcl -*-
+## Parsing Expression Grammar '@NAME@'.
+## Recursive Descent Packrat parser generated
+## by the PAGE writer plugin 'mecpu'.
+@COPY@
+# ### ### ### ######### ######### #########
+## Package description
+
+# The commands provided here match an input provided through a buffer
+# command to the PE grammar '@NAME@'. The parser is based on the ME
+# virtual machine (recursive-descent, packrat, pulling chars,
+# pushing the generated AST, suspendable).
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# Import the virtual machine for matching.
+package require grammar::me::cpu
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::@PKG@ {
+    constructor {} {
+	set cpu [grammar::me::cpu ${selfns}::cpu $mecode]
+	return
+    }
+    variable cpu
+    delegate method * to cpu
+
+    typevariable mecode {
+	{
+@FNSN@	}
+	{
+@FPOL@	}
+	{@TMAP@}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Documentation. Readable form of 'mecode' above.
+
+@ASMP@
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide @PKG@ 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_ser.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_ser.tcl
new file mode 100644
index 00000000..7fb82666
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_peg_ser.tcl
@@ -0,0 +1,63 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / Backend - PEG as serialized PEG container.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require grammar::peg
+package require page::util::quote
+package require page::util::peg
+
+namespace eval ::page::gen::peg::ser {
+    # Get the peg char de/encoder commands.
+    # (unquote, quote'tcl), and other utilities.
+
+    namespace import ::page::util::quote::*
+    namespace import ::page::util::peg::*
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::gen::peg::ser {t chan} {
+    ser::printWarnings [ser::getWarnings $t]
+
+    ::grammar::peg gr
+
+    set gstart [$t get root start]
+    if {$gstart ne ""} {
+	gr start [ser::peOf $t $gstart]
+    } else {
+	page_info "No start expression."
+    }
+
+    foreach {sym def} [$t get root definitions] {
+	set eroot [lindex [$t children $def] 0]
+
+	gr nonterminal add  $sym [ser::peOf $t $eroot]
+	gr nonterminal mode $sym [$t get $def mode]
+    }
+
+    puts $chan [gr serialize]
+    gr destroy
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Helpers
+
+proc ::page::gen::peg::ser::GetRules {t} {
+    return $res
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Strings.
+
+namespace eval ::page::gen::peg::ser {}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::gen::peg::ser 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_tree_text.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_tree_text.tcl
new file mode 100644
index 00000000..44b674fd
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/gen_tree_text.tcl
@@ -0,0 +1,94 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / Backend - Dump (A)ST for inspection.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::util::quote
+
+namespace eval ::page::gen::tree::text {
+    # Get the peg char de/encoder commands.
+    # (unquote, quote'tcl)
+
+    namespace import ::page::util::quote::*
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::gen::tree::text {t chan} {
+    set indent ""
+    set bystr  "  "
+    set bysiz  [string length $bystr]
+    set byoff  end-$bysiz
+
+    $t walk root -order both -type dfs {a n} {
+	if {$a eq "enter"} {
+	    text::WriteNode $indent $chan $t $n
+	    append indent $bystr
+	} else {
+	    set indent [string range $indent 0 $byoff]
+	}
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Helpers
+
+proc ::page::gen::tree::text::WriteNode {indent chan t n} {
+    array set attr [$t getall $n]
+
+    if {[array size attr] == 0} {
+	puts $chan "$indent$n <>"
+    } else {
+	puts -nonewline $chan "$indent$n < "
+
+	set max -1
+	set d {}
+	foreach k [array names attr] {
+	    set l [string length $k]
+	    if {$l > $max} {set max $l}
+	    lappend d [list $k [Quote $attr($k)] $l]
+	}
+
+	if {[llength $d] == 1} {
+	    puts $chan "$k = $attr($k) >"
+	    return
+	}
+
+	set first 1
+	set space $indent[string repeat " " [string length "$n < "]]
+
+	foreach e [lsort -dict -index 0 $d] {
+	    foreach {k v l} $e break
+	    set off [string repeat " " [expr {$max-$l}]]
+
+	    if {$first} {
+		puts -nonewline $chan "$k$off = $v"
+		set first 0
+	    } else {
+		puts -nonewline $chan "\n$space$k$off = $v"
+	    }
+	}
+
+	puts $chan " >"
+    }
+}
+
+proc ::page::gen::tree::text::Quote {str} {
+    return $str
+
+    set res ""
+    foreach c [split $str {}] {
+	append res [quote'tcl $c]
+    }
+    return $res
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::gen::tree::text 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/parse_lemon.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/parse_lemon.tcl
new file mode 100644
index 00000000..e3b2447c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/parse_lemon.tcl
@@ -0,0 +1,7420 @@
+# -*- tcl -*-
+## Parsing Expression Grammar 'page::parse::lemon'.
+## RD parser by the PG backend 'MEwriter'.
+
+# ### ### ### ######### ######### #########
+## Package description
+
+# The commands provided here match an input provided through a buffer
+# command to the PE grammar 'page::parse::lemon'. The parser is based on the package
+# 'grammar::mengine' (recursive-descent, packrat, pulling chars,
+# pushing the generated AST).
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require grammar::me::tcl
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+namespace eval ::page::parse::lemon {
+    # Import the virtual machine for matching.
+
+    namespace import ::grammar::me::tcl::*
+    upvar #0 ::grammar::me::tcl::ok ok
+}
+
+# ### ### ### ######### ######### #########
+## API Implementation.
+
+proc ::page::parse::lemon::parse {nxcmd emvar astvar} {
+    variable ok
+    variable se
+
+    upvar 1 $emvar emsg $astvar ast
+
+    init $nxcmd
+
+    matchSymbol_LemonGrammar    ; # (n LemonGrammar)
+
+    isv_nonterminal_reduce ALL -1
+    set ast [sv]
+    if {!$ok} {
+        foreach {l m} [ier_get] break
+        lappend l [lc $l]
+	set mx {}
+	foreach x $m {lappend mx "Expected $x"}
+        set emsg [list $l $mx]
+    }
+
+    return $ok
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper methods
+
+# Grammar 'page::parse::lemon'
+#
+# ASSIGN = (x (t :)
+#             (t :)
+#             (t =)
+#             (n SPACE))
+#
+# C_COMMENT = (x (n CCOM_OPEN)
+#                (* (x (! (n CCOM_CLOSE))
+#                      (dot)))
+#                (n CCOM_CLOSE))
+#
+# CCOM_CLOSE = (x (t *)
+#                 (t /))
+#
+# CCOM_OPEN = (x (t /)
+#                (t *))
+#
+# Code = (x (n DCODE)
+#           (n Codeblock))
+#
+# Codeblock = (x (n LBRACE)
+#                (* (/ (n Codeblock)
+#                      (n C_COMMENT)
+#                      (n Cplusplus_COMMENT)
+#                      (x (! (n RBRACE))
+#                         (dot))))
+#                (n RBRACE))
+#
+# Cplusplus_COMMENT = (x (t /)
+#                        (t /)
+#                        (* (x (! (n EOL))
+#                              (dot)))
+#                        (n EOL))
+#
+# DCODE = (x (t c)
+#            (t o)
+#            (t d)
+#            (t e)
+#            (n SPACE))
+#
+# DDEFDEST = (x (t d)
+#               (t e)
+#               (t f)
+#               (t a)
+#               (t u)
+#               (t l)
+#               (t t)
+#               (t _)
+#               (t d)
+#               (t e)
+#               (t s)
+#               (t t)
+#               (t r)
+#               (t u)
+#               (t c)
+#               (t t)
+#               (t o)
+#               (t r)
+#               (n SPACE))
+#
+# DDEFTYPE = (x (t d)
+#               (t e)
+#               (t f)
+#               (t a)
+#               (t u)
+#               (t l)
+#               (t t)
+#               (t _)
+#               (t t)
+#               (t y)
+#               (t p)
+#               (t e)
+#               (n SPACE))
+#
+# DDEST = (x (t d)
+#            (t e)
+#            (t s)
+#            (t t)
+#            (t r)
+#            (t u)
+#            (t c)
+#            (t t)
+#            (t o)
+#            (t r)
+#            (n SPACE))
+#
+# DefaultDestructor = (x (n DDEFDEST)
+#                        (n Identifier)
+#                        (n Codeblock))
+#
+# DefaultType = (x (n DDEFTYPE)
+#                  (n Codeblock))
+#
+# Definition = (* (x (n Identifier)
+#                    (? (n Label))))
+#
+# DENDIF = (x (t %)
+#             (t e)
+#             (t n)
+#             (t d)
+#             (t i)
+#             (t f)
+#             (n SPACE))
+#
+# Destructor = (x (n DDEST)
+#                 (n Identifier)
+#                 (n Codeblock))
+#
+# DEXTRA = (x (t e)
+#             (t x)
+#             (t t)
+#             (t r)
+#             (t a)
+#             (t _)
+#             (t a)
+#             (t r)
+#             (t g)
+#             (t u)
+#             (t m)
+#             (t e)
+#             (t n)
+#             (t t)
+#             (n SPACE))
+#
+# DFALLBK = (x (t f)
+#              (t a)
+#              (t l)
+#              (t l)
+#              (t b)
+#              (t a)
+#              (t c)
+#              (t k)
+#              (n SPACE))
+#
+# DIFDEF = (x (t %)
+#             (t i)
+#             (t f)
+#             (t d)
+#             (t e)
+#             (t f)
+#             (n SPACE))
+#
+# DIFNDEF = (x (t %)
+#              (t i)
+#              (t f)
+#              (t n)
+#              (t d)
+#              (t e)
+#              (t f)
+#              (n SPACE))
+#
+# DINCL = (x (t i)
+#            (t n)
+#            (t c)
+#            (t l)
+#            (t u)
+#            (t d)
+#            (t e)
+#            (n SPACE))
+#
+# DINTRO = (t %)
+#
+# Directive = (x (n DINTRO)
+#                (/ (n Code)
+#                   (n DefaultDestructor)
+#                   (n DefaultType)
+#                   (n Destructor)
+#                   (n ExtraArgument)
+#                   (n Include)
+#                   (n Left)
+#                   (n Name)
+#                   (n Nonassoc)
+#                   (n ParseAccept)
+#                   (n ParseFailure)
+#                   (n Right)
+#                   (n StackOverflow)
+#                   (n Stacksize)
+#                   (n StartSymbol)
+#                   (n SyntaxError)
+#                   (n TokenDestructor)
+#                   (n TokenPrefix)
+#                   (n TokenType)
+#                   (n Type)
+#                   (n Fallback)))
+#
+# DLEFT = (x (t l)
+#            (t e)
+#            (t f)
+#            (t t)
+#            (n SPACE))
+#
+# DNAME = (x (t n)
+#            (t a)
+#            (t m)
+#            (t e)
+#            (n SPACE))
+#
+# DNON = (x (t n)
+#           (t o)
+#           (t n)
+#           (t a)
+#           (t s)
+#           (t s)
+#           (t o)
+#           (t c)
+#           (n SPACE))
+#
+# DOT = (x (t .)
+#          (n SPACE))
+#
+# DPACC = (x (t p)
+#            (t a)
+#            (t r)
+#            (t s)
+#            (t e)
+#            (t _)
+#            (t a)
+#            (t c)
+#            (t c)
+#            (t e)
+#            (t p)
+#            (t t)
+#            (n SPACE))
+#
+# DPFAIL = (x (t p)
+#             (t a)
+#             (t r)
+#             (t s)
+#             (t e)
+#             (t _)
+#             (t f)
+#             (t a)
+#             (t i)
+#             (t l)
+#             (t u)
+#             (t r)
+#             (t e)
+#             (n SPACE))
+#
+# DRIGHT = (x (t r)
+#             (t i)
+#             (t g)
+#             (t h)
+#             (t t)
+#             (n SPACE))
+#
+# DSTART = (x (t s)
+#             (t t)
+#             (t a)
+#             (t r)
+#             (t t)
+#             (t _)
+#             (t s)
+#             (t y)
+#             (t m)
+#             (t b)
+#             (t o)
+#             (t l)
+#             (n SPACE))
+#
+# DSTKOVER = (x (t s)
+#               (t t)
+#               (t a)
+#               (t c)
+#               (t k)
+#               (t _)
+#               (t o)
+#               (t v)
+#               (t e)
+#               (t r)
+#               (t f)
+#               (t l)
+#               (t o)
+#               (t w)
+#               (n SPACE))
+#
+# DSTKSZ = (x (t s)
+#             (t t)
+#             (t a)
+#             (t c)
+#             (t k)
+#             (t _)
+#             (t s)
+#             (t i)
+#             (t z)
+#             (t e)
+#             (n SPACE))
+#
+# DSYNERR = (x (t s)
+#              (t y)
+#              (t n)
+#              (t t)
+#              (t a)
+#              (t x)
+#              (t _)
+#              (t e)
+#              (t r)
+#              (t r)
+#              (t o)
+#              (t r)
+#              (n SPACE))
+#
+# DTOKDEST = (x (t t)
+#               (t o)
+#               (t k)
+#               (t e)
+#               (t n)
+#               (t _)
+#               (t d)
+#               (t e)
+#               (t s)
+#               (t t)
+#               (t r)
+#               (t u)
+#               (t c)
+#               (t t)
+#               (t o)
+#               (t r)
+#               (n SPACE))
+#
+# DTOKPFX = (x (t t)
+#              (t o)
+#              (t k)
+#              (t e)
+#              (t n)
+#              (t _)
+#              (t p)
+#              (t r)
+#              (t e)
+#              (t f)
+#              (t i)
+#              (t x)
+#              (n SPACE))
+#
+# DTOKTYPE = (x (t t)
+#               (t o)
+#               (t k)
+#               (t e)
+#               (t n)
+#               (t _)
+#               (t t)
+#               (t y)
+#               (t p)
+#               (t e)
+#               (n SPACE))
+#
+# DTYPE = (x (t t)
+#            (t y)
+#            (t p)
+#            (t e)
+#            (n SPACE))
+#
+# Endif = (n DENDIF)
+#
+# EOF = (! (dot))
+#
+# EOL = (/ (x (t \r)
+#             (t \n))
+#          (t \r)
+#          (t \n))
+#
+# ExtraArgument = (x (n DEXTRA)
+#                    (n Codeblock))
+#
+# Fallback = (x (n DFALLBK)
+#               (+ (n Identifier))
+#               (n DOT))
+#
+# Ident = (x (/ (alpha)
+#               (t _))
+#            (* (/ (alnum)
+#                  (t _))))
+#
+# Identifier = (x (n Ident)
+#                 (n SPACE))
+#
+# Ifdef = (x (n DIFDEF)
+#            (n Identifier))
+#
+# Ifndef = (x (n DIFNDEF)
+#             (n Identifier))
+#
+# Include = (x (n DINCL)
+#              (n Codeblock))
+#
+# Label = (x (n LPAREN)
+#            (n Identifier)
+#            (n RPAREN))
+#
+# LBRACE = (t \{)
+#
+# LBRACKET = (x (t [)
+#               (n SPACE))
+#
+# Left = (x (n DLEFT)
+#           (+ (n Identifier))
+#           (n DOT))
+#
+# LemonGrammar = (x (n SPACE)
+#                   (+ (n Statement))
+#                   (n EOF))
+#
+# LPAREN = (x (t \()
+#             (n SPACE))
+#
+# Name = (x (n DNAME)
+#           (n Identifier))
+#
+# NatNum = (+ (.. 0 9))
+#
+# NaturalNumber = (x (n NatNum)
+#                    (n SPACE))
+#
+# Nonassoc = (x (n DNON)
+#               (+ (n Identifier))
+#               (n DOT))
+#
+# ParseAccept = (x (n DPACC)
+#                  (n Codeblock))
+#
+# ParseFailure = (x (n DPFAIL)
+#                   (n Codeblock))
+#
+# Precedence = (x (n LBRACKET)
+#                 (n Identifier)
+#                 (n RBRACKET))
+#
+# RBRACE = (t \})
+#
+# RBRACKET = (x (t ])
+#               (n SPACE))
+#
+# Right = (x (n DRIGHT)
+#            (+ (n Identifier))
+#            (n DOT))
+#
+# RPAREN = (x (t \))
+#             (n SPACE))
+#
+# Rule = (x (n Identifier)
+#           (? (n Label))
+#           (n ASSIGN)
+#           (n Definition)
+#           (n DOT)
+#           (? (n Precedence))
+#           (? (n Codeblock)))
+#
+# SPACE = (* (/ (t <blank>)
+#               (t \t)
+#               (t \n)
+#               (t \r)
+#               (n C_COMMENT)
+#               (n Cplusplus_COMMENT)
+#               (n Ifndef)
+#               (n Ifdef)
+#               (n Endif)))
+#
+# StackOverflow = (x (n DSTKOVER)
+#                    (n Codeblock))
+#
+# Stacksize = (x (n DSTKSZ)
+#                (n NaturalNumber))
+#
+# StartSymbol = (x (n DSTART)
+#                  (n Identifier))
+#
+# Statement = (x (/ (n Directive)
+#                   (n Rule))
+#                (n SPACE))
+#
+# SyntaxError = (x (n DSYNERR)
+#                  (n Codeblock))
+#
+# TokenDestructor = (x (n DTOKDEST)
+#                      (n Identifier)
+#                      (n Codeblock))
+#
+# TokenPrefix = (x (n DTOKPFX)
+#                  (n Identifier))
+#
+# TokenType = (x (n DTOKTYPE)
+#                (n Codeblock))
+#
+# Type = (x (n DTYPE)
+#           (n Identifier)
+#           (n Codeblock))
+#
+
+proc ::page::parse::lemon::matchSymbol_ASSIGN {} {
+    # ASSIGN = (x (t :)
+    #             (t :)
+    #             (t =)
+    #             (n SPACE))
+
+    if {[inc_restore ASSIGN]} return
+
+    set pos [icl_get]
+
+    eseq53                ; # (x (t :)
+                            #    (t :)
+                            #    (t =)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               ASSIGN $pos
+    ier_nonterminal        ASSIGN $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq53 {} {
+
+    # (x (t :)
+    #    (t :)
+    #    (t =)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance :
+    if {$ok} {ict_match_token :}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance :
+    if {$ok} {ict_match_token :}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance =
+    if {$ok} {ict_match_token =}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_C_COMMENT {} {
+    # C_COMMENT = (x (n CCOM_OPEN)
+    #                (* (x (! (n CCOM_CLOSE))
+    #                      (dot)))
+    #                (n CCOM_CLOSE))
+
+    if {[inc_restore C_COMMENT]} return
+
+    set pos [icl_get]
+
+    eseq90                ; # (x (n CCOM_OPEN)
+                            #    (* (x (! (n CCOM_CLOSE))
+                            #          (dot)))
+                            #    (n CCOM_CLOSE))
+
+    isv_clear
+    inc_save               C_COMMENT $pos
+    ier_nonterminal        C_COMMENT $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq90 {} {
+
+    # (x (n CCOM_OPEN)
+    #    (* (x (! (n CCOM_CLOSE))
+    #          (dot)))
+    #    (n CCOM_CLOSE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_CCOM_OPEN    ; # (n CCOM_OPEN)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ekleene89                ; # (* (x (! (n CCOM_CLOSE))
+                               #       (dot)))
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_CCOM_CLOSE    ; # (n CCOM_CLOSE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::ekleene89 {} {
+
+    # (* (x (! (n CCOM_CLOSE))
+    #       (dot)))
+
+    variable ok
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        eseq88                ; # (x (! (n CCOM_CLOSE))
+                                #    (dot))
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::eseq88 {} {
+
+    # (x (! (n CCOM_CLOSE))
+    #    (dot))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ebang87
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "any character"
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::ebang87 {} {
+    set pos [icl_get]
+
+    matchSymbol_CCOM_CLOSE    ; # (n CCOM_CLOSE)
+
+    icl_rewind $pos
+    iok_negate
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_CCOM_CLOSE {} {
+    # CCOM_CLOSE = (x (t *)
+    #                 (t /))
+
+    if {[inc_restore CCOM_CLOSE]} return
+
+    set pos [icl_get]
+
+    eseq92                ; # (x (t *)
+                            #    (t /))
+
+    isv_clear
+    inc_save               CCOM_CLOSE $pos
+    ier_nonterminal        CCOM_CLOSE $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq92 {} {
+
+    # (x (t *)
+    #    (t /))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance *
+    if {$ok} {ict_match_token *}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance /
+    if {$ok} {ict_match_token /}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_CCOM_OPEN {} {
+    # CCOM_OPEN = (x (t /)
+    #                (t *))
+
+    if {[inc_restore CCOM_OPEN]} return
+
+    set pos [icl_get]
+
+    eseq91                ; # (x (t /)
+                            #    (t *))
+
+    isv_clear
+    inc_save               CCOM_OPEN $pos
+    ier_nonterminal        CCOM_OPEN $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq91 {} {
+
+    # (x (t /)
+    #    (t *))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance /
+    if {$ok} {ict_match_token /}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance *
+    if {$ok} {ict_match_token *}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Code {} {
+    # Code = (x (n DCODE)
+    #           (n Codeblock))
+
+    variable ok
+    if {[inc_restore Code]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq16                ; # (x (n DCODE)
+                            #    (n Codeblock))
+
+    isv_nonterminal_reduce Code $pos $mrk
+    inc_save               Code $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Code $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq16 {} {
+
+    # (x (n DCODE)
+    #    (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DCODE    ; # (n DCODE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Codeblock {} {
+    # Codeblock = (x (n LBRACE)
+    #                (* (/ (n Codeblock)
+    #                      (n C_COMMENT)
+    #                      (n Cplusplus_COMMENT)
+    #                      (x (! (n RBRACE))
+    #                         (dot))))
+    #                (n RBRACE))
+
+    variable ok
+    if {[inc_restore Codeblock]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq45                ; # (x (n LBRACE)
+                            #    (* (/ (n Codeblock)
+                            #          (n C_COMMENT)
+                            #          (n Cplusplus_COMMENT)
+                            #          (x (! (n RBRACE))
+                            #             (dot))))
+                            #    (n RBRACE))
+
+    isv_nonterminal_range  Codeblock $pos
+    inc_save               Codeblock $pos
+    if {$ok} ias_push
+    ier_nonterminal        Codeblock $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq45 {} {
+
+    # (x (n LBRACE)
+    #    (* (/ (n Codeblock)
+    #          (n C_COMMENT)
+    #          (n Cplusplus_COMMENT)
+    #          (x (! (n RBRACE))
+    #             (dot))))
+    #    (n RBRACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_LBRACE    ; # (n LBRACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ekleene44                ; # (* (/ (n Codeblock)
+                               #       (n C_COMMENT)
+                               #       (n Cplusplus_COMMENT)
+                               #       (x (! (n RBRACE))
+                               #          (dot))))
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_RBRACE    ; # (n RBRACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::ekleene44 {} {
+
+    # (* (/ (n Codeblock)
+    #       (n C_COMMENT)
+    #       (n Cplusplus_COMMENT)
+    #       (x (! (n RBRACE))
+    #          (dot))))
+
+    variable ok
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        ebra43                ; # (/ (n Codeblock)
+                                #    (n C_COMMENT)
+                                #    (n Cplusplus_COMMENT)
+                                #    (x (! (n RBRACE))
+                                #       (dot)))
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::ebra43 {} {
+
+    # (/ (n Codeblock)
+    #    (n C_COMMENT)
+    #    (n Cplusplus_COMMENT)
+    #    (x (! (n RBRACE))
+    #       (dot)))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    set pCodeblock [ias_mark]
+    matchSymbol_Codeblock
+    ias_pop2mark $pCodeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    matchSymbol_C_COMMENT    ; # (n C_COMMENT)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    matchSymbol_Cplusplus_COMMENT    ; # (n Cplusplus_COMMENT)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    eseq42                ; # (x (! (n RBRACE))
+                            #    (dot))
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::lemon::eseq42 {} {
+
+    # (x (! (n RBRACE))
+    #    (dot))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ebang41
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "any character"
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::ebang41 {} {
+    set pos [icl_get]
+
+    matchSymbol_RBRACE    ; # (n RBRACE)
+
+    icl_rewind $pos
+    iok_negate
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Cplusplus_COMMENT {} {
+    # Cplusplus_COMMENT = (x (t /)
+    #                        (t /)
+    #                        (* (x (! (n EOL))
+    #                              (dot)))
+    #                        (n EOL))
+
+    if {[inc_restore Cplusplus_COMMENT]} return
+
+    set pos [icl_get]
+
+    eseq96                ; # (x (t /)
+                            #    (t /)
+                            #    (* (x (! (n EOL))
+                            #          (dot)))
+                            #    (n EOL))
+
+    isv_clear
+    inc_save               Cplusplus_COMMENT $pos
+    ier_nonterminal        Cplusplus_COMMENT $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq96 {} {
+
+    # (x (t /)
+    #    (t /)
+    #    (* (x (! (n EOL))
+    #          (dot)))
+    #    (n EOL))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance /
+    if {$ok} {ict_match_token /}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance /
+    if {$ok} {ict_match_token /}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ekleene95                ; # (* (x (! (n EOL))
+                               #       (dot)))
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_EOL    ; # (n EOL)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::ekleene95 {} {
+
+    # (* (x (! (n EOL))
+    #       (dot)))
+
+    variable ok
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        eseq94                ; # (x (! (n EOL))
+                                #    (dot))
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::eseq94 {} {
+
+    # (x (! (n EOL))
+    #    (dot))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ebang93
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "any character"
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::ebang93 {} {
+    set pos [icl_get]
+
+    matchSymbol_EOL    ; # (n EOL)
+
+    icl_rewind $pos
+    iok_negate
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DCODE {} {
+    # DCODE = (x (t c)
+    #            (t o)
+    #            (t d)
+    #            (t e)
+    #            (n SPACE))
+
+    if {[inc_restore DCODE]} return
+
+    set pos [icl_get]
+
+    eseq59                ; # (x (t c)
+                            #    (t o)
+                            #    (t d)
+                            #    (t e)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DCODE $pos
+    ier_nonterminal        DCODE $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq59 {} {
+
+    # (x (t c)
+    #    (t o)
+    #    (t d)
+    #    (t e)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance c
+    if {$ok} {ict_match_token c}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance o
+    if {$ok} {ict_match_token o}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance d
+    if {$ok} {ict_match_token d}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DDEFDEST {} {
+    # DDEFDEST = (x (t d)
+    #               (t e)
+    #               (t f)
+    #               (t a)
+    #               (t u)
+    #               (t l)
+    #               (t t)
+    #               (t _)
+    #               (t d)
+    #               (t e)
+    #               (t s)
+    #               (t t)
+    #               (t r)
+    #               (t u)
+    #               (t c)
+    #               (t t)
+    #               (t o)
+    #               (t r)
+    #               (n SPACE))
+
+    if {[inc_restore DDEFDEST]} return
+
+    set pos [icl_get]
+
+    eseq60                ; # (x (t d)
+                            #    (t e)
+                            #    (t f)
+                            #    (t a)
+                            #    (t u)
+                            #    (t l)
+                            #    (t t)
+                            #    (t _)
+                            #    (t d)
+                            #    (t e)
+                            #    (t s)
+                            #    (t t)
+                            #    (t r)
+                            #    (t u)
+                            #    (t c)
+                            #    (t t)
+                            #    (t o)
+                            #    (t r)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DDEFDEST $pos
+    ier_nonterminal        DDEFDEST $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq60 {} {
+
+    # (x (t d)
+    #    (t e)
+    #    (t f)
+    #    (t a)
+    #    (t u)
+    #    (t l)
+    #    (t t)
+    #    (t _)
+    #    (t d)
+    #    (t e)
+    #    (t s)
+    #    (t t)
+    #    (t r)
+    #    (t u)
+    #    (t c)
+    #    (t t)
+    #    (t o)
+    #    (t r)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance d
+    if {$ok} {ict_match_token d}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance f
+    if {$ok} {ict_match_token f}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance u
+    if {$ok} {ict_match_token u}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance l
+    if {$ok} {ict_match_token l}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance d
+    if {$ok} {ict_match_token d}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance s
+    if {$ok} {ict_match_token s}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance u
+    if {$ok} {ict_match_token u}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance c
+    if {$ok} {ict_match_token c}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance o
+    if {$ok} {ict_match_token o}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DDEFTYPE {} {
+    # DDEFTYPE = (x (t d)
+    #               (t e)
+    #               (t f)
+    #               (t a)
+    #               (t u)
+    #               (t l)
+    #               (t t)
+    #               (t _)
+    #               (t t)
+    #               (t y)
+    #               (t p)
+    #               (t e)
+    #               (n SPACE))
+
+    if {[inc_restore DDEFTYPE]} return
+
+    set pos [icl_get]
+
+    eseq61                ; # (x (t d)
+                            #    (t e)
+                            #    (t f)
+                            #    (t a)
+                            #    (t u)
+                            #    (t l)
+                            #    (t t)
+                            #    (t _)
+                            #    (t t)
+                            #    (t y)
+                            #    (t p)
+                            #    (t e)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DDEFTYPE $pos
+    ier_nonterminal        DDEFTYPE $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq61 {} {
+
+    # (x (t d)
+    #    (t e)
+    #    (t f)
+    #    (t a)
+    #    (t u)
+    #    (t l)
+    #    (t t)
+    #    (t _)
+    #    (t t)
+    #    (t y)
+    #    (t p)
+    #    (t e)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance d
+    if {$ok} {ict_match_token d}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance f
+    if {$ok} {ict_match_token f}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance u
+    if {$ok} {ict_match_token u}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance l
+    if {$ok} {ict_match_token l}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance y
+    if {$ok} {ict_match_token y}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance p
+    if {$ok} {ict_match_token p}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DDEST {} {
+    # DDEST = (x (t d)
+    #            (t e)
+    #            (t s)
+    #            (t t)
+    #            (t r)
+    #            (t u)
+    #            (t c)
+    #            (t t)
+    #            (t o)
+    #            (t r)
+    #            (n SPACE))
+
+    if {[inc_restore DDEST]} return
+
+    set pos [icl_get]
+
+    eseq62                ; # (x (t d)
+                            #    (t e)
+                            #    (t s)
+                            #    (t t)
+                            #    (t r)
+                            #    (t u)
+                            #    (t c)
+                            #    (t t)
+                            #    (t o)
+                            #    (t r)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DDEST $pos
+    ier_nonterminal        DDEST $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq62 {} {
+
+    # (x (t d)
+    #    (t e)
+    #    (t s)
+    #    (t t)
+    #    (t r)
+    #    (t u)
+    #    (t c)
+    #    (t t)
+    #    (t o)
+    #    (t r)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance d
+    if {$ok} {ict_match_token d}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance s
+    if {$ok} {ict_match_token s}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance u
+    if {$ok} {ict_match_token u}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance c
+    if {$ok} {ict_match_token c}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance o
+    if {$ok} {ict_match_token o}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DefaultDestructor {} {
+    # DefaultDestructor = (x (n DDEFDEST)
+    #                        (n Identifier)
+    #                        (n Codeblock))
+
+    variable ok
+    if {[inc_restore DefaultDestructor]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq17                ; # (x (n DDEFDEST)
+                            #    (n Identifier)
+                            #    (n Codeblock))
+
+    isv_nonterminal_reduce DefaultDestructor $pos $mrk
+    inc_save               DefaultDestructor $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        DefaultDestructor $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq17 {} {
+
+    # (x (n DDEFDEST)
+    #    (n Identifier)
+    #    (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DDEFDEST    ; # (n DDEFDEST)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DefaultType {} {
+    # DefaultType = (x (n DDEFTYPE)
+    #                  (n Codeblock))
+
+    variable ok
+    if {[inc_restore DefaultType]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq18                ; # (x (n DDEFTYPE)
+                            #    (n Codeblock))
+
+    isv_nonterminal_reduce DefaultType $pos $mrk
+    inc_save               DefaultType $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        DefaultType $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq18 {} {
+
+    # (x (n DDEFTYPE)
+    #    (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DDEFTYPE    ; # (n DDEFTYPE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Definition {} {
+    # Definition = (* (x (n Identifier)
+    #                    (? (n Label))))
+
+    variable ok
+    if {[inc_restore Definition]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    ekleene11                ; # (* (x (n Identifier)
+                               #       (? (n Label))))
+
+    isv_nonterminal_reduce Definition $pos $mrk
+    inc_save               Definition $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Definition $pos
+    return
+}
+
+proc ::page::parse::lemon::ekleene11 {} {
+
+    # (* (x (n Identifier)
+    #       (? (n Label))))
+
+    variable ok
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        eseq10                ; # (x (n Identifier)
+                                #    (? (n Label)))
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::eseq10 {} {
+
+    # (x (n Identifier)
+    #    (? (n Label)))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    eopt9                ; # (? (n Label))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::eopt9 {} {
+
+    # (? (n Label))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_Label    ; # (n Label)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DENDIF {} {
+    # DENDIF = (x (t %)
+    #             (t e)
+    #             (t n)
+    #             (t d)
+    #             (t i)
+    #             (t f)
+    #             (n SPACE))
+
+    if {[inc_restore DENDIF]} return
+
+    set pos [icl_get]
+
+    eseq82                ; # (x (t %)
+                            #    (t e)
+                            #    (t n)
+                            #    (t d)
+                            #    (t i)
+                            #    (t f)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DENDIF $pos
+    ier_nonterminal        DENDIF $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq82 {} {
+
+    # (x (t %)
+    #    (t e)
+    #    (t n)
+    #    (t d)
+    #    (t i)
+    #    (t f)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance %
+    if {$ok} {ict_match_token %}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance n
+    if {$ok} {ict_match_token n}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance d
+    if {$ok} {ict_match_token d}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance i
+    if {$ok} {ict_match_token i}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance f
+    if {$ok} {ict_match_token f}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Destructor {} {
+    # Destructor = (x (n DDEST)
+    #                 (n Identifier)
+    #                 (n Codeblock))
+
+    variable ok
+    if {[inc_restore Destructor]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq19                ; # (x (n DDEST)
+                            #    (n Identifier)
+                            #    (n Codeblock))
+
+    isv_nonterminal_reduce Destructor $pos $mrk
+    inc_save               Destructor $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Destructor $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq19 {} {
+
+    # (x (n DDEST)
+    #    (n Identifier)
+    #    (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DDEST    ; # (n DDEST)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DEXTRA {} {
+    # DEXTRA = (x (t e)
+    #             (t x)
+    #             (t t)
+    #             (t r)
+    #             (t a)
+    #             (t _)
+    #             (t a)
+    #             (t r)
+    #             (t g)
+    #             (t u)
+    #             (t m)
+    #             (t e)
+    #             (t n)
+    #             (t t)
+    #             (n SPACE))
+
+    if {[inc_restore DEXTRA]} return
+
+    set pos [icl_get]
+
+    eseq63                ; # (x (t e)
+                            #    (t x)
+                            #    (t t)
+                            #    (t r)
+                            #    (t a)
+                            #    (t _)
+                            #    (t a)
+                            #    (t r)
+                            #    (t g)
+                            #    (t u)
+                            #    (t m)
+                            #    (t e)
+                            #    (t n)
+                            #    (t t)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DEXTRA $pos
+    ier_nonterminal        DEXTRA $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq63 {} {
+
+    # (x (t e)
+    #    (t x)
+    #    (t t)
+    #    (t r)
+    #    (t a)
+    #    (t _)
+    #    (t a)
+    #    (t r)
+    #    (t g)
+    #    (t u)
+    #    (t m)
+    #    (t e)
+    #    (t n)
+    #    (t t)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance x
+    if {$ok} {ict_match_token x}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance g
+    if {$ok} {ict_match_token g}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance u
+    if {$ok} {ict_match_token u}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance m
+    if {$ok} {ict_match_token m}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance n
+    if {$ok} {ict_match_token n}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DFALLBK {} {
+    # DFALLBK = (x (t f)
+    #              (t a)
+    #              (t l)
+    #              (t l)
+    #              (t b)
+    #              (t a)
+    #              (t c)
+    #              (t k)
+    #              (n SPACE))
+
+    if {[inc_restore DFALLBK]} return
+
+    set pos [icl_get]
+
+    eseq79                ; # (x (t f)
+                            #    (t a)
+                            #    (t l)
+                            #    (t l)
+                            #    (t b)
+                            #    (t a)
+                            #    (t c)
+                            #    (t k)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DFALLBK $pos
+    ier_nonterminal        DFALLBK $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq79 {} {
+
+    # (x (t f)
+    #    (t a)
+    #    (t l)
+    #    (t l)
+    #    (t b)
+    #    (t a)
+    #    (t c)
+    #    (t k)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance f
+    if {$ok} {ict_match_token f}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance l
+    if {$ok} {ict_match_token l}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance l
+    if {$ok} {ict_match_token l}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance b
+    if {$ok} {ict_match_token b}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance c
+    if {$ok} {ict_match_token c}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance k
+    if {$ok} {ict_match_token k}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DIFDEF {} {
+    # DIFDEF = (x (t %)
+    #             (t i)
+    #             (t f)
+    #             (t d)
+    #             (t e)
+    #             (t f)
+    #             (n SPACE))
+
+    if {[inc_restore DIFDEF]} return
+
+    set pos [icl_get]
+
+    eseq80                ; # (x (t %)
+                            #    (t i)
+                            #    (t f)
+                            #    (t d)
+                            #    (t e)
+                            #    (t f)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DIFDEF $pos
+    ier_nonterminal        DIFDEF $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq80 {} {
+
+    # (x (t %)
+    #    (t i)
+    #    (t f)
+    #    (t d)
+    #    (t e)
+    #    (t f)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance %
+    if {$ok} {ict_match_token %}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance i
+    if {$ok} {ict_match_token i}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance f
+    if {$ok} {ict_match_token f}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance d
+    if {$ok} {ict_match_token d}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance f
+    if {$ok} {ict_match_token f}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DIFNDEF {} {
+    # DIFNDEF = (x (t %)
+    #              (t i)
+    #              (t f)
+    #              (t n)
+    #              (t d)
+    #              (t e)
+    #              (t f)
+    #              (n SPACE))
+
+    if {[inc_restore DIFNDEF]} return
+
+    set pos [icl_get]
+
+    eseq81                ; # (x (t %)
+                            #    (t i)
+                            #    (t f)
+                            #    (t n)
+                            #    (t d)
+                            #    (t e)
+                            #    (t f)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DIFNDEF $pos
+    ier_nonterminal        DIFNDEF $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq81 {} {
+
+    # (x (t %)
+    #    (t i)
+    #    (t f)
+    #    (t n)
+    #    (t d)
+    #    (t e)
+    #    (t f)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance %
+    if {$ok} {ict_match_token %}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance i
+    if {$ok} {ict_match_token i}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance f
+    if {$ok} {ict_match_token f}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance n
+    if {$ok} {ict_match_token n}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance d
+    if {$ok} {ict_match_token d}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance f
+    if {$ok} {ict_match_token f}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DINCL {} {
+    # DINCL = (x (t i)
+    #            (t n)
+    #            (t c)
+    #            (t l)
+    #            (t u)
+    #            (t d)
+    #            (t e)
+    #            (n SPACE))
+
+    if {[inc_restore DINCL]} return
+
+    set pos [icl_get]
+
+    eseq64                ; # (x (t i)
+                            #    (t n)
+                            #    (t c)
+                            #    (t l)
+                            #    (t u)
+                            #    (t d)
+                            #    (t e)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DINCL $pos
+    ier_nonterminal        DINCL $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq64 {} {
+
+    # (x (t i)
+    #    (t n)
+    #    (t c)
+    #    (t l)
+    #    (t u)
+    #    (t d)
+    #    (t e)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance i
+    if {$ok} {ict_match_token i}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance n
+    if {$ok} {ict_match_token n}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance c
+    if {$ok} {ict_match_token c}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance l
+    if {$ok} {ict_match_token l}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance u
+    if {$ok} {ict_match_token u}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance d
+    if {$ok} {ict_match_token d}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DINTRO {} {
+    # DINTRO = (t %)
+
+    variable ok
+    if {[inc_restore DINTRO]} return
+
+    set pos [icl_get]
+
+    ict_advance %
+    if {$ok} {ict_match_token %}
+
+    isv_clear
+    inc_save               DINTRO $pos
+    ier_nonterminal        DINTRO $pos
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Directive {} {
+    # Directive = (x (n DINTRO)
+    #                (/ (n Code)
+    #                   (n DefaultDestructor)
+    #                   (n DefaultType)
+    #                   (n Destructor)
+    #                   (n ExtraArgument)
+    #                   (n Include)
+    #                   (n Left)
+    #                   (n Name)
+    #                   (n Nonassoc)
+    #                   (n ParseAccept)
+    #                   (n ParseFailure)
+    #                   (n Right)
+    #                   (n StackOverflow)
+    #                   (n Stacksize)
+    #                   (n StartSymbol)
+    #                   (n SyntaxError)
+    #                   (n TokenDestructor)
+    #                   (n TokenPrefix)
+    #                   (n TokenType)
+    #                   (n Type)
+    #                   (n Fallback)))
+
+    variable ok
+    if {[inc_restore Directive]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq15                ; # (x (n DINTRO)
+                            #    (/ (n Code)
+                            #       (n DefaultDestructor)
+                            #       (n DefaultType)
+                            #       (n Destructor)
+                            #       (n ExtraArgument)
+                            #       (n Include)
+                            #       (n Left)
+                            #       (n Name)
+                            #       (n Nonassoc)
+                            #       (n ParseAccept)
+                            #       (n ParseFailure)
+                            #       (n Right)
+                            #       (n StackOverflow)
+                            #       (n Stacksize)
+                            #       (n StartSymbol)
+                            #       (n SyntaxError)
+                            #       (n TokenDestructor)
+                            #       (n TokenPrefix)
+                            #       (n TokenType)
+                            #       (n Type)
+                            #       (n Fallback)))
+
+    isv_nonterminal_reduce Directive $pos $mrk
+    inc_save               Directive $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Directive $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq15 {} {
+
+    # (x (n DINTRO)
+    #    (/ (n Code)
+    #       (n DefaultDestructor)
+    #       (n DefaultType)
+    #       (n Destructor)
+    #       (n ExtraArgument)
+    #       (n Include)
+    #       (n Left)
+    #       (n Name)
+    #       (n Nonassoc)
+    #       (n ParseAccept)
+    #       (n ParseFailure)
+    #       (n Right)
+    #       (n StackOverflow)
+    #       (n Stacksize)
+    #       (n StartSymbol)
+    #       (n SyntaxError)
+    #       (n TokenDestructor)
+    #       (n TokenPrefix)
+    #       (n TokenType)
+    #       (n Type)
+    #       (n Fallback)))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DINTRO    ; # (n DINTRO)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    ebra14                ; # (/ (n Code)
+                            #    (n DefaultDestructor)
+                            #    (n DefaultType)
+                            #    (n Destructor)
+                            #    (n ExtraArgument)
+                            #    (n Include)
+                            #    (n Left)
+                            #    (n Name)
+                            #    (n Nonassoc)
+                            #    (n ParseAccept)
+                            #    (n ParseFailure)
+                            #    (n Right)
+                            #    (n StackOverflow)
+                            #    (n Stacksize)
+                            #    (n StartSymbol)
+                            #    (n SyntaxError)
+                            #    (n TokenDestructor)
+                            #    (n TokenPrefix)
+                            #    (n TokenType)
+                            #    (n Type)
+                            #    (n Fallback))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::ebra14 {} {
+
+    # (/ (n Code)
+    #    (n DefaultDestructor)
+    #    (n DefaultType)
+    #    (n Destructor)
+    #    (n ExtraArgument)
+    #    (n Include)
+    #    (n Left)
+    #    (n Name)
+    #    (n Nonassoc)
+    #    (n ParseAccept)
+    #    (n ParseFailure)
+    #    (n Right)
+    #    (n StackOverflow)
+    #    (n Stacksize)
+    #    (n StartSymbol)
+    #    (n SyntaxError)
+    #    (n TokenDestructor)
+    #    (n TokenPrefix)
+    #    (n TokenType)
+    #    (n Type)
+    #    (n Fallback))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Code    ; # (n Code)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_DefaultDestructor    ; # (n DefaultDestructor)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_DefaultType    ; # (n DefaultType)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Destructor    ; # (n Destructor)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_ExtraArgument    ; # (n ExtraArgument)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Include    ; # (n Include)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Left    ; # (n Left)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Name    ; # (n Name)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Nonassoc    ; # (n Nonassoc)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_ParseAccept    ; # (n ParseAccept)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_ParseFailure    ; # (n ParseFailure)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Right    ; # (n Right)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_StackOverflow    ; # (n StackOverflow)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Stacksize    ; # (n Stacksize)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_StartSymbol    ; # (n StartSymbol)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_SyntaxError    ; # (n SyntaxError)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_TokenDestructor    ; # (n TokenDestructor)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_TokenPrefix    ; # (n TokenPrefix)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_TokenType    ; # (n TokenType)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Type    ; # (n Type)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Fallback    ; # (n Fallback)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DLEFT {} {
+    # DLEFT = (x (t l)
+    #            (t e)
+    #            (t f)
+    #            (t t)
+    #            (n SPACE))
+
+    if {[inc_restore DLEFT]} return
+
+    set pos [icl_get]
+
+    eseq65                ; # (x (t l)
+                            #    (t e)
+                            #    (t f)
+                            #    (t t)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DLEFT $pos
+    ier_nonterminal        DLEFT $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq65 {} {
+
+    # (x (t l)
+    #    (t e)
+    #    (t f)
+    #    (t t)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance l
+    if {$ok} {ict_match_token l}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance f
+    if {$ok} {ict_match_token f}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DNAME {} {
+    # DNAME = (x (t n)
+    #            (t a)
+    #            (t m)
+    #            (t e)
+    #            (n SPACE))
+
+    if {[inc_restore DNAME]} return
+
+    set pos [icl_get]
+
+    eseq66                ; # (x (t n)
+                            #    (t a)
+                            #    (t m)
+                            #    (t e)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DNAME $pos
+    ier_nonterminal        DNAME $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq66 {} {
+
+    # (x (t n)
+    #    (t a)
+    #    (t m)
+    #    (t e)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance n
+    if {$ok} {ict_match_token n}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance m
+    if {$ok} {ict_match_token m}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DNON {} {
+    # DNON = (x (t n)
+    #           (t o)
+    #           (t n)
+    #           (t a)
+    #           (t s)
+    #           (t s)
+    #           (t o)
+    #           (t c)
+    #           (n SPACE))
+
+    if {[inc_restore DNON]} return
+
+    set pos [icl_get]
+
+    eseq67                ; # (x (t n)
+                            #    (t o)
+                            #    (t n)
+                            #    (t a)
+                            #    (t s)
+                            #    (t s)
+                            #    (t o)
+                            #    (t c)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DNON $pos
+    ier_nonterminal        DNON $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq67 {} {
+
+    # (x (t n)
+    #    (t o)
+    #    (t n)
+    #    (t a)
+    #    (t s)
+    #    (t s)
+    #    (t o)
+    #    (t c)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance n
+    if {$ok} {ict_match_token n}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance o
+    if {$ok} {ict_match_token o}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance n
+    if {$ok} {ict_match_token n}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance s
+    if {$ok} {ict_match_token s}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance s
+    if {$ok} {ict_match_token s}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance o
+    if {$ok} {ict_match_token o}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance c
+    if {$ok} {ict_match_token c}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DOT {} {
+    # DOT = (x (t .)
+    #          (n SPACE))
+
+    if {[inc_restore DOT]} return
+
+    set pos [icl_get]
+
+    eseq54                ; # (x (t .)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DOT $pos
+    ier_nonterminal        DOT $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq54 {} {
+
+    # (x (t .)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance .
+    if {$ok} {ict_match_token .}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DPACC {} {
+    # DPACC = (x (t p)
+    #            (t a)
+    #            (t r)
+    #            (t s)
+    #            (t e)
+    #            (t _)
+    #            (t a)
+    #            (t c)
+    #            (t c)
+    #            (t e)
+    #            (t p)
+    #            (t t)
+    #            (n SPACE))
+
+    if {[inc_restore DPACC]} return
+
+    set pos [icl_get]
+
+    eseq68                ; # (x (t p)
+                            #    (t a)
+                            #    (t r)
+                            #    (t s)
+                            #    (t e)
+                            #    (t _)
+                            #    (t a)
+                            #    (t c)
+                            #    (t c)
+                            #    (t e)
+                            #    (t p)
+                            #    (t t)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DPACC $pos
+    ier_nonterminal        DPACC $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq68 {} {
+
+    # (x (t p)
+    #    (t a)
+    #    (t r)
+    #    (t s)
+    #    (t e)
+    #    (t _)
+    #    (t a)
+    #    (t c)
+    #    (t c)
+    #    (t e)
+    #    (t p)
+    #    (t t)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance p
+    if {$ok} {ict_match_token p}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance s
+    if {$ok} {ict_match_token s}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance c
+    if {$ok} {ict_match_token c}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance c
+    if {$ok} {ict_match_token c}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance p
+    if {$ok} {ict_match_token p}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DPFAIL {} {
+    # DPFAIL = (x (t p)
+    #             (t a)
+    #             (t r)
+    #             (t s)
+    #             (t e)
+    #             (t _)
+    #             (t f)
+    #             (t a)
+    #             (t i)
+    #             (t l)
+    #             (t u)
+    #             (t r)
+    #             (t e)
+    #             (n SPACE))
+
+    if {[inc_restore DPFAIL]} return
+
+    set pos [icl_get]
+
+    eseq69                ; # (x (t p)
+                            #    (t a)
+                            #    (t r)
+                            #    (t s)
+                            #    (t e)
+                            #    (t _)
+                            #    (t f)
+                            #    (t a)
+                            #    (t i)
+                            #    (t l)
+                            #    (t u)
+                            #    (t r)
+                            #    (t e)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DPFAIL $pos
+    ier_nonterminal        DPFAIL $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq69 {} {
+
+    # (x (t p)
+    #    (t a)
+    #    (t r)
+    #    (t s)
+    #    (t e)
+    #    (t _)
+    #    (t f)
+    #    (t a)
+    #    (t i)
+    #    (t l)
+    #    (t u)
+    #    (t r)
+    #    (t e)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance p
+    if {$ok} {ict_match_token p}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance s
+    if {$ok} {ict_match_token s}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance f
+    if {$ok} {ict_match_token f}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance i
+    if {$ok} {ict_match_token i}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance l
+    if {$ok} {ict_match_token l}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance u
+    if {$ok} {ict_match_token u}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DRIGHT {} {
+    # DRIGHT = (x (t r)
+    #             (t i)
+    #             (t g)
+    #             (t h)
+    #             (t t)
+    #             (n SPACE))
+
+    if {[inc_restore DRIGHT]} return
+
+    set pos [icl_get]
+
+    eseq70                ; # (x (t r)
+                            #    (t i)
+                            #    (t g)
+                            #    (t h)
+                            #    (t t)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DRIGHT $pos
+    ier_nonterminal        DRIGHT $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq70 {} {
+
+    # (x (t r)
+    #    (t i)
+    #    (t g)
+    #    (t h)
+    #    (t t)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance i
+    if {$ok} {ict_match_token i}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance g
+    if {$ok} {ict_match_token g}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance h
+    if {$ok} {ict_match_token h}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DSTART {} {
+    # DSTART = (x (t s)
+    #             (t t)
+    #             (t a)
+    #             (t r)
+    #             (t t)
+    #             (t _)
+    #             (t s)
+    #             (t y)
+    #             (t m)
+    #             (t b)
+    #             (t o)
+    #             (t l)
+    #             (n SPACE))
+
+    if {[inc_restore DSTART]} return
+
+    set pos [icl_get]
+
+    eseq73                ; # (x (t s)
+                            #    (t t)
+                            #    (t a)
+                            #    (t r)
+                            #    (t t)
+                            #    (t _)
+                            #    (t s)
+                            #    (t y)
+                            #    (t m)
+                            #    (t b)
+                            #    (t o)
+                            #    (t l)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DSTART $pos
+    ier_nonterminal        DSTART $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq73 {} {
+
+    # (x (t s)
+    #    (t t)
+    #    (t a)
+    #    (t r)
+    #    (t t)
+    #    (t _)
+    #    (t s)
+    #    (t y)
+    #    (t m)
+    #    (t b)
+    #    (t o)
+    #    (t l)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance s
+    if {$ok} {ict_match_token s}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance s
+    if {$ok} {ict_match_token s}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance y
+    if {$ok} {ict_match_token y}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance m
+    if {$ok} {ict_match_token m}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance b
+    if {$ok} {ict_match_token b}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance o
+    if {$ok} {ict_match_token o}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance l
+    if {$ok} {ict_match_token l}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DSTKOVER {} {
+    # DSTKOVER = (x (t s)
+    #               (t t)
+    #               (t a)
+    #               (t c)
+    #               (t k)
+    #               (t _)
+    #               (t o)
+    #               (t v)
+    #               (t e)
+    #               (t r)
+    #               (t f)
+    #               (t l)
+    #               (t o)
+    #               (t w)
+    #               (n SPACE))
+
+    if {[inc_restore DSTKOVER]} return
+
+    set pos [icl_get]
+
+    eseq71                ; # (x (t s)
+                            #    (t t)
+                            #    (t a)
+                            #    (t c)
+                            #    (t k)
+                            #    (t _)
+                            #    (t o)
+                            #    (t v)
+                            #    (t e)
+                            #    (t r)
+                            #    (t f)
+                            #    (t l)
+                            #    (t o)
+                            #    (t w)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DSTKOVER $pos
+    ier_nonterminal        DSTKOVER $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq71 {} {
+
+    # (x (t s)
+    #    (t t)
+    #    (t a)
+    #    (t c)
+    #    (t k)
+    #    (t _)
+    #    (t o)
+    #    (t v)
+    #    (t e)
+    #    (t r)
+    #    (t f)
+    #    (t l)
+    #    (t o)
+    #    (t w)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance s
+    if {$ok} {ict_match_token s}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance c
+    if {$ok} {ict_match_token c}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance k
+    if {$ok} {ict_match_token k}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance o
+    if {$ok} {ict_match_token o}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance v
+    if {$ok} {ict_match_token v}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance f
+    if {$ok} {ict_match_token f}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance l
+    if {$ok} {ict_match_token l}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance o
+    if {$ok} {ict_match_token o}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance w
+    if {$ok} {ict_match_token w}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DSTKSZ {} {
+    # DSTKSZ = (x (t s)
+    #             (t t)
+    #             (t a)
+    #             (t c)
+    #             (t k)
+    #             (t _)
+    #             (t s)
+    #             (t i)
+    #             (t z)
+    #             (t e)
+    #             (n SPACE))
+
+    if {[inc_restore DSTKSZ]} return
+
+    set pos [icl_get]
+
+    eseq72                ; # (x (t s)
+                            #    (t t)
+                            #    (t a)
+                            #    (t c)
+                            #    (t k)
+                            #    (t _)
+                            #    (t s)
+                            #    (t i)
+                            #    (t z)
+                            #    (t e)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DSTKSZ $pos
+    ier_nonterminal        DSTKSZ $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq72 {} {
+
+    # (x (t s)
+    #    (t t)
+    #    (t a)
+    #    (t c)
+    #    (t k)
+    #    (t _)
+    #    (t s)
+    #    (t i)
+    #    (t z)
+    #    (t e)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance s
+    if {$ok} {ict_match_token s}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance c
+    if {$ok} {ict_match_token c}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance k
+    if {$ok} {ict_match_token k}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance s
+    if {$ok} {ict_match_token s}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance i
+    if {$ok} {ict_match_token i}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance z
+    if {$ok} {ict_match_token z}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DSYNERR {} {
+    # DSYNERR = (x (t s)
+    #              (t y)
+    #              (t n)
+    #              (t t)
+    #              (t a)
+    #              (t x)
+    #              (t _)
+    #              (t e)
+    #              (t r)
+    #              (t r)
+    #              (t o)
+    #              (t r)
+    #              (n SPACE))
+
+    if {[inc_restore DSYNERR]} return
+
+    set pos [icl_get]
+
+    eseq74                ; # (x (t s)
+                            #    (t y)
+                            #    (t n)
+                            #    (t t)
+                            #    (t a)
+                            #    (t x)
+                            #    (t _)
+                            #    (t e)
+                            #    (t r)
+                            #    (t r)
+                            #    (t o)
+                            #    (t r)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DSYNERR $pos
+    ier_nonterminal        DSYNERR $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq74 {} {
+
+    # (x (t s)
+    #    (t y)
+    #    (t n)
+    #    (t t)
+    #    (t a)
+    #    (t x)
+    #    (t _)
+    #    (t e)
+    #    (t r)
+    #    (t r)
+    #    (t o)
+    #    (t r)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance s
+    if {$ok} {ict_match_token s}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance y
+    if {$ok} {ict_match_token y}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance n
+    if {$ok} {ict_match_token n}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance a
+    if {$ok} {ict_match_token a}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance x
+    if {$ok} {ict_match_token x}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance o
+    if {$ok} {ict_match_token o}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DTOKDEST {} {
+    # DTOKDEST = (x (t t)
+    #               (t o)
+    #               (t k)
+    #               (t e)
+    #               (t n)
+    #               (t _)
+    #               (t d)
+    #               (t e)
+    #               (t s)
+    #               (t t)
+    #               (t r)
+    #               (t u)
+    #               (t c)
+    #               (t t)
+    #               (t o)
+    #               (t r)
+    #               (n SPACE))
+
+    if {[inc_restore DTOKDEST]} return
+
+    set pos [icl_get]
+
+    eseq75                ; # (x (t t)
+                            #    (t o)
+                            #    (t k)
+                            #    (t e)
+                            #    (t n)
+                            #    (t _)
+                            #    (t d)
+                            #    (t e)
+                            #    (t s)
+                            #    (t t)
+                            #    (t r)
+                            #    (t u)
+                            #    (t c)
+                            #    (t t)
+                            #    (t o)
+                            #    (t r)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DTOKDEST $pos
+    ier_nonterminal        DTOKDEST $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq75 {} {
+
+    # (x (t t)
+    #    (t o)
+    #    (t k)
+    #    (t e)
+    #    (t n)
+    #    (t _)
+    #    (t d)
+    #    (t e)
+    #    (t s)
+    #    (t t)
+    #    (t r)
+    #    (t u)
+    #    (t c)
+    #    (t t)
+    #    (t o)
+    #    (t r)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance o
+    if {$ok} {ict_match_token o}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance k
+    if {$ok} {ict_match_token k}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance n
+    if {$ok} {ict_match_token n}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance d
+    if {$ok} {ict_match_token d}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance s
+    if {$ok} {ict_match_token s}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance u
+    if {$ok} {ict_match_token u}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance c
+    if {$ok} {ict_match_token c}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance o
+    if {$ok} {ict_match_token o}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DTOKPFX {} {
+    # DTOKPFX = (x (t t)
+    #              (t o)
+    #              (t k)
+    #              (t e)
+    #              (t n)
+    #              (t _)
+    #              (t p)
+    #              (t r)
+    #              (t e)
+    #              (t f)
+    #              (t i)
+    #              (t x)
+    #              (n SPACE))
+
+    if {[inc_restore DTOKPFX]} return
+
+    set pos [icl_get]
+
+    eseq76                ; # (x (t t)
+                            #    (t o)
+                            #    (t k)
+                            #    (t e)
+                            #    (t n)
+                            #    (t _)
+                            #    (t p)
+                            #    (t r)
+                            #    (t e)
+                            #    (t f)
+                            #    (t i)
+                            #    (t x)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DTOKPFX $pos
+    ier_nonterminal        DTOKPFX $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq76 {} {
+
+    # (x (t t)
+    #    (t o)
+    #    (t k)
+    #    (t e)
+    #    (t n)
+    #    (t _)
+    #    (t p)
+    #    (t r)
+    #    (t e)
+    #    (t f)
+    #    (t i)
+    #    (t x)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance o
+    if {$ok} {ict_match_token o}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance k
+    if {$ok} {ict_match_token k}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance n
+    if {$ok} {ict_match_token n}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance p
+    if {$ok} {ict_match_token p}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance r
+    if {$ok} {ict_match_token r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance f
+    if {$ok} {ict_match_token f}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance i
+    if {$ok} {ict_match_token i}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance x
+    if {$ok} {ict_match_token x}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DTOKTYPE {} {
+    # DTOKTYPE = (x (t t)
+    #               (t o)
+    #               (t k)
+    #               (t e)
+    #               (t n)
+    #               (t _)
+    #               (t t)
+    #               (t y)
+    #               (t p)
+    #               (t e)
+    #               (n SPACE))
+
+    if {[inc_restore DTOKTYPE]} return
+
+    set pos [icl_get]
+
+    eseq77                ; # (x (t t)
+                            #    (t o)
+                            #    (t k)
+                            #    (t e)
+                            #    (t n)
+                            #    (t _)
+                            #    (t t)
+                            #    (t y)
+                            #    (t p)
+                            #    (t e)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DTOKTYPE $pos
+    ier_nonterminal        DTOKTYPE $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq77 {} {
+
+    # (x (t t)
+    #    (t o)
+    #    (t k)
+    #    (t e)
+    #    (t n)
+    #    (t _)
+    #    (t t)
+    #    (t y)
+    #    (t p)
+    #    (t e)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance o
+    if {$ok} {ict_match_token o}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance k
+    if {$ok} {ict_match_token k}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance n
+    if {$ok} {ict_match_token n}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance y
+    if {$ok} {ict_match_token y}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance p
+    if {$ok} {ict_match_token p}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_DTYPE {} {
+    # DTYPE = (x (t t)
+    #            (t y)
+    #            (t p)
+    #            (t e)
+    #            (n SPACE))
+
+    if {[inc_restore DTYPE]} return
+
+    set pos [icl_get]
+
+    eseq78                ; # (x (t t)
+                            #    (t y)
+                            #    (t p)
+                            #    (t e)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               DTYPE $pos
+    ier_nonterminal        DTYPE $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq78 {} {
+
+    # (x (t t)
+    #    (t y)
+    #    (t p)
+    #    (t e)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance t
+    if {$ok} {ict_match_token t}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance y
+    if {$ok} {ict_match_token y}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance p
+    if {$ok} {ict_match_token p}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance e
+    if {$ok} {ict_match_token e}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Endif {} {
+    # Endif = (n DENDIF)
+
+    if {[inc_restore Endif]} return
+
+    set pos [icl_get]
+
+    matchSymbol_DENDIF    ; # (n DENDIF)
+
+    isv_clear
+    inc_save               Endif $pos
+    ier_nonterminal        Endif $pos
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_EOF {} {
+    # EOF = (! (dot))
+
+    if {[inc_restore EOF]} return
+
+    set pos [icl_get]
+
+    ebang99
+
+    isv_clear
+    inc_save               EOF $pos
+    ier_nonterminal        EOF $pos
+    return
+}
+
+proc ::page::parse::lemon::ebang99 {} {
+    set pos [icl_get]
+
+    ict_advance "any character"
+
+    icl_rewind $pos
+    iok_negate
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_EOL {} {
+    # EOL = (/ (x (t \r)
+    #             (t \n))
+    #          (t \r)
+    #          (t \n))
+
+    if {[inc_restore EOL]} return
+
+    set pos [icl_get]
+
+    ebra98                ; # (/ (x (t \r)
+                            #       (t \n))
+                            #    (t \r)
+                            #    (t \n))
+
+    isv_clear
+    inc_save               EOL $pos
+    ier_nonterminal        EOL $pos
+    return
+}
+
+proc ::page::parse::lemon::ebra98 {} {
+
+    # (/ (x (t \r)
+    #       (t \n))
+    #    (t \r)
+    #    (t \n))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    eseq97                ; # (x (t \r)
+                            #    (t \n))
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance \\r
+    if {$ok} {ict_match_token \r}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance \\n
+    if {$ok} {ict_match_token \n}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::lemon::eseq97 {} {
+
+    # (x (t \r)
+    #    (t \n))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance \\r
+    if {$ok} {ict_match_token \r}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance \\n
+    if {$ok} {ict_match_token \n}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_ExtraArgument {} {
+    # ExtraArgument = (x (n DEXTRA)
+    #                    (n Codeblock))
+
+    variable ok
+    if {[inc_restore ExtraArgument]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq20                ; # (x (n DEXTRA)
+                            #    (n Codeblock))
+
+    isv_nonterminal_reduce ExtraArgument $pos $mrk
+    inc_save               ExtraArgument $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        ExtraArgument $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq20 {} {
+
+    # (x (n DEXTRA)
+    #    (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DEXTRA    ; # (n DEXTRA)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Fallback {} {
+    # Fallback = (x (n DFALLBK)
+    #               (+ (n Identifier))
+    #               (n DOT))
+
+    variable ok
+    if {[inc_restore Fallback]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq40                ; # (x (n DFALLBK)
+                            #    (+ (n Identifier))
+                            #    (n DOT))
+
+    isv_nonterminal_reduce Fallback $pos $mrk
+    inc_save               Fallback $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Fallback $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq40 {} {
+
+    # (x (n DFALLBK)
+    #    (+ (n Identifier))
+    #    (n DOT))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DFALLBK    ; # (n DFALLBK)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    epkleene39                ; # (+ (n Identifier))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_DOT    ; # (n DOT)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::epkleene39 {} {
+
+    # (+ (n Identifier))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        icl_rewind $pos
+        return
+    }
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        matchSymbol_Identifier    ; # (n Identifier)
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Ident {} {
+    # Ident = (x (/ (alpha)
+    #               (t _))
+    #            (* (/ (alnum)
+    #                  (t _))))
+
+    variable ok
+    if {[inc_restore Ident]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq50                ; # (x (/ (alpha)
+                            #       (t _))
+                            #    (* (/ (alnum)
+                            #          (t _))))
+
+    isv_nonterminal_range  Ident $pos
+    inc_save               Ident $pos
+    if {$ok} ias_push
+    ier_nonterminal        Ident $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq50 {} {
+
+    # (x (/ (alpha)
+    #       (t _))
+    #    (* (/ (alnum)
+    #          (t _))))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ebra47                ; # (/ (alpha)
+                            #    (t _))
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ekleene49                ; # (* (/ (alnum)
+                               #       (t _)))
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::ebra47 {} {
+
+    # (/ (alpha)
+    #    (t _))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance alpha
+    if {$ok} {ict_match_tokclass alpha}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::lemon::ekleene49 {} {
+
+    # (* (/ (alnum)
+    #       (t _)))
+
+    variable ok
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        ebra48                ; # (/ (alnum)
+                                #    (t _))
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::ebra48 {} {
+
+    # (/ (alnum)
+    #    (t _))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance alnum
+    if {$ok} {ict_match_tokclass alnum}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance _
+    if {$ok} {ict_match_token _}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Identifier {} {
+    # Identifier = (x (n Ident)
+    #                 (n SPACE))
+
+    variable ok
+    if {[inc_restore Identifier]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq46                ; # (x (n Ident)
+                            #    (n SPACE))
+
+    isv_nonterminal_reduce Identifier $pos $mrk
+    inc_save               Identifier $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Identifier $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq46 {} {
+
+    # (x (n Ident)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Ident    ; # (n Ident)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Ifdef {} {
+    # Ifdef = (x (n DIFDEF)
+    #            (n Identifier))
+
+    if {[inc_restore Ifdef]} return
+
+    set pos [icl_get]
+
+    eseq83                ; # (x (n DIFDEF)
+                            #    (n Identifier))
+
+    isv_clear
+    inc_save               Ifdef $pos
+    ier_nonterminal        Ifdef $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq83 {} {
+
+    # (x (n DIFDEF)
+    #    (n Identifier))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DIFDEF    ; # (n DIFDEF)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    set pIdentifier [ias_mark]
+    matchSymbol_Identifier
+    ias_pop2mark $pIdentifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Ifndef {} {
+    # Ifndef = (x (n DIFNDEF)
+    #             (n Identifier))
+
+    if {[inc_restore Ifndef]} return
+
+    set pos [icl_get]
+
+    eseq84                ; # (x (n DIFNDEF)
+                            #    (n Identifier))
+
+    isv_clear
+    inc_save               Ifndef $pos
+    ier_nonterminal        Ifndef $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq84 {} {
+
+    # (x (n DIFNDEF)
+    #    (n Identifier))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DIFNDEF    ; # (n DIFNDEF)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    set pIdentifier [ias_mark]
+    matchSymbol_Identifier
+    ias_pop2mark $pIdentifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Include {} {
+    # Include = (x (n DINCL)
+    #              (n Codeblock))
+
+    variable ok
+    if {[inc_restore Include]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq21                ; # (x (n DINCL)
+                            #    (n Codeblock))
+
+    isv_nonterminal_reduce Include $pos $mrk
+    inc_save               Include $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Include $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq21 {} {
+
+    # (x (n DINCL)
+    #    (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DINCL    ; # (n DINCL)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Label {} {
+    # Label = (x (n LPAREN)
+    #            (n Identifier)
+    #            (n RPAREN))
+
+    variable ok
+    if {[inc_restore Label]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq12                ; # (x (n LPAREN)
+                            #    (n Identifier)
+                            #    (n RPAREN))
+
+    isv_nonterminal_reduce Label $pos $mrk
+    inc_save               Label $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Label $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq12 {} {
+
+    # (x (n LPAREN)
+    #    (n Identifier)
+    #    (n RPAREN))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_LPAREN    ; # (n LPAREN)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_RPAREN    ; # (n RPAREN)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_LBRACE {} {
+    # LBRACE = (t \{)
+
+    variable ok
+    if {[inc_restore LBRACE]} return
+
+    set pos [icl_get]
+
+    ict_advance \{
+    if {$ok} {ict_match_token \173}
+
+    isv_clear
+    inc_save               LBRACE $pos
+    ier_nonterminal        LBRACE $pos
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_LBRACKET {} {
+    # LBRACKET = (x (t [)
+    #               (n SPACE))
+
+    if {[inc_restore LBRACKET]} return
+
+    set pos [icl_get]
+
+    eseq57                ; # (x (t [)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               LBRACKET $pos
+    ier_nonterminal        LBRACKET $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq57 {} {
+
+    # (x (t [)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance \[
+    if {$ok} {ict_match_token \133}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Left {} {
+    # Left = (x (n DLEFT)
+    #           (+ (n Identifier))
+    #           (n DOT))
+
+    variable ok
+    if {[inc_restore Left]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq23                ; # (x (n DLEFT)
+                            #    (+ (n Identifier))
+                            #    (n DOT))
+
+    isv_nonterminal_reduce Left $pos $mrk
+    inc_save               Left $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Left $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq23 {} {
+
+    # (x (n DLEFT)
+    #    (+ (n Identifier))
+    #    (n DOT))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DLEFT    ; # (n DLEFT)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    epkleene22                ; # (+ (n Identifier))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_DOT    ; # (n DOT)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::epkleene22 {} {
+
+    # (+ (n Identifier))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        icl_rewind $pos
+        return
+    }
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        matchSymbol_Identifier    ; # (n Identifier)
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_LemonGrammar {} {
+    # LemonGrammar = (x (n SPACE)
+    #                   (+ (n Statement))
+    #                   (n EOF))
+
+    variable ok
+    if {[inc_restore LemonGrammar]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq2                ; # (x (n SPACE)
+                           #    (+ (n Statement))
+                           #    (n EOF))
+
+    isv_nonterminal_reduce LemonGrammar $pos $mrk
+    inc_save               LemonGrammar $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        LemonGrammar $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq2 {} {
+
+    # (x (n SPACE)
+    #    (+ (n Statement))
+    #    (n EOF))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    epkleene1                ; # (+ (n Statement))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_EOF    ; # (n EOF)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::epkleene1 {} {
+
+    # (+ (n Statement))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_Statement    ; # (n Statement)
+    ier_merge $old
+
+    if {!$ok} {
+        icl_rewind $pos
+        return
+    }
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        matchSymbol_Statement    ; # (n Statement)
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_LPAREN {} {
+    # LPAREN = (x (t \()
+    #             (n SPACE))
+
+    if {[inc_restore LPAREN]} return
+
+    set pos [icl_get]
+
+    eseq55                ; # (x (t \()
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               LPAREN $pos
+    ier_nonterminal        LPAREN $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq55 {} {
+
+    # (x (t \()
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance \(
+    if {$ok} {ict_match_token \50}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Name {} {
+    # Name = (x (n DNAME)
+    #           (n Identifier))
+
+    variable ok
+    if {[inc_restore Name]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq24                ; # (x (n DNAME)
+                            #    (n Identifier))
+
+    isv_nonterminal_reduce Name $pos $mrk
+    inc_save               Name $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Name $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq24 {} {
+
+    # (x (n DNAME)
+    #    (n Identifier))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DNAME    ; # (n DNAME)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_NatNum {} {
+    # NatNum = (+ (.. 0 9))
+
+    variable ok
+    if {[inc_restore NatNum]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    epkleene52                ; # (+ (.. 0 9))
+
+    isv_nonterminal_range  NatNum $pos
+    inc_save               NatNum $pos
+    if {$ok} ias_push
+    ier_nonterminal        NatNum $pos
+    return
+}
+
+proc ::page::parse::lemon::epkleene52 {} {
+
+    # (+ (.. 0 9))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "any in 0..9"
+    if {$ok} {ict_match_tokrange 0 9}
+    ier_merge $old
+
+    if {!$ok} {
+        icl_rewind $pos
+        return
+    }
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        ict_advance "any in 0..9"
+        if {$ok} {ict_match_tokrange 0 9}
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_NaturalNumber {} {
+    # NaturalNumber = (x (n NatNum)
+    #                    (n SPACE))
+
+    variable ok
+    if {[inc_restore NaturalNumber]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq51                ; # (x (n NatNum)
+                            #    (n SPACE))
+
+    isv_nonterminal_reduce NaturalNumber $pos $mrk
+    inc_save               NaturalNumber $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        NaturalNumber $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq51 {} {
+
+    # (x (n NatNum)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_NatNum    ; # (n NatNum)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Nonassoc {} {
+    # Nonassoc = (x (n DNON)
+    #               (+ (n Identifier))
+    #               (n DOT))
+
+    variable ok
+    if {[inc_restore Nonassoc]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq26                ; # (x (n DNON)
+                            #    (+ (n Identifier))
+                            #    (n DOT))
+
+    isv_nonterminal_reduce Nonassoc $pos $mrk
+    inc_save               Nonassoc $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Nonassoc $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq26 {} {
+
+    # (x (n DNON)
+    #    (+ (n Identifier))
+    #    (n DOT))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DNON    ; # (n DNON)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    epkleene25                ; # (+ (n Identifier))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_DOT    ; # (n DOT)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::epkleene25 {} {
+
+    # (+ (n Identifier))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        icl_rewind $pos
+        return
+    }
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        matchSymbol_Identifier    ; # (n Identifier)
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_ParseAccept {} {
+    # ParseAccept = (x (n DPACC)
+    #                  (n Codeblock))
+
+    variable ok
+    if {[inc_restore ParseAccept]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq27                ; # (x (n DPACC)
+                            #    (n Codeblock))
+
+    isv_nonterminal_reduce ParseAccept $pos $mrk
+    inc_save               ParseAccept $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        ParseAccept $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq27 {} {
+
+    # (x (n DPACC)
+    #    (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DPACC    ; # (n DPACC)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_ParseFailure {} {
+    # ParseFailure = (x (n DPFAIL)
+    #                   (n Codeblock))
+
+    variable ok
+    if {[inc_restore ParseFailure]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq28                ; # (x (n DPFAIL)
+                            #    (n Codeblock))
+
+    isv_nonterminal_reduce ParseFailure $pos $mrk
+    inc_save               ParseFailure $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        ParseFailure $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq28 {} {
+
+    # (x (n DPFAIL)
+    #    (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DPFAIL    ; # (n DPFAIL)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Precedence {} {
+    # Precedence = (x (n LBRACKET)
+    #                 (n Identifier)
+    #                 (n RBRACKET))
+
+    variable ok
+    if {[inc_restore Precedence]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq13                ; # (x (n LBRACKET)
+                            #    (n Identifier)
+                            #    (n RBRACKET))
+
+    isv_nonterminal_reduce Precedence $pos $mrk
+    inc_save               Precedence $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Precedence $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq13 {} {
+
+    # (x (n LBRACKET)
+    #    (n Identifier)
+    #    (n RBRACKET))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_LBRACKET    ; # (n LBRACKET)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_RBRACKET    ; # (n RBRACKET)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_RBRACE {} {
+    # RBRACE = (t \})
+
+    variable ok
+    if {[inc_restore RBRACE]} return
+
+    set pos [icl_get]
+
+    ict_advance \}
+    if {$ok} {ict_match_token \175}
+
+    isv_clear
+    inc_save               RBRACE $pos
+    ier_nonterminal        RBRACE $pos
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_RBRACKET {} {
+    # RBRACKET = (x (t ])
+    #               (n SPACE))
+
+    if {[inc_restore RBRACKET]} return
+
+    set pos [icl_get]
+
+    eseq58                ; # (x (t ])
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               RBRACKET $pos
+    ier_nonterminal        RBRACKET $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq58 {} {
+
+    # (x (t ])
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance \]
+    if {$ok} {ict_match_token \135}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Right {} {
+    # Right = (x (n DRIGHT)
+    #            (+ (n Identifier))
+    #            (n DOT))
+
+    variable ok
+    if {[inc_restore Right]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq30                ; # (x (n DRIGHT)
+                            #    (+ (n Identifier))
+                            #    (n DOT))
+
+    isv_nonterminal_reduce Right $pos $mrk
+    inc_save               Right $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Right $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq30 {} {
+
+    # (x (n DRIGHT)
+    #    (+ (n Identifier))
+    #    (n DOT))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DRIGHT    ; # (n DRIGHT)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    epkleene29                ; # (+ (n Identifier))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_DOT    ; # (n DOT)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::epkleene29 {} {
+
+    # (+ (n Identifier))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        icl_rewind $pos
+        return
+    }
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        matchSymbol_Identifier    ; # (n Identifier)
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_RPAREN {} {
+    # RPAREN = (x (t \))
+    #             (n SPACE))
+
+    if {[inc_restore RPAREN]} return
+
+    set pos [icl_get]
+
+    eseq56                ; # (x (t \))
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               RPAREN $pos
+    ier_nonterminal        RPAREN $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq56 {} {
+
+    # (x (t \))
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance \)
+    if {$ok} {ict_match_token \51}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Rule {} {
+    # Rule = (x (n Identifier)
+    #           (? (n Label))
+    #           (n ASSIGN)
+    #           (n Definition)
+    #           (n DOT)
+    #           (? (n Precedence))
+    #           (? (n Codeblock)))
+
+    variable ok
+    if {[inc_restore Rule]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq8                ; # (x (n Identifier)
+                           #    (? (n Label))
+                           #    (n ASSIGN)
+                           #    (n Definition)
+                           #    (n DOT)
+                           #    (? (n Precedence))
+                           #    (? (n Codeblock)))
+
+    isv_nonterminal_reduce Rule $pos $mrk
+    inc_save               Rule $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Rule $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq8 {} {
+
+    # (x (n Identifier)
+    #    (? (n Label))
+    #    (n ASSIGN)
+    #    (n Definition)
+    #    (n DOT)
+    #    (? (n Precedence))
+    #    (? (n Codeblock)))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    eopt5                ; # (? (n Label))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_ASSIGN    ; # (n ASSIGN)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_Definition    ; # (n Definition)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_DOT    ; # (n DOT)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    eopt6                ; # (? (n Precedence))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    eopt7                ; # (? (n Codeblock))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::eopt5 {} {
+
+    # (? (n Label))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_Label    ; # (n Label)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::eopt6 {} {
+
+    # (? (n Precedence))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_Precedence    ; # (n Precedence)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::eopt7 {} {
+
+    # (? (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_SPACE {} {
+    # SPACE = (* (/ (t <blank>)
+    #               (t \t)
+    #               (t \n)
+    #               (t \r)
+    #               (n C_COMMENT)
+    #               (n Cplusplus_COMMENT)
+    #               (n Ifndef)
+    #               (n Ifdef)
+    #               (n Endif)))
+
+    if {[inc_restore SPACE]} return
+
+    set pos [icl_get]
+
+    ekleene86                ; # (* (/ (t <blank>)
+                               #       (t \t)
+                               #       (t \n)
+                               #       (t \r)
+                               #       (n C_COMMENT)
+                               #       (n Cplusplus_COMMENT)
+                               #       (n Ifndef)
+                               #       (n Ifdef)
+                               #       (n Endif)))
+
+    isv_clear
+    inc_save               SPACE $pos
+    ier_nonterminal        SPACE $pos
+    return
+}
+
+proc ::page::parse::lemon::ekleene86 {} {
+
+    # (* (/ (t <blank>)
+    #       (t \t)
+    #       (t \n)
+    #       (t \r)
+    #       (n C_COMMENT)
+    #       (n Cplusplus_COMMENT)
+    #       (n Ifndef)
+    #       (n Ifdef)
+    #       (n Endif)))
+
+    variable ok
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        ebra85                ; # (/ (t <blank>)
+                                #    (t \t)
+                                #    (t \n)
+                                #    (t \r)
+                                #    (n C_COMMENT)
+                                #    (n Cplusplus_COMMENT)
+                                #    (n Ifndef)
+                                #    (n Ifdef)
+                                #    (n Endif))
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::lemon::ebra85 {} {
+
+    # (/ (t <blank>)
+    #    (t \t)
+    #    (t \n)
+    #    (t \r)
+    #    (n C_COMMENT)
+    #    (n Cplusplus_COMMENT)
+    #    (n Ifndef)
+    #    (n Ifdef)
+    #    (n Endif))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance <blank>
+    if {$ok} {ict_match_token \40}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance \\t
+    if {$ok} {ict_match_token \t}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance \\n
+    if {$ok} {ict_match_token \n}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance \\r
+    if {$ok} {ict_match_token \r}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    matchSymbol_C_COMMENT    ; # (n C_COMMENT)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    matchSymbol_Cplusplus_COMMENT    ; # (n Cplusplus_COMMENT)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    matchSymbol_Ifndef    ; # (n Ifndef)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    matchSymbol_Ifdef    ; # (n Ifdef)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    matchSymbol_Endif    ; # (n Endif)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_StackOverflow {} {
+    # StackOverflow = (x (n DSTKOVER)
+    #                    (n Codeblock))
+
+    variable ok
+    if {[inc_restore StackOverflow]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq31                ; # (x (n DSTKOVER)
+                            #    (n Codeblock))
+
+    isv_nonterminal_reduce StackOverflow $pos $mrk
+    inc_save               StackOverflow $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        StackOverflow $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq31 {} {
+
+    # (x (n DSTKOVER)
+    #    (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DSTKOVER    ; # (n DSTKOVER)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Stacksize {} {
+    # Stacksize = (x (n DSTKSZ)
+    #                (n NaturalNumber))
+
+    variable ok
+    if {[inc_restore Stacksize]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq32                ; # (x (n DSTKSZ)
+                            #    (n NaturalNumber))
+
+    isv_nonterminal_reduce Stacksize $pos $mrk
+    inc_save               Stacksize $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Stacksize $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq32 {} {
+
+    # (x (n DSTKSZ)
+    #    (n NaturalNumber))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DSTKSZ    ; # (n DSTKSZ)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_NaturalNumber    ; # (n NaturalNumber)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_StartSymbol {} {
+    # StartSymbol = (x (n DSTART)
+    #                  (n Identifier))
+
+    variable ok
+    if {[inc_restore StartSymbol]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq33                ; # (x (n DSTART)
+                            #    (n Identifier))
+
+    isv_nonterminal_reduce StartSymbol $pos $mrk
+    inc_save               StartSymbol $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        StartSymbol $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq33 {} {
+
+    # (x (n DSTART)
+    #    (n Identifier))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DSTART    ; # (n DSTART)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Statement {} {
+    # Statement = (x (/ (n Directive)
+    #                   (n Rule))
+    #                (n SPACE))
+
+    variable ok
+    if {[inc_restore Statement]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq4                ; # (x (/ (n Directive)
+                           #       (n Rule))
+                           #    (n SPACE))
+
+    isv_nonterminal_reduce Statement $pos $mrk
+    inc_save               Statement $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Statement $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq4 {} {
+
+    # (x (/ (n Directive)
+    #       (n Rule))
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    ebra3                ; # (/ (n Directive)
+                           #    (n Rule))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::ebra3 {} {
+
+    # (/ (n Directive)
+    #    (n Rule))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Directive    ; # (n Directive)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Rule    ; # (n Rule)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_SyntaxError {} {
+    # SyntaxError = (x (n DSYNERR)
+    #                  (n Codeblock))
+
+    variable ok
+    if {[inc_restore SyntaxError]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq34                ; # (x (n DSYNERR)
+                            #    (n Codeblock))
+
+    isv_nonterminal_reduce SyntaxError $pos $mrk
+    inc_save               SyntaxError $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        SyntaxError $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq34 {} {
+
+    # (x (n DSYNERR)
+    #    (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DSYNERR    ; # (n DSYNERR)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_TokenDestructor {} {
+    # TokenDestructor = (x (n DTOKDEST)
+    #                      (n Identifier)
+    #                      (n Codeblock))
+
+    variable ok
+    if {[inc_restore TokenDestructor]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq35                ; # (x (n DTOKDEST)
+                            #    (n Identifier)
+                            #    (n Codeblock))
+
+    isv_nonterminal_reduce TokenDestructor $pos $mrk
+    inc_save               TokenDestructor $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        TokenDestructor $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq35 {} {
+
+    # (x (n DTOKDEST)
+    #    (n Identifier)
+    #    (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DTOKDEST    ; # (n DTOKDEST)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_TokenPrefix {} {
+    # TokenPrefix = (x (n DTOKPFX)
+    #                  (n Identifier))
+
+    variable ok
+    if {[inc_restore TokenPrefix]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq36                ; # (x (n DTOKPFX)
+                            #    (n Identifier))
+
+    isv_nonterminal_reduce TokenPrefix $pos $mrk
+    inc_save               TokenPrefix $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        TokenPrefix $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq36 {} {
+
+    # (x (n DTOKPFX)
+    #    (n Identifier))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DTOKPFX    ; # (n DTOKPFX)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_TokenType {} {
+    # TokenType = (x (n DTOKTYPE)
+    #                (n Codeblock))
+
+    variable ok
+    if {[inc_restore TokenType]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq37                ; # (x (n DTOKTYPE)
+                            #    (n Codeblock))
+
+    isv_nonterminal_reduce TokenType $pos $mrk
+    inc_save               TokenType $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        TokenType $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq37 {} {
+
+    # (x (n DTOKTYPE)
+    #    (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DTOKTYPE    ; # (n DTOKTYPE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::lemon::matchSymbol_Type {} {
+    # Type = (x (n DTYPE)
+    #           (n Identifier)
+    #           (n Codeblock))
+
+    variable ok
+    if {[inc_restore Type]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq38                ; # (x (n DTYPE)
+                            #    (n Identifier)
+                            #    (n Codeblock))
+
+    isv_nonterminal_reduce Type $pos $mrk
+    inc_save               Type $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        Type $pos
+    return
+}
+
+proc ::page::parse::lemon::eseq38 {} {
+
+    # (x (n DTYPE)
+    #    (n Identifier)
+    #    (n Codeblock))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DTYPE    ; # (n DTYPE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_Codeblock    ; # (n Codeblock)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide page::parse::lemon 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/parse_peg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/parse_peg.tcl
new file mode 100644
index 00000000..13f72651
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/parse_peg.tcl
@@ -0,0 +1,4415 @@
+# -*- tcl -*-
+## Parsing Expression Grammar 'pg::peg::grammar'.
+## Recursive Descent Packrat parser generated
+## by the PAGE writer plugin 'me'.
+## (C) 2005 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# ### ### ### ######### ######### #########
+## Package description
+
+# The commands provided here match an input provided through a buffer
+# command to the PE grammar 'pg::peg::grammar'. The parser is based on the package
+# 'grammar::me::tcl' (recursive-descent, packrat, pulling chars,
+# pushing the generated AST).
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require grammar::me::tcl
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+namespace eval ::page::parse::peg {
+    # Import the virtual machine for matching.
+
+    namespace import ::grammar::me::tcl::*
+    upvar #0 ::grammar::me::tcl::ok ok
+}
+
+# ### ### ### ######### ######### #########
+## API Implementation.
+
+proc ::page::parse::peg::parse {nxcmd emvar astvar} {
+    variable ok
+    variable se
+
+    upvar 1 $emvar emsg $astvar ast
+
+    init $nxcmd
+
+    matchSymbol_Grammar    ; # (n Grammar)
+
+    isv_nonterminal_reduce ALL -1
+    set ast [sv]
+    if {!$ok} {
+        foreach {l m} [ier_get] break
+        lappend l [lc $l]
+        set emsg [list $l $m]
+    }
+
+    return $ok
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper methods
+
+# Grammar 'pg::peg::grammar'
+#
+# ALNUM = (x (t <)
+#            (t a)
+#            (t l)
+#            (t n)
+#            (t u)
+#            (t m)
+#            (t >)
+#            (n SPACE))
+#
+# ALPHA = (x (t <)
+#            (t a)
+#            (t l)
+#            (t p)
+#            (t h)
+#            (t a)
+#            (t >)
+#            (n SPACE))
+#
+# AND = (x (t &)
+#          (n SPACE))
+#
+# APOSTROPH = (t ')
+#
+# Attribute = (x (/ (n VOID)
+#                   (n LEAF)
+#                   (n MATCH))
+#                (n COLON))
+#
+# Char = (/ (n CharSpecial)
+#           (n CharOctalFull)
+#           (n CharOctalPart)
+#           (n CharUnicode)
+#           (n CharUnescaped))
+#
+# CharOctalFull = (x (t \)
+#                    (.. 0 2)
+#                    (.. 0 7)
+#                    (.. 0 7))
+#
+# CharOctalPart = (x (t \)
+#                    (.. 0 7)
+#                    (? (.. 0 7)))
+#
+# CharSpecial = (x (t \)
+#                  (/ (t n)
+#                     (t r)
+#                     (t t)
+#                     (t ')
+#                     (t \")
+#                     (t [)
+#                     (t ])
+#                     (t \)))
+#
+# CharUnescaped = (x (! (t \))
+#                    (dot))
+#
+# CharUnicode = (x (t \)
+#                  (t u)
+#                  (n HexDigit)
+#                  (? (x (n HexDigit)
+#                        (? (x (n HexDigit)
+#                              (? (n HexDigit)))))))
+#
+# Class = (x (n OPENB)
+#            (* (x (! (n CLOSEB))
+#                  (n Range)))
+#            (n CLOSEB)
+#            (n SPACE))
+#
+# CLOSE = (x (t \))
+#            (n SPACE))
+#
+# CLOSEB = (t ])
+#
+# COLON = (x (t :)
+#            (n SPACE))
+#
+# COMMENT = (x (t #)
+#              (* (x (! (n EOL))
+#                    (dot)))
+#              (n EOL))
+#
+# DAPOSTROPH = (t \")
+#
+# Definition = (x (? (n Attribute))
+#                 (n Identifier)
+#                 (n IS)
+#                 (n Expression)
+#                 (n SEMICOLON))
+#
+# DOT = (x (t .)
+#          (n SPACE))
+#
+# END = (x (t E)
+#          (t N)
+#          (t D)
+#          (n SPACE))
+#
+# EOF = (! (dot))
+#
+# EOL = (/ (x (t \n)
+#             (t \r))
+#          (t \n)
+#          (t \r))
+#
+# Expression = (x (n Sequence)
+#                 (* (x (n SLASH)
+#                       (n Sequence))))
+#
+# Final = (x (n END)
+#            (n SEMICOLON)
+#            (n SPACE))
+#
+# Grammar = (x (n SPACE)
+#              (n Header)
+#              (+ (n Definition))
+#              (n Final)
+#              (n EOF))
+#
+# Header = (x (n PEG)
+#             (n Identifier)
+#             (n StartExpr))
+#
+# HexDigit = (/ (.. 0 9)
+#               (.. a f)
+#               (.. A F))
+#
+# Ident = (x (/ (t _)
+#               (t :)
+#               (alpha))
+#            (* (/ (t _)
+#                  (t :)
+#                  (alnum))))
+#
+# Identifier = (x (n Ident)
+#                 (n SPACE))
+#
+# IS = (x (t <)
+#         (t -)
+#         (n SPACE))
+#
+# LEAF = (x (t l)
+#           (t e)
+#           (t a)
+#           (t f)
+#           (n SPACE))
+#
+# Literal = (/ (x (n APOSTROPH)
+#                 (* (x (! (n APOSTROPH))
+#                       (n Char)))
+#                 (n APOSTROPH)
+#                 (n SPACE))
+#              (x (n DAPOSTROPH)
+#                 (* (x (! (n DAPOSTROPH))
+#                       (n Char)))
+#                 (n DAPOSTROPH)
+#                 (n SPACE)))
+#
+# MATCH = (x (t m)
+#            (t a)
+#            (t t)
+#            (t c)
+#            (t h)
+#            (n SPACE))
+#
+# NOT = (x (t !)
+#          (n SPACE))
+#
+# OPEN = (x (t \()
+#           (n SPACE))
+#
+# OPENB = (t [)
+#
+# PEG = (x (t P)
+#          (t E)
+#          (t G)
+#          (n SPACE))
+#
+# PLUS = (x (t +)
+#           (n SPACE))
+#
+# Prefix = (x (? (/ (n AND)
+#                   (n NOT)))
+#             (n Suffix))
+#
+# Primary = (/ (n ALNUM)
+#              (n ALPHA)
+#              (n Identifier)
+#              (x (n OPEN)
+#                 (n Expression)
+#                 (n CLOSE))
+#              (n Literal)
+#              (n Class)
+#              (n DOT))
+#
+# QUESTION = (x (t ?)
+#               (n SPACE))
+#
+# Range = (/ (x (n Char)
+#               (n TO)
+#               (n Char))
+#            (n Char))
+#
+# SEMICOLON = (x (t ;)
+#                (n SPACE))
+#
+# Sequence = (+ (n Prefix))
+#
+# SLASH = (x (t /)
+#            (n SPACE))
+#
+# SPACE = (* (/ (t <blank>)
+#               (t \t)
+#               (n EOL)
+#               (n COMMENT)))
+#
+# STAR = (x (t *)
+#           (n SPACE))
+#
+# StartExpr = (x (n OPEN)
+#                (n Expression)
+#                (n CLOSE))
+#
+# Suffix = (x (n Primary)
+#             (? (/ (n QUESTION)
+#                   (n STAR)
+#                   (n PLUS))))
+#
+# TO = (t -)
+#
+# VOID = (x (t v)
+#           (t o)
+#           (t i)
+#           (t d)
+#           (n SPACE))
+#
+
+proc ::page::parse::peg::matchSymbol_ALNUM {} {
+    # ALNUM = (x (t <)
+    #            (t a)
+    #            (t l)
+    #            (t n)
+    #            (t u)
+    #            (t m)
+    #            (t >)
+    #            (n SPACE))
+
+    variable ok
+    if {[inc_restore ALNUM]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq75                ; # (x (t <)
+                            #    (t a)
+                            #    (t l)
+                            #    (t n)
+                            #    (t u)
+                            #    (t m)
+                            #    (t >)
+                            #    (n SPACE))
+
+    isv_nonterminal_leaf   ALNUM $pos
+    inc_save               ALNUM $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected ALNUM" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq75 {} {
+
+    # (x (t <)
+    #    (t a)
+    #    (t l)
+    #    (t n)
+    #    (t u)
+    #    (t m)
+    #    (t >)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected < (got EOF)"
+    if {$ok} {ict_match_token < "Expected <"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected a (got EOF)"
+    if {$ok} {ict_match_token a "Expected a"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected l (got EOF)"
+    if {$ok} {ict_match_token l "Expected l"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected n (got EOF)"
+    if {$ok} {ict_match_token n "Expected n"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected u (got EOF)"
+    if {$ok} {ict_match_token u "Expected u"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected m (got EOF)"
+    if {$ok} {ict_match_token m "Expected m"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected > (got EOF)"
+    if {$ok} {ict_match_token > "Expected >"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_ALPHA {} {
+    # ALPHA = (x (t <)
+    #            (t a)
+    #            (t l)
+    #            (t p)
+    #            (t h)
+    #            (t a)
+    #            (t >)
+    #            (n SPACE))
+
+    variable ok
+    if {[inc_restore ALPHA]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq74                ; # (x (t <)
+                            #    (t a)
+                            #    (t l)
+                            #    (t p)
+                            #    (t h)
+                            #    (t a)
+                            #    (t >)
+                            #    (n SPACE))
+
+    isv_nonterminal_leaf   ALPHA $pos
+    inc_save               ALPHA $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected ALPHA" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq74 {} {
+
+    # (x (t <)
+    #    (t a)
+    #    (t l)
+    #    (t p)
+    #    (t h)
+    #    (t a)
+    #    (t >)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected < (got EOF)"
+    if {$ok} {ict_match_token < "Expected <"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected a (got EOF)"
+    if {$ok} {ict_match_token a "Expected a"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected l (got EOF)"
+    if {$ok} {ict_match_token l "Expected l"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected p (got EOF)"
+    if {$ok} {ict_match_token p "Expected p"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected h (got EOF)"
+    if {$ok} {ict_match_token h "Expected h"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected a (got EOF)"
+    if {$ok} {ict_match_token a "Expected a"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected > (got EOF)"
+    if {$ok} {ict_match_token > "Expected >"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_AND {} {
+    # AND = (x (t &)
+    #          (n SPACE))
+
+    variable ok
+    if {[inc_restore AND]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq66                ; # (x (t &)
+                            #    (n SPACE))
+
+    isv_nonterminal_leaf   AND $pos
+    inc_save               AND $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected AND" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq66 {} {
+
+    # (x (t &)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected & (got EOF)"
+    if {$ok} {ict_match_token & "Expected &"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_APOSTROPH {} {
+    # APOSTROPH = (t ')
+
+    variable ok
+    if {[inc_restore APOSTROPH]} return
+
+    set pos [icl_get]
+
+    ict_advance "Expected ' (got EOF)"
+    if {$ok} {ict_match_token ' "Expected '"}
+
+    isv_clear
+    inc_save               APOSTROPH $pos
+    ier_nonterminal        "Expected APOSTROPH" $pos
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Attribute {} {
+    # Attribute = (x (/ (n VOID)
+    #                   (n LEAF)
+    #                   (n MATCH))
+    #                (n COLON))
+
+    variable ok
+    if {[inc_restore Attribute]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq7                ; # (x (/ (n VOID)
+                           #       (n LEAF)
+                           #       (n MATCH))
+                           #    (n COLON))
+
+    isv_nonterminal_reduce Attribute $pos $mrk
+    inc_save               Attribute $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Attribute" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq7 {} {
+
+    # (x (/ (n VOID)
+    #       (n LEAF)
+    #       (n MATCH))
+    #    (n COLON))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    ebra6                ; # (/ (n VOID)
+                           #    (n LEAF)
+                           #    (n MATCH))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_COLON    ; # (n COLON)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::ebra6 {} {
+
+    # (/ (n VOID)
+    #    (n LEAF)
+    #    (n MATCH))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_VOID    ; # (n VOID)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_LEAF    ; # (n LEAF)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_MATCH    ; # (n MATCH)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Char {} {
+    # Char = (/ (n CharSpecial)
+    #           (n CharOctalFull)
+    #           (n CharOctalPart)
+    #           (n CharUnicode)
+    #           (n CharUnescaped))
+
+    variable ok
+    if {[inc_restore Char]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    ebra42                ; # (/ (n CharSpecial)
+                            #    (n CharOctalFull)
+                            #    (n CharOctalPart)
+                            #    (n CharUnicode)
+                            #    (n CharUnescaped))
+
+    isv_nonterminal_reduce Char $pos $mrk
+    inc_save               Char $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Char" $pos
+    return
+}
+
+proc ::page::parse::peg::ebra42 {} {
+
+    # (/ (n CharSpecial)
+    #    (n CharOctalFull)
+    #    (n CharOctalPart)
+    #    (n CharUnicode)
+    #    (n CharUnescaped))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_CharSpecial    ; # (n CharSpecial)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_CharOctalFull    ; # (n CharOctalFull)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_CharOctalPart    ; # (n CharOctalPart)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_CharUnicode    ; # (n CharUnicode)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_CharUnescaped    ; # (n CharUnescaped)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_CharOctalFull {} {
+    # CharOctalFull = (x (t \)
+    #                    (.. 0 2)
+    #                    (.. 0 7)
+    #                    (.. 0 7))
+
+    variable ok
+    if {[inc_restore CharOctalFull]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq45                ; # (x (t \)
+                            #    (.. 0 2)
+                            #    (.. 0 7)
+                            #    (.. 0 7))
+
+    isv_nonterminal_range  CharOctalFull $pos
+    inc_save               CharOctalFull $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected CharOctalFull" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq45 {} {
+
+    # (x (t \)
+    #    (.. 0 2)
+    #    (.. 0 7)
+    #    (.. 0 7))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected \\ (got EOF)"
+    if {$ok} {ict_match_token \134 "Expected \\"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected \[0..2\] (got EOF)"
+    if {$ok} {ict_match_tokrange 0 2 "Expected \[0..2\]"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected \[0..7\] (got EOF)"
+    if {$ok} {ict_match_tokrange 0 7 "Expected \[0..7\]"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected \[0..7\] (got EOF)"
+    if {$ok} {ict_match_tokrange 0 7 "Expected \[0..7\]"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_CharOctalPart {} {
+    # CharOctalPart = (x (t \)
+    #                    (.. 0 7)
+    #                    (? (.. 0 7)))
+
+    variable ok
+    if {[inc_restore CharOctalPart]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq47                ; # (x (t \)
+                            #    (.. 0 7)
+                            #    (? (.. 0 7)))
+
+    isv_nonterminal_range  CharOctalPart $pos
+    inc_save               CharOctalPart $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected CharOctalPart" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq47 {} {
+
+    # (x (t \)
+    #    (.. 0 7)
+    #    (? (.. 0 7)))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected \\ (got EOF)"
+    if {$ok} {ict_match_token \134 "Expected \\"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected \[0..7\] (got EOF)"
+    if {$ok} {ict_match_tokrange 0 7 "Expected \[0..7\]"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    eopt46                ; # (? (.. 0 7))
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::eopt46 {} {
+
+    # (? (.. 0 7))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected \[0..7\] (got EOF)"
+    if {$ok} {ict_match_tokrange 0 7 "Expected \[0..7\]"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_CharSpecial {} {
+    # CharSpecial = (x (t \)
+    #                  (/ (t n)
+    #                     (t r)
+    #                     (t t)
+    #                     (t ')
+    #                     (t \")
+    #                     (t [)
+    #                     (t ])
+    #                     (t \)))
+
+    variable ok
+    if {[inc_restore CharSpecial]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq44                ; # (x (t \)
+                            #    (/ (t n)
+                            #       (t r)
+                            #       (t t)
+                            #       (t ')
+                            #       (t \")
+                            #       (t [)
+                            #       (t ])
+                            #       (t \)))
+
+    isv_nonterminal_range  CharSpecial $pos
+    inc_save               CharSpecial $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected CharSpecial" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq44 {} {
+
+    # (x (t \)
+    #    (/ (t n)
+    #       (t r)
+    #       (t t)
+    #       (t ')
+    #       (t \")
+    #       (t [)
+    #       (t ])
+    #       (t \)))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected \\ (got EOF)"
+    if {$ok} {ict_match_token \134 "Expected \\"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ebra43                ; # (/ (t n)
+                            #    (t r)
+                            #    (t t)
+                            #    (t ')
+                            #    (t \")
+                            #    (t [)
+                            #    (t ])
+                            #    (t \))
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::ebra43 {} {
+
+    # (/ (t n)
+    #    (t r)
+    #    (t t)
+    #    (t ')
+    #    (t \")
+    #    (t [)
+    #    (t ])
+    #    (t \))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected n (got EOF)"
+    if {$ok} {ict_match_token n "Expected n"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected r (got EOF)"
+    if {$ok} {ict_match_token r "Expected r"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected t (got EOF)"
+    if {$ok} {ict_match_token t "Expected t"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected ' (got EOF)"
+    if {$ok} {ict_match_token ' "Expected '"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected \" (got EOF)"
+    if {$ok} {ict_match_token \42 "Expected \""}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected \[ (got EOF)"
+    if {$ok} {ict_match_token \133 "Expected \["}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected \] (got EOF)"
+    if {$ok} {ict_match_token \135 "Expected \]"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected \\ (got EOF)"
+    if {$ok} {ict_match_token \134 "Expected \\"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_CharUnescaped {} {
+    # CharUnescaped = (x (! (t \))
+    #                    (dot))
+
+    variable ok
+    if {[inc_restore CharUnescaped]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq55                ; # (x (! (t \))
+                            #    (dot))
+
+    isv_nonterminal_range  CharUnescaped $pos
+    inc_save               CharUnescaped $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected CharUnescaped" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq55 {} {
+
+    # (x (! (t \))
+    #    (dot))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ebang54
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected any character (got EOF)"
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::ebang54 {} {
+    variable ok
+
+    set pos [icl_get]
+
+    ict_advance "Expected \\ (got EOF)"
+    if {$ok} {ict_match_token \134 "Expected \\"}
+
+    icl_rewind $pos
+    iok_negate
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_CharUnicode {} {
+    # CharUnicode = (x (t \)
+    #                  (t u)
+    #                  (n HexDigit)
+    #                  (? (x (n HexDigit)
+    #                        (? (x (n HexDigit)
+    #                              (? (n HexDigit)))))))
+
+    variable ok
+    if {[inc_restore CharUnicode]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq53                ; # (x (t \)
+                            #    (t u)
+                            #    (n HexDigit)
+                            #    (? (x (n HexDigit)
+                            #          (? (x (n HexDigit)
+                            #                (? (n HexDigit)))))))
+
+    isv_nonterminal_range  CharUnicode $pos
+    inc_save               CharUnicode $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected CharUnicode" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq53 {} {
+
+    # (x (t \)
+    #    (t u)
+    #    (n HexDigit)
+    #    (? (x (n HexDigit)
+    #          (? (x (n HexDigit)
+    #                (? (n HexDigit)))))))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected \\ (got EOF)"
+    if {$ok} {ict_match_token \134 "Expected \\"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected u (got EOF)"
+    if {$ok} {ict_match_token u "Expected u"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_HexDigit    ; # (n HexDigit)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    eopt52                ; # (? (x (n HexDigit)
+                            #       (? (x (n HexDigit)
+                            #             (? (n HexDigit))))))
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::eopt52 {} {
+
+    # (? (x (n HexDigit)
+    #       (? (x (n HexDigit)
+    #             (? (n HexDigit))))))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    eseq51                ; # (x (n HexDigit)
+                            #    (? (x (n HexDigit)
+                            #          (? (n HexDigit)))))
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::eseq51 {} {
+
+    # (x (n HexDigit)
+    #    (? (x (n HexDigit)
+    #          (? (n HexDigit)))))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_HexDigit    ; # (n HexDigit)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    eopt50                ; # (? (x (n HexDigit)
+                            #       (? (n HexDigit))))
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::eopt50 {} {
+
+    # (? (x (n HexDigit)
+    #       (? (n HexDigit))))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    eseq49                ; # (x (n HexDigit)
+                            #    (? (n HexDigit)))
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::eseq49 {} {
+
+    # (x (n HexDigit)
+    #    (? (n HexDigit)))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_HexDigit    ; # (n HexDigit)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    eopt48                ; # (? (n HexDigit))
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::eopt48 {} {
+
+    # (? (n HexDigit))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_HexDigit    ; # (n HexDigit)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Class {} {
+    # Class = (x (n OPENB)
+    #            (* (x (! (n CLOSEB))
+    #                  (n Range)))
+    #            (n CLOSEB)
+    #            (n SPACE))
+
+    variable ok
+    if {[inc_restore Class]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq32                ; # (x (n OPENB)
+                            #    (* (x (! (n CLOSEB))
+                            #          (n Range)))
+                            #    (n CLOSEB)
+                            #    (n SPACE))
+
+    isv_nonterminal_reduce Class $pos $mrk
+    inc_save               Class $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Class" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq32 {} {
+
+    # (x (n OPENB)
+    #    (* (x (! (n CLOSEB))
+    #          (n Range)))
+    #    (n CLOSEB)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_OPENB    ; # (n OPENB)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    ekleene31                ; # (* (x (! (n CLOSEB))
+                               #       (n Range)))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_CLOSEB    ; # (n CLOSEB)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::ekleene31 {} {
+
+    # (* (x (! (n CLOSEB))
+    #       (n Range)))
+
+    variable ok
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        eseq30                ; # (x (! (n CLOSEB))
+                                #    (n Range))
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::eseq30 {} {
+
+    # (x (! (n CLOSEB))
+    #    (n Range))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ebang29
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Range    ; # (n Range)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::ebang29 {} {
+    set pos [icl_get]
+
+    matchSymbol_CLOSEB    ; # (n CLOSEB)
+
+    icl_rewind $pos
+    iok_negate
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_CLOSE {} {
+    # CLOSE = (x (t \))
+    #            (n SPACE))
+
+    if {[inc_restore CLOSE]} return
+
+    set pos [icl_get]
+
+    eseq72                ; # (x (t \))
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               CLOSE $pos
+    ier_nonterminal        "Expected CLOSE" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq72 {} {
+
+    # (x (t \))
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected \) (got EOF)"
+    if {$ok} {ict_match_token \51 "Expected \)"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_CLOSEB {} {
+    # CLOSEB = (t ])
+
+    variable ok
+    if {[inc_restore CLOSEB]} return
+
+    set pos [icl_get]
+
+    ict_advance "Expected \] (got EOF)"
+    if {$ok} {ict_match_token \135 "Expected \]"}
+
+    isv_clear
+    inc_save               CLOSEB $pos
+    ier_nonterminal        "Expected CLOSEB" $pos
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_COLON {} {
+    # COLON = (x (t :)
+    #            (n SPACE))
+
+    if {[inc_restore COLON]} return
+
+    set pos [icl_get]
+
+    eseq64                ; # (x (t :)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               COLON $pos
+    ier_nonterminal        "Expected COLON" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq64 {} {
+
+    # (x (t :)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected : (got EOF)"
+    if {$ok} {ict_match_token : "Expected :"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_COMMENT {} {
+    # COMMENT = (x (t #)
+    #              (* (x (! (n EOL))
+    #                    (dot)))
+    #              (n EOL))
+
+    if {[inc_restore COMMENT]} return
+
+    set pos [icl_get]
+
+    eseq81                ; # (x (t #)
+                            #    (* (x (! (n EOL))
+                            #          (dot)))
+                            #    (n EOL))
+
+    isv_clear
+    inc_save               COMMENT $pos
+    ier_nonterminal        "Expected COMMENT" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq81 {} {
+
+    # (x (t #)
+    #    (* (x (! (n EOL))
+    #          (dot)))
+    #    (n EOL))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected # (got EOF)"
+    if {$ok} {ict_match_token # "Expected #"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ekleene80                ; # (* (x (! (n EOL))
+                               #       (dot)))
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_EOL    ; # (n EOL)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::ekleene80 {} {
+
+    # (* (x (! (n EOL))
+    #       (dot)))
+
+    variable ok
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        eseq79                ; # (x (! (n EOL))
+                                #    (dot))
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::eseq79 {} {
+
+    # (x (! (n EOL))
+    #    (dot))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ebang78
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected any character (got EOF)"
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::ebang78 {} {
+    set pos [icl_get]
+
+    matchSymbol_EOL    ; # (n EOL)
+
+    icl_rewind $pos
+    iok_negate
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_DAPOSTROPH {} {
+    # DAPOSTROPH = (t \")
+
+    variable ok
+    if {[inc_restore DAPOSTROPH]} return
+
+    set pos [icl_get]
+
+    ict_advance "Expected \" (got EOF)"
+    if {$ok} {ict_match_token \42 "Expected \""}
+
+    isv_clear
+    inc_save               DAPOSTROPH $pos
+    ier_nonterminal        "Expected DAPOSTROPH" $pos
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Definition {} {
+    # Definition = (x (? (n Attribute))
+    #                 (n Identifier)
+    #                 (n IS)
+    #                 (n Expression)
+    #                 (n SEMICOLON))
+
+    variable ok
+    if {[inc_restore Definition]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq5                ; # (x (? (n Attribute))
+                           #    (n Identifier)
+                           #    (n IS)
+                           #    (n Expression)
+                           #    (n SEMICOLON))
+
+    isv_nonterminal_reduce Definition $pos $mrk
+    inc_save               Definition $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Definition" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq5 {} {
+
+    # (x (? (n Attribute))
+    #    (n Identifier)
+    #    (n IS)
+    #    (n Expression)
+    #    (n SEMICOLON))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    eopt4                ; # (? (n Attribute))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_IS    ; # (n IS)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_Expression    ; # (n Expression)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_SEMICOLON    ; # (n SEMICOLON)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::eopt4 {} {
+
+    # (? (n Attribute))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_Attribute    ; # (n Attribute)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_DOT {} {
+    # DOT = (x (t .)
+    #          (n SPACE))
+
+    variable ok
+    if {[inc_restore DOT]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq73                ; # (x (t .)
+                            #    (n SPACE))
+
+    isv_nonterminal_leaf   DOT $pos
+    inc_save               DOT $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected DOT" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq73 {} {
+
+    # (x (t .)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected . (got EOF)"
+    if {$ok} {ict_match_token . "Expected ."}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_END {} {
+    # END = (x (t E)
+    #          (t N)
+    #          (t D)
+    #          (n SPACE))
+
+    if {[inc_restore END]} return
+
+    set pos [icl_get]
+
+    eseq62                ; # (x (t E)
+                            #    (t N)
+                            #    (t D)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               END $pos
+    ier_nonterminal        "Expected END" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq62 {} {
+
+    # (x (t E)
+    #    (t N)
+    #    (t D)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected E (got EOF)"
+    if {$ok} {ict_match_token E "Expected E"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected N (got EOF)"
+    if {$ok} {ict_match_token N "Expected N"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected D (got EOF)"
+    if {$ok} {ict_match_token D "Expected D"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_EOF {} {
+    # EOF = (! (dot))
+
+    if {[inc_restore EOF]} return
+
+    set pos [icl_get]
+
+    ebang84
+
+    isv_clear
+    inc_save               EOF $pos
+    ier_nonterminal        "Expected EOF" $pos
+    return
+}
+
+proc ::page::parse::peg::ebang84 {} {
+    set pos [icl_get]
+
+    ict_advance "Expected any character (got EOF)"
+
+    icl_rewind $pos
+    iok_negate
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_EOL {} {
+    # EOL = (/ (x (t \n)
+    #             (t \r))
+    #          (t \n)
+    #          (t \r))
+
+    if {[inc_restore EOL]} return
+
+    set pos [icl_get]
+
+    ebra83                ; # (/ (x (t \n)
+                            #       (t \r))
+                            #    (t \n)
+                            #    (t \r))
+
+    isv_clear
+    inc_save               EOL $pos
+    ier_nonterminal        "Expected EOL" $pos
+    return
+}
+
+proc ::page::parse::peg::ebra83 {} {
+
+    # (/ (x (t \n)
+    #       (t \r))
+    #    (t \n)
+    #    (t \r))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    eseq82                ; # (x (t \n)
+                            #    (t \r))
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected \\n (got EOF)"
+    if {$ok} {ict_match_token \n "Expected \\n"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected \\r (got EOF)"
+    if {$ok} {ict_match_token \r "Expected \\r"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::peg::eseq82 {} {
+
+    # (x (t \n)
+    #    (t \r))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected \\n (got EOF)"
+    if {$ok} {ict_match_token \n "Expected \\n"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected \\r (got EOF)"
+    if {$ok} {ict_match_token \r "Expected \\r"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Expression {} {
+    # Expression = (x (n Sequence)
+    #                 (* (x (n SLASH)
+    #                       (n Sequence))))
+
+    variable ok
+    if {[inc_restore Expression]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq10                ; # (x (n Sequence)
+                            #    (* (x (n SLASH)
+                            #          (n Sequence))))
+
+    isv_nonterminal_reduce Expression $pos $mrk
+    inc_save               Expression $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Expression" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq10 {} {
+
+    # (x (n Sequence)
+    #    (* (x (n SLASH)
+    #          (n Sequence))))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Sequence    ; # (n Sequence)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    ekleene9                ; # (* (x (n SLASH)
+                              #       (n Sequence)))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::ekleene9 {} {
+
+    # (* (x (n SLASH)
+    #       (n Sequence)))
+
+    variable ok
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        eseq8                ; # (x (n SLASH)
+                               #    (n Sequence))
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::eseq8 {} {
+
+    # (x (n SLASH)
+    #    (n Sequence))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_SLASH    ; # (n SLASH)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Sequence    ; # (n Sequence)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Final {} {
+    # Final = (x (n END)
+    #            (n SEMICOLON)
+    #            (n SPACE))
+
+    if {[inc_restore Final]} return
+
+    set pos [icl_get]
+
+    eseq36                ; # (x (n END)
+                            #    (n SEMICOLON)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               Final $pos
+    ier_nonterminal        "Expected Final" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq36 {} {
+
+    # (x (n END)
+    #    (n SEMICOLON)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_END    ; # (n END)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SEMICOLON    ; # (n SEMICOLON)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Grammar {} {
+    # Grammar = (x (n SPACE)
+    #              (n Header)
+    #              (+ (n Definition))
+    #              (n Final)
+    #              (n EOF))
+
+    variable ok
+    if {[inc_restore Grammar]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq2                ; # (x (n SPACE)
+                           #    (n Header)
+                           #    (+ (n Definition))
+                           #    (n Final)
+                           #    (n EOF))
+
+    isv_nonterminal_reduce Grammar $pos $mrk
+    inc_save               Grammar $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Grammar" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq2 {} {
+
+    # (x (n SPACE)
+    #    (n Header)
+    #    (+ (n Definition))
+    #    (n Final)
+    #    (n EOF))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Header    ; # (n Header)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    epkleene1                ; # (+ (n Definition))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_Final    ; # (n Final)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_EOF    ; # (n EOF)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::epkleene1 {} {
+
+    # (+ (n Definition))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_Definition    ; # (n Definition)
+    ier_merge $old
+
+    if {!$ok} {
+        icl_rewind $pos
+        return
+    }
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        matchSymbol_Definition    ; # (n Definition)
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Header {} {
+    # Header = (x (n PEG)
+    #             (n Identifier)
+    #             (n StartExpr))
+
+    variable ok
+    if {[inc_restore Header]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq3                ; # (x (n PEG)
+                           #    (n Identifier)
+                           #    (n StartExpr))
+
+    isv_nonterminal_reduce Header $pos $mrk
+    inc_save               Header $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Header" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq3 {} {
+
+    # (x (n PEG)
+    #    (n Identifier)
+    #    (n StartExpr))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_PEG    ; # (n PEG)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_StartExpr    ; # (n StartExpr)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_HexDigit {} {
+    # HexDigit = (/ (.. 0 9)
+    #               (.. a f)
+    #               (.. A F))
+
+    if {[inc_restore HexDigit]} return
+
+    set pos [icl_get]
+
+    ebra56                ; # (/ (.. 0 9)
+                            #    (.. a f)
+                            #    (.. A F))
+
+    isv_clear
+    inc_save               HexDigit $pos
+    ier_nonterminal        "Expected HexDigit" $pos
+    return
+}
+
+proc ::page::parse::peg::ebra56 {} {
+
+    # (/ (.. 0 9)
+    #    (.. a f)
+    #    (.. A F))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected \[0..9\] (got EOF)"
+    if {$ok} {ict_match_tokrange 0 9 "Expected \[0..9\]"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected \[a..f\] (got EOF)"
+    if {$ok} {ict_match_tokrange a f "Expected \[a..f\]"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected \[A..F\] (got EOF)"
+    if {$ok} {ict_match_tokrange A F "Expected \[A..F\]"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Ident {} {
+    # Ident = (x (/ (t _)
+    #               (t :)
+    #               (alpha))
+    #            (* (/ (t _)
+    #                  (t :)
+    #                  (alnum))))
+
+    variable ok
+    if {[inc_restore Ident]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq41                ; # (x (/ (t _)
+                            #       (t :)
+                            #       (alpha))
+                            #    (* (/ (t _)
+                            #          (t :)
+                            #          (alnum))))
+
+    isv_nonterminal_range  Ident $pos
+    inc_save               Ident $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Ident" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq41 {} {
+
+    # (x (/ (t _)
+    #       (t :)
+    #       (alpha))
+    #    (* (/ (t _)
+    #          (t :)
+    #          (alnum))))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ebra38                ; # (/ (t _)
+                            #    (t :)
+                            #    (alpha))
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ekleene40                ; # (* (/ (t _)
+                               #       (t :)
+                               #       (alnum)))
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::ebra38 {} {
+
+    # (/ (t _)
+    #    (t :)
+    #    (alpha))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected _ (got EOF)"
+    if {$ok} {ict_match_token _ "Expected _"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected : (got EOF)"
+    if {$ok} {ict_match_token : "Expected :"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected <alpha> (got EOF)"
+    if {$ok} {ict_match_tokclass alpha "Expected <alpha>"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::peg::ekleene40 {} {
+
+    # (* (/ (t _)
+    #       (t :)
+    #       (alnum)))
+
+    variable ok
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        ebra39                ; # (/ (t _)
+                                #    (t :)
+                                #    (alnum))
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::ebra39 {} {
+
+    # (/ (t _)
+    #    (t :)
+    #    (alnum))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected _ (got EOF)"
+    if {$ok} {ict_match_token _ "Expected _"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected : (got EOF)"
+    if {$ok} {ict_match_token : "Expected :"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected <alnum> (got EOF)"
+    if {$ok} {ict_match_tokclass alnum "Expected <alnum>"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Identifier {} {
+    # Identifier = (x (n Ident)
+    #                 (n SPACE))
+
+    variable ok
+    if {[inc_restore Identifier]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq37                ; # (x (n Ident)
+                            #    (n SPACE))
+
+    isv_nonterminal_reduce Identifier $pos $mrk
+    inc_save               Identifier $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Identifier" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq37 {} {
+
+    # (x (n Ident)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Ident    ; # (n Ident)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_IS {} {
+    # IS = (x (t <)
+    #         (t -)
+    #         (n SPACE))
+
+    if {[inc_restore IS]} return
+
+    set pos [icl_get]
+
+    eseq58                ; # (x (t <)
+                            #    (t -)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               IS $pos
+    ier_nonterminal        "Expected IS" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq58 {} {
+
+    # (x (t <)
+    #    (t -)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected < (got EOF)"
+    if {$ok} {ict_match_token < "Expected <"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected - (got EOF)"
+    if {$ok} {ict_match_token - "Expected -"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_LEAF {} {
+    # LEAF = (x (t l)
+    #           (t e)
+    #           (t a)
+    #           (t f)
+    #           (n SPACE))
+
+    variable ok
+    if {[inc_restore LEAF]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq60                ; # (x (t l)
+                            #    (t e)
+                            #    (t a)
+                            #    (t f)
+                            #    (n SPACE))
+
+    isv_nonterminal_leaf   LEAF $pos
+    inc_save               LEAF $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected LEAF" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq60 {} {
+
+    # (x (t l)
+    #    (t e)
+    #    (t a)
+    #    (t f)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected l (got EOF)"
+    if {$ok} {ict_match_token l "Expected l"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected e (got EOF)"
+    if {$ok} {ict_match_token e "Expected e"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected a (got EOF)"
+    if {$ok} {ict_match_token a "Expected a"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected f (got EOF)"
+    if {$ok} {ict_match_token f "Expected f"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Literal {} {
+    # Literal = (/ (x (n APOSTROPH)
+    #                 (* (x (! (n APOSTROPH))
+    #                       (n Char)))
+    #                 (n APOSTROPH)
+    #                 (n SPACE))
+    #              (x (n DAPOSTROPH)
+    #                 (* (x (! (n DAPOSTROPH))
+    #                       (n Char)))
+    #                 (n DAPOSTROPH)
+    #                 (n SPACE)))
+
+    variable ok
+    if {[inc_restore Literal]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    ebra28                ; # (/ (x (n APOSTROPH)
+                            #       (* (x (! (n APOSTROPH))
+                            #             (n Char)))
+                            #       (n APOSTROPH)
+                            #       (n SPACE))
+                            #    (x (n DAPOSTROPH)
+                            #       (* (x (! (n DAPOSTROPH))
+                            #             (n Char)))
+                            #       (n DAPOSTROPH)
+                            #       (n SPACE)))
+
+    isv_nonterminal_reduce Literal $pos $mrk
+    inc_save               Literal $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Literal" $pos
+    return
+}
+
+proc ::page::parse::peg::ebra28 {} {
+
+    # (/ (x (n APOSTROPH)
+    #       (* (x (! (n APOSTROPH))
+    #             (n Char)))
+    #       (n APOSTROPH)
+    #       (n SPACE))
+    #    (x (n DAPOSTROPH)
+    #       (* (x (! (n DAPOSTROPH))
+    #             (n Char)))
+    #       (n DAPOSTROPH)
+    #       (n SPACE)))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    eseq23                ; # (x (n APOSTROPH)
+                            #    (* (x (! (n APOSTROPH))
+                            #          (n Char)))
+                            #    (n APOSTROPH)
+                            #    (n SPACE))
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    eseq27                ; # (x (n DAPOSTROPH)
+                            #    (* (x (! (n DAPOSTROPH))
+                            #          (n Char)))
+                            #    (n DAPOSTROPH)
+                            #    (n SPACE))
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::peg::eseq23 {} {
+
+    # (x (n APOSTROPH)
+    #    (* (x (! (n APOSTROPH))
+    #          (n Char)))
+    #    (n APOSTROPH)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_APOSTROPH    ; # (n APOSTROPH)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    ekleene22                ; # (* (x (! (n APOSTROPH))
+                               #       (n Char)))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_APOSTROPH    ; # (n APOSTROPH)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::ekleene22 {} {
+
+    # (* (x (! (n APOSTROPH))
+    #       (n Char)))
+
+    variable ok
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        eseq21                ; # (x (! (n APOSTROPH))
+                                #    (n Char))
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::eseq21 {} {
+
+    # (x (! (n APOSTROPH))
+    #    (n Char))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ebang20
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Char    ; # (n Char)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::ebang20 {} {
+    set pos [icl_get]
+
+    matchSymbol_APOSTROPH    ; # (n APOSTROPH)
+
+    icl_rewind $pos
+    iok_negate
+    return
+}
+
+proc ::page::parse::peg::eseq27 {} {
+
+    # (x (n DAPOSTROPH)
+    #    (* (x (! (n DAPOSTROPH))
+    #          (n Char)))
+    #    (n DAPOSTROPH)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_DAPOSTROPH    ; # (n DAPOSTROPH)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    ekleene26                ; # (* (x (! (n DAPOSTROPH))
+                               #       (n Char)))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_DAPOSTROPH    ; # (n DAPOSTROPH)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::ekleene26 {} {
+
+    # (* (x (! (n DAPOSTROPH))
+    #       (n Char)))
+
+    variable ok
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        eseq25                ; # (x (! (n DAPOSTROPH))
+                                #    (n Char))
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::eseq25 {} {
+
+    # (x (! (n DAPOSTROPH))
+    #    (n Char))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ebang24
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Char    ; # (n Char)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::ebang24 {} {
+    set pos [icl_get]
+
+    matchSymbol_DAPOSTROPH    ; # (n DAPOSTROPH)
+
+    icl_rewind $pos
+    iok_negate
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_MATCH {} {
+    # MATCH = (x (t m)
+    #            (t a)
+    #            (t t)
+    #            (t c)
+    #            (t h)
+    #            (n SPACE))
+
+    variable ok
+    if {[inc_restore MATCH]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq61                ; # (x (t m)
+                            #    (t a)
+                            #    (t t)
+                            #    (t c)
+                            #    (t h)
+                            #    (n SPACE))
+
+    isv_nonterminal_leaf   MATCH $pos
+    inc_save               MATCH $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected MATCH" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq61 {} {
+
+    # (x (t m)
+    #    (t a)
+    #    (t t)
+    #    (t c)
+    #    (t h)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected m (got EOF)"
+    if {$ok} {ict_match_token m "Expected m"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected a (got EOF)"
+    if {$ok} {ict_match_token a "Expected a"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected t (got EOF)"
+    if {$ok} {ict_match_token t "Expected t"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected c (got EOF)"
+    if {$ok} {ict_match_token c "Expected c"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected h (got EOF)"
+    if {$ok} {ict_match_token h "Expected h"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_NOT {} {
+    # NOT = (x (t !)
+    #          (n SPACE))
+
+    variable ok
+    if {[inc_restore NOT]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq67                ; # (x (t !)
+                            #    (n SPACE))
+
+    isv_nonterminal_leaf   NOT $pos
+    inc_save               NOT $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected NOT" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq67 {} {
+
+    # (x (t !)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected ! (got EOF)"
+    if {$ok} {ict_match_token ! "Expected !"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_OPEN {} {
+    # OPEN = (x (t \()
+    #           (n SPACE))
+
+    if {[inc_restore OPEN]} return
+
+    set pos [icl_get]
+
+    eseq71                ; # (x (t \()
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               OPEN $pos
+    ier_nonterminal        "Expected OPEN" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq71 {} {
+
+    # (x (t \()
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected \( (got EOF)"
+    if {$ok} {ict_match_token \50 "Expected \("}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_OPENB {} {
+    # OPENB = (t [)
+
+    variable ok
+    if {[inc_restore OPENB]} return
+
+    set pos [icl_get]
+
+    ict_advance "Expected \[ (got EOF)"
+    if {$ok} {ict_match_token \133 "Expected \["}
+
+    isv_clear
+    inc_save               OPENB $pos
+    ier_nonterminal        "Expected OPENB" $pos
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_PEG {} {
+    # PEG = (x (t P)
+    #          (t E)
+    #          (t G)
+    #          (n SPACE))
+
+    if {[inc_restore PEG]} return
+
+    set pos [icl_get]
+
+    eseq57                ; # (x (t P)
+                            #    (t E)
+                            #    (t G)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               PEG $pos
+    ier_nonterminal        "Expected PEG" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq57 {} {
+
+    # (x (t P)
+    #    (t E)
+    #    (t G)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected P (got EOF)"
+    if {$ok} {ict_match_token P "Expected P"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected E (got EOF)"
+    if {$ok} {ict_match_token E "Expected E"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected G (got EOF)"
+    if {$ok} {ict_match_token G "Expected G"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_PLUS {} {
+    # PLUS = (x (t +)
+    #           (n SPACE))
+
+    variable ok
+    if {[inc_restore PLUS]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq70                ; # (x (t +)
+                            #    (n SPACE))
+
+    isv_nonterminal_leaf   PLUS $pos
+    inc_save               PLUS $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected PLUS" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq70 {} {
+
+    # (x (t +)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected + (got EOF)"
+    if {$ok} {ict_match_token + "Expected +"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Prefix {} {
+    # Prefix = (x (? (/ (n AND)
+    #                   (n NOT)))
+    #             (n Suffix))
+
+    variable ok
+    if {[inc_restore Prefix]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq14                ; # (x (? (/ (n AND)
+                            #          (n NOT)))
+                            #    (n Suffix))
+
+    isv_nonterminal_reduce Prefix $pos $mrk
+    inc_save               Prefix $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Prefix" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq14 {} {
+
+    # (x (? (/ (n AND)
+    #          (n NOT)))
+    #    (n Suffix))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    eopt13                ; # (? (/ (n AND)
+                            #       (n NOT)))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_Suffix    ; # (n Suffix)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::eopt13 {} {
+
+    # (? (/ (n AND)
+    #       (n NOT)))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ebra12                ; # (/ (n AND)
+                            #    (n NOT))
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::ebra12 {} {
+
+    # (/ (n AND)
+    #    (n NOT))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_AND    ; # (n AND)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_NOT    ; # (n NOT)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Primary {} {
+    # Primary = (/ (n ALNUM)
+    #              (n ALPHA)
+    #              (n Identifier)
+    #              (x (n OPEN)
+    #                 (n Expression)
+    #                 (n CLOSE))
+    #              (n Literal)
+    #              (n Class)
+    #              (n DOT))
+
+    variable ok
+    if {[inc_restore Primary]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    ebra19                ; # (/ (n ALNUM)
+                            #    (n ALPHA)
+                            #    (n Identifier)
+                            #    (x (n OPEN)
+                            #       (n Expression)
+                            #       (n CLOSE))
+                            #    (n Literal)
+                            #    (n Class)
+                            #    (n DOT))
+
+    isv_nonterminal_reduce Primary $pos $mrk
+    inc_save               Primary $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Primary" $pos
+    return
+}
+
+proc ::page::parse::peg::ebra19 {} {
+
+    # (/ (n ALNUM)
+    #    (n ALPHA)
+    #    (n Identifier)
+    #    (x (n OPEN)
+    #       (n Expression)
+    #       (n CLOSE))
+    #    (n Literal)
+    #    (n Class)
+    #    (n DOT))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_ALNUM    ; # (n ALNUM)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_ALPHA    ; # (n ALPHA)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Identifier    ; # (n Identifier)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    eseq18                ; # (x (n OPEN)
+                            #    (n Expression)
+                            #    (n CLOSE))
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Literal    ; # (n Literal)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Class    ; # (n Class)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_DOT    ; # (n DOT)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::peg::eseq18 {} {
+
+    # (x (n OPEN)
+    #    (n Expression)
+    #    (n CLOSE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_OPEN    ; # (n OPEN)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Expression    ; # (n Expression)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_CLOSE    ; # (n CLOSE)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_QUESTION {} {
+    # QUESTION = (x (t ?)
+    #               (n SPACE))
+
+    variable ok
+    if {[inc_restore QUESTION]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq68                ; # (x (t ?)
+                            #    (n SPACE))
+
+    isv_nonterminal_leaf   QUESTION $pos
+    inc_save               QUESTION $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected QUESTION" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq68 {} {
+
+    # (x (t ?)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected ? (got EOF)"
+    if {$ok} {ict_match_token ? "Expected ?"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Range {} {
+    # Range = (/ (x (n Char)
+    #               (n TO)
+    #               (n Char))
+    #            (n Char))
+
+    variable ok
+    if {[inc_restore Range]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    ebra34                ; # (/ (x (n Char)
+                            #       (n TO)
+                            #       (n Char))
+                            #    (n Char))
+
+    isv_nonterminal_reduce Range $pos $mrk
+    inc_save               Range $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Range" $pos
+    return
+}
+
+proc ::page::parse::peg::ebra34 {} {
+
+    # (/ (x (n Char)
+    #       (n TO)
+    #       (n Char))
+    #    (n Char))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    eseq33                ; # (x (n Char)
+                            #    (n TO)
+                            #    (n Char))
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_Char    ; # (n Char)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::peg::eseq33 {} {
+
+    # (x (n Char)
+    #    (n TO)
+    #    (n Char))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Char    ; # (n Char)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_TO    ; # (n TO)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_Char    ; # (n Char)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_SEMICOLON {} {
+    # SEMICOLON = (x (t ;)
+    #                (n SPACE))
+
+    if {[inc_restore SEMICOLON]} return
+
+    set pos [icl_get]
+
+    eseq63                ; # (x (t ;)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               SEMICOLON $pos
+    ier_nonterminal        "Expected SEMICOLON" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq63 {} {
+
+    # (x (t ;)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected \; (got EOF)"
+    if {$ok} {ict_match_token \73 "Expected \;"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Sequence {} {
+    # Sequence = (+ (n Prefix))
+
+    variable ok
+    if {[inc_restore Sequence]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    epkleene11                ; # (+ (n Prefix))
+
+    isv_nonterminal_reduce Sequence $pos $mrk
+    inc_save               Sequence $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Sequence" $pos
+    return
+}
+
+proc ::page::parse::peg::epkleene11 {} {
+
+    # (+ (n Prefix))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_Prefix    ; # (n Prefix)
+    ier_merge $old
+
+    if {!$ok} {
+        icl_rewind $pos
+        return
+    }
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        matchSymbol_Prefix    ; # (n Prefix)
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_SLASH {} {
+    # SLASH = (x (t /)
+    #            (n SPACE))
+
+    if {[inc_restore SLASH]} return
+
+    set pos [icl_get]
+
+    eseq65                ; # (x (t /)
+                            #    (n SPACE))
+
+    isv_clear
+    inc_save               SLASH $pos
+    ier_nonterminal        "Expected SLASH" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq65 {} {
+
+    # (x (t /)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected / (got EOF)"
+    if {$ok} {ict_match_token / "Expected /"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_SPACE {} {
+    # SPACE = (* (/ (t <blank>)
+    #               (t \t)
+    #               (n EOL)
+    #               (n COMMENT)))
+
+    if {[inc_restore SPACE]} return
+
+    set pos [icl_get]
+
+    ekleene77                ; # (* (/ (t <blank>)
+                               #       (t \t)
+                               #       (n EOL)
+                               #       (n COMMENT)))
+
+    isv_clear
+    inc_save               SPACE $pos
+    ier_nonterminal        "Expected SPACE" $pos
+    return
+}
+
+proc ::page::parse::peg::ekleene77 {} {
+
+    # (* (/ (t <blank>)
+    #       (t \t)
+    #       (n EOL)
+    #       (n COMMENT)))
+
+    variable ok
+
+    while {1} {
+        set pos [icl_get]
+
+        set old [ier_get]
+        ebra76                ; # (/ (t <blank>)
+                                #    (t \t)
+                                #    (n EOL)
+                                #    (n COMMENT))
+        ier_merge $old
+
+        if {$ok} continue
+        break
+    }
+
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::ebra76 {} {
+
+    # (/ (t <blank>)
+    #    (t \t)
+    #    (n EOL)
+    #    (n COMMENT))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected <blank> (got EOF)"
+    if {$ok} {ict_match_token \40 "Expected <blank>"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    ict_advance "Expected \\t (got EOF)"
+    if {$ok} {ict_match_token \t "Expected \\t"}
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    matchSymbol_EOL    ; # (n EOL)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    set old [ier_get]
+    matchSymbol_COMMENT    ; # (n COMMENT)
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_STAR {} {
+    # STAR = (x (t *)
+    #           (n SPACE))
+
+    variable ok
+    if {[inc_restore STAR]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq69                ; # (x (t *)
+                            #    (n SPACE))
+
+    isv_nonterminal_leaf   STAR $pos
+    inc_save               STAR $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected STAR" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq69 {} {
+
+    # (x (t *)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected * (got EOF)"
+    if {$ok} {ict_match_token * "Expected *"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_StartExpr {} {
+    # StartExpr = (x (n OPEN)
+    #                (n Expression)
+    #                (n CLOSE))
+
+    variable ok
+    if {[inc_restore StartExpr]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq35                ; # (x (n OPEN)
+                            #    (n Expression)
+                            #    (n CLOSE))
+
+    isv_nonterminal_reduce StartExpr $pos $mrk
+    inc_save               StartExpr $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected StartExpr" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq35 {} {
+
+    # (x (n OPEN)
+    #    (n Expression)
+    #    (n CLOSE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    matchSymbol_OPEN    ; # (n OPEN)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Expression    ; # (n Expression)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    matchSymbol_CLOSE    ; # (n CLOSE)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_Suffix {} {
+    # Suffix = (x (n Primary)
+    #             (? (/ (n QUESTION)
+    #                   (n STAR)
+    #                   (n PLUS))))
+
+    variable ok
+    if {[inc_restore Suffix]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+    set mrk [ias_mark]
+
+    eseq17                ; # (x (n Primary)
+                            #    (? (/ (n QUESTION)
+                            #          (n STAR)
+                            #          (n PLUS))))
+
+    isv_nonterminal_reduce Suffix $pos $mrk
+    inc_save               Suffix $pos
+    ias_pop2mark             $mrk
+    if {$ok} ias_push
+    ier_nonterminal        "Expected Suffix" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq17 {} {
+
+    # (x (n Primary)
+    #    (? (/ (n QUESTION)
+    #          (n STAR)
+    #          (n PLUS))))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+
+    set old [ier_get]
+    matchSymbol_Primary    ; # (n Primary)
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    set old [ier_get]
+    eopt16                ; # (? (/ (n QUESTION)
+                            #       (n STAR)
+                            #       (n PLUS)))
+    ier_merge $old
+
+    if {!$ok} {
+        ias_pop2mark $mrk
+        icl_rewind   $pos
+        return
+    }
+
+    return
+}
+
+proc ::page::parse::peg::eopt16 {} {
+
+    # (? (/ (n QUESTION)
+    #       (n STAR)
+    #       (n PLUS)))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ebra15                ; # (/ (n QUESTION)
+                            #    (n STAR)
+                            #    (n PLUS))
+    ier_merge $old
+
+    if {$ok} return
+    icl_rewind $pos
+    iok_ok
+    return
+}
+
+proc ::page::parse::peg::ebra15 {} {
+
+    # (/ (n QUESTION)
+    #    (n STAR)
+    #    (n PLUS))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_QUESTION    ; # (n QUESTION)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_STAR    ; # (n STAR)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    set mrk [ias_mark]
+    set old [ier_get]
+    matchSymbol_PLUS    ; # (n PLUS)
+    ier_merge $old
+
+    if {$ok} return
+    ias_pop2mark $mrk
+    icl_rewind   $pos
+
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_TO {} {
+    # TO = (t -)
+
+    variable ok
+    if {[inc_restore TO]} return
+
+    set pos [icl_get]
+
+    ict_advance "Expected - (got EOF)"
+    if {$ok} {ict_match_token - "Expected -"}
+
+    isv_clear
+    inc_save               TO $pos
+    ier_nonterminal        "Expected TO" $pos
+    return
+}
+
+proc ::page::parse::peg::matchSymbol_VOID {} {
+    # VOID = (x (t v)
+    #           (t o)
+    #           (t i)
+    #           (t d)
+    #           (n SPACE))
+
+    variable ok
+    if {[inc_restore VOID]} {
+        if {$ok} ias_push
+        return
+    }
+
+    set pos [icl_get]
+
+    eseq59                ; # (x (t v)
+                            #    (t o)
+                            #    (t i)
+                            #    (t d)
+                            #    (n SPACE))
+
+    isv_nonterminal_leaf   VOID $pos
+    inc_save               VOID $pos
+    if {$ok} ias_push
+    ier_nonterminal        "Expected VOID" $pos
+    return
+}
+
+proc ::page::parse::peg::eseq59 {} {
+
+    # (x (t v)
+    #    (t o)
+    #    (t i)
+    #    (t d)
+    #    (n SPACE))
+
+    variable ok
+
+    set pos [icl_get]
+
+    set old [ier_get]
+    ict_advance "Expected v (got EOF)"
+    if {$ok} {ict_match_token v "Expected v"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected o (got EOF)"
+    if {$ok} {ict_match_token o "Expected o"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected i (got EOF)"
+    if {$ok} {ict_match_token i "Expected i"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    ict_advance "Expected d (got EOF)"
+    if {$ok} {ict_match_token d "Expected d"}
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    set old [ier_get]
+    matchSymbol_SPACE    ; # (n SPACE)
+    ier_merge $old
+
+    if {!$ok} {icl_rewind $pos ; return}
+
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide page::parse::peg 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/parse_peghb.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/parse_peghb.tcl
new file mode 100644
index 00000000..ba9fab43
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/parse_peghb.tcl
@@ -0,0 +1,118 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / Frontend - Read halfbaked PEG container.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+namespace eval ::page::parse::peghb {
+    variable fixup {}
+    variable definitions
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::parse::peghb {halfbaked t} {
+    variable peghb::fixup
+    variable peghb::definitions
+    array set definitions {}
+
+    set fixup {}
+
+    interp create -safe sb
+    # Should remove everything.
+    interp alias  sb Start  {} ::page::parse::peghb::Start  $t
+    interp alias  sb Define {} ::page::parse::peghb::Define $t
+    interp eval   sb $halfbaked
+    interp delete sb
+
+    array set undefined {}
+    array set users     {}
+    foreach {n sym} $fixup {
+	if {[info exists definitions($sym)]} {
+	    set def $definitions($sym)
+	    $t set $n def $def
+	    lappend users($def) $n
+	} else {
+	    lappend undefined($sym) $n
+	}
+    }
+
+    foreach def [array names users] {
+	$t set $def users $users($def)
+    }
+
+    $t set root definitions [array get definitions]
+    $t set root undefined   [array get undefined]
+    $t set root symbol <StartExpression>
+    $t set root name   <HalfBaked>
+
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Helpers
+
+proc ::page::parse::peghb::Start {t pe} {
+    variable fixup
+    $t set root start [treeOf $t root $pe fixup]
+    return
+}
+
+proc ::page::parse::peghb::Define {t mode sym pe} {
+    variable fixup
+    variable definitions
+
+    set def [$t insert root end]
+
+    $t set $def users  {}
+    $t set $def symbol $sym
+    $t set $def label  $sym
+    $t set $def mode   $mode
+
+    treeOf $t $def $pe fixup
+
+    set definitions($sym) $def
+    return
+}
+
+proc ::page::parse::peghb::treeOf {t root pe fv} {
+    upvar 1 $fv fixup
+
+    set n  [$t insert $root end]
+    set op [lindex $pe 0]
+    $t set $n op $op
+
+    if {$op eq "t"} {
+	$t set $n char [lindex $pe 1]
+
+    } elseif {$op eq ".."} {
+	$t set $n begin [lindex $pe 1]
+	$t set $n end   [lindex $pe 2]
+
+    } elseif {$op eq "n"} {
+
+	set sym [lindex $pe 1]
+	$t set $n sym $sym
+	$t set $n def ""
+
+	lappend fixup $n $sym
+    } else {
+	foreach sub [lrange $pe 1 end] {
+	    treeOf $t $n $sub fixup
+	}
+    }
+    return $n
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Strings.
+
+namespace eval ::page::parse::peghb {}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::parse::peghb 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/parse_pegser.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/parse_pegser.tcl
new file mode 100644
index 00000000..b3814a7c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/parse_pegser.tcl
@@ -0,0 +1,99 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / Frontend - Read serialized PEG container.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require grammar::peg
+
+namespace eval ::page::parse::pegser {}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::parse::pegser {serial t} {
+
+    ::grammar::peg gr deserialize $serial
+
+    $t set root start [pegser::treeOf $t root [gr start] fixup]
+
+    array set definitions {}
+    foreach sym [gr nonterminals] {
+	set def [$t insert root end]
+
+	$t set $def users  {}
+	$t set $def symbol $sym
+	$t set $def label  $sym
+	$t set $def mode       [gr nonterminal mode $sym]
+	pegser::treeOf $t $def [gr nonterminal rule $sym] fixup
+
+	set definitions($sym) $def
+    }
+
+    array set undefined {}
+    array set users     {}
+    foreach {n sym} $fixup {
+	if {[info exists definitions($sym)]} {
+	    set def $definitions($sym)
+	    $t set $n def $def
+	    lappend users($def) $n
+	} else {
+	    lappend undefined($sym) $n
+	}
+    }
+
+    foreach def [array names users] {
+	$t set $def users $users($def)
+    }
+
+    $t set root definitions [array get definitions]
+    $t set root undefined   [array get undefined]
+    $t set root symbol <StartExpression>
+    $t set root name   <Serialization>
+
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Helpers
+
+proc ::page::parse::pegser::treeOf {t root pe fv} {
+    upvar 1 $fv fixup
+
+    set n  [$t insert $root end]
+    set op [lindex $pe 0]
+    $t set $n op $op
+
+    if {$op eq "t"} {
+	$t set $n char [lindex $pe 1]
+
+    } elseif {$op eq ".."} {
+	$t set $n begin [lindex $pe 1]
+	$t set $n end   [lindex $pe 2]
+
+    } elseif {$op eq "n"} {
+
+	set sym [lindex $pe 1]
+	$t set $n sym $sym
+	$t set $n def ""
+
+	lappend fixup $n $sym
+    } else {
+	foreach sub [lrange $pe 1 end] {
+	    treeOf $t $n $sub fixup
+	}
+    }
+    return $n
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Strings.
+
+namespace eval ::page::parse::pegser {}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::parse::pegser 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/peg_grammar.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/peg_grammar.tcl
new file mode 100644
index 00000000..b5851252
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/peg_grammar.tcl
@@ -0,0 +1,117 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / Grammar for reading of PE grammars
+
+## Parsing Expression Grammar 'pg::peg::grammar'.
+
+# ### ### ### ######### ######### #########
+## Package description
+
+## It provides a single command returning the handle of a
+## grammar container in which the grammar 'pg::peg::grammar'
+## is stored. The container is usable by a PEG interpreter
+## or other packages taking PE grammars.
+
+# ### ### ### ######### ######### #########
+## Requisites.
+## - PEG container type
+
+package require grammar::peg
+
+namespace eval ::pg::peg::grammar {}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::pg::peg::grammar {} {
+    return $grammar::gr
+}
+
+# ### ### ### ######### ######### #########
+# ### ### ### ######### ######### #########
+## Data and helpers.
+
+namespace eval ::pg::peg::grammar {
+    # Grammar container
+    variable gr [::grammar::peg gr]
+}
+
+proc ::pg::peg::grammar::Start {pe} {
+    variable gr
+    $gr start $pe
+    return
+}
+
+proc ::pg::peg::grammar::Define {mode nt pe} {
+    variable gr
+    $gr nonterminal add  $nt $pe
+    $gr nonterminal mode $nt $mode
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Initialization = Grammar definition
+    
+namespace eval ::pg::peg::grammar {
+    Start  {n Grammar}
+
+    Define leaf    ALNUM         {x {t <} {t a} {t l} {t n} {t u} {t m} {t >} {n SPACE}}
+    Define leaf    ALPHA         {x {t <} {t a} {t l} {t p} {t h} {t a} {t >} {n SPACE}}
+    Define leaf    AND           {x {t &} {n SPACE}}
+    Define discard APOSTROPH     {t '}
+    Define value   Attribute     {x {/ {n VOID} {n LEAF} {n MATCH}} {n COLON}}
+    Define value   Char          {/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}}
+    Define match   CharOctalFull {x {t \134} {.. 0 2} {.. 0 7} {.. 0 7}}
+    Define match   CharOctalPart {x {t \134} {.. 0 7} {? {.. 0 7}}}
+    Define match   CharSpecial   {x {t \134} {/ {t n} {t r} {t t} {t '} {t \42} {t \133} {t \135} {t \134}}}
+    Define match   CharUnescaped {x {! {t \134}} dot}
+    Define match   CharUnicode   {x {t \134} {t u} {n HexDigit} {? {x {n HexDigit} {? {x {n HexDigit} {? {n HexDigit}}}}}}}
+    Define value   Class         {x {n OPENB} {* {x {! {n CLOSEB}} {n Range}}} {n CLOSEB} {n SPACE}}
+    Define discard CLOSE         {x {t \51} {n SPACE}}
+    Define discard CLOSEB        {t \135}
+    Define discard COLON         {x {t :} {n SPACE}}
+    Define discard COMMENT       {x {t #} {* {x {! {n EOL}} dot}} {n EOL}}
+    Define discard DAPOSTROPH    {t \42}
+    Define value   Definition    {x {? {n Attribute}} {n Identifier} {n IS} {n Expression} {n SEMICOLON}}
+    Define leaf    DOT           {x {t .} {n SPACE}}
+    Define discard END           {x {t E} {t N} {t D} {n SPACE}}
+    Define discard EOF           {! dot}
+    Define discard EOL           {/ {x {t \n} {t \r}} {t \n} {t \r}}
+    Define value   Expression    {x {n Sequence} {* {x {n SLASH} {n Sequence}}}}
+    Define discard Final         {x {n END} {n SEMICOLON} {n SPACE}}
+    Define value   Grammar       {x {n SPACE} {n Header} {+ {n Definition}} {n Final} {n EOF}}
+    Define value   Header        {x {n PEG} {n Identifier} {n StartExpr}}
+    Define discard HexDigit      {/ {.. 0 9} {.. a f} {.. A F}}
+    Define match   Ident         {x {/ {t _} {t :} alpha} {* {/ {t _} {t :} alnum}}}
+    Define value   Identifier    {x {n Ident} {n SPACE}}
+    Define discard IS            {x {t <} {t -} {n SPACE}}
+    Define leaf    LEAF          {x {t l} {t e} {t a} {t f} {n SPACE}}
+    Define value   Literal       {/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n SPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n SPACE}}}
+    Define leaf    MATCH         {x {t m} {t a} {t t} {t c} {t h} {n SPACE}}
+    Define leaf    NOT           {x {t !} {n SPACE}}
+    Define discard OPEN          {x {t \50} {n SPACE}}
+    Define discard OPENB         {t \133}
+    Define discard PEG           {x {t P} {t E} {t G} {n SPACE}}
+    Define leaf    PLUS          {x {t +} {n SPACE}}
+    Define value   Prefix        {x {? {/ {n AND} {n NOT}}} {n Suffix}}
+    Define value   Primary       {/ {n ALNUM} {n ALPHA} {n Identifier} {x {n OPEN} {n Expression} {n CLOSE}} {n Literal} {n Class} {n DOT}}
+    Define leaf    QUESTION      {x {t ?} {n SPACE}}
+    Define value   Range         {/ {x {n Char} {n TO} {n Char}} {n Char}}
+    Define discard SEMICOLON     {x {t \73} {n SPACE}}
+    Define value   Sequence      {+ {n Prefix}}
+    Define discard SLASH         {x {t /} {n SPACE}}
+    Define discard SPACE         {* {/ {t \40} {t \t} {n EOL} {n COMMENT}}}
+    Define leaf    STAR          {x {t *} {n SPACE}}
+    Define value   StartExpr     {x {n OPEN} {n Expression} {n CLOSE}}
+    Define value   Suffix        {x {n Primary} {? {/ {n QUESTION} {n STAR} {n PLUS}}}}
+    Define discard TO            {t -}
+    Define leaf    VOID          {x {t v} {t o} {t i} {t d} {n SPACE}}
+}
+
+# ### ### ### ######### ######### #########
+## Package Management - Ready
+
+# @sak notprovided pg::peg::grammar
+package provide pg::peg::grammar 0.1
+    
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/pkgIndex.tcl
new file mode 100644
index 00000000..71cb4036
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/pkgIndex.tcl
@@ -0,0 +1,80 @@
+# -- PAGE application packages --
+# -- ---- plugin management
+
+package ifneeded page::pluginmgr 0.2 [list source [file join $dir pluginmgr.tcl]]
+
+# -- PAGE plugin packages
+# -- ---- Canned configurations
+
+package ifneeded page::config::peg   0.1 [list source [file join $dir plugins/config_peg.tcl]]
+
+# -- PAGE plugin packages
+# -- ---- Readers
+
+package ifneeded page::reader::peg     0.1 [list source [file join $dir plugins/reader_peg.tcl]]
+package ifneeded page::reader::lemon   0.1 [list source [file join $dir plugins/reader_lemon.tcl]]
+package ifneeded page::reader::hb      0.1 [list source [file join $dir plugins/reader_hb.tcl]]
+package ifneeded page::reader::ser     0.1 [list source [file join $dir plugins/reader_ser.tcl]]
+package ifneeded page::reader::treeser 0.1 [list source [file join $dir plugins/reader_treeser.tcl]]
+
+# -- PAGE plugin packages
+# -- ---- Writers
+
+package ifneeded page::writer::null     0.1   [list source [file join $dir plugins/writer_null.tcl]]
+package ifneeded page::writer::me       0.1   [list source [file join $dir plugins/writer_me.tcl]]
+package ifneeded page::writer::mecpu    0.1.1 [list source [file join $dir plugins/writer_mecpu.tcl]]
+package ifneeded page::writer::tree     0.1   [list source [file join $dir plugins/writer_tree.tcl]]
+package ifneeded page::writer::tpc      0.1   [list source [file join $dir plugins/writer_tpc.tcl]]
+package ifneeded page::writer::hb       0.1   [list source [file join $dir plugins/writer_hb.tcl]]
+package ifneeded page::writer::ser      0.1   [list source [file join $dir plugins/writer_ser.tcl]]
+package ifneeded page::writer::peg      0.1   [list source [file join $dir plugins/writer_peg.tcl]]
+package ifneeded page::writer::identity 0.1   [list source [file join $dir plugins/writer_identity.tcl]]
+
+# -- PAGE plugin packages
+# -- ---- Transformations
+
+package ifneeded page::transform::reachable  0.1 \
+	[list source [file join $dir plugins/transform_reachable.tcl]]
+package ifneeded page::transform::realizable 0.1 \
+	[list source [file join $dir plugins/transform_realizable.tcl]]
+package ifneeded page::transform::mecpu 0.1 \
+	[list source [file join $dir plugins/transform_mecpu.tcl]]
+
+# -- PAGE packages --
+# -- --- Parsing and normalization packages used by the reader plugins.
+
+package ifneeded page::parse::peg        0.1 [list source [file join $dir parse_peg.tcl]]
+package ifneeded page::parse::lemon      0.1 [list source [file join $dir parse_lemon.tcl]]
+package ifneeded page::parse::pegser     0.1 [list source [file join $dir parse_pegser.tcl]]
+package ifneeded page::parse::peghb      0.1 [list source [file join $dir parse_peghb.tcl]]
+
+package ifneeded page::util::norm::peg   0.1 [list source [file join $dir util_norm_peg.tcl]]
+package ifneeded page::util::norm::lemon 0.1 [list source [file join $dir util_norm_lemon.tcl]]
+
+# @mdgen EXCLUDE: peg_grammar.tcl
+### package ifneeded pg::peg::grammar      0.1 [list source [file join $dir peg_grammar.tcl]]
+
+# -- PAGE packages --
+# -- --- Code generation packages used by the writer plugins.
+
+package ifneeded page::gen::tree::text 0.1 [list source [file join $dir gen_tree_text.tcl]]
+package ifneeded page::gen::peg::cpkg  0.1 [list source [file join $dir gen_peg_cpkg.tcl]]
+package ifneeded page::gen::peg::hb    0.1 [list source [file join $dir gen_peg_hb.tcl]]
+package ifneeded page::gen::peg::ser   0.1 [list source [file join $dir gen_peg_ser.tcl]]
+package ifneeded page::gen::peg::canon 0.1 [list source [file join $dir gen_peg_canon.tcl]]
+package ifneeded page::gen::peg::me    0.1 [list source [file join $dir gen_peg_me.tcl]]
+package ifneeded page::gen::peg::mecpu 0.1 [list source [file join $dir gen_peg_mecpu.tcl]]
+
+# -- Transformation Helper Packages --
+
+package ifneeded page::analysis::peg::minimize   0.1 [list source [file join $dir analysis_peg_minimize.tcl]]
+package ifneeded page::analysis::peg::reachable  0.1 [list source [file join $dir analysis_peg_reachable.tcl]]
+package ifneeded page::analysis::peg::realizable 0.1 [list source [file join $dir analysis_peg_realizable.tcl]]
+package ifneeded page::analysis::peg::emodes     0.1 [list source [file join $dir analysis_peg_emodes.tcl]]
+package ifneeded page::compiler::peg::mecpu      0.1.1 [list source [file join $dir compiler_peg_mecpu.tcl]]
+
+# -- Various other utilities --
+
+package ifneeded page::util::peg   0.1 [list source [file join $dir util_peg.tcl]]
+package ifneeded page::util::quote 0.1 [list source [file join $dir util_quote.tcl]]
+package ifneeded page::util::flow  0.1 [list source [file join $dir util_flow.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/pluginmgr.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/pluginmgr.tcl
new file mode 100644
index 00000000..ac00192b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/pluginmgr.tcl
@@ -0,0 +1,581 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+
+## This package provides custom plugin management specific to PAGE. It
+## is built on top of the generic plugin management framework (See
+## ---> pluginmgr).
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require fileutil
+package require pluginmgr           ; # Generic plugin management framework
+
+namespace eval ::page::pluginmgr {}
+
+# ### ### ### ######### ######### #########
+## API (Public, exported)
+
+proc ::page::pluginmgr::reportvia {cmd} {
+    variable reportcmd $cmd
+    return
+}
+
+proc ::page::pluginmgr::log {cmd} {
+    variable reader
+    variable writer
+    variable transforms
+
+    set     iplist {}
+    lappend iplist [$reader interpreter]
+    lappend iplist [$writer interpreter]
+    foreach t $transforms {
+	lappend iplist [$t interpreter]
+    }
+
+    if {$cmd eq ""} {
+	# No logging. Disable with empty command,
+	# to allow the system to completely remove
+	# them from the bytecode (= No execution
+	# overhead).
+
+	foreach ip $iplist {
+	    $ip eval [list proc page_log_error   args {}]
+	    $ip eval [list proc page_log_warning args {}]
+	    $ip eval [list proc page_log_info    args {}]
+	}
+    } else {
+	# Activate logging. Make the commands in
+	# the interpreters aliases to us.
+
+	foreach ip $iplist {
+	    interp alias $ip page_log_error   {} ${cmd}::error
+	    interp alias $ip page_log_warning {} ${cmd}::warning
+	    interp alias $ip page_log_info    {} ${cmd}::info
+	}
+    }
+    return
+}
+
+proc ::page::pluginmgr::reader {name} {
+    variable reader
+
+    $reader load $name
+    return [$reader do page_roptions]
+}
+
+proc ::page::pluginmgr::rconfigure {dict} {
+    variable reader
+    foreach {k v} $dict {
+	$reader do page_rconfigure $k $v
+    }
+    return
+}
+
+proc ::page::pluginmgr::rtimeable {} {
+    variable reader
+    return [$reader do page_rfeature timeable]
+}
+
+proc ::page::pluginmgr::rtime {} {
+    variable reader
+    $reader do page_rtime
+    return
+}
+
+proc ::page::pluginmgr::rgettime {} {
+    variable reader
+    return [$reader do page_rgettime]
+}
+
+proc ::page::pluginmgr::rhelp {} {
+    variable reader
+    return [$reader do page_rhelp]
+}
+
+proc ::page::pluginmgr::rlabel {} {
+    variable reader
+    return [$reader do page_rlabel]
+}
+
+proc ::page::pluginmgr::read {read eof {complete {}}} {
+    variable reader
+
+    #interp alias $ip page_read {} {*}$read
+    #interp alias $ip page_eof  {} {*}$eof
+
+    set ip [$reader interpreter]
+    eval [linsert $read 0 interp alias $ip page_read {}]
+    eval [linsert $eof  0 interp alias $ip page_eof  {}]
+
+    if {![llength $complete]} {
+	interp alias $ip page_read_done {} ::page::pluginmgr::Nop
+    } else {
+	eval [linsert $complete  0 interp alias $ip page_read_done  {}]
+    }
+
+    return [$reader do page_rrun]
+}
+
+proc ::page::pluginmgr::writer {name} {
+    variable writer
+
+    $writer load $name
+    return [$writer do page_woptions]
+}
+
+proc ::page::pluginmgr::wconfigure {dict} {
+    variable writer
+    foreach {k v} $dict {
+	$writer do page_wconfigure $k $v
+    }
+    return
+}
+
+proc ::page::pluginmgr::wtimeable {} {
+    variable writer
+    return [$writer do page_wfeature timeable]
+}
+
+proc ::page::pluginmgr::wtime {} {
+    variable writer
+    $writer do page_wtime
+    return
+}
+
+proc ::page::pluginmgr::wgettime {} {
+    variable writer
+    return [$writer do page_wgettime]
+}
+
+proc ::page::pluginmgr::whelp {} {
+    variable writer
+    return [$writer do page_whelp]
+}
+
+proc ::page::pluginmgr::wlabel {} {
+    variable writer
+    return [$writer do page_wlabel]
+}
+
+proc ::page::pluginmgr::write {chan data} {
+    variable writer
+
+    $writer do page_wrun $chan $data
+    return
+}
+
+proc ::page::pluginmgr::transform {name} {
+    variable transform
+    variable transforms
+
+    $transform load $name
+
+    set id [llength $transforms]
+    set opt [$transform do page_toptions]
+    lappend transforms [$transform clone]
+
+    return [list $id $opt]
+}
+
+proc ::page::pluginmgr::tconfigure {id dict} {
+    variable transforms
+
+    set t [lindex $transforms $id]
+
+    foreach {k v} $dict {
+	$t do page_tconfigure $k $v
+    }
+    return
+}
+
+proc ::page::pluginmgr::ttimeable {id} {
+    variable transforms
+    set t [lindex $transforms $id]
+    return [$t do page_tfeature timeable]
+}
+
+proc ::page::pluginmgr::ttime {id} {
+    variable transforms
+    set t [lindex $transforms $id]
+    $t do page_ttime
+    return
+}
+
+proc ::page::pluginmgr::tgettime {id} {
+    variable transforms
+    set t [lindex $transforms $id]
+    return [$t do page_tgettime]
+}
+
+proc ::page::pluginmgr::thelp {id} {
+    variable transforms
+    set t [lindex $transforms $id]
+    return [$t do page_thelp]
+}
+
+proc ::page::pluginmgr::tlabel {id} {
+    variable transforms
+    set t [lindex $transforms $id]
+    return [$t do page_tlabel]
+}
+
+proc ::page::pluginmgr::transform_do {id data} {
+    variable transforms
+    variable reader
+
+    set t [lindex $transforms $id]
+
+    return [$t do page_trun $data]
+}
+
+proc ::page::pluginmgr::configuration {name} {
+    variable config
+
+    if {[file exists $name]} {
+	# Try as plugin first. On failure read it as list of options,
+	# separated by spaces and tabs, and possibly quoted with
+	# quotes and double-quotes.
+
+	if {[catch {$config load $name}]} {
+	    set ch      [open $name r]
+	    set options [::read $ch]
+	    close $ch
+
+	    set def {}
+	    while {[string length $options]} {
+		if {[regsub "^\[ \t\n\]+" $options {} options]} {
+		    # Skip whitespace
+		    continue
+		}
+		if {[regexp -indices {^'(([^']|(''))*)'} \
+			$options -> word]} {
+		    foreach {__ end} $word break
+		    lappend def [string map {'' '} [string range $options 1 $end]]
+		    set options [string range $options [incr end 2] end]
+		} elseif {[regexp -indices {^"(([^"]|(""))*)"} \
+			$options -> word]} {
+		    foreach {__ end} $word break
+		    lappend def [string map {{""} {"}} [string range $options 1 $end]]
+		    set options [string range $options [incr end 2] end]
+		} elseif {[regexp -indices "^(\[^ \t\n\]+)" \
+			$options -> word]} {
+		    foreach {__ end} $word break
+		    lappend def [string range $options 0 $end]
+		    set options [string range $options [incr end] end]
+		}
+	    }
+	    return $def
+	}
+    } else {
+	$config load $name
+    }
+    set def [$config do page_cdefinition]
+    $config unload
+    return $def
+}
+
+proc ::page::pluginmgr::report {level text {from {}} {to {}}} {
+    variable replevel
+    variable reportcmd
+    uplevel #0 [linsert $reportcmd end $replevel($level) $text $from $to]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internals
+
+## Data structures
+##
+## - reader    | Instances of pluginmgr configured for input,
+## - transform | transformational, and output plugins. The
+## - writer    | manager for transforms is actually a template
+##             | from which the actual instances are cloned.
+
+## - reportcmd | Callback for reporting of input error and warnings.
+## - replevel  | Mapping from chosen level to the right-padded text
+##             | to use.
+
+namespace eval ::page::pluginmgr {
+    variable  replevel
+    array set replevel {
+	info    {info   }
+	warning {warning}
+	error   {error  }
+    }
+}
+
+proc ::page::pluginmgr::Initialize {} {
+    InitializeReporting
+    InitializeConfig
+    InitializeReader
+    InitializeTransform
+    InitializeWriter
+    return
+}
+
+proc ::page::pluginmgr::InitializeReader {} {
+    variable commands
+    variable reader_api
+    variable reader [pluginmgr RD \
+	    -setup   ::page::pluginmgr::InitializeReaderIp \
+	    -pattern page::reader::* \
+	    -api     $reader_api \
+	    -cmdip   {} \
+	    -cmds    $commands]
+
+    # The page_log_* commands are set later, when it is known if
+    # logging is active or not, as their implementation depends on
+    # this.
+
+    pluginmgr::paths $reader page::reader
+    return
+}
+
+proc ::page::pluginmgr::InitializeReaderIp {p ip} {
+    interp eval $ip {
+	# @sak notprovided page::plugin
+	# @sak notprovided page::plugin::reader
+	package provide page::plugin         1.0
+	package provide page::plugin::reader 1.0
+    }
+    interp alias $ip puts  {} puts
+    interp alias $ip open  {} ::page::pluginmgr::AliasOpen $ip
+    interp alias $ip write {} ::page::pluginmgr::WriteFile $ip
+    return
+}
+
+proc ::page::pluginmgr::InitializeWriter {} {
+    variable commands
+    variable writer_api
+    variable writer [pluginmgr WR \
+	    -setup   ::page::pluginmgr::InitializeWriterIp \
+	    -pattern page::writer::* \
+	    -api     $writer_api \
+	    -cmdip   {} \
+	    -cmds    $commands]
+
+    # The page_log_* commands are set later, when it is known if
+    # logging is active or not, as their implementation depends on
+    # this.
+
+    pluginmgr::paths $writer page::writer
+    return
+}
+
+proc ::page::pluginmgr::InitializeWriterIp {p ip} {
+    interp eval $ip {
+	# @sak notprovided page::plugin
+	# @sak notprovided page::plugin::writer
+	package provide page::plugin         1.0
+	package provide page::plugin::writer 1.0
+    }
+    interp alias $ip puts  {} puts
+    interp alias $ip open  {} ::page::pluginmgr::AliasOpen $ip
+    interp alias $ip write {} ::page::pluginmgr::WriteFile $ip
+    return
+}
+
+proc ::page::pluginmgr::InitializeTransform {} {
+    variable transforms {}
+    variable commands
+    variable transform_api
+    variable transform [pluginmgr TR \
+	    -setup   ::page::pluginmgr::InitializeTransformIp \
+	    -pattern page::transform::* \
+	    -api     $transform_api \
+	    -cmdip   {} \
+	    -cmds    $commands]
+
+    # The page_log_* commands are set later, when it is known if
+    # logging is active or not, as their implementation depends on
+    # this.
+
+    pluginmgr::paths $transform page::transform
+    return
+}
+
+proc ::page::pluginmgr::InitializeTransformIp {p ip} {
+    interp eval $ip {
+	# @sak notprovided page::plugin
+	# @sak notprovided page::plugin::transform
+	package provide page::plugin            1.0
+	package provide page::plugin::transform 1.0
+    }
+    interp alias $ip puts  {} puts
+    interp alias $ip open  {} ::page::pluginmgr::AliasOpen $ip
+    interp alias $ip write {} ::page::pluginmgr::WriteFile $ip
+    return
+}
+
+proc ::page::pluginmgr::InitializeConfig {} {
+    variable config [pluginmgr CO \
+	    -pattern page::config::* \
+	    -api {page_cdefinition}]
+
+    pluginmgr::paths $config page::config
+    return
+}
+
+proc ::page::pluginmgr::InitializeReporting {} {
+    variable reportcmd ::page::pluginmgr::ReportStderr
+    return
+}
+
+proc ::page::pluginmgr::ReportStderr {level text from to} {
+    # from = epsilon | list (line col)
+    # to   = epsilon | list (line col)
+    # line = 5 digits, col = 3 digits
+
+    if {
+	($text eq "") &&
+	![llength $from] &&
+	![llength $to]
+    } {
+	puts stderr ""
+	return
+    }
+
+    puts -nonewline stderr $level
+    WriteLocation $from
+    if {![llength $to]} {
+	puts -nonewline stderr { }
+    } else {
+	puts -nonewline stderr {-}
+    }
+    WriteLocation $to
+    puts -nonewline stderr " "
+    puts -nonewline stderr $text
+    puts stderr ""
+    return
+}
+
+proc ::page::pluginmgr::WriteLocation {loc} {
+    if {![llength $loc]} {
+	set text {         }
+    } else {
+	set line [lindex $loc 0]
+	set col  [lindex $loc 1]
+	set text {}
+	if {![string length $line]} {
+	    append text _____
+	} else {
+	    append text [string map {{ } _} [format %5d $line]]
+	}
+	append text @
+	if {![string length $col]} {
+	    append text ___
+	} else {
+	    append text [string map {{ } _} [format %3d $col]]
+	}
+    }
+    puts -nonewline stderr $text
+    return
+}
+
+proc ::page::pluginmgr::AliasOpen {slave file {acc {}} {perm {}}} {
+
+    if {$acc eq ""} {set acc r}
+
+    ::safe::Log $slave =============================================
+    ::safe::Log $slave "open $file $acc $perm"
+
+    if {[regexp {[wa+]|(WRONLY)|(RDWR)|(APPEND)|(CREAT)|(TRUNC)} $acc]} {
+	# Do not allow write acess.
+	::safe::Log $slave "permission denied"
+	::safe::Log $slave 0/============================================
+	return -code error "permission denied"
+    }
+
+    if {[catch {set file [::safe::TranslatePath $slave $file]} msg]} {
+	::safe::Log $slave $msg
+	::safe::Log $slave "permission denied"
+	::safe::Log $slave 1/============================================
+	return -code error "permission denied"
+    }
+    
+    # check that the path is in the access path of that slave
+
+    if {[catch {::safe::FileInAccessPath $slave $file} msg]} {
+	::safe::Log $slave $msg
+	::safe::Log $slave "permission denied"
+	::safe::Log $slave 2/============================================
+	return -code error "permission denied"
+    }
+
+    # do the checks on the filename :
+
+    if {[catch {::safe::CheckFileName $slave $file} msg]} {
+	::safe::Log $slave "$file: $msg"
+	::safe::Log $slave "$msg"
+	::safe::Log $slave 3/============================================
+	return -code error $msg
+    }
+
+    if {[catch {::interp invokehidden $slave open $file $acc} msg]} {
+	::safe::Log $slave "Caught: $msg"
+	::safe::Log $slave "script error"
+	::safe::Log $slave 4/============================================
+	return -code error "script error"
+    }
+
+    ::safe::Log $slave =/============================================
+    return $msg
+
+}
+
+proc ::page::pluginmgr::Nop {args} {}
+
+proc ::page::pluginmgr::WriteFile {slave file text} {
+    if {[file pathtype $file] ne "relative"} {
+	set file [file join [pwd] [file tail $fail]]
+    }
+    file mkdir [file dirname $file]
+    fileutil::writeFile      $file $text
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+namespace eval ::page::pluginmgr {
+
+    # List of functions in the various plugin APIs
+
+    variable reader_api {
+	page_rhelp
+	page_rlabel
+	page_roptions
+	page_rconfigure
+	page_rrun
+	page_rfeature
+    }
+    variable writer_api {
+	page_whelp
+	page_wlabel
+	page_woptions
+	page_wconfigure
+	page_wrun
+	page_wfeature
+    }
+    variable transform_api {
+	page_thelp
+	page_tlabel
+	page_toptions
+	page_tconfigure
+	page_trun
+	page_tfeature
+    }
+    variable commands {
+	page_info    {::page::pluginmgr::report info}
+	page_warning {::page::pluginmgr::report warning}
+	page_error   {::page::pluginmgr::report error}
+    }
+}
+
+::page::pluginmgr::Initialize
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::pluginmgr 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/config_peg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/config_peg.tcl
new file mode 100644
index 00000000..517877fa
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/config_peg.tcl
@@ -0,0 +1,14 @@
+# -*- tcl -*- $Id: config_peg.tcl,v 1.2 2005/09/28 06:16:38 andreas_kupries Exp $
+
+package provide page::config::peg 0.1
+
+proc page_cdefinition {} {
+    return {
+	--reset
+	--append
+	--reader    peg
+	--transform reachable
+	--transform realizable
+	--writer    me
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/pkgIndex.tcl
new file mode 100644
index 00000000..8b6332aa
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/pkgIndex.tcl
@@ -0,0 +1,34 @@
+#puts @plugins
+# -- PAGE plugin packages
+# -- ---- Canned configurations
+
+package ifneeded page::config::peg   0.1 [list source [file join $dir config_peg.tcl]]
+
+# -- PAGE plugin packages
+# -- ---- Readers
+
+package ifneeded page::reader::peg     0.1 [list source [file join $dir reader_peg.tcl]]
+package ifneeded page::reader::lemon   0.1 [list source [file join $dir reader_lemon.tcl]]
+package ifneeded page::reader::hb      0.1 [list source [file join $dir reader_hb.tcl]]
+package ifneeded page::reader::ser     0.1 [list source [file join $dir reader_ser.tcl]]
+package ifneeded page::reader::treeser 0.1 [list source [file join $dir reader_treeser.tcl]]
+
+# -- PAGE plugin packages
+# -- ---- Writers
+
+package ifneeded page::writer::null     0.1 [list source [file join $dir writer_null.tcl]]
+package ifneeded page::writer::me       0.1 [list source [file join $dir writer_me.tcl]]
+package ifneeded page::writer::mecpu    0.1.1 [list source [file join $dir writer_mecpu.tcl]]
+package ifneeded page::writer::tree     0.1 [list source [file join $dir writer_tree.tcl]]
+package ifneeded page::writer::tpc      0.1 [list source [file join $dir writer_tpc.tcl]]
+package ifneeded page::writer::hb       0.1 [list source [file join $dir writer_hb.tcl]]
+package ifneeded page::writer::ser      0.1 [list source [file join $dir writer_ser.tcl]]
+package ifneeded page::writer::peg      0.1 [list source [file join $dir writer_peg.tcl]]
+package ifneeded page::writer::identity 0.1 [list source [file join $dir writer_identity.tcl]]
+
+# -- PAGE plugin packages
+# -- ---- Transformations
+
+package ifneeded page::transform::reachable  0.1 [list source [file join $dir transform_reachable.tcl]]
+package ifneeded page::transform::realizable 0.1 [list source [file join $dir transform_realizable.tcl]]
+package ifneeded page::transform::mecpu      0.1 [list source [file join $dir transform_mecpu.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_hb.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_hb.tcl
new file mode 100644
index 00000000..4cee18c0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_hb.tcl
@@ -0,0 +1,114 @@
+# -*- tcl -*- 
+# -- $Id: reader_hb.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - reader - HB ~ Half baked PEG Container
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_read        | Access to the input stream.
+# page_read_done   |
+# page_eof         |
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_rfeature    | Query for special plugin features page might wish to use.
+# page_rtime       | Activate collection of timing statistics.
+# page_rgettime    | Return the collected timing statistics.
+# page_rlabel      | User readable label for the plugin.
+# page_rhelp       | Doctools help text for plugin.
+# page_roptions    | Options understood by plugin.
+# page_rconfigure  | Option (re)configuration.
+# page_rdata       | External access to processed input stream.
+# page_rrun        | Process input stream per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require struct::tree         ; # Data structure.
+package require page::parse::peghb
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_rlabel {} {
+    return {Halfbaked PEG Container}
+}
+
+proc page_rfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_rtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_rgettime {} {
+    global  usec
+    return $usec
+}
+
+proc page_rhelp {} {
+    return {}
+}
+
+proc page_roptions {} {
+    return {}
+}
+
+proc page_rconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+## proc page_rdata {} {}
+## Created in 'Initialize'
+
+proc page_rrun {} {
+    global timed usec
+    page_log_info "reader/hb/run/parse"
+
+    struct::tree ::tree
+
+    if {$timed} {
+	set usec [lindex [time {
+	    page::parse::peghb [page_read] ::tree
+	}] 0] ; #{}
+    } else {
+	page::parse::peghb [page_read] ::tree
+    }
+    page_read_done
+
+    set ast [::tree serialize]
+    ::tree destroy
+
+    page_log_info "reader/hb/run/ok"
+    return $ast
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::reader::hb 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_lemon.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_lemon.tcl
new file mode 100644
index 00000000..16df2903
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_lemon.tcl
@@ -0,0 +1,170 @@
+# -*- tcl -*- 
+# -- $Id: reader_lemon.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - reader - LEMON ~ Grammar specification as understood
+#                                by drh's lemon parser generator.
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_read        | Access to the input stream.
+# page_read_done   |
+# page_eof         |
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_rfeature    | Query for special plugin features page might wish to use.
+# page_rtime       | Activate collection of timing statistics.
+# page_rgettime    | Return the collected timing statistics.
+# page_rlabel      | User readable label for the plugin.
+# page_rhelp       | Doctools help text for plugin.
+# page_roptions    | Options understood by plugin.
+# page_rconfigure  | Option (re)configuration.
+# page_rdata       | External access to processed input stream.
+# page_rrun        | Process input stream per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::util::norm::lemon ; # Normalize AST generated by PE matcher.
+package require page::parse::lemon      ; # Mengine based parser for Lemon grammars.
+package require struct::tree            ; # Data structure.
+package require grammar::me::util       ; # AST conversion
+
+global usec
+global timed
+set    timed 0
+
+global cline
+global ccol
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_rlabel {} {
+    return {Lemon specification}
+}
+
+proc page_rfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_rtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_rgettime {} {
+    global  usec
+    return $usec
+}
+
+proc page_rhelp {} {
+    return {}
+}
+
+proc page_roptions {} {
+    return {}
+}
+
+proc page_rconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+## proc page_rdata {} {}
+## Created in 'Initialize'
+
+proc page_rrun {} {
+    global timed usec cline ccol
+    page_log_info "reader/lemon/run/parse"
+
+    set ast {}
+    set err {}
+
+    # Location of the next character to be read.
+    set cline 1
+    set ccol  0
+
+    if {$timed} {
+	set usec [lindex [time {
+	    set ok [::page::parse::lemon::parse ::Next err ast]
+	}] 0] ; #{}
+    } else {
+	set ok [::page::parse::lemon::parse ::Next err ast]
+    }
+    page_read_done
+    page_log_info "reader/lemon/run/check-for-errors"
+
+    if {!$ok} {
+	foreach {olc   messages} $err     break
+	foreach {offset linecol} $olc     break
+	foreach {line       col} $linecol break
+
+	set olc [string map {{ } _} \
+		[format %5d $line]]@[string map {{ } _} \
+		[format %3d $col]]/([format %5d $offset])
+
+	foreach m $messages {
+	    page_log_error "reader/lemon/run: $olc: $m"
+	    page_error $m $linecol
+	}
+
+	page_log_info "reader/lemon/run/failed"
+	return {}
+    }
+
+    page_log_info "reader/lemon/run/ast-conversion"
+
+    struct::tree                        ::tree
+    ::grammar::me::util::ast2etree $ast ::grammar::me::tcl ::tree
+    ::page::util::norm::lemon           ::tree
+
+    set ast [::tree serialize]
+    ::tree destroy
+
+    page_log_info "reader/lemon/run/ok"
+    return $ast
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+proc Next {} {
+    global cline ccol
+
+    if {[page_eof]} {return {}}
+
+    set ch [page_read 1]
+
+    if {$ch eq ""} {return {}}
+
+    set tok [list $ch {} $cline $ccol]
+
+    if {$ch eq "\n"} {
+	incr cline ; set ccol 0
+    } else {
+	incr ccol
+    }
+
+    return $tok
+}
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::reader::lemon 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_peg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_peg.tcl
new file mode 100644
index 00000000..52fd6a86
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_peg.tcl
@@ -0,0 +1,169 @@
+# -*- tcl -*- 
+# -- $Id: reader_peg.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - reader - PEG ~ Parsing Expression Grammar
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_read        | Access to the input stream.
+# page_read_done   |
+# page_eof         |
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_rfeature    | Query for special plugin features page might wish to use.
+# page_rtime       | Activate collection of timing statistics.
+# page_rgettime    | Return the collected timing statistics.
+# page_rlabel      | User readable label for the plugin.
+# page_rhelp       | Doctools help text for plugin.
+# page_roptions    | Options understood by plugin.
+# page_rconfigure  | Option (re)configuration.
+# page_rdata       | External access to processed input stream.
+# page_rrun        | Process input stream per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::util::norm::peg ; # Normalize AST generated by reader of PEG grammars
+package require page::parse::peg      ; # Mengine based parser for PE grammars.
+package require struct::tree          ; # Data structure.
+package require grammar::me::util     ; # AST conversion
+
+global usec
+global timed
+set    timed 0
+
+global cline
+global ccol
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_rlabel {} {
+    return {Parsing Expression Grammar}
+}
+
+proc page_rfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_rtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_rgettime {} {
+    global  usec
+    return $usec
+}
+
+proc page_rhelp {} {
+    return {}
+}
+
+proc page_roptions {} {
+    return {}
+}
+
+proc page_rconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+## proc page_rdata {} {}
+## Created in 'Initialize'
+
+proc page_rrun {} {
+    global timed usec cline ccol
+    page_log_info "reader/peg/run/parse"
+
+    set ast {}
+    set err {}
+
+    # Location of the next character to be read.
+    set cline 1
+    set ccol  0
+
+    if {$timed} {
+	set usec [lindex [time {
+	    set ok [::page::parse::peg::parse ::Next err ast]
+	}] 0] ; #{}
+    } else {
+	set ok [::page::parse::peg::parse ::Next err ast]
+    }
+    page_read_done
+    page_log_info "reader/peg/run/check-for-errors"
+
+    if {!$ok} {
+	foreach {olc   messages} $err     break
+	foreach {offset linecol} $olc     break
+	foreach {line       col} $linecol break
+
+	set olc [string map {{ } _} \
+		[format %5d $line]]@[string map {{ } _} \
+		[format %3d $col]]/([format %5d $offset])
+
+	foreach m $messages {
+	    page_log_error "reader/peg/run: $olc: $m"
+	    page_error $m $linecol
+	}
+
+	page_log_info "reader/peg/run/failed"
+	return {}
+    }
+
+    page_log_info "reader/peg/run/ast-conversion"
+
+    struct::tree                        ::tree
+    ::grammar::me::util::ast2etree $ast ::grammar::me::tcl ::tree
+    ::page::util::norm::peg             ::tree
+
+    set ast [::tree serialize]
+    ::tree destroy
+
+    page_log_info "reader/peg/run/ok"
+    return $ast
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+proc Next {} {
+    global cline ccol
+
+    if {[page_eof]} {return {}}
+
+    set ch [page_read 1]
+
+    if {$ch eq ""} {return {}}
+
+    set tok [list $ch {} $cline $ccol]
+
+    if {$ch eq "\n"} {
+	incr cline ; set ccol 0
+    } else {
+	incr ccol
+    }
+
+    return $tok
+}
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::reader::peg 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_ser.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_ser.tcl
new file mode 100644
index 00000000..b4e1a688
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_ser.tcl
@@ -0,0 +1,114 @@
+# -*- tcl -*- 
+# -- $Id: reader_ser.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - reader - SER ~ Serialized PEG Container
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_read        | Access to the input stream.
+# page_read_done   |
+# page_eof         |
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_rfeature    | Query for special plugin features page might wish to use.
+# page_rtime       | Activate collection of timing statistics.
+# page_rgettime    | Return the collected timing statistics.
+# page_rlabel      | User readable label for the plugin.
+# page_rhelp       | Doctools help text for plugin.
+# page_roptions    | Options understood by plugin.
+# page_rconfigure  | Option (re)configuration.
+# page_rdata       | External access to processed input stream.
+# page_rrun        | Process input stream per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require struct::tree         ; # Data structure.
+package require page::parse::pegser
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_rlabel {} {
+    return {Serialized PEG Container}
+}
+
+proc page_rfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_rtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_rgettime {} {
+    global  usec
+    return $usec
+}
+
+proc page_rhelp {} {
+    return {}
+}
+
+proc page_roptions {} {
+    return {}
+}
+
+proc page_rconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+## proc page_rdata {} {}
+## Created in 'Initialize'
+
+proc page_rrun {} {
+    global timed usec
+    page_log_info "reader/ser/run/parse"
+
+    struct::tree                    ::tree
+
+    if {$timed} {
+	set usec [lindex [time {
+	    page::parse::pegser [page_read] ::tree
+	}] 0] ; #{}
+    } else {
+	page::parse::pegser [page_read] ::tree
+    }
+    page_read_done
+
+    set ast [::tree serialize]
+    ::tree destroy
+
+    page_log_info "reader/ser/run/ok"
+    return $ast
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::reader::ser 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_treeser.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_treeser.tcl
new file mode 100644
index 00000000..6394d7bb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/reader_treeser.tcl
@@ -0,0 +1,116 @@
+# -*- tcl -*- 
+# -- $Id: reader_treeser.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - reader - TREESER ~ Serialized TREE
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_read        | Access to the input stream.
+# page_read_done   |
+# page_eof         |
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_rfeature    | Query for special plugin features page might wish to use.
+# page_rtime       | Activate collection of timing statistics.
+# page_rgettime    | Return the collected timing statistics.
+# page_rlabel      | User readable label for the plugin.
+# page_rhelp       | Doctools help text for plugin.
+# page_roptions    | Options understood by plugin.
+# page_rconfigure  | Option (re)configuration.
+# page_rdata       | External access to processed input stream.
+# page_rrun        | Process input stream per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require struct::tree ; # Data structure.
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_rlabel {} {
+    return {Serialized Tree}
+}
+
+proc page_rfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_rtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_rgettime {} {
+    global  usec
+    return $usec
+}
+
+proc page_rhelp {} {
+    return {}
+}
+
+proc page_roptions {} {
+    return {}
+}
+
+proc page_rconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+## proc page_rdata {} {}
+## Created in 'Initialize'
+
+proc page_rrun {} {
+    global timed usec
+    page_log_info "reader/treeser/run/parse"
+
+    if {$timed} {
+	set usec [lindex [time {
+	    set data [page_read]
+	}] 0] ; #{}
+    } else {
+	set data [page_read]
+    }
+    page_read_done
+
+    # Reading and passing it on is trivial.
+    # Here however we validate the we truly got
+    # a sensible serialization.
+
+    struct::tree ::tree
+    ::tree deserialize $data
+    ::tree destroy
+
+    page_log_info "reader/treeser/run/ok"
+    return $data
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::reader::treeser 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/transform_mecpu.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/transform_mecpu.tcl
new file mode 100644
index 00000000..4c48e536
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/transform_mecpu.tcl
@@ -0,0 +1,107 @@
+# -*- tcl -*- 
+# -- $Id: transform_mecpu.tcl,v 1.1 2006/07/01 01:35:21 andreas_kupries Exp $ ---
+#
+# PAGE plugin - transform - mecpu ~ Translation of grammar to ME cpu instruction set.
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_tdata       | Access to processed input stream.
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_tfeature    | Query for special plugin features page might wish to use.
+# page_ttime       | Activate collection of timing statistics.
+# page_tgettime    | Return the collected timing statistics.
+# page_tlabel      | User readable label for the plugin.
+# page_thelp       | Doctools help text for plugin.
+# page_toptions    | Options understood by plugin.
+# page_tconfigure  | Option (re)configuration.
+# page_trun        | Transform input data per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::compiler::peg::mecpu
+package require struct::tree         ; # Data structure.
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_tlabel {} {
+    return {ME cpu Translation}
+}
+
+proc page_tfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_ttime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_tgettime {} {
+    global  usec
+    return $usec
+}
+
+proc page_thelp {} {
+    return {}
+}
+
+proc page_toptions {} {
+    return {}
+}
+
+proc page_tconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+proc page_trun {data} {
+    global timed usec
+    page_log_info "transform/mecpu/run/"
+
+    if {$timed} {
+	set usec [lindex [time {
+	    ::struct::tree             ::tree deserialize $data
+	    page::compiler::peg::mecpu ::tree
+	}] 0] ; #{}
+    } else {
+	::struct::tree             ::tree deserialize $data
+	page::compiler::peg::mecpu ::tree
+    }
+    set name [::tree get root name]
+    set asm  [::tree get root asm]
+    ::tree destroy
+
+    page_log_info "transform/mecpu/run/ok"
+    return [list $name $asm]
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::transform::mecpu 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/transform_reachable.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/transform_reachable.tcl
new file mode 100644
index 00000000..2dee6dd9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/transform_reachable.tcl
@@ -0,0 +1,107 @@
+# -*- tcl -*- 
+# -- $Id: transform_reachable.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - transform - reachable ~ Reachability Analysis
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_tdata       | Access to processed input stream.
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_tfeature    | Query for special plugin features page might wish to use.
+# page_ttime       | Activate collection of timing statistics.
+# page_tgettime    | Return the collected timing statistics.
+# page_tlabel      | User readable label for the plugin.
+# page_thelp       | Doctools help text for plugin.
+# page_toptions    | Options understood by plugin.
+# page_tconfigure  | Option (re)configuration.
+# page_trun        | Transform input data per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::analysis::peg::reachable
+package require struct::tree         ; # Data structure.
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_tlabel {} {
+    return Reachability
+}
+
+proc page_tfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_ttime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_tgettime {} {
+    global  usec
+    return $usec
+}
+
+proc page_thelp {} {
+    return {}
+}
+
+proc page_toptions {} {
+    return {}
+}
+
+proc page_tconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+proc page_trun {data} {
+    global timed usec
+    page_log_info "transform/reachable/run/"
+
+    if {$timed} {
+	set usec [lindex [time {
+	    ::struct::tree          ::tree deserialize $data
+	    ::page::analysis::peg::reachable::remove! ::tree
+	}] 0] ; #{}
+    } else {
+	::struct::tree          ::tree deserialize $data
+	::page::analysis::peg::reachable::remove! ::tree
+    }
+
+    set data [::tree serialize]
+    ::tree destroy
+
+    page_log_info "transform/reachable/run/ok"
+    return $data
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::transform::reachable 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/transform_realizable.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/transform_realizable.tcl
new file mode 100644
index 00000000..38efaeb5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/transform_realizable.tcl
@@ -0,0 +1,106 @@
+# -*- tcl -*- 
+# -- $Id: transform_realizable.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - transform - realizable ~ Realizability Analysis
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_tdata       | Access to processed input stream.
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_tfeature    | Query for special plugin features page might wish to use.
+# page_ttime       | Activate collection of timing statistics.
+# page_tgettime    | Return the collected timing statistics.
+# page_tlabel      | User readable label for the plugin.
+# page_thelp       | Doctools help text for plugin.
+# page_toptions    | Options understood by plugin.
+# page_tconfigure  | Option (re)configuration.
+# page_trun        | Transform input data per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::analysis::peg::realizable
+package require struct::tree         ; # Data structure.
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_tlabel {} {
+    return Realizability
+}
+
+proc page_tfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_ttime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_tgettime {} {
+    global  usec
+    return $usec
+}
+
+proc page_thelp {} {
+    return {}
+}
+
+proc page_toptions {} {
+    return {}
+}
+
+proc page_tconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+proc page_trun {data} {
+    global timed usec
+    page_log_info "transform/realizable/run/"
+
+    if {$timed} {
+	set usec [lindex [time {
+	    ::struct::tree           ::tree deserialize $data
+	    ::page::analysis::peg::realizable::remove! ::tree
+	}] 0] ; #{}
+    } else {
+	::struct::tree           ::tree deserialize $data
+	::page::analysis::peg::realizable::remove! ::tree
+    }
+    set data [::tree serialize]
+    ::tree destroy
+
+    page_log_info "transform/realizable/run/ok"
+    return $data
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::transform::realizable 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_hb.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_hb.tcl
new file mode 100644
index 00000000..711e62a3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_hb.tcl
@@ -0,0 +1,106 @@
+# -*- tcl -*- 
+# -- $Id: writer_hb.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - writer - HB ~ Half Baked / Tcl Peg Container
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_wdata       | Access to processed input stream.
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_wfeature    | Query for special plugin features page might wish to use.
+# page_wtime       | Activate collection of timing statistics.
+# page_wgettime    | Return the collected timing statistics.
+# page_wlabel      | User readable label for the plugin.
+# page_whelp       | Doctools help text for plugin.
+# page_woptions    | Options understood by plugin.
+# page_wconfigure  | Option (re)configuration.
+# page_wrun        | Generate output from data per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::gen::peg::hb
+package require struct::tree         ; # Data structure.
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_wlabel {} {
+    return {Half baked PEG Container}
+}
+
+proc page_wfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_wtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_wgettime {} {
+    global  usec
+    return $usec
+}
+
+proc page_whelp {} {
+    return {}
+}
+
+proc page_woptions {} {
+    return {}
+}
+
+proc page_wconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+proc page_wrun {chan data} {
+    global timed usec
+    page_log_info "writer/hb/run/"
+
+    if {$timed} {
+	set usec [lindex [time {
+	    ::struct::tree     ::tree deserialize $data
+	    page::gen::peg::hb ::tree             $chan
+	}] 0] ; #{}
+    } else {
+	::struct::tree     ::tree deserialize $data
+	page::gen::peg::hb ::tree             $chan
+    }
+
+    page_log_info "writer/hb/run/ok"
+
+    ::tree destroy
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::writer::hb 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_identity.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_identity.tcl
new file mode 100644
index 00000000..b5d9cd42
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_identity.tcl
@@ -0,0 +1,98 @@
+# -*- tcl -*- 
+# -- $Id: writer_identity.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - writer - Generic dump
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_wdata       | Access to processed input stream.
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_wfeature    | Query for special plugin features page might wish to use.
+# page_wtime       | Activate collection of timing statistics.
+# page_wgettime    | Return the collected timing statistics.
+# page_wlabel      | User readable label for the plugin.
+# page_whelp       | Doctools help text for plugin.
+# page_woptions    | Options understood by plugin.
+# page_wconfigure  | Option (re)configuration.
+# page_wrun        | Generate output from data per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_wlabel {} {
+    return {Raw data unchanged}
+}
+
+proc page_wfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_wtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_wgettime {} {
+    global  usec
+    return $usec
+}
+proc page_whelp {} {
+    return {}
+}
+
+proc page_woptions {} {
+    return {}
+}
+
+proc page_wconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+proc page_wrun {chan data} {
+    global timed usec
+    page_log_info "writer/identity/run/"
+
+    if {$timed} {
+	set usec [lindex [time {
+	    puts $chan $data
+	}] 0] ; #{}
+    } else {
+	puts $chan $data
+    }
+
+    page_log_info "writer/identity/run/ok"
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::writer::identity 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_me.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_me.tcl
new file mode 100644
index 00000000..5e4d6b1e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_me.tcl
@@ -0,0 +1,115 @@
+# -*- tcl -*- 
+# -- $Id: writer_me.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - writer - ME ~ Match Engine
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_wdata       | Access to processed input stream.
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_wfeature    | Query for special plugin features page might wish to use.
+# page_wtime       | Activate collection of timing statistics.
+# page_wgettime    | Return the collected timing statistics.
+# page_wlabel      | User readable label for the plugin.
+# page_whelp       | Doctools help text for plugin.
+# page_woptions    | Options understood by plugin.
+# page_wconfigure  | Option (re)configuration.
+# page_wrun        | Generate output from data per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::gen::peg::me
+package require struct::tree         ; # Data structure.
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_wlabel {} {
+    return {MatchEngine RecDescent}
+}
+
+proc page_wfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_wtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_wgettime {} {
+    global  usec
+    return $usec
+}
+
+proc page_whelp {} {
+    return {}
+}
+
+proc page_woptions {} {
+    return {--package --copyright}
+}
+
+proc page_wconfigure {option value} {
+    switch -exact -- $option {
+	--package {
+	    page::gen::peg::me::package $value
+	}
+	--copyright {
+	    page::gen::peg::me::copyright $value
+	}
+	default {
+	    return -code error "Cannot set value of unknown option \"$option\""
+	}
+    }
+}
+
+proc page_wrun {chan data} {
+    global timed usec
+    page_log_info "writer/me/run/"
+
+    if {$timed} {
+	set usec [lindex [time {
+	    ::struct::tree     ::tree deserialize $data
+	    page::gen::peg::me ::tree             $chan
+	}] 0] ; #{}
+    } else {
+	::struct::tree     ::tree deserialize $data
+	page::gen::peg::me ::tree             $chan
+    }
+    page_log_info "writer/me/run/ok"
+
+    ::tree destroy
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::writer::me 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_mecpu.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_mecpu.tcl
new file mode 100644
index 00000000..00e55089
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_mecpu.tcl
@@ -0,0 +1,116 @@
+# -*- tcl -*- 
+# -- $Id: writer_mecpu.tcl,v 1.2 2007/03/21 23:15:53 andreas_kupries Exp $ ---
+#
+# PAGE plugin - writer - ME cpu ~ Match Engine CPU
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_wdata       | Access to processed input stream.
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_wfeature    | Query for special plugin features page might wish to use.
+# page_wtime       | Activate collection of timing statistics.
+# page_wgettime    | Return the collected timing statistics.
+# page_wlabel      | User readable label for the plugin.
+# page_whelp       | Doctools help text for plugin.
+# page_woptions    | Options understood by plugin.
+# page_wconfigure  | Option (re)configuration.
+# page_wrun        | Generate output from data per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::gen::peg::mecpu
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_wlabel {} {
+    return {ME cpu Assembler}
+}
+
+proc page_wfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_wtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_wgettime {} {
+    global  usec
+    return $usec
+}
+
+proc page_whelp {} {
+    return {}
+}
+
+proc page_woptions {} {
+    return {--package --copyright --template --cmarker}
+}
+
+proc page_wconfigure {option value} {
+    switch -exact -- $option {
+	--package {
+	    page::gen::peg::mecpu::package $value
+	}
+	--copyright {
+	    page::gen::peg::mecpu::copyright $value
+	}
+	--template {
+	    page::gen::peg::mecpu::template $value
+	}
+	--cmarker {
+	    page::gen::peg::mecpu::cmarker $value
+	}
+	default {
+	    return -code error "Cannot set value of unknown option \"$option\""
+	}
+    }
+}
+
+proc page_wrun {chan data} {
+    global timed usec
+    page_log_info "writer/me-cpu/run/"
+
+    if {$timed} {
+	set usec [lindex [time {
+	    page::gen::peg::mecpu $data $chan
+	}] 0] ; #{}
+    } else {
+	page::gen::peg::mecpu $data $chan
+    }
+    page_log_info "writer/me-cpu/run/ok"
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::writer::mecpu 0.1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_null.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_null.tcl
new file mode 100644
index 00000000..7d15b254
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_null.tcl
@@ -0,0 +1,97 @@
+# -*- tcl -*- 
+# -- $Id: writer_null.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - writer - NULL ~ /dev/null the output
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_wdata       | Access to processed input stream.
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_wfeature    | Query for special plugin features page might wish to use.
+# page_wtime       | Activate collection of timing statistics.
+# page_wgettime    | Return the collected timing statistics.
+# page_wlabel      | User readable label for the plugin.
+# page_whelp       | Doctools help text for plugin.
+# page_woptions    | Options understood by plugin.
+# page_wconfigure  | Option (re)configuration.
+# page_wrun        | Generate output from data per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_wlabel {} {
+    return /dev/null
+}
+
+proc page_wfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_wtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_wgettime {} {
+    global  usec
+    return $usec
+}
+
+proc page_whelp {} {
+    return {}
+}
+
+proc page_woptions {} {
+    return {}
+}
+
+proc page_wconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+proc page_wrun {chan data} {
+    global timed usec
+    if {$timed} {
+	set usec [lindex [time {
+	    page_log_info "writer/null/run/"
+	    page_log_info "writer/null/run/ok"
+	}] 0] ; #{}
+    } else {
+	page_log_info "writer/null/run/"
+	page_log_info "writer/null/run/ok"
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::writer::null 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_peg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_peg.tcl
new file mode 100644
index 00000000..f8cd060a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_peg.tcl
@@ -0,0 +1,106 @@
+# -*- tcl -*- 
+# -- $Id: writer_peg.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - writer - PEG ~ Canonical PE Grammar
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_wdata       | Access to processed input stream.
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_wfeature    | Query for special plugin features page might wish to use.
+# page_wtime       | Activate collection of timing statistics.
+# page_wgettime    | Return the collected timing statistics.
+# page_wlabel      | User readable label for the plugin.
+# page_whelp       | Doctools help text for plugin.
+# page_woptions    | Options understood by plugin.
+# page_wconfigure  | Option (re)configuration.
+# page_wrun        | Generate output from data per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::gen::peg::canon
+package require struct::tree         ; # Data structure.
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_wlabel {} {
+    return {Canonical PEG}
+}
+
+proc page_wfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_wtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_wgettime {} {
+    global  usec
+    return $usec
+}
+
+proc page_whelp {} {
+    return {}
+}
+
+proc page_woptions {} {
+    return {}
+}
+
+proc page_wconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+proc page_wrun {chan data} {
+    global timed usec
+    page_log_info "writer/peg/run/"
+
+    if {$timed} {
+	set usec [lindex [time {
+	    ::struct::tree        ::tree deserialize $data
+	    page::gen::peg::canon ::tree             $chan
+	}] 0] ; #{}
+    } else {
+	::struct::tree        ::tree deserialize $data
+	page::gen::peg::canon ::tree             $chan
+    }
+
+    page_log_info "writer/peg/run/ok"
+
+    ::tree destroy
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::writer::peg 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_ser.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_ser.tcl
new file mode 100644
index 00000000..3b977a2b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_ser.tcl
@@ -0,0 +1,104 @@
+# -*- tcl -*- 
+# -- $Id: writer_ser.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - writer - SER ~ Serialized PEG Container
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_wdata       | Access to processed input stream.
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_wfeature    | Query for special plugin features page might wish to use.
+# page_wtime       | Activate collection of timing statistics.
+# page_wgettime    | Return the collected timing statistics.
+# page_wlabel      | User readable label for the plugin.
+# page_whelp       | Doctools help text for plugin.
+# page_woptions    | Options understood by plugin.
+# page_wconfigure  | Option (re)configuration.
+# page_wrun        | Generate output from data per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::gen::peg::ser
+package require struct::tree         ; # Data structure.
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_wlabel {} {
+    return {Serialized PEG Container}
+}
+
+proc page_wfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_wtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_wgettime {} {
+    global  usec
+    return $usec
+}
+proc page_whelp {} {
+    return {}
+}
+
+proc page_woptions {} {
+    return {}
+}
+
+proc page_wconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+proc page_wrun {chan data} {
+    global timed usec
+    page_log_info "writer/ser/run/"
+
+    if {$timed} {
+	set usec [lindex [time {
+	    ::struct::tree      ::tree deserialize $data
+	    page::gen::peg::ser ::tree             $chan
+	}] 0] ; #{}
+    } else {
+	::struct::tree      ::tree deserialize $data
+	page::gen::peg::ser ::tree             $chan
+    }
+    page_log_info "writer/ser/run/ok"
+
+    ::tree destroy
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::writer::ser 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_tpc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_tpc.tcl
new file mode 100644
index 00000000..6b143287
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_tpc.tcl
@@ -0,0 +1,105 @@
+# -*- tcl -*- 
+# -- $Id: writer_tpc.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - writer - TPC ~ Tcl Peg Container
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_wdata       | Access to processed input stream.
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_wfeature    | Query for special plugin features page might wish to use.
+# page_wtime       | Activate collection of timing statistics.
+# page_wgettime    | Return the collected timing statistics.
+# page_wlabel      | User readable label for the plugin.
+# page_whelp       | Doctools help text for plugin.
+# page_woptions    | Options understood by plugin.
+# page_wconfigure  | Option (re)configuration.
+# page_wrun        | Generate output from data per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::gen::peg::cpkg
+package require struct::tree         ; # Data structure.
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_wlabel {} {
+    return {Tcl PEG Container (Package)}
+}
+
+proc page_wfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_wtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_wgettime {} {
+    global  usec
+    return $usec
+}
+proc page_whelp {} {
+    return {}
+}
+
+proc page_woptions {} {
+    return {}
+}
+
+proc page_wconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+proc page_wrun {chan data} {
+    global timed usec
+    page_log_info "writer/tpc/run/"
+
+    if {$timed} {
+	set usec [lindex [time {
+	    ::struct::tree       ::tree deserialize $data
+	    page::gen::peg::cpkg ::tree             $chan
+	}] 0] ; #{}
+    } else {
+	::struct::tree       ::tree deserialize $data
+	page::gen::peg::cpkg ::tree             $chan
+    }
+
+    page_log_info "writer/tpc/run/ok"
+
+    ::tree destroy
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::writer::tpc 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_tree.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_tree.tcl
new file mode 100644
index 00000000..d02458ea
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/plugins/writer_tree.tcl
@@ -0,0 +1,105 @@
+# -*- tcl -*- 
+# -- $Id: writer_tree.tcl,v 1.1 2005/09/28 04:51:22 andreas_kupries Exp $ ---
+#
+# PAGE plugin - writer - TREE ~ Generic Tree dump
+#
+
+# ### ### ### ######### ######### #########
+## Imported API
+
+# -----------------+--
+# page_wdata       | Access to processed input stream.
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Exported API
+
+# -----------------+--
+# page_wfeature    | Query for special plugin features page might wish to use.
+# page_wtime       | Activate collection of timing statistics.
+# page_wgettime    | Return the collected timing statistics.
+# page_wlabel      | User readable label for the plugin.
+# page_whelp       | Doctools help text for plugin.
+# page_woptions    | Options understood by plugin.
+# page_wconfigure  | Option (re)configuration.
+# page_wrun        | Generate output from data per plugin configuration and hardwiring.
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::gen::tree::text
+package require struct::tree         ; # Data structure.
+
+global usec
+global timed
+set    timed 0
+
+# ### ### ### ######### ######### #########
+## Implementation of exported API
+
+proc page_wlabel {} {
+    return {Tree Dump}
+}
+
+proc page_wfeature {key} {
+    return [string eq $key timeable]
+}
+
+proc page_wtime {} {
+    global timed
+    set    timed 1
+    return
+}
+
+proc page_wgettime {} {
+    global  usec
+    return $usec
+}
+proc page_whelp {} {
+    return {}
+}
+
+proc page_woptions {} {
+    return {}
+}
+
+proc page_wconfigure {option value} {
+    return -code error "Cannot set value of unknown option \"$option\""
+}
+
+proc page_wrun {chan data} {
+    global timed usec
+    page_log_info "writer/tree/run/"
+
+    if {$timed} {
+	set usec [lindex [time {
+	    ::struct::tree        ::tree deserialize $data
+	    page::gen::tree::text ::tree             $chan
+	}] 0] ; #{}
+    } else {
+	::struct::tree        ::tree deserialize $data
+	page::gen::tree::text ::tree             $chan
+    }
+
+    page_log_info "writer/tree/run/ok"
+
+    ::tree destroy
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper code.
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+package provide page::writer::tree 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_flow.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_flow.tcl
new file mode 100644
index 00000000..d8245ff5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_flow.tcl
@@ -0,0 +1,90 @@
+# -*- tcl -*-
+# General tree iterative walking for dataflow algorithms.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require snit
+
+# ### ### ### ######### ######### #########
+## API
+
+namespace eval ::page::util::flow {}
+
+proc ::page::util::flow {start fvar nvar script} {
+    set f [uplevel 1 [list ::page::util::flow::iter %AUTO% $start $fvar $nvar $script]]
+    $f destroy
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internals
+
+snit::type ::page::util::flow::iter {
+    constructor {startset fvar nvar script} {
+	$self visitl $startset
+
+	# Export the object for use by the flow script
+	upvar 3 $fvar flow ; set flow $self
+	upvar 3 $nvar current
+
+	while {[array size visit]} {
+	    set nodes [array names visit]
+	    array unset visit *
+
+	    foreach n $nodes {
+		set current $n
+		set code [catch {uplevel 3 $script} result]
+
+		# decide what to do upon the return code:
+		#
+		#               0 - the body executed successfully
+		#               1 - the body raised an error
+		#               2 - the body invoked [return]
+		#               3 - the body invoked [break]
+		#               4 - the body invoked [continue]
+		# everything else - return and pass on the results
+
+		switch -exact -- $code {
+		    0 {}
+		    1 {
+			return -errorinfo $::errorInfo  \
+				-errorcode $::errorCode -code error $result
+		    }
+		    3 {
+			# FRINK: nocheck
+			return -code break
+		    }
+		    4 {}
+		    default {
+			# This includes code 2 (return).
+			return -code $code $result
+		    }
+		}
+	    }
+	}
+	return
+    }
+
+    method visit {n} {
+	set visit($n) .
+	return
+    }
+
+    method visitl {nodelist} {
+	foreach n $nodelist {set visit($n) .}
+	return
+    }
+
+    method visita {args} {
+	foreach n $args {set visit($n) .}
+	return
+    }
+
+    variable visit -array {}
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::util::flow 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_norm_lemon.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_norm_lemon.tcl
new file mode 100644
index 00000000..f604f810
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_norm_lemon.tcl
@@ -0,0 +1,427 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / Transformation - Normalize PEG AST for later.
+
+# This package assumes to be used from within a PAGE plugin. It uses
+# the API commands listed below. These are identical across the major
+# types of PAGE plugins, allowing this package to be used in reader,
+# transform, and writer plugins. It cannot be used in a configuration
+# plugin, and this makes no sense either.
+#
+# To ensure that our assumption is ok we require the relevant pseudo
+# package setup by the PAGE plugin management code.
+#
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: page::plugin
+
+package require page::plugin ; # S.a. pseudo-package.
+package require treeql
+package require page::util::quote
+package require page::util::peg
+
+namespace eval ::page::util::norm::lemon {
+    # Get the peg char de/encoder commands.
+    # (unquote, quote'tcl)
+
+    namespace import ::page::util::quote::*
+    namespace import ::page::util::peg::*
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::util::norm::lemon {t} {
+    set q [treeql q -tree $t]
+
+    page_info {[Lemon Normalization]}
+
+    # Retrieve grammar name out of one directive.
+    # Or from LHS of first rule.
+
+    page_log_info ..Startsymbol
+
+    set start {}
+
+    $q query tree \
+	    withatt type nonterminal \
+	    withatt detail StartSymbol \
+	    descendants \
+	    withatt type terminal \
+	    over n {
+
+	lemon::TokReduce $t $n detail
+	set start [$t get $n detail]
+
+	page_info "  StartSymbol: $start"
+    }
+
+    $q query tree \
+	    withatt type   nonterminal \
+	    withatt detail Name \
+	    descendants \
+	    withatt type terminal \
+	    over n {
+
+	lemon::TokReduce $t $n detail
+	set name [$t get $n detail]
+
+	page_info "  Name:        $name"
+
+	$t set root name $name
+    }
+
+    page_log_info ..Drop        ; lemon::Drop        $q $t
+    page_log_info ..Terminals   ; lemon::Terminals   $q $t
+    page_log_info ..Definitions ; lemon::Definitions $q $t
+    page_log_info ..Rules       ; lemon::Rules       $q $t start
+    page_log_info ..Epsilon     ; lemon::ElimEpsilon $q $t
+    page_log_info ..Autoclass   ; lemon::AutoClassId $q $t
+    page_log_info ..Chains
+
+    # Find and cut operator chains, very restricted. Cut only chains
+    # of x- and /-operators. The other operators have only one child
+    # by definition and are thus not chains.
+
+    #set q [treeql q -tree $t]
+    # q query tree over n
+    foreach n [$t children -all root] {
+	if {[$t keyexists $n symbol]}        continue
+	if {[llength [$t children $n]] != 1} continue
+
+	set op [$t get $n op]
+	if {($op ne "/") && ($op ne "x")} continue
+	$t cut $n
+    }
+
+    page_log_info ..Flatten
+
+    lemon::flatten $q $t
+
+    # Analysis: Left recursion, and where.
+    # Manual: Definitions for terminals.
+    #         Definitions for space, comments.
+    #         Integration of this into the grammar.
+
+    # Sentinel for PE algorithms.
+    $t set root symbol <StartExpression>
+
+    if {$start eq ""} {
+	page_error "  Startsymbol missing"
+    } else {
+	set s [$t insert root end]
+	$t set $s op  n
+	$t set $s sym $start
+	$t set root start $s
+
+	array set def [$t get root definitions]
+
+	if {![info exists def($start)]} {
+	    page_error "  Startsymbol is undefined"
+	    $t set $s def ""
+	} else {
+	    $t set $s def $def($start)
+	}
+	unset def
+    }
+
+    $q destroy
+
+    page_log_info Ok
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Documentation
+#
+## See doc_normalize.txt for the specification of the publicly visible
+## attributes.
+##
+## Internal attributes
+## - DATA - Transient storage for terminal data.
+
+# ### ### ### ######### ######### #########
+## Internal. Helpers
+
+proc ::page::util::norm::lemon::Drop {q t} {
+    # Simple normalization.
+    # All lemon specific data is dropped completely.
+
+    foreach drop {
+	Directive Codeblock Label Precedence
+    } {
+	$q query tree withatt type nonterminal \
+	    withatt detail $drop over n {
+		$t delete $n
+	    }
+    }
+
+    # Some nodes can be dropped, but not their children.
+
+    $q query tree withatt type nonterminal \
+	withatt detail Statement over n {
+	    $t cut $n
+	}
+
+    # Cut the ALL and LemonGrammar nodes, direct access, no search
+    # needed.
+
+    $t cut [lindex [$t children root] 0]
+    $t cut [lindex [$t children root] 0]
+
+    return
+}
+
+proc ::page::util::norm::lemon::Terminals {q t} {
+    # The data for all terminals is stored in their grandparental
+    # nodes. We get rid of both terminals and their parents.
+
+    $q query tree withatt type terminal over n {
+	set p  [$t parent $n]
+	set gp [$t parent $p]
+
+	CopyLocation $t $n $gp
+	AttrCopy     $t $n detail $gp DATA
+	TokReduce    $t           $gp DATA
+	$t delete $p
+    }
+
+    # We can now drop the type attribute, as all the remaining nodes
+    # (which have it) will contain the value 'nonterminal'.
+
+    $q query tree hasatt type over n {
+	$t unset $n type
+    }
+    return
+}
+
+proc ::page::util::norm::lemon::Definitions {q t} {
+    # Convert 'Definition' into the sequences they are.
+    # Sequences of length one will be flattened later.
+    # Empty sequences (Length zero) are epsilon.
+    # Epsilon will be later converted to ? of the
+    # whole choice they are part of.
+
+    $q query tree withatt detail Definition over n {
+	$t unset $n detail
+
+	if {[$t children $n] < 1} {
+	    $t set $n op epsilon
+	} else {
+	    $t set $n op x
+	}
+    }
+    return
+}
+
+proc ::page::util::norm::lemon::Rules {q t sv} {
+    upvar $sv start
+    # We move nonterminal hint information from nodes into attributes,
+    # and delete the now irrelevant nodes.
+
+    # Like with the global metadata we move definition specific
+    # information out of nodes into attributes, get rid of the
+    # superfluous nodes, and tag the definition roots with marker
+    # attributes.
+
+    array set defs {}
+    $q query tree withatt detail Rule over n {
+	set first [Child $t $n 0]
+
+	set sym   [$t get $first DATA]
+	$t set $n symbol $sym
+	$t set $n label  $sym
+	$t set $n users  {}
+	$t set $n mode value
+
+	if {$start eq ""} {
+	    page_info "  StartSymbol: $sym"
+	    set start $sym
+	}
+
+	# We get the left extend of the definition from the terminal
+	# for the symbol it defines.
+
+	MergeLocations $t $first [Rightmost $t $n] $n
+	$t unset $n detail
+
+	lappend defs($sym) $n
+	$t cut $first
+    }
+
+    set d {}
+    foreach sym [array names defs] {
+	set nodes $defs($sym)
+	if {[llength $nodes] == 1} {
+	    lappend d $sym [lindex $nodes 0]
+	} else {
+	    # Merge multi-node definition together, under a choice.
+
+	    set r [$t insert root end]
+	    set c [$t insert $r end]
+
+	    $t set $r symbol $sym
+	    $t set $r label  $sym
+	    $t set $r users  {}
+	    $t set $r mode value
+	    $t set $c op     /
+
+	    foreach n $nodes {
+		set seq [lindex [$t children $n] 0]
+		$t move $c end $seq
+		$t delete $n
+	    }
+
+	    lappend d $sym $r
+	}
+    }
+
+    # We remember a mapping from nonterminal names to their defining
+    # nodes in the root as well, for quick reference later, when we
+    # build nonterminal usage references
+
+    $t set root definitions $d
+    return
+}
+
+proc ::page::util::norm::lemon::Rightmost {t n} {
+    # Determine the rightmost leaf under the specified node.
+
+    if {[$t isleaf $n]} {return $n}
+    return [Rightmost $t [lindex [$t children $n] end]]
+}
+
+proc ::page::util::norm::lemon::ElimEpsilon {q t} {
+    # We convert choices with an epsilon in them into
+    # optional choices without an epsilon branch.
+
+    $q query tree withatt op epsilon over n {
+	set choice [$t parent $n]
+
+	# Move branches into the epsilon, which becomes the new
+	# choice. And the choice becomes an option.
+	foreach c [$t children $choice] {
+	    if {$c eq $n} continue
+	    $t move $n end $c
+	}
+	$t set $n      op /
+	$t set $choice op ?
+    }
+    return
+}
+
+proc ::page::util::norm::lemon::AutoClassId {q t} {
+
+    array set defs [$t get root definitions]
+    array set use {}
+
+    $q query tree \
+	    withatt op x \
+	    children \
+	    hasatt DATA \
+	    over n {
+	# All identifiers are nonterminals, and for the
+	# undefined ones we create rules which define
+	# them as terminal sequences.
+
+	set sym  [$t get $n DATA]
+	$t unset $n DATA
+
+	$t set $n op  n
+	$t set $n sym $sym
+
+	if {![info exists defs($sym)]} {
+	    set defs($sym) [NewTerminal $t $sym]
+	}
+	$t set $n def $defs($sym)
+
+	lappend use($sym) $n
+	$t unset $n detail
+    }
+
+    $t set root definitions [array get defs]
+
+    foreach sym [array names use] {
+	$t set $defs($sym) users $use($sym)
+    }
+
+    $t set root undefined {}
+    return
+}
+
+proc ::page::util::norm::lemon::NewTerminal {t sym} {
+    page_log_info "  Terminal: $sym"
+
+    set     r [$t insert root end]
+    $t set $r symbol $sym
+    $t set $r label  $sym
+    $t set $r users  {}
+    $t set $r mode   leaf
+
+    set     s [$t insert $r end]
+    $t set $s op x
+
+    foreach ch [split $sym {}] {
+	set c [$t insert $s end]
+	$t set $c op   t
+	$t set $c char $ch
+    }
+    return $r
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Low-level helpers.
+
+proc ::page::util::norm::lemon::CopyLocation {t src dst} {
+    $t set $dst range    [$t get $src range]
+    $t set $dst range_lc [$t get $src range_lc]
+    return
+}
+
+proc ::page::util::norm::lemon::MergeLocations {t srca srcb dst} {
+    set ar   [$t get $srca range]
+    set arlc [$t get $srca range_lc]
+
+    set br   [$t get $srcb range]
+    set brlc [$t get $srcb range_lc]
+
+    $t set $dst range    [list [lindex $ar   0] [lindex $br   1]]
+    $t set $dst range_lc [list [lindex $arlc 0] [lindex $brlc 1]]
+    return
+}
+
+proc ::page::util::norm::lemon::AttrCopy {t src asrc dst adst} {
+    $t set $dst $adst [$t get $src $asrc]
+    return
+}
+
+proc ::page::util::norm::lemon::Child {t n index} {
+    return [lindex [$t children $n] $index]
+}
+
+proc ::page::util::norm::lemon::TokReduce {t src attr} {
+    set tokens [$t get $src $attr]
+    set ch     {}
+    foreach tok $tokens {
+	lappend ch [lindex $tok 0]
+    }
+    $t set $src $attr [join $ch {}]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::util::norm::lemon 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_norm_peg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_norm_peg.tcl
new file mode 100644
index 00000000..90405bef
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_norm_peg.tcl
@@ -0,0 +1,415 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / Transformation - Normalize PEG AST for later.
+
+# This package assumes to be used from within a PAGE plugin. It uses
+# the API commands listed below. These are identical across the major
+# types of PAGE plugins, allowing this package to be used in reader,
+# transform, and writer plugins. It cannot be used in a configuration
+# plugin, and this makes no sense either.
+#
+# To ensure that our assumption is ok we require the relevant pseudo
+# package setup by the PAGE plugin management code.
+#
+# -----------------+--
+# page_info        | Reporting to the user.
+# page_warning     |
+# page_error       |
+# -----------------+--
+# page_log_error   | Reporting of internals.
+# page_log_warning |
+# page_log_info    |
+# -----------------+--
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: page::plugin
+
+package require page::plugin ; # S.a. pseudo-package.
+package require treeql
+package require page::util::quote
+
+namespace eval ::page::util::norm::peg {
+    # Get the peg char de/encoder commands.
+    # (unquote, quote'tcl)
+
+    namespace import ::page::util::quote::*
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::util::norm::peg {t} {
+    set q [treeql q -tree $t]
+
+    page_info {[PEG Normalization]}
+    page_log_info ..Terminals   ; peg::Terminals   $q $t
+    page_log_info ..Chains      ; peg::CutChains   $q $t
+    page_log_info ..Metadata    ; peg::Metadata    $q $t
+    page_log_info ..Definitions ; peg::Definitions $q $t
+    page_log_info ..Expressions ; peg::Expressions $q $t
+
+    # Sentinel for PE algorithms.
+    $t set root symbol <StartExpression>
+    $q destroy
+
+    page_log_info Ok
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Documentation
+#
+## See doc_normalize.txt for the specification of the publicly visible
+## attributes.
+##
+## Internal attributes
+## - DATA - Transient storage for terminal data.
+
+# ### ### ### ######### ######### #########
+## Internal. Helpers
+
+proc ::page::util::norm::peg::Terminals {q t} {
+    # The data for all terminals is stored in their grandparental
+    # nodes. We get rid of both terminals and their parents.
+
+    $q query tree withatt type terminal over n {
+	set p  [$t parent $n]
+	set gp [$t parent $p]
+
+	CopyLocation $t $n $gp
+	AttrCopy     $t $n detail $gp DATA
+	TokReduce    $t           $gp DATA
+	$t delete $p
+    }
+
+    # We can now drop the type attribute, as all the remaining nodes
+    # (which have it) will contain the value 'nonterminal'.
+
+    $q query tree hasatt type over n {
+	$t unset $n type
+    }
+    return
+}
+
+proc ::page::util::norm::peg::CutChains {q t} {
+    # All nodes which have exactly one child are irrelevant. We get
+    # rid of them. The root node is the sole exception. The immediate
+    # child of the root however is superfluous as well.
+
+    $q query tree notq {root} over n {
+	if {[llength [$t children $n]] != 1} continue
+	$t cut $n
+    }
+
+    foreach n [$t children root] {$t cut $n}
+    return
+}
+
+proc ::page::util::norm::peg::Metadata {q t} {
+    # Having the name of the grammar in a tree node is overkill. We
+    # move this information into an attribute of the root node.
+    # The node keeping the start expression separate is irrelevant as
+    # well. We get rid of it, and tag the root of the start expression
+    # with a marker attribute.
+
+    $q query tree withatt detail Header over n {
+	set tmp    [Child $t $n 0]
+	set sexpr  [Child $t $n 1]
+
+	AttrCopy $t $tmp DATA root name
+	$t cut $tmp
+	$t cut $n
+	break
+    }
+
+    # Remember the node for the start expression in the root for quick
+    # access by later stages.
+
+    $t set root start $sexpr
+    return
+}
+
+proc ::page::util::norm::peg::Definitions {q t} {
+    # We move nonterminal hint information from nodes into attributes,
+    # and delete the now irrelevant nodes.
+
+    # NOTE: This transformation is dependent on the removal of all
+    # nodes with exactly one child, as it removes the all 'Attribute'
+    # nodes already. Otherwise this transformation would have to put
+    # the information into the grandparental node.
+
+    # The default mode for nonterminals is 'value'.
+
+    $q query tree withatt detail Definition over n {
+	$t set $n mode value
+    }
+
+    foreach {a mode} {
+	VOID  discard
+	MATCH match
+	LEAF  leaf
+    } {
+	$q query tree withatt detail $a over n {
+	    set p [$t parent $n]
+	    $t set $p mode $mode
+	    $t delete $n
+	}
+    }
+
+    # Like with the global metadata we move definition specific
+    # information out of nodes into attributes, get rid of the
+    # superfluous nodes, and tag the definition roots with marker
+    # attributes.
+
+    set defs {}
+    $q query tree withatt detail Definition over n {
+	# Define mode information for all nonterminals without an
+	# explicit specification. We also save the mode information
+	# from deletion when we redo the definition node.
+
+	set first [Child $t $n 0]
+
+	set sym [$t get $first DATA]
+	$t set $n symbol $sym
+	$t set $n label  $sym
+	$t set $n users  {}
+
+	# Now determine the range in the input covered by the
+	# definition. The left extent comes from the terminal for the
+	# nonterminal symbol it defines. The right extent comes from
+	# the rightmost child under the definition. While this not an
+	# expression tree yet the location data is sound already.
+
+	MergeLocations $t $first [Rightmost $t $n] $n
+	$t unset $n detail
+
+	lappend defs $sym $n
+	$t cut $first
+    }
+
+    # We remember a mapping from nonterminal names to their defining
+    # nodes in the root as well, for quick reference later, when we
+    # build nonterminal usage references
+
+    $t set root definitions $defs
+    return
+}
+
+proc ::page::util::norm::peg::Rightmost {t n} {
+    # Determine the rightmost leaf under the specified node.
+
+    if {[$t isleaf $n]} {return $n}
+    return [Rightmost $t [lindex [$t children $n] end]]
+}
+
+proc ::page::util::norm::peg::Expressions {q t} {
+    # We now transform the remaining nodes into proper expression
+    # trees. The order matters, to shed as much nodes as possible
+    # early, and to avoid unncessary work.
+
+    ExprRanges       $q $t
+    ExprUnaryOps     $q $t
+    ExprChars        $q $t
+    ExprNonterminals $q $t
+    ExprOperators    $q $t
+    ExprFlatten      $q $t
+    return
+}
+
+proc ::page::util::norm::peg::ExprRanges {q t} {
+    # Ranges = .. operator
+
+    $q query tree withatt detail Range over n {
+	# Two the children, both of text 'Char', their data is what we
+	# take. The children become irrelevant and are removed.
+
+	foreach {b e} [$t children $n] break
+	set begin [unquote [$t get $b DATA]]
+	set end   [unquote [$t get $e DATA]]
+
+	$t set $n op ..
+	$t set $n begin $begin
+	$t set $n end   $end
+
+	MergeLocations $t $b $e $n
+
+	$t unset $n detail
+
+	$t delete $b
+	$t delete $e
+    }
+    return
+}
+
+proc ::page::util::norm::peg::ExprUnaryOps {q t} {
+    # Unary operators ... Their transformation sheds more nodes.
+
+    foreach {a op} {
+	QUESTION ?
+	STAR     *
+	PLUS     +
+	AND      &
+	NOT      !
+    } {
+	$q query tree withatt detail $a over n {
+	    set p [$t parent $n]
+
+	    $t set $p op $op
+	    $t cut $n
+
+	    $t unset $p detail
+	}
+    }
+    return
+}
+
+proc ::page::util::norm::peg::ExprChars {q t} {
+    # Chars = t operator (The remaining Char'acters are plain terminal
+    # symbols.
+
+    $q query tree withatt detail Char over n {
+	set ch [unquote [$t get $n DATA]]
+
+	$t set $n op   t
+	$t set $n char $ch
+
+	$t unset $n detail
+	$t unset $n DATA
+    }
+    return
+}
+
+proc ::page::util::norm::peg::ExprNonterminals {q t} {
+    # Identifiers = n operator (nonterminal references) ...
+
+    array set defs [$t get root definitions]
+    array set undefined {}
+
+    $q query tree withatt detail Identifier over n {
+	set sym [$t get $n DATA]
+
+	$t set $n op  n
+	$t set $n sym $sym
+
+	$t unset $n detail
+	$t unset $n DATA
+
+	# Create x-references between the users and the definition of
+	# a nonterminal symbol.
+
+	if {![info exists defs($sym)]} {
+	    $t set $n def {}
+	    lappend undefined($sym) $n
+	    continue
+	} else {
+	    set def $defs($sym)
+	    $t set $n def $def
+	}
+
+	set users [$t get $def users]
+	lappend users $n
+	$t set $def users $users
+    }
+
+    $t set root undefined [array get undefined]
+    return
+}
+
+proc ::page::util::norm::peg::ExprOperators {q t} {
+    # The remaining operator nodes can be changed directly from node
+    # text to operator. Se we do.
+
+    foreach {a op} {
+	EPSILON    epsilon
+	ALNUM      alnum
+	ALPHA      alpha
+	DOT        dot
+	Literal    x
+	Class      /
+	Sequence   x
+	Expression /
+    } {
+	$q query tree withatt detail $a over n {
+	    $t set   $n op $op
+	    $t unset $n detail
+	}
+    }
+    return
+}
+
+proc ::page::util::norm::peg::ExprFlatten {q t} {
+    # Last tweaks of the expressions. Classes inside of Expressions,
+    # and Literals in Sequences create nested / or x expressions. We
+    # locate such and flatten the nested expression, cutting out the
+    # superfluous operator.
+
+    foreach op {x /} {
+	# Locate all x operators, whose parents are x operators as
+	# well, then go back to the child operators and cut them out.
+
+	$q query tree withatt op $op \
+		parent unique withatt op $op \
+		children withatt op $op \
+		over n {
+	    $t cut $n
+	}
+
+	# Locate all x operators without children and convert them
+	# into epsilon operators. Because that is what they accept,
+	# nothing.
+
+	$q query tree withatt op $op over n {
+	    if {[$t numchildren $n]} continue
+	    $t set $n op epsilon
+	}
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Low-level helpers.
+
+proc ::page::util::norm::peg::CopyLocation {t src dst} {
+    $t set $dst range    [$t get $src range]
+    $t set $dst range_lc [$t get $src range_lc]
+    return
+}
+
+proc ::page::util::norm::peg::MergeLocations {t srca srcb dst} {
+    set ar   [$t get $srca range]
+    set arlc [$t get $srca range_lc]
+
+    set br   [$t get $srcb range]
+    set brlc [$t get $srcb range_lc]
+
+    $t set $dst range    [list [lindex $ar   0] [lindex $br   1]]
+    $t set $dst range_lc [list [lindex $arlc 0] [lindex $brlc 1]]
+    return
+}
+
+proc ::page::util::norm::peg::TokReduce {t src attr} {
+    set tokens [$t get $src $attr]
+    set ch     {}
+    foreach tok $tokens {
+	lappend ch [lindex $tok 0]
+    }
+    $t set $src $attr [join $ch {}]
+    return
+}
+
+proc ::page::util::norm::peg::AttrCopy {t src asrc dst adst} {
+    $t set $dst $adst [$t get $src $asrc]
+    return
+}
+
+proc ::page::util::norm::peg::Child {t n index} {
+    return [lindex [$t children $n] $index]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::util::norm::peg 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_peg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_peg.tcl
new file mode 100644
index 00000000..172c26eb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_peg.tcl
@@ -0,0 +1,209 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+
+## This package provides a number of utility commands to
+## transformations for common operations. It assumes a 'Normalized PE
+## Grammar Tree' as input, possibly augmented with attributes coming
+## from transformation not in conflict with the base definition.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require page::util::quote
+
+namespace eval ::page::util::peg {
+    namespace export \
+	    symbolOf symbolNodeOf \
+	    updateUndefinedDueRemoval \
+	    flatten peOf printTclExpr \
+	    getWarnings printWarnings
+
+    # Get the peg char de/encoder commands.
+    # (unquote, quote'tcl).
+
+    namespace import ::page::util::quote::*
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::util::peg::symbolNodeOf {t n} {
+    # Given an arbitrary root it determines the node (itself or an
+    # ancestor) containing the name of the nonterminal symbol the node
+    # belongs to, and returns its id. The result is either the root of
+    # the tree (for the start expression), or a definition mode.
+
+    while {![$t keyexists $n symbol]} {
+	set n [$t parent $n]
+    }
+    return $n
+}
+
+proc ::page::util::peg::symbolOf {t n} {
+    # As above, but returns the symbol name.
+
+    return [$t get [symbolNodeOf $t $n] symbol]
+}
+
+proc ::page::util::peg::updateUndefinedDueRemoval {t} {
+    # The removal of nodes may have caused symbols to lose one or more
+    # users. Example: A used by B and C, B is reachable, C is not, so A
+    # now loses a node in the expression for C calling it, or rather
+    # not anymore.
+
+    foreach {sym def} [$t get root definitions] {
+	set res {}
+	foreach u [$t get $def users] {
+	    if {![$t exists $u]} continue
+	    lappend res $u
+	}
+	$t set $def users $res
+    }
+
+    # Update the knowledge of undefined nonterminals. To be used when
+    # a transformation can remove invokations of undefined symbols,
+    # and is not able to generate such invokations.
+
+    set res {}
+    foreach {sym invokers} [$t get root undefined] {
+	set sres {}
+	foreach n $invokers {
+	    if {![$t exists $n]} continue
+	    lappend sres $n
+	}
+	if {[llength $sres]} {
+	    lappend res $sym $sres
+	}
+    }
+    $t set root undefined $res
+    return
+}
+
+proc ::page::util::peg::flatten {q t} {
+    # Flatten nested x-, or /-operators.
+    # See peg_normalize.tcl, peg::normalize::ExprFlatten
+
+    foreach op {x /} {
+	# Locate all x operators, whose parents are x oerators as
+	# well, then go back to the child operators and cut them out.
+
+	$q query \
+		tree          withatt op $op \
+		parent unique withatt op $op \
+		children      withatt op $op \
+		over n {
+	    $t cut $n
+	}
+    }
+    return
+}
+
+proc ::page::util::peg::getWarnings {t} {
+    # Look at the attributes for problems with the grammar and issue
+    # warnings. They do not prevent us from writing the grammar, but
+    # still represent problems with it the user should be made aware
+    # of.
+
+    array set msg {}
+    array set undefined [$t get root undefined]
+    foreach sym [array names undefined] {
+	set msg($sym) {}
+	foreach ref $undefined($sym) {
+	    lappend msg($sym) "Undefined symbol used by the definition of '[symbolOf $t $ref]'."
+	}
+    }
+
+    foreach {sym def} [$t get root definitions] {
+	if {[llength [$t get $def users]] == 0} {
+	    set msg($sym) [list "This symbol has been defined, but is not used."]
+	}
+    }
+
+    return [array get msg]
+}
+
+proc ::page::util::peg::printWarnings {msg} {
+    if {![llength $msg]} return
+
+    set dict {}
+    set max -1
+    foreach {k v} $msg {
+	set l [string length [list $k]]
+	if {$l > $max} {set max $l}
+	lappend dict [list $k $v $l]
+    }
+
+    foreach e [lsort -dict -index 0 $dict] {
+	foreach {k msgs l} $e break
+
+	set off [string repeat " " [expr {$max - $l}]]
+	page_info "[list $k]$off : [lindex $msgs 0]"
+
+	if {[llength $msgs] > 1} {
+	    set indent [string repeat " " [string length [list $k]]]
+	    foreach m [lrange $msgs 1 end] {
+		puts stderr "  $indent$off : $m"
+	    }
+	}
+    }
+    return
+}
+
+proc ::page::util::peg::peOf {t eroot} {
+    set op [$t get $eroot op]
+    set pe [list $op]
+
+    set ch [$t children $eroot]
+
+    if {[llength $ch]} {
+	foreach c $ch {
+	    lappend pe [peOf $t $c]
+	}
+    } elseif {$op eq "n"} {
+	lappend pe [$t get $eroot sym]
+    } elseif {$op eq "t"} {
+	lappend pe [unquote [$t get $eroot char]]
+    } elseif {$op eq ".."} {
+	lappend pe \
+		[unquote [$t get $eroot begin]] \
+		[unquote [$t get $eroot end]]
+
+    }
+    return $pe
+}
+
+proc ::page::util::peg::printTclExpr {pe} {
+    list [PrintExprSub $pe]
+}
+
+# ### ### ### ######### ######### #########
+## Internal
+
+proc ::page::util::peg::PrintExprSub {pe} {
+    set op   [lindex $pe 0]
+    set args [lrange $pe 1 end]
+
+    #puts stderr "PE [llength $args] $op | $args"
+
+    if {$op eq "t"} {
+	set a [lindex $args 0]
+	return "$op [quote'tcl $a]"
+    } elseif {$op eq ".."} {
+	set a [lindex $args 0]
+	set b [lindex $args 1]
+	return "$op [quote'tcl $a] [quote'tcl $b]"
+    } elseif {$op eq "n"} {
+	return $pe
+    } else {
+	set res $op
+	foreach a $args {
+	    lappend res [PrintExprSub $a]
+	}
+	return $res
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::util::peg 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_quote.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_quote.tcl
new file mode 100644
index 00000000..6c7b65e1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/page/util_quote.tcl
@@ -0,0 +1,173 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Parser Generator / (Un)quoting characters.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+namespace eval ::page::util::quote {
+    namespace export unquote \
+	    quote'tcl quote'tclstr quote'tclcom
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::page::util::quote::unquote {ch} {
+    # A character, as stored in the grammar tree
+    # by the frontend is transformed into a proper
+    # Tcl character (internal representation).
+
+    switch -exact -- $ch {
+	"\\n"  {return \n}
+	"\\t"  {return \t}
+	"\\r"  {return \r}
+	"\\["  {return \[}
+	"\\]"  {return \]}
+	"\\'"  {return '}
+	"\\\"" {return "\""}
+	"\\\\" {return \\}
+    }
+
+    if {[regexp {^\\([0-2][0-7][0-7])$} $ch -> ocode]} {
+	return [format %c $ocode]
+    } elseif {[regexp {^\\([0-7][0-7]?)$} $ch -> ocode]} {
+	return [format %c 0$ocode]
+    } elseif {[regexp {^\\u([0-9a-fA-F][0-9a-fA-F]?[0-9a-fA-F]?[0-9a-fA-F]?)$} $ch -> hcode]} {
+	return [format %c 0x$hcode]
+    }
+
+    return $ch
+}
+
+proc ::page::util::quote::quote'tcl {ch} {
+    # Converts a Tcl character (internal representation)
+    # into a string which is accepted by the Tcl parser,
+    # will regenerate the character in question and is
+    # 7bit ASCII. 'quoted' is a boolean flag and set if
+    # the returned representation is a \-quoted form.
+    # Because they have to be treated specially when
+    # creating a list containing the reperesentation.
+
+    # Special characters
+
+    switch -exact -- $ch {
+	"\n" {return "\\n"}
+	"\r" {return "\\r"}
+	"\t" {return "\\t"}
+	"\\" - "\;" -
+	" "  - "\"" -
+	"("  - ")"  -
+	"\{" - "\}" -
+	"\[" - "\]" {
+	    # Quote space and all the brackets as well, using octal,
+	    # for easy impure list-ness.
+
+	    scan $ch %c chcode
+	    return \\[format %o $chcode]
+	}
+    }
+
+    scan $ch %c chcode
+
+    # Control characters: Octal
+    if {[string is control -strict $ch]} {
+	return \\[format %o $chcode]
+    }
+
+    # Beyond 7-bit ASCII: Unicode
+
+    if {$chcode > 127} {
+	return \\u[format %04x $chcode]
+    }
+
+    # Regular character: Is its own representation.
+
+    return $ch
+}
+
+proc ::page::util::quote::quote'tclstr {ch} {
+    # Converts a Tcl character (internal representation)
+    # into a string which is accepted by the Tcl parser and will
+    # generate a human readable representation of the character in
+    # question, one which when puts to a channel describes the
+    # character without using any unprintable characters. It may use
+    # \-quoting. High utf characters are quoted to avoid problem with
+    # the still prevalent ascii terminals. It is assumed that the
+    # string will be used in a ""-quoted environment.
+
+    # Special characters
+
+    switch -exact -- $ch {
+	" "  {return "<blank>"}
+	"\n" {return "\\\\n"}
+	"\r" {return "\\\\r"}
+	"\t" {return "\\\\t"}
+	"\"" - "\\" - "\;" -
+	"("  - ")"  -
+	"\{" - "\}" -
+	"\[" - "\]" {
+	    return \\$ch
+	}
+    }
+
+    scan $ch %c chcode
+
+    # Control characters: Octal
+    if {[string is control -strict $ch]} {
+	return \\\\[format %o $chcode]
+    }
+
+    # Beyond 7-bit ASCII: Unicode
+
+    if {$chcode > 127} {
+	return \\\\u[format %04x $chcode]
+    }
+
+    # Regular character: Is its own representation.
+
+    return $ch
+}
+
+proc ::page::util::quote::quote'tclcom {ch} {
+    # Converts a Tcl character (internal representation)
+    # into a string which is accepted by the Tcl parser when used
+    # within a Tcl comment.
+
+    # Special characters
+
+    switch -exact -- $ch {
+	" "  {return "<blank>"}
+	"\n" {return "\\n"}
+	"\r" {return "\\r"}
+	"\t" {return "\\t"}
+	"\"" -
+	"\{" - "\}" -
+	"("  - ")"  {
+	    return \\$ch
+	}
+    }
+
+    scan $ch %c chcode
+
+    # Control characters: Octal
+    if {[string is control -strict $ch]} {
+	return \\[format %o $chcode]
+    }
+
+    # Beyond 7-bit ASCII: Unicode
+
+    if {$chcode > 127} {
+	return \\u[format %04x $chcode]
+    }
+
+    # Regular character: Is its own representation.
+
+    return $ch
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide page::util::quote 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pkgIndex.tcl
new file mode 100644
index 00000000..e5fcb107
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pkgIndex.tcl
@@ -0,0 +1,160 @@
+# Tcl package index file, version 1.1
+# Do NOT edit by hand.  Let tcllib install generate this file.
+# Generated by tcllib installer for version 1.21
+
+# All tcllib packages need Tcl 8 (use [namespace])
+if {![package vsatisfies [package provide Tcl] 8]} {return}
+
+# Extend the auto_path to make tcllib packages available
+if {[lsearch -exact $::auto_path $dir] == -1} {
+    lappend ::auto_path $dir
+}
+
+# For Tcl 8.3.1 and later, that's all we need
+if {[package vsatisfies [package provide Tcl] 8.4]} {return}
+if {(0 == [catch {
+    package vcompare [info patchlevel] [info patchlevel]
+}]) && (
+    [package vcompare [info patchlevel] 8.3.1] >= 0
+)} {return}
+
+# For older Tcl releases, here are equivalent contents
+# of the pkgIndex.tcl files of all the modules
+
+if {![package vsatisfies [package provide Tcl] 8.0]} {return}
+
+
+set maindir $dir
+set dir [file join $maindir 0compatibility] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir aes] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir amazon-s3] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir asn] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir base32] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir base64] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir bee] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir bench] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir bibtex] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir blowfish] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir cache] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir clay] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir clock] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir cmdline] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir comm] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir control] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir coroutine] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir counter] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir crc] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir cron] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir csv] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir debug] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir defer] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir des] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir dicttool] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir dns] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir docstrip] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir doctools] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir doctools2base] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir doctools2idx] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir doctools2toc] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir dtplite] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir fileutil] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir ftp] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir ftpd] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir fumagic] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir generator] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir gpx] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir grammar_aycock] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir grammar_fa] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir grammar_me] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir grammar_peg] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir hook] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir html] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir htmlparse] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir http] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir httpd] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir httpwget] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir ident] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir imap4] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir inifile] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir interp] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir irc] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir javascript] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir jpeg] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir json] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir lambda] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir lazyset] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir ldap] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir log] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir map] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir mapproj] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir markdown] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir math] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir md4] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir md5] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir md5crypt] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir mime] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir mkdoc] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir multiplexer] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir namespacex] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir ncgi] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir nettool] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir nmea] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir nns] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir nntp] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir ntp] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir oauth] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir oodialect] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir oometa] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir ooutil] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir otp] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir page] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir pki] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir pluginmgr] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir png] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir pop3] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir pop3d] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir practcl] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir processman] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir profiler] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir pt] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir rc4] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir rcs] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir report] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir rest] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir ripemd] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir sasl] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir sha1] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir simulation] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir smtpd] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir snit] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir soundex] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir stooop] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir string] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir stringprep] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir struct] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir tar] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir tcllibc] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir tepam] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir term] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir textutil] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir tie] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir tiff] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir tool] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir transfer] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir treeql] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir try] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir udpcluster] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir uev] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir units] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir uri] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir uuid] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir valtype] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir virtchannel_base] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir virtchannel_core] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir virtchannel_transform] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir websocket] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir wip] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir yaml] ;	 source [file join $dir pkgIndex.tcl]
+set dir [file join $maindir zip] ;	 source [file join $dir pkgIndex.tcl]
+unset maindir
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pki/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pki/pkgIndex.tcl
new file mode 100644
index 00000000..1baeddec
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pki/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+
+package ifneeded pki 0.20 [list source [file join $dir pki.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pki/pki.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pki/pki.tcl
new file mode 100644
index 00000000..2c1ea337
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pki/pki.tcl
@@ -0,0 +1,3321 @@
+#! /usr/bin/env tclsh
+# -*- tcl -*-
+# RSA
+#
+# (c) 2010, 2011, 2012, 2013 Roy Keene.
+#	 BSD Licensed.
+# (c) 2021 Ashok P. Nadkarni
+#	 BSD Licensed.
+
+# # ## ### ##### ######## #############
+## Requisites
+
+package require Tcl 8.6
+
+## Versions of asn lower than 0.8.4 are known to have defects
+package require asn 0.8.4
+
+## Further dependencies
+package require aes
+package require des
+package require math::bignum
+package require md5 2
+package require sha1
+package require sha256
+
+# # ## ### ##### ######## #############
+## Requisites
+
+namespace eval ::pki {
+	# OID->name map. Note the corresponding name->OID map is constructed on
+	# the fly on first use in _oid_name_to_number.
+	variable oids
+	array set oids {
+		1.2.840.113549.1.1.1           rsaEncryption
+		1.2.840.113549.1.1.4           md5WithRSAEncryption
+		1.2.840.113549.1.1.5           sha1WithRSAEncryption
+		1.2.840.113549.1.1.11          sha256WithRSAEncryption
+		1.2.840.113549.2.5             md5
+		1.3.14.3.2.26                  sha1
+		2.16.840.1.101.3.4.2.1         sha256
+		0.9.2342.19200300.100.1.1      uid
+		0.9.2342.19200300.100.1.10     manager
+		0.9.2342.19200300.100.1.11     documentIdentifier
+		0.9.2342.19200300.100.1.12     documentTitle
+		0.9.2342.19200300.100.1.13     documentVersion
+		0.9.2342.19200300.100.1.14     documentAuthor
+		0.9.2342.19200300.100.1.15     documentLocation
+		0.9.2342.19200300.100.1.2      textEncodedORAddress
+		0.9.2342.19200300.100.1.20     homePhone
+		0.9.2342.19200300.100.1.21     secretary
+		0.9.2342.19200300.100.1.22     otherMailbox
+		0.9.2342.19200300.100.1.25     dc
+		0.9.2342.19200300.100.1.26     aRecord
+		0.9.2342.19200300.100.1.27     mDRecord
+		0.9.2342.19200300.100.1.28     mXRecord
+		0.9.2342.19200300.100.1.29     nSRecord
+		0.9.2342.19200300.100.1.3      mail
+		0.9.2342.19200300.100.1.30     sOARecord
+		0.9.2342.19200300.100.1.31     cNAMERecord
+		0.9.2342.19200300.100.1.37     associatedDomain
+		0.9.2342.19200300.100.1.38     associatedName
+		0.9.2342.19200300.100.1.39     homePostalAddress
+		0.9.2342.19200300.100.1.4      info
+		0.9.2342.19200300.100.1.40     personalTitle
+		0.9.2342.19200300.100.1.41     mobile
+		0.9.2342.19200300.100.1.42     pager
+		0.9.2342.19200300.100.1.43     co
+		0.9.2342.19200300.100.1.43     friendlyCountryName
+		0.9.2342.19200300.100.1.44     uniqueIdentifier
+		0.9.2342.19200300.100.1.45     organizationalStatus
+		0.9.2342.19200300.100.1.46     janetMailbox
+		0.9.2342.19200300.100.1.47     mailPreferenceOption
+		0.9.2342.19200300.100.1.48     buildingName
+		0.9.2342.19200300.100.1.49     dSAQuality
+		0.9.2342.19200300.100.1.5      drink
+		0.9.2342.19200300.100.1.50     singleLevelQuality
+		0.9.2342.19200300.100.1.51     subtreeMinimumQuality
+		0.9.2342.19200300.100.1.52     subtreeMaximumQuality
+		0.9.2342.19200300.100.1.53     personalSignature
+		0.9.2342.19200300.100.1.54     dITRedirect
+		0.9.2342.19200300.100.1.55     audio
+		0.9.2342.19200300.100.1.56     documentPublisher
+		0.9.2342.19200300.100.1.6      roomNumber
+		0.9.2342.19200300.100.1.60     jpegPhoto
+		0.9.2342.19200300.100.1.7      photo
+		0.9.2342.19200300.100.1.8      userClass
+		0.9.2342.19200300.100.1.9      host
+		1.2.840.113549.1.9.1           email
+		1.3.6.1.4.1.2428.90.1.1        norEduOrgUniqueNumber
+		1.3.6.1.4.1.2428.90.1.11       norEduOrgSchemaVersion
+		1.3.6.1.4.1.2428.90.1.12       norEduOrgNIN
+		1.3.6.1.4.1.2428.90.1.2        norEduOrgUnitUniqueNumber
+		1.3.6.1.4.1.2428.90.1.3        norEduPersonBirthDate
+		1.3.6.1.4.1.2428.90.1.4        norEduPersonLIN
+		1.3.6.1.4.1.2428.90.1.5        norEduPersonNIN
+		1.3.6.1.4.1.2428.90.1.6        norEduOrgAcronym
+		1.3.6.1.4.1.2428.90.1.7        norEduOrgUniqueIdentifier
+		1.3.6.1.4.1.2428.90.1.8        norEduOrgUnitUniqueIdentifier
+		1.3.6.1.4.1.2428.90.1.9        federationFeideSchemaVersion
+		1.3.6.1.4.1.250.1.57           labeledURI
+		1.3.6.1.4.1.5923.1.1.1.1       eduPersonAffiliation
+		1.3.6.1.4.1.5923.1.1.1.10      eduPersonTargetedID
+		1.3.6.1.4.1.5923.1.1.1.2       eduPersonNickname
+		1.3.6.1.4.1.5923.1.1.1.3       eduPersonOrgDN
+		1.3.6.1.4.1.5923.1.1.1.4       eduPersonOrgUnitDN
+		1.3.6.1.4.1.5923.1.1.1.5       eduPersonPrimaryAffiliation
+		1.3.6.1.4.1.5923.1.1.1.6       eduPersonPrincipalName
+		1.3.6.1.4.1.5923.1.1.1.7       eduPersonEntitlement
+		1.3.6.1.4.1.5923.1.1.1.8       eduPersonPrimaryOrgUnitDN
+		1.3.6.1.4.1.5923.1.1.1.9       eduPersonScopedAffiliation
+		1.3.6.1.4.1.5923.1.2.1.2       eduOrgHomePageURI
+		1.3.6.1.4.1.5923.1.2.1.3       eduOrgIdentityAuthNPolicyURI
+		1.3.6.1.4.1.5923.1.2.1.4       eduOrgLegalName
+		1.3.6.1.4.1.5923.1.2.1.5       eduOrgSuperiorURI
+		1.3.6.1.4.1.5923.1.2.1.6       eduOrgWhitePagesURI
+		1.3.6.1.4.1.5923.1.5.1.1       isMemberOf
+		2.16.840.1.113730.3.1.1        carLicense
+		2.16.840.1.113730.3.1.2        departmentNumber
+		2.16.840.1.113730.3.1.216      userPKCS12
+		2.16.840.1.113730.3.1.241      displayName
+		2.16.840.1.113730.3.1.3        employeeNumber
+		2.16.840.1.113730.3.1.39       preferredLanguage
+		2.16.840.1.113730.3.1.4        employeeType
+		2.16.840.1.113730.3.1.40       userSMIMECertificate
+		2.5.4.0                        objectClass
+		2.5.4.1                        aliasedEntryName
+		2.5.4.10                       o
+		2.5.4.11                       ou
+		2.5.4.12                       title
+		2.5.4.13                       description
+		2.5.4.14                       searchGuide
+		2.5.4.15                       businessCategory
+		2.5.4.16                       postalAddress
+		2.5.4.17                       postalCode
+		2.5.4.18                       postOfficeBox
+		2.5.4.19                       physicalDeliveryOfficeName
+		2.5.4.2                        knowledgeInformation
+		2.5.4.20                       telephoneNumber
+		2.5.4.21                       telexNumber
+		2.5.4.22                       teletexTerminalIdentifier
+		2.5.4.23                       facsimileTelephoneNumber
+		2.5.4.23                       fax
+		2.5.4.24                       x121Address
+		2.5.4.25                       internationaliSDNNumber
+		2.5.4.26                       registeredAddress
+		2.5.4.27                       destinationIndicator
+		2.5.4.28                       preferredDeliveryMethod
+		2.5.4.29                       presentationAddress
+		2.5.4.3                        cn
+		2.5.4.30                       supportedApplicationContext
+		2.5.4.31                       member
+		2.5.4.32                       owner
+		2.5.4.33                       roleOccupant
+		2.5.4.34                       seeAlso
+		2.5.4.35                       userPassword
+		2.5.4.36                       userCertificate
+		2.5.4.37                       cACertificate
+		2.5.4.38                       authorityRevocationList
+		2.5.4.39                       certificateRevocationList
+		2.5.4.4                        sn
+		2.5.4.40                       crossCertificatePair
+		2.5.4.41                       name
+		2.5.4.42                       gn
+		2.5.4.43                       initials
+		2.5.4.44                       generationQualifier
+		2.5.4.45                       x500UniqueIdentifier
+		2.5.4.46                       dnQualifier
+		2.5.4.47                       enhancedSearchGuide
+		2.5.4.48                       protocolInformation
+		2.5.4.49                       distinguishedName
+		2.5.4.5                        serialNumber
+		2.5.4.50                       uniqueMember
+		2.5.4.51                       houseIdentifier
+		2.5.4.52                       supportedAlgorithms
+		2.5.4.53                       deltaRevocationList
+		2.5.4.54                       dmdName
+		2.5.4.6                        c
+		2.5.4.65                       pseudonym
+		2.5.4.7                        l
+		2.5.4.8                        st
+		2.5.4.9                        street
+		2.5.29.9                       subjectDirectoryAttributes
+		2.5.29.14                      subjectKeyIdentifier
+		2.5.29.15                      keyUsage
+		2.5.29.16                      privateKeyUsagePeriod
+		2.5.29.17                      subjectAltName
+		2.5.29.18                      issuerAltName
+		2.5.29.19                      basicConstraints
+		2.5.29.20                      cRLNumber
+		2.5.29.30                      nameConstraints
+		2.5.29.31                      cRLDistributionPoints
+		2.5.29.32                      certificatePolicies
+		2.5.29.33                      policyMappings
+		2.5.29.34                      policyConstraintsDeprecated
+		2.5.29.35                      authorityKeyIdentifier
+		2.5.29.36                      policyConstraints
+		2.5.29.37                      extKeyUsage
+		2.5.29.46                      freshestCRL
+		2.5.29.54                      inhibitAnyPolicy
+		1.3.6.1.5.5.7.3.1              serverAuth
+		1.3.6.1.5.5.7.3.2              clientAuth
+		1.3.6.1.5.5.7.3.3              codeSigning
+		1.3.6.1.5.5.7.3.4              emailProtection
+		1.3.6.1.5.5.7.3.5              ipsecEndSystem
+		1.3.6.1.5.5.7.3.6              ipsecTunnel
+		1.3.6.1.5.5.7.3.7              ipsecUser
+		1.3.6.1.5.5.7.3.8              timeStamping
+		1.3.6.1.5.5.7.3.9              OCSPSigning
+		1.3.6.1.5.5.7.1.1              authorityInfoAccess
+		1.3.6.1.5.5.7.1.11             subjectInfoAccess 
+		1.3.6.1.5.5.7.2.1              cps
+		1.3.6.1.5.5.7.2.2              unotice
+		1.3.6.1.5.5.7.48.1             id-ad-ocsp
+		1.3.6.1.5.5.7.48.2             id-ad-caIssuers
+		1.3.6.1.5.5.7.48.3             id-ad-timeStamping
+		1.3.6.1.5.5.7.48.5             id-ad-caRepository
+		1.2.840.113549.1.9.14          extensionRequest
+	}
+
+	variable handlers
+	array set handlers {
+		rsa {
+			::pki::rsa::encrypt
+			::pki::rsa::decrypt
+			::pki::rsa::generate
+			::pki::rsa::serialize_key
+			::pki::rsa::serialize_public_key
+		}
+	}
+
+	variable INT_MAX [expr {[format %u -1] / 2}]
+}
+
+namespace eval ::pki::rsa {}
+namespace eval ::pki::x509 {}
+namespace eval ::pki::pkcs {}
+
+# # ## ### ##### ######## #############
+## Implementation
+
+
+proc ::pki::_dec_to_hex num {
+	set retval [format %llx $num]
+	return $retval
+}
+
+
+proc ::pki::_dec_to_ascii {num {bitlen -1}} {
+	set retval {}
+
+	while {$num} {
+		set currchar [expr {$num & 0xff}]
+		set retval [format %c $currchar]$retval
+		set num [expr {$num >> 8}]
+	}
+
+	if {$bitlen != -1} {
+		set bytelen [expr {$bitlen / 8}]
+		while {[string length $retval] < $bytelen} {
+			set retval \x00$retval
+		}
+	}
+
+	return $retval
+}
+
+
+proc ::pki::_powm {x y m} {
+	if {$y == 0} {
+		return 1
+	}
+
+	set retval 1
+
+	while {$y > 0} {
+		if {($y & 1) == 1} {
+			set retval [expr {($retval * $x) % $m}]
+		}
+
+		set y [expr {$y >> 1}]
+		set x [expr {($x * $x) % $m}]
+	}
+
+	return $retval
+}
+
+
+## **NOTE** Requires that "m" be prime
+### a^-1 === a^(m-2)    (all mod m)
+proc ::pki::_modi {a m} {
+	return [_powm $a [expr {$m - 2}] $m]
+}
+
+
+proc ::pki::_oid_number_to_name {oid} {
+	set oid [join $oid .]
+
+	if {[info exists ::pki::oids($oid)]} {
+		return $::pki::oids($oid)
+	}
+	return $oid
+}
+
+
+proc ::pki::_oid_name_to_number {name} {
+	variable oids
+	variable oid_names
+	unset -nocomplain oid_names; # To handle reloading during development
+	foreach {oid oid_name} [array get ::pki::oids] {
+		set oid_name [string tolower $oid_name]
+		set oid_names($oid_name) $oid
+	}
+	if {[array size oids] != [array size oid_names]} {
+		return -code error "Internal error: OID->name map array oids has duplicate entries."
+	}
+	proc [namespace current]::_oid_name_to_number {name} {
+		variable oid_names
+		set lower [string tolower $name]
+		if {[info exists oid_names($lower)]} {
+			return [split $oid_names($lower) .]
+		}
+		return -code error "Unable to convert OID $name to an OID value"
+	}
+	return [_oid_name_to_number $name]
+}
+
+proc ::pki::_oid_number_to_dotted {oid} {
+	return [join $oid .]
+}
+
+proc ::pki::_oid_dotted_to_number {dotted_oid} {
+	return [split $oid .]
+}
+
+
+proc ::pki::rsa::_encrypt_num {input exponent mod} {
+	set ret [::pki::_powm $input $exponent $mod]
+	return $ret
+}
+
+
+proc ::pki::rsa::_decrypt_num {input exponent mod} {
+	set ret [::pki::_powm $input $exponent $mod]
+	return $ret
+}
+
+
+proc ::pki::_pad_pkcs {data bitlength {blocktype 2}} {
+	set ret {} 
+
+	set bytes_to_pad [expr {($bitlength / 8) - 3 - [string length $data]}]
+	if {$bytes_to_pad < 0} {
+		return $data
+	}
+
+	switch -- $blocktype {
+		0 {
+		}
+		1 {
+			append ret \x00\x01
+			append ret [string repeat \xff $bytes_to_pad]
+			append ret \x00
+		}
+		2 {
+			append ret \x00\x02
+			for {set idx 0} {$idx < $bytes_to_pad} {incr idx} {
+				append ret [format %c [expr {int(rand() * 255 + 1)}]]
+			}
+			append ret \x00
+		}
+	}
+
+	append ret $data
+
+	return $ret
+}
+
+
+proc ::pki::_unpad_pkcs data {
+	set check [string index $data 0]
+	binary scan [string index $data 1] H* blocktype
+	set datalen [string length $data]
+
+	if {$check ne "\x00"} {
+		return $data
+	}
+
+	switch -- $blocktype {
+		00 {
+			# Padding Scheme 1, the first non-zero byte is the start of data
+			for {set idx 2} {$idx < $datalen} {incr idx} {
+				set char [string index $data $idx]
+				if {$char ne "\x00"} {
+					set ret [string range $data $idx end]
+					break
+				}
+			}
+		}
+		01 {
+			# Padding Scheme 2, pad bytes are 0xFF followed by 0x00
+			for {set idx 2} {$idx < $datalen} {incr idx} {
+				set char [string index $data $idx]
+				if {$char ne "\xff"} {
+					if {$char eq "\x00"} {
+						set ret [string range $data [expr {$idx + 1}] end]
+
+						break
+					} else {
+						return -code error "Invalid padding, seperator byte is not 0x00"
+					}
+				}
+			}
+		}
+		02 {
+			# Padding Scheme 3, pad bytes are random, followed by 0x00
+			for {set idx 2} {$idx < $datalen} {incr idx} {
+				set char [string index $data $idx]
+				if {$char eq "\x00"} {
+					set ret [string range $data [expr {$idx + 1}] end]
+
+					break
+				}
+			}
+		}
+		default {
+			return $data
+		}
+	}
+
+	if {![info exists ret]} {
+		return -code error "Invalid padding, no seperator byte found"
+	}
+
+	return $ret
+}
+
+
+proc ::pki::rsa::encrypt {mode input keylist {overhead 0}} {
+	switch -- $mode {
+		pub {
+			set exponent_ent e
+		}
+		priv {
+			set exponent_ent d
+		}
+	}
+
+	array set key $keylist
+
+	set exponent $key($exponent_ent)
+	set mod $key(n)
+
+	## RSA requires that the input be no larger than the key
+	set input_len_bits [expr {
+		([string length $input] - $overhead) * 8
+	}]
+	if {$key(l) < $input_len_bits} {
+		return -code error "Message length exceeds key length"
+	}
+
+	binary scan $input H* input_num
+
+	set input_num 0x${input_num}
+
+	set retval_num [_encrypt_num $input_num $exponent $mod]
+
+	set retval [::pki::_dec_to_ascii $retval_num $key(l)]
+
+	return $retval
+}
+
+
+proc ::pki::rsa::decrypt {mode input keylist} {
+	switch -- $mode {
+		pub {
+			set exponent_ent e
+		}
+		priv {
+			set exponent_ent d
+		}
+	}
+
+	array set key $keylist
+
+	set exponent $key($exponent_ent)
+	set mod $key(n)
+
+	binary scan $input H* input_num
+
+	set input_num 0x${input_num}
+
+	set retval_num [_decrypt_num $input_num $exponent $mod]
+
+	set retval [::pki::_dec_to_ascii $retval_num $key(l)]
+
+	return $retval
+}
+
+
+proc ::pki::rsa::serialize_public_key {keylist} {
+	array set key $keylist
+
+	foreach entry [list n e] {
+		if {![info exists key($entry)]} {
+			return -code error "Key does not contain an element $entry"
+		}
+	}
+
+	set pubkey [::asn::asnSequence [
+		::asn::asnBigInteger [::math::bignum::fromstr $key(n)]] [
+		::asn::asnBigInteger [::math::bignum::fromstr $key(e)]]]
+	set pubkey_algo_params [::asn::asnNull]
+
+	binary scan $pubkey B* pubkey_bitstring
+
+	set ret [::asn::asnSequence [
+		::asn::asnSequence [
+			::asn::asnObjectIdentifier [::pki::_oid_name_to_number rsaEncryption]
+		] $pubkey_algo_params] [
+			::asn::asnBitString $pubkey_bitstring]
+		]
+
+	return [list data $ret begin -----BEGIN PUBLIC KEY----- end -----END PUBLIC KEY-----]
+}
+
+
+proc ::pki::rsa::serialize_key {keylist} {
+	array set key $keylist
+
+	foreach entry [list n e d p q] {
+		if {![info exists key($entry)]} {
+			return -code error "Key does not contain an element $entry"
+		}
+	}
+
+	# Exponent 1
+	## d (mod p-1)
+	set e1 [expr {$key(d) % ($key(p) - 1)}]
+
+	# Exponent 2
+	#set e2 [expr d mod (q-1)]
+	set e2 [expr {$key(d) % ($key(q) - 1)}]
+
+	# Coefficient
+	## Modular multiplicative inverse of q mod p
+	set c [::pki::_modi $key(q) $key(p)]
+
+	set ret [::asn::asnSequence [
+		::asn::asnBigInteger [::math::bignum::fromstr 0]] [
+		::asn::asnBigInteger [::math::bignum::fromstr $key(n)]] [
+		::asn::asnBigInteger [::math::bignum::fromstr $key(e)]] [
+		::asn::asnBigInteger [::math::bignum::fromstr $key(d)]] [
+		::asn::asnBigInteger [::math::bignum::fromstr $key(p)]] [
+		::asn::asnBigInteger [::math::bignum::fromstr $key(q)]] [
+		::asn::asnBigInteger [::math::bignum::fromstr $e1]] [
+		::asn::asnBigInteger [::math::bignum::fromstr $e2]] [
+		::asn::asnBigInteger [::math::bignum::fromstr $c]]
+	]
+
+	return [list data $ret begin {-----BEGIN RSA PRIVATE KEY-----} \
+		end {-----END RSA PRIVATE KEY-----}]
+}
+
+
+proc ::pki::_lookup_command {action keylist} {
+	array set key $keylist
+
+	set type $key(type)
+
+	switch -- $action {
+		encrypt {
+			set idx 0
+		}
+		decrypt {
+			set idx 1
+		}
+		generate {
+			set idx 2
+		}
+		serialize_key {
+			set idx 3
+		}
+		serialize_public_key {
+			set idx 4
+		}
+	}
+
+	set cmdlist $::pki::handlers($type)
+
+	set ret [lindex $cmdlist $idx]
+
+	return $ret
+}
+
+
+proc ::pki::encrypt args {
+	set outmode hex
+	set enablepad 1
+
+	set argsmode 0
+	set newargs [list]
+	foreach arg $args {
+		if {![string match -* $arg]} {
+			set argsmode 1
+		}
+
+		if {$argsmode} {
+			lappend newargs $arg
+			continue
+		}
+
+		switch -- $arg {
+			-pub {
+				set mode pub
+				set padmode 2
+			}
+			-priv {
+				set mode priv
+				set padmode 1
+			}
+			-hex {
+				set outmode hex
+			}
+			-binary {
+				set outmode bin
+			}
+			-pad {
+				set enablepad 1
+			}
+			-nopad {
+				set enablepad 0
+			}
+			-- {
+				set argsmode 1
+			}
+			default {
+				return -code error "usage: encrypt ?-binary? ?-hex? ?-pad? ?-nopad?\
+					-priv|-pub ?--? input key"
+			}
+		}
+	}
+	set args $newargs
+
+	if {[llength $args] != 2 || ![info exists mode]} {
+		return -code error "usage: encrypt ?-binary? ?-hex? ?-pad? ?-nopad?\
+			-priv|-pub ?--? input key"
+	}
+
+	set input [lindex $args 0]
+	set keylist [lindex $args 1]
+	array set key $keylist
+
+	if {$enablepad} {
+		set input [::pki::_pad_pkcs $input $key(l) $padmode]
+	}
+	set overhead 3
+
+	set encrypt [::pki::_lookup_command encrypt $keylist]
+
+	set retval [$encrypt $mode $input $keylist $overhead]
+
+	switch -- $outmode {
+		hex {
+			binary scan $retval H* retval
+		}
+	}
+
+	return $retval
+}
+
+
+proc ::pki::decrypt args {
+	set inmode hex
+	set enableunpad 1
+
+	set argsmode 0
+	set newargs [list]
+	foreach arg $args {
+		if {![string match -* $arg]} {
+			set argsmode 1
+		}
+
+		if {$argsmode} {
+			lappend newargs $arg
+			continue
+		}
+
+		switch -- $arg {
+			-pub {
+				set mode pub
+			}
+			-priv {
+				set mode priv
+			}
+			-hex {
+				set inmode hex
+			}
+			-binary {
+				set inmode bin
+			}
+			-unpad {
+				set enableunpad 1
+			}
+			-nounpad {
+				set enableunpad 0
+			}
+			-- {
+				set argsmode 1
+			}
+			default {
+				return -code error "usage: decrypt ?-binary? ?-hex? ?-unpad? ?-nounpad?\
+					-priv|-pub ?--? input key"
+			}
+		}
+	}
+	set args $newargs
+
+	if {[llength $args] != 2 || ![info exists mode]} {
+		return -code error "usage: decrypt ?-binary? ?-hex? ?-unpad? ?-nounpad?\
+			-priv|-pub ?--? input key"
+	}
+
+	set input [lindex $args 0]
+	set keylist [lindex $args 1]
+	array set key $keylist
+
+	switch -- $inmode {
+		hex {
+			set input [binary format H* $input]
+		}
+	}
+
+	set decrypt [::pki::_lookup_command decrypt $keylist]
+
+	set retval [$decrypt $mode $input $keylist]
+
+	if {$enableunpad} {
+		set retval [::pki::_unpad_pkcs $retval]
+	}
+
+	return $retval
+}
+
+
+# Hash and encrypt with private key
+proc ::pki::sign {input keylist {algo sha1}} {
+	switch -- $algo {
+		md5 {
+			package require md5
+
+			set header \x30\x20\x30\x0c\x06\x08\x2a\x86\x48\x86\xf7\x0d\x02\x05\x05\x00\x04\x10
+			set hash [md5::md5 $input]
+		}
+		sha1 {
+			package require sha1
+
+			set header \x30\x21\x30\x09\x06\x05\x2b\x0e\x03\x02\x1a\x05\x00\x04\x14
+			set hash [sha1::sha1 -bin $input]
+		}
+		sha256 {
+			package require sha256
+
+			set header \x30\x31\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x05\x00\x04\x20
+			set hash [sha2::sha256 -bin $input]
+		}
+		raw {
+			set header {}
+			set hash $input
+		}
+		default {
+			return -code error "Invalid algorithm selected, must be one of: md5, sha1, sha256, raw"
+		}
+	}
+
+	set plaintext ${header}${hash}
+
+	array set key $keylist
+
+	set padded [::pki::_pad_pkcs $plaintext $key(l) 1]
+
+	return [::pki::encrypt -binary -nopad -priv -- $padded $keylist]
+}
+
+
+# Verify known-plaintext with signature
+proc ::pki::verify {signedmessage checkmessage keylist {algo default}} {
+	package require asn
+
+	if {[catch {
+		set plaintext [::pki::decrypt -binary -unpad -pub -- $signedmessage $keylist]
+	}]} {
+		return false
+	}
+
+	if {$algo eq {default}} {
+		set algoId unknown
+		set digest {}
+
+		catch {
+			::asn::asnGetSequence plaintext message
+			::asn::asnGetSequence message digestInfo
+			::asn::asnGetObjectIdentifier digestInfo algoId
+			::asn::asnGetOctetString message digest
+		}
+
+		set algoId [::pki::_oid_number_to_name $algoId]
+	} else {
+		set algoId $algo
+		set digest $plaintext
+	}
+
+	switch -- $algoId {
+		md5 - md5WithRSAEncryption {
+			set checkdigest [md5::md5 $checkmessage]
+		}
+		sha1 - sha1WithRSAEncryption {
+			set checkdigest [sha1::sha1 -bin $checkmessage]
+		}
+		sha256 - sha256WithRSAEncryption {
+			set checkdigest [sha2::sha256 -bin $checkmessage]
+		}
+		default {
+			return -code error "Unknown hashing algorithm: $algoId"
+		}
+	}
+
+	if {$checkdigest ne $digest} {
+		return false
+	}
+
+	return true
+}
+
+
+proc ::pki::key {keylist {password {}} {encodePem 1}} {
+	set serialize_key [::pki::_lookup_command serialize_key $keylist]
+
+	if {$serialize_key eq {}} {
+		array set key $keylist
+
+		return -code error "Do not know how to serialize an $key(type) key"
+	}
+
+	array set retval_parts [$serialize_key $keylist]
+
+	if {$encodePem} {
+		set retval [::pki::_encode_pem $retval_parts(data) $retval_parts(begin) \
+			$retval_parts(end) $password]
+	} else {
+		if {$password ne {}} {
+			return -code error {DER encoded keys may not be password protected}
+		}
+
+		set retval $retval_parts(data)
+	}
+
+	return $retval
+}
+
+
+proc ::pki::public_key {keylist {password {}} {encodePem 1}} {
+	set serialize_key [::pki::_lookup_command serialize_public_key $keylist]
+
+	if {$serialize_key eq {}} {
+		array set key $keylist
+
+		return -code error "Do not know how to serialize an $key(type) key"
+	}
+
+	array set retval_parts [$serialize_key $keylist]
+
+	if {$encodePem} {
+		set retval [::pki::_encode_pem $retval_parts(data) $retval_parts(begin) \
+			$retval_parts(end) $password]
+	} else {
+		if {$password ne {}} {
+			return -code error {DER encoded keys may not be password protected}
+		}
+
+		set retval $retval_parts(data)
+	}
+
+	return $retval
+}
+
+
+proc ::pki::parse {text {errorOnUnknownType 0}} {
+	set rc [list]
+	while {[regexp {^.*?-----BEGIN (.*?)-----(.*?)-----END (.*?)-----(.*)$} \
+		$text - type body type2 text]} {
+
+		if {$type != $type2} {
+			return -code error "BEGIN and END types do not match ($type and $type2)"
+		}
+		set body "-----BEGIN $type-----\n$body\n-----END $type-----\n"
+
+		switch -- $type {
+			{RSA PRIVATE KEY} {
+				lappend rc key [::pki::pkcs::parse_key $body]
+			}
+			{PUBLIC KEY} {
+				lappend rc public_key [::pki::pkcs::parse_public_key $body]
+			}
+			CERTIFICATE {
+				lappend rc certificate [::pki::x509::parse_cert $body]
+			}
+			{CERTIFICATE REQUEST} {
+				lappend rc certificate_request [::pki::pkcs::parse_csr $body]
+			}
+			default {
+				if {$errorOnUnknownType} {
+					return -code error "Unable to parse key with type $type"
+				}
+			}
+		}
+	}
+	return $rc
+}
+
+
+proc ::pki::_parse_init {} {
+	if {[info exists ::pki::_parse_init_done]} {
+		return
+	}
+
+	package require asn
+
+	set test FAIL
+	catch {
+		set test [binary decode base64 UEFTUw==]
+	}
+
+	switch -- $test {
+		PASS {
+			set ::pki::rsa::base64_binary 1
+		}
+		FAIL {
+			set ::pki::rsa::base64_binary 0
+
+			package require base64
+		}
+	}
+
+	set ::pki::_parse_init_done 1
+	return
+}
+
+
+proc ::pki::_getopensslkey {password salt bytes} {
+	package require md5
+
+	set salt [string range $salt 0 7]
+
+	set saltedkey $password$salt
+	for {set ret {}} {[string length $ret] < $bytes} {} {
+		if {![info exists hash]} {
+			set hash $saltedkey
+		} else {
+			set hash $hash$saltedkey
+		}
+
+		set hash [md5::md5 $hash]
+
+		append ret $hash
+	}
+
+	if {[string length $ret] < $bytes} {
+		set bytes_to_add [expr $bytes - [string length $ret]]
+		set ret [string repeat \x00 $bytes_to_add]$ret
+	}
+
+	set ret [string range $ret 0 [expr {$bytes - 1}]]
+	return $ret
+}
+
+
+proc ::pki::_encode_pem {data begin end {password {}} {algo aes-256-cbc}} {
+	set ret {} 
+
+	append ret $begin\n
+	if {$password ne {}} {
+		switch -glob -- $algo {
+			aes-* {
+				set algostr [string toupper $algo]
+				set work [split $algo -]
+				set algo aes
+				set keysize [lindex $work 1]
+				set mode [lindex $work 2]
+				set blocksize 16
+				set ivsize [expr {$blocksize * 8}]
+			}
+			default {
+				return -code error {Only AES is currently supported}
+			}
+		}
+
+		set keybytesize [expr {$keysize / 8}]
+		set ivbytesize [expr {$ivsize / 8}]
+
+		set iv {} 
+		while {[string length $iv] < $ivbytesize} {
+			append iv [::pki::_random -binary]
+		}
+		set iv [string range $iv 0 [expr {$ivbytesize - 1}]]
+
+		set password_key [::pki::_getopensslkey $password $iv $keybytesize]
+
+		set pad [expr {$blocksize - ([string length $data] % $blocksize)}]
+		append data [string repeat \x09 $pad]
+
+		switch -- $algo {
+			aes {
+				set data [aes::aes -dir encrypt -mode $mode -iv $iv -key $password_key -- $data]
+			}
+		}
+
+		binary scan $iv H* iv
+		set iv [string toupper $iv]
+
+		append ret "Proc-Type: 4,ENCRYPTED\n"
+		append ret "DEK-Info: $algostr,$iv\n"
+		append ret \n
+	}
+
+	if {$::pki::rsa::base64_binary} {
+		append ret [binary encode base64 -maxlen 64 $data]
+	} else {
+		append ret [::base64::encode -maxlen 64 $data]
+	}
+	append ret \n
+	append ret $end\n
+	return $ret
+}
+
+
+proc ::pki::_parse_pem {pem begin end {password {}}} {
+	# Unencode a PEM-encoded object
+	set testpem [split $pem \n]
+	set pem_startidx [lsearch -exact $testpem $begin]
+	set pem_endidx [lsearch -exact -start $pem_startidx $testpem $end]
+
+	if {$pem_startidx == -1 || $pem_endidx == -1} {
+		return [list data $pem]
+	}
+
+	set pem $testpem
+
+	incr pem_startidx
+	incr pem_endidx -1
+
+	array set ret [list]
+
+	set newpem ""
+	foreach line [lrange $pem $pem_startidx $pem_endidx] {
+		if {[string match *:* $line]} {
+			set work [split $line :]
+
+			set var [string toupper [lindex $work 0]]
+			set val [string trim [join [lrange $work 1 end] :]]
+
+			set ret($var) $val
+
+			continue
+		}
+
+		set line [string trim $line]
+
+		append newpem $line
+	}
+
+	if {$newpem ne {}} {
+		if {$::pki::rsa::base64_binary} {
+			set pem [binary decode base64 $newpem]
+		} else {
+			set pem [::base64::decode $newpem]
+		}
+	}
+
+	if {[info exists ret(PROC-TYPE)] && [info exists ret(DEK-INFO)]} {
+		if {$ret(PROC-TYPE) eq {4,ENCRYPTED}} {
+			if {$password eq {}} {
+				return [list error ENCRYPTED]
+			}
+
+			switch -glob -- $ret(DEK-INFO) {
+				DES-EDE3-* {
+					package require des
+
+					# DES-EDE3-CBC,03B1F1883BFA4412
+					set keyinfo $ret(DEK-INFO)
+
+					set work [split $keyinfo ,]
+					set cipher [lindex $work 0]
+					set iv [lindex $work 1]
+
+					set work [split $cipher -]
+					set algo [lindex $work 0]
+					set mode [string tolower [lindex $work 2]]
+
+					set iv [binary format H* $iv]
+					set password_key [::pki::_getopensslkey $password $iv 24]
+
+					set pem [DES::des -dir decrypt -mode $mode -iv $iv -key $password_key -- $pem]
+				}
+				AES-* {
+					package require aes
+
+					# AES-256-CBC,AF517BA39E94FF39D1395C63F6DE9657
+					set keyinfo $ret(DEK-INFO)
+
+					set work [split $keyinfo ,]
+					set cipher [lindex $work 0]
+					set iv [lindex $work 1]
+
+					set work [split $cipher -]
+					set algo [lindex $work 0]
+					set keysize [lindex $work 1]
+					set mode [string tolower [lindex $work 2]]
+
+					set iv [binary format H* $iv]
+					set password_key [::pki::_getopensslkey $password $iv [expr $keysize / 8]]
+
+					set pem [aes::aes -dir decrypt -mode $mode -iv $iv -key $password_key -- $pem]
+				}
+			}
+		}
+	}
+
+	set ret(data) $pem
+
+	return [array get ret]
+}
+
+
+proc ::pki::pkcs::parse_public_key {key {password {}}} {
+	array set parsed_key [::pki::_parse_pem $key \
+		{-----BEGIN PUBLIC KEY-----} {-----END PUBLIC KEY-----} $password]
+
+	set key_seq $parsed_key(data)
+
+	::asn::asnGetSequence key_seq pubkeyinfo
+		::asn::asnGetSequence pubkeyinfo pubkey_algoid
+			::asn::asnGetObjectIdentifier pubkey_algoid oid
+		::asn::asnGetBitString pubkeyinfo pubkey
+	set ret(pubkey_algo) [::pki::_oid_number_to_name $oid]
+
+	switch -- $ret(pubkey_algo) {
+		rsaEncryption {
+			set pubkey [binary format B* $pubkey]
+
+			::asn::asnGetSequence pubkey pubkey_parts
+				::asn::asnGetBigInteger pubkey_parts ret(n)
+				::asn::asnGetBigInteger pubkey_parts ret(e)
+
+			set ret(n) [::math::bignum::tostr $ret(n)]
+			set ret(e) [::math::bignum::tostr $ret(e)]
+			set ret(l) [expr {int([::pki::_bits $ret(n)] / 8.0000 + 0.5) * 8}]
+			set ret(type) rsa
+		}
+		default {
+			error {Unknown algorithm}
+		}
+	}
+
+	return [array get ret]
+}
+
+
+proc ::pki::pkcs::parse_key {key {password {}}} {
+	array set parsed_key [::pki::_parse_pem $key \
+		{-----BEGIN RSA PRIVATE KEY-----} {-----END RSA PRIVATE KEY-----} $password]
+
+	set key_seq $parsed_key(data)
+
+	::asn::asnGetSequence key_seq key
+	::asn::asnGetBigInteger key version
+	::asn::asnGetBigInteger key ret(n)
+	::asn::asnGetBigInteger key ret(e)
+	::asn::asnGetBigInteger key ret(d)
+	::asn::asnGetBigInteger key ret(p)
+	::asn::asnGetBigInteger key ret(q)
+
+	set ret(n) [::math::bignum::tostr $ret(n)]
+	set ret(e) [::math::bignum::tostr $ret(e)]
+	set ret(d) [::math::bignum::tostr $ret(d)]
+	set ret(p) [::math::bignum::tostr $ret(p)]
+	set ret(q) [::math::bignum::tostr $ret(q)]
+	set ret(l) [expr {int([::pki::_bits $ret(n)] / 8.0000 + 0.5) * 8}]
+	set ret(type) rsa
+
+	return [array get ret]
+}
+
+
+# dn expected to be concatenated RelativeDistinguishedName DER encoded values
+proc ::pki::x509::_dn_to_list dn {
+	set ret {} 
+
+	while {$dn ne {}} {
+		# RelativeDistinguishedName  ::=
+		# SET SIZE (1 .. MAX) OF SingleAttribute { {SupportedAttributes} }
+		# SingleAttribute{ATTRIBUTE:AttrSet} ::= SEQUENCE {
+		# 	type      ATTRIBUTE.&id({AttrSet}),
+		# 	value     ATTRIBUTE.&Type({AttrSet}{@type})
+		# }
+		# Assumed here that Set contains a single attribute, and the attribute
+		# value is a string. This should suffice for most (all?) X.509 certs
+		::asn::asnGetSet dn dn_parts
+		::asn::asnGetSequence dn_parts curr_part
+		::asn::asnGetObjectIdentifier curr_part label
+		::asn::asnGetString curr_part value
+
+		set label [::pki::_oid_number_to_name $label]
+		lappend ret $label $value
+	}
+
+	return $ret
+}
+
+
+proc ::pki::x509::_list_to_dn name {
+	set ret {} 
+	foreach {oid_name value} $name {
+		if {![regexp {[^ A-Za-z0-9'()+,.:/?=-]} $value]} {
+			set asnValue [::asn::asnPrintableString $value]
+		} else {
+			set asnValue [::asn::asnUTF8String $value]
+		}
+
+		append ret [::asn::asnSet [
+			::asn::asnSequence [
+				::asn::asnObjectIdentifier [::pki::_oid_name_to_number $oid_name]
+			] $asnValue ]
+		]
+	}
+
+	return $ret
+}
+
+
+proc ::pki::x509::_dn_to_string dn {
+	set ret [list]
+
+	foreach {label value} [_dn_to_list $dn] {
+		set label [string toupper $label]
+
+		lappend ret $label=$value
+	}
+
+	set ret [join $ret {, }]
+
+	return $ret
+}
+
+
+proc ::pki::x509::_string_to_dn string {
+	foreach {label value} [split $string ,=] {
+		set label [string trim $label]
+		set value [string trim $value]
+
+		lappend namelist $label $value
+	}
+
+	return [_list_to_dn $namelist]
+}
+
+
+proc ::pki::x509::_dn_to_cn dn {
+	foreach {label value} [split $dn ,=] {
+		set label [string toupper [string trim $label]]
+		set value [string trim $value]
+
+		if {$label eq {CN}} {
+			return $value
+		}
+	}
+
+	return {} 
+}
+
+
+proc ::pki::x509::_utctime_to_native utctime {
+	return [clock scan $utctime -format %y%m%d%H%M%SZ -gmt true]
+}
+
+proc ::pki::x509::_native_to_utctime time {
+	return [clock format $time -format %y%m%d%H%M%SZ -gmt true]
+}
+
+proc ::pki::x509::_generalizedtime_to_native utctime {
+	return [clock scan $utctime -format %Y%m%d%H%M%SZ -gmt true]
+}
+
+
+proc ::pki::x509::_generalizedtime_to_utctime time {
+	return [clock format $time -format %Y%m%d%H%M%SZ -gmt true]
+}
+
+
+proc ::pki::x509::_parse_BasicConstraints {ext_octets_var} {
+	# https://www.rfc-editor.org/rfc/rfc5280#page-128
+	# BasicConstraints ::= SEQUENCE {
+	# 	cA                      BOOLEAN DEFAULT FALSE,
+	# 	pathLenConstraint       INTEGER (0..MAX) OPTIONAL }
+
+	upvar 1 $ext_octets_var ext_octets
+	# bytes will hold actual sequence bytes without the header
+	::asn::asnGetSequence ext_octets bytes
+
+	# Both elements are effectively optional. Upper levels use CA depth of -1
+	# to indicate no constraints specified
+	set allowCA 0
+	set caDepth -1
+
+	if {$bytes ne {}} {
+		# Check first element - if not a boolean, it is missing and should default
+		::asn::asnPeekByte bytes tag
+		if {$tag == 0x01} {
+			::asn::asnGetBoolean bytes allowCA
+		}
+		# Second field if present
+		if {$bytes ne {}} {
+			::asn::asnGetInteger bytes caDepth
+		}
+		# TODO - should we raise an error if extra bytes left over?
+	}
+
+
+	return [list $allowCA $caDepth]
+}
+
+
+proc ::pki::x509::_parse_ExtKeyUsage {ext_octets_var} {
+	# extKeyUsage OBJECT IDENTIFIER ::= {id-ce 37}
+	# ExtKeyUsageSyntax ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
+	# KeyPurposeId ::= OBJECT IDENTIFIER
+	# -- permit unspecified key uses
+	# anyExtendedKeyUsage OBJECT IDENTIFIER ::= { extKeyUsage 0 }
+	# -- extended key purpose OIDs
+	# id-kp-serverAuth             OBJECT IDENTIFIER ::= { id-kp 1 }
+	# id-kp-clientAuth             OBJECT IDENTIFIER ::= { id-kp 2 }
+	# id-kp-codeSigning            OBJECT IDENTIFIER ::= { id-kp 3 }
+	# id-kp-emailProtection        OBJECT IDENTIFIER ::= { id-kp 4 }
+	# id-kp-ipsecEndSystem         OBJECT IDENTIFIER ::= { id-kp 5 }
+	# id-kp-ipsecTunnel            OBJECT IDENTIFIER ::= { id-kp 6 }
+	# id-kp-ipsecUser              OBJECT IDENTIFIER ::= { id-kp 7 }
+	# id-kp-timeStamping           OBJECT IDENTIFIER ::= { id-kp 8 }
+	# id-kp-OCSPSigning            OBJECT IDENTIFIER ::= { id-kp 9 }
+
+	upvar 1 $ext_octets_var ext_octets
+	::asn::asnGetSequence ext_octets bytes
+
+	set ext_key_usage [list]
+	while {$bytes ne {}} {
+		::asn::asnGetObjectIdentifier bytes oid
+		lappend ext_key_usage [::pki::_oid_number_to_name $oid]
+	}
+
+	return $ext_key_usage
+}
+
+
+proc ::pki::x509::_parse_KeyUsage {ext_octets_var} {
+	# KeyUsage ::= BIT STRING {
+	# 	digitalSignature        (0),
+	# 	nonRepudiation          (1),  -- recent editions of X.509 have
+	# 	-- renamed this bit to contentCommitment
+	# 	keyEncipherment         (2),
+	# 	dataEncipherment        (3),
+	# 	keyAgreement            (4),
+	# 	keyCertSign             (5),
+	# 	cRLSign                 (6),
+	# 	encipherOnly            (7),
+	# 	decipherOnly            (8) }
+
+	upvar 1 $ext_octets_var ext_octets
+	::asn::asnGetBitString ext_octets bits
+
+	scan $bits %b bits
+	set tokens {
+		digitalSignature nonRepudiation keyEncipherment dataEncipherment
+		keyAgreement keyCertSign cRLSign encipherOnly decipherOnly
+	}
+	set ntokens [llength $tokens]
+	set key_usage [list $bits]
+	for {set i 0} {$i < $ntokens} {incr i} {
+		if {$bits & (1 << $i)} {
+			lappend key_usage [lindex $tokens $i]
+		}
+	}
+	return $key_usage
+}
+
+proc ::pki::x509::_parse_GeneralName {bytes_var {with_ip_mask 0}} {
+	# Returns a pair "name type" and name value
+	# by parsing a GeneralName ASN.1 structure in $bytes_var. The parsed bytes
+	# are removed from $bytes_var.
+	# https://www.rfc-editor.org/rfc/rfc5280#page-128
+	# GeneralName ::= CHOICE {
+	# 	otherName                 [0]  AnotherName,
+	# 	rfc822Name                [1]  IA5String,
+	# 	dNSName                   [2]  IA5String,
+	# 	x400Address               [3]  ORAddress,
+	# 	directoryName             [4]  Name,
+	# 	ediPartyName              [5]  EDIPartyName,
+	# 	uniformResourceIdentifier [6]  IA5String,
+	# 	iPAddress                 [7]  OCTET STRING,
+	# 	registeredID              [8]  OBJECT IDENTIFIER }
+	# In addition, from RFC 8398 -
+	# id-on-SmtpUTF8Mailbox OBJECT IDENTIFIER ::= { id-on 9 }
+	# SmtpUTF8Mailbox ::= UTF8String (SIZE (1..MAX))
+
+	upvar 1 $bytes_var bytes
+
+	::asn::asnPeekByte bytes tag
+	# The tag is context-specific (0x80) | choice index To extract using asn
+	# routines, replace the tag with the concrete primitive tag using
+	# asnRetag. This is somewhat inefficient and it would have been better
+	# if the asn routines took an optional "expected_tag" argument but they
+	# do not, and I don't want to start hacking that module.
+
+	# Note the name tags (rfc822name etc.) are same as those used in create_cert
+	switch -exact -- [format 0x%02x $tag] {
+		0xa0 {
+			# AnotherName - Important because Windows uses it for WinRM to store
+			# UPN format names with OID 1.3.6.1.4.1.311.20.2.3 with the value
+			# as a UTF-8 encoded string. However, other OID's may not use this
+			# UTF-8 forms, so we just keep the raw data in hex.
+			::asn::asnGetContext bytes context_tag other_name
+			# ::asn::asnRetag bytes 0x30; # Retag as SEQUENCE
+			# ::asn::asnGetSequence bytes other_name
+			::asn::asnGetObjectIdentifier other_name other_name_oid
+			# Since interpretation is unknown, just store hex representation
+			binary scan $other_name H* other_name_hex
+			return [list otherName [list [::pki::_oid_number_to_dotted $other_name_oid] $other_name_hex]]
+		}
+		0x81 {
+			::asn::asnRetag bytes 0x16;	# Retag as IA5String
+			::asn::asnGetIA5String bytes name
+			return [list rfc822Name $name]
+		}
+		0x82 {
+			::asn::asnRetag bytes 0x16;	# Retag as IA5String
+			::asn::asnGetIA5String bytes name
+			return [list dNSName $name]
+		}
+		0xa3 {
+			# TODO x400address - forget about parsing this for now!
+			::asn::asnGetContext bytes context_tag x400addr
+			# ::asn::asnRetag bytes 0x30; # Retag as SEQUENCE
+			# ::asn::asnGetSequence bytes x400addr
+			binary scan $x400addr H* x400addr_hex
+			return [list x400Address $x400addr_hex]
+		}
+		0xa4 {
+			::asn::asnGetContext bytes context_tag dn_bytes
+			#::asn::asnRetag bytes 0x30; # Retag as SEQUENCE
+			::asn::asnGetSequence dn_bytes dir_name
+			return [list directoryName [_dn_to_string $dir_name]]
+		}
+		0xa5 {
+			# EDIPartyName ::= SEQUENCE {
+			# 	nameAssigner            [0]     DirectoryString OPTIONAL,
+			# 	partyName               [1]     DirectoryString }
+			# DirectoryString ::= CHOICE {
+			# 	teletexString       TeletexString   (SIZE (1..MAX)),
+			# 	printableString     PrintableString (SIZE (1..MAX)),
+			# 	universalString     UniversalString (SIZE (1..MAX)),
+			# 	utf8String          UTF8String      (SIZE (1..MAX)),
+			# 	bmpString           BMPString       (SIZE (1..MAX)) }
+			# TODO - Not too hard to implement but I'm not clear about the
+			# presence of implicit tags and do not have a sample certificate
+			::asn::asnRetag bytes 0x30; # Retag as SEQUENCE
+			::asn::asnGetSequence bytes edi
+			binary scan $edi H* edi_hex
+			return [list ediPartyName $edi_hex]
+		}
+		0x86 {
+			::asn::asnRetag bytes 0x16;	# Retag as IA5String
+			::asn::asnGetIA5String bytes name
+			return [list uniformResourceIdentifier $name]
+		}
+		0x87 {
+			# IPv4/6 -> must be exactly 4/16 octets respectively in a subject
+			# name but can be 8/32 in a name constraint.
+			::asn::asnRetag bytes 0x04
+			::asn::asnGetOctetString bytes addr
+			set n [string length $addr]
+			if {$n == 4} {
+				binary scan $addr cu* addr
+				set addr_str [join $addr .]
+			} elseif {$n == 16} {
+				binary scan $addr H* addr
+				set addr_str [regsub -all {[[:xdigit:]]{4}(?=.)} $addr {\0:}]
+			} elseif {$with_ip_mask && $n == 8} {
+				binary scan $addr cu4cu* addr mask
+				set addr_str [list [join $addr .] [join $mask .]]
+			} elseif {$with_ip_mask && $n == 32} {
+				binary scan $addr H32H32 addr mask
+				set addr [regsub -all {[[:xdigit:]]{4}(?=.)} $addr {\0:}]
+				set mask [regsub -all {[[:xdigit:]]{4}(?=.)} $mask {\0:}]
+				set addr_str [list $addr $mask]
+			} else {
+				error "Invalid IP address. Has $n octets."
+			}
+			return [list iPAddress $addr_str]
+		}
+		0x88 {
+			::asn::asnRetag bytes 0x06;	# Retag as OBJECT IDENTIFIER
+			::asn::asnGetObjectIdentifier bytes oid
+			return [list registeredID [::pki::_oid_number_to_dotted $oid]]
+		}
+		0x89 {
+			::asn::asnRetag bytes 0x0C;	# Retag as UTF8 string
+			::asn::asnGetUTF8String bytes name
+			return [list uniformResourceIdentifier $name]
+		}
+		default {
+			puts bytes:[binary encode hex $bytes]
+			error "Unknown context tag [format 0x%02x $tag] encountered in parsing ASN.1 GeneralName."
+		}
+	}
+}
+
+
+proc ::pki::x509::_parse_GeneralNames {bytes_var} {
+	# GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
+	# https://www.rfc-editor.org/rfc/rfc5280#page-128
+	# GeneralName ::= CHOICE {
+	# 	otherName                 [0]  AnotherName,
+	# 	rfc822Name                [1]  IA5String,
+	# 	dNSName                   [2]  IA5String,
+	# 	x400Address               [3]  ORAddress,
+	# 	directoryName             [4]  Name,
+	# 	ediPartyName              [5]  EDIPartyName,
+	# 	uniformResourceIdentifier [6]  IA5String,
+	# 	iPAddress                 [7]  OCTET STRING,
+	# 	registeredID              [8]  OBJECT IDENTIFIER }
+	# In addition, from RFC 8398 -
+	# id-on-SmtpUTF8Mailbox OBJECT IDENTIFIER ::= { id-on 9 }
+	# SmtpUTF8Mailbox ::= UTF8String (SIZE (1..MAX))
+	upvar 1 $bytes_var bytes
+	::asn::asnGetSequence bytes names_bytes
+
+	set names [list]
+	while {$names_bytes ne {}} {
+		# names is a flat name type and name value list. NOT a dictionary
+		# since types may be repeated.
+		lappend names {*}[_parse_GeneralName names_bytes]
+	}
+	return $names
+}
+
+
+proc ::pki::x509::_parse_GeneralSubtrees {bytes_var} {
+	# NOTE: bytes is content of GeneralSubtrees AFTER stripping SEQUENCE header
+	# GeneralSubtrees ::= SEQUENCE SIZE (1..MAX) OF GeneralSubtree
+	# GeneralSubtree ::= SEQUENCE {
+	# 	base                    GeneralName,
+	# 	minimum         [0]     BaseDistance DEFAULT 0,
+	# 	maximum         [1]     BaseDistance OPTIONAL }
+	# BaseDistance ::= INTEGER (0..MAX)
+
+	upvar 1 $bytes_var bytes
+	::asn::asnGetSequence bytes subtrees_bytes
+
+	set subtrees [list]
+	while {$subtrees_bytes ne {}} {
+		::asn::asnGetSequence subtrees_bytes subtree_bytes
+		set base [_parse_GeneralName subtree_bytes 1]
+		set minimum 0;			# As per default in spec
+		if {$subtree_bytes ne {}} {
+			::asn::asnPeekByte subtree_bytes tag
+			if {$tag == 0x80} {
+				::asn::asnRetag subtree_bytes 0x02
+				::asn::asnGetInteger subtree_bytes minimum
+				# Next tag. Note NO default if not present
+				if {$subtree_bytes ne {}} {
+					::asn::asnPeekByte subtree_bytes tag
+					::asn::asnRetag subtree_bytes 0x02
+					::asn::asnGetInteger subtree_bytes maximum
+				}
+			}
+		}
+		set subtree [list base $base minimum $minimum]
+		if {[info exists maximum]} {
+			lappend subtree $maximum
+		}
+		lappend subtrees $subtree
+	}
+
+	return $subtrees
+}
+
+
+proc ::pki::x509::_parse_AuthorityKeyIdentifier {ext_octets_var} {
+	# AuthorityKeyIdentifier ::= SEQUENCE {
+	# 	keyIdentifier             [0] KeyIdentifier           OPTIONAL,
+	# 	authorityCertIssuer       [1] GeneralNames            OPTIONAL,
+	# 	authorityCertSerialNumber [2] CertificateSerialNumber OPTIONAL  }
+	# KeyIdentifier ::= OCTET STRING
+
+	upvar 1 $ext_octets_var ext_octets
+
+	::asn::asnGetSequence ext_octets bytes
+
+	# Note the fields are optional but must appear in the sequence shown.
+	# TODO - should we raise an error if fields in wrong order?
+
+	set ext_value [list]
+	if {$bytes eq {}} {
+		return $ext_value
+	}
+
+	# The tag is context-specific (0x80) | choice index To extract using asn
+	# routines, replace the tag with the concrete primitive tag using
+	# asnRetag. This is somewhat inefficient and it would have been better
+	# if the asn routines took an optional "expected_tag" argument but they
+	# do not, and I don't want to start hacking that module.
+
+	::asn::asnPeekByte bytes tag
+	if {$tag == 0x80} {
+		::asn::asnRetag bytes 0x04; # Retag as OCTET STRING
+		::asn::asnGetOctetString bytes key_identifier
+		binary scan $key_identifier H* key_identifier_hex
+		lappend ext_value keyIdentifier $key_identifier_hex
+		if {$bytes eq {}} {
+			return $ext_value
+		}
+		::asn::asnPeekByte bytes tag
+	}
+
+	if {$tag == 0xa1} {
+		::asn::asnRetag bytes 0x30; # Retag as SEQUENCE - (GeneralNames)
+		lappend ext_value \
+			authorityCertIssuer [_parse_GeneralNames bytes]
+		if {$bytes eq {}} {
+			return $ext_value
+		}
+		::asn::asnPeekByte bytes tag
+	}
+
+	if {$tag == 0x82} {
+		if {0} {
+			This breaks because asnGetInteger cannot handle very large integers
+			::asn::asnRetag bytes 0x02; # Retag as INTEGER
+			::asn::asnGetInteger bytes serial
+		} else {
+			# TODO - add this support to asnGetInteger
+			::asn::asnGetByte bytes tag
+			::asn::asnGetLength bytes len
+			::asn::asnGetBytes bytes $len sn_bytes
+			binary scan $sn_bytes H* sn_hex
+			set serial [format %lld 0x$sn_hex]
+		}
+		lappend ext_value authorityCertSerialNumber $serial
+	}
+
+	# TODO - are we supposed to raise an error if no fields or extra bytes?
+	return $ext_value
+}
+
+
+proc ::pki::x509::_parse_NameConstraints {ext_octets_var} {
+	# NameConstraints ::= SEQUENCE {
+	# 	permittedSubtrees       [0]     GeneralSubtrees OPTIONAL,
+	# 	excludedSubtrees        [1]     GeneralSubtrees OPTIONAL }
+
+	upvar 1 $ext_octets_var ext_octets
+	::asn::asnGetSequence ext_octets bytes
+	set ext_value [list]
+	if {$bytes eq {}} {
+		return $ext_value
+	}
+	::asn::asnPeekByte bytes tag
+	if {$tag == 0xa0} {
+		::asn::asnRetag bytes 0x30;	# Tag as SEQUENCE
+		lappend ext_value permittedSubtrees [_parse_GeneralSubtrees bytes]
+		if {$bytes eq {}} {
+			return $ext_value
+		}
+		::asn::asnPeekByte bytes tag
+	}
+	if {$tag == 0xa1} {
+		::asn::asnRetag bytes 0x30;	# Tag as SEQUENCE
+		lappend ext_value excludedSubtrees [_parse_GeneralSubtrees bytes]
+	}
+	return $ext_value
+}
+
+
+proc ::pki::x509::_parse_PolicyConstraints {ext_octets_var} {
+	# PolicyConstraints ::= SEQUENCE {
+    #     requireExplicitPolicy           [0] SkipCerts OPTIONAL,
+    #     inhibitPolicyMapping            [1] SkipCerts OPTIONAL }
+	# SkipCerts ::= INTEGER (0..MAX)
+
+	upvar 1 $ext_octets_var ext_octets
+	::asn::asnGetSequence ext_octets bytes
+	set ext_value [list]
+	if {$bytes eq {}} {
+		return $ext_value
+	}
+	::asn::asnPeekByte bytes tag
+	if {$tag == 0x80} {
+		::asn::asnRetag bytes 0x02;	# Tag as INTEGER
+		::asn::asnGetInteger bytes skip
+		lappend ext_value requireExplicitPolicy $skip
+		if {$bytes eq {}} {
+			return $ext_value
+		}
+		::asn::asnPeekByte bytes tag
+	}
+	if {$tag == 0x81} {
+		::asn::asnRetag bytes 0x02;	# Tag as INTEGER
+		::asn::asnGetInteger bytes skip
+		lappend ext_value inhibitPolicyMapping $skip
+	}
+	return $ext_value
+}
+
+
+proc ::pki::x509::_parse_UserNotice bytes_var {
+	# UserNotice ::= SEQUENCE {
+    #     noticeRef        NoticeReference OPTIONAL,
+    #     explicitText     DisplayText OPTIONAL }
+	# NoticeReference ::= SEQUENCE {
+    #     organization     DisplayText,
+    #     noticeNumbers    SEQUENCE OF INTEGER }
+	# DisplayText ::= CHOICE {
+    #     ia5String        IA5String      (SIZE (1..200)),
+    #     visibleString    VisibleString  (SIZE (1..200)),
+    #     bmpString        BMPString      (SIZE (1..200)),
+    #     utf8String       UTF8String     (SIZE (1..200)) }
+
+	upvar 1 $bytes_var bytes
+
+	set user_notice [list]
+	::asn::asnGetSequence bytes user_notice_bytes
+	::asn::asnPeekByte user_notice_bytes tag
+	if {$tag == 0x30} {
+		# NoticeReference
+		::asn::asnGetSequence user_notice_bytes notice_ref_bytes
+		::asn::asnGetString notice_ref_bytes org
+		set notice_numbers [list]
+		::asn::asnGetSequence notice_ref_bytes int_seq_bytes
+		while {$int_seq_bytes ne {}} {
+			::asn::asnGetSequence int_seq_bytes number
+			lappend notice_numbers $number
+		}
+		lappend user_notice noticeRef \
+			[list organization $org noticeNumbers $notice_numbers]
+	}
+	if {$user_notice_bytes ne {}} {
+		::asn::asnGetString user_notice_bytes explicit_text
+		lappend user_notice explicitText $explicit_text
+	}
+	return $user_notice
+}
+
+
+proc ::pki::x509::_parse_PolicyQualifierInfo bytes_var {
+	# PolicyQualifierInfo ::= SEQUENCE {
+	# 	policyQualifierId  PolicyQualifierId,
+	# 	qualifier          ANY DEFINED BY policyQualifierId }
+	# Qualifier ::= CHOICE {
+    #     cPSuri           CPSuri,
+    #     userNotice       UserNotice }
+	# CPSuri ::= IA5String
+
+	upvar 1 $bytes_var bytes
+
+	::asn::asnGetObjectIdentifier bytes qualifier_oid
+	set qualifier_oid [::pki::_oid_number_to_name $qualifier_oid]
+	switch -exact -- $qualifier_oid {
+		cps {
+			::asn::asnGetIA5String bytes value
+		}
+		unotice {
+			set value [_parse_UserNotice bytes]
+		}
+		default {
+			binary scan $bytes H* value
+		}
+	}
+	return [list $qualifier_oid $value]
+}
+
+
+proc ::pki::x509::_parse_CertificatePolicies ext_octets_var {
+	# CertificatePolicies ::= SEQUENCE SIZE (1..MAX) OF PolicyInformation
+	# PolicyInformation ::= SEQUENCE {
+	#    policyIdentifier CertPolicyId,
+	#    policyQualifiers SEQUENCE SIZE (1..MAX) OF PolicyQualifierInfo OPTIONAL }
+	# CertPolicyId ::= OBJECT IDENTIFIER
+
+	upvar 1 $ext_octets_var ext_octets
+	::asn::asnGetSequence ext_octets bytes
+	set ext_value [list]
+	if {$bytes eq {}} {
+		return $ext_value
+	}
+
+	while {$bytes ne {}} {
+		::asn::asnGetSequence bytes policy_info_bytes
+		::asn::asnGetObjectIdentifier policy_info_bytes policy_oid
+		set policy_oid [::pki::_oid_number_to_dotted $policy_oid]
+		set policy_info [list policyIdentifier $policy_oid]
+		if {$policy_info_bytes ne {}} {
+			set qualifers [list]
+			::asn::asnGetSequence policy_info_bytes qualifiers_bytes
+			while {$qualifiers_bytes ne {}} {
+				::asn::asnGetSequence qualifiers_bytes qualifier_info_bytes
+				lappend qualifiers {*}[_parse_PolicyQualifierInfo qualifier_info_bytes]
+			}
+			lappend policy_info policyQualifiers $qualifiers
+		}
+		lappend ext_value $policy_info
+	}
+
+	return $ext_value
+}
+
+
+proc ::pki::x509::_parse_PolicyMappings {ext_octets_var} {
+    # PolicyMappings ::= SEQUENCE SIZE (1..MAX) OF SEQUENCE {
+    #     issuerDomainPolicy      CertPolicyId,
+    #     subjectDomainPolicy     CertPolicyId }
+    # CertPolicyId ::= OBJECT IDENTIFIER
+
+    upvar 1 $ext_octets_var ext_octets
+    ::asn::asnGetSequence ext_octets bytes
+    set ext_value [list]
+    while {$bytes ne {}} {
+        ::asn::asnGetSequence bytes mapping_bytes
+        ::asn::asnGetObjectIdentifier mapping_bytes issuer_policy_oid
+        ::asn::asnGetObjectIdentifier mapping_bytes subject_policy_oid
+        lappend ext_value \
+            [::pki::_oid_number_to_dotted $issuer_policy_oid] \
+            [::pki::_oid_number_to_dotted $subject_policy_oid]
+    }
+
+    return $ext_value
+}
+
+
+proc ::pki::x509::_parse_AccessDescriptionSequence {ext_octets_var} {
+	# AuthorityInfoAccessSyntax  ::=
+	# SEQUENCE SIZE (1..MAX) OF AccessDescription
+	# SubjectInfoAccessSyntax  ::=
+	# SEQUENCE SIZE (1..MAX) OF AccessDescription
+	# AccessDescription  ::=  SEQUENCE {
+	# 	accessMethod          OBJECT IDENTIFIER,
+	# 	accessLocation        GeneralName  }
+
+	upvar 1 $ext_octets_var ext_octets
+	::asn::asnGetSequence ext_octets bytes
+	set ext_value [list]
+	while {$bytes ne {}} {
+        ::asn::asnGetSequence bytes access_bytes
+        ::asn::asnGetObjectIdentifier access_bytes method_oid
+		set location [_parse_GeneralName access_bytes]
+		lappend ext_value [list \
+							   accessMethod [::pki::_oid_number_to_name $method_oid] \
+							   accessLocation $location
+							  ]
+	}
+
+	return $ext_value
+}
+
+
+proc ::pki::x509::_parse_Attribute {bytes_var} {
+	# Attribute               ::= SEQUENCE {
+	# 	type             AttributeType,
+	# 	values    SET OF AttributeValue }
+	# AttributeType           ::= OBJECT IDENTIFIER
+	# AttributeValue          ::= ANY -- DEFINED BY AttributeType
+
+	upvar 1 $bytes_var bytes
+	::asn::asnGetSequence bytes seq_bytes
+	::asn::asnGetObjectIdentifier seq_bytes type_oid
+	::asn::asnGetSet seq_bytes values_bytes
+	binary scan H* $values_bytes values_hex
+	return [list type [::pki::_oid_number_to_dotted $type_oid] values $values_hex]
+}
+
+
+proc ::pki::x509::_parse_AttributeAndValue {bytes_var} {
+	# AttributeTypeAndValue ::= SEQUENCE {
+	# 	type     AttributeType,
+	# 	value    AttributeValue }
+	# AttributeType           ::= OBJECT IDENTIFIER
+	# AttributeValue          ::= ANY -- DEFINED BY AttributeType
+
+	upvar 1 $bytes_var bytes
+	::asn::asnGetSequence bytes seq_bytes
+	::asn::asnGetObjectIdentifier seq_bytes type_oid
+	binary scan H* $seq_bytes value_hex
+	return [list type [::pki::_oid_number_to_dotted $type_oid] value $value_hex]
+}
+
+proc ::pki::x509::_parse_SubjectDirectoryAttributes {ext_octets_var} {
+	# SubjectDirectoryAttributes ::= SEQUENCE SIZE (1..MAX) OF Attribute
+
+	upvar 1 $ext_octets_var ext_octets
+	::asn::asnGetSequence ext_octets bytes
+
+	set ext_value {}
+	while {$bytes ne {}} {
+		lappend ext_value [_parse_Attribute bytes]
+	}
+
+	return $ext_value
+}
+
+proc ::pki::x509::_parse_DistributionPoint {bytes_var} {
+	# DistributionPoint ::= SEQUENCE {
+    #     distributionPoint       [0]     DistributionPointName OPTIONAL,
+    #     reasons                 [1]     ReasonFlags OPTIONAL,
+    #     cRLIssuer               [2]     GeneralNames OPTIONAL }
+	# DistributionPointName ::= CHOICE {
+    #     fullName                [0]     GeneralNames,
+    #     nameRelativeToCRLIssuer [1]     RelativeDistinguishedName }
+	# ReasonFlags ::= BIT STRING {
+    #     unused                  (0),
+    #     keyCompromise           (1),
+    #     cACompromise            (2),
+    #     affiliationChanged      (3),
+    #     superseded              (4),
+    #     cessationOfOperation    (5),
+    #     certificateHold         (6),
+    #     privilegeWithdrawn      (7),
+    #     aACompromise            (8) }
+
+	upvar 1 $bytes_var bytes
+	set value [list]
+	::asn::asnGetSequence bytes dp_bytes
+	if {$dp_bytes eq {}} {
+		return $value
+	}
+
+	::asn::asnPeekByte dp_bytes tag
+
+	# Note about tagging. Constructed encodings have the form 0xA?, primitives 0x8?
+	if {$tag == 0xA0} {
+		::asn::asnGetContext dp_bytes context_tag name_bytes
+		::asn::asnPeekByte name_bytes name_tag
+		if {$name_tag == 0xA0} {
+			::asn::asnRetag name_bytes 0x30; # Retag as SEQUENCE
+			lappend value distributionPoint \
+				[list fullName [_parse_GeneralNames name_bytes]]
+		} elseif {$name_tag == 0xA1} {
+			::asn::asnRetag name_bytes 0x31; # Retag as SET (RelativeDistinguishedName)
+			#::asn::asnGetSequence name_bytes rdn
+			lappend value distributionPoint \
+				[list nameRelativeToCRLIssuer [_dn_to_string $name_bytes]]
+
+		}
+		if {$dp_bytes eq {}} {
+			return $value
+		}
+		::asn::asnPeekByte dp_bytes tag
+	}
+	if {$tag == 0x81} {
+		::asn::asnRetag dp_bytes 0x03; # BITSTRING
+		::asn::asnGetBitString dp_bytes bits
+		scan $bits %b bits
+		set tokens {
+			unused keyCompromise cACompromise affiliationChanged superseded
+			cessationOfOperation certificateHold privilegeWithdrawn aACompromise
+		}
+		set ntokens [llength $tokens]
+		set reasons [list $bits]; # Keep binary bits to support unknown flags
+		# Note start with i=1 since the "unused" bit is not to be checked
+		for {set i 1} {$i < $ntokens} {incr i} {
+			if {$bits & (1 << $i)} {
+				lappend reasons [lindex $tokens $i]
+			}
+		}
+		lappend value reasons $reasons
+		if {$dp_bytes eq {}} {
+			return $value
+		}
+		::asn::asnPeekByte dp_bytes tag
+	}
+	if {$tag == 0xa2} {
+		# cRLIssuer
+		::asn::asnRetag dp_bytes 0x30; # SEQUENCE
+		lappend value cRLIssuer [_parse_GeneralNames dp_bytes]
+	}
+	return $value
+}
+
+
+proc ::pki::x509::_parse_CRLDistributionPoints {ext_octets_var} {
+	# CRLDistributionPoints ::= SEQUENCE SIZE (1..MAX) OF DistributionPoint
+
+    upvar 1 $ext_octets_var ext_octets
+    ::asn::asnGetSequence ext_octets bytes
+    set ext_value [list]
+    while {$bytes ne {}} {
+        lappend ext_value [_parse_DistributionPoint bytes]
+    }
+
+    return $ext_value
+}
+
+
+proc ::pki::x509::_parse_extensions {extensions extensions_list_var} {
+	upvar 1 $extensions_list_var extensions_list
+	# Note - do NOT init extensions_list as we are appending to whatever caller
+	# has already stored there.
+	while {$extensions ne {}} {
+		# Each extension is itself a sequence. The first element is an OID that
+		# identifies the extension. The second element is the "critical" flag.
+		# This is optional and defaults to false. The third element is the
+		# actual extension value encoded as an octet string.
+		::asn::asnGetSequence extensions extension
+		::asn::asnGetObjectIdentifier extension ext_oid
+		set ext_oid [::pki::_oid_number_to_name $ext_oid]
+
+		# Check for presence of optional "critical" flag
+		::asn::asnPeekByte extension peek_tag
+		if {$peek_tag == 0x1} {
+			::asn::asnGetBoolean extension ext_critical
+		} else {
+			set ext_critical 0
+		}
+
+		# Now extract the extension value. Note the structure of the octet
+		# string will depend on the OID.
+		::asn::asnGetOctetString extension ext_octets
+
+		# Parsed value of extension is the critical flag followed by zero or
+		# more oid-dependent values.
+
+		switch -exact -- $ext_oid {
+			subjectAltName -
+			issuerAltName {
+				set ext_value [_parse_GeneralNames ext_octets]
+			}
+			basicConstraints {
+				set ext_value [_parse_BasicConstraints ext_octets]
+			}
+			keyUsage {
+				set ext_value [_parse_KeyUsage ext_octets]
+			}
+			extKeyUsage {
+				set ext_value [_parse_ExtKeyUsage ext_octets]
+			}
+			authorityKeyIdentifier {
+				set ext_value [_parse_AuthorityKeyIdentifier ext_octets]
+			}
+			subjectKeyIdentifier {
+				::asn::asnGetOctetString ext_octets subject_key_id
+				binary scan $subject_key_id H* ext_value
+			}
+			nameConstraints {
+				set ext_value [_parse_NameConstraints ext_octets]
+			}
+			certificatePolicies {
+				set ext_value [_parse_CertificatePolicies ext_octets]
+			}
+			policyMappings {
+				set ext_value [_parse_PolicyMappings ext_octets]
+			}
+			policyConstraints {
+				set ext_value [_parse_PolicyConstraints ext_octets]
+			}
+			inhibitAnyPolicy {
+				::asn::asnGetInteger ext_octets ext_value
+			}
+			subjectDirectoryAttributes {
+				set ext_value [_parse_SubjectDirectoryAttributes ext_octets]
+			}
+			freshestCRL -
+			cRLDistributionPoints {
+				set ext_value [_parse_CRLDistributionPoints ext_octets]
+			}
+			authorityInfoAccess -
+			subjectInfoAccess {
+				set ext_value [_parse_AccessDescriptionSequence ext_octets]
+			}
+			default {
+				binary scan $ext_octets H* ext_value
+			}
+		}
+		if {$ext_oid eq "basicConstraints"} {
+			# TODO - backward compatibility hack This was returned in 0.1 as a
+			# three element list - {critical allowCa caDepth} If backward compat
+			# is not an issue, we should make it consistent with the asn.1 specs
+			# and other extensions where the value is a separate structure from
+			# the critical flag and not flattened into a list. For now, return
+			# both forms.
+			lappend extensions_list id-ce-basicConstraints [list $ext_critical {*}$ext_value]
+			# Note we also add the new form of basicConstraints below
+		}
+		lappend extensions_list $ext_oid [list $ext_critical $ext_value]
+	}
+	return
+}
+
+proc ::pki::x509::parse_cert {cert} {
+	array set parsed_cert [::pki::_parse_pem $cert \
+		{-----BEGIN CERTIFICATE-----} {-----END CERTIFICATE-----}]
+	set cert_seq $parsed_cert(data)
+
+	array set ret [list]
+
+	# Include the raw certificate
+	set ret(raw) $cert
+	binary scan $ret(raw) H* ret(raw)
+
+	# Decode X.509 certificate, which is an ASN.1 sequence
+	::asn::asnGetSequence cert_seq wholething
+	::asn::asnGetSequence wholething cert
+
+	set ret(cert) $cert
+	set ret(cert) [::asn::asnSequence $ret(cert)]
+	binary scan $ret(cert) H* ret(cert)
+
+	::asn::asnPeekByte cert peek_tag
+	if {$peek_tag != 0x02} {
+		# Version number is optional, if missing assumed to be value of 0
+		::asn::asnGetContext cert - asn_version
+		::asn::asnGetInteger asn_version ret(version)
+		incr ret(version)
+	} else {
+		set ret(version) 1
+	}
+
+	::asn::asnGetBigInteger cert ret(serial_number)
+	::asn::asnGetSequence cert data_signature_algo_seq
+		::asn::asnGetObjectIdentifier data_signature_algo_seq ret(data_signature_algo)
+	::asn::asnGetSequence cert issuer
+	::asn::asnGetSequence cert validity
+		::asn::asnPeekByte validity peek_tag
+	if {$peek_tag == 0x18} {
+		::asn::asnGetGeneralizedTime validity ret(notBefore)
+		set ret(notBefore) [::pki::x509::_generalizedtime_to_native $ret(notBefore)]
+	} else {
+		# 0x17
+		::asn::asnGetUTCTime validity ret(notBefore)
+		set ret(notBefore) [::pki::x509::_utctime_to_native $ret(notBefore)]
+	}
+	if {$peek_tag == 0x18} {
+		::asn::asnGetGeneralizedTime validity ret(notAfter)
+		set ret(notAfter) [::pki::x509::_generalizedtime_to_native $ret(notAfter)]
+	} else {
+		# 0x17
+		::asn::asnGetUTCTime validity ret(notAfter)
+		set ret(notAfter) [::pki::x509::_utctime_to_native $ret(notAfter)]
+	}
+	::asn::asnGetSequence cert subject
+	::asn::asnGetSequence cert pubkeyinfo
+		::asn::asnGetSequence pubkeyinfo pubkey_algoid
+			::asn::asnGetObjectIdentifier pubkey_algoid ret(pubkey_algo)
+		::asn::asnGetBitString pubkeyinfo pubkey
+
+	set extensions_list [list]
+	# TODO - this loop seems incorrect to me. The order should be fixed and
+	# out-of-order should be an error. Moreover, duplicates should not be allowed.
+	while {$cert ne {}} {
+		::asn::asnPeekByte cert peek_tag
+
+		switch -- [format 0x%02x $peek_tag] {
+			0xa1 {
+				# TODO - where is this returned?
+				::asn::asnGetContext cert - issuerUniqID
+			}
+			0xa2 {
+				# TODO - where is this returned?
+				::asn::asnGetContext cert - subjectUniqID
+			}
+			0xa3 {
+				::asn::asnGetContext cert - extensions_ctx
+				::asn::asnGetSequence extensions_ctx extensions
+				_parse_extensions $extensions extensions_list
+			}
+		}
+	}
+	# TODO - are duplicated extensions allowed? See RFC 5280 - section 4.2.
+	set ret(extensions) $extensions_list
+
+	::asn::asnGetSequence wholething signature_algo_seq
+	::asn::asnGetObjectIdentifier signature_algo_seq ret(signature_algo)
+	::asn::asnGetBitString wholething ret(signature)
+
+	# Convert values from ASN.1 decoder to usable values if needed
+	set ret(serial_number) [::math::bignum::tostr $ret(serial_number)]
+	set ret(data_signature_algo) [::pki::_oid_number_to_name $ret(data_signature_algo)]
+	set ret(signature_algo) [::pki::_oid_number_to_name $ret(signature_algo)]
+	set ret(pubkey_algo) [::pki::_oid_number_to_name $ret(pubkey_algo)]
+	set ret(issuer) [_dn_to_string $issuer]
+	set ret(subject) [_dn_to_string $subject]
+	set ret(signature) [binary format B* $ret(signature)]
+	binary scan $ret(signature) H* ret(signature)
+
+	# Handle RSA public keys by extracting N and E
+	switch -- $ret(pubkey_algo) {
+		rsaEncryption {
+			set pubkey [binary format B* $pubkey]
+			binary scan $pubkey H* ret(pubkey)
+
+			::asn::asnGetSequence pubkey pubkey_parts
+			::asn::asnGetBigInteger pubkey_parts ret(n)
+			::asn::asnGetBigInteger pubkey_parts ret(e)
+
+			set ret(n) [::math::bignum::tostr $ret(n)]
+			set ret(e) [::math::bignum::tostr $ret(e)]
+			set ret(l) [expr {int([::pki::_bits $ret(n)] / 8.0000 + 0.5) * 8}]
+			set ret(type) rsa
+		}
+	}
+
+	return [array get ret]
+}
+
+
+# Verify whether a cert is valid, regardless of trust
+proc ::pki::x509::validate_cert {cert args} {
+	set {ignore time} 0
+	# Verify arguments and load options
+	for {set idx 0} {$idx < [llength $args]} {incr idx} {
+		set arg [lindex $args $idx]
+
+		switch -- $arg {
+			-ignoretime {
+				set {ignore time} true
+			}
+			-sign_message {
+				incr idx
+				set dn [lindex $args $idx]
+				set cn [_dn_to_cn $dn]
+
+				set opts(sign_message) $cn
+			}
+			-encrypt_message {
+				incr idx
+				set dn [lindex $args $idx]
+				set cn [_dn_to_cn $dn]
+
+				set opts(encrypt_message) $cn
+			}
+			-sign_cert {
+				incr idx
+				set dn [lindex $args $idx]
+				if {$dn eq {ALL} || $dn eq {ANY}} {
+					set cn $dn
+				} else {
+					set cn [_dn_to_cn $dn]
+				}
+
+				incr idx
+				set currdepth [lindex $args $idx]
+
+				set opts(sign_cert) [list $cn $currdepth]
+			}
+			-ssl {
+				incr idx
+				set dn [lindex $args $idx]
+				set cn [_dn_to_cn $dn]
+
+				set opts(ssl) $cn
+			}
+			default {
+				return -code error {wrong # args: should be \
+					"validate_cert cert ?-sign_message dn_of_signer?\
+						?-encrypt_message dn_of_signer? ?-sign_cert\
+						[dn_to_be_signed | ANY | ALL] ca_depth? ?-ssl dn?"}
+			}
+		}
+	}
+
+	# Load cert
+	array set cert_arr $cert
+	# Validate certificate
+
+	if {!${ignore time}} {
+		## Validate times
+		if {![info exists cert_arr(notBefore)]
+			|| ![info exists cert_arr(notAfter)]
+		} {
+			return false
+		}
+
+		set currtime [clock seconds]
+		if {$currtime < $cert_arr(notBefore) || $currtime > $cert_arr(notAfter)} {
+			return false
+		}
+	}
+
+    # Check for extensions and process them. However v1 certs have no extensions
+	if {$cert_arr(version) == 0} {
+		# Do not permit V1 certificates for signing.
+		set CA 0
+	} else {
+		## Critical extensions must be understood, non-critical extensions may be ignored if not understood
+		set CA 0
+		set CAdepth -1
+		foreach {ext_id ext_val} $cert_arr(extensions) {
+			set critical [lindex $ext_val 0]
+
+			switch -- $ext_id {
+				basicConstraints {
+					set CA [lindex $ext_val 1 0]
+					set CAdepth [lindex $ext_val 1 1]
+				}
+				default {
+					### If this extensions is critical and not understood, we must reject it
+					if {$critical} {
+						return false
+					}
+				}
+			}
+		}
+	}
+
+	if {[info exists opts(sign_cert)]} {
+		if {!$CA} {
+			return false
+		}
+
+		if {$CAdepth >= 0} {
+			set sign_depth [lindex $opts(sign_cert) 1]
+			if {$sign_depth > $CAdepth} {
+				return false
+			}
+		}
+	}
+
+	return true
+}
+
+
+proc ::pki::x509::verify_cert {cert trustedcerts args} {
+	if {[llength $args] % 2 == 1} {
+		set args [lassign $args[set args {}] intermediatecerts]
+	} else {
+		set intermediatecerts {}
+	}
+
+	set {validate args} {}
+
+	foreach {key val} $args[set args {}] {
+		switch $key {
+			{validate args} {
+				set {validate args} $val
+			}
+			default {
+				return -code error [list {unknown agument} $key]
+			}
+			
+		}
+	}
+
+	# Validate cert
+	if {![eval validate_cert [list $cert] ${validate args}]} {
+		return false;
+	}
+
+	# Load trusted certs
+	foreach trustedcert_list $trustedcerts {
+		if {![validate_cert $trustedcert_list -sign_cert ANY -1]} {
+			continue
+		}
+
+		unset -nocomplain trustedcert
+		array set trustedcert $trustedcert_list
+
+		set subject $trustedcert(subject)
+
+		set trustedcertinfo($subject) $trustedcert_list
+	}
+
+	# Load intermediate certs
+	foreach intermediatecert_list $intermediatecerts {
+		if {![validate_cert $intermediatecert_list -sign_cert ANY -1]} {
+			continue
+		}
+
+		unset -nocomplain intermediatecert
+		array set intermediatecert $intermediatecert_list
+
+		set subject $intermediatecert(subject)
+
+		set intermediatecertinfo($subject) $intermediatecert_list
+	}
+
+	# Load cert
+	array set cert_arr $cert
+
+	# Verify certificate
+	## Encode certificate to hash later
+	set message [binary format H* $cert_arr(cert)]
+
+	## Find CA to verify against
+	if {![info exists trustedcertinfo($cert_arr(issuer))]} {
+		## XXX: Try to find an intermediate path
+
+		## XXX: Verify each cert in the intermediate path, returning in
+		##      failure if a link in the chain breaks
+
+		## Otherwise, return in failure
+		return false
+	}
+
+	set cacert $trustedcertinfo($cert_arr(issuer))
+	array set cacert_arr $cacert
+
+	## Set signature to binary form
+	set signature [::pki::_dec_to_ascii 0x$cert_arr(signature) $cacert_arr(l)]
+
+	## Verify
+	set ret [::pki::verify $signature $message $cacert]
+
+	return $ret
+}
+
+
+# Generate a PKCS#10 Certificate Signing Request
+proc ::pki::pkcs::create_csr {keylist namelist {encodePem 0} {algo sha1}} {
+	array set key $keylist
+
+	set name [::pki::x509::_list_to_dn $namelist]
+
+	set type $key(type)
+
+	switch -- $type {
+		rsa {
+			set pubkey [::asn::asnSequence [
+				::asn::asnBigInteger [
+					::math::bignum::fromstr $key(n)
+				]
+			] [
+				::asn::asnBigInteger [::math::bignum::fromstr $key(e)]
+			]]
+			set pubkey_algo_params [::asn::asnNull]
+		}
+	}
+	binary scan $pubkey B* pubkey_bitstring
+
+	set cert_req_info [::asn::asnSequence [
+		::asn::asnInteger 0] [
+			::asn::asnSequence $name
+		] [
+			::asn::asnSequence [
+				::asn::asnSequence [
+					::asn::asnObjectIdentifier [
+						::pki::_oid_name_to_number ${type}Encryption]
+				] $pubkey_algo_params 
+			] [
+				::asn::asnBitString $pubkey_bitstring
+			]] [
+			::asn::asnContextConstr 0 {} 
+		]
+	]
+
+	set signature [::pki::sign $cert_req_info $keylist $algo]
+	binary scan $signature B* signature_bitstring
+	
+	set cert_req [::asn::asnSequence $cert_req_info [
+		::asn::asnSequence [
+			::asn::asnObjectIdentifier [
+				::pki::_oid_name_to_number ${algo}With${type}Encryption
+			]
+		] [::asn::asnNull]
+	] [
+		::asn::asnBitString $signature_bitstring
+	]]
+
+	if {$encodePem} {
+		set cert_req [::pki::_encode_pem $cert_req \
+			{-----BEGIN CERTIFICATE REQUEST-----} {-----END CERTIFICATE REQUEST-----}]
+	}
+
+	return $cert_req
+}
+
+
+# Parse a PKCS#10 CSR
+proc ::pki::pkcs::parse_csr csr {
+	# RFC 2986
+	# CertificationRequestInfo ::= SEQUENCE {
+    #     version       INTEGER { v1(0) } (v1,...),
+    #     subject       Name,
+    #     subjectPKInfo SubjectPublicKeyInfo{{ PKInfoAlgorithms }},
+    #     attributes    [0] Attributes{{ CRIAttributes }}
+	# }
+	# Attributes { ATTRIBUTE:IOSet } ::= SET OF Attribute{{ IOSet }}
+	array set ret [list]
+
+	array set parsed_csr [::pki::_parse_pem $csr \
+		{-----BEGIN CERTIFICATE REQUEST-----} {-----END CERTIFICATE REQUEST-----}]
+	set csr $parsed_csr(data)
+
+	::asn::asnGetSequence csr cert_req_seq
+		::asn::asnGetSequence cert_req_seq cert_req_info
+
+	set cert_req_info_saved [::asn::asnSequence $cert_req_info]
+			::asn::asnGetInteger cert_req_info version
+			::asn::asnGetSequence cert_req_info name
+			::asn::asnGetSequence cert_req_info pubkeyinfo
+				::asn::asnGetSequence pubkeyinfo pubkey_algoid
+					::asn::asnGetObjectIdentifier pubkey_algoid pubkey_type
+					::asn::asnGetBitString pubkeyinfo pubkey
+		::asn::asnGetSequence cert_req_seq signature_algo_seq
+			::asn::asnGetObjectIdentifier signature_algo_seq signature_algo
+		::asn::asnGetBitString cert_req_seq signature_bitstring
+
+	# At this point cert_req_info contains attributes if any
+	while {$cert_req_info ne {}} {
+		::asn::asnGetByte cert_req_info tag
+		::asn::asnGetLength cert_req_info len
+		::asn::asnGetBytes cert_req_info $len attrs_bytes
+		if {$tag == 0xa0} {
+			# attr_bytes contains set of attributes without the set header
+			# Each attribute is a sequence of 2 elems - OID and a SET of values
+			while {$attrs_bytes ne {}} {
+				::asn::asnGetSequence attrs_bytes attr_seq
+				::asn::asnGetObjectIdentifier attr_seq attr_oid
+				::asn::asnGetSet attr_seq attr_value_set
+				set attr_oid [::pki::_oid_number_to_name $attr_oid]
+				if {$attr_oid eq "extensionRequest"} {
+					::asn::asnGetSequence attr_value_set ext_req_seq
+					set ext_list {}
+					::pki::x509::_parse_extensions $ext_req_seq ext_list
+				} else {
+					# TODO - what else can be here. Should we add it in hex?
+				}
+			}
+		} else {
+			# TODO - nothing else defined in RFC2986. Skipping but should
+			# we return the tag and attr_bytes in hex?
+		}
+	}
+
+	if {[info exists ext_list]} {
+		set ret(extensionRequest) $ext_list
+	}
+
+	# Convert parsed fields to native types
+	set signature [binary format B* $signature_bitstring]
+	set ret(subject) [::pki::x509::_dn_to_string $name]
+
+	## Convert Pubkey type to string
+	set pubkey_type [::pki::_oid_number_to_name $pubkey_type]
+
+	# Parse public key, based on type
+	switch -- $pubkey_type {
+		rsaEncryption {
+			set pubkey [binary format B* $pubkey]
+
+			::asn::asnGetSequence pubkey pubkey_parts
+			::asn::asnGetBigInteger pubkey_parts key(n)
+			::asn::asnGetBigInteger pubkey_parts key(e)
+
+			set key(n) [::math::bignum::tostr $key(n)]
+			set key(e) [::math::bignum::tostr $key(e)]
+			set key(l) [expr {2 ** int(ceil(log([::pki::_bits $key(n)])/log(2)))}]
+			set key(type) rsa
+		}
+		default {
+			return -code error "Unsupported key type: $pubkey_type"
+		}
+	}
+
+	# Convert key to RSA parts
+	set keylist [array get key]
+
+	# Validate CSR requestor has access to the private key
+	set csrValid [::pki::verify $signature $cert_req_info_saved $keylist]
+	if {!$csrValid} {
+		return -code error {CSR Signature check failed}
+	}
+
+	array set ret $keylist
+
+	return [array get ret]
+}
+
+
+proc ::pki::x509::create_cert {
+	signreqlist cakeylist serial_number notBefore notAfter isCA extensions
+	{encodePem 0} {algo sha1}
+} {
+	# Parse parameters
+	array set cakey $cakeylist
+	array set signreq $signreqlist
+
+	set type $signreq(type)
+
+	# Process extensions
+	set extensions_list $extensions
+	unset extensions
+	array set extensions $extensions_list
+
+	# If we are generating a CA cert, add a CA extension
+	if {$isCA} {
+		set extensions(basicConstraints) [list true true -1]
+	}
+
+	# Determine what version we need to use (default to 1)
+	if {[array get extensions] eq {}} {
+		set version 1
+	} else {
+		set version 3
+	}
+
+	set certlist [list]
+
+	# Create certificate to be signed
+	## Insert version number (if not version 1)
+	if {$version != 1} {
+		lappend certlist [::asn::asnContextConstr 0 [
+			::asn::asnInteger [expr {$version - 1}]]]
+	}
+
+	## Insert serial number
+	lappend certlist [::asn::asnBigInteger [math::bignum::fromstr $serial_number]]
+
+	## Insert data algorithm
+	switch -glob -- $algo {
+		*With*Encryption {
+			# Already fully qualified, add nothing
+			regexp {^.*With(.*)Encryption$} $algo -> type
+			regexp {^(.*)With(.*)Encryption$} $algo -> hashingAlgorithm type
+
+			set hashingAlgorithm [string tolower $hashingAlgorithm]
+			set type [string tolower $type]
+		}
+		default {
+			set hashingAlgorithm $algo
+
+			set algo ${algo}With${type}Encryption
+		}
+	}
+
+	lappend certlist [::asn::asnSequence [
+		::asn::asnObjectIdentifier [::pki::_oid_name_to_number $algo]] [
+			::asn::asnNull
+		]
+	]
+
+	## Insert issuer
+	lappend certlist [::asn::asnSequence [::pki::x509::_string_to_dn $cakey(subject)]]
+
+	## Insert validity requirements
+	lappend certlist [::asn::asnSequence [
+		::asn::asnUTCTime [
+			::pki::x509::_native_to_utctime $notBefore]
+		] [
+			::asn::asnUTCTime [::pki::x509::_native_to_utctime $notAfter
+		]]
+	]
+
+	## Insert subject
+	lappend certlist [::asn::asnSequence [::pki::x509::_string_to_dn $signreq(subject)]]
+
+	## Insert public key information
+	switch -- $type {
+		rsa {
+			set pubkey [::asn::asnSequence [
+				::asn::asnBigInteger [
+					::math::bignum::fromstr $signreq(n)]
+			] [
+				::asn::asnBigInteger [::math::bignum::fromstr $signreq(e)]
+			]]
+
+			set pubkey_algo_params [::asn::asnNull]
+		}
+	}
+	binary scan $pubkey B* pubkey_bitstring
+
+	lappend certlist [::asn::asnSequence [
+		::asn::asnSequence [
+			::asn::asnObjectIdentifier [
+				::pki::_oid_name_to_number ${type}Encryption
+			]
+		] $pubkey_algo_params ] [
+			::asn::asnBitString $pubkey_bitstring
+		]
+	]
+
+	## Insert extensions
+	if {[array get extensions] ne {}} {
+		set extensionslist [list]
+
+		foreach {extension extvalue} [array get extensions] {
+			set critical 0
+
+			switch -- $extension {
+				id-ce-basicConstraints -
+				basicConstraints {
+					set critical [lindex $extvalue 0]
+					set allowCA [lindex $extvalue 1]
+					set caDepth [lindex $extvalue 2]
+
+					if {$caDepth < 0} {
+						set extvalue [::asn::asnSequence [::asn::asnBoolean $allowCA]]
+					} else {
+						set extvalue [::asn::asnSequence [
+							::asn::asnBoolean $allowCA
+						] [
+							::asn::asnInteger $caDepth
+						]]
+					}
+				}
+
+				id-ce-subjectAltName -
+				subjectAltName {
+					set critical [lindex $extvalue 0]
+	
+					unset -nocomplain altnames
+
+					foreach {altnametype altnamevalue} [lrange $extvalue 1 end] {
+						switch -- [string tolower $altnametype] {
+							rfc822Name -
+							rfc822name {
+								lappend altnames [::asn::asnChoice 1 $altnamevalue]
+							}
+							dNSName -
+							dnsname {
+								lappend altnames [::asn::asnChoice 2 $altnamevalue]
+							}
+							default {
+								# TODO - add other alternate name types
+								return -code error "Unknown subjectAltName type: $altnametype"
+							}
+						}
+					}
+
+					set extvalue [::asn::asnSequence {*}$altnames]
+				}
+
+				id-ce-cRLDistributionPoints -
+				cRLDistributionPoints {
+					set critical [lindex $extvalue 0]
+
+					set crlDistributionPoint_objects [list distributionPoint reasons cRLIssuer]
+					set crlDistributionPointsASN [list]
+
+					foreach crlDistributionPoint_dict [lrange $extvalue 1 end] {
+						set crlDistributionPoint_objectASN [list]
+						set crlSequenceIdx -1
+
+						foreach crlDistributionPoint_objectName $crlDistributionPoint_objects {
+							unset -nocomplain crlDistributionPointASN
+							incr crlSequenceIdx
+
+							if {![dict exists $crlDistributionPoint_dict $crlDistributionPoint_objectName]} {
+								continue
+							}
+
+							set crlDistributionPoint_object [dict get $crlDistributionPoint_dict $crlDistributionPoint_objectName]
+
+							switch -- $crlDistributionPoint_objectName {
+								distributionPoint {
+									foreach {crlDistributionPointNameType crlDistributionPointName_dict} $crlDistributionPoint_object {
+										switch -- $crlDistributionPointNameType {
+											name {
+												unset -nocomplain crlDistributionPointName
+												array set crlDistributionPointName $crlDistributionPointName_dict
+
+												switch -- $crlDistributionPointName(type) {
+													url {
+														set crlDistributionPointNameASN [::asn::asnChoice 6 $crlDistributionPointName(value)]
+													}
+													default {
+														return -code error "Unsupported crlDistributionPointName choice: $crlDistributionPointName(type)"
+													}
+												}
+												set crlDistributionPointASN [::asn::asnContextConstr 0 $crlDistributionPointNameASN]
+											}
+											default {
+												return -code error "Unsupported crlDistributionPointNameType: $crlDistributionPointNameType"
+											}
+										}
+									}
+								}
+								default {
+									return -code error "Unsupported crlDistributionPoint option: $crlDistributionPoint_objectName"
+								}
+							}
+
+							lappend crlDistributionPoint_objectASN [::asn::asnContextConstr $crlSequenceIdx $crlDistributionPointASN]
+						}
+						lappend crlDistributionPointsASN [::asn::asnSequenceFromList $crlDistributionPoint_objectASN]
+					}
+
+					set extvalue [::asn::asnSequenceFromList $crlDistributionPointsASN]
+				}
+
+				id-ce-keyUsage -
+				keyUsage {
+					set critical [lindex $extvalue 0]
+					set extvalue [string tolower [lrange $extvalue 1 end]]
+
+					set keyUsages [string tolower [list digitalSignature nonRepudiation keyEncipherment dataEncipherment keyAgreement keyCertSign cRLSign encipherOnly decipherOnly]]
+
+					foreach keyUsage $extvalue {
+						if {$keyUsage ni $keyUsages} {
+							return -code error "Invalid key usage: $keyUsage"
+						}
+					}
+
+					set keyUsageValue {}
+					foreach keyUsage $keyUsages {
+						if {$keyUsage in $extvalue} {
+							set keyUsageResult 1
+						} else {
+							set keyUsageResult 0
+						}
+						append keyUsageValue $keyUsageResult
+					}
+
+					set extvalue [::asn::asnBitString $keyUsageValue]
+				}
+
+				default {
+					return -code error "Unknown extension: $extension"
+				}
+			}
+
+			lappend extensionslist [::asn::asnSequence [
+				::asn::asnObjectIdentifier [
+					::pki::_oid_name_to_number $extension]
+				] [
+					::asn::asnBoolean $critical] [
+						::asn::asnOctetString $extvalue
+				]
+			]
+		}
+
+		lappend certlist [::asn::asnContextConstr 3 [
+			::asn::asnSequenceFromList $extensionslist]]
+	}
+
+	## Enclose certificate data in an ASN.1 sequence
+	set cert [::asn::asnSequenceFromList $certlist]
+
+	# Sign certificate request using CA
+	set signature [::pki::sign $cert $cakeylist $hashingAlgorithm]
+	binary scan $signature B* signature_bitstring
+
+	set cert [::asn::asnSequence $cert [
+		::asn::asnSequence [
+			::asn::asnObjectIdentifier [
+				::pki::_oid_name_to_number $algo]
+			] [
+				::asn::asnNull
+			]
+		] [
+			::asn::asnBitString $signature_bitstring
+		]
+	]
+
+	if {$encodePem} {
+		set cert [::pki::_encode_pem $cert \
+			{-----BEGIN CERTIFICATE-----} {-----END CERTIFICATE-----}]
+	}
+
+	return $cert
+}
+
+
+proc ::pki::_bits num {
+	if {$num == 0} {
+		return 0
+	}
+
+	set num [format %llx $num]
+	set numlen [string length $num]
+	set numprecise 2
+
+	if {$numlen > $numprecise} {
+		set basebits [expr {($numlen - $numprecise) * 4}]
+	} else {
+		set basebits 0
+	}
+
+	set highbits 0x[string range $num 0 [expr {$numprecise - 1}]]
+	set ret [expr {$basebits + log($highbits) / 0.69314718055994530941723}]
+	set ret [expr {floor($ret) + 1}]
+	set ret [lindex [split $ret .] 0]
+	return $ret
+}
+
+proc ::pki::_random args {
+	if {[lindex $args 0] eq {-binary}} {
+		set outputmode binary
+	} else {
+		set outputmode numeric
+	}
+
+	if {![info exists ::pki::_random_dev]} {
+		foreach trydev [list /dev/urandom /dev/random __RAND__] {
+			if {$trydev ne {__RAND__}} {
+				if {[catch {
+					set fd [open $trydev [list RDONLY BINARY]]
+					close $fd
+					unset fd
+				}]} {
+					continue
+				}
+			}
+
+			set ::pki::_random_dev $trydev
+
+			break
+		}
+	}
+
+	set dev $::pki::_random_dev
+
+	switch -- $dev {
+		__RAND__ {
+			set ret [expr {int(rand() * 2147483647)}]
+		}
+		default {
+			set fd [open $dev [list RDONLY BINARY]]
+			set data [read $fd 8]
+			close $fd
+
+			binary scan $data H* ret
+			set ret [expr 0x$ret]
+		}
+	}
+
+	switch -- $outputmode {
+		numeric {
+			# Do nothing, results are already numeric
+		}
+		binary {
+			set ret [binary format H* [format %02llx $ret]]
+		}
+	}
+
+	return $ret
+}
+
+
+proc ::pki::_isprime n {
+	set k 10
+
+	if {$n <= 3} {
+		return true
+	}
+
+	if {$n % 2 == 0} {
+		return false
+	}
+	
+	# write n - 1 as 2^s·d with d odd by factoring powers of 2 from n \u2212 1
+	set d [expr {$n - 1}]
+	set s 0
+	while {$d % 2 == 0} {
+		set d [expr {$d / 2}]
+		incr s
+	}
+	
+	while {$k > 0} {
+		incr k -1
+		set rand_1 [expr {int(rand() * $::pki::INT_MAX)}]
+		set rand_2 [expr {int(rand() * $::pki::INT_MAX)}]
+		if {$rand_1 < $rand_2} {
+			set rand_num $rand_1
+			set rand_den $rand_2
+		} else {
+			set rand_num $rand_2
+			set rand_den $rand_1
+		}
+
+		set a [expr {2 + (($n - 4) * $rand_num / $rand_den)}]
+
+		set x [_powm $a $d $n]
+		if {$x == 1 || $x == $n - 1} {
+			continue
+		}
+
+		for {set r 1} {$r < $s} {incr r} {
+			set x [_powm $x 2 $n]
+			if {$x == 1} {
+				return false
+			}
+			if {$x == $n - 1} {
+				break
+			}
+		}
+
+		if {$x != $n - 1} {
+			return false
+		}
+	}
+
+	return true
+}
+
+
+proc ::pki::rsa::_generate_private {p q e bitlength} {
+	set totient [expr {($p - 1) * ($q - 1)}]
+
+	for {set di 1} {$di < $e} {incr di} {
+		set dchk [expr {($totient * $di + 1) / $e}]
+		set chkval [expr {$dchk * $e - 1}]
+
+		set rem [expr {$chkval % $totient}]
+		if {$rem == 0} {
+			break
+		}
+	}
+
+	# puts "bd=[_bits $dchk], di = $di"
+	for {} 1 {incr di $e} {
+		set dchk [expr {($totient * $di + 1) / $e}]
+		set chkval [expr {$dchk * $e - 1}]
+
+		set rem [expr {$chkval % $totient}]
+		if {$rem == 0} {
+			if {[::pki::_bits $dchk] > $bitlength} {
+				if {![info exists d]} {
+					set d $dchk
+				}
+
+				break
+			}
+
+			set d $dchk
+		}
+
+	}
+
+	return $d
+}
+
+
+proc ::pki::rsa::generate {bitlength {exponent 0x10001}} {
+	set e $exponent
+
+	# Step 1. Pick 2 numbers that when multiplied together will give a number with the appropriate length
+	set componentbitlen [expr {$bitlength / 2}]
+	set bitmask [expr {(1 << $componentbitlen) - 1}]
+
+	set p 0
+	set q 0
+	while 1 {
+		set plen [::pki::_bits $p]
+		set qlen [::pki::_bits $q]
+
+		if {$plen >= $componentbitlen} {
+			set p [expr {$p & $bitmask}]
+
+			set plen [::pki::_bits $p]
+		}
+
+		if {$qlen >= $componentbitlen} {
+			set q [expr {$q & $bitmask}]
+
+			set qlen [::pki::_bits $q]
+		}
+
+		if {$plen >= $componentbitlen && $qlen >= $componentbitlen} {
+			set n [expr {$p * $q}]
+			set nlen [::pki::_bits $n]
+
+			unset n
+
+			if {$nlen == $bitlength} {
+				unset nlen
+
+				break
+                        }
+		}
+
+		set x [::pki::_random]
+		set y [::pki::_random]
+
+		set xlen [expr {[::pki::_bits $x] / 2}]
+		set ylen [expr {[::pki::_bits $y] / 2}]
+
+		set xmask [expr {(1 << $xlen) - 1}]
+		set ymask [expr {(1 << $ylen) - 1}]
+
+		set p [expr {($p << $xlen) + ($x & $xmask)}]
+		set q [expr {($q << $ylen) + ($y & $ymask)}]
+	}
+
+
+	# Step 2. Verify that "p" and "q" are useful
+	## Step 2.a. Verify that they are not too close
+	### Where "too close" is defined as 2*n^(1/4)
+	set quadroot_of_n [expr {isqrt(isqrt($p * $q))}]
+	set min_distance [expr {2 * $quadroot_of_n}]
+	set distance [expr {abs($p - $q)}]
+
+	if {$distance < $min_distance} {
+		#### Try again.
+
+		return [::pki::rsa::generate $bitlength $exponent]
+	}
+
+	# Step 3. Convert the numbers into prime numbers
+	if {$p % 2 == 0} {
+		incr p -1
+	}
+	while {![::pki::_isprime $p]} {
+		incr p -2
+	}
+
+	if {$q % 2 == 0} {
+		incr q -1
+	}
+	while {![::pki::_isprime $q]} {
+		incr q -2
+	}
+
+	# Step 4. Compute N by multiplying P and Q
+	set n [expr {$p * $q}]
+	set retkey(n) $n
+
+	# Step 5. Compute D ...
+	## Step 5.a. Generate D
+	set d [::pki::rsa::_generate_private $p $q $e $bitlength]
+	set retkey(d) $d
+
+	## Step 5.b. Verify D is large enough
+	### Verify that D is greater than (1/3)*n^(1/4) 
+	set quadroot_of_n [expr {isqrt(isqrt($n))}]
+	set min_d [expr {$quadroot_of_n / 3}]
+	if {$d < $min_d} {
+		#### Try again.
+
+		return [::pki::rsa::generate $bitlength $exponent]
+	}
+
+	# Step 6. Encode key information
+	set retkey(type) rsa
+	set retkey(e) $e
+	set retkey(l) $bitlength
+
+	# Step 7. Record additional information that will be needed to write out a PKCS#1 compliant key
+	set retkey(p) $p
+	set retkey(q) $q
+
+	return [array get retkey]
+}
+
+## Fill in missing ASN.1 routines
+
+if {1 || [info commands ::asn::asnGetT61String] eq ""} {
+	namespace eval ::asn {}
+	proc asn::asnGetT61String {data_var print_var} {
+		# This is NOT a fully conforming T.61 decoder. See caveats below.
+		# The result may be used for display purposes etc. but not for validation.
+		# RFC 5280 bans the use for the latter purpose anyways.
+		upvar 1 $data_var data $print_var print
+		asnGetByte data tag
+		if {$tag != 0x14} {
+			return -code error \
+				[format "Expected T.61 String (0x14), but got %02x" $tag]  
+		}
+		asnGetLength data length
+		asnGetBytes data $length t61
+		#
+		# Conversion : https://www.compart.com/en/unicode/charsets/T.61-8bit
+		# - All characters in ascii range 0-0x7f are passed through. T.61 does
+		# not use/define all control characters and even some printables like {, }
+		# but we pass them through anyways.
+		# - Certain 8-bit character within a certain range map to Unicode
+		# equivalents but with a few gaps and exceptions
+		# - T.61 encodes diacritics as the diacritic followed by the base
+		# character. These are encoded as the *decomposed* Unicode character
+		# consisting of the base character followed by the diacritic
+		# (i.e reversed order from T.61). Encoding as precomposed would need
+		# to be table-driven. As an aside, I do not think the Tcl encoding system
+		# can deal with the reordering required.
+		# - Everything else result in an error because interpretation of
+		# remaining bytes is not implemented.
+		binary scan $t61 cu* t61_bytes
+		set string ""
+		for {set n [llength $t61_bytes]; set i 0} {$i < $n} {incr i} {
+			set ord [lindex $t61_bytes $i]
+			if {$ord < 0x80} {
+				# 0-0x7f Primary control and graphic characters (basically
+				# ascii) but with some unused passed through
+				append string [format %c $ord]
+			} elseif {$ord < 0xa0} {
+				# 0x80-0x9f - supplementary control. Could map directly to Unicode
+				# except CSI (0x9b) which is a variable length control sequence
+				# that we do not want to parse.
+				if {$ord == 0x9b} {
+					error "T.61 control character ([format 0x%02x]) encountered."
+				}
+				append string [format %c $ord]
+			} elseif {$ord < 0xc1} {
+				# 0xa1-0xbf - Supplementary graphics characters or unused. Map
+				# directly to Unicode with some exceptions.
+				if {$ord == 0xa4} {
+					append string \$
+				} elseif {$od == 0xa6} {
+					append string #
+				} elseif {$od == 0xa8} {
+					append string \u00a4
+				} elseif {$od == 0xb4} {
+					append string \u00d7
+				} elseif {$od == 0xb8} {
+					append string \u00f7
+				} else {
+					append string [format %c $ord]
+				}
+			} elseif {$ord < 0xd0} {
+				# 0xc1-0xcf - diacritic leaders.
+				set diacritic [dict get {
+					c1 \u0300 c2 \u0301 c3 \u0302 c4 \u0303 c5 \u0304 c6 \u0306
+					c7 \u0307 c8 \u0308 c9 \u0308 ca \u030a cb \u0327 cc \u0332
+					cd \u030b ce \u0328 cf \u030c
+				} [format %02x $ord]]
+
+				# In unicode form, the diacritic
+				# follows the base character. So we need to fetch the next T.61
+				# character.
+				incr i
+				if {$i >= $n} {
+					error "Composing diacritic ([format %02x $ord]) not followed by a character."
+				}
+				set ord [lindex $t61_bytes $i]
+				# TODO - do we need to check that the following character is valid?
+				# If so, how?
+				# TODO - Normalise diacritic and base into a single composed character
+				append string [format %c $ord] $diacritic
+			} elseif {$ord < 0xe0} {
+				# Undefined. Replace with ?. Should we generate an error?
+				append string ?
+			} else {
+				# Final set of supplementary graphics 
+				# TODO - e5 and ff are undefined. We replace with ?. Should we
+				# generate an error?
+				append string [dict get {
+					e0 \u2126 e1 \u00c6 e2 \u00d0 e3 \u00aa e4 \u0126 e5 ?
+					e6 \u0132 e7 \u013f e8 \u0141 e9 \u00d8 ea \u0152 eb \u00ba
+					ec \u00de ed \u0166 ee \u014a ef \u0149 f0 \u0138 f1 \u00e6
+					f2 \u0111 f3 \u00f0 f4 \u0127 f5 \u0131 f6 \u0133 f7 \u0140
+					f8 \u0142 f9 \u00f8 fa \u0153 fb \u00df fc \u00fe fd \u0167
+					fe \u014b ff ?
+				} [format %02x $ord]]
+			}
+		}
+
+		# Now that we completed without errors, we can set the output variable
+		set print $string
+		return
+	}
+}
+
+
+
+if {[info commands ::asn::asnGetGeneralizedTime] eq ""} {
+	namespace eval ::asn {}
+	# TODO - asnGeneralizedTime
+	proc asn::asnGetGeneralizedTime {data_var utc_var} {
+		upvar 1 $data_var data $utc_var utc
+
+		asnGetByte data tag
+		if {$tag != 0x18} {
+			return -code error \
+				[format "Expected GeneralizedTime (0x18), but got %02x" $tag]
+		}
+
+		asnGetLength data length
+		asnGetBytes data $length bytes
+
+		# this should be ascii, make it explicit
+		# TODO: support fractional seconds though not required for X.509
+		set bytes [encoding convertfrom ascii $bytes]
+		binary scan $bytes a* utc
+
+		return
+	}
+}
+
+if {[info commands ::asn::asnGeneralizedTime] eq ""} {
+	namespace eval ::asn {}
+	proc asn::asnGeneralizedTime {UTCtimestring} {
+		# the generalized time tag is 0x18.
+		# 
+		# TODO: check the string for well formedness
+		# TODO: accept clock seconds as well as an integer
+		# TODO: support fractional seconds though not required for X.509
+		# which does not permit them.
+
+		set ascii [encoding convertto ascii $UTCtimestring]
+		set len [string length $ascii]
+		return [binary format H2a*a* 18 [asnLength $len] $ascii]
+	}
+}
+
+if {[info commands ::asn::asnGetVisibleString] eq ""} {
+	namespace eval ::asn {}
+	proc asn::asnGetVisibleString {data_var string_var} {
+		upvar 1 $data_var data $string_var str
+		asnGetByte data tag
+		if {$tag != 0x1a} {
+			return -code error \
+				[format "Expected VisisbleString (0x1a), but got %02x" $tag]  
+		}
+		asnGetLength data length
+		asnGetBytes data $length bytes
+		set str [encoding convertfrom ascii $bytes]
+		# TODO: Supposed to be printable ascii only. Should we check and error out?
+		return
+	}
+}
+
+## Initialize parsing routines, which may load additional packages (base64)
+::pki::_parse_init
+
+# # ## ### ##### ######## #############
+## Ready
+
+package provide pki 0.20
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pluginmgr/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pluginmgr/pkgIndex.tcl
new file mode 100644
index 00000000..6a25058b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pluginmgr/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded pluginmgr 0.3 [list source [file join $dir pluginmgr.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pluginmgr/pluginmgr.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pluginmgr/pluginmgr.tcl
new file mode 100644
index 00000000..0490a6ec
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pluginmgr/pluginmgr.tcl
@@ -0,0 +1,421 @@
+# plugin.tcl --
+#
+#	Generic plugin management.
+#
+# Copyright (c) 2005 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pluginmgr.tcl,v 1.8 2009/03/31 02:14:40 andreas_kupries Exp $
+
+# ### ### ### ######### ######### #########
+## Description
+
+# Each instance of the plugin manager can be configured with data
+# which specifies where to find plugins, and how to validate
+# them. With that it can then be configured to load and provide access
+# to a specific plugin, doing all required checks and
+# initialization. Users for specific plugin types simply have to
+# encapsulate the generic class, providing all the specifics, leaving
+# their users only the task of naming the requested actual plugin.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+package require snit
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::pluginmgr {
+
+    # ### ### ### ######### ######### #########
+    ## Public API - Options
+
+    # - Pattern to match package name. Exactly one '*'. No default.
+    # - List of commands the plugin has to provide. Empty list default.
+    # - Callback for additional checking after the API presence has
+    #   been verified. Empty list default.
+    # - Dictionary of commands to put into the plugin interpreter.
+    #   Key: cmds for plugin, value is cmds to invoke for them.
+    # - Interpreter to use for the -cmds (invoked commands). Default
+    #   is current interp.
+    # - Callback for additional setup actions on the plugin
+    #   interpreter after its creation, but before plugin is loaded into
+    #   it. Empty list default.
+
+    option -pattern {}
+    option -api     {}
+    option -check   {}
+    option -cmds    {}
+    option -cmdip   {}
+    option -setup   {}
+
+    # ### ### ### ######### ######### #########
+    ## Public API - Methods
+
+    method do {args} {
+	if {$plugin eq ""} {
+	    return -code error "No plugin defined"
+	}
+	return [$sip eval $args]
+    }
+
+    method interpreter {} {
+	return $sip
+    }
+
+    method plugin {} {
+	return $plugin
+    }
+
+    method load {name} {
+	if {$name eq $plugin} return
+
+	if {$options(-pattern) eq ""} {
+	    return -code error "Translation pattern is not configured"
+	}
+
+	set save $sip
+
+	$self SetupIp
+	if {![$self LoadPlugin $name]} {
+	    set sip $save
+	    return -code error "Unable to locate or load plugin \"$name\" ($myloaderror)"
+	}
+
+	if {![$self CheckAPI missing]} {
+	    set sip $save
+	    return -code error \
+		    "Cannot use plugin \"$name\", API incomplete: \"$missing\" missing"
+	}
+
+	set savedname $plugin
+	set plugin    $name
+	if {![$self CheckExternal]} {
+	    set sip    $save
+	    set plugin $savedname
+	    return -code error \
+		    "Cannot use plugin \"$name\", API bad"
+	}
+	$self SetupExternalCmds
+
+	if {$save ne ""} {interp delete $save}
+	return
+    }
+
+    method unload {} {
+	if {$sip eq ""} return
+	interp delete $sip
+	set sip    ""
+	set plugin ""
+	return
+    }
+
+    method list {} {
+	if {$options(-pattern) eq ""} {
+	    return -code error "Translation pattern is not configured"
+	}
+
+	set save $sip
+	$self SetupIp
+
+	set result {}
+	set pattern [string map [list \
+		+  \\+  ?  \\?    \
+		\[ \\\[ \] \\\]   \
+		(  \\(  )  \\)    \
+		. \\. \*  {(.*)} \
+		] $options(-pattern)]
+
+	# @mdgen NODEP: bogus-package
+	$sip eval {catch {package require bogus-package}}
+	foreach p [$sip eval {package names}] {
+	    if {![regexp $pattern $p -> plugin]} continue
+	    lappend result $plugin
+	}
+
+	interp delete $sip
+	set sip $save
+	return $result
+    }
+
+    method path {path} {
+	set path [file join [pwd] $path]
+	if {[lsearch -exact $paths $path] < 0} {
+	    lappend paths $path
+	}
+	return
+    }
+
+    method paths {} {
+	return $paths
+    }
+
+    method clone {} {
+	set o [$type create %AUTO% \
+		-pattern $options(-pattern) \
+		-api     $options(-api)    \
+		-check   $options(-check) \
+		-cmds    $options(-cmds) \
+		-cmdip   $options(-cmdip) \
+		-setup   $options(-setup)]
+
+	$o __clone__ $paths $sip $plugin
+
+	# Clone has become owner of the interp.
+	set sip    {}
+	set plugin {}
+
+	return $o
+    }
+
+    method __clone__ {_paths _sip _plugin} {
+	set paths  $_paths
+	set sip    $_sip
+	set plugin $_plugin
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal - Configuration and state
+
+    variable paths  {} ; # List of paths to provide the sip with.
+    variable sip    {} ; # Safe interp used for plugin execution.
+    variable plugin {} ; # Name of currently loaded plugin.
+    variable myloaderror {} ; # Last error reported by the Safe base
+
+    # ### ### ### ######### ######### #########
+    ## Internal - Object construction and descruction.
+
+    constructor {args} {
+	$self configurelist $args
+	return
+    }
+
+    destructor {
+	if {$sip ne ""} {interp delete $sip}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal - Option management
+
+    onconfigure -pattern {newvalue} {
+	set current $options(-pattern)
+	if {$newvalue eq $current} return
+
+	set n [regexp -all "\\*" $newvalue]
+	if {$n < 1} {
+	    return -code error "Invalid pattern, * missing"
+	} elseif {$n > 1} {
+	    return -code error "Invalid pattern, too many *'s"
+	}
+
+	set options(-pattern) $newvalue
+	return
+    }
+
+    onconfigure -api {newvalue} {
+	set current $options(-api)
+	if {$newvalue eq $current} return
+	set options(-api) $newvalue
+	return
+    }
+
+    onconfigure -cmds {newvalue} {
+	set current $options(-cmds)
+	if {$newvalue eq $current} return
+	set options(-cmds) $newvalue
+	return
+    }
+
+    onconfigure -cmdip {newvalue} {
+	set current $options(-cmdip)
+	if {$newvalue eq $current} return
+	set options(-cmdip) $newvalue
+	return
+    }
+
+
+    # ### ### ### ######### ######### #########
+    ## Internal - Helper commands
+
+    method SetupIp {} {
+	set sip [::safe::interpCreate]
+	foreach p $paths {
+	    ::safe::interpAddToAccessPath $sip $p
+	}
+
+	if {![llength $options(-setup)]} return
+	uplevel \#0 [linsert $options(-setup) end $self $sip]
+	return
+    }
+
+    method LoadPlugin {name} {
+	if {[file exists $name]} {
+	    # Plugin files are loaded directly.
+
+	    $sip invokehidden source $name
+	    return 1
+	}
+
+	# Otherwise the name is transformed into a package name
+	# and loaded thorugh the package management.
+
+	set pluginpackage [string map \
+		[list * $name] $options(-pattern)]
+
+	::safe::setLogCmd [mymethod PluginError]
+	if {[catch {
+	    $sip eval [list package require $pluginpackage]
+	} res]} {
+	    ::safe::setLogCmd {}
+	    return 0
+	}
+	::safe::setLogCmd {}
+	return 1
+    }
+
+    method CheckAPI {mv} {
+	upvar 1 $mv missing
+	if {![llength $options(-api)]} {return 1}
+
+	# Check the plugin for useability.
+
+	foreach p $options(-api) {
+	    if {[llength [$sip eval [list info commands $p]]] == 1} continue
+	    interp delete $sip
+	    set missing $p
+	    return 0
+	}
+	return 1
+    }
+
+    method CheckExternal {} {
+	if {![llength $options(-check)]} {return 1}
+	return [uplevel \#0 [linsert $options(-check) end $self]]
+    }
+
+
+    method SetupExternalCmds {} {
+	if {![llength $options(-cmds)]} return
+
+	set cip $options(-cmdip)
+	foreach {pcmd ecmd} $options(-cmds) {
+	    eval [linsert $ecmd 0 interp alias $sip $pcmd $cip]
+	    #interp alias $sip $pcmd $cip {*}$ecmd
+	}
+	return
+    }
+
+    method PluginError {message} {
+	if {[string match {*script error*} $message]} return
+	set myloaderror $message
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    proc paths {pmgr args} {
+	if {[llength $args] == 0} {
+	    return -code error "wrong#args: Expect \"[info level 0] object name...\""
+	}
+	foreach name $args {
+	    AddPaths $pmgr $name
+	}
+	return
+    }
+
+    proc AddPaths {pmgr name} {
+	global env tcl_platform
+
+	if {$tcl_platform(platform) eq "windows"} {
+	    set sep \;
+	} else {
+	    set sep :
+	}
+
+	#puts "$pmgr += ($name) $sep"
+
+	regsub -all {::+} [string trim $name :] \000 name
+	set name [split $name \000]
+
+	# Environment variables
+
+	set prefix {}
+	foreach part $name {
+	    lappend prefix $part
+	    set ev [string toupper [join $prefix _]]_PLUGINS
+
+	    #puts "+? env($ev)"
+
+	    if {[info exists env($ev)]} {
+		foreach path [split $env($ev) $sep] {
+		    $pmgr path $path
+		}
+	    }
+	}
+
+	# Windows registry
+
+	if {
+	    ($tcl_platform(platform) eq "windows") &&
+	    ![catch {package require registry}]
+	} {
+	    foreach root {
+		HKEY_LOCAL_MACHINE
+		HKEY_CURRENT_USER
+	    } {
+		set prefix {}
+		foreach part $name {
+		    lappend prefix $part
+		    set rk $root\\SOFTWARE\\[join $prefix \\]PLUGINS
+
+		    #puts "+? registry($rk)"
+
+		    if {![catch {set data [registry get $rk {}]}]} {
+			foreach path [split $data $sep] {
+			    $pmgr path $path
+			}
+		    }
+		}
+	    }
+	}
+
+	# Home directory dot path
+
+	set prefix {}
+	foreach part $name {
+	    lappend prefix $part
+	    set pd [file join ~ .[join $prefix /] plugin]
+
+	    #puts "+? path($pd)"
+
+	    if {[file exists $pd]} {
+		$pmgr path $pd
+	    }
+
+	    # Cover for the goof in the example found in the docs.
+	    # Note that supporting the directory name 'plugins' is
+	    # also more consistent with the environment variables
+	    # above, where we also use plugins, plural.
+
+	    set pd [file join ~ .[join $prefix /] plugins]
+
+	    #puts "+? path($pd)"
+
+	    if {[file exists $pd]} {
+		$pmgr path $pd
+	    }
+	}
+	return
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pluginmgr 0.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/png/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/png/pkgIndex.tcl
new file mode 100644
index 00000000..5456ec38
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/png/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded png 0.3 [list source [file join $dir png.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/png/png.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/png/png.tcl
new file mode 100644
index 00000000..f29b7649
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/png/png.tcl
@@ -0,0 +1,311 @@
+# png.tcl --
+#
+#       Querying and modifying PNG image files.
+#
+# Copyright (c) 2004-2012 Aaron Faupell <afaupell@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: png.tcl,v 1.11 2012/07/09 16:35:04 afaupell Exp $
+
+package provide png 0.3
+
+namespace eval ::png {}
+
+proc ::png::_openPNG {file {mode r}} {
+    set fh [open $file $mode]
+    fconfigure $fh -encoding binary -translation binary -eofchar {}
+    if {[read $fh 8] != "\x89PNG\r\n\x1a\n"} { close $fh; return -code error "not a png file" }
+    return $fh
+}
+
+proc ::png::_chunks {fh} {
+    set out [list]
+    while {[set r [read $fh 8]] != ""} {
+        binary scan $r Ia4 len type
+        lappend out [list $type [tell $fh] $len]
+        seek $fh [expr {$len + 4}] current
+    }
+    return $out
+}
+
+proc ::png::isPNG {file} {
+    if {[catch {_openPNG $file} fh]} { return 0 }
+    close $fh
+    return 1
+}
+
+proc ::png::validate {file} {
+    package require crc32
+    if {[catch {_openPNG $file} fh]} { return SIG }
+    set num 0
+    set idat 0
+    set last {}
+
+    while {[set r [read $fh 8]] != ""} {
+        binary scan $r Ia4 len type
+        if {$len < 0} { close $fh; return BADLEN }
+        set r [read $fh $len]
+        binary scan [read $fh 4] I crc
+	if {$crc < 0} {set crc [format %u [expr {$crc & 0xffffffff}]]}
+        if {[eof $fh]} { close $fh; return EOF }
+        if {($num == 0) && ($type != "IHDR")} { close $fh; return NOHDR }
+        if {$type == "IDAT"} { set idat 1 }
+        if {[::crc::crc32 $type$r] != $crc} { close $fh; return CKSUM }
+        set last $type
+        incr num
+    }
+    close $fh
+    if {!$idat} { return NODATA }
+    if {$last != "IEND"} { return NOEND }
+    return OK
+}
+
+proc ::png::imageInfo {file} {
+    set fh [_openPNG $file]
+    binary scan [read $fh 8] Ia4 len type
+    set r [read $fh $len]
+    if {![eof $fh] && $type == "IHDR"} {
+        binary scan $r IIccccc width height depth color compression filter interlace
+	binary scan [read $fh 4] I check
+	if {$check < 0} {set check [format %u [expr {$check & 0xffffffff}]]}
+	if {![catch {package present crc32}] && [::crc::crc32 IHDR$r] != $check} {
+	    return -code error "header checksum failed"
+	}
+        close $fh
+        return [list width $width height $height depth $depth color $color \
+		compression $compression filter $filter interlace $interlace]
+    }
+    close $fh
+    return
+}
+
+proc ::png::getTimestamp {file} {
+    set fh [_openPNG $file]
+
+    while {[set r [read $fh 8]] != ""} {
+        binary scan $r Ia4 len type
+        if {$type == "tIME"} {
+            set r [read $fh [expr {$len + 4}]]
+            binary scan $r Sccccc year month day hour minute second
+            close $fh
+            return [clock scan "$month/$day/$year $hour:$minute:$second" -gmt 1]
+        }
+        seek $fh [expr {$len + 4}] current
+    }
+    close $fh
+    return
+}
+
+proc ::png::setTimestamp {file time} {
+    set fh [_openPNG $file r+]
+    
+    set time [eval binary format Sccccc [string map {" 0" " "} [clock format $time -format "%Y %m %d %H %M %S" -gmt 1]]]
+    if {![catch {package present crc32}]} {
+        append time [binary format I [::crc::crc32 tIME$time]]
+    } else {
+        append time [binary format I 0]
+    }
+
+    while {[set r [read $fh 8]] != ""} {
+        binary scan $r Ia4 len type
+        if {[eof $fh]} { close $fh; return }
+        if {$type == "tIME"} {
+            seek $fh 0 current
+            puts -nonewline $fh $time
+            close $fh
+            return
+        }
+        if {$type == "IDAT" && ![info exists idat]} { set idat [expr {[tell $fh] - 8}] }
+        seek $fh [expr {$len + 4}] current
+    }
+    if {![info exists idat]} { close $fh; return -code error "no timestamp or data chunk found" }
+    seek $fh $idat start
+    set data [read $fh]
+    seek $fh $idat start
+    puts -nonewline $fh [binary format I 7]tIME$time$data
+    close $fh
+    return
+}
+
+proc ::png::getComments {file} {
+    set fh [_openPNG $file]
+    set text {}
+
+    while {[set r [read $fh 8]] != ""} {
+        binary scan $r Ia4 len type
+        set pos [tell $fh]
+        if {$type == "tEXt"} {
+            set r [read $fh $len]
+            lappend text [split $r \x00]
+        } elseif {$type == "iTXt"} {
+            set r [read $fh $len]
+            set keyword [lindex [split $r \x00] 0]
+            set r [string range $r [expr {[string length $keyword] + 1}] end]
+            binary scan $r cc comp method
+            if {$comp == 0} {
+                lappend text [linsert [split [string range $r 2 end] \x00] 0 $keyword]
+            }
+        }
+        seek $fh [expr {$pos + $len + 4}] start
+    }
+    close $fh
+    return $text
+}
+
+proc ::png::removeComments {file} {
+    set fh [_openPNG $file r+]
+    set data "\x89PNG\r\n\x1a\n"
+    while {[set r [read $fh 8]] != ""} {
+        binary scan $r Ia4 len type
+        if {$type == "zTXt" || $type == "iTXt" || $type == "tEXt"} {
+            seek $fh [expr {$len + 4}] current
+        } else {
+            seek $fh -8 current
+            append data [read $fh [expr {$len + 12}]]
+        }
+    }
+    close $fh
+    set fh [open $file w]
+    fconfigure $fh -encoding binary -translation binary -eofchar {}
+    puts -nonewline $fh $data
+    close $fh
+}
+
+proc ::png::addComment {file keyword arg1 args} {
+    if {[llength $args] > 0 && [llength $args] != 2} { close $fh; return -code error "wrong number of arguments" }
+    set fh [_openPNG $file r+]
+
+    if {[llength $args] > 0} {
+        set comment "iTXt$keyword\x00\x00\x00$arg1\x00[encoding convertto utf-8 [lindex $args 0]]\x00[encoding convertto utf-8 [lindex $args 1]]"
+    } else {
+        set comment "tEXt$keyword\x00$arg1"
+    }
+    
+    if {![catch {package present crc32}]} {
+        append comment [binary format I [::crc::crc32 $comment]]
+    } else {
+        append comment [binary format I 0]
+    }
+
+    while {[set r [read $fh 8]] != ""} {
+        binary scan $r Ia4 len type
+        if {$type ==  "IDAT"} {
+            seek $fh -8 current
+            set pos [tell $fh]
+            set data [read $fh]
+            seek $fh $pos start
+            set 1 [tell $fh]
+            puts -nonewline $fh $comment
+            set clen [binary format I [expr {[tell $fh] - $1 - 8}]]
+            seek $fh $pos start
+            puts -nonewline $fh $clen$comment$data
+            close $fh
+            return
+        }
+        seek $fh [expr {$len + 4}] current
+    }
+    close $fh
+    return -code error "no data chunk found"
+}
+
+proc ::png::getPixelDimension {file} {
+    set fh [_openPNG $file]
+
+    while {[set r [read $fh 8]] != ""} {
+        binary scan $r Ia4 len type
+        if {$type == "pHYs"} {
+            set r [read $fh [expr {$len + 4}]]
+            binary scan $r IIc ppux ppuy unit
+            close $fh
+            # mask out sign bit, from tcl 8.5, one may use u specifier
+            set res [list ppux [expr {$ppux & 0xFFFFFFFF}]\
+                     ppuy [expr {$ppuy & 0xFFFFFFFF}]\
+                    unit]
+            if {$unit == 1} {lappend res meter} else {lappend res unknown}
+            return $res
+        }
+        seek $fh [expr {$len + 4}] current
+    }
+    close $fh
+    return
+}
+
+proc ::png::image {file} {
+    set fh [_openPNG $file]
+    set chunks [_chunks $fh]
+    set cdata {}
+
+    set h [lsearch -exact -index 0 -inline $chunks IHDR]
+    seek $fh [lindex $h 1] start
+    binary scan [read $fh [lindex $h 2]] IIccccc width height depth color compression filter interlace
+
+    if {$color != 2 || $compression != 0 || $depth != 8} {
+        return -code error "unsupported image format"
+    }
+
+    foreach c [lsearch -exact -index 0 -all -inline $chunks IDAT] {
+        seek $fh [lindex $c 1] start
+        append cdata [read $fh [lindex $c 2]]
+    }
+    set data [zlib decompress $cdata]
+
+    set len [string length $data]
+    set col 1
+    set offset 1
+    set row [list]
+    set out [list]
+    while {$offset < $len} {
+        binary scan $data @${offset}H2H2H2 r g b
+        lappend row "#$r$g$b"
+        incr offset 3
+        if {$col == $width} {
+            set col 1
+            incr offset
+            lappend out $row
+            set row [list]
+            continue
+        }
+        incr col
+    }
+    return $out
+}
+
+proc ::png::write {file in} {
+    set blocksize 65524
+    set chunks [list]
+    set data ""
+    lappend chunks [list IHDR [binary format IIccccc [llength [lindex $in 0]] [llength $in] 8 2 0 0 0]]
+
+    foreach row $in {
+        append data \x00
+        foreach pixel $row {
+            set pixel [string trimleft $pixel "#"]
+            append data [binary format H2H2H2 [string range $pixel 0 1] [string range $pixel 2 3] [string range $pixel 4 5]]
+        }
+    }
+    set cdata [zlib compress $data]
+    set offset 0
+    while {$offset < ([string length $cdata] + $blocksize)} {
+        lappend chunks [list IDAT [string range $cdata $offset [expr {$offset+$blocksize-1}]]]
+        incr offset $blocksize
+    }
+    #lappend chunks [list tIME [eval binary format Sccccc [clock format [clock seconds] -format "%Y %m %d %H %M %S"]]]
+    lappend chunks [list IEND ""]
+    _write $file $chunks
+}
+
+proc ::png::_write {file chunks} {
+    package require crc32
+    set fh [open $file w+]
+    fconfigure $fh -encoding binary -translation binary
+    puts -nonewline $fh "\x89PNG\r\n\x1a\n"
+    foreach chunk $chunks {
+        puts -nonewline $fh [binary format Ia4 [string length [lindex $chunk 1]] [lindex $chunk 0]]
+        puts -nonewline $fh [lindex $chunk 1]
+        puts -nonewline $fh [binary format I [::crc::crc32 [join $chunk ""]]]
+    }
+    close $fh
+    return $file
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3/pkgIndex.tcl
new file mode 100644
index 00000000..e3bee9f6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded pop3 1.10 [list source [file join $dir pop3.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3/pop3.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3/pop3.tcl
new file mode 100644
index 00000000..f1ce6410
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3/pop3.tcl
@@ -0,0 +1,828 @@
+# pop3.tcl --
+#
+#	POP3 mail client package, written in pure Tcl.
+#	Some concepts borrowed from "frenchie", a POP3
+#	mail client utility written by Scott Beasley.
+#
+# Copyright (c) 2000 by Ajuba Solutions.
+# portions Copyright (c) 2000 by Scott Beasley
+# portions Copyright (c) 2010-2012 Andreas Kupries
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.5
+package require cmdline
+package require log
+package provide pop3 1.10
+
+namespace eval ::pop3 {
+
+    # The state variable remembers information about the open pop3
+    # connection. It is indexed by channel id. The information is
+    # a keyed list, with keys "msex" and "retr_mode". The value
+    # associated with "msex" is boolean, a true value signals that the
+    # server at the other end is MS Exchange. The value associated
+    # with "retr_mode" is one of {retr, list, slow}.
+
+    # The value of "msex" influences how the translation for the
+    # channel is set and is determined by the contents of the received
+    # greeting. The value of "retr_mode" is initially "retr" and
+    # completely determined by the first call to [retrieve]. For "list"
+    # the system will use LIST before RETR to retrieve the message size.
+
+    # The state can be influenced by options given to "open".
+
+    variable  state
+    array set state {}
+
+}
+
+# ::pop3::config --
+#
+#	Retrieve configuration of pop3 connection
+#
+# Arguments:
+#	chan      The channel, returned by ::pop3::open
+#
+# Results:
+#	A serialized array.
+
+proc ::pop3::config {chan} {
+    variable state
+    return  $state($chan)
+}
+
+# ::pop3::close --
+#
+#	Close the connection to the POP3 server.
+#
+# Arguments:
+#	chan      The channel, returned by ::pop3::open
+#
+# Results:
+#	None.
+
+proc ::pop3::close {chan} {
+    variable state
+    catch {::pop3::send $chan "QUIT"}
+    unset state($chan)
+    ::close $chan
+    return
+}
+
+# ::pop3::delete --
+#
+#	Delete messages on the POP3 server.
+#
+# Arguments:
+#	chan      The channel, returned by ::pop3::open
+#       start     The first message to delete in the range.
+#                 May be "next" (the next message after the last
+#                 one seen, see ::pop3::last), "start" (aka 1),
+#                 "end" (the last message in the spool, for 
+#                 deleting only the last message).
+#       end       (optional, defaults to -1) The last message
+#                 to delete in the range. May be "last"
+#                 (the last message viewed), "end" (the last
+#                 message in the spool), or "-1" (the default,
+#                 any negative number means delete only
+#                 one message).
+#
+# Results:
+#	None.
+#       May throw errors from the server.
+
+proc ::pop3::delete {chan start {end -1}} {
+
+    variable state
+    array set  cstate $state($chan)
+    set count $cstate(limit)
+    set last 0
+    catch {set last [::pop3::last $chan]}
+
+    if {![string is integer $start]} {
+	if {[string match $start "next"]} {
+	    set start $last
+	    incr start
+	} elseif {$start == "start"} {
+	    set start 1
+	} elseif {$start == "end"} {
+	    set start $count
+	} else {
+	    error "POP3 Deletion error: Bad start index $start"
+	}
+    } 
+    if {$start == 0} {
+	set start 1
+    }
+    
+    if {![string is integer $end]} {
+	if {$end == "end"} {
+	    set end $count
+	} elseif {$end == "last"} {
+	    set end $last
+	} else {
+	    error "POP3 Deletion error: Bad end index $end"
+	}
+    } elseif {$end < 0} {
+	set end $start
+    }
+
+    if {$end > $count} {
+	set end $count
+    }
+    
+    for {set index $start} {$index <= $end} {incr index} {
+	if {[catch {::pop3::send $chan "DELE $index"} errorStr]} {
+	    error "POP3 DELETE ERROR: $errorStr"
+	}
+    }
+    return {}
+}
+
+# ::pop3::last --
+#
+#	Gets the index of the last email read from the server.
+#       Note, some POP3 servers do not support this feature,
+#       in which case the value returned may always be zero,
+#       or an error may be thrown.
+#
+# Arguments:
+#	chan      The channel, returned by ::pop3::open
+#
+# Results:
+#	The index of the last email message read, which may
+#       be zero if none have been read or if the server does
+#       not support this feature.
+#       Server errors may be thrown, including some cases
+#       when the LAST command is not supported.
+
+proc ::pop3::last {chan} {
+
+    if {[catch {
+	    set resultStr [::pop3::send $chan "LAST"]
+        } errorStr]} {
+	error "POP3 LAST ERROR: $errorStr"
+    }
+    
+    return [string trim $resultStr]
+}
+
+# ::pop3::list --
+#
+#	Returns "scan listing" of the mailbox. If parameter msg
+#       is defined, then the listing only for the given message 
+#       is returned.
+#
+# Arguments:
+#	chan        The channel open to the POP3 server.
+#       msg         The message number (optional).
+#
+# Results:
+#	If msg parameter is not given, Tcl list of scan listings in 
+#       the maildrop is returned. In case msg parameter is given,
+#       a list of length one containing the specified message listing
+#       is returned.
+
+proc ::pop3::list {chan {msg ""}} {
+    global PopErrorNm PopErrorStr debug
+ 
+    if {$msg == ""} {
+	if {[catch {::pop3::send $chan "LIST"} errorStr]} {
+	    error "POP3 LIST ERROR: $errorStr"
+	}
+	set msgBuffer [RetrSlow $chan]
+    } else {
+	# argument msg given, single-line response expected
+
+	if {[catch {expr {0 + $msg}}]} {
+	    error "POP3 LIST ERROR: malformed message number '$msg'"
+	} else {
+	    set msgBuffer [string trim [::pop3::send $chan "LIST $msg"]]
+	}
+    }
+    return $msgBuffer
+}
+
+# pop3::open --
+#
+#	Opens a connection to a POP3 mail server.
+#
+# Arguments:
+#       args     A list of options and values, possibly empty,
+#		 followed by the regular arguments, i.e. host, user,
+#		 passwd and port. The latter is optional.
+#
+#	host     The name or IP address of the POP3 server host.
+#       user     The username to use when logging into the server.
+#       passwd   The password to use when logging into the server.
+#       port     (optional) The socket port to connect to, defaults
+#                to port 110, the POP standard port address.
+#
+# Results:
+#	The connection channel (a socket).
+#       May throw errors from the server.
+
+proc ::pop3::open {args} {
+    variable state
+    array set cstate {socketcmd ::socket msex 0 retr_mode retr limit {} stls 0 tls-callback {}}
+
+    log::log debug "pop3::open | [join $args]"
+
+    while {[set err [cmdline::getopt args {
+	msex.arg
+	retr-mode.arg
+	socketcmd.arg
+        stls.arg
+        tls-callback.arg
+    } opt arg]]} {
+	if {$err < 0} {
+	    return -code error "::pop3::open : $arg"
+	}
+	switch -exact -- $opt {
+	    msex {
+		if {![string is boolean $arg]} {
+		    return -code error \
+			    ":pop3::open : Argument to -msex has to be boolean"
+		}
+		set cstate(msex) $arg
+	    }
+	    retr-mode {
+		switch -exact -- $arg {
+		    retr - list - slow {
+			set cstate(retr_mode) $arg
+		    }
+		    default {
+			return -code error \
+				":pop3::open : Argument to -retr-mode has to be one of retr, list or slow"
+		    }
+		}
+	    }
+	    socketcmd {
+		set cstate(socketcmd) $arg
+	    }
+            stls {
+		if {![string is boolean $arg]} {
+		    return -code error \
+			    ":pop3::open : Argument to -tls has to be boolean"
+		}
+		set cstate(stls) $arg                
+            }
+            tls-callback {
+		set cstate(tls-callback) $arg                                
+            }
+	    default {
+		# Can't happen
+	    }
+	}
+    }
+
+    if {[llength $args] > 4} {
+	return -code error "To many arguments to ::pop3::open"
+    }
+    if {[llength $args] < 3} {
+	return -code error "Not enough arguments to ::pop3::open"
+    }
+    foreach {host user password port} $args break
+    if {$port == {}} {
+	if {([lindex $cstate(socketcmd) 0] eq "tls::socket") ||
+	    ([lindex $cstate(socketcmd) 0] eq "::tls::socket")} {
+	    # Standard port for SSL-based pop3 connections.
+	    set port 995
+	} else {
+	    # Standard port for any other type of connection.
+	    set port 110
+	}
+    }
+
+    log::log debug "pop3::open | protocol, connect to $host $port"
+
+    # Argument processing is finally complete, now open the channel
+
+    set chan [eval [linsert $cstate(socketcmd) end $host $port]]
+    fconfigure $chan -buffering none
+
+    log::log debug "pop3::open | connect on $chan"
+
+    if {$cstate(msex)} {
+	# We are talking to MS Exchange. Work around its quirks.
+	fconfigure $chan -translation binary
+    } else {
+	fconfigure $chan -translation {binary crlf}
+    }
+
+    log::log debug "pop3::open | wait for greeting"
+
+    if {[catch {::pop3::send $chan {}} errorStr]} {
+	::close $chan
+	return -code error "POP3 CONNECT ERROR: $errorStr"
+    }
+
+    if {0} {
+	# -FUTURE- Identify MS Exchange servers
+	set cstate(msex) 1
+
+	# We are talking to MS Exchange. Work around its quirks.
+	fconfigure $chan -translation binary
+    }
+
+    if {$cstate(stls)} {
+        log::log debug "pop3::open | negotiating TLS on $chan"
+        if {[catch {
+            set capa [::pop3::capa $chan]
+            log::log debug "pop3::open | Server $chan can $capa"
+        } errorStr]} {
+            close $chan
+            return -code error "POP3 CONNECT/STLS ERROR: $errorStr"
+        }
+
+        if { [lsearch -exact $capa STLS] == -1} {
+            log::log debug "pop3::open | Server $chan can't STLS"
+            close $chan
+            return -code error "POP CONNECT ERROR: STLS requested but not supported by server"
+        }
+        log::log debug "pop3::open | server can TLS on $chan"
+
+        if {[catch {
+            ::pop3::send $chan "STLS"
+        } errorStr]} {
+            close $chan
+            return -code error "POP3 STLS ERROR: $errorStr"
+        }        
+        
+        package require tls
+        
+        log::log debug "pop3::open | tls::import $chan"
+        # Explicitly disable ssl2 and only allow ssl3 and tlsv1. Although the defaults
+        # will work with most servers, ssl2 is really, really old and is deprecated.
+        if {$cstate(tls-callback) ne ""} {
+            set newchan [tls::import $chan -ssl2 0 -ssl3 1 -tls1 1 -cipher SSLv3,TLSv1 -command $cstate(tls-callback)]            
+        } else {
+            set newchan [tls::import $chan -ssl2 0 -ssl3 1 -tls1 1 -cipher SSLv3,TLSv1]            
+        }
+        
+        if {[catch {
+            log::log debug "pop3::open | tls::handshake $chan"
+            tls::handshake $chan
+        } errorStr]} {
+            close $chan
+            return -code error "POP3 CONNECT/TLS HANDSHAKE ERROR: $errorStr"
+        }
+        
+        array set security [tls::status $chan]
+        set sbits 0
+        if { [info exists security(sbits)] } {
+            set sbits $security(sbits)
+        }
+        if { $sbits == 0 } {
+            close $chan
+            return -code error "POP3 CONNECT/TLS: TLS Requested but not available"
+        } elseif { $sbits < 128 } {            
+            close $chan
+            return -code error "POP3 CONNECT/TLS: TLS Requested but insufficient (<128bits): $sbits"
+        }
+        
+        log::log debug "pop3::open | $chan now in $sbits bit TLS mode ($security(cipher))"
+    }
+
+    log::log debug "pop3::open | authenticate $user (*password not shown*)"
+
+    if {[catch {
+	::pop3::send $chan "USER $user"
+	::pop3::send $chan "PASS $password"
+    } errorStr]} {
+	::close $chan
+	return -code error "POP3 LOGIN ERROR: $errorStr"
+    }
+
+    # [ 833486 ] Can't delete messages one at a time ...
+    # Remember the number of messages in the maildrop at the beginning
+    # of the session. This gives us the highest possible number for
+    # message ids later. Note that this number must not be affected
+    # when deleting mails later. While the number of messages drops
+    # down the limit for the message id's stays the same. The messages
+    # are not renumbered before the session actually closed.
+
+    set cstate(limit) [lindex [::pop3::status $chan] 0]
+
+    # Remember the state.
+
+    set state($chan) [array get cstate]
+
+    log::log debug "pop3::open | ok ($chan)"
+    return $chan
+}
+
+# ::pop3::retrieve --
+#
+#	Retrieve email message(s) from the server.
+#
+# Arguments:
+#	chan      The channel, returned by ::pop3::open
+#       start     The first message to retrieve in the range.
+#                 May be "next" (the next message after the last
+#                 one seen, see ::pop3::last), "start" (aka 1),
+#                 "end" (the last message in the spool, for 
+#                 retrieving only the last message).
+#       end       (optional, defaults to -1) The last message
+#                 to retrieve in the range. May be "last"
+#                 (the last message viewed), "end" (the last
+#                 message in the spool), or "-1" (the default,
+#                 any negative number means retrieve only
+#                 one message).
+#
+# Results:
+#	A list containing all of the messages retrieved.
+#       May throw errors from the server.
+
+proc ::pop3::retrieve {chan start {end -1}} {
+    variable state
+    array set cstate $state($chan)
+    
+    set count $cstate(limit)
+    set last 0
+    catch {set last [::pop3::last $chan]}
+
+    if {![string is integer $start]} {
+	if {[string match $start "next"]} {
+	    set start $last
+	    incr start
+	} elseif {$start == "start"} {
+	    set start 1
+	} elseif {$start == "end"} {
+	    set start $count
+	} else {
+	    error "POP3 Retrieval error: Bad start index $start"
+	}
+    } 
+    if {$start == 0} {
+	set start 1
+    }
+    
+    if {![string is integer $end]} {
+	if {$end == "end"} {
+	    set end $count
+	} elseif {$end == "last"} {
+	    set end $last
+	} else {
+	    error "POP3 Retrieval error: Bad end index $end"
+	}
+    } elseif {$end < 0} {
+	set end $start
+    }
+
+    if {$end > $count} {
+	set end $count
+    }
+    
+    set result {}
+
+    ::log::log debug "pop3 $chan retrieve $start -- $end"
+
+    for {set index $start} {$index <= $end} {incr index} {
+	switch -exact -- $cstate(retr_mode) {
+	    retr {
+		set sizeStr [::pop3::send $chan "RETR $index"]
+
+		::log::log debug "pop3 $chan retrieve ($sizeStr)"
+
+		if {[scan $sizeStr {%d %s} size dummy] < 1} {
+		    # The server did not deliver the size information.
+		    # Switch our mode to "list" and use the slow
+		    # method this time. The next call will use LIST before
+		    # RETR to get the size information. If even that fails
+		    # the system will fall back to slow mode all the time.
+
+		    ::log::log debug "pop3 $chan retrieve - no size information, go slow"
+
+		    set cstate(retr_mode) list
+		    set state($chan) [array get cstate]
+
+		    # Retrieve in slow motion.
+		    set msgBuffer [RetrSlow $chan]
+		} else {
+		    ::log::log debug "pop3 $chan retrieve - size information present, use fast mode"
+
+		    set msgBuffer [RetrFast $chan $size]
+		}
+	    }
+	    list {
+		set sizeStr [::pop3::send $chan "LIST $index"]
+
+		if {[scan $sizeStr {%d %d %s} dummy size dummy] < 2} {
+		    # Not even LIST generates the necessary size information.
+		    # Switch to full slow mode and don't bother anymore.
+
+		    set cstate(retr_mode) slow
+		    set state($chan) [array get cstate]
+
+		    ::pop3::send $chan "RETR $index"
+
+		    # Retrieve in slow motion.
+		    set msgBuffer [RetrSlow $chan]
+		} else {
+		    # Ignore response of RETR, already know the size
+		    # through LIST
+
+		    ::pop3::send $chan "RETR $index"
+		    set msgBuffer [RetrFast $chan $size]
+		}
+	    }
+	    slow {
+		# Retrieve in slow motion.
+
+		::pop3::send $chan "RETR $index"
+		set msgBuffer [RetrSlow $chan]
+	    }
+	}
+	lappend result $msgBuffer
+    }
+    return $result
+}
+
+# ::pop3::RetrFast --
+#
+#	Fast retrieval of a message from the pop3 server.
+#	Internal helper to prevent code bloat in "pop3::retrieve"
+#
+# Arguments:
+#	chan	The channel to read the message from.
+#
+# Results:
+#	The text of the retrieved message.
+
+proc ::pop3::RetrFast {chan size} {
+    set msgBuffer [read $chan $size]
+
+    foreach line [split $msgBuffer \n] {
+	::log::log debug "pop3 $chan fast <$line>"
+    }
+
+    # There is a small discrepance in counting octets we have to be
+    # aware of. 'size' is #octets before transmission, i.e. can be
+    # with one eol character, CR or LF. The channel system in binary
+    # mode counts every character, and the protocol specified CRLF as
+    # eol, so for every line in the message we read that many
+    # characters _less_. Another factor which can cause a miscount is
+    # the ".-stuffing performed by the sender. I.e. what we got now is
+    # not necessarily the complete message. We have to perform slow
+    # reads to get the remainder of the message. This has another
+    # complication. We cannot simply check for a line containing the
+    # terminating signature, simply because the point where the
+    # message was broken in two might just be in between the dots of a
+    # "\r\n..\r\n" sequence. We have to make sure that we do not
+    # misinterpret the second part of this sequence as terminator.
+    # Another possibility: "\r\n.\r\n" is broken just after the dot.
+    # Then we have to ensure to not to miss the terminator entirely.
+
+    # Sometimes the gets returns nothing, need to get the real
+    # terminating "."                                    / "
+
+    if {[string equal [string range $msgBuffer end-3 end] "\n.\r\n"]} {
+	# Complete terminator found. Remove it from the message buffer.
+
+	::log::log debug "pop3 $chan /5__"
+	set msgBuffer [string range $msgBuffer 0 end-3]
+
+    } elseif {[string equal [string range $msgBuffer end-2 end] "\n.\r"]} {
+	# Complete terminator found. Remove it from the message buffer.
+	# Also perform an empty read to remove the missing '\n' from
+	# the channel. If we don't do this all following commands will
+	# run into off-by-one (character) problems.
+
+	::log::log debug "pop3 $chan /4__"
+	set msgBuffer [string range $msgBuffer 0 end-2]
+	while {[read $chan 1] != "\n"} {}
+
+    } elseif {[string equal [string range $msgBuffer end-1 end] "\n."]} {
+	# \n. at the end of the fast buffer.
+	# Can be	\n.\r\n	 = Terminator
+	# or		\n..\r\n = dot-stuffed single .
+
+	log::log debug "pop3 $chan /check for cut .. or terminator sequence"
+
+	# Idle until non-empty line encountered.
+	while {[set line [gets $chan]] == ""} {}
+	if {"$line" == "\r"} {
+	    # Terminator already found. Note that we have to
+	    # remove the partial terminator sequence from the
+	    # message buffer.
+	    ::log::log debug "pop3 $chan /3__ <$line>"
+	    set msgBuffer [string range $msgBuffer 0 end-1]
+	} else {
+	    # Append line and look for the real terminator
+	    append msgBuffer $line
+	    ::log::log debug "pop3 $chan ____ <$line>"
+	    while {[set line [gets $chan]] != ".\r"} {
+		::log::log debug "pop3 $chan ____ <$line>"
+		append msgBuffer $line
+	    }
+	    ::log::log debug "pop3 $chan /2__ <$line>"
+	}
+    } elseif {[string equal [string index $msgBuffer end] \n]} {
+	# Line terminator (\n) found. The remainder of the mail has to
+	# consist of true lines we can read directly.
+
+	while {![string equal [set line [gets $chan]] ".\r"]} {
+	    ::log::log debug "pop3 $chan ____ <$line>"
+	    append msgBuffer $line
+	}
+	::log::log debug "pop3 $chan /1__ <$line>"
+    } else {
+	# Incomplete line at the end of the buffer. We complete it in
+	# a single read, and then handle the remainder like the case
+	# before, where we had a complete line at the end of the
+	# buffer.
+
+	set line [gets $chan]
+	::log::log debug "pop3 $chan /1a_ <$line>"
+	append msgBuffer $line
+
+	::log::log debug "pop3 $chan /1b_"
+
+	while {![string equal [set line [gets $chan]] ".\r"]} {
+	    ::log::log debug "pop3 $chan ____ <$line>"
+	    append msgBuffer $line
+	}
+	::log::log debug "pop3 $chan /1c_ <$line>"
+    }
+
+    ::log::log debug "pop3 $chan done"
+
+    # Map both cr+lf and cr to lf to simulate auto EOL translation, then
+    # unstuff .-stuffed lines.
+
+    return [string map [::list \n.. \n.] [string map [::list \r \n] [string map [::list \r\n \n] $msgBuffer]]]
+}
+
+# ::pop3::RetrSlow --
+#
+#	Slow retrieval of a message from the pop3 server.
+#	Internal helper to prevent code bloat in "pop3::retrieve"
+#
+# Arguments:
+#	chan	The channel to read the message from.
+#
+# Results:
+#	The text of the retrieved message.
+
+proc ::pop3::RetrSlow {chan} {
+
+    set msgBuffer ""
+	
+    while {1} {
+	set line [string trimright [gets $chan] \r]
+	::log::log debug "pop3 $chan slow $line"
+
+	# End of the message is a line with just "."
+	if {$line == "."} {
+	    break
+	} elseif {[string index $line 0] == "."} {
+	    set line [string range $line 1 end]
+	}
+		
+	append msgBuffer $line "\n"
+    }
+
+    return $msgBuffer
+}
+
+# ::pop3::send --
+#
+#	Send a command string to the POP3 server.  This is an
+#       internal function, but may be used in rare cases.
+#
+# Arguments:
+#	chan        The channel open to the POP3 server.
+#       cmdstring   POP3 command string
+#
+# Results:
+#	Result string from the POP3 server, except for the +OK tag.
+#       Errors from the POP3 server are thrown.
+
+proc ::pop3::send {chan cmdstring} {
+   global PopErrorNm PopErrorStr debug
+
+   if {$cmdstring != {}} {
+       ::log::log debug "pop3 $chan >>> $cmdstring"       
+       puts $chan $cmdstring
+   }
+   
+   set popRet [string trim [gets $chan]]
+   ::log::log debug "pop3 $chan <<< $popRet"
+
+   if {[string first "+OK" $popRet] == -1} {
+       error [string range $popRet 4 end]
+   }
+
+   return [string range $popRet 3 end]
+}
+
+# ::pop3::status --
+#
+#	Get the status of the mail spool on the POP3 server.
+#
+# Arguments:
+#	chan      The channel, returned by ::pop3::open
+#
+# Results:
+#	A list containing two elements, {msgCount octetSize},
+#       where msgCount is the number of messages in the spool
+#       and octetSize is the size (in octets, or 8 bytes) of
+#       the entire spool.
+
+proc ::pop3::status {chan} {
+
+    if {[catch {set statusStr [::pop3::send $chan "STAT"]} errorStr]} {
+	error "POP3 STAT ERROR: $errorStr"
+    }
+
+    # Dig the sent size and count info out.
+    set rawStatus [split [string trim $statusStr]]
+    
+    return [::list [lindex $rawStatus 0] [lindex $rawStatus 1]]
+}
+
+# ::pop3::top --
+#
+#       Optional POP3 command (see RFC1939). Retrieves message header
+#       and given number of lines from the message body.
+#
+# Arguments:
+#	chan        The channel open to the POP3 server.
+#       msg         The message number to be retrieved.
+#       n           Number of lines returned from the message body.
+#
+# Results:
+#	Text (with newlines) from the server.
+#       Errors from the POP3 server are thrown.
+
+proc ::pop3::top {chan msg n} {
+    global PopErrorNm PopErrorStr debug
+    
+    if {[catch {::pop3::send $chan "TOP $msg $n"} errorStr]} {
+	error "POP3 TOP ERROR: $errorStr"
+    }
+
+    return [RetrSlow $chan]
+}
+
+# ::pop3::uidl --
+#
+#	Returns "uid listing" of the mailbox. If parameter msg
+#	is defined, then the listing only for the given message
+#	is returned.
+#
+# Arguments:
+#	chan        The channel open to the POP3 server.
+#	msg         The message number (optional).
+#
+# Results:
+#	If msg parameter is not given, Tcl list of uid listings in
+#	the maildrop is returned. In case msg parameter is given,
+#	a list of length one containing the uid of the specified
+#	message listing is returned.
+
+proc ::pop3::uidl {chan {msg ""}} {
+    if {$msg == ""} {
+	if {[catch {::pop3::send $chan "UIDL"} errorStr]} {
+	    error "POP3 UIDL ERROR: $errorStr"
+	}
+	set msgBuffer [RetrSlow $chan]
+    } else {
+	# argument msg given, single-line response expected
+	
+	if {[catch {expr {0 + $msg}}]} {
+	    error "POP3 UIDL ERROR: malformed message number '$msg'"
+	} else {
+	    set msgBuffer [string trim [::pop3::send $chan "UIDL $msg"]]
+	}
+    }
+
+    return $msgBuffer
+}
+
+# ::pop3::capa --
+#
+#	Returns "capabilities" of the server. 
+#
+# Arguments:
+#	chan        The channel open to the POP3 server.
+#
+# Results:
+#	A Tcl list with the capabilities of the server.
+#       UIDL, TOP, STLS are typical capabilities.
+
+
+proc ::pop3::capa {chan} {
+    global PopErrorNm PopErrorStr debug
+ 
+    if {[catch {::pop3::send $chan "CAPA"} errorStr]} {
+        error "POP3 CAPA ERROR: $errorStr"
+    }
+    set msgBuffer [string map {\r {}} [RetrSlow $chan]]
+    
+    return [split $msgBuffer \n]
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3d/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3d/pkgIndex.tcl
new file mode 100644
index 00000000..034143a8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3d/pkgIndex.tcl
@@ -0,0 +1,16 @@
+# Tcl package index file, version 1.1
+# This file is generated by the "pkg_mkIndex" command
+# and sourced either when an application starts up or
+# by a "package unknown" script.  It invokes the
+# "package ifneeded" command to set up package-related
+# information so that packages will be loaded automatically
+# in response to "package require" commands.  When this
+# script is sourced, the variable $dir must contain the
+# full path name of this file's directory.
+
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded pop3d::udb  1.1   [list source [file join $dir pop3d_udb.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.3]} {return}
+package ifneeded pop3d       1.1.0 [list source [file join $dir pop3d.tcl]]
+package ifneeded pop3d::dbox 1.0.2 [list source [file join $dir pop3d_dbox.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3d/pop3d.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3d/pop3d.tcl
new file mode 100644
index 00000000..fe67150f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3d/pop3d.tcl
@@ -0,0 +1,1147 @@
+# pop3d.tcl --
+#
+#	Implementation of a pop3 server for Tcl.
+#
+# Copyright (c) 2002-2009 by Andreas Kupries
+# Copyright (c) 2005      by Reinhard Max (-socket option)
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require md5  ; # tcllib | APOP
+package require mime ; # tcllib | storage callback
+package require log  ; # tcllib | tracing
+
+package provide pop3d 1.1.0
+
+namespace eval ::pop3d {
+    # Data storage in the pop3d module
+    # -------------------------------
+    #
+    # There's a number of bits to keep track of for each server and
+    # connection managed by it.
+    #
+    #   port
+    #	callbacks
+    #	connections
+    #	connection state
+    #   server state
+    #
+    # It would quickly become unwieldy to try to keep these in arrays or lists
+    # within the pop3d namespace itself.  Instead, each pop3 server will
+    # get its own namespace.  Each namespace contains:
+    #
+    # port    - port to listen on
+    # sock    - listening socket
+    # authCmd - authentication callback
+    # storCmd - storage callback
+    # sockCmd - command prefix for opening the server socket
+    # state   - state of the server (up, down, exiting)
+    # conn    - map : sock -> state array
+    # counter - counter for state arrays
+    #
+    # Per connection in a server its own state array 'connXXX'.
+    #
+    # id         - unique id for the connection (APOP)
+    # state      - state of connection       (auth, trans, update, fail)
+    # name       - user for that connection
+    # storage    - storage ref for that user
+    # logon      - authentication method     (empty, apop, user)
+    # deleted    - list of deleted messages
+    # msg        - number of messages in storage
+    # remotehost - name of remote host for connection
+    # remoteport - remote port for connection
+
+    # counter is used to give a unique name for unnamed server
+    variable counter 0
+
+    # commands is the list of subcommands recognized by the server
+    variable commands [list	\
+	    "cget"		\
+	    "configure"		\
+	    "destroy"		\
+	    "down"		\
+	    "up"		\
+	    ]
+
+    variable version [package present pop3d]
+    variable server  "tcllib/pop3d-$version"
+
+    variable cmdMap ; array set cmdMap {
+	CAPA H_capa
+	USER H_user
+	PASS H_pass
+	APOP H_apop
+	STAT H_stat
+	DELE H_dele
+	RETR H_retr
+	TOP  H_top
+	QUIT H_quit
+	NOOP H_noop
+	RSET H_rset
+	LIST H_list
+    }
+
+    # Capabilities to be reported by the CAPA command. The list
+    # contains pairs of capability strings and the connection state in
+    # which they are reported. The state can be "auth", "trans", or
+    # "both".
+    variable capabilities \
+	[list \
+	     USER			both \
+	     PIPELINING			both \
+	     "IMPLEMENTATION $server"	trans \
+	    ]
+    
+    # -- UIDL -- not implemented --
+
+    # Only export one command, the one used to instantiate a new server
+    namespace export new
+}
+
+# ::pop3d::new --
+#
+#	Create a new pop3 server with a given name; if no name is given, use
+#	pop3dX, where X is a number.
+#
+# Arguments:
+#	name	name of the pop3 server; if null, generate one.
+#
+# Results:
+#	name	name of the pop3 server created
+
+proc ::pop3d::new {{name ""}} {
+    variable counter
+    
+    if { [llength [info level 0]] == 1 } {
+	incr counter
+	set name "pop3d${counter}"
+    }
+
+    if { ![string equal [info commands ::$name] ""] } {
+	return -code error "command \"$name\" already exists, unable to create pop3 server"
+    }
+
+    # Set up the namespace
+    namespace eval ::pop3d::pop3d::$name {
+	variable port     110
+	variable trueport 110
+	variable sock     {}
+	variable sockCmd  ::socket
+	variable authCmd  {}
+	variable storCmd  {}
+	variable state    down
+	variable conn     ; array set conn {}
+	variable counter  0
+    }
+
+    # Create the command to manipulate the pop3 server
+    interp alias {} ::$name {} ::pop3d::Pop3dProc $name
+
+    return $name
+}
+
+##########################
+# Private functions follow
+
+# ::pop3d::Pop3dProc --
+#
+#	Command that processes all pop3 server object commands.
+#
+# Arguments:
+#	name	name of the pop3 server object to manipulate.
+#	args	command name and args for the command
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::pop3d::Pop3dProc {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error "wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+    
+    # Split the args into command and args components
+    if { [llength [info commands ::pop3d::_$cmd]] == 0 } {
+	variable commands
+	set optlist [join $commands ", "]
+	set optlist [linsert $optlist "end-1" "or"]
+	return -code error "bad option \"$cmd\": must be $optlist"
+    }
+    eval [list ::pop3d::_$cmd $name] $args
+}
+
+# ::pop3d::_up --
+#
+#	Start listening on the configured port.
+#
+# Arguments:
+#	name	name of the pop3 server.
+#
+# Results:
+#	None.
+
+proc ::pop3d::_up {name} {
+    upvar ::pop3d::pop3d::${name}::port     port
+    upvar ::pop3d::pop3d::${name}::trueport trueport
+    upvar ::pop3d::pop3d::${name}::state    state
+    upvar ::pop3d::pop3d::${name}::sockCmd  sockCmd
+    upvar ::pop3d::pop3d::${name}::sock     sock
+
+    log::log debug "pop3d $name up"
+    if {[string equal $state up]} {return}
+
+    log::log debug "pop3d $name listening, requested port $port"
+
+    set cmd $sockCmd
+    lappend cmd -server [list ::pop3d::HandleNewConnection $name] $port
+    #puts $cmd
+    set s [eval $cmd]
+    set trueport [lindex [fconfigure $s -sockname] 2]
+
+    ::log::log debug "pop3d $name listening on $trueport, socket $s ([fconfigure $s -sockname])"
+
+    set state up
+    set sock  $s
+    return
+}
+
+# ::pop3d::_down --
+#
+#	Stop listening on the configured port.
+#
+# Arguments:
+#	name	name of the pop3 server.
+#
+# Results:
+#	None.
+
+proc ::pop3d::_down {name} {
+    upvar ::pop3d::pop3d::${name}::state    state
+    upvar ::pop3d::pop3d::${name}::sock     sock
+    upvar ::pop3d::pop3d::${name}::trueport trueport
+    upvar ::pop3d::pop3d::${name}::port     port
+
+    # Ignore if server is down or exiting
+    if {![string equal $state up]} {return}
+
+    close $sock
+    set state down
+    set sock  {}
+
+    set trueport $port
+    return
+}
+
+# ::pop3d::_destroy --
+#
+#	Destroy a pop3 server.
+#
+# Arguments:
+#	name	name of the pop3 server.
+#	mode	destruction mode
+#
+# Results:
+#	None.
+
+proc ::pop3d::_destroy {name {mode kill}} {
+    upvar ::pop3d::pop3d::${name}::conn  conn
+
+    switch -exact -- $mode {
+	kill {
+	    _down $name
+	    foreach c [array names conn] {
+		CloseConnection $name $c
+	    }
+
+	    namespace delete ::pop3d::pop3d::$name
+	    interp alias {} ::$name {}
+	}
+	defer {
+	    if {[array size conn] > 0} {
+		upvar ::pop3d::pop3d::${name}::state state
+
+		_down $name
+		set state exiting
+		return
+	    }
+	    _destroy $name kill
+	    return
+	}
+	default {
+	    return -code error \
+		    "Illegal destruction mode \"$mode\":\
+		    Expected \"kill\", or \"defer\""
+	}
+    }
+    return
+}
+
+# ::pop3d::_cget --
+#
+#	Query option value
+#
+# Arguments:
+#	name	name of the pop3 server.
+#
+# Results:
+#	None.
+
+proc ::pop3d::_cget {name anoption} {
+    switch -exact -- $anoption {
+	-state {
+	    upvar ::pop3d::pop3d::${name}::state state
+	    return $state
+	}
+	-port {
+	    upvar ::pop3d::pop3d::${name}::trueport trueport
+	    return $trueport
+	}
+	-auth {
+	    upvar ::pop3d::pop3d::${name}::authCmd authCmd
+	    return $authCmd
+	}
+	-storage {
+	    upvar ::pop3d::pop3d::${name}::storCmd storCmd
+	    return $storCmd
+	}
+	-socket {
+	    upvar ::pop3d::pop3d::${name}::sockCmd sockCmd
+	    return $sockCmd
+	}
+	default {
+	    return -code error \
+		    "Unknown option \"$anoption\":\
+		    Expected \"-state\", \"-port\", \"-auth\", \"-socket\", or \"-storage\""
+	}
+    }
+    # return - in all branches
+}
+
+# ::pop3d::_configure --
+#
+#	Query and set option values
+#
+# Arguments:
+#	name	name of the pop3 server.
+#	args	options and option values
+#
+# Results:
+#	None.
+
+proc ::pop3d::_configure {name args} {
+    set argc [llength $args]
+    if {($argc > 1) && (($argc % 2) == 1)} {
+	return -code error \
+		"wrong # args, expected: -option | (-option value)..."
+    }
+    if {$argc == 1} {
+	return [_cget $name [lindex $args 0]]
+    }
+
+    upvar ::pop3d::pop3d::${name}::trueport trueport
+    upvar ::pop3d::pop3d::${name}::port     port
+    upvar ::pop3d::pop3d::${name}::authCmd  authCmd
+    upvar ::pop3d::pop3d::${name}::storCmd  storCmd
+    upvar ::pop3d::pop3d::${name}::sockCmd  sockCmd
+    upvar ::pop3d::pop3d::${name}::state    state
+
+    if {$argc == 0} {
+	# Return the full configuration.
+	return [list \
+		-port    $trueport \
+		-auth    $authCmd  \
+		-storage $storCmd  \
+		-socket  $sockCmd \
+		-state   $state \
+		]
+    }
+
+    while {[llength $args] > 0} {
+	set option [lindex $args 0]
+	set value  [lindex $args 1]
+	switch -exact -- $option {
+	    -auth    {set authCmd $value}
+	    -storage {set storCmd $value}
+	    -socket  {set sockCmd $value}
+	    -port    {
+		set port $value
+
+		# Propagate to the queried value if the server is down
+		# and thus has no real true port.
+
+		if {[string equal $state down]} {
+		    set trueport $value
+		}
+	    }
+	    -state {
+		return -code error "Option -state is read-only"
+	    }
+	    default {
+		return -code error \
+			"Unknown option \"$option\":\
+			Expected \"-port\", \"-auth\", \"-socket\", or \"-storage\""
+	    }
+	}
+	set args [lrange $args 2 end]
+    }
+    return ""
+}
+
+
+# ::pop3d::_conn --
+#
+#	Query connection state.
+#
+# Arguments:
+#	name	name of the pop3 server.
+#	cmd	subcommand to perform
+#	args	arguments for subcommand
+#
+# Results:
+#	Specific to subcommand
+
+proc ::pop3d::_conn {name cmd args} {
+    upvar ::pop3d::pop3d::${name}::conn    conn
+    switch -exact -- $cmd {
+	list {
+	    if {[llength $args] > 0} {
+		return -code error "wrong # args: should be \"$name conn list\""
+	    }
+	    return [array names conn]
+	}
+	state {
+	    if {[llength $args] != 1} {
+		return -code error "wrong # args: should be \"$name conn state connId\""
+	    }
+	    set sock [lindex $args 0]
+	    upvar $conn($sock) cstate
+	    return [array get  cstate]
+	}
+	default {
+	    return -code error "bad option \"$cmd\": must be list, or state"
+	}
+    }
+}
+
+##########################
+##########################
+# Server implementation.
+
+proc ::pop3d::HandleNewConnection {name sock rHost rPort} {
+    upvar ::pop3d::pop3d::${name}::conn    conn
+    upvar ::pop3d::pop3d::${name}::counter counter
+
+    set csa ::pop3d::pop3d::${name}::conn[incr counter]
+    set conn($sock) $csa
+    upvar $csa cstate
+
+    set cstate(remotehost) $rHost
+    set cstate(remoteport) $rPort
+    set cstate(server)     $name
+    set cstate(id)         "<[string map {- {}} [clock clicks]]_${name}_[pid]@[::info hostname]>"
+    set cstate(state)      "auth"
+    set cstate(name)       ""
+    set cstate(logon)      ""
+    set cstate(storage)    ""
+    set cstate(deleted)    ""
+    set cstate(msg)        0
+    set cstate(size)       0
+
+    ::log::log notice "pop3d $name $sock state auth, waiting for logon"
+
+    fconfigure $sock -buffering line -translation crlf -blocking 0
+
+    if {[catch {::pop3d::GreetPeer $name $sock} errmsg]} {
+	close $sock
+	log::log error "pop3d $name $sock greeting $errmsg"
+	unset cstate
+	unset conn($sock)
+	return
+    }
+
+    fileevent $sock readable [list ::pop3d::HandleCommand $name $sock]
+    return
+}
+
+proc ::pop3d::CloseConnection {name sock} {
+    upvar ::pop3d::pop3d::${name}::storCmd storCmd
+    upvar ::pop3d::pop3d::${name}::state   state
+    upvar ::pop3d::pop3d::${name}::conn    conn
+
+    upvar $conn($sock) cstate
+
+    # Kill a pending idle event for CloseConnection, we are closing now.
+    catch {after cancel $cstate(idlepending)}
+
+    ::log::log debug "pop3d $name $sock closing connection"
+
+    if {[catch {close $sock} msg]} {
+	::log::log error "pop3d $name $sock close: $msg"
+    }
+    if {$storCmd != {}} {
+	# remove possible lock set in storage facility.
+	if {[catch {
+	    uplevel #0 [linsert $storCmd end unlock $cstate(storage)]
+	} msg]} {
+	    ::log::log error "pop3d $name $sock storage unlock: $msg"
+	    # -W- future ? kill all connections, execute clean up of storage
+	    # -W-          facility.
+	}
+    }
+
+    unset cstate
+    unset conn($sock)
+
+    ::log::log notice "pop3d $name $sock closed"
+
+    if {[string equal $state existing] && ([array size conn] == 0)} {
+	_destroy $name
+    }
+    return
+}
+
+proc ::pop3d::HandleCommand {name sock} {
+    # @c Called by the event system after arrival of a new command for
+    # @c connection.
+
+    # @a sock:   Direct access to the channel representing the connection.
+    
+    # Client closed connection, bye bye
+    if {[eof $sock]} {
+	CloseConnection $name $sock
+	return
+    }
+
+    # line was incomplete, wait for more
+    if {[gets $sock line] < 0} {
+	return
+    }
+
+    upvar ::pop3d::pop3d::${name}::conn    conn
+    upvar $conn($sock)                   cstate
+    variable                             cmdMap
+
+    ::log::log info "pop3d $name $sock < $line"
+
+    set fail [catch {
+	set cmd [string toupper [lindex $line 0]]
+
+	if {![::info exists cmdMap($cmd)]} {
+	    # unknown command, use unknown handler
+
+	    HandleUnknownCmd $name $sock $cmd $line
+	} else {
+	    $cmdMap($cmd) $name $sock $cmd $line
+	}
+    } errmsg] ;#{}
+
+    if {$fail} {
+	# Had an error during handling of 'cmd'.
+	# Handled by closing the connection.
+	# (We do not know how to relay the internal error to the client)
+
+	::log::log error "pop3d $name $sock $cmd: $errmsg"
+	CloseConnection $name $sock
+    }
+    return
+}
+
+proc ::pop3d::GreetPeer {name sock} {
+    # @c Called after the initialization of a new connection. Writes the
+    # @c greeting to the new client. Overides the baseclass definition
+    # @c (<m server:GreetPeer>).
+    #
+    # @a conn: Descriptor of connection to write to.
+
+    upvar cstate cstate
+    variable server
+
+    log::log debug "pop3d $name $sock _ Greeting"
+
+    Respond2Client $name $sock +OK \
+	    "[::info hostname] $server ready $cstate(id)"
+    return
+}
+
+proc ::pop3d::HandleUnknownCmd {name sock cmd line} {
+    Respond2Client $name $sock -ERR "unknown command '$cmd'"
+    return
+}
+
+proc ::pop3d::Respond2Client {name sock ok wtext} {
+    ::log::log info "pop3d $name $sock > $ok $wtext"
+    puts $sock                          "$ok $wtext"
+    return
+}
+
+##########################
+##########################
+# Command implementations.
+
+proc ::pop3d::H_capa {name sock cmd line} {
+    # @c Handle CAPA command.
+
+    # Capabilities should better be configurable and handled per
+    # server object, so that e.g. USER/PASS authentication can be
+    # turned off.
+
+    upvar cstate cstate
+    variable capabilities
+
+    Respond2Client $name $sock +OK "Capability list follows"
+    foreach {capability state} $capabilities {
+	if {
+	    [string equal $state "both"] ||
+	    [string equal $state $cstate(state)]
+	} {
+	    puts $sock $capability
+	}
+    }
+    puts $sock .
+    return
+}
+
+proc ::pop3d::H_user {name sock cmd line} {
+    # @c Handle USER command.
+    #
+    # @a conn: Descriptor of connection to write to.
+    # @a cmd:  The sent command
+    # @a line: The sent line, with <a cmd> as first word.
+
+    # Called only in places where cstate is known!
+    upvar cstate cstate
+
+    if {[string equal $cstate(logon) apop]} {
+	Respond2Client $name $sock -ERR "login mechanism APOP was chosen"
+    } elseif {[string equal $cstate(state) trans]} {
+	Respond2Client $name $sock -ERR "client already authenticated"
+    } else {
+	# The user name is the first argument to the command
+
+	set cstate(name)  [lindex [split $line] 1]
+	set cstate(logon) user
+
+	Respond2Client $name $sock +OK "please send PASS command"
+    }
+    return
+}
+
+
+proc ::pop3d::H_pass {name sock cmd line} {
+    # @c Handle PASS command.
+    #
+    # @a conn: Descriptor of connection to write to.
+    # @a cmd:  The sent command
+    # @a line: The sent line, with <a cmd> as first word.
+
+    # Called only in places where cstate is known!
+    upvar cstate cstate
+
+    if {[string equal $cstate(logon) apop]} {
+	Respond2Client $name $sock -ERR "login mechanism APOP was chosen"
+    } elseif {[string equal $cstate(state) trans]} {
+	Respond2Client $name $sock -ERR "client already authenticated"
+    } else {
+	upvar ::pop3d::pop3d::${name}::authCmd authCmd
+
+	if {$authCmd == {}} {
+	    # No authentication is possible. Reject all users.
+	    CheckLogin $name $sock "" "" ""
+	    return
+	}
+
+	# The password is given as the first argument of the command
+
+	set pwd [lindex [split $line] 1]
+
+	if {![uplevel #0 [linsert $authCmd end exists $cstate(name)]]} {
+	    ::log::log warning "pop3d $name $sock $authCmd lookup $cstate(name) : user does not exist"
+	    CheckLogin $name $sock "" "" ""
+	    return
+	}
+	if {[catch {
+	    set info [uplevel #0 [linsert $authCmd end lookup $cstate(name)]]
+	} msg]} {
+	    ::log::log error "pop3d $name $sock $authCmd lookup $cstate(name) : $msg"
+	    CheckLogin $name $sock "" "" ""
+	    return
+	}
+	CheckLogin $name $sock $pwd [lindex $info 0] [lindex $info 1]
+    }
+    return
+}
+
+
+proc ::pop3d::H_apop {name sock cmd line} {
+    # @c Handle APOP command.
+    #
+    # @a conn: Descriptor of connection to write to.
+    # @a cmd:  The sent command
+    # @a line: The sent line, with <a cmd> as first word.
+
+    # Called only in places where cstate is known!
+    upvar cstate cstate
+
+    if {[string equal $cstate(logon) user]} {
+	Respond2Client $name $sock -ERR "login mechanism USER/PASS was chosen"
+	return
+    } elseif {[string equal $cstate(state) trans]} {
+	Respond2Client $name $sock -ERR "client already authenticated"
+	return
+    }
+
+    # The first two arguments to the command are user name and its
+    # response to the challenge set by the server.
+
+    set cstate(name)  [lindex $line 1]
+    set cstate(logon) apop
+
+    upvar ::pop3d::pop3d::${name}::authCmd authCmd
+
+    #log::log debug "authCmd|$authCmd|"
+
+    if {$authCmd == {}} {
+	# No authentication is possible. Reject all users.
+	CheckLogin $name $sock "" "" ""
+	return
+    }
+
+    set digest  [lindex $line 2]
+
+    if {![uplevel #0 [linsert $authCmd end exists $cstate(name)]]} {
+	::log::log warning "pop3d $name $sock $authCmd lookup $cstate(name) : user does not exist"
+	CheckLogin $name $sock "" "" ""
+	return
+    }
+    if {[catch {
+	set info [uplevel #0 [linsert $authCmd end lookup $cstate(name)]]
+    } msg]} {
+	::log::log error "pop3d $name $sock $authCmd lookup $cstate(name) : $msg"
+	CheckLogin $name $sock "" "" ""
+	return
+    }
+
+    set pwd     [lindex $info 0]
+    set storage [lindex $info 1]
+
+    ::log::log debug "pop3d $name $sock info = <$info>"
+
+    if {$storage == {}} {
+	# user does not exist, skip over digest computation
+	CheckLogin $name $sock "" "" $storage
+	return
+    }
+
+    # Do the same algorithm as the client to generate a digest, then
+    # compare our data with information sent by the client. As we are
+    # using tcl 8.x there is need to use channels, an immediate
+    # computation is possible.
+
+    set ourDigest [Md5 "$cstate(id)$pwd"]
+
+    ::log::log debug "pop3d $name $sock digest input <$cstate(id)$pwd>"
+    ::log::log debug "pop3d $name $sock digest outpt <$ourDigest>"
+    ::log::log debug "pop3d $name $sock digest given <$digest>"
+
+    CheckLogin $name $sock $digest $ourDigest $storage
+    return
+}
+
+
+proc ::pop3d::H_stat {name sock cmd line} {
+    # @c Handle STAT command.
+    #
+    # @a conn: Descriptor of connection to write to.
+    # @a cmd:  The sent command
+    # @a line: The sent line, with <a cmd> as first word.
+
+    # Called only in places where cstate is known!
+    upvar cstate cstate
+
+    if {[string equal $cstate(state) auth]} {
+	Respond2Client $name $sock -ERR "client not authenticated"
+    } else {
+	# Return number of messages waiting and size of the contents
+	# of the chosen maildrop in octects.
+	Respond2Client $name $sock +OK  "$cstate(msg) $cstate(size)"
+    }
+
+    return
+}
+
+
+proc ::pop3d::H_dele {name sock cmd line} {
+    # @c Handle DELE command.
+    #
+    # @a conn: Descriptor of connection to write to.
+    # @a cmd:  The sent command
+    # @a line: The sent line, with <a cmd> as first word.
+
+    # Called only in places where cstate is known!
+    upvar cstate cstate
+
+    if {[string equal $cstate(state) auth]} {
+	Respond2Client $name $sock -ERR "client not authenticated"
+	return
+    }
+
+    set msgid [lindex $line 1]
+
+    if {
+	($msgid < 1) ||
+	($msgid > $cstate(msg)) ||
+	([lsearch $msgid $cstate(deleted)] >= 0)
+    } {
+	Respond2Client $name $sock -ERR "no such message"
+    } else {
+	lappend cstate(deleted) $msgid
+	Respond2Client $name $sock +OK "message $msgid deleted"
+    }
+    return
+}
+
+
+proc ::pop3d::H_retr {name sock cmd line} {
+    # @c Handle RETR command.
+    #
+    # @a conn: Descriptor of connection to write to.
+    # @a cmd:  The sent command
+    # @a line: The sent line, with <a cmd> as first word.
+
+    # Called only in places where cstate is known!
+    upvar cstate cstate
+
+    if {[string equal $cstate(state) auth]} {
+	Respond2Client $name $sock -ERR "client not authenticated"
+	return
+    }
+
+    set msgid [lindex $line 1]
+
+    if {
+	($msgid > $cstate(msg)) ||
+	([lsearch $msgid $cstate(deleted)] >= 0)
+    } {
+	Respond2Client $name $sock -ERR "no such message"
+    } else {
+	Transfer $name $sock $msgid
+    }
+    return
+}
+
+
+proc ::pop3d::H_top  {name sock cmd line} {
+    # @c Handle RETR command.
+    #
+    # @a conn: Descriptor of connection to write to.
+    # @a cmd:  The sent command
+    # @a line: The sent line, with <a cmd> as first word.
+
+    # Called only in places where cstate is known!
+    upvar cstate cstate
+
+    if {[string equal $cstate(state) auth]} {
+	Respond2Client $name $sock -ERR "client not authenticated"
+	return
+    }
+
+    set msgid  [lindex $line 1]
+    set nlines [lindex $line 2]
+
+    if {
+	($msgid > $cstate(msg)) ||
+	([lsearch $msgid $cstate(deleted)] >= 0)
+    } {
+	Respond2Client $name $sock -ERR "no such message"
+    } elseif {$nlines == {}} {
+	Respond2Client $name $sock -ERR "missing argument: #lines to read"
+    } elseif {$nlines < 0} {
+	Respond2Client $name $sock -ERR \
+		"number of lines has to be greater than or equal to zero."
+    } elseif {$nlines == 0} {
+	# nlines == 0, no limit, same as H_retr
+	Transfer $name $sock $msgid
+    } else {
+	# nlines > 0
+	Transfer $name $sock $msgid $nlines
+    }
+    return
+}
+
+
+proc ::pop3d::H_quit {name sock cmd line} {
+    # @c Handle QUIT command.
+    #
+    # @a conn: Descriptor of connection to write to.
+    # @a cmd:  The sent command
+    # @a line: The sent line, with <a cmd> as first word.
+
+    # Called only in places where cstate is known!
+    upvar cstate cstate
+    variable server
+
+    set cstate(state) update
+
+    if {$cstate(deleted) != {}} {
+	upvar ::pop3d::pop3d::${name}::storCmd storCmd
+	if {$storCmd != {}} {
+	    uplevel #0 [linsert $storCmd end \
+		    dele $cstate(storage) $cstate(deleted)]
+	}
+    }
+
+    set cstate(idlepending) [after idle [list ::pop3d::CloseConnection $name $sock]]
+
+    Respond2Client $name $sock +OK \
+	    "[::info hostname] $server shutting down"
+    return
+}
+
+
+proc ::pop3d::H_noop {name sock cmd line} {
+    # @c Handle NOOP command.
+    #
+    # @a conn: Descriptor of connection to write to.
+    # @a cmd:  The sent command
+    # @a line: The sent line, with <a cmd> as first word.
+
+    # Called only in places where cstate is known!
+    upvar cstate cstate
+
+    if {[string equal $cstate(state) fail]} {
+	Respond2Client $name $sock -ERR "login failed, no actions possible"
+    } elseif {[string equal $cstate(state) auth]} {
+	Respond2Client $name $sock -ERR "client not authenticated"
+    } else {
+	Respond2Client $name $sock +OK ""
+    }
+    return
+}
+
+
+proc ::pop3d::H_rset {name sock cmd line} {
+    # @c Handle RSET command.
+    #
+    # @a conn: Descriptor of connection to write to.
+    # @a cmd:  The sent command
+    # @a line: The sent line, with <a cmd> as first word.
+
+    # Called only in places where cstate is known!
+    upvar cstate cstate
+
+    if {[string equal $cstate(state) fail]} {
+	Respond2Client $name $sock -ERR "login failed, no actions possible"
+    } elseif {[string equal $cstate(state) auth]} {
+	Respond2Client $name $sock -ERR "client not authenticated"
+    } else {
+	set cstate(deleted) ""
+
+	Respond2Client $name $sock +OK "$cstate(msg) messages waiting"
+    }
+    return
+}
+
+
+proc ::pop3d::H_list {name sock cmd line} {
+    # @c Handle LIST command. Generates scan listing
+    #
+    # @a conn: Descriptor of connection to write to.
+    # @a cmd:  The sent command
+    # @a line: The sent line, with <a cmd> as first word.
+
+    # Called only in places where cstate is known!
+    upvar cstate cstate
+
+    if {[string equal $cstate(state) fail]} {
+	Respond2Client $name $sock -ERR "login failed, no actions possible"
+	return
+    } elseif {[string equal $cstate(state) auth]} {
+	Respond2Client $name $sock -ERR "client not authenticated"
+	return
+    }
+
+    set msgid [lindex $line 1]
+
+    upvar ::pop3d::pop3d::${name}::storCmd storCmd
+
+    if {$msgid == {}} {
+	# full listing
+	Respond2Client $name $sock +OK "$cstate(msg) messages"
+
+	set n $cstate(msg)
+
+	for {set i 1} {$i <= $n} {incr i} {
+	    Respond2Client $name $sock $i \
+		    [uplevel #0 [linsert $storCmd end \
+		    size $cstate(storage) $i]]
+	}
+	puts $sock "."
+
+    } else {
+	# listing for specified message
+
+	if {
+	    ($msgid < 1) ||
+	    ($msgid > $cstate(msg)) ||
+	    ([lsearch $msgid $cstate(deleted)] >= 0)
+	}  {
+	    Respond2Client $name $sock -ERR "no such message"
+	    return
+	}
+
+	Respond2Client $name $sock +OK \
+		"$msgid [uplevel #0 [linsert $storCmd end \
+		size $cstate(storage) $msgid]]"
+	return
+    }
+}
+
+##########################
+##########################
+# Command helper commands.
+
+proc ::pop3d::CheckLogin {name sock clientid serverid storage} {
+    # @c Internal procedure. General code used by USER/PASS and
+    # @c APOP login mechanisms to verify the given user-id.
+    # @c Locks the mailbox in case of a match.
+    #
+    # @a conn:     Descriptor of connection to write to.
+    # @a clientid: Authentication code transmitted by client
+    # @a serverid: Authentication code calculated here.
+    # @a storage:  Handle of mailbox requested by client.
+
+    #log::log debug "CheckLogin|$name|$sock|$clientid|$serverid|$storage|"
+
+    upvar cstate cstate
+    upvar ::pop3d::pop3d::${name}::storCmd storCmd
+
+    set noStorage [expr {$storCmd == {}}]
+
+    if {$storage == {}} {
+	# The user given by the client has no storage, therefore it does
+	# not exist. React as if wrong password was given.
+
+	set cstate(state) auth
+	set cstate(logon) ""
+
+	::log::log notice "pop3d $name $sock state auth, no maildrop"
+	Respond2Client $name $sock -ERR "authentication failed, sorry"
+
+    } elseif {[string compare $clientid $serverid] != 0} {
+	# password/digest given by client dos not match
+
+	set cstate(state) auth
+	set cstate(logon) ""
+
+	::log::log notice "pop3d $name $sock state auth, secret does not match"
+	Respond2Client $name $sock -ERR "authentication failed, sorry"
+
+    } elseif {
+	!$noStorage &&
+	! [uplevel #0 [linsert $storCmd end lock $storage]]
+    } {
+	# maildrop is locked already (by someone else).
+
+	set cstate(state) auth
+	set cstate(logon) ""
+
+	::log::log notice "pop3d $name $sock state auth, maildrop already locked"
+	Respond2Client $name $sock -ERR \
+		"could not aquire lock for maildrop $cstate(name)"
+    } else {
+	# everything went fine. allow to proceed in session.
+
+	set cstate(storage) $storage
+	set cstate(state)   trans
+	set cstate(logon)   ""
+
+	set cstate(msg) 0
+	if {!$noStorage} {
+	    set cstate(msg) [uplevel #0 [linsert $storCmd end \
+		    stat $cstate(storage)]]
+	    set cstate(size) [uplevel #0 [linsert $storCmd end \
+		    size $cstate(storage)]]
+	}
+	
+	::log::log notice \
+		"pop3d $name $sock login $cstate(name) $storage $cstate(msg)"
+	::log::log notice "pop3d $name $sock state trans"
+
+	Respond2Client $name $sock +OK "congratulations"
+    }
+    return
+}
+
+proc ::pop3d::Transfer {name sock msgid {limit -1}} {
+    # We ask the storage for the mime token of the mail and use
+    # that to generate and copy the mail to the requestor.
+
+    upvar cstate cstate
+    upvar ::pop3d::pop3d::${name}::storCmd storCmd
+
+    if {$limit < 0} {
+	Respond2Client $name $sock +OK \
+		"[uplevel #0 [linsert $storCmd end \
+		size $cstate(storage) $msgid]] octets"
+    } else {
+	Respond2Client $name $sock +OK ""
+    }
+
+    set token [uplevel #0 [linsert $storCmd end get $cstate(storage) $msgid]]
+    
+    ::log::log debug "pop3d $name $sock transfering data ($token)"
+
+    if {$limit < 0} {
+	# Full transfer, we can use "copymessage" and avoid
+	# construction in memory (depending on source of token).
+
+	log::log debug "pop3d $name Transfer $msgid /full"
+
+	# We do "."-stuffing here. This is not in the scope of the
+	# MIME library we use, but a transport dependent thing.
+
+	set msg [string trimright [string map [list "\n." "\n.."] \
+				       [mime::buildmessage $token]] \n]
+	log::log debug "($msg)"
+	puts $sock $msg
+	puts $sock .
+
+    } else {
+	# As long as FR #531541 is not implemented we have to build
+	# the entire message in memory and then cut it down to the
+	# requested size. If limit was greater than the number of
+	# lines in the message we will get the terminating "."
+	# too. Using regsub we make sure that it is not present and
+	# reattach during the transfer. Otherwise we would have to use
+	# a regexp/if combo to decide wether to attach the terminator
+	# not.
+
+	set msg [split [mime::buildmessage $token] \n]
+	set i 0
+	incr limit -1
+	while {[lindex $msg $i] != {}} {
+	    incr i
+	    incr limit
+	}
+	# i now refers to the line separating header and body
+
+	regsub -- "\n\\.\n$" [string map [list "\n." "\n.."] [join [lrange $msg 0 $limit] \n]] {} data
+	puts $sock ${data}\n.
+    }
+    ::log::log debug "pop3d $name $sock transfer complete"
+    # response already sent.
+    return
+}
+
+set major [lindex [split [package require md5] .] 0]
+if {$::major < 2} {
+    proc ::pop3d::Md5 {text} {md5::md5 $text}
+} else {
+    proc ::pop3d::Md5 {text} {string tolower [md5::md5 -hex $text]}
+}
+unset major
+
+##########################
+# Module initialization
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3d/pop3d_dbox.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3d/pop3d_dbox.tcl
new file mode 100644
index 00000000..562a9066
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3d/pop3d_dbox.tcl
@@ -0,0 +1,485 @@
+# -*- tcl -*-
+# pop3d_dbox.tcl --
+#
+#	Implementation of a simple mailbox database for the pop3 server
+#       Each mailbox is a a directory in a base directory, with each mail
+#	a file in that directory. The mail file contains both headers and
+#	body of the mail.
+#
+# Copyright (c) 2002 by Andreas Kupries
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require mime ; # tcllib | mime token is result of "get".
+package require log  ; # tcllib | Logging package
+
+namespace eval ::pop3d::dbox {
+    # Data storage in the pop3d::dbox module
+    # -------------------------------------
+    # One array per object containing the db contents. Keyed by user name.
+    # And the information about the last file data was read from.
+
+    # counter is used to give a unique name for unnamed databases
+    variable counter 0
+
+    # commands is the list of subcommands recognized by the server
+    variable commands [list	\
+	    "add"	\
+	    "base"	\
+	    "dele"	\
+	    "destroy"   \
+	    "exists"	\
+	    "get"	\
+	    "list"	\
+	    "lock"	\
+	    "locked"	\
+	    "move"	\
+	    "remove"	\
+	    "size"	\
+	    "stat"	\
+	    "unlock"	\
+	    ]
+}
+
+
+# ::pop3d::dbox::new --
+#
+#	Create a new mailbox database with a given name;
+#	if no name is given, use
+#	p3dboxX, where X is a number.
+#
+# Arguments:
+#	name	name of the mailbox database; if null, generate one.
+#
+# Results:
+#	name	name of the mailbox database created
+
+proc ::pop3d::dbox::new {{name ""}} {
+    variable counter
+    
+    if { [llength [info level 0]] == 1 } {
+	incr counter
+	set name "p3dbox${counter}"
+    }
+
+    if { ![string equal [info commands ::$name] ""] } {
+	return -code error \
+		"command \"$name\" already exists,\
+		unable to create mailbox database"
+    }
+
+    # Set up the namespace
+    namespace eval ::pop3d::dbox::dbox::$name {
+	variable dir ""
+	variable state    ; array set state  {}
+	variable locked   ; array set locked {}
+	variable transfer ; array set transfer {}
+    }
+
+    # Create the command to manipulate the mailbox database
+    interp alias {} ::$name {} ::pop3d::dbox::DboxProc $name
+
+    return $name
+}
+
+##########################
+# Private functions follow
+
+# ::pop3d::dbox::DboxProc --
+#
+#	Command that processes all mailbox database object commands.
+#
+# Arguments:
+#	name	name of the mailbox database object to manipulate.
+#	args	command name and args for the command
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::pop3d::dbox::DboxProc {name {cmd ""} args} {
+
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error \
+		"wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+    
+    # Split the args into command and args components
+    if { [llength [info commands ::pop3d::dbox::_$cmd]] == 0 } {
+	variable commands
+	set optlist [join $commands ", "]
+	set optlist [linsert $optlist "end-1" "or"]
+	return -code error "bad option \"$cmd\": must be $optlist"
+    }
+    eval [list ::pop3d::dbox::_$cmd $name] $args
+}
+
+
+proc ::pop3d::dbox::_base {name base} {
+    # @c Constructor. Does some more checks on the given base directory.
+
+    # sanity checks
+    if {$base == {}} {
+	return -code error "directory not specified"
+    }
+    if {! [file exists      $base]} {
+	return -code error "base: \"$base\" does not exist"
+    }
+    if {! [file isdirectory $base]} {
+	return -code error "base: \"$base\" not a directory"
+    }
+    if {! [file readable    $base]} {
+	return -code error "base: \"$base\" not readable"
+    }
+    if {! [file writable    $base]} {
+	return -code error "base: \"$base\" not writable"
+    }
+
+    upvar ::pop3d::dbox::dbox::${name}::dir dir
+    set dir $base
+    return
+}
+
+
+# ::pop3d::dbox::_destroy --
+#
+#	Destroy a mail database, including its associated command and
+#	data storage.
+#
+# Arguments:
+#	name	Name of the database to destroy.
+#
+# Results:
+#	None.
+
+proc ::pop3d::dbox::_destroy {name} {
+    namespace delete ::pop3d::dbox::dbox::$name
+    interp alias {} ::$name {}
+    return
+}
+
+proc ::pop3d::dbox::_add {name mbox} {
+    # @c Create a mailbox with handle <a mbox>. The handle is used as the
+    # @c name of the directory to contain the mails too.
+    #
+    # @a mbox: Reference to the mailbox to be operated on.
+
+    set dir      [CheckDir $name]
+    set mboxpath [file join $dir $mbox]
+
+    if {[file exists $mboxpath]} {
+	return -code error "cannot add \"$mbox\", mailbox already in existence"
+    }
+
+    file mkdir $mboxpath
+    return
+}
+
+
+proc ::pop3d::dbox::_remove {name mbox} {
+    # @c Remove mailbox with handle <a mbox>. This will destroy all mails
+    # @c contained in it too.
+    #
+    # @a mbox: Reference to the mailbox to be operated on.
+
+    set dir      [CheckDir $name]
+    set mboxpath [file join $dir $mbox]
+
+    if {![file exists $mboxpath]} {
+	return -code error "cannot remove \"$mbox\", mailbox does not exist"
+    }
+
+    if {[_locked $name $mbox]} {
+	return -code error "cannot remove \"$mbox\", mailbox is locked"
+    }
+
+    file delete -force $mboxpath
+    return
+}
+
+
+proc ::pop3d::dbox::_move {name old new} {
+    # @c Change the handle of mailbox <a old> to <a new>.
+    #
+    # @a old: Reference to the mailbox to be operated on.
+    # @a new: New reference to the mailbox
+
+    set dir     [CheckDir $name]
+    set oldpath [file join $dir $old]
+    set newpath [file join $dir $new]
+
+    if {![file exists $oldpath]} {
+	return -code error "cannot move \"$old\", mailbox does not exist"
+    }
+    if {[file exists $newpath]} {
+	return -code error \
+		"cannot move \"$old\", destination \"$new\" already exists"
+    }
+
+    file rename -force $oldpath $newpath
+    return
+}
+
+
+proc ::pop3d::dbox::_list {name} {
+    # @c Lists known mailboxes in object.
+    # @r List of mailbox names.
+
+    set dir  [CheckDir $name]
+    set here [pwd]
+    cd $dir
+    set files [glob -nocomplain *]
+    cd $here
+
+    set res [list]
+    foreach f $files {
+	set mboxpath [file join $dir $f]
+	if {! [file isdirectory $mboxpath]} {continue}
+	if {! [file readable    $mboxpath]} {continue}
+	if {! [file writable    $mboxpath]} {continue}
+	lappend res $f
+    }
+    return $res
+}
+
+
+proc ::pop3d::dbox::_exists {name mbox} {
+    # @c Determines existence of mailbox <a mbox>.
+    # @a mbox: Reference to the mailbox to check for.
+    # @r 1 if the mailbox exists, 0 else.
+
+    set dir  [CheckDir $name]
+    set mbox [file join $dir $mbox]
+    return   [file exists    $mbox]
+}
+
+
+proc ::pop3d::dbox::_locked {name mbox} {
+    # @c Checks wether the specified mailbox is locked or not.
+    # @a mbox: Reference to the mailbox to check.
+    # @r 1 if the mailbox is locked, 0 else.
+
+    set     dir  [CheckDir $name]
+    set     mbox [file join $dir $mbox]
+
+    upvar ::pop3d::dbox::dbox::${name}::locked locked
+
+    return [::info exists locked($mbox)]
+}
+
+
+# -- interface to the pop server (storage callback) --
+
+proc ::pop3d::dbox::_lock {name mbox} {
+    # @c Locks the given mailbox, additionally stores a list of the
+    # @c available files in the manager state. All files (= messages)
+    # @c added to the mailbox after this operation will be ignored
+    # @c during the session.
+    #
+    # @a mbox: Reference to the mailbox to be locked.
+    # @r 1 if mailbox was locked sucessfully, 0 else.
+
+    # locked already ?
+    if {[_locked $name $mbox]} {
+	return 0
+    }
+
+    set dir [Check $name $mbox]
+
+    # Compute a list of message files residing in the mailbox directory
+
+    upvar ::pop3d::dbox::dbox::${name}::state  state
+    upvar ::pop3d::dbox::dbox::${name}::locked locked
+
+    set  state($dir)  [lsort [glob -nocomplain [file join $dir *]]]
+    set locked($dir) 1
+    return 1
+}
+
+
+proc ::pop3d::dbox::_unlock {name mbox} {
+    # @c A locked mailbox is unlocked, thereby made available
+    # @c to other sessions.
+    #
+    # @a mbox: Reference to the mailbox to be locked.
+
+    # not locked ?
+    if {![_locked $name $mbox]} {return}
+    set dir [Check $name $mbox]
+
+    upvar ::pop3d::dbox::dbox::${name}::state  state
+    upvar ::pop3d::dbox::dbox::${name}::locked locked
+
+    unset   state($dir)
+    unset  locked($dir)
+    return
+}
+
+
+proc ::pop3d::dbox::_stat {name mbox} {
+    # @c Determines the number of messages picked up by <m lock>.
+    # @c Will fail if the mailbox was not locked.
+    #
+    # @a mbox: Reference to the mailbox queried.
+    # @r The number of messages in the mailbox
+
+    set dir [Check $name $mbox]
+
+    if {![_locked $name $mbox]} {
+	return -code error "mailbox \"$mbox\" is not locked"
+    }
+
+    upvar ::pop3d::dbox::dbox::${name}::state  state
+
+    return  [llength $state($dir)]
+}
+
+
+proc ::pop3d::dbox::_size {name mbox {msgId {}}} {
+    # @c Determines the size of the specified message, in bytes.
+    #
+    # @a mbox: Reference to the mailbox to be operated on.
+    # @a msgId: Numerical index of the message to look at.
+    # @r size of the message in bytes.
+
+    log::log debug "$name size $mbox ($msgId)"
+
+    set dir [Check $name $mbox]
+
+    log::log debug "$name mbox dir = $dir"
+
+    upvar ::pop3d::dbox::dbox::${name}::state  state
+
+    if {$msgId == {}} {
+	log::log debug "$name size /full"
+
+	# Full size of the maildrop requested.
+	if {![info exists state($dir)]} {
+	    # No stat before size, assume that there are no messages
+	    # in the maildrop, which implies that the maildrop is
+	    # empty, i.e. of size 0.
+	    return 0
+	}
+
+	set n 0
+	set k [llength $state($dir)]
+	for {set id 0} {$id < $k} {incr id} {
+	    incr n [file size [lindex $state($dir) $id]]
+	}
+	return $n
+    }
+
+    if {
+	($msgId < 1) ||
+	(![info exists state($dir)]) ||
+	([llength $state($dir)] < $msgId)
+    } {
+	return -code error "id \"$msgId\" out of range"
+    }
+    incr msgId -1
+
+    ## log::log debug "$name msg mails = $state($dir)"
+    log::log debug "$name msg file = [lindex $state($dir) $msgId]"
+
+    return [file size [lindex $state($dir) $msgId]]
+}
+
+
+proc ::pop3d::dbox::_dele {name mbox msgList} {
+    # @c Deletes the specified messages from the mailbox. This should
+    # @c be followed by a <m unlock> as the state is not updated
+    # @c accordingly.
+    #
+    # @a mbox: Reference to the mailbox to be operated on.
+    # @a msgList: List of message ids.
+
+    set dir [Check $name $mbox]
+    if {[llength $msgList] == 0} {
+	return -code error "nothing to delete"
+    }
+
+    # @d The code assumes that the id's in the list were already
+    # @d checked against the maximal number of messages.
+
+    upvar ::pop3d::dbox::dbox::${name}::state  state
+
+    foreach msgId $msgList {
+	if {
+	    ($msgId < 1) ||
+	    (![info exists state($dir)]) ||
+	    ([llength $state($dir)] < $msgId)
+	} {
+	    return -code error "id \"$msgId\" out of range"
+	}
+    }
+    foreach msgId $msgList {
+	file delete [lindex $state($dir) [incr msgId -1]]
+    }
+
+    # the mailbox state is unusable now.
+    return
+}
+
+proc ::pop3d::dbox::_get {name mbox msgId} {
+    set dir [Check $name $mbox]
+
+    upvar ::pop3d::dbox::dbox::${name}::state  state
+
+    if {
+	($msgId < 1) ||
+	(![info exists state($dir)]) ||
+	([llength $state($dir)] < $msgId)
+    } {
+	return -code error "id \"$msgId\" out of range"
+    }
+    incr msgId -1
+
+    set mailfile [lindex $state($dir) $msgId]
+
+    set token [::mime::initialize -file $mailfile]
+    return $token
+}
+
+###########################
+###########################
+# Internal helper commands.
+
+proc ::pop3d::dbox::Check {name mbox} {
+    # @c Internal procedure. Used to map a mailbox handle
+    # @c to the directory containing the messages.
+    # @a mbox: Reference to the mailbox to be operated on.
+    # @r Path of directory holding the message files of the
+    # @r specified mailbox.
+
+    set dir      [CheckDir $name]
+    set mboxpath [file join $dir $mbox]
+
+    if {! [file exists      $mboxpath]} {
+	return -code error "\"$mbox\" does not exist"
+    }
+    if {! [file isdirectory $mboxpath]} {
+	return -code error "\"$mbox\" is not a directory"
+    }
+    if {! [file readable    $mboxpath]} {
+	return -code error "\"$mbox\" is not readable"
+    }
+    if {! [file writable    $mboxpath]} {
+	return -code error "\"$mbox\" is not writable"
+    }
+    return $mboxpath
+}
+
+proc ::pop3d::dbox::CheckDir {name} {
+    upvar ::pop3d::dbox::dbox::${name}::dir dir
+
+    if {$dir == {}} {
+	return -code error "base directory not specified"
+    }
+    return $dir
+}
+
+##########################
+# Module initialization
+
+package provide pop3d::dbox 1.0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3d/pop3d_udb.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3d/pop3d_udb.tcl
new file mode 100644
index 00000000..f6ad7100
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pop3d/pop3d_udb.tcl
@@ -0,0 +1,300 @@
+# -*- tcl -*-
+# pop3d_udb.tcl --
+#
+#	Implementation of a simple user database for the pop3 server
+#
+# Copyright (c) 2002 by Andreas Kupries
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+namespace eval ::pop3d::udb {
+    # Data storage in the pop3d::udb module
+    # -------------------------------------
+    # One array per object containing the db contents. Keyed by user name.
+    # And the information about the last file data was read from.
+
+    # counter is used to give a unique name for unnamed databases
+    variable counter 0
+
+    # commands is the list of subcommands recognized by the server
+    variable commands [list	\
+	    "add"		\
+	    "destroy"           \
+	    "exists"		\
+	    "lookup"		\
+	    "read"		\
+	    "remove"		\
+	    "rename"		\
+	    "save"		\
+	    "who"		\
+	    ]
+}
+
+
+# ::pop3d::udb::new --
+#
+#	Create a new user database with a given name; if no name is given, use
+#	p3udbX, where X is a number.
+#
+# Arguments:
+#	name	name of the user database; if null, generate one.
+#
+# Results:
+#	name	name of the user database created
+
+proc ::pop3d::udb::new {{name ""}} {
+    variable counter
+    
+    if { [llength [info level 0]] == 1 } {
+	incr counter
+	set name "p3udb${counter}"
+    }
+
+    if { ![string equal [info commands ::$name] ""] } {
+	return -code error \
+		"command \"$name\" already exists,\
+		unable to create user database"
+    }
+
+    # Set up the namespace
+    namespace eval ::pop3d::udb::udb::$name {
+	variable user     ;  array set user {}
+	variable lastfile ""
+    }
+
+    # Create the command to manipulate the user database
+    interp alias {} ::$name {} ::pop3d::udb::UdbProc $name
+
+    return $name
+}
+
+##########################
+# Private functions follow
+
+# ::pop3d::udb::UdbProc --
+#
+#	Command that processes all user database object commands.
+#
+# Arguments:
+#	name	name of the user database object to manipulate.
+#	args	command name and args for the command
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::pop3d::udb::UdbProc {name {cmd ""} args} {
+
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error \
+		"wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+    
+    # Split the args into command and args components
+    if { [llength [info commands ::pop3d::udb::_$cmd]] == 0 } {
+	variable commands
+	set optlist [join $commands ", "]
+	set optlist [linsert $optlist "end-1" "or"]
+	return -code error "bad option \"$cmd\": must be $optlist"
+    }
+    eval [list ::pop3d::udb::_$cmd $name] $args
+}
+
+
+# ::pop3d::udb::_destroy --
+#
+#	Destroy a user database, including its associated command and
+#	data storage.
+#
+# Arguments:
+#	name	Name of the database to destroy.
+#
+# Results:
+#	None.
+
+proc ::pop3d::udb::_destroy {name} {
+    namespace delete ::pop3d::udb::udb::$name
+    interp alias {} ::$name {}
+    return
+}
+
+
+proc ::pop3d::udb::_add {name usrName password storage} {
+    # @c Add the user <a usrName> to the database, together with its
+    # @c password and a storage reference. The latter is stored and passed
+    # @c through this system without interpretation of the given value.
+
+    # @a usrName:  The name of the user defined here.
+    # @a password: Password given to the user.
+    # @a storage:  symbolic reference to the maildrop of user <a usrName>.
+    # @a storage:  Usable for a storage system only.
+
+    if {$usrName  == {}} {return -code error "user specification missing"}
+    if {$password == {}} {return -code error "password not specified"}
+    if {$storage  == {}} {return -code error "storage location not defined"}
+
+    upvar ::pop3d::udb::udb::${name}::user user
+
+    set      user($usrName) [list $password $storage]
+    return
+}
+
+
+proc ::pop3d::udb::_remove {name usrName} {
+    # @c Remove the user <a usrName> from the database.
+    #
+    # @a usrName: The name of the user to remove.
+
+    if {$usrName == {}} {return -code error "user specification missing"}
+
+    upvar ::pop3d::udb::udb::${name}::user user
+
+    if {![::info exists user($usrName)]} {
+	return -code error "user \"$usrName\" not known"
+    }
+
+    unset user($usrName)
+    return
+}
+
+
+proc ::pop3d::udb::_rename {name usrName newName} {
+    # @c Renames user <a usrName> to <a newName>.
+    # @a usrName: The name of the user to rename.
+    # @a newName: The new name to give to the user
+
+    if {$usrName == {}} {return -code error "user specification missing"}
+    if {$newName == {}} {return -code error "user specification missing"}
+
+    upvar ::pop3d::udb::udb::${name}::user user
+
+    if {![::info exists user($usrName)]} {
+	return -code error "user \"$usrName\" not known"
+    }
+    if {[::info exists user($newName)]} {
+	return -code error "user \"$newName\" is known"
+    }
+
+    set data $user($usrName)
+    unset     user($usrName)
+
+    set user($newName) $data
+    return
+}
+
+
+proc ::pop3d::udb::_lookup {name usrName} {
+    # @c Query database for information about user <a usrName>.
+    # @c Overrides <m userdbBase:lookup>.
+    # @a usrName: Name of the user to query for.
+    # @r a 2-element list containing password and storage 
+    # @r reference for user <a usrName>, in this order.
+
+    upvar ::pop3d::udb::udb::${name}::user user
+
+    if {![::info exists user($usrName)]} {
+	return -code error "user \"$usrName\" not known"
+    }
+    return $user($usrName)
+}
+
+
+proc ::pop3d::udb::_exists {name usrName} {
+    # @c Determines wether user <a usrName> is registered or not.
+    # @a usrName:     The name of the user to check for.
+
+    upvar ::pop3d::udb::udb::${name}::user user
+
+    return [::info exists user($usrName)]
+}
+
+
+proc ::pop3d::udb::_who {name} {
+    # @c Determines the names of all registered users.
+    # @r A list containing the names of all registered users.
+
+    upvar ::pop3d::udb::udb::${name}::user user
+
+    return [array names user]
+}
+
+
+proc ::pop3d::udb::_save {name {file {}}} {
+    # @c Stores the current contents of the in-memory user database
+    # @c into the specified file.
+
+    # @a file: The name of the file to write to. If it is not specified, or
+    # @a file: as empty, the value of the member variable <v externalFile>
+    # @a file: is used instead.
+
+    # save operation: do a backup of the file, write new contents,
+    # restore backup in case of problems.
+
+    upvar ::pop3d::udb::udb::${name}::user user
+    upvar ::pop3d::udb::udb::${name}::lastfile lastfile
+
+    if {$file == {}} {
+	set file $lastfile
+    }
+    if {$file == {}} {
+	return -code error "No file known to save data into"
+    }
+
+    set tmp [file join [file dirname $file] [pid]]
+
+    set   f [open $tmp w]
+    puts $f "# -*- tcl -*-"
+    puts $f "# ----------- user authentication database -"
+    puts $f ""
+
+    foreach name [array names user] {
+	set password [lindex $user($name) 0]
+	set storage  [lindex $user($name) 1]
+
+	puts $f "\tadd [list $name] [list $password] [list $storage]"
+    }
+
+    puts  $f ""
+    close $f
+    
+    if {[file exists $file]} {
+	file rename -force $file $file.old
+    }
+    file rename -force $tmp $file
+    return
+}
+
+
+proc ::pop3d::udb::_read {name path} {
+    # @c Reads the contents of the specified <a path> into the in-memory
+    # @c database of users, passwords and storage references.
+
+    # @a path: The name of the file to read.
+
+    # @n The name of the file is remembered internally, and used by
+    # @n <m save> (if called without or empty argument).
+
+    upvar ::pop3d::udb::udb::${name}::user user
+    upvar ::pop3d::udb::udb::${name}::lastfile lastfile
+
+    if {$path == {}} {
+	return -code error "No file known to read from"
+    }
+
+    set lastfile $path
+
+    foreach key [array names user] {unset user($key)}
+
+    set ip [interp create -safe]
+    interp alias $ip add {} ::pop3d::udb::_add $name
+    $ip invokehidden -global source $path
+    interp delete $ip
+
+    return
+}
+
+##########################
+# Module initialization
+
+package provide pop3d::udb 1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/practcl/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/practcl/pkgIndex.tcl
new file mode 100644
index 00000000..4fcee9dc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/practcl/pkgIndex.tcl
@@ -0,0 +1,4 @@
+###
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+package ifneeded practcl 0.16.4 [list source [file join $dir practcl.tcl]]
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/practcl/practcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/practcl/practcl.tcl
new file mode 100644
index 00000000..1f1c4966
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/practcl/practcl.tcl
@@ -0,0 +1,8453 @@
+###
+# Amalgamated package for practcl
+# Do not edit directly, tweak the source in src/ and rerun
+# build.tcl
+###
+package require Tcl 8.6
+package provide practcl 0.16.4
+namespace eval ::practcl {}
+
+###
+# START: httpwget/wget.tcl
+###
+
+###
+# END: httpwget/wget.tcl
+###
+###
+# START: clay/clay.tcl
+###
+package provide clay 0.8.6
+namespace eval ::clay {
+}
+namespace eval ::clay {
+}
+set ::clay::trace 0
+if {[info commands ::cron::object_destroy] eq {}} {
+  # Provide a noop if we aren't running with the cron scheduler
+  namespace eval ::cron {}
+  proc ::cron::object_destroy args {}
+}
+proc ::clay::PROC {name arglist body {ninja {}}} {
+  if {[info commands $name] ne {}} return
+  proc $name $arglist $body
+  eval $ninja
+}
+if {[info commands ::PROC] eq {}} {
+  namespace eval ::clay { namespace export PROC }
+  namespace eval :: { namespace import ::clay::PROC }
+}
+proc ::clay::_ancestors {resultvar class} {
+  upvar 1 $resultvar result
+  if {$class in $result} {
+    return
+  }
+  lappend result $class
+  foreach aclass [::info class superclasses $class] {
+    _ancestors result $aclass
+  }
+}
+proc ::clay::ancestors {args} {
+  set result {}
+  set queue  {}
+  set metaclasses {}
+
+  foreach class $args {
+    set ancestors($class) {}
+    _ancestors ancestors($class) $class
+  }
+  foreach class [lreverse $args] {
+    foreach aclass $ancestors($class) {
+      if {$aclass in $result} continue
+      set skip 0
+      foreach bclass $args {
+        if {$class eq $bclass} continue
+        if {$aclass in $ancestors($bclass)} {
+          set skip 1
+          break
+        }
+      }
+      if {$skip} continue
+      lappend result $aclass
+    }
+  }
+  foreach class [lreverse $args] {
+    foreach aclass $ancestors($class) {
+      if {$aclass in $result} continue
+      lappend result $aclass
+    }
+  }
+  ###
+  # Screen out classes that do not participate in clay
+  # interactions
+  ###
+  set output {}
+  foreach {item} $result {
+    if {[catch {$item clay noop} err]} {
+      continue
+    }
+    lappend output $item
+  }
+  return $output
+}
+proc ::clay::args_to_dict args {
+  if {[llength $args]==1} {
+    return [lindex $args 0]
+  }
+  return $args
+}
+proc ::clay::args_to_options args {
+  set result {}
+  foreach {var val} [args_to_dict {*}$args] {
+    lappend result [string trim $var -:] $val
+  }
+  return $result
+}
+proc ::clay::dynamic_arguments {ensemble method arglist args} {
+  set idx 0
+  set len [llength $args]
+  if {$len > [llength $arglist]} {
+    ###
+    # Catch if the user supplies too many arguments
+    ###
+    set dargs 0
+    if {[lindex $arglist end] ni {args dictargs}} {
+      return -code error -level 2 "Usage: $ensemble $method [string trim [dynamic_wrongargs_message $arglist]]"
+    }
+  }
+  foreach argdef $arglist {
+    if {$argdef eq "args"} {
+      ###
+      # Perform args processing in the style of tcl
+      ###
+      uplevel 1 [list set args [lrange $args $idx end]]
+      break
+    }
+    if {$argdef eq "dictargs"} {
+      ###
+      # Perform args processing in the style of tcl
+      ###
+      uplevel 1 [list set args [lrange $args $idx end]]
+      ###
+      # Perform args processing in the style of clay
+      ###
+      set dictargs [::clay::args_to_options {*}[lrange $args $idx end]]
+      uplevel 1 [list set dictargs $dictargs]
+      break
+    }
+    if {$idx > $len} {
+      ###
+      # Catch if the user supplies too few arguments
+      ###
+      if {[llength $argdef]==1} {
+        return -code error -level 2 "Usage: $ensemble $method [string trim [dynamic_wrongargs_message $arglist]]"
+      } else {
+        uplevel 1 [list set [lindex $argdef 0] [lindex $argdef 1]]
+      }
+    } else {
+      uplevel 1 [list set [lindex $argdef 0] [lindex $args $idx]]
+    }
+    incr idx
+  }
+}
+proc ::clay::dynamic_wrongargs_message {arglist} {
+  set result ""
+  set dargs 0
+  foreach argdef $arglist {
+    if {$argdef in {args dictargs}} {
+      set dargs 1
+      break
+    }
+    if {[llength $argdef]==1} {
+      append result " $argdef"
+    } else {
+      append result " ?[lindex $argdef 0]?"
+    }
+  }
+  if { $dargs } {
+    append result " ?option value?..."
+  }
+  return $result
+}
+proc ::clay::is_dict { d } {
+  # is it a dict, or can it be treated like one?
+  if {[catch {::dict size $d} err]} {
+    #::set ::errorInfo {}
+    return 0
+  }
+  return 1
+}
+proc ::clay::is_null value {
+  return [expr {$value in {{} NULL}}]
+}
+proc ::clay::leaf args {
+  set marker [string index [lindex $args end] end]
+  set result [path {*}${args}]
+  if {$marker eq "/"} {
+    return $result
+  }
+  return [list {*}[lrange $result 0 end-1] [string trim [string trim [lindex $result end]] /]]
+}
+proc ::clay::K {a b} {set a}
+if {[info commands ::K] eq {}} {
+  namespace eval ::clay { namespace export K }
+  namespace eval :: { namespace import ::clay::K }
+}
+proc ::clay::noop args {}
+if {[info commands ::noop] eq {}} {
+  namespace eval ::clay { namespace export noop }
+  namespace eval :: { namespace import ::clay::noop }
+}
+proc ::clay::cleanup {} {
+  set count 0
+  if {![info exists ::clay::idle_destroy]} return
+  set objlist $::clay::idle_destroy
+  set ::clay::idle_destroy {}
+  foreach obj $objlist {
+    if {![catch {$obj destroy}]} {
+      incr count
+    }
+  }
+  return $count
+}
+proc ::clay::object_create {objname {class {}}} {
+  #if {$::clay::trace>0} {
+  #  puts [list $objname CREATE]
+  #}
+}
+proc ::clay::object_rename {object newname} {
+  if {$::clay::trace>0} {
+    puts [list $object RENAME -> $newname]
+  }
+}
+proc ::clay::object_destroy args {
+  if {![info exists ::clay::idle_destroy]} {
+    set ::clay::idle_destroy {}
+  }
+  foreach objname $args {
+    if {$::clay::trace>0} {
+      puts [list $objname DESTROY]
+    }
+    ::cron::object_destroy $objname
+    if {$objname in $::clay::idle_destroy} continue
+    lappend ::clay::idle_destroy $objname
+  }
+}
+proc ::clay::path args {
+  set result {}
+  foreach item $args {
+    set item [string trim $item :./]
+    foreach subitem [split $item /] {
+      lappend result [string trim ${subitem}]/
+    }
+  }
+  return $result
+}
+proc ::clay::putb {buffername args} {
+  upvar 1 $buffername buffer
+  switch [llength $args] {
+    1 {
+      append buffer [lindex $args 0] \n
+    }
+    2 {
+      append buffer [string map {*}$args] \n
+    }
+    default {
+      error "usage: putb buffername ?map? string"
+    }
+  }
+}
+if {[info command ::putb] eq {}} {
+  namespace eval ::clay { namespace export putb }
+  namespace eval :: { namespace import ::clay::putb }
+}
+proc ::clay::script_path {} {
+  set path [file dirname [file join [pwd] [info script]]]
+  return $path
+}
+proc ::clay::NSNormalize qualname {
+  if {![string match ::* $qualname]} {
+    set qualname ::clay::classes::$qualname
+  }
+  regsub -all {::+} $qualname "::"
+}
+proc ::clay::uuid_generate args {
+  return [uuid generate]
+}
+namespace eval ::clay {
+  variable option_class {}
+  variable core_classes {::oo::class ::oo::object}
+}
+package require Tcl 8.6 ;# try in pipeline.tcl. Possibly other things.
+if {[info commands irmmd5] eq {}} {
+  if {[catch {package require odielibc}]} {
+    package require md5 2
+  }
+}
+::namespace eval ::clay {
+}
+::namespace eval ::clay::classes {
+}
+::namespace eval ::clay::define {
+}
+::namespace eval ::clay::tree {
+}
+::namespace eval ::clay::dict {
+}
+::namespace eval ::clay::list {
+}
+::namespace eval ::clay::uuid {
+}
+if {![info exists ::clay::idle_destroy]} {
+  set ::clay::idle_destroy {}
+}
+namespace eval ::clay::uuid {
+    namespace export uuid
+}
+proc ::clay::uuid::generate_tcl_machinfo {} {
+  variable machinfo
+  if {[info exists machinfo]} {
+    return $machinfo
+  }
+  lappend machinfo [clock seconds]; # timestamp
+  lappend machinfo [clock clicks];  # system incrementing counter
+  lappend machinfo [info hostname]; # spatial unique id (poor)
+  lappend machinfo [pid];           # additional entropy
+  lappend machinfo [array get ::tcl_platform]
+
+  ###
+  # If we have /dev/urandom just stream 128 bits from that
+  ###
+  if {[file exists /dev/urandom]} {
+    set fin [open /dev/urandom r]
+    binary scan [read $fin 128] H* machinfo
+    close $fin
+  } elseif {[catch {package require nettool}]} {
+    # More spatial information -- better than hostname.
+    # bug 1150714: opening a server socket may raise a warning messagebox
+    #   with WinXP firewall, using ipconfig will return all IP addresses
+    #   including ipv6 ones if available. ipconfig is OK on win98+
+    if {[string equal $::tcl_platform(platform) "windows"]} {
+      catch {exec ipconfig} config
+      lappend machinfo $config
+    } else {
+      catch {
+          set s [socket -server void -myaddr [info hostname] 0]
+          ::clay::K [fconfigure $s -sockname] [close $s]
+      } r
+      lappend machinfo $r
+    }
+
+    if {[package provide Tk] != {}} {
+      lappend machinfo [winfo pointerxy .]
+      lappend machinfo [winfo id .]
+    }
+  } else {
+    ###
+    # If the nettool package works on this platform
+    # use the stream of hardware ids from it
+    ###
+    lappend machinfo {*}[::nettool::hwid_list]
+  }
+  return $machinfo
+}
+if {[info commands irmmd5] ne {}} {
+proc ::clay::uuid::generate {{type {}}} {
+    variable nextuuid
+    set s [irmmd5 "$type [incr nextuuid(type)] [generate_tcl_machinfo]"]
+    foreach {a b} {0 7 8 11 12 15 16 19 20 31} {
+         append r [string range $s $a $b] -
+     }
+     return [string tolower [string trimright $r -]]
+}
+proc ::clay::uuid::short {{type {}}} {
+  variable nextuuid
+  set r [irmmd5 "$type [incr nextuuid(type)] [generate_tcl_machinfo]"]
+  return [string range $r 0 16]
+}
+
+} else {
+package require md5 2
+proc ::clay::uuid::raw {{type {}}} {
+    variable nextuuid
+    set tok [md5::MD5Init]
+    md5::MD5Update $tok "$type [incr nextuuid($type)] [generate_tcl_machinfo]"
+    set r [md5::MD5Final $tok]
+    return $r
+    #return [::clay::uuid::tostring $r]
+}
+proc ::clay::uuid::generate {{type {}}} {
+    return [::clay::uuid::tostring [::clay::uuid::raw  $type]]
+}
+proc ::clay::uuid::short {{type {}}} {
+  set r [::clay::uuid::raw $type]
+  binary scan $r H* s
+  return [string range $s 0 16]
+}
+}
+proc ::clay::uuid::tostring {uuid} {
+    binary scan $uuid H* s
+    foreach {a b} {0 7 8 11 12 15 16 19 20 31} {
+        append r [string range $s $a $b] -
+    }
+    return [string tolower [string trimright $r -]]
+}
+proc ::clay::uuid::fromstring {uuid} {
+    return [binary format H* [string map {- {}} $uuid]]
+}
+proc ::clay::uuid::equal {left right} {
+    set l [fromstring $left]
+    set r [fromstring $right]
+    return [string equal $l $r]
+}
+proc ::clay::uuid {cmd args} {
+    switch -exact -- $cmd {
+        generate {
+           return [::clay::uuid::generate {*}$args]
+        }
+        short {
+          set uuid [::clay::uuid::short {*}$args]
+        }
+        equal {
+            tailcall ::clay::uuid::equal {*}$args
+        }
+        default {
+            return -code error "bad option \"$cmd\":\
+                must be generate or equal"
+        }
+    }
+}
+::clay::PROC ::tcl::dict::getnull {dictionary args} {
+  if {[exists $dictionary {*}$args]} {
+    get $dictionary {*}$args
+  }
+} {
+  namespace ensemble configure dict -map [dict replace\
+      [namespace ensemble configure dict -map] getnull ::tcl::dict::getnull]
+}
+::clay::PROC ::tcl::dict::is_dict { d } {
+  # is it a dict, or can it be treated like one?
+  if {[catch {dict size $d} err]} {
+    #::set ::errorInfo {}
+    return 0
+  }
+  return 1
+} {
+  namespace ensemble configure dict -map [dict replace\
+      [namespace ensemble configure dict -map] is_dict ::tcl::dict::is_dict]
+}
+::clay::PROC ::tcl::dict::rmerge {args} {
+  ::set result [dict create . {}]
+  # Merge b into a, and handle nested dicts appropriately
+  ::foreach b $args {
+    for { k v } $b {
+      ::set field [string trim $k :/]
+      if {![::clay::tree::is_branch $b $k]} {
+        # Element names that end in ":" are assumed to be literals
+        set result $k $v
+      } elseif { [exists $result $k] } {
+        # key exists in a and b?  let's see if both values are dicts
+        # both are dicts, so merge the dicts
+        if { [is_dict [get $result $k]] && [is_dict $v] } {
+          set result $k [rmerge [get $result $k] $v]
+        } else {
+          set result $k $v
+        }
+      } else {
+        set result $k $v
+      }
+    }
+  }
+  return $result
+} {
+  namespace ensemble configure dict -map [dict replace\
+      [namespace ensemble configure dict -map] rmerge ::tcl::dict::rmerge]
+}
+::clay::PROC ::clay::tree::is_branch { dict path } {
+  set field [lindex $path end]
+  if {[string index $field end] eq ":"} {
+    return 0
+  }
+  if {[string index $field 0] eq "."} {
+    return 0
+  }
+  if {[string index $field end] eq "/"} {
+    return 1
+  }
+  return [dict exists $dict {*}$path .]
+}
+::clay::PROC ::clay::tree::print {dict} {
+  ::set result {}
+  ::set level -1
+  ::clay::tree::_dictputb $level result $dict
+  return $result
+}
+::clay::PROC ::clay::tree::_dictputb {level varname dict} {
+  upvar 1 $varname result
+  incr level
+  dict for {field value} $dict {
+    if {$field eq "."} continue
+    if {[clay::tree::is_branch $dict $field]} {
+      putb result "[string repeat "  " $level]$field \{"
+      _dictputb $level result $value
+      putb result "[string repeat "  " $level]\}"
+    } else {
+      putb result "[string repeat "  " $level][list $field $value]"
+    }
+  }
+}
+proc ::clay::tree::sanitize {dict} {
+  ::set result {}
+  ::set level -1
+  ::clay::tree::_sanitizeb {} result $dict
+  return $result
+}
+proc ::clay::tree::_sanitizeb {path varname dict} {
+  upvar 1 $varname result
+  dict for {field value} $dict {
+    if {$field eq "."} continue
+    if {[clay::tree::is_branch $dict $field]} {
+      _sanitizeb [list {*}$path $field] result $value
+    } else {
+      dict set result {*}$path $field $value
+    }
+  }
+}
+proc ::clay::tree::storage {rawpath} {
+  set isleafvar 0
+  set path {}
+  set tail [string index $rawpath end]
+  foreach element $rawpath {
+    set items [split [string trim $element /] /]
+    foreach item $items {
+      if {$item eq {}} continue
+      lappend path $item
+    }
+  }
+  return $path
+}
+proc ::clay::tree::dictset {varname args} {
+  upvar 1 $varname result
+  if {[llength $args] < 2} {
+    error "Usage: ?path...? path value"
+  } elseif {[llength $args]==2} {
+    set rawpath [lindex $args 0]
+  } else {
+    set rawpath  [lrange $args 0 end-1]
+  }
+  set value [lindex $args end]
+  set path [storage $rawpath]
+  set dot .
+  set one {}
+  dict set result $dot $one
+  set dpath {}
+  foreach item [lrange $path 0 end-1] {
+    set field $item
+    lappend dpath [string trim $item /]
+    dict set result {*}$dpath $dot $one
+  }
+  set field [lindex $rawpath end]
+  set ext   [string index $field end]
+  if {$ext eq {:} || ![dict is_dict $value]} {
+    dict set result {*}$path $value
+    return
+  }
+  if {$ext eq {/} && ![dict exists $result {*}$path $dot]} {
+    dict set result {*}$path $dot $one
+  }
+  if {[dict exists $result {*}$path $dot]} {
+    dict set result {*}$path [::clay::tree::merge [dict get $result {*}$path] $value]
+    return
+  }
+  dict set result {*}$path $value
+}
+proc ::clay::tree::dictmerge {varname args} {
+  upvar 1 $varname result
+  set dot .
+  set one {}
+  dict set result $dot $one
+  foreach dict $args {
+    dict for {f v} $dict {
+      set field [string trim $f /]
+      set bbranch [clay::tree::is_branch $dict $f]
+      if {![dict exists $result $field]} {
+        dict set result $field $v
+        if {$bbranch} {
+          dict set result $field [clay::tree::merge $v]
+        } else {
+          dict set result $field $v
+        }
+      } elseif {[dict exists $result $field $dot]} {
+        if {$bbranch} {
+          dict set result $field [clay::tree::merge [dict get $result $field] $v]
+        } else {
+          dict set result $field $v
+        }
+      }
+    }
+  }
+  return $result
+}
+proc ::clay::tree::merge {args} {
+  ###
+  # The result of a merge is always a dict with branches
+  ###
+  set dot .
+  set one {}
+  dict set result $dot $one
+  set argument 0
+  foreach b $args {
+    # Merge b into a, and handle nested dicts appropriately
+    if {![dict is_dict $b]} {
+      error "Element $b is not a dictionary"
+    }
+    dict for { k v } $b {
+      if {$k eq $dot} {
+        dict set result $dot $one
+        continue
+      }
+      set bbranch [is_branch $b $k]
+      set field [string trim $k /]
+      if { ![dict exists $result $field] } {
+        if {$bbranch} {
+          dict set result $field [merge $v]
+        } else {
+          dict set result $field $v
+        }
+      } else {
+        set abranch [dict exists $result $field $dot]
+        if {$abranch && $bbranch} {
+          dict set result $field [merge [dict get $result $field] $v]
+        } else {
+          dict set result $field $v
+          if {$bbranch} {
+            dict set result $field $dot $one
+          }
+        }
+      }
+    }
+  }
+  return $result
+}
+::clay::PROC ::tcl::dict::isnull {dictionary args} {
+  if {![exists $dictionary {*}$args]} {return 1}
+  return [expr {[get $dictionary {*}$args] in {{} NULL null}}]
+} {
+  namespace ensemble configure dict -map [dict replace\
+      [namespace ensemble configure dict -map] isnull ::tcl::dict::isnull]
+}
+::clay::PROC ::clay::ladd {varname args} {
+  upvar 1 $varname var
+  if ![info exists var] {
+      set var {}
+  }
+  foreach item $args {
+    if {$item in $var} continue
+    lappend var $item
+  }
+  return $var
+}
+::clay::PROC ::clay::ldelete {varname args} {
+  upvar 1 $varname var
+  if ![info exists var] {
+      return
+  }
+  foreach item [lsort -unique $args] {
+    while {[set i [lsearch $var $item]]>=0} {
+      set var [lreplace $var $i $i]
+    }
+  }
+  return $var
+}
+::clay::PROC ::clay::lrandom list {
+  set len [llength $list]
+  set idx [expr int(rand()*$len)]
+  return [lindex $list $idx]
+}
+namespace eval ::dictargs {
+}
+if {[info commands ::dictargs::parse] eq {}} {
+  proc ::dictargs::parse {argdef argdict} {
+    set result {}
+    dict for {field info} $argdef {
+      if {![string is alnum [string index $field 0]]} {
+        error "$field is not a simple variable name"
+      }
+      upvar 1 $field _var
+      set aliases {}
+      if {[dict exists $argdict $field]} {
+        set _var [dict get $argdict $field]
+        continue
+      }
+      if {[dict exists $info aliases:]} {
+        set found 0
+        foreach {name} [dict get $info aliases:] {
+          if {[dict exists $argdict $name]} {
+            set _var [dict get $argdict $name]
+            set found 1
+            break
+          }
+        }
+        if {$found} continue
+      }
+      if {[dict exists $info default:]} {
+        set _var [dict get $info default:]
+        continue
+      }
+      set mandatory 1
+      if {[dict exists $info mandatory:]} {
+        set mandatory [dict get $info mandatory:]
+      }
+      if {$mandatory} {
+        error "$field is required"
+      }
+    }
+  }
+}
+proc ::dictargs::proc {name argspec body} {
+  set result {}
+  append result "::dictargs::parse \{$argspec\} \$args" \;
+  append result $body
+  uplevel 1 [list ::proc $name [list [list args [list dictargs $argspec]]] $result]
+}
+proc ::dictargs::method {name argspec body} {
+  set class [lindex [::info level -1] 1]
+  set result {}
+  append result "::dictargs::parse \{$argspec\} \$args" \;
+  append result $body
+  oo::define $class method $name [list [list args [list dictargs $argspec]]] $result
+}
+namespace eval ::clay::dialect {
+  namespace export create
+  foreach {flag test} {
+    tip470 {package vsatisfies [package provide Tcl] 8.7}
+  } {
+    if {![info exists ::clay::dialect::has($flag)]} {
+      set ::clay::dialect::has($flag) [eval $test]
+    }
+  }
+}
+proc ::clay::dialect::Push {class} {
+  ::variable class_stack
+  lappend class_stack $class
+}
+proc ::clay::dialect::Peek {} {
+  ::variable class_stack
+  return [lindex $class_stack end]
+}
+proc ::clay::dialect::Pop {} {
+  ::variable class_stack
+  set class_stack [lrange $class_stack 0 end-1]
+}
+if {$::clay::dialect::has(tip470)} {
+proc ::clay::dialect::current_class {} {
+  return [uplevel 1 self]
+}
+} else {
+proc ::clay::dialect::current_class {} {
+  tailcall Peek
+}
+}
+proc ::clay::dialect::create {name {parent ""}} {
+  variable has
+  set NSPACE [NSNormalize [uplevel 1 {namespace current}] $name]
+  ::namespace eval $NSPACE {::namespace eval define {}}
+  ###
+  # Build the "define" namespace
+  ###
+
+  if {$parent eq ""} {
+    ###
+    # With no "parent" language, begin with all of the keywords in
+    # oo::define
+    ###
+    foreach command [info commands ::oo::define::*] {
+      set procname [namespace tail $command]
+      interp alias {} ${NSPACE}::define::$procname {} \
+        ::clay::dialect::DefineThunk $procname
+    }
+    # Create an empty dynamic_methods proc
+    proc ${NSPACE}::dynamic_methods {class} {}
+    namespace eval $NSPACE {
+      ::namespace export dynamic_methods
+      ::namespace eval define {::namespace export *}
+    }
+    set ANCESTORS {}
+  } else {
+    ###
+    # If we have a parent language, that language already has the
+    # [oo::define] keywords as well as additional keywords and behaviors.
+    # We should begin with that
+    ###
+    set pnspace [NSNormalize [uplevel 1 {namespace current}] $parent]
+    apply [list parent {
+      ::namespace export dynamic_methods
+      ::namespace import -force ${parent}::dynamic_methods
+    } $NSPACE] $pnspace
+
+    apply [list parent {
+      ::namespace import -force ${parent}::define::*
+      ::namespace export *
+    } ${NSPACE}::define] $pnspace
+      set ANCESTORS [list ${pnspace}::object]
+  }
+  ###
+  # Build our dialect template functions
+  ###
+  proc ${NSPACE}::define {oclass args} [string map [list %NSPACE% $NSPACE] {
+  ###
+  # To facilitate library reloading, allow
+  # a dialect to create a class from DEFINE
+  ###
+  set class [::clay::dialect::NSNormalize [uplevel 1 {namespace current}] $oclass]
+    if {[info commands $class] eq {}} {
+      %NSPACE%::class create $class {*}${args}
+    } else {
+      ::clay::dialect::Define %NSPACE% $class {*}${args}
+    }
+}]
+  interp alias {} ${NSPACE}::define::current_class {} \
+    ::clay::dialect::current_class
+  interp alias {} ${NSPACE}::define::aliases {} \
+    ::clay::dialect::Aliases $NSPACE
+  interp alias {} ${NSPACE}::define::superclass {} \
+    ::clay::dialect::SuperClass $NSPACE
+
+  if {[info command ${NSPACE}::class] ne {}} {
+    ::rename ${NSPACE}::class {}
+  }
+  ###
+  # Build the metaclass for our language
+  ###
+  ::oo::class create ${NSPACE}::class {
+    superclass ::clay::dialect::MotherOfAllMetaClasses
+  }
+  # Wire up the create method to add in the extra argument we need; the
+  # MotherOfAllMetaClasses will know what to do with it.
+  ::oo::objdefine ${NSPACE}::class \
+    method create {name {definitionScript ""}} \
+      "next \$name [list ${NSPACE}::define] \$definitionScript"
+
+  ###
+  # Build the mother of all classes. Note that $ANCESTORS is already
+  # guaranteed to be a list in canonical form.
+  ###
+  uplevel #0 [string map [list %NSPACE% [list $NSPACE] %name% [list $name] %ANCESTORS% $ANCESTORS] {
+    %NSPACE%::class create %NSPACE%::object {
+     superclass %ANCESTORS%
+      # Put MOACish stuff in here
+    }
+  }]
+  if { "${NSPACE}::class" ni $::clay::dialect::core_classes } {
+    lappend ::clay::dialect::core_classes "${NSPACE}::class"
+  }
+  if { "${NSPACE}::object" ni $::clay::dialect::core_classes } {
+    lappend ::clay::dialect::core_classes "${NSPACE}::object"
+  }
+}
+proc ::clay::dialect::NSNormalize {namespace qualname} {
+  if {![string match ::* $qualname]} {
+    set qualname ${namespace}::$qualname
+  }
+  regsub -all {::+} $qualname "::"
+}
+proc ::clay::dialect::DefineThunk {target args} {
+  tailcall ::oo::define [Peek] $target {*}$args
+}
+proc ::clay::dialect::Canonical {namespace NSpace class} {
+  namespace upvar $namespace cname cname
+  #if {[string match ::* $class]} {
+  #  return $class
+  #}
+  if {[info exists cname($class)]} {
+    return $cname($class)
+  }
+  if {[info exists ::clay::dialect::cname($class)]} {
+    return $::clay::dialect::cname($class)
+  }
+  if {[info exists ::clay::dialect::cname(${NSpace}::${class})]} {
+    return $::clay::dialect::cname(${NSpace}::${class})
+  }
+  foreach item [list "${NSpace}::$class" "::$class"] {
+    if {[info commands $item] ne {}} {
+      return $item
+    }
+  }
+  return ${NSpace}::$class
+}
+proc ::clay::dialect::Define {namespace class args} {
+  Push $class
+  try {
+  	if {[llength $args]==1} {
+      namespace eval ${namespace}::define [lindex $args 0]
+    } else {
+      ${namespace}::define::[lindex $args 0] {*}[lrange $args 1 end]
+    }
+  	${namespace}::dynamic_methods $class
+  } finally {
+    Pop
+  }
+}
+proc ::clay::dialect::Aliases {namespace args} {
+  set class [Peek]
+  namespace upvar $namespace cname cname
+  set NSpace [join [lrange [split $class ::] 1 end-2] ::]
+  set cname($class) $class
+  foreach name $args {
+    set cname($name) $class
+    #set alias $name
+    set alias [NSNormalize $NSpace $name]
+    # Add a local metaclass reference
+    if {![info exists ::clay::dialect::cname($alias)]} {
+      lappend ::clay::dialect::aliases($class) $alias
+      ##
+      # Add a global reference, first come, first served
+      ##
+      set ::clay::dialect::cname($alias) $class
+    }
+  }
+}
+proc ::clay::dialect::SuperClass {namespace args} {
+  set class [Peek]
+  namespace upvar $namespace class_info class_info
+  dict set class_info($class) superclass 1
+  set ::clay::dialect::cname($class) $class
+  set NSpace [join [lrange [split $class ::] 1 end-2] ::]
+  set unique {}
+  foreach item $args {
+    set Item [Canonical $namespace $NSpace $item]
+    dict set unique $Item $item
+  }
+  set root ${namespace}::object
+  if {$class ne $root} {
+    dict set unique $root $root
+  }
+  tailcall ::oo::define $class superclass {*}[dict keys $unique]
+}
+if {[info command ::clay::dialect::MotherOfAllMetaClasses] eq {}} {
+::oo::class create ::clay::dialect::MotherOfAllMetaClasses {
+  superclass ::oo::class
+  constructor {define definitionScript} {
+    $define [self] {
+      superclass
+    }
+    $define [self] $definitionScript
+  }
+  method aliases {} {
+    if {[info exists ::clay::dialect::aliases([self])]} {
+      return $::clay::dialect::aliases([self])
+    }
+  }
+}
+}
+namespace eval ::clay::dialect {
+  variable core_classes {::oo::class ::oo::object}
+}
+::clay::dialect::create ::clay
+proc ::clay::dynamic_methods class {
+  foreach command [info commands [namespace current]::dynamic_methods_*] {
+    $command $class
+  }
+}
+proc ::clay::dynamic_methods_class {thisclass} {
+  set methods {}
+  set mdata [$thisclass clay find class_typemethod]
+  foreach {method info} $mdata {
+    if {$method eq {.}} continue
+    set method [string trimright $method :/-]
+    if {$method in $methods} continue
+    lappend methods $method
+    set arglist [dict getnull $info arglist]
+    set body    [dict getnull $info body]
+    ::oo::objdefine $thisclass method $method $arglist $body
+  }
+}
+proc ::clay::define::Array {name {values {}}} {
+  set class [current_class]
+  set name [string trim $name :/]
+  $class clay branch array $name
+  dict for {var val} $values {
+    $class clay set array/ $name $var $val
+  }
+}
+proc ::clay::define::Delegate {name info} {
+  set class [current_class]
+  foreach {field value} $info {
+    $class clay set component/ [string trim $name :/]/ $field $value
+  }
+}
+proc ::clay::define::constructor {arglist rawbody} {
+  set body {
+my variable DestroyEvent
+set DestroyEvent 0
+::clay::object_create [self] [info object class [self]]
+# Initialize public variables and options
+my InitializePublic
+  }
+  append body $rawbody
+  set class [current_class]
+  ::oo::define $class constructor $arglist $body
+}
+proc ::clay::define::Class_Method {name arglist body} {
+  set class [current_class]
+  $class clay set class_typemethod/ [string trim $name :/] [dict create arglist $arglist body $body]
+}
+proc ::clay::define::class_method {name arglist body} {
+  set class [current_class]
+  $class clay set class_typemethod/ [string trim $name :/] [dict create arglist $arglist body $body]
+}
+proc ::clay::define::clay {args} {
+  set class [current_class]
+  if {[lindex $args 0] in "cget set branch"} {
+    $class clay {*}$args
+  } else {
+    $class clay set {*}$args
+  }
+}
+proc ::clay::define::destructor rawbody {
+  set body {
+# Run the destructor once and only once
+set self [self]
+my variable DestroyEvent
+if {$DestroyEvent} return
+set DestroyEvent 1
+}
+  append body $rawbody
+  ::oo::define [current_class] destructor $body
+}
+proc ::clay::define::Dict {name {values {}}} {
+  set class [current_class]
+  set name [string trim $name :/]
+  $class clay branch dict $name
+  foreach {var val} $values {
+    $class clay set dict/ $name/ $var $val
+  }
+}
+proc ::clay::define::Option {name args} {
+  set class [current_class]
+  set dictargs {default {}}
+  foreach {var val} [::clay::args_to_dict {*}$args] {
+    dict set dictargs [string trim $var -:/] $val
+  }
+  set name [string trimleft $name -]
+
+  ###
+  # Option Class handling
+  ###
+  set optclass [dict getnull $dictargs class]
+  if {$optclass ne {}} {
+    foreach {f v} [$class clay find option_class $optclass] {
+      if {![dict exists $dictargs $f]} {
+        dict set dictargs $f $v
+      }
+    }
+    if {$optclass eq "variable"} {
+      variable $name [dict getnull $dictargs default]
+    }
+  }
+  foreach {f v} $dictargs {
+    $class clay set option $name $f $v
+  }
+}
+proc ::clay::define::Method {name argstyle argspec body} {
+  set class [current_class]
+  set result {}
+  switch $argstyle {
+    dictargs {
+      append result "::dictargs::parse \{$argspec\} \$args" \;
+    }
+  }
+  append result $body
+  oo::define $class method $name [list [list args [list dictargs $argspec]]] $result
+}
+proc ::clay::define::Option_Class {name args} {
+  set class [current_class]
+  set dictargs {default {}}
+  set name [string trimleft $name -:]
+  foreach {f v} [::clay::args_to_dict {*}$args] {
+    $class clay set option_class $name [string trim $f -/:] $v
+  }
+}
+proc ::clay::define::Variable {name {default {}}} {
+  set class [current_class]
+  set name [string trimright $name :/]
+  $class clay set variable/ $name $default
+}
+::namespace eval ::clay::define {
+}
+proc ::clay::ensemble_methodbody {ensemble einfo} {
+  set default standard
+  set preamble {}
+  set eswitch {}
+  set Ensemble [string totitle $ensemble]
+  if {$Ensemble eq "."} continue
+  foreach {msubmethod minfo} [lsort -dictionary -stride 2 $einfo] {
+    if {$msubmethod eq "."} continue
+    if {![dict exists $minfo body:]} {
+      continue
+    }
+    set submethod [string trim $msubmethod :/-]
+    if {$submethod eq "default"} {
+      set default [dict get $minfo body:]
+    } else {
+      dict set eswitch $submethod [dict get $minfo body:]
+    }
+    if {[dict exists $submethod aliases:]} {
+      foreach alias [dict get $minfo aliases:] {
+        if {![dict exists $eswitch $alias]} {
+          dict set eswitch $alias [dict get $minfo body:]
+        }
+      }
+    }
+  }
+  set methodlist [lsort -dictionary [dict keys $eswitch]]
+  if {![dict exists $eswitch <list>]} {
+    dict set eswitch <list> {return $methodlist}
+  }
+  if {$default eq "standard"} {
+    set default "error \"unknown method $ensemble \$method. Valid: \$methodlist\""
+  }
+  dict set eswitch default $default
+  set mbody {}
+  append mbody \n [list set methodlist $methodlist]
+  append mbody \n "switch -- \$method \{$eswitch\}" \n
+  return $mbody
+}
+::proc ::clay::define::Ensemble {rawmethod args} {
+  if {[llength $args]==2} {
+    lassign $args argspec body
+    set argstyle tcl
+  } elseif {[llength $args]==3} {
+    lassign $args argstyle argspec body
+  } else {
+    error "Usage: Ensemble name ?argstyle? argspec body"
+  }
+  set class [current_class]
+  #if {$::clay::trace>2} {
+  #  puts [list $class Ensemble $rawmethod $argspec $body]
+  #}
+  set mlist [split $rawmethod "::"]
+  set ensemble [string trim [lindex $mlist 0] :/]
+  set method   [string trim [lindex $mlist 2] :/]
+  if {[string index $method 0] eq "_"} {
+    $class clay set method_ensemble $ensemble $method $body
+    return
+  }
+  set realmethod  [string totitle $ensemble]_${method}
+  set realbody {}
+  if {$argstyle eq "dictargs"} {
+    append realbody "::dictargs::parse \{$argspec\} \$args" \n
+  }
+  if {[$class clay exists method_ensemble $ensemble _preamble]} {
+    append realbody [$class clay get method_ensemble $ensemble _preamble] \n
+  }
+  append realbody $body
+  if {$method eq "default"} {
+    $class clay set method_ensemble $ensemble $method: "tailcall my $realmethod \$method {*}\$args"
+    if {$argstyle eq "dictargs"} {
+      oo::define $class method $realmethod [list method [list args $argspec]] $realbody
+    } else {
+      oo::define $class method $realmethod [list method {*}$argspec] $realbody
+    }
+  } else {
+    $class clay set method_ensemble $ensemble $method: "tailcall my $realmethod {*}\$args"
+    if {$argstyle eq "dictargs"} {
+      oo::define $class method $realmethod [list [list args $argspec]] $realbody
+    } else {
+      oo::define $class method $realmethod $argspec $realbody
+    }
+  }
+  if {$::clay::trace>2} {
+    puts [list $class clay set method_ensemble/ $ensemble [string trim $method :/]  ...]
+  }
+}
+::oo::define ::clay::class {
+  method clay {submethod args} {
+    my variable clay
+    if {![info exists clay]} {
+      set clay {}
+    }
+    switch $submethod {
+      ancestors {
+        tailcall ::clay::ancestors [self]
+      }
+      branch {
+        set path [::clay::tree::storage $args]
+        if {![dict exists $clay {*}$path .]} {
+          dict set clay {*}$path . {}
+        }
+      }
+      exists {
+        if {![info exists clay]} {
+          return 0
+        }
+        set path [::clay::tree::storage $args]
+        if {[dict exists $clay {*}$path]} {
+          return 1
+        }
+        if {[dict exists $clay {*}[lrange $path 0 end-1] [lindex $path end]:]} {
+          return 1
+        }
+        return 0
+      }
+      dump {
+        return $clay
+      }
+      dget {
+         if {![info exists clay]} {
+          return {}
+        }
+        set path [::clay::tree::storage $args]
+        if {[dict exists $clay {*}$path]} {
+          return [dict get $clay {*}$path]
+        }
+        if {[dict exists $clay {*}[lrange $path 0 end-1] [lindex $path end]:]} {
+          return [dict get $clay {*}[lrange $path 0 end-1] [lindex $path end]:]
+        }
+        return {}
+      }
+      is_branch {
+        set path [::clay::tree::storage $args]
+        return [dict exists $clay {*}$path .]
+      }
+      getnull -
+      get {
+        if {![info exists clay]} {
+          return {}
+        }
+        set path [::clay::tree::storage $args]
+        if {[llength $path]==0} {
+          return $clay
+        }
+        if {[dict exists $clay {*}$path .]} {
+          return [::clay::tree::sanitize [dict get $clay {*}$path]]
+        }
+        if {[dict exists $clay {*}$path]} {
+          return [dict get $clay {*}$path]
+        }
+        if {[dict exists $clay {*}[lrange $path 0 end-1] [lindex $path end]:]} {
+          return [dict get $clay {*}[lrange $path 0 end-1] [lindex $path end]:]
+        }
+        return {}
+      }
+      find {
+        set path [::clay::tree::storage $args]
+        if {![info exists clay]} {
+          set clay {}
+        }
+        set clayorder [::clay::ancestors [self]]
+        set found 0
+        if {[llength $path]==0} {
+          set result [dict create . {}]
+          foreach class $clayorder {
+            ::clay::tree::dictmerge result [$class clay dump]
+          }
+          return [::clay::tree::sanitize $result]
+        }
+        foreach class $clayorder {
+          if {[$class clay exists {*}$path .]} {
+            # Found a branch break
+            set found 1
+            break
+          }
+          if {[$class clay exists {*}$path]} {
+            # Found a leaf. Return that value immediately
+            return [$class clay get {*}$path]
+          }
+          if {[dict exists $clay {*}[lrange $path 0 end-1] [lindex $path end]:]} {
+            return [dict get $clay {*}[lrange $path 0 end-1] [lindex $path end]:]
+          }
+        }
+        if {!$found} {
+          return {}
+        }
+        set result {}
+        # Leaf searches return one data field at a time
+        # Search in our local dict
+        # Search in the in our list of classes for an answer
+        foreach class [lreverse $clayorder] {
+          ::clay::tree::dictmerge result [$class clay dget {*}$path]
+        }
+        return [::clay::tree::sanitize $result]
+      }
+      merge {
+        foreach arg $args {
+          ::clay::tree::dictmerge clay {*}$arg
+        }
+      }
+      noop {
+        # Do nothing. Used as a sign of clay savviness
+      }
+      search {
+        foreach aclass [::clay::ancestors [self]] {
+          if {[$aclass clay exists {*}$args]} {
+            return [$aclass clay get {*}$args]
+          }
+        }
+      }
+      set {
+        ::clay::tree::dictset clay {*}$args
+      }
+      unset {
+        dict unset clay {*}$args
+      }
+      default {
+        dict $submethod clay {*}$args
+      }
+    }
+  }
+}
+::oo::define ::clay::object {
+  method clay {submethod args} {
+    my variable clay claycache clayorder config option_canonical
+    if {![info exists clay]} {set clay {}}
+    if {![info exists claycache]} {set claycache {}}
+    if {![info exists config]} {set config {}}
+    if {![info exists clayorder] || [llength $clayorder]==0} {
+      set clayorder {}
+      if {[dict exists $clay cascade]} {
+        dict for {f v} [dict get $clay cascade] {
+          if {$f eq "."} continue
+          if {[info commands $v] ne {}} {
+            lappend clayorder $v
+          }
+        }
+      }
+      lappend clayorder {*}[::clay::ancestors [info object class [self]] {*}[lreverse [info object mixins [self]]]]
+    }
+    switch $submethod {
+      ancestors {
+        return $clayorder
+      }
+      branch {
+        set path [::clay::tree::storage $args]
+        if {![dict exists $clay {*}$path .]} {
+          dict set clay {*}$path . {}
+        }
+      }
+      busy {
+        my variable clay_busy
+        if {[llength $args]} {
+          set clay_busy [string is true [lindex $args 0]]
+          set claycache {}
+        }
+        if {![info exists clay_busy]} {
+          set clay_busy 0
+        }
+        return $clay_busy
+      }
+      cache {
+        set path [lindex $args 0]
+        set value [lindex $args 1]
+        dict set claycache $path $value
+      }
+      cget {
+        # Leaf searches return one data field at a time
+        # Search in our local dict
+        if {[llength $args]==1} {
+          set field [string trim [lindex $args 0] -:/]
+          if {[info exists option_canonical($field)]} {
+            set field $option_canonical($field)
+          }
+          if {[dict exists $config $field]} {
+            return [dict get $config $field]
+          }
+        }
+        set path [::clay::tree::storage $args]
+        if {[dict exists $clay {*}$path]} {
+          return [dict get $clay {*}$path]
+        }
+        # Search in our local cache
+        if {[dict exists $claycache {*}$path]} {
+          if {[dict exists $claycache {*}$path .]} {
+            return [dict remove [dict get $claycache {*}$path] .]
+          } else {
+            return [dict get $claycache {*}$path]
+          }
+        }
+        # Search in the in our list of classes for an answer
+        foreach class $clayorder {
+          if {[$class clay exists {*}$path]} {
+            set value [$class clay get {*}$path]
+            dict set claycache {*}$path $value
+            return $value
+          }
+          if {[$class clay exists const {*}$path]} {
+            set value [$class clay get const {*}$path]
+            dict set claycache {*}$path $value
+            return $value
+          }
+          if {[$class clay exists option {*}$path default]} {
+            set value [$class clay get option {*}$path default]
+            dict set claycache {*}$path $value
+            return $value
+          }
+        }
+        return {}
+      }
+      delegate {
+        if {![dict exists $clay .delegate <class>]} {
+          dict set clay .delegate <class> [info object class [self]]
+        }
+        if {[llength $args]==0} {
+          return [dict get $clay .delegate]
+        }
+        if {[llength $args]==1} {
+          set stub <[string trim [lindex $args 0] <>]>
+          if {![dict exists $clay .delegate $stub]} {
+            return {}
+          }
+          return [dict get $clay .delegate $stub]
+        }
+        if {([llength $args] % 2)} {
+          error "Usage: delegate
+    OR
+    delegate stub
+    OR
+    delegate stub OBJECT ?stub OBJECT? ..."
+        }
+        foreach {stub object} $args {
+          set stub <[string trim $stub <>]>
+          dict set clay .delegate $stub $object
+          oo::objdefine [self] forward ${stub} $object
+          oo::objdefine [self] export ${stub}
+        }
+      }
+      dump {
+        # Do a full dump of clay data
+        set result {}
+        # Search in the in our list of classes for an answer
+        foreach class $clayorder {
+          ::clay::tree::dictmerge result [$class clay dump]
+        }
+        ::clay::tree::dictmerge result $clay
+        return $result
+      }
+      ensemble_map {
+        set path [::clay::tree::storage method_ensemble]
+        if {[dict exists $claycache {*}$path]} {
+          return [dict get $claycache {*}$path]
+        }
+        set emap {}
+        foreach class $clayorder {
+          if {![$class clay exists {*}$path .]} continue
+          dict for {ensemble einfo} [$class clay dget {*}$path] {
+            if {$ensemble eq "."} continue
+            dict for {method body} $einfo {
+              if {$method eq "."} continue
+              dict set emap $ensemble $method class: $class
+              dict set emap $ensemble $method body: $body
+            }
+          }
+        }
+        if {[dict exists $clay {*}$path]} {
+          dict for {ensemble einfo} [dict get $clay {*}$path] {
+            dict for {method body} $einfo {
+              if {$method eq "."} continue
+              dict set emap $ensemble $method class: $class
+              dict set emap $ensemble $method body: $body
+            }
+          }
+        }
+        dict set claycache {*}$path $emap
+        return $emap
+      }
+      eval {
+        set script [lindex $args 0]
+        set buffer {}
+        set thisline {}
+        foreach line [split $script \n] {
+          append thisline $line
+          if {![info complete $thisline]} {
+            append thisline \n
+            continue
+          }
+          set thisline [string trim $thisline]
+          if {[string index $thisline 0] eq "#"} continue
+          if {[string length $thisline]==0} continue
+          if {[lindex $thisline 0] eq "my"} {
+            # Line already calls out "my", accept verbatim
+            append buffer $thisline \n
+          } elseif {[string range $thisline 0 2] eq "::"} {
+            # Fully qualified commands accepted verbatim
+            append buffer $thisline \n
+          } elseif {
+            append buffer "my $thisline" \n
+          }
+          set thisline {}
+        }
+        eval $buffer
+      }
+      evolve -
+      initialize {
+        my InitializePublic
+      }
+      exists {
+        # Leaf searches return one data field at a time
+        # Search in our local dict
+        set path [::clay::tree::storage $args]
+        if {[dict exists $clay {*}$path]} {
+          return 1
+        }
+        # Search in our local cache
+        if {[dict exists $claycache {*}$path]} {
+          return 2
+        }
+        set count 2
+        # Search in the in our list of classes for an answer
+        foreach class $clayorder {
+          incr count
+          if {[$class clay exists {*}$path]} {
+            return $count
+          }
+        }
+        return 0
+      }
+      flush {
+        set claycache {}
+        set clayorder [::clay::ancestors [info object class [self]] {*}[lreverse [info object mixins [self]]]]
+      }
+      forward {
+        oo::objdefine [self] forward {*}$args
+      }
+      dget {
+        set path [::clay::tree::storage $args]
+        if {[llength $path]==0} {
+          # Do a full dump of clay data
+          set result {}
+          # Search in the in our list of classes for an answer
+          foreach class $clayorder {
+            ::clay::tree::dictmerge result [$class clay dump]
+          }
+          ::clay::tree::dictmerge result $clay
+          return $result
+        }
+        if {[dict exists $clay {*}$path] && ![dict exists $clay {*}$path .]} {
+          # Path is a leaf
+          return [dict get $clay {*}$path]
+        }
+        # Search in our local cache
+        if {[my clay search $path value isleaf]} {
+          return $value
+        }
+
+        set found 0
+        set branch [dict exists $clay {*}$path .]
+        foreach class $clayorder {
+          if {[$class clay exists {*}$path .]} {
+            set found 1
+            break
+          }
+          if {!$branch && [$class clay exists {*}$path]} {
+            set result [$class clay dget {*}$path]
+            my clay cache $path $result
+            return $result
+          }
+        }
+        # Path is a branch
+        set result [dict getnull $clay {*}$path]
+        foreach class $clayorder {
+          if {![$class clay exists {*}$path .]} continue
+          ::clay::tree::dictmerge result [$class clay dget {*}$path]
+        }
+        #if {[dict exists $clay {*}$path .]} {
+        #  ::clay::tree::dictmerge result
+        #}
+        my clay cache $path $result
+        return $result
+      }
+      getnull -
+      get {
+        set path [::clay::tree::storage $args]
+        if {[llength $path]==0} {
+          # Do a full dump of clay data
+          set result {}
+          # Search in the in our list of classes for an answer
+          foreach class $clayorder {
+            ::clay::tree::dictmerge result [$class clay dump]
+          }
+          ::clay::tree::dictmerge result $clay
+          return [::clay::tree::sanitize $result]
+        }
+        if {[dict exists $clay {*}$path] && ![dict exists $clay {*}$path .]} {
+          # Path is a leaf
+          return [dict get $clay {*}$path]
+        }
+        # Search in our local cache
+        if {[my clay search $path value isleaf]} {
+          if {!$isleaf} {
+            return [clay::tree::sanitize $value]
+          } else {
+            return $value
+          }
+        }
+        set found 0
+        set branch [dict exists $clay {*}$path .]
+        foreach class $clayorder {
+          if {[$class clay exists {*}$path .]} {
+            set found 1
+            break
+          }
+          if {!$branch && [$class clay exists {*}$path]} {
+            set result [$class clay dget {*}$path]
+            my clay cache $path $result
+            return $result
+          }
+        }
+        # Path is a branch
+        set result [dict getnull $clay {*}$path]
+        #foreach class [lreverse $clayorder] {
+        #  if {![$class clay exists {*}$path .]} continue
+        #  ::clay::tree::dictmerge result [$class clay dget {*}$path]
+        #}
+        foreach class $clayorder {
+          if {![$class clay exists {*}$path .]} continue
+          ::clay::tree::dictmerge result [$class clay dget {*}$path]
+        }
+        #if {[dict exists $clay {*}$path .]} {
+        #  ::clay::tree::dictmerge result [dict get $clay {*}$path]
+        #}
+        my clay cache $path $result
+        return [clay::tree::sanitize $result]
+      }
+      leaf {
+        # Leaf searches return one data field at a time
+        # Search in our local dict
+        set path [::clay::tree::storage $args]
+        if {[dict exists $clay {*}$path .]} {
+          return [clay::tree::sanitize [dict get $clay {*}$path]]
+        }
+        if {[dict exists $clay {*}$path]} {
+          return [dict get $clay {*}$path]
+        }
+        # Search in our local cache
+        if {[my clay search $path value isleaf]} {
+          if {!$isleaf} {
+            return [clay::tree::sanitize $value]
+          } else {
+            return $value
+          }
+        }
+        # Search in the in our list of classes for an answer
+        foreach class $clayorder {
+          if {[$class clay exists {*}$path]} {
+            set value [$class clay get {*}$path]
+            my clay cache $path $value
+            return $value
+          }
+        }
+      }
+      merge {
+        foreach arg $args {
+          ::clay::tree::dictmerge clay {*}$arg
+        }
+      }
+      mixin {
+        ###
+        # Mix in the class
+        ###
+        my clay flush
+        set prior  [info object mixins [self]]
+        set newmixin {}
+        foreach item $args {
+          lappend newmixin ::[string trimleft $item :]
+        }
+        set newmap $args
+        foreach class $prior {
+          if {$class ni $newmixin} {
+            set script [$class clay search mixin/ unmap-script]
+            if {[string length $script]} {
+              if {[catch $script err errdat]} {
+                puts stderr "[self] MIXIN ERROR POPPING $class:\n[dict get $errdat -errorinfo]"
+              }
+            }
+          }
+        }
+        ::oo::objdefine [self] mixin {*}$args
+        ###
+        # Build a compsite map of all ensembles defined by the object's current
+        # class as well as all of the classes being mixed in
+        ###
+        my InitializePublic
+        foreach class $newmixin {
+          if {$class ni $prior} {
+            set script [$class clay search mixin/ map-script]
+            if {[string length $script]} {
+              if {[catch $script err errdat]} {
+                puts stderr "[self] MIXIN ERROR PUSHING $class:\n[dict get $errdat -errorinfo]"
+              }
+            }
+          }
+        }
+        foreach class $newmixin {
+          set script [$class clay search mixin/ react-script]
+          if {[string length $script]} {
+            if {[catch $script err errdat]} {
+              puts stderr "[self] MIXIN ERROR PEEKING $class:\n[dict get $errdat -errorinfo]"
+            }
+            break
+          }
+        }
+      }
+      mixinmap {
+        if {![dict exists $clay .mixin]} {
+          dict set clay .mixin {}
+        }
+        if {[llength $args]==0} {
+          return [dict get $clay .mixin]
+        } elseif {[llength $args]==1} {
+          return [dict getnull $clay .mixin [lindex $args 0]]
+        } else {
+          dict for {slot classes} $args {
+            dict set clay .mixin $slot $classes
+          }
+          set classlist {}
+          dict for {item class} [dict get $clay .mixin] {
+            if {$class ne {}} {
+              lappend classlist $class
+            }
+          }
+          my clay mixin {*}[lreverse $classlist]
+        }
+      }
+      provenance {
+        if {[dict exists $clay {*}$args]} {
+          return self
+        }
+        foreach class $clayorder {
+          if {[$class clay exists {*}$args]} {
+            return $class
+          }
+        }
+        return {}
+      }
+      refcount {
+        my variable refcount
+        if {![info exists refcount]} {
+          return 0
+        }
+        return $refcount
+      }
+      refcount_incr {
+        my variable refcount
+        incr refcount
+      }
+      refcount_decr {
+        my variable refcount
+        incr refcount -1
+        if {$refcount <= 0} {
+          ::clay::object_destroy [self]
+        }
+      }
+      replace {
+        set clay [lindex $args 0]
+      }
+      search {
+        set path [lindex $args 0]
+        upvar 1 [lindex $args 1] value [lindex $args 2] isleaf
+        set isleaf [expr {![dict exists $claycache $path .]}]
+        if {[dict exists $claycache $path]} {
+          set value [dict get $claycache $path]
+          return 1
+        }
+        return 0
+      }
+      source {
+        source [lindex $args 0]
+      }
+      set {
+        #puts [list [self] clay SET {*}$args]
+        ::clay::tree::dictset clay {*}$args
+      }
+      default {
+        dict $submethod clay {*}$args
+      }
+    }
+  }
+  method InitializePublic {} {
+    my variable clayorder clay claycache config option_canonical clay_busy
+    if {[info exists clay_busy] && $clay_busy} {
+      # Avoid repeated calls to InitializePublic if we know that someone is
+      # going to invoke it at the end of whatever process is going on
+      return
+    }
+    set claycache {}
+    set clayorder [::clay::ancestors [info object class [self]] {*}[lreverse [info object mixins [self]]]]
+    if {![info exists clay]} {
+      set clay {}
+    }
+    if {![info exists config]} {
+      set config {}
+    }
+    dict for {var value} [my clay get variable] {
+      if { $var in {. clay} } continue
+      set var [string trim $var :/]
+      my variable $var
+      if {![info exists $var]} {
+        if {$::clay::trace>2} {puts [list initialize variable $var $value]}
+        set $var $value
+      }
+    }
+    dict for {var value} [my clay get dict/] {
+      if { $var in {. clay} } continue
+      set var [string trim $var :/]
+      my variable $var
+      if {![info exists $var]} {
+        set $var {}
+      }
+      foreach {f v} $value {
+        if {$f eq "."} continue
+        if {![dict exists ${var} $f]} {
+          if {$::clay::trace>2} {puts [list initialize dict $var $f $v]}
+          dict set ${var} $f $v
+        }
+      }
+    }
+    foreach {var value} [my clay get array/] {
+      if { $var in {. clay} } continue
+      set var [string trim $var :/]
+      if { $var eq {clay} } continue
+      my variable $var
+      if {![info exists $var]} { array set $var {} }
+      foreach {f v} $value {
+        if {![array exists ${var}($f)]} {
+          if {$f eq "."} continue
+          if {$::clay::trace>2} {puts [list initialize array $var\($f\) $v]}
+          set ${var}($f) $v
+        }
+      }
+    }
+    foreach {field info} [my clay get option/] {
+      if { $field in {. clay} } continue
+      set field [string trim $field -/:]
+      foreach alias [dict getnull $info aliases] {
+        set option_canonical($alias) $field
+      }
+      if {[dict exists $config $field]} continue
+      set getcmd [dict getnull $info default-command]
+      if {$getcmd ne {}} {
+        set value [{*}[string map [list %field% $field %self% [namespace which my]] $getcmd]]
+      } else {
+        set value [dict getnull $info default]
+      }
+      dict set config $field $value
+      set setcmd [dict getnull $info set-command]
+      if {$setcmd ne {}} {
+        {*}[string map [list %field% [list $field] %value% [list $value] %self% [namespace which my]] $setcmd]
+      }
+    }
+
+    foreach {ensemble einfo} [my clay ensemble_map] {
+      #if {[dict exists $einfo _body]} continue
+      if {$ensemble eq "."} continue
+      set body [::clay::ensemble_methodbody $ensemble $einfo]
+      if {$::clay::trace>2} {
+        set rawbody $body
+        set body {puts [list [self] <object> [self method]]}
+        append body \n $rawbody
+      }
+      oo::objdefine [self] method $ensemble {{method default} args} $body
+    }
+  }
+}
+::clay::object clay branch array
+::clay::object clay branch mixin
+::clay::object clay branch option
+::clay::object clay branch dict clay
+::clay::object clay set variable DestroyEvent 0
+proc ::clay::singleton {name script} {
+  if {[info commands $name] eq {}} {
+    ::clay::object create $name
+  }
+  oo::objdefine $name {
+method SingletonProcs {} {
+proc class class {
+  uplevel 1 "oo::objdefine \[self\] class $class"
+  my clay delegate class $class
+}
+proc clay args {
+  my clay {*}$args
+}
+proc Ensemble {rawmethod args} {
+  if {[llength $args]==2} {
+    lassign $args argspec body
+    set argstyle tcl
+  } elseif {[llength $args]==3} {
+    lassign $args argstyle argspec body
+  } else {
+    error "Usage: Ensemble name ?argstyle? argspec body"
+  }
+  set class [uplevel 1 self]
+  #if {$::clay::trace>2} {
+  #  puts [list $class Ensemble $rawmethod $argspec $body]
+  #}
+  set mlist [split $rawmethod "::"]
+  set ensemble [string trim [lindex $mlist 0] :/]
+  set method   [string trim [lindex $mlist 2] :/]
+  if {[string index $method 0] eq "_"} {
+    $class clay set method_ensemble $ensemble $method $body
+    return
+  }
+  set realmethod  [string totitle $ensemble]_${method}
+  set realbody {}
+  if {$argstyle eq "dictargs"} {
+    append realbody "::dictargs::parse \{$argspec\} \$args" \n
+  }
+  if {[$class clay exists method_ensemble $ensemble _preamble]} {
+    append realbody [$class clay get method_ensemble $ensemble _preamble] \n
+  }
+  append realbody $body
+  if {$method eq "default"} {
+    $class clay set method_ensemble $ensemble $method: "tailcall my $realmethod \$method {*}\$args"
+    if {$argstyle eq "dictargs"} {
+      oo::objdefine $class method $realmethod [list method [list args $argspec]] $realbody
+    } else {
+      oo::objdefine $class method $realmethod [list method {*}$argspec] $realbody
+    }
+  } else {
+    $class clay set method_ensemble $ensemble $method: "tailcall my $realmethod {*}\$args"
+    if {$argstyle eq "dictargs"} {
+      oo::objdefine $class method $realmethod [list [list args $argspec]] $realbody
+    } else {
+      oo::objdefine $class method $realmethod $argspec $realbody
+    }
+  }
+  if {$::clay::trace>2} {
+    puts [list $class clay set method_ensemble/ $ensemble [string trim $method :/]  ...]
+  }
+}
+proc method args {
+  uplevel 1 "oo::objdefine \[self\] method {*}$args"
+}
+}
+method script script {
+  my clay busy 1
+  my SingletonProcs
+  eval $script
+  my clay busy 0
+  my InitializePublic
+}
+}
+  $name script $script
+  return $name
+}
+namespace eval ::clay {
+  namespace export *
+}
+
+###
+# END: clay/clay.tcl
+###
+###
+# START: setup.tcl
+###
+package require TclOO
+set tcllib_path {}
+foreach path {.. ../.. ../../..} {
+  foreach path [glob -nocomplain [file join [file normalize $path] tcllib* modules]] {
+    set tclib_path $path
+    lappend ::auto_path $path
+    break
+  }
+  if {$tcllib_path ne {}} break
+}
+namespace eval ::practcl {
+}
+namespace eval ::practcl::OBJECT {
+}
+
+###
+# END: setup.tcl
+###
+###
+# START: doctool.tcl
+###
+namespace eval ::practcl {
+}
+proc ::practcl::cat fname {
+    if {![file exists $fname]} {
+       return
+    }
+    set fin [open $fname r]
+    set data [read $fin]
+    close $fin
+    return $data
+}
+proc ::practcl::docstrip text {
+  set result {}
+  foreach line [split $text \n] {
+    append thisline $line \n
+    if {![info complete $thisline]} continue
+    set outline $thisline
+    set thisline {}
+    if {[string trim $outline] eq {}} {
+      continue
+    }
+    if {[string index [string trim $outline] 0] eq "#"} continue
+    set cmd [string trim [lindex $outline 0] :]
+    if {$cmd eq "namespace" && [lindex $outline 1] eq "eval"} {
+      append result [list {*}[lrange $outline 0 end-1]] " " \{ \n [docstrip [lindex $outline end]]\} \n
+      continue
+    }
+    if {[string match "*::define" $cmd] && [llength $outline]==3} {
+      append result [list {*}[lrange $outline 0 end-1]] " " \{ \n [docstrip [lindex $outline end]]\} \n
+      continue
+    }
+    if {$cmd eq "oo::class" && [lindex $outline 1] eq "create"} {
+      append result [list {*}[lrange $outline 0 end-1]] " " \{ \n [docstrip [lindex $outline end]]\} \n
+      continue
+    }
+    append result $outline
+  }
+  return $result
+}
+proc ::putb {buffername args} {
+  upvar 1 $buffername buffer
+  switch [llength $args] {
+    1 {
+      append buffer [lindex $args 0] \n
+    }
+    2 {
+      append buffer [string map {*}$args] \n
+    }
+    default {
+      error "usage: putb buffername ?map? string"
+    }
+  }
+}
+::oo::class create ::practcl::doctool {
+  constructor {} {
+    my reset
+  }
+  method argspec {argspec} {
+    set result [dict create]
+    foreach arg $argspec {
+      set name [lindex $arg 0]
+      dict set result $name positional 1
+      dict set result $name mandatory  1
+      if {$name in {args dictargs}} {
+        switch [llength $arg] {
+          1 {
+            dict set result $name mandatory 0
+          }
+          2 {
+            dict for {optname optinfo} [lindex $arg 1] {
+              set optname [string trim $optname -:]
+              dict set result $optname {positional 1 mandatory 0}
+              dict for {f v} $optinfo {
+                dict set result $optname [string trim $f -:] $v
+              }
+            }
+          }
+          default {
+            error "Bad argument"
+          }
+        }
+      } else {
+        switch [llength $arg] {
+          1 {
+            dict set result $name mandatory 1
+          }
+          2 {
+            dict set result $name mandatory 0
+            dict set result $name default   [lindex $arg 1]
+          }
+          default {
+            error "Bad argument"
+          }
+        }
+      }
+    }
+    return $result
+  }
+  method comment block {
+    set count 0
+    set field description
+    set result [dict create description {}]
+    foreach line [split $block \n] {
+      set sline [string trim $line]
+      set fwidx [string first " " $sline]
+      if {$fwidx < 0} {
+        set firstword [string range $sline 0 end]
+        set restline {}
+      } else {
+        set firstword [string range $sline 0 [expr {$fwidx-1}]]
+        set restline [string range $sline [expr {$fwidx+1}] end]
+      }
+      if {[string index $firstword end] eq ":"} {
+        set field [string tolower [string trim $firstword -:]]
+        switch $field {
+          dictargs -
+          arglist {
+            set field argspec
+          }
+          desc {
+            set field description
+          }
+        }
+        if {[string length $restline]} {
+          dict append result $field "$restline\n"
+        }
+      } else {
+        dict append result $field "$line\n"
+      }
+    }
+    return $result
+  }
+  method keyword.Annotation {resultvar commentblock type name body} {
+    upvar 1 $resultvar result
+    set name [string trim $name :]
+    if {[dict exists $result $type $name]} {
+      set info [dict get $result $type $name]
+    } else {
+      set info [my comment $commentblock]
+    }
+    foreach {f v} $body {
+      dict set info $f $v
+    }
+    dict set result $type $name $info
+  }
+  method keyword.Class {resultvar commentblock name body} {
+    upvar 1 $resultvar result
+    set name [string trim $name :]
+    if {[dict exists $result class $name]} {
+      set info [dict get $result class $name]
+    } else {
+      set info [my comment $commentblock]
+    }
+    set commentblock {}
+    foreach line [split $body \n] {
+      append thisline $line \n
+      if {![info complete $thisline]} continue
+      set thisline [string trim $thisline]
+      if {[string index $thisline 0] eq "#"} {
+        append commentblock [string trimleft $thisline #] \n
+        set thisline {}
+        continue
+      }
+      set cmd [string trim [lindex $thisline 0] ":"]
+      switch $cmd {
+        Option -
+        option {
+          my keyword.Annotation info $commentblock option [lindex $thisline 1] [lindex $thisline 2]
+          set commentblock {}
+        }
+        variable -
+        Variable {
+          my keyword.Annotation info $commentblock variable [lindex $thisline 1] [list type scaler default [lindex $thisline 2]]
+          set commentblock {}
+        }
+        Dict -
+        Array {
+          set iinfo [lindex $thisline 2]
+          dict set iinfo type [string tolower $cmd]
+          my keyword.Annotation info $commentblock variable [lindex $thisline 1] $iinfo
+          set commentblock {}
+        }
+        Componant -
+        Delegate {
+          my keyword.Annotation info $commentblock delegate [lindex $thisline 1] [lindex $thisline 2]
+          set commentblock {}
+        }
+        method -
+        Ensemble {
+          my keyword.Class_Method info $commentblock  {*}[lrange $thisline 1 end-1]
+          set commentblock {}
+        }
+      }
+      set thisline {}
+    }
+    dict set result class $name $info
+  }
+  method keyword.class {resultvar commentblock name body} {
+    upvar 1 $resultvar result
+    set name [string trim $name :]
+    if {[dict exists $result class $name]} {
+      set info [dict get $result class $name]
+    } else {
+      set info [my comment $commentblock]
+    }
+    set commentblock {}
+    foreach line [split $body \n] {
+      append thisline $line \n
+      if {![info complete $thisline]} continue
+      set thisline [string trim $thisline]
+      if {[string index $thisline 0] eq "#"} {
+        append commentblock [string trimleft $thisline #] \n
+        set thisline {}
+        continue
+      }
+      set cmd [string trim [lindex $thisline 0] ":"]
+      switch $cmd {
+        Option -
+        option {
+          puts [list keyword.Annotation $cmd $thisline]
+          my keyword.Annotation info $commentblock option [lindex $thisline 1] [lindex $thisline 2]
+          set commentblock {}
+        }
+        variable -
+        Variable {
+          my keyword.Annotation info $commentblock variable [lindex $thisline 1] [list default [lindex $thisline 2]]
+          set commentblock {}
+        }
+        Dict -
+        Array {
+          set iinfo [lindex $thisline 2]
+          dict set iinfo type [string tolower $cmd]
+          my keyword.Annotation info $commentblock variable [lindex $thisline 1] $iinfo
+          set commentblock {}
+        }
+        Componant -
+        Delegate {
+          my keyword.Annotation info $commentblock delegate [lindex $thisline 1] [lindex $thisline 2]
+          set commentblock {}
+        }
+        superclass {
+          dict set info ancestors [lrange $thisline 1 end]
+          set commentblock {}
+        }
+        classmethod -
+        class_method -
+        Class_Method {
+          my keyword.Class_Method info $commentblock  {*}[lrange $thisline 1 end-1]
+          set commentblock {}
+        }
+        destructor -
+        constructor {
+          my keyword.method info $commentblock {*}[lrange $thisline 0 end-1]
+          set commentblock {}
+        }
+        method -
+        Ensemble {
+          my keyword.method info $commentblock  {*}[lrange $thisline 1 end-1]
+          set commentblock {}
+        }
+      }
+      set thisline {}
+    }
+    dict set result class $name $info
+  }
+  method keyword.Class_Method {resultvar commentblock name args} {
+    upvar 1 $resultvar result
+    set info [my comment $commentblock]
+    if {[dict exists $info show_body] && [dict get $info show_body]} {
+      dict set info internals [lindex $args end]
+    }
+    if {[dict exists $info ensemble]} {
+      dict for {method minfo} [dict get $info ensemble] {
+        dict set result Class_Method "${name} $method" $minfo
+      }
+    } else {
+      switch [llength $args] {
+        1 {
+          set argspec [lindex $args 0]
+        }
+        0 {
+          set argspec dictargs
+          #set body [lindex $args 0]
+        }
+        default {error "could not interpret method $name {*}$args"}
+      }
+      if {![dict exists $info argspec]} {
+        dict set info argspec [my argspec $argspec]
+      }
+      dict set result Class_Method [string trim $name :] $info
+    }
+  }
+  method keyword.method {resultvar commentblock name args} {
+    upvar 1 $resultvar result
+    set info [my comment $commentblock]
+    if {[dict exists $info show_body] && [dict get $info show_body]} {
+      dict set info internals [lindex $args end]
+    }
+    if {[dict exists $info ensemble]} {
+      dict for {method minfo} [dict get $info ensemble] {
+        dict set result method "\"${name} $method\"" $minfo
+      }
+    } else {
+      switch [llength $args] {
+        1 {
+          set argspec [lindex $args 0]
+        }
+        0 {
+          set argspec dictargs
+          #set body [lindex $args 0]
+        }
+        default {error "could not interpret method $name {*}$args"}
+      }
+      if {![dict exists $info argspec]} {
+        dict set info argspec [my argspec $argspec]
+      }
+      dict set result method "\"[split [string trim $name :] ::]\"" $info
+    }
+  }
+  method keyword.proc {commentblock name argspec} {
+    set info [my comment $commentblock]
+    if {![dict exists $info argspec]} {
+      dict set info argspec [my argspec $argspec]
+    }
+    return $info
+  }
+  method reset {} {
+    my variable coro
+    set coro [info object namespace [self]]::coro
+    oo::objdefine [self] forward coro $coro
+    if {[info command $coro] ne {}} {
+      rename $coro {}
+    }
+    coroutine $coro {*}[namespace code {my Main}]
+  }
+  method Main {} {
+
+    my variable info
+    set info [dict create]
+    yield [info coroutine]
+    set thisline {}
+    set commentblock {}
+    set linec 0
+    while 1 {
+      set line [yield]
+      append thisline $line \n
+      if {![info complete $thisline]} continue
+      set thisline [string trim $thisline]
+      if {[string index $thisline 0] eq "#"} {
+        append commentblock [string trimleft $thisline #] \n
+        set thisline {}
+        continue
+      }
+      set cmd [string trim [lindex $thisline 0] ":"]
+      switch $cmd {
+        dictargs::proc {
+          set procinfo [my keyword.proc $commentblock [lindex $thisline 1] [list args [list dictargs [lindex $thisline 2]]]]
+          if {[dict exists $procinfo show_body] && [dict get $procinfo show_body]} {
+            dict set procinfo internals [lindex $thisline end]
+          }
+          dict set info proc [string trim [lindex $thisline 1] :] $procinfo
+          set commentblock {}
+        }
+        tcllib::PROC -
+        PROC -
+        Proc -
+        proc {
+          set procinfo [my keyword.proc $commentblock {*}[lrange $thisline 1 2]]
+          if {[dict exists $procinfo show_body] && [dict get $procinfo show_body]} {
+            dict set procinfo internals [lindex $thisline end]
+          }
+          dict set info proc [string trim [lindex $thisline 1] :] $procinfo
+          set commentblock {}
+        }
+        oo::objdefine {
+          if {[llength $thisline]==3} {
+            lassign $thisline tcmd name body
+            my keyword.Class info $commentblock $name $body
+          } else {
+            puts "Warning: bare oo::define in library"
+          }
+        }
+        oo::define {
+          if {[llength $thisline]==3} {
+            lassign $thisline tcmd name body
+            my keyword.class info $commentblock $name $body
+          } else {
+            puts "Warning: bare oo::define in library"
+          }
+        }
+        tao::define -
+        clay::define -
+        tool::define {
+          lassign $thisline tcmd name body
+          my keyword.class info $commentblock $name $body
+          set commentblock {}
+        }
+        oo::class {
+          lassign $thisline tcmd mthd name body
+          my keyword.class info $commentblock $name $body
+          set commentblock {}
+        }
+        default {
+          if {[lindex [split $cmd ::] end] eq "define"} {
+            lassign $thisline tcmd name body
+            my keyword.class info $commentblock $name $body
+            set commentblock {}
+          }
+          set commentblock {}
+        }
+      }
+      set thisline {}
+    }
+  }
+  method section.method {keyword method minfo} {
+    set result {}
+    set line "\[call $keyword \[cmd $method\]"
+    if {[dict exists $minfo argspec]} {
+      dict for {argname arginfo} [dict get $minfo argspec] {
+        set positional 1
+        set mandatory  1
+        set repeating 0
+        dict with arginfo {}
+        if {$mandatory==0} {
+          append line " \[opt \""
+        } else {
+          append line " "
+        }
+        if {$positional} {
+          append line "\[arg $argname"
+        } else {
+          append line "\[option \"$argname"
+          if {[dict exists $arginfo type]} {
+            append line " \[emph [dict get $arginfo type]\]"
+          } else {
+            append line " \[emph value\]"
+          }
+          append line "\""
+        }
+        append line "\]"
+        if {$mandatory==0} {
+          if {[dict exists $arginfo default]} {
+            append line " \[const \"[dict get $arginfo default]\"\]"
+          }
+          append line "\"\]"
+        }
+        if {$repeating} {
+          append line " \[opt \[option \"$argname...\"\]\]"
+        }
+      }
+    }
+    append line \]
+    putb result $line
+    if {[dict exists $minfo description]} {
+      putb result [dict get $minfo description]
+    }
+    if {[dict exists $minfo example]} {
+      putb result "\[para\]Example: \[example [list [dict get $minfo example]]\]"
+    }
+    if {[dict exists $minfo internals]} {
+      putb result "\[para\]Internals: \[example [list [dict get $minfo internals]]\]"
+    }
+    return $result
+  }
+  method section.annotation {type name iinfo} {
+    set result "\[call $type \[cmd $name\]\]"
+    if {[dict exists $iinfo description]} {
+      putb result [dict get $iinfo description]
+    }
+    if {[dict exists $iinfo example]} {
+      putb result "\[para\]Example: \[example [list [dict get $minfo example]]\]"
+    }
+    return $result
+  }
+  method section.class {class_name class_info} {
+    set result {}
+    putb result "\[subsection \{Class  $class_name\}\]"
+    if {[dict exists $class_info ancestors]} {
+      set line "\[emph \"ancestors\"\]:"
+      foreach {c} [dict get $class_info ancestors] {
+        append line " \[class [string trim $c :]\]"
+      }
+      putb result $line
+      putb result {[para]}
+    }
+    dict for {f v} $class_info {
+      if {$f in {Class_Method method description ancestors example option variable delegate}} continue
+      putb result "\[emph \"$f\"\]: $v"
+      putb result {[para]}
+    }
+    if {[dict exists $class_info example]} {
+      putb result "\[example \{[list [dict get $class_info example]]\}\]"
+      putb result {[para]}
+    }
+    if {[dict exists $class_info description]} {
+      putb result [dict get $class_info description]
+      putb result {[para]}
+    }
+    dict for {f v} $class_info {
+      if {$f ni {option variable delegate}} continue
+      putb result "\[class \{[string totitle $f]\}\]"
+      #putb result "Methods on the class object itself."
+      putb result {[list_begin definitions]}
+      dict for {item iinfo} [dict get $class_info $f] {
+        putb result [my section.annotation $f $item $iinfo]
+      }
+      putb result {[list_end]}
+      putb result {[para]}
+    }
+    if {[dict exists $class_info Class_Method]} {
+      putb result "\[class \{Class Methods\}\]"
+      #putb result "Methods on the class object itself."
+      putb result {[list_begin definitions]}
+      dict for {method minfo} [dict get $class_info Class_Method] {
+        putb result [my section.method classmethod $method $minfo]
+      }
+      putb result {[list_end]}
+      putb result {[para]}
+    }
+    if {[dict exists $class_info method]} {
+      putb result "\[class {Methods}\]"
+      putb result {[list_begin definitions]}
+      dict for {method minfo} [dict get $class_info method] {
+        putb result [my section.method method $method $minfo]
+      }
+      putb result {[list_end]}
+      putb result {[para]}
+    }
+    return $result
+  }
+  method section.command {procinfo} {
+    set result {}
+    putb result "\[section \{Commands\}\]"
+    putb result {[list_begin definitions]}
+    dict for {method minfo} $procinfo {
+      putb result [my section.method proc $method $minfo]
+    }
+    putb result {[list_end]}
+    return $result
+  }
+  method manpage args {
+    my variable info
+    set map {%version% 0.0 %module% {Your_Module_Here}}
+    set result {}
+    set header {}
+    set footer {}
+    set authors {}
+    dict with args {}
+    dict set map %keyword% comment
+    putb result $map {[%keyword% {-*- tcl -*- doctools manpage}]
+[vset PACKAGE_VERSION %version%]
+[manpage_begin %module% n [vset PACKAGE_VERSION]]}
+    putb result $map $header
+
+    dict for {sec_type sec_info} $info {
+      switch $sec_type {
+        proc {
+          putb result [my section.command $sec_info]
+        }
+        class {
+          putb result "\[section Classes\]"
+          dict for {class_name class_info} $sec_info {
+            putb result [my section.class $class_name $class_info]
+          }
+        }
+        default {
+          putb result "\[section [list $sec_type $sec_name]\]"
+          if {[dict exists $sec_info description]} {
+            putb result [dict get $sec_info description]
+          }
+        }
+      }
+    }
+    if {[llength $authors]} {
+      putb result {[section AUTHORS]}
+      foreach {name email} $authors {
+        putb result "$name \[uri mailto:$email\]\[para\]"
+      }
+    }
+    putb result $footer
+    putb result {[manpage_end]}
+    return $result
+  }
+  method scan_text {text} {
+    my variable linecount coro
+    set linecount 0
+    foreach line [split $text \n] {
+      incr linecount
+      $coro $line
+    }
+  }
+  method scan_file {filename} {
+    my variable linecount coro
+    set fin [open $filename r]
+    set linecount 0
+    while {[gets $fin line]>=0} {
+      incr linecount
+      $coro $line
+    }
+    close $fin
+  }
+}
+
+###
+# END: doctool.tcl
+###
+###
+# START: buildutil.tcl
+###
+proc Proc {name arglist body} {
+  if {[info command $name] ne {}} return
+  proc $name $arglist $body
+}
+Proc ::noop args {}
+proc ::practcl::debug args {
+  #puts $args
+  ::practcl::cputs ::DEBUG_INFO $args
+}
+proc ::practcl::doexec args {
+  puts [list {*}$args]
+  exec {*}$args >&@ stdout
+}
+proc ::practcl::doexec_in {path args} {
+  set PWD [pwd]
+  cd $path
+  puts [list {*}$args]
+  exec {*}$args >&@ stdout
+  cd $PWD
+}
+proc ::practcl::dotclexec args {
+  puts [list [info nameofexecutable] {*}$args]
+  exec [info nameofexecutable] {*}$args >&@ stdout
+}
+proc ::practcl::domake {path args} {
+  set PWD [pwd]
+  cd $path
+  puts [list *** $path ***]
+  puts [list make {*}$args]
+  exec make {*}$args >&@ stdout
+  cd $PWD
+}
+proc ::practcl::domake.tcl {path args} {
+  set PWD [pwd]
+  cd $path
+  puts [list *** $path ***]
+  puts [list make.tcl {*}$args]
+  exec [info nameofexecutable] make.tcl {*}$args >&@ stdout
+  cd $PWD
+}
+proc ::practcl::fossil {path args} {
+  set PWD [pwd]
+  cd $path
+  puts [list {*}$args]
+  exec fossil {*}$args >&@ stdout
+  cd $PWD
+}
+proc ::practcl::fossil_status {dir} {
+  if {[info exists ::fosdat($dir)]} {
+    return $::fosdat($dir)
+  }
+  set result {
+tags experimental
+version {}
+  }
+  set pwd [pwd]
+  cd $dir
+  set info [exec fossil status]
+  cd $pwd
+  foreach line [split $info \n] {
+    if {[lindex $line 0] eq "checkout:"} {
+      set hash [lindex $line end-3]
+      set maxdate [lrange $line end-2 end-1]
+      dict set result hash $hash
+      dict set result maxdate $maxdate
+      regsub -all {[^0-9]} $maxdate {} isodate
+      dict set result isodate $isodate
+    }
+    if {[lindex $line 0] eq "tags:"} {
+      set tags [lrange $line 1 end]
+      dict set result tags $tags
+      break
+    }
+  }
+  set ::fosdat($dir) $result
+  return $result
+}
+proc ::practcl::os {} {
+  return [${::practcl::MAIN} define get TEACUP_OS]
+}
+proc ::practcl::mkzip {exename barekit vfspath} {
+  ::practcl::tcllib_require zipfile::mkzip
+  ::zipfile::mkzip::mkzip $exename -runtime $barekit -directory $vfspath
+}
+proc ::practcl::sort_dict list {
+  return [::lsort -stride 2 -dictionary $list]
+}
+if {[::package vcompare $::tcl_version 8.6] < 0} {
+  # Approximate ::zipfile::mkzip with exec calls
+  proc ::practcl::mkzip {exename barekit vfspath} {
+    set path [file dirname [file normalize $exename]]
+    set zipfile [file join $path [file rootname $exename].zip]
+    file copy -force $barekit $exename
+    set pwd [pwd]
+    cd $vfspath
+    exec zip -r $zipfile .
+    cd $pwd
+    set fout [open $exename a]
+    set fin [open $zipfile r]
+    chan configure $fout -translation binary
+    chan configure $fin -translation binary
+    chan copy $fin $fout
+    chan close $fin
+    chan close $fout
+    exec zip -A $exename
+  }
+  proc ::practcl::sort_dict list {
+    set result {}
+    foreach key [lsort -dictionary [dict keys $list]] {
+      dict set result $key [dict get $list $key]
+    }
+    return $result
+  }
+}
+proc ::practcl::local_os {} {
+  # If we have already run this command, return
+  # a cached copy of the data
+  if {[info exists ::practcl::LOCAL_INFO]} {
+    return $::practcl::LOCAL_INFO
+  }
+  set result [array get ::practcl::CONFIG]
+  dict set result TEACUP_PROFILE unknown
+  dict set result TEACUP_OS unknown
+  dict set result EXEEXT {}
+  set windows 0
+  if {$::tcl_platform(platform) eq "windows"} {
+    set windows 1
+  }
+  if {$windows} {
+    set system "windows"
+    set arch ix86
+    dict set result TEACUP_PROFILE win32-ix86
+    dict set result TEACUP_OS windows
+    dict set result EXEEXT .exe
+  } else {
+    set system [exec uname -s]-[exec uname -r]
+    set arch unknown
+    dict set result TEACUP_OS generic
+  }
+  dict set result TEA_PLATFORM $system
+  dict set result TEA_SYSTEM $system
+  if {[info exists ::SANDBOX]} {
+    dict set result sandbox $::SANDBOX
+  }
+  switch -glob $system {
+    Linux* {
+      dict set result TEACUP_OS linux
+      set arch [exec uname -m]
+      dict set result TEACUP_PROFILE "linux-glibc2.3-$arch"
+    }
+    GNU* {
+      set arch [exec uname -m]
+      dict set result TEACUP_OS "gnu"
+    }
+    NetBSD-Debian {
+      set arch [exec uname -m]
+      dict set result TEACUP_OS "netbsd-debian"
+    }
+    OpenBSD-* {
+      set arch [exec arch -s]
+      dict set result TEACUP_OS "openbsd"
+    }
+    Darwin* {
+      set arch [exec uname -m]
+      dict set result TEACUP_OS "macosx"
+      if {$arch eq "x86_64"} {
+        dict set result TEACUP_PROFILE "macosx10.5-i386-x86_84"
+      } else {
+        dict set result TEACUP_PROFILE "macosx-universal"
+      }
+    }
+    OpenBSD* {
+      set arch [exec arch -s]
+      dict set result TEACUP_OS "openbsd"
+    }
+  }
+  if {$arch eq "unknown"} {
+    catch {set arch [exec uname -m]}
+  }
+  switch -glob $arch {
+    i*86 {
+      set arch "ix86"
+    }
+    amd64 {
+      set arch "x86_64"
+    }
+  }
+  dict set result TEACUP_ARCH $arch
+  if {[dict get $result TEACUP_PROFILE] eq "unknown"} {
+    dict set result TEACUP_PROFILE [dict get $result TEACUP_OS]-$arch
+  }
+  set OS [dict get $result TEACUP_OS]
+  dict set result os $OS
+
+  # Look for a local preference file
+  set pathlist {}
+  set userhome [file normalize ~/tcl]
+  set local_install [file join $userhome lib]
+  switch $OS {
+    windows {
+      set userhome [file join [file normalize $::env(LOCALAPPDATA)] Tcl]
+      if {[file exists c:/Tcl/Teapot]} {
+        dict set result teapot c:/Tcl/Teapot
+      }
+    }
+    macosx {
+      set userhome [file join [file normalize {~/Library/Application Support/}] Tcl]
+      if {[file exists {~/Library/Application Support/ActiveState/Teapot/repository/}]} {
+        dict set result teapot [file normalize {~/Library/Application Support/ActiveState/Teapot/repository/}]
+      }
+      dict set result local_install [file normalize ~/Library/Tcl]
+      if {![dict exists $result sandbox]} {
+        dict set result sandbox       [file normalize ~/Library/Tcl/sandbox]
+      }
+    }
+    default {
+    }
+  }
+  dict set result userhome $userhome
+  # Load user preferences
+  if {[file exists [file join $userhome practcl.rc]]} {
+    set dat [::practcl::read_rc_file [file join $userhome practcl.rc]]
+    foreach {f v} $dat {
+      dict set result $f $v
+    }
+  }
+  if {![dict exists $result prefix]} {
+    dict set result prefix   $userhome
+  }
+
+  # Create a default path for the teapot
+  if {![dict exists $result teapot]} {
+    dict set result teapot [file join $userhome teapot]
+  }
+  # Create a default path for the local sandbox
+  if {![dict exists $result sandbox]} {
+    dict set result sandbox [file join $userhome sandbox]
+  }
+  # Create a default path for download folder
+  if {![dict exists $result download]} {
+    dict set result download [file join $userhome download]
+  }
+  # Path to install local packages
+  if {![dict exists $result local_install]} {
+    dict set result local_install [file join $userhome lib]
+  }
+  if {![dict exists result fossil_mirror] && [::info exists ::env(FOSSIL_MIRROR)]} {
+    dict set result fossil_mirror $::env(FOSSIL_MIRROR)
+  }
+
+  set ::practcl::LOCAL_INFO $result
+  return $result
+}
+proc ::practcl::config.tcl {path} {
+   return [read_configuration $path]
+}
+proc ::practcl::read_configuration {path} {
+  dict set result buildpath $path
+  set result [local_os]
+  set OS [dict get $result TEACUP_OS]
+  set windows 0
+  dict set result USEMSVC 0
+  if {[file exists [file join $path config.tcl]]} {
+    # We have a definitive configuration file. Read its content
+    # and take it as gospel
+    set cresult [read_rc_file [file join $path config.tcl]]
+    set cresult [::practcl::de_shell $cresult]
+    if {[dict exists $cresult srcdir] && ![dict exists $cresult sandbox]} {
+      dict set cresult sandbox  [file dirname [dict get $cresult srcdir]]
+    }
+    set result [dict merge $result [::practcl::de_shell $cresult]]
+  }
+  if {[file exists [file join $path config.site]]} {
+    # No config.tcl file is present but we do seed
+    dict set result USEMSVC 0
+    foreach {f v} [::practcl::de_shell [::practcl::read_sh_file [file join $path config.site]]] {
+      dict set result $f $v
+      dict set result XCOMPILE_${f} $v
+    }
+    dict set result CONFIG_SITE [file join $path config.site]
+    if {[dict exist $result XCOMPILE_CC] && [regexp mingw [dict get $result XCOMPILE_CC]]} {
+      set windows 1
+    }
+  } elseif {[info exists ::env(VisualStudioVersion)]} {
+    set windows 1
+    dict set result USEMSVC 1
+  }
+  if {$windows && [dict get $result TEACUP_OS] ne "windows"} {
+    if {![dict exists exists $result TEACUP_ARCH]} {
+      dict set result TEACUP_ARCH ix86
+    }
+    dict set result TEACUP_PROFILE win32-[dict get $result TEACUP_ARCH]
+    dict set result TEACUP_OS windows
+    dict set result EXEEXT .exe
+  }
+  return $result
+}
+if {$::tcl_platform(platform) eq "windows"} {
+proc ::practcl::msys_to_tclpath msyspath {
+  return [exec sh -c "cd $msyspath ; pwd -W"]
+}
+proc ::practcl::tcl_to_myspath tclpath {
+  set path [file normalize $tclpath]
+  return "/[string index $path 0][string range $path 2 end]"
+  #return [exec sh -c "cd $tclpath ; pwd"]
+}
+} else {
+proc ::practcl::msys_to_tclpath msyspath {
+  return [file normalize $msyspath]
+}
+proc ::practcl::tcl_to_myspath msyspath {
+  return [file normalize $msyspath]
+}
+}
+proc ::practcl::tcllib_require {pkg args} {
+  # Try to load the package from the local environment
+  if {[catch [list ::package require $pkg {*}$args] err]==0} {
+    return $err
+  }
+  ::practcl::LOCAL tool tcllib env-load
+  uplevel #0 [list ::package require $pkg {*}$args]
+}
+namespace eval ::practcl::platform {
+}
+proc ::practcl::platform::tcl_core_options {os} {
+  ###
+  # Download our required packages
+  ###
+  set tcl_config_opts {}
+  # Auto-guess options for the local operating system
+  switch $os {
+    windows {
+      #lappend tcl_config_opts --disable-stubs
+    }
+    linux {
+    }
+    macosx {
+      lappend tcl_config_opts --enable-corefoundation=yes  --enable-framework=no
+    }
+  }
+  lappend tcl_config_opts --with-tzdata --with-encoding utf-8
+  return $tcl_config_opts
+}
+proc ::practcl::platform::tk_core_options {os} {
+  ###
+  # Download our required packages
+  ###
+  set tk_config_opts {}
+
+  # Auto-guess options for the local operating system
+  switch $os {
+    windows {
+    }
+    linux {
+      lappend tk_config_opts --enable-xft=no --enable-xss=no
+    }
+    macosx {
+      lappend tk_config_opts --enable-aqua=yes
+    }
+  }
+  return $tk_config_opts
+}
+proc ::practcl::read_rc_file {filename {localdat {}}} {
+  set result $localdat
+  set fin [open $filename r]
+  set bufline {}
+  set rawcount 0
+  set linecount 0
+  while {[gets $fin thisline]>=0} {
+    incr rawcount
+    append bufline \n $thisline
+    if {![info complete $bufline]} continue
+    set line [string trimleft $bufline]
+    set bufline {}
+    if {[string index [string trimleft $line] 0] eq "#"} continue
+    append result \n $line
+    #incr linecount
+    #set key [lindex $line 0]
+    #set value [lindex $line 1]
+    #dict set result $key $value
+  }
+  close $fin
+  return $result
+}
+proc ::practcl::read_sh_subst {line info} {
+  regsub -all {\x28} $line \x7B line
+  regsub -all {\x29} $line \x7D line
+
+  #set line [string map $key [string trim $line]]
+  foreach {field value} $info {
+    catch {set $field $value}
+  }
+  if [catch {subst $line} result] {
+    return {}
+  }
+  set result [string trim $result]
+  return [string trim $result ']
+}
+proc ::practcl::read_sh_file {filename {localdat {}}} {
+  set fin [open $filename r]
+  set result {}
+  if {$localdat eq {}} {
+    set top 1
+    set local [array get ::env]
+    dict set local EXE {}
+  } else {
+    set top 0
+    set local $localdat
+  }
+  while {[gets $fin line] >= 0} {
+    set line [string trim $line]
+    if {[string index $line 0] eq "#"} continue
+    if {$line eq {}} continue
+    catch {
+    if {[string range $line 0 6] eq "export "} {
+      set eq [string first "=" $line]
+      set field [string trim [string range $line 6 [expr {$eq - 1}]]]
+      set value [read_sh_subst [string range $line [expr {$eq+1}] end] $local]
+      dict set result $field [read_sh_subst $value $local]
+      dict set local $field $value
+    } elseif {[string range $line 0 7] eq "include "} {
+      set subfile [read_sh_subst [string range $line 7 end] $local]
+      foreach {field value} [read_sh_file $subfile $local] {
+        dict set result $field $value
+      }
+    } else {
+      set eq [string first "=" $line]
+      if {$eq > 0} {
+        set field [read_sh_subst [string range $line 0 [expr {$eq - 1}]] $local]
+        set value [string trim [string range $line [expr {$eq+1}] end] ']
+        #set value [read_sh_subst [string range $line [expr {$eq+1}] end] $local]
+        dict set local $field $value
+        dict set result $field $value
+      }
+    }
+    } err opts
+    if {[dict get $opts -code] != 0} {
+      #puts $opts
+      puts "Error reading line:\n$line\nerr: $err\n***"
+      return $err {*}$opts
+    }
+  }
+  return $result
+}
+proc ::practcl::read_Config.sh filename {
+  set fin [open $filename r]
+  set result {}
+  set linecount 0
+  while {[gets $fin line] >= 0} {
+    set line [string trim $line]
+    if {[string index $line 0] eq "#"} continue
+    if {$line eq {}} continue
+    catch {
+      set eq [string first "=" $line]
+      if {$eq > 0} {
+        set field [string range $line 0 [expr {$eq - 1}]]
+        set value [string trim [string range $line [expr {$eq+1}] end] ']
+        #set value [read_sh_subst [string range $line [expr {$eq+1}] end] $local]
+        dict set result $field $value
+        incr $linecount
+      }
+    } err opts
+    if {[dict get $opts -code] != 0} {
+      #puts $opts
+      puts "Error reading line:\n$line\nerr: $err\n***"
+      return $err {*}$opts
+    }
+  }
+  return $result
+}
+proc ::practcl::read_Makefile filename {
+  set fin [open $filename r]
+  set result {}
+  while {[gets $fin line] >= 0} {
+    set line [string trim $line]
+    if {[string index $line 0] eq "#"} continue
+    if {$line eq {}} continue
+    catch {
+      set eq [string first "=" $line]
+      if {$eq > 0} {
+        set field [string trim [string range $line 0 [expr {$eq - 1}]]]
+        set value [string trim [string trim [string range $line [expr {$eq+1}] end] ']]
+        switch $field {
+          PKG_LIB_FILE {
+            dict set result libfile $value
+          }
+          srcdir {
+            if {$value eq "."} {
+              dict set result srcdir [file dirname $filename]
+            } else {
+              dict set result srcdir $value
+            }
+          }
+          PACKAGE_NAME {
+            dict set result name $value
+          }
+          PACKAGE_VERSION {
+            dict set result version $value
+          }
+          LIBS {
+            dict set result PRACTCL_LIBS $value
+          }
+          PKG_LIB_FILE {
+            dict set result libfile $value
+          }
+        }
+      }
+    } err opts
+    if {[dict get $opts -code] != 0} {
+      #puts $opts
+      puts "Error reading line:\n$line\nerr: $err\n***"
+      return $err {*}$opts
+    }
+    # the Compile field is about where most TEA files start getting silly
+    if {$field eq "compile"} {
+      break
+    }
+  }
+  return $result
+}
+proc ::practcl::cputs {varname args} {
+  upvar 1 $varname buffer
+  if {[llength $args]==1 && [string length [string trim [lindex $args 0]]] == 0} {
+
+  }
+  if {[info exist buffer]} {
+    if {[string index $buffer end] ne "\n"} {
+      append buffer \n
+    }
+  } else {
+    set buffer \n
+  }
+  # Trim leading \n's
+  append buffer [string trimleft [lindex $args 0] \n] {*}[lrange $args 1 end]
+}
+proc ::practcl::tcl_to_c {body} {
+  set result {}
+  foreach rawline [split $body \n] {
+    set line [string map [list \" \\\" \\ \\\\] $rawline]
+    cputs result "\n        \"$line\\n\" \\"
+  }
+  return [string trimright $result \\]
+}
+proc ::practcl::_tagblock {text {style tcl} {note {}}} {
+  if {[string length [string trim $text]]==0} {
+    return {}
+  }
+  set output {}
+  switch $style {
+    tcl {
+      ::practcl::cputs output "# BEGIN $note"
+    }
+    c {
+      ::practcl::cputs output "/* BEGIN $note */"
+    }
+    default {
+      ::practcl::cputs output "# BEGIN $note"
+    }
+  }
+  ::practcl::cputs output $text
+  switch $style {
+    tcl {
+      ::practcl::cputs output "# END $note"
+    }
+    c {
+      ::practcl::cputs output "/* END $note */"
+    }
+    default {
+      ::practcl::cputs output "# END $note"
+    }
+  }
+  return $output
+}
+proc ::practcl::de_shell {data} {
+  set values {}
+  foreach flag {DEFS TCL_DEFS TK_DEFS} {
+    if {[dict exists $data $flag]} {
+      #set value {}
+      #foreach item [dict get $data $flag] {
+      #  append value " " [string map {{ } {\ }} $item]
+      #}
+      dict set values $flag [dict get $data $flag]
+    }
+  }
+  set map {}
+  lappend map {${PKG_OBJECTS}} %LIBRARY_OBJECTS%
+  lappend map {$(PKG_OBJECTS)} %LIBRARY_OBJECTS%
+  lappend map {${PKG_STUB_OBJECTS}} %LIBRARY_STUB_OBJECTS%
+  lappend map {$(PKG_STUB_OBJECTS)} %LIBRARY_STUB_OBJECTS%
+
+  if {[dict exists $data name]} {
+    lappend map %LIBRARY_NAME% [dict get $data name]
+    lappend map %LIBRARY_VERSION% [dict get $data version]
+    lappend map %LIBRARY_VERSION_NODOTS% [string map {. {}} [dict get $data version]]
+    if {[dict exists $data libprefix]} {
+      lappend map %LIBRARY_PREFIX% [dict get $data libprefix]
+    } else {
+      lappend map %LIBRARY_PREFIX% [dict get $data prefix]
+    }
+  }
+  foreach flag [dict keys $data] {
+    if {$flag in {TCL_DEFS TK_DEFS DEFS}} continue
+    set value [string trim [dict get $data $flag] \"]
+    dict set map "\$\{${flag}\}" $value
+    dict set map "\$\(${flag}\)" $value
+    #dict set map "\$${flag}" $value
+    dict set map "%${flag}%" $value
+    dict set values $flag [dict get $data $flag]
+    #dict set map "\$\{${flag}\}" $proj($flag)
+  }
+  set changed 1
+  while {$changed} {
+    set changed 0
+    foreach {field value} $values {
+      if {$field in {TCL_DEFS TK_DEFS DEFS}} continue
+      dict with values {}
+      set newval [string map $map $value]
+      if {$newval eq $value} continue
+      set changed 1
+      dict set values $field $newval
+    }
+  }
+  return $values
+}
+
+###
+# END: buildutil.tcl
+###
+###
+# START: fileutil.tcl
+###
+proc ::practcl::grep {pattern {files {}}} {
+    set result [list]
+    if {[llength $files] == 0} {
+            # read from stdin
+            set lnum 0
+            while {[gets stdin line] >= 0} {
+                incr lnum
+                if {[regexp -- $pattern $line]} {
+                        lappend result "${lnum}:${line}"
+                }
+            }
+    } else {
+            foreach filename $files {
+            set file [open $filename r]
+            set lnum 0
+            while {[gets $file line] >= 0} {
+                incr lnum
+                if {[regexp -- $pattern $line]} {
+                    lappend result "${filename}:${lnum}:${line}"
+                }
+            }
+            close $file
+            }
+    }
+    return $result
+}
+proc ::practcl::file_lexnormalize {sp} {
+    set spx [file split $sp]
+
+    # Resolution of embedded relative modifiers (., and ..).
+
+    if {
+      ([lsearch -exact $spx . ] < 0) &&
+      ([lsearch -exact $spx ..] < 0)
+    } {
+      # Quick path out if there are no relative modifiers
+      return $sp
+    }
+
+    set absolute [expr {![string equal [file pathtype $sp] relative]}]
+    # A volumerelative path counts as absolute for our purposes.
+
+    set sp $spx
+    set np {}
+    set noskip 1
+
+    while {[llength $sp]} {
+      set ele    [lindex $sp 0]
+      set sp     [lrange $sp 1 end]
+      set islast [expr {[llength $sp] == 0}]
+
+      if {[string equal $ele ".."]} {
+          if {
+            ($absolute  && ([llength $np] >  1)) ||
+            (!$absolute && ([llength $np] >= 1))
+          } {
+            # .. : Remove the previous element added to the
+            # new path, if there actually is enough to remove.
+            set np [lrange $np 0 end-1]
+          }
+      } elseif {[string equal $ele "."]} {
+          # Ignore .'s, they stay at the current location
+          continue
+      } else {
+          # A regular element.
+          lappend np $ele
+      }
+    }
+    if {[llength $np] > 0} {
+      return [eval [linsert $np 0 file join]]
+      # 8.5: return [file join {*}$np]
+    }
+    return {}
+}
+proc ::practcl::file_relative {base dst} {
+    # Ensure that the link to directory 'dst' is properly done relative to
+    # the directory 'base'.
+
+    if {![string equal [file pathtype $base] [file pathtype $dst]]} {
+      return -code error "Unable to compute relation for paths of different pathtypes: [file pathtype $base] vs. [file pathtype $dst], ($base vs. $dst)"
+    }
+
+    set base [file_lexnormalize [file join [pwd] $base]]
+    set dst  [file_lexnormalize [file join [pwd] $dst]]
+
+    set save $dst
+    set base [file split $base]
+    set dst  [file split $dst]
+
+    while {[string equal [lindex $dst 0] [lindex $base 0]]} {
+      set dst  [lrange $dst  1 end]
+      set base [lrange $base 1 end]
+      if {![llength $dst]} {break}
+    }
+
+    set dstlen  [llength $dst]
+    set baselen [llength $base]
+
+    if {($dstlen == 0) && ($baselen == 0)} {
+      # Cases:
+      # (a) base == dst
+
+      set dst .
+    } else {
+      # Cases:
+      # (b) base is: base/sub = sub
+      #     dst  is: base     = {}
+
+      # (c) base is: base     = {}
+      #     dst  is: base/sub = sub
+
+      while {$baselen > 0} {
+          set dst [linsert $dst 0 ..]
+          incr baselen -1
+      }
+      # 8.5: set dst [file join {*}$dst]
+      set dst [eval [linsert $dst 0 file join]]
+    }
+
+    return $dst
+}
+proc ::practcl::findByPattern {basedir patterns} {
+    set queue $basedir
+    set result {}
+    while {[llength $queue]} {
+      set item [lindex $queue 0]
+      set queue [lrange $queue 1 end]
+      if {[file isdirectory $item]} {
+        foreach path [glob -nocomplain [file join $item *]] {
+          lappend queue $path
+        }
+        continue
+      }
+      foreach pattern $patterns {
+        set fname [file tail $item]
+        if {[string match $pattern $fname]} {
+          lappend result $item
+          break
+        }
+      }
+    }
+    return $result
+}
+proc ::practcl::log {fname comment} {
+  set fname [file normalize $fname]
+  if {[info exists ::practcl::logchan($fname)]} {
+    set fout $::practcl::logchan($fname)
+    after cancel $::practcl::logevent($fname)
+  } else {
+    set fout [open $fname a]
+  }
+  puts $fout $comment
+  # Defer close until idle
+  set ::practcl::logevent($fname) [after idle "close $fout ; unset ::practcl::logchan($fname)"]
+}
+
+###
+# END: fileutil.tcl
+###
+###
+# START: installutil.tcl
+###
+proc ::practcl::_pkgindex_simpleIndex {path} {
+set buffer {}
+  set pkgidxfile    [file join $path pkgIndex.tcl]
+  set modfile       [file join $path [file tail $path].tcl]
+  set use_pkgindex  [file exists $pkgidxfile]
+  set tclfiles      {}
+  set found 0
+  set mlist [list pkgIndex.tcl index.tcl [file tail $modfile] version_info.tcl]
+  foreach file [glob -nocomplain [file join $path *.tcl]] {
+    if {[file tail $file] ni $mlist} {
+      #puts [list NONMODFILE $file]
+      return {}
+    }
+  }
+  foreach file [glob -nocomplain [file join $path *.tcl]] {
+    if { [file tail $file] == "version_info.tcl" } continue
+    set fin [open $file r]
+    set dat [read $fin]
+    close $fin
+    if {![regexp "package provide" $dat]} continue
+    set fname [file rootname [file tail $file]]
+    # Look for a package provide statement
+    foreach line [split $dat \n] {
+      set line [string trim $line]
+      if { [string range $line 0 14] != "package provide" } continue
+      set package [lindex $line 2]
+      set version [lindex $line 3]
+      if {[string index $package 0] in "\$ \[ @"} continue
+      if {[string index $version 0] in "\$ \[ @"} continue
+      #puts "PKGLINE $line"
+      append buffer "package ifneeded $package $version \[list source \[file join %DIR% [file tail $file]\]\]" \n
+      break
+    }
+  }
+  return $buffer
+}
+proc ::practcl::_pkgindex_directory {path} {
+  set buffer {}
+  set pkgidxfile    [file join $path pkgIndex.tcl]
+  set modfile       [file join $path [file tail $path].tcl]
+  set use_pkgindex  [file exists $pkgidxfile]
+  set tclfiles      {}
+  if {$use_pkgindex && [file exists $modfile]} {
+    set use_pkgindex 0
+    set mlist [list pkgIndex.tcl [file tail $modfile]]
+    foreach file [glob -nocomplain [file join $path *.tcl]] {
+      lappend tclfiles [file tail $file]
+      if {[file tail $file] in $mlist} continue
+      incr use_pkgindex
+    }
+  }
+  if {!$use_pkgindex} {
+    # No pkgIndex file, read the source
+    foreach file [glob -nocomplain $path/*.tm] {
+      set file [file normalize $file]
+      set fname [file rootname [file tail $file]]
+      ###
+      # We used to be able to ... Assume the package is correct in the filename
+      # No hunt for a "package provides"
+      ###
+      set package [lindex [split $fname -] 0]
+      set version [lindex [split $fname -] 1]
+      ###
+      # Read the file, and override assumptions as needed
+      ###
+      set fin [open $file r]
+      set dat [read $fin]
+      close $fin
+      # Look for a teapot style Package statement
+      foreach line [split $dat \n] {
+        set line [string trim $line]
+        if { [string range $line 0 9] != "# Package " } continue
+        set package [lindex $line 2]
+        set version [lindex $line 3]
+        break
+      }
+      # Look for a package provide statement
+      foreach line [split $dat \n] {
+        set line [string trim $line]
+        if { [string range $line 0 14] != "package provide" } continue
+        set package [lindex $line 2]
+        set version [lindex $line 3]
+        break
+      }
+      if {[string trim $version] ne {}} {
+        append buffer "package ifneeded $package $version \[list source \[file join \$dir [file tail $file]\]\]" \n
+      }
+    }
+    foreach file [glob -nocomplain $path/*.tcl] {
+      if { [file tail $file] == "version_info.tcl" } continue
+      set fin [open $file r]
+      set dat [read $fin]
+      close $fin
+      if {![regexp "package provide" $dat]} continue
+      set fname [file rootname [file tail $file]]
+      # Look for a package provide statement
+      foreach line [split $dat \n] {
+        set line [string trim $line]
+        if { [string range $line 0 14] != "package provide" } continue
+        set package [lindex $line 2]
+        set version [lindex $line 3]
+        if {[string index $package 0] in "\$ \[ @"} continue
+        if {[string index $version 0] in "\$ \[ @"} continue
+        append buffer "package ifneeded $package $version \[list source \[file join \$dir [file tail $file]\]\]" \n
+        break
+      }
+    }
+    return $buffer
+  }
+  set fin [open $pkgidxfile r]
+  set dat [read $fin]
+  close $fin
+  set trace 0
+  #if {[file tail $path] eq "tool"} {
+  #  set trace 1
+  #}
+  set thisline {}
+  foreach line [split $dat \n] {
+    append thisline $line \n
+    if {![info complete $thisline]} continue
+    set line [string trim $line]
+    if {[string length $line]==0} {
+      set thisline {} ; continue
+    }
+    if {[string index $line 0] eq "#"} {
+      set thisline {} ; continue
+    }
+    if {[regexp "if.*catch.*package.*Tcl.*return" $thisline]} {
+      if {$trace} {puts "[file dirname $pkgidxfile] Ignoring $thisline"}
+      set thisline {} ; continue
+    }
+    if {[regexp "if.*package.*vsatisfies.*package.*provide.*return" $thisline]} {
+      if {$trace} { puts "[file dirname $pkgidxfile] Ignoring $thisline" }
+      set thisline {} ; continue
+    }
+    if {![regexp "package.*ifneeded" $thisline]} {
+      # This package index contains arbitrary code
+      # source instead of trying to add it to the master
+      # package index
+      if {$trace} { puts "[file dirname $pkgidxfile] Arbitrary code $thisline" }
+      return {source [file join $dir pkgIndex.tcl]}
+    }
+    append buffer $thisline \n
+    set thisline {}
+  }
+  if {$trace} {puts [list [file dirname $pkgidxfile] $buffer]}
+  return $buffer
+}
+proc ::practcl::_pkgindex_path_subdir {path} {
+  set result {}
+  if {[file exists [file join $path src build.tcl]]} {
+    # Tool style module, don't dive into subdirectories
+    return $path
+  }
+  foreach subpath [glob -nocomplain [file join $path *]] {
+    if {[file isdirectory $subpath]} {
+      if {[file tail $subpath] eq "build" && [file exists [file join $subpath build.tcl]]} continue
+      lappend result $subpath {*}[_pkgindex_path_subdir $subpath]
+    }
+  }
+  return $result
+}
+proc ::practcl::pkgindex_path {args} {
+  set stack {}
+  set buffer {
+lappend ::PATHSTACK $dir
+set IDXPATH [lindex $::PATHSTACK end]
+  }
+  set preindexed {}
+  foreach base $args {
+    set base [file normalize $base]
+    set paths {}
+    foreach dir [glob -nocomplain [file join $base *]] {
+      set thisdir [file tail $dir]
+      if {$thisdir eq "teapot"} continue
+      if {$thisdir eq "pkgs"} {
+        foreach subdir [glob -nocomplain [file join $dir *]] {
+          set thissubdir [file tail $subdir]
+          set skip 0
+          foreach file {pkgIndex.tcl tclIndex} {
+            if {[file exists [file join $subdir $file]]} {
+              set skip 1
+              append buffer "set dir \[file join \$::IDXPATH [list $thisdir] [list $thissubdir]\] \; "
+              append buffer "source \[file join \$dir ${file}\]" \n
+            }
+          }
+          if {$skip} continue
+          lappend paths {*}[::practcl::_pkgindex_path_subdir $subdir]
+        }
+        continue
+      }
+      lappend paths $dir {*}[::practcl::_pkgindex_path_subdir $dir]
+    }
+    append buffer ""
+    set i    [string length  $base]
+    # Build a list of all of the paths
+    if {[llength $paths]} {
+      foreach path $paths {
+        if {$path eq $base} continue
+        set path_indexed($path) 0
+      }
+    } else {
+      puts [list WARNING: NO PATHS FOUND IN $base]
+    }
+    set path_indexed($base) 1
+    set path_indexed([file join $base boot tcl]) 1
+    append buffer \n {# SINGLE FILE MODULES BEGIN} \n {set dir [lindex $::PATHSTACK end]} \n
+    foreach path $paths {
+      if {$path_indexed($path)} continue
+      set thisdir [file_relative $base $path]
+      set simpleIdx [_pkgindex_simpleIndex $path]
+      if {[string length $simpleIdx]==0} continue
+      incr path_indexed($path)
+      if {[string length $simpleIdx]} {
+        incr path_indexed($path)
+        append buffer [string map [list %DIR% "\$dir \{$thisdir\}"] [string trimright $simpleIdx]] \n
+      }
+    }
+    append buffer {# SINGLE FILE MODULES END} \n
+    foreach path $paths {
+      if {$path_indexed($path)} continue
+      set thisdir [file_relative $base $path]
+      set idxbuf [::practcl::_pkgindex_directory $path]
+      if {[string length $idxbuf]} {
+        incr path_indexed($path)
+        append buffer "set dir \[set PKGDIR \[file join \[lindex \$::PATHSTACK end\] $thisdir\]\]" \n
+        append buffer [string map {$dir $PKGDIR} [string trimright $idxbuf]] \n
+      }
+    }
+  }
+  append buffer {
+set dir [lindex $::PATHSTACK end]
+set ::PATHSTACK [lrange $::PATHSTACK 0 end-1]
+}
+  return $buffer
+}
+proc ::practcl::installDir {d1 d2} {
+  puts [format {%*sCreating %s} [expr {4 * [info level]}] {} [file tail $d2]]
+  file delete -force -- $d2
+  file mkdir $d2
+
+  foreach ftail [glob -directory $d1 -nocomplain -tails *] {
+    set f [file join $d1 $ftail]
+    if {[file isdirectory $f] && [string compare CVS $ftail]} {
+      installDir $f [file join $d2 $ftail]
+    } elseif {[file isfile $f]} {
+	    file copy -force $f [file join $d2 $ftail]
+	    if {$::tcl_platform(platform) eq {unix}} {
+        file attributes [file join $d2 $ftail] -permissions 0644
+	    } else {
+        file attributes [file join $d2 $ftail] -readonly 1
+	    }
+    }
+  }
+
+  if {$::tcl_platform(platform) eq {unix}} {
+    file attributes $d2 -permissions 0755
+  } else {
+    file attributes $d2 -readonly 1
+  }
+}
+proc ::practcl::copyDir {d1 d2 {toplevel 1}} {
+  #if {$toplevel} {
+  #  puts [list ::practcl::copyDir $d1 -> $d2]
+  #}
+  #file delete -force -- $d2
+  file mkdir $d2
+  if {[file isfile $d1]} {
+    file copy -force $d1 $d2
+    set ftail [file tail $d1]
+    if {$::tcl_platform(platform) eq {unix}} {
+      file attributes [file join $d2 $ftail] -permissions 0644
+    } else {
+      file attributes [file join $d2 $ftail] -readonly 1
+    }
+  } else {
+    foreach ftail [glob -directory $d1 -nocomplain -tails *] {
+      set f [file join $d1 $ftail]
+      if {[file isdirectory $f] && [string compare CVS $ftail]} {
+        copyDir $f [file join $d2 $ftail] 0
+      } elseif {[file isfile $f]} {
+        file copy -force $f [file join $d2 $ftail]
+        if {$::tcl_platform(platform) eq {unix}} {
+          file attributes [file join $d2 $ftail] -permissions 0644
+        } else {
+          file attributes [file join $d2 $ftail] -readonly 1
+        }
+      }
+    }
+  }
+}
+proc ::practcl::buildModule {modpath} {
+  set buildscript [file join $modpath build build.tcl]
+  if {![file exists $buildscript]} return
+  set pkgIndexFile [file join $modpath pkgIndex.tcl]
+  if {[file exists $pkgIndexFile]} {
+    set latest 0
+    foreach file [::practcl::findByPattern [file dirname $buildscript] *.tcl] {
+      set mtime [file mtime $file]
+      if {$mtime>$latest} {
+        set latest $mtime
+      }
+    }
+    set IdxTime [file mtime $pkgIndexFile]
+    if {$latest<$IdxTime} return
+  }
+  ::practcl::dotclexec $buildscript
+}
+proc ::practcl::installModule {modpath DEST} {
+  if {[file exists [file join $DEST modules]]} {
+    set dpath [file join $DEST modules [file tail $modpath]]
+  } else {
+    set dpath $DEST
+  }
+  if {[file exists $dpath] && [file type $dpath] eq "link"} return
+  if {[file exists [file join $modpath index.tcl]]} {
+    # IRM/Tao style modules non-amalgamated
+    ::practcl::installDir $modpath $dpath
+    return
+  }
+  buildModule $modpath
+  set files [glob -nocomplain [file join $modpath *.tcl]]
+  if {[llength $files]} {
+    if {[llength $files]>1} {
+      if {![file exists [file join $modpath pkgIndex.tcl]]} {
+        pkg_mkIndex $modpath
+      }
+    }
+    file delete -force $dpath
+    file mkdir $dpath
+    foreach file $files {
+      file copy $file $dpath
+    }
+  }
+  if {[file exists [file join $modpath htdocs]]} {
+    ::practcl::copyDir [file join $modpath htdocs] [file join $dpath htdocs]
+  }
+}
+
+###
+# END: installutil.tcl
+###
+###
+# START: makeutil.tcl
+###
+proc ::practcl::trigger {args} {
+  ::practcl::LOCAL make trigger {*}$args
+  foreach {name obj} [::practcl::LOCAL make objects] {
+    set ::make($name) [$obj do]
+  }
+}
+proc ::practcl::depends {args} {
+  ::practcl::LOCAL make depends {*}$args
+}
+proc ::practcl::target {name info {action {}}} {
+  set obj [::practcl::LOCAL make task $name $info $action]
+  set ::make($name) 0
+  set filename [$obj define get filename]
+  if {$filename ne {}} {
+    set ::target($name) $filename
+  }
+}
+
+###
+# END: makeutil.tcl
+###
+###
+# START: class metaclass.tcl
+###
+::clay::define ::practcl::metaclass {
+  method _MorphPatterns {} {
+    return {{@name@} {::practcl::@name@} {::practcl::*@name@} {::practcl::*@name@*}}
+  }
+  method define {submethod args} {
+    my variable define
+    switch $submethod {
+      dump {
+        return [array get define]
+      }
+      add {
+        set field [lindex $args 0]
+        if {![info exists define($field)]} {
+          set define($field) {}
+        }
+        foreach arg [lrange $args 1 end] {
+          if {$arg ni $define($field)} {
+            lappend define($field) $arg
+          }
+        }
+        return $define($field)
+      }
+      remove {
+        set field [lindex $args 0]
+        if {![info exists define($field)]} {
+          return
+        }
+        set rlist [lrange $args 1 end]
+        set olist $define($field)
+        set nlist {}
+        foreach arg $olist {
+          if {$arg in $rlist} continue
+          lappend nlist $arg
+        }
+        set define($field) $nlist
+        return $nlist
+      }
+      exists {
+        set field [lindex $args 0]
+        return [info exists define($field)]
+      }
+      getnull -
+      get -
+      cget {
+        set field [lindex $args 0]
+        if {[info exists define($field)]} {
+          return $define($field)
+        }
+        return [lindex $args 1]
+      }
+      set {
+        if {[llength $args]==1} {
+          set arglist [lindex $args 0]
+        } else {
+          set arglist $args
+        }
+        array set define $arglist
+        if {[dict exists $arglist class]} {
+          my select
+        }
+      }
+      default {
+        array $submethod define {*}$args
+      }
+    }
+  }
+  method graft args {
+    return [my clay delegate {*}$args]
+  }
+  method initialize {} {}
+  method link {command args} {
+    my variable links
+    switch $command {
+      object {
+        foreach obj $args {
+          foreach linktype [$obj linktype] {
+            my link add $linktype $obj
+          }
+        }
+      }
+      add {
+        ###
+        # Add a link to an object that was externally created
+        ###
+        if {[llength $args] ne 2} { error "Usage: link add LINKTYPE OBJECT"}
+        lassign $args linktype object
+        if {[info exists links($linktype)] && $object in $links($linktype)} {
+          return
+        }
+        lappend links($linktype) $object
+      }
+      remove {
+        set object [lindex $args 0]
+        if {[llength $args]==1} {
+          set ltype *
+        } else {
+          set ltype [lindex $args 1]
+        }
+        foreach {linktype elements} [array get links $ltype] {
+          if {$object in $elements} {
+            set nlist {}
+            foreach e $elements {
+              if { $object ne $e } { lappend nlist $e }
+            }
+            set links($linktype) $nlist
+          }
+        }
+      }
+      list {
+        if {[llength $args]==0} {
+          return [array get links]
+        }
+        if {[llength $args] != 1} { error "Usage: link list LINKTYPE"}
+        set linktype [lindex $args 0]
+        if {![info exists links($linktype)]} {
+          return {}
+        }
+        return $links($linktype)
+      }
+      dump {
+        return [array get links]
+      }
+    }
+  }
+  method morph classname {
+    my variable define
+    if {$classname ne {}} {
+      set map [list @name@ $classname]
+      foreach pattern [string map $map [my _MorphPatterns]] {
+        set pattern [string trim $pattern]
+        set matches [info commands $pattern]
+        if {![llength $matches]} continue
+        set class [lindex $matches 0]
+        break
+      }
+      set mixinslot {}
+      foreach {slot pattern} {
+        distribution ::practcl::distribution*
+        product      ::practcl::product*
+        toolset      ::practcl::toolset*
+      } {
+        if {[string match $pattern $class]} {
+           set mixinslot $slot
+           break
+        }
+      }
+      if {$mixinslot ne {}} {
+        my clay mixinmap $mixinslot $class
+      } elseif {[info command $class] ne {}} {
+        if {[info object class [self]] ne $class} {
+          ::oo::objdefine [self] class $class
+          ::practcl::debug [self] morph $class
+           my define set class $class
+        }
+      } else {
+        error "[self] Could not detect class for $classname"
+      }
+    }
+    if {[::info exists define(oodefine)]} {
+      ::oo::objdefine [self] $define(oodefine)
+      #unset define(oodefine)
+    }
+  }
+  method script script {
+    eval $script
+  }
+  method select {} {
+    my variable define
+    if {[info exists define(class)]} {
+      my morph $define(class)
+    } else {
+      if {[::info exists define(oodefine)]} {
+        ::oo::objdefine [self] $define(oodefine)
+        #unset define(oodefine)
+      }
+    }
+  }
+  method source filename {
+    source $filename
+  }
+}
+
+###
+# END: class metaclass.tcl
+###
+###
+# START: class toolset baseclass.tcl
+###
+::clay::define ::practcl::toolset {
+  method config.sh {} {
+    return [my read_configuration]
+  }
+  method BuildDir {PWD} {
+    set name [my define get name]
+    set debug [my define get debug 0]
+    if {[my <project> define get LOCAL 0]} {
+      return [my define get builddir [file join $PWD local $name]]
+    }
+    if {$debug} {
+      return [my define get builddir [file join $PWD debug $name]]
+    } else {
+      return [my define get builddir [file join $PWD pkg $name]]
+    }
+  }
+  method MakeDir {srcdir} {
+    return $srcdir
+  }
+  method read_configuration {} {
+    my variable conf_result
+    if {[info exists conf_result]} {
+      return $conf_result
+    }
+    set result {}
+    set name [my define get name]
+    set PWD $::CWD
+    set builddir [my define get builddir]
+    my unpack
+    set srcdir [my define get srcdir]
+    if {![file exists $builddir]} {
+      my Configure
+    }
+    set filename [file join $builddir config.tcl]
+    # Project uses the practcl template. Use the leavings from autoconf
+    if {[file exists $filename]} {
+      set dat [::practcl::read_configuration $builddir]
+      foreach {item value} [::practcl::sort_dict $dat] {
+        dict set result $item $value
+      }
+      set conf_result $result
+      return $result
+    }
+    set filename [file join $builddir ${name}Config.sh]
+    if {[file exists $filename]} {
+      set l [expr {[string length $name]+1}]
+      foreach {field dat} [::practcl::read_Config.sh $filename] {
+        set field [string tolower $field]
+        if {[string match ${name}_* $field]} {
+          set field [string range $field $l end]
+        }
+        switch $field {
+          version {
+            dict set result pkg_vers $dat
+          }
+          lib_file {
+            set field libfile
+          }
+        }
+        dict set result $field $dat
+      }
+      set conf_result $result
+      return $result
+    }
+    ###
+    # Oh man... we have to guess
+    ###
+    if {![file exists [file join $builddir Makefile]]} {
+      my Configure
+    }
+    set filename [file join $builddir Makefile]
+    if {![file exists $filename]} {
+      error "Could not locate any configuration data in $srcdir"
+    }
+    foreach {field dat} [::practcl::read_Makefile $filename] {
+      dict set result $field $dat
+    }
+    if {![dict exists $result PRACTCL_PKG_LIBS] && [dict exists $result LIBS]} {
+      dict set result PRACTCL_PKG_LIBS [dict get $result LIBS]
+    }
+    set conf_result $result
+    cd $PWD
+    return $result
+  }
+  method build-cflags {PROJECT DEFS namevar versionvar defsvar} {
+    upvar 1 $namevar name $versionvar version NAME NAME $defsvar defs
+    set name [string tolower [${PROJECT} define get name [${PROJECT} define get pkg_name]]]
+    set NAME [string toupper $name]
+    set version [${PROJECT} define get version [${PROJECT} define get pkg_vers]]
+    if {$version eq {}} {
+      set version 0.1a
+    }
+    set defs $DEFS
+    foreach flag {
+      -DPACKAGE_NAME
+      -DPACKAGE_VERSION
+      -DPACKAGE_TARNAME
+      -DPACKAGE_STRING
+    } {
+      if {[set i [string first $flag $defs]] >= 0} {
+        set j [string first -D $flag [expr {$i+[string length $flag]}]]
+        set predef [string range $defs 0 [expr {$i-1}]]
+        set postdef [string range $defs $j end]
+        set defs "$predef $postdef"
+      }
+    }
+    append defs " -DPACKAGE_NAME=\"${name}\" -DPACKAGE_VERSION=\"${version}\""
+    append defs " -DPACKAGE_TARNAME=\"${name}\" -DPACKAGE_STRING=\"${name}\x5c\x20${version}\""
+    return $defs
+  }
+  method critcl args {
+    if {![info exists critcl]} {
+      ::practcl::LOCAL tool critcl env-load
+      set critcl [file join [::practcl::LOCAL tool critcl define get srcdir] main.tcl
+    }
+    set srcdir [my SourceRoot]
+    set PWD [pwd]
+    cd $srcdir
+    ::practcl::dotclexec $critcl {*}$args
+    cd $PWD
+  }
+}
+oo::objdefine ::practcl::toolset {
+  # Perform the selection for the toolset mixin
+  method select object {
+    ###
+    # Select the toolset to use for this project
+    ###
+    if {[$object define exists toolset]} {
+      return [$object define get toolset]
+    }
+    set class [$object define get toolset]
+    if {$class ne {}} {
+      $object clay mixinmap toolset $class
+    } else {
+      if {[info exists ::env(VisualStudioVersion)]} {
+        $object clay mixinmap toolset ::practcl::toolset.msvc
+      } else {
+        $object clay mixinmap toolset ::practcl::toolset.gcc
+      }
+    }
+  }
+}
+
+###
+# END: class toolset baseclass.tcl
+###
+###
+# START: class toolset gcc.tcl
+###
+::clay::define ::practcl::toolset.gcc {
+  superclass ::practcl::toolset
+  method Autoconf {} {
+    ###
+    # Re-run autoconf for this project
+    # Not a good idea in practice... but in the right hands it can be useful
+    ###
+    set pwd [pwd]
+    set srcdir [file normalize [my define get srcdir]]
+    set localsrcdir [my MakeDir $srcdir]
+    cd $localsrcdir
+    foreach template {configure.ac configure.in} {
+      set input [file join $srcdir $template]
+      if {[file exists $input]} {
+        puts "autoconf -f $input > [file join $srcdir configure]"
+        exec autoconf -f $input > [file join $srcdir configure]
+      }
+    }
+    cd $pwd
+  }
+  method BuildDir {PWD} {
+    set name [my define get name]
+    set debug [my define get debug 0]
+    if {[my <project> define get LOCAL 0]} {
+      return [my define get builddir [file join $PWD local $name]]
+    }
+    if {$debug} {
+      return [my define get builddir [file join $PWD debug $name]]
+    } else {
+      return [my define get builddir [file join $PWD pkg $name]]
+    }
+  }
+  method ConfigureOpts {} {
+    set opts {}
+    set builddir [my define get builddir]
+
+    if {[my define get broken_destroot 0]} {
+      set PREFIX [my <project> define get prefix_broken_destdir]
+    } else {
+      set PREFIX [my <project> define get prefix]
+    }
+    switch [my define get name] {
+      tcl {
+        set opts [::practcl::platform::tcl_core_options [my <project> define get TEACUP_OS]]
+      }
+      tk {
+        set opts [::practcl::platform::tk_core_options  [my <project> define get TEACUP_OS]]
+      }
+    }
+    if {[my <project> define get CONFIG_SITE] != {}} {
+      lappend opts --host=[my <project> define get HOST]
+    }
+    set inside_msys [string is true -strict [my <project> define get MSYS_ENV 0]]
+    lappend opts --with-tclsh=[info nameofexecutable]
+
+    if {[my define get tk 0]} {
+      if {![my <project> define get LOCAL 0]} {
+        set obj [my <project> tclcore]
+        if {$obj ne {}} {
+          if {$inside_msys} {
+            lappend opts --with-tcl=[::practcl::file_relative [file normalize $builddir] [$obj define get builddir]]
+          } else {
+            lappend opts --with-tcl=[file normalize [$obj define get builddir]]
+          }
+        }
+        set obj [my <project> tkcore]
+        if {$obj ne {}} {
+          if {$inside_msys} {
+            lappend opts --with-tk=[::practcl::file_relative [file normalize $builddir] [$obj define get builddir]]
+          } else {
+            lappend opts --with-tk=[file normalize [$obj define get builddir]]
+          }
+        }
+      } else {
+        lappend opts --with-tcl=[file join $PREFIX lib]
+        lappend opts --with-tk=[file join $PREFIX lib]
+      }
+    } else {
+      if {![my <project> define get LOCAL 0]} {
+        set obj [my <project> tclcore]
+        if {$obj ne {}} {
+          if {$inside_msys} {
+            lappend opts --with-tcl=[::practcl::file_relative [file normalize $builddir] [$obj define get builddir]]
+          } else {
+            lappend opts --with-tcl=[file normalize [$obj define get builddir]]
+          }
+        }
+      } else {
+        lappend opts --with-tcl=[file join $PREFIX lib]
+      }
+    }
+
+    lappend opts {*}[my define get config_opts]
+    if {![regexp -- "--prefix" $opts]} {
+      lappend opts --prefix=$PREFIX --exec-prefix=$PREFIX
+    }
+    if {[my define get debug 0]} {
+      lappend opts --enable-symbols=true
+    }
+    #--exec_prefix=$PREFIX
+    #if {$::tcl_platform(platform) eq "windows"} {
+    #  lappend opts --disable-64bit
+    #}
+    if {[my define get static 1]} {
+      lappend opts --disable-shared
+      #--disable-stubs
+      #
+    } else {
+      lappend opts --enable-shared
+    }
+    return $opts
+  }
+  method MakeDir {srcdir} {
+    set localsrcdir $srcdir
+    if {[file exists [file join $srcdir generic]]} {
+      my define add include_dir [file join $srcdir generic]
+    }
+    set os [my <project> define get TEACUP_OS]
+    switch $os {
+      windows {
+        if {[file exists [file join $srcdir win]]} {
+          my define add include_dir [file join $srcdir win]
+        }
+        if {[file exists [file join $srcdir win Makefile.in]]} {
+          set localsrcdir [file join $srcdir win]
+        }
+      }
+      macosx {
+        if {[file exists [file join $srcdir unix Makefile.in]]} {
+          set localsrcdir [file join $srcdir unix]
+        }
+      }
+      default {
+        if {[file exists [file join $srcdir $os]]} {
+          my define add include_dir [file join $srcdir $os]
+        }
+        if {[file exists [file join $srcdir unix]]} {
+          my define add include_dir [file join $srcdir unix]
+        }
+        if {[file exists [file join $srcdir $os Makefile.in]]} {
+          set localsrcdir [file join $srcdir $os]
+        } elseif {[file exists [file join $srcdir unix Makefile.in]]} {
+          set localsrcdir [file join $srcdir unix]
+        }
+      }
+    }
+    return $localsrcdir
+  }
+  Ensemble make::autodetect {} {
+    set srcdir [my define get srcdir]
+    set localsrcdir [my MakeDir $srcdir]
+    if {$localsrcdir eq {}} {
+      set localsrcdir $srcdir
+    }
+    if {$srcdir eq $localsrcdir} {
+      if {![file exists [file join $srcdir tclconfig install-sh]]} {
+        # ensure we have tclconfig with all of the trimmings
+        set teapath {}
+        if {[file exists [file join $srcdir .. tclconfig install-sh]]} {
+          set teapath [file join $srcdir .. tclconfig]
+        } else {
+          set tclConfigObj [::practcl::LOCAL tool tclconfig]
+          $tclConfigObj load
+          set teapath [$tclConfigObj define get srcdir]
+        }
+        set teapath [file normalize $teapath]
+        #file mkdir [file join $srcdir tclconfig]
+        if {[catch {file link -symbolic [file join $srcdir tclconfig] $teapath}]} {
+          ::practcl::copyDir [file join $teapath] [file join $srcdir tclconfig]
+        }
+      }
+    }
+    set builddir [my define get builddir]
+    file mkdir $builddir
+    if {![file exists [file join $localsrcdir configure]]} {
+      if {[file exists [file join $localsrcdir autogen.sh]]} {
+        cd $localsrcdir
+        catch {exec sh autogen.sh >>& [file join $builddir autoconf.log]}
+        cd $::CWD
+      }
+    }
+    set opts [my ConfigureOpts]
+    if {[file exists [file join $builddir autoconf.log]]} {
+      file delete [file join $builddir autoconf.log]
+    }
+    ::practcl::debug [list PKG [my define get name] CONFIGURE {*}$opts]
+    ::practcl::log   [file join $builddir autoconf.log] [list  CONFIGURE {*}$opts]
+    cd $builddir
+    if {[my <project> define get CONFIG_SITE] ne {}} {
+      set ::env(CONFIG_SITE) [my <project> define get CONFIG_SITE]
+    }
+    catch {exec sh [file join $localsrcdir configure] {*}$opts >>& [file join $builddir autoconf.log]}
+    cd $::CWD
+  }
+  Ensemble make::clean {} {
+    set builddir [file normalize [my define get builddir]]
+    catch {::practcl::domake $builddir clean}
+  }
+  Ensemble make::compile {} {
+    set name [my define get name]
+    set srcdir [my define get srcdir]
+    if {[my define get static 1]} {
+      puts "BUILDING Static $name $srcdir"
+    } else {
+      puts "BUILDING Dynamic $name $srcdir"
+    }
+    cd $::CWD
+    set builddir [file normalize [my define get builddir]]
+    file mkdir $builddir
+    if {![file exists [file join $builddir Makefile]]} {
+      my Configure
+    }
+    if {[file exists [file join $builddir make.tcl]]} {
+      if {[my define get debug 0]} {
+        ::practcl::domake.tcl $builddir debug all
+      } else {
+        ::practcl::domake.tcl $builddir all
+      }
+    } else {
+      ::practcl::domake $builddir all
+    }
+  }
+  Ensemble make::install DEST {
+    set PWD [pwd]
+    set builddir [my define get builddir]
+    if {[my <project> define get LOCAL 0] || $DEST eq {}} {
+      if {[file exists [file join $builddir make.tcl]]} {
+        puts "[self] Local INSTALL (Practcl)"
+        ::practcl::domake.tcl $builddir install
+      } elseif {[my define get broken_destroot 0] == 0} {
+        puts "[self] Local INSTALL (TEA)"
+        ::practcl::domake $builddir install
+      }
+    } else {
+      if {[file exists [file join $builddir make.tcl]]} {
+        # Practcl builds can inject right to where we need them
+        puts "[self] VFS INSTALL $DEST (Practcl)"
+        ::practcl::domake.tcl $builddir install-package $DEST
+      } elseif {[my define get broken_destroot 0] == 0} {
+        # Most modern TEA projects understand DESTROOT in the makefile
+        puts "[self] VFS INSTALL $DEST (TEA)"
+        ::practcl::domake $builddir install DESTDIR=[::practcl::file_relative $builddir $DEST]
+      } else {
+        # But some require us to do an install into a fictitious filesystem
+        # and then extract the gooey parts within.
+        # (*cough*) TkImg
+        set PREFIX [my <project> define get prefix]
+        set BROKENROOT [::practcl::msys_to_tclpath [my <project> define get prefix_broken_destdir]]
+        file delete -force $BROKENROOT
+        file mkdir $BROKENROOT
+        ::practcl::domake $builddir $install
+        ::practcl::copyDir $BROKENROOT  [file join $DEST [string trimleft $PREFIX /]]
+        file delete -force $BROKENROOT
+      }
+    }
+    cd $PWD
+  }
+  method build-compile-sources {PROJECT COMPILE CPPCOMPILE INCLUDES} {
+    set objext [my define get OBJEXT o]
+    set EXTERN_OBJS {}
+    set OBJECTS {}
+    set result {}
+    set builddir [$PROJECT define get builddir]
+    file mkdir [file join $builddir objs]
+    set debug [$PROJECT define get debug 0]
+
+    set task {}
+    ###
+    # Compile the C sources
+    ###
+    ::practcl::debug ### COMPILE PRODUCTS
+    foreach {ofile info} [${PROJECT} project-compile-products] {
+      ::practcl::debug $ofile $info
+      if {[dict exists $info library]} {
+        #dict set task $ofile done 1
+        continue
+      }
+      # Products with no cfile aren't compiled
+      if {![dict exists $info cfile] || [set cfile [dict get $info cfile]] eq {}} {
+        #dict set task $ofile done 1
+        continue
+      }
+      set ofile [file rootname $ofile]
+      dict set task $ofile done 0
+      if {[dict exists $info external] && [dict get $info external]==1} {
+        dict set task $ofile external 1
+      } else {
+        dict set task $ofile external 0
+      }
+      set cfile [dict get $info cfile]
+      if {$debug} {
+        set ofilename [file join $builddir objs [file rootname [file tail $ofile]].debug.${objext}]
+      } else {
+        set ofilename [file join $builddir objs [file tail $ofile]].${objext}
+      }
+      dict set task $ofile source $cfile
+      dict set task $ofile objfile $ofilename
+      if {![dict exist $info command]} {
+        if {[file extension $cfile] in {.c++ .cpp}} {
+          set cmd $CPPCOMPILE
+        } else {
+          set cmd $COMPILE
+        }
+        if {[dict exists $info extra]} {
+          append cmd " [dict get $info extra]"
+        }
+        append cmd " $INCLUDES"
+        append cmd " -c $cfile"
+        append cmd " -o $ofilename"
+        dict set task $ofile command $cmd
+      }
+    }
+    set completed 0
+    while {$completed==0} {
+      set completed 1
+      foreach {ofile info} $task {
+        set waiting {}
+        if {[dict exists $info done] && [dict get $info done]} continue
+        ::practcl::debug COMPILING $ofile $info
+        set filename [dict get $info objfile]
+        if {[file exists $filename] && [file mtime $filename]>[file mtime [dict get $info source]]} {
+          lappend result $filename
+          dict set task $ofile done 1
+          continue
+        }
+        if {[dict exists $info depend]} {
+          foreach file [dict get $info depend] {
+            if {[dict exists $task $file command] && [dict exists $task $file done] && [dict get $task $file done] != 1} {
+              set waiting $file
+              break
+            }
+          }
+        }
+        if {$waiting ne {}} {
+          set completed 0
+          puts "$ofile waiting for $waiting"
+          continue
+        }
+        if {[dict exists $info command]} {
+          set cmd [dict get $info command]
+          puts "$cmd"
+          exec {*}$cmd >&@ stdout
+        }
+        if {[file exists $filename]} {
+          lappend result $filename
+          dict set task $ofile done 1
+          continue
+        }
+        error "Failed to produce $filename"
+      }
+    }
+    return $result
+  }
+method build-Makefile {path PROJECT} {
+  array set proj [$PROJECT define dump]
+  set path $proj(builddir)
+  cd $path
+  set includedir .
+  set objext [my define get OBJEXT o]
+
+  #lappend includedir [::practcl::file_relative $path $proj(TCL_INCLUDES)]
+  lappend includedir [::practcl::file_relative $path [file normalize [file join $proj(TCL_SRC_DIR) generic]]]
+  lappend includedir [::practcl::file_relative $path [file normalize [file join $proj(srcdir) generic]]]
+  foreach include [$PROJECT toolset-include-directory] {
+    set cpath [::practcl::file_relative $path [file normalize $include]]
+    if {$cpath ni $includedir} {
+      lappend includedir $cpath
+    }
+  }
+  set INCLUDES  "-I[join $includedir " -I"]"
+  set NAME [string toupper $proj(name)]
+  set result {}
+  set products {}
+  set libraries {}
+  set thisline {}
+  ::practcl::cputs result "${NAME}_DEFS = $proj(DEFS)\n"
+  ::practcl::cputs result "${NAME}_INCLUDES = -I\"[join $includedir "\" -I\""]\"\n"
+  ::practcl::cputs result "${NAME}_COMPILE = \$(CC) \$(CFLAGS) \$(PKG_CFLAGS) \$(${NAME}_DEFS) \$(${NAME}_INCLUDES) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(AM_CFLAGS)"
+  ::practcl::cputs result "${NAME}_CPPCOMPILE = \$(CXX) \$(CFLAGS) \$(PKG_CFLAGS) \$(${NAME}_DEFS) \$(${NAME}_INCLUDES) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(AM_CFLAGS)"
+
+  foreach {ofile info} [$PROJECT project-compile-products] {
+    dict set products $ofile $info
+    set fname [file rootname ${ofile}].${objext}
+    if {[dict exists $info library]} {
+lappend libraries $ofile
+continue
+    }
+    if {[dict exists $info depend]} {
+      ::practcl::cputs result "\n${fname}: [dict get $info depend]"
+    } else {
+      ::practcl::cputs result "\n${fname}:"
+    }
+    set cfile [dict get $info cfile]
+    if {[file extension $cfile] in {.c++ .cpp}} {
+      set cmd "\t\$\(${NAME}_CPPCOMPILE\)"
+    } else {
+      set cmd "\t\$\(${NAME}_COMPILE\)"
+    }
+    if {[dict exists $info extra]} {
+      append cmd " [dict get $info extra]"
+    }
+    append cmd " -c [dict get $info cfile] -o \$@\n\t"
+    ::practcl::cputs result  $cmd
+  }
+
+  set map {}
+  lappend map %LIBRARY_NAME% $proj(name)
+  lappend map %LIBRARY_VERSION% $proj(version)
+  lappend map %LIBRARY_VERSION_NODOTS% [string map {. {}} $proj(version)]
+  lappend map %LIBRARY_PREFIX% [$PROJECT define getnull libprefix]
+
+  if {[string is true [$PROJECT define get SHARED_BUILD]]} {
+    set outfile [$PROJECT define get libfile]
+  } else {
+    set outfile [$PROJECT shared_library]
+  }
+  $PROJECT define set shared_library $outfile
+  ::practcl::cputs result "
+${NAME}_SHLIB = $outfile
+${NAME}_OBJS = [dict keys $products]
+"
+
+  #lappend map %OUTFILE% {\[$]@}
+  lappend map %OUTFILE% $outfile
+  lappend map %LIBRARY_OBJECTS% "\$(${NAME}_OBJS)"
+  ::practcl::cputs result "$outfile: \$(${NAME}_OBJS)"
+  ::practcl::cputs result "\t[string map $map [$PROJECT define get PRACTCL_SHARED_LIB]]"
+  if {[$PROJECT define get PRACTCL_VC_MANIFEST_EMBED_DLL] ni {: {}}} {
+    ::practcl::cputs result "\t[string map $map [$PROJECT define get PRACTCL_VC_MANIFEST_EMBED_DLL]]"
+  }
+  ::practcl::cputs result {}
+  if {[string is true [$PROJECT define get SHARED_BUILD]]} {
+    #set outfile [$PROJECT static_library]
+    set outfile $proj(name).a
+  } else {
+    set outfile [$PROJECT define get libfile]
+  }
+  $PROJECT define set static_library $outfile
+  dict set map %OUTFILE% $outfile
+  ::practcl::cputs result "$outfile: \$(${NAME}_OBJS)"
+  ::practcl::cputs result "\t[string map $map [$PROJECT define get PRACTCL_STATIC_LIB]]"
+  ::practcl::cputs result {}
+  return $result
+}
+method build-library {outfile PROJECT} {
+  array set proj [$PROJECT define dump]
+  set path $proj(builddir)
+  cd $path
+  set includedir .
+  #lappend includedir [::practcl::file_relative $path $proj(TCL_INCLUDES)]
+  lappend includedir [::practcl::file_relative $path [file normalize [file join $proj(TCL_SRC_DIR) generic]]]
+  if {[$PROJECT define get TEA_PRIVATE_TCL_HEADERS 0]} {
+    if {[$PROJECT define get TEA_PLATFORM] eq "windows"} {
+      lappend includedir [::practcl::file_relative $path [file normalize [file join $proj(TCL_SRC_DIR) win]]]
+    } else {
+      lappend includedir [::practcl::file_relative $path [file normalize [file join $proj(TCL_SRC_DIR) unix]]]
+    }
+  }
+
+  lappend includedir [::practcl::file_relative $path [file normalize [file join $proj(srcdir) generic]]]
+
+  if {[$PROJECT define get tk 0]} {
+    lappend includedir [::practcl::file_relative $path [file normalize [file join $proj(TK_SRC_DIR) generic]]]
+    lappend includedir [::practcl::file_relative $path [file normalize [file join $proj(TK_SRC_DIR) ttk]]]
+    lappend includedir [::practcl::file_relative $path [file normalize [file join $proj(TK_SRC_DIR) xlib]]]
+    if {[$PROJECT define get TEA_PRIVATE_TK_HEADERS 0]} {
+      if {[$PROJECT define get TEA_PLATFORM] eq "windows"} {
+        lappend includedir [::practcl::file_relative $path [file normalize [file join $proj(TK_SRC_DIR) win]]]
+      } else {
+        lappend includedir [::practcl::file_relative $path [file normalize [file join $proj(TK_SRC_DIR) unix]]]
+      }
+    }
+    lappend includedir [::practcl::file_relative $path [file normalize $proj(TK_BIN_DIR)]]
+  }
+  foreach include [$PROJECT toolset-include-directory] {
+    set cpath [::practcl::file_relative $path [file normalize $include]]
+    if {$cpath ni $includedir} {
+      lappend includedir $cpath
+    }
+  }
+  my build-cflags $PROJECT $proj(DEFS) name version defs
+  set NAME [string toupper $name]
+  set debug [$PROJECT define get debug 0]
+  set os [$PROJECT define get TEACUP_OS]
+
+  set INCLUDES  "-I[join $includedir " -I"]"
+  if {$debug} {
+    set COMPILE "$proj(CC) $proj(CFLAGS_DEBUG) -ggdb \
+$proj(CFLAGS_WARNING) $INCLUDES $defs"
+
+    if {[info exists proc(CXX)]} {
+      set COMPILECPP "$proj(CXX) $defs $INCLUDES $proj(CFLAGS_DEBUG) -ggdb \
+  $defs $proj(CFLAGS_WARNING)"
+    } else {
+      set COMPILECPP $COMPILE
+    }
+  } else {
+    set COMPILE "$proj(CC) $proj(CFLAGS) $defs"
+
+    if {[info exists proc(CXX)]} {
+      set COMPILECPP "$proj(CXX) $defs $proj(CFLAGS)"
+    } else {
+      set COMPILECPP $COMPILE
+    }
+  }
+
+  set products [my build-compile-sources $PROJECT $COMPILE $COMPILECPP $INCLUDES]
+
+  set map {}
+  lappend map %LIBRARY_NAME% $proj(name)
+  lappend map %LIBRARY_VERSION% $proj(version)
+  lappend map %LIBRARY_VERSION_NODOTS% [string map {. {}} $proj(version)]
+  lappend map %OUTFILE% $outfile
+  lappend map %LIBRARY_OBJECTS% $products
+  lappend map {${CFLAGS}} "$proj(CFLAGS_DEFAULT) $proj(CFLAGS_WARNING)"
+
+  if {[string is true [$PROJECT define get SHARED_BUILD 1]]} {
+    set cmd [$PROJECT define get PRACTCL_SHARED_LIB]
+    append cmd " [$PROJECT define get PRACTCL_LIBS]"
+    set cmd [string map $map $cmd]
+    puts $cmd
+    exec {*}$cmd >&@ stdout
+    if {[$PROJECT define get PRACTCL_VC_MANIFEST_EMBED_DLL] ni {: {}}} {
+      set cmd [string map $map [$PROJECT define get PRACTCL_VC_MANIFEST_EMBED_DLL]]
+      puts $cmd
+      exec {*}$cmd >&@ stdout
+    }
+  } else {
+    set cmd [string map $map [$PROJECT define get PRACTCL_STATIC_LIB]]
+    puts $cmd
+    exec {*}$cmd >&@ stdout
+  }
+  set ranlib [$PROJECT define get RANLIB]
+  if {$ranlib ni {{} :}} {
+    catch {exec $ranlib $outfile}
+  }
+}
+method build-tclsh {outfile PROJECT {path {auto}}} {
+  if {[my define get tk 0] && [my define get static_tk 0]} {
+    puts " BUILDING STATIC TCL/TK EXE $PROJECT"
+    set TKOBJ  [$PROJECT tkcore]
+    if {[info command $TKOBJ] eq {}} {
+      set TKOBJ ::noop
+      $PROJECT define set static_tk 0
+    } else {
+      ::practcl::toolset select $TKOBJ
+      array set TK  [$TKOBJ read_configuration]
+      set do_tk [$TKOBJ define get static]
+      $PROJECT define set static_tk $do_tk
+      $PROJECT define set tk $do_tk
+      set TKSRCDIR [$TKOBJ define get srcdir]
+    }
+  } else {
+    puts " BUILDING STATIC TCL EXE $PROJECT"
+    set TKOBJ ::noop
+    my define set static_tk 0
+  }
+  set TCLOBJ [$PROJECT tclcore]
+  ::practcl::toolset select $TCLOBJ
+  set PKG_OBJS {}
+  foreach item [$PROJECT link list core.library] {
+    if {[string is true [$item define get static]]} {
+      lappend PKG_OBJS $item
+    }
+  }
+  foreach item [$PROJECT link list package] {
+    if {[string is true [$item define get static]]} {
+      lappend PKG_OBJS $item
+    }
+  }
+  array set TCL [$TCLOBJ read_configuration]
+  if {$path in {{} auto}} {
+    set path [file dirname [file normalize $outfile]]
+  }
+  if {$path eq "."} {
+    set path [pwd]
+  }
+  cd $path
+  ###
+  # For a static Tcl shell, we need to build all local sources
+  # with the same DEFS flags as the tcl core was compiled with.
+  # The DEFS produced by a TEA extension aren't intended to operate
+  # with the internals of a staticly linked Tcl
+  ###
+  my build-cflags $PROJECT $TCL(defs) name version defs
+  set debug [$PROJECT define get debug 0]
+  set NAME [string toupper $name]
+  set result {}
+  set libraries {}
+  set thisline {}
+  set OBJECTS {}
+  set EXTERN_OBJS {}
+  foreach obj $PKG_OBJS {
+    $obj compile
+    set config($obj) [$obj read_configuration]
+  }
+  set os [$PROJECT define get TEACUP_OS]
+  set TCLSRCDIR [$TCLOBJ define get srcdir]
+
+  set includedir .
+  foreach include [$TCLOBJ toolset-include-directory] {
+    set cpath [::practcl::file_relative $path [file normalize $include]]
+    if {$cpath ni $includedir} {
+      lappend includedir $cpath
+    }
+  }
+  lappend includedir [::practcl::file_relative $path [file normalize ../tcl/compat/zlib]]
+  if {[$PROJECT define get static_tk]} {
+    lappend includedir [::practcl::file_relative $path [file normalize [file join $TKSRCDIR generic]]]
+    lappend includedir [::practcl::file_relative $path [file normalize [file join $TKSRCDIR ttk]]]
+    lappend includedir [::practcl::file_relative $path [file normalize [file join $TKSRCDIR xlib]]]
+    lappend includedir [::practcl::file_relative $path [file normalize $TKSRCDIR]]
+  }
+
+  foreach include [$PROJECT toolset-include-directory] {
+    set cpath [::practcl::file_relative $path [file normalize $include]]
+    if {$cpath ni $includedir} {
+      lappend includedir $cpath
+    }
+  }
+
+  set INCLUDES  "-I[join $includedir " -I"]"
+  if {$debug} {
+      set COMPILE "$TCL(cc) $TCL(shlib_cflags) $TCL(cflags_debug) -ggdb \
+$TCL(cflags_warning) $TCL(extra_cflags)"
+  } else {
+      set COMPILE "$TCL(cc) $TCL(shlib_cflags) $TCL(cflags_optimize) \
+$TCL(cflags_warning) $TCL(extra_cflags)"
+  }
+  append COMPILE " " $defs
+  lappend OBJECTS {*}[my build-compile-sources $PROJECT $COMPILE $COMPILE $INCLUDES]
+
+  set TCLSRC [file normalize $TCLSRCDIR]
+
+  if {[${PROJECT} define get TEACUP_OS] eq "windows"} {
+    set windres [$PROJECT define get RC windres]
+    set RSOBJ [file join $path objs tclkit.res.o]
+    set RCSRC [${PROJECT} define get kit_resource_file]
+    set RCMAN [${PROJECT} define get kit_manifest_file]
+    set RCICO [${PROJECT} define get kit_icon_file]
+
+    set cmd [list $windres -o $RSOBJ -DSTATIC_BUILD --include [::practcl::file_relative $path [file join $TCLSRC generic]]]
+    if {[$PROJECT define get static_tk]} {
+      if {$RCSRC eq {} || ![file exists $RCSRC]} {
+        set RCSRC [file join $TKSRCDIR win rc wish.rc]
+      }
+      if {$RCMAN eq {} || ![file exists $RCMAN]} {
+        set RCMAN [file join [$TKOBJ define get builddir] wish.exe.manifest]
+      }
+      if {$RCICO eq {} || ![file exists $RCICO]} {
+        set RCICO [file join $TKSRCDIR win rc wish.ico]
+      }
+      set TKSRC [file normalize $TKSRCDIR]
+      lappend cmd --include [::practcl::file_relative $path [file join $TKSRC generic]] \
+        --include [::practcl::file_relative $path [file join $TKSRC win]] \
+        --include [::practcl::file_relative $path [file join $TKSRC win rc]]
+    } else {
+      if {$RCSRC eq {} || ![file exists $RCSRC]} {
+        set RCSRC [file join $TCLSRCDIR win tclsh.rc]
+      }
+      if {$RCMAN eq {} || ![file exists $RCMAN]} {
+        set RCMAN [file join [$TCLOBJ define get builddir] tclsh.exe.manifest]
+      }
+      if {$RCICO eq {} || ![file exists $RCICO]} {
+        set RCICO [file join $TCLSRCDIR win tclsh.ico]
+      }
+    }
+    foreach item [${PROJECT} define get resource_include] {
+      lappend cmd --include [::practcl::file_relative $path [file normalize $item]]
+    }
+    lappend cmd [file tail $RCSRC]
+    if {![file exists [file join $path [file tail $RCSRC]]]} {
+      file copy -force $RCSRC [file join $path [file tail $RCSRC]]
+    }
+    if {![file exists [file join $path [file tail $RCMAN]]]} {
+      file copy -force $RCMAN [file join $path [file tail $RCMAN]]
+    }
+    if {![file exists [file join $path [file tail $RCICO]]]} {
+      file copy -force $RCICO [file join $path [file tail $RCICO]]
+    }
+    ::practcl::doexec {*}$cmd
+    lappend OBJECTS $RSOBJ
+  }
+  puts "***"
+  set cmd "$TCL(cc)"
+  if {$debug} {
+   append cmd " $TCL(cflags_debug)"
+  } else {
+   append cmd " $TCL(cflags_optimize)"
+  }
+  append cmd " $TCL(ld_flags)"
+  if {$debug} {
+   append cmd " $TCL(ldflags_debug)"
+  } else {
+   append cmd " $TCL(ldflags_optimize)"
+  }
+
+  append cmd " $OBJECTS"
+  append cmd " $EXTERN_OBJS"
+  if {$debug && $os eq "windows"} {
+    ###
+    # There is bug in the core's autoconf and the value for
+    # tcl_build_lib_spec does not have the 'g' suffix
+    ###
+    append cmd " -L[file dirname $TCL(build_stub_lib_path)] -ltcl86g"
+    if {[$PROJECT define get static_tk]} {
+      append cmd " -L[file dirname $TK(build_stub_lib_path)] -ltk86g"
+    }
+  } else {
+    append cmd " $TCL(build_lib_spec)"
+    if {[$PROJECT define get static_tk]} {
+      append cmd  " $TK(build_lib_spec)"
+    }
+  }
+  foreach obj $PKG_OBJS {
+    append cmd " [$obj linker-products $config($obj)]"
+  }
+  set LIBS {}
+  foreach item $TCL(libs) {
+    if {[string range $item 0 1] eq "-l" && $item in $LIBS } continue
+    lappend LIBS $item
+  }
+  if {[$PROJECT define get static_tk]} {
+    foreach item $TK(libs) {
+      if {[string range $item 0 1] eq "-l" && $item in $LIBS } continue
+      lappend LIBS $item
+    }
+  }
+  if {[info exists TCL(extra_libs)]} {
+    foreach item $TCL(extra_libs) {
+      if {[string range $item 0 1] eq "-l" && $item in $LIBS } continue
+      lappend LIBS $item
+    }
+  }
+  foreach obj $PKG_OBJS {
+    puts [list Checking $obj for external dependencies]
+    foreach item [$obj linker-external $config($obj)] {
+      puts [list $obj adds $item]
+      if {[string range $item 0 1] eq "-l" && $item in $LIBS } continue
+      lappend LIBS $item
+    }
+  }
+  append cmd " ${LIBS}"
+  foreach obj $PKG_OBJS {
+    puts [list Checking $obj for additional link items]
+    foreach item [$obj linker-extra $config($obj)] {
+      append cmd $item
+    }
+  }
+  if {$debug && $os eq "windows"} {
+    append cmd " -L[file dirname $TCL(build_stub_lib_path)] ${TCL(stub_lib_flag)}"
+    if {[$PROJECT define get static_tk]} {
+      append cmd " -L[file dirname $TK(build_stub_lib_path)] ${TK(stub_lib_flag)}"
+    }
+  } else {
+    append cmd " $TCL(build_stub_lib_spec)"
+    if {[$PROJECT define get static_tk]} {
+      append cmd " $TK(build_stub_lib_spec)"
+    }
+  }
+  if {[info exists TCL(cc_search_flags)]} {
+    append cmd " $TCL(cc_search_flags)"
+  }
+  append cmd " -o $outfile "
+  if {$os eq "windows"} {
+    set LDFLAGS_CONSOLE {-mconsole -pipe -static-libgcc}
+    set LDFLAGS_WINDOW  {-mwindows -pipe -static-libgcc}
+    append cmd " $LDFLAGS_CONSOLE"
+  }
+  puts "LINK: $cmd"
+  exec {*}[string map [list "\n" " " "  " " "] $cmd] >&@ stdout
+}
+}
+
+###
+# END: class toolset gcc.tcl
+###
+###
+# START: class toolset msvc.tcl
+###
+::clay::define ::practcl::toolset.msvc {
+  superclass ::practcl::toolset
+  method BuildDir {PWD} {
+    set srcdir [my define get srcdir]
+    return $srcdir
+  }
+  Ensemble make::autodetect {} {
+  }
+  Ensemble make::clean {} {
+    set PWD [pwd]
+    set srcdir [my define get srcdir]
+    cd $srcdir
+    catch {::practcl::doexec nmake -f makefile.vc clean}
+    cd $PWD
+  }
+  Ensemble make::compile {} {
+    set srcdir [my define get srcdir]
+    if {[my define get static 1]} {
+      puts "BUILDING Static $name $srcdir"
+    } else {
+      puts "BUILDING Dynamic $name $srcdir"
+    }
+    cd $srcdir
+    if {[file exists [file join $srcdir make.tcl]]} {
+      if {[my define get debug 0]} {
+        ::practcl::domake.tcl $srcdir debug all
+      } else {
+        ::practcl::domake.tcl $srcdir all
+      }
+    } else {
+      if {[file exists [file join $srcdir makefile.vc]]} {
+        ::practcl::doexec nmake -f makefile.vc INSTALLDIR=[my <project> define get installdir]  {*}[my NmakeOpts] release
+      } elseif {[file exists [file join $srcdir win makefile.vc]]} {
+        cd [file join $srcdir win]
+        ::practcl::doexec nmake -f makefile.vc INSTALLDIR=[my <project> define get installdir]  {*}[my NmakeOpts] release
+      } else {
+        error "No make.tcl or makefile.vc found for project $name"
+      }
+    }
+  }
+  Ensemble make::install DEST {
+    set PWD [pwd]
+    set srcdir [my define get srcdir]
+    cd $srcdir
+    if {$DEST eq {}} {
+      error "No destination given"
+    }
+    if {[my <project> define get LOCAL 0] || $DEST eq {}} {
+      if {[file exists [file join $srcdir make.tcl]]} {
+        # Practcl builds can inject right to where we need them
+        puts "[self] Local Install (Practcl)"
+        ::practcl::domake.tcl $srcdir install
+      } else {
+        puts "[self] Local Install (Nmake)"
+        ::practcl::doexec nmake -f makefile.vc {*}[my NmakeOpts] install
+      }
+    } else {
+      if {[file exists [file join $srcdir make.tcl]]} {
+        # Practcl builds can inject right to where we need them
+        puts "[self] VFS INSTALL $DEST (Practcl)"
+        ::practcl::domake.tcl $srcdir install-package $DEST
+      } else {
+        puts "[self] VFS INSTALL $DEST"
+        ::practcl::doexec nmake -f makefile.vc INSTALLDIR=$DEST {*}[my NmakeOpts] install
+      }
+    }
+    cd $PWD
+  }
+  method MakeDir {srcdir} {
+    set localsrcdir $srcdir
+    if {[file exists [file join $srcdir generic]]} {
+      my define add include_dir [file join $srcdir generic]
+    }
+    if {[file exists [file join $srcdir win]]} {
+       my define add include_dir [file join $srcdir win]
+    }
+    if {[file exists [file join $srcdir makefile.vc]]} {
+      set localsrcdir [file join $srcdir win]
+    }
+    return $localsrcdir
+  }
+  method NmakeOpts {} {
+    set opts {}
+    set builddir [file normalize [my define get builddir]]
+
+    if {[my <project> define exists tclsrcdir]} {
+      ###
+      # On Windows we are probably running under MSYS, which doesn't deal with
+      # spaces in filename well
+      ###
+      set TCLSRCDIR  [::practcl::file_relative [file normalize $builddir] [file normalize [file join $::CWD [my <project> define get tclsrcdir] ..]]]
+      set TCLGENERIC [::practcl::file_relative [file normalize $builddir] [file normalize [file join $::CWD [my <project> define get tclsrcdir] .. generic]]]
+      lappend opts TCLDIR=[file normalize $TCLSRCDIR]
+      #--with-tclinclude=$TCLGENERIC
+    }
+    if {[my <project> define exists tksrcdir]} {
+      set TKSRCDIR  [::practcl::file_relative [file normalize $builddir] [file normalize [file join $::CWD [my <project> define get tksrcdir] ..]]]
+      set TKGENERIC [::practcl::file_relative [file normalize $builddir] [file normalize [file join $::CWD [my <project> define get tksrcdir] .. generic]]]
+      #lappend opts --with-tk=$TKSRCDIR --with-tkinclude=$TKGENERIC
+      lappend opts TKDIR=[file normalize $TKSRCDIR]
+    }
+    return $opts
+  }
+}
+
+###
+# END: class toolset msvc.tcl
+###
+###
+# START: class target.tcl
+###
+::clay::define ::practcl::make_obj {
+  superclass ::practcl::metaclass
+  constructor {module_object name info {action_body {}}} {
+    my variable define triggered domake
+    set triggered 0
+    set domake 0
+    set define(name) $name
+    set define(action) {}
+    array set define $info
+    my select
+    my initialize
+    foreach {stub obj} [$module_object child organs] {
+      my graft $stub $obj
+    }
+    if {$action_body ne {}} {
+      set define(action) $action_body
+    }
+  }
+  method do {} {
+    my variable domake
+    return $domake
+  }
+  method check {} {
+    my variable needs_make domake
+    if {$domake} {
+      return 1
+    }
+    if {[info exists needs_make]} {
+      return $needs_make
+    }
+    set make_objects [my <module> make objects]
+    set needs_make 0
+    foreach item [my define get depends] {
+      if {![dict exists $make_objects $item]} continue
+      set depobj [dict get $make_objects $item]
+      if {$depobj eq [self]} {
+        puts "WARNING [self] depends on itself"
+        continue
+      }
+      if {[$depobj check]} {
+        set needs_make 1
+      }
+    }
+    if {!$needs_make} {
+      foreach filename [my output] {
+        if {$filename ne {} && ![file exists $filename]} {
+          set needs_make 1
+        }
+      }
+    }
+    return $needs_make
+  }
+  method output {} {
+    set result {}
+    set filename [my define get filename]
+    if {$filename ne {}} {
+      lappend result $filename
+    }
+    foreach filename [my define get files] {
+      if {$filename ne {}} {
+        lappend result $filename
+      }
+    }
+    return $result
+  }
+  method reset {} {
+    my variable triggered domake needs_make
+    set triggerd 0
+    set domake 0
+    set needs_make 0
+  }
+  method triggers {} {
+    my variable triggered domake define
+    if {$triggered} {
+      return $domake
+    }
+    set triggered 1
+    set make_objects [my <module> make objects]
+
+    foreach item [my define get depends] {
+      if {![dict exists $make_objects $item]} continue
+      set depobj [dict get $make_objects $item]
+      if {$depobj eq [self]} {
+        puts "WARNING [self] triggers itself"
+        continue
+      } else {
+        set r [$depobj check]
+        if {$r} {
+          $depobj triggers
+        }
+      }
+    }
+    set domake 1
+    my <module> make trigger {*}[my define get triggers]
+  }
+}
+
+###
+# END: class target.tcl
+###
+###
+# START: class object.tcl
+###
+::clay::define ::practcl::object {
+  superclass ::practcl::metaclass
+  constructor {parent args} {
+    my variable links define
+    set organs [$parent child organs]
+    my clay delegate {*}$organs
+    array set define $organs
+    array set define [$parent child define]
+    array set links {}
+    if {[llength $args]==1 && [file exists [lindex $args 0]]} {
+      my define set filename [lindex $args 0]
+      ::practcl::product select [self]
+    } elseif {[llength $args] == 1} {
+      set data  [uplevel 1 [list subst [lindex $args 0]]]
+      array set define $data
+      my select
+    } else {
+      array set define [uplevel 1 [list subst $args]]
+      my select
+    }
+    my initialize
+
+  }
+  method child {method} {
+    return {}
+  }
+  method go {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable links
+    foreach {linktype objs} [array get links] {
+      foreach obj $objs {
+        $obj go
+      }
+    }
+    ::practcl::debug [list /[self] [self method] [self class]]
+  }
+}
+
+###
+# END: class object.tcl
+###
+###
+# START: class dynamic.tcl
+###
+::clay::define ::practcl::dynamic {
+  method cstructure {name definition {argdat {}}} {
+    my variable cstruct
+    dict set cstruct $name body $definition
+    foreach {f v} $argdat {
+      dict set cstruct $name $f $v
+    }
+    if {![dict exists $cstruct $name public]} {
+      dict set cstruct $name public 1
+    }
+  }
+  method include header {
+    my define add include $header
+  }
+  method include_dir args {
+    my define add include_dir {*}$args
+  }
+  method include_directory args {
+    my define add include_dir {*}$args
+  }
+  method c_header body {
+    my variable code
+    ::practcl::cputs code(header) $body
+  }
+  method c_code body {
+    my variable code
+    ::practcl::cputs code(funct) $body
+  }
+  method c_function {header body {info {}}} {
+    set header [string map "\t \  \n \ \ \  \ " $header]
+    my variable code cfunct
+    foreach regexp {
+         {(.*) ([a-zA-Z_][a-zA-Z0-9_]*) *\((.*)\)}
+         {(.*) (\x2a[a-zA-Z_][a-zA-Z0-9_]*) *\((.*)\)}
+    } {
+      if {[regexp $regexp $header all keywords funcname arglist]} {
+        set dat [dict merge {export 0 extern 0 public 1 inline 0} $info]
+        dict set dat header $header
+        dict set dat body $body
+        dict set dat keywords $keywords
+        dict set dat arglist $arglist
+        if {"IRM_INLINE" in $keywords || "CTHULHU_INLINE" in $keywords} {
+          dict set dat public 1
+          dict set dat extern 0
+          dict set dat inline 1
+        } else {
+          if {"inline" in $keywords} {
+            dict set dat inline 1
+          }
+          if {"STUB_EXPORT" in $keywords} {
+            dict set dat extern 1
+            dict set dat public 1
+            dict set dat export 1
+            dict set dat inline 0
+          } elseif {"extern" in $keywords} {
+            dict set dat extern 1
+            dict set dat public 1
+          } elseif {"static" in $keywords} {
+            dict set dat public 0
+          }
+        }
+        if {[dict get $dat inline] && [dict get $dat public]} {
+          set header [string map {IRM_INLINE {} CTHULHU_INLINE {} static {} inline {} extern {}} [dict get $dat header]]
+          dict set dat header "extern $header"
+        }
+        dict set cfunct $funcname $dat
+        return
+      }
+    }
+    puts "WARNING: NON CONFORMING FUNCTION DEFINITION: $headers $body"
+    ::practcl::cputs code(header) "$header\;"
+    # Could not parse that block as a function
+    # append it verbatim to our c_implementation
+    ::practcl::cputs code(funct) "$header [list $body]"
+  }
+  method c_tcloomethod {name body {arginfo {}}} {
+    my variable methods code
+    foreach {f v} $arginfo {
+      dict set methods $name $f $v
+    }
+    dict set methods $name body "Tcl_Object thisObject = Tcl_ObjectContextObject(objectContext); /* The current connection object */
+$body"
+  }
+  method cmethod {name body {arginfo {}}} {
+    my variable methods code
+    foreach {f v} $arginfo {
+      dict set methods $name $f $v
+    }
+    dict set methods $name body "Tcl_Object thisObject = Tcl_ObjectContextObject(objectContext); /* The current connection object */
+$body"
+  }
+  method c_tclproc_nspace nspace {
+    my variable code
+    if {![info exists code(nspace)]} {
+      set code(nspace) {}
+    }
+    if {$nspace ni $code(nspace)} {
+      lappend code(nspace) $nspace
+    }
+  }
+  method c_tclcmd {name body {arginfo {}}} {
+    my variable tclprocs code
+
+    foreach {f v} $arginfo {
+      dict set tclprocs $name $f $v
+    }
+    dict set tclprocs $name body $body
+  }
+  method c_tclproc_raw {name body {arginfo {}}} {
+    my variable tclprocs code
+
+    foreach {f v} $arginfo {
+      dict set tclprocs $name $f $v
+    }
+    dict set tclprocs $name body $body
+  }
+  method tcltype {name argdat} {
+    my variable tcltype
+    foreach {f v} $argdat {
+      dict set tcltype $name $f $v
+    }
+    if {![dict exists tcltype $name cname]} {
+      dict set tcltype $name cname [string tolower $name]_tclobjtype
+    }
+    lappend map @NAME@ $name
+    set info [dict get $tcltype $name]
+    foreach {f v} $info {
+      lappend map @[string toupper $f]@ $v
+    }
+    foreach {func fpat template} {
+      freeproc         {@Name@Obj_freeIntRepProc}       {void @FNAME@(Tcl_Obj *objPtr)}
+      dupproc          {@Name@Obj_dupIntRepProc}        {void @FNAME@(Tcl_Obj *srcPtr,Tcl_Obj *dupPtr)}
+      updatestringproc {@Name@Obj_updateStringRepProc} {void @FNAME@(Tcl_Obj *objPtr)}
+      setfromanyproc   {@Name@Obj_setFromAnyProc}       {int @FNAME@(Tcl_Interp *interp,Tcl_Obj *objPtr)}
+    } {
+      if {![dict exists $info $func]} {
+        error "$name does not define $func"
+      }
+      set body [dict get $info $func]
+      # We were given a function name to call
+      if {[llength $body] eq 1} continue
+      set fname [string map [list @Name@ [string totitle $name]] $fpat]
+      my c_function [string map [list @FNAME@ $fname] $template] [string map $map $body]
+      dict set tcltype $name $func $fname
+    }
+  }
+  method project-compile-products {} {
+    set filename [my define get output_c]
+    set result {}
+    if {$filename ne {}} {
+      ::practcl::debug [self] [self class] [self method] project-compile-products $filename
+
+      if {[my define exists ofile]} {
+        set ofile [my define get ofile]
+      } else {
+        set ofile [my Ofile $filename]
+        my define set ofile $ofile
+      }
+      lappend result $ofile [list cfile $filename extra [my define get extra] external [string is true -strict [my define get external]]]
+    } else {
+      set filename [my define get cfile]
+      if {$filename ne {}} {
+        ::practcl::debug [self] [self class] [self method] project-compile-products $filename
+        if {[my define exists ofile]} {
+          set ofile [my define get ofile]
+        } else {
+          set ofile [my Ofile $filename]
+          my define set ofile $ofile
+        }
+        lappend result $ofile [list cfile $filename extra [my define get extra] external [string is true -strict [my define get external]]]
+      }
+    }
+    foreach item [my link list subordinate] {
+      lappend result {*}[$item project-compile-products]
+    }
+    return $result
+  }
+  method implement path {
+    my go
+    my Collate_Source $path
+    if {[my define get output_c] eq {}} return
+    set filename [file join $path [my define get output_c]]
+    ::practcl::debug [self] [my define get filename] WANTS TO GENERATE $filename
+    my define set cfile $filename
+    set fout [open $filename w]
+    puts $fout [my generate-c]
+    if {[my define get initfunc] ne {}} {
+      puts $fout "extern int DLLEXPORT [my define get initfunc]( Tcl_Interp *interp ) \x7B"
+      puts $fout [my generate-loader-module]
+      if {[my define get pkg_name] ne {}} {
+        puts $fout "   Tcl_PkgProvide(interp, \"[my define get pkg_name]\", \"[my define get pkg_vers]\");"
+      }
+      puts $fout "  return TCL_OK\;"
+      puts $fout "\x7D"
+    }
+    close $fout
+  }
+  method initialize {} {
+    set filename [my define get filename]
+    if {$filename eq {}} {
+      return
+    }
+    if {[my define get name] eq {}} {
+      my define set name [file tail [file rootname $filename]]
+    }
+    if {[my define get localpath] eq {}} {
+      my define set localpath [my <module> define get localpath]_[my define get name]
+    }
+    ::source $filename
+  }
+  method linktype {} {
+    return {subordinate product dynamic}
+  }
+  method generate-cfile-constant {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set result {}
+    my variable code cstruct methods tcltype
+    if {[info exists code(constant)]} {
+      ::practcl::cputs result "/* [my define get filename] CONSTANT */"
+      ::practcl::cputs result $code(constant)
+    }
+    if {[info exists cstruct]} {
+      foreach {name info} $cstruct {
+        set map {}
+        lappend map @NAME@ $name
+        lappend map @MACRO@ GET[string toupper $name]
+
+        if {[dict exists $info deleteproc]} {
+          lappend map @DELETEPROC@ [dict get $info deleteproc]
+        } else {
+          lappend map @DELETEPROC@ NULL
+        }
+        if {[dict exists $info cloneproc]} {
+          lappend map @CLONEPROC@ [dict get $info cloneproc]
+        } else {
+          lappend map @CLONEPROC@ NULL
+        }
+        ::practcl::cputs result [string map $map {
+const static Tcl_ObjectMetadataType @NAME@DataType = {
+  TCL_OO_METADATA_VERSION_CURRENT,
+  "@NAME@",
+  @DELETEPROC@,
+  @CLONEPROC@
+};
+#define @MACRO@(OBJCONTEXT) (@NAME@ *) Tcl_ObjectGetMetadata(OBJCONTEXT,&@NAME@DataType)
+}]
+      }
+    }
+    if {[info exists tcltype]} {
+      foreach {type info} $tcltype {
+        dict with info {}
+        ::practcl::cputs result "const Tcl_ObjType $cname = \{\n .name=\"$type\",\n .freeIntRepProc = &${freeproc},\n  .dupIntRepProc = &${dupproc},\n  .updateStringProc = &${updatestringproc},\n  .setFromAnyProc = &${setfromanyproc}\n\}\;"
+      }
+    }
+
+    if {[info exists methods]} {
+      set mtypes {}
+      foreach {name info} $methods {
+        set callproc   [dict get $info callproc]
+        set methodtype [dict get $info methodtype]
+        if {$methodtype in $mtypes} continue
+        lappend mtypes $methodtype
+        ###
+        # Build the data struct for this method
+        ###
+        ::practcl::cputs result "const static Tcl_MethodType $methodtype = \{"
+        ::practcl::cputs result "  .version = TCL_OO_METADATA_VERSION_CURRENT,\n  .name = \"$name\",\n  .callProc = $callproc,"
+        if {[dict exists $info deleteproc]} {
+          set deleteproc [dict get $info deleteproc]
+        } else {
+          set deleteproc NULL
+        }
+        if {$deleteproc ni { {} NULL }} {
+          ::practcl::cputs result "  .deleteProc = $deleteproc,"
+        } else {
+          ::practcl::cputs result "  .deleteProc = NULL,"
+        }
+        if {[dict exists $info cloneproc]} {
+          set cloneproc [dict get $info cloneproc]
+        } else {
+          set cloneproc NULL
+        }
+        if {$cloneproc ni { {} NULL }} {
+          ::practcl::cputs result "  .cloneProc = $cloneproc\n\}\;"
+        } else {
+          ::practcl::cputs result "  .cloneProc = NULL\n\}\;"
+        }
+        dict set methods $name methodtype $methodtype
+      }
+    }
+    foreach obj [my link list product] {
+      # Exclude products that will generate their own C files
+      if {[$obj define get output_c] ne {}} continue
+      ::practcl::cputs result [$obj generate-cfile-constant]
+    }
+    return $result
+  }
+  method generate-cfile-header {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code cfunct cstruct methods tcltype tclprocs
+    set result {}
+    if {[info exists code(header)]} {
+      ::practcl::cputs result $code(header)
+    }
+    ::practcl::debug [list cfunct [info exists cfunct]]
+    if {[info exists cfunct]} {
+      foreach {funcname info} $cfunct {
+        if {[dict get $info public]} continue
+        ::practcl::cputs result "[dict get $info header]\;"
+      }
+    }
+    ::practcl::debug [list tclprocs [info exists tclprocs]]
+    if {[info exists tclprocs]} {
+      foreach {name info} $tclprocs {
+        if {[dict exists $info header]} {
+          ::practcl::cputs result "[dict get $info header]\;"
+        }
+      }
+    }
+    ::practcl::debug [list methods [info exists methods] [my define get cclass]]
+    if {[info exists methods]} {
+      set thisclass [my define get cclass]
+      foreach {name info} $methods {
+        if {[dict exists $info header]} {
+          ::practcl::cputs result "[dict get $info header]\;"
+        }
+      }
+      # Add the initializer wrapper for the class
+      ::practcl::cputs result "static int ${thisclass}_OO_Init(Tcl_Interp *interp)\;"
+    }
+    foreach obj [my link list product] {
+      # Exclude products that will generate their own C files
+      if {[$obj define get output_c] ne {}} continue
+      set dat [$obj generate-cfile-header]
+      if {[string length [string trim $dat]]} {
+        ::practcl::cputs result "/* BEGIN [$obj define get filename] generate-cfile-header */"
+        ::practcl::cputs result $dat
+        ::practcl::cputs result "/* END [$obj define get filename] generate-cfile-header */"
+      }
+    }
+    return $result
+  }
+  method generate-cfile-tclapi {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code methods tclprocs
+    set result {}
+    if {[info exists code(method)]} {
+      ::practcl::cputs result $code(method)
+    }
+
+    if {[info exists tclprocs]} {
+      foreach {name info} $tclprocs {
+        if {![dict exists $info body]} continue
+        set callproc [dict get $info callproc]
+        set header [dict get $info header]
+        set body [dict get $info body]
+        ::practcl::cputs result "/* Tcl Proc $name */"
+        ::practcl::cputs result "${header} \{${body}\}"
+      }
+    }
+
+
+    if {[info exists methods]} {
+      set thisclass [my define get cclass]
+      foreach {name info} $methods {
+        if {![dict exists $info body]} continue
+        set callproc [dict get $info callproc]
+        set header [dict get $info header]
+        set body [dict get $info body]
+        ::practcl::cputs result "/* OO Method $thisclass $name */"
+        ::practcl::cputs result "${header} \{${body}\}"
+      }
+      # Build the OO_Init function
+      ::practcl::cputs result "/* Loader for $thisclass */"
+      ::practcl::cputs result "static int ${thisclass}_OO_Init(Tcl_Interp *interp) \{"
+      ::practcl::cputs result [string map [list @CCLASS@ $thisclass @TCLCLASS@ [my define get class]] {
+  /*
+  ** Build the "@TCLCLASS@" class
+  */
+  Tcl_Obj* nameObj;		/* Name of a class or method being looked up */
+  Tcl_Object curClassObject;  /* Tcl_Object representing the current class */
+  Tcl_Class curClass;		/* Tcl_Class representing the current class */
+
+  /*
+   * Find the "@TCLCLASS@" class, and attach an 'init' method to it.
+   */
+
+  nameObj = Tcl_NewStringObj("@TCLCLASS@", -1);
+  Tcl_IncrRefCount(nameObj);
+  if ((curClassObject = Tcl_GetObjectFromObj(interp, nameObj)) == NULL) {
+      Tcl_DecrRefCount(nameObj);
+      return TCL_ERROR;
+  }
+  Tcl_DecrRefCount(nameObj);
+  curClass = Tcl_GetObjectAsClass(curClassObject);
+}]
+      if {[dict exists $methods constructor]} {
+        set mtype [dict get $methods constructor methodtype]
+        ::practcl::cputs result [string map [list @MTYPE@ $mtype] {
+  /* Attach the constructor to the class */
+  Tcl_ClassSetConstructor(interp, curClass, Tcl_NewMethod(interp, curClass, NULL, 1, &@MTYPE@, NULL));
+    }]
+      }
+      foreach {name info} $methods {
+        dict with info {}
+        if {$name in {constructor destructor}} continue
+        ::practcl::cputs result [string map [list @NAME@ $name @MTYPE@ $methodtype] {
+  nameObj=Tcl_NewStringObj("@NAME@",-1);
+  Tcl_NewMethod(interp, curClass, nameObj, 1, &@MTYPE@, (ClientData) NULL);
+  Tcl_DecrRefCount(nameObj);
+}]
+        if {[dict exists $info aliases]} {
+          foreach alias [dict get $info aliases] {
+            if {[dict exists $methods $alias]} continue
+            ::practcl::cputs result [string map [list @NAME@ $alias @MTYPE@ $methodtype] {
+  nameObj=Tcl_NewStringObj("@NAME@",-1);
+  Tcl_NewMethod(interp, curClass, nameObj, 1, &@MTYPE@, (ClientData) NULL);
+  Tcl_DecrRefCount(nameObj);
+}]
+          }
+        }
+      }
+      ::practcl::cputs result "  return TCL_OK\;\n\}\n"
+    }
+    foreach obj [my link list product] {
+      # Exclude products that will generate their own C files
+      if {[$obj define get output_c] ne {}} continue
+      ::practcl::cputs result [$obj generate-cfile-tclapi]
+    }
+    return $result
+  }
+  method generate-loader-module {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set result {}
+    my variable code methods tclprocs
+    if {[info exists code(nspace)]} {
+      ::practcl::cputs result "  \{\n    Tcl_Namespace *modPtr;"
+      foreach nspace $code(nspace) {
+        ::practcl::cputs result [string map [list @NSPACE@ $nspace] {
+    modPtr=Tcl_FindNamespace(interp,"@NSPACE@",NULL,TCL_NAMESPACE_ONLY);
+    if(!modPtr) {
+      modPtr = Tcl_CreateNamespace(interp, "@NSPACE@", NULL, NULL);
+    }
+}]
+      }
+      ::practcl::cputs result "  \}"
+    }
+    if {[info exists code(tclinit)]} {
+      ::practcl::cputs result $code(tclinit)
+    }
+    if {[info exists code(cinit)]} {
+      ::practcl::cputs result $code(cinit)
+    }
+    if {[info exists code(initfuncts)]} {
+      foreach func $code(initfuncts) {
+        ::practcl::cputs result "  if (${func}(interp) != TCL_OK) return TCL_ERROR\;"
+      }
+    }
+    if {[info exists tclprocs]} {
+      foreach {name info} $tclprocs {
+        set map [list @NAME@ $name @CALLPROC@ [dict get $info callproc]]
+        ::practcl::cputs result [string map $map {  Tcl_CreateObjCommand(interp,"@NAME@",(Tcl_ObjCmdProc *)@CALLPROC@,NULL,NULL);}]
+        if {[dict exists $info aliases]} {
+          foreach alias [dict get $info aliases] {
+            set map [list @NAME@ $alias @CALLPROC@ [dict get $info callproc]]
+            ::practcl::cputs result [string map $map {  Tcl_CreateObjCommand(interp,"@NAME@",(Tcl_ObjCmdProc *)@CALLPROC@,NULL,NULL);}]
+          }
+        }
+      }
+    }
+
+    if {[info exists code(nspace)]} {
+      ::practcl::cputs result "  \{\n    Tcl_Namespace *modPtr;"
+      foreach nspace $code(nspace) {
+        ::practcl::cputs result [string map [list @NSPACE@ $nspace] {
+    modPtr=Tcl_FindNamespace(interp,"@NSPACE@",NULL,TCL_NAMESPACE_ONLY);
+    Tcl_CreateEnsemble(interp, modPtr->fullName, modPtr, TCL_ENSEMBLE_PREFIX);
+    Tcl_Export(interp, modPtr, "[a-z]*", 1);
+}]
+      }
+      ::practcl::cputs result "  \}"
+    }
+    set result [::practcl::_tagblock $result c [my define get filename]]
+    foreach obj [my link list product] {
+      # Exclude products that will generate their own C files
+      if {[$obj define get output_c] ne {}} {
+        ::practcl::cputs result [$obj generate-loader-external]
+      } else {
+        ::practcl::cputs result [$obj generate-loader-module]
+      }
+    }
+    return $result
+  }
+  method Collate_Source CWD {
+    my variable methods code cstruct tclprocs
+    if {[info exists methods]} {
+      ::practcl::debug [self] methods [my define get cclass]
+      set thisclass [my define get cclass]
+      foreach {name info} $methods {
+        # Provide a callproc
+        if {![dict exists $info callproc]} {
+          set callproc [string map {____ _ ___ _ __ _} [string map {{ } _ : _} OOMethod_${thisclass}_${name}]]
+          dict set methods $name callproc $callproc
+        } else {
+          set callproc [dict get $info callproc]
+        }
+        if {[dict exists $info body] && ![dict exists $info header]} {
+          dict set methods $name header "static int ${callproc}(ClientData clientData, Tcl_Interp *interp, Tcl_ObjectContext objectContext ,int objc ,Tcl_Obj *const *objv)"
+        }
+        if {![dict exists $info methodtype]} {
+          set methodtype [string map {{ } _ : _} OOMethodType_${thisclass}_${name}]
+          dict set methods $name methodtype $methodtype
+        }
+      }
+      if {![info exists code(initfuncts)] || "${thisclass}_OO_Init" ni $code(initfuncts)} {
+        lappend code(initfuncts) "${thisclass}_OO_Init"
+      }
+    }
+    set thisnspace [my define get nspace]
+
+    if {[info exists tclprocs]} {
+      ::practcl::debug [self] tclprocs [dict keys $tclprocs]
+      foreach {name info} $tclprocs {
+        if {![dict exists $info callproc]} {
+          set callproc [string map {____ _ ___ _ __ _} [string map {{ } _ : _} TclCmd_${thisnspace}_${name}]]
+          dict set tclprocs $name callproc $callproc
+        } else {
+          set callproc [dict get $info callproc]
+        }
+        if {[dict exists $info body] && ![dict exists $info header]} {
+          dict set tclprocs $name header "static int ${callproc}(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv\[\])"
+        }
+      }
+    }
+  }
+  method select {} {}
+}
+
+###
+# END: class dynamic.tcl
+###
+###
+# START: class product.tcl
+###
+::clay::define ::practcl::product {
+  method code {section body} {
+    my variable code
+    ::practcl::cputs code($section) $body
+  }
+  method Collate_Source CWD {}
+  method project-compile-products {} {
+    set result {}
+    noop {
+    set filename [my define get filename]
+    if {$filename ne {}} {
+      ::practcl::debug [self] [self class] [self method] project-compile-products $filename
+      if {[my define exists ofile]} {
+        set ofile [my define get ofile]
+      } else {
+        set ofile [my Ofile $filename]
+        my define set ofile $ofile
+      }
+      lappend result $ofile [list cfile $filename include [my define get include]  extra [my define get extra] external [string is true -strict [my define get external]] object [self]]
+    }
+    }
+    foreach item [my link list subordinate] {
+      lappend result {*}[$item project-compile-products]
+    }
+    return $result
+  }
+  method generate-debug {{spaces {}}} {
+    set result {}
+    ::practcl::cputs result "$spaces[list [self] [list class [info object class [self]] filename [my define get filename]] links [my link list]]"
+    foreach item [my link list subordinate] {
+      practcl::cputs result [$item generate-debug "$spaces  "]
+    }
+    return $result
+  }
+  method generate-cfile-constant {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set result {}
+    my variable code cstruct methods tcltype
+    if {[info exists code(constant)]} {
+      ::practcl::cputs result "/* [my define get filename] CONSTANT */"
+      ::practcl::cputs result $code(constant)
+    }
+    foreach obj [my link list product] {
+      # Exclude products that will generate their own C files
+      if {[$obj define get output_c] ne {}} continue
+      ::practcl::cputs result [$obj generate-cfile-constant]
+    }
+    return $result
+  }
+  method generate-cfile-public-structure {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code cstruct methods tcltype
+    set result {}
+    if {[info exists code(struct)]} {
+      ::practcl::cputs result $code(struct)
+    }
+    foreach obj [my link list product] {
+      # Exclude products that will generate their own C files
+      if {[$obj define get output_c] ne {}} continue
+      ::practcl::cputs result [$obj generate-cfile-public-structure]
+    }
+    return $result
+  }
+  method generate-cfile-header {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code cfunct cstruct methods tcltype tclprocs
+    set result {}
+    if {[info exists code(header)]} {
+      ::practcl::cputs result $code(header)
+    }
+    foreach obj [my link list product] {
+      # Exclude products that will generate their own C files
+      if {[$obj define get output_c] ne {}} continue
+      set dat [$obj generate-cfile-header]
+      if {[string length [string trim $dat]]} {
+        ::practcl::cputs result "/* BEGIN [$obj define get filename] generate-cfile-header */"
+        ::practcl::cputs result $dat
+        ::practcl::cputs result "/* END [$obj define get filename] generate-cfile-header */"
+      }
+    }
+    return $result
+  }
+  method generate-cfile-global {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code cfunct cstruct methods tcltype tclprocs
+    set result {}
+    if {[info exists code(global)]} {
+      ::practcl::cputs result $code(global)
+    }
+    foreach obj [my link list product] {
+      # Exclude products that will generate their own C files
+      if {[$obj define get output_c] ne {}} continue
+      set dat [$obj generate-cfile-global]
+      if {[string length [string trim $dat]]} {
+        ::practcl::cputs result "/* BEGIN [$obj define get filename] generate-cfile-global */"
+        ::practcl::cputs result $dat
+        ::practcl::cputs result "/* END [$obj define get filename] generate-cfile-global */"
+      }
+    }
+    return $result
+  }
+  method generate-cfile-private-typedef {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code cstruct
+    set result {}
+    if {[info exists code(private-typedef)]} {
+      ::practcl::cputs result $code(private-typedef)
+    }
+    if {[info exists cstruct]} {
+      # Add defintion for native c data structures
+      foreach {name info} $cstruct {
+        if {[dict get $info public]==1} continue
+        ::practcl::cputs result "typedef struct $name ${name}\;"
+        if {[dict exists $info aliases]} {
+          foreach n [dict get $info aliases] {
+            ::practcl::cputs result "typedef struct $name ${n}\;"
+          }
+        }
+      }
+    }
+    set result [::practcl::_tagblock $result c [my define get filename]]
+    foreach mod [my link list product] {
+      ::practcl::cputs result [$mod generate-cfile-private-typedef]
+    }
+    return $result
+  }
+  method generate-cfile-private-structure {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code cstruct
+    set result {}
+    if {[info exists code(private-structure)]} {
+      ::practcl::cputs result $code(private-structure)
+    }
+    if {[info exists cstruct]} {
+      foreach {name info} $cstruct {
+        if {[dict get $info public]==1} continue
+        if {[dict exists $info comment]} {
+          ::practcl::cputs result [dict get $info comment]
+        }
+        ::practcl::cputs result "struct $name \{[dict get $info body]\}\;"
+      }
+    }
+    set result [::practcl::_tagblock $result c [my define get filename]]
+    foreach mod [my link list product] {
+      ::practcl::cputs result [$mod generate-cfile-private-structure]
+    }
+    return $result
+  }
+  method generate-cfile-functions {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code cfunct
+    set result {}
+    if {[info exists code(funct)]} {
+      ::practcl::cputs result $code(funct)
+    }
+    if {[info exists cfunct]} {
+      foreach {funcname info} $cfunct {
+        ::practcl::cputs result "/* $funcname */"
+        if {[dict get $info inline] && [dict get $info public]} {
+          ::practcl::cputs result "\ninline [dict get $info header]\{[dict get $info body]\}"
+        } else {
+          ::practcl::cputs result "\n[dict get $info header]\{[dict get $info body]\}"
+        }
+      }
+    }
+    foreach obj [my link list product] {
+      # Exclude products that will generate their own C files
+      if {[$obj define get output_c] ne {}} {
+        continue
+      }
+      ::practcl::cputs result [$obj generate-cfile-functions]
+    }
+    return $result
+  }
+  method generate-cfile-tclapi {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code methods tclprocs
+    set result {}
+    if {[info exists code(method)]} {
+      ::practcl::cputs result $code(method)
+    }
+    foreach obj [my link list product] {
+      # Exclude products that will generate their own C files
+      if {[$obj define get output_c] ne {}} continue
+      ::practcl::cputs result [$obj generate-cfile-tclapi]
+    }
+    return $result
+  }
+  method generate-hfile-public-define {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code
+    set result {}
+    if {[info exists code(public-define)]} {
+      ::practcl::cputs result $code(public-define)
+    }
+    set result [::practcl::_tagblock $result c [my define get filename]]
+    foreach mod [my link list product] {
+      ::practcl::cputs result [$mod generate-hfile-public-define]
+    }
+    return $result
+  }
+  method generate-hfile-public-macro {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code
+    set result {}
+    if {[info exists code(public-macro)]} {
+      ::practcl::cputs result $code(public-macro)
+    }
+    set result [::practcl::_tagblock $result c [my define get filename]]
+    foreach mod [my link list product] {
+      ::practcl::cputs result [$mod generate-hfile-public-macro]
+    }
+    return $result
+  }
+  method generate-hfile-public-typedef {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code cstruct
+    set result {}
+    if {[info exists code(public-typedef)]} {
+      ::practcl::cputs result $code(public-typedef)
+    }
+    if {[info exists cstruct]} {
+      # Add defintion for native c data structures
+      foreach {name info} $cstruct {
+        if {[dict get $info public]==0} continue
+        ::practcl::cputs result "typedef struct $name ${name}\;"
+        if {[dict exists $info aliases]} {
+          foreach n [dict get $info aliases] {
+            ::practcl::cputs result "typedef struct $name ${n}\;"
+          }
+        }
+      }
+    }
+    set result [::practcl::_tagblock $result c [my define get filename]]
+    foreach mod [my link list product] {
+      ::practcl::cputs result [$mod generate-hfile-public-typedef]
+    }
+    return $result
+  }
+  method generate-hfile-public-structure {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code cstruct
+    set result {}
+    if {[info exists code(public-structure)]} {
+      ::practcl::cputs result $code(public-structure)
+    }
+    if {[info exists cstruct]} {
+      foreach {name info} $cstruct {
+        if {[dict get $info public]==0} continue
+        if {[dict exists $info comment]} {
+          ::practcl::cputs result [dict get $info comment]
+        }
+        ::practcl::cputs result "struct $name \{[dict get $info body]\}\;"
+      }
+    }
+    set result [::practcl::_tagblock $result c [my define get filename]]
+    foreach mod [my link list product] {
+      ::practcl::cputs result [$mod generate-hfile-public-structure]
+    }
+    return $result
+  }
+  method generate-hfile-public-headers {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code tcltype
+    set result {}
+    if {[info exists code(public-header)]} {
+      ::practcl::cputs result $code(public-header)
+    }
+    if {[info exists tcltype]} {
+      foreach {type info} $tcltype {
+        if {![dict exists $info cname]} {
+          set cname [string tolower ${type}]_tclobjtype
+          dict set tcltype $type cname $cname
+        } else {
+          set cname [dict get $info cname]
+        }
+        ::practcl::cputs result "extern const Tcl_ObjType $cname\;"
+      }
+    }
+    if {[info exists code(public)]} {
+      ::practcl::cputs result $code(public)
+    }
+    set result [::practcl::_tagblock $result c [my define get filename]]
+    foreach mod [my link list product] {
+      ::practcl::cputs result [$mod generate-hfile-public-headers]
+    }
+    return $result
+  }
+  method generate-hfile-public-function {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code cfunct tcltype
+    set result {}
+
+    if {[my define get initfunc] ne {}} {
+      ::practcl::cputs result "int [my define get initfunc](Tcl_Interp *interp);"
+    }
+    if {[info exists cfunct]} {
+      foreach {funcname info} $cfunct {
+        if {![dict get $info public]} continue
+        ::practcl::cputs result "[dict get $info header]\;"
+      }
+    }
+    set result [::practcl::_tagblock $result c [my define get filename]]
+    foreach mod [my link list product] {
+      ::practcl::cputs result [$mod generate-hfile-public-function]
+    }
+    return $result
+  }
+  method generate-hfile-public-includes {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set includes {}
+    foreach item [my define get public-include] {
+      if {$item ni $includes} {
+        lappend includes $item
+      }
+    }
+    foreach mod [my link list product] {
+      foreach item [$mod generate-hfile-public-includes] {
+        if {$item ni $includes} {
+          lappend includes $item
+        }
+      }
+    }
+    return $includes
+  }
+  method generate-hfile-public-verbatim {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set includes {}
+    foreach item [my define get public-verbatim] {
+      if {$item ni $includes} {
+        lappend includes $item
+      }
+    }
+    foreach mod [my link list subordinate] {
+      foreach item [$mod generate-hfile-public-verbatim] {
+        if {$item ni $includes} {
+          lappend includes $item
+        }
+      }
+    }
+    return $includes
+  }
+  method generate-loader-external {} {
+    if {[my define get initfunc] eq {}} {
+      return "/*  [my define get filename] declared not initfunc */"
+    }
+    return "  if([my define get initfunc](interp)) return TCL_ERROR\;"
+  }
+  method generate-loader-module {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code
+    set result {}
+    if {[info exists code(cinit)]} {
+      ::practcl::cputs result $code(cinit)
+    }
+    if {[my define get initfunc] ne {}} {
+      ::practcl::cputs result "  if([my define get initfunc](interp)!=TCL_OK) return TCL_ERROR\;"
+    }
+    set result [::practcl::_tagblock $result c [my define get filename]]
+    foreach item [my link list product] {
+      if {[$item define get output_c] ne {}} {
+        ::practcl::cputs result [$item generate-loader-external]
+      } else {
+        ::practcl::cputs result [$item generate-loader-module]
+      }
+    }
+    return $result
+  }
+  method generate-stub-function {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    my variable code cfunct tcltype
+    set result {}
+    foreach mod [my link list product] {
+      foreach {funct def} [$mod generate-stub-function] {
+        dict set result $funct $def
+      }
+    }
+    if {[info exists cfunct]} {
+      foreach {funcname info} $cfunct {
+        if {![dict get $info export]} continue
+        dict set result $funcname [dict get $info header]
+      }
+    }
+    return $result
+  }
+  method IncludeAdd {headervar args} {
+    upvar 1 $headervar headers
+    foreach inc $args {
+      if {[string index $inc 0] ni {< \"}} {
+        set inc "\"$inc\""
+      }
+      if {$inc ni $headers} {
+        lappend headers $inc
+      }
+    }
+  }
+  method generate-tcl-loader {} {
+    set result {}
+    set PKGINIT [my define get pkginit]
+    set PKG_NAME [my define get name [my define get pkg_name]]
+    set PKG_VERSION [my define get pkg_vers [my define get version]]
+    if {[string is true [my define get SHARED_BUILD 0]]} {
+      set LIBFILE [my define get libfile]
+      ::practcl::cputs result [string map \
+        [list @LIBFILE@ $LIBFILE @PKGINIT@ $PKGINIT @PKG_NAME@ $PKG_NAME @PKG_VERSION@ $PKG_VERSION] {
+# Shared Library Style
+load [file join [file dirname [file join [pwd] [info script]]] @LIBFILE@] @PKGINIT@
+package provide @PKG_NAME@ @PKG_VERSION@
+}]
+    } else {
+      ::practcl::cputs result [string map \
+      [list @PKGINIT@ $PKGINIT @PKG_NAME@ $PKG_NAME @PKG_VERSION@ $PKG_VERSION] {
+# Tclkit Style
+load {} @PKGINIT@
+package provide @PKG_NAME@ @PKG_VERSION@
+}]
+    }
+    return $result
+  }
+  method generate-tcl-pre {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set result {}
+    my variable code
+    if {[info exists code(tcl)]} {
+      set result [::practcl::_tagblock $code(tcl) tcl [my define get filename]]
+    }
+    if {[info exists code(tcl-pre)]} {
+      set result [::practcl::_tagblock $code(tcl) tcl [my define get filename]]
+    }
+    foreach mod [my link list product] {
+      ::practcl::cputs result [$mod generate-tcl-pre]
+    }
+    return $result
+  }
+  method generate-tcl-post {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set result {}
+    my variable code
+    if {[info exists code(tcl-post)]} {
+      set result [::practcl::_tagblock $code(tcl-post) tcl [my define get filename]]
+    }
+    foreach mod [my link list product] {
+      ::practcl::cputs result [$mod generate-tcl-post]
+    }
+    return $result
+  }
+  method linktype {} {
+    return {subordinate product}
+  }
+  method Ofile filename {
+    set lpath [my <module> define get localpath]
+    if {$lpath eq {}} {
+      set lpath [my <module> define get name]
+    }
+    return ${lpath}_[file rootname [file tail $filename]]
+  }
+  method project-static-packages {} {
+    set result [my define get static_packages]
+    set initfunc [my define get initfunc]
+    if {$initfunc ne {}} {
+      set pkg_name [my define get pkg_name]
+      if {$pkg_name ne {}} {
+        dict set result $pkg_name initfunc $initfunc
+        dict set result $pkg_name version [my define get version [my define get pkg_vers]]
+        dict set result $pkg_name autoload [my define get autoload 0]
+      }
+    }
+    foreach item [my link list subordinate] {
+      foreach {pkg info} [$item project-static-packages] {
+        dict set result $pkg $info
+      }
+    }
+    return $result
+  }
+  method toolset-include-directory {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set result [my define get include_dir]
+    foreach obj [my link list product] {
+      foreach path [$obj toolset-include-directory] {
+        lappend result $path
+      }
+    }
+    return $result
+  }
+  method target {method args} {
+    switch $method {
+      is_unix { return [expr {$::tcl_platform(platform) eq "unix"}] }
+    }
+  }
+}
+oo::objdefine ::practcl::product {
+
+  method select {object} {
+    set class [$object define get class]
+    set mixin [$object define get product]
+    if {$class eq {} && $mixin eq {}} {
+      set filename [$object define get filename]
+      if {$filename ne {} && [file exists $filename]} {
+        switch [file extension $filename] {
+          .tcl {
+            set mixin ::practcl::product.dynamic
+          }
+          .h {
+            set mixin ::practcl::product.cheader
+          }
+          .c {
+            set mixin ::practcl::product.csource
+          }
+          .ini {
+            switch [file tail $filename] {
+              module.ini {
+                set class ::practcl::module
+              }
+              library.ini {
+                set class ::practcl::subproject
+              }
+            }
+          }
+          .so -
+          .dll -
+          .dylib -
+          .a {
+            set mixin ::practcl::product.clibrary
+          }
+        }
+      }
+    }
+    if {$class ne {}} {
+      $object clay mixinmap core $class
+    }
+    if {$mixin ne {}} {
+      $object clay mixinmap product $mixin
+    }
+  }
+}
+::clay::define ::practcl::product.cheader {
+  superclass ::practcl::product
+  method project-compile-products {} {}
+  method generate-loader-module {} {}
+}
+::clay::define ::practcl::product.csource {
+  superclass ::practcl::product
+  method project-compile-products {} {
+    set result {}
+    set filename [my define get filename]
+    if {$filename ne {}} {
+      ::practcl::debug [self] [self class] [self method] project-compile-products $filename
+      if {[my define exists ofile]} {
+        set ofile [my define get ofile]
+      } else {
+        set ofile [my Ofile $filename]
+        my define set ofile $ofile
+      }
+      lappend result $ofile [list cfile $filename extra [my define get extra] external [string is true -strict [my define get external]] object [self]]
+    }
+    foreach item [my link list subordinate] {
+      lappend result {*}[$item project-compile-products]
+    }
+    return $result
+  }
+}
+::clay::define ::practcl::product.clibrary {
+  superclass ::practcl::product
+  method linker-products {configdict} {
+    return [my define get filename]
+  }
+}
+::clay::define ::practcl::product.dynamic {
+  superclass ::practcl::dynamic ::practcl::product
+  method initialize {} {
+    set filename [my define get filename]
+    if {$filename eq {}} {
+      return
+    }
+    if {[my define get name] eq {}} {
+      my define set name [file tail [file rootname $filename]]
+    }
+    if {[my define get localpath] eq {}} {
+      my define set localpath [my <module> define get localpath]_[my define get name]
+    }
+    # Future Development:
+    # Scan source file to see if it is encoded in criticl or practcl notation
+    #set thisline {}
+    #foreach line [split [::practcl::cat $filename] \n] {
+    #
+    #}
+    ::source $filename
+    if {[my define get output_c] ne {}} {
+      # Turn into a module if we have an output_c file
+      my morph ::practcl::module
+    }
+  }
+}
+::clay::define ::practcl::product.critcl {
+  superclass ::practcl::dynamic ::practcl::product
+}
+
+###
+# END: class product.tcl
+###
+###
+# START: class module.tcl
+###
+::clay::define ::practcl::module {
+  superclass ::practcl::object ::practcl::product.dynamic
+  Dict make_object {}
+  method _MorphPatterns {} {
+    return {{@name@} {::practcl::module.@name@} ::practcl::module}
+  }
+  method add args {
+    my variable links
+    set object [::practcl::object new [self] {*}$args]
+    foreach linktype [$object linktype] {
+      lappend links($linktype) $object
+    }
+    return $object
+  }
+  method install-headers args {}
+  Ensemble make::_preamble {} {
+    my variable make_object
+    if {![info exists make_object]} {
+      set make_object {}
+    }
+  }
+  Ensemble make::pkginfo {} {
+    ###
+    # Build local variables needed for install
+    ###
+    package require platform
+    set result {}
+    set dat [my define dump]
+    set PKG_DIR [dict get $dat name][dict get $dat version]
+    dict set result PKG_DIR $PKG_DIR
+    dict with dat {}
+    if {![info exists DESTDIR]} {
+      set DESTDIR {}
+    }
+    dict set result profile [::platform::identify]
+    dict set result os $::tcl_platform(os)
+    dict set result platform $::tcl_platform(platform)
+    foreach {field value} $dat {
+      switch $field {
+        includedir -
+        mandir -
+        datadir -
+        libdir -
+        libfile -
+        name -
+        output_tcl -
+        version -
+        authors -
+        license -
+        requires {
+          dict set result $field $value
+        }
+        TEA_PLATFORM {
+          dict set result platform $value
+        }
+        TEACUP_OS {
+          dict set result os $value
+        }
+        TEACUP_PROFILE {
+          dict set result profile $value
+        }
+        TEACUP_ZIPFILE {
+          dict set result zipfile $value
+        }
+      }
+    }
+    if {![dict exists $result zipfile]} {
+      dict set result zipfile "[dict get $result name]-[dict get $result version]-[dict get $result profile].zip"
+    }
+    return $result
+  }
+  Ensemble make::objects {} {
+    return $make_object
+  }
+  Ensemble make::object name {
+    if {[dict exists $make_object $name]} {
+      return [dict get $make_object $name]
+    }
+    return {}
+  }
+  Ensemble make::reset {} {
+    foreach {name obj} $make_object {
+      $obj reset
+    }
+  }
+  Ensemble make::trigger args {
+    foreach {name obj} $make_object {
+      if {$name in $args} {
+        $obj triggers
+      }
+    }
+  }
+  Ensemble make::depends args {
+    foreach {name obj} $make_object {
+      if {$name in $args} {
+        $obj check
+      }
+    }
+  }
+  Ensemble make::filename name {
+    if {[dict exists $make_object $name]} {
+      return [[dict get $make_object $name] define get filename]
+    }
+  }
+  Ensemble make::target {name Info body} {
+    set info [uplevel #0 [list subst $Info]]
+    set nspace [namespace current]
+    if {[dict exist $make_object $name]} {
+      set obj [dict get $$make_object $name]
+    } else {
+      set obj [::practcl::make_obj new [self] $name $info $body]
+      dict set make_object $name $obj
+      dict set target_make $name 0
+      dict set target_trigger $name 0
+    }
+    if {[dict exists $info aliases]} {
+      foreach item [dict get $info aliases] {
+        if {![dict exists $make_object $item]} {
+          dict set make_object $item $obj
+        }
+      }
+    }
+    return $obj
+  }
+  clay set method_ensemble make target aliases {target add}
+  Ensemble make::todo {} {
+    foreach {name obj} $make_object {
+      if {[$obj do]} {
+        lappend result $name
+      }
+    }
+    return $result
+  }
+  Ensemble make::do {} {
+    global CWD SRCDIR project SANDBOX
+    foreach {name obj} $make_object {
+      if {[$obj do]} {
+        eval [$obj define get action]
+      }
+    }
+  }
+  method child which {
+    switch $which {
+      delegate -
+      organs {
+        return [list project [my define get project] module [self]]
+      }
+    }
+  }
+  method generate-c {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set result {
+/* This file was generated by practcl */
+    }
+    set includes {}
+
+    foreach mod [my link list product] {
+      # Signal modules to formulate final implementation
+      $mod go
+    }
+    set headers {}
+
+    my IncludeAdd headers <tcl.h> <tclOO.h>
+    if {[my define get tk 0]} {
+      my IncludeAdd headers <tk.h>
+    }
+    if {[my define get output_h] ne {}} {
+      my IncludeAdd headers [my define get output_h]
+    }
+    my IncludeAdd headers {*}[my define get include]
+
+    foreach mod [my link list dynamic] {
+      my IncludeAdd headers {*}[$mod define get include]
+    }
+    foreach inc $headers {
+      ::practcl::cputs result "#include $inc"
+    }
+    foreach {method} {
+      generate-cfile-header
+      generate-cfile-private-typedef
+      generate-cfile-private-structure
+      generate-cfile-public-structure
+      generate-cfile-constant
+      generate-cfile-global
+      generate-cfile-functions
+      generate-cfile-tclapi
+    } {
+      set dat [my $method]
+      if {[string length [string trim $dat]]} {
+        ::practcl::cputs result "/* BEGIN $method [my define get filename] */"
+        ::practcl::cputs result $dat
+        ::practcl::cputs result "/* END $method [my define get filename] */"
+      }
+    }
+    ::practcl::debug [list /[self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    return $result
+  }
+  method generate-h {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set result {}
+    foreach method {
+      generate-hfile-public-define
+      generate-hfile-public-macro
+    } {
+      ::practcl::cputs result "/* BEGIN SECTION $method */"
+      ::practcl::cputs result [my $method]
+      ::practcl::cputs result "/* END SECTION $method */"
+    }
+    set includes [my generate-hfile-public-includes]
+    foreach inc $includes {
+      if {[string index $inc 0] ni {< \"}} {
+        ::practcl::cputs result "#include \"$inc\""
+      } else {
+        ::practcl::cputs result "#include $inc"
+      }
+    }
+    foreach method {
+      generate-hfile-public-typedef
+      generate-hfile-public-structure
+    } {
+      ::practcl::cputs result "/* BEGIN SECTION $method */"
+      ::practcl::cputs result [my $method]
+      ::practcl::cputs result "/* END SECTION $method */"
+    }
+
+    foreach file [my generate-hfile-public-verbatim] {
+      ::practcl::cputs result "/* BEGIN $file */"
+      ::practcl::cputs result [::practcl::cat $file]
+      ::practcl::cputs result "/* END $file */"
+    }
+
+    foreach method {
+      generate-hfile-public-headers
+      generate-hfile-public-function
+    } {
+      ::practcl::cputs result "/* BEGIN SECTION $method */"
+      ::practcl::cputs result [my $method]
+      ::practcl::cputs result "/* END SECTION $method */"
+    }
+    return $result
+  }
+  method generate-loader {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set result {}
+    if {[my define get initfunc] eq {}} return
+    ::practcl::cputs result  "
+extern int DLLEXPORT [my define get initfunc]( Tcl_Interp *interp ) \{"
+    ::practcl::cputs result  {
+  /* Initialise the stubs tables. */
+  #ifdef USE_TCL_STUBS
+    if (Tcl_InitStubs(interp, "8.6", 0)==NULL) return TCL_ERROR;
+    if (TclOOInitializeStubs(interp, "1.0") == NULL) return TCL_ERROR;
+}
+    if {[my define get tk 0]} {
+      ::practcl::cputs result  {    if (Tk_InitStubs(interp, "8.6", 0)==NULL) return TCL_ERROR;}
+    }
+    ::practcl::cputs result {  #endif}
+    set TCLINIT [my generate-tcl-pre]
+    if {[string length [string trim $TCLINIT]]} {
+      ::practcl::cputs result "  if(interp) {\nif(Tcl_Eval(interp,[::practcl::tcl_to_c $TCLINIT])) return TCL_ERROR;\n  }"
+    }
+    ::practcl::cputs result [my generate-loader-module]
+
+    set TCLINIT [my generate-tcl-post]
+    if {[string length [string trim $TCLINIT]]} {
+      ::practcl::cputs result "  if(interp) {\nif(Tcl_Eval(interp,[::practcl::tcl_to_c $TCLINIT])) return TCL_ERROR;\n }"
+    }
+    if {[my define exists pkg_name]} {
+      ::practcl::cputs result  "    if (Tcl_PkgProvide(interp, \"[my define get pkg_name [my define get name]]\" , \"[my define get pkg_vers [my define get version]]\" )) return TCL_ERROR\;"
+    }
+    ::practcl::cputs result  "  return TCL_OK\;\n\}\n"
+    return $result
+  }
+  method initialize {} {
+    set filename [my define get filename]
+    if {$filename eq {}} {
+      return
+    }
+    if {[my define get name] eq {}} {
+      my define set name [file tail [file dirname $filename]]
+    }
+    if {[my define get localpath] eq {}} {
+      my define set localpath [my <project> define get name]_[my define get name]
+    }
+    my graft module [self]
+    ::practcl::debug [self] SOURCE $filename
+    my source $filename
+  }
+  method implement path {
+    my go
+    my Collate_Source $path
+    set errs {}
+    foreach item [my link list dynamic] {
+      if {[catch {$item implement $path} err errdat]} {
+        lappend errs "Skipped $item: [$item define get filename] $err"
+        if {[dict exists $errdat -errorinfo]} {
+          lappend errs [dict get $errdat -errorinfo]
+        } else {
+          lappend errs $errdat
+        }
+      }
+    }
+    foreach item [my link list module] {
+      if {[catch {$item implement $path} err errdat]} {
+        lappend errs "Skipped $item: [$item define get filename] $err"
+        if {[dict exists $errdat -errorinfo]} {
+          lappend errs [dict get $errdat -errorinfo]
+        } else {
+          lappend errs $errdat
+        }
+      }
+    }
+    if {[llength $errs]} {
+      set logfile [file join $::CWD practcl.log]
+      ::practcl::log $logfile "*** ERRORS ***"
+      foreach {item trace} $errs {
+        ::practcl::log $logfile "###\n# ERROR\n###\n$item"
+       ::practcl::log $logfile "###\n# TRACE\n###\n$trace"
+      }
+      ::practcl::log $logfile "*** DEBUG INFO ***"
+      ::practcl::log $logfile $::DEBUG_INFO
+      puts stderr "Errors saved to $logfile"
+      exit 1
+    }
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set filename [my define get output_c]
+    if {$filename eq {}} {
+      ::practcl::debug [list /[self] [self method] [self class]]
+      return
+    }
+    set cout [open [file join $path [file rootname $filename].c] w]
+    puts $cout [subst {/*
+** This file is generated by the [info script] script
+** any changes will be overwritten the next time it is run
+*/}]
+    puts $cout [my generate-c]
+    puts $cout [my generate-loader]
+    close $cout
+    ::practcl::debug [list /[self] [self method] [self class]]
+  }
+  method linktype {} {
+    return {subordinate product dynamic module}
+  }
+}
+
+###
+# END: class module.tcl
+###
+###
+# START: class project baseclass.tcl
+###
+::clay::define ::practcl::project {
+  superclass ::practcl::module
+  method _MorphPatterns {} {
+    return {{@name@} {::practcl::@name@} {::practcl::project.@name@} {::practcl::project}}
+  }
+  constructor args {
+    my variable define
+    if {[llength $args] == 1} {
+      set rawcontents [lindex $args 0]
+    } else {
+      set rawcontents $args
+    }
+    if {[catch {uplevel 1 [list subst $rawcontents]} contents]} {
+      set contents $rawcontents
+    }
+    ###
+    # The first instance of ::practcl::project (or its descendents)
+    # registers itself as the ::practcl::MAIN. If a project other
+    # than ::practcl::LOCAL is created, odds are that was the one
+    # the developer intended to be the main project
+    ###
+    if {$::practcl::MAIN eq "::practcl::LOCAL"} {
+      set ::practcl::MAIN [self]
+    }
+    # DEFS fields need to be passed unchanged and unsubstituted
+    # as we need to preserve their escape characters
+    foreach field {TCL_DEFS DEFS TK_DEFS} {
+      if {[dict exists $rawcontents $field]} {
+        dict set contents $field [dict get $rawcontents $field]
+      }
+    }
+    my graft module [self]
+    array set define $contents
+    ::practcl::toolset select [self]
+    my initialize
+  }
+  method add_object object {
+    my link object $object
+  }
+  method add_project {pkg info {oodefine {}}} {
+    ::practcl::debug [self] add_project $pkg $info
+    set os [my define get TEACUP_OS]
+    if {$os eq {}} {
+      set os [::practcl::os]
+      my define set os $os
+    }
+    set fossilinfo [list download [my define get download] tag trunk sandbox [my define get sandbox]]
+    if {[dict exists $info os] && ($os ni [dict get $info os])} return
+    # Select which tag to use here.
+    # For production builds: tag-release
+    set profile [my define get profile release]:
+    if {[dict exists $info profile $profile]} {
+      dict set info tag [dict get $info profile $profile]
+    }
+    dict set info USEMSVC [my define get USEMSVC 0]
+    dict set info debug [my define get debug 0]
+    set obj [namespace current]::PROJECT.$pkg
+    if {[info command $obj] eq {}} {
+      set obj [::practcl::subproject create $obj [self] [dict merge $fossilinfo [list name $pkg pkg_name $pkg static 0 class subproject.binary] $info]]
+    }
+    my link object $obj
+    oo::objdefine $obj $oodefine
+    $obj define set masterpath $::CWD
+    $obj go
+    return $obj
+  }
+  method add_tool {pkg info {oodefine {}}} {
+    ::practcl::debug [self] add_tool $pkg $info
+    set info [dict merge [::practcl::local_os] $info]
+
+    set os [dict get $info TEACUP_OS]
+    set fossilinfo [list download [my define get download] tag trunk sandbox [my define get sandbox]]
+    if {[dict exists $info os] && ($os ni [dict get $info os])} return
+    # Select which tag to use here.
+    # For production builds: tag-release
+    set profile [my define get profile release]:
+    if {[dict exists $info profile $profile]} {
+      dict set info tag [dict get $info profile $profile]
+    }
+    set obj ::practcl::OBJECT::TOOL.$pkg
+    if {[info command $obj] eq {}} {
+      set obj [::practcl::subproject create $obj [self] [dict merge $fossilinfo [list name $pkg pkg_name $pkg static 0] $info]]
+    }
+    my link add tool $obj
+    oo::objdefine $obj $oodefine
+    $obj define set masterpath $::CWD
+    $obj go
+    return $obj
+  }
+  method build-tclcore {} {
+    set os [my define get TEACUP_OS]
+    set tcl_config_opts [::practcl::platform::tcl_core_options $os]
+    set tk_config_opts  [::practcl::platform::tk_core_options $os]
+
+    lappend tcl_config_opts --prefix [my define get prefix] --exec-prefix [my define get prefix]
+    set tclobj [my tclcore]
+    if {[my define get debug 0]} {
+      $tclobj define set debug 1
+      lappend tcl_config_opts --enable-symbols=true
+    }
+    $tclobj define set config_opts $tcl_config_opts
+    $tclobj go
+    $tclobj compile
+
+    set _TclSrcDir [$tclobj define get localsrcdir]
+    my define set tclsrcdir $_TclSrcDir
+    if {[my define get tk 0]} {
+      set tkobj [my tkcore]
+      lappend tk_config_opts --with-tcl=[::practcl::file_relative [$tkobj define get builddir]  [$tclobj define get builddir]]
+      if {[my define get debug 0]} {
+        $tkobj define set debug 1
+        lappend tk_config_opts --enable-symbols=true
+      }
+      $tkobj define set config_opts $tk_config_opts
+      $tkobj compile
+    }
+  }
+  method child which {
+    switch $which {
+      delegate -
+      organs {
+	# A library can be a project, it can be a module. Any
+	# subordinate modules will indicate their existance
+        return [list project [self] module [self]]
+      }
+    }
+  }
+  method linktype {} {
+    return project
+  }
+  method project {pkg args} {
+    set obj [namespace current]::PROJECT.$pkg
+    if {[llength $args]==0} {
+      return $obj
+    }
+    ${obj} {*}$args
+  }
+  method tclcore {} {
+    if {[info commands [set obj [my clay delegate tclcore]]] ne {}} {
+      return $obj
+    }
+    if {[info commands [set obj [my project TCLCORE]]] ne {}} {
+      my graft tclcore $obj
+      return $obj
+    }
+    if {[info commands [set obj [my project tcl]]] ne {}} {
+      my graft tclcore $obj
+      return $obj
+    }
+    if {[info commands [set obj [my tool tcl]]] ne {}} {
+      my graft tclcore $obj
+      return $obj
+    }
+    # Provide a fallback
+    set obj [my add_tool tcl {
+      tag release class subproject.core
+      fossil_url http://core.tcl.tk/tcl
+    }]
+    my graft tclcore $obj
+    return $obj
+  }
+  method tkcore {} {
+    if {[set obj [my clay delegate tkcore]] ne {}} {
+      return $obj
+    }
+    if {[set obj [my project tk]] ne {}} {
+      my graft tkcore $obj
+      return $obj
+    }
+    if {[set obj [my tool tk]] ne {}} {
+      my graft tkcore $obj
+      return $obj
+    }
+    # Provide a fallback
+    set obj [my add_tool tk {
+      tag release class tool.core
+      fossil_url http://core.tcl.tk/tk
+    }]
+    my graft tkcore $obj
+    return $obj
+  }
+  method tool {pkg args} {
+    set obj ::practcl::OBJECT::TOOL.$pkg
+    if {[llength $args]==0} {
+      return $obj
+    }
+    ${obj} {*}$args
+  }
+}
+
+###
+# END: class project baseclass.tcl
+###
+###
+# START: class project library.tcl
+###
+::clay::define ::practcl::library {
+  superclass ::practcl::project
+  method clean {PATH} {
+    set objext [my define get OBJEXT o]
+    foreach {ofile info} [my project-compile-products] {
+      if {[file exists [file join $PATH objs $ofile].${objext}]} {
+        file delete [file join $PATH objs $ofile].${objext}
+      }
+    }
+    foreach ofile [glob -nocomplain [file join $PATH *.${objext}]] {
+      file delete $ofile
+    }
+    foreach ofile [glob -nocomplain [file join $PATH objs *]] {
+      file delete $ofile
+    }
+    set libfile [my define get libfile]
+    if {[file exists [file join $PATH $libfile]]} {
+      file delete [file join $PATH $libfile]
+    }
+    my implement $PATH
+  }
+  method project-compile-products {} {
+    set result {}
+    foreach item [my link list subordinate] {
+      lappend result {*}[$item project-compile-products]
+    }
+    set filename [my define get output_c]
+    if {$filename ne {}} {
+      ::practcl::debug [self] [self class] [self method] project-compile-products $filename
+      set ofile [file rootname [file tail $filename]]_main
+      lappend result $ofile [list cfile $filename extra [my define get extra] external [string is true -strict [my define get external]]]
+    }
+    return $result
+  }
+  method go {} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set name [my define getnull name]
+    if {$name eq {}} {
+      set name generic
+      my define name generic
+    }
+    if {[my define get tk] eq {@TEA_TK_EXTENSION@}} {
+      my define set tk 0
+    }
+    set output_c [my define getnull output_c]
+    if {$output_c eq {}} {
+      set output_c [file rootname $name].c
+      my define set output_c $output_c
+    }
+    set output_h [my define getnull output_h]
+    if {$output_h eq {}} {
+      set output_h [file rootname $output_c].h
+      my define set output_h $output_h
+    }
+    set output_tcl [my define getnull output_tcl]
+    #if {$output_tcl eq {}} {
+    #  set output_tcl [file rootname $output_c].tcl
+    #  my define set output_tcl $output_tcl
+    #}
+    #set output_mk [my define getnull output_mk]
+    #if {$output_mk eq {}} {
+    #  set output_mk [file rootname $output_c].mk
+    #  my define set output_mk $output_mk
+    #}
+    set initfunc [my define getnull initfunc]
+    if {$initfunc eq {}} {
+      set initfunc [string totitle $name]_Init
+      my define set initfunc $initfunc
+    }
+    set output_decls [my define getnull output_decls]
+    if {$output_decls eq {}} {
+      set output_decls [file rootname $output_c].decls
+      my define set output_decls $output_decls
+    }
+    my variable links
+    foreach {linktype objs} [array get links] {
+      foreach obj $objs {
+        $obj go
+      }
+    }
+    ::practcl::debug [list /[self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+  }
+  method generate-decls {pkgname path} {
+    ::practcl::debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]]
+    set outfile [file join $path/$pkgname.decls]
+
+    ###
+    # Build the decls file
+    ## #
+    set fout [open $outfile w]
+    puts $fout [subst {###
+  # $outfile
+  #
+  # This file was generated by [info script]
+  ###
+
+library $pkgname
+interface $pkgname
+}]
+
+    ###
+    # Generate list of functions
+    ###
+    set stubfuncts [my generate-stub-function]
+    set thisline {}
+    set functcount 0
+    foreach {func header} $stubfuncts {
+      puts $fout [list declare [incr functcount] $header]
+    }
+    puts $fout [list export "int [my define get initfunc](Tcl_Inter *interp)"]
+    puts $fout [list export "char *[string totitle [my define get name]]_InitStubs(Tcl_Inter *interp, char *version, int exact)"]
+
+    close $fout
+
+    ###
+    # Build [package]Decls.h
+    ###
+    set hout [open [file join $path ${pkgname}Decls.h] w]
+    close $hout
+
+    set cout [open [file join $path ${pkgname}StubInit.c] w]
+    puts $cout [string map [list %pkgname% $pkgname %PkgName% [string totitle $pkgname]] {
+#ifndef USE_TCL_STUBS
+#define USE_TCL_STUBS
+#endif
+#undef USE_TCL_STUB_PROCS
+
+#include "tcl.h"
+#include "%pkgname%.h"
+
+/*
+** Ensure that Tdom_InitStubs is built as an exported symbol.  The other stub
+** functions should be built as non-exported symbols.
+*/
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
+
+%PkgName%Stubs *%pkgname%StubsPtr;
+
+ /*
+ **----------------------------------------------------------------------
+ **
+ **  %PkgName%_InitStubs --
+ **
+ **        Checks that the correct version of %PkgName% is loaded and that it
+ **        supports stubs. It then initialises the stub table pointers.
+ **
+ **  Results:
+ **        The actual version of %PkgName% that satisfies the request, or
+ **        NULL to indicate that an error occurred.
+ **
+ **  Side effects:
+ **        Sets the stub table pointers.
+ **
+ **----------------------------------------------------------------------
+ */
+
+char *
+%PkgName%_InitStubs (Tcl_Interp *interp, char *version, int exact)
+{
+  char *actualVersion;
+  actualVersion = Tcl_PkgRequireEx(interp, "%pkgname%", version, exact,(ClientData *) &%pkgname%StubsPtr);
+  if (!actualVersion) {
+    return NULL;
+  }
+  if (!%pkgname%StubsPtr) {
+    Tcl_SetResult(interp,"This implementation of %PkgName% does not support stubs",TCL_STATIC);
+    return NULL;
+  }
+  return actualVersion;
+}
+}]
+    close $cout
+  }
+  method implement path {
+    my go
+    my Collate_Source $path
+    set errs {}
+    foreach item [my link list dynamic] {
+      if {[catch {$item implement $path} err errdat]} {
+        lappend errs "Skipped $item: [$item define get filename] $err"
+        if {[dict exists $errdat -errorinfo]} {
+          lappend errs [dict get $errdat -errorinfo]
+        } else {
+          lappend errs $errdat
+        }
+      }
+    }
+    foreach item [my link list module] {
+      if {[catch {$item implement $path} err errdat]} {
+        lappend errs "Skipped $item: [$item define get filename] $err"
+        if {[dict exists $errdat -errorinfo]} {
+          lappend errs [dict get $errdat -errorinfo]
+        } else {
+          lappend errs $errdat
+        }
+      }
+    }
+    if {[llength $errs]} {
+      set logfile [file join $::CWD practcl.log]
+      ::practcl::log $logfile "*** ERRORS ***"
+      foreach {item trace} $errs {
+        ::practcl::log $logfile "###\n# ERROR\n###$item"
+        ::practcl::log $logfile "###\n# TRACE\n###$trace"
+      }
+      ::practcl::log $logfile "*** DEBUG INFO ***"
+      ::practcl::log $logfile $::DEBUG_INFO
+      puts stderr "Errors saved to $logfile"
+      exit 1
+    }
+    set cout [open [file join $path [my define get output_c]] w]
+    puts $cout [subst {/*
+** This file is generated by the [info script] script
+** any changes will be overwritten the next time it is run
+*/}]
+    puts $cout [my generate-c]
+    puts $cout [my generate-loader]
+    close $cout
+
+    set macro HAVE_[string toupper [file rootname [my define get output_h]]]_H
+    set hout [open [file join $path [my define get output_h]] w]
+    puts $hout [subst {/*
+** This file is generated by the [info script] script
+** any changes will be overwritten the next time it is run
+*/}]
+    puts $hout "#ifndef ${macro}"
+    puts $hout "#define ${macro} 1"
+    puts $hout [my generate-h]
+    puts $hout "#endif"
+    close $hout
+
+    set output_tcl [my define get output_tcl]
+    if {$output_tcl ne {}} {
+      set tclout [open [file join $path [my define get output_tcl]] w]
+      puts $tclout "###
+# This file is generated by the [info script] script
+# any changes will be overwritten the next time it is run
+###"
+      puts $tclout [my generate-tcl-pre]
+      puts $tclout [my generate-tcl-loader]
+      puts $tclout [my generate-tcl-post]
+      close $tclout
+    }
+  }
+  method generate-make path {
+    my build-Makefile $path [self]
+  }
+  method linktype {} {
+    return library
+  }
+  method package-ifneeded {args} {
+    set result {}
+    set name [my define get pkg_name [my define get name]]
+    set version [my define get pkg_vers [my define get version]]
+    if {$version eq {}} {
+      set version 0.1a
+    }
+    set output_tcl [my define get output_tcl]
+    if {$output_tcl ne {}} {
+      set script "\[list source \[file join \$dir $output_tcl\]\]"
+    } elseif {[my define get SHARED_BUILD 0]} {
+      set script "\[list load \[file join \$dir [my define get libfile]\] $name\]"
+    } else {
+      # Provide a null passthrough
+      set script "\[list package provide $name $version\]"
+    }
+    set result "package ifneeded [list $name] [list $version] $script"
+    foreach alias $args {
+      set script "package require $name $version \; package provide $alias $version"
+      append result \n\n [list package ifneeded $alias $version $script]
+    }
+    return $result
+  }
+  method shared_library {{filename {}}} {
+    set name [string tolower [my define get name [my define get pkg_name]]]
+    set NAME [string toupper $name]
+    set version [my define get version [my define get pkg_vers]]
+    set map {}
+    lappend map %LIBRARY_NAME% $name
+    lappend map %LIBRARY_VERSION% $version
+    lappend map %LIBRARY_VERSION_NODOTS% [string map {. {}} $version]
+    lappend map %LIBRARY_PREFIX% [my define getnull libprefix]
+    set outfile [string map $map [my define get PRACTCL_NAME_LIBRARY]][my define get SHLIB_SUFFIX]
+    return $outfile
+  }
+  method static_library {{filename {}}} {
+    set name [string tolower [my define get name [my define get pkg_name]]]
+    set NAME [string toupper $name]
+    set version [my define get version [my define get pkg_vers]]
+    set map {}
+    lappend map %LIBRARY_NAME% $name
+    lappend map %LIBRARY_VERSION% $version
+    lappend map %LIBRARY_VERSION_NODOTS% [string map {. {}} $version]
+    lappend map %LIBRARY_PREFIX% [my define getnull libprefix]
+    set outfile [string map $map [my define get PRACTCL_NAME_LIBRARY]].a
+    return $outfile
+  }
+}
+
+###
+# END: class project library.tcl
+###
+###
+# START: class project tclkit.tcl
+###
+::clay::define ::practcl::tclkit {
+  superclass ::practcl::library
+  method build-tclkit_main {PROJECT PKG_OBJS} {
+    ###
+    # Build static package list
+    ###
+    set statpkglist {}
+    foreach cobj [list {*}${PKG_OBJS} $PROJECT] {
+      foreach {pkg info} [$cobj project-static-packages] {
+        dict set statpkglist $pkg $info
+      }
+    }
+    foreach {ofile info} [${PROJECT} project-compile-products] {
+      if {![dict exists $info object]} continue
+      set cobj [dict get $info object]
+      foreach {pkg info} [$cobj project-static-packages] {
+        dict set statpkglist $pkg $info
+      }
+    }
+
+    set result {}
+    $PROJECT include {<tcl.h>}
+    $PROJECT include {"tclInt.h"}
+    $PROJECT include {"tclFileSystem.h"}
+    $PROJECT include {<assert.h>}
+    $PROJECT include {<stdio.h>}
+    $PROJECT include {<stdlib.h>}
+    $PROJECT include {<string.h>}
+    $PROJECT include {<math.h>}
+
+    $PROJECT code header {
+#ifndef MODULE_SCOPE
+#   define MODULE_SCOPE extern
+#endif
+
+/*
+** Provide a dummy Tcl_InitStubs if we are using this as a static
+** library.
+*/
+#ifndef USE_TCL_STUBS
+# undef  Tcl_InitStubs
+# define Tcl_InitStubs(a,b,c) TCL_VERSION
+#endif
+#define STATIC_BUILD 1
+#undef USE_TCL_STUBS
+
+/* Make sure the stubbed variants of those are never used. */
+#undef Tcl_ObjSetVar2
+#undef Tcl_NewStringObj
+#undef Tk_Init
+#undef Tk_MainEx
+#undef Tk_SafeInit
+}
+
+    # Build an area of the file for #define directives and
+    # function declarations
+    set define {}
+    set mainhook   [$PROJECT define get TCL_LOCAL_MAIN_HOOK Tclkit_MainHook]
+    set mainfunc   [$PROJECT define get TCL_LOCAL_APPINIT Tclkit_AppInit]
+    set mainscript [$PROJECT define get main.tcl main.tcl]
+    set vfsroot    [$PROJECT define get vfsroot "[$PROJECT define get ZIPFS_VOLUME]app"]
+    set vfs_main "${vfsroot}/${mainscript}"
+
+    set map {}
+    foreach var {
+      vfsroot mainhook mainfunc vfs_main
+    } {
+      dict set map %${var}% [set $var]
+    }
+    set thread_init_script {namespace eval ::starkit {}}
+    append thread_init_script \n [list set ::starkit::topdir $vfsroot]
+    set preinitscript {
+set ::odie(boot_vfs) %vfsroot%
+set ::SRCDIR $::odie(boot_vfs)
+namespace eval ::starkit {}
+set ::starkit::topdir %vfsroot%
+if {[file exists [file join %vfsroot% tcl_library init.tcl]]} {
+  set ::tcl_library [file join %vfsroot% tcl_library]
+  set ::auto_path {}
+}
+if {[file exists [file join %vfsroot% tk_library tk.tcl]]} {
+  set ::tk_library [file join %vfsroot% tk_library]
+}
+} ; # Preinitscript
+
+    set zvfsboot {
+/*
+ * %mainhook% --
+ * Performs the argument munging for the shell
+ */
+  }
+    ::practcl::cputs zvfsboot {
+  CONST char *archive;
+  Tcl_FindExecutable(*argv[0]);
+  archive=Tcl_GetNameOfExecutable();
+}
+    # We have to initialize the virtual filesystem before calling
+    # Tcl_Init().  Otherwise, Tcl_Init() will not be able to find
+    # its startup script files.
+    if {![$PROJECT define get tip_430 0]} {
+      # Add declarations of functions that tip430 puts in the stub files
+      $PROJECT code public-header {
+int TclZipfs_Init(Tcl_Interp *interp);
+int TclZipfs_Mount(
+    Tcl_Interp *interp,
+    const char *mntpt,
+    const char *zipname,
+    const char *passwd
+);
+int TclZipfs_Mount_Buffer(
+    Tcl_Interp *interp,
+    const char *mntpt,
+    unsigned char *data,
+    size_t datalen,
+    int copy
+);
+}
+      ::practcl::cputs zvfsboot {  TclZipfs_Init(NULL);}
+    }
+    ::practcl::cputs zvfsboot "  if(!TclZipfs_Mount(NULL, \"app\", archive, NULL)) \x7B "
+    ::practcl::cputs zvfsboot {
+      Tcl_Obj *vfsinitscript;
+      vfsinitscript=Tcl_NewStringObj("%vfs_main%",-1);
+      Tcl_IncrRefCount(vfsinitscript);
+      if(Tcl_FSAccess(vfsinitscript,F_OK)==0) {
+        /* Startup script should be set before calling Tcl_AppInit */
+        Tcl_SetStartupScript(vfsinitscript,NULL);
+      }
+    }
+    ::practcl::cputs zvfsboot "    TclSetPreInitScript([::practcl::tcl_to_c $preinitscript])\;"
+    ::practcl::cputs zvfsboot "  \x7D else \x7B"
+    ::practcl::cputs zvfsboot "    TclSetPreInitScript([::practcl::tcl_to_c {
+foreach path {../tcl} {
+  set p  [file join $path library init.tcl]
+  if {[file exists [file join $path library init.tcl]]} {
+    set ::tcl_library [file normalize [file join $path library]]
+    break
+  }
+}
+foreach path {
+  ../tk
+} {
+  if {[file exists [file join $path library tk.tcl]]} {
+    set ::tk_library [file normalize [file join $path library]]
+    break
+  }
+}
+}])\;"
+    ::practcl::cputs zvfsboot "  \x7D"
+    ::practcl::cputs zvfsboot "  return TCL_OK;"
+
+    if {[$PROJECT define get TEACUP_OS] eq "windows"} {
+      set header {int %mainhook%(int *argc, TCHAR ***argv)}
+    } else {
+      set header {int %mainhook%(int *argc, char ***argv)}
+    }
+    $PROJECT c_function  [string map $map $header] [string map $map $zvfsboot]
+
+    practcl::cputs appinit "int %mainfunc%(Tcl_Interp *interp) \x7B"
+
+  # Build AppInit()
+  set appinit {}
+  practcl::cputs appinit {
+  if ((Tcl_Init)(interp) == TCL_ERROR) {
+      return TCL_ERROR;
+  }
+
+}
+    if {![$PROJECT define get tip_430 0]} {
+      ::practcl::cputs appinit {  TclZipfs_Init(interp);}
+    }
+    set main_init_script {}
+
+    foreach {statpkg info} $statpkglist {
+      set initfunc {}
+      if {[dict exists $info initfunc]} {
+        set initfunc [dict get $info initfunc]
+      }
+      if {$initfunc eq {}} {
+        set initfunc [string totitle ${statpkg}]_Init
+      }
+      if {![dict exists $info version]} {
+        error "$statpkg HAS NO VERSION"
+      }
+      # We employ a NULL to prevent the package system from thinking the
+      # package is actually loaded into the interpreter
+      $PROJECT code header "extern Tcl_PackageInitProc $initfunc\;\n"
+      set script [list package ifneeded $statpkg [dict get $info version] [list ::load {} $statpkg]]
+      append main_init_script \n [list set ::starkit::static_packages(${statpkg}) $script]
+
+      if {[dict get $info autoload]} {
+        ::practcl::cputs appinit "  if(${initfunc}(interp)) return TCL_ERROR\;"
+        ::practcl::cputs appinit "  Tcl_StaticPackage(interp,\"$statpkg\",$initfunc,NULL)\;"
+      } else {
+        ::practcl::cputs appinit "\n  Tcl_StaticPackage(NULL,\"$statpkg\",$initfunc,NULL)\;"
+        append main_init_script \n $script
+      }
+    }
+    append main_init_script \n {
+if {[file exists [file join $::starkit::topdir pkgIndex.tcl]]} {
+  #In a wrapped exe, we don't go out to the environment
+  set dir $::starkit::topdir
+  source [file join $::starkit::topdir pkgIndex.tcl]
+}}
+    append thread_init_script $main_init_script
+    append main_init_script \n {
+# Specify a user-specific startup file to invoke if the application
+# is run interactively.  Typically the startup file is "~/.apprc"
+# where "app" is the name of the application.  If this line is deleted
+# then no user-specific startup file will be run under any conditions.
+}
+    append thread_init_script \n [list set ::starkit::thread_init $thread_init_script]
+    append main_init_script \n [list set ::starkit::thread_init $thread_init_script]
+    append main_init_script \n [list set tcl_rcFileName [$PROJECT define get tcl_rcFileName ~/.tclshrc]]
+
+
+    practcl::cputs appinit "  Tcl_Eval(interp,[::practcl::tcl_to_c  $thread_init_script]);"
+    practcl::cputs appinit {  return TCL_OK;}
+    $PROJECT c_function [string map $map "int %mainfunc%(Tcl_Interp *interp)"] [string map $map $appinit]
+  }
+  method Collate_Source CWD {
+    next $CWD
+    set name [my define get name]
+    # Assume a static shell
+    if {[my define exists SHARED_BUILD]} {
+      my define set SHARED_BUILD 0
+    }
+    if {![my define exists TCL_LOCAL_APPINIT]} {
+      my define set TCL_LOCAL_APPINIT Tclkit_AppInit
+    }
+    if {![my define exists TCL_LOCAL_MAIN_HOOK]} {
+      my define set TCL_LOCAL_MAIN_HOOK Tclkit_MainHook
+    }
+    set PROJECT [self]
+    set os [$PROJECT define get TEACUP_OS]
+    if {[my define get SHARED_BUILD 0]} {
+      puts [list BUILDING TCLSH FOR OS $os]
+    } else {
+      puts [list BUILDING KIT FOR OS $os]
+    }
+    set TCLOBJ [$PROJECT tclcore]
+    ::practcl::toolset select $TCLOBJ
+
+    set TCLSRCDIR [$TCLOBJ define get srcdir]
+    set PKG_OBJS {}
+    foreach item [$PROJECT link list core.library] {
+      if {[string is true [$item define get static]]} {
+        lappend PKG_OBJS $item
+      }
+    }
+    foreach item [$PROJECT link list package] {
+      if {[string is true [$item define get static]]} {
+        lappend PKG_OBJS $item
+      }
+    }
+    # Arrange to build an main.c that utilizes TCL_LOCAL_APPINIT and TCL_LOCAL_MAIN_HOOK
+    if {$os eq "windows"} {
+      set PLATFORM_SRC_DIR win
+      if {![my define get SHARED_BUILD 0]} {
+        my add class csource filename [file join $TCLSRCDIR win tclWinReg.c] initfunc Registry_Init pkg_name registry pkg_vers 1.3.1 autoload 1
+        my add class csource filename [file join $TCLSRCDIR win tclWinDde.c] initfunc Dde_Init pkg_name dde pkg_vers 1.4.0 autoload 1
+      }
+      my add class csource ofile [my define get name]_appinit.o filename [file join $TCLSRCDIR win tclAppInit.c] extra [list -DTCL_LOCAL_MAIN_HOOK=[my define get TCL_LOCAL_MAIN_HOOK Tclkit_MainHook] -DTCL_LOCAL_APPINIT=[my define get TCL_LOCAL_APPINIT Tclkit_AppInit]]
+    } else {
+      set PLATFORM_SRC_DIR unix
+      my add class csource ofile [my define get name]_appinit.o filename [file join $TCLSRCDIR unix tclAppInit.c] extra [list -DTCL_LOCAL_MAIN_HOOK=[my define get TCL_LOCAL_MAIN_HOOK Tclkit_MainHook] -DTCL_LOCAL_APPINIT=[my define get TCL_LOCAL_APPINIT Tclkit_AppInit]]
+    }
+
+    if {![my define get SHARED_BUILD 0]} {
+      ###
+      # Add local static Zlib implementation
+      ###
+      set cdir [file join $TCLSRCDIR compat zlib]
+      foreach file {
+        adler32.c compress.c crc32.c
+        deflate.c infback.c inffast.c
+        inflate.c inftrees.c trees.c
+        uncompr.c zutil.c
+      } {
+        my add [file join $cdir $file]
+      }
+    }
+    ###
+    # Pre 8.7, Tcl doesn't include a Zipfs implementation
+    # in the core. Grab the one from odielib
+    ###
+    set zipfs [file join $TCLSRCDIR generic tclZipfs.c]
+    if {![$PROJECT define exists ZIPFS_VOLUME]} {
+      $PROJECT define set ZIPFS_VOLUME "zipfs:/"
+    }
+    $PROJECT code header "#define ZIPFS_VOLUME \"[$PROJECT define get ZIPFS_VOLUME]\""
+    if {[file exists $zipfs]} {
+      $TCLOBJ define set tip_430 1
+      my define set tip_430 1
+    } else {
+      # The Tclconfig project maintains a mirror of the version
+      # released with the Tcl core
+      my define set tip_430 0
+      set tclzipfs_c [my define get tclzipfs_c]
+      if {![file exists $tclzipfs_c]} {
+        ::practcl::LOCAL tool tclconfig unpack
+        set COMPATSRCROOT [::practcl::LOCAL tool tclconfig define get srcdir]
+        set tclzipfs_c [file join $COMPATSRCROOT compat tclZipfs.c]
+      }
+      my add class csource ofile tclZipfs.o filename $tclzipfs_c \
+        extra -I[::practcl::file_relative $CWD [file join $TCLSRCDIR compat zlib contrib minizip]]
+    }
+
+    my define add include_dir [file join $TCLSRCDIR generic]
+    my define add include_dir [file join $TCLSRCDIR $PLATFORM_SRC_DIR]
+    # This file will implement TCL_LOCAL_APPINIT and TCL_LOCAL_MAIN_HOOK
+    my build-tclkit_main $PROJECT $PKG_OBJS
+  }
+  method wrap {PWD exename vfspath args} {
+    cd $PWD
+    if {![file exists $vfspath]} {
+      file mkdir $vfspath
+    }
+    foreach item [my link list core.library] {
+      set name  [$item define get name]
+      set libsrcdir [$item define get srcdir]
+      if {[file exists [file join $libsrcdir library]]} {
+        ::practcl::copyDir [file join $libsrcdir library] [file join $vfspath ${name}_library]
+      }
+    }
+    # Assume the user will populate the VFS path
+    #if {[my define get installdir] ne {}} {
+    #  ::practcl::copyDir [file join [my define get installdir] [string trimleft [my define get prefix] /] lib] [file join $vfspath lib]
+    #}
+    foreach arg $args {
+       ::practcl::copyDir $arg $vfspath
+    }
+
+    set fout [open [file join $vfspath pkgIndex.tcl] w]
+    puts $fout [string map [list %platform% [my define get TEACUP_PROFILE]] {set ::tcl_teapot_profile {%platform%}}]
+    puts $fout {
+namespace eval ::starkit {}
+set ::PKGIDXFILE [info script]
+set dir [file dirname $::PKGIDXFILE]
+if {$::tcl_platform(platform) eq "windows"} {
+  set ::starkit::localHome [file join [file normalize $::env(LOCALAPPDATA)] tcl]
+} else {
+  set ::starkit::localHome [file normalize ~/tcl]
+}
+set ::tcl_teapot [file join $::starkit::localHome teapot $::tcl_teapot_profile]
+lappend ::auto_path $::tcl_teapot
+}
+    puts $fout [list proc installDir [info args ::practcl::installDir] [info body ::practcl::installDir]]
+    set buffer [::practcl::pkgindex_path $vfspath]
+    puts $fout $buffer
+    puts $fout {
+# Advertise statically linked packages
+foreach {pkg script} [array get ::starkit::static_packages] {
+  eval $script
+}
+}
+    puts $fout {
+###
+# Cache binary packages distributed as dynamic libraries in a known location
+###
+foreach teapath [glob -nocomplain [file join $dir teapot $::tcl_teapot_profile *]] {
+  set pkg [file tail $teapath]
+  set pkginstall [file join $::tcl_teapot $pkg]
+  if {![file exists $pkginstall]} {
+    installDir $teapath $pkginstall
+  }
+}
+}
+    close $fout
+
+    set EXEEXT [my define get EXEEXT]
+    set tclkit_bare [my define get tclkit_bare]
+    ::practcl::mkzip ${exename}${EXEEXT} $tclkit_bare $vfspath
+    if { [my define get TEACUP_OS] ne "windows" } {
+      file attributes ${exename}${EXEEXT} -permissions a+x
+    }
+  }
+}
+
+###
+# END: class project tclkit.tcl
+###
+###
+# START: class distro baseclass.tcl
+###
+::clay::define ::practcl::distribution {
+  method scm_info {} {
+    return {
+      scm  None
+      hash {}
+      maxdate {}
+      tags {}
+      isodate {}
+    }
+  }
+  method DistroMixIn {} {
+    my define set scm none
+  }
+  method Sandbox {} {
+    if {[my define exists sandbox]} {
+      return [my define get sandbox]
+    }
+    if {[my clay delegate project] ni {::noop {}}} {
+      set sandbox [my <project> define get sandbox]
+      if {$sandbox ne {}} {
+        my define set sandbox $sandbox
+        return $sandbox
+      }
+    }
+    set sandbox [file normalize [file join $::CWD ..]]
+    my define set sandbox $sandbox
+    return $sandbox
+  }
+  method SrcDir {} {
+    set pkg [my define get name]
+    if {[my define exists srcdir]} {
+      return [my define get srcdir]
+    }
+    set sandbox [my Sandbox]
+    set srcdir [file join [my Sandbox] $pkg]
+    my define set srcdir $srcdir
+    return $srcdir
+  }
+  method ScmTag    {} {}
+  method ScmClone  {} {}
+  method ScmUnpack {} {}
+  method ScmUpdate {} {}
+  method Unpack {} {
+    set srcdir [my SrcDir]
+    if {[file exists $srcdir]} {
+      return
+    }
+    set pkg [my define get name]
+    if {[my define exists download]} {
+      # Utilize a staged download
+      set download [my define get download]
+      if {[file exists [file join $download $pkg.zip]]} {
+        ::practcl::tcllib_require zipfile::decode
+        ::zipfile::decode::unzipfile [file join $download $pkg.zip] $srcdir
+        return
+      }
+    }
+    my ScmUnpack
+  }
+}
+oo::objdefine ::practcl::distribution {
+  method Sandbox {object} {
+    if {[$object define exists sandbox]} {
+      return [$object define get sandbox]
+    }
+    if {[$object clay delegate project] ni {::noop {}}} {
+      set sandbox [$object <project> define get sandbox]
+      if {$sandbox ne {}} {
+        $object define set sandbox $sandbox
+        return $sandbox
+      }
+    }
+    set pkg [$object define get name]
+    set sandbox [file normalize [file join $::CWD ..]]
+    $object define set sandbox $sandbox
+    return $sandbox
+  }
+
+  method select object {
+    if {[$object define exists scm]} {
+      return [$object define get scm]
+    }
+
+    set pkg [$object define get name]
+    if {[$object define get srcdir] ne {}} {
+      set srcdir [$object define get srcdir]
+    } else {
+      set srcdir [file join [my Sandbox $object] $pkg]
+      $object define set srcdir $srcdir
+    }
+
+    set classprefix ::practcl::distribution.
+    if {[file exists $srcdir]} {
+      foreach class [::info commands ${classprefix}*] {
+        if {[$class claim_path $srcdir]} {
+          $object clay mixinmap distribution $class
+          set name [$class claim_option]
+          $object define set scm $name
+          return $name
+        }
+      }
+    }
+    foreach class [::info commands ${classprefix}*] {
+      if {[$class claim_object $object]} {
+        $object clay mixinmap distribution $class
+        set name [$class claim_option]
+        $object define set scm $name
+        return $name
+      }
+    }
+    if {[$object define get scm] eq {} && [$object define exists file_url]} {
+      set class ::practcl::distribution.snapshot
+      set name [$class claim_option]
+      $object define set scm $name
+      $object clay mixinmap distribution $class
+      return $name
+    }
+    error "Cannot determine source distribution method"
+  }
+
+  method claim_option {} {
+    return Unknown
+  }
+
+  method claim_object object {
+    return false
+  }
+
+  method claim_path path {
+    return false
+  }
+}
+
+###
+# END: class distro baseclass.tcl
+###
+###
+# START: class distro snapshot.tcl
+###
+::clay::define ::practcl::distribution.snapshot {
+  superclass ::practcl::distribution
+  method ScmUnpack {} {
+    set srcdir [my SrcDir]
+    if {[file exists [file join $srcdir .download]]} {
+      return 0
+    }
+    set dpath [::practcl::LOCAL define get download]
+    set url [my define get file_url]
+    set fname [file tail $url]
+    set archive [file join $dpath $fname]
+    if {![file exists $archive]} {
+      ::http::wget $url $archive
+    }
+    set CWD [pwd]
+    switch [file extension $fname] {
+      .zip {
+        # Zipfile
+
+      }
+      .tar {
+        ::practcl::tcllib_require tar
+      }
+      .tgz -
+      .gz {
+        # Tarball
+        ::practcl::tcllib_require tcl::transform::zlib
+        ::practcl::tcllib_require tar
+        set fh [::open $archive]
+        fconfigure $fh -encoding binary -translation lf -eofchar {}
+        ::tcl::transform::zlib $fh
+      }
+    }
+    set fosdb [my ScmClone]
+    set tag [my ScmTag]
+    file mkdir $srcdir
+    ::practcl::fossil $srcdir open $fosdb $tag
+    return 1
+  }
+}
+oo::objdefine ::practcl::distribution.snapshot {
+
+  method claim_object object {
+    return false
+  }
+
+  method claim_option {} {
+    return snapshot
+  }
+
+  method claim_path path {
+    if {[file exists [file join $path .download]]} {
+      return true
+    }
+    return false
+  }
+}
+
+###
+# END: class distro snapshot.tcl
+###
+###
+# START: class distro fossil.tcl
+###
+::clay::define ::practcl::distribution.fossil {
+  superclass ::practcl::distribution
+  method scm_info {} {
+    set info [next]
+    dict set info scm fossil
+    foreach {field value} [::practcl::fossil_status [my define get srcdir]] {
+      dict set info $field $value
+    }
+    return $info
+  }
+  method ScmClone  {} {
+    set srcdir [my SrcDir]
+    if {[file exists [file join $srcdir .fslckout]]} {
+      return
+    }
+    if {[file exists [file join $srcdir _FOSSIL_]]} {
+      return
+    }
+    if {![::info exists ::practcl::fossil_dbs]} {
+      # Get a list of local fossil databases
+      set ::practcl::fossil_dbs [exec fossil all list]
+    }
+    set pkg [my define get name]
+    # Return an already downloaded fossil repo
+    foreach line [split $::practcl::fossil_dbs \n] {
+      set line [string trim $line]
+      if {[file rootname [file tail $line]] eq $pkg} {
+        return $line
+      }
+    }
+    set download [::practcl::LOCAL define get download]
+    set fosdb [file join $download $pkg.fos]
+    if {[file exists $fosdb]} {
+      return $fosdb
+    }
+
+    file mkdir [file join $download fossil]
+    set fosdb [file join $download fossil $pkg.fos]
+    if {[file exists $fosdb]} {
+      return $fosdb
+    }
+
+    set cloned 0
+    # Attempt to clone from a local network mirror
+    if {[::practcl::LOCAL define exists fossil_mirror]} {
+      set localmirror [::practcl::LOCAL define get fossil_mirror]
+      catch {
+        ::practcl::doexec fossil clone $localmirror/$pkg $fosdb
+        set cloned 1
+      }
+      if {$cloned} {
+        return $fosdb
+      }
+    }
+    # Attempt to clone from the canonical source
+    if {[my define get fossil_url] ne {}} {
+      catch {
+        ::practcl::doexec fossil clone [my define get fossil_url] $fosdb
+        set cloned 1
+      }
+      if {$cloned} {
+        return $fosdb
+      }
+    }
+    # Fall back to the fossil mirror on the island of misfit toys
+    ::practcl::doexec fossil clone http://fossil.etoyoc.com/fossil/$pkg $fosdb
+    return $fosdb
+  }
+  method ScmTag {} {
+    if {[my define exists scm_tag]} {
+      return [my define get scm_tag]
+    }
+    if {[my define exists tag]} {
+      set tag [my define get tag]
+    } else {
+      set tag trunk
+    }
+    my define set scm_tag $tag
+    return $tag
+  }
+  method ScmUnpack {} {
+    set srcdir [my SrcDir]
+    if {[file exists [file join $srcdir .fslckout]]} {
+      return 0
+    }
+    if {[file exists [file join $srcdir _FOSSIL_]]} {
+      return 0
+    }
+    set CWD [pwd]
+    set fosdb [my ScmClone]
+    set tag [my ScmTag]
+    file mkdir $srcdir
+    ::practcl::fossil $srcdir open $fosdb $tag
+    return 1
+  }
+  method ScmUpdate {} {
+    if {[my ScmUnpack]} {
+      return
+    }
+    set srcdir [my SrcDir]
+    set tag [my ScmTag]
+    ::practcl::fossil $srcdir update $tag
+  }
+}
+oo::objdefine ::practcl::distribution.fossil {
+
+  # Check for markers in the metadata
+  method claim_object obj {
+    set path [$obj define get srcdir]
+    if {[my claim_path $path]} {
+      return true
+    }
+    if {[$obj define get fossil_url] ne {}} {
+      return true
+    }
+    return false
+  }
+
+  method claim_option {} {
+    return fossil
+  }
+
+  # Check for markers in the source root
+  method claim_path path {
+    if {[file exists [file join $path .fslckout]]} {
+      return true
+    }
+    if {[file exists [file join $path _FOSSIL_]]} {
+      return true
+    }
+    return false
+  }
+}
+
+###
+# END: class distro fossil.tcl
+###
+###
+# START: class distro git.tcl
+###
+::clay::define ::practcl::distribution.git {
+  superclass ::practcl::distribution
+  method ScmTag {} {
+    if {[my define exists scm_tag]} {
+      return [my define get scm_tag]
+    }
+    if {[my define exists tag]} {
+      set tag [my define get tag]
+    } else {
+      set tag master
+    }
+    my define set scm_tag $tag
+    return $tag
+  }
+  method ScmUnpack {} {
+    set srcdir [my SrcDir]
+    if {[file exists [file join $srcdir .git]]} {
+      return 0
+    }
+    set CWD [pwd]
+    set tag [my ScmTag]
+    set pkg [my define get name]
+    if {[my define exists git_url]} {
+      ::practcl::doexec git clone --branch $tag [my define get git_url] $srcdir
+    } else {
+      ::practcl::doexec git clone --branch $tag https://github.com/eviltwinskippy/$pkg $srcdir
+    }
+    return 1
+  }
+  method ScmUpdate {} {
+    if {[my ScmUnpack]} {
+      return
+    }
+    set CWD [pwd]
+    set srcdir [my SrcDir]
+    set tag [my ScmTag]
+    ::practcl::doexec_in $srcdir git pull
+    cd $CWD
+  }
+}
+oo::objdefine ::practcl::distribution.git {
+
+  method claim_object obj {
+    set path [$obj define get srcdir]
+    if {[my claim_path $path]} {
+      return true
+    }
+    if {[$obj define get git_url] ne {}} {
+      return true
+    }
+    return false
+  }
+
+  method claim_option {} {
+    return git
+  }
+
+  method claim_path path {
+   if {[file exists [file join $path .git]]} {
+      return true
+    }
+    return false
+  }
+}
+
+###
+# END: class distro git.tcl
+###
+###
+# START: class subproject baseclass.tcl
+###
+::clay::define ::practcl::subproject {
+  superclass ::practcl::module
+  method _MorphPatterns {} {
+    return {{::practcl::subproject.@name@} {::practcl::@name@} {@name@} {::practcl::subproject}}
+  }
+  method BuildDir {PWD} {
+    return [my define get srcdir]
+  }
+  method child which {
+    switch $which {
+      delegate -
+      organs {
+	# A library can be a project, it can be a module. Any
+	# subordinate modules will indicate their existance
+        return [list project [self] module [self]]
+      }
+    }
+  }
+  method compile {} {}
+  method go {} {
+    ::practcl::distribution select [self]
+    set name [my define get name]
+    my define set builddir [my BuildDir [my define get masterpath]]
+    my define set builddir [my BuildDir [my define get masterpath]]
+    my sources
+  }
+  method install args {}
+  method linktype {} {
+    return {subordinate package}
+  }
+  method linker-products {configdict} {}
+  method linker-external {configdict} {
+    if {[dict exists $configdict PRACTCL_PKG_LIBS]} {
+      return [dict get $configdict PRACTCL_PKG_LIBS]
+    }
+    if {[dict exists $configdict LIBS]} {
+      return [dict get $configdict LIBS]
+    }
+  }
+  method linker-extra {configdict} {
+    if {[dict exists $configdict PRACTCL_LINKER_EXTRA]} {
+      return [dict get $configdict PRACTCL_LINKER_EXTRA]
+    }
+    return {}
+  }
+  method env-bootstrap {} {
+    set pkg [my define get pkg_name [my define get name]]
+    package require $pkg
+  }
+  method env-exec {} {}
+  method env-install {} {
+    my unpack
+  }
+  method env-load {} {
+    my variable loaded
+    if {[info exists loaded]} {
+      return 0
+    }
+    if {![my env-present]} {
+      my env-install
+    }
+    my env-bootstrap
+    set loaded 1
+  }
+  method env-present {} {
+    set pkg [my define get pkg_name [my define get name]]
+    if {[catch [list package require $pkg]]} {
+      return 0
+    }
+    return 1
+  }
+  method sources {} {}
+  method update {} {
+    my ScmUpdate
+  }
+  method unpack {} {
+    cd $::CWD
+    ::practcl::distribution select [self]
+    my Unpack
+    ::practcl::toolset select [self]
+    cd $::CWD
+  }
+}
+::clay::define ::practcl::subproject.source {
+  superclass ::practcl::subproject ::practcl::library
+  method env-bootstrap {} {
+    set LibraryRoot [file join [my define get srcdir] [my define get module_root modules]]
+    if {[file exists $LibraryRoot] && $LibraryRoot ni $::auto_path} {
+      set ::auto_path [linsert $::auto_path 0 $LibraryRoot]
+    }
+  }
+  method env-present {} {
+    set path [my define get srcdir]
+    return [file exists $path]
+  }
+  method linktype {} {
+    return {subordinate package source}
+  }
+}
+::clay::define ::practcl::subproject.teapot {
+  superclass ::practcl::subproject
+  method env-bootstrap {} {
+    set pkg [my define get pkg_name [my define get name]]
+    package require $pkg
+  }
+  method env-install {} {
+    set pkg [my define get pkg_name [my define get name]]
+    set download [my <project> define get download]
+    my unpack
+    set prefix [string trimleft [my <project> define get prefix] /]
+    ::practcl::tcllib_require zipfile::decode
+    ::zipfile::decode::unzipfile [file join $download $pkg.zip] [file join $prefix lib $pkg]
+  }
+  method env-present {} {
+    set pkg [my define get pkg_name [my define get name]]
+    if {[catch [list package require $pkg]]} {
+      return 0
+    }
+    return 1
+  }
+  method install DEST {
+    set pkg [my define get pkg_name [my define get name]]
+    set download [my <project> define get download]
+    my unpack
+    set prefix [string trimleft [my <project> define get prefix] /]
+    ::practcl::tcllib_require zipfile::decode
+    ::zipfile::decode::unzipfile [file join $download $pkg.zip] [file join $DEST $prefix lib $pkg]
+  }
+}
+::clay::define ::practcl::subproject.kettle {
+  superclass ::practcl::subproject
+  method kettle {path args} {
+    my variable kettle
+    if {![info exists kettle]} {
+      ::practcl::LOCAL tool kettle env-load
+      set kettle [file join [::practcl::LOCAL tool kettle define get srcdir] kettle]
+    }
+    set srcdir [my SourceRoot]
+    ::practcl::dotclexec $kettle -f [file join $srcdir build.tcl] {*}$args
+  }
+  method install DEST {
+    my kettle reinstall --prefix $DEST
+  }
+}
+::clay::define ::practcl::subproject.critcl {
+  superclass ::practcl::subproject
+  method install DEST {
+    my critcl -pkg [my define get name]
+    set srcdir [my SourceRoot]
+    ::practcl::copyDir [file join $srcdir [my define get name]] [file join $DEST lib [my define get name]]
+  }
+}
+::clay::define ::practcl::subproject.sak {
+  superclass ::practcl::subproject
+  method env-bootstrap {} {
+    set LibraryRoot [file join [my define get srcdir] [my define get module_root modules]]
+    if {[file exists $LibraryRoot] && $LibraryRoot ni $::auto_path} {
+      set ::auto_path [linsert $::auto_path 0 $LibraryRoot]
+    }
+  }
+  method env-install {} {
+    ###
+    # Handle teapot installs
+    ###
+    set pkg [my define get pkg_name [my define get name]]
+    my unpack
+    set prefix [my <project> define get prefix [file normalize [file join ~ tcl]]]
+    set srcdir [my define get srcdir]
+    ::practcl::dotclexec [file join $srcdir installer.tcl] \
+      -apps -app-path [file join $prefix apps] \
+      -html -html-path [file join $prefix doc html $pkg] \
+      -pkg-path [file join $prefix lib $pkg]  \
+      -no-nroff -no-wait -no-gui
+  }
+  method env-present {} {
+    set path [my define get srcdir]
+    return [file exists $path]
+  }
+  method install DEST {
+    ###
+    # Handle teapot installs
+    ###
+    set pkg [my define get pkg_name [my define get name]]
+    my unpack
+    set prefix [string trimleft [my <project> define get prefix] /]
+    set srcdir [my define get srcdir]
+    ::practcl::dotclexec [file join $srcdir installer.tcl] \
+      -pkg-path [file join $DEST $prefix lib $pkg]  \
+      -no-examples -no-html -no-nroff \
+      -no-wait -no-gui -no-apps
+  }
+  method install-module {DEST args} {
+    set srcdir [my define get srcdir]
+    if {[llength $args]==1 && [lindex $args 0] in {* all}} {
+      set pkg [my define get pkg_name [my define get name]]
+      ::practcl::dotclexec [file join $srcdir installer.tcl] \
+        -pkg-path [file join $DEST $pkg]  \
+        -no-examples -no-html -no-nroff \
+        -no-wait -no-gui -no-apps
+    } else {
+      foreach module $args {
+        ::practcl::installModule [file join $srcdir modules $module] [file join $DEST $module]
+      }
+    }
+  }
+}
+::clay::define ::practcl::subproject.practcl {
+  superclass ::practcl::subproject
+  method env-bootstrap {} {
+    set LibraryRoot [file join [my define get srcdir] [my define get module_root modules]]
+    if {[file exists $LibraryRoot] && $LibraryRoot ni $::auto_path} {
+      set ::auto_path [linsert $::auto_path 0 $LibraryRoot]
+    }
+  }
+  method env-install {} {
+    ###
+    # Handle teapot installs
+    ###
+    set pkg [my define get pkg_name [my define get name]]
+    my unpack
+    set prefix [my <project> define get prefix [file normalize [file join ~ tcl]]]
+    set srcdir [my define get srcdir]
+    ::practcl::dotclexec [file join $srcdir make.tcl] install [file join $prefix lib $pkg]
+  }
+  method install DEST {
+    ###
+    # Handle teapot installs
+    ###
+    set pkg [my define get pkg_name [my define get name]]
+    my unpack
+    set prefix [string trimleft [my <project> define get prefix] /]
+    set srcdir [my define get srcdir]
+    puts [list INSTALLING  [my define get name] to [file join $DEST $prefix lib $pkg]]
+    ::practcl::dotclexec [file join $srcdir make.tcl] install [file join $DEST $prefix lib $pkg]
+  }
+  method install-module {DEST args} {
+    set pkg [my define get pkg_name [my define get name]]
+    set srcdir [my define get srcdir]
+    ::practcl::dotclexec [file join $srcdir make.tcl] install-module $DEST {*}$args
+  }
+}
+
+###
+# END: class subproject baseclass.tcl
+###
+###
+# START: class subproject binary.tcl
+###
+::clay::define ::practcl::subproject.binary {
+  superclass ::practcl::subproject
+  method clean {} {
+    set builddir [file normalize [my define get builddir]]
+    if {![file exists $builddir]} return
+    if {[file exists [file join $builddir make.tcl]]} {
+      ::practcl::domake.tcl $builddir clean
+    } else {
+      catch {::practcl::domake $builddir clean}
+    }
+  }
+ method env-install {} {
+    ###
+    # Handle tea installs
+    ###
+    set pkg [my define get pkg_name [my define get name]]
+    set os [::practcl::local_os]
+    my define set os $os
+    my unpack
+    set prefix [my <project> define get prefix [file normalize [file join ~ tcl]]]
+    set srcdir [my define get srcdir]
+    lappend options --prefix $prefix --exec-prefix $prefix
+    my define set config_opts $options
+    my go
+    my clean
+    my compile
+    my make install {}
+  }
+  method project-compile-products {} {}
+  method ComputeInstall {} {
+    if {[my define exists install]} {
+      switch [my define get install] {
+        static {
+          my define set static 1
+          my define set autoload 0
+        }
+        static-autoload {
+          my define set static 1
+          my define set autoload 1
+        }
+        vfs {
+          my define set static 0
+          my define set autoload 0
+          my define set vfsinstall 1
+        }
+        null {
+          my define set static 0
+          my define set autoload 0
+          my define set vfsinstall 0
+        }
+        default {
+
+        }
+      }
+    }
+  }
+  method go {} {
+    next
+    ::practcl::distribution select [self]
+    my ComputeInstall
+    my define set builddir [my BuildDir [my define get masterpath]]
+  }
+  method linker-products {configdict} {
+    if {![my define get static 0]} {
+      return {}
+    }
+    set srcdir [my define get builddir]
+    if {[dict exists $configdict libfile]} {
+      return " [file join $srcdir [dict get $configdict libfile]]"
+    }
+  }
+  method project-static-packages {} {
+    if {![my define get static 0]} {
+      return {}
+    }
+    set result [my define get static_packages]
+    set statpkg  [my define get static_pkg]
+    set initfunc [my define get initfunc]
+    if {$initfunc ne {}} {
+      set pkg_name [my define get pkg_name]
+      if {$pkg_name ne {}} {
+        dict set result $pkg_name initfunc $initfunc
+        set version [my define get version]
+        if {$version eq {}} {
+          my unpack
+          set info [my read_configuration]
+          set version [dict get $info version]
+          set pl {}
+          if {[dict exists $info patch_level]} {
+            set pl [dict get $info patch_level]
+            append version $pl
+          }
+          my define set version $version
+        }
+        dict set result $pkg_name version $version
+        dict set result $pkg_name autoload [my define get autoload 0]
+      }
+    }
+    foreach item [my link list subordinate] {
+      foreach {pkg info} [$item project-static-packages] {
+        dict set result $pkg $info
+      }
+    }
+    return $result
+  }
+  method BuildDir {PWD} {
+    set name [my define get name]
+    set debug [my define get debug 0]
+    if {[my <project> define get LOCAL 0]} {
+      return [my define get builddir [file join $PWD local $name]]
+    }
+    if {$debug} {
+      return [my define get builddir [file join $PWD debug $name]]
+    } else {
+      return [my define get builddir [file join $PWD pkg $name]]
+    }
+  }
+  method compile {} {
+    set name [my define get name]
+    set PWD $::CWD
+    cd $PWD
+    my unpack
+    set srcdir [file normalize [my SrcDir]]
+    set localsrcdir [my MakeDir $srcdir]
+    my define set localsrcdir $localsrcdir
+    my Collate_Source $PWD
+    ###
+    # Build a starter VFS for both Tcl and wish
+    ###
+    set srcdir [my define get srcdir]
+    if {[my define get static 1]} {
+      puts "BUILDING Static $name $srcdir"
+    } else {
+      puts "BUILDING Dynamic $name $srcdir"
+    }
+    my make compile
+    cd $PWD
+  }
+  method Configure {} {
+    cd $::CWD
+    my unpack
+    ::practcl::toolset select [self]
+    set srcdir [file normalize [my define get srcdir]]
+    set builddir [file normalize [my define get builddir]]
+    file mkdir $builddir
+    my make autodetect
+  }
+  method install DEST {
+    set PWD [pwd]
+    set PREFIX  [my <project> define get prefix]
+    ###
+    # Handle teapot installs
+    ###
+    set pkg [my define get pkg_name [my define get name]]
+    if {[my <project> define get teapot] ne {}} {
+      set TEAPOT [my <project> define get teapot]
+      set found 0
+      foreach ver [my define get pkg_vers [my define get version]] {
+        set teapath [file join $TEAPOT $pkg$ver]
+        if {[file exists $teapath]} {
+          set dest  [file join $DEST [string trimleft $PREFIX /] lib [file tail $teapath]]
+          ::practcl::copyDir $teapath $dest
+          return
+        }
+      }
+    }
+    my compile
+    my make install $DEST
+    cd $PWD
+  }
+}
+::clay::define ::practcl::subproject.tea {
+  superclass ::practcl::subproject.binary
+}
+::clay::define ::practcl::subproject.library {
+  superclass ::practcl::subproject.binary ::practcl::library
+  method install DEST {
+    my compile
+  }
+}
+::clay::define ::practcl::subproject.external {
+  superclass ::practcl::subproject.binary
+  method install DEST {
+    my compile
+  }
+}
+
+###
+# END: class subproject binary.tcl
+###
+###
+# START: class subproject core.tcl
+###
+::clay::define ::practcl::subproject.core {
+  superclass ::practcl::subproject.binary
+  method env-bootstrap {} {}
+  method env-present {} {
+    set PREFIX [my <project> define get prefix]
+    set name [my define get name]
+    set fname [file join $PREFIX lib ${name}Config.sh]
+    return [file exists $fname]
+  }
+  method env-install {} {
+    my unpack
+    set os [::practcl::local_os]
+
+    set prefix [my <project> define get prefix [file normalize [file join ~ tcl]]]
+    lappend options --prefix $prefix --exec-prefix $prefix
+    my define set config_opts $options
+    puts [list [self] OS [dict get $os TEACUP_OS] options $options]
+    my go
+    my compile
+    my make install {}
+  }
+  method go {} {
+    my define set core_binary 1
+    next
+  }
+  method linktype {} {
+    return {subordinate core.library}
+  }
+}
+
+###
+# END: class subproject core.tcl
+###
+###
+# START: class tool.tcl
+###
+set ::practcl::MAIN ::practcl::LOCAL
+set ::auto_index(::practcl::LOCAL) {
+  ::practcl::project create ::practcl::LOCAL
+  ::practcl::LOCAL define set [::practcl::local_os]
+  ::practcl::LOCAL define set LOCAL 1
+
+  # Until something better comes along, use ::practcl::LOCAL
+  # as our main project
+  # Add tclconfig as a project of record
+  ::practcl::LOCAL add_tool tclconfig {
+    name tclconfig tag practcl class subproject.source fossil_url http://core.tcl.tk/tclconfig
+  }
+  # Add tcllib as a project of record
+  ::practcl::LOCAL add_tool tcllib {
+    tag trunk class sak fossil_url http://core.tcl.tk/tcllib
+  }
+  ::practcl::LOCAL add_tool kettle {
+    tag trunk class sak fossil_url http://fossil.etoyoc.com/fossil/kettle
+  }
+  ::practcl::LOCAL add_tool tclvfs {
+    tag trunk class tea
+    fossil_url http://fossil.etoyoc.com/fossil/tclvfs
+  }
+  ::practcl::LOCAL add_tool critcl {
+    tag master class subproject.binary
+    git_url http://github.com/andreas-kupries/critcl
+    modules lib
+  } {
+    method env-bootstrap {} {
+      package require critcl::app
+    }
+    method env-install {} {
+      my unpack
+      set prefix [my <project> define get prefix [file join [file normalize ~] tcl]]
+      set srcdir [my define get srcdir]
+      ::practcl::dotclexec [file join $srcdir build.tcl] install [file join $prefix lib]
+    }
+  }
+  ::practcl::LOCAL add_tool odie {
+    tag trunk class subproject.source
+    fossil_url http://fossil.etoyoc.com/fossil/odie
+  }
+  ::practcl::LOCAL add_tool tcl {
+    tag release class subproject.core
+    fossil_url http://core.tcl.tk/tcl
+  }
+  ::practcl::LOCAL add_tool tk {
+    tag release class subproject.core
+    fossil_url http://core.tcl.tk/tcl
+  }
+  ::practcl::LOCAL add_tool sqlite {
+    tag practcl
+    class subproject.tea
+    pkg_name sqlite3
+    fossil_url http://fossil.etoyoc.com/fossil/sqlite
+  }
+}
+
+###
+# END: class tool.tcl
+###
+
+namespace eval ::practcl {
+  namespace export *
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/processman/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/processman/pkgIndex.tcl
new file mode 100644
index 00000000..f1668922
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/processman/pkgIndex.tcl
@@ -0,0 +1,3 @@
+# -*- tcl -*-
+package ifneeded odie::processman 0.6 [list source [file join $dir processman.tcl]]
+package ifneeded processman 0.6 [list source [file join $dir processman.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/processman/processman.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/processman/processman.tcl
new file mode 100644
index 00000000..dbf6c533
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/processman/processman.tcl
@@ -0,0 +1,343 @@
+###
+# IRM External Process Manager
+###
+
+package require Tcl 8.5
+package require cron 2.0
+
+::namespace eval ::processman {}
+
+###
+# Attempt to locate some C - API helpers
+###
+
+set ::processman::api tcl
+
+foreach {command package api} {
+    {::twapi::process_exists} twapi    twapi
+    umask                     tclx     tclx
+    subprocess_exists         tclextra tclextra
+    {}                        odielibc tclextra
+} {
+    if {[info commands $command] ne {}} {
+	set ::processman::api $api
+	break
+    }
+    if {![catch {package require $package}]} {
+	set ::processman::api $api
+	break
+    }
+}
+
+switch $::processman::api {
+    tclx {
+	proc ::processman::kill_subprocess pid {
+	    catch {::kill $pid}
+	}
+    }
+    tclextra {
+	proc ::processman::kill_subprocess pid {
+	    catch {::kill_subprocess $pid}
+	}
+    }
+    twapi {
+	proc ::processman::priority {id level} {
+	    foreach pid [PIDLIST $id] {
+		switch $level {
+		    background {
+			if  {[catch {twapi::set_priority_class $pid 0x00104000} err]} {
+			    puts "BG Mode failed - $err"
+			    twapi::set_priority_class $pid 0x00004000
+			}
+		    }
+		    low {
+			twapi::set_priority_class $pid 0x00004000
+		    }
+		    high {
+			twapi::set_priority_class $pid 0x00000020
+		    }
+		    default {
+			twapi::set_priority_class $pid 0x00008000
+		    }
+		}
+	    }
+	}
+	proc ::processman::killexe name {
+	    set pids [twapi::get_process_ids -name $name.exe]
+	    foreach pid $pids {
+		# Catch the error in case process does not exist any more
+		if {[catch {twapi::end_process $pid} err]} {
+		    puts $err
+		}
+	    }
+	    #catch {exec taskkill /F /IM $name.exe} err
+	    #puts $err
+	}
+	proc ::processman::kill_subprocess pid {
+	    if {[catch {::twapi::end_process $pid} err]} {
+		puts $err
+	    }
+	}
+	proc ::processman::subprocess_exists pid {
+	    return [::twapi::process_exists $pid]
+	}
+	proc ::processman::keep_machine_awake {truefalse} {
+	    if {[string is true -strict $truefalse]} {
+		twapi::SetThreadExecutionState 0x80000040
+	    } else {
+		twapi::SetThreadExecutionState 0x00000000
+	    }
+	}
+    }
+    default {}
+}
+
+###
+# Create fallback implementations for functions we don't have a
+# C API call for
+###
+
+proc ::processman::fallback {name arglist body} {
+    if {[info commands ::${name}] eq {} && [info commands ::processman::${name}] eq {} } {
+	::proc ::processman::${name} $arglist $body
+    }
+
+}
+
+# title: Keep the machine from going to sleep
+::processman::fallback keep_machine_awake {truefalse} {
+}
+
+::processman::fallback killexe name {
+    if {[catch {exec killall -9 $name} err]} {
+	puts $err
+    }
+    harvest_zombies
+}
+
+###
+# title: Detect a running process
+# usage: subprocess_exists PID
+# description:
+#  Returns true if PID is running. If PID is an integer
+#  it is interpreted as Process Id from the operating system.
+#  Otherwise it is assumed to be a handle previously registered
+#  with the processman package
+###
+::processman::fallback subprocess_exists pid {
+    set dat [exec ps]
+    foreach line [split $dat \n] {
+	if {![scan $line "%d %s" thispid rest]} continue
+	if { $thispid eq $pid} {
+	    return $thispid
+	}
+    }
+    return 0
+}
+
+# title: Changes priority of task
+::processman::fallback priority {id level} {
+    if {$::tcl_platform(platform) eq "windows"} {
+	return
+    }
+    foreach pid [PIDLIST $id] {
+	switch $level {
+	    background {
+		exec renice -n 20 -p $pid
+	    }
+	    low {
+		exec renice -n 10 -p $pid
+	    }
+	    high {
+		exec renice -n -5 -p $pid
+	    }
+	    default {
+		exec renice -n 0 -p $pid
+	    }
+	}
+    }
+}
+
+::processman::fallback kill_subprocess pid {
+    catch {exec kill $pid}
+}
+
+::processman::fallback harvest_zombies args {
+}
+
+###
+# topic: a0cdb7503872cd302756c732956cd5c3
+# title: Periodic scan of the state of processes
+###
+proc ::processman::events {} {
+    variable process_binding
+    foreach {id bind} $process_binding {
+	if {![running $id]} {
+	    kill $id
+	    catch {eval $bind}
+	}
+    }
+}
+
+###
+# topic: 95edbb845e0a8802b1cc3119516a6502
+# title: Locate and executable of name
+###
+proc ::processman::find_exe name {
+    global tcl_platform
+    if {$tcl_platform(platform)=="windows"} {set suffix .exe} {set suffix {}}
+    foreach f [list $name ~/irm/bin/$name ./$name/$name ./$name  ../$name/$name ../../$name/$name] {
+	if {[file executable $f]} break
+	append f $suffix
+	if {[file executable $f]} break
+    }
+    if {![file executable $f]} {
+	error "Cannot find the $name executable"
+	return {}
+    }
+    return $f
+}
+
+proc ::processman::PIDLIST id {
+    variable process_list
+    if {[string is integer -strict $id]} {
+	return $id
+    }
+    if {[dict exists $process_list $id]} {
+	return [dict get $process_list $id]
+    }
+    return {}
+}
+
+###
+# topic: ac021b1116f0c1d5e3319d9f333f0c89
+# title: Kill a process
+###
+proc ::processman::kill id {
+    variable process_list
+    variable process_binding
+    global tcl_platform
+    foreach pid [PIDLIST $id] {
+	kill_subprocess $pid
+    }
+    if {![string is integer $id]} {
+	dict set process_list $id {}
+	dict unset process_binding $id
+    }
+    harvest_zombies
+}
+
+###
+# topic: 8987329d60cd1adc766e09a0227f87b6
+# title: Kill all processes spawned by this program
+###
+proc ::processman::kill_all {} {
+    variable process_list
+    if {![info exists process_list]} {
+	return {}
+    }
+    foreach {name pidlist} $process_list {
+	kill $name
+    }
+    harvest_zombies
+}
+
+###
+# topic: 02406b2a7edd05c887554384ad2db41f
+# title: Issue a command when process {$id} exits
+###
+proc ::processman::onexit {id cmd} {
+    variable process_binding
+    if {![running $id]} {
+	catch {eval $cmd}
+	return
+    }
+    dict set process_binding $id $cmd
+}
+
+###
+# topic: 8bccf62b4fa11949dba4c85e05d116e9
+# title: Return a list of processes and their current state
+###
+proc ::processman::process_list {} {
+    variable process_list
+    set result {}
+    dict set result self [pid]
+    if {![info exists process_list]} {
+	return $result
+    }
+    foreach {name pidlist} $process_list {
+	foreach pid $pidlist {
+	    lappend result $name $pid [subprocess_exists $pid]
+	}
+    }
+    return $result
+}
+
+###
+# topic: 96b4b2c53ea1554006417e507197488c
+# title: Test if a process is running
+###
+proc ::processman::running id {
+    variable process_list
+    set pidlist {}
+    if {![string is integer -strict $id]} {
+	if {$id eq "self"} {
+	    return [pid]
+	}
+	if {![dict exists $process_list $id]} {
+	    return 0
+	}
+	set pidlist [dict get $process_list $id]
+    } else {
+	set pidlist $id
+    }
+    foreach pid $pidlist {
+	if {[subprocess_exists $pid]} {
+	    return $pid
+	}
+    }
+    return 0
+}
+
+###
+# topic: 61694ad97dbac52351431ad0d8c448e3
+# title: Launch a task in the background
+###
+proc ::processman::spawn {id command args} {
+    variable process_list
+    if {[llength $command] == 1} {
+	set command [lindex $command 0]
+    }
+    if {$::tcl_platform(platform) eq "windows"} {
+	set pid [exec "$command" {*}$args &]
+    } else {
+	set pid [exec $command {*}$args &]
+    }
+    dict lappend process_list $id $pid
+    return $pid
+}
+
+###
+# topic: 56fbf345652c5ca18543a67a6bc95787
+# title: Process Management Tools
+###
+namespace eval ::processman {
+    ###
+    # initialize tables
+    ###
+
+    variable process_list
+    variable process_binding
+    if { ![info exists process_list]} {
+	set process_list {}
+    }
+    if {![info exists process_binding]} {
+	set process_binding {}
+    }
+}
+
+::cron::every processman 60 ::processman::events
+
+package provide odie::processman 0.6
+package provide processman 0.6
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/profiler/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/profiler/pkgIndex.tcl
new file mode 100644
index 00000000..32af3dd8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/profiler/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.3]} {return}
+package ifneeded profiler 0.6 [list source [file join $dir profiler.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/profiler/profiler.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/profiler/profiler.tcl
new file mode 100644
index 00000000..0b6508c1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/profiler/profiler.tcl
@@ -0,0 +1,672 @@
+# profiler.tcl --
+#
+#	Tcl code profiler.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.3		;# uses [clock clicks -milliseconds]
+package provide profiler 0.6
+
+namespace eval ::profiler {}
+
+# ::profiler::tZero --
+#
+#	Start a named timer instance
+#
+# Arguments:
+#	tag	name for the timer instance; if none is given, defaults to ""
+#
+# Results:
+#	None.
+
+proc ::profiler::tZero { { tag "" } } {
+    set ms [ clock clicks -milliseconds ]
+    set us [ clock clicks ]
+    set tag [string map {: ""} $tag]
+    # FRINK: nocheck
+    set ::profiler::T$tag [ list $us $ms ]
+    return
+}
+
+# ::profiler::tMark --
+#
+#	Return the delta time since the start of a named timer.
+#
+# Arguments:
+#	tag	Tag for which to return a delta; if none is given, defaults to
+#		""
+#
+# Results:
+#	dt	Time difference between start of the timer and the current
+#		time, in microseconds.
+
+proc ::profiler::tMark { { tag "" } } {
+    set ut [ clock clicks ]
+    set mt [ clock clicks -milliseconds ]
+    set tag [string map {: ""} $tag]
+
+    # Per tag a variable was created within the profiler
+    # namespace. But we should check if the tag does ecxist.
+
+    if {![info exists ::profiler::T$tag]} {
+	error "Unknown tag \"$tag\""
+    }
+    # FRINK: nocheck
+     set ust [ lindex [ set ::profiler::T$tag ] 0 ]
+    # FRINK: nocheck
+     set mst [ lindex [ set ::profiler::T$tag ] 1 ]
+     set udt [ expr { ($ut-$ust) } ]
+     set mdt [ expr { ($mt-$mst) } ]000
+     set dt $udt
+     ;## handle wrapping of the microsecond clock
+     if { $dt < 0 || $dt > 1000000 } { set dt $mdt }
+     set dt
+}
+
+# ::profiler::stats --
+#
+#	Compute statistical information for a set of values, including
+#	the mean, the standard deviation, and the covariance.
+#
+# Arguments:
+#	args	Values for which to compute information.
+#
+# Results:
+#	A list with three elements:  the mean, the standard deviation, and the
+#	covariance.
+
+proc ::profiler::stats {args} {
+    set sum      0
+    set mean     0
+    set sigma_sq 0
+    set sigma    0
+    set cov      0
+    set N [ llength $args ]
+    if { $N > 1 } {
+        foreach val $args {
+            incr sum $val
+        }
+        if {$sum > 0} {
+            set mean [ expr { $sum/$N } ]
+            foreach val $args {
+                set sigma_sq [ expr { $sigma_sq+pow(($val-$mean),2) } ]
+            }
+            set sigma_sq [ expr { $sigma_sq/($N-1) } ]
+            set sigma [ expr { round(sqrt($sigma_sq)) } ]
+	    if { $mean != 0 } {
+		set cov [ expr { (($sigma*1.0)/$mean)*100 } ]
+		set cov [ expr { round($cov*10)/10.0 } ]
+	    }
+        }
+    }
+    return [ list $mean $sigma $cov ]
+}
+
+# ::profiler::Handler --
+#
+#	Profile a function (tcl8.3).  This function works together with
+#       profProc, which replaces the proc command.  When a new procedure
+#       is defined, it creates and alias to this function; when that
+#       procedure is called, it calls this handler first, which gathers
+#       profiling information from the call.
+#
+# Arguments:
+#	name	name of the function to profile.
+#	args	arguments to pass to the original function.
+#
+# Results:
+#	res	result from the original function.
+
+proc ::profiler::Handler {name args} {
+    variable enabled
+
+    if { [info level] == 1 } {
+        set caller GLOBAL
+    } else {
+        # Get the name of the calling procedure
+	set caller [lindex [info level -1] 0]
+	# Remove the ORIG suffix
+	set caller [string range $caller 0 end-4]
+
+        # Make sure that caller names always include the "::" prefix;
+        # otherwise we get confused by the string inequality between
+        # "::foo" and "foo" -- even though those refer to the same proc.
+
+        if { ![string equal -length 2 $caller "::"] } {
+            set caller "::$caller"
+        }
+    }
+
+    ::profiler::enterHandler $name $caller
+    set CODE [uplevel 1 [list ${name}ORIG] $args]
+    ::profiler::leaveHandler $name $caller
+    return $CODE
+}
+
+# ::profiler::TraceHandler --
+#
+#	Profile a function (tcl8.4+).  This function works together with
+#       profProc, which replaces the proc command.  When a new procedure
+#       is defined, it creates an execution trace on the function; when
+#       that function is called, 'enter' and 'leave' traces invoke this
+#       handler first, which gathers profiling information from the call.
+#
+# Arguments:
+#	name	name of the function to profile.
+#	cmd	command name and its expanded arguments.
+#	args	for 'enter' operation, value of args is "enter"
+#	    	for 'leave' operation, args is list of
+#               3 elements: <code> <result> "leave"
+#
+# Results:
+#	None
+
+proc ::profiler::TraceHandler {name cmd args} {
+
+    if { [info level] == 1 } {
+        set caller GLOBAL
+    } else {
+        # Get the name of the calling procedure
+	set caller [lindex [info level -1] 0]
+
+        # Make sure that caller names always include the "::" prefix;
+        # otherwise we get confused by the string inequality between
+        # "::foo" and "foo" -- even though those refer to the same proc.
+
+        if { ![string equal -length 2 $caller "::"] } {
+            set caller "::$caller"
+        }
+    }
+
+    set type [lindex $args end]
+    ::profiler::${type}Handler $name $caller
+}
+
+# ::profiler::enterHandler --
+#
+#	Profile a function.  This function works together with Handler and
+#       TraceHandler to collect profiling information just before it invokes
+#       the function.
+#
+# Arguments:
+#	name	name of the function to profile.
+#	caller	name of the function that calls the profiled function.
+#
+# Results:
+#	None
+
+proc ::profiler::enterHandler {name caller} {
+    variable enabled
+
+    if { !$enabled($name) } {
+        return
+    }
+
+    if { [catch {incr ::profiler::callers($name,$caller)}] } {
+        set ::profiler::callers($name,$caller) 1
+    }
+    ::profiler::tZero $name.$caller
+}
+
+# ::profiler::leaveHandler --
+#
+#	Profile a function.  This function works together with Handler and
+#       TraceHandler to collect profiling information just after it invokes
+#       the function.
+#
+# Arguments:
+#	name	name of the function to profile.
+#	caller	name of the function that calls the profiled function.
+#
+# Results:
+#	None
+
+proc ::profiler::leaveHandler {name caller} {
+    variable enabled
+
+    # Tkt [0dd4b31bb8] Note that the result is pulled from the
+    # caller's context as it is not passed into leaveHandler
+
+    if { !$enabled($name) } {
+	return [uplevel 1 {lindex $args 1}] ;# RETURN RESULT!
+    }
+
+    set t [::profiler::tMark $name.$caller]
+    lappend ::profiler::statTime($name) $t
+
+    if { [incr ::profiler::callCount($name)] == 1 } {
+        set ::profiler::compileTime($name) $t
+    }
+    incr ::profiler::totalRuntime($name) $t
+    if { [catch {incr ::profiler::descendantTime($caller) $t}] } {
+        set ::profiler::descendantTime($caller) $t
+    }
+    if { [catch {incr ::profiler::descendants($caller,$name)}] } {
+        set ::profiler::descendants($caller,$name) 1
+    }
+
+    return [uplevel 1 {lindex $args 1}] ;# RETURN RESULT!
+}
+
+# ::profiler::profProc --
+#
+#	Replacement for the proc command that adds rudimentary profiling
+#	capabilities to Tcl.
+#
+# Arguments:
+#	name		name of the procedure
+#	arglist		list of arguments
+#	body		body of the procedure
+#
+# Results:
+#	None.
+
+proc ::profiler::profProc {name arglist body} {
+    variable callCount
+    variable compileTime
+    variable totalRuntime
+    variable descendantTime
+    variable statTime
+    variable enabled
+    variable paused
+
+    # Get the fully qualified name of the proc
+    set ns [uplevel [list namespace current]]
+    # If the proc call did not happen at the global context and it did not
+    # have an absolute namespace qualifier, we have to prepend the current
+    # namespace to the command name
+    if { ![string equal $ns "::"] } {
+	if { ![string match "::*" $name] } {
+	    set name "${ns}::${name}"
+	}
+    }
+    if { ![string match "::*" $name] } {
+	set name "::$name"
+    }
+
+    # Set up accounting for this procedure
+    set callCount($name) 0
+    set compileTime($name) 0
+    set totalRuntime($name) 0
+    set descendantTime($name) 0
+    set statTime($name) {}
+    set enabled($name) [expr {!$paused}]
+
+    if {[package vsatisfies [package provide Tcl] 8.4]} {
+        uplevel 1 [list ::_oldProc $name $arglist $body]
+        trace add execution $name {enter leave} \
+                 [list ::profiler::TraceHandler $name]
+    } else {
+        uplevel 1 [list ::_oldProc ${name}ORIG $arglist $body]
+        uplevel 1 [list interp alias {} $name {} ::profiler::Handler $name]
+    }
+    return
+}
+
+# ::profiler::init --
+#
+#	Initialize the profiler.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	None.  Renames proc to _oldProc and sets an alias for proc to
+#		profiler::profProc
+
+proc ::profiler::init {} {
+    # paused is set to 1 when the profiler is suspended.
+    variable paused 0
+
+    rename ::proc ::_oldProc
+    interp alias {} proc {} ::profiler::profProc
+
+    return
+}
+
+# ::profiler::printname --
+#
+#	Returns a string with some human readable information about
+#	the command name that was passed to this procedure.
+
+proc ::profiler::printname {name} {
+    variable callCount
+    variable compileTime
+    variable totalRuntime
+    variable descendantTime
+    variable descendants
+    variable statTime
+    variable callers
+
+    set result ""
+
+    set avgRuntime 0
+    set sigmaRuntime 0
+    set covRuntime 0
+    set avgDesTime 0
+    if { $callCount($name) > 0 } {
+	foreach {m s c} [eval ::profiler::stats $statTime($name)] { break }
+	set avgRuntime   $m
+	set sigmaRuntime $s
+	set covRuntime   $c
+	set avgDesTime \
+	    [expr {$descendantTime($name)/$callCount($name)}]
+    }
+
+    append result "Profiling information for $name\n"
+    append result "[string repeat = 60]\n"
+    append result "            Total calls:  $callCount($name)\n"
+    if { !$callCount($name) } {
+	append result "\n"
+	return $result
+    }
+    append result "    Caller distribution:\n"
+    set i [expr {[string length $name] + 1}]
+    foreach index [lsort [array names callers $name,*]] {
+	append result "  [string range $index $i end]:  $callers($index)\n"
+    }
+    append result "           Compile time:  $compileTime($name)\n"
+    append result "          Total runtime:  $totalRuntime($name)\n"
+    append result "        Average runtime:  $avgRuntime\n"
+    append result "          Runtime StDev:  $sigmaRuntime\n"
+    append result "         Runtime cov(%):  $covRuntime\n"
+    append result "  Total descendant time:  $descendantTime($name)\n"
+    append result "Average descendant time:  $avgDesTime\n"
+    append result "Descendants:\n"
+    if { !$descendantTime($name) } {
+	append result "  none\n"
+    }
+    foreach index [lsort [array names descendants $name,*]] {
+	append result "  [string range $index $i end]: \
+		    $descendants($index)\n"
+    }
+    append result "\n"
+    return $result
+}
+
+
+# ::profiler::print --
+#
+#	Print information about a proc.
+#
+# Arguments:
+#	pattern	pattern of the proc's to get info for; default is *.
+#
+# Results:
+#	A human readable printout of info.
+
+proc ::profiler::print {{pattern *}} {
+    variable callCount
+    #parray callCount
+
+    set result ""
+    foreach name [lsort [array names callCount $pattern]] {
+	append result [printname $name]
+    }
+    return $result
+}
+
+# ::profiler::printsorted --
+#
+#	This proc takes a key and a pattern as arguments, and produces
+#	human readable results for the procs that match the pattern,
+#	sorted by the key.
+
+proc ::profiler::printsorted {key {pattern *}} {
+    variable callCount
+    variable compileTime
+    variable totalRuntime
+    variable descendantTime
+    variable descendants
+    variable statTime
+    variable callers
+
+    set data [sortFunctions $key]
+    foreach {k v} $data {
+	append result [printname [lindex $k 0]]
+    }
+    return $result
+}
+
+
+# ::profiler::dump --
+#
+#	Dump out the information for a proc in a big blob.
+#
+# Arguments:
+#	pattern	pattern of the proc's to lookup; default is *.
+#
+# Results:
+#	data	data about the proc's.
+
+proc ::profiler::dump {{pattern *}} {
+    variable callCount
+    variable compileTime
+    variable totalRuntime
+    variable callers
+    variable descendantTime
+    variable descendants
+    variable statTime
+
+    set result ""
+    foreach name [lsort [array names callCount $pattern]] {
+	set i [expr {[string length $name] + 1}]
+	catch {unset thisCallers}
+	foreach index [lsort [array names callers $name,*]] {
+	    set thisCallers([string range $index $i end]) $callers($index)
+	}
+	set avgRuntime 0
+	set sigmaRuntime 0
+	set covRuntime 0
+	set avgDesTime 0
+	if { $callCount($name) > 0 } {
+	    foreach {m s c} [eval ::profiler::stats $statTime($name)] { break }
+	    set avgRuntime   $m
+	    set sigmaRuntime $s
+	    set covRuntime   $c
+	    set avgDesTime \
+		    [expr {$descendantTime($name)/$callCount($name)}]
+	}
+	set descendantList [list ]
+	foreach index [lsort [array names descendants $name,*]] {
+	    lappend descendantList [string range $index $i end]
+	}
+	lappend result $name [list callCount $callCount($name) \
+		callerDist [array get thisCallers] \
+		compileTime $compileTime($name) \
+		totalRuntime $totalRuntime($name) \
+		averageRuntime $avgRuntime \
+		stddevRuntime  $sigmaRuntime \
+		covpercentRuntime $covRuntime \
+		descendantTime $descendantTime($name) \
+		averageDescendantTime $avgDesTime \
+		descendants $descendantList]
+    }
+    return $result
+}
+
+# ::profiler::sortFunctions --
+#
+#	Return a list of functions sorted by a particular field and the
+#	value of that field.
+#
+# Arguments:
+#	field	field to sort by
+#
+# Results:
+#	slist	sorted list of lists, sorted by the field in question.
+
+proc ::profiler::sortFunctions {{field ""}} {
+    switch -glob -- $field {
+	"calls" {
+	    upvar ::profiler::callCount data
+	}
+	"compileTime" {
+	    upvar ::profiler::compileTime data
+	}
+	"totalRuntime" {
+	    upvar ::profiler::totalRuntime data
+	}
+	"avgRuntime" -
+	"averageRuntime" {
+	    variable callCount
+	    variable totalRuntime
+	    foreach fxn [array names callCount] {
+		if { $callCount($fxn) > 1 } {
+		    set data($fxn) \
+			    [expr {$totalRuntime($fxn)/($callCount($fxn) - 1)}]
+		}
+	    }
+	}
+	"exclusiveRuntime" {
+	    variable totalRuntime
+	    variable descendantTime
+	    foreach fxn [array names totalRuntime] {
+		set data($fxn) \
+			[expr {$totalRuntime($fxn) - $descendantTime($fxn)}]
+	    }
+	}
+	"avgExclusiveRuntime" {
+	    variable totalRuntime
+	    variable callCount
+	    variable descendantTime
+	    foreach fxn [array names totalRuntime] {
+		if { $callCount($fxn) } {
+		    set data($fxn) \
+			    [expr {($totalRuntime($fxn) - \
+				$descendantTime($fxn)) / $callCount($fxn)}]
+		}
+	    }
+	}
+	"nonCompileTime" {
+	    variable compileTime
+	    variable totalRuntime
+	    foreach fxn [array names totalRuntime] {
+		set data($fxn) [expr {$totalRuntime($fxn)-$compileTime($fxn)}]
+	    }
+	}
+	default {
+	    error "unknown statistic \"$field\": should be calls,\
+		    compileTime, exclusiveRuntime, nonCompileTime,\
+		    totalRuntime, avgExclusiveRuntime, or avgRuntime"
+	}
+    }
+
+    set result [list ]
+    foreach fxn [array names data] {
+	lappend result [list $fxn $data($fxn)]
+    }
+    return [lsort -integer -index 1 $result]
+}
+
+# ::profiler::reset --
+#
+#	Reset collected data for functions matching a given pattern.
+#
+# Arguments:
+#	pattern		pattern of functions to reset; default is *.
+#
+# Results:
+#	None.
+
+proc ::profiler::reset {{pattern *}} {
+    variable callCount
+    variable compileTime
+    variable totalRuntime
+    variable callers
+    variable statTime
+    variable descendantTime
+    variable descendants
+
+    foreach name [array names callCount $pattern] {
+	set callCount($name) 0
+	set compileTime($name) 0
+	set totalRuntime($name) 0
+	set statTime($name) {}
+	foreach caller [array names callers $name,*] {
+	    unset callers($caller)
+	}
+	set descendantTime($name) 0
+        foreach descendant [array names descendants $name,*] {
+            unset descendants($descendant)
+        }
+    }
+    return
+}
+
+# ::profiler::suspend --
+#
+#	Suspend the profiler.
+#
+# Arguments:
+#	pattern		pattern of functions to suspend; default is *.
+#
+# Results:
+#	None.  Resets the `enabled($name)' variable to 0
+#	       to suspend profiling
+
+proc ::profiler::suspend {{pattern *}} {
+    variable callCount
+    variable enabled
+
+    foreach name [array names callCount $pattern] {
+        set enabled($name) 0
+    }
+
+    return
+}
+
+# ::profiler::resume --
+#
+#	Resume the profiler, after it has been suspended.
+#
+# Arguments:
+#	pattern		pattern of functions to suspend; default is *.
+#
+# Results:
+#	None.  Sets the `enabled($name)' variable to 1
+#	       so as to enable the profiler.
+
+proc ::profiler::resume {{pattern *}} {
+    variable callCount
+    variable enabled
+
+    foreach name [array names callCount $pattern] {
+        set enabled($name) 1
+    }
+
+    return
+}
+
+# ::profiler::new-disabled --
+#
+#	Start new procedures with profiling disabled
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	None.
+
+proc ::profiler::new-disabled {} {
+    variable paused 1
+    return
+}
+
+# ::profiler::new-enabled --
+#
+#	Start new procedures with profiling enabled
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	None.
+
+proc ::profiler::new-enabled {} {
+    variable paused 0
+    return
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/char.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/char.tcl
new file mode 100644
index 00000000..a138bbc4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/char.tcl
@@ -0,0 +1,289 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2009,2021 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Operations with characters: (Un)quoting.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+
+namespace eval char {
+    namespace export unquote quote
+    namespace ensemble create
+    namespace eval quote {
+	namespace export tcl string comment cstring
+	namespace ensemble create
+    }
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+proc ::char::unquote {args} {
+    if {1 == [llength $args]} { return [Unquote {*}$args] }
+    set res {}
+    foreach ch $args { lappend res [Unquote $ch] }
+    return $res
+}
+
+proc ::char::Unquote {ch} {
+
+    # A character, stored in quoted form is transformed back into a
+    # proper Tcl character (i.e. the internal representation).
+
+    switch -exact -- $ch {
+	"\\n"  {return \n}
+	"\\t"  {return \t}
+	"\\r"  {return \r}
+	"\\["  {return \[}
+	"\\]"  {return \]}
+	"\\'"  {return '}
+	"\\\"" {return "\""}
+	"\\\\" {return \\}
+    }
+
+    if {[regexp {^\\([0-2][0-7][0-7])$} $ch -> ocode]} {
+	return [format %c $ocode]
+
+    } elseif {[regexp {^\\([0-7][0-7]?)$} $ch -> ocode]} {
+	return [format %c 0$ocode]
+
+    } elseif {[regexp {^\\u([[:xdigit:]][[:xdigit:]]?[[:xdigit:]]?[[:xdigit:]]?)$} $ch -> hcode]} {
+	return [format %c 0x$hcode]
+
+    }
+
+    return $ch
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::char::quote::tcl {ch args} {
+    Arg Tcl $ch {*}$args
+}
+
+proc ::char::quote::Tcl {ch} {
+    # Input:  A single character
+    # Output: A string representing the input.
+    # Properties of the output:
+    # (1) Contains only ASCII characters (7bit Unicode subset).
+    # (2) When embedded in a ""-quoted Tcl string in a piece of Tcl
+    #     code the Tcl parser will regenerate the input character.
+
+    # Special character?
+    switch -exact -- $ch {
+	"\n" {return "\\n"}
+	"\r" {return "\\r"}
+	"\t" {return "\\t"}
+	"\\" - "\;" -
+	" "  - "\"" -
+	"("  - ")"  -
+	"\{" - "\}" -
+	"\[" - "\]" {
+	    # Quote space and all the brackets as well, using octal,
+	    # for easy impure list-ness.
+
+	    scan $ch %c chcode
+	    return \\[format %o $chcode]
+	}
+    }
+
+    scan $ch %c chcode
+
+    # Unicode beyond 7bit ASCII?
+    if {$chcode > 127} {
+	return \\u[format %04x $chcode]
+    }
+
+    # Control character?
+    if {[::string is control -strict $ch]} {
+	return \\[format %o $chcode]
+    }
+
+    # Regular character: Is its own representation.
+    return $ch
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::char::quote::string {ch args} {
+    Arg String $ch {*}$args
+}
+
+proc ::char::quote::String {ch} {
+    # Input:  A single character
+    # Output: A string representing the input
+    # Properties of the output
+    # (1) Human-readable, for use in error messages, or comments.
+    # (1a) Uses only printable characters.
+    # (2) NO particular properties with regard to C or Tcl parsers.
+
+    scan $ch %c chcode
+
+    # Map the ascii control characters to proper names.
+    if {($chcode <= 32) || ($chcode == 127)} {
+	variable strmap
+	return [dict get $strmap $chcode]
+    }
+
+    # Printable ascii characters represent themselves.
+    if {$chcode < 128} {
+	return $ch
+    }
+
+    # Unicode characters. Mostly represent themselves, except if
+    # control or not printable. Then they are represented by their
+    # hexadecimal codepoint.
+
+    # Control characters: Octal
+    if {[::string is control -strict $ch] ||
+	![::string is print -strict $ch]} {
+	return <U+[format %04x $chcode]>
+    }
+
+    return $ch
+}
+
+namespace eval ::char::quote {
+    variable strmap {
+	0 <NUL>  8 <BS>   16 <DLE> 24 <CAN>  32 <SPACE>
+	1 <SOH>  9 <TAB>  17 <DC1> 25 <EM>  127 <DEL>
+	2 <STX> 10 <LF>   18 <DC2> 26 <SUB>
+	3 <ETX> 11 <VTAB> 19 <DC3> 27 <ESC>
+	4 <EOT> 12 <FF>   20 <DC4> 28 <FS>
+	5 <ENQ> 13 <CR>   21 <NAK> 29 <GS>
+	6 <ACK> 14 <SO>   22 <SYN> 30 <RS>
+	7 <BEL> 15 <SI>   23 <ETB> 31 <US>
+    }
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::char::quote::cstring {ch args} {
+    Arg CString $ch {*}$args
+}
+
+proc ::char::quote::CString {ch} {
+    # Input:  A single character
+    # Output: A string representing the input.
+    # Properties of the output:
+    # (1) Contains only ASCII characters (7bit Unicode subset).
+    # (2) When embedded in a ""-quoted C string in a piece of
+    #     C code the C parser will regenerate the input character
+    #     in UTF-8 encoding.
+
+    # Special characters (named).
+    switch -exact -- $ch {
+	"\n" {return "\\n"}
+	"\r" {return "\\r"}
+	"\t" {return "\\t"}
+	"\"" - "\\" {
+	    return \\$ch
+	}
+	"\{" - "\}" {
+	    # The generated C code containing the result of this
+	    # transform may be embedded in Tcl code (Brace-quoted),
+	    # i.e. like for a critcl-based package. To avoid tripping
+	    # the Tcl parser with unbalanced braces we sacrifice
+	    # readability of the generated code a bit and insert
+	    # braces in their octal form.
+	    scan $ch %c chcode
+	    return \\[format %o $chcode]
+	}
+    }
+
+    scan $ch %c chcode
+
+    # Beyond 7-bit ASCII: Unicode
+    if {$chcode > 127} {
+	# Recode the character into the sequence of utf-8 bytes and
+	# convert each to octal.
+	foreach x [split [encoding convertto utf-8 $ch] {}] {
+	    scan $x %c x
+	    append res \\[format %o $x]
+	}
+	return $res
+    }
+
+    # Control characters: Octal
+    if {[::string is control -strict $ch]} {
+	return \\[format %o $chcode]
+    }
+
+    # Regular character: Is its own representation.
+
+    return $ch
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::char::quote::comment {ch args} {
+    Arg Comment $ch {*}$args
+}
+
+proc ::char::quote::Comment {ch} {
+    # Converts a Tcl character (internal representation) into a string
+    # which is accepted by the Tcl parser when used within a Tcl
+    # comment.
+
+    # Special characters
+
+    switch -exact -- $ch {
+	" "  {return "<blank>"}
+	"\n" {return "\\n"}
+	"\r" {return "\\r"}
+	"\t" {return "\\t"}
+	"\"" -
+	"\{" - "\}" -
+	"("  - ")"  {
+	    return \\$ch
+	}
+    }
+
+    scan $ch %c chcode
+
+    # Beyond 7-bit ASCII: Unicode
+
+    if {$chcode > 127} {
+	return \\u[format %04x $chcode]
+    }
+
+    # Control characters: Octal
+    if {[::string is control -strict $ch]} {
+	return \\[format %o $chcode]
+    }
+
+    # Regular character: Is its own representation.
+
+    return $ch
+}
+
+# ### ### ### ######### ######### #########
+## Internal. Argument processing helper
+
+proc ::char::quote::Arg {cmdpfx str args} {
+    # single argument => treat as string,
+    # process all characters separately.
+    # return transformed string.
+    if {![llength $args]} {
+	set r {}
+	foreach c [split $str {}] {
+	    append r [uplevel 1 [linsert $cmdpfx end $c]]
+	}
+	return $r
+    }
+
+    # multiple arguments => process each like a single argument, and
+    # return list of transform results.
+    set args [linsert $args 0 $str]
+    foreach str $args {
+	lappend res [uplevel 1 [list Arg $cmdpfx $str]]
+    }
+    return $res
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide char 1.0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pkgIndex.tcl
new file mode 100644
index 00000000..79a69d62
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pkgIndex.tcl
@@ -0,0 +1,71 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} return
+
+# General utilities.
+package ifneeded char          1.0.2 [list source [file join $dir char.tcl]]
+package ifneeded text::write   1 [list source [file join $dir text_write.tcl]]
+
+# AST support
+package ifneeded pt::ast     1.1 [list source [file join $dir pt_astree.tcl]]
+
+# General parser support. Currently only conversion of structured
+# syntax errors (or parts thereof) into a human-readable form.
+package ifneeded pt::util    1.1 [list source [file join $dir pt_util.tcl]]
+
+# Parsing Expression support
+package ifneeded pt::pe        1.0.2 [list source [file join $dir pt_pexpression.tcl]]
+package ifneeded pt::pe::op    1.0.1 [list source [file join $dir pt_pexpr_op.tcl]]
+
+# Parsing Expression Grammar support.
+package ifneeded pt::peg                1 [list source [file join $dir pt_pegrammar.tcl]]
+package ifneeded pt::peg::container     1 [list source [file join $dir pt_peg_container.tcl]]
+package ifneeded pt::peg::interp    1.0.1 [list source [file join $dir pt_peg_interp.tcl]]
+package ifneeded pt::peg::op        1.1.0 [list source [file join $dir pt_peg_op.tcl]]
+package ifneeded pt::parse::peg     1.0.1 [list source [file join $dir pt_parse_peg.tcl]]
+
+
+# Export/import managers. Assumes an untrusted environment.
+package ifneeded pt::peg::export            1.0.1 [list source [file join $dir pt_peg_export.tcl]]
+package ifneeded pt::peg::import            1.0.1 [list source [file join $dir pt_peg_import.tcl]]
+
+# Export plugins, connecting manager to the core conversion packages.
+package ifneeded pt::peg::export::container 1 [list source [file join $dir pt_peg_export_container.tcl]]
+package ifneeded pt::peg::export::json      1 [list source [file join $dir pt_peg_export_json.tcl]]
+package ifneeded pt::peg::export::peg       1 [list source [file join $dir pt_peg_export_peg.tcl]]
+
+# Import plugins, connecting manager to the core conversion packages.
+package ifneeded pt::peg::import::json      1 [list source [file join $dir pt_peg_import_json.tcl]]
+package ifneeded pt::peg::import::peg       1 [list source [file join $dir pt_peg_import_peg.tcl]]
+
+# Export core functionality: Conversion from PEG to a specific format.
+package ifneeded pt::peg::to::container     1 [list source [file join $dir pt_peg_to_container.tcl]]
+package ifneeded pt::peg::to::cparam    1.1.3 [list source [file join $dir pt_peg_to_cparam.tcl]]
+package ifneeded pt::peg::to::json          1 [list source [file join $dir pt_peg_to_json.tcl]]
+package ifneeded pt::peg::to::param     1.0.1 [list source [file join $dir pt_peg_to_param.tcl]]
+package ifneeded pt::peg::to::peg       1.0.2 [list source [file join $dir pt_peg_to_peg.tcl]]
+package ifneeded pt::peg::to::tclparam  1.0.3 [list source [file join $dir pt_peg_to_tclparam.tcl]]
+
+# Import core functionality: Conversion from a specific format to PEG.
+package ifneeded pt::peg::from::json      1 [list source [file join $dir pt_peg_from_json.tcl]]
+package ifneeded pt::peg::from::peg   1.0.3 [list source [file join $dir pt_peg_from_peg.tcl]]
+
+# PARAM runtime.
+package ifneeded pt::rde      1.1 [list source [file join $dir pt_rdengine.tcl]]
+package ifneeded pt::rde::oo  1.1 [list source [file join $dir pt_rdengine_oo.tcl]]
+
+# Note: The last two numbers are the rde::nx version itself. The
+# preceding version information is the rde::oo version it is based on.
+package ifneeded pt::rde::nx  1.1.1.1 [list source [file join $dir pt_rdengine_nx.tcl]]
+
+
+# PEG grammar specification, as CONTAINER
+package ifneeded pt::peg::container::peg 1 [list source [file join $dir pt_peg_container_peg.tcl]]
+
+# */PARAM support (canned configurations).
+package ifneeded pt::cparam::configuration::critcl  1.0.2 [list source [file join $dir pt_cparam_config_critcl.tcl]]
+package ifneeded pt::cparam::configuration::tea     0.1   [list source [file join $dir pt_cparam_config_tea.tcl]]
+package ifneeded pt::tclparam::configuration::snit  1.0.2 [list source [file join $dir pt_tclparam_config_snit.tcl]]
+package ifneeded pt::tclparam::configuration::tcloo 1.0.4 [list source [file join $dir pt_tclparam_config_tcloo.tcl]]
+package ifneeded pt::tclparam::configuration::nx    1.0.1 [list source [file join $dir pt_tclparam_config_nx.tcl]]
+
+# Parser generator core.
+package ifneeded pt::pgen 1.2 [list source [file join $dir pt_pgen.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_astree.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_astree.tcl
new file mode 100644
index 00000000..5d8379b4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_astree.tcl
@@ -0,0 +1,234 @@
+# -*- tcl -*-
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Verification of serialized parsing expressions, conversion
+# between such and other data structures, and their construction.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.5              ; # Required runtime.
+package require char                 ; # Character quoting utilities.
+
+# # ## ### ##### ######## ############# #####################
+##
+
+namespace eval ::pt::ast {
+    namespace export \
+	verify verify-as-canonical canonicalize \
+	equal bottomup topdown \
+	print new new0
+
+    namespace ensemble create
+}
+
+# # ## ### ##### ######## #############
+## Public API
+
+# Check that the proposed serialization of an abstract syntax tree is
+# indeed such.
+
+proc ::pt::ast::verify {serial {canonvar {}}} {
+    variable ourprefix
+    #puts "V <$serial> /[llength [info level 0]] / [info level 0]"
+
+    if {$canonvar ne {}} {
+	upvar 1 $canonvar iscanonical
+	set iscanonical [string equal $serial [list {*}$serial]]
+    }
+
+    topdown [list [namespace current]::Verify] $serial
+    return
+}
+
+proc ::pt::ast::verify-as-canonical {serial} {
+    verify $serial iscanonical
+    if {!$iscanonical} {
+	variable ourprefix
+	variable ourimpure
+	return -code error $ourprefix$ourimpure
+    }
+    return
+}
+
+proc ::pt::ast::Verify {ast} {
+    variable ourprefix
+    variable ourbadrange
+    variable ourbadend
+    variable ourbadstart
+    variable ourshort
+
+    if {[llength $ast] < 3} {
+	return -code error $ourprefix$ourshort
+    }
+
+    # Open Questions
+    # - Should we constrain the locations of the children to be
+    #   inside of the parent ?
+    # - Should we constrain the locations of the children to not
+    #   overlap ?
+    # Note: Gaps we have to allow, comments and whitespace and such.
+
+    lassign $ast type start end
+
+    if {![string is integer -strict $start]} {
+	return -code error $ourprefix[format $ourbadstart $start]
+    } elseif {$start < 0} {
+	return -code error $ourprefix[format $ourbadstart $start]
+    }
+
+    if {![string is integer -strict $end] || ($end < 0)} {
+	return -code error $ourprefix[format $ourbadend $end]
+    }
+
+    if {$end < $start} {
+	return -code error $ourprefix$ourbadrange
+    }
+
+    upvar 1 iscanonical iscanonical
+    if {
+	[info exists iscanonical] && ($ast ne [list {*}$ast])
+    } {
+	# Reject coding with superfluous whitespace as non-canonical.
+	set iscanonical 0
+    }
+    return
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::ast::canonicalize {serial} {
+    verify $serial iscanonical
+    if {$iscanonical} { return $serial }
+    return [bottomup [list [namespace current]::Canonicalize] $serial]
+}
+
+proc ::pt::ast::Canonicalize {ast} {
+    # We construct a pure list out of the node data.
+    return [list {*}$ast]
+}
+
+# # ## ### ##### ######## #############
+
+# Converts a parsing expression serialization into a human readable
+# string for test results. It assumes that the serialization is at
+# least structurally sound.
+
+proc ::pt::ast::print {serial} {
+    return [join [bottomup [list [namespace current]::Print] $serial] \n]
+}
+
+proc ::pt::ast::Print {ast} {
+    set children [lassign $ast type start end]
+    set result   [list [list <$type> :: $start $end]]
+
+    # The arguments are already processed for printing
+    foreach c $children {
+	foreach line $c {
+	    lappend result "    $line"
+	}
+    }
+    return $result
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::ast::equal {seriala serialb} {
+    return [string equal \
+		[canonicalize $seriala] \
+		[canonicalize $serialb]]
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::ast::bottomup {cmdprefix ast} {
+    Bottomup 2 $cmdprefix $ast
+}
+
+proc ::pt::ast::Bottomup {level cmdprefix ast} {
+    set children [lassign $ast type start end]
+    set new      [list $type $start $end]
+
+    set clevel $level
+    incr clevel
+
+    foreach c $children {
+	lappend new [Bottomup $clevel $cmdprefix $c]
+    }
+
+    return [uplevel $level [list {*}$cmdprefix $new]]
+}
+
+proc ::pt::ast::topdown {cmdprefix ast} {
+    Topdown 2 $cmdprefix $ast
+    return
+}
+
+proc ::pt::ast::Topdown {level cmdprefix ast} {
+    uplevel $level [list {*}$cmdprefix $ast]
+
+    incr level
+    foreach c [lrange $ast 3 end] {
+	Topdown $level $cmdprefix $c
+    }
+    return
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::ast::new {sym start end args} {
+    variable ourbadstart
+    variable ourbadend
+    variable ourbadrange
+
+    if {![string is integer -strict $start] || ($start < 0)} {
+	return -code error [format $ourbadstart $start]
+    }
+    if {![string is integer -strict $end] || ($end < 0)} {
+	return -code error [format $ourbadend $end]
+    }
+    if {$end < $start} {
+	return -code error $ourbadrange
+    }
+
+    return [list $sym $start $end {*}$args]
+}
+
+proc ::pt::ast::new0 {sym start args} {
+    variable ourbadstart
+
+    if {![string is integer -strict $start] || ($start < 0)} {
+	return -code error [format $ourbadstart $start]
+    }
+
+    # The end of the range is placed one position before the start,
+    # making it zero-length (length = end-start+1), i.e. empty. Such
+    # nodes are possible for symbols whose RHS uses * or ? as their
+    # top-level operator.
+
+    set  end $start
+    incr end -1
+
+    return [list $sym $start $end {*}$args]
+}
+
+namespace eval ::pt::ast {
+    # # ## ### ##### ######## #############
+    ## Strings for error messages.
+
+    variable ourprefix    "error in serialization:"
+    variable ourbadstart  " expected integer >= 0 as start of range, got \"%s\""
+    variable ourbadend    " expected integer >= 0 as end of range, got \"%s\""
+    variable ourbadrange  " expected start <= end for range"
+    variable ourshort     " expected at least 3 elements for node"
+    variable ourimpure    " has irrelevant whitespace"
+
+    ##
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide pt::ast 1.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_cparam_config_critcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_cparam_config_critcl.tcl
new file mode 100644
index 00000000..f40172c6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_cparam_config_critcl.tcl
@@ -0,0 +1,494 @@
+# -*- tcl -*-
+# Copyright (c) 2009-2014 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# TODO: Refactor this and pt::cparam::configuration::critcl to avoid
+# TODO: duplication of the supporting code (creation of the RDE
+# TODO: amalgamation, basic C template).
+
+# Canned configuration for the converter to C/PARAM representation,
+# causing generation of a proper critcl-based parser.
+
+# The requirements of the embedded template are not our requirements.
+# @mdgen NODEP: critcl
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.5              ; # Required runtime.
+
+# # ## ### ##### ######## ############# #####################
+##
+
+namespace eval ::pt::cparam::configuration::critcl {
+    namespace export   def
+    namespace ensemble create
+
+    # @mdgen OWNER: rde_critcl/util.*
+    # @mdgen OWNER: rde_critcl/stack.*
+    # @mdgen OWNER: rde_critcl/tc.*
+    # @mdgen OWNER: rde_critcl/param.*
+    # Access to the rde_critcl files forming the low-level runtime
+    variable selfdir [file dirname [file normalize [info script]]]
+}
+
+# # ## ### ##### ######## #############
+## Public API
+
+# Check that the proposed serialization of an abstract syntax tree is
+# indeed such.
+
+proc ::pt::cparam::configuration::critcl::def {class pkg version cmd} {
+    # TODO :: See if we can consolidate the API for converters,
+    # TODO :: plugins, export manager, and container in some way.
+    # TODO :: Container may make exporter manager available through
+    # TODO :: public method.
+
+    # class   = The namespace/prefix for the generated commands.
+    # pkg     = The name of the generated package / parser.
+    # version = The version of the generated package / parser.
+
+    if {[string first :: $class] < 0} {
+	set cheader  $class
+	set ctrailer $class
+    } else {
+	set cheader  [namespace qualifier $class]
+	set ctrailer [namespace tail      $class]
+    }
+
+    lappend map	@@RUNTIME@@ [GetRuntime]
+    lappend map	@@PKG@@     $pkg
+    lappend map	@@VERSION@@ $version
+    lappend map	@@CLASS@@   $class
+    lappend map	@@CHEAD@@   $cheader
+    lappend map	@@CTAIL@@   $ctrailer
+    lappend map	\n\t        \n ;# undent the template
+
+    {*}$cmd -main      MAIN
+    {*}$cmd -indent    8
+    {*}$cmd -template  [string trim \
+			    [string map $map {
+	## -*- tcl -*-
+	##
+	## Critcl-based C/PARAM implementation of the parsing
+	## expression grammar
+	##
+	##	@name@
+	##
+	## Generated from file	@file@
+	##            for user  @user@
+	##
+	# # ## ### ##### ######## ############# #####################
+	## Requirements
+
+	package require Tcl 8.4
+	package require critcl
+	# @sak notprovided @@PKG@@
+	package provide    @@PKG@@ @@VERSION@@
+
+	# Note: The implementation of the PARAM virtual machine
+	#       underlying the C/PARAM code used below is inlined
+	#       into the generated parser, allowing for direct access
+	#       and manipulation of the RDE state, instead of having
+	#       to dispatch through the Tcl interpreter.
+
+	# # ## ### ##### ######## ############# #####################
+	##
+
+	namespace eval ::@@CHEAD@@ {
+	    # # ## ### ##### ######## ############# #####################
+	    ## Supporting code for the main command.
+
+	    catch {
+		#critcl::cflags -g
+		#critcl::debug memory symbols
+	    }
+
+	    # # ## ### ###### ######## #############
+	    ## RDE runtime, inlined, and made static.
+
+	    # This is the C code for the RDE, i.e. the implementation
+	    # of pt::rde. Only the low-level engine is imported, the
+	    # Tcl interface layer is ignored.  This generated parser
+	    # provides its own layer for that.
+
+	    critcl::ccode {
+		/* -*- c -*- */
+
+		#include <string.h>
+		#include <ctype.h>  /* is... */
+		#include <stdlib.h> /* qsort */
+		#define SCOPE static
+
+@@RUNTIME@@
+	    }
+
+	    # # ## ### ###### ######## #############
+	    ## BEGIN of GENERATED CODE. DO NOT EDIT.
+
+	    critcl::ccode {
+		/* -*- c -*- */
+
+@code@
+	    }
+
+	    ## END of GENERATED CODE. DO NOT EDIT.
+	    # # ## ### ###### ######## #############
+
+	    # # ## ### ###### ######## #############
+	    ## Global PARSER management, per interp
+
+	    critcl::ccode {
+		/* -*- c -*- */
+
+		typedef struct PARSERg {
+		    long int counter;
+		    char     buf [50];
+		} PARSERg;
+
+		static void
+		PARSERgRelease (ClientData cd, Tcl_Interp* interp)
+		{
+		    ckfree((char*) cd);
+		}
+
+		static const char*
+		PARSERnewName (Tcl_Interp* interp)
+		{
+#define KEY "tcllib/parser/@@PKG@@/critcl"
+
+		    Tcl_InterpDeleteProc* proc = PARSERgRelease;
+		    PARSERg*                  parserg;
+
+		    parserg = Tcl_GetAssocData (interp, KEY, &proc);
+		    if (parserg  == NULL) {
+			parserg = (PARSERg*) ckalloc (sizeof (PARSERg));
+			parserg->counter = 0;
+
+			Tcl_SetAssocData (interp, KEY, proc,
+					  (ClientData) parserg);
+		    }
+
+		    parserg->counter ++;
+		    sprintf (parserg->buf, "@@CTAIL@@%ld", parserg->counter);
+		    return parserg->buf;
+#undef  KEY
+		}
+
+		static void
+		PARSERdeleteCmd (ClientData clientData)
+		{
+		    /*
+		     * Release the whole PARSER
+		     * (Low-level engine only actually).
+		     */
+		    rde_param_del ((RDE_PARAM) clientData);
+		}
+	    }
+
+	    # # ## ### ##### ######## #############
+	    ## Functions implementing the object methods, and helper.
+
+	    critcl::ccode {
+		static int  COMPLETE (RDE_PARAM p, Tcl_Interp* interp);
+
+		static int parser_PARSE  (RDE_PARAM p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+		{
+		    int mode;
+		    Tcl_Channel chan;
+
+		    if (objc != 3) {
+			Tcl_WrongNumArgs (interp, 2, objv, "chan");
+			return TCL_ERROR;
+		    }
+
+		    chan = Tcl_GetChannel(interp,
+					  Tcl_GetString (objv[2]),
+					  &mode);
+
+		    if (!chan) {
+			return TCL_ERROR;
+		    }
+
+		    rde_param_reset (p, chan);
+		    MAIN (p) ; /* Entrypoint for the generated code. */
+		    return COMPLETE (p, interp);
+		}
+
+		static int parser_PARSET (RDE_PARAM p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+		{
+		    char* buf;
+		    int   len;
+
+		    if (objc != 3) {
+			Tcl_WrongNumArgs (interp, 2, objv, "text");
+			return TCL_ERROR;
+		    }
+
+		    buf = Tcl_GetStringFromObj (objv[2], &len);
+
+		    rde_param_reset (p, NULL);
+		    rde_param_data  (p, buf, len);
+		    MAIN (p) ; /* Entrypoint for the generated code. */
+		    return COMPLETE (p, interp);
+		}
+
+		/* See also rde_critcl/m.c, param_COMPLETE() */
+		static int COMPLETE (RDE_PARAM p, Tcl_Interp* interp)
+		{
+		    if (rde_param_query_st (p)) {
+			long int  ac;
+			Tcl_Obj** av;
+
+			rde_param_query_ast (p, &ac, &av);
+
+			if (ac > 1) {
+			    Tcl_Obj** lv = NALLOC (3+ac, Tcl_Obj*);
+
+			    memcpy(lv + 3, av, ac * sizeof (Tcl_Obj*));
+			    lv [0] = Tcl_NewObj ();
+			    lv [1] = Tcl_NewIntObj (1 + rde_param_query_lstop (p));
+			    lv [2] = Tcl_NewIntObj (rde_param_query_cl (p));
+
+			    Tcl_SetObjResult (interp, Tcl_NewListObj (3, lv));
+			    ckfree ((char*) lv);
+
+			} else if (ac == 0) {
+			    /*
+			     * Match, but no AST. This is possible if the grammar
+			     * consists of only the start expression.
+			     */
+			    Tcl_SetObjResult (interp, Tcl_NewStringObj ("",-1));
+			} else {
+			    Tcl_SetObjResult (interp, av [0]);
+			}
+
+			return TCL_OK;
+		    } else {
+			Tcl_Obj* xv [1];
+			const ERROR_STATE* er = rde_param_query_er (p);
+			Tcl_Obj* res = rde_param_query_er_tcl (p, er);
+			/* res = list (location, list(msg)) */
+
+			/* Stick the exception type-tag before the existing elements */
+			xv [0] = Tcl_NewStringObj ("pt::rde",-1);
+			Tcl_ListObjReplace(interp, res, 0, 0, 1, xv);
+
+			Tcl_SetErrorCode (interp, "PT", "RDE", "SYNTAX", NULL);
+			Tcl_SetObjResult (interp, res);
+			return TCL_ERROR;
+		    }
+		}
+	    }
+
+	    # # ## ### ##### ######## #############
+	    ## Object command, method dispatch.
+
+	    critcl::ccode {
+		static int parser_objcmd (ClientData cd, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+		{
+		    RDE_PARAM p = (RDE_PARAM) cd;
+		    int m, res;
+
+		    static CONST char* methods [] = {
+			"destroy", "parse", "parset", NULL
+		    };
+		    enum methods {
+			M_DESTROY, M_PARSE, M_PARSET
+		    };
+
+		    if (objc < 2) {
+			Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?");
+			return TCL_ERROR;
+		    } else if (Tcl_GetIndexFromObj (interp, objv [1], methods, "option",
+						    0, &m) != TCL_OK) {
+			return TCL_ERROR;
+		    }
+
+		    /* Dispatch to methods. They check the #args in
+		     * detail before performing the requested
+		     * functionality
+		     */
+
+		    switch (m) {
+			case M_DESTROY:
+			    if (objc != 2) {
+				Tcl_WrongNumArgs (interp, 2, objv, NULL);
+				return TCL_ERROR;
+			    }
+
+			Tcl_DeleteCommandFromToken(interp, (Tcl_Command) rde_param_query_clientdata (p));
+			return TCL_OK;
+
+			case M_PARSE:	res = parser_PARSE  (p, interp, objc, objv); break;
+			case M_PARSET:	res = parser_PARSET (p, interp, objc, objv); break;
+			default:
+			/* Not coming to this place */
+			ASSERT (0,"Reached unreachable location");
+		    }
+
+		    return res;
+		}
+	    }
+
+	    # # ## ### ##### ######## #############
+	    # Class command, i.e. object construction.
+
+	    critcl::ccommand @@CTAIL@@_critcl {dummy interp objc objv} {
+		/*
+		 * Syntax: No arguments beyond the name
+		 */
+
+		RDE_PARAM   parser;
+		CONST char* name;
+		Tcl_Obj*    fqn;
+		Tcl_CmdInfo ci;
+		Tcl_Command c;
+
+#define USAGE "?name?"
+
+		if ((objc != 2) && (objc != 1)) {
+		    Tcl_WrongNumArgs (interp, 1, objv, USAGE);
+		    return TCL_ERROR;
+		}
+
+		if (objc < 2) {
+		    name = PARSERnewName (interp);
+		} else {
+		    name = Tcl_GetString (objv [1]);
+		}
+
+		if (!Tcl_StringMatch (name, "::*")) {
+		    /* Relative name. Prefix with current namespace */
+
+		    Tcl_Eval (interp, "namespace current");
+		    fqn = Tcl_GetObjResult (interp);
+		    fqn = Tcl_DuplicateObj (fqn);
+		    Tcl_IncrRefCount (fqn);
+
+		    if (!Tcl_StringMatch (Tcl_GetString (fqn), "::")) {
+			Tcl_AppendToObj (fqn, "::", -1);
+		    }
+		    Tcl_AppendToObj (fqn, name, -1);
+		} else {
+		    fqn = Tcl_NewStringObj (name, -1);
+		    Tcl_IncrRefCount (fqn);
+		}
+		Tcl_ResetResult (interp);
+
+		if (Tcl_GetCommandInfo (interp,
+					Tcl_GetString (fqn),
+					&ci)) {
+		    Tcl_Obj* err;
+
+		    err = Tcl_NewObj ();
+		    Tcl_AppendToObj    (err, "command \"", -1);
+		    Tcl_AppendObjToObj (err, fqn);
+		    Tcl_AppendToObj    (err, "\" already exists", -1);
+
+		    Tcl_DecrRefCount (fqn);
+		    Tcl_SetObjResult (interp, err);
+		    return TCL_ERROR;
+		}
+
+		parser = rde_param_new (sizeof(p_string)/sizeof(char*), (char**) p_string);
+		c = Tcl_CreateObjCommand (interp, Tcl_GetString (fqn),
+					  parser_objcmd, (ClientData) parser,
+					  PARSERdeleteCmd);
+		rde_param_clientdata (parser, (ClientData) c);
+		Tcl_SetObjResult (interp, fqn);
+		Tcl_DecrRefCount (fqn);
+		return TCL_OK;
+	    }
+
+	    ##
+	    # # ## ### ##### ######## #############
+	}
+
+	# # ## ### ##### ######## ############# #####################
+	## Ready (Note: Our package provide is at the top).
+	return
+    }]]
+
+    return
+}
+
+proc ::pt::cparam::configuration::critcl::GetRuntime {} {
+    # This is the C code for the RDE, i.e. the implementation of
+    # pt::rde. Only the low-level engine is imported, the Tcl
+    # interface layer is ignored.  This generated parser provides its
+    # own layer for that.
+
+    # We are inlining the code (making the functions static) to
+    # prevent any conflict with the support for pt::rde, should both
+    # be put into the same shared library.
+
+    variable selfdir
+
+    set code {}
+
+    foreach f {
+	rde_critcl/util.h
+	rde_critcl/stack.h
+	rde_critcl/tc.h
+	rde_critcl/param.h
+	rde_critcl/util.c
+	rde_critcl/stack.c
+	rde_critcl/tc.c
+	rde_critcl/param.c
+    } {
+	# Load C code.
+	set c [open $selfdir/$f]
+	set d [read $c]
+	close $c
+
+	# Strip include directives and anything explicitly excluded.
+	set skip 0
+	set n {}
+	foreach l [split $d \n] {
+	    if {[string match {*#include*} $l]} {
+		continue
+	    }
+	    if {[string match {*SKIP START*} $l]} {
+		set skip 1
+		continue
+	    }
+	    if {[string match {*SKIP END*} $l]} {
+		set skip 0
+		continue
+	    }
+	    if {$skip} continue
+	    lappend n $l
+	}
+	set d [join $n \n]
+
+	# Strip comments, trailing whitespace, empty lines.
+	set d [regsub -all {/\*.*?\*/} $d {}]
+	set d [regsub -all {//.*?\n}   $d {}]
+	set d [regsub -all {[ 	]+$}   $d {}]
+	while {1} {
+	    set n [string map [list \n\n \n] $d]
+	    if {$n eq $d} break
+	    set d $n
+	}
+
+	# Indent code.
+	lappend code "#line 1 \"$f\""
+	foreach l [split $d \n] {
+	    if {$l ne ""} { set l \t$l }
+	    lappend code $l
+	}
+    }
+
+    #lappend code "#line x \"X\""
+    return [join $code \n]
+}
+
+# # ## ### ##### ######## #############
+
+namespace eval ::pt::cparam::configuration::critcl {}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide pt::cparam::configuration::critcl 1.0.2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_cparam_config_tea.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_cparam_config_tea.tcl
new file mode 100644
index 00000000..97aa99ef
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_cparam_config_tea.tcl
@@ -0,0 +1,465 @@
+# -*- tcl -*-
+# Copyright (c) 2014 Christian Gollwitzer <auriocus@gmx.de>
+
+# TODO: Refactor this and pt::cparam::configuration::critcl to avoid
+# TODO: duplication of the supporting code (creation of the RDE
+# TODO: amalgamation, basic C template).
+
+# Canned configuration for the converter to C/PARAM representation,
+# causing generation of a C-based parser which can be plugged into a
+# TEA-based C extension. The supporting files, i.e. configure.in,
+# Makefile.in, etc. still have to be written separately, and manually.
+
+# The generated file can easily be compiled with a single
+#
+#     gcc -dynamiclib -o <parser>.dylib <parser>.c -DUSE_TCL_STUBS -ltclstub8.5
+#
+# or similar, or included in a larger package, if added to the source
+# files and by invoking the <parser>_Init() function within the init
+# function of the main package.
+#
+# TODO: Put the above note/semi-example into the manpage for this generator.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.5              ; # Required runtime.
+
+# # ## ### ##### ######## ############# #####################
+##
+
+namespace eval ::pt::cparam::configuration::tea {
+    namespace export   def
+    namespace ensemble create
+
+    # @mdgen OWNER: rde_critcl/util.*
+    # @mdgen OWNER: rde_critcl/stack.*
+    # @mdgen OWNER: rde_critcl/tc.*
+    # @mdgen OWNER: rde_critcl/param.*
+    # Access to the rde_critcl files forming the low-level runtime
+    variable selfdir [file dirname [file normalize [info script]]]
+}
+
+# # ## ### ##### ######## #############
+## Public API
+
+# Check that the proposed serialization of an abstract syntax tree is
+# indeed such.
+
+proc ::pt::cparam::configuration::tea::def {class pkg version cmd} {
+    # TODO :: See if we can consolidate the API for converters,
+    # TODO :: plugins, export manager, and container in some way.
+    # TODO :: Container may make exporter manager available through
+    # TODO :: public method.
+
+    # class   = The namespace/prefix for the generated commands.
+    # pkg     = The name of the generated package / parser.
+    # version = The version of the generated package / parser.
+
+    if {[string first :: $class] < 0} {
+	set cheader  $class
+	set ctrailer $class
+    } else {
+	set cheader  [namespace qualifier $class]
+	set ctrailer [namespace tail      $class]
+    }
+
+    set pkghead [string range $pkg 0 0]
+    set pkgtail [string range $pkg 1 end]
+    set pkglowcase "[string toupper $pkghead][string tolower $pkgtail]"
+
+    lappend map	@@RUNTIME@@ [GetRuntime]
+    lappend map	@@PKG@@     $pkg
+    lappend map	@@PKGLOWCASE@@     $pkglowcase
+    lappend map	@@VERSION@@ $version
+    lappend map	@@CLASS@@   $class
+    lappend map	@@CHEAD@@   $cheader
+    lappend map	@@CTAIL@@   $ctrailer
+    lappend map	\n\t        \n ;# undent the template
+
+    {*}$cmd -main      MAIN
+    {*}$cmd -indent    8
+    {*}$cmd -template  [string trim \
+			    [string map $map {
+	/************************************************************
+	**
+	** TEA-based C/PARAM implementation of the parsing
+	** expression grammar
+	**
+	**	@name@
+	**
+	** Generated from file	@file@
+	**            for user  @user@
+	**
+	* * ** *** ***** ******** ************* *********************/
+		#include <string.h>
+		#include <tcl.h>
+		#include <stdlib.h>
+		#include <ctype.h>
+		#define SCOPE static
+
+@@RUNTIME@@
+@code@
+		/* -*- c -*- */
+
+		typedef struct PARSERg {
+		    long int counter;
+		    char     buf [50];
+		} PARSERg;
+
+		static void
+		PARSERgRelease (ClientData cd, Tcl_Interp* interp)
+		{
+		    ckfree((char*) cd);
+		}
+
+		static const char*
+		PARSERnewName (Tcl_Interp* interp)
+		{
+#define KEY "tcllib/parser/@@PKG@@/TEA"
+
+		    Tcl_InterpDeleteProc* proc = PARSERgRelease;
+		    PARSERg*                  parserg;
+
+		    parserg = Tcl_GetAssocData (interp, KEY, &proc);
+		    if (parserg  == NULL) {
+			parserg = (PARSERg*) ckalloc (sizeof (PARSERg));
+			parserg->counter = 0;
+
+			Tcl_SetAssocData (interp, KEY, proc,
+					  (ClientData) parserg);
+		    }
+
+		    parserg->counter ++;
+		    sprintf (parserg->buf, "@@CTAIL@@%ld", parserg->counter);
+		    return parserg->buf;
+#undef  KEY
+		}
+
+		static void
+		PARSERdeleteCmd (ClientData clientData)
+		{
+		    /*
+		     * Release the whole PARSER
+		     * (Low-level engine only actually).
+		     */
+		    rde_param_del ((RDE_PARAM) clientData);
+		}
+	    
+
+	    /* * ** *** ***** ******** *************
+	    ** Functions implementing the object methods, and helper.
+	    */
+
+		static int  COMPLETE (RDE_PARAM p, Tcl_Interp* interp);
+
+		static int parser_PARSE  (RDE_PARAM p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+		{
+		    int mode;
+		    Tcl_Channel chan;
+
+		    if (objc != 3) {
+			Tcl_WrongNumArgs (interp, 2, objv, "chan");
+			return TCL_ERROR;
+		    }
+
+		    chan = Tcl_GetChannel(interp,
+					  Tcl_GetString (objv[2]),
+					  &mode);
+
+		    if (!chan) {
+			return TCL_ERROR;
+		    }
+
+		    rde_param_reset (p, chan);
+		    MAIN (p) ; /* Entrypoint for the generated code. */
+		    return COMPLETE (p, interp);
+		}
+
+		static int parser_PARSET (RDE_PARAM p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+		{
+		    char* buf;
+		    int   len;
+
+		    if (objc != 3) {
+			Tcl_WrongNumArgs (interp, 2, objv, "text");
+			return TCL_ERROR;
+		    }
+
+		    buf = Tcl_GetStringFromObj (objv[2], &len);
+
+		    rde_param_reset (p, NULL);
+		    rde_param_data  (p, buf, len);
+		    MAIN (p) ; /* Entrypoint for the generated code. */
+		    return COMPLETE (p, interp);
+		}
+
+		/* See also rde_critcl/m.c, param_COMPLETE() */
+		static int COMPLETE (RDE_PARAM p, Tcl_Interp* interp)
+		{
+		    if (rde_param_query_st (p)) {
+			long int  ac;
+			Tcl_Obj** av;
+
+			rde_param_query_ast (p, &ac, &av);
+
+			if (ac > 1) {
+			    Tcl_Obj** lv = NALLOC (3+ac, Tcl_Obj*);
+
+			    memcpy(lv + 3, av, ac * sizeof (Tcl_Obj*));
+			    lv [0] = Tcl_NewObj ();
+			    lv [1] = Tcl_NewIntObj (1 + rde_param_query_lstop (p));
+			    lv [2] = Tcl_NewIntObj (rde_param_query_cl (p));
+
+			    Tcl_SetObjResult (interp, Tcl_NewListObj (3, lv));
+			    ckfree ((char*) lv);
+
+			} else if (ac == 0) {
+			    /*
+			     * Match, but no AST. This is possible if the grammar
+			     * consists of only the start expression.
+			     */
+			    Tcl_SetObjResult (interp, Tcl_NewStringObj ("",-1));
+			} else {
+			    Tcl_SetObjResult (interp, av [0]);
+			}
+
+			return TCL_OK;
+		    } else {
+			Tcl_Obj* xv [1];
+			const ERROR_STATE* er = rde_param_query_er (p);
+			Tcl_Obj* res = rde_param_query_er_tcl (p, er);
+			/* res = list (location, list(msg)) */
+
+			/* Stick the exception type-tag before the existing elements */
+			xv [0] = Tcl_NewStringObj ("pt::rde",-1);
+			Tcl_ListObjReplace(interp, res, 0, 0, 1, xv);
+
+			Tcl_SetErrorCode (interp, "PT", "RDE", "SYNTAX", NULL);
+			Tcl_SetObjResult (interp, res);
+			return TCL_ERROR;
+		    }
+		}
+	    
+
+	    /* * ** *** ***** ******** *************
+	    ** Object command, method dispatch.
+	    */
+		static int parser_objcmd (ClientData cd, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+		{
+		    RDE_PARAM p = (RDE_PARAM) cd;
+		    int m, res;
+
+		    static CONST char* methods [] = {
+			"destroy", "parse", "parset", NULL
+		    };
+		    enum methods {
+			M_DESTROY, M_PARSE, M_PARSET
+		    };
+
+		    if (objc < 2) {
+			Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?");
+			return TCL_ERROR;
+		    } else if (Tcl_GetIndexFromObj (interp, objv [1], methods, "option",
+						    0, &m) != TCL_OK) {
+			return TCL_ERROR;
+		    }
+
+		    /* Dispatch to methods. They check the #args in
+		     * detail before performing the requested
+		     * functionality
+		     */
+
+		    switch (m) {
+			case M_DESTROY:
+			    if (objc != 2) {
+				Tcl_WrongNumArgs (interp, 2, objv, NULL);
+				return TCL_ERROR;
+			    }
+
+			Tcl_DeleteCommandFromToken(interp, (Tcl_Command) rde_param_query_clientdata (p));
+			return TCL_OK;
+
+			case M_PARSE:	res = parser_PARSE  (p, interp, objc, objv); break;
+			case M_PARSET:	res = parser_PARSET (p, interp, objc, objv); break;
+			default:
+			/* Not coming to this place */
+			ASSERT (0,"Reached unreachable location");
+		    }
+
+		    return res;
+		}
+
+	    /** * ** *** ***** ******** *************
+	    * Class command, i.e. object construction.
+	    */
+	    static int ParserClassCmd (ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj * const*objv) {
+		/*
+		 * Syntax: No arguments beyond the name
+		 */
+
+		RDE_PARAM   parser;
+		CONST char* name;
+		Tcl_Obj*    fqn;
+		Tcl_CmdInfo ci;
+		Tcl_Command c;
+
+#define USAGE "?name?"
+
+		if ((objc != 2) && (objc != 1)) {
+		    Tcl_WrongNumArgs (interp, 1, objv, USAGE);
+		    return TCL_ERROR;
+		}
+
+		if (objc < 2) {
+		    name = PARSERnewName (interp);
+		} else {
+		    name = Tcl_GetString (objv [1]);
+		}
+
+		if (!Tcl_StringMatch (name, "::*")) {
+		    /* Relative name. Prefix with current namespace */
+
+		    Tcl_Eval (interp, "namespace current");
+		    fqn = Tcl_GetObjResult (interp);
+		    fqn = Tcl_DuplicateObj (fqn);
+		    Tcl_IncrRefCount (fqn);
+
+		    if (!Tcl_StringMatch (Tcl_GetString (fqn), "::")) {
+			Tcl_AppendToObj (fqn, "::", -1);
+		    }
+		    Tcl_AppendToObj (fqn, name, -1);
+		} else {
+		    fqn = Tcl_NewStringObj (name, -1);
+		    Tcl_IncrRefCount (fqn);
+		}
+		Tcl_ResetResult (interp);
+
+		if (Tcl_GetCommandInfo (interp,
+					Tcl_GetString (fqn),
+					&ci)) {
+		    Tcl_Obj* err;
+
+		    err = Tcl_NewObj ();
+		    Tcl_AppendToObj    (err, "command \"", -1);
+		    Tcl_AppendObjToObj (err, fqn);
+		    Tcl_AppendToObj    (err, "\" already exists", -1);
+
+		    Tcl_DecrRefCount (fqn);
+		    Tcl_SetObjResult (interp, err);
+		    return TCL_ERROR;
+		}
+
+		parser = rde_param_new (sizeof(p_string)/sizeof(char*), (char**) p_string);
+		c = Tcl_CreateObjCommand (interp, Tcl_GetString (fqn),
+					  parser_objcmd, (ClientData) parser,
+					  PARSERdeleteCmd);
+		rde_param_clientdata (parser, (ClientData) c);
+		Tcl_SetObjResult (interp, fqn);
+		Tcl_DecrRefCount (fqn);
+		return TCL_OK;
+	    }
+    
+	int @@PKGLOWCASE@@_Init(Tcl_Interp* interp) {
+	    if (interp == 0) return TCL_ERROR;
+
+	    if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
+		    return TCL_ERROR;
+	    }
+
+	    if (Tcl_CreateObjCommand(interp, "@@CLASS@@", ParserClassCmd , NULL, NULL) == NULL) {
+		    Tcl_SetResult(interp, "Can't create constructor", NULL);
+		    return TCL_ERROR;
+	    }
+	    
+	    
+	    Tcl_PkgProvide(interp, "@@PKG@@", "0.1");
+	    
+	    return TCL_OK;
+	}
+
+    }]]
+
+    return
+}
+
+proc ::pt::cparam::configuration::tea::GetRuntime {} {
+    # This is the C code for the RDE, i.e. the implementation of
+    # pt::rde. Only the low-level engine is imported, the Tcl
+    # interface layer is ignored.  This generated parser provides its
+    # own layer for that.
+
+    # We are inlining the code (making the functions static) to
+    # prevent any conflict with the support for pt::rde, should both
+    # be put into the same shared library.
+
+    variable selfdir
+
+    set code {}
+
+    foreach f {
+	rde_critcl/util.h
+	rde_critcl/stack.h
+	rde_critcl/tc.h
+	rde_critcl/param.h
+	rde_critcl/util.c
+	rde_critcl/stack.c
+	rde_critcl/tc.c
+	rde_critcl/param.c
+    } {
+	# Load C code.
+	set c [open $selfdir/$f]
+	set d [read $c]
+	close $c
+
+	# Strip include directives and anything explicitly excluded.
+	set skip 0
+	set n {}
+	foreach l [split $d \n] {
+	    if {[string match {*#include*} $l]} {
+		continue
+	    }
+	    if {[string match {*SKIP START*} $l]} {
+		set skip 1
+		continue
+	    }
+	    if {[string match {*SKIP END*} $l]} {
+		set skip 0
+		continue
+	    }
+	    if {$skip} continue
+	    lappend n $l
+	}
+	set d [join $n \n]
+
+	# Strip comments, trailing whitespace, empty lines.
+	set d [regsub -all {/\*.*?\*/} $d {}]
+	set d [regsub -all {//.*?\n}   $d {}]
+	set d [regsub -all {[ 	]+$}   $d {}]
+	while {1} {
+	    set n [string map [list \n\n \n] $d]
+	    if {$n eq $d} break
+	    set d $n
+	}
+
+	# Indent code.
+	lappend code "#line 1 \"$f\""
+	foreach l [split $d \n] {
+	    if {$l ne ""} { set l \t$l }
+	    lappend code $l
+	}
+    }
+
+    #lappend code "#line x \"X\""
+    return [join $code \n]
+}
+
+# # ## ### ##### ######## #############
+
+namespace eval ::pt::cparam::configuration::tea {}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide pt::cparam::configuration::tea 0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_parse_peg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_parse_peg.tcl
new file mode 100644
index 00000000..13ccd750
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_parse_peg.tcl
@@ -0,0 +1,180 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2009-2014 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Package description
+
+## Implementation of a parser for PE grammars. We have multiple
+## implementations in Tcl (Snit-based), and C (Critcl-based). The
+## system will try to use the latter where possible.
+
+# @mdgen EXCLUDE: pt_parse_peg_c.tcl
+
+package require Tcl 8.5
+
+namespace eval ::pt::parse::peg {}
+
+# # ## ### ##### ######## ############# #####################
+## Management of stack implementations.
+
+# ::pt::parse::peg::LoadAccelerator --
+#
+#	Loads a named implementation, if possible.
+#
+# Arguments:
+#	key	Name of the implementation to load.
+#
+# Results:
+#	A boolean flag. True if the implementation
+#	was successfully loaded; and False otherwise.
+
+proc ::pt::parse::peg::LoadAccelerator {key} {
+    variable accel
+    set r 0
+    switch -exact -- $key {
+	critcl {
+	    if {![package vsatisfies [package provide Tcl] 8.5]} {return 0}
+	    if {[catch {package require tcllibc}]} {return 0}
+	    set r [llength [info commands ::pt::parse::peg_critcl]]
+	}
+	tcl {
+	    variable selfdir
+	    source [file join $selfdir pt_parse_peg_tcl.tcl]
+	    set r 1
+	}
+        default {
+            return -code error "invalid accelerator/impl. package $key:\
+                must be one of [join [KnownImplementations] {, }]"
+        }
+    }
+    set accel($key) $r
+    return $r
+}
+
+# ::pt::parse::peg::SwitchTo --
+#
+#	Activates a loaded named implementation.
+#
+# Arguments:
+#	key	Name of the implementation to activate.
+#
+# Results:
+#	None.
+
+proc ::pt::parse::peg::SwitchTo {key} {
+    variable accel
+    variable loaded
+
+    if {$key eq $loaded} {
+	# No change, nothing to do.
+	return
+    } elseif {$key ne {}} {
+	# Validate the target implementation of the switch.
+
+	if {![info exists accel($key)]} {
+	    return -code error "Unable to activate unknown implementation \"$key\""
+	} elseif {![info exists accel($key)] || !$accel($key)} {
+	    return -code error "Unable to activate missing implementation \"$key\""
+	}
+    }
+
+    # Deactivate the previous implementation, if there was any.
+
+    if {$loaded ne {}} {
+	rename ::pt::parse::peg ::pt::parse::peg_$loaded
+    }
+
+    # Activate the new implementation, if there is any.
+
+    if {$key ne {}} {
+	rename ::pt::parse::peg_$key ::pt::parse::peg
+    }
+
+    # Remember the active implementation, for deactivation by future
+    # switches.
+
+    set loaded $key
+    return
+}
+
+# ::pt::parse::peg::Implementations --
+#
+#	Determines which implementations are
+#	present, i.e. loaded.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys.
+
+proc ::pt::parse::peg::Implementations {} {
+    variable accel
+    set res {}
+    foreach n [array names accel] {
+	if {!$accel($n)} continue
+	lappend res $n
+    }
+    return $res
+}
+
+# ::pt::parse::peg::KnownImplementations --
+#
+#	Determines which implementations are known
+#	as possible implementations.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys. In the order
+#	of preference, most prefered first.
+
+proc ::pt::parse::peg::KnownImplementations {} {
+    return {critcl tcl}
+}
+
+proc ::pt::parse::peg::Names {} {
+    return {
+	critcl {tcllibc based}
+	tcl    {pure Tcl}
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Initialization: Data structures.
+
+namespace eval ::pt::parse::peg {
+    variable  selfdir [file dirname [info script]]
+    variable  accel
+    array set accel   {tcl 0 critcl 0}
+    variable  loaded  {}
+}
+
+# # ## ### ##### ######## ############# #####################
+
+## Initialization: Choose an implementation, the most prefered is
+## listed first. Loads only one of the possible implementations. And
+## activates it.
+
+namespace eval ::pt::parse::peg {
+    variable e
+    foreach e [KnownImplementations] {
+	if {[LoadAccelerator $e]} {
+	    SwitchTo $e
+	    break
+	}
+    }
+    unset e
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+namespace eval ::pt {
+    # Export the constructor command.
+    namespace export rde
+}
+
+package provide pt::parse::peg 1.0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_parse_peg_c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_parse_peg_c.tcl
new file mode 100644
index 00000000..ff05d839
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_parse_peg_c.tcl
@@ -0,0 +1,4997 @@
+## -*- tcl -*-
+##
+## Critcl-based C/PARAM implementation of the parsing
+## expression grammar
+##
+##	PEG
+##
+## Generated from file	3_peg_itself
+##            for user  aku
+##
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.4
+package require critcl
+# @sak notprovided pt_parse_peg_c
+package provide    pt_parse_peg_c 1.0.1
+
+# Note: The implementation of the PARAM virtual machine
+#       underlying the C/PARAM code used below is inlined
+#       into the generated parser, allowing for direct access
+#       and manipulation of the RDE state, instead of having
+#       to dispatch through the Tcl interpreter.
+
+# # ## ### ##### ######## ############# #####################
+##
+
+namespace eval ::pt::parse {
+    # # ## ### ##### ######## ############# #####################
+    ## Supporting code for the main command.
+
+    catch {
+	#critcl::cflags -g
+	#critcl::debug memory symbols
+    }
+
+    # # ## ### ###### ######## #############
+    ## RDE runtime, inlined, and made static.
+
+    # This is the C code for the RDE, i.e. the implementation
+    # of pt::rde. Only the low-level engine is imported, the
+    # Tcl interface layer is ignored.  This generated parser
+    # provides its own layer for that.
+
+    critcl::ccode {
+	/* -*- c -*- */
+
+	#include <string.h>
+	#include <ctype.h>  /* is... */
+	#include <stdlib.h> /* qsort */
+	#define SCOPE static
+
+#line 1 "rde_critcl/util.h"
+
+	#ifndef _RDE_UTIL_H
+	#define _RDE_UTIL_H 1
+	#ifndef SCOPE
+	#define SCOPE
+	#endif
+	#define ALLOC(type)    (type *) ckalloc (sizeof (type))
+	#define NALLOC(n,type) (type *) ckalloc ((n) * sizeof (type))
+	#undef  RDE_DEBUG
+	#define RDE_DEBUG 1
+	#undef  RDE_TRACE
+	#ifdef RDE_DEBUG
+	#define STOPAFTER(x) { static int count = (x); count --; if (!count) { Tcl_Panic ("stop"); } }
+	#define XSTR(x) #x
+	#define STR(x) XSTR(x)
+	#define RANGEOK(i,n) ((0 <= (i)) && (i < (n)))
+	#define ASSERT(x,msg) if (!(x)) { Tcl_Panic (msg " (" #x "), in file " __FILE__ " @line " STR(__LINE__));}
+	#define ASSERT_BOUNDS(i,n) ASSERT (RANGEOK(i,n),"array index out of bounds: " STR(i) " >= " STR(n))
+	#else
+	#define STOPAFTER(x)
+	#define ASSERT(x,msg)
+	#define ASSERT_BOUNDS(i,n)
+	#endif
+	#ifdef RDE_TRACE
+	SCOPE void trace_enter (const char* fun);
+	SCOPE void trace_return (const char *pat, ...);
+	SCOPE void trace_printf (const char *pat, ...);
+	#define ENTER(fun)          trace_enter (fun)
+	#define RETURN(format,x)    trace_return (format,x) ; return x
+	#define RETURNVOID          trace_return ("%s","(void)") ; return
+	#define TRACE0(x)           trace_printf0 x
+	#define TRACE(x)            trace_printf x
+	#else
+	#define ENTER(fun)
+	#define RETURN(f,x) return x
+	#define RETURNVOID  return
+	#define TRACE0(x)
+	#define TRACE(x)
+	#endif
+	#endif 
+	
+
+#line 1 "rde_critcl/stack.h"
+
+	#ifndef _RDE_DS_STACK_H
+	#define _RDE_DS_STACK_H 1
+	typedef void (*RDE_STACK_CELL_FREE) (void* cell);
+	typedef struct RDE_STACK_* RDE_STACK;
+	static const int RDE_STACK_INITIAL_SIZE = 256;
+	#endif 
+	
+
+#line 1 "rde_critcl/tc.h"
+
+	#ifndef _RDE_DS_TC_H
+	#define _RDE_DS_TC_H 1
+	typedef struct RDE_TC_* RDE_TC;
+	#endif 
+	
+
+#line 1 "rde_critcl/param.h"
+
+	#ifndef _RDE_DS_PARAM_H
+	#define _RDE_DS_PARAM_H 1
+	typedef struct RDE_PARAM_* RDE_PARAM;
+	typedef struct ERROR_STATE {
+	    int       refCount;
+	    long int  loc;
+	    RDE_STACK msg; 
+	} ERROR_STATE;
+	typedef struct NC_STATE {
+	    long int     CL;
+	    long int     ST;
+	    Tcl_Obj*     SV;
+	    ERROR_STATE* ER;
+	} NC_STATE;
+	#endif 
+	
+
+#line 1 "rde_critcl/util.c"
+
+	#ifdef RDE_TRACE
+	typedef struct F_STACK {
+	    const char*     str;
+	    struct F_STACK* down;
+	} F_STACK;
+	static F_STACK* top   = 0;
+	static int      level = 0;
+	static void
+	push (const char* str)
+	{
+	    F_STACK* new = ALLOC (F_STACK);
+	    new->str = str;
+	    new->down = top;
+	    top = new;
+	    level += 4;
+	}
+	static void
+	pop (void)
+	{
+	    F_STACK* next = top->down;
+	    level -= 4;
+	    ckfree ((char*)top);
+	    top = next;
+	}
+	static void
+	indent (void)
+	{
+	    int i;
+	    for (i = 0; i < level; i++) {
+		fwrite(" ", 1, 1, stdout);
+		fflush           (stdout);
+	    }
+	    if (top) {
+		fwrite(top->str, 1, strlen(top->str), stdout);
+		fflush                               (stdout);
+	    }
+	    fwrite(" ", 1, 1, stdout);
+	    fflush           (stdout);
+	}
+	SCOPE void
+	trace_enter (const char* fun)
+	{
+	    push (fun);
+	    indent();
+	    fwrite("ENTER\n", 1, 6, stdout);
+	    fflush                 (stdout);
+	}
+	static char msg [1024*1024];
+	SCOPE void
+	trace_return (const char *pat, ...)
+	{
+	    int len;
+	    va_list args;
+	    indent();
+	    fwrite("RETURN = ", 1, 9, stdout);
+	    fflush                   (stdout);
+	    va_start(args, pat);
+	    len = vsprintf(msg, pat, args);
+	    va_end(args);
+	    msg[len++] = '\n';
+	    msg[len] = '\0';
+	    fwrite(msg, 1, len, stdout);
+	    fflush             (stdout);
+	    pop();
+	}
+	SCOPE void
+	trace_printf (const char *pat, ...)
+	{
+	    int len;
+	    va_list args;
+	    indent();
+	    va_start(args, pat);
+	    len = vsprintf(msg, pat, args);
+	    va_end(args);
+	    msg[len++] = '\n';
+	    msg[len] = '\0';
+	    fwrite(msg, 1, len, stdout);
+	    fflush             (stdout);
+	}
+	SCOPE void
+	trace_printf0 (const char *pat, ...)
+	{
+	    int len;
+	    va_list args;
+	    va_start(args, pat);
+	    len = vsprintf(msg, pat, args);
+	    va_end(args);
+	    msg[len++] = '\n';
+	    msg[len] = '\0';
+	    fwrite(msg, 1, len, stdout);
+	    fflush             (stdout);
+	}
+	#endif
+	
+
+#line 1 "rde_critcl/stack.c"
+
+	typedef struct RDE_STACK_ {
+	    long int            max;   
+	    long int            top;   
+	    RDE_STACK_CELL_FREE freeCellProc; 
+	    void**              cell;  
+	} RDE_STACK_;
+	
+	SCOPE RDE_STACK
+	rde_stack_new (RDE_STACK_CELL_FREE freeCellProc)
+	{
+	    RDE_STACK s = ALLOC (RDE_STACK_);
+	    s->cell = NALLOC (RDE_STACK_INITIAL_SIZE, void*);
+	    s->max  = RDE_STACK_INITIAL_SIZE;
+	    s->top  = 0;
+	    s->freeCellProc = freeCellProc;
+	    return s;
+	}
+	SCOPE void
+	rde_stack_del (RDE_STACK s)
+	{
+	    if (s->freeCellProc && s->top) {
+		long int i;
+		for (i=0; i < s->top; i++) {
+		    ASSERT_BOUNDS(i,s->max);
+		    s->freeCellProc ( s->cell [i] );
+		}
+	    }
+	    ckfree ((char*) s->cell);
+	    ckfree ((char*) s);
+	}
+	SCOPE void
+	rde_stack_push (RDE_STACK s, void* item)
+	{
+	    if (s->top >= s->max) {
+		long int new  = s->max ? (2 * s->max) : RDE_STACK_INITIAL_SIZE;
+		void**   cell = (void**) ckrealloc ((char*) s->cell, new * sizeof(void*));
+		ASSERT (cell,"Memory allocation failure for RDE stack");
+		s->max  = new;
+		s->cell = cell;
+	    }
+	    ASSERT_BOUNDS(s->top,s->max);
+	    s->cell [s->top] = item;
+	    s->top ++;
+	}
+	SCOPE void*
+	rde_stack_top (RDE_STACK s)
+	{
+	    ASSERT_BOUNDS(s->top-1,s->max);
+	    return s->cell [s->top - 1];
+	}
+	SCOPE void
+	rde_stack_pop (RDE_STACK s, long int n)
+	{
+	    ASSERT (n >= 0, "Bad pop count");
+	    if (n == 0) return;
+	    if (s->freeCellProc) {
+		while (n) {
+		    s->top --;
+		    ASSERT_BOUNDS(s->top,s->max);
+		    s->freeCellProc ( s->cell [s->top] );
+		    n --;
+		}
+	    } else {
+		s->top -= n;
+	    }
+	}
+	SCOPE void
+	rde_stack_trim (RDE_STACK s, long int n)
+	{
+	    ASSERT (n >= 0, "Bad trimsize");
+	    if (s->freeCellProc) {
+		while (s->top > n) {
+		    s->top --;
+		    ASSERT_BOUNDS(s->top,s->max);
+		    s->freeCellProc ( s->cell [s->top] );
+		}
+	    } else {
+		s->top = n;
+	    }
+	}
+	SCOPE void
+	rde_stack_drop (RDE_STACK s, long int n)
+	{
+	    ASSERT (n >= 0, "Bad pop count");
+	    if (n == 0) return;
+	    s->top -= n;
+	}
+	SCOPE void
+	rde_stack_move (RDE_STACK dst, RDE_STACK src)
+	{
+	    ASSERT (dst->freeCellProc == src->freeCellProc, "Ownership mismatch");
+	    
+	    while (src->top > 0) {
+		src->top --;
+		ASSERT_BOUNDS(src->top,src->max);
+		rde_stack_push (dst, src->cell [src->top] );
+	    }
+	}
+	SCOPE void
+	rde_stack_get (RDE_STACK s, long int* cn, void*** cc)
+	{
+	    *cn = s->top;
+	    *cc = s->cell;
+	}
+	SCOPE long int
+	rde_stack_size (RDE_STACK s)
+	{
+	    return s->top;
+	}
+	
+
+#line 1 "rde_critcl/tc.c"
+
+	typedef struct RDE_TC_ {
+	    int       max;   
+	    int       num;   
+	    char*     str;   
+	    RDE_STACK off;   
+	} RDE_TC_;
+	
+	SCOPE RDE_TC
+	rde_tc_new (void)
+	{
+	    RDE_TC tc = ALLOC (RDE_TC_);
+	    tc->max   = RDE_STACK_INITIAL_SIZE;
+	    tc->num   = 0;
+	    tc->str   = NALLOC (RDE_STACK_INITIAL_SIZE, char);
+	    tc->off   = rde_stack_new (NULL);
+	    return tc;
+	}
+	SCOPE void
+	rde_tc_del (RDE_TC tc)
+	{
+	    rde_stack_del (tc->off);
+	    ckfree (tc->str);
+	    ckfree ((char*) tc);
+	}
+	SCOPE long int
+	rde_tc_size (RDE_TC tc)
+	{
+	    return rde_stack_size (tc->off);
+	}
+	SCOPE void
+	rde_tc_clear (RDE_TC tc)
+	{
+	    tc->num   = 0;
+	    rde_stack_trim (tc->off,  0);
+	}
+	SCOPE char*
+	rde_tc_append (RDE_TC tc, char* string, long int len)
+	{
+	    long int base = tc->num;
+	    long int off  = tc->num;
+	    char* ch;
+	    int clen;
+	    Tcl_UniChar uni;
+	    if (len < 0) {
+		len = strlen (string);
+	    }
+	    
+	    if (!len) {
+		return tc->str + base;
+	    }
+	    
+	    if ((tc->num + len) >= tc->max) {
+		int   new = len + (tc->max ? (2 * tc->max) : RDE_STACK_INITIAL_SIZE);
+		char* str = ckrealloc (tc->str, new * sizeof(char));
+		ASSERT (str,"Memory allocation failure for token character array");
+		tc->max = new;
+		tc->str = str;
+	    }
+	    tc->num += len;
+	    ASSERT_BOUNDS(tc->num,tc->max);
+	    ASSERT_BOUNDS(off,tc->max);
+	    ASSERT_BOUNDS(off+len-1,tc->max);
+	    ASSERT_BOUNDS(off+len-1,tc->num);
+	    memcpy (tc->str + off, string, len);
+	    
+	    ch = string;
+	    while (ch < (string + len)) {
+		ASSERT_BOUNDS(off,tc->num);
+		rde_stack_push (tc->off,  (void*) off);
+		clen = Tcl_UtfToUniChar (ch, &uni);
+		off += clen;
+		ch  += clen;
+	    }
+	    return tc->str + base;
+	}
+	SCOPE void
+	rde_tc_get (RDE_TC tc, int at, char** ch, long int* len)
+	{
+	    long int  oc, off, end;
+	    void** ov;
+	    rde_stack_get (tc->off, &oc, &ov);
+	    ASSERT_BOUNDS(at,oc);
+	    off = (long int) ov [at];
+	    if ((at+1) == oc) {
+		end = tc->num;
+	    } else {
+		end = (long int) ov [at+1];
+	    }
+	    TRACE (("rde_tc_get (RDE_TC %p, @ %d) => %d.[%d ... %d]/%d",tc,at,end-off,off,end-1,tc->num));
+	    ASSERT_BOUNDS(off,tc->num);
+	    ASSERT_BOUNDS(end-1,tc->num);
+	    *ch = tc->str + off;
+	    *len = end - off;
+	}
+	SCOPE void
+	rde_tc_get_s (RDE_TC tc, int at, int last, char** ch, long int* len)
+	{
+	    long int  oc, off, end;
+	    void** ov;
+	    rde_stack_get (tc->off, &oc, &ov);
+	    ASSERT_BOUNDS(at,oc);
+	    ASSERT_BOUNDS(last,oc);
+	    off = (long int) ov [at];
+	    if ((last+1) == oc) {
+		end = tc->num;
+	    } else {
+		end = (long int) ov [last+1];
+	    }
+	    TRACE (("rde_tc_get_s (RDE_TC %p, @ %d .. %d) => %d.[%d ... %d]/%d",tc,at,last,end-off,off,end-1,tc->num));
+	    ASSERT_BOUNDS(off,tc->num);
+	    ASSERT_BOUNDS(end-1,tc->num);
+	    *ch = tc->str + off;
+	    *len = end - off;
+	}
+	
+
+#line 1 "rde_critcl/param.c"
+
+	typedef struct RDE_PARAM_ {
+	    Tcl_Channel   IN;
+	    Tcl_Obj*      readbuf;
+	    char*         CC; 
+	    long int      CC_len;
+	    RDE_TC        TC;
+	    long int      CL;
+	    RDE_STACK     LS; 
+	    ERROR_STATE*  ER;
+	    RDE_STACK     ES; 
+	    long int      ST;
+	    Tcl_Obj*      SV;
+	    Tcl_HashTable NC;
+	    
+	    RDE_STACK    ast  ; 
+	    RDE_STACK    mark ; 
+	    
+	    long int numstr; 
+	    char**  string;
+	    
+	    ClientData clientData;
+	} RDE_PARAM_;
+	typedef int (*UniCharClass) (int);
+	typedef enum test_class_id {
+	    tc_alnum,
+	    tc_alpha,
+	    tc_ascii,
+	    tc_control,
+	    tc_ddigit,
+	    tc_digit,
+	    tc_graph,
+	    tc_lower,
+	    tc_printable,
+	    tc_punct,
+	    tc_space,
+	    tc_upper,
+	    tc_wordchar,
+	    tc_xdigit
+	} test_class_id;
+	static void ast_node_free    (void* n);
+	static void error_state_free (void* es);
+	static void error_set        (RDE_PARAM p, long int s);
+	static void nc_clear         (RDE_PARAM p);
+	static int UniCharIsAscii    (int character);
+	static int UniCharIsHexDigit (int character);
+	static int UniCharIsDecDigit (int character);
+	static void test_class (RDE_PARAM p, UniCharClass class, test_class_id id);
+	static int  er_int_compare (const void* a, const void* b);
+	#define SV_INIT(p)             \
+	    p->SV = NULL; \
+	    TRACE (("SV_INIT (%p => %p)", (p), (p)->SV))
+	#define SV_SET(p,newsv)             \
+	    if (((p)->SV) != (newsv)) { \
+	        TRACE (("SV_CLEAR/set (%p => %p)", (p), (p)->SV)); \
+	        if ((p)->SV) {                  \
+		    Tcl_DecrRefCount ((p)->SV); \
+	        }				    \
+	        (p)->SV = (newsv);		    \
+	        TRACE (("SV_SET       (%p => %p)", (p), (p)->SV)); \
+	        if ((p)->SV) {                  \
+		    Tcl_IncrRefCount ((p)->SV); \
+	        } \
+	    }
+	#define SV_CLEAR(p)                 \
+	    TRACE (("SV_CLEAR (%p => %p)", (p), (p)->SV)); \
+	    if ((p)->SV) {                  \
+		Tcl_DecrRefCount ((p)->SV); \
+	    }				    \
+	    (p)->SV = NULL
+	#define ER_INIT(p)             \
+	    p->ER = NULL; \
+	    TRACE (("ER_INIT (%p => %p)", (p), (p)->ER))
+	#define ER_CLEAR(p)             \
+	    error_state_free ((p)->ER);	\
+	    (p)->ER = NULL
+	SCOPE RDE_PARAM
+	rde_param_new (long int nstr, char** strings)
+	{
+	    RDE_PARAM p;
+	    ENTER ("rde_param_new");
+	    TRACE (("\tINT %d strings @ %p", nstr, strings));
+	    p = ALLOC (RDE_PARAM_);
+	    p->numstr = nstr;
+	    p->string = strings;
+	    p->readbuf = Tcl_NewObj ();
+	    Tcl_IncrRefCount (p->readbuf);
+	    TRACE (("\tTcl_Obj* readbuf %p used %d", p->readbuf,p->readbuf->refCount));
+	    Tcl_InitHashTable (&p->NC, TCL_ONE_WORD_KEYS);
+	    p->IN   = NULL;
+	    p->CL   = -1;
+	    p->ST   = 0;
+	    ER_INIT (p);
+	    SV_INIT (p);
+	    p->CC   = NULL;
+	    p->CC_len = 0;
+	    p->TC   = rde_tc_new ();
+	    p->ES   = rde_stack_new (error_state_free);
+	    p->LS   = rde_stack_new (NULL);
+	    p->ast  = rde_stack_new (ast_node_free);
+	    p->mark = rde_stack_new (NULL);
+	    RETURN ("%p", p);
+	}
+	SCOPE void 
+	rde_param_del (RDE_PARAM p)
+	{
+	    ENTER ("rde_param_del");
+	    TRACE (("RDE_PARAM %p",p));
+	    ER_CLEAR (p);                 TRACE (("\ter_clear"));
+	    SV_CLEAR (p);                 TRACE (("\tsv_clear"));
+	    nc_clear (p);                 TRACE (("\tnc_clear"));
+	    Tcl_DeleteHashTable (&p->NC); TRACE (("\tnc hashtable delete"));
+	    rde_tc_del    (p->TC);        TRACE (("\ttc clear"));
+	    rde_stack_del (p->ES);        TRACE (("\tes clear"));
+	    rde_stack_del (p->LS);        TRACE (("\tls clear"));
+	    rde_stack_del (p->ast);       TRACE (("\tast clear"));
+	    rde_stack_del (p->mark);      TRACE (("\tmark clear"));
+	    TRACE (("\tTcl_Obj* readbuf %p used %d", p->readbuf,p->readbuf->refCount));
+	    Tcl_DecrRefCount (p->readbuf);
+	    ckfree ((char*) p);
+	    RETURNVOID;
+	}
+	SCOPE void 
+	rde_param_reset (RDE_PARAM p, Tcl_Channel chan)
+	{
+	    ENTER ("rde_param_reset");
+	    TRACE (("RDE_PARAM   %p",p));
+	    TRACE (("Tcl_Channel %p",chan));
+	    p->IN  = chan;
+	    p->CL  = -1;
+	    p->ST  = 0;
+	    p->CC  = NULL;
+	    p->CC_len = 0;
+	    ER_CLEAR (p);
+	    SV_CLEAR (p);
+	    nc_clear (p);
+	    rde_tc_clear   (p->TC);
+	    rde_stack_trim (p->ES,   0);
+	    rde_stack_trim (p->LS,   0);
+	    rde_stack_trim (p->ast,  0);
+	    rde_stack_trim (p->mark, 0);
+	    TRACE (("\tTcl_Obj* readbuf %p used %d", p->readbuf,p->readbuf->refCount));
+	    RETURNVOID;
+	}
+	SCOPE void
+	rde_param_update_strings (RDE_PARAM p, long int nstr, char** strings)
+	{
+	    ENTER ("rde_param_update_strings");
+	    TRACE (("RDE_PARAM %p", p));
+	    TRACE (("INT       %d strings", nstr));
+	    p->numstr = nstr;
+	    p->string = strings;
+	    RETURNVOID;
+	}
+	SCOPE void
+	rde_param_data (RDE_PARAM p, char* buf, long int len)
+	{
+	    (void) rde_tc_append (p->TC, buf, len);
+	}
+	SCOPE void
+	rde_param_clientdata (RDE_PARAM p, ClientData clientData)
+	{
+	    p->clientData = clientData;
+	}
+	static void
+	nc_clear (RDE_PARAM p)
+	{
+	    Tcl_HashSearch hs;
+	    Tcl_HashEntry* he;
+	    Tcl_HashTable* tablePtr;
+	    for(he = Tcl_FirstHashEntry(&p->NC, &hs);
+		he != NULL;
+		he = Tcl_FirstHashEntry(&p->NC, &hs)) {
+		Tcl_HashSearch hsc;
+		Tcl_HashEntry* hec;
+		tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (he);
+		for(hec = Tcl_FirstHashEntry(tablePtr, &hsc);
+		    hec != NULL;
+		    hec = Tcl_NextHashEntry(&hsc)) {
+		    NC_STATE* scs = Tcl_GetHashValue (hec);
+		    error_state_free (scs->ER);
+		    if (scs->SV) { Tcl_DecrRefCount (scs->SV); }
+		    ckfree ((char*) scs);
+		}
+		Tcl_DeleteHashTable (tablePtr);
+		ckfree ((char*) tablePtr);
+		Tcl_DeleteHashEntry (he);
+	    }
+	}
+	SCOPE ClientData
+	rde_param_query_clientdata (RDE_PARAM p)
+	{
+	    return p->clientData;
+	}
+	SCOPE void
+	rde_param_query_amark (RDE_PARAM p, long int* mc, void*** mv)
+	{
+	    rde_stack_get (p->mark, mc, mv);
+	}
+	SCOPE void
+	rde_param_query_ast (RDE_PARAM p, long int* ac, Tcl_Obj*** av)
+	{
+	    rde_stack_get (p->ast, ac, (void***) av);
+	}
+	SCOPE const char*
+	rde_param_query_in (RDE_PARAM p)
+	{
+	    return p->IN
+		? Tcl_GetChannelName (p->IN)
+		: "";
+	}
+	SCOPE const char*
+	rde_param_query_cc (RDE_PARAM p, long int* len)
+	{
+	    *len = p->CC_len;
+	    return p->CC;
+	}
+	SCOPE int
+	rde_param_query_cl (RDE_PARAM p)
+	{
+	    return p->CL;
+	}
+	SCOPE const ERROR_STATE*
+	rde_param_query_er (RDE_PARAM p)
+	{
+	    return p->ER;
+	}
+	SCOPE Tcl_Obj*
+	rde_param_query_er_tcl (RDE_PARAM p, const ERROR_STATE* er)
+	{
+	    Tcl_Obj* res;
+	    if (!er) {
+		
+		res = Tcl_NewStringObj ("", 0);
+	    } else {
+		Tcl_Obj* ov [2];
+		Tcl_Obj** mov;
+		long int  mc, i, j;
+		void** mv;
+		int lastid;
+		const char* msg;
+		rde_stack_get (er->msg, &mc, &mv);
+		
+		qsort (mv, mc, sizeof (void*), er_int_compare);
+		
+		mov = NALLOC (mc, Tcl_Obj*);
+		lastid = -1;
+		for (i=0, j=0; i < mc; i++) {
+		    ASSERT_BOUNDS (i,mc);
+		    if (((long int) mv [i]) == lastid) continue;
+		    lastid = (long int) mv [i];
+		    ASSERT_BOUNDS((long int) mv[i],p->numstr);
+		    msg = p->string [(long int) mv[i]]; 
+		    ASSERT_BOUNDS (j,mc);
+		    mov [j] = Tcl_NewStringObj (msg, -1);
+		    j++;
+		}
+		
+		ov [0] = Tcl_NewIntObj  (er->loc);
+		ov [1] = Tcl_NewListObj (j, mov);
+		res = Tcl_NewListObj (2, ov);
+		ckfree ((char*) mov);
+	    }
+	    return res;
+	}
+	SCOPE void
+	rde_param_query_es (RDE_PARAM p, long int* ec, ERROR_STATE*** ev)
+	{
+	    rde_stack_get (p->ES, ec, (void***) ev);
+	}
+	SCOPE void
+	rde_param_query_ls (RDE_PARAM p, long int* lc, void*** lv)
+	{
+	    rde_stack_get (p->LS, lc, lv);
+	}
+	SCOPE long int
+	rde_param_query_lstop (RDE_PARAM p)
+	{
+	    return (long int) rde_stack_top (p->LS);
+	}
+	SCOPE Tcl_HashTable*
+	rde_param_query_nc (RDE_PARAM p)
+	{
+	    return &p->NC;
+	}
+	SCOPE int
+	rde_param_query_st (RDE_PARAM p)
+	{
+	    return p->ST;
+	}
+	SCOPE Tcl_Obj*
+	rde_param_query_sv (RDE_PARAM p)
+	{
+	    TRACE (("SV_QUERY %p => (%p)", (p), (p)->SV)); \
+	    return p->SV;
+	}
+	SCOPE long int
+	rde_param_query_tc_size (RDE_PARAM p)
+	{
+	    return rde_tc_size (p->TC);
+	}
+	SCOPE void
+	rde_param_query_tc_get_s (RDE_PARAM p, long int at, long int last, char** ch, long int* len)
+	{
+	    rde_tc_get_s (p->TC, at, last, ch, len);
+	}
+	SCOPE const char*
+	rde_param_query_string (RDE_PARAM p, long int id)
+	{
+	    TRACE (("rde_param_query_string (RDE_PARAM %p, %d/%d)", p, id, p->numstr));
+	    ASSERT_BOUNDS(id,p->numstr);
+	    return p->string [id];
+	}
+	SCOPE void
+	rde_param_i_ast_pop_discard (RDE_PARAM p)
+	{
+	    rde_stack_pop (p->mark, 1);
+	}
+	SCOPE void
+	rde_param_i_ast_pop_rewind (RDE_PARAM p)
+	{
+	    long int trim = (long int) rde_stack_top (p->mark);
+	    ENTER ("rde_param_i_ast_pop_rewind");
+	    TRACE (("RDE_PARAM %p",p));
+	    rde_stack_pop  (p->mark, 1);
+	    rde_stack_trim (p->ast, trim);
+	    TRACE (("SV = (%p rc%d '%s')",
+		    p->SV,
+		    p->SV ? p->SV->refCount       : -1,
+		    p->SV ? Tcl_GetString (p->SV) : ""));
+	    RETURNVOID;
+	}
+	SCOPE void
+	rde_param_i_ast_rewind (RDE_PARAM p)
+	{
+	    long int trim = (long int) rde_stack_top (p->mark);
+	    ENTER ("rde_param_i_ast_rewind");
+	    TRACE (("RDE_PARAM %p",p));
+	    rde_stack_trim (p->ast, trim);
+	    TRACE (("SV = (%p rc%d '%s')",
+		    p->SV,
+		    p->SV ? p->SV->refCount       : -1,
+		    p->SV ? Tcl_GetString (p->SV) : ""));
+	    RETURNVOID;
+	}
+	SCOPE void
+	rde_param_i_ast_push (RDE_PARAM p)
+	{
+	    rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+	}
+	SCOPE void
+	rde_param_i_ast_value_push (RDE_PARAM p)
+	{
+	    ENTER ("rde_param_i_ast_value_push");
+	    TRACE (("RDE_PARAM %p",p));
+	    ASSERT(p->SV,"Unable to push undefined semantic value");
+	    TRACE (("rde_param_i_ast_value_push %p => (%p)", p, p->SV));
+	    TRACE (("SV = (%p rc%d '%s')", p->SV, p->SV->refCount, Tcl_GetString (p->SV)));
+	    rde_stack_push (p->ast, p->SV);
+	    Tcl_IncrRefCount (p->SV);
+	    RETURNVOID;
+	}
+	static void
+	ast_node_free (void* n)
+	{
+	    Tcl_DecrRefCount ((Tcl_Obj*) n);
+	}
+	SCOPE void
+	rde_param_i_error_clear (RDE_PARAM p)
+	{
+	    ER_CLEAR (p);
+	}
+	SCOPE void
+	rde_param_i_error_nonterminal (RDE_PARAM p, long int s)
+	{
+	    
+	    return;
+	#if 0
+	    long int pos;
+	    if (!p->ER) return;
+	    pos = 1 + (long int) rde_stack_top (p->LS);
+	    if (p->ER->loc != pos) return;
+	    error_set (p, s);
+	    p->ER->loc = pos;
+	#endif
+	}
+	SCOPE void
+	rde_param_i_error_pop_merge (RDE_PARAM p)
+	{
+	    ERROR_STATE* top = (ERROR_STATE*) rde_stack_top (p->ES);
+	    
+	    if (top == p->ER) {
+		rde_stack_pop (p->ES, 1);
+		return;
+	    }
+	    
+	    if (!top) {
+		rde_stack_pop (p->ES, 1);
+		return;
+	    }
+	    
+	    if (!p->ER) {
+		rde_stack_drop (p->ES, 1);
+		p->ER = top;
+		
+		return;
+	    }
+	    
+	    if (top->loc < p->ER->loc) {
+		rde_stack_pop (p->ES, 1);
+		return;
+	    }
+	    
+	    if (top->loc > p->ER->loc) {
+		rde_stack_drop (p->ES, 1);
+		error_state_free (p->ER);
+		p->ER = top;
+		
+		return;
+	    }
+	    
+	    rde_stack_move (p->ER->msg, top->msg);
+	    rde_stack_pop  (p->ES, 1);
+	}
+	SCOPE void
+	rde_param_i_error_push (RDE_PARAM p)
+	{
+	    rde_stack_push (p->ES, p->ER);
+	    if (p->ER) { p->ER->refCount ++; }
+	}
+	static void
+	error_set (RDE_PARAM p, long int s)
+	{
+	    error_state_free (p->ER);
+	    p->ER = ALLOC (ERROR_STATE);
+	    p->ER->refCount = 1;
+	    p->ER->loc      = p->CL;
+	    p->ER->msg      = rde_stack_new (NULL);
+	    ASSERT_BOUNDS(s,p->numstr);
+	    rde_stack_push (p->ER->msg, (void*) s);
+	}
+	static void
+	error_state_free (void* esx)
+	{
+	    ERROR_STATE* es = esx;
+	    if (!es) return;
+	    es->refCount --;
+	    if (es->refCount > 0) return;
+	    rde_stack_del (es->msg);
+	    ckfree ((char*) es);
+	}
+	SCOPE void
+	rde_param_i_loc_pop_discard (RDE_PARAM p)
+	{
+	    rde_stack_pop (p->LS, 1);
+	}
+	SCOPE void
+	rde_param_i_loc_pop_rewind (RDE_PARAM p)
+	{
+	    p->CL = (long int) rde_stack_top (p->LS);
+	    rde_stack_pop (p->LS, 1);
+	}
+	SCOPE void
+	rde_param_i_loc_push (RDE_PARAM p)
+	{
+	    rde_stack_push (p->LS, (void*) p->CL);
+	}
+	SCOPE void
+	rde_param_i_loc_rewind (RDE_PARAM p)
+	{
+	    p->CL = (long int) rde_stack_top (p->LS);
+	}
+	SCOPE void
+	rde_param_i_input_next (RDE_PARAM p, long int m)
+	{
+	    int leni;
+	    char* ch;
+	    ASSERT_BOUNDS(m,p->numstr);
+	    p->CL ++;
+	    if (p->CL < rde_tc_size (p->TC)) {
+		
+		rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len);
+		
+		ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX);
+		p->ST = 1;
+		ER_CLEAR (p);
+		return;
+	    }
+	    if (!p->IN || 
+		Tcl_Eof (p->IN) ||
+		(Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) {
+		
+		p->ST = 0;
+		error_set (p, m);
+		return;
+	    }
+	    
+	    ch = Tcl_GetStringFromObj (p->readbuf, &leni);
+	    ASSERT_BOUNDS (leni, TCL_UTF_MAX);
+	    p->CC = rde_tc_append (p->TC, ch, leni);
+	    p->CC_len = leni;
+	    p->ST = 1;
+	    ER_CLEAR (p);
+	}
+	SCOPE void
+	rde_param_i_status_fail (RDE_PARAM p)
+	{
+	    p->ST = 0;
+	}
+	SCOPE void
+	rde_param_i_status_ok (RDE_PARAM p)
+	{
+	    p->ST = 1;
+	}
+	SCOPE void
+	rde_param_i_status_negate (RDE_PARAM p)
+	{
+	    p->ST = !p->ST;
+	}
+	SCOPE int 
+	rde_param_i_symbol_restore (RDE_PARAM p, long int s)
+	{
+	    NC_STATE*      scs;
+	    Tcl_HashEntry* hPtr;
+	    Tcl_HashTable* tablePtr;
+	    
+	    hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL);
+	    if (!hPtr) { return 0; }
+	    tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
+	    hPtr = Tcl_FindHashEntry (tablePtr, (char*) s);
+	    if (!hPtr) { return 0; }
+	    
+	    scs = Tcl_GetHashValue (hPtr);
+	    p->CL = scs->CL;
+	    p->ST = scs->ST;
+	    error_state_free (p->ER);
+	    p->ER = scs->ER;
+	    if (p->ER) { p->ER->refCount ++; }
+	    TRACE (("SV_RESTORE (%p) '%s'",scs->SV, scs->SV ? Tcl_GetString (scs->SV):""));
+	    SV_SET (p, scs->SV);
+	    return 1;
+	}
+	SCOPE void
+	rde_param_i_symbol_save (RDE_PARAM p, long int s)
+	{
+	    long int       at = (long int) rde_stack_top (p->LS);
+	    NC_STATE*      scs;
+	    Tcl_HashEntry* hPtr;
+	    Tcl_HashTable* tablePtr;
+	    int            isnew;
+	    ENTER ("rde_param_i_symbol_save");
+	    TRACE (("RDE_PARAM %p",p));
+	    TRACE (("INT       %d",s));
+	    
+	    hPtr = Tcl_CreateHashEntry (&p->NC, (char*) at, &isnew);
+	    if (isnew) {
+		tablePtr = ALLOC (Tcl_HashTable);
+		Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS);
+		Tcl_SetHashValue (hPtr, tablePtr);
+	    } else {
+		tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
+	    }
+	    hPtr = Tcl_CreateHashEntry (tablePtr, (char*) s, &isnew);
+	    if (isnew) {
+		
+		scs = ALLOC (NC_STATE);
+		scs->CL = p->CL;
+		scs->ST = p->ST;
+		TRACE (("SV_CACHE (%p '%s')", p->SV, p->SV ? Tcl_GetString(p->SV) : ""));
+		scs->SV = p->SV;
+		if (scs->SV) { Tcl_IncrRefCount (scs->SV); }
+		scs->ER = p->ER;
+		if (scs->ER) { scs->ER->refCount ++; }
+		Tcl_SetHashValue (hPtr, scs);
+	    } else {
+		
+		scs = (NC_STATE*) Tcl_GetHashValue (hPtr);
+		scs->CL = p->CL;
+		scs->ST = p->ST;
+		TRACE (("SV_CACHE/over (%p '%s')", p->SV, p->SV ? Tcl_GetString(p->SV) : "" ));
+		if (scs->SV) { Tcl_DecrRefCount (scs->SV); }
+		scs->SV = p->SV;
+		if (scs->SV) { Tcl_IncrRefCount (scs->SV); }
+		error_state_free (scs->ER);
+		scs->ER = p->ER;
+		if (scs->ER) { scs->ER->refCount ++; }
+	    }
+	    TRACE (("SV = (%p rc%d '%s')",
+		    p->SV,
+		    p->SV ? p->SV->refCount       : -1,
+		    p->SV ? Tcl_GetString (p->SV) : ""));
+	    RETURNVOID;
+	}
+	SCOPE void
+	rde_param_i_test_alnum (RDE_PARAM p)
+	{
+	    test_class (p, Tcl_UniCharIsAlnum, tc_alnum);
+	}
+	SCOPE void
+	rde_param_i_test_alpha (RDE_PARAM p)
+	{
+	    test_class (p, Tcl_UniCharIsAlpha, tc_alpha);
+	}
+	SCOPE void
+	rde_param_i_test_ascii (RDE_PARAM p)
+	{
+	    test_class (p, UniCharIsAscii, tc_ascii);
+	}
+	SCOPE void
+	rde_param_i_test_control (RDE_PARAM p)
+	{
+	    test_class (p, Tcl_UniCharIsControl, tc_control);
+	}
+	SCOPE void
+	rde_param_i_test_char (RDE_PARAM p, const char* c, long int msg)
+	{
+	    ASSERT_BOUNDS(msg,p->numstr);
+	    p->ST = Tcl_UtfNcmp (p->CC, c, 1) == 0;
+	    if (p->ST) {
+		ER_CLEAR (p);
+	    } else {
+		error_set (p, msg);
+		p->CL --;
+	    }
+	}
+	SCOPE void
+	rde_param_i_test_ddigit (RDE_PARAM p)
+	{
+	    test_class (p, UniCharIsDecDigit, tc_ddigit);
+	}
+	SCOPE void
+	rde_param_i_test_digit (RDE_PARAM p)
+	{
+	    test_class (p, Tcl_UniCharIsDigit, tc_digit);
+	}
+	SCOPE void
+	rde_param_i_test_graph (RDE_PARAM p)
+	{
+	    test_class (p, Tcl_UniCharIsGraph, tc_graph);
+	}
+	SCOPE void
+	rde_param_i_test_lower (RDE_PARAM p)
+	{
+	    test_class (p, Tcl_UniCharIsLower, tc_lower);
+	}
+	SCOPE void
+	rde_param_i_test_print (RDE_PARAM p)
+	{
+	    test_class (p, Tcl_UniCharIsPrint, tc_printable);
+	}
+	SCOPE void
+	rde_param_i_test_punct (RDE_PARAM p)
+	{
+	    test_class (p, Tcl_UniCharIsPunct, tc_punct);
+	}
+	SCOPE void
+	rde_param_i_test_range (RDE_PARAM p, const char* s, const char* e, long int msg)
+	{
+	    ASSERT_BOUNDS(msg,p->numstr);
+	    p->ST =
+		(Tcl_UtfNcmp (s, p->CC, 1) <= 0) &&
+		(Tcl_UtfNcmp (p->CC, e, 1) <= 0);
+	    if (p->ST) {
+		ER_CLEAR (p);
+	    } else {
+		error_set (p, msg);
+		p->CL --;
+	    }
+	}
+	SCOPE void
+	rde_param_i_test_space (RDE_PARAM p)
+	{
+	    test_class (p, Tcl_UniCharIsSpace, tc_space);
+	}
+	SCOPE void
+	rde_param_i_test_upper (RDE_PARAM p)
+	{
+	    test_class (p, Tcl_UniCharIsUpper, tc_upper);
+	}
+	SCOPE void
+	rde_param_i_test_wordchar (RDE_PARAM p)
+	{
+	    test_class (p, Tcl_UniCharIsWordChar, tc_wordchar);
+	}
+	SCOPE void
+	rde_param_i_test_xdigit (RDE_PARAM p)
+	{
+	    test_class (p, UniCharIsHexDigit, tc_xdigit);
+	}
+	static void
+	test_class (RDE_PARAM p, UniCharClass class, test_class_id id)
+	{
+	    Tcl_UniChar ch;
+	    Tcl_UtfToUniChar(p->CC, &ch);
+	    ASSERT_BOUNDS(id,p->numstr);
+	    p->ST = !!class (ch);
+	    
+	    if (p->ST) {
+		ER_CLEAR (p);
+	    } else {
+		error_set (p, id);
+		p->CL --;
+	    }
+	}
+	static int
+	UniCharIsAscii (int character)
+	{
+	    return (character >= 0) && (character < 0x80);
+	}
+	static int
+	UniCharIsHexDigit (int character)
+	{
+	    return (character >= 0) && (character < 0x80) && isxdigit(character);
+	}
+	static int
+	UniCharIsDecDigit (int character)
+	{
+	    return (character >= 0) && (character < 0x80) && isdigit(character);
+	}
+	SCOPE void
+	rde_param_i_value_clear (RDE_PARAM p)
+	{
+	    SV_CLEAR (p);
+	}
+	SCOPE void
+	rde_param_i_value_leaf (RDE_PARAM p, long int s)
+	{
+	    Tcl_Obj* newsv;
+	    Tcl_Obj* ov [3];
+	    long int pos = 1 + (long int) rde_stack_top (p->LS);
+	    ASSERT_BOUNDS(s,p->numstr);
+	    ov [0] = Tcl_NewStringObj (p->string[s], -1);
+	    ov [1] = Tcl_NewIntObj (pos);
+	    ov [2] = Tcl_NewIntObj (p->CL);
+	    newsv = Tcl_NewListObj (3, ov);
+	    TRACE (("rde_param_i_value_leaf => '%s'",Tcl_GetString (newsv)));
+	    SV_SET (p, newsv);
+	}
+	SCOPE void
+	rde_param_i_value_reduce (RDE_PARAM p, long int s)
+	{
+	    Tcl_Obj*  newsv;
+	    int       i, j;
+	    Tcl_Obj** ov;
+	    long int  ac;
+	    Tcl_Obj** av;
+	    long int pos   = 1 + (long int) rde_stack_top (p->LS);
+	    long int mark  = (long int) rde_stack_top (p->mark);
+	    long int asize = rde_stack_size (p->ast);
+	    long int new   = asize - mark;
+	    ASSERT (new >= 0, "Bad number of elements to reduce");
+	    ov = NALLOC (3+new, Tcl_Obj*);
+	    ASSERT_BOUNDS(s,p->numstr);
+	    ov [0] = Tcl_NewStringObj (p->string[s], -1);
+	    ov [1] = Tcl_NewIntObj (pos);
+	    ov [2] = Tcl_NewIntObj (p->CL);
+	    rde_stack_get (p->ast, &ac, (void***) &av);
+	    for (i = 3, j = mark; j < asize; i++, j++) {
+		ASSERT_BOUNDS (i, 3+new);
+		ASSERT_BOUNDS (j, ac);
+		ov [i] = av [j];
+	    }
+	    ASSERT (i == 3+new, "Reduction result incomplete");
+	    newsv = Tcl_NewListObj (3+new, ov);
+	    TRACE (("rde_param_i_value_reduce => '%s'",Tcl_GetString (newsv)));
+	    SV_SET (p, newsv);
+	    ckfree ((char*) ov);
+	}
+	static int
+	er_int_compare (const void* a, const void* b)
+	{
+	    
+	    const void** ael = (const void**) a;
+	    const void** bel = (const void**) b;
+	    long int avalue = (long int) *ael;
+	    long int bvalue = (long int) *bel;
+	    if (avalue < bvalue) { return -1; }
+	    if (avalue > bvalue) { return  1; }
+	    return 0;
+	}
+	SCOPE int
+	rde_param_i_symbol_start (RDE_PARAM p, long int s)
+	{
+	    if (rde_param_i_symbol_restore (p, s)) {
+		if (p->ST) {
+		    rde_stack_push (p->ast, p->SV);
+		    Tcl_IncrRefCount (p->SV);
+		}
+		return 1;
+	    }
+	    rde_stack_push (p->LS, (void*) p->CL);
+	    return 0;
+	}
+	SCOPE int
+	rde_param_i_symbol_start_d (RDE_PARAM p, long int s)
+	{
+	    if (rde_param_i_symbol_restore (p, s)) {
+		if (p->ST) {
+		    rde_stack_push (p->ast, p->SV);
+		    Tcl_IncrRefCount (p->SV);
+		}
+		return 1;
+	    }
+	    rde_stack_push (p->LS,   (void*) p->CL);
+	    rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+	    return 0;
+	}
+	SCOPE int
+	rde_param_i_symbol_void_start (RDE_PARAM p, long int s)
+	{
+	    if (rde_param_i_symbol_restore (p, s)) return 1;
+	    rde_stack_push (p->LS, (void*) p->CL);
+	    return 0;
+	}
+	SCOPE int
+	rde_param_i_symbol_void_start_d (RDE_PARAM p, long int s)
+	{
+	    if (rde_param_i_symbol_restore (p, s)) return 1;
+	    rde_stack_push (p->LS,   (void*) p->CL);
+	    rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+	    return 0;
+	}
+	SCOPE void
+	rde_param_i_symbol_done_d_reduce (RDE_PARAM p, long int s, long int m)
+	{
+	    if (p->ST) {
+		rde_param_i_value_reduce (p, s);
+	    } else {
+		SV_CLEAR (p);
+	    }
+	    rde_param_i_symbol_save       (p, s);
+	    rde_param_i_error_nonterminal (p, m);
+	    rde_param_i_ast_pop_rewind    (p);
+	    rde_stack_pop (p->LS, 1);
+	    if (p->ST) {
+		rde_stack_push (p->ast, p->SV);
+		Tcl_IncrRefCount (p->SV);
+	    }
+	}
+	SCOPE void
+	rde_param_i_symbol_done_leaf (RDE_PARAM p, long int s, long int m)
+	{
+	    if (p->ST) {
+		rde_param_i_value_leaf (p, s);
+	    } else {
+		SV_CLEAR (p);
+	    }
+	    rde_param_i_symbol_save       (p, s);
+	    rde_param_i_error_nonterminal (p, m);
+	    rde_stack_pop (p->LS, 1);
+	    if (p->ST) {
+		rde_stack_push (p->ast, p->SV);
+		Tcl_IncrRefCount (p->SV);
+	    }
+	}
+	SCOPE void
+	rde_param_i_symbol_done_d_leaf (RDE_PARAM p, long int s, long int m)
+	{
+	    if (p->ST) {
+		rde_param_i_value_leaf (p, s);
+	    } else {
+		SV_CLEAR (p);
+	    }
+	    rde_param_i_symbol_save       (p, s);
+	    rde_param_i_error_nonterminal (p, m);
+	    rde_param_i_ast_pop_rewind    (p);
+	    rde_stack_pop (p->LS, 1);
+	    if (p->ST) {
+		rde_stack_push (p->ast, p->SV);
+		Tcl_IncrRefCount (p->SV);
+	    }
+	}
+	SCOPE void
+	rde_param_i_symbol_done_void (RDE_PARAM p, long int s, long int m)
+	{
+	    SV_CLEAR (p);
+	    rde_param_i_symbol_save       (p, s);
+	    rde_param_i_error_nonterminal (p, m);
+	    rde_stack_pop (p->LS, 1);
+	}
+	SCOPE void
+	rde_param_i_symbol_done_d_void (RDE_PARAM p, long int s, long int m)
+	{
+	    SV_CLEAR (p);
+	    rde_param_i_symbol_save       (p, s);
+	    rde_param_i_error_nonterminal (p, m);
+	    rde_param_i_ast_pop_rewind    (p);
+	    rde_stack_pop (p->LS, 1);
+	}
+	SCOPE void
+	rde_param_i_next_char (RDE_PARAM p, const char* c, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_char (p, c, m);
+	}
+	SCOPE void
+	rde_param_i_next_range (RDE_PARAM p, const char* s, const char* e, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_range (p, s, e, m);
+	}
+	SCOPE void
+	rde_param_i_next_alnum (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_alnum (p);
+	}
+	SCOPE void
+	rde_param_i_next_alpha (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_alpha (p);
+	}
+	SCOPE void
+	rde_param_i_next_ascii (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_ascii (p);
+	}
+	SCOPE void
+	rde_param_i_next_control (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_control (p);
+	}
+	SCOPE void
+	rde_param_i_next_ddigit (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_ddigit (p);
+	}
+	SCOPE void
+	rde_param_i_next_digit (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_digit (p);
+	}
+	SCOPE void
+	rde_param_i_next_graph (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_graph (p);
+	}
+	SCOPE void
+	rde_param_i_next_lower (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_lower (p);
+	}
+	SCOPE void
+	rde_param_i_next_print (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_print (p);
+	}
+	SCOPE void
+	rde_param_i_next_punct (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_punct (p);
+	}
+	SCOPE void
+	rde_param_i_next_space (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_space (p);
+	}
+	SCOPE void
+	rde_param_i_next_upper (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_upper (p);
+	}
+	SCOPE void
+	rde_param_i_next_wordchar (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_wordchar (p);
+	}
+	SCOPE void
+	rde_param_i_next_xdigit (RDE_PARAM p, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    rde_param_i_test_xdigit (p);
+	}
+	SCOPE void
+	rde_param_i_notahead_start_d (RDE_PARAM p)
+	{
+	    rde_stack_push (p->LS, (void*) p->CL);
+	    rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+	}
+	SCOPE void
+	rde_param_i_notahead_exit_d (RDE_PARAM p)
+	{
+	    if (p->ST) {
+		rde_param_i_ast_pop_rewind (p); 
+	    } else {
+		rde_stack_pop (p->mark, 1);
+	    }
+	    p->CL = (long int) rde_stack_top (p->LS);
+	    rde_stack_pop (p->LS, 1);
+	    p->ST = !p->ST;
+	}
+	SCOPE void
+	rde_param_i_notahead_exit (RDE_PARAM p)
+	{
+	    p->CL = (long int) rde_stack_top (p->LS);
+	    rde_stack_pop (p->LS, 1);
+	    p->ST = !p->ST;
+	}
+	SCOPE void
+	rde_param_i_state_push_2 (RDE_PARAM p)
+	{
+	    
+	    rde_stack_push (p->LS, (void*) p->CL);
+	    rde_stack_push (p->ES, p->ER);
+	    if (p->ER) { p->ER->refCount ++; }
+	}
+	SCOPE void
+	rde_param_i_state_push_void (RDE_PARAM p)
+	{
+	    rde_stack_push (p->LS, (void*) p->CL);
+	    ER_CLEAR (p);
+	    rde_stack_push (p->ES, p->ER);
+	    
+	}
+	SCOPE void
+	rde_param_i_state_push_value (RDE_PARAM p)
+	{
+	    rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+	    rde_stack_push (p->LS, (void*) p->CL);
+	    ER_CLEAR (p);
+	    rde_stack_push (p->ES, p->ER);
+	    
+	}
+	SCOPE void
+	rde_param_i_state_merge_ok (RDE_PARAM p)
+	{
+	    rde_param_i_error_pop_merge (p);
+	    if (!p->ST) {
+		p->ST = 1;
+		p->CL = (long int) rde_stack_top (p->LS);
+	    }
+	    rde_stack_pop (p->LS, 1);
+	}
+	SCOPE void
+	rde_param_i_state_merge_void (RDE_PARAM p)
+	{
+	    rde_param_i_error_pop_merge (p);
+	    if (!p->ST) {
+		p->CL = (long int) rde_stack_top (p->LS);
+	    }
+	    rde_stack_pop (p->LS, 1);
+	}
+	SCOPE void
+	rde_param_i_state_merge_value (RDE_PARAM p)
+	{
+	    rde_param_i_error_pop_merge (p);
+	    if (!p->ST) {
+		long int trim = (long int) rde_stack_top (p->mark);
+		rde_stack_trim (p->ast, trim);
+		p->CL = (long int) rde_stack_top (p->LS);
+	    }
+	    rde_stack_pop (p->mark, 1);
+	    rde_stack_pop (p->LS, 1);
+	}
+	SCOPE int
+	rde_param_i_kleene_close (RDE_PARAM p)
+	{
+	    int stop = !p->ST;
+	    rde_param_i_error_pop_merge (p);
+	    if (stop) {
+		p->ST = 1;
+		p->CL = (long int) rde_stack_top (p->LS);
+	    }
+	    rde_stack_pop (p->LS, 1);
+	    return stop;
+	}
+	SCOPE int
+	rde_param_i_kleene_abort (RDE_PARAM p)
+	{
+	    int stop = !p->ST;
+	    if (stop) {
+		p->CL = (long int) rde_stack_top (p->LS);
+	    }
+	    rde_stack_pop (p->LS, 1);
+	    return stop;
+	}
+	SCOPE int
+	rde_param_i_seq_void2void (RDE_PARAM p)
+	{
+	    rde_param_i_error_pop_merge (p);
+	    if (p->ST) {
+		rde_stack_push (p->ES, p->ER);
+		if (p->ER) { p->ER->refCount ++; }
+		return 0;
+	    } else {
+		p->CL = (long int) rde_stack_top (p->LS);
+		rde_stack_pop (p->LS, 1);
+		return 1;
+	    }
+	}
+	SCOPE int
+	rde_param_i_seq_void2value (RDE_PARAM p)
+	{
+	    rde_param_i_error_pop_merge (p);
+	    if (p->ST) {
+		rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+		rde_stack_push (p->ES, p->ER);
+		if (p->ER) { p->ER->refCount ++; }
+		return 0;
+	    } else {
+		p->CL = (long int) rde_stack_top (p->LS);
+		rde_stack_pop (p->LS, 1);
+		return 1;
+	    }
+	}
+	SCOPE int
+	rde_param_i_seq_value2value (RDE_PARAM p)
+	{
+	    rde_param_i_error_pop_merge (p);
+	    if (p->ST) {
+		rde_stack_push (p->ES, p->ER);
+		if (p->ER) { p->ER->refCount ++; }
+		return 0;
+	    } else {
+		long int trim = (long int) rde_stack_top (p->mark);
+		rde_stack_pop  (p->mark, 1);
+		rde_stack_trim (p->ast, trim);
+		p->CL = (long int) rde_stack_top (p->LS);
+		rde_stack_pop (p->LS, 1);
+		return 1;
+	    }
+	}
+	SCOPE int
+	rde_param_i_bra_void2void (RDE_PARAM p)
+	{
+	    rde_param_i_error_pop_merge (p);
+	    if (p->ST) {
+		rde_stack_pop (p->LS, 1);
+	    } else {
+		p->CL = (long int) rde_stack_top (p->LS);
+		rde_stack_push (p->ES, p->ER);
+		if (p->ER) { p->ER->refCount ++; }
+	    }
+	    return p->ST;
+	}
+	SCOPE int
+	rde_param_i_bra_void2value (RDE_PARAM p)
+	{
+	    rde_param_i_error_pop_merge (p);
+	    if (p->ST) {
+		rde_stack_pop (p->LS, 1);
+	    } else {
+		rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+		p->CL = (long int) rde_stack_top (p->LS);
+		rde_stack_push (p->ES, p->ER);
+		if (p->ER) { p->ER->refCount ++; }
+	    }
+	    return p->ST;
+	}
+	SCOPE int
+	rde_param_i_bra_value2void (RDE_PARAM p)
+	{
+	    rde_param_i_error_pop_merge (p);
+	    if (p->ST) {
+		rde_stack_pop (p->mark, 1);
+		rde_stack_pop (p->LS, 1);
+	    } else {
+		long int trim = (long int) rde_stack_top (p->mark);
+		rde_stack_pop  (p->mark, 1);
+		rde_stack_trim (p->ast, trim);
+		p->CL = (long int) rde_stack_top (p->LS);
+		rde_stack_push (p->ES, p->ER);
+		if (p->ER) { p->ER->refCount ++; }
+	    }
+	    return p->ST;
+	}
+	SCOPE int
+	rde_param_i_bra_value2value (RDE_PARAM p)
+	{
+	    rde_param_i_error_pop_merge (p);
+	    if (p->ST) {
+		rde_stack_pop (p->mark, 1);
+		rde_stack_pop (p->LS, 1);
+	    } else {
+		long int trim = (long int) rde_stack_top (p->mark);
+		rde_stack_trim (p->ast, trim);
+		p->CL = (long int) rde_stack_top (p->LS);
+		rde_stack_push (p->ES, p->ER);
+		if (p->ER) { p->ER->refCount ++; }
+	    }
+	    return p->ST;
+	}
+	SCOPE void
+	rde_param_i_next_str (RDE_PARAM p, const char* str, long int m)
+	{
+	    int at = p->CL;
+	    
+	    while (*str) {
+		rde_param_i_input_next (p, m);
+		if (!p->ST) {
+		    p->ER->loc = at+1;
+		    p->CL = at;
+		    return;
+		}
+		rde_param_i_test_char (p, str, m);
+		if (!p->ST) {
+		    p->ER->loc = at+1;
+		    p->CL = at;
+		    return;
+		}
+		str = Tcl_UtfNext (str);
+	    }
+	}
+	SCOPE void
+	rde_param_i_next_class (RDE_PARAM p, const char* class, long int m)
+	{
+	    rde_param_i_input_next (p, m);
+	    if (!p->ST) return;
+	    while (*class) {
+		p->ST = Tcl_UtfNcmp (p->CC, class, 1) == 0;
+		if (p->ST) {
+		    ER_CLEAR (p);
+		    return;
+		}
+		class = Tcl_UtfNext (class);
+	    }
+	    error_set (p, m);
+	    p->CL --;
+	}
+	
+
+    }
+
+    # # ## ### ###### ######## #############
+    ## BEGIN of GENERATED CODE. DO NOT EDIT.
+
+    critcl::ccode {
+	/* -*- c -*- */
+
+        /*
+         * Declaring the parse functions
+         */
+        
+        static void sequence_4 (RDE_PARAM p);
+        static void sym_ALNUM (RDE_PARAM p);
+        static void sequence_9 (RDE_PARAM p);
+        static void sym_ALPHA (RDE_PARAM p);
+        static void sequence_14 (RDE_PARAM p);
+        static void sym_AND (RDE_PARAM p);
+        static void sym_APOSTROPH (RDE_PARAM p);
+        static void sequence_21 (RDE_PARAM p);
+        static void sym_ASCII (RDE_PARAM p);
+        static void choice_26 (RDE_PARAM p);
+        static void sequence_29 (RDE_PARAM p);
+        static void sym_Attribute (RDE_PARAM p);
+        static void choice_37 (RDE_PARAM p);
+        static void sym_Char (RDE_PARAM p);
+        static void sequence_44 (RDE_PARAM p);
+        static void sym_CharOctalFull (RDE_PARAM p);
+        static void optional_50 (RDE_PARAM p);
+        static void sequence_52 (RDE_PARAM p);
+        static void sym_CharOctalPart (RDE_PARAM p);
+        static void sequence_57 (RDE_PARAM p);
+        static void sym_CharSpecial (RDE_PARAM p);
+        static void notahead_61 (RDE_PARAM p);
+        static void sequence_64 (RDE_PARAM p);
+        static void sym_CharUnescaped (RDE_PARAM p);
+        static void optional_72 (RDE_PARAM p);
+        static void sequence_74 (RDE_PARAM p);
+        static void optional_76 (RDE_PARAM p);
+        static void sequence_78 (RDE_PARAM p);
+        static void optional_80 (RDE_PARAM p);
+        static void sequence_82 (RDE_PARAM p);
+        static void sym_CharUnicode (RDE_PARAM p);
+        static void notahead_87 (RDE_PARAM p);
+        static void sequence_90 (RDE_PARAM p);
+        static void kleene_92 (RDE_PARAM p);
+        static void sequence_96 (RDE_PARAM p);
+        static void sym_Class (RDE_PARAM p);
+        static void sequence_101 (RDE_PARAM p);
+        static void sym_CLOSE (RDE_PARAM p);
+        static void sym_CLOSEB (RDE_PARAM p);
+        static void sequence_108 (RDE_PARAM p);
+        static void sym_COLON (RDE_PARAM p);
+        static void notahead_113 (RDE_PARAM p);
+        static void sequence_116 (RDE_PARAM p);
+        static void kleene_118 (RDE_PARAM p);
+        static void sequence_121 (RDE_PARAM p);
+        static void sym_COMMENT (RDE_PARAM p);
+        static void sequence_126 (RDE_PARAM p);
+        static void sym_CONTROL (RDE_PARAM p);
+        static void sym_DAPOSTROPH (RDE_PARAM p);
+        static void sequence_133 (RDE_PARAM p);
+        static void sym_DDIGIT (RDE_PARAM p);
+        static void optional_137 (RDE_PARAM p);
+        static void sequence_143 (RDE_PARAM p);
+        static void sym_Definition (RDE_PARAM p);
+        static void sequence_148 (RDE_PARAM p);
+        static void sym_DIGIT (RDE_PARAM p);
+        static void sequence_153 (RDE_PARAM p);
+        static void sym_DOT (RDE_PARAM p);
+        static void notahead_157 (RDE_PARAM p);
+        static void sym_EOF (RDE_PARAM p);
+        static void sym_EOL (RDE_PARAM p);
+        static void sequence_165 (RDE_PARAM p);
+        static void kleene_167 (RDE_PARAM p);
+        static void sequence_169 (RDE_PARAM p);
+        static void sym_Expression (RDE_PARAM p);
+        static void sequence_176 (RDE_PARAM p);
+        static void sym_Final (RDE_PARAM p);
+        static void kleene_182 (RDE_PARAM p);
+        static void sequence_186 (RDE_PARAM p);
+        static void sym_Grammar (RDE_PARAM p);
+        static void sequence_191 (RDE_PARAM p);
+        static void sym_GRAPH (RDE_PARAM p);
+        static void sequence_197 (RDE_PARAM p);
+        static void sym_Header (RDE_PARAM p);
+        static void choice_202 (RDE_PARAM p);
+        static void choice_206 (RDE_PARAM p);
+        static void kleene_208 (RDE_PARAM p);
+        static void sequence_210 (RDE_PARAM p);
+        static void sym_Ident (RDE_PARAM p);
+        static void sequence_215 (RDE_PARAM p);
+        static void sym_Identifier (RDE_PARAM p);
+        static void sequence_220 (RDE_PARAM p);
+        static void sym_IS (RDE_PARAM p);
+        static void sequence_225 (RDE_PARAM p);
+        static void sym_LEAF (RDE_PARAM p);
+        static void notahead_230 (RDE_PARAM p);
+        static void sequence_233 (RDE_PARAM p);
+        static void kleene_235 (RDE_PARAM p);
+        static void sequence_239 (RDE_PARAM p);
+        static void notahead_243 (RDE_PARAM p);
+        static void sequence_246 (RDE_PARAM p);
+        static void kleene_248 (RDE_PARAM p);
+        static void sequence_252 (RDE_PARAM p);
+        static void choice_254 (RDE_PARAM p);
+        static void sym_Literal (RDE_PARAM p);
+        static void sequence_259 (RDE_PARAM p);
+        static void sym_LOWER (RDE_PARAM p);
+        static void sequence_264 (RDE_PARAM p);
+        static void sym_NOT (RDE_PARAM p);
+        static void sequence_269 (RDE_PARAM p);
+        static void sym_OPEN (RDE_PARAM p);
+        static void sym_OPENB (RDE_PARAM p);
+        static void notahead_278 (RDE_PARAM p);
+        static void sequence_281 (RDE_PARAM p);
+        static void sym_PEG (RDE_PARAM p);
+        static void sequence_286 (RDE_PARAM p);
+        static void sym_PLUS (RDE_PARAM p);
+        static void choice_291 (RDE_PARAM p);
+        static void optional_293 (RDE_PARAM p);
+        static void sequence_296 (RDE_PARAM p);
+        static void sym_Prefix (RDE_PARAM p);
+        static void sequence_317 (RDE_PARAM p);
+        static void choice_322 (RDE_PARAM p);
+        static void sym_Primary (RDE_PARAM p);
+        static void sequence_327 (RDE_PARAM p);
+        static void sym_PRINTABLE (RDE_PARAM p);
+        static void sequence_332 (RDE_PARAM p);
+        static void sym_PUNCT (RDE_PARAM p);
+        static void sequence_337 (RDE_PARAM p);
+        static void sym_QUESTION (RDE_PARAM p);
+        static void sequence_343 (RDE_PARAM p);
+        static void choice_346 (RDE_PARAM p);
+        static void sym_Range (RDE_PARAM p);
+        static void sequence_351 (RDE_PARAM p);
+        static void sym_SEMICOLON (RDE_PARAM p);
+        static void poskleene_355 (RDE_PARAM p);
+        static void sym_Sequence (RDE_PARAM p);
+        static void sequence_360 (RDE_PARAM p);
+        static void sym_SLASH (RDE_PARAM p);
+        static void sequence_365 (RDE_PARAM p);
+        static void sym_SPACE (RDE_PARAM p);
+        static void sequence_370 (RDE_PARAM p);
+        static void sym_STAR (RDE_PARAM p);
+        static void sym_StartExpr (RDE_PARAM p);
+        static void choice_382 (RDE_PARAM p);
+        static void optional_384 (RDE_PARAM p);
+        static void sequence_386 (RDE_PARAM p);
+        static void sym_Suffix (RDE_PARAM p);
+        static void sym_TO (RDE_PARAM p);
+        static void sequence_393 (RDE_PARAM p);
+        static void sym_UPPER (RDE_PARAM p);
+        static void sequence_398 (RDE_PARAM p);
+        static void sym_VOID (RDE_PARAM p);
+        static void choice_403 (RDE_PARAM p);
+        static void kleene_405 (RDE_PARAM p);
+        static void sym_WHITESPACE (RDE_PARAM p);
+        static void sequence_410 (RDE_PARAM p);
+        static void sym_WORDCHAR (RDE_PARAM p);
+        static void sequence_415 (RDE_PARAM p);
+        static void sym_XDIGIT (RDE_PARAM p);
+        
+        /*
+         * Precomputed table of strings (symbols, error messages, etc.).
+         */
+        
+        static char const* p_string [178] = {
+            /*        0 = */   "alnum",
+            /*        1 = */   "alpha",
+            /*        2 = */   "ascii",
+            /*        3 = */   "control",
+            /*        4 = */   "ddigit",
+            /*        5 = */   "digit",
+            /*        6 = */   "graph",
+            /*        7 = */   "lower",
+            /*        8 = */   "print",
+            /*        9 = */   "punct",
+            /*       10 = */   "space",
+            /*       11 = */   "upper",
+            /*       12 = */   "wordchar",
+            /*       13 = */   "xdigit",
+            /*       14 = */   "str <alnum>",
+            /*       15 = */   "n ALNUM",
+            /*       16 = */   "ALNUM",
+            /*       17 = */   "str <alpha>",
+            /*       18 = */   "n ALPHA",
+            /*       19 = */   "ALPHA",
+            /*       20 = */   "t &",
+            /*       21 = */   "n AND",
+            /*       22 = */   "AND",
+            /*       23 = */   "t '",
+            /*       24 = */   "n APOSTROPH",
+            /*       25 = */   "APOSTROPH",
+            /*       26 = */   "str <ascii>",
+            /*       27 = */   "n ASCII",
+            /*       28 = */   "ASCII",
+            /*       29 = */   "n Attribute",
+            /*       30 = */   "Attribute",
+            /*       31 = */   "n Char",
+            /*       32 = */   "Char",
+            /*       33 = */   "t \\\\",
+            /*       34 = */   ".. 0 2",
+            /*       35 = */   ".. 0 7",
+            /*       36 = */   "n CharOctalFull",
+            /*       37 = */   "CharOctalFull",
+            /*       38 = */   "n CharOctalPart",
+            /*       39 = */   "CharOctalPart",
+            /*       40 = */   "cl nrt'\\\"\\[\\]\\\\",
+            /*       41 = */   "n CharSpecial",
+            /*       42 = */   "CharSpecial",
+            /*       43 = */   "dot",
+            /*       44 = */   "n CharUnescaped",
+            /*       45 = */   "CharUnescaped",
+            /*       46 = */   "str \173\\u\175",
+            /*       47 = */   "n CharUnicode",
+            /*       48 = */   "CharUnicode",
+            /*       49 = */   "n Class",
+            /*       50 = */   "Class",
+            /*       51 = */   "t )",
+            /*       52 = */   "n CLOSE",
+            /*       53 = */   "CLOSE",
+            /*       54 = */   "t \\]",
+            /*       55 = */   "n CLOSEB",
+            /*       56 = */   "CLOSEB",
+            /*       57 = */   "t :",
+            /*       58 = */   "n COLON",
+            /*       59 = */   "COLON",
+            /*       60 = */   "t #",
+            /*       61 = */   "n COMMENT",
+            /*       62 = */   "COMMENT",
+            /*       63 = */   "str <control>",
+            /*       64 = */   "n CONTROL",
+            /*       65 = */   "CONTROL",
+            /*       66 = */   "t \173\"\175",
+            /*       67 = */   "n DAPOSTROPH",
+            /*       68 = */   "DAPOSTROPH",
+            /*       69 = */   "str <ddigit>",
+            /*       70 = */   "n DDIGIT",
+            /*       71 = */   "DDIGIT",
+            /*       72 = */   "n Definition",
+            /*       73 = */   "Definition",
+            /*       74 = */   "str <digit>",
+            /*       75 = */   "n DIGIT",
+            /*       76 = */   "DIGIT",
+            /*       77 = */   "t .",
+            /*       78 = */   "n DOT",
+            /*       79 = */   "DOT",
+            /*       80 = */   "n EOF",
+            /*       81 = */   "EOF",
+            /*       82 = */   "cl \173\n\r\175",
+            /*       83 = */   "n EOL",
+            /*       84 = */   "EOL",
+            /*       85 = */   "n Expression",
+            /*       86 = */   "Expression",
+            /*       87 = */   "str END",
+            /*       88 = */   "n Final",
+            /*       89 = */   "Final",
+            /*       90 = */   "n Grammar",
+            /*       91 = */   "Grammar",
+            /*       92 = */   "str <graph>",
+            /*       93 = */   "n GRAPH",
+            /*       94 = */   "GRAPH",
+            /*       95 = */   "n Header",
+            /*       96 = */   "Header",
+            /*       97 = */   "cl _:",
+            /*       98 = */   "n Ident",
+            /*       99 = */   "Ident",
+            /*      100 = */   "n Identifier",
+            /*      101 = */   "Identifier",
+            /*      102 = */   "str <-",
+            /*      103 = */   "n IS",
+            /*      104 = */   "IS",
+            /*      105 = */   "str leaf",
+            /*      106 = */   "n LEAF",
+            /*      107 = */   "LEAF",
+            /*      108 = */   "n Literal",
+            /*      109 = */   "Literal",
+            /*      110 = */   "str <lower>",
+            /*      111 = */   "n LOWER",
+            /*      112 = */   "LOWER",
+            /*      113 = */   "t !",
+            /*      114 = */   "n NOT",
+            /*      115 = */   "NOT",
+            /*      116 = */   "t (",
+            /*      117 = */   "n OPEN",
+            /*      118 = */   "OPEN",
+            /*      119 = */   "t \173[\175",
+            /*      120 = */   "n OPENB",
+            /*      121 = */   "OPENB",
+            /*      122 = */   "str PEG",
+            /*      123 = */   "n PEG",
+            /*      124 = */   "PEG",
+            /*      125 = */   "t +",
+            /*      126 = */   "n PLUS",
+            /*      127 = */   "PLUS",
+            /*      128 = */   "n Prefix",
+            /*      129 = */   "Prefix",
+            /*      130 = */   "n Primary",
+            /*      131 = */   "Primary",
+            /*      132 = */   "str <print>",
+            /*      133 = */   "n PRINTABLE",
+            /*      134 = */   "PRINTABLE",
+            /*      135 = */   "str <punct>",
+            /*      136 = */   "n PUNCT",
+            /*      137 = */   "PUNCT",
+            /*      138 = */   "t ?",
+            /*      139 = */   "n QUESTION",
+            /*      140 = */   "QUESTION",
+            /*      141 = */   "n Range",
+            /*      142 = */   "Range",
+            /*      143 = */   "t \173;\175",
+            /*      144 = */   "n SEMICOLON",
+            /*      145 = */   "SEMICOLON",
+            /*      146 = */   "n Sequence",
+            /*      147 = */   "Sequence",
+            /*      148 = */   "t /",
+            /*      149 = */   "n SLASH",
+            /*      150 = */   "SLASH",
+            /*      151 = */   "str <space>",
+            /*      152 = */   "n SPACE",
+            /*      153 = */   "SPACE",
+            /*      154 = */   "t *",
+            /*      155 = */   "n STAR",
+            /*      156 = */   "STAR",
+            /*      157 = */   "n StartExpr",
+            /*      158 = */   "StartExpr",
+            /*      159 = */   "n Suffix",
+            /*      160 = */   "Suffix",
+            /*      161 = */   "t -",
+            /*      162 = */   "n TO",
+            /*      163 = */   "TO",
+            /*      164 = */   "str <upper>",
+            /*      165 = */   "n UPPER",
+            /*      166 = */   "UPPER",
+            /*      167 = */   "str void",
+            /*      168 = */   "n VOID",
+            /*      169 = */   "VOID",
+            /*      170 = */   "n WHITESPACE",
+            /*      171 = */   "WHITESPACE",
+            /*      172 = */   "str <wordchar>",
+            /*      173 = */   "n WORDCHAR",
+            /*      174 = */   "WORDCHAR",
+            /*      175 = */   "str <xdigit>",
+            /*      176 = */   "n XDIGIT",
+            /*      177 = */   "XDIGIT"
+        };
+        
+        /*
+         * Grammar Start Expression
+         */
+        
+        static void MAIN (RDE_PARAM p) {
+            sym_Grammar (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'ALNUM'
+         */
+        
+        static void sym_ALNUM (RDE_PARAM p) {
+           /*
+            * x
+            *     "<alnum>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 16)) return ;
+            sequence_4 (p);
+            rde_param_i_symbol_done_leaf (p, 16, 15);
+            return;
+        }
+        
+        static void sequence_4 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<alnum>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<alnum>", 14);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'ALPHA'
+         */
+        
+        static void sym_ALPHA (RDE_PARAM p) {
+           /*
+            * x
+            *     "<alpha>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 19)) return ;
+            sequence_9 (p);
+            rde_param_i_symbol_done_leaf (p, 19, 18);
+            return;
+        }
+        
+        static void sequence_9 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<alpha>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<alpha>", 17);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'AND'
+         */
+        
+        static void sym_AND (RDE_PARAM p) {
+           /*
+            * x
+            *     '&'
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 22)) return ;
+            sequence_14 (p);
+            rde_param_i_symbol_done_leaf (p, 22, 21);
+            return;
+        }
+        
+        static void sequence_14 (RDE_PARAM p) {
+           /*
+            * x
+            *     '&'
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, "&", 20);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'APOSTROPH'
+         */
+        
+        static void sym_APOSTROPH (RDE_PARAM p) {
+           /*
+            * '''
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 25)) return ;
+            rde_param_i_next_char (p, "'", 23);
+            rde_param_i_symbol_done_void (p, 25, 24);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'ASCII'
+         */
+        
+        static void sym_ASCII (RDE_PARAM p) {
+           /*
+            * x
+            *     "<ascii>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 28)) return ;
+            sequence_21 (p);
+            rde_param_i_symbol_done_leaf (p, 28, 27);
+            return;
+        }
+        
+        static void sequence_21 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<ascii>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<ascii>", 26);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Attribute'
+         */
+        
+        static void sym_Attribute (RDE_PARAM p) {
+           /*
+            * x
+            *     /
+            *         (VOID)
+            *         (LEAF)
+            *     (COLON)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 30)) return ;
+            sequence_29 (p);
+            rde_param_i_symbol_done_d_reduce (p, 30, 29);
+            return;
+        }
+        
+        static void sequence_29 (RDE_PARAM p) {
+           /*
+            * x
+            *     /
+            *         (VOID)
+            *         (LEAF)
+            *     (COLON)
+            */
+        
+            rde_param_i_state_push_value (p);
+            choice_26 (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_COLON (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void choice_26 (RDE_PARAM p) {
+           /*
+            * /
+            *     (VOID)
+            *     (LEAF)
+            */
+        
+            rde_param_i_state_push_value (p);
+            sym_VOID (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_LEAF (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Char'
+         */
+        
+        static void sym_Char (RDE_PARAM p) {
+           /*
+            * /
+            *     (CharSpecial)
+            *     (CharOctalFull)
+            *     (CharOctalPart)
+            *     (CharUnicode)
+            *     (CharUnescaped)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 32)) return ;
+            choice_37 (p);
+            rde_param_i_symbol_done_d_reduce (p, 32, 31);
+            return;
+        }
+        
+        static void choice_37 (RDE_PARAM p) {
+           /*
+            * /
+            *     (CharSpecial)
+            *     (CharOctalFull)
+            *     (CharOctalPart)
+            *     (CharUnicode)
+            *     (CharUnescaped)
+            */
+        
+            rde_param_i_state_push_value (p);
+            sym_CharSpecial (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_CharOctalFull (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_CharOctalPart (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_CharUnicode (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_CharUnescaped (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'CharOctalFull'
+         */
+        
+        static void sym_CharOctalFull (RDE_PARAM p) {
+           /*
+            * x
+            *     '\'
+            *     range (0 .. 2)
+            *     range (0 .. 7)
+            *     range (0 .. 7)
+            */
+        
+            if (rde_param_i_symbol_start (p, 37)) return ;
+            sequence_44 (p);
+            rde_param_i_symbol_done_leaf (p, 37, 36);
+            return;
+        }
+        
+        static void sequence_44 (RDE_PARAM p) {
+           /*
+            * x
+            *     '\'
+            *     range (0 .. 2)
+            *     range (0 .. 7)
+            *     range (0 .. 7)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, "\\", 33);
+            if (rde_param_i_seq_void2void(p)) return;
+            rde_param_i_next_range (p, "0", "2", 34);
+            if (rde_param_i_seq_void2void(p)) return;
+            rde_param_i_next_range (p, "0", "7", 35);
+            if (rde_param_i_seq_void2void(p)) return;
+            rde_param_i_next_range (p, "0", "7", 35);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'CharOctalPart'
+         */
+        
+        static void sym_CharOctalPart (RDE_PARAM p) {
+           /*
+            * x
+            *     '\'
+            *     range (0 .. 7)
+            *     ?
+            *         range (0 .. 7)
+            */
+        
+            if (rde_param_i_symbol_start (p, 39)) return ;
+            sequence_52 (p);
+            rde_param_i_symbol_done_leaf (p, 39, 38);
+            return;
+        }
+        
+        static void sequence_52 (RDE_PARAM p) {
+           /*
+            * x
+            *     '\'
+            *     range (0 .. 7)
+            *     ?
+            *         range (0 .. 7)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, "\\", 33);
+            if (rde_param_i_seq_void2void(p)) return;
+            rde_param_i_next_range (p, "0", "7", 35);
+            if (rde_param_i_seq_void2void(p)) return;
+            optional_50 (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        static void optional_50 (RDE_PARAM p) {
+           /*
+            * ?
+            *     range (0 .. 7)
+            */
+        
+            rde_param_i_state_push_2 (p);
+            rde_param_i_next_range (p, "0", "7", 35);
+            rde_param_i_state_merge_ok (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'CharSpecial'
+         */
+        
+        static void sym_CharSpecial (RDE_PARAM p) {
+           /*
+            * x
+            *     '\'
+            *     [nrt'\"[]\]
+            */
+        
+            if (rde_param_i_symbol_start (p, 42)) return ;
+            sequence_57 (p);
+            rde_param_i_symbol_done_leaf (p, 42, 41);
+            return;
+        }
+        
+        static void sequence_57 (RDE_PARAM p) {
+           /*
+            * x
+            *     '\'
+            *     [nrt'\"[]\]
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, "\\", 33);
+            if (rde_param_i_seq_void2void(p)) return;
+            rde_param_i_next_class (p, "nrt'\"[]\\", 40);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'CharUnescaped'
+         */
+        
+        static void sym_CharUnescaped (RDE_PARAM p) {
+           /*
+            * x
+            *     !
+            *         '\'
+            *     <dot>
+            */
+        
+            if (rde_param_i_symbol_start (p, 45)) return ;
+            sequence_64 (p);
+            rde_param_i_symbol_done_leaf (p, 45, 44);
+            return;
+        }
+        
+        static void sequence_64 (RDE_PARAM p) {
+           /*
+            * x
+            *     !
+            *         '\'
+            *     <dot>
+            */
+        
+            rde_param_i_state_push_void (p);
+            notahead_61 (p);
+            if (rde_param_i_seq_void2void(p)) return;
+            rde_param_i_input_next (p, 43);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        static void notahead_61 (RDE_PARAM p) {
+           /*
+            * !
+            *     '\'
+            */
+        
+            rde_param_i_loc_push (p);
+            rde_param_i_next_char (p, "\\", 33);
+            rde_param_i_notahead_exit (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'CharUnicode'
+         */
+        
+        static void sym_CharUnicode (RDE_PARAM p) {
+           /*
+            * x
+            *     "\u"
+            *     <xdigit>
+            *     ?
+            *         x
+            *             <xdigit>
+            *             ?
+            *                 x
+            *                     <xdigit>
+            *                     ?
+            *                         <xdigit>
+            */
+        
+            if (rde_param_i_symbol_start (p, 48)) return ;
+            sequence_82 (p);
+            rde_param_i_symbol_done_leaf (p, 48, 47);
+            return;
+        }
+        
+        static void sequence_82 (RDE_PARAM p) {
+           /*
+            * x
+            *     "\u"
+            *     <xdigit>
+            *     ?
+            *         x
+            *             <xdigit>
+            *             ?
+            *                 x
+            *                     <xdigit>
+            *                     ?
+            *                         <xdigit>
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "\\u", 46);
+            if (rde_param_i_seq_void2void(p)) return;
+            rde_param_i_next_xdigit (p, 13);
+            if (rde_param_i_seq_void2void(p)) return;
+            optional_80 (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        static void optional_80 (RDE_PARAM p) {
+           /*
+            * ?
+            *     x
+            *         <xdigit>
+            *         ?
+            *             x
+            *                 <xdigit>
+            *                 ?
+            *                     <xdigit>
+            */
+        
+            rde_param_i_state_push_2 (p);
+            sequence_78 (p);
+            rde_param_i_state_merge_ok (p);
+            return;
+        }
+        
+        static void sequence_78 (RDE_PARAM p) {
+           /*
+            * x
+            *     <xdigit>
+            *     ?
+            *         x
+            *             <xdigit>
+            *             ?
+            *                 <xdigit>
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_xdigit (p, 13);
+            if (rde_param_i_seq_void2void(p)) return;
+            optional_76 (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        static void optional_76 (RDE_PARAM p) {
+           /*
+            * ?
+            *     x
+            *         <xdigit>
+            *         ?
+            *             <xdigit>
+            */
+        
+            rde_param_i_state_push_2 (p);
+            sequence_74 (p);
+            rde_param_i_state_merge_ok (p);
+            return;
+        }
+        
+        static void sequence_74 (RDE_PARAM p) {
+           /*
+            * x
+            *     <xdigit>
+            *     ?
+            *         <xdigit>
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_xdigit (p, 13);
+            if (rde_param_i_seq_void2void(p)) return;
+            optional_72 (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        static void optional_72 (RDE_PARAM p) {
+           /*
+            * ?
+            *     <xdigit>
+            */
+        
+            rde_param_i_state_push_2 (p);
+            rde_param_i_next_xdigit (p, 13);
+            rde_param_i_state_merge_ok (p);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Class'
+         */
+        
+        static void sym_Class (RDE_PARAM p) {
+           /*
+            * x
+            *     (OPENB)
+            *     *
+            *         x
+            *             !
+            *                 (CLOSEB)
+            *             (Range)
+            *     (CLOSEB)
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 50)) return ;
+            sequence_96 (p);
+            rde_param_i_symbol_done_d_reduce (p, 50, 49);
+            return;
+        }
+        
+        static void sequence_96 (RDE_PARAM p) {
+           /*
+            * x
+            *     (OPENB)
+            *     *
+            *         x
+            *             !
+            *                 (CLOSEB)
+            *             (Range)
+            *     (CLOSEB)
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            sym_OPENB (p);
+            if (rde_param_i_seq_void2value(p)) return;
+            kleene_92 (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_CLOSEB (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void kleene_92 (RDE_PARAM p) {
+           /*
+            * *
+            *     x
+            *         !
+            *             (CLOSEB)
+            *         (Range)
+            */
+        
+            while (1) {
+                rde_param_i_state_push_2 (p);
+                sequence_90 (p);
+                if (rde_param_i_kleene_close(p)) return;
+            }
+            return;
+        }
+        
+        static void sequence_90 (RDE_PARAM p) {
+           /*
+            * x
+            *     !
+            *         (CLOSEB)
+            *     (Range)
+            */
+        
+            rde_param_i_state_push_void (p);
+            notahead_87 (p);
+            if (rde_param_i_seq_void2value(p)) return;
+            sym_Range (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void notahead_87 (RDE_PARAM p) {
+           /*
+            * !
+            *     (CLOSEB)
+            */
+        
+            rde_param_i_loc_push (p);
+            sym_CLOSEB (p);
+            rde_param_i_notahead_exit (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'CLOSE'
+         */
+        
+        static void sym_CLOSE (RDE_PARAM p) {
+           /*
+            * x
+            *     '\)'
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 53)) return ;
+            sequence_101 (p);
+            rde_param_i_symbol_done_void (p, 53, 52);
+            return;
+        }
+        
+        static void sequence_101 (RDE_PARAM p) {
+           /*
+            * x
+            *     '\)'
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, ")", 51);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'CLOSEB'
+         */
+        
+        static void sym_CLOSEB (RDE_PARAM p) {
+           /*
+            * ']'
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 56)) return ;
+            rde_param_i_next_char (p, "]", 54);
+            rde_param_i_symbol_done_void (p, 56, 55);
+            return;
+        }
+        
+        /*
+         * void Symbol 'COLON'
+         */
+        
+        static void sym_COLON (RDE_PARAM p) {
+           /*
+            * x
+            *     ':'
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 59)) return ;
+            sequence_108 (p);
+            rde_param_i_symbol_done_void (p, 59, 58);
+            return;
+        }
+        
+        static void sequence_108 (RDE_PARAM p) {
+           /*
+            * x
+            *     ':'
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, ":", 57);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'COMMENT'
+         */
+        
+        static void sym_COMMENT (RDE_PARAM p) {
+           /*
+            * x
+            *     '#'
+            *     *
+            *         x
+            *             !
+            *                 (EOL)
+            *             <dot>
+            *     (EOL)
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 62)) return ;
+            sequence_121 (p);
+            rde_param_i_symbol_done_void (p, 62, 61);
+            return;
+        }
+        
+        static void sequence_121 (RDE_PARAM p) {
+           /*
+            * x
+            *     '#'
+            *     *
+            *         x
+            *             !
+            *                 (EOL)
+            *             <dot>
+            *     (EOL)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, "#", 60);
+            if (rde_param_i_seq_void2void(p)) return;
+            kleene_118 (p);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_EOL (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        static void kleene_118 (RDE_PARAM p) {
+           /*
+            * *
+            *     x
+            *         !
+            *             (EOL)
+            *         <dot>
+            */
+        
+            while (1) {
+                rde_param_i_state_push_2 (p);
+                sequence_116 (p);
+                if (rde_param_i_kleene_close(p)) return;
+            }
+            return;
+        }
+        
+        static void sequence_116 (RDE_PARAM p) {
+           /*
+            * x
+            *     !
+            *         (EOL)
+            *     <dot>
+            */
+        
+            rde_param_i_state_push_void (p);
+            notahead_113 (p);
+            if (rde_param_i_seq_void2void(p)) return;
+            rde_param_i_input_next (p, 43);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        static void notahead_113 (RDE_PARAM p) {
+           /*
+            * !
+            *     (EOL)
+            */
+        
+            rde_param_i_loc_push (p);
+            sym_EOL (p);
+            rde_param_i_notahead_exit (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'CONTROL'
+         */
+        
+        static void sym_CONTROL (RDE_PARAM p) {
+           /*
+            * x
+            *     "<control>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 65)) return ;
+            sequence_126 (p);
+            rde_param_i_symbol_done_leaf (p, 65, 64);
+            return;
+        }
+        
+        static void sequence_126 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<control>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<control>", 63);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'DAPOSTROPH'
+         */
+        
+        static void sym_DAPOSTROPH (RDE_PARAM p) {
+           /*
+            * '\"'
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 68)) return ;
+            rde_param_i_next_char (p, "\"", 66);
+            rde_param_i_symbol_done_void (p, 68, 67);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'DDIGIT'
+         */
+        
+        static void sym_DDIGIT (RDE_PARAM p) {
+           /*
+            * x
+            *     "<ddigit>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 71)) return ;
+            sequence_133 (p);
+            rde_param_i_symbol_done_leaf (p, 71, 70);
+            return;
+        }
+        
+        static void sequence_133 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<ddigit>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<ddigit>", 69);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Definition'
+         */
+        
+        static void sym_Definition (RDE_PARAM p) {
+           /*
+            * x
+            *     ?
+            *         (Attribute)
+            *     (Identifier)
+            *     (IS)
+            *     (Expression)
+            *     (SEMICOLON)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 73)) return ;
+            sequence_143 (p);
+            rde_param_i_symbol_done_d_reduce (p, 73, 72);
+            return;
+        }
+        
+        static void sequence_143 (RDE_PARAM p) {
+           /*
+            * x
+            *     ?
+            *         (Attribute)
+            *     (Identifier)
+            *     (IS)
+            *     (Expression)
+            *     (SEMICOLON)
+            */
+        
+            rde_param_i_state_push_value (p);
+            optional_137 (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_Identifier (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_IS (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_Expression (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_SEMICOLON (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void optional_137 (RDE_PARAM p) {
+           /*
+            * ?
+            *     (Attribute)
+            */
+        
+            rde_param_i_state_push_2 (p);
+            sym_Attribute (p);
+            rde_param_i_state_merge_ok (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'DIGIT'
+         */
+        
+        static void sym_DIGIT (RDE_PARAM p) {
+           /*
+            * x
+            *     "<digit>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 76)) return ;
+            sequence_148 (p);
+            rde_param_i_symbol_done_leaf (p, 76, 75);
+            return;
+        }
+        
+        static void sequence_148 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<digit>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<digit>", 74);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'DOT'
+         */
+        
+        static void sym_DOT (RDE_PARAM p) {
+           /*
+            * x
+            *     '.'
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 79)) return ;
+            sequence_153 (p);
+            rde_param_i_symbol_done_leaf (p, 79, 78);
+            return;
+        }
+        
+        static void sequence_153 (RDE_PARAM p) {
+           /*
+            * x
+            *     '.'
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, ".", 77);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'EOF'
+         */
+        
+        static void sym_EOF (RDE_PARAM p) {
+           /*
+            * !
+            *     <dot>
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 81)) return ;
+            notahead_157 (p);
+            rde_param_i_symbol_done_void (p, 81, 80);
+            return;
+        }
+        
+        static void notahead_157 (RDE_PARAM p) {
+           /*
+            * !
+            *     <dot>
+            */
+        
+            rde_param_i_loc_push (p);
+            rde_param_i_input_next (p, 43);
+            rde_param_i_notahead_exit (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'EOL'
+         */
+        
+        static void sym_EOL (RDE_PARAM p) {
+           /*
+            * [\n\r]
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 84)) return ;
+            rde_param_i_next_class (p, "\n\r", 82);
+            rde_param_i_symbol_done_void (p, 84, 83);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Expression'
+         */
+        
+        static void sym_Expression (RDE_PARAM p) {
+           /*
+            * x
+            *     (Sequence)
+            *     *
+            *         x
+            *             (SLASH)
+            *             (Sequence)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 86)) return ;
+            sequence_169 (p);
+            rde_param_i_symbol_done_d_reduce (p, 86, 85);
+            return;
+        }
+        
+        static void sequence_169 (RDE_PARAM p) {
+           /*
+            * x
+            *     (Sequence)
+            *     *
+            *         x
+            *             (SLASH)
+            *             (Sequence)
+            */
+        
+            rde_param_i_state_push_value (p);
+            sym_Sequence (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            kleene_167 (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void kleene_167 (RDE_PARAM p) {
+           /*
+            * *
+            *     x
+            *         (SLASH)
+            *         (Sequence)
+            */
+        
+            while (1) {
+                rde_param_i_state_push_2 (p);
+                sequence_165 (p);
+                if (rde_param_i_kleene_close(p)) return;
+            }
+            return;
+        }
+        
+        static void sequence_165 (RDE_PARAM p) {
+           /*
+            * x
+            *     (SLASH)
+            *     (Sequence)
+            */
+        
+            rde_param_i_state_push_void (p);
+            sym_SLASH (p);
+            if (rde_param_i_seq_void2value(p)) return;
+            sym_Sequence (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'Final'
+         */
+        
+        static void sym_Final (RDE_PARAM p) {
+           /*
+            * x
+            *     "END"
+            *     (WHITESPACE)
+            *     (SEMICOLON)
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 89)) return ;
+            sequence_176 (p);
+            rde_param_i_symbol_done_void (p, 89, 88);
+            return;
+        }
+        
+        static void sequence_176 (RDE_PARAM p) {
+           /*
+            * x
+            *     "END"
+            *     (WHITESPACE)
+            *     (SEMICOLON)
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "END", 87);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_SEMICOLON (p);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Grammar'
+         */
+        
+        static void sym_Grammar (RDE_PARAM p) {
+           /*
+            * x
+            *     (WHITESPACE)
+            *     (Header)
+            *     *
+            *         (Definition)
+            *     (Final)
+            *     (EOF)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 91)) return ;
+            sequence_186 (p);
+            rde_param_i_symbol_done_d_reduce (p, 91, 90);
+            return;
+        }
+        
+        static void sequence_186 (RDE_PARAM p) {
+           /*
+            * x
+            *     (WHITESPACE)
+            *     (Header)
+            *     *
+            *         (Definition)
+            *     (Final)
+            *     (EOF)
+            */
+        
+            rde_param_i_state_push_void (p);
+            sym_WHITESPACE (p);
+            if (rde_param_i_seq_void2value(p)) return;
+            sym_Header (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            kleene_182 (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_Final (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_EOF (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void kleene_182 (RDE_PARAM p) {
+           /*
+            * *
+            *     (Definition)
+            */
+        
+            while (1) {
+                rde_param_i_state_push_2 (p);
+                sym_Definition (p);
+                if (rde_param_i_kleene_close(p)) return;
+            }
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'GRAPH'
+         */
+        
+        static void sym_GRAPH (RDE_PARAM p) {
+           /*
+            * x
+            *     "<graph>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 94)) return ;
+            sequence_191 (p);
+            rde_param_i_symbol_done_leaf (p, 94, 93);
+            return;
+        }
+        
+        static void sequence_191 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<graph>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<graph>", 92);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Header'
+         */
+        
+        static void sym_Header (RDE_PARAM p) {
+           /*
+            * x
+            *     (PEG)
+            *     (Identifier)
+            *     (StartExpr)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 96)) return ;
+            sequence_197 (p);
+            rde_param_i_symbol_done_d_reduce (p, 96, 95);
+            return;
+        }
+        
+        static void sequence_197 (RDE_PARAM p) {
+           /*
+            * x
+            *     (PEG)
+            *     (Identifier)
+            *     (StartExpr)
+            */
+        
+            rde_param_i_state_push_void (p);
+            sym_PEG (p);
+            if (rde_param_i_seq_void2value(p)) return;
+            sym_Identifier (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_StartExpr (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'Ident'
+         */
+        
+        static void sym_Ident (RDE_PARAM p) {
+           /*
+            * x
+            *     /
+            *         [_:]
+            *         <alpha>
+            *     *
+            *         /
+            *             [_:]
+            *             <alnum>
+            */
+        
+            if (rde_param_i_symbol_start (p, 99)) return ;
+            sequence_210 (p);
+            rde_param_i_symbol_done_leaf (p, 99, 98);
+            return;
+        }
+        
+        static void sequence_210 (RDE_PARAM p) {
+           /*
+            * x
+            *     /
+            *         [_:]
+            *         <alpha>
+            *     *
+            *         /
+            *             [_:]
+            *             <alnum>
+            */
+        
+            rde_param_i_state_push_void (p);
+            choice_202 (p);
+            if (rde_param_i_seq_void2void(p)) return;
+            kleene_208 (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        static void choice_202 (RDE_PARAM p) {
+           /*
+            * /
+            *     [_:]
+            *     <alpha>
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_class (p, "_:", 97);
+            if (rde_param_i_bra_void2void(p)) return;
+            rde_param_i_next_alpha (p, 1);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        static void kleene_208 (RDE_PARAM p) {
+           /*
+            * *
+            *     /
+            *         [_:]
+            *         <alnum>
+            */
+        
+            while (1) {
+                rde_param_i_state_push_2 (p);
+                choice_206 (p);
+                if (rde_param_i_kleene_close(p)) return;
+            }
+            return;
+        }
+        
+        static void choice_206 (RDE_PARAM p) {
+           /*
+            * /
+            *     [_:]
+            *     <alnum>
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_class (p, "_:", 97);
+            if (rde_param_i_bra_void2void(p)) return;
+            rde_param_i_next_alnum (p, 0);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Identifier'
+         */
+        
+        static void sym_Identifier (RDE_PARAM p) {
+           /*
+            * x
+            *     (Ident)
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 101)) return ;
+            sequence_215 (p);
+            rde_param_i_symbol_done_d_reduce (p, 101, 100);
+            return;
+        }
+        
+        static void sequence_215 (RDE_PARAM p) {
+           /*
+            * x
+            *     (Ident)
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_value (p);
+            sym_Ident (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'IS'
+         */
+        
+        static void sym_IS (RDE_PARAM p) {
+           /*
+            * x
+            *     "<-"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 104)) return ;
+            sequence_220 (p);
+            rde_param_i_symbol_done_void (p, 104, 103);
+            return;
+        }
+        
+        static void sequence_220 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<-"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<-", 102);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'LEAF'
+         */
+        
+        static void sym_LEAF (RDE_PARAM p) {
+           /*
+            * x
+            *     "leaf"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 107)) return ;
+            sequence_225 (p);
+            rde_param_i_symbol_done_leaf (p, 107, 106);
+            return;
+        }
+        
+        static void sequence_225 (RDE_PARAM p) {
+           /*
+            * x
+            *     "leaf"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "leaf", 105);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Literal'
+         */
+        
+        static void sym_Literal (RDE_PARAM p) {
+           /*
+            * /
+            *     x
+            *         (APOSTROPH)
+            *         *
+            *             x
+            *                 !
+            *                     (APOSTROPH)
+            *                 (Char)
+            *         (APOSTROPH)
+            *         (WHITESPACE)
+            *     x
+            *         (DAPOSTROPH)
+            *         *
+            *             x
+            *                 !
+            *                     (DAPOSTROPH)
+            *                 (Char)
+            *         (DAPOSTROPH)
+            *         (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 109)) return ;
+            choice_254 (p);
+            rde_param_i_symbol_done_d_reduce (p, 109, 108);
+            return;
+        }
+        
+        static void choice_254 (RDE_PARAM p) {
+           /*
+            * /
+            *     x
+            *         (APOSTROPH)
+            *         *
+            *             x
+            *                 !
+            *                     (APOSTROPH)
+            *                 (Char)
+            *         (APOSTROPH)
+            *         (WHITESPACE)
+            *     x
+            *         (DAPOSTROPH)
+            *         *
+            *             x
+            *                 !
+            *                     (DAPOSTROPH)
+            *                 (Char)
+            *         (DAPOSTROPH)
+            *         (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_value (p);
+            sequence_239 (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sequence_252 (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void sequence_239 (RDE_PARAM p) {
+           /*
+            * x
+            *     (APOSTROPH)
+            *     *
+            *         x
+            *             !
+            *                 (APOSTROPH)
+            *             (Char)
+            *     (APOSTROPH)
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            sym_APOSTROPH (p);
+            if (rde_param_i_seq_void2value(p)) return;
+            kleene_235 (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_APOSTROPH (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void kleene_235 (RDE_PARAM p) {
+           /*
+            * *
+            *     x
+            *         !
+            *             (APOSTROPH)
+            *         (Char)
+            */
+        
+            while (1) {
+                rde_param_i_state_push_2 (p);
+                sequence_233 (p);
+                if (rde_param_i_kleene_close(p)) return;
+            }
+            return;
+        }
+        
+        static void sequence_233 (RDE_PARAM p) {
+           /*
+            * x
+            *     !
+            *         (APOSTROPH)
+            *     (Char)
+            */
+        
+            rde_param_i_state_push_void (p);
+            notahead_230 (p);
+            if (rde_param_i_seq_void2value(p)) return;
+            sym_Char (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void notahead_230 (RDE_PARAM p) {
+           /*
+            * !
+            *     (APOSTROPH)
+            */
+        
+            rde_param_i_loc_push (p);
+            sym_APOSTROPH (p);
+            rde_param_i_notahead_exit (p);
+            return;
+        }
+        
+        static void sequence_252 (RDE_PARAM p) {
+           /*
+            * x
+            *     (DAPOSTROPH)
+            *     *
+            *         x
+            *             !
+            *                 (DAPOSTROPH)
+            *             (Char)
+            *     (DAPOSTROPH)
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            sym_DAPOSTROPH (p);
+            if (rde_param_i_seq_void2value(p)) return;
+            kleene_248 (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_DAPOSTROPH (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void kleene_248 (RDE_PARAM p) {
+           /*
+            * *
+            *     x
+            *         !
+            *             (DAPOSTROPH)
+            *         (Char)
+            */
+        
+            while (1) {
+                rde_param_i_state_push_2 (p);
+                sequence_246 (p);
+                if (rde_param_i_kleene_close(p)) return;
+            }
+            return;
+        }
+        
+        static void sequence_246 (RDE_PARAM p) {
+           /*
+            * x
+            *     !
+            *         (DAPOSTROPH)
+            *     (Char)
+            */
+        
+            rde_param_i_state_push_void (p);
+            notahead_243 (p);
+            if (rde_param_i_seq_void2value(p)) return;
+            sym_Char (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void notahead_243 (RDE_PARAM p) {
+           /*
+            * !
+            *     (DAPOSTROPH)
+            */
+        
+            rde_param_i_loc_push (p);
+            sym_DAPOSTROPH (p);
+            rde_param_i_notahead_exit (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'LOWER'
+         */
+        
+        static void sym_LOWER (RDE_PARAM p) {
+           /*
+            * x
+            *     "<lower>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 112)) return ;
+            sequence_259 (p);
+            rde_param_i_symbol_done_leaf (p, 112, 111);
+            return;
+        }
+        
+        static void sequence_259 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<lower>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<lower>", 110);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'NOT'
+         */
+        
+        static void sym_NOT (RDE_PARAM p) {
+           /*
+            * x
+            *     '!'
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 115)) return ;
+            sequence_264 (p);
+            rde_param_i_symbol_done_leaf (p, 115, 114);
+            return;
+        }
+        
+        static void sequence_264 (RDE_PARAM p) {
+           /*
+            * x
+            *     '!'
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, "!", 113);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'OPEN'
+         */
+        
+        static void sym_OPEN (RDE_PARAM p) {
+           /*
+            * x
+            *     '\('
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 118)) return ;
+            sequence_269 (p);
+            rde_param_i_symbol_done_void (p, 118, 117);
+            return;
+        }
+        
+        static void sequence_269 (RDE_PARAM p) {
+           /*
+            * x
+            *     '\('
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, "(", 116);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'OPENB'
+         */
+        
+        static void sym_OPENB (RDE_PARAM p) {
+           /*
+            * '['
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 121)) return ;
+            rde_param_i_next_char (p, "[", 119);
+            rde_param_i_symbol_done_void (p, 121, 120);
+            return;
+        }
+        
+        /*
+         * void Symbol 'PEG'
+         */
+        
+        static void sym_PEG (RDE_PARAM p) {
+           /*
+            * x
+            *     "PEG"
+            *     !
+            *         /
+            *             [_:]
+            *             <alnum>
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 124)) return ;
+            sequence_281 (p);
+            rde_param_i_symbol_done_void (p, 124, 123);
+            return;
+        }
+        
+        static void sequence_281 (RDE_PARAM p) {
+           /*
+            * x
+            *     "PEG"
+            *     !
+            *         /
+            *             [_:]
+            *             <alnum>
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "PEG", 122);
+            if (rde_param_i_seq_void2void(p)) return;
+            notahead_278 (p);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        static void notahead_278 (RDE_PARAM p) {
+           /*
+            * !
+            *     /
+            *         [_:]
+            *         <alnum>
+            */
+        
+            rde_param_i_loc_push (p);
+            choice_206 (p);
+            rde_param_i_notahead_exit (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'PLUS'
+         */
+        
+        static void sym_PLUS (RDE_PARAM p) {
+           /*
+            * x
+            *     '+'
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 127)) return ;
+            sequence_286 (p);
+            rde_param_i_symbol_done_leaf (p, 127, 126);
+            return;
+        }
+        
+        static void sequence_286 (RDE_PARAM p) {
+           /*
+            * x
+            *     '+'
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, "+", 125);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Prefix'
+         */
+        
+        static void sym_Prefix (RDE_PARAM p) {
+           /*
+            * x
+            *     ?
+            *         /
+            *             (AND)
+            *             (NOT)
+            *     (Suffix)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 129)) return ;
+            sequence_296 (p);
+            rde_param_i_symbol_done_d_reduce (p, 129, 128);
+            return;
+        }
+        
+        static void sequence_296 (RDE_PARAM p) {
+           /*
+            * x
+            *     ?
+            *         /
+            *             (AND)
+            *             (NOT)
+            *     (Suffix)
+            */
+        
+            rde_param_i_state_push_value (p);
+            optional_293 (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_Suffix (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void optional_293 (RDE_PARAM p) {
+           /*
+            * ?
+            *     /
+            *         (AND)
+            *         (NOT)
+            */
+        
+            rde_param_i_state_push_2 (p);
+            choice_291 (p);
+            rde_param_i_state_merge_ok (p);
+            return;
+        }
+        
+        static void choice_291 (RDE_PARAM p) {
+           /*
+            * /
+            *     (AND)
+            *     (NOT)
+            */
+        
+            rde_param_i_state_push_value (p);
+            sym_AND (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_NOT (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Primary'
+         */
+        
+        static void sym_Primary (RDE_PARAM p) {
+           /*
+            * /
+            *     (ALNUM)
+            *     (ALPHA)
+            *     (ASCII)
+            *     (CONTROL)
+            *     (DDIGIT)
+            *     (DIGIT)
+            *     (GRAPH)
+            *     (LOWER)
+            *     (PRINTABLE)
+            *     (PUNCT)
+            *     (SPACE)
+            *     (UPPER)
+            *     (WORDCHAR)
+            *     (XDIGIT)
+            *     (Identifier)
+            *     x
+            *         (OPEN)
+            *         (Expression)
+            *         (CLOSE)
+            *     (Literal)
+            *     (Class)
+            *     (DOT)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 131)) return ;
+            choice_322 (p);
+            rde_param_i_symbol_done_d_reduce (p, 131, 130);
+            return;
+        }
+        
+        static void choice_322 (RDE_PARAM p) {
+           /*
+            * /
+            *     (ALNUM)
+            *     (ALPHA)
+            *     (ASCII)
+            *     (CONTROL)
+            *     (DDIGIT)
+            *     (DIGIT)
+            *     (GRAPH)
+            *     (LOWER)
+            *     (PRINTABLE)
+            *     (PUNCT)
+            *     (SPACE)
+            *     (UPPER)
+            *     (WORDCHAR)
+            *     (XDIGIT)
+            *     (Identifier)
+            *     x
+            *         (OPEN)
+            *         (Expression)
+            *         (CLOSE)
+            *     (Literal)
+            *     (Class)
+            *     (DOT)
+            */
+        
+            rde_param_i_state_push_value (p);
+            sym_ALNUM (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_ALPHA (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_ASCII (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_CONTROL (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_DDIGIT (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_DIGIT (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_GRAPH (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_LOWER (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_PRINTABLE (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_PUNCT (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_SPACE (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_UPPER (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_WORDCHAR (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_XDIGIT (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_Identifier (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sequence_317 (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_Literal (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_Class (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_DOT (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void sequence_317 (RDE_PARAM p) {
+           /*
+            * x
+            *     (OPEN)
+            *     (Expression)
+            *     (CLOSE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            sym_OPEN (p);
+            if (rde_param_i_seq_void2value(p)) return;
+            sym_Expression (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_CLOSE (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'PRINTABLE'
+         */
+        
+        static void sym_PRINTABLE (RDE_PARAM p) {
+           /*
+            * x
+            *     "<print>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 134)) return ;
+            sequence_327 (p);
+            rde_param_i_symbol_done_leaf (p, 134, 133);
+            return;
+        }
+        
+        static void sequence_327 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<print>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<print>", 132);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'PUNCT'
+         */
+        
+        static void sym_PUNCT (RDE_PARAM p) {
+           /*
+            * x
+            *     "<punct>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 137)) return ;
+            sequence_332 (p);
+            rde_param_i_symbol_done_leaf (p, 137, 136);
+            return;
+        }
+        
+        static void sequence_332 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<punct>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<punct>", 135);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'QUESTION'
+         */
+        
+        static void sym_QUESTION (RDE_PARAM p) {
+           /*
+            * x
+            *     '?'
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 140)) return ;
+            sequence_337 (p);
+            rde_param_i_symbol_done_leaf (p, 140, 139);
+            return;
+        }
+        
+        static void sequence_337 (RDE_PARAM p) {
+           /*
+            * x
+            *     '?'
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, "?", 138);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Range'
+         */
+        
+        static void sym_Range (RDE_PARAM p) {
+           /*
+            * /
+            *     x
+            *         (Char)
+            *         (TO)
+            *         (Char)
+            *     (Char)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 142)) return ;
+            choice_346 (p);
+            rde_param_i_symbol_done_d_reduce (p, 142, 141);
+            return;
+        }
+        
+        static void choice_346 (RDE_PARAM p) {
+           /*
+            * /
+            *     x
+            *         (Char)
+            *         (TO)
+            *         (Char)
+            *     (Char)
+            */
+        
+            rde_param_i_state_push_value (p);
+            sequence_343 (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_Char (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void sequence_343 (RDE_PARAM p) {
+           /*
+            * x
+            *     (Char)
+            *     (TO)
+            *     (Char)
+            */
+        
+            rde_param_i_state_push_value (p);
+            sym_Char (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_TO (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            sym_Char (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'SEMICOLON'
+         */
+        
+        static void sym_SEMICOLON (RDE_PARAM p) {
+           /*
+            * x
+            *     ';'
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 145)) return ;
+            sequence_351 (p);
+            rde_param_i_symbol_done_void (p, 145, 144);
+            return;
+        }
+        
+        static void sequence_351 (RDE_PARAM p) {
+           /*
+            * x
+            *     ';'
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, ";", 143);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Sequence'
+         */
+        
+        static void sym_Sequence (RDE_PARAM p) {
+           /*
+            * +
+            *     (Prefix)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 147)) return ;
+            poskleene_355 (p);
+            rde_param_i_symbol_done_d_reduce (p, 147, 146);
+            return;
+        }
+        
+        static void poskleene_355 (RDE_PARAM p) {
+           /*
+            * +
+            *     (Prefix)
+            */
+        
+            rde_param_i_loc_push (p);
+            sym_Prefix (p);
+            if (rde_param_i_kleene_abort(p)) return;
+            while (1) {
+                rde_param_i_state_push_2 (p);
+                sym_Prefix (p);
+                if (rde_param_i_kleene_close(p)) return;
+            }
+            return;
+        }
+        
+        /*
+         * void Symbol 'SLASH'
+         */
+        
+        static void sym_SLASH (RDE_PARAM p) {
+           /*
+            * x
+            *     '/'
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 150)) return ;
+            sequence_360 (p);
+            rde_param_i_symbol_done_void (p, 150, 149);
+            return;
+        }
+        
+        static void sequence_360 (RDE_PARAM p) {
+           /*
+            * x
+            *     '/'
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, "/", 148);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'SPACE'
+         */
+        
+        static void sym_SPACE (RDE_PARAM p) {
+           /*
+            * x
+            *     "<space>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 153)) return ;
+            sequence_365 (p);
+            rde_param_i_symbol_done_leaf (p, 153, 152);
+            return;
+        }
+        
+        static void sequence_365 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<space>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<space>", 151);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'STAR'
+         */
+        
+        static void sym_STAR (RDE_PARAM p) {
+           /*
+            * x
+            *     '*'
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 156)) return ;
+            sequence_370 (p);
+            rde_param_i_symbol_done_leaf (p, 156, 155);
+            return;
+        }
+        
+        static void sequence_370 (RDE_PARAM p) {
+           /*
+            * x
+            *     '*'
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_char (p, "*", 154);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * value Symbol 'StartExpr'
+         */
+        
+        static void sym_StartExpr (RDE_PARAM p) {
+           /*
+            * x
+            *     (OPEN)
+            *     (Expression)
+            *     (CLOSE)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 158)) return ;
+            sequence_317 (p);
+            rde_param_i_symbol_done_d_reduce (p, 158, 157);
+            return;
+        }
+        
+        /*
+         * value Symbol 'Suffix'
+         */
+        
+        static void sym_Suffix (RDE_PARAM p) {
+           /*
+            * x
+            *     (Primary)
+            *     ?
+            *         /
+            *             (QUESTION)
+            *             (STAR)
+            *             (PLUS)
+            */
+        
+            if (rde_param_i_symbol_start_d (p, 160)) return ;
+            sequence_386 (p);
+            rde_param_i_symbol_done_d_reduce (p, 160, 159);
+            return;
+        }
+        
+        static void sequence_386 (RDE_PARAM p) {
+           /*
+            * x
+            *     (Primary)
+            *     ?
+            *         /
+            *             (QUESTION)
+            *             (STAR)
+            *             (PLUS)
+            */
+        
+            rde_param_i_state_push_value (p);
+            sym_Primary (p);
+            if (rde_param_i_seq_value2value(p)) return;
+            optional_384 (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        static void optional_384 (RDE_PARAM p) {
+           /*
+            * ?
+            *     /
+            *         (QUESTION)
+            *         (STAR)
+            *         (PLUS)
+            */
+        
+            rde_param_i_state_push_2 (p);
+            choice_382 (p);
+            rde_param_i_state_merge_ok (p);
+            return;
+        }
+        
+        static void choice_382 (RDE_PARAM p) {
+           /*
+            * /
+            *     (QUESTION)
+            *     (STAR)
+            *     (PLUS)
+            */
+        
+            rde_param_i_state_push_value (p);
+            sym_QUESTION (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_STAR (p);
+            if (rde_param_i_bra_value2value(p)) return;
+            sym_PLUS (p);
+            rde_param_i_state_merge_value (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'TO'
+         */
+        
+        static void sym_TO (RDE_PARAM p) {
+           /*
+            * '-'
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 163)) return ;
+            rde_param_i_next_char (p, "-", 161);
+            rde_param_i_symbol_done_void (p, 163, 162);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'UPPER'
+         */
+        
+        static void sym_UPPER (RDE_PARAM p) {
+           /*
+            * x
+            *     "<upper>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 166)) return ;
+            sequence_393 (p);
+            rde_param_i_symbol_done_leaf (p, 166, 165);
+            return;
+        }
+        
+        static void sequence_393 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<upper>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<upper>", 164);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'VOID'
+         */
+        
+        static void sym_VOID (RDE_PARAM p) {
+           /*
+            * x
+            *     "void"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 169)) return ;
+            sequence_398 (p);
+            rde_param_i_symbol_done_leaf (p, 169, 168);
+            return;
+        }
+        
+        static void sequence_398 (RDE_PARAM p) {
+           /*
+            * x
+            *     "void"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "void", 167);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * void Symbol 'WHITESPACE'
+         */
+        
+        static void sym_WHITESPACE (RDE_PARAM p) {
+           /*
+            * *
+            *     /
+            *         <space>
+            *         (COMMENT)
+            */
+        
+            if (rde_param_i_symbol_void_start (p, 171)) return ;
+            kleene_405 (p);
+            rde_param_i_symbol_done_void (p, 171, 170);
+            return;
+        }
+        
+        static void kleene_405 (RDE_PARAM p) {
+           /*
+            * *
+            *     /
+            *         <space>
+            *         (COMMENT)
+            */
+        
+            while (1) {
+                rde_param_i_state_push_2 (p);
+                choice_403 (p);
+                if (rde_param_i_kleene_close(p)) return;
+            }
+            return;
+        }
+        
+        static void choice_403 (RDE_PARAM p) {
+           /*
+            * /
+            *     <space>
+            *     (COMMENT)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_space (p, 10);
+            if (rde_param_i_bra_void2void(p)) return;
+            sym_COMMENT (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'WORDCHAR'
+         */
+        
+        static void sym_WORDCHAR (RDE_PARAM p) {
+           /*
+            * x
+            *     "<wordchar>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 174)) return ;
+            sequence_410 (p);
+            rde_param_i_symbol_done_leaf (p, 174, 173);
+            return;
+        }
+        
+        static void sequence_410 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<wordchar>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<wordchar>", 172);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+        /*
+         * leaf Symbol 'XDIGIT'
+         */
+        
+        static void sym_XDIGIT (RDE_PARAM p) {
+           /*
+            * x
+            *     "<xdigit>"
+            *     (WHITESPACE)
+            */
+        
+            if (rde_param_i_symbol_start (p, 177)) return ;
+            sequence_415 (p);
+            rde_param_i_symbol_done_leaf (p, 177, 176);
+            return;
+        }
+        
+        static void sequence_415 (RDE_PARAM p) {
+           /*
+            * x
+            *     "<xdigit>"
+            *     (WHITESPACE)
+            */
+        
+            rde_param_i_state_push_void (p);
+            rde_param_i_next_str (p, "<xdigit>", 175);
+            if (rde_param_i_seq_void2void(p)) return;
+            sym_WHITESPACE (p);
+            rde_param_i_state_merge_void (p);
+            return;
+        }
+        
+    }
+
+    ## END of GENERATED CODE. DO NOT EDIT.
+    # # ## ### ###### ######## #############
+
+    # # ## ### ###### ######## #############
+    ## Global PARSER management, per interp
+
+    critcl::ccode {
+	/* -*- c -*- */
+
+	typedef struct PARSERg {
+	    long int counter;
+	    char     buf [50];
+	} PARSERg;
+
+	static void
+	PARSERgRelease (ClientData cd, Tcl_Interp* interp)
+	{
+	    ckfree((char*) cd);
+	}
+
+	static const char*
+	PARSERnewName (Tcl_Interp* interp)
+	{
+#define KEY "tcllib/parser/pt_parse_peg_c/critcl"
+
+	    Tcl_InterpDeleteProc* proc = PARSERgRelease;
+	    PARSERg*                  parserg;
+
+	    parserg = Tcl_GetAssocData (interp, KEY, &proc);
+	    if (parserg  == NULL) {
+		parserg = (PARSERg*) ckalloc (sizeof (PARSERg));
+		parserg->counter = 0;
+
+		Tcl_SetAssocData (interp, KEY, proc,
+				  (ClientData) parserg);
+	    }
+
+	    parserg->counter ++;
+	    sprintf (parserg->buf, "peg%ld", parserg->counter);
+	    return parserg->buf;
+#undef  KEY
+	}
+
+	static void
+	PARSERdeleteCmd (ClientData clientData)
+	{
+	    /*
+	     * Release the whole PARSER
+	     * (Low-level engine only actually).
+	     */
+	    rde_param_del ((RDE_PARAM) clientData);
+	}
+    }
+
+    # # ## ### ##### ######## #############
+    ## Functions implementing the object methods, and helper.
+
+    critcl::ccode {
+	static int  COMPLETE (RDE_PARAM p, Tcl_Interp* interp);
+
+	static int parser_PARSE  (RDE_PARAM p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+	{
+	    int mode;
+	    Tcl_Channel chan;
+
+	    if (objc != 3) {
+		Tcl_WrongNumArgs (interp, 2, objv, "chan");
+		return TCL_ERROR;
+	    }
+
+	    chan = Tcl_GetChannel(interp,
+				  Tcl_GetString (objv[2]),
+				  &mode);
+
+	    if (!chan) {
+		return TCL_ERROR;
+	    }
+
+	    rde_param_reset (p, chan);
+	    MAIN (p) ; /* Entrypoint for the generated code. */
+	    return COMPLETE (p, interp);
+	}
+
+	static int parser_PARSET (RDE_PARAM p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+	{
+	    char* buf;
+	    int   len;
+
+	    if (objc != 3) {
+		Tcl_WrongNumArgs (interp, 2, objv, "text");
+		return TCL_ERROR;
+	    }
+
+	    buf = Tcl_GetStringFromObj (objv[2], &len);
+
+	    rde_param_reset (p, NULL);
+	    rde_param_data  (p, buf, len);
+	    MAIN (p) ; /* Entrypoint for the generated code. */
+	    return COMPLETE (p, interp);
+	}
+
+	/* See also rde_critcl/m.c, param_COMPLETE() */
+	static int COMPLETE (RDE_PARAM p, Tcl_Interp* interp)
+	{
+	    if (rde_param_query_st (p)) {
+		long int  ac;
+		Tcl_Obj** av;
+
+		rde_param_query_ast (p, &ac, &av);
+
+		if (ac > 1) {
+		    Tcl_Obj** lv = NALLOC (3+ac, Tcl_Obj*);
+
+		    memcpy(lv + 3, av, ac * sizeof (Tcl_Obj*));
+		    lv [0] = Tcl_NewObj ();
+		    lv [1] = Tcl_NewIntObj (1 + rde_param_query_lstop (p));
+		    lv [2] = Tcl_NewIntObj (rde_param_query_cl (p));
+
+		    Tcl_SetObjResult (interp, Tcl_NewListObj (3, lv));
+		    ckfree ((char*) lv);
+
+		} else if (ac == 0) {
+		    /*
+		     * Match, but no AST. This is possible if the grammar
+		     * consists of only the start expression.
+		     */
+		    Tcl_SetObjResult (interp, Tcl_NewStringObj ("",-1));
+		} else {
+		    Tcl_SetObjResult (interp, av [0]);
+		}
+
+		return TCL_OK;
+	    } else {
+		Tcl_Obj* xv [1];
+		const ERROR_STATE* er = rde_param_query_er (p);
+		Tcl_Obj* res = rde_param_query_er_tcl (p, er);
+		/* res = list (location, list(msg)) */
+
+		/* Stick the exception type-tag before the existing elements */
+		xv [0] = Tcl_NewStringObj ("pt::rde",-1);
+		Tcl_ListObjReplace(interp, res, 0, 0, 1, xv);
+
+		Tcl_SetErrorCode (interp, "PT", "RDE", "SYNTAX", NULL);
+		Tcl_SetObjResult (interp, res);
+		return TCL_ERROR;
+	    }
+	}
+    }
+
+    # # ## ### ##### ######## #############
+    ## Object command, method dispatch.
+
+    critcl::ccode {
+	static int parser_objcmd (ClientData cd, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+	{
+	    RDE_PARAM p = (RDE_PARAM) cd;
+	    int m, res;
+
+	    static CONST char* methods [] = {
+		"destroy", "parse", "parset", NULL
+	    };
+	    enum methods {
+		M_DESTROY, M_PARSE, M_PARSET
+	    };
+
+	    if (objc < 2) {
+		Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?");
+		return TCL_ERROR;
+	    } else if (Tcl_GetIndexFromObj (interp, objv [1], methods, "option",
+					    0, &m) != TCL_OK) {
+		return TCL_ERROR;
+	    }
+
+	    /* Dispatch to methods. They check the #args in
+	     * detail before performing the requested
+	     * functionality
+	     */
+
+	    switch (m) {
+		case M_DESTROY:
+		    if (objc != 2) {
+			Tcl_WrongNumArgs (interp, 2, objv, NULL);
+			return TCL_ERROR;
+		    }
+
+		Tcl_DeleteCommandFromToken(interp, (Tcl_Command) rde_param_query_clientdata (p));
+		return TCL_OK;
+
+		case M_PARSE:	res = parser_PARSE  (p, interp, objc, objv); break;
+		case M_PARSET:	res = parser_PARSET (p, interp, objc, objv); break;
+		default:
+		/* Not coming to this place */
+		ASSERT (0,"Reached unreachable location");
+	    }
+
+	    return res;
+	}
+    }
+
+    # # ## ### ##### ######## #############
+    # Class command, i.e. object construction.
+
+    critcl::ccommand peg_critcl {dummy interp objc objv} {
+	/*
+	 * Syntax: No arguments beyond the name
+	 */
+
+	RDE_PARAM   parser;
+	CONST char* name;
+	Tcl_Obj*    fqn;
+	Tcl_CmdInfo ci;
+	Tcl_Command c;
+
+#define USAGE "?name?"
+
+	if ((objc != 2) && (objc != 1)) {
+	    Tcl_WrongNumArgs (interp, 1, objv, USAGE);
+	    return TCL_ERROR;
+	}
+
+	if (objc < 2) {
+	    name = PARSERnewName (interp);
+	} else {
+	    name = Tcl_GetString (objv [1]);
+	}
+
+	if (!Tcl_StringMatch (name, "::*")) {
+	    /* Relative name. Prefix with current namespace */
+
+	    Tcl_Eval (interp, "namespace current");
+	    fqn = Tcl_GetObjResult (interp);
+	    fqn = Tcl_DuplicateObj (fqn);
+	    Tcl_IncrRefCount (fqn);
+
+	    if (!Tcl_StringMatch (Tcl_GetString (fqn), "::")) {
+		Tcl_AppendToObj (fqn, "::", -1);
+	    }
+	    Tcl_AppendToObj (fqn, name, -1);
+	} else {
+	    fqn = Tcl_NewStringObj (name, -1);
+	    Tcl_IncrRefCount (fqn);
+	}
+	Tcl_ResetResult (interp);
+
+	if (Tcl_GetCommandInfo (interp,
+				Tcl_GetString (fqn),
+				&ci)) {
+	    Tcl_Obj* err;
+
+	    err = Tcl_NewObj ();
+	    Tcl_AppendToObj    (err, "command \"", -1);
+	    Tcl_AppendObjToObj (err, fqn);
+	    Tcl_AppendToObj    (err, "\" already exists", -1);
+
+	    Tcl_DecrRefCount (fqn);
+	    Tcl_SetObjResult (interp, err);
+	    return TCL_ERROR;
+	}
+
+	parser = rde_param_new (sizeof(p_string)/sizeof(char*), (char**) p_string);
+	c = Tcl_CreateObjCommand (interp, Tcl_GetString (fqn),
+				  parser_objcmd, (ClientData) parser,
+				  PARSERdeleteCmd);
+	rde_param_clientdata (parser, (ClientData) c);
+	Tcl_SetObjResult (interp, fqn);
+	Tcl_DecrRefCount (fqn);
+	return TCL_OK;
+    }
+
+    ##
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready (Note: Our package provide is at the top).
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_parse_peg_tcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_parse_peg_tcl.tcl
new file mode 100644
index 00000000..297d76b1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_parse_peg_tcl.tcl
@@ -0,0 +1,2431 @@
+## -*- tcl -*-
+##
+## Snit-based Tcl/PARAM implementation of the parsing
+## expression grammar
+##
+##	PEG
+##
+## Generated from file	3_peg_itself
+##            for user  aku
+##
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.5
+package require snit
+package require pt::rde ; # Implementation of the PARAM
+			  # virtual machine underlying the
+			  # Tcl/PARAM code used below.
+
+# # ## ### ##### ######## ############# #####################
+##
+
+snit::type ::pt::parse::peg_tcl {
+    # # ## ### ##### ######## #############
+    ## Public API
+
+    constructor {} {
+	# Create the runtime supporting the parsing process.
+	set myparser [pt::rde ${selfns}::ENGINE]
+	return
+    }
+
+    method parse {channel} {
+	$myparser reset $channel
+	MAIN ; # Entrypoint for the generated code.
+	return [$myparser complete]
+    }
+
+    method parset {text} {
+	$myparser reset
+	$myparser data $text
+	MAIN ; # Entrypoint for the generated code.
+	return [$myparser complete]
+    }
+
+    # # ## ### ###### ######## #############
+    ## Configuration
+
+    pragma -hastypeinfo    0
+    pragma -hastypemethods 0
+    pragma -hasinfo        0
+    pragma -simpledispatch 1
+
+    # # ## ### ###### ######## #############
+    ## Data structures.
+
+    variable myparser {} ; # Our instantiation of the PARAM.
+
+    # # ## ### ###### ######## #############
+    ## BEGIN of GENERATED CODE. DO NOT EDIT.
+
+    #
+    # Grammar Start Expression
+    #
+    
+    proc MAIN {} { upvar 1 myparser myparser
+        sym_Grammar
+        return
+    }
+    
+    #
+    # leaf Symbol 'ALNUM'
+    #
+    
+    proc sym_ALNUM {} { upvar 1 myparser myparser
+        # x
+        #     "<alnum>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start ALNUM
+        sequence_4
+        $myparser si:void_leaf_symbol_end ALNUM
+        return
+    }
+    
+    proc sequence_4 {} { upvar 1 myparser myparser
+        # x
+        #     "<alnum>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <alnum>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'ALPHA'
+    #
+    
+    proc sym_ALPHA {} { upvar 1 myparser myparser
+        # x
+        #     "<alpha>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start ALPHA
+        sequence_9
+        $myparser si:void_leaf_symbol_end ALPHA
+        return
+    }
+    
+    proc sequence_9 {} { upvar 1 myparser myparser
+        # x
+        #     "<alpha>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <alpha>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'AND'
+    #
+    
+    proc sym_AND {} { upvar 1 myparser myparser
+        # x
+        #     '&'
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start AND
+        sequence_14
+        $myparser si:void_leaf_symbol_end AND
+        return
+    }
+    
+    proc sequence_14 {} { upvar 1 myparser myparser
+        # x
+        #     '&'
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char &
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # void Symbol 'APOSTROPH'
+    #
+    
+    proc sym_APOSTROPH {} { upvar 1 myparser myparser
+        # '''
+    
+        $myparser si:void_void_symbol_start APOSTROPH
+        $myparser si:next_char '
+        $myparser si:void_clear_symbol_end APOSTROPH
+        return
+    }
+    
+    #
+    # leaf Symbol 'ASCII'
+    #
+    
+    proc sym_ASCII {} { upvar 1 myparser myparser
+        # x
+        #     "<ascii>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start ASCII
+        sequence_21
+        $myparser si:void_leaf_symbol_end ASCII
+        return
+    }
+    
+    proc sequence_21 {} { upvar 1 myparser myparser
+        # x
+        #     "<ascii>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <ascii>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # value Symbol 'Attribute'
+    #
+    
+    proc sym_Attribute {} { upvar 1 myparser myparser
+        # x
+        #     /
+        #         (VOID)
+        #         (LEAF)
+        #     (COLON)
+    
+        $myparser si:value_symbol_start Attribute
+        sequence_29
+        $myparser si:reduce_symbol_end Attribute
+        return
+    }
+    
+    proc sequence_29 {} { upvar 1 myparser myparser
+        # x
+        #     /
+        #         (VOID)
+        #         (LEAF)
+        #     (COLON)
+    
+        $myparser si:value_state_push
+        choice_26
+        $myparser si:valuevalue_part
+        sym_COLON
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc choice_26 {} { upvar 1 myparser myparser
+        # /
+        #     (VOID)
+        #     (LEAF)
+    
+        $myparser si:value_state_push
+        sym_VOID
+        $myparser si:valuevalue_branch
+        sym_LEAF
+        $myparser si:value_state_merge
+        return
+    }
+    
+    #
+    # value Symbol 'Char'
+    #
+    
+    proc sym_Char {} { upvar 1 myparser myparser
+        # /
+        #     (CharSpecial)
+        #     (CharOctalFull)
+        #     (CharOctalPart)
+        #     (CharUnicode)
+        #     (CharUnescaped)
+    
+        $myparser si:value_symbol_start Char
+        choice_37
+        $myparser si:reduce_symbol_end Char
+        return
+    }
+    
+    proc choice_37 {} { upvar 1 myparser myparser
+        # /
+        #     (CharSpecial)
+        #     (CharOctalFull)
+        #     (CharOctalPart)
+        #     (CharUnicode)
+        #     (CharUnescaped)
+    
+        $myparser si:value_state_push
+        sym_CharSpecial
+        $myparser si:valuevalue_branch
+        sym_CharOctalFull
+        $myparser si:valuevalue_branch
+        sym_CharOctalPart
+        $myparser si:valuevalue_branch
+        sym_CharUnicode
+        $myparser si:valuevalue_branch
+        sym_CharUnescaped
+        $myparser si:value_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'CharOctalFull'
+    #
+    
+    proc sym_CharOctalFull {} { upvar 1 myparser myparser
+        # x
+        #     '\'
+        #     range (0 .. 2)
+        #     range (0 .. 7)
+        #     range (0 .. 7)
+    
+        $myparser si:void_symbol_start CharOctalFull
+        sequence_44
+        $myparser si:void_leaf_symbol_end CharOctalFull
+        return
+    }
+    
+    proc sequence_44 {} { upvar 1 myparser myparser
+        # x
+        #     '\'
+        #     range (0 .. 2)
+        #     range (0 .. 7)
+        #     range (0 .. 7)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char \134
+        $myparser si:voidvoid_part
+        $myparser si:next_range 0 2
+        $myparser si:voidvoid_part
+        $myparser si:next_range 0 7
+        $myparser si:voidvoid_part
+        $myparser si:next_range 0 7
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'CharOctalPart'
+    #
+    
+    proc sym_CharOctalPart {} { upvar 1 myparser myparser
+        # x
+        #     '\'
+        #     range (0 .. 7)
+        #     ?
+        #         range (0 .. 7)
+    
+        $myparser si:void_symbol_start CharOctalPart
+        sequence_52
+        $myparser si:void_leaf_symbol_end CharOctalPart
+        return
+    }
+    
+    proc sequence_52 {} { upvar 1 myparser myparser
+        # x
+        #     '\'
+        #     range (0 .. 7)
+        #     ?
+        #         range (0 .. 7)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char \134
+        $myparser si:voidvoid_part
+        $myparser si:next_range 0 7
+        $myparser si:voidvoid_part
+        optional_50
+        $myparser si:void_state_merge
+        return
+    }
+    
+    proc optional_50 {} { upvar 1 myparser myparser
+        # ?
+        #     range (0 .. 7)
+    
+        $myparser si:void2_state_push
+        $myparser si:next_range 0 7
+        $myparser si:void_state_merge_ok
+        return
+    }
+    
+    #
+    # leaf Symbol 'CharSpecial'
+    #
+    
+    proc sym_CharSpecial {} { upvar 1 myparser myparser
+        # x
+        #     '\'
+        #     [nrt'\"[]\]
+    
+        $myparser si:void_symbol_start CharSpecial
+        sequence_57
+        $myparser si:void_leaf_symbol_end CharSpecial
+        return
+    }
+    
+    proc sequence_57 {} { upvar 1 myparser myparser
+        # x
+        #     '\'
+        #     [nrt'\"[]\]
+    
+        $myparser si:void_state_push
+        $myparser si:next_char \134
+        $myparser si:voidvoid_part
+        $myparser si:next_class nrt'\42\133\135\134
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'CharUnescaped'
+    #
+    
+    proc sym_CharUnescaped {} { upvar 1 myparser myparser
+        # x
+        #     !
+        #         '\'
+        #     <dot>
+    
+        $myparser si:void_symbol_start CharUnescaped
+        sequence_64
+        $myparser si:void_leaf_symbol_end CharUnescaped
+        return
+    }
+    
+    proc sequence_64 {} { upvar 1 myparser myparser
+        # x
+        #     !
+        #         '\'
+        #     <dot>
+    
+        $myparser si:void_state_push
+        notahead_61
+        $myparser si:voidvoid_part
+        $myparser i_input_next dot
+        $myparser si:void_state_merge
+        return
+    }
+    
+    proc notahead_61 {} { upvar 1 myparser myparser
+        # !
+        #     '\'
+    
+        $myparser i_loc_push
+        $myparser si:next_char \134
+        $myparser si:void_notahead_exit
+        return
+    }
+    
+    #
+    # leaf Symbol 'CharUnicode'
+    #
+    
+    proc sym_CharUnicode {} { upvar 1 myparser myparser
+        # x
+        #     "\u"
+        #     <xdigit>
+        #     ?
+        #         x
+        #             <xdigit>
+        #             ?
+        #                 x
+        #                     <xdigit>
+        #                     ?
+        #                         <xdigit>
+    
+        $myparser si:void_symbol_start CharUnicode
+        sequence_82
+        $myparser si:void_leaf_symbol_end CharUnicode
+        return
+    }
+    
+    proc sequence_82 {} { upvar 1 myparser myparser
+        # x
+        #     "\u"
+        #     <xdigit>
+        #     ?
+        #         x
+        #             <xdigit>
+        #             ?
+        #                 x
+        #                     <xdigit>
+        #                     ?
+        #                         <xdigit>
+    
+        $myparser si:void_state_push
+        $myparser si:next_str \134u
+        $myparser si:voidvoid_part
+        $myparser si:next_xdigit
+        $myparser si:voidvoid_part
+        optional_80
+        $myparser si:void_state_merge
+        return
+    }
+    
+    proc optional_80 {} { upvar 1 myparser myparser
+        # ?
+        #     x
+        #         <xdigit>
+        #         ?
+        #             x
+        #                 <xdigit>
+        #                 ?
+        #                     <xdigit>
+    
+        $myparser si:void2_state_push
+        sequence_78
+        $myparser si:void_state_merge_ok
+        return
+    }
+    
+    proc sequence_78 {} { upvar 1 myparser myparser
+        # x
+        #     <xdigit>
+        #     ?
+        #         x
+        #             <xdigit>
+        #             ?
+        #                 <xdigit>
+    
+        $myparser si:void_state_push
+        $myparser si:next_xdigit
+        $myparser si:voidvoid_part
+        optional_76
+        $myparser si:void_state_merge
+        return
+    }
+    
+    proc optional_76 {} { upvar 1 myparser myparser
+        # ?
+        #     x
+        #         <xdigit>
+        #         ?
+        #             <xdigit>
+    
+        $myparser si:void2_state_push
+        sequence_74
+        $myparser si:void_state_merge_ok
+        return
+    }
+    
+    proc sequence_74 {} { upvar 1 myparser myparser
+        # x
+        #     <xdigit>
+        #     ?
+        #         <xdigit>
+    
+        $myparser si:void_state_push
+        $myparser si:next_xdigit
+        $myparser si:voidvoid_part
+        optional_72
+        $myparser si:void_state_merge
+        return
+    }
+    
+    proc optional_72 {} { upvar 1 myparser myparser
+        # ?
+        #     <xdigit>
+    
+        $myparser si:void2_state_push
+        $myparser si:next_xdigit
+        $myparser si:void_state_merge_ok
+        return
+    }
+    
+    #
+    # value Symbol 'Class'
+    #
+    
+    proc sym_Class {} { upvar 1 myparser myparser
+        # x
+        #     (OPENB)
+        #     *
+        #         x
+        #             !
+        #                 (CLOSEB)
+        #             (Range)
+        #     (CLOSEB)
+        #     (WHITESPACE)
+    
+        $myparser si:value_symbol_start Class
+        sequence_96
+        $myparser si:reduce_symbol_end Class
+        return
+    }
+    
+    proc sequence_96 {} { upvar 1 myparser myparser
+        # x
+        #     (OPENB)
+        #     *
+        #         x
+        #             !
+        #                 (CLOSEB)
+        #             (Range)
+        #     (CLOSEB)
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        sym_OPENB
+        $myparser si:voidvalue_part
+        kleene_92
+        $myparser si:valuevalue_part
+        sym_CLOSEB
+        $myparser si:valuevalue_part
+        sym_WHITESPACE
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc kleene_92 {} { upvar 1 myparser myparser
+        # *
+        #     x
+        #         !
+        #             (CLOSEB)
+        #         (Range)
+    
+        while {1} {
+            $myparser si:void2_state_push
+        sequence_90
+            $myparser si:kleene_close
+        }
+        return
+    }
+    
+    proc sequence_90 {} { upvar 1 myparser myparser
+        # x
+        #     !
+        #         (CLOSEB)
+        #     (Range)
+    
+        $myparser si:void_state_push
+        notahead_87
+        $myparser si:voidvalue_part
+        sym_Range
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc notahead_87 {} { upvar 1 myparser myparser
+        # !
+        #     (CLOSEB)
+    
+        $myparser i_loc_push
+        sym_CLOSEB
+        $myparser si:void_notahead_exit
+        return
+    }
+    
+    #
+    # void Symbol 'CLOSE'
+    #
+    
+    proc sym_CLOSE {} { upvar 1 myparser myparser
+        # x
+        #     '\)'
+        #     (WHITESPACE)
+    
+        $myparser si:void_void_symbol_start CLOSE
+        sequence_101
+        $myparser si:void_clear_symbol_end CLOSE
+        return
+    }
+    
+    proc sequence_101 {} { upvar 1 myparser myparser
+        # x
+        #     '\)'
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char \51
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # void Symbol 'CLOSEB'
+    #
+    
+    proc sym_CLOSEB {} { upvar 1 myparser myparser
+        # ']'
+    
+        $myparser si:void_void_symbol_start CLOSEB
+        $myparser si:next_char \135
+        $myparser si:void_clear_symbol_end CLOSEB
+        return
+    }
+    
+    #
+    # void Symbol 'COLON'
+    #
+    
+    proc sym_COLON {} { upvar 1 myparser myparser
+        # x
+        #     ':'
+        #     (WHITESPACE)
+    
+        $myparser si:void_void_symbol_start COLON
+        sequence_108
+        $myparser si:void_clear_symbol_end COLON
+        return
+    }
+    
+    proc sequence_108 {} { upvar 1 myparser myparser
+        # x
+        #     ':'
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char :
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # void Symbol 'COMMENT'
+    #
+    
+    proc sym_COMMENT {} { upvar 1 myparser myparser
+        # x
+        #     '#'
+        #     *
+        #         x
+        #             !
+        #                 (EOL)
+        #             <dot>
+        #     (EOL)
+    
+        $myparser si:void_void_symbol_start COMMENT
+        sequence_121
+        $myparser si:void_clear_symbol_end COMMENT
+        return
+    }
+    
+    proc sequence_121 {} { upvar 1 myparser myparser
+        # x
+        #     '#'
+        #     *
+        #         x
+        #             !
+        #                 (EOL)
+        #             <dot>
+        #     (EOL)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char #
+        $myparser si:voidvoid_part
+        kleene_118
+        $myparser si:voidvoid_part
+        sym_EOL
+        $myparser si:void_state_merge
+        return
+    }
+    
+    proc kleene_118 {} { upvar 1 myparser myparser
+        # *
+        #     x
+        #         !
+        #             (EOL)
+        #         <dot>
+    
+        while {1} {
+            $myparser si:void2_state_push
+        sequence_116
+            $myparser si:kleene_close
+        }
+        return
+    }
+    
+    proc sequence_116 {} { upvar 1 myparser myparser
+        # x
+        #     !
+        #         (EOL)
+        #     <dot>
+    
+        $myparser si:void_state_push
+        notahead_113
+        $myparser si:voidvoid_part
+        $myparser i_input_next dot
+        $myparser si:void_state_merge
+        return
+    }
+    
+    proc notahead_113 {} { upvar 1 myparser myparser
+        # !
+        #     (EOL)
+    
+        $myparser i_loc_push
+        sym_EOL
+        $myparser si:void_notahead_exit
+        return
+    }
+    
+    #
+    # leaf Symbol 'CONTROL'
+    #
+    
+    proc sym_CONTROL {} { upvar 1 myparser myparser
+        # x
+        #     "<control>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start CONTROL
+        sequence_126
+        $myparser si:void_leaf_symbol_end CONTROL
+        return
+    }
+    
+    proc sequence_126 {} { upvar 1 myparser myparser
+        # x
+        #     "<control>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <control>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # void Symbol 'DAPOSTROPH'
+    #
+    
+    proc sym_DAPOSTROPH {} { upvar 1 myparser myparser
+        # '\"'
+    
+        $myparser si:void_void_symbol_start DAPOSTROPH
+        $myparser si:next_char \42
+        $myparser si:void_clear_symbol_end DAPOSTROPH
+        return
+    }
+    
+    #
+    # leaf Symbol 'DDIGIT'
+    #
+    
+    proc sym_DDIGIT {} { upvar 1 myparser myparser
+        # x
+        #     "<ddigit>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start DDIGIT
+        sequence_133
+        $myparser si:void_leaf_symbol_end DDIGIT
+        return
+    }
+    
+    proc sequence_133 {} { upvar 1 myparser myparser
+        # x
+        #     "<ddigit>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <ddigit>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # value Symbol 'Definition'
+    #
+    
+    proc sym_Definition {} { upvar 1 myparser myparser
+        # x
+        #     ?
+        #         (Attribute)
+        #     (Identifier)
+        #     (IS)
+        #     (Expression)
+        #     (SEMICOLON)
+    
+        $myparser si:value_symbol_start Definition
+        sequence_143
+        $myparser si:reduce_symbol_end Definition
+        return
+    }
+    
+    proc sequence_143 {} { upvar 1 myparser myparser
+        # x
+        #     ?
+        #         (Attribute)
+        #     (Identifier)
+        #     (IS)
+        #     (Expression)
+        #     (SEMICOLON)
+    
+        $myparser si:value_state_push
+        optional_137
+        $myparser si:valuevalue_part
+        sym_Identifier
+        $myparser si:valuevalue_part
+        sym_IS
+        $myparser si:valuevalue_part
+        sym_Expression
+        $myparser si:valuevalue_part
+        sym_SEMICOLON
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc optional_137 {} { upvar 1 myparser myparser
+        # ?
+        #     (Attribute)
+    
+        $myparser si:void2_state_push
+        sym_Attribute
+        $myparser si:void_state_merge_ok
+        return
+    }
+    
+    #
+    # leaf Symbol 'DIGIT'
+    #
+    
+    proc sym_DIGIT {} { upvar 1 myparser myparser
+        # x
+        #     "<digit>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start DIGIT
+        sequence_148
+        $myparser si:void_leaf_symbol_end DIGIT
+        return
+    }
+    
+    proc sequence_148 {} { upvar 1 myparser myparser
+        # x
+        #     "<digit>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <digit>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'DOT'
+    #
+    
+    proc sym_DOT {} { upvar 1 myparser myparser
+        # x
+        #     '.'
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start DOT
+        sequence_153
+        $myparser si:void_leaf_symbol_end DOT
+        return
+    }
+    
+    proc sequence_153 {} { upvar 1 myparser myparser
+        # x
+        #     '.'
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char .
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # void Symbol 'EOF'
+    #
+    
+    proc sym_EOF {} { upvar 1 myparser myparser
+        # !
+        #     <dot>
+    
+        $myparser si:void_void_symbol_start EOF
+        notahead_157
+        $myparser si:void_clear_symbol_end EOF
+        return
+    }
+    
+    proc notahead_157 {} { upvar 1 myparser myparser
+        # !
+        #     <dot>
+    
+        $myparser i_loc_push
+        $myparser i_input_next dot
+        $myparser si:void_notahead_exit
+        return
+    }
+    
+    #
+    # void Symbol 'EOL'
+    #
+    
+    proc sym_EOL {} { upvar 1 myparser myparser
+        # [\n\r]
+    
+        $myparser si:void_void_symbol_start EOL
+        $myparser si:next_class \n\r
+        $myparser si:void_clear_symbol_end EOL
+        return
+    }
+    
+    #
+    # value Symbol 'Expression'
+    #
+    
+    proc sym_Expression {} { upvar 1 myparser myparser
+        # x
+        #     (Sequence)
+        #     *
+        #         x
+        #             (SLASH)
+        #             (Sequence)
+    
+        $myparser si:value_symbol_start Expression
+        sequence_169
+        $myparser si:reduce_symbol_end Expression
+        return
+    }
+    
+    proc sequence_169 {} { upvar 1 myparser myparser
+        # x
+        #     (Sequence)
+        #     *
+        #         x
+        #             (SLASH)
+        #             (Sequence)
+    
+        $myparser si:value_state_push
+        sym_Sequence
+        $myparser si:valuevalue_part
+        kleene_167
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc kleene_167 {} { upvar 1 myparser myparser
+        # *
+        #     x
+        #         (SLASH)
+        #         (Sequence)
+    
+        while {1} {
+            $myparser si:void2_state_push
+        sequence_165
+            $myparser si:kleene_close
+        }
+        return
+    }
+    
+    proc sequence_165 {} { upvar 1 myparser myparser
+        # x
+        #     (SLASH)
+        #     (Sequence)
+    
+        $myparser si:void_state_push
+        sym_SLASH
+        $myparser si:voidvalue_part
+        sym_Sequence
+        $myparser si:value_state_merge
+        return
+    }
+    
+    #
+    # void Symbol 'Final'
+    #
+    
+    proc sym_Final {} { upvar 1 myparser myparser
+        # x
+        #     "END"
+        #     (WHITESPACE)
+        #     (SEMICOLON)
+        #     (WHITESPACE)
+    
+        $myparser si:void_void_symbol_start Final
+        sequence_176
+        $myparser si:void_clear_symbol_end Final
+        return
+    }
+    
+    proc sequence_176 {} { upvar 1 myparser myparser
+        # x
+        #     "END"
+        #     (WHITESPACE)
+        #     (SEMICOLON)
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str END
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:voidvoid_part
+        sym_SEMICOLON
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # value Symbol 'Grammar'
+    #
+    
+    proc sym_Grammar {} { upvar 1 myparser myparser
+        # x
+        #     (WHITESPACE)
+        #     (Header)
+        #     *
+        #         (Definition)
+        #     (Final)
+        #     (EOF)
+    
+        $myparser si:value_symbol_start Grammar
+        sequence_186
+        $myparser si:reduce_symbol_end Grammar
+        return
+    }
+    
+    proc sequence_186 {} { upvar 1 myparser myparser
+        # x
+        #     (WHITESPACE)
+        #     (Header)
+        #     *
+        #         (Definition)
+        #     (Final)
+        #     (EOF)
+    
+        $myparser si:void_state_push
+        sym_WHITESPACE
+        $myparser si:voidvalue_part
+        sym_Header
+        $myparser si:valuevalue_part
+        kleene_182
+        $myparser si:valuevalue_part
+        sym_Final
+        $myparser si:valuevalue_part
+        sym_EOF
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc kleene_182 {} { upvar 1 myparser myparser
+        # *
+        #     (Definition)
+    
+        while {1} {
+            $myparser si:void2_state_push
+        sym_Definition
+            $myparser si:kleene_close
+        }
+        return
+    }
+    
+    #
+    # leaf Symbol 'GRAPH'
+    #
+    
+    proc sym_GRAPH {} { upvar 1 myparser myparser
+        # x
+        #     "<graph>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start GRAPH
+        sequence_191
+        $myparser si:void_leaf_symbol_end GRAPH
+        return
+    }
+    
+    proc sequence_191 {} { upvar 1 myparser myparser
+        # x
+        #     "<graph>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <graph>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # value Symbol 'Header'
+    #
+    
+    proc sym_Header {} { upvar 1 myparser myparser
+        # x
+        #     (PEG)
+        #     (Identifier)
+        #     (StartExpr)
+    
+        $myparser si:value_symbol_start Header
+        sequence_197
+        $myparser si:reduce_symbol_end Header
+        return
+    }
+    
+    proc sequence_197 {} { upvar 1 myparser myparser
+        # x
+        #     (PEG)
+        #     (Identifier)
+        #     (StartExpr)
+    
+        $myparser si:void_state_push
+        sym_PEG
+        $myparser si:voidvalue_part
+        sym_Identifier
+        $myparser si:valuevalue_part
+        sym_StartExpr
+        $myparser si:value_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'Ident'
+    #
+    
+    proc sym_Ident {} { upvar 1 myparser myparser
+        # x
+        #     /
+        #         [_:]
+        #         <alpha>
+        #     *
+        #         /
+        #             [_:]
+        #             <alnum>
+    
+        $myparser si:void_symbol_start Ident
+        sequence_210
+        $myparser si:void_leaf_symbol_end Ident
+        return
+    }
+    
+    proc sequence_210 {} { upvar 1 myparser myparser
+        # x
+        #     /
+        #         [_:]
+        #         <alpha>
+        #     *
+        #         /
+        #             [_:]
+        #             <alnum>
+    
+        $myparser si:void_state_push
+        choice_202
+        $myparser si:voidvoid_part
+        kleene_208
+        $myparser si:void_state_merge
+        return
+    }
+    
+    proc choice_202 {} { upvar 1 myparser myparser
+        # /
+        #     [_:]
+        #     <alpha>
+    
+        $myparser si:void_state_push
+        $myparser si:next_class _:
+        $myparser si:voidvoid_branch
+        $myparser si:next_alpha
+        $myparser si:void_state_merge
+        return
+    }
+    
+    proc kleene_208 {} { upvar 1 myparser myparser
+        # *
+        #     /
+        #         [_:]
+        #         <alnum>
+    
+        while {1} {
+            $myparser si:void2_state_push
+        choice_206
+            $myparser si:kleene_close
+        }
+        return
+    }
+    
+    proc choice_206 {} { upvar 1 myparser myparser
+        # /
+        #     [_:]
+        #     <alnum>
+    
+        $myparser si:void_state_push
+        $myparser si:next_class _:
+        $myparser si:voidvoid_branch
+        $myparser si:next_alnum
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # value Symbol 'Identifier'
+    #
+    
+    proc sym_Identifier {} { upvar 1 myparser myparser
+        # x
+        #     (Ident)
+        #     (WHITESPACE)
+    
+        $myparser si:value_symbol_start Identifier
+        sequence_215
+        $myparser si:reduce_symbol_end Identifier
+        return
+    }
+    
+    proc sequence_215 {} { upvar 1 myparser myparser
+        # x
+        #     (Ident)
+        #     (WHITESPACE)
+    
+        $myparser si:value_state_push
+        sym_Ident
+        $myparser si:valuevalue_part
+        sym_WHITESPACE
+        $myparser si:value_state_merge
+        return
+    }
+    
+    #
+    # void Symbol 'IS'
+    #
+    
+    proc sym_IS {} { upvar 1 myparser myparser
+        # x
+        #     "<-"
+        #     (WHITESPACE)
+    
+        $myparser si:void_void_symbol_start IS
+        sequence_220
+        $myparser si:void_clear_symbol_end IS
+        return
+    }
+    
+    proc sequence_220 {} { upvar 1 myparser myparser
+        # x
+        #     "<-"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <-
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'LEAF'
+    #
+    
+    proc sym_LEAF {} { upvar 1 myparser myparser
+        # x
+        #     "leaf"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start LEAF
+        sequence_225
+        $myparser si:void_leaf_symbol_end LEAF
+        return
+    }
+    
+    proc sequence_225 {} { upvar 1 myparser myparser
+        # x
+        #     "leaf"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str leaf
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # value Symbol 'Literal'
+    #
+    
+    proc sym_Literal {} { upvar 1 myparser myparser
+        # /
+        #     x
+        #         (APOSTROPH)
+        #         *
+        #             x
+        #                 !
+        #                     (APOSTROPH)
+        #                 (Char)
+        #         (APOSTROPH)
+        #         (WHITESPACE)
+        #     x
+        #         (DAPOSTROPH)
+        #         *
+        #             x
+        #                 !
+        #                     (DAPOSTROPH)
+        #                 (Char)
+        #         (DAPOSTROPH)
+        #         (WHITESPACE)
+    
+        $myparser si:value_symbol_start Literal
+        choice_254
+        $myparser si:reduce_symbol_end Literal
+        return
+    }
+    
+    proc choice_254 {} { upvar 1 myparser myparser
+        # /
+        #     x
+        #         (APOSTROPH)
+        #         *
+        #             x
+        #                 !
+        #                     (APOSTROPH)
+        #                 (Char)
+        #         (APOSTROPH)
+        #         (WHITESPACE)
+        #     x
+        #         (DAPOSTROPH)
+        #         *
+        #             x
+        #                 !
+        #                     (DAPOSTROPH)
+        #                 (Char)
+        #         (DAPOSTROPH)
+        #         (WHITESPACE)
+    
+        $myparser si:value_state_push
+        sequence_239
+        $myparser si:valuevalue_branch
+        sequence_252
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc sequence_239 {} { upvar 1 myparser myparser
+        # x
+        #     (APOSTROPH)
+        #     *
+        #         x
+        #             !
+        #                 (APOSTROPH)
+        #             (Char)
+        #     (APOSTROPH)
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        sym_APOSTROPH
+        $myparser si:voidvalue_part
+        kleene_235
+        $myparser si:valuevalue_part
+        sym_APOSTROPH
+        $myparser si:valuevalue_part
+        sym_WHITESPACE
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc kleene_235 {} { upvar 1 myparser myparser
+        # *
+        #     x
+        #         !
+        #             (APOSTROPH)
+        #         (Char)
+    
+        while {1} {
+            $myparser si:void2_state_push
+        sequence_233
+            $myparser si:kleene_close
+        }
+        return
+    }
+    
+    proc sequence_233 {} { upvar 1 myparser myparser
+        # x
+        #     !
+        #         (APOSTROPH)
+        #     (Char)
+    
+        $myparser si:void_state_push
+        notahead_230
+        $myparser si:voidvalue_part
+        sym_Char
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc notahead_230 {} { upvar 1 myparser myparser
+        # !
+        #     (APOSTROPH)
+    
+        $myparser i_loc_push
+        sym_APOSTROPH
+        $myparser si:void_notahead_exit
+        return
+    }
+    
+    proc sequence_252 {} { upvar 1 myparser myparser
+        # x
+        #     (DAPOSTROPH)
+        #     *
+        #         x
+        #             !
+        #                 (DAPOSTROPH)
+        #             (Char)
+        #     (DAPOSTROPH)
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        sym_DAPOSTROPH
+        $myparser si:voidvalue_part
+        kleene_248
+        $myparser si:valuevalue_part
+        sym_DAPOSTROPH
+        $myparser si:valuevalue_part
+        sym_WHITESPACE
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc kleene_248 {} { upvar 1 myparser myparser
+        # *
+        #     x
+        #         !
+        #             (DAPOSTROPH)
+        #         (Char)
+    
+        while {1} {
+            $myparser si:void2_state_push
+        sequence_246
+            $myparser si:kleene_close
+        }
+        return
+    }
+    
+    proc sequence_246 {} { upvar 1 myparser myparser
+        # x
+        #     !
+        #         (DAPOSTROPH)
+        #     (Char)
+    
+        $myparser si:void_state_push
+        notahead_243
+        $myparser si:voidvalue_part
+        sym_Char
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc notahead_243 {} { upvar 1 myparser myparser
+        # !
+        #     (DAPOSTROPH)
+    
+        $myparser i_loc_push
+        sym_DAPOSTROPH
+        $myparser si:void_notahead_exit
+        return
+    }
+    
+    #
+    # leaf Symbol 'LOWER'
+    #
+    
+    proc sym_LOWER {} { upvar 1 myparser myparser
+        # x
+        #     "<lower>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start LOWER
+        sequence_259
+        $myparser si:void_leaf_symbol_end LOWER
+        return
+    }
+    
+    proc sequence_259 {} { upvar 1 myparser myparser
+        # x
+        #     "<lower>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <lower>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'NOT'
+    #
+    
+    proc sym_NOT {} { upvar 1 myparser myparser
+        # x
+        #     '!'
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start NOT
+        sequence_264
+        $myparser si:void_leaf_symbol_end NOT
+        return
+    }
+    
+    proc sequence_264 {} { upvar 1 myparser myparser
+        # x
+        #     '!'
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char !
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # void Symbol 'OPEN'
+    #
+    
+    proc sym_OPEN {} { upvar 1 myparser myparser
+        # x
+        #     '\('
+        #     (WHITESPACE)
+    
+        $myparser si:void_void_symbol_start OPEN
+        sequence_269
+        $myparser si:void_clear_symbol_end OPEN
+        return
+    }
+    
+    proc sequence_269 {} { upvar 1 myparser myparser
+        # x
+        #     '\('
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char \50
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # void Symbol 'OPENB'
+    #
+    
+    proc sym_OPENB {} { upvar 1 myparser myparser
+        # '['
+    
+        $myparser si:void_void_symbol_start OPENB
+        $myparser si:next_char \133
+        $myparser si:void_clear_symbol_end OPENB
+        return
+    }
+    
+    #
+    # void Symbol 'PEG'
+    #
+    
+    proc sym_PEG {} { upvar 1 myparser myparser
+        # x
+        #     "PEG"
+        #     !
+        #         /
+        #             [_:]
+        #             <alnum>
+        #     (WHITESPACE)
+    
+        $myparser si:void_void_symbol_start PEG
+        sequence_281
+        $myparser si:void_clear_symbol_end PEG
+        return
+    }
+    
+    proc sequence_281 {} { upvar 1 myparser myparser
+        # x
+        #     "PEG"
+        #     !
+        #         /
+        #             [_:]
+        #             <alnum>
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str PEG
+        $myparser si:voidvoid_part
+        notahead_278
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    proc notahead_278 {} { upvar 1 myparser myparser
+        # !
+        #     /
+        #         [_:]
+        #         <alnum>
+    
+        $myparser i_loc_push
+        choice_206
+        $myparser si:void_notahead_exit
+        return
+    }
+    
+    #
+    # leaf Symbol 'PLUS'
+    #
+    
+    proc sym_PLUS {} { upvar 1 myparser myparser
+        # x
+        #     '+'
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start PLUS
+        sequence_286
+        $myparser si:void_leaf_symbol_end PLUS
+        return
+    }
+    
+    proc sequence_286 {} { upvar 1 myparser myparser
+        # x
+        #     '+'
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char +
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # value Symbol 'Prefix'
+    #
+    
+    proc sym_Prefix {} { upvar 1 myparser myparser
+        # x
+        #     ?
+        #         /
+        #             (AND)
+        #             (NOT)
+        #     (Suffix)
+    
+        $myparser si:value_symbol_start Prefix
+        sequence_296
+        $myparser si:reduce_symbol_end Prefix
+        return
+    }
+    
+    proc sequence_296 {} { upvar 1 myparser myparser
+        # x
+        #     ?
+        #         /
+        #             (AND)
+        #             (NOT)
+        #     (Suffix)
+    
+        $myparser si:value_state_push
+        optional_293
+        $myparser si:valuevalue_part
+        sym_Suffix
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc optional_293 {} { upvar 1 myparser myparser
+        # ?
+        #     /
+        #         (AND)
+        #         (NOT)
+    
+        $myparser si:void2_state_push
+        choice_291
+        $myparser si:void_state_merge_ok
+        return
+    }
+    
+    proc choice_291 {} { upvar 1 myparser myparser
+        # /
+        #     (AND)
+        #     (NOT)
+    
+        $myparser si:value_state_push
+        sym_AND
+        $myparser si:valuevalue_branch
+        sym_NOT
+        $myparser si:value_state_merge
+        return
+    }
+    
+    #
+    # value Symbol 'Primary'
+    #
+    
+    proc sym_Primary {} { upvar 1 myparser myparser
+        # /
+        #     (ALNUM)
+        #     (ALPHA)
+        #     (ASCII)
+        #     (CONTROL)
+        #     (DDIGIT)
+        #     (DIGIT)
+        #     (GRAPH)
+        #     (LOWER)
+        #     (PRINTABLE)
+        #     (PUNCT)
+        #     (SPACE)
+        #     (UPPER)
+        #     (WORDCHAR)
+        #     (XDIGIT)
+        #     (Identifier)
+        #     x
+        #         (OPEN)
+        #         (Expression)
+        #         (CLOSE)
+        #     (Literal)
+        #     (Class)
+        #     (DOT)
+    
+        $myparser si:value_symbol_start Primary
+        choice_322
+        $myparser si:reduce_symbol_end Primary
+        return
+    }
+    
+    proc choice_322 {} { upvar 1 myparser myparser
+        # /
+        #     (ALNUM)
+        #     (ALPHA)
+        #     (ASCII)
+        #     (CONTROL)
+        #     (DDIGIT)
+        #     (DIGIT)
+        #     (GRAPH)
+        #     (LOWER)
+        #     (PRINTABLE)
+        #     (PUNCT)
+        #     (SPACE)
+        #     (UPPER)
+        #     (WORDCHAR)
+        #     (XDIGIT)
+        #     (Identifier)
+        #     x
+        #         (OPEN)
+        #         (Expression)
+        #         (CLOSE)
+        #     (Literal)
+        #     (Class)
+        #     (DOT)
+    
+        $myparser si:value_state_push
+        sym_ALNUM
+        $myparser si:valuevalue_branch
+        sym_ALPHA
+        $myparser si:valuevalue_branch
+        sym_ASCII
+        $myparser si:valuevalue_branch
+        sym_CONTROL
+        $myparser si:valuevalue_branch
+        sym_DDIGIT
+        $myparser si:valuevalue_branch
+        sym_DIGIT
+        $myparser si:valuevalue_branch
+        sym_GRAPH
+        $myparser si:valuevalue_branch
+        sym_LOWER
+        $myparser si:valuevalue_branch
+        sym_PRINTABLE
+        $myparser si:valuevalue_branch
+        sym_PUNCT
+        $myparser si:valuevalue_branch
+        sym_SPACE
+        $myparser si:valuevalue_branch
+        sym_UPPER
+        $myparser si:valuevalue_branch
+        sym_WORDCHAR
+        $myparser si:valuevalue_branch
+        sym_XDIGIT
+        $myparser si:valuevalue_branch
+        sym_Identifier
+        $myparser si:valuevalue_branch
+        sequence_317
+        $myparser si:valuevalue_branch
+        sym_Literal
+        $myparser si:valuevalue_branch
+        sym_Class
+        $myparser si:valuevalue_branch
+        sym_DOT
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc sequence_317 {} { upvar 1 myparser myparser
+        # x
+        #     (OPEN)
+        #     (Expression)
+        #     (CLOSE)
+    
+        $myparser si:void_state_push
+        sym_OPEN
+        $myparser si:voidvalue_part
+        sym_Expression
+        $myparser si:valuevalue_part
+        sym_CLOSE
+        $myparser si:value_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'PRINTABLE'
+    #
+    
+    proc sym_PRINTABLE {} { upvar 1 myparser myparser
+        # x
+        #     "<print>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start PRINTABLE
+        sequence_327
+        $myparser si:void_leaf_symbol_end PRINTABLE
+        return
+    }
+    
+    proc sequence_327 {} { upvar 1 myparser myparser
+        # x
+        #     "<print>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <print>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'PUNCT'
+    #
+    
+    proc sym_PUNCT {} { upvar 1 myparser myparser
+        # x
+        #     "<punct>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start PUNCT
+        sequence_332
+        $myparser si:void_leaf_symbol_end PUNCT
+        return
+    }
+    
+    proc sequence_332 {} { upvar 1 myparser myparser
+        # x
+        #     "<punct>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <punct>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'QUESTION'
+    #
+    
+    proc sym_QUESTION {} { upvar 1 myparser myparser
+        # x
+        #     '?'
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start QUESTION
+        sequence_337
+        $myparser si:void_leaf_symbol_end QUESTION
+        return
+    }
+    
+    proc sequence_337 {} { upvar 1 myparser myparser
+        # x
+        #     '?'
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char ?
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # value Symbol 'Range'
+    #
+    
+    proc sym_Range {} { upvar 1 myparser myparser
+        # /
+        #     x
+        #         (Char)
+        #         (TO)
+        #         (Char)
+        #     (Char)
+    
+        $myparser si:value_symbol_start Range
+        choice_346
+        $myparser si:reduce_symbol_end Range
+        return
+    }
+    
+    proc choice_346 {} { upvar 1 myparser myparser
+        # /
+        #     x
+        #         (Char)
+        #         (TO)
+        #         (Char)
+        #     (Char)
+    
+        $myparser si:value_state_push
+        sequence_343
+        $myparser si:valuevalue_branch
+        sym_Char
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc sequence_343 {} { upvar 1 myparser myparser
+        # x
+        #     (Char)
+        #     (TO)
+        #     (Char)
+    
+        $myparser si:value_state_push
+        sym_Char
+        $myparser si:valuevalue_part
+        sym_TO
+        $myparser si:valuevalue_part
+        sym_Char
+        $myparser si:value_state_merge
+        return
+    }
+    
+    #
+    # void Symbol 'SEMICOLON'
+    #
+    
+    proc sym_SEMICOLON {} { upvar 1 myparser myparser
+        # x
+        #     ';'
+        #     (WHITESPACE)
+    
+        $myparser si:void_void_symbol_start SEMICOLON
+        sequence_351
+        $myparser si:void_clear_symbol_end SEMICOLON
+        return
+    }
+    
+    proc sequence_351 {} { upvar 1 myparser myparser
+        # x
+        #     ';'
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char \73
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # value Symbol 'Sequence'
+    #
+    
+    proc sym_Sequence {} { upvar 1 myparser myparser
+        # +
+        #     (Prefix)
+    
+        $myparser si:value_symbol_start Sequence
+        poskleene_355
+        $myparser si:reduce_symbol_end Sequence
+        return
+    }
+    
+    proc poskleene_355 {} { upvar 1 myparser myparser
+        # +
+        #     (Prefix)
+    
+        $myparser i_loc_push
+        sym_Prefix
+        $myparser si:kleene_abort
+        while {1} {
+            $myparser si:void2_state_push
+        sym_Prefix
+            $myparser si:kleene_close
+        }
+        return
+    }
+    
+    #
+    # void Symbol 'SLASH'
+    #
+    
+    proc sym_SLASH {} { upvar 1 myparser myparser
+        # x
+        #     '/'
+        #     (WHITESPACE)
+    
+        $myparser si:void_void_symbol_start SLASH
+        sequence_360
+        $myparser si:void_clear_symbol_end SLASH
+        return
+    }
+    
+    proc sequence_360 {} { upvar 1 myparser myparser
+        # x
+        #     '/'
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char /
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'SPACE'
+    #
+    
+    proc sym_SPACE {} { upvar 1 myparser myparser
+        # x
+        #     "<space>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start SPACE
+        sequence_365
+        $myparser si:void_leaf_symbol_end SPACE
+        return
+    }
+    
+    proc sequence_365 {} { upvar 1 myparser myparser
+        # x
+        #     "<space>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <space>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'STAR'
+    #
+    
+    proc sym_STAR {} { upvar 1 myparser myparser
+        # x
+        #     '*'
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start STAR
+        sequence_370
+        $myparser si:void_leaf_symbol_end STAR
+        return
+    }
+    
+    proc sequence_370 {} { upvar 1 myparser myparser
+        # x
+        #     '*'
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_char *
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # value Symbol 'StartExpr'
+    #
+    
+    proc sym_StartExpr {} { upvar 1 myparser myparser
+        # x
+        #     (OPEN)
+        #     (Expression)
+        #     (CLOSE)
+    
+        $myparser si:value_symbol_start StartExpr
+        sequence_317
+        $myparser si:reduce_symbol_end StartExpr
+        return
+    }
+    
+    #
+    # value Symbol 'Suffix'
+    #
+    
+    proc sym_Suffix {} { upvar 1 myparser myparser
+        # x
+        #     (Primary)
+        #     ?
+        #         /
+        #             (QUESTION)
+        #             (STAR)
+        #             (PLUS)
+    
+        $myparser si:value_symbol_start Suffix
+        sequence_386
+        $myparser si:reduce_symbol_end Suffix
+        return
+    }
+    
+    proc sequence_386 {} { upvar 1 myparser myparser
+        # x
+        #     (Primary)
+        #     ?
+        #         /
+        #             (QUESTION)
+        #             (STAR)
+        #             (PLUS)
+    
+        $myparser si:value_state_push
+        sym_Primary
+        $myparser si:valuevalue_part
+        optional_384
+        $myparser si:value_state_merge
+        return
+    }
+    
+    proc optional_384 {} { upvar 1 myparser myparser
+        # ?
+        #     /
+        #         (QUESTION)
+        #         (STAR)
+        #         (PLUS)
+    
+        $myparser si:void2_state_push
+        choice_382
+        $myparser si:void_state_merge_ok
+        return
+    }
+    
+    proc choice_382 {} { upvar 1 myparser myparser
+        # /
+        #     (QUESTION)
+        #     (STAR)
+        #     (PLUS)
+    
+        $myparser si:value_state_push
+        sym_QUESTION
+        $myparser si:valuevalue_branch
+        sym_STAR
+        $myparser si:valuevalue_branch
+        sym_PLUS
+        $myparser si:value_state_merge
+        return
+    }
+    
+    #
+    # void Symbol 'TO'
+    #
+    
+    proc sym_TO {} { upvar 1 myparser myparser
+        # '-'
+    
+        $myparser si:void_void_symbol_start TO
+        $myparser si:next_char -
+        $myparser si:void_clear_symbol_end TO
+        return
+    }
+    
+    #
+    # leaf Symbol 'UPPER'
+    #
+    
+    proc sym_UPPER {} { upvar 1 myparser myparser
+        # x
+        #     "<upper>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start UPPER
+        sequence_393
+        $myparser si:void_leaf_symbol_end UPPER
+        return
+    }
+    
+    proc sequence_393 {} { upvar 1 myparser myparser
+        # x
+        #     "<upper>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <upper>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'VOID'
+    #
+    
+    proc sym_VOID {} { upvar 1 myparser myparser
+        # x
+        #     "void"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start VOID
+        sequence_398
+        $myparser si:void_leaf_symbol_end VOID
+        return
+    }
+    
+    proc sequence_398 {} { upvar 1 myparser myparser
+        # x
+        #     "void"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str void
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # void Symbol 'WHITESPACE'
+    #
+    
+    proc sym_WHITESPACE {} { upvar 1 myparser myparser
+        # *
+        #     /
+        #         <space>
+        #         (COMMENT)
+    
+        $myparser si:void_void_symbol_start WHITESPACE
+        kleene_405
+        $myparser si:void_clear_symbol_end WHITESPACE
+        return
+    }
+    
+    proc kleene_405 {} { upvar 1 myparser myparser
+        # *
+        #     /
+        #         <space>
+        #         (COMMENT)
+    
+        while {1} {
+            $myparser si:void2_state_push
+        choice_403
+            $myparser si:kleene_close
+        }
+        return
+    }
+    
+    proc choice_403 {} { upvar 1 myparser myparser
+        # /
+        #     <space>
+        #     (COMMENT)
+    
+        $myparser si:void_state_push
+        $myparser si:next_space
+        $myparser si:voidvoid_branch
+        sym_COMMENT
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'WORDCHAR'
+    #
+    
+    proc sym_WORDCHAR {} { upvar 1 myparser myparser
+        # x
+        #     "<wordchar>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start WORDCHAR
+        sequence_410
+        $myparser si:void_leaf_symbol_end WORDCHAR
+        return
+    }
+    
+    proc sequence_410 {} { upvar 1 myparser myparser
+        # x
+        #     "<wordchar>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <wordchar>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    #
+    # leaf Symbol 'XDIGIT'
+    #
+    
+    proc sym_XDIGIT {} { upvar 1 myparser myparser
+        # x
+        #     "<xdigit>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_symbol_start XDIGIT
+        sequence_415
+        $myparser si:void_leaf_symbol_end XDIGIT
+        return
+    }
+    
+    proc sequence_415 {} { upvar 1 myparser myparser
+        # x
+        #     "<xdigit>"
+        #     (WHITESPACE)
+    
+        $myparser si:void_state_push
+        $myparser si:next_str <xdigit>
+        $myparser si:voidvoid_part
+        sym_WHITESPACE
+        $myparser si:void_state_merge
+        return
+    }
+    
+    ## END of GENERATED CODE. DO NOT EDIT.
+    # # ## ### ###### ######## #############
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide pt::parse::peg_tcl 1.0.1
+return
\ No newline at end of file
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_container.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_container.tcl
new file mode 100644
index 00000000..96915b67
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_container.tcl
@@ -0,0 +1,530 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2009 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Grammars / Parsing Expression Grammars / Container
+
+# ### ### ### ######### ######### #########
+## Package description
+
+# A class whose instances hold all the information describing a single
+# parsing expression grammar (terminal symbols, nonterminal symbols,
+# nonterminal rules, start expression, parsing hints (called 'mode')),
+# and operations to define, manipulate, and query this information.
+#
+# Note that the container provides no higher-level operations on the
+# grammar, like the removal of unreachable nonterminals, rule
+# rewriting, etc.
+#
+# The set of terminal symbols is the set of characters (i.e.
+# implicitly defined). For Tcl this means that all the unicode
+# characters are supported.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require snit               ; # Tcllib | OO system used
+package require pt::pe             ; # PE serialization
+package require pt::peg ; # PEG serialization
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::pt::peg::container {
+    # Concepts:
+    # - A parsing expression grammar consists of a start (parsing)
+    #   expression, and a set of nonterminal symbol with their
+    #   definitions.
+    # - The definition of each nonterminal symbol consists of its
+    #   name, semantic made, and sentennial structure, the latter
+    #   provided by a parsing expression.
+    # - The nonterminal symbols are identified by their name, and each
+    #   can occur at most once.
+
+    # ### ### ### ######### ######### #########
+    ## Options
+
+    ## None
+
+    # ### ### ### ######### ######### #########
+    ## Instance API
+
+    constructor {args} {}
+
+    # Bulk deletion.
+    method clear {} {}
+
+    # Bulk copying.
+    method =                {source}           {} ; # Assign contents
+						    # of source object
+						    # to us.
+    method -->              {destination}      {} ; # Assign our
+						    # contents to the
+						    # destination
+						    # object.
+    method serialize        {{format {}}}      {} ; # Return our
+						    # contents in the
+						    # specified format
+						    # (By default the
+						    # canonical
+						    # serialization).
+    method {deserialize =}  {data {format {}}} {} ; # Assign contents
+						    # in format to us
+						    # (By default a
+						    # regular
+						    # serialization).
+    method {deserialize +=} {data {format {}}} {} ; # Add contents in
+						    # format to us (By
+						    # default a
+						    # regular
+						    # serialization).
+
+    # Bulk queries
+    method nonterminals {}          {} ; # Return set of known symbols
+    method modes        {{dict {}}} {} ; # Query/set dict (sym -> mode)
+    method rules        {{dict {}}} {} ; # Query/set dict (sym -> rhs)
+
+    # Start expression
+    method start {{pe {}}} {} ; # Query/set start expression.
+
+    # Non-terminal manipulation and querying
+    method add    {args}         {} ; # Add new nonterminals, default
+				      # rhs and modes.
+    method remove {args}         {} ; # Remove nonterminals, and
+				      # associated data.
+    method exists {nt}           {} ; # Check if nonterminal is known.
+    method rename {nt ntnew}     {} ; # Rename a nonterminal
+    method mode   {nt {mode {}}} {} ; # Query/set nonterminal mode
+    method rule   {nt {rule {}}} {} ; # Query/set nonterminal rhs
+
+    # Administrative data
+    method importer {{object {}}} {} ; # Query/set import manager.
+    method exporter {{object {}}} {} ; # Query/set export manager.
+
+    # ### ### ### ######### ######### #########
+    ## Instance API Implementation.
+
+    constructor {args} {
+	$self clear
+
+	if {
+	    (([llength $args] != 0) && ([llength $args] != 2)) ||
+	    (([llength $args] == 2) && ([lindex $args 0] ni {= := <-- as deserialize}))
+	} {
+	    return -code error "wrong#args: $self ?=|:=|<--|as|deserialize a'?"
+	}
+
+	# Serialization arguments.
+	# [llength args] in {0 2}
+	#
+	# =           src-obj
+	# :=          src-obj
+	# <--         src-obj
+	# as          src-obj
+	# deserialize src-value
+
+	if {[llength $args] == 2} {
+	    foreach {op val} $args break
+	    switch -exact -- $op {
+		= - := - <-- - as {
+		    $self deserialize = [$val serialize]
+		}
+		deserialize {
+		    $self deserialize = $val
+		}
+	    }
+	}
+	return
+    }
+
+    # Default destructor.
+
+    # ### ### ### ######### ######### #########
+
+    method invalidate {} {
+	array unset mypeg *
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Administrative data
+
+    method exporter {{object {}}} {
+	# TODO :: unlink/link change notification callbacks on the
+	# config/include components so that we can invalidate our
+	# cache when the settings change.
+
+	if {[llength [info level 0]] == 6} {
+	    set myexporter $object
+	}
+	return $myexporter
+    }
+
+    method importer {{object {}}} {
+	if {[llength [info level 0]] == 6} {
+	    set myimporter $object
+	}
+	return $myimporter
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Direct manipulation of the grammar.
+
+    ## Bulk deletion
+
+    method clear {} {
+	array unset myrhs     *
+	array unset mymode    *
+	set mystartpe [pt::pe epsilon]
+	return
+    }
+
+    ## Bulk queries
+
+    method nonterminals {} {
+	return [array names myrhs]
+    }
+
+    method modes {{dict {}}} {
+	if {[llength [info level 0]] == 6} {
+	    VerifyAsKnown [dict keys $dict]
+	    foreach mode [dict values $dict] {
+		if {![info exists ourmode($mode)]} {
+		    set ours [linsert [join [lsort -dict [array names ourmode]] ", "] end-1 or]
+		    return -code error "Expected one of $ours, got \"$mode\""
+		}
+	    }
+	    array set mymode $dict
+	    return
+	}
+	return [array get mymode]
+    }
+
+    method rules {{dict {}}} {
+	if {[llength [info level 0]] == 6} {
+	    VerifyAsKnown [dict keys $dict]
+	    foreach {nt pe} $dict {
+	        lappend tmp $nt [pt::pe canonicalize $pe]
+	    }
+	    array set myrhs $tmp
+	    return
+	}
+	return [array get myrhs]
+    }
+
+    ## Start expression
+
+    method start {{pe {}}} {
+	if {[llength [info level 0]] == 6} {
+	    set mystartpe [pt::pe canonicalize $pe]
+	    return
+	}
+	return $mystartpe
+    }
+
+    ## Non-terminal manipulation and querying
+
+    method add {args} {
+	if {![llength $args]} return
+	VerifyAsUnknown $args
+	foreach nt $args {
+	    set myrhs($nt)  [pt::pe epsilon]
+	    set mymode($nt) value
+	}
+	return
+    }
+
+    method remove {args} {
+	if {![llength $args]} return
+	VerifyAsKnown $args
+	foreach nt $args {
+	    unset myrhs($nt)
+	    unset mymode($nt)
+	}
+	return
+    }
+
+    method exists {nt} {
+	if {$nt eq {}} {
+	    return -code error "Expected nonterminal name, got the empty string"
+	}
+	return [info exists myrhs($nt)]
+    }
+
+    method rename {ntold ntnew} {
+	VerifyAsKnown1   $ntold
+	VerifyAsUnknown1 $ntnew
+
+	# We have to go through all rules and rewrite their RHS to use
+	# the new name of the nonterminal.
+
+	set myrhs($ntnew)  $myrhs($ntold)
+	unset               myrhs($ntold)
+	set mymode($ntnew) $mymode($ntold)
+	unset               mymode($ntold)
+
+	foreach nt [array names myrhs] {
+	    set myrhs($nt) [pt::pe rename \
+			       $myrhs($nt) $ntold $ntnew]
+	}
+	return
+    }
+
+    method mode {nt {mode {}}} {
+	VerifyAsKnown1 $nt
+	if {[llength [info level 0]] == 7} {
+	    if {![info exists ourmode($mode)]} {
+		set ours [linsert [join [lsort -dict [array names ourmode]] ", "] end-1 or]
+		return -code error "Expected one of $ours, got \"$mode\""
+	    }
+	    set mymode($nt) $mode
+	}
+	return $mymode($nt)
+    }
+
+    method rule {nt {pe {}}} {
+	VerifyAsKnown1 $nt
+	if {[llength [info level 0]] == 7} {
+	    set myrhs($nt) [pt::pe canonicalize $pe]
+	}
+	return $myrhs($nt)
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Public methods. Bulk loading and merging.
+
+    method = {source} {
+	$self deserialize [$source serialize]
+	return
+    }
+
+    method --> {destination} {
+	$destination deserialize [$self serialize]
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method serialize {{format {}}} {
+	# Default format is the regular PEG serialization
+	if {[llength [info level 0]] == 5} {
+	    set format serial
+	}
+
+	# First check the cache for a remebered representation of the
+	# index for the chosen format, and return it, if such is
+	# known.
+
+	if {[info exists mypeg($format)]} {
+	    return $mypeg($format)
+	}
+
+	# If there is no cached representation we have to generate it
+	# from it from our internal representation.
+
+	if {$format eq "serial"} {
+	    return [$self GenerateSerial]
+	} else {
+	    return [$self Generate $format]
+	}
+
+	return -code error "Internal error, reached unreachable location"
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method {deserialize =} {data {format {}}} {
+	# Default format is the regular PEG serialization
+	if {[llength [info level 0]] == 6} {
+	    set format serial
+	}
+
+	if {$format ne "serial"} {
+	    set data [$self Import $format $data]
+	    # pt::peg verify-as-canonical $data
+	    # ImportSerial verifies.
+	}
+
+	$self ImportSerial $data
+	return
+    }
+
+    method {deserialize +=} {data {format {}}} {
+	# Default format is the regular PEG serialization
+	if {[llength [info level 0]] == 6} {
+	    set format serial
+	}
+
+	if {$format ne "serial"} {
+	    set data [$self Import $format $data]
+	    # pt::peg verify-as-canonical $data
+	    # merge or ImportSerial verify the structure.
+	}
+
+	set data [pt::peg merge [$self serialize] $data]
+	# pt::peg verify-as-canonical $data
+	# ImportSerial verifies.
+
+	$self ImportSerial $data
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal methods
+
+    proc VerifyAsKnown1 {nt} {
+	upvar 1 myrhs myrhs
+	if {$nt eq {}} {
+	    return -code error "Expected nonterminal name, got the empty string"
+	}
+	if {![info exists myrhs($nt)]} {
+	    return -code error "Invalid nonterminal \"$nt\""
+	}
+	return
+    }
+
+    proc VerifyAsUnknown1 {nt} {
+	upvar 1 myrhs myrhs
+	if {$nt eq {}} {
+	    return -code error "Expected nonterminal name, got the empty string"
+	}
+	if {[info exists myrhs($nt)]} {
+	    return -code error "Nonterminal \"$nt\" is already known"
+	}
+	return
+    }
+
+    proc VerifyAsKnown {ntlist} {
+	upvar 1 myrhs myrhs
+	foreach nt $ntlist {
+	    if {$nt eq {}} {
+		return -code error "Expected nonterminal name, got the empty string"
+	    }
+	    if {![info exists myrhs($nt)]} {
+		return -code error "Invalid nonterminal \"$nt\""
+	    }
+	}
+	return
+    }
+
+    proc VerifyAsUnknown {ntlist} {
+	upvar 1 myrhs myrhs
+	foreach nt $ntlist {
+	    if {$nt eq {}} {
+		return -code error "Expected nonterminal name, got the empty string"
+	    }
+	    if {[info exists myrhs($nt)]} {
+		return -code error "Nonterminal \"$nt\" is already known"
+	    }
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method GenerateSerial {} {
+	# We can generate the list serialization easily from the
+	# internal representation.
+
+	# Construct result. inside out
+	set rules {}
+	foreach nt [lsort -dict [array names myrhs]] {
+	    lappend rules $nt [list \
+				   is   $myrhs($nt) \
+				   mode $mymode($nt)]
+	}
+
+	set serial [list pt::grammar::peg \
+			[list \
+			     rules $rules \
+			     start $mystartpe]]
+
+	# This is just present to assert that the code above creates
+	# correct serializations.
+	pt::peg verify-as-canonical $serial
+
+	set mypeg(serial) $serial
+	return $serial
+    }
+
+    method Generate {format} {
+	if {$myexporter eq {}} {
+	    return -code error "Unable to export from \"$format\", no exporter configured"
+	}
+	set res [$myexporter export object $self $format]
+	set mypeg($format) $res
+	return $res
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method ImportSerial {serial} {
+	pt::peg verify $serial iscanonical
+
+	# Kill existing content
+	$self clear
+
+	# Unpack the serialization.
+	array set peg $serial
+	array set peg $peg(pt::grammar::peg)
+	unset     peg(pt::grammar::peg)
+
+	# We are setting the relevant variables directly instead of
+	# going through the accessor methods.
+
+	set mystartpe $peg(start)
+
+	foreach {nt def} $peg(rules) {
+	    array set sd $def
+	    set myrhs($nt)  $sd(is)
+	    set mymode($nt) $sd(mode)
+	    unset sd
+	}
+
+	# Extend cache (only if canonical, as we return only canonical
+	# data).
+	if {$iscanonical} {
+	    set mypeg(serial) $serial
+	}
+	return
+    }
+
+    method Import {format data} {
+	if {$myimporter eq {}} {
+	    return -code error "Unable to import from \"$format\", no importer configured"
+	}
+
+	return [$myimporter import text $data $format]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+
+    # References the to export/import managers extending the
+    # (de)serialization abilities of the grammar.
+
+    variable myexporter {}
+    variable myimporter {}
+
+    # Internal representation of the grammar.
+
+    variable mystartpe        {} ; # Start parsing expression.
+    variable myrhs     -array {} ; # Right hand side (parsing
+				   # expression)s for the known
+				   # nonterminal symbols.
+    variable mymode    -array {} ; # Modes for the known nonterminal
+				   # symols.
+
+    typevariable ourmode -array {
+	value   .
+	leaf    .
+	void    .
+    }
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide pt::peg::container 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_container_peg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_container_peg.tcl
new file mode 100644
index 00000000..8e03618c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_container_peg.tcl
@@ -0,0 +1,146 @@
+# -*- tcl -*-
+# Parsing Expression Grammar 'PEG'.
+# Definition of a human-readable form of parsing expression grammar specification.
+
+package require Tcl 8.5
+package require snit
+package require pt::peg::container
+
+snit::type pt::peg::container::peg {
+    constructor {} {
+        install myg using pt::peg::container ${selfns}::G
+        $myg start {n Grammar}
+        $myg add   ALNUM ALPHA AND APOSTROPH ASCII Attribute Char CharOctalFull CharOctalPart CharSpecial CharUnescaped CharUnicode Class CLOSE CLOSEB COLON COMMENT DAPOSTROPH DDIGIT Definition DIGIT DOT END EOF EOL Expression Final Grammar GRAPH Header Ident Identifier IS LEAF Literal LOWER NOT OPEN OPENB PEG PLUS Prefix Primary PRINTABLE PUNCT QUESTION Range SEMICOLON Sequence SLASH SPACE STAR StartExpr Suffix TO UPPER VOID WHITESPACE WORDCHAR XDIGIT
+        $myg modes {
+            ALNUM         leaf
+            ALPHA         leaf
+            AND           leaf
+            APOSTROPH     void
+            ASCII         leaf
+            Attribute     value
+            Char          value
+            CharOctalFull leaf
+            CharOctalPart leaf
+            CharSpecial   leaf
+            CharUnescaped leaf
+            CharUnicode   leaf
+            Class         value
+            CLOSE         void
+            CLOSEB        void
+            COLON         void
+            COMMENT       void
+            DAPOSTROPH    void
+            DDIGIT        leaf
+            Definition    value
+            DIGIT         leaf
+            DOT           leaf
+            END           void
+            EOF           void
+            EOL           void
+            Expression    value
+            Final         void
+            Grammar       value
+            GRAPH         leaf
+            Header        value
+            Ident         leaf
+            Identifier    value
+            IS            void
+            LEAF          leaf
+            Literal       value
+            LOWER         leaf
+            NOT           leaf
+            OPEN          void
+            OPENB         void
+            PEG           void
+            PLUS          leaf
+            Prefix        value
+            Primary       value
+            PRINTABLE     leaf
+            PUNCT         leaf
+            QUESTION      leaf
+            Range         value
+            SEMICOLON     void
+            Sequence      value
+            SLASH         void
+            SPACE         leaf
+            STAR          leaf
+            StartExpr     value
+            Suffix        value
+            TO            void
+            UPPER         leaf
+            VOID          leaf
+            WHITESPACE    void
+            WORDCHAR      leaf
+            XDIGIT        leaf
+        }
+        $myg rules {
+            ALNUM         {x {t <} {t a} {t l} {t n} {t u} {t m} {t >} {n WHITESPACE}}
+            ALPHA         {x {t <} {t a} {t l} {t p} {t h} {t a} {t >} {n WHITESPACE}}
+            AND           {x {t &} {n WHITESPACE}}
+            APOSTROPH     {t '}
+            ASCII         {x {t <} {t a} {t s} {t c} {t i} {t i} {t >} {n WHITESPACE}}
+            Attribute     {x {/ {n VOID} {n LEAF}} {n COLON}}
+            Char          {/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}}
+            CharOctalFull {x {t \134} {.. 0 2} {.. 0 7} {.. 0 7}}
+            CharOctalPart {x {t \134} {.. 0 7} {? {.. 0 7}}}
+            CharSpecial   {x {t \134} {/ {t n} {t r} {t t} {t '} {t \42} {t \133} {t \135} {t \134}}}
+            CharUnescaped {x {! {t \134}} dot}
+            CharUnicode   {x {t \134} {t u} xdigit {? {x xdigit {? {x xdigit {? xdigit}}}}}}
+            Class         {x {n OPENB} {* {x {! {n CLOSEB}} {n Range}}} {n CLOSEB} {n WHITESPACE}}
+            CLOSE         {x {t \51} {n WHITESPACE}}
+            CLOSEB        {t \135}
+            COLON         {x {t :} {n WHITESPACE}}
+            COMMENT       {x {t #} {* {x {! {n EOL}} dot}} {n EOL}}
+            DAPOSTROPH    {t \42}
+            DDIGIT        {x {t <} {t d} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}}
+            Definition    {x {? {n Attribute}} {n Identifier} {n IS} {n Expression} {n SEMICOLON}}
+            DIGIT         {x {t <} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}}
+            DOT           {x {t .} {n WHITESPACE}}
+            END           {x {t E} {t N} {t D} {n WHITESPACE}}
+            EOF           {! dot}
+            EOL           {/ {x {t \r} {t \n}} {t \n} {t \r}}
+            Expression    {x {n Sequence} {* {x {n SLASH} {n Sequence}}}}
+            Final         {x {n END} {n SEMICOLON} {n WHITESPACE}}
+            Grammar       {x {n WHITESPACE} {n Header} {* {n Definition}} {n Final} {n EOF}}
+            GRAPH         {x {t <} {t g} {t r} {t a} {t p} {t h} {t >} {n WHITESPACE}}
+            Header        {x {n PEG} {n Identifier} {n StartExpr}}
+            Ident         {x {/ {t _} {t :} alpha} {* {/ {t _} {t :} alnum}}}
+            Identifier    {x {n Ident} {n WHITESPACE}}
+            IS            {x {t <} {t -} {n WHITESPACE}}
+            LEAF          {x {t l} {t e} {t a} {t f} {n WHITESPACE}}
+            Literal       {/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n WHITESPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n WHITESPACE}}}
+            LOWER         {x {t <} {t l} {t o} {t w} {t e} {t r} {t >} {n WHITESPACE}}
+            NOT           {x {t !} {n WHITESPACE}}
+            OPEN          {x {t \50} {n WHITESPACE}}
+            OPENB         {t \133}
+            PEG           {x {t P} {t E} {t G} {n WHITESPACE}}
+            PLUS          {x {t +} {n WHITESPACE}}
+            Prefix        {x {? {/ {n AND} {n NOT}}} {n Suffix}}
+            Primary       {/ {n ALNUM} {n ALPHA} {n ASCII} {n DDIGIT} {n DIGIT} {n GRAPH} {n LOWER} {n PRINTABLE} {n PUNCT} {n SPACE} {n UPPER} {n WORDCHAR} {n XDIGIT} {n Identifier} {x {n OPEN} {n Expression} {n CLOSE}} {n Literal} {n Class} {n DOT}}
+            PRINTABLE     {x {t <} {t p} {t r} {t i} {t n} {t t} {t >} {n WHITESPACE}}
+            PUNCT         {x {t <} {t p} {t u} {t n} {t c} {t t} {t >} {n WHITESPACE}}
+            QUESTION      {x {t ?} {n WHITESPACE}}
+            Range         {/ {x {n Char} {n TO} {n Char}} {n Char}}
+            SEMICOLON     {x {t \73} {n WHITESPACE}}
+            Sequence      {+ {n Prefix}}
+            SLASH         {x {t /} {n WHITESPACE}}
+            SPACE         {x {t <} {t s} {t p} {t a} {t c} {t e} {t >} {n WHITESPACE}}
+            STAR          {x {t *} {n WHITESPACE}}
+            StartExpr     {x {n OPEN} {n Expression} {n CLOSE}}
+            Suffix        {x {n Primary} {? {/ {n QUESTION} {n STAR} {n PLUS}}}}
+            TO            {t -}
+            UPPER         {x {t <} {t u} {t p} {t p} {t e} {t r} {t >} {n WHITESPACE}}
+            VOID          {x {t v} {t o} {t i} {t d} {n WHITESPACE}}
+            WHITESPACE    {* {/ {t \40} {t \t} {n EOL} {n COMMENT}}}
+            WORDCHAR      {x {t <} {t w} {t o} {t r} {t d} {t c} {t h} {t a} {t r} {t >} {n WHITESPACE}}
+            XDIGIT        {x {t <} {t x} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}}
+        }
+        return
+    }
+
+    component myg
+    delegate method * to myg
+}
+
+package provide pt::peg::container::peg 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_export.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_export.tcl
new file mode 100644
index 00000000..94bdb967
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_export.tcl
@@ -0,0 +1,117 @@
+# pt_peg_export.tcl --
+#
+#	Exporting parsing expression grammars into other formats.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# Each object manages a set of plugins for the conversion of parsing
+# expression grammars into some textual representation. I.e. this
+# object manages the conversion to specialized serializations of
+# parsing expression grammars.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require pt::peg
+package require pluginmgr
+package require struct::map
+
+# ### ### ### ######### ######### #########
+## API
+
+snit::type ::pt::peg::export {
+
+    # ### ### ### ######### ######### #########
+    ## Options :: None
+
+    # ### ### ### ######### ######### #########
+    ## Creation, destruction.
+
+    constructor {} {
+	install myconfig using ::struct::map ${selfns}::CONFIG
+	return
+    }
+
+    destructor {
+	$myconfig destroy
+	# Clear the cache of loaded export plugins.
+	foreach k [array names myplugin] {
+	    $myplugin($k) destroy
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Convert from the Tcl index serialization to other formats.
+
+    method {export object} {obj {format {}}} {
+	return [$self export serial [$obj serialize] $format]
+    }
+
+    method {export serial} {serial {format {}}} {
+	set serial [pt::peg canonicalize $serial]
+	set plugin [$self GetPlugin $format]
+
+	# We have a plugin, now feed it.
+
+	set configuration [$myconfig get]
+
+	return [$plugin do export $serial $configuration]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal methods
+
+    method GetPlugin {format} {
+	if {$format eq {}} { set format text }
+
+	if {![info exists myplugin($format)]} {
+	    set plugin [pluginmgr ${selfns}::fmt-$format \
+			       -pattern pt::peg::export::* \
+			       -api { export } \
+			       -setup [mymethod PluginSetup]]
+	    ::pluginmgr::paths $plugin pt::peg::export
+	    $plugin load $format
+	    set myplugin($format) $plugin
+	} else {
+	    set plugin $myplugin($format)
+	}
+
+	return $plugin
+    }
+
+    method PluginSetup {mgr ip} {
+	# Inject a pseudo package into the plugin interpreter the
+	# formatters can use to check that they were loaded into a
+	# proper environment.
+	$ip eval {package provide pt::peg::export::plugin 1}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+
+    # Array serving as a cache for the various plugin managers holding
+    # a specific export plugin.
+
+    variable myplugin -array {}
+
+    # A component managing the configuration given to the export
+    # plugins when they are invoked.
+
+    component myconfig -public configuration
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::export 1.0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_export_container.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_export_container.tcl
new file mode 100644
index 00000000..4a4b4555
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_export_container.tcl
@@ -0,0 +1,51 @@
+# peg_export_container.tcl --
+#
+#	The PEG to CONTAINER export plugin. Generation of Tcl code, a
+#	snit::type.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pt_peg_export_container.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $
+
+# This package is a plugin for the pt::peg export manager.  It
+# takes the canonical serialization of a parsing expression grammar
+# and produces text in CONTAINER format.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: pt::peg::export::plugin
+
+package  require Tcl 8.5
+package  require pt::peg::export::plugin ; # The presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require pt::peg::to::container
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc export {serial configuration} {
+
+    pt::peg::to::container reset
+    foreach {option value} $configuration {
+	pt::peg::to::container configure $option $value
+    }
+
+    set text [pt::peg::to::container convert $serial]
+
+    pt::peg::to::container reset
+    return $text
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::export::container 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_export_json.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_export_json.tcl
new file mode 100644
index 00000000..12eaa508
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_export_json.tcl
@@ -0,0 +1,50 @@
+# pt_peg_export_json.tcl --
+#
+#	The PEG to JSON export plugin. Generation of Tcl code, a
+#	snit::type.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pt_peg_export_json.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $
+
+# This package is a plugin for the pt::peg export manager.  It
+# takes the canonical serialization of a parsing expression grammar
+# and produces text in JSON format.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: pt::peg::export::plugin
+
+package require Tcl 8.5
+package require pt::peg::export::plugin ; # The presence of this
+					  # pseudo package indicates
+					  # execution inside of a
+					  # properly initialized
+					  # plugin interpreter.
+package require pt::peg::to::json
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc export {serial configuration} {
+
+    pt::peg::to::json reset
+    foreach {option value} $configuration {
+	pt::peg::to::json configure $option $value
+    }
+
+    set text [pt::peg::to::json convert $serial]
+
+    pt::peg::to::json reset
+    return $text
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::export::json 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_export_peg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_export_peg.tcl
new file mode 100644
index 00000000..32c6ea36
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_export_peg.tcl
@@ -0,0 +1,51 @@
+# peg_to_export.tcl --
+#
+#	The PEG to PEG (text representation) export plugin. Generation
+#	of plain text.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pt_peg_export_peg.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $
+
+# This package is a plugin for the pt::peg export manager.  It
+# takes the canonical serialization of a parsing expression grammar
+# and produces the corresponding human readable text representation.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: pt::peg::export::plugin
+
+package  require Tcl 8.5
+package  require pt::peg::export::plugin ; # The presence of this
+						# pseudo package
+						# indicates execution
+						# inside of a properly
+						# initialized plugin
+						# interpreter.
+package require pt::peg::to::peg
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc export {serial configuration} {
+
+    pt::peg::to::peg reset
+    foreach {option value} $configuration {
+	pt::peg::to::peg configure $option $value
+    }
+
+    set text [pt::peg::to::peg convert $serial]
+
+    pt::peg::to::peg reset
+    return $text
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::export::peg 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_from_json.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_from_json.tcl
new file mode 100644
index 00000000..0d99d21e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_from_json.tcl
@@ -0,0 +1,48 @@
+# peg_from_json.tcl --
+#
+#	Conversion to PEG from JSON (Java Script Object Notation).
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pt_peg_from_json.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $
+
+# This package takes text in JSON format (Java Script data transfer
+# format) and produces the canonical serialization of a parsing
+# expression grammar.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require pt::peg ; # Verification that the input is proper.
+package require json
+
+# ### ### ### ######### ######### #########
+##
+
+namespace eval ::pt::peg::from::json {
+    namespace export convert
+    namespace ensemble create
+}
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc ::pt::peg::from::json::convert {text} {
+    # Note: We cannot fail here on duplicate keys in the input, as we
+    # do for Tcl-based canonical PEG serializations, because our
+    # underlying JSON parser automatically merges them, by taking only
+    # the last found definition. I.e. of two or more definitions for
+    # some key X the last overwrites all previous occurences.
+
+    return [pt::peg canonicalize [json::json2dict $text]]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::from::json 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_from_peg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_from_peg.tcl
new file mode 100644
index 00000000..74492242
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_from_peg.tcl
@@ -0,0 +1,394 @@
+# pt_peg_from_peg.tcl --
+#
+#	Conversion from PEG (Human readable text) to PEG.
+#
+# Copyright (c) 2009-2014 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pt_peg_from_peg.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $
+
+# This package takes text for a human-readable PEG and produces the
+# canonical serialization of a parsing expression grammar.
+
+# TODO :: APIs for reading from arbitrary channel.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require pt::peg  ; # Verification that the input is proper.
+#package require pt::peg::interp
+#package require pt::peg::container::peg
+package require pt::parse::peg
+package require pt::ast
+package require pt::pe
+package require pt::pe::op
+
+# ### ### ### ######### ######### #########
+##
+
+namespace eval ::pt::peg::from::peg {
+    namespace export   convert convert-file
+    namespace ensemble create
+}
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc ::pt::peg::from::peg::convert {text} {
+    # Initialize data for the pseudo-channel
+    variable input $text
+    variable loc   0
+    variable max   [expr { [string length $text] - 1 }]
+
+    return [Convert]
+}
+
+proc ::pt::peg::from::peg::convert-file {path} {
+    # Initialize data for the pseudo-channel
+    variable input [fileutil::cat $path]
+    variable loc   0
+    variable max   [expr { [string length $input] - 1 }]
+
+    return [Convert]
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::pt::peg::from::peg::Convert {} {
+    # Create the runtime ...
+    set c [chan create read pt::peg::from::peg::CHAN] ; # pseudo-channel for input
+
+    #set g [pt::peg::container::peg %AUTO]             ; # load peg grammar
+    #set i [pt::peg::interp         %AUTO% $g]         ; # grammar interpreter / parser
+    #$g destroy
+    set i [pt::parse::peg]
+
+    # Parse input.
+    set fail [catch {
+	set ast [$i parse $c]
+    } msg]
+    if {$fail} {
+	set ei $::errorInfo
+	set ec $::errorCode
+    }
+
+    $i destroy
+    close $c
+
+    if {$fail} {
+	variable input {}
+	return -code error -errorinfo $ei -errorcode $ec $msg
+    }
+
+    # Now convert the AST to the grammar serial.
+    set serial [pt::ast bottomup \
+		    pt::peg::from::peg::GEN \
+		    $ast]
+
+    variable input {}
+    return $serial
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Internals - Pseudo channel to couple the in-memory text with the
+## RDE.
+
+namespace eval ::pt::peg::from::peg::CHAN {
+    namespace export   initialize finalize read watch
+    namespace ensemble create
+}
+
+proc pt::peg::from::peg::CHAN::initialize {c mode} {
+    return {initialize finalize watch read}
+}
+
+proc pt::peg::from::peg::CHAN::finalize {c}        {}
+proc pt::peg::from::peg::CHAN::watch    {c events} {}
+
+proc pt::peg::from::peg::CHAN::read {c n} {
+    # Note: Should have binary string of the input, to properly handle
+    # encodings ...
+    variable ::pt::peg::from::peg::input
+    variable ::pt::peg::from::peg::loc
+    variable ::pt::peg::from::peg::max
+
+    if {$loc >= $max} { return {} }
+
+    set end [expr {$loc + $n - 1}]
+    set res [string range $input $loc $end]
+
+    incr loc $n
+
+    return $res
+}
+
+# ### ### ### ######### ######### #########
+## Internals - Bottom up walk converting AST to PEG serialization.
+## Pseudo-ensemble
+
+namespace eval ::pt::peg::from::peg::GEN {}
+
+proc pt::peg::from::peg::GEN {ast} {
+    # The reason for not being an ensemble, an additional param
+    # (8.6+ can code that as ensemble).
+    return [namespace eval GEN $ast]
+}
+
+proc pt::peg::from::peg::GEN::ALNUM {s e} {
+    return [pt::pe alnum]    
+}
+
+proc pt::peg::from::peg::GEN::ALPHA {s e} {
+    return [pt::pe alpha]    
+}
+
+proc pt::peg::from::peg::GEN::AND {s e} {
+    return [pt::pe ahead [pt::pe dot]] ; # -> Prefix
+}
+
+proc pt::peg::from::peg::GEN::ASCII {s e} {
+    return [pt::pe ascii]    
+}
+
+proc pt::peg::from::peg::GEN::Attribute {s e args} {
+    return [lindex $args 0] ; # -> Definition
+}
+
+proc pt::peg::from::peg::GEN::Char {s e args} {
+    return [lindex $args 0]
+}
+
+proc pt::peg::from::peg::GEN::CharOctalFull {s e} {
+    variable ::pt::peg::from::peg::input
+    return [pt::pe terminal [char unquote [string range $input $s $e]]]
+}
+
+proc pt::peg::from::peg::GEN::CharOctalPart {s e} {
+    variable ::pt::peg::from::peg::input
+    return [pt::pe terminal [char unquote [string range $input $s $e]]]
+}
+
+proc pt::peg::from::peg::GEN::CharSpecial {s e} {
+    variable ::pt::peg::from::peg::input
+    return [pt::pe terminal [char unquote [string range $input $s $e]]]
+}
+
+proc pt::peg::from::peg::GEN::CharUnescaped {s e} {
+    variable ::pt::peg::from::peg::input
+    return [pt::pe terminal [string range $input $s $e]]
+}
+
+proc pt::peg::from::peg::GEN::CharUnicode {s e} {
+    variable ::pt::peg::from::peg::input
+    return [pt::pe terminal [char unquote [string range $input $s $e]]]
+}
+
+proc pt::peg::from::peg::GEN::Class {s e args} {
+    if {[llength $args] == 1} { ; # integrated pe::op flatten
+	return [lindex $args 0]
+    } else {
+	return [pt::pe choice {*}$args] ; # <- Chars and Ranges
+    }
+}
+
+proc pt::peg::from::peg::GEN::CONTROL {s e} {
+    return [pt::pe control]
+}
+
+proc pt::peg::from::peg::GEN::DDIGIT {s e} {
+    return [pt::pe ddigit]
+}
+
+proc pt::peg::from::peg::GEN::Definition {s e args} {
+    # args = list/2 (symbol pe)      | <-           Ident(ifier) Expression
+    # args = list/3 (mode symbol pe) | <- Attribute Ident(ifier) Expression
+    if {[llength $args] == 3} {
+	lassign $args mode sym pe
+    } else {
+	lassign $args sym pe
+	set mode value
+    }
+    # sym = list/2 ('n' name)
+    return [list [lindex $sym 1] $mode [pt::pe::op flatten $pe]]
+}
+
+proc pt::peg::from::peg::GEN::DIGIT {s e} {
+    return [pt::pe digit]
+}
+
+proc pt::peg::from::peg::GEN::DOT {s e} {
+    return [pt::pe dot]
+}
+
+proc pt::peg::from::peg::GEN::Expression {s e args} {
+    if {[llength $args] == 1} { ; # integrated pe::op flatten
+	return [lindex $args 0]
+    } else {
+	return [pt::pe choice {*}$args] ; # <- Primary
+    }
+}
+
+proc pt::peg::from::peg::GEN::Grammar {s e args} {
+    # args = list (start, list/3(symbol, mode, rule)...) <- Header Definition*
+    array set symbols {}
+    set rules {}
+    foreach def [lsort -index 0 -dict [lassign $args startexpr]] {
+	lassign $def sym mode rhs
+	if {[info exists symbol($sym)]} {
+	    return -code error "Double declaration of symolb '$sym'"
+	}
+	set symbols($sym) .
+	lappend rules $sym [list is $rhs mode $mode]
+    }
+    # Full grammar
+    return [list pt::grammar::peg [list rules $rules start $startexpr]]
+}
+
+proc pt::peg::from::peg::GEN::GRAPH {s e} {
+    return [pt::pe graph]
+}
+
+proc pt::peg::from::peg::GEN::Header {s e args} {
+    # args = list/2 (list/2 ('n', name), pe) <- Ident(ifier) StartExpr
+    return [lindex $args 1] ; # StartExpr passes through
+}
+
+proc pt::peg::from::peg::GEN::Ident {s e} {
+    variable ::pt::peg::from::peg::input
+    return [pt::pe nonterminal [string range $input $s $e]]
+}
+
+proc pt::peg::from::peg::GEN::Identifier {s e args} {
+    return [lindex $args 0] ; # <- Ident, passes through
+}
+
+proc pt::peg::from::peg::GEN::LEAF {s e} {
+    return leaf
+}
+
+proc pt::peg::from::peg::GEN::LOWER {s e} {
+    return [pt::pe lower]
+}
+
+proc pt::peg::from::peg::GEN::Literal {s e args} {
+    set n [llength $args]
+    if {$n == 1} {
+	# integrated pe::op flatten, return just the char.
+	return [lindex $args 0]
+    } elseif {$n == 0} {
+	# No chars, empty string, IOW epsilon.
+	return [pt::pe epsilon]
+    } else {
+	# Series of chars -> Primary
+	return [pt::pe sequence {*}$args]
+    }
+}
+
+proc pt::peg::from::peg::GEN::NOT {s e} {
+    return [pt::pe notahead [pt::pe dot]] ; # -> Prefix (dot is placeholder)
+}
+
+proc pt::peg::from::peg::GEN::PLUS {s e} {
+    return [pt::pe repeat1 [pt::pe dot]] ; # -> Suffix (dot is placeholder)
+}
+
+proc pt::peg::from::peg::GEN::Primary {s e args} {
+    return [lindex $args 0] ; # -> Expression, pass through
+}
+
+proc pt::peg::from::peg::GEN::Prefix {s e args} {
+    # args = list/1 (pe)            | <- AND/NOT, Expression
+    # args = list/2 (pe/prefix, pe) | <- Expression
+    if {[llength $args] == 2} {
+	# Prefix operator present ... Replace its child (dot,
+	# placeholder) with our second, the actual expression.
+	return [lreplace [lindex $args 0] 1 1 [lindex $args 1]]
+    } else {
+	# Pass the sub-expression
+	return [lindex $args 0]
+    }
+}
+
+proc pt::peg::from::peg::GEN::PRINTABLE {s e} {
+    return [pt::pe printable]
+}
+
+proc pt::peg::from::peg::GEN::PUNCT {s e} {
+    return [pt::pe punct]    
+}
+
+proc pt::peg::from::peg::GEN::QUESTION {s e} {
+    return [pt::pe optional [pt::pe dot]] ; # -> Suffix (dot is placeholder)
+}
+
+proc pt::peg::from::peg::GEN::Range {s e args} {
+    # args = list/1 (pe/t)       | <- Char (pass through)
+    # args = list/2 (pe/t, pe/t) | <- Char, Char
+    if {[llength $args] == 2} {
+	# Convert two terminals to range
+	return [pt::pe range [lindex $args 0 1] [lindex $args 1 1]]
+    } else {
+	# Pass the char ...
+	return [lindex $args 0]
+    }
+}
+
+proc pt::peg::from::peg::GEN::Sequence {s e args} {
+    if {[llength $args] == 1} { ; # integrated pe::op flatten
+	return [lindex $args 0]
+    } else {
+	return [pt::pe sequence {*}$args] ; # <- Prefix+
+    }
+}
+
+proc pt::peg::from::peg::GEN::SPACE {s e} {
+    return [pt::pe space]
+}
+
+proc pt::peg::from::peg::GEN::STAR {s e} {
+    return [pt::pe repeat0 [pt::pe dot]] ; # -> Suffix (dot is placeholder)
+}
+
+proc pt::peg::from::peg::GEN::StartExpr {s e args} {
+    # args = list/1 (pe) | <- Expression, -> Header
+    return [pt::pe::op flatten [lindex $args 0]]
+}
+proc pt::peg::from::peg::GEN::Suffix {s e args} {
+    # args = list/1 (pe)            | <- Expression 
+    # args = list/2 (pe, pe/suffix) | <- Expression */+/?
+    if {[llength $args] == 2} {
+	# Suffix operator present ... Replace its child (dot,
+	# placeholder) with our first, the actual expression.
+	return [lreplace [lindex $args 1] 1 1 [lindex $args 0]]
+    } else {
+	# Pass the sub-expression
+	return [lindex $args 0]
+    }
+}
+
+proc pt::peg::from::peg::GEN::UPPER {s e} {
+    return [pt::pe upper]   
+}
+
+proc pt::peg::from::peg::GEN::VOID {s e} {
+    return void
+}
+
+proc pt::peg::from::peg::GEN::WORDCHAR {s e} {
+    return [pt::pe wordchar]
+}
+
+proc pt::peg::from::peg::GEN::XDIGIT {s e} {
+    return [pt::pe xdigit]  
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::from::peg 1.0.3
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_import.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_import.tcl
new file mode 100644
index 00000000..aedd1ecc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_import.tcl
@@ -0,0 +1,188 @@
+# import.tcl --
+#
+#	Importing parsing expression grammars from other formats.
+#
+# Copyright (c) 2009-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# Each object manages a set of plugins for the creation of parsing
+# expression grammars from some textual representation. I.e. this
+# object manages the conversion from specialized serializations of
+# parsing expression grammars into their standard form.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+package require fileutil::paths
+package require pt::peg
+package require pluginmgr
+package require snit
+
+# ### ### ### ######### ######### #########
+## API
+
+snit::type ::pt::peg::import {
+
+    # ### ### ### ######### ######### #########
+    ## Options :: None
+
+    # ### ### ### ######### ######### #########
+    ## Creation, destruction.
+
+    constructor {} {
+	install myinclude using ::fileutil::paths ${selfns}::INCLUDE
+	return
+    }
+
+    destructor {
+	$myinclude destroy
+	# Clear the cache of loaded import plugins.
+	foreach k [array names myplugin] {
+	    $myplugin($k) destroy
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Convert from other formats to the Tcl PEG serialization
+
+    method {import object text} {obj text {format {}}} {
+	$obj deserialize [$self import text $text $format]
+	return
+    }
+
+    method {import object file} {obj path {format {}}} {
+	$obj deserialize [$self import file $path $format]
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method {import text} {text {format {}}} {
+	set plugin [$self GetPlugin $format]
+
+	return [$plugin do import $text]
+    }
+
+    method {import file} {path {format {}}} {
+	# The plugin is not trusted to handle the file to convert.
+	return [$self import text [fileutil::cat $path] $format]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal methods
+
+    method GetPlugin {format} {
+	if {$format eq {}} { set format text }
+
+	if {![info exists myplugin($format)]} {
+	    set plugin [pluginmgr ${selfns}::fmt-$format \
+			       -pattern pt::peg::import::* \
+			       -api { import } \
+			       -setup [mymethod PluginSetup]]
+	    ::pluginmgr::paths $plugin pt::peg::import
+	    $plugin load $format
+	    set myplugin($format) $plugin
+	} else {
+	    set plugin $myplugin($format)
+	}
+
+	return $plugin
+    }
+
+    method PluginSetup {mgr ip} {
+	# Inject a pseudo package into the plugin interpreter the
+	# formatters can use to check that they were loaded into a
+	# proper environment.
+	$ip eval {package provide pt::peg::import::plugin 1}
+	return
+    }
+
+    method PluginSetup {mgr ip} {
+	# Inject a pseudo package into the plugin interpreter the
+	# import plugins can use to check that they were loaded into a
+	# proper environment.
+	$ip eval {package provide pt::peg::import::plugin 1}
+
+	# The import plugins may use msgcat, which requires access to
+	# tcl_platform during its initialization, and won't have it by
+	# default. We trust them enough to hand out the information.
+	# TODO :: remove user/wordSize, etc. We need only 'os'.
+	$ip eval [list array set ::tcl_platform [array get ::tcl_platform]]
+
+	# Provide an alias-command a plugin can use to ask for any
+	# file, so that it can handle the processing of include files,
+	# should its format have that concept. The alias will be
+	# directed to a method of ours and use the configured include
+	# paths to find the file.
+
+	::interp alias $ip include {} {*}[mymethod IncludeFile]
+	return
+    }
+
+    method IncludeFile {currentfile path} {
+	# result = ok text fullpath error-code error-message
+
+	# Find the file, or not.
+	set fullpath [$self Locate $path]
+	if {$fullpath eq {}} {
+	    return [list 0 {} $path notfound {}]
+	}
+
+	# Read contents, or not.
+	if {[catch {
+	    set data [fileutil::cat $fullpath]
+	} msg]} {
+	    set error notread
+	    set emessage $msg
+	    return [list 0 {} $fullpath notread $msg]
+	}
+
+	return [list 1 $data $fullpath {} {}]
+    }
+
+    method Locate {path} {
+	upvar 1 currentfile currentfile
+
+	if {$currentfile ne {}} {
+	    set pathstosearch \
+		[linsert [$myinclude paths] 0 \
+		     [file dirname [file normalize $currentfile]]]
+	} else {
+	    set pathstosearch [$myinclude paths]
+	}
+
+	foreach base $pathstosearch {
+	    set try [file join $base $path]
+	    if {![file exists $try]} continue
+	    return $try
+	}
+	# Nothing found
+	return {}
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+
+    # Array serving as a cache for the various plugin managers holding
+    # a specific import plugin.
+
+    variable myplugin -array {}
+
+    # A component managing the configuration given to the import
+    # plugins when they are invoked.
+
+    component myinclude -public include
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::import 1.0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_import_json.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_import_json.tcl
new file mode 100644
index 00000000..085f7845
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_import_json.tcl
@@ -0,0 +1,40 @@
+# pt_peg_import_json.tcl --
+#
+#	The PEG from JSON import plugin.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pt_peg_import_json.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $
+
+# This package is a plugin for the pt::peg import manager. It takes
+# text in JSON format for a parsing expression grammar and produces
+# the canonical serialization of that grammar.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: pt::peg::import::plugin
+
+package require Tcl 8.5
+package require pt::peg::import::plugin ; # The presence of this
+					  # pseudo package indicates
+					  # execution inside of a
+					  # properly initialized
+					  # plugin interpreter.
+package require pt::peg::from::json
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc import {text} {
+    return [pt::peg::from::json convert $text]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::import::json 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_import_peg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_import_peg.tcl
new file mode 100644
index 00000000..e7ce2abc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_import_peg.tcl
@@ -0,0 +1,41 @@
+# pt_peg_import_peg.tcl --
+#
+#	The PEG to PEG (text representation) import plugin. Generation
+#	of plain text.
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pt_peg_import_peg.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $
+
+# This package is a plugin for the pt::peg import manager.  It takes
+# the human readable text representation of a parsing expression
+# grammar and produces the corresponding canonical serialization.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+# @mdgen NODEP: pt::peg::import::plugin
+
+package require Tcl 8.5
+package require pt::peg::import::plugin ; # The presence of this
+					  # pseudo package indicates
+					  # execution inside of a
+					  # properly initialized
+					  # plugin interpreter.
+package require pt::peg::from::peg
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc import {text} {
+    return [pt::peg::from::peg convert $text]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::import::peg 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_interp.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_interp.tcl
new file mode 100644
index 00000000..a6f576e6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_interp.tcl
@@ -0,0 +1,385 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2009-2014 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# Interpreter for parsing expression grammars. In essence a recursive
+# descent parser configurable with a parsing expression grammar.
+
+# ### ### ### ######### ######### #########
+## Package description
+
+## The instances of this class parse a text provided through a channel
+## based on a parsing expression grammar provided by a peg container
+## object. The parsing process is interpretative, i.e. the parsing
+## expressions are decoded and checked on the fly and possibly
+## multiple times, as they are encountered.
+
+## The interpreter operates in pull-push mode, i.e. the interpreter
+## object is in charge and reads the characters from the channel as
+## needed, and returns with the result of the parse, either when
+## encountering an error, or when the parse was successful.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require pt::rde ; # Virtual machine geared to the parsing of PEGs.
+package require snit
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::pt::peg::interp {
+
+    # ### ### ### ######### ######### #########
+    ## Instance API
+
+    constructor {} {}
+
+    method use {grammar} {}
+
+    method parse {channel} {} ; # Parse the contents of the channel
+				# against the configured grammar.
+
+    method parset {text}   {} ; # Parse the text against the
+                                # configured grammar.
+
+    # ### ### ### ######### ######### #########
+    ## Options
+
+    ## None
+
+    # ### ### ### ######### ######### #########
+    ## Instance API Implementation.
+
+    constructor {} {
+	# Create the runtime supporting the parsing process.
+	set myparser [pt::rde ${selfns}::ENGINE]
+	return
+    }
+
+    method use {grammar} {
+	# Release the information of any previously used grammar.
+
+	array unset myrhs  *
+	array unset mymode *
+	set mystart epsilon
+
+	# Copy the grammar into internal tables.
+
+	# Note how the grammar is not used in any way, shape, or form
+	# afterward.
+
+	# Note also that it is not required to verify the
+	# grammar. This was done while it was loaded into the grammar
+	# object, be it incrementally or at once.
+
+	array set myrhs  [$grammar rules]
+	array set mymode [$grammar modes]
+	set mystart      [$grammar start]
+	return
+    }
+
+    method parse {channel} {
+	$myparser reset $channel
+	$self {*}$mystart
+	return [$myparser complete]
+    }
+
+    method parset {text} {
+	$myparser reset
+	$myparser data $text
+	$self {*}$mystart
+	return [$myparser complete]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Parse operator implementation
+
+    # No input to parse, nor consume. Ok, always.
+
+    method epsilon {} {
+	$myparser i_status_ok
+	return
+    }
+
+    # Parse and consume one character. No matter which character. This
+    # fails only when reaching EOF. Does not consume input on failure.
+
+    method dot {} {
+	$self Next
+	return
+    }
+
+    # Parse and consume one specific character. This fails if the
+    # character at the location is not in the specified character
+    # class. Does not consume input on failure.
+
+    foreach operator {
+	alnum alpha ascii control ddigit digit    graph
+	lower print punct space   upper  wordchar xdigit
+    } {
+	method $operator {} [string map [list @ $operator] {
+	    $self Next
+	    $myparser i:fail_return
+	    $myparser i_test_@
+	    return
+	}]
+    }
+
+    # Parse and consume one specific character. This fails if the
+    # character at the location is not the expected character. Does
+    # not consume input on failure.
+    
+    method t {char} {
+	$self Next
+	$myparser i:fail_return
+	$myparser i_test_char $char
+	return
+    }
+
+    # Parse and consume one character, if in the specified range. This
+    # fails if the read character is outside of the range. Does not
+    # consume input on failure.
+
+    method .. {chstart chend} {
+	$self Next
+	$myparser i:fail_return
+	$myparser i_test_range $chstart $chend
+	return
+    }
+
+    # To parse a nonterminal symbol in the input we execute its
+    # parsing expression, i.e its right-hand side. This can be cut
+    # short if the necessary information can be obtained from the
+    # nonterminal cache. Does not consume input on failure.
+
+    method n {symbol} {
+	set savemode      $mycurrentmode
+	set mycurrentmode $mymode($symbol)
+
+	# Query NC, and shortcut
+	if {[$myparser i_symbol_restore $symbol]} {
+	    $self ASTFinalize
+	    return
+	}
+
+	# Save location and AST construction state
+	$myparser i_loc_push ; # (i)
+	$myparser i_ast_push ; # (1)
+
+	# Run the right hand side.
+	$self {*}$myrhs($symbol)
+
+	# Generate a semantic value, based on the currently active
+	# semantic mode.
+	switch -exact -- $mycurrentmode {
+	    value   { $myparser i_value_clear/reduce $symbol }
+	    leaf    { $myparser i_value_clear/leaf   $symbol }
+	    void    { $myparser i_value_clear }
+	}
+
+	$myparser i_symbol_save $symbol
+
+	# Drop ARS. Unconditional as any necessary reduction was done
+	# already (See (a)), and left the result in SV
+	$myparser i_ast_pop_rewind ; # (Ad 1)
+	$self ASTFinalize
+
+	# Even if parse is ok.
+	$myparser i_error_nonterminal $symbol
+	$myparser i_loc_pop_discard ; # (Ad i)
+	return
+    }
+
+    # And lookahead predicate. We parse the expression against the
+    # input and return the parse result. No input is consumed.
+
+    method & {expression} {
+	$myparser i_loc_push
+
+	    $self {*}$expression
+
+	$myparser i_loc_pop_rewind
+	return
+    }
+
+    # Negated lookahead predicate. We parse the expression against the
+    # input and returns the negated parse result. No input is
+    # consumed.
+
+    method ! {expression} {
+	$myparser i_loc_push
+	$myparser i_ast_push
+
+	$self {*}$expression
+
+	$myparser i_ast_pop_discard/rewind ;# -- fail/ok
+	$myparser i_loc_pop_rewind
+	$myparser i_status_negate
+	return
+    }
+
+    # Parsing an optional expression. This tries to parse the sub
+    # expression. It will never fail, even if the sub expression
+    # itself is not succesful. Consumes only input if it could parse
+    # the sub expression. Like *, but without the repetition.
+
+    method ? {expression} {
+	$myparser i_loc_push
+	$myparser i_error_push
+
+	$self {*}$expression
+
+	$myparser i_error_pop_merge
+	$myparser i_loc_pop_rewind/discard ;# -- fail/ok
+	$myparser i_status_ok
+	return
+    }
+
+    # Parse zero or more repetitions of an expression (Kleene
+    # closure).  This consumes as much input as we were able to parse
+    # the sub expression. The expresion as a whole is always
+    # succesful, even if the sub expression fails (zero repetitions).
+
+    method * {expression} {
+	# do { ... } while ok.
+	while {1} {
+	    $myparser i_loc_push
+	    $myparser i_error_push
+
+	    $self {*}$expression
+
+	    $myparser i_error_pop_merge
+	    $myparser i_loc_pop_rewind/discard ;# -- fail/ok
+	    $myparser i:ok_continue
+	    break
+	}
+	$myparser i_status_ok
+	return
+    }
+
+    # Parse one or more repetitions of an expression (Positive kleene
+    # closure). This is similar to *, except for one round at the
+    # front which has to parse for success of the whole. This
+    # expression can fail. It will consume only as much input as it
+    # was able to parse.
+
+    method + {expression} {
+	$myparser i_loc_push
+
+	$self {*}$expression
+
+	$myparser i_loc_pop_rewind/discard ;# -- fail/ok
+	$myparser i:fail_return
+
+	$self * $expression
+	return
+    }
+
+    # Parsing a sequence of expressions. This parses each sub
+    # expression in turn, each consuming input. In the case of failure
+    # by one of the sequence's elements nothing is consumed at all.
+
+    method x {args} {
+	$myparser i_loc_push
+	$myparser i_ast_push
+	$myparser i_error_clear
+
+	foreach expression $args {
+	    $myparser i_error_push
+
+	    $self {*}$expression
+
+	    $myparser i_error_pop_merge
+	    # Branch failed, track back and report to caller.
+	    $myparser i:fail_ast_pop_rewind
+	    $myparser i:fail_loc_pop_rewind
+	    $myparser i:fail_return         ; # Stop trying on element failure
+	}
+
+	# All elements OK, squash backtracking state
+	$myparser i_loc_pop_discard
+	$myparser i_ast_pop_discard
+	return
+    }
+
+    # Parsing a series of alternatives (Choice). This parses each
+    # alternative in turn, always starting from the current
+    # location. Nothing is consumed if all alternatives fail. Consumes
+    # as much as was consumed by the succesful branch.
+
+    method / {args} {
+	$myparser i_error_clear
+
+	foreach expression $args {
+	    $myparser i_loc_push
+	    $myparser i_ast_push
+	    $myparser i_error_push
+
+	    $self {*}$expression
+
+	    $myparser i_error_pop_merge
+	    $myparser i_ast_pop_rewind/discard
+	    $myparser i_loc_pop_rewind/discard
+	    $myparser i:fail_continue
+	    return ; # Stop trying on finding a successful branch.
+	}
+
+	# All branches FAIL
+	$myparser i_status_fail
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method Next {} {
+	# We are processing the outer method call into an atomic
+	# parsing expression for error messaging.
+	$myparser i_input_next [regsub {^.*Snit_method} [lreplace [info level -1] 1 4] {}]
+	return
+    }
+
+    method ASTFinalize {} {
+	if {$mycurrentmode ne "void"} {
+	    $myparser i:ok_ast_value_push
+	}
+	upvar 1 savemode savemode
+	set mycurrentmode $savemode
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State Interpreter data structures.
+
+    variable myparser      {}    ; # Our PARAM instantiation.
+    variable myrhs  -array {}    ; # Dictionary mapping nonterminal
+				   # symbols to parsing expressions
+				   # describing their sentence
+				   # structure.
+    variable mymode -array {}    ; # Dictionary mapping nonterminal
+				   # symbols to semantic modes
+				   # (controlling AST generation).
+    variable mystart  epsilon    ; # The parsing expression to start
+				   # the parse process with.
+    variable mycurrentmode value ; # The currently active semantic mode.
+
+    # ### ### ### ######### ######### #########
+    ## Debugging helper. To activate
+    ## string map {{self {*}} {self TRACE {*}}}
+
+    method TRACE {args} {
+	puts |$args|enter
+	set res [$self {*}$args]
+	puts |$args|return
+	return $res
+    }
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide pt::peg::interp 1.0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_op.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_op.tcl
new file mode 100644
index 00000000..604a30be
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_op.tcl
@@ -0,0 +1,375 @@
+# -*- tcl -*-
+# Copyright (c) 2009-2018 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Copyright (c) 2018 Stefan Sobernig <stefan.sobernig@wu.ac.at>
+
+# Utility commands operating on parsing expressions.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.5        ; # Required runtime.
+package require pt::pe         ; # PE basics
+package require pt::pe::op     ; # PE transforms
+package require struct::set    ; # Set operations (symbol sets)
+
+# # ## ### ##### ######## ############# #####################
+##
+
+namespace eval ::pt::peg::op {
+    namespace export \
+	flatten called reachable realizable \
+	drop modeopt minimize dechain
+
+    namespace ensemble create
+
+    namespace eval ::pt::peg::op::drop {
+	namespace export \
+	    unreachable unrealizable
+
+	namespace ensemble create
+    }
+}
+
+# # ## ### ##### ######## #############
+## Public API
+
+proc ::pt::peg::op::flatten {container} {
+    # Flatten all expressions in the grammar, i.e. start expression
+    # and nonterminal symbol right hand sides.
+
+    $container start [pt::pe::op flatten [$container start]]
+
+    foreach {symbol rule} [$container rules] {
+	$container rule $symbol [pt::pe::op flatten $rule]
+    }
+
+    return
+}
+
+proc ::pt::peg::op::called {container} {
+    # Determine static call structure for the nonterminal symbols of
+    # the grammar. Result is dictionary mapping from each symbol to
+    # the symbols it calls. The empty string is used to represent the
+    # start expression (as key).
+
+    lappend dict {} [pt::pe::op called [$container start]]
+
+    foreach {symbol rule} [$container rules] {
+	lappend dict $symbol [pt::pe::op called $rule]
+    }
+
+    return $dict
+}
+
+proc ::pt::peg::op::dechain {container} {
+
+    set changed 1
+    while {$changed} {
+	
+	set chainPairs [dict create]
+	set rules [$container rules]
+	array set modes [$container modes]
+	set changed 0
+	foreach {caller rule} $rules {
+	    lassign $rule op called
+	    if {$op ne "n"} continue
+	    dict set chainPairs $called $caller
+	}
+
+	set ends [struct::set difference \
+			[dict keys $chainPairs] \
+			[dict values $chainPairs]]
+
+	if {[struct::set empty $ends]} {
+	    # stop, given a cycle
+	    break
+	}
+
+	set chainPairs [dict remove $chainPairs {*}$ends]
+	set changed [dict size $chainPairs]
+	
+	if {$changed} {
+	    
+	    dict for {called caller} $chainPairs {
+
+		if {$called in [$container nonterminals]
+		    && !(($modes($caller) ne "value") &&
+		    (($modes($caller) ne "void") ||
+		     ![info exists modes($called)] ||
+		     ($modes($called) ne "void")))} {
+		    
+       		    $container rule $caller [$container rule $called]
+		    
+		} else {
+		    incr changed -1
+		}
+	    }
+	}
+    }
+    
+    return
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::peg::op::modeopt {container} {
+
+    # Optimize the semantic modes of symbols.
+
+    # Rules.
+    # 1. If a symbol X with mode 'value' calls no other symbols,
+    #    i.e. uses only terminal symbols in whatever combination, then
+    #    this can be represented simpler by using mode leaf.
+    #
+    # 2. If a symbol X is only called from symbols with modes 'leaf'
+    #    or 'void' then this symbol should have mode 'void' also, as
+    #    any AST it could generate will be discarded anyway.
+
+    array set calls  [called $container]
+    array set caller [Invert [array get calls]]
+    array set mode   [$container modes]
+    set mode() value
+
+    # calls  = array (x -> called-by-x)
+    # caller = array (x -> users-of-x)
+
+    set changed [$container nonterminals]
+    while {[llength $changed]} {
+	#puts <$changed>
+	set scan $changed
+	set changed {}
+
+	foreach sym $scan {
+	    # Rule 1
+	    if {![llength $calls($sym)] &&
+		($mode($sym) eq "value")} {
+		#puts (1)$sym
+		set mode($sym) leaf
+	    }
+
+	    # Rule 2
+	    set callmode [CallMode $caller($sym) mode]
+	    if {($callmode eq "void") &&
+		($mode($sym) ne "void")} {
+
+		#puts (2)$sym
+		set mode($sym) void
+
+		# This change may change calling context and this call
+		# mode of the symbols we call, so put them back up for
+		# consideration.
+		struct::set add changed $calls($sym)
+	    }
+	}
+    }
+
+    # Save the optimized modes back to the grammar.
+    unset mode()
+    $container modes [array get mode]
+    return
+}
+
+proc ::pt::peg::op::CallMode {callers mv} {
+    upvar 1 $mv mode
+    set res {}
+    foreach sym $callers {
+	struct::set include res $mode($sym)
+    }
+    if {[struct::set contains $res value]} {
+	return value
+    } else {
+	return void
+    }
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::peg::op::minimize {container} {
+    flatten           $container
+    modeopt           $container; # for dechaining
+    dechain           $container
+    drop unrealizable $container
+    drop unreachable  $container
+    modeopt           $container;
+    flatten           $container
+    return
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::peg::op::reachable {container} {
+
+    # We compute the set of all nonterminal symbols which are
+    # reachable from the start expression of the grammar. This is
+    # essentially the transitive closure over [called] and the symbol's
+    # right hand sides, beginning with the start expression.
+
+    set reachable {}
+    set pending [pt::pe::op called [$container start]]
+    set known   [$container nonterminals]
+
+    while {[llength $pending]} {
+	set new $pending
+	set pending {}
+	foreach symbol $new {
+	    if {
+		![struct::set contains $known $symbol] ||
+		[struct::set contains $reachable $symbol]
+	    } continue
+
+	    struct::set add pending \
+		[pt::pe::op called [$container rule $symbol]]
+	}
+
+	# Everything from the previous round is reachable, now that we
+	# expanded it we can even add it to the result.
+	struct::set add reachable $new
+    }
+
+    return $reachable
+}
+
+proc ::pt::peg::op::drop::unreachable {container} {
+
+    set unreachable [struct::set difference \
+			 [$container nonterminals] \
+			 [pt::peg::op reachable $container]]
+
+    if {![llength $unreachable]} return
+
+    $container remove {*}$unreachable
+    return
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::peg::op::realizable {container} {
+
+    # We compute the set of all nonterminal symbols which are
+    # realizable, i.e. can derive pure terminal phrases. This is done
+    # iteratively, starting with state unrealizable for all and any,
+    # and then updating all symbols which are realizable, propagating
+    # changes, until nothing changes any more.
+
+    set realizable {}
+    array set caller [Invert [called $container]]
+    # caller = array (x -> list(caller-of-x))
+
+    set     maychange [$container nonterminals]
+    lappend maychange {} ;# special marker for the start expression.
+
+    while {[llength $maychange]} {
+	set scan $maychange
+	set maychange {}
+
+	foreach symbol $scan {
+	    # Ignore symbols we have a settled result for.
+	    if {[struct::set contains $realizable $symbol]} \
+		continue
+
+	    set real [pt::pe bottomup pt::peg::op::Realizable \
+			  [expr {
+				 ($symbol eq {})
+				 ? [$container start]
+				 : [$container rule $symbol]
+			     }]]
+	    if {!$real} continue
+
+	    struct::set include realizable $symbol
+
+	    # Symbol may be unreachable, i.e. have no callers.
+	    if {![info exists caller($symbol)]} continue
+	    struct::set add maychange $caller($symbol)
+	}
+    }
+
+    return $realizable
+}
+
+proc ::pt::peg::op::Realizable {pe op arguments} {
+    switch -exact -- $op {
+	n {
+	    upvar 1 realizable realizable
+	    lassign $arguments symbol
+	    return [struct::set contains $realizable $symbol]
+	}
+	/ {
+	    # Choice is realizable if we have at least one realizable
+	    # branch. This is also the place where we have to remove
+	    # unrealizable children when we drop unrealizable symbols
+	    # from a grammar.
+
+	    return [tcl::mathfunc::max {*}$arguments]
+	}
+	x - + - & - ! {
+	    # All other operators are realizable if and only if all
+	    # its children are realizable.
+
+	    return [tcl::mathfunc::min {*}$arguments]
+	}
+	default {
+	    # Terminals, special forms, Kleene closure (*), and
+	    # optionals (?) are realizable by definition.
+	    return 1
+	}
+    }
+}
+
+proc ::pt::peg::op::drop::unrealizable {container} {
+
+    #set     all [$container nonterminals]
+    set     all [::pt::peg::op reachable $container]
+    lappend all {} ; # marker for start expression.
+
+    set unrealizable \
+	[struct::set difference \
+	     $all [pt::peg::op realizable $container]]
+
+    if {![llength $unrealizable]} return
+
+    if {[struct::set contains $unrealizable {}]} {
+	struct::set exclude unrealizable {}
+	$container start epsilon
+    }
+
+    # Drop the unrealizable symbols.
+
+    $container remove {*}$unrealizable
+
+    # Phase II. For the remaining symbols, if any, rewrite their
+    # expressions to get rid of the references to the dropped symbols
+    # (these may occur in choice (/) operators).
+
+    foreach symbol [$container nonterminals] {
+	$container rule $symbol \
+	    [pt::pe::op drop $unrealizable \
+		 [$container rule $symbol]]
+    }
+    return
+}
+
+# # ## ### ##### ######## #############
+## Internals
+
+proc ::pt::peg::op::Invert {dict} {
+    # dict   = dict (a -> list(b))
+    # result = dict (b -> list(a)) 
+    array set tmp {}
+    foreach {a blist} $dict {
+	foreach b $blist {
+	    lappend tmp($b) $a
+	}
+    }
+    return [array get tmp]
+}
+
+# # ## ### ##### ######## #############
+## State / Configuration :: n/a
+
+namespace eval ::pt::peg::op {}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide pt::peg::op 1.1.0
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_container.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_container.tcl
new file mode 100644
index 00000000..4ecc06f0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_container.tcl
@@ -0,0 +1,345 @@
+# peg_to_container.tcl --
+#
+#	Conversion from PEG to CONTAINER (Tcl code).
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pt_peg_to_container.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $
+
+# This package takes the canonical serialization of a parsing
+# expression grammar and produces text in CONTAINER format, a form
+# of Tcl code which defines a snit::type whose instances store the
+# converted grammar.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require pt::peg ; # Verification that the input is
+				     # proper.
+package require pt::pe             ; # Conversion of expressions.
+package require text::write        ; # Text generation support
+package require char               ; # Character quoting needed for
+				     # the Tcl code to be correct.
+
+# ### ### ### ######### ######### #########
+##
+
+namespace eval ::pt::peg::to::container {
+    namespace export \
+	reset configure convert
+
+    namespace ensemble create
+}
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc ::pt::peg::to::container::reset {} {
+    variable template @code@
+    variable mode     bulk
+    variable name     a_pe_grammar
+    variable file     unknown
+    variable user     unknown
+    return
+}
+
+proc ::pt::peg::to::container::configure {args} {
+    variable template
+    variable mode
+    variable name
+    variable file
+    variable user
+
+    if {[llength $args] == 0} {
+	return [list \
+		    -file     $file \
+		    -mode     $mode \
+		    -name     $name \
+		    -template $template \
+		    -user     $user]
+    } elseif {[llength $args] == 1} {
+	lassign $args option
+	set variable [string range $option 1 end]
+	if {[info exists $variable]} {
+	    return [set $variable]
+	} else {
+	    return -code error "Expected one of -file, -mode, -name, -template, or -user, got \"$option\""
+	}
+    } elseif {[llength $args] % 2 == 0} {
+	foreach {option value} $args {
+	    set variable [string range $option 1 end]
+	    if {![info exists $variable]} {
+		return -code error "Expected one of -file, -mode, -name, -template, or -user, got \"$option\""
+	    }
+	}
+	foreach {option value} $args {
+	    set variable [string range $option 1 end]
+	    switch -exact -- $variable {
+		mode {
+		    if {$value ni {bulk incremental}} {
+			return -code error "Expected bulk, or incremental, got \"$value\""
+		    }
+		}
+		template {
+		    if {$value eq {}} {
+			return -code error "Expected template, got the empty string"
+		    }
+		}
+		name -
+		file -
+		user { }
+	    }
+	    set $variable $value
+	}
+    } else {
+	return -code error {wrong#args, expected option value ...}
+    }
+}
+
+proc ::pt::peg::to::container::convert {serial} {
+    variable user
+    variable file
+    variable name
+    variable mode
+    variable template
+
+    ::pt::peg verify-as-canonical $serial
+
+    # TODO :: Reformat expressions for line-length (wrapping)
+    # TODO :: Reformat 'add' bulk symbols for line-length (wrapping).
+    # TODO :: Generate a read-only container.
+
+    # Unpack the serialization, known as canonical.
+    array set peg $serial
+    array set peg $peg(pt::grammar::peg)
+    unset     peg(pt::grammar::peg)
+
+    # Determine the field size for nonterminal symbol names.
+    set smax [text::write maxlen [dict keys $peg(rules)]]
+
+    # Assemble the output, various pieces.
+    text::write reset
+    StartExpression $peg(start)
+    Rules           $peg(rules) $smax
+    Type
+
+    # At last retrieve the fully assembled code and integrate with the
+    # chosen template.
+    return [string map \
+		[list \
+		     @user@   $user \
+		     @format@ CONTAINER \
+		     @file@   $file \
+		     @name@   $name \
+		     @mode@   $mode \
+		     @code@   [text::write get]] $template]
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Internals
+
+proc ::pt::peg::to::container::StartExpression {startexpression} {
+    text::write clear
+
+    text::write field   install myg using pt::peg::container {${selfns}::G}
+    text::write /line
+
+    text::write field   {$myg} start [Expression $startexpression]
+    text::write /line
+
+    text::write indent 4
+    text::write store START
+    return
+}
+
+proc ::pt::peg::to::container::Rules {rules smax} {
+    variable mode
+    text::write clear
+    if {[llength $rules]} {
+	text::write /line
+	switch -exact -- $mode {
+	    bulk        { BulkLoading        $rules $smax }
+	    incremental { IncrementalLoading $rules $smax }
+	}
+
+	text::write field  return
+	text::write /line
+
+	text::write indent 4
+    }
+    text::write store RULES
+    return
+}
+
+proc ::pt::peg::to::container::BulkLoading {rules smax} {
+    # 2 phases. First reshuffle the input into bulk
+    # dictionaries, then write them.
+
+    foreach {symbol def} $rules {
+	lassign $def _ is _ mode
+	lappend symbols $symbol
+	lappend modes   $symbol $mode
+	lappend rhs     $symbol $is
+    }
+
+    text::write clear
+    foreach {symbol mode} $modes {
+	text::write fieldl $smax $symbol
+	text::write field        $mode
+	text::write /line
+    }
+    text::write indent 4
+    text::write store MODES
+
+    text::write clear
+    foreach {symbol is} $rhs {
+	text::write fieldl $smax $symbol
+	text::write field        [Expression $is]
+	text::write /line
+    }
+    text::write indent 4
+    text::write store RULES
+
+    # note - allow line wrapping, max length of line?
+    text::write clear
+    text::write field {$myg} {add  } {*}$symbols
+    text::write /line
+
+    text::write field {$myg} modes \{
+    text::write /line
+
+    text::write recall MODES
+
+    text::write field \}
+    text::write /line
+
+    text::write field {$myg} rules \{
+    text::write /line
+
+    text::write recall RULES
+
+    text::write field \}
+    text::write /line
+    return
+}
+
+proc ::pt::peg::to::container::IncrementalLoading {rules smax} {
+    foreach {symbol def} $rules {
+	lassign $def _ is _ mode
+
+	text::write field        {$myg}
+	text::write fieldl 5     add
+	text::write fieldl $smax $symbol
+	text::write /line
+
+	text::write field        {$myg}
+	text::write fieldl 5     mode
+	text::write fieldl $smax $symbol
+	text::write field        $mode
+	text::write /line
+
+	text::write field        {$myg}
+	text::write fieldl 5     rule
+	text::write fieldl $smax $symbol
+	text::write field        [Expression $is]
+	text::write /line
+
+	text::write /line
+    }
+    return
+}
+
+proc ::pt::peg::to::container::TypeBody {} {
+    text::write clear
+
+    text::write field constructor "{}" \{
+    text::write /line
+
+    text::write recall START
+    text::write recall RULES
+
+    text::write field \}
+    text::write /line
+
+    text::write /line
+
+    text::write field component myg
+    text::write /line
+
+    text::write field delegate method * to myg
+    text::write /line
+
+    text::write indent 4
+    text::write store BODY
+    return
+}
+
+proc ::pt::peg::to::container::Type {} {
+    variable name
+
+    TypeBody
+
+    text::write clear
+
+    text::write field snit::type $name \{
+    text::write /line
+
+    text::write recall BODY
+
+    text::write field \}
+    text::write /line
+    return
+}
+
+proc ::pt::peg::to::container::Expression {pe} {
+    return [list [pt::pe bottomup \
+		      [namespace current]::Convert \
+		      $pe]]
+}
+
+proc ::pt::peg::to::container::Convert {pe operator arguments} {
+    if {$operator eq "t"} {
+	return "$operator [char quote tcl [lindex $arguments 0]]"
+    } elseif {$operator eq ".."} {
+	lassign $arguments ca ce
+	return "$operator [char quote tcl $ca] [char quote tcl $ce]"
+    } else {
+	return $pe
+    }
+    return -code error {INTERNAL ERROR}
+}
+
+# ### ### ### ######### ######### #########
+## Configuration
+
+namespace eval ::pt::peg::to::container {
+
+    variable template @code@       ; # A string. Specifies how to
+				     # embed the generated code into a
+				     # larger frame- work (the
+				     # template).
+    variable mode     bulk         ; # enum (bulk,
+				     # incremental). Chooses between
+				     # code for bulk or incrementally
+				     # loading of the grammar into its
+				     # container.
+    variable name     a_pe_grammar ; # String. Name of the grammar.
+    variable file     unknown      ; # String. Name of the file or
+				     # other entity the grammar came
+				     # from.
+    variable user     unknown      ; # String. Name of the user on
+				     # which behalf the conversion has
+				     # been invoked.
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::to::container 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_cparam.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_cparam.tcl
new file mode 100644
index 00000000..f8298f7c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_cparam.tcl
@@ -0,0 +1,1661 @@
+# peg_to_param.tcl --
+#
+#	Conversion of PEG to C PARAM, customizable text blocks.
+#
+# Copyright (c) 2009-2014 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pt_peg_to_cparam.tcl,v 1.2 2010/04/07 19:40:54 andreas_kupries Exp $
+
+# This package takes the canonical serialization of a parsing
+# expression grammar and produces text in PARAM assembler, i.e.
+# readable machine code for the PARAM virtual machine.
+
+## NOTE: Should have cheat sheet of PARAM instructions (which parts of
+## the arch state they touch, and secondly, bigger effects).
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package  require Tcl 8.5
+package  require pt::peg             ; # Verification that the input
+				       # is proper.
+package  require pt::pe              ; # Walking an expression.
+package  require pt::pe::op          ; # String/Class fusing
+package  require text::write         ; # Text generation support
+package  require char
+
+# ### ### ### ######### ######### #########
+##
+
+namespace eval ::pt::peg::to::cparam {
+    namespace export \
+	reset configure convert
+
+    namespace ensemble create
+}
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc ::pt::peg::to::cparam::reset {} {
+    variable insertcmd {}             ; # -insert-command (hook)
+    variable template  @code@         ; # -template
+    variable name      a_pe_grammar   ; # -name
+    variable file      unknown        ; # -file
+    variable user      unknown        ; # -user
+    variable self      {}             ; # -self-command
+    variable ns        {}             ; # -namespace
+    variable def       static         ; # -fun-qualifier
+    variable main      __main         ; # -main
+    variable indent    0              ; # -indent
+    variable comments  1              ; # -comments
+    variable prelude   {}             ; # -prelude
+    variable statedecl {RDE_PARAM p}  ; # -state-decl
+    variable stateref  {p}            ; # -state-ref
+    variable strings   p_string       ; # -string-varname
+    return
+}
+
+proc ::pt::peg::to::cparam::configure {args} {
+    variable template
+    variable name
+    variable file
+    variable user
+    variable self
+    variable ns
+    variable def
+    variable main
+    variable omap
+    variable indent
+    variable insertcmd
+    variable comments
+    variable prelude
+    variable statedecl
+    variable stateref
+    variable strings
+
+    if {[llength $args] == 0} {
+	return [list \
+		    -comments        $comments \
+		    -file            $file \
+		    -fun-qualifier   $def \
+		    -indent          $indent \
+		    -insert-command  $insertcmd \
+		    -main            $main \
+		    -name            $name \
+		    -namespace       $ns \
+		    -self-command    $self \
+		    -state-decl      $statedecl \
+		    -state-ref       $stateref \
+		    -string-varname  $strings \
+		    -template        $template \
+		    -user            $user \
+		   ]
+    } elseif {[llength $args] == 1} {
+	lassign $args option
+	set variable [string range $option 1 end]
+	if {[info exists omap($variable)]} {
+	    return [set $omap($variable)]
+	} else {
+	    # TODO: compute this string dynamically.
+	    return -code error "Expected one of -comments, -file, -fun-qualifier, -indent, -insert-cmd, -main, -name, -namespace, -self-command, -state-decl, -state-ref, -string-varname, -template, or -user, got \"$option\""
+	}
+    } elseif {[llength $args] % 2 == 0} {
+	foreach {option value} $args {
+	    set variable [string range $option 1 end]
+	    if {![info exists omap($variable)]} {
+		# TODO: compute this string dynamically.
+		return -code error "Expected one of -comments, -file, -fun-qualifier, -indent, -insert-cmd, -main, -name, -namespace, -self-command, -state-decl, -state-ref, -string-varname, -template, or -user, got \"$option\""
+	    }
+	}
+	foreach {option value} $args {
+	    set variable $omap([string range $option 1 end])
+	    switch -exact -- $variable {
+		template {
+		    if {$value eq {}} {
+			return -code error "Expected template, got the empty string"
+		    }
+		}
+		indent {
+		    if {![string is integer -strict $value] || ($value < 0)} {
+			return -code error "Expected int > 0, got \"$value\""
+		    }
+		}
+		comments {
+		    if {![string is boolean -strict $value]} {
+			return -code error "Expected boolean, got \"$value\""
+		    }
+		}
+		insert-cmd -
+		statedecl -
+		stateref -
+		strings -
+		self -
+		def -
+		ns -
+		main -
+		name -
+		file -
+		user { }
+	    }
+	    set $variable $value
+	}
+    } else {
+	return -code error {wrong#args, expected option value ...}
+    }
+}
+
+proc ::pt::peg::to::cparam::convert {serial} {
+    variable Op::Asm::cache
+    variable template
+    variable name
+    variable file
+    variable user
+    variable self
+    variable ns
+    variable def
+    variable main
+    variable indent
+    variable insertcmd
+    variable prelude
+    variable statedecl
+    variable stateref
+    variable strings
+
+    Op::Asm::Setup
+
+    ::pt::peg verify-as-canonical $serial
+
+    # Unpack the serialization, known as canonical
+    array set peg $serial
+    array set peg $peg(pt::grammar::peg)
+    unset     peg(pt::grammar::peg)
+
+    set modes {}
+    foreach {symbol symdef} $peg(rules) {
+	lassign $symdef _ is _ mode
+	lappend modes $symbol $mode
+    }
+
+    text::write reset
+
+    # Fixed elements of the string table as needed by the lower level
+    # PARAM functions (class tests, see param.c, enum test_class).
+    # ** Keep in sync **
+    #
+    # Maybe move the interning into the lower level, i.e. PARAM ?
+
+    Op::Asm::String alnum
+    Op::Asm::String alpha
+    Op::Asm::String ascii
+    Op::Asm::String control
+    Op::Asm::String ddigit
+    Op::Asm::String digit
+    Op::Asm::String graph
+    Op::Asm::String lower
+    Op::Asm::String print
+    Op::Asm::String punct
+    Op::Asm::String space
+    Op::Asm::String upper
+    Op::Asm::String wordchar
+    Op::Asm::String xdigit
+
+    Op::Asm::Header {Declaring the parse functions}
+    text::write /line
+    text::write store FORWARD
+
+    text::write clear
+    set blocks {}
+
+    # Translate all expressions/symbols, results are stored in
+    # text::write blocks, command results are the block ids.
+
+    set start [pt::pe::op flatten \
+		   [pt::pe::op fusechars \
+			[pt::pe::op flatten \
+			     $peg(start)]]]
+
+    lappend blocks [set start [Expression $start $modes]]
+
+    foreach {symbol symdef} $peg(rules) {
+	lassign $symdef _ is _ mode
+	set is [pt::pe::op flatten \
+		    [pt::pe::op fusechars \
+			 [pt::pe::op flatten \
+			      $is]]]
+	lappend blocks [Symbol $symbol $mode $is $modes]
+    }
+
+    # Assemble the output from the stored blocks.
+    text::write clear
+    text::write recall FORWARD
+    text::write /line
+
+    Op::Asm::Header {Precomputed table of strings (symbols, error messages, etc.).}
+    text::write /line
+    set n [llength $cache(_strings)]
+    text::write field static char const* @strings@ \[$n\] = \{
+    text::write /line
+    foreach s [lrange $cache(_strings) 0 end-1] {
+	text::write field "   " ${s},
+	text::write /line
+    }
+    text::write field "   " [lindex $cache(_strings) end]
+    text::write /line
+    text::write field \}\;
+    text::write /line
+    text::write /line
+
+    Op::Asm::Header {Grammar Start Expression}
+    Op::Asm::FunStart @main@
+    Op::Asm::Call $start 0
+    Op::Asm::CStmt return
+    Op::Asm::FunClose
+
+    foreach b $blocks {
+	Op::Asm::Use $b
+	text::write /line
+    }
+
+    # At last retrieve the fully assembled result and integrate with
+    # the chosen template.
+
+    set code [text::write get]
+    if {$indent} {
+	set code [Indent $code $indent]
+    }
+
+    set xprelude $prelude ; if {$xprelude ne {}} { set xprelude " $xprelude" }
+    set xself    $self    ; if {$xself    ne {}} { append xself { } }
+
+    # I. run code through the insertcmd hook (if specified) to prepare it for embedding
+    if {[llength $insertcmd]} {
+	set code [{*}$insertcmd $code]
+    }
+
+    # II. Phase 1 merge of code into the template.
+    #     (Placeholders only in the template)
+    lappend map @user@   $user
+    lappend map @format@ C/PARAM
+    lappend map @file@   $file
+    lappend map @name@   $name
+    lappend map @code@   $code
+    set code [string map $map $template]
+    unset map
+
+    # III. Phase 2 merge of code into the template.
+    #      (Placeholders in generated code, and template).
+    lappend map @statedecl@  $statedecl
+    lappend map @stateref@   $stateref
+    lappend map @strings@    $strings
+    lappend map { @prelude@} $xprelude
+    lappend map {@self@ }    $xself
+    lappend map @def@        $def
+    lappend map @ns@         $ns
+    lappend map @main@       $main
+    set code [string map $map $code]
+
+    return $code
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Internals
+
+proc ::pt::peg::to::cparam::Indent {text n} {
+    set b [string repeat { } $n]
+    return $b[join [split $text \n] \n$b]
+}
+
+proc ::pt::peg::to::cparam::Expression {expression modes} {
+    return [pt::pe bottomup \
+		[list [namespace current]::Op $modes] \
+		$expression]
+}
+
+proc ::pt::peg::to::cparam::Symbol {symbol mode rhs modes} {
+    set expression [Expression $rhs $modes]
+
+    text::write clear
+    Op::Asm::Header "$mode Symbol '$symbol'"
+    text::write store FUN_HEADER
+
+    Op::Asm::Start
+    Op::Asm::ReExpression $symbol
+    Op::Asm::GenAST $expression
+    Op::Asm::PE $rhs
+
+    set gen [dict get $result gen]
+
+    Op::Asm::Function sym_$symbol {
+	# Message is Tcl list. Quote for C embedding.
+	set msg    [Op::Asm::String [char quote cstring [list n $symbol]]]
+	# Quote for C embedding.
+	set symbol [Op::Asm::String [char quote cstring $symbol]]
+
+	# We have six possibilites for the combination of AST node
+	# generation by the rhs and AST generation by the symbol. Two
+	# of these (leaf/0, value/0 coincide, leaving 5). This
+	# controls the use of AS/ARS instructions.
+
+	switch -exact -- $mode/$gen {
+	    value/1 {
+		# Generate value for symbol, rhs may have generated
+		# AST nodes as well, keep rhs
+
+		Op::Asm::CBlock if (rde_param_i_symbol_start_d (@stateref@, $symbol)) return \;
+		Op::Asm::Call $expression
+		Op::Asm::Ins symbol_done_d_reduce $symbol $msg
+
+		#Op::Asm::CBlock if (!rde_param_i_symbol_restore (@stateref@, $symbol)) \{
+		#Op::Asm::>>> 4
+
+		#Op::Asm::Ins loc_push
+		#Op::Asm::Ins ast_push
+
+		#Op::Asm::Call $expression
+
+		#Op::Asm::CBlock if (rde_param_query_st(@stateref@)) \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins value_reduce $symbol
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \} else \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins value_clear
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \}
+
+		#Op::Asm::Ins symbol_save        $symbol
+		#Op::Asm::Ins error_nonterminal  $symbol
+
+		#Op::Asm::Ins ast_pop_rewind
+		#Op::Asm::Ins loc_pop_discard
+
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \}
+
+		#Op::Asm::CBlock if (rde_param_query_st(@stateref@)) \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins ast_value_push
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \}
+	    }
+	    leaf/0 -
+	    value/0 {
+		# Generate value for symbol, rhs cannot generate its
+		# own AST nodes => leaf/0.
+
+		Op::Asm::CBlock if (rde_param_i_symbol_start (@stateref@, $symbol)) return \;
+		Op::Asm::Call $expression
+		Op::Asm::Ins symbol_done_leaf $symbol $msg
+
+		#Op::Asm::CBlock if (!rde_param_i_symbol_restore (@stateref@, $symbol)) \{
+		#Op::Asm::>>> 4
+
+		#Op::Asm::Ins loc_push
+
+		#Op::Asm::Call $expression
+
+		#Op::Asm::CBlock if (rde_param_query_st(@stateref@)) \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins value_leaf $symbol
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \} else \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins value_clear
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \}
+
+		#Op::Asm::Ins symbol_save       $symbol
+		#Op::Asm::Ins error_nonterminal $symbol
+
+		#Op::Asm::Ins loc_pop_discard
+
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \}
+
+		#Op::Asm::CBlock if (rde_param_query_st(@stateref@)) \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins ast_value_push
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \}
+	    }
+	    leaf/1 {
+		# Generate value for symbol, rhs may have generated
+		# AST nodes as well, discard rhs.
+
+		Op::Asm::CBlock if (rde_param_i_symbol_start_d (@stateref@, $symbol)) return \;
+		Op::Asm::Call $expression
+		Op::Asm::Ins symbol_done_d_leaf $symbol $msg
+
+		#Op::Asm::CBlock if (!rde_param_i_symbol_restore (@stateref@, $symbol)) \{
+		#Op::Asm::>>> 4
+
+		#Op::Asm::Ins loc_push
+		#Op::Asm::Ins ast_push
+
+		#Op::Asm::Call $expression
+
+		#Op::Asm::CBlock if (rde_param_query_st(@stateref@)) \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins value_leaf $symbol
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \} else \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins value_clear
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \}
+
+		#Op::Asm::Ins symbol_save       $symbol
+		#Op::Asm::Ins error_nonterminal $symbol
+
+		#Op::Asm::Ins ast_pop_rewind
+		#Op::Asm::Ins loc_pop_discard
+
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \}
+
+		#Op::Asm::CBlock if (rde_param_query_st(@stateref@)) \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins ast_value_push
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \}
+	    }
+	    void/1 {
+		# Generate no value for symbol, rhs may have generated
+		# AST nodes as well, discard rhs.
+		# // test case missing //
+
+		Op::Asm::CBlock if (rde_param_i_symbol_void_start_d (@stateref@, $symbol)) return \;
+		Op::Asm::Call $expression
+		Op::Asm::Ins symbol_done_d_void $symbol $msg
+
+		#Op::Asm::CBlock if (!rde_param_i_symbol_restore (@stateref@, $symbol)) \{
+		#Op::Asm::>>> 4
+
+		#Op::Asm::Ins loc_push
+		#Op::Asm::Ins ast_push
+
+		#Op::Asm::Call $expression
+
+		#Op::Asm::Ins value_clear
+
+		#Op::Asm::Ins symbol_save       $symbol
+		#Op::Asm::Ins error_nonterminal $symbol
+
+		#Op::Asm::Ins ast_pop_rewind
+		#Op::Asm::Ins loc_pop_discard
+
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \}
+	    }
+	    void/0 {
+		# Generate no value for symbol, rhs cannot generate
+		# its own AST nodes. Nothing to save nor discard.
+
+		Op::Asm::CBlock if (rde_param_i_symbol_void_start (@stateref@, $symbol)) return \;
+		Op::Asm::Call $expression
+		Op::Asm::Ins symbol_done_void $symbol $msg
+
+		#Op::Asm::CBlock if (!rde_param_i_symbol_restore (@stateref@, $symbol)) \{
+		#Op::Asm::>>> 4
+
+		#Op::Asm::Ins loc_push
+
+		#Op::Asm::Call $expression
+
+		#Op::Asm::Ins value_clear
+
+		#Op::Asm::Ins symbol_save       $symbol
+		#Op::Asm::Ins error_nonterminal $symbol
+
+		#Op::Asm::Ins loc_pop_discard
+
+		#Op::Asm::<<< 4
+		#Op::Asm::CBlock \}
+	    }
+	}
+    } $expression
+    Op::Asm::Done
+}
+
+namespace eval ::pt::peg::to::cparam::Op {
+    namespace export \
+	alpha alnum ascii control digit graph lower print \
+	punct space upper wordchar xdigit ddigit \
+	dot epsilon t .. n ? * + & ! x / 
+}
+
+proc ::pt::peg::to::cparam::Op {modes pe op arguments} {
+    return [namespace eval Op [list $op $modes {*}$arguments]]
+}
+
+proc ::pt::peg::to::cparam::Op::epsilon {modes} {
+    Asm::Start
+    Asm::ReExpression epsilon
+    Asm::Direct {
+	Asm::Ins status_ok
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::cparam::Op::dot {modes} {
+    Asm::Start
+    Asm::ReExpression dot
+    Asm::Direct {
+	Asm::Ins input_next [Asm::String dot]
+    }
+    Asm::Done
+}
+
+foreach test {
+    alpha alnum ascii control digit graph lower print
+    punct space upper wordchar xdigit ddigit
+} {
+    proc ::pt::peg::to::cparam::Op::$test {modes} \
+	[string map [list @OP@ $test] {
+	    Asm::Start
+	    Asm::ReExpression @OP@
+	    Asm::Direct {
+		set m [Asm::String @OP@]
+		#Asm::Ins input_next [Asm::String @OP@]
+		#Asm::CStmt if (!rde_param_query_st(@stateref@)) return
+		#Asm::Ins test_@OP@
+		Asm::Ins next_@OP@ $m
+	    }
+	    Asm::Done
+	}]
+}
+
+proc ::pt::peg::to::cparam::Op::t {modes char} {
+    Asm::Start
+    Asm::ReTerminal t $char
+    Asm::Direct {
+	# Message is Tcl list. Quote for C embedding.
+	set msg  [Asm::String [char quote cstring [list t $char]]]
+	# Quote for C embedding.
+	set char [char quote cstring $char]
+
+	#Asm::Ins input_next $msg
+	#Asm::CStmt if (!rde_param_query_st(@stateref@)) return
+	#Asm::Ins test_char \"$char\" $msg
+	Asm::Ins next_char \"$char\" $msg
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::cparam::Op::.. {modes chs che} {
+    Asm::Start
+    Asm::ReTerminal .. $chs $che
+    Asm::Direct {
+	# Message is Tcl list. Quote for C embedding.
+	set msg [Asm::String [char quote cstring [list .. $chs $che]]]
+
+	# Quote for C embedding
+	set chs [char quote cstring $chs]
+	set che [char quote cstring $che]
+
+	#Asm::Ins input_next $msg
+	#Asm::CStmt if (!rde_param_query_st(@stateref@)) return
+	#Asm::Ins test_range \"$chs\" \"$che\" $msg
+	Asm::Ins next_range \"$chs\" \"$che\" $msg
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::cparam::Op::str {modes args} {
+    Asm::Start
+    Asm::ReTerminal str {*}$args
+    Asm::Direct {
+	set str [join $args {}]
+	# Message is Tcl list. Quote for C embedding.
+	set msg [Asm::String [char quote cstring [list str $str]]]
+	# Quote for C embedding
+	set str [char quote cstring $str]
+
+	# Without fusing this would be rendered as a sequence of
+	# characters, with associated stack churn for each
+	# character/part (See Op::x, void/all).
+
+	Asm::Ins next_str \"$str\" $msg
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::cparam::Op::cl {modes args} {
+    # rorc = Range-OR-Char-List
+    Asm::Start
+    Asm::ReTerminal cl {*}$args
+    Asm::Direct {
+	# Without fusing this would be rendered as a choice of
+	# characters, with associated stack churn for each
+	# character/branch (See Op::/, void/all).
+
+	set cl  [join [Ranges {*}$args] {}]
+	# Message is Tcl list. Quote for C embedding.
+	set msg [Asm::String [char quote cstring [list cl $cl]]]
+	# Quote for C embedding
+	set cl  [char quote cstring $cl]
+
+	Asm::Ins next_class \"$cl\" $msg
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::cparam::Op::Ranges {args} {
+    set res {}
+    foreach rorc $args { lappend res [Range $rorc] }
+    return $res
+}
+
+proc ::pt::peg::to::cparam::Op::Range {rorc} {
+    # See also pt::peg::to::peg
+
+    # We use string ops here to distinguish terminals and ranges. The
+    # input can be a single char, not a list, and further the char may
+    # not be a proper list. Example: double-apostroph.
+    if {[string length $rorc] > 1} {
+	lassign $rorc s e
+
+	# The whole range is expanded into its full set of characters.
+	# Beware, this may blow the process if the range tries to
+	# match a substantial part of the unicode character set. We
+	# should see if there is a way to keep it encoded as range
+	# without giving up on the fast matching.
+
+	set s [scan $s %c]
+	set e [scan $e %c]
+
+	set res {}
+	for {set i $s} {$i <= $e} {incr i} {
+	    append res [format %c $i]
+	}
+	return $res
+    } else {
+	return $rorc ;#[char quote tcl $rorc]
+    }
+}
+
+proc ::pt::peg::to::cparam::Op::n {modes symbol} {
+    # symbol mode determines AST generation
+    # void       => non-generative,
+    # leaf/value => generative.
+
+    Asm::Start
+    Asm::ReTerminal n $symbol
+
+    if {![dict exists $modes $symbol]} {
+	# Incomplete grammar. The symbol has no definition.
+	Asm::Direct {
+	    Asm::CStmt "/* Undefined symbol '$symbol' */"
+	    Asm::Ins status_fail
+	}
+    } else {
+	Asm::GenAST [list gen [expr { [dict get $modes $symbol] ne "void" }]]
+	Asm::Direct {
+	    Asm::Self sym_$symbol
+	}
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::cparam::Op::& {modes expression} {
+    # Note: This operation could be inlined, as it has no special
+    #       control flow. Not done to make the higher-level ops are
+    #       similar in construction and use = consistent and simple.
+
+    Asm::Start
+    Asm::ReExpression & $expression
+    Asm::GenAST $expression
+
+    Asm::Function [Asm::NewBlock ahead] {
+	Asm::Ins loc_push
+	Asm::Call $expression
+	Asm::Ins loc_pop_rewind
+    } $expression
+    Asm::Done
+}
+
+proc ::pt::peg::to::cparam::Op::! {modes expression} {
+    # Note: This operation could be inlined, as it has no special
+    #       control flow. Not done to make the higher-level ops are
+    #       similar in construction and use = consistent and simple.
+
+    Asm::Start
+    Asm::ReExpression ! $expression
+    if {[dict get $expression gen]} {
+	Asm::Function [Asm::NewBlock notahead] {
+	    # The sub-expression may generate AST elements. We must
+	    # not pass them through.
+
+	    #Asm::Ins loc_push
+	    #Asm::Ins ast_push
+
+	    Asm::Ins notahead_start_d
+	    Asm::Call $expression
+	    Asm::Ins notahead_exit_d
+
+	    #Asm::CBlock if (rde_param_query_st(@stateref@)) \{
+	    #Asm::>>> 4
+	    #Asm::Ins ast_pop_rewind
+	    #Asm::<<< 4
+	    #Asm::CBlock \} else \{
+	    #Asm::>>> 4
+	    #Asm::Ins ast_pop_discard
+	    #Asm::<<< 4
+	    #Asm::CBlock \}
+
+	    #Asm::Ins loc_pop_rewind
+	    #Asm::Ins status_negate
+	} $expression
+    } else {
+	Asm::Function [Asm::NewBlock notahead] {
+	    # The sub-expression cannot generate AST elements. We can
+	    # ignore AS/ARS, simplifying the code.
+
+	    Asm::Ins loc_push
+	    Asm::Call $expression
+	    Asm::Ins notahead_exit
+
+	    #Asm::Ins loc_pop_rewind
+	    #Asm::Ins status_negate
+	} $expression
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::cparam::Op::? {modes expression} {
+    # Note: This operation could be inlined, as it has no special
+    #       control flow. Not done to make the higher-level ops are
+    #       similar in construction and use => consistent and simple.
+
+    Asm::Start
+    Asm::ReExpression ? $expression
+    Asm::GenAST $expression
+
+    Asm::Function [Asm::NewBlock optional] {
+	#Asm::Ins loc_push
+	#Asm::Ins error_push
+
+	Asm::Ins state_push_2
+	Asm::Call $expression
+	Asm::Ins state_merge_ok
+
+	#Asm::Ins error_pop_merge
+
+	#Asm::CBlock if (rde_param_query_st(@stateref@)) \{
+	#Asm::>>> 4
+	#Asm::Ins loc_pop_discard
+	#Asm::<<< 4
+	#Asm::CBlock \} else \{
+	#Asm::>>> 4
+	#Asm::Ins loc_pop_rewind
+	#Asm::<<< 4
+	#Asm::CBlock \}
+
+	#Asm::Ins status_ok
+    } $expression
+    Asm::Done
+}
+
+proc ::pt::peg::to::cparam::Op::* {modes expression} {
+    Asm::Start
+    Asm::ReExpression * $expression
+    Asm::GenAST $expression
+
+    Asm::Function [Asm::NewBlock kleene] {
+	Asm::CBlock while (1) \{
+	Asm::>>> 4
+	#Asm::Ins loc_push
+	#Asm::Ins error_push
+
+	Asm::Ins state_push_2
+	Asm::Call $expression
+	Asm::CStmt if (rde_param_i_kleene_close(@stateref@)) return
+
+	#Asm::Ins error_pop_merge
+
+	#Asm::CStmt if (!rde_param_query_st(@stateref@)) break
+	#Asm::Ins loc_pop_discard
+	Asm::<<< 4
+	Asm::CBlock \}
+	# FAILED, clean up and return OK.
+	#text::write /line
+	#Asm::Ins loc_pop_rewind
+	#Asm::Ins status_ok
+    } $expression
+    Asm::Done
+}
+
+proc ::pt::peg::to::cparam::Op::+ {modes expression} {
+    Asm::Start
+    Asm::ReExpression + $expression
+    Asm::GenAST $expression
+
+    Asm::Function [Asm::NewBlock poskleene] {
+	Asm::Ins loc_push
+	Asm::Call $expression
+	Asm::CStmt if (rde_param_i_kleene_abort(@stateref@)) return
+
+	#Asm::CStmt if (!rde_param_query_st(@stateref@)) goto error
+	#Asm::Ins loc_pop_discard
+	#text::write /line
+
+	Asm::CBlock while (1) \{
+	Asm::>>> 4
+	#Asm::Ins loc_push
+	#Asm::Ins error_push
+
+	Asm::Ins state_push_2
+	Asm::Call $expression
+	Asm::CStmt if (rde_param_i_kleene_close(@stateref@)) return
+
+	#Asm::Ins error_pop_merge
+
+	#Asm::CStmt if (!rde_param_query_st(@stateref@)) break
+	#Asm::Ins loc_pop_discard
+	Asm::<<< 4
+	Asm::CBlock \}
+	# FAILED, clean up and return OK.
+	#text::write /line
+	#Asm::Ins status_ok
+	#Asm::CLabel error
+	#Asm::Ins loc_pop_rewind
+    } $expression
+    Asm::Done
+}
+
+proc ::pt::peg::to::cparam::Op::x {modes args} {
+    if {[llength $args] == 1} {
+	return [lindex $args 0]
+    }
+
+    Asm::Start
+    Asm::ReExpression x {*}$args
+    set gens [Asm::GenAST {*}$args]
+
+    # We have three possibilities regarding AST node generation, each
+    # requiring a slightly different instruction sequence.
+
+    # i.  gen     == 0  <=> No node generation at all.
+    # ii. gens[0] == 1  <=> We may have nodes from the beginning.
+    # iii.              <=> Node generation starts in the middle.
+
+    if {![dict get $result gen]} {
+	set mode none
+    } elseif {[lindex $gens 0]} {
+	set mode all
+    } else {
+	set mode some
+    }
+
+    Asm::Function [Asm::NewBlock sequence] {
+	switch -exact -- $mode {
+	    none {
+		# (Ad i) No AST node generation at all.
+
+		Asm::xinit0
+
+		# Note: This loop runs at code generation time. At
+		# runtime the entire construction is essentially a
+		# fully unrolled loop, with each iteration having its
+		# own block of instructions.
+
+		foreach expression [lrange $args 0 end-1] {
+		    Asm::Call $expression
+		    Asm::xinter00
+		}
+		Asm::Call [lindex $args end]
+		Asm::xexit0
+	    }
+	    all {
+		# (Ad ii) AST node generation from start to end.
+
+		Asm::xinit1
+
+		# Note: This loop runs at code generation time. At
+		# runtime the entire construction is essentially a
+		# fully unrolled loop, with each iteration having its
+		# own block of instructions.
+
+		foreach expression [lrange $args 0 end-1] {
+		    Asm::Call $expression
+		    Asm::xinter11
+		}
+		Asm::Call [lindex $args end]
+		Asm::xexit1
+	    }
+	    some {
+		# (Ad iii). Start without AST nodes, later parts do
+		# AST nodes.
+
+		Asm::xinit0
+
+		# Note: This loop runs at code generation time. At
+		# runtime the entire construction is essentially a
+		# fully unrolled loop, with each iteration having its
+		# own block of instructions.
+
+		set pushed 0
+		foreach expression [lrange $args 0 end-1] xgen [lrange $gens 1 end] {
+		    Asm::Call $expression
+		    if {!$pushed && $xgen} {
+			Asm::xinter01
+			set pushed 1
+			continue
+		    }
+		    if {$pushed} {
+			#Asm::xinter11 error_pushed
+			Asm::xinter11
+		    } else {
+			Asm::xinter00
+		    }
+		}
+		Asm::Call [lindex $args end]
+		#Asm::xexit1a
+		Asm::xexit1
+	    }
+	}
+    } {*}$args
+    Asm::Done
+}
+
+proc ::pt::peg::to::cparam::Op::/ {modes args} {
+    if {[llength $args] == 1} {
+	return [lindex $args 0]
+    }
+
+    Asm::Start
+    Asm::ReExpression / {*}$args
+    set gens [Asm::GenAST {*}$args]
+
+    # Optimized AST handling: Handle each branch separately, based on
+    # its ability to generate AST nodes.
+
+    Asm::Function [Asm::NewBlock choice] {
+	set hasxgen   0
+	set hasnoxgen 0
+	if {[tcl::mathfunc::max {*}$gens]}  { set hasxgen   1 }
+	if {![tcl::mathfunc::min {*}$gens]} { set hasnoxgen 1 }
+
+	set xgen [lindex $gens 0]
+	Asm::/init$xgen
+
+	# Note: This loop runs at code generation time. At runtime the
+	# entire construction is essentially a fully unrolled loop,
+	# with each iteration having its own block of instructions.
+
+	foreach expression [lrange $args 0 end-1] nxgen [lrange $gens 1 end] {
+	    Asm::Call $expression
+	    Asm::/inter$xgen$nxgen
+	    set xgen $nxgen
+	}
+
+	Asm::Call [lindex $args end]
+	Asm::/exit$nxgen;#[expr {$nxgen ? $hasnoxgen : $hasxgen }]
+
+    } {*}$args
+    Asm::Done
+}
+
+# ### ### ### ######### ######### #########
+## Assembler commands
+
+namespace eval ::pt::peg::to::cparam::Op::Asm {}
+
+# ### ### ### ######### ######### #########
+## The various part of a sequence compilation.
+proc ::pt::peg::to::cparam::Op::Asm::xinit0 {} {
+    #Ins loc_push
+    #Ins error_clear
+    #text::write /line
+    #Ins error_push
+
+    Ins state_push_void
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::xinit1 {} {
+    #Ins ast_push
+    #Ins loc_push
+    #Ins error_clear
+    #text::write /line
+    #Ins error_push
+
+    Ins state_push_value
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::xinter00 {} {
+    #Ins error_pop_merge
+    # Stop the sequence on element failure, and
+    # restore state to before we tried the sequence.
+    #CStmt if (!rde_param_query_st(@stateref@)) goto error
+    #Ins error_push
+
+    CStmt if (rde_param_i_seq_void2void(@stateref@)) return
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::xinter01 {} {
+    #Ins error_pop_merge
+    # Stop the sequence on element failure, and
+    # restore state to before we tried the sequence.
+    #CStmt if (!rde_param_query_st(@stateref@)) goto error
+    #Ins ast_push
+    #Ins error_push
+
+    CStmt if (rde_param_i_seq_void2value(@stateref@)) return
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::xinter11 {{label error}} {
+    #Ins error_pop_merge
+    # Stop the sequence on element failure, and
+    # restore state to before we tried the sequence.
+    #CStmt if (!rde_param_query_st(@stateref@)) goto $label
+    #Ins error_push
+
+    CStmt if (rde_param_i_seq_value2value(@stateref@)) return
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::xexit0 {} {
+    #Ins error_pop_merge
+
+    # Stop the sequence on element failure, and
+    # restore state to before we tried the sequence.
+
+    #CStmt if (!rde_param_query_st(@stateref@)) goto error
+
+    # All elements OK, squash backtracking state
+    #text::write /line
+    #Ins loc_pop_discard
+    #CStmt   return
+
+    #CLabel error
+    #Ins loc_pop_rewind
+
+    Ins state_merge_void
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::xexit1 {} {
+    #Ins error_pop_merge
+
+    # Stop the sequence on element failure, and
+    # restore state to before we tried the sequence.
+
+    #CStmt if (!rde_param_query_st(@stateref@)) goto error
+
+    # All elements OK, squash backtracking state
+    #text::write /line
+    #Ins ast_pop_discard
+    #Ins loc_pop_discard
+    #CStmt   return
+
+    #CLabel error
+    #Ins ast_pop_rewind
+    #Ins loc_pop_rewind
+
+    Ins state_merge_value
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::xexit1a {} { error deprecated/illegal-to-call
+    Ins error_pop_merge
+
+    # Stop the sequence on element failure, and
+    # restore state to before we tried the sequence.
+
+    CStmt if (!rde_param_query_st(@stateref@)) goto error_pushed
+
+    # All elements OK, squash backtracking state
+    text::write /line
+    Ins ast_pop_discard
+    Ins loc_pop_discard
+    CStmt   return
+
+    CLabel error_pushed
+    Ins ast_pop_rewind
+    CLabel error
+    Ins loc_pop_rewind
+    return
+}
+
+# ### ### ### ######### ######### #########
+## The various part of a choice compilation.
+
+proc ::pt::peg::to::cparam::Op::Asm::/init0 {} {
+    #Ins error_clear
+    #text::write /line
+    #Ins loc_push
+    #Ins error_push
+
+    Ins state_push_void
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::/init1 {} {
+    #Ins error_clear
+    #text::write /line
+    #Ins ast_push
+    #Ins loc_push
+    #Ins error_push
+
+    Ins state_push_value
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::/inter00 {} {
+    #Ins error_pop_merge
+    #CStmt if (rde_param_query_st(@stateref@)) goto ok
+    #Ins loc_pop_rewind
+    #Ins loc_push
+    #Ins error_push
+
+    CStmt if (rde_param_i_bra_void2void(@stateref@)) return
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::/inter01 {} {
+    #Ins error_pop_merge
+    #CStmt if (rde_param_query_st(@stateref@)) goto ok
+    #Ins loc_pop_rewind
+    #Ins ast_push
+    #Ins loc_push
+    #Ins error_push
+
+    CStmt if (rde_param_i_bra_void2value(@stateref@)) return
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::/inter10 {} {
+    #Ins error_pop_merge
+    #CStmt if (rde_param_query_st(@stateref@)) goto ok_xgen
+    #Ins ast_pop_rewind
+    #Ins loc_pop_rewind
+    #Ins ast_push ??-wrong
+    #Ins loc_push
+    #Ins error_push
+
+    CStmt if (rde_param_i_bra_value2void(@stateref@)) return
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::/inter11 {} {
+    #Ins error_pop_merge
+    #CStmt if (rde_param_query_st(@stateref@)) goto ok_xgen
+    #Ins ast_pop_rewind
+    #Ins loc_pop_rewind
+    #Ins ast_push
+    #Ins loc_push
+    #Ins error_push
+
+    CStmt if (rde_param_i_bra_value2value(@stateref@)) return
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::/exit0 {} {
+    Ins state_merge_void
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::/exit1 {} {
+    Ins state_merge_value
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::/exit00 {} { error deprecated
+    Ins error_pop_merge
+
+    CStmt if (rde_param_query_st(@stateref@)) goto ok
+
+    Ins loc_pop_rewind
+
+    # All branches FAILED
+    text::write /line
+    Ins status_fail
+    CStmt   return
+
+    CLabel ok
+    Ins loc_pop_discard
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::/exit01 {} { error deprecated
+    Ins error_pop_merge
+
+    CStmt if (rde_param_query_st(@stateref@)) goto ok
+
+    Ins loc_pop_rewind
+
+    # All branches FAILED
+    text::write /line
+    Ins status_fail
+    CStmt   return
+
+    CLabel ok_xgen
+    Ins ast_pop_discard
+    CLabel ok
+    Ins loc_pop_discard
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::/exit10 {} { error deprecated
+    Ins error_pop_merge
+
+    CStmt if (rde_param_query_st(@stateref@)) goto ok_xgen
+    Ins ast_pop_rewind
+
+    Ins loc_pop_rewind
+
+    # All branches FAILED
+    text::write /line
+    Ins status_fail
+    CStmt   return
+
+    CLabel ok_xgen
+    Ins ast_pop_discard
+
+    Ins loc_pop_discard
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::/exit11 {} { error deprecated
+    Ins error_pop_merge
+
+    CStmt if (rde_param_query_st(@stateref@)) goto ok_xgen
+    Ins ast_pop_rewind
+
+    Ins loc_pop_rewind
+
+    # All branches FAILED
+    text::write /line
+    Ins status_fail
+    CStmt   return
+
+    CLabel ok_xgen
+    Ins ast_pop_discard
+
+    CLabel ok
+    Ins loc_pop_discard
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Allocate a text block / internal symbol / function
+
+proc ::pt::peg::to::cparam::Op::Asm::Start {} {
+    upvar 1 result result
+    set result {def {} use {} gen 0 pe {}}
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::Done {} {
+    upvar 1 result result
+    return -code return $result
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::ReExpression {op args} {
+    upvar 1 result result
+
+    set pe $op
+    foreach a $args {
+	lappend pe [dict get $a pe]
+    }
+
+    dict set result pe $pe
+    PE $pe
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::ReTerminal {op args} {
+    upvar 1 result result
+
+    set pe [linsert $args 0 $op]
+    dict set result pe $pe
+    PE $pe
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::GenAST {args} {
+    upvar 1 result result
+
+    foreach a $args {
+	lappend flags [dict get $a gen]
+    }
+
+    dict set result gen    [tcl::mathfunc::max {*}$flags]
+    dict set result genmin [tcl::mathfunc::min {*}$flags]
+    return $flags
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::NewBlock {type} {
+    variable counter
+    variable lastid ${type}_[incr counter]
+    return $lastid
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::Function {name def args} {
+    upvar 1 result result
+    variable cache
+    variable field
+
+    set k [list [dict get $result gen] [dict get $result pe]]
+
+    # Hardcoded 'compact == 1', compare "pt_peg_to_param.tcl"
+    if {[info exists cache($k)]} {
+	dict set result def {}
+	dict set result use $cache($k)
+	return
+    }
+
+    text::write clear
+    if {[text::write exists FUN_HEADER]} {
+	text::write recall FUN_HEADER
+	text::write undef  FUN_HEADER
+    }
+
+    FunStart $name
+
+    # Comment at function start.
+    text::write recall PE ; # Generated in Asm::ReExpression, printed
+    text::write undef  PE ; # representation of the expression, to
+			    # make the generated code more readable.
+    uplevel 1 $def
+    CStmt return
+
+    FunClose
+
+    if {[llength $args]} {
+	Use {*}$args
+    }
+
+    text::write store $name
+
+    set useb [NewBlock anon]
+    text::write clear
+    Self $name
+    text::write store $useb
+
+    dict set result def $name
+    dict set result use $useb
+
+    set cache($k) $useb
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::Direct {use} {
+    variable field
+    upvar 1 result result
+
+    set useb [NewBlock anon]
+    text::write clear
+
+    set saved $field
+    set field 0
+
+    uplevel 1 $use
+
+    text::write store $useb
+
+    set field $saved
+
+    dict set result def {}
+    dict set result use $useb
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::Call {expr {distance 1}} {
+    variable field
+    #if {$distance} { text::write /line }
+
+    set id [dict get $expr use]
+
+    text::write store CURRENT
+    text::write clear
+    text::write recall $id
+    text::write indent $field
+    text::write store CALL
+
+    text::write clear
+    text::write recall CURRENT
+    text::write recall CALL
+
+    text::write undef CURRENT
+    text::write undef CALL
+
+    #if {$distance} { text::write /line }
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::Use {args} {
+    foreach item $args {
+	set def [dict get $item def]
+	if {$def eq {}} continue
+	text::write recall $def
+	text::write undef  $def
+    }
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::FunStart {name} {
+    text::write /line
+    text::write field @def@ void @ns@$name (@statedecl@) \{ @prelude@
+    text::write /line
+    text::write store CURRENT
+
+    text::write clear
+    text::write recall FORWARD
+    text::write field @def@ void @ns@$name (@statedecl@)\;
+    text::write /line
+    text::write store FORWARD
+
+    text::write clear
+    text::write recall CURRENT
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::FunClose {} {
+    text::write field \}
+    text::write /line
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::Ins {args} {
+    set args [lassign $args name]
+    CStmt rde_param_i_$name ([join [linsert $args 0 @stateref@] {, }])
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::Self {args} {
+    variable field
+    set args [lassign $args name]
+    set saved $field
+    set field 0
+    CStmt @self@ @ns@$name ([join [linsert $args 0 @stateref@] {, }])
+    set field $saved
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::>>> {n} {
+    variable field
+    incr field $n
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::<<< {n} {
+    variable field
+    incr field -$n
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::CLabel {name} {
+    text::write /line
+    <<< 2
+    CBlock ${name}:
+    >>> 2
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::CStmt {args} {
+    variable field
+
+    # Note: The lreplace/lindex dance appends a ; to the last element
+    #       in the list, closing the statement.
+
+    text::write fieldl $field {}
+    text::write field {*}[lreplace $args end end [lindex $args end]\;]
+    text::write /line
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::CBlock {args} {
+    variable field
+    text::write fieldl $field {}
+    text::write field {*}$args
+    text::write /line
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::Header {text} {
+    text::write field "/*"
+    text::write /line
+    text::write field " * $text"
+    text::write /line
+    text::write field " */"
+    text::write /line
+    #text::write /line
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::PE {pe} {
+    variable ::pt::peg::to::cparam::comments
+
+    text::write clear
+    if {$comments} {
+	text::write field "   /*"
+	text::write /line
+
+	# Ticket [da61329276]: Detect C comment opener and closer, and
+	# disarm them. This can occur with char classes, and char
+	# sequences, i.e. strings. We recode them into
+	# backslash-escaped unicode code-points.
+
+	# Note: Putting this into the 'pe print' method is not
+	# possible, as the output can be used in other contexts (Tcl,
+	# whatever), each with their own special strings to be aware
+	# of. This is something each generator has to handle, knowing
+	# their special sequences.
+
+	lappend map "*/" "\\u002a\\u002f"
+	lappend map "/*" "\\u002f\\u002a"
+
+	foreach l [split [pt::pe print $pe] \n] {
+	    text::write field  "    * [string map $map $l]"
+	    text::write /line
+	}
+	text::write field "    */"
+	text::write /line
+	text::write /line
+    }
+    # Keeping the definition of PE, albeit empty avoids having to
+    # special case the places using this block.
+    text::write store PE
+    return
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::String {s} {
+    variable cache
+
+    set k str,$s
+
+    if {![info exists cache($k)]} {
+	set id [incr cache(_str,counter)]
+	set cache($k) $id
+
+	lappend cache(_strings) \
+	    "/* [format %8d $id] = */   \"$s\""
+    }
+
+    return $cache($k)
+}
+
+proc ::pt::peg::to::cparam::Op::Asm::Setup {} {
+    variable counter 0
+    variable field 3
+    variable cache
+    array unset cache *
+    set cache(_str,counter) -1
+    set cache(_strings)     {}
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Configuration
+
+namespace eval ::pt::peg::to::cparam {
+    namespace eval ::pt::peg::to::cparam::Op::Asm {
+	variable counter 0
+	variable fieldlen {17 5 5}
+	variable field 3
+	variable  cache
+	array set cache {}
+	set cache(_str,counter) -1
+	set cache(_strings)     {}
+    }
+
+    # Map from option name (without leading dash) to the name of the
+    # variable used to store setting.
+    variable omap ; array set omap {
+	comments        comments
+	file            file
+	fun-qualifier   def
+	indent          indent
+	insert-cmd      insertcmd
+	main            main
+	name            name
+	namespace       ns
+	prelude         prelude
+	self-command    self
+	state-decl      statedecl
+	state-ref       stateref
+	string-varname  strings
+	template        template
+	user            user
+    }
+
+    variable insertcmd {}
+    variable comments  1
+    variable self      {}
+    variable ns        {}
+    variable def       static
+    variable main      __main
+    variable indent    0
+    variable prelude   {}
+    variable statedecl {RDE_PARAM p}
+    variable stateref  p
+    variable strings   p_string
+
+    variable template @code@       ; # A string. Together with the
+				     # insertcmd (if any) it specifies
+				     # how to embed the generated code
+				     # into a larger framework (the
+				     # template).
+    variable name     a_pe_grammar ; # String. Name of the grammar.
+    variable file     unknown      ; # String. Name of the file or
+				     # other entity the grammar came
+				     # from.
+    variable user     unknown      ; # String. Name of the user on
+				     # which behalf the conversion has
+				     # been invoked.
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::to::cparam 1.1.3
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_json.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_json.tcl
new file mode 100644
index 00000000..0d26b90d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_json.tcl
@@ -0,0 +1,149 @@
+# peg_to_json.tcl --
+#
+#	Conversion from PEG to JSON (Java Script Object Notation).
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pt_peg_to_json.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $
+
+# This package takes the canonical serialization of a parsing
+# expression grammar and produces text in JSON format, Java Script
+# data transfer format.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require pt::peg      ; # Verification that the
+					       # input is proper.
+package require json::write
+
+# ### ### ### ######### ######### #########
+##
+
+namespace eval ::pt::peg::to::json {
+    namespace export \
+	reset configure convert
+
+    namespace ensemble create
+}
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc ::pt::peg::to::json::reset {} {
+    variable indented 0
+    variable aligned  0
+    variable name     a_pe_grammar
+    variable file     unknown
+    variable user     unknown
+    return
+}
+
+proc ::pt::peg::to::json::configure {args} {
+    variable indented
+    variable aligned
+    variable name
+    variable file
+    variable user
+
+    if {[llength $args] == 0} {
+	return [list \
+		    -file     $file \
+		    -name     $name \
+		    -user     $user \
+		    -indented $indented \
+		    -aligned  $aligned]
+    } elseif {[llength $args] == 1} {
+	lassign $args option
+	set variable [string range $option 1 end]
+	if {[info exists $variable]} {
+	    return [set $variable]
+	} else {
+	    return -code error "Expected one of -aligned, or -indented, got \"$option\""
+	}
+    } elseif {[llength $args] % 2 == 0} {
+	foreach {option value} $args {
+	    set variable [string range $option 1 end]
+	    if {![info exists $variable]} {
+		return -code error "Expected one of -aligned, or -indented, got \"$option\""
+	    }
+	}
+	foreach {option value} $args {
+	    set variable [string range $option 1 end]
+	    switch -exact -- $variable {
+		indented - aligned {
+		    if {![::string is boolean -strict $value]} {
+			return -code error "Expected boolean, got \"$value\""
+		    }
+		}
+		name -
+		file -
+		user { }
+	    }
+	    set $variable $value
+	}
+    } else {
+	return -code error {wrong#args, expected option value ...}
+    }
+}
+
+proc ::pt::peg::to::json::convert {serial} {
+    variable indented
+    variable aligned
+
+    ::pt::peg verify-as-canonical $serial
+
+    json::write indented $indented
+    json::write aligned  $aligned
+
+    # Unpack the serialization, known as canonical
+    array set peg $serial
+    array set peg $peg(pt::grammar::peg)
+    unset     peg(pt::grammar::peg)
+
+    # Assemble the rules object
+    set rules {}
+    foreach {symbol def} $peg(rules) {
+	lassign $def _ is _ mode
+	lappend rules $symbol \
+	    [json::write object \
+		 is   [json::write string $is] \
+		 mode [json::write string $mode]]
+    }
+
+    # Assemble the final result
+    return [json::write object pt::grammar::peg \
+		[json::write object \
+		     rules [json::write object {*}$rules] \
+		     start [json::write string $peg(start)]]]
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Configuration
+
+namespace eval ::pt::peg::to::json {
+
+    # Combinations of the format specific entries
+    # I A |
+    # - - + ---------------------
+    # 0 0 | Ultracompact (no whitespace, single line)
+    # 1 0 | Indented
+    # 0 1 | Not possible, per the implications above.
+    # 1 1 | Indented + Tabular aligned keys
+    # - - + ---------------------
+
+    variable indented 0
+    variable aligned  0
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::to::json 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_param.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_param.tcl
new file mode 100644
index 00000000..0ed0179a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_param.tcl
@@ -0,0 +1,1029 @@
+# peg_to_param.tcl --
+#
+#	Conversion of PEG to PARAM assembler.
+#
+# Copyright (c) 2009-2014 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pt_peg_to_param.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $
+
+# This package takes the canonical serialization of a parsing
+# expression grammar and produces text in PARAM assembler, i.e.
+# readable machine code for the PARAM virtual machine.
+
+## NOTE: Should have cheat sheet of PARAM instructions (which parts of
+## the arch state they touch, and secondly, bigger effects).
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package  require Tcl 8.5
+package  require pt::peg             ; # Verification that the input
+				       # is proper.
+package  require pt::pe              ; # Walking an expression.
+package  require text::write         ; # Text generation support
+package  require char
+
+# ### ### ### ######### ######### #########
+##
+
+namespace eval ::pt::peg::to::param {
+    namespace export \
+	reset configure convert
+
+    namespace ensemble create
+}
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc ::pt::peg::to::param::reset {} {
+    variable template @code@
+    variable name     a_pe_grammar
+    variable file     unknown
+    variable user     unknown
+    variable inline   1
+    variable compact  1
+    return
+}
+
+proc ::pt::peg::to::param::configure {args} {
+    variable template
+    variable name
+    variable file
+    variable user
+    variable inline
+    variable compact
+
+    if {[llength $args] == 0} {
+	return [list \
+		    -inline   $inline \
+		    -compact  $compact \
+		    -file     $file \
+		    -name     $name \
+		    -template $template \
+		    -user     $user]
+    } elseif {[llength $args] == 1} {
+	lassign $args option
+	set variable [string range $option 1 end]
+	if {[info exists $variable]} {
+	    return [set $variable]
+	} else {
+	    return -code error "Expected one of -compact, -file, -inline, -name, -template, or -user, got \"$option\""
+	}
+    } elseif {[llength $args] % 2 == 0} {
+	foreach {option value} $args {
+	    set variable [string range $option 1 end]
+	    if {![info exists $variable]} {
+		return -code error "Expected one of -compact, -file, -inline, -name, -template, or -user, got \"$option\""
+	    }
+	}
+	foreach {option value} $args {
+	    set variable [string range $option 1 end]
+	    switch -exact -- $variable {
+		template {
+		    if {$value eq {}} {
+			return -code error "Expected template, got the empty string"
+		    }
+		}
+		inline - compact {
+		    if {![::string is boolean -strict $value]} {
+			return -code error "Expected boolean, got \"$value\""
+		    }
+		}
+		name -
+		file -
+		user { }
+	    }
+	    set $variable $value
+	}
+    } else {
+	return -code error {wrong#args, expected option value ...}
+    }
+}
+
+proc ::pt::peg::to::param::convert {serial} {
+    variable template
+    variable name
+    variable file
+    variable user
+
+    Op::Asm::Setup
+
+    ::pt::peg verify-as-canonical $serial
+
+    # Unpack the serialization, known as canonical
+    array set peg $serial
+    array set peg $peg(pt::grammar::peg)
+    unset     peg(pt::grammar::peg)
+
+    set modes {}
+    foreach {symbol def} $peg(rules) {
+	lassign $def _ is _ mode
+	lappend modes $symbol $mode
+    }
+
+    text::write reset
+    set blocks {}
+
+    # Translate all expressions/symbols, results are stored in
+    # text::write blocks, command results are the block ids.
+    lappend blocks [set start [Expression $peg(start) $modes]]
+
+    foreach {symbol def} $peg(rules) {
+	lassign $def _ is _ mode
+	lappend blocks [Symbol $symbol $mode $is $modes]
+    }
+
+    # Assemble the output from the stored blocks.
+    text::write clear
+    Op::Asm::Header {Grammar Start Expression}
+    Op::Asm::Label <<MAIN>>
+    Op::Asm::Call $start 0
+    Op::Asm::Ins  halt
+    text::write /line
+
+    Op::Asm::Use {*}$blocks
+
+    # At last retrieve the fully assembled result and integrate with
+    # the chosen template.
+
+    return [string map \
+		[list \
+		     @user@   $user \
+		     @format@ PEG   \
+		     @file@   $file \
+		     @name@   $name \
+		     @code@   [text::write get]] $template]
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Internals
+
+proc ::pt::peg::to::param::Expression {expression modes} {
+    return [pt::pe bottomup \
+		[list [namespace current]::Op $modes] \
+		$expression]
+}
+
+proc ::pt::peg::to::param::Symbol {symbol mode rhs modes} {
+
+    set expression [Expression $rhs $modes]
+
+    text::write clear
+    Op::Asm::Header "$mode Symbol '$symbol'"
+    text::write store FUN_HEADER
+
+    Op::Asm::Start
+    Op::Asm::ReExpression $symbol
+    Op::Asm::GenAST $expression
+    Op::Asm::PE $rhs
+
+    set gen [dict get $result gen]
+
+    Op::Asm::Function sym_$symbol {
+
+	# We have six possibilites for the combination of AST node
+	# generation by the rhs and AST generation by the symbol. Two
+	# of these (leaf/0, value/0 coincide, leaving 5). This
+	# controls the use of AS/ARS instructions.
+
+	switch -exact -- $mode/$gen {
+	    value/1 {
+		# Generate value for symbol, rhs may have generated
+		# AST nodes as well, keep rhs
+
+		set found [Op::Asm::NewLabel found]
+
+		Op::Asm::Ins symbol_restore $symbol
+		Op::Asm::Ins found! jump $found
+
+		Op::Asm::Ins loc_push
+		Op::Asm::Ins ast_push
+
+		Op::Asm::Call $expression
+
+		Op::Asm::Ins fail! value_clear
+		Op::Asm::Ins ok!   value_reduce $symbol
+
+		Op::Asm::Ins symbol_save       $symbol
+		Op::Asm::Ins error_nonterminal $symbol
+
+		Op::Asm::Ins ast_pop_rewind
+		Op::Asm::Ins loc_pop_discard
+
+		Op::Asm::Label $found
+		Op::Asm::Ins ok! ast_value_push
+	    }
+	    leaf/0 -
+	    value/0 {
+		# Generate value for symbol, rhs cannot generate its
+		# own AST nodes => leaf/0.
+
+		set found [Op::Asm::NewLabel found]
+
+		Op::Asm::Ins symbol_restore $symbol
+		Op::Asm::Ins found! jump $found
+
+		Op::Asm::Ins loc_push
+
+		Op::Asm::Call $expression
+
+		Op::Asm::Ins fail! value_clear
+		Op::Asm::Ins ok!   value_leaf $symbol
+
+		Op::Asm::Ins symbol_save       $symbol
+		Op::Asm::Ins error_nonterminal $symbol
+
+		Op::Asm::Ins loc_pop_discard
+
+		Op::Asm::Label $found
+		Op::Asm::Ins ok! ast_value_push
+	    }
+	    leaf/1 {
+		# Generate value for symbol, rhs may have generated
+		# AST nodes as well, discard rhs.
+
+		set found [Op::Asm::NewLabel found]
+
+		Op::Asm::Ins symbol_restore $symbol
+		Op::Asm::Ins found! jump $found
+
+		Op::Asm::Ins loc_push
+		Op::Asm::Ins ast_push
+
+		Op::Asm::Call $expression
+
+		Op::Asm::Ins fail! value_clear
+		Op::Asm::Ins ok!   value_leaf   $symbol
+
+		Op::Asm::Ins symbol_save       $symbol
+		Op::Asm::Ins error_nonterminal $symbol
+
+		Op::Asm::Ins ast_pop_rewind
+		Op::Asm::Ins loc_pop_discard
+
+		Op::Asm::Label $found
+		Op::Asm::Ins ok! ast_value_push
+	    }
+	    void/1 {
+		# Generate no value for symbol, rhs may have generated
+		# AST nodes as well, discard rhs.
+
+		Op::Asm::Ins symbol_restore $symbol ; # Implied
+		Op::Asm::Ins found! return
+
+		Op::Asm::Ins loc_push
+		Op::Asm::Ins ast_push
+
+		Op::Asm::Call $expression
+
+		Op::Asm::Ins value_clear
+
+		Op::Asm::Ins symbol_save       $symbol
+		Op::Asm::Ins error_nonterminal $symbol
+
+		Op::Asm::Ins ast_pop_rewind
+		Op::Asm::Ins loc_pop_discard
+	    }
+	    void/0 {
+		# Generate no value for symbol, rhs cannot generate
+		# its own AST nodes. Nothing to save nor discard.
+
+		Op::Asm::Ins symbol_restore $symbol ; # Implied
+		Op::Asm::Ins found! return
+
+		Op::Asm::Ins loc_push
+
+		Op::Asm::Call $expression
+
+		Op::Asm::Ins value_clear
+
+		Op::Asm::Ins symbol_save       $symbol
+		Op::Asm::Ins error_nonterminal $symbol
+
+		Op::Asm::Ins loc_pop_discard
+	    }
+	}
+    } $expression
+    Op::Asm::Done
+}
+
+namespace eval ::pt::peg::to::param::Op {
+    namespace export \
+	alpha alnum ascii digit graph lower print \
+	punct space upper wordchar xdigit ddigit \
+	dot epsilon t .. n ? * + & ! x / 
+}
+
+proc ::pt::peg::to::param::Op {modes pe op arguments} {
+    return [namespace eval Op [list $op $modes {*}$arguments]]
+}
+
+proc ::pt::peg::to::param::Op::epsilon {modes} {
+    Asm::Start
+    Asm::ReExpression epsilon
+    Asm::Direct {
+	Asm::Ins status_ok
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::param::Op::dot {modes} {
+    Asm::Start
+    Asm::ReExpression dot
+    Asm::Direct {
+	Asm::Ins input_next \"dot\"
+    }
+    Asm::Done
+}
+
+foreach test {
+    alpha alnum ascii digit graph lower print
+    punct space upper wordchar xdigit ddigit
+} {
+    proc ::pt::peg::to::param::Op::$test {modes} \
+	[string map [list @ $test] {
+	    variable ::pt::peg::to::param::inline
+	    Asm::Start
+	    Asm::ReExpression @
+	    if {$inline} {
+		Asm::Direct {
+		    Asm::Ins input_next \"@\"
+		    Asm::Ins ok! test_@
+		}
+	    } else {
+		Asm::Function [Asm::NewBlock @] {
+		    Asm::Ins input_next \"@\"
+		    Asm::Ins ok! test_@
+		}
+	    }
+	    Asm::Done
+	}]
+}
+
+proc ::pt::peg::to::param::Op::t {modes char} {
+    variable ::pt::peg::to::param::inline
+    Asm::Start
+    Asm::ReTerminal t $char
+    if {$inline} {
+	Asm::Direct {
+	    set c [char quote string $char]
+
+	    Asm::Ins input_next "\"t $c\""
+	    Asm::Ins ok! test_char \"$c\"
+	}
+    } else {
+	Asm::Function [Asm::NewBlock char ] {
+	    set c [char quote string $char]
+
+	    Asm::Ins input_next "\"t $c\""
+	    Asm::Ins ok! test_char \"$c\"
+	}
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::param::Op::.. {modes chstart chend} {
+    variable ::pt::peg::to::param::inline
+    Asm::Start
+    Asm::ReTerminal .. $chstart $chend
+    if {$inline} {
+	Asm::Direct {
+	    set s [char quote string $chstart]
+	    set e [char quote string $chend]
+
+	    Asm::Ins input_next "\".. $s $e\""
+	    Asm::Ins ok! test_range \"$s\" \"$e\"
+	}
+    } else {
+	Asm::Function [Asm::NewBlock range] {
+	    set s [char quote string $chstart]
+	    set e [char quote string $chend]
+
+	    Asm::Ins input_next "\".. $s $e\""
+	    Asm::Ins ok! test_range \"$s\" \"$e\"
+	}
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::param::Op::n {modes symbol} {
+    # symbol mode determines AST generation
+    # void       => non-generative,
+    # leaf/value => generative.
+
+    Asm::Start
+    Asm::ReTerminal n $symbol
+
+    if {![dict exists $modes $symbol]} {
+	# Incomplete grammar. The symbol has no definition.
+	Asm::Direct {
+	    Asm::Ins status_fail {} "; # Undefined symbol '$symbol'"
+	}
+    } else {
+	Asm::GenAST [list gen [expr { [dict get $modes $symbol] ne "void" }]]
+	Asm::Direct {
+	    Asm::Ins call sym_$symbol
+	}
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::param::Op::& {modes expression} {
+    # Note: This operation could be inlined, as it has no special
+    #       control flow. Not done to make the higher-level ops are
+    #       similar in construction and use = consistent and simple.
+
+    Asm::Start
+    Asm::ReExpression & $expression
+    Asm::GenAST $expression
+
+    Asm::Function [Asm::NewBlock ahead] {
+	Asm::Ins loc_push
+	Asm::Call $expression
+	Asm::Ins loc_pop_rewind
+    } $expression
+    Asm::Done
+}
+
+proc ::pt::peg::to::param::Op::! {modes expression} {
+    # Note: This operation could be inlined, as it has no special
+    #       control flow. Not done to make the higher-level ops are
+    #       similar in construction and use = consistent and simple.
+
+    Asm::Start
+    Asm::ReExpression ! $expression
+    if {[dict get $expression gen]} {
+	Asm::Function [Asm::NewBlock notahead] {
+	    # The sub-expression may generate AST elements. We must
+	    # not pass them through.
+
+	    Asm::Ins loc_push
+	    Asm::Ins ast_push
+
+	    Asm::Call $expression
+
+	    Asm::Ins fail! ast_pop_discard
+	    Asm::Ins ok!   ast_pop_rewind
+	    Asm::Ins loc_pop_rewind
+	    Asm::Ins status_negate
+	} $expression
+    } else {
+	Asm::Function [Asm::NewBlock notahead] {
+	    # The sub-expression cannot generate AST elements. We can
+	    # ignore AS/ARS, simplifying the code.
+
+	    Asm::Ins loc_push
+
+	    Asm::Call $expression
+
+	    Asm::Ins loc_pop_rewind
+	    Asm::Ins status_negate
+	} $expression
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::param::Op::? {modes expression} {
+    # Note: This operation could be inlined, as it has no special
+    #       control flow. Not done to make the higher-level ops are
+    #       similar in construction and use => consistent and simple.
+
+    Asm::Start
+    Asm::ReExpression ? $expression
+    Asm::GenAST $expression
+
+    Asm::Function [Asm::NewBlock optional] {
+	Asm::Ins loc_push
+	Asm::Ins error_push
+
+	Asm::Call $expression
+
+	Asm::Ins error_pop_merge
+	Asm::Ins fail! loc_pop_rewind
+	Asm::Ins ok!   loc_pop_discard
+	Asm::Ins status_ok
+    } $expression
+    Asm::Done
+}
+
+proc ::pt::peg::to::param::Op::* {modes expression} {
+    Asm::Start
+    Asm::ReExpression * $expression
+    Asm::GenAST $expression
+
+    Asm::Function [Asm::NewBlock kleene] {
+	set failed [Asm::NewLabel failed]
+
+	Asm::Ins loc_push
+	Asm::Ins error_push
+
+	Asm::Call $expression
+
+	Asm::Ins error_pop_merge
+	Asm::Ins fail! jump $failed
+	Asm::Ins loc_pop_discard
+	Asm::Ins jump [Asm::LastId] ; # Loop head = Function head.
+
+	# FAILED, clean up and return OK.
+	Asm::Label $failed
+	Asm::Ins loc_pop_rewind
+	Asm::Ins status_ok
+    } $expression
+    Asm::Done
+}
+
+proc ::pt::peg::to::param::Op::+ {modes expression} {
+    Asm::Start
+    Asm::ReExpression + $expression
+    Asm::GenAST $expression
+
+    Asm::Function [Asm::NewBlock poskleene] {
+	set failed   [Asm::NewLabel failed]
+	set loophead [Asm::NewLabel loop]
+
+	Asm::Ins loc_push
+
+	Asm::Call $expression
+
+	# FAILED truly.
+	Asm::Ins fail! jump $failed
+
+	Asm::Label $loophead
+	Asm::Ins loc_pop_discard
+	Asm::Ins loc_push
+	Asm::Ins error_push
+
+	Asm::Call $expression
+
+	Asm::Ins error_pop_merge
+	Asm::Ins ok! jump $loophead
+	# FAILED, clean up and return OK.
+	Asm::Ins status_ok
+
+	Asm::Label $failed
+	Asm::Ins loc_pop_rewind
+    } $expression
+    Asm::Done
+}
+
+proc ::pt::peg::to::param::Op::x {modes args} {
+    if {[llength $args] == 1} {
+	return [lindex $args 0]
+    }
+
+    Asm::Start
+    Asm::ReExpression x {*}$args
+    set gens [Asm::GenAST {*}$args]
+
+    # We have three possibilities regarding AST node generation, each
+    # requiring a slightly different instruction sequence.
+
+    # i.  gen     == 0  <=> No node generation at all.
+    # ii. gens[0] == 1  <=> We may have nodes from the beginning.
+    # iii.              <=> Node generation starts in the middle.
+
+    if {![dict get $result gen]} {
+	set mode none
+    } elseif {[lindex $gens 0]} {
+	set mode all
+    } else {
+	set mode some
+    }
+
+    Asm::Function [Asm::NewBlock sequence] {
+
+	set failed [Asm::NewLabel failed]
+	if {$mode eq "some"} {
+	    set failed_noast [Asm::NewLabel failednoast]
+	}
+
+	switch -exact -- $mode {
+	    none {
+		# (Ad i) No AST node generation at all.
+
+		Asm::Ins loc_push
+		Asm::Ins error_clear
+		text::write /line
+
+		# Note: This loop runs at code generation time. At
+		# runtime the entire construction is essentially a
+		# fully unrolled loop, with each iteration having its
+		# own block of instructions.
+
+		foreach expression $args {
+		    Asm::Ins error_push
+
+		    Asm::Call $expression
+
+		    Asm::Ins error_pop_merge
+		    # Stop the sequence on element failure
+		    Asm::Ins fail! jump $failed
+		}
+
+		# All elements OK, squash backtracking state
+		text::write /line
+		Asm::Ins loc_pop_discard
+		Asm::Ins return
+
+		# An element failed, restore state to before we tried
+		# the sequence.
+		Asm::Label $failed
+		Asm::Ins loc_pop_rewind
+	    }
+	    all {
+		# (Ad ii) AST node generation from start to end.
+
+		Asm::Ins ast_push
+		Asm::Ins loc_push
+		Asm::Ins error_clear
+		text::write /line
+
+		# Note: This loop runs at code generation time. At
+		# runtime the entire construction is essentially a
+		# fully unrolled loop, with each iteration having its
+		# own block of instructions.
+
+		foreach expression $args {
+		    Asm::Ins error_push
+
+		    Asm::Call $expression
+
+		    Asm::Ins error_pop_merge
+		    # Stop the sequence on element failure
+		    Asm::Ins fail! jump $failed
+		}
+
+		# All elements OK, squash backtracking state
+		text::write /line
+		Asm::Ins ast_pop_discard
+		Asm::Ins loc_pop_discard
+		Asm::Ins return
+
+		# An element failed, restore state to before we tried
+		# the sequence.
+		Asm::Label $failed
+		Asm::Ins ast_pop_rewind
+		Asm::Ins loc_pop_rewind
+	    }
+	    some {
+		# (Ad iii). Start without AST nodes, later parts do
+		# AST nodes.
+
+		Asm::Ins loc_push
+		Asm::Ins error_clear
+		text::write /line
+
+		# Note: This loop runs at code generation time. At
+		# runtime the entire construction is essentially a
+		# fully unrolled loop, with each iteration having its
+		# own block of instructions.
+
+		set pushed 0
+		foreach expression $args xgen $gens {
+		    if {!$pushed && $xgen} {
+			Asm::Ins ast_push
+			set pushed 1
+		    }
+
+		    Asm::Ins error_push
+
+		    Asm::Call $expression
+
+		    Asm::Ins error_pop_merge
+		    # Stop the sequence on element failure
+		    if {$pushed} {
+			Asm::Ins fail! jump $failed
+		    } else {
+			Asm::Ins fail! jump $failed_noast
+		    }
+		}
+
+		# All elements OK, squash backtracking state.
+		text::write /line
+		Asm::Ins ast_pop_discard
+		Asm::Ins loc_pop_discard
+		Asm::Ins return
+
+		# An element failed, restore state to before we tried
+		# the sequence.
+		Asm::Label $failed
+		Asm::Ins ast_pop_rewind
+		Asm::Label $failed_noast
+		Asm::Ins loc_pop_rewind
+	    }
+	}
+    } {*}$args
+    Asm::Done
+}
+
+proc ::pt::peg::to::param::Op::/ {modes args} {
+    if {[llength $args] == 1} {
+	return [lindex $args 0]
+    }
+
+    Asm::Start
+    Asm::ReExpression / {*}$args
+    set gens [Asm::GenAST {*}$args]
+
+    if {![dict get $result genmin]} {
+	# We have at least one branch without AST node generation.
+	set ok_noast [Asm::NewLabel oknoast]
+    } else {
+	set ok_noast {}
+    }
+    if {[dict get $result gen]} {
+	# We have at least one branch capable of generating AST nodes.
+	set ok [Asm::NewLabel ok]
+    } else {
+	set ok {}
+    }
+
+    # Optimized AST handling: Handle each branch separately, based on
+    # its ability to generate AST nodes.
+
+    Asm::Function [Asm::NewBlock choice] {
+	Asm::Ins error_clear
+	text::write /line
+
+	# Note: This loop runs at code generation time. At runtime the
+	# entire construction is seentially a fully unrolled loop,
+	# with each iteration having its own block of instructions.
+
+	foreach expression $args xgen $gens {
+	    if {$xgen} {
+		Asm::Ins ast_push
+	    }
+	    Asm::Ins loc_push
+	    Asm::Ins error_push
+
+	    Asm::Call $expression
+
+	    Asm::Ins error_pop_merge
+	    if {$xgen} {
+		Asm::Ins ok! jump $ok
+	    } else {
+		Asm::Ins ok! jump $ok_noast
+	    }
+	    text::write /line
+	    if {$xgen} {
+		Asm::Ins ast_pop_rewind
+	    }
+	    Asm::Ins loc_pop_rewind
+	}
+
+	# All branches FAILED
+	Asm::Ins status_fail
+	Asm::Ins return
+
+	# A branch was successful, squash the backtracking state
+	if {$ok ne {}} {
+	    Asm::Label $ok
+	    Asm::Ins ast_pop_discard
+	}
+	if {$ok_noast ne {}} {
+	    Asm::Label $ok_noast
+	}
+	Asm::Ins loc_pop_discard
+    } {*}$args
+    Asm::Done
+}
+
+# ### ### ### ######### ######### #########
+## Allocate a text block / internal symbol / function
+
+namespace eval ::pt::peg::to::param::Op::Asm {}
+
+proc ::pt::peg::to::param::Op::Asm::Start {} {
+    upvar 1 result result
+    set result {def {} use {} gen 0 pe {}}
+    return
+}
+
+proc ::pt::peg::to::param::Op::Asm::Done {} {
+    upvar 1 result result
+    return -code return $result
+    return
+}
+
+proc ::pt::peg::to::param::Op::Asm::ReExpression {op args} {
+    upvar 1 result result
+
+    set pe $op
+    foreach a $args {
+	lappend pe [dict get $a pe]
+    }
+
+    dict set result pe $pe
+    PE $pe
+    return
+}
+
+proc ::pt::peg::to::param::Op::Asm::ReTerminal {op args} {
+    upvar 1 result result
+
+    set pe [linsert $args 0 $op]
+    dict set result pe $pe
+    PE $pe
+    return
+}
+
+proc ::pt::peg::to::param::Op::Asm::GenAST {args} {
+    upvar 1 result result
+
+    foreach a $args {
+	lappend flags [dict get $a gen]
+    }
+
+    dict set result gen    [tcl::mathfunc::max {*}$flags]
+    dict set result genmin [tcl::mathfunc::min {*}$flags]
+    return $flags
+}
+
+proc ::pt::peg::to::param::Op::Asm::NewBlock {type} {
+    variable counter
+    variable lastid ${type}_[incr counter]
+    return $lastid
+}
+
+proc ::pt::peg::to::param::Op::Asm::NewLabel {{prefix {label}}} {
+    variable counter
+    return ${prefix}_[incr counter]
+}
+
+proc ::pt::peg::to::param::Op::Asm::Function {name def args} {
+    upvar 1 result result
+    variable ::pt::peg::to::param::compact
+    variable cache
+
+    set k [list [dict get $result gen] [dict get $result pe]]
+
+#puts $name///<<$k>>==[info exists cache($k)]\t\t($result)
+
+    if {$compact && [info exists cache($k)]} {
+	dict set result def {}
+	dict set result use $cache($k)
+	return
+    }
+
+    text::write clear
+    if {[text::write exists FUN_HEADER]} {
+	text::write recall FUN_HEADER
+	text::write undef  FUN_HEADER
+    }
+
+    Label $name
+    text::write recall PE ; # Generated in Asm::Zip, printed rep
+    text::write undef  PE ; # of the expression, for code clarity
+
+    uplevel 1 $def
+    Ins return
+
+    if {[llength $args]} {
+	Use {*}$args
+    }
+
+    text::write store $name
+
+    set useb [NewBlock anon]
+    text::write clear
+    Ins call $name
+    text::write store $useb
+
+    dict set result def $name
+    dict set result use $useb
+
+    set cache($k) $useb
+    return
+}
+
+proc ::pt::peg::to::param::Op::Asm::Direct {use} {
+    upvar 1 result result
+
+    set useb [NewBlock anon]
+    text::write clear
+    uplevel 1 $use
+    text::write store $useb
+
+    dict set result def {}
+    dict set result use $useb
+    return
+}
+
+proc ::pt::peg::to::param::Op::Asm::Call {expr {distance 1}} {
+    if {$distance} { text::write /line }
+    text::write recall [dict get $expr use]
+    if {$distance} { text::write /line }
+    return
+}
+
+proc ::pt::peg::to::param::Op::Asm::Use {args} {
+    foreach item $args {
+	set def [dict get $item def]
+	if {$def eq {}} continue
+	text::write recall $def
+	text::write undef  $def
+    }
+    return
+}
+
+proc ::pt::peg::to::param::Op::Asm::Ins {args} {
+    variable fieldlen
+
+    if {[string match *! [lindex $args 0]]} {
+	set args [lassign $args guard]
+	text::write fieldr 8 $guard
+    } else {
+	text::write fieldr 8 {}
+    }
+    foreach w $args len $fieldlen {
+	text::write fieldl $len $w
+    }
+    text::write /line
+    return
+}
+
+proc ::pt::peg::to::param::Op::Asm::Label {label} {
+    text::write /line
+    text::write field ${label}:
+    text::write /line
+    return
+}
+
+proc ::pt::peg::to::param::Op::Asm::LastId {} {
+    variable lastid
+    return $lastid
+}
+
+proc ::pt::peg::to::param::Op::Asm::Header {text} {
+    text::write field "#"
+    text::write /line
+    text::write field "# $text"
+    text::write /line
+    text::write field "#"
+    text::write /line
+    #text::write /line
+    return
+}
+
+proc ::pt::peg::to::param::Op::Asm::PE {pe} {
+    text::write clear
+    text::write field [pt::pe print $pe]
+    text::write /line
+    text::write prefix "# "
+    text::write /line
+    text::write store PE
+    return
+}
+
+proc ::pt::peg::to::param::Op::Asm::Setup {} {
+    variable counter 0
+    variable fieldlen {17 5 5}
+    variable cache
+    array unset cache *
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Configuration
+
+namespace eval ::pt::peg::to::param {
+    namespace eval ::pt::peg::to::param::Op::Asm {
+	variable counter 0
+	variable fieldlen {17 5 5}
+	variable  cache
+	array set cache {}
+    }
+
+    variable inline   1            ; # A boolean flag. Specifies if we
+				     # should inline terminal tests
+				     # (default), or put them into
+				     # their own functions.
+    variable compact  1            ; # A boolean flag. Specifies if we
+				     # should try to coalesce
+				     # identical parsing expressions,
+				     # i.e. compile them once
+				     # (default), or not.
+    variable template @code@       ; # A string. Specifies how to
+				     # embed the generated code into a
+				     # larger frame- work (the
+				     # template).
+    variable name     a_pe_grammar ; # String. Name of the grammar.
+    variable file     unknown      ; # String. Name of the file or
+				     # other entity the grammar came
+				     # from.
+    variable user     unknown      ; # String. Name of the user on
+				     # which behalf the conversion has
+				     # been invoked.
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::to::param 1.0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_peg.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_peg.tcl
new file mode 100644
index 00000000..9622b575
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_peg.tcl
@@ -0,0 +1,413 @@
+# peg_to_peg.tcl --
+#
+#	Conversion from PEG to PEG (Human readable text).
+#
+# Copyright (c) 2009-2014 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pt_peg_to_peg.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $
+
+# This package takes the canonical serialization of a parsing
+# expression grammar and produces text in PEG format, a form of text
+# which specifies a PEG in a human readable, yet formal manner,
+# similar too, but not identical to EBNF.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package  require Tcl 8.5
+package  require pt::peg  ; # Verification that the input
+				       # is proper.
+package  require pt::pe              ; # Walking an expression.
+package  require pt::pe::op          ; # Flatten & fuse.
+package  require text::write         ; # Text generation support
+package  require textutil::adjust
+package  require struct::list
+
+# ### ### ### ######### ######### #########
+##
+
+namespace eval ::pt::peg::to::peg {
+    namespace export \
+	reset configure convert
+
+    namespace ensemble create
+}
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc ::pt::peg::to::peg::reset {} {
+    variable template @code@
+    variable name     a_pe_grammar
+    variable file     unknown
+    variable user     unknown
+    variable fused    1
+    return
+}
+
+proc ::pt::peg::to::peg::configure {args} {
+    variable template
+    variable name
+    variable file
+    variable user
+    variable fused
+
+    if {[llength $args] == 0} {
+	return [list \
+		    -file     $file \
+		    -fused    $fused \
+		    -name     $name \
+		    -template $template \
+		    -user     $user]
+    } elseif {[llength $args] == 1} {
+	lassign $args option
+	set variable [string range $option 1 end]
+	if {[info exists $variable]} {
+	    return [set $variable]
+	} else {
+	    return -code error "Expected one of -file, -fused, -name, -template, or -user, got \"$option\""
+	}
+    } elseif {[llength $args] % 2 == 0} {
+	foreach {option value} $args {
+	    set variable [string range $option 1 end]
+	    if {![info exists $variable]} {
+		return -code error "Expected one of -file, -fused, -name, -template, or -user, got \"$option\""
+	    }
+	}
+	foreach {option value} $args {
+	    set variable [string range $option 1 end]
+	    switch -exact -- $variable {
+		template {
+		    if {$value eq {}} {
+			return -code error "Expected template, got the empty string"
+		    }
+		}
+		fused {
+		    if {![::string is boolean -strict $value]} {
+			return -code error "Expected boolean, got \"$value\""
+		    }
+		}
+		name -
+		file -
+		user { }
+	    }
+	    set $variable $value
+	}
+    } else {
+	return -code error {wrong#args, expected option value ...}
+    }
+}
+
+proc ::pt::peg::to::peg::convert {serial} {
+    variable template
+    variable name
+    variable file
+    variable user
+
+    ::pt::peg verify-as-canonical $serial
+
+    # Unpack the serialization, known as canonical
+    array set peg $serial
+    array set peg $peg(pt::grammar::peg)
+    unset     peg(pt::grammar::peg)
+
+    # Determine the field sizes for nonterminal symbol names and
+    # semantic modes.
+
+    set smax [text::write maxlen [dict keys $peg(rules)]]
+    set mmax [ModeSize                      $peg(rules)]
+
+    # Assemble the output, various pieces
+    text::write reset
+    Header $peg(start)
+    Rules  $peg(rules) $mmax $smax
+    Trailer
+
+    # At last retrieve the fully assembled result and integrate with
+    # the chosen template.
+    return [string map \
+		[list \
+		     @user@   $user \
+		     @format@ PEG   \
+		     @file@   $file \
+		     @name@   $name \
+		     @code@   [text::write get]] $template]
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Internals
+
+proc ::pt::peg::to::peg::Header {startexpression} {
+    variable name
+
+    text::write field  PEG
+    text::write field  $name
+    text::write field  ([Expression $startexpression])
+    text::write /line
+    return
+}
+
+proc ::pt::peg::to::peg::Rules {rules mmax smax} {
+    if {[llength $rules]} { text::write /line }
+
+    foreach {symbol def} $rules {
+	lassign $def _ is _ mode
+	set mode  [expr {($mode eq "value")
+			 ? ""
+			 : "${mode}:"}]
+
+	text::write fieldl $mmax $mode
+	text::write fieldl $smax $symbol
+	text::write field        "<-"
+	text::write field        [Expression $is] 
+	text::write field        ";"
+	text::write /line
+    }
+
+    if {[llength $rules]} { text::write /line }
+    return
+}
+
+proc ::pt::peg::to::peg::Trailer {} {
+    text::write field  {END;}
+    text::write /line
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::pt::peg::to::peg::Expression {pe} {
+    variable fused
+
+    if {$fused} {
+	# First flatten for a maximum amount of adjacent terminals and
+	# ranges, then fuse these into strings and classes, then
+	# flatten again, eliminating all sequences and choices fully
+	# subsumed by the new elements.
+
+	set pe [pt::pe::op flatten \
+		    [pt::pe::op fusechars \
+			 [pt::pe::op flatten \
+			      $pe]]]
+    }
+
+    return [lindex [pt::pe bottomup \
+			[namespace current]::Convert \
+			$pe] 0]
+}
+
+proc ::pt::peg::to::peg::Convert {pe operator arguments} {
+    # For the inner nodes the each of arguments are a pair of
+    # generated text, and the sub-expression it came from, in this
+    # order.
+
+    switch -exact -- $operator {
+	alpha - alnum - ascii - control - digit - graph - lower - print -
+	punct - space - upper - wordchar - xdigit - ddigit {
+	    # Special forms ...
+	    return [list <$operator> $pe]
+	}
+	dot {
+	    # Special form ...
+	    return [list "." $pe]
+	}
+	epsilon {
+	    # Special form, represented by the empty string ...
+	    return [list "''" $pe]
+	}
+	t {
+	    # Character ...
+	    lassign $arguments char
+	    return [list "'[Char ${char}]'" $pe]
+	}
+	.. {
+	    # Range of characters ... Show as character class.
+	    # Note: Canonical input means that an expression like
+	    # {.. X X} cannot occur, and can be ignored.
+
+	    lassign $arguments chstart chend
+	    return [list "\[[Char ${chstart}]-[Char $chend]\]" $pe]
+	}
+	n {
+	    # Nonterminal symbol
+	    lassign $arguments symbol
+	    return [list $symbol $pe]
+	}
+	? - * - + {
+	    # Suffix operators (Option, Kleene Closure, Positive KC) ...
+	    lassign $arguments child
+	    lassign $child text def
+	    lassign $def coperator
+	    return [list [MayParens $operator $coperator $text]$operator $pe]
+	}
+	& -
+	! {
+	    # Prefix operators (And/Not Lookahead) ...
+	    lassign $arguments child
+	    lassign $child text def
+	    lassign $def coperator
+	    return [list $operator[MayParens $operator $coperator $text] $pe]
+	}
+	x {
+	    # Sequences ...
+	    # TODO :: merge adjacent chars into strings ...  also, cut
+	    # x out if only one child
+
+	    set t {}
+	    set x {}
+	    foreach a $arguments {
+		lassign $a text def
+		lassign $def coperator
+		lappend t [MayParens $operator $coperator $text]
+		lappend x $def
+	    }
+	    return [list [join $t { }] [list x {*}$x]]
+	}
+	/ {
+	    # Choices ...
+	    # TODO :: merge adjacent chars and ranges into classes ...
+	    # also, cut / out if only one child
+
+	    set t {}
+	    set x {}
+	    foreach a $arguments {
+		lassign $a text def
+		lassign $def coperator
+		lappend t [MayParens $operator $coperator $text]
+		lappend x $def
+	    }
+	    return [list [join $t { / }] [list / {*}$x]]
+	}
+	str {
+	    return [list \
+			'[join [struct::list map $arguments \
+				    [namespace current]::Char] {}]' \
+			$pe]
+	}
+	cl {
+	    return [list \
+			\[[join [struct::list map $arguments \
+				     [namespace current]::Range] {}]\] \
+			$pe]
+	}
+    }
+}
+
+proc ::pt::peg::to::peg::Range {range} {
+    # See also pt::peg::to::tclparam
+
+    # Use string ops here to distinguish terminals and ranges. The
+    # input can be a single char, not a list, and further the char may
+    # not be a proper list. Example: double-apostroph.
+    if {[string length $range] > 1} {
+	lassign $range s e
+	return [Char $s]-[Char $e]
+    } else {
+	return [Char $range]
+    }
+}
+
+proc ::pt::peg::to::peg::Char {ch} {
+    # Encode a character, handle special cases.  We cannot use package
+    # char, as that is geared towards character encoding for Tcl code.
+
+    switch -exact -- $ch {
+	"\n" { return "\\n"  }
+	"\r" { return "\\r"  }
+	"\t" { return "\\t"  }
+	"\\" { return "\\\\" }
+	"\"" { return "\\\"" }
+	"'"  { return "\\'"  }
+	"\]" { return "\\\]" }
+	"\[" { return "\\\[" }
+    }
+
+    scan $ch %c chcode
+
+    # Control characters: Octal
+    if {[::string is control -strict $ch]} {
+	return \\[format %o $chcode]
+    }
+
+    # Beyond 7-bit ASCII: Unicode
+
+    if {$chcode > 127} {
+	return \\u[format %04x $chcode]
+    }
+
+    # Regular character: Is its own representation.
+
+    return $ch
+
+}
+
+proc ::pt::peg::to::peg::MayParens {op cop text} {
+    if {![NeedParens $op $cop]} { return $text }
+    return "([::textutil::adjust::indent $text " " 1])"
+}
+
+proc ::pt::peg::to::peg::NeedParens {op cop} {
+    variable priority
+    # c(hild)op is nested under op.
+    # Parens are required if cop has a lower priority than op.
+
+    return [expr {$priority($cop) < $priority($op)}]
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::pt::peg::to::peg::ModeSize {rules} {
+    set modes {}
+    foreach {symbol def} $rules {
+	lassign $def _ is _ mode
+	if {$mode eq "value"} continue ; # These are not shown in the
+					 # text representation, as
+					 # they are the implicit
+					 # default for it.
+	lappend modes ${mode}:
+    }
+    return [text::write maxlen [lsort -uniq $modes]]
+}
+
+# ### ### ### ######### ######### #########
+## Configuration
+
+namespace eval ::pt::peg::to::peg {
+
+    variable template @code@       ; # A string. Specifies how to
+				     # embed the generated code into a
+				     # larger frame- work (the
+				     # template).
+    variable name     a_pe_grammar ; # String. Name of the grammar.
+    variable file     unknown      ; # String. Name of the file or
+				     # other entity the grammar came
+				     # from.
+    variable user     unknown      ; # String. Name of the user on
+				     # which behalf the conversion has
+				     # been invoked.
+    variable fused    1            ; # Boolean flag. If true character
+				     # sequences and choices are fused
+				     # into strings and classes.
+
+    variable  priority
+    array set priority {
+	/ 0  t       4  ascii 4  upper    4
+	x 1  n       4  digit 4  wordchar 4
+	& 2  ..      4  graph 4  xdigit   4
+	! 2  dot     4  lower 4  ddigit   4
+	+ 3  epsilon 4  print 4  str      4
+	* 3  alnum   4  punct 4  cl       4
+	? 3  alpha   4  space 4  control  4
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::to::peg 1.0.2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_tclparam.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_tclparam.tcl
new file mode 100644
index 00000000..21bbd303
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_peg_to_tclparam.tcl
@@ -0,0 +1,1273 @@
+# peg_to_param.tcl --
+#
+#	Conversion of PEG to Tcl/C PARAM, customizable text blocks.
+#
+# Copyright (c) 2009-2014 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: pt_peg_to_tclparam.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $
+
+# This package takes the canonical serialization of a parsing
+# expression grammar and produces text in PARAM assembler, i.e.
+# readable machine code for the PARAM virtual machine.
+
+## NOTE: Should have cheat sheet of PARAM instructions (which parts of
+## the arch state they touch, and secondly, bigger effects).
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package  require Tcl 8.5
+package  require pt::peg             ; # Verification that the input
+				       # is proper.
+package  require pt::pe              ; # Walking an expression.
+package  require pt::pe::op          ; # String/Class fusing
+package  require text::write         ; # Text generation support
+package  require char
+
+# ### ### ### ######### ######### #########
+##
+
+namespace eval ::pt::peg::to::tclparam {
+    namespace export \
+	reset configure convert
+
+    namespace ensemble create
+}
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc ::pt::peg::to::tclparam::reset {} {
+    variable template @code@
+    variable name     a_pe_grammar
+    variable file     unknown
+    variable user     unknown
+    variable self     {}
+    variable ns       ::
+    variable runtime  {}
+    variable def      proc
+    variable main     __main
+    variable indent   0
+    variable prelude  {}
+    return
+}
+
+proc ::pt::peg::to::tclparam::configure {args} {
+    variable template
+    variable name
+    variable file
+    variable user
+    variable self
+    variable ns
+    variable runtime
+    variable def
+    variable main
+    variable omap
+    variable indent
+    variable prelude
+
+    if {[llength $args] == 0} {
+	return [list \
+		    -indent          $indent \
+		    -runtime-command $runtime \
+		    -self-command    $self \
+		    -proc-command    $def \
+		    -namespace       $ns \
+		    -main            $main \
+		    -file            $file \
+		    -name            $name \
+		    -template        $template \
+		    -user            $user]
+    } elseif {[llength $args] == 1} {
+	lassign $args option
+	set variable [string range $option 1 end]
+	if {[info exists omap($variable)]} {
+	    return [set $omap($variable)]
+	} else {
+	    return -code error "Expected one of -indent, -runtime-command, -proc-command, -self-command, -namespace, -main, -file, -name, -template, or -user, got \"$option\""
+	}
+    } elseif {[llength $args] % 2 == 0} {
+	foreach {option value} $args {
+	    set variable [string range $option 1 end]
+	    if {![info exists omap($variable)]} {
+		return -code error "Expected one of -indent, -runtime-command, -proc-command, -self-command, -namespace, -main, -file, -name, -template, or -user, got \"$option\""
+	    }
+	}
+	foreach {option value} $args {
+	    set variable $omap([string range $option 1 end])
+	    switch -exact -- $variable {
+		template {
+		    if {$value eq {}} {
+			return -code error "Expected template, got the empty string"
+		    }
+		}
+		indent {
+		    if {![string is integer -strict $value] || ($value < 0)} {
+			return -code error "Expected int > 0, got \"$value\""
+		    }
+		}
+		runtime -
+		self -
+		def -
+		ns -
+		main -
+		name -
+		file -
+		user { }
+	    }
+	    set $variable $value
+	}
+    } else {
+	return -code error {wrong#args, expected option value ...}
+    }
+}
+
+proc ::pt::peg::to::tclparam::convert {serial} {
+    variable template
+    variable name
+    variable file
+    variable user
+    variable self
+    variable ns
+    variable runtime
+    variable def
+    variable main
+    variable indent
+    variable prelude
+
+    Op::Asm::Setup
+
+    ::pt::peg verify-as-canonical $serial
+
+    # Unpack the serialization, known as canonical
+    array set peg $serial
+    array set peg $peg(pt::grammar::peg)
+    unset     peg(pt::grammar::peg)
+
+    set modes {}
+    foreach {symbol symdef} $peg(rules) {
+	lassign $symdef _ is _ mode
+	lappend modes $symbol $mode
+    }
+
+    text::write reset
+    set blocks {}
+
+    # Translate all expressions/symbols, results are stored in
+    # text::write blocks, command results are the block ids.
+
+    set start [pt::pe::op flatten \
+		   [pt::pe::op fusechars \
+			[pt::pe::op flatten \
+			     $peg(start)]]]
+
+    lappend blocks [set start [Expression $start $modes]]
+
+    foreach {symbol symdef} $peg(rules) {
+	lassign $symdef _ is _ mode
+	set is [pt::pe::op flatten \
+		    [pt::pe::op fusechars \
+			 [pt::pe::op flatten \
+			      $is]]]
+	lappend blocks [Symbol $symbol $mode $is $modes]
+    }
+
+    # Assemble the output from the stored blocks.
+    text::write clear
+    Op::Asm::Header {Grammar Start Expression}
+    Op::Asm::FunStart @main@
+    Op::Asm::Call $start 0
+    Op::Asm::Tcl return
+    Op::Asm::FunClose
+
+    foreach b $blocks {
+	Op::Asm::Use $b
+	text::write /line
+    }
+
+    # At last retrieve the fully assembled result and integrate with
+    # the chosen template.
+
+    set code [text::write get]
+    if {$indent} {
+	set code [Indent $code $indent]
+    }
+
+    set pre $prelude ; if {$pre ne {}} { set pre " $pre" }
+    set run $runtime ; if {$run ne {}} { append run { } }
+    set slf $self    ; if {$slf ne {}} { append slf { } }
+
+    set code [string map \
+		  [list \
+		       @user@   $user \
+		       @format@ Tcl/PARAM   \
+		       @file@   $file \
+		       @name@   $name \
+		       @code@   $code] $template]
+    set code [string map \
+		  [list \
+		       {@runtime@ } $run \
+		       { @prelude@} $pre \
+		       {@self@ }    $slf \
+		       @def@     $def \
+		       @ns@      $ns   \
+		       @main@    $main] $code]
+
+    return $code
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Internals
+
+proc ::pt::peg::to::tclparam::Indent {text n} {
+    set b [string repeat { } $n]
+    return $b[join [split $text \n] \n$b]
+}
+
+proc ::pt::peg::to::tclparam::Expression {expression modes} {
+    # We first flatten for a maximum amount of adjacent terminals and
+    # ranges, then fuse these into strings and classes, then flatten
+    # again, eliminating all sequences and choices fully subsumed by
+    # the new elements.
+
+    return [pt::pe bottomup \
+		[list [namespace current]::Op $modes] \
+		$expression]
+}
+
+proc ::pt::peg::to::tclparam::Symbol {symbol mode rhs modes} {
+
+    set expression [Expression $rhs $modes]
+
+    text::write clear
+    Op::Asm::Header "$mode Symbol '$symbol'"
+    text::write store FUN_HEADER
+
+    Op::Asm::Start
+    Op::Asm::ReExpression $symbol
+    Op::Asm::GenAST $expression
+    Op::Asm::PE $rhs
+
+    set gen [dict get $result gen]
+
+    Op::Asm::Function sym_$symbol {
+
+	# We have six possibilites for the combination of AST node
+	# generation by the rhs and AST generation by the symbol. Two
+	# of these (leaf/0, value/0 coincide, leaving 5). This
+	# controls the use of AS/ARS instructions.
+
+	switch -exact -- $mode/$gen {
+	    value/1 {
+		# Generate value for symbol, rhs may have generated
+		# AST nodes as well, keep rhs
+
+		#Op::Asm::Tcl if \{!\[@runtime@ i_symbol_restore $symbol\]\} \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins i_loc_push
+		#Op::Asm::Ins i_ast_push
+
+		Op::Asm::Ins si:value_symbol_start $symbol
+		Op::Asm::Call $expression
+		Op::Asm::Ins si:reduce_symbol_end $symbol
+
+		#Op::Asm::Ins i_value_clear/reduce $symbol
+		#Op::Asm::Ins i_symbol_save       $symbol
+		#Op::Asm::Ins i_error_nonterminal $symbol
+		#Op::Asm::Ins i_ast_pop_rewind
+		#Op::Asm::Ins i_loc_pop_discard
+		#Op::Asm::<<< 4
+		#Op::Asm::Tcl \}
+		#Op::Asm::Ins i:ok_ast_value_push
+	    }
+	    leaf/0 -
+	    value/0 {
+		# Generate value for symbol, rhs cannot generate its
+		# own AST nodes => leaf/0.
+
+		#Op::Asm::Tcl if \{!\[@runtime@ i_symbol_restore $symbol\]\} \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins i_loc_push
+
+		Op::Asm::Ins si:void_symbol_start $symbol
+		Op::Asm::Call $expression
+		Op::Asm::Ins si:void_leaf_symbol_end $symbol
+
+		#Op::Asm::Ins i_value_clear/leaf $symbol
+		#Op::Asm::Ins i_symbol_save       $symbol
+		#Op::Asm::Ins i_error_nonterminal $symbol
+		#Op::Asm::Ins i_loc_pop_discard
+		#Op::Asm::<<< 4
+		#Op::Asm::Tcl \}
+		#Op::Asm::Ins i:ok_ast_value_push
+	    }
+	    leaf/1 {
+		# Generate value for symbol, rhs may have generated
+		# AST nodes as well, discard rhs.
+
+		#Op::Asm::Tcl if \{!\[@runtime@ i_symbol_restore $symbol\]\} \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins i_loc_push
+		#Op::Asm::Ins i_ast_push
+
+		Op::Asm::Ins si:value_symbol_start $symbol
+		Op::Asm::Call $expression
+		Op::Asm::Ins si:value_leaf_symbol_end $symbol
+
+		#Op::Asm::Ins i_value_clear/leaf   $symbol
+		#Op::Asm::Ins i_symbol_save       $symbol
+		#Op::Asm::Ins i_error_nonterminal $symbol
+		#Op::Asm::Ins i_ast_pop_rewind
+		#Op::Asm::Ins i_loc_pop_discard
+		#Op::Asm::<<< 4
+		#Op::Asm::Tcl \}
+		#Op::Asm::Ins i:ok_ast_value_push
+	    }
+	    void/1 {
+		# Generate no value for symbol, rhs may have generated
+		# AST nodes as well, discard rhs.
+		# // test case missing //
+
+		#Op::Asm::Tcl if \{!\[@runtime@ i_symbol_restore $symbol\]\} \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins i_loc_push
+		#Op::Asm::Ins i_ast_push
+
+		Op::Asm::Ins si:value_void_symbol_start $symbol
+		Op::Asm::Call $expression
+		Op::Asm::Ins si:value_clear_symbol_end $symbol
+
+		#Op::Asm::Ins i_value_clear
+		#Op::Asm::Ins i_symbol_save       $symbol
+		#Op::Asm::Ins i_error_nonterminal $symbol
+		#Op::Asm::Ins i_ast_pop_rewind
+		#Op::Asm::Ins i_loc_pop_discard
+		#Op::Asm::<<< 4
+		#Op::Asm::Tcl \}
+	    }
+	    void/0 {
+		# Generate no value for symbol, rhs cannot generate
+		# its own AST nodes. Nothing to save nor discard.
+
+		#Op::Asm::Tcl if \{!\[@runtime@ i_symbol_restore $symbol\]\} \{
+		#Op::Asm::>>> 4
+		#Op::Asm::Ins i_loc_push
+
+		Op::Asm::Ins si:void_void_symbol_start $symbol
+		Op::Asm::Call $expression
+		Op::Asm::Ins si:void_clear_symbol_end $symbol
+
+		#Op::Asm::Ins i_value_clear
+		#Op::Asm::Ins i_symbol_save       $symbol
+		#Op::Asm::Ins i_error_nonterminal $symbol
+		#Op::Asm::Ins i_loc_pop_discard
+		#Op::Asm::<<< 4
+		#Op::Asm::Tcl \}
+	    }
+	}
+    } $expression
+    Op::Asm::Done
+}
+
+namespace eval ::pt::peg::to::tclparam::Op {
+    namespace export \
+	alpha alnum ascii control digit graph lower print \
+	punct space upper wordchar xdigit ddigit \
+	dot epsilon t .. n ? * + & ! x / str cl
+}
+
+proc ::pt::peg::to::tclparam::Op {modes pe op arguments} {
+    return [namespace eval Op [list $op $modes {*}$arguments]]
+}
+
+proc ::pt::peg::to::tclparam::Op::epsilon {modes} {
+    Asm::Start
+    Asm::ReExpression epsilon
+    Asm::Direct {
+	Asm::Ins i_status_ok
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::tclparam::Op::dot {modes} {
+    Asm::Start
+    Asm::ReExpression dot
+    Asm::Direct {
+	Asm::Ins i_input_next dot
+    }
+    Asm::Done
+}
+
+foreach test {
+    alpha alnum ascii control digit graph lower print
+    punct space upper wordchar xdigit ddigit
+} {
+    proc ::pt::peg::to::tclparam::Op::$test {modes} \
+	[string map [list @ $test] {
+	    Asm::Start
+	    Asm::ReExpression @
+	    Asm::Direct {
+		#Asm::Ins i_input_next @
+		#Asm::Ins i:fail_return
+		#Asm::Ins i_test_@
+
+		Asm::Ins si:next_@
+	    }
+	    Asm::Done
+	}]
+}
+
+proc ::pt::peg::to::tclparam::Op::t {modes char} {
+    Asm::Start
+    Asm::ReTerminal t $char
+    Asm::Direct {
+	set char [char quote tcl $char]
+
+	#Asm::Ins i_input_next "\{t $char\}"
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_char $char
+
+	Asm::Ins si:next_char $char
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::tclparam::Op::.. {modes chs che} {
+    Asm::Start
+    Asm::ReTerminal .. $chs $che
+    Asm::Direct {
+	set chs [char quote tcl $chs]
+	set che [char quote tcl $che]
+
+	#Asm::Ins i_input_next "\{.. $chs $che\}"
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_range $chs $che
+
+	Asm::Ins si:next_range $chs $che
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::tclparam::Op::str {modes args} {
+    Asm::Start
+    Asm::ReTerminal str {*}$args
+    Asm::Direct {
+	# Without fusing this would be rendered as a sequence of
+	# characters, with associated stack churn for each character/part
+	# (See Op::x, void/all).
+
+	set str [join $args {}]
+	set str [char quote tcl $str]
+
+	Asm::Ins si:next_str $str
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::tclparam::Op::cl {modes args} {
+    # rorc = Range-OR-Char-List
+    Asm::Start
+    Asm::ReTerminal cl {*}$args
+    Asm::Direct {
+	# Without fusing this would be rendered as a choice of
+	# characters, with associated stack churn for each
+	# character/branch (See Op::/, void/all).
+
+	set cl [join [Ranges {*}$args] {}]
+	set cl [char quote tcl $cl]
+
+	Asm::Ins si:next_class $cl
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::tclparam::Op::Ranges {args} {
+    set res {}
+    foreach rorc $args { lappend res [Range $rorc] }
+    return $res
+}
+
+proc ::pt::peg::to::tclparam::Op::Range {rorc} {
+    # See also pt::peg::to::peg
+
+    # We use string ops here to distinguish terminals and ranges. The
+    # input can be a single char, not a list, and further the char may
+    # not be a proper list. Example: double-apostroph.
+    if {[string length $rorc] > 1} {
+	lassign $rorc s e
+
+	# The whole range is expanded into its full set of characters.
+	# Beware, this may blow the process if the range tries to
+	# match a substantial part of the unicode character set. We
+	# should see if there is a way to keep it encoded as range
+	# without giving up on the fast matching.
+
+	set s [scan $s %c]
+	set e [scan $e %c]
+
+	set res {}
+	for {set i $s} {$i <= $e} {incr i} {
+	    append res [format %c $i]
+	}
+	return $res
+    } else {
+	return $rorc ;#[char quote tcl $rorc]
+    }
+}
+
+proc ::pt::peg::to::tclparam::Op::n {modes symbol} {
+    # symbol mode determines AST generation
+    # void       => non-generative,
+    # leaf/value => generative.
+
+    Asm::Start
+    Asm::ReTerminal n $symbol
+
+    if {![dict exists $modes $symbol]} {
+	# Incomplete grammar. The symbol has no definition.
+	Asm::Direct {
+	    Asm::Ins i_status_fail "; # Undefined symbol '$symbol'"
+	}
+    } else {
+	Asm::GenAST [list gen [expr { [dict get $modes $symbol] ne "void" }]]
+	Asm::Direct {
+	    Asm::Self sym_$symbol
+	}
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::tclparam::Op::& {modes expression} {
+    # Note: This operation could be inlined, as it has no special
+    #       control flow. Not done to make the higher-level ops are
+    #       similar in construction and use = consistent and simple.
+
+    Asm::Start
+    Asm::ReExpression & $expression
+    Asm::GenAST $expression
+
+    Asm::Function [Asm::NewBlock ahead] {
+	Asm::Ins i_loc_push
+	Asm::Call $expression
+	Asm::Ins i_loc_pop_rewind
+    } $expression
+    Asm::Done
+}
+
+proc ::pt::peg::to::tclparam::Op::! {modes expression} {
+    # Note: This operation could be inlined, as it has no special
+    #       control flow. Not done to make the higher-level ops are
+    #       similar in construction and use = consistent and simple.
+
+    Asm::Start
+    Asm::ReExpression ! $expression
+    if {[dict get $expression gen]} {
+	Asm::Function [Asm::NewBlock notahead] {
+	    # The sub-expression may generate AST elements. We must
+	    # not pass them through.
+
+	    #Asm::Ins i_loc_push
+	    #Asm::Ins i_ast_push
+
+	    Asm::Ins si:value_notahead_start
+
+	    Asm::Call $expression
+
+	    #Asm::Ins i_ast_pop_discard/rewind
+	    #Asm::Ins i_loc_pop_rewind
+	    #Asm::Ins i_status_negate
+
+	    Asm::Ins si:value_notahead_exit
+	} $expression
+    } else {
+	Asm::Function [Asm::NewBlock notahead] {
+	    # The sub-expression cannot generate AST elements. We can
+	    # ignore AS/ARS, simplifying the code.
+
+	    Asm::Ins i_loc_push
+
+	    Asm::Call $expression
+
+	    #Asm::Ins i_loc_pop_rewind
+	    #Asm::Ins i_status_negate
+
+	    Asm::Ins si:void_notahead_exit
+	} $expression
+    }
+    Asm::Done
+}
+
+proc ::pt::peg::to::tclparam::Op::? {modes expression} {
+    # Note: This operation could be inlined, as it has no special
+    #       control flow. Not done to make the higher-level ops are
+    #       similar in construction and use => consistent and simple.
+
+    Asm::Start
+    Asm::ReExpression ? $expression
+    Asm::GenAST $expression
+
+    Asm::Function [Asm::NewBlock optional] {
+	#Asm::Ins i_loc_push
+	#Asm::Ins i_error_push
+
+	Asm::Ins si:void2_state_push
+
+	Asm::Call $expression
+
+	#Asm::Ins i_error_pop_merge
+	#Asm::Ins i_loc_pop_rewind/discard
+	#Asm::Ins i_status_ok
+
+	Asm::Ins si:void_state_merge_ok
+    } $expression
+    Asm::Done
+}
+
+proc ::pt::peg::to::tclparam::Op::* {modes expression} {
+    Asm::Start
+    Asm::ReExpression * $expression
+    Asm::GenAST $expression
+
+    Asm::Function [Asm::NewBlock kleene] {
+	Asm::Tcl while \{1\} \{
+	Asm::>>> 4
+	#Asm::Ins i_loc_push
+	#Asm::Ins i_error_push
+
+	Asm::Ins si:void2_state_push
+
+	Asm::Call $expression
+
+	#Asm::Ins i_error_pop_merge
+	#Asm::Ins i_loc_pop_rewind/discard
+	#Asm::Ins i:fail_status_ok
+	#Asm::Tcl i:fail_return
+
+	Asm::Ins si:kleene_close
+	Asm::<<< 4
+	Asm::Tcl \}
+	# FAILED, clean up and return OK.
+    } $expression
+    Asm::Done
+}
+
+proc ::pt::peg::to::tclparam::Op::+ {modes expression} {
+    Asm::Start
+    Asm::ReExpression + $expression
+    Asm::GenAST $expression
+
+    Asm::Function [Asm::NewBlock poskleene] {
+	Asm::Ins i_loc_push
+
+	Asm::Call $expression
+
+	#Asm::Ins i_loc_pop_rewind/discard
+	#Asm::Ins i:fail_return
+
+	Asm::Ins si:kleene_abort
+
+	Asm::Tcl while \{1\} \{
+	Asm::>>> 4
+	#Asm::Ins i_loc_push
+	#Asm::Ins i_error_push
+
+	Asm::Ins si:void2_state_push
+
+	Asm::Call $expression
+
+	#Asm::Ins i_error_pop_merge
+	#Asm::Ins i_loc_pop_rewind/discard
+	#Asm::Ins i:ok_continue
+	#Asm::Tcl break
+
+	Asm::Ins si:kleene_close
+	Asm::<<< 4
+	Asm::Tcl \}
+	# FAILED, clean up and return OK.
+	#Asm::Ins i_status_ok
+
+    } $expression
+    Asm::Done
+}
+
+proc ::pt::peg::to::tclparam::Op::x {modes args} {
+    if {[llength $args] == 1} {
+	return [lindex $args 0]
+    }
+
+    Asm::Start
+    Asm::ReExpression x {*}$args
+    set gens [Asm::GenAST {*}$args]
+
+    # We have three possibilities regarding AST node generation, each
+    # requiring a slightly different instruction sequence.
+
+    # i.  gen     == 0  <=> No node generation at all.
+    # ii. gens[0] == 1  <=> We may have nodes from the beginning.
+    # iii.              <=> Node generation starts in the middle.
+
+    if {![dict get $result gen]} {
+	set mode none
+    } elseif {[lindex $gens 0]} {
+	set mode all
+    } else {
+	set mode some
+    }
+
+    Asm::Function [Asm::NewBlock sequence] {
+	switch -exact -- $mode {
+	    none {
+		# (Ad i) No AST node generation at all.
+
+		Asm::xinit0
+
+		# Note: This loop runs at code generation time. At
+		# runtime the entire construction is essentially a
+		# fully unrolled loop, with each iteration having its
+		# own block of instructions.
+
+		foreach expression [lrange $args 0 end-1] {
+		    Asm::Call $expression
+		    Asm::xinter00
+		}
+		Asm::Call [lindex $args end]
+		Asm::xexit0
+	    }
+	    all {
+		# (Ad ii) AST node generation from start to end.
+
+		Asm::xinit1
+
+		# Note: This loop runs at code generation time. At
+		# runtime the entire construction is essentially a
+		# fully unrolled loop, with each iteration having its
+		# own block of instructions.
+
+		foreach expression [lrange $args 0 end-1] {
+		    Asm::Call $expression
+		    Asm::xinter11
+		}
+		Asm::Call [lindex $args end]
+		Asm::xexit1
+	    }
+	    some {
+		# (Ad iii). Start without AST nodes, later parts do
+		# AST nodes.
+
+		Asm::xinit0
+
+		# Note: This loop runs at code generation time. At
+		# runtime the entire construction is essentially a
+		# fully unrolled loop, with each iteration having its
+		# own block of instructions.
+
+		set pushed 0
+		foreach expression [lrange $args 0 end-1] xgen [lrange $gens 1 end] {
+		    Asm::Call $expression
+		    if {!$pushed && $xgen} {
+			Asm::xinter01
+			set pushed 1
+			continue
+		    }
+		    if {$pushed} {
+			Asm::xinter11
+		    } else {
+			Asm::xinter00
+		    }
+		}
+		Asm::Call [lindex $args end]
+		Asm::xexit1
+	    }
+	}
+    } {*}$args
+    Asm::Done
+}
+
+proc ::pt::peg::to::tclparam::Op::/ {modes args} {
+    if {[llength $args] == 1} {
+	return [lindex $args 0]
+    }
+
+    Asm::Start
+    Asm::ReExpression / {*}$args
+    set gens [Asm::GenAST {*}$args]
+
+    # Optimized AST handling: Handle each branch separately, based on
+    # its ability to generate AST nodes.
+
+    Asm::Function [Asm::NewBlock choice] {
+	set xgen [lindex $gens 0]
+	Asm::/init$xgen
+
+	# Note: This loop runs at code generation time. At runtime the
+	# entire construction is essentially a fully unrolled loop,
+	# with each iteration having its own block of instructions.
+
+	foreach expression [lrange $args 0 end-1] nxgen [lrange $gens 1 end] {
+	    Asm::Call $expression
+	    Asm::/inter$xgen$nxgen
+	    set xgen $nxgen
+	}
+
+	Asm::Call [lindex $args end]
+	Asm::/exit$nxgen
+
+    } {*}$args
+    Asm::Done
+}
+
+# ### ### ### ######### ######### #########
+## Assembler commands
+
+namespace eval ::pt::peg::to::tclparam::Op::Asm {}
+
+# ### ### ### ######### ######### #########
+## The various part of a sequence compilation.
+
+proc ::pt::peg::to::tclparam::Op::Asm::xinit0 {} {
+    #Ins i_loc_push
+    #Ins i_error_clear_push
+
+    Ins si:void_state_push
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::xinit1 {} {
+    #Ins i_ast_push
+    #Ins i_loc_push
+    #Ins i_error_clear_push
+
+    Ins si:value_state_push
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::xinter00 {} {
+    #Ins i_error_pop_merge
+    # Stop the sequence on element failure, and
+    # restore state to before we tried the sequence.
+    #Ins i:fail_loc_pop_rewind
+    #Ins i:fail_return
+    #Ins i_error_push
+
+    Ins si:voidvoid_part
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::xinter01 {} {
+    #Ins i_error_pop_merge
+    # Stop the sequence on element failure, and
+    # restore state to before we tried the sequence.
+    #Ins i:fail_loc_pop_rewind
+    #Ins i:fail_return
+    #Ins i_ast_push
+    #Ins i_error_push
+
+    Ins si:voidvalue_part
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::xinter11 {} {
+    #Ins i_error_pop_merge
+    # Stop the sequence on element failure, and
+    # restore state to before we tried the sequence.
+    #Ins i:fail_ast_pop_rewind
+    #Ins i:fail_loc_pop_rewind
+    #Ins i:fail_return
+    #Ins i_error_push
+
+    Ins si:valuevalue_part
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::xexit0 {} {
+    #Ins i_error_pop_merge
+    #Ins i_loc_pop_rewind/discard
+    #Ins i:fail_return
+
+    Ins si:void_state_merge
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::xexit1 {} {
+    #Ins i_error_pop_merge
+    #Ins i_ast_pop_rewind/discard
+    #Ins i_loc_pop_rewind/discard
+    #Ins i:fail_return
+
+    Ins si:value_state_merge
+    return
+}
+
+# ### ### ### ######### ######### #########
+## The various part of a choice compilation.
+
+proc ::pt::peg::to::tclparam::Op::Asm::/init0 {} {
+    #Ins i_loc_push
+    #Ins i_error_clear_push
+
+    Ins si:void_state_push
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::/init1 {} {
+    #Ins i_ast_push
+    #Ins i_loc_push
+    #Ins i_error_clear_push
+
+    Ins si:value_state_push
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::/inter00 {} {
+    #Ins i_error_pop_merge
+    # A branch was successful, squash the backtracking state
+    #Ins i:ok_loc_pop_discard
+    #Ins i:ok_return
+    #Ins i_loc_rewind
+    #Ins i_error_push
+
+    Ins si:voidvoid_branch
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::/inter01 {} {
+    #Ins i_error_pop_merge
+    # A branch was successful, squash the backtracking state
+    #Ins i:ok_loc_pop_discard
+    #Ins i:ok_return
+    #Ins i_ast_push
+    #Ins i_loc_rewind
+    #Ins i_error_push
+
+    Ins si:voidvalue_branch
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::/inter10 {} {
+    #Ins i_error_pop_merge
+    #Ins i_ast_pop_rewind/discard
+    # A branch was successful, squash the backtracking state
+    #Ins i:ok_loc_pop_discard
+    #Ins i:ok_return
+    #Ins i_loc_rewind
+    #Ins i_error_push
+
+    Ins si:valuevoid_branch
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::/inter11 {} {
+    #Ins i_error_pop_merge
+    # A branch was successful, squash the backtracking state
+    #Ins i:ok_ast_pop_discard
+    #Ins i:ok_loc_pop_discard
+    #Ins i:ok_return
+    #Ins i_ast_rewind
+    #Ins i_loc_rewind
+    #Ins i_error_push
+
+    Ins si:valuevalue_branch
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::/exit0 {} {
+    #Ins i_error_pop_merge
+    #Ins i_loc_pop_rewind/discard
+
+    Ins si:void_state_merge
+
+    # Note: on ok we return, on fail, we .. set to fail ... The last
+    # is unnecessary. Which then makes the conditional return also
+    # irrelevant.
+
+    # A branch was successful, squash the backtracking state
+    #Ins i:ok_return
+
+    # All branches FAILED
+    #text::write /line
+    #Ins i_status_fail
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::/exit1 {} {
+    #Ins i_error_pop_merge
+    #Ins i_ast_pop_rewind/discard
+    #Ins i_loc_pop_rewind/discard
+
+    Ins si:value_state_merge
+
+    # Note: on ok we return, on fail, we .. set to fail ... The last
+    # is unnecessary. Which then makes the conditional return also
+    # irrelevant.
+
+    # A branch was successful, squash the backtracking state
+    #Ins i:ok_return
+
+    # All branches FAILED
+    #text::write /line
+    #Ins i_status_fail
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Allocate a text block / internal symbol / function
+
+proc ::pt::peg::to::tclparam::Op::Asm::Start {} {
+    upvar 1 result result
+    set result {def {} use {} gen 0 pe {}}
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::Done {} {
+    upvar 1 result result
+    return -code return $result
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::ReExpression {op args} {
+    upvar 1 result result
+
+    set pe $op
+    foreach a $args {
+	lappend pe [dict get $a pe]
+    }
+
+    dict set result pe $pe
+    PE $pe
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::ReTerminal {op args} {
+    upvar 1 result result
+
+    set pe [linsert $args 0 $op]
+    dict set result pe $pe
+    PE $pe
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::GenAST {args} {
+    upvar 1 result result
+
+    foreach a $args {
+	lappend flags [dict get $a gen]
+    }
+
+    dict set result gen    [tcl::mathfunc::max {*}$flags]
+    dict set result genmin [tcl::mathfunc::min {*}$flags]
+    return $flags
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::NewBlock {type} {
+    variable counter
+    variable lastid ${type}_[incr counter]
+    return $lastid
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::Function {name def args} {
+    upvar 1 result result
+    variable cache
+
+    set k [list [dict get $result gen] [dict get $result pe]]
+
+    # Hardcoded 'compact == 1', compare "pt_peg_to_param.tcl"
+    if {[info exists cache($k)]} {
+	dict set result def {}
+	dict set result use $cache($k)
+	return
+    }
+
+    text::write clear
+    if {[text::write exists FUN_HEADER]} {
+	text::write recall FUN_HEADER
+	text::write undef  FUN_HEADER
+    }
+
+    FunStart $name
+
+    text::write recall PE ; # Generated in Asm::ReExpression, printed
+    text::write undef  PE ; # representation of the expression, to
+			    # make the generated code more readable.
+    uplevel 1 $def
+    Tcl return
+
+    FunClose
+
+    if {[llength $args]} {
+	Use {*}$args
+    }
+
+    text::write store $name
+
+    set useb [NewBlock anon]
+    text::write clear
+    Self $name
+    text::write store $useb
+
+    dict set result def $name
+    dict set result use $useb
+
+    set cache($k) $useb
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::Direct {use} {
+    upvar 1 result result
+
+    set useb [NewBlock anon]
+    text::write clear
+    uplevel 1 $use
+    text::write store $useb
+
+    dict set result def {}
+    dict set result use $useb
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::Call {expr {distance 1}} {
+    #if {$distance} { text::write /line }
+
+    text::write recall [dict get $expr use]
+
+    #if {$distance} { text::write /line }
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::Use {args} {
+    foreach item $args {
+	set def [dict get $item def]
+	if {$def eq {}} continue
+	text::write recall $def
+	text::write undef  $def
+    }
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::FunStart {name} {
+    text::write /line
+    text::write field @def@ @ns@$name \{\} \{ @prelude@
+    text::write /line
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::FunClose {} {
+    text::write field \}
+    text::write /line
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::Ins {args} {
+    Tcl @runtime@ {*}$args
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::Self {args} {
+    Tcl @self@ {*}$args
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::>>> {n} {
+    variable field
+    incr field $n
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::<<< {n} {
+    variable field
+    incr field -$n
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::Tcl {args} {
+    variable field
+    text::write fieldl $field {}
+    text::write field {*}$args
+    text::write /line
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::Header {text} {
+    text::write field "#"
+    text::write /line
+    text::write field "# $text"
+    text::write /line
+    text::write field "#"
+    text::write /line
+    #text::write /line
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::PE {pe} {
+    text::write clear
+    text::write field [pt::pe print $pe]
+    text::write /line
+    text::write prefix "    # "
+    text::write /line
+    text::write store PE
+    return
+}
+
+proc ::pt::peg::to::tclparam::Op::Asm::Setup {} {
+    variable counter 0
+    variable field 3
+    variable cache
+    array unset cache *
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Configuration
+
+namespace eval ::pt::peg::to::tclparam {
+    namespace eval ::pt::peg::to::tclparam::Op::Asm {
+	variable counter 0
+	variable fieldlen {17 5 5}
+	variable field 3
+	variable  cache
+	array set cache {}
+    }
+
+    variable omap ; array set omap {
+	runtime-command runtime
+	self-command    self
+	proc-command    def
+	namespace       ns
+	main            main
+	file            file
+	name            name
+	template        template
+	user            user
+	indent          indent
+	prelude         prelude
+    }
+
+    variable self     {}
+    variable ns       ::
+    variable runtime  {}
+    variable def      proc
+    variable main     __main
+    variable indent   0
+    variable prelude  {}
+
+    variable template @code@       ; # A string. Specifies how to
+				     # embed the generated code into a
+				     # larger frame- work (the
+				     # template).
+    variable name     a_pe_grammar ; # String. Name of the grammar.
+    variable file     unknown      ; # String. Name of the file or
+				     # other entity the grammar came
+				     # from.
+    variable user     unknown      ; # String. Name of the user on
+				     # which behalf the conversion has
+				     # been invoked.
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide pt::peg::to::tclparam 1.0.3
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_pegrammar.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_pegrammar.tcl
new file mode 100644
index 00000000..c264fdb4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_pegrammar.tcl
@@ -0,0 +1,380 @@
+# -*- tcl -*-
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Verification of serialized PEGs, and conversion between
+# serializations and other data structures.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.5                 ; # Required runtime.
+package require pt::pe
+
+# # ## ### ##### ######## ############# #####################
+##
+
+namespace eval ::pt::peg {
+    namespace export \
+	verify verify-as-canonical canonicalize print merge equal
+    namespace ensemble create
+}
+
+# # ## ### ##### ######## #############
+## Public API
+
+# Check that the proposed serialization of a keyword index is
+# indeed such.
+
+proc ::pt::peg::verify {serial {canonvar {}}} {
+    variable ourprefix
+    variable ourshort
+    variable ourtag
+    variable ourcbadlen
+    variable ourmiss
+    variable ourbadpe
+    variable ourcode
+
+    # Basic syntax: Length and outer type code
+    if {[llength $serial] != 2} {
+	return -code error $ourprefix$ourshort
+    }
+
+    lassign $serial tag contents
+
+    if {$tag ne $ourcode} {
+	return -code error $ourprefix[format $ourtag $tag]
+    }
+
+    # contents = dict (rules, start -> ...)
+
+    if {[llength $contents] != 4} {
+	return -code error $ourprefix$ourcbadlen
+    }
+
+    # Unpack the contents, then check that all necessary keys are
+    # present. Together with the length check we can then also be
+    # sure that no other key is present either.
+    array set peg $contents
+    foreach k {rules start} {
+	if {[info exists peg($k)]} continue
+	return -code error $ourprefix[format $ourmiss $k]
+    }
+
+    if {[catch {
+	pt::pe verify $peg(start) canon
+    } msg]} {
+	return -code error \
+	    [string map \
+		 [list \
+		      {error in serialization:} \
+		      $ourprefix[format $ourbadpe start]] \
+		 $msg]
+    }
+
+    if {$canonvar eq {}} {
+	VerifyRules $peg(rules)
+    } else {
+	upvar 1 $canonvar iscanonical
+	set iscanonical $canon
+
+	VerifyRules $peg(rules) iscanonical
+
+	# Quick exit if the inner structure was already
+	# non-canonical.
+	if {!$iscanonical} return
+
+	# Now various checks if the keys and identifiers are
+	# properly sorted to make this a canonical serialization.
+
+	lassign $contents a _ b _
+	if {[list $a $b] ne {rules start}} {
+	    set iscanonical 0
+	}
+
+	if {$serial ne [list {*}$serial]} {
+	    set iscanonical 0
+	}
+
+	if {$contents ne [list {*}$contents]} {
+	    set iscanonical 0
+	}
+    }
+
+    # Everything checked out.
+    return
+}
+
+proc ::pt::peg::verify-as-canonical {serial} {
+    verify $serial iscanonical
+    if {!$iscanonical} {
+	variable ourprefix
+	variable ourdupsort
+	return -code error $ourprefix$ourdupsort
+    }
+    return
+}
+
+proc ::pt::peg::canonicalize {serial} {
+    variable ourcode
+
+    verify $serial iscanonical
+    if {$iscanonical} { return $serial }
+
+    # Unpack the serialization.
+    array set peg $serial
+    array set peg $peg($ourcode)
+    unset     peg($ourcode)
+
+    # Construct result, inside out
+    set rules {}
+    array set r $peg(rules)
+    foreach symbol [lsort -dict [array names r]] {
+	array set sd $r($symbol)
+	lappend rules \
+	    $symbol [list \
+			 is   [pt::pe \
+				   canonicalize $sd(is)] \
+			 mode $sd(mode)]
+	unset sd
+    }
+
+    set serial [list $ourcode \
+		    [list \
+			 rules  $rules \
+			 start  [pt::pe \
+				     canonicalize $peg(start)]]]
+    return $serial
+}
+
+# Converts a PEG serialization into a human readable string for
+# test results. It assumes that the serialization is at least
+# structurally sound.
+
+proc ::pt::peg::print {serial} {
+    variable ourcode
+
+    # Unpack the serialization.
+    array set peg $serial
+    array set peg $peg($ourcode)
+    unset     peg($ourcode)
+    # Print
+    set lines {}
+    lappend lines $ourcode
+    lappend lines "    start := [join [split [pt::pe print $peg(start)] \n] "\n             "]"
+    lappend lines {    rules}
+    foreach {symbol value} $peg(rules) {
+	array set sd $value
+	# keys :: is, mode
+	lappend lines "        $symbol :: <$sd(mode)> :="
+	lappend lines "            [join [split [pt::pe print $sd(is)] \n] "\n            "]"
+	unset sd
+    }
+    return [join $lines \n]
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::peg::merge {seriala serialb} {
+    variable ourcode
+
+    verify $seriala
+    verify $serialb
+
+    array set pega $seriala
+    array set pega $pega($ourcode)
+    unset     pega($ourcode)
+
+    array set pegb $serialb
+    array set pegb $pegb($ourcode)
+    unset     pegb($ourcode)
+
+    array set ra $pega(rules)
+    array set rb $pegb(rules)
+
+    foreach symbol [array names rb] {
+	if {![info exists ra($symbol)]} {
+	    # No conflict possible, copy over
+	    set ra($symbol) $rb($symbol)
+	} else {
+	    # unpack definitions, check for conflicts
+	    array set sda $ra($symbol)
+	    array set sdb $rb($symbol)
+
+	    if {$sda(mode) ne $sdb(mode)} {
+		return -code "Merge error for nonterminal \"$symbol\", semantic mode mismatch"
+	    }
+
+	    # Merge parsing expressions, if not identical ...
+	    if {![pt::pe equal \
+		      $sda(is) \
+		      $sdb(is)]} {
+		set sda(is) [pt::pe choice \
+				 $sda(is) \
+				 $sdb(is)]
+		set ra($symbol) [array get sda]
+	    }
+
+	    unset sda
+	    unset sdb
+	}
+    }
+
+    # Construct result, inside out
+
+    set rules {}
+    foreach symbol [lsort -dict [array names ra]] {
+	array set sd $ra($symbol)
+	lappend rules \
+	    $symbol [list \
+			 is   $sd(is) \
+			 mode $sd(mode)]
+	unset sd
+    }
+
+    if {![pt::pe equal \
+	      $pega(start) \
+	      $pegb(start)]} {
+	set start [pt::pe choice \
+		       $pega(start) \
+		       $pegb(start)]
+    } else {
+	set start $pega(start)
+    }
+
+    set serial [list $ourcode \
+		    [list \
+			 rules  $rules \
+			 start  $start]]
+    return $serial
+
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::peg::equal {seriala serialb} {
+    # syntactical (intensional) grammar equality.
+    string equal \
+	[canonicalize $seriala] \
+	[canonicalize $serialb]
+}
+
+# # ## ### ##### ######## #############
+
+
+proc ::pt::peg::VerifyRules {rules {canonvar {}}} {
+    variable ourprefix
+    variable ourrbadlen
+    variable oursdup
+    variable oursempty
+    variable oursbadlen
+    variable oursmiss
+    variable ourbadpe
+    variable ourbadmode
+    variable ourmode
+
+    if {$canonvar ne {}} {
+	upvar 1 $canonvar iscanonical
+    }
+
+    if {[llength $rules] % 2 == 1} {
+	return -code error $ourprefix$ourrbadlen
+    }
+
+    if {$rules ne [list {*}$rules]} {
+	set iscanonical 0
+    }
+
+    array set r $rules
+
+    if {([array size r]*2) < [llength $rules]} {
+	return -code error $ourprefix$oursdup
+    }
+
+    foreach symbol [array names r] {
+	if {$symbol eq {}} {
+	    return -code error $ourprefix$oursempty
+	}
+
+	set def $r($symbol)
+
+	if {[llength $def] != 4} {
+	    return -code error $ourprefix[format $oursbadlen $symbol]
+	}
+
+	if {$def ne [list {*}$def]} {
+	    set iscanonical 0
+	}
+
+	array set sd $def
+	foreach k {is mode} {
+	    if {[info exists sd($k)]} continue
+	    return -code error $ourprefix[format $oursmiss $symbol $k]
+	}
+
+	if {[catch {
+	    pt::pe verify $sd(is) canon
+	} msg]} {
+	    return -code error \
+		[string map \
+		     [list \
+			  {error in serialization:} \
+			  $ourprefix[format $ourbadpe ($symbol)]] \
+		     $msg]
+	}
+
+	if {![info exists ourmode($sd(mode))]} {
+	    return -code error $ourprefix[format $ourbadmode $symbol $sd(mode)]
+	}
+
+	# Now various checks if the keys and identifiers are
+	# properly sorted to make this a canonical serialization.
+
+	if {!$canon} {
+	    set iscanonical 0
+	    continue
+	}
+
+	lassign $def a _ b _
+	if {[list $a $b] ne {is mode}} {
+	    set iscanonical 0
+	}
+    }
+    return
+}
+
+namespace eval ::pt::peg {
+    # # ## ### ##### ######## #############
+
+    variable ourcode      pt::grammar::peg
+    variable ourprefix    {error in serialization:}
+    #                                                                              # Test cases (grammar-peg-structure-)
+    variable ourshort     { dictionary too short, expected exactly one key}      ; # 
+    variable ourtag       { bad type tag "%s"}                                   ; # 
+    variable ourcbadlen   { dictionary of bad length, expected exactly two keys} ; # 
+    variable ourmiss      { missing expected key "%s"}                           ; # 
+    variable oursmiss     { symbol "%s", missing expected key "%s"}                           ; # 
+    variable ourbadpe     { bad %s parsing expression:}                      ; # 
+    variable ourbadmode   { symbol "%s", bad nonterminal mode "%s"}                           ; # 
+    variable ourrbadlen   { rule dictionary of bad length, not a dictionary}     ; # 
+    variable oursempty    { expected symbol name, got empty string}
+    variable oursbadlen   { symbol dictionary for "%s" of bad length, expected exactly two keys} ; # 
+    variable oursdup      { duplicate nonterminal keywords}                                  ; # 
+    # Message for non-canonical serialization when expecting canonical form
+    variable ourdupsort   { duplicate and/or unsorted keywords and/or irrelevant whitespace}                ; #
+
+    variable  ourmode
+    array set ourmode {
+	value .
+	leaf  .
+	void  .
+    }
+
+    ##
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide pt::peg 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_pexpr_op.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_pexpr_op.tcl
new file mode 100644
index 00000000..e052bbb9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_pexpr_op.tcl
@@ -0,0 +1,331 @@
+# -*- tcl -*-
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Utility commands operating on parsing expressions.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.5        ; # Required runtime.
+package require pt::pe         ; # PE basics
+package require struct::set    ; # Set operations (symbol sets)
+
+# # ## ### ##### ######## ############# #####################
+##
+
+namespace eval ::pt::pe::op {
+    namespace export \
+	drop rename called flatten fusechars
+
+    namespace ensemble create
+}
+
+# # ## ### ##### ######## #############
+## Public API
+
+proc ::pt::pe::op::rename {nt ntnew serial} {
+    if {$nt eq $ntnew} {
+	return $serial
+    }
+    return [pt::pe bottomup \
+		[list [namespace current]::Rename $nt $ntnew] \
+		$serial]
+}
+
+proc ::pt::pe::op::drop {dropset serial} {
+   set res [pt::pe bottomup \
+		[list [namespace current]::Drop $dropset] \
+		$serial]
+   if {$res eq "@@"} { set res [pt::pe epsilon] }
+   return $res
+}
+
+proc ::pt::pe::op::called {serial} {
+    return [pt::pe bottomup \
+		[list [namespace current]::Called] \
+		$serial]
+}
+
+proc ::pt::pe::op::flatten {serial} {
+    return [pt::pe bottomup \
+		[list [namespace current]::Flatten] \
+		$serial]
+}
+
+proc ::pt::pe::op::fusechars {serial} {
+    return [pt::pe bottomup \
+		[list [namespace current]::FuseChars] \
+		$serial]
+}
+
+# # ## ### ##### ######## #############
+## Internals
+
+proc ::pt::pe::op::Drop {dropset pe op arguments} {
+    if {$op eq "n"} {
+	lassign $arguments symbol
+	if {[struct::set contains $dropset $symbol]} {
+	    set pe @@
+	}
+    } elseif {$op in {/ x * + ? & !}} {
+	set newarg {}
+	foreach a $arguments {
+	    if {$a eq "@@"} continue
+	    lappend newarg $a
+	}
+	if {![llength $newarg]} {
+	    # Nothing remained, drop the whole expression
+	    set pe [pt::pe epsilon]
+	} elseif {[llength $newarg] < [llength $arguments]} {
+	    # Some removed, construct a new expression
+	    if {$op eq "/"} {
+		set pe [list $op {*}$newarg]
+	    } else {
+		set pe @@
+	    }
+	} ; # None removed, no change.
+    }
+    return $pe
+}
+
+proc ::pt::pe::op::Rename {nt ntnew pe op arguments} {
+    #puts R($op)/$arguments/
+    if {($op eq "n") && ([lindex $arguments 0] eq $nt)} {
+	return [pt::pe nonterminal $ntnew]
+    } else {
+	return $pe
+    }
+}
+
+proc ::pt::pe::op::Called {pe op arguments} {
+    # arguments = list(set-of-symbols) for operators, and n.
+    #             ignored for terminal expressions.
+    # result    = set-of-symbols
+
+    #puts -nonewline C|$op|$arguments|=
+    switch -exact -- $op {
+	n - & - ! - * - + - ? {
+	    #puts |[lindex $arguments 0]|
+	    return [lindex $arguments 0]
+	}
+	x - / {
+	    #puts |[struct::set union {*}$arguments]|
+	    return [struct::set union {*}$arguments]
+	}
+    }
+    #puts ||
+    return {}
+}
+
+proc ::pt::pe::op::Flatten {pe op arguments} {
+    switch -exact -- $op {
+	x - / {
+	    if {[llength $arguments] == 1} {
+		# Cut single-child x/ out of the tree
+		return [lindex $arguments 0]
+	    } else {
+		set res {}
+		foreach c $arguments {
+		    if {[lindex $c 0] eq $op} {
+			# Cut x in x (/ in /) operator out of the
+			# tree.
+			lappend res {*}[lrange $c 1 end]
+		    } else {
+			# Leave anything else unchanged.
+			lappend res $c
+		    }
+		}
+		return [list $op {*}$res]
+	    }
+	}
+	default {
+	    # Leave anything not x/ unchanged
+	    return $pe
+	}
+    }
+}
+
+proc ::pt::pe::op::FuseChars {pe op arguments} {
+    switch -exact -- $op {
+	x {
+	    set changed 0  ; # boolean flag showing if fuse ops were done.
+	    set buf     {} ; # accumulator of chars in a string.
+	    set res     {} ; # accumulator of new children for operator.
+
+	    foreach c $arguments {
+		CollectTerminal $c
+		FuseTerminal
+		lappend res $c
+	    }
+
+	    # Capture a run of characters at the end of the sequence.
+	    FuseTerminal
+
+	    if {$changed} {
+		return [list x {*}$res]
+	    } else {
+		return $pe
+	    }
+	}
+	/ {
+	    set changed 0  ; # boolean flag showing if fuse ops were done.
+	    set buf     {} ; # accumulator of chars and ranges in a class.
+	    set res     {} ; # accumulator of new children for operator.
+
+	    foreach c $arguments {
+		CollectClass $c
+		FuseClass
+		lappend res $c
+	    }
+
+	    # Capture a run of characters and ranges at the end of the
+	    # sequence.
+	    FuseClass
+
+	    if {$changed} {
+		return [list / {*}$res]
+	    } else {
+		return $pe
+	    }
+	}
+	default {
+	    # Leave anything not x/ unchanged
+	    return $pe
+	}
+    }
+}
+
+# # ## ### ##### ######## #############
+## Fuser Support
+
+proc ::pt::pe::op::CollectTerminal {c} {
+    if {[lindex $c 0] ne "t"} return
+
+    # A terminal. Just extend the accumulator. The main processing
+    # happens after each run of t-operators, see FuseTerminal.
+
+    upvar 1 buf buf
+    lappend buf [lindex $c 1]
+    return -code continue
+}
+
+proc ::pt::pe::op::FuseTerminal {} {
+    upvar 1 changed changed res res buf buf
+
+    # Nothing has accumulated, nothing to fuse.
+    if {$buf eq {}} return
+
+    # The current non-t operator is after one or more t-operators. We
+    # have to flush its accumulated data to keep the expression
+    # correct.
+
+    if {[llength $buf] > 1} {
+	# We are behind an actual series of t-operators, i.e. a
+	# string. We flush it and signal the change to the processing
+	# after the loop,
+
+	lappend res [list str {*}$buf]
+	set changed 1
+    } else {
+	# We are behind a single t-operator. We keep it as is, there
+	# is no actual need to make it a string.
+
+	lappend res [pt::pe terminal [lindex $buf 0]]
+    }
+
+    # Reset the accumulator for the next series.
+    set buf {}
+    return
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::pe::op::CollectClass {c} {
+    if {[lindex $c 0] ni {t ..}} return
+
+    # A terminal or range. Just extend the accumulator. The main processing
+    # happens after each run of t-operators, see FuseClass.
+
+    upvar 1 buf buf
+    set new [lrange $c 1 end]
+    if {([llength $new] == 1) || ([lindex $new 0] eq [lindex $new 1])} {
+	set new [list [lindex $new 0]]
+	#set new [lindex $new 0]
+	# Note how new is rewrapped as a list, because that is what
+	# FuseClass below expects, always. See <*>
+    }
+    lappend buf $new
+    return -code continue
+}
+
+proc ::pt::pe::op::FuseClass {} {
+    upvar 1 changed changed res res buf buf
+
+    # buf :: list (elems), elems :: list (char ?char?)
+
+    # Nothing has accumulated, nothing to fuse.
+    if {$buf eq {}} return
+
+    # The current non-t operator is after one or more
+    # t/..-operators. We have to flush the accumulated data to keep
+    # the expression correct.
+
+    if {[llength $buf] > 1} {
+	# We are behind an actual series of t/..-operators, i.e. a
+	# class. We flush it, signal the change to the processing
+	# after the loop, and reset the accumulator for the next
+	# series.
+
+	# TODO :: Sort class elements, aggregate adjacents into larger
+	#         ranges if possible and worthwhile (>= 3), look for
+	#         overlapping ranges and merge.
+
+	# buf :: list (elems), elems :: list (char ?char?)
+	# The single-element elems have to change, become simple chars.
+	# A simple {*}-operation is not enough, as that leaves these as lists.
+
+	lappend tmp cl
+	foreach elem $buf {
+	    if {[llength $elem] == 1} {
+		lappend tmp [lindex $elem 0]
+	    } else {
+		lappend tmp $elem
+	    }
+	}
+	lappend res $tmp
+	set changed 1
+    } else {
+	# We are behind a single t- or ..-operator. A terminal can be
+	# kept as is, but a range has to be encapsulated into a class,
+	# except of the range is something like a-a, then this is just
+	# a different coding of a single character ... 
+
+	set args [lindex $buf 0] ; # <*> args expected to be a list.
+	if {[llength $args] == 1} {
+	    lappend res [pt::pe terminal [lindex $args 0]]
+	} else {
+	    lassign $args a b
+	    set changed 1
+	    if {$a ne $b} {
+		lappend res [list cl {*}$buf]
+	    } else {
+		lappend res [pt::pe terminal $a]
+	    }
+	}
+    }
+
+    # Reset the accumulator for the next series.
+    set buf {}
+    return
+}
+
+# # ## ### ##### ######## #############
+## State / Configuration :: n/a
+
+namespace eval ::pt::pe::op {}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide pt::pe::op 1.0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_pexpression.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_pexpression.tcl
new file mode 100644
index 00000000..c821dd3d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_pexpression.tcl
@@ -0,0 +1,321 @@
+# -*- tcl -*-
+# Copyright (c) 2009-2014 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Verification of serialized parsing expressions, conversion
+# between such and other data structures, and their construction.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.5              ; # Required runtime.
+package require char                 ; # Character quoting utilities.
+
+# # ## ### ##### ######## ############# #####################
+##
+
+namespace eval ::pt::pe {
+    namespace export \
+	verify verify-as-canonical canonicalize \
+	bottomup topdown print equal \
+	\
+	epsilon dot alnum alpha ascii digit graph lower printable \
+	control punct space upper wordchar xdigit ddigit \
+	nonterminal optional repeat0 repeat1 ahead notahead \
+	choice sequence \
+	terminal range class str
+
+    namespace ensemble create
+}
+
+# # ## ### ##### ######## #############
+## Public API
+
+# Check that the proposed serialization of a keyword index is
+# indeed such.
+
+proc ::pt::pe::verify {serial {canonvar {}}} {
+    variable ourprefix
+    variable ourempty
+    #puts "V <$serial> /[llength [info level 0]] / [info level 0]"
+
+    if {[llength $serial] == 0} {
+	return -code error $ourprefix$ourempty
+    }
+
+    if {$canonvar ne {}} {
+	upvar 1 $canonvar iscanonical
+	set iscanonical [string equal $serial [list {*}$serial]]
+    }
+
+    topdown [list [namespace current]::Verify] $serial
+    return
+}
+
+proc ::pt::pe::verify-as-canonical {serial} {
+    verify $serial iscanonical
+    if {!$iscanonical} {
+	variable ourprefix
+	variable ourimpure
+	return -code error $ourprefix$ourimpure
+    }
+    return
+}
+
+proc ::pt::pe::Verify {pe op arguments} {
+    variable ourprefix
+    variable ourbadop
+    variable ourarity
+    variable ourwrongargs
+    variable ourempty
+
+    #puts "VE <$pe /$op /$arguments>"
+    if {[llength $pe] == 0} {
+	return -code error $ourprefix$ourempty
+    }
+
+    if {![info exists ourarity($op)]} {
+	return -code error $ourprefix[format $ourbadop $op]
+    }
+
+    lassign $ourarity($op) min max
+
+    set n [llength $arguments]
+    if {($n < $min) || (($max >= 0) && ($n > $max))} {
+	return -code error $ourprefix[format $ourwrongargs $op]
+    }
+
+    upvar 1 iscanonical iscanonical
+    if {
+	[info exists iscanonical] &&
+	(($pe ne [list {*}$pe]) ||
+	 ($op eq "..") && ([lindex $arguments 0] eq [lindex $arguments 1]))
+    } {
+	# Reject coding with superfluous whitespace, and the use of
+	# {.. x x} as coding for {t x} as non-canonical.
+
+	set iscanonical 0
+    }
+    return
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::pe::canonicalize {serial} {
+    verify $serial iscanonical
+    if {$iscanonical} { return $serial }
+    return [bottomup [list [namespace current]::Canonicalize] $serial]
+}
+
+proc ::pt::pe::Canonicalize {pe op arguments} {
+    # The input is mostly already pulled apart into its elements. Now
+    # we construct a pure list out of them, and if necessary, convert
+    # a {.. x x} expression into the canonical {t x} representation.
+
+    if {($op eq ".." ) &&
+	([lindex $arguments 0] eq [lindex $arguments 1])} {
+	return [list t [lindex $arguments 0]]
+    }
+    return [list $op {*}$arguments]
+}
+
+# # ## ### ##### ######## #############
+
+# Converts a parsing expression serialization into a human readable
+# string for test results. It assumes that the serialization is at
+# least structurally sound.
+
+proc ::pt::pe::print {serial} {
+    return [join [bottomup [list [namespace current]::Print] $serial] \n]
+}
+
+proc ::pt::pe::Print {pe op arguments} {
+    switch -exact -- $op {
+	epsilon - alpha - alnum - ascii - digit - graph - lower - print - \
+	    control - punct - space - upper - wordchar - xdigit - ddigit - dot {
+		return [list <$op>]
+	    }
+	str { return [list "\"[join [char quote comment {*}$arguments] {}]\""] }
+	cl  { return [list "\[[join [char quote comment {*}$arguments] {}]\]"] }
+	n   { return [list "([lindex $arguments 0])"] }
+	t   { return [list "'[char quote comment [lindex $arguments 0]]'"] }
+	..  {
+	    lassign $arguments ca ce
+	    return [list "range ([char quote comment $ca] .. [char quote comment $ce])"]
+	}
+    }
+    # The arguments are already processed for printing
+
+    set out {}
+    lappend out $op
+    foreach a $arguments {
+	foreach line $a {
+	    lappend out "    $line"
+	}
+    }
+    return $out
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::pe::equal {seriala serialb} {
+    return [string equal \
+		[canonicalize $seriala] \
+		[canonicalize $serialb]]
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::pe::bottomup {cmdprefix pe} {
+    Bottomup 2 $cmdprefix $pe
+}
+
+proc ::pt::pe::Bottomup {level cmdprefix pe} {
+    set op [lindex $pe 0]
+    set ar [lrange $pe 1 end]
+
+    switch -exact -- $op {
+	& - ! - * - + - ? - x - / {
+	    set clevel $level
+	    incr clevel
+	    set nar {}
+	    foreach a $ar {
+		lappend nar [Bottomup $clevel $cmdprefix $a]
+	    }
+	    set ar $nar
+	    set pe [list $op {*}$nar]
+	}
+	default {}
+    }
+
+    return [uplevel $level [list {*}$cmdprefix $pe $op $ar]]
+}
+
+proc ::pt::pe::topdown {cmdprefix pe} {
+    Topdown 2 $cmdprefix $pe
+    return
+}
+
+proc ::pt::pe::Topdown {level cmdprefix pe} {
+    set op [lindex $pe 0]
+    set ar [lrange $pe 1 end]
+
+    uplevel $level [list {*}$cmdprefix $pe $op $ar]
+
+    switch -exact -- $op {
+	& - ! - * - + - ? - x - / {
+	    incr level
+	    foreach a $ar {
+		Topdown $level $cmdprefix $a
+	    }
+	}
+	default {}
+    }
+    return
+}
+
+# # ## ### ##### ######## #############
+
+proc ::pt::pe::epsilon   {} { return epsilon  }
+proc ::pt::pe::dot       {} { return dot      }
+proc ::pt::pe::alnum     {} { return alnum    }
+proc ::pt::pe::alpha     {} { return alpha    }
+proc ::pt::pe::ascii     {} { return ascii    }
+proc ::pt::pe::control   {} { return control  }
+proc ::pt::pe::digit     {} { return digit    }
+proc ::pt::pe::graph     {} { return graph    }
+proc ::pt::pe::lower     {} { return lower    }
+proc ::pt::pe::printable {} { return print    }
+proc ::pt::pe::punct     {} { return punct    }
+proc ::pt::pe::space     {} { return space    }
+proc ::pt::pe::upper     {} { return upper    }
+proc ::pt::pe::wordchar  {} { return wordchar }
+proc ::pt::pe::xdigit    {} { return xdigit   }
+proc ::pt::pe::ddigit    {} { return ddigit   }
+
+proc ::pt::pe::nonterminal {nt} { list n $nt }
+proc ::pt::pe::optional    {pe} { list ? $pe }
+proc ::pt::pe::repeat0     {pe} { list * $pe }
+proc ::pt::pe::repeat1     {pe} { list + $pe }
+proc ::pt::pe::ahead       {pe} { list & $pe }
+proc ::pt::pe::notahead    {pe} { list ! $pe }
+
+proc ::pt::pe::choice   {pe args} { linsert $args 0 / $pe }
+proc ::pt::pe::sequence {pe args} { linsert $args 0 x $pe }
+
+proc ::pt::pe::terminal {t} {
+    list t $t
+}
+proc ::pt::pe::range {ta tb} {
+    if {$ta eq $tb} {
+	list t $ta
+    } else {
+	list .. $ta $tb
+    }
+}
+proc ::pt::pe::class {set} {
+    if {[string length $set] > 1} {
+	list cl $set
+    } else {
+	list t $set
+    }
+}
+proc ::pt::pe::str {str} {
+    if {[string length $str] > 1} {
+	list str $str
+    } else {
+	list t $str
+    }
+}
+
+namespace eval ::pt::pe {
+    # # ## ### ##### ######## #############
+    ## Strings for error messages.
+
+    variable ourprefix    "error in serialization:"
+    variable ourempty     " got empty string"
+    variable ourwrongargs " wrong#args for \"%s\""
+    variable ourbadop     " invalid operator \"%s\""
+    variable ourimpure    " has irrelevant whitespace or (.. X X)"
+
+    # # ## ### ##### ######## #############
+    ## operator arities
+
+    variable  ourarity
+    array set ourarity {
+	epsilon  {0 0}
+	alpha    {0 0}
+	alnum    {0 0}
+	ascii    {0 0}
+	control  {0 0}
+	digit    {0 0}
+	graph    {0 0}
+	lower    {0 0}
+	print    {0 0}
+	punct    {0 0}
+	space    {0 0}
+	upper    {0 0}
+	wordchar {0 0}
+	xdigit   {0 0}
+	ddigit   {0 0}
+	dot      {0 0}
+	..       {2 2}
+	n        {1 1}
+	t        {1 1}
+	&        {1 1}
+	!        {1 1}
+	*        {1 1}
+	+        {1 1}
+	?        {1 1}
+	x        {1 -1}
+	/        {1 -1}
+    }
+
+    ##
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide pt::pe 1.0.2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_pgen.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_pgen.tcl
new file mode 100644
index 00000000..8edbb5f1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_pgen.tcl
@@ -0,0 +1,278 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2009-2014,2022 by Andreas Kupries <andreas.kupries@gmail.com>
+# Grammars / Parsing Expression Grammars / Parser Generator
+
+# ### ### ### ######### ######### #########
+## Package description
+
+# A package exporting a parser generator command.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require fileutil
+package require pt::peg::from::json    ; # Frontends: json, and PEG text form
+package require pt::peg::from::peg     ; #
+package require pt::peg::to::container ; # Backends: json, peg, container code,
+package require pt::peg::to::json      ; #           param assembler, 
+package require pt::peg::to::peg       ; #
+package require pt::peg::to::param     ; # PARAM assembly, raw
+package require pt::peg::to::tclparam  ; # PARAM assembly, embedded into Tcl
+package require pt::peg::to::cparam    ; # PARAM assembly, embedded into C
+package require pt::tclparam::configuration::snit  1.0.2 ; # PARAM/Tcl, snit::type
+package require pt::tclparam::configuration::tcloo 1.0.4 ; # PARAM/Tcl, TclOO class
+package require pt::cparam::configuration::critcl  1.0.2 ; # PARAM/C, in critcl
+package require pt::cparam::configuration::tea           ; # PARAM/C, in TEA
+package require pt::tclparam::configuration::nx 1.0.0    ; # PARAM/Tcl, NX class
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+namespace eval ::pt::pgen {
+    namespace export json peg serial
+    namespace ensemble create
+}
+
+# # ## ### ##### ######## #############
+## Public API - Processing the input.
+
+proc ::pt::pgen::serial {input args} {
+    #lappend args -file $inputfile
+    return [Write {*}$args $input]
+}
+
+proc ::pt::pgen::json {input args} {
+    #lappend args -file $inputfile
+    return [Write {*}$args [pt::peg::from::json convert $input]]
+}
+
+proc ::pt::pgen::peg {input args} {
+    #lappend args -file $inputfile
+    return [Write {*}$args [pt::peg::from::peg convert $input]]
+}
+
+# # ## ### ##### ######## #############
+## Internals - Generating the parser.
+
+namespace eval ::pt::pgen::Write {
+    namespace export json peg container param snit snit-sa oo oo-sa critcl c tea nx
+    namespace ensemble create
+}
+
+proc ::pt::pgen::Write::json {args} {
+    # args = (option value)... grammar
+    pt::peg::to::json configure {*}[lrange $args 0 end-1]
+    return [pt::peg::to::json convert [lindex $args end]]
+}
+
+proc ::pt::pgen::Write::peg {args} {
+    # args = (option value)... grammar
+    pt::peg::to::peg configure {*}[lrange $args 0 end-1]
+    return [pt::peg::to::peg convert [lindex $args end]]
+}
+
+proc ::pt::pgen::Write::container {args} {
+    # args = (option value)... grammar
+    pt::peg::to::container configure {*}[lrange $args 0 end-1]
+    return [pt::peg::to::container convert [lindex $args end]]
+}
+
+proc ::pt::pgen::Write::param {args} {
+    # args = (option value)... grammar
+    pt::peg::to::param configure {*}[lrange $args 0 end-1]
+    return [pt::peg::to::param convert [lindex $args end]]
+}
+
+proc ::pt::pgen::Write::snit {args} {
+    # args = (option value)... grammar
+    pt::peg::to::tclparam configure {*}[Package [Version [Class [lrange $args 0 end-1]]]]
+    ClassPackageDefaults
+
+    pt::tclparam::configuration::snit def \
+	$class $package $version \
+	{pt::peg::to::tclparam configure}
+
+    return [pt::peg::to::tclparam convert [lindex $args end]]
+}
+
+proc ::pt::pgen::Write::snit-sa {args} {
+    # args = (option value)... grammar
+    pt::peg::to::tclparam configure {*}[Package [Version [Class [lrange $args 0 end-1]]]]
+    ClassPackageDefaults
+
+    pt::tclparam::configuration::snit def \
+	$class $package $version \
+	{pt::peg::to::tclparam configure}
+
+    set parser [pt::peg::to::tclparam convert [lindex $args end]]
+    set parser [string map [list {package require pt::rde} [Runtime pt::rde]] $parser]
+    
+    return $parser
+}
+
+proc ::pt::pgen::Write::oo {args} {
+    # args = (option value)... grammar
+    pt::peg::to::tclparam configure {*}[Package [Version [Class [lrange $args 0 end-1]]]]
+    ClassPackageDefaults
+
+    pt::tclparam::configuration::tcloo def \
+	$class $package $version \
+	{pt::peg::to::tclparam configure}
+
+    return [pt::peg::to::tclparam convert [lindex $args end]]
+}
+
+proc ::pt::pgen::Write::oo-sa {args} {
+    # args = (option value)... grammar
+    pt::peg::to::tclparam configure {*}[Package [Version [Class [lrange $args 0 end-1]]]]
+    ClassPackageDefaults
+
+    pt::tclparam::configuration::tcloo def \
+	$class $package $version \
+	{pt::peg::to::tclparam configure}
+
+    set parser [pt::peg::to::tclparam convert [lindex $args end]]
+    set parser [string map [list {package require pt::rde::oo} [Runtime pt::rde::oo]] $parser]
+    
+    return $parser
+}
+
+proc ::pt::pgen::Write::nx {args} {
+    # args = (option value)... grammar
+    pt::peg::to::tclparam configure {*}[Package [Version [Class [lrange $args 0 end-1]]]]
+    ClassPackageDefaults
+
+    pt::tclparam::configuration::nx def \
+	$class $package $version \
+	{pt::peg::to::tclparam configure}
+
+    return [pt::peg::to::tclparam convert [lindex $args end]]
+}
+
+proc ::pt::pgen::Write::tea {args} {
+    # args = (option value)... grammar
+    # Class   -> touches/defines variable 'class'
+    # Package -> touches/defines variable 'package'
+    # Version -> touches/defines variable 'version'
+    pt::peg::to::cparam configure {*}[Package [Version [Class [lrange $args 0 end-1]]]]
+    ClassPackageDefaults
+
+    pt::cparam::configuration::tea def \
+	$class $package $version \
+	{pt::peg::to::cparam configure}
+
+    return [pt::peg::to::cparam convert [lindex $args end]]
+}
+
+proc ::pt::pgen::Write::critcl {args} {
+    # args = (option value)... grammar
+    # Class   -> touches/defines variable 'class'
+    # Package -> touches/defines variable 'package'
+    # Version -> touches/defines variable 'version'
+    pt::peg::to::cparam configure {*}[Package [Version [Class [lrange $args 0 end-1]]]]
+    ClassPackageDefaults
+
+    pt::cparam::configuration::critcl def \
+	$class $package $version \
+	{pt::peg::to::cparam configure}
+
+    return [pt::peg::to::cparam convert [lindex $args end]]
+}
+
+proc ::pt::pgen::Write::c {args} {
+    # args = (option value)... grammar
+    pt::peg::to::cparam configure {*}[lrange $args 0 end-1]
+    return [pt::peg::to::cparam convert [lindex $args end]]
+}
+
+proc ::pt::pgen::Write::Runtime {pkg} {
+    set version     [lindex [lsort -dict [package versions $pkg]] end]
+    set runtimefile [lindex [package ifneeded $pkg $version] end]
+    set chan        [open $runtimefile r]
+    set runtime     [read $chan]
+    close $chan
+
+    # Remove a trailing global return
+    set runtime [string map [list "\nreturn" "\n"] $runtime]
+    
+    set sep "# # ## ### ##### ######## ############# #####################"
+    return "\n$sep\n## $pkg RUNTIME START\n##\n\n$runtime\n\n##\n## $pkg RUNTIME END\n$sep\n\n"
+}
+
+# ### ### ### ######### ######### #########
+## Internals: Special option handling handling.
+
+proc ::pt::pgen::Write::ClassPackageDefaults {} {
+    upvar 1 class   class
+    upvar 1 package package
+    upvar 1 version version
+
+    # Initialize undefined class and package names from each other,
+    # i.e. from whichever of the two was specified, or fallback to
+    # hardwired defaults if neither was specified.
+
+    if {[info exists class] && ![info exists package]} {
+	set package $class
+    } elseif {[info exists package] && ![info exists class]} {
+	set class $package
+    } elseif {![info exists package] && ![info exists class]} {
+	set class   CLASS
+	set package PACKAGE
+    }
+
+    # Initialize undefined version information.
+
+    if {![info exists version]} {
+	set version 1
+    }
+    return
+}
+
+# Class, Package, Version - identical modulo option and variable name.
+# TODO: Refactor into some common code.
+
+proc ::pt::pgen::Write::Class {optiondict} {
+    upvar 1 class class
+    set res {}
+    foreach {option value} $optiondict {
+	if {$option eq "-class"} {
+	    set class $value
+	    continue
+	}
+	lappend res $option $value
+    }
+    return $res
+}
+
+proc ::pt::pgen::Write::Package {optiondict} {
+    upvar 1 package package
+    set res {}
+    foreach {option value} $optiondict {
+	if {$option eq "-package"} {
+	    set package $value
+	    continue
+	}
+	lappend res $option $value
+    }
+    return $res
+}
+
+proc ::pt::pgen::Write::Version {optiondict} {
+    upvar 1 version version
+    set res {}
+    foreach {option value} $optiondict {
+	if {$option eq "-version"} {
+	    set version $value
+	    continue
+	}
+	lappend res $option $value
+    }
+    return $res
+}
+
+# ### ### ### ######### ######### #########
+## Package Management
+
+package provide pt::pgen 1.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine.tcl
new file mode 100644
index 00000000..c0e69a2b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine.tcl
@@ -0,0 +1,206 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2009-2015 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Package description
+
+## Implementation of the PackRat Machine (PARAM), a virtual machine on
+## top of which parsers for Parsing Expression Grammars (PEGs) can be
+## realized. This implementation is tied to Tcl for control flow. We
+## (will) have alternate implementations written in TclOO, and critcl,
+## all exporting the same API.
+#
+## RD stands for Recursive Descent.
+
+## This package has a pure Tcl implementation, and a C implementation,
+## choosing the latter over the former, if possible.
+
+# @mdgen EXCLUDE: pt_rdengine_c.tcl
+
+package require Tcl 8.5
+
+namespace eval ::pt::rde {}
+
+# # ## ### ##### ######## ############# #####################
+## Support narrative tracing.
+
+package require debug
+debug level  pt/rdengine
+debug prefix pt/rdengine {}
+
+# # ## ### ##### ######## ############# #####################
+## Management of RDengine implementations.
+
+# ::pt::rde::LoadAccelerator --
+#
+#	Loads a named implementation, if possible.
+#
+# Arguments:
+#	key	Name of the implementation to load.
+#
+# Results:
+#	A boolean flag. True if the implementation
+#	was successfully loaded; and False otherwise.
+
+proc ::pt::rde::LoadAccelerator {key} {
+    debug.pt/rdengine {[info level 0]}
+    variable accel
+    set r 0
+    switch -exact -- $key {
+	critcl {
+	    if {![package vsatisfies [package provide Tcl] 8.5]} {return 0}
+	    if {[catch {package require tcllibc}]} {return 0}
+	    set r [llength [info commands ::pt::rde_critcl]]
+	}
+	tcl {
+	    variable selfdir
+	    source [file join $selfdir pt_rdengine_tcl.tcl]
+	    set r 1
+	}
+        default {
+            return -code error "invalid accelerator/impl. package $key:\
+                must be one of [join [KnownImplementations] {, }]"
+        }
+    }
+    set accel($key) $r
+    debug.pt/rdengine {[info level 0] ==> ($r)}
+    return $r
+}
+
+# ::pt::rde::SwitchTo --
+#
+#	Activates a loaded named implementation.
+#
+# Arguments:
+#	key	Name of the implementation to activate.
+#
+# Results:
+#	None.
+
+proc ::pt::rde::SwitchTo {key} {
+    debug.pt/rdengine {[info level 0]}
+    variable accel
+    variable loaded
+
+    if {$key eq $loaded} {
+	# No change, nothing to do.
+	debug.pt/rdengine {[info level 0] == $loaded /no change}
+	return
+    } elseif {$key ne {}} {
+	# Validate the target implementation of the switch.
+	debug.pt/rdengine {[info level 0] validate}
+
+	if {![info exists accel($key)]} {
+	    return -code error "Unable to activate unknown implementation \"$key\""
+	} elseif {![info exists accel($key)] || !$accel($key)} {
+	    return -code error "Unable to activate missing implementation \"$key\""
+	}
+    }
+
+    # Deactivate the previous implementation, if there was any.
+
+    if {$loaded ne {}} {
+	debug.pt/rdengine {[info level 0] disable $loaded}
+	rename ::pt::rde ::pt::rde_$loaded
+    }
+
+    # Activate the new implementation, if there is any.
+
+    if {$key ne {}} {
+	debug.pt/rdengine {[info level 0] enable $key}
+	rename ::pt::rde_$key ::pt::rde
+    }
+
+    # Remember the active implementation, for deactivation by future
+    # switches.
+
+    set loaded $key
+    debug.pt/rdengine {[info level 0] /done}
+    return
+}
+
+# ::pt::rde::Implementations --
+#
+#	Determines which implementations are
+#	present, i.e. loaded.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys.
+
+proc ::pt::rde::Implementations {} {
+    debug.pt/rdengine {[info level 0]}
+    variable accel
+    set res {}
+    foreach n [array names accel] {
+	if {!$accel($n)} continue
+	lappend res $n
+    }
+    debug.pt/rdengine {[info level 0] ==> ($res)}
+    return $res
+}
+
+# ::pt::rde::KnownImplementations --
+#
+#	Determines which implementations are known
+#	as possible implementations.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys. In the order
+#	of preference, most prefered first.
+
+proc ::pt::rde::KnownImplementations {} {
+    debug.pt/rdengine {[info level 0]}
+    return {critcl tcl}
+}
+
+proc ::pt::rde::Names {} {
+    debug.pt/rdengine {[info level 0]}
+    return {
+	critcl {tcllibc based}
+	tcl    {pure Tcl}
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Initialization: Data structures.
+
+namespace eval ::pt::rde {
+    variable  selfdir [file dirname [info script]]
+    variable  accel
+    array set accel   {tcl 0 critcl 0}
+    variable  loaded  {}
+}
+
+# # ## ### ##### ######## ############# #####################
+
+## Initialization: Choose an implementation, the most prefered is
+## listed first. Loads only one of the possible implementations. And
+## activates it.
+
+namespace eval ::pt::rde {
+    variable e
+    foreach e [KnownImplementations] {
+	if {[LoadAccelerator $e]} {
+	    SwitchTo $e
+	    break
+	}
+    }
+    unset e
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+namespace eval ::pt {
+    # Export the constructor command.
+    namespace export rde
+}
+
+package provide pt::rde 1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine_c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine_c.tcl
new file mode 100644
index 00000000..8016b00e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine_c.tcl
@@ -0,0 +1,168 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2009-2015 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Package description
+
+## Implementation of the PackRat Machine (PARAM), a virtual machine on
+## top of which parsers for Parsing Expression Grammars (PEGs) can be
+## realized. This implementation is written in C, for parsers written in
+## Tcl. As such the parsers themselves are tied to Tcl for control flow.
+#
+## RD stands for Recursive Descent.
+
+# # ## ### ##### ######## ############# #####################
+## Requisites
+
+package require Tcl 8.4
+package require critcl
+# @sak notprovided pt_rde_critcl
+package provide pt_rde_critcl 1.3.4
+
+# # ## ### ##### ######## ############# #####################
+## Implementation
+
+namespace eval ::pt {
+
+    # # ## ### ##### ######## ############# #####################
+    ## Supporting code for the main command.
+
+    catch {
+	#critcl::cheaders -g
+	#critcl::debug memory symbols
+    }
+
+    critcl::cheaders rde_critcl/*.h
+    critcl::csources rde_critcl/*.c
+
+    critcl::ccode {
+	/* -*- c -*- */
+
+	#include <util.h>  /* Allocation macros */
+	#include <p.h>     /* Public state API */
+	#include <ms.h>    /* Instance command */
+
+	/* .................................................. */
+	/* Global PARAM management, per interp
+	*/
+
+	typedef struct PARAMg {
+	    long int counter;
+	    char     buf [50];
+	} PARAMg;
+
+	static void
+	PARAMgRelease (ClientData cd, Tcl_Interp* interp)
+	{
+	    ckfree((char*) cd);
+	}
+
+	static CONST char*
+	PARAMnewName (Tcl_Interp* interp)
+	{
+#define KEY "tcllib/pt::rde/critcl"
+
+	    Tcl_InterpDeleteProc* proc = PARAMgRelease;
+	    PARAMg*                  paramg;
+
+	    paramg = Tcl_GetAssocData (interp, KEY, &proc);
+	    if (paramg  == NULL) {
+		paramg = (PARAMg*) ckalloc (sizeof (PARAMg));
+		paramg->counter = 0;
+
+		Tcl_SetAssocData (interp, KEY, proc,
+				  (ClientData) paramg);
+	    }
+	    
+	    paramg->counter ++;
+	    sprintf (paramg->buf, "rde%ld", paramg->counter);
+	    return paramg->buf;
+
+#undef  KEY
+	}
+
+	static void
+	PARAMdeleteCmd (ClientData clientData)
+	{
+	    /* Release the whole PARAM. */
+	    param_delete ((RDE_STATE) clientData);
+	}
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## Main command, PARAM creation.
+
+    critcl::ccommand rde_critcl {dummy interp objc objv} {
+      /* Syntax: No arguments beyond the name
+       */
+
+      CONST char* name;
+      RDE_STATE   param;
+      Tcl_Obj*    fqn;
+      Tcl_CmdInfo ci;
+      Tcl_Command c;
+
+#define USAGE "?name?"
+
+      if ((objc != 2) && (objc != 1)) {
+        Tcl_WrongNumArgs (interp, 1, objv, USAGE);
+        return TCL_ERROR;
+      }
+
+      if (objc < 2) {
+        name = PARAMnewName (interp);
+      } else {
+        name = Tcl_GetString (objv [1]);
+      }
+
+      if (!Tcl_StringMatch (name, "::*")) {
+        /* Relative name. Prefix with current namespace */
+
+        Tcl_Eval (interp, "namespace current");
+        fqn = Tcl_GetObjResult (interp);
+        fqn = Tcl_DuplicateObj (fqn);
+        Tcl_IncrRefCount (fqn);
+
+        if (!Tcl_StringMatch (Tcl_GetString (fqn), "::")) {
+          Tcl_AppendToObj (fqn, "::", -1);
+        }
+        Tcl_AppendToObj (fqn, name, -1);
+      } else {
+        fqn = Tcl_NewStringObj (name, -1);
+        Tcl_IncrRefCount (fqn);
+      }
+      Tcl_ResetResult (interp);
+
+      if (Tcl_GetCommandInfo (interp,
+                              Tcl_GetString (fqn),
+                              &ci)) {
+        Tcl_Obj* err;
+
+        err = Tcl_NewObj ();
+        Tcl_AppendToObj    (err, "command \"", -1);
+        Tcl_AppendObjToObj (err, fqn);
+        Tcl_AppendToObj    (err, "\" already exists", -1);
+
+        Tcl_DecrRefCount (fqn);
+        Tcl_SetObjResult (interp, err);
+        return TCL_ERROR;
+      }
+
+      param = param_new ();
+      c = Tcl_CreateObjCommand (interp, Tcl_GetString (fqn),
+				paramms_objcmd, (ClientData) param,
+				PARAMdeleteCmd);
+      param_setcmd (param, c);
+
+      Tcl_SetObjResult (interp, fqn);
+      Tcl_DecrRefCount (fqn);
+      return TCL_OK;
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide pt::rde::critcl 1.3.4
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine_nx.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine_nx.tcl
new file mode 100644
index 00000000..532e3b4a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine_nx.tcl
@@ -0,0 +1,148 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2016-2018 by Stefan Sobernig <stefan.sobernig@wu.ac.at>
+
+# # ## ### ##### ######## ############# #####################
+## Package description
+
+## An NX implementation of the PackRat Machine (PARAM), a virtual
+## machine on top of which parsers for Parsing Expression Grammars
+## (PEGs) can be realized. This implementation is tied to the PARAM's
+## TclOO implementation and it is automatically derived from the
+## corresponding TclOO class (pt::rde::oo) upon loading the package.
+
+# # ## ### ##### ######## ############# #####################
+## Requisites
+
+package require pt::rde::oo
+package req nx
+
+namespace eval ::pt::rde {
+
+  ##
+  ## Helper: An NX metaclass and class generator, which allows for
+  ## deriving an NX class from the ::pt::rde::oo class.
+  ##
+  
+  nx::Class create ClassFactory -superclass nx::Class {
+    :property prototype:required
+
+    :method mkMethod {name vars params body tmpl} {
+      set objVars [list]
+      set debugObjVars [list]
+      foreach v $vars {
+        if {[string first $v $body] > -1} {
+          lappend objVars :$v $v
+        } else {
+          lappend debugObjVars :$v $v
+        }
+      }
+      
+      if {[llength $objVars]} {
+        set objVars [list upvar 0 {*}$objVars]
+      }
+
+      if {[llength $debugObjVars]} {
+        set debugObjVars [list debug.pt/rdengine \
+                              "\[[list upvar 0 {*}$debugObjVars]\]"]
+      }
+
+      set mappings [list @body@ $body @objVars@ $objVars \
+                        @debugObjVars@ $debugObjVars @params@ $params]
+      
+      set finalBody [string map $mappings $tmpl]
+
+      :method $name $params $finalBody
+      
+    }; # mkMethod
+    
+    :method init {args} {
+
+      namespace eval [namespace qualifier [self]] {
+        namespace import ::nsf::my
+      }
+
+      :method debugPrep {cls} {
+        :object method TraceInitialization [list [list cls $cls]] {
+          set mh [$cls info methods -callprotection all TraceInitialization]
+          if {$mh ne ""} {
+            set script [$cls info method body $mh]
+            apply [list {} $script [self]]
+          }
+        }
+        return
+      }
+
+      :method debugOn {} {
+        interp alias {} [namespace current]::Instruction {} [self]::Instruction
+        interp alias {} [namespace current]::InstReturn {} [self]::InstReturn
+        interp alias {} [namespace current]::State {} [self]::State
+        interp alias {} [namespace current]::TraceSetupStacks {} [self]::TraceSetupStacks
+        return
+      }
+
+      :method debugOff {} {
+        interp alias {} [namespace current]::Instruction {} 
+        interp alias {} [namespace current]::InstReturn {} 
+        interp alias {} [namespace current]::State {} 
+        interp alias {} [namespace current]::TraceSetupStacks {}
+        return
+      }
+
+      set vars [info class variables ${:prototype}]
+      
+      ## clone constructor
+      lassign [info class constructor ${:prototype}] ctorParams ctorBody
+
+      :mkMethod init $vars $ctorParams $ctorBody {
+        debug.pt/rdengine {[:debugPrep [current class]][self] TraceInitialization indirection}
+        :require namespace;
+        apply [list {} {
+          namespace import ::nsf::my
+          @objVars@
+          @body@
+        } [self]]
+        
+        debug.pt/rdengine {[:debugOn][self] DebugCmd indirection on}
+      }
+
+      :public method destroy {args} {
+        debug.pt/rdengine {[:debugOff][self] DebugCmd indirection off}
+        next
+      }
+
+      ## clone all methods
+      foreach m [info class methods ${:prototype} -private] {
+        lassign [info class definition ${:prototype} $m] params body
+
+        :mkMethod $m $vars $params $body {
+          @objVars@
+          @debugObjVars@
+          @body@
+        }
+      }
+      
+      return
+    }; # init
+  }; # ClassFactory
+
+  ##
+  ## ::pt::rde::nx:
+  ##
+  ## The NX derivative of ::pt::rde::oo, to be inherited
+  ## by the generated grammar class.
+  ##
+  
+  ClassFactory create nx -prototype ::pt::rde::oo
+
+  namespace export nx
+}
+
+package provide pt::rde::nx [package req pt::rde::oo].1.1
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 2
+#    indent-tabs-mode: nil
+# End:
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine_oo.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine_oo.tcl
new file mode 100644
index 00000000..6c5ac790
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine_oo.tcl
@@ -0,0 +1,2170 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2009-2015 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Package description
+
+## Implementation of the PackRat Machine (PARAM), a virtual machine on
+## top of which parsers for Parsing Expression Grammars (PEGs) can be
+## realized. This implementation is tied to Tcl for control flow. We
+## (will) have alternate implementations written in TclOO, and critcl,
+## all exporting the same API.
+#
+## RD stands for Recursive Descent.
+
+# # ## ### ##### ######## ############# #####################
+## Requisites
+
+package require Tcl 8.5
+package require TclOO
+package require struct::stack 1.5 ; # Requiring peekr, getr, get, trim* methods
+package require pt::ast
+package require pt::pe
+
+# # ## ### ##### ######## ############# #####################
+## Support narrative tracing.
+
+package require debug
+debug level  pt/rdengine
+debug prefix pt/rdengine {}
+
+
+# # ## ### ##### ######## ############# #####################
+## Implementation
+
+oo::class create ::pt::rde::oo {
+    # # ## ### ##### ######## ############# #####################
+    ## Instruction counter for tracing. Unused else. Plus other helpers.
+
+    method TraceInitialization {} {
+	# Creation of the tracing support procedures.
+	# Conditional on debug tag "pt/rdengine".
+	# The instance namespace is the current context.
+	# This is where the procedures go.
+
+	proc Instruction {label {a {}} {b {}}} {
+	    upvar 1 mytracecounter mytracecounter myok myok myloc myloc mycurrent mycurrent mysvalue mysvalue myerror myerror __inst theinst
+	    set theinst [list $label $a $b]
+	    return "[uplevel 1 self] <<[format %08d [incr mytracecounter]]>> START I:[format %-30s $label] [format %-10s $a] [format %-10s $b] :: [State]"
+	}
+
+	proc InstReturn {} {
+	    upvar 1 mytracecounter mytracecounter myok myok myloc myloc mycurrent mycurrent mysvalue mysvalue myerror myerror __inst theinst
+	    lassign $theinst label a b
+	    return "[uplevel 1 self] <<[format %08d $mytracecounter]>> END__ I:[format %-30s $label] [format %-10s $a] [format %-10s $b] :: [State]"
+	}
+
+	proc State {} {
+	    upvar 1 myok myok myloc myloc mycurrent mycurrent mysvalue mysvalue myerror myerror
+	    set sv [expr {[info exists mysvalue] ? $mysvalue : ""}]
+	    return "ST $myok CL $myloc CC ($mycurrent) SV ($sv) ER ($myerror)"
+	}
+
+	proc TraceSetupStacks {} {
+	    set selfns [namespace current]
+
+	    # Move stack instances aside.
+	    rename ${selfns}::LOC   ${selfns}::LOC__
+	    rename ${selfns}::ERR   ${selfns}::ERR__
+	    rename ${selfns}::AST   ${selfns}::AST__
+	    rename ${selfns}::MARK  ${selfns}::MRK__
+
+	    # Create procedures doing tracing, and forwarding to
+	    # the renamed actual instances.
+
+	    interp alias {} ${selfns}::LOC  {} ${selfns}::WRAP LS  LOC__
+	    interp alias {} ${selfns}::ERR  {} ${selfns}::WRAP ES  ERR__
+	    interp alias {} ${selfns}::AST  {} ${selfns}::WRAP ARS AST__
+	    interp alias {} ${selfns}::MARK {} ${selfns}::WRAP ASM MRK__
+
+	    proc WRAP {label stack args} {
+		debug.pt/rdengine {    $label ___ $args}
+		set res [$stack {*}$args]
+
+		# Show state state after the op
+		set n [$stack size]
+		if {!$n} {
+		    set c {()}
+		} elseif {$n == 1} {
+		    set c <<[$stack peek $n]>>
+		} else {
+		    set c <<[join [$stack peek $n] {>> <<}]>>
+		}
+		debug.pt/rdengine {    $label ==  ($n):$c}
+
+		# And op return
+		debug.pt/rdengine {    $label ==> ($res)}
+		return $res
+	    }
+	    return
+	}
+
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## API - Lifecycle
+
+    constructor {} {
+	debug.pt/rdengine {[my TraceInitialization][self] constructor}
+
+	#set selfns [self namespace]
+
+	set mystackloc  [struct::stack LOC]  ; # LS
+	set mystackerr  [struct::stack ERR]  ; # ES
+	set mystackast  [struct::stack AST]  ; # ARS/AS
+	set mystackmark [struct::stack MARK] ; # s.a.
+
+	debug.pt/rdengine {[TraceSetupStacks][self] constructor /done}
+	my reset {}
+	return
+    }
+
+    method reset {chan} {
+	debug.pt/rdengine {[self] reset ($chan)}
+
+	set mychan    $chan      ; # IN
+	set mycurrent {}         ; # CC
+	set myloc     -1         ; # CL
+	set myok      0          ; # ST
+	set msvalue   {}         ; # SV
+	set myerror   {}         ; # ER
+	set mytoken   {}         ; # TC (string)
+	array unset   mysymbol * ; # NC
+
+	$mystackloc  clear
+	$mystackerr  clear
+	$mystackast  clear
+	$mystackmark clear
+
+	debug.pt/rdengine {[self] reset /done}
+	return
+    }
+
+    method complete {} {
+	debug.pt/rdengine {[self] complete [State]}
+
+	if {$myok} {
+	    set n [$mystackast size]
+	    debug.pt/rdengine {[self] complete ast $n}
+	    if {$n > 1} {
+		# Multiple ASTs left, reduce into single containing them.
+		set  pos [$mystackloc peek]
+		incr pos
+		set children [$mystackast peekr [$mystackast size]]     ; # SaveToMark
+		set ast [pt::ast new {} $pos $myloc {*}$children] ; # Reduce ALL
+
+		debug.pt/rdengine {[self] complete n ==> ($ast)}
+		return $ast
+	    } elseif {$n == 0} {
+		# Match, but no AST. This is possible if the grammar
+		# consists of only the start expression.
+
+		debug.pt/rdengine {[self] complete 0 ==> ()}
+		return {}
+	    } else {
+		# Match, with AST.
+		set ast [$mystackast peek]
+		debug.pt/rdengine {[self] complete 1 ==> ($ast)}
+		return $ast
+	    }
+	} else {
+	    lassign $myerror loc messages
+	    return -code error \
+		-errorcode {PT RDE SYNTAX} \
+		[list pt::rde $loc $messages]
+	}
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## API - State accessors
+
+    method chan   {} { debug.pt/rdengine {[self] chan} ; return $mychan }
+
+    # - - -- --- ----- --------
+
+    method current  {} { debug.pt/rdengine {[self] current}  ; return $mycurrent }
+    method location {} { debug.pt/rdengine {[self] location} ; return $myloc }
+    method lmarked  {} { debug.pt/rdengine {[self] lmarked}  ; return [$mystackloc getr] }
+
+    # - - -- --- ----- --------
+
+    method ok      {} { debug.pt/rdengine {[self] ok}      ; return $myok      }
+    method value   {} { debug.pt/rdengine {[self] value}   ; return $mysvalue  }
+    method error   {} { debug.pt/rdengine {[self] error}   ; return $myerror   }
+    method emarked {} { debug.pt/rdengine {[self] emarked} ; return [$mystackerr getr] }
+
+    # - - -- --- ----- --------
+
+    method tokens {{from {}} {to {}}} {
+	debug.pt/rdengine {[self] tokens ($from) ($to)}
+	switch -exact [llength [info level 0]] {
+	    4 { return $mytoken }
+	    5 { return [string range $mytoken $from $from] }
+	    6 { return [string range $mytoken $from $to] }
+	}
+    }
+
+    method symbols {} {
+	debug.pt/rdengine {[self] symbols}
+	return [array get mysymbol]
+    }
+
+    method scached {} {
+	debug.pt/rdengine {[self] scached}
+	return [array names mysymbol]
+    }
+
+    # - - -- --- ----- --------
+
+    method asts    {} { debug.pt/rdengine {[self] asts}    ; return [$mystackast  getr] }
+    method amarked {} { debug.pt/rdengine {[self] amarked} ; return [$mystackmark getr] }
+    method ast     {} { debug.pt/rdengine {[self] ast}     ; return [$mystackast  peek] }
+
+    # # ## ### ##### ######## ############# #####################
+    ## API - Preloading the token cache.
+
+    method data {string} {
+	debug.pt/rdengine {[self] data +[string length $string]}
+	append mytoken $string
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## Common instruction sequences
+
+    method si:void_state_push {} {
+	debug.pt/rdengine {[Instruction si:void_state_push]}
+	# i_loc_push
+	# i_error_clear_push
+	$mystackloc push $myloc
+	set myerror {}
+	$mystackerr push {}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void2_state_push {} {
+	debug.pt/rdengine {[Instruction si:void2_state_push]}
+	# i_loc_push
+	# i_error_push
+	$mystackloc push $myloc
+	$mystackerr push {}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:value_state_push {} {
+	debug.pt/rdengine {[Instruction si:value_state_push]}
+	# i_ast_push
+	# i_loc_push
+	# i_error_clear_push
+	$mystackmark push [$mystackast size]
+	$mystackloc push $myloc
+	set myerror {}
+	$mystackerr push {}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:void_state_merge {} {
+	debug.pt/rdengine {[Instruction si:void_state_merge]}
+	# i_error_pop_merge
+	# i_loc_pop_rewind/discard
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+
+	set last [$mystackloc pop]
+	if {!$myok} {
+	    set myloc $last
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void_state_merge_ok {} {
+	debug.pt/rdengine {[Instruction si:void_state_merge_ok]}
+	# i_error_pop_merge
+	# i_loc_pop_rewind/discard
+	# i_status_ok
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+
+	set last [$mystackloc pop]
+	if {!$myok} {
+	    set myloc $last
+	    set myok 1
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:value_state_merge {} {
+	debug.pt/rdengine {[Instruction si:value_state_merge]}
+	# i_error_pop_merge
+	# i_ast_pop_rewind/discard
+	# i_loc_pop_rewind/discard
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+
+	set mark [$mystackmark pop]
+	set last [$mystackloc pop]
+	if {!$myok} {
+	    $mystackast trim* $mark
+	    set myloc $last
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:value_notahead_start {} {
+	debug.pt/rdengine {[Instruction si:value_notahead_start]}
+	# i_loc_push
+	# i_ast_push
+
+	$mystackloc  push $myloc
+	$mystackmark push [$mystackast size]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void_notahead_exit {} {
+	debug.pt/rdengine {[Instruction si:void_notahead_exit]}
+	# i_loc_pop_rewind
+	# i_status_negate
+
+	set myloc [$mystackloc pop]
+	set myok [expr {!$myok}]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:value_notahead_exit {} {
+	debug.pt/rdengine {[Instruction si:value_notahead_exit]}
+	# i_ast_pop_discard/rewind
+	# i_loc_pop_rewind
+	# i_status_negate
+
+	set mark [$mystackmark pop]
+	if {$myok} {
+	    $mystackast trim* $mark
+	}
+	set myloc [$mystackloc pop]
+	set myok [expr {!$myok}]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:kleene_abort {} {
+	debug.pt/rdengine {[Instruction si:kleene_abort]}
+	# i_loc_pop_rewind/discard
+	# i:fail_return
+
+	set last [$mystackloc pop]
+	if {$myok} {
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set myloc $last
+	debug.pt/rdengine {[InstReturn]}
+	return -code return
+    }
+
+    method si:kleene_close {} {
+	debug.pt/rdengine {[Instruction si:kleene_close]}
+	# i_error_pop_merge
+	# i_loc_pop_rewind/discard
+	# i:fail_status_ok
+	# i:fail_return
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+
+	set last [$mystackloc pop]
+	if {$myok} {
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set myok 1
+	set myloc $last
+
+	debug.pt/rdengine {[InstReturn]}
+	return -code return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:voidvoid_branch {} {
+	debug.pt/rdengine {[Instruction si:voidvoid_branch]}
+	# i_error_pop_merge
+	# i:ok_loc_pop_discard
+	# i:ok_return
+	# i_loc_rewind
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+
+	if {$myok} {
+	    $mystackloc pop
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	set myloc [$mystackloc peek]
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:voidvalue_branch {} {
+	debug.pt/rdengine {[Instruction si:voidvalue_branch]}
+	# i_error_pop_merge
+	# i:ok_loc_pop_discard
+	# i:ok_return
+	# i_ast_push
+	# i_loc_rewind
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+
+	if {$myok} {
+	    $mystackloc pop
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackmark push [$mystackast size]
+	set myloc [$mystackloc peek]
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:valuevoid_branch {} {
+	debug.pt/rdengine {[Instruction si:valuevoid_branch]}
+	# i_error_pop_merge
+	# i_ast_pop_rewind/discard
+	# i:ok_loc_pop_discard
+	# i:ok_return
+	# i_loc_rewind
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+	set mark [$mystackmark pop]
+	if {$myok} {
+	    $mystackloc pop
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackast trim* $mark
+	set myloc [$mystackloc peek]
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:valuevalue_branch {} {
+	debug.pt/rdengine {[Instruction si:valuevalue_branch]}
+	# i_error_pop_merge
+	# i_ast_pop_discard
+	# i:ok_loc_pop_discard
+	# i:ok_return
+	# i_ast_rewind
+	# i_loc_rewind
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+	if {$myok} {
+	    $mystackmark pop
+	    $mystackloc pop
+
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackast trim* [$mystackmark peek]
+	set myloc [$mystackloc peek]
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:voidvoid_part {} {
+	debug.pt/rdengine {[Instruction si:voidvoid_part]}
+	# i_error_pop_merge
+	# i:fail_loc_pop_rewind
+	# i:fail_return
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+	if {!$myok} {
+	    set myloc [$mystackloc pop]
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:voidvalue_part {} {
+	debug.pt/rdengine {[Instruction si:voidvalue_part]}
+	# i_error_pop_merge
+	# i:fail_loc_pop_rewind
+	# i:fail_return
+	# i_ast_push
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+	if {!$myok} {
+	    set myloc [$mystackloc pop]
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackmark push [$mystackast size]
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:valuevalue_part {} {
+	debug.pt/rdengine {[Instruction si:valuevalue_part]}
+	# i_error_pop_merge
+	# i:fail_ast_pop_rewind
+	# i:fail_loc_pop_rewind
+	# i:fail_return
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+	if {!$myok} {
+	    $mystackast trim* [$mystackmark pop]
+	    set myloc [$mystackloc pop]
+
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:next_str {tok} {
+	debug.pt/rdengine {[Instruction si:next_str $tok]}
+	# String = sequence of characters.
+	# No need for all the intermediate stack churn.
+
+	set n    [string length $tok]
+	set last [expr {$myloc + $n}]
+	set max  [string length $mytoken]
+
+	incr myloc
+	if {($last >= $max) && ![my ExtendTCN [expr {$last - $max + 1}]]} {
+	    set myok    0
+	    set myerror [list $myloc [list [list str $tok]]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set lex       [string range $mytoken $myloc $last]
+	set mycurrent [string index $mytoken $last]
+
+	# ATTENTION: The error output of this instruction is different
+	# from a regular sequence of si:next_char instructions. The
+	# error location will be the start of the string token we
+	# wanted to match, and the message will contain the entire
+	# string token. In the regular sequence we would see the exact
+	# point of the mismatch instead, with the message containing
+	# the expected character.
+
+	if {$tok eq $lex} {
+	    set myok 1
+	    set myloc $last
+	    set myerror {}
+	} else {
+	    set myok 0
+	    set myerror [list $myloc [list [list str $tok]]]
+	    incr myloc -1
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_class {tok} {
+	debug.pt/rdengine {[Instruction si:next_class $tok]}
+	# Class = Choice of characters. No need for stack churn.
+
+	# i_input_next "\{t $c\}"
+	# i:fail_return
+	# i_test_<user class>
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list [list cl $tok]]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	# Note what is needle versus hay. The token, i.e. the string
+	# of allowed characters is the hay in which the current
+	# character is looked, making it the needle.
+
+	if {[string first $mycurrent $tok] >= 0} {
+	    set myok 1
+	    set myerror {}
+	} else {
+	    set myok 0
+	    set myerror [list $myloc [list [list cl $tok]]]
+	    incr myloc -1
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_char {tok} {
+	debug.pt/rdengine {[Instruction si:next_char $tok]}
+	# i_input_next "\{t $c\}"
+	# i:fail_return
+	# i_test_char $c
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list [list t $tok]]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	if {$tok eq $mycurrent} {
+	    set myok 1
+	    set myerror {}
+	} else {
+	    set myok 0
+	    set myerror [list $myloc [list [list t $tok]]]
+	    incr myloc -1
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_range {toks toke} {
+	debug.pt/rdengine {[Instruction si:next_range $toks $toke]}
+	#Asm::Ins i_input_next "\{.. $s $e\}"
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_range $s $e
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list [list .. $toks $toke]]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	if {([string compare $toks $mycurrent] <= 0) &&
+	    ([string compare $mycurrent $toke] <= 0)} {
+	    set myok 1
+	    set myerror {}
+	} else {
+	    set myok 0
+	    set myerror [list $myloc [list [pt::pe range $toks $toke]]]
+	    incr myloc -1
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:next_alnum {} {
+	debug.pt/rdengine {[Instruction si:next_alnum]}
+	#Asm::Ins i_input_next alnum
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_alnum
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list alnum]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is alnum -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list alnum]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_alpha {} {
+	debug.pt/rdengine {[Instruction si:next_alpha]}
+	#Asm::Ins i_input_next alpha
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_alpha
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list alpha]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is alpha -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list alpha]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_ascii {} {
+	debug.pt/rdengine {[Instruction si:next_ascii]}
+	#Asm::Ins i_input_next ascii
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_ascii
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list ascii]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is ascii -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list ascii]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_control {} {
+	debug.pt/rdengine {[Instruction si:next_control]}
+	#Asm::Ins i_input_next control
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_control
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list control]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is control -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list control]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_ddigit {} {
+	debug.pt/rdengine {[Instruction si:next_ddigit]}
+	#Asm::Ins i_input_next ddigit
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_ddigit
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list ddigit]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string match {[0-9]} $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list ddigit]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_digit {} {
+	debug.pt/rdengine {[Instruction si:next_digit]}
+	#Asm::Ins i_input_next digit
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_digit
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list digit]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is digit -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list digit]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_graph {} {
+	debug.pt/rdengine {[Instruction si:next_graph]}
+	#Asm::Ins i_input_next graph
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_graph
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list graph]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is graph -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list graph]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_lower {} {
+	debug.pt/rdengine {[Instruction si:next_lower]}
+	#Asm::Ins i_input_next lower
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_lower
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list lower]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is lower -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list lower]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_print {} {
+	debug.pt/rdengine {[Instruction si:next_print]}
+	#Asm::Ins i_input_next print
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_print
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list print]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is print -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list print]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_punct {} {
+	debug.pt/rdengine {[Instruction si:next_punct]}
+	#Asm::Ins i_input_next punct
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_punct
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list punct]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is punct -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list punct]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_space {} {
+	debug.pt/rdengine {[Instruction si:next_space]}
+	#Asm::Ins i_input_next space
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_space
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list space]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is space -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list space]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_upper {} {
+	debug.pt/rdengine {[Instruction si:next_upper]}
+	#Asm::Ins i_input_next upper
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_upper
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list upper]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is upper -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list upper]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_wordchar {} {
+	debug.pt/rdengine {[Instruction si:next_wordchar]}
+	#Asm::Ins i_input_next wordchar
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_wordchar
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list wordchar]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is wordchar -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list wordchar]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_xdigit {} {
+	debug.pt/rdengine {[Instruction si:next_xdigit]}
+	#Asm::Ins i_input_next xdigit
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_xdigit
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list xdigit]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is xdigit -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list xdigit]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:value_symbol_start {symbol} {
+	debug.pt/rdengine {[Instruction si:value_symbol_start $symbol]}
+	# if @runtime@ i_symbol_restore $symbol
+	# i:found:ok_ast_value_push
+	# i:found_return
+	# i_loc_push
+	# i_ast_push
+
+	set k [list $myloc $symbol]
+	if {[info exists mysymbol($k)]} { 
+	    lassign $mysymbol($k) myloc myok myerror mysvalue
+	    if {$myok} {
+		$mystackast push $mysvalue
+	    }
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackloc  push $myloc
+	$mystackmark push [$mystackast size]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:value_void_symbol_start {symbol} {
+	debug.pt/rdengine {[Instruction si:value_void_symbol_start $symbol]}
+	# if @runtime@ i_symbol_restore $symbol
+	# i:found_return
+	# i_loc_push
+	# i_ast_push
+
+	set k [list $myloc $symbol]
+	if {[info exists mysymbol($k)]} { 
+	    lassign $mysymbol($k) myloc myok myerror mysvalue
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackloc  push $myloc
+	$mystackmark push [$mystackast size]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void_symbol_start {symbol} {
+	debug.pt/rdengine {[Instruction si:void_symbol_start $symbol]}
+	# if @runtime@ i_symbol_restore $symbol
+	# i:found:ok_ast_value_push
+	# i:found_return
+	# i_loc_push
+
+	set k [list $myloc $symbol]
+	if {[info exists mysymbol($k)]} { 
+	    lassign $mysymbol($k) myloc myok myerror mysvalue
+	    if {$myok} {
+		$mystackast push $mysvalue
+	    }
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackloc push $myloc
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void_void_symbol_start {symbol} {
+	debug.pt/rdengine {[Instruction si:void_void_symbol_start $symbol]}
+	# if @runtime@ i_symbol_restore $symbol
+	# i:found_return
+	# i_loc_push
+
+	set k [list $myloc $symbol]
+	if {[info exists mysymbol($k)]} { 
+	    lassign $mysymbol($k) myloc myok myerror mysvalue
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackloc push $myloc
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:reduce_symbol_end {symbol} {
+	debug.pt/rdengine {[Instruction si:reduce_symbol_end $symbol]}
+	# i_value_clear/reduce $symbol
+	# i_symbol_save       $symbol
+	# i_error_nonterminal $symbol
+	# i_ast_pop_rewind
+	# i_loc_pop_discard
+	# i:ok_ast_value_push
+
+	set mysvalue {}
+	set at [$mystackloc pop]
+
+	if {$myok} {
+	    set  mark [$mystackmark peek];# Old size of stack before current nt pushed more.
+	    set  newa [expr {[$mystackast size] - $mark}]
+	    set  pos  $at
+	    incr pos
+
+	    if {!$newa} {
+		set mysvalue {}
+	    } elseif {$newa == 1} {
+		# peek 1 => single element comes back
+		set mysvalue [list [$mystackast peek]]     ; # SaveToMark
+	    } else {
+		# peek n > 1 => list of elements comes back
+		set mysvalue [$mystackast peekr $newa]     ; # SaveToMark
+	    }
+
+	    if {$at == $myloc} {
+		# The symbol did not process any input. As this is
+		# signaled to be ok (*) we create a node covering an
+		# empty range. (Ad *): Can happen for a RHS using
+		# toplevel operators * or ?.
+		set mysvalue [pt::ast new0 $symbol $pos {*}$mysvalue]
+	    } else {
+		set mysvalue [pt::ast new $symbol $pos $myloc {*}$mysvalue] ; # Reduce $symbol
+	    }
+	}
+
+	set k  [list $at $symbol]
+	set mysymbol($k) [list $myloc $myok $myerror $mysvalue]
+
+	# si:reduce_symbol_end / i_error_nonterminal -- inlined -- disabled
+	if {0} {if {[llength $myerror]} {
+	    set  pos $at
+	    incr pos
+	    lassign $myerror loc messages
+	    if {$loc == $pos} {
+		set myerror [list $loc [list [list n $symbol]]]
+	    }
+	}}
+
+	$mystackast trim* [$mystackmark pop]
+	if {$myok} {
+	    $mystackast push $mysvalue
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void_leaf_symbol_end {symbol} {
+	debug.pt/rdengine {[Instruction si:void_leaf_symbol_end $symbol]}
+	# i_value_clear/leaf $symbol
+	# i_symbol_save       $symbol
+	# i_error_nonterminal $symbol
+	# i_loc_pop_discard
+	# i:ok_ast_value_push
+
+	set mysvalue {}
+	set at [$mystackloc pop]
+
+	if {$myok} {
+	    set  pos $at
+	    incr pos
+	    if {$at == $myloc} {
+		# The symbol did not process any input. As this is
+		# signaled to be ok (*) we create a node covering an
+		# empty range. (Ad *): Can happen for a RHS using
+		# toplevel operators * or ?.
+		set mysvalue [pt::ast new0 $symbol $pos]
+	    } else {
+		set mysvalue [pt::ast new $symbol $pos $myloc]
+	    }
+	}
+
+	set k  [list $at $symbol]
+	set mysymbol($k) [list $myloc $myok $myerror $mysvalue]
+
+	# si:void_leaf_symbol_end / i_error_nonterminal -- inlined -- disabled
+	if {0} {if {[llength $myerror]} {
+	    set  pos $at
+	    incr pos
+	    lassign $myerror loc messages
+	    if {$loc == $pos} {
+		set myerror [list $loc [list [list n $symbol]]]
+	    }
+	}}
+
+	if {$myok} {
+	    $mystackast push $mysvalue
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:value_leaf_symbol_end {symbol} {
+	debug.pt/rdengine {[Instruction si:value_leaf_symbol_end $symbol]}
+	# i_value_clear/leaf $symbol
+	# i_symbol_save       $symbol
+	# i_error_nonterminal $symbol
+	# i_loc_pop_discard
+	# i_ast_pop_rewind
+	# i:ok_ast_value_push
+
+	set mysvalue {}
+	set at [$mystackloc pop]
+
+	if {$myok} {
+	    set  pos $at
+	    incr pos
+	    if {$at == $myloc} {
+		# The symbol did not process any input. As this is
+		# signaled to be ok (*) we create a node covering an
+		# empty range. (Ad *): Can happen for a RHS using
+		# toplevel operators * or ?.
+		set mysvalue [pt::ast new0 $symbol $pos]
+	    } else {
+		set mysvalue [pt::ast new $symbol $pos $myloc]
+	    }
+	}
+
+	set k  [list $at $symbol]
+	set mysymbol($k) [list $myloc $myok $myerror $mysvalue]
+
+	# si:value_leaf_symbol_end / i_error_nonterminal -- inlined -- disabled
+	if {0} {if {[llength $myerror]} {
+	    set  pos $at
+	    incr pos
+	    lassign $myerror loc messages
+	    if {$loc == $pos} {
+		set myerror [list $loc [list [list n $symbol]]]
+	    }
+	}}
+
+	$mystackast trim* [$mystackmark pop]
+	if {$myok} {
+	    $mystackast push $mysvalue
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:value_clear_symbol_end {symbol} {
+	debug.pt/rdengine {[Instruction si:value_clear_symbol_end $symbol]}
+	# i_value_clear
+	# i_symbol_save       $symbol
+	# i_error_nonterminal $symbol
+	# i_loc_pop_discard
+	# i_ast_pop_rewind
+
+	set mysvalue {}
+	set at [$mystackloc pop]
+
+	set k  [list $at $symbol]
+	set mysymbol($k) [list $myloc $myok $myerror $mysvalue]
+
+	# si:value_clear_symbol_end / i_error_nonterminal -- inlined -- disabled
+	if {0} {if {[llength $myerror]} {
+	    set  pos $at
+	    incr pos
+	    lassign $myerror loc messages
+	    if {$loc == $pos} {
+		set myerror [list $loc [list [list n $symbol]]]
+	    }
+	}}
+
+	$mystackast trim* [$mystackmark pop]
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void_clear_symbol_end {symbol} {
+	debug.pt/rdengine {[Instruction si:void_clear_symbol_end $symbol]}
+	# i_value_clear
+	# i_symbol_save       $symbol
+	# i_error_nonterminal $symbol
+	# i_loc_pop_discard
+
+	set mysvalue {}
+	set at [$mystackloc pop]
+
+	set k  [list $at $symbol]
+	set mysymbol($k) [list $myloc $myok $myerror $mysvalue]
+
+	# si:void_clear_symbol_end / i_error_nonterminal -- inlined -- disabled
+	if {0} {if {[llength $myerror]} {
+	    set  pos $at
+	    incr pos
+	    lassign $myerror loc messages
+	    if {$loc == $pos} {
+		set myerror [list $loc [list [list n $symbol]]]
+	    }
+	}}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## API - Instructions - Control flow
+
+    method i:ok_continue {} {
+	debug.pt/rdengine {[Instruction i:ok_continue]}
+	if {!$myok} return
+	return -code continue
+    }
+
+    method i:fail_continue {} {
+	debug.pt/rdengine {[Instruction i:fail_continue]}
+	if {$myok} return
+	return -code continue
+    }
+
+    method i:fail_return {} {
+	debug.pt/rdengine {[Instruction i:fail_return]}
+	if {$myok} return
+	return -code return
+    }
+
+    method i:ok_return {} {
+	debug.pt/rdengine {[Instruction i:ok_return]}
+	if {!$myok} return
+	return -code return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ##  API - Instructions - Unconditional matching.
+
+    method i_status_ok {} {
+	debug.pt/rdengine {[Instruction i_status_ok]}
+	set myok 1
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_status_fail {} {
+	debug.pt/rdengine {[Instruction i_status_fail]}
+	set myok 0
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_status_negate {} {
+	debug.pt/rdengine {[Instruction i_status_negate]}
+	set myok [expr {!$myok}]
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ##  API - Instructions - Error handling.
+
+    method i_error_clear {} {
+	debug.pt/rdengine {[Instruction i_error_clear]}
+	set myerror {}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_error_push {} {
+	debug.pt/rdengine {[Instruction i_error_push]}
+	$mystackerr push $myerror
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_error_clear_push {} {
+	debug.pt/rdengine {[Instruction i_error_clear_push]}
+	set myerror {}
+	$mystackerr push {}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_error_pop_merge {} {
+	debug.pt/rdengine {[Instruction i_error_pop_merge]}
+	set olderror [$mystackerr pop]
+
+	# We have either old or new error data, keep it.
+
+	if {![llength $myerror]}  { set myerror $olderror ; debug.pt/rdengine {[InstReturn]} ; return }
+	if {![llength $olderror]} { debug.pt/rdengine {[InstReturn]} ; return }
+
+	# If one of the errors is further on in the input choose that as
+	# the information to propagate.
+
+	lassign $myerror  loe msgse
+	lassign $olderror lon msgsn
+
+	if {$lon > $loe} { set myerror $olderror ; debug.pt/rdengine {[InstReturn]} ; return }
+	if {$loe > $lon} { debug.pt/rdengine {[InstReturn]} ; return }
+
+	# Equal locations, merge the message lists.
+	set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_error_nonterminal {symbol} {
+	debug.pt/rdengine {[Instruction i_error_nonterminal $symbol]}
+	#  i_error_nonterminal -- Disabled. Generate only low-level
+	#  i_error_nonterminal -- errors until we have worked out how
+	#  i_error_nonterminal -- to integrate symbol information with
+	#  i_error_nonterminal -- them. Do not forget where this
+	#  i_error_nonterminal -- instruction is inlined.
+	return
+
+	# Inlined: Errors, Expected.
+	if {![llength $myerror]} {
+	    debug.pt/rdengine {no error}
+	    return
+	}
+	set pos [$mystackloc peek]
+	incr pos
+	lassign $myerror loc messages
+	if {$loc != $pos} {
+	    debug.pt/rdengine {my $myerror != pos $pos}
+	    return
+	}
+	set myerror [list $loc [list [list n $symbol]]]
+
+	debug.pt/rdengine {::= ($myerror)}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ##  API - Instructions - Basic input handling and tracking
+
+    method i_loc_pop_rewind/discard {} {
+	debug.pt/rdengine {[Instruction i_loc_pop_rewind/discard]}
+	#$myparser i:fail_loc_pop_rewind
+	#$myparser i:ok_loc_pop_discard
+	#return
+	set last [$mystackloc pop]
+	if {!$myok} {
+	    set myloc $last
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_loc_pop_discard {} {
+	debug.pt/rdengine {[Instruction i_loc_pop_discard]}
+	$mystackloc pop
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # i:ok_loc_pop_discard - all uses inlined
+
+    method i_loc_pop_rewind {} {
+	debug.pt/rdengine {[Instruction i_loc_pop_rewind]}
+	set myloc [$mystackloc pop]
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i:fail_loc_pop_rewind {} {
+	debug.pt/rdengine {[Instruction i:fail_loc_pop_rewind]}
+	if {!$myok} {
+	    set myloc [$mystackloc pop]
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_loc_push {} {
+	debug.pt/rdengine {[Instruction i_loc_push]}
+	$mystackloc push $myloc
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_loc_rewind {} {
+	debug.pt/rdengine {[Instruction i_loc_rewind]}
+	# i_loc_pop_rewind - set myloc [$mystackloc pop]
+	# i_loc_push       - $mystackloc push $myloc    
+	set myloc [$mystackloc peek]
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ##  API - Instructions - AST stack handling
+
+    method i_ast_pop_rewind/discard {} {
+	debug.pt/rdengine {[Instruction i_ast_pop_rewind/discard]}
+	#$myparser i:fail_ast_pop_rewind
+	#$myparser i:ok_ast_pop_discard
+	#return
+	set mark [$mystackmark pop]
+	if {!$myok} {
+	    $mystackast trim* $mark
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_ast_pop_discard/rewind {} {
+	debug.pt/rdengine {[Instruction i_ast_pop_discard/rewind]}
+	#$myparser i:ok_ast_pop_rewind
+	#$myparser i:fail_ast_pop_discard
+	#return
+	set mark [$mystackmark pop]
+	if {$myok} {
+	    $mystackast trim* $mark
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_ast_pop_discard {} {
+	debug.pt/rdengine {[Instruction i_ast_pop_discard]}
+	$mystackmark pop
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # i:ok_ast_pop_discard - all uses inlined
+
+    method i_ast_pop_rewind {} {
+	debug.pt/rdengine {[Instruction i_ast_pop_rewind]}
+	$mystackast trim* [$mystackmark pop]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i:fail_ast_pop_rewind {} {
+	debug.pt/rdengine {[Instruction i:fail_ast_pop_rewind]}
+	if {!$myok} {
+	    $mystackast trim* [$mystackmark pop]
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_ast_push {} {
+	debug.pt/rdengine {[Instruction i_ast_push]}
+	$mystackmark push [$mystackast size]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i:ok_ast_value_push {} {
+	debug.pt/rdengine {[Instruction i:ok_ast_value_push]}
+	if {$myok} {
+	    $mystackast push $mysvalue
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # i_ast_rewind - all uses inlined
+
+    # # ## ### ##### ######## ############# #####################
+    ## API - Instructions - Nonterminal cache
+
+    method i_symbol_restore {symbol} {
+	debug.pt/rdengine {[Instruction i_symbol_restore $symbol]}
+	# Satisfy from cache if possible.
+	set k [list $myloc $symbol]
+	if {![info exists mysymbol($k)]} {
+	    debug.pt/rdengine {[InstReturn]}
+	    return 0
+	}
+	lassign $mysymbol($k) myloc myok myerror mysvalue
+	# We go forward, as the nonterminal matches (or not).
+	debug.pt/rdengine {[InstReturn]}
+	return 1
+    }
+
+    method i_symbol_save {symbol} {
+	debug.pt/rdengine {[Instruction i_symbol_save $symbol]}
+	# Store not only the value, but also how far
+	# the match went (if it was a match).
+	set at [$mystackloc peek]
+	set k  [list $at $symbol]
+	set mysymbol($k) [list $myloc $myok $myerror $mysvalue]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ##  API - Instructions - Semantic values.
+
+    method i_value_clear {} {
+	debug.pt/rdengine {[Instruction i_value_clear]}
+	set mysvalue {}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_value_clear/leaf {symbol} {
+	debug.pt/rdengine {[Instruction i_value_clear/leaf $symbol] :: ([expr {[$mystackloc peek]+1}])-@$myloc)}
+
+	# not quite value_lead (guarded, and clear on fail)
+	# Inlined clear, reduce, and optimized.
+	# Clear ; if {$ok} {Reduce $symbol}
+	set mysvalue {}
+        if {$myok} {
+	    set  pos [$mystackloc peek]
+	    incr pos
+
+	    if {($pos - 1) == $myloc} {
+		# The symbol did not process any input. As this is
+		# signaled to be ok (*) we create a node covering an
+		# empty range. (Ad *): Can happen for a RHS using
+		# toplevel operators * or ?.
+		set mysvalue [pt::ast new0 $symbol $pos]
+	    } else {
+		set mysvalue [pt::ast new $symbol $pos $myloc]
+	    }
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_value_clear/reduce {symbol} {
+	debug.pt/rdengine {[Instruction i_value_clear/reduce $symbol]}
+	set mysvalue {}
+        if {$myok} {
+	    set  mark [$mystackmark peek];# Old size of stack before current nt pushed more.
+	    set  newa [expr {[$mystackast size] - $mark}]
+
+	    set  pos  [$mystackloc  peek]
+	    incr pos
+
+	    if {!$newa} {
+		set mysvalue {}
+	    } elseif {$newa == 1} {
+		# peek 1 => single element comes back
+		set mysvalue [list [$mystackast peek]]     ; # SaveToMark
+	    } else {
+		# peek n > 1 => list of elements comes back
+		set mysvalue [$mystackast peekr $newa]     ; # SaveToMark
+	    }
+
+	    if {($pos - 1) == $myloc} {
+		# The symbol did not process any input. As this is
+		# signaled to be ok (*) we create a node covering an
+		# empty range. (Ad *): Can happen for a RHS using
+		# toplevel operators * or ?.
+		set mysvalue [pt::ast new0 $symbol $pos {*}$mysvalue]
+	    } else {
+		set mysvalue [pt::ast new $symbol $pos $myloc {*}$mysvalue] ; # Reduce $symbol
+	    }
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## API - Instructions - Terminal matching
+
+    method i_input_next {msg} {
+	debug.pt/rdengine {[Instruction i_input_next $msg]}
+	# Inlined: Getch, Expected, ClearErrors
+	# Satisfy from input cache if possible.
+
+	incr myloc
+	# May read from the input (ExtendTC), and remember the
+	# information. Note: We are implicitly incrementing the
+	# location!
+	if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list $msg]]
+
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok    1
+	set myerror {}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_char {tok} {
+	debug.pt/rdengine {[Instruction i_test_char $tok] :: ok [expr {$tok eq $mycurrent}], [expr {$tok eq $mycurrent ? "@$myloc" : "back@[expr {$myloc-1}]"}]}
+	set myok [expr {$tok eq $mycurrent}]
+	my OkFailD {pt::pe terminal $tok}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_range {toks toke} {
+	debug.pt/rdengine {[Instruction i_test_range $toks $toke]}
+	set myok [expr {
+			([string compare $toks $mycurrent] <= 0) &&
+			([string compare $mycurrent $toke] <= 0)
+		    }] ; # {}
+	my OkFailD {pt::pe range $toks $toke}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_alnum {} {
+	debug.pt/rdengine {[Instruction i_test_alnum]}
+	set myok [string is alnum -strict $mycurrent]
+	my OkFailD {pt::pe alnum}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_alpha {} {
+	debug.pt/rdengine {[Instruction i_test_alpha]}
+	set myok [string is alpha -strict $mycurrent]
+	my OkFailD {pt::pe alpha}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_ascii {} {
+	debug.pt/rdengine {[Instruction i_test_ascii]}
+	set myok [string is ascii -strict $mycurrent]
+	my OkFailD {pt::pe ascii}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_control {} {
+	debug.pt/rdengine {[Instruction i_test_control]}
+	set myok [string is control -strict $mycurrent]
+	my OkFailD {pt::pe control}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_ddigit {} {
+	debug.pt/rdengine {[Instruction i_test_ddigit]}
+	set myok [string match {[0-9]} $mycurrent]
+	my OkFailD {pt::pe ddigit}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_digit {} {
+	debug.pt/rdengine {[Instruction i_test_digit]}
+	set myok [string is digit -strict $mycurrent]
+	my OkFailD {pt::pe digit}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_graph {} {
+	debug.pt/rdengine {[Instruction i_test_graph]}
+	set myok [string is graph -strict $mycurrent]
+	my OkFailD {pt::pe graph}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_lower {} {
+	debug.pt/rdengine {[Instruction i_test_lower]}
+	set myok [string is lower -strict $mycurrent]
+	my OkFailD {pt::pe lower}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_print {} {
+	debug.pt/rdengine {[Instruction i_test_print]}
+	set myok [string is print -strict $mycurrent]
+	my OkFailD {pt::pe printable}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_punct {} {
+	debug.pt/rdengine {[Instruction i_test_punct]}
+	set myok [string is punct -strict $mycurrent]
+	my OkFailD {pt::pe punct}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_space {} {
+	debug.pt/rdengine {[Instruction i_test_space]}
+	set myok [string is space -strict $mycurrent]
+	my OkFailD {pt::pe space}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_upper {} {
+	debug.pt/rdengine {[Instruction i_test_upper]}
+	set myok [string is upper -strict $mycurrent]
+	my OkFailD {pt::pe upper}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_wordchar {} {
+	debug.pt/rdengine {[Instruction i_test_wordchar]}
+	set myok [string is wordchar -strict $mycurrent]
+	my OkFailD {pt::pe wordchar}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_xdigit {} {
+	debug.pt/rdengine {[Instruction i_test_xdigit]}
+	set myok [string is xdigit -strict $mycurrent]
+	my OkFailD {pt::pe xdigit}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## Internals
+
+    method ExtendTC {} {
+	if {($mychan eq {}) ||
+	    [eof $mychan]} {return 0}
+
+	set ch [read $mychan 1]
+	if {$ch eq {}} {
+	    return 0
+	}
+
+	append mytoken $ch
+	return 1
+    }
+
+    method ExtendTCN {n} {
+	if {($mychan eq {}) ||
+	    [eof $mychan]} {return 0}
+
+	set str [read $mychan $n]
+	set k   [string length $str]
+
+	append mytoken $str
+	if {$k < $n} {
+	    return 0
+	}
+
+	return 1
+    }
+
+    method OkFailD {msgcmd} {
+	# Inlined: Expected, Unget, ClearErrors
+	if {!$myok} {
+	    set myerror [list $myloc [list [uplevel 1 $msgcmd]]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## Data structures.
+    ## Mainly the architectural state of the instance's PARAM.
+
+    variable \
+	mychan mycurrent myloc mystackloc \
+	myok mysvalue myerror mystackerr \
+	mytoken mysymbol mystackast mystackmark \
+	mytracecounter
+
+    # Parser Input (channel, location (line, column)) ...........
+    # Token, current parsing location, stack of locations .......
+    # Match state .  ........ ............. .....................
+    # Caches for tokens and nonterminals .. .....................
+    # Abstract syntax tree (AST) .......... .....................
+
+    # # ## ### ##### ######## ############# #####################
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+package provide pt::rde::oo 1.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine_tcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine_tcl.tcl
new file mode 100644
index 00000000..2c596aa6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_rdengine_tcl.tcl
@@ -0,0 +1,2283 @@
+# -*- tcl -*-
+#
+# Copyright (c) 2009-2015 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+# # ## ### ##### ######## ############# #####################
+## Package description
+
+## Implementation of the PackRat Machine (PARAM), a virtual machine on
+## top of which parsers for Parsing Expression Grammars (PEGs) can be
+## realized. This implementation is tied to Tcl for control flow. We
+## (will) have alternate implementations written in TclOO, and critcl,
+## all exporting the same API.
+#
+## RD stands for Recursive Descent.
+
+# # ## ### ##### ######## ############# #####################
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require struct::stack 1.5 ; # Requiring peekr, getr, get, trim* methods
+package require pt::ast
+package require pt::pe
+
+# # ## ### ##### ######## ############# #####################
+## Support narrative tracing.
+
+package require debug
+debug level  pt/rdengine
+debug prefix pt/rdengine {}
+
+
+# # ## ### ##### ######## ############# #####################
+## Implementation
+
+snit::type ::pt::rde_tcl {
+    # # ## ### ##### ######## ############# #####################
+    ## Instruction counter for tracing. Unused else. Plus other helpers.
+    variable trace 0
+
+    proc Instruction {label {a {}} {b {}}} {
+	upvar 1 self self trace trace myok myok myloc myloc mycurrent mycurrent mysvalue mysvalue myerror myerror __inst theinst
+	set theinst [list $label $a $b]
+	return "$self <<[format %08d [incr trace]]>> START I:[format %-30s $label] [format %-10s $a] [format %-10s $b] :: [State]"
+    }
+
+    proc InstReturn {} {
+	upvar 1 self self trace trace myok myok myloc myloc mycurrent mycurrent mysvalue mysvalue myerror myerror __inst theinst
+	lassign $theinst label a b
+	return "$self <<[format %08d $trace]>> END__ I:[format %-30s $label] [format %-10s $a] [format %-10s $b] :: [State]"
+    }
+
+    proc State {} {
+	upvar 1 myok myok myloc myloc mycurrent mycurrent mysvalue mysvalue myerror myerror
+	return "ST $myok CL $myloc CC ($mycurrent) SV ($mysvalue) ER ($myerror)"
+    }
+
+    proc TraceSetupStacks {} {
+	upvar selfns selfns
+
+	# Move stack instances aside.
+	rename ${selfns}::LOC   ${selfns}::LOC__
+	rename ${selfns}::ERR   ${selfns}::ERR__
+	rename ${selfns}::AST   ${selfns}::AST__
+	rename ${selfns}::MARK  ${selfns}::MRK__
+
+	# Create procedures doing tracing, and forwarding to the
+	# renamed actual instances.
+
+	interp alias {} ${selfns}::LOC  {} ${selfns}::WRAP LS  LOC__
+	interp alias {} ${selfns}::ERR  {} ${selfns}::WRAP ES  ERR__
+	interp alias {} ${selfns}::AST  {} ${selfns}::WRAP ARS AST__
+	interp alias {} ${selfns}::MARK {} ${selfns}::WRAP ASM MRK__
+
+	proc ${selfns}::WRAP {label stack args} {
+	    debug.pt/rdengine {    $label ___ $args}
+	    set res [$stack {*}$args]
+
+	    # Show state state after the op
+	    set n [$stack size]
+	    if {!$n} {
+		set c {()}
+	    } elseif {$n == 1} {
+		set c <<[$stack peek $n]>>
+	    } else {
+		set c <<[join [$stack peek $n] {>> <<}]>>
+	    }
+	    debug.pt/rdengine {    $label ==  ($n):$c}
+
+	    # And op return
+	    debug.pt/rdengine {    $label ==> ($res)}
+	    return $res
+	}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## API - Lifecycle
+
+    constructor {} {
+	debug.pt/rdengine {$self constructor}
+
+	set mystackloc  [struct::stack ${selfns}::LOC]  ; # LS
+	set mystackerr  [struct::stack ${selfns}::ERR]  ; # ES
+	set mystackast  [struct::stack ${selfns}::AST]  ; # ARS/AS
+	set mystackmark [struct::stack ${selfns}::MARK] ; # s.a.
+
+	debug.pt/rdengine {[TraceSetupStacks]$self constructor /done}
+	return
+    }
+
+    method reset {{chan {}}} {
+	debug.pt/rdengine {$self reset ($chan)}
+
+	set mychan    $chan      ; # IN
+	set mycurrent {}         ; # CC
+	set myloc     -1         ; # CL
+	set myok      0          ; # ST
+	set msvalue   {}         ; # SV
+	set myerror   {}         ; # ER
+	set mytoken   {}         ; # TC (string)
+	array unset   mysymbol * ; # NC
+
+	$mystackloc  clear
+	$mystackerr  clear
+	$mystackast  clear
+	$mystackmark clear
+
+	debug.pt/rdengine {$self reset /done}
+	return
+    }
+
+    method complete {} {
+	debug.pt/rdengine {$self complete [State]}
+
+	if {$myok} {
+	    set n [$mystackast size]
+	    debug.pt/rdengine {$self complete ast $n}
+	    if {$n > 1} {
+		# Multiple ASTs left, reduce into single containing them.
+		set  pos [$mystackloc peek]
+		incr pos
+		set children [$mystackast peekr [$mystackast size]] ; # SaveToMark
+		set ast [pt::ast new {} $pos $myloc {*}$children]    ; # Reduce ALL
+
+		debug.pt/rdengine {$self complete n ==> ($ast)}
+		return $ast
+	    } elseif {$n == 0} {
+		# Match, but no AST. This is possible if the grammar
+		# consists of only the start expression.
+
+		debug.pt/rdengine {$self complete 0 ==> ()}
+		return {}
+	    } else {
+		# Match, with AST.
+		set ast [$mystackast peek]
+		debug.pt/rdengine {$self complete 1 ==> ($ast)}
+		return $ast
+	    }
+	} else {
+	    lassign $myerror loc messages
+	    return -code error \
+		-errorcode {PT RDE SYNTAX} \
+		[list pt::rde $loc $messages]
+	}
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## API - State accessors
+
+    method chan   {} { debug.pt/rdengine {$self chan} ; return $mychan }
+
+    # - - -- --- ----- --------
+
+    method current  {} { debug.pt/rdengine {$self current}  ; return $mycurrent }
+    method location {} { debug.pt/rdengine {$self location} ; return $myloc }
+    method lmarked  {} { debug.pt/rdengine {$self lmarked}  ; return [$mystackloc getr] }
+
+    # - - -- --- ----- --------
+
+    method ok      {} { debug.pt/rdengine {$self ok}      ; return $myok      }
+    method value   {} { debug.pt/rdengine {$self value}   ; return $mysvalue  }
+    method error   {} { debug.pt/rdengine {$self error}   ; return $myerror   }
+    method emarked {} { debug.pt/rdengine {$self emarked} ; return [$mystackerr getr] }
+
+    # - - -- --- ----- --------
+
+    method tokens {{from {}} {to {}}} {
+	debug.pt/rdengine {$self tokens ($from) ($to)}
+	switch -exact [llength [info level 0]] {
+	    5 { return $mytoken }
+	    6 { return [string range $mytoken $from $from] }
+	    7 { return [string range $mytoken $from $to] }
+	}
+    }
+
+    method symbols {} {
+	debug.pt/rdengine {$self symbols}
+	return [array get mysymbol]
+    }
+
+    method scached {} {
+	debug.pt/rdengine {$self scached}
+	return [array names mysymbol]
+    }
+
+    # - - -- --- ----- --------
+
+    method asts    {} { debug.pt/rdengine {$self asts}    ; return [$mystackast  getr] }
+    method amarked {} { debug.pt/rdengine {$self amarked} ; return [$mystackmark getr] }
+    method ast     {} { debug.pt/rdengine {$self ast}     ; return [$mystackast  peek] }
+
+    # # ## ### ##### ######## ############# #####################
+    ## API - Preloading the token cache.
+
+    method data {data} {
+	debug.pt/rdengine {$self data +[string length $data]}
+	append mytoken $data
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## Common instruction sequences
+
+    method si:void_state_push {} {
+	debug.pt/rdengine {[Instruction si:void_state_push]}
+	# i_loc_push
+	# i_error_clear_push
+	$mystackloc push $myloc
+	set myerror {}
+	$mystackerr push {}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void2_state_push {} {
+	debug.pt/rdengine {[Instruction si:void2_state_push]}
+	# i_loc_push
+	# i_error_push
+	$mystackloc push $myloc
+	$mystackerr push {}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:value_state_push {} {
+	debug.pt/rdengine {[Instruction si:value_state_push]}
+	# i_ast_push
+	# i_loc_push
+	# i_error_clear_push
+	$mystackmark push [$mystackast size]
+	$mystackloc push $myloc
+	set myerror {}
+	$mystackerr push {}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:void_state_merge {} {
+	debug.pt/rdengine {[Instruction si:void_state_merge]}
+	# i_error_pop_merge
+	# i_loc_pop_rewind/discard
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+
+	set last [$mystackloc pop]
+	if {!$myok} {
+	    set myloc $last
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void_state_merge_ok {} {
+	debug.pt/rdengine {[Instruction si:void_state_merge_ok]}
+	# i_error_pop_merge
+	# i_loc_pop_rewind/discard
+	# i_status_ok
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+
+	set last [$mystackloc pop]
+	if {!$myok} {
+	    set myloc $last
+	    set myok 1
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:value_state_merge {} {
+	debug.pt/rdengine {[Instruction si:value_state_merge]}
+	# i_error_pop_merge
+	# i_ast_pop_rewind/discard
+	# i_loc_pop_rewind/discard
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+
+	set mark [$mystackmark pop]
+	set last [$mystackloc pop]
+	if {!$myok} {
+	    $mystackast trim* $mark
+	    set myloc $last
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:value_notahead_start {} {
+	debug.pt/rdengine {[Instruction si:value_notahead_start]}
+	# i_loc_push
+	# i_ast_push
+
+	$mystackloc  push $myloc
+	$mystackmark push [$mystackast size]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void_notahead_exit {} {
+	debug.pt/rdengine {[Instruction si:void_notahead_exit]}
+	# i_loc_pop_rewind
+	# i_status_negate
+
+	set myloc [$mystackloc pop]
+	set myok [expr {!$myok}]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:value_notahead_exit {} {
+	debug.pt/rdengine {[Instruction si:value_notahead_exit]}
+	# i_ast_pop_discard/rewind
+	# i_loc_pop_rewind
+	# i_status_negate
+
+	set mark [$mystackmark pop]
+	if {$myok} {
+	    $mystackast trim* $mark
+	}
+	set myloc [$mystackloc pop]
+	set myok [expr {!$myok}]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:kleene_abort {} {
+	debug.pt/rdengine {[Instruction si:kleene_abort]}
+	# i_loc_pop_rewind/discard
+	# i:fail_return
+
+	set last [$mystackloc pop]
+	if {$myok} {
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set myloc $last
+	debug.pt/rdengine {[InstReturn]}
+	return -code return
+    }
+
+    method si:kleene_close {} {
+	debug.pt/rdengine {[Instruction si:kleene_close]}
+	# i_error_pop_merge
+	# i_loc_pop_rewind/discard
+	# i:fail_status_ok
+	# i:fail_return
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+
+	set last [$mystackloc pop]
+	if {$myok} {
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set myok 1
+	set myloc $last
+
+	debug.pt/rdengine {[InstReturn]}
+	return -code return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:voidvoid_branch {} {
+	debug.pt/rdengine {[Instruction si:voidvoid_branch]}
+	# i_error_pop_merge
+	# i:ok_loc_pop_discard
+	# i:ok_return
+	# i_loc_rewind
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+
+	if {$myok} {
+	    $mystackloc pop
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	set myloc [$mystackloc peek]
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:voidvalue_branch {} {
+	debug.pt/rdengine {[Instruction si:voidvalue_branch]}
+	# i_error_pop_merge
+	# i:ok_loc_pop_discard
+	# i:ok_return
+	# i_ast_push
+	# i_loc_rewind
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+
+	if {$myok} {
+	    $mystackloc pop
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackmark push [$mystackast size]
+	set myloc [$mystackloc peek]
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:valuevoid_branch {} {
+	debug.pt/rdengine {[Instruction si:valuevoid_branch]}
+	# i_error_pop_merge
+	# i_ast_pop_rewind/discard
+	# i:ok_loc_pop_discard
+	# i:ok_return
+	# i_loc_rewind
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+	set mark [$mystackmark pop]
+	if {$myok} {
+	    $mystackloc pop
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackast trim* $mark
+	set myloc [$mystackloc peek]
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:valuevalue_branch {} {
+	debug.pt/rdengine {[Instruction si:valuevalue_branch]}
+	# i_error_pop_merge
+	# i_ast_pop_discard
+	# i:ok_loc_pop_discard
+	# i:ok_return
+	# i_ast_rewind
+	# i_loc_rewind
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+	if {$myok} {
+	    $mystackmark pop
+	    $mystackloc pop
+
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackast trim* [$mystackmark peek]
+	set myloc [$mystackloc peek]
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:voidvoid_part {} {
+	debug.pt/rdengine {[Instruction si:voidvoid_part]}
+	# i_error_pop_merge
+	# i:fail_loc_pop_rewind
+	# i:fail_return
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+	if {!$myok} {
+	    set myloc [$mystackloc pop]
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:voidvalue_part {} {
+	debug.pt/rdengine {[Instruction si:voidvalue_part]}
+	# i_error_pop_merge
+	# i:fail_loc_pop_rewind
+	# i:fail_return
+	# i_ast_push
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+	if {!$myok} {
+	    set myloc [$mystackloc pop]
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackmark push [$mystackast size]
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:valuevalue_part {} {
+	debug.pt/rdengine {[Instruction si:valuevalue_part]}
+	# i_error_pop_merge
+	# i:fail_ast_pop_rewind
+	# i:fail_loc_pop_rewind
+	# i:fail_return
+	# i_error_push
+
+	set olderror [$mystackerr pop]
+	# We have either old or new error data, keep it.
+	if {![llength $myerror]}  {
+	    set myerror $olderror
+	} elseif {[llength $olderror]} {
+	    # If one of the errors is further on in the input choose
+	    # that as the information to propagate.
+
+	    lassign $myerror  loe msgse
+	    lassign $olderror lon msgsn
+
+	    if {$lon > $loe} {
+		set myerror $olderror
+	    } elseif {$loe == $lon} {
+		# Equal locations, merge the message lists, set-like.
+		set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	    }
+	}
+	if {!$myok} {
+	    $mystackast trim* [$mystackmark pop]
+	    set myloc [$mystackloc pop]
+
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackerr push $myerror
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:next_str {tok} {
+	debug.pt/rdengine {[Instruction si:next_str $tok]}
+	# String = sequence of characters.
+	# No need for all the intermediate stack churn.
+
+	set n    [string length $tok]
+	set last [expr {$myloc + $n}]
+	set max  [string length $mytoken]
+
+	incr myloc
+	if {($last >= $max) && ![ExtendTCN [expr {$last - $max + 1}]]} {
+	    set myok    0
+	    set myerror [list $myloc [list [pt::pe str $tok]]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set lex       [string range $mytoken $myloc $last]
+	set mycurrent [string index $mytoken $last]
+
+	# ATTENTION: The error output of this instruction is different
+	# from a regular sequence of si:next_char instructions. The
+	# error location will be the start of the string token we
+	# wanted to match, and the message will contain the entire
+	# string token. In the regular sequence we would see the exact
+	# point of the mismatch instead, with the message containing
+	# the expected character.
+
+	if {$tok eq $lex} {
+	    set myok 1
+	    set myloc $last
+	    set myerror {}
+	} else {
+	    set myok 0
+	    set myerror [list $myloc [list [pt::pe str $tok]]]
+	    incr myloc -1
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_class {tok} {
+	debug.pt/rdengine {[Instruction si:next_class $tok]}
+	# Class = Choice of characters. No need for stack churn.
+
+	# i_input_next "\{t $c\}"
+	# i:fail_return
+	# i_test_<user class>
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list [pt::pe class $tok]]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	# Note what is needle versus hay. The token, i.e. the string
+	# of allowed characters is the hay in which the current
+	# character is looked, making it the needle.
+
+	if {[string first $mycurrent $tok] >= 0} {
+	    set myok 1
+	    set myerror {}
+	} else {
+	    set myok 0
+	    set myerror [list $myloc [list [pt::pe class $tok]]]
+	    incr myloc -1
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_char {tok} {
+	debug.pt/rdengine {[Instruction si:next_char $tok]}
+	# i_input_next "\{t $c\}"
+	# i:fail_return
+	# i_test_char $c
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list [pt::pe terminal $tok]]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	if {$tok eq $mycurrent} {
+	    set myok 1
+	    set myerror {}
+	} else {
+	    set myok 0
+	    set myerror [list $myloc [list [pt::pe terminal $tok]]]
+	    incr myloc -1
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_range {toks toke} {
+	debug.pt/rdengine {[Instruction si:next_range $toks $toke]}
+	#Asm::Ins i_input_next "\{.. $s $e\}"
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_range $s $e
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list [pt::pe range $toks $toke]]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	if {([string compare $toks $mycurrent] <= 0) &&
+	    ([string compare $mycurrent $toke] <= 0)} {
+	    set myok 1
+	    set myerror {}
+	} else {
+	    set myok 0
+	    set myerror [list $myloc [list [pt::pe range $toks $toke]]]
+	    incr myloc -1
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:next_alnum {} {
+	debug.pt/rdengine {[Instruction si:next_alnum]}
+	#Asm::Ins i_input_next alnum
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_alnum
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list alnum]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is alnum -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list alnum]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_alpha {} {
+	debug.pt/rdengine {[Instruction si:next_alpha]}
+	#Asm::Ins i_input_next alpha
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_alpha
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list alpha]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is alpha -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list alpha]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_ascii {} {
+	debug.pt/rdengine {[Instruction si:next_ascii]}
+	#Asm::Ins i_input_next ascii
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_ascii
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list ascii]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is ascii -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list ascii]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_control {} {
+	debug.pt/rdengine {[Instruction si:next_control]}
+	#Asm::Ins i_input_next control
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_control
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list control]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is control -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list control]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_ddigit {} {
+	debug.pt/rdengine {[Instruction si:next_ddigit]}
+	#Asm::Ins i_input_next ddigit
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_ddigit
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list ddigit]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string match {[0-9]} $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list ddigit]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_digit {} {
+	debug.pt/rdengine {[Instruction si:next_digit]}
+	#Asm::Ins i_input_next digit
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_digit
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list digit]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is digit -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list digit]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_graph {} {
+	debug.pt/rdengine {[Instruction si:next_graph]}
+	#Asm::Ins i_input_next graph
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_graph
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list graph]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is graph -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list graph]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_lower {} {
+	debug.pt/rdengine {[Instruction si:next_lower]}
+	#Asm::Ins i_input_next lower
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_lower
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list lower]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is lower -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list lower]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_print {} {
+	debug.pt/rdengine {[Instruction si:next_print]}
+	#Asm::Ins i_input_next print
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_print
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list print]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is print -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list print]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_punct {} {
+	debug.pt/rdengine {[Instruction si:next_punct]}
+	#Asm::Ins i_input_next punct
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_punct
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list punct]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is punct -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list punct]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_space {} {
+	debug.pt/rdengine {[Instruction si:next_space]}
+	#Asm::Ins i_input_next space
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_space
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list space]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is space -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list space]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_upper {} {
+	debug.pt/rdengine {[Instruction si:next_upper]}
+	#Asm::Ins i_input_next upper
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_upper
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list upper]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is upper -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list upper]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_wordchar {} {
+	debug.pt/rdengine {[Instruction si:next_wordchar]}
+	#Asm::Ins i_input_next wordchar
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_wordchar
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list wordchar]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is wordchar -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list wordchar]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:next_xdigit {} {
+	debug.pt/rdengine {[Instruction si:next_xdigit]}
+	#Asm::Ins i_input_next xdigit
+	#Asm::Ins i:fail_return
+	#Asm::Ins i_test_xdigit
+
+	incr myloc
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list xdigit]]
+	    # i:fail_return
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok [string is xdigit -strict $mycurrent]
+	if {!$myok} {
+	    set myerror [list $myloc [list xdigit]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # - -- --- ----- -------- ------------- ---------------------
+
+    method si:value_symbol_start {symbol} {
+	debug.pt/rdengine {[Instruction si:value_symbol_start $symbol]}
+	# if @runtime@ i_symbol_restore $symbol
+	# i:found:ok_ast_value_push
+	# i:found_return
+	# i_loc_push
+	# i_ast_push
+
+	set k [list $myloc $symbol]
+	if {[info exists mysymbol($k)]} { 
+	    lassign $mysymbol($k) myloc myok myerror mysvalue
+	    if {$myok} {
+		$mystackast push $mysvalue
+	    }
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackloc  push $myloc
+	$mystackmark push [$mystackast size]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:value_void_symbol_start {symbol} {
+	debug.pt/rdengine {[Instruction si:value_void_symbol_start $symbol]}
+	# if @runtime@ i_symbol_restore $symbol
+	# i:found_return
+	# i_loc_push
+	# i_ast_push
+
+	set k [list $myloc $symbol]
+	if {[info exists mysymbol($k)]} { 
+	    lassign $mysymbol($k) myloc myok myerror mysvalue
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackloc  push $myloc
+	$mystackmark push [$mystackast size]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void_symbol_start {symbol} {
+	debug.pt/rdengine {[Instruction si:void_symbol_start $symbol]}
+	# if @runtime@ i_symbol_restore $symbol
+	# i:found:ok_ast_value_push
+	# i:found_return
+	# i_loc_push
+
+	set k [list $myloc $symbol]
+	if {[info exists mysymbol($k)]} { 
+	    lassign $mysymbol($k) myloc myok myerror mysvalue
+	    if {$myok} {
+		$mystackast push $mysvalue
+	    }
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackloc push $myloc
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void_void_symbol_start {symbol} {
+	debug.pt/rdengine {[Instruction si:void_void_symbol_start $symbol]}
+	# if @runtime@ i_symbol_restore $symbol
+	# i:found_return
+	# i_loc_push
+
+	set k [list $myloc $symbol]
+	if {[info exists mysymbol($k)]} { 
+	    lassign $mysymbol($k) myloc myok myerror mysvalue
+	    debug.pt/rdengine {[InstReturn]}
+	    return -code return
+	}
+	$mystackloc push $myloc
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:reduce_symbol_end {symbol} {
+	debug.pt/rdengine {[Instruction si:reduce_symbol_end $symbol]}
+	# i_value_clear/reduce $symbol
+	# i_symbol_save       $symbol
+	# i_error_nonterminal $symbol
+	# i_ast_pop_rewind
+	# i_loc_pop_discard
+	# i:ok_ast_value_push
+
+	set mysvalue {}
+	set at [$mystackloc pop]
+
+	if {$myok} {
+	    set  mark [$mystackmark peek];# Old size of stack before current nt pushed more.
+	    set  newa [expr {[$mystackast size] - $mark}]
+	    set  pos  $at
+	    incr pos
+
+	    if {!$newa} {
+		set mysvalue {}
+	    } elseif {$newa == 1} {
+		# peek 1 => single element comes back
+		set mysvalue [list [$mystackast peek]]     ; # SaveToMark
+	    } else {
+		# peek n > 1 => list of elements comes back
+		set mysvalue [$mystackast peekr $newa]     ; # SaveToMark
+	    }
+
+	    if {$at == $myloc} {
+		# The symbol did not process any input. As this is
+		# signaled to be ok (*) we create a node covering an
+		# empty range. (Ad *): Can happen for a RHS using
+		# toplevel operators * or ?.
+		set mysvalue [pt::ast new0 $symbol $pos {*}$mysvalue]
+	    } else {
+		set mysvalue [pt::ast new $symbol $pos $myloc {*}$mysvalue] ; # Reduce $symbol
+	    }
+	}
+
+	set k  [list $at $symbol]
+	set mysymbol($k) [list $myloc $myok $myerror $mysvalue]
+
+	# si:reduce_symbol_end / i_error_nonterminal -- inlined -- disabled
+	if {0} {if {[llength $myerror]} {
+	    set  pos $at
+	    incr pos
+	    lassign $myerror loc messages
+	    if {$loc == $pos} {
+		set myerror [list $loc [list [list n $symbol]]]
+	    }
+	}}
+
+	$mystackast trim* [$mystackmark pop]
+	if {$myok} {
+	    $mystackast push $mysvalue
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void_leaf_symbol_end {symbol} {
+	debug.pt/rdengine {[Instruction si:void_leaf_symbol_end $symbol]}
+	# i_value_clear/leaf $symbol
+	# i_symbol_save       $symbol
+	# i_error_nonterminal $symbol
+	# i_loc_pop_discard
+	# i:ok_ast_value_push
+
+	set mysvalue {}
+	set at [$mystackloc pop]
+
+	if {$myok} {
+	    set  pos $at
+	    incr pos
+	    if {$at == $myloc} {
+		# The symbol did not process any input. As this is
+		# signaled to be ok (*) we create a node covering an
+		# empty range. (Ad *): Can happen for a RHS using
+		# toplevel operators * or ?.
+		set mysvalue [pt::ast new0 $symbol $pos]
+	    } else {
+		set mysvalue [pt::ast new $symbol $pos $myloc]
+	    }
+	}
+
+	set k  [list $at $symbol]
+	set mysymbol($k) [list $myloc $myok $myerror $mysvalue]
+
+	# si:void_leaf_symbol_end / i_error_nonterminal -- inlined -- disabled
+	if {0} {if {[llength $myerror]} {
+	    set  pos $at
+	    incr pos
+	    lassign $myerror loc messages
+	    if {$loc == $pos} {
+		set myerror [list $loc [list [list n $symbol]]]
+	    }
+	}}
+
+	if {$myok} {
+	    $mystackast push $mysvalue
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:value_leaf_symbol_end {symbol} {
+	debug.pt/rdengine {[Instruction si:value_leaf_symbol_end $symbol]}
+	# i_value_clear/leaf $symbol
+	# i_symbol_save       $symbol
+	# i_error_nonterminal $symbol
+	# i_loc_pop_discard
+	# i_ast_pop_rewind
+	# i:ok_ast_value_push
+
+	set mysvalue {}
+	set at [$mystackloc pop]
+
+	if {$myok} {
+	    set  pos $at
+	    incr pos
+	    if {$at == $myloc} {
+		# The symbol did not process any input. As this is
+		# signaled to be ok (*) we create a node covering an
+		# empty range. (Ad *): Can happen for a RHS using
+		# toplevel operators * or ?.
+		set mysvalue [pt::ast new0 $symbol $pos]
+	    } else {
+		set mysvalue [pt::ast new $symbol $pos $myloc]
+	    }
+	}
+
+	set k  [list $at $symbol]
+	set mysymbol($k) [list $myloc $myok $myerror $mysvalue]
+
+	# si:value_leaf_symbol_end / i_error_nonterminal -- inlined -- disabled
+	if {0} {if {[llength $myerror]} {
+	    set  pos $at
+	    incr pos
+	    lassign $myerror loc messages
+	    if {$loc == $pos} {
+		set myerror [list $loc [list [list n $symbol]]]
+	    }
+	}}
+
+	$mystackast trim* [$mystackmark pop]
+	if {$myok} {
+	    $mystackast push $mysvalue
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:value_clear_symbol_end {symbol} {
+	debug.pt/rdengine {[Instruction si:value_clear_symbol_end $symbol]}
+	# i_value_clear
+	# i_symbol_save       $symbol
+	# i_error_nonterminal $symbol
+	# i_loc_pop_discard
+	# i_ast_pop_rewind
+
+	set mysvalue {}
+	set at [$mystackloc pop]
+
+	set k  [list $at $symbol]
+	set mysymbol($k) [list $myloc $myok $myerror $mysvalue]
+
+	# si:value_clear_symbol_end / i_error_nonterminal -- inlined -- disabled
+	if {0} {if {[llength $myerror]} {
+	    set  pos $at
+	    incr pos
+	    lassign $myerror loc messages
+	    if {$loc == $pos} {
+		set myerror [list $loc [list [list n $symbol]]]
+	    }
+	}}
+
+	$mystackast trim* [$mystackmark pop]
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method si:void_clear_symbol_end {symbol} {
+	debug.pt/rdengine {[Instruction si:void_clear_symbol_end $symbol]}
+	# i_value_clear
+	# i_symbol_save       $symbol
+	# i_error_nonterminal $symbol
+	# i_loc_pop_discard
+
+	set mysvalue {}
+	set at [$mystackloc pop]
+
+	set k  [list $at $symbol]
+	set mysymbol($k) [list $myloc $myok $myerror $mysvalue]
+
+	# si:void_clear_symbol_end / i_error_nonterminal -- inlined -- disabled
+	if {0} {if {[llength $myerror]} {
+	    set  pos $at
+	    incr pos
+	    lassign $myerror loc messages
+	    if {$loc == $pos} {
+		set myerror [list $loc [list [list n $symbol]]]
+	    }
+	}}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## API - Instructions - Control flow
+
+    method i:ok_continue {} {
+	debug.pt/rdengine {[Instruction i:ok_continue]}
+	if {!$myok} return
+	return -code continue
+    }
+
+    method i:fail_continue {} {
+	debug.pt/rdengine {[Instruction i:fail_continue]}
+	if {$myok} return
+	return -code continue
+    }
+
+    method i:fail_return {} {
+	debug.pt/rdengine {[Instruction i:fail_return]}
+	if {$myok} return
+	return -code return
+    }
+
+    method i:ok_return {} {
+	debug.pt/rdengine {[Instruction i:ok_return]}
+	if {!$myok} return
+	return -code return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ##  API - Instructions - Unconditional matching.
+
+    method i_status_ok {} {
+	debug.pt/rdengine {[Instruction i_status_ok]}
+	set myok 1
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_status_fail {} {
+	debug.pt/rdengine {[Instruction i_status_fail]}
+	set myok 0
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_status_negate {} {
+	debug.pt/rdengine {[Instruction i_status_negate]}
+	set myok [expr {!$myok}]
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ##  API - Instructions - Error handling.
+
+    method i_error_clear {} {
+	debug.pt/rdengine {[Instruction i_error_clear]}
+	set myerror {}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_error_push {} {
+	debug.pt/rdengine {[Instruction i_error_push]}
+	$mystackerr push $myerror
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_error_clear_push {} {
+	debug.pt/rdengine {[Instruction i_error_clear_push]}
+	set myerror {}
+	$mystackerr push {}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_error_pop_merge {} {
+	debug.pt/rdengine {[Instruction i_error_pop_merge]}
+	set olderror [$mystackerr pop]
+
+	# We have either old or new error data, keep it.
+
+	if {![llength $myerror]}  { set myerror $olderror ; debug.pt/rdengine {[InstReturn]} ; return }
+	if {![llength $olderror]} { debug.pt/rdengine {[InstReturn]} ; return }
+
+	# If one of the errors is further on in the input choose that as
+	# the information to propagate.
+
+	lassign $myerror  loe msgse
+	lassign $olderror lon msgsn
+
+	if {$lon > $loe} { set myerror $olderror ; debug.pt/rdengine {[InstReturn]} ; return }
+	if {$loe > $lon} { debug.pt/rdengine {[InstReturn]} ; return }
+
+	# Equal locations, merge the message lists.
+	set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]]
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_error_nonterminal {symbol} {
+	debug.pt/rdengine {[Instruction i_error_nonterminal $symbol]}
+	#  i_error_nonterminal -- Disabled. Generate only low-level
+	#  i_error_nonterminal -- errors until we have worked out how
+	#  i_error_nonterminal -- to integrate symbol information with
+	#  i_error_nonterminal -- them. Do not forget where this
+	#  i_error_nonterminal -- instruction is inlined.
+	return
+
+	# Inlined: Errors, Expected.
+	if {![llength $myerror]} {
+	    debug.pt/rdengine {no error}
+	    return
+	}
+	set pos [$mystackloc peek]
+	incr pos
+	lassign $myerror loc messages
+	if {$loc != $pos} {
+	    debug.pt/rdengine {my $myerror != pos $pos}
+	    return
+	}
+	set myerror [list $loc [list [list n $symbol]]]
+
+	debug.pt/rdengine {::= ($myerror)}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ##  API - Instructions - Basic input handling and tracking
+
+    method i_loc_pop_rewind/discard {} {
+	debug.pt/rdengine {[Instruction i_loc_pop_rewind/discard]}
+	#$myparser i:fail_loc_pop_rewind
+	#$myparser i:ok_loc_pop_discard
+	#return
+	set last [$mystackloc pop]
+	if {!$myok} {
+	    set myloc $last
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_loc_pop_discard {} {
+	debug.pt/rdengine {[Instruction i_loc_pop_discard]}
+	$mystackloc pop
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i:ok_loc_pop_discard {} {
+	debug.pt/rdengine {[Instruction i:ok_loc_pop_discard]}
+	if {$myok} {
+	    $mystackloc pop
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_loc_pop_rewind {} {
+	debug.pt/rdengine {[Instruction i_loc_pop_rewind]}
+	set myloc [$mystackloc pop]
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i:fail_loc_pop_rewind {} {
+	debug.pt/rdengine {[Instruction i:fail_loc_pop_rewind]}
+	if {!$myok} {
+	    set myloc [$mystackloc pop]
+	}
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_loc_push {} {
+	debug.pt/rdengine {[Instruction i_loc_push]}
+	$mystackloc push $myloc
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_loc_rewind {} {
+	debug.pt/rdengine {[Instruction i_loc_rewind]}
+	# i_loc_pop_rewind - set myloc [$mystackloc pop]
+	# i_loc_push       - $mystackloc push $myloc    
+	set myloc [$mystackloc peek]
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ##  API - Instructions - AST stack handling
+
+    method i_ast_pop_rewind/discard {} {
+	debug.pt/rdengine {[Instruction i_ast_pop_rewind/discard]}
+	#$myparser i:fail_ast_pop_rewind
+	#$myparser i:ok_ast_pop_discard
+	#return
+	set mark [$mystackmark pop]
+	if {!$myok} {
+	    $mystackast trim* $mark
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_ast_pop_discard/rewind {} {
+	debug.pt/rdengine {[Instruction i_ast_pop_discard/rewind]}
+	#$myparser i:ok_ast_pop_rewind
+	#$myparser i:fail_ast_pop_discard
+	#return
+	set mark [$mystackmark pop]
+	if {$myok} {
+	    $mystackast trim* $mark
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_ast_pop_discard {} {
+	debug.pt/rdengine {[Instruction i_ast_pop_discard]}
+	$mystackmark pop
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i:ok_ast_pop_discard {} {
+	debug.pt/rdengine {[Instruction i:ok_ast_pop_discard]}
+	if {$myok} {
+	    $mystackmark pop
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_ast_pop_rewind {} {
+	debug.pt/rdengine {[Instruction i_ast_pop_rewind]}
+	$mystackast trim* [$mystackmark pop]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i:fail_ast_pop_rewind {} {
+	debug.pt/rdengine {[Instruction i:fail_ast_pop_rewind]}
+	if {!$myok} {
+	    $mystackast trim* [$mystackmark pop]
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_ast_push {} {
+	debug.pt/rdengine {[Instruction i_ast_push]}
+	$mystackmark push [$mystackast size]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i:ok_ast_value_push {} {
+	debug.pt/rdengine {[Instruction i:ok_ast_value_push]}
+	if {$myok} {
+	    $mystackast push $mysvalue
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_ast_rewind {} {
+	debug.pt/rdengine {[Instruction i_ast_rewind]}
+	# i_ast_pop_rewind - $mystackast  trim* [$mystackmark pop]
+	# i_ast_push       - $mystackmark push [$mystackast size]
+
+	$mystackast trim* [$mystackmark peek]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## API - Instructions - Nonterminal cache
+
+    method i_symbol_restore {symbol} {
+	debug.pt/rdengine {[Instruction i_symbol_restore $symbol]}
+	# Satisfy from cache if possible.
+	set k [list $myloc $symbol]
+	if {![info exists mysymbol($k)]} {
+	    debug.pt/rdengine {[InstReturn]}
+	    return 0
+	}
+	lassign $mysymbol($k) myloc myok myerror mysvalue
+	# We go forward, as the nonterminal matches (or not).
+	debug.pt/rdengine {[InstReturn]}
+	return 1
+    }
+
+    method i_symbol_save {symbol} {
+	debug.pt/rdengine {[Instruction i_symbol_save $symbol]}
+	# Store not only the value, but also how far
+	# the match went (if it was a match).
+	set at [$mystackloc peek]
+	set k  [list $at $symbol]
+	set mysymbol($k) [list $myloc $myok $myerror $mysvalue]
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ##  API - Instructions - Semantic values.
+
+    method i_value_clear {} {
+	debug.pt/rdengine {[Instruction i_value_clear]}
+	set mysvalue {}
+	
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_value_clear/leaf {symbol} {
+	debug.pt/rdengine {[Instruction i_value_clear/leaf $symbol] :: ([expr {[$mystackloc peek]+1}])-@$myloc)}
+
+	# not quite value_lead (guarded, and clear on fail)
+	# Inlined clear, reduce, and optimized.
+	# Clear ; if {$ok} {Reduce $symbol}
+	set mysvalue {}
+        if {$myok} {
+	    set  pos [$mystackloc peek]
+	    incr pos
+
+	    if {($pos - 1) == $myloc} {
+		# The symbol did not process any input. As this is
+		# signaled to be ok (*) we create a node covering an empty
+		# range. (Ad *): Can happen for a RHS using toplevel
+		# operators * or ?.
+		set mysvalue [pt::ast new0 $symbol $pos]
+	    } else {
+		set mysvalue [pt::ast new $symbol $pos $myloc]
+	    }
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_value_clear/reduce {symbol} {
+	debug.pt/rdengine {[Instruction i_value_clear/reduce $symbol]}
+	set mysvalue {}
+	if {$myok} {
+	    set  mark [$mystackmark peek];# Old size of stack before current nt pushed more.
+	    set  newa [expr {[$mystackast size] - $mark}]
+
+	    set  pos  [$mystackloc  peek]
+	    incr pos
+
+	    if {!$newa} {
+		set mysvalue {}
+	    } elseif {$newa == 1} {
+		# peek 1 => single element comes back
+		set mysvalue [list [$mystackast peek]]     ; # SaveToMark
+	    } else {
+		# peek n > 1 => list of elements comes back
+		set mysvalue [$mystackast peekr $newa]     ; # SaveToMark
+	    }
+
+	    if {($pos - 1) == $myloc} {
+		# The symbol did not process any input. As this is
+		# signaled to be ok (*) we create a node covering an empty
+		# range. (Ad *): Can happen for a RHS using toplevel
+		# operators * or ?.
+		set mysvalue [pt::ast new0 $symbol $pos {*}$mysvalue]
+	    } else {
+		set mysvalue [pt::ast new $symbol $pos $myloc {*}$mysvalue] ; # Reduce $symbol
+	    }
+	}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## API - Instructions - Terminal matching
+
+    method i_input_next {msg} {
+	debug.pt/rdengine {[Instruction i_input_next $msg]}
+	# Inlined: Getch, Expected, ClearErrors
+	# Satisfy from input cache if possible.
+
+	incr myloc
+	# May read from the input (ExtendTC), and remember the
+	# information. Note: We are implicitly incrementing the
+	# location!
+	if {($myloc >= [string length $mytoken]) && ![ExtendTC]} {
+	    set myok    0
+	    set myerror [list $myloc [list $msg]]
+
+	    debug.pt/rdengine {[InstReturn]}
+	    return
+	}
+	set mycurrent [string index $mytoken $myloc]
+
+	set myok    1
+	set myerror {}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_char {tok} {
+	debug.pt/rdengine {[Instruction i_test_char $tok] :: ok [expr {$tok eq $mycurrent}], [expr {$tok eq $mycurrent ? "@$myloc" : "back@[expr {$myloc-1}]"}]}
+	set myok [expr {$tok eq $mycurrent}]
+	OkFailD {pt::pe terminal $tok}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_range {toks toke} {
+	debug.pt/rdengine {[Instruction i_test_range $toks $toke]}
+	set myok [expr {
+			([string compare $toks $mycurrent] <= 0) &&
+			([string compare $mycurrent $toke] <= 0)
+		    }] ; # {}
+	OkFailD {pt::pe range $toks $toke}
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_alnum {} {
+	debug.pt/rdengine {[Instruction i_test_alnum]}
+	set myok [string is alnum -strict $mycurrent]
+	OkFail alnum
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_alpha {} {
+	debug.pt/rdengine {[Instruction i_test_alpha]}
+	set myok [string is alpha -strict $mycurrent]
+	OkFail alpha
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_ascii {} {
+	debug.pt/rdengine {[Instruction i_test_ascii]}
+	set myok [string is ascii -strict $mycurrent]
+	OkFail ascii
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_control {} {
+	debug.pt/rdengine {[Instruction i_test_control]}
+	set myok [string is control -strict $mycurrent]
+	OkFail control
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_ddigit {} {
+	debug.pt/rdengine {[Instruction i_test_ddigit]}
+	set myok [string match {[0-9]} $mycurrent]
+	OkFail ddigit
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_digit {} {
+	debug.pt/rdengine {[Instruction i_test_digit]}
+	set myok [string is digit -strict $mycurrent]
+	OkFail digit
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_graph {} {
+	debug.pt/rdengine {[Instruction i_test_graph]}
+	set myok [string is graph -strict $mycurrent]
+	OkFail graph
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_lower {} {
+	debug.pt/rdengine {[Instruction i_test_lower]}
+	set myok [string is lower -strict $mycurrent]
+	OkFail lower
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_print {} {
+	debug.pt/rdengine {[Instruction i_test_print]}
+	set myok [string is print -strict $mycurrent]
+	OkFail print
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_punct {} {
+	debug.pt/rdengine {[Instruction i_test_punct]}
+	set myok [string is punct -strict $mycurrent]
+	OkFail punct
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_space {} {
+	debug.pt/rdengine {[Instruction i_test_space]}
+	set myok [string is space -strict $mycurrent]
+	OkFail space
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_upper {} {
+	debug.pt/rdengine {[Instruction i_test_upper]}
+	set myok [string is upper -strict $mycurrent]
+	OkFail upper
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_wordchar {} {
+	debug.pt/rdengine {[Instruction i_test_wordchar]}
+	set myok [string is wordchar -strict $mycurrent]
+	OkFail wordchar
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    method i_test_xdigit {} {
+	debug.pt/rdengine {[Instruction i_test_xdigit]}
+	set myok [string is xdigit -strict $mycurrent]
+	OkFail xdigit
+
+	debug.pt/rdengine {[InstReturn]}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## Internals
+
+    proc ExtendTC {} {
+	upvar 1 mychan mychan mytoken mytoken
+
+	if {($mychan eq {}) ||
+	    [eof $mychan]} {return 0}
+
+	set ch [read $mychan 1]
+	if {$ch eq {}} {
+	    return 0
+	}
+
+	append mytoken $ch
+	return 1
+    }
+
+    proc ExtendTCN {n} {
+	upvar 1 mychan mychan mytoken mytoken
+
+	if {($mychan eq {}) ||
+	    [eof $mychan]} {return 0}
+
+	set str [read $mychan $n]
+	set k   [string length $str]
+
+	append mytoken $str
+	if {$k < $n} {
+	    return 0
+	}
+
+	return 1
+    }
+
+    proc OkFail {msg} {
+	upvar 1 myok myok myerror myerror myloc myloc
+	# Inlined: Expected, Unget, ClearErrors
+	if {!$myok} {
+	    set myerror [list $myloc [list $ourmsg($msg)]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	return
+    }
+
+    proc OkFailD {msgcmd} {
+	upvar 1 myok myok myerror myerror myloc myloc
+	# Inlined: Expected, Unget, ClearErrors
+	if {!$myok} {
+	    set myerror [list $myloc [list [uplevel 1 $msgcmd]]]
+	    incr myloc -1
+	} else {
+	    set myerror {}
+	}
+	return
+    }
+
+    # # ## ### ##### ######## ############# #####################
+    ## Data structures.
+    ## Mainly the architectural state of the instance's PARAM.
+
+    # # ## ### ###### ######## #############
+    ## Configuration
+
+    pragma -hastypeinfo    0
+    pragma -hastypemethods 0
+    pragma -hasinfo        0
+
+    #pragma -simpledispatch 1 ; # Cannot use this. Doing so breaks
+    #                           # the use of 'return -code XXX' in
+    #                           # the guarded control flow
+    #                           # instructions, i.e.
+    #                           # i:{ok,fail}_{continue,return}.
+
+    typevariable ourmsg -array {}
+
+    typeconstructor {
+	debug.pt/rdengine {}
+
+	set ourmsg(alnum)     [pt::pe alnum]
+	set ourmsg(alpha)     [pt::pe alpha]
+	set ourmsg(ascii)     [pt::pe ascii]
+	set ourmsg(control)   [pt::pe control]
+	set ourmsg(ddigit)    [pt::pe ddigit]
+	set ourmsg(digit)     [pt::pe digit]
+	set ourmsg(graph)     [pt::pe graph]
+	set ourmsg(lower)     [pt::pe lower]
+	set ourmsg(print)     [pt::pe printable]
+	set ourmsg(punct)     [pt::pe punct]
+	set ourmsg(space)     [pt::pe space]
+	set ourmsg(upper)     [pt::pe upper]
+	set ourmsg(wordchar)  [pt::pe wordchar]
+	set ourmsg(xdigit)    [pt::pe xdigit]
+
+	debug.pt/rdengine {/done}
+	return
+    }
+
+    # Parser Input (channel, location (line, column)) ...........
+
+    variable mychan          {} ; # IN. Channel we read the characters
+				  # from. Its current location is
+				  # where the next character will be
+				  # read from, when needed.
+
+    # Token, current parsing location, stack of locations .......
+
+    variable mycurrent       {} ; # CC. Current character.
+    variable myloc           -1 ; # CL. Location of 'mycurrent' as
+				  # offset in the input, relative to
+				  # the starting location.
+    variable mystackloc      {} ; # LS. Stack object holding parsing
+				  # location, see i_loc_mark_set,
+				  # i_loc_mark_rewind,
+				  # i_loc_mark_drop, and
+				  # i_value_(leaf,range,reduce)
+
+    # Match state .  ........ ............. .....................
+
+    variable myok             0 ; # ST. Boolean flag indicating the
+				  # success (true) or failure
+				  # (failure) of the last match
+				  # operation.
+    variable mysvalue        {} ; # SV. The semantic value produced by
+				  # the last match.
+    variable myerror         {} ; # ER. Error information for the last
+				  # match. Empty string if the match
+				  # was ok, otherwise list (location,
+				  # list (message...)).
+    variable mystackerr      {} ; # ES. Stack object holding saved
+				  # error states, see i_error_mark,
+				  # i_error_merge
+
+    # Caches for tokens and nonterminals .. .....................
+
+    # list(list(char line col value))
+    variable mytoken         {} ; # TC. String of all read characters,
+				  # the tokens.
+    variable mysymbol -array {} ; # NC. Cache of data about
+				  # nonterminal symbols. Indexed by
+				  # location and symbol name, value is
+				  # a 4-tuple (go, ok, error, sv)
+
+    # Abstract syntax tree (AST) .......... .....................
+    # AS/ARS intertwined. ARS is top of mystackast, with the markers
+    # on mystackmark showing there ARS ends and AS with older ARS
+    # begins.
+
+    variable mystackast      {} ; # ARS. Stack of semantic values
+				  # (i.e. partial ASTs) to use in
+				  # further AST construction, see
+				  # i_ast_push, and i_ast_pop2mark.
+    variable mystackmark     {} ; # AS. Stack of locations into the
+				  # previous stack, see
+				  # i_ast_mark_set,
+				  # i_ast_mark_discard, and
+				  # i_ast_mark_rewind.
+
+    # # ## ### ##### ######## ############# #####################
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready, return to manager.
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_tclparam_config_nx.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_tclparam_config_nx.tcl
new file mode 100644
index 00000000..5dc7cf6e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_tclparam_config_nx.tcl
@@ -0,0 +1,113 @@
+# -*- tcl -*-
+# Copyright (c) 2009-2014 Andreas Kupries <andreas_kupries@sourceforge.net>
+# Copyright (c) 2016 Stefan Sobernig <stefan.sobernig@wu.ac.at>
+
+# Canned configuration for the converter to Tcl/PARAM representation,
+# causing generation of a proper NX class.
+
+# The requirements of the embedded template are not our requirements.
+# @mdgen NODEP: nx
+# @mdgen NODEP: pt::rde::nx
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.5              ; # Required runtime.
+
+# # ## ### ##### ######## ############# #####################
+##
+
+namespace eval ::pt::tclparam::configuration::nx {
+    namespace export   def
+    namespace ensemble create
+}
+
+# # ## ### ##### ######## #############
+## Public API
+
+# Check that the proposed serialization of an abstract syntax tree is
+# indeed such.
+
+proc ::pt::tclparam::configuration::nx::def {class pkg version cmd} {
+
+    lappend map @@PKG@@     $pkg
+    lappend map @@VERSION@@ $version
+    lappend map @@CLASS@@   $class
+    lappend map \n\t        \n ;# undent the template
+
+    {*}$cmd -runtime-command :
+    {*}$cmd -self-command    :
+    {*}$cmd -proc-command    :method
+    {*}$cmd -prelude         {}
+    {*}$cmd -namespace       {}
+    {*}$cmd -main            MAIN
+    {*}$cmd -indent          4
+    {*}$cmd -template        [string trim \
+				  [string map $map {
+	## -*- tcl -*-
+	##
+	## NX-based Tcl/PARAM implementation of the parsing
+	## expression grammar
+	##
+	##	@name@
+	##
+	## Generated from file	@file@
+	##            for user  @user@
+	##
+	# # ## ### ##### ######## ############# #####################
+	## Requirements
+
+	package require Tcl 8.5
+	package require nx
+	package require pt::rde::nx ; # NX-based implementation of the
+				      # PARAM virtual machine
+				      # underlying the Tcl/PARAM code
+				      # used below.
+
+	# # ## ### ##### ######## ############# #####################
+	##
+
+	nx::Class create @@CLASS@@ -superclasses pt::rde::nx {
+	    # # ## ### ##### ######## #############
+	    ## Public API
+	    
+	    :public method parse {channel} {
+		:reset $channel
+		:MAIN ; # Entrypoint for the generated code.
+		return [:complete]
+	    }
+
+	    :public method parset {text} {
+		:reset {}
+		:data $text
+		:MAIN ; # Entrypoint for the generated code.
+		return [:complete]
+	    }
+
+	    # # ## ### ###### ######## #############
+	    ## BEGIN of GENERATED CODE. DO NOT EDIT.
+
+@code@
+	    ## END of GENERATED CODE. DO NOT EDIT.
+	    # # ## ### ###### ######## #############
+	}
+
+	# # ## ### ##### ######## ############# #####################
+	## Ready
+
+	package provide @@PKG@@ @@VERSION@@
+	return
+    }]]
+
+    return
+}
+
+# # ## ### ##### ######## #############
+
+namespace eval ::pt::tclparam::configuration::nx {}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide pt::tclparam::configuration::nx 1.0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_tclparam_config_snit.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_tclparam_config_snit.tcl
new file mode 100644
index 00000000..806253f9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_tclparam_config_snit.tcl
@@ -0,0 +1,141 @@
+# -*- tcl -*-
+# Copyright (c) 2009-2014 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Canned configuration for the converter to Tcl/PARAM representation,
+# causing generation of a proper snit class.
+
+# The requirements of the embedded template are not our requirements.
+# @mdgen NODEP: snit
+# @mdgen NODEP: pt::rde
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.5              ; # Required runtime.
+
+# # ## ### ##### ######## ############# #####################
+##
+
+namespace eval ::pt::tclparam::configuration::snit {
+    namespace export   def
+    namespace ensemble create
+}
+
+# # ## ### ##### ######## #############
+## Public API
+
+# Check that the proposed serialization of an abstract syntax tree is
+# indeed such.
+
+proc ::pt::tclparam::configuration::snit::def {class pkg version cmd} {
+
+    # TODO :: See if we can consolidate the API for converters,
+    # TODO :: plugins, export manager, and container in some way.
+    # TODO :: Container may make exporter manager available through
+    # TODO :: public method.
+
+    # class : is actually the name of the package to generate, and
+    #         will be prefixed with :: to make it a proper absolute
+    #         class and Tcl namespace name.
+
+    lappend map @@PKG@@     $pkg
+    lappend map @@VERSION@@ $version
+    lappend map @@CLASS@@   $class
+    lappend map \n\t        \n ;# undent the template
+
+    {*}$cmd -runtime-command {$myparser}
+    #{*}$cmd -self-command    {$self}
+    #{*}$cmd -proc-command    method
+    {*}$cmd -self-command    {}
+    {*}$cmd -proc-command    proc
+    {*}$cmd -prelude         {upvar 1 myparser myparser}
+    {*}$cmd -namespace       {}
+    {*}$cmd -main            MAIN
+    {*}$cmd -indent          4
+    {*}$cmd -template        [string trim \
+				  [string map $map {
+	## -*- tcl -*-
+	##
+	## Snit-based Tcl/PARAM implementation of the parsing
+	## expression grammar
+	##
+	##	@name@
+	##
+	## Generated from file	@file@
+	##            for user  @user@
+	##
+	# # ## ### ##### ######## ############# #####################
+	## Requirements
+
+	package require Tcl 8.5
+	package require snit
+	package require pt::rde ; # Implementation of the PARAM
+				  # virtual machine underlying the
+				  # Tcl/PARAM code used below.
+
+	# # ## ### ##### ######## ############# #####################
+	##
+
+	snit::type ::@@CLASS@@ {
+	    # # ## ### ##### ######## #############
+	    ## Public API
+
+	    constructor {} {
+		# Create the runtime supporting the parsing process.
+		set myparser [pt::rde ${selfns}::ENGINE]
+		return
+	    }
+
+	    method parse {channel} {
+		$myparser reset $channel
+		MAIN ; # Entrypoint for the generated code.
+		return [$myparser complete]
+	    }
+
+	    method parset {text} {
+		$myparser reset
+		$myparser data $text
+		MAIN ; # Entrypoint for the generated code.
+		return [$myparser complete]
+	    }
+
+	    # # ## ### ###### ######## #############
+	    ## Configuration
+
+	    pragma -hastypeinfo    0
+	    pragma -hastypemethods 0
+	    pragma -hasinfo        0
+	    pragma -simpledispatch 1
+
+	    # # ## ### ###### ######## #############
+	    ## Data structures.
+
+	    variable myparser {} ; # Our instantiation of the PARAM.
+
+	    # # ## ### ###### ######## #############
+	    ## BEGIN of GENERATED CODE. DO NOT EDIT.
+
+@code@
+	    ## END of GENERATED CODE. DO NOT EDIT.
+	    # # ## ### ###### ######## #############
+	}
+
+	# # ## ### ##### ######## ############# #####################
+	## Ready
+
+	package provide @@PKG@@ @@VERSION@@
+	return
+    }]]
+
+    return
+}
+
+# # ## ### ##### ######## #############
+
+namespace eval ::pt::tclparam::configuration::snit {}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide pt::tclparam::configuration::snit 1.0.2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_tclparam_config_tcloo.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_tclparam_config_tcloo.tcl
new file mode 100644
index 00000000..3e2d152b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_tclparam_config_tcloo.tcl
@@ -0,0 +1,121 @@
+# -*- tcl -*-
+# Copyright (c) 2009-2014 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Canned configuration for the converter to Tcl/PARAM representation,
+# causing generation of a proper TclOO class.
+
+# The requirements of the embedded template are not our requirements.
+# @mdgen NODEP: TclOO
+# @mdgen NODEP: pt::rde::oo
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.5              ; # Required runtime.
+
+# # ## ### ##### ######## ############# #####################
+##
+
+namespace eval ::pt::tclparam::configuration::tcloo {
+    namespace export   def
+    namespace ensemble create
+}
+
+# # ## ### ##### ######## #############
+## Public API
+
+# Check that the proposed serialization of an abstract syntax tree is
+# indeed such.
+
+proc ::pt::tclparam::configuration::tcloo::def {class pkg version cmd} {
+
+    # TODO :: See if we can consolidate the API for converters,
+    # TODO :: plugins, export manager, and container in some way.
+    # TODO :: Container may make exporter manager available through
+    # TODO :: public method.
+
+    lappend map @@PKG@@     $pkg
+    lappend map @@VERSION@@ $version
+    lappend map @@CLASS@@   $class
+    lappend map \n\t        \n ;# undent the template
+
+    {*}$cmd -runtime-command my
+    {*}$cmd -self-command    my
+    {*}$cmd -proc-command    method
+    {*}$cmd -prelude         {}
+    {*}$cmd -namespace       {}
+    {*}$cmd -main            MAIN
+    {*}$cmd -indent          4
+    {*}$cmd -template        [string trim \
+				  [string map $map {
+	## -*- tcl -*-
+	##
+	## OO-based Tcl/PARAM implementation of the parsing
+	## expression grammar
+	##
+	##	@name@
+	##
+	## Generated from file	@file@
+	##            for user  @user@
+	##
+	# # ## ### ##### ######## ############# #####################
+	## Requirements
+
+	package require Tcl 8.5
+	package require TclOO
+	package require pt::rde::oo ; # OO-based implementation of the
+				      # PARAM virtual machine
+				      # underlying the Tcl/PARAM code
+				      # used below.
+
+	# # ## ### ##### ######## ############# #####################
+	##
+
+	oo::class create @@CLASS@@ {
+	    # # ## ### ##### ######## #############
+	    ## Public API
+
+	    superclass pt::rde::oo ; # TODO - Define this class.
+	                             # Or can we inherit from a snit
+	                             # class too ?
+
+	    method parse {channel} {
+		my reset $channel
+		my MAIN ; # Entrypoint for the generated code.
+		return [my complete]
+	    }
+
+	    method parset {text} {
+		my reset {}
+		my data $text
+		my MAIN ; # Entrypoint for the generated code.
+		return [my complete]
+	    }
+
+	    # # ## ### ###### ######## #############
+	    ## BEGIN of GENERATED CODE. DO NOT EDIT.
+
+@code@
+	    ## END of GENERATED CODE. DO NOT EDIT.
+	    # # ## ### ###### ######## #############
+	}
+
+	# # ## ### ##### ######## ############# #####################
+	## Ready
+
+	package provide @@PKG@@ @@VERSION@@
+	return
+    }]]
+
+    return
+}
+
+# # ## ### ##### ######## #############
+
+namespace eval ::pt::tclparam::configuration::tcloo {}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide pt::tclparam::configuration::tcloo 1.0.4
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_util.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_util.tcl
new file mode 100644
index 00000000..ed39663c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/pt_util.tcl
@@ -0,0 +1,160 @@
+# -*- tcl -*-
+# Copyright (c) 2014 Andreas Kupries <andreas_kupries@sourceforge.net>
+
+# Utility commands for parser syntax errors.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.5 ; # Required runtime.
+package require char
+
+# # ## ### ##### ######## ############# #####################
+##
+
+namespace eval ::pt::util {
+    namespace export error2readable error2position error2text
+    namespace ensemble create
+
+    namespace import ::char::quote
+}
+
+# # ## ### ##### ######## #############
+## Public API
+
+proc ::pt::util::error2readable {error text} {
+    lassign $error _ location msgs
+    lassign [Position $location $text] l c
+
+    lappend map \n \\n
+    lappend map \r \\r
+    lappend map \t \\t
+
+    # Get 10 chars before and after the failure point.  Depending on
+    # the relative position of input beginning and end we may get less
+    # back of either.  Special characters in the input (line endings,
+    # tabs) are quoted to keep this on a single line.
+    set prefix [string map $map [string range $text ${location}-10 $location]]
+    set suffix [string map $map [string range $text ${location}+1 ${location}+10]]
+
+    # Construct a line pointing to the failure position. By using the
+    # transformed prefix as our source (length) no complex
+    # calculations are required. It is implicit in the prefix/suffix
+    # separation above.
+    set  n [string length $prefix]
+    incr n -1
+    set point [string repeat - $n]
+    append point ^
+
+    # Print our results.
+    lappend lines "Parse error at position $location (Line $l, column $c)."
+    lappend lines "... ${prefix}${suffix} ..."
+    lappend lines "    $point"
+    lappend lines "Expected one of"
+    lappend lines "* [join [Readables $msgs] "\n* "]"
+    lappend lines ""
+
+    return [join $lines \n]
+}
+
+proc ::pt::util::error2position {error text} {
+    lassign $error _ location msgs
+    return [Position $location $text]
+}
+
+proc ::pt::util::error2text {error} {
+    lassign $error _ location msgs
+    return [Readables $msgs]
+}
+
+# # ## ### ##### ######## #############
+## Internals
+
+proc ::pt::util::Position {location text} {
+    incr location -1
+
+    # Computing the line/col of a position is quite easy. Split the
+    # part before the location into lines (at eol), count them, and
+    # look at the length of the last line in that.
+
+    set prefix [string range $text 0 $location]
+    set lines  [split $prefix \n]
+    set line   [llength $lines]
+    set col    [string length [lindex $lines end]]
+
+    return [list $line $col]
+}
+
+proc ::pt::util::Readables {msgs} {
+    set cl {}
+    set r {}
+    foreach pe $msgs {
+	switch -exact -- [lindex $pe 0] {
+	    t {
+		# Fuse to multiple 't'-tags into a single 'cl'-tag.
+		lappend cl [lindex $pe 1]
+	    }
+	    cl {
+		# Fuse multiple 'cl'-tags into one.
+		foreach c [split [lindex $pe 1]] { lappend cl $c }
+	    }
+	    default {
+		lappend r [Readable $pe]
+	    }
+	}
+    }
+    if {[set n [llength $cl]]} {
+	if {$n > 1} {
+	    lappend r [Readable [list cl [join [lsort -dict $cl] {}]]]
+	} else {
+	    lappend r [Readable [list t [lindex $cl 0]]]
+	}
+    }
+    return [lsort -dict $r]
+}
+
+proc ::pt::util::Readable {pe} {
+    set details [lassign $pe tag]
+    switch -exact -- $tag {
+	t        {
+	    set details [quote string {*}$details]
+	    set m "The character '$details'"
+	}
+	n        { set m "The symbol $details" }
+	..       {
+	    set details [quote string {*}$details]
+	    set m "A character in range '[join $details '-']'"
+	}
+	str      {
+	    set details [join [quote string {*}[split $details {}]] {}]
+	    set m "A string \"$details\""
+	}
+	cl       {
+	    set details [join [quote string {*}[split $details {}]] {}]
+	    set m "A character in set \{$details\}"
+	}
+	alpha    { set m "A unicode alphabetical character" }
+	alnum    { set m "A unicode alphanumerical character" }
+	ascii    { set m "An ascii character" }
+	digit    { set m "A unicode digit character" }
+	graph    { set m "A unicode printing character, but not space" }
+	lower    { set m "A unicode lower-case alphabetical character" }
+	print    { set m "A unicode printing character, including space" }
+	control  { set m "A unicode control character" }
+	punct    { set m "A unicode punctuation character" }
+	space    { set m "A unicode space character" }
+	upper    { set m "A unicode upper-case alphabetical character" }
+	wordchar { set m "A unicode word character (alphanumerics + connectors)" }
+	xdigit   { set m "A hexadecimal digit" }
+	ddigit   { set m "A decimal digit" }
+	dot      { set m "Any character" }
+	default  { set m [string totitle $tag] }
+    }
+    return $m
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide pt::util 1.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/m.c b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/m.c
new file mode 100644
index 00000000..9a56bc62
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/m.c
@@ -0,0 +1,2746 @@
+/* pt::rde::critcl - critcl - layer 3 definitions.
+ *
+ * -> Method functions.
+ *    Implementations for all state methods.
+ */
+
+#include <m.h>    /* Our public API */
+#include <pInt.h> /* State public and internal APIs */
+#include <ot.h>   /* Tcl_Objype for interned strings. */
+#include <util.h> /* Allocation utilities */
+#include <string.h>
+
+/* .................................................. */
+
+int
+param_AMARKED (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde amarked
+     *         [0] [1]
+     */
+
+    long int mc, i;
+    void**   mv;
+    Tcl_Obj** ov;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_query_amark (p->p, &mc, &mv);
+
+    ov = NALLOC (mc, Tcl_Obj*);
+
+    for (i=0; i < mc; i++) {
+	ov [i] = Tcl_NewIntObj ((long int) mv [i]);
+    }
+
+    Tcl_SetObjResult (interp,
+		      Tcl_NewListObj (mc, ov));
+
+    ckfree ((char*) ov);
+
+    return TCL_OK;
+}
+
+int
+param_AST (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde ast
+     *         [0] [1]
+     */
+
+    long int  ac;
+    Tcl_Obj** av;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_query_ast (p->p, &ac, &av);
+
+    Tcl_SetObjResult (interp, av [ac-1]);
+
+    return TCL_OK;
+}
+
+int
+param_ASTS (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde asts
+     *         [0] [1]
+     */
+
+    long int  ac;
+    Tcl_Obj** av;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_query_ast (p->p, &ac, &av);
+
+    Tcl_SetObjResult (interp, Tcl_NewListObj (ac, av));
+
+    return TCL_OK;
+}
+
+int
+param_CHAN (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde chan
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    Tcl_SetObjResult (interp,
+		      Tcl_NewStringObj (rde_param_query_in (p->p),
+					-1));
+
+    return TCL_OK;
+}
+
+int
+param_COMPLETE (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* See also pt_cparam_config_critcl.tcl, COMPLETE().
+     * Syntax: rde complete
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (rde_param_query_st (p->p)) {
+	long int  ac;
+	Tcl_Obj** av;
+
+	rde_param_query_ast (p->p, &ac, &av);
+
+	if (ac > 1) {
+	    Tcl_Obj** lv = NALLOC (3+ac, Tcl_Obj*);
+
+	    memcpy(lv + 3, av, ac * sizeof (Tcl_Obj*));
+	    lv [0] = Tcl_NewObj ();
+	    lv [1] = Tcl_NewIntObj (1 + rde_param_query_lstop (p->p));
+	    lv [2] = Tcl_NewIntObj (rde_param_query_cl (p->p));
+
+	    Tcl_SetObjResult (interp, Tcl_NewListObj (3, lv));
+	    ckfree ((char*) lv);
+	} else if (ac == 0) {
+	    /*
+	     * Match, but no AST. This is possible if the grammar consists of
+	     * only the start expression.
+	     */
+	    Tcl_SetObjResult (interp, Tcl_NewStringObj ("",-1));
+	} else {
+	    Tcl_SetObjResult (interp, av [0]);
+	}
+
+	return TCL_OK;
+
+    } else {
+	Tcl_Obj* xv [1];
+	const ERROR_STATE* er = rde_param_query_er (p->p);
+	Tcl_Obj* res = rde_param_query_er_tcl (p->p, er);
+	/* res = list (location, list(msg)) */
+
+	/* Stick the exception type-tag before the existing elements */
+	xv [0] = Tcl_NewStringObj ("pt::rde",-1);
+	Tcl_ListObjReplace(interp, res, 0, 0, 1, xv);
+
+	Tcl_SetErrorCode (interp, "PT", "RDE", "SYNTAX", NULL);
+	Tcl_SetObjResult (interp, res);
+	return TCL_ERROR;
+    }
+}
+
+int
+param_CURRENT (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde current
+     *         [0] [1]
+     */
+
+    const char* ch;
+    long int    len;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    ch = rde_param_query_cc (p->p, &len);
+    Tcl_SetObjResult (interp, Tcl_NewStringObj (ch, len));
+
+    return TCL_OK;
+}
+
+int
+param_DATA (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde data DATA
+     *         [0] [1]  [2]
+     */
+
+    char* buf;
+    int len;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "data");
+	return TCL_ERROR;
+    }
+
+    buf = Tcl_GetStringFromObj (objv [2], &len);
+
+    rde_param_data (p->p, buf, len);
+
+    return TCL_OK;
+}
+
+int
+param_DESTROY (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde destroy
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    Tcl_DeleteCommandFromToken(interp, p->c);
+    return TCL_OK;
+}
+
+int
+param_EMARKED (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde emarked
+     *         [0] [1]
+     */
+
+    long int      ec, i;
+    ERROR_STATE** ev;
+    Tcl_Obj**     ov;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_query_es (p->p, &ec, &ev);
+
+    ov = NALLOC (ec, Tcl_Obj*);
+
+    for (i=0; i < ec; i++) {
+	ov [i] = rde_param_query_er_tcl (p->p, ev [i]);
+    }
+
+    Tcl_SetObjResult (interp, Tcl_NewListObj (ec, ov));
+
+    ckfree ((char*) ov);
+
+    return TCL_OK;
+}
+
+int
+param_ERROR (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde error
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    Tcl_SetObjResult (interp, 
+		      rde_param_query_er_tcl (p->p,
+			      rde_param_query_er (p->p)));
+    return TCL_OK;
+}
+
+int
+param_LMARKED (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde lmarked
+     *         [0] [1]
+     */
+
+    long int  lc, i;
+    void**    lv;
+    Tcl_Obj** ov;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_query_ls (p->p, &lc, &lv);
+
+    ov = NALLOC (lc, Tcl_Obj*);
+
+    for (i=0; i < lc; i++) {
+	ov [i] = Tcl_NewIntObj ((long int) lv [i]);
+    }
+
+    Tcl_SetObjResult (interp, Tcl_NewListObj (lc, ov));
+
+    ckfree ((char*) ov);
+    return TCL_OK;
+}
+
+int
+param_LOCATION (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde location
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    Tcl_SetObjResult (interp,
+		      Tcl_NewIntObj (rde_param_query_cl (p->p)));
+
+    return TCL_OK;
+}
+
+int
+param_OK (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde ok
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    Tcl_SetObjResult (interp,
+		      Tcl_NewIntObj (rde_param_query_st (p->p)));
+
+    return TCL_OK;
+}
+
+int
+param_RESET (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde reset ?CHAN?
+     *         [0] [1]   [2]
+     */
+
+    int mode;
+    Tcl_Channel chan;
+
+    if ((objc != 3) && (objc != 2)) {
+	Tcl_WrongNumArgs (interp, 2, objv, "?chan?");
+	return TCL_ERROR;
+    }
+
+    /*
+     * Can't use TclGetChannelFromObj, nice as it would be. This fucntion is
+     * not part of Tcl's public C API.
+     */
+
+    if (objc == 2) {
+	chan = NULL;
+    } else {
+	chan = Tcl_GetChannel(interp,
+			      Tcl_GetString (objv[2]),
+			      &mode);
+
+	if (!chan) {
+	    return TCL_ERROR;
+	}
+    }
+
+    rde_param_reset (p->p, chan);
+
+    return TCL_OK;
+}
+
+int
+param_SCACHED (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde scached
+     *         [0] [1]
+     */
+
+    Tcl_HashTable* nc;
+    Tcl_Obj* res;
+    Tcl_HashSearch hs;
+    Tcl_HashEntry* he;
+    Tcl_HashTable* tablePtr;
+    Tcl_Obj* kv [2];
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    nc  = rde_param_query_nc (p->p);
+    res = Tcl_NewListObj (0, NULL);
+
+    for(he = Tcl_FirstHashEntry(nc, &hs);
+	he != NULL;
+	he = Tcl_NextHashEntry(&hs)) {
+
+	Tcl_HashSearch hsc;
+	Tcl_HashEntry* hec;
+	long int loc = (long int) Tcl_GetHashKey (nc, he);
+
+	kv [0]   = Tcl_NewIntObj (loc);
+	tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (he);
+
+	for(hec = Tcl_FirstHashEntry(tablePtr, &hsc);
+	    hec != NULL;
+	    hec = Tcl_NextHashEntry(&hsc)) {
+
+	    long int    symid = (long int) Tcl_GetHashKey (tablePtr, hec);
+	    const char* sym   = rde_param_query_string (p->p, symid);
+
+	    kv [1] = Tcl_NewStringObj (sym,-1);
+
+	    Tcl_ListObjAppendElement (interp, res,
+				      Tcl_NewListObj (2, kv));
+	}
+    }
+
+    Tcl_SetObjResult (interp, res);
+    return TCL_OK;
+}
+
+int
+param_SYMBOLS (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde symbols
+     *         [0] [1]
+     */
+
+    Tcl_HashTable* nc;
+    Tcl_Obj* res;
+    Tcl_HashSearch hs;
+    Tcl_HashEntry* he;
+    Tcl_HashTable* tablePtr;
+    Tcl_Obj* kv [2];
+    Tcl_Obj* vv [4];
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    nc  = rde_param_query_nc (p->p);
+    res = Tcl_NewListObj (0, NULL);
+
+    for(he = Tcl_FirstHashEntry(nc, &hs);
+	he != NULL;
+	he = Tcl_NextHashEntry(&hs)) {
+
+	Tcl_HashSearch hsc;
+	Tcl_HashEntry* hec;
+	long int loc = (long int) Tcl_GetHashKey (nc, he);
+
+	kv [0]   = Tcl_NewIntObj (loc);
+	tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (he);
+
+	for(hec = Tcl_FirstHashEntry(tablePtr, &hsc);
+	    hec != NULL;
+	    hec = Tcl_NextHashEntry(&hsc)) {
+
+	    NC_STATE*   scs   = Tcl_GetHashValue (hec);
+	    long int    symid = (long int) Tcl_GetHashKey (tablePtr, hec);
+	    const char* sym   = rde_param_query_string (p->p, symid);
+
+	    kv [1] = Tcl_NewStringObj (sym,-1);
+
+	    vv [0] = Tcl_NewIntObj (scs->CL);
+	    vv [1] = Tcl_NewIntObj (scs->ST);
+	    vv [2] = rde_param_query_er_tcl (p->p, scs->ER);
+	    vv [3] = (scs->SV ? scs->SV : Tcl_NewObj ());
+
+	    Tcl_ListObjAppendElement (interp, res, Tcl_NewListObj (2, kv));
+	    Tcl_ListObjAppendElement (interp, res, Tcl_NewListObj (4, vv));
+	}
+    }
+
+    Tcl_SetObjResult (interp, res);
+
+    return TCL_OK;
+}
+
+int
+param_TOKENS (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde tokens ?FROM ?TO??
+     *         [0] [1]    [2]   [3]
+     */
+
+    long int num, from, to;
+
+    if ((objc < 2) || (objc > 4)) {
+	Tcl_WrongNumArgs (interp, 2, objv, "?from? ?to?");
+	return TCL_ERROR;
+    }
+
+    num = rde_param_query_tc_size (p->p);
+
+    if (objc == 2) {
+	from = 0;
+	to   = num - 1;
+    } else if (objc == 3) {
+
+	if (Tcl_GetLongFromObj (interp, objv [2], &from) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	to = from;
+
+    } else { /* objc == 4 */
+	if (Tcl_GetLongFromObj (interp, objv [2], &from) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	if (Tcl_GetLongFromObj (interp, objv [3], &to) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+    }
+
+    if (from < 0)  { from = 0; }
+    if (to >= num) { to = num-1; }
+
+    if (to < from) {
+	Tcl_SetObjResult (interp, Tcl_NewObj ());
+    } else {
+	long int len;
+	char* buf;
+
+	rde_param_query_tc_get_s (p->p, from, to, &buf, &len);
+
+	Tcl_SetObjResult (interp, Tcl_NewStringObj (buf,len));
+    }
+
+    return TCL_OK;
+}
+
+int
+param_VALUE (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde value
+     *         [0] [1]
+     */
+
+    Tcl_Obj* sv;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    sv = rde_param_query_sv (p->p);
+    if (!sv) {
+	sv = Tcl_NewObj ();
+    }
+
+    Tcl_SetObjResult (interp, sv);
+
+    return TCL_OK;
+}
+
+/* .................................................. */
+
+int
+param_F_continue (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i:fail_continue
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (!rde_param_query_st (p->p)) {
+	return TCL_CONTINUE;
+    }
+
+    return TCL_OK;
+}
+
+int
+param_F_return (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i:fail_return
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (!rde_param_query_st (p->p)) {
+	return TCL_RETURN;
+    }
+
+    return TCL_OK;
+}
+
+int
+param_O_continue (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i:ok_continue
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (rde_param_query_st (p->p)) {
+	return TCL_CONTINUE;
+    }
+
+    return TCL_OK;
+}
+
+int
+param_O_return (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i:ok_return
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (rde_param_query_st (p->p)) {
+	return TCL_RETURN;
+    }
+
+    return TCL_OK;
+}
+
+int
+param_I_st_fail (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_status_fail
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_status_fail (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_st_neg (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_status_negate
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_status_negate (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_st_ok (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_status_ok
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_status_ok (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_er_clear (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_error_clear
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_clear (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_er_clear_push (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_error_clear
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_clear (p->p);
+    rde_param_i_error_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_er_nt (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_error_nonterminal SYMBOL
+     *         [0] [1]                 [2]
+     */
+
+    long int sym;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    /*
+     * interning: n + space + symbol
+     *
+     * The obj literal here is very likely shared with the arguments of
+     * i_symbol_save/restore, and i_value_leaf/reduce, and derivatives. This
+     * here is the only point between these where we save the string id in the
+     * Tcl_Obj*.
+     */
+
+    sym = rde_ot_intern1 (p, "n", objv [2]);
+    rde_param_i_error_nonterminal (p->p, sym);
+
+    return TCL_OK;
+}
+
+int
+param_I_er_popmerge (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_error_pop_merge
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_pop_merge (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_er_push (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_error_push
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_F_loc_pop_rewind (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i:fail_loc_pop_rewind
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_loc_pop_rewind (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_I_loc_pop_discard (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_loc_pop_discard
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_loc_pop_discard (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_O_loc_pop_discard (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_loc_pop_discard
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_loc_pop_discard (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_I_loc_pop_rewdis (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_loc_pop_rewind/discard
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_loc_pop_rewind (p->p);
+    } else {
+	rde_param_i_loc_pop_discard (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_I_loc_pop_rewind (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_loc_pop_rewind
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_loc_pop_rewind (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_loc_rewind (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_loc_pop_rewind
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_loc_rewind (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_loc_push (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_loc_pop_push
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_loc_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_F_ast_pop_rewind (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i:fail_ast_pop_rewind
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_ast_pop_rewind (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_I_ast_pop_discard (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_ast_pop_discard
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_ast_pop_discard (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_O_ast_pop_discard (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_ast_pop_discard
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_ast_pop_discard (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_I_ast_pop_disrew (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_ast_pop_discard/rewind
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_ast_pop_discard (p->p);
+    } else {
+	rde_param_i_ast_pop_rewind (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_I_ast_pop_rewdis (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_ast_pop_rewind/discard
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_ast_pop_rewind (p->p);
+    } else {
+	rde_param_i_ast_pop_discard (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_I_ast_pop_rewind (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_ast_pop_rewind
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_ast_pop_rewind (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_ast_rewind (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_ast_pop_rewind
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_ast_rewind (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_ast_push (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_ast_push
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_ast_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_O_ast_value_push (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_ast_value_push
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_ast_value_push (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_I_symbol_restore (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_symbol_restore SYMBOL
+     *         [0] [1]              [2]
+     */
+
+    long int sym;
+    int found;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    /*
+     * We cannot save the interned string id in the Tcl_Obj*, because this is
+     * already taken by the argument of param_I_er_nt aka i_error_nonterminal,
+     * due to literal sharing in procedure bodies.
+     */
+
+    sym = param_intern (p, Tcl_GetString (objv [2]));
+    found = rde_param_i_symbol_restore (p->p, sym);
+    Tcl_SetObjResult (interp, Tcl_NewIntObj (found));
+
+    return TCL_OK;
+}
+
+int
+param_I_symbol_save (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_symbol_save SYMBOL
+     *         [0] [1]           [2]
+     */
+
+    long int sym;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    /*
+     * We cannot save the interned string id in the Tcl_Obj*, because this is
+     * already taken by the argument of param_I_er_nt aka i_error_nonterminal,
+     * due to literal sharing in procedure bodies.
+     */
+
+    sym = param_intern (p, Tcl_GetString (objv [2]));
+    rde_param_i_symbol_save (p->p, sym);
+
+    return TCL_OK;
+}
+
+int
+param_I_value_cleaf (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_value_clear/leaf SYMBOL
+     *         [0] [1]                [2]
+     */
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_value_clear (p->p);
+    } else {
+	long int sym;
+
+	/*
+	 * We cannot save the interned string id in the Tcl_Obj*, because this
+	 * is already taken by the argument of param_I_er_nt aka
+	 * i_error_nonterminal, due to literal sharing in procedure bodies.
+	 */
+
+	sym = param_intern (p, Tcl_GetString (objv [2]));
+	rde_param_i_value_leaf (p->p, sym);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_I_value_clear (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_value_clear
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_value_clear (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_value_creduce (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_value_clear/reduce SYMBOL
+     *         [0] [1]                  [2]
+     */
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_value_clear (p->p);
+    } else {
+	long int sym;
+
+	/*
+	 * We cannot save the interned string id in the Tcl_Obj*, because this
+	 * is already taken by the argument of param_I_er_nt aka
+	 * i_error_nonterminal, due to literal sharing in procedure bodies.
+	 */
+
+	sym = param_intern (p, Tcl_GetString (objv [2]));
+	rde_param_i_value_reduce (p->p, sym);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_I_input_next (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_input_next MSG
+     *         [0] [1]          [2]
+     */
+
+    long int msg;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "msg");
+	return TCL_ERROR;
+    }
+
+    /*
+     * interning: msg as is. Already has PE operator in the message.
+     */
+
+    msg = rde_ot_intern0 (p, objv [2]);
+    rde_param_i_input_next (p->p, msg);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_alnum (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_alnum
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_alnum (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_alpha (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_alpha
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_alpha (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_ascii (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_ascii
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_ascii (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_char (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    long int msg;
+    char* ch;
+
+    /* Syntax: rde i_test_char CHAR
+     *         [0] [1]         [2]
+     */
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "tok");
+	return TCL_ERROR;
+    }
+
+    /*
+     * interning: t + space + char
+     */
+
+    ch  = Tcl_GetString (objv [2]);
+    msg = rde_ot_intern1 (p, "t", objv [2]);
+
+    rde_param_i_test_char (p->p, ch, msg);
+    return TCL_OK;
+}
+
+int
+param_I_test_control (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_control
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_control (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_ddigit (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_ddigit
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_ddigit (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_digit (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_digit
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_digit (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_graph (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_graph
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_graph (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_lower (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_lower
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_lower (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_print (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_print
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_print (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_punct (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_punct
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_punct (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_range (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    long int msg;
+    char* chs;
+    char* che;
+
+    /* Syntax: rde i_test_range START END
+     *         [0] [1]          [2]   [3]
+     */
+
+    if (objc != 4) {
+	Tcl_WrongNumArgs (interp, 2, objv, "toks toke");
+	return TCL_ERROR;
+    }
+
+    /*
+     * interning: .. + space + char + space + char
+     */
+
+    chs = Tcl_GetString (objv [2]);
+    che = Tcl_GetString (objv [3]);
+    msg = rde_ot_intern2 (p, "..", objv [2], objv[3]);
+
+    rde_param_i_test_range (p->p, chs, che, msg);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_space (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_space
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_space (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_upper (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_upper
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_upper (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_wordchar (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_wordchar
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_wordchar (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_I_test_xdigit (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde i_test_xdigit
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_test_xdigit (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_void_state_push (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:void_state_push
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_loc_push (p->p);
+    rde_param_i_error_clear (p->p);
+    rde_param_i_error_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_value_state_push (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:value_state_push
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_ast_push (p->p);
+    rde_param_i_loc_push (p->p);
+    rde_param_i_error_clear (p->p);
+    rde_param_i_error_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_void_state_merge (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:void_state_merge
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_pop_merge (p->p);
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_loc_pop_rewind (p->p);
+    } else {
+	rde_param_i_loc_pop_discard (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_SI_value_state_merge (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:value_state_merge
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_pop_merge (p->p);
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_ast_pop_rewind (p->p);
+	rde_param_i_loc_pop_rewind (p->p);
+    } else {
+	rde_param_i_ast_pop_discard (p->p);
+	rde_param_i_loc_pop_discard (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_SI_voidvoid_branch (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:voidvoid_branch
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_pop_merge (p->p);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_loc_pop_discard (p->p);
+	return TCL_RETURN;
+    }
+    rde_param_i_loc_rewind (p->p);
+    rde_param_i_error_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_voidvalue_branch (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:voidvalue_branch
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_pop_merge (p->p);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_loc_pop_discard (p->p);
+	return TCL_RETURN;
+    }
+    rde_param_i_ast_push (p->p);
+    rde_param_i_loc_rewind (p->p);
+    rde_param_i_error_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_valuevoid_branch (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:valuevoid_branch
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_pop_merge (p->p);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_ast_pop_discard (p->p);
+	rde_param_i_loc_pop_discard (p->p);
+	return TCL_RETURN;
+    }
+    rde_param_i_ast_pop_rewind (p->p);
+    rde_param_i_loc_rewind (p->p);
+    rde_param_i_error_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_valuevalue_branch (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:valuevalue:branch
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_pop_merge (p->p);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_ast_pop_discard (p->p);
+	rde_param_i_loc_pop_discard (p->p);
+	return TCL_RETURN;
+    }
+    rde_param_i_ast_rewind (p->p);
+    rde_param_i_loc_rewind (p->p);
+    rde_param_i_error_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_voidvoid_part (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:voidvoid_part
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_pop_merge (p->p);
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_loc_pop_rewind (p->p);
+	return TCL_RETURN;
+    }
+    rde_param_i_error_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_voidvalue_part (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:voidvalue_part
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_pop_merge (p->p);
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_loc_pop_rewind (p->p);
+	return TCL_RETURN;
+    }
+    rde_param_i_ast_push (p->p);
+    rde_param_i_error_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_valuevalue_part (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:valuevalue_part
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_pop_merge (p->p);
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_ast_pop_rewind (p->p);
+	rde_param_i_loc_pop_rewind (p->p);
+	return TCL_RETURN;
+    }
+    rde_param_i_error_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_next_char (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    long int msg;
+    char* ch;
+
+    /* Syntax: rde i_next_char CHAR
+     *         [0] [1]         [2]
+     */
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "tok");
+	return TCL_ERROR;
+    }
+
+    /*
+     * interning: t + space + char
+     */
+
+    ch  = Tcl_GetString (objv [2]);
+    msg = rde_ot_intern1 (p, "t", objv [2]);
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_char (p->p, ch, msg);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_range (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    long int msg;
+    char* chs;
+    char* che;
+
+    /* Syntax: rde i_next_range START END
+     *         [0] [1]          [2]   [3]
+     */
+
+    if (objc != 4) {
+	Tcl_WrongNumArgs (interp, 2, objv, "toks toke");
+	return TCL_ERROR;
+    }
+
+    /*
+     * interning: .. + space + char + space + char
+     */
+
+    chs = Tcl_GetString (objv [2]);
+    che = Tcl_GetString (objv [3]);
+    msg = rde_ot_intern2 (p, "..", objv [2], objv[3]);
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_range (p->p, chs, che, msg);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_alnum (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_alnum
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "alnum");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_alnum (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_alpha (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_alpha
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "alpha");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_alpha (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_ascii (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_ascii
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "ascii");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_ascii (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_control (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_control
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "control");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_control (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_ddigit (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_ddigit
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "ddigit");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_ddigit (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_digit (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_digit
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "digit");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_digit (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_graph (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_graph
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "graph");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_graph (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_lower (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_lower
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "lower");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_lower (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_print (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_print
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "print");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_print (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_punct (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_punct
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "punct");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_punct (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_space (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_space
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "space");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_space (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_upper (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_upper
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "upper");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_upper (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_wordchar (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_wordchar
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "wordchar");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_wordchar (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_next_xdigit (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:next_xdigit
+     *         [0] [1]
+     */
+
+    long int msg;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    msg = param_intern (p, "xdigit");
+
+    rde_param_i_input_next (p->p, msg);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_test_xdigit (p->p);
+    }
+    return TCL_OK;
+}
+
+int
+param_SI_void2_state_push (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:void2_state_push
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_loc_push (p->p);
+    rde_param_i_error_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_void_state_merge_ok (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:void_state_merge_ok
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_pop_merge (p->p);
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_loc_pop_rewind (p->p);
+	rde_param_i_status_ok (p->p);
+    } else {
+	rde_param_i_loc_pop_discard (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_SI_value_notahead_start (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:void_notahead_start
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_loc_push (p->p);
+    rde_param_i_ast_push (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_void_notahead_exit (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:void_notahead_exit
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_loc_pop_rewind (p->p);
+    rde_param_i_status_negate  (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_value_notahead_exit (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:value_notahead_exit
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_loc_pop_rewind (p->p);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_ast_pop_rewind (p->p);
+    } else {
+	rde_param_i_ast_pop_discard (p->p);
+    }
+    rde_param_i_status_negate  (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_kleene_abort (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:kleene_abort
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_loc_pop_discard (p->p);
+	return TCL_OK;
+    } else {
+	rde_param_i_loc_pop_rewind (p->p);
+	return TCL_RETURN;
+    }
+}
+
+int
+param_SI_kleene_close (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:kleene_close
+     *         [0] [1]
+     */
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs (interp, 2, objv, NULL);
+	return TCL_ERROR;
+    }
+
+    rde_param_i_error_pop_merge (p->p);
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_loc_pop_discard (p->p);
+	return TCL_OK;
+    } else {
+	rde_param_i_loc_pop_rewind (p->p);
+	rde_param_i_status_ok (p->p);
+	return TCL_RETURN;
+    }
+}
+
+int
+param_SI_value_symbol_start (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:value_symbol_start SYMBOL
+     *         [0] [1]                  [2]
+     */
+
+    long int sym;
+    int found;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    /*
+     * We cannot save the interned string id in the Tcl_Obj*, because this is
+     * already taken by the argument of param_I_er_nt aka i_error_nonterminal,
+     * due to literal sharing in procedure bodies.
+     */
+
+    sym = param_intern (p, Tcl_GetString (objv [2]));
+
+    found = rde_param_i_symbol_restore (p->p, sym);
+    if (found) {
+	if (rde_param_query_st (p->p)) {
+	    rde_param_i_ast_value_push (p->p);
+	}
+	return TCL_RETURN;
+    }
+
+    rde_param_i_loc_push (p->p);
+    rde_param_i_ast_push (p->p);
+    return TCL_OK;
+}
+
+int
+param_SI_value_void_symbol_start (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:value_void_symbol_start SYMBOL
+     *         [0] [1]                  [2]
+     */
+
+    long int sym;
+    int found;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    /*
+     * We cannot save the interned string id in the Tcl_Obj*, because this is
+     * already taken by the argument of param_I_er_nt aka i_error_nonterminal,
+     * due to literal sharing in procedure bodies.
+     */
+
+    sym = param_intern (p, Tcl_GetString (objv [2]));
+
+    found = rde_param_i_symbol_restore (p->p, sym);
+    if (found) {
+	return TCL_RETURN;
+    }
+
+    rde_param_i_loc_push (p->p);
+    rde_param_i_ast_push (p->p);
+    return TCL_OK;
+}
+
+int
+param_SI_void_symbol_start (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:void_symbol_start SYMBOL
+     *         [0] [1]                  [2]
+     */
+
+    long int sym;
+    int found;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    /*
+     * We cannot save the interned string id in the Tcl_Obj*, because this is
+     * already taken by the argument of param_I_er_nt aka i_error_nonterminal,
+     * due to literal sharing in procedure bodies.
+     */
+
+    sym = param_intern (p, Tcl_GetString (objv [2]));
+
+    found = rde_param_i_symbol_restore (p->p, sym);
+    if (found) {
+	if (rde_param_query_st (p->p)) {
+	    rde_param_i_ast_value_push (p->p);
+	}
+	return TCL_RETURN;
+    }
+
+    rde_param_i_loc_push (p->p);
+    return TCL_OK;
+}
+
+int
+param_SI_void_void_symbol_start (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:void_void_symbol_start SYMBOL
+     *         [0] [1]                  [2]
+     */
+
+    long int sym;
+    int found;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    /*
+     * We cannot save the interned string id in the Tcl_Obj*, because this is
+     * already taken by the argument of param_I_er_nt aka i_error_nonterminal,
+     * due to literal sharing in procedure bodies.
+     */
+
+    sym = param_intern (p, Tcl_GetString (objv [2]));
+
+    found = rde_param_i_symbol_restore (p->p, sym);
+    if (found) {
+	return TCL_RETURN;
+    }
+
+    rde_param_i_loc_push (p->p);
+    return TCL_OK;
+}
+
+int
+param_SI_reduce_symbol_end (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:reduce_symbol_end SYMBOL
+     *         [0] [1]           [2]
+     */
+
+    long int sym, msg;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    /*
+     * We cannot save the interned string id in the Tcl_Obj*, because this is
+     * already taken by the argument of param_I_er_nt aka i_error_nonterminal,
+     * due to literal sharing in procedure bodies.
+     */
+
+    sym = param_intern (p, Tcl_GetString (objv [2]));
+
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_value_clear (p->p);
+    } else {
+	rde_param_i_value_reduce (p->p, sym);
+    }
+
+    rde_param_i_symbol_save (p->p, sym);
+
+    /*
+     * interning: n + space + symbol
+     *
+     * The obj literal here is very likely shared with the arguments of
+     * i_symbol_save/restore, and i_value_leaf/reduce, and derivatives. This
+     * here is the only point between these where we save the string id in the
+     * Tcl_Obj*.
+     */
+
+    msg = rde_ot_intern1 (p, "n", objv [2]);
+
+    rde_param_i_error_nonterminal (p->p, msg);
+    rde_param_i_ast_pop_rewind (p->p);
+    rde_param_i_loc_pop_discard (p->p);
+
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_ast_value_push (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_SI_void_leaf_symbol_end (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:void_leaf_symbol_end SYMBOL
+     *         [0] [1]           [2]
+     */
+
+    long int sym, msg;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    /*
+     * We cannot save the interned string id in the Tcl_Obj*, because this is
+     * already taken by the argument of param_I_er_nt aka i_error_nonterminal,
+     * due to literal sharing in procedure bodies.
+     */
+
+    sym = param_intern (p, Tcl_GetString (objv [2]));
+
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_value_clear (p->p);
+    } else {
+	rde_param_i_value_leaf (p->p, sym);
+    }
+
+    rde_param_i_symbol_save (p->p, sym);
+
+    /*
+     * interning: n + space + symbol
+     *
+     * The obj literal here is very likely shared with the arguments of
+     * i_symbol_save/restore, and i_value_leaf/reduce, and derivatives. This
+     * here is the only point between these where we save the string id in the
+     * Tcl_Obj*.
+     */
+
+    msg = rde_ot_intern1 (p, "n", objv [2]);
+
+    rde_param_i_error_nonterminal (p->p, msg);
+    rde_param_i_loc_pop_discard (p->p);
+
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_ast_value_push (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_SI_value_leaf_symbol_end (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:value_leaf_symbol_end SYMBOL
+     *         [0] [1]           [2]
+     */
+
+    long int sym, msg;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    /*
+     * We cannot save the interned string id in the Tcl_Obj*, because this is
+     * already taken by the argument of param_I_er_nt aka i_error_nonterminal,
+     * due to literal sharing in procedure bodies.
+     */
+
+    sym = param_intern (p, Tcl_GetString (objv [2]));
+
+    if (!rde_param_query_st (p->p)) {
+	rde_param_i_value_clear (p->p);
+    } else {
+	rde_param_i_value_leaf (p->p, sym);
+    }
+
+    rde_param_i_symbol_save (p->p, sym);
+
+    /*
+     * interning: n + space + symbol
+     *
+     * The obj literal here is very likely shared with the arguments of
+     * i_symbol_save/restore, and i_value_leaf/reduce, and derivatives. This
+     * here is the only point between these where we save the string id in the
+     * Tcl_Obj*.
+     */
+
+    msg = rde_ot_intern1 (p, "n", objv [2]);
+
+    rde_param_i_error_nonterminal (p->p, msg);
+    rde_param_i_ast_pop_rewind (p->p);
+    rde_param_i_loc_pop_discard (p->p);
+
+    if (rde_param_query_st (p->p)) {
+	rde_param_i_ast_value_push (p->p);
+    }
+
+    return TCL_OK;
+}
+
+int
+param_SI_value_clear_symbol_end (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:value_clear_symbol_end SYMBOL
+     *         [0] [1]           [2]
+     */
+
+    long int sym, msg;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    /*
+     * We cannot save the interned string id in the Tcl_Obj*, because this is
+     * already taken by the argument of param_I_er_nt aka i_error_nonterminal,
+     * due to literal sharing in procedure bodies.
+     */
+
+    sym = param_intern (p, Tcl_GetString (objv [2]));
+
+    rde_param_i_value_clear (p->p);
+    rde_param_i_symbol_save (p->p, sym);
+
+    /*
+     * interning: n + space + symbol
+     *
+     * The obj literal here is very likely shared with the arguments of
+     * i_symbol_save/restore, and i_value_leaf/reduce, and derivatives. This
+     * here is the only point between these where we save the string id in the
+     * Tcl_Obj*.
+     */
+
+    msg = rde_ot_intern1 (p, "n", objv [2]);
+
+    rde_param_i_error_nonterminal (p->p, msg);
+    rde_param_i_ast_pop_rewind (p->p);
+    rde_param_i_loc_pop_discard (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_void_clear_symbol_end (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    /* Syntax: rde si:void_clear_symbol_end SYMBOL
+     *         [0] [1]           [2]
+     */
+
+    long int sym, msg;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "symbol");
+	return TCL_ERROR;
+    }
+
+    /*
+     * We cannot save the interned string id in the Tcl_Obj*, because this is
+     * already taken by the argument of param_I_er_nt aka i_error_nonterminal,
+     * due to literal sharing in procedure bodies.
+     */
+
+    sym = param_intern (p, Tcl_GetString (objv [2]));
+
+    rde_param_i_value_clear (p->p);
+    rde_param_i_symbol_save (p->p, sym);
+
+    /*
+     * interning: n + space + symbol
+     *
+     * The obj literal here is very likely shared with the arguments of
+     * i_symbol_save/restore, and i_value_leaf/reduce, and derivatives. This
+     * here is the only point between these where we save the string id in the
+     * Tcl_Obj*.
+     */
+
+    msg = rde_ot_intern1 (p, "n", objv [2]);
+
+    rde_param_i_error_nonterminal (p->p, msg);
+    rde_param_i_loc_pop_discard (p->p);
+
+    return TCL_OK;
+}
+
+int
+param_SI_next_str (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    long int msg;
+    int len, i;
+    char* str;
+
+    /* Syntax: rde i_next_char CHAR
+     *         [0] [1]         [2]
+     */
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "tok");
+	return TCL_ERROR;
+    }
+
+    /*
+     * interning: str + space + char
+     */
+
+    str = Tcl_GetStringFromObj (objv [2], &len);
+    msg = rde_ot_intern1 (p, "str", objv [2]);
+
+    rde_param_i_next_str (p->p, str, msg);
+    return TCL_OK;
+}
+
+int
+param_SI_next_class (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    long int msg;
+    int len, i;
+    char* class;
+
+    /* Syntax: rde i_next_char CHAR
+     *         [0] [1]         [2]
+     */
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs (interp, 2, objv, "tok");
+	return TCL_ERROR;
+    }
+
+    /*
+     * interning: cl + space + char
+     */
+
+    class = Tcl_GetStringFromObj (objv [2], &len);
+    msg   = rde_ot_intern1 (p, "cl", objv [2]);
+
+    rde_param_i_next_class (p->p, class, msg);
+    return TCL_OK;
+}
+
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/m.h b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/m.h
new file mode 100644
index 00000000..8d3395ae
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/m.h
@@ -0,0 +1,150 @@
+/* pt::rde::critcl - critcl - layer 3 declarations
+ * Method functions.
+ */
+
+#ifndef _M_H
+#define _M_H 1
+
+#include "tcl.h"
+#include <p.h>
+
+int param_AMARKED           (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_AST               (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_ASTS              (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_CHAN              (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_COLUMN            (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_COMPLETE          (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_CURRENT           (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_DATA              (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_DESTROY           (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_EMARKED           (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_ERROR             (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_LINE              (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_LMARKED           (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_LOCATION          (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_OK                (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_POSITION          (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_RESET             (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SCACHED           (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SYMBOLS           (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_TOKENS            (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_VALUE             (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_F_continue        (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_F_return          (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_O_continue        (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_O_return          (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_I_st_fail         (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_st_neg          (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_st_ok           (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_I_er_clear        (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_er_clear_push   (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_er_nt           (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_er_popmerge     (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_er_push         (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_F_loc_pop_rewind  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_loc_pop_discard (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_loc_pop_rewdis  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_loc_pop_rewind  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_loc_push        (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_loc_rewind      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_O_loc_pop_discard (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_F_ast_pop_rewind  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_ast_pop_discard (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_ast_pop_disrew  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_ast_pop_rewdis  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_ast_pop_rewind  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_ast_push        (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_ast_rewind      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_O_ast_pop_discard (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_O_ast_value_push  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_I_symbol_restore  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_symbol_save     (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_I_value_cleaf     (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_value_clear     (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_value_creduce   (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_I_input_next      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_I_test_alnum      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_alpha      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_ascii      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_char       (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_control    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_ddigit     (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_digit      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_graph      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_lower      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_print      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_punct      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_range      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_space      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_upper      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_wordchar   (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_I_test_xdigit     (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_SI_void_state_push   (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_value_state_push  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_void_state_merge  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_value_state_merge (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_voidvoid_branch   (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_voidvalue_branch  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_valuevoid_branch  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_valuevalue_branch (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_voidvoid_part     (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_voidvalue_part    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_valuevalue_part   (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_SI_next_char     (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_range    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_alnum    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_alpha    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_ascii    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_control  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_ddigit   (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_digit    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_graph    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_lower    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_print    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_punct    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_space    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_upper    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_wordchar (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_xdigit   (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_SI_void2_state_push     (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_void_state_merge_ok  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_value_notahead_start (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_void_notahead_exit   (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_value_notahead_exit  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_kleene_abort         (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_kleene_close         (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_SI_value_symbol_start      (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_value_void_symbol_start (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_void_symbol_start       (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_void_void_symbol_start  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_reduce_symbol_end       (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_void_leaf_symbol_end    (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_value_leaf_symbol_end   (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_value_clear_symbol_end  (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_void_clear_symbol_end   (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+int param_SI_next_str   (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+int param_SI_next_class (RDE_STATE p, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+#endif /* _M_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/ms.c b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/ms.c
new file mode 100644
index 00000000..2865e734
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/ms.c
@@ -0,0 +1,317 @@
+/* pt::rde::critcl - critcl - layer 2 definitions
+ *
+ * -> Support for the stack methods in layer 3.
+ */
+
+#include <ms.h>   /* Our public API */
+#include <m.h>    /* Method declarations */
+#include <util.h> /* Trace utilities */
+#ifdef RDE_TRACE
+#include <pInt.h> /* To have access to icount */
+#endif
+/* .................................................. */
+/*
+ *---------------------------------------------------------------------------
+ *
+ * paramms_objcmd --
+ *
+ *	Implementation of stack objects, the main dispatcher function.
+ *
+ * Results:
+ *	A standard Tcl result code.
+ *
+ * Side effects:
+ *	Per the called methods.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+int
+paramms_objcmd (ClientData cd, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv)
+{
+    RDE_STATE p = (RDE_STATE) cd;
+    int m, res = TCL_ERROR;
+
+    static CONST char* methods [] = {
+	"amarked",	"ast",		"asts",		"chan",
+	"complete",	"current",	"data",		"destroy",	"emarked",
+	"error",	"lmarked",	"location",	"ok",
+       	"reset",	"scached",	"symbols",	"tokens",
+	"value",	"i:fail_continue",	"i:fail_return",	"i:ok_continue",
+	"i:ok_return",	"i_status_fail",	"i_status_negate",	"i_status_ok",
+	"i_error_clear","i_error_nonterminal",	"i_error_pop_merge",	"i_error_push",
+	"i:fail_loc_pop_rewind",	"i_loc_pop_discard",
+	"i_loc_pop_rewind/discard",	"i_loc_pop_rewind",	"i_loc_push",
+	"i:fail_ast_pop_rewind",	"i_ast_pop_discard",	"i_ast_pop_discard/rewind",
+	"i_ast_pop_rewind/discard",	"i_ast_pop_rewind",	"i_ast_push",
+	"i:ok_ast_value_push",	"i_symbol_restore",	"i_symbol_save",
+	"i_value_clear/leaf",	"i_value_clear",	"i_value_clear/reduce",
+	"i_input_next",	"i_test_alnum",	"i_test_alpha",	"i_test_ascii",	"i_test_char",	"i_test_control",
+	"i_test_ddigit","i_test_digit",	"i_test_graph",	"i_test_lower",	"i_test_print",
+	"i_test_punct",	"i_test_range",	"i_test_space",	"i_test_upper",	"i_test_wordchar",
+	"i_test_xdigit",
+	"i:ok_ast_pop_discard",	"i_ast_rewind",
+	"i:ok_loc_pop_discard",	"i_loc_rewind",
+	"i_error_clear_push",
+	"si:void_state_push",
+	"si:value_state_push",
+	"si:void_state_merge",
+	"si:value_state_merge",
+	"si:voidvoid_branch",
+	"si:voidvalue_branch",
+	"si:valuevoid_branch",
+	"si:valuevalue_branch",
+	"si:voidvoid_part",
+	"si:voidvalue_part",
+	"si:valuevalue_part",
+	"si:next_char",
+	"si:next_range",
+	"si:next_alnum",	"si:next_alpha",	"si:next_ascii",	"si:next_control",
+	"si:next_ddigit","si:next_digit",	"si:next_graph",	"si:next_lower",	"si:next_print",
+	"si:next_punct",	"si:next_space",	"si:next_upper",	"si:next_wordchar",
+	"si:next_xdigit",
+
+	"si:void2_state_push",
+	"si:void_state_merge_ok",
+	"si:value_notahead_start",
+	"si:void_notahead_exit",
+	"si:value_notahead_exit",
+	"si:kleene_abort",
+	"si:kleene_close",
+
+	"si:value_symbol_start",
+	"si:value_void_symbol_start",
+	"si:void_symbol_start",
+	"si:void_void_symbol_start",
+	"si:reduce_symbol_end",
+	"si:void_leaf_symbol_end",
+	"si:value_leaf_symbol_end",
+	"si:value_clear_symbol_end",
+	"si:void_clear_symbol_end",
+
+	"si:next_str",
+	"si:next_class",
+	NULL
+    };
+    enum methods {
+	M_AMARKED,	M_AST,	M_ASTS,	M_CHAN,	M_COMPLETE,	M_CURRENT,
+	M_DATA,	M_DESTROY,	M_EMARKED,	M_ERROR,       	M_LMARKED,	M_LOCATION,	M_OK,
+       	M_RESET,	M_SCACHED,	M_SYMBOLS,	M_TOKENS,
+	M_VALUE,	M_F_continue,	M_F_return,	M_O_continue,	M_O_return,
+	M_I_st_fail,	M_I_st_neg,	M_I_st_ok,	M_I_er_clear,	M_I_er_nt,
+	M_I_er_popmerge,	M_I_er_push,	M_F_loc_pop_rewind,	M_I_loc_pop_discard,
+	M_I_loc_pop_rewdis,	M_I_loc_pop_rewind,	M_I_loc_push,	M_F_ast_pop_rewind,
+	M_I_ast_pop_discard,	M_I_ast_pop_disrew,	M_I_ast_pop_rewdis,
+	M_I_ast_pop_rewind,	M_I_ast_push,	M_O_ast_value_push,	M_I_symbol_restore,
+	M_I_symbol_save,	M_I_value_cleaf,	M_I_value_clear,	M_I_value_creduce,
+	M_I_input_next,	M_I_test_alnum,	M_I_test_alpha,	M_I_test_ascii,	M_I_test_char,	M_I_test_control,
+	M_I_test_ddigit,	M_I_test_digit,	M_I_test_graph,	M_I_test_lower,	M_I_test_print,
+	M_I_test_punct,	M_I_test_range,	M_I_test_space,	M_I_test_upper,	M_I_test_wordchar,
+	M_I_test_xdigit,
+
+	M_O_ast_pop_discard,
+	M_I_ast_rewind,
+	M_O_loc_pop_discard,
+	M_I_loc_rewind,
+	M_I_er_clear_push,
+
+	M_SI_void_state_push,
+	M_SI_value_state_push,
+	M_SI_void_state_merge,
+	M_SI_value_state_merge,
+	M_SI_voidvoid_branch,
+	M_SI_voidvalue_branch,
+	M_SI_valuevoid_branch,
+	M_SI_valuevalue_branch,
+	M_SI_voidvoid_part,
+	M_SI_voidvalue_part,
+	M_SI_valuevalue_part,
+
+	M_SI_next_char,
+	M_SI_next_range,
+	M_SI_next_alnum,
+	M_SI_next_alpha,
+	M_SI_next_ascii,
+	M_SI_next_control,
+	M_SI_next_ddigit,
+	M_SI_next_digit,
+	M_SI_next_graph,
+	M_SI_next_lower,
+	M_SI_next_print,
+	M_SI_next_punct,
+	M_SI_next_space,
+	M_SI_next_upper,
+	M_SI_next_wordchar,
+	M_SI_next_xdigit,
+
+	M_SI_void2_state_push,
+	M_SI_void_state_merge_ok,
+	M_SI_value_notahead_start,
+	M_SI_void_notahead_exit,
+	M_SI_value_notahead_exit,
+	M_SI_kleene_abort,
+	M_SI_kleene_close,
+
+	M_SI_value_symbol_start,
+	M_SI_value_void_symbol_start,
+	M_SI_void_symbol_start,
+	M_SI_void_void_symbol_start,
+	M_SI_reduce_symbol_end,
+	M_SI_void_leaf_symbol_end,
+	M_SI_value_leaf_symbol_end,
+	M_SI_value_clear_symbol_end,
+	M_SI_void_clear_symbol_end,
+
+	M_SI_next_str,
+	M_SI_next_class
+    };
+
+    if (objc < 2) {
+	Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?");
+	return TCL_ERROR;
+    } else if (Tcl_GetIndexFromObj (interp, objv [1], methods, "option",
+				    0, &m) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    /* Dispatch to methods. They check the #args in detail before performing
+     * the requested functionality
+     */
+
+    TRACE0 (("%8d RDE %s", ++p->icount, Tcl_GetString(objv [1])));
+    ENTER (Tcl_GetString(objv [1]));
+
+    switch (m) {
+    case M_AMARKED:             res = param_AMARKED           (p, interp, objc, objv); break;
+    case M_AST:                 res = param_AST               (p, interp, objc, objv); break;
+    case M_ASTS:                res = param_ASTS              (p, interp, objc, objv); break;
+    case M_CHAN:                res = param_CHAN              (p, interp, objc, objv); break;
+    case M_COMPLETE:            res = param_COMPLETE          (p, interp, objc, objv); break;
+    case M_CURRENT:             res = param_CURRENT           (p, interp, objc, objv); break;
+    case M_DATA:                res = param_DATA              (p, interp, objc, objv); break;
+    case M_DESTROY:             res = param_DESTROY           (p, interp, objc, objv); break;
+    case M_EMARKED:             res = param_EMARKED           (p, interp, objc, objv); break;
+    case M_ERROR:               res = param_ERROR             (p, interp, objc, objv); break;
+    case M_LMARKED:             res = param_LMARKED           (p, interp, objc, objv); break;
+    case M_LOCATION:            res = param_LOCATION          (p, interp, objc, objv); break;
+    case M_OK:                  res = param_OK                (p, interp, objc, objv); break;
+    case M_RESET:               res = param_RESET             (p, interp, objc, objv); break;
+    case M_SCACHED:             res = param_SCACHED           (p, interp, objc, objv); break;
+    case M_SYMBOLS:             res = param_SYMBOLS           (p, interp, objc, objv); break;
+    case M_TOKENS:              res = param_TOKENS            (p, interp, objc, objv); break;
+    case M_VALUE:               res = param_VALUE             (p, interp, objc, objv); break;
+    case M_F_continue:          res = param_F_continue        (p, interp, objc, objv); break;
+    case M_F_return:            res = param_F_return          (p, interp, objc, objv); break;
+    case M_O_continue:          res = param_O_continue        (p, interp, objc, objv); break;
+    case M_O_return:            res = param_O_return          (p, interp, objc, objv); break;
+    case M_I_st_fail:           res = param_I_st_fail         (p, interp, objc, objv); break;
+    case M_I_st_neg:            res = param_I_st_neg          (p, interp, objc, objv); break;
+    case M_I_st_ok:             res = param_I_st_ok           (p, interp, objc, objv); break;
+    case M_I_er_clear:          res = param_I_er_clear        (p, interp, objc, objv); break;
+    case M_I_er_clear_push:     res = param_I_er_clear_push   (p, interp, objc, objv); break;
+    case M_I_er_nt:             res = param_I_er_nt           (p, interp, objc, objv); break;
+    case M_I_er_popmerge:       res = param_I_er_popmerge     (p, interp, objc, objv); break;
+    case M_I_er_push:           res = param_I_er_push         (p, interp, objc, objv); break;
+    case M_F_loc_pop_rewind:    res = param_F_loc_pop_rewind  (p, interp, objc, objv); break;
+    case M_I_loc_pop_discard:   res = param_I_loc_pop_discard (p, interp, objc, objv); break;
+    case M_I_loc_pop_rewdis:    res = param_I_loc_pop_rewdis  (p, interp, objc, objv); break;
+    case M_I_loc_pop_rewind:    res = param_I_loc_pop_rewind  (p, interp, objc, objv); break;
+    case M_I_loc_push:          res = param_I_loc_push        (p, interp, objc, objv); break;
+    case M_I_loc_rewind:        res = param_I_loc_rewind      (p, interp, objc, objv); break;
+    case M_O_loc_pop_discard:   res = param_O_loc_pop_discard (p, interp, objc, objv); break;
+    case M_F_ast_pop_rewind:    res = param_F_ast_pop_rewind  (p, interp, objc, objv); break;
+    case M_I_ast_pop_discard:   res = param_I_ast_pop_discard (p, interp, objc, objv); break;
+    case M_I_ast_pop_disrew:    res = param_I_ast_pop_disrew  (p, interp, objc, objv); break;
+    case M_I_ast_pop_rewdis:    res = param_I_ast_pop_rewdis  (p, interp, objc, objv); break;
+    case M_I_ast_pop_rewind:    res = param_I_ast_pop_rewind  (p, interp, objc, objv); break;
+    case M_I_ast_push:          res = param_I_ast_push        (p, interp, objc, objv); break;
+    case M_I_ast_rewind:        res = param_I_ast_rewind      (p, interp, objc, objv); break;
+    case M_O_ast_pop_discard:   res = param_O_ast_pop_discard (p, interp, objc, objv); break;
+    case M_O_ast_value_push:    res = param_O_ast_value_push  (p, interp, objc, objv); break;
+    case M_I_symbol_restore:    res = param_I_symbol_restore  (p, interp, objc, objv); break;
+    case M_I_symbol_save:       res = param_I_symbol_save     (p, interp, objc, objv); break;
+    case M_I_value_cleaf:       res = param_I_value_cleaf     (p, interp, objc, objv); break;
+    case M_I_value_clear:       res = param_I_value_clear     (p, interp, objc, objv); break;
+    case M_I_value_creduce:     res = param_I_value_creduce   (p, interp, objc, objv); break;
+    case M_I_input_next:        res = param_I_input_next      (p, interp, objc, objv); break;
+    case M_I_test_alnum:        res = param_I_test_alnum      (p, interp, objc, objv); break;
+    case M_I_test_alpha:        res = param_I_test_alpha      (p, interp, objc, objv); break;
+    case M_I_test_ascii:        res = param_I_test_ascii      (p, interp, objc, objv); break;
+    case M_I_test_char:         res = param_I_test_char       (p, interp, objc, objv); break;
+    case M_I_test_control:      res = param_I_test_control    (p, interp, objc, objv); break;
+    case M_I_test_ddigit:       res = param_I_test_ddigit     (p, interp, objc, objv); break;
+    case M_I_test_digit:        res = param_I_test_digit      (p, interp, objc, objv); break;
+    case M_I_test_graph:        res = param_I_test_graph      (p, interp, objc, objv); break;
+    case M_I_test_lower:        res = param_I_test_lower      (p, interp, objc, objv); break;
+    case M_I_test_print:        res = param_I_test_print      (p, interp, objc, objv); break;
+    case M_I_test_punct:        res = param_I_test_punct      (p, interp, objc, objv); break;
+    case M_I_test_range:        res = param_I_test_range      (p, interp, objc, objv); break;
+    case M_I_test_space:        res = param_I_test_space      (p, interp, objc, objv); break;
+    case M_I_test_upper:        res = param_I_test_upper      (p, interp, objc, objv); break;
+    case M_I_test_wordchar:     res = param_I_test_wordchar   (p, interp, objc, objv); break;
+    case M_I_test_xdigit:       res = param_I_test_xdigit     (p, interp, objc, objv); break;
+
+    case M_SI_void_state_push:         res = param_SI_void_state_push   (p, interp, objc, objv); break;
+    case M_SI_value_state_push:        res = param_SI_value_state_push  (p, interp, objc, objv); break;
+    case M_SI_void_state_merge:        res = param_SI_void_state_merge  (p, interp, objc, objv); break;
+    case M_SI_value_state_merge:       res = param_SI_value_state_merge (p, interp, objc, objv); break;
+    case M_SI_voidvoid_branch:         res = param_SI_voidvoid_branch   (p, interp, objc, objv); break;
+    case M_SI_voidvalue_branch:        res = param_SI_voidvalue_branch  (p, interp, objc, objv); break;
+    case M_SI_valuevoid_branch:        res = param_SI_valuevoid_branch  (p, interp, objc, objv); break;
+    case M_SI_valuevalue_branch:       res = param_SI_valuevalue_branch (p, interp, objc, objv); break;
+    case M_SI_voidvoid_part:           res = param_SI_voidvoid_part     (p, interp, objc, objv); break;
+    case M_SI_voidvalue_part:          res = param_SI_voidvalue_part    (p, interp, objc, objv); break;
+    case M_SI_valuevalue_part:         res = param_SI_valuevalue_part   (p, interp, objc, objv); break;
+
+    case M_SI_next_char:               res = param_SI_next_char    (p, interp, objc, objv); break;
+    case M_SI_next_range:              res = param_SI_next_range   (p, interp, objc, objv); break;
+    case M_SI_next_alnum:              res = param_SI_next_alnum   (p, interp, objc, objv); break;
+    case M_SI_next_alpha:              res = param_SI_next_alpha   (p, interp, objc, objv); break;
+    case M_SI_next_ascii:              res = param_SI_next_ascii   (p, interp, objc, objv); break;
+    case M_SI_next_control:            res = param_SI_next_control (p, interp, objc, objv); break;
+    case M_SI_next_ddigit:             res = param_SI_next_ddigit  (p, interp, objc, objv); break;
+    case M_SI_next_digit:              res = param_SI_next_digit   (p, interp, objc, objv); break;
+    case M_SI_next_graph:              res = param_SI_next_graph   (p, interp, objc, objv); break;
+    case M_SI_next_lower:              res = param_SI_next_lower   (p, interp, objc, objv); break;
+    case M_SI_next_print:              res = param_SI_next_print   (p, interp, objc, objv); break;
+    case M_SI_next_punct:              res = param_SI_next_punct   (p, interp, objc, objv); break;
+    case M_SI_next_space:              res = param_SI_next_space   (p, interp, objc, objv); break;
+    case M_SI_next_upper:              res = param_SI_next_upper   (p, interp, objc, objv); break;
+    case M_SI_next_wordchar:           res = param_SI_next_wordchar(p, interp, objc, objv); break;
+    case M_SI_next_xdigit:             res = param_SI_next_xdigit  (p, interp, objc, objv); break;
+			        
+    case M_SI_void2_state_push:        res = param_SI_void2_state_push     (p, interp, objc, objv); break;
+    case M_SI_void_state_merge_ok:     res = param_SI_void_state_merge_ok  (p, interp, objc, objv); break;
+    case M_SI_value_notahead_start:    res = param_SI_value_notahead_start (p, interp, objc, objv); break;
+    case M_SI_void_notahead_exit:      res = param_SI_void_notahead_exit   (p, interp, objc, objv); break;
+    case M_SI_value_notahead_exit:     res = param_SI_value_notahead_exit  (p, interp, objc, objv); break;
+    case M_SI_kleene_abort:            res = param_SI_kleene_abort         (p, interp, objc, objv); break;
+    case M_SI_kleene_close:            res = param_SI_kleene_close         (p, interp, objc, objv); break;
+
+    case M_SI_value_symbol_start:      res = param_SI_value_symbol_start      (p, interp, objc, objv); break;
+    case M_SI_value_void_symbol_start: res = param_SI_value_void_symbol_start (p, interp, objc, objv); break;
+    case M_SI_void_symbol_start:       res = param_SI_void_symbol_start       (p, interp, objc, objv); break;
+    case M_SI_void_void_symbol_start:  res = param_SI_void_void_symbol_start  (p, interp, objc, objv); break;
+    case M_SI_reduce_symbol_end:       res = param_SI_reduce_symbol_end       (p, interp, objc, objv); break;
+    case M_SI_void_leaf_symbol_end:    res = param_SI_void_leaf_symbol_end    (p, interp, objc, objv); break;
+    case M_SI_value_leaf_symbol_end:   res = param_SI_value_leaf_symbol_end   (p, interp, objc, objv); break;
+    case M_SI_value_clear_symbol_end:  res = param_SI_value_clear_symbol_end  (p, interp, objc, objv); break;
+    case M_SI_void_clear_symbol_end:   res = param_SI_void_clear_symbol_end   (p, interp, objc, objv); break;
+
+    case M_SI_next_str:           res = param_SI_next_str   (p, interp, objc, objv); break;
+    case M_SI_next_class:         res = param_SI_next_class (p, interp, objc, objv); break;
+    default:
+        /* Not coming to this place */
+        ASSERT (0,"Reached unreachable location");
+    }
+
+    RETURN ("%d",res);
+}
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/ms.h b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/ms.h
new file mode 100644
index 00000000..362334d1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/ms.h
@@ -0,0 +1,20 @@
+/* pt::rde::critcl - critcl - layer 2 declarations
+ * Support for param methods.
+ */
+
+#ifndef _MS_H
+#define _MS_H 1
+
+#include "tcl.h"
+
+int paramms_objcmd (ClientData cd, Tcl_Interp* interp, int objc, Tcl_Obj* CONST* objv);
+
+#endif /* _MS_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/ot.c b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/ot.c
new file mode 100644
index 00000000..3b99b045
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/ot.c
@@ -0,0 +1,236 @@
+/*
+ * = = == === ===== ======== ============= =====================
+ * == pt::rde (critcl) - Data Structures - Tcl_ObjType for interned strings.
+ *
+ */
+
+#include <ot.h>    /* Our public API */
+#include <util.h>  /* Allocation macros */
+#include <pInt.h>  /* API to basic intern(ing) of strings */
+#include <string.h>
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+static void ot_free_rep   (Tcl_Obj* obj);
+static void ot_dup_rep    (Tcl_Obj* obj, Tcl_Obj* dup);
+static void ot_string_rep (Tcl_Obj* obj);
+static int  ot_from_any   (Tcl_Interp* ip, Tcl_Obj* obj);
+
+static Tcl_ObjType ot_type = {
+    "tcllib/pt::rde/critcl",
+    ot_free_rep,
+    ot_dup_rep,
+    ot_string_rep,
+    ot_from_any
+};
+
+static int      IsCached (RDE_STATE p, Tcl_Obj* obj, long int* id);
+static long int Make     (RDE_STATE p, Tcl_Obj* obj, const char* str);
+
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+long int
+rde_ot_intern0 (RDE_STATE p,
+		Tcl_Obj* detail)
+{
+    long int id;
+
+    TRACE (("rde_ot_intern0 (%p, %p = '%s')", p, detail, Tcl_GetString(detail)));
+    if (IsCached (p, detail, &id)) {
+	return id;
+    }
+
+    TRACE (("INTERNALIZE"));
+    return Make (p, detail, Tcl_GetString (detail));
+}
+
+long int
+rde_ot_intern1 (RDE_STATE p,
+		const char* operator,
+		Tcl_Obj* detail)
+{
+    long int id;
+    Tcl_DString buf;
+
+    TRACE (("rde_ot_intern1 (%p, '%s' %p = '%s')", p, operator, detail, Tcl_GetString(detail)));
+    if (IsCached (p, detail, &id)) {
+	return id;
+    }
+
+    TRACE (("INTERNALIZE"));
+
+    /* Create a list of operator + detail.
+     * Using a DString.
+     */
+
+    Tcl_DStringInit (&buf);
+    Tcl_DStringAppendElement (&buf, operator);
+    Tcl_DStringAppendElement (&buf, Tcl_GetString (detail));
+
+    id = Make (p, detail, Tcl_DStringValue (&buf));
+
+    Tcl_DStringFree (&buf);
+    return id;
+}
+
+long int
+rde_ot_intern2 (RDE_STATE p,
+		const char* operator,
+		Tcl_Obj* detail1,
+		Tcl_Obj* detail2)
+{
+    long int id;
+    Tcl_DString buf;
+
+    TRACE (("rde_ot_intern2 (%p, '%s' %p = '%s', %p = '%s')", p, operator,
+	    detail1, Tcl_GetString(detail1)
+	    detail2, Tcl_GetString(detail2)));
+    if (IsCached (p, detail1, &id)) {
+	return id;
+    }
+
+    TRACE (("INTERNALIZE"));
+
+    /* Create a list of operator + detail1 + detail2.
+     * Using a DString.
+     */
+
+    Tcl_DStringInit (&buf);
+    Tcl_DStringAppendElement (&buf, operator);
+    Tcl_DStringAppendElement (&buf, Tcl_GetString (detail1));
+    Tcl_DStringAppendElement (&buf, Tcl_GetString (detail2));
+
+    id = Make (p, detail1, Tcl_DStringValue (&buf));
+
+    Tcl_DStringFree (&buf);
+    return id;
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+static int
+IsCached (RDE_STATE p, Tcl_Obj* obj, long int* id)
+{
+    /*
+     * Quick exit if we have a cached and valid value.
+     */
+
+    if ((obj->typePtr == &ot_type) &&
+	(obj->internalRep.twoPtrValue.ptr1 == p)) {
+	RDE_STRING* rs = (RDE_STRING*) obj->internalRep.twoPtrValue.ptr2;
+	TRACE (("CACHED %p = %d", rs, rs->id));
+	*id = rs->id;
+	return 1;
+    }
+
+    return 0;
+}
+
+static long int
+Make (RDE_STATE p, Tcl_Obj* obj, const char* str)
+{
+    long int    id = param_intern (p, str);
+    RDE_STRING* rs = ALLOC (RDE_STRING);
+
+    rs->next = p->sfirst;
+    rs->self = obj;
+    rs->id   = id;
+    p->sfirst = rs;
+
+    /* Invalidate previous int.rep before setting our own.
+     * Inlined copy of TclFreeIntRep() macro (tclInt.h)
+     */
+
+    if ((obj)->typePtr &&
+	(obj)->typePtr->freeIntRepProc) {
+        (obj)->typePtr->freeIntRepProc(obj);
+    }
+
+    obj->internalRep.twoPtrValue.ptr1 = p;
+    obj->internalRep.twoPtrValue.ptr2 = rs;
+    obj->typePtr = &ot_type;
+
+    return id;
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+static void 
+ot_free_rep(Tcl_Obj* obj)
+{
+    RDE_STATE   p  = (RDE_STATE)   obj->internalRep.twoPtrValue.ptr1;
+    RDE_STRING* rs = (RDE_STRING*) obj->internalRep.twoPtrValue.ptr2;
+
+    /* Take structure out of the tracking list. */
+    if (p->sfirst == rs) {
+	p->sfirst = rs->next;
+    } else {
+	RDE_STRING* iter = p->sfirst;
+	while (iter->next != rs) {
+	    iter = iter->next;
+	}
+	iter->next = rs->next;
+    }
+
+    /* Drop the now un-tracked structure */
+    ckfree ((char*) rs);
+
+    /* Nothing to release in the obj itself, just resetting references. */
+    obj->internalRep.twoPtrValue.ptr1 = NULL;
+    obj->internalRep.twoPtrValue.ptr2 = NULL;
+}
+        
+static void
+ot_dup_rep(Tcl_Obj* obj, Tcl_Obj* dup)
+{
+    RDE_STRING* ors = (RDE_STRING*) obj->internalRep.twoPtrValue.ptr2;
+    RDE_STRING* drs;
+    RDE_STATE   p = ((RDE_STATE) obj->internalRep.twoPtrValue.ptr1);
+
+    drs = ALLOC (RDE_STRING);
+    drs->next = p->sfirst;
+    drs->self = dup;
+    drs->id   = ors->id;
+    p->sfirst = drs;
+
+    dup->internalRep.twoPtrValue.ptr1 = obj->internalRep.twoPtrValue.ptr1;
+    dup->internalRep.twoPtrValue.ptr2 = drs;
+    dup->typePtr = &ot_type;
+}
+        
+static void
+ot_string_rep(Tcl_Obj* obj)
+{
+    (void) obj;
+    ASSERT (0, "Attempted reconversion of rde string to string rep");
+}
+    
+static int
+ot_from_any(Tcl_Interp* ip, Tcl_Obj* obj)
+{
+    (void) ip;
+    (void) obj;
+    ASSERT (0, "Illegal conversion into rde string");
+    return TCL_ERROR;
+}
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/ot.h b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/ot.h
new file mode 100644
index 00000000..086b2b2c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/ot.h
@@ -0,0 +1,32 @@
+/*
+ * = = == === ===== ======== ============= =====================
+ * == pt::rde (critcl) - Data Structures - ObjType for interned strings.
+ */
+
+#ifndef _RDE_DS_OT_H
+#define _RDE_DS_OT_H 1
+
+#include "tcl.h"
+#include <p.h>   /* State declarations */
+
+long int rde_ot_intern0 (RDE_STATE p,
+			 Tcl_Obj* detail);
+
+long int rde_ot_intern1 (RDE_STATE p,
+			 const char* operator,
+			 Tcl_Obj* detail);
+
+long int rde_ot_intern2 (RDE_STATE p,
+			 const char* operator,
+			 Tcl_Obj* detail1,
+			 Tcl_Obj* detail2);
+
+#endif /* _RDE_DS_OT_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/p.c b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/p.c
new file mode 100644
index 00000000..ac41446c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/p.c
@@ -0,0 +1,183 @@
+/* pt::rde::critcl - critcl - layer 1 definitions
+ * (c) PARAM functions
+ */
+
+#include <pInt.h> /* Our public and internal APIs */
+#include <util.h> /* Allocation macros */
+#include <string.h>
+
+/* .................................................. */
+
+static char*
+dup_string (const char* str);
+
+/* .................................................. */
+
+RDE_STATE
+param_new (void)
+{
+    RDE_STATE p;
+
+    ENTER ("param_new");
+
+    p = ALLOC (RDE_STATE_);
+#ifdef RDE_TRACE
+    p->icount = 0;
+#endif
+    p->c = NULL;
+
+    p->maxnum = 0;
+    p->numstr = 0;
+    p->string = NULL;
+    p->sfirst = NULL;
+    Tcl_InitHashTable (&p->str, TCL_STRING_KEYS);
+
+    p->p = rde_param_new (p->numstr, p->string);
+
+    /*
+     * Fixed elements of the string table, as needed by the lower level PARAM
+     * functions (class tests, see param.c, enum test_class).
+     * Further pt_peg_to_cparam.tcl, [::pt::peg::to::cparam::convert]
+     * ** Keep in sync **
+     *
+     * Maybe move the interning into the lower level, i.e. PARAM ?
+     */
+
+    param_intern (p, "alnum");
+    param_intern (p, "alpha");
+    param_intern (p, "ascii");
+    param_intern (p, "control");
+    param_intern (p, "ddigit");
+    param_intern (p, "digit");
+    param_intern (p, "graph");
+    param_intern (p, "lower");
+    param_intern (p, "print");
+    param_intern (p, "punct");
+    param_intern (p, "space");
+    param_intern (p, "upper");
+    param_intern (p, "wordchar");
+    param_intern (p, "xdigit");
+
+    RETURN ("%p",p);
+}
+
+void
+param_delete (RDE_STATE p)
+{
+    RDE_STRING* next;
+
+    ENTER ("param_delete");
+    TRACE (("RDE_STATE %p",p));
+
+    while (p->numstr) {
+	p->numstr --;
+	ASSERT_BOUNDS(p->numstr,p->maxnum);
+	ckfree (p->string [p->numstr]);
+    }
+
+    Tcl_DeleteHashTable (&p->str);
+
+    /* Process the list of Tcl_Obj* which have references to interned strings.
+     * We have to invalidate & release their intreps, and detach them from
+     * this state.
+     */
+    while (p->sfirst) {
+	next = p->sfirst->next;
+
+	TRACE (("del intern %p having %p '%s'", p, p->sfirst->self, Tcl_GetString(p->sfirst->self)));
+
+	p->sfirst->self->internalRep.twoPtrValue.ptr1 = NULL;
+	p->sfirst->self->internalRep.twoPtrValue.ptr2 = NULL;
+	p->sfirst->self->typePtr = NULL;
+
+	ckfree ((char*) p->sfirst);
+	p->sfirst = next;
+    }
+
+    rde_param_del (p->p);
+    ckfree ((char*) p);
+
+    RETURNVOID;
+}
+
+void
+param_setcmd (RDE_STATE p, Tcl_Command c)
+{
+    ENTER ("param_setcmd");
+    TRACE (("RDE_STATE   %p",p));
+    TRACE (("Tcl_Command %p",c));
+
+    p->c = c;
+
+    RETURNVOID;
+}
+
+long int
+param_intern (RDE_STATE p, const char* literal)
+{
+    long int res;
+    int isnew;
+    Tcl_HashEntry* hPtr;
+
+    ENTER ("param_intern");
+    TRACE (("RDE_STATE   %p",p));
+    TRACE (("CHAR*      '%s'",literal));
+
+    hPtr = Tcl_FindHashEntry (&p->str, literal);
+    if (hPtr) {
+	res = (long int) Tcl_GetHashValue (hPtr);
+	RETURN("CACHED %d",res);
+    }
+
+    hPtr = Tcl_CreateHashEntry(&p->str, literal, &isnew);
+    ASSERT (isnew, "Should have found entry");
+
+    Tcl_SetHashValue (hPtr, p->numstr);
+
+    if (p->numstr >= p->maxnum) {
+	long int new;
+	char**   str;
+
+	new  = 2 * (p->maxnum ? p->maxnum : 8);
+	TRACE (("extend to %d strings",new));
+
+	str  = (char**) ckrealloc ((char*) p->string, new * sizeof(char*));
+	ASSERT (str,"Memory allocation failure for string table");
+	p->maxnum = new;
+	p->string = str;
+    }
+
+    res = p->numstr;
+
+    ASSERT_BOUNDS(res,p->maxnum);
+    p->string [res] = dup_string (literal);
+    p->numstr ++;
+
+    TRACE (("UPDATE ENGINE"));
+    rde_param_update_strings (p->p, p->numstr, p->string);
+
+    RETURN("NEW %d",res);
+}
+/* .................................................. */
+
+static char*
+dup_string (const char* str)
+{
+    int   n = strlen(str);
+    char* s = NALLOC(n+1,char);
+
+    memcpy (s, str, n);
+    s[n] = '\0';
+
+    return s;
+}
+
+/* .................................................. */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/p.h b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/p.h
new file mode 100644
index 00000000..cb115294
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/p.h
@@ -0,0 +1,24 @@
+/* pt::rde::critcl - critcl - layer 1 declarations
+ * (c) PARAM functions
+ */
+
+#ifndef _P_H
+#define _P_H 1
+
+#include "tcl.h"
+
+typedef struct RDE_STATE_* RDE_STATE;
+
+RDE_STATE param_new    (void);
+void      param_delete (RDE_STATE p);
+void      param_setcmd (RDE_STATE p, Tcl_Command c);
+
+#endif /* _P_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/pInt.h b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/pInt.h
new file mode 100644
index 00000000..993d983d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/pInt.h
@@ -0,0 +1,50 @@
+/* pt::rde::critcl - critcl - layer 1 declarations
+ * (c) PARAM functions
+ */
+
+#ifndef _P_INT_H
+#define _P_INT_H 1
+
+#include <p.h>     /* Public decls */
+#include <param.h> /* PARAM architectural state */
+#include <util.h>  /* Tracing support */
+
+typedef struct RDE_STRING {
+    struct RDE_STRING* next;
+    Tcl_Obj*           self;
+    int                id;
+} RDE_STRING;
+
+typedef struct RDE_STATE_ {
+    RDE_PARAM   p;
+    Tcl_Command c;
+
+    struct RDE_STRING* sfirst;
+
+    Tcl_HashTable str; /* Table to intern strings, i.e. convert them into
+			* unique numerical indices for the PARAM instructions.
+			*/
+
+    /* And the counter mapping from ids to strings, this is handed to the
+     * PARAM for use.
+     */
+    long int maxnum; /* NOTE -- */
+    long int numstr; /* This is, essentially, an RDE_STACK (char* elements) */
+    char**   string; /* Convert over to that instead of replicating the code */
+
+#ifdef RDE_TRACE
+    int icount;  /* Instruction counter, when tracing */
+#endif
+} RDE_STATE_;
+
+long int param_intern (RDE_STATE p, const char* literal);
+
+#endif /* _P_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/param.c b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/param.c
new file mode 100644
index 00000000..e468835d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/param.c
@@ -0,0 +1,1791 @@
+/*
+ * = = == === ===== ======== ============= =====================
+ * == pt::rde (critcl) - Data Structures - PARAM architectural state.
+ */
+
+#include <param.h> /* Public and private APIs */
+#include <stack.h> /* Stack handling */
+#include <tc.h>    /* Token cache handling */
+#include <util.h>  /* Allocation utilities */
+#include <string.h>
+#include <ctype.h>  /* is... */
+#include <stdlib.h> /* qsort */
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+typedef struct RDE_PARAM_ {
+
+    Tcl_Channel   IN;
+    Tcl_Obj*      readbuf;
+    char*         CC; /* [TCL_UTF_MAX] */
+    long int      CC_len;
+
+    RDE_TC        TC;
+
+    long int      CL;
+    RDE_STACK     LS; /* long int :: locations */
+
+    ERROR_STATE*  ER;
+    RDE_STACK     ES; /* ERROR_STATE* :: errors */
+
+    long int      ST;
+    Tcl_Obj*      SV;
+
+    Tcl_HashTable NC;
+
+    /*
+     * AS/ARS are actually intertwined. ARS is the top of 'ast' below, with
+     * the markers on 'mark' showing where ARS ends and AS with older ARS
+     * begins.
+     */
+
+    RDE_STACK    ast  ; /* Tcl_Obj* :: ast (node) */
+    RDE_STACK    mark ; /* long int :: markers */
+
+    /* Various non PARAM state needed, the only part. An array of all the
+     * strings needed by this state instance. The instruction implementations
+     * take indices into this array instead of the actual strings, where
+     * needed. This field is NOT owned by the state.
+     */
+
+    long int numstr; /* String table (error messages), and its size */
+    char**  string;
+
+    /*
+     * A generic value for the higher layers to associate their own
+     * information with the parser's state.
+     */
+
+    ClientData clientData;
+
+} RDE_PARAM_;
+
+typedef int (*UniCharClass) (int);
+
+/* See also p.c, param_new(), table of param_intern() calls.
+ * ** Keep in sync **
+ */
+typedef enum test_class_id {
+    tc_alnum,
+    tc_alpha,
+    tc_ascii,
+    tc_control,
+    tc_ddigit,
+    tc_digit,
+    tc_graph,
+    tc_lower,
+    tc_printable,
+    tc_punct,
+    tc_space,
+    tc_upper,
+    tc_wordchar,
+    tc_xdigit
+} test_class_id;
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+static void ast_node_free    (void* n);
+static void error_state_free (void* es);
+static void error_set        (RDE_PARAM p, long int s);
+static void nc_clear         (RDE_PARAM p);
+
+static int UniCharIsAscii    (int character);
+static int UniCharIsHexDigit (int character);
+static int UniCharIsDecDigit (int character);
+
+static void test_class (RDE_PARAM p, UniCharClass class, test_class_id id);
+static int  er_int_compare (const void* a, const void* b);
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+#define SV_INIT(p)             \
+    p->SV = NULL; \
+    TRACE (("SV_INIT (%p => %p)", (p), (p)->SV))
+
+#define SV_SET(p,newsv)             \
+    if (((p)->SV) != (newsv)) { \
+        TRACE (("SV_CLEAR/set (%p => %p)", (p), (p)->SV)); \
+        if ((p)->SV) {                  \
+	    Tcl_DecrRefCount ((p)->SV); \
+        }				    \
+        (p)->SV = (newsv);		    \
+        TRACE (("SV_SET       (%p => %p)", (p), (p)->SV)); \
+        if ((p)->SV) {                  \
+	    Tcl_IncrRefCount ((p)->SV); \
+        } \
+    }
+
+#define SV_CLEAR(p)                 \
+    TRACE (("SV_CLEAR (%p => %p)", (p), (p)->SV)); \
+    if ((p)->SV) {                  \
+	Tcl_DecrRefCount ((p)->SV); \
+    }				    \
+    (p)->SV = NULL
+
+#define ER_INIT(p)             \
+    p->ER = NULL; \
+    TRACE (("ER_INIT (%p => %p)", (p), (p)->ER))
+
+#define ER_CLEAR(p)             \
+    error_state_free ((p)->ER);	\
+    (p)->ER = NULL
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE RDE_PARAM
+rde_param_new (long int nstr, char** strings)
+{
+    RDE_PARAM p;
+
+    ENTER ("rde_param_new");
+    TRACE (("\tINT %d strings @ %p", nstr, strings));
+
+    p = ALLOC (RDE_PARAM_);
+    p->numstr = nstr;
+    p->string = strings;
+
+    p->readbuf = Tcl_NewObj ();
+    Tcl_IncrRefCount (p->readbuf);
+
+    TRACE (("\tTcl_Obj* readbuf %p used %d", p->readbuf,p->readbuf->refCount));
+
+    Tcl_InitHashTable (&p->NC, TCL_ONE_WORD_KEYS);
+
+    p->IN   = NULL;
+    p->CL   = -1;
+    p->ST   = 0;
+
+    ER_INIT (p);
+    SV_INIT (p);
+
+    p->CC   = NULL;
+    p->CC_len = 0;
+
+    p->TC   = rde_tc_new ();
+    p->ES   = rde_stack_new (error_state_free);
+    p->LS   = rde_stack_new (NULL);
+    p->ast  = rde_stack_new (ast_node_free);
+    p->mark = rde_stack_new (NULL);
+
+    RETURN ("%p", p);
+}
+
+SCOPE void 
+rde_param_del (RDE_PARAM p)
+{
+    ENTER ("rde_param_del");
+    TRACE (("RDE_PARAM %p",p));
+
+    ER_CLEAR (p);                 TRACE (("\ter_clear"));
+    SV_CLEAR (p);                 TRACE (("\tsv_clear"));
+
+    nc_clear (p);                 TRACE (("\tnc_clear"));
+    Tcl_DeleteHashTable (&p->NC); TRACE (("\tnc hashtable delete"));
+
+    rde_tc_del    (p->TC);        TRACE (("\ttc clear"));
+    rde_stack_del (p->ES);        TRACE (("\tes clear"));
+    rde_stack_del (p->LS);        TRACE (("\tls clear"));
+    rde_stack_del (p->ast);       TRACE (("\tast clear"));
+    rde_stack_del (p->mark);      TRACE (("\tmark clear"));
+
+    TRACE (("\tTcl_Obj* readbuf %p used %d", p->readbuf,p->readbuf->refCount));
+
+    Tcl_DecrRefCount (p->readbuf);
+    ckfree ((char*) p);
+
+    RETURNVOID;
+}
+
+SCOPE void 
+rde_param_reset (RDE_PARAM p, Tcl_Channel chan)
+{
+    ENTER ("rde_param_reset");
+    TRACE (("RDE_PARAM   %p",p));
+    TRACE (("Tcl_Channel %p",chan));
+
+    p->IN  = chan;
+    p->CL  = -1;
+    p->ST  = 0;
+
+    p->CC  = NULL;
+    p->CC_len = 0;
+
+    ER_CLEAR (p);
+    SV_CLEAR (p);
+    nc_clear (p);
+
+    rde_tc_clear   (p->TC);
+    rde_stack_trim (p->ES,   0);
+    rde_stack_trim (p->LS,   0);
+    rde_stack_trim (p->ast,  0);
+    rde_stack_trim (p->mark, 0);
+
+    TRACE (("\tTcl_Obj* readbuf %p used %d", p->readbuf,p->readbuf->refCount));
+
+    RETURNVOID;
+}
+
+SCOPE void
+rde_param_update_strings (RDE_PARAM p, long int nstr, char** strings)
+{
+    ENTER ("rde_param_update_strings");
+    TRACE (("RDE_PARAM %p", p));
+    TRACE (("INT       %d strings", nstr));
+
+    p->numstr = nstr;
+    p->string = strings;
+
+    RETURNVOID;
+}
+
+SCOPE void
+rde_param_data (RDE_PARAM p, char* buf, long int len)
+{
+    (void) rde_tc_append (p->TC, buf, len);
+}
+
+SCOPE void
+rde_param_clientdata (RDE_PARAM p, ClientData clientData)
+{
+    p->clientData = clientData;
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+static void
+nc_clear (RDE_PARAM p)
+{
+    Tcl_HashSearch hs;
+    Tcl_HashEntry* he;
+    Tcl_HashTable* tablePtr;
+
+    for(he = Tcl_FirstHashEntry(&p->NC, &hs);
+	he != NULL;
+	he = Tcl_FirstHashEntry(&p->NC, &hs)) {
+
+	Tcl_HashSearch hsc;
+	Tcl_HashEntry* hec;
+
+	tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (he);
+
+	for(hec = Tcl_FirstHashEntry(tablePtr, &hsc);
+	    hec != NULL;
+	    hec = Tcl_NextHashEntry(&hsc)) {
+
+	    NC_STATE* scs = Tcl_GetHashValue (hec);
+	    error_state_free (scs->ER);
+	    if (scs->SV) { Tcl_DecrRefCount (scs->SV); }
+	    ckfree ((char*) scs);
+	}
+
+	Tcl_DeleteHashTable (tablePtr);
+	ckfree ((char*) tablePtr);
+	Tcl_DeleteHashEntry (he);
+    }
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE ClientData
+rde_param_query_clientdata (RDE_PARAM p)
+{
+    return p->clientData;
+}
+
+SCOPE void
+rde_param_query_amark (RDE_PARAM p, long int* mc, void*** mv)
+{
+    rde_stack_get (p->mark, mc, mv);
+}
+
+SCOPE void
+rde_param_query_ast (RDE_PARAM p, long int* ac, Tcl_Obj*** av)
+{
+    rde_stack_get (p->ast, ac, (void***) av);
+}
+
+SCOPE const char*
+rde_param_query_in (RDE_PARAM p)
+{
+    return p->IN
+	? Tcl_GetChannelName (p->IN)
+	: "";
+}
+
+SCOPE const char*
+rde_param_query_cc (RDE_PARAM p, long int* len)
+{
+    *len = p->CC_len;
+    return p->CC;
+}
+
+SCOPE int
+rde_param_query_cl (RDE_PARAM p)
+{
+    return p->CL;
+}
+
+SCOPE const ERROR_STATE*
+rde_param_query_er (RDE_PARAM p)
+{
+    return p->ER;
+}
+
+SCOPE Tcl_Obj*
+rde_param_query_er_tcl (RDE_PARAM p, const ERROR_STATE* er)
+{
+    Tcl_Obj* res;
+
+    if (!er) {
+	/*
+	 * Consider keeping one of these around in the main object state, for
+	 * quick return.
+	 */
+	res = Tcl_NewStringObj ("", 0);
+    } else {
+	Tcl_Obj* ov [2];
+	Tcl_Obj** mov;
+	long int  mc, i, j;
+	void** mv;
+	int lastid;
+	const char* msg;
+
+	rde_stack_get (er->msg, &mc, &mv);
+
+	/*
+	 * Note: We are peeking inside the (message) stack here and are
+	 * modifying it in place. This doesn't matter, we are using the stack
+	 * code for convenience, not for the ordering.
+	 */
+
+	qsort (mv, mc, sizeof (void*), er_int_compare);
+
+	/*
+	 * Convert message ids to strings. We ignore duplicates, by comparing
+	 * to the last processed id. Here the sorting (see above) comes into
+	 * play, we know that duplicates are bunched together in runs, making
+	 * it easy to drop them.
+	 */
+
+	mov = NALLOC (mc, Tcl_Obj*);
+	lastid = -1;
+	for (i=0, j=0; i < mc; i++) {
+	    ASSERT_BOUNDS (i,mc);
+
+	    if (((long int) mv [i]) == lastid) continue;
+	    lastid = (long int) mv [i];
+
+	    ASSERT_BOUNDS((long int) mv[i],p->numstr);
+	    msg = p->string [(long int) mv[i]]; /* inlined query_string */
+
+	    ASSERT_BOUNDS (j,mc);
+	    mov [j] = Tcl_NewStringObj (msg, -1);
+	    j++;
+	}
+
+	/*
+	 * Assemble the result.
+	 */
+
+	ov [0] = Tcl_NewIntObj  (er->loc);
+	ov [1] = Tcl_NewListObj (j, mov);
+
+	res = Tcl_NewListObj (2, ov);
+
+	ckfree ((char*) mov);
+    }
+
+    return res;
+}
+
+SCOPE void
+rde_param_query_es (RDE_PARAM p, long int* ec, ERROR_STATE*** ev)
+{
+    rde_stack_get (p->ES, ec, (void***) ev);
+}
+
+SCOPE void
+rde_param_query_ls (RDE_PARAM p, long int* lc, void*** lv)
+{
+    rde_stack_get (p->LS, lc, lv);
+}
+
+SCOPE long int
+rde_param_query_lstop (RDE_PARAM p)
+{
+    return (long int) rde_stack_top (p->LS);
+}
+
+SCOPE Tcl_HashTable*
+rde_param_query_nc (RDE_PARAM p)
+{
+    return &p->NC;
+}
+
+SCOPE int
+rde_param_query_st (RDE_PARAM p)
+{
+    return p->ST;
+}
+
+SCOPE Tcl_Obj*
+rde_param_query_sv (RDE_PARAM p)
+{
+    TRACE (("SV_QUERY %p => (%p)", (p), (p)->SV)); \
+    return p->SV;
+}
+
+SCOPE long int
+rde_param_query_tc_size (RDE_PARAM p)
+{
+    return rde_tc_size (p->TC);
+}
+
+SCOPE void
+rde_param_query_tc_get_s (RDE_PARAM p, long int at, long int last, char** ch, long int* len)
+{
+    rde_tc_get_s (p->TC, at, last, ch, len);
+}
+
+SCOPE const char*
+rde_param_query_string (RDE_PARAM p, long int id)
+{
+    TRACE (("rde_param_query_string (RDE_PARAM %p, %d/%d)", p, id, p->numstr));
+
+    ASSERT_BOUNDS(id,p->numstr);
+
+    return p->string [id];
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE void
+rde_param_i_ast_pop_discard (RDE_PARAM p)
+{
+    rde_stack_pop (p->mark, 1);
+}
+
+SCOPE void
+rde_param_i_ast_pop_rewind (RDE_PARAM p)
+{
+    long int trim = (long int) rde_stack_top (p->mark);
+
+    ENTER ("rde_param_i_ast_pop_rewind");
+    TRACE (("RDE_PARAM %p",p));
+
+    rde_stack_pop  (p->mark, 1);
+    rde_stack_trim (p->ast, trim);
+
+    TRACE (("SV = (%p rc%d '%s')",
+	    p->SV,
+	    p->SV ? p->SV->refCount       : -1,
+	    p->SV ? Tcl_GetString (p->SV) : ""));
+    RETURNVOID;
+}
+
+SCOPE void
+rde_param_i_ast_rewind (RDE_PARAM p)
+{
+    long int trim = (long int) rde_stack_top (p->mark);
+
+    ENTER ("rde_param_i_ast_rewind");
+    TRACE (("RDE_PARAM %p",p));
+
+    rde_stack_trim (p->ast, trim);
+
+    TRACE (("SV = (%p rc%d '%s')",
+	    p->SV,
+	    p->SV ? p->SV->refCount       : -1,
+	    p->SV ? Tcl_GetString (p->SV) : ""));
+    RETURNVOID;
+}
+
+SCOPE void
+rde_param_i_ast_push (RDE_PARAM p)
+{
+    rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+}
+
+SCOPE void
+rde_param_i_ast_value_push (RDE_PARAM p)
+{
+    ENTER ("rde_param_i_ast_value_push");
+    TRACE (("RDE_PARAM %p",p));
+
+    ASSERT(p->SV,"Unable to push undefined semantic value");
+    TRACE (("rde_param_i_ast_value_push %p => (%p)", p, p->SV));
+    TRACE (("SV = (%p rc%d '%s')", p->SV, p->SV->refCount, Tcl_GetString (p->SV)));
+
+    rde_stack_push (p->ast, p->SV);
+    Tcl_IncrRefCount (p->SV);
+
+    RETURNVOID;
+}
+
+static void
+ast_node_free (void* n)
+{
+    Tcl_DecrRefCount ((Tcl_Obj*) n);
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE void
+rde_param_i_error_clear (RDE_PARAM p)
+{
+    ER_CLEAR (p);
+}
+
+SCOPE void
+rde_param_i_error_nonterminal (RDE_PARAM p, long int s)
+{
+    /*
+     * Disabled. Generate only low-level errors until we have worked out how
+     * to integrate symbol information with them. Do not forget where this
+     * instruction is inlined - No such exist, places using the instruction
+     * directly call on this function.
+     */
+    return;
+#if 0
+    long int pos;
+    if (!p->ER) return;
+    pos = 1 + (long int) rde_stack_top (p->LS);
+    if (p->ER->loc != pos) return;
+    error_set (p, s);
+    p->ER->loc = pos;
+#endif
+}
+
+SCOPE void
+rde_param_i_error_pop_merge (RDE_PARAM p)
+{
+    ERROR_STATE* top = (ERROR_STATE*) rde_stack_top (p->ES);
+
+    /*
+     * The states are identical. Nothing has to be done in that case.
+     */
+
+    if (top == p->ER) {
+	rde_stack_pop (p->ES, 1);
+	return;
+    }
+
+    /*
+     * Saved state is nothing, keep current, discard top.
+     * No refCount to change.
+     */
+
+    if (!top) {
+	rde_stack_pop (p->ES, 1);
+	return;
+    }
+
+    /*
+     * Current state is nothing, keep top, dicard current. We 'drop' as we are
+     * taking ownership of the error state in 'top' back from the stack.
+     */
+
+    if (!p->ER) {
+	rde_stack_drop (p->ES, 1);
+	p->ER = top;
+
+	/*
+	 * Note: The refCount of top is left unchanged. The reference lost
+	 * through the drop is taken over by ER.
+	 */
+	return;
+    }
+
+    /*
+     * Both top and current have data. Compare their locations to determine
+     * which to keep, or discard, respectively.
+     *
+     * The current state is farther ahead in the input, keep it, and discard
+     * the saved information.
+     */
+
+    if (top->loc < p->ER->loc) {
+	rde_stack_pop (p->ES, 1);
+	return;
+    }
+
+    /*
+     * The saved state is farther ahead than the current one, keep it, discard
+     * current. We 'drop' as we are taking ownership of the error state in
+     * 'top' back from the stack.
+     */
+
+    if (top->loc > p->ER->loc) {
+	rde_stack_drop (p->ES, 1);
+	error_state_free (p->ER);
+	p->ER = top;
+
+	/*
+	 * Note: The refCount of top is left unchanged. The reference lost
+	 * through the drop is taken over by ER.
+	 */
+	return;
+    }
+
+    /*
+     * Both states describe the same location. We merge the message sets. We
+     * do not make the set unique however. This can be defered until the data
+     * is actually retrieved by the user of the PARAM.
+     */
+
+    rde_stack_move (p->ER->msg, top->msg);
+    rde_stack_pop  (p->ES, 1);
+}
+
+SCOPE void
+rde_param_i_error_push (RDE_PARAM p)
+{
+    rde_stack_push (p->ES, p->ER);
+    if (p->ER) { p->ER->refCount ++; }
+}
+
+static void
+error_set (RDE_PARAM p, long int s)
+{
+    error_state_free (p->ER);
+
+    p->ER = ALLOC (ERROR_STATE);
+    p->ER->refCount = 1;
+    p->ER->loc      = p->CL;
+    p->ER->msg      = rde_stack_new (NULL);
+
+    ASSERT_BOUNDS(s,p->numstr);
+
+    rde_stack_push (p->ER->msg, (void*) s);
+}
+
+static void
+error_state_free (void* esx)
+{
+    ERROR_STATE* es = esx;
+
+    if (!es) return;
+
+    es->refCount --;
+    if (es->refCount > 0) return;
+
+    rde_stack_del (es->msg);
+    ckfree ((char*) es);
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE void
+rde_param_i_loc_pop_discard (RDE_PARAM p)
+{
+    rde_stack_pop (p->LS, 1);
+}
+
+SCOPE void
+rde_param_i_loc_pop_rewind (RDE_PARAM p)
+{
+    p->CL = (long int) rde_stack_top (p->LS);
+    rde_stack_pop (p->LS, 1);
+}
+
+SCOPE void
+rde_param_i_loc_push (RDE_PARAM p)
+{
+    rde_stack_push (p->LS, (void*) p->CL);
+}
+
+SCOPE void
+rde_param_i_loc_rewind (RDE_PARAM p)
+{
+    p->CL = (long int) rde_stack_top (p->LS);
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE void
+rde_param_i_input_next (RDE_PARAM p, long int m)
+{
+    int leni;
+    char* ch;
+
+    ASSERT_BOUNDS(m,p->numstr);
+
+    p->CL ++;
+
+    if (p->CL < rde_tc_size (p->TC)) {
+	/*
+	 * We are at a known position, we can and do take the associated
+	 * character out of the token cache.
+	 *
+	 * FUTURE :: keep track of what location the data stored in CC is
+	 * for. If the location is identical no extraction is required. This
+	 * may help when a choice repeatedly tests the same character.
+	 */
+
+	rde_tc_get (p->TC, p->CL, &p->CC, &p->CC_len);
+	/* Note: BOUNDS(n) <=> [0..(n-1)].
+	 * cc_len in [1..utfmax] <=> cc_len-1 in [0...utfmax-1] <=> BOUNDS(utfmax)
+	 */
+	ASSERT_BOUNDS (p->CC_len-1, TCL_UTF_MAX);
+
+	p->ST = 1;
+	ER_CLEAR (p);
+	return;
+    }
+
+    if (!p->IN || 
+	Tcl_Eof (p->IN) ||
+	(Tcl_ReadChars (p->IN, p->readbuf, 1, 0) <= 0)) {
+	/*
+	 * As we are outside of the known range we tried to read a character
+	 * from the input, to extend the token cache with. That failed.
+	 */
+
+	p->ST = 0;
+	error_set (p, m);
+	return;
+    }
+
+    /*
+     * We got a new character, we now extend the token cache, and also make it
+     * current.
+     */
+
+    ch = Tcl_GetStringFromObj (p->readbuf, &leni);
+    ASSERT_BOUNDS (leni, TCL_UTF_MAX);
+
+    p->CC = rde_tc_append (p->TC, ch, leni);
+    p->CC_len = leni;
+
+    p->ST = 1;
+    ER_CLEAR (p);
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE void
+rde_param_i_status_fail (RDE_PARAM p)
+{
+    p->ST = 0;
+}
+
+SCOPE void
+rde_param_i_status_ok (RDE_PARAM p)
+{
+    p->ST = 1;
+}
+
+SCOPE void
+rde_param_i_status_negate (RDE_PARAM p)
+{
+    p->ST = !p->ST;
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE int 
+rde_param_i_symbol_restore (RDE_PARAM p, long int s)
+{
+    NC_STATE*      scs;
+    Tcl_HashEntry* hPtr;
+    Tcl_HashTable* tablePtr;
+
+    /*
+     * 2-level hash table keyed by location, and symbol ...
+     */
+
+    hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL);
+    if (!hPtr) { return 0; }
+
+    tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
+    hPtr = Tcl_FindHashEntry (tablePtr, (char*) s);
+    if (!hPtr) { return 0; }
+
+    /*
+     * Found information, apply it to the state, restoring the cached
+     * situation.
+     */
+
+    scs = Tcl_GetHashValue (hPtr);
+
+    p->CL = scs->CL;
+    p->ST = scs->ST;
+
+    error_state_free (p->ER);
+    p->ER = scs->ER;
+    if (p->ER) { p->ER->refCount ++; }
+
+    TRACE (("SV_RESTORE (%p) '%s'",scs->SV, scs->SV ? Tcl_GetString (scs->SV):""));
+
+    SV_SET (p, scs->SV);
+
+    return 1;
+}
+
+SCOPE void
+rde_param_i_symbol_save (RDE_PARAM p, long int s)
+{
+    long int       at = (long int) rde_stack_top (p->LS);
+    NC_STATE*      scs;
+    Tcl_HashEntry* hPtr;
+    Tcl_HashTable* tablePtr;
+    int            isnew;
+
+    ENTER ("rde_param_i_symbol_save");
+    TRACE (("RDE_PARAM %p",p));
+    TRACE (("INT       %d",s));
+
+    /*
+     * 2-level hash table keyed by location, and symbol ...
+     */
+
+    hPtr = Tcl_CreateHashEntry (&p->NC, (char*) at, &isnew);
+
+    if (isnew) {
+	tablePtr = ALLOC (Tcl_HashTable);
+	Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS);
+	Tcl_SetHashValue (hPtr, tablePtr);
+    } else {
+	tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
+    }
+
+    hPtr = Tcl_CreateHashEntry (tablePtr, (char*) s, &isnew);
+
+    if (isnew) {
+	/*
+	 * Copy state into new cache entry.
+	 */
+
+	scs = ALLOC (NC_STATE);
+	scs->CL = p->CL;
+	scs->ST = p->ST;
+
+	TRACE (("SV_CACHE (%p '%s')", p->SV, p->SV ? Tcl_GetString(p->SV) : ""));
+
+	scs->SV = p->SV;
+	if (scs->SV) { Tcl_IncrRefCount (scs->SV); }
+
+	scs->ER = p->ER;
+	if (scs->ER) { scs->ER->refCount ++; }
+
+	Tcl_SetHashValue (hPtr, scs);
+    } else {
+	/*
+	 * Copy state into existing cache entry, overwriting the previous
+	 * information.
+	 */
+
+	scs = (NC_STATE*) Tcl_GetHashValue (hPtr);
+
+	scs->CL = p->CL;
+	scs->ST = p->ST;
+
+	TRACE (("SV_CACHE/over (%p '%s')", p->SV, p->SV ? Tcl_GetString(p->SV) : "" ));
+
+	if (scs->SV) { Tcl_DecrRefCount (scs->SV); }
+	scs->SV = p->SV;
+	if (scs->SV) { Tcl_IncrRefCount (scs->SV); }
+
+	error_state_free (scs->ER);
+	scs->ER = p->ER;
+	if (scs->ER) { scs->ER->refCount ++; }
+    }
+
+    TRACE (("SV = (%p rc%d '%s')",
+	    p->SV,
+	    p->SV ? p->SV->refCount       : -1,
+	    p->SV ? Tcl_GetString (p->SV) : ""));
+    RETURNVOID;
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE void
+rde_param_i_test_alnum (RDE_PARAM p)
+{
+    test_class (p, Tcl_UniCharIsAlnum, tc_alnum);
+}
+
+SCOPE void
+rde_param_i_test_alpha (RDE_PARAM p)
+{
+    test_class (p, Tcl_UniCharIsAlpha, tc_alpha);
+}
+
+SCOPE void
+rde_param_i_test_ascii (RDE_PARAM p)
+{
+    test_class (p, UniCharIsAscii, tc_ascii);
+}
+
+SCOPE void
+rde_param_i_test_control (RDE_PARAM p)
+{
+    test_class (p, Tcl_UniCharIsControl, tc_control);
+}
+
+SCOPE void
+rde_param_i_test_char (RDE_PARAM p, const char* c, long int msg)
+{
+    ASSERT_BOUNDS(msg,p->numstr);
+
+    p->ST = Tcl_UtfNcmp (p->CC, c, 1) == 0;
+
+    if (p->ST) {
+	ER_CLEAR (p);
+    } else {
+	error_set (p, msg);
+	p->CL --;
+    }
+}
+
+SCOPE void
+rde_param_i_test_ddigit (RDE_PARAM p)
+{
+    test_class (p, UniCharIsDecDigit, tc_ddigit);
+}
+
+SCOPE void
+rde_param_i_test_digit (RDE_PARAM p)
+{
+    test_class (p, Tcl_UniCharIsDigit, tc_digit);
+}
+
+SCOPE void
+rde_param_i_test_graph (RDE_PARAM p)
+{
+    test_class (p, Tcl_UniCharIsGraph, tc_graph);
+}
+
+SCOPE void
+rde_param_i_test_lower (RDE_PARAM p)
+{
+    test_class (p, Tcl_UniCharIsLower, tc_lower);
+}
+
+SCOPE void
+rde_param_i_test_print (RDE_PARAM p)
+{
+    test_class (p, Tcl_UniCharIsPrint, tc_printable);
+}
+
+SCOPE void
+rde_param_i_test_punct (RDE_PARAM p)
+{
+    test_class (p, Tcl_UniCharIsPunct, tc_punct);
+}
+
+SCOPE void
+rde_param_i_test_range (RDE_PARAM p, const char* s, const char* e, long int msg)
+{
+    ASSERT_BOUNDS(msg,p->numstr);
+
+    p->ST =
+	(Tcl_UtfNcmp (s, p->CC, 1) <= 0) &&
+	(Tcl_UtfNcmp (p->CC, e, 1) <= 0);
+
+    if (p->ST) {
+	ER_CLEAR (p);
+    } else {
+	error_set (p, msg);
+	p->CL --;
+    }
+}
+
+SCOPE void
+rde_param_i_test_space (RDE_PARAM p)
+{
+    test_class (p, Tcl_UniCharIsSpace, tc_space);
+}
+
+SCOPE void
+rde_param_i_test_upper (RDE_PARAM p)
+{
+    test_class (p, Tcl_UniCharIsUpper, tc_upper);
+}
+
+SCOPE void
+rde_param_i_test_wordchar (RDE_PARAM p)
+{
+    test_class (p, Tcl_UniCharIsWordChar, tc_wordchar);
+}
+
+SCOPE void
+rde_param_i_test_xdigit (RDE_PARAM p)
+{
+    test_class (p, UniCharIsHexDigit, tc_xdigit);
+}
+
+static void
+test_class (RDE_PARAM p, UniCharClass class, test_class_id id)
+{
+    Tcl_UniChar ch;
+    Tcl_UtfToUniChar(p->CC, &ch);
+
+    ASSERT_BOUNDS(id,p->numstr);
+
+    p->ST = !!class (ch);
+
+    /* The double-negation normalizes the output of the class function to the
+     * regular booleans 0 and 1.
+     */
+
+    if (p->ST) {
+	ER_CLEAR (p);
+    } else {
+	error_set (p, id);
+	p->CL --;
+    }
+}
+
+static int
+UniCharIsAscii (int character)
+{
+    return (character >= 0) && (character < 0x80);
+}
+
+static int
+UniCharIsHexDigit (int character)
+{
+    return (character >= 0) && (character < 0x80) && isxdigit(character);
+}
+
+static int
+UniCharIsDecDigit (int character)
+{
+    return (character >= 0) && (character < 0x80) && isdigit(character);
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE void
+rde_param_i_value_clear (RDE_PARAM p)
+{
+    SV_CLEAR (p);
+}
+
+SCOPE void
+rde_param_i_value_leaf (RDE_PARAM p, long int s)
+{
+    Tcl_Obj* newsv;
+    Tcl_Obj* ov [3];
+    long int pos = 1 + (long int) rde_stack_top (p->LS);
+
+    ASSERT_BOUNDS(s,p->numstr);
+
+    ov [0] = Tcl_NewStringObj (p->string[s], -1);
+    ov [1] = Tcl_NewIntObj (pos);
+    ov [2] = Tcl_NewIntObj (p->CL);
+
+    newsv = Tcl_NewListObj (3, ov);
+
+    TRACE (("rde_param_i_value_leaf => '%s'",Tcl_GetString (newsv)));
+
+    SV_SET (p, newsv);
+}
+
+SCOPE void
+rde_param_i_value_reduce (RDE_PARAM p, long int s)
+{
+    Tcl_Obj*  newsv;
+    int       i, j;
+    Tcl_Obj** ov;
+    long int  ac;
+    Tcl_Obj** av;
+
+    long int pos   = 1 + (long int) rde_stack_top (p->LS);
+    long int mark  = (long int) rde_stack_top (p->mark);
+    long int asize = rde_stack_size (p->ast);
+    long int new   = asize - mark;
+
+    ASSERT (new >= 0, "Bad number of elements to reduce");
+
+    ov = NALLOC (3+new, Tcl_Obj*);
+
+    ASSERT_BOUNDS(s,p->numstr);
+
+    ov [0] = Tcl_NewStringObj (p->string[s], -1);
+    ov [1] = Tcl_NewIntObj (pos);
+    ov [2] = Tcl_NewIntObj (p->CL);
+
+    rde_stack_get (p->ast, &ac, (void***) &av);
+    for (i = 3, j = mark; j < asize; i++, j++) {
+	ASSERT_BOUNDS (i, 3+new);
+	ASSERT_BOUNDS (j, ac);
+	ov [i] = av [j];
+    }
+
+    ASSERT (i == 3+new, "Reduction result incomplete");
+    newsv = Tcl_NewListObj (3+new, ov);
+
+    TRACE (("rde_param_i_value_reduce => '%s'",Tcl_GetString (newsv)));
+
+    SV_SET (p, newsv);
+    ckfree ((char*) ov);
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+static int
+er_int_compare (const void* a, const void* b)
+{
+    /* a, b = pointers to element, as void*.
+     * Actual element type is (void*), and
+     * actually stored data is (long int).
+     */
+
+    const void** ael = (const void**) a;
+    const void** bel = (const void**) b;
+
+    long int avalue = (long int) *ael;
+    long int bvalue = (long int) *bel;
+
+    if (avalue < bvalue) { return -1; }
+    if (avalue > bvalue) { return  1; }
+    return 0;
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ * == Super Instructions.
+ */
+
+SCOPE int
+rde_param_i_symbol_start (RDE_PARAM p, long int s)
+{
+    if (rde_param_i_symbol_restore (p, s)) {
+	if (p->ST) {
+	    rde_stack_push (p->ast, p->SV);
+	    Tcl_IncrRefCount (p->SV);
+	}
+	return 1;
+    }
+
+    rde_stack_push (p->LS, (void*) p->CL);
+    return 0;
+}
+
+SCOPE int
+rde_param_i_symbol_start_d (RDE_PARAM p, long int s)
+{
+    if (rde_param_i_symbol_restore (p, s)) {
+	if (p->ST) {
+	    rde_stack_push (p->ast, p->SV);
+	    Tcl_IncrRefCount (p->SV);
+	}
+	return 1;
+    }
+
+    rde_stack_push (p->LS,   (void*) p->CL);
+    rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+    return 0;
+}
+
+SCOPE int
+rde_param_i_symbol_void_start (RDE_PARAM p, long int s)
+{
+    if (rde_param_i_symbol_restore (p, s)) return 1;
+
+    rde_stack_push (p->LS, (void*) p->CL);
+    return 0;
+}
+
+SCOPE int
+rde_param_i_symbol_void_start_d (RDE_PARAM p, long int s)
+{
+    if (rde_param_i_symbol_restore (p, s)) return 1;
+
+    rde_stack_push (p->LS,   (void*) p->CL);
+    rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+    return 0;
+}
+
+SCOPE void
+rde_param_i_symbol_done_d_reduce (RDE_PARAM p, long int s, long int m)
+{
+    if (p->ST) {
+	rde_param_i_value_reduce (p, s);
+    } else {
+	SV_CLEAR (p);
+    }
+
+    rde_param_i_symbol_save       (p, s);
+    rde_param_i_error_nonterminal (p, m);
+    rde_param_i_ast_pop_rewind    (p);
+
+    rde_stack_pop (p->LS, 1);
+
+    if (p->ST) {
+	rde_stack_push (p->ast, p->SV);
+	Tcl_IncrRefCount (p->SV);
+    }
+}
+
+SCOPE void
+rde_param_i_symbol_done_leaf (RDE_PARAM p, long int s, long int m)
+{
+    if (p->ST) {
+	rde_param_i_value_leaf (p, s);
+    } else {
+	SV_CLEAR (p);
+    }
+
+    rde_param_i_symbol_save       (p, s);
+    rde_param_i_error_nonterminal (p, m);
+
+    rde_stack_pop (p->LS, 1);
+
+    if (p->ST) {
+	rde_stack_push (p->ast, p->SV);
+	Tcl_IncrRefCount (p->SV);
+    }
+}
+
+SCOPE void
+rde_param_i_symbol_done_d_leaf (RDE_PARAM p, long int s, long int m)
+{
+    if (p->ST) {
+	rde_param_i_value_leaf (p, s);
+    } else {
+	SV_CLEAR (p);
+    }
+
+    rde_param_i_symbol_save       (p, s);
+    rde_param_i_error_nonterminal (p, m);
+    rde_param_i_ast_pop_rewind    (p);
+
+    rde_stack_pop (p->LS, 1);
+
+    if (p->ST) {
+	rde_stack_push (p->ast, p->SV);
+	Tcl_IncrRefCount (p->SV);
+    }
+}
+
+SCOPE void
+rde_param_i_symbol_done_void (RDE_PARAM p, long int s, long int m)
+{
+    SV_CLEAR (p);
+    rde_param_i_symbol_save       (p, s);
+    rde_param_i_error_nonterminal (p, m);
+
+    rde_stack_pop (p->LS, 1);
+}
+
+SCOPE void
+rde_param_i_symbol_done_d_void (RDE_PARAM p, long int s, long int m)
+{
+    SV_CLEAR (p);
+    rde_param_i_symbol_save       (p, s);
+    rde_param_i_error_nonterminal (p, m);
+    rde_param_i_ast_pop_rewind    (p);
+
+    rde_stack_pop (p->LS, 1);
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE void
+rde_param_i_next_char (RDE_PARAM p, const char* c, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_char (p, c, m);
+}
+
+SCOPE void
+rde_param_i_next_range (RDE_PARAM p, const char* s, const char* e, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_range (p, s, e, m);
+}
+
+SCOPE void
+rde_param_i_next_alnum (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_alnum (p);
+}
+
+SCOPE void
+rde_param_i_next_alpha (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_alpha (p);
+}
+
+SCOPE void
+rde_param_i_next_ascii (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_ascii (p);
+}
+
+SCOPE void
+rde_param_i_next_control (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_control (p);
+}
+
+SCOPE void
+rde_param_i_next_ddigit (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_ddigit (p);
+}
+
+SCOPE void
+rde_param_i_next_digit (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_digit (p);
+}
+
+SCOPE void
+rde_param_i_next_graph (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_graph (p);
+}
+
+SCOPE void
+rde_param_i_next_lower (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_lower (p);
+}
+
+SCOPE void
+rde_param_i_next_print (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_print (p);
+}
+
+SCOPE void
+rde_param_i_next_punct (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_punct (p);
+}
+
+SCOPE void
+rde_param_i_next_space (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_space (p);
+}
+
+SCOPE void
+rde_param_i_next_upper (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_upper (p);
+}
+
+SCOPE void
+rde_param_i_next_wordchar (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_wordchar (p);
+}
+
+SCOPE void
+rde_param_i_next_xdigit (RDE_PARAM p, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+    rde_param_i_test_xdigit (p);
+}
+
+SCOPE void
+rde_param_i_notahead_start_d (RDE_PARAM p)
+{
+    rde_stack_push (p->LS, (void*) p->CL);
+    rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+}
+
+SCOPE void
+rde_param_i_notahead_exit_d (RDE_PARAM p)
+{
+    if (p->ST) {
+	rde_param_i_ast_pop_rewind (p); 
+    } else {
+	rde_stack_pop (p->mark, 1);
+    }
+    p->CL = (long int) rde_stack_top (p->LS);
+    rde_stack_pop (p->LS, 1);
+    p->ST = !p->ST;
+}
+
+SCOPE void
+rde_param_i_notahead_exit (RDE_PARAM p)
+{
+    p->CL = (long int) rde_stack_top (p->LS);
+    rde_stack_pop (p->LS, 1);
+    p->ST = !p->ST;
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE void
+rde_param_i_state_push_2 (RDE_PARAM p)
+{
+    /* loc_push + error_push */
+    rde_stack_push (p->LS, (void*) p->CL);
+    rde_stack_push (p->ES, p->ER);
+    if (p->ER) { p->ER->refCount ++; }
+}
+
+SCOPE void
+rde_param_i_state_push_void (RDE_PARAM p)
+{
+    rde_stack_push (p->LS, (void*) p->CL);
+    ER_CLEAR (p);
+    rde_stack_push (p->ES, p->ER);
+    /* if (p->ER) { p->ER->refCount ++; } */
+}
+
+SCOPE void
+rde_param_i_state_push_value (RDE_PARAM p)
+{
+    rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+    rde_stack_push (p->LS, (void*) p->CL);
+    ER_CLEAR (p);
+    rde_stack_push (p->ES, p->ER);
+    /* if (p->ER) { p->ER->refCount ++; } */
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE void
+rde_param_i_state_merge_ok (RDE_PARAM p)
+{
+    rde_param_i_error_pop_merge (p);
+
+    if (!p->ST) {
+	p->ST = 1;
+	p->CL = (long int) rde_stack_top (p->LS);
+    }
+    rde_stack_pop (p->LS, 1);
+}
+
+SCOPE void
+rde_param_i_state_merge_void (RDE_PARAM p)
+{
+    rde_param_i_error_pop_merge (p);
+
+    if (!p->ST) {
+	p->CL = (long int) rde_stack_top (p->LS);
+    }
+    rde_stack_pop (p->LS, 1);
+}
+
+SCOPE void
+rde_param_i_state_merge_value (RDE_PARAM p)
+{
+    rde_param_i_error_pop_merge (p);
+
+    if (!p->ST) {
+	long int trim = (long int) rde_stack_top (p->mark);
+	rde_stack_trim (p->ast, trim);
+	p->CL = (long int) rde_stack_top (p->LS);
+    }
+    rde_stack_pop (p->mark, 1);
+    rde_stack_pop (p->LS, 1);
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE int
+rde_param_i_kleene_close (RDE_PARAM p)
+{
+    int stop = !p->ST;
+    rde_param_i_error_pop_merge (p);
+
+    if (stop) {
+	p->ST = 1;
+	p->CL = (long int) rde_stack_top (p->LS);
+    }
+
+    rde_stack_pop (p->LS, 1);
+    return stop;
+}
+
+SCOPE int
+rde_param_i_kleene_abort (RDE_PARAM p)
+{
+    int stop = !p->ST;
+
+    if (stop) {
+	p->CL = (long int) rde_stack_top (p->LS);
+    }
+
+    rde_stack_pop (p->LS, 1);
+    return stop;
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE int
+rde_param_i_seq_void2void (RDE_PARAM p)
+{
+    rde_param_i_error_pop_merge (p);
+
+    if (p->ST) {
+	rde_stack_push (p->ES, p->ER);
+	if (p->ER) { p->ER->refCount ++; }
+	return 0;
+    } else {
+	p->CL = (long int) rde_stack_top (p->LS);
+	rde_stack_pop (p->LS, 1);
+	return 1;
+    }
+}
+
+SCOPE int
+rde_param_i_seq_void2value (RDE_PARAM p)
+{
+    rde_param_i_error_pop_merge (p);
+
+    if (p->ST) {
+	rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+	rde_stack_push (p->ES, p->ER);
+	if (p->ER) { p->ER->refCount ++; }
+	return 0;
+    } else {
+	p->CL = (long int) rde_stack_top (p->LS);
+	rde_stack_pop (p->LS, 1);
+	return 1;
+    }
+}
+
+SCOPE int
+rde_param_i_seq_value2value (RDE_PARAM p)
+{
+    rde_param_i_error_pop_merge (p);
+
+    if (p->ST) {
+	rde_stack_push (p->ES, p->ER);
+	if (p->ER) { p->ER->refCount ++; }
+	return 0;
+    } else {
+	long int trim = (long int) rde_stack_top (p->mark);
+
+	rde_stack_pop  (p->mark, 1);
+	rde_stack_trim (p->ast, trim);
+
+	p->CL = (long int) rde_stack_top (p->LS);
+	rde_stack_pop (p->LS, 1);
+	return 1;
+    }
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE int
+rde_param_i_bra_void2void (RDE_PARAM p)
+{
+    rde_param_i_error_pop_merge (p);
+
+    if (p->ST) {
+	rde_stack_pop (p->LS, 1);
+    } else {
+	p->CL = (long int) rde_stack_top (p->LS);
+
+	rde_stack_push (p->ES, p->ER);
+	if (p->ER) { p->ER->refCount ++; }
+    }
+
+    return p->ST;
+}
+
+SCOPE int
+rde_param_i_bra_void2value (RDE_PARAM p)
+{
+    rde_param_i_error_pop_merge (p);
+
+    if (p->ST) {
+	rde_stack_pop (p->LS, 1);
+    } else {
+	rde_stack_push (p->mark, (void*) rde_stack_size (p->ast));
+	p->CL = (long int) rde_stack_top (p->LS);
+
+	rde_stack_push (p->ES, p->ER);
+	if (p->ER) { p->ER->refCount ++; }
+    }
+
+    return p->ST;
+}
+
+SCOPE int
+rde_param_i_bra_value2void (RDE_PARAM p)
+{
+    rde_param_i_error_pop_merge (p);
+
+    if (p->ST) {
+	rde_stack_pop (p->mark, 1);
+	rde_stack_pop (p->LS, 1);
+    } else {
+	long int trim = (long int) rde_stack_top (p->mark);
+	rde_stack_pop  (p->mark, 1);
+	rde_stack_trim (p->ast, trim);
+
+	p->CL = (long int) rde_stack_top (p->LS);
+
+	rde_stack_push (p->ES, p->ER);
+	if (p->ER) { p->ER->refCount ++; }
+    }
+
+    return p->ST;
+}
+
+SCOPE int
+rde_param_i_bra_value2value (RDE_PARAM p)
+{
+    rde_param_i_error_pop_merge (p);
+
+    if (p->ST) {
+	rde_stack_pop (p->mark, 1);
+	rde_stack_pop (p->LS, 1);
+    } else {
+	long int trim = (long int) rde_stack_top (p->mark);
+	rde_stack_trim (p->ast, trim);
+
+	p->CL = (long int) rde_stack_top (p->LS);
+
+	rde_stack_push (p->ES, p->ER);
+	if (p->ER) { p->ER->refCount ++; }
+    }
+
+    return p->ST;
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE void
+rde_param_i_next_str (RDE_PARAM p, const char* str, long int m)
+{
+    int at = p->CL;
+
+    /* Future: Place match string into a shared table of constants, like error
+     * messages, indexed by code. Precomputed length information.
+     *
+     * NOTE how we are modifying the error location after the fact. The
+     * message contains the entire string, so the location should be the
+     * start of the string in the input, not somewhere in the middle. This
+     * matches the Tcl runtimes. Here we have to adjust the stored location
+     * due to our progress through the pattern.
+     */
+
+    while (*str) {
+	rde_param_i_input_next (p, m);
+	if (!p->ST) {
+	    p->ER->loc = at+1;
+	    p->CL = at;
+	    return;
+	}
+
+	rde_param_i_test_char (p, str, m);
+	if (!p->ST) {
+	    p->ER->loc = at+1;
+	    p->CL = at;
+	    return;
+	}
+
+	str = Tcl_UtfNext (str);
+    }
+}
+
+SCOPE void
+rde_param_i_next_class (RDE_PARAM p, const char* class, long int m)
+{
+    rde_param_i_input_next (p, m);
+    if (!p->ST) return;
+
+    while (*class) {
+	p->ST = Tcl_UtfNcmp (p->CC, class, 1) == 0;
+
+	if (p->ST) {
+	    ER_CLEAR (p);
+	    return;
+	}
+
+	class = Tcl_UtfNext (class);
+    }
+
+    error_set (p, m);
+    p->CL --;
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+
+/*
+ * local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/param.h b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/param.h
new file mode 100644
index 00000000..3d9fb36c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/param.h
@@ -0,0 +1,183 @@
+/*
+ * = = == === ===== ======== ============= =====================
+ * == pt::rde (critcl) - Data Structures - PARAM architectural state.
+ */
+
+#ifndef _RDE_DS_PARAM_H
+#define _RDE_DS_PARAM_H 1
+
+#include "tcl.h"
+#include <util.h>  /* Scoping */
+#include <stack.h> /* Stack handling */
+
+/*
+ * The state structure is opaque, its internals are known only to the
+ * functions declared here.
+ */
+
+typedef struct RDE_PARAM_* RDE_PARAM;
+
+typedef struct ERROR_STATE {
+    int       refCount;
+    long int  loc;
+    RDE_STACK msg; /* long int :: error messages */
+} ERROR_STATE;
+
+typedef struct NC_STATE {
+    long int     CL;
+    long int     ST;
+    Tcl_Obj*     SV;
+    ERROR_STATE* ER;
+} NC_STATE;
+
+/* SKIP START */
+/* Admin
+ */
+
+SCOPE RDE_PARAM rde_param_new            (long int n, char** strings);
+SCOPE void      rde_param_del            (RDE_PARAM p);
+SCOPE void      rde_param_reset          (RDE_PARAM p, Tcl_Channel chan);
+SCOPE void      rde_param_update_strings (RDE_PARAM p, long int n, char** strings);
+SCOPE void      rde_param_data           (RDE_PARAM p, char* buf, long int len);
+SCOPE void      rde_param_clientdata     (RDE_PARAM p, ClientData clientData);
+
+/* Accessors
+ */
+
+SCOPE ClientData         rde_param_query_clientdata (RDE_PARAM p);
+SCOPE void               rde_param_query_amark   (RDE_PARAM p, long int* mc, void*** mv);
+SCOPE void               rde_param_query_ast     (RDE_PARAM p, long int* ac, Tcl_Obj*** av);
+SCOPE const char*        rde_param_query_in      (RDE_PARAM p);
+SCOPE const char*        rde_param_query_cc      (RDE_PARAM p, long int* len);
+SCOPE int                rde_param_query_cl      (RDE_PARAM p);
+SCOPE const ERROR_STATE* rde_param_query_er      (RDE_PARAM p);
+SCOPE Tcl_Obj*           rde_param_query_er_tcl  (RDE_PARAM p, const ERROR_STATE* er);
+SCOPE void               rde_param_query_es      (RDE_PARAM p, long int* ec, ERROR_STATE*** ev);
+SCOPE void               rde_param_query_ls      (RDE_PARAM p, long int* lc, void*** lv);
+SCOPE long int           rde_param_query_lstop   (RDE_PARAM p);
+SCOPE Tcl_HashTable*     rde_param_query_nc      (RDE_PARAM p);
+SCOPE int                rde_param_query_st      (RDE_PARAM p);
+SCOPE Tcl_Obj*           rde_param_query_sv      (RDE_PARAM p);
+SCOPE long int           rde_param_query_tc_size (RDE_PARAM p);
+SCOPE void               rde_param_query_tc_get_s (RDE_PARAM p, long int at, long int last, char** ch, long int* len);
+SCOPE const char*        rde_param_query_string  (RDE_PARAM p, long int id);
+
+/* Instructions
+ */
+
+SCOPE void rde_param_i_ast_pop_discard   (RDE_PARAM p);
+SCOPE void rde_param_i_ast_pop_rewind    (RDE_PARAM p);
+SCOPE void rde_param_i_ast_push          (RDE_PARAM p);
+SCOPE void rde_param_i_ast_rewind        (RDE_PARAM p);
+SCOPE void rde_param_i_ast_value_push    (RDE_PARAM p);
+
+SCOPE void rde_param_i_error_clear       (RDE_PARAM p);
+SCOPE void rde_param_i_error_nonterminal (RDE_PARAM p, long int s);
+SCOPE void rde_param_i_error_pop_merge   (RDE_PARAM p);
+SCOPE void rde_param_i_error_push        (RDE_PARAM p);
+
+SCOPE void rde_param_i_loc_pop_discard   (RDE_PARAM p);
+SCOPE void rde_param_i_loc_pop_rewind    (RDE_PARAM p);
+SCOPE void rde_param_i_loc_push          (RDE_PARAM p);
+SCOPE void rde_param_i_loc_rewind        (RDE_PARAM p);
+
+SCOPE void rde_param_i_input_next        (RDE_PARAM p, long int m);
+
+SCOPE void rde_param_i_status_fail       (RDE_PARAM p);
+SCOPE void rde_param_i_status_ok         (RDE_PARAM p);
+SCOPE void rde_param_i_status_negate     (RDE_PARAM p);
+
+SCOPE int  rde_param_i_symbol_restore    (RDE_PARAM p, long int s);
+SCOPE void rde_param_i_symbol_save       (RDE_PARAM p, long int s);
+
+SCOPE void rde_param_i_test_char         (RDE_PARAM p, const char* c, long int m);
+SCOPE void rde_param_i_test_range        (RDE_PARAM p, const char* s, const char* e, long int m);
+
+SCOPE void rde_param_i_test_alnum        (RDE_PARAM p);
+SCOPE void rde_param_i_test_alpha        (RDE_PARAM p);
+SCOPE void rde_param_i_test_ascii        (RDE_PARAM p);
+SCOPE void rde_param_i_test_control      (RDE_PARAM p);
+SCOPE void rde_param_i_test_ddigit       (RDE_PARAM p);
+SCOPE void rde_param_i_test_digit        (RDE_PARAM p);
+SCOPE void rde_param_i_test_graph        (RDE_PARAM p);
+SCOPE void rde_param_i_test_lower        (RDE_PARAM p);
+SCOPE void rde_param_i_test_print        (RDE_PARAM p);
+SCOPE void rde_param_i_test_punct        (RDE_PARAM p);
+SCOPE void rde_param_i_test_space        (RDE_PARAM p);
+SCOPE void rde_param_i_test_upper        (RDE_PARAM p);
+SCOPE void rde_param_i_test_wordchar     (RDE_PARAM p);
+SCOPE void rde_param_i_test_xdigit       (RDE_PARAM p);
+
+SCOPE void rde_param_i_value_clear       (RDE_PARAM p);
+SCOPE void rde_param_i_value_leaf        (RDE_PARAM p, long int s);
+SCOPE void rde_param_i_value_reduce      (RDE_PARAM p, long int s);
+
+/* Super Instructions - Aggregated common instruction sequences.
+ */
+
+SCOPE int  rde_param_i_symbol_start         (RDE_PARAM p, long int s);
+SCOPE int  rde_param_i_symbol_start_d       (RDE_PARAM p, long int s);
+SCOPE int  rde_param_i_symbol_void_start    (RDE_PARAM p, long int s);
+SCOPE int  rde_param_i_symbol_void_start_d  (RDE_PARAM p, long int s);
+
+SCOPE void rde_param_i_symbol_done_d_reduce (RDE_PARAM p, long int s, long int m);
+SCOPE void rde_param_i_symbol_done_leaf     (RDE_PARAM p, long int s, long int m);
+SCOPE void rde_param_i_symbol_done_d_leaf   (RDE_PARAM p, long int s, long int m);
+SCOPE void rde_param_i_symbol_done_void     (RDE_PARAM p, long int s, long int m);
+SCOPE void rde_param_i_symbol_done_d_void   (RDE_PARAM p, long int s, long int m);
+
+SCOPE void rde_param_i_next_char     (RDE_PARAM p, const char* c, long int m);
+SCOPE void rde_param_i_next_range    (RDE_PARAM p, const char* s, const char* e, long int m);
+
+SCOPE void rde_param_i_next_alnum    (RDE_PARAM p, long int m);
+SCOPE void rde_param_i_next_alpha    (RDE_PARAM p, long int m);
+SCOPE void rde_param_i_next_ascii    (RDE_PARAM p, long int m);
+SCOPE void rde_param_i_next_control  (RDE_PARAM p, long int m);
+SCOPE void rde_param_i_next_ddigit   (RDE_PARAM p, long int m);
+SCOPE void rde_param_i_next_digit    (RDE_PARAM p, long int m);
+SCOPE void rde_param_i_next_graph    (RDE_PARAM p, long int m);
+SCOPE void rde_param_i_next_lower    (RDE_PARAM p, long int m);
+SCOPE void rde_param_i_next_print    (RDE_PARAM p, long int m);
+SCOPE void rde_param_i_next_punct    (RDE_PARAM p, long int m);
+SCOPE void rde_param_i_next_space    (RDE_PARAM p, long int m);
+SCOPE void rde_param_i_next_upper    (RDE_PARAM p, long int m);
+SCOPE void rde_param_i_next_wordchar (RDE_PARAM p, long int m);
+SCOPE void rde_param_i_next_xdigit   (RDE_PARAM p, long int m);
+
+SCOPE void rde_param_i_notahead_start_d (RDE_PARAM p);
+SCOPE void rde_param_i_notahead_exit_d  (RDE_PARAM p);
+SCOPE void rde_param_i_notahead_exit    (RDE_PARAM p);
+
+SCOPE void rde_param_i_state_push_2     (RDE_PARAM p);
+SCOPE void rde_param_i_state_push_void  (RDE_PARAM p);
+SCOPE void rde_param_i_state_push_value (RDE_PARAM p);
+
+SCOPE void rde_param_i_state_merge_ok    (RDE_PARAM p);
+SCOPE void rde_param_i_state_merge_void  (RDE_PARAM p);
+SCOPE void rde_param_i_state_merge_value (RDE_PARAM p);
+
+SCOPE int  rde_param_i_kleene_close   (RDE_PARAM p);
+SCOPE int  rde_param_i_kleene_abort   (RDE_PARAM p);
+
+SCOPE int  rde_param_i_seq_void2void   (RDE_PARAM p);
+SCOPE int  rde_param_i_seq_void2value  (RDE_PARAM p);
+SCOPE int  rde_param_i_seq_value2value (RDE_PARAM p);
+
+SCOPE int  rde_param_i_bra_void2void   (RDE_PARAM p);
+SCOPE int  rde_param_i_bra_void2value  (RDE_PARAM p);
+SCOPE int  rde_param_i_bra_value2void  (RDE_PARAM p);
+SCOPE int  rde_param_i_bra_value2value (RDE_PARAM p);
+
+SCOPE void rde_param_i_next_str   (RDE_PARAM p, const char* str,   long int m);
+SCOPE void rde_param_i_next_class (RDE_PARAM p, const char* class, long int m);
+
+/* SKIP END */
+#endif /* _RDE_DS_PARAM_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/stack.c b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/stack.c
new file mode 100644
index 00000000..c5ebc8e4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/stack.c
@@ -0,0 +1,160 @@
+/*
+ * = = == === ===== ======== ============= =====================
+ * == pt::rde (critcl) - Data Structures - Generic stack
+ */
+
+#include <stack.h> /* Our public API */
+#include <util.h>  /* Allocation macros */
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+typedef struct RDE_STACK_ {
+    long int            max;   /* Size of the cell array. */
+    long int            top;   /* Index of the topmost _unused_ cell in the
+				* array === Index of the _next_ cell to use
+				* === Size of the stack. */
+    RDE_STACK_CELL_FREE freeCellProc; 
+    void**              cell;  /* Array of the stack cells. */
+} RDE_STACK_;
+
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE RDE_STACK
+rde_stack_new (RDE_STACK_CELL_FREE freeCellProc)
+{
+    RDE_STACK s = ALLOC (RDE_STACK_);
+    s->cell = NALLOC (RDE_STACK_INITIAL_SIZE, void*);
+    s->max  = RDE_STACK_INITIAL_SIZE;
+    s->top  = 0;
+    s->freeCellProc = freeCellProc;
+
+    return s;
+}
+
+SCOPE void
+rde_stack_del (RDE_STACK s)
+{
+    if (s->freeCellProc && s->top) {
+	long int i;
+	for (i=0; i < s->top; i++) {
+	    ASSERT_BOUNDS(i,s->max);
+	    s->freeCellProc ( s->cell [i] );
+	}
+    }
+
+    ckfree ((char*) s->cell);
+    ckfree ((char*) s);
+}
+
+SCOPE void
+rde_stack_push (RDE_STACK s, void* item)
+{
+    if (s->top >= s->max) {
+	long int new  = s->max ? (2 * s->max) : RDE_STACK_INITIAL_SIZE;
+	void**   cell = (void**) ckrealloc ((char*) s->cell, new * sizeof(void*));
+	ASSERT (cell,"Memory allocation failure for RDE stack");
+	s->max  = new;
+	s->cell = cell;
+    }
+
+    ASSERT_BOUNDS(s->top,s->max);
+    s->cell [s->top] = item;
+    s->top ++;
+}
+
+SCOPE void*
+rde_stack_top (RDE_STACK s)
+{
+    ASSERT_BOUNDS(s->top-1,s->max);
+    return s->cell [s->top - 1];
+}
+
+SCOPE void
+rde_stack_pop (RDE_STACK s, long int n)
+{
+    ASSERT (n >= 0, "Bad pop count");
+    if (n == 0) return;
+
+    if (s->freeCellProc) {
+	while (n) {
+	    s->top --;
+	    ASSERT_BOUNDS(s->top,s->max);
+	    s->freeCellProc ( s->cell [s->top] );
+	    n --;
+	}
+    } else {
+	s->top -= n;
+    }
+}
+
+SCOPE void
+rde_stack_trim (RDE_STACK s, long int n)
+{
+    ASSERT (n >= 0, "Bad trimsize");
+
+    if (s->freeCellProc) {
+	while (s->top > n) {
+	    s->top --;
+	    ASSERT_BOUNDS(s->top,s->max);
+	    s->freeCellProc ( s->cell [s->top] );
+	}
+    } else {
+	s->top = n;
+    }
+}
+
+SCOPE void
+rde_stack_drop (RDE_STACK s, long int n)
+{
+    ASSERT (n >= 0, "Bad pop count");
+    if (n == 0) return;
+    s->top -= n;
+}
+
+SCOPE void
+rde_stack_move (RDE_STACK dst, RDE_STACK src)
+{
+    ASSERT (dst->freeCellProc == src->freeCellProc, "Ownership mismatch");
+
+    /*
+     * Note: The destination takes ownership of the moved cell, thus there is
+     * no need to run free on them.
+     */
+
+    while (src->top > 0) {
+	src->top --;
+	ASSERT_BOUNDS(src->top,src->max);
+	rde_stack_push (dst, src->cell [src->top] );
+    }
+}
+
+SCOPE void
+rde_stack_get (RDE_STACK s, long int* cn, void*** cc)
+{
+    *cn = s->top;
+    *cc = s->cell;
+}
+
+SCOPE long int
+rde_stack_size (RDE_STACK s)
+{
+    return s->top;
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/stack.h b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/stack.h
new file mode 100644
index 00000000..ca246661
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/stack.h
@@ -0,0 +1,62 @@
+/*
+ * = = == === ===== ======== ============= =====================
+ * == pt::rde (critcl) - Data Structures - Generic stack
+ */
+
+#ifndef _RDE_DS_STACK_H
+#define _RDE_DS_STACK_H 1
+
+#include <util.h> /* Scoping */
+
+/*
+ * The stack data structure declared in this file is an array of void*
+ * cells, with each cell either directly containing the data, or being
+ * a pointer to it.
+ *
+ * The structure maintains a max-size field, reallocating the array if
+ * and only if we go over this size. Each allocation doubles the
+ * available room.
+ *
+ * A pointer to a delete function is maintained, to delete cells which
+ * are references to the actual data.
+ */
+
+typedef void (*RDE_STACK_CELL_FREE) (void* cell);
+typedef struct RDE_STACK_* RDE_STACK;
+
+static const int RDE_STACK_INITIAL_SIZE = 256;
+
+/*
+ * Notes
+ * - push -- Item allocation is responsibility of caller.
+ *           Stack takes ownership of the item.
+ * - pop  -- Stack frees allocated item.
+ * - trim -- Ditto
+ * - top  -- Provides top item, no transfer of ownership.
+ * - del  -- Releases stack, cell array, and items, if any.
+ * - drop -- Like pop, but doesn't free, assumes that caller
+ *           is taking ownership of the pointer.
+ */
+
+/* SKIP START */
+SCOPE RDE_STACK rde_stack_new  (RDE_STACK_CELL_FREE freeCellProc);
+SCOPE void      rde_stack_del  (RDE_STACK s);
+
+SCOPE void*    rde_stack_top  (RDE_STACK s);
+SCOPE void     rde_stack_push (RDE_STACK s, void* item);
+SCOPE void     rde_stack_pop  (RDE_STACK s, long int n);
+SCOPE void     rde_stack_trim (RDE_STACK s, long int n);
+SCOPE void     rde_stack_drop (RDE_STACK s, long int n);
+SCOPE void     rde_stack_move (RDE_STACK dst, RDE_STACK src);
+SCOPE void     rde_stack_get  (RDE_STACK s, long int* cn, void*** cc);
+SCOPE long int rde_stack_size (RDE_STACK s);
+/* SKIP END */
+#endif /* _RDE_DS_STACK_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/tc.c b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/tc.c
new file mode 100644
index 00000000..1b3ca63a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/tc.c
@@ -0,0 +1,186 @@
+/*
+ * = = == === ===== ======== ============= =====================
+ * == pt::rde (critcl) - Data Structures - Token cache
+ */
+
+#include <tc.h>    /* Our public API */
+#include <stack.h> /* Stack handling */
+#include <util.h>  /* Allocation macros */
+#include <string.h>
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+typedef struct RDE_TC_ {
+    int       max;   /* Max number of bytes in the cache */
+    int       num;   /* Current number of bytes in the cache */
+    char*     str;   /* Character cache (utf8) */
+    RDE_STACK off;   /* Offsets of characters in 'string' */
+} RDE_TC_;
+
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+SCOPE RDE_TC
+rde_tc_new (void)
+{
+    RDE_TC tc = ALLOC (RDE_TC_);
+
+    tc->max   = RDE_STACK_INITIAL_SIZE;
+    tc->num   = 0;
+    tc->str   = NALLOC (RDE_STACK_INITIAL_SIZE, char);
+    tc->off   = rde_stack_new (NULL);
+
+    return tc;
+}
+
+SCOPE void
+rde_tc_del (RDE_TC tc)
+{
+    rde_stack_del (tc->off);
+
+    ckfree (tc->str);
+    ckfree ((char*) tc);
+}
+
+SCOPE long int
+rde_tc_size (RDE_TC tc)
+{
+    return rde_stack_size (tc->off);
+}
+
+SCOPE void
+rde_tc_clear (RDE_TC tc)
+{
+    tc->num   = 0;
+
+    rde_stack_trim (tc->off,  0);
+}
+
+SCOPE char*
+rde_tc_append (RDE_TC tc, char* string, long int len)
+{
+    long int base = tc->num;
+    long int off  = tc->num;
+    char* ch;
+    int clen;
+    Tcl_UniChar uni;
+
+    if (len < 0) {
+	len = strlen (string);
+    }
+
+    /*
+     * Nothing to append, nothing to do. Bail immediately.
+     */
+
+    if (!len) {
+	return tc->str + base;
+    }
+
+    /*
+     * Extend character buffer to hold the new string, and copy the string in.
+     */
+
+    if ((tc->num + len) >= tc->max) {
+	int   new = len + (tc->max ? (2 * tc->max) : RDE_STACK_INITIAL_SIZE);
+	char* str = ckrealloc (tc->str, new * sizeof(char));
+	ASSERT (str,"Memory allocation failure for token character array");
+	tc->max = new;
+	tc->str = str;
+    }
+
+    tc->num += len;
+    ASSERT_BOUNDS(tc->num,tc->max);
+    ASSERT_BOUNDS(off,tc->max);
+    ASSERT_BOUNDS(off+len-1,tc->max);
+    ASSERT_BOUNDS(off+len-1,tc->num);
+    memcpy (tc->str + off, string, len);
+
+    /*
+     * Now update the offset counter, this is done per character in the new
+     * string.
+     */
+
+    ch = string;
+    while (ch < (string + len)) {
+	ASSERT_BOUNDS(off,tc->num);
+	rde_stack_push (tc->off,  (void*) off);
+
+	clen = Tcl_UtfToUniChar (ch, &uni);
+
+	off += clen;
+	ch  += clen;
+    }
+
+    return tc->str + base;
+}
+
+SCOPE void
+rde_tc_get (RDE_TC tc, int at, char** ch, long int* len)
+{
+    long int  oc, off, end;
+    void** ov;
+
+    rde_stack_get (tc->off, &oc, &ov);
+
+    ASSERT_BOUNDS(at,oc);
+
+    off = (long int) ov [at];
+    if ((at+1) == oc) {
+	end = tc->num;
+    } else {
+	end = (long int) ov [at+1];
+    }
+
+    TRACE (("rde_tc_get (RDE_TC %p, @ %d) => %d.[%d ... %d]/%d",tc,at,end-off,off,end-1,tc->num));
+
+    ASSERT_BOUNDS(off,tc->num);
+    ASSERT_BOUNDS(end-1,tc->num);
+
+    *ch = tc->str + off;
+    *len = end - off;
+}
+
+SCOPE void
+rde_tc_get_s (RDE_TC tc, int at, int last, char** ch, long int* len)
+{
+    long int  oc, off, end;
+    void** ov;
+
+    rde_stack_get (tc->off, &oc, &ov);
+
+    ASSERT_BOUNDS(at,oc);
+    ASSERT_BOUNDS(last,oc);
+
+    off = (long int) ov [at];
+    if ((last+1) == oc) {
+	end = tc->num;
+    } else {
+	end = (long int) ov [last+1];
+    }
+
+    TRACE (("rde_tc_get_s (RDE_TC %p, @ %d .. %d) => %d.[%d ... %d]/%d",tc,at,last,end-off,off,end-1,tc->num));
+
+    ASSERT_BOUNDS(off,tc->num);
+    ASSERT_BOUNDS(end-1,tc->num);
+
+    *ch = tc->str + off;
+    *len = end - off;
+}
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/tc.h b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/tc.h
new file mode 100644
index 00000000..61954000
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/tc.h
@@ -0,0 +1,31 @@
+/*
+ * = = == === ===== ======== ============= =====================
+ * == pt::rde (critcl) - Data Structures - Generic token cache
+ */
+
+#ifndef _RDE_DS_TC_H
+#define _RDE_DS_TC_H 1
+
+#include <util.h> /* Scoping */
+
+typedef struct RDE_TC_* RDE_TC;
+
+/* SKIP START */
+SCOPE RDE_TC rde_tc_new  (void);
+SCOPE void   rde_tc_del  (RDE_TC tc);
+
+SCOPE long int    rde_tc_size   (RDE_TC tc);
+SCOPE void        rde_tc_clear  (RDE_TC tc);
+SCOPE char*       rde_tc_append (RDE_TC tc, char* ch, long int len);
+SCOPE void        rde_tc_get    (RDE_TC tc, int at, char** ch, long int *len);
+SCOPE void        rde_tc_get_s  (RDE_TC tc, int at, int last, char** ch, long int *len);
+/* SKIP END */
+#endif /* _RDE_DS_TC_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/util.c b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/util.c
new file mode 100644
index 00000000..2eb0454c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/util.c
@@ -0,0 +1,145 @@
+/*
+ * = = == === ===== ======== ============= =====================
+ * == pt::rde (critcl) - Data Structures - PARAM architectural state.
+ */
+
+#include <string.h>
+#include <util.h>  /* Allocation utilities */
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+#ifdef RDE_TRACE
+typedef struct F_STACK {
+    const char*     str;
+    struct F_STACK* down;
+} F_STACK;
+
+static F_STACK* top   = 0;
+static int      level = 0;
+
+static void
+push (const char* str)
+{
+    F_STACK* new = ALLOC (F_STACK);
+    new->str = str;
+    new->down = top;
+    top = new;
+    level += 4;
+}
+
+static void
+pop (void)
+{
+    F_STACK* next = top->down;
+    level -= 4;
+    ckfree ((char*)top);
+    top = next;
+}
+
+static void
+indent (void)
+{
+    int i;
+    for (i = 0; i < level; i++) {
+	fwrite(" ", 1, 1, stdout);
+	fflush           (stdout);
+    }
+
+    if (top) {
+	fwrite(top->str, 1, strlen(top->str), stdout);
+	fflush                               (stdout);
+    }
+
+    fwrite(" ", 1, 1, stdout);
+    fflush           (stdout);
+}
+
+SCOPE void
+trace_enter (const char* fun)
+{
+    push (fun);
+    indent();
+    fwrite("ENTER\n", 1, 6, stdout);
+    fflush                 (stdout);
+}
+
+/*
+ * We may trace large data structures (AST!)
+ */
+static char msg [1024*1024];
+
+SCOPE void
+trace_return (const char *pat, ...)
+{
+    int len;
+    va_list args;
+
+    indent();
+    fwrite("RETURN = ", 1, 9, stdout);
+    fflush                   (stdout);
+
+    va_start(args, pat);
+    len = vsprintf(msg, pat, args);
+    va_end(args);
+
+    msg[len++] = '\n';
+    msg[len] = '\0';
+
+    fwrite(msg, 1, len, stdout);
+    fflush             (stdout);
+
+    pop();
+}
+
+SCOPE void
+trace_printf (const char *pat, ...)
+{
+    int len;
+    va_list args;
+
+    indent();
+
+    va_start(args, pat);
+    len = vsprintf(msg, pat, args);
+    va_end(args);
+
+    msg[len++] = '\n';
+    msg[len] = '\0';
+
+    fwrite(msg, 1, len, stdout);
+    fflush             (stdout);
+}
+
+SCOPE void
+trace_printf0 (const char *pat, ...)
+{
+    int len;
+    va_list args;
+
+    va_start(args, pat);
+    len = vsprintf(msg, pat, args);
+    va_end(args);
+
+    msg[len++] = '\n';
+    msg[len] = '\0';
+
+    fwrite(msg, 1, len, stdout);
+    fflush             (stdout);
+}
+
+#endif
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+
+/*
+ * local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/util.h b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/util.h
new file mode 100644
index 00000000..e89f9eb4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/rde_critcl/util.h
@@ -0,0 +1,79 @@
+/*
+ * = = == === ===== ======== ============= =====================
+ * == pt::rde (critcl) - General utilities 
+ */
+
+#ifndef _RDE_UTIL_H
+#define _RDE_UTIL_H 1
+
+#include <tcl.h>
+
+/*
+ * Default scope, global
+ */
+
+#ifndef SCOPE
+#define SCOPE
+#endif
+
+/*
+ * Allocation macros for common situations.
+ */
+
+#define ALLOC(type)    (type *) ckalloc (sizeof (type))
+#define NALLOC(n,type) (type *) ckalloc ((n) * sizeof (type))
+
+/*
+ * General assertions, and asserting the proper range of an array index.
+ */
+
+#undef  RDE_DEBUG
+#define RDE_DEBUG 1
+
+#undef  RDE_TRACE
+/* #define RDE_TRACE 1 */
+
+/*
+ * = = == === ===== ======== ============= =====================
+ */
+
+#ifdef RDE_DEBUG
+#define STOPAFTER(x) { static int count = (x); count --; if (!count) { Tcl_Panic ("stop"); } }
+#define XSTR(x) #x
+#define STR(x) XSTR(x)
+#define RANGEOK(i,n) ((0 <= (i)) && (i < (n)))
+#define ASSERT(x,msg) if (!(x)) { Tcl_Panic (msg " (" #x "), in file " __FILE__ " @line " STR(__LINE__));}
+#define ASSERT_BOUNDS(i,n) ASSERT (RANGEOK(i,n),"array index out of bounds: " STR(i) " >= " STR(n))
+#else
+#define STOPAFTER(x)
+#define ASSERT(x,msg)
+#define ASSERT_BOUNDS(i,n)
+#endif
+
+#ifdef RDE_TRACE
+SCOPE void trace_enter (const char* fun);
+SCOPE void trace_return (const char *pat, ...);
+SCOPE void trace_printf (const char *pat, ...);
+
+#define ENTER(fun)          trace_enter (fun)
+#define RETURN(format,x)    trace_return (format,x) ; return x
+#define RETURNVOID          trace_return ("%s","(void)") ; return
+#define TRACE0(x)           trace_printf0 x
+#define TRACE(x)            trace_printf x
+#else
+#define ENTER(fun)
+#define RETURN(f,x) return x
+#define RETURNVOID  return
+#define TRACE0(x)
+#define TRACE(x)
+#endif
+
+#endif /* _RDE_UTIL_H */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/text_write.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/text_write.tcl
new file mode 100644
index 00000000..1209b98b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/pt/text_write.tcl
@@ -0,0 +1,249 @@
+# text_write.tcl --
+#
+#	Commands for the generation of TEXT
+#
+# Copyright (c) 2009 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: text_write.tcl,v 1.1 2010/03/26 05:07:24 andreas_kupries Exp $
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require textutil::adjust
+
+namespace eval ::text::write {
+    namespace export \
+	reset clear field fieldl fieldr /line prefix indent \
+	store recall undef undo get getl maxlen fieldsep \
+	push pop pop-append copy move clear-block exists
+
+
+    namespace ensemble create
+}
+
+# ### ### ### ######### ######### #########
+## API.
+
+proc ::text::write::reset {} {
+    # Reset state, fully (clear line and block buffers, , stack, set
+    # the default field separator, and flush the named blocks)
+    variable currentline    {}
+    variable currentblock   {}
+    variable stack          {}
+    variable fieldseparator { }
+    variable blocks
+    array unset blocks *
+    return
+}
+
+proc ::text::write::clear {} {
+    # Reset state (clear line and block buffers, stack, and set the
+    # default field separator)
+    variable currentline    {}
+    variable currentblock   {}
+    variable stack          {}
+    variable fieldseparator { }
+    return
+}
+
+proc ::text::write::field {args} {
+    # Extend line buffer, at end.
+    variable currentline
+    lappend  currentline {*}$args
+    return
+}
+
+proc ::text::write::fieldl {fieldlength text} {
+    # As field, but a text left-aligned in a field of given length.
+    field [format %-${fieldlength}s $text]
+    return
+}
+
+proc ::text::write::fieldr {fieldlength text} {
+    # As field, but a text right-aligned in a field of given length.
+    field [format %${fieldlength}s $text]
+    return
+}
+
+proc ::text::write::fieldsep {char} {
+    # Set field separator for '/line'
+    variable fieldseparator $char
+    return
+}
+
+proc ::text::write::get {} {
+    # Return text of current block.
+    variable currentblock
+    set res $currentblock
+    reset
+    return [join $res \n]
+}
+
+proc ::text::write::getl {} {
+    # As get, but retrieve the raw list of lines.
+    variable currentblock
+    set res $currentblock
+    reset
+    return $res
+}
+
+proc ::text::write::/line {} {
+    # Commit current line to current block (added at end)
+    variable currentline
+    variable currentblock
+    variable fieldseparator
+    lappend  currentblock [string trimright [join $currentline $fieldseparator]]
+    set      currentline {}
+    return
+}
+
+proc ::text::write::undo {} {
+    # Remove last line from current block.
+    variable currentblock
+    set      currentblock [lreplace $currentblock end end]
+    return
+}
+
+proc ::text::write::prefix {prefix {n 0}} {
+    # Indent current block using the prefix text, skipping the first n lines
+    variable currentblock
+    set currentblock \
+	[split \
+	     [textutil::adjust::indent \
+		  [join $currentblock \n] \
+		  $prefix $n] \
+	     \n]
+    return
+}
+
+proc ::text::write::indent {k {n 0}} {
+    # Indent current block by k spaces, skipping the first n lines
+    variable currentblock
+    set currentblock \
+	[split \
+	     [textutil::adjust::indent \
+		  [join $currentblock \n] \
+		  [string repeat { } $k] $n] \
+	     \n]
+    return
+}
+
+
+proc ::text::write::store {name} {
+    # Save current block and under a name. /store
+    variable currentblock
+    variable blocks
+    set blocks($name) $currentblock
+    return
+}
+
+proc ::text::write::recall {name} {
+    # Append named block to current block. /recall
+    variable currentblock
+    variable blocks
+    lappend currentblock {*}$blocks($name)
+    return
+}
+
+proc ::text::write::undef {name} {
+    # Remove the specified block from memory
+    variable blocks
+    unset    blocks($name)
+    return
+}
+
+proc ::text::write::exists {name} {
+    # Remove the specified block from memory
+    variable blocks
+    return [info exists blocks($name)]
+}
+
+proc ::text::write::copy {src dst} {
+    # Copy named block to other named block, overwriting it.
+    variable blocks
+    set blocks($dst) $blocks($src)
+    return
+}
+
+proc ::text::write::clear-block {name} {
+    # Clear the named block.
+    variable blocks
+    set blocks($name) ""
+    return
+}
+
+proc ::text::write::move {src dst} {
+    # Move named block to other named block, overwriting it.
+    variable blocks
+    set   blocks($dst) $blocks($src)
+    unset blocks($src)
+    return
+}
+
+proc ::text::write::push {} {
+    # Suspend current block.
+    variable currentblock
+    variable stack
+    lappend stack $currentblock
+    return
+}
+
+proc ::text::write::pop {} {
+    # Recall the last suspended block, replace current block.
+    variable currentblock
+    variable stack
+    set currentblock [lindex $stack end]
+    set stack [lrange $stack 0 end-1]
+    return
+}
+
+proc ::text::write::pop-append {} {
+    # Recall the last suspended block, add to the current block.
+    variable currentblock
+    variable stack
+    lappend currentblock {*}[lindex $stack end]
+    set stack [lrange $stack 0 end-1]
+    return
+}
+
+proc ::text::write::maxlen {list} {
+    # Find the max length of the strings in the list.
+
+    set lengths 0 ; # This will be the max if the list is empty, and
+		    # prevents the mathfunc from throwing errors for
+		    # that case.
+
+    foreach str $list {
+	lappend lengths [::string length $str]
+    }
+
+    return [tcl::mathfunc::max {*}$lengths]
+}
+
+# ### ### ### ######### ######### #########
+## Internals.
+
+# ### ### ### ######### ######### #########
+
+namespace eval ::text::write {
+    # State of the writer.
+
+    variable currentline    {}  ; # List of text fragments which make
+				  # up the current line.
+    variable currentblock   {}  ; # List of lines which make up the
+				  # current block.
+    variable  blocks            ; # Set of named blocks.
+    array set blocks        {}  ; #
+    variable fieldseparator { } ; # Current field separator.
+    variable stack          {}  ; # Stack of suspended blocks.
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide text::write 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rc4/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rc4/pkgIndex.tcl
new file mode 100644
index 00000000..84a5d47a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rc4/pkgIndex.tcl
@@ -0,0 +1,13 @@
+# pkgIndex.tcl - 
+#
+# RC4 package index file
+#
+# This package has been tested with tcl 8.2.3 and above.
+#
+# $Id: pkgIndex.tcl,v 1.4 2005/12/20 16:19:38 patthoyts Exp $
+
+if {![package vsatisfies [package provide Tcl] 8.2]} {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded rc4 1.1.0 [list source [file join $dir rc4.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rc4/rc4.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rc4/rc4.tcl
new file mode 100644
index 00000000..37b4a126
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rc4/rc4.tcl
@@ -0,0 +1,422 @@
+# rc4.tcl - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# RC4 is a symmetric stream cipher developed by Ron Rivest of RSA Data
+# Security Inc. The algorithm was a trade secret of RSA but was reverse
+# engineered and published to the internet in 1994. This pure Tcl
+# implementation is based on the description of the algorithm.
+#
+# The algorithm is a pseudo-random number generator with the output of
+# the PRNG being xored with the plaintext stream. Decryption is done
+# by feeding the ciphertext as input with the same key.
+
+package require Tcl 8.2
+
+# @mdgen EXCLUDE: rc4c.tcl
+
+namespace eval ::rc4 {
+    namespace export rc4
+
+    variable uid
+    if {![info exists uid]} {
+        set uid 0
+    }
+}
+
+# RC4Init - create and initialize the RC4 state as an array
+#
+proc ::rc4::RC4Init_Array {keystr} {
+    variable uid
+
+    binary scan $keystr c* key
+    set keylen [llength $key]
+
+    set Key [namespace current]::key[incr uid]
+    # FRINK: nocheck
+    variable $Key
+    upvar #0 $Key state
+    catch {unset state}
+
+    set state(x) 0
+    set state(y) 0
+    for {set cn 0} {$cn < 256} {incr cn} {
+        set state(s,$cn) $cn
+    }
+    set i 0
+    set j 0
+    for {set cn 0} {$cn < 256} {incr cn} {
+        set j [expr {([lindex $key $i] + $state(s,$cn) + $j) % 256}]
+        set t $state(s,$cn)
+        set state(s,$cn) $state(s,$j)
+        set state(s,$j) $t
+        set i [expr {($i + 1) % $keylen}]
+    }
+
+    return $Key
+}
+
+# RC4 - process the data using the array based state
+#
+proc ::rc4::RC4_Array {Key datastr} {
+    upvar #0 $Key state
+    set res {}
+
+    binary scan $datastr c* data
+    set datalen [llength $data]
+    
+    set x $state(x)
+    set y $state(y)
+
+    for {set cn 0} {$cn < $datalen} {incr cn} {
+        set x [expr {($x + 1) % 256}]
+        set y [expr {($state(s,$x) + $y) % 256}]
+        set t $state(s,$y)
+        set state(s,$y) $state(s,$x)
+        set state(s,$x) $t
+        set i [expr {($state(s,$x) + $state(s,$y)) % 256}]
+        lappend res [expr {([lindex $data $cn] ^ $state(s,$i)) & 0xFF}]
+    }
+    set state(x) $x
+    set state(y) $y
+    return [binary format c* $res]
+}
+
+# RC4Init - create and initialize the RC4 state as a list.
+#
+proc ::rc4::RC4Init_List {keystr} {
+    variable uid
+
+    binary scan $keystr c* key
+    set keylen [llength $key]
+
+    set Key [namespace current]::key[incr uid]
+    # FRINK: nocheck
+    variable $Key
+    upvar #0 $Key State
+    catch {unset State}
+
+    set i 0
+    set j 0
+    set s {}; #[::struct::list::Liota 256]
+    for {set n 0} {$n < 256} {incr n} {lappend s $n}
+    
+    for {set cn 0} {$cn < 256} {incr cn} {
+        set j [expr {([lindex $key $i] + [lindex $s $cn] + $j) % 256}]
+        set t [lindex $s $cn]
+        lset s $cn [lindex $s $j]
+        lset s $j $t
+        set i [expr {($i + 1) % $keylen}]
+    }
+    
+    set State(x) 0
+    set State(y) 0
+    set State(s) $s
+
+    return $Key
+}
+
+# RC4 - process the data using the list-based state.
+#
+proc ::rc4::RC4_List {Key datastr} {
+    upvar #0 $Key State
+    set res {}
+
+    binary scan $datastr c* data
+    set datalen [llength $data]
+    
+    set x $State(x)
+    set y $State(y)
+    set s $State(s)
+
+    for {set cn 0} {$cn < $datalen} {incr cn} {
+        set x [expr {($x + 1) % 256}]
+        set y [expr {([lindex $s $x] + $y) % 256}]
+        set t [lindex $s $y]
+        lset s $y [lindex $s $x]
+        lset s $x $t
+        set i [expr {([lindex $s $x] + [lindex $s $y]) % 256}]
+        lappend res [expr {([lindex $data $cn] ^ [lindex $s $i]) & 0xFF}]
+    }
+    set State(x) $x
+    set State(y) $y
+    set State(s) $s
+    return [binary format c* $res]
+}
+
+# PRAGMA: nocheck
+proc ::rc4::K {x y} {set x}
+
+# Using this compat function for < 8.4 is 2x slower than using arrays.
+if {[package vcompare [package provide Tcl] 8.4] < 0} {
+    proc ::rc4::lset {var index arg} {
+        upvar 1 $var list
+        set list [::lreplace [K $list [set list {}]] $index $index $arg]
+    }
+}
+
+proc ::rc4::RC4Final {Key} {
+    upvar #0 $Key state
+    catch {unset state}
+    return {}
+}
+
+# -------------------------------------------------------------------------
+# Helper to turn binary data into hex format.
+#
+proc ::rc4::Hex {data} {
+    binary scan $data H* result
+    return $result
+}
+
+# Demo function for use with Trf transform command to add automatic
+# RC4 encryption to a channel. Illustrates use of [transform]
+#
+# For instance, to create a file with all ondisk data encrypted:
+#   set f [open secretfile r+]
+#   transform -attach $f -command [list rc4::Transform $f Secret]
+#   puts -nonewline $f yourdata   ;# write to encrypt
+#   read $f                       ;# read to decrypt
+#   close $f
+#
+proc ::rc4::Transform {channel keystr operation data} {
+    set readkey [namespace current]::R$channel
+    # FRINK: nocheck
+    variable $readkey
+    upvar #0 $readkey rk
+    set writekey [namespace current]::W$channel
+    # FRINK: nocheck
+    variable $writekey
+    upvar #0 $writekey wk
+    set result {}
+
+    #puts stderr "$operation {$data}"
+    switch -- $operation {
+        create/write {
+            if {[info exists wk]} {
+                RCFinal $wk
+            }
+            set wk [RC4Init $keystr] 
+        }
+        clear/write {}
+        delete/write {
+            if {[info exists wk]} {
+                RC4Final $wk
+                unset wk
+            }
+        }
+        write - flush/write {
+            if {![info exists wk]} {
+                set wk [RC4Init $keystr]
+            }
+            set result [RC4 $wk $data] 
+        }
+
+        create/read {
+            if {[info exists rk]} {
+                RCFinal $rk
+            }
+            set rk [RC4Init $keystr] 
+        }
+        clear/read {}
+        delete/read {
+            if {[info exists rk]} {
+                RC4Final $rk
+                unset rk
+            }
+        }
+        read - flush/read {
+            if {![info exists rk]} {
+                set rk [RC4Init $keystr]
+            }
+            set result [RC4 $rk $data] 
+        }
+        
+        query/ratio {
+            set result {1 1};           # RC4 is a 1:1 stream cipher.
+        }
+        query/maxRead {
+            set result -1;              # Permit read of any amount
+        }
+        default {
+            # ignore unknown operations.
+        }
+    }
+    return $result
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::rc4::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# Fileevent handler for chunked file hashing.
+#
+proc ::rc4::Chunk {State} {
+    upvar #0 $State state
+    
+    if {[eof $state(-in)]} {
+        fileevent $state(-in) readable {}
+        set state(reading) 0
+    }
+    set data [read $state(-in) $state(-chunksize)]
+    if {[llength $state(-out)] == 0} {
+        append state(output) [RC4 $state(Key) $data]
+    } else {
+        puts -nonewline $state(-out) [RC4 $state(Key) $data]
+    }
+    if {!$state(reading) && [llength $state(-command)] != 0} {
+        Cleanup $State; # cleanup and call users command 
+    }
+}
+
+
+proc ::rc4::Cleanup {State} {
+    upvar #0 $State state
+    set cmd $state(-command)
+    set res $state(output)
+    # If we opened the channel then we should close it too.
+    if {[string length $state(-infile)] > 0} {
+        close $state(-in)
+    }
+    RC4Final $state(Key)
+    unset state
+    if {[llength $cmd] != 0} {
+        eval $cmd [list $res]
+    }
+    return $res
+}
+
+# -------------------------------------------------------------------------
+
+proc ::rc4::rc4 {args} {
+    array set opts {-hex 0 -infile {} -in {} -out {} -chunksize 4096
+        -key {} -command {}}
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -exact -- $option {
+            -key        { set opts(-key) [Pop args 1] }
+            -hex        { set opts(-hex) 1}
+            -infile     { set opts(-infile) [Pop args 1] }
+            -in         { set opts(-in) [Pop args 1] }
+            -out        { set opts(-out) [Pop args 1] }
+            -chunksize  { set opts(-chunksize) [Pop args 1] }
+            -command    { set opts(-command) [Pop args 1] }
+            default {
+                if {[llength $args] == 1} { break }
+                if {[string compare $option "--"] == 0} { Pop args; break }
+                set err [join [lsort [array names opts]] ", "]
+                return -code error "bad option $option:\
+                    must be one of $err"
+            }
+        }
+        Pop args
+    }
+
+    if {[string length $opts(-key)] < 1} {
+        return -code error "wrong # args:\
+            should be \"rc4 ?-hex? -key key -in channel | string\""
+    }
+
+    if {$opts(-infile) != {}} {
+        set opts(-in) [open $opts(-infile) r]
+        fconfigure $opts(-in) -translation binary
+    }
+
+    set r {}
+    if {$opts(-in) == {}} {
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"rc4 ?-hex? -key key -in channel | string\""
+        }
+
+        set Key [RC4Init $opts(-key)]
+        set r [RC4 $Key [lindex $args 0]]
+        if {[llength $opts(-command)] != 0} {
+            eval $opts(-command) [list $r]
+            set r {}
+        } elseif {$opts(-out) != {}} {
+            puts -nonewline $opts(-out) $r
+            set r {}
+        }
+        RC4Final $Key
+
+    } else {
+
+        variable uid
+        set State [namespace current]::state[incr uid]
+        upvar #0 $State state
+        array set state [array get opts]
+        set state(Key) [RC4Init $opts(-key)]
+        set state(reading) 1
+        set state(output) ""
+        fileevent $opts(-in) readable [list [namespace origin Chunk] $State]
+        if {[llength $opts(-command)] != 0} {
+            return {}
+        } else {
+            vwait [set State](reading)
+            set r [Cleanup $State]
+        }
+    }
+
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+proc ::rc4::SelectImplementation {impl} {
+    switch -exact -- $impl {
+        critcl {
+            interp alias {} ::rc4::RC4Init {} ::rc4::rc4c_init
+            interp alias {} ::rc4::RC4     {} ::rc4::rc4c
+        }
+        array {
+            interp alias {} ::rc4::RC4Init {} ::rc4::RC4Init_Array
+            interp alias {} ::rc4::RC4     {} ::rc4::RC4_Array
+        }
+        list {
+            interp alias {} ::rc4::RC4Init {} ::rc4::RC4Init_List
+            interp alias {} ::rc4::RC4     {} ::rc4::RC4_List
+        }
+        default {
+            return -code error "invalid implementation \"$impl\":\
+                must be one of \"critcl\", \"array\" or \"list\""
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# Using a list to hold the keystream state is a lot faster than using
+# an array. However, for Tcl < 8.4 we don't have the lset command.
+# Using a compatability lset is slower than using arrays.
+# Obviously, a compiled C version is fastest of all.
+# So lets pick the fastest method we can find...
+#
+namespace eval ::rc4 {
+    if {[catch {package require tcllibc}]} {
+        catch {package require rc4c}
+    }
+    if {[info commands ::rc4::rc4c] != {}} {
+        SelectImplementation critcl
+    } elseif {[package vcompare [package provide Tcl] 8.4] < 0} {
+        SelectImplementation array
+    } else {
+        SelectImplementation list
+    }
+}
+
+package provide rc4 1.1.0
+
+# -------------------------------------------------------------------------
+# Local variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rc4/rc4c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rc4/rc4c.tcl
new file mode 100644
index 00000000..fd717dfb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rc4/rc4c.tcl
@@ -0,0 +1,168 @@
+# rc4c.tcl - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# This provides a critcl C implementation of RC4 
+#
+# INSTALLATION
+# ------------
+# This package uses critcl (http://wiki.tcl.tk/critcl). To build do:
+#  critcl -libdir <your-tcl-lib-dir> -pkg rc4c rc4c
+#
+# To build this for tcllib use sak.tcl:
+#  tclsh sak.tcl critcl
+# generates a tcllibc module.
+#
+# $Id: rc4c.tcl,v 1.4 2009/05/07 00:14:02 patthoyts Exp $
+
+package require critcl
+# @sak notprovided rc4c
+package provide rc4c 1.1.0
+
+namespace eval ::rc4 {
+
+    critcl::ccode {
+        #include <string.h>
+
+        typedef struct RC4_CTX {
+            unsigned char x;
+            unsigned char y;
+            unsigned char s[256];
+        } RC4_CTX;
+
+        /* #define TRACE trace */
+        #define TRACE 1 ? ((void)0) : trace
+
+        static void trace(const char *format, ...)
+        {
+            va_list args;
+            va_start(args, format);
+            vfprintf(stderr, format, args);
+            va_end(args);
+        }
+        static Tcl_ObjType rc4_type;
+    
+        static void rc4_free_rep(Tcl_Obj *obj)
+        {
+            RC4_CTX *ctx = (RC4_CTX *)obj->internalRep.otherValuePtr;
+            TRACE("rc4_free_rep(%08x)\n", (long)obj);
+            Tcl_Free((char *)ctx);
+        }
+
+        static void rc4_dup_rep(Tcl_Obj *obj, Tcl_Obj *dup)
+        {
+            RC4_CTX *ctx = (RC4_CTX *)obj->internalRep.otherValuePtr;
+            TRACE("rc4_dup_rep(%08x,%08x)\n", (long)obj, (long)dup);
+            dup->internalRep.otherValuePtr = (RC4_CTX *)Tcl_Alloc(sizeof(RC4_CTX));
+            memcpy(dup->internalRep.otherValuePtr, ctx, sizeof(RC4_CTX));
+            dup->typePtr = &rc4_type;
+        }
+
+        static void rc4_string_rep(Tcl_Obj* obj)
+        {
+            RC4_CTX *ctx = (RC4_CTX *)obj->internalRep.otherValuePtr;
+            Tcl_Obj* tmpObj;
+            char* str;
+            TRACE("rc4_string_rep(%08x)\n", (long)obj);
+            /* convert via a byte array to properly handle null bytes */
+            tmpObj = Tcl_NewByteArrayObj((unsigned char *)ctx, sizeof(RC4_CTX));
+            Tcl_IncrRefCount(tmpObj);
+            
+            str = Tcl_GetStringFromObj(tmpObj, &obj->length);
+            obj->bytes = Tcl_Alloc(obj->length + 1);
+            memcpy(obj->bytes, str, obj->length + 1);
+            
+            Tcl_DecrRefCount(tmpObj);
+        }
+
+        static int rc4_from_any(Tcl_Interp* interp, Tcl_Obj* obj)
+        {
+            TRACE("rc4_from_any %08x\n", (long)obj);
+            return TCL_ERROR;
+        }
+
+        static Tcl_ObjType rc4_type = {
+            "rc4c", rc4_free_rep, rc4_dup_rep, rc4_string_rep, rc4_from_any
+        };
+#ifdef __GNUC__
+        inline
+#elif defined(_MSC_VER)
+        __inline
+#endif
+        void swap (unsigned char *lhs, unsigned char *rhs) {
+            unsigned char t = *lhs;
+            *lhs = *rhs;
+            *rhs = t;
+        }
+    }
+
+    critcl::ccommand rc4c_init {dummy interp objc objv} {
+        RC4_CTX *ctx;
+        Tcl_Obj *obj;
+        const unsigned char *k;
+        int n = 0, i = 0, j = 0, keylen;
+
+        if (objc != 2) {
+            Tcl_WrongNumArgs(interp, 1, objv, "keystring");
+            return TCL_ERROR;
+        }
+        
+        k = Tcl_GetByteArrayFromObj(objv[1], &keylen);
+
+        obj = Tcl_NewObj();
+        ctx = (RC4_CTX *)Tcl_Alloc(sizeof(RC4_CTX));
+        ctx->x = 0;
+        ctx->y = 0;
+        for (n = 0; n < 256; n++)
+            ctx->s[n] = n;
+        for (n = 0; n < 256; n++) {
+            j = (k[i] + ctx->s[n] + j) % 256;
+            swap(&ctx->s[n], &ctx->s[j]);
+            i = (i + 1) % keylen;
+        }
+        
+        if (obj->typePtr != NULL && obj->typePtr->freeIntRepProc != NULL)
+            obj->typePtr->freeIntRepProc(obj);
+        obj->internalRep.otherValuePtr = ctx;
+        obj->typePtr = &rc4_type;
+        Tcl_InvalidateStringRep(obj);
+        Tcl_SetObjResult(interp, obj);
+        return TCL_OK;
+    }
+
+    critcl::ccommand rc4c {dummy interp objc objv} {
+        Tcl_Obj *resObj = NULL;
+        RC4_CTX *ctx = NULL;
+        unsigned char *data, *res, x, y;
+        int size, n, i;
+
+        if (objc != 3) {
+            Tcl_WrongNumArgs(interp, 1, objv, "key data");
+            return TCL_ERROR;
+        }
+
+        if (objv[1]->typePtr != &rc4_type
+            && rc4_from_any(interp, objv[1]) != TCL_OK) {
+            return TCL_ERROR;
+        }
+
+        ctx = objv[1]->internalRep.otherValuePtr;
+        data = Tcl_GetByteArrayFromObj(objv[2], &size);
+        res = (unsigned char *)Tcl_Alloc(size);
+
+        x = ctx->x;
+        y = ctx->y;
+        for (n = 0; n < size; n++) {
+            x = (x + 1) % 256;
+            y = (ctx->s[x] + y) % 256;
+            swap(&ctx->s[x], &ctx->s[y]);
+            i = (ctx->s[x] + ctx->s[y]) % 256;
+            res[n] = data[n] ^ ctx->s[i];
+        }
+        ctx->x = x;
+        ctx->y = y;
+
+        resObj = Tcl_NewByteArrayObj(res, size);
+        Tcl_SetObjResult(interp, resObj);
+        Tcl_Free((char*)res);
+        return TCL_OK;
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rcs/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rcs/pkgIndex.tcl
new file mode 100644
index 00000000..329d5d70
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rcs/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded rcs 0.1 [list source [file join $dir rcs.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rcs/rcs.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rcs/rcs.tcl
new file mode 100644
index 00000000..aa85cfa7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rcs/rcs.tcl
@@ -0,0 +1,281 @@
+# rcs.tcl --
+#
+#	Utilities for RCS related operations.
+#
+# Copyright (c) 2005 by Colin McCormack <coldstore@users.sourceforge.net>
+# Copyright (c) 2005 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: rcs.tcl,v 1.4 2005/09/28 04:51:23 andreas_kupries Exp $
+
+# ### ### ### ######### ######### #########
+## Requisites.
+
+package require Tcl 8.4
+
+# ### ### ### ######### ######### #########
+## API Implementation
+
+namespace eval rcs {}
+
+# ::rcs::text2dict --
+#
+# Convert a text into a dictionary. The dictionary is keyed by line
+# numbers, and the value is the text of the corresponding line. The
+# first line has index/number 1.
+#
+# Arguments
+# - text	The text to convert.
+#
+# Results
+#  A dictionary containing the text in split form.
+#
+# Side effects
+#  None
+
+proc ::rcs::text2dict {text} {
+    array set lines {}
+    set lnum 0
+    foreach line [split $text \n] {
+	set lines([incr lnum]) $line
+    }
+    return [array get lines]
+}
+
+# ::rcs::file2dict --
+#
+# Convert a text stored in a file into a dictionary. The dictionary is
+# keyed by line numbers, and the value is the text of the
+# corresponding line. The first line has index/number 1.
+#
+# Arguments
+# - file	The path of the file containing the text to convert.
+#
+# Results
+#  A dictionary containing the text in split form.
+#
+# Side effects
+#  None
+
+proc ::rcs::file2dict {filename} {
+    set chan [open $filename r]
+    set text [read $chan]
+    close $chan
+
+    return [text2dict $text]
+}
+
+# ::rcs::dict2text --
+#
+# Converts a dictionary as created by the 2dict commands back into a
+# text. The dictionary is keyed by line numbers, and the value is the
+# text of the corresponding line. The first line has index/number 1.
+# The dictionary may have gaps in the line numbers.
+#
+# Arguments
+# - dict	The dictionary to convert.
+#
+# Results
+#  The text stored in the dictionary.
+#
+# Side effects
+#  None
+
+proc ::rcs::dict2text {dict} {
+    array set lines $dict
+    set result {}
+    foreach lnum [lsort -integer [array names lines]] {
+	lappend result $lines($lnum)
+    }
+    return [join $result \n]
+}
+
+# ::rcs::dict2file --
+#
+# Converts a dictionary as created by the 2dict commands back into a
+# text and stores it into the specified file. The dictionary is keyed
+# by line numbers, and the value is the text of the corresponding
+# line. The first line has index/number 1.  The dictionary may have
+# gaps in the line numbers.
+#
+# Arguments
+# - filename	The path to the file to store the reconstructed text into.
+# - dict	The dictionary to convert.
+#
+# Results
+#  None.
+#
+# Side effects
+#  None
+
+proc ::rcs::dict2file {filename dict} {
+    set chan [open $filename w]
+    puts -nonewline $chan [dict2text $dict]
+    close $chan
+}
+
+# ::rcs::decodeRcsPatch --
+#
+# Converts a text containing a RCS patch (diff -n format) into a list
+# of patch commands. Each element of the list is a list containing the
+# patch command and its arguments, in this order.
+#
+# The valid patch commands are 'a' and 'd'. 'a' has two arguments, the
+# index of the line where to add the text, and the text itself. The
+# 'd' command has two arguments as well, the index of the first line
+# to delete, and the number of lines to delete.
+#
+# Arguments
+# - patch	The text in diff -n format, the patch to parse.
+#
+# Results
+#   A list containing the patch as sequence of commands.
+#
+# Side effects
+#  None
+
+proc ::rcs::decodeRcsPatch {patch} {
+    set patch [split $patch \n]
+    set plen  [llength $patch]
+    set at    0
+    set res   {}
+
+    while {$at < $plen} {
+	# I use an index into the list to avoid shifting the list
+	# elements down with each line processed. That is a lot of
+	# memcpy's.
+
+	set cmd [string trim [lindex $patch $at]]
+	incr at
+
+	switch -glob -- $cmd {
+	    "" {}
+	    a* {
+		foreach {start len} [split [string range $cmd 1 end]] break
+
+		set to [expr {$at + $len - 1}]
+		lappend res [list \
+				 a \
+				 $start \
+				 [join [lrange $patch $at $to] \n]]
+		incr to
+		set at $to
+	    }
+	    d* {
+		foreach {start len} [split [string range $cmd 1 end]] break
+		lappend res [list d $start $len]
+	    }
+	    default {
+		return -code error "Unknown patch command: '$cmd'"
+	    }
+	}
+    }
+
+    return $res
+}
+
+# ::rcs::encodeRcsPatch --
+#
+# Converts a list of patch commands into a text containing the same
+# command as a RCS patch (i.e. in diff -n format). See decodePatch for
+# a description of the input format.
+#
+# Arguments
+# - patch	The patch as list of patch commands.
+#
+# Results
+#   A text containing the patch in diff -n format.
+#
+# Side effects
+#  None
+
+proc ::rcs::encodeRcsPatch {patch} {
+    set res {}
+
+    foreach cmd $patch {
+	foreach {op a b} $cmd break
+
+	switch -exact -- $op {
+	    a {
+		# a = index of line where to add
+		# b = text to add
+
+		set  lines [llength [split $b \n]]
+
+		lappend res "a$a $lines"
+		lappend res $b
+	    }
+	    d {
+		# a = index of first line to delete.
+		# b = #lines to delete.
+
+		lappend res "d$a $b"
+	    }
+	    default {
+		return -code error "Unknown patch command: '$op'"
+	    }
+	}
+    }
+
+    return [join $res \n]\n
+}
+
+# ::rcs::applyRcsPatch --
+#
+# Apply a patch in the format returned by decodeRcsPatch to a text in
+# the format returned by the xx2dict commands. The result is
+# dictionary containing the modified text. Use the dict2xx commands to
+# convert this back into a regular text.
+#
+# Arguments
+# - text	The text (as dict) to patch
+# - patch	The patch (as cmd list) to apply.
+#
+# Results
+#  The modified text (as dict)
+#
+# Side effects
+#  None
+
+proc ::rcs::applyRcsPatch {text patch} {
+    array set lines $text
+
+    foreach cmd $patch {
+	foreach {op a b} $cmd break
+
+	switch -exact -- $op {
+	    a {
+		# a = index of line where to add
+		# b = text to add
+
+		if {[info exists lines($a)]} {
+		    append lines($a) \n $b
+		} else {
+		    set lines($a) $b
+		}
+	    }
+	    d {
+		# a = index of first line to delete.
+		# b = #lines to delete.
+
+		while {$b > 0} {
+		    unset lines($a)
+		    incr a
+		    incr b -1
+		}
+	    }
+	    default {
+		return -code error "Unknown patch command: '$op'"
+	    }
+	}
+    }
+
+    return [array get lines]
+}
+
+# ### ### ### ######### ######### #########
+## Ready for use.
+
+package provide rcs 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/report/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/report/pkgIndex.tcl
new file mode 100644
index 00000000..a7e3e7d3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/report/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded report 0.4 [list source [file join $dir report.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/report/report.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/report/report.tcl
new file mode 100644
index 00000000..193fd37e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/report/report.tcl
@@ -0,0 +1,1389 @@
+# report.tcl --
+#
+#	Implementation of report objects for Tcl.
+#
+# Copyright (c) 2001-2014,2022 by Andreas Kupries <andreas.kupries@gmail.com>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.5
+package provide report 0.4
+
+namespace eval ::report {
+    # Data storage in the report module
+    # -------------------------------
+    #
+    # One namespace per object, containing
+    #  1) An array mapping from template codes to templates
+    #  2) An array mapping from template codes and columns to horizontal template items
+    #  3) An array mapping from template codes and columns to vertical template items
+    #  4) ... deleted, local to formatting
+    #  5) An array mapping from columns to left padding
+    #  6) An array mapping from columns to right padding
+    #  7) An array mapping from columns to column size
+    #  8) An array mapping from columns to justification
+    #  9) A scalar containing the number of columns in the report.
+    # 10) An array mapping from template codes to enabledness
+    # 11) A scalar containing the size of the top caption
+    # 12) A scalar containing the size of the bottom caption
+    #
+    # 1 - template		5 - lpad	 9 - columns
+    # 2 - hTemplate		6 - rpad	10 - enabled
+    # 3 - vTemplate		7 - csize	11 - tcaption
+    # 4 - fullHTemplate		8 - cjust	12 - bcaption
+
+    # commands is the list of subcommands recognized by the report
+    variable commands [list		\
+	    "bcaption"			\
+	    "botcapsep"			\
+	    "botdata"			\
+	    "botdatasep"		\
+	    "bottom"			\
+	    "columns"			\
+	    "data"			\
+	    "datasep"			\
+	    "justify"			\
+	    "pad"			\
+	    "printmatrix"		\
+	    "printmatrix2channel"	\
+	    "size"			\
+	    "sizes"			\
+	    "tcaption"			\
+	    "top"			\
+	    "topcapsep"			\
+	    "topdata"			\
+	    "topdatasep"
+	    ]
+
+    # Only export the toplevel commands
+    namespace export report defstyle rmstyle stylearguments stylebody
+
+    # Global data, style definitions
+
+    variable styles [list plain]
+    variable styleargs
+    variable stylebody
+
+    array set styleargs {plain {}}
+    array set stylebody {plain {}}
+
+    # Global data, template codes, for easy checking
+
+    variable  tcode
+    array set tcode {
+	topdata    0	data       0
+	botdata    0	top        1
+	topdatasep 1	topcapsep  1
+	datasep    1	botcapsep  1
+	botdatasep 1	bottom     1
+    }
+}
+
+# ::report::report --
+#
+#	Create a new report with a given name
+#
+# Arguments:
+#	name	Optional name of the report; if null or not given, generate one.
+#
+# Results:
+#	name	Name of the report created
+
+proc ::report::report {name columns args} {
+    variable styleargs
+
+    if { [llength [info commands ::$name]] } {
+	error "command \"$name\" already exists, unable to create report"
+    }
+    if {![string is integer $columns]} {
+	return -code error "columns: expected integer greater than zero, got \"$columns\""
+    } elseif {$columns <= 0} {
+	return -code error "columns: expected integer greater than zero, got \"$columns\""
+    }
+
+    set styleName ""
+    switch -exact -- [llength $args] {
+	0 {# No style was specied. This is OK}
+	1 {
+	    # We possibly got the "style" keyword, but everything behind is missing
+	    return -code error "wrong # args: report name columns ?\"style\" styleName ?arg...??"
+	}
+	default {
+	    # Break tail apart, check for correct keyword, ensure that style is known too.
+	    # Don't forget to check the actual against the formal arguments.
+
+	    foreach {dummy styleName} $args break
+	    set args [lrange $args 2 end]
+
+	    if {![string equal $dummy style]} {
+		return -code error "wrong # args: report name columns ?\"style\" styleName ?arg...??"
+	    }
+	    if {![info exists styleargs($styleName)]} {
+		return -code error "style \"$styleName\" is not known"
+	    }
+	    CheckStyleArguments $styleName $args
+	}
+    }
+
+    # The arguments seem to be ok, setup the namespace for the object
+    # and configure it to style "plain".
+
+    namespace eval ::report::report$name "variable columns $columns"
+    namespace eval ::report::report$name {
+	variable tcaption 0
+	variable bcaption 0
+	variable template
+	variable enabled
+	variable hTemplate
+	variable vTemplate
+	variable lpad
+	variable rpad
+	variable csize
+	variable cjust
+
+	variable t
+	variable i
+	variable dt [list]
+	variable st [list]
+	for {set i 0} {$i < $columns} {incr i} {
+	    set lpad($i) ""
+	    set rpad($i) ""
+	    set csize($i) dyn
+	    set cjust($i) left
+	    lappend dt {}
+	    lappend st {} {}
+	}
+	lappend dt {}
+	lappend st {}
+
+	foreach t {
+	    topdata data botdata
+	} {
+	    set enabled($t) 1
+	    set template($t) $dt
+	    for {set i 0} {$i <= $columns} {incr i} {
+		set vTemplate($t,$i) {}
+	    }
+	}
+	foreach t {
+	    top topdatasep topcapsep
+	    datasep
+	    botcapsep botdatasep bottom
+	} {
+	    set enabled($t) 0
+	    set template($t) $st
+	    for {set i 0} {$i < $columns} {incr i} {
+		set hTemplate($t,$i) {}
+	    }
+	    for {set i 0} {$i <= $columns} {incr i} {
+		set vTemplate($t,$i) {}
+	    }
+	}
+
+	unset t i dt st
+    }
+
+    # Create the command to manipulate the report
+    #                 $name -> ::report::ReportProc $name
+    interp alias {} ::$name {} ::report::ReportProc $name
+
+    # If a style was specified execute it now, before the oobject is
+    # handed back to the user.
+
+    if {$styleName != {}} {
+	ExecuteStyle $name $styleName $args
+    }
+
+    return $name
+}
+
+# ::report::defstyle --
+#
+#	Defines a new named style, with arguments and defining script.
+#
+# Arguments:
+#	styleName	Name of the new style.
+#	arguments	Formal arguments of the style, some format as for proc.
+#	body		The script actually defining the style.
+#
+# Results:
+#	None.
+
+proc ::report::defstyle {styleName arguments body} {
+    variable styleargs
+    variable stylebody
+    variable styles
+
+    if {[info exists styleargs($styleName)]} {
+	return -code error "Cannot create style \"$styleName\", already exists"
+    }
+
+    # Check the formal arguments
+    # 1. Arguments without default may not follow an argument with a
+    #    default. The special "args" is no exception!
+    # 2. Compute the minimal number of arguments required by the proc.
+
+    set min 0
+    set def 0
+    set ca  0
+
+    foreach v $arguments {
+	switch -- [llength $v] {
+	    1 {
+		if {$def} {
+		    return -code error \
+			    "Found argument without default after arguments having defaults"
+		}
+		incr min
+	    }
+	    2 {
+		set def 1
+	    }
+	    default {
+		error "Illegal length of value \"$v\""
+	    }
+	}
+    }
+    if {[string equal args [lindex $arguments end]]} {
+	# Correct requirements if we have a catch-all at the end.
+	incr min -1
+	set  ca 1
+    }
+
+    # Now we are allowed to extend the internal database
+
+    set styleargs($styleName) [list $min $ca $arguments]
+    set stylebody($styleName) $body
+    lappend styles $styleName
+    return
+}
+
+# ::report::rmstyle --
+#
+#	Deletes the specified style.
+#
+# Arguments:
+#	styleName	Name of the style to destroy.
+#
+# Results:
+#	None.
+
+proc ::report::rmstyle {styleName} {
+    variable styleargs
+    variable stylebody
+    variable styles
+
+    if {![info exists styleargs($styleName)]} {
+	return -code error "cannot delete unknown style \"$styleName\""
+    }
+    if {[string equal $styleName plain]} {
+	return -code error {cannot delete builtin style "plain"}
+    }
+
+    unset styleargs($styleName)
+    unset stylebody($styleName)
+
+    set pos    [lsearch -exact $styles $styleName]
+    set styles [lreplace $styles $pos $pos]
+    return
+}
+
+# ::report::_stylearguments --
+#
+#	Introspection, returns the list of formal arguments of the
+#	specified style.
+#
+# Arguments:
+#	styleName	Name of the style to query.
+#
+# Results:
+#	A list containing the formal argument of the style
+
+proc ::report::stylearguments {styleName} {
+    variable styleargs
+    if {![info exists styleargs($styleName)]} {
+	return -code error "style \"$styleName\" is not known"
+    }
+    return [lindex $styleargs($styleName) 2]
+}
+
+# ::report::_stylebody --
+#
+#	Introspection, returns the body/script of the
+#	specified style.
+#
+# Arguments:
+#	styleName	Name of the style to query.
+#
+# Results:
+#	A script, the body of the style.
+
+proc ::report::stylebody {styleName} {
+    variable stylebody
+    if {![info exists stylebody($styleName)]} {
+	return -code error "style \"$styleName\" is not known"
+    }
+    return $stylebody($styleName)
+}
+
+# ::report::_styles --
+#
+#	Returns alist containing the names of all known styles.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list containing the names of all known styles
+
+proc ::report::styles {} {
+    variable styles
+    return  $styles
+}
+
+##########################
+# Private functions follow
+
+# ::report::CheckStyleArguments --
+#
+#	Internal helper. Used to check actual arguments of a style against the formal ones.
+#
+# Arguments:
+#	styleName	Name of the style in question
+#	arguments	Actual arguments for the style.
+#
+# Results:
+#	None, or an error in case of problems.
+
+proc ::report::CheckStyleArguments {styleName arguments} {
+    variable styleargs
+
+    # Match formal and actual arguments, error out in case of problems.
+    foreach {min catchall formal} $styleargs($styleName) break
+
+    if {[llength $arguments] < $min} {
+	# Determine the name of the first formal parameter which did not get a value.
+	set firstmissing [lindex $formal [llength $arguments]]
+	return -code error "no value given for parameter \"$firstmissing\" to style \"$styleName\""
+    } elseif {[llength $arguments] > $min} {
+	if {!$catchall && ([llength $arguments] > [llength $formal])} {
+	    # More actual arguments than formals, without catch-all argument, error
+	    return -code error "called style \"$styleName\" with too many arguments"
+	}
+    }
+}
+
+# ::report::ExecuteStyle --
+#
+#	Internal helper. Applies a named style to the specified report object.
+#
+# Arguments:
+#	name		Name of the report the style is applied to.
+#	styleName	Name of the style to apply
+#	arguments	Actual arguments for the style.
+#
+# Results:
+#	None.
+
+proc ::report::ExecuteStyle {name styleName arguments} {
+    variable styleargs
+    variable stylebody
+    variable styles
+    variable commands
+
+    CheckStyleArguments $styleName $arguments
+    foreach {min catchall formal} $styleargs($styleName) break
+
+    array set a {}
+
+    if {([llength $arguments] > $min) && $catchall} {
+	# #min = number of formal arguments - 1
+	set a(args) [lrange $arguments $min end]
+	set formal  [lrange $formal 0 end-1]
+	incr min -1
+	set arguments [lrange $arguments 0 $min]
+
+	# arguments and formal are now of equal length and we also
+	# know that there are no arguments having a default value.
+	foreach v $formal aval $arguments {
+	    set a($v) $aval
+	}
+    }
+
+    # More arguments than minimally required, but no more than formal
+    # arguments! Proceed to standard matching: Go through the actual
+    # values and associate them with a formal argument. Then fill the
+    # remaining formal arguments with their default values.
+
+    foreach aval $arguments {
+	set v      [lindex $formal 0]
+	set formal [lrange $formal 1 end]
+	if {[llength $v] > 1} {set v [lindex $v 0]}
+	set a($v) $aval
+    }
+
+    foreach vd $formal {
+	foreach {var default} $vd {
+	    set a($var) $default
+	}
+    }
+
+    # Create and initialize a safe interpreter, execute the style and
+    # then break everything down again.
+
+    set ip [interp create -safe]
+
+    # -- Report methods --
+
+    foreach m $commands {
+	# safe-ip method --> here report method
+	interp alias $ip $m {} $name $m
+    }
+
+    # -- Styles defined before this one --
+
+    foreach s $styles {
+	if {[string equal $s $styleName]} {break}
+	interp alias $ip $s {} ::report::LinkExec $name $s
+    }
+
+    # -- Arguments as variables --
+
+    foreach {var val} [array get a] {
+	$ip eval [list set $var $val]
+    }
+
+    # Finally execute / apply the style.
+
+    $ip eval $stylebody($styleName)
+    interp delete $ip
+    return
+}
+
+# ::report::_LinkExec --
+#
+#	Internal helper. Used for application of styles from within
+#	another style script. Collects the formal arguments into the
+#	one list which is expected by "ExecuteStyle".
+#
+# Arguments:
+#	name		Name of the report the style is applied to.
+#	styleName	Name of the style to apply
+#	args		Actual arguments for the style.
+#
+# Results:
+#	None.
+
+proc ::report::LinkExec {name styleName args} {
+    ExecuteStyle $name $styleName $args
+}
+
+# ::report::ReportProc --
+#
+#	Command that processes all report object commands.
+#
+# Arguments:
+#	name	Name of the report object to manipulate.
+#	cmd	Subcommand to invoke.
+#	args	Arguments for subcommand.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::report::ReportProc {name {cmd ""} args} {
+    variable tcode
+
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	error "wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+
+    if {[info exists tcode($cmd)]} {
+	# Template codes are a bit special
+	eval [list ::report::_tAction $name $cmd] $args
+    } else {
+	if { [llength [info commands ::report::_$cmd]] == 0 } {
+	    variable commands
+	    set optlist [join $commands ", "]
+	    set optlist [linsert $optlist "end-1" "or"]
+	    error "bad option \"$cmd\": must be $optlist"
+	}
+	eval [list ::report::_$cmd $name] $args
+    }
+}
+
+# ::report::CheckColumn --
+#
+#	Helper to check and transform column indices. Returns the
+#	absolute index number belonging to the specified
+#	index. Rejects indices out of the valid range of columns.
+#
+# Arguments:
+#	columns Number of columns
+#	column	The incoming index to check and transform
+#
+# Results:
+#	The absolute index to the column
+
+proc ::report::CheckColumn {columns column} {
+    switch -regex -- $column {
+	{end-[0-9]+} {
+	    regsub -- {end-} $column {} column
+	    set cc [expr {$columns - 1 - $column}]
+	    if {($cc < 0) || ($cc >= $columns)} {
+		return -code error "column: index \"end-$column\" out of range"
+	    }
+	    return $cc
+	}
+	end {
+	    if {$columns <= 0} {
+		return -code error "column: index \"$column\" out of range"
+	    }
+	    return [expr {$columns - 1}]
+	}
+	{[0-9]+} {
+	    if {($column < 0) || ($column >= $columns)} {
+		return -code error "column: index \"$column\" out of range"
+	    }
+	    return $column
+	}
+	default {
+	    return -code error "column: syntax error in index \"$column\""
+	}
+    }
+}
+
+# ::report::CheckVerticals --
+#
+#	Internal helper. Used to check the consistency of all active
+#	templates with respect to the generated vertical separators
+#	(Same length).
+#
+# Arguments:
+#	name	Name of the report object to check.
+#
+# Results:
+#	None.
+
+proc ::report::CheckVerticals {name} {
+    upvar ::report::report${name}::vTemplate vTemplate
+    upvar ::report::report${name}::enabled   enabled
+    upvar ::report::report${name}::columns   columns
+    upvar ::report::report${name}::tcaption  tcaption
+    upvar ::report::report${name}::bcaption  bcaption
+
+    for {set c 0} {$c <= $columns} {incr c} {
+	# Collect all lengths for a column in a list, sort that and
+	# compare first against last element. If they are not equal we
+	# have found an inconsistent definition.
+
+	set     res [list]
+	lappend res [TermWidth $vTemplate(data,$c)]
+
+	if {$tcaption > 0} {
+	    lappend res [TermWidth $vTemplate(topdata,$c)]
+	    if {($tcaption > 1) && $enabled(topdatasep)} {
+		lappend res [TermWidth $vTemplate(topdatasep,$c)]
+	    }
+	    if {$enabled(topcapsep)} {
+		lappend res [TermWidth $vTemplate(topcapsep,$c)]
+	    }
+	}
+	if {$bcaption > 0} {
+	    lappend res [TermWidth $vTemplate(botdata,$c)]
+	    if {($bcaption > 1) && $enabled(botdatasep)} {
+		lappend res [TermWidth $vTemplate(botdatasep,$c)]
+	    }
+	    if {$enabled(botcapsep)} {
+		lappend res [TermWidth $vTemplate(botcapsep,$c)]
+	    }
+	}
+	foreach t {top datasep bottom} {
+	    if {$enabled($t)} {
+		lappend res [TermWidth $vTemplate($t,$c)]
+	    }
+	}
+
+	set res [lsort $res]
+
+	if {[lindex $res 0] != [lindex $res end]} {
+	    return -code error "inconsistent verticals in report"
+	}
+    }
+}
+
+# ::report::_tAction --
+#
+#	Implements the actions on templates (set, get, enable, disable, enabled)
+#
+# Arguments:
+#	name		Name of the report object.
+#	template	Name of the template to query or manipulate.
+#	cmd		The action applied to the template
+#	args		Additional arguments per action, see documentation.
+#
+# Results:
+#	None.
+
+proc ::report::_tAction {name template cmd args} {
+    # When coming in here we know that $template contains a legal
+    # template code. No need to check again. We need 'tcode'
+    # nevertheless to distinguish between separator (1) and data
+    # templates (0).
+
+    variable tcode
+
+    switch -exact -- $cmd {
+	set {
+	    if {[llength $args] != 1} {
+		return -code error "Wrong # args: $name $template $cmd template"
+	    }
+	    set templval [lindex $args 0]
+
+	    upvar ::report::report${name}::columns   columns
+	    upvar ::report::report${name}::template  tpl
+	    upvar ::report::report${name}::hTemplate hTemplate
+	    upvar ::report::report${name}::vTemplate vTemplate
+	    upvar ::report::report${name}::enabled   enabled
+
+	    if {$tcode($template)} {
+		# Separator template, expected size = 2*colums+1
+		if {[llength $templval] > (2*$columns+1)} {
+		    return -code error {template to long for number of columns in report}
+		} elseif {[llength $templval] < (2*$columns+1)} {
+		    return -code error {template to short for number of columns in report}
+		}
+
+		set tpl($template) $templval
+
+		set even 1
+		set c1   0
+		set c2   0
+		foreach item $templval {
+		    if {$even} {
+			set vTemplate($template,$c1) $item
+			incr c1
+			set even 0
+		    } else {
+			set hTemplate($template,$c2) $item
+			incr c2
+			set even 1
+		    }
+		}
+	    } else {
+		# Data template, expected size = columns+1
+		if {[llength $templval] > ($columns+1)} {
+		    return -code error {template to long for number of columns in report}
+		} elseif {[llength $templval] < ($columns+1)} {
+		    return -code error {template to short for number of columns in report}
+		}
+
+		set tpl($template) $templval
+
+		set c 0
+		foreach item $templval {
+		    set vTemplate($template,$c) $item
+		    incr c
+		}
+	    }
+	    if {$enabled($template)} {
+		# Perform checks for active separator templates and
+		# all data templates.
+		CheckVerticals $name
+	    }
+	}
+	get -
+	enable -
+	disable -
+	enabled {
+	    if {[llength $args] > 0} {
+		return -code error "Wrong # args: $name $template $cmd"
+	    }
+	    switch -exact -- $cmd {
+		get {
+		    upvar ::report::report${name}::template  tpl
+		    return $tpl($template)
+		}
+		enable {
+		    if {!$tcode($template)} {
+			# Data template, can't be enabled.
+			return -code error "Cannot enable data template \"$template\""
+		    }
+
+		    upvar ::report::report${name}::enabled enabled
+
+		    if {!$enabled($template)} {
+			set enabled($template) 1
+			CheckVerticals $name
+		    }
+
+		}
+		disable {
+		    if {!$tcode($template)} {
+			# Data template, can't be disabled.
+			return -code error "Cannot disable data template \"$template\""
+		    }
+
+		    upvar ::report::report${name}::enabled enabled
+		    if {$enabled($template)} {
+			set enabled($template) 0
+		    }
+		}
+		enabled {
+		    if {!$tcode($template)} {
+			# Data template, can't be disabled.
+			return -code error "Cannot query state of data template \"$template\""
+		    }
+
+		    upvar ::report::report${name}::enabled enabled
+		    return $enabled($template)
+		}
+		default {error "Can't happen, panic, run, shout"}
+	    }
+	}
+	default {
+	    return -code error "Unknown template command \"$cmd\""
+	}
+    }
+    return ""
+}
+
+# ::report::_tcaption --
+#
+#	Sets or queries the size of the top caption region of the report.
+#
+# Arguments:
+#	name	Name of the report object.
+#	size	The new size, if not empty. Emptiness indicates that a
+#		query was requested
+#
+# Results:
+#	None, or the current size of the top caption region
+
+proc ::report::_tcaption {name {size {}}} {
+    upvar ::report::report${name}::tcaption tcaption
+
+    if {$size == {}} {
+	return $tcaption
+    }
+    if {![string is integer $size]} {
+	return -code error "size: expected integer greater than or equal to zero, got \"$size\""
+    }
+    if {$size < 0} {
+	return -code error "size: expected integer greater than or equal to zero, got \"$size\""
+    }
+    if {$size == $tcaption} {
+	# No change, nothing to do
+	return ""
+    }
+    if {($size > 0) && ($tcaption == 0)} {
+	# Perform a consistency check after the assignment, the
+	# template might have been changed.
+	set tcaption $size
+	CheckVerticals $name
+    } else {
+	set tcaption $size
+    }
+    return ""
+}
+
+# ::report::_bcaption --
+#
+#	Sets or queries the size of the bottom caption region of the report.
+#
+# Arguments:
+#	name	Name of the report object.
+#	size	The new size, if not empty. Emptiness indicates that a
+#		query was requested
+#
+# Results:
+#	None, or the current size of the bottom caption region
+
+proc ::report::_bcaption {name {size {}}} {
+    upvar ::report::report${name}::bcaption bcaption
+
+    if {$size == {}} {
+	return $bcaption
+    }
+    if {![string is integer $size]} {
+	return -code error "size: expected integer greater than or equal to zero, got \"$size\""
+    }
+    if {$size < 0} {
+	return -code error "size: expected integer greater than or equal to zero, got \"$size\""
+    }
+    if {$size == $bcaption} {
+	# No change, nothing to do
+	return ""
+    }
+    if {($size > 0) && ($bcaption == 0)} {
+	# Perform a consistency check after the assignment, the
+	# template might have been changed.
+	set bcaption $size
+	CheckVerticals $name
+    } else {
+	set bcaption $size
+    }
+    return ""
+}
+
+# ::report::_size --
+#
+#	Sets or queries the size of the specified column.
+#
+# Arguments:
+#	name	Name of the report object.
+#	column	Index of the column to manipulate or query
+#	size	The new size, if not empty. Emptiness indicates that a
+#		query was requested
+#
+# Results:
+#	None, or the current size of the column
+
+proc ::report::_size {name column {size {}}} {
+    upvar ::report::report${name}::columns columns
+    upvar ::report::report${name}::csize   csize
+
+    set column [CheckColumn $columns $column]
+
+    if {$size == {}} {
+	return $csize($column)
+    }
+    if {[string equal $size dyn]} {
+	set csize($column) $size
+	return ""
+    }
+    if {![string is integer $size]} {
+	return -code error "expected integer greater than zero, got \"$size\""
+    }
+    if {$size <= 0} {
+	return -code error "expected integer greater than zero, got \"$size\""
+    }
+    set csize($column) $size
+    return ""
+}
+
+# ::report::_sizes --
+#
+#	Sets or queries the sizes of all columns.
+#
+# Arguments:
+#	name	Name of the report object.
+#	sizes	The new sizes, if not empty. Emptiness indicates that a
+#		query was requested
+#
+# Results:
+#	None, or a list containing the sizes of all columns.
+
+proc ::report::_sizes {name {sizes {}}} {
+    upvar ::report::report${name}::columns columns
+    upvar ::report::report${name}::csize   csize
+
+    if {$sizes == {}} {
+	set res [list]
+	foreach k [lsort -integer [array names csize]] {
+	    lappend res $csize($k)
+	}
+	return $res
+    }
+    if {[llength $sizes] != $columns} {
+	return -code error "Wrong # number of column sizes"
+    }
+    foreach size $sizes {
+	if {[string equal $size dyn]} {
+	    continue
+	}
+	if {![string is integer $size]} {
+	    return -code error "expected integer greater than zero, got \"$size\""
+	}
+	if {$size <= 0} {
+	    return -code error "expected integer greater than zero, got \"$size\""
+	}
+    }
+
+    set i 0
+    foreach s $sizes {
+	set csize($i) $s
+	incr i
+    }
+    return ""
+}
+
+# ::report::_pad --
+#
+#	Sets or queries the padding for the specified column.
+#
+# Arguments:
+#	name	Name of the report object.
+#	column	Index of the column to manipulate or query
+#	where	Where to place the padding. Emptiness indicates
+#		that a query was requested.
+#
+# Results:
+#	None, or the padding for the specified column.
+
+proc ::report::_pad {name column {where {}} {string { }}} {
+    upvar ::report::report${name}::columns columns
+    upvar ::report::report${name}::lpad   lpad
+    upvar ::report::report${name}::rpad   rpad
+
+    set column [CheckColumn $columns $column]
+
+    if {$where == {}} {
+	return [list $lpad($column) $rpad($column)]
+    }
+
+    switch -exact -- $where {
+	left {
+	    set lpad($column) $string
+	}
+	right {
+	    set rpad($column) $string
+	}
+	both {
+	    set lpad($column) $string
+	    set rpad($column) $string
+	}
+	default {
+	    return -code error "where: expected left, right, or both, got \"$where\""
+	}
+    }
+    return ""
+}
+
+# ::report::_justify --
+#
+#	Sets or queries the justification for the specified column.
+#
+# Arguments:
+#	name	Name of the report object.
+#	column	Index of the column to manipulate or query
+#	jvalue	Justification to set. Emptiness indicates
+#		that a query was requested
+#
+# Results:
+#	None, or the current justication for the specified column
+
+proc ::report::_justify {name column {jvalue {}}} {
+    upvar ::report::report${name}::columns columns
+    upvar ::report::report${name}::cjust   cjust
+
+    set column [CheckColumn $columns $column]
+
+    if {$jvalue == {}} {
+	return $cjust($column)
+    }
+    switch -exact -- $jvalue {
+	left - right - center {
+	    set cjust($column) $jvalue
+	    return ""
+	}
+	default {
+	    return -code error "justification: expected, left, right, or center, got \"$jvalue\""
+	}
+    }
+}
+
+# ::report::_printmatrix --
+#
+#	Format the specified matrix according to the configuration of
+#	the report.
+#
+# Arguments:
+#	name	Name of the report object.
+#	matrix	Name of the matrix object to format.
+#
+# Results:
+#	A string containing the formatted matrix.
+
+proc ::report::_printmatrix {name matrix} {
+    CheckMatrix $name $matrix
+    ColumnSizes $name $matrix state
+
+    upvar ::report::report${name}::tcaption tcaption
+    upvar ::report::report${name}::bcaption bcaption
+
+    set    row 0
+    set    out ""
+    append out [Separator top $name $matrix state]
+    if {$tcaption > 0} {
+	set n $tcaption
+	while {$n > 0} {
+	    append out [FormatData topdata $name state [$matrix get row $row] [$matrix rowheight $row]]
+	    if {$n > 1} {
+		append out [Separator topdatasep $name $matrix state]
+	    }
+	    incr n -1
+	    incr row
+	}
+	append out [Separator topcapsep $name $matrix state]
+    }
+
+    set n [expr {[$matrix rows] - $bcaption}]
+
+    while {$row < $n} {
+	append out [FormatData data $name state [$matrix get row $row] [$matrix rowheight $row]]
+	incr row
+	if {$row < $n} {
+	    append out [Separator datasep $name $matrix state]
+	}
+    }
+
+    if {$bcaption > 0} {
+	append out [Separator botcapsep $name $matrix state]
+	set n $bcaption
+	while {$n > 0} {
+	    append out [FormatData botdata $name state [$matrix get row $row] [$matrix rowheight $row]]
+	    if {$n > 1} {
+		append out [Separator botdatasep $name $matrix state]
+	    }
+	    incr n -1
+	    incr row
+	}
+    }
+
+    append out [Separator bottom $name $matrix state]
+
+    #parray state
+    return $out
+}
+
+# ::report::_printmatrix2channel --
+#
+#	Format the specified matrix according to the configuration of
+#	the report.
+#
+# Arguments:
+#	name	Name of the report.
+#	matrix	Name of the matrix object to format.
+#	chan	Handle of the channel to write the formatting result into.
+#
+# Results:
+#	None.
+
+proc ::report::_printmatrix2channel {name matrix chan} {
+    CheckMatrix $name $matrix
+    ColumnSizes $name $matrix state
+
+    upvar ::report::report${name}::tcaption tcaption
+    upvar ::report::report${name}::bcaption bcaption
+
+    set    row 0
+    puts -nonewline $chan [Separator top $name $matrix state]
+    if {$tcaption > 0} {
+	set n $tcaption
+	while {$n > 0} {
+	    puts -nonewline $chan \
+		    [FormatData topdata $name state [$matrix get row $row] [$matrix rowheight $row]]
+	    if {$n > 1} {
+		puts -nonewline $chan [Separator topdatasep $name $matrix state]
+	    }
+	    incr n -1
+	    incr row
+	}
+	puts -nonewline $chan [Separator topcapsep $name $matrix state]
+    }
+
+    set n [expr {[$matrix rows] - $bcaption}]
+
+    while {$row < $n} {
+	puts -nonewline $chan \
+		[FormatData data $name state [$matrix get row $row] [$matrix rowheight $row]]
+	incr row
+	if {$row < $n} {
+	    puts -nonewline $chan [Separator datasep $name $matrix state]
+	}
+    }
+
+    if {$bcaption > 0} {
+	puts -nonewline $chan [Separator botcapsep $name $matrix state]
+	set n $bcaption
+	while {$n > 0} {
+	    puts -nonewline $chan \
+		    [FormatData botdata $name state [$matrix get row $row] [$matrix rowheight $row]]
+	    if {$n > 1} {
+		puts -nonewline $chan [Separator botdatasep $name $matrix state]
+	    }
+	    incr n -1
+	    incr row
+	}
+    }
+
+    puts -nonewline $chan [Separator bottom $name $matrix state]
+    return
+}
+
+# ::report::_columns --
+#
+#	Retrieves the number of columns in the report.
+#
+# Arguments:
+#	name	Name of the report queried
+#
+# Results:
+#	A number
+
+proc ::report::_columns {name} {
+    upvar ::report::report${name}::columns columns
+    return $columns
+}
+
+# ::report::_destroy --
+#
+#	Destroy a report, including its associated command and data storage.
+#
+# Arguments:
+#	name	Name of the report to destroy.
+#
+# Results:
+#	None.
+
+proc ::report::_destroy {name} {
+    namespace delete ::report::report$name
+    interp alias {} ::$name {}
+    return
+}
+
+# ::report::CheckMatrix --
+#
+#	Internal helper for the "print" methods. Checks that the
+#	supplied matrix can be formatted by the specified report.
+#
+# Arguments:
+#	name	Name of the report to use for the formatting
+#	matrix	Name of the matrix to format.
+#
+# Results:
+#	None, or an error in case of problems.
+
+proc ::report::CheckMatrix {name matrix} {
+    upvar ::report::report${name}::columns  columns
+    upvar ::report::report${name}::tcaption tcaption
+    upvar ::report::report${name}::bcaption bcaption
+
+    if {$columns != [$matrix columns]} {
+	return -code error "report/matrix mismatch in number of columns"
+    }
+    if {($tcaption + $bcaption) > [$matrix rows]} {
+	return -code error "matrix too small, top and bottom captions overlap"
+    }
+}
+
+# ::report::ColumnSizes --
+#
+#	Internal helper for the "print" methods. Computes the final
+#	column sizes (with and without padding) and stores them in
+#	the print-state
+#
+# Arguments:
+#	name		Name of the report used for the formatting
+#	matrix		Name of the matrix to format.
+#	statevar	Name of the array variable holding the state
+#			of the formatter.
+#
+# Results:
+#	None.
+
+proc ::report::ColumnSizes {name matrix statevar} {
+    # Calculate the final column sizes with and without padding and
+    # store them in the local state.
+
+    upvar $statevar state
+
+    upvar ::report::report${name}::columns  columns
+    upvar ::report::report${name}::csize    csize
+    upvar ::report::report${name}::lpad     lpad
+    upvar ::report::report${name}::rpad     rpad
+
+    for {set c 0} {$c < $columns} {incr c} {
+	if {[string equal dyn $csize($c)]} {
+	    set size [$matrix columnwidth $c]
+	} else {
+	    set size $csize($c)
+	}
+
+	set state(s,$c) $size
+
+	incr size [TermWidth $lpad($c)]
+	incr size [TermWidth $rpad($c)]
+
+	set state(s/pad,$c) $size
+    }
+
+    return
+}
+
+# ::report::Separator --
+#
+#	Internal helper for the "print" methods. Computes the final
+#	shape of the various separators using the column sizes with
+#	padding found in the print state. Uses also the print state as
+#	a cache to avoid costly recomputation for the separators which
+#	are used multiple times.
+#
+# Arguments:
+#	tcode		Code of the separator to compute / template to use
+#	name		Name of the report used for the formatting
+#	matrix		Name of the matrix to format.
+#	statevar	Name of the array variable holding the state
+#			of the formatter.
+#
+# Results:
+#	The final separator string. Empty for disabled separators.
+
+proc ::report::Separator {tcode name matrix statevar} {
+    upvar ::report::report${name}::enabled  e
+    if {!$e($tcode)} {return ""}
+    upvar $statevar state
+    if {![info exists state($tcode)]} {
+	upvar ::report::report${name}::vTemplate vt
+	upvar ::report::report${name}::hTemplate ht
+	upvar ::report::report${name}::columns   cs
+	set str ""
+	for {set c 0} {$c < $cs} {incr c} {
+	    append str $vt($tcode,$c)
+	    set fill $ht($tcode,$c)
+	    set flen [TermWidth $fill]
+	    set rep  [expr {($state(s/pad,$c)/$flen)+1}]
+	    append str [string range [string repeat $fill $rep] 0 [expr {$state(s/pad,$c)-1}]]
+	}
+	append str $vt($tcode,$cs)
+	set state($tcode) $str
+    }
+    return [string trimright $state($tcode)]\n
+}
+
+# ::report::FormatData --
+#
+#	Internal helper for the "print" methods. Computes the output
+#	for one row in the matrix, given its values, the rowheight,
+#	padding and justification.
+#
+# Arguments:
+#	tcode		Code of the data template to use
+#	name		Name of the report used for the formatting
+#	statevar	Name of the array variable holding the state
+#			of the formatter.
+#	line		List containing the values to format
+#	rh		Height of the row (line) in lines.
+#
+# Results:
+#	The formatted string for the supplied row.
+
+proc ::report::FormatData {tcode name statevar line rh} {
+    upvar $statevar state
+    upvar ::report::report${name}::vTemplate vt
+    upvar ::report::report${name}::columns   cs
+    upvar ::report::report${name}::lpad      lpad
+    upvar ::report::report${name}::rpad      rpad
+    upvar ::report::report${name}::cjust     cjust
+
+    if {$rh == 1} {
+	set str ""
+	set c 0
+	foreach cell $line {
+	    # prefix, cell (pad-l, value, pad-r)
+	    append str $vt($tcode,$c)$lpad($c)[FormatCell $cell $state(s,$c) $cjust($c)]$rpad($c)
+	    incr c
+	}
+	append str $vt($tcode,$cs)
+	set    str [string trimright $str]
+	append str \n
+	
+	return $str
+    } else {
+	array set str {}
+	for {set l 1} {$l <= $rh} {incr l} {set str($l) ""}
+
+	# - Future - Vertical justification of cells less tall than rowheight
+	# - Future - Vertical cutoff after N lines, auto-repeat of captions
+	# - Future - => Higher level, not here, use virtual matrices for this
+	# - Future -  and count the generated lines
+
+	set c 0
+	foreach fcell $line {
+	    set fcell [split $fcell \n]
+	    for {set l 1; set lo 0} {$l <= $rh} {incr l; incr lo} {
+		append str($l) $vt($tcode,$c)$lpad($c)[FormatCell \
+			[lindex $fcell $lo] $state(s,$c) $cjust($c)]$rpad($c)
+	    }
+	    incr c
+	}
+	set strout ""
+	for {set l 1} {$l <= $rh} {incr l} {
+	    append strout $str($l)$vt($tcode,$cs)
+	    set    strout [string trimright $strout]
+	    append strout \n
+	}
+	return $strout
+    }
+}
+
+# ::report::FormatCell --
+#
+#	Internal helper for the "print" methods. Formats the value of
+#	a single cell according to column size and justification.
+#
+# Arguments:
+#	value	The value to format
+#	size	The size of the column, without padding
+#	just	The justification for the current cell/column
+#
+# Results:
+#	The formatted string for the supplied cell.
+
+proc ::report::FormatCell {value size just} {
+    set vlen [TermWidth $value]
+
+    if {$vlen == $size} {
+	# Value fits exactly, justification is irrelevant
+	return $value
+    }
+
+    # - Future - Other fill characters ...
+    # - Future - Different fill characters per class of value => regex/glob pattern|functions
+    # - Future - Wraparound - interacts with rowheight!
+
+    switch -exact -- $just {
+	left {
+	    if {$vlen < $size} {
+		return $value[string repeat " " [expr {$size - $vlen}]]
+	    }
+	    return [string range $value [expr {$vlen - $size}] end]
+	}
+	right {
+	    if {$vlen < $size} {
+		return [string repeat " " [expr {$size - $vlen}]]$value
+	    }
+	    incr size -1
+	    return [string range $value 0 $size]
+	}
+	center {
+	    if {$vlen < $size} {
+		set fill  [expr {$size - $vlen}]
+		set rfill [expr {$fill / 2}]
+		set lfill [expr {$fill - $rfill}]
+		return [string repeat " " $lfill]$value[string repeat " " $rfill]
+	    }
+
+	    set cut  [expr {$vlen - $size}]
+	    set lcut [expr {$cut / 2}]
+	    set rcut [expr {$cut - $lcut}]
+
+	    return [string range $value $lcut end-$rcut]
+	}
+	default {
+	    error "Can't happen, panic, run, shout"
+	}
+    }
+}
+
+proc ::report::TermWidth {string} {
+    # Look for ANSI color control sequences and remove them. Avoid
+    # counting their characters as such sequences as a whole represent
+    # a state change, and are logically of zero/no width.
+    regsub -all "\033\\\[\[0-9;\]*m" $string {} string
+    return [textutil::wcswidth $string]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rest/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rest/pkgIndex.tcl
new file mode 100644
index 00000000..de65faa6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rest/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded rest 1.5 [list source [file join $dir rest.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rest/rest.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rest/rest.tcl
new file mode 100644
index 00000000..ea6130d8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/rest/rest.tcl
@@ -0,0 +1,854 @@
+# rest.tcl --
+#
+# A framework for RESTful web services
+#
+# Copyright (c) 2009 Aaron Faupell
+
+package require Tcl 8.5
+package require http 2.7
+package require json
+package require tdom
+package require base64
+
+package provide rest 1.5
+
+namespace eval ::rest {
+    namespace export create_interface parameters parse_opts save \
+    describe substitute
+}
+
+# simple --
+#
+# perform a simple rest call
+#
+# ARGS:
+#       url        name of the array containing command definitions
+#       query      query string or list of key/value pairs to be passed to http::formatQuery
+#       config     (optional) dict containing configuration options for the call
+#       body       (optional) data for the body of the http request
+#
+# RETURNS:
+#       the data from the rest call
+#
+proc ::rest::simple {url query args} {
+    set headers [list]
+    set config [lindex $args 0]
+    if {[string index $config 0] == "-"} {
+        set opts [parse_opts {} {} {headers: cookie: auth: format: method:} [join $args]]
+        set config [lindex $opts 0]
+        set body [lindex $opts 1]
+    } else {
+        set body [lindex $args 1]
+    }
+
+    DetermineMethod config
+
+    if {[string first " " $query] > 0} {
+        # if query has a space assume it is a list of key value pairs, and do the formatting
+        set query [::http::formatQuery {*}$query]
+    } elseif {[string first ? $url] > 0 && $query == ""} {
+        # if the url contains a query string and query empty then split it to the correct vars
+        set query [join [lrange [split $url ?] 1 end] ?]
+        set url [lindex [split $url ?] 0]
+    }
+
+    if {[dict exists $config auth]} {
+        set auth [dict get $config auth]
+        if {[lindex $auth 0] == "basic"} {
+            lappend headers Authorization "Basic [base64::encode [lindex $auth 1]:[lindex $auth 2]]"
+	} elseif {[lindex $auth 0] == "bearer"} {
+            lappend headers Authorization "Bearer [lindex $auth 1]"
+	}
+    }
+    if {[dict exists $config content-type]} {
+        lappend headers Content-type [join [dict get $config content-type] \;]
+    }
+    if {[dict exists $config headers]} {
+        dict for {key val} [dict get $config headers] { lappend headers $key $val }
+    }
+    if {[dict exists $config cookie]} {
+        lappend headers Cookie [join [dict get $config cookie] \;]
+    }
+    if {[dict exists $config error-body]} {
+        set error_body [dict get $config error-body]
+    } else {
+        set error_body 0
+    }
+
+    set result [::rest::_call {} $headers $url $query $body $error_body]
+
+    # if a format was specified then convert the data, but dont do any auto formatting
+    if {[dict exists $config result]} {
+        set result [::rest::format_[dict get $config result] $result]
+    }
+
+    return $result
+}
+
+interp alias {} ::rest::delete {} ::rest::simple
+interp alias {} ::rest::get    {} ::rest::simple
+interp alias {} ::rest::head   {} ::rest::simple
+interp alias {} ::rest::patch  {} ::rest::simple
+interp alias {} ::rest::post   {} ::rest::simple
+interp alias {} ::rest::put    {} ::rest::simple
+
+proc ::rest::DetermineMethod {cv} {
+    upvar 1 $cv config
+    if {[dict exists $config method]} return
+
+    set loc [info frame -2]
+    if {![dict exists $loc cmd]} {
+	return -code error "Unable to determine rest::simple method in the current context ([dict get $loc type]). Please specify it explicitly."
+    }
+    set cmd [dict get $loc cmd]
+    if {[catch {
+	set cmd [lindex $cmd 0]
+    }]} {
+	# Not a proper list. String processing.
+	# Simple: Assume name without spaces.
+	# TODO: Quoted literal.
+	regexp {^([^ ]+).*$} $cmd -> cmd
+    }
+    set cmd [namespace tail $cmd]
+    if {$cmd eq "simple"} { set cmd get }
+    if {$cmd ni {get delete head post put patch}} {
+	return -code error "Unable to determine rest::simple method, found \"$cmd\". Please specify it explicitly."
+    }
+    #puts >>>|$cmd|
+    dict set config method $cmd
+    return
+}
+
+# create_interface --
+#
+# use an array which defines a rest API to construct a set of procs
+#
+# ARGS:
+#       name       name of the array containing command definitions
+#
+# EFFECTS:
+#       creates a new namespace and builds api procedures within it
+#
+# RETURNS:
+#       the name of the new namespace, which is the same as the input name
+#
+proc ::rest::create_interface {name} {
+    upvar $name in
+
+    # check if any defined calls have https urls and automatically load and register tls
+    #if {[catch {package present tls}]} {
+    #    foreach x [array names in] {
+    #        if {[dict exists $in($x) url] && [string match https://* [dict get $in($x) url]]} {
+    #            package require tls
+    #            ::http::register https 443 [list ::tls::socket]
+    #            break
+    #        }
+    #    }
+    #}
+
+    namespace eval ::$name {}
+    foreach call [array names in] {
+        set config $in($call)
+        set proc [list]
+
+        if {[dict exists $config copy]} {
+            set config [dict merge $in([dict get $config copy]) $config]
+        }
+        if {[dict exists $config unset]} {
+            set config [dict remove $config {*}[dict get $config unset]]
+        }
+        if {[dict exists $config content-type]} {
+            dict set config headers content-type [dict get $config content-type]
+        }
+
+        lappend proc "set config \{$config\}"
+        lappend proc "set headers \{\}"
+
+        # invocation option processing
+        _addopts [dict get $config url] config
+        if {[dict exists $config headers]} {
+            dict for {k val} [dict get $config headers] {
+                _addopts $val config
+            }
+        }
+        set opts [list]
+        lappend proc "set static \{[expr {[dict exists $config static_args] ? [dict get $config static_args] : {}}]\}"
+        lappend proc {variable static_args}
+        lappend proc {if {[info exists static_args]} { set static [dict merge $static $static_args] }}
+        lappend opts [expr {[dict exists $config req_args] ? [dict get $config req_args] : ""}]
+        lappend opts [expr {[dict exists $config opt_args] ? [dict get $config opt_args] : ""}]
+        lappend proc "set parsed \[::rest::parse_opts \$static $opts \$args]"
+        lappend proc {set query [lindex $parsed 0]}
+        lappend proc {set body [lindex $parsed 1]}
+        lappend proc {set url [::rest::substitute [dict get $config url] query]}
+        if {[dict exists $config body]} {
+            if {[string match req* [dict get $config body]]} {
+                lappend proc {if {$body == ""} { return -code error "wrong # args: should be \"[lindex [info level 0] 0] ?options? string\"" }}
+            } elseif {[string match no* [dict get $config body]]} {
+                lappend proc {if {$body != ""} { return -code error "extra arguments after options" }}
+            } elseif {[string match arg* [lindex [dict get $config body] 0]]} {
+                lappend proc {if {$body == ""} { return -code error "wrong # args: should be \"[lindex [info level 0] 0] ?options? string\"" }}
+                lappend proc "lappend query [lindex [dict get $config body] 1] \$body" {set body ""}
+            } elseif {[string match mime_multi* [lindex [dict get $config body] 0]]} {
+                lappend proc {if {$body == ""} { return -code error "wrong # args: should be \"[lindex [info level 0] 0] ?options? string\"" }}
+                lappend proc {set b [::rest::mime_multipart body $body]}
+                if {[regexp {/(.+)$} [lindex [dict get $config body] 0] dummy match]} {
+                    set content_type "multipart/$match"
+                } else {
+                    set content_type "multipart/related"
+                }
+                lappend proc "dict set config headers content-type \"$content_type; boundary=\$b\""
+	    }
+        }
+        if {[dict exists $config error-body]} {
+            set error_body [dict get $config error-body]
+        } else {
+            set error_body 0
+        }
+        lappend proc "set error_body $error_body"
+        # end option processing
+
+        if {[dict exists $config auth]} {
+            set auth [dict get $config auth]
+            if {$auth == "basic"} {
+                lappend proc "lappend headers Authorization \"Basic \[base64::encode \$\{::${name}::user\}:\$\{::${name}::password\}]\""
+                if {[info commands ::${name}::basic_auth] == ""} {
+                    proc ::${name}::basic_auth {u p} {
+                        variable user $u
+                        variable password $p
+                    }
+                }
+            }
+        }
+
+        if {[dict exists $config headers]} {
+            lappend proc {dict for {key val} [dict get $config headers] { lappend headers $key [::rest::substitute $val query] }}
+        }
+        if {[dict exists $config cookie]} {
+            lappend proc {lappend headers Cookie [join [dict get $config cookie] \;]}
+        }
+        _transform $name $call $config proc input_transform query
+        if {[dict exists $config auth] && [lindex [dict get $config auth] 0] == "sign"} {
+            lappend proc "set query \[::${name}::[lindex [dict get $config auth] 1] \$query]"
+        }
+
+        lappend proc {set query [::http::formatQuery {*}$query]}
+
+        # if this is an async call (has defined a callback)
+        # then end the main proc here by returning the http token
+        # the rest of the normal result processing will be put in a _callback_NAME
+        # proc which is called by the generic _callback proc
+        if {[dict exists $config callback]} {
+            lappend proc "set t \[::rest::_call \{[list ::${name}::_callback_$call [dict get $config callback]]\} \$headers \$url \$query \$body \$error_body]"
+            lappend proc {return $t}
+            proc ::${name}::$call args [join $proc \n]
+            set proc {}
+            lappend proc {upvar token token}
+        } else {
+            lappend proc {set result [::rest::_call {} $headers $url $query $body $error_body]}
+        }
+
+        # process results
+        _transform $name $call $config proc pre_transform result
+        if {[dict exists $config result]} {
+            lappend proc "set result \[::rest::format_[dict get $config result] \$result]"
+        } elseif {[dict exists $config format]} {
+            lappend proc "set result \[::rest::format_[dict get $config format] \$result]"
+        } else {
+            lappend proc "set result \[::rest::format_auto \$result]"
+        }
+        _transform $name $call $config proc post_transform result
+        if {[dict exists $config check_result]} {
+            lappend proc "::rest::_check_result \$result [dict get $config check_result]"
+        }
+        # end process results
+
+        # if this is an async call (has a defined callback)
+        # create the callback proc which contains only the result processing and
+        # a handoff to the user defined callback
+        # otherwise create the normal call proc
+        if {[dict exists $config callback]} {
+            lappend proc "[dict get $config callback] $call OK \$result"
+            proc ::${name}::_callback_$call {result} [join $proc \n]
+        } else {
+            lappend proc {return $result}
+            proc ::${name}::$call args [join $proc \n]
+        }
+    }
+
+    proc ::${name}::set_static_args {args} {
+        variable static_args
+        set static_args $args
+    }
+
+    set ::${name}::static_args {}
+
+    # print the contents of all the dynamic generated procs
+    if {0} {
+        foreach x [info commands ::${name}::*] {
+            puts "proc $x \{[info args $x]\} \{\n[info body $x]\n\}\n"
+        }
+    }
+    return $name
+}
+
+# mime_multipart --
+#
+# creates a mime mulipart message
+#
+# ARGS:
+#       var        name of variable in which the mime body is stored
+#       body       a list of key/value pairs which represent mime part
+#                  headers and bodies. the header is itself a list of
+#                  value pairs which define header fields
+#
+# EFFECTS:
+#       replaces $var with a mime body
+#
+# RETURNS:
+#       the mime boundary string
+#
+proc ::rest::mime_multipart {var body} {
+    upvar $var out
+    set out {}
+    set boundary _000-MIME_SEPERATOR
+    foreach {head data} $body {
+        append out \n--$boundary\n
+        foreach {k v} $head {
+            append out "$k: $v\n"
+        }
+        append out \n$data\n
+    }
+    append out \n--$boundary--\n
+    return $boundary
+}
+
+# _transform --
+#
+# called by create_interface to handle the creation of user defined procedures
+#
+# ARGS:
+#       ns         target namespace
+#       call       name of the proc that is being created
+#       config     dict of config options
+#       proc       name of variable holding the proc being created
+#       name       name of the transform
+#
+# EFFECTS:
+#       appends commands to the proc variable and possible creates a new proc
+#
+# RETURNS:
+#       nothing
+#
+proc ::rest::_transform {ns call config proc name var} {
+    upvar $proc p
+    if {[dict exists $config $name]} {
+        set t [dict get $config $name]
+        if {[llength [split $t]] == 1 && [info commands $t] != ""} {
+            lappend p "set $var \[$t \$$var]"
+        } else {
+            lappend p "set $var \[::${ns}::_${name}_$call \$$var]"
+            proc ::${ns}::_${name}_$call $var $t
+        }
+    }
+}
+
+# save --
+#
+# saves a copy of the dynamically created procs to a file for later loading
+#
+# ARGS:
+#       name       name of the array containing command definitions
+#       file       name of file in which to save the generated commands
+#
+# RETURNS:
+#       nothing
+#
+proc ::rest::save {name file} {
+    set fh [open $file w]
+    puts $fh {package require http
+package require json
+package require tdom
+package require base64
+}
+
+    if {![catch {package present tls}]} {
+        puts $fh {
+package require tls
+::http::register https 443 [list ::tls::socket]
+}
+    }
+
+    puts $fh "namespace eval ::$name \{\}\n"
+    foreach x {_call _callback parse_opts _addopts substitute _check_result \
+            format_auto format_raw format_xml format_json format_discard \
+            format_tdom} {
+        puts $fh "proc ::${name}::$x \{[info args $x]\} \{[info body $x]\n\}\n"
+    }
+    foreach x [info commands ::${name}::*] {
+        puts $fh "proc $x \{[info args $x]\} \{\n[info body $x]\n\}\n"
+    }
+    close $fh
+}
+
+# parameters --
+#
+# parse a url query string into a dict
+#
+# ARGS:
+#       url        a url with a query string seperated by a '?'
+#       args       optionally a dict key to return instead of the entire dict
+#
+# RETURNS:
+#       a dict containing the parsed query string
+#
+proc ::rest::parameters {url args} {
+    set dict [list]
+    foreach x [split [lindex [split $url ?] 1] &] {
+        set x [split $x =]
+        if {[llength $x] < 2} { lappend x "" }
+        lappend dict {*}$x
+    }
+    if {[llength $args] > 0} {
+        return [dict get $dict [lindex $args 0]]
+    }
+    return $dict
+}
+
+# _call --
+#
+# makes an http request
+# expected to be called only by a generated procedure because it depends on the
+# config dict
+#
+# ARGS:
+#       name       name of the array containing command definitions
+#       callback   empty string, or a list of 2 callback procs,
+#                  generated and user defined. if not empty the call will
+#                  be made async (-command argument to geturl)
+#       headers    a dict of keys/values for the http request header
+#       url        the url to request
+#       query
+#       body
+#
+# EFFECTS:
+#       creates a new namespace and builds api procedures within it
+#
+# RETURNS:
+#       the data from the http reply, or an http token if the request was async
+#
+proc ::rest::_call {callback headers url query body error_body} {
+    #puts "_call [list $callback $headers $url $query $body $error_body]"
+    # get the settings from the calling proc
+    upvar config config
+
+    set method GET
+    if {[dict exists $config method]} { set method [string toupper [dict get $config method]] }
+
+    # assume the query should really be the body for post or put requests
+    # with no other body. doesnt seem technically correct but works for
+    # everything I have encountered. there is no way for the call definition to
+    # specify the difference between url parameters and request body
+    if {[dict exists $config body] && [string match no* [dict get $config body]]} {
+        # never put the query in the body if the user said no body
+    } elseif {($method == "POST" || $method == "PUT") && $query != "" && $body == ""} {
+        set body $query
+        set query {}
+    }
+    if {$query != ""} { append url ?$query }
+
+    # configure options to the geturl command
+    set opts [list]
+    lappend opts -method $method
+    if {[dict exists $headers content-type]} {
+        lappend opts -type [dict get $headers content-type]
+        set headers [dict remove $headers content-type]
+    }
+    if {$body != ""} {
+        lappend opts -query $body
+    }
+    if {$callback != ""} {
+        lappend opts -command [list ::rest::_callback {*}$callback]
+    }
+
+    #puts "headers $headers"
+    #puts "opts $opts"
+    #puts "geturl $url"
+    #return
+    set t        [http::geturl $url -headers $headers {*}$opts]
+    set data     [http::data  $t]
+    set httpCode [http::ncode $t]
+
+    # if this is an async request return now, otherwise process the
+    # result
+    if {$callback != ""} { return $t }
+
+    # Generate an error return for a failed request
+    if {![string match 2* $httpCode]} {
+        #parray $t
+	set retList [list HTTP $httpCode]
+        if {[string match {30[123]} $httpCode]} {
+            upvar #0 $t a
+            lappend retList [dict get $a(meta) Location]
+        }
+        if {$error_body} {lappend retList $data}
+        return -code error $retList
+    }
+
+    # copy the token into the calling scope so that the transforms can
+    # access it via uplevel, and we can still call cleanup on the real
+    # token
+    upvar token token
+    array set token [array get $t]
+
+    #parray $t
+    #puts "data: $data"
+    http::cleanup $t
+    return $data
+}
+
+# _callback --
+#
+# callback procedure for async http requests
+#
+# ARGS:
+#       datacb     name of the dynamically generated callback proc created by
+#                  create_interface which contains post transforms and content
+#                  interpreting
+#       usercb     the name of the user supplied callback function.
+#                  if there is an error it is called directly from here,
+#                  otherwise the datacb calls it
+#       t          the http request token
+#
+# EFFECTS:
+#       evaluates http error conditions and calls the user defined callback
+#
+# RETURNS:
+#       nothing
+#
+proc ::rest::_callback {datacb usercb t} {
+    # copy the token into the local scope so that the datacb can access it
+    # via uplevel, and we can still call cleanup on the real token
+    array set token [array get $t]
+    if {![string match 2* [http::ncode $t]]} {
+        set data [list HTTP [http::ncode $t]]
+        if {[http::ncode $t] == "302"} {
+            lappend data [dict get $token(meta) Location]
+        }
+        http::cleanup $t
+        {*}$usercb ERROR $data
+        return
+    }
+    set data [http::data $t]
+    http::cleanup $t
+    {*}$datacb $data
+}
+
+# parse_opts --
+#
+# command option parsing
+#
+# ARGS:
+#       static       a dict of options and values that are always present
+#       required     a list of options that must be supplied
+#       optional     a list of options that may appear but are not required
+#                    the format is
+#                        name    - an option which is present or not, no default
+#                        name:   - an option which requires a value
+#                        name:value - an option with a default value
+#       options      the string of options supplied by the user at invocation
+#
+# EFFECTS:
+#       none
+#
+# RETURNS:
+#       a 2 item list. the first item is a dict containing the parsed
+#       options and their values. the second item is a string of any
+#       remaining data
+#       ex: [list [dict create opt1 value1 opt2 value2] {some extra text supplied to the command}]
+#
+proc ::rest::parse_opts {static required optional options} {
+    #puts "static $static\nrequired $required\noptional $optional\noptions $options"
+    set args $options
+    set query {}
+    foreach {k v} $static {
+        set k [string trimleft $k -]
+        lappend query $k $v
+    }
+
+    foreach opt $required {
+        if {[string index $opt end] == ":"} {
+            set opt [string range $opt 0 end-1]
+        }
+        if {[set i [lsearch -exact $args -$opt]] >= 0} {
+            if {[llength $args] <= $i+1} { return -code error "the -$opt argument requires a value" }
+            lappend query $opt [lindex $args [expr {$i+1}]]
+            set args [lreplace $args $i [expr {$i+1}]]
+        } elseif {[set i [lsearch -regexp $static ^-?$opt$]] >= 0} {
+            lappend query $opt [lindex $static [expr {$i+1}]]
+            set static [lreplace $static $i [expr {$i+1}]]
+        } else {
+            return -code error "the -$opt argument is required"
+        }
+    }
+
+    while {[llength $args] > 0} {
+        set opt [lindex $args 0]
+        if {![string match -* $opt]} break
+        if {$opt == "--"} {
+            set args [lreplace $args 0 0]
+            break
+        }
+        set opt [string range $opt 1 end]
+
+        if {[set i [lsearch $optional $opt:*]] > -1} {
+            lappend query $opt [lindex $args 1]
+            set args [lreplace $args 0 1]
+            set optional [lreplace $optional $i $i]
+        } elseif {[set i [lsearch -exact $optional $opt]] > -1} {
+            lappend query $opt ""
+            set args [lreplace $args 0 0]
+            set optional [lreplace $optional $i $i]
+        } else {
+            set opts {}
+            foreach x [concat $required $optional] { lappend opts -[string trimright $x :] }
+            if {[llength $opts] > 0} {
+                return -code error "bad option \"$opt\": Must be [join $opts ", "]"
+            }
+            return -code error "bad option \"$opt\""
+        }
+    }
+
+    foreach opt $optional {
+        if {[set i [lsearch -regexp $static ^-?$opt$]] >= 0} {
+            lappend query $opt [lindex $static [expr {$i+1}]]
+            set static [lreplace $static $i [expr {$i+1}]]
+        } elseif {[string match *:?* $opt]} {
+            set opt [split $opt :]
+            lappend query [lindex $opt 0] [join [lrange $opt 1 end]]
+        }
+    }
+    #puts "optional $optional\nquery $query"
+    return [list $query [join $args]]
+}
+
+# _addopts --
+#
+# add inline argument identifiers to the options list
+#
+# ARGS:
+#       str        a string which may contain %word% option identifiers
+#       c          name of the config variable
+#
+# EFFECTS:
+#       modifies the option variable to add any identifiers found
+#
+# RETURNS:
+#       nothing
+#
+proc ::rest::_addopts {str c} {
+    upvar $c config
+    foreach {junk x} [regexp -all -inline -nocase {%([a-z0-9_:-]+)%} $str] {
+        if {[string match *:* $x]} {
+            dict lappend config opt_args $x
+         } else {
+            dict lappend config req_args $x:
+         }
+    }
+}
+
+# substitute --
+#
+# take a string and substitute real values for any option identifiers
+#
+# ARGS:
+#       input      a string which may contain %word% option identifiers
+#       q          name of a variable containing a dict of options and values
+#
+# EFFECTS:
+#       removes any substituted options from the q variable
+#
+# RETURNS:
+#       the input string with option identifiers replaced by real values
+#
+proc ::rest::substitute {input q} {
+    upvar $q query
+    foreach {junk name} [regexp -all -inline -nocase {%([a-z0-9_:-]+)%} $input] {
+        set opt [lindex [split $name :] 0]
+        if {[dict exists $query $opt]} {
+            set replace [dict get $query $opt]
+            #set replace [string map {/ %2F} $replace]
+            #set replace [string range [http::formatQuery "" $replace] 1 end]
+            set query [dict remove $query $opt]
+        } else {
+            set replace {}
+        }
+        set input [string map [list %$name% $replace] $input]
+    }
+    return $input
+}
+
+# describe --
+#
+# print a description of defined api calls
+#
+# ARGS:
+#       name       name of an interface previously created with create_interface
+#
+# RETURNS:
+#       nothing
+#
+proc ::rest::describe {name} {
+    # replace [set], then run all the procs to get the value of the config var
+    rename ::set ::_set
+    proc ::set {var val} {
+        if {[lindex [info level 0] 1] != "config"} { continue }
+        upvar 2 config c
+        ::_set c([info level -1]) $val
+        return -code return
+    }
+    foreach call [lsort -dictionary [info commands ::${name}::*]] {
+        if {[string match *::_* $call]} { continue }
+        catch {$call}
+    }
+    rename ::set {}
+    rename ::_set ::set
+
+    foreach {name val} [array get config] {
+        puts -nonewline "$name"
+        if {([dict exists $val req_args] && [dict get $val req_args] != "") \
+            || ([dict exists $val opt_args] && [dict get $val opt_args] != "")} {
+            puts -nonewline "  <options>"
+        }
+        if {[dict exists $val body] && [dict get $val body] == "required"} {
+            puts -nonewline "  <body>"
+        }
+        puts ""
+        if {[dict exists $val description]} {
+            puts "[regsub -all {[\s\n]+} [dict get $val description] { }]"
+        }
+        if {[dict exists $val callback]} {
+            puts "Async callback: [dict get $val callback]"
+        }
+        puts "  Required arguments:"
+        if {[dict exists $val req_args]} {
+            foreach x [dict get $val req_args] {
+                puts "    -[format %-12s [string trimright $x :]]  <value>"
+            }
+        } else {
+            puts "     none"
+        }
+        puts "  Optional arguments:"
+        if {[dict exists $val opt_args]} {
+            foreach x [dict get $val opt_args] {
+                if {![string match *:* $x]} {
+                    puts "  $x"
+                } else {
+                    set x [split $x :]
+                    if {[lindex $x 1] == ""} {
+                        puts "    -[format %-12s [lindex $x 0]]  <value>"
+                    } else {
+                        puts "    -[format %-12s [lindex $x 0]]  <value>  default \"[lindex $x 1]\""
+                    }
+                }
+            }
+        } else {
+            puts "     none"
+        }
+        puts ""
+    }
+}
+
+# _check_result --
+#
+# checks http returned data against user supplied conditions
+#
+# ARGS:
+#       result     name of the array containing command definitions
+#       ok         an expression which if it returns false causes an error
+#       err        an expression which if it returns true causes an error
+#
+# EFFECTS:
+#       throws an error if the expression evaluations indicate an error
+#
+# RETURNS:
+#       nothing
+#
+proc ::rest::_check_result {result ok err} {
+    if {$err != "" && ![catch {expr $err} out] && [expr {$out}]} {
+        return -code error [list ERR $result "triggered error condition" $err $out]
+    }
+    if {$ok == "" || (![catch {expr $ok} out] && [expr {$out}])} {
+        return -code ok
+    }
+    return -code error [list ERR $result "ok expression failed or returned false" $ok $out]
+}
+
+# format_auto --
+#
+# the default data formatter. tries to detect the data type and dispatch
+# to a specific handler
+#
+# ARGS:
+#       data      data returned by an http call
+#
+# RETURNS:
+#       data, possibly transformed in a representation specific manner
+#
+proc ::rest::format_auto {data} {
+    if {[string match {<*} [string trimleft $data]]} {
+        return [format_xml $data]
+    }
+    if {[string match \{* $data] || [regexp {":\s*[\{\[]} $data]} {
+        return [format_json $data]
+    }
+    return $data
+}
+
+proc ::rest::format_raw {data} {
+    return $data
+}
+
+proc ::rest::format_discard {data} {
+    return -code ok
+}
+
+proc ::rest::format_json {data} {
+    #if {[regexp -nocase {^[a-z_.]+ *= *(.*)} $data -> json]} {
+    #    set data $json
+    #}
+    return [json::json2dict $data]
+}
+
+proc ::rest::format_xml {data} {
+    set d [[dom parse $data] documentElement]
+    set data [$d asList]
+    if {[lindex $data 0] == "rss"} {
+        set data [format_rss $data]
+    }
+    return $data
+}
+
+proc ::rest::format_rss {data} {
+    set data [lindex $data 2 0 2]
+    set out {}
+    set channel {}
+    foreach x $data {
+        if {[lindex $x 0] != "item"} {
+            lappend channel [lindex $x 0] \
+            [linsert [lindex $x 1] end content [lindex $x 2 0 1]]
+        } else {
+            set tmp {}
+            foreach item [lindex $x 2] {
+                lappend tmp [lindex $item 0] \
+                [linsert [lindex $item 1] end content [lindex $item 2 0 1]]
+            }
+            lappend out item $tmp
+        }
+    }
+    return [linsert $out 0 channel $channel]
+}
+
+proc ::rest::format_tdom {data} {
+    return [[dom parse $data] documentElement]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ripemd/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ripemd/pkgIndex.tcl
new file mode 100644
index 00000000..623edc69
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ripemd/pkgIndex.tcl
@@ -0,0 +1,11 @@
+# pkgIndex.tcl - 
+#
+# RIPEMD package index file
+#
+# This package has been tested with tcl 8.2.3 and above.
+#
+# $Id: pkgIndex.tcl,v 1.6 2009/05/07 01:12:59 patthoyts Exp $
+
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded ripemd128 1.0.5 [list source [file join $dir ripemd128.tcl]]
+package ifneeded ripemd160 1.0.5 [list source [file join $dir ripemd160.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ripemd/ripemd128.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ripemd/ripemd128.tcl
new file mode 100644
index 00000000..5fa72543
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ripemd/ripemd128.tcl
@@ -0,0 +1,731 @@
+# ripemd128.tcl - Copyright (C) 2003 Pat Thoyts <patthoyts@users.sf.net>
+#
+# This is a Tcl-only implementation of the RIPEMD-128 hash algorithm as 
+# described in [RIPE].
+# Included is an implementation of keyed message authentication using 
+# the RIPEMD-128 function [HMAC].
+#
+# See http://www.esat.kuleuven.ac.be/~cosicart/pdf/AB-9601/
+#
+# [RIPE] Dobbertin, H., Bosselaers A., and Preneel, B.
+#        "RIPEMD-160: A Strengthened Version of RIPEMD" 
+#        Fast Software Encryption, LNCS 1039, D. Gollmann, Ed., 
+#        Springer-Verlag, 1996, pp. 71-82
+# [HMAC] Krawczyk, H., Bellare, M., and R. Canetti, 
+#       "HMAC: Keyed-Hashing for Message Authentication",
+#        RFC 2104, February 1997.
+#
+# RFC 2286, ``Test cases for HMAC-RIPEMD160 and HMAC-RIPEMD128,''
+# Internet Request for Comments 2286, J. Kapp, 
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2;                # tcl minimum version
+
+namespace eval ::ripemd {
+    namespace eval ripemd128 {
+        variable  accel
+        array set accel {trf 0}
+
+        variable uid
+        if {![info exists uid]} {
+            set uid 0
+        }
+
+        namespace export ripemd128 hmac128 Hex \
+            RIPEMD128Init RIPEMD128Update RIPEMD128Final \
+            RIPEHMAC128Init RIPEHMAC128Update RIPEHMAC128Final
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# RIPEMD128Init - create and initialize an MD4 state variable. This will be
+# cleaned up when we call MD4Final
+#
+proc ::ripemd::ripemd128::RIPEMD128Init {} {
+    variable accel
+    variable uid
+    set token [namespace current]::[incr uid]
+    upvar #0 $token state
+
+    # Initialize RIPEMD-128 state structure (same as MD4).
+    array set state \
+        [list \
+             A [expr {0x67452301}] \
+             B [expr {0xefcdab89}] \
+             C [expr {0x98badcfe}] \
+             D [expr {0x10325476}] \
+             n 0 i "" ]
+    if {$accel(trf)} {
+        set s {}
+        switch -exact -- $::tcl_platform(platform) {
+            windows { set s [open NUL w] }
+            unix    { set s [open /dev/null w] }
+        }
+        if {$s != {}} {
+            fconfigure $s -translation binary -buffering none
+            ::ripemd128 -attach $s -mode write \
+                -read-type variable \
+                -read-destination [subst $token](trfread) \
+                -write-type variable \
+                -write-destination [subst $token](trfwrite)
+            array set state [list trfread 0 trfwrite 0 trf $s]
+        }
+    }
+    return $token
+}
+
+proc ::ripemd::ripemd128::RIPEMD128Update {token data} {
+    upvar #0 $token state
+
+    if {[info exists state(trf)]} {
+        puts -nonewline $state(trf) $data
+        return
+    }
+
+    # Update the state values
+    incr state(n) [string length $data]
+    append state(i) $data
+
+    # Calculate the hash for any complete blocks
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        RIPEMD128Hash $token [string range $state(i) $n [incr n 64]]
+    }
+
+    # Adjust the state for the blocks completed.
+    set state(i) [string range $state(i) $n end]
+    return
+}
+
+proc ::ripemd::ripemd128::RIPEMD128Final {token} {
+    upvar #0 $token state
+
+    if {[info exists state(trf)]} {
+        close $state(trf)
+        set r $state(trfwrite)
+        unset state
+        return $r
+    }
+
+    # RFC1320:3.1 - Padding
+    #
+    set len [string length $state(i)]
+    set pad [expr {56 - ($len % 64)}]
+    if {$len % 64 > 56} {
+        incr pad 64
+    }
+    if {$pad == 0} {
+        incr pad 64
+    }
+    append state(i) [binary format a$pad \x80]
+
+    # RFC1320:3.2 - Append length in bits as little-endian wide int.
+    append state(i) [binary format ii [expr {8 * $state(n)}] 0]
+
+    # Calculate the hash for the remaining block.
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        RIPEMD128Hash $token [string range $state(i) $n [incr n 64]]
+    }
+
+    # RFC1320:3.5 - Output
+    set r [bytes $state(A)][bytes $state(B)][bytes $state(C)][bytes $state(D)]
+    unset state
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# HMAC Hashed Message Authentication (RFC 2104)
+#
+# hmac = H(K xor opad, H(K xor ipad, text))
+#
+proc ::ripemd::ripemd128::RIPEHMAC128Init {K} {
+
+    # Key K is adjusted to be 64 bytes long. If K is larger, then use
+    # the RIPEMD-128 digest of K and pad this instead.
+    set len [string length $K]
+    if {$len > 64} {
+        set tok [RIPEMD128Init]
+        RIPEMD128Update $tok $K
+        set K [RIPEMD128Final $tok]
+        set len [string length $K]
+    }
+    set pad [expr {64 - $len}]
+    append K [string repeat \0 $pad]
+
+    # Cacluate the padding buffers.
+    set Ki {}
+    set Ko {}
+    binary scan $K i16 Ks
+    foreach k $Ks {
+        append Ki [binary format i [expr {$k ^ 0x36363636}]]
+        append Ko [binary format i [expr {$k ^ 0x5c5c5c5c}]]
+    }
+
+    set tok [RIPEMD128Init]
+    RIPEMD128Update $tok $Ki;                 # initialize with the inner pad
+    
+    # preserve the Ko value for the final stage.
+    # FRINK: nocheck
+    set [subst $tok](Ko) $Ko
+
+    return $tok
+}
+
+proc ::ripemd::ripemd128::RIPEHMAC128Update {token data} {
+    RIPEMD128Update $token $data
+    return
+}
+
+proc ::ripemd::ripemd128::RIPEHMAC128Final {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set tok [RIPEMD128Init];            # init the outer hashing function
+    RIPEMD128Update $tok $state(Ko);    # prepare with the outer pad.
+    RIPEMD128Update $tok [RIPEMD128Final $token];  # hash the inner result
+    return [RIPEMD128Final $tok]
+}
+
+# -------------------------------------------------------------------------
+
+set ::ripemd::ripemd128::RIPEMD128Hash_body {
+    variable $token
+    upvar 0 $token state
+
+    # RFC1320:3.4 - Process Message in 16-Word Blocks
+    binary scan $msg i* blocks
+    foreach {X0 X1 X2 X3 X4 X5 X6 X7 X8 X9 X10 X11 X12 X13 X14 X15} $blocks {
+        set A $state(A)   ;  set AA $state(A)
+        set B $state(B)   ;  set BB $state(B)
+        set C $state(C)   ;  set CC $state(C)
+        set D $state(D)   ;  set DD $state(D)
+
+        # Round 1 (track 1). 
+        #    F(x,y,z) = x ^ y ^ z
+        # Let [abcd x s] denote the operation
+        #    a = (a + F(b,c,d) + X[x]) <<< s.
+        # Do the following 16 operations.
+        # [ABCD  0  11]  [DABC  1  14]  [CDAB  2 15]  [BCDA  3 12]
+        set A [expr {($A + [F $B $C $D] + $X0)  <<< 11}]
+        set D [expr {($D + [F $A $B $C] + $X1)  <<< 14}]
+        set C [expr {($C + [F $D $A $B] + $X2)  <<< 15}]
+        set B [expr {($B + [F $C $D $A] + $X3)  <<< 12}]
+        # [ABCD  4  5]  [DABC  5  8]  [CDAB  6 7]  [BCDA  7 9]
+        set A [expr {($A + [F $B $C $D] + $X4)  <<< 5}]
+        set D [expr {($D + [F $A $B $C] + $X5)  <<< 8}]
+        set C [expr {($C + [F $D $A $B] + $X6)  <<< 7}]
+        set B [expr {($B + [F $C $D $A] + $X7)  <<< 9}]
+        # [ABCD  8  11]  [DABC  9  13]  [CDAB 10 14]  [BCDA 11 15]
+        set A [expr {($A + [F $B $C $D] + $X8)  <<< 11}]
+        set D [expr {($D + [F $A $B $C] + $X9)  <<< 13}]
+        set C [expr {($C + [F $D $A $B] + $X10) <<< 14}]
+        set B [expr {($B + [F $C $D $A] + $X11) <<< 15}]
+        # [ABCD 12  6]  [DABC 13  7]  [CDAB 14 9]  [BCDA 15 8]
+        set A [expr {($A + [F $B $C $D] + $X12) <<< 6}]
+        set D [expr {($D + [F $A $B $C] + $X13) <<< 7}]
+        set C [expr {($C + [F $D $A $B] + $X14) <<< 9}]
+        set B [expr {($B + [F $C $D $A] + $X15) <<< 8}]
+
+        # Round 2 (track 1).
+        #   G(x, y, z) = (x & y) | (~x & z)
+        # Let [abcd k s] denote the operation
+        #   a = (a + G(b,c,d) + X[k] + 5A827999) <<< s
+        # Do the following 16 operations.
+        # [ABCD  7  7]  [DABC  4  6]  [CDAB  13  8]  [BCDA 1 13]
+        set A [expr {($A + [G $B $C $D] + $X7  + 0x5a827999) <<< 7}]
+        set D [expr {($D + [G $A $B $C] + $X4  + 0x5a827999) <<< 6}]
+        set C [expr {($C + [G $D $A $B] + $X13 + 0x5a827999) <<< 8}]
+        set B [expr {($B + [G $C $D $A] + $X1  + 0x5a827999) <<< 13}]
+        # [ABCD  10  11]  [DABC  6  9]  [CDAB  15  7]  [BCDA 3 15]
+        set A [expr {($A + [G $B $C $D] + $X10 + 0x5a827999) <<< 11}]
+        set D [expr {($D + [G $A $B $C] + $X6  + 0x5a827999) <<< 9}]
+        set C [expr {($C + [G $D $A $B] + $X15 + 0x5a827999) <<< 7}]
+        set B [expr {($B + [G $C $D $A] + $X3  + 0x5a827999) <<< 15}]
+        # [ABCD 12  7]  [DABC  0  12]  [CDAB 9  15]  [BCDA 5 9]
+        set A [expr {($A + [G $B $C $D] + $X12 + 0x5a827999) <<< 7}]
+        set D [expr {($D + [G $A $B $C] + $X0  + 0x5a827999) <<< 12}]
+        set C [expr {($C + [G $D $A $B] + $X9  + 0x5a827999) <<< 15}]
+        set B [expr {($B + [G $C $D $A] + $X5  + 0x5a827999) <<< 9}]
+        # [ABCD  2  11]  [DABC  14  7]  [CDAB 11  13]  [BCDA 8 12]
+        set A [expr {($A + [G $B $C $D] + $X2  + 0x5a827999) <<< 11}]
+        set D [expr {($D + [G $A $B $C] + $X14 + 0x5a827999) <<< 7}]
+        set C [expr {($C + [G $D $A $B] + $X11 + 0x5a827999) <<< 13}]
+        set B [expr {($B + [G $C $D $A] + $X8  + 0x5a827999) <<< 12}]
+        
+        # Round 3 (track 1).
+        #   H(x,y,z) = (x | ~y) ^ z
+        # Let [abcd k s] denote the operation
+        #   a = (a + H(b,c,d) + X[k] + 6ED9EBA1) <<< s.
+        # Do the following 16 operations.
+        # [ABCD  3  11]  [DABC  10  13]  [CDAB  14 6]  [BCDA 4 7]
+        set A [expr {($A + [H $B $C $D] + $X3  + 0x6ed9eba1) <<< 11}]
+        set D [expr {($D + [H $A $B $C] + $X10 + 0x6ed9eba1) <<< 13}]
+        set C [expr {($C + [H $D $A $B] + $X14 + 0x6ed9eba1) <<< 6}]
+        set B [expr {($B + [H $C $D $A] + $X4  + 0x6ed9eba1) <<< 7}]
+        # [ABCD  9  14]  [DABC 15  9]  [CDAB  8 13]  [BCDA 1 15]
+        set A [expr {($A + [H $B $C $D] + $X9  + 0x6ed9eba1) <<< 14}]
+        set D [expr {($D + [H $A $B $C] + $X15 + 0x6ed9eba1) <<< 9}]
+        set C [expr {($C + [H $D $A $B] + $X8  + 0x6ed9eba1) <<< 13}]
+        set B [expr {($B + [H $C $D $A] + $X1  + 0x6ed9eba1) <<< 15}]
+        # [ABCD  2  14]  [DABC  7  8]  [CDAB  0 13]  [BCDA 6 6]
+        set A [expr {($A + [H $B $C $D] + $X2  + 0x6ed9eba1) <<< 14}]
+        set D [expr {($D + [H $A $B $C] + $X7  + 0x6ed9eba1) <<< 8}]
+        set C [expr {($C + [H $D $A $B] + $X0  + 0x6ed9eba1) <<< 13}]
+        set B [expr {($B + [H $C $D $A] + $X6  + 0x6ed9eba1) <<< 6}]
+        # [ABCD  13  5]  [DABC 11  12]  [CDAB  5 7]  [BCDA 12  5]
+        set A [expr {($A + [H $B $C $D] + $X13 + 0x6ed9eba1) <<< 5}]
+        set D [expr {($D + [H $A $B $C] + $X11 + 0x6ed9eba1) <<< 12}]
+        set C [expr {($C + [H $D $A $B] + $X5  + 0x6ed9eba1) <<< 7}]
+        set B [expr {($B + [H $C $D $A] + $X12 + 0x6ed9eba1) <<< 5}]
+
+        # Round 4 (track 1).
+        #   I(x,y,z) = (x & z) | (y & ^ ~z)
+        # Let [abcd k s] denote the operation
+        #   a = (a + I(b,c,d) + X[k] + 8F1BBCDC) <<< s.
+        # Do the following 16 operations.
+        # [ABCD  1  11]  [DABC  9  12]  [CDAB  11 14]  [BCDA 10 15]
+        set A [expr {($A + [I $B $C $D] + $X1  + 0x8f1bbcdc) <<< 11}]
+        set D [expr {($D + [I $A $B $C] + $X9  + 0x8f1bbcdc) <<< 12}]
+        set C [expr {($C + [I $D $A $B] + $X11 + 0x8f1bbcdc) <<< 14}]
+        set B [expr {($B + [I $C $D $A] + $X10 + 0x8f1bbcdc) <<< 15}]
+        # [ABCD  0  14]  [DABC 8  15]  [CDAB 12 9]  [BCDA 4 8]
+        set A [expr {($A + [I $B $C $D] + $X0  + 0x8f1bbcdc) <<< 14}]
+        set D [expr {($D + [I $A $B $C] + $X8  + 0x8f1bbcdc) <<< 15}]
+        set C [expr {($C + [I $D $A $B] + $X12 + 0x8f1bbcdc) <<< 9}]
+        set B [expr {($B + [I $C $D $A] + $X4  + 0x8f1bbcdc) <<< 8}]
+        # [ABCD  13  9]  [DABC  3  14]  [CDAB  7 5]  [BCDA 15 6]
+        set A [expr {($A + [I $B $C $D] + $X13 + 0x8f1bbcdc) <<< 9}]
+        set D [expr {($D + [I $A $B $C] + $X3  + 0x8f1bbcdc) <<< 14}]
+        set C [expr {($C + [I $D $A $B] + $X7  + 0x8f1bbcdc) <<< 5}]
+        set B [expr {($B + [I $C $D $A] + $X15 + 0x8f1bbcdc) <<< 6}]
+        # [ABCD  14  8]  [DABC 5  6]  [CDAB  6 5]  [BCDA 2 12]
+        set A [expr {($A + [I $B $C $D] + $X14 + 0x8f1bbcdc) <<< 8}]
+        set D [expr {($D + [I $A $B $C] + $X5  + 0x8f1bbcdc) <<< 6}]
+        set C [expr {($C + [I $D $A $B] + $X6  + 0x8f1bbcdc) <<< 5}]
+        set B [expr {($B + [I $C $D $A] + $X2  + 0x8f1bbcdc) <<< 12}]
+
+
+        # Round 1 (track 2).
+        #   I(x,y,z) = (x & z) | (y & ^ ~z)
+        # Let [abcd k s] denote the operation
+        #   a = (a + I(b,c,d) + X[k] + 50A28BE6) <<< s.
+        # Do the following 16 operations.
+        # [ABCD  5  8]  [DABC  14  9]  [CDAB  7 9]  [BCDA 0 11]
+        set AA [expr {($AA + [I $BB $CC $DD] + $X5  + 0x50a28be6) <<< 8}]
+        set DD [expr {($DD + [I $AA $BB $CC] + $X14 + 0x50a28be6) <<< 9}]
+        set CC [expr {($CC + [I $DD $AA $BB] + $X7  + 0x50a28be6) <<< 9}]
+        set BB [expr {($BB + [I $CC $DD $AA] + $X0  + 0x50a28be6) <<< 11}]
+        # [ABCD  9  13]  [DABC 2  15]  [CDAB 11 15]  [BCDA 4 5]
+        set AA [expr {($AA + [I $BB $CC $DD] + $X9  + 0x50a28be6) <<< 13}]
+        set DD [expr {($DD + [I $AA $BB $CC] + $X2  + 0x50a28be6) <<< 15}]
+        set CC [expr {($CC + [I $DD $AA $BB] + $X11 + 0x50a28be6) <<< 15}]
+        set BB [expr {($BB + [I $CC $DD $AA] + $X4  + 0x50a28be6) <<< 5}]
+        # [ABCD  13  7]  [DABC  6  7]  [CDAB  15 8]  [BCDA 8 11]
+        set AA [expr {($AA + [I $BB $CC $DD] + $X13 + 0x50a28be6) <<< 7}]
+        set DD [expr {($DD + [I $AA $BB $CC] + $X6  + 0x50a28be6) <<< 7}]
+        set CC [expr {($CC + [I $DD $AA $BB] + $X15 + 0x50a28be6) <<< 8}]
+        set BB [expr {($BB + [I $CC $DD $AA] + $X8  + 0x50a28be6) <<< 11}]
+        # [ABCD  1  14]  [DABC 10  14]  [CDAB  3 12]  [BCDA 12 6]
+        set AA [expr {($AA + [I $BB $CC $DD] + $X1  + 0x50a28be6) <<< 14}]
+        set DD [expr {($DD + [I $AA $BB $CC] + $X10 + 0x50a28be6) <<< 14}]
+        set CC [expr {($CC + [I $DD $AA $BB] + $X3  + 0x50a28be6) <<< 12}]
+        set BB [expr {($BB + [I $CC $DD $AA] + $X12 + 0x50a28be6) <<< 6}]
+
+        # Round 2 (track 2).
+        #   H(x,y,z) = (x | ~y) ^ z
+        # Let [abcd k s] denote the operation
+        #   a = (a + H(b,c,d) + X[k] + 5C4DD124) <<< s.
+        # Do the following 16 operations.
+        # [ABCD  6  9]  [DABC  11  13]  [CDAB  3 15]  [BCDA 7 7]
+        set AA [expr {($AA + [H $BB $CC $DD] + $X6  + 0x5c4dd124) <<< 9}]
+        set DD [expr {($DD + [H $AA $BB $CC] + $X11 + 0x5c4dd124) <<< 13}]
+        set CC [expr {($CC + [H $DD $AA $BB] + $X3  + 0x5c4dd124) <<< 15}]
+        set BB [expr {($BB + [H $CC $DD $AA] + $X7  + 0x5c4dd124) <<< 7}]
+        # [ABCD  0  12]  [DABC 13  8]  [CDAB 5 9]  [BCDA 10 11]
+        set AA [expr {($AA + [H $BB $CC $DD] + $X0  + 0x5c4dd124) <<< 12}]
+        set DD [expr {($DD + [H $AA $BB $CC] + $X13 + 0x5c4dd124) <<< 8}]
+        set CC [expr {($CC + [H $DD $AA $BB] + $X5  + 0x5c4dd124) <<< 9}]
+        set BB [expr {($BB + [H $CC $DD $AA] + $X10 + 0x5c4dd124) <<< 11}]
+        # [ABCD  14  7]  [DABC  15  7]  [CDAB  8 12]  [BCDA 12 7]
+        set AA [expr {($AA + [H $BB $CC $DD] + $X14 + 0x5c4dd124) <<< 7}]
+        set DD [expr {($DD + [H $AA $BB $CC] + $X15 + 0x5c4dd124) <<< 7}]
+        set CC [expr {($CC + [H $DD $AA $BB] + $X8  + 0x5c4dd124) <<< 12}]
+        set BB [expr {($BB + [H $CC $DD $AA] + $X12 + 0x5c4dd124) <<< 7}]
+        # [ABCD  4  6]  [DABC 9  15]  [CDAB  1 13]  [BCDA 2 11]
+        set AA [expr {($AA + [H $BB $CC $DD] + $X4  + 0x5c4dd124) <<< 6}]
+        set DD [expr {($DD + [H $AA $BB $CC] + $X9  + 0x5c4dd124) <<< 15}]
+        set CC [expr {($CC + [H $DD $AA $BB] + $X1  + 0x5c4dd124) <<< 13}]
+        set BB [expr {($BB + [H $CC $DD $AA] + $X2  + 0x5c4dd124) <<< 11}]
+
+        # Round 3 (track 2).
+        #   G(x, y, z) = (x & y) | (~x & z)
+        # Let [abcd k s] denote the operation
+        #   a = (a + G(b,c,d) + X[k] + 6D703EF3) <<< s.
+        # Do the following 16 operations.
+        # [ABCD  15  9]  [DABC  5 7]  [CDAB  1 15]  [BCDA 3 11]
+        set AA [expr {($AA + [G $BB $CC $DD] + $X15 + 0x6d703ef3) <<< 9}]
+        set DD [expr {($DD + [G $AA $BB $CC] + $X5  + 0x6d703ef3) <<< 7}]
+        set CC [expr {($CC + [G $DD $AA $BB] + $X1  + 0x6d703ef3) <<< 15}]
+        set BB [expr {($BB + [G $CC $DD $AA] + $X3  + 0x6d703ef3) <<< 11}]
+        # [ABCD  7  8]  [DABC 14  6]  [CDAB 6 6]  [BCDA 9 14]
+        set AA [expr {($AA + [G $BB $CC $DD] + $X7  + 0x6d703ef3) <<< 8}]
+        set DD [expr {($DD + [G $AA $BB $CC] + $X14 + 0x6d703ef3) <<< 6}]
+        set CC [expr {($CC + [G $DD $AA $BB] + $X6  + 0x6d703ef3) <<< 6}]
+        set BB [expr {($BB + [G $CC $DD $AA] + $X9  + 0x6d703ef3) <<< 14}]
+        # [ABCD  11  12]  [DABC  8  13]  [CDAB  12 5]  [BCDA 2 14]
+        set AA [expr {($AA + [G $BB $CC $DD] + $X11 + 0x6d703ef3) <<< 12}]
+        set DD [expr {($DD + [G $AA $BB $CC] + $X8  + 0x6d703ef3) <<< 13}]
+        set CC [expr {($CC + [G $DD $AA $BB] + $X12 + 0x6d703ef3) <<< 5}]
+        set BB [expr {($BB + [G $CC $DD $AA] + $X2  + 0x6d703ef3) <<< 14}]
+        # [ABCD  10  13]  [DABC 0  13]  [CDAB  4 7]  [BCDA 13 5]
+        set AA [expr {($AA + [G $BB $CC $DD] + $X10 + 0x6d703ef3) <<< 13}]
+        set DD [expr {($DD + [G $AA $BB $CC] + $X0  + 0x6d703ef3) <<< 13}]
+        set CC [expr {($CC + [G $DD $AA $BB] + $X4  + 0x6d703ef3) <<< 7}]
+        set BB [expr {($BB + [G $CC $DD $AA] + $X13 + 0x6d703ef3) <<< 5}]
+
+        # Round 4 (track 2).
+        #   F(x,y,z) = x ^ y ^ z
+        # Let [abcd k s] denote the operation
+        #   a = (a + F(b,c,d) + X[k]) <<< s.
+        # Do the following 16 operations.
+        # [ABCD  8  15]  [DABC  6 5]  [CDAB  4 8]  [BCDA 1 11]
+        set AA [expr {($AA + [F $BB $CC $DD] + $X8)  <<< 15}]
+        set DD [expr {($DD + [F $AA $BB $CC] + $X6)  <<< 5}]
+        set CC [expr {($CC + [F $DD $AA $BB] + $X4)  <<< 8}]
+        set BB [expr {($BB + [F $CC $DD $AA] + $X1)  <<< 11}]
+        # [ABCD  3  14]  [DABC 11 14]  [CDAB 15 6]  [BCDA 0 14]
+        set AA [expr {($AA + [F $BB $CC $DD] + $X3)  <<< 14}]
+        set DD [expr {($DD + [F $AA $BB $CC] + $X11) <<< 14}]
+        set CC [expr {($CC + [F $DD $AA $BB] + $X15) <<< 6}]
+        set BB [expr {($BB + [F $CC $DD $AA] + $X0)  <<< 14}]
+        # [ABCD  5  6]  [DABC  12 9]  [CDAB  2 12]  [BCDA 13 9]
+        set AA [expr {($AA + [F $BB $CC $DD] + $X5)  <<< 6}]
+        set DD [expr {($DD + [F $AA $BB $CC] + $X12) <<< 9}]
+        set CC [expr {($CC + [F $DD $AA $BB] + $X2)  <<< 12}]
+        set BB [expr {($BB + [F $CC $DD $AA] + $X13) <<< 9}]
+        # [ABCD  9  12]  [DABC 7  5]  [CDAB  10 15]  [BCDA 14 8]
+        set AA [expr {($AA + [F $BB $CC $DD] + $X9)  <<< 12}]
+        set DD [expr {($DD + [F $AA $BB $CC] + $X7)  <<< 5}]
+        set CC [expr {($CC + [F $DD $AA $BB] + $X10) <<< 15}]
+        set BB [expr {($BB + [F $CC $DD $AA] + $X14) <<< 8}]
+
+        # Then perform the following additions to combine the results.
+        set DD       [expr {$state(B) + $C + $DD}]
+        set state(B) [expr {$state(C) + $D + $AA}]
+        set state(C) [expr {$state(D) + $A + $BB}]
+        set state(D) [expr {$state(A) + $B + $CC}]
+        set state(A) $DD
+    }
+
+    return
+}
+
+proc ::ripemd::ripemd128::byte {n v} {expr {((0xFF << (8 * $n)) & $v) >> (8 * $n)}}
+proc ::ripemd::ripemd128::bytes {v} { 
+    #format %c%c%c%c [byte 0 $v] [byte 1 $v] [byte 2 $v] [byte 3 $v]
+    format %c%c%c%c \
+        [expr {0xFF & $v}] \
+        [expr {(0xFF00 & $v) >> 8}] \
+        [expr {(0xFF0000 & $v) >> 16}] \
+        [expr {((0xFF000000 & $v) >> 24) & 0xFF}]
+}
+
+# 32bit rotate-left
+proc ::ripemd::ripemd128::<<< {v n} {
+    return [expr {((($v << $n) \
+                        | (($v >> (32 - $n)) \
+                               & (0x7FFFFFFF >> (31 - $n))))) \
+                      & 0xFFFFFFFF}]
+}
+
+# Convert our <<< pseudo-operator into a procedure call.
+regsub -all -line \
+    {\[expr {(.*) <<< (\d+)}\]} \
+    $::ripemd::ripemd128::RIPEMD128Hash_body \
+    {[<<< [expr {\1}] \2]} \
+    ::ripemd::ripemd128::RIPEMD128Hash_body
+
+#  F(x,y,z) = x ^ y ^ z
+proc ::ripemd::ripemd128::F {X Y Z} {
+    return [expr {$X ^ $Y ^ $Z}]
+}
+# Inline the F function F
+regsub -all -line \
+    {\[F (\$[ABCD]{1,2}) (\$[ABCD]{1,2}) (\$[ABCD]{1,2})\]} \
+    $::ripemd::ripemd128::RIPEMD128Hash_body \
+    {(\1 ^ \2 ^ \3)} \
+    ::ripemd::ripemd128::RIPEMD128Hash_body
+    
+# G(x,y,z) = (x & y) | (~x & z)
+proc ::ripemd::ripemd128::G {X Y Z} {
+    return [expr {($X & $Y) | (~$X & $Z)}]
+}
+# Inline the G function
+regsub -all -line \
+    {\[G (\$[ABCD]{1,2}) (\$[ABCD]{1,2}) (\$[ABCD]{1,2})\]} \
+    $::ripemd::ripemd128::RIPEMD128Hash_body \
+    {((\1 \& \2) | (~\1 \& \3))} \
+    ::ripemd::ripemd128::RIPEMD128Hash_body
+
+# H(x,y,z) = (x | ~y) ^ z
+proc ::ripemd::ripemd128::H {X Y Z} {
+    return [expr {($X | ~$Y) ^ $Z}]
+}
+# Inline the H function
+regsub -all -line \
+    {\[H (\$[ABCD]{1,2}) (\$[ABCD]{1,2}) (\$[ABCD]{1,2})\]} \
+    $::ripemd::ripemd128::RIPEMD128Hash_body \
+    {( (\1 | ~\2) ^ \3)} \
+    ::ripemd::ripemd128::RIPEMD128Hash_body
+
+# I(x,y,z) = (x & z) | (y & ~z)
+proc ::ripemd::ripemd128::I {X Y Z} {
+    return [expr {($X & $Z) | ($Y & ~$Z)}]
+}
+# Inline the I function
+regsub -all -line \
+    {\[I (\$[ABCD]{1,2}) (\$[ABCD]{1,2}) (\$[ABCD]{1,2})\]} \
+    $::ripemd::ripemd128::RIPEMD128Hash_body \
+    {( (\1 \& \3) | (\2 \& ~\3) )} \
+    ::ripemd::ripemd128::RIPEMD128Hash_body
+
+# Define the MD4 hashing procedure with inline functions.
+proc ::ripemd::ripemd128::RIPEMD128Hash {token msg} \
+    $::ripemd::ripemd128::RIPEMD128Hash_body
+
+unset ::ripemd::ripemd128::RIPEMD128Hash_body
+
+# -------------------------------------------------------------------------
+
+proc ::ripemd::ripemd128::Hex {data} {
+    binary scan $data H* result
+    return $result
+}
+
+# -------------------------------------------------------------------------
+
+# LoadAccelerator --
+#
+#	This package can make use of a number of compiled extensions to
+#	accelerate the digest computation. This procedure manages the
+#	use of these extensions within the package. During normal usage
+#	this should not be called, but the test package manipulates the
+#	list of enabled accelerators.
+#
+proc ::ripemd::ripemd128::LoadAccelerator {name} {
+    variable accel
+    set r 0
+    switch -exact -- $name {
+        #critcl {
+        #    if {![catch {package require tcllibc}]
+        #        || ![catch {package require sha1c}]} {
+        #        set r [expr {[info commands ::sha1::sha1c] != {}}]
+        #    }
+        #}
+        #cryptkit {
+        #    if {![catch {package require cryptkit}]} {
+        #        set r [expr {![catch {cryptkit::cryptInit}]}]
+        #    }
+        #}
+        trf {
+            if {![catch {package require Trf}]} {
+                set r [expr {![catch {::ripemd128 aa} msg]}]
+            }
+        }
+        default {
+            return -code error "invalid accelerator package:\
+                must be one of [join [array names accel] {, }]"
+        }
+    }
+    set accel($name) $r
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::ripemd::ripemd128::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# fileevent handler for chunked file hashing.
+#
+proc ::ripemd::ripemd128::Chunk {token channel {chunksize 4096}} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+    
+    if {[eof $channel]} {
+        fileevent $channel readable {}
+        set state(reading) 0
+    }
+        
+    RIPEMD128Update $token [read $channel $chunksize]
+}
+
+# -------------------------------------------------------------------------
+
+proc ::ripemd::ripemd128::ripemd128 {args} {
+    array set opts {-hex 0 -filename {} -channel {} -chunksize 4096}
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -hex       { set opts(-hex) 1 }
+            -file*     { set opts(-filename) [Pop args 1] }
+            -channel   { set opts(-channel) [Pop args 1] }
+            -chunksize { set opts(-chunksize) [Pop args 1] }
+            default {
+                if {[llength $args] == 1} { break }
+                if {[string compare $option "--"] == 0} { Pop args; break }
+                set err [join [lsort [array names opts]] ", "]
+                return -code error "bad option $option:\
+                    must be one of $err"
+            }
+        }
+        Pop args
+    }
+    
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"ripemd128 ?-hex? -filename file | string\""
+        }
+        set tok [RIPEMD128Init]
+        RIPEMD128Update $tok [lindex $args 0]
+        set r [RIPEMD128Final $tok]
+
+    } else {
+
+        set tok [RIPEMD128Init]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        vwait [subst $tok](reading)
+        set r [RIPEMD128Final $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+proc ::ripemd::ripemd128::hmac128 {args} {
+    array set opts {-hex 0 -filename {} -channel {} -chunksize 4096}
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -key       { set opts(-key) [Pop args 1] }
+            -hex       { set opts(-hex) 1 }
+            -file*     { set opts(-filename) [Pop args 1] }
+            -channel   { set opts(-channel) [Pop args 1] }
+            -chunksize { set opts(-chunksize) [Pop args 1] }
+            default {
+                if {[llength $args] == 1} { break }
+                if {[string compare $option "--"] == 0} { Pop args; break }
+                set err [join [lsort [array names opts]] ", "]
+                return -code error "bad option $option:\
+                    must be one of $err"
+            }
+        }
+        Pop args
+    }
+
+    if {![info exists opts(-key)]} {
+        return -code error "wrong # args:\
+            should be \"hmac128 ?-hex? -key key -filename file | string\""
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"hmac128 ?-hex? -key key -filename file | string\""
+        }
+        set tok [RIPEHMAC128Init $opts(-key)]
+        RIPEHMAC128Update $tok [lindex $args 0]
+        set r [RIPEHMAC128Final $tok]
+
+    } else {
+
+        set tok [RIPEHMAC128Init $opts(-key)]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        vwait [subst $tok](reading)
+        set r [RIPEHMAC128Final $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+namespace eval ::ripemd {
+
+    namespace import -force [namespace current]::ripemd128::*
+
+    namespace export ripemd128 hmac128 \
+        RIPEMD128Init RIPEMD128Update RIPEMD128Final \
+        RIPEHMAC128Init RIPEHMAC128Update RIPEHMAC128Final
+}
+
+# -------------------------------------------------------------------------
+
+# Try and load a compiled extension to help.
+namespace eval ::ripemd::ripemd128 {
+    variable e {}
+    foreach e {trf} {
+        if {[LoadAccelerator $e]} break
+    }
+    unset e
+}
+
+package provide ripemd128 1.0.5
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ripemd/ripemd160.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ripemd/ripemd160.tcl
new file mode 100644
index 00000000..d9f92a39
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/ripemd/ripemd160.tcl
@@ -0,0 +1,866 @@
+# ripemd160.tcl - Copyright (C) 2003 Pat Thoyts <patthoyts@users.sf.net>
+#
+# This is a Tcl-only implementation of the RIPEMD-160 hash algorithm as 
+# described in [RIPE].
+# Included is an implementation of keyed message authentication using 
+# the RIPEMD-160 function [HMAC].
+#
+# See http://www.esat.kuleuven.ac.be/~cosicart/pdf/AB-9601/
+#
+# [RIPE] Dobbertin, H., Bosselaers A., and Preneel, B.
+#        "RIPEMD-160: A Strengthened Version of RIPEMD" 
+#        Fast Software Encryption, LNCS 1039, D. Gollmann, Ed., 
+#        Springer-Verlag, 1996, pp. 71-82
+# [HMAC] Krawczyk, H., Bellare, M., and R. Canetti, 
+#       "HMAC: Keyed-Hashing for Message Authentication",
+#        RFC 2104, February 1997.
+#
+# RFC 2286, ``Test cases for HMAC-RIPEMD160 and HMAC-RIPEMD128,''
+# Internet Request for Comments 2286, J. Kapp, 
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2;                # tcl minimum version
+#catch {package require ripemdc 1.0};   # tcllib critcl alternative
+
+namespace eval ::ripemd {
+    namespace eval ripemd160 {
+        variable  accel
+        array set accel {cryptkit 0 trf 0}
+
+        variable uid
+        if {![info exists uid]} {
+            set uid 0
+        }
+
+        namespace export ripemd160 hmac160 Hex \
+            RIPEMD160Init RIPEMD160Update RIPEMD160Final \
+            RIPEHMAC160Init RIPEHMAC160Update RIPEHMAC160Final
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# RIPEMD160Init - create and initialize the state variable. This will be
+# cleaned up when we call RIPEMD160Final
+#
+proc ::ripemd::ripemd160::RIPEMD160Init {} {
+    variable accel
+    variable uid
+    set token [namespace current]::[incr uid]
+    upvar #0 $token state
+
+    # Initialize RIPEMD-160 state structure (same as MD4).
+    array set state \
+        [list \
+             A [expr {0x67452301}] \
+             B [expr {0xefcdab89}] \
+             C [expr {0x98badcfe}] \
+             D [expr {0x10325476}] \
+             E [expr {0xc3d2e1f0}] \
+             n 0 i "" ]
+    if {$accel(cryptkit)} {
+        cryptkit::cryptCreateContext state(ckctx) \
+            CRYPT_UNUSED CRYPT_ALGO_RIPEMD160
+    } elseif {$accel(trf)} {
+        set s {}
+        switch -exact -- $::tcl_platform(platform) {
+            windows { set s [open NUL w] }
+            unix    { set s [open /dev/null w] }
+        }
+        if {$s != {}} {
+            fconfigure $s -translation binary -buffering none
+            ::ripemd160 -attach $s -mode write \
+                -read-type variable \
+                -read-destination [subst $token](trfread) \
+                -write-type variable \
+                -write-destination [subst $token](trfwrite)
+            array set state [list trfread 0 trfwrite 0 trf $s]
+        }
+    }
+    return $token
+}
+
+proc ::ripemd::ripemd160::RIPEMD160Update {token data} {
+    upvar #0 $token state
+
+    if {[info exists state(ckctx)]} {
+        if {[string length $data] > 0} {
+            cryptkit::cryptEncrypt $state(ckctx) $data
+        }
+        return
+    } elseif {[info exists state(trf)]} {
+        puts -nonewline $state(trf) $data
+        return
+    }
+
+    # Update the state values
+    incr state(n) [string length $data]
+    append state(i) $data
+
+    # Calculate the hash for any complete blocks
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        RIPEMD160Hash $token [string range $state(i) $n [incr n 64]]
+    }
+
+    # Adjust the state for the blocks completed.
+    set state(i) [string range $state(i) $n end]
+    return
+}
+
+proc ::ripemd::ripemd160::RIPEMD160Final {token} {
+    upvar #0 $token state
+
+    if {[info exists state(ckctx)]} {
+        cryptkit::cryptEncrypt $state(ckctx) ""
+        cryptkit::cryptGetAttributeString $state(ckctx) \
+            CRYPT_CTXINFO_HASHVALUE r 20
+        cryptkit::cryptDestroyContext $state(ckctx)
+        # If nothing was hashed, we get no r variable set!
+        if {[info exists r]} {
+            unset state
+            return $r
+        }
+    } elseif {[info exists state(trf)]} {
+        close $state(trf)
+        set r $state(trfwrite)
+        unset state
+        return $r
+    }
+
+    # Padding
+    #
+    set len [string length $state(i)]
+    set pad [expr {56 - ($len % 64)}]
+    if {$len % 64 > 56} {
+        incr pad 64
+    }
+    if {$pad == 0} {
+        incr pad 64
+    }
+    append state(i) [binary format a$pad \x80]
+
+    # Append length in bits as little-endian wide int.
+    append state(i) [binary format ii [expr {8 * $state(n)}] 0]
+
+    # Calculate the hash for the remaining block.
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        RIPEMD160Hash $token [string range $state(i) $n [incr n 64]]
+    }
+
+    # Output
+    set r [bytes $state(A)][bytes $state(B)][bytes $state(C)][bytes $state(D)][bytes $state(E)]
+    unset state
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# HMAC Hashed Message Authentication (RFC 2104)
+#
+# hmac = H(K xor opad, H(K xor ipad, text))
+#
+proc ::ripemd::ripemd160::RIPEHMAC160Init {K} {
+
+    # Key K is adjusted to be 64 bytes long. If K is larger, then use
+    # the RIPEMD-160 digest of K and pad this instead.
+    set len [string length $K]
+    if {$len > 64} {
+        set tok [RIPEMD160Init]
+        RIPEMD160Update $tok $K
+        set K [RIPEMD160Final $tok]
+        set len [string length $K]
+    }
+    set pad [expr {64 - $len}]
+    append K [string repeat \0 $pad]
+
+    # Cacluate the padding buffers.
+    set Ki {}
+    set Ko {}
+    binary scan $K i16 Ks
+    foreach k $Ks {
+        append Ki [binary format i [expr {$k ^ 0x36363636}]]
+        append Ko [binary format i [expr {$k ^ 0x5c5c5c5c}]]
+    }
+
+    set tok [RIPEMD160Init]
+    RIPEMD160Update $tok $Ki;                 # initialize with the inner pad
+    
+    # preserve the Ko value for the final stage.
+    # FRINK: nocheck
+    set [subst $tok](Ko) $Ko
+
+    return $tok
+}
+
+proc ::ripemd::ripemd160::RIPEHMAC160Update {token data} {
+    RIPEMD160Update $token $data
+    return
+}
+
+proc ::ripemd::ripemd160::RIPEHMAC160Final {token} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+
+    set tok [RIPEMD160Init];            # init the outer hashing function
+    RIPEMD160Update $tok $state(Ko);    # prepare with the outer pad.
+    RIPEMD160Update $tok [RIPEMD160Final $token];  # hash the inner result
+    return [RIPEMD160Final $tok]
+}
+
+# -------------------------------------------------------------------------
+
+set ::ripemd::ripemd160::RIPEMD160Hash_body {
+    variable $token
+    upvar 0 $token state
+
+    binary scan $msg i* blocks
+    foreach {X0 X1 X2 X3 X4 X5 X6 X7 X8 X9 X10 X11 X12 X13 X14 X15} $blocks {
+        set A $state(A)   ;  set AA $state(A)
+        set B $state(B)   ;  set BB $state(B)
+        set C $state(C)   ;  set CC $state(C)
+        set D $state(D)   ;  set DD $state(D)
+        set E $state(E)   ;  set EE $state(E)
+
+        FF A B C D E $X0 11
+        FF E A B C D $X1 14
+        FF D E A B C $X2 15
+        FF C D E A B $X3 12
+        FF B C D E A $X4 5
+        FF A B C D E $X5 8
+        FF E A B C D $X6 7
+        FF D E A B C $X7 9
+        FF C D E A B $X8 11
+        FF B C D E A $X9 13
+        FF A B C D E $X10 14
+        FF E A B C D $X11 15
+        FF D E A B C $X12 6
+        FF C D E A B $X13 7
+        FF B C D E A $X14 9
+        FF A B C D E $X15 8
+        
+        GG E A B C D $X7 7
+        GG D E A B C $X4 6
+        GG C D E A B $X13 8
+        GG B C D E A $X1 13
+        GG A B C D E $X10 11
+        GG E A B C D $X6 9
+        GG D E A B C $X15 7
+        GG C D E A B $X3 15
+        GG B C D E A $X12 7
+        GG A B C D E $X0 12
+        GG E A B C D $X9 15
+        GG D E A B C $X5 9
+        GG C D E A B $X2 11
+        GG B C D E A $X14 7
+        GG A B C D E $X11 13
+        GG E A B C D $X8 12
+        
+        HH D E A B C $X3 11
+        HH C D E A B $X10 13
+        HH B C D E A $X14 6
+        HH A B C D E $X4 7
+        HH E A B C D $X9 14
+        HH D E A B C $X15 9
+        HH C D E A B $X8 13
+        HH B C D E A $X1 15
+        HH A B C D E $X2 14
+        HH E A B C D $X7 8
+        HH D E A B C $X0 13
+        HH C D E A B $X6 6
+        HH B C D E A $X13 5
+        HH A B C D E $X11 12
+        HH E A B C D $X5 7
+        HH D E A B C $X12 5
+        
+        II C D E A B $X1 11
+        II B C D E A $X9 12
+        II A B C D E $X11 14
+        II E A B C D $X10 15
+        II D E A B C $X0 14
+        II C D E A B $X8 15
+        II B C D E A $X12 9
+        II A B C D E $X4 8
+        II E A B C D $X13 9
+        II D E A B C $X3 14
+        II C D E A B $X7 5
+        II B C D E A $X15 6
+        II A B C D E $X14 8
+        II E A B C D $X5 6
+        II D E A B C $X6 5
+        II C D E A B $X2 12
+        
+        JJ B C D E A $X4 9
+        JJ A B C D E $X0 15
+        JJ E A B C D $X5 5
+        JJ D E A B C $X9 11
+        JJ C D E A B $X7 6
+        JJ B C D E A $X12 8
+        JJ A B C D E $X2 13
+        JJ E A B C D $X10 12
+        JJ D E A B C $X14 5
+        JJ C D E A B $X1 12
+        JJ B C D E A $X3 13
+        JJ A B C D E $X8 14
+        JJ E A B C D $X11 11
+        JJ D E A B C $X6 8
+        JJ C D E A B $X15 5
+        JJ B C D E A $X13 6
+        
+        JJJ AA BB CC DD EE $X5 8
+        JJJ EE AA BB CC DD $X14 9
+        JJJ DD EE AA BB CC $X7 9
+        JJJ CC DD EE AA BB $X0 11
+        JJJ BB CC DD EE AA $X9 13
+        JJJ AA BB CC DD EE $X2 15
+        JJJ EE AA BB CC DD $X11 15
+        JJJ DD EE AA BB CC $X4 5
+        JJJ CC DD EE AA BB $X13 7
+        JJJ BB CC DD EE AA $X6 7
+        JJJ AA BB CC DD EE $X15 8
+        JJJ EE AA BB CC DD $X8 11
+        JJJ DD EE AA BB CC $X1 14
+        JJJ CC DD EE AA BB $X10 14
+        JJJ BB CC DD EE AA $X3 12
+        JJJ AA BB CC DD EE $X12 6
+        
+        III EE AA BB CC DD $X6 9
+        III DD EE AA BB CC $X11 13
+        III CC DD EE AA BB $X3 15
+        III BB CC DD EE AA $X7 7
+        III AA BB CC DD EE $X0 12
+        III EE AA BB CC DD $X13 8
+        III DD EE AA BB CC $X5 9
+        III CC DD EE AA BB $X10 11
+        III BB CC DD EE AA $X14 7
+        III AA BB CC DD EE $X15 7
+        III EE AA BB CC DD $X8 12
+        III DD EE AA BB CC $X12 7
+        III CC DD EE AA BB $X4 6
+        III BB CC DD EE AA $X9 15
+        III AA BB CC DD EE $X1 13
+        III EE AA BB CC DD $X2 11
+        
+        HHH DD EE AA BB CC $X15 9
+        HHH CC DD EE AA BB $X5 7
+        HHH BB CC DD EE AA $X1 15
+        HHH AA BB CC DD EE $X3 11
+        HHH EE AA BB CC DD $X7 8
+        HHH DD EE AA BB CC $X14 6
+        HHH CC DD EE AA BB $X6 6
+        HHH BB CC DD EE AA $X9 14
+        HHH AA BB CC DD EE $X11 12
+        HHH EE AA BB CC DD $X8 13
+        HHH DD EE AA BB CC $X12 5
+        HHH CC DD EE AA BB $X2 14
+        HHH BB CC DD EE AA $X10 13
+        HHH AA BB CC DD EE $X0 13
+        HHH EE AA BB CC DD $X4 7
+        HHH DD EE AA BB CC $X13 5
+        
+        GGG CC DD EE AA BB $X8 15
+        GGG BB CC DD EE AA $X6 5
+        GGG AA BB CC DD EE $X4 8
+        GGG EE AA BB CC DD $X1 11
+        GGG DD EE AA BB CC $X3 14
+        GGG CC DD EE AA BB $X11 14
+        GGG BB CC DD EE AA $X15 6
+        GGG AA BB CC DD EE $X0 14
+        GGG EE AA BB CC DD $X5 6
+        GGG DD EE AA BB CC $X12 9
+        GGG CC DD EE AA BB $X2 12
+        GGG BB CC DD EE AA $X13 9
+        GGG AA BB CC DD EE $X9 12
+        GGG EE AA BB CC DD $X7 5
+        GGG DD EE AA BB CC $X10 15
+        GGG CC DD EE AA BB $X14 8
+        
+        FFF BB CC DD EE AA $X12 8
+        FFF AA BB CC DD EE $X15 5
+        FFF EE AA BB CC DD $X10 12
+        FFF DD EE AA BB CC $X4 9
+        FFF CC DD EE AA BB $X1 12
+        FFF BB CC DD EE AA $X5 5
+        FFF AA BB CC DD EE $X8 14
+        FFF EE AA BB CC DD $X7 6
+        FFF DD EE AA BB CC $X6 8
+        FFF CC DD EE AA BB $X2 13
+        FFF BB CC DD EE AA $X13 6
+        FFF AA BB CC DD EE $X14 5
+        FFF EE AA BB CC DD $X0 15
+        FFF DD EE AA BB CC $X3 13
+        FFF CC DD EE AA BB $X9 11
+        FFF BB CC DD EE AA $X11 11
+
+        # Then perform the following additions to combine the results.
+        set DD       [expr {$state(B) + $C + $DD}]
+        set state(B) [expr {$state(C) + $D + $EE}]
+        set state(C) [expr {$state(D) + $E + $AA}]
+        set state(D) [expr {$state(E) + $A + $BB}]
+        set state(E) [expr {$state(A) + $B + $CC}]
+        set state(A) $DD
+    }
+
+    return
+}
+
+proc ::ripemd::ripemd160::byte {n v} {expr {((0xFF << (8 * $n)) & $v) >> (8 * $n)}}
+proc ::ripemd::ripemd160::bytes {v} { 
+    #format %c%c%c%c [byte 0 $v] [byte 1 $v] [byte 2 $v] [byte 3 $v]
+    format %c%c%c%c \
+        [expr {0xFF & $v}] \
+        [expr {(0xFF00 & $v) >> 8}] \
+        [expr {(0xFF0000 & $v) >> 16}] \
+        [expr {((0xFF000000 & $v) >> 24) & 0xFF}]
+}
+
+#  F(x,y,z) = x ^ y ^ z
+proc ::ripemd::ripemd160::F {X Y Z} {
+    return [expr {$X ^ $Y ^ $Z}]
+}
+# G(x,y,z) = (x & y) | (~x & z)
+proc ::ripemd::ripemd160::G {X Y Z} {
+    return [expr {($X & $Y) | (~$X & $Z)}]
+}
+# H(x,y,z) = (x | ~y) ^ z
+proc ::ripemd::ripemd160::H {X Y Z} {
+    return [expr {($X | ~$Y) ^ $Z}]
+}
+# I(x,y,z) = (x & z) | (y & ~z)
+proc ::ripemd::ripemd160::I {X Y Z} {
+    return [expr {($X & $Z) | ($Y & ~$Z)}]
+}
+# J(x,y,z) = x ^ (y | ~z)
+proc ::ripemd::ripemd160::J {X Y Z} {
+    return [expr {($X ^ ($Y | ~$Z))}]
+}
+
+proc ::ripemd::ripemd160::FF {a b c d e x s} {
+    upvar $a A $b B $c C $d D $e E
+    set A [<<< [expr {$A + ($B ^ $C ^ $D) + $x}] $s]
+    incr A $E
+    set C [<<< $C 10]
+}
+
+proc ::ripemd::ripemd160::GG {a b c d e x s} {
+    upvar $a A $b B $c C $d D $e E
+    set A [<<< [expr {$A + (($B & $C) | (~$B & $D)) + $x + 0x5a827999}] $s]
+    incr A $E
+    set C [<<< $C 10]
+}
+
+proc ::ripemd::ripemd160::HH {a b c d e x s} {
+    upvar $a A $b B $c C $d D $e E
+    set A [<<< [expr {$A + (($B | ~$C) ^ $D) + $x + 0x6ed9eba1}] $s]
+    incr A $E
+    set C [<<< $C 10]
+}
+
+proc ::ripemd::ripemd160::II {a b c d e x s} {
+    upvar $a A $b B $c C $d D $e E
+    set A [<<< [expr {$A + (($B & $D)|($C & ~$D)) + $x + 0x8f1bbcdc}] $s]
+    incr A $E
+    set C [<<< $C 10]
+
+}
+
+proc ::ripemd::ripemd160::JJ {a b c d e x s} {
+    upvar $a A $b B $c C $d D $e E
+    set A [<<< [expr {$A + ($B ^ ($C | ~$D)) + $x + 0xa953fd4e}] $s]
+    incr A $E
+    set C [<<< $C 10]
+}
+
+
+proc ::ripemd::ripemd160::FFF {a b c d e x s} {
+    upvar $a A $b B $c C $d D $e E
+    set A [<<< [expr {$A + ($B ^ $C ^ $D) + $x}] $s]
+    incr A $E
+    set C [<<< $C 10]
+}
+
+proc ::ripemd::ripemd160::GGG {a b c d e x s} {
+    upvar $a A $b B $c C $d D $e E
+    set A [<<< [expr {$A + (($B & $C) | (~$B & $D)) + $x + 0x7a6d76e9}] $s]
+    incr A $E
+    set C [<<< $C 10]
+}
+
+proc ::ripemd::ripemd160::HHH {a b c d e x s} {
+    upvar $a A $b B $c C $d D $e E
+    set A [<<< [expr {$A + (($B | ~$C) ^ $D) + $x + 0x6d703ef3}] $s]
+    incr A $E
+    set C [<<< $C 10]
+}
+
+proc ::ripemd::ripemd160::III {a b c d e x s} {
+    upvar $a A $b B $c C $d D $e E
+    set A [<<< [expr {$A + (($B & $D)|($C & ~$D)) + $x + 0x5c4dd124}] $s]
+    incr A $E
+    set C [<<< $C 10]
+
+}
+
+proc ::ripemd::ripemd160::JJJ {a b c d e x s} {
+    upvar $a A $b B $c C $d D $e E
+    set A [<<< [expr {$A + ($B ^ ($C | ~$D)) + $x + 0x50a28be6}] $s]
+    incr A $E
+    set C [<<< $C 10]
+}
+
+# 32bit rotate-left
+proc ::ripemd::ripemd160::<<< {v n} {
+    return [expr {((($v << $n) \
+                        | (($v >> (32 - $n)) \
+                               & (0x7FFFFFFF >> (31 - $n))))) \
+                      & 0xFFFFFFFF}]
+}
+
+# -------------------------------------------------------------------------
+# Inline the algorithm functions
+#
+# On my test system inlining the functions like this improves
+#   time {ripmd::ripmd160 [string repeat a 100]} 100
+# from 28ms per iteration to 13ms per iteration.
+#
+# This means that the functions above (F - J, FF - JJ and FFF-JJJ) are
+# not actually required for the code to operate. However, they provide
+# a readable way to document what is going on so have been left in.
+#
+namespace eval ::ripemd::ripemd160 {
+
+    # Inline function FF and FFF
+    set Split {(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\d+)}
+    
+    regsub -all -line \
+        "^\\s+FFF?\\s+$Split$" \
+        $RIPEMD160Hash_body \
+        {set \1 [<<< [expr {$\1 + ($\2 ^ $\3 ^ $\4) + \6}] \7];\
+             incr \1 $\5; set \3 [<<< $\3 10]} \
+        RIPEMD160Hash_body
+    
+    # Inline function GG
+    regsub -all -line \
+        "^\\s+GG\\s+$Split$" \
+        $RIPEMD160Hash_body \
+        {set \1 [<<< [expr {$\1 + (($\2 \& $\3) | (~$\2 \& $\4)) + \6 \
+                                + 0x5a827999}] \7];\
+             incr \1 $\5; set \3 [<<< $\3 10]} \
+        RIPEMD160Hash_body
+
+    # Inline function GGG
+    regsub -all -line \
+        "^\\s+GGG\\s+$Split$" \
+        $RIPEMD160Hash_body \
+        {set \1 [<<< [expr {$\1 + (($\2 \& $\3) | (~$\2 \& $\4)) + \6 \
+                                + 0x7a6d76e9}] \7];\
+             incr \1 $\5; set \3 [<<< $\3 10]} \
+        RIPEMD160Hash_body
+
+    # Inline function HH
+    regsub -all -line \
+        "^\\s+HH\\s+$Split$" \
+        $RIPEMD160Hash_body \
+        {set \1 [<<< [expr {$\1 + (($\2 | ~$\3) ^ $\4) + \6 \
+                                + 0x6ed9eba1}] \7];\
+             incr \1 $\5; set \3 [<<< $\3 10]} \
+        RIPEMD160Hash_body
+
+    # Inline function HHH
+    regsub -all -line \
+        "^\\s+HHH\\s+$Split$" \
+        $RIPEMD160Hash_body \
+        {set \1 [<<< [expr {$\1 + (($\2 | ~$\3) ^ $\4) + \6 \
+                                + 0x6d703ef3}] \7];\
+             incr \1 $\5; set \3 [<<< $\3 10]} \
+        RIPEMD160Hash_body
+
+    # Inline function II
+    regsub -all -line \
+        "^\\s+II\\s+$Split$" \
+        $RIPEMD160Hash_body \
+        {set \1 [<<< [expr {$\1 + (($\2 \& $\4) | ($\3 \& ~$\4)) + \6 \
+                                + 0x8f1bbcdc}] \7];\
+             incr \1 $\5; set \3 [<<< $\3 10]} \
+        RIPEMD160Hash_body
+
+    # Inline function III
+    regsub -all -line \
+        "^\\s+III\\s+$Split$" \
+        $RIPEMD160Hash_body \
+        {set \1 [<<< [expr {$\1 + (($\2 \& $\4) | ($\3 \& ~$\4)) + \6 \
+                                + 0x5c4dd124}] \7];\
+             incr \1 $\5; set \3 [<<< $\3 10]} \
+        RIPEMD160Hash_body
+
+    # Inline function JJ
+    regsub -all -line \
+        "^\\s+JJ\\s+$Split$" \
+        $RIPEMD160Hash_body \
+        {set \1 [<<< [expr {$\1 + ($\2 ^ ($\3 | ~$\4)) + \6 \
+                                + 0xa953fd4e}] \7];\
+             incr \1 $\5; set \3 [<<< $\3 10]} \
+        RIPEMD160Hash_body
+
+    # Inline function JJJ
+    regsub -all -line \
+        "^\\s+JJJ\\s+$Split$" \
+        $RIPEMD160Hash_body \
+        {set \1 [<<< [expr {$\1 + ($\2 ^ ($\3 | ~$\4)) + \6 \
+                                + 0x50a28be6}] \7];\
+             incr \1 $\5; set \3 [<<< $\3 10]} \
+        RIPEMD160Hash_body
+
+    # Inline simple <<<
+    regsub -all -line \
+        {\[<<< (\$\S+)\s+(\d+)\]$} \
+        $RIPEMD160Hash_body \
+        {[expr {(((\1 << \2) \
+                      | ((\1 >> (32 - \2)) \
+                             \& (0x7FFFFFFF >> (31 - \2))))) \
+                    \& 0xFFFFFFFF}]} \
+        RIPEMD160Hash_body
+}
+
+# -------------------------------------------------------------------------
+
+# Define the hashing procedure with inline functions.
+proc ::ripemd::ripemd160::RIPEMD160Hash {token msg} \
+    $::ripemd::ripemd160::RIPEMD160Hash_body
+
+unset ::ripemd::ripemd160::RIPEMD160Hash_body
+
+# -------------------------------------------------------------------------
+
+proc ::ripemd::ripemd160::Hex {data} {
+    binary scan $data H* result
+    return $result
+}
+
+# -------------------------------------------------------------------------
+
+# LoadAccelerator --
+#
+#	This package can make use of a number of compiled extensions to
+#	accelerate the digest computation. This procedure manages the
+#	use of these extensions within the package. During normal usage
+#	this should not be called, but the test package manipulates the
+#	list of enabled accelerators.
+#
+proc ::ripemd::ripemd160::LoadAccelerator {name} {
+    variable accel
+    set r 0
+    switch -exact -- $name {
+        #critcl {
+        #    if {![catch {package require tcllibc}]
+        #        || ![catch {package require sha1c}]} {
+        #        set r [expr {[info commands ::sha1::sha1c] != {}}]
+        #    }
+        #}
+        cryptkit {
+            if {![catch {package require cryptkit}]} {
+                set r [expr {![catch {cryptkit::cryptInit}]}]
+            }
+        }
+        trf {
+            if {![catch {package require Trf}]} {
+                set r [expr {![catch {::ripemd160 aa} msg]}]
+            }
+        }
+        default {
+            return -code error "invalid accelerator package:\
+                must be one of [join [array names accel] {, }]"
+        }
+    }
+    set accel($name) $r
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::ripemd::ripemd160::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# fileevent handler for chunked file hashing.
+#
+proc ::ripemd::ripemd160::Chunk {token channel {chunksize 4096}} {
+    # FRINK: nocheck
+    variable $token
+    upvar 0 $token state
+    
+    if {[eof $channel]} {
+        fileevent $channel readable {}
+        set state(reading) 0
+    }
+        
+    RIPEMD160Update $token [read $channel $chunksize]
+}
+
+# -------------------------------------------------------------------------
+
+proc ::ripemd::ripemd160::ripemd160 {args} {
+    array set opts {-hex 0 -filename {} -channel {} -chunksize 4096}
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -hex       { set opts(-hex) 1 }
+            -file*     { set opts(-filename) [Pop args 1] }
+            -channel   { set opts(-channel) [Pop args 1] }
+            -chunksize { set opts(-chunksize) [Pop args 1] }
+            default {
+                if {[llength $args] == 1} { break }
+                if {[string compare $option "--"] == 0} { Pop args; break }
+                set err [join [lsort [array names opts]] ", "]
+                return -code error "bad option $option:\
+                    must be one of $err"
+            }
+        }
+        Pop args
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"ripemd160 ?-hex? -filename file | string\""
+        }
+        set tok [RIPEMD160Init]
+        RIPEMD160Update $tok [lindex $args 0]
+        set r [RIPEMD160Final $tok]
+
+    } else {
+
+        set tok [RIPEMD160Init]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        vwait [subst $tok](reading)
+        set r [RIPEMD160Final $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+proc ::ripemd::ripemd160::hmac160 {args} {
+    array set opts {-hex 0 -filename {} -channel {} -chunksize 4096}
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -key       { set opts(-key) [Pop args 1] }
+            -hex       { set opts(-hex) 1 }
+            -file*     { set opts(-filename) [Pop args 1] }
+            -channel   { set opts(-channel) [Pop args 1] }
+            -chunksize { set opts(-chunksize) [Pop args 1] }
+            default {
+                if {[llength $args] == 1} { break }
+                if {[string compare $option "--"] == 0} { Pop args; break }
+                set err [join [lsort [array names opts]] ", "]
+                return -code error "bad option $option:\
+                    must be one of $err"
+            }
+        }
+        Pop args
+    }
+
+    if {![info exists opts(-key)]} {
+        return -code error "wrong # args:\
+            should be \"hmac160 ?-hex? -key key -filename file | string\""
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"hmac160 ?-hex? -key key -filename file | string\""
+        }
+        set tok [RIPEHMAC160Init $opts(-key)]
+        RIPEHMAC160Update $tok [lindex $args 0]
+        set r [RIPEHMAC160Final $tok]
+
+    } else {
+
+        set tok [RIPEHMAC160Init $opts(-key)]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        vwait [subst $tok](reading)
+        set r [RIPEHMAC160Final $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+namespace eval ::ripemd {
+
+    namespace import -force [namespace current]::ripemd160::*
+
+    namespace export ripemd160 hmac160 \
+        RIPEMD160Init RIPEMD160Update RIPEMD160Final \
+        RIPEHMAC160Init RIPEHMAC160Update RIPEHMAC160Final
+}
+
+# -------------------------------------------------------------------------
+
+# Try and load a compiled extension to help.
+namespace eval ::ripemd::ripemd160 {
+    variable e {}
+    foreach e {cryptkit trf} {
+        if {[LoadAccelerator $e]} break
+    }
+    unset e
+}
+
+package provide ripemd160 1.0.5
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
+
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/gtoken.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/gtoken.tcl
new file mode 100644
index 00000000..aec9ef98
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/gtoken.tcl
@@ -0,0 +1,92 @@
+# gtoken.tcl - Copyright (C) 2006 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# This is an implementation of Google's X-GOOGLE-TOKEN authentication 
+# mechanism. This actually passes the login details to the Google
+# accounts server which gives us a short lived token that may be passed 
+# over an insecure link.
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2
+package require SASL
+package require http
+package require tls
+
+namespace eval ::SASL {
+    namespace eval XGoogleToken {
+        variable URLa https://www.google.com/accounts/ClientAuth
+        variable URLb https://www.google.com/accounts/IssueAuthToken
+
+        # Should use autoproxy and register autoproxy::tls_socket
+        # Leave to application author?
+        if {![info exists ::http::urlTypes(https)]} {
+            http::register https 443 tls::socket
+        }
+    }
+}
+
+proc ::SASL::XGoogleToken::client {context challenge args} {
+    upvar #0 $context ctx
+    variable URLa
+    variable URLb
+    set reply ""
+    set err ""
+
+    if {$ctx(step) != 0} {
+        return -code error "unexpected state: X-GOOGLE-TOKEN has only 1 step"
+    }
+    set username [eval $ctx(callback) [list $context username]]
+    set password [eval $ctx(callback) [list $context password]]
+    set query [http::formatQuery Email $username Passwd $password \
+                   PersistentCookie false source googletalk]
+    set tok [http::geturl $URLa -query $query -timeout 30000]
+    if {[http::status $tok] eq "ok"} {
+        foreach line [split [http::data $tok] \n] {
+            array set g [split $line =]
+        }
+        if {![info exists g(Error)]} {
+            set query [http::formatQuery SID $g(SID) LSID $g(LSID) \
+                           service mail Session true]
+            set tok2 [http::geturl $URLb -query $query -timeout 30000]
+
+            if {[http::status $tok2] eq "ok"} {
+                set reply "\0$username\0[http::data $tok2]"
+            } else {
+                set err [http::error $tok2]
+            }
+            http::cleanup $tok2
+       } else {
+           set err "Invalid username or password"
+       }
+    } else {
+        set err [http::error $tok]
+    }
+    http::cleanup $tok
+    
+    if {[string length $err] > 0} {
+        return -code error $err
+    } else {
+        set ctx(response) $reply
+        incr ctx(step)
+    }
+    return 0
+}
+
+# -------------------------------------------------------------------------
+
+# Register this SASL mechanism with the Tcllib SASL package.
+#
+if {[llength [package provide SASL]] != 0} {
+    ::SASL::register X-GOOGLE-TOKEN 40 ::SASL::XGoogleToken::client
+}
+
+package provide SASL::XGoogleToken 1.0.1
+
+# -------------------------------------------------------------------------
+#
+# Local variables:
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/ntlm.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/ntlm.tcl
new file mode 100644
index 00000000..f7762e9b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/ntlm.tcl
@@ -0,0 +1,375 @@
+# ntlm.tcl - Copyright (C) 2005 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# This is an implementation of Microsoft's NTLM authentication mechanism.
+#
+# References:
+#    http://www.innovation.ch/java/ntlm.html
+#    http://davenport.sourceforge.net/ntlm.html
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2;                # tcl minimum version
+package require SASL 1.0;               # tcllib 1.7
+package require des 1.0;                # tcllib 1.8
+package require md4;                    # tcllib 1.4
+
+namespace eval ::SASL {
+    namespace eval NTLM {
+        array set NTLMFlags {
+            unicode        0x00000001
+            oem            0x00000002
+            req_target     0x00000004
+            unknown        0x00000008
+            sign           0x00000010
+            seal           0x00000020
+            datagram       0x00000040
+            lmkey          0x00000080
+            netware        0x00000100
+            ntlm           0x00000200
+            unknown        0x00000400
+            unknown        0x00000800
+            domain         0x00001000
+            server         0x00002000
+            share          0x00004000
+            NTLM2          0x00008000
+            targetinfo     0x00800000
+            128bit         0x20000000
+            keyexch        0x40000000
+            56bit          0x80000000
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+
+proc ::SASL::NTLM::NTLM {context challenge args} {
+    upvar #0 $context ctx
+    incr ctx(step)
+    switch -exact -- $ctx(step) {
+        
+        1 {
+            set ctx(realm) [eval [linsert $ctx(callback) end $context realm]]
+            set ctx(hostname) [eval [linsert $ctx(callback) end $context hostname]]
+            set ctx(response)   [CreateGreeting $ctx(realm) $ctx(hostname)]
+            set result 1
+        }
+
+        2 {
+            array set params [Decode $challenge]
+            set user [eval [linsert $ctx(callback) end $context username]]
+            set pass [eval [linsert $ctx(callback) end $context password]]
+            if {[info exists params(domain)]} {
+                set ctx(realm) $params(domain)
+            }
+            set ctx(response) [CreateResponse \
+                                   $ctx(realm) $ctx(hostname) \
+                                   $user $pass $params(nonce) $params(flags)]
+            Decode $ctx(response)
+            set result 0
+        }
+        default {
+            return -code error "invalid state \"$ctx(step)"
+        }
+    }
+    return $result
+}
+
+# -------------------------------------------------------------------------
+# NTLM client implementation
+# -------------------------------------------------------------------------
+
+# The NMLM greeting. This is sent by the client to the server to initiate
+# the challenge response handshake.
+# This message contains the hostname (not domain qualified) and the 
+# NT domain name for authentication.
+#
+proc ::SASL::NTLM::CreateGreeting {domainname hostname {flags {}}} {
+    set domain [encoding convertto ascii $domainname]
+    set host [encoding convertto ascii $hostname]
+    set d_len [string length $domain]
+    set h_len [string length $host]
+    set d_off [expr {32 + $h_len}]
+    if {![llength $flags]} {
+        set flags {unicode oem ntlm server req_target}
+    }
+    set msg [binary format a8iississi \
+                 "NTLMSSP\x00" 1 [Flags $flags] \
+                 $d_len $d_len $d_off \
+                 $h_len $h_len 32]
+    append msg $host $domain
+    return $msg
+}
+
+# Create a NTLM server challenge. This is sent by a server in response to
+# a client type 1 message. The content of the type 2 message is variable
+# and depends upon the flags set by the client and server choices.
+#
+proc ::SASL::NTLM::CreateChallenge {domainname} {
+    SASL::md5_init
+    set target  [encoding convertto ascii $domainname]
+    set t_len   [string length $target]
+    set nonce   [string range [binary format h* [SASL::CreateNonce]] 0 7]
+    set pad     [string repeat \0 8]
+    set context [string repeat \0 8]
+    set msg [binary format a8issii \
+                 "NTLMSSP\x00" 2 \
+                 $t_len $t_len 48 \
+                 [Flags {ntlm unicode}]]
+    append msg $nonce $pad $context $pad $target
+    return $msg
+}
+
+# Compose the final client response. This contains the encoded username
+# and password, along with the server nonce value.
+#
+proc ::SASL::NTLM::CreateResponse {domainname hostname username passwd nonce flags} {
+    set lm_resp [LMhash $passwd $nonce]
+    set nt_resp [NThash $passwd $nonce]
+
+    set domain  [string toupper $domainname]
+    set host    [string toupper $hostname]
+    set user    $username
+    set unicode [expr {$flags & 0x00000001}]
+
+    if {$unicode} {
+      set domain [to_unicode_le $domain]
+      set host   [to_unicode_le $host]
+      set user   [to_unicode_le $user]
+    }
+
+    set l_len [string length $lm_resp]; # LM response length
+    set n_len [string length $nt_resp]; # NT response length
+    set d_len [string length $domain];  # Domain name length
+    set h_len [string length $host];    # Host name length
+    set u_len [string length $user];    # User name length
+    set s_len 0 ;                       # Session key length
+
+    # The offsets to strings appended to the structure
+    set d_off [expr {0x40}];            # Fixed offset to Domain buffer
+    set u_off [expr {$d_off + $d_len}]; # Offset to user buffer 
+    set h_off [expr {$u_off + $u_len}]; # Offset to host buffer
+    set l_off [expr {$h_off + $h_len}]; # Offset to LM hash
+    set n_off [expr {$l_off + $l_len}]; # Offset to NT hash
+    set s_off [expr {$n_off + $n_len}]; # Offset to Session key
+
+    set msg [binary format a8is4s4s4s4s4s4i \
+                 "NTLMSSP\x00" 3 \
+                 [list $l_len $l_len $l_off 0] \
+                 [list $n_len $n_len $n_off 0] \
+                 [list $d_len $d_len $d_off 0] \
+                 [list $u_len $u_len $u_off 0] \
+                 [list $h_len $h_len $h_off 0] \
+                 [list $s_len $s_len $s_off 0] \
+                 $flags]
+    append msg $domain $user $host $lm_resp $nt_resp
+    return $msg
+}
+
+proc ::SASL::NTLM::Debug {msg} {
+    array set d [Decode $msg]
+    if {[info exists d(flags)]}  { 
+        set d(flags) [list [format 0x%08x $d(flags)] [decodeflags $d(flags)]] 
+    }
+    if {[info exists d(nonce)]}  { set d(nonce) [base64::encode $d(nonce)] }
+    if {[info exists d(lmhash)]} { set d(lmhash) [base64::encode $d(lmhash)] }
+    if {[info exists d(nthash)]} { set d(nthash) [base64::encode $d(nthash)] }
+    return [array get d]
+}
+
+proc ::SASL::NTLM::Decode {msg} {
+    #puts [Debug $msg]
+    binary scan $msg a7ci protocol zero type
+    
+    switch -exact -- $type {
+        1 {
+            binary scan $msg @12ississi flags dlen dlen2 doff hlen hlen2 hoff
+            binary scan $msg @${hoff}a${hlen} host
+            binary scan $msg @${doff}a${dlen} domain
+            return [list type $type flags [format 0x%08x $flags] \
+                        domain $domain host $host]
+        }
+        2 {
+            binary scan $msg @12ssiia8a8 dlen dlen2 doff flags nonce pad
+            set domain {}; binary scan $msg @${doff}a${dlen} domain
+            set unicode [expr {$flags & 0x00000001}]
+            if {$unicode} {
+                set domain [from_unicode_le $domain]
+            }
+
+            binary scan $nonce H* nonce_h
+            binary scan $pad   H* pad_h
+            return [list type $type flags [format 0x%08x $flags] \
+                        domain $domain nonce $nonce]
+        }
+        3 {
+            binary scan $msg @12ssissississississii \
+                lmlen lmlen2 lmoff \
+                ntlen ntlen2 ntoff \
+                dlen  dlen2  doff  \
+                ulen  ulen2  uoff \
+                hlen  hlen2  hoff \
+                slen  slen2  soff \
+                flags
+            set domain {}; binary scan $msg @${doff}a${dlen} domain
+            set user {};   binary scan $msg @${uoff}a${ulen} user
+            set host {};   binary scan $msg @${hoff}a${hlen} host
+            set unicode [expr {$flags & 0x00000001}]
+            if {$unicode} {
+                set domain [from_unicode_le $domain]
+                set user   [from_unicode_le $user]
+                set host   [from_unicode_le $host]
+            }
+            binary scan $msg @${ntoff}a${ntlen} ntdata
+            binary scan $msg @${lmoff}a${lmlen} lmdata
+            binary scan $ntdata H* ntdata_h
+            binary scan $lmdata H* lmdata_h
+            return [list type $type flags [format 0x%08x $flags]\
+                        domain $domain host $host user $user \
+                        lmhash $lmdata nthash $ntdata]
+        }
+        default {
+            return -code error "invalid NTLM data: type not recognised"
+        }
+    }
+}
+
+proc ::SASL::NTLM::decodeflags {value} {
+    variable NTLMFlags
+    set result {}
+    foreach {flag mask} [array get NTLMFlags] {
+        if {$value & ($mask & 0xffffffff)} {
+            lappend result $flag
+        }
+    }
+    return $result
+}
+
+proc ::SASL::NTLM::Flags {flags} {
+    variable NTLMFlags
+    set result 0
+    foreach flag $flags {
+        if {![info exists NTLMFlags($flag)]} {
+            return -code error "invalid ntlm flag \"$flag\""
+        }
+        set result [expr {$result | $NTLMFlags($flag)}]
+    }
+    return $result
+}
+
+# Convert a string to unicode in little endian byte order.
+proc ::SASL::NTLM::to_unicode_le {str} {
+    set result [encoding convertto unicode $str]
+    if {[string equal $::tcl_platform(byteOrder) "bigEndian"]} {
+        set r {} ; set n 0
+        while {[binary scan $result @${n}cc a b] == 2} {
+            append r [binary format cc $b $a]
+            incr n 2
+        }
+        set result $r
+    }
+    return $result
+}
+
+# Convert a little-endian unicode string to utf-8.
+proc ::SASL::NTLM::from_unicode_le {str} {
+    if {[string equal $::tcl_platform(byteOrder) "bigEndian"]} {
+        set r {} ; set n 0
+        while {[binary scan $str @${n}cc a b] == 2} {
+            append r [binary format cc $b $a]
+            incr n 2
+        }
+        set str $r
+    }
+    return [encoding convertfrom unicode $str]
+}
+
+proc ::SASL::NTLM::LMhash {password nonce} {
+    set magic "\x4b\x47\x53\x21\x40\x23\x24\x25"
+    set hash ""
+    set password [string range [string toupper $password][string repeat \0 14] 0 13]
+    foreach key [CreateDesKeys $password] {
+        append hash [DES::des -dir encrypt -weak -mode ecb -key $key $magic]
+    }
+
+    append hash [string repeat \0 5]
+    set res ""
+    foreach key [CreateDesKeys $hash] {
+        append res [DES::des -dir encrypt -weak -mode ecb -key $key $nonce]
+    }
+
+    return $res
+}
+
+proc ::SASL::NTLM::NThash {password nonce} {
+    set pass [to_unicode_le $password]
+    set hash [md4::md4 $pass]
+    append hash [string repeat \x00 5]
+
+    set res ""
+    foreach key [CreateDesKeys $hash] {
+        append res [DES::des -dir encrypt -weak -mode ecb -key $key $nonce]
+    }
+
+    return $res
+}
+
+# Convert a password into a 56 bit DES key according to the NTLM specs.
+# We do NOT fix the parity of each byte. If we did, then bit 0 of each
+# byte should be adjusted to give the byte odd parity.
+#
+proc ::SASL::NTLM::CreateDesKeys {key} {
+    # pad to 7 byte boundary with nuls.
+    set mod [expr {[string length $key] % 7}]
+    if {$mod != 0} {
+        append key [string repeat "\0" [expr {7 - $mod}]]
+    }
+    set len [string length $key]
+    set r ""
+    for {set n 0} {$n < $len} {incr n 7} {
+        binary scan $key @${n}c7 bytes
+        set b {}
+        lappend b [expr {  [lindex $bytes 0] & 0xFF}]
+        lappend b [expr {(([lindex $bytes 0] & 0x01) << 7) | (([lindex $bytes 1] >> 1) & 0x7F)}]
+        lappend b [expr {(([lindex $bytes 1] & 0x03) << 6) | (([lindex $bytes 2] >> 2) & 0x3F)}]
+        lappend b [expr {(([lindex $bytes 2] & 0x07) << 5) | (([lindex $bytes 3] >> 3) & 0x1F)}]
+        lappend b [expr {(([lindex $bytes 3] & 0x0F) << 4) | (([lindex $bytes 4] >> 4) & 0x0F)}]
+        lappend b [expr {(([lindex $bytes 4] & 0x1F) << 3) | (([lindex $bytes 5] >> 5) & 0x07)}]
+        lappend b [expr {(([lindex $bytes 5] & 0x3F) << 2) | (([lindex $bytes 6] >> 6) & 0x03)}]
+        lappend b [expr {(([lindex $bytes 6] & 0x7F) << 1)}]
+        lappend r [binary format c* $b]
+    }
+    return $r;
+}
+
+# This is slower than the above in Tcl 8.4.9
+proc ::SASL::NTLM::CreateDesKeys2 {key} {
+    # pad to 7 byte boundary with nuls.
+    append key [string repeat "\0" [expr {7 - ([string length $key] % 7)}]]
+    binary scan $key B* bin
+    set len [string length $bin]
+    set r ""
+    for {set n 0} {$n < $len} {incr n} {
+        append r [string range $bin $n [incr n  6]] 0
+    }
+    # needs spliting into 8 byte keys.
+    return [binary format B* $r]
+}
+
+# -------------------------------------------------------------------------
+
+# Register this SASL mechanism with the Tcllib SASL package.
+#
+if {[llength [package provide SASL]] != 0} {
+    ::SASL::register NTLM 50 ::SASL::NTLM::NTLM
+}
+
+package provide SASL::NTLM 1.1.2
+
+# -------------------------------------------------------------------------
+#
+# Local variables:
+# indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/pkgIndex.tcl
new file mode 100644
index 00000000..b5910c30
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/pkgIndex.tcl
@@ -0,0 +1,11 @@
+# pkgIndex.tcl                                                -*- tcl -*-
+# Copyright (C) 2005 Pat Thoyts <patthoyts@users.sourceforge.net>
+# $Id: pkgIndex.tcl,v 1.11 2008/01/29 00:51:39 patthoyts Exp $
+if {![package vsatisfies [package provide Tcl] 8.2]} {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded SASL               1.3.3 [list source [file join $dir sasl.tcl]]
+package ifneeded SASL::NTLM         1.1.2 [list source [file join $dir ntlm.tcl]]
+package ifneeded SASL::XGoogleToken 1.0.1 [list source [file join $dir gtoken.tcl]]
+package ifneeded SASL::SCRAM        0.1   [list source [file join $dir scram.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/sasl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/sasl.tcl
new file mode 100644
index 00000000..c54acb65
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/sasl.tcl
@@ -0,0 +1,682 @@
+# sasl.tcl - Copyright (C) 2005 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# This is an implementation of a general purpose SASL library for use in
+# Tcl scripts. 
+#
+# References:
+#    Myers, J., "Simple Authentication and Security Layer (SASL)", 
+#      RFC 2222, October 1997.
+#    Rose, M.T., "TclSASL", "http://beepcore-tcl.sourceforge.net/tclsasl.html"
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2
+
+namespace eval ::SASL {
+    variable uid
+    if {![info exists uid]} { set uid 0 }
+
+    variable mechanisms
+    if {![info exists mechanisms]} {
+        set mechanisms [list]
+    }
+}
+
+# SASL::mechanisms --
+#
+#	Return a list of available SASL mechanisms. By default only the
+#	client implementations are given but if type is set to server then
+#	the list of available server mechanisms is returned.
+#	No mechanism with a preference value less than 'minimum' will be
+#	returned.
+#	The list is sorted by the security preference with the most secure
+#	mechanisms given first.
+#
+proc ::SASL::mechanisms {{type client} {minimum 0}} {
+    variable mechanisms
+    set r [list]
+    foreach mech $mechanisms {
+        if {[lindex $mech 0] < $minimum} { continue }
+        switch -exact -- $type {
+            client {
+                if {[string length [lindex $mech 2]] > 0} {
+                    lappend r [lindex $mech 1]
+                }
+            }
+            server {
+                if {[string length [lindex $mech 3]] > 0} {
+                    lappend r [lindex $mech 1]
+                }
+            }
+            default {
+                return -code error "invalid type \"$type\":\
+                    must be either client or server"
+            }
+        }
+    }
+    return $r
+}
+
+# SASL::register --
+#
+#	Register a new SASL mechanism with a security preference. Higher
+#	preference values are chosen before lower valued mechanisms.
+#	If no server implementation is available then an empty string 
+#	should be provided for the serverproc parameter.
+#
+proc ::SASL::register {mechanism preference clientproc {serverproc {}}} {
+    variable mechanisms
+    set ndx [lsearch -regexp $mechanisms $mechanism]
+    set mech [list $preference $mechanism $clientproc $serverproc]
+    if {$ndx == -1} {
+        lappend mechanisms $mech
+    } else {
+        set mechanisms [lreplace $mechanisms $ndx $ndx $mech]
+    }
+    set mechanisms [lsort -index 0 -decreasing -integer $mechanisms]
+    return
+}
+
+# SASL::uid --
+#
+#	Return a unique integer.
+#
+proc ::SASL::uid {} {
+    variable uid
+    return [incr uid]
+}
+
+# SASL::response --
+#
+#	Get the reponse string from the SASL state.
+#
+proc ::SASL::response {context} {
+    upvar #0 $context ctx
+    return $ctx(response)
+}
+
+# SASL::reset --
+#
+#	Reset the SASL state. This permits the same instance to be reused
+#	for a new round of authentication.
+#
+proc ::SASL::reset {context {step 0}} {
+    upvar #0 $context ctx
+    array set ctx [list step $step response "" valid false count 0]
+    return $context
+}
+
+# SASL::cleanup --
+#
+#	Free any resources used with the SASL state.
+#
+proc ::SASL::cleanup {context} {
+    if {[info exists $context]} {
+        unset $context
+    }
+    return
+}
+
+# SASL::new --
+#
+#	Create a new SASL instance. 
+#
+proc ::SASL::new {args} {
+    set context [namespace current]::[uid]
+    upvar #0 $context ctx
+    array set ctx [list mech {} callback {} proc {} service smtp server {} \
+                       step 0 response "" valid false type client count 0]
+    eval [linsert $args 0 [namespace origin configure] $context]
+    return $context
+}
+
+# SASL::configure --
+#
+#	Configure the SASL state.
+#
+proc ::SASL::configure {context args} {
+    variable mechanisms
+    upvar #0 $context ctx
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -exact -- $option {
+            -service {
+                set ctx(service) [Pop args 1]
+            }
+            -server - -serverFQDN {
+                set ctx(server) [Pop args 1]
+            }
+            -mech - -mechanism {
+                set mech [string toupper [Pop args 1]]
+                set ctx(proc) {}
+                foreach m $mechanisms {
+                    if {[string equal [lindex $m 1] $mech]} {
+                        set ctx(mech) $mech
+                        if {[string equal $ctx(type) "server"]} {
+                            set ctx(proc) [lindex $m 3]
+                        } else {
+                            set ctx(proc) [lindex $m 2]
+                        }
+                        break
+                    }
+                }
+                if {[string equal $ctx(proc) {}]} {
+                    return -code error "mechanism \"$mech\" not available:\
+                        must be one of those given by \[sasl::mechanisms\]"
+                }
+            }
+            -callback - -callbacks {
+                set ctx(callback) [Pop args 1]
+            }
+            -type {
+                set type [Pop args 1]
+                if {[lsearch -exact {server client} $type] != -1} {
+                    set ctx(type) $type
+                    if {![string equal $ctx(mech) ""]} {
+                        configure $context -mechanism $ctx(mech)
+                    }
+                } else {
+                    return -code error "bad value \"$type\":\
+                        must be either client or server"
+                }
+            }
+            default {
+                return -code error "bad option \"$option\":\
+                    must be one of -mechanism, -service, -server -type\
+                    or -callbacks"
+            }
+        }
+        Pop args
+    }
+        
+}
+
+proc ::SASL::step {context challenge args} {
+    upvar #0 $context ctx
+    incr ctx(count)
+    return [eval [linsert $args 0 $ctx(proc) $context $challenge]]
+}
+
+
+proc ::SASL::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+proc ::SASL::md5_init {} {
+    variable md5_inited
+    if {[info exists md5_inited]} {return} else {set md5_inited 1}
+    # Deal with either version of md5. We'd like version 2 but someone
+    # may have already loaded version 1.
+    set md5major [lindex [split [package require md5] .] 0]
+    if {$md5major < 2} {
+        # md5 v1, no options, and returns a hex string ready for us.
+        proc ::SASL::md5_hex {data} { return [::md5::md5 $data] }
+        proc ::SASL::md5_bin {data} { return [binary format H* [::md5::md5 $data]] }
+        proc ::SASL::hmac_hex {pass data} { return [::md5::hmac $pass $data] }
+        proc ::SASL::hmac_bin {pass data} { return [binary format H* [::md5::hmac $pass $data]] }
+    } else {
+        # md5 v2 requires -hex to return hash as hex-encoded non-binary string.
+        proc ::SASL::md5_hex {data} { return [string tolower [::md5::md5 -hex $data]] }
+        proc ::SASL::md5_bin {data} { return [::md5::md5 $data] }
+        proc ::SASL::hmac_hex {pass data} { return [::md5::hmac -hex -key $pass $data] }
+        proc ::SASL::hmac_bin {pass data} { return [::md5::hmac -key $pass $data] }
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# CRAM-MD5 SASL MECHANISM
+#
+# 	Implementation of the Challenge-Response Authentication Mechanism
+#	(RFC2195).
+#
+# Comments:
+#	This mechanism passes a server generated string containing
+#	a timestamp and has the client generate an MD5 HMAC using the
+#	shared secret as the key and the server string as the data.
+#	The downside of this protocol is that the server must have access
+#	to the plaintext password.
+#
+proc ::SASL::CRAM-MD5:client {context challenge args} {
+    upvar #0 $context ctx
+    md5_init
+    if {$ctx(step) != 0} {
+        return -code error "unexpected state: CRAM-MD5 has only 1 step"
+    }
+    if {[string length $challenge] == 0} {
+        set ctx(response) ""
+        return 1
+    }
+    set password [eval $ctx(callback) [list $context password]]
+    set username [eval $ctx(callback) [list $context username]]
+    set reply [hmac_hex $password $challenge]
+    set reply "$username [string tolower $reply]"
+    set ctx(response) $reply
+    incr ctx(step)
+    return 0
+}
+
+proc ::SASL::CRAM-MD5:server {context clientrsp args} {
+    upvar #0 $context ctx
+    md5_init
+    incr ctx(step)
+    switch -exact -- $ctx(step) {
+        1 {
+            set ctx(realm) [eval $ctx(callback) [list $context realm]]
+            set ctx(response) "<[pid].[clock seconds]@$ctx(realm)>"
+            return 1
+        }
+        2 {
+            foreach {user hash} $clientrsp break
+            set hash [string tolower $hash]
+            set pass [eval $ctx(callback) [list $context password $user $ctx(realm)]]
+            set check [hmac_bin $pass $ctx(response)]
+            binary scan $check H* cx
+            if {[string equal $cx $hash]} {
+                return 0
+            } else {
+                return -code error "authentication failed"
+            }
+        }
+        default {
+            return -code error "invalid state"
+        }
+    }
+}
+
+::SASL::register CRAM-MD5 30 ::SASL::CRAM-MD5:client ::SASL::CRAM-MD5:server
+
+# -------------------------------------------------------------------------
+# PLAIN SASL MECHANISM
+#
+# 	Implementation of the single step login SASL mechanism (RFC2595).
+#
+# Comments:
+#	A single step mechanism in which the authorization ID, the
+#	authentication ID and password are all transmitted in plain
+#	text. This should not be used unless the channel is secured by
+#	some other means (such as SSL/TLS).
+#
+proc ::SASL::PLAIN:client {context challenge args} {
+    upvar #0 $context ctx
+    incr ctx(step)
+    set authzid  [eval $ctx(callback) [list $context login]]
+    set username [eval $ctx(callback) [list $context username]]
+    set password [eval $ctx(callback) [list $context password]]
+    set ctx(response) "$authzid\x00$username\x00$password"
+    return 0
+}
+
+proc ::SASL::PLAIN:server {context clientrsp args} {
+    upvar \#0 $context ctx
+    if {[string length $clientrsp] < 1} {
+        set ctx(response) ""
+        return 1
+    } else {
+        foreach {authzid authid pass} [split $clientrsp \0] break
+        set realm [eval $ctx(callback) [list $context realm]]
+        set check [eval $ctx(callback) [list $context password $authid $realm]]
+        if {[string equal $pass $check]} {
+            return 0
+        } else {
+            return -code error "authentication failed"
+        }
+    }
+}
+
+::SASL::register PLAIN 10 ::SASL::PLAIN:client ::SASL::PLAIN:server
+
+# -------------------------------------------------------------------------
+# LOGIN SASL MECHANISM
+#
+# 	Implementation of the two step login SASL mechanism.
+#
+# Comments:
+#	This is an unofficial but widely deployed SASL mechanism somewhat
+#	akin to the PLAIN mechanism. Both the authentication ID and password
+#	are transmitted in plain text in response to server prompts.
+#
+#	NOT RECOMMENDED for use in new protocol implementations.
+#
+proc ::SASL::LOGIN:client {context challenge args} {
+    upvar #0 $context ctx
+    if {$ctx(step) == 0 && [string length $challenge] == 0} {
+        set ctx(response) ""
+        return 1
+    }
+    incr ctx(step)
+    switch -exact -- $ctx(step) {
+        1 {
+            set ctx(response) [eval $ctx(callback) [list $context username]]
+            set r 1
+        }
+        2 {
+            set ctx(response) [eval $ctx(callback) [list $context password]]
+            set r 0
+        }
+        default {
+            return -code error "unexpected state \"$ctx(step)\":\
+                LOGIN has only 2 steps"
+        }
+    }
+    return $r
+}
+
+proc ::SASL::LOGIN:server {context clientrsp args} {
+    upvar #0 $context ctx
+    incr ctx(step)
+    switch -exact -- $ctx(step) {
+        1 {
+            set ctx(response) "Username:"
+            return 1
+        }
+        2 {
+            set ctx(username) $clientrsp
+            set ctx(response) "Password:"
+            return 1
+        }
+        3 {
+            set user $ctx(username)
+            set realm [eval $ctx(callback) [list $context realm]]
+            set pass [eval $ctx(callback) [list $context password $user $realm]]
+            if {[string equal $clientrsp $pass]} {
+                return 0
+            } else {
+                return -code error "authentication failed"
+            }
+        }
+        default {
+            return -code error "invalid state"
+        }
+    }
+}
+
+::SASL::register LOGIN 20 ::SASL::LOGIN:client ::SASL::LOGIN:server
+
+# -------------------------------------------------------------------------
+# ANONYMOUS SASL MECHANISM
+#
+# 	Implementation of the ANONYMOUS SASL mechanism (RFC2245).
+#
+# Comments:
+#
+# 
+proc ::SASL::ANONYMOUS:client {context challenge args} {
+    upvar #0 $context ctx
+    set user  [eval $ctx(callback) [list $context username]]
+    set realm [eval $ctx(callback) [list $context realm]]
+    set ctx(response) $user@$realm
+    return 0
+}
+
+proc ::SASL::ANONYMOUS:server {context clientrsp args} {
+    upvar #0 $context ctx
+    set ctx(response) ""
+    if {[string length $clientrsp] < 1} {
+        if {$ctx(count) > 2} {
+            return -code error "authentication failed"
+        }
+        return 1
+    } else {
+        set ctx(trace) $clientrsp
+        return 0
+    }
+}
+
+::SASL::register ANONYMOUS 5 ::SASL::ANONYMOUS:client ::SASL::ANONYMOUS:server
+
+# -------------------------------------------------------------------------
+
+# DIGEST-MD5 SASL MECHANISM
+#
+# 	Implementation of the DIGEST-MD5 SASL mechanism (RFC2831).
+#
+# Comments:
+#
+proc ::SASL::DIGEST-MD5:client {context challenge args} {
+    upvar #0 $context ctx
+    md5_init
+    if {$ctx(step) == 0 && [string length $challenge] == 0} {
+        if {[info exists ctx(challenge)]} {
+            set challenge $ctx(challenge)
+        } else {
+            set ctx(response) ""
+            return 1
+        }
+    }
+    incr ctx(step)
+    set result 0
+    switch -exact -- $ctx(step) {
+        1 {
+            set ctx(challenge) $challenge
+            array set params [DigestParameters $challenge]
+            
+            if {![info exists ctx(noncecount)]} {
+                set ctx(noncecount) 0
+            }
+            set nonce $params(nonce)
+            set cnonce [CreateNonce]
+            set noncecount [format %08u [incr ctx(noncecount)]]
+            set qop auth
+            
+            # support the 'charset' parameter.
+            set username [eval $ctx(callback) [list $context username]]
+            set password [eval $ctx(callback) [list $context password]]
+            set encoding iso8859-1
+            if {[info exists params(charset)]} {
+                set encoding $params(charset)
+            }
+            set username [encoding convertto $encoding $username]
+            set password [encoding convertto $encoding $password]
+
+            if {[info exists params(realm)]} {
+                set realm $params(realm)
+            } else {
+                set realm [eval $ctx(callback) [list $context realm]]
+            }
+            
+            set uri "$ctx(service)/$realm"
+            set R [DigestResponse $username $realm $password $uri \
+                       $qop $nonce $noncecount $cnonce]
+            
+            set ctx(response) "username=\"$username\",realm=\"$realm\",nonce=\"$nonce\",nc=\"$noncecount\",cnonce=\"$cnonce\",digest-uri=\"$uri\",response=\"$R\",qop=$qop"
+            if {[info exists params(charset)]} {
+                append ctx(response) ",charset=$params(charset)"
+            }
+            set result 1
+        }
+        
+        2 {
+            set ctx(response) ""
+            set result 0
+        }
+        default {
+            return -code error "invalid state"
+        }
+    }
+    return $result
+}
+
+proc ::SASL::DIGEST-MD5:server {context challenge args} {
+    upvar #0 $context ctx
+    md5_init
+    incr ctx(step)
+    set result 0
+    switch -exact -- $ctx(step) {
+        1 {
+            set realm [eval $ctx(callback) [list $context realm]]
+            set ctx(nonce) [CreateNonce]
+            set ctx(nc) 0
+            set ctx(response) "realm=\"$realm\",nonce=\"$ctx(nonce)\",qop=\"auth\",charset=utf-8,algorithm=md5-sess"
+            set result 1
+        }
+        2 {
+            array set params [DigestParameters $challenge]
+            set realm [eval $ctx(callback) [list $context realm]]
+            set password [eval $ctx(callback)\
+                              [list $context password $params(username) $realm]]
+            set uri "$ctx(service)/$realm"
+            set nc [format %08u [expr {$ctx(nc) + 1}]]
+            set R [DigestResponse $params(username) $realm $password \
+                       $uri auth $ctx(nonce) $nc $params(cnonce)]
+            if {[string equal $R $params(response)]} {
+                set R2 [DigestResponse $params(username) $realm $password \
+                        $uri auth $ctx(nonce) $nc $params(cnonce)]
+                set ctx(response) "rspauth=$R2"
+                incr ctx(nc)
+                set result 1
+            } else {
+                return -code error "authentication failed"
+            }
+        }
+        3 {
+            set ctx(response) ""
+            set result 0
+        }
+        default {
+            return -code error "invalid state"
+        }
+    }
+    return $result
+}
+
+# RFC 2831 2.1
+# Char categories as per spec...
+# Build up a regexp for splitting the challenge into key value pairs.
+proc ::SASL::DigestParameters {challenge} {
+    set sep "\\\]\\\[\\\\()<>@,;:\\\"\\\?=\\\{\\\} \t"
+    set tok {0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\-\|\~\!\#\$\%\&\*\+\.\^\_\`}
+    set sqot {(?:\'(?:\\.|[^\'\\])*\')}
+    set dqot {(?:\"(?:\\.|[^\"\\])*\")}
+    set parameters {}
+    regsub -all "(\[${tok}\]+)=(${dqot}|(?:\[${tok}\]+))(?:\[${sep}\]+|$)" $challenge {\1 \2 } parameters
+    return $parameters
+}
+
+# RFC 2831 2.1.2.1
+#
+proc ::SASL::DigestResponse {user realm pass uri qop nonce noncecount cnonce} {
+    set A1 [md5_bin "$user:$realm:$pass"]
+    set A2 "AUTHENTICATE:$uri"
+    if {![string equal $qop "auth"]} {
+        append A2 :[string repeat 0 32]
+    }
+    set A1h [md5_hex "${A1}:$nonce:$cnonce"]
+    set A2h [md5_hex $A2]
+    set R   [md5_hex $A1h:$nonce:$noncecount:$cnonce:$qop:$A2h]
+    return $R
+}
+
+# RFC 2831 2.1.2.2
+#
+proc ::SASL::DigestResponse2 {user realm pass uri qop nonce noncecount cnonce} {
+    set A1 [md5_bin "$user:$realm:$pass"]
+    set A2 ":$uri"
+    if {![string equal $qop "auth"]} {
+        append A2 :[string repeat 0 32]
+    }
+    set A1h [md5_hex "${A1}:$nonce:$cnonce"]
+    set A2h [md5_hex $A2]
+    set R   [md5_hex $A1h:$nonce:$noncecount:$cnonce:$qop:$A2h]
+    return $R
+}
+
+# Get 16 random bytes for a nonce value. If we can use /dev/random, do so
+# otherwise we hash some values.
+#
+proc ::SASL::CreateNonce {} {
+    set bytes {}
+    if {[file readable /dev/urandom]} {
+        catch {
+            set f [open /dev/urandom r]
+            fconfigure $f -translation binary -buffering none
+            set bytes [read $f 16]
+            close $f
+        }
+    }
+    if {[string length $bytes] < 1} {
+        md5_init
+        set bytes [md5_bin [clock seconds]:[pid]:[expr {rand()}]]
+    }
+    return [binary scan $bytes h* r; set r]
+}
+
+::SASL::register DIGEST-MD5 40 \
+    ::SASL::DIGEST-MD5:client ::SASL::DIGEST-MD5:server
+
+# -------------------------------------------------------------------------
+
+# OTP SASL MECHANISM
+#
+# 	Implementation of the OTP SASL mechanism (RFC2444).
+#
+# Comments:
+#
+#	RFC 2289: A One-Time Password System
+#	RFC 2444: OTP SASL Mechanism
+#	RFC 2243: OTP Extended Responses
+#	Client initializes with authid\0authzid
+#	Server responds with extended OTP responses 
+# 	eg: otp-md5 498 bi32123 ext
+#	Client responds with otp result as:
+#	 hex:xxxxxxxxxxxxxxxx
+# 	or
+#	 word:WWWW WWW WWWW WWWW WWWW
+#
+#	To support changing the otp sequence the extended commands have:
+#	  init-hex:<current>:<new params>:<new>
+#	eg: init-hex:xxxxxxxxxxxx:md5 499 seed987:xxxxxxxxxxxxxx
+#	or init-word
+
+proc ::SASL::OTP:client {context challenge args} {
+    upvar #0 $context ctx
+    package require otp
+    incr ctx(step)
+    switch -exact -- $ctx(step) {
+        1 {
+            set authzid  [eval $ctx(callback) [list $context login]]
+            set username [eval $ctx(callback) [list $context username]]
+            set ctx(response) "$authzid\x00$username"
+            set cont 1
+        }
+        2 {
+            foreach {type count seed ext} $challenge break
+            set type [lindex [split $type -] 1]
+            if {[lsearch -exact {md4 md5 sha1 rmd160} $type] == -1} {
+                return -code error "unsupported digest algorithm \"$type\":\
+                    must be one of md4, md5, sha1 or rmd160"
+            }
+            set challenge [lrange $challenge 3 end]
+            set password [eval $ctx(callback) [list $context password]]
+            set otp [::otp::otp-$type -word -seed $seed \
+                         -count $count $password]
+            if {[string match "ext*" $ext]} {
+                set otp word:$otp
+            }
+            set ctx(response) $otp
+            set cont 0
+        }
+        default {
+            return -code error "unexpected state \"$ctx(step)\":\
+               the SASL OTP mechanism only has 2 steps"
+        }
+    }
+    return $cont
+}
+
+::SASL::register OTP 45 ::SASL::OTP:client
+
+# -------------------------------------------------------------------------
+
+package provide SASL 1.3.3
+
+# -------------------------------------------------------------------------
+#
+# Local variables:
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/scram.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/scram.tcl
new file mode 100644
index 00000000..7f13d531
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sasl/scram.tcl
@@ -0,0 +1,503 @@
+# scram.tcl - Copyright (c) 2013 Sergei Golovan <sgolovan@nes.ru>
+#
+# This is an implementation of SCRAM-* SASL authentication
+# mechanism (RFC-5802).
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+
+package require Tcl 8.2
+package require SASL
+package require sha1
+package require base64
+
+namespace eval ::SASL::SCRAM {}
+
+# ::SASL::SCRAM::Map --
+#
+#       Map comma and equal sign to their codes in authzid and username
+#       (section 5.1, a and n attributes)
+#
+# Arguments:
+#       string      string subject to mapping
+#
+# Result:
+#       The given string with , replaced by =2C and = replaced by =3D
+#
+# Side effects:
+#       None
+#
+# Comment:
+#       Since comma, equal sign, 2, C, 3, D are all in ASCII,
+#       [encoding convertto utf-8 [Map]] gives the same result as
+#       [Map [encoding convertto utf-8]], so the latter is used here
+#       despite the former is correct formally
+
+proc ::SASL::SCRAM::Map {string} {
+    string map {, =2C = =3D} $string
+}
+
+# ::SASL::SCRAM::Unmap --
+#
+#       Replace codes =2C by , and =3D by = in authzid and username
+#       (section 5.1, a and n attributes)
+#
+# Arguments:
+#       string      authzid or username extracted from a challenge
+#
+# Result:
+#       Mapped argument
+#
+# Side effects:
+#       None
+#
+# Comment:
+#       Since comma, equal sign, 2, C, 3, D are all in ASCII,
+#       [encoding convertfrom utf-8 [Unmap]] gives the same result as
+#       [Unmap [encoding convertfrom utf-8]], and the former is used here
+#       despite the latter is correct formally
+
+proc ::SASL::SCRAM::Unmap {string} {
+    string map {=2C , =3D =} $string
+}
+
+# ::SASL::SCRAM::GS2Header --
+#
+#       Return GS2 header for SCRAM (section 7, gs2-header)
+#
+# Arguments:
+#       authzid     authorization identity (empty if it's the same as username
+#                   to authenticate)
+#
+# Result:
+#       GS2 header for inclusion into a client messages
+#
+# Side effects:
+#       None
+
+proc ::SASL::SCRAM::GS2Header {authzid} {
+    # n means that client doesn't support channel binding
+    if {[string equal $authzid ""]} {
+	return "n,,"
+    } else {
+	return "n,a=[Map $authzid],"
+    }
+}
+
+# ::SASL::SCRAM::ClientFirstMessageBare --
+#
+#       Return the first client message without the GS2 header (section 7,
+#       client-first-message-bare, without extensions)
+#
+# Arguments:
+#       username    Username to authenticate
+#       nonce       Random string of printable chars
+#
+# Result:
+#       SCRAM client first message without GS2 header
+#
+# Side effects:
+#       None
+
+proc ::SASL::SCRAM::ClientFirstMessageBare {username nonce} {
+    return "n=[Map $username],r=$nonce"
+}
+
+# ::SASL::SCRAM::ClientFirstMessage --
+#
+#       Return the first client message to be sent to a server (section 7,
+#       client-first-message, without extensions)
+#
+# Arguments:
+#       authzid     authorization identity (empty if it's the same as username
+#                   to authenticate)
+#       username    Username to authenticate
+#       nonce       Random string of printable chars
+#
+# Result:
+#       SCRAM client first message without GS2 header
+#
+# Side effects:
+#       None
+
+proc ::SASL::SCRAM::ClientFirstMessage {authzid username nonce} {
+    return "[GS2Header $authzid][ClientFirstMessageBare $username $nonce]"
+}
+
+# ::SASL::SCRAM::ClientFinalMessageWithoutProof --
+#
+#       Return the final client message not including the client proof
+#       (section 7, client-final-message-without-proof, without extensions).
+#       Note that we don't support channel binding, so the GS2 header used
+#       here is the same as in the first message. This message is used twice:
+#       1) as part of auth-message which hash authenticates user, 2) as part
+#       of the final message client sends to the server
+#
+# Arguments:
+#       authzid     authorization identity (empty if it's the same as username
+#                   to authenticate), must be the same as in the first message
+#       nonce       Random string of printable chars, must be the one received
+#                   from the server on step 1
+#
+# Result:
+#       The final client message without proof
+#
+# Side effects:
+#       None
+
+proc ::SASL::SCRAM::ClientFinalMessageWithoutProof {authzid nonce} {
+    # We still don't support channel binding, so just use [GS2Header]
+    return "c=[base64::encode [GS2Header $authzid]],r=$nonce"
+}
+
+# ::SASL::SCRAM::ServerFirstMessage --
+#
+#       Return the server first message (section 7, server-first-message)
+#
+# Arguments:
+#       nonce       Random string of printable chars, it must start with the
+#                   random string received from the client at step 0
+#       salt        Random binary string
+#       iter        Number of iterations for salting password (required to be
+#                   not less then 4096)
+#
+# Result:
+#       The first server message
+#
+# Side effects:
+#       None
+
+proc ::SASL::SCRAM::ServerFirstMessage {nonce salt iter} {
+    return "r=$nonce,s=[base64::encode $salt],i=$iter"
+}
+
+# ::SASL::SCRAM::ParseChallenge --
+#
+#       Parse client or server output string and return a list of attr-value,
+#       suitable for [array set].  Channel binding part of GS2 header returns
+#       as "cbind n", "cbind y" or "cbind p p <value>", other attributes
+#       return simply as "<attr> <value>"
+#
+# Arguments:
+#       challenge   Input string to parse
+#
+# Result:
+#       List with even number of members
+#
+# Side effects:
+#       None
+
+proc ::SASL::SCRAM::ParseChallenge {challenge} {
+    set attrval [split $challenge ,]
+    set params {}
+    set n 0
+    foreach av $attrval {
+        incr n
+        if {$av == ""} continue
+
+        if {[regexp {^([a-z])(?:=(.+))?$} $av -> attr val]} {
+            if {$n == 1 && ($attr == "n" || $attr == "y")} {
+                # Header (channel binding)
+                lappend params cbind $attr
+            } elseif {$n == 1 && $attr == "p"} {
+                # Header (channel binding)
+                lappend params cbind $attr $attr $val
+            } else {
+                lappend params $attr $val
+            }
+        } else {
+            return -code error "invalid challenge"
+        }
+    }
+    return $params
+}
+
+# ::SASL::SCRAM::Xor --
+#
+#       Return bitwize XOR between two strings of equal length
+#
+# Arguments:
+#       str1        String to XOR
+#       str2        String to XOR
+#
+# Result:
+#       Bitwise XOR of the supplied strings or error if their lengths differ
+#
+# Side effects:
+#       None
+
+proc ::SASL::SCRAM::Xor {str1 str2} {
+    set result ""
+    foreach s1 [split $str1 ""] s2 [split $str2 ""] {
+	append result [binary format c [expr {[scan $s1 %c] ^ [scan $s2 %c]}]]
+    }
+    return $result
+}
+
+# ::SASL::SCRAM::Hi --
+#
+#       Salt the given password using algorithm from section 2.2
+#
+# Arguments:
+#       hmac        Function which calculates a Hashed Message Authentication
+#                   digest (HMAC) described in RFC 2104 in binary form
+#       password    Password to salt
+#       salt        Random string used as a salt
+#       i           Number of iterations (assumed i>=1)
+#
+# Result:
+#       Salted password
+#
+# Side effects:
+#       None
+
+proc ::SASL::SCRAM::Hi {hmac password salt i} {
+    set res [set ui [$hmac $password "$salt\x0\x0\x0\x1"]]
+    for {set n 1} {$n < $i} {incr n} {
+        set ui [$hmac $password $ui]
+        set res [Xor $res $ui]
+    }
+    return $res
+}
+
+# ::SASL::SCRAM::Algo --
+#
+#       Return client proof and server signature according to SCRAM
+#       algorithm from section 3.
+#
+# Arguments:
+#       hash        Function which returns a cryptographic dugest in binary form
+#       hmac        Function which calculates a Hashed Message Authentication
+#                   digest (HMAC) described in RFC 2104 in binary form
+#       password    User password
+#       salt        Random string used as a salt
+#       i           Number of iterations for password salting (assumed i>=1)
+#       auth_message Message which is to be hashed to get client and server
+#                    signatures
+#
+# Result:
+#       List of two binaries with client proof and server signature
+#
+# Side effects:
+#       None
+
+proc ::SASL::SCRAM::Algo {hash hmac password salt i auth_message} {
+    set salted_password [Hi $hmac $password $salt $i]
+    set client_key [$hmac $salted_password "Client Key"]
+    set stored_key [$hash $client_key]
+    set client_signature [$hmac $stored_key $auth_message]
+    set client_proof [Xor $client_key $client_signature]
+    set server_key [$hmac $salted_password "Server Key"]
+    set server_signature [$hmac $server_key $auth_message]
+    return [list $client_proof $server_signature]
+}
+
+# ::SASL::SCRAM::client --
+#
+#       Perform authentication step of the client part of SCRAM SASL
+#       procedure. It's an auxiliary procedure called from the callback
+#       registered with the SASL package
+#
+# Arguments:
+#       hash        Function which returns a cryptographic dugest in binary form
+#       hmac        Function which calculates a Hashed Message Authentication
+#                   digest (HMAC) described in RFC 2104 in binary form
+#       context     Array name which contains authentication state (in particular
+#                   step and response values)
+#       challenge   Input from the server
+#       args        Ignored rest of the arguments
+#
+# Result:
+#       1 if authentication is to be continued, 0 if it is finished with
+#       success, error if it is failed for some reason. ${context}(response)
+#       contains data to be sent to the server
+#
+# Side effects:
+#       The authzid, username, password are obtained using SASL callback.
+#       Step 1 uses data from step 0, and step 2 uses data from step 1
+#       (stored in the context array)
+#
+# Known bugs and limitations:
+#       1) The authzid, username and password aren't saslprepped
+#       2) There's no check for 'm' attribute (authentication must fail if it's
+#          present)
+#       3) There's no check if the server's nonce has the client's nonce as
+#          a prefix
+
+proc ::SASL::SCRAM::client {hash hmac context challenge args} {
+    upvar #0 $context ctx
+
+    switch -exact -- $ctx(step) {
+	0 {
+            # Initial message with username and random string
+
+            # authzid and username will be used also at step 1, so store them
+            set ctx(authzid) [encoding convertto utf-8 [eval $ctx(callback) [list $context login]]]
+            set ctx(username) [encoding convertto utf-8 [eval $ctx(callback) [list $context username]]]
+	    set ctx(nonce) [::SASL::CreateNonce]
+	    set ctx(response) [ClientFirstMessage $ctx(authzid) $ctx(username) $ctx(nonce)]
+	    incr ctx(step)
+	    return 1
+	}
+	1 {
+            # Final message with client proof calculated using the user's password
+
+            array set params [ParseChallenge $challenge]
+	    set password [encoding convertto utf-8 [eval $ctx(callback) [list $context password]]]
+            set final_message [ClientFinalMessageWithoutProof $ctx(authzid) $params(r)]
+            set auth_message "[ClientFirstMessageBare $ctx(username) $ctx(nonce)],$challenge,$final_message"
+	    foreach {proof signature} [Algo $hash $hmac $password [base64::decode $params(s)] $params(i) $auth_message] break
+            set ctx(signature) $signature
+	    set ctx(response) "$final_message,p=[base64::encode $proof]"
+	    incr ctx(step)
+	    return 1
+	}
+	2 {
+            # Check of the server's signature
+
+            array set params [ParseChallenge $challenge]
+            if {[info exists params(e)]} {
+                return -code error $params(e)
+            }
+            if {![string equal $ctx(signature) [base64::decode $params(v)]]} {
+                return -code error "invalid server signature"
+            }
+	    incr ctx(step)
+            return 0
+
+	}
+	default {
+	    return -code error "invalid state"
+	}
+    }
+}
+
+# ::SASL::SCRAM::server --
+#
+#       Perform authentication step of the server part of SCRAM SASL
+#       procedure. It's an auxiliary procedure called from the callback
+#       registered with the SASL package
+#
+# Arguments:
+#       hash        Function which returns a cryptographic dugest in binary form
+#       hmac        Function which calculates a Hashed Message Authentication
+#                   digest (HMAC) described in RFC 2104 in binary form
+#       context     Array name which contains authentication state (in particular
+#                   step and response values)
+#       clientrsp   Input from the client
+#       args        Ignored rest of the arguments
+#
+# Result:
+#       1 if authentication is to be continued, 0 if it is finished with
+#       success, error if it is failed for some reason. ${context}(response)
+#       contains data to be sent to the server
+#
+# Side effects:
+#       The authentication realm and password are obtained using SASL callback.
+#       Step 1 uses data from step 0 (stored in the context array)
+#
+# Known bugs and limitations:
+#       1) The server part needs to know the user's password (which violates the
+#          idea that server cannot impersonate client)
+#       2) The username and password aren't saslprepped
+#       3) There's no check for 'm' attribute (authentication must fail if it's
+#          present)
+#       4) There's no check if the encoded username contains unprotected =
+#       5) The authzid support is not implemented
+#       6) The channel binding option at step 1 is ignored
+
+proc ::SASL::SCRAM::server {hash hmac context clientrsp args} {
+    upvar #0 $context ctx
+
+    switch -exact -- $ctx(step) {
+	0 {
+            if {[string length $clientrsp] == 0} {
+                # Do not increase the step counter here and send an empty
+                # challenge because SCRAM is a client-first mechanism (section
+                # 5 of RFC-4422)
+                set ctx(response) ""
+                return 1
+            }
+
+            # Initial response with random string, salt and number of iterations
+
+            array set params [ParseChallenge $clientrsp]
+            if {![info exists params(cbind)]} {
+                return -code error "invalid header"
+            }
+            if {$params(cbind) == "p"} {
+                return -code error "channel binding is not supported"
+            }
+
+            set ctx(username) [encoding convertfrom utf-8 [Unmap $params(n)]]
+            set ctx(salt)     [::SASL::CreateNonce]
+            set ctx(nonce)    $params(r)[::SASL::CreateNonce]
+            set ctx(iter)     4096
+
+            # Store the bare client message for AuthMessage at step 1
+            regexp {^[^,]*,[^,]*,(.*)} $clientrsp -> ctx(message)
+
+	    set ctx(response) [ServerFirstMessage $ctx(nonce) $ctx(salt) $ctx(iter)]
+	    incr ctx(step)
+	    return 1
+	}
+	1 {
+            # Verification of the client's proof and response with the
+            # server's signature
+
+            array set params [ParseChallenge $clientrsp]
+            set realm [eval $ctx(callback) [list $context realm]]
+            set password [encoding convertto utf-8 [eval $ctx(callback) [list $context password $ctx(username) $realm]]]
+
+            # Remove proof to create AuthMessage
+            regexp {(.*),p=[^,]*$} $clientrsp -> final_message
+            set auth_message "$ctx(message),[ServerFirstMessage $ctx(nonce) $ctx(salt) $ctx(iter)],$final_message"
+	    foreach {proof signature} [Algo $hash $hmac $password $ctx(salt) $ctx(iter) $auth_message] break
+            if {![string equal $proof [base64::decode $params(p)]]} {
+                return -code error "authentication failed"
+            }
+	    set ctx(response) "v=[base64::encode $signature]"
+	    incr ctx(step)
+	    return 0
+	}
+	default {
+	    return -code error "invalid state"
+	}
+    }
+}
+
+# -------------------------------------------------------------------------
+# Provide the mandatory SCRAM-SHA-1 mechanism
+
+proc ::SASL::SCRAM::SHA-1:hash {str} {
+    sha1::sha1 -bin $str
+}
+
+proc ::SASL::SCRAM::SHA-1:hmac {key str} {
+    sha1::hmac -bin -key $key $str
+}
+
+proc ::SASL::SCRAM::SHA-1:client {context challenge args} {
+    client ::SASL::SCRAM::SHA-1:hash ::SASL::SCRAM::SHA-1:hmac $context $challenge
+}
+
+proc ::SASL::SCRAM::SHA-1:server {context clientrsp args} {
+    server ::SASL::SCRAM::SHA-1:hash ::SASL::SCRAM::SHA-1:hmac $context $clientrsp
+}
+
+# Register the SCRAM-SHA-1 SASL mechanism with the Tcllib SASL package
+
+::SASL::register SCRAM-SHA-1 50 ::SASL::SCRAM::SHA-1:client ::SASL::SCRAM::SHA-1:server
+
+# -------------------------------------------------------------------------
+
+package provide SASL::SCRAM 0.1
+
+# -------------------------------------------------------------------------
+#
+# Local variables:
+# indent-tabs-mode: nil
+# End:
+# vim:ts=8:sw=4:sts=4:et
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/pkgIndex.tcl
new file mode 100644
index 00000000..bc56d8e6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/pkgIndex.tcl
@@ -0,0 +1,15 @@
+# Tcl package index file, version 1.1
+# This file is generated by the "pkg_mkIndex" command
+# and sourced either when an application starts up or
+# by a "package unknown" script.  It invokes the
+# "package ifneeded" command to set up package-related
+# information so that packages will be loaded automatically
+# in response to "package require" commands.  When this
+# script is sourced, the variable $dir must contain the
+# full path name of this file's directory.
+
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded sha256 1.0.4 [list source [file join $dir sha256.tcl]]
+package ifneeded sha256c 1.0.4 [list source [file join $dir sha256c.tcl]]
+package ifneeded sha1   2.0.4 [list source [file join $dir sha1.tcl]]
+package ifneeded sha1   1.1.1 [list source [file join $dir sha1v1.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1.c b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1.c
new file mode 100644
index 00000000..14b1a753
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1.c
@@ -0,0 +1,267 @@
+/*	$NetBSD: sha1.c,v 1.3 2005/10/07 14:38:56 patthoyts Exp $	*/
+/*	$OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $	*/
+
+/*
+ * SHA-1 in C
+ * By Steve Reid <steve@edmweb.com>
+ * 100% Public Domain
+ *
+ * Test Vectors (from FIPS PUB 180-1)
+ * "abc"
+ *   A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+ * "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+ *   84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+ * A million repetitions of "a"
+ *   34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define SHA1HANDSOFF		/* Copies data before messing with it. */
+
+#include <assert.h>
+#include <string.h>
+#include "sha1.h"
+
+#ifndef TCL_BYTE_ORDER
+#error "-DTCL_BYTE_ORDER missing"
+#endif
+
+#ifndef _DIAGASSERT
+#define _DIAGASSERT(cond)	assert(cond)
+#endif
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/*
+ * blk0() and blk() perform the initial expand.
+ * I got the idea of expanding during the round function from SSLeay
+ */
+#if TCL_BYTE_ORDER==1234
+# define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+    |(rol(block->l[i],8)&0x00FF00FF))
+#else
+# define blk0(i) block->l[i]
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+    ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/*
+ * (R0+R1), R2, R3, R4 are the different operations (rounds) used in SHA1
+ */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+typedef union {
+    my_char    c[64];
+    my_int32_t l[16];
+} CHAR64LONG16;
+
+#ifdef __sparc_v9__
+void do_R01(my_int32_t *a, my_int32_t *b, my_int32_t *c, my_int32_t *d, my_int32_t *e, CHAR64LONG16 *);
+void do_R2(my_int32_t *a, my_int32_t *b, my_int32_t *c, my_int32_t *d, my_int32_t *e, CHAR64LONG16 *);
+void do_R3(my_int32_t *a, my_int32_t *b, my_int32_t *c, my_int32_t *d, my_int32_t *e, CHAR64LONG16 *);
+void do_R4(my_int32_t *a, my_int32_t *b, my_int32_t *c, my_int32_t *d, my_int32_t *e, CHAR64LONG16 *);
+
+#define nR0(v,w,x,y,z,i) R0(*v,*w,*x,*y,*z,i)
+#define nR1(v,w,x,y,z,i) R1(*v,*w,*x,*y,*z,i)
+#define nR2(v,w,x,y,z,i) R2(*v,*w,*x,*y,*z,i)
+#define nR3(v,w,x,y,z,i) R3(*v,*w,*x,*y,*z,i)
+#define nR4(v,w,x,y,z,i) R4(*v,*w,*x,*y,*z,i)
+
+void
+do_R01(my_int32_t *a, my_int32_t *b, my_int32_t *c, my_int32_t *d, my_int32_t *e, CHAR64LONG16 *block)
+{
+    nR0(a,b,c,d,e, 0); nR0(e,a,b,c,d, 1); nR0(d,e,a,b,c, 2); nR0(c,d,e,a,b, 3);
+    nR0(b,c,d,e,a, 4); nR0(a,b,c,d,e, 5); nR0(e,a,b,c,d, 6); nR0(d,e,a,b,c, 7);
+    nR0(c,d,e,a,b, 8); nR0(b,c,d,e,a, 9); nR0(a,b,c,d,e,10); nR0(e,a,b,c,d,11);
+    nR0(d,e,a,b,c,12); nR0(c,d,e,a,b,13); nR0(b,c,d,e,a,14); nR0(a,b,c,d,e,15);
+    nR1(e,a,b,c,d,16); nR1(d,e,a,b,c,17); nR1(c,d,e,a,b,18); nR1(b,c,d,e,a,19);
+}
+
+void
+do_R2(my_int32_t *a, my_int32_t *b, my_int32_t *c, my_int32_t *d, my_int32_t *e, CHAR64LONG16 *block)
+{
+    nR2(a,b,c,d,e,20); nR2(e,a,b,c,d,21); nR2(d,e,a,b,c,22); nR2(c,d,e,a,b,23);
+    nR2(b,c,d,e,a,24); nR2(a,b,c,d,e,25); nR2(e,a,b,c,d,26); nR2(d,e,a,b,c,27);
+    nR2(c,d,e,a,b,28); nR2(b,c,d,e,a,29); nR2(a,b,c,d,e,30); nR2(e,a,b,c,d,31);
+    nR2(d,e,a,b,c,32); nR2(c,d,e,a,b,33); nR2(b,c,d,e,a,34); nR2(a,b,c,d,e,35);
+    nR2(e,a,b,c,d,36); nR2(d,e,a,b,c,37); nR2(c,d,e,a,b,38); nR2(b,c,d,e,a,39);
+}
+
+void
+do_R3(my_int32_t *a, my_int32_t *b, my_int32_t *c, my_int32_t *d, my_int32_t *e, CHAR64LONG16 *block)
+{
+    nR3(a,b,c,d,e,40); nR3(e,a,b,c,d,41); nR3(d,e,a,b,c,42); nR3(c,d,e,a,b,43);
+    nR3(b,c,d,e,a,44); nR3(a,b,c,d,e,45); nR3(e,a,b,c,d,46); nR3(d,e,a,b,c,47);
+    nR3(c,d,e,a,b,48); nR3(b,c,d,e,a,49); nR3(a,b,c,d,e,50); nR3(e,a,b,c,d,51);
+    nR3(d,e,a,b,c,52); nR3(c,d,e,a,b,53); nR3(b,c,d,e,a,54); nR3(a,b,c,d,e,55);
+    nR3(e,a,b,c,d,56); nR3(d,e,a,b,c,57); nR3(c,d,e,a,b,58); nR3(b,c,d,e,a,59);
+}
+
+void
+do_R4(my_int32_t *a, my_int32_t *b, my_int32_t *c, my_int32_t *d, my_int32_t *e, CHAR64LONG16 *block)
+{
+    nR4(a,b,c,d,e,60); nR4(e,a,b,c,d,61); nR4(d,e,a,b,c,62); nR4(c,d,e,a,b,63);
+    nR4(b,c,d,e,a,64); nR4(a,b,c,d,e,65); nR4(e,a,b,c,d,66); nR4(d,e,a,b,c,67);
+    nR4(c,d,e,a,b,68); nR4(b,c,d,e,a,69); nR4(a,b,c,d,e,70); nR4(e,a,b,c,d,71);
+    nR4(d,e,a,b,c,72); nR4(c,d,e,a,b,73); nR4(b,c,d,e,a,74); nR4(a,b,c,d,e,75);
+    nR4(e,a,b,c,d,76); nR4(d,e,a,b,c,77); nR4(c,d,e,a,b,78); nR4(b,c,d,e,a,79);
+}
+#endif
+
+/*
+ * Hash a single 512-bit block. This is the core of the algorithm.
+ */
+void SHA1Transform(state, buffer)
+    my_int32_t state[5];
+    const my_char buffer[64];
+{
+    my_int32_t a, b, c, d, e;
+    CHAR64LONG16 *block;
+
+#ifdef SHA1HANDSOFF
+    CHAR64LONG16 workspace;
+#endif
+
+    _DIAGASSERT(buffer != 0);
+    _DIAGASSERT(state != 0);
+
+#ifdef SHA1HANDSOFF
+    block = &workspace;
+    (void)memcpy(block, buffer, 64);
+#else
+    block = (CHAR64LONG16 *)(void *)buffer;
+#endif
+
+    /* Copy context->state[] to working vars */
+    a = state[0];
+    b = state[1];
+    c = state[2];
+    d = state[3];
+    e = state[4];
+
+#ifdef __sparc_v9__
+    do_R01(&a, &b, &c, &d, &e, block);
+    do_R2(&a, &b, &c, &d, &e, block);
+    do_R3(&a, &b, &c, &d, &e, block);
+    do_R4(&a, &b, &c, &d, &e, block);
+#else
+    /* 4 rounds of 20 operations each. Loop unrolled. */
+    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+#endif
+
+    /* Add the working vars back into context.state[] */
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+    state[4] += e;
+
+    /* Wipe variables */
+    a = b = c = d = e = 0;
+}
+
+
+/*
+ * SHA1Init - Initialize new context
+ */
+void SHA1Init(context)
+    SHA1_CTX *context;
+{
+
+    _DIAGASSERT(context != 0);
+
+    /* SHA1 initialization constants */
+    context->state[0] = 0x67452301;
+    context->state[1] = 0xEFCDAB89;
+    context->state[2] = 0x98BADCFE;
+    context->state[3] = 0x10325476;
+    context->state[4] = 0xC3D2E1F0;
+    context->count[0] = context->count[1] = 0;
+}
+
+
+/*
+ * Run your data through this.
+ */
+void SHA1Update(context, data, len)
+    SHA1_CTX *context;
+    const my_char *data;
+    my_int32_t len;
+{
+    my_int32_t i, j;
+
+    _DIAGASSERT(context != 0);
+    _DIAGASSERT(data != 0);
+
+    j = context->count[0];
+    if ((context->count[0] += len << 3) < j)
+	context->count[1] += (len>>29)+1;
+    j = (j >> 3) & 63;
+    if ((j + len) > 63) {
+	(void)memcpy(&context->buffer[j], data, (i = 64-j));
+	SHA1Transform(context->state, context->buffer);
+	for ( ; i + 63 < len; i += 64)
+	    SHA1Transform(context->state, &data[i]);
+	j = 0;
+    } else {
+	i = 0;
+    }
+    (void)memcpy(&context->buffer[j], &data[i], len - i);
+}
+
+
+/*
+ * Add padding and return the message digest.
+ */
+void SHA1Final(digest, context)
+    my_char digest[20];
+    SHA1_CTX* context;
+{
+    my_int32_t i;
+    my_char finalcount[8];
+
+    _DIAGASSERT(digest != 0);
+    _DIAGASSERT(context != 0);
+
+    for (i = 0; i < 8; i++) {
+	finalcount[i] = (my_char)((context->count[(i >= 4 ? 0 : 1)]
+	 >> ((3-(i & 3)) * 8) ) & 255);	 /* Endian independent */
+    }
+    SHA1Update(context, (const my_char *)"\200", 1);
+    while ((context->count[0] & 504) != 448)
+	SHA1Update(context, (const my_char *)"\0", 1);
+    SHA1Update(context, finalcount, 8);  /* Should cause a SHA1Transform() */
+
+    if (digest) {
+	for (i = 0; i < 20; i++)
+	    digest[i] = (my_char)
+		((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1.h b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1.h
new file mode 100644
index 00000000..6156243c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1.h
@@ -0,0 +1,26 @@
+/*	$NetBSD: sha1.h,v 1.5 2006/10/02 23:42:08 patthoyts Exp $	*/
+
+/*
+ * SHA-1 in C
+ * By Steve Reid <steve@edmweb.com>
+ * 100% Public Domain
+ */
+
+#ifndef _SYS_SHA1_H_
+#define	_SYS_SHA1_H_
+
+typedef unsigned int  my_int32_t;
+typedef unsigned char my_char;
+
+typedef struct {
+	my_int32_t state[5];
+	my_int32_t count[2];  
+	my_char    buffer[64];
+} SHA1_CTX;
+  
+void	SHA1Transform(my_int32_t state[5], const my_char buffer[64]);
+void	SHA1Init(SHA1_CTX *context);
+void	SHA1Update(SHA1_CTX *context, const my_char *data, my_int32_t len);
+void	SHA1Final(my_char digest[20], SHA1_CTX *context);
+
+#endif /* _SYS_SHA1_H_ */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1.tcl
new file mode 100644
index 00000000..b2b3de40
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1.tcl
@@ -0,0 +1,814 @@
+# sha1.tcl - 
+#
+# Copyright (C) 2001 Don Libes <libes@nist.gov>
+# Copyright (C) 2003 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# SHA1 defined by FIPS 180-1, "The SHA1 Message-Digest Algorithm"
+# HMAC defined by RFC 2104, "Keyed-Hashing for Message Authentication"
+#
+# This is an implementation of SHA1 based upon the example code given in
+# FIPS 180-1 and upon the tcllib MD4 implementation and taking some ideas
+# and methods from the earlier tcllib sha1 version by Don Libes.
+#
+# This implementation permits incremental updating of the hash and 
+# provides support for external compiled implementations either using
+# critcl (sha1c) or Trf.
+#
+# ref: http://www.itl.nist.gov/fipspubs/fip180-1.htm
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+# @mdgen EXCLUDE: sha1c.tcl
+
+package require Tcl 8.2;                # tcl minimum version
+
+namespace eval ::sha1 {
+    variable  accel
+    array set accel {tcl 0 critcl 0 cryptkit 0 trf 0}
+
+    variable  loaded {}
+    variable  active
+    array set active {tcl 0 critcl 0 cryptkit 0 trf 0}
+
+    namespace export sha1 hmac SHA1Init SHA1Update SHA1Final
+
+    variable uid
+    if {![info exists uid]} {
+        set uid 0
+    }
+}
+
+# -------------------------------------------------------------------------
+# Management of sha1 implementations.
+
+# LoadAccelerator --
+#
+#	This package can make use of a number of compiled extensions to
+#	accelerate the digest computation. This procedure manages the
+#	use of these extensions within the package. During normal usage
+#	this should not be called, but the test package manipulates the
+#	list of enabled accelerators.
+#
+proc ::sha1::LoadAccelerator {name} {
+    variable accel
+    set r 0
+    switch -exact -- $name {
+        tcl {
+            # Already present (this file)
+            set r 1
+        }
+        critcl {
+            if {![catch {package require tcllibc}]
+                || ![catch {package require sha1c}]} {
+                set r [expr {[info commands ::sha1::sha1c] != {}}]
+            }
+        }
+        cryptkit {
+            if {![catch {package require cryptkit}]} {
+                set r [expr {![catch {cryptkit::cryptInit}]}]
+            }
+        }
+        trf {
+            if {![catch {package require Trf}]} {
+                set r [expr {![catch {::sha1 aa} msg]}]
+            }
+        }
+        default {
+            return -code error "invalid accelerator $key:\
+                must be one of [join [KnownImplementations] {, }]"
+        }
+    }
+    set accel($name) $r
+    return $r
+}
+
+# ::sha1::Implementations --
+#
+#	Determines which implementations are
+#	present, i.e. loaded.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys.
+
+proc ::sha1::Implementations {} {
+    variable accel
+    set res {}
+    foreach n [array names accel] {
+	if {!$accel($n)} continue
+	lappend res $n
+    }
+    return $res
+}
+
+# ::sha1::KnownImplementations --
+#
+#	Determines which implementations are known
+#	as possible implementations.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys. In the order
+#	of preference, most prefered first.
+
+proc ::sha1::KnownImplementations {} {
+    return {critcl cryptkit trf tcl}
+}
+
+proc ::sha1::Names {} {
+    return {
+	critcl   {tcllibc based}
+        cryptkit {cryptkit based}
+        trf      {Trf based}
+	tcl      {pure Tcl}
+    }
+}
+
+# ::sha1::SwitchTo --
+#
+#	Activates a loaded named implementation.
+#
+# Arguments:
+#	key	Name of the implementation to activate.
+#
+# Results:
+#	None.
+
+proc ::sha1::SwitchTo {key} {
+    variable accel
+    variable active
+    variable loaded
+
+    if {[string equal $key $loaded]} {
+	# No change, nothing to do.
+	return
+    } elseif {![string equal $key ""]} {
+	# Validate the target implementation of the switch.
+
+	if {![info exists accel($key)]} {
+	    return -code error "Unable to activate unknown implementation \"$key\""
+	} elseif {![info exists accel($key)] || !$accel($key)} {
+	    return -code error "Unable to activate missing implementation \"$key\""
+	}
+    }
+
+    if {![string equal $loaded ""]} {
+        set active($loaded) 0
+    }
+    if {![string equal $key ""]} {
+        set active($key) 1
+    }
+
+    # Remember the active implementation, for deactivation by future
+    # switches.
+
+    set loaded $key
+    return
+}
+
+# -------------------------------------------------------------------------
+
+# SHA1Init --
+#
+#   Create and initialize an SHA1 state variable. This will be
+#   cleaned up when we call SHA1Final
+#
+
+proc ::sha1::SHA1Init {} {
+    variable active
+    variable uid
+    set token [namespace current]::[incr uid]
+    upvar #0 $token state
+
+    # FIPS 180-1: 7 - Initialize the hash state
+    array set state \
+        [list \
+             A [expr {int(0x67452301)}] \
+             B [expr {int(0xEFCDAB89)}] \
+             C [expr {int(0x98BADCFE)}] \
+             D [expr {int(0x10325476)}] \
+             E [expr {int(0xC3D2E1F0)}] \
+             n 0 i "" ]
+    if {$active(cryptkit)} {
+        cryptkit::cryptCreateContext state(ckctx) CRYPT_UNUSED CRYPT_ALGO_SHA
+    } elseif {$active(trf)} {
+        set s {}
+        switch -exact -- $::tcl_platform(platform) {
+            windows { set s [open NUL w] }
+            unix    { set s [open /dev/null w] }
+        }
+        if {$s != {}} {
+            fconfigure $s -translation binary -buffering none
+            ::sha1 -attach $s -mode write \
+                -read-type variable \
+                -read-destination [subst $token](trfread) \
+                -write-type variable \
+                -write-destination [subst $token](trfwrite)
+            array set state [list trfread 0 trfwrite 0 trf $s]
+        }
+    }
+    return $token
+}
+
+# SHA1Update --
+#
+#   This is called to add more data into the hash. You may call this
+#   as many times as you require. Note that passing in "ABC" is equivalent
+#   to passing these letters in as separate calls -- hence this proc 
+#   permits hashing of chunked data
+#
+#   If we have a C-based implementation available, then we will use
+#   it here in preference to the pure-Tcl implementation.
+#
+proc ::sha1::SHA1Update {token data} {
+    variable active
+    upvar #0 $token state
+
+    if {$active(critcl)} {
+        if {[info exists state(sha1c)]} {
+            set state(sha1c) [sha1c $data $state(sha1c)]
+        } else {
+            set state(sha1c) [sha1c $data]
+        }
+        return
+    } elseif {[info exists state(ckctx)]} {
+        if {[string length $data] > 0} {
+            cryptkit::cryptEncrypt $state(ckctx) $data
+        }
+        return
+    } elseif {[info exists state(trf)]} {
+        puts -nonewline $state(trf) $data
+        return
+    }
+
+    # Update the state values
+    incr state(n) [string length $data]
+    append state(i) $data
+
+    # Calculate the hash for any complete blocks
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        SHA1Transform $token [string range $state(i) $n [incr n 64]]
+    }
+
+    # Adjust the state for the blocks completed.
+    set state(i) [string range $state(i) $n end]
+    return
+}
+
+# SHA1Final --
+#
+#    This procedure is used to close the current hash and returns the
+#    hash data. Once this procedure has been called the hash context
+#    is freed and cannot be used again.
+#
+#    Note that the output is 160 bits represented as binary data.
+#
+proc ::sha1::SHA1Final {token} {
+    upvar #0 $token state
+
+    # Check for either of the C-compiled versions.
+    if {[info exists state(sha1c)]} {
+        set r $state(sha1c)
+        unset state
+        return $r
+    } elseif {[info exists state(ckctx)]} {
+        cryptkit::cryptEncrypt $state(ckctx) ""
+        cryptkit::cryptGetAttributeString $state(ckctx) \
+            CRYPT_CTXINFO_HASHVALUE r 20
+        cryptkit::cryptDestroyContext $state(ckctx)
+        # If nothing was hashed, we get no r variable set!
+        if {[info exists r]} {
+            unset state
+            return $r
+        }
+    } elseif {[info exists state(trf)]} {
+        close $state(trf)
+        set r $state(trfwrite)
+        unset state
+        return $r
+    }
+
+    # Padding
+    #
+    set len [string length $state(i)]
+    set pad [expr {56 - ($len % 64)}]
+    if {$len % 64 > 56} {
+        incr pad 64
+    }
+    if {$pad == 0} {
+        incr pad 64
+    }
+    append state(i) [binary format a$pad \x80]
+
+    # Append length in bits as big-endian wide int.
+    set dlen [expr {8 * $state(n)}]
+    append state(i) [binary format II 0 $dlen]
+
+    # Calculate the hash for the remaining block.
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        SHA1Transform $token [string range $state(i) $n [incr n 64]]
+    }
+
+    # Output
+    set r [bytes $state(A)][bytes $state(B)][bytes $state(C)][bytes $state(D)][bytes $state(E)]
+    unset state
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# HMAC Hashed Message Authentication (RFC 2104)
+#
+# hmac = H(K xor opad, H(K xor ipad, text))
+#
+
+# HMACInit --
+#
+#    This is equivalent to the SHA1Init procedure except that a key is
+#    added into the algorithm
+#
+proc ::sha1::HMACInit {K} {
+
+    # Key K is adjusted to be 64 bytes long. If K is larger, then use
+    # the SHA1 digest of K and pad this instead.
+    set len [string length $K]
+    if {$len > 64} {
+        set tok [SHA1Init]
+        SHA1Update $tok $K
+        set K [SHA1Final $tok]
+        set len [string length $K]
+    }
+    set pad [expr {64 - $len}]
+    append K [string repeat \0 $pad]
+
+    # Cacluate the padding buffers.
+    set Ki {}
+    set Ko {}
+    binary scan $K i16 Ks
+    foreach k $Ks {
+        append Ki [binary format i [expr {$k ^ 0x36363636}]]
+        append Ko [binary format i [expr {$k ^ 0x5c5c5c5c}]]
+    }
+
+    set tok [SHA1Init]
+    SHA1Update $tok $Ki;                 # initialize with the inner pad
+    
+    # preserve the Ko value for the final stage.
+    # FRINK: nocheck
+    set [subst $tok](Ko) $Ko
+
+    return $tok
+}
+
+# HMACUpdate --
+#
+#    Identical to calling SHA1Update
+#
+proc ::sha1::HMACUpdate {token data} {
+    SHA1Update $token $data
+    return
+}
+
+# HMACFinal --
+#
+#    This is equivalent to the SHA1Final procedure. The hash context is
+#    closed and the binary representation of the hash result is returned.
+#
+proc ::sha1::HMACFinal {token} {
+    upvar #0 $token state
+
+    set tok [SHA1Init];                 # init the outer hashing function
+    SHA1Update $tok $state(Ko);         # prepare with the outer pad.
+    SHA1Update $tok [SHA1Final $token]; # hash the inner result
+    return [SHA1Final $tok]
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  This is the core SHA1 algorithm. It is a lot like the MD4 algorithm but
+#  includes an extra round and a set of constant modifiers throughout.
+#
+set ::sha1::SHA1Transform_body {
+    upvar #0 $token state
+
+    # FIPS 180-1: 7a: Process Message in 16-Word Blocks
+    binary scan $msg I* blocks
+    set blockLen [llength $blocks]
+    for {set i 0} {$i < $blockLen} {incr i 16} {
+        set W [lrange $blocks $i [expr {$i+15}]]
+        
+        # FIPS 180-1: 7b: Expand the input into 80 words
+        # For t = 16 to 79 
+        #   let Wt = (Wt-3 ^ Wt-8 ^ Wt-14 ^ Wt-16) <<< 1
+        set t3  12
+        set t8   7
+        set t14  1
+        set t16 -1
+        for {set t 16} {$t < 80} {incr t} {
+            set x [expr {[lindex $W [incr t3]] ^ [lindex $W [incr t8]] ^ \
+                             [lindex $W [incr t14]] ^ [lindex $W [incr t16]]}]
+            lappend W [expr {int(($x << 1) | (($x >> 31) & 1))}]
+        }
+        
+        # FIPS 180-1: 7c: Copy hash state.
+        set A $state(A)
+        set B $state(B)
+        set C $state(C)
+        set D $state(D)
+        set E $state(E)
+
+        # FIPS 180-1: 7d: Do permutation rounds
+        # For t = 0 to 79 do
+        #   TEMP = (A<<<5) + ft(B,C,D) + E + Wt + Kt;
+        #   E = D; D = C; C = S30(B); B = A; A = TEMP;
+
+        # Round 1: ft(B,C,D) = (B & C) | (~B & D) ( 0 <= t <= 19)
+        for {set t 0} {$t < 20} {incr t} {
+            set TEMP [F1 $A $B $C $D $E [lindex $W $t]]
+            set E $D
+            set D $C
+            set C [rotl32 $B 30]
+            set B $A
+            set A $TEMP
+        }
+
+        # Round 2: ft(B,C,D) = (B ^ C ^ D) ( 20 <= t <= 39)
+        for {} {$t < 40} {incr t} {
+            set TEMP [F2 $A $B $C $D $E [lindex $W $t]]
+            set E $D
+            set D $C
+            set C [rotl32 $B 30]
+            set B $A
+            set A $TEMP
+        }
+
+        # Round 3: ft(B,C,D) = ((B & C) | (B & D) | (C & D)) ( 40 <= t <= 59)
+        for {} {$t < 60} {incr t} {
+            set TEMP [F3 $A $B $C $D $E [lindex $W $t]]
+            set E $D
+            set D $C
+            set C [rotl32 $B 30]
+            set B $A
+            set A $TEMP
+         }
+
+        # Round 4: ft(B,C,D) = (B ^ C ^ D) ( 60 <= t <= 79)
+        for {} {$t < 80} {incr t} {
+            set TEMP [F4 $A $B $C $D $E [lindex $W $t]]
+            set E $D
+            set D $C
+            set C [rotl32 $B 30]
+            set B $A
+            set A $TEMP
+        }
+
+        # Then perform the following additions. (That is, increment each
+        # of the four registers by the value it had before this block
+        # was started.)
+        incr state(A) $A
+        incr state(B) $B
+        incr state(C) $C
+        incr state(D) $D
+        incr state(E) $E
+    }
+
+    return
+}
+
+proc ::sha1::F1 {A B C D E W} {
+    expr {(((($A << 5) & 0xffffffff) | (($A >> 27) & 0x1f)) \
+               + ($D ^ ($B & ($C ^ $D))) + $E + $W + 0x5a827999) & 0xffffffff}
+}
+
+proc ::sha1::F2 {A B C D E W} {
+    expr {(((($A << 5) & 0xffffffff) | (($A >> 27) & 0x1f)) \
+               + ($B ^ $C ^ $D) + $E + $W + 0x6ed9eba1) & 0xffffffff}
+}
+
+proc ::sha1::F3 {A B C D E W} {
+    expr {(((($A << 5) & 0xffffffff)| (($A >> 27) & 0x1f)) \
+               + (($B & $C) | ($D & ($B | $C))) + $E + $W + 0x8f1bbcdc) & 0xffffffff}
+}
+
+proc ::sha1::F4 {A B C D E W} {
+    expr {(((($A << 5) & 0xffffffff)| (($A >> 27) & 0x1f)) \
+               + ($B ^ $C ^ $D) + $E + $W + 0xca62c1d6) & 0xffffffff}
+}
+
+proc ::sha1::rotl32 {v n} {
+    return [expr {((($v << $n) \
+                        | (($v >> (32 - $n)) \
+                               & (0x7FFFFFFF >> (31 - $n))))) \
+                      & 0xFFFFFFFF}]
+}
+
+
+# -------------------------------------------------------------------------
+# 
+# In order to get this code to go as fast as possible while leaving
+# the main code readable we can substitute the above function bodies
+# into the transform procedure. This inlines the code for us an avoids
+# a procedure call overhead within the loops.
+#
+# We can do some minor tweaking to improve speed on Tcl < 8.5 where we
+# know our arithmetic is limited to 64 bits. On > 8.5 we may have 
+# unconstrained integer arithmetic and must avoid letting it run away.
+#
+
+regsub -all -line \
+    {\[F1 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body \
+    {[expr {(rotl32($A,5) + ($D ^ ($B \& ($C ^ $D))) + $E + \1 + 0x5a827999) \& 0xffffffff}]} \
+    ::sha1::SHA1Transform_body_tmp
+
+regsub -all -line \
+    {\[F2 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body_tmp \
+    {[expr {(rotl32($A,5) + ($B ^ $C ^ $D) + $E + \1 + 0x6ed9eba1) \& 0xffffffff}]} \
+    ::sha1::SHA1Transform_body_tmp
+
+regsub -all -line \
+    {\[F3 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body_tmp \
+    {[expr {(rotl32($A,5) + (($B \& $C) | ($D \& ($B | $C))) + $E + \1 + 0x8f1bbcdc) \& 0xffffffff}]} \
+    ::sha1::SHA1Transform_body_tmp
+
+regsub -all -line \
+    {\[F4 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body_tmp \
+    {[expr {(rotl32($A,5) + ($B ^ $C ^ $D) + $E + \1 + 0xca62c1d6) \& 0xffffffff}]} \
+    ::sha1::SHA1Transform_body_tmp
+
+regsub -all -line \
+    {rotl32\(\$A,5\)} \
+    $::sha1::SHA1Transform_body_tmp \
+    {((($A << 5) \& 0xffffffff) | (($A >> 27) \& 0x1f))} \
+    ::sha1::SHA1Transform_body_tmp
+
+regsub -all -line \
+    {\[rotl32 \$B 30\]} \
+    $::sha1::SHA1Transform_body_tmp \
+    {[expr {int(($B << 30) | (($B >> 2) \& 0x3fffffff))}]} \
+    ::sha1::SHA1Transform_body_tmp
+#
+# Version 2 avoids a few truncations to 32 bits in non-essential places.
+#
+regsub -all -line \
+    {\[F1 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body \
+    {[expr {rotl32($A,5) + ($D ^ ($B \& ($C ^ $D))) + $E + \1 + 0x5a827999}]} \
+    ::sha1::SHA1Transform_body_tmp2
+
+regsub -all -line \
+    {\[F2 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body_tmp2 \
+    {[expr {rotl32($A,5) + ($B ^ $C ^ $D) + $E + \1 + 0x6ed9eba1}]} \
+    ::sha1::SHA1Transform_body_tmp2
+
+regsub -all -line \
+    {\[F3 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body_tmp2 \
+    {[expr {rotl32($A,5) + (($B \& $C) | ($D \& ($B | $C))) + $E + \1 + 0x8f1bbcdc}]} \
+    ::sha1::SHA1Transform_body_tmp2
+
+regsub -all -line \
+    {\[F4 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body_tmp2 \
+    {[expr {rotl32($A,5) + ($B ^ $C ^ $D) + $E + \1 + 0xca62c1d6}]} \
+    ::sha1::SHA1Transform_body_tmp2
+
+regsub -all -line \
+    {rotl32\(\$A,5\)} \
+    $::sha1::SHA1Transform_body_tmp2 \
+    {(($A << 5) | (($A >> 27) \& 0x1f))} \
+    ::sha1::SHA1Transform_body_tmp2
+
+regsub -all -line \
+    {\[rotl32 \$B 30\]} \
+    $::sha1::SHA1Transform_body_tmp2 \
+    {[expr {($B << 30) | (($B >> 2) \& 0x3fffffff)}]} \
+    ::sha1::SHA1Transform_body_tmp2
+
+if {[package vsatisfies [package provide Tcl] 8.5]} {
+    proc ::sha1::SHA1Transform {token msg} $::sha1::SHA1Transform_body_tmp
+} else {
+    proc ::sha1::SHA1Transform {token msg} $::sha1::SHA1Transform_body_tmp2
+}
+
+unset ::sha1::SHA1Transform_body
+unset ::sha1::SHA1Transform_body_tmp
+unset ::sha1::SHA1Transform_body_tmp2
+
+# -------------------------------------------------------------------------
+
+proc ::sha1::byte {n v} {expr {((0xFF << (8 * $n)) & $v) >> (8 * $n)}}
+proc ::sha1::bytes {v} { 
+    #format %c%c%c%c [byte 0 $v] [byte 1 $v] [byte 2 $v] [byte 3 $v]
+    format %c%c%c%c \
+        [expr {((0xFF000000 & $v) >> 24) & 0xFF}] \
+        [expr {(0xFF0000 & $v) >> 16}] \
+        [expr {(0xFF00 & $v) >> 8}] \
+        [expr {0xFF & $v}]
+}
+
+# -------------------------------------------------------------------------
+
+proc ::sha1::Hex {data} {
+    binary scan $data H* result
+    return $result
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::sha1::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# fileevent handler for chunked file hashing.
+#
+proc ::sha1::Chunk {token channel {chunksize 4096}} {
+    upvar #0 $token state
+    
+    SHA1Update $token [read $channel $chunksize]
+
+    if {[eof $channel]} {
+        fileevent $channel readable {}
+        set state(reading) 0
+    }
+    return
+}
+
+# -------------------------------------------------------------------------
+
+proc ::sha1::sha1 {args} {
+    array set opts {-hex 0 -filename {} -channel {} -chunksize 4096}
+    if {[llength $args] == 1} {
+        set opts(-hex) 1
+    } else {
+        while {[string match -* [set option [lindex $args 0]]]} {
+            switch -glob -- $option {
+                -hex       { set opts(-hex) 1 }
+                -bin       { set opts(-hex) 0 }
+                -file*     { set opts(-filename) [Pop args 1] }
+                -channel   { set opts(-channel) [Pop args 1] }
+                -chunksize { set opts(-chunksize) [Pop args 1] }
+                default {
+                    if {[llength $args] == 1} { break }
+                    if {[string compare $option "--"] == 0} { Pop args; break }
+                    set err [join [lsort [concat -bin [array names opts]]] ", "]
+                    return -code error "bad option $option:\
+                    must be one of $err"
+                }
+            }
+            Pop args
+        }
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"sha1 ?-hex? -filename file | string\""
+        }
+        set tok [SHA1Init]
+        SHA1Update $tok [lindex $args 0]
+        set r [SHA1Final $tok]
+
+    } else {
+
+        set tok [SHA1Init]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        # FRINK: nocheck
+        vwait [subst $tok](reading)
+        set r [SHA1Final $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+proc ::sha1::hmac {args} {
+    array set opts {-hex 1 -filename {} -channel {} -chunksize 4096}
+    if {[llength $args] != 2} {
+        while {[string match -* [set option [lindex $args 0]]]} {
+            switch -glob -- $option {
+                -key       { set opts(-key) [Pop args 1] }
+                -hex       { set opts(-hex) 1 }
+                -bin       { set opts(-hex) 0 }
+                -file*     { set opts(-filename) [Pop args 1] }
+                -channel   { set opts(-channel) [Pop args 1] }
+                -chunksize { set opts(-chunksize) [Pop args 1] }
+                default {
+                    if {[llength $args] == 1} { break }
+                    if {[string compare $option "--"] == 0} { Pop args; break }
+                    set err [join [lsort [array names opts]] ", "]
+                    return -code error "bad option $option:\
+                    must be one of $err"
+                }
+            }
+            Pop args
+        }
+    }
+
+    if {[llength $args] == 2} {
+        set opts(-key) [Pop args]
+    }
+
+    if {![info exists opts(-key)]} {
+        return -code error "wrong # args:\
+            should be \"hmac ?-hex? -key key -filename file | string\""
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"hmac ?-hex? -key key -filename file | string\""
+        }
+        set tok [HMACInit $opts(-key)]
+        HMACUpdate $tok [lindex $args 0]
+        set r [HMACFinal $tok]
+
+    } else {
+
+        set tok [HMACInit $opts(-key)]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        # FRINK: nocheck
+        vwait [subst $tok](reading)
+        set r [HMACFinal $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# Try and load a compiled extension to help.
+namespace eval ::sha1 {
+    variable e {}
+    foreach e [KnownImplementations] {
+	if {[LoadAccelerator $e]} {
+	    SwitchTo $e
+	    break
+	}
+    }
+    unset e
+}
+
+package provide sha1 2.0.4
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1c.tcl
new file mode 100644
index 00000000..5f0f07ee
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1c.tcl
@@ -0,0 +1,125 @@
+# sha1c.tcl - Copyright (C) 2005 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# Wrapper for the Secure Hashing Algorithm (SHA1)
+#
+# $Id: sha1c.tcl,v 1.6 2009/05/07 00:35:10 patthoyts Exp $
+
+package require critcl;                 # needs critcl
+# @sak notprovided sha1c
+package provide sha1c 2.0.3
+
+critcl::cheaders sha1.h;                # NetBSD SHA1 implementation
+critcl::csources sha1.c;                # NetBSD SHA1 implementation
+
+if {$tcl_platform(byteOrder) eq "littleEndian"} {
+    set byteOrder 1234
+} else {
+    set byteOrder 4321
+}
+critcl::cflags -DTCL_BYTE_ORDER=$byteOrder
+
+namespace eval ::sha1 {
+
+    critcl::ccode {
+        #include "sha1.h"
+        #include <stdlib.h>
+        #include <string.h>
+        #include <assert.h>
+        
+        static
+        Tcl_ObjType sha1_type; /* fast internal access representation */
+        
+        static void 
+        sha1_free_rep(Tcl_Obj* obj)
+        {
+            SHA1_CTX* mp = (SHA1_CTX*) obj->internalRep.otherValuePtr;
+            Tcl_Free ((char*)mp);
+        }
+        
+        static void
+        sha1_dup_rep(Tcl_Obj* obj, Tcl_Obj* dup)
+        {
+            SHA1_CTX* mp = (SHA1_CTX*) obj->internalRep.otherValuePtr;
+            dup->internalRep.otherValuePtr = Tcl_Alloc(sizeof *mp);
+            memcpy(dup->internalRep.otherValuePtr, mp, sizeof *mp);
+            dup->typePtr = &sha1_type;
+        }
+        
+        static void
+        sha1_string_rep(Tcl_Obj* obj)
+        {
+            unsigned char buf[20];
+            Tcl_Obj* temp;
+            char* str;
+            SHA1_CTX dup = *(SHA1_CTX*) obj->internalRep.otherValuePtr;
+            
+            SHA1Final(buf, &dup);
+            
+            /* convert via a byte array to properly handle null bytes */
+            temp = Tcl_NewByteArrayObj(buf, sizeof buf);
+            Tcl_IncrRefCount(temp);
+            
+            str = Tcl_GetStringFromObj(temp, &obj->length);
+            obj->bytes = Tcl_Alloc(obj->length + 1);
+            memcpy(obj->bytes, str, obj->length + 1);
+            
+            Tcl_DecrRefCount(temp);
+        }
+        
+        static int
+        sha1_from_any(Tcl_Interp* ip, Tcl_Obj* obj)
+        {
+            assert(0);
+            return TCL_ERROR;
+        }
+        
+        static
+        Tcl_ObjType sha1_type = {
+            "sha1c", sha1_free_rep, sha1_dup_rep, sha1_string_rep,
+            sha1_from_any
+        };
+    }
+    
+    critcl::ccommand sha1c {dummy ip objc objv} {
+        SHA1_CTX* mp;
+        unsigned char* data;
+        int size;
+        Tcl_Obj* obj;
+        
+        if (objc < 2 || objc > 3) {
+            Tcl_WrongNumArgs(ip, 1, objv, "data ?context?");
+            return TCL_ERROR;
+        }
+        
+        if (objc == 3) {
+            if (objv[2]->typePtr != &sha1_type 
+                && sha1_from_any(ip, objv[2]) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            obj = objv[2];
+            if (Tcl_IsShared(obj)) {
+                obj = Tcl_DuplicateObj(obj);
+            }
+        } else {
+            obj = Tcl_NewObj();
+            mp = (SHA1_CTX*) Tcl_Alloc(sizeof *mp);
+            SHA1Init(mp);
+            
+            if (obj->typePtr != NULL && obj->typePtr->freeIntRepProc != NULL) {
+                obj->typePtr->freeIntRepProc(obj);
+            }
+            
+            obj->internalRep.otherValuePtr = mp;
+            obj->typePtr = &sha1_type;
+        }
+        
+        Tcl_InvalidateStringRep(obj);
+
+        mp = (SHA1_CTX*) obj->internalRep.otherValuePtr;
+        data = Tcl_GetByteArrayFromObj(objv[1], &size);
+        SHA1Update(mp, data, size);
+
+        Tcl_SetObjResult(ip, obj);
+        return TCL_OK;
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1v1.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1v1.tcl
new file mode 100644
index 00000000..ea2c94f1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha1v1.tcl
@@ -0,0 +1,710 @@
+# sha1.tcl - 
+#
+# Copyright (C) 2001 Don Libes <libes@nist.gov>
+# Copyright (C) 2003 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# SHA1 defined by FIPS 180-1, "The SHA1 Message-Digest Algorithm"
+# HMAC defined by RFC 2104, "Keyed-Hashing for Message Authentication"
+#
+# This is an implementation of SHA1 based upon the example code given in
+# FIPS 180-1 and upon the tcllib MD4 implementation and taking some ideas
+# and methods from the earlier tcllib sha1 version by Don Libes.
+#
+# This implementation permits incremental updating of the hash and 
+# provides support for external compiled implementations either using
+# critcl (sha1c) or Trf.
+#
+# ref: http://www.itl.nist.gov/fipspubs/fip180-1.htm
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+# @mdgen EXCLUDE: sha1c.tcl
+
+package require Tcl 8.2;                # tcl minimum version
+
+namespace eval ::sha1 {
+    variable  accel
+    array set accel {critcl 0 cryptkit 0 trf 0}
+
+    namespace export sha1 hmac SHA1Init SHA1Update SHA1Final
+
+    variable uid
+    if {![info exists uid]} {
+        set uid 0
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# SHA1Init --
+#
+#   Create and initialize an SHA1 state variable. This will be
+#   cleaned up when we call SHA1Final
+#
+proc ::sha1::SHA1Init {} {
+    variable accel
+    variable uid
+    set token [namespace current]::[incr uid]
+    upvar #0 $token state
+
+    # FIPS 180-1: 7 - Initialize the hash state
+    array set state \
+        [list \
+             A [expr {int(0x67452301)}] \
+             B [expr {int(0xEFCDAB89)}] \
+             C [expr {int(0x98BADCFE)}] \
+             D [expr {int(0x10325476)}] \
+             E [expr {int(0xC3D2E1F0)}] \
+             n 0 i "" ]
+    if {$accel(cryptkit)} {
+        cryptkit::cryptCreateContext state(ckctx) CRYPT_UNUSED CRYPT_ALGO_SHA
+    } elseif {$accel(trf)} {
+        set s {}
+        switch -exact -- $::tcl_platform(platform) {
+            windows { set s [open NUL w] }
+            unix    { set s [open /dev/null w] }
+        }
+        if {$s != {}} {
+            fconfigure $s -translation binary -buffering none
+            ::sha1 -attach $s -mode write \
+                -read-type variable \
+                -read-destination [subst $token](trfread) \
+                -write-type variable \
+                -write-destination [subst $token](trfwrite)
+            array set state [list trfread 0 trfwrite 0 trf $s]
+        }
+    }
+    return $token
+}
+
+# SHA1Update --
+#
+#   This is called to add more data into the hash. You may call this
+#   as many times as you require. Note that passing in "ABC" is equivalent
+#   to passing these letters in as separate calls -- hence this proc 
+#   permits hashing of chunked data
+#
+#   If we have a C-based implementation available, then we will use
+#   it here in preference to the pure-Tcl implementation.
+#
+proc ::sha1::SHA1Update {token data} {
+    variable accel
+    upvar #0 $token state
+
+    if {$accel(critcl)} {
+        if {[info exists state(sha1c)]} {
+            set state(sha1c) [sha1c $data $state(sha1c)]
+        } else {
+            set state(sha1c) [sha1c $data]
+        }
+        return
+    } elseif {[info exists state(ckctx)]} {
+        if {[string length $data] > 0} {
+            cryptkit::cryptEncrypt $state(ckctx) $data
+        }
+        return
+    } elseif {[info exists state(trf)]} {
+        puts -nonewline $state(trf) $data
+        return
+    }
+
+    # Update the state values
+    incr state(n) [string length $data]
+    append state(i) $data
+
+    # Calculate the hash for any complete blocks
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        SHA1Transform $token [string range $state(i) $n [incr n 64]]
+    }
+
+    # Adjust the state for the blocks completed.
+    set state(i) [string range $state(i) $n end]
+    return
+}
+
+# SHA1Final --
+#
+#    This procedure is used to close the current hash and returns the
+#    hash data. Once this procedure has been called the hash context
+#    is freed and cannot be used again.
+#
+#    Note that the output is 160 bits represented as binary data.
+#
+proc ::sha1::SHA1Final {token} {
+    upvar #0 $token state
+
+    # Check for either of the C-compiled versions.
+    if {[info exists state(sha1c)]} {
+        set r $state(sha1c)
+        unset state
+        return $r
+    } elseif {[info exists state(ckctx)]} {
+        cryptkit::cryptEncrypt $state(ckctx) ""
+        cryptkit::cryptGetAttributeString $state(ckctx) \
+            CRYPT_CTXINFO_HASHVALUE r 20
+        cryptkit::cryptDestroyContext $state(ckctx)
+        # If nothing was hashed, we get no r variable set!
+        if {[info exists r]} {
+            unset state
+            return $r
+        }
+    } elseif {[info exists state(trf)]} {
+        close $state(trf)
+        set r $state(trfwrite)
+        unset state
+        return $r
+    }
+
+    # Padding
+    #
+    set len [string length $state(i)]
+    set pad [expr {56 - ($len % 64)}]
+    if {$len % 64 > 56} {
+        incr pad 64
+    }
+    if {$pad == 0} {
+        incr pad 64
+    }
+    append state(i) [binary format a$pad \x80]
+
+    # Append length in bits as big-endian wide int.
+    set dlen [expr {8 * $state(n)}]
+    append state(i) [binary format II 0 $dlen]
+
+    # Calculate the hash for the remaining block.
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        SHA1Transform $token [string range $state(i) $n [incr n 64]]
+    }
+
+    # Output
+    set r [bytes $state(A)][bytes $state(B)][bytes $state(C)][bytes $state(D)][bytes $state(E)]
+    unset state
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# HMAC Hashed Message Authentication (RFC 2104)
+#
+# hmac = H(K xor opad, H(K xor ipad, text))
+#
+
+# HMACInit --
+#
+#    This is equivalent to the SHA1Init procedure except that a key is
+#    added into the algorithm
+#
+proc ::sha1::HMACInit {K} {
+
+    # Key K is adjusted to be 64 bytes long. If K is larger, then use
+    # the SHA1 digest of K and pad this instead.
+    set len [string length $K]
+    if {$len > 64} {
+        set tok [SHA1Init]
+        SHA1Update $tok $K
+        set K [SHA1Final $tok]
+        set len [string length $K]
+    }
+    set pad [expr {64 - $len}]
+    append K [string repeat \0 $pad]
+
+    # Cacluate the padding buffers.
+    set Ki {}
+    set Ko {}
+    binary scan $K i16 Ks
+    foreach k $Ks {
+        append Ki [binary format i [expr {$k ^ 0x36363636}]]
+        append Ko [binary format i [expr {$k ^ 0x5c5c5c5c}]]
+    }
+
+    set tok [SHA1Init]
+    SHA1Update $tok $Ki;                 # initialize with the inner pad
+    
+    # preserve the Ko value for the final stage.
+    # FRINK: nocheck
+    set [subst $tok](Ko) $Ko
+
+    return $tok
+}
+
+# HMACUpdate --
+#
+#    Identical to calling SHA1Update
+#
+proc ::sha1::HMACUpdate {token data} {
+    SHA1Update $token $data
+    return
+}
+
+# HMACFinal --
+#
+#    This is equivalent to the SHA1Final procedure. The hash context is
+#    closed and the binary representation of the hash result is returned.
+#
+proc ::sha1::HMACFinal {token} {
+    upvar #0 $token state
+
+    set tok [SHA1Init];                 # init the outer hashing function
+    SHA1Update $tok $state(Ko);         # prepare with the outer pad.
+    SHA1Update $tok [SHA1Final $token]; # hash the inner result
+    return [SHA1Final $tok]
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  This is the core SHA1 algorithm. It is a lot like the MD4 algorithm but
+#  includes an extra round and a set of constant modifiers throughout.
+#
+set ::sha1::SHA1Transform_body {
+    upvar #0 $token state
+
+    # FIPS 180-1: 7a: Process Message in 16-Word Blocks
+    binary scan $msg I* blocks
+    set blockLen [llength $blocks]
+    for {set i 0} {$i < $blockLen} {incr i 16} {
+        set W [lrange $blocks $i [expr {$i+15}]]
+        
+        # FIPS 180-1: 7b: Expand the input into 80 words
+        # For t = 16 to 79 
+        #   let Wt = (Wt-3 ^ Wt-8 ^ Wt-14 ^ Wt-16) <<< 1
+        set t3  12
+        set t8   7
+        set t14  1
+        set t16 -1
+        for {set t 16} {$t < 80} {incr t} {
+            set x [expr {[lindex $W [incr t3]] ^ [lindex $W [incr t8]] ^ \
+                             [lindex $W [incr t14]] ^ [lindex $W [incr t16]]}]
+            lappend W [expr {int(($x << 1) | (($x >> 31) & 1))}]
+        }
+        
+        # FIPS 180-1: 7c: Copy hash state.
+        set A $state(A)
+        set B $state(B)
+        set C $state(C)
+        set D $state(D)
+        set E $state(E)
+
+        # FIPS 180-1: 7d: Do permutation rounds
+        # For t = 0 to 79 do
+        #   TEMP = (A<<<5) + ft(B,C,D) + E + Wt + Kt;
+        #   E = D; D = C; C = S30(B); B = A; A = TEMP;
+
+        # Round 1: ft(B,C,D) = (B & C) | (~B & D) ( 0 <= t <= 19)
+        for {set t 0} {$t < 20} {incr t} {
+            set TEMP [F1 $A $B $C $D $E [lindex $W $t]]
+            set E $D
+            set D $C
+            set C [rotl32 $B 30]
+            set B $A
+            set A $TEMP
+        }
+
+        # Round 2: ft(B,C,D) = (B ^ C ^ D) ( 20 <= t <= 39)
+        for {} {$t < 40} {incr t} {
+            set TEMP [F2 $A $B $C $D $E [lindex $W $t]]
+            set E $D
+            set D $C
+            set C [rotl32 $B 30]
+            set B $A
+            set A $TEMP
+        }
+
+        # Round 3: ft(B,C,D) = ((B & C) | (B & D) | (C & D)) ( 40 <= t <= 59)
+        for {} {$t < 60} {incr t} {
+            set TEMP [F3 $A $B $C $D $E [lindex $W $t]]
+            set E $D
+            set D $C
+            set C [rotl32 $B 30]
+            set B $A
+            set A $TEMP
+         }
+
+        # Round 4: ft(B,C,D) = (B ^ C ^ D) ( 60 <= t <= 79)
+        for {} {$t < 80} {incr t} {
+            set TEMP [F4 $A $B $C $D $E [lindex $W $t]]
+            set E $D
+            set D $C
+            set C [rotl32 $B 30]
+            set B $A
+            set A $TEMP
+        }
+
+        # Then perform the following additions. (That is, increment each
+        # of the four registers by the value it had before this block
+        # was started.)
+        incr state(A) $A
+        incr state(B) $B
+        incr state(C) $C
+        incr state(D) $D
+        incr state(E) $E
+    }
+
+    return
+}
+
+proc ::sha1::F1 {A B C D E W} {
+    expr {(((($A << 5) & 0xffffffff) | (($A >> 27) & 0x1f)) \
+               + ($D ^ ($B & ($C ^ $D))) + $E + $W + 0x5a827999) & 0xffffffff}
+}
+
+proc ::sha1::F2 {A B C D E W} {
+    expr {(((($A << 5) & 0xffffffff) | (($A >> 27) & 0x1f)) \
+               + ($B ^ $C ^ $D) + $E + $W + 0x6ed9eba1) & 0xffffffff}
+}
+
+proc ::sha1::F3 {A B C D E W} {
+    expr {(((($A << 5) & 0xffffffff)| (($A >> 27) & 0x1f)) \
+               + (($B & $C) | ($D & ($B | $C))) + $E + $W + 0x8f1bbcdc) & 0xffffffff}
+}
+
+proc ::sha1::F4 {A B C D E W} {
+    expr {(((($A << 5) & 0xffffffff)| (($A >> 27) & 0x1f)) \
+               + ($B ^ $C ^ $D) + $E + $W + 0xca62c1d6) & 0xffffffff}
+}
+
+proc ::sha1::rotl32 {v n} {
+    return [expr {((($v << $n) \
+                        | (($v >> (32 - $n)) \
+                               & (0x7FFFFFFF >> (31 - $n))))) \
+                      & 0xFFFFFFFF}]
+}
+
+
+# -------------------------------------------------------------------------
+# 
+# In order to get this code to go as fast as possible while leaving
+# the main code readable we can substitute the above function bodies
+# into the transform procedure. This inlines the code for us an avoids
+# a procedure call overhead within the loops.
+#
+# We can do some minor tweaking to improve speed on Tcl < 8.5 where we
+# know our arithmetic is limited to 64 bits. On > 8.5 we may have 
+# unconstrained integer arithmetic and must avoid letting it run away.
+#
+
+regsub -all -line \
+    {\[F1 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body \
+    {[expr {(rotl32($A,5) + ($D ^ ($B \& ($C ^ $D))) + $E + \1 + 0x5a827999) \& 0xffffffff}]} \
+    ::sha1::SHA1Transform_body_tmp
+
+regsub -all -line \
+    {\[F2 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body_tmp \
+    {[expr {(rotl32($A,5) + ($B ^ $C ^ $D) + $E + \1 + 0x6ed9eba1) \& 0xffffffff}]} \
+    ::sha1::SHA1Transform_body_tmp
+
+regsub -all -line \
+    {\[F3 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body_tmp \
+    {[expr {(rotl32($A,5) + (($B \& $C) | ($D \& ($B | $C))) + $E + \1 + 0x8f1bbcdc) \& 0xffffffff}]} \
+    ::sha1::SHA1Transform_body_tmp
+
+regsub -all -line \
+    {\[F4 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body_tmp \
+    {[expr {(rotl32($A,5) + ($B ^ $C ^ $D) + $E + \1 + 0xca62c1d6) \& 0xffffffff}]} \
+    ::sha1::SHA1Transform_body_tmp
+
+regsub -all -line \
+    {rotl32\(\$A,5\)} \
+    $::sha1::SHA1Transform_body_tmp \
+    {((($A << 5) \& 0xffffffff) | (($A >> 27) \& 0x1f))} \
+    ::sha1::SHA1Transform_body_tmp
+
+regsub -all -line \
+    {\[rotl32 \$B 30\]} \
+    $::sha1::SHA1Transform_body_tmp \
+    {[expr {int(($B << 30) | (($B >> 2) \& 0x3fffffff))}]} \
+    ::sha1::SHA1Transform_body_tmp
+#
+# Version 2 avoids a few truncations to 32 bits in non-essential places.
+#
+regsub -all -line \
+    {\[F1 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body \
+    {[expr {rotl32($A,5) + ($D ^ ($B \& ($C ^ $D))) + $E + \1 + 0x5a827999}]} \
+    ::sha1::SHA1Transform_body_tmp2
+
+regsub -all -line \
+    {\[F2 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body_tmp2 \
+    {[expr {rotl32($A,5) + ($B ^ $C ^ $D) + $E + \1 + 0x6ed9eba1}]} \
+    ::sha1::SHA1Transform_body_tmp2
+
+regsub -all -line \
+    {\[F3 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body_tmp2 \
+    {[expr {rotl32($A,5) + (($B \& $C) | ($D \& ($B | $C))) + $E + \1 + 0x8f1bbcdc}]} \
+    ::sha1::SHA1Transform_body_tmp2
+
+regsub -all -line \
+    {\[F4 \$A \$B \$C \$D \$E (\[.*?\])\]} \
+    $::sha1::SHA1Transform_body_tmp2 \
+    {[expr {rotl32($A,5) + ($B ^ $C ^ $D) + $E + \1 + 0xca62c1d6}]} \
+    ::sha1::SHA1Transform_body_tmp2
+
+regsub -all -line \
+    {rotl32\(\$A,5\)} \
+    $::sha1::SHA1Transform_body_tmp2 \
+    {(($A << 5) | (($A >> 27) \& 0x1f))} \
+    ::sha1::SHA1Transform_body_tmp2
+
+regsub -all -line \
+    {\[rotl32 \$B 30\]} \
+    $::sha1::SHA1Transform_body_tmp2 \
+    {[expr {($B << 30) | (($B >> 2) \& 0x3fffffff)}]} \
+    ::sha1::SHA1Transform_body_tmp2
+
+if {[package vsatisfies [package provide Tcl] 8.5]} {
+    proc ::sha1::SHA1Transform {token msg} $::sha1::SHA1Transform_body_tmp
+} else {
+    proc ::sha1::SHA1Transform {token msg} $::sha1::SHA1Transform_body_tmp2
+}
+
+unset ::sha1::SHA1Transform_body_tmp
+unset ::sha1::SHA1Transform_body_tmp2
+
+# -------------------------------------------------------------------------
+
+proc ::sha1::byte {n v} {expr {((0xFF << (8 * $n)) & $v) >> (8 * $n)}}
+proc ::sha1::bytes {v} { 
+    #format %c%c%c%c [byte 0 $v] [byte 1 $v] [byte 2 $v] [byte 3 $v]
+    format %c%c%c%c \
+        [expr {((0xFF000000 & $v) >> 24) & 0xFF}] \
+        [expr {(0xFF0000 & $v) >> 16}] \
+        [expr {(0xFF00 & $v) >> 8}] \
+        [expr {0xFF & $v}]
+}
+
+# -------------------------------------------------------------------------
+
+proc ::sha1::Hex {data} {
+    binary scan $data H* result
+    return $result
+}
+
+# -------------------------------------------------------------------------
+
+# LoadAccelerator --
+#
+#	This package can make use of a number of compiled extensions to
+#	accelerate the digest computation. This procedure manages the
+#	use of these extensions within the package. During normal usage
+#	this should not be called, but the test package manipulates the
+#	list of enabled accelerators.
+#
+proc ::sha1::LoadAccelerator {name} {
+    variable accel
+    set r 0
+    switch -exact -- $name {
+        critcl {
+            if {![catch {package require tcllibc}]
+                || ![catch {package require sha1c}]} {
+                set r [expr {[info commands ::sha1::sha1c] != {}}]
+            }
+        }
+        cryptkit {
+            if {![catch {package require cryptkit}]} {
+                set r [expr {![catch {cryptkit::cryptInit}]}]
+            }
+        }
+        trf {
+            if {![catch {package require Trf}]} {
+                set r [expr {![catch {::sha1 aa} msg]}]
+            }
+        }
+        default {
+            return -code error "invalid accelerator package:\
+                must be one of [join [array names accel] {, }]"
+        }
+    }
+    set accel($name) $r
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::sha1::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# fileevent handler for chunked file hashing.
+#
+proc ::sha1::Chunk {token channel {chunksize 4096}} {
+    upvar #0 $token state
+    
+    if {[eof $channel]} {
+        fileevent $channel readable {}
+        set state(reading) 0
+    }
+        
+    SHA1Update $token [read $channel $chunksize]
+}
+
+# -------------------------------------------------------------------------
+
+proc ::sha1::sha1 {args} {
+    array set opts {-hex 0 -filename {} -channel {} -chunksize 4096}
+    if {[llength $args] == 1} {
+        set opts(-hex) 1
+    } else {
+        while {[string match -* [set option [lindex $args 0]]]} {
+            switch -glob -- $option {
+                -hex       { set opts(-hex) 1 }
+                -bin       { set opts(-hex) 0 }
+                -file*     { set opts(-filename) [Pop args 1] }
+                -channel   { set opts(-channel) [Pop args 1] }
+                -chunksize { set opts(-chunksize) [Pop args 1] }
+                default {
+                    if {[llength $args] == 1} { break }
+                    if {[string compare $option "--"] == 0} { Pop args; break }
+                    set err [join [lsort [concat -bin [array names opts]]] ", "]
+                    return -code error "bad option $option:\
+                    must be one of $err"
+                }
+            }
+            Pop args
+        }
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"sha1 ?-hex? -filename file | string\""
+        }
+        set tok [SHA1Init]
+        SHA1Update $tok [lindex $args 0]
+        set r [SHA1Final $tok]
+
+    } else {
+
+        set tok [SHA1Init]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        # FRINK: nocheck
+        vwait [subst $tok](reading)
+        set r [SHA1Final $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+proc ::sha1::hmac {args} {
+    array set opts {-hex 1 -filename {} -channel {} -chunksize 4096}
+    if {[llength $args] != 2} {
+        while {[string match -* [set option [lindex $args 0]]]} {
+            switch -glob -- $option {
+                -key       { set opts(-key) [Pop args 1] }
+                -hex       { set opts(-hex) 1 }
+                -bin       { set opts(-hex) 0 }
+                -file*     { set opts(-filename) [Pop args 1] }
+                -channel   { set opts(-channel) [Pop args 1] }
+                -chunksize { set opts(-chunksize) [Pop args 1] }
+                default {
+                    if {[llength $args] == 1} { break }
+                    if {[string compare $option "--"] == 0} { Pop args; break }
+                    set err [join [lsort [array names opts]] ", "]
+                    return -code error "bad option $option:\
+                    must be one of $err"
+                }
+            }
+            Pop args
+        }
+    }
+
+    if {[llength $args] == 2} {
+        set opts(-key) [Pop args]
+    }
+
+    if {![info exists opts(-key)]} {
+        return -code error "wrong # args:\
+            should be \"hmac ?-hex? -key key -filename file | string\""
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"hmac ?-hex? -key key -filename file | string\""
+        }
+        set tok [HMACInit $opts(-key)]
+        HMACUpdate $tok [lindex $args 0]
+        set r [HMACFinal $tok]
+
+    } else {
+
+        set tok [HMACInit $opts(-key)]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        # FRINK: nocheck
+        vwait [subst $tok](reading)
+        set r [HMACFinal $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# Try and load a compiled extension to help.
+namespace eval ::sha1 {
+    variable e {}
+    foreach e {critcl cryptkit trf} { if {[LoadAccelerator $e]} { break } }
+    unset e
+}
+
+package provide sha1 1.1.1
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
+
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha256.c b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha256.c
new file mode 100644
index 00000000..ec5d1d01
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha256.c
@@ -0,0 +1,524 @@
+/*-
+ * Copyright (c) 2001, 2002 Allan Saddi <allan@saddi.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$Id: sha256.c,v 1.3 2007/03/25 11:33:41 patthoyts Exp $
+ */
+
+/*
+ * Define WORDS_BIGENDIAN if compiling on a big-endian architecture.
+ *
+ * Define SHA256_TEST to test the implementation using the NIST's
+ * sample messages. The output should be:
+ *
+ *   ba7816bf 8f01cfea 414140de 5dae2223 b00361a3 96177a9c b410ff61 f20015ad
+ *   248d6a61 d20638b8 e5c02693 0c3e6039 a33ce459 64ff2167 f6ecedd4 19db06c1
+ *   cdc76e5c 9914fb92 81a1c7e2 84d73e67 f1809a48 a497200e 046d39cc c7112cd0
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "sha256.h"
+
+#ifndef lint
+static const char rcsid[] =
+	"$Id: sha256.c,v 1.3 2007/03/25 11:33:41 patthoyts Exp $";
+#endif /* !lint */
+
+#ifndef TCL_BYTE_ORDER
+#error "-DTCL_BYTE_ORDER missing"
+#endif
+
+#if TCL_BYTE_ORDER==1234
+#else
+#define WORDS_BIGENDIAN
+#endif
+
+
+#define ROTL(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
+#define ROTR(x, n) (((x) >> (n)) | ((x) << (32 - (n))))
+
+#define Ch(x, y, z) ((z) ^ ((x) & ((y) ^ (z))))
+#define Maj(x, y, z) (((x) & ((y) | (z))) | ((y) & (z)))
+#define SIGMA0(x) (ROTR((x), 2) ^ ROTR((x), 13) ^ ROTR((x), 22))
+#define SIGMA1(x) (ROTR((x), 6) ^ ROTR((x), 11) ^ ROTR((x), 25))
+#define sigma0(x) (ROTR((x), 7) ^ ROTR((x), 18) ^ ((x) >> 3))
+#define sigma1(x) (ROTR((x), 17) ^ ROTR((x), 19) ^ ((x) >> 10))
+
+#define DO_ROUND() { \
+  t1 = h + SIGMA1(e) + Ch(e, f, g) + *(Kp++) + *(W++); \
+  t2 = SIGMA0(a) + Maj(a, b, c); \
+  h = g; \
+  g = f; \
+  f = e; \
+  e = d + t1; \
+  d = c; \
+  c = b; \
+  b = a; \
+  a = t1 + t2; \
+}
+
+static const uint32_t K[64] = {
+  0x428a2f98L, 0x71374491L, 0xb5c0fbcfL, 0xe9b5dba5L,
+  0x3956c25bL, 0x59f111f1L, 0x923f82a4L, 0xab1c5ed5L,
+  0xd807aa98L, 0x12835b01L, 0x243185beL, 0x550c7dc3L,
+  0x72be5d74L, 0x80deb1feL, 0x9bdc06a7L, 0xc19bf174L,
+  0xe49b69c1L, 0xefbe4786L, 0x0fc19dc6L, 0x240ca1ccL,
+  0x2de92c6fL, 0x4a7484aaL, 0x5cb0a9dcL, 0x76f988daL,
+  0x983e5152L, 0xa831c66dL, 0xb00327c8L, 0xbf597fc7L,
+  0xc6e00bf3L, 0xd5a79147L, 0x06ca6351L, 0x14292967L,
+  0x27b70a85L, 0x2e1b2138L, 0x4d2c6dfcL, 0x53380d13L,
+  0x650a7354L, 0x766a0abbL, 0x81c2c92eL, 0x92722c85L,
+  0xa2bfe8a1L, 0xa81a664bL, 0xc24b8b70L, 0xc76c51a3L,
+  0xd192e819L, 0xd6990624L, 0xf40e3585L, 0x106aa070L,
+  0x19a4c116L, 0x1e376c08L, 0x2748774cL, 0x34b0bcb5L,
+  0x391c0cb3L, 0x4ed8aa4aL, 0x5b9cca4fL, 0x682e6ff3L,
+  0x748f82eeL, 0x78a5636fL, 0x84c87814L, 0x8cc70208L,
+  0x90befffaL, 0xa4506cebL, 0xbef9a3f7L, 0xc67178f2L
+};
+
+#ifndef RUNTIME_ENDIAN
+#ifdef WORDS_BIGENDIAN
+
+#define BYTESWAP(x) (x)
+#define BYTESWAP64(x) (x)
+
+#else /* !WORDS_BIGENDIAN */
+
+#define BYTESWAP(x) ((ROTR((x), 8) & 0xff00ff00L) | \
+		     (ROTL((x), 8) & 0x00ff00ffL))
+
+#define BYTESWAP64(x) _byteswap64(x)
+
+static
+#ifndef _MSC_VER
+ inline
+#endif
+uint64_t _byteswap64(uint64_t x)
+{
+  uint32_t a = x >> 32;
+  uint32_t b = (uint32_t) x;
+  return ((uint64_t) BYTESWAP(b) << 32) | (uint64_t) BYTESWAP(a);
+}
+
+#endif /* WORDS_BIGENDIAN */
+#else /* !RUNTIME_ENDIAN */
+
+static int littleEndian;
+
+#define BYTESWAP(x) _byteswap(x)
+#define BYTESWAP64(x) _byteswap64(x)
+
+#define _BYTESWAP(x) ((ROTR((x), 8) & 0xff00ff00L) | \
+		      (ROTL((x), 8) & 0x00ff00ffL))
+#define _BYTESWAP64(x) __byteswap64(x)
+
+static inline uint64_t __byteswap64(uint64_t x)
+{
+  uint32_t a = x >> 32;
+  uint32_t b = (uint32_t) x;
+  return ((uint64_t) _BYTESWAP(b) << 32) | (uint64_t) _BYTESWAP(a);
+}
+
+static inline uint32_t _byteswap(uint32_t x)
+{
+  if (!littleEndian)
+    return x;
+  else
+    return _BYTESWAP(x);
+}
+
+static inline uint64_t _byteswap64(uint64_t x)
+{
+  if (!littleEndian)
+    return x;
+  else
+    return _BYTESWAP64(x);
+}
+
+static inline void setEndian(void)
+{
+  union {
+    uint32_t w;
+    uint8_t b[4];
+  } endian;
+
+  endian.w = 1L;
+  littleEndian = endian.b[0] != 0;
+}
+
+#endif /* !RUNTIME_ENDIAN */
+
+static const uint8_t padding[64] = {
+  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+void
+SHA256Init (SHA256Context *sc)
+{
+#ifdef RUNTIME_ENDIAN
+  setEndian ();
+#endif /* RUNTIME_ENDIAN */
+
+  sc->totalLength = 0;
+  sc->hash[0] = 0x6a09e667;
+  sc->hash[1] = 0xbb67ae85;
+  sc->hash[2] = 0x3c6ef372;
+  sc->hash[3] = 0xa54ff53a;
+  sc->hash[4] = 0x510e527f;
+  sc->hash[5] = 0x9b05688c;
+  sc->hash[6] = 0x1f83d9ab;
+  sc->hash[7] = 0x5be0cd19;
+  sc->bufferLength = 0;
+}
+
+void
+SHA224Init (SHA256Context *sc)
+{
+#ifdef RUNTIME_ENDIAN
+  setEndian ();
+#endif /* RUNTIME_ENDIAN */
+
+  sc->totalLength = 0;
+  sc->hash[0] = 0xc1059ed8;
+  sc->hash[1] = 0x367cd507;
+  sc->hash[2] = 0x3070dd17;
+  sc->hash[3] = 0xf70e5939;
+  sc->hash[4] = 0xffc00b31;
+  sc->hash[5] = 0x68581511;
+  sc->hash[6] = 0x64f98fa7;
+  sc->hash[7] = 0xbefa4fa4;
+  sc->bufferLength = 0;
+}
+
+static void
+burnStack (int size)
+{
+  char buf[128];
+
+  memset (buf, 0, sizeof (buf));
+  size -= sizeof (buf);
+  if (size > 0)
+    burnStack (size);
+}
+
+static void
+SHA256Guts (SHA256Context *sc, const uint32_t *cbuf)
+{
+  uint32_t buf[64];
+  uint32_t *W, *W2, *W7, *W15, *W16;
+  uint32_t a, b, c, d, e, f, g, h;
+  uint32_t t1, t2;
+  const uint32_t *Kp;
+  int i;
+
+  W = buf;
+
+  for (i = 15; i >= 0; i--) {
+    *(W++) = BYTESWAP(*cbuf);
+    cbuf++;
+  }
+
+  W16 = &buf[0];
+  W15 = &buf[1];
+  W7 = &buf[9];
+  W2 = &buf[14];
+
+  for (i = 47; i >= 0; i--) {
+    *(W++) = sigma1(*W2) + *(W7++) + sigma0(*W15) + *(W16++);
+    W2++;
+    W15++;
+  }
+
+  a = sc->hash[0];
+  b = sc->hash[1];
+  c = sc->hash[2];
+  d = sc->hash[3];
+  e = sc->hash[4];
+  f = sc->hash[5];
+  g = sc->hash[6];
+  h = sc->hash[7];
+
+  Kp = K;
+  W = buf;
+
+#ifndef SHA256_UNROLL
+#define SHA256_UNROLL 1
+#endif /* !SHA256_UNROLL */
+
+#if SHA256_UNROLL == 1
+  for (i = 63; i >= 0; i--)
+    DO_ROUND();
+#elif SHA256_UNROLL == 2
+  for (i = 31; i >= 0; i--) {
+    DO_ROUND(); DO_ROUND();
+  }
+#elif SHA256_UNROLL == 4
+  for (i = 15; i >= 0; i--) {
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  }
+#elif SHA256_UNROLL == 8
+  for (i = 7; i >= 0; i--) {
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  }
+#elif SHA256_UNROLL == 16
+  for (i = 3; i >= 0; i--) {
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  }
+#elif SHA256_UNROLL == 32
+  for (i = 1; i >= 0; i--) {
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  }
+#elif SHA256_UNROLL == 64
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
+#else
+#error "SHA256_UNROLL must be 1, 2, 4, 8, 16, 32, or 64!"
+#endif
+
+  sc->hash[0] += a;
+  sc->hash[1] += b;
+  sc->hash[2] += c;
+  sc->hash[3] += d;
+  sc->hash[4] += e;
+  sc->hash[5] += f;
+  sc->hash[6] += g;
+  sc->hash[7] += h;
+}
+
+void
+SHA256Update (SHA256Context *sc, const void *data, uint32_t len)
+{
+  uint32_t bufferBytesLeft;
+  uint32_t bytesToCopy;
+  int needBurn = 0;
+
+  /* gcc 4 complains that the following construction has an invalid lvalue:
+   *   ((uint8_t *) data) += bytesToCopy;
+   * apparently they have decided that assigment to cast values is a bad idea
+   * so we have to do the cast now as a work around -- assholes.
+   */
+  uint8_t *dataPtr = (uint8_t *)data;
+
+#ifdef SHA256_FAST_COPY
+  if (sc->bufferLength) {
+    bufferBytesLeft = 64L - sc->bufferLength;
+
+    bytesToCopy = bufferBytesLeft;
+    if (bytesToCopy > len)
+      bytesToCopy = len;
+
+    memcpy (&sc->buffer.bytes[sc->bufferLength], dataPtr, bytesToCopy);
+
+    sc->totalLength += bytesToCopy * 8L;
+
+    sc->bufferLength += bytesToCopy;
+    dataPtr += bytesToCopy;
+    len -= bytesToCopy;
+
+    if (sc->bufferLength == 64L) {
+      SHA256Guts (sc, sc->buffer.words);
+      needBurn = 1;
+      sc->bufferLength = 0L;
+    }
+  }
+
+  while (len > 63L) {
+    sc->totalLength += 512L;
+
+    SHA256Guts (sc, dataPtr);
+    needBurn = 1;
+
+    dataPtr += 64L;
+    len -= 64L;
+  }
+
+  if (len) {
+    memcpy (&sc->buffer.bytes[sc->bufferLength], dataPtr, len);
+
+    sc->totalLength += len * 8L;
+
+    sc->bufferLength += len;
+  }
+#else /* SHA256_FAST_COPY */
+  while (len) {
+    bufferBytesLeft = 64L - sc->bufferLength;
+
+    bytesToCopy = bufferBytesLeft;
+    if (bytesToCopy > len)
+      bytesToCopy = len;
+
+    memcpy (&sc->buffer.bytes[sc->bufferLength], dataPtr, bytesToCopy);
+
+    sc->totalLength += bytesToCopy * 8L;
+
+    sc->bufferLength += bytesToCopy;
+
+    dataPtr += bytesToCopy;
+    len -= bytesToCopy;
+
+    if (sc->bufferLength == 64L) {
+      SHA256Guts (sc, sc->buffer.words);
+      needBurn = 1;
+      sc->bufferLength = 0L;
+    }
+  }
+#endif /* SHA256_FAST_COPY */
+
+  if (needBurn)
+    burnStack (sizeof (uint32_t[74]) + sizeof (uint32_t *[6]) + sizeof (int));
+}
+
+void
+SHA256Final (
+SHA256Context *sc, uint8_t hash[SHA256_HASH_SIZE])
+{
+  uint32_t bytesToPad;
+  uint64_t lengthPad;
+  int i;
+
+  bytesToPad = 120L - sc->bufferLength;
+  if (bytesToPad > 64L)
+    bytesToPad -= 64L;
+
+  lengthPad = BYTESWAP64(sc->totalLength);
+
+  SHA256Update (sc, padding, bytesToPad);
+  SHA256Update (sc, &lengthPad, 8L);
+
+  if (hash) {
+    for (i = 0; i < SHA256_HASH_WORDS; i++) {
+#ifdef SHA256_FAST_COPY
+      *((uint32_t *) hash) = BYTESWAP(sc->hash[i]);
+#else /* SHA256_FAST_COPY */
+      hash[0] = (uint8_t) (sc->hash[i] >> 24);
+      hash[1] = (uint8_t) (sc->hash[i] >> 16);
+      hash[2] = (uint8_t) (sc->hash[i] >> 8);
+      hash[3] = (uint8_t) sc->hash[i];
+#endif /* SHA256_FAST_COPY */
+      hash += 4;
+    }
+  }
+}
+
+#ifdef SHA256_TEST
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int
+main (int argc, char *argv[])
+{
+  SHA256Context foo;
+  uint8_t hash[SHA256_HASH_SIZE];
+  char buf[1000];
+  int i;
+
+  SHA256Init (&foo);
+  SHA256Update (&foo, "abc", 3);
+  SHA256Final (&foo, hash);
+
+  for (i = 0; i < SHA256_HASH_SIZE;) {
+    printf ("%02x", hash[i++]);
+    if (!(i % 4))
+      printf (" ");
+  }
+  printf ("\n");
+
+  SHA256Init (&foo);
+  SHA256Update (&foo,
+		"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+		56);
+  SHA256Final (&foo, hash);
+
+  for (i = 0; i < SHA256_HASH_SIZE;) {
+    printf ("%02x", hash[i++]);
+    if (!(i % 4))
+      printf (" ");
+  }
+  printf ("\n");
+
+  SHA256Init (&foo);
+  memset (buf, 'a', sizeof (buf));
+  for (i = 0; i < 1000; i++)
+    SHA256Update (&foo, buf, sizeof (buf));
+  SHA256Final (&foo, hash);
+
+  for (i = 0; i < SHA256_HASH_SIZE;) {
+    printf ("%02x", hash[i++]);
+    if (!(i % 4))
+      printf (" ");
+  }
+  printf ("\n");
+
+  exit (0);
+}
+
+#endif /* SHA256_TEST */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha256.h b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha256.h
new file mode 100644
index 00000000..b361ff5f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha256.h
@@ -0,0 +1,88 @@
+/*-
+ * Copyright (c) 2001, 2002 Allan Saddi <allan@saddi.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$Id: sha256.h,v 1.4 2011/04/21 17:51:55 andreas_kupries Exp $
+ */
+
+#ifndef _SHA256_H
+#define _SHA256_H
+
+/*
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+*/
+# include <stdint.h>
+
+#define SHA256_HASH_SIZE 32
+
+/* Hash size in 32-bit words */
+#define SHA256_HASH_WORDS 8
+
+/*
+#ifdef _MSC_VER
+typedef unsigned __int64    uint64_t;
+#elif !(defined(__hpux) || defined(_AIX))
+typedef unsigned long long  uint64_t;
+#endif
+*/
+
+#if !(defined(__hpux))
+typedef unsigned int        uint32_t;
+typedef unsigned char       uint8_t;
+#endif
+
+struct _SHA256Context {
+  uint64_t totalLength;
+  uint32_t hash[SHA256_HASH_WORDS];
+  uint32_t bufferLength;
+  union {
+    uint32_t words[16];
+    uint8_t bytes[64];
+  } buffer;
+};
+
+typedef struct _SHA256Context SHA256Context;
+typedef struct _SHA256Context SHA256_CTX;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void SHA256Init (SHA256Context *sc);
+void SHA256Update (SHA256Context *sc, const void *data, uint32_t len);
+void SHA256Final (SHA256Context *sc, uint8_t hash[SHA256_HASH_SIZE]);
+
+void SHA224Init (SHA256Context *sc);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !_SHA256_H */
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha256.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha256.tcl
new file mode 100644
index 00000000..efa0fc14
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha256.tcl
@@ -0,0 +1,833 @@
+# sha256.tcl - Copyright (C) 2005 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# SHA1 defined by FIPS 180-2, "The Secure Hash Standard"
+# HMAC defined by RFC 2104, "Keyed-Hashing for Message Authentication"
+#
+# This is an implementation of the secure hash algorithms specified in the
+# FIPS 180-2 document.
+#
+# This implementation permits incremental updating of the hash and 
+# provides support for external compiled implementations using critcl.
+#
+# This implementation permits incremental updating of the hash and 
+# provides support for external compiled implementations either using
+# critcl (sha256c).
+#
+# Ref: http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
+#      http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf
+#
+# -------------------------------------------------------------------------
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# -------------------------------------------------------------------------
+# @mdgen EXCLUDE: sha256c.tcl
+
+package require Tcl 8.2;                # tcl minimum version
+
+namespace eval ::sha2 {
+    variable  accel
+    array set accel {tcl 0 critcl 0}
+    variable  loaded {}
+
+    namespace export sha256 hmac \
+            SHA256Init SHA256Update SHA256Final
+
+
+    variable uid
+    if {![info exists uid]} {
+        set uid 0
+    }
+
+    variable K
+    if {![info exists K]} {
+        # FIPS 180-2: 4.2.2 SHA-256 constants
+        set K [list \
+                   0x428a2f98 0x71374491 0xb5c0fbcf 0xe9b5dba5 \
+                   0x3956c25b 0x59f111f1 0x923f82a4 0xab1c5ed5 \
+                   0xd807aa98 0x12835b01 0x243185be 0x550c7dc3 \
+                   0x72be5d74 0x80deb1fe 0x9bdc06a7 0xc19bf174 \
+                   0xe49b69c1 0xefbe4786 0x0fc19dc6 0x240ca1cc \
+                   0x2de92c6f 0x4a7484aa 0x5cb0a9dc 0x76f988da \
+                   0x983e5152 0xa831c66d 0xb00327c8 0xbf597fc7 \
+                   0xc6e00bf3 0xd5a79147 0x06ca6351 0x14292967 \
+                   0x27b70a85 0x2e1b2138 0x4d2c6dfc 0x53380d13 \
+                   0x650a7354 0x766a0abb 0x81c2c92e 0x92722c85 \
+                   0xa2bfe8a1 0xa81a664b 0xc24b8b70 0xc76c51a3 \
+                   0xd192e819 0xd6990624 0xf40e3585 0x106aa070 \
+                   0x19a4c116 0x1e376c08 0x2748774c 0x34b0bcb5 \
+                   0x391c0cb3 0x4ed8aa4a 0x5b9cca4f 0x682e6ff3 \
+                   0x748f82ee 0x78a5636f 0x84c87814 0x8cc70208 \
+                   0x90befffa 0xa4506ceb 0xbef9a3f7 0xc67178f2 \
+                  ]
+    }
+    
+}
+
+# -------------------------------------------------------------------------
+# Management of sha256 implementations.
+
+# LoadAccelerator --
+#
+#	This package can make use of a number of compiled extensions to
+#	accelerate the digest computation. This procedure manages the
+#	use of these extensions within the package. During normal usage
+#	this should not be called, but the test package manipulates the
+#	list of enabled accelerators.
+#
+proc ::sha2::LoadAccelerator {name} {
+    variable accel
+    set r 0
+    switch -exact -- $name {
+        tcl {
+            # Already present (this file)
+            set r 1
+        }
+        critcl {
+            if {![catch {package require tcllibc}]
+                || ![catch {package require sha256c}]} {
+                set r [expr {[info commands ::sha2::sha256c_update] != {}}]
+            }
+        }
+        default {
+            return -code error "invalid accelerator $key:\
+                must be one of [join [KnownImplementations] {, }]"
+        }
+    }
+    set accel($name) $r
+    return $r
+}
+
+# ::sha2::Implementations --
+#
+#	Determines which implementations are
+#	present, i.e. loaded.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys.
+
+proc ::sha2::Implementations {} {
+    variable accel
+    set res {}
+    foreach n [array names accel] {
+	if {!$accel($n)} continue
+	lappend res $n
+    }
+    return $res
+}
+
+# ::sha2::KnownImplementations --
+#
+#	Determines which implementations are known
+#	as possible implementations.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys. In the order
+#	of preference, most prefered first.
+
+proc ::sha2::KnownImplementations {} {
+    return {critcl tcl}
+}
+
+proc ::sha2::Names {} {
+    return {
+	critcl   {tcllibc based}
+	tcl      {pure Tcl}
+    }
+}
+
+# ::sha2::SwitchTo --
+#
+#	Activates a loaded named implementation.
+#
+# Arguments:
+#	key	Name of the implementation to activate.
+#
+# Results:
+#	None.
+
+proc ::sha2::SwitchTo {key} {
+    variable accel
+    variable loaded
+
+    if {[string equal $key $loaded]} {
+	# No change, nothing to do.
+	return
+    } elseif {![string equal $key ""]} {
+	# Validate the target implementation of the switch.
+
+	if {![info exists accel($key)]} {
+	    return -code error "Unable to activate unknown implementation \"$key\""
+	} elseif {![info exists accel($key)] || !$accel($key)} {
+	    return -code error "Unable to activate missing implementation \"$key\""
+	}
+    }
+
+    # Deactivate the previous implementation, if there was any.
+
+    if {![string equal $loaded ""]} {
+        foreach c {
+            SHA256Init   SHA224Init
+            SHA256Final  SHA224Final
+            SHA256Update
+        } {
+            interp alias {} ::sha2::$c {}
+        }
+    }
+
+    # Activate the new implementation, if there is any.
+
+    if {![string equal $key ""]} {
+        foreach c {
+            SHA256Init   SHA224Init
+            SHA256Final  SHA224Final
+            SHA256Update
+        } {
+	    interp alias {} ::sha2::$c {} ::sha2::${c}-${key}
+        }
+    }
+
+    # Remember the active implementation, for deactivation by future
+    # switches.
+
+    set loaded $key
+    return
+}
+
+# -------------------------------------------------------------------------
+
+# SHA256Init --
+#
+#   Create and initialize an SHA256 state variable. This will be
+#   cleaned up when we call SHA256Final
+#
+
+proc ::sha2::SHA256Init-tcl {} {
+    variable uid
+    set token [namespace current]::[incr uid]
+    upvar #0 $token tok
+
+    # FIPS 180-2: 5.3.2 Setting the initial hash value
+    array set tok \
+            [list \
+            A [expr {int(0x6a09e667)}] \
+            B [expr {int(0xbb67ae85)}] \
+            C [expr {int(0x3c6ef372)}] \
+            D [expr {int(0xa54ff53a)}] \
+            E [expr {int(0x510e527f)}] \
+            F [expr {int(0x9b05688c)}] \
+            G [expr {int(0x1f83d9ab)}] \
+            H [expr {int(0x5be0cd19)}] \
+            n 0 i "" v 256]
+    return $token
+}
+
+proc ::sha2::SHA256Init-critcl {} {
+    variable uid
+    set token [namespace current]::[incr uid]
+    upvar #0 $token tok
+
+    # FIPS 180-2: 5.3.2 Setting the initial hash value
+    set tok(sha256c) [sha256c_init256]
+    return $token
+}
+
+# SHA256Update --
+#
+#   This is called to add more data into the hash. You may call this
+#   as many times as you require. Note that passing in "ABC" is equivalent
+#   to passing these letters in as separate calls -- hence this proc 
+#   permits hashing of chunked data
+#
+#   If we have a C-based implementation available, then we will use
+#   it here in preference to the pure-Tcl implementation.
+#
+
+proc ::sha2::SHA256Update-tcl {token data} {
+    upvar #0 $token state
+
+    # Update the state values
+    incr   state(n) [string length $data]
+    append state(i) $data
+
+    # Calculate the hash for any complete blocks
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        SHA256Transform $token [string range $state(i) $n [incr n 64]]
+    }
+
+    # Adjust the state for the blocks completed.
+    set state(i) [string range $state(i) $n end]
+    return
+}
+
+proc ::sha2::SHA256Update-critcl {token data} {
+    upvar #0 $token state
+
+    set state(sha256c) [sha256c_update $data $state(sha256c)]
+    return
+}
+
+# SHA256Final --
+#
+#    This procedure is used to close the current hash and returns the
+#    hash data. Once this procedure has been called the hash context
+#    is freed and cannot be used again.
+#
+#    Note that the output is 256 bits represented as binary data.
+#
+
+proc ::sha2::SHA256Final-tcl {token} {
+    upvar #0 $token state
+    SHA256Penultimate $token
+    
+    # Output
+    set r [bytes $state(A)][bytes $state(B)][bytes $state(C)][bytes $state(D)][bytes $state(E)][bytes $state(F)][bytes $state(G)][bytes $state(H)]
+    unset state
+    return $r
+}
+
+proc ::sha2::SHA256Final-critcl {token} {
+    upvar #0 $token state
+    set r $state(sha256c)
+    unset  state
+    return $r
+}
+
+# SHA256Penultimate --
+#
+#
+proc ::sha2::SHA256Penultimate {token} {
+    upvar #0 $token state
+
+    # FIPS 180-2: 5.1.1: Padding the message
+    #
+    set len [string length $state(i)]
+    set pad [expr {56 - ($len % 64)}]
+    if {$len % 64 > 56} {
+        incr pad 64
+    }
+    if {$pad == 0} {
+        incr pad 64
+    }
+    append state(i) [binary format a$pad \x80]
+
+    # Append length in bits as big-endian wide int.
+    set dlen [expr {8 * $state(n)}]
+    append state(i) [binary format II 0 $dlen]
+
+    # Calculate the hash for the remaining block.
+    set len [string length $state(i)]
+    for {set n 0} {($n + 64) <= $len} {} {
+        SHA256Transform $token [string range $state(i) $n [incr n 64]]
+    }
+}
+
+# -------------------------------------------------------------------------
+
+proc ::sha2::SHA224Init-tcl {} {
+    variable uid
+    set token [namespace current]::[incr uid]
+    upvar #0 $token tok
+
+    # FIPS 180-2 (change notice 1) (1): SHA-224 initialization values
+    array set tok \
+            [list \
+            A [expr {int(0xc1059ed8)}] \
+            B [expr {int(0x367cd507)}] \
+            C [expr {int(0x3070dd17)}] \
+            D [expr {int(0xf70e5939)}] \
+            E [expr {int(0xffc00b31)}] \
+            F [expr {int(0x68581511)}] \
+            G [expr {int(0x64f98fa7)}] \
+            H [expr {int(0xbefa4fa4)}] \
+            n 0 i "" v 224]
+    return $token
+}
+
+proc ::sha2::SHA224Init-critcl {} {
+    variable uid
+    set token [namespace current]::[incr uid]
+    upvar #0 $token tok
+
+    # FIPS 180-2 (change notice 1) (1): SHA-224 initialization values
+    set tok(sha256c) [sha256c_init224]
+    return $token
+}
+
+interp alias {} ::sha2::SHA224Update {} ::sha2::SHA256Update
+
+proc ::sha2::SHA224Final-tcl {token} {
+    upvar #0 $token state
+    SHA256Penultimate $token
+    
+    # Output
+    set r [bytes $state(A)][bytes $state(B)][bytes $state(C)][bytes $state(D)][bytes $state(E)][bytes $state(F)][bytes $state(G)]
+    unset state
+    return $r
+}
+
+proc ::sha2::SHA224Final-critcl {token} {
+    upvar #0 $token state
+    # Trim result down to 224 bits (by 4 bytes).
+    # See output below, A..G, not A..H
+    set r [string range $state(sha256c) 0 end-4]
+    unset state
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# HMAC Hashed Message Authentication (RFC 2104)
+#
+# hmac = H(K xor opad, H(K xor ipad, text))
+#
+
+# HMACInit --
+#
+#    This is equivalent to the SHA1Init procedure except that a key is
+#    added into the algorithm
+#
+proc ::sha2::HMACInit {K} {
+
+    # Key K is adjusted to be 64 bytes long. If K is larger, then use
+    # the SHA1 digest of K and pad this instead.
+    set len [string length $K]
+    if {$len > 64} {
+        set tok [SHA256Init]
+        SHA256Update $tok $K
+        set K [SHA256Final $tok]
+        set len [string length $K]
+    }
+    set pad [expr {64 - $len}]
+    append K [string repeat \0 $pad]
+
+    # Cacluate the padding buffers.
+    set Ki {}
+    set Ko {}
+    binary scan $K i16 Ks
+    foreach k $Ks {
+        append Ki [binary format i [expr {$k ^ 0x36363636}]]
+        append Ko [binary format i [expr {$k ^ 0x5c5c5c5c}]]
+    }
+
+    set tok [SHA256Init]
+    SHA256Update $tok $Ki;                 # initialize with the inner pad
+    
+    # preserve the Ko value for the final stage.
+    # FRINK: nocheck
+    set [subst $tok](Ko) $Ko
+
+    return $tok
+}
+
+# HMACUpdate --
+#
+#    Identical to calling SHA256Update
+#
+proc ::sha2::HMACUpdate {token data} {
+    SHA256Update $token $data
+    return
+}
+
+# HMACFinal --
+#
+#    This is equivalent to the SHA256Final procedure. The hash context is
+#    closed and the binary representation of the hash result is returned.
+#
+proc ::sha2::HMACFinal {token} {
+    upvar #0 $token state
+
+    set tok [SHA256Init];                 # init the outer hashing function
+    SHA256Update $tok $state(Ko);         # prepare with the outer pad.
+    SHA256Update $tok [SHA256Final $token]; # hash the inner result
+    return [SHA256Final $tok]
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  This is the core SHA1 algorithm. It is a lot like the MD4 algorithm but
+#  includes an extra round and a set of constant modifiers throughout.
+#
+set ::sha2::SHA256Transform_body {
+    variable K
+    upvar #0 $token state
+
+    # FIPS 180-2: 6.2.2 SHA-256 Hash computation.
+    binary scan $msg I* blocks
+    set blockLen [llength $blocks]
+    for {set i 0} {$i < $blockLen} {incr i 16} {
+        set W [lrange $blocks $i [expr {$i+15}]]
+
+        # FIPS 180-2: 6.2.2 (1) Prepare the message schedule
+        # For t = 16 to 64 
+        #   let Wt = (sigma1(Wt-2) + Wt-7 + sigma0(Wt-15) + Wt-16)
+        set t2  13
+        set t7   8
+        set t15  0
+        set t16 -1
+        for {set t 16} {$t < 64} {incr t} {
+            lappend W [expr {([sigma1 [lindex $W [incr t2]]] \
+                                 + [lindex $W [incr t7]] \
+                                 + [sigma0 [lindex $W [incr t15]]] \
+                                 + [lindex $W [incr t16]]) & 0xffffffff}]
+        }
+        
+        # FIPS 180-2: 6.2.2 (2) Initialise the working variables
+        set A $state(A)
+        set B $state(B)
+        set C $state(C)
+        set D $state(D)
+        set E $state(E)
+        set F $state(F)
+        set G $state(G)
+        set H $state(H)
+
+        # FIPS 180-2: 6.2.2 (3) Do permutation rounds
+        # For t = 0 to 63 do
+        #   T1 = h + SIGMA1(e) + Ch(e,f,g) + Kt + Wt
+        #   T2 = SIGMA0(a) + Maj(a,b,c)
+        #   h = g; g = f;  f = e;  e = d + T1;  d = c;  c = b; b = a;
+        #   a = T1 + T2
+        #
+        for {set t 0} {$t < 64} {incr t} {
+            set T1 [expr {($H + [SIGMA1 $E] + [Ch $E $F $G] 
+                          + [lindex $K $t] + [lindex $W $t]) & 0xffffffff}]
+            set T2 [expr {([SIGMA0 $A] + [Maj $A $B $C]) & 0xffffffff}]
+            set H $G
+            set G $F
+            set F $E
+            set E [expr {($D + $T1) & 0xffffffff}]
+            set D $C
+            set C $B
+            set B $A
+            set A [expr {($T1 + $T2) & 0xffffffff}]
+        }
+
+        # FIPS 180-2: 6.2.2 (4) Compute the intermediate hash
+        incr state(A) $A
+        incr state(B) $B
+        incr state(C) $C
+        incr state(D) $D
+        incr state(E) $E
+        incr state(F) $F
+        incr state(G) $G
+        incr state(H) $H
+    }
+
+    return
+}
+
+# -------------------------------------------------------------------------
+
+# FIPS 180-2: 4.1.2 equation 4.2
+proc ::sha2::Ch {x y z} {
+    return [expr {($x & $y) ^ (~$x & $z)}]
+}
+
+# FIPS 180-2: 4.1.2 equation 4.3
+proc ::sha2::Maj {x y z} {
+    return [expr {($x & $y) ^ ($x & $z) ^ ($y & $z)}]
+}
+
+# FIPS 180-2: 4.1.2 equation 4.4
+#  (x >>> 2) ^ (x >>> 13) ^ (x >>> 22)
+proc ::sha2::SIGMA0 {x} {
+    return [expr {[>>> $x 2] ^ [>>> $x 13] ^ [>>> $x 22]}]
+}
+
+# FIPS 180-2: 4.1.2 equation 4.5
+#  (x >>> 6) ^ (x >>> 11) ^ (x >>> 25)
+proc ::sha2::SIGMA1 {x} {
+    return [expr {[>>> $x 6] ^ [>>> $x 11] ^ [>>> $x 25]}]
+}
+
+# FIPS 180-2: 4.1.2 equation 4.6
+#  s0 = (x >>> 7)  ^ (x >>> 18) ^ (x >> 3)
+proc ::sha2::sigma0 {x} {
+    #return [expr {[>>> $x 7] ^ [>>> $x 18] ^ (($x >> 3) & 0x1fffffff)}]
+    return [expr {((($x<<25) | (($x>>7) & (0x7FFFFFFF>>6))) \
+                 ^ (($x<<14) | (($x>>18) & (0x7FFFFFFF>>17))) & 0xFFFFFFFF) \
+                 ^ (($x>>3) & 0x1fffffff)}]
+}
+
+# FIPS 180-2: 4.1.2 equation 4.7
+#  s1 = (x >>> 17) ^ (x >>> 19) ^ (x >> 10)
+proc ::sha2::sigma1 {x} {
+    #return [expr {[>>> $x 17] ^ [>>> $x 19] ^ (($x >> 10) & 0x003fffff)}]
+    return [expr {((($x<<15) | (($x>>17) & (0x7FFFFFFF>>16))) \
+                 ^ (($x<<13) | (($x>>19) & (0x7FFFFFFF>>18))) & 0xFFFFFFFF) \
+                 ^ (($x >> 10) & 0x003fffff)}]
+}
+
+# 32bit rotate-right
+proc ::sha2::>>> {v n} {
+    return [expr {(($v << (32 - $n)) \
+                       | (($v >> $n) & (0x7FFFFFFF >> ($n - 1)))) \
+                      & 0xFFFFFFFF}]
+}
+
+# 32bit rotate-left
+proc ::sha2::<<< {v n} {
+    return [expr {((($v << $n) \
+                        | (($v >> (32 - $n)) \
+                               & (0x7FFFFFFF >> (31 - $n))))) \
+                      & 0xFFFFFFFF}]
+}
+
+# -------------------------------------------------------------------------
+# We speed up the SHA256Transform code while maintaining readability in the
+# source code by substituting inline for a number of functions.
+# The idea is to reduce the number of [expr] calls.
+
+# Inline the Ch function
+regsub -all -line \
+    {\[Ch (\$[ABCDEFGH]) (\$[ABCDEFGH]) (\$[ABCDEFGH])\]} \
+    $::sha2::SHA256Transform_body \
+    {((\1 \& \2) ^ ((~\1) \& \3))} \
+    ::sha2::SHA256Transform_body
+
+# Inline the Maj function
+regsub -all -line \
+    {\[Maj (\$[ABCDEFGH]) (\$[ABCDEFGH]) (\$[ABCDEFGH])\]} \
+    $::sha2::SHA256Transform_body \
+    {((\1 \& \2) ^ (\1 \& \3) ^ (\2 \& \3))} \
+    ::sha2::SHA256Transform_body
+
+
+# Inline the SIGMA0 function
+regsub -all -line \
+    {\[SIGMA0 (\$[ABCDEFGH])\]} \
+    $::sha2::SHA256Transform_body \
+    {((((\1<<30) | ((\1>>2) \& (0x7FFFFFFF>>1))) \& 0xFFFFFFFF) \
+          ^ (((\1<<19) | ((\1>>13) \& (0x7FFFFFFF>>12))) \& 0xFFFFFFFF) \
+          ^ (((\1<<10) | ((\1>>22) \& (0x7FFFFFFF>>21))) \& 0xFFFFFFFF) \
+          )} \
+    ::sha2::SHA256Transform_body
+
+# Inline the SIGMA1 function
+regsub -all -line \
+    {\[SIGMA1 (\$[ABCDEFGH])\]} \
+    $::sha2::SHA256Transform_body \
+    {((((\1<<26) | ((\1>>6) \& (0x7FFFFFFF>>5))) \& 0xFFFFFFFF) \
+          ^ (((\1<<21) | ((\1>>11) \& (0x7FFFFFFF>>10))) \& 0xFFFFFFFF) \
+          ^ (((\1<<7) | ((\1>>25) \& (0x7FFFFFFF>>24))) \& 0xFFFFFFFF) \
+          )} \
+    ::sha2::SHA256Transform_body
+
+proc ::sha2::SHA256Transform {token msg} $::sha2::SHA256Transform_body
+
+# -------------------------------------------------------------------------
+
+# Convert a integer value into a binary string in big-endian order.
+proc ::sha2::byte {n v} {expr {((0xFF << (8 * $n)) & $v) >> (8 * $n)}}
+proc ::sha2::bytes {v} { 
+    #format %c%c%c%c [byte 3 $v] [byte 2 $v] [byte 1 $v] [byte 0 $v]
+    format %c%c%c%c \
+        [expr {((0xFF000000 & $v) >> 24) & 0xFF}] \
+        [expr {(0xFF0000 & $v) >> 16}] \
+        [expr {(0xFF00 & $v) >> 8}] \
+        [expr {0xFF & $v}]
+}
+
+# -------------------------------------------------------------------------
+
+proc ::sha2::Hex {data} {
+    binary scan $data H* result
+    return $result
+}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::sha2::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# fileevent handler for chunked file hashing.
+#
+proc ::sha2::Chunk {token channel {chunksize 4096}} {
+    upvar #0 $token state
+    
+    SHA256Update $token [read $channel $chunksize]
+
+    if {[eof $channel]} {
+        fileevent $channel readable {}
+        set state(reading) 0
+    }
+    return
+}
+
+# -------------------------------------------------------------------------
+
+proc ::sha2::_sha256 {ver args} {
+    array set opts {-hex 0 -filename {} -channel {} -chunksize 4096}
+    if {[llength $args] == 1} {
+        set opts(-hex) 1
+    } else {
+        while {[string match -* [set option [lindex $args 0]]]} {
+            switch -glob -- $option {
+                -hex       { set opts(-hex) 1 }
+                -bin       { set opts(-hex) 0 }
+                -file*     { set opts(-filename) [Pop args 1] }
+                -channel   { set opts(-channel) [Pop args 1] }
+                -chunksize { set opts(-chunksize) [Pop args 1] }
+                default {
+                    if {[llength $args] == 1} { break }
+                    if {[string compare $option "--"] == 0} { Pop args; break }
+                    set err [join [lsort [concat -bin [array names opts]]] ", "]
+                    return -code error "bad option $option:\
+                    must be one of $err"
+                }
+            }
+            Pop args
+        }
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+        if {[llength $args] != 1} {
+            return -code error "wrong # args: should be\
+                \"[namespace current]::sha$ver ?-hex|-bin? -filename file\
+                | -channel channel | string\""
+        }
+        set tok [SHA${ver}Init]
+        SHA${ver}Update $tok [lindex $args 0]
+        set r [SHA${ver}Final $tok]
+
+    } else {
+
+        set tok [SHA${ver}Init]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        # FRINK: nocheck
+        vwait [subst $tok](reading)
+        set r [SHA${ver}Final $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+interp alias {} ::sha2::sha256 {} ::sha2::_sha256 256
+interp alias {} ::sha2::sha224 {} ::sha2::_sha256 224
+
+# -------------------------------------------------------------------------
+
+proc ::sha2::hmac {args} {
+    array set opts {-hex 1 -filename {} -channel {} -chunksize 4096}
+    if {[llength $args] != 2} {
+        while {[string match -* [set option [lindex $args 0]]]} {
+            switch -glob -- $option {
+                -key       { set opts(-key) [Pop args 1] }
+                -hex       { set opts(-hex) 1 }
+                -bin       { set opts(-hex) 0 }
+                -file*     { set opts(-filename) [Pop args 1] }
+                -channel   { set opts(-channel) [Pop args 1] }
+                -chunksize { set opts(-chunksize) [Pop args 1] }
+                default {
+                    if {[llength $args] == 1} { break }
+                    if {[string compare $option "--"] == 0} { Pop args; break }
+                    set err [join [lsort [array names opts]] ", "]
+                    return -code error "bad option $option:\
+                    must be one of $err"
+                }
+            }
+            Pop args
+        }
+    }
+
+    if {[llength $args] == 2} {
+        set opts(-key) [Pop args]
+    }
+
+    if {![info exists opts(-key)]} {
+        return -code error "wrong # args:\
+            should be \"hmac ?-hex? -key key -filename file | string\""
+    }
+
+    if {$opts(-filename) != {}} {
+        set opts(-channel) [open $opts(-filename) r]
+        fconfigure $opts(-channel) -translation binary
+    }
+
+    if {$opts(-channel) == {}} {
+
+        if {[llength $args] != 1} {
+            return -code error "wrong # args:\
+                should be \"hmac ?-hex? -key key -filename file | string\""
+        }
+        set tok [HMACInit $opts(-key)]
+        HMACUpdate $tok [lindex $args 0]
+        set r [HMACFinal $tok]
+
+    } else {
+
+        set tok [HMACInit $opts(-key)]
+        # FRINK: nocheck
+        set [subst $tok](reading) 1
+        fileevent $opts(-channel) readable \
+            [list [namespace origin Chunk] \
+                 $tok $opts(-channel) $opts(-chunksize)]
+        # FRINK: nocheck
+        vwait [subst $tok](reading)
+        set r [HMACFinal $tok]
+
+        # If we opened the channel - we should close it too.
+        if {$opts(-filename) != {}} {
+            close $opts(-channel)
+        }
+    }
+    
+    if {$opts(-hex)} {
+        set r [Hex $r]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+
+# Try and load a compiled extension to help.
+namespace eval ::sha2 {
+    variable e {}
+    foreach e [KnownImplementations] {
+	if {[LoadAccelerator $e]} {
+	    SwitchTo $e
+	    break
+	}
+    }
+    unset e
+}
+
+package provide sha256 1.0.4
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha256c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha256c.tcl
new file mode 100644
index 00000000..0b278eab
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/sha1/sha256c.tcl
@@ -0,0 +1,193 @@
+# sha256c.tcl
+# - Copyright (C) 2005 Pat Thoyts <patthoyts@users.sourceforge.net>
+# - Copyright (C) 2006 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#   (Rewriting the sha1c wrapper to 256).
+#
+# Wrapper for the Secure Hashing Algorithm (SHA256)
+#
+# $Id: sha256c.tcl,v 1.5 2009/05/07 00:35:10 patthoyts Exp $
+
+package require critcl;        # needs critcl
+# @sak notprovided sha256c
+package provide sha256c 1.0.4
+			       
+critcl::cheaders sha256.h;     # FreeBSD SHA256 implementation
+critcl::csources sha256.c;     # FreeBSD SHA256 implementation
+
+if {$tcl_platform(byteOrder) eq "littleEndian"} {
+    set byteOrder 1234
+} else {
+    set byteOrder 4321
+}
+critcl::cflags -DTCL_BYTE_ORDER=$byteOrder
+
+namespace eval ::sha2 {
+    # Supporting code for the main command.
+    catch {
+        #critcl::debug memory symbols
+    }
+
+    critcl::ccode {
+        #include "sha256.h"
+        #include <stdlib.h>
+        #include <string.h>
+        #include <assert.h>
+        
+        static
+        Tcl_ObjType sha256_type; /* fast internal access representation */
+        
+        static void 
+        sha256_free_rep(Tcl_Obj* obj)
+        {
+            SHA256_CTX* mp = (SHA256_CTX*) obj->internalRep.otherValuePtr;
+            free(mp);
+        }
+        
+        static void
+        sha256_dup_rep(Tcl_Obj* obj, Tcl_Obj* dup)
+        {
+            SHA256_CTX* mp = (SHA256_CTX*) obj->internalRep.otherValuePtr;
+            dup->internalRep.otherValuePtr = malloc(sizeof *mp);
+            memcpy(dup->internalRep.otherValuePtr, mp, sizeof *mp);
+            dup->typePtr = &sha256_type;
+        }
+        
+        static void
+        sha256_string_rep(Tcl_Obj* obj)
+        {
+            unsigned char buf[SHA256_HASH_SIZE];
+            Tcl_Obj* temp;
+            char* str;
+            SHA256_CTX dup = *(SHA256_CTX*) obj->internalRep.otherValuePtr;
+            
+            SHA256Final(&dup, buf);
+            
+            /* convert via a byte array to properly handle null bytes */
+            temp = Tcl_NewByteArrayObj(buf, sizeof buf);
+            Tcl_IncrRefCount(temp);
+            
+            str = Tcl_GetStringFromObj(temp, &obj->length);
+            obj->bytes = Tcl_Alloc(obj->length + 1);
+            memcpy(obj->bytes, str, obj->length + 1);
+            
+            Tcl_DecrRefCount(temp);
+        }
+        
+        static int
+        sha256_from_any(Tcl_Interp* ip, Tcl_Obj* obj)
+        {
+            assert(0);
+            return TCL_ERROR;
+        }
+        
+        static
+        Tcl_ObjType sha256_type = {
+            "sha256c", sha256_free_rep, sha256_dup_rep, sha256_string_rep,
+            sha256_from_any
+        };
+    }
+    
+    critcl::ccommand sha256c_init256 {dummy ip objc objv} {
+        SHA256_CTX* mp;
+        unsigned char* data;
+        int size;
+        Tcl_Obj* obj;
+        
+        if (objc > 1) {
+            Tcl_WrongNumArgs(ip, 1, objv, "");
+            return TCL_ERROR;
+        }
+        
+	obj = Tcl_NewObj();
+	mp = (SHA256_CTX*) malloc(sizeof *mp);
+	SHA256Init(mp);
+            
+	if (obj->typePtr != NULL && obj->typePtr->freeIntRepProc != NULL) {
+	    obj->typePtr->freeIntRepProc(obj);
+	}
+            
+	obj->internalRep.otherValuePtr = mp;
+	obj->typePtr = &sha256_type;
+        
+        Tcl_InvalidateStringRep(obj);        
+        Tcl_SetObjResult(ip, obj);
+        return TCL_OK;
+    }
+
+    critcl::ccommand sha256c_init224 {dummy ip objc objv} {
+        SHA256_CTX* mp;
+        unsigned char* data;
+        int size;
+        Tcl_Obj* obj;
+        
+        if (objc > 1) {
+            Tcl_WrongNumArgs(ip, 1, objv, "");
+            return TCL_ERROR;
+        }
+        
+	obj = Tcl_NewObj();
+	mp = (SHA256_CTX*) malloc(sizeof *mp);
+	SHA224Init(mp);
+            
+	if (obj->typePtr != NULL && obj->typePtr->freeIntRepProc != NULL) {
+	    obj->typePtr->freeIntRepProc(obj);
+	}
+            
+	obj->internalRep.otherValuePtr = mp;
+	obj->typePtr = &sha256_type;
+        
+        Tcl_InvalidateStringRep(obj);        
+        Tcl_SetObjResult(ip, obj);
+        return TCL_OK;
+    }
+
+    critcl::ccommand sha256c_update {dummy ip objc objv} {
+        SHA256_CTX* mp;
+        unsigned char* data;
+        int size;
+        Tcl_Obj* obj;
+        
+        if (objc != 3) {
+            Tcl_WrongNumArgs(ip, 1, objv, "data context");
+            return TCL_ERROR;
+        }
+        
+	if (objv[2]->typePtr != &sha256_type 
+	    && sha256_from_any(ip, objv[2]) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+
+	obj = objv[2];
+	if (Tcl_IsShared(obj)) {
+	    obj = Tcl_DuplicateObj(obj);
+	}
+        
+        Tcl_InvalidateStringRep(obj);
+        mp = (SHA256_CTX*) obj->internalRep.otherValuePtr;
+        
+        data = Tcl_GetByteArrayFromObj(objv[1], &size);
+        SHA256Update(mp, data, size);
+        
+        Tcl_SetObjResult(ip, obj);
+        return TCL_OK;
+    }
+}
+
+
+critcl::api header sha256.h
+::critcl::api function void SHA256Init {
+	SHA256Context *sc
+}
+
+::critcl::api function void SHA256Update {
+	SHA256Context *sc
+	{const void} *data
+	uint32_t len
+}
+::critcl::api function void SHA256Final {
+	SHA256Context *sc
+	uint8_t *hash
+}
+
+#::critcl::debug symbols
+::critcl::load
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/simulation/annealing.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/simulation/annealing.tcl
new file mode 100644
index 00000000..ab53c734
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/simulation/annealing.tcl
@@ -0,0 +1,564 @@
+# annealing.tcl --
+#     Package implementing simulated annealing for minimizing functions
+#     of one or more parameters
+#
+# Copyright (c) 2007 by Arjen Markus <arjenmarkus@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: annealing.tcl,v 1.4 2008/02/22 13:34:07 arjenmarkus Exp $
+#------------------------------------------------------------------------------
+
+package require Tcl 8.4
+
+# ::simulation::annealing --
+#     Create the namespace
+#
+namespace eval ::simulation::annealing {
+}
+
+
+# getOption --
+#     Return the value of an option
+#
+# Arguments:
+#     option         Name of the option (without -)
+# Result:
+#     The value or an error message if it does not exist
+#
+proc ::simulation::annealing::getOption {option} {
+    variable ann_option
+
+    if { [info exists ann_option(-$option)] } {
+        return $ann_option(-$option)
+    } else {
+        return -code error "No such option: $option"
+    }
+}
+
+
+# setOption --
+#     Set the value of an option
+#
+# Arguments:
+#     option         Name of the option (without -)
+#     value          Value of the option
+# Result:
+#     None
+#
+proc ::simulation::annealing::setOption {option value} {
+    variable ann_option
+
+    set ann_option(-$option) $value
+}
+
+
+# hasOption --
+#     Return whether the given option exists or not
+#
+# Arguments:
+#     option         Name of the option (without -)
+# Result:
+#     1 if it exists, 0 if not
+#
+proc ::simulation::annealing::hasOption {option} {
+    variable ann_option
+
+    if { [info exists ann_option(-$option)] } {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+
+# findMinimum --
+#     Find the (global) minimum of a function using simulated annealing
+#
+# Arguments:
+#     args            Option-value pairs:
+#                     -parameters list - triples defining parameters and ranges
+#                     -function expr   - expression defining the function
+#                     -code body       - body of code to define the function
+#                                        (takes precedence over -function)
+#                                        should set the variable "result"
+#                     -init code       - code to be run at start up
+#                     -final code      - code to be run at the end
+#                     -trials n        - number of trials before reducing the temperature
+#                     -reduce factor   - reduce the temperature by this factor
+#                                        (between 0 and 1)
+#                     -initial-temp t  - initial temperature
+#                     -scale s         - scale of the function (order of
+#                                        magnitude of the values)
+#                     -estimate-scale y/n - estimate the scale (only if -scale not present)
+#                     -verbose y/n     - Turn verbose printing on (1) or off (0)
+#                     -reportfile file - Channel to write verbose output to
+#                     Any others can be used via the getOption procedure
+#                     in the body.
+#
+# Result:
+#     Estimated minimum and the parameters involved:
+#     function value param1 value param2 value ...
+#
+proc ::simulation::annealing::findMinimum {args} {
+    variable ann_option
+
+    #
+    # Handle the options
+    #
+    set ann_option(-parameters)     {}
+    set ann_option(-function)       {}
+    set ann_option(-code)           {}
+    set ann_option(-init)           {}
+    set ann_option(-final)          {}
+    set ann_option(-trials)         300
+    set ann_option(-reduce)         0.95
+    set ann_option(-initial-temp)   1.0
+    set ann_option(-scale)          {}
+    set ann_option(-estimate-scale) 0
+    set ann_option(-verbose)        0
+    set ann_option(-reportfile)     stdout
+
+    foreach {option value} $args {
+        set ann_option($option) $value
+    }
+
+    if { $ann_option(-scale) == {} } {
+        if { ! $ann_option(-estimate-scale) } {
+            set ann_option(-scale) 1.0
+        }
+    }
+
+    if { $ann_option(-code) != {} } {
+        set ann_option(-function) {}
+    }
+
+    if { $ann_option(-code) == {} && $ann_option(-function) == {} } {
+        return -code error "Neither code nor function given! Nothing to optimize"
+    }
+    if { $ann_option(-parameters) == {} } {
+        return -code error "No parameters given! Nothing to optimize"
+    }
+
+    if { $ann_option(-function) != {} } {
+        set ann_option(-code) "set result \[expr {$ann_option(-function)}\]"
+    }
+
+    #
+    # Create the procedure
+    #
+    proc FindMin {} [string map \
+        [list PARAMETERS $ann_option(-parameters) \
+              CODE  $ann_option(-code) \
+              INIT  $ann_option(-init) \
+              FINAL $ann_option(-final)] {
+        #
+        # Give all parameters a value
+        #
+        foreach {_param_ _min_ _max_} {PARAMETERS} {
+            set $_param_ $_min_
+        }
+
+        set _trials_ [getOption trials]
+        set _temperature_ [getOption initial-temp]
+        set _reduce_      [getOption reduce]
+        set _noparams_    [expr {[llength {PARAMETERS}]/3}]
+        set _verbose_     [getOption verbose]
+        set _reportfile_  [getOption reportfile]
+
+        INIT
+
+        #
+        # Estimate the scale
+        #
+        if { [getOption estimate-scale] == 1 } {
+            set _sum_ 0.0
+            for { set _trial_ 0 } { $_trial_ < $_trials_/3 } { incr _trial_ } {
+                set _randp_ [expr {3*int($_noparams_*rand())}]
+                set _param_ [lindex {PARAMETERS} $_randp_]
+                set _min_   [lindex {PARAMETERS} [expr {$_randp_+1}]]
+                set _max_   [lindex {PARAMETERS} [expr {$_randp_+2}]]
+                set _old_param_ [set $_param_]
+                set $_param_ [expr {$_min_ + rand()*($_max_-$_min_)}]
+
+                CODE
+
+                set _sum_  [expr {$_sum_ + abs($result)}]
+            }
+            set _scale_ [expr {3.0*$_sum_/$_trials_}]
+        } else {
+            set _scale_ [getOption scale]
+        }
+        if { $_verbose_ } {
+            puts $_reportfile_ "Scale value: $_scale_"
+        }
+
+        #
+        # Start the outer loop
+        #
+        set _changes_     1
+
+        #
+        # Get the initial value of the function
+        #
+        CODE
+        set _old_result_ $result
+
+        if { $_verbose_ } {
+            puts $_reportfile_ "Result -- Mean of accepted values -- % accepted"
+        }
+
+        while {1} {
+            set _sum_       $_old_result_
+            set _accepted_  1
+            for { set _trial_ 0 } { $_trial_ < $_trials_} { incr _trial_ } {
+                set _randp_ [expr {3*int($_noparams_*rand())}]
+                set _param_ [lindex {PARAMETERS} $_randp_]
+                set _min_   [lindex {PARAMETERS} [expr {$_randp_+1}]]
+                set _max_   [lindex {PARAMETERS} [expr {$_randp_+2}]]
+                set _old_param_ [set $_param_]
+                set $_param_ [expr {$_min_ + rand()*($_max_-$_min_)}]
+
+                CODE
+
+                #
+                # Accept the new solution?
+                #
+                set _rand_  [expr {rand()}]
+                if { log($_rand_) < -($result-$_old_result_)/($_scale_*$_temperature_) } {
+                    incr _changes_
+                    set _old_result_ $result
+                    set _sum_        [expr {$_sum_ + $result}]
+                    incr _accepted_
+                } else {
+                    set $_param_ $_old_param_
+                }
+            }
+
+            if { $_verbose_ } {
+                puts $_reportfile_ \
+                    [format "%.5g -- %.5g -- %.2f %%" $_old_result_ \
+                        [expr {$_sum_/$_accepted_}] [expr {100.0*double($_changes_)/$_trials_}]]
+            }
+
+            set _temperature_ [expr {$_reduce_ * $_temperature_}]
+            if { $_changes_ == 0 } {
+                break
+            } else {
+                set _changes_ 0
+            }
+        }
+
+        set result [list result $_old_result_] ;# Note: we need the last accepted result!
+        foreach {_param_ _min_ _max_} {PARAMETERS} {
+            lappend result $_param_ [set $_param_]
+        }
+
+        FINAL
+
+        return $result
+    }]
+
+    #
+    # Do the actual computation and return the result
+    #
+    return [FindMin]
+}
+
+
+# findCombinatorialMinimum --
+#     Find the (global) minimum of a combinatorial function using simulated annealing
+#
+# Arguments:
+#     args            Option-value pairs:
+#                     -number-params n     - number of (binary) parameters
+#                     -initial-values list - list of parameter values to start with
+#                     -function expr       - expression defining the function
+#                     -code body           - body of code to define the function
+#                                            (takes precedence over -function)
+#                                            should set the variable "result"
+#                                            The values of the solutions
+#                                            are stored as a list in the
+#                                            variable params
+#                     -init code           - code to be run at start up
+#                     -final code          - code to be run at the end
+#                     -trials n            - number of trials before reducing the temperature
+#                     -reduce factor       - reduce the temperature by this factor
+#                                            (between 0 and 1)
+#                     -initial-temp t      - initial temperature
+#                     -scale s             - scale of the function (order of
+#                                            magnitude of the values)
+#                     -estimate-scale y/n  - estimate the scale (only if -scale not present)
+#                     -verbose y/n         - Turn verbose printing on (1) or off (0)
+#                     -reportfile file     - Channel to write verbose output to
+#                     Any others can be used via the getOption procedure
+#                     in the body.
+#
+# Result:
+#     Estimated minimum and the parameters involved:
+#     function value, list of values
+#
+# Note:
+#     The parameters have the values 0 or 1
+#
+#     The stop criterion is that if the result value does not change in
+#     sqrt(trials) then the iteration stops. Experiments with the
+#     example below show that the function to be minimised can show
+#     a very wide minimum due to the parameters being discrete.
+#     sqrt(trials) is just an arbitrary value.
+#
+proc ::simulation::annealing::findCombinatorialMinimum {args} {
+    variable ann_option
+
+    #
+    # Handle the options
+    #
+    set ann_option(-number-params)  {}
+    set ann_option(-initial-values) {}
+    set ann_option(-function)       {}
+    set ann_option(-code)           {}
+    set ann_option(-init)           {}
+    set ann_option(-final)          {}
+    set ann_option(-trials)         300
+    set ann_option(-reduce)         0.95
+    set ann_option(-initial-temp)   1.0
+    set ann_option(-scale)          {}
+    set ann_option(-estimate-scale) 0
+    set ann_option(-verbose)        0
+    set ann_option(-reportfile)     stdout
+
+    foreach {option value} $args {
+        set ann_option($option) $value
+    }
+
+    if { $ann_option(-scale) == {} } {
+        if { ! $ann_option(-estimate-scale) } {
+            set ann_option(-scale) 1.0
+        }
+    }
+
+    if { $ann_option(-code) != {} } {
+        set ann_option(-function) {}
+    }
+
+    if { $ann_option(-code) == {} && $ann_option(-function) == {} } {
+        return -code error "Neither code nor function given! Nothing to optimize"
+    }
+    if { $ann_option(-number-params) == {} } {
+        return -code error "Number of parameters not given! Nothing to optimize"
+    }
+
+    if { $ann_option(-initial-values) == {} } {
+        for { set i 0 } { $i < $ann_option(-number-params) } { incr i } {
+            lappend ann_option(-initial-values) 0
+        }
+    }
+
+    if { $ann_option(-function) != {} } {
+        set ann_option(-code) "set result \[expr {$ann_option(-function)}\]"
+    }
+
+    #
+    # Create the procedure
+    #
+    proc FindCombMin {params} [string map \
+        [list CODE  $ann_option(-code) \
+              INIT  $ann_option(-init) \
+              FINAL $ann_option(-final)] {
+
+        set _trials_      [getOption trials]
+        set _temperature_ [getOption initial-temp]
+        set _reduce_      [getOption reduce]
+        set _noparams_    [llength $params]
+        set _verbose_     [getOption verbose]
+        set _reportfile_  [getOption reportfile]
+
+        INIT
+
+        #
+        # Estimate the scale
+        #
+        if { [getOption estimate-scale] == 1 } {
+            set _sum_ 0.0
+            set _old_params_ $params
+            for { set _trial_ 0 } { $_trial_ < $_trials_/3 } { incr _trial_ } {
+                set _randp_ [expr {int($_noparams_*rand())}]
+                lset params $_randp_ [expr {rand()>0.5? 0 : 1}]
+
+                CODE
+
+                set _sum_  [expr {$_sum_ + abs($result)}]
+            }
+            set _scale_ [expr {3.0*$_sum_/$_trials_}]
+            set params $_old_params_
+        } else {
+            set _scale_ [getOption scale]
+        }
+        if { $_verbose_ } {
+            puts $_reportfile_ "Scale value: $_scale_"
+        }
+
+        #
+        # Start the outer loop
+        #
+        set _changes_     1
+
+        #
+        # Get the initial value of the function
+        #
+        CODE
+        set _old_result_        $result
+        set _result_same_       0
+        set _result_after_loop_ $result
+
+        if { $_verbose_ } {
+            puts $_reportfile_ "Result -- Mean of accepted values -- % accepted"
+        }
+
+        while {1} {
+            set _sum_       $_old_result_
+            set _accepted_  1
+            for { set _trial_ 0 } { $_trial_ < $_trials_} { incr _trial_ } {
+                set _old_params_ $params
+                set _randp_ [expr {int($_noparams_*rand())}]
+                lset params $_randp_ [expr {rand()>0.5? 0 : 1}]
+
+                CODE
+
+                #
+                # Accept the new solution?
+                #
+                set _rand_  [expr {rand()}]
+                if { log($_rand_) < -($result-$_old_result_)/($_scale_*$_temperature_) } {
+                    incr _changes_
+                    set _old_result_ $result
+                    set _sum_        [expr {$_sum_ + $result}]
+                    incr _accepted_
+                } else {
+                    set params $_old_params_
+                }
+            }
+
+            if { $_verbose_ } {
+                puts $_reportfile_ \
+                    [format "%.5g -- %.5g -- %.2f %%" $_old_result_ \
+                        [expr {$_sum_/$_accepted_}] [expr {100.0*double($_changes_)/$_trials_}]]
+            }
+
+            set _temperature_ [expr {$_reduce_ * $_temperature_}]
+            if { $_changes_ == 0 || $_result_same_ > sqrt($_trials_) } {
+                break
+            } else {
+                set _changes_ 0
+            }
+
+            if { $_result_after_loop_ == $_old_result_ } {
+                incr _result_same_
+            } else {
+                set _result_after_loop_ $_old_result_
+            }
+        }
+
+        set result [list result $_old_result_] ;# Note: we need the last accepted result!
+        lappend result solution $params
+
+        FINAL
+
+        return $result
+    }]
+
+    #
+    # Do the actual computation and return the result
+    #
+    return [FindCombMin $ann_option(-initial-values)]
+}
+
+# Announce the package
+#
+package provide simulation::annealing 0.2
+
+# main --
+#     Example
+#
+if { 0 } {
+puts [::simulation::annealing::findMinimum \
+    -trials 300 \
+    -verbose 1 \
+    -parameters {x -5.0 5.0 y -5.0 5.0} \
+    -function {$x*$x+$y*$y+sin(10.0*$x)+4.0*cos(20.0*$y)}]
+
+puts "Constrained:"
+puts [::simulation::annealing::findMinimum \
+    -trials 3000 \
+    -reduce 0.98 \
+    -parameters {x -5.0 5.0 y -5.0 5.0} \
+    -code {
+        if { hypot($x-5.0,$y-5.0) < 4.0 } {
+            set result [expr {$x*$x+$y*$y+sin(10.0*$x)+4.0*cos(20.0*$y)}]
+        } else {
+           set result 1.0e100
+        }
+    }]
+}
+
+#
+# A simple combinatorial problem:
+# We have 100 items and the function is optimal if the first 10
+# values are 1 and the result is 0. Can we find this solution?
+#
+# What if we have 1000 items? Or 10000 items?
+#
+# WARNING:
+# 10000 items take a very long time!
+#
+if { 0 } {
+    proc cost {params} {
+        set cost 0
+        foreach p [lrange $params 0 9] {
+            if { $p == 0 } {
+                incr cost
+            }
+        }
+        foreach p [lrange $params 10 end] {
+            if { $p == 1 } {
+                incr cost
+            }
+        }
+        return $cost
+    }
+
+    foreach n {100 1000 10000} {
+        break
+        puts "Problem size: $n"
+        puts [::simulation::annealing::findCombinatorialMinimum \
+            -trials 300 \
+            -verbose 0 \
+            -number-params $n \
+            -code {set result [cost $params]}]
+    }
+
+    #
+    # Second problem:
+    #     Only the values of the first 10 items are important -
+    #     they should be 1
+    #
+    proc cost2 {params} {
+        set cost 0
+        foreach p [lrange $params 0 9] {
+            if { $p == 0 } {
+                incr cost
+            }
+        }
+        return $cost
+    }
+
+    foreach n {100 1000 10000} {
+        puts "Problem size: $n"
+        puts [::simulation::annealing::findCombinatorialMinimum \
+            -trials 300 \
+            -verbose 0 \
+            -number-params $n \
+            -code {set result [cost2 $params]}]
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/simulation/montecarlo.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/simulation/montecarlo.tcl
new file mode 100644
index 00000000..dbd0e424
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/simulation/montecarlo.tcl
@@ -0,0 +1,486 @@
+# montecarlo.tcl --
+#     Utilities for Monte Carlo simulations
+#
+# Copyright (c) 2007 by Arjen Markus <arjenmarkus@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: montecarlo.tcl,v 1.2 2008/01/23 05:35:02 arjenmarkus Exp $
+#------------------------------------------------------------------------------
+
+package require Tcl 8.4
+package require simulation::random
+package require math::statistics
+
+# ::simulation::montecarlo --
+#     Create the namespace
+#
+namespace eval ::simulation::montecarlo {
+}
+
+
+# AcceptAll --
+#     Accept any point
+#
+# Arguments:
+#     args            Coordinates
+#     y               Y-coordinate
+#
+proc ::simulation::montecarlo::AcceptAll {args} {
+    return 1
+}
+
+
+# integral2D --
+#     Estimate an integral over a two-dimensional domain, using MC
+#
+# Arguments:
+#     domain          List of minimum x, maximum x, minimum y and maximum y
+#     func            Function to be integrated
+#     args            Option-value pairs:
+#                     -region proc  - accept or reject the chosen point
+#                     -samples n    - number of samples to use
+# Result:
+#     Estimated value of the integral
+#
+proc ::simulation::montecarlo::integral2D {domain func args} {
+    set option(-region)  AcceptAll
+    set option(-samples) 1000
+
+    foreach {key value} $args {
+        if { [string index $key 0] != "-" } {
+            return -code error "Incorrect option: $key - should start with a -"
+        }
+        set option($key) $value
+    }
+
+    set sum      0.0
+    set count    0
+    set accepted 0
+    set maxcount [expr {10*$option(-samples)}]
+
+    foreach {xmin xmax ymin ymax} $domain {break}
+    set area [expr {($xmax-$xmin)*($ymax-$ymin)}]
+
+    while { $accepted < $option(-samples) && $count < $maxcount } {
+        set x [expr {$xmin + ($xmax-$xmin)*rand()}]
+        set y [expr {$ymin + ($ymax-$ymin)*rand()}]
+
+        if { [$option(-region) $x $y] } {
+            set sum [expr {$sum + [$func $x $y]}]
+            incr accepted
+        }
+        incr count
+    }
+
+    #
+    # The ratio accepted/count gives an estimate of the area
+    # over which we just integrated.
+    #
+    return [expr {$accepted*$sum/$count/$count*$area}]
+}
+
+
+# integral3D --
+#     Estimate an integral over a three-dimensional domain, using MC
+#
+# Arguments:
+#     domain          List of minimum x, maximum x, minimum y and maximum y,
+#                     minimum z, maximum z
+#     func            Function to be integrated
+#     args            Option-value pairs:
+#                     -region proc  - accept or reject the chosen point
+#                     -samples n    - number of samples to use
+# Result:
+#     Estimated value of the integral
+#
+proc ::simulation::montecarlo::integral3D {domain func args} {
+    set option(-region)  AcceptAll
+    set option(-samples) 1000
+
+    foreach {key value} $args {
+        if { [string index $key 0] != "-" } {
+            return -code error "Incorrect option: $key - should start with a -"
+        }
+        set option($key) $value
+    }
+
+    set sum      0.0
+    set count    0
+    set accepted 0
+    set maxcount [expr {10*$option(-samples)}]
+
+    foreach {xmin xmax ymin ymax zmin zmax} $domain {break}
+    set area [expr {($xmax-$xmin)*($ymax-$ymin)*($zmax-$zmin)}]
+
+    while { $accepted < $option(-samples) && $count < $maxcount } {
+        set x [expr {$xmin + ($xmax-$xmin)*rand()}]
+        set y [expr {$ymin + ($ymax-$ymin)*rand()}]
+        set z [expr {$zmin + ($zmax-$zmin)*rand()}]
+
+        if { [$option(-region) $x $y $z] } {
+            set sum [expr {$sum + [$func $x $y $z]}]
+            incr accepted
+        }
+        incr count
+    }
+
+    #
+    # The ratio accepted/count gives an estimate of the area
+    # over which we just integrated.
+    #
+    return [expr {$accepted*$sum/$count/$count*$area}]
+}
+
+
+# singleExperiment --
+#     Perform a single MC experiment
+#
+# Arguments:
+#     args            Option-value pairs, predefined options:
+#                     -init body      - code to initialise the experiment
+#                     -loop body      - code to be run for each trial
+#                     -final body     - code to finalise the experiment
+#                     -trials n       - number of trials
+#                     -reportfile f   - channel to report file
+#                     -verbose yesno  - whether to report the details or not
+#                     -analysis type  - type of analysis to perform
+#                                       (standard, none or the name of a procedure)
+#                     -columns names  - list of names of the columns (for printing)
+#                     All option-value pairs are available via
+#                     the procedure getOption
+#
+# Result:
+#     Whatever was set via [setExpResult]
+#
+proc ::simulation::montecarlo::singleExperiment {args} {
+    variable exp_option
+    variable exp_result
+    variable trial_result
+    variable trial_first
+
+    catch {unset exp_option}
+    set exp_option(-init)       {}
+    set exp_option(-loop)       {}
+    set exp_option(-final)      {}
+    set exp_option(-trials)     {}
+    set exp_option(-reportfile) stdout
+    set exp_option(-verbose)    0
+    set exp_option(-analysis)   standard
+    set exp_option(-columns)    {}
+
+    set exp_result   {}
+    set trial_result {}
+
+    #
+    # Sanity check for the options, and store them
+    #
+    foreach {key value} $args {
+        if { [string index $key 0] != "-" } {
+            return -code error "Incorrect option: $key - should start with a -"
+        }
+        set exp_option($key) $value
+    }
+
+    #
+    # Which analysis procedure
+    #
+    switch -- $exp_option(-analysis) {
+        "standard" { set exp_option(-analysis) ::simulation::montecarlo::StandardAnalysis }
+        "none"     { set exp_option(-analysis) "" }
+    }
+
+    #
+    # Now construct the temporary procedure that will do the work
+    #
+    proc DoExperiment {} [string map \
+        [list INIT $exp_option(-init) LOOP $exp_option(-loop) \
+              FINAL $exp_option(-final) TRIALS $exp_option(-trials) \
+              VERBOSE $exp_option(-verbose) \
+              ANALYSIS $exp_option(-analysis)] \
+        {
+            INIT
+            for { set trial 0 } { $trial < TRIALS } { incr trial } {
+                LOOP
+                if { VERBOSE } {
+                    ::simulation::montecarlo::PrintTrialResult $trial
+                }
+            }
+            FINAL
+            ANALYSIS
+        }]
+        # TODO: analysis of all trial results
+
+    #
+    # Do the experiment and remove it. The results
+    #
+    DoExperiment
+    rename DoExperiment {}
+
+    return $exp_result
+}
+
+
+# transposeData --
+#     Transpose a matrix of data
+#
+# Arguments:
+#     values          List of lists of values
+#
+# Result:
+#     Transposed list
+#
+proc ::simulation::montecarlo::transposeData {values} {
+    set transpose {}
+    set c 0
+    foreach col [lindex $values 0] {
+        set newrow {}
+        foreach row $values {
+            lappend newrow [lindex $row $c]
+        }
+        lappend transpose $newrow
+        incr c
+    }
+    return $transpose
+}
+
+
+# setTrialResult --
+#     Set the result of an individual trial
+#
+# Arguments:
+#     values          List of values to be stored
+#
+# Result:
+#     None
+#
+proc ::simulation::montecarlo::setTrialResult {values} {
+
+    lappend ::simulation::montecarlo::trial_result $values
+}
+
+
+# PrintTrialResult --
+#     Print the result of the current trial
+#
+# Arguments:
+#     trial            Trial number
+#
+# Result:
+#     None
+#
+proc ::simulation::montecarlo::PrintTrialResult {trial} {
+
+    set outfile [getOption reportfile]
+
+    #
+    # Print the column names
+    #
+    if { $trial == 0 } {
+        set columns [getOption columns]
+        set format "%5.5s [string repeat %12.12s [llength $columns]]"
+
+        puts $outfile [eval format [list $format] [list " "] $columns]
+    }
+
+    #
+    # Print the results
+    #
+    set result [lindex $::simulation::montecarlo::trial_result end]
+
+    set format "%5d:[string repeat %12g [llength $result]]"
+
+    puts $outfile [eval format $format $trial $result]
+}
+
+
+# setExpResult --
+#     Set the result for the complete experiment
+#
+# Arguments:
+#     values          List of values to be stored
+#
+# Result:
+#     None
+#
+proc ::simulation::montecarlo::setExpResult {values} {
+
+    set ::simulation::montecarlo::exp_result $values
+}
+
+
+# getExpResult --
+#     Return the result of the complete experiment
+#
+# Arguments:
+#     None
+# Result:
+#     Whatever was set via setExpResult
+#
+proc ::simulation::montecarlo::getExpResult {} {
+
+    return $::simulation::montecarlo::exp_result
+}
+
+
+# getTrialResults --
+#     Return the list of individual results for all trials
+#
+# Arguments:
+#     None
+# Result:
+#     Whatever was set via setTrialResult
+#
+proc ::simulation::montecarlo::getTrialResults {} {
+
+    return $::simulation::montecarlo::trial_result
+}
+
+
+# getOption --
+#     Return the value of an option
+#
+# Arguments:
+#     option         Name of the option (without -)
+# Result:
+#     The value or an error message if it does not exist
+#
+proc ::simulation::montecarlo::getOption {option} {
+    variable exp_option
+
+    if { [info exists exp_option(-$option)] } {
+        return $exp_option(-$option)
+    } else {
+        return -code error "No such option: $option"
+    }
+}
+
+
+# hasOption --
+#     Check if the option is available
+#
+# Arguments:
+#     option         Name of the option (without -)
+# Result:
+#     1 if it is available, 0 if not
+#
+proc ::simulation::montecarlo::hasOption {option} {
+    variable exp_option
+
+    if { [info exists exp_option(-$option)] } {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+
+# StandardAnalysis --
+#     Perform standard analysis on the trial data
+#
+# Arguments:
+#     None
+# Result:
+#     None
+# Side effects:
+#     Prints the results to the result file and stores them as
+#     the experiment results.
+#
+proc ::simulation::montecarlo::StandardAnalysis {} {
+
+    set repfile [getOption reportfile]
+    set names   [getOption columns]
+
+    set values [transposeData [getTrialResults]]
+
+    set exp_result {}
+
+    #
+    # First part: basic statistics
+    #
+    set part_one {}
+
+    puts $repfile "Basic statistical parameters:"
+    set form "%12.12s[string repeat %12g 4]"
+    puts $repfile [format [string repeat "%12.12s" 5] "" Mean Stdev Min Max]
+
+    foreach row $values name $names {
+        set basicStats [::math::statistics::basic-stats $row]
+        lappend part_one $basicStats
+
+        puts $repfile [format $form $name \
+            [lindex $basicStats 0] \
+            [lindex $basicStats 4] \
+            [lindex $basicStats 1] \
+            [lindex $basicStats 2]]
+    }
+
+    #
+    # Second part: correlation matrix
+    #
+    set form "%12.12s[string repeat %12g [llength $values]]"
+
+    puts $repfile "Correlation matrix:"
+    puts $repfile [eval format "%12.12s[string repeat %12.12s [llength $values]]" [list ""] $names]
+
+    set part_two {}
+    foreach row $values rowname $names {
+        set line {}
+
+        foreach col $values {
+            set corr [::math::statistics::corr $col $row]
+            lappend line $corr
+        }
+        lappend part_two $line
+        puts $repfile [eval format $form $rowname $line]
+    }
+
+    setExpResult [list $part_one $part_two]
+}
+
+# Announce the package
+#
+package provide simulation::montecarlo 0.1
+
+# main --
+#     Quick test
+#
+if { 0 } {
+proc f {x y} {
+    return $x
+}
+puts "Integral over rectangle: [::simulation::montecarlo::integral2D {0 1 0 1} f]"
+puts [time {
+set a [::simulation::montecarlo::integral2D {0 1 0 1} f]
+} 100]
+
+#
+# MC experiments:
+# Determine the mean and median of a set of points and compare them
+#
+::simulation::montecarlo::singleExperiment -init {
+    package require math::statistics
+
+    set prng [::simulation::random::prng_Normal 0.0 1.0]
+} -loop {
+    set numbers {}
+    for { set i 0 } { $i < [getOption samples] } { incr i } {
+        lappend numbers [$prng]
+    }
+    set mean   [::math::statistics::mean $numbers]
+    set median [::math::statistics::median $numbers] ;# ? Exists?
+    setTrialResult [list $mean $median]
+} -final {
+    set result [getTrialResults]
+    set means   {}
+    set medians {}
+    foreach r $result {
+        foreach {m M} $r break
+        lappend means   $m
+        lappend medians $M
+    }
+    puts [getOption reportfile] "Correlation: [::math::statistics::corr $means $medians]"
+
+} -trials 100 -samples 10 -verbose 1 -columns {Mean Median}
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/simulation/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/simulation/pkgIndex.tcl
new file mode 100644
index 00000000..17809b38
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/simulation/pkgIndex.tcl
@@ -0,0 +1,3 @@
+package ifneeded simulation::random 0.4.0 [list source [file join $dir random.tcl]]
+package ifneeded simulation::montecarlo 0.1 [list source [file join $dir montecarlo.tcl]]
+package ifneeded simulation::annealing 0.2 [list source [file join $dir annealing.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/simulation/random.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/simulation/random.tcl
new file mode 100644
index 00000000..a268727e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/simulation/random.tcl
@@ -0,0 +1,645 @@
+# random.tcl --
+#     Create procedures that return various types of pseudo-random
+#     number generators (PRNGs)
+#
+# Copyright (c) 2007 by Arjen Markus <arjenmarkus@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# TODO:
+# - Beta
+# - Weighted discrete
+# - Poisson
+# - Cauchy
+# - Binomial
+#
+#     Note:
+#     Several formulae and algorithms come from "Monte Carlo Simulation"
+#     by C. Mooney (Sage Publications, 1997)
+#
+# RCS: @(#) $Id: random.tcl,v 1.5 2012/08/15 04:38:48 arjenmarkus Exp $
+#------------------------------------------------------------------------------
+
+package require Tcl 8.4
+
+# ::simulation::random --
+#     Create the namespace
+#
+namespace eval ::simulation::random {
+    variable count 0
+    variable pi    [expr {4.0*atan(1.0)}]
+}
+
+
+# prng_Bernoulli --
+#     Create a PRNG with a Bernoulli distribution
+#
+# Arguments:
+#     p         Probability that the outcome will be 1
+#
+# Result:
+#     Name of a procedure that returns a Bernoulli-distributed random number
+#
+proc ::simulation::random::prng_Bernoulli {p} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+    proc $name {} [string map [list P $p] {return [expr {rand()<P? 1 : 0}]}]
+
+    return $name
+}
+
+
+# prng_Uniform --
+#     Create a PRNG with a uniform distribution in a given range
+#
+# Arguments:
+#     min       Minimum value
+#     max       Maximum value
+#
+# Result:
+#     Name of a procedure that returns a uniformly distributed
+#     random number
+#
+proc ::simulation::random::prng_Uniform {min max} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+    set range [expr {$max-$min}]
+    proc $name {} [string map [list MIN $min RANGE $range] {return [expr {MIN+RANGE*rand()}]}]
+
+    return $name
+}
+
+
+# prng_Exponential --
+#     Create a PRNG with an exponential distribution with given mean
+#
+# Arguments:
+#     min       Minimum value
+#     mean      Mean value
+#
+# Result:
+#     Name of a procedure that returns an exponentially distributed
+#     random number
+#
+proc ::simulation::random::prng_Exponential {min mean} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+    set b [expr {$mean-$min}]
+    proc $name {} [string map [list MIN $min B $b] {return [expr {MIN-B*log(rand())}]}]
+
+    return $name
+}
+
+
+# prng_Discrete --
+#     Create a PRNG with a uniform but discrete distribution
+#
+# Arguments:
+#     n         Outcome is an integer between 0 and n-1
+#
+# Result:
+#     Name of a procedure that returns such a random number
+#
+proc ::simulation::random::prng_Discrete {n} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+    proc $name {} [string map [list N $n] {return [expr {int(N*rand())}]}]
+
+    return $name
+}
+
+
+# prng_Poisson --
+#     Create a PRNG with a Poisson distribution
+#
+# Arguments:
+#     lambda    The one parameter of the Poisson distribution
+#
+# Result:
+#     Name of a procedure that returns such a random number
+#
+proc ::simulation::random::prng_Poisson {lambda} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+
+    set explambda [expr {exp(-$lambda)}]
+
+    proc $name {} [string map [list INIT $explambda LAMBDA $lambda] {
+        set r      [expr {rand()}]
+        set number 0
+        set sum    INIT
+        set rfact  INIT
+
+        while { $r > $sum } {
+            set rfact [expr {$rfact * LAMBDA /($number+1.0)}]
+            set sum [expr {$sum + $rfact}]
+            incr number
+        }
+        return $number
+    }]
+
+    return $name
+}
+
+
+# prng_Normal --
+#     Create a PRNG with a normal distribution
+#
+# Arguments:
+#     mean      Mean of the distribution
+#     stdev     Standard deviation of the distribution
+#
+# Result:
+#     Name of a procedure that returns such a random number
+#
+# Note:
+#     Use the Box-Mueller method to generate a normal random number
+#
+proc ::simulation::random::prng_Normal {mean stdev} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+    proc $name {} [string map [list MEAN $mean STDEV $stdev] \
+    {
+        variable pi
+        set rad [expr {sqrt(-2.0*log(rand()))}]
+        set phi [expr {2.0*$pi*rand()}]
+        set r   [expr {$rad*cos($phi)}]
+        return [expr {MEAN + STDEV*$r}]
+    }]
+
+    return $name
+}
+
+
+# prng_Pareto --
+#     Create a PRNG with a Pareto distribution
+#
+# Arguments:
+#     min       Minimum value for the distribution
+#     steep     Steepness of the descent
+#
+# Result:
+#     Name of a procedure that returns a Pareto-distributed number
+#
+proc ::simulation::random::prng_Pareto {min steep} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+
+    set rsteep [expr {1.0/$steep}]
+    proc $name {} [string map [list MIN $min RSTEEP $rsteep] \
+    {
+        return [expr {MIN * pow(1.0-rand(),RSTEEP)}]
+    }]
+
+    return $name
+}
+
+
+# prng_Gumbel --
+#     Create a PRNG with a Gumbel distribution
+#
+# Arguments:
+#     min       Minimum value for the distribution
+#     f         Factor to scale the value
+#
+# Result:
+#     Name of a procedure that returns a Gumbel-distributed number
+#
+# Note:
+#     The chance P(v) = exp( -exp( f*(v-min) ) )
+#
+proc ::simulation::random::prng_Gumbel {min f} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+
+    proc $name {} [string map [list MIN $min F $f] \
+    {
+        return [expr {MIN + log( -log(1.0-rand()) ) / F}]
+    }]
+
+    return $name
+}
+
+
+# prng_chiSquared --
+#     Create a PRNG with a chi-squared distribution
+#
+# Arguments:
+#     df        Degrees of freedom
+#
+# Result:
+#     Name of a procedure that returns a chi-squared distributed number
+#     with mean 0 and standard deviation 1
+#
+proc ::simulation::random::prng_chiSquared {df} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+    proc $name {} [string map [list DF $df] \
+    {
+        variable pi
+        set y 0.0
+        for { set i 0 } { $i < DF } { incr i } {
+            set rad [expr {sqrt(-log(rand()))}]
+            set phi [expr {2.0*$pi*rand()}]
+            set r   [expr {$rad*cos($phi)}]
+            set y   [expr {$y+$r*$r}]
+        }
+        return [expr {($y-DF)/sqrt(2.0*DF)}]
+    }]
+
+    return $name
+}
+
+
+# prng_Disk --
+#     Create a PRNG with a uniform distribution of points on a disk
+#
+# Arguments:
+#     rad       Radius of the disk
+#
+# Result:
+#     Name of a procedure that returns the x- and y-coordinates of
+#     such a random point
+#
+proc ::simulation::random::prng_Disk {rad} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+    proc $name {} [string map [list RAD $rad] \
+    {
+        variable pi
+        set rad [expr {RAD*sqrt(rand())}]
+        set phi [expr {2.0*$pi*rand()}]
+        set x   [expr {$rad*cos($phi)}]
+        set y   [expr {$rad*sin($phi)}]
+        return [list $x $y]
+    }]
+
+    return $name
+}
+
+
+# prng_Ball --
+#     Create a PRNG with a uniform distribution of points within a ball
+#
+# Arguments:
+#     rad       Radius of the ball
+#
+# Result:
+#     Name of a procedure that returns the x-, y- and z-coordinates of
+#     such a random point
+#
+proc ::simulation::random::prng_Ball {rad} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+    proc $name {} [string map [list RAD $rad] \
+    {
+        variable pi
+        set rad   [expr {RAD*pow(rand(),0.333333333333)}]
+        set phi   [expr {2.0*$pi*rand()}]
+        set theta [expr {acos(2.0*rand()-1.0)}]
+        set x     [expr {$rad*cos($phi)*cos($theta)}]
+        set y     [expr {$rad*sin($phi)*cos($theta)}]
+        set z     [expr {$rad*sin($theta)}]
+        return [list $x $y $z]
+    }]
+
+    return $name
+}
+
+
+# prng_Sphere --
+#     Create a PRNG with a uniform distribution of points on the surface
+#     of a sphere
+#
+# Arguments:
+#     rad       Radius of the sphere
+#
+# Result:
+#     Name of a procedure that returns the x-, y- and z-coordinates of
+#     such a random point
+#
+proc ::simulation::random::prng_Sphere {rad} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+    proc $name {} [string map [list RAD $rad] \
+    {
+        variable pi
+        set phi   [expr {2.0*$pi*rand()}]
+        set theta [expr {acos(2.0*rand()-1.0)}]
+        set x     [expr {RAD*cos($phi)*cos($theta)}]
+        set y     [expr {RAD*sin($phi)*cos($theta)}]
+        set z     [expr {RAD*sin($theta)}]
+        return [list $x $y $z]
+    }]
+
+    return $name
+}
+
+
+# prng_Rectangle --
+#     Create a PRNG with a uniform distribution of points in a rectangle
+#
+# Arguments:
+#     length    Length of the rectangle (x-direction)
+#     width     Width of the rectangle (y-direction)
+#
+# Result:
+#     Name of a procedure that returns the x- and y-coordinates of
+#     such a random point
+#
+proc ::simulation::random::prng_Rectangle {length width} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+
+    proc $name {} [string map [list LENGTH $length WIDTH $width] \
+     {
+         set x [expr {LENGTH*rand()}]
+         set y [expr {WIDTH*rand()}]
+         return [list $x $y]
+    }]
+
+    return $name
+}
+
+
+# prng_Block --
+#     Create a PRNG with a uniform distribution of points in a block
+#
+# Arguments:
+#     length    Length of the block (x-direction)
+#     width     Width of the block (y-direction)
+#     depth     Depth of the block (y-direction)
+#
+# Result:
+#     Name of a procedure that returns the x-, y- and z-coordinates of
+#     such a random point
+#
+proc ::simulation::random::prng_Block {length width depth} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+
+    proc $name {} [string map [list LENGTH $length WIDTH $width DEPTH $depth] \
+     {
+         set x [expr {LENGTH*rand()}]
+         set y [expr {WIDTH*rand()}]
+         set z [expr {DEPTH*rand()}]
+         return [list $x $y $z]
+    }]
+
+    return $name
+}
+
+
+# prng_Triangle --
+#     Create a PRNG with a triangular distribution of points on an interval.
+#     If the argument min is lower than the argument max, then smaller
+#     values have higher probability and vice versa.
+#
+# Arguments:
+#     min       Minimum value
+#     max       Maximum value
+#
+# Result:
+#     Name of a procedure that returns the random point
+#
+proc ::simulation::random::prng_Triangle {min max} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+
+    set diff [expr {$max-$min}]
+
+    if { $diff > 0.0 } {
+        proc $name {} [string map [list MIN $min DIFF $diff] \
+         {
+            set r [expr {1.0 - sqrt(1.0 - rand())}]
+            set x [expr {MIN + DIFF*$r}]
+            return $x
+        }]
+    } else {
+        proc $name {} [string map [list MAX $max DIFF $diff] \
+         {
+            set x [expr {MAX - DIFF*sqrt(rand())}]
+            return $x
+        }]
+    }
+
+    return $name
+}
+
+
+# prng_SymmetricTriangle --
+#     Create a PRNG with a symmetric triangular distribution of points on an interval.
+#
+# Arguments:
+#     min       Minimum value
+#     max       Maximum value
+#
+# Result:
+#     Name of a procedure that returns the random point
+#
+proc ::simulation::random::prng_SymmetricTriangle {min max} {
+    variable count
+
+    incr count
+
+    set name ::simulation::random::PRNG_$count
+
+    set diff2 [expr {0.5 *($max-$min)}]
+
+    proc $name {} [string map [list MIN $min DIFF2 $diff2] \
+     {
+        return [expr {MIN + DIFF2 * (rand() + rand())}]
+    }]
+
+    return $name
+}
+
+# Announce the package
+#
+package provide simulation::random 0.4.0
+
+
+# main --
+#     Test code
+#
+if { 0 } {
+set bin [::simulation::random::prng_Bernoulli 0.2]
+
+set ones  0
+set zeros 0
+for { set i 0} {$i < 100000} {incr i} {
+    if { [$bin] } {
+        incr ones
+    } else {
+        incr zeros
+    }
+}
+
+puts "Bernoulli: $ones - $zeros"
+
+set discrete [::simulation::random::prng_Discrete 10]
+
+for { set i 0} {$i < 100000} {incr i} {
+    set v [$discrete]
+
+    if { [info exists count($v)] } {
+        incr count($v)
+    } else {
+        set count($v) 1
+    }
+}
+
+puts "Discrete:"
+parray count
+
+set rect [::simulation::random::prng_Rectangle 10 3]
+
+puts "Rectangle:"
+for { set i 0} {$i < 10} {incr i} {
+    puts [$rect]
+}
+
+set normal [::simulation::random::prng_Normal 0 1]
+
+puts "Normal:"
+for { set i 0} {$i < 10} {incr i} {
+    puts [$normal]
+}
+
+#
+# Timing: how fast is the normal random number generator?
+#
+# Surprising speed: 15 million numbers per minute!
+#
+puts "Normal random number generator:"
+puts "[time {set value [$normal]} 30000]"
+set result [lindex [time {set value [$normal]} 30000] 0]
+puts "[expr {60.0e6/$result}] numbers per minute"
+puts "Creating a long list: [time {lappend value [$normal]} 30000]"
+puts "[lrange $value 0 20] - [llength $value] numbers in total"
+set value {}
+set result [lindex [time {lappend value [$normal]} 30000] 0]
+puts "[expr {60.0e6/$result}] numbers per minute"
+
+puts "Points in a rectangle:"
+puts "[time {set value [$rect]} 30000]"
+set result [lindex [time {set value [$rect]} 30000] 0]
+puts "[expr {60.0e6/$result}] numbers per minute"
+
+#
+# A more formal test
+#
+package require math
+unset count
+set samples 100000
+
+set lambda 10.0
+set poisson [::simulation::random::prng_Poisson $lambda]
+for { set i 0 } { $i < $samples } { incr i } {
+    set number [$poisson]
+    if { [info exists count($number)] } {
+        incr count($number)
+    } else {
+        set count($number) 1
+    }
+}
+parray count
+for { set i 0 } { $i < 30 } { incr i } {
+    set expected [expr {int($samples * pow($lambda,$i) * exp(-$lambda) / [::math::factorial $i])}]
+    set exp_error [expr {sqrt($expected)}]
+    if { [info exists count($i)] } {
+        if { $expected-$exp_error < $count($i) &&
+             $expected+$exp_error > $count($i) } {
+            set okay "okay"
+        } else {
+            set okay "difference too large"
+        }
+        puts "$i $expected $count($i) - [expr {$expected/double($count($i))}] - $okay"
+    } else {
+        puts "$i $expected none"
+    }
+}
+}
+
+#
+# Test hypothesis concerning rectangle
+#
+if { 0 } {
+set r2 [::simulation::random::prng_Rectangle2 10 1]
+
+set count_down  0
+set count_up    0
+set count_left  0
+set count_right 0
+for { set i 0 } { $i < 1000000 } { incr i } {
+
+    foreach {x y} [$r2] {
+        if { $x < 2.0 } { incr count_left  }
+        if { $x > 8.0 } { incr count_right }
+        if { $y < 0.2 } { incr count_down  }
+        if { $y > 0.8 } { incr count_up    }
+    }
+}
+puts "Left-right:\t$count_left\t$count_right"
+puts "Up-down:   \t$count_up\t$count_down"
+}
+
+#
+# Check normal distribution
+#
+if { 0 } {
+    package require math::statistics
+    set normal [::simulation::random::prng_Normal 0 1]
+
+    for { set i 0} {$i < 1000} {incr i} {
+        lappend numbers [$normal]
+    }
+    puts "Mean:  [::math::statistics::mean  $numbers]"
+    puts "Stdev: [::math::statistics::stdev $numbers]"
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/smtpd/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/smtpd/pkgIndex.tcl
new file mode 100644
index 00000000..f1c4fb80
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/smtpd/pkgIndex.tcl
@@ -0,0 +1,12 @@
+# Tcl package index file, version 1.1
+# This file is generated by the "pkg_mkIndex" command
+# and sourced either when an application starts up or
+# by a "package unknown" script.  It invokes the
+# "package ifneeded" command to set up package-related
+# information so that packages will be loaded automatically
+# in response to "package require" commands.  When this
+# script is sourced, the variable $dir must contain the
+# full path name of this file's directory.
+
+if {![package vsatisfies [package provide Tcl] 8.3]} {return}
+package ifneeded smtpd 1.5 [list source [file join $dir smtpd.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/smtpd/smtpd.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/smtpd/smtpd.tcl
new file mode 100644
index 00000000..96b2d9ed
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/smtpd/smtpd.tcl
@@ -0,0 +1,924 @@
+# smtpd.tcl - Copyright (C) 2001 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# This provides a minimal implementation of the Simple Mail Tranfer Protocol
+# as per RFC821 and RFC2821 (http://www.normos.org/ietf/rfc/rfc821.txt) and
+# is designed for use during local testing of SMTP client software.
+#
+# -------------------------------------------------------------------------
+# This software 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 file 'license.terms' for
+# more details.
+# -------------------------------------------------------------------------
+# @mdgen EXCLUDE: clients/mail-test.tcl
+
+package require Tcl 8.3;                # tcl minimum version
+package require logger;                 # tcllib 1.3
+package require mime;                   # tcllib
+
+package provide smtpd 1.5
+
+namespace eval ::smtpd {
+    variable version [package present smtpd]
+    variable stopped
+
+    namespace export start stop configure
+
+    variable commands
+    if {![info exists commands]} {
+        set commands {EHLO HELO MAIL RCPT DATA RSET NOOP QUIT HELP}
+        # non-minimal commands HELP VRFY EXPN VERB ETRN DSN 
+    }
+
+    variable extensions
+    if {! [info exists extensions]} {
+        array set extensions {
+            8BITMIME {}
+            SIZE     0
+        }
+    }
+
+    variable options
+    if {! [info exists options]} {
+        array set options {
+            serveraddr         {}
+            deliverMIME        {}
+            deliver            {}
+            validate_host      {}
+            validate_sender    {}
+            validate_recipient {}
+            usetls             0
+            tlsopts            {}
+        }
+        set options(banner) "tcllib smtpd $version"
+    }
+    variable tlsopts {-cadir -cafile -certfile -cipher 
+        -command -keyfile -password -request -require -ssl2 -ssl3 -tls1}
+
+    variable log
+    if {![info exists log]} {
+        set log [logger::init smtpd]
+        ${log}::setlevel warn
+        proc ${log}::stdoutcmd {level text} {
+            variable service
+            puts "\[[clock format [clock seconds] -format {%H:%M:%S}]\
+                $service $level\] $text"
+        }
+    }
+    
+    variable Help
+    if {![info exists Help]} {
+        array set Help {
+            {}   {{Topics:} {   HELO MAIL DATA RSET NOOP QUIT} 
+                {For more information use "HELP <topic>".}}
+            HELO {{HELO <hostname>} {   Introduce yourself.}}
+            MAIL {{MAIL FROM: <sender> [ <parameters> ]}
+                {   Specify the sender of the message.}
+                {   If using ESMTP there may be additional parameters of the}
+                {   form NAME=VALUE.}}
+            DATA {{DATA} {   Send your mail message.} 
+                {   End with a line containing a single dot.}}
+            RSET {{RSET} {   Reset the session.}}
+            NOOP {{NOOP} {   Command ignored by server.}}
+            QUIT {{QUIT} {   Exit SMTP session}}
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Obtain configuration options for the server.
+#
+proc ::smtpd::cget {option} {
+    variable options
+    variable tlsopts
+    variable log
+    set optname [string trimleft $option -]
+    if { [string equal option -loglevel] } {
+        return [${log}::currentloglevel]
+    } elseif { [info exists options($optname)] } {
+        return $options($optname)
+    } elseif {[lsearch -exact $tlsopts -$optname] != -1} {
+        set ndx [lsearch -exact $options(tlsopts) -$optname]
+        if {$ndx != -1} {
+            return [lindex $options(tlsopts) [incr ndx]]
+        }
+        return {}
+    } else {
+        return -code error "unknown option \"-$optname\": \
+            must be one of -[join [array names options] {, -}]"
+    }
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Configure server options. These include validation of hosts or users
+#   and a procedure to handle delivery of incoming mail. The -deliver
+#   procedure must handle mail because the server may release all session
+#   resources once the deliver proc has completed.
+#   An example might be to exec procmail to deliver the mail to users.
+#
+proc ::smtpd::configure {args} {
+    variable options
+    variable commands
+    variable extensions
+    variable log
+    variable tlsopts
+
+    if {[llength $args] == 0} {
+        set r [list -loglevel [${log}::currentloglevel]]
+        foreach {opt value} [array get options] {
+            lappend r -$opt $value
+        }
+        lappend r -
+        return $r
+    }
+
+    while {[string match -* [set option [lindex $args 0]]]} {
+        switch -glob -- $option {
+            -loglevel           {${log}::setlevel [Pop args 1]}
+            -deliverMIME        {set options(deliverMIME) [Pop args 1]}
+            -deliver            {set options(deliver) [Pop args 1]}
+            -validate_host      {set options(validate_host) [Pop args 1]}
+            -validate_sender    {set options(validate_sender) [Pop args 1]}
+            -validate_recipient {set options(validate_recipient) [Pop args 1]}
+            -banner             {set options(banner) [Pop args 1]}
+            -usetls             {
+                set usetls [Pop args 1]
+                if {$usetls && ![catch {package require tls}]} {
+                    set options(usetls) 1
+                    set extensions(STARTTLS) {}
+                    lappend commands STARTTLS
+                }
+            }
+            --                  { Pop args; break }
+            default {
+                set failed 1
+                if {[lsearch $tlsopts $option] != -1} {
+                    set options(tlsopts) \
+                        [concat $options(tlsopts) $option [Pop args 1]]
+                    set failed 0
+                }
+                set msg "unknown option: \"$option\":\
+                           must be one of -deliverMIME, -deliver,\
+                           -validate_host, -validate_recipient,\
+                           -validate_sender or an option suitable\
+                           to tls::init"
+                if {$failed} {
+                    return -code error $msg
+                }
+            }
+        }
+        Pop args
+    }
+    return {}
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Start the server on the given interface and port.
+#
+proc ::smtpd::start {{myaddr {}} {port 25}} {
+    variable options
+    variable stopped
+    
+    if {[info exists options(socket)]} {
+        return -code error \
+            "smtpd service already running on socket $options(socket)"
+    }
+
+    if {$myaddr != {}} {
+        set options(serveraddr) $myaddr
+        set myaddr "-myaddr $myaddr"
+    } else {
+        if {$options(serveraddr) == {}} {
+            set options(serveraddr) [info hostname]
+        }
+    }
+
+    set options(socket) [eval socket \
+                             -server [namespace current]::accept $myaddr $port]
+    set stopped 0
+    Log notice "smtpd service started on $options(socket)"
+    return $options(socket)
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Stop a running server. Do nothing if the server isn't running.
+#
+proc ::smtpd::stop {} {
+    variable options
+    variable stopped
+    if {[info exists options(socket)]} {
+        close $options(socket)
+        set stopped 1
+        Log notice "smtpd service stopped"
+        unset options(socket)
+    }
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Accept a new connection and setup a fileevent handler to process the new
+#   session. Performs a host id validation step before allowing access.
+#
+proc ::smtpd::accept {channel client_addr client_port} {
+    variable options
+    variable version
+    upvar [namespace current]::state_$channel State
+
+    # init state array
+    catch {unset State}
+    initializeState $channel
+    set State(access) allowed
+    set State(client_addr) $client_addr
+    set State(client_port) $client_port
+    set accepted true
+
+    # configure the data channel
+    fconfigure $channel -buffering line -translation crlf -encoding ascii
+    fileevent $channel readable [list [namespace current]::service $channel]
+
+    # check host access permissions
+    if {[cget -validate_host] != {}} {
+        if {[catch {eval [cget -validate_host] $client_addr} msg] } {
+            Log notice "access denied for $client_addr:$client_port: $msg"
+            Puts $channel "550 Access denied: $msg"
+            set State(access) denied
+            set accepted false
+        }
+    }
+    
+    if {$accepted} {
+        # Accept the connection
+        Log notice "connect from $client_addr:$client_port on $channel"
+        Puts $channel "220 $options(serveraddr) $options(banner); [timestamp]"
+    }
+    
+    return
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Initialize the channel state array. Called by accept and RSET.
+#
+proc ::smtpd::initializeState {channel} {
+    upvar [namespace current]::state_$channel State
+    set State(indata) 0
+    set State(to) {}
+    set State(from) {}
+    set State(data) {}
+    set State(options) {}
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Access the state of a connected session using the channel name as part
+#   of the state array name. Called with no value, it returns the current
+#   value of the item (or {} if not defined).
+#
+proc ::smtpd::state {channel args} {
+    if {[llength $args] == 0} {
+        return [array get [namespace current]::state_$channel]
+    }
+
+    set arrname [namespace current]::[subst state_$channel]
+
+    if {[llength $args] == 1} {
+        set r {}
+        if {[info exists [subst $arrname]($args)]} {
+            # FRINK: nocheck
+            set r [set [subst $arrname]($args)]
+        }
+        return $r
+    }
+
+    foreach {name value} $args {
+        # FRINK: nocheck
+        set [namespace current]::[subst state_$channel]($name) $value
+    }
+    return {}
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Pop the nth element off a list. Used in options processing.
+#
+proc ::smtpd::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Wrapper to call our log procedure.
+#
+proc ::smtpd::Log {level text} {
+    variable log
+    ${log}::${level} $text
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Safe puts.
+#   If the client closes the channel, then puts will throw an error. Lets
+#   terminate the session if this occurs.
+proc ::smtpd::Puts {channel args} {
+    if {[catch {uplevel puts $channel $args} msg]} {
+        Log error $msg
+        catch {
+            close $channel
+            # FRINK: nocheck
+            unset -- [namespace current]::state_$channel
+        }
+    }
+    return $msg
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Perform the chat with a connected client. This procedure accepts input on
+#   the connected socket and executes commands according to the state of the
+#   session.
+#
+proc ::smtpd::service {channel} {
+    variable commands
+    variable options
+    upvar [namespace current]::state_$channel State
+
+    if {[eof $channel]} {
+        close $channel
+        return
+    }
+
+    if {[catch {gets $channel cmdline} msg]} {
+        close $channel
+        Log error $msg
+        return
+    }
+
+    if { $cmdline == "" && [eof $channel] } {
+        Log warn "client has closed the channel"
+        return
+    }
+
+    Log debug "received: $cmdline"
+
+    # If we are handling a DATA section, keep looking for the end of data.
+    if {$State(indata)} {
+        if {$cmdline == "."} {
+            set State(indata) 0
+            fconfigure $channel -translation crlf
+            if {[catch {deliver $channel} err]} {
+                # permit delivery handler to return SMTP errors in errorCode
+                if {[regexp {\d{3}} $::errorCode]} {
+                    Puts $channel "$::errorCode $err"
+                } else {
+                    Puts $channel "554 Transaction failed: $err"
+                }
+            } else {
+                Puts $channel "250 [state $channel id]\
+                        Message accepted for delivery"
+            }
+        } else {
+            # RFC 2821 section 4.5.2: Transparency
+            if {[string match {..*} $cmdline]} {
+                set cmdline [string range $cmdline 1 end]
+            }
+            lappend State(data) $cmdline
+        }
+        return
+    }
+
+    # Process SMTP commands (case insensitive)
+    set cmd [string toupper [lindex [split $cmdline] 0]]
+    if {[lsearch $commands $cmd] != -1} {
+        if {[info proc $cmd] == {}} {
+            Puts $channel "500 $cmd not implemented"
+        } else {
+            # If access denied then client can only issue QUIT.
+            if {$State(access) == "denied" && $cmd != "QUIT" } {
+                Puts $channel "503 bad sequence of commands"
+            } else {
+                set r [eval $cmd $channel [list $cmdline]]
+            }
+        }
+    } else {
+        Puts $channel "500 Invalid command"
+    }
+
+    return
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#  Generate a random ASCII character for use in mail identifiers.
+#
+proc ::smtpd::uidchar {} {
+    set c .
+    while {! [string is alnum $c]} {
+        set n [expr {int(rand() * 74 + 48)}]
+        set c [format %c $n]
+    }
+    return $c
+}
+
+# Description:
+#  Generate a unique random identifier using only ASCII alphanumeric chars.
+#
+proc ::smtpd::uid {} {
+    set r {}
+    for {set cn 0} {$cn < 12} {incr cn} {
+        append r [uidchar]
+    }
+    return $r
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Calculate the local offset from GMT in hours for use in the timestamp
+#
+proc ::smtpd::gmtoffset {} {
+    set now [clock seconds]
+    set local [clock format $now -format "%j %H" -gmt false]
+    set zulu  [clock format $now -format "%j %H" -gmt true]
+    set lh [expr {([scan [lindex $local 0] %d] * 24) \
+                      + [scan [lindex $local 1] %d]}]
+    set zh [expr {([scan [lindex $zulu 0] %d] * 24) \
+                      + [scan [lindex $zulu 1] %d]}]
+    set off [expr {$lh - $zh}]
+    set off [format "%+03d00" $off]
+    return $off
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Generate a standard SMTP compliant timestamp. That is a local time but with
+#   the timezone represented as an offset.
+#
+proc ::smtpd::timestamp {} {
+    set ts [clock format [clock seconds] \
+                -format "%a, %d %b %Y %H:%M:%S" -gmt false]
+    append ts " " [gmtoffset]
+    return $ts
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Get the servers ip address (from http://purl.org/mini/tcl/526.html)
+#
+proc ::smtpd::server_ip {} {
+    set me [socket -server xxx -myaddr [info hostname] 0]
+    set ip [lindex [fconfigure $me -sockname] 0]
+    close $me
+    return $ip
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   deliver is called once a mail transaction is completed and there is
+#   no deliver procedure defined
+#   The configured -deliverMIME procedure is called with a MIME token.
+#   If no such callback is defined then try the -deliver option and use
+#   the old API.
+#
+proc ::smtpd::deliver {channel} {
+    set deliverMIME [cget deliverMIME]
+    if { $deliverMIME != {} \
+            && [state $channel from] != {} \
+            && [state $channel to] != {} \
+            && [state $channel data] != {} } {
+        
+        # create a MIME token from the mail message.        
+        set tok [mime::initialize -string \
+                [join [state $channel data] "\n"]]
+#        mime::setheader $tok "From" [state $channel from]
+#        foreach recipient [state $channel to] {
+#            mime::setheader $tok "To" $recipient -mode append
+#        }
+        
+        # catch and rethrow any errors.
+        set err [catch {eval $deliverMIME [list $tok]} msg]
+        mime::finalize $tok -subordinates all
+        if {$err} {
+            Log debug "error in deliver: $msg"
+            return -code error -errorcode $::errorCode \
+                    -errorinfo $::errorInfo $msg
+        }        
+        
+    } else {
+        # Try the old interface
+        deliver_old $channel
+    }
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Deliver is called once a mail transaction is completed (defined as the
+#   completion of a DATA command). The configured -deliver procedure is called
+#   with the sender, list of recipients and the text of the mail.
+#
+proc ::smtpd::deliver_old {channel} {
+    set deliver [cget deliver]
+    if { $deliver != {} \
+             && [state $channel from] != {} \
+             && [state $channel to] != {} \
+             && [state $channel data] != {} } {
+        if {[catch {$deliver [state $channel from] \
+                        [state $channel to] \
+                        [state $channel data]} msg]} {
+            Log debug "error in deliver: $msg"
+            return -code error -errorcode $::errorCode \
+                    -errorinfo $::errorInfo $msg
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+proc ::smtpd::split_address {address} {
+    set start [string first < $address]
+    set end [string last > $address]
+    set addr [string range $address $start $end]
+    incr end
+    set opts [string trim [string range $address $end end]]
+    return [list $addr $opts]
+}
+
+# -------------------------------------------------------------------------
+# The SMTP Commands
+# -------------------------------------------------------------------------
+# Description:
+#   Initiate an SMTP session
+# Reference:
+#   RFC2821 4.1.1.1
+#
+proc ::smtpd::HELO {channel line} {
+    variable options
+
+    if {[state $channel domain] != {}} {
+        Puts $channel "503 bad sequence of commands"
+        Log debug "HELO received out of sequence."
+        return
+    }
+
+    set r [regexp -nocase {^HELO\s+([-\w\.]+)\s*$} $line -> domain]
+    if {$r == 0} {
+        Puts $channel "501 Syntax error in parameters or arguments"
+        Log debug "HELO received \"$line\""
+        return
+    }
+    Puts $channel "250 $options(serveraddr) Hello $domain\
+                     \[[state $channel client_addr]\], pleased to meet you"
+    state $channel domain $domain
+    Log debug "HELO on $channel from $domain"
+    return
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Initiate an ESMTP session
+# Reference:
+#   RFC2821 4.1.1.1
+proc ::smtpd::EHLO {channel line} {
+    variable options
+    variable extensions
+
+    if {[state $channel domain] != {}} {
+        Puts $channel "503 bad sequence of commands"
+        Log debug "EHLO received out of sequence."
+        return
+    }
+
+    set r [regexp -nocase {^EHLO\s+([-\w\.]+)\s*$} $line -> domain]
+    if {$r == 0} {
+        Puts $channel "501 Syntax error in parameters or arguments"
+        Log debug "EHLO received \"$line\""
+        return
+    }
+    Puts $channel "250-$options(serveraddr) Hello $domain\
+                     \[[state $channel client_addr]\], pleased to meet you"
+    foreach {extn opts} [array get extensions] {
+        Puts $channel [string trimright "250-$extn $opts"]
+    }
+    Puts $channel "250 Ready for mail."
+    state $channel domain $domain
+    Log debug "EHLO on $channel from $domain"
+    return
+}
+
+# -------------------------------------------------------------------------
+# Description:
+# Reference:
+#   RFC2821 4.1.1.2
+#
+proc ::smtpd::MAIL {channel line} {
+    set r [regexp -nocase {^MAIL FROM:\s*(.*)} $line -> from]
+    if {$r == 0} {
+        Puts $channel "501 Syntax error in parameters or arguments"
+        Log debug "MAIL received \"$line\""
+        return
+    }
+    if {[catch {
+        set from [split_address $from]
+        set opts [lindex $from 1]
+        set from [lindex $from 0]
+        eval array set addr [mime::parseaddress $from]
+        # RFC2821 3.7: we must accept null return path addresses.
+        if {[string equal "<>" $from]} {
+            set addr(error) {}
+        }
+    } msg]} {
+        set addr(error) $msg
+    }
+    if {$addr(error) != {} } {
+        Log debug "MAIL failed $addr(error)"
+        Puts $channel "501 Syntax error in parameters or arguments"
+        return
+    }
+
+    if {[cget -validate_sender] != {}} {
+        if {[catch {eval [cget -validate_sender] $addr(address)}]} {
+            # this user has been denied
+            Log info "MAIL denied user $addr(address)"
+            Puts $channel "553 Requested action not taken:\
+                            mailbox name not allowed"
+            return
+        }
+    }
+
+    Log debug "MAIL FROM: $addr(address)"
+    state $channel from $from
+    state $channel options $opts
+    Puts $channel "250 OK"
+    return
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Specify a recipient for this mail. This command may be executed multiple
+#   times to contruct a list of recipients. If a -validate_recipient 
+#   procedure is configured then this is used. An error from the validation
+#   procedure indicates an invalid or unacceptable mailbox.
+# Reference:
+#   RFC2821 4.1.1.3
+# Notes:
+#   The postmaster mailbox MUST be supported. (RFC2821: 4.5.1)
+#
+proc ::smtpd::RCPT {channel line} {
+    set r [regexp -nocase {^RCPT TO:\s*(.*)} $line -> to]
+    if {$r == 0} {
+        Puts $channel "501 Syntax error in parameters or arguments"
+        Log debug "RCPT received \"$line\""
+        return
+    }
+    if {[catch {
+        set to [split_address $to]
+        set opts [lindex $to 1]
+        set to [lindex $to 0]
+        eval array set addr [mime::parseaddress $to]
+    } msg]} {
+        set addr(error) $msg
+    }
+
+    if {$addr(error) != {}} {
+        Log debug "RCPT failed $addr(error)"
+        Puts $channel "501 Syntax error in parameters or arguments"
+        return
+    }
+
+    if {[string match -nocase "postmaster" $addr(local)]} {
+        # we MUST support this recipient somehow as mail.
+        Log notice "RCPT to postmaster"
+    } else {
+        if {[cget -validate_recipient] != {}} {
+            if {[catch {eval [cget -validate_recipient] $addr(address)}]} {
+                # this recipient has been denied
+                Log info "RCPT denied mailbox $addr(address)"
+                Puts $channel "553 Requested action not taken:\
+                            mailbox name not allowed"
+                return
+            }
+        }
+    }
+
+    Log debug "RCPT TO: $addr(address)"
+    set recipients {}
+    catch {set recipients [state $channel to]}
+    lappend recipients $to
+    state $channel to $recipients
+    Puts $channel "250 OK"
+    return
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Begin accepting data for the mail payload. A line containing a single 
+#   period marks the end of the data and the server will then deliver the
+#   mail. RCPT and MAIL commands must have been executed before the DATA
+#   command.
+# Reference:
+#   RFC2821 4.1.1.4
+# Notes:
+#   The DATA section is the only part of the protocol permitted to use non-
+#   ASCII characters and non-CRLF line endings and some clients take
+#   advantage of this. Therefore we change the translation option on the
+#   channel and reset it once the DATA command is completed. See the
+#   'service' procedure for the handling of DATA lines.
+#   We also insert trace information as per RFC2821:4.4
+#
+proc ::smtpd::DATA {channel line} {
+    variable version
+    upvar [namespace current]::state_$channel State
+    Log debug "DATA"
+    if { $State(from) == {}} {
+        Puts $channel "503 bad sequence: no sender specified"
+    } elseif { $State(to) == {}} {
+        Puts $channel "503 bad sequence: no recipient specified"
+    } else {
+        Puts $channel "354 Enter mail, end with \".\" on a line by itself"
+        set State(id) [uid]
+        set State(indata) 1
+
+        lappend trace "Return-Path: $State(from)"
+        lappend trace "Received: from [state $channel domain]\
+                   \[[state $channel client_addr]\]"
+        lappend trace "\tby [info hostname] with tcllib smtpd ($version)"
+        if {[info exists State(tls)] && $State(tls)} {
+            catch {
+                array set t [::tls::status $channel]
+                lappend trace "\t(version=TLS1/SSL3 cipher=$t(cipher) bits=$t(sbits) verify=NO)"
+            }
+        }
+        lappend trace "\tid $State(id); [timestamp]"
+        set State(data) $trace
+        fconfigure $channel -translation auto ;# naughty: RFC2821:2.3.7
+    }
+    return
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Reset the server state for this connection.
+# Reference:
+#   RFC2821 4.1.1.5
+#
+proc ::smtpd::RSET {channel line} {
+    upvar [namespace current]::state_$channel State
+    Log debug "RSET on $channel"
+    if {[catch {initializeState $channel} msg]} {
+        Log warn "RSET: $msg"
+    }
+    Puts $channel "250 OK"
+    return
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Verify the existence of a mailbox on the server
+# Reference:
+#   RFC2821 4.1.1.6
+#
+#proc ::smtpd::VRFY {channel line} {
+#    # VRFY SP String CRLF
+#}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Expand a mailing list.
+# Reference:
+#   RFC2821 4.1.1.7
+#
+#proc ::smtpd::EXPN {channel line} {
+#    # EXPN SP String CRLF
+#}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Return a help message.
+# Reference:
+#   RFC2821 4.1.1.8
+#
+proc ::smtpd::HELP {channel line} {
+    variable Help
+    set cmd {}
+    regexp {^HELP\s*(\w+)?} $line -> cmd
+    if {[info exists Help($cmd)]} {
+        foreach line $Help($cmd) {
+            Puts $channel "214-$line"
+        }
+        Puts $channel "214 End of HELP"
+    } else {
+        Puts $channel "504 HELP topic \"$cmd\" unknown."
+    }
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Perform no action.
+# Reference:
+#   RFC2821 4.1.1.9
+#
+proc ::smtpd::NOOP {channel line} {
+    set str {}
+    regexp -nocase {^NOOP (.*)$} -> str
+    Log debug "NOOP: $str"
+    Puts $channel "250 OK"
+    return
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Terminate a session and close the transmission channel.
+# Reference:
+#   RFC2821 4.1.1.10
+# Notes:
+#   The server is only permitted to close the channel once it has received 
+#   a QUIT message.
+#
+proc ::smtpd::QUIT {channel line} {
+    variable options
+    upvar [namespace current]::state_$channel State
+
+    Log debug "QUIT on $channel"
+    Puts $channel "221 $options(serveraddr) Service closing transmission channel"
+    close $channel
+        
+    # cleanup the session state array.
+    unset State
+    return
+}
+
+# -------------------------------------------------------------------------
+# Description:
+#   Implement support for secure mail transactions using the TLS package.
+# Reference:
+#   RFC3207
+# Notes:
+#
+proc ::smtpd::STARTTLS {channel line} {
+    variable options
+    upvar [namespace current]::state_$channel State
+    
+    Log debug "$line on $channel"
+    if {![string equal $line STARTTLS]} {
+        Puts $channel "501 Syntax error (no parameters allowed)"
+        return
+    }
+
+    if {[lsearch -exact $options(tlsopts) -certfile] == -1
+        || [lsearch -exact $options(tlsopts) -keyfile] == -1} {
+        Puts $channel "454 TLS not available due to temporary reason"
+        return
+    }
+    
+    set import [linsert $options(tlsopts) 0 ::tls::import $channel -server 1]
+    Puts $channel "220 Ready to start TLS"
+    if {[catch $import msg]} {
+        Puts $channel "454 TLS not available due to temporary reason"
+    } else {
+        set State(domain) {};           #  RFC3207:4.2
+        set State(tls) 1
+    }
+    return
+}
+
+# -------------------------------------------------------------------------
+# Logging callback for use with tls - you must specify this when configuring
+# smtpd if you wan to use it.
+#
+proc ::smtpd::tlscallback {option args} {
+    switch -exact -- $option {
+        "error" {
+            foreach {chan msg} $args break
+            Log error "TLS error '$msg'"
+        } 
+        "verify" {
+            foreach {chan depth cert rc err} $args break
+            if {$rc ne "1"} {
+                Log error "TLS verify/$depth Bad cert '$err' (rc=$rc)"
+            } else {
+                array set c $cert
+                Log notice "TLS verify/$depth: $c(subject)"
+            }
+            return $rc
+        }
+        "info" {
+            foreach {chan major minor state msg} $args break
+            if {$msg ne ""} { append state ": $msg" }
+            Log debug "TLS ${major}.${minor} $state"
+        }
+        default  {
+            Log warn "bad option \"$option\" in smtpd::callback"
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+# -------------------------------------------------------------------------
+# Local variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/main1.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/main1.tcl
new file mode 100644
index 00000000..9cbe4805
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/main1.tcl
@@ -0,0 +1,3987 @@
+#-----------------------------------------------------------------------
+# TITLE:
+#	main1.tcl
+#
+# AUTHOR:
+#	Will Duquette
+#
+# DESCRIPTION:
+#       Snit's Not Incr Tcl, a simple object system in Pure Tcl.
+#
+#       Snit 1.x Compiler and Run-Time Library, Tcl 8.4 and later
+#
+#       Copyright (C) 2003-2006 by William H. Duquette
+#       This code is licensed as described in license.txt.
+#
+#-----------------------------------------------------------------------
+
+#-----------------------------------------------------------------------
+# Namespace
+
+namespace eval ::snit:: {
+    namespace export \
+        compile type widget widgetadaptor typemethod method macro
+}
+
+#-----------------------------------------------------------------------
+# Some Snit variables
+
+namespace eval ::snit:: {
+    variable reservedArgs {type selfns win self}
+
+    # Widget classes which can be hulls (must have -class)
+    variable hulltypes {
+	toplevel tk::toplevel
+	frame tk::frame ttk::frame
+	labelframe tk::labelframe ttk::labelframe
+    }
+}
+
+#-----------------------------------------------------------------------
+# Snit Type Implementation template
+
+namespace eval ::snit:: {
+    # Template type definition: All internal and user-visible Snit
+    # implementation code.
+    #
+    # The following placeholders will automatically be replaced with
+    # the client's code, in two passes:
+    #
+    # First pass:
+    # %COMPILEDDEFS%  The compiled type definition.
+    #
+    # Second pass:
+    # %TYPE%          The fully qualified type name.
+    # %IVARDECS%      Instance variable declarations
+    # %TVARDECS%      Type variable declarations
+    # %TCONSTBODY%    Type constructor body
+    # %INSTANCEVARS%  The compiled instance variable initialization code.
+    # %TYPEVARS%      The compiled type variable initialization code.
+
+    # This is the overall type template.
+    variable typeTemplate
+
+    # This is the normal type proc
+    variable nominalTypeProc
+
+    # This is the "-hastypemethods no" type proc
+    variable simpleTypeProc
+}
+
+set ::snit::typeTemplate {
+
+    #-------------------------------------------------------------------
+    # The type's namespace definition and the user's type variables
+
+    namespace eval %TYPE% {%TYPEVARS%
+    }
+
+    #----------------------------------------------------------------
+    # Commands for use in methods, typemethods, etc.
+    #
+    # These are implemented as aliases into the Snit runtime library.
+
+    interp alias {} %TYPE%::installhull  {} ::snit::RT.installhull %TYPE%
+    interp alias {} %TYPE%::install      {} ::snit::RT.install %TYPE%
+    interp alias {} %TYPE%::typevariable {} ::variable
+    interp alias {} %TYPE%::variable     {} ::snit::RT.variable
+    interp alias {} %TYPE%::mytypevar    {} ::snit::RT.mytypevar %TYPE%
+    interp alias {} %TYPE%::typevarname  {} ::snit::RT.mytypevar %TYPE%
+    interp alias {} %TYPE%::myvar        {} ::snit::RT.myvar
+    interp alias {} %TYPE%::varname      {} ::snit::RT.myvar
+    interp alias {} %TYPE%::codename     {} ::snit::RT.codename %TYPE%
+    interp alias {} %TYPE%::myproc       {} ::snit::RT.myproc %TYPE%
+    interp alias {} %TYPE%::mymethod     {} ::snit::RT.mymethod
+    interp alias {} %TYPE%::mytypemethod {} ::snit::RT.mytypemethod %TYPE%
+    interp alias {} %TYPE%::from         {} ::snit::RT.from %TYPE%
+
+    #-------------------------------------------------------------------
+    # Snit's internal variables
+
+    namespace eval %TYPE% {
+        # Array: General Snit Info
+        #
+        # ns:                The type's namespace
+        # hasinstances:      T or F, from pragma -hasinstances.
+        # simpledispatch:    T or F, from pragma -hasinstances.
+        # canreplace:        T or F, from pragma -canreplace.
+        # counter:           Count of instances created so far.
+        # widgetclass:       Set by widgetclass statement.
+        # hulltype:          Hull type (frame or toplevel) for widgets only.
+        # exceptmethods:     Methods explicitly not delegated to *
+        # excepttypemethods: Methods explicitly not delegated to *
+        # tvardecs:          Type variable declarations--for dynamic methods
+        # ivardecs:          Instance variable declarations--for dyn. methods
+        typevariable Snit_info
+        set Snit_info(ns)      %TYPE%::
+        set Snit_info(hasinstances) 1
+        set Snit_info(simpledispatch) 0
+        set Snit_info(canreplace) 0
+        set Snit_info(counter) 0
+        set Snit_info(widgetclass) {}
+        set Snit_info(hulltype) frame
+        set Snit_info(exceptmethods) {}
+        set Snit_info(excepttypemethods) {}
+        set Snit_info(tvardecs) {%TVARDECS%}
+        set Snit_info(ivardecs) {%IVARDECS%}
+
+        # Array: Public methods of this type.
+        # The index is the method name, or "*".
+        # The value is [list $pattern $componentName], where
+        # $componentName is "" for normal methods.
+        typevariable Snit_typemethodInfo
+        array unset Snit_typemethodInfo
+
+        # Array: Public methods of instances of this type.
+        # The index is the method name, or "*".
+        # The value is [list $pattern $componentName], where
+        # $componentName is "" for normal methods.
+        typevariable Snit_methodInfo
+        array unset Snit_methodInfo
+
+        # Array: option information.  See dictionary.txt.
+        typevariable Snit_optionInfo
+        array unset Snit_optionInfo
+        set Snit_optionInfo(local)     {}
+        set Snit_optionInfo(delegated) {}
+        set Snit_optionInfo(starcomp)  {}
+        set Snit_optionInfo(except)    {}
+    }
+
+    #----------------------------------------------------------------
+    # Compiled Procs
+    #
+    # These commands are created or replaced during compilation:
+
+
+    # Snit_instanceVars selfns
+    #
+    # Initializes the instance variables, if any.  Called during
+    # instance creation.
+
+    proc %TYPE%::Snit_instanceVars {selfns} {
+        %INSTANCEVARS%
+    }
+
+    # Type Constructor
+    proc %TYPE%::Snit_typeconstructor {type} {
+        %TVARDECS%
+        %TCONSTBODY%
+    }
+
+    #----------------------------------------------------------------
+    # Default Procs
+    #
+    # These commands might be replaced during compilation:
+
+    # Snit_destructor type selfns win self
+    #
+    # Default destructor for the type.  By default, it does
+    # nothing.  It's replaced by any user destructor.
+    # For types, it's called by method destroy; for widgettypes,
+    # it's called by a destroy event handler.
+
+    proc %TYPE%::Snit_destructor {type selfns win self} { }
+
+    #----------------------------------------------------------
+    # Compiled Definitions
+
+    %COMPILEDDEFS%
+
+    #----------------------------------------------------------
+    # Finally, call the Type Constructor
+
+    %TYPE%::Snit_typeconstructor %TYPE%
+}
+
+#-----------------------------------------------------------------------
+# Type procs
+#
+# These procs expect the fully-qualified type name to be
+# substituted in for %TYPE%.
+
+# This is the nominal type proc.  It supports typemethods and
+# delegated typemethods.
+set ::snit::nominalTypeProc {
+    # Type dispatcher function.  Note: This function lives
+    # in the parent of the %TYPE% namespace!  All accesses to
+    # %TYPE% variables and methods must be qualified!
+    proc %TYPE% {{method ""} args} {
+        # First, if there's no method, and no args, and there's a create
+        # method, and this isn't a widget, then method is "create" and
+        # "args" is %AUTO%.
+        if {"" == $method && [llength $args] == 0} {
+            ::variable %TYPE%::Snit_info
+
+            if {$Snit_info(hasinstances) && !$Snit_info(isWidget)} {
+                set method create
+                lappend args %AUTO%
+            } else {
+                error "wrong \# args: should be \"%TYPE% method args\""
+            }
+        }
+
+        # Next, retrieve the command.
+	variable %TYPE%::Snit_typemethodCache
+        while 1 {
+            if {[catch {set Snit_typemethodCache($method)} commandRec]} {
+                set commandRec [::snit::RT.CacheTypemethodCommand %TYPE% $method]
+
+                if {[llength $commandRec] == 0} {
+                    return -code error  "\"%TYPE% $method\" is not defined"
+                }
+            }
+
+            # If we've got a real command, break.
+            if {[lindex $commandRec 0] == 0} {
+                break
+            }
+
+            # Otherwise, we need to look up again...if we can.
+            if {[llength $args] == 0} {
+                return -code error \
+                 "wrong number args: should be \"%TYPE% $method method args\""
+            }
+
+            lappend method [lindex $args 0]
+            set args [lrange $args 1 end]
+        }
+
+        set command [lindex $commandRec 1]
+
+        # Pass along the return code unchanged.
+        set retval [catch {uplevel 1 $command $args} result]
+
+        if {$retval} {
+            if {$retval == 1} {
+                global errorInfo
+                global errorCode
+                return -code error -errorinfo $errorInfo \
+                    -errorcode $errorCode $result
+            } else {
+                return -code $retval $result
+            }
+        }
+
+        return $result
+    }
+}
+
+# This is the simplified type proc for when there are no typemethods
+# except create.  In this case, it doesn't take a method argument;
+# the method is always "create".
+set ::snit::simpleTypeProc {
+    # Type dispatcher function.  Note: This function lives
+    # in the parent of the %TYPE% namespace!  All accesses to
+    # %TYPE% variables and methods must be qualified!
+    proc %TYPE% {args} {
+        ::variable %TYPE%::Snit_info
+
+        # FIRST, if the are no args, the single arg is %AUTO%
+        if {[llength $args] == 0} {
+            if {$Snit_info(isWidget)} {
+                error "wrong \# args: should be \"%TYPE% name args\""
+            }
+
+            lappend args %AUTO%
+        }
+
+        # NEXT, we're going to call the create method.
+        # Pass along the return code unchanged.
+        if {$Snit_info(isWidget)} {
+            set command [list ::snit::RT.widget.typemethod.create %TYPE%]
+        } else {
+            set command [list ::snit::RT.type.typemethod.create %TYPE%]
+        }
+
+        set retval [catch {uplevel 1 $command $args} result]
+
+        if {$retval} {
+            if {$retval == 1} {
+                global errorInfo
+                global errorCode
+                return -code error -errorinfo $errorInfo \
+                    -errorcode $errorCode $result
+            } else {
+                return -code $retval $result
+            }
+        }
+
+        return $result
+    }
+}
+
+#-----------------------------------------------------------------------
+# Instance procs
+#
+# The following must be substituted into these proc bodies:
+#
+# %SELFNS%       The instance namespace
+# %WIN%          The original instance name
+# %TYPE%         The fully-qualified type name
+#
+
+# Nominal instance proc body: supports method caching and delegation.
+#
+# proc $instanceName {method args} ....
+set ::snit::nominalInstanceProc {
+    set self [set %SELFNS%::Snit_instance]
+
+    while {1} {
+        if {[catch {set %SELFNS%::Snit_methodCache($method)} commandRec]} {
+            set commandRec [snit::RT.CacheMethodCommand %TYPE% %SELFNS% %WIN% $self $method]
+
+            if {[llength $commandRec] == 0} {
+                return -code error \
+                    "\"$self $method\" is not defined"
+            }
+        }
+
+        # If we've got a real command, break.
+        if {[lindex $commandRec 0] == 0} {
+            break
+        }
+
+        # Otherwise, we need to look up again...if we can.
+        if {[llength $args] == 0} {
+            return -code error \
+                "wrong number args: should be \"$self $method method args\""
+        }
+
+        lappend method [lindex $args 0]
+        set args [lrange $args 1 end]
+    }
+
+    set command [lindex $commandRec 1]
+
+    # Pass along the return code unchanged.
+    set retval [catch {uplevel 1 $command $args} result]
+
+    if {$retval} {
+        if {$retval == 1} {
+            global errorInfo
+            global errorCode
+            return -code error -errorinfo $errorInfo \
+                -errorcode $errorCode $result
+        } else {
+            return -code $retval $result
+        }
+    }
+
+    return $result
+}
+
+# Simplified method proc body: No delegation allowed; no support for
+# upvar or exotic return codes or hierarchical methods.  Designed for
+# max speed for simple types.
+#
+# proc $instanceName {method args} ....
+
+set ::snit::simpleInstanceProc {
+    set self [set %SELFNS%::Snit_instance]
+
+    if {[lsearch -exact ${%TYPE%::Snit_methods} $method] == -1} {
+	set optlist [join ${%TYPE%::Snit_methods} ", "]
+	set optlist [linsert $optlist "end-1" "or"]
+	error "bad option \"$method\": must be $optlist"
+    }
+
+    eval [linsert $args 0 \
+              %TYPE%::Snit_method$method %TYPE% %SELFNS% %WIN% $self]
+}
+
+
+#=======================================================================
+# Snit Type Definition
+#
+# These are the procs used to define Snit types, widgets, and
+# widgetadaptors.
+
+
+#-----------------------------------------------------------------------
+# Snit Compilation Variables
+#
+# The following variables are used while Snit is compiling a type,
+# and are disposed afterwards.
+
+namespace eval ::snit:: {
+    # The compiler variable contains the name of the slave interpreter
+    # used to compile type definitions.
+    variable compiler ""
+
+    # The compile array accumulates information about the type or
+    # widgettype being compiled.  It is cleared before and after each
+    # compilation.  It has these indices:
+    #
+    # type:                  The name of the type being compiled, for use
+    #                        in compilation procs.
+    # defs:                  Compiled definitions, both standard and client.
+    # which:                 type, widget, widgetadaptor
+    # instancevars:          Instance variable definitions and initializations.
+    # ivprocdec:             Instance variable proc declarations.
+    # tvprocdec:             Type variable proc declarations.
+    # typeconstructor:       Type constructor body.
+    # widgetclass:           The widgetclass, for snit::widgets, only
+    # hasoptions:            False, initially; set to true when first
+    #                        option is defined.
+    # localoptions:          Names of local options.
+    # delegatedoptions:      Names of delegated options.
+    # localmethods:          Names of locally defined methods.
+    # delegatesmethods:      no if no delegated methods, yes otherwise.
+    # hashierarchic       :  no if no hierarchic methods, yes otherwise.
+    # components:            Names of defined components.
+    # typecomponents:        Names of defined typecomponents.
+    # typevars:              Typevariable definitions and initializations.
+    # varnames:              Names of instance variables
+    # typevarnames           Names of type variables
+    # hasconstructor         False, initially; true when constructor is
+    #                        defined.
+    # resource-$opt          The option's resource name
+    # class-$opt             The option's class
+    # -default-$opt          The option's default value
+    # -validatemethod-$opt   The option's validate method
+    # -configuremethod-$opt  The option's configure method
+    # -cgetmethod-$opt       The option's cget method.
+    # -hastypeinfo           The -hastypeinfo pragma
+    # -hastypedestroy        The -hastypedestroy pragma
+    # -hastypemethods        The -hastypemethods pragma
+    # -hasinfo               The -hasinfo pragma
+    # -hasinstances          The -hasinstances pragma
+    # -simpledispatch        The -simpledispatch pragma
+    # -canreplace            The -canreplace pragma
+    variable compile
+
+    # This variable accumulates method dispatch information; it has
+    # the same structure as the %TYPE%::Snit_methodInfo array, and is
+    # used to initialize it.
+    variable methodInfo
+
+    # This variable accumulates typemethod dispatch information; it has
+    # the same structure as the %TYPE%::Snit_typemethodInfo array, and is
+    # used to initialize it.
+    variable typemethodInfo
+
+    # The following variable lists the reserved type definition statement
+    # names, e.g., the names you can't use as macros.  It's built at
+    # compiler definition time using "info commands".
+    variable reservedwords {}
+}
+
+#-----------------------------------------------------------------------
+# type compilation commands
+#
+# The type and widgettype commands use a slave interpreter to compile
+# the type definition.  These are the procs
+# that are aliased into it.
+
+# Initialize the compiler
+proc ::snit::Comp.Init {} {
+    variable compiler
+    variable reservedwords
+
+    if {"" == $compiler} {
+        # Create the compiler's interpreter
+        set compiler [interp create]
+
+        # Initialize the interpreter
+	$compiler eval {
+	    catch {close stdout}
+	    catch {close stderr}
+	    catch {close stdin}
+
+            # Load package information
+            # TBD: see if this can be moved outside.
+	    # @mdgen NODEP: ::snit::__does_not_exist__
+            catch {package require ::snit::__does_not_exist__}
+
+            # Protect some Tcl commands our type definitions
+            # will shadow.
+            rename proc _proc
+            rename variable _variable
+        }
+
+        # Define compilation aliases.
+        $compiler alias pragma          ::snit::Comp.statement.pragma
+        $compiler alias widgetclass     ::snit::Comp.statement.widgetclass
+        $compiler alias hulltype        ::snit::Comp.statement.hulltype
+        $compiler alias constructor     ::snit::Comp.statement.constructor
+        $compiler alias destructor      ::snit::Comp.statement.destructor
+        $compiler alias option          ::snit::Comp.statement.option
+        $compiler alias oncget          ::snit::Comp.statement.oncget
+        $compiler alias onconfigure     ::snit::Comp.statement.onconfigure
+        $compiler alias method          ::snit::Comp.statement.method
+        $compiler alias typemethod      ::snit::Comp.statement.typemethod
+        $compiler alias typeconstructor ::snit::Comp.statement.typeconstructor
+        $compiler alias proc            ::snit::Comp.statement.proc
+        $compiler alias typevariable    ::snit::Comp.statement.typevariable
+        $compiler alias variable        ::snit::Comp.statement.variable
+        $compiler alias typecomponent   ::snit::Comp.statement.typecomponent
+        $compiler alias component       ::snit::Comp.statement.component
+        $compiler alias delegate        ::snit::Comp.statement.delegate
+        $compiler alias expose          ::snit::Comp.statement.expose
+
+        # Get the list of reserved words
+        set reservedwords [$compiler eval {info commands}]
+    }
+}
+
+# Compile a type definition, and return the results as a list of two
+# items: the fully-qualified type name, and a script that will define
+# the type when executed.
+#
+# which		type, widget, or widgetadaptor
+# type          the type name
+# body          the type definition
+proc ::snit::Comp.Compile {which type body} {
+    variable typeTemplate
+    variable nominalTypeProc
+    variable simpleTypeProc
+    variable compile
+    variable compiler
+    variable methodInfo
+    variable typemethodInfo
+
+    # FIRST, qualify the name.
+    if {![string match "::*" $type]} {
+        # Get caller's namespace;
+        # append :: if not global namespace.
+        set ns [uplevel 2 [list namespace current]]
+        if {"::" != $ns} {
+            append ns "::"
+        }
+
+        set type "$ns$type"
+    }
+
+    # NEXT, create and initialize the compiler, if needed.
+    Comp.Init
+
+    # NEXT, initialize the class data
+    array unset methodInfo
+    array unset typemethodInfo
+
+    array unset compile
+    set compile(type) $type
+    set compile(defs) {}
+    set compile(which) $which
+    set compile(hasoptions) no
+    set compile(localoptions) {}
+    set compile(instancevars) {}
+    set compile(typevars) {}
+    set compile(delegatedoptions) {}
+    set compile(ivprocdec) {}
+    set compile(tvprocdec) {}
+    set compile(typeconstructor) {}
+    set compile(widgetclass) {}
+    set compile(hulltype) {}
+    set compile(localmethods) {}
+    set compile(delegatesmethods) no
+    set compile(hashierarchic) no
+    set compile(components) {}
+    set compile(typecomponents) {}
+    set compile(varnames) {}
+    set compile(typevarnames) {}
+    set compile(hasconstructor) no
+    set compile(-hastypedestroy) yes
+    set compile(-hastypeinfo) yes
+    set compile(-hastypemethods) yes
+    set compile(-hasinfo) yes
+    set compile(-hasinstances) yes
+    set compile(-simpledispatch) no
+    set compile(-canreplace) no
+
+    set isWidget [string match widget* $which]
+    set isWidgetAdaptor [string match widgetadaptor $which]
+
+    # NEXT, Evaluate the type's definition in the class interpreter.
+    $compiler eval $body
+
+    # NEXT, Add the standard definitions
+    append compile(defs) \
+        "\nset %TYPE%::Snit_info(isWidget) $isWidget\n"
+
+    append compile(defs) \
+        "\nset %TYPE%::Snit_info(isWidgetAdaptor) $isWidgetAdaptor\n"
+
+    # Indicate whether the type can create instances that replace
+    # existing commands.
+    append compile(defs) "\nset %TYPE%::Snit_info(canreplace) $compile(-canreplace)\n"
+
+
+    # Check pragmas for conflict.
+
+    if {!$compile(-hastypemethods) && !$compile(-hasinstances)} {
+        error "$which $type has neither typemethods nor instances"
+    }
+
+    if {$compile(-simpledispatch) && $compile(delegatesmethods)} {
+        error "$which $type requests -simpledispatch but delegates methods."
+    }
+
+    if {$compile(-simpledispatch) && $compile(hashierarchic)} {
+        error "$which $type requests -simpledispatch but defines hierarchical methods."
+    }
+
+    # If there are typemethods, define the standard typemethods and
+    # the nominal type proc.  Otherwise define the simple type proc.
+    if {$compile(-hastypemethods)} {
+        # Add the info typemethod unless the pragma forbids it.
+        if {$compile(-hastypeinfo)} {
+            Comp.statement.delegate typemethod info \
+                using {::snit::RT.typemethod.info %t}
+        }
+
+        # Add the destroy typemethod unless the pragma forbids it.
+        if {$compile(-hastypedestroy)} {
+            Comp.statement.delegate typemethod destroy \
+                using {::snit::RT.typemethod.destroy %t}
+        }
+
+        # Add the nominal type proc.
+        append compile(defs) $nominalTypeProc
+    } else {
+        # Add the simple type proc.
+        append compile(defs) $simpleTypeProc
+    }
+
+    # Add standard methods/typemethods that only make sense if the
+    # type has instances.
+    if {$compile(-hasinstances)} {
+        # If we're using simple dispatch, remember that.
+        if {$compile(-simpledispatch)} {
+            append compile(defs) "\nset %TYPE%::Snit_info(simpledispatch) 1\n"
+        }
+
+        # Add the info method unless the pragma forbids it.
+        if {$compile(-hasinfo)} {
+            if {!$compile(-simpledispatch)} {
+                Comp.statement.delegate method info \
+                    using {::snit::RT.method.info %t %n %w %s}
+            } else {
+                Comp.statement.method info {args} {
+                    eval [linsert $args 0 \
+                              ::snit::RT.method.info $type $selfns $win $self]
+                }
+            }
+        }
+
+        # Add the option handling stuff if there are any options.
+        if {$compile(hasoptions)} {
+            Comp.statement.variable options
+
+            if {!$compile(-simpledispatch)} {
+                Comp.statement.delegate method cget \
+                    using {::snit::RT.method.cget %t %n %w %s}
+                Comp.statement.delegate method configurelist \
+                    using {::snit::RT.method.configurelist %t %n %w %s}
+                Comp.statement.delegate method configure \
+                    using {::snit::RT.method.configure %t %n %w %s}
+            } else {
+                Comp.statement.method cget {args} {
+                    eval [linsert $args 0 \
+                              ::snit::RT.method.cget $type $selfns $win $self]
+                }
+                Comp.statement.method configurelist {args} {
+                    eval [linsert $args 0 \
+                              ::snit::RT.method.configurelist $type $selfns $win $self]
+                }
+                Comp.statement.method configure {args} {
+                    eval [linsert $args 0 \
+                              ::snit::RT.method.configure $type $selfns $win $self]
+                }
+            }
+        }
+
+        # Add a default constructor, if they haven't already defined one.
+        # If there are options, it will configure args; otherwise it
+        # will do nothing.
+        if {!$compile(hasconstructor)} {
+            if {$compile(hasoptions)} {
+                Comp.statement.constructor {args} {
+                    $self configurelist $args
+                }
+            } else {
+                Comp.statement.constructor {} {}
+            }
+        }
+
+        if {!$isWidget} {
+            if {!$compile(-simpledispatch)} {
+                Comp.statement.delegate method destroy \
+                    using {::snit::RT.method.destroy %t %n %w %s}
+            } else {
+                Comp.statement.method destroy {args} {
+                    eval [linsert $args 0 \
+                              ::snit::RT.method.destroy $type $selfns $win $self]
+                }
+            }
+
+            Comp.statement.delegate typemethod create \
+                using {::snit::RT.type.typemethod.create %t}
+        } else {
+            Comp.statement.delegate typemethod create \
+                using {::snit::RT.widget.typemethod.create %t}
+        }
+
+        # Save the list of method names, for -simpledispatch; otherwise,
+        # save the method info.
+        if {$compile(-simpledispatch)} {
+            append compile(defs) \
+                "\nset %TYPE%::Snit_methods [list $compile(localmethods)]\n"
+        } else {
+            append compile(defs) \
+                "\narray set %TYPE%::Snit_methodInfo [list [array get methodInfo]]\n"
+        }
+
+    } else {
+        append compile(defs) "\nset %TYPE%::Snit_info(hasinstances) 0\n"
+    }
+
+    # NEXT, compiling the type definition built up a set of information
+    # about the type's locally defined options; add this information to
+    # the compiled definition.
+    Comp.SaveOptionInfo
+
+    # NEXT, compiling the type definition built up a set of information
+    # about the typemethods; save the typemethod info.
+    append compile(defs) \
+        "\narray set %TYPE%::Snit_typemethodInfo [list [array get typemethodInfo]]\n"
+
+    # NEXT, if this is a widget define the hull component if it isn't
+    # already defined.
+    if {$isWidget} {
+        Comp.DefineComponent hull
+    }
+
+    # NEXT, substitute the compiled definition into the type template
+    # to get the type definition script.
+    set defscript [Expand $typeTemplate \
+                       %COMPILEDDEFS% $compile(defs)]
+
+    # NEXT, substitute the defined macros into the type definition script.
+    # This is done as a separate step so that the compile(defs) can
+    # contain the macros defined below.
+
+    set defscript [Expand $defscript \
+                       %TYPE%         $type \
+                       %IVARDECS%     $compile(ivprocdec) \
+                       %TVARDECS%     $compile(tvprocdec) \
+                       %TCONSTBODY%   $compile(typeconstructor) \
+                       %INSTANCEVARS% $compile(instancevars) \
+                       %TYPEVARS%     $compile(typevars) \
+		       ]
+
+    array unset compile
+
+    return [list $type $defscript]
+}
+
+# Information about locally-defined options is accumulated during
+# compilation, but not added to the compiled definition--the option
+# statement can appear multiple times, so it's easier this way.
+# This proc fills in Snit_optionInfo with the accumulated information.
+#
+# It also computes the option's resource and class names if needed.
+#
+# Note that the information for delegated options was put in
+# Snit_optionInfo during compilation.
+
+proc ::snit::Comp.SaveOptionInfo {} {
+    variable compile
+
+    foreach option $compile(localoptions) {
+        if {"" == $compile(resource-$option)} {
+            set compile(resource-$option) [string range $option 1 end]
+        }
+
+        if {"" == $compile(class-$option)} {
+            set compile(class-$option) [Capitalize $compile(resource-$option)]
+        }
+
+        # NOTE: Don't verify that the validate, configure, and cget
+        # values name real methods; the methods might be defined outside
+        # the typedefinition using snit::method.
+
+        Mappend compile(defs) {
+            # Option %OPTION%
+            lappend %TYPE%::Snit_optionInfo(local) %OPTION%
+
+            set %TYPE%::Snit_optionInfo(islocal-%OPTION%)   1
+            set %TYPE%::Snit_optionInfo(resource-%OPTION%)  %RESOURCE%
+            set %TYPE%::Snit_optionInfo(class-%OPTION%)     %CLASS%
+            set %TYPE%::Snit_optionInfo(default-%OPTION%)   %DEFAULT%
+            set %TYPE%::Snit_optionInfo(validate-%OPTION%)  %VALIDATE%
+            set %TYPE%::Snit_optionInfo(configure-%OPTION%) %CONFIGURE%
+            set %TYPE%::Snit_optionInfo(cget-%OPTION%)      %CGET%
+            set %TYPE%::Snit_optionInfo(readonly-%OPTION%)  %READONLY%
+            set %TYPE%::Snit_optionInfo(typespec-%OPTION%)  %TYPESPEC%
+        }   %OPTION%    $option                                   \
+            %RESOURCE%  $compile(resource-$option)                \
+            %CLASS%     $compile(class-$option)                   \
+            %DEFAULT%   [list $compile(-default-$option)]         \
+            %VALIDATE%  [list $compile(-validatemethod-$option)]  \
+            %CONFIGURE% [list $compile(-configuremethod-$option)] \
+            %CGET%      [list $compile(-cgetmethod-$option)]      \
+            %READONLY%  $compile(-readonly-$option)               \
+            %TYPESPEC%  [list $compile(-type-$option)]
+    }
+}
+
+
+# Evaluates a compiled type definition, thus making the type available.
+proc ::snit::Comp.Define {compResult} {
+    # The compilation result is a list containing the fully qualified
+    # type name and a script to evaluate to define the type.
+    set type [lindex $compResult 0]
+    set defscript [lindex $compResult 1]
+
+    # Execute the type definition script.
+    # Consider using namespace eval %TYPE%.  See if it's faster.
+    if {[catch {eval $defscript} result]} {
+        namespace delete $type
+        catch {rename $type ""}
+        error $result
+    }
+
+    return $type
+}
+
+# Sets pragma options which control how the type is defined.
+proc ::snit::Comp.statement.pragma {args} {
+    variable compile
+
+    set errRoot "Error in \"pragma...\""
+
+    foreach {opt val} $args {
+        switch -exact -- $opt {
+            -hastypeinfo    -
+            -hastypedestroy -
+            -hastypemethods -
+            -hasinstances   -
+            -simpledispatch -
+            -hasinfo        -
+            -canreplace     {
+                if {![string is boolean -strict $val]} {
+                    error "$errRoot, \"$opt\" requires a boolean value"
+                }
+                set compile($opt) $val
+            }
+            default {
+                error "$errRoot, unknown pragma"
+            }
+        }
+    }
+}
+
+# Defines a widget's option class name.
+# This statement is only available for snit::widgets,
+# not for snit::types or snit::widgetadaptors.
+proc ::snit::Comp.statement.widgetclass {name} {
+    variable compile
+
+    # First, widgetclass can only be set for true widgets
+    if {"widget" != $compile(which)} {
+        error "widgetclass cannot be set for snit::$compile(which)s"
+    }
+
+    # Next, validate the option name.  We'll require that it begin
+    # with an uppercase letter.
+    set initial [string index $name 0]
+    if {![string is upper $initial]} {
+        error "widgetclass \"$name\" does not begin with an uppercase letter"
+    }
+
+    if {"" != $compile(widgetclass)} {
+        error "too many widgetclass statements"
+    }
+
+    # Next, save it.
+    Mappend compile(defs) {
+        set  %TYPE%::Snit_info(widgetclass) %WIDGETCLASS%
+    } %WIDGETCLASS% [list $name]
+
+    set compile(widgetclass) $name
+}
+
+# Defines a widget's hull type.
+# This statement is only available for snit::widgets,
+# not for snit::types or snit::widgetadaptors.
+proc ::snit::Comp.statement.hulltype {name} {
+    variable compile
+    variable hulltypes
+
+    # First, hulltype can only be set for true widgets
+    if {"widget" != $compile(which)} {
+        error "hulltype cannot be set for snit::$compile(which)s"
+    }
+
+    # Next, it must be one of the valid hulltypes (frame, toplevel, ...)
+    if {[lsearch -exact $hulltypes [string trimleft $name :]] == -1} {
+        error "invalid hulltype \"$name\", should be one of\
+		[join $hulltypes {, }]"
+    }
+
+    if {"" != $compile(hulltype)} {
+        error "too many hulltype statements"
+    }
+
+    # Next, save it.
+    Mappend compile(defs) {
+        set  %TYPE%::Snit_info(hulltype) %HULLTYPE%
+    } %HULLTYPE% $name
+
+    set compile(hulltype) $name
+}
+
+# Defines a constructor.
+proc ::snit::Comp.statement.constructor {arglist body} {
+    variable compile
+
+    CheckArgs "constructor" $arglist
+
+    # Next, add a magic reference to self.
+    set arglist [concat type selfns win self $arglist]
+
+    # Next, add variable declarations to body:
+    set body "%TVARDECS%%IVARDECS%\n$body"
+
+    set compile(hasconstructor) yes
+    append compile(defs) "proc %TYPE%::Snit_constructor [list $arglist] [list $body]\n"
+}
+
+# Defines a destructor.
+proc ::snit::Comp.statement.destructor {body} {
+    variable compile
+
+    # Next, add variable declarations to body:
+    set body "%TVARDECS%%IVARDECS%\n$body"
+
+    append compile(defs) "proc %TYPE%::Snit_destructor {type selfns win self} [list $body]\n\n"
+}
+
+# Defines a type option.  The option value can be a triple, specifying
+# the option's -name, resource name, and class name.
+proc ::snit::Comp.statement.option {optionDef args} {
+    variable compile
+
+    # First, get the three option names.
+    set option [lindex $optionDef 0]
+    set resourceName [lindex $optionDef 1]
+    set className [lindex $optionDef 2]
+
+    set errRoot "Error in \"option [list $optionDef]...\""
+
+    # Next, validate the option name.
+    if {![Comp.OptionNameIsValid $option]} {
+        error "$errRoot, badly named option \"$option\""
+    }
+
+    if {[Contains $option $compile(delegatedoptions)]} {
+        error "$errRoot, cannot define \"$option\" locally, it has been delegated"
+    }
+
+    if {![Contains $option $compile(localoptions)]} {
+        # Remember that we've seen this one.
+        set compile(hasoptions) yes
+        lappend compile(localoptions) $option
+
+        # Initialize compilation info for this option.
+        set compile(resource-$option)         ""
+        set compile(class-$option)            ""
+        set compile(-default-$option)         ""
+        set compile(-validatemethod-$option)  ""
+        set compile(-configuremethod-$option) ""
+        set compile(-cgetmethod-$option)      ""
+        set compile(-readonly-$option)        0
+        set compile(-type-$option)            ""
+    }
+
+    # NEXT, see if we have a resource name.  If so, make sure it
+    # isn't being redefined differently.
+    if {"" != $resourceName} {
+        if {"" == $compile(resource-$option)} {
+            # If it's undefined, just save the value.
+            set compile(resource-$option) $resourceName
+        } elseif {![string equal $resourceName $compile(resource-$option)]} {
+            # It's been redefined differently.
+            error "$errRoot, resource name redefined from \"$compile(resource-$option)\" to \"$resourceName\""
+        }
+    }
+
+    # NEXT, see if we have a class name.  If so, make sure it
+    # isn't being redefined differently.
+    if {"" != $className} {
+        if {"" == $compile(class-$option)} {
+            # If it's undefined, just save the value.
+            set compile(class-$option) $className
+        } elseif {![string equal $className $compile(class-$option)]} {
+            # It's been redefined differently.
+            error "$errRoot, class name redefined from \"$compile(class-$option)\" to \"$className\""
+        }
+    }
+
+    # NEXT, handle the args; it's not an error to redefine these.
+    if {[llength $args] == 1} {
+        set compile(-default-$option) [lindex $args 0]
+    } else {
+        foreach {optopt val} $args {
+            switch -exact -- $optopt {
+                -default         -
+                -validatemethod  -
+                -configuremethod -
+                -cgetmethod      {
+                    set compile($optopt-$option) $val
+                }
+                -type {
+                    set compile($optopt-$option) $val
+                    
+                    if {[llength $val] == 1} {
+                        # The type spec *is* the validation object
+                        append compile(defs) \
+                            "\nset %TYPE%::Snit_optionInfo(typeobj-$option) [list $val]\n"
+                    } else {
+                        # Compilation the creation of the validation object
+                        set cmd [linsert $val 1 %TYPE%::Snit_TypeObj_%AUTO%]
+                        append compile(defs) \
+                            "\nset %TYPE%::Snit_optionInfo(typeobj-$option) \[$cmd\]\n"
+                    }
+                }
+                -readonly        {
+                    if {![string is boolean -strict $val]} {
+                        error "$errRoot, -readonly requires a boolean, got \"$val\""
+                    }
+                    set compile($optopt-$option) $val
+                }
+                default {
+                    error "$errRoot, unknown option definition option \"$optopt\""
+                }
+            }
+        }
+    }
+}
+
+# 1 if the option name is valid, 0 otherwise.
+proc ::snit::Comp.OptionNameIsValid {option} {
+    if {![string match {-*} $option] || [string match {*[A-Z ]*} $option]} {
+        return 0
+    }
+
+    return 1
+}
+
+# Defines an option's cget handler
+proc ::snit::Comp.statement.oncget {option body} {
+    variable compile
+
+    set errRoot "Error in \"oncget $option...\""
+
+    if {[lsearch -exact $compile(delegatedoptions) $option] != -1} {
+        return -code error "$errRoot, option \"$option\" is delegated"
+    }
+
+    if {[lsearch -exact $compile(localoptions) $option] == -1} {
+        return -code error "$errRoot, option \"$option\" unknown"
+    }
+
+    Comp.statement.method _cget$option {_option} $body
+    Comp.statement.option $option -cgetmethod _cget$option
+}
+
+# Defines an option's configure handler.
+proc ::snit::Comp.statement.onconfigure {option arglist body} {
+    variable compile
+
+    if {[lsearch -exact $compile(delegatedoptions) $option] != -1} {
+        return -code error "onconfigure $option: option \"$option\" is delegated"
+    }
+
+    if {[lsearch -exact $compile(localoptions) $option] == -1} {
+        return -code error "onconfigure $option: option \"$option\" unknown"
+    }
+
+    if {[llength $arglist] != 1} {
+        error \
+       "onconfigure $option handler should have one argument, got \"$arglist\""
+    }
+
+    CheckArgs "onconfigure $option" $arglist
+
+    # Next, add a magic reference to the option name
+    set arglist [concat _option $arglist]
+
+    Comp.statement.method _configure$option $arglist $body
+    Comp.statement.option $option -configuremethod _configure$option
+}
+
+# Defines an instance method.
+proc ::snit::Comp.statement.method {method arglist body} {
+    variable compile
+    variable methodInfo
+
+    # FIRST, check the method name against previously defined
+    # methods.
+    Comp.CheckMethodName $method 0 ::snit::methodInfo \
+        "Error in \"method [list $method]...\""
+
+    if {[llength $method] > 1} {
+        set compile(hashierarchic) yes
+    }
+
+    # Remeber this method
+    lappend compile(localmethods) $method
+
+    CheckArgs "method [list $method]" $arglist
+
+    # Next, add magic references to type and self.
+    set arglist [concat type selfns win self $arglist]
+
+    # Next, add variable declarations to body:
+    set body "%TVARDECS%%IVARDECS%\n# END snit method prolog\n$body"
+
+    # Next, save the definition script.
+    if {[llength $method] == 1} {
+        set methodInfo($method) {0 "%t::Snit_method%m %t %n %w %s" ""}
+        Mappend compile(defs) {
+            proc %TYPE%::Snit_method%METHOD% %ARGLIST% %BODY%
+        } %METHOD% $method %ARGLIST% [list $arglist] %BODY% [list $body]
+    } else {
+        set methodInfo($method) {0 "%t::Snit_hmethod%j %t %n %w %s" ""}
+
+        Mappend compile(defs) {
+            proc %TYPE%::Snit_hmethod%JMETHOD% %ARGLIST% %BODY%
+        } %JMETHOD% [join $method _] %ARGLIST% [list $arglist] \
+            %BODY% [list $body]
+    }
+}
+
+# Check for name collisions; save prefix information.
+#
+# method	The name of the method or typemethod.
+# delFlag       1 if delegated, 0 otherwise.
+# infoVar       The fully qualified name of the array containing
+#               information about the defined methods.
+# errRoot       The root string for any error messages.
+
+proc ::snit::Comp.CheckMethodName {method delFlag infoVar errRoot} {
+    upvar $infoVar methodInfo
+
+    # FIRST, make sure the method name is a valid Tcl list.
+    if {[catch {lindex $method 0}]} {
+        error "$errRoot, the name \"$method\" must have list syntax."
+    }
+
+    # NEXT, check whether we can define it.
+    if {![catch {set methodInfo($method)} data]} {
+        # We can't redefine methods with submethods.
+        if {[lindex $data 0] == 1} {
+            error "$errRoot, \"$method\" has submethods."
+        }
+
+        # You can't delegate a method that's defined locally,
+        # and you can't define a method locally if it's been delegated.
+        if {$delFlag && "" == [lindex $data 2]} {
+            error "$errRoot, \"$method\" has been defined locally."
+        } elseif {!$delFlag && "" != [lindex $data 2]} {
+            error "$errRoot, \"$method\" has been delegated"
+        }
+    }
+
+    # Handle hierarchical case.
+    if {[llength $method] > 1} {
+        set prefix {}
+        set tokens $method
+        while {[llength $tokens] > 1} {
+            lappend prefix [lindex $tokens 0]
+            set tokens [lrange $tokens 1 end]
+
+            if {![catch {set methodInfo($prefix)} result]} {
+                # Prefix is known.  If it's not a prefix, throw an
+                # error.
+                if {[lindex $result 0] == 0} {
+                    error "$errRoot, \"$prefix\" has no submethods."
+                }
+            }
+
+            set methodInfo($prefix) [list 1]
+        }
+    }
+}
+
+# Defines a typemethod method.
+proc ::snit::Comp.statement.typemethod {method arglist body} {
+    variable compile
+    variable typemethodInfo
+
+    # FIRST, check the typemethod name against previously defined
+    # typemethods.
+    Comp.CheckMethodName $method 0 ::snit::typemethodInfo \
+        "Error in \"typemethod [list $method]...\""
+
+    CheckArgs "typemethod $method" $arglist
+
+    # First, add magic reference to type.
+    set arglist [concat type $arglist]
+
+    # Next, add typevariable declarations to body:
+    set body "%TVARDECS%\n# END snit method prolog\n$body"
+
+    # Next, save the definition script
+    if {[llength $method] == 1} {
+        set typemethodInfo($method) {0 "%t::Snit_typemethod%m %t" ""}
+
+        Mappend compile(defs) {
+            proc %TYPE%::Snit_typemethod%METHOD% %ARGLIST% %BODY%
+        } %METHOD% $method %ARGLIST% [list $arglist] %BODY% [list $body]
+    } else {
+        set typemethodInfo($method) {0 "%t::Snit_htypemethod%j %t" ""}
+
+        Mappend compile(defs) {
+            proc %TYPE%::Snit_htypemethod%JMETHOD% %ARGLIST% %BODY%
+        } %JMETHOD% [join $method _] \
+            %ARGLIST% [list $arglist] %BODY% [list $body]
+    }
+}
+
+
+# Defines a type constructor.
+proc ::snit::Comp.statement.typeconstructor {body} {
+    variable compile
+
+    if {"" != $compile(typeconstructor)} {
+        error "too many typeconstructors"
+    }
+
+    set compile(typeconstructor) $body
+}
+
+# Defines a static proc in the type's namespace.
+proc ::snit::Comp.statement.proc {proc arglist body} {
+    variable compile
+
+    # If "ns" is defined, the proc can see instance variables.
+    if {[lsearch -exact $arglist selfns] != -1} {
+        # Next, add instance variable declarations to body:
+        set body "%IVARDECS%\n$body"
+    }
+
+    # The proc can always see typevariables.
+    set body "%TVARDECS%\n$body"
+
+    append compile(defs) "
+
+        # Proc $proc
+        proc [list %TYPE%::$proc $arglist $body]
+    "
+}
+
+# Defines a static variable in the type's namespace.
+proc ::snit::Comp.statement.typevariable {name args} {
+    variable compile
+
+    set errRoot "Error in \"typevariable $name...\""
+
+    set len [llength $args]
+
+    if {$len > 2 ||
+        ($len == 2 && "-array" != [lindex $args 0])} {
+        error "$errRoot, too many initializers"
+    }
+
+    if {[lsearch -exact $compile(varnames) $name] != -1} {
+        error "$errRoot, \"$name\" is already an instance variable"
+    }
+
+    lappend compile(typevarnames) $name
+
+    if {$len == 1} {
+        append compile(typevars) \
+		"\n\t    [list ::variable $name [lindex $args 0]]"
+    } elseif {$len == 2} {
+        append compile(typevars) \
+            "\n\t    [list ::variable $name]"
+        append compile(typevars) \
+            "\n\t    [list array set $name [lindex $args 1]]"
+    } else {
+        append compile(typevars) \
+		"\n\t    [list ::variable $name]"
+    }
+
+    append compile(tvprocdec) "\n\t    typevariable ${name}"
+}
+
+# Defines an instance variable; the definition will go in the
+# type's create typemethod.
+proc ::snit::Comp.statement.variable {name args} {
+    variable compile
+
+    set errRoot "Error in \"variable $name...\""
+
+    set len [llength $args]
+
+    if {$len > 2 ||
+        ($len == 2 && "-array" != [lindex $args 0])} {
+        error "$errRoot, too many initializers"
+    }
+
+    if {[lsearch -exact $compile(typevarnames) $name] != -1} {
+        error "$errRoot, \"$name\" is already a typevariable"
+    }
+
+    lappend compile(varnames) $name
+
+    if {$len == 1} {
+        append compile(instancevars) \
+            "\nset \${selfns}::$name [list [lindex $args 0]]\n"
+    } elseif {$len == 2} {
+        append compile(instancevars) \
+            "\narray set \${selfns}::$name [list [lindex $args 1]]\n"
+    }
+
+    append  compile(ivprocdec) "\n\t    "
+    Mappend compile(ivprocdec) {::variable ${selfns}::%N} %N $name
+}
+
+# Defines a typecomponent, and handles component options.
+#
+# component     The logical name of the delegate
+# args          options.
+
+proc ::snit::Comp.statement.typecomponent {component args} {
+    variable compile
+
+    set errRoot "Error in \"typecomponent $component...\""
+
+    # FIRST, define the component
+    Comp.DefineTypecomponent $component $errRoot
+
+    # NEXT, handle the options.
+    set publicMethod ""
+    set inheritFlag 0
+
+    foreach {opt val} $args {
+        switch -exact -- $opt {
+            -public {
+                set publicMethod $val
+            }
+            -inherit {
+                set inheritFlag $val
+                if {![string is boolean $inheritFlag]} {
+    error "typecomponent $component -inherit: expected boolean value, got \"$val\""
+                }
+            }
+            default {
+                error "typecomponent $component: Invalid option \"$opt\""
+            }
+        }
+    }
+
+    # NEXT, if -public specified, define the method.
+    if {"" != $publicMethod} {
+        Comp.statement.delegate typemethod [list $publicMethod *] to $component
+    }
+
+    # NEXT, if "-inherit 1" is specified, delegate typemethod * to
+    # this component.
+    if {$inheritFlag} {
+        Comp.statement.delegate typemethod "*" to $component
+    }
+
+}
+
+
+# Defines a name to be a typecomponent
+#
+# The name becomes a typevariable; in addition, it gets a
+# write trace so that when it is set, all of the component mechanisms
+# get updated.
+#
+# component     The component name
+
+proc ::snit::Comp.DefineTypecomponent {component {errRoot "Error"}} {
+    variable compile
+
+    if {[lsearch -exact $compile(varnames) $component] != -1} {
+        error "$errRoot, \"$component\" is already an instance variable"
+    }
+
+    if {[lsearch -exact $compile(typecomponents) $component] == -1} {
+        # Remember we've done this.
+        lappend compile(typecomponents) $component
+
+        # Make it a type variable with no initial value
+        Comp.statement.typevariable $component ""
+
+        # Add a write trace to do the component thing.
+        Mappend compile(typevars) {
+            trace add variable %COMP% write \
+                [list ::snit::RT.TypecomponentTrace [list %TYPE%] %COMP%]
+        } %TYPE% $compile(type) %COMP% $component
+    }
+}
+
+# Defines a component, and handles component options.
+#
+# component     The logical name of the delegate
+# args          options.
+#
+# TBD: Ideally, it should be possible to call this statement multiple
+# times, possibly changing the option values.  To do that, I'd need
+# to cache the option values and not act on them until *after* I'd
+# read the entire type definition.
+
+proc ::snit::Comp.statement.component {component args} {
+    variable compile
+
+    set errRoot "Error in \"component $component...\""
+
+    # FIRST, define the component
+    Comp.DefineComponent $component $errRoot
+
+    # NEXT, handle the options.
+    set publicMethod ""
+    set inheritFlag 0
+
+    foreach {opt val} $args {
+        switch -exact -- $opt {
+            -public {
+                set publicMethod $val
+            }
+            -inherit {
+                set inheritFlag $val
+                if {![string is boolean $inheritFlag]} {
+    error "component $component -inherit: expected boolean value, got \"$val\""
+                }
+            }
+            default {
+                error "component $component: Invalid option \"$opt\""
+            }
+        }
+    }
+
+    # NEXT, if -public specified, define the method.
+    if {"" != $publicMethod} {
+        Comp.statement.delegate method [list $publicMethod *] to $component
+    }
+
+    # NEXT, if -inherit is specified, delegate method/option * to
+    # this component.
+    if {$inheritFlag} {
+        Comp.statement.delegate method "*" to $component
+        Comp.statement.delegate option "*" to $component
+    }
+}
+
+
+# Defines a name to be a component
+#
+# The name becomes an instance variable; in addition, it gets a
+# write trace so that when it is set, all of the component mechanisms
+# get updated.
+#
+# component     The component name
+
+proc ::snit::Comp.DefineComponent {component {errRoot "Error"}} {
+    variable compile
+
+    if {[lsearch -exact $compile(typevarnames) $component] != -1} {
+        error "$errRoot, \"$component\" is already a typevariable"
+    }
+
+    if {[lsearch -exact $compile(components) $component] == -1} {
+        # Remember we've done this.
+        lappend compile(components) $component
+
+        # Make it an instance variable with no initial value
+        Comp.statement.variable $component ""
+
+        # Add a write trace to do the component thing.
+        Mappend compile(instancevars) {
+            trace add variable ${selfns}::%COMP% write \
+                [list ::snit::RT.ComponentTrace [list %TYPE%] $selfns %COMP%]
+        } %TYPE% $compile(type) %COMP% $component
+    }
+}
+
+# Creates a delegated method, typemethod, or option.
+proc ::snit::Comp.statement.delegate {what name args} {
+    # FIRST, dispatch to correct handler.
+    switch $what {
+        typemethod { Comp.DelegatedTypemethod $name $args }
+        method     { Comp.DelegatedMethod     $name $args }
+        option     { Comp.DelegatedOption     $name $args }
+        default {
+            error "Error in \"delegate $what $name...\", \"$what\"?"
+        }
+    }
+
+    if {([llength $args] % 2) != 0} {
+        error "Error in \"delegate $what $name...\", invalid syntax"
+    }
+}
+
+# Creates a delegated typemethod delegating it to a particular
+# typecomponent or an arbitrary command.
+#
+# method    The name of the method
+# arglist       Delegation options
+
+proc ::snit::Comp.DelegatedTypemethod {method arglist} {
+    variable compile
+    variable typemethodInfo
+
+    set errRoot "Error in \"delegate typemethod [list $method]...\""
+
+    # Next, parse the delegation options.
+    set component ""
+    set target ""
+    set exceptions {}
+    set pattern ""
+    set methodTail [lindex $method end]
+
+    foreach {opt value} $arglist {
+        switch -exact $opt {
+            to     { set component $value  }
+            as     { set target $value     }
+            except { set exceptions $value }
+            using  { set pattern $value    }
+            default {
+                error "$errRoot, unknown delegation option \"$opt\""
+            }
+        }
+    }
+
+    if {"" == $component && "" == $pattern} {
+        error "$errRoot, missing \"to\""
+    }
+
+    if {"*" == $methodTail && "" != $target} {
+        error "$errRoot, cannot specify \"as\" with \"*\""
+    }
+
+    if {"*" != $methodTail && "" != $exceptions} {
+        error "$errRoot, can only specify \"except\" with \"*\""
+    }
+
+    if {"" != $pattern && "" != $target} {
+        error "$errRoot, cannot specify both \"as\" and \"using\""
+    }
+
+    foreach token [lrange $method 1 end-1] {
+        if {"*" == $token} {
+            error "$errRoot, \"*\" must be the last token."
+        }
+    }
+
+    # NEXT, define the component
+    if {"" != $component} {
+        Comp.DefineTypecomponent $component $errRoot
+    }
+
+    # NEXT, define the pattern.
+    if {"" == $pattern} {
+        if {"*" == $methodTail} {
+            set pattern "%c %m"
+        } elseif {"" != $target} {
+            set pattern "%c $target"
+        } else {
+            set pattern "%c %m"
+        }
+    }
+
+    # Make sure the pattern is a valid list.
+    if {[catch {lindex $pattern 0} result]} {
+        error "$errRoot, the using pattern, \"$pattern\", is not a valid list"
+    }
+
+    # NEXT, check the method name against previously defined
+    # methods.
+    Comp.CheckMethodName $method 1 ::snit::typemethodInfo $errRoot
+
+    set typemethodInfo($method) [list 0 $pattern $component]
+
+    if {[string equal $methodTail "*"]} {
+        Mappend compile(defs) {
+            set %TYPE%::Snit_info(excepttypemethods) %EXCEPT%
+        } %EXCEPT% [list $exceptions]
+    }
+}
+
+
+# Creates a delegated method delegating it to a particular
+# component or command.
+#
+# method        The name of the method
+# arglist       Delegation options.
+
+proc ::snit::Comp.DelegatedMethod {method arglist} {
+    variable compile
+    variable methodInfo
+
+    set errRoot "Error in \"delegate method [list $method]...\""
+
+    # Next, parse the delegation options.
+    set component ""
+    set target ""
+    set exceptions {}
+    set pattern ""
+    set methodTail [lindex $method end]
+
+    foreach {opt value} $arglist {
+        switch -exact $opt {
+            to     { set component $value  }
+            as     { set target $value     }
+            except { set exceptions $value }
+            using  { set pattern $value    }
+            default {
+                error "$errRoot, unknown delegation option \"$opt\""
+            }
+        }
+    }
+
+    if {"" == $component && "" == $pattern} {
+        error "$errRoot, missing \"to\""
+    }
+
+    if {"*" == $methodTail && "" != $target} {
+        error "$errRoot, cannot specify \"as\" with \"*\""
+    }
+
+    if {"*" != $methodTail && "" != $exceptions} {
+        error "$errRoot, can only specify \"except\" with \"*\""
+    }
+
+    if {"" != $pattern && "" != $target} {
+        error "$errRoot, cannot specify both \"as\" and \"using\""
+    }
+
+    foreach token [lrange $method 1 end-1] {
+        if {"*" == $token} {
+            error "$errRoot, \"*\" must be the last token."
+        }
+    }
+
+    # NEXT, we delegate some methods
+    set compile(delegatesmethods) yes
+
+    # NEXT, define the component.  Allow typecomponents.
+    if {"" != $component} {
+        if {[lsearch -exact $compile(typecomponents) $component] == -1} {
+            Comp.DefineComponent $component $errRoot
+        }
+    }
+
+    # NEXT, define the pattern.
+    if {"" == $pattern} {
+        if {"*" == $methodTail} {
+            set pattern "%c %m"
+        } elseif {"" != $target} {
+            set pattern "%c $target"
+        } else {
+            set pattern "%c %m"
+        }
+    }
+
+    # Make sure the pattern is a valid list.
+    if {[catch {lindex $pattern 0} result]} {
+        error "$errRoot, the using pattern, \"$pattern\", is not a valid list"
+    }
+
+    # NEXT, check the method name against previously defined
+    # methods.
+    Comp.CheckMethodName $method 1 ::snit::methodInfo $errRoot
+
+    # NEXT, save the method info.
+    set methodInfo($method) [list 0 $pattern $component]
+
+    if {[string equal $methodTail "*"]} {
+        Mappend compile(defs) {
+            set %TYPE%::Snit_info(exceptmethods) %EXCEPT%
+        } %EXCEPT% [list $exceptions]
+    }
+}
+
+# Creates a delegated option, delegating it to a particular
+# component and, optionally, to a particular option of that
+# component.
+#
+# optionDef     The option definition
+# args          definition arguments.
+
+proc ::snit::Comp.DelegatedOption {optionDef arglist} {
+    variable compile
+
+    # First, get the three option names.
+    set option [lindex $optionDef 0]
+    set resourceName [lindex $optionDef 1]
+    set className [lindex $optionDef 2]
+
+    set errRoot "Error in \"delegate option [list $optionDef]...\""
+
+    # Next, parse the delegation options.
+    set component ""
+    set target ""
+    set exceptions {}
+
+    foreach {opt value} $arglist {
+        switch -exact $opt {
+            to     { set component $value  }
+            as     { set target $value     }
+            except { set exceptions $value }
+            default {
+                error "$errRoot, unknown delegation option \"$opt\""
+            }
+        }
+    }
+
+    if {"" == $component} {
+        error "$errRoot, missing \"to\""
+    }
+
+    if {"*" == $option && "" != $target} {
+        error "$errRoot, cannot specify \"as\" with \"delegate option *\""
+    }
+
+    if {"*" != $option && "" != $exceptions} {
+        error "$errRoot, can only specify \"except\" with \"delegate option *\""
+    }
+
+    # Next, validate the option name
+
+    if {"*" != $option} {
+        if {![Comp.OptionNameIsValid $option]} {
+            error "$errRoot, badly named option \"$option\""
+        }
+    }
+
+    if {[Contains $option $compile(localoptions)]} {
+        error "$errRoot, \"$option\" has been defined locally"
+    }
+
+    if {[Contains $option $compile(delegatedoptions)]} {
+        error "$errRoot, \"$option\" is multiply delegated"
+    }
+
+    # NEXT, define the component
+    Comp.DefineComponent $component $errRoot
+
+    # Next, define the target option, if not specified.
+    if {![string equal $option "*"] &&
+        [string equal $target ""]} {
+        set target $option
+    }
+
+    # NEXT, save the delegation data.
+    set compile(hasoptions) yes
+
+    if {![string equal $option "*"]} {
+        lappend compile(delegatedoptions) $option
+
+        # Next, compute the resource and class names, if they aren't
+        # already defined.
+
+        if {"" == $resourceName} {
+            set resourceName [string range $option 1 end]
+        }
+
+        if {"" == $className} {
+            set className [Capitalize $resourceName]
+        }
+
+        Mappend  compile(defs) {
+            set %TYPE%::Snit_optionInfo(islocal-%OPTION%) 0
+            set %TYPE%::Snit_optionInfo(resource-%OPTION%) %RES%
+            set %TYPE%::Snit_optionInfo(class-%OPTION%) %CLASS%
+            lappend %TYPE%::Snit_optionInfo(delegated) %OPTION%
+            set %TYPE%::Snit_optionInfo(target-%OPTION%) [list %COMP% %TARGET%]
+            lappend %TYPE%::Snit_optionInfo(delegated-%COMP%) %OPTION%
+        }   %OPTION% $option \
+            %COMP% $component \
+            %TARGET% $target \
+            %RES% $resourceName \
+            %CLASS% $className
+    } else {
+        Mappend  compile(defs) {
+            set %TYPE%::Snit_optionInfo(starcomp) %COMP%
+            set %TYPE%::Snit_optionInfo(except) %EXCEPT%
+        } %COMP% $component %EXCEPT% [list $exceptions]
+    }
+}
+
+# Exposes a component, effectively making the component's command an
+# instance method.
+#
+# component     The logical name of the delegate
+# "as"          sugar; if not "", must be "as"
+# methodname    The desired method name for the component's command, or ""
+
+proc ::snit::Comp.statement.expose {component {"as" ""} {methodname ""}} {
+    variable compile
+
+
+    # FIRST, define the component
+    Comp.DefineComponent $component
+
+    # NEXT, define the method just as though it were in the type
+    # definition.
+    if {[string equal $methodname ""]} {
+        set methodname $component
+    }
+
+    Comp.statement.method $methodname args [Expand {
+        if {[llength $args] == 0} {
+            return $%COMPONENT%
+        }
+
+        if {[string equal $%COMPONENT% ""]} {
+            error "undefined component \"%COMPONENT%\""
+        }
+
+
+        set cmd [linsert $args 0 $%COMPONENT%]
+        return [uplevel 1 $cmd]
+    } %COMPONENT% $component]
+}
+
+
+
+#-----------------------------------------------------------------------
+# Public commands
+
+# Compile a type definition, and return the results as a list of two
+# items: the fully-qualified type name, and a script that will define
+# the type when executed.
+#
+# which		type, widget, or widgetadaptor
+# type          the type name
+# body          the type definition
+proc ::snit::compile {which type body} {
+    return [Comp.Compile $which $type $body]
+}
+
+proc ::snit::type {type body} {
+    return [Comp.Define [Comp.Compile type $type $body]]
+}
+
+proc ::snit::widget {type body} {
+    return [Comp.Define [Comp.Compile widget $type $body]]
+}
+
+proc ::snit::widgetadaptor {type body} {
+    return [Comp.Define [Comp.Compile widgetadaptor $type $body]]
+}
+
+proc ::snit::typemethod {type method arglist body} {
+    # Make sure the type exists.
+    if {![info exists ${type}::Snit_info]} {
+        error "no such type: \"$type\""
+    }
+
+    upvar ${type}::Snit_info           Snit_info
+    upvar ${type}::Snit_typemethodInfo Snit_typemethodInfo
+
+    # FIRST, check the typemethod name against previously defined
+    # typemethods.
+    Comp.CheckMethodName $method 0 ${type}::Snit_typemethodInfo \
+        "Cannot define \"$method\""
+
+    # NEXT, check the arguments
+    CheckArgs "snit::typemethod $type $method" $arglist
+
+    # Next, add magic reference to type.
+    set arglist [concat type $arglist]
+
+    # Next, add typevariable declarations to body:
+    set body "$Snit_info(tvardecs)\n$body"
+
+    # Next, define it.
+    if {[llength $method] == 1} {
+        set Snit_typemethodInfo($method) {0 "%t::Snit_typemethod%m %t" ""}
+        uplevel 1 [list proc ${type}::Snit_typemethod$method $arglist $body]
+    } else {
+        set Snit_typemethodInfo($method) {0 "%t::Snit_htypemethod%j %t" ""}
+        set suffix [join $method _]
+        uplevel 1 [list proc ${type}::Snit_htypemethod$suffix $arglist $body]
+    }
+}
+
+proc ::snit::method {type method arglist body} {
+    # Make sure the type exists.
+    if {![info exists ${type}::Snit_info]} {
+        error "no such type: \"$type\""
+    }
+
+    upvar ${type}::Snit_methodInfo  Snit_methodInfo
+    upvar ${type}::Snit_info        Snit_info
+
+    # FIRST, check the method name against previously defined
+    # methods.
+    Comp.CheckMethodName $method 0 ${type}::Snit_methodInfo \
+        "Cannot define \"$method\""
+
+    # NEXT, check the arguments
+    CheckArgs "snit::method $type $method" $arglist
+
+    # Next, add magic references to type and self.
+    set arglist [concat type selfns win self $arglist]
+
+    # Next, add variable declarations to body:
+    set body "$Snit_info(tvardecs)$Snit_info(ivardecs)\n$body"
+
+    # Next, define it.
+    if {[llength $method] == 1} {
+        set Snit_methodInfo($method) {0 "%t::Snit_method%m %t %n %w %s" ""}
+        uplevel 1 [list proc ${type}::Snit_method$method $arglist $body]
+    } else {
+        set Snit_methodInfo($method) {0 "%t::Snit_hmethod%j %t %n %w %s" ""}
+
+        set suffix [join $method _]
+        uplevel 1 [list proc ${type}::Snit_hmethod$suffix $arglist $body]
+    }
+}
+
+# Defines a proc within the compiler; this proc can call other
+# type definition statements, and thus can be used for meta-programming.
+proc ::snit::macro {name arglist body} {
+    variable compiler
+    variable reservedwords
+
+    # FIRST, make sure the compiler is defined.
+    Comp.Init
+
+    # NEXT, check the macro name against the reserved words
+    if {[lsearch -exact $reservedwords $name] != -1} {
+        error "invalid macro name \"$name\""
+    }
+
+    # NEXT, see if the name has a namespace; if it does, define the
+    # namespace.
+    set ns [namespace qualifiers $name]
+
+    if {"" != $ns} {
+        $compiler eval "namespace eval $ns {}"
+    }
+
+    # NEXT, define the macro
+    $compiler eval [list _proc $name $arglist $body]
+}
+
+#-----------------------------------------------------------------------
+# Utility Functions
+#
+# These are utility functions used while compiling Snit types.
+
+# Builds a template from a tagged list of text blocks, then substitutes
+# all symbols in the mapTable, returning the expanded template.
+proc ::snit::Expand {template args} {
+    return [string map $args $template]
+}
+
+# Expands a template and appends it to a variable.
+proc ::snit::Mappend {varname template args} {
+    upvar $varname myvar
+
+    append myvar [string map $args $template]
+}
+
+# Checks argument list against reserved args
+proc ::snit::CheckArgs {which arglist} {
+    variable reservedArgs
+
+    foreach name $reservedArgs {
+        if {[Contains $name $arglist]} {
+            error "$which's arglist may not contain \"$name\" explicitly"
+        }
+    }
+}
+
+# Returns 1 if a value is in a list, and 0 otherwise.
+proc ::snit::Contains {value list} {
+    if {[lsearch -exact $list $value] != -1} {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+# Capitalizes the first letter of a string.
+proc ::snit::Capitalize {text} {
+    return [string toupper $text 0]
+}
+
+# Converts an arbitrary white-space-delimited string into a list
+# by splitting on white-space and deleting empty tokens.
+
+proc ::snit::Listify {str} {
+    set result {}
+    foreach token [split [string trim $str]] {
+        if {[string length $token] > 0} {
+            lappend result $token
+        }
+    }
+
+    return $result
+}
+
+
+#=======================================================================
+# Snit Runtime Library
+#
+# These are procs used by Snit types and widgets at runtime.
+
+#-----------------------------------------------------------------------
+# Object Creation
+
+# Creates a new instance of the snit::type given its name and the args.
+#
+# type		The snit::type
+# name		The instance name
+# args		Args to pass to the constructor
+
+proc ::snit::RT.type.typemethod.create {type name args} {
+    variable ${type}::Snit_info
+    variable ${type}::Snit_optionInfo
+
+    # FIRST, qualify the name.
+    if {![string match "::*" $name]} {
+        # Get caller's namespace;
+        # append :: if not global namespace.
+        set ns [uplevel 1 [list namespace current]]
+        if {"::" != $ns} {
+            append ns "::"
+        }
+
+        set name "$ns$name"
+    }
+
+    # NEXT, if %AUTO% appears in the name, generate a unique
+    # command name.  Otherwise, ensure that the name isn't in use.
+    if {[string match "*%AUTO%*" $name]} {
+        set name [::snit::RT.UniqueName Snit_info(counter) $type $name]
+    } elseif {!$Snit_info(canreplace) && [llength [info commands $name]]} {
+        error "command \"$name\" already exists"
+    }
+
+    # NEXT, create the instance's namespace.
+    set selfns \
+        [::snit::RT.UniqueInstanceNamespace Snit_info(counter) $type]
+    namespace eval $selfns {}
+
+    # NEXT, install the dispatcher
+    RT.MakeInstanceCommand $type $selfns $name
+
+    # Initialize the options to their defaults.
+    upvar ${selfns}::options options
+    foreach opt $Snit_optionInfo(local) {
+        set options($opt) $Snit_optionInfo(default-$opt)
+    }
+
+    # Initialize the instance vars to their defaults.
+    # selfns must be defined, as it is used implicitly.
+    ${type}::Snit_instanceVars $selfns
+
+    # Execute the type's constructor.
+    set errcode [catch {
+        RT.ConstructInstance $type $selfns $name $args
+    } result]
+
+    if {$errcode} {
+        global errorInfo
+        global errorCode
+
+        set theInfo $errorInfo
+        set theCode $errorCode
+        ::snit::RT.DestroyObject $type $selfns $name
+        error "Error in constructor: $result" $theInfo $theCode
+    }
+
+    # NEXT, return the object's name.
+    return $name
+}
+
+# Creates a new instance of the snit::widget or snit::widgetadaptor
+# given its name and the args.
+#
+# type		The snit::widget or snit::widgetadaptor
+# name		The instance name
+# args		Args to pass to the constructor
+
+proc ::snit::RT.widget.typemethod.create {type name args} {
+    variable ${type}::Snit_info
+    variable ${type}::Snit_optionInfo
+
+    # FIRST, if %AUTO% appears in the name, generate a unique
+    # command name.
+    if {[string match "*%AUTO%*" $name]} {
+        set name [::snit::RT.UniqueName Snit_info(counter) $type $name]
+    }
+
+    # NEXT, create the instance's namespace.
+    set selfns \
+        [::snit::RT.UniqueInstanceNamespace Snit_info(counter) $type]
+    namespace eval $selfns { }
+
+    # NEXT, Initialize the widget's own options to their defaults.
+    upvar ${selfns}::options options
+    foreach opt $Snit_optionInfo(local) {
+        set options($opt) $Snit_optionInfo(default-$opt)
+    }
+
+    # Initialize the instance vars to their defaults.
+    ${type}::Snit_instanceVars $selfns
+
+    # NEXT, if this is a normal widget (not a widget adaptor) then create a
+    # frame as its hull.  We set the frame's -class to the user's widgetclass,
+    # or, if none, search for -class in the args list, otherwise default to
+    # the basename of the $type with an initial upper case letter.
+    if {!$Snit_info(isWidgetAdaptor)} {
+        # FIRST, determine the class name
+	set wclass $Snit_info(widgetclass)
+        if {$Snit_info(widgetclass) eq ""} {
+	    set idx [lsearch -exact $args -class]
+	    if {$idx >= 0 && ($idx%2 == 0)} {
+		# -class exists and is in the -option position
+		set wclass [lindex $args [expr {$idx+1}]]
+		set args [lreplace $args $idx [expr {$idx+1}]]
+	    } else {
+		set wclass [::snit::Capitalize [namespace tail $type]]
+	    }
+	}
+
+        # NEXT, create the widget
+        set self $name
+        package require Tk
+        ${type}::installhull using $Snit_info(hulltype) -class $wclass
+
+        # NEXT, let's query the option database for our
+        # widget, now that we know that it exists.
+        foreach opt $Snit_optionInfo(local) {
+            set dbval [RT.OptionDbGet $type $name $opt]
+
+            if {"" != $dbval} {
+                set options($opt) $dbval
+            }
+        }
+    }
+
+    # Execute the type's constructor, and verify that it
+    # has a hull.
+    set errcode [catch {
+        RT.ConstructInstance $type $selfns $name $args
+
+        ::snit::RT.Component $type $selfns hull
+
+        # Prepare to call the object's destructor when the
+        # <Destroy> event is received.  Use a Snit-specific bindtag
+        # so that the widget name's tag is unencumbered.
+
+        bind Snit$type$name <Destroy> [::snit::Expand {
+            ::snit::RT.DestroyObject %TYPE% %NS% %W
+        } %TYPE% $type %NS% $selfns]
+
+        # Insert the bindtag into the list of bindtags right
+        # after the widget name.
+        set taglist [bindtags $name]
+        set ndx [lsearch -exact $taglist $name]
+        incr ndx
+        bindtags $name [linsert $taglist $ndx Snit$type$name]
+    } result]
+
+    if {$errcode} {
+        global errorInfo
+        global errorCode
+
+        set theInfo $errorInfo
+        set theCode $errorCode
+        ::snit::RT.DestroyObject $type $selfns $name
+        error "Error in constructor: $result" $theInfo $theCode
+    }
+
+    # NEXT, return the object's name.
+    return $name
+}
+
+
+# RT.MakeInstanceCommand type selfns instance
+#
+# type        The object type
+# selfns      The instance namespace
+# instance    The instance name
+#
+# Creates the instance proc.
+
+proc ::snit::RT.MakeInstanceCommand {type selfns instance} {
+    variable ${type}::Snit_info
+
+    # FIRST, remember the instance name.  The Snit_instance variable
+    # allows the instance to figure out its current name given the
+    # instance namespace.
+    upvar ${selfns}::Snit_instance Snit_instance
+    set Snit_instance $instance
+
+    # NEXT, qualify the proc name if it's a widget.
+    if {$Snit_info(isWidget)} {
+        set procname ::$instance
+    } else {
+        set procname $instance
+    }
+
+    # NEXT, install the new proc
+    if {!$Snit_info(simpledispatch)} {
+        set instanceProc $::snit::nominalInstanceProc
+    } else {
+        set instanceProc $::snit::simpleInstanceProc
+    }
+
+    proc $procname {method args} \
+        [string map \
+             [list %SELFNS% $selfns %WIN% $instance %TYPE% $type] \
+             $instanceProc]
+
+    # NEXT, add the trace.
+    trace add command $procname {rename delete} \
+        [list ::snit::RT.InstanceTrace $type $selfns $instance]
+}
+
+# This proc is called when the instance command is renamed.
+# If op is delete, then new will always be "", so op is redundant.
+#
+# type		The fully-qualified type name
+# selfns	The instance namespace
+# win		The original instance/tk window name.
+# old		old instance command name
+# new		new instance command name
+# op		rename or delete
+#
+# If the op is delete, we need to clean up the object; otherwise,
+# we need to track the change.
+#
+# NOTE: In Tcl 8.4.2 there's a bug: errors in rename and delete
+# traces aren't propagated correctly.  Instead, they silently
+# vanish.  Add a catch to output any error message.
+
+proc ::snit::RT.InstanceTrace {type selfns win old new op} {
+    variable ${type}::Snit_info
+
+    # Note to developers ...
+    # For Tcl 8.4.0, errors thrown in trace handlers vanish silently.
+    # Therefore we catch them here and create some output to help in
+    # debugging such problems.
+
+    if {[catch {
+        # FIRST, clean up if necessary
+        if {"" == $new} {
+            if {$Snit_info(isWidget)} {
+                destroy $win
+            } else {
+                ::snit::RT.DestroyObject $type $selfns $win
+            }
+        } else {
+            # Otherwise, track the change.
+            variable ${selfns}::Snit_instance
+            set Snit_instance [uplevel 1 [list namespace which -command $new]]
+
+            # Also, clear the instance caches, as many cached commands
+            # might be invalid.
+            RT.ClearInstanceCaches $selfns
+        }
+    } result]} {
+        global errorInfo
+        # Pop up the console on Windows wish, to enable stdout.
+        # This clobbers errorInfo on unix, so save it so we can print it.
+        set ei $errorInfo
+        catch {console show}
+        puts "Error in ::snit::RT.InstanceTrace $type $selfns $win $old $new $op:"
+        puts $ei
+    }
+}
+
+# Calls the instance constructor and handles related housekeeping.
+proc ::snit::RT.ConstructInstance {type selfns instance arglist} {
+    variable ${type}::Snit_optionInfo
+    variable ${selfns}::Snit_iinfo
+
+    # Track whether we are constructed or not.
+    set Snit_iinfo(constructed) 0
+
+    # Call the user's constructor
+    eval [linsert $arglist 0 \
+              ${type}::Snit_constructor $type $selfns $instance $instance]
+
+    set Snit_iinfo(constructed) 1
+
+    # Validate the initial set of options (including defaults)
+    foreach option $Snit_optionInfo(local) {
+        set value [set ${selfns}::options($option)]
+
+        if {"" != $Snit_optionInfo(typespec-$option)} {
+            if {[catch {
+                $Snit_optionInfo(typeobj-$option) validate $value
+            } result]} {
+                return -code error "invalid $option default: $result"
+            }
+        }
+    }
+
+    # Unset the configure cache for all -readonly options.
+    # This ensures that the next time anyone tries to
+    # configure it, an error is thrown.
+    foreach opt $Snit_optionInfo(local) {
+        if {$Snit_optionInfo(readonly-$opt)} {
+            unset -nocomplain ${selfns}::Snit_configureCache($opt)
+        }
+    }
+
+    return
+}
+
+# Returns a unique command name.
+#
+# REQUIRE: type is a fully qualified name.
+# REQUIRE: name contains "%AUTO%"
+# PROMISE: the returned command name is unused.
+proc ::snit::RT.UniqueName {countervar type name} {
+    upvar $countervar counter
+    while 1 {
+        # FIRST, bump the counter and define the %AUTO% instance name;
+        # then substitute it into the specified name.  Wrap around at
+        # 2^31 - 2 to prevent overflow problems.
+        incr counter
+        if {$counter > 2147483646} {
+            set counter 0
+        }
+        set auto "[namespace tail $type]$counter"
+        set candidate [Expand $name %AUTO% $auto]
+        if {![llength [info commands $candidate]]} {
+            return $candidate
+        }
+    }
+}
+
+# Returns a unique instance namespace, fully qualified.
+#
+# countervar     The name of a counter variable
+# type           The instance's type
+#
+# REQUIRE: type is fully qualified
+# PROMISE: The returned namespace name is unused.
+
+proc ::snit::RT.UniqueInstanceNamespace {countervar type} {
+    upvar $countervar counter
+    while 1 {
+        # FIRST, bump the counter and define the namespace name.
+        # Then see if it already exists.  Wrap around at
+        # 2^31 - 2 to prevent overflow problems.
+        incr counter
+        if {$counter > 2147483646} {
+            set counter 0
+        }
+        set ins "${type}::Snit_inst${counter}"
+        if {![namespace exists $ins]} {
+            return $ins
+        }
+    }
+}
+
+# Retrieves an option's value from the option database.
+# Returns "" if no value is found.
+proc ::snit::RT.OptionDbGet {type self opt} {
+    variable ${type}::Snit_optionInfo
+
+    return [option get $self \
+                $Snit_optionInfo(resource-$opt) \
+                $Snit_optionInfo(class-$opt)]
+}
+
+#-----------------------------------------------------------------------
+# Object Destruction
+
+# Implements the standard "destroy" method
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+
+proc ::snit::RT.method.destroy {type selfns win self} {
+    variable ${selfns}::Snit_iinfo
+
+    # Can't destroy the object if it isn't complete constructed.
+    if {!$Snit_iinfo(constructed)} {
+        return -code error "Called 'destroy' method in constructor"
+    }
+
+    # Calls Snit_cleanup, which (among other things) calls the
+    # user's destructor.
+    ::snit::RT.DestroyObject $type $selfns $win
+}
+
+# This is the function that really cleans up; it's automatically
+# called when any instance is destroyed, e.g., by "$object destroy"
+# for types, and by the <Destroy> event for widgets.
+#
+# type		The fully-qualified type name.
+# selfns	The instance namespace
+# win		The original instance command name.
+
+proc ::snit::RT.DestroyObject {type selfns win} {
+    variable ${type}::Snit_info
+
+    # If the variable Snit_instance doesn't exist then there's no
+    # instance command for this object -- it's most likely a
+    # widgetadaptor. Consequently, there are some things that
+    # we don't need to do.
+    if {[info exists ${selfns}::Snit_instance]} {
+        upvar ${selfns}::Snit_instance instance
+
+        # First, remove the trace on the instance name, so that we
+        # don't call RT.DestroyObject recursively.
+        RT.RemoveInstanceTrace $type $selfns $win $instance
+
+        # Next, call the user's destructor
+        ${type}::Snit_destructor $type $selfns $win $instance
+
+        # Next, if this isn't a widget, delete the instance command.
+        # If it is a widget, get the hull component's name, and rename
+        # it back to the widget name
+
+        # Next, delete the hull component's instance command,
+        # if there is one.
+        if {$Snit_info(isWidget)} {
+            set hullcmd [::snit::RT.Component $type $selfns hull]
+
+            catch {rename $instance ""}
+
+            # Clear the bind event
+            bind Snit$type$win <Destroy> ""
+
+            if {[llength [info commands $hullcmd]]} {
+                # FIRST, rename the hull back to its original name.
+                # If the hull is itself a megawidget, it will have its
+                # own cleanup to do, and it might not do it properly
+                # if it doesn't have the right name.
+                rename $hullcmd ::$instance
+
+                # NEXT, destroy it.
+                destroy $instance
+            }
+        } else {
+            catch {rename $instance ""}
+        }
+    }
+
+    # Next, delete the instance's namespace.  This kills any
+    # instance variables.
+    namespace delete $selfns
+
+    return
+}
+
+# Remove instance trace
+#
+# type           The fully qualified type name
+# selfns         The instance namespace
+# win            The original instance name/Tk window name
+# instance       The current instance name
+
+proc ::snit::RT.RemoveInstanceTrace {type selfns win instance} {
+    variable ${type}::Snit_info
+
+    if {$Snit_info(isWidget)} {
+        set procname ::$instance
+    } else {
+        set procname $instance
+    }
+
+    # NEXT, remove any trace on this name
+    catch {
+        trace remove command $procname {rename delete} \
+            [list ::snit::RT.InstanceTrace $type $selfns $win]
+    }
+}
+
+#-----------------------------------------------------------------------
+# Typecomponent Management and Method Caching
+
+# Typecomponent trace; used for write trace on typecomponent
+# variables.  Saves the new component object name, provided
+# that certain conditions are met.  Also clears the typemethod
+# cache.
+
+proc ::snit::RT.TypecomponentTrace {type component n1 n2 op} {
+    upvar ${type}::Snit_info Snit_info
+    upvar ${type}::${component} cvar
+    upvar ${type}::Snit_typecomponents Snit_typecomponents
+
+    # Save the new component value.
+    set Snit_typecomponents($component) $cvar
+
+    # Clear the typemethod cache.
+    # TBD: can we unset just the elements related to
+    # this component?
+    unset -nocomplain -- ${type}::Snit_typemethodCache
+}
+
+# Generates and caches the command for a typemethod.
+#
+# type		The type
+# method	The name of the typemethod to call.
+#
+# The return value is one of the following lists:
+#
+#    {}              There's no such method.
+#    {1}             The method has submethods; look again.
+#    {0 <command>}   Here's the command to execute.
+
+proc snit::RT.CacheTypemethodCommand {type method} {
+    upvar ${type}::Snit_typemethodInfo  Snit_typemethodInfo
+    upvar ${type}::Snit_typecomponents  Snit_typecomponents
+    upvar ${type}::Snit_typemethodCache Snit_typemethodCache
+    upvar ${type}::Snit_info            Snit_info
+
+    # FIRST, get the pattern data and the typecomponent name.
+    set implicitCreate 0
+    set instanceName ""
+
+    set starredMethod [lreplace $method end end *]
+    set methodTail [lindex $method end]
+
+    if {[info exists Snit_typemethodInfo($method)]} {
+        set key $method
+    } elseif {[info exists Snit_typemethodInfo($starredMethod)]} {
+        if {[lsearch -exact $Snit_info(excepttypemethods) $methodTail] == -1} {
+            set key $starredMethod
+        } else {
+            return [list ]
+        }
+    } elseif {[llength $method] > 1} {
+	return [list ]
+    } elseif {$Snit_info(hasinstances)} {
+        # Assume the unknown name is an instance name to create, unless
+        # this is a widget and the style of the name is wrong, or the
+        # name mimics a standard typemethod.
+
+        if {[set ${type}::Snit_info(isWidget)] &&
+            ![string match ".*" $method]} {
+            return [list ]
+        }
+
+        # Without this check, the call "$type info" will redefine the
+        # standard "::info" command, with disastrous results.  Since it's
+        # a likely thing to do if !-typeinfo, put in an explicit check.
+        if {"info" == $method || "destroy" == $method} {
+            return [list ]
+        }
+
+        set implicitCreate 1
+        set instanceName $method
+        set key create
+        set method create
+    } else {
+        return [list ]
+    }
+
+    foreach {flag pattern compName} $Snit_typemethodInfo($key) {}
+
+    if {$flag == 1} {
+        return [list 1]
+    }
+
+    # NEXT, build the substitution list
+    set subList [list \
+                     %% % \
+                     %t $type \
+                     %M $method \
+                     %m [lindex $method end] \
+                     %j [join $method _]]
+
+    if {"" != $compName} {
+        if {![info exists Snit_typecomponents($compName)]} {
+            error "$type delegates typemethod \"$method\" to undefined typecomponent \"$compName\""
+        }
+
+        lappend subList %c [list $Snit_typecomponents($compName)]
+    }
+
+    set command {}
+
+    foreach subpattern $pattern {
+        lappend command [string map $subList $subpattern]
+    }
+
+    if {$implicitCreate} {
+        # In this case, $method is the name of the instance to
+        # create.  Don't cache, as we usually won't do this one
+        # again.
+        lappend command $instanceName
+    } else {
+        set Snit_typemethodCache($method) [list 0 $command]
+    }
+
+    return [list 0 $command]
+}
+
+
+#-----------------------------------------------------------------------
+# Component Management and Method Caching
+
+# Retrieves the object name given the component name.
+proc ::snit::RT.Component {type selfns name} {
+    variable ${selfns}::Snit_components
+
+    if {[catch {set Snit_components($name)} result]} {
+        variable ${selfns}::Snit_instance
+
+        error "component \"$name\" is undefined in $type $Snit_instance"
+    }
+
+    return $result
+}
+
+# Component trace; used for write trace on component instance
+# variables.  Saves the new component object name, provided
+# that certain conditions are met.  Also clears the method
+# cache.
+
+proc ::snit::RT.ComponentTrace {type selfns component n1 n2 op} {
+    upvar ${type}::Snit_info Snit_info
+    upvar ${selfns}::${component} cvar
+    upvar ${selfns}::Snit_components Snit_components
+
+    # If they try to redefine the hull component after
+    # it's been defined, that's an error--but only if
+    # this is a widget or widget adaptor.
+    if {"hull" == $component &&
+        $Snit_info(isWidget) &&
+        [info exists Snit_components($component)]} {
+        set cvar $Snit_components($component)
+        error "The hull component cannot be redefined"
+    }
+
+    # Save the new component value.
+    set Snit_components($component) $cvar
+
+    # Clear the instance caches.
+    # TBD: can we unset just the elements related to
+    # this component?
+    RT.ClearInstanceCaches $selfns
+}
+
+# Generates and caches the command for a method.
+#
+# type:		The instance's type
+# selfns:	The instance's private namespace
+# win:          The instance's original name (a Tk widget name, for
+#               snit::widgets.
+# self:         The instance's current name.
+# method:	The name of the method to call.
+#
+# The return value is one of the following lists:
+#
+#    {}              There's no such method.
+#    {1}             The method has submethods; look again.
+#    {0 <command>}   Here's the command to execute.
+
+proc ::snit::RT.CacheMethodCommand {type selfns win self method} {
+    variable ${type}::Snit_info
+    variable ${type}::Snit_methodInfo
+    variable ${type}::Snit_typecomponents
+    variable ${selfns}::Snit_components
+    variable ${selfns}::Snit_methodCache
+
+    # FIRST, get the pattern data and the component name.
+    set starredMethod [lreplace $method end end *]
+    set methodTail [lindex $method end]
+
+    if {[info exists Snit_methodInfo($method)]} {
+        set key $method
+    } elseif {[info exists Snit_methodInfo($starredMethod)] &&
+              [lsearch -exact $Snit_info(exceptmethods) $methodTail] == -1} {
+        set key $starredMethod
+    } else {
+        return [list ]
+    }
+
+    foreach {flag pattern compName} $Snit_methodInfo($key) {}
+
+    if {$flag == 1} {
+        return [list 1]
+    }
+
+    # NEXT, build the substitution list
+    set subList [list \
+                     %% % \
+                     %t $type \
+                     %M $method \
+                     %m [lindex $method end] \
+                     %j [join $method _] \
+                     %n [list $selfns] \
+                     %w [list $win] \
+                     %s [list $self]]
+
+    if {"" != $compName} {
+        if {[info exists Snit_components($compName)]} {
+            set compCmd $Snit_components($compName)
+        } elseif {[info exists Snit_typecomponents($compName)]} {
+            set compCmd $Snit_typecomponents($compName)
+        } else {
+            error "$type $self delegates method \"$method\" to undefined component \"$compName\""
+        }
+
+        lappend subList %c [list $compCmd]
+    }
+
+    # Note: The cached command will executed faster if it's
+    # already a list.
+    set command {}
+
+    foreach subpattern $pattern {
+        lappend command [string map $subList $subpattern]
+    }
+
+    set commandRec [list 0 $command]
+
+    set Snit_methodCache($method) $commandRec
+
+    return $commandRec
+}
+
+
+# Looks up a method's command.
+#
+# type:		The instance's type
+# selfns:	The instance's private namespace
+# win:          The instance's original name (a Tk widget name, for
+#               snit::widgets.
+# self:         The instance's current name.
+# method:	The name of the method to call.
+# errPrefix:    Prefix for any error method
+proc ::snit::RT.LookupMethodCommand {type selfns win self method errPrefix} {
+    set commandRec [snit::RT.CacheMethodCommand \
+                        $type $selfns $win $self \
+                        $method]
+
+
+    if {[llength $commandRec] == 0} {
+        return -code error \
+            "$errPrefix, \"$self $method\" is not defined"
+    } elseif {[lindex $commandRec 0] == 1} {
+        return -code error \
+            "$errPrefix, wrong number args: should be \"$self\" $method method args"
+    }
+
+    return  [lindex $commandRec 1]
+}
+
+
+# Clears all instance command caches
+proc ::snit::RT.ClearInstanceCaches {selfns} {
+    unset -nocomplain -- ${selfns}::Snit_methodCache
+    unset -nocomplain -- ${selfns}::Snit_cgetCache
+    unset -nocomplain -- ${selfns}::Snit_configureCache
+    unset -nocomplain -- ${selfns}::Snit_validateCache
+}
+
+
+#-----------------------------------------------------------------------
+# Component Installation
+
+# Implements %TYPE%::installhull.  The variables self and selfns
+# must be defined in the caller's context.
+#
+# Installs the named widget as the hull of a
+# widgetadaptor.  Once the widget is hijacked, its new name
+# is assigned to the hull component.
+
+proc ::snit::RT.installhull {type {using "using"} {widgetType ""} args} {
+    variable ${type}::Snit_info
+    variable ${type}::Snit_optionInfo
+    upvar self self
+    upvar selfns selfns
+    upvar ${selfns}::hull hull
+    upvar ${selfns}::options options
+
+    # FIRST, make sure we can do it.
+    if {!$Snit_info(isWidget)} {
+        error "installhull is valid only for snit::widgetadaptors"
+    }
+
+    if {[info exists ${selfns}::Snit_instance]} {
+        error "hull already installed for $type $self"
+    }
+
+    # NEXT, has it been created yet?  If not, create it using
+    # the specified arguments.
+    if {"using" == $using} {
+        # FIRST, create the widget
+        set cmd [linsert $args 0 $widgetType $self]
+        set obj [uplevel 1 $cmd]
+
+        # NEXT, for each option explicitly delegated to the hull
+        # that doesn't appear in the usedOpts list, get the
+        # option database value and apply it--provided that the
+        # real option name and the target option name are different.
+        # (If they are the same, then the option database was
+        # already queried as part of the normal widget creation.)
+        #
+        # Also, we don't need to worry about implicitly delegated
+        # options, as the option and target option names must be
+        # the same.
+        if {[info exists Snit_optionInfo(delegated-hull)]} {
+
+            # FIRST, extract all option names from args
+            set usedOpts {}
+            set ndx [lsearch -glob $args "-*"]
+            foreach {opt val} [lrange $args $ndx end] {
+                lappend usedOpts $opt
+            }
+
+            foreach opt $Snit_optionInfo(delegated-hull) {
+                set target [lindex $Snit_optionInfo(target-$opt) 1]
+
+                if {"$target" == $opt} {
+                    continue
+                }
+
+                set result [lsearch -exact $usedOpts $target]
+
+                if {$result != -1} {
+                    continue
+                }
+
+                set dbval [RT.OptionDbGet $type $self $opt]
+                $obj configure $target $dbval
+            }
+        }
+    } else {
+        set obj $using
+
+        if {![string equal $obj $self]} {
+            error \
+                "hull name mismatch: \"$obj\" != \"$self\""
+        }
+    }
+
+    # NEXT, get the local option defaults.
+    foreach opt $Snit_optionInfo(local) {
+        set dbval [RT.OptionDbGet $type $self $opt]
+
+        if {"" != $dbval} {
+            set options($opt) $dbval
+        }
+    }
+
+
+    # NEXT, do the magic
+    set i 0
+    while 1 {
+        incr i
+        set newName "::hull${i}$self"
+        if {![llength [info commands $newName]]} {
+            break
+        }
+    }
+
+    rename ::$self $newName
+    RT.MakeInstanceCommand $type $selfns $self
+
+    # Note: this relies on RT.ComponentTrace to do the dirty work.
+    set hull $newName
+
+    return
+}
+
+# Implements %TYPE%::install.
+#
+# Creates a widget and installs it as the named component.
+# It expects self and selfns to be defined in the caller's context.
+
+proc ::snit::RT.install {type compName "using" widgetType winPath args} {
+    variable ${type}::Snit_optionInfo
+    variable ${type}::Snit_info
+    upvar self self
+    upvar selfns selfns
+    upvar ${selfns}::$compName comp
+    upvar ${selfns}::hull hull
+
+    # We do the magic option database stuff only if $self is
+    # a widget.
+    if {$Snit_info(isWidget)} {
+        if {"" == $hull} {
+            error "tried to install \"$compName\" before the hull exists"
+        }
+
+        # FIRST, query the option database and save the results
+        # into args.  Insert them before the first option in the
+        # list, in case there are any non-standard parameters.
+        #
+        # Note: there might not be any delegated options; if so,
+        # don't bother.
+
+        if {[info exists Snit_optionInfo(delegated-$compName)]} {
+            set ndx [lsearch -glob $args "-*"]
+
+            foreach opt $Snit_optionInfo(delegated-$compName) {
+                set dbval [RT.OptionDbGet $type $self $opt]
+
+                if {"" != $dbval} {
+                    set target [lindex $Snit_optionInfo(target-$opt) 1]
+                    set args [linsert $args $ndx $target $dbval]
+                }
+            }
+        }
+    }
+
+    # NEXT, create the component and save it.
+    set cmd [concat [list $widgetType $winPath] $args]
+    set comp [uplevel 1 $cmd]
+
+    # NEXT, handle the option database for "delegate option *",
+    # in widgets only.
+    if {$Snit_info(isWidget) && [string equal $Snit_optionInfo(starcomp) $compName]} {
+        # FIRST, get the list of option specs from the widget.
+        # If configure doesn't work, skip it.
+        if {[catch {$comp configure} specs]} {
+            return
+        }
+
+        # NEXT, get the set of explicitly used options from args
+        set usedOpts {}
+        set ndx [lsearch -glob $args "-*"]
+        foreach {opt val} [lrange $args $ndx end] {
+            lappend usedOpts $opt
+        }
+
+        # NEXT, "delegate option *" matches all options defined
+        # by this widget that aren't defined by the widget as a whole,
+        # and that aren't excepted.  Plus, we skip usedOpts.  So build
+        # a list of the options it can't match.
+        set skiplist [concat \
+                          $usedOpts \
+                          $Snit_optionInfo(except) \
+                          $Snit_optionInfo(local) \
+                          $Snit_optionInfo(delegated)]
+
+        # NEXT, loop over all of the component's options, and set
+        # any not in the skip list for which there is an option
+        # database value.
+        foreach spec $specs {
+            # Skip aliases
+            if {[llength $spec] != 5} {
+                continue
+            }
+
+            set opt [lindex $spec 0]
+
+            if {[lsearch -exact $skiplist $opt] != -1} {
+                continue
+            }
+
+            set res [lindex $spec 1]
+            set cls [lindex $spec 2]
+
+            set dbvalue [option get $self $res $cls]
+
+            if {"" != $dbvalue} {
+                $comp configure $opt $dbvalue
+            }
+        }
+    }
+
+    return
+}
+
+
+#-----------------------------------------------------------------------
+# Method/Variable Name Qualification
+
+# Implements %TYPE%::variable.  Requires selfns.
+proc ::snit::RT.variable {varname} {
+    upvar selfns selfns
+
+    if {![string match "::*" $varname]} {
+        uplevel 1 [list upvar 1 ${selfns}::$varname $varname]
+    } else {
+        # varname is fully qualified; let the standard
+        # "variable" command handle it.
+        uplevel 1 [list ::variable $varname]
+    }
+}
+
+# Fully qualifies a typevariable name.
+#
+# This is used to implement the mytypevar command.
+
+proc ::snit::RT.mytypevar {type name} {
+    return ${type}::$name
+}
+
+# Fully qualifies an instance variable name.
+#
+# This is used to implement the myvar command.
+proc ::snit::RT.myvar {name} {
+    upvar selfns selfns
+    return ${selfns}::$name
+}
+
+# Use this like "list" to convert a proc call into a command
+# string to pass to another object (e.g., as a -command).
+# Qualifies the proc name properly.
+#
+# This is used to implement the "myproc" command.
+
+proc ::snit::RT.myproc {type procname args} {
+    set procname "${type}::$procname"
+    return [linsert $args 0 $procname]
+}
+
+# DEPRECATED
+proc ::snit::RT.codename {type name} {
+    return "${type}::$name"
+}
+
+# Use this like "list" to convert a typemethod call into a command
+# string to pass to another object (e.g., as a -command).
+# Inserts the type command at the beginning.
+#
+# This is used to implement the "mytypemethod" command.
+
+proc ::snit::RT.mytypemethod {type args} {
+    return [linsert $args 0 $type]
+}
+
+# Use this like "list" to convert a method call into a command
+# string to pass to another object (e.g., as a -command).
+# Inserts the code at the beginning to call the right object, even if
+# the object's name has changed.  Requires that selfns be defined
+# in the calling context, eg. can only be called in instance
+# code.
+#
+# This is used to implement the "mymethod" command.
+
+proc ::snit::RT.mymethod {args} {
+    upvar selfns selfns
+    return [linsert $args 0 ::snit::RT.CallInstance ${selfns}]
+}
+
+# Calls an instance method for an object given its
+# instance namespace and remaining arguments (the first of which
+# will be the method name.
+#
+# selfns		The instance namespace
+# args			The arguments
+#
+# Uses the selfns to determine $self, and calls the method
+# in the normal way.
+#
+# This is used to implement the "mymethod" command.
+
+proc ::snit::RT.CallInstance {selfns args} {
+    upvar ${selfns}::Snit_instance self
+
+    set retval [catch {uplevel 1 [linsert $args 0 $self]} result]
+
+    if {$retval} {
+        if {$retval == 1} {
+            global errorInfo
+            global errorCode
+            return -code error -errorinfo $errorInfo \
+                -errorcode $errorCode $result
+        } else {
+            return -code $retval $result
+        }
+    }
+
+    return $result
+}
+
+# Looks for the named option in the named variable.  If found,
+# it and its value are removed from the list, and the value
+# is returned.  Otherwise, the default value is returned.
+# If the option is undelegated, it's own default value will be
+# used if none is specified.
+#
+# Implements the "from" command.
+
+proc ::snit::RT.from {type argvName option {defvalue ""}} {
+    variable ${type}::Snit_optionInfo
+    upvar $argvName argv
+
+    set ioption [lsearch -exact $argv $option]
+
+    if {$ioption == -1} {
+        if {"" == $defvalue &&
+            [info exists Snit_optionInfo(default-$option)]} {
+            return $Snit_optionInfo(default-$option)
+        } else {
+            return $defvalue
+        }
+    }
+
+    set ivalue [expr {$ioption + 1}]
+    set value [lindex $argv $ivalue]
+
+    set argv [lreplace $argv $ioption $ivalue]
+
+    return $value
+}
+
+#-----------------------------------------------------------------------
+# Type Destruction
+
+# Implements the standard "destroy" typemethod:
+# Destroys a type completely.
+#
+# type		The snit type
+
+proc ::snit::RT.typemethod.destroy {type} {
+    variable ${type}::Snit_info
+
+    # FIRST, destroy all instances
+    foreach selfns [namespace children $type "${type}::Snit_inst*"] {
+        if {![namespace exists $selfns]} {
+            continue
+        }
+        upvar ${selfns}::Snit_instance obj
+
+        if {$Snit_info(isWidget)} {
+            destroy $obj
+        } else {
+            if {[llength [info commands $obj]]} {
+                $obj destroy
+            }
+        }
+    }
+
+    # NEXT, destroy the type's data.
+    namespace delete $type
+
+    # NEXT, get rid of the type command.
+    rename $type ""
+}
+
+
+
+#-----------------------------------------------------------------------
+# Option Handling
+
+# Implements the standard "cget" method
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# option        The name of the option
+
+proc ::snit::RT.method.cget {type selfns win self option} {
+    if {[catch {set ${selfns}::Snit_cgetCache($option)} command]} {
+        set command [snit::RT.CacheCgetCommand $type $selfns $win $self $option]
+
+        if {[llength $command] == 0} {
+            return -code error "unknown option \"$option\""
+        }
+    }
+
+    uplevel 1 $command
+}
+
+# Retrieves and caches the command that implements "cget" for the
+# specified option.
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# option        The name of the option
+
+proc ::snit::RT.CacheCgetCommand {type selfns win self option} {
+    variable ${type}::Snit_optionInfo
+    variable ${selfns}::Snit_cgetCache
+
+    if {[info exists Snit_optionInfo(islocal-$option)]} {
+        # We know the item; it's either local, or explicitly delegated.
+        if {$Snit_optionInfo(islocal-$option)} {
+            # It's a local option.  If it has a cget method defined,
+            # use it; otherwise just return the value.
+
+            if {"" == $Snit_optionInfo(cget-$option)} {
+                set command [list set ${selfns}::options($option)]
+            } else {
+                set command [snit::RT.LookupMethodCommand \
+                                 $type $selfns $win $self \
+                                 $Snit_optionInfo(cget-$option) \
+                                 "can't cget $option"]
+
+                lappend command $option
+            }
+
+            set Snit_cgetCache($option) $command
+            return $command
+        }
+
+        # Explicitly delegated option; get target
+        set comp [lindex $Snit_optionInfo(target-$option) 0]
+        set target [lindex $Snit_optionInfo(target-$option) 1]
+    } elseif {"" != $Snit_optionInfo(starcomp) &&
+              [lsearch -exact $Snit_optionInfo(except) $option] == -1} {
+        # Unknown option, but unknowns are delegated; get target.
+        set comp $Snit_optionInfo(starcomp)
+        set target $option
+    } else {
+        return ""
+    }
+
+    # Get the component's object.
+    set obj [RT.Component $type $selfns $comp]
+
+    set command [list $obj cget $target]
+    set Snit_cgetCache($option) $command
+
+    return $command
+}
+
+# Implements the standard "configurelist" method
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# optionlist    A list of options and their values.
+
+proc ::snit::RT.method.configurelist {type selfns win self optionlist} {
+    variable ${type}::Snit_optionInfo
+
+    foreach {option value} $optionlist {
+        # FIRST, get the configure command, caching it if need be.
+        if {[catch {set ${selfns}::Snit_configureCache($option)} command]} {
+            set command [snit::RT.CacheConfigureCommand \
+                             $type $selfns $win $self $option]
+
+            if {[llength $command] == 0} {
+                return -code error "unknown option \"$option\""
+            }
+        }
+
+        # NEXT, if we have a type-validation object, use it.
+        # TBD: Should test (islocal-$option) here, but islocal
+        # isn't defined for implicitly delegated options.
+        if {[info exists Snit_optionInfo(typeobj-$option)]
+            && "" != $Snit_optionInfo(typeobj-$option)} {
+            if {[catch {
+                $Snit_optionInfo(typeobj-$option) validate $value
+            } result]} {
+                return -code error "invalid $option value: $result"
+            }
+        }
+
+        # NEXT, the caching the configure command also cached the
+        # validate command, if any.  If we have one, run it.
+        set valcommand [set ${selfns}::Snit_validateCache($option)]
+
+        if {[llength $valcommand]} {
+            lappend valcommand $value
+            uplevel 1 $valcommand
+        }
+
+        # NEXT, configure the option with the value.
+        lappend command $value
+        uplevel 1 $command
+    }
+
+    return
+}
+
+# Retrieves and caches the command that stores the named option.
+# Also stores the command that validates the name option if any;
+# If none, the validate command is "", so that the cache is always
+# populated.
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# option        An option name
+
+proc ::snit::RT.CacheConfigureCommand {type selfns win self option} {
+    variable ${type}::Snit_optionInfo
+    variable ${selfns}::Snit_configureCache
+    variable ${selfns}::Snit_validateCache
+
+    if {[info exist Snit_optionInfo(islocal-$option)]} {
+        # We know the item; it's either local, or explicitly delegated.
+
+        if {$Snit_optionInfo(islocal-$option)} {
+            # It's a local option.
+
+            # If it's readonly, it throws an error if we're already
+            # constructed.
+            if {$Snit_optionInfo(readonly-$option)} {
+                if {[set ${selfns}::Snit_iinfo(constructed)]} {
+                    error "option $option can only be set at instance creation"
+                }
+            }
+
+            # If it has a validate method, cache that for later.
+            if {"" != $Snit_optionInfo(validate-$option)} {
+                set command [snit::RT.LookupMethodCommand \
+                                 $type $selfns $win $self \
+                                 $Snit_optionInfo(validate-$option) \
+                                 "can't validate $option"]
+
+                lappend command $option
+                set Snit_validateCache($option) $command
+            } else {
+                set Snit_validateCache($option) ""
+            }
+
+            # If it has a configure method defined,
+            # cache it; otherwise, just set the value.
+
+            if {"" == $Snit_optionInfo(configure-$option)} {
+                set command [list set ${selfns}::options($option)]
+            } else {
+                set command [snit::RT.LookupMethodCommand \
+                                 $type $selfns $win $self \
+                                 $Snit_optionInfo(configure-$option) \
+                                 "can't configure $option"]
+
+                lappend command $option
+            }
+
+            set Snit_configureCache($option) $command
+            return $command
+        }
+
+        # Delegated option: get target.
+        set comp [lindex $Snit_optionInfo(target-$option) 0]
+        set target [lindex $Snit_optionInfo(target-$option) 1]
+    } elseif {$Snit_optionInfo(starcomp) != "" &&
+              [lsearch -exact $Snit_optionInfo(except) $option] == -1} {
+        # Unknown option, but unknowns are delegated.
+        set comp $Snit_optionInfo(starcomp)
+        set target $option
+    } else {
+        return ""
+    }
+
+    # There is no validate command in this case; save an empty string.
+    set Snit_validateCache($option) ""
+
+    # Get the component's object
+    set obj [RT.Component $type $selfns $comp]
+
+    set command [list $obj configure $target]
+    set Snit_configureCache($option) $command
+
+    return $command
+}
+
+# Implements the standard "configure" method
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# args          A list of options and their values, possibly empty.
+
+proc ::snit::RT.method.configure {type selfns win self args} {
+    # If two or more arguments, set values as usual.
+    if {[llength $args] >= 2} {
+        ::snit::RT.method.configurelist $type $selfns $win $self $args
+        return
+    }
+
+    # If zero arguments, acquire data for each known option
+    # and return the list
+    if {[llength $args] == 0} {
+        set result {}
+        foreach opt [RT.method.info.options $type $selfns $win $self] {
+            # Refactor this, so that we don't need to call via $self.
+            lappend result [RT.GetOptionDbSpec \
+                                $type $selfns $win $self $opt]
+        }
+
+        return $result
+    }
+
+    # They want it for just one.
+    set opt [lindex $args 0]
+
+    return [RT.GetOptionDbSpec $type $selfns $win $self $opt]
+}
+
+
+# Retrieves the option database spec for a single option.
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# option        The name of an option
+#
+# TBD: This is a bad name.  What it's returning is the
+# result of the configure query.
+
+proc ::snit::RT.GetOptionDbSpec {type selfns win self opt} {
+    variable ${type}::Snit_optionInfo
+
+    upvar ${selfns}::Snit_components Snit_components
+    upvar ${selfns}::options         options
+
+    if {[info exists options($opt)]} {
+        # This is a locally-defined option.  Just build the
+        # list and return it.
+        set res $Snit_optionInfo(resource-$opt)
+        set cls $Snit_optionInfo(class-$opt)
+        set def $Snit_optionInfo(default-$opt)
+
+        return [list $opt $res $cls $def \
+                    [RT.method.cget $type $selfns $win $self $opt]]
+    } elseif {[info exists Snit_optionInfo(target-$opt)]} {
+        # This is an explicitly delegated option.  The only
+        # thing we don't have is the default.
+        set res $Snit_optionInfo(resource-$opt)
+        set cls $Snit_optionInfo(class-$opt)
+
+        # Get the default
+        set logicalName [lindex $Snit_optionInfo(target-$opt) 0]
+        set comp $Snit_components($logicalName)
+        set target [lindex $Snit_optionInfo(target-$opt) 1]
+
+        if {[catch {$comp configure $target} result]} {
+            set defValue {}
+        } else {
+            set defValue [lindex $result 3]
+        }
+
+        return [list $opt $res $cls $defValue [$self cget $opt]]
+    } elseif {"" != $Snit_optionInfo(starcomp) &&
+              [lsearch -exact $Snit_optionInfo(except) $opt] == -1} {
+        set logicalName $Snit_optionInfo(starcomp)
+        set target $opt
+        set comp $Snit_components($logicalName)
+
+        if {[catch {set value [$comp cget $target]} result]} {
+            error "unknown option \"$opt\""
+        }
+
+        if {![catch {$comp configure $target} result]} {
+            # Replace the delegated option name with the local name.
+            return [::snit::Expand $result $target $opt]
+        }
+
+        # configure didn't work; return simple form.
+        return [list $opt "" "" "" $value]
+    } else {
+        error "unknown option \"$opt\""
+    }
+}
+
+#-----------------------------------------------------------------------
+# Type Introspection
+
+# Implements the standard "info" typemethod.
+#
+# type		The snit type
+# command       The info subcommand
+# args          All other arguments.
+
+proc ::snit::RT.typemethod.info {type command args} {
+    global errorInfo
+    global errorCode
+
+    switch -exact $command {
+	args        -
+	body        -
+	default     -
+        typevars    -
+        typemethods -
+        instances {
+            # TBD: it should be possible to delete this error
+            # handling.
+            set errflag [catch {
+                uplevel 1 [linsert $args 0 \
+			       ::snit::RT.typemethod.info.$command $type]
+            } result]
+
+            if {$errflag} {
+                return -code error -errorinfo $errorInfo \
+                    -errorcode $errorCode $result
+            } else {
+                return $result
+            }
+        }
+        default {
+            error "\"$type info $command\" is not defined"
+        }
+    }
+}
+
+
+# Returns a list of the type's typevariables whose names match a
+# pattern, excluding Snit internal variables.
+#
+# type		A Snit type
+# pattern       Optional.  The glob pattern to match.  Defaults
+#               to *.
+
+proc ::snit::RT.typemethod.info.typevars {type {pattern *}} {
+    set result {}
+    foreach name [info vars "${type}::$pattern"] {
+        set tail [namespace tail $name]
+        if {![string match "Snit_*" $tail]} {
+            lappend result $name
+        }
+    }
+
+    return $result
+}
+
+# Returns a list of the type's methods whose names match a
+# pattern.  If "delegate typemethod *" is used, the list may
+# not be complete.
+#
+# type		A Snit type
+# pattern       Optional.  The glob pattern to match.  Defaults
+#               to *.
+
+proc ::snit::RT.typemethod.info.typemethods {type {pattern *}} {
+    variable ${type}::Snit_typemethodInfo
+    variable ${type}::Snit_typemethodCache
+
+    # FIRST, get the explicit names, skipping prefixes.
+    set result {}
+
+    foreach name [array names Snit_typemethodInfo $pattern] {
+        if {[lindex $Snit_typemethodInfo($name) 0] != 1} {
+            lappend result $name
+        }
+    }
+
+    # NEXT, add any from the cache that aren't explicit.
+    if {[info exists Snit_typemethodInfo(*)]} {
+        # First, remove "*" from the list.
+        set ndx [lsearch -exact $result "*"]
+        if {$ndx != -1} {
+            set result [lreplace $result $ndx $ndx]
+        }
+
+        foreach name [array names Snit_typemethodCache $pattern] {
+            if {[lsearch -exact $result $name] == -1} {
+                lappend result $name
+            }
+        }
+    }
+
+    return $result
+}
+
+# $type info args
+#
+# Returns a method's list of arguments. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.typemethod.info.args {type method} {
+    upvar ${type}::Snit_typemethodInfo  Snit_typemethodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_typemethodInfo
+
+    if {![info exists Snit_typemethodInfo($method)]} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    foreach {flag cmd component} $Snit_typemethodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated typemethod \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [lrange [::info args $theproc] 1 end]
+}
+
+# $type info body
+#
+# Returns a method's body. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.typemethod.info.body {type method} {
+    upvar ${type}::Snit_typemethodInfo  Snit_typemethodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_typemethodInfo
+
+    if {![info exists Snit_typemethodInfo($method)]} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    foreach {flag cmd component} $Snit_typemethodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated typemethod \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [RT.body [::info body $theproc]]
+}
+
+# $type info default
+#
+# Returns a method's list of arguments. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.typemethod.info.default {type method aname dvar} {
+    upvar 1 $dvar def
+    upvar ${type}::Snit_typemethodInfo  Snit_typemethodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_methodInfo
+
+    if {![info exists Snit_typemethodInfo($method)]} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    foreach {flag cmd component} $Snit_typemethodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated typemethod \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [::info default $theproc $aname def]
+}
+
+# Returns a list of the type's instances whose names match
+# a pattern.
+#
+# type		A Snit type
+# pattern       Optional.  The glob pattern to match
+#               Defaults to *
+#
+# REQUIRE: type is fully qualified.
+
+proc ::snit::RT.typemethod.info.instances {type {pattern *}} {
+    set result {}
+
+    foreach selfns [namespace children $type "${type}::Snit_inst*"] {
+        upvar ${selfns}::Snit_instance instance
+
+        if {[string match $pattern $instance]} {
+            lappend result $instance
+        }
+    }
+
+    return $result
+}
+
+#-----------------------------------------------------------------------
+# Instance Introspection
+
+# Implements the standard "info" method.
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# command       The info subcommand
+# args          All other arguments.
+
+proc ::snit::RT.method.info {type selfns win self command args} {
+    switch -exact $command {
+	args        -
+	body        -
+	default     -
+        type        -
+        vars        -
+        options     -
+        methods     -
+        typevars    -
+        typemethods {
+            set errflag [catch {
+                uplevel 1 [linsert $args 0 ::snit::RT.method.info.$command \
+			       $type $selfns $win $self]
+            } result]
+
+            if {$errflag} {
+                global errorInfo
+                return -code error -errorinfo $errorInfo $result
+            } else {
+                return $result
+            }
+        }
+        default {
+            # error "\"$self info $command\" is not defined"
+            return -code error "\"$self info $command\" is not defined"
+        }
+    }
+}
+
+# $self info type
+#
+# Returns the instance's type
+proc ::snit::RT.method.info.type {type selfns win self} {
+    return $type
+}
+
+# $self info typevars
+#
+# Returns the instance's type's typevariables
+proc ::snit::RT.method.info.typevars {type selfns win self {pattern *}} {
+    return [RT.typemethod.info.typevars $type $pattern]
+}
+
+# $self info typemethods
+#
+# Returns the instance's type's typemethods
+proc ::snit::RT.method.info.typemethods {type selfns win self {pattern *}} {
+    return [RT.typemethod.info.typemethods $type $pattern]
+}
+
+# Returns a list of the instance's methods whose names match a
+# pattern.  If "delegate method *" is used, the list may
+# not be complete.
+#
+# type		A Snit type
+# selfns        The instance namespace
+# win		The original instance name
+# self          The current instance name
+# pattern       Optional.  The glob pattern to match.  Defaults
+#               to *.
+
+proc ::snit::RT.method.info.methods {type selfns win self {pattern *}} {
+    variable ${type}::Snit_methodInfo
+    variable ${selfns}::Snit_methodCache
+
+    # FIRST, get the explicit names, skipping prefixes.
+    set result {}
+
+    foreach name [array names Snit_methodInfo $pattern] {
+        if {[lindex $Snit_methodInfo($name) 0] != 1} {
+            lappend result $name
+        }
+    }
+
+    # NEXT, add any from the cache that aren't explicit.
+    if {[info exists Snit_methodInfo(*)]} {
+        # First, remove "*" from the list.
+        set ndx [lsearch -exact $result "*"]
+        if {$ndx != -1} {
+            set result [lreplace $result $ndx $ndx]
+        }
+
+        foreach name [array names Snit_methodCache $pattern] {
+            if {[lsearch -exact $result $name] == -1} {
+                lappend result $name
+            }
+        }
+    }
+
+    return $result
+}
+
+# $self info args
+#
+# Returns a method's list of arguments. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.method.info.args {type selfns win self method} {
+
+    upvar ${type}::Snit_methodInfo  Snit_methodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_methodInfo
+
+    if {![info exists Snit_methodInfo($method)]} {
+	return -code error "Unknown method \"$method\""
+    }
+    foreach {flag cmd component} $Snit_methodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown method \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated method \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type %n $selfns %w $win %s $self]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [lrange [::info args $theproc] 4 end]
+}
+
+# $self info body
+#
+# Returns a method's body. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.method.info.body {type selfns win self method} {
+
+    upvar ${type}::Snit_methodInfo  Snit_methodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_methodInfo
+
+    if {![info exists Snit_methodInfo($method)]} {
+	return -code error "Unknown method \"$method\""
+    }
+    foreach {flag cmd component} $Snit_methodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown method \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated method \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type %n $selfns %w $win %s $self]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [RT.body [::info body $theproc]]
+}
+
+# $self info default
+#
+# Returns a method's list of arguments. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.method.info.default {type selfns win self method aname dvar} {
+    upvar 1 $dvar def
+    upvar ${type}::Snit_methodInfo  Snit_methodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    if {![info exists Snit_methodInfo($method)]} {
+	return -code error "Unknown method \"$method\""
+    }
+    foreach {flag cmd component} $Snit_methodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown method \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated method \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type %n $selfns %w $win %s $self]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [::info default $theproc $aname def]
+}
+
+# $self info vars
+#
+# Returns the instance's instance variables
+proc ::snit::RT.method.info.vars {type selfns win self {pattern *}} {
+    set result {}
+    foreach name [info vars "${selfns}::$pattern"] {
+        set tail [namespace tail $name]
+        if {![string match "Snit_*" $tail]} {
+            lappend result $name
+        }
+    }
+
+    return $result
+}
+
+# $self info options
+#
+# Returns a list of the names of the instance's options
+proc ::snit::RT.method.info.options {type selfns win self {pattern *}} {
+    variable ${type}::Snit_optionInfo
+
+    # First, get the local and explicitly delegated options
+    set result [concat $Snit_optionInfo(local) $Snit_optionInfo(delegated)]
+
+    # If "configure" works as for Tk widgets, add the resulting
+    # options to the list.  Skip excepted options
+    if {"" != $Snit_optionInfo(starcomp)} {
+        upvar ${selfns}::Snit_components Snit_components
+        set logicalName $Snit_optionInfo(starcomp)
+        set comp $Snit_components($logicalName)
+
+        if {![catch {$comp configure} records]} {
+            foreach record $records {
+                set opt [lindex $record 0]
+                if {[lsearch -exact $result $opt] == -1 &&
+                    [lsearch -exact $Snit_optionInfo(except) $opt] == -1} {
+                    lappend result $opt
+                }
+            }
+        }
+    }
+
+    # Next, apply the pattern
+    set names {}
+
+    foreach name $result {
+        if {[string match $pattern $name]} {
+            lappend names $name
+        }
+    }
+
+    return $names
+}
+
+proc ::snit::RT.body {body} {
+    regsub -all ".*# END snit method prolog\n" $body {} body
+    return $body
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/main1_83.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/main1_83.tcl
new file mode 100644
index 00000000..d8b16f6d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/main1_83.tcl
@@ -0,0 +1,4011 @@
+#-----------------------------------------------------------------------
+# TITLE:
+#	main1_83.tcl
+#
+# AUTHOR:
+#	Will Duquette
+#
+# DESCRIPTION:
+#       Snit's Not Incr Tcl, a simple object system in Pure Tcl.
+#
+#       Snit 1.x Compiler and Run-Time Library, Tcl 8.3 and later
+#
+#       Copyright (C) 2003-2006 by William H. Duquette
+#       This code is licensed as described in license.txt.
+#
+#-----------------------------------------------------------------------
+# Back-port to Tcl8.3 by Kenneth Green (kmg)
+# Modified by Andreas Kupries.
+# Further modified by Will Duquette 12 Aug 2006
+#
+# Local changes marked with "#kmg-tcl83"
+#
+# Global changes:
+#  " trace add variable " -> "trace variable "
+#  " write " -> "w" in all calls to 'trace variable'
+#  " unset -nocomplain "  -> "::snit83::unset -nocomplain"
+#-----------------------------------------------------------------------
+
+#-----------------------------------------------------------------------
+# Namespace
+
+namespace eval ::snit:: {
+    namespace export \
+        compile type widget widgetadaptor typemethod method macro
+}
+
+#-----------------------------------------------------------------------
+# Some Snit variables
+
+namespace eval ::snit:: {
+    variable reservedArgs {type selfns win self}
+
+    # Widget classes which can be hulls (must have -class)
+    variable hulltypes {
+	toplevel tk::toplevel
+	frame tk::frame ttk::frame
+	labelframe tk::labelframe ttk::labelframe
+    }
+}
+
+#-----------------------------------------------------------------------
+# Snit Type Implementation template
+
+namespace eval ::snit:: {
+    # Template type definition: All internal and user-visible Snit
+    # implementation code.
+    #
+    # The following placeholders will automatically be replaced with
+    # the client's code, in two passes:
+    #
+    # First pass:
+    # %COMPILEDDEFS%  The compiled type definition.
+    #
+    # Second pass:
+    # %TYPE%          The fully qualified type name.
+    # %IVARDECS%      Instance variable declarations
+    # %TVARDECS%      Type variable declarations
+    # %TCONSTBODY%    Type constructor body
+    # %INSTANCEVARS%  The compiled instance variable initialization code.
+    # %TYPEVARS%      The compiled type variable initialization code.
+
+    # This is the overall type template.
+    variable typeTemplate
+
+    # This is the normal type proc
+    variable nominalTypeProc
+
+    # This is the "-hastypemethods no" type proc
+    variable simpleTypeProc
+}
+
+set ::snit::typeTemplate {
+
+    #-------------------------------------------------------------------
+    # The type's namespace definition and the user's type variables
+
+    namespace eval %TYPE% {%TYPEVARS%
+    }
+
+    #----------------------------------------------------------------
+    # Commands for use in methods, typemethods, etc.
+    #
+    # These are implemented as aliases into the Snit runtime library.
+
+    interp alias {} %TYPE%::installhull  {} ::snit::RT.installhull %TYPE%
+    interp alias {} %TYPE%::install      {} ::snit::RT.install %TYPE%
+    interp alias {} %TYPE%::typevariable {} ::variable
+    interp alias {} %TYPE%::variable     {} ::snit::RT.variable
+    interp alias {} %TYPE%::mytypevar    {} ::snit::RT.mytypevar %TYPE%
+    interp alias {} %TYPE%::typevarname  {} ::snit::RT.mytypevar %TYPE%
+    interp alias {} %TYPE%::myvar        {} ::snit::RT.myvar
+    interp alias {} %TYPE%::varname      {} ::snit::RT.myvar
+    interp alias {} %TYPE%::codename     {} ::snit::RT.codename %TYPE%
+    interp alias {} %TYPE%::myproc       {} ::snit::RT.myproc %TYPE%
+    interp alias {} %TYPE%::mymethod     {} ::snit::RT.mymethod
+    interp alias {} %TYPE%::mytypemethod {} ::snit::RT.mytypemethod %TYPE%
+    interp alias {} %TYPE%::from         {} ::snit::RT.from %TYPE%
+
+    #-------------------------------------------------------------------
+    # Snit's internal variables
+
+    namespace eval %TYPE% {
+        # Array: General Snit Info
+        #
+        # ns:                The type's namespace
+        # hasinstances:      T or F, from pragma -hasinstances.
+        # simpledispatch:    T or F, from pragma -hasinstances.
+        # canreplace:        T or F, from pragma -canreplace.
+        # counter:           Count of instances created so far.
+        # widgetclass:       Set by widgetclass statement.
+        # hulltype:          Hull type (frame or toplevel) for widgets only.
+        # exceptmethods:     Methods explicitly not delegated to *
+        # excepttypemethods: Methods explicitly not delegated to *
+        # tvardecs:          Type variable declarations--for dynamic methods
+        # ivardecs:          Instance variable declarations--for dyn. methods
+        typevariable Snit_info
+        set Snit_info(ns)      %TYPE%::
+        set Snit_info(hasinstances) 1
+        set Snit_info(simpledispatch) 0
+        set Snit_info(canreplace) 0
+        set Snit_info(counter) 0
+        set Snit_info(widgetclass) {}
+        set Snit_info(hulltype) frame
+        set Snit_info(exceptmethods) {}
+        set Snit_info(excepttypemethods) {}
+        set Snit_info(tvardecs) {%TVARDECS%}
+        set Snit_info(ivardecs) {%IVARDECS%}
+
+        # Array: Public methods of this type.
+        # The index is the method name, or "*".
+        # The value is [list $pattern $componentName], where
+        # $componentName is "" for normal methods.
+        typevariable Snit_typemethodInfo
+        array unset Snit_typemethodInfo
+
+        # Array: Public methods of instances of this type.
+        # The index is the method name, or "*".
+        # The value is [list $pattern $componentName], where
+        # $componentName is "" for normal methods.
+        typevariable Snit_methodInfo
+        array unset Snit_methodInfo
+
+        # Array: option information.  See dictionary.txt.
+        typevariable Snit_optionInfo
+        array unset Snit_optionInfo
+        set Snit_optionInfo(local)     {}
+        set Snit_optionInfo(delegated) {}
+        set Snit_optionInfo(starcomp)  {}
+        set Snit_optionInfo(except)    {}
+    }
+
+    #----------------------------------------------------------------
+    # Compiled Procs
+    #
+    # These commands are created or replaced during compilation:
+
+
+    # Snit_instanceVars selfns
+    #
+    # Initializes the instance variables, if any.  Called during
+    # instance creation.
+
+    proc %TYPE%::Snit_instanceVars {selfns} {
+        %INSTANCEVARS%
+    }
+
+    # Type Constructor
+    proc %TYPE%::Snit_typeconstructor {type} {
+        %TVARDECS%
+        %TCONSTBODY%
+    }
+
+    #----------------------------------------------------------------
+    # Default Procs
+    #
+    # These commands might be replaced during compilation:
+
+    # Snit_destructor type selfns win self
+    #
+    # Default destructor for the type.  By default, it does
+    # nothing.  It's replaced by any user destructor.
+    # For types, it's called by method destroy; for widgettypes,
+    # it's called by a destroy event handler.
+
+    proc %TYPE%::Snit_destructor {type selfns win self} { }
+
+    #----------------------------------------------------------
+    # Compiled Definitions
+
+    %COMPILEDDEFS%
+
+    #----------------------------------------------------------
+    # Finally, call the Type Constructor
+
+    %TYPE%::Snit_typeconstructor %TYPE%
+}
+
+#-----------------------------------------------------------------------
+# Type procs
+#
+# These procs expect the fully-qualified type name to be
+# substituted in for %TYPE%.
+
+# This is the nominal type proc.  It supports typemethods and
+# delegated typemethods.
+set ::snit::nominalTypeProc {
+    # Type dispatcher function.  Note: This function lives
+    # in the parent of the %TYPE% namespace!  All accesses to
+    # %TYPE% variables and methods must be qualified!
+    proc %TYPE% {{method ""} args} {
+        # First, if there's no method, and no args, and there's a create
+        # method, and this isn't a widget, then method is "create" and
+        # "args" is %AUTO%.
+        if {"" == $method && [llength $args] == 0} {
+            ::variable %TYPE%::Snit_info
+
+            if {$Snit_info(hasinstances) && !$Snit_info(isWidget)} {
+                set method create
+                lappend args %AUTO%
+            } else {
+                error "wrong \# args: should be \"%TYPE% method args\""
+            }
+        }
+
+        # Next, retrieve the command.
+	variable %TYPE%::Snit_typemethodCache
+        while 1 {
+            if {[catch {set Snit_typemethodCache($method)} commandRec]} {
+                set commandRec [::snit::RT.CacheTypemethodCommand %TYPE% $method]
+
+                if {[llength $commandRec] == 0} {
+                    return -code error  "\"%TYPE% $method\" is not defined"
+                }
+            }
+
+            # If we've got a real command, break.
+            if {[lindex $commandRec 0] == 0} {
+                break
+            }
+
+            # Otherwise, we need to look up again...if we can.
+            if {[llength $args] == 0} {
+                return -code error \
+                 "wrong number args: should be \"%TYPE% $method method args\""
+            }
+
+            lappend method [lindex $args 0]
+            set args [lrange $args 1 end]
+        }
+
+        set command [lindex $commandRec 1]
+
+        # Pass along the return code unchanged.
+        set retval [catch {uplevel 1 $command $args} result]
+
+        if {$retval} {
+            if {$retval == 1} {
+                global errorInfo
+                global errorCode
+                return -code error -errorinfo $errorInfo \
+                    -errorcode $errorCode $result
+            } else {
+                return -code $retval $result
+            }
+        }
+
+        return $result
+    }
+}
+
+# This is the simplified type proc for when there are no typemethods
+# except create.  In this case, it doesn't take a method argument;
+# the method is always "create".
+set ::snit::simpleTypeProc {
+    # Type dispatcher function.  Note: This function lives
+    # in the parent of the %TYPE% namespace!  All accesses to
+    # %TYPE% variables and methods must be qualified!
+    proc %TYPE% {args} {
+        ::variable %TYPE%::Snit_info
+
+        # FIRST, if the are no args, the single arg is %AUTO%
+        if {[llength $args] == 0} {
+            if {$Snit_info(isWidget)} {
+                error "wrong \# args: should be \"%TYPE% name args\""
+            }
+
+            lappend args %AUTO%
+        }
+
+        # NEXT, we're going to call the create method.
+        # Pass along the return code unchanged.
+        if {$Snit_info(isWidget)} {
+            set command [list ::snit::RT.widget.typemethod.create %TYPE%]
+        } else {
+            set command [list ::snit::RT.type.typemethod.create %TYPE%]
+        }
+
+        set retval [catch {uplevel 1 $command $args} result]
+
+        if {$retval} {
+            if {$retval == 1} {
+                global errorInfo
+                global errorCode
+                return -code error -errorinfo $errorInfo \
+                    -errorcode $errorCode $result
+            } else {
+                return -code $retval $result
+            }
+        }
+
+        return $result
+    }
+}
+
+#-----------------------------------------------------------------------
+# Instance procs
+#
+# The following must be substituted into these proc bodies:
+#
+# %SELFNS%       The instance namespace
+# %WIN%          The original instance name
+# %TYPE%         The fully-qualified type name
+#
+
+# Nominal instance proc body: supports method caching and delegation.
+#
+# proc $instanceName {method args} ....
+set ::snit::nominalInstanceProc {
+    set self [set %SELFNS%::Snit_instance]
+
+    while {1} {
+        if {[catch {set %SELFNS%::Snit_methodCache($method)} commandRec]} {
+            set commandRec [snit::RT.CacheMethodCommand %TYPE% %SELFNS% %WIN% $self $method]
+
+            if {[llength $commandRec] == 0} {
+                return -code error \
+                    "\"$self $method\" is not defined"
+            }
+        }
+
+        # If we've got a real command, break.
+        if {[lindex $commandRec 0] == 0} {
+            break
+        }
+
+        # Otherwise, we need to look up again...if we can.
+        if {[llength $args] == 0} {
+            return -code error \
+                "wrong number args: should be \"$self $method method args\""
+        }
+
+        lappend method [lindex $args 0]
+        set args [lrange $args 1 end]
+    }
+
+    set command [lindex $commandRec 1]
+
+    # Pass along the return code unchanged.
+    set retval [catch {uplevel 1 $command $args} result]
+
+    if {$retval} {
+        if {$retval == 1} {
+            global errorInfo
+            global errorCode
+            return -code error -errorinfo $errorInfo \
+                -errorcode $errorCode $result
+        } else {
+            return -code $retval $result
+        }
+    }
+
+    return $result
+}
+
+# Simplified method proc body: No delegation allowed; no support for
+# upvar or exotic return codes or hierarchical methods.  Designed for
+# max speed for simple types.
+#
+# proc $instanceName {method args} ....
+
+set ::snit::simpleInstanceProc {
+    set self [set %SELFNS%::Snit_instance]
+
+    if {[lsearch -exact ${%TYPE%::Snit_methods} $method] == -1} {
+	set optlist [join ${%TYPE%::Snit_methods} ", "]
+	set optlist [linsert $optlist "end-1" "or"]
+	error "bad option \"$method\": must be $optlist"
+    }
+
+    eval [linsert $args 0 \
+              %TYPE%::Snit_method$method %TYPE% %SELFNS% %WIN% $self]
+}
+
+
+#=======================================================================
+# Snit Type Definition
+#
+# These are the procs used to define Snit types, widgets, and
+# widgetadaptors.
+
+
+#-----------------------------------------------------------------------
+# Snit Compilation Variables
+#
+# The following variables are used while Snit is compiling a type,
+# and are disposed afterwards.
+
+namespace eval ::snit:: {
+    # The compiler variable contains the name of the slave interpreter
+    # used to compile type definitions.
+    variable compiler ""
+
+    # The compile array accumulates information about the type or
+    # widgettype being compiled.  It is cleared before and after each
+    # compilation.  It has these indices:
+    #
+    # type:                  The name of the type being compiled, for use
+    #                        in compilation procs.
+    # defs:                  Compiled definitions, both standard and client.
+    # which:                 type, widget, widgetadaptor
+    # instancevars:          Instance variable definitions and initializations.
+    # ivprocdec:             Instance variable proc declarations.
+    # tvprocdec:             Type variable proc declarations.
+    # typeconstructor:       Type constructor body.
+    # widgetclass:           The widgetclass, for snit::widgets, only
+    # hasoptions:            False, initially; set to true when first
+    #                        option is defined.
+    # localoptions:          Names of local options.
+    # delegatedoptions:      Names of delegated options.
+    # localmethods:          Names of locally defined methods.
+    # delegatesmethods:      no if no delegated methods, yes otherwise.
+    # hashierarchic       :  no if no hierarchic methods, yes otherwise.
+    # components:            Names of defined components.
+    # typecomponents:        Names of defined typecomponents.
+    # typevars:              Typevariable definitions and initializations.
+    # varnames:              Names of instance variables
+    # typevarnames           Names of type variables
+    # hasconstructor         False, initially; true when constructor is
+    #                        defined.
+    # resource-$opt          The option's resource name
+    # class-$opt             The option's class
+    # -default-$opt          The option's default value
+    # -validatemethod-$opt   The option's validate method
+    # -configuremethod-$opt  The option's configure method
+    # -cgetmethod-$opt       The option's cget method.
+    # -hastypeinfo           The -hastypeinfo pragma
+    # -hastypedestroy        The -hastypedestroy pragma
+    # -hastypemethods        The -hastypemethods pragma
+    # -hasinfo               The -hasinfo pragma
+    # -hasinstances          The -hasinstances pragma
+    # -simpledispatch        The -simpledispatch pragma
+    # -canreplace            The -canreplace pragma
+    variable compile
+
+    # This variable accumulates method dispatch information; it has
+    # the same structure as the %TYPE%::Snit_methodInfo array, and is
+    # used to initialize it.
+    variable methodInfo
+
+    # This variable accumulates typemethod dispatch information; it has
+    # the same structure as the %TYPE%::Snit_typemethodInfo array, and is
+    # used to initialize it.
+    variable typemethodInfo
+
+    # The following variable lists the reserved type definition statement
+    # names, e.g., the names you can't use as macros.  It's built at
+    # compiler definition time using "info commands".
+    variable reservedwords {}
+}
+
+#-----------------------------------------------------------------------
+# type compilation commands
+#
+# The type and widgettype commands use a slave interpreter to compile
+# the type definition.  These are the procs
+# that are aliased into it.
+
+# Initialize the compiler
+proc ::snit::Comp.Init {} {
+    variable compiler
+    variable reservedwords
+
+    if {"" == $compiler} {
+        # Create the compiler's interpreter
+        set compiler [interp create]
+
+        # Initialize the interpreter
+	$compiler eval {
+	    catch {close stdout}
+	    catch {close stderr}
+	    catch {close stdin}
+
+            # Load package information
+            # TBD: see if this can be moved outside.
+	    # @mdgen NODEP: ::snit::__does_not_exist__
+            catch {package require ::snit::__does_not_exist__}
+
+            # Protect some Tcl commands our type definitions
+            # will shadow.
+            rename proc _proc
+            rename variable _variable
+        }
+
+        # Define compilation aliases.
+        $compiler alias pragma          ::snit::Comp.statement.pragma
+        $compiler alias widgetclass     ::snit::Comp.statement.widgetclass
+        $compiler alias hulltype        ::snit::Comp.statement.hulltype
+        $compiler alias constructor     ::snit::Comp.statement.constructor
+        $compiler alias destructor      ::snit::Comp.statement.destructor
+        $compiler alias option          ::snit::Comp.statement.option
+        $compiler alias oncget          ::snit::Comp.statement.oncget
+        $compiler alias onconfigure     ::snit::Comp.statement.onconfigure
+        $compiler alias method          ::snit::Comp.statement.method
+        $compiler alias typemethod      ::snit::Comp.statement.typemethod
+        $compiler alias typeconstructor ::snit::Comp.statement.typeconstructor
+        $compiler alias proc            ::snit::Comp.statement.proc
+        $compiler alias typevariable    ::snit::Comp.statement.typevariable
+        $compiler alias variable        ::snit::Comp.statement.variable
+        $compiler alias typecomponent   ::snit::Comp.statement.typecomponent
+        $compiler alias component       ::snit::Comp.statement.component
+        $compiler alias delegate        ::snit::Comp.statement.delegate
+        $compiler alias expose          ::snit::Comp.statement.expose
+
+        # Get the list of reserved words
+        set reservedwords [$compiler eval {info commands}]
+    }
+}
+
+# Compile a type definition, and return the results as a list of two
+# items: the fully-qualified type name, and a script that will define
+# the type when executed.
+#
+# which		type, widget, or widgetadaptor
+# type          the type name
+# body          the type definition
+proc ::snit::Comp.Compile {which type body} {
+    variable typeTemplate
+    variable nominalTypeProc
+    variable simpleTypeProc
+    variable compile
+    variable compiler
+    variable methodInfo
+    variable typemethodInfo
+
+    # FIRST, qualify the name.
+    if {![string match "::*" $type]} {
+        # Get caller's namespace;
+        # append :: if not global namespace.
+        set ns [uplevel 2 [list namespace current]]
+        if {"::" != $ns} {
+            append ns "::"
+        }
+
+        set type "$ns$type"
+    }
+
+    # NEXT, create and initialize the compiler, if needed.
+    Comp.Init
+
+    # NEXT, initialize the class data
+    array unset methodInfo
+    array unset typemethodInfo
+
+    array unset compile
+    set compile(type) $type
+    set compile(defs) {}
+    set compile(which) $which
+    set compile(hasoptions) no
+    set compile(localoptions) {}
+    set compile(instancevars) {}
+    set compile(typevars) {}
+    set compile(delegatedoptions) {}
+    set compile(ivprocdec) {}
+    set compile(tvprocdec) {}
+    set compile(typeconstructor) {}
+    set compile(widgetclass) {}
+    set compile(hulltype) {}
+    set compile(localmethods) {}
+    set compile(delegatesmethods) no
+    set compile(hashierarchic) no
+    set compile(components) {}
+    set compile(typecomponents) {}
+    set compile(varnames) {}
+    set compile(typevarnames) {}
+    set compile(hasconstructor) no
+    set compile(-hastypedestroy) yes
+    set compile(-hastypeinfo) yes
+    set compile(-hastypemethods) yes
+    set compile(-hasinfo) yes
+    set compile(-hasinstances) yes
+    set compile(-simpledispatch) no
+    set compile(-canreplace) no
+
+    set isWidget [string match widget* $which]
+    set isWidgetAdaptor [string match widgetadaptor $which]
+
+    # NEXT, Evaluate the type's definition in the class interpreter.
+    $compiler eval $body
+
+    # NEXT, Add the standard definitions
+    append compile(defs) \
+        "\nset %TYPE%::Snit_info(isWidget) $isWidget\n"
+
+    append compile(defs) \
+        "\nset %TYPE%::Snit_info(isWidgetAdaptor) $isWidgetAdaptor\n"
+
+    # Indicate whether the type can create instances that replace
+    # existing commands.
+    append compile(defs) "\nset %TYPE%::Snit_info(canreplace) $compile(-canreplace)\n"
+
+
+    # Check pragmas for conflict.
+
+    if {!$compile(-hastypemethods) && !$compile(-hasinstances)} {
+        error "$which $type has neither typemethods nor instances"
+    }
+
+    if {$compile(-simpledispatch) && $compile(delegatesmethods)} {
+        error "$which $type requests -simpledispatch but delegates methods."
+    }
+
+    if {$compile(-simpledispatch) && $compile(hashierarchic)} {
+        error "$which $type requests -simpledispatch but defines hierarchical methods."
+    }
+
+    # If there are typemethods, define the standard typemethods and
+    # the nominal type proc.  Otherwise define the simple type proc.
+    if {$compile(-hastypemethods)} {
+        # Add the info typemethod unless the pragma forbids it.
+        if {$compile(-hastypeinfo)} {
+            Comp.statement.delegate typemethod info \
+                using {::snit::RT.typemethod.info %t}
+        }
+
+        # Add the destroy typemethod unless the pragma forbids it.
+        if {$compile(-hastypedestroy)} {
+            Comp.statement.delegate typemethod destroy \
+                using {::snit::RT.typemethod.destroy %t}
+        }
+
+        # Add the nominal type proc.
+        append compile(defs) $nominalTypeProc
+    } else {
+        # Add the simple type proc.
+        append compile(defs) $simpleTypeProc
+    }
+
+    # Add standard methods/typemethods that only make sense if the
+    # type has instances.
+    if {$compile(-hasinstances)} {
+        # If we're using simple dispatch, remember that.
+        if {$compile(-simpledispatch)} {
+            append compile(defs) "\nset %TYPE%::Snit_info(simpledispatch) 1\n"
+        }
+
+        # Add the info method unless the pragma forbids it.
+        if {$compile(-hasinfo)} {
+            if {!$compile(-simpledispatch)} {
+                Comp.statement.delegate method info \
+                    using {::snit::RT.method.info %t %n %w %s}
+            } else {
+                Comp.statement.method info {args} {
+                    eval [linsert $args 0 \
+                              ::snit::RT.method.info $type $selfns $win $self]
+                }
+            }
+        }
+
+        # Add the option handling stuff if there are any options.
+        if {$compile(hasoptions)} {
+            Comp.statement.variable options
+
+            if {!$compile(-simpledispatch)} {
+                Comp.statement.delegate method cget \
+                    using {::snit::RT.method.cget %t %n %w %s}
+                Comp.statement.delegate method configurelist \
+                    using {::snit::RT.method.configurelist %t %n %w %s}
+                Comp.statement.delegate method configure \
+                    using {::snit::RT.method.configure %t %n %w %s}
+            } else {
+                Comp.statement.method cget {args} {
+                    eval [linsert $args 0 \
+                              ::snit::RT.method.cget $type $selfns $win $self]
+                }
+                Comp.statement.method configurelist {args} {
+                    eval [linsert $args 0 \
+                              ::snit::RT.method.configurelist $type $selfns $win $self]
+                }
+                Comp.statement.method configure {args} {
+                    eval [linsert $args 0 \
+                              ::snit::RT.method.configure $type $selfns $win $self]
+                }
+            }
+        }
+
+        # Add a default constructor, if they haven't already defined one.
+        # If there are options, it will configure args; otherwise it
+        # will do nothing.
+        if {!$compile(hasconstructor)} {
+            if {$compile(hasoptions)} {
+                Comp.statement.constructor {args} {
+                    $self configurelist $args
+                }
+            } else {
+                Comp.statement.constructor {} {}
+            }
+        }
+
+        if {!$isWidget} {
+            if {!$compile(-simpledispatch)} {
+                Comp.statement.delegate method destroy \
+                    using {::snit::RT.method.destroy %t %n %w %s}
+            } else {
+                Comp.statement.method destroy {args} {
+                    eval [linsert $args 0 \
+                              ::snit::RT.method.destroy $type $selfns $win $self]
+                }
+            }
+
+            Comp.statement.delegate typemethod create \
+                using {::snit::RT.type.typemethod.create %t}
+        } else {
+            Comp.statement.delegate typemethod create \
+                using {::snit::RT.widget.typemethod.create %t}
+        }
+
+        # Save the list of method names, for -simpledispatch; otherwise,
+        # save the method info.
+        if {$compile(-simpledispatch)} {
+            append compile(defs) \
+                "\nset %TYPE%::Snit_methods [list $compile(localmethods)]\n"
+        } else {
+            append compile(defs) \
+                "\narray set %TYPE%::Snit_methodInfo [list [array get methodInfo]]\n"
+        }
+
+    } else {
+        append compile(defs) "\nset %TYPE%::Snit_info(hasinstances) 0\n"
+    }
+
+    # NEXT, compiling the type definition built up a set of information
+    # about the type's locally defined options; add this information to
+    # the compiled definition.
+    Comp.SaveOptionInfo
+
+    # NEXT, compiling the type definition built up a set of information
+    # about the typemethods; save the typemethod info.
+    append compile(defs) \
+        "\narray set %TYPE%::Snit_typemethodInfo [list [array get typemethodInfo]]\n"
+
+    # NEXT, if this is a widget define the hull component if it isn't
+    # already defined.
+    if {$isWidget} {
+        Comp.DefineComponent hull
+    }
+
+    # NEXT, substitute the compiled definition into the type template
+    # to get the type definition script.
+    set defscript [Expand $typeTemplate \
+                       %COMPILEDDEFS% $compile(defs)]
+
+    # NEXT, substitute the defined macros into the type definition script.
+    # This is done as a separate step so that the compile(defs) can
+    # contain the macros defined below.
+
+    set defscript [Expand $defscript \
+                       %TYPE%         $type \
+                       %IVARDECS%     $compile(ivprocdec) \
+                       %TVARDECS%     $compile(tvprocdec) \
+                       %TCONSTBODY%   $compile(typeconstructor) \
+                       %INSTANCEVARS% $compile(instancevars) \
+                       %TYPEVARS%     $compile(typevars) \
+		       ]
+
+    array unset compile
+
+    return [list $type $defscript]
+}
+
+# Information about locally-defined options is accumulated during
+# compilation, but not added to the compiled definition--the option
+# statement can appear multiple times, so it's easier this way.
+# This proc fills in Snit_optionInfo with the accumulated information.
+#
+# It also computes the option's resource and class names if needed.
+#
+# Note that the information for delegated options was put in
+# Snit_optionInfo during compilation.
+
+proc ::snit::Comp.SaveOptionInfo {} {
+    variable compile
+
+    foreach option $compile(localoptions) {
+        if {"" == $compile(resource-$option)} {
+            set compile(resource-$option) [string range $option 1 end]
+        }
+
+        if {"" == $compile(class-$option)} {
+            set compile(class-$option) [Capitalize $compile(resource-$option)]
+        }
+
+        # NOTE: Don't verify that the validate, configure, and cget
+        # values name real methods; the methods might be defined outside
+        # the typedefinition using snit::method.
+
+        Mappend compile(defs) {
+            # Option %OPTION%
+            lappend %TYPE%::Snit_optionInfo(local) %OPTION%
+
+            set %TYPE%::Snit_optionInfo(islocal-%OPTION%)   1
+            set %TYPE%::Snit_optionInfo(resource-%OPTION%)  %RESOURCE%
+            set %TYPE%::Snit_optionInfo(class-%OPTION%)     %CLASS%
+            set %TYPE%::Snit_optionInfo(default-%OPTION%)   %DEFAULT%
+            set %TYPE%::Snit_optionInfo(validate-%OPTION%)  %VALIDATE%
+            set %TYPE%::Snit_optionInfo(configure-%OPTION%) %CONFIGURE%
+            set %TYPE%::Snit_optionInfo(cget-%OPTION%)      %CGET%
+            set %TYPE%::Snit_optionInfo(readonly-%OPTION%)  %READONLY%
+            set %TYPE%::Snit_optionInfo(typespec-%OPTION%)  %TYPESPEC%
+        }   %OPTION%    $option                                   \
+            %RESOURCE%  $compile(resource-$option)                \
+            %CLASS%     $compile(class-$option)                   \
+            %DEFAULT%   [list $compile(-default-$option)]         \
+            %VALIDATE%  [list $compile(-validatemethod-$option)]  \
+            %CONFIGURE% [list $compile(-configuremethod-$option)] \
+            %CGET%      [list $compile(-cgetmethod-$option)]      \
+            %READONLY%  $compile(-readonly-$option)               \
+            %TYPESPEC%  [list $compile(-type-$option)]
+    }
+}
+
+
+# Evaluates a compiled type definition, thus making the type available.
+proc ::snit::Comp.Define {compResult} {
+    # The compilation result is a list containing the fully qualified
+    # type name and a script to evaluate to define the type.
+    set type [lindex $compResult 0]
+    set defscript [lindex $compResult 1]
+
+    # Execute the type definition script.
+    # Consider using namespace eval %TYPE%.  See if it's faster.
+    if {[catch {eval $defscript} result]} {
+        namespace delete $type
+        catch {rename $type ""}
+        error $result
+    }
+
+    return $type
+}
+
+# Sets pragma options which control how the type is defined.
+proc ::snit::Comp.statement.pragma {args} {
+    variable compile
+
+    set errRoot "Error in \"pragma...\""
+
+    foreach {opt val} $args {
+        switch -exact -- $opt {
+            -hastypeinfo    -
+            -hastypedestroy -
+            -hastypemethods -
+            -hasinstances   -
+            -simpledispatch -
+            -hasinfo        -
+            -canreplace     {
+                if {![string is boolean -strict $val]} {
+                    error "$errRoot, \"$opt\" requires a boolean value"
+                }
+                set compile($opt) $val
+            }
+            default {
+                error "$errRoot, unknown pragma"
+            }
+        }
+    }
+}
+
+# Defines a widget's option class name.
+# This statement is only available for snit::widgets,
+# not for snit::types or snit::widgetadaptors.
+proc ::snit::Comp.statement.widgetclass {name} {
+    variable compile
+
+    # First, widgetclass can only be set for true widgets
+    if {"widget" != $compile(which)} {
+        error "widgetclass cannot be set for snit::$compile(which)s"
+    }
+
+    # Next, validate the option name.  We'll require that it begin
+    # with an uppercase letter.
+    set initial [string index $name 0]
+    if {![string is upper $initial]} {
+        error "widgetclass \"$name\" does not begin with an uppercase letter"
+    }
+
+    if {"" != $compile(widgetclass)} {
+        error "too many widgetclass statements"
+    }
+
+    # Next, save it.
+    Mappend compile(defs) {
+        set  %TYPE%::Snit_info(widgetclass) %WIDGETCLASS%
+    } %WIDGETCLASS% [list $name]
+
+    set compile(widgetclass) $name
+}
+
+# Defines a widget's hull type.
+# This statement is only available for snit::widgets,
+# not for snit::types or snit::widgetadaptors.
+proc ::snit::Comp.statement.hulltype {name} {
+    variable compile
+    variable hulltypes
+
+    # First, hulltype can only be set for true widgets
+    if {"widget" != $compile(which)} {
+        error "hulltype cannot be set for snit::$compile(which)s"
+    }
+
+    # Next, it must be one of the valid hulltypes (frame, toplevel, ...)
+    if {[lsearch -exact $hulltypes [string trimleft $name :]] == -1} {
+        error "invalid hulltype \"$name\", should be one of\
+		[join $hulltypes {, }]"
+    }
+
+    if {"" != $compile(hulltype)} {
+        error "too many hulltype statements"
+    }
+
+    # Next, save it.
+    Mappend compile(defs) {
+        set  %TYPE%::Snit_info(hulltype) %HULLTYPE%
+    } %HULLTYPE% $name
+
+    set compile(hulltype) $name
+}
+
+# Defines a constructor.
+proc ::snit::Comp.statement.constructor {arglist body} {
+    variable compile
+
+    CheckArgs "constructor" $arglist
+
+    # Next, add a magic reference to self.
+    set arglist [concat type selfns win self $arglist]
+
+    # Next, add variable declarations to body:
+    set body "%TVARDECS%%IVARDECS%\n$body"
+
+    set compile(hasconstructor) yes
+    append compile(defs) "proc %TYPE%::Snit_constructor [list $arglist] [list $body]\n"
+}
+
+# Defines a destructor.
+proc ::snit::Comp.statement.destructor {body} {
+    variable compile
+
+    # Next, add variable declarations to body:
+    set body "%TVARDECS%%IVARDECS%\n$body"
+
+    append compile(defs) "proc %TYPE%::Snit_destructor {type selfns win self} [list $body]\n\n"
+}
+
+# Defines a type option.  The option value can be a triple, specifying
+# the option's -name, resource name, and class name.
+proc ::snit::Comp.statement.option {optionDef args} {
+    variable compile
+
+    # First, get the three option names.
+    set option [lindex $optionDef 0]
+    set resourceName [lindex $optionDef 1]
+    set className [lindex $optionDef 2]
+
+    set errRoot "Error in \"option [list $optionDef]...\""
+
+    # Next, validate the option name.
+    if {![Comp.OptionNameIsValid $option]} {
+        error "$errRoot, badly named option \"$option\""
+    }
+
+    if {[Contains $option $compile(delegatedoptions)]} {
+        error "$errRoot, cannot define \"$option\" locally, it has been delegated"
+    }
+
+    if {![Contains $option $compile(localoptions)]} {
+        # Remember that we've seen this one.
+        set compile(hasoptions) yes
+        lappend compile(localoptions) $option
+
+        # Initialize compilation info for this option.
+        set compile(resource-$option)         ""
+        set compile(class-$option)            ""
+        set compile(-default-$option)         ""
+        set compile(-validatemethod-$option)  ""
+        set compile(-configuremethod-$option) ""
+        set compile(-cgetmethod-$option)      ""
+        set compile(-readonly-$option)        0
+        set compile(-type-$option)            ""
+    }
+
+    # NEXT, see if we have a resource name.  If so, make sure it
+    # isn't being redefined differently.
+    if {"" != $resourceName} {
+        if {"" == $compile(resource-$option)} {
+            # If it's undefined, just save the value.
+            set compile(resource-$option) $resourceName
+        } elseif {![string equal $resourceName $compile(resource-$option)]} {
+            # It's been redefined differently.
+            error "$errRoot, resource name redefined from \"$compile(resource-$option)\" to \"$resourceName\""
+        }
+    }
+
+    # NEXT, see if we have a class name.  If so, make sure it
+    # isn't being redefined differently.
+    if {"" != $className} {
+        if {"" == $compile(class-$option)} {
+            # If it's undefined, just save the value.
+            set compile(class-$option) $className
+        } elseif {![string equal $className $compile(class-$option)]} {
+            # It's been redefined differently.
+            error "$errRoot, class name redefined from \"$compile(class-$option)\" to \"$className\""
+        }
+    }
+
+    # NEXT, handle the args; it's not an error to redefine these.
+    if {[llength $args] == 1} {
+        set compile(-default-$option) [lindex $args 0]
+    } else {
+        foreach {optopt val} $args {
+            switch -exact -- $optopt {
+                -default         -
+                -validatemethod  -
+                -configuremethod -
+                -cgetmethod      {
+                    set compile($optopt-$option) $val
+                }
+                -type {
+                    set compile($optopt-$option) $val
+                    
+                    if {[llength $val] == 1} {
+                        # The type spec *is* the validation object
+                        append compile(defs) \
+                            "\nset %TYPE%::Snit_optionInfo(typeobj-$option) [list $val]\n"
+                    } else {
+                        # Compilation the creation of the validation object
+                        set cmd [linsert $val 1 %TYPE%::Snit_TypeObj_%AUTO%]
+                        append compile(defs) \
+                            "\nset %TYPE%::Snit_optionInfo(typeobj-$option) \[$cmd\]\n"
+                    }
+                }
+                -readonly        {
+                    if {![string is boolean -strict $val]} {
+                        error "$errRoot, -readonly requires a boolean, got \"$val\""
+                    }
+                    set compile($optopt-$option) $val
+                }
+                default {
+                    error "$errRoot, unknown option definition option \"$optopt\""
+                }
+            }
+        }
+    }
+}
+
+# 1 if the option name is valid, 0 otherwise.
+proc ::snit::Comp.OptionNameIsValid {option} {
+    if {![string match {-*} $option] || [string match {*[A-Z ]*} $option]} {
+        return 0
+    }
+
+    return 1
+}
+
+# Defines an option's cget handler
+proc ::snit::Comp.statement.oncget {option body} {
+    variable compile
+
+    set errRoot "Error in \"oncget $option...\""
+
+    if {[lsearch -exact $compile(delegatedoptions) $option] != -1} {
+        return -code error "$errRoot, option \"$option\" is delegated"
+    }
+
+    if {[lsearch -exact $compile(localoptions) $option] == -1} {
+        return -code error "$errRoot, option \"$option\" unknown"
+    }
+
+    Comp.statement.method _cget$option {_option} $body
+    Comp.statement.option $option -cgetmethod _cget$option
+}
+
+# Defines an option's configure handler.
+proc ::snit::Comp.statement.onconfigure {option arglist body} {
+    variable compile
+
+    if {[lsearch -exact $compile(delegatedoptions) $option] != -1} {
+        return -code error "onconfigure $option: option \"$option\" is delegated"
+    }
+
+    if {[lsearch -exact $compile(localoptions) $option] == -1} {
+        return -code error "onconfigure $option: option \"$option\" unknown"
+    }
+
+    if {[llength $arglist] != 1} {
+        error \
+       "onconfigure $option handler should have one argument, got \"$arglist\""
+    }
+
+    CheckArgs "onconfigure $option" $arglist
+
+    # Next, add a magic reference to the option name
+    set arglist [concat _option $arglist]
+
+    Comp.statement.method _configure$option $arglist $body
+    Comp.statement.option $option -configuremethod _configure$option
+}
+
+# Defines an instance method.
+proc ::snit::Comp.statement.method {method arglist body} {
+    variable compile
+    variable methodInfo
+
+    # FIRST, check the method name against previously defined
+    # methods.
+    Comp.CheckMethodName $method 0 ::snit::methodInfo \
+        "Error in \"method [list $method]...\""
+
+    if {[llength $method] > 1} {
+        set compile(hashierarchic) yes
+    }
+
+    # Remeber this method
+    lappend compile(localmethods) $method
+
+    CheckArgs "method [list $method]" $arglist
+
+    # Next, add magic references to type and self.
+    set arglist [concat type selfns win self $arglist]
+
+    # Next, add variable declarations to body:
+    set body "%TVARDECS%%IVARDECS%\n# END snit method prolog\n$body"
+
+    # Next, save the definition script.
+    if {[llength $method] == 1} {
+        set methodInfo($method) {0 "%t::Snit_method%m %t %n %w %s" ""}
+        Mappend compile(defs) {
+            proc %TYPE%::Snit_method%METHOD% %ARGLIST% %BODY%
+        } %METHOD% $method %ARGLIST% [list $arglist] %BODY% [list $body]
+    } else {
+        set methodInfo($method) {0 "%t::Snit_hmethod%j %t %n %w %s" ""}
+
+        Mappend compile(defs) {
+            proc %TYPE%::Snit_hmethod%JMETHOD% %ARGLIST% %BODY%
+        } %JMETHOD% [join $method _] %ARGLIST% [list $arglist] \
+            %BODY% [list $body]
+    }
+}
+
+# Check for name collisions; save prefix information.
+#
+# method	The name of the method or typemethod.
+# delFlag       1 if delegated, 0 otherwise.
+# infoVar       The fully qualified name of the array containing
+#               information about the defined methods.
+# errRoot       The root string for any error messages.
+
+proc ::snit::Comp.CheckMethodName {method delFlag infoVar errRoot} {
+    upvar $infoVar methodInfo
+
+    # FIRST, make sure the method name is a valid Tcl list.
+    if {[catch {lindex $method 0}]} {
+        error "$errRoot, the name \"$method\" must have list syntax."
+    }
+
+    # NEXT, check whether we can define it.
+    if {![catch {set methodInfo($method)} data]} {
+        # We can't redefine methods with submethods.
+        if {[lindex $data 0] == 1} {
+            error "$errRoot, \"$method\" has submethods."
+        }
+
+        # You can't delegate a method that's defined locally,
+        # and you can't define a method locally if it's been delegated.
+        if {$delFlag && "" == [lindex $data 2]} {
+            error "$errRoot, \"$method\" has been defined locally."
+        } elseif {!$delFlag && "" != [lindex $data 2]} {
+            error "$errRoot, \"$method\" has been delegated"
+        }
+    }
+
+    # Handle hierarchical case.
+    if {[llength $method] > 1} {
+        set prefix {}
+        set tokens $method
+        while {[llength $tokens] > 1} {
+            lappend prefix [lindex $tokens 0]
+            set tokens [lrange $tokens 1 end]
+
+            if {![catch {set methodInfo($prefix)} result]} {
+                # Prefix is known.  If it's not a prefix, throw an
+                # error.
+                if {[lindex $result 0] == 0} {
+                    error "$errRoot, \"$prefix\" has no submethods."
+                }
+            }
+
+            set methodInfo($prefix) [list 1]
+        }
+    }
+}
+
+# Defines a typemethod method.
+proc ::snit::Comp.statement.typemethod {method arglist body} {
+    variable compile
+    variable typemethodInfo
+
+    # FIRST, check the typemethod name against previously defined
+    # typemethods.
+    Comp.CheckMethodName $method 0 ::snit::typemethodInfo \
+        "Error in \"typemethod [list $method]...\""
+
+    CheckArgs "typemethod $method" $arglist
+
+    # First, add magic reference to type.
+    set arglist [concat type $arglist]
+
+    # Next, add typevariable declarations to body:
+    set body "%TVARDECS%\n# END snit method prolog\n$body"
+
+    # Next, save the definition script
+    if {[llength $method] == 1} {
+        set typemethodInfo($method) {0 "%t::Snit_typemethod%m %t" ""}
+
+        Mappend compile(defs) {
+            proc %TYPE%::Snit_typemethod%METHOD% %ARGLIST% %BODY%
+        } %METHOD% $method %ARGLIST% [list $arglist] %BODY% [list $body]
+    } else {
+        set typemethodInfo($method) {0 "%t::Snit_htypemethod%j %t" ""}
+
+        Mappend compile(defs) {
+            proc %TYPE%::Snit_htypemethod%JMETHOD% %ARGLIST% %BODY%
+        } %JMETHOD% [join $method _] \
+            %ARGLIST% [list $arglist] %BODY% [list $body]
+    }
+}
+
+
+# Defines a type constructor.
+proc ::snit::Comp.statement.typeconstructor {body} {
+    variable compile
+
+    if {"" != $compile(typeconstructor)} {
+        error "too many typeconstructors"
+    }
+
+    set compile(typeconstructor) $body
+}
+
+# Defines a static proc in the type's namespace.
+proc ::snit::Comp.statement.proc {proc arglist body} {
+    variable compile
+
+    # If "ns" is defined, the proc can see instance variables.
+    if {[lsearch -exact $arglist selfns] != -1} {
+        # Next, add instance variable declarations to body:
+        set body "%IVARDECS%\n$body"
+    }
+
+    # The proc can always see typevariables.
+    set body "%TVARDECS%\n$body"
+
+    append compile(defs) "
+
+        # Proc $proc
+        proc [list %TYPE%::$proc $arglist $body]
+    "
+}
+
+# Defines a static variable in the type's namespace.
+proc ::snit::Comp.statement.typevariable {name args} {
+    variable compile
+
+    set errRoot "Error in \"typevariable $name...\""
+
+    set len [llength $args]
+
+    if {$len > 2 ||
+        ($len == 2 && "-array" != [lindex $args 0])} {
+        error "$errRoot, too many initializers"
+    }
+
+    if {[lsearch -exact $compile(varnames) $name] != -1} {
+        error "$errRoot, \"$name\" is already an instance variable"
+    }
+
+    lappend compile(typevarnames) $name
+
+    if {$len == 1} {
+        append compile(typevars) \
+		"\n\t    [list ::variable $name [lindex $args 0]]"
+    } elseif {$len == 2} {
+        append compile(typevars) \
+            "\n\t    [list ::variable $name]"
+        append compile(typevars) \
+            "\n\t    [list array set $name [lindex $args 1]]"
+    } else {
+        append compile(typevars) \
+		"\n\t    [list ::variable $name]"
+    }
+
+    append compile(tvprocdec) "\n\t    typevariable ${name}"
+}
+
+# Defines an instance variable; the definition will go in the
+# type's create typemethod.
+proc ::snit::Comp.statement.variable {name args} {
+    variable compile
+
+    set errRoot "Error in \"variable $name...\""
+
+    set len [llength $args]
+
+    if {$len > 2 ||
+        ($len == 2 && "-array" != [lindex $args 0])} {
+        error "$errRoot, too many initializers"
+    }
+
+    if {[lsearch -exact $compile(typevarnames) $name] != -1} {
+        error "$errRoot, \"$name\" is already a typevariable"
+    }
+
+    lappend compile(varnames) $name
+
+    if {$len == 1} {
+        append compile(instancevars) \
+            "\nset \${selfns}::$name [list [lindex $args 0]]\n"
+    } elseif {$len == 2} {
+        append compile(instancevars) \
+            "\narray set \${selfns}::$name [list [lindex $args 1]]\n"
+    }
+
+    append  compile(ivprocdec) "\n\t    "
+    Mappend compile(ivprocdec) {::variable ${selfns}::%N} %N $name
+}
+
+# Defines a typecomponent, and handles component options.
+#
+# component     The logical name of the delegate
+# args          options.
+
+proc ::snit::Comp.statement.typecomponent {component args} {
+    variable compile
+
+    set errRoot "Error in \"typecomponent $component...\""
+
+    # FIRST, define the component
+    Comp.DefineTypecomponent $component $errRoot
+
+    # NEXT, handle the options.
+    set publicMethod ""
+    set inheritFlag 0
+
+    foreach {opt val} $args {
+        switch -exact -- $opt {
+            -public {
+                set publicMethod $val
+            }
+            -inherit {
+                set inheritFlag $val
+                if {![string is boolean $inheritFlag]} {
+    error "typecomponent $component -inherit: expected boolean value, got \"$val\""
+                }
+            }
+            default {
+                error "typecomponent $component: Invalid option \"$opt\""
+            }
+        }
+    }
+
+    # NEXT, if -public specified, define the method.
+    if {"" != $publicMethod} {
+        Comp.statement.delegate typemethod [list $publicMethod *] to $component
+    }
+
+    # NEXT, if "-inherit 1" is specified, delegate typemethod * to
+    # this component.
+    if {$inheritFlag} {
+        Comp.statement.delegate typemethod "*" to $component
+    }
+
+}
+
+
+# Defines a name to be a typecomponent
+#
+# The name becomes a typevariable; in addition, it gets a
+# write trace so that when it is set, all of the component mechanisms
+# get updated.
+#
+# component     The component name
+
+proc ::snit::Comp.DefineTypecomponent {component {errRoot "Error"}} {
+    variable compile
+
+    if {[lsearch -exact $compile(varnames) $component] != -1} {
+        error "$errRoot, \"$component\" is already an instance variable"
+    }
+
+    if {[lsearch -exact $compile(typecomponents) $component] == -1} {
+        # Remember we've done this.
+        lappend compile(typecomponents) $component
+
+        # Make it a type variable with no initial value
+        Comp.statement.typevariable $component ""
+
+        # Add a write trace to do the component thing.
+        Mappend compile(typevars) {
+            trace variable %COMP% w \
+                [list ::snit::RT.TypecomponentTrace [list %TYPE%] %COMP%]
+        } %TYPE% $compile(type) %COMP% $component
+    }
+}
+
+# Defines a component, and handles component options.
+#
+# component     The logical name of the delegate
+# args          options.
+#
+# TBD: Ideally, it should be possible to call this statement multiple
+# times, possibly changing the option values.  To do that, I'd need
+# to cache the option values and not act on them until *after* I'd
+# read the entire type definition.
+
+proc ::snit::Comp.statement.component {component args} {
+    variable compile
+
+    set errRoot "Error in \"component $component...\""
+
+    # FIRST, define the component
+    Comp.DefineComponent $component $errRoot
+
+    # NEXT, handle the options.
+    set publicMethod ""
+    set inheritFlag 0
+
+    foreach {opt val} $args {
+        switch -exact -- $opt {
+            -public {
+                set publicMethod $val
+            }
+            -inherit {
+                set inheritFlag $val
+                if {![string is boolean $inheritFlag]} {
+    error "component $component -inherit: expected boolean value, got \"$val\""
+                }
+            }
+            default {
+                error "component $component: Invalid option \"$opt\""
+            }
+        }
+    }
+
+    # NEXT, if -public specified, define the method.
+    if {"" != $publicMethod} {
+        Comp.statement.delegate method [list $publicMethod *] to $component
+    }
+
+    # NEXT, if -inherit is specified, delegate method/option * to
+    # this component.
+    if {$inheritFlag} {
+        Comp.statement.delegate method "*" to $component
+        Comp.statement.delegate option "*" to $component
+    }
+}
+
+
+# Defines a name to be a component
+#
+# The name becomes an instance variable; in addition, it gets a
+# write trace so that when it is set, all of the component mechanisms
+# get updated.
+#
+# component     The component name
+
+proc ::snit::Comp.DefineComponent {component {errRoot "Error"}} {
+    variable compile
+
+    if {[lsearch -exact $compile(typevarnames) $component] != -1} {
+        error "$errRoot, \"$component\" is already a typevariable"
+    }
+
+    if {[lsearch -exact $compile(components) $component] == -1} {
+        # Remember we've done this.
+        lappend compile(components) $component
+
+        # Make it an instance variable with no initial value
+        Comp.statement.variable $component ""
+
+        # Add a write trace to do the component thing.
+        Mappend compile(instancevars) {
+            trace variable ${selfns}::%COMP% w \
+                [list ::snit::RT.ComponentTrace [list %TYPE%] $selfns %COMP%]
+        } %TYPE% $compile(type) %COMP% $component
+    }
+}
+
+# Creates a delegated method, typemethod, or option.
+proc ::snit::Comp.statement.delegate {what name args} {
+    # FIRST, dispatch to correct handler.
+    switch $what {
+        typemethod { Comp.DelegatedTypemethod $name $args }
+        method     { Comp.DelegatedMethod     $name $args }
+        option     { Comp.DelegatedOption     $name $args }
+        default {
+            error "Error in \"delegate $what $name...\", \"$what\"?"
+        }
+    }
+
+    if {([llength $args] % 2) != 0} {
+        error "Error in \"delegate $what $name...\", invalid syntax"
+    }
+}
+
+# Creates a delegated typemethod delegating it to a particular
+# typecomponent or an arbitrary command.
+#
+# method    The name of the method
+# arglist       Delegation options
+
+proc ::snit::Comp.DelegatedTypemethod {method arglist} {
+    variable compile
+    variable typemethodInfo
+
+    set errRoot "Error in \"delegate typemethod [list $method]...\""
+
+    # Next, parse the delegation options.
+    set component ""
+    set target ""
+    set exceptions {}
+    set pattern ""
+    set methodTail [lindex $method end]
+
+    foreach {opt value} $arglist {
+        switch -exact $opt {
+            to     { set component $value  }
+            as     { set target $value     }
+            except { set exceptions $value }
+            using  { set pattern $value    }
+            default {
+                error "$errRoot, unknown delegation option \"$opt\""
+            }
+        }
+    }
+
+    if {"" == $component && "" == $pattern} {
+        error "$errRoot, missing \"to\""
+    }
+
+    if {"*" == $methodTail && "" != $target} {
+        error "$errRoot, cannot specify \"as\" with \"*\""
+    }
+
+    if {"*" != $methodTail && "" != $exceptions} {
+        error "$errRoot, can only specify \"except\" with \"*\""
+    }
+
+    if {"" != $pattern && "" != $target} {
+        error "$errRoot, cannot specify both \"as\" and \"using\""
+    }
+
+    foreach token [lrange $method 1 end-1] {
+        if {"*" == $token} {
+            error "$errRoot, \"*\" must be the last token."
+        }
+    }
+
+    # NEXT, define the component
+    if {"" != $component} {
+        Comp.DefineTypecomponent $component $errRoot
+    }
+
+    # NEXT, define the pattern.
+    if {"" == $pattern} {
+        if {"*" == $methodTail} {
+            set pattern "%c %m"
+        } elseif {"" != $target} {
+            set pattern "%c $target"
+        } else {
+            set pattern "%c %m"
+        }
+    }
+
+    # Make sure the pattern is a valid list.
+    if {[catch {lindex $pattern 0} result]} {
+        error "$errRoot, the using pattern, \"$pattern\", is not a valid list"
+    }
+
+    # NEXT, check the method name against previously defined
+    # methods.
+    Comp.CheckMethodName $method 1 ::snit::typemethodInfo $errRoot
+
+    set typemethodInfo($method) [list 0 $pattern $component]
+
+    if {[string equal $methodTail "*"]} {
+        Mappend compile(defs) {
+            set %TYPE%::Snit_info(excepttypemethods) %EXCEPT%
+        } %EXCEPT% [list $exceptions]
+    }
+}
+
+
+# Creates a delegated method delegating it to a particular
+# component or command.
+#
+# method        The name of the method
+# arglist       Delegation options.
+
+proc ::snit::Comp.DelegatedMethod {method arglist} {
+    variable compile
+    variable methodInfo
+
+    set errRoot "Error in \"delegate method [list $method]...\""
+
+    # Next, parse the delegation options.
+    set component ""
+    set target ""
+    set exceptions {}
+    set pattern ""
+    set methodTail [lindex $method end]
+
+    foreach {opt value} $arglist {
+        switch -exact $opt {
+            to     { set component $value  }
+            as     { set target $value     }
+            except { set exceptions $value }
+            using  { set pattern $value    }
+            default {
+                error "$errRoot, unknown delegation option \"$opt\""
+            }
+        }
+    }
+
+    if {"" == $component && "" == $pattern} {
+        error "$errRoot, missing \"to\""
+    }
+
+    if {"*" == $methodTail && "" != $target} {
+        error "$errRoot, cannot specify \"as\" with \"*\""
+    }
+
+    if {"*" != $methodTail && "" != $exceptions} {
+        error "$errRoot, can only specify \"except\" with \"*\""
+    }
+
+    if {"" != $pattern && "" != $target} {
+        error "$errRoot, cannot specify both \"as\" and \"using\""
+    }
+
+    foreach token [lrange $method 1 end-1] {
+        if {"*" == $token} {
+            error "$errRoot, \"*\" must be the last token."
+        }
+    }
+
+    # NEXT, we delegate some methods
+    set compile(delegatesmethods) yes
+
+    # NEXT, define the component.  Allow typecomponents.
+    if {"" != $component} {
+        if {[lsearch -exact $compile(typecomponents) $component] == -1} {
+            Comp.DefineComponent $component $errRoot
+        }
+    }
+
+    # NEXT, define the pattern.
+    if {"" == $pattern} {
+        if {"*" == $methodTail} {
+            set pattern "%c %m"
+        } elseif {"" != $target} {
+            set pattern "%c $target"
+        } else {
+            set pattern "%c %m"
+        }
+    }
+
+    # Make sure the pattern is a valid list.
+    if {[catch {lindex $pattern 0} result]} {
+        error "$errRoot, the using pattern, \"$pattern\", is not a valid list"
+    }
+
+    # NEXT, check the method name against previously defined
+    # methods.
+    Comp.CheckMethodName $method 1 ::snit::methodInfo $errRoot
+
+    # NEXT, save the method info.
+    set methodInfo($method) [list 0 $pattern $component]
+
+    if {[string equal $methodTail "*"]} {
+        Mappend compile(defs) {
+            set %TYPE%::Snit_info(exceptmethods) %EXCEPT%
+        } %EXCEPT% [list $exceptions]
+    }
+}
+
+# Creates a delegated option, delegating it to a particular
+# component and, optionally, to a particular option of that
+# component.
+#
+# optionDef     The option definition
+# args          definition arguments.
+
+proc ::snit::Comp.DelegatedOption {optionDef arglist} {
+    variable compile
+
+    # First, get the three option names.
+    set option [lindex $optionDef 0]
+    set resourceName [lindex $optionDef 1]
+    set className [lindex $optionDef 2]
+
+    set errRoot "Error in \"delegate option [list $optionDef]...\""
+
+    # Next, parse the delegation options.
+    set component ""
+    set target ""
+    set exceptions {}
+
+    foreach {opt value} $arglist {
+        switch -exact $opt {
+            to     { set component $value  }
+            as     { set target $value     }
+            except { set exceptions $value }
+            default {
+                error "$errRoot, unknown delegation option \"$opt\""
+            }
+        }
+    }
+
+    if {"" == $component} {
+        error "$errRoot, missing \"to\""
+    }
+
+    if {"*" == $option && "" != $target} {
+        error "$errRoot, cannot specify \"as\" with \"delegate option *\""
+    }
+
+    if {"*" != $option && "" != $exceptions} {
+        error "$errRoot, can only specify \"except\" with \"delegate option *\""
+    }
+
+    # Next, validate the option name
+
+    if {"*" != $option} {
+        if {![Comp.OptionNameIsValid $option]} {
+            error "$errRoot, badly named option \"$option\""
+        }
+    }
+
+    if {[Contains $option $compile(localoptions)]} {
+        error "$errRoot, \"$option\" has been defined locally"
+    }
+
+    if {[Contains $option $compile(delegatedoptions)]} {
+        error "$errRoot, \"$option\" is multiply delegated"
+    }
+
+    # NEXT, define the component
+    Comp.DefineComponent $component $errRoot
+
+    # Next, define the target option, if not specified.
+    if {![string equal $option "*"] &&
+        [string equal $target ""]} {
+        set target $option
+    }
+
+    # NEXT, save the delegation data.
+    set compile(hasoptions) yes
+
+    if {![string equal $option "*"]} {
+        lappend compile(delegatedoptions) $option
+
+        # Next, compute the resource and class names, if they aren't
+        # already defined.
+
+        if {"" == $resourceName} {
+            set resourceName [string range $option 1 end]
+        }
+
+        if {"" == $className} {
+            set className [Capitalize $resourceName]
+        }
+
+        Mappend  compile(defs) {
+            set %TYPE%::Snit_optionInfo(islocal-%OPTION%) 0
+            set %TYPE%::Snit_optionInfo(resource-%OPTION%) %RES%
+            set %TYPE%::Snit_optionInfo(class-%OPTION%) %CLASS%
+            lappend %TYPE%::Snit_optionInfo(delegated) %OPTION%
+            set %TYPE%::Snit_optionInfo(target-%OPTION%) [list %COMP% %TARGET%]
+            lappend %TYPE%::Snit_optionInfo(delegated-%COMP%) %OPTION%
+        }   %OPTION% $option \
+            %COMP% $component \
+            %TARGET% $target \
+            %RES% $resourceName \
+            %CLASS% $className
+    } else {
+        Mappend  compile(defs) {
+            set %TYPE%::Snit_optionInfo(starcomp) %COMP%
+            set %TYPE%::Snit_optionInfo(except) %EXCEPT%
+        } %COMP% $component %EXCEPT% [list $exceptions]
+    }
+}
+
+# Exposes a component, effectively making the component's command an
+# instance method.
+#
+# component     The logical name of the delegate
+# "as"          sugar; if not "", must be "as"
+# methodname    The desired method name for the component's command, or ""
+
+proc ::snit::Comp.statement.expose {component {"as" ""} {methodname ""}} {
+    variable compile
+
+
+    # FIRST, define the component
+    Comp.DefineComponent $component
+
+    # NEXT, define the method just as though it were in the type
+    # definition.
+    if {[string equal $methodname ""]} {
+        set methodname $component
+    }
+
+    Comp.statement.method $methodname args [Expand {
+        if {[llength $args] == 0} {
+            return $%COMPONENT%
+        }
+
+        if {[string equal $%COMPONENT% ""]} {
+            error "undefined component \"%COMPONENT%\""
+        }
+
+
+        set cmd [linsert $args 0 $%COMPONENT%]
+        return [uplevel 1 $cmd]
+    } %COMPONENT% $component]
+}
+
+
+
+#-----------------------------------------------------------------------
+# Public commands
+
+# Compile a type definition, and return the results as a list of two
+# items: the fully-qualified type name, and a script that will define
+# the type when executed.
+#
+# which		type, widget, or widgetadaptor
+# type          the type name
+# body          the type definition
+proc ::snit::compile {which type body} {
+    return [Comp.Compile $which $type $body]
+}
+
+proc ::snit::type {type body} {
+    return [Comp.Define [Comp.Compile type $type $body]]
+}
+
+proc ::snit::widget {type body} {
+    return [Comp.Define [Comp.Compile widget $type $body]]
+}
+
+proc ::snit::widgetadaptor {type body} {
+    return [Comp.Define [Comp.Compile widgetadaptor $type $body]]
+}
+
+proc ::snit::typemethod {type method arglist body} {
+    # Make sure the type exists.
+    if {![info exists ${type}::Snit_info]} {
+        error "no such type: \"$type\""
+    }
+
+    upvar ${type}::Snit_info           Snit_info
+    upvar ${type}::Snit_typemethodInfo Snit_typemethodInfo
+
+    # FIRST, check the typemethod name against previously defined
+    # typemethods.
+    Comp.CheckMethodName $method 0 ${type}::Snit_typemethodInfo \
+        "Cannot define \"$method\""
+
+    # NEXT, check the arguments
+    CheckArgs "snit::typemethod $type $method" $arglist
+
+    # Next, add magic reference to type.
+    set arglist [concat type $arglist]
+
+    # Next, add typevariable declarations to body:
+    set body "$Snit_info(tvardecs)\n$body"
+
+    # Next, define it.
+    if {[llength $method] == 1} {
+        set Snit_typemethodInfo($method) {0 "%t::Snit_typemethod%m %t" ""}
+        uplevel 1 [list proc ${type}::Snit_typemethod$method $arglist $body]
+    } else {
+        set Snit_typemethodInfo($method) {0 "%t::Snit_htypemethod%j %t" ""}
+        set suffix [join $method _]
+        uplevel 1 [list proc ${type}::Snit_htypemethod$suffix $arglist $body]
+    }
+}
+
+proc ::snit::method {type method arglist body} {
+    # Make sure the type exists.
+    if {![info exists ${type}::Snit_info]} {
+        error "no such type: \"$type\""
+    }
+
+    upvar ${type}::Snit_methodInfo  Snit_methodInfo
+    upvar ${type}::Snit_info        Snit_info
+
+    # FIRST, check the method name against previously defined
+    # methods.
+    Comp.CheckMethodName $method 0 ${type}::Snit_methodInfo \
+        "Cannot define \"$method\""
+
+    # NEXT, check the arguments
+    CheckArgs "snit::method $type $method" $arglist
+
+    # Next, add magic references to type and self.
+    set arglist [concat type selfns win self $arglist]
+
+    # Next, add variable declarations to body:
+    set body "$Snit_info(tvardecs)$Snit_info(ivardecs)\n$body"
+
+    # Next, define it.
+    if {[llength $method] == 1} {
+        set Snit_methodInfo($method) {0 "%t::Snit_method%m %t %n %w %s" ""}
+        uplevel 1 [list proc ${type}::Snit_method$method $arglist $body]
+    } else {
+        set Snit_methodInfo($method) {0 "%t::Snit_hmethod%j %t %n %w %s" ""}
+
+        set suffix [join $method _]
+        uplevel 1 [list proc ${type}::Snit_hmethod$suffix $arglist $body]
+    }
+}
+
+# Defines a proc within the compiler; this proc can call other
+# type definition statements, and thus can be used for meta-programming.
+proc ::snit::macro {name arglist body} {
+    variable compiler
+    variable reservedwords
+
+    # FIRST, make sure the compiler is defined.
+    Comp.Init
+
+    # NEXT, check the macro name against the reserved words
+    if {[lsearch -exact $reservedwords $name] != -1} {
+        error "invalid macro name \"$name\""
+    }
+
+    # NEXT, see if the name has a namespace; if it does, define the
+    # namespace.
+    set ns [namespace qualifiers $name]
+
+    if {"" != $ns} {
+        $compiler eval "namespace eval $ns {}"
+    }
+
+    # NEXT, define the macro
+    $compiler eval [list _proc $name $arglist $body]
+}
+
+#-----------------------------------------------------------------------
+# Utility Functions
+#
+# These are utility functions used while compiling Snit types.
+
+# Builds a template from a tagged list of text blocks, then substitutes
+# all symbols in the mapTable, returning the expanded template.
+proc ::snit::Expand {template args} {
+    return [string map $args $template]
+}
+
+# Expands a template and appends it to a variable.
+proc ::snit::Mappend {varname template args} {
+    upvar $varname myvar
+
+    append myvar [string map $args $template]
+}
+
+# Checks argument list against reserved args
+proc ::snit::CheckArgs {which arglist} {
+    variable reservedArgs
+
+    foreach name $reservedArgs {
+        if {[Contains $name $arglist]} {
+            error "$which's arglist may not contain \"$name\" explicitly"
+        }
+    }
+}
+
+# Returns 1 if a value is in a list, and 0 otherwise.
+proc ::snit::Contains {value list} {
+    if {[lsearch -exact $list $value] != -1} {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+# Capitalizes the first letter of a string.
+proc ::snit::Capitalize {text} {
+    set first [string index $text 0]
+    set rest [string range $text 1 end]
+    return "[string toupper $first]$rest"
+}
+
+# Converts an arbitrary white-space-delimited string into a list
+# by splitting on white-space and deleting empty tokens.
+
+proc ::snit::Listify {str} {
+    set result {}
+    foreach token [split [string trim $str]] {
+        if {[string length $token] > 0} {
+            lappend result $token
+        }
+    }
+
+    return $result
+}
+
+
+#=======================================================================
+# Snit Runtime Library
+#
+# These are procs used by Snit types and widgets at runtime.
+
+#-----------------------------------------------------------------------
+# Object Creation
+
+# Creates a new instance of the snit::type given its name and the args.
+#
+# type		The snit::type
+# name		The instance name
+# args		Args to pass to the constructor
+
+proc ::snit::RT.type.typemethod.create {type name args} {
+    variable ${type}::Snit_info
+    variable ${type}::Snit_optionInfo
+
+    # FIRST, qualify the name.
+    if {![string match "::*" $name]} {
+        # Get caller's namespace;
+        # append :: if not global namespace.
+        set ns [uplevel 1 [list namespace current]]
+        if {"::" != $ns} {
+            append ns "::"
+        }
+
+        set name "$ns$name"
+    }
+
+    # NEXT, if %AUTO% appears in the name, generate a unique
+    # command name.  Otherwise, ensure that the name isn't in use.
+    if {[string match "*%AUTO%*" $name]} {
+        set name [::snit::RT.UniqueName Snit_info(counter) $type $name]
+    } elseif {$Snit_info(canreplace) && [llength [info commands $name]]} {
+
+	#kmg-tcl83
+	#
+	# Had to add this elseif branch to pass test rename-1.5
+	#
+        # Allowed to replace so must first destroy the prior instance
+
+        $name destroy
+    } elseif {!$Snit_info(canreplace) && [llength [info commands $name]]} {
+        error "command \"$name\" already exists"
+    }
+
+    # NEXT, create the instance's namespace.
+    set selfns \
+        [::snit::RT.UniqueInstanceNamespace Snit_info(counter) $type]
+    namespace eval $selfns {}
+
+    # NEXT, install the dispatcher
+    RT.MakeInstanceCommand $type $selfns $name
+
+    # Initialize the options to their defaults.
+    upvar ${selfns}::options options
+    foreach opt $Snit_optionInfo(local) {
+        set options($opt) $Snit_optionInfo(default-$opt)
+    }
+
+    # Initialize the instance vars to their defaults.
+    # selfns must be defined, as it is used implicitly.
+    ${type}::Snit_instanceVars $selfns
+
+    # Execute the type's constructor.
+    set errcode [catch {
+        RT.ConstructInstance $type $selfns $name $args
+    } result]
+
+    if {$errcode} {
+        global errorInfo
+        global errorCode
+
+        set theInfo $errorInfo
+        set theCode $errorCode
+        ::snit::RT.DestroyObject $type $selfns $name
+        error "Error in constructor: $result" $theInfo $theCode
+    }
+
+    # NEXT, return the object's name.
+    return $name
+}
+
+# Creates a new instance of the snit::widget or snit::widgetadaptor
+# given its name and the args.
+#
+# type		The snit::widget or snit::widgetadaptor
+# name		The instance name
+# args		Args to pass to the constructor
+
+proc ::snit::RT.widget.typemethod.create {type name args} {
+    variable ${type}::Snit_info
+    variable ${type}::Snit_optionInfo
+
+    # FIRST, if %AUTO% appears in the name, generate a unique
+    # command name.
+    if {[string match "*%AUTO%*" $name]} {
+        set name [::snit::RT.UniqueName Snit_info(counter) $type $name]
+    }
+
+    # NEXT, create the instance's namespace.
+    set selfns \
+        [::snit::RT.UniqueInstanceNamespace Snit_info(counter) $type]
+    namespace eval $selfns { }
+
+    # NEXT, Initialize the widget's own options to their defaults.
+    upvar ${selfns}::options options
+    foreach opt $Snit_optionInfo(local) {
+        set options($opt) $Snit_optionInfo(default-$opt)
+    }
+
+    # Initialize the instance vars to their defaults.
+    ${type}::Snit_instanceVars $selfns
+
+    # NEXT, if this is a normal widget (not a widget adaptor) then create a
+    # frame as its hull.  We set the frame's -class to the user's widgetclass,
+    # or, if none, search for -class in the args list, otherwise default to
+    # the basename of the $type with an initial upper case letter.
+    if {!$Snit_info(isWidgetAdaptor)} {
+        # FIRST, determine the class name
+	set wclass $Snit_info(widgetclass)
+        if {$Snit_info(widgetclass) == ""} {
+	    set idx [lsearch -exact $args -class]
+	    if {$idx >= 0 && ($idx%2 == 0)} {
+		# -class exists and is in the -option position
+		set wclass [lindex $args [expr {$idx+1}]]
+		set args [lreplace $args $idx [expr {$idx+1}]]
+	    } else {
+		set wclass [::snit::Capitalize [namespace tail $type]]
+	    }
+	}
+
+        # NEXT, create the widget
+        set self $name
+        package require Tk
+        ${type}::installhull using $Snit_info(hulltype) -class $wclass
+
+        # NEXT, let's query the option database for our
+        # widget, now that we know that it exists.
+        foreach opt $Snit_optionInfo(local) {
+            set dbval [RT.OptionDbGet $type $name $opt]
+
+            if {"" != $dbval} {
+                set options($opt) $dbval
+            }
+        }
+    }
+
+    # Execute the type's constructor, and verify that it
+    # has a hull.
+    set errcode [catch {
+        RT.ConstructInstance $type $selfns $name $args
+
+        ::snit::RT.Component $type $selfns hull
+
+        # Prepare to call the object's destructor when the
+        # <Destroy> event is received.  Use a Snit-specific bindtag
+        # so that the widget name's tag is unencumbered.
+
+        bind Snit$type$name <Destroy> [::snit::Expand {
+            ::snit::RT.DestroyObject %TYPE% %NS% %W
+        } %TYPE% $type %NS% $selfns]
+
+        # Insert the bindtag into the list of bindtags right
+        # after the widget name.
+        set taglist [bindtags $name]
+        set ndx [lsearch -exact $taglist $name]
+        incr ndx
+        bindtags $name [linsert $taglist $ndx Snit$type$name]
+    } result]
+
+    if {$errcode} {
+        global errorInfo
+        global errorCode
+
+        set theInfo $errorInfo
+        set theCode $errorCode
+        ::snit::RT.DestroyObject $type $selfns $name
+        error "Error in constructor: $result" $theInfo $theCode
+    }
+
+    # NEXT, return the object's name.
+    return $name
+}
+
+
+# RT.MakeInstanceCommand type selfns instance
+#
+# type        The object type
+# selfns      The instance namespace
+# instance    The instance name
+#
+# Creates the instance proc.
+
+proc ::snit::RT.MakeInstanceCommand {type selfns instance} {
+    variable ${type}::Snit_info
+
+    # FIRST, remember the instance name.  The Snit_instance variable
+    # allows the instance to figure out its current name given the
+    # instance namespace.
+    upvar ${selfns}::Snit_instance Snit_instance
+    set Snit_instance $instance
+
+    # NEXT, qualify the proc name if it's a widget.
+    if {$Snit_info(isWidget)} {
+        set procname ::$instance
+    } else {
+        set procname $instance
+    }
+
+    # NEXT, install the new proc
+    if {!$Snit_info(simpledispatch)} {
+        set instanceProc $::snit::nominalInstanceProc
+    } else {
+        set instanceProc $::snit::simpleInstanceProc
+    }
+
+    proc $procname {method args} \
+        [string map \
+             [list %SELFNS% $selfns %WIN% $instance %TYPE% $type] \
+             $instanceProc]
+
+    #kmg-tcl83
+    # NEXT, add the trace.
+    ::snit83::traceAddCommand $procname {rename delete} \
+        [list ::snit::RT.InstanceTrace $type $selfns $instance]
+}
+
+# This proc is called when the instance command is renamed.
+# If op is delete, then new will always be "", so op is redundant.
+#
+# type		The fully-qualified type name
+# selfns	The instance namespace
+# win		The original instance/tk window name.
+# old		old instance command name
+# new		new instance command name
+# op		rename or delete
+#
+# If the op is delete, we need to clean up the object; otherwise,
+# we need to track the change.
+#
+# NOTE: In Tcl 8.4.2 there's a bug: errors in rename and delete
+# traces aren't propagated correctly.  Instead, they silently
+# vanish.  Add a catch to output any error message.
+
+proc ::snit::RT.InstanceTrace {type selfns win old new op} {
+    variable ${type}::Snit_info
+
+    # Note to developers ...
+    # For Tcl 8.4.0, errors thrown in trace handlers vanish silently.
+    # Therefore we catch them here and create some output to help in
+    # debugging such problems.
+
+    if {[catch {
+        # FIRST, clean up if necessary
+        if {"" == $new} {
+            if {$Snit_info(isWidget)} {
+                destroy $win
+            } else {
+                ::snit::RT.DestroyObject $type $selfns $win
+            }
+        } else {
+            # Otherwise, track the change.
+            variable ${selfns}::Snit_instance
+            set Snit_instance [uplevel 1 [list namespace which -command $new]]
+
+            # Also, clear the instance caches, as many cached commands
+            # might be invalid.
+            RT.ClearInstanceCaches $selfns
+        }
+    } result]} {
+        global errorInfo
+        # Pop up the console on Windows wish, to enable stdout.
+        # This clobbers errorInfo on unix, so save it so we can print it.
+        set ei $errorInfo
+        catch {console show}
+        puts "Error in ::snit::RT.InstanceTrace $type $selfns $win $old $new $op:"
+        puts $ei
+    }
+}
+
+# Calls the instance constructor and handles related housekeeping.
+proc ::snit::RT.ConstructInstance {type selfns instance arglist} {
+    variable ${type}::Snit_optionInfo
+    variable ${selfns}::Snit_iinfo
+
+    # Track whether we are constructed or not.
+    set Snit_iinfo(constructed) 0
+
+    # Call the user's constructor
+    eval [linsert $arglist 0 \
+              ${type}::Snit_constructor $type $selfns $instance $instance]
+
+    set Snit_iinfo(constructed) 1
+
+    # Validate the initial set of options (including defaults)
+    foreach option $Snit_optionInfo(local) {
+        set value [set ${selfns}::options($option)]
+
+        if {"" != $Snit_optionInfo(typespec-$option)} {
+            if {[catch {
+                $Snit_optionInfo(typeobj-$option) validate $value
+            } result]} {
+                return -code error "invalid $option default: $result"
+            }
+        }
+    }
+
+    # Unset the configure cache for all -readonly options.
+    # This ensures that the next time anyone tries to
+    # configure it, an error is thrown.
+    foreach opt $Snit_optionInfo(local) {
+        if {$Snit_optionInfo(readonly-$opt)} {
+            ::snit83::unset -nocomplain ${selfns}::Snit_configureCache($opt)
+        }
+    }
+
+    return
+}
+
+# Returns a unique command name.
+#
+# REQUIRE: type is a fully qualified name.
+# REQUIRE: name contains "%AUTO%"
+# PROMISE: the returned command name is unused.
+proc ::snit::RT.UniqueName {countervar type name} {
+    upvar $countervar counter
+    while 1 {
+        # FIRST, bump the counter and define the %AUTO% instance name;
+        # then substitute it into the specified name.  Wrap around at
+        # 2^31 - 2 to prevent overflow problems.
+        incr counter
+        if {$counter > 2147483646} {
+            set counter 0
+        }
+        set auto "[namespace tail $type]$counter"
+        set candidate [Expand $name %AUTO% $auto]
+        if {![llength [info commands $candidate]]} {
+            return $candidate
+        }
+    }
+}
+
+# Returns a unique instance namespace, fully qualified.
+#
+# countervar     The name of a counter variable
+# type           The instance's type
+#
+# REQUIRE: type is fully qualified
+# PROMISE: The returned namespace name is unused.
+
+proc ::snit::RT.UniqueInstanceNamespace {countervar type} {
+    upvar $countervar counter
+    while 1 {
+        # FIRST, bump the counter and define the namespace name.
+        # Then see if it already exists.  Wrap around at
+        # 2^31 - 2 to prevent overflow problems.
+        incr counter
+        if {$counter > 2147483646} {
+            set counter 0
+        }
+        set ins "${type}::Snit_inst${counter}"
+        if {![namespace exists $ins]} {
+            return $ins
+        }
+    }
+}
+
+# Retrieves an option's value from the option database.
+# Returns "" if no value is found.
+proc ::snit::RT.OptionDbGet {type self opt} {
+    variable ${type}::Snit_optionInfo
+
+    return [option get $self \
+                $Snit_optionInfo(resource-$opt) \
+                $Snit_optionInfo(class-$opt)]
+}
+
+#-----------------------------------------------------------------------
+# Object Destruction
+
+# Implements the standard "destroy" method
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+
+proc ::snit::RT.method.destroy {type selfns win self} {
+    variable ${selfns}::Snit_iinfo
+
+    # Can't destroy the object if it isn't complete constructed.
+    if {!$Snit_iinfo(constructed)} {
+        return -code error "Called 'destroy' method in constructor"
+    }
+
+    # Calls Snit_cleanup, which (among other things) calls the
+    # user's destructor.
+    ::snit::RT.DestroyObject $type $selfns $win
+}
+
+# This is the function that really cleans up; it's automatically
+# called when any instance is destroyed, e.g., by "$object destroy"
+# for types, and by the <Destroy> event for widgets.
+#
+# type		The fully-qualified type name.
+# selfns	The instance namespace
+# win		The original instance command name.
+
+proc ::snit::RT.DestroyObject {type selfns win} {
+    variable ${type}::Snit_info
+
+    # If the variable Snit_instance doesn't exist then there's no
+    # instance command for this object -- it's most likely a
+    # widgetadaptor. Consequently, there are some things that
+    # we don't need to do.
+    if {[info exists ${selfns}::Snit_instance]} {
+        upvar ${selfns}::Snit_instance instance
+
+        # First, remove the trace on the instance name, so that we
+        # don't call RT.DestroyObject recursively.
+        RT.RemoveInstanceTrace $type $selfns $win $instance
+
+        # Next, call the user's destructor
+        ${type}::Snit_destructor $type $selfns $win $instance
+
+        # Next, if this isn't a widget, delete the instance command.
+        # If it is a widget, get the hull component's name, and rename
+        # it back to the widget name
+
+        # Next, delete the hull component's instance command,
+        # if there is one.
+        if {$Snit_info(isWidget)} {
+            set hullcmd [::snit::RT.Component $type $selfns hull]
+
+            catch {rename $instance ""}
+
+            # Clear the bind event
+            bind Snit$type$win <Destroy> ""
+
+            if {[llength [info commands $hullcmd]]} {
+                # FIRST, rename the hull back to its original name.
+                # If the hull is itself a megawidget, it will have its
+                # own cleanup to do, and it might not do it properly
+                # if it doesn't have the right name.
+                rename $hullcmd ::$instance
+
+                # NEXT, destroy it.
+                destroy $instance
+            }
+        } else {
+            catch {rename $instance ""}
+        }
+    }
+
+    # Next, delete the instance's namespace.  This kills any
+    # instance variables.
+    namespace delete $selfns
+
+    return
+}
+
+# Remove instance trace
+#
+# type           The fully qualified type name
+# selfns         The instance namespace
+# win            The original instance name/Tk window name
+# instance       The current instance name
+
+proc ::snit::RT.RemoveInstanceTrace {type selfns win instance} {
+    variable ${type}::Snit_info
+
+    if {$Snit_info(isWidget)} {
+        set procname ::$instance
+    } else {
+        set procname $instance
+    }
+
+    # NEXT, remove any trace on this name
+    catch {
+	#kmg-tcl83
+        ::snit83::traceRemoveCommand $procname {rename delete} \
+            [list ::snit::RT.InstanceTrace $type $selfns $win]
+    }
+}
+
+#-----------------------------------------------------------------------
+# Typecomponent Management and Method Caching
+
+# Typecomponent trace; used for write trace on typecomponent
+# variables.  Saves the new component object name, provided
+# that certain conditions are met.  Also clears the typemethod
+# cache.
+
+proc ::snit::RT.TypecomponentTrace {type component n1 n2 op} {
+    upvar ${type}::Snit_info Snit_info
+    upvar ${type}::${component} cvar
+    upvar ${type}::Snit_typecomponents Snit_typecomponents
+
+    # Save the new component value.
+    set Snit_typecomponents($component) $cvar
+
+    # Clear the typemethod cache.
+    # TBD: can we unset just the elements related to
+    # this component?
+    ::snit83::unset -nocomplain -- ${type}::Snit_typemethodCache
+}
+
+# Generates and caches the command for a typemethod.
+#
+# type		The type
+# method	The name of the typemethod to call.
+#
+# The return value is one of the following lists:
+#
+#    {}              There's no such method.
+#    {1}             The method has submethods; look again.
+#    {0 <command>}   Here's the command to execute.
+
+proc snit::RT.CacheTypemethodCommand {type method} {
+    upvar ${type}::Snit_typemethodInfo  Snit_typemethodInfo
+    upvar ${type}::Snit_typecomponents  Snit_typecomponents
+    upvar ${type}::Snit_typemethodCache Snit_typemethodCache
+    upvar ${type}::Snit_info            Snit_info
+
+    # FIRST, get the pattern data and the typecomponent name.
+    set implicitCreate 0
+    set instanceName ""
+
+    set starredMethod [lreplace $method end end *]
+    set methodTail [lindex $method end]
+
+    if {[info exists Snit_typemethodInfo($method)]} {
+        set key $method
+    } elseif {[info exists Snit_typemethodInfo($starredMethod)]} {
+        if {[lsearch -exact $Snit_info(excepttypemethods) $methodTail] == -1} {
+            set key $starredMethod
+        } else {
+            return [list ]
+        }
+    } elseif {[llength $method] > 1} {
+	return [list ]
+    } elseif {$Snit_info(hasinstances)} {
+        # Assume the unknown name is an instance name to create, unless
+        # this is a widget and the style of the name is wrong, or the
+        # name mimics a standard typemethod.
+
+        if {[set ${type}::Snit_info(isWidget)] &&
+            ![string match ".*" $method]} {
+            return [list ]
+        }
+
+        # Without this check, the call "$type info" will redefine the
+        # standard "::info" command, with disastrous results.  Since it's
+        # a likely thing to do if !-typeinfo, put in an explicit check.
+        if {"info" == $method || "destroy" == $method} {
+            return [list ]
+        }
+
+        set implicitCreate 1
+        set instanceName $method
+        set key create
+        set method create
+    } else {
+        return [list ]
+    }
+
+    foreach {flag pattern compName} $Snit_typemethodInfo($key) {}
+
+    if {$flag == 1} {
+        return [list 1]
+    }
+
+    # NEXT, build the substitution list
+    set subList [list \
+                     %% % \
+                     %t $type \
+                     %M $method \
+                     %m [lindex $method end] \
+                     %j [join $method _]]
+
+    if {"" != $compName} {
+        if {![info exists Snit_typecomponents($compName)]} {
+            error "$type delegates typemethod \"$method\" to undefined typecomponent \"$compName\""
+        }
+
+        lappend subList %c [list $Snit_typecomponents($compName)]
+    }
+
+    set command {}
+
+    foreach subpattern $pattern {
+        lappend command [string map $subList $subpattern]
+    }
+
+    if {$implicitCreate} {
+        # In this case, $method is the name of the instance to
+        # create.  Don't cache, as we usually won't do this one
+        # again.
+        lappend command $instanceName
+    } else {
+        set Snit_typemethodCache($method) [list 0 $command]
+    }
+
+    return [list 0 $command]
+}
+
+
+#-----------------------------------------------------------------------
+# Component Management and Method Caching
+
+# Retrieves the object name given the component name.
+proc ::snit::RT.Component {type selfns name} {
+    variable ${selfns}::Snit_components
+
+    if {[catch {set Snit_components($name)} result]} {
+        variable ${selfns}::Snit_instance
+
+        error "component \"$name\" is undefined in $type $Snit_instance"
+    }
+
+    return $result
+}
+
+# Component trace; used for write trace on component instance
+# variables.  Saves the new component object name, provided
+# that certain conditions are met.  Also clears the method
+# cache.
+
+proc ::snit::RT.ComponentTrace {type selfns component n1 n2 op} {
+    upvar ${type}::Snit_info Snit_info
+    upvar ${selfns}::${component} cvar
+    upvar ${selfns}::Snit_components Snit_components
+
+    # If they try to redefine the hull component after
+    # it's been defined, that's an error--but only if
+    # this is a widget or widget adaptor.
+    if {"hull" == $component &&
+        $Snit_info(isWidget) &&
+        [info exists Snit_components($component)]} {
+        set cvar $Snit_components($component)
+        error "The hull component cannot be redefined"
+    }
+
+    # Save the new component value.
+    set Snit_components($component) $cvar
+
+    # Clear the instance caches.
+    # TBD: can we unset just the elements related to
+    # this component?
+    RT.ClearInstanceCaches $selfns
+}
+
+# Generates and caches the command for a method.
+#
+# type:		The instance's type
+# selfns:	The instance's private namespace
+# win:          The instance's original name (a Tk widget name, for
+#               snit::widgets.
+# self:         The instance's current name.
+# method:	The name of the method to call.
+#
+# The return value is one of the following lists:
+#
+#    {}              There's no such method.
+#    {1}             The method has submethods; look again.
+#    {0 <command>}   Here's the command to execute.
+
+proc ::snit::RT.CacheMethodCommand {type selfns win self method} {
+    variable ${type}::Snit_info
+    variable ${type}::Snit_methodInfo
+    variable ${type}::Snit_typecomponents
+    variable ${selfns}::Snit_components
+    variable ${selfns}::Snit_methodCache
+
+    # FIRST, get the pattern data and the component name.
+    set starredMethod [lreplace $method end end *]
+    set methodTail [lindex $method end]
+
+    if {[info exists Snit_methodInfo($method)]} {
+        set key $method
+    } elseif {[info exists Snit_methodInfo($starredMethod)] &&
+              [lsearch -exact $Snit_info(exceptmethods) $methodTail] == -1} {
+        set key $starredMethod
+    } else {
+        return [list ]
+    }
+
+    foreach {flag pattern compName} $Snit_methodInfo($key) {}
+
+    if {$flag == 1} {
+        return [list 1]
+    }
+
+    # NEXT, build the substitution list
+    set subList [list \
+                     %% % \
+                     %t $type \
+                     %M $method \
+                     %m [lindex $method end] \
+                     %j [join $method _] \
+                     %n [list $selfns] \
+                     %w [list $win] \
+                     %s [list $self]]
+
+    if {"" != $compName} {
+        if {[info exists Snit_components($compName)]} {
+            set compCmd $Snit_components($compName)
+        } elseif {[info exists Snit_typecomponents($compName)]} {
+            set compCmd $Snit_typecomponents($compName)
+        } else {
+            error "$type $self delegates method \"$method\" to undefined component \"$compName\""
+        }
+
+        lappend subList %c [list $compCmd]
+    }
+
+    # Note: The cached command will executed faster if it's
+    # already a list.
+    set command {}
+
+    foreach subpattern $pattern {
+        lappend command [string map $subList $subpattern]
+    }
+
+    set commandRec [list 0 $command]
+
+    set Snit_methodCache($method) $commandRec
+
+    return $commandRec
+}
+
+
+# Looks up a method's command.
+#
+# type:		The instance's type
+# selfns:	The instance's private namespace
+# win:          The instance's original name (a Tk widget name, for
+#               snit::widgets.
+# self:         The instance's current name.
+# method:	The name of the method to call.
+# errPrefix:    Prefix for any error method
+proc ::snit::RT.LookupMethodCommand {type selfns win self method errPrefix} {
+    set commandRec [snit::RT.CacheMethodCommand \
+                        $type $selfns $win $self \
+                        $method]
+
+
+    if {[llength $commandRec] == 0} {
+        return -code error \
+            "$errPrefix, \"$self $method\" is not defined"
+    } elseif {[lindex $commandRec 0] == 1} {
+        return -code error \
+            "$errPrefix, wrong number args: should be \"$self\" $method method args"
+    }
+
+    return  [lindex $commandRec 1]
+}
+
+
+# Clears all instance command caches
+proc ::snit::RT.ClearInstanceCaches {selfns} {
+    ::snit83::unset -nocomplain -- ${selfns}::Snit_methodCache
+    ::snit83::unset -nocomplain -- ${selfns}::Snit_cgetCache
+    ::snit83::unset -nocomplain -- ${selfns}::Snit_configureCache
+    ::snit83::unset -nocomplain -- ${selfns}::Snit_validateCache
+}
+
+
+#-----------------------------------------------------------------------
+# Component Installation
+
+# Implements %TYPE%::installhull.  The variables self and selfns
+# must be defined in the caller's context.
+#
+# Installs the named widget as the hull of a
+# widgetadaptor.  Once the widget is hijacked, its new name
+# is assigned to the hull component.
+
+proc ::snit::RT.installhull {type {using "using"} {widgetType ""} args} {
+    variable ${type}::Snit_info
+    variable ${type}::Snit_optionInfo
+    upvar self self
+    upvar selfns selfns
+    upvar ${selfns}::hull hull
+    upvar ${selfns}::options options
+
+    # FIRST, make sure we can do it.
+    if {!$Snit_info(isWidget)} {
+        error "installhull is valid only for snit::widgetadaptors"
+    }
+
+    if {[info exists ${selfns}::Snit_instance]} {
+        error "hull already installed for $type $self"
+    }
+
+    # NEXT, has it been created yet?  If not, create it using
+    # the specified arguments.
+    if {"using" == $using} {
+        # FIRST, create the widget
+        set cmd [linsert $args 0 $widgetType $self]
+        set obj [uplevel 1 $cmd]
+
+        # NEXT, for each option explicitly delegated to the hull
+        # that doesn't appear in the usedOpts list, get the
+        # option database value and apply it--provided that the
+        # real option name and the target option name are different.
+        # (If they are the same, then the option database was
+        # already queried as part of the normal widget creation.)
+        #
+        # Also, we don't need to worry about implicitly delegated
+        # options, as the option and target option names must be
+        # the same.
+        if {[info exists Snit_optionInfo(delegated-hull)]} {
+
+            # FIRST, extract all option names from args
+            set usedOpts {}
+            set ndx [lsearch -glob $args "-*"]
+            foreach {opt val} [lrange $args $ndx end] {
+                lappend usedOpts $opt
+            }
+
+            foreach opt $Snit_optionInfo(delegated-hull) {
+                set target [lindex $Snit_optionInfo(target-$opt) 1]
+
+                if {"$target" == $opt} {
+                    continue
+                }
+
+                set result [lsearch -exact $usedOpts $target]
+
+                if {$result != -1} {
+                    continue
+                }
+
+                set dbval [RT.OptionDbGet $type $self $opt]
+                $obj configure $target $dbval
+            }
+        }
+    } else {
+        set obj $using
+
+        if {![string equal $obj $self]} {
+            error \
+                "hull name mismatch: \"$obj\" != \"$self\""
+        }
+    }
+
+    # NEXT, get the local option defaults.
+    foreach opt $Snit_optionInfo(local) {
+        set dbval [RT.OptionDbGet $type $self $opt]
+
+        if {"" != $dbval} {
+            set options($opt) $dbval
+        }
+    }
+
+
+    # NEXT, do the magic
+    set i 0
+    while 1 {
+        incr i
+        set newName "::hull${i}$self"
+        if {![llength [info commands $newName]]} {
+            break
+        }
+    }
+
+    rename ::$self $newName
+    RT.MakeInstanceCommand $type $selfns $self
+
+    # Note: this relies on RT.ComponentTrace to do the dirty work.
+    set hull $newName
+
+    return
+}
+
+# Implements %TYPE%::install.
+#
+# Creates a widget and installs it as the named component.
+# It expects self and selfns to be defined in the caller's context.
+
+proc ::snit::RT.install {type compName "using" widgetType winPath args} {
+    variable ${type}::Snit_optionInfo
+    variable ${type}::Snit_info
+    upvar self self
+    upvar selfns selfns
+    upvar ${selfns}::$compName comp
+    upvar ${selfns}::hull hull
+
+    # We do the magic option database stuff only if $self is
+    # a widget.
+    if {$Snit_info(isWidget)} {
+        if {"" == $hull} {
+            error "tried to install \"$compName\" before the hull exists"
+        }
+
+        # FIRST, query the option database and save the results
+        # into args.  Insert them before the first option in the
+        # list, in case there are any non-standard parameters.
+        #
+        # Note: there might not be any delegated options; if so,
+        # don't bother.
+
+        if {[info exists Snit_optionInfo(delegated-$compName)]} {
+            set ndx [lsearch -glob $args "-*"]
+
+            foreach opt $Snit_optionInfo(delegated-$compName) {
+                set dbval [RT.OptionDbGet $type $self $opt]
+
+                if {"" != $dbval} {
+                    set target [lindex $Snit_optionInfo(target-$opt) 1]
+                    set args [linsert $args $ndx $target $dbval]
+                }
+            }
+        }
+    }
+
+    # NEXT, create the component and save it.
+    set cmd [concat [list $widgetType $winPath] $args]
+    set comp [uplevel 1 $cmd]
+
+    # NEXT, handle the option database for "delegate option *",
+    # in widgets only.
+    if {$Snit_info(isWidget) && [string equal $Snit_optionInfo(starcomp) $compName]} {
+        # FIRST, get the list of option specs from the widget.
+        # If configure doesn't work, skip it.
+        if {[catch {$comp configure} specs]} {
+            return
+        }
+
+        # NEXT, get the set of explicitly used options from args
+        set usedOpts {}
+        set ndx [lsearch -glob $args "-*"]
+        foreach {opt val} [lrange $args $ndx end] {
+            lappend usedOpts $opt
+        }
+
+        # NEXT, "delegate option *" matches all options defined
+        # by this widget that aren't defined by the widget as a whole,
+        # and that aren't excepted.  Plus, we skip usedOpts.  So build
+        # a list of the options it can't match.
+        set skiplist [concat \
+                          $usedOpts \
+                          $Snit_optionInfo(except) \
+                          $Snit_optionInfo(local) \
+                          $Snit_optionInfo(delegated)]
+
+        # NEXT, loop over all of the component's options, and set
+        # any not in the skip list for which there is an option
+        # database value.
+        foreach spec $specs {
+            # Skip aliases
+            if {[llength $spec] != 5} {
+                continue
+            }
+
+            set opt [lindex $spec 0]
+
+            if {[lsearch -exact $skiplist $opt] != -1} {
+                continue
+            }
+
+            set res [lindex $spec 1]
+            set cls [lindex $spec 2]
+
+            set dbvalue [option get $self $res $cls]
+
+            if {"" != $dbvalue} {
+                $comp configure $opt $dbvalue
+            }
+        }
+    }
+
+    return
+}
+
+
+#-----------------------------------------------------------------------
+# Method/Variable Name Qualification
+
+# Implements %TYPE%::variable.  Requires selfns.
+proc ::snit::RT.variable {varname} {
+    upvar selfns selfns
+
+    if {![string match "::*" $varname]} {
+        uplevel 1 [list upvar 1 ${selfns}::$varname $varname]
+    } else {
+        # varname is fully qualified; let the standard
+        # "variable" command handle it.
+        uplevel 1 [list ::variable $varname]
+    }
+}
+
+# Fully qualifies a typevariable name.
+#
+# This is used to implement the mytypevar command.
+
+proc ::snit::RT.mytypevar {type name} {
+    return ${type}::$name
+}
+
+# Fully qualifies an instance variable name.
+#
+# This is used to implement the myvar command.
+proc ::snit::RT.myvar {name} {
+    upvar selfns selfns
+    return ${selfns}::$name
+}
+
+# Use this like "list" to convert a proc call into a command
+# string to pass to another object (e.g., as a -command).
+# Qualifies the proc name properly.
+#
+# This is used to implement the "myproc" command.
+
+proc ::snit::RT.myproc {type procname args} {
+    set procname "${type}::$procname"
+    return [linsert $args 0 $procname]
+}
+
+# DEPRECATED
+proc ::snit::RT.codename {type name} {
+    return "${type}::$name"
+}
+
+# Use this like "list" to convert a typemethod call into a command
+# string to pass to another object (e.g., as a -command).
+# Inserts the type command at the beginning.
+#
+# This is used to implement the "mytypemethod" command.
+
+proc ::snit::RT.mytypemethod {type args} {
+    return [linsert $args 0 $type]
+}
+
+# Use this like "list" to convert a method call into a command
+# string to pass to another object (e.g., as a -command).
+# Inserts the code at the beginning to call the right object, even if
+# the object's name has changed.  Requires that selfns be defined
+# in the calling context, eg. can only be called in instance
+# code.
+#
+# This is used to implement the "mymethod" command.
+
+proc ::snit::RT.mymethod {args} {
+    upvar selfns selfns
+    return [linsert $args 0 ::snit::RT.CallInstance ${selfns}]
+}
+
+# Calls an instance method for an object given its
+# instance namespace and remaining arguments (the first of which
+# will be the method name.
+#
+# selfns		The instance namespace
+# args			The arguments
+#
+# Uses the selfns to determine $self, and calls the method
+# in the normal way.
+#
+# This is used to implement the "mymethod" command.
+
+proc ::snit::RT.CallInstance {selfns args} {
+    upvar ${selfns}::Snit_instance self
+
+    set retval [catch {uplevel 1 [linsert $args 0 $self]} result]
+
+    if {$retval} {
+        if {$retval == 1} {
+            global errorInfo
+            global errorCode
+            return -code error -errorinfo $errorInfo \
+                -errorcode $errorCode $result
+        } else {
+            return -code $retval $result
+        }
+    }
+
+    return $result
+}
+
+# Looks for the named option in the named variable.  If found,
+# it and its value are removed from the list, and the value
+# is returned.  Otherwise, the default value is returned.
+# If the option is undelegated, it's own default value will be
+# used if none is specified.
+#
+# Implements the "from" command.
+
+proc ::snit::RT.from {type argvName option {defvalue ""}} {
+    variable ${type}::Snit_optionInfo
+    upvar $argvName argv
+
+    set ioption [lsearch -exact $argv $option]
+
+    if {$ioption == -1} {
+        if {"" == $defvalue &&
+            [info exists Snit_optionInfo(default-$option)]} {
+            return $Snit_optionInfo(default-$option)
+        } else {
+            return $defvalue
+        }
+    }
+
+    set ivalue [expr {$ioption + 1}]
+    set value [lindex $argv $ivalue]
+
+    set argv [lreplace $argv $ioption $ivalue]
+
+    return $value
+}
+
+#-----------------------------------------------------------------------
+# Type Destruction
+
+# Implements the standard "destroy" typemethod:
+# Destroys a type completely.
+#
+# type		The snit type
+
+proc ::snit::RT.typemethod.destroy {type} {
+    variable ${type}::Snit_info
+
+    # FIRST, destroy all instances
+    foreach selfns [namespace children $type] {
+        if {![namespace exists $selfns]} {
+            continue
+        }
+        upvar ${selfns}::Snit_instance obj
+
+        if {$Snit_info(isWidget)} {
+            destroy $obj
+        } else {
+            if {[llength [info commands $obj]]} {
+                $obj destroy
+            }
+        }
+    }
+
+    # NEXT, destroy the type's data.
+    namespace delete $type
+
+    # NEXT, get rid of the type command.
+    rename $type ""
+}
+
+
+
+#-----------------------------------------------------------------------
+# Option Handling
+
+# Implements the standard "cget" method
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# option        The name of the option
+
+proc ::snit::RT.method.cget {type selfns win self option} {
+    if {[catch {set ${selfns}::Snit_cgetCache($option)} command]} {
+        set command [snit::RT.CacheCgetCommand $type $selfns $win $self $option]
+
+        if {[llength $command] == 0} {
+            return -code error "unknown option \"$option\""
+        }
+    }
+
+    uplevel 1 $command
+}
+
+# Retrieves and caches the command that implements "cget" for the
+# specified option.
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# option        The name of the option
+
+proc ::snit::RT.CacheCgetCommand {type selfns win self option} {
+    variable ${type}::Snit_optionInfo
+    variable ${selfns}::Snit_cgetCache
+
+    if {[info exists Snit_optionInfo(islocal-$option)]} {
+        # We know the item; it's either local, or explicitly delegated.
+        if {$Snit_optionInfo(islocal-$option)} {
+            # It's a local option.  If it has a cget method defined,
+            # use it; otherwise just return the value.
+
+            if {"" == $Snit_optionInfo(cget-$option)} {
+                set command [list set ${selfns}::options($option)]
+            } else {
+                set command [snit::RT.LookupMethodCommand \
+                                 $type $selfns $win $self \
+                                 $Snit_optionInfo(cget-$option) \
+                                 "can't cget $option"]
+
+                lappend command $option
+            }
+
+            set Snit_cgetCache($option) $command
+            return $command
+        }
+
+        # Explicitly delegated option; get target
+        set comp [lindex $Snit_optionInfo(target-$option) 0]
+        set target [lindex $Snit_optionInfo(target-$option) 1]
+    } elseif {"" != $Snit_optionInfo(starcomp) &&
+              [lsearch -exact $Snit_optionInfo(except) $option] == -1} {
+        # Unknown option, but unknowns are delegated; get target.
+        set comp $Snit_optionInfo(starcomp)
+        set target $option
+    } else {
+        return ""
+    }
+
+    # Get the component's object.
+    set obj [RT.Component $type $selfns $comp]
+
+    set command [list $obj cget $target]
+    set Snit_cgetCache($option) $command
+
+    return $command
+}
+
+# Implements the standard "configurelist" method
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# optionlist    A list of options and their values.
+
+proc ::snit::RT.method.configurelist {type selfns win self optionlist} {
+    variable ${type}::Snit_optionInfo
+
+    foreach {option value} $optionlist {
+        # FIRST, get the configure command, caching it if need be.
+        if {[catch {set ${selfns}::Snit_configureCache($option)} command]} {
+            set command [snit::RT.CacheConfigureCommand \
+                             $type $selfns $win $self $option]
+
+            if {[llength $command] == 0} {
+                return -code error "unknown option \"$option\""
+            }
+        }
+
+        # NEXT, if we have a type-validation object, use it.
+        # TBD: Should test (islocal-$option) here, but islocal
+        # isn't defined for implicitly delegated options.
+        if {[info exists Snit_optionInfo(typeobj-$option)]
+            && "" != $Snit_optionInfo(typeobj-$option)} {
+            if {[catch {
+                $Snit_optionInfo(typeobj-$option) validate $value
+            } result]} {
+                return -code error "invalid $option value: $result"
+            }
+        }
+
+        # NEXT, the caching the configure command also cached the
+        # validate command, if any.  If we have one, run it.
+        set valcommand [set ${selfns}::Snit_validateCache($option)]
+
+        if {[llength $valcommand]} {
+            lappend valcommand $value
+            uplevel 1 $valcommand
+        }
+
+        # NEXT, configure the option with the value.
+        lappend command $value
+        uplevel 1 $command
+    }
+
+    return
+}
+
+# Retrieves and caches the command that stores the named option.
+# Also stores the command that validates the name option if any;
+# If none, the validate command is "", so that the cache is always
+# populated.
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# option        An option name
+
+proc ::snit::RT.CacheConfigureCommand {type selfns win self option} {
+    variable ${type}::Snit_optionInfo
+    variable ${selfns}::Snit_configureCache
+    variable ${selfns}::Snit_validateCache
+
+    if {[info exist Snit_optionInfo(islocal-$option)]} {
+        # We know the item; it's either local, or explicitly delegated.
+
+        if {$Snit_optionInfo(islocal-$option)} {
+            # It's a local option.
+
+            # If it's readonly, it throws an error if we're already
+            # constructed.
+            if {$Snit_optionInfo(readonly-$option)} {
+                if {[set ${selfns}::Snit_iinfo(constructed)]} {
+                    error "option $option can only be set at instance creation"
+                }
+            }
+
+            # If it has a validate method, cache that for later.
+            if {"" != $Snit_optionInfo(validate-$option)} {
+                set command [snit::RT.LookupMethodCommand \
+                                 $type $selfns $win $self \
+                                 $Snit_optionInfo(validate-$option) \
+                                 "can't validate $option"]
+
+                lappend command $option
+                set Snit_validateCache($option) $command
+            } else {
+                set Snit_validateCache($option) ""
+            }
+
+            # If it has a configure method defined,
+            # cache it; otherwise, just set the value.
+
+            if {"" == $Snit_optionInfo(configure-$option)} {
+                set command [list set ${selfns}::options($option)]
+            } else {
+                set command [snit::RT.LookupMethodCommand \
+                                 $type $selfns $win $self \
+                                 $Snit_optionInfo(configure-$option) \
+                                 "can't configure $option"]
+
+                lappend command $option
+            }
+
+            set Snit_configureCache($option) $command
+            return $command
+        }
+
+        # Delegated option: get target.
+        set comp [lindex $Snit_optionInfo(target-$option) 0]
+        set target [lindex $Snit_optionInfo(target-$option) 1]
+    } elseif {$Snit_optionInfo(starcomp) != "" &&
+              [lsearch -exact $Snit_optionInfo(except) $option] == -1} {
+        # Unknown option, but unknowns are delegated.
+        set comp $Snit_optionInfo(starcomp)
+        set target $option
+    } else {
+        return ""
+    }
+
+    # There is no validate command in this case; save an empty string.
+    set Snit_validateCache($option) ""
+
+    # Get the component's object
+    set obj [RT.Component $type $selfns $comp]
+
+    set command [list $obj configure $target]
+    set Snit_configureCache($option) $command
+
+    return $command
+}
+
+# Implements the standard "configure" method
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# args          A list of options and their values, possibly empty.
+
+proc ::snit::RT.method.configure {type selfns win self args} {
+    # If two or more arguments, set values as usual.
+    if {[llength $args] >= 2} {
+        ::snit::RT.method.configurelist $type $selfns $win $self $args
+        return
+    }
+
+    # If zero arguments, acquire data for each known option
+    # and return the list
+    if {[llength $args] == 0} {
+        set result {}
+        foreach opt [RT.method.info.options $type $selfns $win $self] {
+            # Refactor this, so that we don't need to call via $self.
+            lappend result [RT.GetOptionDbSpec \
+                                $type $selfns $win $self $opt]
+        }
+
+        return $result
+    }
+
+    # They want it for just one.
+    set opt [lindex $args 0]
+
+    return [RT.GetOptionDbSpec $type $selfns $win $self $opt]
+}
+
+
+# Retrieves the option database spec for a single option.
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# option        The name of an option
+#
+# TBD: This is a bad name.  What it's returning is the
+# result of the configure query.
+
+proc ::snit::RT.GetOptionDbSpec {type selfns win self opt} {
+    variable ${type}::Snit_optionInfo
+
+    upvar ${selfns}::Snit_components Snit_components
+    upvar ${selfns}::options         options
+
+    if {[info exists options($opt)]} {
+        # This is a locally-defined option.  Just build the
+        # list and return it.
+        set res $Snit_optionInfo(resource-$opt)
+        set cls $Snit_optionInfo(class-$opt)
+        set def $Snit_optionInfo(default-$opt)
+
+        return [list $opt $res $cls $def \
+                    [RT.method.cget $type $selfns $win $self $opt]]
+    } elseif {[info exists Snit_optionInfo(target-$opt)]} {
+        # This is an explicitly delegated option.  The only
+        # thing we don't have is the default.
+        set res $Snit_optionInfo(resource-$opt)
+        set cls $Snit_optionInfo(class-$opt)
+
+        # Get the default
+        set logicalName [lindex $Snit_optionInfo(target-$opt) 0]
+        set comp $Snit_components($logicalName)
+        set target [lindex $Snit_optionInfo(target-$opt) 1]
+
+        if {[catch {$comp configure $target} result]} {
+            set defValue {}
+        } else {
+            set defValue [lindex $result 3]
+        }
+
+        return [list $opt $res $cls $defValue [$self cget $opt]]
+    } elseif {"" != $Snit_optionInfo(starcomp) &&
+              [lsearch -exact $Snit_optionInfo(except) $opt] == -1} {
+        set logicalName $Snit_optionInfo(starcomp)
+        set target $opt
+        set comp $Snit_components($logicalName)
+
+        if {[catch {set value [$comp cget $target]} result]} {
+            error "unknown option \"$opt\""
+        }
+
+        if {![catch {$comp configure $target} result]} {
+            # Replace the delegated option name with the local name.
+            return [::snit::Expand $result $target $opt]
+        }
+
+        # configure didn't work; return simple form.
+        return [list $opt "" "" "" $value]
+    } else {
+        error "unknown option \"$opt\""
+    }
+}
+
+#-----------------------------------------------------------------------
+# Type Introspection
+
+# Implements the standard "info" typemethod.
+#
+# type		The snit type
+# command       The info subcommand
+# args          All other arguments.
+
+proc ::snit::RT.typemethod.info {type command args} {
+    global errorInfo
+    global errorCode
+
+    switch -exact $command {
+	args        -
+	body        -
+	default     -
+        typevars    -
+        typemethods -
+        instances {
+            # TBD: it should be possible to delete this error
+            # handling.
+            set errflag [catch {
+                uplevel 1 [linsert $args 0 \
+			       ::snit::RT.typemethod.info.$command $type]
+            } result]
+
+            if {$errflag} {
+                return -code error -errorinfo $errorInfo \
+                    -errorcode $errorCode $result
+            } else {
+                return $result
+            }
+        }
+        default {
+            error "\"$type info $command\" is not defined"
+        }
+    }
+}
+
+
+# Returns a list of the type's typevariables whose names match a
+# pattern, excluding Snit internal variables.
+#
+# type		A Snit type
+# pattern       Optional.  The glob pattern to match.  Defaults
+#               to *.
+
+proc ::snit::RT.typemethod.info.typevars {type {pattern *}} {
+    set result {}
+    foreach name [info vars "${type}::$pattern"] {
+        set tail [namespace tail $name]
+        if {![string match "Snit_*" $tail]} {
+            lappend result $name
+        }
+    }
+
+    return $result
+}
+
+# Returns a list of the type's methods whose names match a
+# pattern.  If "delegate typemethod *" is used, the list may
+# not be complete.
+#
+# type		A Snit type
+# pattern       Optional.  The glob pattern to match.  Defaults
+#               to *.
+
+proc ::snit::RT.typemethod.info.typemethods {type {pattern *}} {
+    variable ${type}::Snit_typemethodInfo
+    variable ${type}::Snit_typemethodCache
+
+    # FIRST, get the explicit names, skipping prefixes.
+    set result {}
+
+    foreach name [array names Snit_typemethodInfo $pattern] {
+        if {[lindex $Snit_typemethodInfo($name) 0] != 1} {
+            lappend result $name
+        }
+    }
+
+    # NEXT, add any from the cache that aren't explicit.
+    if {[info exists Snit_typemethodInfo(*)]} {
+        # First, remove "*" from the list.
+        set ndx [lsearch -exact $result "*"]
+        if {$ndx != -1} {
+            set result [lreplace $result $ndx $ndx]
+        }
+
+        foreach name [array names Snit_typemethodCache $pattern] {
+            if {[lsearch -exact $result $name] == -1} {
+                lappend result $name
+            }
+        }
+    }
+
+    return $result
+}
+
+# $type info args
+#
+# Returns a method's list of arguments. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.typemethod.info.args {type method} {
+    upvar ${type}::Snit_typemethodInfo  Snit_typemethodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_typemethodInfo
+
+    if {![info exists Snit_typemethodInfo($method)]} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    foreach {flag cmd component} $Snit_typemethodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated typemethod \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [lrange [::info args $theproc] 1 end]
+}
+
+# $type info body
+#
+# Returns a method's body. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.typemethod.info.body {type method} {
+    upvar ${type}::Snit_typemethodInfo  Snit_typemethodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_typemethodInfo
+
+    if {![info exists Snit_typemethodInfo($method)]} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    foreach {flag cmd component} $Snit_typemethodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated typemethod \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [RT.body [::info body $theproc]]
+}
+
+# $type info default
+#
+# Returns a method's list of arguments. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.typemethod.info.default {type method aname dvar} {
+    upvar 1 $dvar def
+    upvar ${type}::Snit_typemethodInfo  Snit_typemethodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_methodInfo
+
+    if {![info exists Snit_typemethodInfo($method)]} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    foreach {flag cmd component} $Snit_typemethodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated typemethod \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [::info default $theproc $aname def]
+}
+
+# Returns a list of the type's instances whose names match
+# a pattern.
+#
+# type		A Snit type
+# pattern       Optional.  The glob pattern to match
+#               Defaults to *
+#
+# REQUIRE: type is fully qualified.
+
+proc ::snit::RT.typemethod.info.instances {type {pattern *}} {
+    set result {}
+
+    foreach selfns [namespace children $type] {
+        upvar ${selfns}::Snit_instance instance
+
+        if {[string match $pattern $instance]} {
+            lappend result $instance
+        }
+    }
+
+    return $result
+}
+
+#-----------------------------------------------------------------------
+# Instance Introspection
+
+# Implements the standard "info" method.
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# command       The info subcommand
+# args          All other arguments.
+
+proc ::snit::RT.method.info {type selfns win self command args} {
+    switch -exact $command {
+	args        -
+	body        -
+	default     -
+        type        -
+        vars        -
+        options     -
+        methods     -
+        typevars    -
+        typemethods {
+            set errflag [catch {
+                uplevel 1 [linsert $args 0 ::snit::RT.method.info.$command \
+			       $type $selfns $win $self]
+            } result]
+
+            if {$errflag} {
+                global errorInfo
+                return -code error -errorinfo $errorInfo $result
+            } else {
+                return $result
+            }
+        }
+        default {
+            # error "\"$self info $command\" is not defined"
+            return -code error "\"$self info $command\" is not defined"
+        }
+    }
+}
+
+# $self info type
+#
+# Returns the instance's type
+proc ::snit::RT.method.info.type {type selfns win self} {
+    return $type
+}
+
+# $self info typevars
+#
+# Returns the instance's type's typevariables
+proc ::snit::RT.method.info.typevars {type selfns win self {pattern *}} {
+    return [RT.typemethod.info.typevars $type $pattern]
+}
+
+# $self info typemethods
+#
+# Returns the instance's type's typemethods
+proc ::snit::RT.method.info.typemethods {type selfns win self {pattern *}} {
+    return [RT.typemethod.info.typemethods $type $pattern]
+}
+
+# Returns a list of the instance's methods whose names match a
+# pattern.  If "delegate method *" is used, the list may
+# not be complete.
+#
+# type		A Snit type
+# selfns        The instance namespace
+# win		The original instance name
+# self          The current instance name
+# pattern       Optional.  The glob pattern to match.  Defaults
+#               to *.
+
+proc ::snit::RT.method.info.methods {type selfns win self {pattern *}} {
+    variable ${type}::Snit_methodInfo
+    variable ${selfns}::Snit_methodCache
+
+    # FIRST, get the explicit names, skipping prefixes.
+    set result {}
+
+    foreach name [array names Snit_methodInfo $pattern] {
+        if {[lindex $Snit_methodInfo($name) 0] != 1} {
+            lappend result $name
+        }
+    }
+
+    # NEXT, add any from the cache that aren't explicit.
+    if {[info exists Snit_methodInfo(*)]} {
+        # First, remove "*" from the list.
+        set ndx [lsearch -exact $result "*"]
+        if {$ndx != -1} {
+            set result [lreplace $result $ndx $ndx]
+        }
+
+        foreach name [array names Snit_methodCache $pattern] {
+            if {[lsearch -exact $result $name] == -1} {
+                lappend result $name
+            }
+        }
+    }
+
+    return $result
+}
+
+# $self info args
+#
+# Returns a method's list of arguments. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.method.info.args {type selfns win self method} {
+
+    upvar ${type}::Snit_methodInfo  Snit_methodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_methodInfo
+
+    if {![info exists Snit_methodInfo($method)]} {
+	return -code error "Unknown method \"$method\""
+    }
+    foreach {flag cmd component} $Snit_methodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown method \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated method \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type %n $selfns %w $win %s $self]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [lrange [::info args $theproc] 4 end]
+}
+
+# $self info body
+#
+# Returns a method's body. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.method.info.body {type selfns win self method} {
+
+    upvar ${type}::Snit_methodInfo  Snit_methodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_methodInfo
+
+    if {![info exists Snit_methodInfo($method)]} {
+	return -code error "Unknown method \"$method\""
+    }
+    foreach {flag cmd component} $Snit_methodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown method \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated method \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type %n $selfns %w $win %s $self]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [RT.body [::info body $theproc]]
+}
+
+# $self info default
+#
+# Returns a method's list of arguments. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.method.info.default {type selfns win self method aname dvar} {
+    upvar 1 $dvar def
+    upvar ${type}::Snit_methodInfo  Snit_methodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    if {![info exists Snit_methodInfo($method)]} {
+	return -code error "Unknown method \"$method\""
+    }
+    foreach {flag cmd component} $Snit_methodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown method \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated method \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type %n $selfns %w $win %s $self]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [::info default $theproc $aname def]
+}
+
+# $self info vars
+#
+# Returns the instance's instance variables
+proc ::snit::RT.method.info.vars {type selfns win self {pattern *}} {
+    set result {}
+    foreach name [info vars "${selfns}::$pattern"] {
+        set tail [namespace tail $name]
+        if {![string match "Snit_*" $tail]} {
+            lappend result $name
+        }
+    }
+
+    return $result
+}
+
+# $self info options
+#
+# Returns a list of the names of the instance's options
+proc ::snit::RT.method.info.options {type selfns win self {pattern *}} {
+    variable ${type}::Snit_optionInfo
+
+    # First, get the local and explicitly delegated options
+    set result [concat $Snit_optionInfo(local) $Snit_optionInfo(delegated)]
+
+    # If "configure" works as for Tk widgets, add the resulting
+    # options to the list.  Skip excepted options
+    if {"" != $Snit_optionInfo(starcomp)} {
+        upvar ${selfns}::Snit_components Snit_components
+        set logicalName $Snit_optionInfo(starcomp)
+        set comp $Snit_components($logicalName)
+
+        if {![catch {$comp configure} records]} {
+            foreach record $records {
+                set opt [lindex $record 0]
+                if {[lsearch -exact $result $opt] == -1 &&
+                    [lsearch -exact $Snit_optionInfo(except) $opt] == -1} {
+                    lappend result $opt
+                }
+            }
+        }
+    }
+
+    # Next, apply the pattern
+    set names {}
+
+    foreach name $result {
+        if {[string match $pattern $name]} {
+            lappend names $name
+        }
+    }
+
+    return $names
+}
+
+proc ::snit::RT.body {body} {
+    regsub -all ".*# END snit method prolog\n" $body {} body
+    return $body
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/main2.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/main2.tcl
new file mode 100644
index 00000000..d8d4a6b4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/main2.tcl
@@ -0,0 +1,3888 @@
+#-----------------------------------------------------------------------
+# TITLE:
+#	main2.tcl
+#
+# AUTHOR:
+#	Will Duquette
+#
+# DESCRIPTION:
+#       Snit's Not Incr Tcl, a simple object system in Pure Tcl.
+#
+#       Snit 2.x Compiler and Run-Time Library
+#
+#       Copyright (C) 2003-2006 by William H. Duquette
+#       This code is licensed as described in license.txt.
+#
+#-----------------------------------------------------------------------
+
+#-----------------------------------------------------------------------
+# Namespace
+
+namespace eval ::snit:: {
+    namespace export \
+        compile type widget widgetadaptor typemethod method macro
+}
+
+#-----------------------------------------------------------------------
+# Some Snit variables
+
+namespace eval ::snit:: {
+    variable reservedArgs {type selfns win self}
+
+    # Widget classes which can be hulls (must have -class)
+    variable hulltypes {
+	toplevel tk::toplevel
+	frame tk::frame ttk::frame
+	labelframe tk::labelframe ttk::labelframe
+    }
+}
+
+#-----------------------------------------------------------------------
+# Snit Type Implementation template
+
+namespace eval ::snit:: {
+    # Template type definition: All internal and user-visible Snit
+    # implementation code.
+    #
+    # The following placeholders will automatically be replaced with
+    # the client's code, in two passes:
+    #
+    # First pass:
+    # %COMPILEDDEFS%  The compiled type definition.
+    #
+    # Second pass:
+    # %TYPE%          The fully qualified type name.
+    # %IVARDECS%      Instance variable declarations
+    # %TVARDECS%      Type variable declarations
+    # %TCONSTBODY%    Type constructor body
+    # %INSTANCEVARS%  The compiled instance variable initialization code.
+    # %TYPEVARS%      The compiled type variable initialization code.
+
+    # This is the overall type template.
+    variable typeTemplate
+
+    # This is the normal type proc
+    variable nominalTypeProc
+
+    # This is the "-hastypemethods no" type proc
+    variable simpleTypeProc
+}
+
+set ::snit::typeTemplate {
+
+    #-------------------------------------------------------------------
+    # The type's namespace definition and the user's type variables
+
+    namespace eval %TYPE% {%TYPEVARS%
+    }
+
+    #----------------------------------------------------------------
+    # Commands for use in methods, typemethods, etc.
+    #
+    # These are implemented as aliases into the Snit runtime library.
+
+    interp alias {} %TYPE%::installhull  {} ::snit::RT.installhull %TYPE%
+    interp alias {} %TYPE%::install      {} ::snit::RT.install %TYPE%
+    interp alias {} %TYPE%::typevariable {} ::variable
+    interp alias {} %TYPE%::variable     {} ::snit::RT.variable
+    interp alias {} %TYPE%::mytypevar    {} ::snit::RT.mytypevar %TYPE%
+    interp alias {} %TYPE%::typevarname  {} ::snit::RT.mytypevar %TYPE%
+    interp alias {} %TYPE%::myvar        {} ::snit::RT.myvar
+    interp alias {} %TYPE%::varname      {} ::snit::RT.myvar
+    interp alias {} %TYPE%::codename     {} ::snit::RT.codename %TYPE%
+    interp alias {} %TYPE%::myproc       {} ::snit::RT.myproc %TYPE%
+    interp alias {} %TYPE%::mymethod     {} ::snit::RT.mymethod 
+    interp alias {} %TYPE%::mytypemethod {} ::snit::RT.mytypemethod %TYPE%
+    interp alias {} %TYPE%::from         {} ::snit::RT.from %TYPE%
+
+    #-------------------------------------------------------------------
+    # Snit's internal variables
+
+    namespace eval %TYPE% {
+        # Array: General Snit Info
+        #
+        # ns:                The type's namespace
+        # hasinstances:      T or F, from pragma -hasinstances.
+        # simpledispatch:    T or F, from pragma -hasinstances.
+        # canreplace:        T or F, from pragma -canreplace.
+        # counter:           Count of instances created so far.
+        # widgetclass:       Set by widgetclass statement.
+        # hulltype:          Hull type (frame or toplevel) for widgets only.
+        # exceptmethods:     Methods explicitly not delegated to *
+        # excepttypemethods: Methods explicitly not delegated to *
+        # tvardecs:          Type variable declarations--for dynamic methods
+        # ivardecs:          Instance variable declarations--for dyn. methods
+        typevariable Snit_info
+        set Snit_info(ns)      %TYPE%::
+        set Snit_info(hasinstances) 1
+        set Snit_info(simpledispatch) 0
+        set Snit_info(canreplace) 0
+        set Snit_info(counter) 0
+        set Snit_info(widgetclass) {}
+        set Snit_info(hulltype) frame
+        set Snit_info(exceptmethods) {}
+        set Snit_info(excepttypemethods) {}
+        set Snit_info(tvardecs) {%TVARDECS%}
+        set Snit_info(ivardecs) {%IVARDECS%}
+
+        # Array: Public methods of this type.
+        # The index is the method name, or "*".
+        # The value is [list $pattern $componentName], where
+        # $componentName is "" for normal methods.
+        typevariable Snit_typemethodInfo
+        array unset Snit_typemethodInfo
+
+        # Array: Public methods of instances of this type.
+        # The index is the method name, or "*".
+        # The value is [list $pattern $componentName], where
+        # $componentName is "" for normal methods.
+        typevariable Snit_methodInfo
+        array unset Snit_methodInfo
+
+        # Array: option information.  See dictionary.txt.
+        typevariable Snit_optionInfo
+        array unset Snit_optionInfo
+        set Snit_optionInfo(local)     {}
+        set Snit_optionInfo(delegated) {}
+        set Snit_optionInfo(starcomp)  {}
+        set Snit_optionInfo(except)    {}
+    }
+
+    #----------------------------------------------------------------
+    # Compiled Procs
+    #
+    # These commands are created or replaced during compilation:
+
+
+    # Snit_instanceVars selfns
+    #
+    # Initializes the instance variables, if any.  Called during
+    # instance creation.
+    
+    proc %TYPE%::Snit_instanceVars {selfns} {
+        %INSTANCEVARS%
+    }
+
+    # Type Constructor
+    proc %TYPE%::Snit_typeconstructor {type} {
+        %TVARDECS%
+        namespace path [namespace parent $type]
+        %TCONSTBODY%
+    }
+
+    #----------------------------------------------------------------
+    # Default Procs
+    #
+    # These commands might be replaced during compilation:
+
+    # Snit_destructor type selfns win self
+    #
+    # Default destructor for the type.  By default, it does
+    # nothing.  It's replaced by any user destructor.
+    # For types, it's called by method destroy; for widgettypes,
+    # it's called by a destroy event handler.
+
+    proc %TYPE%::Snit_destructor {type selfns win self} { }
+
+    #----------------------------------------------------------
+    # Compiled Definitions
+
+    %COMPILEDDEFS%
+
+    #----------------------------------------------------------
+    # Finally, call the Type Constructor
+
+    %TYPE%::Snit_typeconstructor %TYPE%
+}
+
+#-----------------------------------------------------------------------
+# Type procs
+#
+# These procs expect the fully-qualified type name to be 
+# substituted in for %TYPE%.
+
+# This is the nominal type proc.  It supports typemethods and
+# delegated typemethods.
+set ::snit::nominalTypeProc {
+    # WHD: Code for creating the type ensemble
+    namespace eval %TYPE% {
+        namespace ensemble create \
+            -unknown [list ::snit::RT.UnknownTypemethod %TYPE% ""] \
+            -prefixes 0
+    }
+}
+
+# This is the simplified type proc for when there are no typemethods
+# except create.  In this case, it doesn't take a method argument;
+# the method is always "create".
+set ::snit::simpleTypeProc {
+    # Type dispatcher function.  Note: This function lives
+    # in the parent of the %TYPE% namespace!  All accesses to 
+    # %TYPE% variables and methods must be qualified!
+    proc %TYPE% {args} {
+        ::variable %TYPE%::Snit_info
+
+        # FIRST, if the are no args, the single arg is %AUTO%
+        if {[llength $args] == 0} {
+            if {$Snit_info(isWidget)} {
+                error "wrong \# args: should be \"%TYPE% name args\""
+            }
+            
+            lappend args %AUTO%
+        }
+
+        # NEXT, we're going to call the create method.
+        # Pass along the return code unchanged.
+        if {$Snit_info(isWidget)} {
+            set command [list ::snit::RT.widget.typemethod.create %TYPE%]
+        } else {
+            set command [list ::snit::RT.type.typemethod.create %TYPE%]
+        }
+
+        set retval [catch {uplevel 1 $command $args} result]
+
+        if {$retval} {
+            if {$retval == 1} {
+                global errorInfo
+                global errorCode
+                return -code error -errorinfo $errorInfo \
+                    -errorcode $errorCode $result
+            } else {
+                return -code $retval $result
+            }
+        }
+
+        return $result
+    }
+}
+
+#=======================================================================
+# Snit Type Definition
+#
+# These are the procs used to define Snit types, widgets, and 
+# widgetadaptors.
+
+
+#-----------------------------------------------------------------------
+# Snit Compilation Variables
+#
+# The following variables are used while Snit is compiling a type,
+# and are disposed afterwards.
+
+namespace eval ::snit:: {
+    # The compiler variable contains the name of the slave interpreter
+    # used to compile type definitions.
+    variable compiler ""
+
+    # The compile array accumulates information about the type or
+    # widgettype being compiled.  It is cleared before and after each
+    # compilation.  It has these indices:
+    #
+    # type:                  The name of the type being compiled, for use
+    #                        in compilation procs.
+    # defs:                  Compiled definitions, both standard and client.
+    # which:                 type, widget, widgetadaptor
+    # instancevars:          Instance variable definitions and initializations.
+    # ivprocdec:             Instance variable proc declarations.
+    # tvprocdec:             Type variable proc declarations.
+    # typeconstructor:       Type constructor body.
+    # widgetclass:           The widgetclass, for snit::widgets, only
+    # hasoptions:            False, initially; set to true when first
+    #                        option is defined.
+    # localoptions:          Names of local options.
+    # delegatedoptions:      Names of delegated options.
+    # localmethods:          Names of locally defined methods.
+    # delegatesmethods:      no if no delegated methods, yes otherwise.
+    # hashierarchic       :  no if no hierarchic methods, yes otherwise.
+    # components:            Names of defined components.
+    # typecomponents:        Names of defined typecomponents.
+    # typevars:              Typevariable definitions and initializations.
+    # varnames:              Names of instance variables
+    # typevarnames           Names of type variables
+    # hasconstructor         False, initially; true when constructor is
+    #                        defined.
+    # resource-$opt          The option's resource name
+    # class-$opt             The option's class
+    # -default-$opt          The option's default value
+    # -validatemethod-$opt   The option's validate method
+    # -configuremethod-$opt  The option's configure method
+    # -cgetmethod-$opt       The option's cget method.
+    # -hastypeinfo           The -hastypeinfo pragma
+    # -hastypedestroy        The -hastypedestroy pragma
+    # -hastypemethods        The -hastypemethods pragma
+    # -hasinfo               The -hasinfo pragma
+    # -hasinstances          The -hasinstances pragma
+    # -simpledispatch        The -simpledispatch pragma WHD: OBSOLETE
+    # -canreplace            The -canreplace pragma
+    variable compile
+
+    # This variable accumulates method dispatch information; it has
+    # the same structure as the %TYPE%::Snit_methodInfo array, and is
+    # used to initialize it.
+    variable methodInfo
+
+    # This variable accumulates typemethod dispatch information; it has
+    # the same structure as the %TYPE%::Snit_typemethodInfo array, and is
+    # used to initialize it.
+    variable typemethodInfo
+
+    # The following variable lists the reserved type definition statement
+    # names, e.g., the names you can't use as macros.  It's built at
+    # compiler definition time using "info commands".
+    variable reservedwords {}
+}
+
+#-----------------------------------------------------------------------
+# type compilation commands
+#
+# The type and widgettype commands use a slave interpreter to compile
+# the type definition.  These are the procs
+# that are aliased into it.
+
+# Initialize the compiler
+proc ::snit::Comp.Init {} {
+    variable compiler
+    variable reservedwords
+
+    if {$compiler eq ""} {
+        # Create the compiler's interpreter
+        set compiler [interp create]
+
+        # Initialize the interpreter
+	$compiler eval {
+	    catch {close stdout}
+	    catch {close stderr}
+	    catch {close stdin}
+
+            # Load package information
+            # TBD: see if this can be moved outside.
+	    # @mdgen NODEP: ::snit::__does_not_exist__
+            catch {package require ::snit::__does_not_exist__}
+
+            # Protect some Tcl commands our type definitions
+            # will shadow.
+            rename proc _proc
+            rename variable _variable
+        }
+
+        # Define compilation aliases.
+        $compiler alias pragma          ::snit::Comp.statement.pragma
+        $compiler alias widgetclass     ::snit::Comp.statement.widgetclass
+        $compiler alias hulltype        ::snit::Comp.statement.hulltype
+        $compiler alias constructor     ::snit::Comp.statement.constructor
+        $compiler alias destructor      ::snit::Comp.statement.destructor
+        $compiler alias option          ::snit::Comp.statement.option
+        $compiler alias oncget          ::snit::Comp.statement.oncget
+        $compiler alias onconfigure     ::snit::Comp.statement.onconfigure
+        $compiler alias method          ::snit::Comp.statement.method
+        $compiler alias typemethod      ::snit::Comp.statement.typemethod
+        $compiler alias typeconstructor ::snit::Comp.statement.typeconstructor
+        $compiler alias proc            ::snit::Comp.statement.proc
+        $compiler alias typevariable    ::snit::Comp.statement.typevariable
+        $compiler alias variable        ::snit::Comp.statement.variable
+        $compiler alias typecomponent   ::snit::Comp.statement.typecomponent
+        $compiler alias component       ::snit::Comp.statement.component
+        $compiler alias delegate        ::snit::Comp.statement.delegate
+        $compiler alias expose          ::snit::Comp.statement.expose
+
+        # Get the list of reserved words
+        set reservedwords [$compiler eval {info commands}]
+    }
+}
+
+# Compile a type definition, and return the results as a list of two
+# items: the fully-qualified type name, and a script that will define
+# the type when executed.
+#
+# which		type, widget, or widgetadaptor
+# type          the type name
+# body          the type definition
+proc ::snit::Comp.Compile {which type body} {
+    variable typeTemplate
+    variable nominalTypeProc
+    variable simpleTypeProc
+    variable compile
+    variable compiler
+    variable methodInfo
+    variable typemethodInfo
+
+    # FIRST, qualify the name.
+    if {![string match "::*" $type]} {
+        # Get caller's namespace; 
+        # append :: if not global namespace.
+        set ns [uplevel 2 [list namespace current]]
+        if {"::" != $ns} {
+            append ns "::"
+        }
+        
+        set type "$ns$type"
+    }
+
+    # NEXT, create and initialize the compiler, if needed.
+    Comp.Init
+
+    # NEXT, initialize the class data
+    array unset methodInfo
+    array unset typemethodInfo
+
+    array unset compile
+    set compile(type) $type
+    set compile(defs) {}
+    set compile(which) $which
+    set compile(hasoptions) no
+    set compile(localoptions) {}
+    set compile(instancevars) {}
+    set compile(typevars) {}
+    set compile(delegatedoptions) {}
+    set compile(ivprocdec) {}
+    set compile(tvprocdec) {}
+    set compile(typeconstructor) {}
+    set compile(widgetclass) {}
+    set compile(hulltype) {}
+    set compile(localmethods) {}
+    set compile(delegatesmethods) no
+    set compile(hashierarchic) no
+    set compile(components) {}
+    set compile(typecomponents) {}
+    set compile(varnames) {}
+    set compile(typevarnames) {}
+    set compile(hasconstructor) no
+    set compile(-hastypedestroy) yes
+    set compile(-hastypeinfo) yes
+    set compile(-hastypemethods) yes
+    set compile(-hasinfo) yes
+    set compile(-hasinstances) yes
+    set compile(-canreplace) no
+
+    set isWidget [string match widget* $which]
+    set isWidgetAdaptor [string match widgetadaptor $which]
+
+    # NEXT, Evaluate the type's definition in the class interpreter.
+    $compiler eval $body
+
+    # NEXT, Add the standard definitions
+    append compile(defs) \
+        "\nset %TYPE%::Snit_info(isWidget) $isWidget\n"
+
+    append compile(defs) \
+        "\nset %TYPE%::Snit_info(isWidgetAdaptor) $isWidgetAdaptor\n"
+
+    # Indicate whether the type can create instances that replace
+    # existing commands.
+    append compile(defs) "\nset %TYPE%::Snit_info(canreplace) $compile(-canreplace)\n"
+
+
+    # Check pragmas for conflict.
+    
+    if {!$compile(-hastypemethods) && !$compile(-hasinstances)} {
+        error "$which $type has neither typemethods nor instances"
+    }
+
+    # If there are typemethods, define the standard typemethods and
+    # the nominal type proc.  Otherwise define the simple type proc.
+    if {$compile(-hastypemethods)} {
+        # Add the info typemethod unless the pragma forbids it.
+        if {$compile(-hastypeinfo)} {
+            Comp.statement.delegate typemethod info \
+                using {::snit::RT.typemethod.info %t}
+        }
+
+        # Add the destroy typemethod unless the pragma forbids it.
+        if {$compile(-hastypedestroy)} {
+            Comp.statement.delegate typemethod destroy \
+                using {::snit::RT.typemethod.destroy %t}
+        }
+
+        # Add the nominal type proc.
+        append compile(defs) $nominalTypeProc
+    } else {
+        # Add the simple type proc.
+        append compile(defs) $simpleTypeProc
+    }
+
+    # Add standard methods/typemethods that only make sense if the
+    # type has instances.
+    if {$compile(-hasinstances)} {
+        # Add the info method unless the pragma forbids it.
+        if {$compile(-hasinfo)} {
+            Comp.statement.delegate method info \
+                using {::snit::RT.method.info %t %n %w %s}
+        }
+        
+        # Add the option handling stuff if there are any options.
+        if {$compile(hasoptions)} {
+            Comp.statement.variable options
+
+            Comp.statement.delegate method cget \
+                using {::snit::RT.method.cget %t %n %w %s}
+            Comp.statement.delegate method configurelist \
+                using {::snit::RT.method.configurelist %t %n %w %s}
+            Comp.statement.delegate method configure \
+                using {::snit::RT.method.configure %t %n %w %s}
+        }
+
+        # Add a default constructor, if they haven't already defined one.
+        # If there are options, it will configure args; otherwise it
+        # will do nothing.
+        if {!$compile(hasconstructor)} {
+            if {$compile(hasoptions)} {
+                Comp.statement.constructor {args} {
+                    $self configurelist $args
+                }
+            } else {
+                Comp.statement.constructor {} {}
+            }
+        }
+        
+        if {!$isWidget} {
+            Comp.statement.delegate method destroy \
+                using {::snit::RT.method.destroy %t %n %w %s}
+
+            Comp.statement.delegate typemethod create \
+                using {::snit::RT.type.typemethod.create %t}
+        } else {
+            Comp.statement.delegate typemethod create \
+                using {::snit::RT.widget.typemethod.create %t}
+        }
+
+        # Save the method info. 
+        append compile(defs) \
+            "\narray set %TYPE%::Snit_methodInfo [list [array get methodInfo]]\n"
+    } else {
+        append compile(defs) "\nset %TYPE%::Snit_info(hasinstances) 0\n"
+    }
+
+    # NEXT, compiling the type definition built up a set of information
+    # about the type's locally defined options; add this information to
+    # the compiled definition.
+    Comp.SaveOptionInfo
+
+    # NEXT, compiling the type definition built up a set of information
+    # about the typemethods; save the typemethod info.
+    append compile(defs) \
+        "\narray set %TYPE%::Snit_typemethodInfo [list [array get typemethodInfo]]\n"
+
+    # NEXT, if this is a widget define the hull component if it isn't
+    # already defined.
+    if {$isWidget} {
+        Comp.DefineComponent hull
+    }
+
+    # NEXT, substitute the compiled definition into the type template
+    # to get the type definition script.
+    set defscript [Expand $typeTemplate \
+                       %COMPILEDDEFS% $compile(defs)]
+
+    # NEXT, substitute the defined macros into the type definition script.
+    # This is done as a separate step so that the compile(defs) can 
+    # contain the macros defined below.
+
+    set defscript [Expand $defscript \
+                       %TYPE%         $type \
+                       %IVARDECS%     $compile(ivprocdec) \
+                       %TVARDECS%     $compile(tvprocdec) \
+                       %TCONSTBODY%   $compile(typeconstructor) \
+                       %INSTANCEVARS% $compile(instancevars) \
+                       %TYPEVARS%     $compile(typevars) \
+		       ]
+
+    array unset compile
+
+    return [list $type $defscript]
+}
+
+# Information about locally-defined options is accumulated during
+# compilation, but not added to the compiled definition--the option
+# statement can appear multiple times, so it's easier this way.
+# This proc fills in Snit_optionInfo with the accumulated information.
+#
+# It also computes the option's resource and class names if needed.
+#
+# Note that the information for delegated options was put in 
+# Snit_optionInfo during compilation.
+
+proc ::snit::Comp.SaveOptionInfo {} {
+    variable compile
+
+    foreach option $compile(localoptions) {
+        if {$compile(resource-$option) eq ""} {
+            set compile(resource-$option) [string range $option 1 end]
+        }
+
+        if {$compile(class-$option) eq ""} {
+            set compile(class-$option) [Capitalize $compile(resource-$option)]
+        }
+
+        # NOTE: Don't verify that the validate, configure, and cget 
+        # values name real methods; the methods might be defined outside 
+        # the typedefinition using snit::method.
+        
+        Mappend compile(defs) {
+            # Option %OPTION%
+            lappend %TYPE%::Snit_optionInfo(local) %OPTION%
+
+            set %TYPE%::Snit_optionInfo(islocal-%OPTION%)   1
+            set %TYPE%::Snit_optionInfo(resource-%OPTION%)  %RESOURCE%
+            set %TYPE%::Snit_optionInfo(class-%OPTION%)     %CLASS%
+            set %TYPE%::Snit_optionInfo(default-%OPTION%)   %DEFAULT%
+            set %TYPE%::Snit_optionInfo(validate-%OPTION%)  %VALIDATE%
+            set %TYPE%::Snit_optionInfo(configure-%OPTION%) %CONFIGURE%
+            set %TYPE%::Snit_optionInfo(cget-%OPTION%)      %CGET%
+            set %TYPE%::Snit_optionInfo(readonly-%OPTION%)  %READONLY%
+            set %TYPE%::Snit_optionInfo(typespec-%OPTION%)  %TYPESPEC%
+        }   %OPTION%    $option \
+            %RESOURCE%  $compile(resource-$option) \
+            %CLASS%     $compile(class-$option) \
+            %DEFAULT%   [list $compile(-default-$option)] \
+            %VALIDATE%  [list $compile(-validatemethod-$option)] \
+            %CONFIGURE% [list $compile(-configuremethod-$option)] \
+            %CGET%      [list $compile(-cgetmethod-$option)] \
+            %READONLY%  $compile(-readonly-$option)               \
+            %TYPESPEC%  [list $compile(-type-$option)]
+    }
+}
+
+
+# Evaluates a compiled type definition, thus making the type available.
+proc ::snit::Comp.Define {compResult} {
+    # The compilation result is a list containing the fully qualified
+    # type name and a script to evaluate to define the type.
+    set type [lindex $compResult 0]
+    set defscript [lindex $compResult 1]
+
+    # Execute the type definition script.
+    # Consider using namespace eval %TYPE%.  See if it's faster.
+    if {[catch {eval $defscript} result]} {
+        namespace delete $type
+        catch {rename $type ""}
+        error $result
+    }
+
+    return $type
+}
+
+# Sets pragma options which control how the type is defined.
+proc ::snit::Comp.statement.pragma {args} {
+    variable compile
+
+    set errRoot "Error in \"pragma...\""
+
+    foreach {opt val} $args {
+        switch -exact -- $opt {
+            -hastypeinfo    -
+            -hastypedestroy -
+            -hastypemethods -
+            -hasinstances   -
+            -simpledispatch -
+            -hasinfo        -
+            -canreplace     {
+                if {![string is boolean -strict $val]} {
+                    error "$errRoot, \"$opt\" requires a boolean value"
+                }
+                set compile($opt) $val
+            }
+            default {
+                error "$errRoot, unknown pragma"
+            }
+        }
+    }
+}
+
+# Defines a widget's option class name.  
+# This statement is only available for snit::widgets,
+# not for snit::types or snit::widgetadaptors.
+proc ::snit::Comp.statement.widgetclass {name} {
+    variable compile
+
+    # First, widgetclass can only be set for true widgets
+    if {"widget" != $compile(which)} {
+        error "widgetclass cannot be set for snit::$compile(which)s"
+    }
+
+    # Next, validate the option name.  We'll require that it begin
+    # with an uppercase letter.
+    set initial [string index $name 0]
+    if {![string is upper $initial]} {
+        error "widgetclass \"$name\" does not begin with an uppercase letter"
+    }
+
+    if {"" != $compile(widgetclass)} {
+        error "too many widgetclass statements"
+    }
+
+    # Next, save it.
+    Mappend compile(defs) {
+        set  %TYPE%::Snit_info(widgetclass) %WIDGETCLASS%
+    } %WIDGETCLASS% [list $name]
+
+    set compile(widgetclass) $name
+}
+
+# Defines a widget's hull type.
+# This statement is only available for snit::widgets,
+# not for snit::types or snit::widgetadaptors.
+proc ::snit::Comp.statement.hulltype {name} {
+    variable compile
+    variable hulltypes
+
+    # First, hulltype can only be set for true widgets
+    if {"widget" != $compile(which)} {
+        error "hulltype cannot be set for snit::$compile(which)s"
+    }
+
+    # Next, it must be one of the valid hulltypes (frame, toplevel, ...)
+    if {[lsearch -exact $hulltypes [string trimleft $name :]] == -1} {
+        error "invalid hulltype \"$name\", should be one of\
+		[join $hulltypes {, }]"
+    }
+
+    if {"" != $compile(hulltype)} {
+        error "too many hulltype statements"
+    }
+
+    # Next, save it.
+    Mappend compile(defs) {
+        set  %TYPE%::Snit_info(hulltype) %HULLTYPE%
+    } %HULLTYPE% $name
+
+    set compile(hulltype) $name
+}
+
+# Defines a constructor.
+proc ::snit::Comp.statement.constructor {arglist body} {
+    variable compile
+
+    CheckArgs "constructor" $arglist
+
+    # Next, add a magic reference to self.
+    set arglist [concat type selfns win self $arglist]
+
+    # Next, add variable declarations to body:
+    set body "%TVARDECS%\n%IVARDECS%\n$body"
+
+    set compile(hasconstructor) yes
+    append compile(defs) "proc %TYPE%::Snit_constructor [list $arglist] [list $body]\n"
+} 
+
+# Defines a destructor.
+proc ::snit::Comp.statement.destructor {body} {
+    variable compile
+
+    # Next, add variable declarations to body:
+    set body "%TVARDECS%\n%IVARDECS%\n$body"
+
+    append compile(defs) "proc %TYPE%::Snit_destructor {type selfns win self} [list $body]\n\n"
+} 
+
+# Defines a type option.  The option value can be a triple, specifying
+# the option's -name, resource name, and class name. 
+proc ::snit::Comp.statement.option {optionDef args} {
+    variable compile
+
+    # First, get the three option names.
+    set option [lindex $optionDef 0]
+    set resourceName [lindex $optionDef 1]
+    set className [lindex $optionDef 2]
+
+    set errRoot "Error in \"option [list $optionDef]...\""
+
+    # Next, validate the option name.
+    if {![Comp.OptionNameIsValid $option]} {
+        error "$errRoot, badly named option \"$option\""
+    }
+
+    if {$option in $compile(delegatedoptions)} {
+        error "$errRoot, cannot define \"$option\" locally, it has been delegated"
+    }
+
+    if {!($option in $compile(localoptions))} {
+        # Remember that we've seen this one.
+        set compile(hasoptions) yes
+        lappend compile(localoptions) $option
+        
+        # Initialize compilation info for this option.
+        set compile(resource-$option)         ""
+        set compile(class-$option)            ""
+        set compile(-default-$option)         ""
+        set compile(-validatemethod-$option)  ""
+        set compile(-configuremethod-$option) ""
+        set compile(-cgetmethod-$option)      ""
+        set compile(-readonly-$option)        0
+        set compile(-type-$option)            ""
+    }
+
+    # NEXT, see if we have a resource name.  If so, make sure it
+    # isn't being redefined differently.
+    if {$resourceName ne ""} {
+        if {$compile(resource-$option) eq ""} {
+            # If it's undefined, just save the value.
+            set compile(resource-$option) $resourceName
+        } elseif {$resourceName ne $compile(resource-$option)} {
+            # It's been redefined differently.
+            error "$errRoot, resource name redefined from \"$compile(resource-$option)\" to \"$resourceName\""
+        }
+    }
+
+    # NEXT, see if we have a class name.  If so, make sure it
+    # isn't being redefined differently.
+    if {$className ne ""} {
+        if {$compile(class-$option) eq ""} {
+            # If it's undefined, just save the value.
+            set compile(class-$option) $className
+        } elseif {$className ne $compile(class-$option)} {
+            # It's been redefined differently.
+            error "$errRoot, class name redefined from \"$compile(class-$option)\" to \"$className\""
+        }
+    }
+
+    # NEXT, handle the args; it's not an error to redefine these.
+    if {[llength $args] == 1} {
+        set compile(-default-$option) [lindex $args 0]
+    } else {
+        foreach {optopt val} $args {
+            switch -exact -- $optopt {
+                -default         -
+                -validatemethod  -
+                -configuremethod -
+                -cgetmethod      {
+                    set compile($optopt-$option) $val
+                }
+                -type {
+                    set compile($optopt-$option) $val
+                    
+                    if {[llength $val] == 1} {
+                        # The type spec *is* the validation object
+                        append compile(defs) \
+                            "\nset %TYPE%::Snit_optionInfo(typeobj-$option) [list $val]\n"
+                    } else {
+                        # Compilation the creation of the validation object
+                        set cmd [linsert $val 1 %TYPE%::Snit_TypeObj_%AUTO%]
+                        append compile(defs) \
+                            "\nset %TYPE%::Snit_optionInfo(typeobj-$option) \[$cmd\]\n"
+                    }
+                }
+                -readonly        {
+                    if {![string is boolean -strict $val]} {
+                        error "$errRoot, -readonly requires a boolean, got \"$val\""
+                    }
+                    set compile($optopt-$option) $val
+                }
+                default {
+                    error "$errRoot, unknown option definition option \"$optopt\""
+                }
+            }
+        }
+    }
+}
+
+# 1 if the option name is valid, 0 otherwise.
+proc ::snit::Comp.OptionNameIsValid {option} {
+    if {![string match {-*} $option] || [string match {*[A-Z ]*} $option]} {
+        return 0
+    }
+
+    return 1
+}
+
+# Defines an option's cget handler
+proc ::snit::Comp.statement.oncget {option body} {
+    variable compile
+
+    set errRoot "Error in \"oncget $option...\""
+
+    if {[lsearch -exact $compile(delegatedoptions) $option] != -1} {
+        return -code error "$errRoot, option \"$option\" is delegated"
+    }
+
+    if {[lsearch -exact $compile(localoptions) $option] == -1} {
+        return -code error "$errRoot, option \"$option\" unknown"
+    }
+
+    Comp.statement.method _cget$option {_option} $body
+    Comp.statement.option $option -cgetmethod _cget$option
+} 
+
+# Defines an option's configure handler.
+proc ::snit::Comp.statement.onconfigure {option arglist body} {
+    variable compile
+
+    if {[lsearch -exact $compile(delegatedoptions) $option] != -1} {
+        return -code error "onconfigure $option: option \"$option\" is delegated"
+    }
+
+    if {[lsearch -exact $compile(localoptions) $option] == -1} {
+        return -code error "onconfigure $option: option \"$option\" unknown"
+    }
+
+    if {[llength $arglist] != 1} {
+        error \
+       "onconfigure $option handler should have one argument, got \"$arglist\""
+    }
+
+    CheckArgs "onconfigure $option" $arglist
+
+    # Next, add a magic reference to the option name
+    set arglist [concat _option $arglist]
+
+    Comp.statement.method _configure$option $arglist $body
+    Comp.statement.option $option -configuremethod _configure$option
+} 
+
+# Defines an instance method.
+proc ::snit::Comp.statement.method {method arglist body} {
+    variable compile
+    variable methodInfo
+
+    # FIRST, check the method name against previously defined 
+    # methods.
+    Comp.CheckMethodName $method 0 ::snit::methodInfo \
+        "Error in \"method [list $method]...\""
+
+    if {[llength $method] > 1} {
+        set compile(hashierarchic) yes
+    }
+
+    # Remeber this method
+    lappend compile(localmethods) $method
+
+    CheckArgs "method [list $method]" $arglist
+
+    # Next, add magic references to type and self.
+    set arglist [concat type selfns win self $arglist]
+
+    # Next, add variable declarations to body:
+    set body "%TVARDECS%\n%IVARDECS%\n# END snit method prolog\n$body"
+
+    # Next, save the definition script.
+    if {[llength $method] == 1} {
+        set methodInfo($method) {0 "%t::Snit_method%m %t %n %w %s" ""}
+        Mappend compile(defs) {
+            proc %TYPE%::Snit_method%METHOD% %ARGLIST% %BODY% 
+        } %METHOD% $method %ARGLIST% [list $arglist] %BODY% [list $body] 
+    } else {
+        set methodInfo($method) {0 "%t::Snit_hmethod%j %t %n %w %s" ""}
+
+        Mappend compile(defs) {
+            proc %TYPE%::Snit_hmethod%JMETHOD% %ARGLIST% %BODY% 
+        } %JMETHOD% [join $method _] %ARGLIST% [list $arglist] \
+            %BODY% [list $body] 
+    }
+} 
+
+# Check for name collisions; save prefix information.
+#
+# method	The name of the method or typemethod.
+# delFlag       1 if delegated, 0 otherwise.
+# infoVar       The fully qualified name of the array containing 
+#               information about the defined methods.
+# errRoot       The root string for any error messages.
+
+proc ::snit::Comp.CheckMethodName {method delFlag infoVar errRoot} {
+    upvar $infoVar methodInfo
+
+    # FIRST, make sure the method name is a valid Tcl list.
+    if {[catch {lindex $method 0}]} {
+        error "$errRoot, the name \"$method\" must have list syntax."
+    }
+
+    # NEXT, check whether we can define it.
+    if {![catch {set methodInfo($method)} data]} {
+        # We can't redefine methods with submethods.
+        if {[lindex $data 0] == 1} {
+            error "$errRoot, \"$method\" has submethods."
+        }
+       
+        # You can't delegate a method that's defined locally,
+        # and you can't define a method locally if it's been delegated.
+        if {$delFlag && [lindex $data 2] eq ""} {
+            error "$errRoot, \"$method\" has been defined locally."
+        } elseif {!$delFlag && [lindex $data 2] ne ""} {
+            error "$errRoot, \"$method\" has been delegated"
+        }
+    }
+
+    # Handle hierarchical case.
+    if {[llength $method] > 1} {
+        set prefix {}
+        set tokens $method
+        while {[llength $tokens] > 1} {
+            lappend prefix [lindex $tokens 0]
+            set tokens [lrange $tokens 1 end]
+
+            if {![catch {set methodInfo($prefix)} result]} {
+                # Prefix is known.  If it's not a prefix, throw an
+                # error.
+                if {[lindex $result 0] == 0} {
+                    error "$errRoot, \"$prefix\" has no submethods."
+                }
+            }
+            
+            set methodInfo($prefix) [list 1]
+        }
+    }
+}
+
+# Defines a typemethod method.
+proc ::snit::Comp.statement.typemethod {method arglist body} {
+    variable compile
+    variable typemethodInfo
+
+    # FIRST, check the typemethod name against previously defined 
+    # typemethods.
+    Comp.CheckMethodName $method 0 ::snit::typemethodInfo \
+        "Error in \"typemethod [list $method]...\""
+
+    CheckArgs "typemethod $method" $arglist
+
+    # First, add magic reference to type.
+    set arglist [concat type $arglist]
+
+    # Next, add typevariable declarations to body:
+    set body "%TVARDECS%\n# END snit method prolog\n$body"
+
+    # Next, save the definition script
+    if {[llength $method] == 1} {
+        set typemethodInfo($method) {0 "%t::Snit_typemethod%m %t" ""}
+
+        Mappend compile(defs) {
+            proc %TYPE%::Snit_typemethod%METHOD% %ARGLIST% %BODY%
+        } %METHOD% $method %ARGLIST% [list $arglist] %BODY% [list $body]
+    } else {
+        set typemethodInfo($method) {0 "%t::Snit_htypemethod%j %t" ""}
+
+        Mappend compile(defs) {
+            proc %TYPE%::Snit_htypemethod%JMETHOD% %ARGLIST% %BODY%
+        } %JMETHOD% [join $method _] \
+            %ARGLIST% [list $arglist] %BODY% [list $body]
+    }
+} 
+
+
+# Defines a type constructor.
+proc ::snit::Comp.statement.typeconstructor {body} {
+    variable compile
+
+    if {"" != $compile(typeconstructor)} {
+        error "too many typeconstructors"
+    }
+
+    set compile(typeconstructor) $body
+} 
+
+# Defines a static proc in the type's namespace.
+proc ::snit::Comp.statement.proc {proc arglist body} {
+    variable compile
+
+    # If "ns" is defined, the proc can see instance variables.
+    if {[lsearch -exact $arglist selfns] != -1} {
+        # Next, add instance variable declarations to body:
+        set body "%IVARDECS%\n$body"
+    }
+
+    # The proc can always see typevariables.
+    set body "%TVARDECS%\n$body"
+
+    append compile(defs) "
+
+        # Proc $proc
+        proc [list %TYPE%::$proc $arglist $body]
+    "
+} 
+
+# Defines a static variable in the type's namespace.
+proc ::snit::Comp.statement.typevariable {name args} {
+    variable compile
+
+    set errRoot "Error in \"typevariable $name...\""
+
+    set len [llength $args]
+    
+    if {$len > 2 ||
+        ($len == 2 && [lindex $args 0] ne "-array")} {
+        error "$errRoot, too many initializers"
+    }
+
+    if {[lsearch -exact $compile(varnames) $name] != -1} {
+        error "$errRoot, \"$name\" is already an instance variable"
+    }
+
+    lappend compile(typevarnames) $name
+
+    if {$len == 1} {
+        append compile(typevars) \
+		"\n\t    [list ::variable $name [lindex $args 0]]"
+    } elseif {$len == 2} {
+        append compile(typevars) \
+            "\n\t    [list ::variable $name]"
+        append compile(typevars) \
+            "\n\t    [list array set $name [lindex $args 1]]"
+    } else {
+        append compile(typevars) \
+		"\n\t    [list ::variable $name]"
+    }
+
+    if {$compile(tvprocdec) eq ""} {
+        set compile(tvprocdec) "\n\t"
+        append compile(tvprocdec) "namespace upvar [list $compile(type)]"
+    }
+    append compile(tvprocdec) " [list $name $name]"
+} 
+
+# Defines an instance variable; the definition will go in the
+# type's create typemethod.
+proc ::snit::Comp.statement.variable {name args} {
+    variable compile
+
+    set errRoot "Error in \"variable $name...\""
+
+    set len [llength $args]
+    
+    if {$len > 2 ||
+        ($len == 2 && [lindex $args 0] ne "-array")} {
+        error "$errRoot, too many initializers"
+    }
+
+    if {[lsearch -exact $compile(typevarnames) $name] != -1} {
+        error "$errRoot, \"$name\" is already a typevariable"
+    }
+
+    lappend compile(varnames) $name
+
+    # Add a ::variable to instancevars, so that ::variable is used
+    # at least once; ::variable makes the variable visible to
+    # [info vars] even if no value is assigned.
+    append  compile(instancevars) "\n"
+    Mappend compile(instancevars) {::variable ${selfns}::%N} %N $name 
+
+    if {$len == 1} {
+        append compile(instancevars) \
+            "\nset $name [list [lindex $args 0]]\n"
+    } elseif {$len == 2} {
+        append compile(instancevars) \
+            "\narray set $name [list [lindex $args 1]]\n"
+    } 
+
+    if {$compile(ivprocdec) eq ""} {
+        set compile(ivprocdec) "\n\t"
+        append compile(ivprocdec) {namespace upvar $selfns}
+    }
+    append compile(ivprocdec) " [list $name $name]"
+} 
+
+# Defines a typecomponent, and handles component options.
+#
+# component     The logical name of the delegate
+# args          options.
+
+proc ::snit::Comp.statement.typecomponent {component args} {
+    variable compile
+
+    set errRoot "Error in \"typecomponent $component...\""
+
+    # FIRST, define the component
+    Comp.DefineTypecomponent $component $errRoot
+
+    # NEXT, handle the options.
+    set publicMethod ""
+    set inheritFlag 0
+
+    foreach {opt val} $args {
+        switch -exact -- $opt {
+            -public {
+                set publicMethod $val
+            }
+            -inherit {
+                set inheritFlag $val
+                if {![string is boolean $inheritFlag]} {
+    error "typecomponent $component -inherit: expected boolean value, got \"$val\""
+                }
+            }
+            default {
+                error "typecomponent $component: Invalid option \"$opt\""
+            }
+        }
+    }
+
+    # NEXT, if -public specified, define the method.  
+    if {$publicMethod ne ""} {
+        Comp.statement.delegate typemethod [list $publicMethod *] to $component
+    }
+
+    # NEXT, if "-inherit 1" is specified, delegate typemethod * to 
+    # this component.
+    if {$inheritFlag} {
+        Comp.statement.delegate typemethod "*" to $component
+    }
+
+}
+
+
+# Defines a name to be a typecomponent
+# 
+# The name becomes a typevariable; in addition, it gets a 
+# write trace so that when it is set, all of the component mechanisms
+# get updated.
+#
+# component     The component name
+
+proc ::snit::Comp.DefineTypecomponent {component {errRoot "Error"}} {
+    variable compile
+
+    if {[lsearch -exact $compile(varnames) $component] != -1} {
+        error "$errRoot, \"$component\" is already an instance variable"
+    }
+
+    if {[lsearch -exact $compile(typecomponents) $component] == -1} {
+        # Remember we've done this.
+        lappend compile(typecomponents) $component
+
+        # Make it a type variable with no initial value
+        Comp.statement.typevariable $component ""
+
+        # Add a write trace to do the component thing.
+        Mappend compile(typevars) {
+            trace add variable %COMP% write \
+                [list ::snit::RT.TypecomponentTrace [list %TYPE%] %COMP%]
+        } %TYPE% $compile(type) %COMP% $component
+    }
+} 
+
+# Defines a component, and handles component options.
+#
+# component     The logical name of the delegate
+# args          options.
+#
+# TBD: Ideally, it should be possible to call this statement multiple
+# times, possibly changing the option values.  To do that, I'd need
+# to cache the option values and not act on them until *after* I'd
+# read the entire type definition.
+
+proc ::snit::Comp.statement.component {component args} {
+    variable compile
+
+    set errRoot "Error in \"component $component...\""
+
+    # FIRST, define the component
+    Comp.DefineComponent $component $errRoot
+
+    # NEXT, handle the options.
+    set publicMethod ""
+    set inheritFlag 0
+
+    foreach {opt val} $args {
+        switch -exact -- $opt {
+            -public {
+                set publicMethod $val
+            }
+            -inherit {
+                set inheritFlag $val
+                if {![string is boolean $inheritFlag]} {
+    error "component $component -inherit: expected boolean value, got \"$val\""
+                }
+            }
+            default {
+                error "component $component: Invalid option \"$opt\""
+            }
+        }
+    }
+
+    # NEXT, if -public specified, define the method.  
+    if {$publicMethod ne ""} {
+        Comp.statement.delegate method [list $publicMethod *] to $component
+    }
+
+    # NEXT, if -inherit is specified, delegate method/option * to 
+    # this component.
+    if {$inheritFlag} {
+        Comp.statement.delegate method "*" to $component
+        Comp.statement.delegate option "*" to $component
+    }
+}
+
+
+# Defines a name to be a component
+# 
+# The name becomes an instance variable; in addition, it gets a 
+# write trace so that when it is set, all of the component mechanisms
+# get updated.
+#
+# component     The component name
+
+proc ::snit::Comp.DefineComponent {component {errRoot "Error"}} {
+    variable compile
+
+    if {[lsearch -exact $compile(typevarnames) $component] != -1} {
+        error "$errRoot, \"$component\" is already a typevariable"
+    }
+
+    if {[lsearch -exact $compile(components) $component] == -1} {
+        # Remember we've done this.
+        lappend compile(components) $component
+
+        # Make it an instance variable with no initial value
+        Comp.statement.variable $component ""
+
+        # Add a write trace to do the component thing.
+        Mappend compile(instancevars) {
+            trace add variable ${selfns}::%COMP% write \
+                [list ::snit::RT.ComponentTrace [list %TYPE%] $selfns %COMP%]
+        } %TYPE% $compile(type) %COMP% $component
+    }
+} 
+
+# Creates a delegated method, typemethod, or option.
+proc ::snit::Comp.statement.delegate {what name args} {
+    # FIRST, dispatch to correct handler.
+    switch $what {
+        typemethod { Comp.DelegatedTypemethod $name $args }
+        method     { Comp.DelegatedMethod     $name $args }
+        option     { Comp.DelegatedOption     $name $args }
+        default {
+            error "Error in \"delegate $what $name...\", \"$what\"?"
+        }
+    }
+
+    if {([llength $args] % 2) != 0} {
+        error "Error in \"delegate $what $name...\", invalid syntax"
+    }
+}
+
+# Creates a delegated typemethod delegating it to a particular
+# typecomponent or an arbitrary command.
+#
+# method    The name of the method
+# arglist       Delegation options
+
+proc ::snit::Comp.DelegatedTypemethod {method arglist} {
+    variable compile
+    variable typemethodInfo
+
+    set errRoot "Error in \"delegate typemethod [list $method]...\""
+
+    # Next, parse the delegation options.
+    set component ""
+    set target ""
+    set exceptions {}
+    set pattern ""
+    set methodTail [lindex $method end]
+
+    foreach {opt value} $arglist {
+        switch -exact $opt {
+            to     { set component $value  }
+            as     { set target $value     }
+            except { set exceptions $value }
+            using  { set pattern $value    }
+            default {
+                error "$errRoot, unknown delegation option \"$opt\""
+            }
+        }
+    }
+
+    if {$component eq "" && $pattern eq ""} {
+        error "$errRoot, missing \"to\""
+    }
+
+    if {$methodTail eq "*" && $target ne ""} {
+        error "$errRoot, cannot specify \"as\" with \"*\""
+    }
+
+    if {$methodTail ne "*" && $exceptions ne ""} {
+        error "$errRoot, can only specify \"except\" with \"*\"" 
+    }
+
+    if {$pattern ne "" && $target ne ""} {
+        error "$errRoot, cannot specify both \"as\" and \"using\""
+    }
+
+    foreach token [lrange $method 1 end-1] {
+        if {$token eq "*"} {
+            error "$errRoot, \"*\" must be the last token."
+        }
+    }
+
+    # NEXT, define the component
+    if {$component ne ""} {
+        Comp.DefineTypecomponent $component $errRoot
+    }
+
+    # NEXT, define the pattern.
+    if {$pattern eq ""} {
+        if {$methodTail eq "*"} {
+            set pattern "%c %m"
+        } elseif {$target ne ""} {
+            set pattern "%c $target"
+        } else {
+            set pattern "%c %m"
+        }
+    }
+
+    # Make sure the pattern is a valid list.
+    if {[catch {lindex $pattern 0} result]} {
+        error "$errRoot, the using pattern, \"$pattern\", is not a valid list"
+    }
+
+    # NEXT, check the method name against previously defined 
+    # methods.
+    Comp.CheckMethodName $method 1 ::snit::typemethodInfo $errRoot
+
+    set typemethodInfo($method) [list 0 $pattern $component]
+
+    if {[string equal $methodTail "*"]} {
+        Mappend compile(defs) {
+            set %TYPE%::Snit_info(excepttypemethods) %EXCEPT%
+        } %EXCEPT% [list $exceptions]
+    }
+}
+
+
+# Creates a delegated method delegating it to a particular
+# component or command.
+#
+# method        The name of the method
+# arglist       Delegation options.
+
+proc ::snit::Comp.DelegatedMethod {method arglist} {
+    variable compile
+    variable methodInfo
+
+    set errRoot "Error in \"delegate method [list $method]...\""
+
+    # Next, parse the delegation options.
+    set component ""
+    set target ""
+    set exceptions {}
+    set pattern ""
+    set methodTail [lindex $method end]
+
+    foreach {opt value} $arglist {
+        switch -exact $opt {
+            to     { set component $value  }
+            as     { set target $value     }
+            except { set exceptions $value }
+            using  { set pattern $value    }
+            default {
+                error "$errRoot, unknown delegation option \"$opt\""
+            }
+        }
+    }
+
+    if {$component eq "" && $pattern eq ""} {
+        error "$errRoot, missing \"to\""
+    }
+
+    if {$methodTail eq "*" && $target ne ""} {
+        error "$errRoot, cannot specify \"as\" with \"*\""
+    }
+
+    if {$methodTail ne "*" && $exceptions ne ""} {
+        error "$errRoot, can only specify \"except\" with \"*\"" 
+    }
+
+    if {$pattern ne "" && $target ne ""} {
+        error "$errRoot, cannot specify both \"as\" and \"using\""
+    }
+
+    foreach token [lrange $method 1 end-1] {
+        if {$token eq "*"} {
+            error "$errRoot, \"*\" must be the last token."
+        }
+    }
+
+    # NEXT, we delegate some methods
+    set compile(delegatesmethods) yes
+
+    # NEXT, define the component.  Allow typecomponents.
+    if {$component ne ""} {
+        if {[lsearch -exact $compile(typecomponents) $component] == -1} {
+            Comp.DefineComponent $component $errRoot
+        }
+    }
+
+    # NEXT, define the pattern.
+    if {$pattern eq ""} {
+        if {$methodTail eq "*"} {
+            set pattern "%c %m"
+        } elseif {$target ne ""} {
+            set pattern "%c $target"
+        } else {
+            set pattern "%c %m"
+        }
+    }
+
+    # Make sure the pattern is a valid list.
+    if {[catch {lindex $pattern 0} result]} {
+        error "$errRoot, the using pattern, \"$pattern\", is not a valid list"
+    }
+
+    # NEXT, check the method name against previously defined 
+    # methods.
+    Comp.CheckMethodName $method 1 ::snit::methodInfo $errRoot
+
+    # NEXT, save the method info.
+    set methodInfo($method) [list 0 $pattern $component]
+
+    if {[string equal $methodTail "*"]} {
+        Mappend compile(defs) {
+            set %TYPE%::Snit_info(exceptmethods) %EXCEPT%
+        } %EXCEPT% [list $exceptions]
+    }
+} 
+
+# Creates a delegated option, delegating it to a particular
+# component and, optionally, to a particular option of that
+# component.
+#
+# optionDef     The option definition
+# args          definition arguments.
+
+proc ::snit::Comp.DelegatedOption {optionDef arglist} {
+    variable compile
+
+    # First, get the three option names.
+    set option [lindex $optionDef 0]
+    set resourceName [lindex $optionDef 1]
+    set className [lindex $optionDef 2]
+
+    set errRoot "Error in \"delegate option [list $optionDef]...\""
+
+    # Next, parse the delegation options.
+    set component ""
+    set target ""
+    set exceptions {}
+
+    foreach {opt value} $arglist {
+        switch -exact $opt {
+            to     { set component $value  }
+            as     { set target $value     }
+            except { set exceptions $value }
+            default {
+                error "$errRoot, unknown delegation option \"$opt\""
+            }
+        }
+    }
+
+    if {$component eq ""} {
+        error "$errRoot, missing \"to\""
+    }
+
+    if {$option eq "*" && $target ne ""} {
+        error "$errRoot, cannot specify \"as\" with \"delegate option *\""
+    }
+
+    if {$option ne "*" && $exceptions ne ""} {
+        error "$errRoot, can only specify \"except\" with \"delegate option *\"" 
+    }
+
+    # Next, validate the option name
+
+    if {"*" != $option} {
+        if {![Comp.OptionNameIsValid $option]} {
+            error "$errRoot, badly named option \"$option\""
+        }
+    }
+
+    if {$option in $compile(localoptions)} {
+        error "$errRoot, \"$option\" has been defined locally"
+    }
+
+    if {$option in $compile(delegatedoptions)} {
+        error "$errRoot, \"$option\" is multiply delegated"
+    }
+
+    # NEXT, define the component
+    Comp.DefineComponent $component $errRoot
+
+    # Next, define the target option, if not specified.
+    if {![string equal $option "*"] &&
+        [string equal $target ""]} {
+        set target $option
+    }
+
+    # NEXT, save the delegation data.
+    set compile(hasoptions) yes
+
+    if {![string equal $option "*"]} {
+        lappend compile(delegatedoptions) $option
+
+        # Next, compute the resource and class names, if they aren't
+        # already defined.
+
+        if {"" == $resourceName} {
+            set resourceName [string range $option 1 end]
+        }
+
+        if {"" == $className} {
+            set className [Capitalize $resourceName]
+        }
+
+        Mappend  compile(defs) {
+            set %TYPE%::Snit_optionInfo(islocal-%OPTION%) 0
+            set %TYPE%::Snit_optionInfo(resource-%OPTION%) %RES%
+            set %TYPE%::Snit_optionInfo(class-%OPTION%) %CLASS%
+            lappend %TYPE%::Snit_optionInfo(delegated) %OPTION%
+            set %TYPE%::Snit_optionInfo(target-%OPTION%) [list %COMP% %TARGET%]
+            lappend %TYPE%::Snit_optionInfo(delegated-%COMP%) %OPTION%
+        }   %OPTION% $option \
+            %COMP% $component \
+            %TARGET% $target \
+            %RES% $resourceName \
+            %CLASS% $className 
+    } else {
+        Mappend  compile(defs) {
+            set %TYPE%::Snit_optionInfo(starcomp) %COMP%
+            set %TYPE%::Snit_optionInfo(except) %EXCEPT%
+        } %COMP% $component %EXCEPT% [list $exceptions]
+    }
+} 
+
+# Exposes a component, effectively making the component's command an
+# instance method.
+#
+# component     The logical name of the delegate
+# "as"          sugar; if not "", must be "as"
+# methodname    The desired method name for the component's command, or ""
+
+proc ::snit::Comp.statement.expose {component {"as" ""} {methodname ""}} {
+    variable compile
+
+
+    # FIRST, define the component
+    Comp.DefineComponent $component
+
+    # NEXT, define the method just as though it were in the type
+    # definition.
+    if {[string equal $methodname ""]} {
+        set methodname $component
+    }
+
+    Comp.statement.method $methodname args [Expand {
+        if {[llength $args] == 0} {
+            return $%COMPONENT%
+        }
+
+        if {[string equal $%COMPONENT% ""]} {
+            error "undefined component \"%COMPONENT%\""
+        }
+
+
+        set cmd [linsert $args 0 $%COMPONENT%]
+        return [uplevel 1 $cmd]
+    } %COMPONENT% $component]
+}
+
+
+
+#-----------------------------------------------------------------------
+# Public commands
+
+# Compile a type definition, and return the results as a list of two
+# items: the fully-qualified type name, and a script that will define
+# the type when executed.
+#
+# which		type, widget, or widgetadaptor
+# type          the type name
+# body          the type definition
+proc ::snit::compile {which type body} {
+    return [Comp.Compile $which $type $body]
+}
+
+proc ::snit::type {type body} {
+    return [Comp.Define [Comp.Compile type $type $body]]
+}
+
+proc ::snit::widget {type body} {
+    return [Comp.Define [Comp.Compile widget $type $body]]
+}
+
+proc ::snit::widgetadaptor {type body} {
+    return [Comp.Define [Comp.Compile widgetadaptor $type $body]]
+}
+
+proc ::snit::typemethod {type method arglist body} {
+    # Make sure the type exists.
+    if {![info exists ${type}::Snit_info]} {
+        error "no such type: \"$type\""
+    }
+
+    upvar ${type}::Snit_info           Snit_info
+    upvar ${type}::Snit_typemethodInfo Snit_typemethodInfo
+
+    # FIRST, check the typemethod name against previously defined 
+    # typemethods.
+    Comp.CheckMethodName $method 0 ${type}::Snit_typemethodInfo \
+        "Cannot define \"$method\""
+
+    # NEXT, check the arguments
+    CheckArgs "snit::typemethod $type $method" $arglist
+
+    # Next, add magic reference to type.
+    set arglist [concat type $arglist]
+
+    # Next, add typevariable declarations to body:
+    set body "$Snit_info(tvardecs)\n$body"
+
+    # Next, define it.
+    if {[llength $method] == 1} {
+        set Snit_typemethodInfo($method) {0 "%t::Snit_typemethod%m %t" ""}
+        uplevel 1 [list proc ${type}::Snit_typemethod$method $arglist $body]
+    } else {
+        set Snit_typemethodInfo($method) {0 "%t::Snit_htypemethod%j %t" ""}
+        set suffix [join $method _]
+        uplevel 1 [list proc ${type}::Snit_htypemethod$suffix $arglist $body]
+    }
+}
+
+proc ::snit::method {type method arglist body} {
+    # Make sure the type exists.
+    if {![info exists ${type}::Snit_info]} {
+        error "no such type: \"$type\""
+    }
+
+    upvar ${type}::Snit_methodInfo  Snit_methodInfo
+    upvar ${type}::Snit_info        Snit_info
+
+    # FIRST, check the method name against previously defined 
+    # methods.
+    Comp.CheckMethodName $method 0 ${type}::Snit_methodInfo \
+        "Cannot define \"$method\""
+
+    # NEXT, check the arguments
+    CheckArgs "snit::method $type $method" $arglist
+
+    # Next, add magic references to type and self.
+    set arglist [concat type selfns win self $arglist]
+
+    # Next, add variable declarations to body:
+    set body "$Snit_info(tvardecs)\n$Snit_info(ivardecs)\n$body"
+
+    # Next, define it.
+    if {[llength $method] == 1} {
+        set Snit_methodInfo($method) {0 "%t::Snit_method%m %t %n %w %s" ""}
+        uplevel 1 [list proc ${type}::Snit_method$method $arglist $body]
+    } else {
+        set Snit_methodInfo($method) {0 "%t::Snit_hmethod%j %t %n %w %s" ""}
+
+        set suffix [join $method _]
+        uplevel 1 [list proc ${type}::Snit_hmethod$suffix $arglist $body]
+    }
+}
+
+# Defines a proc within the compiler; this proc can call other
+# type definition statements, and thus can be used for meta-programming.
+proc ::snit::macro {name arglist body} {
+    variable compiler
+    variable reservedwords
+
+    # FIRST, make sure the compiler is defined.
+    Comp.Init
+
+    # NEXT, check the macro name against the reserved words
+    if {[lsearch -exact $reservedwords $name] != -1} {
+        error "invalid macro name \"$name\""
+    }
+
+    # NEXT, see if the name has a namespace; if it does, define the
+    # namespace.
+    set ns [namespace qualifiers $name]
+
+    if {$ns ne ""} {
+        $compiler eval "namespace eval $ns {}"
+    }
+
+    # NEXT, define the macro
+    $compiler eval [list _proc $name $arglist $body]
+}
+
+#-----------------------------------------------------------------------
+# Utility Functions
+#
+# These are utility functions used while compiling Snit types.
+
+# Builds a template from a tagged list of text blocks, then substitutes
+# all symbols in the mapTable, returning the expanded template.
+proc ::snit::Expand {template args} {
+    return [string map $args $template]
+}
+
+# Expands a template and appends it to a variable.
+proc ::snit::Mappend {varname template args} {
+    upvar $varname myvar
+
+    append myvar [string map $args $template]
+}
+
+# Checks argument list against reserved args 
+proc ::snit::CheckArgs {which arglist} {
+    variable reservedArgs
+    
+    foreach name $reservedArgs {
+        if {$name in $arglist} {
+            error "$which's arglist may not contain \"$name\" explicitly"
+        }
+    }
+}
+
+# Capitalizes the first letter of a string.
+proc ::snit::Capitalize {text} {
+    return [string toupper $text 0]
+}
+
+
+#=======================================================================
+# Snit Runtime Library
+#
+# These are procs used by Snit types and widgets at runtime.
+
+#-----------------------------------------------------------------------
+# Object Creation
+
+# Creates a new instance of the snit::type given its name and the args.
+#
+# type		The snit::type
+# name		The instance name
+# args		Args to pass to the constructor
+
+proc ::snit::RT.type.typemethod.create {type name args} {
+    variable ${type}::Snit_info
+    variable ${type}::Snit_optionInfo
+
+    # FIRST, qualify the name.
+    if {![string match "::*" $name]} {
+        # Get caller's namespace; 
+        # append :: if not global namespace.
+        set ns [uplevel 1 [list namespace current]]
+        if {"::" != $ns} {
+            append ns "::"
+        }
+        
+        set name "$ns$name"
+    }
+
+    # NEXT, if %AUTO% appears in the name, generate a unique 
+    # command name.  Otherwise, ensure that the name isn't in use.
+    if {[string match "*%AUTO%*" $name]} {
+        set name [::snit::RT.UniqueName Snit_info(counter) $type $name]
+    } elseif {!$Snit_info(canreplace) && [llength [info commands $name]]} {
+        error "command \"$name\" already exists"
+    }
+
+    # NEXT, create the instance's namespace.
+    set selfns \
+        [::snit::RT.UniqueInstanceNamespace Snit_info(counter) $type]
+    namespace eval $selfns {}
+
+    # NEXT, install the dispatcher
+    RT.MakeInstanceCommand $type $selfns $name
+
+    # Initialize the options to their defaults. 
+    namespace upvar ${selfns} options options
+
+    foreach opt $Snit_optionInfo(local) {
+        set options($opt) $Snit_optionInfo(default-$opt)
+    }
+        
+    # Initialize the instance vars to their defaults.
+    # selfns must be defined, as it is used implicitly.
+    ${type}::Snit_instanceVars $selfns
+
+    # Execute the type's constructor.
+    set errcode [catch {
+        RT.ConstructInstance $type $selfns $name $args
+    } result]
+
+    if {$errcode} {
+        global errorInfo
+        global errorCode
+        
+        set theInfo $errorInfo
+        set theCode $errorCode
+
+        ::snit::RT.DestroyObject $type $selfns $name
+        error "Error in constructor: $result" $theInfo $theCode
+    }
+
+    # NEXT, return the object's name.
+    return $name
+}
+
+# Creates a new instance of the snit::widget or snit::widgetadaptor
+# given its name and the args.
+#
+# type		The snit::widget or snit::widgetadaptor
+# name		The instance name
+# args		Args to pass to the constructor
+
+proc ::snit::RT.widget.typemethod.create {type name args} {
+    variable ${type}::Snit_info
+    variable ${type}::Snit_optionInfo
+
+    # FIRST, if %AUTO% appears in the name, generate a unique 
+    # command name.
+    if {[string match "*%AUTO%*" $name]} {
+        set name [::snit::RT.UniqueName Snit_info(counter) $type $name]
+    }
+            
+    # NEXT, create the instance's namespace.
+    set selfns \
+        [::snit::RT.UniqueInstanceNamespace Snit_info(counter) $type]
+    namespace eval $selfns { }
+            
+    # NEXT, Initialize the widget's own options to their defaults.
+    namespace upvar $selfns options options
+
+    foreach opt $Snit_optionInfo(local) {
+        set options($opt) $Snit_optionInfo(default-$opt)
+    }
+
+    # Initialize the instance vars to their defaults.
+    ${type}::Snit_instanceVars $selfns
+
+    # NEXT, if this is a normal widget (not a widget adaptor) then create a
+    # frame as its hull.  We set the frame's -class to the user's widgetclass,
+    # or, if none, search for -class in the args list, otherwise default to
+    # the basename of the $type with an initial upper case letter.
+    if {!$Snit_info(isWidgetAdaptor)} {
+        # FIRST, determine the class name
+	set wclass $Snit_info(widgetclass)
+        if {$Snit_info(widgetclass) eq ""} {
+	    set idx [lsearch -exact $args -class]
+	    if {$idx >= 0 && ($idx%2 == 0)} {
+		# -class exists and is in the -option position
+		set wclass [lindex $args [expr {$idx+1}]]
+		set args [lreplace $args $idx [expr {$idx+1}]]
+	    } else {
+		set wclass [::snit::Capitalize [namespace tail $type]]
+	    }
+	}
+
+        # NEXT, create the widget
+        set self $name
+        package require Tk
+        ${type}::installhull using $Snit_info(hulltype) -class $wclass
+
+        # NEXT, let's query the option database for our
+        # widget, now that we know that it exists.
+        foreach opt $Snit_optionInfo(local) {
+            set dbval [RT.OptionDbGet $type $name $opt]
+
+            if {"" != $dbval} {
+                set options($opt) $dbval
+            }
+        }
+    }
+
+    # Execute the type's constructor, and verify that it
+    # has a hull.
+    set errcode [catch {
+        RT.ConstructInstance $type $selfns $name $args
+
+        ::snit::RT.Component $type $selfns hull
+
+        # Prepare to call the object's destructor when the
+        # <Destroy> event is received.  Use a Snit-specific bindtag
+        # so that the widget name's tag is unencumbered.
+
+        bind Snit$type$name <Destroy> [::snit::Expand {
+            ::snit::RT.DestroyObject %TYPE% %NS% %W
+        } %TYPE% $type %NS% $selfns]
+
+        # Insert the bindtag into the list of bindtags right
+        # after the widget name.
+        set taglist [bindtags $name]
+        set ndx [lsearch -exact $taglist $name]
+        incr ndx
+        bindtags $name [linsert $taglist $ndx Snit$type$name]
+    } result]
+
+    if {$errcode} {
+        global errorInfo
+        global errorCode
+
+        set theInfo $errorInfo
+        set theCode $errorCode
+        ::snit::RT.DestroyObject $type $selfns $name
+        error "Error in constructor: $result" $theInfo $theCode
+    }
+
+    # NEXT, return the object's name.
+    return $name
+}
+
+
+# RT.MakeInstanceCommand type selfns instance
+#
+# type        The object type
+# selfns      The instance namespace
+# instance    The instance name
+#
+# Creates the instance proc.
+
+proc ::snit::RT.MakeInstanceCommand {type selfns instance} {
+    variable ${type}::Snit_info
+        
+    # FIRST, remember the instance name.  The Snit_instance variable
+    # allows the instance to figure out its current name given the
+    # instance namespace.
+
+    namespace upvar $selfns Snit_instance Snit_instance
+
+    set Snit_instance $instance
+
+    # NEXT, qualify the proc name if it's a widget.
+    if {$Snit_info(isWidget)} {
+        set procname ::$instance
+    } else {
+        set procname $instance
+    }
+
+    # NEXT, install the new proc
+    # WHD: Snit 2.0 code
+
+    set unknownCmd [list ::snit::RT.UnknownMethod $type $selfns $instance ""]
+    set createCmd [list namespace ensemble create \
+                       -command $procname \
+                       -unknown $unknownCmd \
+                       -prefixes 0]
+
+    namespace eval $selfns $createCmd
+
+    # NEXT, add the trace.
+    trace add command $procname {rename delete} \
+        [list ::snit::RT.InstanceTrace $type $selfns $instance]
+}
+
+# This proc is called when the instance command is renamed.
+# If op is delete, then new will always be "", so op is redundant.
+#
+# type		The fully-qualified type name
+# selfns	The instance namespace
+# win		The original instance/tk window name.
+# old		old instance command name
+# new		new instance command name
+# op		rename or delete
+#
+# If the op is delete, we need to clean up the object; otherwise,
+# we need to track the change.
+#
+# NOTE: In Tcl 8.4.2 there's a bug: errors in rename and delete
+# traces aren't propagated correctly.  Instead, they silently
+# vanish.  Add a catch to output any error message.
+
+proc ::snit::RT.InstanceTrace {type selfns win old new op} {
+    variable ${type}::Snit_info
+
+    # Note to developers ...
+    # For Tcl 8.4.0, errors thrown in trace handlers vanish silently.
+    # Therefore we catch them here and create some output to help in
+    # debugging such problems.
+
+    if {[catch {
+        # FIRST, clean up if necessary
+        if {"" == $new} {
+            if {$Snit_info(isWidget)} {
+                destroy $win
+            } else {
+                ::snit::RT.DestroyObject $type $selfns $win
+            }
+        } else {
+            # Otherwise, track the change.
+            variable ${selfns}::Snit_instance
+            set Snit_instance [uplevel 1 [list namespace which -command $new]]
+            
+            # Also, clear the instance caches, as many cached commands
+            # might be invalid.
+            RT.ClearInstanceCaches $selfns
+        }
+    } result]} {
+        global errorInfo
+        # Pop up the console on Windows wish, to enable stdout.
+        # This clobbers errorInfo on unix, so save it so we can print it.
+        set ei $errorInfo
+        catch {console show}
+        puts "Error in ::snit::RT.InstanceTrace $type $selfns $win $old $new $op:"
+        puts $ei
+    }
+}
+
+# Calls the instance constructor and handles related housekeeping.
+proc ::snit::RT.ConstructInstance {type selfns instance arglist} {
+    variable ${type}::Snit_optionInfo
+    variable ${selfns}::Snit_iinfo
+
+    # Track whether we are constructed or not.
+    set Snit_iinfo(constructed) 0
+
+    # Call the user's constructor
+    eval [linsert $arglist 0 \
+              ${type}::Snit_constructor $type $selfns $instance $instance]
+
+    set Snit_iinfo(constructed) 1
+
+    # Validate the initial set of options (including defaults)
+    foreach option $Snit_optionInfo(local) {
+        set value [set ${selfns}::options($option)]
+
+        if {$Snit_optionInfo(typespec-$option) ne ""} {
+            if {[catch {
+                $Snit_optionInfo(typeobj-$option) validate $value
+            } result]} {
+                return -code error "invalid $option default: $result"
+            }
+        }
+    }
+
+    # Unset the configure cache for all -readonly options.
+    # This ensures that the next time anyone tries to 
+    # configure it, an error is thrown.
+    foreach opt $Snit_optionInfo(local) {
+        if {$Snit_optionInfo(readonly-$opt)} {
+            unset -nocomplain ${selfns}::Snit_configureCache($opt)
+        }
+    }
+
+    return
+}
+
+# Returns a unique command name.  
+#
+# REQUIRE: type is a fully qualified name.
+# REQUIRE: name contains "%AUTO%"
+# PROMISE: the returned command name is unused.
+proc ::snit::RT.UniqueName {countervar type name} {
+    upvar $countervar counter 
+    while 1 {
+        # FIRST, bump the counter and define the %AUTO% instance name;
+        # then substitute it into the specified name.  Wrap around at
+        # 2^31 - 2 to prevent overflow problems.
+        incr counter
+        if {$counter > 2147483646} {
+            set counter 0
+        }
+        set auto "[namespace tail $type]$counter"
+        set candidate [Expand $name %AUTO% $auto]
+        if {![llength [info commands $candidate]]} {
+            return $candidate
+        }
+    }
+}
+
+# Returns a unique instance namespace, fully qualified.
+#
+# countervar     The name of a counter variable
+# type           The instance's type
+#
+# REQUIRE: type is fully qualified
+# PROMISE: The returned namespace name is unused.
+
+proc ::snit::RT.UniqueInstanceNamespace {countervar type} {
+    upvar $countervar counter 
+    while 1 {
+        # FIRST, bump the counter and define the namespace name.
+        # Then see if it already exists.  Wrap around at
+        # 2^31 - 2 to prevent overflow problems.
+        incr counter
+        if {$counter > 2147483646} {
+            set counter 0
+        }
+        set ins "${type}::Snit_inst${counter}"
+        if {![namespace exists $ins]} {
+            return $ins
+        }
+    }
+}
+
+# Retrieves an option's value from the option database.
+# Returns "" if no value is found.
+proc ::snit::RT.OptionDbGet {type self opt} {
+    variable ${type}::Snit_optionInfo
+
+    return [option get $self \
+                $Snit_optionInfo(resource-$opt) \
+                $Snit_optionInfo(class-$opt)]
+}
+
+#-----------------------------------------------------------------------
+# Object Destruction
+
+# Implements the standard "destroy" method
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+
+proc ::snit::RT.method.destroy {type selfns win self} {
+    variable ${selfns}::Snit_iinfo
+
+    # Can't destroy the object if it isn't complete constructed.
+    if {!$Snit_iinfo(constructed)} {
+        return -code error "Called 'destroy' method in constructor"
+    }
+
+    # Calls Snit_cleanup, which (among other things) calls the
+    # user's destructor.
+    ::snit::RT.DestroyObject $type $selfns $win
+}
+
+# This is the function that really cleans up; it's automatically 
+# called when any instance is destroyed, e.g., by "$object destroy"
+# for types, and by the <Destroy> event for widgets.
+#
+# type		The fully-qualified type name.
+# selfns	The instance namespace
+# win		The original instance command name.
+
+proc ::snit::RT.DestroyObject {type selfns win} {
+    variable ${type}::Snit_info
+
+    # If the variable Snit_instance doesn't exist then there's no
+    # instance command for this object -- it's most likely a 
+    # widgetadaptor. Consequently, there are some things that
+    # we don't need to do.
+    if {[info exists ${selfns}::Snit_instance]} {
+        namespace upvar $selfns Snit_instance instance
+            
+        # First, remove the trace on the instance name, so that we
+        # don't call RT.DestroyObject recursively.
+        RT.RemoveInstanceTrace $type $selfns $win $instance
+            
+        # Next, call the user's destructor
+        ${type}::Snit_destructor $type $selfns $win $instance
+
+        # Next, if this isn't a widget, delete the instance command.
+        # If it is a widget, get the hull component's name, and rename
+        # it back to the widget name
+                
+        # Next, delete the hull component's instance command,
+        # if there is one.
+        if {$Snit_info(isWidget)} {
+            set hullcmd [::snit::RT.Component $type $selfns hull]
+            
+            catch {rename $instance ""}
+
+            # Clear the bind event
+            bind Snit$type$win <Destroy> ""
+
+            if {[llength [info commands $hullcmd]]} {
+                # FIRST, rename the hull back to its original name.
+                # If the hull is itself a megawidget, it will have its
+                # own cleanup to do, and it might not do it properly
+                # if it doesn't have the right name.
+                rename $hullcmd ::$instance
+
+                # NEXT, destroy it.
+                destroy $instance
+            }
+        } else {
+            catch {rename $instance ""}
+        }
+    }
+
+    # Next, delete the instance's namespace.  This kills any
+    # instance variables.
+    namespace delete $selfns
+
+    return
+}
+
+# Remove instance trace
+# 
+# type           The fully qualified type name
+# selfns         The instance namespace
+# win            The original instance name/Tk window name
+# instance       The current instance name
+
+proc ::snit::RT.RemoveInstanceTrace {type selfns win instance} {
+    variable ${type}::Snit_info
+
+    if {$Snit_info(isWidget)} {
+        set procname ::$instance
+    } else {
+        set procname $instance
+    }
+        
+    # NEXT, remove any trace on this name
+    catch {
+        trace remove command $procname {rename delete} \
+            [list ::snit::RT.InstanceTrace $type $selfns $win]
+    }
+}
+
+#-----------------------------------------------------------------------
+# Typecomponent Management and Method Caching
+
+# Typecomponent trace; used for write trace on typecomponent 
+# variables.  Saves the new component object name, provided 
+# that certain conditions are met.  Also clears the typemethod
+# cache.
+
+proc ::snit::RT.TypecomponentTrace {type component n1 n2 op} {
+    namespace upvar $type \
+        Snit_info           Snit_info \
+        $component          cvar      \
+        Snit_typecomponents Snit_typecomponents
+
+        
+    # Save the new component value.
+    set Snit_typecomponents($component) $cvar
+
+    # Clear the typemethod cache.
+    # TBD: can we unset just the elements related to
+    # this component?
+
+    # WHD: Namespace 2.0 code
+    namespace ensemble configure $type -map {}
+}
+
+# WHD: Snit 2.0 code
+#
+# RT.UnknownTypemethod type eId eCmd method args
+#
+# type		The type
+# eId           The ensemble command ID; "" for the instance itself.
+# eCmd          The ensemble command name.
+# method	The unknown method name.
+# args          The additional arguments, if any.
+#
+# This proc looks up the method relative to the specified ensemble.
+# If no method is found, it assumes that the "create" method is
+# desired, and that the "method" is the instance name.  In this case,
+# it returns the "create" typemethod command with the instance name
+# appended; this will cause the instance to be created without updating
+# the -map.  If the method is found, the method's command is created and
+# added to the -map; the function returns the empty list.
+
+proc snit::RT.UnknownTypemethod {type eId eCmd method args} {
+    namespace upvar $type \
+        Snit_typemethodInfo  Snit_typemethodInfo \
+        Snit_typecomponents  Snit_typecomponents \
+        Snit_info            Snit_info
+    
+    # FIRST, get the pattern data and the typecomponent name.
+    set implicitCreate 0
+    set instanceName ""
+
+    set fullMethod $eId
+    lappend fullMethod $method
+    set starredMethod [concat $eId *]
+    set methodTail $method
+
+    if {[info exists Snit_typemethodInfo($fullMethod)]} {
+        set key $fullMethod
+    } elseif {[info exists Snit_typemethodInfo($starredMethod)]} {
+        if {[lsearch -exact $Snit_info(excepttypemethods) $methodTail] == -1} {
+            set key $starredMethod
+        } else {
+            # WHD: The method is explicitly not delegated, so this is an error.
+            # Or should we treat it as an instance name?
+            return [list ]
+        }
+    } elseif {[llength $fullMethod] > 1} {
+	return [list ]
+    } elseif {$Snit_info(hasinstances)} {
+        # Assume the unknown name is an instance name to create, unless
+        # this is a widget and the style of the name is wrong, or the
+        # name mimics a standard typemethod.
+
+        if {[set ${type}::Snit_info(isWidget)] && 
+            ![string match ".*" $method]} {
+            return [list ]
+        }
+
+        # Without this check, the call "$type info" will redefine the
+        # standard "::info" command, with disastrous results.  Since it's
+        # a likely thing to do if !-typeinfo, put in an explicit check.
+        if {$method eq "info" || $method eq "destroy"} {
+            return [list ]
+        }
+
+        set implicitCreate 1
+        set instanceName $method
+        set key create
+        set method create
+    } else {
+        return [list ]
+    }
+    
+    foreach {flag pattern compName} $Snit_typemethodInfo($key) {}
+
+    if {$flag == 1} {
+        # FIRST, define the ensemble command.
+        lappend eId $method
+
+        set newCmd ${type}::Snit_ten[llength $eId]_[join $eId _]
+
+        set unknownCmd [list ::snit::RT.UnknownTypemethod \
+                            $type $eId]
+
+        set createCmd [list namespace ensemble create \
+                           -command $newCmd \
+                           -unknown $unknownCmd \
+                           -prefixes 0]
+
+        namespace eval $type $createCmd
+        
+        # NEXT, add the method to the current ensemble
+        set map [namespace ensemble configure $eCmd -map]
+
+        dict append map $method $newCmd
+
+        namespace ensemble configure $eCmd -map $map
+
+        return [list ]
+    }
+
+    # NEXT, build the substitution list
+    set subList [list \
+                     %% % \
+                     %t $type \
+                     %M $fullMethod \
+                     %m [lindex $fullMethod end] \
+                     %j [join $fullMethod _]]
+    
+    if {$compName ne ""} {
+        if {![info exists Snit_typecomponents($compName)]} {
+            error "$type delegates typemethod \"$method\" to undefined typecomponent \"$compName\""
+        }
+        
+        lappend subList %c [list $Snit_typecomponents($compName)]
+    }
+
+    set command {}
+
+    foreach subpattern $pattern {
+        lappend command [string map $subList $subpattern]
+    }
+
+    if {$implicitCreate} {
+        # In this case, $method is the name of the instance to
+        # create.  Don't cache, as we usually won't do this one
+        # again.
+        lappend command $instanceName
+        return $command
+    }
+
+
+    # NEXT, if the actual command name isn't fully qualified,
+    # assume it's global.
+    set cmd [lindex $command 0]
+
+    if {[string index $cmd 0] ne ":"} {
+        set command [lreplace $command 0 0 "::$cmd"]
+    }
+
+    # NEXT, update the ensemble map.
+    set map [namespace ensemble configure $eCmd -map]
+
+    dict append map $method $command
+
+    namespace ensemble configure $eCmd -map $map
+
+    return [list ]
+}
+
+#-----------------------------------------------------------------------
+# Component Management and Method Caching
+
+# Retrieves the object name given the component name.
+proc ::snit::RT.Component {type selfns name} {
+    variable ${selfns}::Snit_components
+
+    if {[catch {set Snit_components($name)} result]} {
+        variable ${selfns}::Snit_instance
+
+        error "component \"$name\" is undefined in $type $Snit_instance"
+    }
+    
+    return $result
+}
+
+# Component trace; used for write trace on component instance 
+# variables.  Saves the new component object name, provided 
+# that certain conditions are met.  Also clears the method
+# cache.
+
+proc ::snit::RT.ComponentTrace {type selfns component n1 n2 op} {
+    namespace upvar $type Snit_info Snit_info
+    namespace upvar $selfns \
+        $component      cvar            \
+        Snit_components Snit_components
+        
+    # If they try to redefine the hull component after
+    # it's been defined, that's an error--but only if
+    # this is a widget or widget adaptor.
+    if {"hull" == $component && 
+        $Snit_info(isWidget) &&
+        [info exists Snit_components($component)]} {
+        set cvar $Snit_components($component)
+        error "The hull component cannot be redefined"
+    }
+
+    # Save the new component value.
+    set Snit_components($component) $cvar
+
+    # Clear the instance caches.
+    # TBD: can we unset just the elements related to
+    # this component?
+    RT.ClearInstanceCaches $selfns
+}
+
+# WHD: Snit 2.0 code
+#
+# RT.UnknownMethod type selfns win eId eCmd method args
+#
+# type       The type or widget command.
+# selfns     The instance namespace.
+# win        The original instance name.
+# eId        The ensemble command ID; "" for the instance itself.
+# eCmd       The real ensemble command name
+# method     The unknown method name
+# args       The additional arguments, if any.
+#
+# This proc looks up the method relative to the specific ensemble.
+# If no method is found, it returns an empty list; this will result in
+# the parent ensemble throwing an error.
+# If the method is found, the ensemble's -map is extended with the 
+# correct command, and the empty list is returned; this caches the
+# method's command.  If the method is found, and it is also an
+# ensemble, the ensemble command is created with an empty map.
+
+proc ::snit::RT.UnknownMethod {type selfns win eId eCmd method args} {
+    variable ${type}::Snit_info
+    variable ${type}::Snit_methodInfo
+    variable ${type}::Snit_typecomponents
+    variable ${selfns}::Snit_components
+
+    # FIRST, get the "self" value
+    set self [set ${selfns}::Snit_instance]
+
+    # FIRST, get the pattern data and the component name.
+    set fullMethod $eId
+    lappend fullMethod $method
+    set starredMethod [concat $eId *]
+    set methodTail $method
+
+    if {[info exists Snit_methodInfo($fullMethod)]} {
+        set key $fullMethod
+    } elseif {[info exists Snit_methodInfo($starredMethod)] &&
+              [lsearch -exact $Snit_info(exceptmethods) $methodTail] == -1} {
+        set key $starredMethod
+    } else {
+        return [list ]
+    }
+
+    foreach {flag pattern compName} $Snit_methodInfo($key) {}
+
+    if {$flag == 1} {
+        # FIRST, define the ensemble command.
+        lappend eId $method
+
+        # Fix provided by Anton Kovalenko; previously this call erroneously
+        # used ${type} rather than ${selfns}.
+        set newCmd ${selfns}::Snit_en[llength $eId]_[join $eId _]
+
+        set unknownCmd [list ::snit::RT.UnknownMethod \
+                            $type $selfns $win $eId]
+
+        set createCmd [list namespace ensemble create \
+                           -command $newCmd \
+                           -unknown $unknownCmd \
+                           -prefixes 0]
+
+        namespace eval $selfns $createCmd
+        
+        # NEXT, add the method to the current ensemble
+        set map [namespace ensemble configure $eCmd -map]
+
+        dict append map $method $newCmd
+
+        namespace ensemble configure $eCmd -map $map
+
+        return [list ]
+    }
+
+    # NEXT, build the substitution list
+    set subList [list \
+                     %% % \
+                     %t $type \
+                     %M $fullMethod \
+                     %m [lindex $fullMethod end] \
+                     %j [join $fullMethod _] \
+                     %n [list $selfns] \
+                     %w [list $win] \
+                     %s [list $self]]
+
+    if {$compName ne ""} {
+        if {[info exists Snit_components($compName)]} {
+            set compCmd $Snit_components($compName)
+        } elseif {[info exists Snit_typecomponents($compName)]} {
+            set compCmd $Snit_typecomponents($compName)
+        } else {
+            error "$type $self delegates method \"$fullMethod\" to undefined component \"$compName\""
+        }
+
+        lappend subList %c [list $compCmd]
+    }
+
+    # Note: The cached command will execute faster if it's
+    # already a list.
+    set command {}
+
+    foreach subpattern $pattern {
+        lappend command [string map $subList $subpattern]
+    }
+
+    # NEXT, if the actual command name isn't fully qualified,
+    # assume it's global.
+
+    set cmd [lindex $command 0]
+
+    if {[string index $cmd 0] ne ":"} {
+        set command [lreplace $command 0 0 "::$cmd"]
+    }
+
+    # NEXT, update the ensemble map.
+    set map [namespace ensemble configure $eCmd -map]
+
+    dict append map $method $command
+
+    namespace ensemble configure $eCmd -map $map
+
+    return [list ]
+}
+
+# Clears all instance command caches
+proc ::snit::RT.ClearInstanceCaches {selfns} {
+    # WHD: clear ensemble -map
+    if {![info exists ${selfns}::Snit_instance]} {
+        # Component variable set prior to constructor
+        # via the "variable" type definition statement.
+        return
+    }
+    set self [set ${selfns}::Snit_instance]
+    namespace ensemble configure $self -map {}
+
+    unset -nocomplain -- ${selfns}::Snit_cgetCache
+    unset -nocomplain -- ${selfns}::Snit_configureCache
+    unset -nocomplain -- ${selfns}::Snit_validateCache
+}
+
+
+#-----------------------------------------------------------------------
+# Component Installation
+
+# Implements %TYPE%::installhull.  The variables self and selfns
+# must be defined in the caller's context.
+#
+# Installs the named widget as the hull of a 
+# widgetadaptor.  Once the widget is hijacked, its new name
+# is assigned to the hull component.
+
+proc ::snit::RT.installhull {type {using "using"} {widgetType ""} args} {
+    variable ${type}::Snit_info
+    variable ${type}::Snit_optionInfo
+    upvar 1 self self
+    upvar 1 selfns selfns
+    namespace upvar $selfns \
+        hull    hull        \
+        options options
+
+    # FIRST, make sure we can do it.
+    if {!$Snit_info(isWidget)} { 
+        error "installhull is valid only for snit::widgetadaptors"
+    }
+            
+    if {[info exists ${selfns}::Snit_instance]} {
+        error "hull already installed for $type $self"
+    }
+
+    # NEXT, has it been created yet?  If not, create it using
+    # the specified arguments.
+    if {"using" == $using} {
+        # FIRST, create the widget
+        set cmd [linsert $args 0 $widgetType $self]
+        set obj [uplevel 1 $cmd]
+            
+        # NEXT, for each option explicitly delegated to the hull
+        # that doesn't appear in the usedOpts list, get the
+        # option database value and apply it--provided that the
+        # real option name and the target option name are different.
+        # (If they are the same, then the option database was
+        # already queried as part of the normal widget creation.)
+        #
+        # Also, we don't need to worry about implicitly delegated
+        # options, as the option and target option names must be
+        # the same.
+        if {[info exists Snit_optionInfo(delegated-hull)]} {
+                
+            # FIRST, extract all option names from args
+            set usedOpts {}
+            set ndx [lsearch -glob $args "-*"]
+            foreach {opt val} [lrange $args $ndx end] {
+                lappend usedOpts $opt
+            }
+                
+            foreach opt $Snit_optionInfo(delegated-hull) {
+                set target [lindex $Snit_optionInfo(target-$opt) 1]
+                
+                if {"$target" == $opt} {
+                    continue
+                }
+                    
+                set result [lsearch -exact $usedOpts $target]
+                    
+                if {$result != -1} {
+                    continue
+                }
+
+                set dbval [RT.OptionDbGet $type $self $opt]
+                $obj configure $target $dbval
+            }
+        }
+    } else {
+        set obj $using
+        
+        if {$obj ne $self} {
+            error \
+                "hull name mismatch: \"$obj\" != \"$self\""
+        }
+    }
+
+    # NEXT, get the local option defaults.
+    foreach opt $Snit_optionInfo(local) {
+        set dbval [RT.OptionDbGet $type $self $opt]
+            
+        if {"" != $dbval} {
+            set options($opt) $dbval
+        }
+    }
+
+
+    # NEXT, do the magic
+    set i 0
+    while 1 {
+        incr i
+        set newName "::hull${i}$self"
+        if {![llength [info commands $newName]]} {
+            break
+        }
+    }
+        
+    rename ::$self $newName
+    RT.MakeInstanceCommand $type $selfns $self
+        
+    # Note: this relies on RT.ComponentTrace to do the dirty work.
+    set hull $newName
+        
+    return
+}
+
+# Implements %TYPE%::install.
+#
+# Creates a widget and installs it as the named component.
+# It expects self and selfns to be defined in the caller's context.
+
+proc ::snit::RT.install {type compName "using" widgetType winPath args} {
+    variable ${type}::Snit_optionInfo
+    variable ${type}::Snit_info
+    upvar 1 self   self
+    upvar 1 selfns selfns
+
+    namespace upvar ${selfns} \
+        $compName comp        \
+        hull      hull
+
+    # We do the magic option database stuff only if $self is
+    # a widget.
+    if {$Snit_info(isWidget)} {
+        if {"" == $hull} {
+            error "tried to install \"$compName\" before the hull exists"
+        }
+            
+        # FIRST, query the option database and save the results 
+        # into args.  Insert them before the first option in the
+        # list, in case there are any non-standard parameters.
+        #
+        # Note: there might not be any delegated options; if so,
+        # don't bother.
+
+        if {[info exists Snit_optionInfo(delegated-$compName)]} {
+            set ndx [lsearch -glob $args "-*"]
+                
+            foreach opt $Snit_optionInfo(delegated-$compName) {
+                set dbval [RT.OptionDbGet $type $self $opt]
+                    
+                if {"" != $dbval} {
+                    set target [lindex $Snit_optionInfo(target-$opt) 1]
+                    set args [linsert $args $ndx $target $dbval]
+                }
+            }
+        }
+    }
+             
+    # NEXT, create the component and save it.
+    set cmd [concat [list $widgetType $winPath] $args]
+    set comp [uplevel 1 $cmd]
+
+    # NEXT, handle the option database for "delegate option *",
+    # in widgets only.
+    if {$Snit_info(isWidget) && $Snit_optionInfo(starcomp) eq $compName} {
+        # FIRST, get the list of option specs from the widget.
+        # If configure doesn't work, skip it.
+        if {[catch {$comp configure} specs]} {
+            return
+        }
+
+        # NEXT, get the set of explicitly used options from args
+        set usedOpts {}
+        set ndx [lsearch -glob $args "-*"]
+        foreach {opt val} [lrange $args $ndx end] {
+            lappend usedOpts $opt
+        }
+
+        # NEXT, "delegate option *" matches all options defined
+        # by this widget that aren't defined by the widget as a whole,
+        # and that aren't excepted.  Plus, we skip usedOpts.  So build 
+        # a list of the options it can't match.
+        set skiplist [concat \
+                          $usedOpts \
+                          $Snit_optionInfo(except) \
+                          $Snit_optionInfo(local) \
+                          $Snit_optionInfo(delegated)]
+        
+        # NEXT, loop over all of the component's options, and set
+        # any not in the skip list for which there is an option 
+        # database value.
+        foreach spec $specs {
+            # Skip aliases
+            if {[llength $spec] != 5} {
+                continue
+            }
+
+            set opt [lindex $spec 0]
+
+            if {[lsearch -exact $skiplist $opt] != -1} {
+                continue
+            }
+
+            set res [lindex $spec 1]
+            set cls [lindex $spec 2]
+
+            set dbvalue [option get $self $res $cls]
+
+            if {"" != $dbvalue} {
+                $comp configure $opt $dbvalue
+            }
+        }
+    }
+
+    return
+}
+
+
+#-----------------------------------------------------------------------
+# Method/Variable Name Qualification
+
+# Implements %TYPE%::variable.  Requires selfns.
+proc ::snit::RT.variable {varname} {
+    upvar 1 selfns selfns
+
+    if {![string match "::*" $varname]} {
+        uplevel 1 [list upvar 1 ${selfns}::$varname $varname]
+    } else {
+        # varname is fully qualified; let the standard
+        # "variable" command handle it.
+        uplevel 1 [list ::variable $varname]
+    }
+}
+
+# Fully qualifies a typevariable name.
+#
+# This is used to implement the mytypevar command.
+
+proc ::snit::RT.mytypevar {type name} {
+    return ${type}::$name
+}
+
+# Fully qualifies an instance variable name.
+#
+# This is used to implement the myvar command.
+proc ::snit::RT.myvar {name} {
+    upvar 1 selfns selfns
+    return ${selfns}::$name
+}
+
+# Use this like "list" to convert a proc call into a command
+# string to pass to another object (e.g., as a -command).
+# Qualifies the proc name properly.
+#
+# This is used to implement the "myproc" command.
+
+proc ::snit::RT.myproc {type procname args} {
+    set procname "${type}::$procname"
+    return [linsert $args 0 $procname]
+}
+
+# DEPRECATED
+proc ::snit::RT.codename {type name} {
+    return "${type}::$name"
+}
+
+# Use this like "list" to convert a typemethod call into a command
+# string to pass to another object (e.g., as a -command).
+# Inserts the type command at the beginning.
+#
+# This is used to implement the "mytypemethod" command.
+
+proc ::snit::RT.mytypemethod {type args} {
+    return [linsert $args 0 $type]
+}
+
+# Use this like "list" to convert a method call into a command
+# string to pass to another object (e.g., as a -command).
+# Inserts the code at the beginning to call the right object, even if
+# the object's name has changed.  Requires that selfns be defined
+# in the calling context, eg. can only be called in instance
+# code.
+#
+# This is used to implement the "mymethod" command.
+
+proc ::snit::RT.mymethod {args} {
+    upvar 1 selfns selfns
+    return [linsert $args 0 ::snit::RT.CallInstance ${selfns}]
+}
+
+# Calls an instance method for an object given its
+# instance namespace and remaining arguments (the first of which
+# will be the method name.
+#
+# selfns		The instance namespace
+# args			The arguments
+#
+# Uses the selfns to determine $self, and calls the method
+# in the normal way.
+#
+# This is used to implement the "mymethod" command.
+
+proc ::snit::RT.CallInstance {selfns args} {
+    namespace upvar $selfns Snit_instance self
+
+    set retval [catch {uplevel 1 [linsert $args 0 $self]} result]
+
+    if {$retval} {
+        if {$retval == 1} {
+            global errorInfo
+            global errorCode
+            return -code error -errorinfo $errorInfo \
+                -errorcode $errorCode $result
+        } else {
+            return -code $retval $result
+        }
+    }
+
+    return $result
+}
+
+# Looks for the named option in the named variable.  If found,
+# it and its value are removed from the list, and the value
+# is returned.  Otherwise, the default value is returned.
+# If the option is undelegated, it's own default value will be
+# used if none is specified.
+#
+# Implements the "from" command.
+
+proc ::snit::RT.from {type argvName option {defvalue ""}} {
+    namespace upvar $type Snit_optionInfo Snit_optionInfo
+    upvar $argvName argv
+
+    set ioption [lsearch -exact $argv $option]
+
+    if {$ioption == -1} {
+        if {"" == $defvalue &&
+            [info exists Snit_optionInfo(default-$option)]} {
+            return $Snit_optionInfo(default-$option)
+        } else {
+            return $defvalue
+        }
+    }
+
+    set ivalue [expr {$ioption + 1}]
+    set value [lindex $argv $ivalue]
+    
+    set argv [lreplace $argv $ioption $ivalue] 
+
+    return $value
+}
+
+#-----------------------------------------------------------------------
+# Type Destruction
+
+# Implements the standard "destroy" typemethod:
+# Destroys a type completely.
+#
+# type		The snit type
+
+proc ::snit::RT.typemethod.destroy {type} {
+    variable ${type}::Snit_info
+        
+    # FIRST, destroy all instances
+    foreach selfns [namespace children $type "${type}::Snit_inst*"] {
+        if {![namespace exists $selfns]} {
+            continue
+        }
+
+        namespace upvar $selfns Snit_instance obj
+            
+        if {$Snit_info(isWidget)} {
+            destroy $obj
+        } else {
+            if {[llength [info commands $obj]]} {
+                $obj destroy
+            }
+        }
+    }
+
+    # NEXT, get rid of the type command.
+    rename $type ""
+
+    # NEXT, destroy the type's data.
+    namespace delete $type
+}
+
+
+
+#-----------------------------------------------------------------------
+# Option Handling
+
+# Implements the standard "cget" method
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# option        The name of the option
+
+proc ::snit::RT.method.cget {type selfns win self option} {
+    if {[catch {set ${selfns}::Snit_cgetCache($option)} command]} {
+        set command [snit::RT.CacheCgetCommand $type $selfns $win $self $option]
+        
+        if {[llength $command] == 0} {
+            return -code error "unknown option \"$option\""
+        }
+    }
+            
+    uplevel 1 $command
+}
+
+# Retrieves and caches the command that implements "cget" for the 
+# specified option.
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# option        The name of the option
+
+proc ::snit::RT.CacheCgetCommand {type selfns win self option} {
+    variable ${type}::Snit_optionInfo
+    variable ${selfns}::Snit_cgetCache
+                
+    if {[info exists Snit_optionInfo(islocal-$option)]} {
+        # We know the item; it's either local, or explicitly delegated.
+        if {$Snit_optionInfo(islocal-$option)} {
+            # It's a local option.  If it has a cget method defined,
+            # use it; otherwise just return the value.
+
+            if {$Snit_optionInfo(cget-$option) eq ""} {
+                set command [list set ${selfns}::options($option)]
+            } else {
+                # WHD: Snit 2.0 code -- simpler, no slower.
+                set command [list \
+                                 $self \
+                                 {*}$Snit_optionInfo(cget-$option) \
+                                 $option]
+            }
+
+            set Snit_cgetCache($option) $command
+            return $command
+        }
+         
+        # Explicitly delegated option; get target
+        set comp [lindex $Snit_optionInfo(target-$option) 0]
+        set target [lindex $Snit_optionInfo(target-$option) 1]
+    } elseif {$Snit_optionInfo(starcomp) ne "" &&
+              [lsearch -exact $Snit_optionInfo(except) $option] == -1} {
+        # Unknown option, but unknowns are delegated; get target.
+        set comp $Snit_optionInfo(starcomp)
+        set target $option
+    } else {
+        return ""
+    }
+    
+    # Get the component's object.
+    set obj [RT.Component $type $selfns $comp]
+
+    set command [list $obj cget $target]
+    set Snit_cgetCache($option) $command
+
+    return $command
+}
+
+# Implements the standard "configurelist" method
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# optionlist    A list of options and their values.
+
+proc ::snit::RT.method.configurelist {type selfns win self optionlist} {
+    variable ${type}::Snit_optionInfo
+
+    foreach {option value} $optionlist {
+        # FIRST, get the configure command, caching it if need be.
+        if {[catch {set ${selfns}::Snit_configureCache($option)} command]} {
+            set command [snit::RT.CacheConfigureCommand \
+                             $type $selfns $win $self $option]
+
+            if {[llength $command] == 0} {
+                return -code error "unknown option \"$option\""
+            }
+        }
+
+        # NEXT, if we have a type-validation object, use it.
+        # TBD: Should test (islocal-$option) here, but islocal
+        # isn't defined for implicitly delegated options.
+        if {[info exists Snit_optionInfo(typeobj-$option)]
+            && $Snit_optionInfo(typeobj-$option) ne ""} {
+            if {[catch {
+                $Snit_optionInfo(typeobj-$option) validate $value
+            } result]} {
+                return -code error "invalid $option value: $result"
+            }
+        }
+
+        # NEXT, the caching the configure command also cached the
+        # validate command, if any.  If we have one, run it.
+        set valcommand [set ${selfns}::Snit_validateCache($option)]
+
+        if {[llength $valcommand]} {
+            lappend valcommand $value
+            uplevel 1 $valcommand
+        }
+
+        # NEXT, configure the option with the value.
+        lappend command $value
+        uplevel 1 $command
+    }
+    
+    return
+}
+
+# Retrieves and caches the command that stores the named option.
+# Also stores the command that validates the name option if any;
+# If none, the validate command is "", so that the cache is always
+# populated.
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# option        An option name
+
+proc ::snit::RT.CacheConfigureCommand {type selfns win self option} {
+    variable ${type}::Snit_optionInfo
+    variable ${selfns}::Snit_configureCache
+    variable ${selfns}::Snit_validateCache
+
+    if {[info exist Snit_optionInfo(islocal-$option)]} {
+        # We know the item; it's either local, or explicitly delegated.
+        
+        if {$Snit_optionInfo(islocal-$option)} {
+            # It's a local option.
+
+            # If it's readonly, it throws an error if we're already 
+            # constructed.
+            if {$Snit_optionInfo(readonly-$option)} {
+                if {[set ${selfns}::Snit_iinfo(constructed)]} {
+                    error "option $option can only be set at instance creation"
+                }
+            }
+
+            # If it has a validate method, cache that for later.
+            if {$Snit_optionInfo(validate-$option) ne ""} {
+                # WHD: Snit 2.0 code -- simpler, no slower.
+                set command [list \
+                                 $self \
+                                 {*}$Snit_optionInfo(validate-$option) \
+                                 $option]
+
+                set Snit_validateCache($option) $command
+            } else {
+                set Snit_validateCache($option) ""
+            }
+            
+            # If it has a configure method defined,
+            # cache it; otherwise, just set the value.
+            if {$Snit_optionInfo(configure-$option) eq ""} {
+                set command [list set ${selfns}::options($option)]
+            } else {
+                # WHD: Snit 2.0 code -- simpler, no slower.
+                set command [list \
+                                 $self \
+                                 {*}$Snit_optionInfo(configure-$option) \
+                                 $option]
+            }
+
+            set Snit_configureCache($option) $command
+            return $command
+        }
+
+        # Delegated option: get target.
+        set comp [lindex $Snit_optionInfo(target-$option) 0]
+        set target [lindex $Snit_optionInfo(target-$option) 1]
+    } elseif {$Snit_optionInfo(starcomp) != "" &&
+              [lsearch -exact $Snit_optionInfo(except) $option] == -1} {
+        # Unknown option, but unknowns are delegated.
+        set comp $Snit_optionInfo(starcomp)
+        set target $option
+    } else {
+        return ""
+    }
+
+    # There is no validate command in this case; save an empty string.
+    set Snit_validateCache($option) ""
+        
+    # Get the component's object
+    set obj [RT.Component $type $selfns $comp]
+    
+    set command [list $obj configure $target]
+    set Snit_configureCache($option) $command
+
+    return $command
+}
+
+# Implements the standard "configure" method
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# args          A list of options and their values, possibly empty.
+
+proc ::snit::RT.method.configure {type selfns win self args} {
+    # If two or more arguments, set values as usual.
+    if {[llength $args] >= 2} {
+        ::snit::RT.method.configurelist $type $selfns $win $self $args
+        return
+    }
+
+    # If zero arguments, acquire data for each known option
+    # and return the list
+    if {[llength $args] == 0} {
+        set result {}
+        foreach opt [RT.method.info.options $type $selfns $win $self] {
+            # Refactor this, so that we don't need to call via $self.
+            lappend result [RT.GetOptionDbSpec \
+                                $type $selfns $win $self $opt]
+        }
+        
+        return $result
+    }
+
+    # They want it for just one.
+    set opt [lindex $args 0]
+
+    return [RT.GetOptionDbSpec $type $selfns $win $self $opt]
+}
+
+
+# Retrieves the option database spec for a single option.
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# option        The name of an option
+#
+# TBD: This is a bad name.  What it's returning is the
+# result of the configure query.
+
+proc ::snit::RT.GetOptionDbSpec {type selfns win self opt} {
+    variable ${type}::Snit_optionInfo
+
+    namespace upvar $selfns \
+        Snit_components Snit_components \
+        options         options
+    
+    if {[info exists options($opt)]} {
+        # This is a locally-defined option.  Just build the
+        # list and return it.
+        set res $Snit_optionInfo(resource-$opt)
+        set cls $Snit_optionInfo(class-$opt)
+        set def $Snit_optionInfo(default-$opt)
+
+        return [list $opt $res $cls $def \
+                    [RT.method.cget $type $selfns $win $self $opt]]
+    } elseif {[info exists Snit_optionInfo(target-$opt)]} {
+        # This is an explicitly delegated option.  The only
+        # thing we don't have is the default.
+        set res $Snit_optionInfo(resource-$opt)
+        set cls $Snit_optionInfo(class-$opt)
+        
+        # Get the default
+        set logicalName [lindex $Snit_optionInfo(target-$opt) 0]
+        set comp $Snit_components($logicalName)
+        set target [lindex $Snit_optionInfo(target-$opt) 1]
+
+        if {[catch {$comp configure $target} result]} {
+            set defValue {}
+        } else {
+            set defValue [lindex $result 3]
+        }
+
+        return [list $opt $res $cls $defValue [$self cget $opt]]
+    } elseif {$Snit_optionInfo(starcomp) ne "" &&
+              [lsearch -exact $Snit_optionInfo(except) $opt] == -1} {
+        set logicalName $Snit_optionInfo(starcomp)
+        set target $opt
+        set comp $Snit_components($logicalName)
+
+        if {[catch {set value [$comp cget $target]} result]} {
+            error "unknown option \"$opt\""
+        }
+
+        if {![catch {$comp configure $target} result]} {
+            # Replace the delegated option name with the local name.
+            return [::snit::Expand $result $target $opt]
+        }
+
+        # configure didn't work; return simple form.
+        return [list $opt "" "" "" $value]
+    } else {
+        error "unknown option \"$opt\""
+    }
+}
+
+#-----------------------------------------------------------------------
+# Type Introspection
+
+# Implements the standard "info" typemethod.
+#
+# type		The snit type
+# command       The info subcommand
+# args          All other arguments.
+
+proc ::snit::RT.typemethod.info {type command args} {
+    global errorInfo
+    global errorCode
+
+    switch -exact $command {
+	args        -
+	body        -
+	default     -
+        typevars    -
+        typemethods -
+        instances {
+            # TBD: it should be possible to delete this error
+            # handling.
+            set errflag [catch {
+                uplevel 1 [linsert $args 0 \
+			       ::snit::RT.typemethod.info.$command $type]
+            } result]
+
+            if {$errflag} {
+                return -code error -errorinfo $errorInfo \
+                    -errorcode $errorCode $result
+            } else {
+                return $result
+            }
+        }
+        default {
+            error "\"$type info $command\" is not defined"
+        }
+    }
+}
+
+
+# Returns a list of the type's typevariables whose names match a 
+# pattern, excluding Snit internal variables.
+#
+# type		A Snit type
+# pattern       Optional.  The glob pattern to match.  Defaults
+#               to *.
+
+proc ::snit::RT.typemethod.info.typevars {type {pattern *}} {
+    set result {}
+    foreach name [info vars "${type}::$pattern"] {
+        set tail [namespace tail $name]
+        if {![string match "Snit_*" $tail]} {
+            lappend result $name
+        }
+    }
+    
+    return $result
+}
+
+# Returns a list of the type's methods whose names match a 
+# pattern.  If "delegate typemethod *" is used, the list may
+# not be complete.
+#
+# type		A Snit type
+# pattern       Optional.  The glob pattern to match.  Defaults
+#               to *.
+
+proc ::snit::RT.typemethod.info.typemethods {type {pattern *}} {
+    variable ${type}::Snit_typemethodInfo
+
+    # FIRST, get the explicit names, skipping prefixes.
+    set result {}
+
+    foreach name [array names Snit_typemethodInfo -glob $pattern] {
+        if {[lindex $Snit_typemethodInfo($name) 0] != 1} {
+            lappend result $name
+        }
+    }
+
+    # NEXT, add any from the cache that aren't explicit.
+    # WHD: fixed up to use newstyle method cache/list of subcommands.
+    if {[info exists Snit_typemethodInfo(*)]} {
+        # First, remove "*" from the list.
+        set ndx [lsearch -exact $result "*"]
+        if {$ndx != -1} {
+            set result [lreplace $result $ndx $ndx]
+        }
+
+        # Next, get the type's -map
+        array set typemethodCache [namespace ensemble configure $type -map]
+
+        # Next, get matching names from the cache that we don't already
+        # know about.
+        foreach name [array names typemethodCache -glob $pattern] {
+            if {[lsearch -exact $result $name] == -1} {
+                lappend result $name
+            }
+        }
+    }
+
+    return $result
+}
+
+# $type info args
+#
+# Returns a method's list of arguments. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.typemethod.info.args {type method} {
+    upvar ${type}::Snit_typemethodInfo  Snit_typemethodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_typemethodInfo
+
+    if {![info exists Snit_typemethodInfo($method)]} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    foreach {flag cmd component} $Snit_typemethodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated typemethod \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [lrange [::info args $theproc] 1 end]
+}
+
+# $type info body
+#
+# Returns a method's body. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.typemethod.info.body {type method} {
+    upvar ${type}::Snit_typemethodInfo  Snit_typemethodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_typemethodInfo
+
+    if {![info exists Snit_typemethodInfo($method)]} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    foreach {flag cmd component} $Snit_typemethodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated typemethod \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [RT.body [::info body $theproc]]
+}
+
+# $type info default
+#
+# Returns a method's list of arguments. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.typemethod.info.default {type method aname dvar} {
+    upvar 1 $dvar def
+    upvar ${type}::Snit_typemethodInfo  Snit_typemethodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_methodInfo
+
+    if {![info exists Snit_typemethodInfo($method)]} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    foreach {flag cmd component} $Snit_typemethodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown typemethod \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated typemethod \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [::info default $theproc $aname def]
+}
+
+# Returns a list of the type's instances whose names match
+# a pattern.
+#
+# type		A Snit type
+# pattern       Optional.  The glob pattern to match
+#               Defaults to *
+#
+# REQUIRE: type is fully qualified.
+
+proc ::snit::RT.typemethod.info.instances {type {pattern *}} {
+    set result {}
+
+    foreach selfns [namespace children $type "${type}::Snit_inst*"] {
+        namespace upvar $selfns Snit_instance instance
+
+        if {[string match $pattern $instance]} {
+            lappend result $instance
+        }
+    }
+
+    return $result
+}
+
+#-----------------------------------------------------------------------
+# Instance Introspection
+
+# Implements the standard "info" method.
+#
+# type		The snit type
+# selfns        The instance's instance namespace
+# win           The instance's original name
+# self          The instance's current name
+# command       The info subcommand
+# args          All other arguments.
+
+proc ::snit::RT.method.info {type selfns win self command args} {
+    switch -exact $command {
+	args        -
+	body        -
+	default     -
+        type        -
+        vars        -
+        options     -
+        methods     -
+        typevars    -
+        typemethods {
+            set errflag [catch {
+                uplevel 1 [linsert $args 0 ::snit::RT.method.info.$command \
+			       $type $selfns $win $self]
+            } result]
+
+            if {$errflag} {
+                global errorInfo
+                return -code error -errorinfo $errorInfo $result
+            } else {
+                return $result
+            }
+        }
+        default {
+            # error "\"$self info $command\" is not defined"
+            return -code error "\"$self info $command\" is not defined"
+        }
+    }
+}
+
+# $self info type
+#
+# Returns the instance's type
+proc ::snit::RT.method.info.type {type selfns win self} {
+    return $type
+}
+
+# $self info typevars
+#
+# Returns the instance's type's typevariables
+proc ::snit::RT.method.info.typevars {type selfns win self {pattern *}} {
+    return [RT.typemethod.info.typevars $type $pattern]
+}
+
+# $self info typemethods
+#
+# Returns the instance's type's typemethods
+proc ::snit::RT.method.info.typemethods {type selfns win self {pattern *}} {
+    return [RT.typemethod.info.typemethods $type $pattern]
+}
+
+# Returns a list of the instance's methods whose names match a 
+# pattern.  If "delegate method *" is used, the list may
+# not be complete.
+#
+# type		A Snit type
+# selfns        The instance namespace
+# win		The original instance name
+# self          The current instance name
+# pattern       Optional.  The glob pattern to match.  Defaults
+#               to *.
+
+proc ::snit::RT.method.info.methods {type selfns win self {pattern *}} {
+    variable ${type}::Snit_methodInfo
+
+    # FIRST, get the explicit names, skipping prefixes.
+    set result {}
+
+    foreach name [array names Snit_methodInfo -glob $pattern] {
+        if {[lindex $Snit_methodInfo($name) 0] != 1} {
+            lappend result $name
+        }
+    }
+
+    # NEXT, add any from the cache that aren't explicit.
+    # WHD: Fixed up to use newstyle method cache/list of subcommands.
+    if {[info exists Snit_methodInfo(*)]} {
+        # First, remove "*" from the list.
+        set ndx [lsearch -exact $result "*"]
+        if {$ndx != -1} {
+            set result [lreplace $result $ndx $ndx]
+        }
+
+        # Next, get the instance's -map
+        set self [set ${selfns}::Snit_instance]
+
+        array set methodCache [namespace ensemble configure $self -map]
+
+        # Next, get matching names from the cache that we don't already
+        # know about.
+        foreach name [array names methodCache -glob $pattern] {
+            if {[lsearch -exact $result $name] == -1} {
+                lappend result $name
+            }
+        }
+    }
+
+    return $result
+}
+
+# $self info args
+#
+# Returns a method's list of arguments. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.method.info.args {type selfns win self method} {
+
+    upvar ${type}::Snit_methodInfo  Snit_methodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_methodInfo
+
+    if {![info exists Snit_methodInfo($method)]} {
+	return -code error "Unknown method \"$method\""
+    }
+    foreach {flag cmd component} $Snit_methodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown method \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated method \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type %n $selfns %w $win %s $self]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [lrange [::info args $theproc] 4 end]
+}
+
+# $self info body
+#
+# Returns a method's body. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.method.info.body {type selfns win self method} {
+
+    upvar ${type}::Snit_methodInfo  Snit_methodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    #parray Snit_methodInfo
+
+    if {![info exists Snit_methodInfo($method)]} {
+	return -code error "Unknown method \"$method\""
+    }
+    foreach {flag cmd component} $Snit_methodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown method \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated method \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type %n $selfns %w $win %s $self]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [RT.body [::info body $theproc]]
+}
+
+# $self info default
+#
+# Returns a method's list of arguments. does not work for delegated
+# methods, nor for the internal dispatch methods of multi-word
+# methods.
+
+proc ::snit::RT.method.info.default {type selfns win self method aname dvar} {
+    upvar 1 $dvar def
+    upvar ${type}::Snit_methodInfo  Snit_methodInfo
+
+    # Snit_methodInfo: method -> list (flag cmd component)
+
+    # flag      : 1 -> internal dispatcher for multi-word method.
+    #             0 -> regular method
+    #
+    # cmd       : template mapping from method to command prefix, may
+    #             contain placeholders for various pieces of information.
+    #
+    # component : is empty for normal methods.
+
+    if {![info exists Snit_methodInfo($method)]} {
+	return -code error "Unknown method \"$method\""
+    }
+    foreach {flag cmd component} $Snit_methodInfo($method) break
+    if {$flag} {
+	return -code error "Unknown method \"$method\""
+    }
+    if {$component != ""} {
+	return -code error "Delegated method \"$method\""
+    }
+
+    set map     [list %m $method %j [join $method _] %t $type %n $selfns %w $win %s $self]
+    set theproc [lindex [string map $map $cmd] 0]
+    return [::info default $theproc $aname def]
+}
+
+# $self info vars
+#
+# Returns the instance's instance variables
+proc ::snit::RT.method.info.vars {type selfns win self {pattern *}} {
+    set result {}
+    foreach name [info vars "${selfns}::$pattern"] {
+        set tail [namespace tail $name]
+        if {![string match "Snit_*" $tail]} {
+            lappend result $name
+        }
+    }
+
+    return $result
+}
+
+# $self info options 
+#
+# Returns a list of the names of the instance's options
+proc ::snit::RT.method.info.options {type selfns win self {pattern *}} {
+    variable ${type}::Snit_optionInfo
+
+    # First, get the local and explicitly delegated options
+    set result [concat $Snit_optionInfo(local) $Snit_optionInfo(delegated)]
+
+    # If "configure" works as for Tk widgets, add the resulting
+    # options to the list.  Skip excepted options
+    if {$Snit_optionInfo(starcomp) ne ""} {
+        namespace upvar $selfns Snit_components Snit_components
+
+        set logicalName $Snit_optionInfo(starcomp)
+        set comp $Snit_components($logicalName)
+
+        if {![catch {$comp configure} records]} {
+            foreach record $records {
+                set opt [lindex $record 0]
+                if {[lsearch -exact $result $opt] == -1 &&
+                    [lsearch -exact $Snit_optionInfo(except) $opt] == -1} {
+                    lappend result $opt
+                }
+            }
+        }
+    }
+
+    # Next, apply the pattern
+    set names {}
+
+    foreach name $result {
+        if {[string match $pattern $name]} {
+            lappend names $name
+        }
+    }
+
+    return $names
+}
+
+proc ::snit::RT.body {body} {
+    regsub -all ".*# END snit method prolog\n" $body {} body
+    return $body
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/pkgIndex.tcl
new file mode 100644
index 00000000..ff47c611
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/pkgIndex.tcl
@@ -0,0 +1,6 @@
+if {[package vsatisfies [package provide Tcl] 8.5]} {
+    package ifneeded snit 2.3.2 \
+        [list source [file join $dir snit2.tcl]]
+}
+
+package ifneeded snit 1.4.2 [list source [file join $dir snit.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/snit.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/snit.tcl
new file mode 100644
index 00000000..375e51a1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/snit.tcl
@@ -0,0 +1,41 @@
+#-----------------------------------------------------------------------
+# TITLE:
+#	snit.tcl
+#
+# AUTHOR:
+#	Will Duquette
+#
+# DESCRIPTION:
+#       Snit's Not Incr Tcl, a simple object system in Pure Tcl.
+#
+#       Snit 1.x Loader 
+#
+#       Copyright (C) 2003-2006 by William H. Duquette
+#       This code is licensed as described in license.txt.
+#
+#-----------------------------------------------------------------------
+
+package require Tcl 8.3
+
+# Define the snit namespace and save the library directory
+
+namespace eval ::snit:: {
+    set library [file dirname [info script]]
+}
+
+# Select the implementation based on the version of the Tcl core
+# executing this code. For 8.3 we use a backport emulating various
+# 8.4 features
+
+if {[package vsatisfies [package provide Tcl] 8.4]} {
+    source [file join $::snit::library main1.tcl]
+} else {
+    source [file join $::snit::library main1_83.tcl]
+    source [file join $::snit::library snit_tcl83_utils.tcl]
+}
+
+# Load the library of Snit validation types.
+
+source [file join $::snit::library validate.tcl]
+
+package provide snit 1.4.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/snit2.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/snit2.tcl
new file mode 100644
index 00000000..3240d718
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/snit2.tcl
@@ -0,0 +1,32 @@
+#-----------------------------------------------------------------------
+# TITLE:
+#	snit2.tcl
+#
+# AUTHOR:
+#	Will Duquette
+#
+# DESCRIPTION:
+#       Snit's Not Incr Tcl, a simple object system in Pure Tcl.
+#
+#       Snit 2.x Loader
+#
+#       Copyright (C) 2003-2006 by William H. Duquette
+#       This code is licensed as described in license.txt.
+#
+#-----------------------------------------------------------------------
+
+package require Tcl 8.5
+
+# Define the snit namespace and save the library directory
+
+namespace eval ::snit:: {
+    set library [file dirname [info script]]
+}
+
+# Load the kernel.
+source [file join $::snit::library main2.tcl]
+
+# Load the library of Snit validation types.
+source [file join $::snit::library validate.tcl]
+
+package provide snit 2.3.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/snit_tcl83_utils.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/snit_tcl83_utils.tcl
new file mode 100644
index 00000000..9dba59b2
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/snit_tcl83_utils.tcl
@@ -0,0 +1,231 @@
+#--------------------------------------------------------------------------
+# TITLE:
+#	snit_tcl83_utils.tcl
+#
+# AUTHOR:
+#	Kenneth Green, 28 Aug 2004
+#
+# DESCRIPTION:
+#       Utilities to support the back-port of snit from Tcl 8.4 to 8.3
+#
+#--------------------------------------------------------------------------
+# Copyright
+#
+# Copyright (c) 2005 Kenneth Green
+# Modified by Andreas Kupries.
+# All rights reserved. This code is licensed as described in license.txt.
+#--------------------------------------------------------------------------
+# This code is freely distributable, but is provided as-is with
+# no warranty expressed or implied.
+#--------------------------------------------------------------------------
+# Acknowledgements
+#   The changes described in this file are made to the awesome 'snit'
+#   library as provided by William H. Duquette under the terms
+#   defined in the associated 'license.txt'.
+#-----------------------------------------------------------------------
+
+#-----------------------------------------------------------------------
+# Namespace
+
+namespace eval ::snit83 {}
+
+#-----------------------------------------------------------------------
+# Some Snit83 variables
+
+namespace eval ::snit83 {
+    variable  cmdTraceTable
+    array set cmdTraceTable {}
+
+    namespace eval private {}
+}
+
+
+#-----------------------------------------------------------------------
+# Initialisation
+
+#
+# Override Tcl functions so we can mimic some behaviours. This is
+# conditional on not having been done already. Otherwise loading snit
+# twice will fail the second time.
+#
+
+if [info exists tk_version] {
+    if {
+	![llength [info procs destroy]] ||
+	![regexp snit83 [info body destroy]]
+    } {
+	rename destroy __destroy__
+    }
+}
+if {
+    ![llength [info procs namespace]] ||
+    ![regexp snit83 [info body namespace]]
+} {
+    rename namespace __namespace__
+    rename rename    __rename__ ;# must be last one renamed!
+}
+
+#-----------------------------------------------------------------------
+# Global namespace functions
+
+
+# destroy -
+#
+# Perform delete tracing and then invoke the actual Tk destroy command
+
+if [info exists tk_version] {
+    proc destroy { w } {
+	variable ::snit83::cmdTraceTable
+
+	set index "delete,$w"
+	if [info exists cmdTraceTable($index)] {
+	    set cmd $cmdTraceTable($index)
+	    ::unset cmdTraceTable($index) ;# prevent recursive tracing
+	    if [catch {eval $cmd $oldName \"$newName\" delete} err] { ; # "
+		error $err
+	    }
+	}
+
+	return [__destroy__ $w]
+    }
+}
+
+# namespace -
+#
+# Add limited support for 'namespace exists'. Must be a fully
+# qualified namespace name (pattern match support not provided).
+
+proc namespace { cmd args } {
+    if {[string equal $cmd "exists"]} {
+        set ptn [lindex $args 0]
+        return [::snit83::private::NamespaceIsDescendantOf :: $ptn]
+    } elseif {[string equal $cmd "delete"]} {
+        if [namespace exists [lindex $args 0]] {
+            return [uplevel 1 [subst {__namespace__ $cmd $args}]]
+        }
+    } else {
+        return [uplevel 1 [subst {__namespace__ $cmd $args}]]
+    }
+}
+
+# rename -
+#
+# Perform rename tracing and then invoke the actual Tcl rename command
+
+proc rename { oldName newName } {
+    variable ::snit83::cmdTraceTable
+
+    # Get caller's namespace since rename must be performed
+    # in the context of the caller's namespace
+    set callerNs "::"
+    set callerLevel [expr {[info level] - 1}]
+    if { $callerLevel > 0 } {
+        set callerInfo [info level $callerLevel]
+        set procName   [lindex $callerInfo 0]
+        set callerNs   [namespace qualifiers $procName]
+    }
+
+    #puts "rename: callerNs: $callerNs"
+    #puts "rename: '$oldName' -> '$newName'"
+    #puts "rename: rcds - [join [array names cmdTraceTable] "\nrename: rcds - "]"
+
+    set result [namespace eval $callerNs [concat __rename__ [list $oldName $newName]]]
+
+    set index1 "rename,$oldName"
+    set index2 "rename,::$oldName"
+
+    foreach index [list $index1 $index2] {
+        if [info exists cmdTraceTable($index)] {
+            set cmd $cmdTraceTable($index)
+
+	    #puts "rename: '$cmd' { $oldName -> $newName }"
+
+            ::unset cmdTraceTable($index) ;# prevent recursive tracing
+            if {![string equal $newName ""]} {
+                # Create a new trace record under the new name
+                set cmdTraceTable(rename,$newName) $cmd
+            }
+            if [catch {eval $cmd $oldName \"$newName\" rename} err] {
+                error $err
+            }
+            break
+        }
+    }
+
+    return $result
+}
+
+
+#-----------------------------------------------------------------------
+# Private functions
+
+proc ::snit83::private::NamespaceIsDescendantOf { parent child } {
+    set result 0
+
+    foreach ns [__namespace__ children $parent] {
+        if [string match $ns $child] {
+            set result 1
+            break;
+        } else {
+            if [set result [NamespaceIsDescendantOf $ns $child]] {
+                break
+            }
+        }
+    }
+    return $result
+}
+
+
+#-----------------------------------------------------------------------
+# Utility functions
+
+proc ::snit83::traceAddCommand {name ops command} {
+    variable cmdTraceTable
+
+    #puts "::snit83::traceAddCommand n/$name/ o/$ops/ c/$command/"
+    #puts "XX [join [array names cmdTraceTable] "\nXX "]"
+
+    foreach op $ops {
+        set index "$op,$name"
+	#puts "::snit83::traceAddCommand: index = $index cmd = $command"
+
+        set cmdTraceTable($index) $command
+    }
+}
+
+proc ::snit83::traceRemoveCommand {name ops command} {
+    variable cmdTraceTable
+
+    #puts "::snit83::traceRemoveCommand n/$name/ o/$ops/ c/$command/"
+    #puts "YY [join [array names cmdTraceTable] "\nYY "]"
+
+    foreach op $ops {
+        set index "$op,$name"
+	#puts "::snit83::traceRemoveCommand: index = $index cmd = $command"
+
+	catch { ::unset cmdTraceTable($index) }
+    }
+}
+
+# Add support for 'unset -nocomplain'
+proc ::snit83::unset { args } {
+
+    #puts "::snit83::unset - args: '$args'"
+
+    set noComplain 0
+    if {[string equal [lindex $args 0] "-nocomplain"]} {
+        set noComplain 1
+        set args [lrange $args 1 end]
+    }
+    if {[string equal [lindex $args 0] "--"]} {
+        set args [lrange $args 1 end]
+    }
+
+    if [catch {
+	uplevel 1 [linsert $args 0 ::unset]
+    } err] {
+        if { !$noComplain } {
+            error $err
+        }
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/validate.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/validate.tcl
new file mode 100644
index 00000000..4275e9be
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/snit/validate.tcl
@@ -0,0 +1,720 @@
+#-----------------------------------------------------------------------
+# TITLE:
+#    validate.tcl
+#
+# AUTHOR:
+#    Will Duquette
+#
+# DESCRIPTION:
+#    Snit validation types.
+#
+#-----------------------------------------------------------------------
+
+namespace eval ::snit:: { 
+    namespace export \
+        boolean \
+        double \
+        enum \
+        fpixels \
+        integer \
+        listtype \
+        pixels \
+        stringtype \
+        window
+}
+
+#-----------------------------------------------------------------------
+# snit::boolean
+
+snit::type ::snit::boolean {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+        if {![string is boolean -strict $value]} {
+            return -code error -errorcode INVALID \
+   "invalid boolean \"$value\", should be one of: 1, 0, true, false, yes, no, on, off"
+
+        }
+
+        return $value
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+}
+
+#-----------------------------------------------------------------------
+# snit::double
+
+snit::type ::snit::double {
+    #-------------------------------------------------------------------
+    # Options
+
+    # -min value
+    #
+    # Minimum value
+
+    option -min -default "" -readonly 1
+
+    # -max value
+    #
+    # Maximum value
+
+    option -max -default "" -readonly 1
+
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+        if {![string is double -strict $value]} {
+            return -code error -errorcode INVALID \
+                "invalid value \"$value\", expected double"
+        }
+
+        return $value
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    constructor {args} {
+        # FIRST, get the options
+        $self configurelist $args
+
+        if {"" != $options(-min) && 
+            ![string is double -strict $options(-min)]} {
+            return -code error \
+                "invalid -min: \"$options(-min)\""
+        }
+
+        if {"" != $options(-max) && 
+            ![string is double -strict $options(-max)]} {
+            return -code error \
+                "invalid -max: \"$options(-max)\""
+        }
+
+        if {"" != $options(-min) &&
+            "" != $options(-max) && 
+            $options(-max) < $options(-min)} {
+            return -code error "-max < -min"
+        }
+    }
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    # Fixed method for the snit::double type.
+    # WHD, 6/7/2010.
+    method validate {value} {
+        $type validate $value
+
+        if {("" != $options(-min) && $value < $options(-min))       ||
+            ("" != $options(-max) && $value > $options(-max))} {
+
+            set msg "invalid value \"$value\", expected double"
+
+            if {"" != $options(-min) && "" != $options(-max)} {
+                append msg " in range $options(-min), $options(-max)"
+            } elseif {"" != $options(-min)} {
+                append msg " no less than $options(-min)"
+            } elseif {"" != $options(-max)} {
+                append msg " no greater than $options(-max)"
+            }
+        
+            return -code error -errorcode INVALID $msg
+        }
+
+        return $value
+    }
+}
+
+#-----------------------------------------------------------------------
+# snit::enum
+
+snit::type ::snit::enum {
+    #-------------------------------------------------------------------
+    # Options
+
+    # -values list
+    #
+    # Valid values for this type
+
+    option -values -default {} -readonly 1
+
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+        # No -values specified; it's always valid
+        return $value
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    constructor {args} {
+        $self configurelist $args
+
+        if {[llength $options(-values)] == 0} {
+            return -code error \
+                "invalid -values: \"\""
+        }
+    }
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        if {[lsearch -exact $options(-values) $value] == -1} {
+            return -code error -errorcode INVALID \
+    "invalid value \"$value\", should be one of: [join $options(-values) {, }]"
+        }
+        
+        return $value
+    }
+}
+
+#-----------------------------------------------------------------------
+# snit::fpixels
+
+snit::type ::snit::fpixels {
+    #-------------------------------------------------------------------
+    # Options
+
+    # -min value
+    #
+    # Minimum value
+
+    option -min -default "" -readonly 1
+
+    # -max value
+    #
+    # Maximum value
+
+    option -max -default "" -readonly 1
+
+    #-------------------------------------------------------------------
+    # Instance variables
+
+    variable min ""  ;# -min, no suffix
+    variable max ""  ;# -max, no suffix
+
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+        if {[catch {winfo fpixels . $value} dummy]} {
+            return -code error -errorcode INVALID \
+                "invalid value \"$value\", expected fpixels"
+        }
+
+        return $value
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    constructor {args} {
+        # FIRST, get the options
+        $self configurelist $args
+
+        if {"" != $options(-min) && 
+            [catch {winfo fpixels . $options(-min)} min]} {
+            return -code error \
+                "invalid -min: \"$options(-min)\""
+        }
+
+        if {"" != $options(-max) && 
+            [catch {winfo fpixels . $options(-max)} max]} {
+            return -code error \
+                "invalid -max: \"$options(-max)\""
+        }
+
+        if {"" != $min &&
+            "" != $max && 
+            $max < $min} {
+            return -code error "-max < -min"
+        }
+    }
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+        
+        set val [winfo fpixels . $value]
+
+        if {("" != $min && $val < $min) ||
+            ("" != $max && $val > $max)} {
+
+            set msg "invalid value \"$value\", expected fpixels"
+
+            if {"" != $min && "" != $max} {
+                append msg " in range $options(-min), $options(-max)"
+            } elseif {"" != $min} {
+                append msg " no less than $options(-min)"
+            }
+        
+            return -code error -errorcode INVALID $msg
+        }
+
+        return $value
+    }
+}
+
+#-----------------------------------------------------------------------
+# snit::integer
+
+snit::type ::snit::integer {
+    #-------------------------------------------------------------------
+    # Options
+
+    # -min value
+    #
+    # Minimum value
+
+    option -min -default "" -readonly 1
+
+    # -max value
+    #
+    # Maximum value
+
+    option -max -default "" -readonly 1
+
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+        if {![string is integer -strict $value]} {
+            return -code error -errorcode INVALID \
+                "invalid value \"$value\", expected integer"
+        }
+
+        return $value
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    constructor {args} {
+        # FIRST, get the options
+        $self configurelist $args
+
+        if {"" != $options(-min) && 
+            ![string is integer -strict $options(-min)]} {
+            return -code error \
+                "invalid -min: \"$options(-min)\""
+        }
+
+        if {"" != $options(-max) && 
+            ![string is integer -strict $options(-max)]} {
+            return -code error \
+                "invalid -max: \"$options(-max)\""
+        }
+
+        if {"" != $options(-min) &&
+            "" != $options(-max) && 
+            $options(-max) < $options(-min)} {
+            return -code error "-max < -min"
+        }
+    }
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+
+        if {("" != $options(-min) && $value < $options(-min))       ||
+            ("" != $options(-max) && $value > $options(-max))} {
+
+            set msg "invalid value \"$value\", expected integer"
+
+            if {"" != $options(-min) && "" != $options(-max)} {
+                append msg " in range $options(-min), $options(-max)"
+            } elseif {"" != $options(-min)} {
+                append msg " no less than $options(-min)"
+            }
+        
+            return -code error -errorcode INVALID $msg
+        }
+
+        return $value
+    }
+}
+
+#-----------------------------------------------------------------------
+# snit::list
+
+snit::type ::snit::listtype {
+    #-------------------------------------------------------------------
+    # Options
+
+    # -type type
+    #
+    # Specifies a value type
+
+    option -type -readonly 1
+
+    # -minlen len
+    #
+    # Minimum list length
+
+    option -minlen -readonly 1 -default 0
+
+    # -maxlen len
+    #
+    # Maximum list length
+
+    option -maxlen -readonly 1
+
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+        if {[catch {llength $value} result]} {
+            return -code error -errorcode INVALID \
+                "invalid value \"$value\", expected list"
+        }
+
+        return $value
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+    
+    constructor {args} {
+        # FIRST, get the options
+        $self configurelist $args
+
+        if {"" != $options(-minlen) && 
+            (![string is integer -strict $options(-minlen)] ||
+             $options(-minlen) < 0)} {
+            return -code error \
+                "invalid -minlen: \"$options(-minlen)\""
+        }
+
+        if {"" == $options(-minlen)} {
+            set options(-minlen) 0
+        }
+
+        if {"" != $options(-maxlen) && 
+            ![string is integer -strict $options(-maxlen)]} {
+            return -code error \
+                "invalid -maxlen: \"$options(-maxlen)\""
+        }
+
+        if {"" != $options(-maxlen) && 
+            $options(-maxlen) < $options(-minlen)} {
+            return -code error "-maxlen < -minlen"
+        }
+    }
+
+
+    #-------------------------------------------------------------------
+    # Methods
+
+    method validate {value} {
+        $type validate $value
+
+        set len [llength $value]
+
+        if {$len < $options(-minlen)} {
+            return -code error -errorcode INVALID \
+              "value has too few elements; at least $options(-minlen) expected"
+        } elseif {"" != $options(-maxlen)} {
+            if {$len > $options(-maxlen)} {
+                return -code error -errorcode INVALID \
+         "value has too many elements; no more than $options(-maxlen) expected"
+            }
+        }
+
+        # NEXT, check each value
+        if {"" != $options(-type)} {
+            foreach item $value {
+                set cmd $options(-type)
+                lappend cmd validate $item
+                uplevel \#0 $cmd
+            }
+        }
+        
+        return $value
+    }
+}
+
+#-----------------------------------------------------------------------
+# snit::pixels
+
+snit::type ::snit::pixels {
+    #-------------------------------------------------------------------
+    # Options
+
+    # -min value
+    #
+    # Minimum value
+
+    option -min -default "" -readonly 1
+
+    # -max value
+    #
+    # Maximum value
+
+    option -max -default "" -readonly 1
+
+    #-------------------------------------------------------------------
+    # Instance variables
+
+    variable min ""  ;# -min, no suffix
+    variable max ""  ;# -max, no suffix
+
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+        if {[catch {winfo pixels . $value} dummy]} {
+            return -code error -errorcode INVALID \
+                "invalid value \"$value\", expected pixels"
+        }
+
+        return $value
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    constructor {args} {
+        # FIRST, get the options
+        $self configurelist $args
+
+        if {"" != $options(-min) && 
+            [catch {winfo pixels . $options(-min)} min]} {
+            return -code error \
+                "invalid -min: \"$options(-min)\""
+        }
+
+        if {"" != $options(-max) && 
+            [catch {winfo pixels . $options(-max)} max]} {
+            return -code error \
+                "invalid -max: \"$options(-max)\""
+        }
+
+        if {"" != $min &&
+            "" != $max && 
+            $max < $min} {
+            return -code error "-max < -min"
+        }
+    }
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+        
+        set val [winfo pixels . $value]
+
+        if {("" != $min && $val < $min) ||
+            ("" != $max && $val > $max)} {
+
+            set msg "invalid value \"$value\", expected pixels"
+
+            if {"" != $min && "" != $max} {
+                append msg " in range $options(-min), $options(-max)"
+            } elseif {"" != $min} {
+                append msg " no less than $options(-min)"
+            }
+        
+            return -code error -errorcode INVALID $msg
+        }
+
+        return $value
+    }
+}
+
+#-----------------------------------------------------------------------
+# snit::stringtype
+
+snit::type ::snit::stringtype {
+    #-------------------------------------------------------------------
+    # Options
+
+    # -minlen len
+    #
+    # Minimum list length
+
+    option -minlen -readonly 1 -default 0
+
+    # -maxlen len
+    #
+    # Maximum list length
+
+    option -maxlen -readonly 1
+
+    # -nocase 0|1
+    #
+    # globs and regexps are case-insensitive if -nocase 1.
+
+    option -nocase -readonly 1 -default 0
+
+    # -glob pattern
+    #
+    # Glob-match pattern, or ""
+
+    option -glob -readonly 1
+
+    # -regexp regexp
+    #
+    # Regular expression to match
+    
+    option -regexp -readonly 1
+    
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+        # By default, any string (hence, any Tcl value) is valid.
+        return $value
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+    
+    constructor {args} {
+        # FIRST, get the options
+        $self configurelist $args
+
+        # NEXT, validate -minlen and -maxlen
+        if {"" != $options(-minlen) && 
+            (![string is integer -strict $options(-minlen)] ||
+             $options(-minlen) < 0)} {
+            return -code error \
+                "invalid -minlen: \"$options(-minlen)\""
+        }
+
+        if {"" == $options(-minlen)} {
+            set options(-minlen) 0
+        }
+
+        if {"" != $options(-maxlen) && 
+            ![string is integer -strict $options(-maxlen)]} {
+            return -code error \
+                "invalid -maxlen: \"$options(-maxlen)\""
+        }
+
+        if {"" != $options(-maxlen) && 
+            $options(-maxlen) < $options(-minlen)} {
+            return -code error "-maxlen < -minlen"
+        }
+
+        # NEXT, validate -nocase
+        if {[catch {snit::boolean validate $options(-nocase)} result]} {
+            return -code error "invalid -nocase: $result"
+        }
+
+        # Validate the glob
+        if {"" != $options(-glob) && 
+            [catch {string match $options(-glob) ""} dummy]} {
+            return -code error \
+                "invalid -glob: \"$options(-glob)\""
+        }
+
+        # Validate the regexp
+        if {"" != $options(-regexp) && 
+            [catch {regexp $options(-regexp) ""} dummy]} {
+            return -code error \
+                "invalid -regexp: \"$options(-regexp)\""
+        }
+    }
+
+
+    #-------------------------------------------------------------------
+    # Methods
+
+    method validate {value} {
+        # Usually we'd call [$type validate $value] here, but
+        # as it's a no-op, don't bother.
+
+        # FIRST, validate the length.
+        set len [string length $value]
+
+        if {$len < $options(-minlen)} {
+            return -code error -errorcode INVALID \
+              "too short: at least $options(-minlen) characters expected"
+        } elseif {"" != $options(-maxlen)} {
+            if {$len > $options(-maxlen)} {
+                return -code error -errorcode INVALID \
+         "too long: no more than $options(-maxlen) characters expected"
+            }
+        }
+
+        # NEXT, check the glob match, with or without case.
+        if {"" != $options(-glob)} {
+            if {$options(-nocase)} {
+                set result [string match -nocase $options(-glob) $value]
+            } else {
+                set result [string match $options(-glob) $value]
+            }
+            
+            if {!$result} {
+                return -code error -errorcode INVALID \
+                    "invalid value \"$value\""
+            }
+        }
+        
+        # NEXT, check regexp match with or without case
+        if {"" != $options(-regexp)} {
+            if {$options(-nocase)} {
+                set result [regexp -nocase -- $options(-regexp) $value]
+            } else {
+                set result [regexp -- $options(-regexp) $value]
+            }
+            
+            if {!$result} {
+                return -code error -errorcode INVALID \
+                    "invalid value \"$value\""
+            }
+        }
+        
+        return $value
+    }
+}
+
+#-----------------------------------------------------------------------
+# snit::window
+
+snit::type ::snit::window {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+        if {![winfo exists $value]} {
+            return -code error -errorcode INVALID \
+                "invalid value \"$value\", value is not a window"
+        }
+
+        return $value
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/soundex/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/soundex/pkgIndex.tcl
new file mode 100644
index 00000000..7be9812a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/soundex/pkgIndex.tcl
@@ -0,0 +1,12 @@
+# Tcl package index file, version 1.1
+# This file is generated by the "pkg_mkIndex" command
+# and sourced either when an application starts up or
+# by a "package unknown" script.  It invokes the
+# "package ifneeded" command to set up package-related
+# information so that packages will be loaded automatically
+# in response to "package require" commands.  When this
+# script is sourced, the variable $dir must contain the
+# full path name of this file's directory.
+
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded soundex 1.0 [list source [file join $dir soundex.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/soundex/soundex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/soundex/soundex.tcl
new file mode 100644
index 00000000..08ba4fac
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/soundex/soundex.tcl
@@ -0,0 +1,96 @@
+# soundex.tcl --
+#
+#	Implementation of soundex in Tcl
+#
+# Copyright (c) 2003 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: soundex.tcl,v 1.3 2004/01/15 06:36:14 andreas_kupries Exp $
+
+package require Tcl 8.2
+
+namespace eval ::soundex {}
+
+## ------------------------------------------------------------
+##
+## I. Soundex by Knuth.
+
+# This implementation of the Soundex algorithm is released to the public
+# domain: anyone may use it for any purpose.  See if I care.
+
+# N. Dean Pentcheff 1/13/89 Dept. of Zoology University of California Berkeley,
+#    CA  94720 dean@violet.berkeley.edu
+# TCL port by Evan Rempel 2/10/98 Dept Comp Services University of Victoria.
+# erempel@uvic.ca
+
+# proc ::soundex::knuth ( string )
+#
+#   Given as argument: a character string. Returns: a static string, 4 characters long
+#   This string is the Soundex key for the argument string.
+#   Side effects and limitations:
+#   Does not clobber the string passed in as the argument. No limit on
+#   argument string length. Assumes a character set with continuously
+#   ascending and contiguous letters within each case and within the digits
+#   (e.g. this works for ASCII and bombs in EBCDIC. But then, most things
+#   do.). Reference: Adapted from Knuth, D.E. (1973) The art of computer
+#   programming; Volume 3: Sorting and searching.  Addison-Wesley Publishing
+#   Company: Reading, Mass. Page 392.
+#   Special cases: Leading or embedded spaces, numerals, or punctuation are squeezed
+#   out before encoding begins.
+#
+#   Null strings or those with no encodable letters return the code 'Z000'.
+#
+#   Test data from Knuth (1973):
+#   Euler   Gauss   Hilbert Knuth   Lloyd   Lukasiewicz
+#   E460    G200    H416    K530    L300    L222
+
+namespace eval ::soundex {
+    variable  soundexKnuthCode
+    array set soundexKnuthCode {
+	a 0 b 1 c 2 d 3 e 0 f 1 g 2 h 0 i 0 j 2 k 2 l 4 m 5
+	n 5 o 0 p 1 q 2 r 6 s 2 t 3 u 0 v 1 w 0 x 2 y 0 z 2
+    }
+}
+proc ::soundex::knuth {in} {
+    variable soundexKnuthCode
+    set key ""
+
+    # Remove the leading/trailing white space punctuation etc.
+
+    set TempIn [string trim $in "\t\n\r .,'-"]
+
+    # Only use alphabetic characters, so strip out all others
+    # also, soundex index uses only lower case chars, so force to lower
+
+    regsub -all {[^a-z]} [string tolower $TempIn] {} TempIn
+    if {[string length $TempIn] == 0} {
+	return Z000
+    }
+    set last [string index $TempIn 0]
+    set key  [string toupper $last]
+    set last $soundexKnuthCode($last)
+
+    # Scan rest of string, stop at end of string or when the key is
+    # full
+
+    set count    1
+    set MaxIndex [string length $TempIn]
+
+    for {set index 1} {(($count < 4) && ($index < $MaxIndex))} {incr index } {
+	set chcode $soundexKnuthCode([string index $TempIn $index])
+	# Fold together adjacent letters sharing the same code
+	if {![string equal $last $chcode]} {
+	    set last $chcode
+	    # Ignore code==0 letters except as separators
+	    if {$last != 0} then {
+		set key $key$last
+		incr count
+	    }
+	}
+    }
+    return [string range ${key}0000 0 3]
+}
+
+package provide soundex 1.0
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/mkpkgidx.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/mkpkgidx.tcl
new file mode 100644
index 00000000..d29d1703
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/mkpkgidx.tcl
@@ -0,0 +1,112 @@
+# command line:
+# $ interpreter mkpkgidx.tcl -p package1.n.n -p package2 -p package3.n ...
+#     packageName file1 file2 ...
+# use wish as interpreter instead of tclsh in order to handle graphical packages
+
+# Copyright (c) 2001 by Jean-Luc Fontaine <jfontain@free.fr>.
+# This code may be distributed under the same terms as Tcl.
+#
+# $Id: mkpkgidx.tcl,v 1.3 2004/01/15 06:36:14 andreas_kupries Exp $
+
+# this utility must be used to create the package index file for a package that
+# uses stooop.
+# it differs from the tcl pkg_mkIndex procedure in the way it sources files.
+# since base classes can usually be found in files separate from the derived
+# class source file, sourcing each file in a different interpreter (as is done
+# in the pkg_mkIndex procedure) results in an error for stooop that catches the
+# fact that the base class is not defined. the solution is to use a single
+# interpreter which will source the class files in order (base classes first at
+# the user's responsibility). since stooop is loaded in that single interpreter,
+# inheritance problems and others are automatically caught in the process.
+# the generated package index file is fully compatible with the tcl generated
+# ones.
+# the stooop library makes sure that base classes source files are automatically
+# sourced when a derived class is defined (see the stooop.tcl source file for
+# more information).
+# if your software requires one or more packages, you may force their loading
+# by using the -p arguments. each package version number is optionally appended
+# to the package name and follows the same rules as the Tcl package require
+# command
+# example: $ tclsh -p switched.1 -p scwoop foo bar.tcl barfoo.tcl foobar.tcl ...
+
+if {[catch {package require stooop 4}]} {
+    # in case stooop package is not installed
+    source stooop.tcl
+}
+namespace import stooop::*
+
+proc indexData {packageName files} {
+    global auto_index
+
+    set index "# Package index file created with stooop version [package provide stooop] for stooop packages\n"
+    set data {}
+
+    foreach command [info commands] {
+        set defined($command) {}
+    }
+
+    foreach file $files {
+        # source at global level to avoid variable names collisions:
+        uplevel #0 source [list $file]
+
+        catch {unset newCommands}                    ;# empty new commands array
+        foreach command [info commands] {
+            # check new commands at the global level
+            # filter out tk widget commands and ignore commands eventually
+            # loaded from a package required by the new commands
+            if {
+                [string match .* $command]||[info exists defined($command)]||
+                [info exists auto_index($command)]||\
+                [info exists auto_index(::$command)]
+            } continue
+            set newCommands($command) {}
+            set defined($command) {}
+        }
+        # check new classes, which actually are namespaces:
+        foreach class [array name stooop::declared] {
+            if {![info exists declared($class)]} {
+                # check new commands at the class namespace level:
+                foreach command [info commands ::${class}::*] {
+                    # ignore commands eventually loaded from a package required
+                    # by the new commands
+                    if {\
+                        [info exists defined($command)]||\
+                        [info exists auto_index($command)]||\
+                        [info exists auto_index(::$command)]\
+                    } continue
+                    set newCommands($command) {}
+                    set defined($command) {}
+                }
+                set declared($class) {}
+            }
+        }
+        # so far only sourceable file, not shared libraries, are handled
+        lappend data [list $file source [lsort [array names newCommands]]]
+    }
+    set version [package provide $packageName]
+    append index "\npackage ifneeded $packageName $version \[list tclPkgSetup \$dir $packageName $version [list $data]\]"
+    return $index
+}
+
+proc printUsage {exitCode} {
+    global argv0
+
+    puts stderr "usage: $argv0 \[\[-p package.n.n\] \[-p package.n.n\] ...\] moduleName tclFile tclFile ..."
+    exit $exitCode
+}
+
+# first gather eventual packages:
+for {set index 0} {$index<[llength $argv]} {incr index} {
+    if {[string compare [lindex $argv $index] -p]!=0} break
+    set version {}
+    scan [lindex $argv [incr index]] {%[^.].%s} name version
+    eval package require $name $version
+}
+
+set argv [lrange $argv $index end]                   ;# keep remaining arguments
+if {[llength $argv]<2} {
+    printUsage 1
+}
+
+puts [open pkgIndex.tcl w] [indexData [lindex $argv 0] [lrange $argv 1 end]]
+exit                                                     ;# in case wish is used
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/pkgIndex.tcl
new file mode 100644
index 00000000..12b32fe6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/pkgIndex.tcl
@@ -0,0 +1,22 @@
+# @mdgen EXCLUDE: xifo.tcl
+# @mdgen EXCLUDE: mkpkgidx.tcl
+#
+# Copyright (c) 2001 by Jean-Luc Fontaine <jfontain@free.fr>.
+# This code may be distributed under the same terms as Tcl.
+#
+# $Id: pkgIndex.tcl,v 1.10 2007/03/23 17:31:51 andreas_kupries Exp $
+
+# Since stooop redefines the proc command and the default package facility will
+# only load the stooop package at the first unknown command, proc being
+# obviously known by default, forcing the loading of stooop is mandatory prior
+# to the first proc declaration.
+
+if {![package vsatisfies [package provide Tcl] 8.3]} {return}
+package ifneeded stooop 4.4.1 [list source [file join $dir stooop.tcl]]
+
+# the following package index instruction was generated using:
+#   "tclsh mkpkgidx.tcl switched switched.tcl"
+# (comment out the following line if you do not want to use the switched class
+# as a package)
+
+package ifneeded switched 2.2.1 [list source [file join $dir switched.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/stooop.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/stooop.tcl
new file mode 100644
index 00000000..1b47a8a5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/stooop.tcl
@@ -0,0 +1,938 @@
+# stooop
+# Simple Tcl Only Object Oriented Programming
+# An object oriented extension to the Tcl programming language
+#
+# Copyright (c) 2002 by Jean-Luc Fontaine <jfontain@free.fr>.
+# This code may be distributed under the same terms as Tcl.
+#
+# $Id: stooop.tcl,v 1.9 2004/01/15 06:36:14 andreas_kupries Exp $
+
+
+# check whether empty named arrays and array unset are supported:
+package require Tcl 8.3
+
+package provide stooop 4.4.1
+
+# rename proc before it is overloaded, ignore error in case of multiple
+# inclusion of this file:
+catch {rename proc _proc}
+
+namespace eval ::stooop {
+    variable check
+    variable trace
+
+    # no checking by default: use an empty instruction to avoid any performance
+    # hit:
+    set check(code) {}
+    if {[info exists ::env(STOOOPCHECKALL)]&&$::env(STOOOPCHECKALL)} {
+        array set ::env\
+            {STOOOPCHECKPROCEDURES 1 STOOOPCHECKDATA 1 STOOOPCHECKOBJECTS 1}
+    }
+    set check(procedures) [expr {\
+        [info exists ::env(STOOOPCHECKPROCEDURES)]&&\
+        $::env(STOOOPCHECKPROCEDURES)\
+    }]
+    set check(data) [expr {\
+        [info exists ::env(STOOOPCHECKDATA)]&&$::env(STOOOPCHECKDATA)\
+    }]
+    set check(objects) [expr {\
+        [info exists ::env(STOOOPCHECKOBJECTS)]&&$::env(STOOOPCHECKOBJECTS)\
+    }]
+    if {$check(procedures)} {
+        append check(code) {::stooop::checkProcedure;}
+    }
+    if {[info exists ::env(STOOOPTRACEALL)]} {
+        # use same channel for both traces
+        set ::env(STOOOPTRACEPROCEDURES) $::env(STOOOPTRACEALL)
+        set ::env(STOOOPTRACEDATA) $::env(STOOOPTRACEALL)
+    }
+    if {[info exists ::env(STOOOPTRACEPROCEDURES)]} {
+        set trace(procedureChannel) $::env(STOOOPTRACEPROCEDURES)
+        switch $trace(procedureChannel) {
+            stdout - stderr {}
+            default {
+                # eventually truncate output file if it exists:
+                set trace(procedureChannel) [open $::env(STOOOPTRACEPROCEDURES) w+]
+            }
+        }
+        # default format:
+        set trace(procedureFormat)\
+            {class: %C, procedure: %p, object: %O, arguments: %a}
+        # eventually override with user defined format:
+        catch {set trace(procedureFormat) $::env(STOOOPTRACEPROCEDURESFORMAT)}
+        append check(code) {::stooop::traceProcedure;}
+    }
+    if {[info exists ::env(STOOOPTRACEDATA)]} {
+        set trace(dataChannel) $::env(STOOOPTRACEDATA)
+        switch $trace(dataChannel) {
+            stdout - stderr {}
+            default {
+                # eventually truncate output file if it exists
+                set trace(dataChannel) [open $::env(STOOOPTRACEDATA) w+]
+            }
+        }
+        # default format:
+        set trace(dataFormat) {class: %C, procedure: %p, array: %A, object: %O, member: %m, operation: %o, value: %v}
+        # eventually override with user defined format:
+        catch {set trace(dataFormat) $::env(STOOOPTRACEDATAFORMAT)}
+        # trace all operations by default:
+        set trace(dataOperations) rwu
+        # eventually override with user defined operations:
+        catch {set trace(dataOperations) $::env(STOOOPTRACEDATAOPERATIONS)}
+    }
+
+    namespace export class virtual new delete classof  ;# export public commands
+
+    if {![info exists newId]} {
+        # initialize object id counter only once even if this file is sourced
+        # several times:
+        variable newId 0
+    }
+
+    # create an object of specified class or copy an existing object:
+    _proc new {classOrId args} {
+        variable newId
+        variable fullClass
+
+        # use local variable for identifier because new can be invoked
+        # recursively:
+        if {[string is integer $classOrId]} {
+            # first argument is an object identifier (unsigned integer), copy
+            # source object to new object of identical class
+            if {[catch {\
+                set fullClass([set id [incr newId]]) $fullClass($classOrId)\
+            }]} {
+                error "invalid object identifier $classOrId"
+            }
+            # invoke the copy constructor for the class in caller's variable
+            # context so that object copy is transparent (see above):
+            uplevel 1 $fullClass($classOrId)::_copy $id $classOrId
+        } else {                                    ;# first argument is a class
+            # generate constructor name:
+            set constructor ${classOrId}::[namespace tail $classOrId]
+            # we could detect here whether class was ever declared but that
+            # would prevent stooop packages to load properly, because
+            # constructor would not be invoked and thus class source file never
+            # sourced
+            # invoke the constructor for the class with optional arguments in
+            # caller's variable context so that object creation is transparent
+            # and that array names as constructor parameters work with a simple
+            # upvar
+            # note: if class is in a package, the class namespace code is loaded
+            # here, as the first object of the class is created
+            uplevel 1 $constructor [set id [incr newId]] $args
+            # generate fully qualified class namespace name now that we are sure
+            # that class namespace code has been invoked:
+            set fullClass($id) [namespace qualifiers\
+                [uplevel 1 namespace which -command $constructor]\
+            ]
+        }
+        return $id                          ;# return a unique object identifier
+    }
+
+    _proc delete {args} {                          ;# delete one or more objects
+        variable fullClass
+
+        foreach id $args {
+            # destruct in caller's variable context so that object deletion is
+            # transparent:
+            uplevel 1 ::stooop::deleteObject $fullClass($id) $id
+            unset fullClass($id)
+        }
+    }
+
+    # delete object data starting at specified class layer and going up the base
+    # class hierarchy if any
+    # invoke the destructor for the object class and unset all the object data
+    # members for the class
+    # the destructor will in turn delete the base classes layers
+    _proc deleteObject {fullClass id} {
+        # invoke the destructor for the class in caller's variable context so
+        # that object deletion is transparent:
+        uplevel 1 ${fullClass}::~[namespace tail $fullClass] $id
+        # delete all this object data members if any (assume that they were
+        # stored as ${class}::($id,memberName)):
+        array unset ${fullClass}:: $id,*
+        # data member arrays deletion is left to the user
+    }
+
+    _proc classof {id} {
+        variable fullClass
+
+        return $fullClass($id)                         ;# return class of object
+    }
+
+    # copy object data members from one object to another:
+    _proc copy {fullClass from to} {
+        set index [string length $from]
+        # copy regular data members:
+        foreach {name value} [array get ${fullClass}:: $from,*] {
+            set ${fullClass}::($to[string range $name $index end]) $value
+        }
+        # if any, array data members copy is left to the class programmer
+        # through the then mandatory copy constructor
+    }
+}
+
+_proc ::stooop::class {args} {
+    variable declared
+
+    set class [lindex $args 0]
+    # register class using its fully qualified name:
+    set declared([uplevel 1 namespace eval $class {namespace current}]) {}
+    # create the empty name array used to hold all class objects so that static
+    # members can be directly initialized within the class declaration but
+    # outside member procedures
+    uplevel 1 namespace eval $class [list "::variable {}\n[lindex $args end]"]
+}
+
+# if procedure is a member of a known class, class and procedure names are set
+# and true is returned, otherwise false is returned:
+_proc ::stooop::parseProcedureName {\
+    namespace name fullClassVariable procedureVariable messageVariable\
+} {
+    # namespace argument is the current namespace (fully qualified) in which the
+    # procedure is defined
+    variable declared
+    upvar 1 $fullClassVariable fullClass $procedureVariable procedure\
+        $messageVariable message
+
+    if {\
+        [info exists declared($namespace)]&&\
+        ([string length [namespace qualifiers $name]]==0)\
+    } {
+        # a member procedure is being defined inside a class namespace
+        set fullClass $namespace
+        set procedure $name                ;# member procedure name is full name
+        return 1
+    } else {
+        # procedure is either a member of a known class or a regular procedure
+        if {![string match ::* $name]} {
+            # eventually fully qualify procedure name
+            if {[string equal $namespace ::]} { ;# global namespace special case
+                set name ::$name
+            } else {
+                set name ${namespace}::$name
+            }
+        }
+        # eventual class name is leading part:
+        set fullClass [namespace qualifiers $name]
+        if {[info exists declared($fullClass)]} {           ;# if class is known
+            set procedure [namespace tail $name] ;# procedure always is the tail
+            return 1
+        } else {                                       ;# not a member procedure
+            if {[string length $fullClass]==0} {
+                set message "procedure $name class name is empty"
+            } else {
+                set message "procedure $name class $fullClass is unknown"
+            }
+            return 0
+        }
+    }
+}
+
+# virtual operator, to be placed before proc
+# virtualize a member procedure, determine whether it is a pure virtual, check
+# for procedures that cannot be virtualized
+_proc ::stooop::virtual {keyword name arguments args} {
+    # set a flag so that proc knows it is acting upon a virtual procedure, also
+    # serves as a pure indicator:
+    variable pureVirtual
+
+    if {![string equal [uplevel 1 namespace which -command $keyword] ::proc]} {
+        error "virtual operator works only on proc, not $keyword"
+    }
+    if {![parseProcedureName\
+        [uplevel 1 namespace current] $name fullClass procedure message\
+    ]} {
+        error $message                   ;# not in a member procedure definition
+    }
+    set class [namespace tail $fullClass]
+    if {[string equal $class $procedure]} {
+        error "cannot make class $fullClass constructor virtual"
+    }
+    if {[string equal ~$class $procedure]} {
+        error "cannot make class $fullClass destructor virtual"
+    }
+    if {![string equal [lindex $arguments 0] this]} {
+        error "cannot make static procedure $procedure of class $fullClass virtual"
+    }
+    # no procedure body means pure virtual:
+    set pureVirtual [expr {[llength $args]==0}]
+    # process procedure declaration, body being empty for pure virtual procedure
+    # make virtual transparent by using uplevel:
+    uplevel 1 ::proc [list $name $arguments [lindex $args 0]]
+    unset pureVirtual
+}
+
+_proc proc {name arguments args} {
+    if {![::stooop::parseProcedureName\
+        [uplevel 1 namespace current] $name fullClass procedure message\
+    ]} {
+        # not in a member procedure definition, fall back to normal procedure
+        # declaration
+        # uplevel is required instead of eval here otherwise tcl seems to forget
+        # the procedure namespace if it exists
+        uplevel 1 _proc [list $name $arguments] $args
+        return
+    }
+    if {[llength $args]==0} {               ;# check for procedure body presence
+        error "missing body for ${fullClass}::$procedure"
+    }
+    set class [namespace tail $fullClass]
+    if {[string equal $class $procedure]} {      ;# class constructor definition
+        if {![string equal [lindex $arguments 0] this]} {
+            error "class $fullClass constructor first argument must be this"
+        }
+        if {[string equal [lindex $arguments 1] copy]} {
+            # user defined copy constructor definition
+            if {[llength $arguments]!=2} {
+                error "class $fullClass copy constructor must have 2 arguments exactly"
+            }
+            # make sure of proper declaration order:
+            if {[catch {info body ::${fullClass}::$class}]} {
+                error "class $fullClass copy constructor defined before constructor"
+            }
+            eval ::stooop::constructorDeclaration\
+                $fullClass $class 1 \{$arguments\} $args
+        } else {                                             ;# main constructor
+            eval ::stooop::constructorDeclaration\
+                $fullClass $class 0 \{$arguments\} $args
+            # always generate default copy constructor:
+            ::stooop::generateDefaultCopyConstructor $fullClass
+        }
+    } elseif {[string equal ~$class $procedure]} {
+        # class destructor declaration
+        if {[llength $arguments]!=1} {
+            error "class $fullClass destructor must have 1 argument exactly"
+        }
+        if {![string equal [lindex $arguments 0] this]} {
+            error "class $fullClass destructor argument must be this"
+        }
+        # make sure of proper declaration order
+        # (use fastest method for testing procedure existence):
+        if {[catch {info body ::${fullClass}::$class}]} {
+            error "class $fullClass destructor defined before constructor"
+        }
+        ::stooop::destructorDeclaration\
+            $fullClass $class $arguments [lindex $args 0]
+    } else {
+        # regular member procedure, may be static if there is no this first
+        # argument
+        # make sure of proper declaration order:
+        if {[catch {info body ::${fullClass}::$class}]} {
+            error "class $fullClass member procedure $procedure defined before constructor"
+        }
+        ::stooop::memberProcedureDeclaration\
+            $fullClass $class $procedure $arguments [lindex $args 0]
+    }
+}
+
+# copy flag is set for user defined copy constructor:
+_proc ::stooop::constructorDeclaration {fullClass class copy arguments args} {
+    variable check
+    variable fullBases
+    variable variable
+
+    set number [llength $args]
+    # check that each base class constructor has arguments:
+    if {($number%2)==0} {
+        error "bad class $fullClass constructor declaration, a base class, contructor arguments or body may be missing"
+    }
+    if {[string equal [lindex $arguments end] args]} {
+        # remember that there is a variable number of arguments in class
+        # constructor
+        set variable($fullClass) {}
+    }
+    if {!$copy} {
+        # do not initialize (or reinitialize in case of multiple class file
+        # source statements) base classes for copy constructor
+        set fullBases($fullClass) {}
+    }
+    # check base classes and their constructor arguments:
+    foreach {base baseArguments} [lrange $args 0 [expr {$number-2}]] {
+        # fully qualify base class namespace by looking up constructor, which
+        # must exist
+        set constructor ${base}::[namespace tail $base]
+        # in case base class is defined in a file that is part of a package,
+        # make sure that file is sourced through the tcl package auto-loading
+        # mechanism by directly invoking the base class constructor while
+        # ignoring the resulting error
+        catch {$constructor}
+        # determine fully qualified base class name in user invocation level
+        # (up 2 levels from here since this procedure is invoked exclusively by
+        # proc)
+        set fullBase [namespace qualifiers\
+            [uplevel 2 namespace which -command $constructor]\
+        ]
+        if {[string length $fullBase]==0} {   ;# base constructor is not defined
+            if {[string match *$base $fullClass]} {
+                # if the specified base class name is included last in the fully
+                # qualified class name, assume that it was meant to be the same
+                error "class $fullClass cannot be derived from itself"
+            } else {
+                error "class $fullClass constructor defined before base class $base constructor"
+            }
+        }
+        # check and save base classes only for main constructor that defines
+        # them:
+        if {!$copy} {
+            if {[lsearch -exact $fullBases($fullClass) $fullBase]>=0} {
+                error "class $fullClass directly inherits from class $fullBase more than once"
+            }
+            lappend fullBases($fullClass) $fullBase
+        }
+        # replace new lines with blanks in base arguments part in case user has
+        # formatted long declarations with new lines
+        regsub -all {\n} $baseArguments { } constructorArguments($fullBase)
+    }
+    # setup access to class data (an empty named array)
+    # fully qualify tcl variable command for it may have been redefined within
+    # the class namespace
+    # since constructor is directly invoked by new, the object identifier must
+    # be valid, so debugging the procedure is pointless
+    set constructorBody \
+"::variable {}
+$check(code)
+"
+    # base class(es) derivation specified:
+    if {[llength $fullBases($fullClass)]>0} {
+        # invoke base class constructors before evaluating constructor body
+        # then set base part hidden derived member so that virtual procedures
+        # are invoked at base class level as in C++
+        if {[info exists variable($fullClass)]} {
+            # variable number of arguments in derived class constructor
+            foreach fullBase $fullBases($fullClass) {
+                if {![info exists constructorArguments($fullBase)]} {
+                    error "missing base class $fullBase constructor arguments from class $fullClass constructor"
+                }
+                set baseConstructor ${fullBase}::[namespace tail $fullBase]
+                if {\
+                    [info exists variable($fullBase)]&&\
+                    ([string first {$args} $constructorArguments($fullBase)]>=0)\
+                } {
+                    # variable number of arguments in base class constructor and
+                    # in derived class base class constructor arguments
+                    # use eval so that base class constructor sees arguments
+                    # instead of a list
+                    # only the last argument of the base class constructor
+                    # arguments is considered as a variable list
+                    # (it usually is $args but could be a procedure invocation,
+                    # such as [filter $args])
+                    # fully qualify tcl commands such as set, for they may have
+                    #  been redefined within the class namespace
+                    append constructorBody \
+"::set _list \[::list $constructorArguments($fullBase)\]
+::eval $baseConstructor \$this \[::lrange \$_list 0 \[::expr {\[::llength \$_list\]-2}\]\] \[::lindex \$_list end\]
+::unset _list
+::set ${fullBase}::(\$this,_derived) $fullClass
+"
+                } else {
+                    # no special processing needed
+                    # variable number of arguments in base class constructor or
+                    # variable arguments list passed as is to base class
+                    #  constructor
+                    append constructorBody \
+"$baseConstructor \$this $constructorArguments($fullBase)
+::set ${fullBase}::(\$this,_derived) $fullClass
+"
+                }
+            }
+        } else {                                 ;# constant number of arguments
+            foreach fullBase $fullBases($fullClass) {
+                if {![info exists constructorArguments($fullBase)]} {
+                    error "missing base class $fullBase constructor arguments from class $fullClass constructor"
+                }
+                set baseConstructor ${fullBase}::[namespace tail $fullBase]
+                append constructorBody \
+"$baseConstructor \$this $constructorArguments($fullBase)
+::set ${fullBase}::(\$this,_derived) $fullClass
+"
+            }
+        }
+    }                                 ;# else no base class derivation specified
+    if {$copy} {
+        # for user defined copy constructor, copy derived class member if it
+        # exists
+        append constructorBody \
+"::catch {::set (\$this,_derived) \$(\$[::lindex $arguments 1],_derived)}
+"
+    }
+    # finally append user defined procedure body:
+    append constructorBody [lindex $args end]
+    if {$copy} {
+        _proc ${fullClass}::_copy $arguments $constructorBody
+    } else {
+        _proc ${fullClass}::$class $arguments $constructorBody
+    }
+}
+
+_proc ::stooop::destructorDeclaration {fullClass class arguments body} {
+    variable check
+    variable fullBases
+
+    # setup access to class data
+    # since the object identifier is always valid at this point, debugging the
+    # procedure is pointless
+    set body \
+"::variable {}
+$check(code)
+$body
+"
+    # if there are any, delete base classes parts in reverse order of
+    # construction
+    for {set index [expr {[llength $fullBases($fullClass)]-1}]} {$index>=0}\
+        {incr index -1}\
+    {
+        set fullBase [lindex $fullBases($fullClass) $index]
+        append body \
+"::stooop::deleteObject $fullBase \$this
+"
+    }
+    _proc ${fullClass}::~$class $arguments $body
+}
+
+_proc ::stooop::memberProcedureDeclaration {\
+    fullClass class procedure arguments body\
+} {
+    variable check
+    variable pureVirtual
+
+    if {[info exists pureVirtual]} {                      ;# virtual declaration
+        if {$pureVirtual} {                          ;# pure virtual declaration
+            # setup access to class data
+            # evaluate derived procedure which must exists. derived procedure
+            # return value is automatically returned
+            _proc ${fullClass}::$procedure $arguments \
+"::variable {}
+$check(code)
+::uplevel 1 \$(\$this,_derived)::$procedure \[::lrange \[::info level 0\] 1 end\]
+"
+        } else {                                  ;# regular virtual declaration
+            # setup access to class data
+            # evaluate derived procedure and return if it exists
+            # else evaluate the base class procedure which can be invoked from
+            # derived class procedure by prepending _
+            _proc ${fullClass}::_$procedure $arguments \
+"::variable {}
+$check(code)
+$body
+"
+            _proc ${fullClass}::$procedure $arguments \
+"::variable {}
+$check(code)
+if {!\[::catch {::info body \$(\$this,_derived)::$procedure}\]} {
+::return \[::uplevel 1 \$(\$this,_derived)::$procedure \[::lrange \[::info level 0\] 1 end\]\]
+}
+::uplevel 1 ${fullClass}::_$procedure \[::lrange \[::info level 0\] 1 end\]
+"
+        }
+    } else {                                          ;# non virtual declaration
+        # setup access to class data:
+        _proc ${fullClass}::$procedure $arguments \
+"::variable {}
+$check(code)
+$body
+"
+    }
+}
+
+# generate default copy procedure which may be overriden by the user for any
+# class layer:
+_proc ::stooop::generateDefaultCopyConstructor {fullClass} {
+    variable fullBases
+
+    # generate code for cloning base classes layers if there is at least one
+    # base class
+    foreach fullBase $fullBases($fullClass) {
+        append body \
+"${fullBase}::_copy \$this \$sibling
+"
+    }
+    append body \
+"::stooop::copy $fullClass \$sibling \$this
+"
+    _proc ${fullClass}::_copy {this sibling} $body
+}
+
+
+if {[llength [array names ::env STOOOP*]]>0} {
+    # if one or more environment variables are set, we are in debugging mode
+
+    # gracefully handle multiple sourcing of this file:
+    catch {rename ::stooop::class ::stooop::_class}
+    # use a new class procedure instead of adding debugging code to existing one
+    _proc ::stooop::class {args} {
+        variable trace
+        variable check
+
+        set class [lindex $args 0]
+        if {$check(data)} {
+            # check write and unset operations on empty named array holding
+            # class data
+            uplevel 1 namespace eval $class\
+                [list {::trace variable {} wu ::stooop::checkData}]
+        }
+        if {[info exists ::env(STOOOPTRACEDATA)]} {
+            # trace write and unset operations on empty named array holding
+            # class data
+            uplevel 1 namespace eval $class [list\
+                "::trace variable {} $trace(dataOperations) ::stooop::traceData"\
+            ]
+        }
+        uplevel 1 ::stooop::_class $args
+    }
+
+    if {$::stooop::check(procedures)} {
+        # prevent the creation of any object of a pure interface class
+        # use a new virtual procedure instead of adding debugging code to
+        # existing one
+        # gracefully handle multiple sourcing of this file:
+        catch {rename ::stooop::virtual ::stooop::_virtual}
+        # keep track of interface classes (which have at least 1 pure virtual
+        # procedure):
+        _proc ::stooop::virtual {keyword name arguments args} {
+            variable interface
+
+            uplevel 1 ::stooop::_virtual [list $keyword $name $arguments] $args
+            parseProcedureName [uplevel 1 namespace current] $name\
+                fullClass procedure message
+            if {[llength $args]==0} {    ;# no procedure body means pure virtual
+                set interface($fullClass) {}
+            }
+        }
+    }
+
+    if {$::stooop::check(objects)} {
+        _proc invokingProcedure {} {
+            if {[catch {set procedure [lindex [info level -2] 0]}]} {
+                # no invoking procedure
+                return {top level}
+            } elseif {\
+                ([string length $procedure]==0)||\
+                [string equal $procedure namespace]\
+            } {                                 ;# invoked from a namespace body
+                return "namespace [uplevel 2 namespace current]"
+            } else {
+                # store fully qualified name, visible from creator procedure
+                # invoking procedure
+                return [uplevel 3 namespace which -command $procedure]
+            }
+        }
+    }
+
+    if {$::stooop::check(procedures)||$::stooop::check(objects)} {
+        # gracefully handle multiple sourcing of this file:
+        catch {rename ::stooop::new ::stooop::_new}
+        # use a new new procedure instead of adding debugging code to existing
+        # one:
+        _proc ::stooop::new {classOrId args} {
+            variable newId
+            variable check
+
+            if {$check(procedures)} {
+                variable fullClass
+                variable interface
+            }
+            if {$check(objects)} {
+                variable creator
+            }
+            if {$check(procedures)} {
+                if {[string is integer $classOrId]} {
+                    # first argument is an object identifier
+                    # class code, if from a package, must already be loaded
+                    set fullName $fullClass($classOrId)
+                } else {                            ;# first argument is a class
+                    # generate constructor name:
+                    set constructor ${classOrId}::[namespace tail $classOrId]
+                    # force loading in case class is in a package so namespace
+                    # commands work properly:
+                    catch {$constructor}
+                    set fullName [namespace qualifiers\
+                        [uplevel 1 namespace which -command $constructor]\
+                    ]
+                    # anticipate full class name storage in original new{} in
+                    # order to avoid invalid object identifier error in
+                    # checkProcedure{} when member procedure is invoked from
+                    # within contructor, in which case full class name would
+                    # have yet to be stored.
+                    set fullClass([expr {$newId+1}]) $fullName
+                    # new identifier is really incremented in original new{}
+                }
+                if {[info exists interface($fullName)]} {
+                    error "class $fullName with pure virtual procedures should not be instanciated"
+                }
+            }
+            if {$check(objects)} {
+                # keep track of procedure in which creation occured (new
+                # identifier is really incremented in original new{})
+                set creator([expr {$newId+1}]) [invokingProcedure]
+            }
+            return [uplevel 1 ::stooop::_new $classOrId $args]
+        }
+    }
+
+    if {$::stooop::check(objects)} {
+        _proc ::stooop::delete {args} {
+            variable fullClass
+            variable deleter
+
+            # keep track of procedure in which deletion occured:
+            set procedure [invokingProcedure]
+            foreach id $args {
+                uplevel 1 ::stooop::deleteObject $fullClass($id) $id
+                unset fullClass($id)
+                set deleter($id) $procedure
+            }
+        }
+    }
+
+    # return the unsorted list of ancestors in class hierarchy:
+    _proc ::stooop::ancestors {fullClass} {
+        variable ancestors                         ;# use a cache for efficiency
+        variable fullBases
+
+        if {[info exists ancestors($fullClass)]} {
+            return $ancestors($fullClass)                  ;# found in the cache
+        }
+        set list {}
+        foreach class $fullBases($fullClass) {
+            set list [concat $list [list $class] [ancestors $class]]
+        }
+        set ancestors($fullClass) $list                         ;# save in cache
+        return $list
+    }
+
+    # since this procedure is always invoked from a debug procedure, take the
+    # extra level in the stack frame into account
+    # parameters (passed as references) that cannot be determined are not set
+    _proc ::stooop::debugInformation {\
+        className fullClassName procedureName fullProcedureName\
+        thisParameterName\
+    } {
+        upvar 1 $className class $fullClassName fullClass\
+            $procedureName procedure $fullProcedureName fullProcedure\
+            $thisParameterName thisParameter
+        variable declared
+
+        set namespace [uplevel 2 namespace current]
+        # not in a class namespace:
+        if {[lsearch -exact [array names declared] $namespace]<0} return
+        # remove redundant global qualifier:
+        set fullClass [string trimleft $namespace :]
+        set class [namespace tail $fullClass]                      ;# class name
+        set list [info level -2]
+        set first [lindex $list 0]
+        if {([llength $list]==0)||[string equal $first namespace]}\
+            return                     ;# not in a procedure, nothing else to do
+        set procedure $first
+        # procedure must be known at the invoker level:
+        set fullProcedure [uplevel 3 namespace which -command $procedure]
+        set procedure [namespace tail $procedure]        ;# strip procedure name
+        if {[string equal $class $procedure]} {                   ;# constructor
+            set procedure constructor
+        } elseif {[string equal ~$class $procedure]} {             ;# destructor
+            set procedure destructor
+        }
+        if {[string equal [lindex [info args $fullProcedure] 0] this]} {
+            # non static procedure
+            # object identifier is first argument:
+            set thisParameter [lindex $list 1]
+        }
+    }
+
+    # check that member procedure is valid for object passed as parameter:
+    _proc ::stooop::checkProcedure {} {
+        variable fullClass
+
+        debugInformation class qualifiedClass procedure qualifiedProcedure this
+        # static procedure, no checking possible:
+        if {![info exists this]} return
+        # in constructor, checking useless since object is not yet created:
+        if {[string equal $procedure constructor]} return
+        if {![info exists fullClass($this)]} {
+            error "$this is not a valid object identifier"
+        }
+        set fullName [string trimleft $fullClass($this) :]
+        # procedure and object classes match:
+        if {[string equal $fullName $qualifiedClass]} return
+        # restore global qualifiers to compare with internal full class array
+        # data
+        if {[lsearch -exact [ancestors ::$fullName] ::$qualifiedClass]<0} {
+            error "class $qualifiedClass of $qualifiedProcedure procedure not an ancestor of object $this class $fullName"
+        }
+    }
+
+    # gather current procedure data, perform substitutions and output to trace
+    # channel:
+    _proc ::stooop::traceProcedure {} {
+        variable trace
+
+        debugInformation class qualifiedClass procedure qualifiedProcedure this
+        # all debug data is available since we are for sure in a class procedure
+        set text $trace(procedureFormat)
+        regsub -all %C $text $qualifiedClass text  ;# fully qualified class name
+        regsub -all %c $text $class text
+        # fully qualified procedure name:
+        regsub -all %P $text $qualifiedProcedure text
+        regsub -all %p $text $procedure text
+        if {[info exists this]} {                        ;# non static procedure
+            regsub -all %O $text $this text
+            # remaining arguments:
+            regsub -all %a $text [lrange [info level -1] 2 end] text
+        } else {                                             ;# static procedure
+            regsub -all %O $text {} text
+            # remaining arguments:
+            regsub -all %a $text [lrange [info level -1] 1 end] text
+        }
+        puts $trace(procedureChannel) $text
+    }
+
+    # check that class data member is accessed within procedure of identical
+    # class
+    # then if procedure is not static, check that only data belonging to the
+    # object passed as parameter is accessed
+    _proc ::stooop::checkData {array name operation} {
+        scan $name %u,%s identifier member
+        # ignore internally defined members:
+        if {[info exists member]&&[string equal $member _derived]} return
+
+        debugInformation class qualifiedClass procedure qualifiedProcedure this
+        # no checking can be done outside of a class namespace:
+        if {![info exists class]} return
+        # determine array full name:
+        set array [uplevel 1 [list namespace which -variable $array]]
+        if {![info exists procedure]} {              ;# inside a class namespace
+            # compare with empty named array fully qualified name:
+            if {![string equal $array ::${qualifiedClass}::]} {
+                # trace command error message is automatically prepended and
+                # indicates operation
+                error\
+                    "class access violation in class $qualifiedClass namespace"
+            }
+            return                                                       ;# done
+        }
+        # ignore internal copy procedure:
+        if {[string equal $qualifiedProcedure ::stooop::copy]} return
+        if {![string equal $array ::${qualifiedClass}::]} {
+            # compare with empty named array fully qualified name
+            # trace command error message is automatically prepended and
+            # indicates operation
+            error "class access violation in procedure $qualifiedProcedure"
+        }
+        # static procedure, all objects can be accessed:
+        if {![info exists this]} return
+        # static data members can be accessed:
+        if {![info exists identifier]} return
+        # check that accessed data belongs to this object:
+        if {$this!=$identifier} {
+            error "object $identifier access violation in procedure $qualifiedProcedure acting on object $this"
+        }
+    }
+
+    # gather accessed data member information, perform substitutions and output
+    # to trace channel
+    _proc ::stooop::traceData {array name operation} {
+        variable trace
+
+        scan $name %u,%s identifier member
+        # ignore internally defined members:
+        if {[info exists member]&&[string equal $member _derived]} return
+
+        # ignore internal destruction:
+        if {\
+            ![catch {lindex [info level -1] 0} procedure]&&\
+            [string equal ::stooop::deleteObject $procedure]\
+        } return
+        set class {}                           ;# in case we are outside a class
+        set qualifiedClass {}
+        set procedure {}             ;# in case we are outside a class procedure
+        set qualifiedProcedure {}
+
+        debugInformation class qualifiedClass procedure qualifiedProcedure this
+        set text $trace(dataFormat)
+        regsub -all %C $text $qualifiedClass text  ;# fully qualified class name
+        regsub -all %c $text $class text
+        if {[info exists member]} {
+            regsub -all %m $text $member text
+        } else {
+            regsub -all %m $text $name text                     ;# static member
+        }
+        # fully qualified procedure name:
+        regsub -all %P $text $qualifiedProcedure text
+        regsub -all %p $text $procedure text
+        # fully qualified array name with global qualifiers stripped:
+        regsub -all %A $text [string trimleft\
+            [uplevel 1 [list namespace which -variable $array]] :\
+        ] text
+        if {[info exists this]} {                        ;# non static procedure
+            regsub -all %O $text $this text
+        } else {                                             ;# static procedure
+            regsub -all %O $text {} text
+        }
+        array set string {r read w write u unset}
+        regsub -all %o $text $string($operation) text
+        if {[string equal $operation u]} {
+            regsub -all %v $text {} text              ;# no value when unsetting
+        } else {
+            regsub -all %v $text [uplevel 1 set ${array}($name)] text
+        }
+        puts $trace(dataChannel) $text
+    }
+
+    if {$::stooop::check(objects)} {
+        # print existing objects along with creation procedure, with optional
+        # class pattern (see the string Tcl command manual)
+        _proc ::stooop::printObjects {{pattern *}} {
+            variable fullClass
+            variable creator
+
+            puts "stooop::printObjects invoked from [invokingProcedure]:"
+            foreach id [lsort -integer [array names fullClass]] {
+                if {[string match $pattern $fullClass($id)]} {
+                    puts "$fullClass($id)\($id\) + $creator($id)"
+                }
+            }
+        }
+
+        # record all existing objects for later report:
+        _proc ::stooop::record {} {
+            variable fullClass
+            variable checkpointFullClass
+
+            puts "stooop::record invoked from [invokingProcedure]"
+            catch {unset checkpointFullClass}
+            array set checkpointFullClass [array get fullClass]
+        }
+
+        # print all new or deleted object since last record, with optional class
+        # pattern:
+        _proc ::stooop::report {{pattern *}} {
+            variable fullClass
+            variable checkpointFullClass
+            variable creator
+            variable deleter
+
+            puts "stooop::report invoked from [invokingProcedure]:"
+            set checkpointIds [lsort -integer [array names checkpointFullClass]]
+            set currentIds [lsort -integer [array names fullClass]]
+            foreach id $currentIds {
+                if {\
+                    [string match $pattern $fullClass($id)]&&\
+                    ([lsearch -exact $checkpointIds $id]<0)\
+                } {
+                    puts "+ $fullClass($id)\($id\) + $creator($id)"
+                }
+            }
+            foreach id $checkpointIds {
+                if {\
+                    [string match $pattern $checkpointFullClass($id)]&&\
+                    ([lsearch -exact $currentIds $id]<0)\
+                } {
+                    puts "- $checkpointFullClass($id)\($id\) - $deleter($id) + $creator($id)"
+                }
+            }
+        }
+    }
+
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/switched.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/switched.tcl
new file mode 100644
index 00000000..b05c7737
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/switched.tcl
@@ -0,0 +1,133 @@
+# The switched class (for the stooop object oriented extension)
+#
+# Copyright (c) 2001 by Jean-Luc Fontaine <jfontain@free.fr>.
+# This code may be distributed under the same terms as Tcl.
+#
+# $Id: switched.tcl,v 1.5 2006/09/19 23:36:18 andreas_kupries Exp $
+
+package require stooop
+package provide switched 2.2.1
+
+
+::stooop::class switched {
+
+    proc switched {this args} {            ;# arguments are option / value pairs
+        if {([llength $args]%2)!=0} {
+            error "value for \"[lindex $args end]\" missing"
+        }
+        set ($this,complete) 0
+        # delay arguments processing till completion as pure virtual procedure
+        # invocations do not work from base class constructor
+        set ($this,arguments) $args
+    }
+
+    proc ~switched {this} {}
+
+    # derived class implementation must return a list of
+    # {name "default value" "initial value"} lists
+    ::stooop::virtual proc options {this}
+
+    # must be invoked once only at the end of derived class constructor so that
+    # configuration occurs once derived object is completely built:
+    proc complete {this} {
+        foreach description [options $this] {
+            set option [lindex $description 0]
+            # by default always set option to default value:
+            set ($this,$option) [set default [lindex $description 1]]
+            if {[llength $description]<3} {
+                # no initial value so force initialization with default value
+                set initialize($option) {}
+            } elseif {![string equal $default [lindex $description 2]]} {
+                set ($this,$option) [lindex $description 2]
+                # initial value different from default value so force
+                # initialization
+                set initialize($option) {}
+            }
+        }
+        # check validity of constructor options, which always take precedence
+        # for initialization
+        foreach {option value} $($this,arguments) {
+            if {[catch {string compare $($this,$option) $value} different]} {
+                error "$($this,_derived): unknown option \"$option\""
+            }
+            if {$different} {
+                set ($this,$option) $value
+                set initialize($option) {}
+            }
+        }
+        unset ($this,arguments)
+        # all option values are initialized before any of the set procedures are
+        # called
+        foreach option [array names initialize] {
+            $($this,_derived)::set$option $this $($this,$option)
+        }
+        set ($this,complete) 1
+    }
+
+    proc configure {this args} {      ;# should not be invoked before completion
+        if {[llength $args]==0} {
+            return [descriptions $this]
+        }
+        foreach {option value} $args {
+            # check all options validity before doing anything else
+            if {![info exists ($this,$option)]} {
+                error "$($this,_derived): unknown option \"$option\""
+            }
+        }
+        if {[llength $args]==1} {
+            return [description $this [lindex $args 0]]
+        }
+        if {([llength $args]%2)!=0} {
+            error "value for \"[lindex $args end]\" missing"
+        }
+        # derived (dynamic virtual) procedure must either accept (or eventually
+        # adjust) the value or throw an error
+        # option data member is set prior to invoking the procedure in case
+        # other procedures are invoked and expect the new value
+        foreach {option value} $args {
+            if {![string equal $($this,$option) $value]} {
+                $($this,_derived)::set$option $this [set ($this,$option) $value]
+            }
+        }
+    }
+
+    proc cget {this option} {
+        if {[catch {set value $($this,$option)}]} {
+            error "$($this,_derived): unknown option \"$option\""
+        }
+        return $value                   ;# return specified option current value
+    }
+
+    proc description {this option} {  ;# build specified option description list
+        foreach description [options $this] {
+            if {[string equal [lindex $description 0] $option]} {
+                if {[llength $description]<3} {              ;# no initial value
+                    lappend description $($this,$option) ;# append current value
+                    return $description
+                } else {
+                    # set current value:
+                    return [lreplace $description 2 2 $($this,$option)]
+                }
+            }
+        }
+    }
+
+    # build option descriptions list for all supported options:
+    proc descriptions {this} {
+        set descriptions {}
+        foreach description [options $this] {
+            if {[llength $description]<3} {                  ;# no initial value
+                # append current value:
+                lappend description $($this,[lindex $description 0])
+                lappend descriptions $description
+            } else {
+                # set current value:
+                lappend descriptions [lreplace\
+                    $description 2 2 $($this,[lindex $description 0])\
+                ]
+            }
+        }
+        return $descriptions
+    }
+
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/xifo.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/xifo.tcl
new file mode 100644
index 00000000..96b81ae0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stooop/xifo.tcl
@@ -0,0 +1,142 @@
+# The lifo and fifo classes (for the stooop object oriented extension)
+#
+# Copyright (c) 2002 by Jean-Luc Fontaine <jfontain@free.fr>.
+# This code may be distributed under the same terms as Tcl.
+#
+# $Id: xifo.tcl,v 1.4 2004/07/19 19:12:45 jfontain Exp $
+
+
+# Here is a sample FIFO/LIFO implementation with stooop.
+# Sample test code is at the bottom of this file.
+
+
+# Uncomment the following lines for the bottom sample code to work:
+# package require stooop
+# namespace import stooop::*
+
+
+::stooop::class xifo {
+
+    proc xifo {this size} {
+        set ($this,size) $size
+        empty $this
+    }
+
+    proc ~xifo {this} {
+        variable ${this}data
+        catch {unset ${this}data}
+    }
+
+    proc in {this data} {
+        variable ${this}data
+        tidyUp $this
+        if {[array size ${this}data] >= $($this,size)} {
+            unset ${this}data($($this,first))
+            incr ($this,first)
+        }
+        set ${this}data([incr ($this,last)]) $data
+    }
+
+    proc tidyUp {this} {                       ;# warning: for internal use only
+        variable ${this}data
+        catch {
+            unset ${this}data($($this,unset))
+            unset ($this,unset)
+        }
+    }
+
+    proc empty {this} {
+        variable ${this}data
+        catch {unset ${this}data}
+        catch {unset ($this,unset)}
+        set ($this,first) 0
+        set ($this,last) -1
+    }
+
+    proc isEmpty {this} {
+        return [expr {$($this,last) < $($this,first)}]
+    }
+
+    ::stooop::virtual proc out {this}
+
+    ::stooop::virtual proc data {this}
+}
+
+
+::stooop::class lifo {
+
+    proc lifo {this {size 2147483647}} xifo {$size} {}
+
+    proc ~lifo {this} {}
+
+    proc out {this} {
+        xifo::tidyUp $this
+        if {[array size xifo::${this}data] == 0} {
+            error "lifo $this out error, empty"
+        }
+        # delay unsetting popped data to improve performance by avoiding a data
+        # copy:
+        set xifo::($this,unset) $xifo::($this,last)
+        incr xifo::($this,last) -1
+        return [set xifo::${this}data($xifo::($this,unset))]
+    }
+
+    proc data {this} {
+        set list {}
+        set first $xifo::($this,first)
+        for {set index $xifo::($this,last)} {$index >= $first} {incr index -1} {
+            lappend list [set xifo::${this}data($index)]
+        }
+        return $list
+    }
+
+}
+
+
+::stooop::class fifo {
+
+    proc fifo {this {size 2147483647}} xifo {$size} {}
+
+    proc ~fifo {this} {}
+
+    proc out {this} {
+        xifo::tidyUp $this
+        if {[array size xifo::${this}data] == 0} {
+            error "fifo $this out error, empty"
+        }
+        # delay unsetting popped data to improve performance by avoiding a data
+        # copy:
+        set xifo::($this,unset) $xifo::($this,first)
+        incr xifo::($this,first)
+        return [set xifo::${this}data($xifo::($this,unset))]
+    }
+
+    proc data {this} {
+        set list {}
+        set last $xifo::($this,last)
+        for {set index $xifo::($this,first)} {$index <= $last} {incr index} {
+            lappend list [set xifo::${this}data($index)]
+        }
+        return $list
+    }
+
+}
+
+
+# Here are a few lines of sample code:
+#    proc exercise {id} {
+#        for {set u 0} {$u < 10} {incr u} {
+#            xifo::in $id $u
+#        }
+#        puts [xifo::out $id]
+#        puts [xifo::data $id]
+#        xifo::in $id $u
+#        xifo::in $id [incr u]
+#        puts [xifo::data $id]
+#    }
+#    set id [stooop::new lifo 10]
+#    exercise $id
+#    stooop::delete $id
+#    set id [stooop::new fifo 10]
+#    exercise $id
+#    stooop::delete $id
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/string/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/string/pkgIndex.tcl
new file mode 100644
index 00000000..27196e96
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/string/pkgIndex.tcl
@@ -0,0 +1,6 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    # FRINK: nocheck
+    return
+}
+package ifneeded string::token        1   [list source [file join $dir token.tcl]]
+package ifneeded string::token::shell 1.2 [list source [file join $dir token_shell.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/string/token.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/string/token.tcl
new file mode 100644
index 00000000..85b7304e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/string/token.tcl
@@ -0,0 +1,94 @@
+# # ## ### ##### ######## ############# #####################
+## Copyright (c) 2013 Andreas Kupries, BSD licensed
+
+# # ## ### ##### ######## ############# #####################
+## Requisites
+
+package require Tcl 8.5
+package require fileutil ;# cat
+
+# # ## ### ##### ######## ############# #####################
+## API setup
+#
+
+namespace eval ::string::token {
+    namespace export chomp file text
+    namespace ensemble create
+}
+
+## NOTE: We are placing the 'token' ensemble command into the Tcl
+##       core's builtin 'string' ensemble.
+
+apply {{} {
+    set map [namespace ensemble configure ::string -map]
+    dict set map token ::string::token
+    namespace ensemble configure ::string -map $map
+    return
+}}
+
+# # ## ### ##### ######## ############# #####################
+## API
+
+proc ::string::token::file {map path args} {
+    return [text $map [fileutil::cat {*}$args $path]]
+}
+
+proc ::string::token::text {map text} {
+    # map = dict (regex -> label)
+    #   note! order is important, most specific to most general.
+
+    # result = list (token)
+    # where
+    #   token = list(label start-index end-index)
+
+    set start  0
+    set result {}
+
+    # status values:
+    #  0: no token found, abort
+    #  1: token found, continue
+    #  2: no token found, end of string reached, stop, ok.
+    set status 1
+    while {$status == 1} {
+	set status [chomp $map start $text result]
+    }
+    if {$status == 0} {
+	return -code error \
+	    -errorcode {STRING TOKEN BAD CHARACTER} \
+	    "Unexpected character '[string index $text $start]' at offset $start"
+    }
+    return $result
+}
+
+# # ## ### ##### ######## ############# #####################
+## Internal, helpers.
+
+proc ::string::token::chomp {map sv text rv} {
+    upvar 1 $sv start $rv result
+
+    # Stop when trying to match after the end of the string.
+    if {$text eq {}} {return 2}
+    if {$start >= [string length $text]} {return 2}
+
+    #puts |$start||[string range $text $start end]||$result|
+
+    foreach {pattern label} $map {
+	if {![regexp -start $start -indices -- \\A($pattern) $text -> range]} continue
+
+	lappend result [list $label {*}$range]
+	lassign $range a e
+
+	#puts MATCH|$pattern|[string range $text $a $e]|
+
+	set start $e
+	incr start
+	return 1
+    }
+    return 0
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide string::token 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/string/token_shell.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/string/token_shell.tcl
new file mode 100644
index 00000000..256e3d0d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/string/token_shell.tcl
@@ -0,0 +1,172 @@
+# # ## ### ##### ######## ############# #####################
+## Copyright (c) 2013 Andreas Kupries, BSD licensed
+
+# # ## ### ##### ######## ############# #####################
+## Requisites
+
+package require Tcl 8.5
+package require string::token
+
+# # ## ### ##### ######## ############# #####################
+## API setup
+
+namespace eval ::string::token {
+    # Note: string::token claims the "text" and "file" commands.
+    namespace export shell
+    namespace ensemble create
+}
+
+proc ::string::token::shell {args} {
+    # result = list (word)
+
+    set partial 0
+    set indices 0
+    while {[llength $args]} {
+	switch -glob -- [set o [lindex $args 0]] {
+	    -partial { set partial 1 }
+	    -indices { set indices 1 }
+	    -- {
+		set args [lrange $args 1 end]
+		break
+	    }
+	    -* {
+		# Unknown option.
+		return -code error \
+		    -errorcode {STRING TOKEN SHELL BAD OPTION} \
+		    "Bad option $o, expected one of -indices, or -partial"
+	    }
+	    * {
+		# Non-option, stop option processing.
+		break
+	    }
+	}
+	set args [lrange $args 1 end]
+    }
+    if {[llength $args] != 1} {
+	return -code error \
+	    -errorcode {STRING TOKEN WRONG ARGS} \
+	    "wrong \# args: should be \"[lindex [info level 0] 0] ?-indices? ?-partial? ?--? text\""
+    } else {
+	set text [lindex $args 0]
+    }
+
+    set space    \\s
+    set     lexer {}
+    lappend lexer ${space}+                                  WSPACE
+    lappend lexer {'[^']*'}                                  S:QUOTED
+    lappend lexer "\"(\[^\"\]|(\\\\\")|(\\\\\\\\))*\""       D:QUOTED
+    lappend lexer "((\[^ $space'\"\])|(\\\\\")|(\\\\\\\\))+" PLAIN
+
+    if {$partial} {
+	lappend lexer {'[^']*$}                             S:QUOTED:PART
+	lappend lexer "\"(\[^\"\]|(\\\\\")|(\\\\\\\\))*$"   D:QUOTED:PART
+    }
+
+    lappend lexer {.*}                                       ERROR
+
+    set dequote [list \\" \" \\\\ \\ ] ; #"
+
+    set result {}
+
+    # Parsing of a shell line is a simple grammar, RE-equivalent
+    # actually, thus tractable with a plain finite state machine.
+    #
+    # States:
+    # - WS-WORD : Expected whitespace or word.
+    # - WS      : Expected whitespace
+    # - WORD    : Expected word.
+
+    # We may have leading whitespace.
+    set state WS-WORD
+    foreach token [text $lexer $text] {
+	lassign $token type start end
+
+	#puts "[format %7s $state] + ($token) = <<[string range $text $start $end]>>"
+
+	set changed 0
+	switch -glob -- ${type}/$state {
+	    ERROR/* {
+		return -code error \
+		    -errorcode {STRING TOKEN SHELL BAD SYNTAX CHAR} \
+		    "Unexpected character '[string index $text $start]' at offset $start"
+	    }
+	    WSPACE/WORD {
+		# Impossible
+		return -code error \
+		    -errorcode {STRING TOKEN SHELL BAD SYNTAX WHITESPACE} \
+		    "Expected start of word, got whitespace at offset $start."
+	    }
+	    PLAIN/WS -
+	    *:QUOTED*/WS {
+		return -code error \
+		    -errorcode {STRING TOKEN SHELL BAD SYNTAX WORD} \
+		    "Expected whitespace, got start of word at offset $start"
+	    }
+            WSPACE/WS* {
+		# Ignore leading, inter-word, and trailing whitespace
+		# Must be followed by a word
+		set state WORD
+	    }
+	    S:QUOTED/*WORD {
+		# Quoted word, single, extract it, ignore delimiters.
+		# Must be followed by whitespace.
+		incr start
+		incr end -1
+		lappend result [string range $text $start $end]
+		set state WS
+		set changed 1
+	    }
+	    S:QUOTED:PART/*WORD {
+		# Quoted partial word (at end), single, extract it, ignore delimiter at start, none at end.
+		# Must be followed by nothing.
+		incr start
+		lappend result [string range $text $start $end]
+		set state WS
+		set changed 1
+	    }
+	    D:QUOTED/*WORD {
+		# Quoted word, double, extract it, ignore delimiters.
+		# Have to check for and reduce escaped double quotes and backslashes.
+		# Must be followed by whitespace.
+		incr start
+		incr end -1
+		lappend result [string map $dequote [string range $text $start $end]]
+		set state WS
+		set changed 1
+	    }
+	    D:QUOTED:PART/*WORD {
+		# Quoted word, double, extract it, ignore delimiter at start, none at end.
+		# Have to check for and reduce escaped double quotes and backslashes.
+		# Must be followed by nothing.
+		incr start
+		lappend result [string map $dequote [string range $text $start $end]]
+		set state WS
+		set changed 1
+	    }
+	    PLAIN/*WORD {
+		# Unquoted word. extract.
+		# Have to check for and reduce escaped double quotes and backslashes.
+		# Must be followed by whitespace.
+		lappend result [string map $dequote [string range $text $start $end]]
+		set state WS
+		set changed 1
+	    }
+	    * {
+		return -code error \
+		    -errorcode {STRING TOKEN SHELL INTERNAL} \
+		    "Illegal token/state combination $type/$state"
+	    }
+        }
+	if {$indices && $changed} {
+	    set last [lindex $result end]
+	    set result [lreplace $result end end [list {*}$token $last]]
+	}
+    }
+    return $result
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
+
+package provide string::token::shell 1.2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/pkgIndex.tcl
new file mode 100644
index 00000000..952fbaad
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/pkgIndex.tcl
@@ -0,0 +1,5 @@
+package ifneeded stringprep 1.0.1 [list source [file join $dir stringprep.tcl]]
+package ifneeded stringprep::data 1.0.1 [list source [file join $dir stringprep_data.tcl]]
+package ifneeded unicode 1.0.0 [list source [file join $dir unicode.tcl]]
+package ifneeded unicode::data 1.0.0 [list source [file join $dir unicode_data.tcl]]
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/stringprep.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/stringprep.tcl
new file mode 100644
index 00000000..70d14f62
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/stringprep.tcl
@@ -0,0 +1,278 @@
+# stringprep.tcl                                                -*- tcl -*-
+#
+#	Implementation of RFC 3454 "Preparation of Internationalized Strings"
+#
+# Copyright (c) 2007 Sergei Golovan
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: stringprep.tcl,v 1.2 2009/11/02 00:26:44 patthoyts Exp $
+
+package require stringprep::data 1.0
+package require unicode 1.0
+
+namespace eval ::stringprep {
+    variable profiles
+    array unset profiles
+}
+
+########################################################################
+# Register new stringprep profile
+
+proc ::stringprep::register {profile args} {
+    variable profiles
+
+    array set props [list -mapping "" \
+			  -normalization "" \
+			  -prohibited 0 \
+			  -prohibitedList {} \
+			  -prohibitedCommand "" \
+			  -prohibitedBidi 0]
+
+    foreach {opt val} $args {
+	switch -- $opt {
+	    -mapping {
+		foreach tab $val {
+		    switch -- $tab {
+			B.1 - B.2 - B.3 {}
+			default {
+			    return -code error \
+				   "::stringprep::register -mapping: Only\
+				    B.1, B.2, B.3 tables are allowed"
+			}
+		    }
+		}
+		set props(-mapping) $val
+	    }
+	    -normalization {
+		switch -- $val {
+		    D - C - KD - KC - "" {
+			set props(-normalization) $val
+		    }
+		    default {
+			return -code error \
+			       "::stringprep::register -normalization: Only\
+				D, C, KD, KC or empty normalization is allowed"
+		    }
+		}
+	    }
+	    -prohibited {
+		set mask 0
+		set c39count 0
+		foreach tab $val {
+		    switch -- $tab {
+			A.1 { set mask [expr {$mask | $data::A1Mask}] }
+			C.1.1 { set mask [expr {$mask | $data::C11Mask}] }
+			C.1.2 { set mask [expr {$mask | $data::C12Mask}] }
+			C.2.1 { set mask [expr {$mask | $data::C21Mask}] }
+			C.2.2 { set mask [expr {$mask | $data::C22Mask}] }
+			C.3 - C.4 - C.5 - C.6 - C.7 - C.8 -
+			C.9 { incr c39count }
+			default {
+			    return -code error \
+				   "::stringprep::register -prohibited: Only\
+				    tables A.1, C.* are allowed to prohibit"
+			}
+		    }
+		}
+		if {$c39count > 0 && $c39count < 7} {
+		    return -code error \
+			   "::stringprep::register -prohibited: Must prohibit\
+			    all C.3--C.9 tables or none of them"
+		}
+		if {$c39count > 0} {
+		    set mask [expr {$mask | $data::C39Mask}]
+		}
+		set props(-prohibited) $mask
+	    }
+	    -prohibitedList {
+		if {[catch {
+			foreach uc $val {
+			    if {![string is integer -strict $uc]} {
+				error not_integer
+			    } else {
+				lappend props(-prohibitedList) [expr {$uc}]
+			    }
+			}}]} {
+		    return -code error \
+			   "::stringprep::register -prohibitedList: List\
+			    of integers expected"
+		}
+	    }
+	    -prohibitedCommand {
+		set props(-prohibitedCommand) $val
+	    }
+	    -prohibitedBidi {
+		if {[string is true -strict $val]} {
+		    set props(-prohibitedBidi) 1
+		} elseif {[string is false -strict $val]} {
+		    set props(-prohibitedBidi) 0
+		} else {
+		    return -code error \
+			   "::stringprep::register -prohibitedBidi: Boolean\
+			    value expected"
+		}
+	    }
+	}
+    }
+    set profiles($profile) [array get props]
+}
+
+########################################################################
+# Register identity profile
+
+::stringprep::register none \
+    -mapping {} \
+    -normalization {} \
+    -prohibited {} \
+    -prohibitedBidi 0
+
+########################################################################
+
+proc ::stringprep::stringprep {profile str} {
+    variable profiles
+
+    if {![info exists profiles($profile)]} {
+	return -code error invalid_profile
+    }
+
+    set uclist [::unicode::fromstring $str]
+
+    set uclist [map $profile $uclist]
+    if {[llength $uclist] == 0} {
+	return ""
+    }
+
+    set uclist [normalize $profile $uclist]
+
+    if {[prohibited $profile $uclist]} {
+	return -code error prohibited_character
+    }
+
+    if {[prohibited_bidi $profile $uclist]} {
+	return -code error prohibited_bidi
+    }
+
+    ::unicode::tostring $uclist
+}
+
+########################################################################
+
+proc ::stringprep::compare {profile str1 str2} {
+    string compare [stringprep $profile $str1] [stringprep $profile $str2]
+}
+
+########################################################################
+# Mapping (section 3)
+
+proc ::stringprep::map {profile uclist} {
+    variable profiles
+
+    array set props $profiles($profile)
+
+    set B1Mask 0
+    set B3Mask 0
+    set B2 0
+    foreach tab $props(-mapping) {
+	switch -- $tab {
+	    B.1 { set B1Mask $data::B1Mask }
+	    B.2 { set B2 1 }
+	    B.3 { set B3Mask $data::B3Mask }
+	}
+    }
+
+    set res {}
+    foreach uc $uclist {
+	set info [data::GetUniCharInfo $uc]
+
+	if {$info & $B1Mask} {
+	    # Map to nothing
+	    continue
+	}
+
+	if {$B2 || ($info & $B3Mask)} {
+	    if {$info & $data::MCMask} {
+		set res [concat $res [data::GetMC $info]]
+	    } else {
+		lappend res [expr {$uc + [data::GetDelta $info]}]
+	    }
+	} else {
+	    lappend res $uc
+	}
+    }
+    return $res
+}
+
+########################################################################
+# Normalization (section 4)
+
+proc ::stringprep::normalize {profile uclist} {
+    variable profiles
+
+    array set props $profiles($profile)
+
+    switch -- $props(-normalization) {
+	D - C - KD - KC {
+	    return [::unicode::normalize $props(-normalization) $uclist]
+	}
+	default { return $uclist }
+    }
+}
+
+########################################################################
+# Prohibit (section 5)
+
+proc ::stringprep::prohibited {profile uclist} {
+    variable profiles
+
+    array set props $profiles($profile)
+
+    foreach uc $uclist {
+	set info [data::GetUniCharInfo $uc]
+	if {($info & $props(-prohibited)) || \
+		[lsearch -exact $props(-prohibitedList) $uc] >= 0} {
+	    return 1
+	} elseif {$props(-prohibitedCommand) != "" && \
+		[uplevel #0 $props(-prohibitedCommand) [list $uc]]} {
+	    return 1
+	}
+    }
+    return 0
+}
+
+########################################################################
+# Check bidi (section 6)
+
+proc ::stringprep::prohibited_bidi {profile uclist} {
+    variable profiles
+
+    array set props $profiles($profile)
+
+    if {!$props(-prohibitedBidi)} {
+	return 0
+    }
+
+    set info [data::GetUniCharInfo [lindex $uclist 0]]
+    set first_ral [expr {$info & $data::D1Mask}]
+    set last_ral 0
+    set have_ral 0
+    set have_l 0
+    foreach uc $uclist {
+	set info [data::GetUniCharInfo $uc]
+	set last_ral [expr {$info & $data::D1Mask}]
+	set have_ral [expr {$have_ral || $last_ral}]
+	set have_l   [expr {$have_l || ($info & $data::D2Mask)}]
+    }
+    if {$have_ral && (!$first_ral || !$last_ral || $have_l)} {
+	return 1
+    } else {
+	return 0
+    }
+}
+
+########################################################################
+
+package provide stringprep 1.0.1
+
+########################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/stringprep_data.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/stringprep_data.tcl
new file mode 100644
index 00000000..7c76426a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/stringprep_data.tcl
@@ -0,0 +1,1034 @@
+# stringprep_data.tcl --
+#
+#	Declarations of Unicode character information tables.  This file is
+#	automatically generated by the gen_stringprep_data.tcl script.  Do not
+#	modify this file by hand.
+#
+# Copyright (c) 1998 Scriptics Corporation.
+# Copyright (c) 2007 Alexey Shchepin
+# Copyright (c) 2008 Sergei Golovan
+#
+# RCS: @(#) $Id: stringprep_data.tcl,v 1.2 2009/11/02 00:26:44 patthoyts Exp $
+#
+
+package provide stringprep::data 1.0.1
+
+namespace eval ::stringprep::data {
+
+#
+# A 16-bit Unicode character is split into two parts in order to index
+# into the following tables.  The lower OFFSET_BITS comprise an offset
+# into a page of characters.  The upper bits comprise the page number.
+#
+
+set OFFSET_BITS 7
+
+#
+# The pageMap is indexed by page number and returns an alternate page number
+# that identifies a unique page of characters.  Many Unicode characters map
+# to the same alternate page number.
+#
+
+array unset pageMap
+array set pageMap [list \
+    0 0 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 10 10 11 11 12 12 13 13 14 14 \
+    15 15 18 17 19 18 20 19 21 20 22 21 23 22 24 23 25 24 26 25 27 26 28 27 \
+    29 28 30 29 31 30 32 31 33 32 34 33 35 34 36 35 37 36 38 37 39 38 40 39 \
+    41 40 42 40 43 40 44 41 45 42 46 43 47 44 48 45 49 46 60 47 61 48 62 49 \
+    63 50 64 51 65 52 66 53 67 54 68 55 69 55 70 56 71 57 72 58 73 59 74 55 \
+    75 55 76 60 77 61 78 62 79 63 80 55 81 55 82 55 83 55 84 55 85 55 93 64 \
+    94 55 95 65 96 66 97 67 98 68 99 69 100 70 101 71 102 72 103 73 104 40 \
+    105 40 106 40 107 40 108 40 109 40 110 40 111 40 112 40 113 40 114 40 \
+    115 40 116 40 117 40 118 40 119 40 120 40 121 40 122 40 123 40 124 40 \
+    125 40 126 40 127 40 128 40 129 40 130 40 131 40 132 40 133 40 134 40 \
+    135 40 136 40 137 40 138 40 139 40 140 40 141 40 142 40 143 40 144 40 \
+    145 40 146 40 147 40 148 40 149 40 150 40 151 40 152 40 153 40 154 40 \
+    155 74 156 40 157 40 158 40 159 40 160 40 161 40 162 40 163 40 164 40 \
+    165 40 166 40 167 40 168 40 169 40 170 40 171 40 172 40 173 40 174 40 \
+    175 40 176 40 177 40 178 40 179 40 180 40 181 40 182 40 183 40 184 40 \
+    185 40 186 40 187 40 188 40 189 40 190 40 191 40 192 40 193 40 194 40 \
+    195 40 196 40 197 40 198 40 199 40 200 40 201 40 202 40 203 40 204 40 \
+    205 40 206 40 207 40 208 40 209 40 210 40 211 40 212 40 213 40 214 40 \
+    215 40 216 40 217 40 218 40 219 40 220 40 221 40 222 40 223 40 224 40 \
+    225 40 226 40 227 40 228 40 229 40 230 40 231 40 232 40 233 40 234 40 \
+    235 40 236 40 237 40 238 40 239 40 240 40 241 40 242 40 243 40 244 40 \
+    245 40 246 40 247 40 248 40 249 40 250 40 251 40 252 40 253 40 254 40 \
+    255 40 256 40 257 40 258 40 259 40 260 40 261 40 262 40 263 40 264 40 \
+    265 40 266 40 267 40 268 40 269 40 270 40 271 40 272 40 273 40 274 40 \
+    275 40 276 40 277 40 278 40 279 40 280 40 281 40 282 40 283 40 284 40 \
+    285 40 286 40 287 40 288 40 289 40 290 40 291 40 292 40 293 40 294 40 \
+    295 40 296 40 297 40 298 40 299 40 300 40 301 40 302 40 303 40 304 40 \
+    305 40 306 40 307 40 308 40 309 40 310 40 311 40 312 40 313 40 314 40 \
+    315 40 316 40 317 40 318 40 319 75 320 40 321 40 322 40 323 40 324 40 \
+    325 40 326 40 327 40 328 40 329 76 344 40 345 40 346 40 347 40 348 40 \
+    349 40 350 40 351 40 352 40 353 40 354 40 355 40 356 40 357 40 358 40 \
+    359 40 360 40 361 40 362 40 363 40 364 40 365 40 366 40 367 40 368 40 \
+    369 40 370 40 371 40 372 40 373 40 374 40 375 40 376 40 377 40 378 40 \
+    379 40 380 40 381 40 382 40 383 40 384 40 385 40 386 40 387 40 388 40 \
+    389 40 390 40 391 40 392 40 393 40 394 40 395 40 396 40 397 40 398 40 \
+    399 40 400 40 401 40 402 40 403 40 404 40 405 40 406 40 407 40 408 40 \
+    409 40 410 40 411 40 412 40 413 40 414 40 415 40 416 40 417 40 418 40 \
+    419 40 420 40 421 40 422 40 423 40 424 40 425 40 426 40 427 40 428 40 \
+    429 40 430 40 431 77 432 78 433 78 434 78 435 78 436 78 437 78 438 78 \
+    439 78 440 78 441 78 442 78 443 78 444 78 445 78 446 78 447 78 448 78 \
+    449 78 450 78 451 78 452 78 453 78 454 78 455 78 456 78 457 78 458 78 \
+    459 78 460 78 461 78 462 78 463 78 464 78 465 78 466 78 467 78 468 78 \
+    469 78 470 78 471 78 472 78 473 78 474 78 475 78 476 78 477 78 478 78 \
+    479 78 480 78 481 78 482 78 483 78 484 78 485 78 486 78 487 78 488 78 \
+    489 78 490 78 491 78 492 78 493 78 494 78 495 78 496 78 497 78 498 40 \
+    499 40 500 79 502 80 503 81 504 82 505 82 506 83 507 84 508 85 509 86 \
+    510 87 511 88 518 89 520 90 928 40 929 91 930 92 931 93 936 94 937 95 \
+    938 96 939 97 940 98 941 99 942 100 943 101 1023 102 1024 40 1025 40 \
+    1026 40 1027 40 1028 40 1029 40 1030 40 1031 40 1032 40 1033 40 1034 40 \
+    1035 40 1036 40 1037 40 1038 40 1039 40 1040 40 1041 40 1042 40 1043 40 \
+    1044 40 1045 40 1046 40 1047 40 1048 40 1049 40 1050 40 1051 40 1052 40 \
+    1053 40 1054 40 1055 40 1056 40 1057 40 1058 40 1059 40 1060 40 1061 40 \
+    1062 40 1063 40 1064 40 1065 40 1066 40 1067 40 1068 40 1069 40 1070 40 \
+    1071 40 1072 40 1073 40 1074 40 1075 40 1076 40 1077 40 1078 40 1079 40 \
+    1080 40 1081 40 1082 40 1083 40 1084 40 1085 40 1086 40 1087 40 1088 40 \
+    1089 40 1090 40 1091 40 1092 40 1093 40 1094 40 1095 40 1096 40 1097 40 \
+    1098 40 1099 40 1100 40 1101 40 1102 40 1103 40 1104 40 1105 40 1106 40 \
+    1107 40 1108 40 1109 40 1110 40 1111 40 1112 40 1113 40 1114 40 1115 40 \
+    1116 40 1117 40 1118 40 1119 40 1120 40 1121 40 1122 40 1123 40 1124 40 \
+    1125 40 1126 40 1127 40 1128 40 1129 40 1130 40 1131 40 1132 40 1133 40 \
+    1134 40 1135 40 1136 40 1137 40 1138 40 1139 40 1140 40 1141 40 1142 40 \
+    1143 40 1144 40 1145 40 1146 40 1147 40 1148 40 1149 40 1150 40 1151 40 \
+    1152 40 1153 40 1154 40 1155 40 1156 40 1157 40 1158 40 1159 40 1160 40 \
+    1161 40 1162 40 1163 40 1164 40 1165 40 1166 40 1167 40 1168 40 1169 40 \
+    1170 40 1171 40 1172 40 1173 40 1174 40 1175 40 1176 40 1177 40 1178 40 \
+    1179 40 1180 40 1181 40 1182 40 1183 40 1184 40 1185 40 1186 40 1187 40 \
+    1188 40 1189 40 1190 40 1191 40 1192 40 1193 40 1194 40 1195 40 1196 40 \
+    1197 40 1198 40 1199 40 1200 40 1201 40 1202 40 1203 40 1204 40 1205 40 \
+    1206 40 1207 40 1208 40 1209 40 1210 40 1211 40 1212 40 1213 40 1214 40 \
+    1215 40 1216 40 1217 40 1218 40 1219 40 1220 40 1221 40 1222 40 1223 40 \
+    1224 40 1225 40 1226 40 1227 40 1228 40 1229 40 1230 40 1231 40 1232 40 \
+    1233 40 1234 40 1235 40 1236 40 1237 40 1238 40 1239 40 1240 40 1241 40 \
+    1242 40 1243 40 1244 40 1245 40 1246 40 1247 40 1248 40 1249 40 1250 40 \
+    1251 40 1252 40 1253 40 1254 40 1255 40 1256 40 1257 40 1258 40 1259 40 \
+    1260 40 1261 40 1262 40 1263 40 1264 40 1265 40 1266 40 1267 40 1268 40 \
+    1269 40 1270 40 1271 40 1272 40 1273 40 1274 40 1275 40 1276 40 1277 40 \
+    1278 40 1279 40 1280 40 1281 40 1282 40 1283 40 1284 40 1285 40 1286 40 \
+    1287 40 1288 40 1289 40 1290 40 1291 40 1292 40 1293 40 1294 40 1295 40 \
+    1296 40 1297 40 1298 40 1299 40 1300 40 1301 40 1302 40 1303 40 1304 40 \
+    1305 40 1306 40 1307 40 1308 40 1309 40 1310 40 1311 40 1312 40 1313 40 \
+    1314 40 1315 40 1316 40 1317 40 1318 40 1319 40 1320 40 1321 40 1322 40 \
+    1323 40 1324 40 1325 40 1326 40 1327 40 1328 40 1329 40 1330 40 1331 40 \
+    1332 40 1333 40 1334 40 1335 40 1336 40 1337 40 1338 40 1339 40 1340 40 \
+    1341 40 1342 40 1343 40 1344 40 1345 40 1346 40 1347 40 1348 40 1349 40 \
+    1350 40 1351 40 1352 40 1353 40 1354 40 1355 40 1356 40 1357 103 1520 40 \
+    1521 40 1522 40 1523 40 1524 104 1535 102 2047 102 2559 102 3071 102 \
+    3583 102 4095 102 4607 102 5119 102 5631 102 6143 102 6655 102 7167 102 \
+    7168 105 7679 102 7680 78 7681 78 7682 78 7683 78 7684 78 7685 78 7686 78 \
+    7687 78 7688 78 7689 78 7690 78 7691 78 7692 78 7693 78 7694 78 7695 78 \
+    7696 78 7697 78 7698 78 7699 78 7700 78 7701 78 7702 78 7703 78 7704 78 \
+    7705 78 7706 78 7707 78 7708 78 7709 78 7710 78 7711 78 7712 78 7713 78 \
+    7714 78 7715 78 7716 78 7717 78 7718 78 7719 78 7720 78 7721 78 7722 78 \
+    7723 78 7724 78 7725 78 7726 78 7727 78 7728 78 7729 78 7730 78 7731 78 \
+    7732 78 7733 78 7734 78 7735 78 7736 78 7737 78 7738 78 7739 78 7740 78 \
+    7741 78 7742 78 7743 78 7744 78 7745 78 7746 78 7747 78 7748 78 7749 78 \
+    7750 78 7751 78 7752 78 7753 78 7754 78 7755 78 7756 78 7757 78 7758 78 \
+    7759 78 7760 78 7761 78 7762 78 7763 78 7764 78 7765 78 7766 78 7767 78 \
+    7768 78 7769 78 7770 78 7771 78 7772 78 7773 78 7774 78 7775 78 7776 78 \
+    7777 78 7778 78 7779 78 7780 78 7781 78 7782 78 7783 78 7784 78 7785 78 \
+    7786 78 7787 78 7788 78 7789 78 7790 78 7791 78 7792 78 7793 78 7794 78 \
+    7795 78 7796 78 7797 78 7798 78 7799 78 7800 78 7801 78 7802 78 7803 78 \
+    7804 78 7805 78 7806 78 7807 78 7808 78 7809 78 7810 78 7811 78 7812 78 \
+    7813 78 7814 78 7815 78 7816 78 7817 78 7818 78 7819 78 7820 78 7821 78 \
+    7822 78 7823 78 7824 78 7825 78 7826 78 7827 78 7828 78 7829 78 7830 78 \
+    7831 78 7832 78 7833 78 7834 78 7835 78 7836 78 7837 78 7838 78 7839 78 \
+    7840 78 7841 78 7842 78 7843 78 7844 78 7845 78 7846 78 7847 78 7848 78 \
+    7849 78 7850 78 7851 78 7852 78 7853 78 7854 78 7855 78 7856 78 7857 78 \
+    7858 78 7859 78 7860 78 7861 78 7862 78 7863 78 7864 78 7865 78 7866 78 \
+    7867 78 7868 78 7869 78 7870 78 7871 78 7872 78 7873 78 7874 78 7875 78 \
+    7876 78 7877 78 7878 78 7879 78 7880 78 7881 78 7882 78 7883 78 7884 78 \
+    7885 78 7886 78 7887 78 7888 78 7889 78 7890 78 7891 78 7892 78 7893 78 \
+    7894 78 7895 78 7896 78 7897 78 7898 78 7899 78 7900 78 7901 78 7902 78 \
+    7903 78 7904 78 7905 78 7906 78 7907 78 7908 78 7909 78 7910 78 7911 78 \
+    7912 78 7913 78 7914 78 7915 78 7916 78 7917 78 7918 78 7919 78 7920 78 \
+    7921 78 7922 78 7923 78 7924 78 7925 78 7926 78 7927 78 7928 78 7929 78 \
+    7930 78 7931 78 7932 78 7933 78 7934 78 7935 78 7936 78 7937 78 7938 78 \
+    7939 78 7940 78 7941 78 7942 78 7943 78 7944 78 7945 78 7946 78 7947 78 \
+    7948 78 7949 78 7950 78 7951 78 7952 78 7953 78 7954 78 7955 78 7956 78 \
+    7957 78 7958 78 7959 78 7960 78 7961 78 7962 78 7963 78 7964 78 7965 78 \
+    7966 78 7967 78 7968 78 7969 78 7970 78 7971 78 7972 78 7973 78 7974 78 \
+    7975 78 7976 78 7977 78 7978 78 7979 78 7980 78 7981 78 7982 78 7983 78 \
+    7984 78 7985 78 7986 78 7987 78 7988 78 7989 78 7990 78 7991 78 7992 78 \
+    7993 78 7994 78 7995 78 7996 78 7997 78 7998 78 7999 78 8000 78 8001 78 \
+    8002 78 8003 78 8004 78 8005 78 8006 78 8007 78 8008 78 8009 78 8010 78 \
+    8011 78 8012 78 8013 78 8014 78 8015 78 8016 78 8017 78 8018 78 8019 78 \
+    8020 78 8021 78 8022 78 8023 78 8024 78 8025 78 8026 78 8027 78 8028 78 \
+    8029 78 8030 78 8031 78 8032 78 8033 78 8034 78 8035 78 8036 78 8037 78 \
+    8038 78 8039 78 8040 78 8041 78 8042 78 8043 78 8044 78 8045 78 8046 78 \
+    8047 78 8048 78 8049 78 8050 78 8051 78 8052 78 8053 78 8054 78 8055 78 \
+    8056 78 8057 78 8058 78 8059 78 8060 78 8061 78 8062 78 8063 78 8064 78 \
+    8065 78 8066 78 8067 78 8068 78 8069 78 8070 78 8071 78 8072 78 8073 78 \
+    8074 78 8075 78 8076 78 8077 78 8078 78 8079 78 8080 78 8081 78 8082 78 \
+    8083 78 8084 78 8085 78 8086 78 8087 78 8088 78 8089 78 8090 78 8091 78 \
+    8092 78 8093 78 8094 78 8095 78 8096 78 8097 78 8098 78 8099 78 8100 78 \
+    8101 78 8102 78 8103 78 8104 78 8105 78 8106 78 8107 78 8108 78 8109 78 \
+    8110 78 8111 78 8112 78 8113 78 8114 78 8115 78 8116 78 8117 78 8118 78 \
+    8119 78 8120 78 8121 78 8122 78 8123 78 8124 78 8125 78 8126 78 8127 78 \
+    8128 78 8129 78 8130 78 8131 78 8132 78 8133 78 8134 78 8135 78 8136 78 \
+    8137 78 8138 78 8139 78 8140 78 8141 78 8142 78 8143 78 8144 78 8145 78 \
+    8146 78 8147 78 8148 78 8149 78 8150 78 8151 78 8152 78 8153 78 8154 78 \
+    8155 78 8156 78 8157 78 8158 78 8159 78 8160 78 8161 78 8162 78 8163 78 \
+    8164 78 8165 78 8166 78 8167 78 8168 78 8169 78 8170 78 8171 78 8172 78 \
+    8173 78 8174 78 8175 78 8176 78 8177 78 8178 78 8179 78 8180 78 8181 78 \
+    8182 78 8183 78 8184 78 8185 78 8186 78 8187 78 8188 78 8189 78 8190 78 \
+    8191 106 8192 78 8193 78 8194 78 8195 78 8196 78 8197 78 8198 78 8199 78 \
+    8200 78 8201 78 8202 78 8203 78 8204 78 8205 78 8206 78 8207 78 8208 78 \
+    8209 78 8210 78 8211 78 8212 78 8213 78 8214 78 8215 78 8216 78 8217 78 \
+    8218 78 8219 78 8220 78 8221 78 8222 78 8223 78 8224 78 8225 78 8226 78 \
+    8227 78 8228 78 8229 78 8230 78 8231 78 8232 78 8233 78 8234 78 8235 78 \
+    8236 78 8237 78 8238 78 8239 78 8240 78 8241 78 8242 78 8243 78 8244 78 \
+    8245 78 8246 78 8247 78 8248 78 8249 78 8250 78 8251 78 8252 78 8253 78 \
+    8254 78 8255 78 8256 78 8257 78 8258 78 8259 78 8260 78 8261 78 8262 78 \
+    8263 78 8264 78 8265 78 8266 78 8267 78 8268 78 8269 78 8270 78 8271 78 \
+    8272 78 8273 78 8274 78 8275 78 8276 78 8277 78 8278 78 8279 78 8280 78 \
+    8281 78 8282 78 8283 78 8284 78 8285 78 8286 78 8287 78 8288 78 8289 78 \
+    8290 78 8291 78 8292 78 8293 78 8294 78 8295 78 8296 78 8297 78 8298 78 \
+    8299 78 8300 78 8301 78 8302 78 8303 78 8304 78 8305 78 8306 78 8307 78 \
+    8308 78 8309 78 8310 78 8311 78 8312 78 8313 78 8314 78 8315 78 8316 78 \
+    8317 78 8318 78 8319 78 8320 78 8321 78 8322 78 8323 78 8324 78 8325 78 \
+    8326 78 8327 78 8328 78 8329 78 8330 78 8331 78 8332 78 8333 78 8334 78 \
+    8335 78 8336 78 8337 78 8338 78 8339 78 8340 78 8341 78 8342 78 8343 78 \
+    8344 78 8345 78 8346 78 8347 78 8348 78 8349 78 8350 78 8351 78 8352 78 \
+    8353 78 8354 78 8355 78 8356 78 8357 78 8358 78 8359 78 8360 78 8361 78 \
+    8362 78 8363 78 8364 78 8365 78 8366 78 8367 78 8368 78 8369 78 8370 78 \
+    8371 78 8372 78 8373 78 8374 78 8375 78 8376 78 8377 78 8378 78 8379 78 \
+    8380 78 8381 78 8382 78 8383 78 8384 78 8385 78 8386 78 8387 78 8388 78 \
+    8389 78 8390 78 8391 78 8392 78 8393 78 8394 78 8395 78 8396 78 8397 78 \
+    8398 78 8399 78 8400 78 8401 78 8402 78 8403 78 8404 78 8405 78 8406 78 \
+    8407 78 8408 78 8409 78 8410 78 8411 78 8412 78 8413 78 8414 78 8415 78 \
+    8416 78 8417 78 8418 78 8419 78 8420 78 8421 78 8422 78 8423 78 8424 78 \
+    8425 78 8426 78 8427 78 8428 78 8429 78 8430 78 8431 78 8432 78 8433 78 \
+    8434 78 8435 78 8436 78 8437 78 8438 78 8439 78 8440 78 8441 78 8442 78 \
+    8443 78 8444 78 8445 78 8446 78 8447 78 8448 78 8449 78 8450 78 8451 78 \
+    8452 78 8453 78 8454 78 8455 78 8456 78 8457 78 8458 78 8459 78 8460 78 \
+    8461 78 8462 78 8463 78 8464 78 8465 78 8466 78 8467 78 8468 78 8469 78 \
+    8470 78 8471 78 8472 78 8473 78 8474 78 8475 78 8476 78 8477 78 8478 78 \
+    8479 78 8480 78 8481 78 8482 78 8483 78 8484 78 8485 78 8486 78 8487 78 \
+    8488 78 8489 78 8490 78 8491 78 8492 78 8493 78 8494 78 8495 78 8496 78 \
+    8497 78 8498 78 8499 78 8500 78 8501 78 8502 78 8503 78 8504 78 8505 78 \
+    8506 78 8507 78 8508 78 8509 78 8510 78 8511 78 8512 78 8513 78 8514 78 \
+    8515 78 8516 78 8517 78 8518 78 8519 78 8520 78 8521 78 8522 78 8523 78 \
+    8524 78 8525 78 8526 78 8527 78 8528 78 8529 78 8530 78 8531 78 8532 78 \
+    8533 78 8534 78 8535 78 8536 78 8537 78 8538 78 8539 78 8540 78 8541 78 \
+    8542 78 8543 78 8544 78 8545 78 8546 78 8547 78 8548 78 8549 78 8550 78 \
+    8551 78 8552 78 8553 78 8554 78 8555 78 8556 78 8557 78 8558 78 8559 78 \
+    8560 78 8561 78 8562 78 8563 78 8564 78 8565 78 8566 78 8567 78 8568 78 \
+    8569 78 8570 78 8571 78 8572 78 8573 78 8574 78 8575 78 8576 78 8577 78 \
+    8578 78 8579 78 8580 78 8581 78 8582 78 8583 78 8584 78 8585 78 8586 78 \
+    8587 78 8588 78 8589 78 8590 78 8591 78 8592 78 8593 78 8594 78 8595 78 \
+    8596 78 8597 78 8598 78 8599 78 8600 78 8601 78 8602 78 8603 78 8604 78 \
+    8605 78 8606 78 8607 78 8608 78 8609 78 8610 78 8611 78 8612 78 8613 78 \
+    8614 78 8615 78 8616 78 8617 78 8618 78 8619 78 8620 78 8621 78 8622 78 \
+    8623 78 8624 78 8625 78 8626 78 8627 78 8628 78 8629 78 8630 78 8631 78 \
+    8632 78 8633 78 8634 78 8635 78 8636 78 8637 78 8638 78 8639 78 8640 78 \
+    8641 78 8642 78 8643 78 8644 78 8645 78 8646 78 8647 78 8648 78 8649 78 \
+    8650 78 8651 78 8652 78 8653 78 8654 78 8655 78 8656 78 8657 78 8658 78 \
+    8659 78 8660 78 8661 78 8662 78 8663 78 8664 78 8665 78 8666 78 8667 78 \
+    8668 78 8669 78 8670 78 8671 78 8672 78 8673 78 8674 78 8675 78 8676 78 \
+    8677 78 8678 78 8679 78 8680 78 8681 78 8682 78 8683 78 8684 78 8685 78 \
+    8686 78 8687 78 8688 78 8689 78 8690 78 8691 78 8692 78 8693 78 8694 78 \
+    8695 78 8696 78 8697 78 8698 78 8699 78 8700 78 8701 78 8702 78 8703 106 \
+   ]
+
+set COMMON_PAGE_MAP 16
+
+#
+# The groupMap is indexed by combining the alternate page number with
+# the page offset and returns a group number that identifies a unique
+# set of character attributes.
+#
+
+set groupMap [list \
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 3 3 \
+    3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 2 2 2 2 2 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 2 2 2 0 5 5 5 5 5 5 5 5 \
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 6 2 2 2 2 2 2 2 2 2 \
+    4 2 2 7 2 2 2 2 2 2 2 8 2 2 2 2 4 2 2 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 \
+    3 3 3 3 3 3 3 3 3 3 3 2 3 3 3 3 3 3 3 9 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 2 4 4 4 4 4 4 4 4 10 4 10 4 10 4 10 4 10 4 10 4 10 \
+    4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 \
+    10 4 10 4 10 4 10 4 11 4 10 4 10 4 10 4 4 10 4 10 4 10 4 10 4 10 4 \
+    10 4 10 4 10 4 12 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 \
+    10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 13 \
+    10 4 10 4 10 4 14 4 15 10 4 10 4 16 10 4 17 17 10 4 4 18 19 20 10 4 \
+    17 21 4 22 23 10 4 4 4 22 24 4 25 10 4 10 4 10 4 26 10 4 26 4 4 10 \
+    4 26 10 4 27 27 10 4 10 4 28 10 4 4 4 10 4 4 4 4 4 4 4 29 10 4 29 10 \
+    4 29 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 4 10 4 10 4 10 4 \
+    10 4 10 4 10 4 10 4 10 4 10 4 30 29 10 4 10 4 31 32 10 4 10 4 10 4 \
+    10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 \
+    4 10 4 10 4 10 4 33 34 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    34 34 4 4 4 4 4 4 4 4 4 2 2 4 4 4 4 4 4 4 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 4 4 2 2 2 2 2 2 2 2 2 2 2 2 2 2 4 4 4 4 4 2 2 2 2 2 2 2 2 2 4 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 35 35 2 2 2 36 2 2 2 2 2 2 \
+    2 2 2 7 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 34 34 34 34 2 2 34 34 34 34 37 34 34 34 2 34 34 \
+    34 34 34 2 2 38 2 39 39 39 34 40 34 41 41 42 3 3 3 3 3 3 3 3 3 3 3 \
+    3 3 3 3 3 3 34 3 3 3 3 3 3 3 3 3 4 4 4 4 43 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 10 4 4 4 4 4 4 4 4 4 4 4 4 34 44 45 46 47 48 49 50 4 10 4 \
+    10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 51 52 53 4 54 \
+    55 2 34 34 34 34 34 34 34 34 34 56 56 56 56 56 56 56 56 56 56 56 56 \
+    56 56 56 56 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 \
+    3 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 10 4 10 4 10 4 10 4 10 4 10 4 10 \
+    4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 4 2 2 2 2 34 2 \
+    2 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 \
+    10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 \
+    4 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 34 10 4 10 4 10 4 10 4 10 4 \
+    10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 \
+    4 34 34 10 4 34 34 34 34 34 34 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 \
+    4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 57 57 57 57 57 57 57 57 57 57 57 57 \
+    57 57 57 57 57 57 57 57 57 57 57 57 57 57 57 57 57 57 57 57 57 57 57 \
+    57 57 57 34 34 4 4 4 4 4 4 4 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 58 34 4 2 34 34 34 34 34 34 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 34 2 2 2 59 2 59 2 2 59 2 34 34 34 34 34 34 34 34 34 \
+    34 34 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 34 34 34 34 34 59 59 59 59 59 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 2 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 59 34 34 34 59 34 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 34 34 34 34 34 59 \
+    59 59 59 59 59 59 59 59 59 59 2 2 2 2 2 2 2 2 2 2 2 34 34 34 34 34 \
+    34 34 34 34 34 2 2 2 2 2 2 2 2 2 2 2 2 2 59 59 59 2 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 2 2 2 2 2 2 2 60 2 2 2 2 2 2 2 59 59 2 2 2 2 2 2 2 34 34 \
+    2 2 2 2 2 2 2 2 2 2 59 59 59 59 59 34 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 34 5 59 2 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 34 34 34 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 2 2 2 2 2 2 2 2 2 2 2 59 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 2 2 4 34 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 2 4 4 4 4 2 2 2 2 2 2 2 2 \
+    4 4 4 4 2 34 34 4 2 2 2 2 34 34 34 4 4 4 4 4 4 4 4 4 4 2 2 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 2 \
+    4 4 34 4 4 4 4 4 4 4 4 34 34 4 4 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 34 4 4 4 4 4 4 4 34 4 34 34 34 4 4 4 4 34 34 2 34 4 \
+    4 4 2 2 2 2 34 34 4 4 34 34 4 4 2 34 34 34 34 34 34 34 34 34 4 34 34 \
+    34 34 4 4 34 4 4 4 2 2 34 34 4 4 4 4 4 4 4 4 4 4 4 4 2 2 4 4 4 4 4 \
+    4 4 34 34 34 34 34 34 34 2 34 34 4 4 4 4 4 4 34 34 34 34 4 4 34 34 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 4 4 4 4 4 4 4 34 4 4 \
+    34 4 4 34 4 4 34 34 2 34 4 4 4 2 2 34 34 34 34 2 2 34 34 2 2 2 34 34 \
+    34 34 34 34 34 34 34 34 34 4 4 4 4 34 4 34 34 34 34 34 34 34 4 4 4 \
+    4 4 4 4 4 4 4 2 2 4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 2 2 4 34 \
+    4 4 4 4 4 4 4 34 4 34 4 4 4 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 34 4 4 4 4 4 4 4 34 4 4 34 4 4 4 4 4 34 34 2 4 4 4 4 2 2 2 \
+    2 2 34 2 2 4 34 4 4 2 34 34 4 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 4 34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 2 4 4 34 4 4 4 4 4 4 4 4 34 34 4 4 34 34 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 4 4 4 4 4 4 4 34 4 4 \
+    34 34 4 4 4 4 34 34 2 4 4 2 4 2 2 2 34 34 34 4 4 34 34 4 4 2 34 34 \
+    34 34 34 34 34 34 2 4 34 34 34 34 4 4 34 4 4 4 34 34 34 34 4 4 4 4 \
+    4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 2 \
+    4 34 4 4 4 4 4 4 34 34 34 4 4 4 34 4 4 4 4 34 34 34 4 4 34 4 34 4 4 \
+    34 34 34 4 4 34 34 34 4 4 4 34 34 34 4 4 4 4 4 4 4 4 34 4 4 4 34 34 \
+    34 34 4 4 2 4 4 34 34 34 4 4 4 34 4 4 4 2 34 34 34 34 34 34 34 34 34 \
+    4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 \
+    4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 4 4 4 34 4 4 4 4 4 4 \
+    4 4 34 4 4 4 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 4 \
+    4 4 4 4 4 4 4 4 4 34 4 4 4 4 4 34 34 34 34 2 2 2 4 4 4 4 34 2 2 2 34 \
+    2 2 2 2 34 34 34 34 34 34 34 2 2 34 34 34 34 34 34 34 34 34 4 4 34 \
+    34 34 34 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 4 4 34 4 4 4 4 4 4 4 4 34 4 4 4 34 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 4 4 4 4 4 4 4 4 4 4 34 4 4 4 4 4 34 \
+    34 34 34 4 2 4 4 4 4 4 34 2 4 4 34 4 4 2 2 34 34 34 34 34 34 34 4 4 \
+    34 34 34 34 34 34 34 4 34 4 4 34 34 34 34 4 4 4 4 4 4 4 4 4 4 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 4 4 34 4 4 4 4 4 4 \
+    4 4 34 4 4 4 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 4 4 4 2 2 2 34 34 4 4 4 34 \
+    4 4 4 2 34 34 34 34 34 34 34 34 34 4 34 34 34 34 34 34 34 34 4 4 34 \
+    34 34 34 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 4 4 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 4 4 4 4 4 4 4 4 \
+    4 34 4 34 34 4 4 4 4 4 4 4 34 34 34 2 34 34 34 34 4 4 4 2 2 2 34 2 \
+    34 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 2 4 4 2 2 2 2 2 2 2 34 34 34 34 2 4 4 4 4 4 4 4 2 2 2 2 2 2 \
+    2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 4 4 34 4 34 34 4 4 34 4 34 34 4 34 34 34 34 34 34 4 4 4 4 34 4 4 \
+    4 4 4 4 4 34 4 4 4 34 4 34 4 34 34 4 4 34 4 4 4 4 2 4 4 2 2 2 2 2 2 \
+    34 2 2 4 34 34 4 4 4 4 4 34 4 34 2 2 2 2 2 2 34 34 4 4 4 4 4 4 4 4 \
+    4 4 34 34 4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 2 4 2 4 2 2 2 2 2 4 4 4 4 4 4 4 4 4 4 34 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 \
+    34 34 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 4 2 2 2 2 2 4 2 2 4 4 4 4 34 34 \
+    34 34 2 2 2 2 2 2 2 2 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 34 4 4 4 4 4 4 4 4 2 4 4 4 4 4 4 34 34 \
+    4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 34 4 4 4 4 4 34 4 4 34 4 2 2 2 2 4 2 34 34 34 2 2 4 2 34 \
+    34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 2 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 4 34 \
+    34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 4 4 4 \
+    4 4 4 4 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 34 4 34 4 4 4 4 34 34 4 4 4 4 4 4 4 34 4 34 4 4 4 4 34 34 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 34 4 34 4 4 4 4 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 34 4 34 4 4 4 4 34 34 4 4 4 4 4 4 4 34 4 34 4 4 4 \
+    4 34 34 4 4 4 4 4 4 4 34 4 4 4 4 4 4 4 34 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 34 4 34 4 4 4 4 34 34 4 4 4 4 4 4 4 34 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 \
+    34 34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 6 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 2 34 34 34 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 34 4 4 4 4 2 2 2 34 34 34 34 34 34 34 34 34 34 34 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 2 2 2 4 4 34 34 34 34 34 34 34 34 34 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 2 34 34 34 34 34 34 34 34 34 34 34 \
+    34 4 4 4 4 4 4 4 4 4 4 4 4 4 34 4 4 4 34 2 2 34 34 34 34 34 34 34 34 \
+    34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 2 2 2 2 2 2 \
+    4 4 4 4 4 4 4 4 2 4 4 2 2 2 2 2 2 2 2 2 2 2 4 4 4 4 4 4 4 2 4 34 34 \
+    34 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 2 2 2 2 2 2 7 2 2 2 2 7 7 7 5 34 4 4 4 4 4 4 4 \
+    4 4 4 34 34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 \
+    34 34 34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 \
+    4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 \
+    10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 \
+    4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 \
+    10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 \
+    4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 61 62 63 64 \
+    65 66 34 34 34 34 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 \
+    10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 \
+    4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 \
+    10 4 10 4 10 4 10 4 10 4 10 4 10 4 10 4 34 34 34 34 34 34 4 4 4 4 4 \
+    4 4 4 67 67 67 67 67 67 67 67 4 4 4 4 4 4 34 34 67 67 67 67 67 67 34 \
+    34 4 4 4 4 4 4 4 4 67 67 67 67 67 67 67 67 4 4 4 4 4 4 4 4 67 67 67 \
+    67 67 67 67 67 4 4 4 4 4 4 34 34 67 67 67 67 67 67 34 34 68 4 69 4 \
+    70 4 71 4 34 67 34 67 34 67 34 67 4 4 4 4 4 4 4 4 67 67 67 67 67 67 \
+    67 67 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 72 73 74 75 76 77 78 79 80 \
+    81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 \
+    103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 \
+    4 4 120 121 122 34 123 124 67 67 125 125 126 2 127 2 2 2 128 129 130 \
+    34 131 132 133 133 133 133 134 2 2 2 4 4 135 136 34 34 137 138 67 67 \
+    139 139 34 2 2 2 4 4 140 141 142 4 143 144 67 67 145 145 146 2 2 2 \
+    34 34 147 148 149 34 150 151 152 152 153 153 154 2 2 34 6 6 6 6 6 6 \
+    6 6 6 6 6 155 156 156 157 158 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 5 5 35 35 35 35 35 6 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 34 34 34 34 2 34 34 34 34 34 34 34 \
+    6 156 5 5 5 34 34 34 34 34 34 159 159 159 159 159 159 2 4 34 34 2 2 \
+    2 2 2 2 2 2 2 2 2 4 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 2 2 2 2 2 2 2 2 160 2 2 2 2 2 2 2 \
+    2 2 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 2 2 161 162 2 2 2 163 2 164 4 165 166 167 4 4 168 169 170 \
+    4 2 168 171 2 2 172 172 172 173 174 2 2 175 176 177 2 173 2 178 2 179 \
+    2 180 181 182 182 2 4 183 183 2 184 4 4 4 4 4 4 2 34 34 4 185 186 2 \
+    2 2 2 2 187 4 4 4 4 2 2 34 34 34 34 34 34 34 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 188 188 188 188 188 188 188 188 188 188 188 188 188 188 188 188 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 \
+    34 34 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 4 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 2 2 2 2 2 2 2 2 2 2 \
+    2 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 189 189 189 189 189 189 189 189 189 \
+    189 189 189 189 189 189 189 189 189 189 189 189 189 189 189 189 189 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 34 34 2 2 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 34 34 2 2 2 2 2 2 2 2 2 2 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 2 2 2 2 34 2 \
+    2 2 2 34 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 34 2 34 2 2 2 2 34 34 34 2 34 2 2 2 2 2 2 2 34 34 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 34 34 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 34 34 34 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 34 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 34 34 34 34 34 34 34 34 34 34 34 34 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 35 35 35 35 35 35 35 35 35 35 35 \
+    35 34 34 34 34 6 2 2 2 2 4 4 4 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 4 4 4 4 4 4 4 4 4 2 2 2 2 2 2 2 4 4 4 4 4 2 2 4 4 4 4 \
+    4 2 2 2 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 2 2 2 2 4 4 4 \
+    2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 4 4 4 4 34 34 34 34 \
+    34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 190 4 191 4 192 4 34 34 34 \
+    34 4 4 4 4 4 193 194 195 196 197 198 199 200 4 4 201 202 203 4 4 4 \
+    204 205 206 207 208 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 209 210 \
+    211 212 4 4 4 4 4 4 4 213 214 215 216 217 218 219 220 221 222 223 224 \
+    225 226 4 227 4 4 228 229 230 231 4 232 4 233 234 4 4 4 4 4 4 4 4 235 \
+    4 236 237 4 238 239 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 240 241 242 243 244 245 246 \
+    34 34 34 34 34 34 34 34 34 34 34 34 247 248 249 250 251 34 34 34 34 \
+    34 59 2 59 59 59 59 59 59 59 59 59 59 2 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 34 59 59 59 59 59 34 59 34 59 59 34 59 59 34 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 2 2 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 34 34 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 34 34 34 34 34 34 34 34 35 35 35 35 35 35 35 35 35 35 35 \
+    35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 34 34 34 7 7 7 7 7 7 7 7 7 7 7 7 7 \
+    7 7 7 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 2 2 2 2 34 34 \
+    34 34 34 34 34 34 34 34 34 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 34 34 2 2 2 2 2 2 2 2 2 2 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 34 2 2 2 2 34 34 34 34 59 59 59 59 59 34 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 59 \
+    59 59 59 59 59 59 59 59 59 59 59 59 59 59 34 34 156 34 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 3 3 3 3 3 3 3 \
+    3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 2 2 2 2 2 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 2 2 2 2 2 2 2 2 2 2 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 4 4 4 4 4 4 34 34 4 4 4 4 4 4 \
+    34 34 4 4 4 4 4 4 34 34 4 4 4 34 34 34 2 2 2 2 2 2 2 34 2 2 2 2 2 2 \
+    2 34 34 34 34 34 34 34 34 34 34 159 159 159 159 35 35 35 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 4 4 4 4 34 34 \
+    34 34 34 34 34 34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 252 252 252 252 252 252 252 \
+    252 252 252 252 252 252 252 252 252 252 252 252 252 252 252 252 252 \
+    252 252 252 252 252 252 252 252 252 252 252 252 252 252 34 34 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 34 \
+    34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 34 34 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 2 2 2 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 2 2 2 2 2 2 \
+    2 2 4 4 2 2 2 2 2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 2 2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 253 253 253 253 253 253 253 253 253 253 253 253 253 \
+    253 253 253 253 253 253 253 253 253 253 253 253 253 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 254 254 254 254 254 254 254 254 \
+    254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 \
+    254 4 4 4 4 4 4 4 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 255 255 255 \
+    255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 \
+    255 255 255 255 255 255 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 256 34 256 256 34 34 256 34 34 256 256 34 34 256 256 256 256 \
+    34 256 256 256 256 256 256 256 256 4 4 4 4 34 4 34 4 4 4 4 34 4 4 34 \
+    4 4 4 4 4 4 4 4 4 4 4 257 257 257 257 257 257 257 257 257 257 257 257 \
+    257 257 257 257 257 257 257 257 257 257 257 257 257 257 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 258 258 34 258 258 258 258 \
+    34 34 258 258 258 258 258 258 258 258 34 258 258 258 258 258 258 258 \
+    34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 259 259 34 259 \
+    259 259 259 34 259 259 259 259 259 34 259 34 34 34 259 259 259 259 \
+    259 259 259 34 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    260 260 260 260 260 260 260 260 260 260 260 260 260 260 260 260 260 \
+    260 260 260 260 260 260 260 260 260 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 261 261 261 261 261 261 261 261 261 261 261 261 \
+    261 261 261 261 261 261 261 261 261 261 261 261 261 261 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 262 262 262 262 262 262 262 \
+    262 262 262 262 262 262 262 262 262 262 262 262 262 262 262 262 262 \
+    262 262 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 263 263 \
+    263 263 263 263 263 263 263 263 263 263 263 263 263 263 263 263 263 \
+    263 263 263 263 263 263 263 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 264 264 264 264 264 264 264 264 264 264 264 264 264 264 \
+    264 264 264 264 264 264 264 264 264 264 264 264 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 265 265 265 265 265 265 265 265 265 \
+    265 265 265 265 265 265 265 265 265 265 265 265 265 265 265 265 265 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 266 \
+    266 266 266 266 266 266 266 266 266 266 266 266 266 266 266 266 267 \
+    266 266 266 266 266 266 266 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 268 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 269 269 269 269 269 269 269 269 269 269 \
+    269 269 269 269 269 269 269 270 269 269 269 269 269 269 269 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 271 4 4 4 4 4 4 4 4 4 4 4 4 4 4 272 272 \
+    272 272 272 272 272 272 272 272 272 272 272 272 272 272 272 273 272 \
+    272 272 272 272 272 272 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 274 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 275 275 275 275 275 275 275 275 275 275 275 \
+    275 275 275 275 275 275 276 275 275 275 275 275 275 275 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 277 4 4 4 4 4 4 4 4 4 4 4 4 4 4 278 278 278 \
+    278 278 278 278 278 278 278 278 278 278 278 278 278 278 279 278 278 \
+    278 278 278 278 278 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 280 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 34 34 34 34 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 \
+    2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 35 35 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 \
+    4 4 4 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 4 4 4 4 \
+    4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 35 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 \
+    34 34 34 34 34 34 34 34 34 34 35 35 35 35 35 35 35 35 35 35 35 35 35 \
+    35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 \
+    35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 \
+    35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 \
+    35 35 35 35 35 35 35 35 35 35 35 35 35 35 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 157 \
+    35 35]
+
+#
+# Each group represents a unique set of character attributes.  The attributes
+# are encoded into a 32-bit value as follows:
+#
+# Bit  0	A.1
+#
+# Bit  1	B.1
+#
+# Bit  2	B.3
+#
+# Bit  3	C.1.1
+#
+# Bit  4	C.1.2
+#
+# Bit  5	C.2.1
+#
+# Bit  6	C.2.2
+#
+# Bit  7	C.3--C.9
+#
+# Bit  8	D.1
+#
+# Bit  9	D.2
+#
+# Bit  10	Case maps to several characters
+#
+# Bits 11-31	Case delta: delta for case conversions.  This should be the
+#		highest field so we can easily sign extend.
+#
+
+set groups [list \
+    32 8 0 66052 512 64 16 2 1587716 1540 2564 3588 5636 -247292 -548348 \
+    430596 422404 420356 162308 414212 416260 424452 432644 428548 \
+    436740 438788 446980 444932 449028 4612 7684 -198140 -114172 -265724 \
+    1 128 237572 9728 78340 76292 131588 129540 11780 13828 -60924 \
+    -50684 -26112 -11776 -17920 -30204 -44540 -110076 -97788 -95740 \
+    -122364 -130556 164356 98820 15876 256 320 17924 19972 22020 24068 \
+    26116 -118268 -15868 28164 30212 32260 34308 36356 38404 40452 \
+    42500 44548 46596 48644 50692 52740 54788 56836 58884 60932 62980 \
+    65028 67076 69124 71172 73220 75268 77316 79364 81412 83460 85508 \
+    87556 89604 91652 93700 95748 97796 99844 101892 103940 105988 \
+    108036 110084 112132 114180 116228 118276 120324 122372 124420 \
+    126468 128516 130564 132612 134660 136708 138756 140804 142852 \
+    -151036 144900 -14689788 146948 148996 151044 153092 155140 -175612 \
+    157188 159236 161284 163332 165380 -204284 167428 169476 171524 \
+    173572 175620 -228860 -13820 177668 179716 181764 183812 185860 \
+    -261628 -257532 187908 18 66 640 384 192 189440 -17102336 191488 \
+    -16080384 193536 -17110528 -17112576 -17114624 -17118720 -17120768 \
+    -17116672 195584 -17122816 -17124864 -17126912 197632 199680 201728 \
+    -15394300 -17133056 -17167868 -16920060 -17190400 -17192448 -17182208 \
+    -15488512 -15463936 -17237504 33284 53764 204288 206336 208384 \
+    210432 212480 214528 216576 218624 220672 222720 224768 226816 \
+    228864 230912 232960 235008 237056 239104 241152 243200 245248 \
+    247296 249344 251392 253440 255488 257536 259584 261632 263680 \
+    265728 267776 269824 271872 273920 275968 278016 280064 282112 \
+    284160 286208 288256 290304 292352 294400 296448 298496 300544 \
+    302592 304640 306692 308740 310788 312836 314884 316932 318980 \
+    321028 323076 325124 327172 329220 82436 -245167616 -245274112 \
+    -245380608 -245487104 -245593600 -245700096 -245806592 -245913088 \
+    -246019584 -246126080 -246232576 -246339072 -246445568 -244823552 \
+    -244844032 -244874752 -244942336 -244962816 -244993536 -245061120 \
+    -245081600 -245112320 -245179904 -245200384 -245231104 -245298688 \
+    -245319168 -245349888]
+
+#
+# Table for characters that lowercased to multiple ones
+#
+
+set multiCaseTable [list \
+    {115 115} \
+    {105 775} \
+    {700 110} \
+    {106 780} \
+    {32 953} \
+    {953 776 769} \
+    {965 776 769} \
+    {1381 1410} \
+    {104 817} \
+    {116 776} \
+    {119 778} \
+    {121 778} \
+    {97 702} \
+    {965 787} \
+    {965 787 768} \
+    {965 787 769} \
+    {965 787 834} \
+    {7936 953} \
+    {7937 953} \
+    {7938 953} \
+    {7939 953} \
+    {7940 953} \
+    {7941 953} \
+    {7942 953} \
+    {7943 953} \
+    {7936 953} \
+    {7937 953} \
+    {7938 953} \
+    {7939 953} \
+    {7940 953} \
+    {7941 953} \
+    {7942 953} \
+    {7943 953} \
+    {7968 953} \
+    {7969 953} \
+    {7970 953} \
+    {7971 953} \
+    {7972 953} \
+    {7973 953} \
+    {7974 953} \
+    {7975 953} \
+    {7968 953} \
+    {7969 953} \
+    {7970 953} \
+    {7971 953} \
+    {7972 953} \
+    {7973 953} \
+    {7974 953} \
+    {7975 953} \
+    {8032 953} \
+    {8033 953} \
+    {8034 953} \
+    {8035 953} \
+    {8036 953} \
+    {8037 953} \
+    {8038 953} \
+    {8039 953} \
+    {8032 953} \
+    {8033 953} \
+    {8034 953} \
+    {8035 953} \
+    {8036 953} \
+    {8037 953} \
+    {8038 953} \
+    {8039 953} \
+    {8048 953} \
+    {945 953} \
+    {940 953} \
+    {945 834} \
+    {945 834 953} \
+    {945 953} \
+    {8052 953} \
+    {951 953} \
+    {942 953} \
+    {951 834} \
+    {951 834 953} \
+    {951 953} \
+    {953 776 768} \
+    {953 776 769} \
+    {953 834} \
+    {953 776 834} \
+    {965 776 768} \
+    {965 776 769} \
+    {961 787} \
+    {965 834} \
+    {965 776 834} \
+    {8060 953} \
+    {969 953} \
+    {974 953} \
+    {969 834} \
+    {969 834 953} \
+    {969 953} \
+    {114 115} \
+    {176 99} \
+    {176 102} \
+    {110 111} \
+    {115 109} \
+    {116 101 108} \
+    {116 109} \
+    {104 112 97} \
+    {97 117} \
+    {111 118} \
+    {112 97} \
+    {110 97} \
+    {956 97} \
+    {109 97} \
+    {107 97} \
+    {107 98} \
+    {109 98} \
+    {103 98} \
+    {112 102} \
+    {110 102} \
+    {956 102} \
+    {104 122} \
+    {107 104 122} \
+    {109 104 122} \
+    {103 104 122} \
+    {116 104 122} \
+    {112 97} \
+    {107 112 97} \
+    {109 112 97} \
+    {103 112 97} \
+    {112 118} \
+    {110 118} \
+    {956 118} \
+    {109 118} \
+    {107 118} \
+    {109 118} \
+    {112 119} \
+    {110 119} \
+    {956 119} \
+    {109 119} \
+    {107 119} \
+    {109 119} \
+    {107 969} \
+    {109 969} \
+    {98 113} \
+    {99 8725 107 103} \
+    {99 111 46} \
+    {100 98} \
+    {103 121} \
+    {104 112} \
+    {107 107} \
+    {107 109} \
+    {112 104} \
+    {112 112 109} \
+    {112 114} \
+    {115 118} \
+    {119 98} \
+    {102 102} \
+    {102 105} \
+    {102 108} \
+    {102 102 105} \
+    {102 102 108} \
+    {115 116} \
+    {115 116} \
+    {1396 1398} \
+    {1396 1381} \
+    {1396 1387} \
+    {1406 1398} \
+    {1396 1389} \
+]
+
+#
+# The following constants are used to determine the category of a
+# Unicode character.
+#
+
+set A1Mask  [expr {1 << 0}]
+set B1Mask  [expr {1 << 1}]
+set B3Mask  [expr {1 << 2}]
+set C11Mask [expr {1 << 3}]
+set C12Mask [expr {1 << 4}]
+set C21Mask [expr {1 << 5}]
+set C22Mask [expr {1 << 6}]
+set C39Mask [expr {1 << 7}]
+set D1Mask  [expr {1 << 8}]
+set D2Mask  [expr {1 << 9}]
+set MCMask  [expr {1 << 10}]
+
+#
+# The following procs extract the fields of the character info.
+#
+
+proc GetCaseType {info} {expr {($info & 0xE0) >> 5}}
+proc GetCategory {info} {expr {$info & 0x1F}}
+proc GetDelta {info} {expr {$info >> 11}}
+proc GetMC {info} {
+    variable multiCaseTable
+    lindex $multiCaseTable [GetDelta $info]
+}
+
+#
+# This proc extracts the information about a character from the
+# Unicode character tables.
+#
+
+proc GetUniCharInfo {uc} {
+    variable OFFSET_BITS
+    variable COMMON_PAGE_MAP
+    variable pageMap
+    variable groupMap
+    variable groups
+
+    set page [expr {($uc & 0x1fffff) >> $OFFSET_BITS}]
+    if {[info exists pageMap($page)]} {
+	set apage $pageMap($page)
+    } else {
+	set apage $COMMON_PAGE_MAP
+    }
+
+    lindex $groups \
+	   [lindex $groupMap \
+		   [expr {($apage << $OFFSET_BITS) | \
+			   ($uc & ((1 << $OFFSET_BITS) - 1))}]]
+}
+
+} ; # namespace eval ::stringprep::data
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/unicode.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/unicode.tcl
new file mode 100644
index 00000000..428f7354
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/unicode.tcl
@@ -0,0 +1,292 @@
+# unicode.tcl                                                   -*- tcl -*-
+#
+#	Implementation of RFC 3454 "Preparation of Internationalized Strings"
+#
+# Copyright (c) 2007 Sergei Golovan
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: unicode.tcl,v 1.1 2008/01/29 02:18:10 patthoyts Exp $
+
+package require unicode::data 1.0
+
+namespace eval ::unicode {
+    # Hangul constants
+    set SBase 0xac00
+    set LBase 0x1100
+    set VBase 0x1161
+    set TBase 0x11a7
+    set LCount 19
+    set VCount 21
+    set TCount 28
+    set NCount [expr {$VCount * $TCount}]
+    set SCount [expr {$LCount * $NCount}]
+}
+
+########################################################################
+# ::unicode::fromstring converts string to list of integers
+
+proc ::unicode::fromstring {str} {
+    set uclist {}
+    foreach char [split $str ""] {
+	lappend uclist [scan $char %c]
+    }
+    return $uclist
+}
+
+########################################################################
+# ::unicode::tostring converts list of integers to string
+
+proc ::unicode::tostring {uclist} {
+    set res ""
+    foreach num $uclist {
+	append res [format %c $num]
+    }
+    return $res
+}
+
+########################################################################
+# ::unicode::normalize normalizes list of integers according to
+# http://unicode.org/reports/tr15/
+# form is to be D, C, KD, or KC
+
+proc ::unicode::normalize {form uclist} {
+    switch -- $form {
+	D  { return [normalizeD  $uclist] }
+	C  { return [normalizeC  $uclist] }
+	KD { return [normalizeKD $uclist] }
+	KC { return [normalizeKC $uclist] }
+	default {
+	    return -code error \
+		   "::unicode::normalize: Only D, C, KD and KC forms are\
+		    allowed"
+	}
+    }
+}
+
+########################################################################
+# ::unicode::normalizeS normalizes string according to
+# http://unicode.org/reports/tr15/
+# form is to be D, C, KD, or KC
+
+proc ::unicode::normalizeS {form str} {
+    switch -- $form {
+	D  { return [tostring [normalizeD  [fromstring $str]]] }
+	C  { return [tostring [normalizeC  [fromstring $str]]] }
+	KD { return [tostring [normalizeKD [fromstring $str]]] }
+	KC { return [tostring [normalizeKC [fromstring $str]]] }
+	default {
+	    return -code error \
+		   "::unicode::normalizeS: Only D, C, KD and KC forms are\
+		    allowed"
+	}
+    }
+}
+
+########################################################################
+
+proc ::unicode::normalizeD {uclist} {
+    set res {}
+    foreach uc $uclist {
+	set res [concat $res [decomposeCanonical $uc]]
+    }
+
+    canonicalOrdering $res
+}
+
+proc ::unicode::normalizeC {uclist} {
+    composeCanonical [normalizeD $uclist]
+}
+
+proc ::unicode::normalizeKD {uclist} {
+    set res {}
+    foreach uc $uclist {
+	set res [concat $res [decomposeCompat $uc]]
+    }
+
+    canonicalOrdering $res
+}
+
+proc ::unicode::normalizeKC {uclist} {
+    composeCanonical [normalizeKD $uclist]
+}
+
+########################################################################
+# Adjacent characters with nonzero character class should go in
+# order of increasing character class
+
+proc ::unicode::canonicalOrdering {uclist} {
+    set res {}
+    set slist {}
+    foreach uc $uclist {
+	set cclass [data::GetUniCharCClass $uc]
+	if {$cclass != 0} {
+	    lappend slist [list $uc $cclass]
+	} else {
+	    foreach s [lsort -integer -index 1 $slist] {
+		lappend res [lindex $s 0]
+	    }
+	    set slist {}
+	    lappend res $uc
+	}
+    }
+    foreach s [lsort -integer -index 1 $slist] {
+	lappend res [lindex $s 0]
+    }
+
+    return $res
+}
+
+########################################################################
+
+proc ::unicode::decomposeHangul {uc} {
+    variable SBase
+    variable LBase
+    variable VBase
+    variable TBase
+    variable LCount
+    variable VCount
+    variable TCount
+    variable NCount
+    variable SCount
+
+    # Hangul decomposition is algorithmic
+    set SIndex [expr {$uc - $SBase}]
+    if {$SIndex >= 0 && $SIndex < $SCount} {
+        set res {}
+        set L [expr {$LBase + $SIndex / $NCount}]
+        set V [expr {$VBase + ($SIndex % $NCount) / $TCount}]
+        set T [expr {$TBase + $SIndex % $TCount}]
+	set res [list $L $V]
+        if {$T != $TBase} {
+	    lappend res $T
+	}
+        return $res
+    }
+    return -1
+}
+
+########################################################################
+
+proc ::unicode::decomposeCanonical {uc} {
+    # Try to decompose Hangul first
+    set res [decomposeHangul $uc]
+    if {$res >= 0} {
+	return $res
+    }
+
+    # For others do a lookup in data tables
+    set info [data::GetUniCharDecompInfo $uc]
+    if {$info >= 0} {
+	set res {}
+	foreach c [data::GetDecompList $info] {
+	    set res [concat $res [decomposeCanonical $c]]
+	}
+	return $res
+    } else {
+	return [list $uc]
+    }
+}
+
+########################################################################
+
+proc ::unicode::decomposeCompat {uc} {
+    # Try to decompose Hangul first
+    set res [decomposeHangul $uc]
+    if {$res >= 0} {
+	return $res
+    }
+
+    # For others do a lookup in data tables
+    set info [data::GetUniCharDecompCompatInfo $uc]
+    if {$info >= 0} {
+	set res {}
+	foreach c [data::GetDecompList $info] {
+	    set res [concat $res [decomposeCompat $c]]
+	}
+	return $res
+    } else {
+	return [list $uc]
+    }
+}
+
+########################################################################
+
+proc ::unicode::composeTwo {uc1 uc2} {
+    variable SBase
+    variable LBase
+    variable VBase
+    variable TBase
+    variable LCount
+    variable VCount
+    variable TCount
+    variable NCount
+    variable SCount
+
+    # Hangul composition is algorithmic
+    if {$uc1 >= $LBase && $uc1 < $LBase + $LCount && \
+	$uc2 >= $VBase && $uc2 < $VBase + $VCount} {
+	return [expr {$SBase + (($uc1 - $LBase) * $VCount + \
+		      ($uc2 - $VBase)) * $TCount}]
+    }
+
+    if {$uc1 >= $SBase && $uc1 < $SBase + $SCount && \
+	(($uc1 - $SBase) % $TCount) == 0 && \
+	$uc2 >= $TBase && $uc2 < $TBase + $TCount} {
+	return [expr {$uc1 + $uc2 - $TBase}]
+    }
+
+    # For others do a lookup in data tables
+    set info1 [data::GetUniCharCompInfo $uc1]
+    set res [data::GetCompFirst $uc2 $info1]
+    if {$res != -1} {
+	return $res
+    }
+
+    set info2 [data::GetUniCharCompInfo $uc2]
+    set res [data::GetCompSecond $uc1 $info2]
+    if {$res != -1} {
+	return $res
+    }
+
+    data::GetCompBoth $info1 $info2
+}
+
+########################################################################
+
+proc ::unicode::composeCanonical {uclist} {
+    if {[llength $uclist] == 0} {
+	return {}
+    }
+
+    set res {}
+    set comps {}
+    set ch1 [lindex $uclist 0]
+    set cclass_prev [data::GetUniCharCClass $ch1]
+    foreach ch2 [lrange $uclist 1 end] {
+	set cclass [data::GetUniCharCClass $ch2]
+	if {($cclass_prev == 0 || $cclass > $cclass_prev) && \
+		[set ruc [composeTwo $ch1 $ch2]]} {
+	    set ch1 $ruc
+	} else {
+	    if {$cclass == 0} {
+		lappend res $ch1
+		set res [concat $res $comps]
+		set comps {}
+		set ch1 $ch2
+		set cclass_prev 0
+	    } else {
+		lappend comps $ch2
+		set cclass_prev $cclass
+	    }
+	}
+    }
+    lappend res $ch1
+    concat $res $comps
+}
+
+########################################################################
+
+package provide unicode 1.0.0
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/unicode_data.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/unicode_data.tcl
new file mode 100644
index 00000000..8121392e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/stringprep/unicode_data.tcl
@@ -0,0 +1,1547 @@
+# unicode_data.tcl --
+#
+#	Declarations of Unicode character information tables.  This file is
+#	automatically generated by the gen_unicode_data.tcl script.  Do not
+#	modify this file by hand.
+#
+# Copyright (c) 1998 Scriptics Corporation.
+# Copyright (c) 2007 Alexey Shchepin
+# Copyright (c) 2007 Sergei Golovan
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: unicode_data.tcl,v 1.1 2008/01/29 02:18:10 patthoyts Exp $
+
+#
+# A 16-bit Unicode character is split into two parts in order to index
+# into the following tables.  The lower CCLASS_OFFSET_BITS comprise an offset
+# into a page of characters.  The upper bits comprise the page number.
+#
+
+package provide unicode::data 1.0.0
+
+namespace eval ::unicode::data {
+
+set CCLASS_OFFSET_BITS 2
+
+#
+# The cclassPageMap is indexed by page number and returns an alternate page number
+# that identifies a unique page of characters.  Many Unicode characters map
+# to the same alternate page number.
+#
+
+array unset cclassPageMap
+array set cclassPageMap [list \
+    192 1 193 1 194 1 195 1 196 1 197 2 198 3 199 4 200 5 201 6 202 7 203 4 \
+    204 4 205 8 206 9 207 10 208 1 209 11 210 12 211 13 212 14 213 15 214 16 \
+    215 17 216 18 217 1 218 1 219 1 288 19 289 20 356 21 357 22 358 23 359 1 \
+    360 24 361 4 362 22 363 25 364 26 365 27 366 28 367 29 368 30 369 31 \
+    388 1 389 32 402 33 403 34 404 35 405 36 406 1 407 37 412 38 437 39 \
+    438 1 439 40 440 14 441 40 442 41 443 42 452 43 460 44 461 45 462 46 \
+    463 47 464 22 465 47 466 37 506 19 507 1 508 22 591 48 595 49 596 50 \
+    597 51 623 48 627 49 655 48 659 49 687 48 691 49 719 48 723 49 755 49 \
+    787 49 789 52 815 48 819 49 851 49 882 53 910 54 914 55 942 56 946 57 \
+    966 58 973 59 974 60 988 61 989 62 990 63 991 64 992 65 993 66 1009 67 \
+    1037 68 1038 49 1239 19 1477 69 1485 69 1524 53 1527 70 1578 71 1614 72 \
+    1669 19 1670 73 1741 48 1745 69 1754 19 1755 10 1756 1 1904 22 1905 1 \
+    1906 74 1919 75 2100 76 2101 1 2102 77 2103 51 2104 70 2105 78 2106 79 \
+    2107 4 3082 80 3083 81 3110 82 10753 53 16071 83 16264 1 17027 84 17038 85 \
+    17039 86 29785 87 29786 88 29787 89 29788 90 29790 91 29791 4 29792 92 \
+    29793 93 29794 24 29802 39 29803 32 29840 39 29841 51]
+
+set CCLASS_COMMON_PAGE_MAP 0
+
+#
+# The cclassGroupMap is indexed by combining the alternate page number with
+# the page offset and returns a combining class number.
+#
+
+set cclassGroupMap [list \
+    0 0 0 0 230 230 230 230 230 232 220 220 220 220 232 216 220 220 220 \
+    220 220 202 202 220 220 220 220 202 202 220 220 220 1 1 1 1 1 220 220 \
+    220 220 230 230 230 230 240 230 220 220 220 230 230 230 220 220 0 230 \
+    230 230 220 220 220 220 230 232 220 220 230 233 234 234 233 234 234 \
+    233 230 0 0 0 230 230 230 230 0 0 220 230 230 230 230 220 230 230 230 \
+    222 220 230 230 220 220 230 222 228 230 10 11 12 13 14 15 16 17 18 \
+    19 19 20 21 22 0 23 0 24 25 0 230 220 0 18 230 230 0 0 0 0 0 27 28 \
+    29 30 31 32 33 34 230 230 220 220 230 220 230 230 0 35 0 0 0 0 0 230 \
+    230 230 0 0 230 230 0 220 230 230 220 0 0 0 36 0 0 230 220 230 230 \
+    220 230 230 220 220 220 230 220 220 230 220 230 7 0 0 0 0 9 0 0 0 230 \
+    220 230 230 0 0 0 0 84 91 0 0 0 9 0 103 103 9 0 107 107 107 107 118 \
+    118 0 0 122 122 122 122 220 220 0 0 0 220 0 220 0 216 0 0 0 129 130 \
+    0 132 0 0 0 0 0 130 130 130 130 0 0 130 0 230 230 9 0 230 230 0 0 220 \
+    0 0 0 0 7 9 0 0 0 0 230 0 0 0 228 0 0 0 222 230 220 220 0 0 0 230 230 \
+    220 0 0 0 230 220 230 230 1 1 1 1 1 230 0 1 1 230 220 230 1 1 0 0 218 \
+    228 232 222 224 224 0 8 8 0 0 0 26 0 0 220 0 230 230 1 220 0 0 0 0 \
+    9 0 216 216 1 1 1 0 0 0 226 216 216 216 216 216 0 0 0 0 220 220 220 \
+    220 0 0 230 230 230]
+
+proc GetUniCharCClass {uc} {
+    variable CCLASS_OFFSET_BITS
+    variable CCLASS_COMMON_PAGE_MAP
+    variable cclassPageMap
+    variable cclassGroupMap
+
+    set page [expr {($uc & 0x1fffff) >> $CCLASS_OFFSET_BITS}]
+    if {[info exists cclassPageMap($page)]} {
+	set apage $cclassPageMap($page)
+    } else {
+	set apage $CCLASS_COMMON_PAGE_MAP
+    }
+
+    lindex $cclassGroupMap \
+	   [expr {($apage << $CCLASS_OFFSET_BITS) | \
+		   ($uc & ((1 << $CCLASS_OFFSET_BITS) - 1))}]
+}
+
+
+set DECOMP_OFFSET_BITS 3
+
+#
+# The pageMap is indexed by page number and returns an alternate page number
+# that identifies a unique page of characters.  Many Unicode characters map
+# to the same alternate page number.
+#
+
+array unset decompPageMap
+array set decompPageMap [list \
+    20 1 21 2 22 3 23 4 24 5 25 6 26 7 27 8 28 9 29 10 30 11 31 12 32 13 \
+    33 14 34 15 35 16 36 17 37 18 38 19 39 20 40 21 41 22 42 23 43 24 44 25 \
+    45 26 46 27 47 28 52 29 53 30 54 31 56 32 57 33 58 34 59 35 60 36 61 37 \
+    62 38 63 39 64 40 65 41 66 42 67 43 68 44 69 45 70 46 86 47 87 48 91 49 \
+    92 50 104 51 110 52 111 53 112 54 113 55 114 56 117 57 118 58 121 59 \
+    122 60 126 61 127 62 128 63 129 64 131 65 135 66 138 67 139 68 142 69 \
+    152 70 154 71 155 72 156 73 157 74 158 75 159 76 176 77 196 78 206 79 \
+    207 80 216 81 218 82 293 83 294 84 299 85 313 86 315 87 326 88 331 89 \
+    361 90 363 91 370 92 377 93 393 94 408 95 409 96 425 97 443 98 454 99 \
+    470 100 475 101 481 102 488 103 489 104 490 105 491 106 493 107 494 108 \
+    495 109 496 110 498 111 499 112 500 113 501 114 503 115 516 116 543 117 \
+    864 118 865 119 866 120 871 121 872 122 933 123 934 124 935 125 936 126 \
+    937 127 938 128 939 129 940 130 941 131 943 132 947 133 948 134 949 135 \
+    950 136 951 137 960 138 961 139 962 140 963 141 964 142 965 143 966 144 \
+    967 145 968 146 969 147 970 148 971 149 972 150 973 151 974 152 975 153 \
+    976 154 977 155 978 156 979 157 980 158 981 159 982 160 983 161 984 162 \
+    985 163 986 164 987 165 988 166 989 167 990 168 991 169 992 170 993 171 \
+    994 172 995 173 996 174 997 175 998 176 999 177 1000 178 1001 179 1002 180 \
+    1003 181 1004 182 1005 183 1006 184 1007 185 1008 186 1009 187 1010 188 \
+    1011 189 1012 190 1013 191 1014 192 1015 193 1016 194 1017 195 1018 196 \
+    1019 197 1020 198 1021 199 1022 200 1023 201 1024 202 1025 203 1026 204 \
+    1028 205 1029 206 1030 207 1031 208 1032 209 1033 210 1034 211 1035 206 \
+    1038 212 1039 213 1040 214 1041 215 1042 216 1045 217 1056 218 1057 219 \
+    1058 220 1059 221 1060 222 1061 223 1062 224 1063 225 1064 226 1065 227 \
+    1066 228 1067 229 1068 230 1069 231 1070 232 1071 233 1075 234 1077 235 \
+    1081 236 1088 237 1089 238 1092 239 1093 240 1094 241 1096 242 1097 243 \
+    1100 244 1101 245 1102 246 1103 247 1104 248 1105 249 1109 250 1116 251 \
+    1117 252 1125 253 1164 254 1165 255 1166 256 1167 257 1168 258 1169 259 \
+    1170 260 1171 261 1172 262 1173 263 1174 264 1175 265 1176 266 1177 267 \
+    1178 268 1179 269 1180 270 1181 271 1345 272 1358 273 1371 274 1453 275 \
+    1491 276 1502 277 1504 278 1505 279 1506 280 1507 281 1508 282 1509 283 \
+    1510 284 1511 285 1512 286 1513 287 1514 288 1515 289 1516 290 1517 291 \
+    1518 292 1519 293 1520 294 1521 295 1522 296 1523 297 1524 298 1525 299 \
+    1526 300 1527 301 1528 302 1529 303 1530 304 1536 1 1542 305 1543 306 \
+    1545 307 1546 308 1547 309 1548 310 1549 311 1550 312 1551 313 1554 314 \
+    1555 315 1557 316 1558 317 1559 318 1560 319 1561 320 1562 321 1563 322 \
+    1566 323 1567 324 1574 325 1575 326 1576 327 1577 328 1578 329 1579 330 \
+    1580 331 1581 332 1582 333 1583 334 1584 335 1585 336 1586 337 1587 338 \
+    1600 339 1601 340 1602 341 1603 342 1604 343 1605 344 1606 345 1607 346 \
+    1608 347 1610 348 1611 349 1612 350 1613 351 1614 352 1615 353 1616 354 \
+    1617 355 1618 356 1619 357 1620 358 1621 359 1622 360 1623 361 1624 362 \
+    1625 363 1626 364 1627 365 1628 366 1629 367 1630 368 1631 369 1632 370 \
+    1633 371 1634 372 1635 373 1636 374 1637 375 1638 376 1639 377 1640 378 \
+    1641 379 1642 380 1643 381 1644 382 1645 383 1646 384 1647 385 1648 386 \
+    1649 387 1650 388 1651 389 1652 390 1653 391 1654 392 1655 393 1656 394 \
+    1657 395 1658 396 1659 397 1660 398 1661 399 1662 400 1663 401 7968 402 \
+    7969 403 7970 404 7971 405 7972 406 7973 407 7974 408 7975 409 7976 410 \
+    7977 411 7978 412 7979 413 7980 414 7981 415 7982 416 7983 417 7984 418 \
+    7985 419 7986 420 7987 421 7988 422 7989 423 7990 424 7991 425 7992 426 \
+    7993 427 7994 428 7995 429 7996 430 7997 431 7998 432 7999 433 8000 434 \
+    8001 435 8002 436 8003 437 8004 438 8005 439 8006 440 8007 441 8008 442 \
+    8009 443 8010 444 8011 445 8012 446 8013 447 8014 448 8015 449 8016 450 \
+    8017 451 8018 452 8019 453 8020 454 8021 455 8022 456 8023 457 8024 458 \
+    8025 459 8026 460 8027 461 8032 462 8034 463 8035 464 8036 465 8037 466 \
+    8038 467 8039 468 8040 469 8041 470 8042 471 8043 472 8044 473 8045 474 \
+    8046 475 8047 476 8048 477 8049 478 8050 479 8051 480 8052 481 8053 482 \
+    8054 483 8058 484 8059 485 8060 486 8061 487 8062 488 8063 489 8064 490 \
+    8065 491 8066 492 8067 493 8068 494 8069 495 8070 496 8071 497 8072 498 \
+    8073 499 8074 500 8075 501 8076 502 8077 503 8078 504 8079 505 8080 506 \
+    8081 507 8082 508 8083 509 8084 510 8085 511 8086 512 8087 513 8088 514 \
+    8089 515 8090 516 8091 517 8092 518 8093 519 8094 520 8095 521 8096 522 \
+    8097 523 8098 524 8099 525 8100 526 8101 527 8102 528 8103 529 8106 530 \
+    8107 531 8108 532 8109 533 8110 534 8111 535 8112 536 8113 537 8114 538 \
+    8115 539 8116 540 8117 541 8118 542 8119 543 8120 544 8126 545 8127 546 \
+    8130 547 8131 548 8134 549 8135 550 8136 551 8137 552 8138 553 8139 554 \
+    8140 555 8141 556 8142 557 8143 558 8144 559 8145 560 8146 561 8147 562 \
+    8148 563 8149 564 8150 565 8151 566 8152 567 8153 568 8154 569 8155 570 \
+    8156 571 8157 572 8158 573 8159 574 8160 575 8161 576 8162 214 8163 577 \
+    8164 578 8165 579 8166 580 8167 581 8168 582 8169 583 8170 584 8171 585 \
+    8172 586 8173 587 8174 588 8175 589 8176 590 8177 591 8178 592 8179 593 \
+    8180 594 8181 595 8182 596 8183 597 8184 598 8185 599 8186 600 8187 601 \
+    8188 602 8189 603 14891 604 14892 605 14903 606 14904 607 14976 608 \
+    14977 609 14978 610 14979 611 14980 612 14981 613 14982 614 14983 615 \
+    14984 616 14985 617 14986 618 14987 619 14988 620 14989 608 14990 609 \
+    14991 610 14992 611 14993 612 14994 613 14995 621 14996 622 14997 623 \
+    14998 617 14999 624 15000 625 15001 620 15002 608 15003 609 15004 610 \
+    15005 611 15006 612 15007 613 15008 626 15009 627 15010 628 15011 629 \
+    15012 630 15013 619 15014 620 15015 631 15016 632 15017 633 15018 634 \
+    15019 612 15020 613 15021 614 15022 615 15023 616 15024 617 15025 630 \
+    15026 619 15027 620 15028 608 15029 609 15030 610 15031 611 15032 612 \
+    15033 613 15034 614 15035 615 15036 616 15037 617 15038 630 15039 619 \
+    15040 620 15041 608 15042 609 15043 610 15044 611 15045 612 15046 613 \
+    15047 614 15048 615 15049 616 15050 617 15051 630 15052 619 15053 620 \
+    15054 608 15055 609 15056 610 15057 611 15058 612 15059 613 15060 635 \
+    15061 636 15062 637 15063 638 15064 639 15065 640 15066 641 15067 642 \
+    15068 643 15069 644 15070 645 15071 646 15072 647 15073 648 15074 649 \
+    15075 650 15076 651 15077 652 15078 653 15079 654 15080 655 15081 656 \
+    15082 657 15083 658 15084 659 15085 660 15086 661 15087 662 15088 663 \
+    15089 664 15090 636 15091 637 15092 638 15093 639 15094 640 15095 641 \
+    15096 642 15097 665 15098 666 15099 214 15100 667 15101 668 15102 669 \
+    15103 666 24320 670 24321 671 24322 672 24323 673 24324 674 24325 675 \
+    24326 676 24327 677 24328 678 24329 679 24330 680 24331 681 24332 682 \
+    24333 683 24334 684 24335 685 24336 686 24337 687 24338 688 24339 689 \
+    24340 690 24341 691 24342 692 24343 693 24344 694 24345 695 24346 696 \
+    24347 697 24348 698 24349 699 24350 700 24351 701 24352 702 24353 703 \
+    24354 704 24355 705 24356 706 24357 707 24358 708 24359 709 24360 710 \
+    24361 711 24362 712 24363 713 24364 714 24365 715 24366 716 24367 717 \
+    24368 718 24369 719 24370 720 24371 721 24372 722 24373 723 24374 724 \
+    24375 725 24376 726 24377 727 24378 728 24379 729 24380 730 24381 731 \
+    24382 732 24383 733 24384 734 24385 735 24386 736 24387 737]
+
+set DECOMP_COMMON_PAGE_MAP 0
+
+#
+# The decompGroupMap is indexed by combining the alternate page number with
+# the page offset and returns a group number that identifies a length and
+# shift of decomposition sequence in decompList
+#
+
+set decompGroupMap [list \
+    -1 -1 -1 -1 -1 -1 -1 -1 196608 -1 -1 -1 -1 -1 -1 -1 327681 -1 196611 \
+    -1 -1 -1 -1 327684 -1 -1 196614 196615 327688 196618 -1 -1 327691 196621 \
+    196622 -1 458767 458770 458773 -1 262168 262170 262172 262174 262176 \
+    262178 -1 262180 262182 262184 262186 262188 262190 262192 262194 262196 \
+    -1 262198 262200 262202 262204 262206 262208 -1 -1 262210 262212 262214 \
+    262216 262218 -1 -1 262220 262222 262224 262226 262228 262230 -1 262232 \
+    262234 262236 262238 262240 262242 262244 262246 262248 -1 262250 262252 \
+    262254 262256 262258 262260 -1 -1 262262 262264 262266 262268 262270 \
+    -1 262272 262274 262276 262278 262280 262282 262284 262286 262288 262290 \
+    262292 262294 262296 262298 262300 262302 262304 -1 -1 262306 262308 \
+    262310 262312 262314 262316 262318 262320 262322 262324 262326 262328 \
+    262330 262332 262334 262336 262338 262340 262342 262344 -1 -1 262346 \
+    262348 262350 262352 262354 262356 262358 262360 262362 -1 327900 327902 \
+    262368 262370 262372 262374 -1 262376 262378 262380 262382 262384 262386 \
+    327924 327926 -1 -1 262392 262394 262396 262398 262400 262402 327940 \
+    -1 -1 262406 262408 262410 262412 262414 262416 -1 -1 262418 262420 \
+    262422 262424 262426 262428 262430 262432 262434 262436 262438 262440 \
+    262442 262444 262446 262448 262450 262452 -1 -1 262454 262456 262458 \
+    262460 262462 262464 262466 262468 262470 262472 262474 262476 262478 \
+    262480 262482 262484 262486 262488 262490 262492 262494 262496 262498 \
+    196964 262501 262503 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 262505 \
+    262507 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 328045 328047 328049 328051 \
+    328053 328055 328057 328059 328061 262527 262529 262531 262533 262535 \
+    262537 262539 262541 262543 262545 262547 262549 262551 262553 262555 \
+    262557 -1 262559 262561 262563 262565 262567 262569 -1 -1 262571 262573 \
+    262575 262577 262579 262581 262583 262585 262587 262589 262591 328129 \
+    328131 328133 262599 262601 -1 -1 262603 262605 262607 262609 262611 \
+    262613 262615 262617 262619 262621 262623 262625 262627 262629 262631 \
+    262633 262635 262637 262639 262641 262643 262645 262647 262649 262651 \
+    262653 262655 262657 262659 262661 262663 262665 262667 262669 262671 \
+    262673 -1 -1 262675 262677 -1 -1 -1 -1 -1 -1 262679 262681 262683 262685 \
+    262687 262689 262691 262693 262695 262697 262699 262701 262703 262705 \
+    -1 -1 -1 -1 197171 197172 197173 197174 197175 197176 197177 197178 \
+    197179 -1 -1 -1 -1 -1 -1 -1 328252 328254 328256 328258 328260 328262 \
+    -1 -1 197192 197193 196964 197194 197195 -1 -1 -1 131660 131661 -1 \
+    131662 262735 -1 -1 -1 -1 -1 -1 -1 131665 -1 -1 -1 -1 -1 328274 -1 \
+    -1 -1 131668 -1 -1 -1 -1 -1 327688 262741 262743 131673 262746 262748 \
+    262750 -1 262752 -1 262754 262756 262758 -1 -1 -1 -1 -1 -1 -1 -1 -1 \
+    262760 262762 262764 262766 262768 262770 262772 -1 -1 -1 -1 -1 -1 \
+    -1 -1 -1 262774 262776 262778 262780 262782 -1 197248 197249 197250 \
+    262787 262789 197255 197256 -1 197257 197258 197259 -1 197260 197261 \
+    -1 -1 -1 197262 -1 -1 -1 -1 -1 -1 262799 262801 -1 262803 -1 -1 -1 \
+    262805 -1 -1 -1 -1 262807 262809 262811 -1 -1 262813 -1 -1 -1 -1 -1 \
+    -1 -1 262815 -1 -1 -1 -1 -1 -1 262817 262819 -1 262821 -1 -1 -1 262823 \
+    -1 -1 -1 -1 262825 262827 262829 -1 -1 -1 -1 -1 -1 -1 262831 262833 \
+    -1 262835 262837 -1 -1 -1 -1 -1 262839 262841 262843 262845 -1 -1 262847 \
+    262849 -1 -1 262851 262853 262855 262857 262859 262861 -1 -1 262863 \
+    262865 262867 262869 262871 262873 -1 -1 262875 262877 262879 262881 \
+    262883 262885 262887 262889 262891 262893 262895 262897 -1 -1 262899 \
+    262901 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 328439 -1 -1 262905 262907 \
+    262909 262911 262913 -1 -1 -1 -1 -1 -1 328451 328453 328455 328457 \
+    -1 -1 -1 -1 -1 -1 -1 262923 -1 262925 -1 -1 -1 -1 -1 -1 -1 -1 262927 \
+    -1 -1 -1 -1 -1 262929 -1 -1 -1 -1 -1 -1 -1 262931 -1 -1 262933 -1 -1 \
+    -1 262935 262937 262939 262941 262943 262945 262947 262949 -1 -1 -1 \
+    262951 262953 -1 -1 -1 -1 -1 -1 -1 262955 262957 -1 262959 -1 -1 -1 \
+    262961 -1 -1 262963 -1 -1 262965 262967 262969 -1 -1 262971 -1 262973 \
+    -1 -1 262975 262977 -1 -1 -1 -1 -1 -1 -1 262979 262981 -1 -1 -1 -1 \
+    -1 -1 262983 -1 -1 -1 -1 -1 262985 262987 262989 -1 -1 -1 262991 -1 \
+    -1 -1 -1 -1 -1 -1 262993 -1 -1 -1 -1 -1 -1 262995 262997 -1 262999 \
+    263001 -1 -1 -1 -1 -1 -1 263003 263005 263007 -1 -1 -1 -1 -1 263009 \
+    -1 263011 263013 263015 -1 -1 -1 -1 328553 -1 -1 -1 -1 -1 -1 -1 328555 \
+    -1 -1 -1 -1 -1 -1 -1 -1 328557 328559 -1 -1 -1 -1 -1 -1 197489 -1 -1 \
+    -1 -1 -1 -1 263026 -1 -1 -1 -1 -1 -1 -1 -1 -1 263028 -1 -1 -1 -1 263030 \
+    -1 -1 -1 -1 263032 -1 -1 -1 -1 263034 -1 -1 -1 -1 263036 -1 -1 -1 -1 \
+    -1 -1 -1 -1 -1 263038 -1 263040 263042 328580 263046 328584 -1 -1 -1 \
+    -1 -1 -1 -1 263050 -1 -1 -1 -1 -1 -1 -1 -1 -1 263052 -1 -1 -1 -1 -1 \
+    -1 -1 -1 -1 263054 -1 -1 -1 -1 263056 -1 -1 -1 -1 263058 -1 -1 -1 -1 \
+    263060 -1 -1 -1 -1 263062 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 263064 \
+    -1 -1 -1 -1 -1 197530 -1 -1 -1 -1 -1 -1 -1 -1 -1 263067 -1 263069 -1 \
+    263071 -1 263073 -1 263075 -1 -1 -1 263077 -1 -1 -1 -1 -1 -1 -1 -1 \
+    263079 -1 263081 -1 -1 263083 263085 -1 263087 -1 -1 -1 -1 -1 -1 -1 \
+    -1 197553 197554 197555 -1 197556 197557 197558 197559 197560 197561 \
+    197562 197563 197564 197565 197566 -1 197567 197568 197569 197570 197571 \
+    197572 197573 196611 197574 197575 197576 197577 197578 197579 197580 \
+    197581 197582 197583 -1 197584 197585 197586 196622 197587 197588 197589 \
+    197590 197591 197592 197593 197594 197595 197596 197248 197597 197598 \
+    197255 197599 197600 197174 197592 197595 197248 197597 197258 197255 \
+    197599 -1 -1 -1 -1 -1 197601 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 197602 197603 \
+    197604 197605 197582 197606 197607 197608 197609 197610 197611 197612 \
+    197613 197614 197615 197616 197617 197618 197619 197620 197621 197622 \
+    197623 197624 197625 197626 197627 197628 197629 197630 197631 197632 \
+    197633 197634 197635 197636 197249 263173 263175 263177 263179 263181 \
+    263183 263185 263187 263189 263191 263193 263195 263197 263199 263201 \
+    263203 263205 263207 263209 263211 263213 263215 263217 263219 263221 \
+    263223 263225 263227 263229 263231 263233 263235 263237 263239 263241 \
+    263243 263245 263247 263249 263251 263253 263255 263257 263259 263261 \
+    263263 263265 263267 263269 263271 263273 263275 263277 263279 263281 \
+    263283 263285 263287 263289 263291 263293 263295 263297 263299 263301 \
+    263303 263305 263307 263309 263311 263313 263315 263317 263319 263321 \
+    263323 263325 263327 263329 263331 263333 263335 263337 263339 263341 \
+    263343 263345 263347 263349 263351 263353 263355 263357 263359 263361 \
+    263363 263365 263367 263369 263371 263373 263375 263377 263379 263381 \
+    263383 263385 263387 263389 263391 263393 263395 263397 263399 263401 \
+    263403 263405 263407 263409 263411 263413 263415 263417 263419 263421 \
+    263423 263425 263427 263429 263431 263433 263435 263437 263439 263441 \
+    263443 263445 263447 263449 263451 263453 263455 263457 263459 263461 \
+    263463 263465 263467 263469 263471 263473 263475 263477 263479 329017 \
+    263483 -1 -1 -1 -1 263485 263487 263489 263491 263493 263495 263497 \
+    263499 263501 263503 263505 263507 263509 263511 263513 263515 263517 \
+    263519 263521 263523 263525 263527 263529 263531 263533 263535 263537 \
+    263539 263541 263543 263545 263547 263549 263551 263553 263555 263557 \
+    263559 263561 263563 263565 263567 263569 263571 263573 263575 263577 \
+    263579 263581 263583 263585 263587 263589 263591 263593 263595 263597 \
+    263599 263601 263603 263605 263607 263609 263611 263613 263615 263617 \
+    263619 263621 263623 263625 263627 263629 263631 263633 263635 263637 \
+    263639 263641 263643 263645 263647 263649 263651 263653 263655 263657 \
+    263659 263661 263663 -1 -1 -1 -1 -1 -1 263665 263667 263669 263671 \
+    263673 263675 263677 263679 263681 263683 263685 263687 263689 263691 \
+    263693 263695 263697 263699 263701 263703 263705 263707 -1 -1 263709 \
+    263711 263713 263715 263717 263719 -1 -1 263721 263723 263725 263727 \
+    263729 263731 263733 263735 263737 263739 263741 263743 263745 263747 \
+    263749 263751 263753 263755 263757 263759 263761 263763 263765 263767 \
+    263769 263771 263773 263775 263777 263779 263781 263783 263785 263787 \
+    263789 263791 263793 263795 -1 -1 263797 263799 263801 263803 263805 \
+    263807 -1 -1 263809 263811 263813 263815 263817 263819 263821 263823 \
+    -1 263825 -1 263827 -1 263829 -1 263831 263833 263835 263837 263839 \
+    263841 263843 263845 263847 263849 263851 263853 263855 263857 263859 \
+    263861 263863 263865 132795 263868 132798 263871 132801 263874 132804 \
+    263877 132807 263880 132810 263883 132813 -1 -1 263886 263888 263890 \
+    263892 263894 263896 263898 263900 263902 263904 263906 263908 263910 \
+    263912 263914 263916 263918 263920 263922 263924 263926 263928 263930 \
+    263932 263934 263936 263938 263940 263942 263944 263946 263948 263950 \
+    263952 263954 263956 263958 263960 263962 263964 263966 263968 263970 \
+    263972 263974 263976 263978 263980 263982 263984 263986 263988 263990 \
+    -1 263992 263994 263996 263998 264000 132930 264003 329541 132935 329541 \
+    329544 264010 264012 264014 264016 -1 264018 264020 264022 132952 264025 \
+    132955 264028 264030 264032 264034 264036 264038 264040 132970 -1 -1 \
+    264043 264045 264047 264049 264051 132981 -1 264054 264056 264058 264060 \
+    264062 264064 132994 264067 264069 264071 264073 264075 264077 264079 \
+    133009 264082 264084 133014 133015 -1 -1 264088 264090 264092 -1 264094 \
+    264096 264098 133028 264101 133031 264104 133034 329643 -1 133037 133038 \
+    196608 196608 196608 196608 196608 196608 196608 196608 196608 -1 -1 \
+    -1 -1 -1 -1 198575 -1 -1 -1 -1 -1 329648 -1 -1 -1 -1 198578 329651 \
+    460725 -1 -1 -1 -1 -1 -1 -1 -1 196608 -1 -1 -1 329656 460730 -1 329661 \
+    460735 -1 -1 -1 -1 329666 -1 329668 -1 -1 -1 -1 -1 -1 -1 -1 329670 \
+    329672 329674 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 591820 198608 \
+    197600 -1 -1 198609 198610 198611 198612 198613 198614 198615 198616 \
+    198617 198618 198619 198620 198608 196621 196614 196615 198609 198610 \
+    198611 198612 198613 198614 198615 198616 198617 198618 198619 -1 196611 \
+    197579 196622 197194 197580 -1 -1 -1 329693 -1 -1 -1 -1 -1 -1 -1 460767 \
+    460770 198629 329702 -1 460776 460779 198638 -1 329711 197583 197560 \
+    197560 197560 197171 198641 197561 197561 197564 197193 -1 197566 329714 \
+    -1 -1 197569 198644 197570 197570 197570 -1 -1 329717 460791 329722 \
+    -1 198652 -1 133117 -1 198652 -1 132027 133118 197555 198629 -1 197579 \
+    197557 198655 -1 197565 196622 198656 198657 198658 198659 197600 -1 \
+    460804 197256 197597 198663 198664 198665 -1 -1 -1 -1 197556 197578 \
+    197579 197600 197173 -1 -1 -1 -1 -1 -1 -1 -1 -1 460810 460813 460816 \
+    460819 460822 460825 460828 460831 460834 460837 460840 460843 329774 \
+    197561 329776 460850 329781 198711 329784 460858 591933 329793 198723 \
+    329796 460870 197564 198629 197556 197565 197600 329801 460875 329806 \
+    197595 329808 460882 591957 329817 197194 329819 460893 197193 197603 \
+    197578 197585 -1 -1 264288 264290 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 264292 \
+    -1 -1 -1 -1 -1 -1 264294 264296 264298 -1 -1 -1 -1 264300 -1 -1 -1 \
+    -1 264302 -1 -1 264304 -1 -1 -1 -1 -1 -1 -1 264306 -1 264308 -1 -1 \
+    -1 -1 -1 329846 460920 -1 329851 460925 -1 -1 -1 -1 -1 -1 -1 -1 264320 \
+    -1 -1 264322 -1 -1 264324 -1 264326 -1 -1 -1 -1 -1 -1 264328 -1 264330 \
+    -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 264332 264334 264336 264338 264340 -1 \
+    -1 264342 264344 -1 -1 264346 264348 -1 -1 -1 -1 -1 -1 264350 264352 \
+    -1 -1 264354 264356 -1 -1 264358 264360 -1 -1 -1 -1 -1 -1 -1 -1 -1 \
+    -1 264362 264364 264366 264368 264370 264372 264374 264376 -1 -1 -1 \
+    -1 -1 -1 264378 264380 264382 264384 -1 -1 -1 133314 133315 -1 -1 -1 \
+    -1 -1 196621 196614 196615 198609 198610 198611 198612 198613 198614 \
+    329924 329926 329928 329930 329932 329934 329936 329938 329940 329942 \
+    329944 461018 461021 461024 461027 461030 461033 461036 461039 461042 \
+    592117 592121 592125 592129 592133 592137 592141 592145 592149 592153 \
+    592157 330017 330019 330021 330023 330025 330027 330029 330031 330033 \
+    461107 461110 461113 461116 461119 461122 461125 461128 461131 461134 \
+    461137 461140 461143 461146 461149 461152 461155 461158 461161 461164 \
+    461167 461170 461173 461176 461179 461182 461185 461188 461191 461194 \
+    461197 461200 461203 461206 461209 461212 461215 197553 197555 198629 \
+    197556 197557 198655 197559 197560 197561 197562 197563 197564 197565 \
+    197566 197567 197569 198644 197570 199074 197571 197572 198711 197573 \
+    198723 199075 198652 196611 197577 197603 197578 197579 197606 197583 \
+    197171 197600 197173 197584 197193 197585 198620 196622 197590 199076 \
+    197174 196964 197591 197592 197595 197178 197194 197179 197633 198608 \
+    -1 -1 -1 -1 -1 -1 -1 -1 -1 592293 -1 -1 -1 -1 -1 -1 -1 461225 330156 \
+    461230 -1 -1 -1 -1 -1 264625 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 199091 -1 \
+    -1 -1 -1 -1 -1 -1 199092 -1 -1 -1 199093 -1 -1 -1 -1 199094 199095 \
+    199096 199097 199098 199099 199100 199101 199102 199103 199104 199105 \
+    199106 199107 199108 199109 199110 199111 199112 199113 199114 199115 \
+    199116 199117 199118 199119 199120 199121 199122 199123 199124 199125 \
+    199126 199127 199128 199129 199130 199131 199132 199133 199134 199135 \
+    199136 199137 199138 199139 199140 199141 199142 199143 199144 199145 \
+    199146 199147 199148 199149 199150 199151 199152 199153 199154 199155 \
+    199156 199157 199158 199159 199160 199161 199162 199163 199164 199165 \
+    199166 199167 199168 199169 199170 199171 199172 199173 199174 199175 \
+    199176 199177 199178 199179 199180 199181 199182 199183 199184 199185 \
+    199186 199187 199188 199189 199190 199191 199192 199193 199194 199195 \
+    199196 199197 199198 199199 199200 199201 199202 199203 199204 199205 \
+    199206 199207 199208 199209 199210 199211 199212 199213 199214 199215 \
+    199216 199217 199218 199219 199220 199221 199222 199223 199224 199225 \
+    199226 199227 199228 199229 199230 199231 199232 199233 199234 199235 \
+    199236 199237 199238 199239 199240 199241 199242 199243 199244 199245 \
+    199246 199247 199248 199249 199250 199251 199252 199253 199254 199255 \
+    199256 199257 199258 199259 199260 199261 199262 199263 199264 199265 \
+    199266 199267 199268 199269 199270 199271 199272 199273 199274 199275 \
+    199276 199277 199278 199279 199280 199281 199282 199283 199284 199285 \
+    199286 199287 199288 199289 199290 199291 199292 199293 199294 199295 \
+    199296 199297 199298 199299 199300 199301 199302 199303 199304 199305 \
+    199306 199307 -1 -1 -1 -1 -1 -1 -1 -1 199308 -1 199117 199309 199310 \
+    -1 -1 -1 -1 -1 -1 -1 -1 -1 264847 -1 264849 -1 264851 -1 264853 -1 \
+    264855 -1 264857 -1 264859 -1 264861 -1 264863 -1 264865 -1 264867 \
+    -1 264869 -1 -1 264871 -1 264873 -1 264875 -1 -1 -1 -1 -1 -1 264877 \
+    264879 -1 264881 264883 -1 264885 264887 -1 264889 264891 -1 264893 \
+    264895 -1 -1 -1 -1 -1 -1 264897 -1 -1 -1 -1 -1 -1 330435 330437 -1 \
+    264903 330441 -1 -1 -1 -1 264907 -1 264909 -1 264911 -1 264913 -1 264915 \
+    -1 264917 -1 264919 -1 264921 -1 264923 -1 264925 -1 264927 -1 264929 \
+    -1 -1 264931 -1 264933 -1 264935 -1 -1 -1 -1 -1 -1 264937 264939 -1 \
+    264941 264943 -1 264945 264947 -1 264949 264951 -1 264953 264955 -1 \
+    -1 -1 -1 -1 -1 264957 -1 -1 264959 264961 264963 264965 -1 -1 -1 264967 \
+    330505 -1 199435 199436 199437 199438 199439 199440 199441 199442 199443 \
+    199444 199445 199446 199447 199448 199449 199450 199451 199452 199453 \
+    199454 199455 199456 199457 199458 199459 199460 199461 199462 199463 \
+    199464 199465 199466 199467 199468 199469 199470 199471 199472 199473 \
+    199474 199475 199476 199477 199478 199479 199480 199481 199482 199483 \
+    199484 199485 199486 199487 199488 199489 199490 199491 199492 199493 \
+    199494 199495 199496 199497 199498 199499 199500 199501 199502 199503 \
+    199504 199505 199506 199507 199508 199509 199510 199511 199512 199513 \
+    199514 199515 199516 199517 199518 199519 199520 199521 199522 199523 \
+    199524 199525 199526 199527 199528 -1 -1 -1 199094 199100 199529 199530 \
+    199531 199532 199533 199534 199098 199535 199536 199537 199538 199102 \
+    461683 461686 461689 461692 461695 461698 461701 461704 461707 461710 \
+    461713 461716 461719 461722 592797 592801 592805 592809 592813 592817 \
+    592821 592825 592829 592833 592837 592841 592845 592849 592853 986073 \
+    855008 -1 461798 461801 461804 461807 461810 461813 461816 461819 461822 \
+    461825 461828 461831 461834 461837 461840 461843 461846 461849 461852 \
+    461855 461858 461861 461864 461867 461870 461873 461876 461879 461882 \
+    461885 461888 461891 461894 461897 461900 461903 -1 -1 -1 -1 461906 \
+    330837 330839 330841 330843 330845 330847 330849 330851 330853 330855 \
+    330857 330859 330861 330863 330865 199435 199438 199441 199443 199451 \
+    199452 199455 199457 199458 199460 199461 199462 199463 199464 330867 \
+    330869 330871 330873 330875 330877 330879 330881 330883 330885 330887 \
+    330889 330891 330893 724111 593044 330904 -1 199094 199100 199529 199530 \
+    199834 199835 199836 199105 199837 199117 199167 199179 199178 199168 \
+    199260 199125 199165 199838 199839 199840 199841 199842 199843 199844 \
+    199845 199846 199847 199131 199848 199849 199850 199851 199852 199853 \
+    199854 199855 199531 199532 199533 199856 199857 199858 199859 199860 \
+    199861 199862 199863 199864 199865 330938 330940 330942 330944 330946 \
+    330948 330950 330952 330954 330956 330958 330960 330962 330964 330966 \
+    330968 330970 330972 330974 330976 330978 330980 330982 330984 462058 \
+    462061 462064 330995 462069 331000 462074 199933 199934 199935 199936 \
+    199937 199938 199939 199940 199941 199942 199943 199944 199945 199946 \
+    199947 199948 199949 199950 199951 199952 199953 199954 199955 199956 \
+    199957 199958 199959 199960 199961 199962 199963 199964 199965 199966 \
+    199967 199968 199969 199970 199971 199972 199973 199974 199975 199976 \
+    199977 199978 199979 -1 593196 593200 593204 462136 593211 462143 462146 \
+    724293 593226 462158 462161 462164 593239 593243 462175 462178 331109 \
+    462183 593258 593262 331122 724340 855417 724351 462212 724359 724364 \
+    593297 462229 462232 462235 593310 724386 593319 462251 462254 462257 \
+    331188 331190 331192 331194 462268 462271 724418 462279 593354 724430 \
+    462291 331222 331224 724442 593375 724451 462312 724459 331248 462322 \
+    462325 462328 462331 462334 593409 462341 331272 462346 462349 462352 \
+    593427 462359 462362 462365 724512 593445 331305 724523 331312 593458 \
+    593462 462394 462397 462400 593475 331335 462409 593484 331344 724562 \
+    462423 331354 331356 331358 331360 331362 331364 331366 331368 331370 \
+    331372 462446 462449 462452 462455 462458 462461 462464 462467 462470 \
+    462473 462476 462479 462482 462485 462488 462491 331422 331424 462498 \
+    331429 331431 331433 462507 462510 331441 331443 331445 331447 331449 \
+    593595 331455 331457 331459 331461 331463 331465 331467 331469 462543 \
+    593618 331478 331480 331482 331484 331486 331488 331490 462564 462567 \
+    462570 462573 331504 331506 331508 331510 331512 331514 331516 331518 \
+    331520 331522 462596 462599 331530 462604 462607 462610 331541 462615 \
+    462618 593693 331553 462627 462630 462633 462636 724783 855860 331578 \
+    331580 331582 331584 331586 331588 331590 331592 331594 331596 331598 \
+    331600 331602 331604 331606 331608 331610 331612 593758 331618 331620 \
+    331622 593768 462700 331631 331633 331635 331637 331639 331641 331643 \
+    331645 331647 331649 462723 331654 331656 462730 462733 331664 593810 \
+    462742 331673 331675 331677 331679 462753 462756 331687 331689 331691 \
+    331693 331695 331697 331699 331701 331703 462777 462780 462783 462786 \
+    462789 462792 462795 462798 462801 462804 462807 462810 462813 462816 \
+    462819 462822 462825 462828 462831 462834 462837 462840 462843 135166 \
+    135167 133716 135168 135169 135170 135171 133770 133770 135172 133724 \
+    135173 135174 135175 135176 135177 135178 135179 135180 135181 135182 \
+    135183 135184 135185 135186 135187 135188 135189 135190 135191 135192 \
+    135193 135194 135195 135196 135197 135198 135199 135200 135201 135202 \
+    135203 135204 135205 135206 135207 135208 135209 135210 135211 135212 \
+    135213 133682 135214 135215 135216 135217 135218 135219 135220 135221 \
+    135222 135223 135224 133755 135225 135226 135227 135228 135229 135230 \
+    135231 135232 135233 135234 135235 135236 135237 135238 135239 135240 \
+    135241 135242 135243 135244 135245 135246 135247 135248 135249 135250 \
+    135251 135182 135252 135253 135254 135255 135256 135257 135258 135259 \
+    135260 135261 135262 135263 135264 135265 135266 135267 135268 135269 \
+    135270 135271 133718 135272 135273 135274 135275 135276 135277 135278 \
+    135279 135280 135281 135282 135283 135284 135285 135286 133595 135287 \
+    135288 135289 135290 135291 135292 135293 135294 133576 135295 135296 \
+    135297 135298 135299 135300 135301 135302 135303 135304 135305 135306 \
+    135307 135308 135309 135310 135311 135312 135313 135314 135315 135316 \
+    135270 135317 135318 135319 135320 135321 135322 135323 135324 135254 \
+    135325 135326 135327 135328 135329 135330 135331 135332 135333 135334 \
+    135335 135336 135337 135338 135339 135340 135341 135342 135343 135344 \
+    135182 135345 135346 135347 135348 133769 135349 135350 135351 135352 \
+    135353 135354 135355 135356 135357 135358 135359 135360 134299 135361 \
+    135362 135363 135364 135365 135366 135367 135368 135369 135256 135370 \
+    135371 135372 135373 135374 135375 135376 135377 135378 135379 135380 \
+    135381 135382 133723 135383 135384 135385 135386 135387 135388 135389 \
+    135390 135391 135392 135393 135394 135395 133674 135396 135397 135398 \
+    135399 135400 135401 135402 135403 135404 135405 135406 135407 135408 \
+    135409 135410 135411 133701 135412 133704 135413 135414 135415 -1 -1 \
+    135416 -1 135417 -1 -1 135418 135419 135420 135421 135422 135423 135424 \
+    135425 135426 133681 -1 135427 -1 135428 -1 -1 135429 135430 -1 -1 \
+    -1 135431 135432 135433 135434 -1 -1 135435 135436 135437 135438 135439 \
+    135440 135441 135442 135443 135444 135445 135446 133602 135447 135448 \
+    135449 135450 135451 135452 135453 135454 135455 135456 135457 135458 \
+    135459 135460 135461 134304 135462 135463 135464 135465 134308 135466 \
+    135467 135468 135469 135470 135306 135471 135472 135473 135474 135475 \
+    135476 135476 135477 135478 135479 135480 135481 135482 135483 135484 \
+    135429 135485 135486 135487 -1 -1 -1 -1 -1 135488 135489 135490 135491 \
+    135492 135493 135494 135495 135441 135496 135497 135498 135416 135499 \
+    135500 135501 135502 135503 135504 135505 135506 135507 135508 135509 \
+    135510 135449 135511 135450 135512 135513 135514 135515 135516 135417 \
+    135203 135517 135518 133635 135271 135354 135519 135520 135457 135521 \
+    135458 135522 135523 135524 135419 135525 135526 135527 135528 135529 \
+    135420 135530 135531 135532 135533 135534 135535 135470 135536 135537 \
+    135306 135538 135474 135539 135540 135541 135542 135543 135479 135544 \
+    135428 135545 135480 135252 135546 135481 135547 135483 135548 135549 \
+    135550 135551 135552 135485 135425 135553 135486 135554 135487 135555 \
+    133770 135556 135557 135558 135559 135560 135561 135562 135563 135564 \
+    135565 135566 -1 -1 -1 -1 -1 -1 332175 332177 332179 463253 463256 \
+    332187 332189 -1 -1 -1 -1 332191 332193 332195 332197 332199 -1 -1 \
+    -1 -1 -1 266665 -1 266667 201133 198656 198659 201134 201135 201136 \
+    201137 201138 201139 198615 266676 266678 266680 266682 266684 266686 \
+    266688 266690 266692 266694 266696 266698 266700 -1 266702 266704 266706 \
+    266708 266710 -1 266712 -1 266714 266716 -1 266718 266720 -1 266722 \
+    266724 266726 266728 266730 266732 266734 266736 266738 332276 201206 \
+    201206 201207 201207 201207 201207 201208 201208 201208 201208 201209 \
+    201209 201209 201209 201210 201210 201210 201210 201211 201211 201211 \
+    201211 201212 201212 201212 201212 201213 201213 201213 201213 201214 \
+    201214 201214 201214 201215 201215 201215 201215 201216 201216 201216 \
+    201216 201217 201217 201217 201217 201218 201218 201218 201218 201219 \
+    201219 201220 201220 201221 201221 201222 201222 201223 201223 201224 \
+    201224 201225 201225 201225 201225 201226 201226 201226 201226 201227 \
+    201227 201227 201227 201228 201228 201228 201228 201229 201229 201230 \
+    201230 201230 201230 201231 201231 201232 201232 201232 201232 201233 \
+    201233 201233 201233 201234 201234 201235 201235 -1 -1 -1 -1 -1 -1 \
+    -1 -1 -1 201236 201236 201236 201236 201237 201237 201238 201238 201239 \
+    201239 201240 201241 201241 201242 201242 201243 201243 201244 201244 \
+    201244 201244 201245 201245 332318 332318 332320 332320 332322 332322 \
+    332324 332324 332326 332326 332328 332328 332330 332330 332330 332332 \
+    332332 332332 201262 201262 201262 201262 332335 332337 332339 332332 \
+    332341 332343 332345 332347 332349 332351 332353 332355 332357 332359 \
+    332361 332363 332365 332367 332369 332371 332373 332375 332377 332379 \
+    332381 332383 332385 332387 332389 332391 332393 332395 332397 332399 \
+    332401 332403 332405 332407 332409 332411 332413 332415 332417 332419 \
+    332421 332423 332425 332427 332429 332431 332433 332435 332437 332439 \
+    332441 332443 332445 332447 332449 332451 332453 332455 332457 332459 \
+    332461 332463 332465 332467 332469 332471 332473 332475 332477 332479 \
+    332481 332483 332485 332487 332489 332491 332493 332495 332497 332499 \
+    332501 332503 332505 332507 332509 332511 332513 332515 332517 332519 \
+    463593 463596 463599 463602 463605 463608 332539 332541 332339 332543 \
+    332332 332341 332545 332547 332349 332549 332351 332353 332551 332553 \
+    332361 332555 332363 332365 332557 332559 332369 332561 332371 332373 \
+    332431 332433 332439 332441 332443 332451 332453 332455 332457 332465 \
+    332467 332469 332563 332477 332565 332567 332489 332569 332491 332493 \
+    332519 332571 332573 332509 332575 332511 332513 332335 332337 332577 \
+    332339 332579 332343 332345 332347 332349 332581 332355 332357 332359 \
+    332361 332583 332369 332375 332377 332379 332381 332383 332387 332389 \
+    332391 332393 332395 332397 332585 332399 332401 332403 332405 332407 \
+    332409 332413 332415 332417 332419 332421 332423 332425 332427 332429 \
+    332435 332437 332445 332447 332449 332451 332453 332459 332461 332463 \
+    332465 332587 332471 332473 332475 332477 332483 332485 332487 332489 \
+    332589 332495 332497 332591 332503 332505 332507 332509 332593 332339 \
+    332579 332349 332581 332361 332583 332369 332595 332395 332597 332599 \
+    332601 332451 332453 332465 332489 332589 332509 332593 463675 463678 \
+    463681 332612 332614 332616 332618 332620 332622 332624 332626 332628 \
+    332630 332632 332634 332636 332638 332640 332642 332644 332646 332648 \
+    332650 332652 332654 332656 332599 332658 332660 332662 332664 332612 \
+    332614 332616 332618 332620 332622 332624 332626 332628 332630 332632 \
+    332634 332636 332638 332640 332642 332644 332646 332648 332650 332652 \
+    332654 332656 332599 332658 332660 332662 332664 332652 332654 332656 \
+    332599 332597 332601 332411 332389 332391 332393 332652 332654 332656 \
+    332411 332413 332666 332666 -1 -1 463740 463743 463743 463746 463749 \
+    463752 463755 463758 463761 463761 463764 463767 463770 463773 463776 \
+    463779 463779 463782 463785 463785 463788 463788 463791 463794 463794 \
+    463797 463800 463800 463803 463803 463806 463809 463809 463812 463812 \
+    463815 463818 463821 463824 463824 463827 463830 463833 463836 463839 \
+    463839 463842 463845 463848 463851 463854 463857 463857 463860 463860 \
+    463863 463863 463866 463869 463872 463875 463878 463881 463884 -1 -1 \
+    463887 463890 463893 463896 463899 463902 463902 463905 463908 463911 \
+    463914 463914 463917 463920 463923 463926 463929 463932 463935 463938 \
+    463941 463944 463947 463950 463953 463956 463959 463962 463965 463968 \
+    463971 463974 463977 463980 463842 463848 463983 463986 463989 463992 \
+    463995 463998 463995 463989 464001 464004 464007 464010 464013 463998 \
+    463821 463791 464016 464019 464022 464025 595100 595104 595108 595112 \
+    595116 595120 595124 464056 2430139 1119437 595157 -1 -1 -1 201945 \
+    201946 201947 201948 197204 201949 201950 201951 201952 201953 -1 -1 \
+    -1 -1 -1 -1 201954 201955 201956 201957 201957 198618 198619 201958 \
+    201959 201960 201961 201962 201963 201964 201965 198850 198851 201966 \
+    201967 201968 201969 -1 -1 201970 201971 201972 201972 201972 201972 \
+    201957 201957 201957 201945 201946 198578 -1 197204 201948 201950 201949 \
+    201955 198618 198619 201958 201959 201960 201961 201973 201974 201975 \
+    198615 201976 201977 201978 198617 -1 201979 201980 201981 201982 -1 \
+    -1 -1 -1 333055 333057 333059 -1 333061 -1 333063 333065 333067 333069 \
+    333071 333073 333075 333077 333079 333081 202011 202012 202012 202013 \
+    202013 202014 202014 202015 202015 202016 202016 202016 202016 202017 \
+    202017 202018 202018 202018 202018 202019 202019 202020 202020 202020 \
+    202020 202021 202021 202021 202021 202022 202022 202022 202022 202023 \
+    202023 202023 202023 202024 202024 202024 202024 202025 202025 202026 \
+    202026 202027 202027 202028 202028 202029 202029 202029 202029 202030 \
+    202030 202030 202030 202031 202031 202031 202031 202032 202032 202032 \
+    202032 202033 202033 202033 202033 202034 202034 202034 202034 202035 \
+    202035 202035 202035 202036 202036 202036 202036 202037 202037 202037 \
+    202037 202038 202038 202038 202038 202039 202039 202039 202039 202040 \
+    202040 202040 202040 202041 202041 202041 202041 202042 202042 202042 \
+    202042 202043 202043 202043 202043 202044 202044 201245 201245 202045 \
+    202045 202045 202045 333118 333118 333120 333120 333122 333122 333124 \
+    333124 -1 -1 -1 -1 201949 202054 201973 201980 201981 201974 202055 \
+    198618 198619 201975 198615 201945 201976 198578 202056 198613 198614 \
+    201948 197204 201977 198617 201978 201950 201982 197553 197555 198629 \
+    197556 197557 198655 197559 197560 197561 197562 197563 197564 197565 \
+    197566 197567 197569 198644 197570 199074 197571 197572 198711 197573 \
+    198723 199075 198652 201970 201979 201971 202057 201957 198551 196611 \
+    197577 197603 197578 197579 197606 197583 197171 197600 197173 197584 \
+    197193 197585 198620 196622 197590 199076 197174 196964 197591 197592 \
+    197595 197178 197194 197179 197633 201958 202058 201959 202059 202060 \
+    202061 201947 201966 201967 201946 202062 199979 202063 202064 202065 \
+    202066 202067 202068 202069 202070 202071 202072 199933 199934 199935 \
+    199936 199937 199938 199939 199940 199941 199942 199943 199944 199945 \
+    199946 199947 199948 199949 199950 199951 199952 199953 199954 199955 \
+    199956 199957 199958 199959 199960 199961 199962 199963 199964 199965 \
+    199966 199967 199968 199969 199970 199971 199972 199973 199974 199975 \
+    199976 202073 202074 202075 202076 202077 202078 202079 202080 202081 \
+    202082 202083 202084 202085 202086 202087 202088 202089 202090 202091 \
+    202092 202093 202094 202095 202096 202097 202098 202099 202100 202101 \
+    202102 202103 202104 202105 202106 -1 -1 -1 202107 202108 202109 202110 \
+    202111 202112 -1 -1 202113 202114 202115 202116 202117 202118 -1 -1 \
+    202119 202120 202121 202122 202123 202124 -1 -1 202125 202126 202127 \
+    -1 -1 -1 202128 202129 202130 202131 202132 202133 202134 -1 202135 \
+    202136 202137 202138 202139 202140 202141 -1 -1 -1 -1 -1 -1 -1 267678 \
+    267680 267682 267684 267686 267688 267690 -1 -1 -1 -1 -1 -1 267692 \
+    267694 267696 267698 267700 267702 -1 -1 -1 -1 -1 -1 -1 197553 197555 \
+    198629 197556 197557 198655 197559 197560 197561 197562 197563 197564 \
+    197565 197566 197567 197569 198644 197570 199074 197571 197572 198711 \
+    197573 198723 199075 198652 196611 197577 197603 197578 197579 197606 \
+    197583 197171 197600 197173 197584 197193 197585 198620 196622 197590 \
+    199076 197174 196964 197591 197592 197595 197178 197194 197179 197633 \
+    197553 197555 198629 197556 197557 198655 197559 197560 197561 197562 \
+    197563 197564 197565 197566 197567 197569 198644 197570 199074 197571 \
+    197572 198711 197573 198723 199075 198652 196611 197577 197603 197578 \
+    197579 197606 197583 -1 197600 197173 197584 197193 197585 198620 196622 \
+    197590 199076 197174 196964 197591 197592 197595 197178 197194 197179 \
+    197633 197178 197194 197179 197633 197553 -1 198629 197556 -1 -1 197559 \
+    -1 -1 197562 197563 -1 -1 197566 197567 197569 198644 -1 199074 197571 \
+    197603 197578 -1 197606 -1 197171 197600 197173 197584 197193 197585 \
+    198620 -1 197590 199076 197174 197178 197194 197179 197633 197553 197555 \
+    -1 197556 197557 198655 197559 -1 -1 197562 197563 197564 197565 197566 \
+    197567 197569 198644 -1 199074 197571 197572 198711 197573 198723 199075 \
+    -1 196611 197577 197603 197578 197579 197606 197583 197171 197600 197173 \
+    197553 197555 -1 197556 197557 198655 197559 -1 197561 197562 197563 \
+    197564 197565 -1 197567 -1 -1 -1 199074 197571 197572 198711 197573 \
+    198723 199075 -1 196611 197577 197603 197578 197579 197606 197178 197194 \
+    197179 197633 202168 202169 -1 -1 202170 202171 198663 202172 202173 \
+    202174 202175 197260 202176 202177 202178 202179 202180 202181 202182 \
+    198664 202183 202184 197262 202185 197250 202186 202187 202188 198653 \
+    202189 202190 197248 197597 197598 197261 202191 202192 197249 198471 \
+    197257 202193 196618 202194 202195 202196 197256 197258 197259 202197 \
+    202198 202199 197255 197599 202200 202201 202202 202203 202204 202205 \
+    202206 202207 202208 202170 202171 198663 202172 202173 202174 202175 \
+    197260 202176 202177 202178 202179 202180 202181 202182 198664 202183 \
+    202184 197262 202185 197250 202186 202187 202188 198653 202189 202190 \
+    197248 197597 197598 197261 202191 202192 197249 198471 197257 202193 \
+    196618 202194 202195 202196 197256 197258 197259 202197 202198 202199 \
+    197255 197599 202200 202201 202202 202203 202204 202205 202206 202207 \
+    202208 202170 202171 198663 202172 202173 202174 202175 197260 202176 \
+    202177 202178 202179 202180 202181 202182 198664 202183 202184 197262 \
+    202185 197250 202186 202187 202188 198653 202189 202190 197248 197597 \
+    197598 197261 202191 202192 197249 198471 197257 202193 196618 202194 \
+    202195 202196 197256 197258 197259 202197 202198 202199 197255 197599 \
+    202200 202201 202202 202203 202204 202205 202206 202207 202208 202170 \
+    202171 198663 202172 202173 202174 202175 197260 202176 202177 202178 \
+    202179 202180 202181 202182 198664 202183 202184 197262 202185 197250 \
+    202186 202187 202188 198653 202189 202190 197248 197597 197598 197261 \
+    202191 202192 197249 198471 197257 202193 196618 202194 202195 202196 \
+    197256 197258 197259 202197 202198 202199 197255 197599 202200 202201 \
+    202202 202203 202204 202205 202206 202207 202208 202207 202208 202209 \
+    202210 -1 -1 198608 196621 196614 196615 198609 198610 198611 198612 \
+    198613 198614 198613 198614 198608 196621 196614 196615 198609 198610 \
+    198611 198612 198613 198614 198608 196621 196614 196615 198609 198610 \
+    198611 198612 198613 198614 198608 196621 136675 136676 136677 136678 \
+    136679 135435 136680 136681 136682 136683 135436 136684 136685 136686 \
+    135437 136687 136688 136689 136690 136691 136692 136693 136694 136695 \
+    136696 136697 136698 135489 136699 133574 136700 136701 136702 136703 \
+    136704 136705 136706 135494 135438 135439 135495 136707 136708 135258 \
+    136709 135440 136710 136711 136712 136713 136713 136713 136714 136715 \
+    136716 136717 136718 136719 136720 136721 136722 136723 136724 136725 \
+    136726 136727 136728 136729 136730 136731 136731 135497 136732 136733 \
+    136734 136735 135442 136736 136737 136738 135404 136739 136740 136741 \
+    136742 136743 136744 136745 136746 136747 136748 136749 136750 136751 \
+    136752 136753 136754 136755 136756 136757 136758 136759 136760 136761 \
+    136762 136763 136764 136764 136765 136766 136767 135254 136768 136769 \
+    136770 136771 136772 133600 136773 136774 133602 136775 136776 136777 \
+    136778 136779 136780 136781 136782 136783 136784 136785 136786 136787 \
+    136788 136789 136790 136791 136792 136793 136794 136795 135202 136796 \
+    133612 136797 136797 136798 136799 136799 136800 136801 136802 136803 \
+    136804 136805 136806 136807 136808 136809 136810 136811 136812 135447 \
+    136813 136814 136815 136816 135509 136816 136817 135449 136818 136819 \
+    136820 136821 135450 135175 136822 136823 136824 136825 136826 136827 \
+    136828 136829 136830 136831 136832 136833 136834 136835 136836 136837 \
+    136838 136839 136840 136841 136842 136843 135451 136844 136845 136846 \
+    136847 136848 136849 135453 136850 136851 136852 136853 136854 136855 \
+    136856 136857 135203 135517 136858 136859 136860 136861 136862 136863 \
+    136864 136865 135454 136866 136867 136868 136869 135559 136870 136871 \
+    136872 136873 136874 136875 136876 136877 136878 136879 136880 136881 \
+    136882 135271 136883 136884 136885 136886 136887 136888 136889 136890 \
+    136891 136892 136893 135455 135354 136894 136895 136896 136897 136898 \
+    136899 136900 136901 135520 136902 136903 136904 136905 136906 136907 \
+    136908 136909 135521 136910 136911 136912 136913 136914 136915 136916 \
+    136917 136918 136919 136920 136921 135523 136922 136923 136924 136925 \
+    136926 136927 136928 136929 136930 136931 136932 136932 136933 136934 \
+    135525 136935 136936 136937 136938 136939 136940 136941 135257 136942 \
+    136943 136944 136945 136946 136947 136948 135531 136949 136950 136951 \
+    136952 136953 136954 136954 135532 135561 136955 136956 136957 136958 \
+    136959 135220 135534 136960 136961 135465 136962 136963 135424 136964 \
+    136965 135468 136966 136967 136968 136969 136969 136970 136971 136972 \
+    136973 136974 136975 136976 136977 136978 136979 136980 136981 136982 \
+    136983 136984 136985 136986 136987 136988 136989 136990 136991 136992 \
+    136993 136994 136995 136996 135474 136997 136998 136999 137000 137001 \
+    137002 137003 137004 137005 137006 137007 137008 137009 137010 137011 \
+    137012 136798 137013 137014 137015 137016 137017 137018 137019 137020 \
+    137021 137022 137023 137024 135274 137025 137026 137027 137028 137029 \
+    137030 135477 137031 137032 137033 137034 137035 137036 137037 137038 \
+    137039 137040 137041 137042 137043 137044 137045 137046 137047 137048 \
+    137049 137050 135215 137051 137052 137053 137054 137055 137056 135541 \
+    137057 137058 137059 137060 137061 137062 137063 137064 133702 137065 \
+    137066 137067 137068 137069 137070 137071 137072 137073 137074 137075 \
+    135546 135547 133709 137076 137077 137078 137079 137080 137081 137082 \
+    137083 137084 137085 137086 137087 135548 137088 137089 137090 137091 \
+    137092 137093 137094 137095 137096 137097 137098 137099 137100 137101 \
+    137102 137103 137104 137105 137106 137107 137108 137109 137110 137111 \
+    137112 137113 137114 137115 137116 137117 135554 135554 137118 137119 \
+    137120 137121 137122 137123 137124 137125 137126 137127 135555 137128 \
+    137129 137130 137131 137132 137133 137134 137135 137136 137137 133757 \
+    137138 133761 137139 137140 137141 137142 133766 137143 -1 -1]
+
+#
+# List of decomposition sequences
+#
+
+set decompList [list \
+    32 32 776 97 32 772 50 51 32 769 956 32 807 49 111 49 8260 52 49 8260 \
+    50 51 8260 52 65 768 65 769 65 770 65 771 65 776 65 778 67 807 69 768 \
+    69 769 69 770 69 776 73 768 73 769 73 770 73 776 78 771 79 768 79 769 \
+    79 770 79 771 79 776 85 768 85 769 85 770 85 776 89 769 97 768 97 769 \
+    97 770 97 771 97 776 97 778 99 807 101 768 101 769 101 770 101 776 \
+    105 768 105 769 105 770 105 776 110 771 111 768 111 769 111 770 111 \
+    771 111 776 117 768 117 769 117 770 117 776 121 769 121 776 65 772 \
+    97 772 65 774 97 774 65 808 97 808 67 769 99 769 67 770 99 770 67 775 \
+    99 775 67 780 99 780 68 780 100 780 69 772 101 772 69 774 101 774 69 \
+    775 101 775 69 808 101 808 69 780 101 780 71 770 103 770 71 774 103 \
+    774 71 775 103 775 71 807 103 807 72 770 104 770 73 771 105 771 73 \
+    772 105 772 73 774 105 774 73 808 105 808 73 775 73 74 105 106 74 770 \
+    106 770 75 807 107 807 76 769 108 769 76 807 108 807 76 780 108 780 \
+    76 183 108 183 78 769 110 769 78 807 110 807 78 780 110 780 700 110 \
+    79 772 111 772 79 774 111 774 79 779 111 779 82 769 114 769 82 807 \
+    114 807 82 780 114 780 83 769 115 769 83 770 115 770 83 807 115 807 \
+    83 780 115 780 84 807 116 807 84 780 116 780 85 771 117 771 85 772 \
+    117 772 85 774 117 774 85 778 117 778 85 779 117 779 85 808 117 808 \
+    87 770 119 770 89 770 121 770 89 776 90 769 122 769 90 775 122 775 \
+    90 780 122 780 115 79 795 111 795 85 795 117 795 68 381 68 382 100 \
+    382 76 74 76 106 108 106 78 74 78 106 110 106 65 780 97 780 73 780 \
+    105 780 79 780 111 780 85 780 117 780 220 772 252 772 220 769 252 769 \
+    220 780 252 780 220 768 252 768 196 772 228 772 550 772 551 772 198 \
+    772 230 772 71 780 103 780 75 780 107 780 79 808 111 808 490 772 491 \
+    772 439 780 658 780 106 780 68 90 68 122 100 122 71 769 103 769 78 \
+    768 110 768 197 769 229 769 198 769 230 769 216 769 248 769 65 783 \
+    97 783 65 785 97 785 69 783 101 783 69 785 101 785 73 783 105 783 73 \
+    785 105 785 79 783 111 783 79 785 111 785 82 783 114 783 82 785 114 \
+    785 85 783 117 783 85 785 117 785 83 806 115 806 84 806 116 806 72 \
+    780 104 780 65 775 97 775 69 807 101 807 214 772 246 772 213 772 245 \
+    772 79 775 111 775 558 772 559 772 89 772 121 772 104 614 106 114 633 \
+    635 641 119 121 32 774 32 775 32 778 32 808 32 771 32 779 611 108 120 \
+    661 768 769 787 776 769 697 32 837 59 168 769 913 769 183 917 769 919 \
+    769 921 769 927 769 933 769 937 769 970 769 921 776 933 776 945 769 \
+    949 769 951 769 953 769 971 769 953 776 965 776 959 769 965 769 969 \
+    769 946 952 933 978 769 978 776 966 960 954 961 962 920 949 931 1045 \
+    768 1045 776 1043 769 1030 776 1050 769 1048 768 1059 774 1048 774 \
+    1080 774 1077 768 1077 776 1075 769 1110 776 1082 769 1080 768 1091 \
+    774 1140 783 1141 783 1046 774 1078 774 1040 774 1072 774 1040 776 \
+    1072 776 1045 774 1077 774 1240 776 1241 776 1046 776 1078 776 1047 \
+    776 1079 776 1048 772 1080 772 1048 776 1080 776 1054 776 1086 776 \
+    1256 776 1257 776 1069 776 1101 776 1059 772 1091 772 1059 776 1091 \
+    776 1059 779 1091 779 1063 776 1095 776 1067 776 1099 776 1381 1410 \
+    1575 1619 1575 1620 1608 1620 1575 1621 1610 1620 1575 1652 1608 1652 \
+    1735 1652 1610 1652 1749 1620 1729 1620 1746 1620 2344 2364 2352 2364 \
+    2355 2364 2325 2364 2326 2364 2327 2364 2332 2364 2337 2364 2338 2364 \
+    2347 2364 2351 2364 2503 2494 2503 2519 2465 2492 2466 2492 2479 2492 \
+    2610 2620 2616 2620 2582 2620 2583 2620 2588 2620 2603 2620 2887 2902 \
+    2887 2878 2887 2903 2849 2876 2850 2876 2962 3031 3014 3006 3015 3006 \
+    3014 3031 3142 3158 3263 3285 3270 3285 3270 3286 3270 3266 3274 3285 \
+    3398 3390 3399 3390 3398 3415 3545 3530 3545 3535 3548 3530 3545 3551 \
+    3661 3634 3789 3762 3755 3737 3755 3745 3851 3906 4023 3916 4023 3921 \
+    4023 3926 4023 3931 4023 3904 4021 3953 3954 3953 3956 4018 3968 4018 \
+    3969 4019 3968 4019 3969 3953 3968 3986 4023 3996 4023 4001 4023 4006 \
+    4023 4011 4023 3984 4021 4133 4142 4316 6917 6965 6919 6965 6921 6965 \
+    6923 6965 6925 6965 6929 6965 6970 6965 6972 6965 6974 6965 6975 6965 \
+    6978 6965 65 198 66 68 69 398 71 72 73 74 75 76 77 78 79 546 80 82 \
+    84 85 87 592 593 7426 98 100 101 601 603 604 103 107 109 331 596 7446 \
+    7447 112 116 117 7453 623 118 7461 947 948 967 105 1085 594 99 597 \
+    240 102 607 609 613 616 617 618 7547 669 621 7557 671 625 624 626 627 \
+    628 629 632 642 643 427 649 650 7452 651 652 122 656 657 658 65 805 \
+    97 805 66 775 98 775 66 803 98 803 66 817 98 817 199 769 231 769 68 \
+    775 100 775 68 803 100 803 68 817 100 817 68 807 100 807 68 813 100 \
+    813 274 768 275 768 274 769 275 769 69 813 101 813 69 816 101 816 552 \
+    774 553 774 70 775 102 775 71 772 103 772 72 775 104 775 72 803 104 \
+    803 72 776 104 776 72 807 104 807 72 814 104 814 73 816 105 816 207 \
+    769 239 769 75 769 107 769 75 803 107 803 75 817 107 817 76 803 108 \
+    803 7734 772 7735 772 76 817 108 817 76 813 108 813 77 769 109 769 \
+    77 775 109 775 77 803 109 803 78 775 110 775 78 803 110 803 78 817 \
+    110 817 78 813 110 813 213 769 245 769 213 776 245 776 332 768 333 \
+    768 332 769 333 769 80 769 112 769 80 775 112 775 82 775 114 775 82 \
+    803 114 803 7770 772 7771 772 82 817 114 817 83 775 115 775 83 803 \
+    115 803 346 775 347 775 352 775 353 775 7778 775 7779 775 84 775 116 \
+    775 84 803 116 803 84 817 116 817 84 813 116 813 85 804 117 804 85 \
+    816 117 816 85 813 117 813 360 769 361 769 362 776 363 776 86 771 118 \
+    771 86 803 118 803 87 768 119 768 87 769 119 769 87 776 119 776 87 \
+    775 119 775 87 803 119 803 88 775 120 775 88 776 120 776 89 775 121 \
+    775 90 770 122 770 90 803 122 803 90 817 122 817 104 817 116 776 119 \
+    778 121 778 97 702 383 775 65 803 97 803 65 777 97 777 194 769 226 \
+    769 194 768 226 768 194 777 226 777 194 771 226 771 7840 770 7841 770 \
+    258 769 259 769 258 768 259 768 258 777 259 777 258 771 259 771 7840 \
+    774 7841 774 69 803 101 803 69 777 101 777 69 771 101 771 202 769 234 \
+    769 202 768 234 768 202 777 234 777 202 771 234 771 7864 770 7865 770 \
+    73 777 105 777 73 803 105 803 79 803 111 803 79 777 111 777 212 769 \
+    244 769 212 768 244 768 212 777 244 777 212 771 244 771 7884 770 7885 \
+    770 416 769 417 769 416 768 417 768 416 777 417 777 416 771 417 771 \
+    416 803 417 803 85 803 117 803 85 777 117 777 431 769 432 769 431 768 \
+    432 768 431 777 432 777 431 771 432 771 431 803 432 803 89 768 121 \
+    768 89 803 121 803 89 777 121 777 89 771 121 771 945 787 945 788 7936 \
+    768 7937 768 7936 769 7937 769 7936 834 7937 834 913 787 913 788 7944 \
+    768 7945 768 7944 769 7945 769 7944 834 7945 834 949 787 949 788 7952 \
+    768 7953 768 7952 769 7953 769 917 787 917 788 7960 768 7961 768 7960 \
+    769 7961 769 951 787 951 788 7968 768 7969 768 7968 769 7969 769 7968 \
+    834 7969 834 919 787 919 788 7976 768 7977 768 7976 769 7977 769 7976 \
+    834 7977 834 953 787 953 788 7984 768 7985 768 7984 769 7985 769 7984 \
+    834 7985 834 921 787 921 788 7992 768 7993 768 7992 769 7993 769 7992 \
+    834 7993 834 959 787 959 788 8000 768 8001 768 8000 769 8001 769 927 \
+    787 927 788 8008 768 8009 768 8008 769 8009 769 965 787 965 788 8016 \
+    768 8017 768 8016 769 8017 769 8016 834 8017 834 933 788 8025 768 8025 \
+    769 8025 834 969 787 969 788 8032 768 8033 768 8032 769 8033 769 8032 \
+    834 8033 834 937 787 937 788 8040 768 8041 768 8040 769 8041 769 8040 \
+    834 8041 834 945 768 940 949 768 941 951 768 942 953 768 943 959 768 \
+    972 965 768 973 969 768 974 7936 837 7937 837 7938 837 7939 837 7940 \
+    837 7941 837 7942 837 7943 837 7944 837 7945 837 7946 837 7947 837 \
+    7948 837 7949 837 7950 837 7951 837 7968 837 7969 837 7970 837 7971 \
+    837 7972 837 7973 837 7974 837 7975 837 7976 837 7977 837 7978 837 \
+    7979 837 7980 837 7981 837 7982 837 7983 837 8032 837 8033 837 8034 \
+    837 8035 837 8036 837 8037 837 8038 837 8039 837 8040 837 8041 837 \
+    8042 837 8043 837 8044 837 8045 837 8046 837 8047 837 945 774 945 772 \
+    8048 837 945 837 940 837 945 834 8118 837 913 774 913 772 913 768 902 \
+    913 837 32 787 953 32 834 168 834 8052 837 951 837 942 837 951 834 \
+    8134 837 917 768 904 919 768 905 919 837 8127 768 8127 769 8127 834 \
+    953 774 953 772 970 768 912 953 834 970 834 921 774 921 772 921 768 \
+    906 8190 768 8190 769 8190 834 965 774 965 772 971 768 944 961 787 \
+    961 788 965 834 971 834 933 774 933 772 933 768 910 929 788 168 768 \
+    901 96 8060 837 969 837 974 837 969 834 8182 837 927 768 908 937 768 \
+    911 937 837 180 32 788 8194 8195 8208 32 819 46 46 46 46 46 46 8242 \
+    8242 8242 8242 8242 8245 8245 8245 8245 8245 33 33 32 773 63 63 63 \
+    33 33 63 8242 8242 8242 8242 48 52 53 54 55 56 57 43 8722 61 40 41 \
+    110 82 115 97 47 99 97 47 115 67 176 67 99 47 111 99 47 117 400 176 \
+    70 295 78 111 81 83 77 84 69 76 84 77 90 937 197 70 1488 1489 1490 \
+    1491 70 65 88 915 928 8721 49 8260 51 50 8260 51 49 8260 53 50 8260 \
+    53 51 8260 53 52 8260 53 49 8260 54 53 8260 54 49 8260 56 51 8260 56 \
+    53 8260 56 55 8260 56 49 8260 73 73 73 73 73 73 86 86 86 73 86 73 73 \
+    86 73 73 73 73 88 88 88 73 88 73 73 105 105 105 105 105 105 118 118 \
+    105 118 105 105 118 105 105 105 105 120 120 105 120 105 105 8592 824 \
+    8594 824 8596 824 8656 824 8660 824 8658 824 8707 824 8712 824 8715 \
+    824 8739 824 8741 824 8747 8747 8747 8747 8747 8750 8750 8750 8750 \
+    8750 8764 824 8771 824 8773 824 8776 824 61 824 8801 824 8781 824 60 \
+    824 62 824 8804 824 8805 824 8818 824 8819 824 8822 824 8823 824 8826 \
+    824 8827 824 8834 824 8835 824 8838 824 8839 824 8866 824 8872 824 \
+    8873 824 8875 824 8828 824 8829 824 8849 824 8850 824 8882 824 8883 \
+    824 8884 824 8885 824 12296 12297 49 48 49 49 49 50 49 51 49 52 49 \
+    53 49 54 49 55 49 56 49 57 50 48 40 49 41 40 50 41 40 51 41 40 52 41 \
+    40 53 41 40 54 41 40 55 41 40 56 41 40 57 41 40 49 48 41 40 49 49 41 \
+    40 49 50 41 40 49 51 41 40 49 52 41 40 49 53 41 40 49 54 41 40 49 55 \
+    41 40 49 56 41 40 49 57 41 40 50 48 41 49 46 50 46 51 46 52 46 53 46 \
+    54 46 55 46 56 46 57 46 49 48 46 49 49 46 49 50 46 49 51 46 49 52 46 \
+    49 53 46 49 54 46 49 55 46 49 56 46 49 57 46 50 48 46 40 97 41 40 98 \
+    41 40 99 41 40 100 41 40 101 41 40 102 41 40 103 41 40 104 41 40 105 \
+    41 40 106 41 40 107 41 40 108 41 40 109 41 40 110 41 40 111 41 40 112 \
+    41 40 113 41 40 114 41 40 115 41 40 116 41 40 117 41 40 118 41 40 119 \
+    41 40 120 41 40 121 41 40 122 41 83 89 113 8747 8747 8747 8747 58 58 \
+    61 61 61 61 61 61 10973 824 11617 27597 40863 19968 20008 20022 20031 \
+    20057 20101 20108 20128 20154 20799 20837 20843 20866 20886 20907 20960 \
+    20981 20992 21147 21241 21269 21274 21304 21313 21340 21353 21378 21430 \
+    21448 21475 22231 22303 22763 22786 22794 22805 22823 22899 23376 23424 \
+    23544 23567 23586 23608 23662 23665 24027 24037 24049 24062 24178 24186 \
+    24191 24308 24318 24331 24339 24400 24417 24435 24515 25096 25142 25163 \
+    25903 25908 25991 26007 26020 26041 26080 26085 26352 26376 26408 27424 \
+    27490 27513 27571 27595 27604 27611 27663 27668 27700 28779 29226 29238 \
+    29243 29247 29255 29273 29275 29356 29572 29577 29916 29926 29976 29983 \
+    29992 30000 30091 30098 30326 30333 30382 30399 30446 30683 30690 30707 \
+    31034 31160 31166 31348 31435 31481 31859 31992 32566 32593 32650 32701 \
+    32769 32780 32786 32819 32895 32905 33251 33258 33267 33276 33292 33307 \
+    33311 33390 33394 33400 34381 34411 34880 34892 34915 35198 35211 35282 \
+    35328 35895 35910 35925 35960 35997 36196 36208 36275 36523 36554 36763 \
+    36784 36789 37009 37193 37318 37324 37329 38263 38272 38428 38582 38585 \
+    38632 38737 38750 38754 38761 38859 38893 38899 38913 39080 39131 39135 \
+    39318 39321 39340 39592 39640 39647 39717 39727 39730 39740 39770 40165 \
+    40565 40575 40613 40635 40643 40653 40657 40697 40701 40718 40723 40736 \
+    40763 40778 40786 40845 40860 40864 12306 21316 21317 12363 12441 12365 \
+    12441 12367 12441 12369 12441 12371 12441 12373 12441 12375 12441 12377 \
+    12441 12379 12441 12381 12441 12383 12441 12385 12441 12388 12441 12390 \
+    12441 12392 12441 12399 12441 12399 12442 12402 12441 12402 12442 12405 \
+    12441 12405 12442 12408 12441 12408 12442 12411 12441 12411 12442 12358 \
+    12441 32 12441 32 12442 12445 12441 12424 12426 12459 12441 12461 12441 \
+    12463 12441 12465 12441 12467 12441 12469 12441 12471 12441 12473 12441 \
+    12475 12441 12477 12441 12479 12441 12481 12441 12484 12441 12486 12441 \
+    12488 12441 12495 12441 12495 12442 12498 12441 12498 12442 12501 12441 \
+    12501 12442 12504 12441 12504 12442 12507 12441 12507 12442 12454 12441 \
+    12527 12441 12528 12441 12529 12441 12530 12441 12541 12441 12467 12488 \
+    4352 4353 4522 4354 4524 4525 4355 4356 4357 4528 4529 4530 4531 4532 \
+    4533 4378 4358 4359 4360 4385 4361 4362 4363 4364 4365 4366 4367 4368 \
+    4369 4370 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 \
+    4461 4462 4463 4464 4465 4466 4467 4468 4469 4448 4372 4373 4551 4552 \
+    4556 4558 4563 4567 4569 4380 4573 4575 4381 4382 4384 4386 4387 4391 \
+    4393 4395 4396 4397 4398 4399 4402 4406 4416 4423 4428 4593 4594 4439 \
+    4440 4441 4484 4485 4488 4497 4498 4500 4510 4513 19977 22235 19978 \
+    20013 19979 30002 19993 19969 22825 22320 40 4352 41 40 4354 41 40 \
+    4355 41 40 4357 41 40 4358 41 40 4359 41 40 4361 41 40 4363 41 40 4364 \
+    41 40 4366 41 40 4367 41 40 4368 41 40 4369 41 40 4370 41 40 4352 4449 \
+    41 40 4354 4449 41 40 4355 4449 41 40 4357 4449 41 40 4358 4449 41 \
+    40 4359 4449 41 40 4361 4449 41 40 4363 4449 41 40 4364 4449 41 40 \
+    4366 4449 41 40 4367 4449 41 40 4368 4449 41 40 4369 4449 41 40 4370 \
+    4449 41 40 4364 4462 41 40 4363 4457 4364 4453 4523 41 40 4363 4457 \
+    4370 4462 41 40 19968 41 40 20108 41 40 19977 41 40 22235 41 40 20116 \
+    41 40 20845 41 40 19971 41 40 20843 41 40 20061 41 40 21313 41 40 26376 \
+    41 40 28779 41 40 27700 41 40 26408 41 40 37329 41 40 22303 41 40 26085 \
+    41 40 26666 41 40 26377 41 40 31038 41 40 21517 41 40 29305 41 40 36001 \
+    41 40 31069 41 40 21172 41 40 20195 41 40 21628 41 40 23398 41 40 30435 \
+    41 40 20225 41 40 36039 41 40 21332 41 40 31085 41 40 20241 41 40 33258 \
+    41 40 33267 41 80 84 69 50 49 50 50 50 51 50 52 50 53 50 54 50 55 50 \
+    56 50 57 51 48 51 49 51 50 51 51 51 52 51 53 4352 4449 4354 4449 4355 \
+    4449 4357 4449 4358 4449 4359 4449 4361 4449 4363 4449 4364 4449 4366 \
+    4449 4367 4449 4368 4449 4369 4449 4370 4449 4366 4449 4535 4352 4457 \
+    4364 4462 4363 4468 4363 4462 20116 20845 19971 20061 26666 26377 31038 \
+    21517 29305 36001 31069 21172 31192 30007 36969 20778 21360 27880 38917 \
+    20241 20889 27491 24038 21491 21307 23447 23398 30435 20225 36039 21332 \
+    22812 51 54 51 55 51 56 51 57 52 48 52 49 52 50 52 51 52 52 52 53 52 \
+    54 52 55 52 56 52 57 53 48 49 26376 50 26376 51 26376 52 26376 53 26376 \
+    54 26376 55 26376 56 26376 57 26376 49 48 26376 49 49 26376 49 50 26376 \
+    72 103 101 114 103 101 86 76 84 68 12450 12452 12454 12456 12458 12459 \
+    12461 12463 12465 12467 12469 12471 12473 12475 12477 12479 12481 12484 \
+    12486 12488 12490 12491 12492 12493 12494 12495 12498 12501 12504 12507 \
+    12510 12511 12512 12513 12514 12516 12518 12520 12521 12522 12523 12524 \
+    12525 12527 12528 12529 12530 12450 12497 12540 12488 12450 12523 12501 \
+    12449 12450 12531 12506 12450 12450 12540 12523 12452 12491 12531 12464 \
+    12452 12531 12481 12454 12457 12531 12456 12473 12463 12540 12489 12456 \
+    12540 12459 12540 12458 12531 12473 12458 12540 12512 12459 12452 12522 \
+    12459 12521 12483 12488 12459 12525 12522 12540 12460 12525 12531 12460 \
+    12531 12510 12462 12460 12462 12491 12540 12461 12517 12522 12540 12462 \
+    12523 12480 12540 12461 12525 12461 12525 12464 12521 12512 12461 12525 \
+    12513 12540 12488 12523 12461 12525 12527 12483 12488 12464 12521 12512 \
+    12464 12521 12512 12488 12531 12463 12523 12476 12452 12525 12463 12525 \
+    12540 12493 12465 12540 12473 12467 12523 12490 12467 12540 12509 12469 \
+    12452 12463 12523 12469 12531 12481 12540 12512 12471 12522 12531 12464 \
+    12475 12531 12481 12475 12531 12488 12480 12540 12473 12487 12471 12489 \
+    12523 12488 12531 12490 12494 12494 12483 12488 12495 12452 12484 12497 \
+    12540 12475 12531 12488 12497 12540 12484 12496 12540 12524 12523 12500 \
+    12450 12473 12488 12523 12500 12463 12523 12500 12467 12499 12523 12501 \
+    12449 12521 12483 12489 12501 12451 12540 12488 12502 12483 12471 12455 \
+    12523 12501 12521 12531 12504 12463 12479 12540 12523 12506 12477 12506 \
+    12491 12498 12504 12523 12484 12506 12531 12473 12506 12540 12472 12505 \
+    12540 12479 12509 12452 12531 12488 12508 12523 12488 12507 12531 12509 \
+    12531 12489 12507 12540 12523 12507 12540 12531 12510 12452 12463 12525 \
+    12510 12452 12523 12510 12483 12495 12510 12523 12463 12510 12531 12471 \
+    12519 12531 12511 12463 12525 12531 12511 12522 12511 12522 12496 12540 \
+    12523 12513 12460 12513 12460 12488 12531 12513 12540 12488 12523 12516 \
+    12540 12489 12516 12540 12523 12518 12450 12531 12522 12483 12488 12523 \
+    12522 12521 12523 12500 12540 12523 12540 12502 12523 12524 12512 12524 \
+    12531 12488 12466 12531 12527 12483 12488 48 28857 49 28857 50 28857 \
+    51 28857 52 28857 53 28857 54 28857 55 28857 56 28857 57 28857 49 48 \
+    28857 49 49 28857 49 50 28857 49 51 28857 49 52 28857 49 53 28857 49 \
+    54 28857 49 55 28857 49 56 28857 49 57 28857 50 48 28857 50 49 28857 \
+    50 50 28857 50 51 28857 50 52 28857 104 80 97 100 97 65 85 98 97 114 \
+    111 86 112 99 100 109 100 109 178 100 109 179 73 85 24179 25104 26157 \
+    21644 22823 27491 26126 27835 26666 24335 20250 31038 112 65 110 65 \
+    956 65 109 65 107 65 75 66 77 66 71 66 99 97 108 107 99 97 108 112 \
+    70 110 70 956 70 956 103 109 103 107 103 72 122 107 72 122 77 72 122 \
+    71 72 122 84 72 122 956 8467 109 8467 100 8467 107 8467 102 109 110 \
+    109 956 109 109 109 99 109 107 109 109 109 178 99 109 178 109 178 107 \
+    109 178 109 109 179 99 109 179 109 179 107 109 179 109 8725 115 109 \
+    8725 115 178 80 97 107 80 97 77 80 97 71 80 97 114 97 100 114 97 100 \
+    8725 115 114 97 100 8725 115 178 112 115 110 115 956 115 109 115 112 \
+    86 110 86 956 86 109 86 107 86 77 86 112 87 110 87 956 87 109 87 107 \
+    87 77 87 107 937 77 937 97 46 109 46 66 113 99 99 99 100 67 8725 107 \
+    103 67 111 46 100 66 71 121 104 97 72 80 105 110 75 75 75 77 107 116 \
+    108 109 108 110 108 111 103 108 120 109 98 109 105 108 109 111 108 \
+    80 72 112 46 109 46 80 80 77 80 82 115 114 83 118 87 98 86 8725 109 \
+    65 8725 109 49 26085 50 26085 51 26085 52 26085 53 26085 54 26085 55 \
+    26085 56 26085 57 26085 49 48 26085 49 49 26085 49 50 26085 49 51 26085 \
+    49 52 26085 49 53 26085 49 54 26085 49 55 26085 49 56 26085 49 57 26085 \
+    50 48 26085 50 49 26085 50 50 26085 50 51 26085 50 52 26085 50 53 26085 \
+    50 54 26085 50 55 26085 50 56 26085 50 57 26085 51 48 26085 51 49 26085 \
+    103 97 108 35912 26356 36040 28369 20018 21477 22865 21895 22856 25078 \
+    30313 32645 34367 34746 35064 37007 27138 27931 28889 29662 33853 37226 \
+    39409 20098 21365 27396 29211 34349 40478 23888 28651 34253 35172 25289 \
+    33240 34847 24266 26391 28010 29436 37070 20358 20919 21214 25796 27347 \
+    29200 30439 34310 34396 36335 38706 39791 40442 30860 31103 32160 33737 \
+    37636 35542 22751 24324 31840 32894 29282 30922 36034 38647 22744 23650 \
+    27155 28122 28431 32047 32311 38475 21202 32907 20956 20940 31260 32190 \
+    33777 38517 35712 25295 35582 20025 23527 24594 29575 30064 21271 30971 \
+    20415 24489 19981 27852 25976 32034 21443 22622 30465 33865 35498 27578 \
+    27784 25342 33509 25504 30053 20142 20841 20937 26753 31975 33391 35538 \
+    37327 21237 21570 24300 26053 28670 31018 38317 39530 40599 40654 26310 \
+    27511 36706 24180 24976 25088 25754 28451 29001 29833 31178 32244 32879 \
+    36646 34030 36899 37706 21015 21155 21693 28872 35010 24265 24565 25467 \
+    27566 31806 29557 20196 22265 23994 24604 29618 29801 32666 32838 37428 \
+    38646 38728 38936 20363 31150 37300 38584 24801 20102 20698 23534 23615 \
+    26009 29134 30274 34044 36988 26248 38446 21129 26491 26611 27969 28316 \
+    29705 30041 30827 32016 39006 25134 38520 20523 23833 28138 36650 24459 \
+    24900 26647 38534 21033 21519 23653 26131 26446 26792 27877 29702 30178 \
+    32633 35023 35041 38626 21311 28346 21533 29136 29848 34298 38563 40023 \
+    40607 26519 28107 33256 31520 31890 29376 28825 35672 20160 33590 21050 \
+    20999 24230 25299 31958 23429 27934 26292 36667 38477 24275 20800 21952 \
+    22618 26228 20958 29482 30410 31036 31070 31077 31119 38742 31934 34322 \
+    35576 36920 37117 39151 39164 39208 40372 20398 20711 20813 21193 21220 \
+    21329 21917 22022 22120 22592 22696 23652 24724 24936 24974 25074 25935 \
+    26082 26257 26757 28023 28186 28450 29038 29227 29730 30865 31049 31048 \
+    31056 31062 31117 31118 31296 31361 31680 32265 32321 32626 32773 33261 \
+    33401 33879 35088 35222 35585 35641 36051 36104 36790 38627 38911 38971 \
+    20006 20917 20840 20352 20805 20864 21191 21242 21845 21913 21986 22707 \
+    22852 22868 23138 23336 24274 24281 24425 24493 24792 24910 24840 24928 \
+    25140 25540 25628 25682 25942 26395 26454 28379 28363 28702 30631 29237 \
+    29359 29809 29958 30011 30237 30239 30427 30452 30538 30528 30924 31409 \
+    31867 32091 32574 33618 33775 34681 35137 35206 35519 35531 35565 35722 \
+    36664 36978 37273 37494 38524 38875 38923 39698 141386 141380 144341 \
+    15261 16408 16441 152137 154832 163539 40771 40846 102 102 102 105 \
+    102 108 102 102 105 102 102 108 383 116 115 116 1396 1398 1396 1381 \
+    1396 1387 1406 1398 1396 1389 1497 1460 1522 1463 1506 1492 1499 1500 \
+    1501 1512 1514 1513 1473 1513 1474 64329 1473 64329 1474 1488 1463 \
+    1488 1464 1488 1468 1489 1468 1490 1468 1491 1468 1492 1468 1493 1468 \
+    1494 1468 1496 1468 1497 1468 1498 1468 1499 1468 1500 1468 1502 1468 \
+    1504 1468 1505 1468 1507 1468 1508 1468 1510 1468 1511 1468 1512 1468 \
+    1513 1468 1514 1468 1493 1465 1489 1471 1499 1471 1508 1471 1488 1500 \
+    1649 1659 1662 1664 1658 1663 1657 1700 1702 1668 1667 1670 1671 1677 \
+    1676 1678 1672 1688 1681 1705 1711 1715 1713 1722 1723 1728 1729 1726 \
+    1746 1747 1709 1735 1734 1736 1655 1739 1733 1737 1744 1609 1574 1575 \
+    1574 1749 1574 1608 1574 1735 1574 1734 1574 1736 1574 1744 1574 1609 \
+    1740 1574 1580 1574 1581 1574 1605 1574 1610 1576 1580 1576 1581 1576 \
+    1582 1576 1605 1576 1609 1576 1610 1578 1580 1578 1581 1578 1582 1578 \
+    1605 1578 1609 1578 1610 1579 1580 1579 1605 1579 1609 1579 1610 1580 \
+    1581 1580 1605 1581 1580 1581 1605 1582 1580 1582 1581 1582 1605 1587 \
+    1580 1587 1581 1587 1582 1587 1605 1589 1581 1589 1605 1590 1580 1590 \
+    1581 1590 1582 1590 1605 1591 1581 1591 1605 1592 1605 1593 1580 1593 \
+    1605 1594 1580 1594 1605 1601 1580 1601 1581 1601 1582 1601 1605 1601 \
+    1609 1601 1610 1602 1581 1602 1605 1602 1609 1602 1610 1603 1575 1603 \
+    1580 1603 1581 1603 1582 1603 1604 1603 1605 1603 1609 1603 1610 1604 \
+    1580 1604 1581 1604 1582 1604 1605 1604 1609 1604 1610 1605 1580 1605 \
+    1581 1605 1582 1605 1605 1605 1609 1605 1610 1606 1580 1606 1581 1606 \
+    1582 1606 1605 1606 1609 1606 1610 1607 1580 1607 1605 1607 1609 1607 \
+    1610 1610 1580 1610 1581 1610 1582 1610 1605 1610 1609 1610 1610 1584 \
+    1648 1585 1648 1609 1648 32 1612 1617 32 1613 1617 32 1614 1617 32 \
+    1615 1617 32 1616 1617 32 1617 1648 1574 1585 1574 1586 1574 1606 1576 \
+    1585 1576 1586 1576 1606 1578 1585 1578 1586 1578 1606 1579 1585 1579 \
+    1586 1579 1606 1605 1575 1606 1585 1606 1586 1606 1606 1610 1585 1610 \
+    1586 1610 1606 1574 1582 1574 1607 1576 1607 1578 1607 1589 1582 1604 \
+    1607 1606 1607 1607 1648 1610 1607 1579 1607 1587 1607 1588 1605 1588 \
+    1607 1600 1614 1617 1600 1615 1617 1600 1616 1617 1591 1609 1591 1610 \
+    1593 1609 1593 1610 1594 1609 1594 1610 1587 1609 1587 1610 1588 1609 \
+    1588 1610 1581 1609 1581 1610 1580 1609 1580 1610 1582 1609 1582 1610 \
+    1589 1609 1589 1610 1590 1609 1590 1610 1588 1580 1588 1581 1588 1582 \
+    1588 1585 1587 1585 1589 1585 1590 1585 1575 1611 1578 1580 1605 1578 \
+    1581 1580 1578 1581 1605 1578 1582 1605 1578 1605 1580 1578 1605 1581 \
+    1578 1605 1582 1580 1605 1581 1581 1605 1610 1581 1605 1609 1587 1581 \
+    1580 1587 1580 1581 1587 1580 1609 1587 1605 1581 1587 1605 1580 1587 \
+    1605 1605 1589 1581 1581 1589 1605 1605 1588 1581 1605 1588 1580 1610 \
+    1588 1605 1582 1588 1605 1605 1590 1581 1609 1590 1582 1605 1591 1605 \
+    1581 1591 1605 1605 1591 1605 1610 1593 1580 1605 1593 1605 1605 1593 \
+    1605 1609 1594 1605 1605 1594 1605 1610 1594 1605 1609 1601 1582 1605 \
+    1602 1605 1581 1602 1605 1605 1604 1581 1605 1604 1581 1610 1604 1581 \
+    1609 1604 1580 1580 1604 1582 1605 1604 1605 1581 1605 1581 1580 1605 \
+    1581 1605 1605 1581 1610 1605 1580 1581 1605 1580 1605 1605 1582 1580 \
+    1605 1582 1605 1605 1580 1582 1607 1605 1580 1607 1605 1605 1606 1581 \
+    1605 1606 1581 1609 1606 1580 1605 1606 1580 1609 1606 1605 1610 1606 \
+    1605 1609 1610 1605 1605 1576 1582 1610 1578 1580 1610 1578 1580 1609 \
+    1578 1582 1610 1578 1582 1609 1578 1605 1610 1578 1605 1609 1580 1605 \
+    1610 1580 1581 1609 1580 1605 1609 1587 1582 1609 1589 1581 1610 1588 \
+    1581 1610 1590 1581 1610 1604 1580 1610 1604 1605 1610 1610 1581 1610 \
+    1610 1580 1610 1610 1605 1610 1605 1605 1610 1602 1605 1610 1606 1581 \
+    1610 1593 1605 1610 1603 1605 1610 1606 1580 1581 1605 1582 1610 1604 \
+    1580 1605 1603 1605 1605 1580 1581 1610 1581 1580 1610 1605 1580 1610 \
+    1601 1605 1610 1576 1581 1610 1587 1582 1610 1606 1580 1610 1589 1604 \
+    1746 1602 1604 1746 1575 1604 1604 1607 1575 1603 1576 1585 1605 1581 \
+    1605 1583 1589 1604 1593 1605 1585 1587 1608 1604 1593 1604 1610 1607 \
+    1608 1587 1604 1605 1589 1604 1609 1589 1604 1609 32 1575 1604 1604 \
+    1607 32 1593 1604 1610 1607 32 1608 1587 1604 1605 1580 1604 32 1580 \
+    1604 1575 1604 1607 1585 1740 1575 1604 44 12289 12290 58 33 63 12310 \
+    12311 8230 8229 8212 8211 95 123 125 12308 12309 12304 12305 12298 \
+    12299 12300 12301 12302 12303 91 93 8254 35 38 42 45 60 62 92 36 37 \
+    64 32 1611 1600 1611 32 1612 32 1613 32 1614 1600 1614 32 1615 1600 \
+    1615 32 1616 1600 1616 32 1617 1600 1617 32 1618 1600 1618 1569 1570 \
+    1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 \
+    1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1601 1602 1603 1604 \
+    1605 1606 1607 1608 1610 1604 1570 1604 1571 1604 1573 1604 1575 34 \
+    39 47 94 124 126 10629 10630 12539 12449 12451 12453 12455 12457 12515 \
+    12517 12519 12483 12540 12531 12441 12442 12644 12593 12594 12595 12596 \
+    12597 12598 12599 12600 12601 12602 12603 12604 12605 12606 12607 12608 \
+    12609 12610 12611 12612 12613 12614 12615 12616 12617 12618 12619 12620 \
+    12621 12622 12623 12624 12625 12626 12627 12628 12629 12630 12631 12632 \
+    12633 12634 12635 12636 12637 12638 12639 12640 12641 12642 12643 162 \
+    163 172 175 166 165 8361 9474 8592 8593 8594 8595 9632 9675 119127 \
+    119141 119128 119141 119135 119150 119135 119151 119135 119152 119135 \
+    119153 119135 119154 119225 119141 119226 119141 119227 119150 119228 \
+    119150 119227 119151 119228 119151 305 567 913 914 916 917 918 919 \
+    921 922 923 924 925 926 927 929 1012 932 934 935 936 8711 945 950 951 \
+    955 957 958 959 963 964 965 968 969 8706 1013 977 1008 981 1009 982 \
+    988 989 20029 20024 20033 131362 20320 20411 20482 20602 20633 20687 \
+    13470 132666 20820 20836 20855 132380 13497 20839 20877 132427 20887 \
+    20900 20172 20908 168415 20995 13535 21051 21062 21106 21111 13589 \
+    21253 21254 21321 21338 21363 21373 21375 133676 28784 21450 21471 \
+    133987 21483 21489 21510 21662 21560 21576 21608 21666 21750 21776 \
+    21843 21859 21892 21931 21939 21954 22294 22295 22097 22132 22766 22478 \
+    22516 22541 22411 22578 22577 22700 136420 22770 22775 22790 22810 \
+    22818 22882 136872 136938 23020 23067 23079 23000 23142 14062 14076 \
+    23304 23358 137672 23491 23512 23539 138008 23551 23558 24403 14209 \
+    23648 23744 23693 138724 23875 138726 23918 23915 23932 24033 24034 \
+    14383 24061 24104 24125 24169 14434 139651 14460 24240 24243 24246 \
+    172946 140081 33281 24354 14535 144056 156122 24418 24427 14563 24474 \
+    24525 24535 24569 24705 14650 14620 141012 24775 24904 24908 24954 \
+    25010 24996 25007 25054 25104 25115 25181 25265 25300 25424 142092 \
+    25405 25340 25448 25475 25572 142321 25634 25541 25513 14894 25705 \
+    25726 25757 25719 14956 25964 143370 26083 26360 26185 15129 15112 \
+    15076 20882 20885 26368 26268 32941 17369 26401 26462 26451 144323 \
+    15177 26618 26501 26706 144493 26766 26655 26900 26946 27043 27114 \
+    27304 145059 27355 15384 27425 145575 27476 15438 27506 27551 27579 \
+    146061 138507 146170 27726 146620 27839 27853 27751 27926 27966 28009 \
+    28024 28037 146718 27956 28207 28270 15667 28359 147153 28153 28526 \
+    147294 147342 28614 28729 28699 15766 28746 28797 28791 28845 132389 \
+    28997 148067 29084 148395 29224 29264 149000 29312 29333 149301 149524 \
+    29562 29579 16044 29605 16056 29767 29788 29829 29898 16155 29988 150582 \
+    30014 150674 139679 30224 151457 151480 151620 16380 16392 151795 151794 \
+    151833 151859 30494 30495 30603 16454 16534 152605 30798 16611 153126 \
+    153242 153285 31211 16687 31306 31311 153980 154279 31470 16898 154539 \
+    31686 31689 16935 154752 31954 17056 31976 31971 32000 155526 32099 \
+    17153 32199 32258 32325 17204 156200 156231 17241 156377 32634 156478 \
+    32661 32762 156890 156963 32864 157096 32880 144223 17365 32946 33027 \
+    17419 33086 23221 157607 157621 144275 144284 33284 36766 17515 33425 \
+    33419 33437 21171 33457 33459 33469 33510 158524 33565 33635 33709 \
+    33571 33725 33767 33619 33738 33740 33756 158774 159083 158933 17707 \
+    34033 34035 34070 160714 34148 159532 17757 17761 159665 159954 17771 \
+    34384 34407 34409 34473 34440 34574 34530 34600 34667 34694 17879 34785 \
+    34817 17913 34912 161383 35031 35038 17973 35066 13499 161966 162150 \
+    18110 18119 35488 162984 36011 36033 36123 36215 163631 133124 36299 \
+    36284 36336 133342 36564 165330 165357 37012 37105 37137 165678 37147 \
+    37432 37591 37592 37500 37881 37909 166906 38283 18837 38327 167287 \
+    18918 38595 23986 38691 168261 168474 19054 19062 38880 168970 19122 \
+    169110 38953 169398 39138 19251 39209 39335 39362 39422 19406 170800 \
+    40000 40189 19662 19693 40295 172238 19704 172293 172558 172689 19798 \
+    40702 40709 40719 40726 173568]
+
+set DECOMP_COMPAT_MASK 65536
+set DECOMP_INFO_BITS 17
+
+#
+# This macro extracts the information about a character from the
+# Unicode character tables.
+#
+
+proc GetUniCharDecompCompatInfo {uc} {
+    variable DECOMP_OFFSET_BITS
+    variable DECOMP_COMMON_PAGE_MAP
+    variable decompPageMap
+    variable decompGroupMap
+
+    set page [expr {($uc & 0x1fffff) >> $DECOMP_OFFSET_BITS}]
+    if {[info exists decompPageMap($page)]} {
+	set apage $decompPageMap($page)
+    } else {
+	set apage $DECOMP_COMMON_PAGE_MAP
+    }
+
+    lindex $decompGroupMap \
+	   [expr {($apage << $DECOMP_OFFSET_BITS) | \
+		   ($uc & ((1 << $DECOMP_OFFSET_BITS) - 1))}]
+}
+
+proc GetUniCharDecompInfo {uc} {
+    variable DECOMP_COMPAT_MASK
+
+    set info [GetUniCharDecompCompatInfo $uc]
+    if {$info & $DECOMP_COMPAT_MASK} {
+	return -1
+    } else {
+	return $info
+    }
+}
+
+proc GetDecompList {info} {
+    variable DECOMP_INFO_BITS
+    variable decompList
+
+    set decomp_len [expr {$info >> $DECOMP_INFO_BITS}]
+    set decomp_shift [expr {$info & ((1 << ($DECOMP_INFO_BITS - 1)) - 1)}]
+
+    lrange $decompList $decomp_shift [expr {$decomp_shift + $decomp_len - 1}]
+}
+
+set COMP_OFFSET_BITS 1
+
+#
+# The pageMap is indexed by page number and returns an alternate page number
+# that identifies a unique page of characters.  Many Unicode characters map
+# to the same alternate page number.
+#
+
+array unset compPageMap
+array set compPageMap [list \
+    30 1 31 2 32 3 33 4 34 5 35 6 36 7 37 8 38 9 39 10 40 11 41 12 42 13 \
+    43 14 44 15 45 16 48 17 49 18 50 19 51 20 52 21 53 22 54 23 55 24 56 25 \
+    57 26 58 27 59 28 60 29 61 30 84 31 97 32 98 33 99 34 101 35 103 36 \
+    106 37 107 38 108 39 110 40 113 41 114 42 115 43 117 44 119 45 122 46 \
+    123 47 124 48 126 49 129 50 137 51 166 52 173 53 176 54 180 55 181 56 \
+    191 57 208 58 215 59 216 60 219 61 245 62 275 63 276 64 279 65 329 66 \
+    384 67 385 68 386 69 387 70 388 71 389 72 390 73 391 74 392 75 393 76 \
+    394 77 397 78 401 79 402 80 403 81 404 82 406 83 407 84 408 85 417 86 \
+    418 87 456 88 458 89 459 90 460 91 463 92 464 93 466 94 468 95 470 96 \
+    471 97 472 98 474 99 475 100 476 101 479 102 480 103 482 104 484 105 \
+    485 106 487 107 489 108 515 109 520 110 521 111 522 112 523 113 524 114 \
+    525 115 527 116 529 117 531 118 533 119 534 120 536 121 537 122 538 123 \
+    539 124 540 125 541 126 543 127 545 128 547 129 549 130 550 131 555 132 \
+    570 133 620 134 628 135 787 136 804 137 805 138 809 139 810 140 864 141 \
+    873 142 874 143 1172 144 1176 145 1177 146 1247 147 1259 148 1439 149 \
+    1451 150 1481 151 1503 152 1507 153 1515 154 1571 155 1631 156 1633 157 \
+    1635 158 1637 159 1642 160 1643 161 1695 162 1699 163 1707 164 1765 165 \
+    1767 166 1772 167 1774 168 1775 169 2066 170 3458 171 3459 172 3460 173 \
+    3461 174 3462 175 3464 176 3485 177 3486 178 3487 179 3489 180 3867 181 \
+    3885 182 3889 183 3920 184 3932 185 3942 186 3968 187 3969 188 3970 189 \
+    3971 190 3972 191 3973 192 3974 193 3975 194 3976 195 3980 196 3984 197 \
+    3985 198 3986 199 3987 200 3988 201 3989 202 3990 203 3991 204 3992 205 \
+    3996 206 4000 207 4004 208 4008 209 4012 210 4016 211 4017 212 4018 213 \
+    4019 214 4020 215 4021 216 4022 217 4023 218 4024 219 4026 220 4030 221 \
+    4059 222 4063 223 4067 224 4091 225 4095 226 4296 227 4297 228 4298 229 \
+    4328 230 4329 231 4330 232 4353 233 4356 234 4357 235 4369 236 4370 237 \
+    4382 238 4385 239 4386 240 4388 241 4390 242 4400 243 4402 244 4409 245 \
+    4411 246 4413 247 4414 248 4417 249 4419 250 4424 251 4425 252 4433 253 \
+    4436 254 4437 255 4441 256 4442 257 6179 258 6181 259 6182 260 6183 261 \
+    6184 262 6185 263 6186 264 6187 265 6188 266 6189 267 6190 268 6191 269 \
+    6192 270 6194 271 6195 272 6196 273 6199 274 6201 275 6202 276 6204 277 \
+    6205 278 6220 279 6221 280 6222 281 6227 282 6229 283 6230 284 6231 285 \
+    6232 286 6233 287 6234 288 6235 289 6236 290 6237 291 6238 292 6239 293 \
+    6240 294 6242 295 6243 296 6244 297 6247 298 6249 299 6250 300 6252 301 \
+    6253 302 6263 303 6264 304 6265 305 6270 306]
+
+set COMP_COMMON_PAGE_MAP 0
+
+#
+# The groupMap is indexed by combining the alternate page number with
+# the page offset and returns a group number that identifies a unique
+# set of character attributes.
+#
+
+set compGroupMap [list \
+    -1 -1 65568 65648 65749 -1 -1 30 91 141 65 121 65712 38 94 1 65611 \
+    124 44 100 12 76 77 -1 48 105 17 84 136 54 113 23 24 -1 -1 140 64 120 \
+    71 123 65577 99 10 75 129 47 104 16 15 83 135 -1 110 22 86 137 59 117 \
+    118 28 89 -1 102 -1 6 -1 65724 65579 101 65551 42 -1 -1 65580 130 50 \
+    65686 -1 65636 -1 115 -1 32 -1 65753 65607 67 65715 5 -1 -1 65550 107 \
+    20 65634 -1 65591 -1 87 -1 142 66 106 18 37 93 65632 65733 65640 65741 \
+    65604 65709 65571 65657 -1 65739 81 131 -1 119 33 -1 -1 65546 65597 \
+    65705 65683 65555 65633 65735 65742 65594 65740 -1 131073 131074 131075 \
+    131077 131079 -1 131080 131082 131083 131084 131098 131102 131085 -1 \
+    -1 131086 -1 131087 -1 131076 131078 -1 -1 131103 -1 131088 131104 \
+    131101 131097 131092 131089 -1 -1 131094 131093 -1 131091 131095 131090 \
+    -1 -1 131072 -1 34 -1 122 -1 96 -1 8 -1 80 -1 65590 -1 85 -1 26 65538 \
+    -1 65718 -1 -1 2 -1 95 -1 7 -1 125 -1 51 -1 111 -1 56 -1 0 138 62 65672 \
+    -1 39 -1 65747 -1 97 -1 -1 65725 -1 103 14 65630 132 -1 65585 -1 65738 \
+    -1 -1 139 -1 65570 -1 65717 -1 65671 72 -1 -1 65678 -1 79 133 65586 \
+    52 -1 65558 -1 65696 -1 -1 63 -1 65755 -1 65667 -1 65601 65666 -1 65669 \
+    65545 65659 65542 65691 65563 -1 143 65744 -1 65665 -1 -1 196618 131108 \
+    196619 -1 65626 65619 -1 -1 65618 65745 -1 65664 -1 -1 65663 196611 \
+    -1 -1 196612 196613 -1 196614 196615 65581 -1 131105 -1 98 65588 -1 \
+    131106 65582 -1 -1 65727 196616 -1 127 -1 65638 -1 -1 131107 196617 \
+    -1 131096 -1 19 65704 -1 196610 131081 -1 -1 196608 -1 3 65539 -1 -1 \
+    196609 -1 65624 -1 65710 -1 65562 -1 65708 -1 65559 -1 65621 -1 65556 \
+    65547 -1 65602 -1 65687 65600 65599 -1 65688 65560 65694 65565 65754 \
+    65608 114 25 65681 65554 65540 65612 82 134 65595 65701 65702 65569 \
+    65649 65750 58 116 65573 65661 65544 65616 65617 65721 36 92 9 73 53 \
+    108 65699 65567 65647 65748 65605 65711 27 88 65541 65613 65614 65720 \
+    65576 65675 11 69 126 45 13 78 55 112 29 90 -1 70 128 46 65692 65564 \
+    65643 65743 65596 65703 109 21 65650 65751 65606 65713 65572 65660 \
+    65543 -1 65578 -1 65553 -1 65537 -1 -1 40 65689 -1 65574 -1 4 -1 65716 \
+    -1 65668 -1 65622 -1 65707 -1 65652 -1 65752 -1 -1 65722 65627 -1 -1 \
+    65684 -1 65676 -1 65549 65656 -1 -1 65548 -1 65726 65552 -1 -1 65690 \
+    -1 65603 65655 65536 65732 65587 65561 65639 65697 65566 65645 65746 \
+    65654 65756 65575 65670 -1 65584 65583 -1 65609 -1 65620 65723 -1 65677 \
+    65557 65637 65736 65592 65729 -1 -1 65719 -1 65714 -1 65706 -1 65695 \
+    -1 65693 -1 65685 -1 65679 -1 65673 -1 65658 -1 65653 -1 65646 -1 65641 \
+    65631 -1 65628 -1 65623 -1 -1 60 74 -1 -1 68 61 -1 -1 57 -1 131099 \
+    131100 -1 -1 65728 65700 -1 -1 65682 -1 65680 -1 65674 -1 65662 -1 \
+    65651 -1 65644 -1 65642 -1 65635 -1 65629 -1 65625 -1 65615 -1 65610 \
+    65598 -1 65593 -1 65589 -1 -1 41 31 -1 -1 49 43 -1 -1 35 -1 65737 65734 \
+    65731 65730 -1 -1 65698]
+
+#
+# Lists of compositions for characters that appears only in one composition
+#
+
+set compFirstList [list \
+    {824 8817} {837 8119} {837 8116} {3530 3549} {770 7896} {837 8090} \
+    {776 1243} {837 8114} {837 8076} {783 1143} {780 494} {6965 6971} \
+    {824 8772} {824 8742} {769 7727} {769 7688} {824 8777} {837 8178} \
+    {770 7879} {772 481} {6965 6930} {824 8938} {769 1116} {6965 6924} \
+    {772 7737} {824 8824} {6965 6920} {776 1259} {837 8099} {772 7773} \
+    {824 8833} {837 8083} {824 8814} {837 8069} {776 1268} {776 7802} \
+    {837 8110} {837 8074} {837 8183} {824 8840} {837 8094} {775 7711} \
+    {837 8130} {769 506} {769 7726} {3031 2964} {3158 3144} {824 8931} \
+    {824 8930} {769 1036} {776 1247} {824 8821} {3006 3019} {12441 12489} \
+    {788 8172} {769 511} {824 8941} {12441 12487} {772 561} {837 8066} \
+    {837 8102} {772 492} {12441 12485} {6965 6979} {6965 6977} \
+    {776 1261} {6965 6973} {824 8802} {769 7800} {837 8086} {837 8108} \
+    {769 507} {775 7785} {824 8876} {12441 12482} {770 308} {770 7897} \
+    {837 8091} {837 8092} {12441 12480} {837 8077} {837 8078} \
+    {1620 1728} {1620 1747} {824 8877} {6965 6926} {824 8622} \
+    {12441 12393} {4142 4134} {12441 12478} {1620 1730} {824 8713} \
+    {12441 12391} {12441 12476} {776 1246} {12441 12389} {775 7780} \
+    {774 7708} {772 555} {12441 12474} {769 510} {824 8939} {3285 3275} \
+    {824 8825} {775 7782} {12441 12386} {12441 12472} {837 8100} \
+    {12441 12470} {824 8928} {12441 12384} {837 8084} {824 8800} \
+    {837 8070} {837 8106} {12441 12468} {824 8655} {12441 12382} \
+    {824 8836} {824 8816} {824 8769} {776 7803} {12441 12380} \
+    {776 1242} {837 8111} {837 8075} {12441 12466} {2364 2356} \
+    {2364 2353} {1620 1574} {776 1111} {776 1273} {824 8603} \
+    {783 1142} {824 8841} {776 1260} {837 8180} {12441 12378} \
+    {12441 12464} {837 8095} {824 8740} {824 8879} {769 1107} \
+    {12441 12376} {12441 12462} {770 7878} {12441 12460} {772 480} \
+    {824 8716} {12441 12374} {772 554} {6965 6976} {772 7736} \
+    {837 8135} {824 8813} {776 1258} {837 8098} {12441 12372} \
+    {772 7772} {12441 12370} {776 1255} {824 8832} {12441 12542} \
+    {837 8082} {12441 12532} {837 8067} {837 8068} {837 8103} \
+    {3390 3403} {772 493} {12441 12368} {824 8653} {6965 6922} \
+    {769 7801} {6965 6918} {837 8087} {775 7710} {837 8109} {12441 12366} \
+    {769 7689} {824 8602} {776 1272} {837 8132} {12441 12364} \
+    {837 8093} {837 8079} {824 8708} {824 8878} {772 478} {769 1027} \
+    {824 8775} {3285 3264} {12441 12446} {12441 12436} {12441 12538} \
+    {12441 12537} {824 8820} {775 7781} {12441 12536} {774 7709} \
+    {824 8940} {12441 12535} {776 1254} {775 7835} {780 495} \
+    {775 7783} {772 560} {837 8101} {1620 1572} {2364 2345} {824 8929} \
+    {776 1031} {837 8085} {824 8815} {837 8071} {837 8107} {824 8654} \
+    {772 479} {775 7784} {776 1269} {824 8837}]
+
+set compSecondList [list \
+    {3545 3548} {3545 3550} {3398 3404} {2503 2507} {2503 2508} \
+    {2887 2891} {2887 2888} {2887 2892} {3270 3274} {3270 3272} \
+    {1575 1570} {1575 1573}]
+
+#
+# Compositions matrix
+#
+
+array unset compBothMap
+array set compBothMap [list \
+    0 8179 1 8060 2 974 4 8032 6 8033 18 8182 145 204 146 205 147 206 149 296 \
+    151 298 152 300 154 304 155 207 156 7880 157 463 158 520 159 522 160 7882 \
+    161 302 163 7724 288 8115 289 8048 290 940 292 7936 294 7937 295 8113 \
+    296 8112 306 8118 441 3546 577 8157 578 8158 594 8159 721 7873 722 7871 \
+    725 7877 732 7875 865 7846 866 7844 869 7850 876 7848 1008 8131 1009 8052 \
+    1010 942 1012 7968 1014 7969 1026 8134 1153 8154 1154 906 1156 7992 \
+    1158 7993 1159 8153 1160 8152 1163 938 1297 7962 1298 7964 1443 293 \
+    1450 7715 1451 7719 1453 543 1456 7717 1460 7721 1461 7723 1463 7830 \
+    1585 7986 1586 7988 1602 7990 1729 504 1730 323 1733 209 1738 7748 1741 327 \
+    1744 7750 1748 325 1750 7754 1751 7752 1873 8002 1874 8004 2024 1217 \
+    2027 1244 2161 505 2162 324 2165 241 2170 7749 2173 328 2176 7751 2180 326 \
+    2182 7755 2183 7753 2306 7743 2314 7745 2320 7747 2458 7786 2461 356 \
+    2464 7788 2468 354 2470 7792 2471 7790 2473 538 2593 7701 2594 7703 \
+    2760 3402 2882 7757 2887 557 2891 7759 3024 8105 3025 8043 3026 8045 \
+    3042 8047 3170 347 3171 349 3178 7777 3181 353 3184 7779 3188 351 3193 537 \
+    3313 7922 3314 221 3315 374 3317 7928 3319 562 3322 7822 3323 376 3324 7926 \
+    3328 7924 3458 377 3459 7824 3466 379 3469 381 3472 7826 3479 7828 3603 7853 \
+    3608 7863 3744 8188 3745 8186 3746 911 3748 8040 3750 8041 3888 8088 \
+    3889 7978 3890 7980 3906 7982 4033 7923 4034 253 4035 375 4037 7929 \
+    4039 563 4042 7823 4043 255 4044 7927 4048 7925 4058 7833 4177 8018 \
+    4178 8020 4194 8022 4321 192 4322 193 4323 194 4325 195 4327 256 4328 258 \
+    4330 550 4331 196 4332 7842 4333 461 4334 512 4335 514 4336 7840 4337 260 \
+    4346 197 4349 7680 4491 12499 4492 12500 4609 7847 4610 7845 4613 7851 \
+    4620 7849 4753 7915 4754 7913 4757 7919 4764 7917 4768 7921 4896 8124 \
+    4897 8122 4898 902 4900 7944 4902 7945 4903 8121 4904 8120 5067 12508 \
+    5068 12509 5185 7954 5186 7956 5329 7760 5330 7762 5474 500 5475 284 \
+    5479 7712 5480 286 5482 288 5485 486 5492 290 5618 979 5627 980 5761 8141 \
+    5762 8142 5778 8143 5931 12496 5932 12497 6049 7872 6050 7870 6053 7876 \
+    6060 7874 6219 12505 6220 12506 6338 313 6349 317 6352 7734 6356 315 \
+    6358 7740 6359 7738 6481 7995 6482 7997 6498 7999 6624 8097 6625 8035 \
+    6626 8037 6642 8039 6770 7729 6781 489 6784 7731 6788 311 6791 7733 \
+    6914 340 6922 7768 6925 344 6926 528 6927 530 6928 7770 6932 342 6935 7774 \
+    7083 12502 7084 12503 7202 7756 7207 556 7211 7758 7345 8056 7346 972 \
+    7348 8000 7350 8001 7489 1117 7495 1251 7496 1081 7499 1253 7632 8080 \
+    7633 7970 7634 7972 7650 7974 7777 7808 7778 7810 7779 372 7786 7814 \
+    7787 7812 7792 7816 7921 8010 7922 8012 8065 8058 8066 973 8068 8016 \
+    8070 8017 8071 8161 8072 8160 8075 971 8082 8166 8235 12412 8236 12413 \
+    8352 8072 8353 7946 8354 7948 8370 7950 8501 7805 8512 7807 8667 12400 \
+    8668 12401 8811 12409 8812 12410 8929 8162 8930 944 8946 8167 9079 1263 \
+    9080 1118 9083 1265 9102 1267 9226 7683 9232 7685 9239 7687 9370 7690 \
+    9373 270 9376 7692 9380 7696 9382 7698 9383 7694 9505 7857 9506 7855 \
+    9509 7861 9516 7859 9650 509 9655 483 9819 12406 9820 12407 9937 7987 \
+    9938 7989 9954 7991 10081 8027 10082 8029 10098 8031 10234 7691 10237 271 \
+    10240 7693 10244 7697 10246 7699 10247 7695 10376 1233 10379 1235 10513 7963 \
+    10514 7965 10683 12403 10684 12404 10801 236 10802 237 10803 238 10805 297 \
+    10807 299 10808 301 10811 239 10812 7881 10813 464 10814 521 10815 523 \
+    10816 7883 10817 303 10819 7725 10945 210 10946 211 10947 212 10949 213 \
+    10951 332 10952 334 10954 558 10955 214 10956 7886 10957 465 10958 524 \
+    10959 526 10960 7884 10961 490 10974 336 10975 416 11090 7764 11098 7766 \
+    11233 8003 11234 8005 11377 1104 11384 1239 11387 1105 11521 8184 11522 908 \
+    11524 8008 11526 8009 11665 7900 11666 7898 11669 7904 11676 7902 11680 7906 \
+    11808 8064 11809 7938 11810 7940 11826 7942 11953 242 11954 243 11955 244 \
+    11957 245 11959 333 11960 335 11962 559 11963 246 11964 7887 11965 466 \
+    11966 525 11967 527 11968 7885 11969 491 11982 337 11983 417 12097 217 \
+    12098 218 12099 219 12101 360 12103 362 12104 364 12107 220 12108 7910 \
+    12109 467 12110 532 12111 534 12112 7908 12113 370 12115 7796 12118 7798 \
+    12122 366 12126 368 12127 431 12128 7794 12241 8170 12242 910 12246 8025 \
+    12247 8169 12248 8168 12251 939 12394 7787 12395 7831 12397 357 12400 7789 \
+    12404 355 12406 7793 12407 7791 12409 539 12529 476 12530 472 12535 470 \
+    12541 474 12672 8089 12673 7979 12674 7981 12690 7983 12818 378 12819 7825 \
+    12826 380 12829 382 12832 7827 12839 7829 12961 8019 12962 8021 12978 8023 \
+    13114 7682 13120 7684 13127 7686 13249 7955 13250 7957 13393 7761 13394 7763 \
+    13539 292 13546 7714 13547 7718 13549 542 13552 7716 13556 7720 13557 7722 \
+    13681 8050 13682 941 13684 7952 13686 7953 13824 8140 13825 8138 13826 905 \
+    13828 7976 13830 7977 13976 1232 13979 1234 14145 3018 14146 3020 14258 501 \
+    14259 285 14263 7713 14264 287 14266 289 14269 487 14276 291 14402 7742 \
+    14410 7744 14416 7746 14546 508 14551 482 14689 8173 14690 901 14706 8129 \
+    14833 1024 14840 1238 14843 1025 14978 314 14989 318 14992 7735 14996 316 \
+    14998 7741 14999 7739 15122 346 15123 348 15130 7776 15133 352 15136 7778 \
+    15140 350 15145 536 15265 7700 15266 7702 15409 7891 15410 7889 15413 7895 \
+    15420 7893 15552 8081 15553 7971 15554 7973 15570 7975 15696 8104 15697 8042 \
+    15698 8044 15714 8046 15842 341 15850 7769 15853 345 15854 529 15855 531 \
+    15856 7771 15860 343 15863 7775 15988 8164 15990 8165 16129 8011 16130 8013 \
+    16282 7818 16283 7820 16419 7852 16424 7862 16561 475 16562 471 16567 469 \
+    16573 473 16704 8073 16705 7947 16706 7949 16722 7951 16849 7809 16850 7811 \
+    16851 373 16858 7815 16859 7813 16864 7817 16874 7832 17002 7819 17003 7821 \
+    17137 7914 17138 7912 17141 7918 17148 7916 17152 7920 17282 263 17283 265 \
+    17290 267 17293 269 17300 231 17425 200 17426 201 17427 202 17429 7868 \
+    17431 274 17432 276 17434 278 17435 203 17436 7866 17437 282 17438 516 \
+    17439 518 17440 7864 17441 280 17443 7706 17444 552 17446 7704 17569 8136 \
+    17570 904 17572 7960 17574 7961 17713 232 17714 233 17715 234 17717 7869 \
+    17719 275 17720 277 17722 279 17723 235 17724 7867 17725 283 17726 517 \
+    17727 519 17728 7865 17729 281 17731 7707 17732 553 17734 7705 17858 7728 \
+    17869 488 17872 7730 17876 310 17879 7732 18001 8054 18002 943 18004 7984 \
+    18006 7985 18007 8145 18008 8144 18011 970 18018 8150 18145 7994 18146 7996 \
+    18162 7998 18323 3271 18432 8096 18433 8034 18434 8036 18450 8038 18579 309 \
+    18589 496 18721 7890 18722 7888 18725 7894 18732 7892 18865 7901 18866 7899 \
+    18869 7905 18876 7903 18880 7907 19009 1037 19015 1250 19016 1049 19019 1252 \
+    19160 1218 19163 1245 19296 8065 19297 7939 19298 7941 19314 7943 19442 7765 \
+    19450 7767 19589 7804 19600 7806 19729 249 19730 250 19731 251 19733 361 \
+    19735 363 19736 365 19739 252 19740 7911 19741 468 19742 533 19743 535 \
+    19744 7909 19745 371 19747 7797 19750 7799 19754 367 19758 369 19759 432 \
+    19760 7795 19873 8146 19874 912 19890 8151 20023 1262 20024 1038 20027 1264 \
+    20046 1266 20161 224 20162 225 20163 226 20165 227 20167 257 20168 259 \
+    20170 551 20171 228 20172 7843 20173 462 20174 513 20175 515 20176 7841 \
+    20177 261 20186 229 20189 7681 20306 262 20307 264 20314 266 20317 268 \
+    20324 199 20449 7856 20450 7854 20453 7860 20460 7858 20628 1571]
+
+
+proc GetUniCharCompInfo {uc} {
+    variable COMP_OFFSET_BITS
+    variable COMP_COMMON_PAGE_MAP
+    variable compPageMap
+    variable compGroupMap
+
+    set page [expr {($uc & 0x1fffff) >> $COMP_OFFSET_BITS}]
+    if {[info exists compPageMap($page)]} {
+	set apage $compPageMap($page)
+    } else {
+	set apage $COMP_COMMON_PAGE_MAP
+    }
+
+    lindex $compGroupMap \
+	   [expr {($apage << $COMP_OFFSET_BITS) | \
+		   ($uc & ((1 << $COMP_OFFSET_BITS) - 1))}]
+}
+
+set COMP_SINGLE_MASK 65536
+set COMP_SECOND_MASK 131072
+set COMP_MASK 65535
+set COMP_LENGTH1 144
+
+proc GetCompFirst {uc info} {
+    variable COMP_SINGLE_MASK
+    variable COMP_SECOND_MASK
+    variable COMP_MASK
+    variable compFirstList
+
+    if {$info == -1 || !($info & $COMP_SINGLE_MASK)} {
+	return -1
+    }
+    if {!($info & $COMP_SECOND_MASK)} {
+	set comp [lindex $compFirstList [expr {$info & $COMP_MASK}]]
+	if {$uc == [lindex $comp 0]} {
+	    return [lindex $comp 1]
+	}
+    }
+    return 0
+}
+
+proc GetCompSecond {uc info} {
+    variable COMP_SINGLE_MASK
+    variable COMP_SECOND_MASK
+    variable COMP_MASK
+    variable compSecondList
+
+    if {$info == -1 || !($info & $COMP_SINGLE_MASK)} {
+	return -1
+    }
+    if {$info & $COMP_SECOND_MASK} {
+	set comp [lindex $compSecondList [expr {$info & $COMP_MASK}]]
+	if {$uc == [lindex $comp 0]} {
+	    return [lindex $comp 1]
+	}
+    }
+    return 0
+}
+
+proc GetCompBoth {info1 info2} {
+    variable COMP_SECOND_MASK
+    variable COMP_MASK
+    variable COMP_LENGTH1
+    variable compBothMap
+
+    if {$info1 != -1 && $info2 != -1 &&  !($info1 & $COMP_SECOND_MASK) && ($info2 & $COMP_SECOND_MASK)} {
+	set idx [expr {$COMP_LENGTH1 * $info1 + ($info2 & $COMP_MASK)}]
+	if {[info exists compBothMap($idx)]} {
+	    return $compBothMap($idx)
+	} else {
+	    return 0
+	}
+    } else {
+	return 0
+    }
+}
+
+} ; # namespace eval ::unicode::data
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/disjointset.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/disjointset.tcl
new file mode 100644
index 00000000..84a59a21
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/disjointset.tcl
@@ -0,0 +1,385 @@
+# disjointset.tcl --
+#
+#  Implementation of a Disjoint Set for Tcl.
+#
+# Copyright (c) Google Summer of Code 2008 Alejandro Eduardo Cruz Paz
+# Copyright (c) 2008 Andreas Kupries (API redesign and simplification)
+# Copyright (c) 2018 by Kevin B. Kenny - reworked to a proper disjoint-sets
+# data structure, added 'add-element', 'exemplars' and 'find-exemplar'.
+
+# References
+#
+# - General overview
+#   - https://en.wikipedia.org/wiki/Disjoint-set_data_structure
+#
+# - Time/Complexity proofs
+#   - https://dl.acm.org/citation.cfm?doid=62.2160
+#   - https://dl.acm.org/citation.cfm?doid=364099.364331
+#
+
+package require Tcl 8.6
+
+# Initialize the disjointset structure namespace. Note that any
+# missing parent namespace (::struct) will be automatically created as
+# well.
+namespace eval ::struct::disjointset {
+
+    # Only export one command, the one used to instantiate a new
+    # disjoint set
+    namespace export disjointset
+}
+
+# class struct::disjointset::_disjointset --
+#
+#	Implementation of a disjoint-sets data structure
+
+oo::class create struct::disjointset::_disjointset {
+
+    # elements - Dictionary whose keys are all the elements in the structure,
+    #            and whose values are element numbers. 
+    # tree     - List indexed by element number whose members are
+    #            ordered triples consisting of the element's name,
+    #            the element number of the element's parent (or the element's
+    #            own index if the element is a root), and the rank of
+    #		 the element.
+    # nParts   - Number of partitions in the structure. Maintained only
+    #            so that num_partitions will work.
+
+    variable elements tree nParts
+
+    constructor {} {
+	set elements {}
+	set tree {}
+	set nParts 0
+    }
+
+    # add-element --
+    #
+    #	Adds an element to the structure
+    #
+    # Parameters:
+    #	item - Name of the element to add
+    #
+    # Results:
+    #	None.
+    #
+    # Side effects:
+    #	Element is added
+
+    method add-element {item} {
+	if {[dict exists $elements $item]} {
+	    return -code error \
+		-errorcode [list STRUCT DISJOINTSET DUPLICATE $item [self]] \
+		"The element \"$item\" is already known to the disjoint\
+            	 set [self]"
+	}
+	set n [llength $tree]
+	dict set elements $item $n
+	lappend tree [list $item $n 0]
+	incr nParts
+	return
+    }
+
+    # add-partition --
+    #
+    #	Adds a collection of new elements to a disjoint-sets structure and
+    #	makes them all one partition.
+    #
+    # Parameters:
+    #	items - List of elements to add.
+    #
+    # Results:
+    #	None.
+    #
+    # Side effects:
+    #	Adds all the elements, and groups them into a single partition.
+
+    method add-partition {items} {
+
+	# Integrity check - make sure that none of the elements have yet
+	# been added
+
+	foreach name $items {
+	    if {[dict exists $elements $name]} {
+		return -code error \
+		    -errorcode [list STRUCT DISJOINTSET DUPLICATE \
+				    $name [self]] \
+		    "The element \"$name\" is already known to the disjoint\
+            	     set [self]"	      	 
+	    }
+	}
+
+	# Add all the elements in one go, and establish parent links for all
+	# but the first
+	
+	set first -1
+	foreach n $items {
+	    set idx [llength $tree]
+	    dict set elements $n $idx
+	    if {$first < 0} {
+		set first $idx
+		set rank 1
+	    } else {
+		set rank 0
+	    }
+	    lappend tree [list $n $first $rank]
+	}
+	incr nParts
+	return
+    }
+
+    # equal --
+    #
+    #	Test if two elements belong to the same partition in a disjoint-sets
+    #	data structure.
+    #
+    # Parameters:
+    #	a - Name of the first element
+    #	b - Name of the second element
+    #
+    # Results:
+    #	Returns 1 if the elements are in the same partition, and 0 otherwise.
+
+    method equal {a b} {
+	expr {[my FindNum $a] == [my FindNum $b]}
+    }
+
+    # exemplars --
+    #
+    #	Find one representative element for each partition in a disjoint-sets
+    #	data structure.
+    #
+    # Results:
+    #	Returns a list of element names
+
+    method exemplars {} {
+	set result {}
+	set n -1
+	foreach row $tree {
+	    if {[lindex $row 1] == [incr n]} {
+		lappend result [lindex $row 0]
+	    }
+	}
+	return $result
+    }
+
+    # find --
+    #
+    #	Find the partition to which a given element belongs.
+    #
+    # Parameters:
+    #	item - Item to find
+    #
+    # Results:
+    #	Returns a list of the partition's members
+    #
+    # Notes:
+    #	This operation takes time proportional to the total number of elements
+    #	in the disjoint-sets structure. If a simple name of the partition
+    #	is all that is required, use "find-exemplar" instead, which runs
+    #	in amortized time proportional to the inverse Ackermann function of
+    #	the size of the partition.
+
+    method find {item} {
+	set result {}
+	# No error on a nonexistent item
+	if {![dict exists $elements $item]} {
+	    return {}
+	}
+	set pnum [my FindNum $item]
+	set n -1
+	foreach row $tree {
+	    if {[my FindByNum [incr n]] eq $pnum} {
+		lappend result [lindex $row 0]
+	    }
+	}
+	return $result
+    }
+
+    # find-exemplar --
+    #
+    #	Find a representative element of the partition that contains a given
+    #	element.
+    #
+    # parameters:
+    #	item - Item to examine
+    #
+    # Results:
+    #	Returns the exemplar
+    #
+    # Notes:
+    #	Takes O(alpha(|P|)) amortized time, where |P| is the size of the
+    #	partition, and alpha is the inverse Ackermann function
+
+    method find-exemplar {item} {
+	return [lindex $tree [my FindNum $item] 0]
+    }
+    
+    # merge --
+    #
+    #	Merges the partitions that two elements are in.
+    #
+    # Results:
+    #	None.
+
+    method merge {a b} {
+	my MergeByNum [my FindNum $a] [my FindNum $b]
+    }
+
+    # num-partitions --
+    #
+    #	Counts the partitions of a disjoint-sets data structure
+    #
+    # Results:
+    #	Returns the partition count.
+
+    method num-partitions {} {
+	return $nParts
+    }
+    
+    # partitions --
+    #
+    #	Enumerates the partitions of a disjoint-sets data structure
+    #
+    # Results:
+    #	Returns a list of lists. Each list is one of the partitions
+    #	in the disjoint set, and each member of the sublist is one
+    #	of the elements added to the structure.
+
+    method partitions {} {
+
+	# Find the partition number for each element, and accumulate a
+	# list per partition
+	set parts {}
+	dict for {element eltNo} $elements {
+	    set partNo [my FindByNum $eltNo]
+	    dict lappend parts $partNo $element
+	}
+	return [dict values $parts]
+    }
+
+    # FindNum --
+    #
+    #	Finds the partition number for an element.
+    #
+    # Parameters:
+    #	item - Item to look up
+    #
+    # Results:
+    #	Returns the partition number
+
+    method FindNum {item} {
+	if {![dict exists $elements $item]} {
+	    return -code error \
+		-errorcode [list STRUCT DISJOINTSET NOTFOUND $item [self]] \
+		"The element \"$item\" is not known to the disjoint\
+                 set [self]"	  
+	}
+	return [my FindByNum [dict get $elements $item]]
+    }
+
+    # FindByNum --
+    #
+    #	Finds the partition number for an element, given the element's
+    #	index
+    #
+    # Parameters:
+    #	idx - Index of the item to look up
+    #
+    # Results:
+    #	Returns the partition number
+    #
+    # Side effects:
+    #	Performs path splitting
+
+    method FindByNum {idx} {
+	while {1} {
+	    set parent [lindex $tree $idx 1]
+	    if {$parent == $idx} {
+		return $idx
+	    }
+	    set prev $idx
+	    set idx $parent
+	    lset tree $prev 1 [lindex $tree $idx 1]
+	}
+    }
+
+    # MergeByNum --
+    #
+    #	Merges two partitions in a disjoint-sets data structure
+    #
+    # Parameters:
+    #	x - Index of an element in the first partition
+    #	y - Index of an element in the second partition
+    #
+    # Results:
+    #	None
+    #
+    # Side effects:
+    #	Merges the partition of the lower rank into the one of the
+    #	higher rank.
+
+    method MergeByNum {x y} {
+	set xroot [my FindByNum $x]
+	set yroot [my FindByNum $y]
+
+	if {$xroot == $yroot} {
+	    # The elements are already in the same partition
+	    return
+	}
+
+	incr nParts -1
+
+	# Make xroot the taller tree
+	if {[lindex $tree $xroot 2] < [lindex $tree $yroot 2]} {
+	    set t $xroot; set xroot $yroot; set yroot $t
+	}
+
+	# Merge yroot into xroot
+	set xrank [lindex $tree $xroot 2]
+	set yrank [lindex $tree $yroot 2]
+	lset tree $yroot 1 $xroot
+	if {$xrank == $yrank} {
+	    lset tree $xroot 2 [expr {$xrank + 1}]
+	}
+    }
+}
+
+# ::struct::disjointset::disjointset --
+#
+#	Create a new disjoint set with a given name; if no name is
+#	given, use disjointsetX, where X is a number.
+#
+# Arguments:
+#	name	Optional name of the disjoint set; if not specified, generate one.
+#
+# Results:
+#	name	Name of the disjoint set created
+
+proc ::struct::disjointset::disjointset {args} {
+
+    switch -exact -- [llength $args] {
+	0 {
+	    return [_disjointset new]
+	}
+	1 {
+	    # Name supplied by user
+	    return [uplevel 1 [list [namespace which _disjointset] \
+				   create [lindex $args 0]]]
+	}
+	default {
+	    # Too many args
+	    return -code error \
+		-errorcode {TCL WRONGARGS} \
+		"wrong # args: should be \"[lindex [info level 0] 0] ?name?\""
+	}
+    }
+}
+
+namespace eval ::struct {
+    namespace import disjointset::disjointset
+    namespace export disjointset
+}
+
+package provide struct::disjointset 1.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graph.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graph.tcl
new file mode 100644
index 00000000..19663fd3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graph.tcl
@@ -0,0 +1,178 @@
+# graph.tcl --
+#
+#	Implementation of a graph data structure for Tcl.
+#
+# Copyright (c) 2000-2005,2019 by Andreas Kupries
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# @mdgen EXCLUDE: graph_c.tcl
+
+package require Tcl 8.4
+
+namespace eval ::struct::graph {}
+
+# ### ### ### ######### ######### #########
+## Management of graph implementations.
+
+# ::struct::graph::LoadAccelerator --
+#
+#	Loads a named implementation, if possible.
+#
+# Arguments:
+#	key	Name of the implementation to load.
+#
+# Results:
+#	A boolean flag. True if the implementation
+#	was successfully loaded; and False otherwise.
+
+proc ::struct::graph::LoadAccelerator {key} {
+    variable accel
+    set r 0
+    switch -exact -- $key {
+	critcl {
+	    # Critcl implementation of graph requires Tcl 8.4.
+	    if {![package vsatisfies [package provide Tcl] 8.4]} {return 0}
+	    if {[catch {package require tcllibc}]} {return 0}
+	    set r [llength [info commands ::struct::graph_critcl]]
+	}
+	tcl {
+	    variable selfdir
+	    source [file join $selfdir graph_tcl.tcl]
+	    set r 1
+	}
+        default {
+            return -code error "invalid accelerator/impl. package $key:\
+                must be one of [join [KnownImplementations] {, }]"
+        }
+    }
+    set accel($key) $r
+    return $r
+}
+
+# ::struct::graph::SwitchTo --
+#
+#	Activates a loaded named implementation.
+#
+# Arguments:
+#	key	Name of the implementation to activate.
+#
+# Results:
+#	None.
+
+proc ::struct::graph::SwitchTo {key} {
+    variable accel
+    variable loaded
+
+    if {[string equal $key $loaded]} {
+	# No change, nothing to do.
+	return
+    } elseif {![string equal $key ""]} {
+	# Validate the target implementation of the switch.
+
+	if {![info exists accel($key)]} {
+	    return -code error "Unable to activate unknown implementation \"$key\""
+	} elseif {![info exists accel($key)] || !$accel($key)} {
+	    return -code error "Unable to activate missing implementation \"$key\""
+	}
+    }
+
+    # Deactivate the previous implementation, if there was any.
+
+    if {![string equal $loaded ""]} {
+	rename ::struct::graph ::struct::graph_$loaded
+    }
+
+    # Activate the new implementation, if there is any.
+
+    if {![string equal $key ""]} {
+	rename ::struct::graph_$key ::struct::graph
+    }
+
+    # Remember the active implementation, for deactivation by future
+    # switches.
+
+    set loaded $key
+    return
+}
+
+# ::struct::graph::Implementations --
+#
+#	Determines which implementations are
+#	present, i.e. loaded.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys.
+
+proc ::struct::graph::Implementations {} {
+    variable accel
+    set res {}
+    foreach n [array names accel] {
+	if {!$accel($n)} continue
+	lappend res $n
+    }
+    return $res
+}
+
+# ::struct::graph::KnownImplementations --
+#
+#	Determines which implementations are known
+#	as possible implementations.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys. In the order
+#	of preference, most prefered first.
+
+proc ::struct::graph::KnownImplementations {} {
+    return {critcl tcl}
+}
+
+proc ::struct::graph::Names {} {
+    return {
+	critcl {tcllibc based}
+	tcl    {pure Tcl}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Data structures.
+
+namespace eval ::struct::graph {
+    variable  selfdir [file dirname [info script]]
+    variable  accel
+    array set accel   {tcl 0 critcl 0}
+    variable  loaded  {}
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Choose an implementation,
+## most prefered first. Loads only one of the
+## possible implementations. And activates it.
+
+namespace eval ::struct::graph {
+    variable e
+    foreach e [KnownImplementations] {
+	if {[LoadAccelerator $e]} {
+	    SwitchTo $e
+	    break
+	}
+    }
+    unset e
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Export the constructor command.
+    namespace export graph
+}
+
+package provide struct::graph 2.4.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graph1.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graph1.tcl
new file mode 100644
index 00000000..80c24592
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graph1.tcl
@@ -0,0 +1,2154 @@
+# graph.tcl --
+#
+#	Implementation of a graph data structure for Tcl.
+#
+# Copyright (c) 2000 by Andreas Kupries
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: graph1.tcl,v 1.5 2008/08/13 20:30:58 mic42 Exp $
+
+# Create the namespace before determining cgraph vs. tcl
+# Otherwise the loading 'struct.tcl' may get into trouble
+# when trying to import commands from them
+
+namespace eval ::struct {}
+namespace eval ::struct::graph {}
+
+# Try to load the cgraph package
+
+if {![catch {package require cgraph 0.6}]} {
+    # the cgraph package takes over, so we can return
+    return
+}
+
+namespace eval ::struct {}
+namespace eval ::struct::graph {
+    # Data storage in the graph module
+    # -------------------------------
+    #
+    # There's a lot of bits to keep track of for each graph:
+    #	nodes
+    #	node values
+    #	node relationships (arcs)
+    #   arc values
+    #
+    # It would quickly become unwieldy to try to keep these in arrays or lists
+    # within the graph namespace itself.  Instead, each graph structure will
+    # get its own namespace.  Each namespace contains:
+    #	node:$node	array mapping keys to values for the node $node
+    #	arc:$arc	array mapping keys to values for the arc $arc
+    #	inArcs		array mapping nodes to the list of incoming arcs
+    #	outArcs		array mapping nodes to the list of outgoing arcs
+    #	arcNodes	array mapping arcs to the two nodes (start & end)
+    
+    # counter is used to give a unique name for unnamed graph
+    variable counter 0
+
+    # commands is the list of subcommands recognized by the graph
+    variable commands [list	\
+	    "arc"		\
+	    "arcs"		\
+	    "destroy"		\
+	    "get"		\
+	    "getall"		\
+	    "keys"		\
+	    "keyexists"		\
+	    "node"		\
+	    "nodes"		\
+	    "set"		\
+	    "swap"		\
+	    "unset"             \
+	    "walk"		\
+	    ]
+
+    variable arcCommands [list	\
+	    "append"	\
+	    "delete"	\
+	    "exists"	\
+	    "get"	\
+	    "getall"	\
+	    "insert"	\
+	    "keys"	\
+	    "keyexists"	\
+	    "lappend"	\
+	    "set"	\
+	    "source"	\
+	    "target"	\
+	    "unset"	\
+	    ]
+
+    variable nodeCommands [list	\
+	    "append"	\
+	    "degree"	\
+	    "delete"	\
+	    "exists"	\
+	    "get"	\
+	    "getall"	\
+	    "insert"	\
+	    "keys"	\
+	    "keyexists"	\
+	    "lappend"	\
+	    "opposite"	\
+	    "set"	\
+	    "unset"	\
+	    ]
+
+    # Only export one command, the one used to instantiate a new graph
+    namespace export graph
+}
+
+# ::struct::graph::graph --
+#
+#	Create a new graph with a given name; if no name is given, use
+#	graphX, where X is a number.
+#
+# Arguments:
+#	name	name of the graph; if null, generate one.
+#
+# Results:
+#	name	name of the graph created
+
+proc ::struct::graph::graph {{name ""}} {
+    variable counter
+    
+    if { [llength [info level 0]] == 1 } {
+	incr counter
+	set name "graph${counter}"
+    }
+
+    if { ![string equal [info commands ::$name] ""] } {
+	error "command \"$name\" already exists, unable to create graph"
+    }
+
+    # Set up the namespace
+    namespace eval ::struct::graph::graph$name {
+
+	# Set up the map for values associated with the graph itself
+	variable graphData
+	array set graphData {data ""}
+
+	# Set up the map from nodes to the arcs coming to them
+	variable  inArcs
+	array set inArcs {}
+
+	# Set up the map from nodes to the arcs going out from them
+	variable  outArcs
+	array set outArcs {}
+
+	# Set up the map from arcs to the nodes they touch.
+	variable  arcNodes
+	array set arcNodes {}
+
+	# Set up a value for use in creating unique node names
+	variable nextUnusedNode
+	set nextUnusedNode 1
+
+	# Set up a value for use in creating unique arc names
+	variable nextUnusedArc
+	set nextUnusedArc 1
+    }
+
+    # Create the command to manipulate the graph
+    interp alias {} ::$name {} ::struct::graph::GraphProc $name
+
+    return $name
+}
+
+##########################
+# Private functions follow
+
+# ::struct::graph::GraphProc --
+#
+#	Command that processes all graph object commands.
+#
+# Arguments:
+#	name	name of the graph object to manipulate.
+#	args	command name and args for the command
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::graph::GraphProc {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	error "wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+    
+    # Split the args into command and args components
+    if { [llength [info commands ::struct::graph::_$cmd]] == 0 } {
+	variable commands
+	set optlist [join $commands ", "]
+	set optlist [linsert $optlist "end-1" "or"]
+	error "bad option \"$cmd\": must be $optlist"
+    }
+    eval [list ::struct::graph::_$cmd $name] $args
+}
+
+# ::struct::graph::_arc --
+#
+#	Dispatches the invocation of arc methods to the proper handler
+#	procedure.
+#
+# Arguments:
+#	name	name of the graph.
+#	cmd	arc command to invoke
+#	args	arguments to propagate to the handler for the arc command
+#
+# Results:
+#	As of the invoked handler.
+
+proc ::struct::graph::_arc {name cmd args} {
+
+    # Split the args into command and args components
+    if { [llength [info commands ::struct::graph::__arc_$cmd]] == 0 } {
+	variable arcCommands
+	set optlist [join $arcCommands ", "]
+	set optlist [linsert $optlist "end-1" "or"]
+	error "bad option \"$cmd\": must be $optlist"
+    }
+
+    eval [list ::struct::graph::__arc_$cmd $name] $args
+}
+
+# ::struct::graph::__arc_delete --
+#
+#	Remove an arc from a graph, including all of its values.
+#
+# Arguments:
+#	name	name of the graph.
+#	args	list of arcs to delete.
+#
+# Results:
+#	None.
+
+proc ::struct::graph::__arc_delete {name args} {
+
+    foreach arc $args {
+	if { ![__arc_exists $name $arc] } {
+	    error "arc \"$arc\" does not exist in graph \"$name\""
+	}
+    }
+
+    upvar ::struct::graph::graph${name}::inArcs   inArcs
+    upvar ::struct::graph::graph${name}::outArcs  outArcs
+    upvar ::struct::graph::graph${name}::arcNodes arcNodes
+
+    foreach arc $args {
+	foreach {source target} $arcNodes($arc) break ; # lassign
+
+	unset arcNodes($arc)
+	# FRINK: nocheck
+	unset ::struct::graph::graph${name}::arc$arc
+
+	# Remove arc from the arc lists of source and target nodes.
+
+	set index            [lsearch -exact $outArcs($source) $arc]
+	set outArcs($source) [lreplace       $outArcs($source) $index $index]
+
+	set index            [lsearch -exact $inArcs($target)  $arc]
+	set inArcs($target)  [lreplace       $inArcs($target)  $index $index]
+    }
+
+    return
+}
+
+# ::struct::graph::__arc_exists --
+#
+#	Test for existance of a given arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to look for.
+#
+# Results:
+#	1 if the arc exists, 0 else.
+
+proc ::struct::graph::__arc_exists {name arc} {
+    return [info exists ::struct::graph::graph${name}::arcNodes($arc)]
+}
+
+# ::struct::graph::__arc_get --
+#
+#	Get a keyed value from an arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to query.
+#	flag	-key; anything else is an error
+#	key	key to lookup; defaults to data
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::__arc_get {name arc {flag -key} {key data}} {
+    if { ![__arc_exists $name $arc] } {
+	error "arc \"$arc\" does not exist in graph \"$name\""
+    }
+    
+    upvar ::struct::graph::graph${name}::arc${arc} data
+
+    if { ![info exists data($key)] } {
+	error "invalid key \"$key\" for arc \"$arc\""
+    }
+
+    return $data($key)
+}
+
+# ::struct::graph::__arc_getall --
+#
+#	Get a serialized array of key/value pairs from an arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to query.
+#
+# Results:
+#	value	serialized array of key/value pairs.
+
+proc ::struct::graph::__arc_getall {name arc args} {
+    if { ![__arc_exists $name $arc] } {
+	error "arc \"$arc\" does not exist in graph \"$name\""
+    }
+
+    if { [llength $args] } {
+	error "wrong # args: should be none"
+    }
+    
+    upvar ::struct::graph::graph${name}::arc${arc} data
+
+    return [array get data]
+}
+
+# ::struct::graph::__arc_keys --
+#
+#	Get a list of keys for an arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to query.
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::__arc_keys {name arc args} {
+    if { ![__arc_exists $name $arc] } {
+	error "arc \"$arc\" does not exist in graph \"$name\""
+    }
+
+    if { [llength $args] } {
+	error "wrong # args: should be none"
+    }    
+
+    upvar ::struct::graph::graph${name}::arc${arc} data
+
+    return [array names data]
+}
+
+# ::struct::graph::__arc_keyexists --
+#
+#	Test for existance of a given key for a given arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to query.
+#	flag	-key; anything else is an error
+#	key	key to lookup; defaults to data
+#
+# Results:
+#	1 if the key exists, 0 else.
+
+proc ::struct::graph::__arc_keyexists {name arc {flag -key} {key data}} {
+    if { ![__arc_exists $name $arc] } {
+	error "arc \"$arc\" does not exist in graph \"$name\""
+    }
+
+    if { ![string equal $flag "-key"] } {
+	error "invalid option \"$flag\": should be -key"
+    }
+    
+    upvar ::struct::graph::graph${name}::arc${arc} data
+
+    return [info exists data($key)]
+}
+
+# ::struct::graph::__arc_insert --
+#
+#	Add an arc to a graph.
+#
+# Arguments:
+#	name		name of the graph.
+#	source		source node of the new arc
+#	target		target node of the new arc
+#	args		arc to insert; must be unique.  If none is given,
+#			the routine will generate a unique node name.
+#
+# Results:
+#	arc		The name of the new arc.
+
+proc ::struct::graph::__arc_insert {name source target args} {
+
+    if { [llength $args] == 0 } {
+	# No arc name was given; generate a unique one
+	set arc [__generateUniqueArcName $name]
+    } else {
+	set arc [lindex $args 0]
+    }
+
+    if { [__arc_exists $name $arc] } {
+	error "arc \"$arc\" already exists in graph \"$name\""
+    }
+    
+    if { ![__node_exists $name $source] } {
+	error "source node \"$source\" does not exist in graph \"$name\""
+    }
+    
+    if { ![__node_exists $name $target] } {
+	error "target node \"$target\" does not exist in graph \"$name\""
+    }
+    
+    upvar ::struct::graph::graph${name}::inArcs    inArcs
+    upvar ::struct::graph::graph${name}::outArcs   outArcs
+    upvar ::struct::graph::graph${name}::arcNodes  arcNodes
+    upvar ::struct::graph::graph${name}::arc${arc} data
+
+    # Set up the new arc
+    set data(data)       ""
+    set arcNodes($arc) [list $source $target]
+
+    # Add this arc to the arc lists of its source resp. target nodes.
+    lappend outArcs($source) $arc
+    lappend inArcs($target)  $arc
+
+    return $arc
+}
+
+# ::struct::graph::__arc_set --
+#
+#	Set or get a value for an arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to modify or query.
+#	args	?-key key? ?value?
+#
+# Results:
+#	val	value associated with the given key of the given arc
+
+proc ::struct::graph::__arc_set {name arc args} {
+    if { ![__arc_exists $name $arc] } {
+	error "arc \"$arc\" does not exist in graph \"$name\""
+    }
+
+    upvar ::struct::graph::graph${name}::arc$arc data
+
+    if { [llength $args] > 3 } {
+	error "wrong # args: should be \"$name arc set $arc ?-key key?\
+		?value?\""
+    }
+    
+    set key "data"
+    set haveValue 0
+    if { [llength $args] > 1 } {
+	foreach {flag key} $args break
+	if { ![string match "${flag}*" "-key"] } {
+	    error "invalid option \"$flag\": should be key"
+	}
+	if { [llength $args] == 3 } {
+	    set haveValue 1
+	    set value [lindex $args end]
+	}
+    } elseif { [llength $args] == 1 } {
+	set haveValue 1
+	set value [lindex $args end]
+    }
+
+    if { $haveValue } {
+	# Setting a value
+	return [set data($key) $value]
+    } else {
+	# Getting a value
+	if { ![info exists data($key)] } {
+	    error "invalid key \"$key\" for arc \"$arc\""
+	}
+	return $data($key)
+    }
+}
+
+# ::struct::graph::__arc_append --
+#
+#	Append a value for an arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to modify or query.
+#	args	?-key key? value
+#
+# Results:
+#	val	value associated with the given key of the given arc
+
+proc ::struct::graph::__arc_append {name arc args} {
+    if { ![__arc_exists $name $arc] } {
+	error "arc \"$arc\" does not exist in graph \"$name\""
+    }
+
+    upvar ::struct::graph::graph${name}::arc$arc data
+
+    if { [llength $args] != 1 && [llength $args] != 3 } {
+	error "wrong # args: should be \"$name arc append $arc ?-key key?\
+		value\""
+    }
+    
+    if { [llength $args] == 3 } {
+	foreach {flag key} $args break
+	if { ![string equal $flag "-key"] } {
+	    error "invalid option \"$flag\": should be -key"
+	}
+    } else {
+	set key "data"
+    }
+
+    set value [lindex $args end]
+
+    return [append data($key) $value]
+}
+
+# ::struct::graph::__arc_lappend --
+#
+#	lappend a value for an arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to modify or query.
+#	args	?-key key? value
+#
+# Results:
+#	val	value associated with the given key of the given arc
+
+proc ::struct::graph::__arc_lappend {name arc args} {
+    if { ![__arc_exists $name $arc] } {
+	error "arc \"$arc\" does not exist in graph \"$name\""
+    }
+
+    upvar ::struct::graph::graph${name}::arc$arc data
+
+    if { [llength $args] != 1 && [llength $args] != 3 } {
+	error "wrong # args: should be \"$name arc lappend $arc ?-key key?\
+		value\""
+    }
+    
+    if { [llength $args] == 3 } {
+	foreach {flag key} $args break
+	if { ![string equal $flag "-key"] } {
+	    error "invalid option \"$flag\": should be -key"
+	}
+    } else {
+	set key "data"
+    }
+
+    set value [lindex $args end]
+
+    return [lappend data($key) $value]
+}
+
+# ::struct::graph::__arc_source --
+#
+#	Return the node at the beginning of the specified arc.
+#
+# Arguments:
+#	name	name of the graph object.
+#	arc	arc to look up.
+#
+# Results:
+#	node	name of the node.
+
+proc ::struct::graph::__arc_source {name arc} {
+    if { ![__arc_exists $name $arc] } {
+	error "arc \"$arc\" does not exist in graph \"$name\""
+    }
+
+    upvar ::struct::graph::graph${name}::arcNodes arcNodes
+    return [lindex $arcNodes($arc) 0]
+}
+
+# ::struct::graph::__arc_target --
+#
+#	Return the node at the end of the specified arc.
+#
+# Arguments:
+#	name	name of the graph object.
+#	arc	arc to look up.
+#
+# Results:
+#	node	name of the node.
+
+proc ::struct::graph::__arc_target {name arc} {
+    if { ![__arc_exists $name $arc] } {
+	error "arc \"$arc\" does not exist in graph \"$name\""
+    }
+
+    upvar ::struct::graph::graph${name}::arcNodes arcNodes
+    return [lindex $arcNodes($arc) 1]
+}
+
+# ::struct::graph::__arc_unset --
+#
+#	Remove a keyed value from a arc.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to modify.
+#	args	additional args: ?-key key?
+#
+# Results:
+#	None.
+
+proc ::struct::graph::__arc_unset {name arc {flag -key} {key data}} {
+    if { ![__arc_exists $name $arc] } {
+	error "arc \"$arc\" does not exist in graph \"$name\""
+    }
+    
+    if { ![string match "${flag}*" "-key"] } {
+	error "invalid option \"$flag\": should be \"$name arc unset\
+		$arc ?-key key?\""
+    }
+
+    upvar ::struct::graph::graph${name}::arc${arc} data
+    if { [info exists data($key)] } {
+	unset data($key)
+    }
+    return
+}
+
+# ::struct::graph::_arcs --
+#
+#	Return a list of all arcs in a graph satisfying some
+#	node based restriction.
+#
+# Arguments:
+#	name	name of the graph.
+#
+# Results:
+#	arcs	list of arcs
+
+proc ::struct::graph::_arcs {name args} {
+
+    # Discriminate between conditions and nodes
+
+    set haveCond 0
+    set haveKey 0
+    set haveValue 0
+    set cond "none"
+    set condNodes [list]
+
+    for {set i 0} {$i < [llength $args]} {incr i} {
+	set arg [lindex $args $i]
+	switch -glob -- $arg {
+	    -in -
+	    -out -
+	    -adj -
+	    -inner -
+	    -embedding {
+		if {$haveCond} {
+		    return -code error "invalid restriction:\
+			    illegal multiple use of\
+			    \"-in\"|\"-out\"|\"-adj\"|\"-inner\"|\"-embedding\""
+		}
+
+		set haveCond 1
+		set cond [string range $arg 1 end]
+	    }
+	    -key {
+		if {$haveKey} {
+		    return -code error {invalid restriction: illegal multiple use of "-key"}
+		}
+
+		incr i
+		set key [lindex $args $i]
+		set haveKey 1
+	    }
+	    -value {
+		if {$haveValue} {
+		    return -code error {invalid restriction: illegal multiple use of "-value"}
+		}
+
+		incr i
+		set value [lindex $args $i]
+		set haveValue 1
+	    }
+	    -* {
+		error "invalid restriction \"$arg\": should be -in, -out,\
+			-adj, -inner, -embedding, -key or -value"
+	    }
+	    default {
+		lappend condNodes $arg
+	    }
+	}
+    }
+
+    # Validate that there are nodes to use in the restriction.
+    # otherwise what's the point?
+    if {$haveCond} {
+	if {[llength $condNodes] == 0} {
+	    set usage "$name arcs ?-key key? ?-value value? ?-in|-out|-adj|-inner|-embedding node node...?"
+	    error "no nodes specified: should be \"$usage\""
+	}
+
+	# Make sure that the specified nodes exist!
+	foreach node $condNodes {
+	    if { ![__node_exists $name $node] } {
+		error "node \"$node\" does not exist in graph \"$name\""
+	    }
+	}
+    }
+
+    # Now we are able to go to work
+    upvar ::struct::graph::graph${name}::inArcs   inArcs
+    upvar ::struct::graph::graph${name}::outArcs  outArcs
+    upvar ::struct::graph::graph${name}::arcNodes arcNodes
+
+    set       arcs [list]
+
+    switch -exact -- $cond {
+	in {
+	    # Result is all arcs going to at least one node
+	    # in the list of arguments.
+
+	    foreach node $condNodes {
+		foreach e $inArcs($node) {
+		    # As an arc has only one destination, i.e. is the
+		    # in-arc of exactly one node it is impossible to
+		    # count an arc twice. IOW the [info exists] below
+		    # is never true. Found through coverage analysis
+		    # and then trying to think up a testcase invoking
+		    # the continue.
+		    # if {[info exists coll($e)]} {continue}
+		    lappend arcs    $e
+		    #set     coll($e) .
+		}
+	    }
+	}
+	out {
+	    # Result is all arcs coming from at least one node
+	    # in the list of arguments.
+
+	    foreach node $condNodes {
+		foreach e $outArcs($node) {
+		    # See above 'in', same reasoning, one source per arc.
+		    # if {[info exists coll($e)]} {continue}
+		    lappend arcs    $e
+		    #set     coll($e) .
+		}
+	    }
+	}
+	adj {
+	    # Result is all arcs coming from or going to at
+	    # least one node in the list of arguments.
+
+	    array set coll  {}
+	    # Here we do need 'coll' as each might be an in- and
+	    # out-arc for one or two nodes in the list of arguments.
+
+	    foreach node $condNodes {
+		foreach e $inArcs($node) {
+		    if {[info exists coll($e)]} {continue}
+		    lappend arcs    $e
+		    set     coll($e) .
+		}
+		foreach e $outArcs($node) {
+		    if {[info exists coll($e)]} {continue}
+		    lappend arcs    $e
+		    set     coll($e) .
+		}
+	    }
+	}
+	inner {
+	    # Result is all arcs running between nodes in the list.
+
+	    array set coll  {}
+	    # Here we do need 'coll' as each might be an in- and
+	    # out-arc for one or two nodes in the list of arguments.
+
+	    array set group {}
+	    foreach node $condNodes {
+		set group($node) .
+	    }
+
+	    foreach node $condNodes {
+		foreach e $inArcs($node) {
+		    set n [lindex $arcNodes($e) 0]
+		    if {![info exists group($n)]} {continue}
+		    if { [info exists coll($e)]}  {continue}
+		    lappend arcs    $e
+		    set     coll($e) .
+		}
+		foreach e $outArcs($node) {
+		    set n [lindex $arcNodes($e) 1]
+		    if {![info exists group($n)]} {continue}
+		    if { [info exists coll($e)]}  {continue}
+		    lappend arcs    $e
+		    set     coll($e) .
+		}
+	    }
+	}
+	embedding {
+	    # Result is all arcs from -adj minus the arcs from -inner.
+	    # IOW all arcs going from a node in the list to a node
+	    # which is *not* in the list
+
+	    # This also means that no arc can be counted twice as it
+	    # is either going to a node, or coming from a node in the
+	    # list, but it can't do both, because then it is part of
+	    # -inner, which was excluded!
+
+	    array set group {}
+	    foreach node $condNodes {
+		set group($node) .
+	    }
+
+	    foreach node $condNodes {
+		foreach e $inArcs($node) {
+		    set n [lindex $arcNodes($e) 0]
+		    if {[info exists group($n)]} {continue}
+		    # if {[info exists coll($e)]}  {continue}
+		    lappend arcs    $e
+		    # set     coll($e) .
+		}
+		foreach e $outArcs($node) {
+		    set n [lindex $arcNodes($e) 1]
+		    if {[info exists group($n)]} {continue}
+		    # if {[info exists coll($e)]}  {continue}
+		    lappend arcs    $e
+		    # set     coll($e) .
+		}
+	    }
+	}
+	none {
+	    set arcs [array names arcNodes]
+	}
+	default {error "Can't happen, panic"}
+    }
+
+    #
+    # We have a list of arcs that match the relation to the nodes.
+    # Now filter according to -key and -value.
+    #
+
+    set filteredArcs [list]
+
+    if {$haveKey} {
+	foreach arc $arcs {
+	    catch {
+		set aval [__arc_get $name $arc -key $key]
+		if {$haveValue} {
+		    if {$aval == $value} {
+			lappend filteredArcs $arc
+		    }
+		} else {
+		    lappend filteredArcs $arc
+		}
+	    }
+	}
+    } else {
+	set filteredArcs $arcs
+    }
+
+    return $filteredArcs
+}
+
+# ::struct::graph::_destroy --
+#
+#	Destroy a graph, including its associated command and data storage.
+#
+# Arguments:
+#	name	name of the graph.
+#
+# Results:
+#	None.
+
+proc ::struct::graph::_destroy {name} {
+    namespace delete ::struct::graph::graph$name
+    interp alias {} ::$name {}
+}
+
+# ::struct::graph::__generateUniqueArcName --
+#
+#	Generate a unique arc name for the given graph.
+#
+# Arguments:
+#	name	name of the graph.
+#
+# Results:
+#	arc	name of a arc guaranteed to not exist in the graph.
+
+proc ::struct::graph::__generateUniqueArcName {name} {
+    upvar ::struct::graph::graph${name}::nextUnusedArc nextUnusedArc
+    while {[__arc_exists $name "arc${nextUnusedArc}"]} {
+	incr nextUnusedArc
+    }
+    return "arc${nextUnusedArc}"
+}
+
+# ::struct::graph::__generateUniqueNodeName --
+#
+#	Generate a unique node name for the given graph.
+#
+# Arguments:
+#	name	name of the graph.
+#
+# Results:
+#	node	name of a node guaranteed to not exist in the graph.
+
+proc ::struct::graph::__generateUniqueNodeName {name} {
+    upvar ::struct::graph::graph${name}::nextUnusedNode nextUnusedNode
+    while {[__node_exists $name "node${nextUnusedNode}"]} {
+	incr nextUnusedNode
+    }
+    return "node${nextUnusedNode}"
+}
+
+# ::struct::graph::_get --
+#
+#	Get a keyed value from the graph itself
+#
+# Arguments:
+#	name	name of the graph.
+#	flag	-key; anything else is an error
+#	key	key to lookup; defaults to data
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::_get {name {flag -key} {key data}} {
+    upvar ::struct::graph::graph${name}::graphData data
+
+    if { ![info exists data($key)] } {
+	error "invalid key \"$key\" for graph \"$name\""
+    }
+
+    return $data($key)
+}
+
+# ::struct::graph::_getall --
+#
+#	Get a serialized list of key/value pairs from a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::_getall {name args} { 
+    if { [llength $args] } {
+	error "wrong # args: should be none"
+    }
+    
+    upvar ::struct::graph::graph${name}::graphData data
+    return [array get data]
+}
+
+# ::struct::graph::_keys --
+#
+#	Get a list of keys from a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#
+# Results:
+#	value	list of known keys
+
+proc ::struct::graph::_keys {name args} { 
+    if { [llength $args] } {
+	error "wrong # args: should be none"
+    }
+
+    upvar ::struct::graph::graph${name}::graphData data
+    return [array names data]
+}
+
+# ::struct::graph::_keyexists --
+#
+#	Test for existance of a given key in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	flag	-key; anything else is an error
+#	key	key to lookup; defaults to data
+#
+# Results:
+#	1 if the key exists, 0 else.
+
+proc ::struct::graph::_keyexists {name {flag -key} {key data}} {
+    if { ![string equal $flag "-key"] } {
+	error "invalid option \"$flag\": should be -key"
+    }
+    
+    upvar ::struct::graph::graph${name}::graphData data
+    return [info exists data($key)]
+}
+
+# ::struct::graph::_node --
+#
+#	Dispatches the invocation of node methods to the proper handler
+#	procedure.
+#
+# Arguments:
+#	name	name of the graph.
+#	cmd	node command to invoke
+#	args	arguments to propagate to the handler for the node command
+#
+# Results:
+#	As of the the invoked handler.
+
+proc ::struct::graph::_node {name cmd args} {
+
+    # Split the args into command and args components
+    if { [llength [info commands ::struct::graph::__node_$cmd]] == 0 } {
+	variable nodeCommands
+	set optlist [join $nodeCommands ", "]
+	set optlist [linsert $optlist "end-1" "or"]
+	error "bad option \"$cmd\": must be $optlist"
+    }
+
+    eval [list ::struct::graph::__node_$cmd $name] $args
+}
+
+# ::struct::graph::__node_degree --
+#
+#	Return the number of arcs adjacent to the specified node.
+#	If one of the restrictions -in or -out is given only
+#	incoming resp. outgoing arcs are counted.
+#
+# Arguments:
+#	name	name of the graph.
+#	args	option, followed by the node.
+#
+# Results:
+#	None.
+
+proc ::struct::graph::__node_degree {name args} {
+
+    if {([llength $args] < 1) || ([llength $args] > 2)} {
+	error "wrong # args: should be \"$name node degree ?-in|-out? node\""
+    }
+
+    switch -exact -- [llength $args] {
+	1 {
+	    set opt {}
+	    set node [lindex $args 0]
+	}
+	2 {
+	    set opt  [lindex $args 0]
+	    set node [lindex $args 1]
+	}
+	default {error "Can't happen, panic"}
+    }
+
+    # Validate the option.
+
+    switch -exact -- $opt {
+	{}   -
+	-in  -
+	-out {}
+	default {
+	    error "invalid option \"$opt\": should be -in or -out"
+	}
+    }
+
+    # Validate the node
+
+    if { ![__node_exists $name $node] } {
+	error "node \"$node\" does not exist in graph \"$name\""
+    }
+
+    upvar ::struct::graph::graph${name}::inArcs   inArcs
+    upvar ::struct::graph::graph${name}::outArcs  outArcs
+
+    switch -exact -- $opt {
+	-in  {
+	    set result [llength $inArcs($node)]
+	}
+	-out {
+	    set result [llength $outArcs($node)]
+	}
+	{} {
+	    set result [expr {[llength $inArcs($node)] \
+		    + [llength $outArcs($node)]}]
+
+	    # loops count twice, don't do <set> arithmetics, i.e. no union!
+	    if {0} {
+		array set coll  {}
+		set result [llength $inArcs($node)]
+
+		foreach e $inArcs($node) {
+		    set coll($e) .
+		}
+		foreach e $outArcs($node) {
+		    if {[info exists coll($e)]} {continue}
+		    incr result
+		    set     coll($e) .
+		}
+	    }
+	}
+	default {error "Can't happen, panic"}
+    }
+
+    return $result
+}
+
+# ::struct::graph::__node_delete --
+#
+#	Remove a node from a graph, including all of its values.
+#	Additionally removes the arcs connected to this node.
+#
+# Arguments:
+#	name	name of the graph.
+#	args	list of the nodes to delete.
+#
+# Results:
+#	None.
+
+proc ::struct::graph::__node_delete {name args} {
+
+    foreach node $args {
+	if { ![__node_exists $name $node] } {
+	    error "node \"$node\" does not exist in graph \"$name\""
+	}
+    }
+
+    upvar ::struct::graph::graph${name}::inArcs  inArcs
+    upvar ::struct::graph::graph${name}::outArcs outArcs
+
+    foreach node $args {
+	# Remove all the arcs connected to this node
+	foreach e $inArcs($node) {
+	    __arc_delete $name $e
+	}
+	foreach e $outArcs($node) {
+	    # Check existence to avoid problems with
+	    # loops (they are in and out arcs! at
+	    # the same time and thus already deleted)
+	    if { [__arc_exists $name $e] } {
+		__arc_delete $name $e
+	    }
+	}
+
+	unset inArcs($node)
+	unset outArcs($node)
+	# FRINK: nocheck
+	unset ::struct::graph::graph${name}::node$node
+    }
+
+    return
+}
+
+# ::struct::graph::__node_exists --
+#
+#	Test for existance of a given node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to look for.
+#
+# Results:
+#	1 if the node exists, 0 else.
+
+proc ::struct::graph::__node_exists {name node} {
+    return [info exists ::struct::graph::graph${name}::inArcs($node)]
+}
+
+# ::struct::graph::__node_get --
+#
+#	Get a keyed value from a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to query.
+#	flag	-key; anything else is an error
+#	key	key to lookup; defaults to data
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::__node_get {name node {flag -key} {key data}} {
+    if { ![__node_exists $name $node] } {
+	error "node \"$node\" does not exist in graph \"$name\""
+    }
+    
+    upvar ::struct::graph::graph${name}::node${node} data
+
+    if { ![info exists data($key)] } {
+	error "invalid key \"$key\" for node \"$node\""
+    }
+
+    return $data($key)
+}
+
+# ::struct::graph::__node_getall --
+#
+#	Get a serialized list of key/value pairs from a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to query.
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::__node_getall {name node args} { 
+    if { ![__node_exists $name $node] } {
+	error "node \"$node\" does not exist in graph \"$name\""
+    }
+
+    if { [llength $args] } {
+	error "wrong # args: should be none"
+    }
+    
+    upvar ::struct::graph::graph${name}::node${node} data
+
+    return [array get data]
+}
+
+# ::struct::graph::__node_keys --
+#
+#	Get a list of keys from a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to query.
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::__node_keys {name node args} { 
+    if { ![__node_exists $name $node] } {
+	error "node \"$node\" does not exist in graph \"$name\""
+    }
+    
+    if { [llength $args] } {
+	error "wrong # args: should be none"
+    }
+
+    upvar ::struct::graph::graph${name}::node${node} data
+
+    return [array names data]
+}
+
+# ::struct::graph::__node_keyexists --
+#
+#	Test for existance of a given key for a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to query.
+#	flag	-key; anything else is an error
+#	key	key to lookup; defaults to data
+#
+# Results:
+#	1 if the key exists, 0 else.
+
+proc ::struct::graph::__node_keyexists {name node {flag -key} {key data}} {
+    if { ![__node_exists $name $node] } {
+	error "node \"$node\" does not exist in graph \"$name\""
+    }
+    
+    if { ![string equal $flag "-key"] } {
+	error "invalid option \"$flag\": should be -key"
+    }
+    
+    upvar ::struct::graph::graph${name}::node${node} data
+
+    return [info exists data($key)]
+}
+
+# ::struct::graph::__node_insert --
+#
+#	Add a node to a graph.
+#
+# Arguments:
+#	name		name of the graph.
+#	args		node to insert; must be unique.  If none is given,
+#			the routine will generate a unique node name.
+#
+# Results:
+#	node		The namee of the new node.
+
+proc ::struct::graph::__node_insert {name args} {
+
+    if { [llength $args] == 0 } {
+	# No node name was given; generate a unique one
+	set node [__generateUniqueNodeName $name]
+    } else {
+	set node [lindex $args 0]
+    }
+
+    if { [__node_exists $name $node] } {
+	error "node \"$node\" already exists in graph \"$name\""
+    }
+    
+    upvar ::struct::graph::graph${name}::inArcs      inArcs
+    upvar ::struct::graph::graph${name}::outArcs     outArcs
+    upvar ::struct::graph::graph${name}::node${node} data
+
+    # Set up the new node
+    set inArcs($node)  [list]
+    set outArcs($node) [list]
+    set data(data) ""
+
+    return $node
+}
+
+# ::struct::graph::__node_opposite --
+#
+#	Retrieve node opposite to the specified one, along the arc.
+#
+# Arguments:
+#	name		name of the graph.
+#	node		node to look up.
+#	arc		arc to look up.
+#
+# Results:
+#	nodex	Node opposite to <node,arc>
+
+proc ::struct::graph::__node_opposite {name node arc} {
+    if {![__node_exists $name $node] } {
+	error "node \"$node\" does not exist in graph \"$name\""
+    }
+    
+    if {![__arc_exists $name $arc] } {
+	error "arc \"$arc\" does not exist in graph \"$name\""
+    }
+
+    upvar ::struct::graph::graph${name}::arcNodes arcNodes
+
+    # Node must be connected to at least one end of the arc.
+
+    if {[string equal $node [lindex $arcNodes($arc) 0]]} {
+	set result [lindex $arcNodes($arc) 1]
+    } elseif {[string equal $node [lindex $arcNodes($arc) 1]]} {
+	set result [lindex $arcNodes($arc) 0]
+    } else {
+	error "node \"$node\" and arc \"$arc\" are not connected\
+		in graph \"$name\""
+    }
+
+    return $result
+}
+
+# ::struct::graph::__node_set --
+#
+#	Set or get a value for a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to modify or query.
+#	args	?-key key? ?value?
+#
+# Results:
+#	val	value associated with the given key of the given node
+
+proc ::struct::graph::__node_set {name node args} {
+    if { ![__node_exists $name $node] } {
+	error "node \"$node\" does not exist in graph \"$name\""
+    }
+    upvar ::struct::graph::graph${name}::node$node data
+
+    if { [llength $args] > 3 } {
+	error "wrong # args: should be \"$name node set $node ?-key key?\
+		?value?\""
+    }
+    
+    set key "data"
+    set haveValue 0
+    if { [llength $args] > 1 } {
+	foreach {flag key} $args break
+	if { ![string match "${flag}*" "-key"] } {
+	    error "invalid option \"$flag\": should be key"
+	}
+	if { [llength $args] == 3 } {
+	    set haveValue 1
+	    set value [lindex $args end]
+	}
+    } elseif { [llength $args] == 1 } {
+	set haveValue 1
+	set value [lindex $args end]
+    }
+
+    if { $haveValue } {
+	# Setting a value
+	return [set data($key) $value]
+    } else {
+	# Getting a value
+	if { ![info exists data($key)] } {
+	    error "invalid key \"$key\" for node \"$node\""
+	}
+	return $data($key)
+    }
+}
+
+# ::struct::graph::__node_append --
+#
+#	Append a value for a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to modify or query.
+#	args	?-key key? value
+#
+# Results:
+#	val	value associated with the given key of the given node
+
+proc ::struct::graph::__node_append {name node args} {
+    if { ![__node_exists $name $node] } {
+	error "node \"$node\" does not exist in graph \"$name\""
+    }
+    upvar ::struct::graph::graph${name}::node$node data
+
+    if { [llength $args] != 1 && [llength $args] != 3 } {
+	error "wrong # args: should be \"$name node append $node ?-key key?\
+		value\""
+    }
+    
+    if { [llength $args] == 3 } {
+	foreach {flag key} $args break
+	if { ![string equal $flag "-key"] } {
+	    error "invalid option \"$flag\": should be -key"
+	}
+    } else {
+	set key "data"
+    }
+
+    set value [lindex $args end]
+
+    return [append data($key) $value]
+}
+
+# ::struct::graph::__node_lappend --
+#
+#	lappend a value for a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to modify or query.
+#	args	?-key key? value
+#
+# Results:
+#	val	value associated with the given key of the given node
+
+proc ::struct::graph::__node_lappend {name node args} {
+    if { ![__node_exists $name $node] } {
+	error "node \"$node\" does not exist in graph \"$name\""
+    }
+    upvar ::struct::graph::graph${name}::node$node data
+
+    if { [llength $args] != 1 && [llength $args] != 3 } {
+	error "wrong # args: should be \"$name node lappend $node ?-key key?\
+		value\""
+    }
+    
+    if { [llength $args] == 3 } {
+	foreach {flag key} $args break
+	if { ![string equal $flag "-key"] } {
+	    error "invalid option \"$flag\": should be -key"
+	}
+    } else {
+	set key "data"
+    }
+
+    set value [lindex $args end]
+
+    return [lappend data($key) $value]
+}
+
+# ::struct::graph::__node_unset --
+#
+#	Remove a keyed value from a node.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to modify.
+#	args	additional args: ?-key key?
+#
+# Results:
+#	None.
+
+proc ::struct::graph::__node_unset {name node {flag -key} {key data}} {
+    if { ![__node_exists $name $node] } {
+	error "node \"$node\" does not exist in graph \"$name\""
+    }
+    
+    if { ![string match "${flag}*" "-key"] } {
+	error "invalid option \"$flag\": should be \"$name node unset\
+		$node ?-key key?\""
+    }
+
+    upvar ::struct::graph::graph${name}::node${node} data
+    if { [info exists data($key)] } {
+	unset data($key)
+    }
+    return
+}
+
+# ::struct::graph::_nodes --
+#
+#	Return a list of all nodes in a graph satisfying some restriction.
+#
+# Arguments:
+#	name	name of the graph.
+#	args	list of options and nodes specifying the restriction.
+#
+# Results:
+#	nodes	list of nodes
+
+proc ::struct::graph::_nodes {name args} {
+
+    # Discriminate between conditions and nodes
+
+    set haveCond 0
+    set haveKey 0
+    set haveValue 0
+    set cond "none"
+    set condNodes [list]
+
+    for {set i 0} {$i < [llength $args]} {incr i} {
+	set arg [lindex $args $i]
+	switch -glob -- $arg {
+	    -in -
+	    -out -
+	    -adj -
+	    -inner -
+	    -embedding {
+		if {$haveCond} {
+		    return -code error "invalid restriction:\
+			    illegal multiple use of\
+			    \"-in\"|\"-out\"|\"-adj\"|\"-inner\"|\"-embedding\""
+		}
+
+		set haveCond 1
+		set cond [string range $arg 1 end]
+	    }
+	    -key {
+		if {$haveKey} {
+		    return -code error {invalid restriction: illegal multiple use of "-key"}
+		}
+
+		incr i
+		set key [lindex $args $i]
+		set haveKey 1
+	    }
+	    -value {
+		if {$haveValue} {
+		    return -code error {invalid restriction: illegal multiple use of "-value"}
+		}
+
+		incr i
+		set value [lindex $args $i]
+		set haveValue 1
+	    }
+	    -* {
+		error "invalid restriction \"$arg\": should be -in, -out,\
+			-adj, -inner, -embedding, -key or -value"
+	    }
+	    default {
+		lappend condNodes $arg
+	    }
+	}
+    }
+
+    # Validate that there are nodes to use in the restriction.
+    # otherwise what's the point?
+    if {$haveCond} {
+	if {[llength $condNodes] == 0} {
+	    set usage "$name nodes ?-key key? ?-value value? ?-in|-out|-adj|-inner|-embedding node node...?"
+	    error "no nodes specified: should be \"$usage\""
+	}
+
+	# Make sure that the specified nodes exist!
+	foreach node $condNodes {
+	    if { ![__node_exists $name $node] } {
+		error "node \"$node\" does not exist in graph \"$name\""
+	    }
+	}
+    }
+
+    # Now we are able to go to work
+    upvar ::struct::graph::graph${name}::inArcs   inArcs
+    upvar ::struct::graph::graph${name}::outArcs  outArcs
+    upvar ::struct::graph::graph${name}::arcNodes arcNodes
+
+    set       nodes [list]
+    array set coll  {}
+
+    switch -exact -- $cond {
+	in {
+	    # Result is all nodes with at least one arc going to
+	    # at least one node in the list of arguments.
+
+	    foreach node $condNodes {
+		foreach e $inArcs($node) {
+		    set n [lindex $arcNodes($e) 0]
+		    if {[info exists coll($n)]} {continue}
+		    lappend nodes    $n
+		    set     coll($n) .
+		}
+	    }
+	}
+	out {
+	    # Result is all nodes with at least one arc coming from
+	    # at least one node in the list of arguments.
+
+	    foreach node $condNodes {
+		foreach e $outArcs($node) {
+		    set n [lindex $arcNodes($e) 1]
+		    if {[info exists coll($n)]} {continue}
+		    lappend nodes    $n
+		    set     coll($n) .
+		}
+	    }
+	}
+	adj {
+	    # Result is all nodes with at least one arc coming from
+	    # or going to at least one node in the list of arguments.
+
+	    foreach node $condNodes {
+		foreach e $inArcs($node) {
+		    set n [lindex $arcNodes($e) 0]
+		    if {[info exists coll($n)]} {continue}
+		    lappend nodes    $n
+		    set     coll($n) .
+		}
+		foreach e $outArcs($node) {
+		    set n [lindex $arcNodes($e) 1]
+		    if {[info exists coll($n)]} {continue}
+		    lappend nodes    $n
+		    set     coll($n) .
+		}
+	    }
+	}
+	inner {
+	    # Result is all nodes from the list! with at least one arc
+	    # coming from or going to at least one node in the list of
+	    # arguments.
+
+	    array set group {}
+	    foreach node $condNodes {
+		set group($node) .
+	    }
+
+	    foreach node $condNodes {
+		foreach e $inArcs($node) {
+		    set n [lindex $arcNodes($e) 0]
+		    if {![info exists group($n)]} {continue}
+		    if { [info exists coll($n)]}  {continue}
+		    lappend nodes    $n
+		    set     coll($n) .
+		}
+		foreach e $outArcs($node) {
+		    set n [lindex $arcNodes($e) 1]
+		    if {![info exists group($n)]} {continue}
+		    if { [info exists coll($n)]}  {continue}
+		    lappend nodes    $n
+		    set     coll($n) .
+		}
+	    }
+	}
+	embedding {
+	    # Result is all nodes with at least one arc coming from
+	    # or going to at least one node in the list of arguments,
+	    # but not in the list itself!
+
+	    array set group {}
+	    foreach node $condNodes {
+		set group($node) .
+	    }
+
+	    foreach node $condNodes {
+		foreach e $inArcs($node) {
+		    set n [lindex $arcNodes($e) 0]
+		    if {[info exists group($n)]} {continue}
+		    if {[info exists coll($n)]}  {continue}
+		    lappend nodes    $n
+		    set     coll($n) .
+		}
+		foreach e $outArcs($node) {
+		    set n [lindex $arcNodes($e) 1]
+		    if {[info exists group($n)]} {continue}
+		    if {[info exists coll($n)]}  {continue}
+		    lappend nodes    $n
+		    set     coll($n) .
+		}
+	    }
+	}
+	none {
+	    set nodes [array names inArcs]
+	}
+	default {error "Can't happen, panic"}
+    }
+
+    #
+    # We have a list of nodes that match the relation to the nodes.
+    # Now filter according to -key and -value.
+    #
+
+    set filteredNodes [list]
+
+    if {$haveKey} {
+	foreach node $nodes {
+	    catch {
+		set nval [__node_get $name $node -key $key]
+		if {$haveValue} {
+		    if {$nval == $value} {
+			lappend filteredNodes $node
+		    }
+		} else {
+		    lappend filteredNodes $node
+		}
+	    }
+	}
+    } else {
+	set filteredNodes $nodes
+    }
+
+    return $filteredNodes
+}
+
+# ::struct::graph::_set --
+#
+#	Set or get a keyed value from the graph itself
+#
+# Arguments:
+#	name	name of the graph.
+#	flag	-key; anything else is an error
+#	args	?-key key? ?value?
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::_set {name args} {
+    upvar ::struct::graph::graph${name}::graphData data
+
+    if { [llength $args] > 3 } {
+	error "wrong # args: should be \"$name set ?-key key?\
+		?value?\""
+    }
+
+    set key "data"
+    set haveValue 0
+    if { [llength $args] > 1 } {
+	foreach {flag key} $args break
+	if { ![string match "${flag}*" "-key"] } {
+	    error "invalid option \"$flag\": should be key"
+	}
+	if { [llength $args] == 3 } {
+	    set haveValue 1
+	    set value [lindex $args end]
+	}
+    } elseif { [llength $args] == 1 } {
+	set haveValue 1
+	set value [lindex $args end]
+    }
+
+    if { $haveValue } {
+	# Setting a value
+	return [set data($key) $value]
+    } else {
+	# Getting a value
+	if { ![info exists data($key)] } {
+	    error "invalid key \"$key\" for graph \"$name\""
+	}
+	return $data($key)
+    }
+}
+
+# ::struct::graph::_swap --
+#
+#	Swap two nodes in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node1	first node to swap.
+#	node2	second node to swap.
+#
+# Results:
+#	None.
+
+proc ::struct::graph::_swap {name node1 node2} {
+    # Can only swap two real nodes
+    if { ![__node_exists $name $node1] } {
+	error "node \"$node1\" does not exist in graph \"$name\""
+    }
+    if { ![__node_exists $name $node2] } {
+	error "node \"$node2\" does not exist in graph \"$name\""
+    }
+
+    # Can't swap a node with itself
+    if { [string equal $node1 $node2] } {
+	error "cannot swap node \"$node1\" with itself"
+    }
+
+    # Swapping nodes means swapping their labels, values and arcs
+    upvar ::struct::graph::graph${name}::outArcs      outArcs
+    upvar ::struct::graph::graph${name}::inArcs       inArcs
+    upvar ::struct::graph::graph${name}::arcNodes     arcNodes
+    upvar ::struct::graph::graph${name}::node${node1} node1Vals
+    upvar ::struct::graph::graph${name}::node${node2} node2Vals
+
+    # Redirect arcs to the new nodes.
+
+    foreach e $inArcs($node1) {
+	set arcNodes($e) [lreplace $arcNodes($e) end end $node2]
+    }
+    foreach e $inArcs($node2) {
+	set arcNodes($e) [lreplace $arcNodes($e) end end $node1]
+    }
+    foreach e $outArcs($node1) {
+	set arcNodes($e) [lreplace $arcNodes($e) 0 0 $node2]
+    }
+    foreach e $outArcs($node2) {
+	set arcNodes($e) [lreplace $arcNodes($e) 0 0 $node1]
+    }
+
+    # Swap arc lists
+
+    set tmp            $inArcs($node1)
+    set inArcs($node1) $inArcs($node2)
+    set inArcs($node2) $tmp
+
+    set tmp             $outArcs($node1)
+    set outArcs($node1) $outArcs($node2)
+    set outArcs($node2) $tmp
+
+    # Swap the values
+    set   value1        [array get node1Vals]
+    unset node1Vals
+    array set node1Vals [array get node2Vals]
+    unset node2Vals
+    array set node2Vals $value1
+
+    return
+}
+
+# ::struct::graph::_unset --
+#
+#	Remove a keyed value from the graph itself
+#
+# Arguments:
+#	name	name of the graph.
+#	flag	-key; anything else is an error
+#	args	additional args: ?-key key?
+#
+# Results:
+#	None.
+
+proc ::struct::graph::_unset {name {flag -key} {key data}} {
+    upvar ::struct::graph::graph${name}::graphData data
+    
+    if { ![string match "${flag}*" "-key"] } {
+	error "invalid option \"$flag\": should be \"$name unset\
+		?-key key?\""
+    }
+
+    if { [info exists data($key)] } {
+	unset data($key)
+    }
+
+    return
+}
+
+# ::struct::graph::_walk --
+#
+#	Walk a graph using a pre-order depth or breadth first
+#	search. Pre-order DFS is the default.  At each node that is visited,
+#	a command will be called with the name of the graph and the node.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node at which to start.
+#	args	additional args: ?-order pre|post|both? ?-type {bfs|dfs}?
+#		-command cmd
+#
+# Results:
+#	None.
+
+proc ::struct::graph::_walk {name node args} {
+    set usage "$name walk $node ?-dir forward|backward?\
+	    ?-order pre|post|both? ?-type {bfs|dfs}? -command cmd"
+
+    if {[llength $args] > 8 || [llength $args] < 2} {
+	error "wrong # args: should be \"$usage\""
+    }
+
+    if { ![__node_exists $name $node] } {
+	error "node \"$node\" does not exist in graph \"$name\""
+    }
+
+    # Set defaults
+    set type  dfs
+    set order pre
+    set cmd   ""
+    set dir   forward
+
+    # Process specified options
+    for {set i 0} {$i < [llength $args]} {incr i} {
+	set flag [lindex $args $i]
+	incr i
+	if { $i >= [llength $args] } {
+	    error "value for \"$flag\" missing: should be \"$usage\""
+	}
+	switch -glob -- $flag {
+	    "-type" {
+		set type [string tolower [lindex $args $i]]
+	    }
+	    "-order" {
+		set order [string tolower [lindex $args $i]]
+	    }
+	    "-command" {
+		set cmd [lindex $args $i]
+	    }
+	    "-dir" {
+		set dir [string tolower [lindex $args $i]]
+	    }
+	    default {
+		error "unknown option \"$flag\": should be \"$usage\""
+	    }
+	}
+    }
+    
+    # Make sure we have a command to run, otherwise what's the point?
+    if { [string equal $cmd ""] } {
+	error "no command specified: should be \"$usage\""
+    }
+
+    # Validate that the given type is good
+    switch -glob -- $type {
+	"dfs" {
+	    set type "dfs"
+	}
+	"bfs" {
+	    set type "bfs"
+	}
+	default {
+	    error "invalid search type \"$type\": should be dfs, or bfs"
+	}
+    }
+    
+    # Validate that the given order is good
+    switch -glob -- $order {
+	"both" {
+	    set order both
+	}
+	"pre" {
+	    set order pre
+	}
+	"post" {
+	    set order post
+	}
+	default {
+	    error "invalid search order \"$order\": should be both,\
+		    pre or post"
+	}
+    }
+
+    # Validate that the given direction is good
+    switch -glob -- $dir {
+	"forward" {
+	    set dir -out
+	}
+	"backward" {
+	    set dir -in
+	}
+	default {
+	    error "invalid search direction \"$dir\": should be\
+		    forward or backward"
+	}
+    }
+
+    # Do the walk
+
+    set st [list ]
+    lappend st $node
+    array set visited {}
+
+    if { [string equal $type "dfs"] } {
+	if { [string equal $order "pre"] } {
+	    # Pre-order Depth-first search
+
+	    while { [llength $st] > 0 } {
+		set node [lindex   $st end]
+		set st   [lreplace $st end end]
+
+		# Evaluate the command at this node
+		set cmdcpy $cmd
+		lappend cmdcpy enter $name $node
+		uplevel 2 $cmdcpy
+
+		set visited($node) .
+
+		# Add this node's neighbours (according to direction)
+		#  Have to add them in reverse order
+		#  so that they will be popped left-to-right
+
+		set next [_nodes $name $dir $node]
+		set len  [llength $next]
+
+		for {set i [expr {$len - 1}]} {$i >= 0} {incr i -1} {
+		    set nextnode [lindex $next $i]
+		    if {[info exists visited($nextnode)]} {
+			# Skip nodes already visited
+			continue
+		    }
+		    lappend st $nextnode
+		}
+	    }
+	} elseif { [string equal $order "post"] } {
+	    # Post-order Depth-first search
+
+	    while { [llength $st] > 0 } {
+		set node [lindex $st end]
+
+		if {[info exists visited($node)]} {
+		    # Second time we are here, pop it,
+		    # then evaluate the command.
+
+		    set st [lreplace $st end end]
+
+		    # Evaluate the command at this node
+		    set cmdcpy $cmd
+		    lappend cmdcpy leave $name $node
+		    uplevel 2 $cmdcpy
+		} else {
+		    # First visit. Remember it.
+		    set visited($node) .
+	    
+		    # Add this node's neighbours.
+		    set next [_nodes $name $dir $node]
+		    set len  [llength $next]
+
+		    for {set i [expr {$len - 1}]} {$i >= 0} {incr i -1} {
+			set nextnode [lindex $next $i]
+			if {[info exists visited($nextnode)]} {
+			    # Skip nodes already visited
+			    continue
+			}
+			lappend st $nextnode
+		    }
+		}
+	    }
+	} else {
+	    # Both-order Depth-first search
+
+	    while { [llength $st] > 0 } {
+		set node [lindex $st end]
+
+		if {[info exists visited($node)]} {
+		    # Second time we are here, pop it,
+		    # then evaluate the command.
+
+		    set st [lreplace $st end end]
+
+		    # Evaluate the command at this node
+		    set cmdcpy $cmd
+		    lappend cmdcpy leave $name $node
+		    uplevel 2 $cmdcpy
+		} else {
+		    # First visit. Remember it.
+		    set visited($node) .
+
+		    # Evaluate the command at this node
+		    set cmdcpy $cmd
+		    lappend cmdcpy enter $name $node
+		    uplevel 2 $cmdcpy
+	    
+		    # Add this node's neighbours.
+		    set next [_nodes $name $dir $node]
+		    set len  [llength $next]
+
+		    for {set i [expr {$len - 1}]} {$i >= 0} {incr i -1} {
+			set nextnode [lindex $next $i]
+			if {[info exists visited($nextnode)]} {
+			    # Skip nodes already visited
+			    continue
+			}
+			lappend st $nextnode
+		    }
+		}
+	    }
+	}
+
+    } else {
+	if { [string equal $order "pre"] } {
+	    # Pre-order Breadth first search
+	    while { [llength $st] > 0 } {
+		set node [lindex $st 0]
+		set st   [lreplace $st 0 0]
+		# Evaluate the command at this node
+		set cmdcpy $cmd
+		lappend cmdcpy enter $name $node
+		uplevel 2 $cmdcpy
+	    
+		set visited($node) .
+
+		# Add this node's neighbours.
+		foreach child [_nodes $name $dir $node] {
+		    if {[info exists visited($child)]} {
+			# Skip nodes already visited
+			continue
+		    }
+		    lappend st $child
+		}
+	    }
+	} else {
+	    # Post-order Breadth first search
+	    # Both-order Breadth first search
+	    # Haven't found anything in Knuth
+	    # and unable to define something
+	    # consistent for myself. Leave it
+	    # out.
+
+	    error "unable to do a ${order}-order breadth first walk"
+	}
+    }
+    return
+}
+
+# ::struct::graph::Union --
+#
+#	Return a list which is the union of the elements
+#	in the specified lists.
+#
+# Arguments:
+#	args	list of lists representing sets.
+#
+# Results:
+#	set	list representing the union of the argument lists.
+
+proc ::struct::graph::Union {args} {
+    switch -- [llength $args] {
+	0 {
+	    return {}
+	}
+	1 {
+	    return [lindex $args 0]
+	}
+	default {
+	    foreach set $args {
+		foreach e $set {
+		    set tmp($e) .
+		}
+	    }
+	    return [array names tmp]
+	}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Get 'graph::graph' into the general structure namespace.
+    namespace import -force graph::graph
+    namespace export graph
+}
+package provide struct::graph 1.2.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graph_c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graph_c.tcl
new file mode 100644
index 00000000..56493b32
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graph_c.tcl
@@ -0,0 +1,158 @@
+# graphc.tcl --
+#
+#       Implementation of a graph data structure for Tcl.
+#       This code based on critcl, API compatible to the PTI [x].
+#       [x] Pure Tcl Implementation.
+#
+# Copyright (c) 2006,2019 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require critcl
+# @sak notprovided struct_graphc
+package provide struct_graphc 2.4.3
+package require Tcl 8.2
+
+namespace eval ::struct {
+    # Supporting code for the main command.
+
+    catch {
+	#critcl::cheaders -g
+	#critcl::debug memory symbols
+    }
+
+    critcl::cheaders graph/*.h
+    critcl::csources graph/*.c
+
+    critcl::ccode {
+	/* -*- c -*- */
+
+	#include <global.h>
+	#include <objcmd.h>
+	#include <graph.h>
+
+	#define USAGE "?name ?=|:=|as|deserialize source??"
+
+	static void gg_delete (ClientData clientData)
+	{
+	    /* Release the whole graph. */
+	    g_delete ((G*) clientData);
+	}
+    }
+
+    # Main command, graph creation.
+
+    critcl::ccommand graph_critcl {dummy interp objc objv} {
+	/* Syntax */
+	/*  - epsilon                         |1 */
+	/*  - name                            |2 */
+	/*  - name =|:=|as|deserialize source |4 */
+
+	CONST char* name;
+	G*          g;
+	Tcl_Obj*    fqn;
+	Tcl_CmdInfo ci;
+
+	if ((objc != 4) && (objc != 2) && (objc != 1)) {
+	    Tcl_WrongNumArgs (interp, 1, objv, USAGE);
+	    return TCL_ERROR;
+	}
+
+	if (objc < 2) {
+	    name = gg_new (interp);
+	} else {
+	    name = Tcl_GetString (objv [1]);
+	}
+
+	if (!Tcl_StringMatch (name, "::*")) {
+	    /* Relative name. Prefix with current namespace */
+
+	    Tcl_Eval (interp, "namespace current");
+	    fqn = Tcl_GetObjResult (interp);
+	    fqn = Tcl_DuplicateObj (fqn);
+	    Tcl_IncrRefCount (fqn);
+
+	    if (!Tcl_StringMatch (Tcl_GetString (fqn), "::")) {
+		Tcl_AppendToObj (fqn, "::", -1);
+	    }
+	    Tcl_AppendToObj (fqn, name, -1);
+	} else {
+	    fqn = Tcl_NewStringObj (name, -1);
+	    Tcl_IncrRefCount (fqn);
+	}
+
+	Tcl_ResetResult (interp);
+
+	if (Tcl_GetCommandInfo (interp, Tcl_GetString (fqn), &ci)) {
+	    Tcl_Obj* err;
+
+	    err = Tcl_NewObj ();
+	    Tcl_AppendToObj    (err, "command \"", -1);
+	    Tcl_AppendObjToObj (err, fqn);
+	    Tcl_AppendToObj    (err, "\" already exists, unable to create graph", -1);
+
+	    Tcl_DecrRefCount (fqn);
+	    Tcl_SetObjResult (interp, err);
+	    return TCL_ERROR;
+	}
+
+	if (objc == 4) {
+	    /* Construction with immediate initialization */
+	    /* through deserialization */
+
+	    Tcl_Obj* type = objv[2];
+	    Tcl_Obj* src  = objv[3];
+	    int      srctype;
+
+	    static CONST char* types [] = {
+		":=", "=", "as", "deserialize", NULL
+	    };
+	    enum types {
+		G_ASSIGN, G_IS, G_AS, G_DESER
+	    };
+
+	    if (Tcl_GetIndexFromObj (interp, type, types, "type", 0, &srctype) != TCL_OK) {
+		Tcl_DecrRefCount (fqn);
+		Tcl_ResetResult  (interp);
+		Tcl_WrongNumArgs (interp, 1, objv, USAGE);
+		return TCL_ERROR;
+	    }
+
+	    g = g_new ();
+
+	    switch (srctype) {
+		case G_ASSIGN:
+		case G_AS:
+		case G_IS:
+		if (g_ms_assign (interp, g, src) != TCL_OK) {
+		    g_delete (g);
+		    Tcl_DecrRefCount (fqn);
+		    return TCL_ERROR;
+		}
+		break;
+
+		case G_DESER:
+		if (g_deserialize (g, interp, src) != TCL_OK) {
+		    g_delete (g);
+		    Tcl_DecrRefCount (fqn);
+		    return TCL_ERROR;
+		}
+		break;
+	    }
+	} else {
+	    g = g_new ();
+	}
+
+	g->cmd = Tcl_CreateObjCommand (interp, Tcl_GetString (fqn),
+                                       g_objcmd, (ClientData) g,
+                                       gg_delete);
+
+	Tcl_SetObjResult (interp, fqn);
+	Tcl_DecrRefCount (fqn);
+	return TCL_OK;
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graph_tcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graph_tcl.tcl
new file mode 100644
index 00000000..a63fd548
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graph_tcl.tcl
@@ -0,0 +1,3279 @@
+# graph_tcl.tcl --
+#
+#	Implementation of a graph data structure for Tcl.
+#
+# Copyright (c) 2000-2009,2019 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Copyright (c) 2008           by Alejandro Paz <vidriloco@gmail.com>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.4
+package require struct::list
+package require struct::set
+
+namespace eval ::struct::graph {
+    # Data storage in the graph module
+    # -------------------------------
+    #
+    # There's a lot of bits to keep track of for each graph:
+    #	nodes
+    #	node values
+    #	node relationships (arcs)
+    #   arc values
+    #
+    # It would quickly become unwieldy to try to keep these in arrays or lists
+    # within the graph namespace itself.  Instead, each graph structure will
+    # get its own namespace.  Each namespace contains:
+    #	node:$node	array mapping keys to values for the node $node
+    #	arc:$arc	array mapping keys to values for the arc $arc
+    #	inArcs		array mapping nodes to the list of incoming arcs
+    #	outArcs		array mapping nodes to the list of outgoing arcs
+    #	arcNodes	array mapping arcs to the two nodes (start & end)
+    
+    # counter is used to give a unique name for unnamed graph
+    variable counter 0
+
+    # Only export one command, the one used to instantiate a new graph
+    namespace export graph_tcl
+}
+
+# ::struct::graph::graph_tcl --
+#
+#	Create a new graph with a given name; if no name is given, use
+#	graphX, where X is a number.
+#
+# Arguments:
+#	name	name of the graph; if null, generate one.
+#
+# Results:
+#	name	name of the graph created
+
+proc ::struct::graph::graph_tcl {args} {
+    variable counter
+    
+    set src     {}
+    set srctype {}
+
+    switch -exact -- [llength [info level 0]] {
+	1 {
+	    # Missing name, generate one.
+	    incr counter
+	    set name "graph${counter}"
+	}
+	2 {
+	    # Standard call. New empty graph.
+	    set name [lindex $args 0]
+	}
+	4 {
+	    # Copy construction.
+	    foreach {name as src} $args break
+	    switch -exact -- $as {
+		= - := - as {
+		    set srctype graph
+		}
+		deserialize {
+		    set srctype serial
+		}
+		default {
+		    return -code error \
+			    "wrong # args: should be \"struct::graph ?name ?=|:=|as|deserialize source??\""
+		}
+	    }
+	}
+	default {
+	    # Error.
+	    return -code error \
+		    "wrong # args: should be \"struct::graph ?name ?=|:=|as|deserialize source??\""
+	}
+    }
+
+    # FIRST, qualify the name.
+    if {![string match "::*" $name]} {
+        # Get caller's namespace; append :: if not global namespace.
+        set ns [uplevel 1 [list namespace current]]
+        if {"::" != $ns} {
+            append ns "::"
+        }
+
+        set name "$ns$name"
+    }
+    if {[llength [info commands $name]]} {
+	return -code error "command \"$name\" already exists, unable to create graph"
+    }
+
+    # Set up the namespace
+    namespace eval $name {
+
+	# Set up the map for values associated with the graph itself
+	variable  graphAttr
+	array set graphAttr {}
+
+	# Set up the node attribute mapping
+	variable  nodeAttr
+	array set nodeAttr {}
+
+	# Set up the arc attribute mapping
+	variable  arcAttr
+	array set arcAttr {}
+
+	# Set up the map from nodes to the arcs coming to them
+	variable  inArcs
+	array set inArcs {}
+
+	# Set up the map from nodes to the arcs going out from them
+	variable  outArcs
+	array set outArcs {}
+
+	# Set up the map from arcs to the nodes they touch.
+	variable  arcNodes
+	array set arcNodes {}
+
+	# Set up a value for use in creating unique node names
+	variable nextUnusedNode
+	set      nextUnusedNode 1
+
+	# Set up a value for use in creating unique arc names
+	variable nextUnusedArc
+	set      nextUnusedArc 1
+
+	# Set up a counter for use in creating attribute arrays.
+	variable nextAttr
+	set      nextAttr 0
+
+        # Set up a map from arcs to their weights. Note: Only arcs
+        # which actually have a weight are recorded in the map, to
+        # keep memory usage down.
+        variable arcWeight
+        array set arcWeight {}
+    }
+
+    # Create the command to manipulate the graph
+    interp alias {} $name {} ::struct::graph::GraphProc $name
+
+    # Automatic execution of assignment if a source
+    # is present.
+    if {$src != {}} {
+	switch -exact -- $srctype {
+	    graph  {_= $name $src}
+	    serial {_deserialize $name $src}
+	    default {
+		return -code error \
+			"Internal error, illegal srctype \"$srctype\""
+	    }
+	}
+    }
+
+    return $name
+}
+
+##########################
+# Private functions follow
+
+# ::struct::graph::GraphProc --
+#
+#	Command that processes all graph object commands.
+#
+# Arguments:
+#	name	name of the graph object to manipulate.
+#	args	command name and args for the command
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::graph::GraphProc {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error "wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+    
+    # Split the args into command and args components
+    set sub _$cmd
+    if { [llength [info commands ::struct::graph::$sub]] == 0 } {
+	set optlist [lsort [info commands ::struct::graph::_*]]
+	set xlist {}
+	foreach p $optlist {
+	    set p [namespace tail $p]
+	    if {[string match __* $p]} {continue}
+	    lappend xlist [string range $p 1 end]
+	}
+	set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	return -code error \
+		"bad option \"$cmd\": must be $optlist"
+    }
+    uplevel 1 [linsert $args 0 ::struct::graph::$sub $name]
+}
+
+# ::struct::graph::_= --
+#
+#	Assignment operator. Copies the source graph into the
+#       destination, destroying the original information.
+#
+# Arguments:
+#	name	Name of the graph object we are copying into.
+#	source	Name of the graph object providing us with the
+#		data to copy.
+#
+# Results:
+#	Nothing.
+
+proc ::struct::graph::_= {name source} {
+    _deserialize $name [$source serialize]
+    return
+}
+
+# ::struct::graph::_--> --
+#
+#	Reverse assignment operator. Copies this graph into the
+#       destination, destroying the original information.
+#
+# Arguments:
+#	name	Name of the graph object to copy
+#	dest	Name of the graph object we are copying to.
+#
+# Results:
+#	Nothing.
+
+proc ::struct::graph::_--> {name dest} {
+    $dest deserialize [_serialize $name]
+    return
+}
+
+# ::struct::graph::_append --
+#
+#	Append a value for an attribute in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	args	key value
+#
+# Results:
+#	val	value associated with the given key of the given arc
+
+proc ::struct::graph::_append {name key value} {
+    variable ${name}::graphAttr
+    return [append    graphAttr($key) $value]
+}
+
+# ::struct::graph::_lappend --
+#
+#	lappend a value for an attribute in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	args	key value
+#
+# Results:
+#	val	value associated with the given key of the given arc
+
+proc ::struct::graph::_lappend {name key value} {
+    variable ${name}::graphAttr
+    return [lappend   graphAttr($key) $value]
+}
+
+# ::struct::graph::_arc --
+#
+#	Dispatches the invocation of arc methods to the proper handler
+#	procedure.
+#
+# Arguments:
+#	name	name of the graph.
+#	cmd	arc command to invoke
+#	args	arguments to propagate to the handler for the arc command
+#
+# Results:
+#	As of the invoked handler.
+
+proc ::struct::graph::_arc {name cmd args} {
+    # Split the args into command and args components
+
+    set sub __arc_$cmd
+    if { [llength [info commands ::struct::graph::$sub]] == 0 } {
+	set optlist [lsort [info commands ::struct::graph::__arc_*]]
+	set xlist {}
+	foreach p $optlist {
+	    set p [namespace tail $p]
+	    lappend xlist [string range $p 6 end]
+	}
+	set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	return -code error \
+		"bad option \"$cmd\": must be $optlist"
+    }
+    uplevel 1 [linsert $args 0 ::struct::graph::$sub $name]
+}
+
+# ::struct::graph::__arc_delete --
+#
+#	Remove an arc from a graph, including all of its values.
+#
+# Arguments:
+#	name	name of the graph.
+#	args	list of arcs to delete.
+#
+# Results:
+#	None.
+
+proc ::struct::graph::__arc_delete {name args} {
+    if {![llength $args]} {
+	return {wrong # args: should be "::struct::graph::__arc_delete name arc arc..."}
+    }
+
+    # seen is used to catch duplicate arcs in the args
+    array set seen {}
+    foreach arc $args {
+	if {[info exists seen($arc)]} {
+	    return -code error "arc \"$arc\" does not exist in graph \"$name\""
+	}
+	CheckMissingArc $name $arc
+	set seen($arc) .
+    }
+
+    variable ${name}::inArcs
+    variable ${name}::outArcs
+    variable ${name}::arcNodes
+    variable ${name}::arcAttr
+    variable ${name}::arcWeight
+
+    foreach arc $args {
+	foreach {source target} $arcNodes($arc) break ; # lassign
+
+	unset arcNodes($arc)
+
+	if {[info exists arcAttr($arc)]} {
+	    unset ${name}::$arcAttr($arc) ;# Note the double indirection here
+	    unset arcAttr($arc)
+	}
+	if {[info exists arcWeight($arc)]} {
+	    unset arcWeight($arc)
+	}
+
+	# Remove arc from the arc lists of source and target nodes.
+
+	set index [lsearch -exact $outArcs($source) $arc]
+	ldelete outArcs($source) $index
+
+	set index [lsearch -exact $inArcs($target)  $arc]
+	ldelete inArcs($target) $index
+    }
+
+    return
+}
+
+# ::struct::graph::__arc_exists --
+#
+#	Test for existence of a given arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to look for.
+#
+# Results:
+#	1 if the arc exists, 0 else.
+
+proc ::struct::graph::__arc_exists {name arc} {
+    return [info exists ${name}::arcNodes($arc)]
+}
+
+# ::struct::graph::__arc_flip --
+#
+#	Exchanges origin and destination node of the specified arc.
+#
+# Arguments:
+#	name		name of the graph object.
+#	arc		arc to change.
+#
+# Results:
+#	None
+
+proc ::struct::graph::__arc_flip {name arc} {
+    CheckMissingArc  $name $arc
+
+    variable ${name}::arcNodes
+    variable ${name}::outArcs
+    variable ${name}::inArcs
+
+    set oldsource [lindex $arcNodes($arc) 0]
+    set oldtarget [lindex $arcNodes($arc) 1]
+
+    if {[string equal $oldsource $oldtarget]} return
+
+    set newtarget $oldsource
+    set newsource $oldtarget
+
+    set arcNodes($arc) [lreplace $arcNodes($arc) 0 0 $newsource]
+    lappend outArcs($newsource) $arc
+    ldelete outArcs($oldsource) [lsearch -exact $outArcs($oldsource) $arc]
+
+    set arcNodes($arc) [lreplace $arcNodes($arc) 1 1 $newtarget]
+    lappend inArcs($newtarget) $arc
+    ldelete inArcs($oldtarget) [lsearch -exact $inArcs($oldtarget) $arc]
+    return
+}
+
+# ::struct::graph::__arc_get --
+#
+#	Get a keyed value from an arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to query.
+#	key	key to lookup
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::__arc_get {name arc key} {
+    CheckMissingArc $name $arc
+
+    variable ${name}::arcAttr
+    if {![info exists arcAttr($arc)]} {
+	# No attribute data for this arc, key has to be invalid.
+	return -code error "invalid key \"$key\" for arc \"$arc\""
+    }
+
+    upvar ${name}::$arcAttr($arc) data
+    if { ![info exists data($key)] } {
+	return -code error "invalid key \"$key\" for arc \"$arc\""
+    }
+    return $data($key)
+}
+
+# ::struct::graph::__arc_getall --
+#
+#	Get a serialized array of key/value pairs from an arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to query.
+#	pattern	optional glob pattern to restrict retrieval
+#
+# Results:
+#	value	serialized array of key/value pairs.
+
+proc ::struct::graph::__arc_getall {name arc {pattern *}} {
+    CheckMissingArc $name $arc
+
+    variable ${name}::arcAttr
+    if {![info exists arcAttr($arc)]} {
+	# No attributes ...
+	return {}
+    }
+
+    upvar ${name}::$arcAttr($arc) data
+    return [array get data $pattern]
+}
+
+# ::struct::graph::__arc_keys --
+#
+#	Get a list of keys for an arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to query.
+#	pattern	optional glob pattern to restrict retrieval
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::__arc_keys {name arc {pattern *}} {
+    CheckMissingArc $name $arc
+
+    variable ${name}::arcAttr
+    if {![info exists arcAttr($arc)]} {
+	# No attributes ...
+	return {}
+    }
+
+    upvar ${name}::$arcAttr($arc) data
+    return [array names data $pattern]
+}
+
+# ::struct::graph::__arc_keyexists --
+#
+#	Test for existence of a given key for a given arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to query.
+#	key	key to lookup
+#
+# Results:
+#	1 if the key exists, 0 else.
+
+proc ::struct::graph::__arc_keyexists {name arc key} {
+    CheckMissingArc $name $arc
+
+    variable ${name}::arcAttr
+    if {![info exists arcAttr($arc)]} {
+	# No attribute data for this arc, key cannot exist.
+	return 0
+    }
+
+    upvar ${name}::$arcAttr($arc) data
+    return [info exists data($key)]
+}
+
+# ::struct::graph::__arc_insert --
+#
+#	Add an arc to a graph.
+#
+# Arguments:
+#	name		name of the graph.
+#	source		source node of the new arc
+#	target		target node of the new arc
+#	args		arc to insert; must be unique.  If none is given,
+#			the routine will generate a unique node name.
+#
+# Results:
+#	arc		The name of the new arc.
+
+proc ::struct::graph::__arc_insert {name source target args} {
+
+    if { [llength $args] == 0 } {
+	# No arc name was given; generate a unique one
+	set arc [__generateUniqueArcName $name]
+    } elseif { [llength $args] > 1 } {
+	return {wrong # args: should be "::struct::graph::__arc_insert name source target ?arc?"}
+    } else {
+	set arc [lindex $args 0]
+    }
+
+    CheckDuplicateArc $name $arc    
+    CheckMissingNode  $name $source {source }
+    CheckMissingNode  $name $target {target }
+    
+    variable ${name}::inArcs
+    variable ${name}::outArcs
+    variable ${name}::arcNodes
+
+    # Set up the new arc
+    set arcNodes($arc) [list $source $target]
+
+    # Add this arc to the arc lists of its source resp. target nodes.
+    lappend outArcs($source) $arc
+    lappend inArcs($target)  $arc
+
+    return $arc
+}
+
+# ::struct::graph::__arc_rename --
+#
+#	Rename a arc in place.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	Name of the arc to rename
+#	newname	The new name of the arc.
+#
+# Results:
+#	The new name of the arc.
+
+proc ::struct::graph::__arc_rename {name arc newname} {
+    CheckMissingArc   $name $arc
+    CheckDuplicateArc $name $newname
+
+    set oldname  $arc
+
+    # Perform the rename in the internal
+    # data structures.
+
+    # - graphAttr - not required, arc independent.
+    # - nodeAttr  - not required, arc independent.
+    # - counters  - not required
+
+    variable ${name}::arcAttr
+    variable ${name}::inArcs
+    variable ${name}::outArcs
+    variable ${name}::arcNodes
+    variable ${name}::arcWeight
+
+    # Arc relocation
+
+    set arcNodes($newname) [set nodes $arcNodes($oldname)]
+    unset                              arcNodes($oldname)
+
+    # Update the two nodes ...
+    foreach {start end} $nodes break
+
+    set pos [lsearch -exact $inArcs($end) $oldname]
+    lset inArcs($end) $pos $newname
+
+    set pos [lsearch -exact $outArcs($start) $oldname]
+    lset outArcs($start) $pos $newname
+
+    if {[info exists arcAttr($oldname)]} {
+	set arcAttr($newname) $arcAttr($oldname)
+	unset                  arcAttr($oldname)
+    }
+
+    if {[info exists arcWeight($oldname)]} {
+	set arcWeight($newname) $arcWeight($oldname)
+	unset                    arcWeight($oldname)
+    }
+
+    return $newname
+}
+
+# ::struct::graph::__arc_set --
+#
+#	Set or get a value for an arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to modify or query.
+#	key	attribute to modify or query
+#	args	?value?
+#
+# Results:
+#	val	value associated with the given key of the given arc
+
+proc ::struct::graph::__arc_set {name arc key args} {
+    if { [llength $args] > 1 } {
+	return -code error "wrong # args: should be \"$name arc set arc key ?value?\""
+    }
+    CheckMissingArc $name $arc
+
+    if { [llength $args] > 0 } {
+	# Setting the value. This may have to create
+	# the attribute array for this particular
+	# node
+
+	variable ${name}::arcAttr
+	if {![info exists arcAttr($arc)]} {
+	    # No attribute data for this node,
+	    # so create it as we need it now.
+	    GenAttributeStorage $name arc $arc
+	}
+
+	upvar ${name}::$arcAttr($arc) data
+	return [set data($key) [lindex $args end]]
+    } else {
+	# Getting a value
+	return [__arc_get $name $arc $key]
+    }
+}
+
+# ::struct::graph::__arc_append --
+#
+#	Append a value for an arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to modify or query.
+#	args	key value
+#
+# Results:
+#	val	value associated with the given key of the given arc
+
+proc ::struct::graph::__arc_append {name arc key value} {
+    CheckMissingArc $name $arc
+
+    variable ${name}::arcAttr
+    if {![info exists arcAttr($arc)]} {
+	# No attribute data for this arc,
+	# so create it as we need it.
+	GenAttributeStorage $name arc $arc
+    }
+
+    upvar ${name}::$arcAttr($arc) data
+    return [append data($key) $value]
+}
+
+# ::struct::graph::__arc_attr --
+#
+#	Return attribute data for one key and multiple arcs, possibly all.
+#
+# Arguments:
+#	name	Name of the graph object.
+#	key	Name of the attribute to retrieve.
+#
+# Results:
+#	children	Dictionary mapping arcs to attribute data.
+
+proc ::struct::graph::__arc_attr {name key args} {
+    # Syntax:
+    #
+    # t attr key
+    # t attr key -arcs {arclist}
+    # t attr key -glob arcpattern
+    # t attr key -regexp arcpattern
+
+    variable ${name}::arcAttr
+
+    set usage "wrong # args: should be \"[list $name] arc attr key ?-arcs list|-glob pattern|-regexp pattern?\""
+    if {([llength $args] != 0) && ([llength $args] != 2)} {
+	return -code error $usage
+    } elseif {[llength $args] == 0} {
+	# This automatically restricts the list
+	# to arcs which can have the attribute
+	# in question.
+
+	set arcs [array names arcAttr]
+    } else {
+	# Determine a list of arcs to look at
+	# based on the chosen restriction.
+
+	foreach {mode value} $args break
+	switch -exact -- $mode {
+	    -arcs {
+		# This is the only branch where we have to
+		# perform an explicit restriction to the
+		# arcs which have attributes.
+		set arcs {}
+		foreach n $value {
+		    if {![info exists arcAttr($n)]} continue
+		    lappend arcs $n
+		}
+	    }
+	    -glob {
+		set arcs [array names arcAttr $value]
+	    }
+	    -regexp {
+		set arcs {}
+		foreach n [array names arcAttr] {
+		    if {![regexp -- $value $n]} continue
+		    lappend arcs $n
+		}
+	    }
+	    default {
+		return -code error "bad type \"$mode\": must be -arcs, -glob, or -regexp"
+	    }
+	}
+    }
+
+    # Without possibly matching arcs
+    # the result has to be empty.
+
+    if {![llength $arcs]} {
+	return {}
+    }
+
+    # Now locate matching keys and their values.
+
+    set result {}
+    foreach n $arcs {
+	upvar ${name}::$arcAttr($n) data
+	if {[info exists data($key)]} {
+	    lappend result $n $data($key)
+	}
+    }
+
+    return $result
+}
+
+# ::struct::graph::__arc_lappend --
+#
+#	lappend a value for an arc in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to modify or query.
+#	args	key value
+#
+# Results:
+#	val	value associated with the given key of the given arc
+
+proc ::struct::graph::__arc_lappend {name arc key value} {
+    CheckMissingArc $name $arc
+
+    variable ${name}::arcAttr
+    if {![info exists arcAttr($arc)]} {
+	# No attribute data for this arc,
+	# so create it as we need it.
+	GenAttributeStorage $name arc $arc
+    }
+
+    upvar ${name}::$arcAttr($arc) data
+    return [lappend data($key) $value]
+}
+
+# ::struct::graph::__arc_source --
+#
+#	Return the node at the beginning of the specified arc.
+#
+# Arguments:
+#	name	name of the graph object.
+#	arc	arc to look up.
+#
+# Results:
+#	node	name of the node.
+
+proc ::struct::graph::__arc_source {name arc} {
+    CheckMissingArc $name $arc
+
+    variable ${name}::arcNodes
+    return [lindex $arcNodes($arc) 0]
+}
+
+# ::struct::graph::__arc_target --
+#
+#	Return the node at the end of the specified arc.
+#
+# Arguments:
+#	name	name of the graph object.
+#	arc	arc to look up.
+#
+# Results:
+#	node	name of the node.
+
+proc ::struct::graph::__arc_target {name arc} {
+    CheckMissingArc $name $arc
+
+    variable ${name}::arcNodes
+    return [lindex $arcNodes($arc) 1]
+}
+
+# ::struct::graph::__arc_nodes --
+#
+#	Return a list containing both source and target nodes of the arc.
+#
+# Arguments:
+#	name		name of the graph object.
+#	arc		arc to look up.
+#
+# Results:
+#	nodes	list containing the names of the connected nodes node.
+#	None
+
+proc ::struct::graph::__arc_nodes {name arc} {
+    CheckMissingArc  $name $arc
+
+    variable ${name}::arcNodes
+    return $arcNodes($arc)
+}
+
+# ::struct::graph::__arc_move-target --
+#
+#	Change the destination node of the specified arc.
+#	The arc is rotated around its origin to a different
+#	node.
+#
+# Arguments:
+#	name		name of the graph object.
+#	arc		arc to change.
+#	newtarget	new destination/target of the arc.
+#
+# Results:
+#	None
+
+proc ::struct::graph::__arc_move-target {name arc newtarget} {
+    CheckMissingArc  $name $arc
+    CheckMissingNode $name $newtarget
+
+    variable ${name}::arcNodes
+    variable ${name}::inArcs
+
+    set oldtarget [lindex $arcNodes($arc) 1]
+    if {[string equal $oldtarget $newtarget]} return
+
+    set arcNodes($arc) [lreplace $arcNodes($arc) 1 1 $newtarget]
+
+    lappend inArcs($newtarget) $arc
+    ldelete inArcs($oldtarget) [lsearch -exact $inArcs($oldtarget) $arc]
+    return
+}
+
+# ::struct::graph::__arc_move-source --
+#
+#	Change the origin node of the specified arc.
+#	The arc is rotated around its destination to a different
+#	node.
+#
+# Arguments:
+#	name		name of the graph object.
+#	arc		arc to change.
+#	newsource	new origin/source of the arc.
+#
+# Results:
+#	None
+
+proc ::struct::graph::__arc_move-source {name arc newsource} {
+    CheckMissingArc  $name $arc
+    CheckMissingNode $name $newsource
+
+    variable ${name}::arcNodes
+    variable ${name}::outArcs
+
+    set oldsource [lindex $arcNodes($arc) 0]
+    if {[string equal $oldsource $newsource]} return
+
+    set arcNodes($arc) [lreplace $arcNodes($arc) 0 0 $newsource]
+
+    lappend outArcs($newsource) $arc
+    ldelete outArcs($oldsource) [lsearch -exact $outArcs($oldsource) $arc]
+    return
+}
+
+# ::struct::graph::__arc_move --
+#
+#	Changes both origin and destination node of the specified arc.
+#
+# Arguments:
+#	name		name of the graph object.
+#	arc		arc to change.
+#	newsource	new origin/source of the arc.
+#	newtarget	new destination/target of the arc.
+#
+# Results:
+#	None
+
+proc ::struct::graph::__arc_move {name arc newsource newtarget} {
+    CheckMissingArc  $name $arc
+    CheckMissingNode $name $newsource
+    CheckMissingNode $name $newtarget
+
+    variable ${name}::arcNodes
+    variable ${name}::outArcs
+    variable ${name}::inArcs
+
+    set oldsource [lindex $arcNodes($arc) 0]
+    if {![string equal $oldsource $newsource]} {
+	set arcNodes($arc) [lreplace $arcNodes($arc) 0 0 $newsource]
+	lappend outArcs($newsource) $arc
+	ldelete outArcs($oldsource) [lsearch -exact $outArcs($oldsource) $arc]
+    }
+
+    set oldtarget [lindex $arcNodes($arc) 1]
+    if {![string equal $oldtarget $newtarget]} {
+	set arcNodes($arc) [lreplace $arcNodes($arc) 1 1 $newtarget]
+	lappend inArcs($newtarget) $arc
+	ldelete inArcs($oldtarget) [lsearch -exact $inArcs($oldtarget) $arc]
+    }
+    return
+}
+
+# ::struct::graph::__arc_unset --
+#
+#	Remove a keyed value from a arc.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to modify.
+#	key	attribute to remove
+#
+# Results:
+#	None.
+
+proc ::struct::graph::__arc_unset {name arc key} {
+    CheckMissingArc $name $arc
+
+    variable ${name}::arcAttr
+    if {![info exists arcAttr($arc)]} {
+	# No attribute data for this arc,
+	# nothing to do.
+	return
+    }
+
+    upvar ${name}::$arcAttr($arc) data
+    catch {unset data($key)}
+
+    if {[array size data] == 0} {
+	# No attributes stored for this arc, squash the whole array.
+	unset arcAttr($arc)
+	unset data
+    }
+    return
+}
+
+# ::struct::graph::__arc_getunweighted --
+#
+#	Return the arcs which have no weight defined.
+#
+# Arguments:
+#	name	name of the graph.
+#
+# Results:
+#	arcs	list of arcs without weights.
+
+proc ::struct::graph::__arc_getunweighted {name} {
+    variable ${name}::arcNodes
+    variable ${name}::arcWeight
+    return [struct::set difference \
+		[array names arcNodes] \
+		[array names arcWeight]]
+}
+
+# ::struct::graph::__arc_getweight --
+#
+#	Get the weight given to an arc in a graph.
+#	Throws an error if the arc has no weight defined for it.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to query.
+#
+# Results:
+#	weight	The weight defined for the arc.
+
+proc ::struct::graph::__arc_getweight {name arc} {
+    CheckMissingArc $name $arc
+
+    variable ${name}::arcWeight
+    if {![info exists arcWeight($arc)]} {
+	return -code error "arc \"$arc\" has no weight"
+    }
+    return $arcWeight($arc)
+}
+
+# ::struct::graph::__arc_setunweighted --
+#
+#	Define a weight for all arcs which have no weight defined.
+#	After this call no arc will be unweighted.
+#
+# Arguments:
+#	name	name of the graph.
+#	defval	weight to give to all unweighted arcs
+#
+# Results:
+#	None
+
+proc ::struct::graph::__arc_setunweighted {name {weight 0}} {
+    variable ${name}::arcWeight
+    foreach arc [__arc_getunweighted $name] {
+	set arcWeight($arc) $weight
+    }
+    return
+}
+
+# ::struct::graph::__arc_setweight --
+#
+#	Define a weight for an arc.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to modify
+#	weight	the weight to set for the arc
+#
+# Results:
+#	weight	The new weight
+
+proc ::struct::graph::__arc_setweight {name arc weight} {
+    CheckMissingArc $name $arc
+
+    variable ${name}::arcWeight
+    set arcWeight($arc) $weight
+    return $weight 
+}
+
+# ::struct::graph::__arc_unsetweight --
+#
+#	Remove the weight for an arc.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to modify
+#
+# Results:
+#	None.
+
+proc ::struct::graph::__arc_unsetweight {name arc} {
+    CheckMissingArc $name $arc
+
+    variable ${name}::arcWeight
+    if {[info exists arcWeight($arc)]} {
+	unset arcWeight($arc)
+    }
+    return
+}
+
+# ::struct::graph::__arc_hasweight --
+#
+#	Remove the weight for an arc.
+#
+# Arguments:
+#	name	name of the graph.
+#	arc	arc to modify
+#
+# Results:
+#	None.
+
+proc ::struct::graph::__arc_hasweight {name arc} {
+    CheckMissingArc $name $arc
+
+    variable ${name}::arcWeight
+    return [info exists arcWeight($arc)]
+}
+
+# ::struct::graph::__arc_weights --
+#
+#	Return the arcs and weights for all arcs which have such.
+#
+# Arguments:
+#	name	name of the graph.
+#
+# Results:
+#	aw	dictionary mapping arcs to their weights.
+
+proc ::struct::graph::__arc_weights {name} {
+    variable ${name}::arcWeight
+    return [array get arcWeight]
+}
+
+# ::struct::graph::_arcs --
+#
+#	Return a list of all arcs in a graph satisfying some
+#	node based restriction.
+#
+# Arguments:
+#	name	name of the graph.
+#
+# Results:
+#	arcs	list of arcs
+
+proc ::struct::graph::_arcs {name args} {
+
+    CheckE $name arcs $args
+
+    switch -exact -- $cond {
+	none      {set arcs [ArcsNONE $name]}
+	in        {set arcs [ArcsIN   $name $condNodes]}
+	out       {set arcs [ArcsOUT  $name $condNodes]}
+	adj       {set arcs [ArcsADJ  $name $condNodes]}
+	inner     {set arcs [ArcsINN  $name $condNodes]}
+	embedding {set arcs [ArcsEMB  $name $condNodes]}
+	default   {return -code error "Can't happen, panic"}
+    }
+
+    #
+    # We have a list of arcs that match the relation to the nodes.
+    # Now filter according to -key and -value.
+    #
+
+    if {$haveKey && $haveValue} {
+	set arcs [ArcsKV $name $key $value $arcs]
+    } elseif {$haveKey} {
+	set arcs [ArcsK $name $key $arcs]
+    }
+
+    #
+    # Apply the general filter command, if specified.
+    #
+
+    if {$haveFilter} {
+	lappend fcmd $name
+	set arcs [uplevel 1 [list ::struct::list filter $arcs $fcmd]]
+    }
+
+    return $arcs
+}
+
+proc ::struct::graph::ArcsIN {name cn} {
+    # arcs -in.	"Arcs going into the node set"
+    #
+    # ARC/in (NS) := { a | target(a) in NS }
+
+    # The result is all arcs going to at least one node in the set
+    # 'cn' of nodes.
+
+    # As an arc has only one destination, i.e. is the
+    # in-arc of exactly one node it is impossible to
+    # count an arc twice. Therefore there is no need
+    # to keep track of arcs to avoid duplicates.
+
+    variable ${name}::inArcs
+
+    set arcs {}
+    foreach node $cn {
+	foreach e $inArcs($node) {
+	    lappend arcs $e
+	}
+    }
+
+    return $arcs
+}
+
+proc ::struct::graph::ArcsOUT {name cn} {
+    # arcs -out. "Arcs coming from the node set"
+    #
+    # ARC/out (NS) := { a | source(a) in NS }
+
+    # The result is all arcs coming from at least one node in the list
+    # of arguments.
+
+    variable ${name}::outArcs
+
+    set arcs {}
+    foreach node $cn {
+	foreach e $outArcs($node) {
+	    lappend arcs $e
+	}
+    }
+
+    return $arcs
+}
+
+proc ::struct::graph::ArcsADJ {name cn} {
+    # arcs -adj. "Arcs adjacent to the node set"
+    #
+    # ARC/adj (NS) := ARC/in (NS) + ARC/out (NS)
+
+    # Result is all arcs coming from or going to at
+    # least one node in the list of arguments.
+
+    return [struct::set union \
+	    [ArcsIN  $name $cn] \
+	    [ArcsOUT $name $cn]]
+    if 0 {
+	# Alternate implementation using arrays,
+	# implementing the set union directly,
+	# intertwined with the data retrieval.
+
+	array set coll  {}
+	foreach node $condNodes {
+	    foreach e $inArcs($node) {
+		if {[info exists coll($e)]} {continue}
+		lappend arcs     $e
+		set     coll($e) .
+	    }
+	    foreach e $outArcs($node) {
+		if {[info exists coll($e)]} {continue}
+		lappend arcs     $e
+		set     coll($e) .
+	    }
+	}
+    }
+}
+
+proc ::struct::graph::ArcsINN {name cn} {
+    # arcs -adj. "Arcs inside the node set"
+    #
+    # ARC/inner (NS) := ARC/in (NS) * ARC/out (NS)
+
+    # Result is all arcs running between nodes
+    # in the list.
+
+    return [struct::set intersect \
+	    [ArcsIN  $name $cn] \
+	    [ArcsOUT $name $cn]]
+    if 0 {
+	# Alternate implementation using arrays,
+	# implementing the set intersection
+	# directly, intertwined with the data
+	# retrieval.
+
+	array set coll  {}
+	# Here we do need 'coll' as each might be an in- and
+	# out-arc for one or two nodes in the list of arguments.
+
+	array set group {}
+	foreach node $condNodes {
+	    set group($node) .
+	}
+
+	foreach node $condNodes {
+	    foreach e $inArcs($node) {
+		set n [lindex $arcNodes($e) 0]
+		if {![info exists group($n)]} {continue}
+		if { [info exists coll($e)]}  {continue}
+		lappend arcs    $e
+		set     coll($e) .
+	    }
+	    # Second iteration over outgoing arcs not
+	    # required. Any arc found above would be found here as
+	    # well, and arcs not recognized above can't be
+	    # recognized by the out loop either.
+	}
+    }
+}
+
+proc ::struct::graph::ArcsEMB {name cn} {
+    # arcs -adj. "Arcs bordering the node set"
+    #
+    # ARC/emb (NS) := ARC/inner (NS) - ARC/adj (NS)
+    # <=> (ARC/in + ARC/out) - (ARC/in * ARC/out)
+    # <=> (ARC/in - ARC/out) + (ARC/out - ARC/in)
+    # <=> symmetric difference (ARC/in, ARC/out)
+
+    # Result is all arcs from -adj minus the arcs from -inner.
+    # IOW all arcs going from a node in the list to a node
+    # which is *not* in the list
+
+    return [struct::set symdiff \
+	    [ArcsIN  $name $cn] \
+	    [ArcsOUT $name $cn]]
+    if 0 {
+	# Alternate implementation using arrays,
+	# implementing the set intersection
+	# directly, intertwined with the data
+	# retrieval.
+
+	# This also means that no arc can be counted twice as it
+	# is either going to a node, or coming from a node in the
+	# list, but it can't do both, because then it is part of
+	# -inner, which was excluded!
+
+	array set group {}
+	foreach node $condNodes {
+	    set group($node) .
+	}
+
+	foreach node $condNodes {
+	    foreach e $inArcs($node) {
+		set n [lindex $arcNodes($e) 0]
+		if {[info exists group($n)]} {continue}
+		# if {[info exists coll($e)]}  {continue}
+		lappend arcs    $e
+		# set     coll($e) .
+	    }
+	    foreach e $outArcs($node) {
+		set n [lindex $arcNodes($e) 1]
+		if {[info exists group($n)]} {continue}
+		# if {[info exists coll($e)]}  {continue}
+		lappend arcs    $e
+		# set     coll($e) .
+	    }
+	}
+    }
+}
+
+proc ::struct::graph::ArcsNONE {name} {
+    variable ${name}::arcNodes
+    return [array names arcNodes]
+}
+
+proc ::struct::graph::ArcsKV {name key value arcs} {
+    set filteredArcs {}
+    foreach arc $arcs {
+	catch {
+	    set aval [__arc_get $name $arc $key]
+	    if {$aval == $value} {
+		lappend filteredArcs $arc
+	    }
+	}
+    }
+    return $filteredArcs
+}
+
+proc ::struct::graph::ArcsK {name key arcs} {
+    set filteredArcs {}
+    foreach arc $arcs {
+	catch {
+	    __arc_get $name $arc $key
+	    lappend filteredArcs $arc
+	}
+    }
+    return $filteredArcs
+}
+
+# ::struct::graph::_deserialize --
+#
+#	Assignment operator. Copies a serialization into the
+#       destination, destroying the original information.
+#
+# Arguments:
+#	name	Name of the graph object we are copying into.
+#	serial	Serialized graph to copy from.
+#
+# Results:
+#	Nothing.
+
+proc ::struct::graph::_deserialize {name serial} {
+    # As we destroy the original graph as part of
+    # the copying process we don't have to deal
+    # with issues like node names from the new graph
+    # interfering with the old ...
+
+    # I. Get the serialization of the source graph
+    #    and check it for validity.
+
+    CheckSerialization $serial \
+	    gattr nattr aattr ina outa arcn arcw
+
+    # Get all the relevant data into the scope
+
+    variable ${name}::graphAttr
+    variable ${name}::nodeAttr
+    variable ${name}::arcAttr
+    variable ${name}::inArcs
+    variable ${name}::outArcs
+    variable ${name}::arcNodes
+    variable ${name}::nextAttr
+    variable ${name}::arcWeight
+
+    # Kill the existing information and insert the new
+    # data in their place.
+
+    array unset inArcs *
+    array unset outArcs *
+    array set   inArcs   [array get ina]
+    array set   outArcs  [array get outa]
+    unset ina outa
+
+    array unset arcNodes *
+    array set   arcNodes [array get arcn]
+    unset arcn
+
+    array unset arcWeight *
+    array set   arcWeight [array get arcw]
+    unset arcw
+
+    set nextAttr 0
+    foreach a [array names nodeAttr] {
+	unset ${name}::$nodeAttr($a)
+    }
+    foreach a [array names arcAttr] {
+	unset ${name}::$arcAttr($a)
+    }
+    foreach n [array names nattr] {
+	GenAttributeStorage $name node $n
+	array set ${name}::$nodeAttr($n) $nattr($n)
+    }
+    foreach a [array names aattr] {
+	GenAttributeStorage $name arc $a
+	array set ${name}::$arcAttr($a) $aattr($a)
+    }
+
+    array unset graphAttr *
+    array set   graphAttr $gattr
+
+    ## Debug ## Dump internals ...
+    if {0} {
+	puts "___________________________________ $name"
+	parray inArcs
+	parray outArcs
+	parray arcNodes
+	parray nodeAttr
+	parray arcAttr
+	parray graphAttr
+	parray arcWeight
+	puts ___________________________________
+    }
+    return
+}
+
+# ::struct::graph::_destroy --
+#
+#	Destroy a graph, including its associated command and data storage.
+#
+# Arguments:
+#	name	name of the graph.
+#
+# Results:
+#	None.
+
+proc ::struct::graph::_destroy {name} {
+    namespace delete $name
+    interp alias {} $name {}
+}
+
+# ::struct::graph::__generateUniqueArcName --
+#
+#	Generate a unique arc name for the given graph.
+#
+# Arguments:
+#	name	name of the graph.
+#
+# Results:
+#	arc	name of a arc guaranteed to not exist in the graph.
+
+proc ::struct::graph::__generateUniqueArcName {name} {
+    variable ${name}::nextUnusedArc
+    while {[__arc_exists $name "arc${nextUnusedArc}"]} {
+	incr nextUnusedArc
+    }
+    return "arc${nextUnusedArc}"
+}
+
+# ::struct::graph::__generateUniqueNodeName --
+#
+#	Generate a unique node name for the given graph.
+#
+# Arguments:
+#	name	name of the graph.
+#
+# Results:
+#	node	name of a node guaranteed to not exist in the graph.
+
+proc ::struct::graph::__generateUniqueNodeName {name} {
+    variable ${name}::nextUnusedNode
+    while {[__node_exists $name "node${nextUnusedNode}"]} {
+	incr nextUnusedNode
+    }
+    return "node${nextUnusedNode}"
+}
+
+# ::struct::graph::_get --
+#
+#	Get a keyed value from the graph itself
+#
+# Arguments:
+#	name	name of the graph.
+#	key	key to lookup
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::_get {name key} {
+    variable  ${name}::graphAttr
+    if { ![info exists graphAttr($key)] } {
+	return -code error "invalid key \"$key\" for graph \"$name\""
+    }
+    return $graphAttr($key)
+}
+
+# ::struct::graph::_getall --
+#
+#	Get an attribute dictionary from a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	pattern	optional, glob pattern
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::_getall {name {pattern *}} { 
+    variable ${name}::graphAttr
+    return [array get graphAttr $pattern]
+}
+
+# ::struct::graph::_keys --
+#
+#	Get a list of keys from a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	pattern	optional, glob pattern
+#
+# Results:
+#	value	list of known keys
+
+proc ::struct::graph::_keys {name {pattern *}} { 
+    variable   ${name}::graphAttr
+    return [array names graphAttr $pattern]
+}
+
+# ::struct::graph::_keyexists --
+#
+#	Test for existence of a given key in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	key	key to lookup
+#
+# Results:
+#	1 if the key exists, 0 else.
+
+proc ::struct::graph::_keyexists {name key} {
+    variable   ${name}::graphAttr
+    return [info exists graphAttr($key)]
+}
+
+# ::struct::graph::_node --
+#
+#	Dispatches the invocation of node methods to the proper handler
+#	procedure.
+#
+# Arguments:
+#	name	name of the graph.
+#	cmd	node command to invoke
+#	args	arguments to propagate to the handler for the node command
+#
+# Results:
+#	As of the the invoked handler.
+
+proc ::struct::graph::_node {name cmd args} {
+    # Split the args into command and args components
+    set sub __node_$cmd
+    if { [llength [info commands ::struct::graph::$sub]] == 0 } {
+	set optlist [lsort [info commands ::struct::graph::__node_*]]
+	set xlist {}
+	foreach p $optlist {
+	    set p [namespace tail $p]
+	    lappend xlist [string range $p 7 end]
+	}
+	set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	return -code error \
+		"bad option \"$cmd\": must be $optlist"
+    }
+    uplevel 1 [linsert $args 0 ::struct::graph::$sub $name]
+}
+
+# ::struct::graph::__node_degree --
+#
+#	Return the number of arcs adjacent to the specified node.
+#	If one of the restrictions -in or -out is given only
+#	incoming resp. outgoing arcs are counted.
+#
+# Arguments:
+#	name	name of the graph.
+#	args	option, followed by the node.
+#
+# Results:
+#	None.
+
+proc ::struct::graph::__node_degree {name args} {
+
+    if {([llength $args] < 1) || ([llength $args] > 2)} {
+	return -code error "wrong # args: should be \"$name node degree ?-in|-out? node\""
+    }
+
+    switch -exact -- [llength $args] {
+	1 {
+	    set opt {}
+	    set node [lindex $args 0]
+	}
+	2 {
+	    set opt  [lindex $args 0]
+	    set node [lindex $args 1]
+	}
+	default {return -code error "Can't happen, panic"}
+    }
+
+    # Validate the option.
+
+    switch -exact -- $opt {
+	{}   -
+	-in  -
+	-out {}
+	default {
+	    return -code error "bad option \"$opt\": must be -in or -out"
+	}
+    }
+
+    # Validate the node
+
+    CheckMissingNode $name $node
+
+    variable ${name}::inArcs
+    variable ${name}::outArcs
+
+    switch -exact -- $opt {
+	-in  {
+	    set result [llength $inArcs($node)]
+	}
+	-out {
+	    set result [llength $outArcs($node)]
+	}
+	{} {
+	    set result [expr {[llength $inArcs($node)] \
+		    + [llength $outArcs($node)]}]
+
+	    # loops count twice, don't do <set> arithmetics, i.e. no union!
+	    if {0} {
+		array set coll  {}
+		set result [llength $inArcs($node)]
+
+		foreach e $inArcs($node) {
+		    set coll($e) .
+		}
+		foreach e $outArcs($node) {
+		    if {[info exists coll($e)]} {continue}
+		    incr result
+		    set     coll($e) .
+		}
+	    }
+	}
+	default {return -code error "Can't happen, panic"}
+    }
+
+    return $result
+}
+
+# ::struct::graph::__node_delete --
+#
+#	Remove a node from a graph, including all of its values.
+#	Additionally removes the arcs connected to this node.
+#
+# Arguments:
+#	name	name of the graph.
+#	args	list of the nodes to delete.
+#
+# Results:
+#	None.
+
+proc ::struct::graph::__node_delete {name args} {
+    if {![llength $args]} {
+	return {wrong # args: should be "::struct::graph::__node_delete name node node..."}
+    }
+    # seen is used to catch duplicate nodes in the args
+    array set seen {}
+    foreach node $args {
+	if {[info exists seen($node)]} {
+	    return -code error "node \"$node\" does not exist in graph \"$name\""
+	}
+	CheckMissingNode $name $node
+	set seen($node) .
+    }
+
+    variable ${name}::inArcs
+    variable ${name}::outArcs
+    variable ${name}::nodeAttr
+
+    foreach node $args {
+	# Remove all the arcs connected to this node
+	foreach e $inArcs($node) {
+	    __arc_delete $name $e
+	}
+	foreach e $outArcs($node) {
+	    # Check existence to avoid problems with
+	    # loops (they are in and out arcs! at
+	    # the same time and thus already deleted)
+	    if { [__arc_exists $name $e] } {
+		__arc_delete $name $e
+	    }
+	}
+
+	unset inArcs($node)
+	unset outArcs($node)
+
+	if {[info exists nodeAttr($node)]} {
+	    unset ${name}::$nodeAttr($node)
+	    unset nodeAttr($node)
+	}
+    }
+
+    return
+}
+
+# ::struct::graph::__node_exists --
+#
+#	Test for existence of a given node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to look for.
+#
+# Results:
+#	1 if the node exists, 0 else.
+
+proc ::struct::graph::__node_exists {name node} {
+    return [info exists ${name}::inArcs($node)]
+}
+
+# ::struct::graph::__node_get --
+#
+#	Get a keyed value from a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to query.
+#	key	key to lookup
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::__node_get {name node key} {
+    CheckMissingNode $name $node
+ 
+    variable ${name}::nodeAttr
+    if {![info exists nodeAttr($node)]} {
+	# No attribute data for this node, key has to be invalid.
+	return -code error "invalid key \"$key\" for node \"$node\""
+    }
+
+    upvar ${name}::$nodeAttr($node) data
+    if { ![info exists data($key)] } {
+	return -code error "invalid key \"$key\" for node \"$node\""
+    }
+    return $data($key)
+}
+
+# ::struct::graph::__node_getall --
+#
+#	Get a serialized list of key/value pairs from a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to query.
+#	pattern	optional glob pattern to restrict retrieval
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::__node_getall {name node {pattern *}} { 
+    CheckMissingNode $name $node
+
+    variable ${name}::nodeAttr
+    if {![info exists nodeAttr($node)]} {
+	# No attributes ...
+	return {}
+    }
+
+    upvar ${name}::$nodeAttr($node) data
+    return [array get data $pattern]
+}
+
+# ::struct::graph::__node_keys --
+#
+#	Get a list of keys from a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to query.
+#	pattern	optional glob pattern to restrict retrieval
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::__node_keys {name node {pattern *}} { 
+    CheckMissingNode $name $node
+
+    variable ${name}::nodeAttr
+    if {![info exists nodeAttr($node)]} {
+	# No attributes ...
+	return {}
+    }
+
+    upvar ${name}::$nodeAttr($node) data
+    return [array names data $pattern]
+}
+
+# ::struct::graph::__node_keyexists --
+#
+#	Test for existence of a given key for a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to query.
+#	key	key to lookup
+#
+# Results:
+#	1 if the key exists, 0 else.
+
+proc ::struct::graph::__node_keyexists {name node key} {
+    CheckMissingNode $name $node
+    
+    variable ${name}::nodeAttr
+    if {![info exists nodeAttr($node)]} {
+	# No attribute data for this node, key cannot exist.
+	return 0
+    }
+
+    upvar ${name}::$nodeAttr($node) data
+    return [info exists data($key)]
+}
+
+# ::struct::graph::__node_insert --
+#
+#	Add a node to a graph.
+#
+# Arguments:
+#	name		name of the graph.
+#	args		node to insert; must be unique.  If none is given,
+#			the routine will generate a unique node name.
+#
+# Results:
+#	node		The name of the new node.
+
+proc ::struct::graph::__node_insert {name args} {
+    if {[llength $args] == 0} {
+	# No node name was given; generate a unique one
+	set args [list [__generateUniqueNodeName $name]]
+    } else {
+	# seen is used to catch duplicate nodes in the args
+	array set seen {}
+	foreach node $args {
+	    if {[info exists seen($node)]} {
+		return -code error "node \"$node\" already exists in graph \"$name\""
+	    }
+	    CheckDuplicateNode $name $node
+	    set seen($node) .
+	}
+    }
+    
+    variable ${name}::inArcs
+    variable ${name}::outArcs
+
+    foreach node $args {
+	# Set up the new node
+	set inArcs($node)  {}
+	set outArcs($node) {}
+    }
+
+    return $args
+}
+
+# ::struct::graph::__node_opposite --
+#
+#	Retrieve node opposite to the specified one, along the arc.
+#
+# Arguments:
+#	name		name of the graph.
+#	node		node to look up.
+#	arc		arc to look up.
+#
+# Results:
+#	nodex	Node opposite to <node,arc>
+
+proc ::struct::graph::__node_opposite {name node arc} {
+    CheckMissingNode $name $node    
+    CheckMissingArc  $name $arc
+
+    variable ${name}::arcNodes
+
+    # Node must be connected to at least one end of the arc.
+
+    if {[string equal $node [lindex $arcNodes($arc) 0]]} {
+	set result [lindex $arcNodes($arc) 1]
+    } elseif {[string equal $node [lindex $arcNodes($arc) 1]]} {
+	set result [lindex $arcNodes($arc) 0]
+    } else {
+	return -code error "node \"$node\" and arc \"$arc\" are not connected\
+		in graph \"$name\""
+    }
+
+    return $result
+}
+
+# ::struct::graph::__node_set --
+#
+#	Set or get a value for a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to modify or query.
+#	key	attribute to modify or query
+#	args	?value?
+#
+# Results:
+#	val	value associated with the given key of the given node
+
+proc ::struct::graph::__node_set {name node key args} {
+    if { [llength $args] > 1 } {
+	return -code error "wrong # args: should be \"$name node set node key ?value?\""
+    }
+    CheckMissingNode $name $node
+    
+    if { [llength $args] > 0 } {
+	# Setting the value. This may have to create
+	# the attribute array for this particular
+	# node
+
+	variable ${name}::nodeAttr
+	if {![info exists nodeAttr($node)]} {
+	    # No attribute data for this node,
+	    # so create it as we need it now.
+	    GenAttributeStorage $name node $node
+	}
+	upvar ${name}::$nodeAttr($node) data
+
+	return [set data($key) [lindex $args end]]
+    } else {
+	# Getting a value
+	return [__node_get $name $node $key]
+    }
+}
+
+# ::struct::graph::__node_append --
+#
+#	Append a value for a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to modify or query.
+#	args	key value
+#
+# Results:
+#	val	value associated with the given key of the given node
+
+proc ::struct::graph::__node_append {name node key value} {
+    CheckMissingNode $name $node
+
+    variable ${name}::nodeAttr
+    if {![info exists nodeAttr($node)]} {
+	# No attribute data for this node,
+	# so create it as we need it.
+	GenAttributeStorage $name node $node
+    }
+
+    upvar ${name}::$nodeAttr($node) data
+    return [append data($key) $value]
+}
+
+# ::struct::graph::__node_attr --
+#
+#	Return attribute data for one key and multiple nodes, possibly all.
+#
+# Arguments:
+#	name	Name of the graph object.
+#	key	Name of the attribute to retrieve.
+#
+# Results:
+#	children	Dictionary mapping nodes to attribute data.
+
+proc ::struct::graph::__node_attr {name key args} {
+    # Syntax:
+    #
+    # t attr key
+    # t attr key -nodes {nodelist}
+    # t attr key -glob nodepattern
+    # t attr key -regexp nodepattern
+
+    variable ${name}::nodeAttr
+
+    set usage "wrong # args: should be \"[list $name] node attr key ?-nodes list|-glob pattern|-regexp pattern?\""
+    if {([llength $args] != 0) && ([llength $args] != 2)} {
+	return -code error $usage
+    } elseif {[llength $args] == 0} {
+	# This automatically restricts the list
+	# to nodes which can have the attribute
+	# in question.
+
+	set nodes [array names nodeAttr]
+    } else {
+	# Determine a list of nodes to look at
+	# based on the chosen restriction.
+
+	foreach {mode value} $args break
+	switch -exact -- $mode {
+	    -nodes {
+		# This is the only branch where we have to
+		# perform an explicit restriction to the
+		# nodes which have attributes.
+		set nodes {}
+		foreach n $value {
+		    if {![info exists nodeAttr($n)]} continue
+		    lappend nodes $n
+		}
+	    }
+	    -glob {
+		set nodes [array names nodeAttr $value]
+	    }
+	    -regexp {
+		set nodes {}
+		foreach n [array names nodeAttr] {
+		    if {![regexp -- $value $n]} continue
+		    lappend nodes $n
+		}
+	    }
+	    default {
+		return -code error "bad type \"$mode\": must be -glob, -nodes, or -regexp"
+	    }
+	}
+    }
+
+    # Without possibly matching nodes
+    # the result has to be empty.
+
+    if {![llength $nodes]} {
+	return {}
+    }
+
+    # Now locate matching keys and their values.
+
+    set result {}
+    foreach n $nodes {
+	upvar ${name}::$nodeAttr($n) data
+	if {[info exists data($key)]} {
+	    lappend result $n $data($key)
+	}
+    }
+
+    return $result
+}
+
+# ::struct::graph::__node_lappend --
+#
+#	lappend a value for a node in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to modify or query.
+#	args	key value
+#
+# Results:
+#	val	value associated with the given key of the given node
+
+proc ::struct::graph::__node_lappend {name node key value} {
+    CheckMissingNode $name $node
+
+    variable ${name}::nodeAttr
+    if {![info exists nodeAttr($node)]} {
+	# No attribute data for this node,
+	# so create it as we need it.
+	GenAttributeStorage $name node $node
+    }
+
+    upvar ${name}::$nodeAttr($node) data
+    return [lappend data($key) $value]
+}
+
+# ::struct::graph::__node_unset --
+#
+#	Remove a keyed value from a node.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node to modify.
+#	key	attribute to remove
+#
+# Results:
+#	None.
+
+proc ::struct::graph::__node_unset {name node key} {
+    CheckMissingNode $name $node
+
+    variable ${name}::nodeAttr
+    if {![info exists nodeAttr($node)]} {
+	# No attribute data for this node,
+	# nothing to do.
+	return
+    }
+
+    upvar ${name}::$nodeAttr($node) data
+    catch {unset data($key)}
+
+    if {[array size data] == 0} {
+	# No attributes stored for this node, squash the whole array.
+	unset nodeAttr($node)
+	unset data
+    }
+    return
+}
+
+# ::struct::graph::_nodes --
+#
+#	Return a list of all nodes in a graph satisfying some restriction.
+#
+# Arguments:
+#	name	name of the graph.
+#	args	list of options and nodes specifying the restriction.
+#
+# Results:
+#	nodes	list of nodes
+
+proc ::struct::graph::_nodes {name args} {
+
+    CheckE $name nodes $args
+
+    switch -exact -- $cond {
+	none      {set nodes [NodesNONE $name]}
+	in        {set nodes [NodesIN   $name $condNodes]}
+	out       {set nodes [NodesOUT  $name $condNodes]}
+	adj       {set nodes [NodesADJ  $name $condNodes]}
+	inner     {set nodes [NodesINN  $name $condNodes]}
+	embedding {set nodes [NodesEMB  $name $condNodes]}
+	default   {return -code error "Can't happen, panic"}
+    }
+
+    #
+    # We have a list of nodes that match the relation to the nodes.
+    # Now filter according to -key and -value.
+    #
+
+    if {$haveKey && $haveValue} {
+	set nodes [NodesKV $name $key $value $nodes]
+    } elseif {$haveKey} {
+	set nodes [NodesK $name $key $nodes]
+    }
+
+    #
+    # Apply the general filter command, if specified.
+    #
+
+    if {$haveFilter} {
+	lappend fcmd $name
+	set nodes [uplevel 1 [list ::struct::list filter $nodes $fcmd]]
+    }
+
+    return $nodes
+}
+
+proc ::struct::graph::NodesIN {name cn} {
+    # nodes -in.
+    # "Neighbours with arcs going into the node set"
+    #
+    # NODES/in (NS) := { source(a) | a in ARC/in (NS) }
+
+    # Result is all nodes with at least one arc going to
+    # at least one node in the list of arguments.
+
+    variable ${name}::inArcs
+    variable ${name}::arcNodes
+
+    set nodes {}
+    array set coll {}
+
+    foreach node $cn {
+	foreach e $inArcs($node) {
+	    set n [lindex $arcNodes($e) 0]
+	    if {[info exists coll($n)]} {continue}
+	    lappend nodes    $n
+	    set     coll($n) .
+	}
+    }
+    return $nodes
+}
+
+proc ::struct::graph::NodesOUT {name cn} {
+    # nodes -out.
+    # "Neighbours with arcs coming from the node set"
+    #
+    # NODES/out (NS) := { target(a) | a in ARC/out (NS) }
+
+    # Result is all nodes with at least one arc coming from
+    # at least one node in the list of arguments.
+
+    variable ${name}::outArcs
+    variable ${name}::arcNodes
+
+    set nodes {}
+    array set coll {}
+
+    foreach node $cn {
+	foreach e $outArcs($node) {
+	    set n [lindex $arcNodes($e) 1]
+	    if {[info exists coll($n)]} {continue}
+	    lappend nodes    $n
+	    set     coll($n) .
+	}
+    }
+    return $nodes
+}
+
+proc ::struct::graph::NodesADJ {name cn} {
+    # nodes -adj.
+    # "Neighbours of the node set"
+    #
+    # NODES/adj (NS) := NODES/in (NS) + NODES/out (NS)
+
+    # Result is all nodes with at least one arc coming from
+    # or going to at least one node in the list of arguments.
+
+    return [struct::set union \
+	    [NodesIN  $name $cn] \
+	    [NodesOUT $name $cn]]
+    if 0 {
+	# Alternate implementation using arrays,
+	# implementing the set union directly,
+	# intertwined with the data retrieval.
+
+	foreach node $cn {
+	    foreach e $inArcs($node) {
+		set n [lindex $arcNodes($e) 0]
+		if {[info exists coll($n)]} {continue}
+		lappend nodes    $n
+		set     coll($n) .
+	    }
+	    foreach e $outArcs($node) {
+		set n [lindex $arcNodes($e) 1]
+		if {[info exists coll($n)]} {continue}
+		lappend nodes    $n
+		set     coll($n) .
+	    }
+	}
+    }
+}
+
+proc ::struct::graph::NodesINN {name cn} {
+    # nodes -adj.
+    # "Inner node of the node set"
+    #
+    # NODES/inner (NS) := NODES/adj (NS) * NS
+
+    # Result is all nodes from the set with at least one arc coming
+    # from or going to at least one node in the set.
+    #
+    # I.e the adjacent nodes also in the set.
+
+    return [struct::set intersect \
+	    [NodesADJ $name $cn] $cn]
+
+    if 0 {
+	# Alternate implementation using arrays,
+	# implementing the set intersect/union
+	# directly, intertwined with the data retrieval.
+
+	array set group {}
+	foreach node $cn {
+	    set group($node) .
+	}
+
+	foreach node $cn {
+	    foreach e $inArcs($node) {
+		set n [lindex $arcNodes($e) 0]
+		if {![info exists group($n)]} {continue}
+		if { [info exists coll($n)]}  {continue}
+		lappend nodes    $n
+		set     coll($n) .
+	    }
+	    foreach e $outArcs($node) {
+		set n [lindex $arcNodes($e) 1]
+		if {![info exists group($n)]} {continue}
+		if { [info exists coll($n)]}  {continue}
+		lappend nodes    $n
+		set     coll($n) .
+	    }
+	}
+    }
+}
+
+proc ::struct::graph::NodesEMB {name cn} {
+    # nodes -embedding.
+    # "Embedding nodes for the node set"
+    #
+    # NODES/emb (NS) := NODES/adj (NS) - NS
+
+    # Result is all nodes with at least one arc coming from or going
+    # to at least one node in the set, but not in the set itself
+    #
+    # I.e the adjacent nodes not in the set.
+
+    # Result is all nodes from the set with at least one arc coming
+    # from or going to at least one node in the set.
+    # I.e the adjacent nodes still in the set.
+
+    return [struct::set difference \
+	    [NodesADJ $name $cn] $cn]
+
+    if 0 {
+	# Alternate implementation using arrays,
+	# implementing the set diff/union directly,
+	# intertwined with the data retrieval.
+
+	array set group {}
+	foreach node $cn {
+	    set group($node) .
+	}
+
+	foreach node $cn {
+	    foreach e $inArcs($node) {
+		set n [lindex $arcNodes($e) 0]
+		if {[info exists group($n)]} {continue}
+		if {[info exists coll($n)]}  {continue}
+		lappend nodes    $n
+		set     coll($n) .
+	    }
+	    foreach e $outArcs($node) {
+		set n [lindex $arcNodes($e) 1]
+		if {[info exists group($n)]} {continue}
+		if {[info exists coll($n)]}  {continue}
+		lappend nodes    $n
+		set     coll($n) .
+	    }
+	}
+    }
+}
+
+proc ::struct::graph::NodesNONE {name} {
+    variable ${name}::inArcs
+    return [array names inArcs]
+}
+
+proc ::struct::graph::NodesKV {name key value nodes} {
+    set filteredNodes {}
+    foreach node $nodes {
+	catch {
+	    set nval [__node_get $name $node $key]
+	    if {$nval == $value} {
+		lappend filteredNodes $node
+	    }
+	}
+    }
+    return $filteredNodes
+}
+
+proc ::struct::graph::NodesK {name key nodes} {
+    set filteredNodes {}
+    foreach node $nodes {
+	catch {
+	    __node_get $name $node $key
+	    lappend filteredNodes $node
+	}
+    }
+    return $filteredNodes
+}
+
+# ::struct::graph::__node_rename --
+#
+#	Rename a node in place.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	Name of the node to rename
+#	newname	The new name of the node.
+#
+# Results:
+#	The new name of the node.
+
+proc ::struct::graph::__node_rename {name node newname} {
+    CheckMissingNode   $name $node
+    CheckDuplicateNode $name $newname
+
+    set oldname  $node
+
+    # Perform the rename in the internal
+    # data structures.
+
+    # - graphAttr - not required, node independent.
+    # - arcAttr   - not required, node independent.
+    # - counters  - not required
+
+    variable ${name}::nodeAttr
+    variable ${name}::inArcs
+    variable ${name}::outArcs
+    variable ${name}::arcNodes
+
+    # Node relocation
+
+    set inArcs($newname)    [set in $inArcs($oldname)]
+    unset                            inArcs($oldname)
+    set outArcs($newname) [set out $outArcs($oldname)]
+    unset                           outArcs($oldname)
+
+    if {[info exists nodeAttr($oldname)]} {
+	set nodeAttr($newname) $nodeAttr($oldname)
+	unset                   nodeAttr($oldname)
+    }
+
+    # Update all relevant arcs.
+    # 8.4: lset ...
+
+    foreach a $in {
+	set arcNodes($a) [list [lindex $arcNodes($a) 0] $newname]
+    }
+    foreach a $out {
+	set arcNodes($a) [list $newname [lindex $arcNodes($a) 1]]
+    }
+
+    return $newname
+}
+
+# ::struct::graph::_serialize --
+#
+#	Serialize a graph object (partially) into a transportable value.
+#	If only a subset of nodes is serialized the result will be a sub-
+#	graph in the mathematical sense of the word: These nodes and all
+#	arcs which are only between these nodes. No arcs to modes outside
+#	of the listed set.
+#
+# Arguments:
+#	name	Name of the graph.
+#	args	list of nodes to place into the serialized graph
+#
+# Results:
+#	A list structure describing the part of the graph which was serialized.
+
+proc ::struct::graph::_serialize {name args} {
+
+    # all - boolean flag - set if and only if the all nodes of the
+    # graph are chosen for serialization. Because if that is true we
+    # can skip the step finding the relevant arcs and simply take all
+    # arcs.
+
+    variable ${name}::arcNodes
+    variable ${name}::arcWeight
+    variable ${name}::inArcs
+
+    set all 0
+    if {[llength $args] > 0} {
+	set nodes [luniq $args]
+	foreach n $nodes {CheckMissingNode $name $n}
+	if {[llength $nodes] == [array size inArcs]} {
+	    set all 1
+	}
+    } else {
+	set nodes [array names inArcs]
+	set all 1
+    }
+
+    if {$all} {
+	set arcs [array names arcNodes]
+    } else {
+	set arcs [eval [linsert $nodes 0 _arcs $name -inner]]
+    }
+
+    variable ${name}::nodeAttr
+    variable ${name}::arcAttr
+    variable ${name}::graphAttr
+
+    set na {}
+    set aa {}
+    array set np {}
+
+    # node indices, attribute data ...
+    set i 0
+    foreach n $nodes {
+	set np($n) [list $i]
+	incr i 3
+
+	if {[info exists nodeAttr($n)]} {
+	    upvar ${name}::$nodeAttr($n) data
+	    lappend np($n) [array get data]
+	} else {
+	    lappend np($n) {}
+	}
+    }
+
+    # arc dictionary
+    set arcdata  {}
+    foreach a $arcs {
+	foreach {src dst} $arcNodes($a) break
+	# Arc information
+
+	set     arc [list $a]
+	lappend arc [lindex $np($dst) 0]
+	if {[info exists arcAttr($a)]} {
+	    upvar ${name}::$arcAttr($a) data
+	    lappend arc [array get data]
+	} else {
+	    lappend arc {}
+	}
+
+	# Add weight information, if there is any.
+
+	if {[info exists arcWeight($a)]} {
+	    lappend arc $arcWeight($a)
+	}
+
+	# Add the information to the node
+	# indices ...
+
+	lappend np($src) $arc
+    }
+
+    # Combine the transient data into one result.
+
+    set result [list]
+    foreach n $nodes {
+	lappend result $n
+	lappend result [lindex $np($n) 1]
+	lappend result [lrange $np($n) 2 end]
+    }
+    lappend result [array get graphAttr]
+
+    return $result
+}
+
+# ::struct::graph::_set --
+#
+#	Set or get a keyed value from the graph itself
+#
+# Arguments:
+#	name	name of the graph.
+#	key	attribute to modify or query
+#	args	?value?
+#
+# Results:
+#	value	value associated with the key given.
+
+proc ::struct::graph::_set {name key args} {
+    if { [llength $args] > 1 } {
+	return -code error "wrong # args: should be \"$name set key ?value?\""
+    }
+    if { [llength $args] > 0 } {
+	variable ${name}::graphAttr
+	return [set graphAttr($key) [lindex $args end]]
+    } else {
+	# Getting a value
+	return [_get $name $key]
+    }
+}
+
+# ::struct::graph::_swap --
+#
+#	Swap two nodes in a graph.
+#
+# Arguments:
+#	name	name of the graph.
+#	node1	first node to swap.
+#	node2	second node to swap.
+#
+# Results:
+#	None.
+
+proc ::struct::graph::_swap {name node1 node2} {
+    # Can only swap two real nodes
+    CheckMissingNode $name $node1
+    CheckMissingNode $name $node2
+
+    # Can't swap a node with itself
+    if { [string equal $node1 $node2] } {
+	return -code error "cannot swap node \"$node1\" with itself"
+    }
+
+    # Swapping nodes means swapping their labels, values and arcs
+    variable ${name}::outArcs
+    variable ${name}::inArcs
+    variable ${name}::arcNodes
+    variable ${name}::nodeAttr
+
+    # Redirect arcs to the new nodes.
+
+    foreach e $inArcs($node1)  {lset arcNodes($e) end $node2}
+    foreach e $inArcs($node2)  {lset arcNodes($e) end $node1}
+    foreach e $outArcs($node1) {lset arcNodes($e) 0 $node2}
+    foreach e $outArcs($node2) {lset arcNodes($e) 0 $node1}
+
+    # Swap arc lists
+
+    set tmp            $inArcs($node1)
+    set inArcs($node1) $inArcs($node2)
+    set inArcs($node2) $tmp
+
+    set tmp             $outArcs($node1)
+    set outArcs($node1) $outArcs($node2)
+    set outArcs($node2) $tmp
+
+    # Swap the values
+    # More complicated now with the possibility that nodes do not have
+    # attribute storage associated with them. But also
+    # simpler as we just have to swap/move the array
+    # reference
+
+    if {
+	[set ia [info exists nodeAttr($node1)]] ||
+	[set ib [info exists nodeAttr($node2)]]
+    } {
+	# At least one of the nodes has attribute data. We simply swap
+	# the references to the arrays containing them. No need to
+	# copy the actual data around.
+
+	if {$ia && $ib} {
+	    set tmp               $nodeAttr($node1)
+	    set nodeAttr($node1) $nodeAttr($node2)
+	    set nodeAttr($node2) $tmp
+	} elseif {$ia} {
+	    set   nodeAttr($node2) $nodeAttr($node1)
+	    unset nodeAttr($node1)
+	} elseif {$ib} {
+	    set   nodeAttr($node1) $nodeAttr($node2)
+	    unset nodeAttr($node2)
+	} else {
+	    return -code error "Impossible condition."
+	}
+    } ; # else: No attribute storage => Nothing to do {}
+
+    return
+}
+
+# ::struct::graph::_unset --
+#
+#	Remove a keyed value from the graph itself
+#
+# Arguments:
+#	name	name of the graph.
+#	key	attribute to remove
+#
+# Results:
+#	None.
+
+proc ::struct::graph::_unset {name key} {
+    variable ${name}::graphAttr
+    if {[info exists  graphAttr($key)]} {
+	unset graphAttr($key)
+    }
+    return
+}
+
+# ::struct::graph::_walk --
+#
+#	Walk a graph using a pre-order depth or breadth first
+#	search. Pre-order DFS is the default.  At each node that is visited,
+#	a command will be called with the name of the graph and the node.
+#
+# Arguments:
+#	name	name of the graph.
+#	node	node at which to start.
+#	args	additional args: ?-order pre|post|both? ?-type {bfs|dfs}?
+#		-command cmd
+#
+# Results:
+#	None.
+
+proc ::struct::graph::_walk {name node args} {
+    set usage "$name walk node ?-dir forward|backward?\
+	    ?-order pre|post|both? ?-type bfs|dfs? -command cmd"
+
+    if {[llength $args] < 2} {
+	return -code error "wrong # args: should be \"$usage\""
+    }
+
+    CheckMissingNode $name $node
+
+    # Set defaults
+    set type  dfs
+    set order pre
+    set cmd   ""
+    set dir   forward
+
+    # Process specified options
+    for {set i 0} {$i < [llength $args]} {incr i} {
+	set flag [lindex $args $i]
+	switch -glob -- $flag {
+	    "-type" {
+		incr i
+		if { $i >= [llength $args] } {
+		    return -code error "value for \"$flag\" missing: should be \"$usage\""
+		}
+		set type [string tolower [lindex $args $i]]
+	    }
+	    "-order" {
+		incr i
+		if { $i >= [llength $args] } {
+		    return -code error "value for \"$flag\" missing: should be \"$usage\""
+		}
+		set order [string tolower [lindex $args $i]]
+	    }
+	    "-command" {
+		incr i
+		if { $i >= [llength $args] } {
+		    return -code error "value for \"$flag\" missing: should be \"$usage\""
+		}
+		set cmd [lindex $args $i]
+	    }
+	    "-dir" {
+		incr i
+		if { $i >= [llength $args] } {
+		    return -code error "value for \"$flag\" missing: should be \"$usage\""
+		}
+		set dir [string tolower [lindex $args $i]]
+	    }
+	    default {
+		return -code error "unknown option \"$flag\": should be \"$usage\""
+	    }
+	}
+    }
+    
+    # Make sure we have a command to run, otherwise what's the point?
+    if { [string equal $cmd ""] } {
+	return -code error "no command specified: should be \"$usage\""
+    }
+
+    # Validate that the given type is good
+    switch -glob -- $type {
+	"dfs" {
+	    set type "dfs"
+	}
+	"bfs" {
+	    set type "bfs"
+	}
+	default {
+	    return -code error "bad search type \"$type\": must be bfs or dfs"
+	}
+    }
+    
+    # Validate that the given order is good
+    switch -glob -- $order {
+	"both" {
+	    set order both
+	}
+	"pre" {
+	    set order pre
+	}
+	"post" {
+	    set order post
+	}
+	default {
+	    return -code error "bad search order \"$order\": must be both,\
+		    pre, or post"
+	}
+    }
+
+    # Validate that the given direction is good
+    switch -glob -- $dir {
+	"forward" {
+	    set dir -out
+	}
+	"backward" {
+	    set dir -in
+	}
+	default {
+	    return -code error "bad search direction \"$dir\": must be\
+		    backward or forward"
+	}
+    }
+
+    # Do the walk
+
+    set st [list ]
+    lappend st $node
+    array set visited {}
+
+    if { [string equal $type "dfs"] } {
+	if { [string equal $order "pre"] } {
+	    # Pre-order Depth-first search
+
+	    while { [llength $st] > 0 } {
+		set node [lindex   $st end]
+		ldelete st end
+
+		# Skip all nodes already visited via some other path
+		# through the graph.
+		if {[info exists visited($node)]} continue
+		
+		# Evaluate the command at this node
+		set cmdcpy $cmd
+		lappend cmdcpy enter $name $node
+		uplevel 1 $cmdcpy
+
+		set visited($node) .
+
+		# Add this node's neighbours (according to direction)
+		#  Have to add them in reverse order
+		#  so that they will be popped left-to-right
+
+		set next [_nodes $name $dir $node]
+		set len  [llength $next]
+
+		for {set i [expr {$len - 1}]} {$i >= 0} {incr i -1} {
+		    set nextnode [lindex $next $i]
+		    if {[info exists visited($nextnode)]} {
+			# Skip nodes already visited
+			continue
+		    }
+		    lappend st $nextnode
+		}
+	    }
+	} elseif { [string equal $order "post"] } {
+	    # Post-order Depth-first search
+
+	    while { [llength $st] > 0 } {
+		set node [lindex $st end]
+
+		if {[info exists visited($node)]} {
+		    # Second time we are here, pop it,
+		    # then evaluate the command.
+
+		    ldelete st end
+		    # Bug 2420330. Note: The visited node may be
+		    # multiple times on the stack (neighbour of more
+		    # than one node). Remove all occurences.
+		    while {[set index [lsearch -exact $st $node]] != -1} {
+			set st [lreplace $st $index $index]
+		    }
+
+		    # Evaluate the command at this node
+		    set cmdcpy $cmd
+		    lappend cmdcpy leave $name $node
+		    uplevel 1 $cmdcpy
+		} else {
+		    # First visit. Remember it.
+		    set visited($node) .
+	    
+		    # Add this node's neighbours.
+		    set next [_nodes $name $dir $node]
+		    set len  [llength $next]
+
+		    for {set i [expr {$len - 1}]} {$i >= 0} {incr i -1} {
+			set nextnode [lindex $next $i]
+			if {[info exists visited($nextnode)]} {
+			    # Skip nodes already visited
+			    continue
+			}
+			lappend st $nextnode
+		    }
+		}
+	    }
+	} else {
+	    # Both-order Depth-first search
+
+	    while { [llength $st] > 0 } {
+		set node [lindex $st end]
+
+		if {[info exists visited($node)]} {
+		    # Second time we are here, pop it,
+		    # then evaluate the command.
+
+		    ldelete st end
+
+		    # Evaluate the command at this node
+		    set cmdcpy $cmd
+		    lappend cmdcpy leave $name $node
+		    uplevel 1 $cmdcpy
+		} else {
+		    # First visit. Remember it.
+		    set visited($node) .
+
+		    # Evaluate the command at this node
+		    set cmdcpy $cmd
+		    lappend cmdcpy enter $name $node
+		    uplevel 1 $cmdcpy
+	    
+		    # Add this node's neighbours.
+		    set next [_nodes $name $dir $node]
+		    set len  [llength $next]
+
+		    for {set i [expr {$len - 1}]} {$i >= 0} {incr i -1} {
+			set nextnode [lindex $next $i]
+			if {[info exists visited($nextnode)]} {
+			    # Skip nodes already visited
+			    continue
+			}
+			lappend st $nextnode
+		    }
+		}
+	    }
+	}
+
+    } else {
+	if { [string equal $order "pre"] } {
+	    # Pre-order Breadth first search
+	    while { [llength $st] > 0 } {
+		set node [lindex $st 0]
+		ldelete st 0
+		# Evaluate the command at this node
+		set cmdcpy $cmd
+		lappend cmdcpy enter $name $node
+		uplevel 1 $cmdcpy
+	    
+		set visited($node) .
+
+		# Add this node's neighbours.
+		foreach child [_nodes $name $dir $node] {
+		    if {[info exists visited($child)]} {
+			# Skip nodes already visited
+			continue
+		    }
+		    lappend st $child
+		}
+	    }
+	} else {
+	    # Post-order Breadth first search
+	    # Both-order Breadth first search
+	    # Haven't found anything in Knuth
+	    # and unable to define something
+	    # consistent for myself. Leave it
+	    # out.
+
+	    return -code error "unable to do a ${order}-order breadth first walk"
+	}
+    }
+    return
+}
+
+# ::struct::graph::Union --
+#
+#	Return a list which is the union of the elements
+#	in the specified lists.
+#
+# Arguments:
+#	args	list of lists representing sets.
+#
+# Results:
+#	set	list representing the union of the argument lists.
+
+proc ::struct::graph::Union {args} {
+    switch -- [llength $args] {
+	0 {
+	    return {}
+	}
+	1 {
+	    return [lindex $args 0]
+	}
+	default {
+	    foreach set $args {
+		foreach e $set {
+		    set tmp($e) .
+		}
+	    }
+	    return [array names tmp]
+	}
+    }
+}
+
+# ::struct::graph::GenAttributeStorage --
+#
+#	Create an array to store the attributes of a node in.
+#
+# Arguments:
+#	name	Name of the graph containing the node
+#	type	Type of object for the attribute
+#	obj	Name of the node or arc which got attributes.
+#
+# Results:
+#	none
+
+proc ::struct::graph::GenAttributeStorage {name type obj} {
+    variable ${name}::nextAttr
+    upvar    ${name}::${type}Attr attribute
+
+    set   attr "a[incr nextAttr]"
+    set   attribute($obj) $attr
+    return
+}
+
+proc ::struct::graph::CheckMissingArc {name arc} {
+    if {![__arc_exists $name $arc]} {
+	return -code error "arc \"$arc\" does not exist in graph \"$name\""
+    }
+}
+
+proc ::struct::graph::CheckMissingNode {name node {prefix {}}} {
+    if {![__node_exists $name $node]} {
+	return -code error "${prefix}node \"$node\" does not exist in graph \"$name\""
+    }
+}
+
+proc ::struct::graph::CheckDuplicateArc {name arc} {
+    if {[__arc_exists $name $arc]} {
+	return -code error "arc \"$arc\" already exists in graph \"$name\""
+    }
+}
+
+proc ::struct::graph::CheckDuplicateNode {name node} {
+    if {[__node_exists $name $node]} {
+	return -code error "node \"$node\" already exists in graph \"$name\""
+    }
+}
+
+proc ::struct::graph::CheckE {name what arguments} {
+
+    # Discriminate between conditions and nodes
+
+    upvar 1 haveCond   haveCond   ; set haveCond   0
+    upvar 1 haveKey    haveKey    ; set haveKey    0
+    upvar 1 key        key        ; set key        {}
+    upvar 1 haveValue  haveValue  ; set haveValue  0
+    upvar 1 value      value      ; set value      {}
+    upvar 1 haveFilter haveFilter ; set haveFilter 0
+    upvar 1 fcmd       fcmd       ; set fcmd       {}
+    upvar 1 cond       cond       ; set cond       "none"
+    upvar 1 condNodes  condNodes  ; set condNodes  {}
+
+    set wa_usage "wrong # args: should be \"$name $what ?-key key? ?-value value? ?-filter cmd? ?-in|-out|-adj|-inner|-embedding node node...?\""
+    set seenodes 0
+    
+    for {set i 0} {$i < [llength $arguments]} {incr i} {
+	set arg [lindex $arguments $i]
+	switch -glob -- $arg {
+	    -in -
+	    -out -
+	    -adj -
+	    -inner -
+	    -embedding {
+		if {$haveCond} {
+		    return -code error "invalid restriction:\
+			    illegal multiple use of\
+			    \"-in\"|\"-out\"|\"-adj\"|\"-inner\"|\"-embedding\""
+		}
+
+		set haveCond 1
+		set cond [string range $arg 1 end]
+		set seenodes 1
+	    }
+	    -key {
+		if {($i + 1) == [llength $arguments]} {
+		    return -code error $wa_usage
+		}
+		if {$haveKey} {
+		    return -code error {invalid restriction: illegal multiple use of "-key"}
+		}
+
+		incr i
+		set key [lindex $arguments $i]
+		set haveKey 1
+		set seenodes 0
+	    }
+	    -value {
+		if {($i + 1) == [llength $arguments]} {
+		    return -code error $wa_usage
+		}
+		if {$haveValue} {
+		    return -code error {invalid restriction: illegal multiple use of "-value"}
+		}
+
+		incr i
+		set value [lindex $arguments $i]
+		set haveValue 1
+		set seenodes 0
+	    }
+	    -filter {
+		if {($i + 1) == [llength $arguments]} {
+		    return -code error $wa_usage
+		}
+		if {$haveFilter} {
+		    return -code error {invalid restriction: illegal multiple use of "-filter"}
+		}
+
+		incr i
+		set fcmd [lindex $arguments $i]
+		set haveFilter 1
+		set seenodes 0
+	    }
+	    -* {
+		if {$seenodes} {
+		    lappend condNodes $arg
+		} else {
+		    return -code error "bad restriction \"$arg\": must be -adj, -embedding,\
+			-filter, -in, -inner, -key, -out, or -value"
+		}
+	    }
+	    default {
+		lappend condNodes $arg
+	    }
+	}
+    }
+
+    # Validate that there are nodes to use in the restriction.
+    # otherwise what's the point?
+    if {$haveCond} {
+	if {[llength $condNodes] == 0} {
+	    return -code error $wa_usage
+	}
+
+	# Remove duplicates. Note: lsort -unique is not present in Tcl
+	# 8.2, thus not usable here.
+
+	array set nx {}
+	foreach c $condNodes {set nx($c) .}
+	set condNodes [array names nx]
+	unset nx
+
+	# Make sure that the specified nodes exist!
+	foreach node $condNodes {CheckMissingNode $name $node}
+    }
+
+    if {$haveValue && !$haveKey} {
+	return -code error {invalid restriction: use of "-value" without "-key"}
+    }
+
+    return
+}
+
+proc ::struct::graph::CheckSerialization {ser gavar navar aavar inavar outavar arcnvar arcwvar} {
+    upvar 1 \
+	    $gavar   graphAttr \
+	    $navar   nodeAttr  \
+	    $aavar   arcAttr   \
+	    $inavar  inArcs    \
+	    $outavar outArcs   \
+	    $arcnvar arcNodes  \
+	    $arcwvar arcWeight
+
+    array set nodeAttr  {}
+    array set arcAttr   {}
+    array set inArcs    {}
+    array set outArcs   {}
+    array set arcNodes  {}
+    array set arcWeight {}
+
+    # Overall length ok ?
+    if {[llength $ser] % 3 != 1} {
+	return -code error \
+		"error in serialization: list length not 1 mod 3."
+    }
+
+    # Attribute length ok ? Dictionary!
+    set graphAttr [lindex $ser end]
+    if {[llength $graphAttr] % 2} {
+	return -code error \
+		"error in serialization: malformed graph attribute dictionary."
+    }
+
+    # Basic decoder pass
+
+    foreach {node attr narcs} [lrange $ser 0 end-1] {
+	if {![info exists inArcs($node)]} {
+	    set inArcs($node)  [list]
+	}
+	set outArcs($node) [list]
+
+	# Attribute length ok ? Dictionary!
+	if {[llength $attr] % 2} {
+	    return -code error \
+		    "error in serialization: malformed node attribute dictionary."
+	}
+	# Remember attribute data only for non-empty nodes
+	if {[llength $attr]} {
+	    set nodeAttr($node) $attr
+	}
+
+	foreach arcd $narcs {
+	    if {
+		([llength $arcd] != 3) &&
+		([llength $arcd] != 4)
+	    } {
+		return -code error \
+			"error in serialization: arc information length not 3 or 4."
+	    }
+
+	    foreach {arc dst aattr} $arcd break
+
+	    if {[info exists arcNodes($arc)]} {
+		return -code error \
+			"error in serialization: duplicate definition of arc \"$arc\"."
+	    }
+
+	    # Attribute length ok ? Dictionary!
+	    if {[llength $aattr] % 2} {
+		return -code error \
+			"error in serialization: malformed arc attribute dictionary."
+	    }
+	    # Remember attribute data only for non-empty nodes
+	    if {[llength $aattr]} {
+		set arcAttr($arc) $aattr
+	    }
+
+	    # Remember weight data if it was specified.
+	    if {[llength $arcd] == 4} {
+		set arcWeight($arc) [lindex $arcd 3]
+	    }
+
+	    # Destination reference ok ?
+	    if {
+		![string is integer -strict $dst] ||
+		($dst % 3) ||
+		($dst < 0) ||
+		($dst >= [llength $ser])
+	    } {
+		return -code error \
+			"error in serialization: bad arc destination reference \"$dst\"."
+	    }
+
+	    # Get destination and reconstruct the
+	    # various relationships.
+
+	    set dstnode [lindex $ser $dst]
+
+	    set arcNodes($arc) [list $node $dstnode]
+	    lappend inArcs($dstnode) $arc
+	    lappend outArcs($node)   $arc
+	}
+    }
+
+    # Duplicate node names ?
+
+    if {[array size outArcs] < ([llength $ser] / 3)} {
+	return -code error \
+		"error in serialization: duplicate node names."
+    }
+
+    # Ok. The data is now ready for the caller.
+    return
+}
+
+##########################
+# Private functions follow
+#
+# Do a compatibility version of [lset] for pre-8.4 versions of Tcl.
+# This version does not do multi-arg [lset]!
+
+proc ::struct::graph::K { x y } { set x }
+
+if { [package vcompare [package provide Tcl] 8.4] < 0 } {
+    proc ::struct::graph::lset { var index arg } {
+	upvar 1 $var list
+	set list [::lreplace [K $list [set list {}]] $index $index $arg]
+    }
+}
+
+proc ::struct::graph::ldelete {var index {end {}}} {
+    upvar 1 $var list
+    if {$end == {}} {set end $index}
+    set list [lreplace [K $list [set list {}]] $index $end]
+    return
+}
+
+proc ::struct::graph::luniq {list} {
+    array set _ {}
+    set result [list]
+    foreach e $list {
+	if {[info exists _($e)]} {continue}
+	lappend result $e
+	set _($e) .
+    }
+    return $result
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Put 'graph::graph' into the general structure namespace
+    # for pickup by the main management.
+
+    namespace import -force graph::graph_tcl
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graphops.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graphops.tcl
new file mode 100644
index 00000000..91ec450d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/graphops.tcl
@@ -0,0 +1,3787 @@
+# graphops.tcl --
+#
+#	Operations on and algorithms for graph data structures.
+#
+# Copyright (c) 2008 Alejandro Paz <vidriloco@gmail.com>, algorithm implementation
+# Copyright (c) 2008 Andreas Kupries, integration with Tcllib's struct::graph
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: graphops.tcl,v 1.19 2009/09/24 19:30:10 andreas_kupries Exp $
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.6
+
+package require struct::disjointset ; # Used by kruskal -- 8.6 required
+package require struct::prioqueue   ; # Used by kruskal, prim
+package require struct::queue       ; # Used by isBipartite?, connectedComponent(Of)
+package require struct::stack       ; # Used by tarjan
+package require struct::graph       ; # isBridge, isCutVertex
+package require struct::tree        ; # Used by BFS
+
+# ### ### ### ######### ######### #########
+##
+
+namespace eval ::struct::graph::op {}
+
+# ### ### ### ######### ######### #########
+##
+
+# This command constructs an adjacency matrix representation of the
+# graph argument.
+
+# Reference: http://en.wikipedia.org/wiki/Adjacency_matrix
+#
+# Note: The reference defines the matrix in such a way that some of
+#       the limitations of the code here are not present. I.e. the
+#       definition at wikipedia deals properly with arc directionality
+#       and parallelism.
+#
+# TODO: Rework the code so that the result is in line with the reference.
+#       Add features to handle weights as well.
+
+proc ::struct::graph::op::toAdjacencyMatrix {g} {
+    set nodeList [lsort -dict [$g nodes]]
+    # Note the lsort. This is used to impose some order on the matrix,
+    # for comparability of results. Otherwise different versions of
+    # Tcl and struct::graph (critcl) may generate different, yet
+    # equivalent matrices, dependent on things like the order a hash
+    # search is done, or nodes have been added to the graph, or ...
+
+    # Fill an array for index tracking later. Note how we start from
+    # index 1. This allows us avoid multiple expr+1 later on when
+    # iterating over the nodes and converting the names to matrix
+    # indices. See (*).
+
+    set i 1
+    foreach n  $nodeList {
+	set nodeDict($n) $i
+	incr i
+    }
+
+    set matrix {}
+    lappend matrix [linsert $nodeList 0 {}]
+
+    # Setting up a template row with all of it's elements set to zero.
+
+    set baseRow 0
+    foreach n $nodeList {
+	lappend baseRow 0
+    }
+
+    foreach node $nodeList {
+
+	# The first element in every row is the name of its
+	# corresponding node. Using lreplace to overwrite the initial
+	# data in the template we get a copy apart from the template,
+	# which we can then modify further.
+
+	set currentRow [lreplace $baseRow 0 0 $node]
+
+	# Iterate over the neighbours, also known as 'adjacent'
+	# rows. The exact set of neighbours depends on the mode.
+
+	foreach neighbour [$g nodes -adj $node] {
+	    # Set value for neighbour on this node list
+	    set at $nodeDict($neighbour)
+
+	    # (*) Here we avoid +1 due to starting from index 1 in the
+	    #     initialization of nodeDict.
+	    set currentRow [lreplace $currentRow $at $at 1]
+	}
+	lappend matrix $currentRow
+    }
+
+    # The resulting matrix is a list of lists, size (n+1)^2 where n =
+    # number of nodes. First row and column (index 0) are node
+    # names. The other entries are boolean flags. True when an arc is
+    # present, False otherwise. The matrix represents an
+    # un-directional form of the graph with parallel arcs collapsed.
+
+    return $matrix
+}
+
+#Adjacency List
+#-------------------------------------------------------------------------------------
+#Procedure creates for graph G, it's representation as Adjacency List.
+#
+#In comparison to Adjacency Matrix it doesn't force using array with quite big
+#size - V^2, where V is a number of vertices ( instead, memory we need is about O(E) ).
+#It's especially important when concerning rare graphs ( graphs with amount of vertices
+#far bigger than amount of edges ). In practise, it turns out that generally,
+#Adjacency List is more effective. Moreover, going through the set of edges take
+#less time ( O(E) instead of O(E^2) ) and adding new edges is rapid.
+#On the other hand, checking if particular edge exists in graph G takes longer
+#( checking if edge {v1,v2} belongs to E(G) in proportion to min{deg(v1,v2)} ).
+#Deleting an edge is also longer - in proportion to max{ deg(v1), deg(v2) }.
+#
+#Input:
+# graph G ( directed or undirected ). Default is undirected.
+#
+#Output:
+# Adjacency List for graph G, represented by dictionary containing lists of adjacent nodes
+#for each node in G (key).
+#
+#Options:
+# -weights - adds to returning dictionary arc weights for each connection between nodes, so
+#each node returned by list as adjacent has additional parameter - weight of arc between him and
+#current node.
+# -directed - sets graph G to be interpreted as directed graph.
+#
+#Reference:
+#http://en.wikipedia.org/wiki/Adjacency_list
+#
+
+proc ::struct::graph::op::toAdjacencyList {G args} {
+
+    set arcTraversal "undirected"
+    set weightsOn 0
+
+    #options for procedure
+    foreach option $args {
+	switch -exact -- $option {
+	    -directed {
+		set arcTraversal "directed"
+	    }
+	    -weights {
+		#checking if all edges have their weights set
+		VerifyWeightsAreOk $G
+		set weightsOn 1
+	    }
+	    default {
+		return -code error "Bad option \"$option\". Expected -directed or -weights"
+	    }
+	}
+    }
+
+    set V [lsort -dict [$G nodes]]
+
+    #mainloop
+    switch -exact -- $arcTraversal {
+	undirected {
+	    #setting up the Adjacency List with nodes
+	    foreach v [lsort -dict [$G nodes]] {
+		dict set AdjacencyList $v {}
+	    }
+	    #appending the edges adjacent to nodes
+	    foreach e [$G arcs] {
+
+		set v [$G arc source $e]
+		set u [$G arc target $e]
+
+		if { !$weightsOn } {
+		    dict lappend AdjacencyList $v $u
+		    dict lappend AdjacencyList $u $v
+		} else {
+		    dict lappend AdjacencyList $v [list $u [$G arc getweight $e]]
+		    dict lappend AdjacencyList $u [list $v [$G arc getweight $e]]
+		}
+	    }
+	    #deleting duplicated edges
+	    foreach x [dict keys $AdjacencyList] {
+		dict set AdjacencyList $x [lsort -unique [dict get $AdjacencyList $x]]
+	    }
+	}
+	directed {
+	    foreach v $V {
+		set E [$G arcs -out $v]
+		set adjNodes {}
+		foreach e $E {
+		    if { !$weightsOn } {
+			lappend adjNodes [$G arc target $e]
+		    } else {
+			lappend adjNodes [list [$G arc target $e] [$G arc getweight $e]]
+		    }
+		}
+		dict set AdjacencyList $v $adjNodes
+	    }
+	}
+	default {
+	    return -code error "Error while executing procedure"
+	}
+    }
+
+    return $AdjacencyList
+}
+
+#Bellman's Ford Algorithm
+#-------------------------------------------------------------------------------------
+#Searching for shortest paths between chosen node and
+#all other nodes in graph G. Based on relaxation method. In comparison to Dijkstra
+#it doesn't assume that all weights on edges are positive. However, this generality
+#costs us time complexity - O(V*E), where V is number of vertices and E is number
+#of edges.
+#
+#Input:
+#Directed graph G, weighted on edges and not containing
+#any cycles with negative sum of weights ( the presence of such cycles means
+#there is no shortest path, since the total weight becomes lower each time the
+#cycle is traversed ). Possible negative weights on edges.
+#
+#Output:
+#dictionary d[u] - distances from start node to each other node in graph G.
+#
+#Reference: http://en.wikipedia.org/wiki/Bellman-Ford_algorithm
+#
+
+proc ::struct::graph::op::BellmanFord { G startnode } {
+
+    #checking if all edges have their weights set
+    VerifyWeightsAreOk $G
+
+    #checking if the startnode exists in given graph G
+    if {![$G node exists $startnode]} {
+	return -code error "node \"$startnode\" does not exist in graph \"$G\""
+    }
+
+    #sets of nodes and edges for graph G
+    set V [$G nodes]
+    set E [$G arcs]
+
+    #initialization
+    foreach i $V {
+	dict set distances $i Inf
+    }
+
+    dict set distances $startnode 0
+
+    #main loop (relaxation)
+    for { set i 1 } { $i <= ([dict size $distances]-1) } { incr i } {
+
+	foreach j $E {
+	    set u [$G arc source $j]	;# start node of edge j
+	    set v [$G arc target $j]	;# end node of edge j
+
+	    if { [ dict get $distances $v ] > [ dict get $distances $u ] + [ $G arc getweight $j ]} {
+		dict set distances $v [ expr {[dict get $distances $u] + [$G arc getweight $j]} ]
+	    }
+	}
+    }
+
+    #checking if there exists cycle with negative sum of weights
+    foreach i $E {
+	set u [$G arc source $i]	;# start node of edge i
+	set v [$G arc target $i]	;# end node of edge i
+
+	if { [dict get $distances $v] > [ dict get $distances $u ] + [$G arc getweight $i] } {
+	    return -code error "Error. Given graph \"$G\" contains cycle with negative sum of weights."
+	}
+    }
+
+    return $distances
+
+}
+
+
+#Johnson's Algorithm
+#-------------------------------------------------------------------------------------
+#Searching paths between all pairs of vertices in graph. For rare graphs
+#asymptotically quicker than Floyd-Warshall's algorithm. Johnson's algorithm
+#uses Bellman-Ford's and Dijkstra procedures.
+#
+#Input:
+#Directed graph G, weighted on edges and not containing
+#any cycles with negative sum of weights ( the presence of such cycles means
+#there is no shortest path, since the total weight becomes lower each time the
+#cycle is traversed ). Possible negative weights on edges.
+#Possible options:
+# 	-filter ( returns only existing distances, cuts all Inf values for
+#  non-existing connections between pairs of nodes )
+#
+#Output:
+# Dictionary containing distances between all pairs of vertices
+#
+#Reference: http://en.wikipedia.org/wiki/Johnson_algorithm
+#
+
+proc ::struct::graph::op::Johnsons { G args } {
+
+    #options for procedure
+    set displaymode 0
+    foreach option $args {
+	switch -exact -- $option {
+	    -filter {
+		set displaymode 1
+	    }
+	    default {
+		return -code error "Bad option \"$option\". Expected -filter"
+	    }
+	}
+    }
+
+    #checking if all edges have their weights set
+    VerifyWeightsAreOk $G
+
+    #Transformation of graph G - adding one more node connected with
+    #each existing node with an edge, which weight is 0
+    set V [$G nodes]
+    set s [$G node insert]
+
+    foreach i $V {
+	if { $i ne $s } {
+	    $G arc insert $s $i
+	}
+    }
+
+    $G arc setunweighted
+
+    #set potential values with Bellman-Ford's
+    set h [BellmanFord $G $s]
+
+    #transformed graph no needed longer - deleting added node and edges
+    $G node delete $s
+
+    #setting new weights for edges in graph G
+    foreach i [$G arcs] {
+	set u [$G arc source $i]
+	set v [$G arc target $i]
+
+	lappend weights [$G arc getweight $i]
+	$G arc setweight $i [ expr { [$G arc getweight $i] + [dict get $h $u] - [dict get $h $v] } ]
+    }
+
+    #finding distances between all pair of nodes with Dijkstra started from each node
+    foreach i [$G nodes] {
+	set dijkstra [dijkstra $G $i -arcmode directed -outputformat distances]
+
+	foreach j [$G nodes] {
+	    if { $i ne $j } {
+		if { $displaymode eq 1 } {
+		    if { [dict get $dijkstra $j] ne "Inf" } {
+			dict set values [list $i $j] [ expr {[ dict get $dijkstra $j] - [dict get $h $i] + [dict get $h $j]} ]
+		    }
+		} else {
+		    dict set values [list $i $j] [ expr {[ dict get $dijkstra $j] - [dict get $h $i] + [dict get $h $j]} ]
+		}
+	    }
+	}
+    }
+
+    #setting back edge weights for graph G
+    set k 0
+    foreach i [$G arcs] {
+	$G arc setweight $i [ lindex $weights $k ]
+	incr k
+    }
+
+    return $values
+}
+
+
+#Floyd-Warshall's Algorithm
+#-------------------------------------------------------------------------------------
+#Searching shortest paths between all pairs of edges in weighted graphs.
+#Time complexity: O(V^3) - where V is number of vertices.
+#Memory complexity: O(V^2)
+#Input: directed weighted graph G
+#Output: dictionary containing shortest distances to each node from each node
+#
+#Algorithm finds solutions dynamically. It compares all possible paths through the graph
+#between each pair of vertices. Graph shouldn't possess any cycle with negative
+#sum of weights ( the presence of such cycles means there is no shortest path,
+#since the total weight becomes lower each time the cycle is traversed ).
+#On the other hand algorithm can be used to find those cycles - if any shortest distance
+#found by algorithm for any nodes v and u (when v is the same node as u) is negative,
+#that node surely belong to at least one negative cycle.
+#
+#Reference: http://en.wikipedia.org/wiki/Floyd-Warshall_algorithm
+#
+
+proc ::struct::graph::op::FloydWarshall { G } {
+
+    VerifyWeightsAreOk $G
+
+    foreach v1 [$G nodes] {
+	foreach v2 [$G nodes] {
+	    dict set values [list $v1 $v2] Inf
+	}
+	dict set values [list $v1 $v1] 0
+    }
+
+    foreach e [$G arcs] {
+	set v1 [$G arc source $e]
+	set v2 [$G arc target $e]
+	dict set values [list $v1 $v2] [$G arc getweight $e]
+    }
+
+    foreach u [$G nodes] {
+	foreach v1 [$G nodes] {
+	    foreach v2 [$G nodes] {
+
+		set x [dict get $values [list $v1 $u]]
+		set y [dict get $values [list $u $v2]]
+		set d [ expr {$x + $y}]
+
+		if { [dict get $values [list $v1 $v2]] > $d } {
+		    dict set values [list $v1 $v2] $d
+		}
+	    }
+	}
+    }
+    #finding negative cycles
+    foreach v [$G nodes] {
+	if { [dict get $values [list $v $v]] < 0 } {
+	    return -code error "Error. Given graph \"$G\" contains cycle with negative sum of weights."
+	}
+    }
+
+    return $values
+}
+
+#Metric Travelling Salesman Problem (TSP) - 2 approximation algorithm
+#-------------------------------------------------------------------------------------
+#Travelling salesman problem is a very popular problem in graph theory, where
+#we are trying to find minimal Hamilton cycle in weighted complete graph. In other words:
+#given a list of cities (nodes) and their pairwise distances (edges), the task is to find
+#a shortest possible tour that visits each city exactly once.
+#TSP problem is NP-Complete, so there is no efficient algorithm to solve it. Greedy methods
+#are getting extremely slow, with the increase in the set of nodes.
+#
+#For this algorithm we consider a case when for given graph G, the triangle inequality is
+#satisfied. So for example, for any three nodes A, B and C the distance between A and C must
+#be at most the distance from A to B plus the distance from B to C. What's important
+#most of the considered cases in TSP problem will satisfy this condition.
+#
+#Input: undirected, weighted graph G
+#Output: approximated solution of minimum Hamilton Cycle - closed path visiting all nodes,
+#each exactly one time.
+#
+#Reference: http://en.wikipedia.org/wiki/Travelling_salesman_problem
+#
+
+proc ::struct::graph::op::MetricTravellingSalesman { G } {
+
+    #checking if graph is connected
+    if { ![isConnected? $G] } {
+	return -code error "Error. Given graph \"$G\" is not a connected graph."
+    }
+    #checking if all weights are set
+    VerifyWeightsAreOk $G
+
+    # Extend graph to make it complete.
+    # NOTE: The graph is modified in place.
+    createCompleteGraph $G originalEdges
+
+    #create minimum spanning tree for graph G
+    set T [prim $G]
+
+    #TGraph - spanning tree of graph G
+    #filling TGraph with edges and nodes
+    set TGraph [createTGraph $G $T 0]
+
+    #finding Hamilton cycle
+    set result [findHamiltonCycle $TGraph $originalEdges $G]
+
+    $TGraph destroy
+
+    # Note: Fleury, which is the algorithm used to find our the cycle
+    # (inside of isEulerian?) is inherently directionless, i.e. it
+    # doesn't care about arc direction. This does not matter if our
+    # input is a symmetric graph, i.e. u->v and v->u have the same
+    # weight for all nodes u, v in G, u != v. But for an asymmetric
+    # graph as our input we really have to check the two possible
+    # directions of the returned tour for the one with the smaller
+    # weight. See test case MetricTravellingSalesman-1.1 for an
+    # exmaple.
+
+    set w {}
+    foreach a [$G arcs] {
+	set u [$G arc source $a]
+	set v [$G arc target $a]
+	set uv [list $u $v]
+	# uv = <$G arc nodes $arc>
+	dict set w $uv [$G arc getweight $a]
+    }
+    foreach k [dict keys $w] {
+	lassign $k u v
+	set vu [list $v $u]
+	if {[dict exists $w $vu]} continue
+	dict set w $vu [dict get $w $k]
+    }
+
+    set reversed [lreverse $result]
+
+    if {[TourWeight $w $result] > [TourWeight $w $reversed]} {
+	return $reversed
+    }
+    return $result
+}
+
+proc ::struct::graph::op::TourWeight {w tour} {
+    set total 0
+    foreach \
+	u [lrange $tour 0 end-1] \
+	v [lrange $tour 1 end] {
+	    set uv [list $u $v]
+	    set total [expr {
+			     $total +
+			     [dict get $w $uv]
+			 }]
+	}
+    return $total
+}
+
+#Christofides Algorithm - for Metric Travelling Salesman Problem (TSP)
+#-------------------------------------------------------------------------------------
+#Travelling salesman problem is a very popular problem in graph theory, where
+#we are trying to find minimal Hamilton cycle in weighted complete graph. In other words:
+#given a list of cities (nodes) and their pairwise distances (edges), the task is to find
+#a shortest possible tour that visits each city exactly once.
+#TSP problem is NP-Complete, so there is no efficient algorithm to solve it. Greedy methods
+#are getting extremely slow, with the increase in the set of nodes.
+#
+#For this algorithm we consider a case when for given graph G, the triangle inequality is
+#satisfied. So for example, for any three nodes A, B and C the distance between A and C must
+#be at most the distance from A to B plus the distance from B to C. What's important
+#most of the considered cases in TSP problem will satisfy this condition.
+#
+#Christofides is a 3/2 approximation algorithm. For a graph given at input, it returns
+#found Hamilton cycle (list of nodes).
+#
+#Reference: http://en.wikipedia.org/wiki/Christofides_algorithm
+#
+
+proc ::struct::graph::op::Christofides { G } {
+
+    #checking if graph is connected
+    if { ![isConnected? $G] } {
+	return -code error "Error. Given graph \"$G\" is not a connected graph."
+    }
+    #checking if all weights are set
+    VerifyWeightsAreOk $G
+
+    createCompleteGraph $G originalEdges
+
+    #create minimum spanning tree for graph G
+    set T [prim $G]
+
+    #setting graph algorithm is working on - spanning tree of graph G
+    set TGraph [createTGraph $G $T 1]
+
+    set oddTGraph [struct::graph]
+
+    foreach v [$TGraph nodes] {
+	if { [$TGraph node degree $v] % 2 == 1 } {
+	    $oddTGraph node insert $v
+	}
+    }
+
+    #create complete graph
+    foreach v [$oddTGraph nodes] {
+	foreach u [$oddTGraph nodes] {
+	    if { ($u ne $v) && ![$oddTGraph arc exists [list $u $v]] } {
+		$oddTGraph arc insert $v $u [list $v $u]
+		$oddTGraph arc setweight [list $v $u] [distance $G $v $u]
+	    }
+
+	}
+    }
+
+    ####
+    #		MAX MATCHING HERE!!!
+    ####
+    set M [GreedyMaxMatching $oddTGraph]
+
+    foreach e [$oddTGraph arcs] {
+	if { ![struct::set contains $M $e] } {
+	    $oddTGraph arc delete $e
+	}
+    }
+
+    #operation: M + T
+    foreach e [$oddTGraph arcs] {
+	set u [$oddTGraph arc source $e]
+	set v [$oddTGraph arc target $e]
+	set uv [list $u $v]
+
+	# Check if the arc in max-matching is parallel or not, to make
+	# sure that we always insert an anti-parallel arc.
+
+	if {[$TGraph arc exists $uv]} {
+	    set vu [list $v $u]
+	    $TGraph arc insert $v $u $vu
+	    $TGraph arc setweight $vu [$oddTGraph arc getweight $e]
+	} else {
+	    $TGraph arc insert $u $v $uv
+	    $TGraph arc setweight $uv [$oddTGraph arc getweight $e]
+	}
+    }
+
+    #finding Hamilton Cycle
+    set result [findHamiltonCycle $TGraph $originalEdges $G]
+    $oddTGraph destroy
+    $TGraph destroy
+    return $result
+}
+
+#Greedy Max Matching procedure, which finds maximal ( not maximum ) matching
+#for given graph G. It adds edges to solution, beginning from edges with the
+#lowest cost.
+
+proc ::struct::graph::op::GreedyMaxMatching {G} {
+
+    set maxMatch {}
+
+    foreach e [sortEdges $G] {
+	set v [$G arc source $e]
+	set u [$G arc target $e]
+	set neighbours [$G arcs -adj $v $u]
+	set noAdjacentArcs 1
+
+	lremove neighbours $e
+
+	foreach a $neighbours {
+	    if { $a in $maxMatch } {
+		set noAdjacentArcs 0
+		break
+	    }
+	}
+	if { $noAdjacentArcs } {
+	    lappend maxMatch $e
+	}
+    }
+
+    return $maxMatch
+}
+
+#Subprocedure which for given graph G, returns the set of edges
+#sorted with their costs.
+proc ::struct::graph::op::sortEdges {G} {
+    set weights [$G arc weights]
+
+    # NOTE: Look at possible rewrite, simplification.
+
+    set sortedEdges {}
+
+    foreach val [lsort [dict values $weights]] {
+	foreach x [dict keys $weights] {
+	    if { [dict get $weights $x] == $val } {
+		set weights [dict remove $weights $x]
+		lappend sortedEdges $x ;#[list $val $x]
+	    }
+	}
+    }
+
+    return $sortedEdges
+}
+
+#Subprocedure, which for given graph G, returns the dictionary
+#containing edges sorted by weights (sortMode -> weights) or
+#nodes sorted by degree (sortMode -> degrees).
+
+proc ::struct::graph::op::sortGraph {G sortMode} {
+
+    switch -exact -- $sortMode {
+	weights {
+	    set weights [$G arc weights]
+	    foreach val [lsort [dict values $weights]] {
+		foreach x [dict keys $weights] {
+		    if { [dict get $weights $x] == $val } {
+			set weights [dict remove $weights $x]
+			dict set sortedVals $x $val
+		    }
+		}
+	    }
+	}
+	degrees {
+	    foreach v [$G nodes] {
+		dict set degrees $v [$G node degree $v]
+	    }
+	    foreach x [lsort -integer -decreasing [dict values $degrees]] {
+		foreach y [dict keys $degrees] {
+		    if { [dict get $degrees $y] == $x } {
+			set degrees [dict remove $degrees $y]
+			dict set sortedVals $y $x
+		    }
+		}
+	    }
+	}
+	default {
+	    return -code error "Unknown sort mode \"$sortMode\", expected weights, or degrees"
+	}
+    }
+
+    return $sortedVals
+}
+
+#Finds Hamilton cycle in given graph G
+#Procedure used by Metric TSP Algorithms:
+#Christofides and Metric TSP 2-approximation algorithm
+
+proc ::struct::graph::op::findHamiltonCycle {G originalEdges originalGraph} {
+
+    isEulerian? $G tourvar tourstart
+
+    # Note: The start node is not necessarily the source node of the
+    # first arc in the tour. The Fleury in isEulerian? may have walked
+    # the arcs against! their direction. See also the note in our
+    # caller (MetricTravellingSalesman).
+
+    # Instead of reconstructing the start node by intersecting the
+    # node-set for first and last arc, we are taking the easy and get
+    # it directly from isEulerian?, as that command knows which node
+    # it had chosen for this.
+
+    lappend result $tourstart
+    lappend tourvar [lindex $tourvar 0]
+
+    set v $tourstart
+    foreach i $tourvar {
+	set u [$G node opposite $v $i]
+
+	if { $u ni $result } {
+	    set va [lindex $result end]
+	    set vb $u
+
+	    if { ([list $va $vb] in $originalEdges) || ([list $vb $va] in $originalEdges) } {
+		lappend result $u
+	    } else {
+
+		set path [dict get [dijkstra $G $va] $vb]
+
+		#reversing the path
+		set path [lreverse $path]
+		#cutting the start element
+		set path [lrange $path 1 end]
+
+		#adding the path and the target element
+		lappend result {*}$path
+		lappend result $vb
+	    }
+	}
+	set v $u
+    }
+
+    set path [dict get [dijkstra $originalGraph [lindex $result 0]] [lindex $result end]]
+    set path [lreverse $path]
+
+    set path [lrange $path 1 end]
+
+    if { [llength $path] } {
+	lappend result {*}$path
+    }
+
+    lappend result $tourstart
+    return $result
+}
+
+#Subprocedure for TSP problems.
+#
+#Creating graph from sets of given nodes and edges.
+#In option doubledArcs we decide, if we want edges to be
+#duplicated or not:
+#0 - duplicated (Metric TSP 2-approximation algorithm)
+#1 - single (Christofides Algorithm)
+#
+#Note that it assumes that graph's edges are properly weighted. That
+#condition is checked before in procedures that use createTGraph, but for
+#other uses it should be taken into consideration.
+#
+
+proc ::struct::graph::op::createTGraph {G Edges doubledArcs} {
+    #checking if given set of edges is proper (all edges are in graph G)
+    foreach e $Edges {
+	if { ![$G arc exists $e] } {
+	    return -code error "Edge \"$e\" doesn't exist in graph \"$G\". Set the proper set of edges."
+	}
+    }
+
+    set TGraph [struct::graph]
+
+    #fill TGraph with nodes
+    foreach v [$G nodes] {
+	$TGraph node insert
+    }
+
+    #fill TGraph with arcs
+    foreach e $Edges {
+	set v [$G arc source $e]
+	set u [$G arc target $e]
+	if { ![$TGraph arc exists [list $u $v]] } {
+	    $TGraph arc insert $u $v [list $u $v]
+	    $TGraph arc setweight [list $u $v] [$G arc getweight $e]
+	}
+	if { !$doubledArcs } {
+	    if { ![$TGraph arc exists [list $v $u]] } {
+		$TGraph arc insert $v $u [list $v $u]
+		$TGraph arc setweight [list $v $u] [$G arc getweight $e]
+	    }
+	}
+    }
+
+    return $TGraph
+}
+
+#Subprocedure for some algorithms, e.g. TSP algorithms.
+#
+#It returns graph filled with arcs missing to say that graph is complete.
+#Also it sets variable originalEdges with edges, which existed in given
+#graph G at beginning, before extending the set of edges.
+#
+
+proc ::struct::graph::op::createCompleteGraph {G originalEdges} {
+
+    upvar $originalEdges st
+    set st {}
+    foreach e [$G arcs] {
+	set v [$G arc source $e]
+	set u [$G arc target $e]
+
+	lappend st [list $v $u]
+    }
+
+    foreach v [$G nodes] {
+	foreach u [$G nodes] {
+	    if { ($u != $v) && ([list $v $u] ni $st) && ([list $u $v] ni $st) && ![$G arc exists [list $u $v]] } {
+		$G arc insert $v $u [list $v $u]
+		$G arc setweight [list $v $u] Inf
+	    }
+	}
+    }
+    return $G
+}
+
+
+#Maximum Cut - 2 approximation algorithm
+#-------------------------------------------------------------------------------------
+#Maximum cut problem is a problem finding a cut not smaller than any other cut. In
+#other words, we divide set of nodes for graph G into such 2 sets of nodes U and V,
+#that the amount of edges connecting U and V is as high as possible.
+#
+#Algorithm is a 2-approximation, so for ALG ( solution returned by Algorithm) and
+#OPT ( optimal solution), such inequality is true: OPT <= 2 * ALG.
+#
+#Input:
+#Graph G
+#U - variable storing first set of nodes (cut) given by solution
+#V - variable storing second set of nodes (cut) given by solution
+#
+#Output:
+#Algorithm returns number of edges between found two sets of nodes.
+#
+#Reference: http://en.wikipedia.org/wiki/Maxcut
+#
+
+proc ::struct::graph::op::MaxCut {G U V} {
+
+    upvar $U _U
+    upvar $V _V
+
+    set _U {}
+    set _V {}
+    set counter 0
+
+    foreach {u v} [lsort -dict [$G nodes]] {
+	lappend _U $u
+	if {$v eq ""} continue
+	lappend _V $v
+    }
+
+    set val 1
+    set ALG [countEdges $G $_U $_V]
+    while {$val>0} {
+	set val [cut $G _U _V $ALG]
+	if { $val > $ALG } {
+	    set ALG $val
+	}
+    }
+    return $ALG
+}
+
+#procedure replaces nodes between sets and checks if that change is profitable
+proc ::struct::graph::op::cut {G Uvar Vvar param} {
+
+    upvar $Uvar U
+    upvar $Vvar V
+    set _V {}
+    set _U {}
+    set value 0
+
+    set maxValue $param
+    set _U $U
+    set _V $V
+
+    foreach v [$G nodes] {
+
+	if { $v ni $_U } {
+	    lappend _U $v
+	    lremove _V $v
+	    set value [countEdges $G $_U $_V]
+	} else {
+	    lappend _V $v
+	    lremove _U $v
+	    set value [countEdges $G $_U $_V]
+	}
+
+	if { $value > $maxValue } {
+	    set U $_U
+	    set V $_V
+	    set maxValue $value
+	} else {
+	    set _V $V
+	    set _U $U
+	}
+    }
+
+    set value $maxValue
+
+    if { $value > $param } {
+	return $value
+    } else {
+	return 0
+    }
+}
+
+#Removing element from the list - auxiliary procedure
+proc ::struct::graph::op::lremove {listVariable value} {
+    upvar 1 $listVariable var
+    set idx [lsearch -exact $var $value]
+    set var [lreplace $var $idx $idx]
+}
+
+#procedure counts edges that link two sets of nodes
+proc ::struct::graph::op::countEdges {G U V} {
+
+    set value 0
+
+    foreach u $U {
+        foreach e [$G arcs -out $u] {
+            set v [$G arc target $e]
+            if {$v ni $V} continue
+            incr value
+        }
+    }
+    foreach v $V {
+        foreach e [$G arcs -out $v] {
+            set u [$G arc target $e]
+            if {$u ni $U} continue
+            incr value
+        }
+    }
+
+    return $value
+}
+
+#K-Center Problem - 2 approximation algorithm
+#-------------------------------------------------------------------------------------
+#Input:
+#Undirected complete graph G, which satisfies triangle inequality.
+#k - positive integer
+#
+#Definition:
+#For any set S ( which is subset of V ) and node v, let the connect(v,S) be the
+#cost of cheapest edge connecting v with any node in S. The goal is to find
+#such S, that |S| = k and max_v{connect(v,S)} is possibly small.
+#
+#In other words, we can use it i.e. for finding best locations in the city ( nodes
+#of input graph ) for placing k buildings, such that those buildings will be as close
+#as possible to all other locations in town.
+#
+#Output:
+#set of nodes - k center for graph G
+#
+
+proc ::struct::graph::op::UnweightedKCenter {G k} {
+
+    #checking if all weights for edges in graph G are set well
+    VerifyWeightsAreOk $G
+
+    #checking if proper value of k is given at input
+    if { $k <= 0 } {
+	return -code error "The \"k\" value must be an positive integer."
+    }
+
+    set j [ expr {$k+1} ]
+
+    #variable for holding the graph G(i) in each iteration
+    set Gi [struct::graph]
+    #two squared graph G
+    set GiSQ [struct::graph]
+    #sorted set of edges for graph G
+    set arcs [sortEdges $G]
+
+    #initializing both graph variables
+    foreach v [$G nodes] {
+	$Gi node insert $v
+	$GiSQ node insert $v
+    }
+
+    #index i for each iteration
+
+    #we seek for final solution, as long as the max independent
+    #set Mi (found in particular iterations), such that |Mi| <= k, is found.
+    for {set index 0} {$j > $k} {incr index} {
+	#source node of an edge we add in current iteration
+	set u [$G arc source [lindex $arcs $index]]
+	#target node of an edge we add in current iteration
+	set v [$G arc target [lindex $arcs $index]]
+
+	#adding edge Ei to graph G(i)
+	$Gi arc insert $u $v [list $u $v]
+	#extending G(i-1)**2 to G(i)**2 using G(i)
+	set GiSQ [extendTwoSquaredGraph $GiSQ $Gi $u $v]
+
+	#finding maximal independent set for G(i)**2
+	set Mi [GreedyMaxIndependentSet $GiSQ]
+
+	#number of nodes in maximal independent set that was found
+	set j [llength $Mi]
+    }
+
+    $Gi destroy
+    $GiSQ destroy
+    return $Mi
+}
+
+#Weighted K-Center - 3 approximation algorithm
+#-------------------------------------------------------------------------------------
+#
+#The variation of unweighted k-center problem. Besides the fact graph is edge-weighted,
+#there are also weights on vertices of input graph G. We've got also restriction
+#W. The goal is to choose such set of nodes S ( which is a subset of V ), that it's
+#total weight is not greater than W and also function: max_v { min_u { cost(u,v) }}
+#has the smallest possible worth ( v is a node in V and u is a node in S ).
+#
+#Note:
+#For more information about K-Center problem check Unweighted K-Center algorithm
+#description.
+
+proc ::struct::graph::op::WeightedKCenter {G nodeWeights W} {
+
+    #checking if all weights for edges in graph G are set well
+    VerifyWeightsAreOk $G
+
+    #checking if proper value of k is given at input
+    if { $W <= 0 } {
+	return -code error "The \"W\" value must be an positive integer."
+    }
+    #initilization
+    set j [ expr {$W+1} ]
+
+    #graphs G(i) and G(i)**2
+    set Gi   [struct::graph]
+    set GiSQ [struct::graph]
+    #the set of arcs for graph G sorted with their weights (increasing)
+    set arcs [sortEdges $G]
+
+    #initialization of graphs G(i) and G(i)**2
+    foreach v [$G nodes] {
+	$Gi   node insert $v
+	$GiSQ node insert $v
+    }
+
+    #the main loop - iteration over all G(i)'s and G(i)**2's,
+    #extended with each iteration till the solution is found
+
+    foreach arc $arcs {
+	#initilization of the set of nodes, which are cheapest neighbours
+	#for particular nodes in maximal independent set
+	set Si {}
+
+	set u [$G arc source $arc]
+	set v [$G arc target $arc]
+
+	#extending graph G(i)
+	$Gi arc insert $u $v [list $u $v]
+
+	#extending graph G(i)**2 from G(i-1)**2 using G(i)
+	set GiSQ [extendTwoSquaredGraph $GiSQ $Gi $u $v]
+
+	#finding maximal independent set (Mi) for graph G(i)**2 found in the
+	#previous step. Mi is found using greedy algorithm that also considers
+	#weights on vertices.
+	set Mi [GreedyWeightedMaxIndependentSet $GiSQ $nodeWeights]
+
+	#for each node u in Maximal Independent set found in previous step,
+	#we search for its cheapest ( considering costs at vertices ) neighbour.
+	#Note that node u is considered as it is a neighbour for itself.
+	foreach u $Mi {
+
+	    set minWeightOfSi Inf
+
+	    #the neighbours of u
+	    set neighbours [$Gi nodes -adj $u]
+	    set smallestNeighbour 0
+	    #u is a neighbour for itself
+	    lappend neighbours $u
+
+	    #finding neighbour with minimal cost
+	    foreach w [lsort -index 1 $nodeWeights] {
+		lassign $w node weight
+		if {[struct::set contains $neighbours $node]} {
+                    set minWeightOfSi $weight
+		    set smallestNeighbour $node
+                    break
+		}
+	    }
+
+	    lappend Si [list $smallestNeighbour $minWeightOfSi]
+	}
+
+	set totalSiWeight 0
+	set possibleSolution {}
+
+	foreach s $Si {
+	    #counting the total weight of the set of nodes - Si
+	    set totalSiWeight [ expr { $totalSiWeight + [lindex $s 1] } ]
+
+	    #it's final solution, if weight found in previous step is
+	    #not greater than W
+	    lappend possibleSolution [lindex $s 0]
+	}
+
+	#checking if final solution is found
+	if { $totalSiWeight <= $W } {
+	    $Gi destroy
+	    $GiSQ destroy
+	    return $possibleSolution
+	}
+    }
+
+    $Gi destroy
+    $GiSQ destroy
+
+    #no solution found - error returned
+    return -code error "No k-center found for restriction W = $W"
+
+}
+
+#Maximal Independent Set - 2 approximation greedy algorithm
+#-------------------------------------------------------------------------------------
+#
+#A maximal independent set is an independent set such that adding any other node
+#to the set forces the set to contain an edge.
+#
+#Note:
+#Don't confuse it with maximum independent set, which is a largest independent set
+#for a given graph G.
+#
+#Reference: http://en.wikipedia.org/wiki/Maximal_independent_set
+
+proc ::struct::graph::op::GreedyMaxIndependentSet {G} {
+
+    set result {}
+    set nodes [$G nodes]
+
+    foreach v $nodes {
+	if { [struct::set contains $nodes $v] } {
+	    lappend result $v
+
+	    foreach neighbour [$G nodes -adj $v] {
+		struct::set exclude nodes $neighbour
+	    }
+	}
+    }
+
+    return $result
+}
+
+#Weighted Maximal Independent Set - 2 approximation greedy algorithm
+#-------------------------------------------------------------------------------------
+#
+#Weighted variation of Maximal Independent Set. It takes as an input argument
+#not only graph G but also set of weights for all vertices in graph G.
+#
+#Note:
+#Read also Maximal Independent Set description for more info.
+#
+#Reference: http://en.wikipedia.org/wiki/Maximal_independent_set
+
+proc ::struct::graph::op::GreedyWeightedMaxIndependentSet {G nodeWeights} {
+
+    set result {}
+    set nodes {}
+    foreach v [lsort -index 1 $nodeWeights] {
+	lappend nodes [lindex $v 0]
+    }
+
+    foreach v $nodes {
+	if { [struct::set contains $nodes $v] } {
+	    lappend result $v
+
+	    set neighbours [$G nodes -adj $v]
+
+	    foreach neighbour [$G nodes -adj $v] {
+		struct::set exclude nodes $neighbour
+	    }
+	}
+    }
+
+    return $result
+}
+
+#subprocedure creating from graph G two squared graph
+#G^2 - graph in which edge between nodes u and v exists,
+#if and only if, when distance (in edges, not weights)
+#between those nodes is not greater than 2 and u != v.
+
+proc ::struct::graph::op::createSquaredGraph {G} {
+
+    set H [struct::graph]
+    foreach v [$G nodes] {
+	$H node insert $v
+    }
+
+    foreach v [$G nodes] {
+	foreach u [$G nodes -adj $v] {
+	    if { ($v != $u) && ![$H arc exists [list $v $u]] && ![$H arc exists [list $u $v]] } {
+		$H arc insert $u $v [list $u $v]
+	    }
+	    foreach z [$G nodes -adj $u] {
+		if { ($v != $z) && ![$H arc exists [list $v $z]] && ![$H arc exists [list $z $v]] } {
+		    $H arc insert $v $z [list $v $z]
+		}
+	    }
+	}
+    }
+
+    return $H
+}
+
+#subprocedure for Metric K-Center problem
+#
+#Input:
+#previousGsq - graph G(i-1)**2
+#currentGi - graph G(i)
+#u and v - source and target of an edge added in this iteration
+#
+#Output:
+#Graph G(i)**2 used by next steps of K-Center algorithm
+
+proc ::struct::graph::op::extendTwoSquaredGraph {previousGsq currentGi u v} {
+
+    #adding new edge
+    if { ![$previousGsq arc exists [list $v $u]] && ![$previousGsq arc exists [list $u $v]]} {
+	$previousGsq arc insert $u $v [list $u $v]
+    }
+
+    #adding new edges to solution graph:
+    #here edges, where source is a $u node and targets are neighbours of node $u except for $v
+    foreach x [$currentGi nodes -adj $u] {
+	if { ( $x != $v) && ![$previousGsq arc exists [list $v $x]] && ![$previousGsq arc exists [list $x $v]] } {
+	    $previousGsq arc insert $v $x [list $v $x]
+	}
+    }
+    #here edges, where source is a $v node and targets are neighbours of node $v except for $u
+    foreach x [$currentGi nodes -adj $v] {
+	if { ( $x != $u ) && ![$previousGsq arc exists [list $u $x]] && ![$previousGsq arc exists [list $x $u]] } {
+	    $previousGsq arc insert $u $x [list $u $x]
+	}
+    }
+
+    return $previousGsq
+}
+
+#Vertices Cover - 2 approximation algorithm
+#-------------------------------------------------------------------------------------
+#Vertices cover is a set o vertices such that each edge of the graph is incident to
+#at least one vertex of the set. This 2-approximation algorithm searches for minimum
+#vertices cover, which is a classical optimization problem in computer science and
+#is a typical example of an NP-hard optimization problem that has an approximation
+#algorithm.
+#
+#Reference: http://en.wikipedia.org/wiki/Vertex_cover_problem
+#
+
+proc ::struct::graph::op::VerticesCover {G} {
+    #variable containing final solution
+    set vc {}
+    #variable containing sorted (with degree) set of arcs for graph G
+    set arcs {}
+
+    #setting the dictionary with degrees for each node
+    foreach v [$G nodes] {
+	dict set degrees $v [$G node degree $v]
+    }
+
+    #creating a list containing the sum of degrees for source and
+    #target nodes for each edge in graph G
+    foreach e [$G arcs] {
+	set v [$G arc source $e]
+	set u [$G arc target $e]
+
+	lappend values [list [expr {[dict get $degrees $v]+[dict get $degrees $u]}] $e]
+    }
+    #sorting the list of source and target degrees
+    set values [lsort -integer -decreasing -index 0 $values]
+
+    #setting the set of edges in a right sequence
+    foreach e $values {
+	lappend arcs [lindex $e 1]
+    }
+
+    #for each node in graph G, we add it to the final solution and
+    #erase all arcs adjacent to it, so they cannot be
+    #added to solution in next iterations
+    foreach e $arcs {
+
+	if { [struct::set contains $arcs $e] } {
+	    set v [$G arc source $e]
+	    set u [$G arc target $e]
+	    lappend vc $v $u
+
+	    foreach n [$G arcs -adj $v $u] {
+		struct::set exclude arcs $n
+	    }
+	}
+    }
+
+    return $vc
+}
+
+
+#Ford's Fulkerson algorithm - computing maximum flow in a flow network
+#-------------------------------------------------------------------------------------
+#
+#The general idea of algorithm is finding augumenting paths in graph G, as long
+#as they exist, and for each path updating the edge's weights along that path,
+#with maximum possible throughput. The final (maximum) flow is found
+#when there is no other augumenting path from source to sink.
+#
+#Input:
+#graph G - weighted and directed graph. Weights at edges are considered as
+#maximum throughputs that can be carried by that link (edge).
+#s - the node that is a source for graph G
+#t - the node that is a sink for graph G
+#
+#Output:
+#Procedure returns the dictionary contaning throughputs for all edges. For
+#each key ( the edge between nodes u and v in the for of list u v ) there is
+#a value that is a throughput for that key. Edges where throughput values
+#are equal to 0 are not returned ( it is like there was no link in the flow network
+#between nodes connected by such edge).
+#
+#Reference: http://en.wikipedia.org/wiki/Ford-Fulkerson_algorithm
+
+proc ::struct::graph::op::FordFulkerson {G s t} {
+
+    #checking if nodes s and t are in graph G
+    if { !([$G node exists $s] && [$G node exists $t]) } {
+	return -code error "Nodes \"$s\" and \"$t\" should be contained in graph's G set of nodes"
+    }
+
+    #checking if all attributes for input network are set well ( costs and throughputs )
+    foreach e [$G arcs] {
+	if { ![$G arc keyexists $e throughput] } {
+	    return -code error "The input network doesn't have all attributes set correctly... Please, check again attributes: \"throughput\" for input graph."
+	}
+    }
+
+    #initilization
+    foreach e [$G arcs] {
+	set u [$G arc source $e]
+	set v [$G arc target $e]
+	dict set f [list $u $v] 0
+	dict set f [list $v $u] 0
+    }
+
+    #setting the residual graph for the first iteration
+    set residualG [createResidualGraph $G $f]
+
+    #deleting the arcs that are 0-weighted
+    foreach e [$residualG arcs] {
+	if { [$residualG arc set $e throughput] == 0 } {
+	    $residualG arc delete $e
+	}
+    }
+
+    #the main loop - works till the path between source and the sink can be found
+    while {1} {
+	set paths [ShortestsPathsByBFS $residualG $s paths]
+
+	if { ($paths == {}) || (![dict exists $paths $t]) } break
+
+	set path [dict get $paths $t]
+	#setting the path from source to sink
+
+	#adding sink to path
+	lappend path $t
+
+	#finding the throughput of path p - the smallest value of c(f) among
+	#edges that are contained in the path
+	set maxThroughput Inf
+
+	foreach u [lrange $path 0 end-1] v [lrange $path 1 end] {
+	    set pathEdgeFlow [$residualG arc set [list $u $v] throughput]
+	    if { $maxThroughput > $pathEdgeFlow } {
+		set maxThroughput $pathEdgeFlow
+	    }
+	}
+
+	#increase of throughput using the path p, with value equal to maxThroughput
+	foreach u [lrange $path 0 end-1] v [lrange $path 1 end] {
+
+	    #if maximum throughput that was found for the path p (maxThroughput) is bigger than current throughput
+	    #at the edge not contained in the path p (for current pair of nodes u and v), then we add to the edge
+	    #which is contained into path p the maxThroughput value decreased by the value of throughput at
+	    #the second edge (not contained in path). That second edge's throughtput value is set to 0.
+
+	    set f_uv [dict get $f [list $u $v]]
+	    set f_vu [dict get $f [list $v $u]]
+	    if { $maxThroughput >= $f_vu } {
+		dict set f [list $u $v] [ expr { $f_uv + $maxThroughput - $f_vu } ]
+		dict set f [list $v $u] 0
+	    } else {
+
+		#if maxThroughput is not greater than current throughput at the edge not contained in path p (here - v->u),
+		#we add a difference between those values to edge contained in the path p (here u->v) and substract that
+		#difference from edge not contained in the path p.
+		set difference [ expr { $f_vu - $maxThroughput } ]
+		dict set f [list $u $v] [ expr { $f_uv + $difference } ]
+		dict set f [list $v $u] $maxThroughput
+	    }
+	}
+
+	#when the current throughput for the graph is updated, we generate new residual graph
+	#for new values of throughput
+	$residualG destroy
+	set residualG [createResidualGraph $G $f]
+
+	foreach e [$residualG arcs] {
+	    if { [$residualG arc set $e throughput] == 0 } {
+		$residualG arc delete $e
+	    }
+	}
+    }
+
+    $residualG destroy
+
+    #removing 0-weighted edges from solution
+    foreach e [dict keys $f] {
+	if { [dict get $f $e] == 0 } {
+	    set f [dict remove $f $e]
+	}
+    }
+
+    return $f
+}
+
+#subprocedure for FordFulkerson's algorithm, which creates
+#for input graph G and given throughput f residual graph
+#for further operations to find maximum flow in flow network
+
+proc ::struct::graph::op::createResidualGraph {G f} {
+
+    #initialization
+    set residualG [struct::graph]
+
+    foreach v [$G nodes] {
+	$residualG node insert $v
+    }
+
+    foreach e [$G arcs] {
+	set u [$G arc source $e]
+	set v [$G arc target $e]
+	dict set GF [list $u $v] [$G arc set $e throughput]
+    }
+
+    foreach e [dict keys $GF] {
+
+	lassign $e u v
+
+	set c_uv [dict get $GF $e]
+	set flow_uv [dict get $f $e]
+	set flow_vu [dict get $f [list $v $u]]
+
+	if { ![$residualG arc exists $e] } {
+	    $residualG arc insert $u $v $e
+	}
+
+	if { ![$residualG arc exists [list $v $u]] } {
+	    $residualG arc insert $v $u [list $v $u]
+	}
+
+	#new value of c_f(u,v) for residual Graph is a max flow value for this edge
+	#minus current flow on that edge
+	if { ![$residualG arc keyexists $e throughput] } {
+	    if { [dict exists $GF [list $v $u]] } {
+		$residualG arc set [list $u $v] throughput [ expr { $c_uv - $flow_uv + $flow_vu } ]
+	    } else {
+		$residualG arc set $e throughput [ expr { $c_uv - $flow_uv } ]
+	    }
+	}
+
+	if { [dict exists $GF [list $v $u]] } {
+	    #when double arcs in graph G (u->v , v->u)
+	    #so, x/y i w/z    y-x+w
+	    set c_vu [dict get $GF [list $v $u]]
+	    if { ![$residualG arc keyexists [list $v $u] throughput] } {
+		$residualG arc set [list $v $u] throughput [ expr { $c_vu - $flow_vu + $flow_uv} ]
+	    }
+	} else {
+	    $residualG arc set [list $v $u] throughput $flow_uv
+	}
+    }
+
+    #setting all weights at edges to 1 for proper usage of shortest paths finding procedures
+    $residualG arc setunweighted 1
+
+    return $residualG
+}
+
+#Subprocedure for Busacker Gowen algorithm
+#
+#Input:
+#graph G - flow network. Graph G has two attributes for each edge:
+#cost and throughput. Each arc must have it's attribute value assigned.
+#dictionary f - some flow for network G. Keys represent edges and values
+#are flows at those edges
+#path - set of nodes for which we transform the network
+#
+#Subprocedure checks 6 vital conditions and for them updates the network
+#(let values with * be updates values for network). So, let edge (u,v) be
+#the non-zero flow for network G, c(u,v) throughput of edge (u,v) and
+#d(u,v) non-negative cost of edge (u,v):
+#1. c*(v,u) = f(u,v)  --- adding apparent arc
+#2. d*(v,u) = -d(u,v)
+#3. c*(u,v) = c(u,v) - f(u,v)    --- if f(v,u) = 0 and c(u,v) > f(u,v)
+#4. d*(u,v) = d(u,v)             --- if f(v,u) = 0 and c(u,v) > f(u,v)
+#5. c*(u,v) = 0                  --- if f(v,u) = 0 and c(u,v) = f(u,v)
+#6. d*(u,v) = Inf                --- if f(v,u) = 0 and c(u,v) = f(u,v)
+
+proc ::struct::graph::op::createAugmentingNetwork {G f path} {
+
+    set Gf [struct::graph]
+
+    #setting the Gf graph
+    foreach v [$G nodes] {
+	$Gf node insert $v
+    }
+
+    foreach e [$G arcs] {
+	set u [$G arc source $e]
+	set v [$G arc target $e]
+
+	$Gf arc insert $u $v [list $u $v]
+
+	$Gf arc set [list $u $v] throughput [$G arc set $e throughput]
+	$Gf arc set [list $u $v] cost [$G arc set $e cost]
+    }
+
+    #we set new values for each edge contained in the path from input
+    foreach u [lrange $path 0 end-1] v [lrange $path 1 end] {
+
+	set f_uv [dict get $f [list $u $v]]
+	set f_vu [dict get $f [list $v $u]]
+	set c_uv [$G arc get [list $u $v] throughput]
+	set d_uv [$G arc get [list $u $v] cost]
+
+	#adding apparent arcs
+	if { ![$Gf arc exists [list $v $u]] } {
+	    $Gf arc insert $v $u [list $v $u]
+	    #1.
+	    $Gf arc set [list $v $u] throughput $f_uv
+	    #2.
+	    $Gf arc set [list $v $u] cost [ expr { -1 * $d_uv } ]
+	} else {
+	    #1.
+	    $Gf arc set [list $v $u] throughput $f_uv
+	    #2.
+	    $Gf arc set [list $v $u] cost [ expr { -1 * $d_uv } ]
+	    $Gf arc set [list $u $v] cost Inf
+	    $Gf arc set [list $u $v] throughput 0
+	}
+
+	if { ($f_vu == 0 ) && ( $c_uv > $f_uv ) } {
+	    #3.
+	    $Gf arc set [list $u $v] throughput [ expr { $c_uv - $f_uv } ]
+	    #4.
+	    $Gf arc set [list $u $v] cost $d_uv
+	}
+
+	if { ($f_vu == 0 ) && ( $c_uv == $f_uv) } {
+	    #5.
+	    $Gf arc set [list $u $v] throughput 0
+	    #6.
+	    $Gf arc set [list $u $v] cost Inf
+	}
+    }
+
+    return $Gf
+}
+
+#Busacker Gowen's algorithm - computing minimum cost maximum flow in a flow network
+#-------------------------------------------------------------------------------------
+#
+#The goal is to find a flow, whose max value can be d, from source node to
+#sink node in given flow network. That network except throughputs at edges has
+#also defined a non-negative cost on each edge - cost of using that edge when
+#directing flow with that edge ( it can illustrate e.g. fuel usage, time or
+#any other measure dependent on usages ).
+#
+#Input:
+#graph G - flow network, weights at edges are costs of using particular edge
+#desiredFlow - max value of the flow for that network
+#dictionary c - throughputs for all edges
+#node s - the source node for graph G
+#node t - the sink node for graph G
+#
+#Output:
+#f - dictionary containing values of used throughputs for each edge ( key )
+#found by algorithm.
+#
+#Reference: http://en.wikipedia.org/wiki/Minimum_cost_flow_problem
+#
+
+proc ::struct::graph::op::BusackerGowen {G desiredFlow s t} {
+
+    #checking if nodes s and t are in graph G
+    if { !([$G node exists $s] && [$G node exists $t]) } {
+	return -code error "Nodes \"$s\" and \"$t\" should be contained in graph's G set of nodes"
+    }
+
+    if { $desiredFlow <= 0 } {
+	return -code error "The \"desiredFlow\" value must be an positive integer."
+    }
+
+    #checking if all attributes for input network are set well ( costs and throughputs )
+    foreach e [$G arcs] {
+	if { !([$G arc keyexists $e throughput] && [$G arc keyexists $e cost]) } {
+	    return -code error "The input network doesn't have all attributes set correctly... Please, check again attributes: \"throughput\" and \"cost\" for input graph."
+	}
+    }
+
+    set Gf [struct::graph]
+
+    #initialization of Augmenting Network
+    foreach v [$G nodes] {
+	$Gf node insert $v
+    }
+
+    foreach e [$G arcs] {
+	set u [$G arc source $e]
+	set v [$G arc target $e]
+	$Gf arc insert $u $v [list $u $v]
+
+	$Gf arc set [list $u $v] throughput [$G arc set $e throughput]
+	$Gf arc set [list $u $v] cost [$G arc set $e cost]
+    }
+
+    #initialization of f
+    foreach e [$G arcs] {
+	set u [$G arc source $e]
+	set v [$G arc target $e]
+	dict set f [list $u $v] 0
+	dict set f [list $v $u] 0
+    }
+
+    set currentFlow 0
+
+    #main loop - it ends when we reach desired flow value or there is no path in Gf
+    #leading from source node s to sink t
+
+    while { $currentFlow < $desiredFlow } {
+
+	#preparing correct values for pathfinding
+	foreach edge [$Gf arcs] {
+	    $Gf arc setweight $edge [$Gf arc get $edge cost]
+	}
+
+	#setting the path 'p' from 's' to 't'
+	set paths [ShortestsPathsByBFS $Gf $s paths]
+
+	#if there are no more paths, the search has ended
+	if { ($paths == {}) || (![dict exists $paths $t]) } break
+
+	set path [dict get $paths $t]
+	lappend path $t
+
+	#counting max throughput that is availiable to send
+	#using path 'p'
+	set maxThroughput Inf
+	foreach u [lrange $path 0 end-1] v [lrange $path 1 end] {
+	    set uv_throughput [$Gf arc set [list $u $v] throughput]
+	    if { $maxThroughput > $uv_throughput } {
+		set maxThroughput $uv_throughput
+	    }
+	}
+
+	#if max throughput that was found will cause exceeding the desired
+	#flow, send as much as it's possible
+	if { ( $currentFlow + $maxThroughput ) <= $desiredFlow } {
+	    set fAdd $maxThroughput
+	    set currentFlow [ expr { $currentFlow + $fAdd } ]
+	} else {
+	    set fAdd [ expr { $desiredFlow - $currentFlow } ]
+	    set currentFlow $desiredFlow
+	}
+
+	#update the throuputs on edges
+	foreach v [lrange $path 0 end-1] u [lrange $path 1 end] {
+	    if { [dict get $f [list $u $v]] >= $fAdd } {
+		dict set f [list $u $v] [ expr { [dict get $f [list $u $v]] - $fAdd } ]
+	    }
+
+	    if { ( [dict get $f [list $u $v]] < $fAdd ) && ( [dict get $f [list $u $v]] > 0 ) } {
+		dict set f [list $v $u] [ expr { $fAdd - [dict get $f [list $u $v]] } ]
+		dict set f [list $u $v] 0
+	    }
+
+	    if { [dict get $f [list $u $v]] == 0 } {
+		dict set f [list $v $u] [ expr { [dict get $f [list $v $u]] + $fAdd } ]
+	    }
+	}
+
+	#create new Augemnting Network
+
+	set Gfnew [createAugmentingNetwork $Gf $f $path]
+        $Gf destroy
+        set Gf $Gfnew
+    }
+
+    set f [dict filter $f script {flow flowvalue} {expr {$flowvalue != 0}}]
+
+    $Gf destroy
+    return $f
+}
+
+#
+proc ::struct::graph::op::ShortestsPathsByBFS {G s outputFormat} {
+
+    switch -exact -- $outputFormat {
+	distances {
+	    set outputMode distances
+	}
+	paths {
+	    set outputMode paths
+	}
+	default {
+	    return -code error "Unknown output format \"$outputFormat\", expected distances, or paths."
+	}
+    }
+
+    set queue [list $s]
+    set result {}
+
+    #initialization of marked nodes, distances and predecessors
+    foreach v [$G nodes] {
+	dict set marked $v 0
+	dict set distances $v Inf
+	dict set pred $v -1
+    }
+
+    #the s node is initially marked and has 0 distance to itself
+    dict set marked $s 1
+    dict set distances $s 0
+
+    #the main loop
+    while { [llength $queue] != 0 } {
+
+	#removing top element from the queue
+	set v [lindex $queue 0]
+	lremove queue $v
+
+	#for each arc that begins in v
+	foreach arc [$G arcs -out $v] {
+
+	    set u [$G arc target $arc]
+	    set newlabel [ expr { [dict get $distances $v] + [$G arc getweight $arc] } ]
+
+	    if { $newlabel < [dict get $distances $u] } {
+
+		dict set distances $u $newlabel
+		dict set pred $u $v
+
+		#case when current node wasn't placed in a queue yet -
+		#we set u at the end of the queue
+		if { [dict get $marked $u] == 0 } {
+		    lappend queue $u
+		    dict set marked $u 1
+		} else {
+
+		    #case when current node u was in queue before but it is not in it now -
+		    #we set u at the beginning of the queue
+		    if { [lsearch $queue $u] < 0 } {
+			set queue [linsert $queue 0 $u]
+		    }
+		}
+	    }
+	}
+    }
+
+    #if the outputformat is paths, we travel back to find shorests paths
+    #to return sets of nodes for each node, which are their paths between
+    #s and particular node
+    dict set paths nopaths 1
+    if { $outputMode eq "paths" } {
+	foreach node [$G nodes] {
+
+	    set path {}
+	    set lastNode $node
+
+	    while { $lastNode != -1 } {
+		set currentNode [dict get $pred $lastNode]
+		if { $currentNode != -1 } {
+		    lappend path $currentNode
+		}
+		set lastNode $currentNode
+	    }
+
+	    set path [lreverse $path]
+
+	    if { [llength $path] != 0 } {
+		dict set paths $node $path
+		dict unset paths nopaths
+	    }
+	}
+
+	if { ![dict exists $paths nopaths] } {
+	    return $paths
+	} else {
+	    return {}
+	}
+
+	#returning dictionary containing distance from start node to each other node (key)
+    } else {
+	return $distances
+    }
+
+}
+
+#
+proc ::struct::graph::op::BFS {G s outputFormat} {
+
+    set queue [list $s]
+
+    switch -exact -- $outputFormat {
+	graph {
+	    set outputMode graph
+	}
+	tree {
+	    set outputMode tree
+	}
+	default {
+	    return -code error "Unknown output format \"$outputFormat\", expected graph, or tree."
+	}
+    }
+
+    if { $outputMode eq "graph" } {
+	#graph initializing
+	set BFSGraph [struct::graph]
+	foreach v [$G nodes] {
+	    $BFSGraph node insert $v
+	}
+    } else {
+	#tree initializing
+	set BFSTree [struct::tree]
+	$BFSTree set root name $s
+	$BFSTree rename root $s
+    }
+
+    #initilization of marked nodes
+    foreach v [$G nodes] {
+	dict set marked $v 0
+    }
+
+    #start node is marked from the beginning
+    dict set marked $s 1
+
+    #the main loop
+    while { [llength $queue] != 0 } {
+	#removing top element from the queue
+
+	set v [lindex $queue 0]
+	lremove queue $v
+
+	foreach x [$G nodes -adj $v] {
+	    if { ![dict get $marked $x] } {
+		dict set marked $x 1
+		lappend queue $x
+
+		if { $outputMode eq "graph" } {
+		    $BFSGraph arc insert $v $x [list $v $x]
+		} else {
+		    $BFSTree insert $v end $x
+		}
+	    }
+	}
+    }
+
+    if { $outputMode eq "graph" } {
+	return $BFSGraph
+    } else {
+	return $BFSTree
+    }
+}
+
+#Minimum Diameter Spanning Tree - MDST
+#-------------------------------------------------------------------------------------
+#
+#The goal is to find for input graph G, the spanning tree that
+#has the minimum diameter worth.
+#
+#General idea of algorithm is to run BFS over all vertices in graph
+#G. If the diameter "d" of the tree is odd, then we are sure that tree
+#given by BFS is minimum (considering diameter value). When, diameter "d"
+#is even, then optimal tree can have minimum diameter equal to "d" or
+#"d-1".
+#
+#In that case, what algorithm does is rebuilding the tree given by BFS, by
+#adding a vertice between root node and root's child node (nodes), such that
+#subtree created with child node as root node is the greatest one (has the
+#greatests height). In the next step for such rebuilded tree, we run again BFS
+#with new node as root node. If the height of the tree didn't changed, we have found
+#a better solution.
+
+proc ::struct::graph::op::MinimumDiameterSpanningTree {G} {
+
+    set min_diameter Inf
+    set best_Tree [struct::graph]
+
+    foreach v [$G nodes] {
+
+	#BFS Tree
+	set T [BFS $G $v tree]
+	#BFS Graph
+	set TGraph [BFS $G $v graph]
+
+	#Setting all arcs to 1 for diameter procedure
+	$TGraph arc setunweighted 1
+
+	#setting values for current Tree
+	set diam [diameter $TGraph]
+	set subtreeHeight [ expr { $diam / 2 - 1} ]
+
+	##############################################
+	#case when diameter found for tree found by BFS is even:
+	#it's possible to decrease the diameter by one.
+	if { ( $diam % 2 ) == 0 } {
+
+	    #for each child u that current root node v has, we search
+	    #for the greatest subtree(subtrees) with the root in child u.
+	    #
+	    foreach u [$TGraph nodes -adj $v] {
+		set u_depth 1 ;#[$T depth $u]
+		set d_depth 0
+
+		set descendants [$T descendants $u]
+
+		foreach d $descendants {
+		    if { $d_depth < [$T depth $d] } {
+			set d_depth [$T depth $d]
+		    }
+		}
+
+		#depth of the current subtree
+		set depth [ expr { $d_depth - $u_depth } ]
+
+		#proceed if found subtree is the greatest one
+		if { $depth >= $subtreeHeight } {
+
+		    #temporary Graph for holding potential better values
+		    set tempGraph [struct::graph]
+
+		    foreach node [$TGraph nodes] {
+			$tempGraph node insert $node
+		    }
+
+		    #zmienic nazwy zmiennych zeby sie nie mylily
+		    foreach arc [$TGraph arcs] {
+			set _u [$TGraph arc source $arc]
+			set _v [$TGraph arc target $arc]
+			$tempGraph arc insert $_u $_v [list $_u $_v]
+		    }
+
+		    if { [$tempGraph arc exists [list $u $v]] } {
+			$tempGraph arc delete [list $u $v]
+		    } else {
+			$tempGraph arc delete [list $v $u]
+		    }
+
+		    #for nodes u and v, we add a node between them
+		    #to again start BFS with root in new node to check
+		    #if it's possible to decrease the diameter in solution
+		    set node [$tempGraph node insert]
+		    $tempGraph arc insert $node $v [list $node $v]
+		    $tempGraph arc insert $node $u [list $node $u]
+
+		    set newtempGraph [BFS $tempGraph $node graph]
+		    $tempGraph destroy
+		    set tempGraph $newtempGraph
+
+		    $tempGraph node delete $node
+		    $tempGraph arc insert $u $v [list $u $v]
+		    $tempGraph arc setunweighted 1
+
+		    set tempDiam [diameter $tempGraph]
+
+		    #if better tree is found (that any that were already found)
+		    #replace it
+		    if { $min_diameter > $tempDiam } {
+			set $min_diameter [diameter $tempGraph ]
+			$best_Tree destroy
+			set best_Tree $tempGraph
+		    } else {
+			$tempGraph destroy
+		    }
+		}
+
+	    }
+	}
+	################################################################
+
+	set currentTreeDiameter $diam
+
+	if { $min_diameter > $currentTreeDiameter } {
+	    set min_diameter $currentTreeDiameter
+	    $best_Tree destroy
+	    set best_Tree $TGraph
+	} else {
+	    $TGraph destroy
+	}
+
+	$T destroy
+    }
+
+    return $best_Tree
+}
+
+#Minimum Degree Spanning Tree
+#-------------------------------------------------------------------------------------
+#
+#In graph theory, minimum degree spanning tree (or degree-constrained spanning tree)
+#is a spanning tree where the maximum vertex degree is as small as possible (or is
+#limited to a certain constant k). The minimum degree spanning tree problem is to
+#determine whether a particular graph has such a spanning tree for a particular k.
+#
+#Algorithm for input undirected graph G finds its spanning tree with the smallest
+#possible degree. Algorithm is a 2-approximation, so it doesn't assure that optimal
+#solution will be found.
+#
+#Reference: http://en.wikipedia.org/wiki/Degree-constrained_spanning_tree
+
+proc ::struct::graph::op::MinimumDegreeSpanningTree {G} {
+
+    #initialization of spanning tree for G
+    set MST [struct::graph]
+
+    foreach v [$G nodes] {
+	$MST node insert $v
+    }
+
+    #forcing all arcs to be 1-weighted
+    foreach e [$G arcs] {
+	$G arc setweight $e 1
+    }
+
+    foreach e [kruskal $G] {
+	set u [$G arc source $e]
+	set v [$G arc target $e]
+
+	$MST arc insert $u $v [list $u $v]
+    }
+
+    #main loop
+    foreach e [$G arcs] {
+
+	set u [$G arc source $e]
+	set v [$G arc target $e]
+
+	#if nodes u and v are neighbours, proceed to next iteration
+	if { ![$MST arc exists [list $u $v]] && ![$MST arc exists [list $v $u]] } {
+
+	    $MST arc setunweighted 1
+
+	    #setting the path between nodes u and v in Spanning Tree MST
+	    set path [dict get [dijkstra $MST $u] $v]
+	    lappend path $v
+
+	    #search for the node in the path, such that its degree is greater than degree of any of nodes
+	    #u or v increased by one
+	    foreach node $path {
+		if { [$MST node degree $node] > ([Max [$MST node degree $u] [$MST node degree $v]] + 1) } {
+
+		    #if such node is found add the arc between nodes u and v
+                    $MST arc insert $u $v [list $u $v]
+
+		    #then to hold MST being a spanning tree, delete any arc that is in the path
+		    #that is adjacent to found node
+		    foreach n [$MST nodes -adj $node] {
+			if { $n in $path } {
+			    if { [$MST arc exists [list $node $n]] } {
+				$MST arc delete [list $node $n]
+			    } else {
+				$MST arc delete [list $n $node]
+			    }
+			    break
+			}
+		    }
+
+		    # Node found, stop processing the path
+		    break
+		}
+	    }
+	}
+    }
+
+    return $MST
+}
+
+#Dinic algorithm for finding maximum flow in flow network
+#-------------------------------------------------------------------------------------
+#
+#Reference: http://en.wikipedia.org/wiki/Dinic's_algorithm
+#
+proc ::struct::graph::op::MaximumFlowByDinic {G s t blockingFlowAlg} {
+
+    if { !($blockingFlowAlg eq "dinic" || $blockingFlowAlg eq "mkm") } {
+	return -code error "Uncorrect name of blocking flow algorithm. Choose \"mkm\" for Malhotra, Kumar and Maheshwari algorithm and \"dinic\" for Dinic algorithm."
+    }
+
+    foreach arc [$G arcs] {
+	set u [$G arc source $arc]
+	set v [$G arc target $arc]
+
+	dict set f [list $u $v] 0
+	dict set f [list $v $u] 0
+    }
+
+    while {1} {
+	set residualG [createResidualGraph $G $f]
+	if { $blockingFlowAlg == "mkm" } {
+	    set blockingFlow [BlockingFlowByMKM $residualG $s $t]
+	} else {
+	    set blockingFlow [BlockingFlowByDinic $residualG $s $t]
+	}
+	$residualG destroy
+
+	if { $blockingFlow == {} } break
+
+	foreach key [dict keys $blockingFlow] {
+	    dict set f $key [ expr { [dict get $f $key] + [dict get $blockingFlow $key] } ]
+	}
+    }
+
+    set f [dict filter $f script {flow flowvalue} {expr {$flowvalue != 0}}]
+
+    return $f
+}
+
+#Dinic algorithm for finding blocking flow
+#-------------------------------------------------------------------------------------
+#
+#Algorithm for given network G with source s and sink t, finds a blocking
+#flow, which can be used to obtain a maximum flow for that network G.
+#
+#Some steps that algorithm takes:
+#1. constructing the level graph from network G
+#2. until there are edges in level graph:
+#	3. find the path between s and t nodes in level graph
+#	4. for each edge in path update current throughputs at those edges and...
+#	5. ...deleting nodes from which there are no residual edges
+#6. return the dictionary containing the blocking flow
+
+proc ::struct::graph::op::BlockingFlowByDinic {G s t} {
+
+    #initializing blocking flow dictionary
+    foreach edge [$G arcs] {
+	set u [$G arc source $edge]
+	set v [$G arc target $edge]
+
+	dict set b [list $u $v] 0
+    }
+
+    #1.
+    set LevelGraph [createLevelGraph $G $s]
+
+    #2. the main loop
+    while { [llength [$LevelGraph arcs]] > 0 } {
+
+	if { ![$LevelGraph node exists $s] || ![$LevelGraph node exists $t] } break
+
+	#3.
+	set paths [ShortestsPathsByBFS $LevelGraph $s paths]
+
+	if { $paths == {} } break
+	if { ![dict exists $paths $t] } break
+
+	set path [dict get $paths $t]
+	lappend path $t
+
+	#setting the max throughput to go with the path found one step before
+	set maxThroughput Inf
+	foreach u [lrange $path 0 end-1] v [lrange $path 1 end] {
+
+	    set uv_throughput [$LevelGraph arc get [list $u $v] throughput]
+
+	    if { $maxThroughput > $uv_throughput } {
+		set maxThroughput $uv_throughput
+	    }
+	}
+
+	#4. updating throughputs and blocking flow
+	foreach u [lrange $path 0 end-1] v [lrange $path 1 end] {
+
+	    set uv_throughput [$LevelGraph arc get [list $u $v] throughput]
+	    #decreasing the throughputs contained in the path by max flow value
+	    $LevelGraph arc set [list $u $v] throughput [ expr { $uv_throughput - $maxThroughput } ]
+
+	    #updating blocking flows
+	    dict set b [list $u $v] [ expr { [dict get $b [list $u $v]] + $maxThroughput } ]
+	    #dict set b [list $v $u] [ expr { -1 * [dict get $b [list $u $v]] } ]
+
+	    #5. deleting the arcs, whose throughput is completely used
+	    if { [$LevelGraph arc get [list $u $v] throughput] == 0 } {
+		$LevelGraph arc delete [list $u $v]
+	    }
+
+	    #deleting the node, if it hasn't any outgoing arcs
+	    if { ($u != $s) && ( ![llength [$LevelGraph nodes -out $u]] || ![llength [$LevelGraph nodes -in $u]] ) } {
+		$LevelGraph node delete $u
+	    }
+	}
+
+    }
+
+    set b [dict filter $b script {flow flowvalue} {expr {$flowvalue != 0}}]
+
+    $LevelGraph destroy
+
+    #6.
+    return $b
+}
+
+#Malhotra, Kumar and Maheshwari Algorithm for finding blocking flow
+#-------------------------------------------------------------------------------------
+#
+#Algorithm for given network G with source s and sink t, finds a blocking
+#flow, which can be used to obtain a maximum flow for that network G.
+#
+#For given node v, Let c(v) be the min{ a, b }, where a is the sum of all incoming
+#throughputs and b is the sum of all outcoming throughputs from the node v.
+#
+#Some steps that algorithm takes:
+#1. constructing the level graph from network G
+#2. until there are edges in level graph:
+#   3. finding the node with the minimum c(v)
+#   4. sending c(v) units of throughput by incoming arcs of v
+#	5. sending c(v) units of throughput by outcoming arcs of v
+#	6. 4 and 5 steps can cause excess or deficiency of throughputs at nodes, so we
+#	send exceeds forward choosing arcs greedily and...
+#	7. ...the same with deficiencies but we send those backward.
+#	8. delete the v node from level graph
+#	9. upgrade the c values for all nodes
+#
+#10. if no other edges left in level graph, return b - found blocking flow
+#
+
+proc ::struct::graph::op::BlockingFlowByMKM {G s t} {
+
+    #initializing blocking flow dictionary
+    foreach edge [$G arcs] {
+	set u [$G arc source $edge]
+	set v [$G arc target $edge]
+
+	dict set b [list $u $v] 0
+    }
+
+    #1. setting the level graph
+    set LevelGraph [createLevelGraph $G $s]
+
+    #setting the in/out throughputs for each node
+    set c [countThroughputsAtNodes $LevelGraph $s $t]
+
+    #2. the main loop
+    while { [llength [$LevelGraph nodes]] > 2 } {
+
+	#if there is no path between s and t nodes, end the procedure and
+	#return current blocking flow
+	set distances [ShortestsPathsByBFS $LevelGraph $s distances]
+	if { [dict get $distances $t] == "Inf" } {
+	    $LevelGraph destroy
+	    set b [dict filter $b script {flow flowvalue} {expr {$flowvalue != 0}}]
+	    return $b
+	}
+
+	#3. finding the node with minimum value of c(v)
+	set min_cv Inf
+
+	dict for {node cv} $c {
+	    if { $min_cv > $cv } {
+		set min_cv $cv
+		set minCv_node $node
+	    }
+	}
+
+	#4. sending c(v) by all incoming arcs of node with minimum c(v)
+	set _min_cv $min_cv
+	foreach arc [$LevelGraph arcs -in $minCv_node] {
+
+	    set t_arc [$LevelGraph arc get $arc throughput]
+	    set u [$LevelGraph arc source $arc]
+	    set v [$LevelGraph arc target $arc]
+	    set b_uv [dict get $b [list $u $v]]
+
+	    if { $t_arc >= $min_cv } {
+		$LevelGraph arc set $arc throughput [ expr { $t_arc - $min_cv } ]
+		dict set b [list $u $v] [ expr { $b_uv + $min_cv } ]
+		break
+	    } else {
+		set difference [ expr { $min_cv - $t_arc } ]
+		set min_cv $difference
+		dict set b [list $u $v] [ expr { $b_uv + $difference } ]
+		$LevelGraph arc set $arc throughput 0
+	    }
+	}
+
+	#5. sending c(v) by all outcoming arcs of node with minimum c(v)
+	foreach arc [$LevelGraph arcs -out $minCv_node] {
+
+	    set t_arc [$LevelGraph arc get $arc throughput]
+	    set u [$LevelGraph arc source $arc]
+	    set v [$LevelGraph arc target $arc]
+	    set b_uv [dict get $b [list $u $v]]
+
+	    if { $t_arc >= $min_cv } {
+		$LevelGraph arc set $arc throughput [ expr { $t_arc - $_min_cv } ]
+		dict set b [list $u $v] [ expr { $b_uv + $_min_cv } ]
+		break
+	    } else {
+		set difference [ expr { $_min_cv - $t_arc } ]
+		set _min_cv $difference
+		dict set b [list $u $v] [ expr { $b_uv + $difference } ]
+		$LevelGraph arc set $arc throughput 0
+	    }
+	}
+
+	#find exceeds and if any, send them forward or backwards
+	set distances [ShortestsPathsByBFS $LevelGraph $s distances]
+
+	#6.
+	for {set i [ expr {[dict get $distances $minCv_node] + 1}] } { $i < [llength [$G nodes]] } { incr i } {
+	    foreach w [$LevelGraph nodes] {
+		if { [dict get $distances $w] == $i } {
+		    set excess [findExcess $LevelGraph $w $b]
+		    if { $excess > 0 } {
+			set b [sendForward $LevelGraph $w $b $excess]
+		    }
+		}
+	    }
+	}
+
+	#7.
+	for { set i [ expr { [dict get $distances $minCv_node] - 1} ] } { $i > 0 } { incr i -1 } {
+	    foreach w [$LevelGraph nodes] {
+		if { [dict get $distances $w] == $i } {
+		    set excess [findExcess $LevelGraph $w $b]
+		    if { $excess < 0 } {
+			set b [sendBack $LevelGraph $w $b [ expr { (-1) * $excess } ]]
+		    }
+		}
+	    }
+	}
+
+	#8. delete current node from the network
+	$LevelGraph node delete $minCv_node
+
+	#9. correctingg the in/out throughputs for each node after
+	#deleting one of the nodes in network
+	set c [countThroughputsAtNodes $LevelGraph $s $t]
+
+	#if node has no availiable outcoming or incoming throughput
+	#delete that node from the graph
+	dict for {key val} $c {
+	    if { $val == 0 } {
+		$LevelGraph node delete $key
+		dict unset c $key
+	    }
+	}
+    }
+
+    set b [dict filter $b script {flow flowvalue} {expr {$flowvalue != 0}}]
+
+    $LevelGraph destroy
+    #10.
+    return $b
+}
+
+#Subprocedure for algorithms that find blocking-flows.
+#It's creating a level graph from the residual network.
+proc ::struct::graph::op::createLevelGraph {Gf s} {
+
+    set LevelGraph [struct::graph]
+
+    $Gf arc setunweighted 1
+
+    #deleting arcs with 0 throughputs for proper pathfinding
+    foreach arc [$Gf arcs] {
+	if { [$Gf arc get $arc throughput] == 0 } {
+	    $Gf arc delete $arc
+	}
+    }
+
+    set distances [ShortestsPathsByBFS $Gf $s distances]
+
+    foreach v [$Gf nodes] {
+	$LevelGraph node insert $v
+	$LevelGraph node set $v distance [dict get $distances $v]
+    }
+
+    foreach e [$Gf arcs] {
+	set u [$Gf arc source $e]
+	set v [$Gf arc target $e]
+
+	if { ([$LevelGraph node get $u distance] + 1) == [$LevelGraph node get $v distance]} {
+	    $LevelGraph arc insert $u $v [list $u $v]
+	    $LevelGraph arc set [list $u $v] throughput [$Gf arc get $e throughput]
+	}
+    }
+
+    $LevelGraph arc setunweighted 1
+    return $LevelGraph
+}
+
+#Subprocedure for blocking flow finding by MKM algorithm
+#
+#It computes for graph G and each of his nodes the throughput value -
+#for node v: from the sum of availiable throughputs from incoming arcs and
+#the sum of availiable throughputs from outcoming arcs chooses lesser and sets
+#as the throughput of the node.
+#
+#Throughputs of nodes are returned in the dictionary.
+#
+proc ::struct::graph::op::countThroughputsAtNodes {G s t} {
+
+    set c {}
+    foreach v [$G nodes] {
+
+	if { ($v eq $t) || ($v eq $s) } continue
+
+	set outcoming [$G arcs -out $v]
+	set incoming [$G arcs -in $v]
+
+	set outsum 0
+	set insum 0
+
+	foreach o $outcoming i $incoming {
+
+	    if { [llength $o] > 0 } {
+		set outsum [ expr { $outsum + [$G arc get $o throughput] } ]
+	    }
+
+	    if { [llength $i] > 0 } {
+		set insum [ expr { $insum + [$G arc get $i throughput] } ]
+	    }
+
+	    set value [Min $outsum $insum]
+	}
+
+	dict set c $v $value
+    }
+
+    return $c
+}
+
+#Subprocedure for blocking-flow finding algorithm by MKM
+#
+#If for a given input node, outcoming flow is bigger than incoming, then that deficiency
+#has to be send back by that subprocedure.
+proc ::struct::graph::op::sendBack {G node b value} {
+
+    foreach arc [$G arcs -in $node] {
+	set u [$G arc source $arc]
+	set v [$G arc target $arc]
+
+	if { $value > [$G arc get $arc throughput] } {
+	    set value [ expr { $value - [$G arc get $arc throughput] } ]
+	    dict set b [list $u $v] [ expr { [dict get $b [list $u $v]] + [$G arc get $arc throughput] } ]
+	    $G arc set $arc throughput 0
+	} else {
+	    $G arc set $arc throughput [ expr { [$G arc get $arc throughput] - $value } ]
+	    dict set b [list $u $v] [ expr { [dict get $b [list $u $v]] + $value } ]
+	    set value 0
+	    break
+	}
+    }
+
+    return $b
+}
+
+#Subprocedure for blocking-flow finding algorithm by MKM
+#
+#If for a given input node, incoming flow is bigger than outcoming, then that exceed
+#has to be send forward by that sub procedure.
+proc ::struct::graph::op::sendForward {G node b value} {
+
+    foreach arc [$G arcs -out $node] {
+
+	set u [$G arc source $arc]
+	set v [$G arc target $arc]
+
+	if { $value > [$G arc get $arc throughput] } {
+	    set value [ expr { $value - [$G arc get $arc throughput] } ]
+	    dict set b [list $u $v] [ expr { [dict get $b [list $u $v]] + [$G arc get $arc throughput] } ]
+	    $G arc set $arc throughput 0
+	} else {
+	    $G arc set $arc throughput [ expr { [$G arc get $arc throughput] - $value } ]
+	    dict set b [list $u $v] [ expr { [dict get $b [list $u $v]] + $value } ]
+
+	    set value 0
+	    break
+	}
+    }
+
+    return $b
+}
+
+#Subprocedure for blocking-flow finding algorithm by MKM
+#
+#It checks for graph G if node given at input has a exceed
+#or deficiency of throughput.
+#
+#For exceed the positive value of exceed is returned, for deficiency
+#procedure returns negative value. If the incoming throughput
+#is the same as outcoming, procedure returns 0.
+#
+proc ::struct::graph::op::findExcess {G node b} {
+
+    set incoming 0
+    set outcoming 0
+
+    foreach key [dict keys $b] {
+
+	lassign $key u v
+	if { $u eq $node } {
+	    set outcoming [ expr { $outcoming + [dict get $b $key] } ]
+	}
+	if { $v eq $node } {
+	    set incoming [ expr { $incoming + [dict get $b $key] } ]
+	}
+    }
+
+    return [ expr { $incoming - $outcoming } ]
+}
+
+#Travelling Salesman Problem - Heuristic of local searching
+#2 - approximation Algorithm
+#-------------------------------------------------------------------------------------
+#
+
+proc ::struct::graph::op::TSPLocalSearching {G C} {
+
+    foreach arc $C {
+	if { ![$G arc exists $arc] } {
+	    return -code error "Given cycle has arcs not included in graph G."
+	}
+    }
+
+    #initialization
+    set CGraph [struct::graph]
+    set GCopy [struct::graph]
+    set w 0
+
+    foreach node [$G nodes] {
+	$CGraph node insert $node
+	$GCopy node insert $node
+    }
+
+    foreach arc [$G arcs] {
+	set u [$G arc source $arc]
+	set v [$G arc target $arc]
+	$GCopy arc insert $u $v [list $u $v]
+	$GCopy arc set [list $u $v] weight [$G arc get $arc weight]
+    }
+
+    foreach arc $C {
+
+	set u [$G arc source $arc]
+	set v [$G arc target $arc]
+	set arcWeight [$G arc get $arc weight]
+
+	$CGraph arc insert $u $v [list $u $v]
+	$CGraph arc set [list $u $v] weight $arcWeight
+
+	set w [ expr { $w + $arcWeight } ]
+    }
+
+    set reductionDone 1
+
+    while { $reductionDone } {
+
+	set queue {}
+	set reductionDone 0
+
+	#double foreach loop goes through all pairs of arcs
+	foreach i [$CGraph arcs] {
+
+	    #source and target nodes of first arc
+	    set iu [$CGraph arc source $i]
+	    set iv [$CGraph arc target $i]
+
+	    #second arc
+	    foreach j [$CGraph arcs] {
+
+		#if pair of arcs already was considered, continue with next pair of arcs
+		if { [list $j $i] ni $queue } {
+
+		    #add current arc to queue to mark that it was used
+		    lappend queue [list $i $j]
+
+		    set ju [$CGraph arc source $j]
+		    set jv [$CGraph arc target $j]
+
+		    #we consider only arcs that are not adjacent
+		    if { !($iu eq $ju) && !($iu eq $jv) && !($iv eq $ju) && !($iv eq $jv) } {
+
+			#set the current cycle
+			set CPrim [copyGraph $CGraph]
+
+			#transform the current cycle:
+			#1.
+			$CPrim arc delete $i
+			$CPrim arc delete $j
+
+
+			set param 0
+
+			#adding new edges instead of erased ones
+			if { !([$CPrim arc exists [list $iu $ju]] || [$CPrim arc exists [list $iv $jv]] || [$CPrim arc exists [list $ju $iu]] || [$CPrim arc exists [list $jv $iv]] ) } {
+
+			    $CPrim arc insert $iu $ju [list $iu $ju]
+			    $CPrim arc insert $iv $jv [list $iv $jv]
+
+			    if { [$GCopy arc exists [list $iu $ju]] } {
+				$CPrim arc set [list $iu $ju] weight [$GCopy arc get [list $iu $ju] weight]
+			    } else {
+				$CPrim arc set [list $iu $ju] weight [$GCopy arc get [list $ju $iu] weight]
+			    }
+
+			    if { [$GCopy arc exists [list $iv $jv]] } {
+				$CPrim arc set [list $iv $jv] weight [$GCopy arc get [list $iv $jv] weight]
+			    } else {
+				$CPrim arc set [list $iv $jv] weight [$GCopy arc get [list $jv $iv] weight]
+			    }
+			} else {
+			    set param 1
+			}
+
+			$CPrim arc setunweighted 1
+
+			#check if it's still a cycle or if any arcs were added instead those erased
+			if { !([struct::graph::op::distance $CPrim $iu $ju] > 0 ) || $param } {
+
+			    #deleting new edges if they were added before in current iteration
+			    if { !$param } {
+				$CPrim arc delete [list $iu $ju]
+			    }
+
+			    if { !$param } {
+				$CPrim arc delete [list $iv $jv]
+			    }
+
+			    #adding new ones that will assure the graph is still a cycle
+			    $CPrim arc insert $iu $jv [list $iu $jv]
+			    $CPrim arc insert $iv $ju [list $iv $ju]
+
+			    if { [$GCopy arc exists [list $iu $jv]] } {
+				$CPrim arc set [list $iu $jv] weight [$GCopy arc get [list $iu $jv] weight]
+			    } else {
+				$CPrim arc set [list $iu $jv] weight [$GCopy arc get [list $jv $iu] weight]
+			    }
+
+			    if { [$GCopy arc exists [list $iv $ju]] } {
+				$CPrim arc set [list $iv $ju] weight [$GCopy arc get [list $iv $ju] weight]
+			    } else {
+				$CPrim arc set [list $iv $ju] weight [$GCopy arc get [list $ju $iv] weight]
+			    }
+			}
+
+			#count current value of cycle
+			set cycleWeight [countCycleWeight $CPrim]
+
+			#if we found cycle with lesser sum of weights, we set is as a result and
+			#marked that reduction was successful
+			if { $w > $cycleWeight } {
+			    set w $cycleWeight
+			    set reductionDone 1
+			    set C [$CPrim arcs]
+			}
+
+			$CPrim destroy
+		    }
+		}
+	    }
+	}
+
+	#setting the new current cycle if the reduction was successful
+	if { $reductionDone } {
+	    foreach arc [$CGraph arcs] {
+		$CGraph arc delete $arc
+	    }
+	    for {set i 0} { $i < [llength $C] } { incr i } {
+		lset C $i [lsort [lindex $C $i]]
+	    }
+
+	    foreach arc [$GCopy arcs] {
+		if { [lsort $arc] in $C } {
+		    set u [$GCopy arc source $arc]
+		    set v [$GCopy arc target $arc]
+		    $CGraph arc insert $u $v [list $u $v]
+		    $CGraph arc set $arc weight [$GCopy arc get $arc weight]
+		}
+	    }
+	}
+    }
+
+    $GCopy destroy
+    $CGraph destroy
+
+    return $C
+}
+
+proc ::struct::graph::op::copyGraph {G} {
+
+    set newGraph [struct::graph]
+
+    foreach node [$G nodes] {
+	$newGraph node insert $node
+    }
+    foreach arc [$G arcs] {
+	set u [$G arc source $arc]
+	set v [$G arc target $arc]
+	$newGraph arc insert $u $v $arc
+	$newGraph arc set $arc weight [$G arc get $arc weight]
+    }
+
+    return $newGraph
+}
+
+proc ::struct::graph::op::countCycleWeight {G} {
+
+    set result 0
+
+    foreach arc [$G arcs] {
+	set result [ expr { $result + [$G arc get $arc weight] } ]
+    }
+
+    return $result
+}
+
+# ### ### ### ######### ######### #########
+##
+
+# This command finds a minimum spanning tree/forest (MST) of the graph
+# argument, using the algorithm developed by Joseph Kruskal. The
+# result is a set (as list) containing the names of the arcs in the
+# MST. The set of nodes of the MST is implied by set of arcs, and thus
+# not given explicitly. The algorithm does not consider arc
+# directions. Note that unconnected nodes are left out of the result.
+
+# Reference: http://en.wikipedia.org/wiki/Kruskal%27s_algorithm
+
+proc ::struct::graph::op::kruskal {g} {
+    # Check graph argument for proper configuration.
+
+    VerifyWeightsAreOk $g
+
+    # Transient helper data structures. A priority queue for the arcs
+    # under consideration, using their weights as priority, and a
+    # disjoint-set to keep track of the forest of partial minimum
+    # spanning trees we are working with.
+
+    set consider [::struct::prioqueue -dictionary consider]
+    set forest   [::struct::disjointset forest]
+
+    # Start with all nodes in the graph each in their partition.
+
+    foreach n [$g nodes] {
+	$forest add-partition $n
+    }
+
+    # Then fill the queue with all arcs, using their weight to
+    # prioritize. The weight is the cost of the arc. The lesser the
+    # better.
+
+    foreach {arc weight} [$g arc weights] {
+	$consider put $arc $weight
+    }
+
+    # And now we can construct the tree. This is done greedily. In
+    # each round we add the arc with the smallest weight to the
+    # minimum spanning tree, except if doing so would violate the tree
+    # condition.
+
+    set result {}
+
+    while {[$consider size]} {
+	set minarc [$consider get]
+	set origin [$g arc source $minarc]
+	set destin [$g arc target $minarc]
+
+	# Ignore the arc if both ends are in the same partition. Using
+	# it would add a cycle to the result, i.e. it would not be a
+	# tree anymore.
+
+	if {[$forest equal $origin $destin]} continue
+
+	# Take the arc for the result, and merge the trees both ends
+	# are in into a single tree.
+
+	lappend result $minarc
+	$forest merge $origin $destin
+    }
+
+    # We are done. Get rid of the transient helper structures and
+    # return our result.
+
+    $forest   destroy
+    $consider destroy
+
+    return $result
+}
+
+# ### ### ### ######### ######### #########
+##
+
+# This command finds a minimum spanning tree/forest (MST) of the graph
+# argument, using the algorithm developed by Prim. The result is a
+# set (as list) containing the names of the arcs in the MST. The set
+# of nodes of the MST is implied by set of arcs, and thus not given
+# explicitly. The algorithm does not consider arc directions.
+
+# Reference: http://en.wikipedia.org/wiki/Prim%27s_algorithm
+
+proc ::struct::graph::op::prim {g} {
+    VerifyWeightsAreOk $g
+
+    # Fill an array with all nodes, to track which nodes have been
+    # visited at least once. When the inner loop runs out of nodes and
+    # we still have some left over we restart using one of the
+    # leftover as new starting point. In this manner we get the MST of
+    # the whole graph minus unconnected nodes, instead of only the MST
+    # for the component the initial starting node is in.
+
+    array set unvisited {}
+    foreach n [$g nodes] { set unvisited($n) . }
+
+    # Transient helper data structure. A priority queue for the nodes
+    # and arcs under consideration for inclusion into the MST. Each
+    # element of the queue is a list containing node name, a flag bit,
+    # and arc name, in this order. The associated priority is the
+    # weight of the arc. The flag bit is set for the initial queue
+    # entry only, containing a fake (empty) arc, to trigger special
+    # handling.
+
+    set consider [::struct::prioqueue -dictionary consider]
+
+    # More data structures, the result arrays.
+    array set weightmap {} ; # maps nodes to min arc weight seen so
+    # far. This is the threshold other arcs
+    # on this node will have to beat to be
+    # added to the MST.
+    array set arcmap    {} ; # maps arcs to nothing, these are the
+    # arcs in the MST.
+
+    while {[array size unvisited]} {
+	# Choose a 'random' node as the starting point for the inner
+	# loop, prim's algorithm, and put it on the queue for
+	# consideration. Then we iterate until we have considered all
+	# nodes in the its component.
+
+	set startnode [lindex [array names unvisited] 0]
+	$consider put [list $startnode 1 {}] 0
+
+	while {[$consider size] > 0} {
+	    # Pull the next minimum weight to look for. This is the
+	    # priority of the next item we can get from the queue. And the
+	    # associated node/decision/arc data.
+
+	    set arcweight [$consider peekpriority 1]
+
+	    foreach {v arcundefined arc} [$consider get] break
+	    #8.5: lassign [$consider get] v arcundefined arc
+
+	    # Two cases to consider: The node v is already part of the
+	    # MST, or not. If yes we check if the new arcweight is better
+	    # than what we have stored already, and update accordingly.
+
+	    if {[info exists weightmap($v)]} {
+		set currentweight $weightmap($v)
+		if {$arcweight < $currentweight} {
+		    # The new weight is better, update to use it as
+		    # the new threshold. Note that this fill not touch
+		    # any other arcs found for this node, as these are
+		    # still minimal.
+
+		    set weightmap($v) $arcweight
+		    set arcmap($arc)  .
+		}
+	    } else {
+		# Node not yet present. Save weight and arc. The
+		# latter if and only the arc is actually defined. For
+		# the first, initial queue entry, it is not.  Then we
+		# add all the arcs adjacent to the current node to the
+		# queue to consider them in the next rounds.
+
+		set weightmap($v) $arcweight
+		if {!$arcundefined} {
+		    set arcmap($arc) .
+		}
+		foreach adjacentarc [$g arcs -adj $v] {
+		    set weight    [$g arc  getweight   $adjacentarc]
+		    set neighbour [$g node opposite $v $adjacentarc]
+		    $consider put [list $neighbour 0 $adjacentarc] $weight
+		}
+	    }
+
+	    # Mark the node as visited, belonging to the current
+	    # component. Future iterations will ignore it.
+	    unset -nocomplain unvisited($v)
+	}
+    }
+
+    # We are done. Get rid of the transient helper structure and
+    # return our result.
+
+    $consider destroy
+
+    return [array names arcmap]
+}
+
+# ### ### ### ######### ######### #########
+##
+
+# This command checks whether the graph argument is bi-partite or not,
+# and returns the result as a boolean value, true for a bi-partite
+# graph, and false otherwise. A variable can be provided to store the
+# bi-partition into.
+#
+# Reference: http://en.wikipedia.org/wiki/Bipartite_graph
+
+proc ::struct::graph::op::isBipartite? {g {bipartitionvar {}}} {
+
+    # Handle the special cases of empty graphs, or one without arcs
+    # quickly. Both are bi-partite.
+
+    if {$bipartitionvar ne ""} {
+	upvar 1 $bipartitionvar bipartitions
+    }
+    if {![llength [$g nodes]]} {
+	set  bipartitions {{} {}}
+	return 1
+    } elseif {![llength [$g arcs]]} {
+	if {$bipartitionvar ne ""} {
+	    set  bipartitions [list [$g nodes] {}]
+	}
+	return 1
+    }
+
+    # Transient helper data structure, a queue of the nodes waiting
+    # for processing.
+
+    set pending [struct::queue pending]
+    set nodes   [$g nodes]
+
+    # Another structure, a map from node names to their 'color',
+    # indicating which of the two partitions a node belngs to. All
+    # nodes start out as undefined (0). Traversing the arcs we
+    # set and flip them as needed (1,2).
+
+    array set color {}
+    foreach node $nodes {
+	set color($node) 0
+    }
+
+    # Iterating over all nodes we use their connections to traverse
+    # the components and assign colors. We abort when encountering
+    # paradox, as that means that the graph is not bi-partite.
+
+    foreach node $nodes {
+	# Ignore nodes already in the second partition.
+	if {$color($node)} continue
+
+	# Flip the color, then travel the component and check for
+	# conflicts with the neighbours.
+
+	set color($node) 1
+
+	$pending put $node
+	while {[$pending size]} {
+	    set current [$pending get]
+	    foreach neighbour [$g nodes -adj $current] {
+		if {!$color($neighbour)} {
+		    # Exchange the color between current and previous
+		    # nodes, and remember the neighbour for further
+		    # processing.
+		    set color($neighbour) [expr {3 - $color($current)}]
+		    $pending put $neighbour
+		} elseif {$color($neighbour) == $color($current)} {
+		    # Color conflict between adjacent nodes, should be
+		    # different.  This graph is not bi-partite. Kill
+		    # the data structure and abort.
+
+		    $pending destroy
+		    return 0
+		}
+	    }
+	}
+    }
+
+    # The graph is bi-partite. Kill the transient data structure, and
+    # move the partitions into the provided variable, if there is any.
+
+    $pending destroy
+
+    if {$bipartitionvar ne ""} {
+	# Build bipartition, then set the data into the variable
+	# passed as argument to this command.
+
+	set X {}
+	set Y {}
+
+	foreach {node partition} [array get color] {
+	    if {$partition == 1} {
+		lappend X $node
+	    } else {
+		lappend Y $node
+	    }
+	}
+	set bipartitions [list $X $Y]
+    }
+
+    return 1
+}
+
+# ### ### ### ######### ######### #########
+##
+
+# This command computes a maximal matching, if it exists, for the
+# graph argument G and its bi-partition as specified through the node
+# sets X and Y. As is implied, this method requires that the graph is
+# bi-partite. Use the command 'isBipartite?' to check for this
+# property, and to obtain the bi-partition.
+if 0 {
+    proc ::struct::graph::op::maxMatching {g X Y} {
+	return -code error "not implemented yet"
+    }}
+
+# ### ### ### ######### ######### #########
+##
+
+# This command computes the strongly connected components (SCCs) of
+# the graph argument G. The result is a list of node-sets, each set
+# containing the nodes of one SCC of G. In any SCC there is a directed
+# path between any two nodes U, V from U to V. If all SCCs contain
+# only a single node the graph is acyclic.
+
+proc ::struct::graph::op::tarjan {g} {
+    set all [$g nodes]
+
+    # Quick bailout for simple special cases, i.e. graphs without
+    # nodes or arcs.
+    if {![llength $all]} {
+	# No nodes => no SCCs
+	return {}
+    } elseif {![llength [$g arcs]]} {
+	# Have nodes, but no arcs => each node is its own SCC.
+	set r {} ; foreach a $all { lappend r [list $a] }
+	return $r
+    }
+
+    # Transient data structures. Stack of nodes to consider, the
+    # result, and various state arrays. TarjanSub upvar's all them
+    # into its scope.
+
+    set pending [::struct::stack pending]
+    set result  {}
+
+    array set index   {}
+    array set lowlink {}
+    array set instack {}
+
+    # Invoke the main search system while we have unvisited
+    # nodes. TarjanSub will remove all visited nodes from 'all',
+    # ensuring termination.
+
+    while {[llength $all]} {
+	TarjanSub [lindex $all 0] 0
+    }
+
+    # Release the transient structures and return result.
+    $pending destroy
+    return $result
+}
+
+proc ::struct::graph::op::TarjanSub {start counter} {
+    # Import the tracer state from our caller.
+    upvar 1 g g index index lowlink lowlink instack instack result result pending pending all all
+
+    struct::set subtract all $start
+
+    set component {}
+    set   index($start) $counter
+    set lowlink($start) $counter
+    incr counter
+
+    $pending push $start
+    set instack($start) 1
+
+    foreach outarc [$g arcs -out $start] {
+	set neighbour [$g arc target $outarc]
+
+	if {![info exists index($neighbour)]} {
+	    # depth-first-search of reachable nodes from the neighbour
+	    # node. Original from the chosen startnode.
+	    TarjanSub $neighbour $counter
+	    set lowlink($start) [Min $lowlink($start) $lowlink($neighbour)]
+
+	} elseif {[info exists instack($neighbour)]} {
+	    set lowlink($start) [Min $lowlink($start) $lowlink($neighbour)]
+	}
+    }
+
+    # Check if the 'start' node on this recursion level is the root
+    # node of a SCC, and collect the component if yes.
+
+    if {$lowlink($start) == $index($start)} {
+	while {1} {
+	    set v [$pending pop]
+	    unset instack($v)
+	    lappend component $v
+	    if {$v eq $start} break
+	}
+	lappend result $component
+    }
+
+    return
+}
+
+# ### ### ### ######### ######### #########
+##
+
+# This command computes the connected components (CCs) of the graph
+# argument G. The result is a list of node-sets, each set containing
+# the nodes of one CC of G. In any CC there is UN-directed path
+# between any two nodes U, V.
+
+proc ::struct::graph::op::connectedComponents {g} {
+    set all [$g nodes]
+
+    # Quick bailout for simple special cases, i.e. graphs without
+    # nodes or arcs.
+    if {![llength $all]} {
+	# No nodes => no CCs
+	return {}
+    } elseif {![llength [$g arcs]]} {
+	# Have nodes, but no arcs => each node is its own CC.
+	set r {} ; foreach a $all { lappend r [list $a] }
+	return $r
+    }
+
+    # Invoke the main search system while we have unvisited
+    # nodes.
+
+    set result  {}
+    while {[llength $all]} {
+	set component [ComponentOf $g [lindex $all 0]]
+	lappend result $component
+	# all = all - component
+	struct::set subtract all $component
+    }
+    return $result
+}
+
+# A derivative command which computes the connected component (CC) of
+# the graph argument G containing the node N. The result is a node-set
+# containing the nodes of the CC of N in G.
+
+proc ::struct::graph::op::connectedComponentOf {g n} {
+    # Quick bailout for simple special cases
+    if {![$g node exists $n]} {
+	return -code error "node \"$n\" does not exist in graph \"$g\""
+    } elseif {![llength [$g arcs -adj $n]]} {
+	# The chosen node has no neighbours, so is its own CC.
+	return [list $n]
+    }
+
+    # Invoke the main search system for the chosen node.
+
+    return [ComponentOf $g $n]
+}
+
+# Internal helper for finding connected components.
+
+proc ::struct::graph::op::ComponentOf {g start} {
+    set pending [::struct::queue pending]
+    $pending put $start
+
+    array set visited {}
+    set visited($start) .
+
+    while {[$pending size]} {
+	set current [$pending get 1]
+	foreach neighbour [$g nodes -adj $current] {
+	    if {[info exists visited($neighbour)]} continue
+	    $pending put $neighbour
+	    set visited($neighbour) 1
+	}
+    }
+    $pending destroy
+    return [array names visited]
+}
+
+# ### ### ### ######### ######### #########
+##
+
+# This command determines if the specified arc A in the graph G is a
+# bridge, i.e. if its removal will split the connected component its
+# end nodes belong to, into two. The result is a boolean value. Uses
+# the 'ComponentOf' helper command.
+
+proc ::struct::graph::op::isBridge? {g arc} {
+    if {![$g arc exists $arc]} {
+	return -code error "arc \"$arc\" does not exist in graph \"$g\""
+    }
+
+    # Note: We could avoid the need for a copy of the graph if we were
+    # willing to modify G (*). As we are not willing using a copy is
+    # the easiest way to allow us a trivial modification. For the
+    # future consider the creation of a graph class which represents
+    # virtual graphs over a source, generated by deleting nodes and/or
+    # arcs. without actually modifying the source.
+    #
+    # (Ad *): Create a new unnamed helper node X. Move the arc
+    #         destination to X. Recompute the component and ignore
+    #         X. Then move the arc target back to its original node
+    #         and remove X again.
+
+    set src        [$g arc source $arc]
+    set compBefore [ComponentOf $g $src]
+    if {[llength $compBefore] == 1} {
+	# Special case, the arc is a loop on an otherwise unconnected
+	# node. The component will not split, this is not a bridge.
+	return 0
+    }
+
+    set copy       [struct::graph BridgeCopy = $g]
+    $copy arc delete $arc
+    set compAfter  [ComponentOf $copy $src]
+    $copy destroy
+
+    return [expr {[llength $compBefore] != [llength $compAfter]}]
+}
+
+# This command determines if the specified node N in the graph G is a
+# cut vertex, i.e. if its removal will split the connected component
+# it belongs to into two. The result is a boolean value. Uses the
+# 'ComponentOf' helper command.
+
+proc ::struct::graph::op::isCutVertex? {g n} {
+    if {![$g node exists $n]} {
+	return -code error "node \"$n\" does not exist in graph \"$g\""
+    }
+
+    # Note: We could avoid the need for a copy of the graph if we were
+    # willing to modify G (*). As we are not willing using a copy is
+    # the easiest way to allow us a trivial modification. For the
+    # future consider the creation of a graph class which represents
+    # virtual graphs over a source, generated by deleting nodes and/or
+    # arcs. without actually modifying the source.
+    #
+    # (Ad *): Create two new unnamed helper nodes X and Y. Move the
+    #         icoming and outgoing arcs to these helpers. Recompute
+    #         the component and ignore the helpers. Then move the arcs
+    #         back to their original nodes and remove the helpers
+    #         again.
+
+    set compBefore [ComponentOf $g $n]
+
+    if {[llength $compBefore] == 1} {
+	# Special case. The node is unconnected. Its removal will
+	# cause no changes. Therefore not a cutvertex.
+	return 0
+    }
+
+    # We remove the node from the original component, so that we can
+    # select a new start node without fear of hitting on the
+    # cut-vertex candidate. Also makes the comparison later easier
+    # (straight ==).
+    struct::set subtract compBefore $n
+
+    set copy       [struct::graph CutVertexCopy = $g]
+    $copy node delete $n
+    set compAfter  [ComponentOf $copy [lindex $compBefore 0]]
+    $copy destroy
+
+    return [expr {[llength $compBefore] != [llength $compAfter]}]
+}
+
+# This command determines if the graph G is connected.
+
+proc ::struct::graph::op::isConnected? {g} {
+    return [expr { [llength [connectedComponents $g]] == 1 }]
+}
+
+# ### ### ### ######### ######### #########
+##
+
+# This command determines if the specified graph G has an eulerian
+# cycle (aka euler tour, <=> g is eulerian) or not. If yes, it can
+# return the cycle through the named variable, as a list of arcs
+# traversed.
+#
+# Note that for a graph to be eulerian all nodes have to have an even
+# degree, and the graph has to be connected. And if more than two
+# nodes have an odd degree the graph is not even semi-eulerian (cannot
+# even have an euler path).
+
+proc ::struct::graph::op::isEulerian? {g {eulervar {}} {tourstart {}}} {
+    set nodes [$g nodes]
+    if {![llength $nodes] || ![llength [$g arcs]]} {
+	# Quick bailout for special cases. No nodes, or no arcs imply
+	# that no euler cycle is present.
+	return 0
+    }
+
+    # Check the condition regarding even degree nodes, then
+    # connected-ness.
+
+    foreach n $nodes {
+	if {([$g node degree $n] % 2) == 0} continue
+	# Odd degree node found, not eulerian.
+	return 0
+    }
+
+    if {![isConnected? $g]} {
+	return 0
+    }
+
+    # At this point the graph is connected, with all nodes of even
+    # degree. As per Carl Hierholzer the graph has to have an euler
+    # tour. If the user doesn't request it we do not waste the time to
+    # actually compute one.
+
+    if {$tourstart ne ""} {
+	upvar 1 $tourstart start
+    }
+
+    # We start the tour at an arbitrary node.
+    set start [lindex $nodes 0]
+
+    if {$eulervar eq ""} {
+	return 1
+    }
+
+    upvar 1 $eulervar tour
+    Fleury $g $start tour
+    return 1
+}
+
+# This command determines if the specified graph G has an eulerian
+# path (<=> g is semi-eulerian) or not. If yes, it can return the
+# path through the named variable, as a list of arcs traversed.
+#
+# (*) Aka euler tour.
+#
+# Note that for a graph to be semi-eulerian at most two nodes are
+# allowed to have an odd degree, all others have to be of even degree,
+# and the graph has to be connected.
+
+proc ::struct::graph::op::isSemiEulerian? {g {eulervar {}}} {
+    set nodes [$g nodes]
+    if {![llength $nodes] || ![llength [$g arcs]]} {
+	# Quick bailout for special cases. No nodes, or no arcs imply
+	# that no euler path is present.
+	return 0
+    }
+
+    # Check the condition regarding oddd/even degree nodes, then
+    # connected-ness.
+
+    set odd 0
+    foreach n $nodes {
+	if {([$g node degree $n] % 2) == 0} continue
+	incr odd
+	set lastodd $n
+    }
+    if {($odd > 2) || ![isConnected? $g]} {
+	return 0
+    }
+
+    # At this point the graph is connected, with the node degrees
+    # supporting existence of an euler path. If the user doesn't
+    # request it we do not waste the time to actually compute one.
+
+    if {$eulervar eq ""} {
+	return 1
+    }
+
+    upvar 1 $eulervar path
+
+    # We start at either an odd-degree node, or any node, if there are
+    # no odd-degree ones. In the last case we are actually
+    # constructing an euler tour, i.e. a closed path.
+
+    if {$odd} {
+	set start $lastodd
+    } else {
+	set start [lindex $nodes 0]
+    }
+
+    Fleury $g $start path
+    return 1
+}
+
+proc ::struct::graph::op::Fleury {g start eulervar} {
+    upvar 1 $eulervar path
+
+    # We start at the chosen node.
+
+    set copy  [struct::graph FleuryCopy = $g]
+    set path  {}
+
+    # Edges are chosen per Fleury's algorithm. That is easy,
+    # especially as we already have a command to determine whether an
+    # arc is a bridge or not.
+
+    set arcs [$copy arcs]
+    while {![struct::set empty $arcs]} {
+	set adjacent [$copy arcs -adj $start]
+
+	if {[llength $adjacent] == 1} {
+	    # No choice in what arc to traverse.
+	    set arc [lindex $adjacent 0]
+	} else {
+	    # Choose first non-bridge arcs. The euler conditions force
+	    # that at least two such are present.
+
+	    set has 0
+	    foreach arc $adjacent {
+		if {[isBridge? $copy $arc]} {
+		    continue
+		}
+		set has 1
+		break
+	    }
+	    if {!$has} {
+		$copy destroy
+		return -code error {Internal error}
+	    }
+	}
+
+	set start [$copy node opposite $start $arc]
+	$copy arc delete $arc
+	struct::set exclude arcs $arc
+	lappend path $arc
+    }
+
+    $copy destroy
+    return
+}
+
+# ### ### ### ######### ######### #########
+##
+
+# This command uses dijkstra's algorithm to find all shortest paths in
+# the graph G starting at node N. The operation can be configured to
+# traverse arcs directed and undirected, and the format of the result.
+
+proc ::struct::graph::op::dijkstra {g node args} {
+    # Default traversal is undirected.
+    # Default output format is tree.
+
+    set arcTraversal undirected
+    set resultFormat tree
+
+    # Process options to override the defaults, if any.
+    foreach {option param} $args {
+	switch -exact -- $option {
+	    -arcmode {
+		switch -exact -- $param {
+		    directed -
+		    undirected {
+			set arcTraversal $param
+		    }
+		    default {
+			return -code error "Bad value for -arcmode, expected one of \"directed\" or \"undirected\""
+		    }
+		}
+	    }
+	    -outputformat {
+		switch -exact -- $param {
+		    tree -
+		    distances {
+			set resultFormat $param
+		    }
+		    default {
+			return -code error "Bad value for -outputformat, expected one of \"distances\" or \"tree\""
+		    }
+		}
+	    }
+	    default {
+		return -code error "Bad option \"$option\", expected one of \"-arcmode\" or \"-outputformat\""
+	    }
+	}
+    }
+
+    # We expect that all arcs of g are given a weight.
+    VerifyWeightsAreOk $g
+
+    # And the start node has to belong to the graph too, of course.
+    if {![$g node exists $node]} {
+	return -code error "node \"$node\" does not exist in graph \"$g\""
+    }
+
+    # TODO: Quick bailout for special cases (no arcs).
+
+    # Transient and other data structures for the core algorithm.
+    set pending [::struct::prioqueue -dictionary DijkstraQueue]
+    array set distance {} ; # array: node -> distance to 'n'
+    array set previous {} ; # array: node -> parent in shortest path to 'n'.
+    array set visited  {} ; # array: node -> bool, true when node processed
+
+    # Initialize the data structures.
+    foreach n [$g nodes] {
+	set distance($n) Inf
+	set previous($n) undefined
+	set  visited($n) 0
+    }
+
+    # Compute the distances ...
+    $pending put $node 0
+    set distance($node) 0
+    set previous($node) none
+
+    while {[$pending size]} {
+	set current [$pending get]
+	set visited($current) 1
+
+	# Traversal to neighbours according to the chosen mode.
+	if {$arcTraversal eq "undirected"} {
+	    set arcNeighbours [$g arcs -adj $current]
+	} else {
+	    set arcNeighbours [$g arcs -out $current]
+	}
+
+	# Compute distances, record newly discovered nodes, minimize
+	# distances for nodes reachable through multiple paths.
+	foreach arcNeighbour $arcNeighbours {
+	    set cost      [$g arc getweight $arcNeighbour]
+	    set neighbour [$g node opposite $current $arcNeighbour]
+	    set delta     [expr {$distance($current) + $cost}]
+
+	    if {
+		($distance($neighbour) eq "Inf") ||
+		($delta < $distance($neighbour))
+	    } {
+		# First path, or better path to the node folund,
+		# update our records.
+
+		set distance($neighbour) $delta
+		set previous($neighbour) $current
+		if {!$visited($neighbour)} {
+		    $pending put $neighbour $delta
+		}
+	    }
+	}
+    }
+
+    $pending destroy
+
+    # Now generate the result based on the chosen format.
+    if {$resultFormat eq "distances"} {
+	return [array get distance]
+    } else {
+	array set listofprevious {}
+	foreach n [$g nodes] {
+	    set current $n
+	    while {1} {
+		if {$current eq "undefined"} break
+		if {$current eq $node} {
+		    lappend listofprevious($n) $current
+		    break
+		}
+		if {$current ne $n} {
+		    lappend listofprevious($n) $current
+		}
+		set current $previous($current)
+	    }
+	}
+	return [array get listofprevious]
+    }
+}
+
+# This convenience command is a wrapper around dijkstra's algorithm to
+# find the (un)directed distance between two nodes in the graph G.
+
+proc ::struct::graph::op::distance {g origin destination args} {
+    if {![$g node exists $origin]} {
+	return -code error "node \"$origin\" does not exist in graph \"$g\""
+    }
+    if {![$g node exists $destination]} {
+	return -code error "node \"$destination\" does not exist in graph \"$g\""
+    }
+
+    set arcTraversal undirected
+
+    # Process options to override the defaults, if any.
+    foreach {option param} $args {
+	switch -exact -- $option {
+	    -arcmode {
+		switch -exact -- $param {
+		    directed -
+		    undirected {
+			set arcTraversal $param
+		    }
+		    default {
+			return -code error "Bad value for -arcmode, expected one of \"directed\" or \"undirected\""
+		    }
+		}
+	    }
+	    default {
+		return -code error "Bad option \"$option\", expected \"-arcmode\""
+	    }
+	}
+    }
+
+    # Quick bailout for special case: the distance from a node to
+    # itself is zero
+
+    if {$origin eq $destination} {
+	return 0
+    }
+
+    # Compute all distances, then pick and return the one we are
+    # interested in.
+    array set distance [dijkstra $g $origin -outputformat distances -arcmode $arcTraversal]
+    return $distance($destination)
+}
+
+# This convenience command is a wrapper around dijkstra's algorithm to
+# find the (un)directed eccentricity of the node N in the graph G. The
+# eccentricity is the maximal distance to any other node in the graph.
+
+proc ::struct::graph::op::eccentricity {g node args} {
+    if {![$g node exists $node]} {
+	return -code error "node \"$node\" does not exist in graph \"$g\""
+    }
+
+    set arcTraversal undirected
+
+    # Process options to override the defaults, if any.
+    foreach {option param} $args {
+	switch -exact -- $option {
+	    -arcmode {
+		switch -exact -- $param {
+		    directed -
+		    undirected {
+			set arcTraversal $param
+		    }
+		    default {
+			return -code error "Bad value for -arcmode, expected one of \"directed\" or \"undirected\""
+		    }
+		}
+	    }
+	    default {
+		return -code error "Bad option \"$option\", expected \"-arcmode\""
+	    }
+	}
+    }
+
+    # Compute all distances, then pick out the max
+
+    set ecc 0
+    foreach {n distance} [dijkstra $g $node -outputformat distances -arcmode $arcTraversal] {
+	if {$distance eq "Inf"} { return Inf }
+	if {$distance > $ecc} { set ecc $distance }
+    }
+
+    return $ecc
+}
+
+# This convenience command is a wrapper around eccentricity to find
+# the (un)directed radius of the graph G. The radius is the minimal
+# eccentricity over all nodes in the graph.
+
+proc ::struct::graph::op::radius {g args} {
+    return [lindex [RD $g $args] 0]
+}
+
+# This convenience command is a wrapper around eccentricity to find
+# the (un)directed diameter of the graph G. The diameter is the
+# maximal eccentricity over all nodes in the graph.
+
+proc ::struct::graph::op::diameter {g args} {
+    return [lindex [RD $g $args] 1]
+}
+
+proc ::struct::graph::op::RD {g options} {
+    set arcTraversal undirected
+
+    # Process options to override the defaults, if any.
+    foreach {option param} $options {
+	switch -exact -- $option {
+	    -arcmode {
+		switch -exact -- $param {
+		    directed -
+		    undirected {
+			set arcTraversal $param
+		    }
+		    default {
+			return -code error "Bad value for -arcmode, expected one of \"directed\" or \"undirected\""
+		    }
+		}
+	    }
+	    default {
+		return -code error "Bad option \"$option\", expected \"-arcmode\""
+	    }
+	}
+    }
+
+    set radius   Inf
+    set diameter 0
+    foreach n [$g nodes] {
+	set e [eccentricity $g $n -arcmode $arcTraversal]
+	#puts "$n ==> ($e)"
+	if {($e eq "Inf") || ($e > $diameter)} {
+	    set diameter $e
+	}
+	if {($radius eq "Inf") || ($e < $radius)} {
+	    set radius $e
+	}
+    }
+
+    return [list $radius $diameter]
+}
+
+#
+## place holder for operations to come
+#
+
+# ### ### ### ######### ######### #########
+## Internal helpers
+
+proc ::struct::graph::op::Min {first second} {
+    if {$first > $second} {
+	return $second
+    } else {
+	return $first
+    }
+}
+
+proc ::struct::graph::op::Max {first second} {
+    if {$first < $second} {
+	return $second
+    } else {
+	return $first
+    }
+}
+
+# This method verifies that every arc on the graph has a weight
+# assigned to it. This is required for some algorithms.
+proc ::struct::graph::op::VerifyWeightsAreOk {g} {
+    if {![llength [$g arc getunweighted]]} return
+    return -code error "Operation invalid for graph with unweighted arcs."
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct::graph::op {
+    #namespace export ...
+}
+
+package provide struct::graph::op 0.11.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/list.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/list.tcl
new file mode 100644
index 00000000..e0f738db
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/list.tcl
@@ -0,0 +1,1834 @@
+#----------------------------------------------------------------------
+#
+# list.tcl --
+#
+#	Definitions for extended processing of Tcl lists.
+#
+# Copyright (c) 2003 by Kevin B. Kenny.  All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: list.tcl,v 1.27 2011/09/17 14:35:36 mic42 Exp $
+#
+#----------------------------------------------------------------------
+
+package require Tcl 8.4
+package require cmdline
+
+namespace eval ::struct { namespace eval list {} }
+
+namespace eval ::struct::list {
+    namespace export list
+
+    if {0} {
+	# Possibly in the future.
+	namespace export Lassign
+	namespace export LdbJoin
+	namespace export LdbJoinOuter
+	namespace export Ldelete
+	namespace export Lequal
+	namespace export Lfilter
+	namespace export Lfilterfor
+	namespace export Lfirstperm
+	namespace export Lflatten
+	namespace export Lfold
+	namespace export Lforeachperm
+	namespace export Liota
+	namespace export LlcsInvert
+	namespace export LlcsInvert2
+	namespace export LlcsInvertMerge
+	namespace export LlcsInvertMerge2
+	namespace export LlongestCommonSubsequence
+	namespace export LlongestCommonSubsequence2
+	namespace export Lmap
+	namespace export Lmapfor
+	namespace export Lnextperm
+	namespace export Lpermutations
+	namespace export Lrepeat
+	namespace export Lrepeatn
+	namespace export Lreverse
+	namespace export Lshift
+	namespace export Lswap
+	namespace export Lshuffle
+    }
+}
+
+##########################
+# Public functions
+
+# ::struct::list::list --
+#
+#	Command that access all list commands.
+#
+# Arguments:
+#	cmd	Name of the subcommand to dispatch to.
+#	args	Arguments for the subcommand.
+#
+# Results:
+#	Whatever the result of the subcommand is.
+
+proc ::struct::list::list {cmd args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 1 } {
+	return -code error "wrong # args: should be \"$cmd ?arg arg ...?\""
+    }
+    set sub L$cmd
+    if { [llength [info commands ::struct::list::$sub]] == 0 } {
+	set optlist [info commands ::struct::list::L*]
+	set xlist {}
+	foreach p $optlist {
+	    lappend xlist [string range $p 1 end]
+	}
+	return -code error \
+		"bad option \"$cmd\": must be [linsert [join $xlist ", "] "end-1" "or"]"
+    }
+    return [uplevel 1 [linsert $args 0 ::struct::list::$sub]]
+}
+
+##########################
+# Private functions follow
+
+proc ::struct::list::K { x y } { set x }
+
+##########################
+# Implementations of the functionality.
+#
+
+# ::struct::list::LlongestCommonSubsequence --
+#
+#       Computes the longest common subsequence of two lists.
+#
+# Parameters:
+#       sequence1, sequence2 -- Two lists to compare.
+#	maxOccurs -- If provided, causes the procedure to ignore
+#		     lines that appear more than $maxOccurs times
+#		     in the second sequence.  See below for a discussion.
+# Results:
+#       Returns a list of two lists of equal length.
+#       The first sublist is of indices into sequence1, and the
+#       second sublist is of indices into sequence2.  Each corresponding
+#       pair of indices corresponds to equal elements in the sequences;
+#       the sequence returned is the longest possible.
+#
+# Side effects:
+#       None.
+#
+# Notes:
+#
+#	While this procedure is quite rapid for many tasks of file
+# comparison, its performance degrades severely if the second list
+# contains many equal elements (as, for instance, when using this
+# procedure to compare two files, a quarter of whose lines are blank.
+# This drawback is intrinsic to the algorithm used (see the References
+# for details).  One approach to dealing with this problem that is
+# sometimes effective in practice is arbitrarily to exclude elements
+# that appear more than a certain number of times.  This number is
+# provided as the 'maxOccurs' parameter.  If frequent lines are
+# excluded in this manner, they will not appear in the common subsequence
+# that is computed; the result will be the longest common subsequence
+# of infrequent elements.
+#
+#	The procedure struct::list::LongestCommonSubsequence2
+# functions as a wrapper around this procedure; it computes the longest
+# common subsequence of infrequent elements, and then subdivides the
+# subsequences that lie between the matches to approximate the true
+# longest common subsequence.
+#
+# References:
+#	J. W. Hunt and M. D. McIlroy, "An algorithm for differential
+#	file comparison," Comp. Sci. Tech. Rep. #41, Bell Telephone
+#	Laboratories (1976). Available on the Web at the second
+#	author's personal site: http://www.cs.dartmouth.edu/~doug/
+
+proc ::struct::list::LlongestCommonSubsequence {
+    sequence1
+    sequence2
+    {maxOccurs 0x7fffffff}
+} {
+    # Construct a set of equivalence classes of lines in file 2
+
+    set index 0
+    foreach string $sequence2 {
+	lappend eqv($string) $index
+	incr index
+    }
+
+    # K holds descriptions of the common subsequences.
+    # Initially, there is one common subsequence of length 0,
+    # with a fence saying that it includes line -1 of both files.
+    # The maximum subsequence length is 0; position 0 of
+    # K holds a fence carrying the line following the end
+    # of both files.
+
+    lappend K [::list -1 -1 {}]
+    lappend K [::list [llength $sequence1] [llength $sequence2] {}]
+    set k 0
+
+    # Walk through the first file, letting i be the index of the line and
+    # string be the line itself.
+
+    set i 0
+    foreach string $sequence1 {
+	# Consider each possible corresponding index j in the second file.
+
+	if { [info exists eqv($string)]
+	     && [llength $eqv($string)] <= $maxOccurs } {
+
+	    # c is the candidate match most recently found, and r is the
+	    # length of the corresponding subsequence.
+
+	    set r 0
+	    set c [lindex $K 0]
+
+	    foreach j $eqv($string) {
+		# Perform a binary search to find a candidate common
+		# subsequence to which may be appended this match.
+
+		set max $k
+		set min $r
+		set s [expr { $k + 1 }]
+		while { $max >= $min } {
+		    set mid [expr { ( $max + $min ) / 2 }]
+		    set bmid [lindex [lindex $K $mid] 1]
+		    if { $j == $bmid } {
+			break
+		    } elseif { $j < $bmid } {
+			set max [expr {$mid - 1}]
+		    } else {
+			set s $mid
+			set min [expr { $mid + 1 }]
+		    }
+		}
+
+		# Go to the next match point if there is no suitable
+		# candidate.
+
+		if { $j == [lindex [lindex $K $mid] 1] || $s > $k} {
+		    continue
+		}
+
+		# s is the sequence length of the longest sequence
+		# to which this match point may be appended. Make
+		# a new candidate match and store the old one in K
+		# Set r to the length of the new candidate match.
+
+		set newc [::list $i $j [lindex $K $s]]
+		if { $r >= 0 } {
+		    lset K $r $c
+		}
+		set c $newc
+		set r [expr { $s + 1 }]
+
+		# If we've extended the length of the longest match,
+		# we're done; move the fence.
+
+		if { $s >= $k } {
+		    lappend K [lindex $K end]
+		    incr k
+		    break
+		}
+	    }
+
+	    # Put the last candidate into the array
+
+	    lset K $r $c
+	}
+
+	incr i
+    }
+
+    # Package the common subsequence in a convenient form
+
+    set seta {}
+    set setb {}
+    set q [lindex $K $k]
+
+    for { set i 0 } { $i < $k } {incr i } {
+	lappend seta {}
+	lappend setb {}
+    }
+    while { [lindex $q 0] >= 0 } {
+	incr k -1
+	lset seta $k [lindex $q 0]
+	lset setb $k [lindex $q 1]
+	set q [lindex $q 2]
+    }
+
+    return [::list $seta $setb]
+}
+
+# ::struct::list::LlongestCommonSubsequence2 --
+#
+#	Derives an approximation to the longest common subsequence
+#	of two lists.
+#
+# Parameters:
+#	sequence1, sequence2 - Lists to be compared
+#	maxOccurs - Parameter for imprecise matching - see below.
+#
+# Results:
+#       Returns a list of two lists of equal length.
+#       The first sublist is of indices into sequence1, and the
+#       second sublist is of indices into sequence2.  Each corresponding
+#       pair of indices corresponds to equal elements in the sequences;
+#       the sequence returned is an approximation to the longest possible.
+#
+# Side effects:
+#       None.
+#
+# Notes:
+#	This procedure acts as a wrapper around the companion procedure
+#	struct::list::LongestCommonSubsequence and accepts the same
+#	parameters.  It first computes the longest common subsequence of
+#	elements that occur no more than $maxOccurs times in the
+#	second list.  Using that subsequence to align the two lists,
+#	it then tries to augment the subsequence by computing the true
+#	longest common subsequences of the sublists between matched pairs.
+
+proc ::struct::list::LlongestCommonSubsequence2 {
+    sequence1
+    sequence2
+    {maxOccurs 0x7fffffff}
+} {
+    # Derive the longest common subsequence of elements that occur at
+    # most $maxOccurs times
+
+    foreach { l1 l2 } \
+	[LlongestCommonSubsequence $sequence1 $sequence2 $maxOccurs] {
+	    break
+	}
+
+    # Walk through the match points in the sequence just derived.
+
+    set result1 {}
+    set result2 {}
+    set n1 0
+    set n2 0
+    foreach i1 $l1 i2 $l2 {
+	if { $i1 != $n1 && $i2 != $n2 } {
+	    # The match points indicate that there are unmatched
+	    # elements lying between them in both input sequences.
+	    # Extract the unmatched elements and perform precise
+	    # longest-common-subsequence analysis on them.
+
+	    set subl1 [lrange $sequence1 $n1 [expr { $i1 - 1 }]]
+	    set subl2 [lrange $sequence2 $n2 [expr { $i2 - 1 }]]
+	    foreach { m1 m2 } [LlongestCommonSubsequence $subl1 $subl2] break
+	    foreach j1 $m1 j2 $m2 {
+		lappend result1 [expr { $j1 + $n1 }]
+		lappend result2 [expr { $j2 + $n2 }]
+	    }
+	}
+
+	# Add the current match point to the result
+
+	lappend result1 $i1
+	lappend result2 $i2
+	set n1 [expr { $i1 + 1 }]
+	set n2 [expr { $i2 + 1 }]
+    }
+
+    # If there are unmatched elements after the last match in both files,
+    # perform precise longest-common-subsequence matching on them and
+    # add the result to our return.
+
+    if { $n1 < [llength $sequence1] && $n2 < [llength $sequence2] } {
+	set subl1 [lrange $sequence1 $n1 end]
+	set subl2 [lrange $sequence2 $n2 end]
+	foreach { m1 m2 } [LlongestCommonSubsequence $subl1 $subl2] break
+	foreach j1 $m1 j2 $m2 {
+	    lappend result1 [expr { $j1 + $n1 }]
+	    lappend result2 [expr { $j2 + $n2 }]
+	}
+    }
+
+    return [::list $result1 $result2]
+}
+
+# ::struct::list::LlcsInvert --
+#
+#	Takes the data describing a longest common subsequence of two
+#	lists and inverts the information in the sense that the result
+#	of this command will describe the differences between the two
+#	sequences instead of the identical parts.
+#
+# Parameters:
+#	lcsData		longest common subsequence of two lists as
+#			returned by longestCommonSubsequence(2).
+# Results:
+#	Returns a single list whose elements describe the differences
+#	between the original two sequences. Each element describes
+#	one difference through three pieces, the type of the change,
+#	a pair of indices in the first sequence and a pair of indices
+#	into the second sequence, in this order.
+#
+# Side effects:
+#       None.
+
+proc ::struct::list::LlcsInvert {lcsData len1 len2} {
+    return [LlcsInvert2 [::lindex $lcsData 0] [::lindex $lcsData 1] $len1 $len2]
+}
+
+proc ::struct::list::LlcsInvert2 {idx1 idx2 len1 len2} {
+    set result {}
+    set last1 -1
+    set last2 -1
+
+    foreach a $idx1 b $idx2 {
+	# Four possible cases.
+	# a) last1 ... a and last2 ... b are not empty.
+	#    This is a 'change'.
+	# b) last1 ... a is empty, last2 ... b is not.
+	#    This is an 'addition'.
+	# c) last1 ... a is not empty, last2 ... b is empty.
+	#    This is a deletion.
+	# d) If both ranges are empty we can ignore the
+	#    two current indices.
+
+	set empty1 [expr {($a - $last1) <= 1}]
+	set empty2 [expr {($b - $last2) <= 1}]
+
+	if {$empty1 && $empty2} {
+	    # Case (d), ignore the indices
+	} elseif {$empty1} {
+	    # Case (b), 'addition'.
+	    incr last2 ; incr b -1
+	    lappend result [::list added [::list $last1 $a] [::list $last2 $b]]
+	    incr b
+	} elseif {$empty2} {
+	    # Case (c), 'deletion'
+	    incr last1 ; incr a -1
+	    lappend result [::list deleted [::list $last1 $a] [::list $last2 $b]]
+	    incr a
+	} else {
+	    # Case (q), 'change'.
+	    incr last1 ; incr a -1
+	    incr last2 ; incr b -1
+	    lappend result [::list changed [::list $last1 $a] [::list $last2 $b]]
+	    incr a
+	    incr b
+	}
+
+	set last1 $a
+	set last2 $b
+    }
+
+    # Handle the last chunk, using the information about the length of
+    # the original sequences.
+
+    set empty1 [expr {($len1 - $last1) <= 1}]
+    set empty2 [expr {($len2 - $last2) <= 1}]
+
+    if {$empty1 && $empty2} {
+	# Case (d), ignore the indices
+    } elseif {$empty1} {
+	# Case (b), 'addition'.
+	incr last2 ; incr len2 -1
+	lappend result [::list added [::list $last1 $len1] [::list $last2 $len2]]
+    } elseif {$empty2} {
+	# Case (c), 'deletion'
+	incr last1 ; incr len1 -1
+	lappend result [::list deleted [::list $last1 $len1] [::list $last2 $len2]]
+    } else {
+	# Case (q), 'change'.
+	incr last1 ; incr len1 -1
+	incr last2 ; incr len2 -1
+	lappend result [::list changed [::list $last1 $len1] [::list $last2 $len2]]
+    }
+
+    return $result
+}
+
+proc ::struct::list::LlcsInvertMerge {lcsData len1 len2} {
+    return [LlcsInvertMerge2 [::lindex $lcsData 0] [::lindex $lcsData 1] $len1 $len2]
+}
+
+proc ::struct::list::LlcsInvertMerge2 {idx1 idx2 len1 len2} {
+    set result {}
+    set last1 -1
+    set last2 -1
+
+    foreach a $idx1 b $idx2 {
+	# Four possible cases.
+	# a) last1 ... a and last2 ... b are not empty.
+	#    This is a 'change'.
+	# b) last1 ... a is empty, last2 ... b is not.
+	#    This is an 'addition'.
+	# c) last1 ... a is not empty, last2 ... b is empty.
+	#    This is a deletion.
+	# d) If both ranges are empty we can ignore the
+	#    two current indices. For merging we simply
+	#    take the information from the input.
+
+	set empty1 [expr {($a - $last1) <= 1}]
+	set empty2 [expr {($b - $last2) <= 1}]
+
+	if {$empty1 && $empty2} {
+	    # Case (d), add 'unchanged' chunk.
+	    set type --
+	    foreach {type left right} [lindex $result end] break
+	    if {[string match unchanged $type]} {
+		# There is an existing result to extend
+		lset left end $a
+		lset right end $b
+		lset result end [::list unchanged $left $right]
+	    } else {
+		# There is an unchanged result at the start of the list;
+		# it may be extended.
+		lappend result [::list unchanged [::list $a $a] [::list $b $b]]
+	    }
+	} else {
+	    if {$empty1} {
+		# Case (b), 'addition'.
+		incr last2 ; incr b -1
+		lappend result [::list added [::list $last1 $a] [::list $last2 $b]]
+		incr b
+	    } elseif {$empty2} {
+		# Case (c), 'deletion'
+		incr last1 ; incr a -1
+		lappend result [::list deleted [::list $last1 $a] [::list $last2 $b]]
+		incr a
+	    } else {
+		# Case (a), 'change'.
+		incr last1 ; incr a -1
+		incr last2 ; incr b -1
+		lappend result [::list changed [::list $last1 $a] [::list $last2 $b]]
+		incr a
+		incr b
+	    }
+	    # Finally, the two matching lines are a new unchanged region
+	    lappend result [::list unchanged [::list $a $a] [::list $b $b]]
+	}
+	set last1 $a
+	set last2 $b
+    }
+
+    # Handle the last chunk, using the information about the length of
+    # the original sequences.
+
+    set empty1 [expr {($len1 - $last1) <= 1}]
+    set empty2 [expr {($len2 - $last2) <= 1}]
+
+    if {$empty1 && $empty2} {
+	# Case (d), ignore the indices
+    } elseif {$empty1} {
+	# Case (b), 'addition'.
+	incr last2 ; incr len2 -1
+	lappend result [::list added [::list $last1 $len1] [::list $last2 $len2]]
+    } elseif {$empty2} {
+	# Case (c), 'deletion'
+	incr last1 ; incr len1 -1
+	lappend result [::list deleted [::list $last1 $len1] [::list $last2 $len2]]
+    } else {
+	# Case (q), 'change'.
+	incr last1 ; incr len1 -1
+	incr last2 ; incr len2 -1
+	lappend result [::list changed [::list $last1 $len1] [::list $last2 $len2]]
+    }
+
+    return $result
+}
+
+# ::struct::list::Lreverse --
+#
+#	Reverses the contents of the list and returns the reversed
+#	list as the result of the command.
+#
+# Parameters:
+#	sequence	List to be reversed.
+#
+# Results:
+#	The sequence in reverse.
+#
+# Side effects:
+#       None.
+
+proc ::struct::list::Lreverse {sequence} {
+    set l [::llength $sequence]
+
+    # Shortcut for lists where reversing yields the list itself
+    if {$l < 2} {return $sequence}
+
+    # Perform true reversal
+    set res [::list]
+    while {$l} {
+	::lappend res [::lindex $sequence [incr l -1]]
+    }
+    return $res
+}
+
+
+# ::struct::list::Lassign --
+#
+#	Assign list elements to variables.
+#
+# Parameters:
+#	sequence	List to assign
+#	args		Names of the variables to assign to.
+#
+# Results:
+#	The unassigned part of the sequence. Can be empty.
+#
+# Side effects:
+#       None.
+
+# Do a compatibility version of [assign] for pre-8.5 versions of Tcl.
+
+if { [package vcompare [package provide Tcl] 8.5] < 0 } {
+    # 8.4
+    proc ::struct::list::Lassign {sequence v args} {
+	set args [linsert $args 0 $v]
+	set a [::llength $args]
+
+	# Nothing to assign.
+	#if {$a == 0} {return $sequence}
+
+	# Perform assignments
+	set i 0
+	foreach v $args {
+	    upvar 1 $v var
+	    set      var [::lindex $sequence $i]
+	    incr i
+	}
+
+	# Return remainder, if there is any.
+	return [::lrange $sequence $a end]
+}
+
+} else {
+    # For 8.5+ simply redirect the method to the core command.
+
+    interp alias {} ::struct::list::Lassign {} lassign
+}
+
+
+# ::struct::list::Lshift --
+#
+#	Shift a list in a variable one element down, and return first element
+#
+# Parameters:
+#	listvar		Name of variable containing the list to shift.
+#
+# Results:
+#	The first element of the list.
+#
+# Side effects:
+#       After the call the list variable will contain
+#	the second to last elements of the list.
+
+proc ::struct::list::Lshift {listvar} {
+    upvar 1 $listvar list
+    set list [Lassign [K $list [set list {}]] v]
+    return $v
+}
+
+
+# ::struct::list::Lflatten --
+#
+#	Remove nesting from the input
+#
+# Parameters:
+#	sequence	List to flatten
+#
+# Results:
+#	The input list with one or all levels of nesting removed.
+#
+# Side effects:
+#       None.
+
+proc ::struct::list::Lflatten {args} {
+    if {[::llength $args] < 1} {
+	return -code error \
+		"wrong#args: should be \"::struct::list::Lflatten ?-full? ?--? sequence\""
+    }
+
+    set full 0
+    while {[string match -* [set opt [::lindex $args 0]]]} {
+	switch -glob -- $opt {
+	    -full   {set full 1}
+	    --      {
+                set args [::lrange $args 1 end]
+                break ; # fix ticket 6e778502b8 -- break exits while loop
+            }
+	    default {
+		return -code error "Unknown option \"$opt\", should be either -full, or --"
+	    }
+	}
+	set args [::lrange $args 1 end]
+    }
+
+    if {[::llength $args] != 1} {
+	return -code error \
+		"wrong#args: should be \"::struct::list::Lflatten ?-full? ?--? sequence\""
+    }
+
+    set sequence [::lindex $args 0]
+    set cont 1
+    while {$cont} {
+	set cont 0
+	set result [::list]
+	foreach item $sequence {
+	    # catch/llength detects if the item is following the list
+	    # syntax.
+
+	    if {[catch {llength $item} len]} {
+		# Element is not a list in itself, no flatten, add it
+		# as is.
+		lappend result $item
+	    } else {
+		# Element is parseable as list, add all sub-elements
+		# to the result.
+		foreach e $item {
+		    lappend result $e
+		}
+	    }
+	}
+	if {$full && [string compare $sequence $result]} {set cont 1}
+	set sequence $result
+    }
+    return $result
+}
+
+
+# ::struct::list::Lmap --
+#
+#	Apply command to each element of a list and return concatenated results.
+#
+# Parameters:
+#	sequence	List to operate on
+#	cmdprefix	Operation to perform on the elements.
+#
+# Results:
+#	List containing the result of applying cmdprefix to the elements of the
+#	sequence.
+#
+# Side effects:
+#       None of its own, but the command prefix can perform arbitry actions.
+
+proc ::struct::list::Lmap {sequence cmdprefix} {
+    # Shortcut when nothing is to be done.
+    if {[::llength $sequence] == 0} {return $sequence}
+
+    set res [::list]
+    foreach item $sequence {
+	lappend res [uplevel 1 [linsert $cmdprefix end $item]]
+    }
+    return $res
+}
+
+# ::struct::list::Lmapfor --
+#
+#	Apply a script to each element of a list and return concatenated results.
+#
+# Parameters:
+#	sequence	List to operate on
+#	script		The script to run on the elements.
+#
+# Results:
+#	List containing the result of running script on the elements of the
+#	sequence.
+#
+# Side effects:
+#       None of its own, but the script can perform arbitry actions.
+
+proc ::struct::list::Lmapfor {var sequence script} {
+    # Shortcut when nothing is to be done.
+    if {[::llength $sequence] == 0} {return $sequence}
+    upvar 1 $var item
+
+    set res [::list]
+    foreach item $sequence {
+	lappend res [uplevel 1 $script]
+    }
+    return $res
+}
+
+# ::struct::list::Lfilter --
+#
+#	Apply command to each element of a list and return elements passing the test.
+#
+# Parameters:
+#	sequence	List to operate on
+#	cmdprefix	Test to perform on the elements.
+#
+# Results:
+#	List containing the elements of the input passing the test command.
+#
+# Side effects:
+#       None of its own, but the command prefix can perform arbitrary actions.
+
+proc ::struct::list::Lfilter {sequence cmdprefix} {
+    # Shortcut when nothing is to be done.
+    if {[::llength $sequence] == 0} {return $sequence}
+    return [uplevel 1 [::list ::struct::list::Lfold $sequence {} [::list ::struct::list::FTest $cmdprefix]]]
+}
+
+proc ::struct::list::FTest {cmdprefix result item} {
+    set pass [uplevel 1 [::linsert $cmdprefix end $item]]
+    if {$pass} {::lappend result $item}
+    return $result
+}
+
+# ::struct::list::Lfilterfor --
+#
+#	Apply expr condition to each element of a list and return elements passing the test.
+#
+# Parameters:
+#	sequence	List to operate on
+#	expr		Test to perform on the elements.
+#
+# Results:
+#	List containing the elements of the input passing the test expression.
+#
+# Side effects:
+#       None of its own, but the command prefix can perform arbitrary actions.
+
+proc ::struct::list::Lfilterfor {var sequence expr} {
+    # Shortcut when nothing is to be done.
+    if {[::llength $sequence] == 0} {return $sequence}
+
+    upvar 1 $var item
+    set result {}
+    foreach item $sequence {
+	if {[uplevel 1 [::list ::expr $expr]]} {
+	    lappend result $item
+	}
+    }
+    return $result
+}
+
+# ::struct::list::Lsplit --
+#
+#	Apply command to each element of a list and return elements passing
+#	and failing the test. Basic idea by Salvatore Sanfilippo
+#	(http://wiki.tcl.tk/lsplit). The implementation here is mine (AK),
+#	and the interface is slightly different (Command prefix with the
+#	list element given to it as argument vs. variable + script).
+#
+# Parameters:
+#	sequence	List to operate on
+#	cmdprefix	Test to perform on the elements.
+#	args = empty | (varPass varFail)
+#
+# Results:
+#	If the variables are specified then a list containing the
+#	numbers of passing and failing elements, in this
+#	order. Otherwise a list having two elements, the lists of
+#	passing and failing elements, in this order.
+#
+# Side effects:
+#       None of its own, but the command prefix can perform arbitrary actions.
+
+proc ::struct::list::Lsplit {sequence cmdprefix args} {
+    set largs [::llength $args]
+    if {$largs == 0} {
+	# Shortcut when nothing is to be done.
+	if {[::llength $sequence] == 0} {return {{} {}}}
+	return [uplevel 1 [::list [namespace which Lfold] $sequence {} [
+		::list ::struct::list::PFTest $cmdprefix]]]
+    } elseif {$largs == 2} {
+	# Shortcut when nothing is to be done.
+	foreach {pv fv} $args break
+	upvar 1 $pv pass $fv fail
+	if {[::llength $sequence] == 0} {
+	    set pass {}
+	    set fail {}
+	    return {0 0}
+	}
+	foreach {pass fail} [uplevel 1 [
+		::list ::struct::list::Lfold $sequence {} [
+			::list ::struct::list::PFTest $cmdprefix]]] break
+	return [::list [llength $pass] [llength $fail]]
+    } else {
+	return -code error \
+		"wrong#args: should be \"::struct::list::Lsplit sequence cmdprefix ?passVar failVar?"
+    }
+}
+
+proc ::struct::list::PFTest {cmdprefix result item} {
+    set passing [uplevel 1 [::linsert $cmdprefix end $item]]
+    set pass {} ; set fail {}
+    foreach {pass fail} $result break
+    if {$passing} {
+	::lappend pass $item
+    } else {
+	::lappend fail $item
+    }
+    return [::list $pass $fail]
+}
+
+# ::struct::list::Lfold --
+#
+#	Fold list into one value.
+#
+# Parameters:
+#	sequence	List to operate on
+#	cmdprefix	Operation to perform on the elements.
+#
+# Results:
+#	Result of applying cmdprefix to the elements of the
+#	sequence.
+#
+# Side effects:
+#       None of its own, but the command prefix can perform arbitry actions.
+
+proc ::struct::list::Lfold {sequence initialvalue cmdprefix} {
+    # Shortcut when nothing is to be done.
+    if {[::llength $sequence] == 0} {return $initialvalue}
+
+    set res $initialvalue
+    foreach item $sequence {
+	set res [uplevel 1 [linsert $cmdprefix end $res $item]]
+    }
+    return $res
+}
+
+# ::struct::list::Liota --
+#
+#	Return a list containing the integer numbers 0 ... n-1
+#
+# Parameters:
+#	n	First number not in the generated list.
+#
+# Results:
+#	A list containing integer numbers.
+#
+# Side effects:
+#       None
+
+proc ::struct::list::Liota {n} {
+    set retval [::list]
+    for {set i 0} {$i < $n} {incr i} {
+	::lappend retval $i
+    }
+    return $retval
+}
+
+# ::struct::list::Ldelete --
+#
+#	Delete an element from a list by name.
+#	Similar to 'struct::set exclude', however
+#	this here preserves order and list intrep.
+#
+# Parameters:
+#	a	First list to compare.
+#	b	Second list to compare.
+#
+# Results:
+#	A boolean. True if the lists are delete.
+#
+# Side effects:
+#       None
+
+proc ::struct::list::Ldelete {var item} {
+    upvar 1 $var list
+    set pos [lsearch -exact $list $item]
+    if {$pos < 0} return
+    set list [lreplace [K $list [set list {}]] $pos $pos]
+    return
+}
+
+# ::struct::list::Lequal --
+#
+#	Compares two lists for equality
+#	(Same length, Same elements in same order).
+#
+# Parameters:
+#	a	First list to compare.
+#	b	Second list to compare.
+#
+# Results:
+#	A boolean. True if the lists are equal.
+#
+# Side effects:
+#       None
+
+proc ::struct::list::Lequal {a b} {
+    # Author of this command is "Richard Suchenwirth"
+
+    if {[::llength $a] != [::llength $b]} {return 0}
+    if {[::lindex $a 0] == $a && [::lindex $b 0] == $b} {return [string equal $a $b]}
+    foreach i $a j $b {if {![Lequal $i $j]} {return 0}}
+    return 1
+}
+
+# ::struct::list::Lrepeatn --
+#
+#	Create a list repeating the same value over again.
+#
+# Parameters:
+#	value	value to use in the created list.
+#	args	Dimension(s) of the (nested) list to create.
+#
+# Results:
+#	A list
+#
+# Side effects:
+#       None
+
+proc ::struct::list::Lrepeatn {value args} {
+    if {[::llength $args] == 1} {set args [::lindex $args 0]}
+    set buf {}
+    foreach number $args {
+	incr number 0 ;# force integer (1)
+	set buf {}
+	for {set i 0} {$i<$number} {incr i} {
+	    ::lappend buf $value
+	}
+	set value $buf
+    }
+    return $buf
+    # (1): See 'Stress testing' (wiki) for why this makes the code safer.
+}
+
+# ::struct::list::Lrepeat --
+#
+#	Create a list repeating the same value over again.
+#	[Identical to the Tcl 8.5 lrepeat command]
+#
+# Parameters:
+#	n	Number of replications.
+#	args	values to use in the created list.
+#
+# Results:
+#	A list
+#
+# Side effects:
+#       None
+
+# Do a compatibility version of [repeat] for pre-8.5 versions of Tcl.
+
+if { [package vcompare [package provide Tcl] 8.5] < 0 } {
+
+    proc ::struct::list::Lrepeat {positiveCount value args} {
+	if {![string is integer -strict $positiveCount]} {
+	    return -code error "expected integer but got \"$positiveCount\""
+	} elseif {$positiveCount < 1} {
+	    return -code error {must have a count of at least 1}
+	}
+
+	set args   [linsert $args 0 $value]
+
+	if {$positiveCount == 1} {
+	    # Tcl itself has already listified the incoming parameters
+	    # via 'args'.
+	    return $args
+	}
+
+	set result [::list]
+	while {$positiveCount > 0} {
+	    if {($positiveCount % 2) == 0} {
+		set args [concat $args $args]
+		set positiveCount [expr {$positiveCount/2}]
+	    } else {
+		set result [concat $result $args]
+		incr positiveCount -1
+	    }
+	}
+	return $result
+    }
+
+} else {
+    # For 8.5 simply redirect the method to the core command.
+
+    interp alias {} ::struct::list::Lrepeat {} lrepeat
+}
+
+# ::struct::list::LdbJoin(Keyed) --
+#
+#	Relational table joins.
+#
+# Parameters:
+#	args	key specs and tables to join
+#
+# Results:
+#	A table/matrix as nested list. See
+#	struct/matrix set/get rect for structure.
+#
+# Side effects:
+#       None
+
+proc ::struct::list::LdbJoin {args} {
+    # --------------------------------
+    # Process options ...
+
+    set mode   inner
+    set keyvar {}
+
+    while {[llength $args]} {
+        set err [::cmdline::getopt args {inner left right full keys.arg} opt arg]
+	if {$err == 1} {
+	    if {[string equal $opt keys]} {
+		set keyvar $arg
+	    } else {
+		set mode $opt
+	    }
+	} elseif {$err < 0} {
+	    return -code error "wrong#args: dbJoin ?-inner|-left|-right|-full? ?-keys varname? \{key table\}..."
+	} else {
+	    # Non-option argument found, stop processing.
+	    break
+	}
+    }
+
+    set inner       [string equal $mode inner]
+    set innerorleft [expr {$inner || [string equal $mode left]}]
+
+    # --------------------------------
+    # Process tables ...
+
+    if {([llength $args] % 2) != 0} {
+	return -code error "wrong#args: dbJoin ?-inner|-left|-right|-full? \{key table\}..."
+    }
+
+    # One table only, join is identity
+    if {[llength $args] == 2} {return [lindex $args 1]}
+
+    # Use first table for setup.
+
+    foreach {key table} $args break
+
+    # Check for possible early abort
+    if {$innerorleft && ([llength $table] == 0)} {return {}}
+
+    set width 0
+    array set state {}
+
+    set keylist [InitMap state width $key $table]
+
+    # Extend state with the remaining tables.
+
+    foreach {key table} [lrange $args 2 end] {
+	# Check for possible early abort
+	if {$inner && ([llength $table] == 0)} {return {}}
+
+	switch -exact -- $mode {
+	    inner {set keylist [MapExtendInner      state       $key $table]}
+	    left  {set keylist [MapExtendLeftOuter  state width $key $table]}
+	    right {set keylist [MapExtendRightOuter state width $key $table]}
+	    full  {set keylist [MapExtendFullOuter  state width $key $table]}
+	}
+
+	# Check for possible early abort
+	if {$inner && ([llength $keylist] == 0)} {return {}}
+    }
+
+    if {[string length $keyvar]} {
+	upvar 1 $keyvar keys
+	set             keys $keylist
+    }
+
+    return [MapToTable state $keylist]
+}
+
+proc ::struct::list::LdbJoinKeyed {args} {
+    # --------------------------------
+    # Process options ...
+
+    set mode   inner
+    set keyvar {}
+
+    while {[llength $args]} {
+        set err [::cmdline::getopt args {inner left right full keys.arg} opt arg]
+	if {$err == 1} {
+	    if {[string equal $opt keys]} {
+		set keyvar $arg
+	    } else {
+		set mode $opt
+	    }
+	} elseif {$err < 0} {
+	    return -code error "wrong#args: dbJoin ?-inner|-left|-right|-full? table..."
+	} else {
+	    # Non-option argument found, stop processing.
+	    break
+	}
+    }
+
+    set inner       [string equal $mode inner]
+    set innerorleft [expr {$inner || [string equal $mode left]}]
+
+    # --------------------------------
+    # Process tables ...
+
+    # One table only, join is identity
+    if {[llength $args] == 1} {
+	return [Dekey [lindex $args 0]]
+    }
+
+    # Use first table for setup.
+
+    set table [lindex $args 0]
+
+    # Check for possible early abort
+    if {$innerorleft && ([llength $table] == 0)} {return {}}
+
+    set width 0
+    array set state {}
+
+    set keylist [InitKeyedMap state width $table]
+
+    # Extend state with the remaining tables.
+
+    foreach table [lrange $args 1 end] {
+	# Check for possible early abort
+	if {$inner && ([llength $table] == 0)} {return {}}
+
+	switch -exact -- $mode {
+	    inner {set keylist [MapKeyedExtendInner      state       $table]}
+	    left  {set keylist [MapKeyedExtendLeftOuter  state width $table]}
+	    right {set keylist [MapKeyedExtendRightOuter state width $table]}
+	    full  {set keylist [MapKeyedExtendFullOuter  state width $table]}
+	}
+
+	# Check for possible early abort
+	if {$inner && ([llength $keylist] == 0)} {return {}}
+    }
+
+    if {[string length $keyvar]} {
+	upvar 1 $keyvar keys
+	set             keys $keylist
+    }
+
+    return [MapToTable state $keylist]
+}
+
+## Helpers for the relational joins.
+## Map is an array mapping from keys to a list
+## of rows with that key
+
+proc ::struct::list::Cartesian {leftmap rightmap key} {
+    upvar $leftmap left $rightmap right
+    set joined [::list]
+    foreach lrow $left($key) {
+	foreach row $right($key) {
+	    lappend joined [concat $lrow $row]
+	}
+    }
+    set left($key) $joined
+    return
+}
+
+proc ::struct::list::SingleRightCartesian {mapvar key rightrow} {
+    upvar $mapvar map
+    set joined [::list]
+    foreach lrow $map($key) {
+	lappend joined [concat $lrow $rightrow]
+    }
+    set map($key) $joined
+    return
+}
+
+proc ::struct::list::MapToTable {mapvar keys} {
+    # Note: keys must not appear multiple times in the list.
+
+    upvar $mapvar map
+    set table [::list]
+    foreach k $keys {
+	foreach row $map($k) {lappend table $row}
+    }
+    return $table
+}
+
+## More helpers, core join operations: Init, Extend.
+
+proc ::struct::list::InitMap {mapvar wvar key table} {
+    upvar $mapvar map $wvar width
+    set width [llength [lindex $table 0]]
+    foreach row $table {
+	set keyval [lindex $row $key]
+	if {[info exists map($keyval)]} {
+	    lappend map($keyval) $row
+	} else {
+	    set map($keyval) [::list $row]
+	}
+    }
+    return [array names map]
+}
+
+proc ::struct::list::MapExtendInner {mapvar key table} {
+    upvar $mapvar map
+    array set used {}
+
+    # Phase I - Find all keys in the second table matching keys in the
+    # first. Remember all their rows.
+    foreach row $table {
+	set keyval [lindex $row $key]
+	if {[info exists map($keyval)]} {
+	    if {[info exists used($keyval)]} {
+		lappend used($keyval) $row
+	    } else {
+		set used($keyval) [::list $row]
+	    }
+	} ; # else: Nothing to do for missing keys.
+    }
+
+    # Phase II - Merge the collected rows of the second (right) table
+    # into the map, and eliminate all entries which have no keys in
+    # the second table.
+    foreach k [array names map] {
+	if {[info exists  used($k)]} {
+	    Cartesian map used $k
+	} else {
+	    unset map($k)
+	}
+    }
+    return [array names map]
+}
+
+proc ::struct::list::MapExtendRightOuter {mapvar wvar key table} {
+    upvar $mapvar map $wvar width
+    array set used {}
+
+    # Phase I - We keep all keys of the right table, even if they are
+    # missing in the left one <=> Definition of right outer join.
+
+    set w [llength [lindex $table 0]]
+    foreach row $table {
+	set keyval [lindex $row $key]
+	if {[info exists used($keyval)]} {
+	    lappend used($keyval) $row
+	} else {
+	    set used($keyval) [::list $row]
+	}
+    }
+
+    # Phase II - Merge the collected rows of the second (right) table
+    # into the map, and eliminate all entries which have no keys in
+    # the second table. If there is nothing in the left table we
+    # create an appropriate empty row for the cartesian => definition
+    # of right outer join.
+
+    # We go through used, because map can be empty for outer
+
+    foreach k [array names map] {
+	if {![info exists used($k)]} {
+	    unset map($k)
+	}
+    }
+    foreach k [array names used] {
+	if {![info exists map($k)]} {
+	    set map($k) [::list [Lrepeatn {} $width]]
+	}
+	Cartesian map used $k
+    }
+
+    incr width $w
+    return [array names map]
+}
+
+proc ::struct::list::MapExtendLeftOuter {mapvar wvar key table} {
+    upvar $mapvar map $wvar width
+    array set used {}
+
+    ## Keys: All in inner join + additional left keys 
+    ##       == All left keys = array names map after
+    ##          all is said and done with it.
+
+    # Phase I - Find all keys in the second table matching keys in the
+    # first. Remember all their rows.
+    set w [llength [lindex $table 0]]
+    foreach row $table {
+	set keyval [lindex $row $key]
+	if {[info exists map($keyval)]} {
+	    if {[info exists used($keyval)]} {
+		lappend used($keyval) $row
+	    } else {
+		set used($keyval) [::list $row]
+	    }
+	} ; # else: Nothing to do for missing keys.
+    }
+
+    # Phase II - Merge the collected rows of the second (right) table
+    # into the map. We keep entries which have no keys in the second
+    # table, we actually extend them <=> Left outer join.
+
+    foreach k [array names map] {
+	if {[info exists  used($k)]} {
+	    Cartesian map used $k
+	} else {
+	    SingleRightCartesian map $k [Lrepeatn {} $w]
+	}
+    }
+    incr width $w
+    return [array names map]
+}
+
+proc ::struct::list::MapExtendFullOuter {mapvar wvar key table} {
+    upvar $mapvar map $wvar width
+    array set used {}
+
+    # Phase I - We keep all keys of the right table, even if they are
+    # missing in the left one <=> Definition of right outer join.
+
+    set w [llength [lindex $table 0]]
+    foreach row $table {
+	set keyval [lindex $row $key]
+	if {[info exists used($keyval)]} {
+	    lappend used($keyval) $row
+	} else {
+	    lappend keylist $keyval
+	    set used($keyval) [::list $row]
+	}
+    }
+
+    # Phase II - Merge the collected rows of the second (right) table
+    # into the map. We keep entries which have no keys in the second
+    # table, we actually extend them <=> Left outer join.
+    # If there is nothing in the left table we create an appropriate
+    # empty row for the cartesian => definition of right outer join.
+
+    # We go through used, because map can be empty for outer
+
+    foreach k [array names map] {
+	if {![info exists used($k)]} {
+	    SingleRightCartesian map $k [Lrepeatn {} $w]
+	}
+    }
+    foreach k [array names used] {
+	if {![info exists map($k)]} {
+	    set map($k) [::list [Lrepeatn {} $width]]
+	}
+	Cartesian map used $k
+    }
+
+    incr width $w
+    return [array names map]
+}
+
+## Keyed helpers
+
+proc ::struct::list::InitKeyedMap {mapvar wvar table} {
+    upvar $mapvar map $wvar width
+    set width [llength [lindex [lindex $table 0] 1]]
+    foreach row $table {
+	foreach {keyval rowdata} $row break
+	if {[info exists map($keyval)]} {
+	    lappend map($keyval) $rowdata
+	} else {
+	    set map($keyval) [::list $rowdata]
+	}
+    }
+    return [array names map]
+}
+
+proc ::struct::list::MapKeyedExtendInner {mapvar table} {
+    upvar $mapvar map
+    array set used {}
+
+    # Phase I - Find all keys in the second table matching keys in the
+    # first. Remember all their rows.
+    foreach row $table {
+	foreach {keyval rowdata} $row break
+	if {[info exists map($keyval)]} {
+	    if {[info exists used($keyval)]} {
+		lappend used($keyval) $rowdata
+	    } else {
+		set used($keyval) [::list $rowdata]
+	    }
+	} ; # else: Nothing to do for missing keys.
+    }
+
+    # Phase II - Merge the collected rows of the second (right) table
+    # into the map, and eliminate all entries which have no keys in
+    # the second table.
+    foreach k [array names map] {
+	if {[info exists  used($k)]} {
+	    Cartesian map used $k
+	} else {
+	    unset map($k)
+	}
+    }
+
+    return [array names map]
+}
+
+proc ::struct::list::MapKeyedExtendRightOuter {mapvar wvar table} {
+    upvar $mapvar map $wvar width
+    array set used {}
+
+    # Phase I - We keep all keys of the right table, even if they are
+    # missing in the left one <=> Definition of right outer join.
+
+    set w [llength [lindex $table 0]]
+    foreach row $table {
+	foreach {keyval rowdata} $row break
+	if {[info exists used($keyval)]} {
+	    lappend used($keyval) $rowdata
+	} else {
+	    set used($keyval) [::list $rowdata]
+	}
+    }
+
+    # Phase II - Merge the collected rows of the second (right) table
+    # into the map, and eliminate all entries which have no keys in
+    # the second table. If there is nothing in the left table we
+    # create an appropriate empty row for the cartesian => definition
+    # of right outer join.
+
+    # We go through used, because map can be empty for outer
+
+    foreach k [array names map] {
+	if {![info exists used($k)]} {
+	    unset map($k)
+	}
+    }
+    foreach k [array names used] {
+	if {![info exists map($k)]} {
+	    set map($k) [::list [Lrepeatn {} $width]]
+	}
+	Cartesian map used $k
+    }
+
+    incr width $w
+    return [array names map]
+}
+
+proc ::struct::list::MapKeyedExtendLeftOuter {mapvar wvar table} {
+    upvar $mapvar map $wvar width
+    array set used {}
+
+    ## Keys: All in inner join + additional left keys 
+    ##       == All left keys = array names map after
+    ##          all is said and done with it.
+
+    # Phase I - Find all keys in the second table matching keys in the
+    # first. Remember all their rows.
+    set w [llength [lindex $table 0]]
+    foreach row $table {
+	foreach {keyval rowdata} $row break
+	if {[info exists map($keyval)]} {
+	    if {[info exists used($keyval)]} {
+		lappend used($keyval) $rowdata
+	    } else {
+		set used($keyval) [::list $rowdata]
+	    }
+	} ; # else: Nothing to do for missing keys.
+    }
+
+    # Phase II - Merge the collected rows of the second (right) table
+    # into the map. We keep entries which have no keys in the second
+    # table, we actually extend them <=> Left outer join.
+
+    foreach k [array names map] {
+	if {[info exists  used($k)]} {
+	    Cartesian map used $k
+	} else {
+	    SingleRightCartesian map $k [Lrepeatn {} $w]
+	}
+    }
+    incr width $w
+    return [array names map]
+}
+
+proc ::struct::list::MapKeyedExtendFullOuter {mapvar wvar table} {
+    upvar $mapvar map $wvar width
+    array set used {}
+
+    # Phase I - We keep all keys of the right table, even if they are
+    # missing in the left one <=> Definition of right outer join.
+
+    set w [llength [lindex $table 0]]
+    foreach row $table {
+	foreach {keyval rowdata} $row break
+	if {[info exists used($keyval)]} {
+	    lappend used($keyval) $rowdata
+	} else {
+	    lappend keylist $keyval
+	    set used($keyval) [::list $rowdata]
+	}
+    }
+
+    # Phase II - Merge the collected rows of the second (right) table
+    # into the map. We keep entries which have no keys in the second
+    # table, we actually extend them <=> Left outer join.
+    # If there is nothing in the left table we create an appropriate
+    # empty row for the cartesian => definition of right outer join.
+
+    # We go through used, because map can be empty for outer
+
+    foreach k [array names map] {
+	if {![info exists used($k)]} {
+	    SingleRightCartesian map $k [Lrepeatn {} $w]
+	}
+    }
+    foreach k [array names used] {
+	if {![info exists map($k)]} {
+	    set map($k) [::list [Lrepeatn {} $width]]
+	}
+	Cartesian map used $k
+    }
+
+    incr width $w
+    return [array names map]
+}
+
+proc ::struct::list::Dekey {keyedtable} {
+    set table [::list]
+    foreach row $keyedtable {lappend table [lindex $row 1]}
+    return $table
+}
+
+# ::struct::list::Lswap --
+#
+#	Exchange two elements of a list.
+#
+# Parameters:
+#	listvar	Name of the variable containing the list to manipulate.
+#	i, j	Indices of the list elements to exchange.
+#
+# Results:
+#	The modified list
+#
+# Side effects:
+#       None
+
+proc ::struct::list::Lswap {listvar i j} {
+    upvar $listvar list
+
+    if {($i < 0) || ($j < 0)} {
+	return -code error {list index out of range}
+    }
+    set len [llength $list]
+    if {($i >= $len) || ($j >= $len)} {
+	return -code error {list index out of range}
+    }
+
+    if {$i != $j} {
+	set tmp      [lindex $list $i]
+	lset list $i [lindex $list $j]
+	lset list $j $tmp
+    }
+    return $list
+}
+
+# ::struct::list::Lfirstperm --
+#
+#	Returns the lexicographically first permutation of the
+#	specified list.
+#
+# Parameters:
+#	list	The list whose first permutation is sought.
+#
+# Results:
+#	A modified list containing the lexicographically first
+#	permutation of the input.
+#
+# Side effects:
+#       None
+
+proc ::struct::list::Lfirstperm {list} {
+    return [lsort $list]
+}
+
+# ::struct::list::Lnextperm --
+#
+#	Accepts a permutation of a set of elements and returns the
+#	next permutatation in lexicographic sequence.
+#
+# Parameters:
+#	list	The list containing the current permutation.
+#
+# Results:
+#	A modified list containing the lexicographically next
+#	permutation after the input permutation.
+#
+# Side effects:
+#       None
+
+proc ::struct::list::Lnextperm {perm} {
+    # Find the smallest subscript j such that we have already visited
+    # all permutations beginning with the first j elements.
+
+    set len [expr {[llength $perm] - 1}]
+
+    set j $len
+    set ajp1 [lindex $perm $j]
+    while { $j > 0 } {
+	incr j -1
+	set aj [lindex $perm $j]
+	if { [string compare $ajp1 $aj] > 0 } {
+	    set foundj {}
+	    break
+	}
+	set ajp1 $aj
+    }
+    if { ![info exists foundj] } return
+
+    # Find the smallest element greater than the j'th among the elements
+    # following aj. Let its index be l, and interchange aj and al.
+
+    set l $len
+    while { [string compare $aj [set al [lindex $perm $l]]] >= 0 } {
+	incr l -1
+    }
+    lset perm $j $al
+    lset perm $l $aj
+
+    # Reverse a_j+1 ... an
+
+    set k [expr {$j + 1}]
+    set l $len
+    while { $k < $l } {
+	set al [lindex $perm $l]
+	lset perm $l [lindex $perm $k]
+	lset perm $k $al
+	incr k
+	incr l -1
+    }
+
+    return $perm
+}
+
+# ::struct::list::Lpermutations --
+#
+#	Returns a list containing all the permutations of the
+#	specified list, in lexicographic order.
+#
+# Parameters:
+#	list	The list whose permutations are sought.
+#
+# Results:
+#	A list of lists, containing all	permutations of the
+#	input.
+#
+# Side effects:
+#       None
+
+proc ::struct::list::Lpermutations {list} {
+
+    if {[llength $list] < 2} {
+	return [::list $list]
+    }
+
+    set res {}
+    set p [Lfirstperm $list]
+    while {[llength $p]} {
+	lappend res $p
+	set p [Lnextperm $p]
+    }
+    return $res
+}
+
+# ::struct::list::Lforeachperm --
+#
+#	Executes a script for all the permutations of the
+#	specified list, in lexicographic order.
+#
+# Parameters:
+#	var	Name of the loop variable.
+#	list	The list whose permutations are sought.
+#	body	The tcl script to run per permutation of
+#		the input.
+#
+# Results:
+#	The empty string.
+#
+# Side effects:
+#       None
+
+proc ::struct::list::Lforeachperm {var list body} {
+    upvar $var loopvar
+
+    if {[llength $list] < 2} {
+	set loopvar $list
+	# TODO run body.
+
+	# The first invocation of the body, also the last, as only one
+	# permutation is possible. That makes handling of the result
+	# codes easier.
+
+	set code [catch {uplevel 1 $body} result]
+
+	# decide what to do upon the return code:
+	#
+	#               0 - the body executed successfully
+	#               1 - the body raised an error
+	#               2 - the body invoked [return]
+	#               3 - the body invoked [break]
+	#               4 - the body invoked [continue]
+	# everything else - return and pass on the results
+	#
+	switch -exact -- $code {
+	    0 {}
+	    1 {
+		return -errorinfo [ErrorInfoAsCaller uplevel foreachperm]  \
+		    -errorcode $::errorCode -code error $result
+	    }
+	    3 {}
+	    4 {}
+	    default {
+		# Includes code 2
+		return -code $code $result
+	    }
+	}
+	return
+    }
+
+    set p [Lfirstperm $list]
+    while {[llength $p]} {
+	set loopvar $p
+
+	set code [catch {uplevel 1 $body} result]
+
+	# decide what to do upon the return code:
+	#
+	#               0 - the body executed successfully
+	#               1 - the body raised an error
+	#               2 - the body invoked [return]
+	#               3 - the body invoked [break]
+	#               4 - the body invoked [continue]
+	# everything else - return and pass on the results
+	#
+	switch -exact -- $code {
+	    0 {}
+	    1 {
+		return -errorinfo [ErrorInfoAsCaller uplevel foreachperm]  \
+		    -errorcode $::errorCode -code error $result
+	    }
+	    3 {
+		# FRINK: nocheck
+		return
+	    }
+	    4 {}
+	    default {
+		return -code $code $result
+	    }
+	}
+	set p [Lnextperm $p]
+    }
+    return
+}
+
+proc ::struct::list::Lshuffle {list} {
+    for {set i [llength $list]} {$i > 1} {lset list $j $t} {
+	set j [expr {int(rand() * $i)}]
+	set t [lindex $list [incr i -1]]
+	lset list $i [lindex $list $j]
+    }
+    return $list
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::struct::list::ErrorInfoAsCaller {find replace} {
+    set info $::errorInfo
+    set i [string last "\n    (\"$find" $info]
+    if {$i == -1} {return $info}
+    set result [string range $info 0 [incr i 6]]	;# keep "\n    (\""
+    append result $replace			;# $find -> $replace
+    incr i [string length $find]
+    set j [string first ) $info [incr i]]	;# keep rest of parenthetical
+    append result [string range $info $i $j]
+    return $result
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Get 'list::list' into the general structure namespace.
+    namespace import -force list::list
+    namespace export list
+}
+package provide struct::list 1.8.5
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/list.test.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/list.test.tcl
new file mode 100644
index 00000000..ae0403a9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/list.test.tcl
@@ -0,0 +1,1292 @@
+
+namespace eval ::struct::list::test {}
+
+proc ::struct::list::test::main {} {
+	test list-lcs-1.1 {longestCommonSubsequence, no args} {
+		catch { lcs } msg
+		set msg
+	} [tcltest::wrongNumArgs ::struct::list::LlongestCommonSubsequence \
+		   {sequence1 sequence2 ?maxOccurs?} 0]
+
+	test list-lcs-1.2 {longestCommonSubsequence, one arg} {
+		catch { lcs x } msg
+		set msg
+	} [tcltest::wrongNumArgs ::struct::list::LlongestCommonSubsequence \
+		   {sequence1 sequence2 ?maxOccurs?} 1]
+
+	test list-lcs-2.1 {longestCommonSubsequence, two empty lists} {
+		list [catch { lcs {} {} } msg] $msg
+	} {0 {{} {}}}
+
+	test list-lcs-2.2 {longestCommonSubsequence, insert 1 into an empty list} {
+		list [catch { lcs {} {a} } msg] $msg
+	} {0 {{} {}}}
+
+	test list-lcs-2.3 {longestCommonSubsequence, delete 1 from singleton list} {
+		list [catch { lcs {a} {} } msg] $msg
+	} {0 {{} {}}}
+
+	test list-lcs-2.4 {longestCommonSubsequence, preserve singleton list} {
+		list [catch { lcs {a} {a} } msg] $msg
+	} {0 {0 0}}
+
+	test list-lcs-2.5 {longestCommonSubsequence, 1-element change in singleton list} {
+		list [catch { lcs {a} {b} } msg] $msg
+	} {0 {{} {}}}
+
+	test list-lcs-2.6 {longestCommonSubsequence, insert 1 in front of singleton list} {
+		list [catch { lcs {a} {b a} } msg] $msg
+	} {0 {0 1}}
+
+	test list-lcs-2.7 {longestCommonSubsequence, insert 1 at end of singleton list} {
+		list [catch {lcs {a} {a b}} msg] $msg
+	} {0 {0 0}}
+
+	test list-lcs-2.8 {longestCommonSubsequence, duplicate element} {
+		list [catch {lcs {a} {a a}} msg] $msg
+	} {0 {0 0}}
+
+	test list-lcs-2.9 {longestCommonSubsequence, interchange 2} {
+		list [catch {lcs {a b} {b a}} msg] $msg
+	} {0 {1 0}}
+
+	test list-lcs-2.10 {longestCommonSubsequence, insert before 2} {
+		list [catch {lcs {a b} {b a b}} msg] $msg
+	} {0 {{0 1} {1 2}}}
+
+	test list-lcs-2.11 {longestCommonSubsequence, insert inside 2} {
+		list [catch {lcs {a b} {a a b}} msg] $msg
+	} {0 {{0 1} {0 2}}}
+
+	test list-lcs-2.12 {longestCommonSubsequence, insert after 2} {
+		list [catch {lcs {a b} {a b a}} msg] $msg
+	} {0 {{0 1} {0 1}}}
+
+	test list-lcs-2.13 {longestCommonSubsequence, delete first of 2} {
+		list [catch {lcs {a b} b} msg] $msg
+	} {0 {1 0}}
+
+	test list-lcs-2.14 {longestCommonSubsequence, delete second of 2} {
+		list [catch {lcs {a b} a} msg] $msg
+	} {0 {0 0}}
+
+	test list-lcs-2.15 {longestCommonSubsequence, change first of 2} {
+		list [catch {lcs {a b} {c b}} msg] $msg
+	} {0 {1 1}}
+
+	test list-lcs-2.16 {longestCommonSubsequence, change first of 2 to dupe} {
+		list [catch {lcs {a b} {b b}} msg] $msg
+	} {0 {1 0}}
+
+	test list-lcs-2.17 {longestCommonSubsequence, change second of 2} {
+		list [catch {lcs {a b} {a c}} msg] $msg
+	} {0 {0 0}}
+
+	test list-lcs-2.18 {longestCommonSubsequence, change second of 2 to dupe} {
+		list [catch {lcs {a b} {a a}} msg] $msg
+	} {0 {0 0}}
+
+	test list-lcs-2.19 {longestCommonSubsequence, mixed changes} {
+		list [catch {lcs {a b r a c a d a b r a} {b r i c a b r a c}} msg] $msg
+	} {0 {{1 2 4 5 8 9 10} {0 1 3 4 5 6 7}}}
+
+	test list-lcs-2.20 {longestCommonSubsequence, mixed changes} {
+		list [catch {lcs {b r i c a b r a c} {a b r a c a d a b r a}} msg] $msg
+	} {0 {{0 1 3 4 5 6 7} {1 2 4 5 8 9 10}}}
+
+	test list-lcs-3.1 {longestCommonSubsequence, length limit} {
+		list [catch {lcs {b r i c a b r a c} {a b r a c a d a b r a} 5} msg] $msg
+	} {0 {{0 1 3 4 5 6 7} {1 2 4 5 8 9 10}}}
+
+	test list-lcs-3.2 {longestCommonSubsequence, length limit} {
+		list [catch {lcs {b r i c a b r a c} {a b r a c a d a b r a} 4} msg] $msg
+	} {0 {{0 1 3 5 6} {1 2 4 8 9}}}
+
+	test list-lcs-3.3 {longestCommonSubsequence, length limit} {
+		list [catch {lcs {b r i c a b r a c} {a b r a c a d a b r a} 1} msg] $msg
+	} {0 {3 4}}
+
+	test list-lcs-3.4 {longestCommonSubsequence, stupid length limit} {
+		list [catch {lcs {b r i c a b r a c} {a b r a c a d a b r a} 0} msg] $msg
+	} {0 {{} {}}}
+
+
+	#----------------------------------------------------------------------
+
+	interp alias {} lcs2 {} ::struct::list::list longestCommonSubsequence2
+
+	test list-lcs2-1.1 {longestCommonSubsequence2, no args} {
+		catch { lcs2 } msg
+		set msg
+	} [tcltest::wrongNumArgs ::struct::list::LlongestCommonSubsequence2 \
+		   {sequence1 sequence2 ?maxOccurs?} 0]
+
+	test list-lcs2-1.2 {longestCommonSubsequence2, one arg} {
+		catch { lcs2 x } msg
+		set msg
+	} [tcltest::wrongNumArgs ::struct::list::LlongestCommonSubsequence2 \
+		   {sequence1 sequence2 ?maxOccurs?} 1]
+
+	test list-lcs2-2.1 {longestCommonSubsequence2, two empty lists} {
+		list [catch { lcs2 {} {} } msg] $msg
+	} {0 {{} {}}}
+
+	test list-lcs2-2.2 {longestCommonSubsequence2, insert 1 into an empty list} {
+		list [catch { lcs2 {} {a} } msg] $msg
+	} {0 {{} {}}}
+
+	test list-lcs2-2.3 {longestCommonSubsequence2, delete 1 from singleton list} {
+		list [catch { lcs2 {a} {} } msg] $msg
+	} {0 {{} {}}}
+
+	test list-lcs2-2.4 {longestCommonSubsequence2, preserve singleton list} {
+		list [catch { lcs2 {a} {a} } msg] $msg
+	} {0 {0 0}}
+
+	test list-lcs2-2.5 {longestCommonSubsequence2, 1-element change in singleton list} {
+		list [catch { lcs2 {a} {b} } msg] $msg
+	} {0 {{} {}}}
+
+	test list-lcs2-2.6 {longestCommonSubsequence2, insert 1 in front of singleton list} {
+		list [catch { lcs2 {a} {b a} } msg] $msg
+	} {0 {0 1}}
+
+	test list-lcs2-2.7 {longestCommonSubsequence2, insert 1 at end of singleton list} {
+		list [catch {lcs2 {a} {a b}} msg] $msg
+	} {0 {0 0}}
+
+	test list-lcs2-2.8 {longestCommonSubsequence2, duplicate element} {
+		list [catch {lcs2 {a} {a a}} msg] $msg
+	} {0 {0 0}}
+
+	test list-lcs2-2.9 {longestCommonSubsequence2, interchange 2} {
+		list [catch {lcs2 {a b} {b a}} msg] $msg
+	} {0 {1 0}}
+
+	test list-lcs2-2.10 {longestCommonSubsequence2, insert before 2} {
+		list [catch {lcs2 {a b} {b a b}} msg] $msg
+	} {0 {{0 1} {1 2}}}
+
+	test list-lcs2-2.11 {longestCommonSubsequence2, insert inside 2} {
+		list [catch {lcs2 {a b} {a a b}} msg] $msg
+	} {0 {{0 1} {0 2}}}
+
+	test list-lcs2-2.12 {longestCommonSubsequence2, insert after 2} {
+		list [catch {lcs2 {a b} {a b a}} msg] $msg
+	} {0 {{0 1} {0 1}}}
+
+	test list-lcs2-2.13 {longestCommonSubsequence2, delete first of 2} {
+		list [catch {lcs2 {a b} a} msg] $msg
+	} {0 {0 0}}
+
+	test list-lcs2-2.14 {longestCommonSubsequence2, delete second of 2} {
+		list [catch {lcs2 {a b} b} msg] $msg
+	} {0 {1 0}}
+
+	test list-lcs2-2.15 {longestCommonSubsequence2, change first of 2} {
+		list [catch {lcs2 {a b} {c b}} msg] $msg
+	} {0 {1 1}}
+
+	test list-lcs2-2.16 {longestCommonSubsequence2, change first of 2 to dupe} {
+		list [catch {lcs2 {a b} {b b}} msg] $msg
+	} {0 {1 0}}
+
+	test list-lcs2-2.17 {longestCommonSubsequence2, change second of 2} {
+		list [catch {lcs2 {a b} {a c}} msg] $msg
+	} {0 {0 0}}
+
+	test list-lcs2-2.18 {longestCommonSubsequence2, change second of 2 to dupe} {
+		list [catch {lcs2 {a b} {a a}} msg] $msg
+	} {0 {0 0}}
+
+	test list-lcs2-2.19 {longestCommonSubsequence2, mixed changes} {
+		list [catch {lcs2 {a b r a c a d a b r a} {b r i c a b r a c}} msg] $msg
+	} {0 {{1 2 4 5 8 9 10} {0 1 3 4 5 6 7}}}
+
+	test list-lcs2-2.20 {longestCommonSubsequence2, mixed changes} {
+		list [catch {lcs2 {b r i c a b r a c} {a b r a c a d a b r a}} msg] $msg
+	} {0 {{0 1 3 4 5 6 7} {1 2 4 5 8 9 10}}}
+
+	test list-lcs2-3.1 {longestCommonSubsequence2, length limit} {
+		list [catch {lcs2 {b r i c a b r a c} {a b r a c a d a b r a} 5} msg] $msg
+	} {0 {{0 1 3 4 5 6 7} {1 2 4 5 8 9 10}}}
+
+	test list-lcs2-3.2 {longestCommonSubsequence2, length limit} {
+		list [catch {lcs2 {b r i c a b r a c} {a b r a c a d a b r a} 4} msg] $msg
+	} {0 {{0 1 3 4 5 6 7} {1 2 4 5 8 9 10}}}
+
+	test list-lcs2-3.3 {longestCommonSubsequence2, length limit} {
+		list [catch {lcs2 {b r i c a b r a c} {a b r a c a d a b r a} 1} msg] $msg
+	} {0 {{0 1 3 4 5 6 7} {1 2 4 5 8 9 10}}}
+
+	test list-lcs2-3.4 {longestCommonSubsequence2, stupid length limit} {
+		list [catch {lcs2 {b r i c a b r a c} {a b r a c a d a b r a} 0} msg] $msg
+	} {0 {{0 1 3 4 5 6 7} {1 2 4 5 8 9 10}}}
+
+
+	#----------------------------------------------------------------------
+
+	interp alias {} lcsi  {} ::struct::list::list lcsInvert
+	interp alias {} lcsim {} ::struct::list::list lcsInvertMerge
+
+	test list-lcsInv-4.0 {longestCommonSubsequence, mixed changes} {
+
+		# sequence 1 = a b r a c a d a b r a
+		# lcs 1      =   1 2   4 5     8 9 10
+		# lcs 2      =   0 1   3 4     5 6 7
+		# sequence 2 =   b r i c a     b r a c
+		#
+		# Inversion  = deleted  {0  0} {-1 0}
+		#              changed  {3  3}  {2 2}
+		#              deleted  {6  7}  {4 5}
+		#              added   {10 11}  {8 8}
+
+		list [catch {lcsi [lcs {a b r a c a d a b r a} {b r i c a b r a c}] 11 9} msg] $msg
+	} {0 {{deleted {0 0} {-1 0}} {changed {3 3} {2 2}} {deleted {6 7} {4 5}} {added {10 11} {8 8}}}}
+
+	test list-lcsInv-4.1 {longestCommonSubsequence, mixed changes} {
+
+		# sequence 1 = a b r a c a d a b r a
+		# lcs 1      =   1 2   4 5     8 9 10
+		# lcs 2      =   0 1   3 4     5 6 7
+		# sequence 2 =   b r i c a     b r a c
+		#
+		# Inversion/Merge  = deleted   {0  0} {-1 0}
+		#                    unchanged {1  2}  {0 1}
+		#                    changed   {3  3}  {2 2}
+		#                    unchanged {4  5}  {3 4}
+		#                    deleted   {6  7}  {4 5}
+		#                    unchanged {8 10}  {5 7}
+		#                    added    {10 11}  {8 8}
+
+		list [catch {lcsim [lcs {a b r a c a d a b r a} {b r i c a b r a c}] 11 9} msg] $msg
+	} {0 {{deleted {0 0} {-1 0}} {unchanged {1 2} {0 1}} {changed {3 3} {2 2}} {unchanged {4 5} {3 4}} {deleted {6 7} {4 5}} {unchanged {8 10} {5 7}} {added {10 11} {8 8}}}}
+
+
+	proc diff2 {s1 s2} {
+		set l1 [split $s1 {}]
+		set l2 [split $s2 {}]
+		set x [lcs $l1 $l2]
+		lcsim $x [llength $l1] [llength $l2]
+	}
+	test list-lcsInv-4.2 {lcsInvertMerge} {
+		# Handling of 'unchanged' chunks at the beginning of the result
+		# (when result actually empty).
+
+		diff2 ab "a b" 
+	} {{unchanged {0 0} {0 0}} {added {0 1} {1 1}} {unchanged {1 1} {2 2}}}
+
+	test list-lcsInv-4.3 {lcsInvertMerge} {
+		diff2 abcde afcge
+	} {{unchanged {0 0} {0 0}} {changed {1 1} {1 1}} {unchanged {2 2} {2 2}} {changed {3 3} {3 3}} {unchanged {4 4} {4 4}}}
+
+	#----------------------------------------------------------------------
+
+	interp alias {} reverse {} ::struct::list::list reverse
+
+	test reverse-1.1 {reverse method} {
+		reverse {a b c}
+	} {c b a}
+
+	test reverse-1.2 {reverse method} {
+		reverse a
+	} {a}
+
+	test reverse-1.3 {reverse method} {
+		reverse {}
+	} {}
+
+	test reverse-2.1 {reverse errors} {
+		list [catch {reverse} msg] $msg
+	} [list 1 [tcltest::wrongNumArgs ::struct::list::Lreverse {sequence} 0]]
+
+	#----------------------------------------------------------------------
+
+	interp alias {} assign {} ::struct::list::list assign
+
+	test assign-4.1 {assign method} {
+		catch {unset ::x ::y}
+		list [assign {foo bar} x y] $x $y
+	} {{} foo bar}
+
+	test assign-4.2 {assign method} {
+		catch {unset x y}
+		list [assign {foo bar baz} x y] $x $y
+	} {baz foo bar}
+
+	test assign-4.3 {assign method} {
+		catch {unset x y z}
+		list [assign {foo bar} x y z] $x $y $z
+	} {{} foo bar {}}
+
+	if {[package vcompare [package provide Tcl] 8.5] < 0} {
+		# 8.4
+		set err [tcltest::wrongNumArgs {::struct::list::Lassign} {sequence v args} 1]
+	} else {
+		# 8.5+
+		#set err [tcltest::wrongNumArgs {lassign}                 {list varName ?varName ...?} 1]
+		set err [tcltest::wrongNumArgs {::struct::list::Lassign} {list varName ?varName ...?} 1]
+	}
+
+	# In 8.6+ assign is the native lassign and it does nothing gracefully,
+	# per TIP 323, making assign-4.4 not an error anymore.
+	test assign-4.4 {assign method} {!tcl8.6plus} {
+		catch {assign {foo bar}} msg ; set msg
+	} $err
+
+	test assign-4.5 {assign method} {
+		list [assign {foo bar} x] $x
+	} {bar foo}
+
+	catch {unset x y z}
+
+	#----------------------------------------------------------------------
+
+	interp alias {} flatten {} ::struct::list::list flatten
+
+	test flatten-1.1 {flatten command} {
+		flatten {1 2 3 {4 5} {6 7} {{8 9}} 10}
+	} {1 2 3 4 5 6 7 {8 9} 10}
+
+	test flatten-1.2 {flatten command} {
+		flatten -full {1 2 3 {4 5} {6 7} {{8 9}} 10}
+	} {1 2 3 4 5 6 7 8 9 10}
+
+	test flatten-1.3 {flatten command} {
+		flatten {a b}
+	} {a b}
+
+	test flatten-1.4 {flatten command} {
+		flatten [list "\[a\]" "\[b\]"]
+	} {{[a]} {[b]}}
+
+	test flatten-1.5 {flatten command} {
+		flatten [list "'" "\""]
+	} {' {"}} ; # " help emacs highlighting
+
+	test flatten-1.6 {flatten command} {
+		flatten [list "{" "}"]
+	} "\\\{ \\\}"
+
+	test flatten-1.7 {check -- argument termination} {
+		flatten -full -- {1 2 3 {4 5} {6 7} {{8 9}} 10}
+	} {1 2 3 4 5 6 7 8 9 10}
+
+	test flatten-2.1 {flatten errors} {
+		list [catch {flatten} msg] $msg
+	} {1 {wrong#args: should be "::struct::list::Lflatten ?-full? ?--? sequence"}}
+
+	test flatten-2.2 {flatten errors} {
+		list [catch {flatten -all {a {b c d} {e {f g}}}} msg] $msg
+	} {1 {Unknown option "-all", should be either -full, or --}}
+
+
+	#----------------------------------------------------------------------
+
+	interp alias {} map {} ::struct::list::list map
+
+	proc cc {a} {return $a$a}
+	proc +  {a} {expr {$a + $a}}
+	proc *  {a} {expr {$a * $a}}
+	proc projection {n list} {::lindex $list $n}
+
+	test map-4.1 {map command} {
+		map {a b c d} cc
+	} {aa bb cc dd}
+
+	test map-4.2 {map command} {
+		map {1 2 3 4 5} +
+	} {2 4 6 8 10}
+
+	test map-4.3 {map command} {
+		map {1 2 3 4 5} *
+	} {1 4 9 16 25}
+
+	test map-4.4 {map command} {
+		map {} *
+	} {}
+
+	test map-4.5 {map command} {
+		map {{a b c} {1 2 3} {d f g}} {projection 1}
+	} {b 2 f}
+
+
+	#----------------------------------------------------------------------
+
+	interp alias {} mapfor {} ::struct::list::list mapfor
+
+	test mapfor-4.1 {mapfor command} {
+		mapfor x {a b c d} { set x $x$x }
+	} {aa bb cc dd}
+
+	test mapfor-4.2 {mapfor command} {
+		mapfor x {1 2 3 4 5} {expr {$x + $x}}
+	} {2 4 6 8 10}
+
+	test mapfor-4.3 {mapfor command} {
+		mapfor x {1 2 3 4 5} {expr {$x * $x}}
+	} {1 4 9 16 25}
+
+	test mapfor-4.4 {mapfor command} {
+		mapfor x {} {expr {$x * $x}}
+	} {}
+
+	test mapfor-4.5 {mapfor command} {
+		mapfor x {{a b c} {1 2 3} {d f g}} {lindex $x 1}
+	} {b 2 f}
+
+	#----------------------------------------------------------------------
+
+	interp alias {} fold {} ::struct::list::list fold
+
+	proc cc {a b} {return $a$b}
+	proc +  {a b} {expr {$a + $b}}
+	proc *  {a b} {expr {$a * $b}}
+
+	test fold-4.1 {fold command} {
+		fold {a b c d} {} cc
+	} {abcd}
+
+	test fold-4.2 {fold command} {
+		fold {1 2 3 4 5} 0 +
+	} {15}
+
+	test fold-4.3 {fold command} {
+		fold {1 2 3 4 5} 1 *
+	} {120}
+
+	test fold-4.4 {fold command} {
+		fold {} 1 *
+	} {1}
+
+	#----------------------------------------------------------------------
+
+	interp alias {} filter {} ::struct::list::list filter
+
+	proc even {i} {expr {($i % 2) == 0}}
+
+	test filter-4.1 {filter command} {
+		filter {1 2 3 4 5 6 7 8} even
+	} {2 4 6 8}
+
+	test filter-4.2 {filter command} {
+		filter {} even
+	} {}
+
+	test filter-4.3 {filter command} {
+		filter {3 5 7} even
+	} {}
+
+	test filter-4.4 {filter command} {
+		filter {2 4 6} even
+	} {2 4 6}
+
+	# Alternate which elements are filtered by using a global variable
+	# flag. Used to test that the `cmdprefix' is evaluated in the caller's
+	# scope.
+	#
+	# The flag variable should be set on the -setup phase.
+
+	proc alternating {_} {
+		upvar 1 flag flag;
+		set flag [expr {!($flag)}];
+		return $flag;
+	}
+
+	test filter-4.5 {filter evaluates cmdprefix on outer scope} -setup {
+		set flag 1
+	} -body {
+		filter {1 2 3 4 5 6} alternating
+	} -cleanup {
+		unset flag
+	} -result {2 4 6}
+
+	#----------------------------------------------------------------------
+
+	interp alias {} filterfor {} ::struct::list::list filterfor
+
+	test filterfor-4.1 {filterfor command} {
+		filterfor i {1 2 3 4 5 6 7 8} {($i % 2) == 0}
+	} {2 4 6 8}
+
+	test filterfor-4.2 {filterfor command} {
+		filterfor i {} {($i % 2) == 0}
+	} {}
+
+	test filterfor-4.3 {filterfor command} {
+		filterfor i {3 5 7} {($i % 2) == 0}
+	} {}
+
+	test filterfor-4.4 {filterfor command} {
+		filterfor i {2 4 6} {($i % 2) == 0}
+	} {2 4 6}
+
+	#----------------------------------------------------------------------
+
+	interp alias {} lsplit {} ::struct::list::list split
+
+	proc even {i} {expr {($i % 2) == 0}}
+
+	test split-4.1 {split command} {
+		lsplit {1 2 3 4 5 6 7 8} even
+	} {{2 4 6 8} {1 3 5 7}}
+
+	test split-4.2 {split command} {
+		lsplit {} even
+	} {{} {}}
+
+	test split-4.3 {split command} {
+		lsplit {3 5 7} even
+	} {{} {3 5 7}}
+
+	test split-4.4 {split command} {
+		lsplit {2 4 6} even
+	} {{2 4 6} {}}
+
+	test split-4.5 {split command} {
+		list [lsplit {1 2 3 4 5 6 7 8} even pass fail] $pass $fail
+	} {{4 4} {2 4 6 8} {1 3 5 7}}
+
+	test split-4.6 {split command} {
+		list [lsplit {} even pass fail] $pass $fail
+	} {{0 0} {} {}}
+
+	test split-4.7 {split command} {
+		list [lsplit {3 5 7} even pass fail] $pass $fail
+	} {{0 3} {} {3 5 7}}
+
+	test split-4.8 {split command} {
+		list [lsplit {2 4 6} even pass fail] $pass $fail
+	} {{3 0} {2 4 6} {}}
+
+
+	# See test filter-4.5 for explanations.
+
+	test split-4.9 {split evaluates cmdprefix on outer scope} -setup {
+		set flag 1
+	} -body {
+		list [lsplit {1 2 3 4 5 6 7 8} alternating pass fail] $pass $fail
+	} -cleanup {
+		unset flag
+	} -result {{4 4} {2 4 6 8} {1 3 5 7}}
+
+	#----------------------------------------------------------------------
+
+	interp alias {} shift {} ::struct::list::list shift
+
+	test shift-4.1 {shift command} {
+		set v {1 2 3 4 5 6 7 8}
+		list [shift v] $v
+	} {1 {2 3 4 5 6 7 8}}
+
+	test shift-4.2 {shift command} {
+		set v {1}
+		list [shift v] $v
+	} {1 {}}
+
+	test shift-4.3 {shift command} {
+		set v {}
+		list [shift v] $v
+	} {{} {}}
+
+	#----------------------------------------------------------------------
+
+	interp alias {} iota {} ::struct::list::list iota
+
+	test iota-4.1 {iota command} {
+		iota 0
+	} {}
+
+	test iota-4.2 {iota command} {
+		iota 1
+	} {0}
+
+	test iota-4.3 {iota command} {
+		iota 11
+	} {0 1 2 3 4 5 6 7 8 9 10}
+
+
+	#----------------------------------------------------------------------
+
+	interp alias {} repeatn {} ::struct::list::list repeatn
+
+	test repeatn-4.1 {repeatn command} {
+		repeatn 0
+	} {}
+
+	test repeatn-4.2 {repeatn command} {
+		repeatn 0 3
+	} {0 0 0}
+
+	test repeatn-4.3 {repeatn command} {
+		repeatn 0 3 4
+	} {{0 0 0} {0 0 0} {0 0 0} {0 0 0}}
+
+	test repeatn-4.4 {repeatn command} {
+		repeatn 0 {3 4}
+	} {{0 0 0} {0 0 0} {0 0 0} {0 0 0}}
+
+	#----------------------------------------------------------------------
+
+	interp alias {} repeat {} ::struct::list::list repeat
+
+	if {[package vcompare [package provide Tcl] 8.5] < 0} {
+		# 8.4
+		set err [tcltest::wrongNumArgs {::struct::list::Lrepeat} {positiveCount value args} 0]
+	} elseif {![package vsatisfies [package provide Tcl] 8.6]} {
+		# 8.5+
+		#set err [tcltest::wrongNumArgs {lrepeat} {positiveCount value ?value ...?} 0]
+		set err [tcltest::wrongNumArgs {::struct::list::Lrepeat} {positiveCount value ?value ...?} 0]
+	} else {
+		# 8.6+
+		set err [tcltest::wrongNumArgs {::struct::list::Lrepeat} {count ?value ...?} 1]
+	}
+	test repeat-4.1 {repeat command} {
+		catch {repeat} msg
+		set msg
+	} $err
+
+
+	if {[package vcompare [package provide Tcl] 8.5] < 0} {
+		# 8.4
+		set err [tcltest::wrongNumArgs {::struct::list::Lrepeat} {positiveCount value args} 1]
+	} elseif {![package vsatisfies [package provide Tcl] 8.6]} {
+		# 8.5+
+		#set err [tcltest::wrongNumArgs {lrepeat} {positiveCount value ?value ...?} 1]
+		set err [tcltest::wrongNumArgs {::struct::list::Lrepeat} {positiveCount value ?value ...?} 1]
+	} else {
+		# 8.6+
+		set err [tcltest::wrongNumArgs {::struct::list::Lrepeat} {count ?value ...?} 1]
+	}
+	# In 8.6+ repeat is the native lrepeat and it does nothing gracefully,
+	# per TIP 323, making repeat-4.2 not an error anymore.
+	test repeat-4.2 {repeat command} {!tcl8.6plus} {
+		catch {repeat a} msg
+		set msg
+	} $err
+
+	test repeat-4.3 {repeat command} {
+		catch {repeat a b} msg
+		set msg
+	} {expected integer but got "a"}
+
+	# In 8.6+ repeat is the native lrepeat and it does nothing gracefully,
+	# per TIP 323, making repeat-4.2 not an error anymore.
+	test repeat-4.4 {repeat command} {!tcl8.6plus} {
+		catch {repeat 0 b} msg
+		set msg
+	} {must have a count of at least 1}
+
+	if {![package vsatisfies [package provide Tcl] 8.6]} {
+		# before 8.6
+		set err {must have a count of at least 1}
+	} else {
+		# 8.6+, native lrepeat changed error message.
+		set err {bad count "-1": must be integer >= 0}
+	}
+	test repeat-4.5 {repeat command} {
+		catch {repeat -1 b} msg
+		set msg
+	} $err
+
+	test repeat-4.6 {repeat command} {
+		repeat 1 b c
+	} {b c}
+
+	test repeat-4.7 {repeat command} {
+		repeat 3 a
+	} {a a a}
+
+	test repeat-4.8 {repeat command} {
+		repeat 3 [repeat 3 0]
+	} {{0 0 0} {0 0 0} {0 0 0}}
+
+	test repeat-4.9 {repeat command} {
+		repeat 3 a b c
+	} {a b c a b c a b c}
+
+	test repeat-4.10 {repeat command} {
+		repeat 3 [repeat 2 a] b c
+	} {{a a} b c {a a} b c {a a} b c}
+
+	#----------------------------------------------------------------------
+
+	interp alias {} equal {} ::struct::list::list equal
+
+	test equal-4.1 {equal command} {
+		equal 0 0
+	} 1
+
+	test equal-4.2 {equal command} {
+		equal 0 1
+	} 0
+
+	test equal-4.3 {equal command} {
+		equal {0 0 0} {0 0}
+	} 0
+
+	test equal-4.4 {equal command} {
+		equal {{0 2 3} 1} {{0 2 3} 1}
+	} 1
+
+	test equal-4.5 {equal command} {
+		equal [list [list a]] {{a}}
+	} 1
+
+	test equal-4.6 {equal command} {
+		equal {{a}} [list [list a]]
+	} 1
+
+	test equal-4.7 {equal command} {
+		set a {{a}}
+		set b [list [list a]]
+		expr {[equal $a $b] == [equal $b $a]}
+	} 1
+
+	test equal-4.8 {equal command} {
+		set a {{a b}}
+		set b [list [list a b]]
+		expr {[equal $a $b] == [equal $b $a]}
+	} 1
+
+	test equal-4.9 {equal command} {
+		set a {{a} {b}}
+		set b [list [list a] [list b]]
+		expr {[equal $a $b] == [equal $b $a]}
+	} 1
+
+	#----------------------------------------------------------------------
+
+	interp alias {} delete {} ::struct::list::list delete
+
+	test delete-1.0 {delete command} {
+		catch {delete} msg
+		set msg
+	} {wrong # args: should be "::struct::list::Ldelete var item"}
+
+	test delete-1.1 {delete command} {
+		catch {delete x} msg
+		set msg
+	} {wrong # args: should be "::struct::list::Ldelete var item"}
+
+	test delete-1.2 {delete command} {
+		set l {}
+		delete l x
+		set l
+	} {}
+
+	test delete-1.3 {delete command} {
+		set l {a x b}
+		delete l x
+		set l
+	} {a b}
+
+	test delete-1.4 {delete command} {
+		set l {x a b}
+		delete l x
+		set l
+	} {a b}
+
+	test delete-1.5 {delete command} {
+		set l {a b x}
+		delete l x
+		set l
+	} {a b}
+
+	test delete-1.6 {delete command} {
+		set l {a b}
+		delete l x
+		set l
+	} {a b}
+
+	catch { unset l }
+	#----------------------------------------------------------------------
+
+	interp alias {} dbjoin  {} ::struct::list::list dbJoin
+	interp alias {} dbjoink {} ::struct::list::list dbJoinKeyed
+
+	#----------------------------------------------------------------------
+	# Input data sets ...
+
+	set empty {}
+	set table_as [list \
+		{0 foo} \
+		{1 snarf} \
+		{2 blue} \
+		]
+	set table_am [list \
+		{0 foo} \
+		{0 bar} \
+		{1 snarf} \
+		{1 rim} \
+		{2 blue} \
+		{2 dog} \
+		]
+	set table_bs [list \
+		{0 bagel} \
+		{1 snatz} \
+		{3 driver} \
+		]
+	set table_bm [list \
+		{0 bagel} \
+		{0 loaf} \
+		{1 snatz} \
+		{1 grid} \
+		{3 driver} \
+		{3 tcl} \
+		]
+	set table_cs [list \
+		{0 smurf} \
+		{3 bird} \
+		{4 galapagos} \
+		]
+	set table_cm [list \
+		{0 smurf} \
+		{0 blt} \
+		{3 bird} \
+		{3 itcl} \
+		{4 galapagos} \
+		{4 tk} \
+		]
+
+	#----------------------------------------------------------------------
+	# Result data sets ...
+
+	set nyi __not_yet_written__
+
+	set ijss [list \
+		[list 0 foo   0 bagel] \
+		[list 1 snarf 1 snatz] \
+		]
+	set ijsm [list \
+		[list 0 foo   0 bagel] \
+		[list 0 foo   0 loaf] \
+		[list 1 snarf 1 snatz] \
+		[list 1 snarf 1 grid] \
+		]
+	set ijms [list \
+		[list 0 foo   0 bagel] \
+		[list 0 bar   0 bagel] \
+		[list 1 snarf 1 snatz] \
+		[list 1 rim   1 snatz] \
+		]
+	set ijmm [list \
+		[list 0 foo   0 bagel] \
+		[list 0 foo   0 loaf] \
+		[list 0 bar   0 bagel] \
+		[list 0 bar   0 loaf] \
+		[list 1 snarf 1 snatz] \
+		[list 1 snarf 1 grid] \
+		[list 1 rim   1 snatz] \
+		[list 1 rim   1 grid] \
+		]
+
+	set ljss [list \
+		[list 0 foo   0 bagel] \
+		[list 1 snarf 1 snatz] \
+		[list 2 blue {} {}] \
+		]
+	set ljsm [list \
+		[list 0 foo   0 bagel] \
+		[list 0 foo   0 loaf] \
+		[list 1 snarf 1 snatz] \
+		[list 1 snarf 1 grid] \
+		[list 2 blue {} {}] \
+		]
+	set ljms [list \
+		[list 0 foo   0 bagel] \
+		[list 0 bar   0 bagel] \
+		[list 1 snarf 1 snatz] \
+		[list 1 rim   1 snatz] \
+		[list 2 blue {} {}] \
+		[list 2 dog  {} {}] \
+		]
+	set ljmm [list \
+		[list 0 foo   0 bagel] \
+		[list 0 foo   0 loaf] \
+		[list 0 bar   0 bagel] \
+		[list 0 bar   0 loaf] \
+		[list 1 snarf 1 snatz] \
+		[list 1 snarf 1 grid] \
+		[list 1 rim   1 snatz] \
+		[list 1 rim   1 grid] \
+		[list 2 blue {} {}] \
+		[list 2 dog  {} {}] \
+		]
+
+	set rjss [list \
+		[list 0 foo   0 bagel] \
+		[list 1 snarf 1 snatz] \
+		[list {} {}   3 driver] \
+		]
+	set rjsm [list \
+		[list 0 foo   0 bagel] \
+		[list 0 foo   0 loaf] \
+		[list 1 snarf 1 snatz] \
+		[list 1 snarf 1 grid] \
+		[list {} {}   3 driver] \
+		[list {} {}   3 tcl] \
+		]
+	set rjms [list \
+		[list 0 foo   0 bagel] \
+		[list 0 bar   0 bagel] \
+		[list 1 snarf 1 snatz] \
+		[list 1 rim   1 snatz] \
+		[list {} {}   3 driver] \
+		]
+	set rjmm [list \
+		[list 0 foo   0 bagel] \
+		[list 0 foo   0 loaf] \
+		[list 0 bar   0 bagel] \
+		[list 0 bar   0 loaf] \
+		[list 1 snarf 1 snatz] \
+		[list 1 snarf 1 grid] \
+		[list 1 rim   1 snatz] \
+		[list 1 rim   1 grid] \
+		[list {} {}   3 driver] \
+		[list {} {}   3 tcl] \
+		]
+
+	set fjss [list \
+		[list 0 foo   0 bagel] \
+		[list 1 snarf 1 snatz] \
+		[list 2 blue {} {}] \
+		[list {} {}   3 driver] \
+		]
+	set fjsm [list \
+		[list 0 foo   0 bagel] \
+		[list 0 foo   0 loaf] \
+		[list 1 snarf 1 snatz] \
+		[list 1 snarf 1 grid] \
+		[list 2 blue {} {}] \
+		[list {} {}   3 driver] \
+		[list {} {}   3 tcl] \
+		]
+	set fjms [list \
+		[list 0 foo   0 bagel] \
+		[list 0 bar   0 bagel] \
+		[list 1 snarf 1 snatz] \
+		[list 1 rim   1 snatz] \
+		[list 2 blue {} {}] \
+		[list 2 dog  {} {}] \
+		[list {} {}   3 driver] \
+		]
+	set fjmm [list \
+		[list 0 foo   0 bagel] \
+		[list 0 foo   0 loaf] \
+		[list 0 bar   0 bagel] \
+		[list 0 bar   0 loaf] \
+		[list 1 snarf 1 snatz] \
+		[list 1 snarf 1 grid] \
+		[list 1 rim   1 snatz] \
+		[list 1 rim   1 grid] \
+		[list 2 blue {} {}] \
+		[list 2 dog  {} {}] \
+		[list {} {}   3 driver] \
+		[list {} {}   3 tcl] \
+		]
+
+	set ijmmm {
+		{0 bar 0 bagel 0 blt}
+		{0 bar 0 bagel 0 smurf}
+		{0 bar 0 loaf 0 blt}
+		{0 bar 0 loaf 0 smurf}
+		{0 foo 0 bagel 0 blt}
+		{0 foo 0 bagel 0 smurf}
+		{0 foo 0 loaf 0 blt}
+		{0 foo 0 loaf 0 smurf}
+	}
+	set ljmmm {
+		{0 bar 0 bagel 0 blt}
+		{0 bar 0 bagel 0 smurf}
+		{0 bar 0 loaf 0 blt}
+		{0 bar 0 loaf 0 smurf}
+		{0 foo 0 bagel 0 blt}
+		{0 foo 0 bagel 0 smurf}
+		{0 foo 0 loaf 0 blt}
+		{0 foo 0 loaf 0 smurf}
+		{1 rim 1 grid {} {}}
+		{1 rim 1 snatz {} {}}
+		{1 snarf 1 grid {} {}}
+		{1 snarf 1 snatz {} {}}
+		{2 blue {} {} {} {}}
+		{2 dog {} {} {} {}}
+	}
+	set rjmmm {
+		{0 bar 0 bagel 0 blt}
+		{0 bar 0 bagel 0 smurf}
+		{0 bar 0 loaf 0 blt}
+		{0 bar 0 loaf 0 smurf} 
+		{0 foo 0 bagel 0 blt}
+		{0 foo 0 bagel 0 smurf}
+		{0 foo 0 loaf 0 blt}
+		{0 foo 0 loaf 0 smurf}
+		{{} {} 3 driver 3 bird}
+		{{} {} 3 driver 3 itcl}
+		{{} {} 3 tcl 3 bird}
+		{{} {} 3 tcl 3 itcl}
+		{{} {} {} {} 4 galapagos}
+		{{} {} {} {} 4 tk}
+	}
+	set fjmmm {
+		{0 bar 0 bagel 0 blt}
+		{0 bar 0 bagel 0 smurf}
+		{0 bar 0 loaf 0 blt}
+		{0 bar 0 loaf 0 smurf} 
+		{0 foo 0 bagel 0 blt}
+		{0 foo 0 bagel 0 smurf}
+		{0 foo 0 loaf 0 blt}
+		{0 foo 0 loaf 0 smurf}
+		{1 rim 1 grid {} {}}
+		{1 rim 1 snatz {} {}}
+		{1 snarf 1 grid {} {}}
+		{1 snarf 1 snatz {} {}}
+		{2 blue {} {} {} {}}
+		{2 dog {} {} {} {}}
+		{{} {} 3 driver 3 bird}
+		{{} {} 3 driver 3 itcl}
+		{{} {} 3 tcl 3 bird}
+		{{} {} 3 tcl 3 itcl}
+		{{} {} {} {} 4 galapagos}
+		{{} {} {} {} 4 tk}
+	}
+
+	#----------------------------------------------------------------------
+	# Helper, translation to keyed format.
+
+	proc keyed {table} {
+		# Get the key out of the row, hardwired to column 0
+		set res [list]
+		foreach row $table {lappend res [list [lindex $row 0] $row]}
+		return $res
+	}
+
+	#----------------------------------------------------------------------
+	# I.	One table joins
+
+	set n 0 ; # Counter for test cases
+	foreach {jtype inout} {
+		-inner empty    -inner table_as    -inner table_am
+		-left  empty    -left  table_as    -left  table_am
+		-right empty    -right table_as    -right table_am
+		-full  empty    -full  table_as    -full  table_am
+	} {
+		test dbjoin-1.$n "1-table join $jtype $inout" {
+		dbjoin $jtype 0 [set $inout]
+		} [set $inout] ; # {}
+
+		test dbjoinKeyed-1.$n "1-table join $jtype $inout" {
+		dbjoink $jtype [keyed [set $inout]]
+		} [set $inout] ; # {}
+
+		incr n
+	}
+
+	#----------------------------------------------------------------------
+	# II.	Two table joins
+
+	set n 0 ; # Counter for test cases
+	foreach {jtype left right result} {
+		-inner empty    empty    empty
+		-inner empty    table_bs empty
+		-inner table_as empty    empty
+		-inner table_as table_bs ijss
+		-inner table_as table_bm ijsm
+		-inner table_am table_bs ijms
+		-inner table_am table_bm ijmm
+
+		-left  empty    empty    empty
+		-left  empty    table_bs empty
+		-left  table_as empty    table_as
+		-left  table_as table_bs ljss
+		-left  table_as table_bm ljsm
+		-left  table_am table_bs ljms
+		-left  table_am table_bm ljmm
+
+		-right empty    empty    empty
+		-right empty    table_bs table_bs
+		-right table_as empty    empty
+		-right table_as table_bs rjss
+		-right table_as table_bm rjsm
+		-right table_am table_bs rjms
+		-right table_am table_bm rjmm
+
+		-full  empty    empty    empty
+		-full  empty    table_bs table_bs
+		-full  table_as empty    table_as
+		-full  table_as table_bs fjss
+		-full  table_as table_bm fjsm
+		-full  table_am table_bs fjms
+		-full  table_am table_bm fjmm
+	} {
+		test dbjoin-2.$n "2-table join $jtype ($left $right) = $result" {
+		lsort [dbjoin $jtype 0 [set $left] 0 [set $right]]
+		} [lsort [set $result]]
+
+		test dbjoinKeyed-2.$n "2-table join $jtype ($left $right) = $result" {
+		lsort [dbjoink $jtype [keyed [set $left]] [keyed [set $right]]]
+		} [lsort [set $result]]
+
+		incr n
+	}
+
+	#----------------------------------------------------------------------
+	# III.	Three table joins
+
+	set n 0 ; # Counter for test cases
+	foreach {jtype left middle right result} {
+		-inner table_am table_bm table_cm ijmmm
+		-left  table_am table_bm table_cm ljmmm
+		-right table_am table_bm table_cm rjmmm
+		-full  table_am table_bm table_cm fjmmm
+	} {
+		test dbjoin-3.$n "3-table join $jtype ($left $middle $right) = $result" {
+		lsort [dbjoin $jtype 0 [set $left] 0 [set $middle] 0 [set $right]]
+		} [lsort [set $result]]
+
+		test dbjoinKeyed-3.$n "3-table join $jtype ($left $middle $right) = $result" {
+		lsort [dbjoink $jtype [keyed [set $left]] [keyed [set $middle]] [keyed [set $right]]]
+		} [lsort [set $result]]
+
+		incr n
+	}
+
+	#----------------------------------------------------------------------
+
+	interp alias {} swap {} ::struct::list::list swap
+
+	foreach {n list i j err res} {
+		0  {}           0  0   1 {list index out of range}
+		1  {}           3  4   1 {list index out of range}
+		2  {a b c d e} -1  0   1 {list index out of range}
+		3  {a b c d e}  0 -1   1 {list index out of range}
+		4  {a b c d e}  6  0   1 {list index out of range}
+		5  {a b c d e}  0  6   1 {list index out of range}
+		6  {a b c d e}  0  0   0 {a b c d e}
+		7  {a b c d e}  0  1   0 {b a c d e}
+		8  {a b c d e}  1  0   0 {b a c d e}
+		9  {a b c d e}  0  4   0 {e b c d a}
+		10 {a b c d e}  4  0   0 {e b c d a}
+		11 {a b c d e}  2  4   0 {a b e d c}
+		12 {a b c d e}  4  2   0 {a b e d c}
+		13 {a b c d e}  1  3   0 {a d c b e}
+		14 {a b c d e}  3  1   0 {a d c b e}
+	} {
+		if {$err} {
+		test swap-1.$n {swap command error} {
+			set l $list
+			catch {swap l $i $j} msg
+			set msg
+		} $res ; # {}
+		} else {
+		test swap-1.$n {swap command} {
+			set l $list
+			swap l $i $j
+		} $res ; # {}
+		}
+	}
+
+
+	#----------------------------------------------------------------------
+
+	interp alias {} firstperm    {} ::struct::list::list firstperm
+	interp alias {} nextperm     {} ::struct::list::list nextperm
+	interp alias {} foreachperm  {} ::struct::list::list foreachperm
+	interp alias {} permutations {} ::struct::list::list permutations
+
+	test permutations-0.0 {permutations command, single element list} {
+		permutations a
+	} a
+
+
+	array set ps {
+		{Tom Dick Harry Bob} {
+		0	{Bob Dick Harry Tom}	{Tom Harry Bob Dick}
+		{
+			{Bob Dick Harry Tom}    {Bob Dick Tom Harry}
+			{Bob Harry Dick Tom}    {Bob Harry Tom Dick}
+			{Bob Tom Dick Harry}    {Bob Tom Harry Dick}
+			{Dick Bob Harry Tom}    {Dick Bob Tom Harry}
+			{Dick Harry Bob Tom}    {Dick Harry Tom Bob}
+			{Dick Tom Bob Harry}    {Dick Tom Harry Bob}
+			{Harry Bob Dick Tom}    {Harry Bob Tom Dick}
+			{Harry Dick Bob Tom}    {Harry Dick Tom Bob}
+			{Harry Tom Bob Dick}    {Harry Tom Dick Bob}
+			{Tom Bob Dick Harry}    {Tom Bob Harry Dick}
+			{Tom Dick Bob Harry}    {Tom Dick Harry Bob}
+			{Tom Harry Bob Dick}    {Tom Harry Dick Bob}
+		}
+		}
+		{3 2 1 4} {
+		1	{1 2 3 4}	{3 2 4 1}
+		{
+			{1 2 3 4} {1 2 4 3} {1 3 2 4} {1 3 4 2}
+			{1 4 2 3} {1 4 3 2} {2 1 3 4} {2 1 4 3}
+			{2 3 1 4} {2 3 4 1} {2 4 1 3} {2 4 3 1}
+			{3 1 2 4} {3 1 4 2} {3 2 1 4} {3 2 4 1}
+			{3 4 1 2} {3 4 2 1} {4 1 2 3} {4 1 3 2}
+			{4 2 1 3} {4 2 3 1} {4 3 1 2} {4 3 2 1}
+		}
+		}
+	}
+
+	foreach k [array names ps] {
+		foreach {n firstp nextp allp} $ps($k) break
+
+		test firstperm-1.$n {firstperm command} {
+		firstperm $k
+		} $firstp ; # {}
+
+		test nextperm-1.$n {nextperm command} {
+		nextperm $k
+		} $nextp ; # {}
+
+		# Note: The lrange below is necessary a trick/hack to kill the
+		# existing string representation of allp, and get a pure list out
+		# of it. Otherwise the string based comparison of test will fail,
+		# seeing different string reps of the same list.
+
+		test permutations-1.$n {permutations command} {
+		permutations $k
+		} [lrange $allp 0 end] ; # {}
+
+		test foreachperm-1.$n {foreachperm command} {
+		set res {}
+		foreachperm x $k {lappend res $x}
+		set res
+		} [lrange $allp 0 end] ; # {}
+	}
+
+	test nextperm-2.0 {bug 3593689, busyloop} {
+		nextperm {1 10 9 8 7 6 5 4 3 2}
+	} {1 2 10 3 4 5 6 7 8 9}
+
+	#----------------------------------------------------------------------
+
+	interp alias {} shuffle {} ::struct::list::list shuffle
+
+	test shuffle-1.0 {} -body {
+		shuffle
+	} -returnCodes error -result {wrong # args: should be "::struct::list::Lshuffle list"}
+
+	test shuffle-2.0 {shuffle nothing} -body {
+		shuffle {}
+	} -result {}
+
+	test shuffle-2.1 {shuffle single} -body {
+		shuffle {a}
+	} -result {a}
+
+	foreach {k n data} {
+		1 2  {a b}
+		2 4  {c d b a}
+		3 9  {0 1 2 3 4 5 6 7 8}
+		4 15 {a b c d e f 8 6 4 2 0 1 3 5 7}
+	} {
+		test shuffle-2.2.$k "shuffle $n" -body {
+		lsort [shuffle $data]
+		} -result [lsort $data]
+	}
+}
+
+package provide struct::list::test 1.8.4 
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/map.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/map.tcl
new file mode 100644
index 00000000..41094def
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/map.tcl
@@ -0,0 +1,104 @@
+# map.tcl --
+# Copyright (c) 2009-2019 Andreas Kupries <andreas_kupries@sourceforge.net>
+#
+# Object wrapper around array/dict. Useful as key/value store in
+# larger systems.
+#
+# Examples:
+# - configuration mgmt in doctools v2 import/export managers
+# - pt import/export managers
+#
+# Each object manages a key/value map.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+package require snit
+
+# ### ### ### ######### ######### #########
+## API
+
+# ATTENTION:
+##
+# From an API point of view the code below is equivalent to the much
+# shorter `snit::type struct::map { ... }`.
+#
+# Then why the more complex form ?
+#
+# When snit compiles the class to Tcl code, and later on when methods
+# are executed it will happen in the `struct` namespace. The moment
+# this package is used together with `struct::set` all unqualified
+# `set` statements will go bonkers, eiter in snit, or, here, in method
+# `set`, because they get resolved to the `struct::set` dispatcher
+# instead of `::set`. Moving the implementation a level deeper makes
+# the `struct::map` namespace the context, with no conflict.
+
+# Future / TODO: Convert all the OO stuff here over to TclOO, as much
+# as possible (snit configure/cget support is currently still better,
+# ditto hierarchical methods).
+
+namespace eval ::struct {}
+
+proc ::struct::map {args} {
+    uplevel 1 [linsert $args 0 struct::map::I]
+}
+
+snit::type ::struct::map::I {
+
+    # ### ### ### ######### ######### #########
+    ## Options :: None
+
+    # ### ### ### ######### ######### #########
+    ## Creating, destruction
+
+    # Default constructor.
+    # Default destructor.
+
+    # ### ### ### ######### ######### #########
+    ## Public methods. Reading and writing the map.
+
+    method names {} {
+	return [array names mymap]
+    }
+
+    method get {} {
+	return [array get mymap]
+    }
+
+    method set {name {value {}}} {
+	# 7 instead of 3 in the condition below, because of the 4
+	# implicit arguments snit is providing to each method.
+	if {[llength [info level 0]] == 7} {
+	    ::set mymap($name) $value
+	} elseif {![info exists mymap($name)]} {
+	    return -code error "can't read \"$name\": no such variable"
+	}
+	return $mymap($name)
+    }
+
+    method unset {args} {
+	if {![llength $args]} { lappend args * }
+	foreach pattern $args {
+	    array unset mymap $pattern
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal methods :: None.
+
+    # ### ### ### ######### ######### #########
+    ## State :: Map data, Tcl array
+
+    variable mymap -array {}
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide struct::map 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/matrix.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/matrix.tcl
new file mode 100644
index 00000000..ee098eae
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/matrix.tcl
@@ -0,0 +1,2806 @@
+# matrix.tcl --
+#
+#	Implementation of a matrix data structure for Tcl.
+#
+# Copyright (c) 2001-2013,2019,2022 by Andreas Kupries <andreas.kupries@gmail.com>
+#
+# Heapsort code Copyright (c) 2003 by Edwin A. Suominen <ed@eepatents.com>,
+# based on concepts in "Introduction to Algorithms" by Thomas H. Cormen et al.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require Tcl 8.5
+package require textutil::wcswidth	;# TermWidth, for _columnwidth and related places
+
+namespace eval ::struct {}
+
+namespace eval ::struct::matrix {
+    # Data storage in the matrix module
+    # -------------------------------
+    #
+    # One namespace per object, containing
+    #
+    # - Two scalar variables containing the current number of rows and columns.
+    # - Four array variables containing the array data, the caches for
+    #   row heights and column widths and the information about linked arrays.
+    #
+    # The variables are
+    # - columns #columns in data
+    # - rows    #rows in data
+    # - data    cell contents
+    # - colw    cache of column widths
+    # - rowh    cache of row heights
+    # - link    information about linked arrays
+    # - lock    boolean flag to disable MatTraceIn while in MatTraceOut [#532783]
+    # - unset   string used to convey information about 'unset' traces from MatTraceIn to MatTraceOut.
+
+    # counter is used to give a unique name for unnamed matrices
+    variable counter 0
+
+    # Only export one command, the one used to instantiate a new matrix
+    namespace export matrix
+}
+
+# ::struct::matrix::matrix --
+#
+#	Create a new matrix with a given name; if no name is given, use
+#	matrixX, where X is a number.
+#
+# Arguments:
+#	name	Optional name of the matrix; if null or not given, generate one.
+#
+# Results:
+#	name	Name of the matrix created
+
+proc ::struct::matrix::matrix {args} {
+    variable counter
+
+    set src     {}
+    set srctype {}
+
+    switch -exact -- [llength [info level 0]] {
+	1 {
+	    # Missing name, generate one.
+	    incr counter
+	    set name "matrix${counter}"
+	}
+	2 {
+	    # Standard call. New empty matrix.
+	    set name [lindex $args 0]
+	}
+	4 {
+	    # Copy construction.
+	    foreach {name as src} $args break
+	    switch -exact -- $as {
+		= - := - as {
+		    set srctype matrix
+		}
+		deserialize {
+		    set srctype serial
+		}
+		default {
+		    return -code error \
+			    "wrong # args: should be \"matrix ?name ?=|:=|as|deserialize source??\""
+		}
+	    }
+	}
+	default {
+	    # Error.
+	    return -code error \
+		    "wrong # args: should be \"matrix ?name ?=|:=|as|deserialize source??\""
+	}
+    }
+
+    # FIRST, qualify the name.
+    if {![string match "::*" $name]} {
+        # Get caller's namespace; append :: if not global namespace.
+        set ns [uplevel 1 [list namespace current]]
+        if {"::" != $ns} {
+            append ns "::"
+        }
+        set name "$ns$name"
+    }
+
+    if { [llength [info commands $name]] } {
+	return -code error "command \"$name\" already exists, unable to create matrix"
+    }
+
+    # Set up the namespace
+    namespace eval $name {
+	variable columns 0
+	variable rows    0
+
+	variable data
+	variable colw
+	variable rowh
+	variable link
+	variable lock
+	variable unset
+
+	array set data  {}
+	array set colw  {}
+	array set rowh  {}
+	array set link  {}
+	set       lock  0
+	set       unset {}
+    }
+
+    # Create the command to manipulate the matrix
+    interp alias {} $name {} ::struct::matrix::MatrixProc $name
+
+    # Automatic execution of assignment if a source
+    # is present.
+    if {$src != {}} {
+	switch -exact -- $srctype {
+	    matrix {_= $name $src}
+	    serial {_deserialize $name $src}
+	    default {
+		return -code error \
+			"Internal error, illegal srctype \"$srctype\""
+	    }
+	}
+    }
+    return $name
+}
+
+##########################
+# Private functions follow
+
+# ::struct::matrix::MatrixProc --
+#
+#	Command that processes all matrix object commands.
+#
+# Arguments:
+#	name	Name of the matrix object to manipulate.
+#	cmd	Subcommand to invoke.
+#	args	Arguments for subcommand.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::matrix::MatrixProc {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error "wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+    set sub _$cmd
+    if {[llength [info commands ::struct::matrix::$sub]] == 0} {
+	set optlist [lsort [info commands ::struct::matrix::_*]]
+	set xlist {}
+	foreach p $optlist {
+	    set p [namespace tail $p]
+	    if {[string match __* $p]} {continue}
+	    lappend xlist [string range $p 1 end]
+	}
+	set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	return -code error \
+		"bad option \"$cmd\": must be $optlist"
+    }
+    uplevel 1 [linsert $args 0 ::struct::matrix::$sub $name]
+}
+
+# ::struct::matrix::_= --
+#
+#	Assignment operator. Copies the source matrix into the
+#       destination, destroying the original information.
+#
+# Arguments:
+#	name	Name of the matrix object we are copying into.
+#	source	Name of the matrix object providing us with the
+#		data to copy.
+#
+# Results:
+#	Nothing.
+
+proc ::struct::matrix::_= {name source} {
+    _deserialize $name [$source serialize]
+    return
+}
+
+# ::struct::matrix::_--> --
+#
+#	Reverse assignment operator. Copies this matrix into the
+#       destination, destroying the original information.
+#
+# Arguments:
+#	name	Name of the matrix object to copy
+#	dest	Name of the matrix object we are copying to.
+#
+# Results:
+#	Nothing.
+
+proc ::struct::matrix::_--> {name dest} {
+    $dest deserialize [_serialize $name]
+    return
+}
+
+# ::struct::matrix::_add --
+#
+#	Command that processes all 'add' subcommands.
+#
+# Arguments:
+#	name	Name of the matrix object to manipulate.
+#	cmd	Subcommand of 'add' to invoke.
+#	args	Arguments for subcommand of 'add'.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::matrix::_add {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error "wrong # args: should be \"$name add option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+    set sub __add_$cmd
+    if { [llength [info commands ::struct::matrix::$sub]] == 0 } {
+	set optlist [lsort [info commands ::struct::matrix::__add_*]]
+	set xlist {}
+	foreach p $optlist {
+	    set p [namespace tail $p]
+	    lappend xlist [string range $p 6 end]
+	}
+	set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	return -code error \
+		"bad option \"$cmd\": must be $optlist"
+    }
+    uplevel 1 [linsert $args 0 ::struct::matrix::$sub $name]
+}
+
+# ::struct::matrix::_delete --
+#
+#	Command that processes all 'delete' subcommands.
+#
+# Arguments:
+#	name	Name of the matrix object to manipulate.
+#	cmd	Subcommand of 'delete' to invoke.
+#	args	Arguments for subcommand of 'delete'.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::matrix::_delete {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error "wrong # args: should be \"$name delete option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+    set sub __delete_$cmd
+    if { [llength [info commands ::struct::matrix::$sub]] == 0 } {
+	set optlist [lsort [info commands ::struct::matrix::__delete_*]]
+	set xlist {}
+	foreach p $optlist {
+	    set p [namespace tail $p]
+	    lappend xlist [string range $p 9 end]
+	}
+	set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	return -code error \
+		"bad option \"$cmd\": must be $optlist"
+    }
+    uplevel 1 [linsert $args 0 ::struct::matrix::$sub $name]
+}
+
+# ::struct::matrix::_format --
+#
+#	Command that processes all 'format' subcommands.
+#
+# Arguments:
+#	name	Name of the matrix object to manipulate.
+#	cmd	Subcommand of 'format' to invoke.
+#	args	Arguments for subcommand of 'format'.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::matrix::_format {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error "wrong # args: should be \"$name format option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+    set sub __format_$cmd
+    if { [llength [info commands ::struct::matrix::$sub]] == 0 } {
+	set optlist [lsort [info commands ::struct::matrix::__format_*]]
+	set xlist {}
+	foreach p $optlist {
+	    set p [namespace tail $p]
+	    lappend xlist [string range $p 9 end]
+	}
+	set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	return -code error \
+		"bad option \"$cmd\": must be $optlist"
+    }
+    uplevel 1 [linsert $args 0 ::struct::matrix::$sub $name]
+}
+
+# ::struct::matrix::_get --
+#
+#	Command that processes all 'get' subcommands.
+#
+# Arguments:
+#	name	Name of the matrix object to manipulate.
+#	cmd	Subcommand of 'get' to invoke.
+#	args	Arguments for subcommand of 'get'.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::matrix::_get {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error "wrong # args: should be \"$name get option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+    set sub __get_$cmd
+    if { [llength [info commands ::struct::matrix::$sub]] == 0 } {
+	set optlist [lsort [info commands ::struct::matrix::__get_*]]
+	set xlist {}
+	foreach p $optlist {
+	    set p [namespace tail $p]
+	    lappend xlist [string range $p 6 end]
+	}
+	set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	return -code error \
+		"bad option \"$cmd\": must be $optlist"
+    }
+    uplevel 1 [linsert $args 0 ::struct::matrix::$sub $name]
+}
+
+# ::struct::matrix::_insert --
+#
+#	Command that processes all 'insert' subcommands.
+#
+# Arguments:
+#	name	Name of the matrix object to manipulate.
+#	cmd	Subcommand of 'insert' to invoke.
+#	args	Arguments for subcommand of 'insert'.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::matrix::_insert {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error "wrong # args: should be \"$name insert option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+    set sub __insert_$cmd
+    if { [llength [info commands ::struct::matrix::$sub]] == 0 } {
+	set optlist [lsort [info commands ::struct::matrix::__insert_*]]
+	set xlist {}
+	foreach p $optlist {
+	    set p [namespace tail $p]
+	    lappend xlist [string range $p 9 end]
+	}
+	set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	return -code error \
+		"bad option \"$cmd\": must be $optlist"
+    }
+    uplevel 1 [linsert $args 0 ::struct::matrix::$sub $name]
+}
+
+# ::struct::matrix::_search --
+#
+#	Command that processes all 'search' subcommands.
+#
+# Arguments:
+#	name	Name of the matrix object to manipulate.
+#	args	Arguments for search.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::matrix::_search {name args} {
+    set mode   exact
+    set nocase 0
+
+    while {1} {
+	switch -glob -- [lindex $args 0] {
+	    -exact - -glob - -regexp {
+		set mode [string range [lindex $args 0] 1 end]
+		set args [lrange $args 1 end]
+	    }
+	    -nocase {
+		set nocase 1
+		set args [lrange $args 1 end]
+	    }
+	    -* {
+		return -code error \
+			"invalid option \"[lindex $args 0]\":\
+			should be -nocase, -exact, -glob, or -regexp"
+	    }
+	    default {
+		break
+	    }
+	}
+    }
+
+    # Possible argument signatures after option processing
+    #
+    # \ | args
+    # --+--------------------------------------------------------
+    # 2 | all pattern
+    # 3 | row row pattern, column col pattern
+    # 6 | rect ctl rtl cbr rbr pattern
+    #
+    # All range specifications are internally converted into a
+    # rectangle.
+
+    switch -exact -- [llength $args] {
+	2 - 3 - 6 {}
+	default {
+	    return -code error \
+		"wrong # args: should be\
+		\"$name search ?option...? (all|row row|column col|rect c r c r) pattern\""
+	}
+    }
+
+    set range   [lindex $args 0]
+    set pattern [lindex $args end]
+    set args    [lrange $args 1 end-1]
+
+    variable ${name}::data
+    variable ${name}::columns
+    variable ${name}::rows
+
+    switch -exact -- $range {
+	all {
+	    set ctl 0 ; set cbr $columns ; incr cbr -1
+	    set rtl 0 ; set rbr $rows    ; incr rbr -1
+	}
+	column {
+	    set ctl [ChkColumnIndex $name [lindex $args 0]]
+	    set cbr $ctl
+	    set rtl 0       ; set rbr $rows ; incr rbr -1
+	}
+	row {
+	    set rtl [ChkRowIndex $name [lindex $args 0]]
+	    set ctl 0    ; set cbr $columns ; incr cbr -1
+	    set rbr $rtl
+	}
+	rect {
+	    foreach {ctl rtl cbr rbr} $args break
+	    set ctl [ChkColumnIndex $name $ctl]
+	    set rtl [ChkRowIndex    $name $rtl]
+	    set cbr [ChkColumnIndex $name $cbr]
+	    set rbr [ChkRowIndex    $name $rbr]
+	    if {($ctl > $cbr) || ($rtl > $rbr)} {
+		return -code error "Invalid cell indices, wrong ordering"
+	    }
+	}
+	default {
+	    return -code error "invalid range spec \"$range\": should be all, column, row, or rect"
+	}
+    }
+
+    if {$nocase} {
+	set pattern [string tolower $pattern]
+    }
+
+    set matches [list]
+    for {set r $rtl} {$r <= $rbr} {incr r} {
+	for {set c $ctl} {$c <= $cbr} {incr c} {
+	    set v  $data($c,$r)
+	    if {$nocase} {
+		set v [string tolower $v]
+	    }
+	    switch -exact -- $mode {
+		exact  {set matched [string equal $pattern $v]}
+		glob   {set matched [string match $pattern $v]}
+		regexp {set matched [regexp --    $pattern $v]}
+	    }
+	    if {$matched} {
+		lappend matches [list $c $r]
+	    }
+	}
+    }
+    return $matches
+}
+
+# ::struct::matrix::_set --
+#
+#	Command that processes all 'set' subcommands.
+#
+# Arguments:
+#	name	Name of the matrix object to manipulate.
+#	cmd	Subcommand of 'set' to invoke.
+#	args	Arguments for subcommand of 'set'.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::matrix::_set {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error "wrong # args: should be \"$name set option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+    set sub __set_$cmd
+    if { [llength [info commands ::struct::matrix::$sub]] == 0 } {
+	set optlist [lsort [info commands ::struct::matrix::__set_*]]
+	set xlist {}
+	foreach p $optlist {
+	    set p [namespace tail $p]
+	    lappend xlist [string range $p 6 end]
+	}
+	set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	return -code error \
+		"bad option \"$cmd\": must be $optlist"
+    }
+    uplevel 1 [linsert $args 0 ::struct::matrix::$sub $name]
+}
+
+# ::struct::matrix::_sort --
+#
+#	Command that processes all 'sort' subcommands.
+#
+# Arguments:
+#	name	Name of the matrix object to manipulate.
+#	cmd	Subcommand of 'sort' to invoke.
+#	args	Arguments for subcommand of 'sort'.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::matrix::_sort {name cmd args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error "wrong # args: should be \"$name sort option ?arg arg ...?\""
+    }
+    if {[string equal $cmd "rows"]} {
+	set code   r
+	set byrows 1
+    } elseif {[string equal $cmd "columns"]} {
+	set code   c
+	set byrows 0
+    } else {
+	return -code error \
+		"bad option \"$cmd\": must be columns, or rows"
+    }
+
+    set revers 0 ;# Default: -increasing
+    while {1} {
+	switch -glob -- [lindex $args 0] {
+	    -increasing {set revers 0}
+	    -decreasing {set revers 1}
+	    default {
+		if {[llength $args] > 1} {
+		    return -code error \
+			"invalid option \"[lindex $args 0]\":\
+			should be -increasing, or -decreasing"
+		}
+		break
+	    }
+	}
+	set args [lrange $args 1 end]
+    }
+    # ASSERT: [llength $args] == 1
+
+    if {[llength $args] != 1} {
+	return -code error "wrong # args: should be \"$name sort option ?arg arg ...?\""
+    }
+
+    set key [lindex $args 0]
+
+    if {$byrows} {
+	set key [ChkColumnIndex $name $key]
+	variable ${name}::rows
+
+	# Adapted by EAS from BUILD-MAX-HEAP(A) of CRLS 6.3
+	set heapSize $rows
+    } else {
+	set key [ChkRowIndex $name $key]
+	variable ${name}::columns
+
+	# Adapted by EAS from BUILD-MAX-HEAP(A) of CRLS 6.3
+	set heapSize $columns
+    }
+
+    for {set i [expr {int($heapSize/2)-1}]} {$i>=0} {incr i -1} {
+	SortMaxHeapify $name $i $key $code $heapSize $revers
+    }
+
+    # Adapted by EAS from remainder of HEAPSORT(A) of CRLS 6.4
+    for {set i [expr {$heapSize-1}]} {$i>=1} {incr i -1} {
+	if {$byrows} {
+	    SwapRows $name 0 $i
+	} else {
+	    SwapColumns $name 0 $i
+	}
+	incr heapSize -1
+	SortMaxHeapify $name 0 $key $code $heapSize $revers
+    }
+    return
+}
+
+# ::struct::matrix::_swap --
+#
+#	Command that processes all 'swap' subcommands.
+#
+# Arguments:
+#	name	Name of the matrix object to manipulate.
+#	cmd	Subcommand of 'swap' to invoke.
+#	args	Arguments for subcommand of 'swap'.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::matrix::_swap {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error "wrong # args: should be \"$name swap option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+    set sub __swap_$cmd
+    if { [llength [info commands ::struct::matrix::$sub]] == 0 } {
+	set optlist [lsort [info commands ::struct::matrix::__swap_*]]
+	set xlist {}
+	foreach p $optlist {
+	    set p [namespace tail $p]
+	    lappend xlist [string range $p 7 end]
+	}
+	set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	return -code error \
+		"bad option \"$cmd\": must be $optlist"
+    }
+    uplevel 1 [linsert $args 0 ::struct::matrix::$sub $name]
+}
+
+# ::struct::matrix::__add_column --
+#
+#	Extends the matrix by one column and then acts like
+#	"setcolumn" (see below) on this new column if there were
+#	"values" supplied. Without "values" the new cells will be set
+#	to the empty string. The new column is appended immediately
+#	behind the last existing column.
+#
+# Arguments:
+#	name	Name of the matrix object.
+#	values	Optional values to set into the new row.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__add_column {name {values {}}} {
+    variable ${name}::data
+    variable ${name}::columns
+    variable ${name}::rows
+    variable ${name}::rowh
+
+    if {[set l [llength $values]] < $rows} {
+	# Missing values. Fill up with empty strings
+
+	for {} {$l < $rows} {incr l} {
+	    lappend values {}
+	}
+    } elseif {[llength $values] > $rows} {
+	# To many values. Remove the superfluous items
+	set values [lrange $values 0 [expr {$rows - 1}]]
+    }
+
+    # "values" now contains the information to set into the array.
+    # Regarding the width and height caches:
+
+    # - The new column is not added to the width cache, the other
+    #   columns are not touched, the cache therefore unchanged.
+    # - The rows are either removed from the height cache or left
+    #   unchanged, depending on the contents set into the cell.
+
+    set r 0
+    foreach v $values {
+	if {$v != {}} {
+	    # Data changed unpredictably, invalidate cache
+	    catch {unset rowh($r)}
+	} ; # {else leave the row unchanged}
+	set data($columns,$r) $v
+	incr r
+    }
+    incr columns
+    return
+}
+
+# ::struct::matrix::__add_row --
+#
+#	Extends the matrix by one row and then acts like "setrow" (see
+#	below) on this new row if there were "values"
+#	supplied. Without "values" the new cells will be set to the
+#	empty string. The new row is appended immediately behind the
+#	last existing row.
+#
+# Arguments:
+#	name	Name of the matrix object.
+#	values	Optional values to set into the new row.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__add_row {name {values {}}} {
+    variable ${name}::data
+    variable ${name}::columns
+    variable ${name}::rows
+    variable ${name}::colw
+
+    if {[set l [llength $values]] < $columns} {
+	# Missing values. Fill up with empty strings
+
+	for {} {$l < $columns} {incr l} {
+	    lappend values {}
+	}
+    } elseif {[llength $values] > $columns} {
+	# To many values. Remove the superfluous items
+	set values [lrange $values 0 [expr {$columns - 1}]]
+    }
+
+    # "values" now contains the information to set into the array.
+    # Regarding the width and height caches:
+
+    # - The new row is not added to the height cache, the other
+    #   rows are not touched, the cache therefore unchanged.
+    # - The columns are either removed from the width cache or left
+    #   unchanged, depending on the contents set into the cell.
+
+    set c 0
+    foreach v $values {
+	if {$v != {}} {
+	    # Data changed unpredictably, invalidate cache
+	    catch {unset colw($c)}
+	} ; # {else leave the row unchanged}
+	set data($c,$rows) $v
+	incr c
+    }
+    incr rows
+    return
+}
+
+# ::struct::matrix::__add_columns --
+#
+#	Extends the matrix by "n" columns. The new cells will be set
+#	to the empty string. The new columns are appended immediately
+#	behind the last existing column. A value of "n" equal to or
+#	smaller than 0 is not allowed.
+#
+# Arguments:
+#	name	Name of the matrix object.
+#	n	The number of new columns to create.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__add_columns {name n} {
+    if {$n <= 0} {
+	return -code error "A value of n <= 0 is not allowed"
+    }
+    AddColumns $name $n
+    return
+}
+
+proc ::struct::matrix::AddColumns {name n} {
+    variable ${name}::data
+    variable ${name}::columns
+    variable ${name}::rows
+
+    # The new values set into the cell is always the empty
+    # string. These have a length and height of 0, i.e. the don't
+    # influence cached widths and heights as they are at least that
+    # big. IOW there is no need to touch and change the width and
+    # height caches.
+
+    while {$n > 0} {
+	for {set r 0} {$r < $rows} {incr r} {
+	    set data($columns,$r) ""
+	}
+	incr columns
+	incr n -1
+    }
+
+    return
+}
+
+# ::struct::matrix::__add_rows --
+#
+#	Extends the matrix by "n" rows. The new cells will be set to
+#	the empty string. The new rows are appended immediately behind
+#	the last existing row. A value of "n" equal to or smaller than
+#	0 is not allowed.
+#
+# Arguments:
+#	name	Name of the matrix object.
+#	n	The number of new rows to create.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__add_rows {name n} {
+    if {$n <= 0} {
+	return -code error "A value of n <= 0 is not allowed"
+    }
+    AddRows $name $n
+    return
+}
+
+proc ::struct::matrix::AddRows {name n} {
+    variable ${name}::data
+    variable ${name}::columns
+    variable ${name}::rows
+
+    # The new values set into the cell is always the empty
+    # string. These have a length and height of 0, i.e. the don't
+    # influence cached widths and heights as they are at least that
+    # big. IOW there is no need to touch and change the width and
+    # height caches.
+
+    while {$n > 0} {
+	for {set c 0} {$c < $columns} {incr c} {
+	    set data($c,$rows) ""
+	}
+	incr rows
+	incr n -1
+    }
+    return
+}
+
+# ::struct::matrix::_cells --
+#
+#	Returns the number of cells currently managed by the
+#	matrix. This is the product of "rows" and "columns".
+#
+# Arguments:
+#	name	Name of the matrix object.
+#
+# Results:
+#	The number of cells in the matrix.
+
+proc ::struct::matrix::_cells {name} {
+    variable ${name}::rows
+    variable ${name}::columns
+    return [expr {$rows * $columns}]
+}
+
+# ::struct::matrix::_cellsize --
+#
+#	Returns the length of the string representation of the value
+#	currently contained in the addressed cell.
+#
+# Arguments:
+#	name	Name of the matrix object.
+#	column	Column index of the cell to query
+#	row	Row index of the cell to query
+#
+# Results:
+#	The number of cells in the matrix.
+
+proc ::struct::matrix::_cellsize {name column row} {
+    set column [ChkColumnIndex $name $column]
+    set row    [ChkRowIndex    $name $row]
+
+    variable ${name}::data
+    return [string length $data($column,$row)]
+}
+
+# ::struct::matrix::_columns --
+#
+#	Returns the number of columns currently managed by the
+#	matrix.
+#
+# Arguments:
+#	name	Name of the matrix object.
+#
+# Results:
+#	The number of columns in the matrix.
+
+proc ::struct::matrix::_columns {name} {
+    variable ${name}::columns
+    return $columns
+}
+
+# ::struct::matrix::_columnwidth --
+#
+#	Returns the length of the longest string representation of all
+#	the values currently contained in the cells of the addressed
+#	column if these are all spanning only one line. For cell
+#	values spanning multiple lines the length of their longest
+#	line goes into the computation.
+#
+# Arguments:
+#	name	Name of the matrix object.
+#	column	The index of the column whose width is asked for.
+#
+# Results:
+#	See description.
+
+proc ::struct::matrix::_columnwidth {name column} {
+    set column [ChkColumnIndex $name $column]
+
+    variable ${name}::colw
+
+    if {![info exists colw($column)]} {
+	variable ${name}::rows
+	variable ${name}::data
+
+	set width 0
+	for {set r 0} {$r < $rows} {incr r} {
+	    foreach line [split $data($column,$r) \n] {
+		set len [TermWidth $line]
+		if {$len > $width} {
+		    set width $len
+		}
+	    }
+	}
+
+	set colw($column) $width
+    }
+
+    return $colw($column)
+}
+
+# ::struct::matrix::__delete_column --
+#
+#	Deletes the specified column from the matrix and shifts all
+#	columns with higher indices one index down.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	column	The index of the column to delete.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__delete_column {name column} {
+    set column [ChkColumnIndex $name $column]
+
+    variable ${name}::data
+    variable ${name}::rows
+    variable ${name}::columns
+    variable ${name}::colw
+    variable ${name}::rowh
+
+    # Move all data from the higher columns down and then delete the
+    # superfluous data in the old last column. Move the data in the
+    # width cache too, take partial fill into account there too.
+    # Invalidate the height cache for all rows.
+
+    for {set r 0} {$r < $rows} {incr r} {
+	for {set c $column; set cn [expr {$c + 1}]} {$cn < $columns} {incr c ; incr cn} {
+	    set data($c,$r) $data($cn,$r)
+	    if {[info exists colw($cn)]} {
+		set colw($c) $colw($cn)
+		unset colw($cn)
+	    }
+	}
+	unset data($c,$r)
+	catch {unset rowh($r)}
+    }
+    incr columns -1
+    return
+}
+
+# ::struct::matrix::__delete_columns --
+#
+#	Shrink the matrix by "n" columns (from the right).
+#	A value of "n" equal to or smaller than 0 is not
+#	allowed, nor is "n" allowed to be greater than the
+#	number of columns in the matrix.
+#
+# Arguments:
+#	name	Name of the matrix object.
+#	n	The number of columns to remove.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__delete_columns {name n} {
+    if {$n <= 0} {
+	return -code error "A value of n <= 0 is not allowed"
+    }
+
+    variable ${name}::columns
+
+    if {$n > $columns} {
+	return -code error "A value of n > #columns is not allowed"
+    }
+
+    DeleteColumns $name $n
+    return
+}
+
+# ::struct::matrix::__delete_row --
+#
+#	Deletes the specified row from the matrix and shifts all
+#	row with higher indices one index down.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	row	The index of the row to delete.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__delete_row {name row} {
+    set row [ChkRowIndex $name $row]
+
+    variable ${name}::data
+    variable ${name}::rows
+    variable ${name}::columns
+    variable ${name}::colw
+    variable ${name}::rowh
+
+    # Move all data from the higher rows down and then delete the
+    # superfluous data in the old last row. Move the data in the
+    # height cache too, take partial fill into account there too.
+    # Invalidate the width cache for all columns.
+
+    for {set c 0} {$c < $columns} {incr c} {
+	for {set r $row; set rn [expr {$r + 1}]} {$rn < $rows} {incr r ; incr rn} {
+	    set data($c,$r) $data($c,$rn)
+	    if {[info exists rowh($rn)]} {
+		set rowh($r) $rowh($rn)
+		unset rowh($rn)
+	    }
+	}
+	unset data($c,$r)
+	catch {unset colw($c)}
+    }
+    incr rows -1
+    return
+}
+
+# ::struct::matrix::__delete_rows --
+#
+#	Shrink the matrix by "n" rows (from the bottom).
+#	A value of "n" equal to or smaller than 0 is not
+#	allowed, nor is "n" allowed to be greater than the
+#	number of rows in the matrix.
+#
+# Arguments:
+#	name	Name of the matrix object.
+#	n	The number of rows to remove.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__delete_rows {name n} {
+    if {$n <= 0} {
+	return -code error "A value of n <= 0 is not allowed"
+    }
+
+    variable ${name}::rows
+
+    if {$n > $rows} {
+	return -code error "A value of n > #rows is not allowed"
+    }
+
+    DeleteRows $name $n
+    return
+}
+
+# ::struct::matrix::_deserialize --
+#
+#	Assignment operator. Copies a serialization into the
+#       destination, destroying the original information.
+#
+# Arguments:
+#	name	Name of the matrix object we are copying into.
+#	serial	Serialized matrix to copy from.
+#
+# Results:
+#	Nothing.
+
+proc ::struct::matrix::_deserialize {name serial} {
+    # As we destroy the original matrix as part of
+    # the copying process we don't have to deal
+    # with issues like node names from the new matrix
+    # interfering with the old ...
+
+    # I. Get the serialization of the source matrix
+    #    and check it for validity.
+
+    CheckSerialization $serial r c values
+
+    # Get all the relevant data into the scope
+
+    variable ${name}::rows
+    variable ${name}::columns
+
+    # Resize the destination matrix for the new data
+
+    if {$r > $rows} {
+	AddRows $name [expr {$r - $rows}]
+    } elseif {$r < $rows} {
+	DeleteRows $name [expr {$rows - $r}]
+    }
+    if {$c > $columns} {
+	AddColumns $name [expr {$c - $columns}]
+    } elseif {$c < $columns} {
+	DeleteColumns $name [expr {$columns - $c}]
+    }
+
+    set rows    $r
+    set columns $c
+
+    # Copy the new data over the old information.
+
+    set row 0
+    foreach rv $values {
+	SetRow $name $row $rv
+	incr row
+    }
+    while {$row < $rows} {
+	# Fill with empty rows if there are not enough.
+	SetRow $name $row {}
+	incr row
+    }
+    return
+}
+
+# ::struct::matrix::_destroy --
+#
+#	Destroy a matrix, including its associated command and data storage.
+#
+# Arguments:
+#	name	Name of the matrix to destroy.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::_destroy {name} {
+    variable ${name}::link
+
+    # Unlink all existing arrays before destroying the object so that
+    # we don't leave dangling references / traces.
+
+    foreach avar [array names link] {
+	_unlink $name $avar
+    }
+
+    namespace delete $name
+    interp alias {}  $name {}
+}
+
+# ::struct::matrix::__format_2string --
+#
+#	Formats the matrix using the specified report object and
+#	returns the string containing the result of this
+#	operation. The report has to support the "printmatrix" method.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	report	Name of the report object specifying the formatting.
+#
+# Results:
+#	A string containing the formatting result.
+
+proc ::struct::matrix::__format_2string {name {report {}}} {
+    if {$report == {}} {
+	# Use an internal hardwired simple report to format the matrix.
+	# 1. Go through all columns and compute the column widths.
+	# 2. Then iterate through all rows and dump then into a
+	#    string, formatted to the number of characters per columns
+
+	array set cw {}
+	set cols [_columns $name]
+	for {set c 0} {$c < $cols} {incr c} {
+	    set cw($c) [_columnwidth $name $c]
+	}
+
+	set result [list]
+	set n [_rows $name]
+	for {set r 0} {$r < $n} {incr r} {
+	    set rh [_rowheight $name $r]
+	    if {$rh < 2} {
+		# Simple row.
+		set line [list]
+		for {set c 0} {$c < $cols} {incr c} {
+		    set val [__get_cell $name $c $r]
+		    lappend line "$val[string repeat " " [expr {$cw($c)-[TermWidth $val]}]]"
+		}
+		lappend result [join $line " "]
+	    } else {
+		# Complex row, multiple passes
+		for {set h 0} {$h < $rh} {incr h} {
+		    set line [list]
+		    for {set c 0} {$c < $cols} {incr c} {
+			set val [lindex [split [__get_cell $name $c $r] \n] $h]
+			lappend line "$val[string repeat " " [expr {$cw($c)-[TermWidth $val]}]]"
+		    }
+		    lappend result [join $line " "]
+		}
+	    }
+	}
+	return [join $result \n]
+    } else {
+	return [$report printmatrix $name]
+    }
+}
+
+# ::struct::matrix::__format_2chan --
+#
+#	Formats the matrix using the specified report object and
+#	writes the string containing the result of this operation into
+#	the channel. The report has to support the
+#	"printmatrix2channel" method.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	report	Name of the report object specifying the formatting.
+#	chan	Handle of the channel to write to.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__format_2chan {name {report {}} {chan stdout}} {
+    if {$report == {}} {
+	# Use an internal hardwired simple report to format the matrix.
+	# We delegate this to the string formatter and print its result.
+	puts -nonewline $chan [__format_2string $name]
+    } else {
+	$report printmatrix2channel $name $chan
+    }
+    return
+}
+
+# ::struct::matrix::__get_cell --
+#
+#	Returns the value currently contained in the cell identified
+#	by row and column index.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	column	Column index of the addressed cell.
+#	row	Row index of the addressed cell.
+#
+# Results:
+#	value	Value currently stored in the addressed cell.
+
+proc ::struct::matrix::__get_cell {name column row} {
+    set column [ChkColumnIndex $name $column]
+    set row    [ChkRowIndex    $name $row]
+
+    variable ${name}::data
+    return $data($column,$row)
+}
+
+# ::struct::matrix::__get_column --
+#
+#	Returns a list containing the values from all cells in the
+#	column identified by the index. The contents of the cell in
+#	row 0 are stored as the first element of this list.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	column	Column index of the addressed cell.
+#
+# Results:
+#	List of values stored in the addressed row.
+
+proc ::struct::matrix::__get_column {name column} {
+    set column [ChkColumnIndex $name $column]
+    return     [GetColumn      $name $column]
+}
+
+proc ::struct::matrix::GetColumn {name column} {
+    variable ${name}::data
+    variable ${name}::rows
+
+    set result [list]
+    for {set r 0} {$r < $rows} {incr r} {
+	lappend result $data($column,$r)
+    }
+    return $result
+}
+
+# ::struct::matrix::__get_rect --
+#
+#	Returns a list of lists of cell values. The values stored in
+#	the result come from the submatrix whose top-left and
+#	bottom-right cells are specified by "column_tl", "row_tl" and
+#	"column_br", "row_br" resp. Note that the following equations
+#	have to be true: column_tl <= column_br and row_tl <= row_br.
+#	The result is organized as follows: The outer list is the list
+#	of rows, its elements are lists representing a single row. The
+#	row with the smallest index is the first element of the outer
+#	list. The elements of the row lists represent the selected
+#	cell values. The cell with the smallest index is the first
+#	element in each row list.
+#
+# Arguments:
+#	name		Name of the matrix.
+#	column_tl	Column index of the top-left cell of the area.
+#	row_tl		Row index of the top-left cell of the the area
+#	column_br	Column index of the bottom-right cell of the area.
+#	row_br		Row index of the bottom-right cell of the the area
+#
+# Results:
+#	List of a list of values stored in the addressed area.
+
+proc ::struct::matrix::__get_rect {name column_tl row_tl column_br row_br} {
+    set column_tl [ChkColumnIndex $name $column_tl]
+    set row_tl    [ChkRowIndex    $name $row_tl]
+    set column_br [ChkColumnIndex $name $column_br]
+    set row_br    [ChkRowIndex    $name $row_br]
+
+    if {
+	($column_tl > $column_br) ||
+	($row_tl    > $row_br)
+    } {
+	return -code error "Invalid cell indices, wrong ordering"
+    }
+    return [GetRect $name $column_tl $row_tl $column_br $row_br]
+}
+
+proc ::struct::matrix::GetRect {name column_tl row_tl column_br row_br} {
+    variable ${name}::data
+    set result [list]
+
+    for {set r $row_tl} {$r <= $row_br} {incr r} {
+	set row [list]
+	for {set c $column_tl} {$c <= $column_br} {incr c} {
+	    lappend row $data($c,$r)
+	}
+	lappend result $row
+    }
+
+    return $result
+}
+
+# ::struct::matrix::__get_row --
+#
+#	Returns a list containing the values from all cells in the
+#	row identified by the index. The contents of the cell in
+#	column 0 are stored as the first element of this list.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	row	Row index of the addressed cell.
+#
+# Results:
+#	List of values stored in the addressed row.
+
+proc ::struct::matrix::__get_row {name row} {
+    set row [ChkRowIndex $name $row]
+    return  [GetRow      $name $row]
+}
+
+proc ::struct::matrix::GetRow {name row} {
+    variable ${name}::data
+    variable ${name}::columns
+
+    set result [list]
+    for {set c 0} {$c < $columns} {incr c} {
+	lappend result $data($c,$row)
+    }
+    return $result
+}
+
+# ::struct::matrix::__insert_column --
+#
+#	Extends the matrix by one column and then acts like
+#	"setcolumn" (see below) on this new column if there were
+#	"values" supplied. Without "values" the new cells will be set
+#	to the empty string. The new column is inserted just before
+#	the column specified by the given index. This means, if
+#	"column" is less than or equal to zero, then the new column is
+#	inserted at the beginning of the matrix, before the first
+#	column. If "column" has the value "Bend", or if it is greater
+#	than or equal to the number of columns in the matrix, then the
+#	new column is appended to the matrix, behind the last
+#	column. The old column at the chosen index and all columns
+#	with higher indices are shifted one index upward.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	column	Index of the column where to insert.
+#	values	Optional values to set the cells to.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__insert_column {name column {values {}}} {
+    # Allow both negative and too big indices.
+    set column [ChkColumnIndexAll $name $column]
+
+    variable ${name}::columns
+
+    if {$column > $columns} {
+	# Same as 'addcolumn'
+	__add_column $name $values
+	return
+    }
+
+    variable ${name}::data
+    variable ${name}::rows
+    variable ${name}::rowh
+    variable ${name}::colw
+
+    set firstcol $column
+    if {$firstcol < 0} {
+	set firstcol 0
+    }
+
+    if {[set l [llength $values]] < $rows} {
+	# Missing values. Fill up with empty strings
+
+	for {} {$l < $rows} {incr l} {
+	    lappend values {}
+	}
+    } elseif {[llength $values] > $rows} {
+	# To many values. Remove the superfluous items
+	set values [lrange $values 0 [expr {$rows - 1}]]
+    }
+
+    # "values" now contains the information to set into the array.
+    # Regarding the width and height caches:
+    # Invalidate all rows, move all columns
+
+    # Move all data from the higher columns one up and then insert the
+    # new data into the freed space. Move the data in the
+    # width cache too, take partial fill into account there too.
+    # Invalidate the height cache for all rows.
+
+    for {set r 0} {$r < $rows} {incr r} {
+	for {set cn $columns ; set c [expr {$cn - 1}]} {$c >= $firstcol} {incr c -1 ; incr cn -1} {
+	    set data($cn,$r) $data($c,$r)
+	    if {[info exists colw($c)]} {
+		set colw($cn) $colw($c)
+		unset colw($c)
+	    }
+	}
+	set data($firstcol,$r) [lindex $values $r]
+	catch {unset rowh($r)}
+    }
+    incr columns
+    return
+}
+
+# ::struct::matrix::__insert_row --
+#
+#	Extends the matrix by one row and then acts like "setrow" (see
+#	below) on this new row if there were "values"
+#	supplied. Without "values" the new cells will be set to the
+#	empty string. The new row is inserted just before the row
+#	specified by the given index. This means, if "row" is less
+#	than or equal to zero, then the new row is inserted at the
+#	beginning of the matrix, before the first row. If "row" has
+#	the value "end", or if it is greater than or equal to the
+#	number of rows in the matrix, then the new row is appended to
+#	the matrix, behind the last row. The old row at that index and
+#	all rows with higher indices are shifted one index upward.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	row	Index of the row where to insert.
+#	values	Optional values to set the cells to.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__insert_row {name row {values {}}} {
+    # Allow both negative and too big indices.
+    set row [ChkRowIndexAll $name $row]
+
+    variable ${name}::rows
+
+    if {$row > $rows} {
+	# Same as 'addrow'
+	__add_row $name $values
+	return
+    }
+
+    variable ${name}::data
+    variable ${name}::columns
+    variable ${name}::rowh
+    variable ${name}::colw
+
+    set firstrow $row
+    if {$firstrow < 0} {
+	set firstrow 0
+    }
+
+    if {[set l [llength $values]] < $columns} {
+	# Missing values. Fill up with empty strings
+
+	for {} {$l < $columns} {incr l} {
+	    lappend values {}
+	}
+    } elseif {[llength $values] > $columns} {
+	# To many values. Remove the superfluous items
+	set values [lrange $values 0 [expr {$columns - 1}]]
+    }
+
+    # "values" now contains the information to set into the array.
+    # Regarding the width and height caches:
+    # Invalidate all columns, move all rows
+
+    # Move all data from the higher rows one up and then insert the
+    # new data into the freed space. Move the data in the
+    # height cache too, take partial fill into account there too.
+    # Invalidate the width cache for all columns.
+
+    for {set c 0} {$c < $columns} {incr c} {
+	for {set rn $rows ; set r [expr {$rn - 1}]} {$r >= $firstrow} {incr r -1 ; incr rn -1} {
+	    set data($c,$rn) $data($c,$r)
+	    if {[info exists rowh($r)]} {
+		set rowh($rn) $rowh($r)
+		unset rowh($r)
+	    }
+	}
+	set data($c,$firstrow) [lindex $values $c]
+	catch {unset colw($c)}
+    }
+    incr rows
+    return
+}
+
+# ::struct::matrix::_link --
+#
+#	Links the matrix to the specified array variable. This means
+#	that the contents of all cells in the matrix is stored in the
+#	array too, with all changes to the matrix propagated there
+#	too. The contents of the cell "(column,row)" is stored in the
+#	array using the key "column,row". If the option "-transpose"
+#	is specified the key "row,column" will be used instead. It is
+#	possible to link the matrix to more than one array. Note that
+#	the link is bidirectional, i.e. changes to the array are
+#	mirrored in the matrix too.
+#
+# Arguments:
+#	name	Name of the matrix object.
+#	option	Either empty of '-transpose'.
+#	avar	Name of the variable to link to
+#
+# Results:
+#	None
+
+proc ::struct::matrix::_link {name args} {
+    switch -exact -- [llength $args] {
+	0 {
+	    return -code error "$name: wrong # args: link ?-transpose? arrayvariable"
+	}
+	1 {
+	    set transpose 0
+	    set variable  [lindex $args 0]
+	}
+	2 {
+	    foreach {t variable} $args break
+	    if {[string compare $t -transpose]} {
+		return -code error "$name: illegal syntax: link ?-transpose? arrayvariable"
+	    }
+	    set transpose 1
+	}
+	default {
+	    return -code error "$name: wrong # args: link ?-transpose? arrayvariable"
+	}
+    }
+
+    variable ${name}::link
+
+    if {[info exists link($variable)]} {
+	return -code error "$name link: Variable \"$variable\" already linked to matrix"
+    }
+
+    # Ok, a new variable we are linked to. Record this information,
+    # dump our current contents into the array, at last generate the
+    # traces actually performing the link.
+
+    set link($variable) $transpose
+
+    upvar #0 $variable array
+    variable ${name}::data
+
+    foreach key [array names data] {
+	foreach {c r} [split $key ,] break
+	if {$transpose} {
+	    set array($r,$c) $data($key)
+	} else {
+	    set array($c,$r) $data($key)
+	}
+    }
+
+    trace variable array wu [list ::struct::matrix::MatTraceIn  $variable $name]
+    trace variable data  w  [list ::struct::matrix::MatTraceOut $variable $name]
+    return
+}
+
+# ::struct::matrix::_links --
+#
+#	Retrieves the names of all array variable the matrix is
+#	officially linked to.
+#
+# Arguments:
+#	name	Name of the matrix object.
+#
+# Results:
+#	List of variables the matrix is linked to.
+
+proc ::struct::matrix::_links {name} {
+    variable ${name}::link
+    return [array names link]
+}
+
+# ::struct::matrix::_rowheight --
+#
+#	Returns the height of the specified row in lines. This is the
+#	highest number of lines spanned by a cell over all cells in
+#	the row.
+#
+# Arguments:
+#	name	Name of the matrix
+#	row	Index of the row queried for its height
+#
+# Results:
+#	The height of the specified row in lines.
+
+proc ::struct::matrix::_rowheight {name row} {
+    set row [ChkRowIndex $name $row]
+
+    variable ${name}::rowh
+
+    if {![info exists rowh($row)]} {
+	variable ${name}::columns
+	variable ${name}::data
+
+	set height 1
+	for {set c 0} {$c < $columns} {incr c} {
+	    set cheight [llength [split $data($c,$row) \n]]
+	    if {$cheight > $height} {
+		set height $cheight
+	    }
+	}
+
+	set rowh($row) $height
+    }
+    return $rowh($row)
+}
+
+# ::struct::matrix::_rows --
+#
+#	Returns the number of rows currently managed by the matrix.
+#
+# Arguments:
+#	name	Name of the matrix object.
+#
+# Results:
+#	The number of rows in the matrix.
+
+proc ::struct::matrix::_rows {name} {
+    variable ${name}::rows
+    return $rows
+}
+
+# ::struct::matrix::_serialize --
+#
+#	Serialize a matrix object (partially) into a transportable value.
+#	If only a rectangle is serialized the result will be a sub-
+#	matrix in the mathematical sense of the word.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	args	rectangle to place into the serialized matrix
+#
+# Results:
+#	A list structure describing the part of the matrix which was serialized.
+
+proc ::struct::matrix::_serialize {name args} {
+
+    # all - boolean flag - set if and only if the all nodes of the
+    # matrix are chosen for serialization. Because if that is true we
+    # can skip the step finding the relevant arcs and simply take all
+    # arcs.
+
+    set nargs [llength $args]
+    if {($nargs != 0) && ($nargs != 4)} {
+	return -code error "$name: wrong # args: serialize ?column_tl row_tl column_br row_br?"
+    }
+
+    variable ${name}::rows
+    variable ${name}::columns
+
+    if {$nargs == 4} {
+	foreach {column_tl row_tl column_br row_br} $args break
+
+	set column_tl [ChkColumnIndex $name $column_tl]
+	set row_tl    [ChkRowIndex    $name $row_tl]
+	set column_br [ChkColumnIndex $name $column_br]
+	set row_br    [ChkRowIndex    $name $row_br]
+
+	if {
+	    ($column_tl > $column_br) ||
+	    ($row_tl    > $row_br)
+	} {
+	    return -code error "Invalid cell indices, wrong ordering"
+	}
+	set rn [expr {$row_br    - $row_tl    + 1}]
+	set cn [expr {$column_br - $column_tl + 1}]
+    } else {
+	set column_tl 0
+	set row_tl    0
+	set column_br [expr {$columns - 1}]
+	set row_br    [expr {$rows - 1}]
+	set rn $rows
+	set cn $columns
+    }
+
+    # We could optimize and remove empty cells to the right and rows
+    # to the bottom. For now we don't.
+
+    return [list \
+	    $rn $cn \
+	    [GetRect $name $column_tl $row_tl $column_br $row_br]]
+}
+
+# ::struct::matrix::__set_cell --
+#
+#	Sets the value in the cell identified by row and column index
+#	to the data in the third argument.
+#
+# Arguments:
+#	name	Name of the matrix object.
+#	column	Column index of the cell to set.
+#	row	Row index of the cell to set.
+#	value	The new value of the cell.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__set_cell {name column row value} {
+    set column [ChkColumnIndex $name $column]
+    set row    [ChkRowIndex    $name $row]
+
+    variable ${name}::data
+
+    if {![string compare $value $data($column,$row)]} {
+	# No change, ignore call!
+	return
+    }
+
+    set data($column,$row) $value
+
+    if {$value != {}} {
+	variable ${name}::colw
+	variable ${name}::rowh
+	catch {unset colw($column)}
+	catch {unset rowh($row)}
+    }
+    return
+}
+
+# ::struct::matrix::__set_column --
+#
+#	Sets the values in the cells identified by the column index to
+#	the elements of the list provided as the third argument. Each
+#	element of the list is assigned to one cell, with the first
+#	element going into the cell in row 0 and then upward. If there
+#	are less values in the list than there are rows the remaining
+#	rows are set to the empty string. If there are more values in
+#	the list than there are rows the superfluous elements are
+#	ignored. The matrix is not extended by this operation.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	column	Index of the column to set.
+#	values	Values to set into the column.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__set_column {name column values} {
+    set column [ChkColumnIndex $name $column]
+
+    variable ${name}::data
+    variable ${name}::columns
+    variable ${name}::rows
+    variable ${name}::rowh
+    variable ${name}::colw
+
+    if {[set l [llength $values]] < $rows} {
+	# Missing values. Fill up with empty strings
+
+	for {} {$l < $rows} {incr l} {
+	    lappend values {}
+	}
+    } elseif {[llength $values] > $rows} {
+	# To many values. Remove the superfluous items
+	set values [lrange $values 0 [expr {$rows - 1}]]
+    }
+
+    # "values" now contains the information to set into the array.
+    # Regarding the width and height caches:
+
+    # - Invalidate the column in the width cache.
+    # - The rows are either removed from the height cache or left
+    #   unchanged, depending on the contents set into the cell.
+
+    set r 0
+    foreach v $values {
+	if {$v != {}} {
+	    # Data changed unpredictably, invalidate cache
+	    catch {unset rowh($r)}
+	} ; # {else leave the row unchanged}
+	set data($column,$r) $v
+	incr r
+    }
+    catch {unset colw($column)}
+    return
+}
+
+# ::struct::matrix::__set_rect --
+#
+#	Takes a list of lists of cell values and writes them into the
+#	submatrix whose top-left cell is specified by the two
+#	indices. If the sublists of the outer list are not of equal
+#	length the shorter sublists will be filled with empty strings
+#	to the length of the longest sublist. If the submatrix
+#	specified by the top-left cell and the number of rows and
+#	columns in the "values" extends beyond the matrix we are
+#	modifying the over-extending parts of the values are ignored,
+#	i.e. essentially cut off. This subcommand expects its input in
+#	the format as returned by "getrect".
+#
+# Arguments:
+#	name	Name of the matrix object.
+#	column	Column index of the topleft cell to set.
+#	row	Row index of the topleft cell to set.
+#	values	Values to set.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__set_rect {name column row values} {
+    # Allow negative indices!
+    set column [ChkColumnIndexNeg $name $column]
+    set row    [ChkRowIndexNeg    $name $row]
+
+    variable ${name}::data
+    variable ${name}::columns
+    variable ${name}::rows
+    variable ${name}::colw
+    variable ${name}::rowh
+
+    if {$row < 0} {
+	# Remove rows from the head of values to restrict it to the
+	# overlapping area.
+
+	set values [lrange $values [expr {0 - $row}] end]
+	set row 0
+    }
+
+    # Restrict it at the end too.
+    if {($row + [llength $values]) > $rows} {
+	set values [lrange $values 0 [expr {$rows - $row - 1}]]
+    }
+
+    # Same for columns, but store it in some vars as this is required
+    # in a loop.
+    set firstcol 0
+    if {$column < 0} {
+	set firstcol [expr {0 - $column}]
+	set column 0
+    }
+
+    # Now pan through values and area and copy the external data into
+    # the matrix.
+
+    set r $row
+    foreach line $values {
+	set line [lrange $line $firstcol end]
+
+	set l [expr {$column + [llength $line]}]
+	if {$l > $columns} {
+	    set line [lrange $line 0 [expr {$columns - $column - 1}]]
+	} elseif {$l < [expr {$columns - $firstcol}]} {
+	    # We have to take the offset into the line into account
+	    # or we add fillers we don't need, overwriting part of the
+	    # data array we shouldn't.
+
+	    for {} {$l < [expr {$columns - $firstcol}]} {incr l} {
+		lappend line {}
+	    }
+	}
+
+	set c $column
+	foreach cell $line {
+	    if {$cell != {}} {
+		catch {unset rowh($r)}
+		catch {unset colw($c)}
+	    }
+	    set data($c,$r) $cell
+	    incr c
+	}
+	incr r
+    }
+    return
+}
+
+# ::struct::matrix::__set_row --
+#
+#	Sets the values in the cells identified by the row index to
+#	the elements of the list provided as the third argument. Each
+#	element of the list is assigned to one cell, with the first
+#	element going into the cell in column 0 and then upward. If
+#	there are less values in the list than there are columns the
+#	remaining columns are set to the empty string. If there are
+#	more values in the list than there are columns the superfluous
+#	elements are ignored. The matrix is not extended by this
+#	operation.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	row	Index of the row to set.
+#	values	Values to set into the row.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__set_row {name row values} {
+    set row [ChkRowIndex $name $row]
+    SetRow $name $row $values
+}
+
+proc ::struct::matrix::SetRow {name row values} {
+    variable ${name}::data
+    variable ${name}::columns
+    variable ${name}::rows
+    variable ${name}::colw
+    variable ${name}::rowh
+
+    if {[set l [llength $values]] < $columns} {
+	# Missing values. Fill up with empty strings
+
+	for {} {$l < $columns} {incr l} {
+	    lappend values {}
+	}
+    } elseif {[llength $values] > $columns} {
+	# To many values. Remove the superfluous items
+	set values [lrange $values 0 [expr {$columns - 1}]]
+    }
+
+    # "values" now contains the information to set into the array.
+    # Regarding the width and height caches:
+
+    # - Invalidate the row in the height cache.
+    # - The columns are either removed from the width cache or left
+    #   unchanged, depending on the contents set into the cell.
+
+    set c 0
+    foreach v $values {
+	if {$v != {}} {
+	    # Data changed unpredictably, invalidate cache
+	    catch {unset colw($c)}
+	} ; # {else leave the row unchanged}
+	set data($c,$row) $v
+	incr c
+    }
+    catch {unset rowh($row)}
+    return
+}
+
+# ::struct::matrix::__swap_columns --
+#
+#	Swaps the contents of the two specified columns.
+#
+# Arguments:
+#	name		Name of the matrix.
+#	column_a	Index of the first column to swap
+#	column_b	Index of the second column to swap
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__swap_columns {name column_a column_b} {
+    set column_a [ChkColumnIndex $name $column_a]
+    set column_b [ChkColumnIndex $name $column_b]
+    return [SwapColumns $name $column_a $column_b]
+}
+
+proc ::struct::matrix::SwapColumns {name column_a column_b} {
+    variable ${name}::data
+    variable ${name}::rows
+    variable ${name}::colw
+
+    # Note: This operation does not influence the height cache for all
+    # rows and the width cache only insofar as its contents has to be
+    # swapped too for the two columns we are touching. Note that the
+    # cache might be partially filled or not at all, so we don't have
+    # to "swap" in some situations.
+
+    for {set r 0} {$r < $rows} {incr r} {
+	set tmp                $data($column_a,$r)
+	set data($column_a,$r) $data($column_b,$r)
+	set data($column_b,$r) $tmp
+    }
+
+    set cwa [info exists colw($column_a)]
+    set cwb [info exists colw($column_b)]
+
+    if {$cwa && $cwb} {
+	set tmp             $colw($column_a)
+	set colw($column_a) $colw($column_b)
+	set colw($column_b) $tmp
+    } elseif {$cwa} {
+	# Move contents, don't swap.
+	set   colw($column_b) $colw($column_a)
+	unset colw($column_a)
+    } elseif {$cwb} {
+	# Move contents, don't swap.
+	set   colw($column_a) $colw($column_b)
+	unset colw($column_b)
+    } ; # else {nothing to do at all}
+    return
+}
+
+# ::struct::matrix::__swap_rows --
+#
+#	Swaps the contents of the two specified rows.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	row_a	Index of the first row to swap
+#	row_b	Index of the second row to swap
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::__swap_rows {name row_a row_b} {
+    set row_a [ChkRowIndex $name $row_a]
+    set row_b [ChkRowIndex $name $row_b]
+    return [SwapRows $name $row_a $row_b]
+}
+
+proc ::struct::matrix::SwapRows {name row_a row_b} {
+    variable ${name}::data
+    variable ${name}::columns
+    variable ${name}::rowh
+
+    # Note: This operation does not influence the width cache for all
+    # columns and the height cache only insofar as its contents has to be
+    # swapped too for the two rows we are touching. Note that the
+    # cache might be partially filled or not at all, so we don't have
+    # to "swap" in some situations.
+
+    for {set c 0} {$c < $columns} {incr c} {
+	set tmp             $data($c,$row_a)
+	set data($c,$row_a) $data($c,$row_b)
+	set data($c,$row_b) $tmp
+    }
+
+    set rha [info exists rowh($row_a)]
+    set rhb [info exists rowh($row_b)]
+
+    if {$rha && $rhb} {
+	set tmp          $rowh($row_a)
+	set rowh($row_a) $rowh($row_b)
+	set rowh($row_b) $tmp
+    } elseif {$rha} {
+	# Move contents, don't swap.
+	set   rowh($row_b) $rowh($row_a)
+	unset rowh($row_a)
+    } elseif {$rhb} {
+	# Move contents, don't swap.
+	set   rowh($row_a) $rowh($row_b)
+	unset rowh($row_b)
+    } ; # else {nothing to do at all}
+    return
+}
+
+# ::struct::matrix::_transpose --
+#
+#	Exchanges rows and columns of the matrix
+#
+# Arguments:
+#	name		Name of the matrix.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::_transpose {name} {
+    variable ${name}::rows
+    variable ${name}::columns
+
+    if {$rows == 0} {
+	# Change the dimensions.
+	# There is no data to shift.
+	# The row/col caches are empty too.
+
+	set rows    $columns
+	set columns 0
+	return
+
+    } elseif {$columns == 0} {
+	# Change the dimensions.
+	# There is no data to shift.
+	# The row/col caches are empty too.
+
+	set columns $rows
+	set rows    0
+	return
+    }
+
+    variable ${name}::data
+    variable ${name}::rowh
+    variable ${name}::colw
+
+    # Exchanging the row/col caches is easy, independent of the actual
+    # dimensions of the matrix.
+
+    set rhc [array get rowh]
+    set cwc [array get colw]
+
+    unset rowh ; array set rowh $cwc
+    unset colw ; array set colw $rhc
+
+    if {$rows == $columns} {
+	# A square matrix. We have to swap data around, but there is
+	# need to resize any of the arrays. Only the core is present.
+
+	set n $columns
+
+    } elseif {$rows > $columns} {
+	# Rectangular matrix, we have to delete rows, and add columns.
+
+	for {set r $columns} {$r < $rows} {incr r} {
+	    for {set c 0} {$c < $columns} {incr c} {
+		set   data($r,$c) $data($c,$r)
+		unset data($c,$r)
+	    }
+	}
+
+	set n $columns ; # Size of the core.
+    } else {
+	# rows < columns. Rectangular matrix, we have to delete
+	# columns, and add rows.
+
+	for {set c $rows} {$c < $columns} {incr c} {
+	    for {set r 0} {$r < $rows} {incr r} {
+		set   data($r,$c) $data($c,$r)
+		unset data($c,$r)
+	    }
+	}
+
+	set n $rows ; # Size of the core.
+    }
+
+    set tmp     $rows
+    set rows    $columns
+    set columns $tmp
+
+    # Whatever the actual dimensions, a square core is always
+    # present. The data of this core is now shuffled
+
+    for {set i 0} {$i < $n} {incr i} {
+	for {set j $i ; incr j} {$j < $n} {incr j} {
+	    set tmp $data($i,$j)
+	    set data($i,$j) $data($j,$i)
+	    set data($j,$i) $tmp
+	}
+    }
+    return
+}
+
+# ::struct::matrix::_unlink --
+#
+#	Removes the link between the matrix and the specified
+#	arrayvariable, if there is one.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	avar	Name of the linked array.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::_unlink {name avar} {
+
+    variable ${name}::link
+
+    if {![info exists link($avar)]} {
+	# Ignore unlinking of unknown variables.
+	return
+    }
+
+    # Delete the traces first, then remove the link management
+    # information from the object.
+
+    upvar #0 $avar    array
+    variable ${name}::data
+
+    trace vdelete array wu [list ::struct::matrix::MatTraceIn  $avar $name]
+    trace vdelete date  w  [list ::struct::matrix::MatTraceOut $avar $name]
+
+    unset link($avar)
+    return
+}
+
+# ::struct::matrix::ChkColumnIndex --
+#
+#	Helper to check and transform column indices. Returns the
+#	absolute index number belonging to the specified
+#	index. Rejects indices out of the valid range of columns.
+#
+# Arguments:
+#	matrix	Matrix to look at
+#	column	The incoming index to check and transform
+#
+# Results:
+#	The absolute index to the column
+
+proc ::struct::matrix::ChkColumnIndex {name column} {
+    variable ${name}::columns
+
+    switch -regexp -- $column {
+	{end-[0-9]+} {
+	    set column [string map {end- ""} $column]
+	    set cc [expr {$columns - 1 - $column}]
+	    if {($cc < 0) || ($cc >= $columns)} {
+		return -code error "bad column index end-$column, column does not exist"
+	    }
+	    return $cc
+	}
+	end {
+	    if {$columns <= 0} {
+		return -code error "bad column index $column, column does not exist"
+	    }
+	    return [expr {$columns - 1}]
+	}
+	{[0-9]+} {
+	    if {($column < 0) || ($column >= $columns)} {
+		return -code error "bad column index $column, column does not exist"
+	    }
+	    return $column
+	}
+	default {
+	    return -code error "bad column index \"$column\", syntax error"
+	}
+    }
+    # Will not come to this place
+}
+
+# ::struct::matrix::ChkRowIndex --
+#
+#	Helper to check and transform row indices. Returns the
+#	absolute index number belonging to the specified
+#	index. Rejects indices out of the valid range of rows.
+#
+# Arguments:
+#	matrix	Matrix to look at
+#	row	The incoming index to check and transform
+#
+# Results:
+#	The absolute index to the row
+
+proc ::struct::matrix::ChkRowIndex {name row} {
+    variable ${name}::rows
+
+    switch -regexp -- $row {
+	{end-[0-9]+} {
+	    set row [string map {end- ""} $row]
+	    set rr [expr {$rows - 1 - $row}]
+	    if {($rr < 0) || ($rr >= $rows)} {
+		return -code error "bad row index end-$row, row does not exist"
+	    }
+	    return $rr
+	}
+	end {
+	    if {$rows <= 0} {
+		return -code error "bad row index $row, row does not exist"
+	    }
+	    return [expr {$rows - 1}]
+	}
+	{[0-9]+} {
+	    if {($row < 0) || ($row >= $rows)} {
+		return -code error "bad row index $row, row does not exist"
+	    }
+	    return $row
+	}
+	default {
+	    return -code error "bad row index \"$row\", syntax error"
+	}
+    }
+    # Will not come to this place
+}
+
+# ::struct::matrix::ChkColumnIndexNeg --
+#
+#	Helper to check and transform column indices. Returns the
+#	absolute index number belonging to the specified
+#	index. Rejects indices out of the valid range of columns
+#	(Accepts negative indices).
+#
+# Arguments:
+#	matrix	Matrix to look at
+#	column	The incoming index to check and transform
+#
+# Results:
+#	The absolute index to the column
+
+proc ::struct::matrix::ChkColumnIndexNeg {name column} {
+    variable ${name}::columns
+
+    switch -regexp -- $column {
+	{end-[0-9]+} {
+	    set column [string map {end- ""} $column]
+	    set cc [expr {$columns - 1 - $column}]
+	    if {$cc >= $columns} {
+		return -code error "bad column index end-$column, column does not exist"
+	    }
+	    return $cc
+	}
+	end {
+	    return [expr {$columns - 1}]
+	}
+	{[0-9]+} {
+	    if {$column >= $columns} {
+		return -code error "bad column index $column, column does not exist"
+	    }
+	    return $column
+	}
+	default {
+	    return -code error "bad column index \"$column\", syntax error"
+	}
+    }
+    # Will not come to this place
+}
+
+# ::struct::matrix::ChkRowIndexNeg --
+#
+#	Helper to check and transform row indices. Returns the
+#	absolute index number belonging to the specified
+#	index. Rejects indices out of the valid range of rows
+#	(Accepts negative indices).
+#
+# Arguments:
+#	matrix	Matrix to look at
+#	row	The incoming index to check and transform
+#
+# Results:
+#	The absolute index to the row
+
+proc ::struct::matrix::ChkRowIndexNeg {name row} {
+    variable ${name}::rows
+
+    switch -regexp -- $row {
+	{end-[0-9]+} {
+	    set row [string map {end- ""} $row]
+	    set rr [expr {$rows - 1 - $row}]
+	    if {$rr >= $rows} {
+		return -code error "bad row index end-$row, row does not exist"
+	    }
+	    return $rr
+	}
+	end {
+	    return [expr {$rows - 1}]
+	}
+	{[0-9]+} {
+	    if {$row >= $rows} {
+		return -code error "bad row index $row, row does not exist"
+	    }
+	    return $row
+	}
+	default {
+	    return -code error "bad row index \"$row\", syntax error"
+	}
+    }
+    # Will not come to this place
+}
+
+# ::struct::matrix::ChkColumnIndexAll --
+#
+#	Helper to transform column indices. Returns the
+#	absolute index number belonging to the specified
+#	index.
+#
+# Arguments:
+#	matrix	Matrix to look at
+#	column	The incoming index to check and transform
+#
+# Results:
+#	The absolute index to the column
+
+proc ::struct::matrix::ChkColumnIndexAll {name column} {
+    variable ${name}::columns
+
+    switch -regexp -- $column {
+	{end-[0-9]+} {
+	    set column [string map {end- ""} $column]
+	    set cc [expr {$columns - 1 - $column}]
+	    return $cc
+	}
+	end {
+	    return $columns
+	}
+	{[0-9]+} {
+	    return $column
+	}
+	default {
+	    return -code error "bad column index \"$column\", syntax error"
+	}
+    }
+    # Will not come to this place
+}
+
+# ::struct::matrix::ChkRowIndexAll --
+#
+#	Helper to transform row indices. Returns the
+#	absolute index number belonging to the specified
+#	index.
+#
+# Arguments:
+#	matrix	Matrix to look at
+#	row	The incoming index to check and transform
+#
+# Results:
+#	The absolute index to the row
+
+proc ::struct::matrix::ChkRowIndexAll {name row} {
+    variable ${name}::rows
+
+    switch -regexp -- $row {
+	{end-[0-9]+} {
+	    set row [string map {end- ""} $row]
+	    set rr [expr {$rows - 1 - $row}]
+	    return $rr
+	}
+	end {
+	    return $rows
+	}
+	{[0-9]+} {
+	    return $row
+	}
+	default {
+	    return -code error "bad row index \"$row\", syntax error"
+	}
+    }
+    # Will not come to this place
+}
+
+# ::struct::matrix::MatTraceIn --
+#
+#	Helper propagating changes made to an array
+#	into the matrix the array is linked to.
+#
+# Arguments:
+#	avar		Name of the array which was changed.
+#	name		Matrix to write the changes to.
+#	var,idx,op	Standard trace arguments
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::MatTraceIn {avar name var idx op} {
+    # Propagate changes in the linked array back into the matrix.
+
+    variable ${name}::lock
+    if {$lock} {return}
+
+    # We have to cover two possibilities when encountering an "unset" operation ...
+    # 1. The external array was destroyed: perform automatic unlink.
+    # 2. An individual element was unset:  Set the corresponding cell to the empty string.
+    #    See SF Tcllib Bug #532791.
+
+    if {(![string compare $op u]) && ($idx == {})} {
+	# Possibility 1: Array was destroyed
+	$name unlink $avar
+	return
+    }
+
+    upvar #0 $avar    array
+    variable ${name}::data
+    variable ${name}::link
+
+    set transpose $link($avar)
+    if {$transpose} {
+	foreach {r c} [split $idx ,] break
+    } else {
+	foreach {c r} [split $idx ,] break
+    }
+
+    # Use standard method to propagate the change.
+    # => Get automatically index checks, cache updates, ...
+
+    if {![string compare $op u]} {
+	# Unset possibility 2: Element was unset.
+	# Note: Setting the cell to the empty string will
+	# invoke MatTraceOut for this array and thus try
+	# to recreate the destroyed element of the array.
+	# We don't want this. But we do want to propagate
+	# the change to other arrays, as "unset". To do
+	# all of this we use another state variable to
+	# signal this situation.
+
+	variable ${name}::unset
+	set unset $avar
+
+	$name set cell $c $r ""
+
+	set unset {}
+	return
+    }
+
+    $name set cell $c $r $array($idx)
+    return
+}
+
+# ::struct::matrix::MatTraceOut --
+#
+#	Helper propagating changes made to the matrix into the linked arrays.
+#
+# Arguments:
+#	avar		Name of the array to write the changes to.
+#	name		Matrix which was changed.
+#	var,idx,op	Standard trace arguments
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::MatTraceOut {avar name var idx op} {
+    # Propagate changes in the matrix data array into the linked array.
+
+    variable ${name}::unset
+
+    if {![string compare $avar $unset]} {
+	# Do not change the variable currently unsetting
+	# one of its elements.
+	return
+    }
+
+    variable ${name}::lock
+    set lock 1 ; # Disable MatTraceIn [#532783]
+
+    upvar #0 $avar    array
+    variable ${name}::data
+    variable ${name}::link
+
+    set transpose $link($avar)
+
+    if {$transpose} {
+	foreach {r c} [split $idx ,] break
+    } else {
+	foreach {c r} [split $idx ,] break
+    }
+
+    if {$unset != {}} {
+	# We are currently propagating the unset of an
+	# element in a different linked array to this
+	# array. We make sure that this is an unset too.
+
+	unset array($c,$r)
+    } else {
+	set array($c,$r) $data($idx)
+    }
+    set lock 0
+    return
+}
+
+# ::struct::matrix::SortMaxHeapify --
+#
+#	Helper for the 'sort' method. Performs the central algorithm
+#	which converts the matrix into a heap, easily sortable.
+#
+# Arguments:
+#	name	Matrix object which is sorted.
+#	i	Index of the row/column currently being sorted.
+#	key	Index of the column/row to sort the rows/columns by.
+#	rowCol	Indicator if we are sorting rows ('r'), or columns ('c').
+#	heapSize Number of rows/columns to sort.
+#	rev	Boolean flag, set if sorting is done revers (-decreasing).
+#
+# Sideeffects:
+#	Transforms the matrix into a heap of rows/columns,
+#	swapping them around.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::SortMaxHeapify {name i key rowCol heapSize {rev 0}} {
+    # MAX-HEAPIFY, adapted by EAS from CLRS 6.2
+    switch  $rowCol {
+	r { set A [GetColumn $name $key] }
+	c { set A [GetRow    $name $key] }
+    }
+    # Weird expressions below for clarity, as CLRS uses A[1...n]
+    # format and TCL uses A[0...n-1]
+    set left  [expr {int(2*($i+1)    -1)}]
+    set right [expr {int(2*($i+1)+1  -1)}]
+
+    # left, right are tested as < rather than <= because they are
+    # in A[0...n-1]
+    if {
+	$left < $heapSize &&
+	( !$rev && [lindex $A $left] > [lindex $A $i] ||
+	   $rev && [lindex $A $left] < [lindex $A $i] )
+    } {
+	set largest $left
+    } else {
+	set largest $i
+    }
+
+    if {
+	$right < $heapSize &&
+	( !$rev && [lindex $A $right] > [lindex $A $largest] ||
+	   $rev && [lindex $A $right] < [lindex $A $largest] )
+    } {
+	set largest $right
+    }
+
+    if { $largest != $i } {
+	switch $rowCol {
+	    r { SwapRows    $name $i $largest }
+	    c { SwapColumns $name $i $largest }
+	}
+	SortMaxHeapify $name $largest $key $rowCol $heapSize $rev
+    }
+    return
+}
+
+# ::struct::matrix::CheckSerialization --
+#
+#	Validate the serialization of a matrix.
+#
+# Arguments:
+#	ser	Serialization to validate.
+#	rvar	Variable to store the number of rows into.
+#	cvar	Variable to store the number of columns into.
+#	dvar	Variable to store the matrix data into.
+#
+# Results:
+#	none
+
+proc ::struct::matrix::CheckSerialization {ser rvar cvar dvar} {
+    upvar 1 \
+	    $rvar   rows    \
+	    $cvar   columns \
+	    $dvar   data
+
+    # Overall length ok ?
+    if {[llength $ser] != 3} {
+	return -code error \
+		"error in serialization: list length not 3."
+    }
+
+    foreach {r c d} $ser break
+
+    # Check rows/columns information
+
+    if {![string is integer -strict $r] || ($r < 0)} {
+	return -code error \
+		"error in serialization: bad number of rows \"$r\"."
+    }
+    if {![string is integer -strict $c] || ($c < 0)} {
+	return -code error \
+		"error in serialization: bad number of columns \"$c\"."
+    }
+
+    # Validate data against rows/columns. We can have less data than
+    # rows or columns, the missing cells will be initialized to the
+    # empty string. But too many is considered as a signal of
+    # being something wrong.
+
+    if {[llength $d] > $r} {
+	return -code error \
+		"error in serialization: data for to many rows."
+    }
+    foreach rv $d {
+	if {[llength $rv] > $c} {
+	    return -code error \
+		    "error in serialization: data for to many columns."
+	}
+    }
+
+    # Ok. The data is now ready for the caller.
+
+    set data    $d
+    set rows    $r
+    set columns $c
+    return
+}
+
+# ::struct::matrix::DeleteRows --
+#
+#	Deletes n rows from the bottom of the matrix.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	n	The number of rows to delete (no greater than the number of rows).
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::DeleteRows {name n} {
+    variable ${name}::data
+    variable ${name}::rows
+    variable ${name}::columns
+    variable ${name}::colw
+    variable ${name}::rowh
+
+    # Move all data from the higher rows down and then delete the
+    # superfluous data in the old last row. Move the data in the
+    # height cache too, take partial fill into account there too.
+    # Invalidate the width cache for all columns.
+
+    set rowstart [expr {$rows - $n}]
+
+    for {set c 0} {$c < $columns} {incr c} {
+	for {set r $rowstart} {$r < $rows} {incr r} {
+	    unset data($c,$r)
+	    catch {unset rowh($r)}
+	}
+	catch {unset colw($c)}
+    }
+    set rows $rowstart
+    return
+}
+
+# ::struct::matrix::DeleteColumns --
+#
+#	Deletes n columns from the right of the matrix.
+#
+# Arguments:
+#	name	Name of the matrix.
+#	n	The number of columns to delete.
+#
+# Results:
+#	None.
+
+proc ::struct::matrix::DeleteColumns {name n} {
+    variable ${name}::data
+    variable ${name}::rows
+    variable ${name}::columns
+    variable ${name}::colw
+    variable ${name}::rowh
+
+    # Move all data from the higher columns down and then delete the
+    # superfluous data in the old last column. Move the data in the
+    # width cache too, take partial fill into account there too.
+    # Invalidate the height cache for all rows.
+
+    set colstart [expr {$columns - $n}]
+
+    for {set r 0} {$r < $rows} {incr r} {
+	for {set c $colstart} {$c < $columns} {incr c} {
+	    unset data($c,$r)
+	    catch {unset colw($c)}
+	}
+	catch {unset rowh($r)}
+    }
+    set columns $colstart
+    return
+}
+
+# ::struct::matrix::TermWidth --
+#
+#	Computes the number of terminal columns taken by the input string.
+#	This discounts ANSI color codes as zero-width, and asian characters
+#	as double-width.
+#
+# Arguments:
+#	str	String to process
+#
+# Results:
+#	Number of terminal columns covered by string argument
+
+proc ::struct::matrix::TermWidth {str} {
+    # Look for ANSI color control sequences and remove them. Avoid counting their characters as such
+    # sequences as a whole represent a state change, and are logically of zero/no width.
+    # Further use wcswidth to account for double-wide Asian characters.
+
+    regsub -all "\033\\\[\[0-9;\]*m" $str {} str
+    return [textutil::wcswidth $str]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Get 'matrix::matrix' into the general structure namespace.
+    namespace import -force matrix::matrix
+    namespace export matrix
+}
+package provide struct::matrix 2.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/pkgIndex.tcl
new file mode 100644
index 00000000..a76d377b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/pkgIndex.tcl
@@ -0,0 +1,29 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded struct            2.1   [list source [file join $dir struct.tcl]]
+package ifneeded struct            1.4   [list source [file join $dir struct1.tcl]]
+
+package ifneeded struct::queue     1.4.5 [list source [file join $dir queue.tcl]]
+package ifneeded struct::stack     1.5.3 [list source [file join $dir stack.tcl]]
+package ifneeded struct::tree      2.1.2 [list source [file join $dir tree.tcl]]
+package ifneeded struct::pool      1.2.3 [list source [file join $dir pool.tcl]]
+package ifneeded struct::record    1.2.2 [list source [file join $dir record.tcl]]
+package ifneeded struct::set       2.2.3 [list source [file join $dir sets.tcl]]
+package ifneeded struct::prioqueue 1.4   [list source [file join $dir prioqueue.tcl]]
+package ifneeded struct::skiplist  1.3   [list source [file join $dir skiplist.tcl]]
+
+package ifneeded struct::graph     1.2.1 [list source [file join $dir graph1.tcl]]
+package ifneeded struct::tree      1.2.2 [list source [file join $dir tree1.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded struct::list        1.8.5  [list source [file join $dir list.tcl]]
+package ifneeded struct::list::test  1.8.4  [list source [file join $dir list.test.tcl]]
+package ifneeded struct::graph     2.4.3  [list source [file join $dir graph.tcl]]
+package ifneeded struct::map       1      [list source [file join $dir map.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+
+package ifneeded struct::matrix    2.1 [list source [file join $dir matrix.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+package ifneeded struct::disjointset 1.1 [list source [file join $dir disjointset.tcl]]
+package ifneeded struct::graph::op 0.11.3 [list source [file join $dir graphops.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/pool.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/pool.tcl
new file mode 100644
index 00000000..e2557cec
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/pool.tcl
@@ -0,0 +1,715 @@
+################################################################################
+# pool.tcl
+#
+#
+# Author: Erik Leunissen
+#
+#
+# Acknowledgement:
+#     The author is grateful for the advice provided by
+#     Andreas Kupries during the development of this code.
+#
+################################################################################
+
+package require cmdline
+
+namespace eval ::struct {}
+namespace eval ::struct::pool {
+
+    # a list of all current pool names
+    variable pools {}
+
+    # counter is used to give a unique name to a pool if
+    # no name was supplied, e.g. pool1, pool2 etc.
+    variable counter 0
+
+    # `commands' is the list of subcommands recognized by a pool-object command
+    variable commands {add clear destroy info maxsize release remove request}
+
+    # All errors with corresponding (unformatted) messages.
+    # The format strings will be replaced by the appropriate
+    # values when an error occurs.
+    variable  Errors
+    array set Errors {
+	BAD_SUBCMD             {Bad subcommand "%s": must be %s}
+	DUPLICATE_ITEM_IN_ARGS {Duplicate item `%s' in arguments.}
+	DUPLICATE_POOLNAME     {The pool `%s' already exists.}
+	EXCEED_MAXSIZE         "This command would increase the total number of items\
+		\nbeyond the maximum size of the pool. No items registered."
+	FORBIDDEN_ALLOCID      "The value -1 is not allowed as an allocID."
+	INVALID_POOLSIZE       {The pool currently holds %s items.\
+		Can't set maxsize to a value less than that.}
+	ITEM_ALREADY_IN_POOL   {`%s' already is a member of the pool. No items registered.}
+	ITEM_NOT_IN_POOL       {`%s' is not a member of %s.}
+	ITEM_NOT_ALLOCATED     {Can't release `%s' because it isn't allocated.}
+	ITEM_STILL_ALLOCATED   {Can't remove `%s' because it is still allocated.}
+	NONINT_REQSIZE         {The second argument must be a positive integer value}
+	SOME_ITEMS_NOT_FREE    {Couldn't %s `%s' because some items are still allocated.}
+	UNKNOWN_ARG            {Unknown argument `%s'}
+	UNKNOWN_POOL           {Nothing known about `%s'.}
+	VARNAME_EXISTS         {A variable `::struct::pool::%s' already exists.}
+	WRONG_INFO_TYPE        "Expected second argument to be one of:\
+		\n     allitems, allocstate, cursize, freeitems, maxsize,\
+		\nbut received: `%s'."
+	WRONG_NARGS            "wrong#args"
+    }
+    
+    namespace export pool
+}
+
+# A small helper routine to generate structured errors
+
+if {[package vsatisfies [package present Tcl] 8.5]} {
+    # Tcl 8.5+, have expansion operator and syntax. And option -level.
+    proc ::struct::pool::Error {error args} {
+	variable Errors
+	return -code error -level 1 \
+	    -errorcode [list STRUCT POOL $error {*}$args] \
+	    [format $Errors($error) {*}$args]
+    }
+} else {
+    # Tcl 8.4. No expansion operator available. Nor -level.
+    # Construct the pieces explicitly, via linsert/eval hop&dance.
+    proc ::struct::pool::Error {error args} {
+	variable Errors
+	lappend code STRUCT POOL $error
+	eval [linsert $args 0 lappend code]
+	set msg [eval [linsert $args 0 format $Errors($error)]]
+	return -code error -errorcode $code $msg
+    }
+}
+
+# A small helper routine to check list membership
+proc ::struct::pool::lmember {list element} {
+    if { [lsearch -exact $list $element] >= 0 } {
+        return 1
+    } else  {
+        return 0
+    }
+}
+
+# General note
+# ============
+#
+# All procedures below use the following method to reference
+# a particular pool-object:
+#
+#    variable $poolname
+#    upvar #0 ::struct::pool::$poolname pool
+#    upvar #0 ::struct::pool::Allocstate_$poolname state
+#
+# Therefore, the names `pool' and `state' refer to a particular
+# instance of a pool.
+#
+# In the comments to the code below, the words `pool' and `state'
+# also refer to a particular pool.
+#
+
+# ::struct::pool::create
+#
+#    Creates a new instance of a pool (a pool-object).
+#    ::struct::pool::pool (see right below) is an alias to this procedure.
+#
+#
+# Arguments:
+#    poolname: name of the pool-object
+#    maxsize:  the maximum number of elements that the pool is allowed
+#              consist of.
+#
+#
+# Results:
+#    the name of the newly created pool
+#
+#
+# Side effects:
+#    - Registers the pool-name in the variable `pools'.
+#
+#    - Creates the pool array which holds general state about the pool.
+#      The following elements are initialized:
+#          pool(freeitems): a list of non-allocated items
+#          pool(cursize):   the current number of elements in the pool
+#          pool(maxsize):   the maximum allowable number of pool elements
+#      Additional state may be hung off this array as long as the three
+#      elements above are not corrupted.
+#
+#    - Creates a separate array `state' that will hold allocation state
+#      of the pool elements.
+#
+#    - Creates an object-procedure that has the same name as the pool.
+#
+proc ::struct::pool::create { {poolname ""} {maxsize 10} } {
+    variable pools
+    variable counter
+    
+    # check maxsize argument
+    if { ![string equal $maxsize 10] } {
+        if { ![regexp {^\+?[1-9][0-9]*$} $maxsize] } {
+            Error NONINT_REQSIZE
+        }
+    }
+    
+    # create a name if no name was supplied
+    if { [string length $poolname]==0 } {
+        incr counter
+        set poolname pool$counter
+        set incrcnt 1
+    }
+    
+    # check whether there exists a pool named $poolname
+    if { [lmember $pools $poolname] } {
+        if { [::info exists incrcnt] } {
+            incr counter -1
+        }
+        Error DUPLICATE_POOLNAME $poolname
+    }
+    
+    # check whether the namespace variable exists
+    if { [::info exists ::struct::pool::$poolname] } {
+        if { [::info exists incrcnt] } {
+            incr counter -1
+        }
+        Error VARNAME_EXISTS $poolname
+    }
+    
+    variable $poolname
+    
+    # register
+    lappend pools $poolname
+    
+    # create and initialize the new pool data structure
+    upvar #0 ::struct::pool::$poolname pool
+    set pool(freeitems) {}
+    set pool(maxsize) $maxsize
+    set pool(cursize) 0
+    
+    # the array that holds allocation state
+    upvar #0 ::struct::pool::Allocstate_$poolname state
+    array set state {}
+    
+    # create a pool-object command and map it to the pool commands
+    interp alias {} ::$poolname {} ::struct::pool::poolCmd $poolname
+    return $poolname
+}
+
+#
+# This alias provides compatibility with the implementation of the
+# other data structures (stack, queue etc...) in the tcllib::struct package.
+#
+proc ::struct::pool::pool { {poolname ""} {maxsize 10} } {
+    ::struct::pool::create $poolname $maxsize
+}
+
+
+# ::struct::pool::poolCmd
+#
+#    This proc constitutes a level of indirection between the pool-object
+#    subcommand and the pool commands (below); it's sole function is to pass
+#    the command along to one of the pool commands, and receive any results.
+#
+# Arguments:
+#    poolname:    name of the pool-object
+#    subcmd:      the subcommand, which identifies the pool-command to
+#                 which calls will be passed.
+#    args:        any arguments. They will be inspected by the pool-command
+#                 to which this call will be passed along.
+#
+# Results:
+#    Whatever result the pool command returns, is once more returned.
+#
+# Side effects:
+#    Dispatches the call onto a specific pool command and receives any results.
+#
+proc ::struct::pool::poolCmd {poolname subcmd args} {
+    # check the subcmd argument
+    if { [lsearch -exact $::struct::pool::commands $subcmd] == -1 } {
+        set optlist [join $::struct::pool::commands ", "]
+        set optlist [linsert $optlist "end-1" "or"]
+        Error BAD_SUBCMD $subcmd $optlist
+    }
+    
+    # pass the call to the pool command indicated by the subcmd argument,
+    # and return the result from that command.
+    return [eval [linsert $args 0 ::struct::pool::$subcmd $poolname]]
+}
+
+
+# ::struct::pool::destroy
+#
+#    Destroys a pool-object, its associated variables and "object-command"
+#
+# Arguments:
+#    poolname:    name of the pool-object
+#    forceArg:    if set to `-force', the pool-object will be destroyed
+#                 regardless the allocation state of its objects.
+#
+# Results:
+#    none
+#
+# Side effects:
+#    - unregisters the pool name in the variable `pools'.
+#    - unsets `pool' and `state' (poolname specific variables)
+#    - destroys the "object-procedure" that was associated with the pool.
+#
+proc ::struct::pool::destroy {poolname {forceArg ""}} {
+    variable pools
+    
+    # check forceArg argument
+    if { [string length $forceArg] } {
+        if { [string equal $forceArg -force] } {
+            set force 1
+        } else {
+            Error UNKNOWN_ARG $forceArg
+        }
+    } else {
+        set force 0
+    }
+    
+    set index [lsearch -exact $pools $poolname]
+    if {$index == -1 } {
+        Error UNKNOWN_POOL $poolname
+    }
+    
+    if { !$force } {
+        # check for any lingering allocated items
+        variable $poolname
+        upvar #0 ::struct::pool::$poolname pool
+        upvar #0 ::struct::pool::Allocstate_$poolname state
+        if { [llength $pool(freeitems)] != $pool(cursize) } {
+            Error SOME_ITEMS_NOT_FREE destroy $poolname
+        }
+    }
+    
+    rename ::$poolname {}
+    unset ::struct::pool::$poolname
+    catch {unset ::struct::pool::Allocstate_$poolname}
+    set pools [lreplace $pools $index $index]
+    
+    return
+}
+
+
+# ::struct::pool::add
+#
+#    Add items to the pool
+#
+# Arguments:
+#    poolname:    name of the pool-object
+#    args:        the items to add
+#
+# Results:
+#    none
+#
+# Side effects:
+#    sets the initial allocation state of the added items to -1 (free)
+#
+proc ::struct::pool::add {poolname args} {
+    variable $poolname
+    upvar #0 ::struct::pool::$poolname pool
+    upvar #0 ::struct::pool::Allocstate_$poolname state
+    
+    # argument check
+    if { [llength $args] == 0 } {
+        Error WRONG_NARGS
+    }
+    
+    # will this operation exceed the size limit of the pool?
+    if {[expr { $pool(cursize) + [llength $args] }] > $pool(maxsize) } {
+        Error EXCEED_MAXSIZE
+    }
+    
+    
+    # check for duplicate items on the command line
+    set N [llength $args]
+    if { $N > 1} {
+        for {set i 0} {$i<=$N} {incr i} {
+            foreach item [lrange $args [expr {$i+1}] end] {
+                if { [string equal [lindex $args $i] $item]} {
+                    Error DUPLICATE_ITEM_IN_ARGS $item
+                }
+            }
+        }
+    }
+    
+    # check whether the items exist yet in the pool
+    foreach item $args {
+        if { [lmember [array names state] $item] } {
+            Error ITEM_ALREADY_IN_POOL $item
+        }
+    }
+    
+    # add items to the pool, and initialize their allocation state
+    foreach item $args {
+        lappend pool(freeitems) $item
+        set state($item) -1
+        incr pool(cursize)
+    }
+    return
+}
+
+
+
+# ::struct::pool::clear
+#
+#    Removes all items from the pool and clears corresponding
+#    allocation state.
+#
+#
+# Arguments:
+#    poolname: name of the pool-object
+#    forceArg: if set to `-force', all items are removed
+#              regardless their allocation state.
+#
+# Results:
+#    none
+#
+# Side effects:
+#    see description above
+#
+proc ::struct::pool::clear {poolname {forceArg ""} } {
+    variable $poolname
+    upvar #0 ::struct::pool::$poolname pool
+    upvar #0 ::struct::pool::Allocstate_$poolname state
+    
+    # check forceArg argument
+    if { [string length $forceArg] } {
+        if { [string equal $forceArg -force] } {
+            set force 1
+        } else {
+            Error UNKNOWN_ARG $forceArg
+        }
+    } else {
+        set force 0
+    }
+    
+    # check whether some items are still allocated
+    if { !$force } {
+        if { [llength $pool(freeitems)] != $pool(cursize) } {
+            Error SOME_ITEMS_NOT_FREE clear $poolname
+        }
+    }
+    
+    # clear the pool, clean up state and adjust the pool size
+    set pool(freeitems) {}
+    array unset state
+    array set state {}
+    set pool(cursize) 0
+    return
+}
+
+
+
+# ::struct::pool::info
+#
+#    Returns information about the pool in data structures that allow
+#    further programmatic use.
+#
+# Arguments:
+#    poolname: name of the pool-object
+#    type:     the type of info requested
+#
+#
+# Results:
+#    The info requested
+#
+#
+# Side effects:
+#    none
+#
+proc ::struct::pool::info {poolname type args} {
+    variable $poolname
+    upvar #0 ::struct::pool::$poolname pool
+    upvar #0 ::struct::pool::Allocstate_$poolname state
+    
+    # check the number of arguments
+    if { [string equal $type allocID] } {
+        if { [llength $args]!=1 } {
+            Error WRONG_NARGS
+        }
+    } elseif { [llength $args] > 0 } {
+        Error WRONG_NARGS
+    }
+    
+    switch $type {
+        allitems {
+            return [array names state]
+        }
+        allocstate {
+            return [array get state]
+        }
+        allocID {
+            set item [lindex $args 0]
+            if {![lmember [array names state] $item]} {
+                Error ITEM_NOT_IN_POOL $item $poolname
+            }
+            return $state($item)
+        }
+        cursize {
+            return $pool(cursize)
+        }
+        freeitems {
+            return $pool(freeitems)
+        }
+        maxsize {
+            return $pool(maxsize)
+        }
+        default {
+            Error WRONG_INFO_TYPE $type
+        }
+    }
+}
+
+
+# ::struct::pool::maxsize
+#
+#    Returns the current or sets a new maximum size of the pool.
+#    As far as querying only is concerned, this is an alias for
+#    `::struct::pool::info maxsize'.
+#
+#
+# Arguments:
+#    poolname: name of the pool-object
+#    reqsize:  if supplied, it is the requested size of the pool, i.e.
+#              the maximum number of elements in the pool.
+#
+#
+# Results:
+#    The current/new maximum size of the pool.
+#
+#
+# Side effects:
+#    Sets pool(maxsize) if a new size is supplied.
+#
+proc ::struct::pool::maxsize {poolname {reqsize ""} } {
+    variable $poolname
+    upvar #0 ::struct::pool::$poolname pool
+    upvar #0 ::struct::pool::Allocstate_$poolname state
+    
+    if { [string length $reqsize] } {
+        if { [regexp {^\+?[1-9][0-9]*$} $reqsize] } {
+            if { $pool(cursize) <= $reqsize } {
+                set pool(maxsize) $reqsize
+            } else  {
+                Error INVALID_POOLSIZE $pool(cursize)
+            }
+        } else  {
+            Error NONINT_REQSIZE
+        }
+    }
+    return $pool(maxsize)
+}
+
+
+# ::struct::pool::release
+#
+#    Deallocates an item
+#
+#
+# Arguments:
+#    poolname: name of the pool-object
+#    item:     name of the item to be released
+#
+#
+# Results:
+#    none
+#
+# Side effects:
+#    - sets the item's allocation state to free (-1)
+#    - appends item to the list of free items
+#
+proc ::struct::pool::release {poolname item} {
+    variable $poolname
+    upvar #0 ::struct::pool::$poolname pool
+    upvar #0 ::struct::pool::Allocstate_$poolname state
+    
+    # Is item in the pool?
+    if {![lmember [array names state] $item]} {
+        Error ITEM_NOT_IN_POOL $item $poolname
+    }
+    
+    # check whether item was allocated
+    if { $state($item) == -1 } {
+        Error ITEM_NOT_ALLOCATED $item
+    } else  {
+        
+        # set item free and return it to the pool of free items
+        set state($item) -1
+        lappend pool(freeitems) $item
+        
+    }
+    return
+}
+
+# ::struct::pool::remove
+#
+#    Removes an item from the pool
+#
+#
+# Arguments:
+#    poolname: name of the pool-object
+#    item:     the item to be removed
+#    forceArg: if set to `-force', the item is removed
+#              regardless its allocation state.
+#
+# Results:
+#    none
+#
+# Side effects:
+#    - cleans up allocation state related to the item
+#
+proc ::struct::pool::remove {poolname item {forceArg ""} } {
+    variable $poolname
+    upvar #0 ::struct::pool::$poolname pool
+    upvar #0 ::struct::pool::Allocstate_$poolname state
+    
+    # check forceArg argument
+    if { [string length $forceArg] } {
+        if { [string equal $forceArg -force] } {
+            set force 1
+        } else {
+            Error UNKNOWN_ARG $forceArg
+        }
+    } else {
+        set force 0
+    }
+    
+    # Is item in the pool?
+    if {![lmember [array names state] $item]} {
+        Error ITEM_NOT_IN_POOL $item $poolname
+    }
+    
+    set index [lsearch $pool(freeitems) $item]
+    if { $index >= 0} {
+        
+        # actual removal
+        set pool(freeitems) [lreplace $pool(freeitems) $index $index]
+        
+    } elseif { !$force }  {
+        Error ITEM_STILL_ALLOCATED $item
+    }
+    
+    # clean up state and adjust the pool size
+    unset state($item)
+    incr pool(cursize) -1
+    return
+}
+
+
+
+# ::struct::pool::request
+#
+#     Handles requests for an item, taking into account a preference
+#     for a particular item if supplied.
+#
+#
+# Arguments:
+#    poolname:    name of the pool-object
+#
+#    itemvar:     variable to which the item-name will be assigned
+#                 if the request is honored.
+#
+#    args:        an optional sequence of key-value pairs, indicating the
+#                 following options:
+#                 -prefer:  the preferred item to allocate.
+#                 -allocID: An ID for the entity to which the item will be
+#                           allocated. This facilitates reverse lookups.
+#
+# Results:
+#
+#    1 if the request was honored; an item is allocated
+#    0 if the request couldn't be honored; no item is allocated
+#
+#    The user is strongly advised to check the return values
+#    when calling this procedure.
+#
+#
+# Side effects:
+#
+#   if the request is honored:
+#    - sets allocation state to $allocID (or dummyID if it was not supplied)
+#      if allocation was succesful. Allocation state is maintained in the
+#      namespace variable state (see: `General note' above)
+#    - sets the variable passed via `itemvar' to the allocated item.
+#
+#   if the request is denied, no side effects occur.
+#
+proc ::struct::pool::request {poolname itemvar args} {
+    variable $poolname
+    upvar #0 ::struct::pool::$poolname pool
+    upvar #0 ::struct::pool::Allocstate_$poolname state
+    
+    # check args
+    set nargs [llength $args]
+    if { ! ($nargs==0 || $nargs==2 || $nargs==4) } {
+        if { ![string equal $args -?] && ![string equal $args -help]} {
+            Error WRONG_NARGS
+        }
+    } elseif { $nargs } {
+        foreach {name value} $args {
+            if { ![string match -* $name] } {
+                Error UNKNOWN_ARG $name
+            }
+        }
+    }
+    
+    set allocated 0
+    
+    # are there any items available?
+    if { [llength $pool(freeitems)] > 0} {
+        
+        # process command options
+        set options [cmdline::getoptions args { \
+            {prefer.arg {} {The preference for a particular item}} \
+            {allocID.arg {} {An ID for the entity to which the item will be allocated} } \
+                } \
+                "usage: $poolname request itemvar ?options?:"]
+        foreach {key value} $options {
+            set $key $value
+        }
+        
+        if { $allocID == -1 } {
+            Error FORBIDDEN_ALLOCID
+        }
+        
+        # let `item' point to a variable two levels up the call stack
+        upvar 2 $itemvar item
+        
+        # check whether a preference was supplied
+        if { [string length $prefer] } {
+            if {![lmember [array names state] $prefer]} {
+                Error ITEM_NOT_IN_POOL $prefer $poolname
+            }
+            if { $state($prefer) == -1 } {
+                set index [lsearch $pool(freeitems) $prefer]
+                set item $prefer
+            } else {
+		return 0
+	    }
+        } else  {
+            set index 0
+            set item [lindex $pool(freeitems) 0]
+        }
+        
+        # do the actual allocation
+        set pool(freeitems) [lreplace $pool(freeitems) $index $index]
+        if { [string length $allocID] } {
+            set state($item) $allocID
+        } else  {
+            set state($item) dummyID
+        }
+        set allocated 1
+    }
+    return $allocated
+}
+
+
+# EOF pool.tcl
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Get 'pool::pool' into the general structure namespace.
+    namespace import -force pool::pool
+    namespace export pool
+}
+package provide struct::pool 1.2.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/prioqueue.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/prioqueue.tcl
new file mode 100644
index 00000000..44f657d6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/prioqueue.tcl
@@ -0,0 +1,535 @@
+# prioqueue.tcl --
+#
+#  Priority Queue implementation for Tcl.
+#
+# adapted from queue.tcl
+# Copyright (c) 2002,2003 Michael Schlenker
+# Copyright (c) 2008 Alejandro Paz <vidriloco@gmail.com>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: prioqueue.tcl,v 1.10 2008/09/04 04:35:02 andreas_kupries Exp $
+
+package require Tcl 8.2
+
+namespace eval ::struct {}
+
+namespace eval ::struct::prioqueue {
+    # The queues array holds all of the queues you've made
+    variable queues
+
+    # counter is used to give a unique name for unnamed queues
+    variable counter 0
+
+    # commands is the list of subcommands recognized by the queue
+    variable commands [list \
+        "clear" \
+        "destroy"   \
+        "get"   \
+        "peek"  \
+        "put"   \
+        "remove" \
+        "size"  \
+        "peekpriority" \
+        ]
+
+    variable sortopt [list \
+        "-integer" \
+        "-real" \
+        "-ascii" \
+        "-dictionary" \
+        ]
+
+    # this is a simple design decision, that integer and real
+    # are sorted decreasing (-1), and -ascii and -dictionary are sorted -increasing (1)
+    # the values here map to the sortopt list
+    # could be changed to something configurable.
+    variable sortdir [list \
+        "-1" \
+        "-1" \
+        "1" \
+        "1" \
+        ]
+
+
+
+    # Only export one command, the one used to instantiate a new queue
+    namespace export prioqueue
+
+    proc K {x y} {set x} ;# DKF's K combinator
+}
+
+# ::struct::prioqueue::prioqueue --
+#
+#   Create a new prioqueue with a given name; if no name is given, use
+#   prioqueueX, where X is a number.
+#
+# Arguments:
+#   sorting sorting option for lsort to use, no -command option
+#           defaults to integer
+#   name    name of the queue; if null, generate one.
+#           names may not begin with -
+#
+#
+# Results:
+#   name    name of the queue created
+
+proc ::struct::prioqueue::prioqueue {args} {
+    variable queues
+    variable counter
+    variable queues_sorting
+    variable sortopt
+
+    # check args
+    if {[llength $args] > 2} {
+        error "wrong # args: should be \"[lindex [info level 0] 0] ?-ascii|-dictionary|-integer|-real? ?name?\""
+    }
+    if {[llength $args] == 0} {
+        # defaulting to integer priorities
+        set sorting -integer
+    } else {
+        if {[llength $args] == 1} {
+            if {[string match "-*" [lindex $args 0]]==1} {
+                set sorting [lindex $args 0]
+            } else {
+                set sorting -integer
+                set name [lindex $args 0]
+            }
+        } else {
+            if {[llength $args] == 2} {
+                foreach {sorting name} $args {break}
+            }
+        }
+    }
+    # check option (like lsort sorting options without -command)
+    if {[lsearch $sortopt $sorting] == -1} {
+        # if sortoption is unknown, but name is a sortoption we give a better error message
+        if {[info exists name] && [lsearch $sortopt $name]!=-1} {
+            error "wrong argument position: should be \"[lindex [info level 0] 0] ?-ascii|-dictionary|-integer|-real? ?name?\""
+        }
+        error "unknown sort option \"$sorting\""
+    }
+    # create name if not given
+    if {![info exists name]} {
+        incr counter
+        set name "prioqueue${counter}"
+    }
+
+    if { ![string equal [info commands ::$name] ""] } {
+    error "command \"$name\" already exists, unable to create prioqueue"
+    }
+
+    # Initialize the queue as empty
+    set queues($name) [list ]
+    switch -exact -- $sorting {
+    -integer { set queues_sorting($name) 0}
+    -real    { set queues_sorting($name) 1}
+    -ascii   { set queues_sorting($name) 2}
+    -dictionary { set queues_sorting($name) 3}
+    }
+
+    # Create the command to manipulate the queue
+    interp alias {} ::$name {} ::struct::prioqueue::QueueProc $name
+
+    return $name
+}
+
+##########################
+# Private functions follow
+
+# ::struct::prioqueue::QueueProc --
+#
+#   Command that processes all queue object commands.
+#
+# Arguments:
+#   name    name of the queue object to manipulate.
+#   args    command name and args for the command
+#
+# Results:
+#   Varies based on command to perform
+
+proc ::struct::prioqueue::QueueProc {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+    error "wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+    if { [string equal [info commands ::struct::prioqueue::_$cmd] ""] } {
+    variable commands
+    set optlist [join $commands ", "]
+    set optlist [linsert $optlist "end-1" "or"]
+    error "bad option \"$cmd\": must be $optlist"
+    }
+    return [eval [linsert $args 0 ::struct::prioqueue::_$cmd $name]]
+}
+
+# ::struct::prioqueue::_clear --
+#
+#   Clear a queue.
+#
+# Arguments:
+#   name    name of the queue object.
+#
+# Results:
+#   None.
+
+proc ::struct::prioqueue::_clear {name} {
+    variable queues
+    set queues($name) [list]
+    return
+}
+
+# ::struct::prioqueue::_destroy --
+#
+#   Destroy a queue object by removing it's storage space and
+#   eliminating it's proc.
+#
+# Arguments:
+#   name    name of the queue object.
+#
+# Results:
+#   None.
+
+proc ::struct::prioqueue::_destroy {name} {
+    variable queues
+    variable queues_sorting
+    unset queues($name)
+    unset queues_sorting($name)
+    interp alias {} ::$name {}
+    return
+}
+
+# ::struct::prioqueue::_get --
+#
+#   Get an item from a queue.
+#
+# Arguments:
+#   name    name of the queue object.
+#   count   number of items to get; defaults to 1
+#
+# Results:
+#   item    first count items from the queue; if there are not enough
+#           items in the queue, throws an error.
+#
+
+proc ::struct::prioqueue::_get {name {count 1}} {
+    variable queues
+    if { $count < 1 } {
+    error "invalid item count $count"
+    }
+
+    if { $count > [llength $queues($name)] } {
+    error "insufficient items in prioqueue to fill request"
+    }
+
+    if { $count == 1 } {
+    # Handle this as a special case, so single item gets aren't listified
+    set item [lindex [lindex $queues($name) 0] 1]
+    set queues($name) [lreplace [K $queues($name) [set queues($name) ""]] 0 0]
+    return $item
+    }
+
+    # Otherwise, return a list of items
+    incr count -1
+    set items [lrange $queues($name) 0 $count]
+    foreach item $items {
+        lappend result [lindex $item 1]
+    }
+    set items ""
+
+    set queues($name) [lreplace [K $queues($name) [set queues($name) ""]] 0 $count]
+    return $result
+}
+
+# ::struct::prioqueue::_peek --
+#
+#   Retrive the value of an item on the queue without removing it.
+#
+# Arguments:
+#   name    name of the queue object.
+#   count   number of items to peek; defaults to 1
+#
+# Results:
+#   items   top count items from the queue; if there are not enough items
+#       to fufill the request, throws an error.
+
+proc ::struct::prioqueue::_peek {name {count 1}} {
+    variable queues
+    if { $count < 1 } {
+    error "invalid item count $count"
+    }
+
+    if { $count > [llength $queues($name)] } {
+    error "insufficient items in prioqueue to fill request"
+    }
+
+    if { $count == 1 } {
+    # Handle this as a special case, so single item pops aren't listified
+    return [lindex [lindex $queues($name) 0] 1]
+    }
+
+    # Otherwise, return a list of items
+    set index [expr {$count - 1}]
+    foreach item [lrange $queues($name) 0 $index] {
+        lappend result [lindex $item 1]
+    }
+    return $result
+}
+
+# ::struct::prioqueue::_peekpriority --
+#
+#   Retrive the priority of an item on the queue without removing it.
+#
+# Arguments:
+#   name    name of the queue object.
+#   count   number of items to peek; defaults to 1
+#
+# Results:
+#   items   top count items from the queue; if there are not enough items
+#       to fufill the request, throws an error.
+
+proc ::struct::prioqueue::_peekpriority {name {count 1}} {
+    variable queues
+    if { $count < 1 } {
+    error "invalid item count $count"
+    }
+
+    if { $count > [llength $queues($name)] } {
+    error "insufficient items in prioqueue to fill request"
+    }
+
+    if { $count == 1 } {
+    # Handle this as a special case, so single item pops aren't listified
+    return [lindex [lindex $queues($name) 0] 0]
+    }
+
+    # Otherwise, return a list of items
+    set index [expr {$count - 1}]
+    foreach item [lrange $queues($name) 0 $index] {
+        lappend result [lindex $item 0]
+    }
+    return $result
+}
+
+
+# ::struct::prioqueue::_put --
+#
+#   Put an item into a queue.
+#
+# Arguments:
+#   name    name of the queue object
+#   args    list of the form "item1 prio1 item2 prio2 item3 prio3"
+#
+# Results:
+#   None.
+
+proc ::struct::prioqueue::_put {name args} {
+    variable queues
+    variable queues_sorting
+    variable sortopt
+    variable sortdir
+
+    if { [llength $args] == 0 || [llength $args] % 2} {
+    error "wrong # args: should be \"$name put item prio ?item prio ...?\""
+    }
+
+    # check for prio type before adding
+    switch -exact -- $queues_sorting($name) {
+        0    {
+        foreach {item prio} $args {
+        if {![string is integer -strict $prio]} {
+            error "priority \"$prio\" is not an integer type value"
+        }
+        }
+    }
+        1    {
+        foreach {item prio} $args {
+        if {![string is double -strict $prio]} {
+            error "priority \"$prio\" is not a real type value"
+        }
+        }
+    }
+        default {
+        #no restrictions for -ascii and -dictionary
+    }
+    }
+
+    # sort by priorities
+    set opt [lindex $sortopt $queues_sorting($name)]
+    set dir [lindex $sortdir $queues_sorting($name)]
+
+    # add only if check has passed
+    foreach {item prio} $args {
+        set new [list $prio $item]
+        set queues($name) [__linsertsorted [K $queues($name) [set queues($name) ""]] $new $opt $dir]
+    }
+    return
+}
+
+# ::struct::prioqueue::_remove --
+#
+#   Delete an item together with it's related priority value from the queue.
+#
+# Arguments:
+#   name    name of the queue object
+#   item    item to be removed
+#
+# Results:
+#   None.
+
+if {[package vcompare [package present Tcl] 8.5] < 0} {
+    # 8.4-: We have -index option for lsearch, so we use glob to allow
+    # us to create a pattern which can ignore the priority value. We
+    # quote everything in the item to prevent it from being
+    # glob-matched, exact matching is required.
+
+    proc ::struct::prioqueue::_remove {name item} {
+	variable queues
+	set queuelist $queues($name)
+	set itemrep "* \\[join [split $item {}] "\\"]"
+	set foundat [lsearch -glob $queuelist $itemrep]
+
+	# the item to remove was not found if foundat remains at -1,
+	# nothing to replace then
+	if {$foundat < 0} return
+	set queues($name) [lreplace $queuelist $foundat $foundat]
+	return
+    }
+} else {
+    # 8.5+: We have the -index option, allowing us to exactly address
+    # the column used to search.
+
+    proc ::struct::prioqueue::_remove {name item} {
+	variable queues
+	set queuelist $queues($name)
+	set foundat [lsearch -index 1 -exact $queuelist $item]
+
+	# the item to remove was not found if foundat remains at -1,
+	# nothing to replace then
+	if {$foundat < 0} return
+	set queues($name) [lreplace $queuelist $foundat $foundat]
+	return
+    }
+}
+
+# ::struct::prioqueue::_size --
+#
+#   Return the number of objects on a queue.
+#
+# Arguments:
+#   name    name of the queue object.
+#
+# Results:
+#   count   number of items on the queue.
+
+proc ::struct::prioqueue::_size {name} {
+    variable queues
+    return [llength $queues($name)]
+}
+
+# ::struct::prioqueue::__linsertsorted
+#
+# Helper proc for inserting into a sorted list.
+#
+#
+
+proc ::struct::prioqueue::__linsertsorted {list newElement sortopt sortdir} {
+    
+    set cmpcmd __elementcompare${sortopt}
+    set pos -1
+    set newPrio [lindex $newElement 0]
+
+    # do a binary search
+    set lower -1
+    set upper [llength $list]
+    set bound [expr {$upper+1}]
+    set pivot 0
+    
+    if {$upper > 0} {
+        while {$lower +1 != $upper } {
+           
+           # get the pivot element
+           set pivot [expr {($lower + $upper) / 2}]
+           set element [lindex $list $pivot]
+        set prio [lindex $element 0]
+           
+           # check
+           set test [$cmpcmd $prio $newPrio $sortdir]
+           if {$test == 0} {
+                set pos $pivot
+                set upper $pivot
+                # now break as we need the last item
+                break
+           } elseif {$test > 0 } {
+                # search lower section
+                set upper $pivot
+                set bound $upper
+                set pos -1
+           } else {
+                # search upper section
+                set lower $pivot
+                set pos $bound
+           }
+        }
+        
+        
+        if {$pos == -1} {
+            # we do an insert before the pivot element
+            set pos $pivot
+        }
+        
+        # loop to the last matching element to 
+        # keep a stable insertion order
+        while {[$cmpcmd $prio $newPrio $sortdir]==0} {
+        incr pos
+            if {$pos > [llength $list]} {break}
+            set element [lindex $list $pos]
+            set prio [lindex $element 0]
+        }            
+        
+    } else {
+        set pos 0
+    }
+    
+    # do the insert without copying
+    linsert [K $list [set list ""]] $pos $newElement
+}
+
+# ::struct::prioqueue::__elementcompare
+#
+# Compare helpers with the sort options.
+#
+#
+
+proc ::struct::prioqueue::__elementcompare-integer {prio newPrio sortdir} {
+    return [expr {$prio < $newPrio ? -1*$sortdir : ($prio != $newPrio)*$sortdir}]
+}
+
+proc ::struct::prioqueue::__elementcompare-real {prio newPrio sortdir} {
+    return [expr {$prio < $newPrio ? -1*$sortdir : ($prio != $newPrio)*$sortdir}] 
+}
+
+proc ::struct::prioqueue::__elementcompare-ascii {prio newPrio sortdir} {
+    return [expr {[string compare $prio $newPrio]*$sortdir}]
+}
+
+proc ::struct::prioqueue::__elementcompare-dictionary {prio newPrio sortdir} {
+    # need to use lsort to access -dictionary sorting
+    set tlist [lsort -increasing -dictionary [list $prio $newPrio]]
+    set e1 [string equal [lindex $tlist 0]  $prio]
+    set e2 [string equal [lindex $tlist 1]  $prio]    
+    return [expr {$e1 > $e2 ? -1*$sortdir : ($e1 != $e2)*$sortdir}]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Get 'prioqueue::prioqueue' into the general structure namespace.
+    namespace import -force prioqueue::prioqueue
+    namespace export prioqueue
+}
+
+package provide struct::prioqueue 1.4
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/queue.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/queue.tcl
new file mode 100644
index 00000000..7f5dcd91
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/queue.tcl
@@ -0,0 +1,187 @@
+# queue.tcl --
+#
+#	Implementation of a queue data structure for Tcl.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+# Copyright (c) 2008 by Andreas Kupries
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: queue.tcl,v 1.16 2012/11/21 22:36:18 andreas_kupries Exp $
+
+# @mdgen EXCLUDE: queue_c.tcl
+
+package require Tcl 8.4
+namespace eval ::struct::queue {}
+
+# ### ### ### ######### ######### #########
+## Management of queue implementations.
+
+# ::struct::queue::LoadAccelerator --
+#
+#	Loads a named implementation, if possible.
+#
+# Arguments:
+#	key	Name of the implementation to load.
+#
+# Results:
+#	A boolean flag. True if the implementation
+#	was successfully loaded; and False otherwise.
+
+proc ::struct::queue::LoadAccelerator {key} {
+    variable accel
+    set r 0
+    switch -exact -- $key {
+	critcl {
+	    # Critcl implementation of queue requires Tcl 8.4.
+	    if {![package vsatisfies [package provide Tcl] 8.4]} {return 0}
+	    if {[catch {package require tcllibc}]} {return 0}
+	    set r [llength [info commands ::struct::queue_critcl]]
+	}
+	tcl {
+	    variable selfdir
+	    if {
+		[package vsatisfies [package provide Tcl] 8.5] &&
+		![catch {package require TclOO 0.6.1-}]
+	    } {
+		source [file join $selfdir queue_oo.tcl]
+	    } else {
+		source [file join $selfdir queue_tcl.tcl]
+	    }
+	    set r 1
+	}
+        default {
+            return -code error "invalid accelerator/impl. package $key:\
+                must be one of [join [KnownImplementations] {, }]"
+        }
+    }
+    set accel($key) $r
+    return $r
+}
+
+# ::struct::queue::SwitchTo --
+#
+#	Activates a loaded named implementation.
+#
+# Arguments:
+#	key	Name of the implementation to activate.
+#
+# Results:
+#	None.
+
+proc ::struct::queue::SwitchTo {key} {
+    variable accel
+    variable loaded
+
+    if {[string equal $key $loaded]} {
+	# No change, nothing to do.
+	return
+    } elseif {![string equal $key ""]} {
+	# Validate the target implementation of the switch.
+
+	if {![info exists accel($key)]} {
+	    return -code error "Unable to activate unknown implementation \"$key\""
+	} elseif {![info exists accel($key)] || !$accel($key)} {
+	    return -code error "Unable to activate missing implementation \"$key\""
+	}
+    }
+
+    # Deactivate the previous implementation, if there was any.
+
+    if {![string equal $loaded ""]} {
+	rename ::struct::queue ::struct::queue_$loaded
+    }
+
+    # Activate the new implementation, if there is any.
+
+    if {![string equal $key ""]} {
+	rename ::struct::queue_$key ::struct::queue
+    }
+
+    # Remember the active implementation, for deactivation by future
+    # switches.
+
+    set loaded $key
+    return
+}
+
+# ::struct::queue::Implementations --
+#
+#	Determines which implementations are
+#	present, i.e. loaded.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys.
+
+proc ::struct::queue::Implementations {} {
+    variable accel
+    set res {}
+    foreach n [array names accel] {
+	if {!$accel($n)} continue
+	lappend res $n
+    }
+    return $res
+}
+
+# ::struct::queue::KnownImplementations --
+#
+#	Determines which implementations are known
+#	as possible implementations.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys. In the order
+#	of preference, most prefered first.
+
+proc ::struct::queue::KnownImplementations {} {
+    return {critcl tcl}
+}
+
+proc ::struct::queue::Names {} {
+    return {
+	critcl {tcllibc based}
+	tcl    {pure Tcl}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Data structures.
+
+namespace eval ::struct::queue {
+    variable  selfdir [file dirname [info script]]
+    variable  accel
+    array set accel   {tcl 0 critcl 0}
+    variable  loaded  {}
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Choose an implementation,
+## most prefered first. Loads only one of the
+## possible implementations. And activates it.
+
+namespace eval ::struct::queue {
+    variable e
+    foreach e [KnownImplementations] {
+	if {[LoadAccelerator $e]} {
+	    SwitchTo $e
+	    break
+	}
+    }
+    unset e
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Export the constructor command.
+    namespace export queue
+}
+
+package provide struct::queue 1.4.5
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/queue_c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/queue_c.tcl
new file mode 100644
index 00000000..30b1aec6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/queue_c.tcl
@@ -0,0 +1,151 @@
+# queuec.tcl --
+#
+#       Implementation of a queue data structure for Tcl.
+#       This code based on critcl, API compatible to the PTI [x].
+#       [x] Pure Tcl Implementation.
+#
+# Copyright (c) 2008 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: queue_c.tcl,v 1.2 2011/04/21 17:51:55 andreas_kupries Exp $
+
+package require critcl
+# @sak notprovided struct_queuec
+package provide struct_queuec 1.3.1
+package require Tcl 8.4
+
+namespace eval ::struct {
+    # Supporting code for the main command.
+
+    critcl::cheaders queue/*.h
+    critcl::csources queue/*.c
+
+    critcl::ccode {
+	/* -*- c -*- */
+
+	#include <util.h>
+	#include <q.h>
+	#include <ms.h>
+	#include <m.h>
+
+	/* .................................................. */
+	/* Global queue management, per interp
+	*/
+
+	typedef struct QDg {
+	    long int counter;
+	    char buf [50];
+	} QDg;
+
+	static void
+	QDgrelease (ClientData cd, Tcl_Interp* interp)
+	{
+	    ckfree((char*) cd);
+	}
+
+	static CONST char*
+	QDnewName (Tcl_Interp* interp)
+	{
+#define KEY "tcllib/struct::queue/critcl"
+
+	    Tcl_InterpDeleteProc* proc = QDgrelease;
+	    QDg*                  qdg;
+
+	    qdg = Tcl_GetAssocData (interp, KEY, &proc);
+	    if (qdg  == NULL) {
+		qdg = (QDg*) ckalloc (sizeof (QDg));
+		qdg->counter = 0;
+
+		Tcl_SetAssocData (interp, KEY, proc,
+				  (ClientData) qdg);
+	    }
+	    
+	    qdg->counter ++;
+	    sprintf (qdg->buf, "queue%ld", qdg->counter);
+	    return qdg->buf;
+
+#undef  KEY
+	}
+
+	static void
+	QDdeleteCmd (ClientData clientData)
+	{
+	    /* Release the whole queue. */
+	    qu_delete ((Q*) clientData);
+	}
+    }
+
+    # Main command, queue creation.
+
+    critcl::ccommand queue_critcl {dummy interp objc objv} {
+      /* Syntax
+       *  - epsilon                         |1
+       *  - name                            |2
+       */
+
+      CONST char* name;
+      Q*          qd;
+      Tcl_Obj*    fqn;
+      Tcl_CmdInfo ci;
+
+#define USAGE "?name?"
+
+      if ((objc != 2) && (objc != 1)) {
+        Tcl_WrongNumArgs (interp, 1, objv, USAGE);
+        return TCL_ERROR;
+      }
+
+      if (objc < 2) {
+        name = QDnewName (interp);
+      } else {
+        name = Tcl_GetString (objv [1]);
+      }
+
+      if (!Tcl_StringMatch (name, "::*")) {
+        /* Relative name. Prefix with current namespace */
+
+        Tcl_Eval (interp, "namespace current");
+        fqn = Tcl_GetObjResult (interp);
+        fqn = Tcl_DuplicateObj (fqn);
+        Tcl_IncrRefCount (fqn);
+
+        if (!Tcl_StringMatch (Tcl_GetString (fqn), "::")) {
+          Tcl_AppendToObj (fqn, "::", -1);
+        }
+        Tcl_AppendToObj (fqn, name, -1);
+      } else {
+        fqn = Tcl_NewStringObj (name, -1);
+        Tcl_IncrRefCount (fqn);
+      }
+      Tcl_ResetResult (interp);
+
+      if (Tcl_GetCommandInfo (interp,
+                              Tcl_GetString (fqn),
+                              &ci)) {
+        Tcl_Obj* err;
+
+        err = Tcl_NewObj ();
+        Tcl_AppendToObj    (err, "command \"", -1);
+        Tcl_AppendObjToObj (err, fqn);
+        Tcl_AppendToObj    (err, "\" already exists, unable to create queue", -1);
+
+        Tcl_DecrRefCount (fqn);
+        Tcl_SetObjResult (interp, err);
+        return TCL_ERROR;
+      }
+
+      qd = qu_new();
+      qd->cmd = Tcl_CreateObjCommand (interp, Tcl_GetString (fqn),
+				      qums_objcmd, (ClientData) qd,
+				      QDdeleteCmd);
+
+      Tcl_SetObjResult (interp, fqn);
+      Tcl_DecrRefCount (fqn);
+      return TCL_OK;
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/queue_oo.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/queue_oo.tcl
new file mode 100644
index 00000000..e6e1fe73
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/queue_oo.tcl
@@ -0,0 +1,228 @@
+# queue.tcl --
+#
+#	Queue implementation for Tcl.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+# Copyright (c) 2008-2010 Andreas Kupries
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: queue_oo.tcl,v 1.2 2010/09/10 17:31:04 andreas_kupries Exp $
+
+package require Tcl   8.5
+package require TclOO 0.6.1- ; # This includes 1 and higher.
+
+# Cleanup first
+catch {namespace delete ::struct::queue::queue_oo}
+catch {rename           ::struct::queue::queue_oo {}}
+oo::class create ::struct::queue::queue_oo {
+
+    variable qat qret qadd
+
+    # variable qat  - Index in qret of next element to return
+    # variable qret - List of elements waiting for return
+    # variable qadd - List of elements added and not yet reached for return.
+
+    constructor {} {
+	set qat  0
+	set qret [list]
+	set qadd [list]
+	return
+    }
+
+    # clear --
+    #
+    #	Clear a queue.
+    #
+    # Results:
+    #	None.
+
+    method clear {} {
+	set qat  0
+	set qret [list]
+	set qadd [list]
+	return
+    }
+
+    # get --
+    #
+    #	Get an item from a queue.
+    #
+    # Arguments:
+    #	count	number of items to get; defaults to 1
+    #
+    # Results:
+    #	item	first count items from the queue; if there are not enough 
+    #		items in the queue, throws an error.
+
+    method get {{count 1}} {
+	if { $count < 1 } {
+	    return -code error "invalid item count $count"
+	} elseif { $count > [my size] } {
+	    return -code error "insufficient items in queue to fill request"
+	}
+
+	my Shift?
+
+	if { $count == 1 } {
+	    # Handle this as a special case, so single item gets aren't
+	    # listified
+
+	    set item [lindex $qret $qat]
+	    incr qat
+	    my Shift?
+	    return $item
+	}
+
+	# Otherwise, return a list of items
+
+	if {$count > ([llength $qret] - $qat)} {
+	    # Need all of qret (from qat on) and parts of qadd, maybe all.
+	    set max    [expr {$qat + $count - 1 - [llength $qret]}]
+	    set result [concat [lrange $qret $qat end] [lrange $qadd 0 $max]]
+	    my Shift
+	    set qat $max
+	} else {
+	    # Request can be satisified from qret alone.
+	    set max    [expr {$qat + $count - 1}]
+	    set result [lrange $qret $qat $max]
+	    set qat $max
+	}
+
+	incr qat
+	my Shift?
+	return $result
+    }
+
+    # peek --
+    #
+    #	Retrieve the value of an item on the queue without removing it.
+    #
+    # Arguments:
+    #	count	number of items to peek; defaults to 1
+    #
+    # Results:
+    #	items	top count items from the queue; if there are not enough items
+    #		to fulfill the request, throws an error.
+
+    method peek {{count 1}} {
+	variable queues
+	if { $count < 1 } {
+	    return -code error "invalid item count $count"
+	} elseif { $count > [my size] } {
+	    return -code error "insufficient items in queue to fill request"
+	}
+
+	my Shift?
+
+	if { $count == 1 } {
+	    # Handle this as a special case, so single item pops aren't
+	    # listified
+	    return [lindex $qret $qat]
+	}
+
+	# Otherwise, return a list of items
+
+	if {$count > [llength $qret] - $qat} {
+	    # Need all of qret (from qat on) and parts of qadd, maybe all.
+	    set over [expr {$qat + $count - 1 - [llength $qret]}]
+	    return [concat [lrange $qret $qat end] [lrange $qadd 0 $over]]
+	} else {
+	    # Request can be satisified from qret alone.
+	    return [lrange $qret $qat [expr {$qat + $count - 1}]]
+	}
+    }
+
+    # put --
+    #
+    #	Put an item into a queue.
+    #
+    # Arguments:
+    #	args	items to put.
+    #
+    # Results:
+    #	None.
+
+    method put {args} {
+	if {![llength $args]} {
+	    return -code error "wrong # args: should be \"[self] put item ?item ...?\""
+	}
+	foreach item $args {
+	    lappend qadd $item
+	}
+	return
+    }
+
+    # unget --
+    #
+    #	Put an item into a queue. At the _front_!
+    #
+    # Arguments:
+    #	item	item to put at the front of the queue
+    #
+    # Results:
+    #	None.
+
+    method unget {item} {
+	if {![llength $qret]} {
+	    set qret [list $item]
+	} elseif {$qat == 0} {
+	    set qret [linsert [my K $qret [unset qret]] 0 $item]
+	} else {
+	    # step back and modify return buffer
+	    incr qat -1
+	    set qret [lreplace [my K $qret [unset qret]] $qat $qat $item]
+	}
+	return
+    }
+
+    # size --
+    #
+    #	Return the number of objects on a queue.
+    #
+    # Results:
+    #	count	number of items on the queue.
+
+    method size {} {
+	return [expr {
+		      [llength $qret] + [llength $qadd] - $qat
+		  }]
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method Shift? {} {
+	if {$qat < [llength $qret]} return
+	# inlined Shift
+	set qat 0
+	set qret $qadd
+	set qadd [list]
+	return
+    }
+
+    method Shift {} {
+	set qat 0
+	set qret $qadd
+	set qadd [list]
+	return
+    }
+
+    method K {x y} { set x }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Get 'queue::queue' into the general structure namespace for
+    # pickup by the main management.
+
+    proc queue_tcl {args} {
+	if {[llength $args]} {
+	    uplevel 1 [::list ::struct::queue::queue_oo create {*}$args]
+	} else {
+	    uplevel 1 [::list ::struct::queue::queue_oo new]
+	}
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/queue_tcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/queue_tcl.tcl
new file mode 100644
index 00000000..78f93bd5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/queue_tcl.tcl
@@ -0,0 +1,383 @@
+# queue.tcl --
+#
+#	Queue implementation for Tcl.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+# Copyright (c) 2008-2010 Andreas Kupries
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: queue_tcl.tcl,v 1.2 2010/03/24 06:13:00 andreas_kupries Exp $
+
+namespace eval ::struct::queue {
+    # counter is used to give a unique name for unnamed queues
+    variable counter 0
+
+    # Only export one command, the one used to instantiate a new queue
+    namespace export queue_tcl
+}
+
+# ::struct::queue::queue_tcl --
+#
+#	Create a new queue with a given name; if no name is given, use
+#	queueX, where X is a number.
+#
+# Arguments:
+#	name	name of the queue; if null, generate one.
+#
+# Results:
+#	name	name of the queue created
+
+proc ::struct::queue::queue_tcl {args} {
+    variable I::qat
+    variable I::qret
+    variable I::qadd
+    variable counter
+
+    switch -exact -- [llength [info level 0]] {
+	1 {
+	    # Missing name, generate one.
+	    incr counter
+	    set name "queue${counter}"
+	}
+	2 {
+	    # Standard call. New empty queue.
+	    set name [lindex $args 0]
+	}
+	default {
+	    # Error.
+	    return -code error \
+		    "wrong # args: should be \"queue ?name?\""
+	}
+    }
+
+    # FIRST, qualify the name.
+    if {![string match "::*" $name]} {
+        # Get caller's namespace; append :: if not global namespace.
+        set ns [uplevel 1 [list namespace current]]
+        if {"::" != $ns} {
+            append ns "::"
+        }
+
+        set name "$ns$name"
+    }
+    if {[llength [info commands $name]]} {
+	return -code error \
+		"command \"$name\" already exists, unable to create queue"
+    }
+
+    # Initialize the queue as empty
+    set qat($name)  0
+    set qret($name) [list]
+    set qadd($name) [list]
+
+    # Create the command to manipulate the queue
+    interp alias {} $name {} ::struct::queue::QueueProc $name
+
+    return $name
+}
+
+##########################
+# Private functions follow
+
+# ::struct::queue::QueueProc --
+#
+#	Command that processes all queue object commands.
+#
+# Arguments:
+#	name	name of the queue object to manipulate.
+#	args	command name and args for the command
+#
+# Results:
+#	Varies based on command to perform
+
+if {[package vsatisfies [package provide Tcl] 8.5]} {
+    # In 8.5+ we can do an ensemble for fast dispatch.
+
+    proc ::struct::queue::QueueProc {name cmd args} {
+	# Shuffle method to front and then simply run the ensemble.
+	# Dispatch, argument checking, and error message generation
+	# are all done in the C-level.
+
+	I $cmd $name {*}$args
+    }
+
+    namespace eval ::struct::queue::I {
+	namespace export clear destroy get peek \
+	    put unget size
+	namespace ensemble create
+    }
+
+} else {
+    # Before 8.5 we have to code our own dispatch, including error
+    # checking.
+
+    proc ::struct::queue::QueueProc {name cmd args} {
+	# Do minimal args checks here
+	if { [llength [info level 0]] == 2 } {
+	    return -code error "wrong # args: should be \"$name option ?arg arg ...?\""
+	}
+	
+	# Split the args into command and args components
+	if { [llength [info commands ::struct::queue::I::$cmd]] == 0 } {
+	    set optlist [lsort [info commands ::struct::queue::I::*]]
+	    set xlist {}
+	    foreach p $optlist {
+		set p [namespace tail $p]
+		if {($p eq "K") || ($p eq "Shift") || ($p eq "Shift?")} continue
+		lappend xlist $p
+	    }
+	    set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	    return -code error \
+		"bad option \"$cmd\": must be $optlist"
+	}
+
+	uplevel 1 [linsert $args 0 ::struct::queue::I::$cmd $name]
+    }
+}
+
+namespace eval ::struct::queue::I {
+    # The arrays hold all of the queues which were made.
+    variable qat    ; # Index in qret of next element to return
+    variable qret   ; # List of elements waiting for return
+    variable qadd   ; # List of elements added and not yet reached for return.
+}
+
+# ::struct::queue::I::clear --
+#
+#	Clear a queue.
+#
+# Arguments:
+#	name	name of the queue object.
+#
+# Results:
+#	None.
+
+proc ::struct::queue::I::clear {name} {
+    variable qat
+    variable qret
+    variable qadd
+    set qat($name)  0
+    set qret($name) [list]
+    set qadd($name) [list]
+    return
+}
+
+# ::struct::queue::I::destroy --
+#
+#	Destroy a queue object by removing it's storage space and 
+#	eliminating it's proc.
+#
+# Arguments:
+#	name	name of the queue object.
+#
+# Results:
+#	None.
+
+proc ::struct::queue::I::destroy {name} {
+    variable qat  ; unset qat($name)
+    variable qret ; unset qret($name)
+    variable qadd ; unset qadd($name)
+    interp alias {} $name {}
+    return
+}
+
+# ::struct::queue::I::get --
+#
+#	Get an item from a queue.
+#
+# Arguments:
+#	name	name of the queue object.
+#	count	number of items to get; defaults to 1
+#
+# Results:
+#	item	first count items from the queue; if there are not enough 
+#		items in the queue, throws an error.
+
+proc ::struct::queue::I::get {name {count 1}} {
+    if { $count < 1 } {
+	error "invalid item count $count"
+    } elseif { $count > [size $name] } {
+	error "insufficient items in queue to fill request"
+    }
+
+    Shift? $name
+
+    variable qat  ; upvar 0 qat($name)  AT
+    variable qret ; upvar 0 qret($name) RET
+    variable qadd ; upvar 0 qadd($name) ADD
+
+    if { $count == 1 } {
+	# Handle this as a special case, so single item gets aren't
+	# listified
+
+	set item [lindex $RET $AT]
+	incr AT
+	Shift? $name
+	return $item
+    }
+
+    # Otherwise, return a list of items
+
+    if {$count > ([llength $RET] - $AT)} {
+	# Need all of RET (from AT on) and parts of ADD, maybe all.
+	set max    [expr {$count - ([llength $RET] - $AT) - 1}]
+	set result [concat [lrange $RET $AT end] [lrange $ADD 0 $max]]
+	Shift $name
+	set AT $max
+    } else {
+	# Request can be satisified from RET alone.
+	set max    [expr {$AT + $count - 1}]
+	set result [lrange $RET $AT $max]
+	set AT $max
+    }
+
+    incr AT
+    Shift? $name
+    return $result
+}
+
+# ::struct::queue::I::peek --
+#
+#	Retrieve the value of an item on the queue without removing it.
+#
+# Arguments:
+#	name	name of the queue object.
+#	count	number of items to peek; defaults to 1
+#
+# Results:
+#	items	top count items from the queue; if there are not enough items
+#		to fulfill the request, throws an error.
+
+proc ::struct::queue::I::peek {name {count 1}} {
+    variable queues
+    if { $count < 1 } {
+	error "invalid item count $count"
+    } elseif { $count > [size $name] } {
+	error "insufficient items in queue to fill request"
+    }
+
+    Shift? $name
+
+    variable qat  ; upvar 0 qat($name)  AT
+    variable qret ; upvar 0 qret($name) RET
+    variable qadd ; upvar 0 qadd($name) ADD
+
+    if { $count == 1 } {
+	# Handle this as a special case, so single item pops aren't
+	# listified
+	return [lindex $RET $AT]
+    }
+
+    # Otherwise, return a list of items
+
+    if {$count > [llength $RET] - $AT} {
+	# Need all of RET (from AT on) and parts of ADD, maybe all.
+	set over [expr {$count - ([llength $RET] - $AT) - 1}]
+	return [concat [lrange $RET $AT end] [lrange $ADD 0 $over]]
+    } else {
+	# Request can be satisified from RET alone.
+	return [lrange $RET $AT [expr {$AT + $count - 1}]]
+    }
+}
+
+# ::struct::queue::I::put --
+#
+#	Put an item into a queue.
+#
+# Arguments:
+#	name	name of the queue object
+#	args	items to put.
+#
+# Results:
+#	None.
+
+proc ::struct::queue::I::put {name args} {
+    variable qadd
+    if { [llength $args] == 0 } {
+	error "wrong # args: should be \"$name put item ?item ...?\""
+    }
+    foreach item $args {
+	lappend qadd($name) $item
+    }
+    return
+}
+
+# ::struct::queue::I::unget --
+#
+#	Put an item into a queue. At the _front_!
+#
+# Arguments:
+#	name	name of the queue object
+#	item	item to put at the front of the queue
+#
+# Results:
+#	None.
+
+proc ::struct::queue::I::unget {name item} {
+    variable qat  ; upvar 0 qat($name) AT
+    variable qret ; upvar 0 qret($name) RET
+
+    if {![llength $RET]} {
+	set RET [list $item]
+    } elseif {$AT == 0} {
+	set RET [linsert [K $RET [unset RET]] 0 $item]
+    } else {
+	# step back and modify return buffer
+	incr AT -1
+	set RET [lreplace [K $RET [unset RET]] $AT $AT $item]
+    }
+    return
+}
+
+# ::struct::queue::I::size --
+#
+#	Return the number of objects on a queue.
+#
+# Arguments:
+#	name	name of the queue object.
+#
+# Results:
+#	count	number of items on the queue.
+
+proc ::struct::queue::I::size {name} {
+    variable qat
+    variable qret
+    variable qadd
+    return [expr {
+	  [llength $qret($name)] + [llength $qadd($name)] - $qat($name)
+    }]
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::struct::queue::I::Shift? {name} {
+    variable qat
+    variable qret
+    if {$qat($name) < [llength $qret($name)]} return
+    Shift $name
+    return
+}
+
+proc ::struct::queue::I::Shift {name} {
+    variable qat
+    variable qret
+    variable qadd
+    set qat($name) 0
+    set qret($name) $qadd($name)
+    set qadd($name) [list]
+    return
+}
+
+proc ::struct::queue::I::K {x y} { set x }
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Get 'queue::queue' into the general structure namespace for
+    # pickup by the main management.
+    namespace import -force queue::queue_tcl
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/record.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/record.tcl
new file mode 100644
index 00000000..6c58dd78
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/record.tcl
@@ -0,0 +1,830 @@
+#============================================================
+# ::struct::record --
+#
+#    Implements a container data structure similar to a 'C'
+#    structure. It hides the ugly details about keeping the
+#    data organized by using a combination of arrays, lists
+#    and namespaces.
+#
+#    Each record definition is kept in a master array
+#    (_recorddefn) under the ::struct::record namespace. Each
+#    instance of a record is kept within a separate namespace
+#    for each record definition. Hence, instances of
+#    the same record definition are managed under the
+#    same namespace. This avoids possible collisions, and
+#    also limits one big global array mechanism.
+#
+# Copyright (c) 2002 by Brett Schwarz
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# This code may be distributed under the same terms as Tcl.
+#
+#============================================================
+#
+####  FIX ERROR MESSAGES SO THEY MAKE SENSE (Wrong args)
+
+namespace eval ::struct {}
+
+namespace eval ::struct::record {
+
+    ##
+    ##  array of lists that holds the definition (variables) for each
+    ##  record
+    ##
+    ##  _recorddefn(some_record) var1 var2 var3 ...
+    ##
+    variable _recorddefn
+
+    ##
+    ##  holds the count for each record in cases where the instance is
+    ##  automatically generated
+    ##
+    ##  _count(some_record) 0
+    ##
+
+    ## This is not a count, but an id generator. Its value has to
+    ## increase monotonicaly.
+
+    variable _count
+
+    ##
+    ##  array that holds the defining record's name for each instances
+    ##
+    ##  _defn(some_instances) name_of_defining_record
+    ##
+    variable  _defn
+    array set _defn {}
+
+    ##
+    ##  This holds the defaults for a record definition.  If no
+    ##  default is given for a member of a record, then the value is
+    ##  assigned to the empty string
+    ##
+    variable _defaults
+
+    ##
+    ##  These are the possible sub commands
+    ##
+    variable commands
+    set commands [list define delete exists show]
+
+    ##
+    ##  This keeps track of the level that we are in when handling
+    ##  nested records. This is kind of a hack, and probably can be
+    ##  handled better
+    ##
+    set _level 0
+
+    namespace export record
+}
+
+#------------------------------------------------------------
+# ::struct::record::record --
+#
+#    main command used to access the other sub commands
+#
+# Arguments:
+#    cmd_   The sub command (i.e. define, show, delete, exists)
+#    args   arguments to pass to the sub command
+#
+# Results:
+#  none returned
+#------------------------------------------------------------
+#
+proc ::struct::record::record {cmd_ args} {
+    variable commands
+
+    if {[lsearch $commands $cmd_] < 0} {
+        error "Sub command \"$cmd_\" is not recognized. Must be [join $commands ,]"
+    }
+
+    set cmd_ [string totitle "$cmd_"]
+    return [uplevel 1 ::struct::record::${cmd_} $args]
+
+}; # end proc ::struct::record::record
+
+
+#------------------------------------------------------------
+# ::struct::record::Define --
+#
+#    Used to define a record
+#
+# Arguments:
+#    defn_    the name of the record definition
+#    vars_    the variables of the record (as a list)
+#    args     instances to be create during definition
+#
+# Results:
+#   Returns the name of the definition during successful
+#   creation.
+#------------------------------------------------------------
+#
+proc ::struct::record::Define {defn_ vars_ args} {
+    variable _recorddefn
+    variable _count
+    variable _defaults
+
+    # puts .([info level 0])...
+
+    set defn_ [Qualify $defn_]
+
+    if {[info exists _recorddefn($defn_)]} {
+        error "Record definition $defn_ already exists"
+    }
+
+    if {[lsearch [info commands] $defn_] >= 0} {
+        error "Structure definition name can not be a Tcl command name"
+    }
+
+    set _defaults($defn_)   [list]
+    set _recorddefn($defn_) [list]
+
+    ##
+    ##  Loop through the members of the record
+    ##  definition
+    ##
+    foreach V $vars_ {
+        set len [llength $V]
+        set D ""
+
+        if {$len == 2} {
+	    ##  2 --> there is a default value
+	    ##        assigned to the member
+
+            set D [lindex $V 1]
+            set V [lindex $V 0]
+
+        } elseif {$len == 3} {
+	    ##  3 --> there is a nested record
+	    ##        definition given as a member
+	    ##  V = ('record' record-name field-name)
+
+            if {![string match "record" "[lindex $V 0]"]} {
+                Delete record $defn_
+                error "$V is a Bad member for record definition. Definition creation aborted."
+            }
+
+            set new [lindex $V 1]
+            set new [Qualify $new]
+	    # puts .\tchild=$new
+            ##
+            ##  Right now, there can not be circular records
+            ##  so, we abort the creation
+            ##
+            if {[string match "$defn_" "$new"]} {
+		# puts .\tabort
+                Delete record $defn_
+                error "Can not have circular records. Structure was not created."
+            }
+
+            ##
+            ##  Will take care of the nested record later
+            ##  We just join by :: because this is how it
+            ##  use to be declared, so the parsing code
+            ##  is already there.
+            ##
+            set V [join [lrange $V 1 2] "::"]
+        }
+
+	# puts .\tfield($V)=default($D)
+
+        lappend _recorddefn($defn_) $V
+        lappend _defaults($defn_)   $D
+    }
+
+    # Create class command as alias to instance creator.
+    uplevel #0 [list interp alias \
+		    {} $defn_ \
+		    {} ::struct::record::Create $defn_]
+
+    set _count($defn_) 0
+
+    # Create class namespace. This will hold all the instance information.
+    namespace eval ::struct::record${defn_} {
+        variable values
+        variable instances
+	variable record
+
+        set instances [list]
+    }
+
+    set ::struct::record${defn_}::record $defn_
+
+    ##
+    ##    If there were args given (instances), then
+    ##    create them now
+    ##
+    foreach A $args {
+        uplevel 1 [list ::struct::record::Create $defn_ $A]
+    }
+
+    # puts .=>${defn_}
+    return $defn_
+
+}; # end proc ::struct::record::Define
+
+
+#------------------------------------------------------------
+# ::struct::record::Create --
+#
+#    Creates an instance of a record definition
+#
+# Arguments:
+#    defn_    the name of the record definition
+#    inst_    the name of the instances to create
+#    args     values to set to the record's members
+#
+# Results:
+#   Returns the name of the instance for a successful creation
+#------------------------------------------------------------
+#
+proc ::struct::record::Create {defn_ inst_ args} {
+    variable _recorddefn
+    variable _count
+    variable _defn
+    variable _defaults
+    variable _level
+
+    # puts .([info level 0])...
+
+    set inst_ [Qualify "$inst_"]
+
+    ##
+    ##    test to see if the record
+    ##    definition has been defined yet
+    ##
+    if {![info exists _recorddefn($defn_)]} {
+        error "Structure $defn_ does not exist"
+    }
+
+    ##
+    ##    if there was no argument given,
+    ##    then assume that the record
+    ##    variable is automatically
+    ##    generated
+    ##
+    if {[string match "[Qualify #auto]" "$inst_"]} {
+        set c $_count($defn_)
+        set inst_ [format "%s%s" ${defn_} $_count($defn_)]
+        incr _count($defn_)
+    }
+
+    ##
+    ##    Test to see if this instance is already
+    ##    created. This avoids any collisions with
+    ##    previously created instances
+    ##
+    if {[info exists _defn($inst_)]} {
+        incr _count($defn_) -1
+        error "Instances $inst_ already exists"
+    }
+
+    set _defn($inst_) $defn_
+
+    ##
+    ##    Initialize record variables to defaults
+    ##
+
+    # Create instance command as alias of instance dispatcher.
+    uplevel #0 [list interp alias {} ${inst_} {} ::struct::record::Cmd $inst_]
+
+    # Locate manager namespace, i.e. class namespace for new instance
+    set nsi [Ns $inst_]
+    # puts .\tnsi=$nsi
+
+    # Import the state of the manager namespace
+    upvar 0 ${nsi}values    __values
+    upvar 0 ${nsi}instances __instances
+
+    set cnt 0
+    foreach V $_recorddefn($defn_) D $_defaults($defn_) {
+
+	# puts .\tfield($V)=default($D)
+
+	set __values($inst_,$V) $D
+
+        ##
+        ##  Test to see if there is a nested record
+        ##
+        if {[regexp -- {([\w]*)::([\w]*)} $V -> def inst]} {
+
+            if {$_level == 0} {
+                set _level 2
+            }
+
+            ##
+            ##  This is to guard against if the creation had failed,
+            ##  that there isn't any lingering variables/alias around
+            ##
+            set def [Qualify $def $_level]
+
+            if {![info exists _recorddefn($def)]} {
+                Delete inst "$inst_"
+                return
+            }
+
+            ##
+            ##    evaluate the nested record. If there were values for
+            ##    the variables passed in, then we assume that the
+            ##    value for this nested record is a list corresponding
+            ##    the the nested list's variables, and so we pass that
+            ##    to the nested record's instantiation.  We then get
+            ##    rid of those args for later processing.
+            ##
+            set cnt_plus [expr {$cnt + 1}]
+            set mem [lindex $args $cnt]
+            if {![string match "" "$mem"]} {
+		if {![string match "-$inst" "$mem"]} {
+                    Delete inst "$inst_"
+                    error "$inst is not a member of $defn_"
+                }
+            }
+            incr _level
+            set narg [lindex $args $cnt_plus]
+
+	    # Create instance of the nested record.
+            eval [linsert $narg 0 Create $def ${inst_}.${inst}]
+
+            set args [lreplace $args $cnt $cnt_plus]
+
+            incr _level -1
+        } else {
+	    # Regular field, not a nested record. Create alias for
+	    # field access.
+            uplevel #0 [list interp alias \
+			    {} ${inst_}.$V \
+			    {} ::struct::record::Access $defn_ $inst_ $V]
+            incr cnt 2
+        }
+    }; # end foreach variable
+
+    # Remember new instance.
+    lappend __instances $inst_
+
+    # Apply field values handed to the instance constructor.
+    foreach {k v} $args {
+        Access $defn_ $inst_ [string trimleft "$k" -] $v
+    }; # end foreach arg {}
+
+    if {$_level == 2} {
+	set _level 0
+    }
+
+    # puts .=>${inst_}
+    return $inst_
+
+}; # end proc ::struct::record::Create
+
+
+#------------------------------------------------------------
+# ::struct::record::Access --
+#
+#    Provides a common proc to access the variables
+#    from the aliases create for each variable in the record
+#
+# Arguments:
+#    defn_    the name of the record to access
+#    inst_    the name of the instance to create
+#    var_     the variable of the record to access
+#    args     a value to set to var_ (if any)
+#
+# Results:
+#    Returns the value of the record member (var_)
+#------------------------------------------------------------
+#
+proc ::struct::record::Access {defn_ inst_ var_ args} {
+
+    variable _recorddefn
+    variable _defn
+
+    set i [lsearch $_recorddefn($defn_) $var_]
+
+    if {$i < 0} {
+	error "$var_ does not exist in record $defn_"
+    }
+
+    if {![info exists _defn($inst_)]} {
+
+	error "$inst_ does not exist"
+    }
+
+    if {[set idx [lsearch $args "="]] >= 0} {
+        set args [lreplace $args $idx $idx]
+    }
+
+    set nsi [Ns $inst_]
+    # puts .\tnsi=$nsi
+
+    # Import the state of the manager namespace
+    upvar 0 ${nsi}values    __values
+
+    ##
+    ##    If a value was given, then set it
+    ##
+    if {[llength $args] != 0} {
+
+        set val_ [lindex $args 0]
+
+        set __values($inst_,$var_) $val_
+    }
+
+    return $__values($inst_,$var_)
+
+}; # end proc ::struct::record::Access
+
+
+#------------------------------------------------------------
+# ::struct::record::Cmd --
+#
+#    Used to process the set/get requests.
+#
+# Arguments:
+#    inst_    the record instance name
+#    args     For 'get' this is the record members to
+#             retrieve. For 'set' this is a member/value
+#             pair.
+#
+# Results:
+#   For 'set' returns the empty string. For 'get' it returns
+#   the member values.
+#------------------------------------------------------------
+#
+proc ::struct::record::Cmd {inst_ args} {
+
+    variable _defn
+
+    set result [list]
+
+    set len [llength $args]
+    if {$len <= 1} {return [Show values "$inst_"]}
+
+    set cmd [lindex $args 0]
+
+    if {[string match "cget" "$cmd"]} {
+
+	set cnt 0
+	foreach k [lrange $args 1 end] {
+	    if {[catch {set r [${inst_}.[string trimleft ${k} -]]} err]} {
+		error "Bad option \"$k\""
+	    }
+
+	    lappend result $r
+	    incr cnt
+	}
+	if {$cnt == 1} {set result [lindex $result 0]}
+	return $result
+
+    } elseif {[string match "config*" "$cmd"]} {
+
+	set L [lrange $args 1 end]
+	foreach {k v} $L {
+	    ${inst_}.[string trimleft ${k} -] $v
+	}
+
+    } else {
+	error "Wrong argument.
+            must be \"object cget|configure args\""
+    }
+
+    return [list]
+
+}; # end proc ::struct::record::Cmd
+
+
+#------------------------------------------------------------
+# ::struct::record::Ns --
+#
+#    This just constructs a fully qualified namespace for a
+#    particular instance.
+#
+# Arguments;
+#    inst_    instance to construct the namespace for.
+#
+# Results:
+#    Returns the fully qualified namespace for the instance
+#------------------------------------------------------------
+#
+proc ::struct::record::Ns {inst_} {
+
+    variable _defn
+
+    if {[catch {set ret $_defn($inst_)} err]} {
+        return $inst_
+    }
+
+    return [format "%s%s%s" "::struct::record" $ret "::"]
+
+}; # end proc ::struct::record::Ns
+
+
+#------------------------------------------------------------
+# ::struct::record::Show --
+#
+#     Display info about the record that exist
+#
+# Arguments:
+#    what_    subcommand
+#    record_  record or instance to process
+#
+# Results:
+#    if what_ = record, then return list of records
+#               definition names.
+#    if what_ = members, then return list of members
+#               or members of the record.
+#    if what_ = instance, then return a list of instances
+#               with record definition of record_
+#    if what_ = values, then it will return the values
+#               for a particular instance
+#------------------------------------------------------------
+#
+proc ::struct::record::Show {what_ {record_ ""}} {
+    variable _recorddefn
+    variable _defn
+    variable _defaults
+
+    set record_ [Qualify $record_]
+
+    ##
+    ## We just prepend :: to the record_ argument
+    ##
+    #if {![string match "::*" "$record_"]} {set record_ "::$record_"}
+
+    if {[string match "record*" "$what_"]} {
+	# Show record
+
+        return [lsort [array names _recorddefn]]
+    }
+
+    if {[string match "mem*" "$what_"]} {
+	# Show members
+
+	if {[string match "" "$record_"] || ![info exists _recorddefn($record_)]} {
+	    error "Bad arguments while accessing members. Bad record name"
+	}
+
+	set res [list]
+	set cnt 0
+	foreach m $_recorddefn($record_) {
+	    set def [lindex $_defaults($record_) $cnt]
+	    if {[regexp -- {([\w]+)::([\w]+)} $m m d i]} {
+		lappend res [list record $d $i]
+	    } elseif {![string match "" "$def"]} {
+		lappend res [list $m $def]
+	    } else {
+		lappend res $m
+	    }
+
+	    incr cnt
+	}
+
+	return $res
+    }
+
+    if {[string match "inst*" "$what_"]} {
+	# Show instances
+
+	if {![namespace exists ::struct::record${record_}]} {
+	    return [list]
+	}
+
+	# Import the state of the manager namespace
+	upvar 0 ::struct::record${record_}::instances __instances
+
+        if {![info exists __instances]} {
+            return [list]
+        }
+        return [lsort $__instances]
+
+    }
+
+    if {[string match "val*" "$what_"]} {
+	# Show values
+
+	set nsi [Ns $record_]
+	upvar 0 ${nsi}::instances __instances
+	upvar 0 ${nsi}::values    __values
+	upvar 0 ${nsi}::record    __record
+
+	if {[string match "" "$record_"] ||
+	    ([lsearch $__instances $record_] < 0)} {
+
+	    error "Wrong arguments to values. Bad instance name"
+	}
+
+	set ret [list]
+	foreach k $_recorddefn($__record) {
+	    set v $__values($record_,$k)
+
+	    if {[regexp -- {([\w]*)::([\w]*)} $k m def inst]} {
+		set v [::struct::record::Show values ${record_}.${inst}]
+	    }
+
+	    lappend ret -[namespace tail $k] $v
+	}
+	return $ret
+
+    }
+
+    # Bogus submethod
+    return [list]
+
+}; # end proc ::struct::record::Show
+
+
+#------------------------------------------------------------
+# ::struct::record::Delete --
+#
+#    Deletes a record instance or a record definition
+#
+# Arguments:
+#    sub_    what to delete. Either 'instance' or 'record'
+#    item_   the specific record instance or definition
+#            delete.
+#
+# Returns:
+#    none
+#
+#------------------------------------------------------------
+#
+proc ::struct::record::Delete {sub_ item_} {
+    variable _recorddefn
+    variable _defn
+    variable _count
+    variable _defaults
+
+    # puts .([info level 0])...
+
+    set item_ [Qualify $item_]
+
+    switch -- $sub_ {
+        instance -
+        instances -
+        inst    {
+	    # puts .instance
+	    # puts .is-instance=[Exists instance $item_]
+
+            if {[Exists instance $item_]} {
+
+		# Locate manager namespace, i.e. class namespace for
+		# instance to remove
+		set nsi [Ns $item_]
+		# puts .\tnsi=$nsi
+
+		# Import the state of the manager namespace
+		upvar 0 ${nsi}values    __values
+		upvar 0 ${nsi}instances __instances
+		upvar 0 ${nsi}record    __record
+		# puts .\trecord=$__record
+
+		# Remove instance from state
+		set i [lsearch $__instances $item_]
+		set __instances [lreplace $__instances $i $i]
+		unset _defn($item_)
+
+		# Process instance fields.
+
+		foreach V $_recorddefn($__record) {
+		    # puts .\tfield($V)=/clear
+
+		    if {[regexp -- {([\w]*)::([\w]*)} $V m def inst]} {
+			# Nested record detected.
+			# Determine associated instance and delete recursively.
+			Delete inst ${item_}.${inst}
+		    } else {
+			# Delete field accessor alias
+			# puts .de-alias\t($item_.$V)
+			uplevel #0 [list interp alias {} ${item_}.$V {}]
+		    }
+
+		    unset __values($item_,$V)
+		}
+
+		# Auto-generated id numbers increase monotonically.
+		# Reverting here causes the next auto to fail, claiming
+		# that the instance exists.
+                # incr _count($ns) -1
+
+            } else {
+                #error "$item_ is not a instance"
+            }
+        }
+        record  -
+        records   {
+	    # puts .record
+            ##
+            ##  Delete the instances for this
+            ##  record
+            ##
+	    # puts .get-instances
+            foreach I [Show instance "$item_"] {
+                catch {
+		    # puts .di/$I
+		    Delete instance "$I"
+		}
+            }
+
+            catch {
+                unset _recorddefn($item_)
+                unset _defaults($item_)
+                unset _count($item_)
+                namespace delete ::struct::record${item_}
+            }
+        }
+        default   {
+            error "Wrong arguments to delete"
+        }
+
+    }; # end switch
+
+    # Remove alias associated with instance or record (class)
+    # puts .de-alias\t($item_)
+    catch { uplevel #0 [list interp alias {} $item_ {}]}
+
+    # puts ./
+    return
+
+}; # end proc ::struct::record::Delete
+
+
+#------------------------------------------------------------
+# ::struct::record::Exists --
+#
+#    Tests whether a record definition or record
+#    instance exists.
+#
+# Arguments:
+#    sub_    what to test. Either 'instance' or 'record'
+#    item_   the specific record instance or definition
+#            that needs to be tested.
+#
+# Tests to see if a particular instance exists
+#
+#------------------------------------------------------------
+#
+proc ::struct::record::Exists {sub_ item_} {
+
+    # puts .([info level 0])...
+
+    set item_ [Qualify $item_]
+
+    switch -glob -- $sub_ {
+        inst* {
+	    variable _defn
+            return [info exists _defn($item_)]
+        }
+        record {
+	    variable _recorddefn
+            return [info exists _recorddefn($item_)]
+        }
+        default  {
+            error "Wrong arguments. Must be exists record|instance target"
+        }
+    }; # end switch
+
+}; # end proc ::struct::record::Exists
+
+
+#------------------------------------------------------------
+# ::struct::record::Qualify --
+#
+#    Contructs the qualified name of the calling scope. This
+#    defaults to 2 levels since there is an extra proc call in
+#    between.
+#
+# Arguments:
+#    item_   the command that needs to be qualified
+#    level_  how many levels to go up (default = 2)
+#
+# Results:
+#    the item_ passed in fully qualified
+#
+#------------------------------------------------------------
+#
+proc ::struct::record::Qualify {item_ {level_ 2}} {
+    if {![string match "::*" "$item_"]} {
+        set ns [uplevel $level_ [list namespace current]]
+
+        if {![string match "::" "$ns"]} {
+            append ns "::"
+        }
+
+        set item_ "$ns${item_}"
+    }
+
+    return "$item_"
+
+}; # end proc ::struct::record::Qualify
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Get 'record::record' into the general structure namespace.
+    namespace import -force record::record
+    namespace export record
+}
+
+package provide struct::record 1.2.2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/sets.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/sets.tcl
new file mode 100644
index 00000000..88316377
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/sets.tcl
@@ -0,0 +1,189 @@
+#----------------------------------------------------------------------
+#
+# sets.tcl --
+#
+#	Definitions for the processing of sets.
+#
+# Copyright (c) 2004-2008 by Andreas Kupries.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: sets.tcl,v 1.17 2008/03/09 04:24:37 andreas_kupries Exp $
+#
+#----------------------------------------------------------------------
+
+# @mdgen EXCLUDE: sets_c.tcl
+
+package require Tcl 8.2
+
+namespace eval ::struct::set {}
+
+# ### ### ### ######### ######### #########
+## Management of set implementations.
+
+# ::struct::set::LoadAccelerator --
+#
+#	Loads a named implementation, if possible.
+#
+# Arguments:
+#	key	Name of the implementation to load.
+#
+# Results:
+#	A boolean flag. True if the implementation
+#	was successfully loaded; and False otherwise.
+
+proc ::struct::set::LoadAccelerator {key} {
+    variable accel
+    set r 0
+    switch -exact -- $key {
+	critcl {
+	    # Critcl implementation of set requires Tcl 8.4.
+	    if {![package vsatisfies [package provide Tcl] 8.4]} {return 0}
+	    if {[catch {package require tcllibc}]} {return 0}
+	    set r [llength [info commands ::struct::set_critcl]]
+	}
+	tcl {
+	    variable selfdir
+	    source [file join $selfdir sets_tcl.tcl]
+	    set r 1
+	}
+        default {
+            return -code error "invalid accelerator/impl. package $key:\
+                must be one of [join [KnownImplementations] {, }]"
+        }
+    }
+    set accel($key) $r
+    return $r
+}
+
+# ::struct::set::SwitchTo --
+#
+#	Activates a loaded named implementation.
+#
+# Arguments:
+#	key	Name of the implementation to activate.
+#
+# Results:
+#	None.
+
+proc ::struct::set::SwitchTo {key} {
+    variable accel
+    variable loaded
+
+    if {[string equal $key $loaded]} {
+	# No change, nothing to do.
+	return
+    } elseif {![string equal $key ""]} {
+	# Validate the target implementation of the switch.
+
+	if {![info exists accel($key)]} {
+	    return -code error "Unable to activate unknown implementation \"$key\""
+	} elseif {![info exists accel($key)] || !$accel($key)} {
+	    return -code error "Unable to activate missing implementation \"$key\""
+	}
+    }
+
+    # Deactivate the previous implementation, if there was any.
+
+    if {![string equal $loaded ""]} {
+	rename ::struct::set ::struct::set_$loaded
+    }
+
+    # Activate the new implementation, if there is any.
+
+    if {![string equal $key ""]} {
+	rename ::struct::set_$key ::struct::set
+    }
+
+    # Remember the active implementation, for deactivation by future
+    # switches.
+
+    set loaded $key
+    return
+}
+
+proc ::struct::set::Loaded {} {
+    variable loaded
+    return  $loaded
+}
+
+# ::struct::set::Implementations --
+#
+#	Determines which implementations are
+#	present, i.e. loaded.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys.
+
+proc ::struct::set::Implementations {} {
+    variable accel
+    set res {}
+    foreach n [array names accel] {
+	if {!$accel($n)} continue
+	lappend res $n
+    }
+    return $res
+}
+
+# ::struct::set::KnownImplementations --
+#
+#	Determines which implementations are known
+#	as possible implementations.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys. In the order
+#	of preference, most prefered first.
+
+proc ::struct::set::KnownImplementations {} {
+    return {critcl tcl}
+}
+
+proc ::struct::set::Names {} {
+    return {
+	critcl {tcllibc based}
+	tcl    {pure Tcl}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Data structures.
+
+namespace eval ::struct::set {
+    variable  selfdir [file dirname [info script]]
+    variable  accel
+    array set accel   {tcl 0 critcl 0}
+    variable  loaded  {}
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Choose an implementation,
+## most prefered first. Loads only one of the
+## possible implementations. And activates it.
+
+namespace eval ::struct::set {
+    variable e
+    foreach e [KnownImplementations] {
+	if {[LoadAccelerator $e]} {
+	    SwitchTo $e
+	    break
+	}
+    }
+    unset e
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Export the constructor command.
+    namespace export set
+}
+
+package provide struct::set 2.2.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/sets_c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/sets_c.tcl
new file mode 100644
index 00000000..cd07f925
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/sets_c.tcl
@@ -0,0 +1,93 @@
+#----------------------------------------------------------------------
+#
+# sets_tcl.tcl --
+#
+#       Definitions for the processing of sets. C implementation.
+#
+# Copyright (c) 2007 by Andreas Kupries.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: sets_c.tcl,v 1.3 2008/03/25 07:15:34 andreas_kupries Exp $
+#
+#----------------------------------------------------------------------
+
+package require critcl
+# @sak notprovided struct_setc
+package provide struct_setc 2.1.1
+package require Tcl 8.4
+
+namespace eval ::struct {
+    # Supporting code for the main command.
+
+    catch {
+        #critcl::cheaders -g
+        #critcl::debug memory symbols
+    }
+
+    critcl::cheaders sets/*.h
+    critcl::csources sets/*.c
+
+    critcl::ccode {
+        /* -*- c -*- */
+
+        #include <m.h>
+    }
+
+    # Main command, set creation.
+
+    critcl::ccommand set_critcl {dummy interp objc objv} {
+	/* Syntax - dispatcher to the sub commands.
+	 */
+
+        static CONST char* methods [] = {
+            "add",      "contains",     "difference",   "empty",
+            "equal","exclude",  "include",      "intersect",
+            "intersect3",       "size", "subsetof",     "subtract",
+            "symdiff",  "union",
+            NULL
+        };
+        enum methods {
+            S_add,      S_contains,     S_difference,   S_empty,
+            S_equal,S_exclude,  S_include,      S_intersect,
+            S_intersect3,       S_size, S_subsetof,     S_subtract,
+            S_symdiff,  S_union
+        };
+
+	int m;
+
+        if (objc < 2) {
+            Tcl_WrongNumArgs (interp, objc, objv, "cmd ?arg ...?");
+            return TCL_ERROR;
+        } else if (Tcl_GetIndexFromObj (interp, objv [1], methods, "option",
+            0, &m) != TCL_OK) {
+            return TCL_ERROR;
+        }
+
+        /* Dispatch to methods. They check the #args in detail before performing
+         * the requested functionality
+         */
+
+        switch (m) {
+            case S_add:        return sm_ADD        (NULL, interp, objc, objv);
+            case S_contains:   return sm_CONTAINS   (NULL, interp, objc, objv);
+            case S_difference: return sm_DIFFERENCE (NULL, interp, objc, objv);
+            case S_empty:      return sm_EMPTY      (NULL, interp, objc, objv);
+            case S_equal:      return sm_EQUAL      (NULL, interp, objc, objv);
+            case S_exclude:    return sm_EXCLUDE    (NULL, interp, objc, objv);
+            case S_include:    return sm_INCLUDE    (NULL, interp, objc, objv);
+            case S_intersect:  return sm_INTERSECT  (NULL, interp, objc, objv);
+            case S_intersect3: return sm_INTERSECT3 (NULL, interp, objc, objv);
+            case S_size:       return sm_SIZE       (NULL, interp, objc, objv);
+            case S_subsetof:   return sm_SUBSETOF   (NULL, interp, objc, objv);
+            case S_subtract:   return sm_SUBTRACT   (NULL, interp, objc, objv);
+            case S_symdiff:    return sm_SYMDIFF    (NULL, interp, objc, objv);
+            case S_union:      return sm_UNION      (NULL, interp, objc, objv);
+        }
+        /* Not coming to this place */
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/sets_tcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/sets_tcl.tcl
new file mode 100644
index 00000000..a2e1fde3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/sets_tcl.tcl
@@ -0,0 +1,452 @@
+#----------------------------------------------------------------------
+#
+# sets_tcl.tcl --
+#
+#	Definitions for the processing of sets.
+#
+# Copyright (c) 2004-2008 by Andreas Kupries.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: sets_tcl.tcl,v 1.4 2008/03/09 04:38:47 andreas_kupries Exp $
+#
+#----------------------------------------------------------------------
+
+package require Tcl 8.0
+
+namespace eval ::struct::set {
+    # Only export one command, the one used to instantiate a new tree
+    namespace export set_tcl
+}
+
+##########################
+# Public functions
+
+# ::struct::set::set --
+#
+#	Command that access all set commands.
+#
+# Arguments:
+#	cmd	Name of the subcommand to dispatch to.
+#	args	Arguments for the subcommand.
+#
+# Results:
+#	Whatever the result of the subcommand is.
+
+proc ::struct::set::set_tcl {cmd args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 1 } {
+	return -code error "wrong # args: should be \"$cmd ?arg arg ...?\""
+    }
+    ::set sub S_$cmd
+    if { [llength [info commands ::struct::set::$sub]] == 0 } {
+	::set optlist [info commands ::struct::set::S_*]
+	::set xlist {}
+	foreach p $optlist {
+	    lappend xlist [string range $p 17 end]
+	}
+	return -code error \
+		"bad option \"$cmd\": must be [linsert [join [lsort $xlist] ", "] "end-1" "or"]"
+    }
+    return [uplevel 1 [linsert $args 0 ::struct::set::$sub]]
+}
+
+##########################
+# Implementations of the functionality.
+#
+
+# ::struct::set::S_empty --
+#
+#       Determines emptiness of the set
+#
+# Parameters:
+#       set	-- The set to check for emptiness.
+#
+# Results:
+#       A boolean value. True indicates that the set is empty.
+#
+# Side effects:
+#       None.
+#
+# Notes:
+
+proc ::struct::set::S_empty {set} {
+    return [expr {[llength $set] == 0}]
+}
+
+# ::struct::set::S_size --
+#
+#	Computes the cardinality of the set.
+#
+# Parameters:
+#	set	-- The set to inspect.
+#
+# Results:
+#       An integer greater than or equal to zero.
+#
+# Side effects:
+#       None.
+
+proc ::struct::set::S_size {set} {
+    return [llength [Cleanup $set]]
+}
+
+# ::struct::set::S_contains --
+#
+#	Determines if the item is in the set.
+#
+# Parameters:
+#	set	-- The set to inspect.
+#	item	-- The element to look for.
+#
+# Results:
+#	A boolean value. True indicates that the element is present.
+#
+# Side effects:
+#       None.
+
+proc ::struct::set::S_contains {set item} {
+    return [expr {[lsearch -exact $set $item] >= 0}]
+}
+
+# ::struct::set::S_union --
+#
+#	Computes the union of the arguments.
+#
+# Parameters:
+#	args	-- List of sets to unify.
+#
+# Results:
+#	The union of the arguments.
+#
+# Side effects:
+#       None.
+
+proc ::struct::set::S_union {args} {
+    switch -exact -- [llength $args] {
+	0 {return {}}
+	1 {return [lindex $args 0]}
+    }
+    foreach setX $args {
+	foreach x $setX {::set ($x) {}}
+    }
+    return [array names {}]
+}
+
+
+# ::struct::set::S_intersect --
+#
+#	Computes the intersection of the arguments.
+#
+# Parameters:
+#	args	-- List of sets to intersect.
+#
+# Results:
+#	The intersection of the arguments
+#
+# Side effects:
+#       None.
+
+proc ::struct::set::S_intersect {args} {
+    switch -exact -- [llength $args] {
+	0 {return {}}
+	1 {return [lindex $args 0]}
+    }
+    ::set res [lindex $args 0]
+    foreach set [lrange $args 1 end] {
+	if {[llength $res] && [llength $set]} {
+	    ::set res [Intersect $res $set]
+	} else {
+	    # Squash 'res'. Otherwise we get the wrong result if res
+	    # is not empty, but 'set' is.
+	    ::set res {}
+	    break
+	}
+    }
+    return $res
+}
+
+proc ::struct::set::Intersect {A B} {
+    if {[llength $A] == 0} {return {}}
+    if {[llength $B] == 0} {return {}}
+
+    # This is slower than local vars, but more robust
+    if {[llength $B] > [llength $A]} {
+	::set res $A
+	::set A $B
+	::set B $res
+    }
+    ::set res {}
+    foreach x $A {::set ($x) {}}
+    foreach x $B {
+	if {[info exists ($x)]} {
+	    lappend res $x
+	}
+    }
+    return $res
+}
+
+# ::struct::set::S_difference --
+#
+#	Compute difference of two sets.
+#
+# Parameters:
+#	A, B	-- Sets to compute the difference for.
+#
+# Results:
+#	A - B
+#
+# Side effects:
+#       None.
+
+proc ::struct::set::S_difference {A B} {
+    if {[llength $A] == 0} {return {}}
+    if {[llength $B] == 0} {return $A}
+
+    array set tmp {}
+    foreach x $A {::set tmp($x) .}
+    foreach x $B {catch {unset tmp($x)}}
+    return [array names tmp]
+}
+
+if {0} {
+    # Tcllib SF Bug 1002143. We cannot use the implementation below.
+    # It will treat set elements containing '(' and ')' as array
+    # elements, and this screws up the storage of elements as the name
+    # of local vars something fierce. No way around this. Disabling
+    # this code and always using the other implementation (s.a.) is
+    # the only possible fix.
+
+    if {[package vcompare [package provide Tcl] 8.4] < 0} {
+	# Tcl 8.[23]. Use explicit array to perform the operation.
+    } else {
+	# Tcl 8.4+, has 'unset -nocomplain'
+
+	proc ::struct::set::S_difference {A B} {
+	    if {[llength $A] == 0} {return {}}
+	    if {[llength $B] == 0} {return $A}
+
+	    # Get the variable B out of the way, avoid collisions
+	    # prepare for "pure list optimization"
+	    ::set ::struct::set::tmp [lreplace $B -1 -1 unset -nocomplain]
+	    unset B
+
+	    # unset A early: no local variables left
+	    foreach [lindex [list $A [unset A]] 0] {.} {break}
+
+	    eval $::struct::set::tmp
+	    return [info locals]
+	}
+    }
+}
+
+# ::struct::set::S_symdiff --
+#
+#	Compute symmetric difference of two sets.
+#
+# Parameters:
+#	A, B	-- The sets to compute the s.difference for.
+#
+# Results:
+#	The symmetric difference of the two input sets.
+#
+# Side effects:
+#       None.
+
+proc ::struct::set::S_symdiff {A B} {
+    # symdiff == (A-B) + (B-A) == (A+B)-(A*B)
+    if {[llength $A] == 0} {return $B}
+    if {[llength $B] == 0} {return $A}
+    return [S_union \
+	    [S_difference $A $B] \
+	    [S_difference $B $A]]
+}
+
+# ::struct::set::S_intersect3 --
+#
+#	Return intersection and differences for two sets.
+#
+# Parameters:
+#	A, B	-- The sets to inspect.
+#
+# Results:
+#	List containing A*B, A-B, and B-A
+#
+# Side effects:
+#       None.
+
+proc ::struct::set::S_intersect3 {A B} {
+    return [list \
+	    [S_intersect $A $B] \
+	    [S_difference $A $B] \
+	    [S_difference $B $A]]
+}
+
+# ::struct::set::S_equal --
+#
+#	Compares two sets for equality.
+#
+# Parameters:
+#	a	First set to compare.
+#	b	Second set to compare.
+#
+# Results:
+#	A boolean. True if the lists are equal.
+#
+# Side effects:
+#       None.
+
+proc ::struct::set::S_equal {A B} {
+    ::set A [Cleanup $A]
+    ::set B [Cleanup $B]
+
+    # Equal if of same cardinality and difference is empty.
+
+    if {[::llength $A] != [::llength $B]} {return 0}
+    return [expr {[llength [S_difference $A $B]] == 0}]
+}
+
+
+proc ::struct::set::Cleanup {A} {
+    # unset A to avoid collisions
+    if {[llength $A] < 2} {return $A}
+    # We cannot use variables to avoid an explicit array. The set
+    # elements may look like namespace vars (i.e. contain ::), and
+    # such elements break that, cannot be proc-local variables.
+    array set S {}
+    foreach item $A {set S($item) .}
+    return [array names S]
+}
+
+# ::struct::set::S_include --
+#
+#	Add an element to a set.
+#
+# Parameters:
+#	Avar	-- Reference to the set variable to extend.
+#	element	-- The item to add to the set.
+#
+# Results:
+#	None.
+#
+# Side effects:
+#       The set in the variable referenced by Avar is extended
+#	by the element (if the element was not already present).
+
+proc ::struct::set::S_include {Avar element} {
+    # Avar = Avar + {element}
+    upvar 1 $Avar A
+    if {![info exists A] || ![S_contains $A $element]} {
+	lappend A $element
+    }
+    return
+}
+
+# ::struct::set::S_exclude --
+#
+#	Remove an element from a set.
+#
+# Parameters:
+#	Avar	-- Reference to the set variable to shrink.
+#	element	-- The item to remove from the set.
+#
+# Results:
+#	None.
+#
+# Side effects:
+#       The set in the variable referenced by Avar is shrunk,
+#	the element remove (if the element was actually present).
+
+proc ::struct::set::S_exclude {Avar element} {
+    # Avar = Avar - {element}
+    upvar 1 $Avar A
+    if {![info exists A]} {return -code error "can't read \"$Avar\": no such variable"}
+    while {[::set pos [lsearch -exact $A $element]] >= 0} {
+	::set A [lreplace [K $A [::set A {}]] $pos $pos]
+    }
+    return
+}
+
+# ::struct::set::S_add --
+#
+#	Add a set to a set. Similar to 'union', but the first argument
+#	is a variable.
+#
+# Parameters:
+#	Avar	-- Reference to the set variable to extend.
+#	B	-- The set to add to the set in Avar.
+#
+# Results:
+#	None.
+#
+# Side effects:
+#       The set in the variable referenced by Avar is extended
+#	by all the elements in B.
+
+proc ::struct::set::S_add {Avar B} {
+    # Avar = Avar + B
+    upvar 1 $Avar A
+    if {![info exists A]} {set A {}}
+    ::set A [S_union [K $A [::set A {}]] $B]
+    return
+}
+
+# ::struct::set::S_subtract --
+#
+#	Remove a set from a set. Similar to 'difference', but the first argument
+#	is a variable.
+#
+# Parameters:
+#	Avar	-- Reference to the set variable to shrink.
+#	B	-- The set to remove from the set in Avar.
+#
+# Results:
+#	None.
+#
+# Side effects:
+#       The set in the variable referenced by Avar is shrunk,
+#	all elements of B are removed.
+
+proc ::struct::set::S_subtract {Avar B} {
+    # Avar = Avar - B
+    upvar 1 $Avar A
+    if {![info exists A]} {return -code error "can't read \"$Avar\": no such variable"}
+    ::set A [S_difference [K $A [::set A {}]] $B]
+    return
+}
+
+# ::struct::set::S_subsetof --
+#
+#	A predicate checking if the first set is a subset
+#	or equal to the second set.
+#
+# Parameters:
+#	A	-- The possible subset.
+#	B	-- The set to compare to.
+#
+# Results:
+#	A boolean value, true if A is subset of or equal to B
+#
+# Side effects:
+#       None.
+
+proc ::struct::set::S_subsetof {A B} {
+    # A subset|== B <=> (A == A*B)
+    return [S_equal $A [S_intersect $A $B]]
+}
+
+# ::struct::set::K --
+# Performance helper command.
+
+proc ::struct::set::K {x y} {::set x}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Put 'set::set' into the general structure namespace
+    # for pickup by the main management.
+
+    namespace import -force set::set_tcl
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/skiplist.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/skiplist.tcl
new file mode 100644
index 00000000..579f0ef3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/skiplist.tcl
@@ -0,0 +1,437 @@
+# skiplist.tcl --
+#
+#	Implementation of a skiplist data structure for Tcl.
+#
+#	To quote the inventor of skip lists, William Pugh:
+#		Skip lists are a probabilistic data structure that seem likely
+#		to supplant balanced trees as the implementation method of
+#		choice for many applications. Skip list algorithms have the
+#		same asymptotic expected time bounds as balanced trees and are
+#		simpler, faster and use less space.
+#
+#	For more details on how skip lists work, see Pugh, William. Skip
+#	lists: a probabilistic alternative to balanced trees in
+#	Communications of the ACM, June 1990, 33(6) 668-676. Also, see
+#	ftp://ftp.cs.umd.edu/pub/skipLists/
+# 
+# Copyright (c) 2000 by Keith Vetter
+# This software is licensed under a BSD license as described in tcl/tk
+# license.txt file but with the copyright held by Keith Vetter.
+#
+# TODO:
+#	customize key comparison to a user supplied routine
+
+namespace eval ::struct {}
+
+namespace eval ::struct::skiplist {
+    # Data storage in the skiplist module
+    # -------------------------------
+    #
+    # For each skiplist, we have the following arrays
+    #   state - holds the current level plus some magic constants
+    #	nodes - all the nodes in the skiplist, including a dummy header node
+    
+    # counter is used to give a unique name for unnamed skiplists
+    variable counter 0
+
+    # Internal constants
+    variable MAXLEVEL 16
+    variable PROB .5
+    variable MAXINT [expr {0x7FFFFFFF}]
+
+    # commands is the list of subcommands recognized by the skiplist
+    variable commands [list \
+	    "destroy"	\
+	    "delete"	\
+	    "insert"	\
+	    "search"	\
+	    "size"	\
+	    "walk"	\
+	    ]
+
+    # State variables that can be set in the instantiation
+    variable vars [list maxlevel probability]
+    
+    # Only export one command, the one used to instantiate a new skiplist
+    namespace export skiplist
+}
+
+# ::struct::skiplist::skiplist --
+#
+#	Create a new skiplist with a given name; if no name is given, use
+#	skiplistX, where X is a number.
+#
+# Arguments:
+#	name	name of the skiplist; if null, generate one.
+#
+# Results:
+#	name	name of the skiplist created
+
+proc ::struct::skiplist::skiplist {{name ""} args} {
+    set usage "skiplist name ?-maxlevel ##? ?-probability ##?"
+    variable counter
+    
+    if { [llength [info level 0]] == 1 } {
+	incr counter
+	set name "skiplist${counter}"
+    }
+
+    if { ![string equal [info commands ::$name] ""] } {
+	error "command \"$name\" already exists, unable to create skiplist"
+    }
+
+    # Handle the optional arguments
+    set more_eval ""
+    for {set i 0} {$i < [llength $args]} {incr i} {
+	set flag [lindex $args $i]
+	incr i
+	if { $i >= [llength $args] } {
+	    error "value for \"$flag\" missing: should be \"$usage\""
+	}
+	set value [lindex $args $i]
+	switch -glob -- $flag {
+	    "-maxl*" {
+		set n [catch {set value [expr $value]}]
+		if {$n || $value <= 0} {
+		    error "value for the maxlevel option must be greater than 0"
+		}
+		append more_eval "; set state(maxlevel) $value"
+	    }
+	    "-prob*" {
+		set n [catch {set value [expr $value]}]
+		if {$n || $value <= 0 || $value >= 1} {
+		    error "probability must be between 0 and 1"
+		}
+		append more_eval "; set state(prob) $value"
+	    }
+	    default {
+		error "unknown option \"$flag\": should be \"$usage\""
+	    }
+	}
+    }
+    
+    # Set up the namespace for this skiplist
+    namespace eval ::struct::skiplist::skiplist$name {
+	variable state
+	variable nodes
+
+	# NB. maxlevel and prob may be overridden by $more_eval at the end
+	set state(maxlevel) $::struct::skiplist::MAXLEVEL
+	set state(prob) $::struct::skiplist::PROB
+	set state(level) 1
+	set state(cnt) 0
+	set state(size) 0
+
+	set nodes(nil,key) $::struct::skiplist::MAXINT
+	set nodes(header,key) "---"
+	set nodes(header,value) "---"
+
+	for {set i 1} {$i < $state(maxlevel)} {incr i} {
+	    set nodes(header,$i) nil
+	}
+    } $more_eval
+
+    # Create the command to manipulate the skiplist
+    interp alias {} ::$name {} ::struct::skiplist::SkiplistProc $name
+
+    return $name
+}
+
+###########################
+# Private functions follow
+
+# ::struct::skiplist::SkiplistProc --
+#
+#	Command that processes all skiplist object commands.
+#
+# Arguments:
+#	name	name of the skiplist object to manipulate.
+#	args	command name and args for the command
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::skiplist::SkiplistProc {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	error "wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+    
+    # Split the args into command and args components
+    if { [llength [info commands ::struct::skiplist::_$cmd]] == 0 } {
+	variable commands
+	set optlist [join $commands ", "]
+	set optlist [linsert $optlist "end-1" "or"]
+	error "bad option \"$cmd\": must be $optlist"
+    }
+    eval [linsert $args 0 ::struct::skiplist::_$cmd $name]
+}
+
+## ::struct::skiplist::_destroy --
+#
+#	Destroy a skiplist, including its associated command and data storage.
+#
+# Arguments:
+#	name	name of the skiplist.
+#
+# Results:
+#	None.
+
+proc ::struct::skiplist::_destroy {name} {
+    namespace delete ::struct::skiplist::skiplist$name
+    interp alias {} ::$name {}
+}
+
+# ::struct::skiplist::_search --
+#
+#	Searches for a key in a skiplist
+#
+# Arguments:
+#	name		name of the skiplist.
+#	key		key for the node to search for
+#
+# Results:
+#	0 if not found
+#	[list 1 node_value] if found
+
+proc ::struct::skiplist::_search {name key} {
+    upvar ::struct::skiplist::skiplist${name}::state state
+    upvar ::struct::skiplist::skiplist${name}::nodes nodes
+
+    set x header
+    for {set i $state(level)} {$i >= 1} {incr i -1} {
+	while {1} {
+	    set fwd $nodes($x,$i)
+	    if {$nodes($fwd,key) == $::struct::skiplist::MAXINT} break
+	    if {$nodes($fwd,key) >= $key} break
+	    set x $fwd
+	}
+    }
+    set x $nodes($x,1)
+    if {$nodes($x,key) == $key} {
+	return [list 1 $nodes($x,value)]
+    }
+    return 0
+}
+
+# ::struct::skiplist::_insert --
+#
+#	Add a node to a skiplist.
+#
+# Arguments:
+#	name		name of the skiplist.
+#	key		key for the node to insert
+#	value		value of the node to insert
+#
+# Results:
+#	0      if new node was created
+#       level  if existing node was updated
+
+proc ::struct::skiplist::_insert {name key value} {
+    upvar ::struct::skiplist::skiplist${name}::state state
+    upvar ::struct::skiplist::skiplist${name}::nodes nodes
+    
+    set x header
+    for {set i $state(level)} {$i >= 1} {incr i -1} {
+	while {1} {
+	    set fwd $nodes($x,$i)
+	    if {$nodes($fwd,key) == $::struct::skiplist::MAXINT} break
+	    if {$nodes($fwd,key) >= $key} break
+	    set x $fwd
+	}
+	set update($i) $x
+    }
+    set x $nodes($x,1)
+
+    # Does the node already exist?
+    if {$nodes($x,key) == $key} {
+	set nodes($x,value) $value
+	return 0
+    }
+
+    # Here to insert item
+    incr state(size)
+    set lvl [randomLevel $state(prob) $state(level) $state(maxlevel)]
+
+    # Did the skip list level increase???
+    if {$lvl > $state(level)} {
+	for {set i [expr {$state(level) + 1}]} {$i <= $lvl} {incr i} {
+	    set update($i) header
+	}
+	set state(level) $lvl
+    }
+
+    # Create a unique new node name and fill in the key, value parts
+    set x [incr state(cnt)] 
+    set nodes($x,key) $key
+    set nodes($x,value) $value
+
+    for {set i 1} {$i <= $lvl} {incr i} {
+	set nodes($x,$i) $nodes($update($i),$i)
+	set nodes($update($i),$i) $x
+    }
+
+    return $lvl
+}
+
+# ::struct::skiplist::_delete --
+#
+#	Deletes a node from a skiplist
+#
+# Arguments:
+#	name		name of the skiplist.
+#	key		key for the node to delete
+#
+# Results:
+#	1 if we deleted a node
+#       0 otherwise
+
+proc ::struct::skiplist::_delete {name key} {
+    upvar ::struct::skiplist::skiplist${name}::state state
+    upvar ::struct::skiplist::skiplist${name}::nodes nodes
+    
+    set x header
+    for {set i $state(level)} {$i >= 1} {incr i -1} {
+	while {1} {
+	    set fwd $nodes($x,$i)
+	    if {$nodes($fwd,key) >= $key} break
+	    set x $fwd
+	}
+	set update($i) $x
+    }
+    set x $nodes($x,1)
+
+    # Did we find a node to delete?
+    if {$nodes($x,key) != $key} {
+	return 0
+    }
+    
+    # Here when we found a node to delete
+    incr state(size) -1
+    
+    # Unlink this node from all the linked lists that include to it
+    for {set i 1} {$i <= $state(level)} {incr i} {
+	set fwd $nodes($update($i),$i)
+	if {$nodes($fwd,key) != $key} break
+	set nodes($update($i),$i) $nodes($x,$i)
+    }
+    
+    # Delete all traces of this node
+    foreach v [array names nodes($x,*)] {
+	unset nodes($v)
+    }
+
+    # Fix up the level in case it went down
+    while {$state(level) > 1} {
+	if {! [string equal "nil" $nodes(header,$state(level))]} break
+	incr state(level) -1
+    }
+
+    return 1
+}
+
+# ::struct::skiplist::_size --
+#
+#	Returns how many nodes are in the skiplist
+#
+# Arguments:
+#	name		name of the skiplist.
+#
+# Results:
+#	number of nodes in the skiplist
+
+proc ::struct::skiplist::_size {name} {
+    upvar ::struct::skiplist::skiplist${name}::state state
+
+    return $state(size)
+}
+
+# ::struct::skiplist::_walk --
+#
+#	Walks a skiplist performing a specified command on each node.
+#	Command is executed at the global level with the actual command
+#	executed is:  command key value
+#
+# Arguments:
+#	name	name of the skiplist.
+#	cmd		command to run on each node
+#
+# Results:
+#	none.
+
+proc ::struct::skiplist::_walk {name cmd} {
+    upvar ::struct::skiplist::skiplist${name}::nodes nodes
+
+    for {set x $nodes(header,1)} {$x != "nil"} {set x $nodes($x,1)} {
+	# Evaluate the command at this node
+	set cmdcpy $cmd
+	lappend cmdcpy $nodes($x,key) $nodes($x,value)
+	uplevel 2 $cmdcpy
+    }
+}
+
+# ::struct::skiplist::randomLevel --
+#
+#	Generates a random level for a new node. We limit it to 1 greater
+#	than the current level. 
+#
+# Arguments:
+#	prob		probability to use in generating level
+#	level		current biggest level
+#	maxlevel	biggest possible level
+#
+# Results:
+#	an integer between 1 and $maxlevel
+
+proc ::struct::skiplist::randomLevel {prob level maxlevel} {
+
+    set lvl 1
+    while {(rand() < $prob) && ($lvl < $maxlevel)} {
+	incr lvl
+    }
+
+    if {$lvl > $level} {
+	set lvl [expr {$level + 1}]
+    }
+    
+    return $lvl
+}
+
+# ::struct::skiplist::_dump --
+#
+#	Dumps out a skip list. Useful for debugging.
+#
+# Arguments:
+#	name	name of the skiplist.
+#
+# Results:
+#	none.
+
+proc ::struct::skiplist::_dump {name} {
+    upvar ::struct::skiplist::skiplist${name}::state state
+    upvar ::struct::skiplist::skiplist${name}::nodes nodes
+
+
+    puts "Current level $state(level)"
+    puts "Maxlevel:     $state(maxlevel)"
+    puts "Probability:  $state(prob)"
+    puts ""
+    puts "NODE    KEY  FORWARD"
+    for {set x header} {$x != "nil"} {set x $nodes($x,1)} {
+	puts -nonewline [format "%-6s  %3s %4s" $x $nodes($x,key) $nodes($x,1)]
+	for {set i 2} {[info exists nodes($x,$i)]} {incr i} {
+	    puts -nonewline [format %4s $nodes($x,$i)]
+	}
+	puts ""
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Get 'skiplist::skiplist' into the general structure namespace.
+    namespace import -force skiplist::skiplist
+    namespace export skiplist
+}
+package provide struct::skiplist 1.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/stack.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/stack.tcl
new file mode 100644
index 00000000..0dcbca2b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/stack.tcl
@@ -0,0 +1,187 @@
+# stack.tcl --
+#
+#	Implementation of a stack data structure for Tcl.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+# Copyright (c) 2008 by Andreas Kupries
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: stack.tcl,v 1.20 2012/11/21 22:36:18 andreas_kupries Exp $
+
+# @mdgen EXCLUDE: stack_c.tcl
+
+package require Tcl 8.4
+namespace eval ::struct::stack {}
+
+# ### ### ### ######### ######### #########
+## Management of stack implementations.
+
+# ::struct::stack::LoadAccelerator --
+#
+#	Loads a named implementation, if possible.
+#
+# Arguments:
+#	key	Name of the implementation to load.
+#
+# Results:
+#	A boolean flag. True if the implementation
+#	was successfully loaded; and False otherwise.
+
+proc ::struct::stack::LoadAccelerator {key} {
+    variable accel
+    set r 0
+    switch -exact -- $key {
+	critcl {
+	    # Critcl implementation of stack requires Tcl 8.4.
+	    if {![package vsatisfies [package provide Tcl] 8.4]} {return 0}
+	    if {[catch {package require tcllibc}]} {return 0}
+	    set r [llength [info commands ::struct::stack_critcl]]
+	}
+	tcl {
+	    variable selfdir
+	    if {
+		[package vsatisfies [package provide Tcl] 8.5] &&
+		![catch {package require TclOO 0.6.1-} mx]
+	    } {
+		source [file join $selfdir stack_oo.tcl]
+	    } else {
+		source [file join $selfdir stack_tcl.tcl]
+	    }
+	    set r 1
+	}
+        default {
+            return -code error "invalid accelerator/impl. package $key:\
+                must be one of [join [KnownImplementations] {, }]"
+        }
+    }
+    set accel($key) $r
+    return $r
+}
+
+# ::struct::stack::SwitchTo --
+#
+#	Activates a loaded named implementation.
+#
+# Arguments:
+#	key	Name of the implementation to activate.
+#
+# Results:
+#	None.
+
+proc ::struct::stack::SwitchTo {key} {
+    variable accel
+    variable loaded
+
+    if {[string equal $key $loaded]} {
+	# No change, nothing to do.
+	return
+    } elseif {![string equal $key ""]} {
+	# Validate the target implementation of the switch.
+
+	if {![info exists accel($key)]} {
+	    return -code error "Unable to activate unknown implementation \"$key\""
+	} elseif {![info exists accel($key)] || !$accel($key)} {
+	    return -code error "Unable to activate missing implementation \"$key\""
+	}
+    }
+
+    # Deactivate the previous implementation, if there was any.
+
+    if {![string equal $loaded ""]} {
+	rename ::struct::stack ::struct::stack_$loaded
+    }
+
+    # Activate the new implementation, if there is any.
+
+    if {![string equal $key ""]} {
+	rename ::struct::stack_$key ::struct::stack
+    }
+
+    # Remember the active implementation, for deactivation by future
+    # switches.
+
+    set loaded $key
+    return
+}
+
+# ::struct::stack::Implementations --
+#
+#	Determines which implementations are
+#	present, i.e. loaded.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys.
+
+proc ::struct::stack::Implementations {} {
+    variable accel
+    set res {}
+    foreach n [array names accel] {
+	if {!$accel($n)} continue
+	lappend res $n
+    }
+    return $res
+}
+
+# ::struct::stack::KnownImplementations --
+#
+#	Determines which implementations are known
+#	as possible implementations.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys. In the order
+#	of preference, most prefered first.
+
+proc ::struct::stack::KnownImplementations {} {
+    return {critcl tcl}
+}
+
+proc ::struct::stack::Names {} {
+    return {
+	critcl {tcllibc based}
+	tcl    {pure Tcl}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Data structures.
+
+namespace eval ::struct::stack {
+    variable  selfdir [file dirname [info script]]
+    variable  accel
+    array set accel   {tcl 0 critcl 0}
+    variable  loaded  {}
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Choose an implementation,
+## most prefered first. Loads only one of the
+## possible implementations. And activates it.
+
+namespace eval ::struct::stack {
+    variable e
+    foreach e [KnownImplementations] {
+	if {[LoadAccelerator $e]} {
+	    SwitchTo $e
+	    break
+	}
+    }
+    unset e
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Export the constructor command.
+    namespace export stack
+}
+
+package provide struct::stack 1.5.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/stack_c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/stack_c.tcl
new file mode 100644
index 00000000..8345d80c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/stack_c.tcl
@@ -0,0 +1,156 @@
+# stackc.tcl --
+#
+#       Implementation of a stack data structure for Tcl.
+#       This code based on critcl, API compatible to the PTI [x].
+#       [x] Pure Tcl Implementation.
+#
+# Copyright (c) 2008 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: stack_c.tcl,v 1.1 2008/06/19 23:03:35 andreas_kupries Exp $
+
+package require critcl
+# @sak notprovided struct_stackc
+package provide struct_stackc 1.3.1
+package require Tcl 8.4
+
+namespace eval ::struct {
+    # Supporting code for the main command.
+
+    catch {
+	#critcl::cheaders -g
+	#critcl::debug memory symbols
+    }
+
+    critcl::cheaders stack/*.h
+    critcl::csources stack/*.c
+
+    critcl::ccode {
+	/* -*- c -*- */
+
+	#include <util.h>
+	#include <s.h>
+	#include <ms.h>
+	#include <m.h>
+
+	/* .................................................. */
+	/* Global stack management, per interp
+	*/
+
+	typedef struct SDg {
+	    long int counter;
+	    char buf [50];
+	} SDg;
+
+	static void
+	SDgrelease (ClientData cd, Tcl_Interp* interp)
+	{
+	    ckfree((char*) cd);
+	}
+
+	static CONST char*
+	SDnewName (Tcl_Interp* interp)
+	{
+#define KEY "tcllib/struct::stack/critcl"
+
+	    Tcl_InterpDeleteProc* proc = SDgrelease;
+	    SDg*                  sdg;
+
+	    sdg = Tcl_GetAssocData (interp, KEY, &proc);
+	    if (sdg  == NULL) {
+		sdg = (SDg*) ckalloc (sizeof (SDg));
+		sdg->counter = 0;
+
+		Tcl_SetAssocData (interp, KEY, proc,
+				  (ClientData) sdg);
+	    }
+	    
+	    sdg->counter ++;
+	    sprintf (sdg->buf, "stack%ld", sdg->counter);
+	    return sdg->buf;
+
+#undef  KEY
+	}
+
+	static void
+	SDdeleteCmd (ClientData clientData)
+	{
+	    /* Release the whole stack. */
+	    st_delete ((S*) clientData);
+	}
+    }
+
+    # Main command, stack creation.
+
+    critcl::ccommand stack_critcl {dummy interp objc objv} {
+      /* Syntax
+       *  - epsilon                         |1
+       *  - name                            |2
+       */
+
+      CONST char* name;
+      S*          sd;
+      Tcl_Obj*    fqn;
+      Tcl_CmdInfo ci;
+
+#define USAGE "?name?"
+
+      if ((objc != 2) && (objc != 1)) {
+        Tcl_WrongNumArgs (interp, 1, objv, USAGE);
+        return TCL_ERROR;
+      }
+
+      if (objc < 2) {
+        name = SDnewName (interp);
+      } else {
+        name = Tcl_GetString (objv [1]);
+      }
+
+      if (!Tcl_StringMatch (name, "::*")) {
+        /* Relative name. Prefix with current namespace */
+
+        Tcl_Eval (interp, "namespace current");
+        fqn = Tcl_GetObjResult (interp);
+        fqn = Tcl_DuplicateObj (fqn);
+        Tcl_IncrRefCount (fqn);
+
+        if (!Tcl_StringMatch (Tcl_GetString (fqn), "::")) {
+          Tcl_AppendToObj (fqn, "::", -1);
+        }
+        Tcl_AppendToObj (fqn, name, -1);
+      } else {
+        fqn = Tcl_NewStringObj (name, -1);
+        Tcl_IncrRefCount (fqn);
+      }
+      Tcl_ResetResult (interp);
+
+      if (Tcl_GetCommandInfo (interp,
+                              Tcl_GetString (fqn),
+                              &ci)) {
+        Tcl_Obj* err;
+
+        err = Tcl_NewObj ();
+        Tcl_AppendToObj    (err, "command \"", -1);
+        Tcl_AppendObjToObj (err, fqn);
+        Tcl_AppendToObj    (err, "\" already exists, unable to create stack", -1);
+
+        Tcl_DecrRefCount (fqn);
+        Tcl_SetObjResult (interp, err);
+        return TCL_ERROR;
+      }
+
+      sd = st_new();
+      sd->cmd = Tcl_CreateObjCommand (interp, Tcl_GetString (fqn),
+				      stms_objcmd, (ClientData) sd,
+				      SDdeleteCmd);
+
+      Tcl_SetObjResult (interp, fqn);
+      Tcl_DecrRefCount (fqn);
+      return TCL_OK;
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/stack_oo.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/stack_oo.tcl
new file mode 100644
index 00000000..f7520c15
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/stack_oo.tcl
@@ -0,0 +1,296 @@
+# stack.tcl --
+#
+#	Stack implementation for Tcl 8.6+, or 8.5 + TclOO
+#
+# Copyright (c) 2010 Andreas Kupries
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: stack_oo.tcl,v 1.4 2010/09/10 17:31:04 andreas_kupries Exp $
+
+package require Tcl   8.5
+package require TclOO 0.6.1- ; # This includes 1 and higher.
+
+# Cleanup first
+catch {namespace delete ::struct::stack::stack_oo}
+catch {rename           ::struct::stack::stack_oo {}}
+
+oo::class create ::struct::stack::stack_oo {
+
+    variable mystack
+
+    constructor {} {
+	set mystack {}
+	return
+    }
+
+    # clear --
+    #
+    #	Clear a stack.
+    #
+    # Results:
+    #	None.
+
+    method clear {} {
+	set mystack {}
+	return
+    }
+
+    # get --
+    #
+    #	Retrieve the whole contents of the stack.
+    #
+    # Results:
+    #	items	list of all items in the stack.
+
+    method get {} {
+	return [lreverse $mystack]
+    }
+
+    method getr {} {
+	return $mystack
+    }
+
+    # peek --
+    #
+    #	Retrieve the value of an item on the stack without popping it.
+    #
+    # Arguments:
+    #	count	number of items to pop; defaults to 1
+    #
+    # Results:
+    #	items	top count items from the stack; if there are not enough items
+    #		to fulfill the request, throws an error.
+
+    method peek {{count 1}} {
+	if { $count < 1 } {
+	    return -code error "invalid item count $count"
+	} elseif { $count > [llength $mystack] } {
+	    return -code error "insufficient items on stack to fill request"
+	}
+
+	if { $count == 1 } {
+	    # Handle this as a special case, so single item peeks are not
+	    # listified
+	    return [lindex $mystack end]
+	}
+
+	# Otherwise, return a list of items
+	incr count -1
+	return [lreverse [lrange $mystack end-$count end]]
+    }
+
+    method peekr {{count 1}} {
+	if { $count < 1 } {
+	    return -code error "invalid item count $count"
+	} elseif { $count > [llength $mystack] } {
+	    return -code error "insufficient items on stack to fill request"
+	}
+
+	if { $count == 1 } {
+	    # Handle this as a special case, so single item peeks are not
+	    # listified
+	    return [lindex $mystack end]
+	}
+
+	# Otherwise, return a list of items, in reversed order.
+	incr count -1
+	return [lrange $mystack end-$count end]
+    }
+
+    # trim --
+    #
+    #	Pop items off a stack until a maximum size is reached.
+    #
+    # Arguments:
+    #	count	requested size of the stack.
+    #
+    # Results:
+    #	item	List of items trimmed, may be empty.
+
+    method trim {newsize} {
+	if { ![string is integer -strict $newsize]} {
+	    return -code error "expected integer but got \"$newsize\""
+	} elseif { $newsize < 0 } {
+	    return -code error "invalid size $newsize"
+	} elseif { $newsize >= [llength $mystack] } {
+	    # Stack is smaller than requested, do nothing.
+	    return {}
+	}
+
+	# newsize < [llength $mystack]
+	# pop '[llength $mystack]' - newsize elements.
+
+	if {!$newsize} {
+	    set result [lreverse [my K $mystack [unset mystack]]]
+	    set mystack {}
+	} else {
+	    set result  [lreverse [lrange $mystack $newsize end]]
+	    set mystack [lreplace [my K $mystack [unset mystack]] $newsize end]
+	}
+
+	return $result
+    }
+
+    method trim* {newsize} {
+	if { ![string is integer -strict $newsize]} {
+	    return -code error "expected integer but got \"$newsize\""
+	} elseif { $newsize < 0 } {
+	    return -code error "invalid size $newsize"
+	}
+
+	if { $newsize >= [llength $mystack] } {
+	    # Stack is smaller than requested, do nothing.
+	    return
+	}
+
+	# newsize < [llength $mystack]
+	# pop '[llength $mystack]' - newsize elements.
+
+	# No results, compared to trim. 
+
+	if {!$newsize} {
+	    set mystack {}
+	} else {
+	    set mystack [lreplace [my K $mystack [unset mystack]] $newsize end]
+	}
+
+	return
+    }
+
+    # pop --
+    #
+    #	Pop an item off a stack.
+    #
+    # Arguments:
+    #	count	number of items to pop; defaults to 1
+    #
+    # Results:
+    #	item	top count items from the stack; if the stack is empty, 
+    #		returns a list of count nulls.
+
+    method pop {{count 1}} {
+	if { $count < 1 } {
+	    return -code error "invalid item count $count"
+	}
+
+	set ssize [llength $mystack]
+
+	if { $count > $ssize } {
+	    return -code error "insufficient items on stack to fill request"
+	}
+
+	if { $count == 1 } {
+	    # Handle this as a special case, so single item pops are not
+	    # listified
+	    set item [lindex $mystack end]
+	    if {$count == $ssize} {
+		set mystack [list]
+	    } else {
+		set mystack [lreplace [my K $mystack [unset mystack]] end end]
+	    }
+	    return $item
+	}
+
+	# Otherwise, return a list of items, and remove the items from the
+	# stack.
+	if {$count == $ssize} {
+	    set result  [lreverse [my K $mystack [unset mystack]]]
+	    set mystack [list]
+	} else {
+	    incr count -1
+	    set result  [lreverse [lrange $mystack end-$count end]]
+	    set mystack [lreplace [my K $mystack [unset mystack]] end-$count end]
+	}
+	return $result
+    }
+
+    # push --
+    #
+    #	Push an item onto a stack.
+    #
+    # Arguments:
+    #	args	items to push.
+    #
+    # Results:
+    #	None.
+
+    method push {args} {
+	if {![llength $args]} {
+	    return -code error "wrong # args: should be \"[self] push item ?item ...?\""
+	}
+
+	lappend mystack {*}$args
+	return
+    }
+
+    # rotate --
+    #
+    #	Rotate the top count number of items by step number of steps.
+    #
+    # Arguments:
+    #	count	number of items to rotate.
+    #	steps	number of steps to rotate.
+    #
+    # Results:
+    #	None.
+
+    method rotate {count steps} {
+	set len [llength $mystack]
+	if { $count > $len } {
+	    return -code error "insufficient items on stack to fill request"
+	}
+
+	# Rotation algorithm:
+	# do
+	#   Find the insertion point in the stack
+	#   Move the end item to the insertion point
+	# repeat $steps times
+
+	set start [expr {$len - $count}]
+	set steps [expr {$steps % $count}]
+
+	if {$steps == 0} return
+
+	for {set i 0} {$i < $steps} {incr i} {
+	    set item [lindex $mystack end]
+	    set mystack [linsert \
+			     [lreplace \
+				  [my K $mystack [unset mystack]] \
+				  end end] $start $item]
+	}
+	return
+    }
+
+    # size --
+    #
+    #	Return the number of objects on a stack.
+    #
+    # Results:
+    #	count	number of items on the stack.
+
+    method size {} {
+	return [llength $mystack]
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method K {x y} { set x }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Get 'stack::stack' into the general structure namespace for
+    # pickup by the main management.
+
+    proc stack_tcl {args} {
+	if {[llength $args]} {
+	    uplevel 1 [::list ::struct::stack::stack_oo create {*}$args]
+	} else {
+	    uplevel 1 [::list ::struct::stack::stack_oo new]
+	}
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/stack_tcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/stack_tcl.tcl
new file mode 100644
index 00000000..a11f6355
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/stack_tcl.tcl
@@ -0,0 +1,505 @@
+# stack.tcl --
+#
+#	Stack implementation for Tcl.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: stack_tcl.tcl,v 1.3 2010/03/15 17:17:38 andreas_kupries Exp $
+
+namespace eval ::struct::stack {
+    # counter is used to give a unique name for unnamed stacks
+    variable counter 0
+
+    # Only export one command, the one used to instantiate a new stack
+    namespace export stack_tcl
+}
+
+# ::struct::stack::stack_tcl --
+#
+#	Create a new stack with a given name; if no name is given, use
+#	stackX, where X is a number.
+#
+# Arguments:
+#	name	name of the stack; if null, generate one.
+#
+# Results:
+#	name	name of the stack created
+
+proc ::struct::stack::stack_tcl {args} {
+    variable I::stacks
+    variable counter
+    
+    switch -exact -- [llength [info level 0]] {
+	1 {
+	    # Missing name, generate one.
+	    incr counter
+	    set name "stack${counter}"
+	}
+	2 {
+	    # Standard call. New empty stack.
+	    set name [lindex $args 0]
+	}
+	default {
+	    # Error.
+	    return -code error \
+		    "wrong # args: should be \"stack ?name?\""
+	}
+    }
+
+    # FIRST, qualify the name.
+    if {![string match "::*" $name]} {
+        # Get caller's namespace; append :: if not global namespace.
+        set ns [uplevel 1 [list namespace current]]
+        if {"::" != $ns} {
+            append ns "::"
+        }
+
+        set name "$ns$name"
+    }
+    if {[llength [info commands $name]]} {
+	return -code error \
+		"command \"$name\" already exists, unable to create stack"
+    }
+
+    set stacks($name) [list ]
+
+    # Create the command to manipulate the stack
+    interp alias {} $name {} ::struct::stack::StackProc $name
+
+    return $name
+}
+
+##########################
+# Private functions follow
+
+# ::struct::stack::StackProc --
+#
+#	Command that processes all stack object commands.
+#
+# Arguments:
+#	name	name of the stack object to manipulate.
+#	args	command name and args for the command
+#
+# Results:
+#	Varies based on command to perform
+
+if {[package vsatisfies [package provide Tcl] 8.5]} {
+    # In 8.5+ we can do an ensemble for fast dispatch.
+
+    proc ::struct::stack::StackProc {name cmd args} {
+	# Shuffle method to front and then simply run the ensemble.
+	# Dispatch, argument checking, and error message generation
+	# are all done in the C-level.
+
+	I $cmd $name {*}$args
+    }
+
+    namespace eval ::struct::stack::I {
+	namespace export clear destroy get getr peek peekr \
+	    trim trim* pop push rotate size
+	namespace ensemble create
+    }
+
+} else {
+    # Before 8.5 we have to code our own dispatch, including error
+    # checking.
+
+    proc ::struct::stack::StackProc {name cmd args} {
+	# Do minimal args checks here
+	if { [llength [info level 0]] == 2 } {
+	    return -code error "wrong # args: should be \"$name option ?arg arg ...?\""
+	}
+
+	# Split the args into command and args components
+	if {![llength [info commands ::struct::stack::I::$cmd]]} {
+	    set optlist [lsort [info commands ::struct::stack::I::*]]
+	    set xlist {}
+	    foreach p $optlist {
+		set p [namespace tail $p]
+		if {($p eq "K") || ($p eq "lreverse")} continue
+		lappend xlist $p
+	    }
+	    set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	    return -code error \
+		"bad option \"$cmd\": must be $optlist"
+	}
+
+	uplevel 1 [linsert $args 0 ::struct::stack::I::$cmd $name]
+    }
+}
+
+# ### ### ### ######### ######### #########
+
+namespace eval ::struct::stack::I {
+    # The stacks array holds all of the stacks you've made
+    variable stacks
+}
+
+# ### ### ### ######### ######### #########
+
+# ::struct::stack::I::clear --
+#
+#	Clear a stack.
+#
+# Arguments:
+#	name	name of the stack object.
+#
+# Results:
+#	None.
+
+proc ::struct::stack::I::clear {name} {
+    variable stacks
+    set stacks($name) {}
+    return
+}
+
+# ::struct::stack::I::destroy --
+#
+#	Destroy a stack object by removing it's storage space and 
+#	eliminating it's proc.
+#
+# Arguments:
+#	name	name of the stack object.
+#
+# Results:
+#	None.
+
+proc ::struct::stack::I::destroy {name} {
+    variable stacks
+    unset stacks($name)
+    interp alias {} $name {}
+    return
+}
+
+# ::struct::stack::I::get --
+#
+#	Retrieve the whole contents of the stack.
+#
+# Arguments:
+#	name	name of the stack object.
+#
+# Results:
+#	items	list of all items in the stack.
+
+proc ::struct::stack::I::get {name} {
+    variable stacks
+    return [lreverse $stacks($name)]
+}
+
+proc ::struct::stack::I::getr {name} {
+    variable stacks
+    return $stacks($name)
+}
+
+# ::struct::stack::I::peek --
+#
+#	Retrieve the value of an item on the stack without popping it.
+#
+# Arguments:
+#	name	name of the stack object.
+#	count	number of items to pop; defaults to 1
+#
+# Results:
+#	items	top count items from the stack; if there are not enough items
+#		to fulfill the request, throws an error.
+
+proc ::struct::stack::I::peek {name {count 1}} {
+    variable stacks
+    upvar 0  stacks($name) mystack
+
+    if { $count < 1 } {
+	return -code error "invalid item count $count"
+    } elseif { $count > [llength $mystack] } {
+	return -code error "insufficient items on stack to fill request"
+    }
+
+    if { $count == 1 } {
+	# Handle this as a special case, so single item peeks are not
+	# listified
+	return [lindex $mystack end]
+    }
+
+    # Otherwise, return a list of items
+    incr count -1
+    return [lreverse [lrange $mystack end-$count end]]
+}
+
+proc ::struct::stack::I::peekr {name {count 1}} {
+    variable stacks
+    upvar 0  stacks($name) mystack
+
+    if { $count < 1 } {
+	return -code error "invalid item count $count"
+    } elseif { $count > [llength $mystack] } {
+	return -code error "insufficient items on stack to fill request"
+    }
+
+    if { $count == 1 } {
+	# Handle this as a special case, so single item peeks are not
+	# listified
+	return [lindex $mystack end]
+    }
+
+    # Otherwise, return a list of items, in reversed order.
+    incr count -1
+    return [lrange $mystack end-$count end]
+}
+
+# ::struct::stack::I::trim --
+#
+#	Pop items off a stack until a maximum size is reached.
+#
+# Arguments:
+#	name	name of the stack object.
+#	count	requested size of the stack.
+#
+# Results:
+#	item	List of items trimmed, may be empty.
+
+proc ::struct::stack::I::trim {name newsize} {
+    variable stacks
+    upvar 0  stacks($name) mystack
+
+    if { ![string is integer -strict $newsize]} {
+	return -code error "expected integer but got \"$newsize\""
+    } elseif { $newsize < 0 } {
+	return -code error "invalid size $newsize"
+    } elseif { $newsize >= [llength $mystack] } {
+	# Stack is smaller than requested, do nothing.
+	return {}
+    }
+
+    # newsize < [llength $mystack]
+    # pop '[llength $mystack]' - newsize elements.
+
+    if {!$newsize} {
+	set result [lreverse [K $mystack [unset mystack]]]
+	set mystack {}
+    } else {
+	set result  [lreverse [lrange $mystack $newsize end]]
+	set mystack [lreplace [K $mystack [unset mystack]] $newsize end]
+    }
+
+    return $result
+}
+
+proc ::struct::stack::I::trim* {name newsize} {
+    if { ![string is integer -strict $newsize]} {
+	return -code error "expected integer but got \"$newsize\""
+    } elseif { $newsize < 0 } {
+	return -code error "invalid size $newsize"
+    }
+
+    variable stacks
+    upvar 0  stacks($name) mystack
+
+    if { $newsize >= [llength $mystack] } {
+	# Stack is smaller than requested, do nothing.
+	return
+    }
+
+    # newsize < [llength $mystack]
+    # pop '[llength $mystack]' - newsize elements.
+
+    # No results, compared to trim. 
+
+    if {!$newsize} {
+	set mystack {}
+    } else {
+	set mystack [lreplace [K $mystack [unset mystack]] $newsize end]
+    }
+
+    return
+}
+
+# ::struct::stack::I::pop --
+#
+#	Pop an item off a stack.
+#
+# Arguments:
+#	name	name of the stack object.
+#	count	number of items to pop; defaults to 1
+#
+# Results:
+#	item	top count items from the stack; if the stack is empty, 
+#		returns a list of count nulls.
+
+proc ::struct::stack::I::pop {name {count 1}} {
+    variable stacks
+    upvar 0  stacks($name) mystack
+
+    if { $count < 1 } {
+	return -code error "invalid item count $count"
+    }
+    set ssize [llength $mystack]
+    if { $count > $ssize } {
+	return -code error "insufficient items on stack to fill request"
+    }
+
+    if { $count == 1 } {
+	# Handle this as a special case, so single item pops are not
+	# listified
+	set item [lindex $mystack end]
+	if {$count == $ssize} {
+	    set mystack [list]
+	} else {
+	    set mystack [lreplace [K $mystack [unset mystack]] end end]
+	}
+	return $item
+    }
+
+    # Otherwise, return a list of items, and remove the items from the
+    # stack.
+    if {$count == $ssize} {
+	set result  [lreverse [K $mystack [unset mystack]]]
+	set mystack [list]
+    } else {
+	incr count -1
+	set result  [lreverse [lrange $mystack end-$count end]]
+	set mystack [lreplace [K $mystack [unset mystack]] end-$count end]
+    }
+    return $result
+
+    # -------------------------------------------------------
+
+    set newsize [expr {[llength $mystack] - $count}]
+
+    if {!$newsize} {
+	set result [lreverse [K $mystack [unset mystack]]]
+	set mystack {}
+    } else {
+	set result  [lreverse [lrange $mystack $newsize end]]
+	set mystack [lreplace [K $mystack [unset mystack]] $newsize end]
+    }
+
+    if {$count == 1} {
+	set result [lindex $result 0]
+    }
+
+    return $result
+}
+
+# ::struct::stack::I::push --
+#
+#	Push an item onto a stack.
+#
+# Arguments:
+#	name	name of the stack object
+#	args	items to push.
+#
+# Results:
+#	None.
+
+if {[package vsatisfies [package provide Tcl] 8.5]} {
+
+    proc ::struct::stack::I::push {name args} {
+	if {![llength $args]} {
+	    return -code error "wrong # args: should be \"$name push item ?item ...?\""
+	}
+
+	variable stacks
+	upvar 0  stacks($name) mystack
+
+	lappend mystack {*}$args
+	return
+    }
+} else {
+    proc ::struct::stack::I::push {name args} {
+	if {![llength $args]} {
+	    return -code error "wrong # args: should be \"$name push item ?item ...?\""
+	}
+
+	variable stacks
+	upvar 0  stacks($name) mystack
+
+	if {[llength $args] == 1} {
+	    lappend mystack [lindex $args 0]
+	} else {
+	    eval [linsert $args 0 lappend mystack]
+	}
+	return
+    }
+}
+
+# ::struct::stack::I::rotate --
+#
+#	Rotate the top count number of items by step number of steps.
+#
+# Arguments:
+#	name	name of the stack object.
+#	count	number of items to rotate.
+#	steps	number of steps to rotate.
+#
+# Results:
+#	None.
+
+proc ::struct::stack::I::rotate {name count steps} {
+    variable stacks
+    upvar 0  stacks($name) mystack
+    set len [llength $mystack]
+    if { $count > $len } {
+	return -code error "insufficient items on stack to fill request"
+    }
+
+    # Rotation algorithm:
+    # do
+    #   Find the insertion point in the stack
+    #   Move the end item to the insertion point
+    # repeat $steps times
+
+    set start [expr {$len - $count}]
+    set steps [expr {$steps % $count}]
+
+    if {$steps == 0} return
+
+    for {set i 0} {$i < $steps} {incr i} {
+	set item [lindex $mystack end]
+	set mystack [linsert \
+			 [lreplace \
+			      [K $mystack [unset mystack]] \
+			      end end] $start $item]
+    }
+    return
+}
+
+# ::struct::stack::I::size --
+#
+#	Return the number of objects on a stack.
+#
+# Arguments:
+#	name	name of the stack object.
+#
+# Results:
+#	count	number of items on the stack.
+
+proc ::struct::stack::I::size {name} {
+    variable stacks
+    return [llength $stacks($name)]
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::struct::stack::I::K {x y} { set x }
+
+if {![llength [info commands lreverse]]} {
+    proc ::struct::stack::I::lreverse {x} {
+	# assert (llength(x) > 1)
+	set l [llength $x]
+	if {$l <= 1} { return $x }
+	set r [list]
+	while {$l} { lappend r [lindex $x [incr l -1]] }
+	return $r
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Get 'stack::stack' into the general structure namespace for
+    # pickup by the main management.
+    namespace import -force stack::stack_tcl
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/struct.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/struct.tcl
new file mode 100644
index 00000000..c909472b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/struct.tcl
@@ -0,0 +1,18 @@
+package require Tcl 8.2
+package require struct::graph     2.0
+package require struct::queue     1.2.1
+package require struct::stack     1.2.1
+package require struct::tree      2.0
+package require struct::matrix    2.0
+package require struct::pool      1.2.1
+package require struct::record    1.2.1
+package require struct::list      1.4
+package require struct::set       2.1
+package require struct::prioqueue 1.3
+package require struct::skiplist  1.3
+
+namespace eval ::struct {
+    namespace export *
+}
+
+package provide struct 2.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/struct1.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/struct1.tcl
new file mode 100644
index 00000000..7ff3e392
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/struct1.tcl
@@ -0,0 +1,17 @@
+package require Tcl 8.2
+package require struct::graph     1.2.1
+package require struct::queue     1.2.1
+package require struct::stack     1.2.1
+package require struct::tree      1.2.1
+package require struct::matrix    1.2.1
+package require struct::pool      1.2.1
+package require struct::record    1.2.1
+package require struct::list      1.4
+package require struct::prioqueue 1.3
+package require struct::skiplist  1.3
+
+namespace eval ::struct {
+    namespace export *
+}
+
+package provide struct 1.4
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/tree.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/tree.tcl
new file mode 100644
index 00000000..d3430f44
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/tree.tcl
@@ -0,0 +1,183 @@
+# tree.tcl --
+#
+#	Implementation of a tree data structure for Tcl.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: tree.tcl,v 1.45 2009/06/22 18:21:59 andreas_kupries Exp $
+
+# @mdgen EXCLUDE: tree_c.tcl
+
+package require Tcl 8.2
+package require struct::list
+
+namespace eval ::struct::tree {}
+
+# ### ### ### ######### ######### #########
+## Management of tree implementations.
+
+# ::struct::tree::LoadAccelerator --
+#
+#	Loads a named implementation, if possible.
+#
+# Arguments:
+#	key	Name of the implementation to load.
+#
+# Results:
+#	A boolean flag. True if the implementation
+#	was successfully loaded; and False otherwise.
+
+proc ::struct::tree::LoadAccelerator {key} {
+    variable accel
+    set r 0
+    switch -exact -- $key {
+	critcl {
+	    # Critcl implementation of tree requires Tcl 8.4.
+	    if {![package vsatisfies [package provide Tcl] 8.4]} {return 0}
+	    if {[catch {package require tcllibc}]} {return 0}
+	    set r [llength [info commands ::struct::tree_critcl]]
+	}
+	tcl {
+	    variable selfdir
+	    source [file join $selfdir tree_tcl.tcl]
+	    set r 1
+	}
+        default {
+            return -code error "invalid accelerator/impl. package $key:\
+                must be one of [join [KnownImplementations] {, }]"
+        }
+    }
+    set accel($key) $r
+    return $r
+}
+
+# ::struct::tree::SwitchTo --
+#
+#	Activates a loaded named implementation.
+#
+# Arguments:
+#	key	Name of the implementation to activate.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::SwitchTo {key} {
+    variable accel
+    variable loaded
+
+    if {[string equal $key $loaded]} {
+	# No change, nothing to do.
+	return
+    } elseif {![string equal $key ""]} {
+	# Validate the target implementation of the switch.
+
+	if {![info exists accel($key)]} {
+	    return -code error "Unable to activate unknown implementation \"$key\""
+	} elseif {![info exists accel($key)] || !$accel($key)} {
+	    return -code error "Unable to activate missing implementation \"$key\""
+	}
+    }
+
+    # Deactivate the previous implementation, if there was any.
+
+    if {![string equal $loaded ""]} {
+	rename ::struct::tree        ::struct::tree_$loaded
+	rename ::struct::tree::prune ::struct::tree::prune_$loaded
+    }
+
+    # Activate the new implementation, if there is any.
+
+    if {![string equal $key ""]} {
+	rename ::struct::tree_$key        ::struct::tree
+	rename ::struct::tree::prune_$key ::struct::tree::prune
+    }
+
+    # Remember the active implementation, for deactivation by future
+    # switches.
+
+    set loaded $key
+    return
+}
+
+# ::struct::tree::Implementations --
+#
+#	Determines which implementations are
+#	present, i.e. loaded.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys.
+
+proc ::struct::tree::Implementations {} {
+    variable accel
+    set res {}
+    foreach n [array names accel] {
+	if {!$accel($n)} continue
+	lappend res $n
+    }
+    return $res
+}
+
+# ::struct::tree::KnownImplementations --
+#
+#	Determines which implementations are known
+#	as possible implementations.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	A list of implementation keys. In the order
+#	of preference, most prefered first.
+
+proc ::struct::tree::KnownImplementations {} {
+    return {critcl tcl}
+}
+
+proc ::struct::tree::Names {} {
+    return {
+	critcl {tcllibc based}
+	tcl    {pure Tcl}
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Data structures.
+
+namespace eval ::struct::tree {
+    variable  selfdir [file dirname [info script]]
+    variable  accel
+    array set accel   {tcl 0 critcl 0}
+    variable  loaded  {}
+}
+
+# ### ### ### ######### ######### #########
+## Initialization: Choose an implementation,
+## most prefered first. Loads only one of the
+## possible implementations. And activates it.
+
+namespace eval ::struct::tree {
+    variable e
+    foreach e [KnownImplementations] {
+	if {[LoadAccelerator $e]} {
+	    SwitchTo $e
+	    break
+	}
+    }
+    unset e
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Export the constructor command.
+    namespace export tree
+}
+
+package provide struct::tree 2.1.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/tree1.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/tree1.tcl
new file mode 100644
index 00000000..726396e9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/tree1.tcl
@@ -0,0 +1,1485 @@
+# tree.tcl --
+#
+#	Implementation of a tree data structure for Tcl.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: tree1.tcl,v 1.5 2005/10/04 17:15:05 andreas_kupries Exp $
+
+package require Tcl 8.2
+
+namespace eval ::struct {}
+
+namespace eval ::struct::tree {
+    # Data storage in the tree module
+    # -------------------------------
+    #
+    # There's a lot of bits to keep track of for each tree:
+    #	nodes
+    #	node values
+    #	node relationships
+    #
+    # It would quickly become unwieldy to try to keep these in arrays or lists
+    # within the tree namespace itself.  Instead, each tree structure will get
+    # its own namespace.  Each namespace contains:
+    #	children	array mapping nodes to their children list
+    #	parent		array mapping nodes to their parent node
+    #	node:$node	array mapping keys to values for the node $node
+
+    # counter is used to give a unique name for unnamed trees
+    variable counter 0
+
+    # Only export one command, the one used to instantiate a new tree
+    namespace export tree
+}
+
+# ::struct::tree::tree --
+#
+#	Create a new tree with a given name; if no name is given, use
+#	treeX, where X is a number.
+#
+# Arguments:
+#	name	Optional name of the tree; if null or not given, generate one.
+#
+# Results:
+#	name	Name of the tree created
+
+proc ::struct::tree::tree {{name ""}} {
+    variable counter
+
+    if {[llength [info level 0]] == 1} {
+	incr counter
+	set name "tree${counter}"
+    }
+    # FIRST, qualify the name.
+    if {![string match "::*" $name]} {
+        # Get caller's namespace; append :: if not global namespace.
+        set ns [uplevel 1 namespace current]
+        if {"::" != $ns} {
+            append ns "::"
+        }
+
+        set name "$ns$name"
+    }
+    if {[llength [info commands $name]]} {
+	return -code error \
+		"command \"$name\" already exists, unable to create tree"
+    }
+
+    # Set up the namespace for the object,
+    # identical to the object command.
+    namespace eval $name {
+	# Set up root node's child list
+	variable children
+	set      children(root) [list]
+
+	# Set root node's parent
+	variable parent
+	set      parent(root) [list]
+
+	# Set up the node attribute mapping
+	variable  attribute
+	array set attribute {}
+
+	# Set up a counter for use in creating unique node names
+	variable nextUnusedNode
+	set      nextUnusedNode 1
+
+	# Set up a counter for use in creating node attribute arrays.
+	variable nextAttr
+	set      nextAttr 0
+    }
+
+    # Create the command to manipulate the tree
+    interp alias {} ::$name {} ::struct::tree::TreeProc $name
+
+    return $name
+}
+
+##########################
+# Private functions follow
+
+# ::struct::tree::TreeProc --
+#
+#	Command that processes all tree object commands.
+#
+# Arguments:
+#	name	Name of the tree object to manipulate.
+#	cmd	Subcommand to invoke.
+#	args	Arguments for subcommand.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::tree::TreeProc {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error "wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+    set sub _$cmd
+    if { [llength [info commands ::struct::tree::$sub]] == 0 } {
+	set optlist [lsort [info commands ::struct::tree::_*]]
+	set xlist {}
+	foreach p $optlist {
+	    set p [namespace tail $p]
+	    lappend xlist [string range $p 1 end]
+	}
+	set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	return -code error \
+		"bad option \"$cmd\": must be $optlist"
+    }
+    return [uplevel 1 [linsert $args 0 ::struct::tree::$sub $name]]
+}
+
+# ::struct::tree::_children --
+#
+#	Return the child list for a given node of a tree.
+#
+# Arguments:
+#	name	Name of the tree object.
+#	node	Node to look up.
+#
+# Results:
+#	children	List of children for the node.
+
+proc ::struct::tree::_children {name node} {
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::children
+    return $children($node)
+}
+
+# ::struct::tree::_cut --
+#
+#	Destroys the specified node of a tree, but not its children.
+#	These children are made into children of the parent of the
+#	destroyed node at the index of the destroyed node.
+#
+# Arguments:
+#	name	Name of the tree object.
+#	node	Node to look up and cut.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_cut {name node} {
+    if { [string equal $node "root"] } {
+	# Can't delete the special root node
+	return -code error "cannot cut root node"
+    }
+
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::parent
+    variable ${name}::children
+
+    # Locate our parent, children and our location in the parent
+    set parentNode $parent($node)
+    set childNodes $children($node)
+
+    set index [lsearch -exact $children($parentNode) $node]
+
+    # Excise this node from the parent list,
+    set newChildren [lreplace $children($parentNode) $index $index]
+
+    # Put each of the children of $node into the parent's children list,
+    # in the place of $node, and update the parent pointer of those nodes.
+    foreach child $childNodes {
+	set newChildren [linsert $newChildren $index $child]
+	set parent($child) $parentNode
+	incr index
+    }
+    set children($parentNode) $newChildren
+
+    KillNode $name $node
+    return
+}
+
+# ::struct::tree::_delete --
+#
+#	Remove a node from a tree, including all of its values.  Recursively
+#	removes the node's children.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to delete.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_delete {name node} {
+    if { [string equal $node "root"] } {
+	# Can't delete the special root node
+	return -code error "cannot delete root node"
+    }
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::children
+    variable ${name}::parent
+
+    # Remove this node from its parent's children list
+    set parentNode $parent($node)
+    set index [lsearch -exact $children($parentNode) $node]
+    set children($parentNode) [lreplace $children($parentNode) $index $index]
+
+    # Yes, we could use the stack structure implemented in ::struct::stack,
+    # but it's slower than inlining it.  Since we don't need a sophisticated
+    # stack, don't bother.
+    set st [list]
+    foreach child $children($node) {
+	lappend st $child
+    }
+
+    KillNode $name $node
+
+    while { [llength $st] > 0 } {
+	set node [lindex   $st end]
+	set st   [lreplace $st end end]
+	foreach child $children($node) {
+	    lappend st $child
+	}
+
+	KillNode $name $node
+    }
+    return
+}
+
+# ::struct::tree::_depth --
+#
+#	Return the depth (distance from the root node) of a given node.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to find.
+#
+# Results:
+#	depth	Number of steps from node to the root node.
+
+proc ::struct::tree::_depth {name node} {
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+    variable ${name}::parent
+    set depth 0
+    while { ![string equal $node "root"] } {
+	incr depth
+	set node $parent($node)
+    }
+    return $depth
+}
+
+# ::struct::tree::_destroy --
+#
+#	Destroy a tree, including its associated command and data storage.
+#
+# Arguments:
+#	name	Name of the tree to destroy.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_destroy {name} {
+    namespace delete $name
+    interp alias {} ::$name {}
+}
+
+# ::struct::tree::_exists --
+#
+#	Test for existance of a given node in a tree.
+#
+# Arguments:
+#	name	Name of the tree to query.
+#	node	Node to look for.
+#
+# Results:
+#	1 if the node exists, 0 else.
+
+proc ::struct::tree::_exists {name node} {
+    return [info exists ${name}::parent($node)]
+}
+
+# ::struct::tree::_get --
+#
+#	Get a keyed value from a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to query.
+#	flag	Optional flag specifier; if present, must be "-key".
+#	key	Optional key to lookup; defaults to data.
+#
+# Results:
+#	value	Value associated with the key given.
+
+proc ::struct::tree::_get {name node {flag -key} {key data}} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# No attribute data for this node,
+	# except for the default key 'data'.
+
+	if {[string equal $key data]} {
+	    return ""
+	}
+	return -code error "invalid key \"$key\" for node \"$node\""
+    }
+
+    upvar ${name}::$attribute($node) data
+    if {![info exists data($key)]} {
+	return -code error "invalid key \"$key\" for node \"$node\""
+    }
+    return $data($key)
+}
+
+# ::struct::tree::_getall --
+#
+#	Get a serialized list of key/value pairs from a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to query.
+#
+# Results:
+#	value	A serialized list of key/value pairs.
+
+proc ::struct::tree::_getall {name node args} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+    if {[llength $args]} {
+	return -code error "wrong # args: should be \"$name getall $node\""
+    }
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# Only default key is present, invisibly.
+	return {data {}}
+    }
+
+    upvar ${name}::$attribute($node) data
+    return [array get data]
+}
+
+# ::struct::tree::_keys --
+#
+#	Get a list of keys from a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to query.
+#
+# Results:
+#	value	A serialized list of key/value pairs.
+
+proc ::struct::tree::_keys {name node args} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+    if {[llength $args]} {
+	return -code error "wrong # args: should be \"$name keys $node\""
+    }
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# No attribute data for this node,
+	# except for the default key 'data'.
+	return {data}
+    }
+
+    upvar ${name}::$attribute($node) data
+    return [array names data]
+}
+
+# ::struct::tree::_keyexists --
+#
+#	Test for existance of a given key for a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to query.
+#	flag	Optional flag specifier; if present, must be "-key".
+#	key	Optional key to lookup; defaults to data.
+#
+# Results:
+#	1 if the key exists, 0 else.
+
+proc ::struct::tree::_keyexists {name node {flag -key} {key data}} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+    if {![string equal $flag "-key"]} {
+	return -code error "invalid option \"$flag\": should be -key"
+    }
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# No attribute data for this node,
+	# except for the default key 'data'.
+
+	return [string equal $key data]
+    }
+
+    upvar ${name}::$attribute($node) data
+    return [info exists data($key)]
+}
+
+# ::struct::tree::_index --
+#
+#	Determine the index of node with in its parent's list of children.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to look up.
+#
+# Results:
+#	index	The index of the node in its parent
+
+proc ::struct::tree::_index {name node} {
+    if { [string equal $node "root"] } {
+	# The special root node has no parent, thus no index in it either.
+	return -code error "cannot determine index of root node"
+    }
+
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::children
+    variable ${name}::parent
+
+    # Locate the parent and ourself in its list of children
+    set parentNode $parent($node)
+
+    return [lsearch -exact $children($parentNode) $node]
+}
+
+# ::struct::tree::_insert --
+#
+#	Add a node to a tree; if the node(s) specified already exist, they
+#	will be moved to the given location.
+#
+# Arguments:
+#	name		Name of the tree.
+#	parentNode	Parent to add the node to.
+#	index		Index at which to insert.
+#	args		Node(s) to insert.  If none is given, the routine
+#			will insert a single node with a unique name.
+#
+# Results:
+#	nodes		List of nodes inserted.
+
+proc ::struct::tree::_insert {name parentNode index args} {
+    if { [llength $args] == 0 } {
+	# No node name was given; generate a unique one
+	set args [list [GenerateUniqueNodeName $name]]
+    }
+    if { ![_exists $name $parentNode] } {
+	return -code error "parent node \"$parentNode\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::parent
+    variable ${name}::children
+
+    # Make sure the index is numeric
+    if { ![string is integer $index] } {
+	# If the index is not numeric, make it numeric by lsearch'ing for
+	# the value at index, then incrementing index (because "end" means
+	# just past the end for inserts)
+	set val [lindex $children($parentNode) $index]
+	set index [expr {[lsearch -exact $children($parentNode) $val] + 1}]
+    }
+
+    foreach node $args {
+	if {[_exists $name $node] } {
+	    # Move the node to its new home
+	    if { [string equal $node "root"] } {
+		return -code error "cannot move root node"
+	    }
+	
+	    # Cannot make a node its own descendant (I'm my own grandpaw...)
+	    set ancestor $parentNode
+	    while { ![string equal $ancestor "root"] } {
+		if { [string equal $ancestor $node] } {
+		    return -code error "node \"$node\" cannot be its own descendant"
+		}
+		set ancestor $parent($ancestor)
+	    }
+	    # Remove this node from its parent's children list
+	    set oldParent $parent($node)
+	    set ind [lsearch -exact $children($oldParent) $node]
+	    set children($oldParent) [lreplace $children($oldParent) $ind $ind]
+	
+	    # If the node is moving within its parent, and its old location
+	    # was before the new location, decrement the new location, so that
+	    # it gets put in the right spot
+	    if { [string equal $oldParent $parentNode] && $ind < $index } {
+		incr index -1
+	    }
+	} else {
+	    # Set up the new node
+	    set children($node) [list]
+	}
+
+	# Add this node to its parent's children list
+	set children($parentNode) [linsert $children($parentNode) $index $node]
+
+	# Update the parent pointer for this node
+	set parent($node) $parentNode
+	incr index
+    }
+
+    return $args
+}
+
+# ::struct::tree::_isleaf --
+#
+#	Return whether the given node of a tree is a leaf or not.
+#
+# Arguments:
+#	name	Name of the tree object.
+#	node	Node to look up.
+#
+# Results:
+#	isleaf	True if the node is a leaf; false otherwise.
+
+proc ::struct::tree::_isleaf {name node} {
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::children
+    return [expr {[llength $children($node)] == 0}]
+}
+
+# ::struct::tree::_move --
+#
+#	Move a node (and all its subnodes) from where ever it is to a new
+#	location in the tree.
+#
+# Arguments:
+#	name		Name of the tree
+#	parentNode	Parent to add the node to.
+#	index		Index at which to insert.
+#	node		Node to move; the node must exist in the tree.
+#	args		Additional nodes to move; these nodes must exist
+#			in the tree.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_move {name parentNode index node args} {
+    set args [linsert $args 0 $node]
+
+    # Can only move a node to a real location in the tree
+    if { ![_exists $name $parentNode] } {
+	return -code error "parent node \"$parentNode\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::parent
+    variable ${name}::children
+
+    # Make sure the index is numeric
+    if { ![string is integer $index] } {
+	# If the index is not numeric, make it numeric by lsearch'ing for
+	# the value at index, then incrementing index (because "end" means
+	# just past the end for inserts)
+	set val [lindex $children($parentNode) $index]
+	set index [expr {[lsearch -exact $children($parentNode) $val] + 1}]
+    }
+
+    # Validate all nodes to move before trying to move any.
+    foreach node $args {
+	if { [string equal $node "root"] } {
+	    return -code error "cannot move root node"
+	}
+
+	# Can only move real nodes
+	if { ![_exists $name $node] } {
+	    return -code error "node \"$node\" does not exist in tree \"$name\""
+	}
+
+	# Cannot move a node to be a descendant of itself
+	set ancestor $parentNode
+	while { ![string equal $ancestor "root"] } {
+	    if { [string equal $ancestor $node] } {
+		return -code error "node \"$node\" cannot be its own descendant"
+	    }
+	    set ancestor $parent($ancestor)
+	}
+    }
+
+    # Remove all nodes from their current parent's children list
+    foreach node $args {
+	set oldParent $parent($node)
+	set ind [lsearch -exact $children($oldParent) $node]
+
+	set children($oldParent) [lreplace $children($oldParent) $ind $ind]
+
+	# Update the nodes parent value
+	set parent($node) $parentNode
+    }
+
+    # Add all nodes to their new parent's children list
+    set children($parentNode) \
+	[eval [list linsert $children($parentNode) $index] $args]
+
+    return
+}
+
+# ::struct::tree::_next --
+#
+#	Return the right sibling for a given node of a tree.
+#
+# Arguments:
+#	name		Name of the tree object.
+#	node		Node to retrieve right sibling for.
+#
+# Results:
+#	sibling		The right sibling for the node, or null if node was
+#			the rightmost child of its parent.
+
+proc ::struct::tree::_next {name node} {
+    # The 'root' has no siblings.
+    if { [string equal $node "root"] } {
+	return {}
+    }
+
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    # Locate the parent and our place in its list of children.
+    variable ${name}::parent
+    variable ${name}::children
+
+    set parentNode $parent($node)
+    set  index [lsearch -exact $children($parentNode) $node]
+
+    # Go to the node to the right and return its name.
+    return [lindex $children($parentNode) [incr index]]
+}
+
+# ::struct::tree::_numchildren --
+#
+#	Return the number of immediate children for a given node of a tree.
+#
+# Arguments:
+#	name		Name of the tree object.
+#	node		Node to look up.
+#
+# Results:
+#	numchildren	Number of immediate children for the node.
+
+proc ::struct::tree::_numchildren {name node} {
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::children
+    return [llength $children($node)]
+}
+
+# ::struct::tree::_parent --
+#
+#	Return the name of the parent node of a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to look up.
+#
+# Results:
+#	parent	Parent of node $node
+
+proc ::struct::tree::_parent {name node} {
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+    # FRINK: nocheck
+    return [set ${name}::parent($node)]
+}
+
+# ::struct::tree::_previous --
+#
+#	Return the left sibling for a given node of a tree.
+#
+# Arguments:
+#	name		Name of the tree object.
+#	node		Node to look up.
+#
+# Results:
+#	sibling		The left sibling for the node, or null if node was
+#			the leftmost child of its parent.
+
+proc ::struct::tree::_previous {name node} {
+    # The 'root' has no siblings.
+    if { [string equal $node "root"] } {
+	return {}
+    }
+
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    # Locate the parent and our place in its list of children.
+    variable ${name}::parent
+    variable ${name}::children
+
+    set parentNode $parent($node)
+    set  index [lsearch -exact $children($parentNode) $node]
+
+    # Go to the node to the right and return its name.
+    return [lindex $children($parentNode) [incr index -1]]
+}
+
+# ::struct::tree::_serialize --
+#
+#	Serialize a tree object (partially) into a transportable value.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Root node of the serialized tree.
+#
+# Results:
+#	A list structure describing the part of the tree which was serialized.
+
+proc ::struct::tree::_serialize {name {node root}} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+    Serialize $name $node tree attr
+    return [list $tree [array get attr]]
+}
+
+# ::struct::tree::_set --
+#
+#	Set or get a value for a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to modify or query.
+#	args	Optional arguments specifying a key and a value.  Format is
+#			?-key key? ?value?
+#		If no key is specified, the key "data" is used.
+#
+# Results:
+#	val	Value associated with the given key of the given node
+
+proc ::struct::tree::_set {name node args} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+    if {[llength $args] > 3} {
+	return -code error "wrong # args: should be \"$name set [list $node] ?-key key?\
+		?value?\""
+    }
+
+    # Process the arguments ...
+
+    set key "data"
+    set haveValue 0
+    if {[llength $args] > 1} {
+	foreach {flag key} $args break
+	if {![string match "${flag}*" "-key"]} {
+	    return -code error "invalid option \"$flag\": should be key"
+	}
+	if {[llength $args] == 3} {
+	    set haveValue 1
+	    set value [lindex $args end]
+	}
+    } elseif {[llength $args] == 1} {
+	set haveValue 1
+	set value [lindex $args end]
+    }
+
+    if {$haveValue} {
+	# Setting a value. This may have to create
+	# the attribute array for this particular
+	# node
+
+	variable ${name}::attribute
+	if {![info exists attribute($node)]} {
+	    # No attribute data for this node,
+	    # so create it as we need it.
+	    GenAttributeStorage $name $node
+	}
+	upvar ${name}::$attribute($node) data
+
+	return [set data($key) $value]
+    } else {
+	# Getting a value
+
+	return [_get $name $node -key $key]
+    }
+}
+
+# ::struct::tree::_append --
+#
+#	Append a value for a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to modify or query.
+#	args	Optional arguments specifying a key and a value.  Format is
+#			?-key key? ?value?
+#		If no key is specified, the key "data" is used.
+#
+# Results:
+#	val	Value associated with the given key of the given node
+
+proc ::struct::tree::_append {name node args} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+    if {
+	([llength $args] != 1) &&
+	([llength $args] != 3)
+    } {
+	return -code error "wrong # args: should be \"$name set [list $node] ?-key key?\
+		value\""
+    }
+    if {[llength $args] == 3} {
+	foreach {flag key} $args break
+	if {![string equal $flag "-key"]} {
+	    return -code error "invalid option \"$flag\": should be -key"
+	}
+    } else {
+	set key "data"
+    }
+
+    set value [lindex $args end]
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# No attribute data for this node,
+	# so create it as we need it.
+	GenAttributeStorage $name $node
+    }
+    upvar ${name}::$attribute($node) data
+
+    return [append data($key) $value]
+}
+
+# ::struct::tree::_lappend --
+#
+#	lappend a value for a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to modify or query.
+#	args	Optional arguments specifying a key and a value.  Format is
+#			?-key key? ?value?
+#		If no key is specified, the key "data" is used.
+#
+# Results:
+#	val	Value associated with the given key of the given node
+
+proc ::struct::tree::_lappend {name node args} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+    if {
+	([llength $args] != 1) &&
+	([llength $args] != 3)
+    } {
+	return -code error "wrong # args: should be \"$name lappend [list $node] ?-key key?\
+		value\""
+    }
+    if {[llength $args] == 3} {
+	foreach {flag key} $args break
+	if {![string equal $flag "-key"]} {
+	    return -code error "invalid option \"$flag\": should be -key"
+	}
+    } else {
+	set key "data"
+    }
+
+    set value [lindex $args end]
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# No attribute data for this node,
+	# so create it as we need it.
+	GenAttributeStorage $name $node
+    }
+    upvar ${name}::$attribute($node) data
+
+    return [lappend data($key) $value]
+}
+
+# ::struct::tree::_size --
+#
+#	Return the number of descendants of a given node.  The default node
+#	is the special root node.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Optional node to start counting from (default is root).
+#
+# Results:
+#	size	Number of descendants of the node.
+
+proc ::struct::tree::_size {name {node root}} {
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    # If the node is the root, we can do the cheap thing and just count the
+    # number of nodes (excluding the root node) that we have in the tree with
+    # array names
+    if { [string equal $node "root"] } {
+	set size [llength [array names ${name}::parent]]
+	return [expr {$size - 1}]
+    }
+
+    # Otherwise we have to do it the hard way and do a full tree search
+    variable ${name}::children
+    set size 0
+    set st [list ]
+    foreach child $children($node) {
+	lappend st $child
+    }
+    while { [llength $st] > 0 } {
+	set node [lindex $st end]
+	set st [lreplace $st end end]
+	incr size
+	foreach child $children($node) {
+	    lappend st $child
+	}
+    }
+    return $size
+}
+
+# ::struct::tree::_splice --
+#
+#	Add a node to a tree, making a range of children from the given
+#	parent children of the new node.
+#
+# Arguments:
+#	name		Name of the tree.
+#	parentNode	Parent to add the node to.
+#	from		Index at which to insert.
+#	to		Optional end of the range of children to replace.
+#			Defaults to 'end'.
+#	node		Optional node name; if given, must be unique.  If not
+#			given, a unique name will be generated.
+#
+# Results:
+#	node		Name of the node added to the tree.
+
+proc ::struct::tree::_splice {name parentNode from {to end} args} {
+    if { [llength $args] == 0 } {
+	# No node name given; generate a unique node name
+	set node [GenerateUniqueNodeName $name]
+    } else {
+	set node [lindex $args 0]
+    }
+
+    if { [_exists $name $node] } {
+	return -code error "node \"$node\" already exists in tree \"$name\""
+    }
+
+    variable ${name}::children
+    variable ${name}::parent
+
+    # Save the list of children that are moving
+    set moveChildren [lrange $children($parentNode) $from $to]
+
+    # Remove those children from the parent
+    set children($parentNode) [lreplace $children($parentNode) $from $to]
+
+    # Add the new node
+    _insert $name $parentNode $from $node
+
+    # Move the children
+    set children($node) $moveChildren
+    foreach child $moveChildren {
+	set parent($child) $node
+    }
+
+    return $node
+}
+
+# ::struct::tree::_swap --
+#
+#	Swap two nodes in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node1	First node to swap.
+#	node2	Second node to swap.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_swap {name node1 node2} {
+    # Can't swap the magic root node
+    if {[string equal $node1 "root"] || [string equal $node2 "root"]} {
+	return -code error "cannot swap root node"
+    }
+
+    # Can only swap two real nodes
+    if {![_exists $name $node1]} {
+	return -code error "node \"$node1\" does not exist in tree \"$name\""
+    }
+    if {![_exists $name $node2]} {
+	return -code error "node \"$node2\" does not exist in tree \"$name\""
+    }
+
+    # Can't swap a node with itself
+    if {[string equal $node1 $node2]} {
+	return -code error "cannot swap node \"$node1\" with itself"
+    }
+
+    # Swapping nodes means swapping their labels and values
+    variable ${name}::children
+    variable ${name}::parent
+
+    set parent1 $parent($node1)
+    set parent2 $parent($node2)
+
+    # Replace node1 with node2 in node1's parent's children list, and
+    # node2 with node1 in node2's parent's children list
+    set i1 [lsearch -exact $children($parent1) $node1]
+    set i2 [lsearch -exact $children($parent2) $node2]
+
+    set children($parent1) [lreplace $children($parent1) $i1 $i1 $node2]
+    set children($parent2) [lreplace $children($parent2) $i2 $i2 $node1]
+
+    # Make node1 the parent of node2's children, and vis versa
+    foreach child $children($node2) {
+	set parent($child) $node1
+    }
+    foreach child $children($node1) {
+	set parent($child) $node2
+    }
+
+    # Swap the children lists
+    set children1 $children($node1)
+    set children($node1) $children($node2)
+    set children($node2) $children1
+
+    if { [string equal $node1 $parent2] } {
+	set parent($node1) $node2
+	set parent($node2) $parent1
+    } elseif { [string equal $node2 $parent1] } {
+	set parent($node1) $parent2
+	set parent($node2) $node1
+    } else {
+	set parent($node1) $parent2
+	set parent($node2) $parent1
+    }
+
+    # Swap the values
+    # More complicated now with the possibility that nodes do not have
+    # attribute storage associated with them.
+
+    variable ${name}::attribute
+
+    if {
+	[set ia [info exists attribute($node1)]] ||
+	[set ib [info exists attribute($node2)]]
+    } {
+	# At least one of the nodes has attribute data. We simply swap
+	# the references to the arrays containing them. No need to
+	# copy the actual data around.
+
+	if {$ia && $ib} {
+	    set tmp               $attribute($node1)
+	    set attribute($node1) $attribute($node2)
+	    set attribute($node2) $tmp
+	} elseif {$ia} {
+	    set   attribute($node2) $attribute($node1)
+	    unset attribute($node1)
+	} elseif {$ib} {
+	    set   attribute($node1) $attribute($node2)
+	    unset attribute($node2)
+	} else {
+	    return -code error "Impossible condition."
+	}
+    } ; # else: No attribute storage => Nothing to do {}
+
+    return
+}
+
+# ::struct::tree::_unset --
+#
+#	Remove a keyed value from a node.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to modify.
+#	args	Optional additional args specifying which key to unset;
+#		if given, must be of the form "-key key".  If not given,
+#		the key "data" is unset.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_unset {name node {flag -key} {key data}} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+    if {![string match "${flag}*" "-key"]} {
+	return -code error "invalid option \"$flag\": should be \"$name unset\
+		[list $node] ?-key key?\""
+    }
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# No attribute data for this node,
+	# except for the default key 'data'.
+	GenAttributeStorage $name $node
+    }
+    upvar ${name}::$attribute($node) data
+
+    catch {unset data($key)}
+    return
+}
+
+# ::struct::tree::_walk --
+#
+#	Walk a tree using a pre-order depth or breadth first
+#	search. Pre-order DFS is the default.  At each node that is visited,
+#	a command will be called with the name of the tree and the node.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node at which to start.
+#	args	Optional additional arguments specifying the type and order of
+#		the tree walk, and the command to execute at each node.
+#		Format is
+#		    ?-type {bfs|dfs}? ?-order {pre|post|in|both}? -command cmd
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_walk {name node args} {
+    set usage "$name walk $node ?-type {bfs|dfs}? ?-order {pre|post|in|both}? -command cmd"
+
+    if {[llength $args] > 6 || [llength $args] < 2} {
+	return -code error "wrong # args: should be \"$usage\""
+    }
+
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    # Set defaults
+    set type dfs
+    set order pre
+    set cmd ""
+
+    for {set i 0} {$i < [llength $args]} {incr i} {
+	set flag [lindex $args $i]
+	incr i
+	if { $i >= [llength $args] } {
+	    return -code error "value for \"$flag\" missing: should be \"$usage\""
+	}
+	switch -glob -- $flag {
+	    "-type" {
+		set type [string tolower [lindex $args $i]]
+	    }
+	    "-order" {
+		set order [string tolower [lindex $args $i]]
+	    }
+	    "-command" {
+		set cmd [lindex $args $i]
+	    }
+	    default {
+		return -code error "unknown option \"$flag\": should be \"$usage\""
+	    }
+	}
+    }
+
+    # Make sure we have a command to run, otherwise what's the point?
+    if { [string equal $cmd ""] } {
+	return -code error "no command specified: should be \"$usage\""
+    }
+
+    # Validate that the given type is good
+    switch -exact -- $type {
+	"dfs" - "bfs" {
+	    set type $type
+	}
+	default {
+	    return -code error "invalid search type \"$type\": should be dfs, or bfs"
+	}
+    }
+
+    # Validate that the given order is good
+    switch -exact -- $order {
+	"pre" - "post" - "in" - "both" {
+	    set order $order
+	}
+	default {
+	    return -code error "invalid search order \"$order\":\
+		    should be pre, post, both, or in"
+	}
+    }
+
+    if {[string equal $order "in"] && [string equal $type "bfs"]} {
+	return -code error "unable to do a ${order}-order breadth first walk"
+    }
+
+    # Do the walk
+    variable ${name}::children
+    set st [list ]
+    lappend st $node
+
+    # Compute some flags for the possible places of command evaluation
+    set leave [expr {[string equal $order post] || [string equal $order both]}]
+    set enter [expr {[string equal $order pre]  || [string equal $order both]}]
+    set touch [string equal $order in]
+
+    if {$leave} {
+	set lvlabel leave
+    } elseif {$touch} {
+	# in-order does not provide a sense
+	# of nesting for the parent, hence
+	# no enter/leave, just 'visit'.
+	set lvlabel visit
+    }
+
+    if { [string equal $type "dfs"] } {
+	# Depth-first walk, several orders of visiting nodes
+	# (pre, post, both, in)
+
+	array set visited {}
+
+	while { [llength $st] > 0 } {
+	    set node [lindex $st end]
+
+	    if {[info exists visited($node)]} {
+		# Second time we are looking at this 'node'.
+		# Pop it, then evaluate the command (post, both, in).
+
+		set st [lreplace $st end end]
+
+		if {$leave || $touch} {
+		    # Evaluate the command at this node
+		    WalkCall $name $node $lvlabel $cmd
+		}
+	    } else {
+		# First visit of this 'node'.
+		# Do *not* pop it from the stack so that we are able
+		# to visit again after its children
+
+		# Remember it.
+		set visited($node) .
+
+		if {$enter} {
+		    # Evaluate the command at this node (pre, both)
+		    WalkCall $name $node "enter" $cmd
+		}
+
+		# Add the children of this node to the stack.
+		# The exact behaviour depends on the chosen
+		# order. For pre, post, both-order we just
+		# have to add them in reverse-order so that
+		# they will be popped left-to-right. For in-order
+		# we have rearrange the stack so that the parent
+		# is revisited immediately after the first child.
+		# (but only if there is ore than one child,)
+
+		set clist        $children($node)
+		set len [llength $clist]
+
+		if {$touch && ($len > 1)} {
+		    # Pop node from stack, insert into list of children
+		    set st    [lreplace $st end end]
+		    set clist [linsert $clist 1 $node]
+		    incr len
+		}
+
+		for {set i [expr {$len - 1}]} {$i >= 0} {incr i -1} {
+		    lappend st [lindex $clist $i]
+		}
+	    }
+	}
+    } else {
+	# Breadth first walk (pre, post, both)
+	# No in-order possible. Already captured.
+
+	if {$leave} {
+	    set backward $st
+	}
+
+	while { [llength $st] > 0 } {
+	    set node [lindex   $st 0]
+	    set st   [lreplace $st 0 0]
+
+	    if {$enter} {
+		# Evaluate the command at this node
+		WalkCall $name $node "enter" $cmd
+	    }
+
+	    # Add this node's children
+	    # And create a mirrored version in case of post/both order.
+
+	    foreach child $children($node) {
+		lappend st $child
+		if {$leave} {
+		    set backward [linsert $backward 0 $child]
+		}
+	    }
+	}
+
+	if {$leave} {
+	    foreach node $backward {
+		# Evaluate the command at this node
+		WalkCall $name $node "leave" $cmd
+	    }
+	}
+    }
+    return
+}
+
+# ::struct::tree::WalkCall --
+#
+#	Helper command to 'walk' handling the evaluation
+#	of the user-specified command. Information about
+#	the tree, node and current action are substituted
+#	into the command before it evaluation.
+#
+# Arguments:
+#	tree	Tree we are walking
+#	node	Node we are at.
+#	action	The current action.
+#	cmd	The command to call, already partially substituted.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::WalkCall {tree node action cmd} {
+    set subs [list %n [list $node] %a [list $action] %t [list $tree] %% %]
+    uplevel 2 [string map $subs $cmd]
+    return
+}
+
+# ::struct::tree::GenerateUniqueNodeName --
+#
+#	Generate a unique node name for the given tree.
+#
+# Arguments:
+#	name	Name of the tree to generate a unique node name for.
+#
+# Results:
+#	node	Name of a node guaranteed to not exist in the tree.
+
+proc ::struct::tree::GenerateUniqueNodeName {name} {
+    variable ${name}::nextUnusedNode
+    while {[_exists $name "node${nextUnusedNode}"]} {
+	incr nextUnusedNode
+    }
+    return "node${nextUnusedNode}"
+}
+
+# ::struct::tree::KillNode --
+#
+#	Delete all data of a node.
+#
+# Arguments:
+#	name	Name of the tree containing the node
+#	node	Name of the node to delete.
+#
+# Results:
+#	none
+
+proc ::struct::tree::KillNode {name node} {
+    variable ${name}::parent
+    variable ${name}::children
+    variable ${name}::attribute
+
+    # Remove all record of $node
+    unset parent($node)
+    unset children($node)
+
+    if {[info exists attribute($node)]} {
+	# FRINK: nocheck
+	unset ${name}::$attribute($node)
+	unset attribute($node)
+    }
+    return
+}
+
+# ::struct::tree::GenAttributeStorage --
+#
+#	Create an array to store the attrributes of a node in.
+#
+# Arguments:
+#	name	Name of the tree containing the node
+#	node	Name of the node which got attributes.
+#
+# Results:
+#	none
+
+proc ::struct::tree::GenAttributeStorage {name node} {
+    variable ${name}::nextAttr
+    variable ${name}::attribute
+
+    set   attr "a[incr nextAttr]"
+    set   attribute($node) $attr
+    upvar ${name}::$attr data
+    set   data(data) ""
+    return
+}
+
+# ::struct::tree::Serialize --
+#
+#	Serialize a tree object (partially) into a transportable value.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Root node of the serialized tree.
+#
+# Results:
+#	None
+
+proc ::struct::tree::Serialize {name node tvar avar} {
+    upvar 1 $tvar tree $avar attr
+
+    variable ${name}::children
+    variable ${name}::attribute
+
+    # Store attribute data
+    if {[info exists attribute($node)]} {
+	set attr($node) [array get ${name}::$attribute($node)]
+    } else {
+	set attr($node) {}
+    }
+
+    # Build tree structure as nested list.
+
+    set subtrees [list]
+    foreach c $children($node) {
+	Serialize $name $c sub attr
+	lappend subtrees $sub
+    }
+
+    set tree [list $node $subtrees]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Get 'tree::tree' into the general structure namespace.
+    namespace import -force tree::tree
+    namespace export tree
+}
+package provide struct::tree 1.2.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/tree_c.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/tree_c.tcl
new file mode 100644
index 00000000..d8f112a8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/tree_c.tcl
@@ -0,0 +1,208 @@
+# treec.tcl --
+#
+#       Implementation of a tree data structure for Tcl.
+#       This code based on critcl, API compatible to the PTI [x].
+#       [x] Pure Tcl Implementation.
+#
+# Copyright (c) 2005 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: tree_c.tcl,v 1.6 2008/03/25 07:15:34 andreas_kupries Exp $
+
+package require critcl
+# @sak notprovided struct_treec
+package provide struct_treec 2.1.1
+package require Tcl 8.2
+
+namespace eval ::struct {
+    # Supporting code for the main command.
+
+    catch {
+	#critcl::cheaders -g
+	#critcl::debug memory symbols
+    }
+
+    critcl::cheaders tree/*.h
+    critcl::csources tree/*.c
+
+    critcl::ccode {
+	/* -*- c -*- */
+
+	#include <util.h>
+	#include <t.h>
+	#include <tn.h>
+	#include <ms.h>
+	#include <m.h>
+
+	/* .................................................. */
+	/* Global tree management, per interp
+	*/
+
+	typedef struct TDg {
+	    long int counter;
+	    char buf [50];
+	} TDg;
+
+	static void
+	TDgrelease (ClientData cd, Tcl_Interp* interp)
+	{
+	    ckfree((char*) cd);
+	}
+
+	static CONST char*
+	TDnewName (Tcl_Interp* interp)
+	{
+#define KEY "tcllib/struct::tree/critcl"
+
+	    Tcl_InterpDeleteProc* proc = TDgrelease;
+	    TDg*                  tdg;
+
+	    tdg = Tcl_GetAssocData (interp, KEY, &proc);
+	    if (tdg  == NULL) {
+		tdg = (TDg*) ckalloc (sizeof (TDg));
+		tdg->counter = 0;
+
+		Tcl_SetAssocData (interp, KEY, proc,
+				  (ClientData) tdg);
+	    }
+	    
+	    tdg->counter ++;
+	    sprintf (tdg->buf, "tree%ld", tdg->counter);
+	    return tdg->buf;
+
+#undef  KEY
+	}
+
+	static void
+	TDdeleteCmd (ClientData clientData)
+	{
+	    /* Release the whole tree. */
+	    t_delete ((T*) clientData);
+	}
+    }
+
+    # Main command, tree creation.
+
+    critcl::ccommand tree_critcl {dummy interp objc objv} {
+      /* Syntax
+       *  - epsilon                         |1
+       *  - name                            |2
+       *  - name =|:=|as|deserialize source |4
+       */
+
+      CONST char* name;
+      T*          td;
+      Tcl_Obj*    fqn;
+      Tcl_CmdInfo ci;
+
+#define USAGE "?name ?=|:=|as|deserialize source??"
+
+      if ((objc != 4) && (objc != 2) && (objc != 1)) {
+        Tcl_WrongNumArgs (interp, 1, objv, USAGE);
+        return TCL_ERROR;
+      }
+
+      if (objc < 2) {
+        name = TDnewName (interp);
+      } else {
+        name = Tcl_GetString (objv [1]);
+      }
+
+      if (!Tcl_StringMatch (name, "::*")) {
+        /* Relative name. Prefix with current namespace */
+
+        Tcl_Eval (interp, "namespace current");
+        fqn = Tcl_GetObjResult (interp);
+        fqn = Tcl_DuplicateObj (fqn);
+        Tcl_IncrRefCount (fqn);
+
+        if (!Tcl_StringMatch (Tcl_GetString (fqn), "::")) {
+          Tcl_AppendToObj (fqn, "::", -1);
+        }
+        Tcl_AppendToObj (fqn, name, -1);
+      } else {
+        fqn = Tcl_NewStringObj (name, -1);
+        Tcl_IncrRefCount (fqn);
+      }
+      Tcl_ResetResult (interp);
+
+      if (Tcl_GetCommandInfo (interp,
+                              Tcl_GetString (fqn),
+                              &ci)) {
+        Tcl_Obj* err;
+
+        err = Tcl_NewObj ();
+        Tcl_AppendToObj    (err, "command \"", -1);
+        Tcl_AppendObjToObj (err, fqn);
+        Tcl_AppendToObj    (err, "\" already exists, unable to create tree", -1);
+
+        Tcl_DecrRefCount (fqn);
+        Tcl_SetObjResult (interp, err);
+        return TCL_ERROR;
+      }
+
+      if (objc == 4) {
+        Tcl_Obj* type = objv[2];
+        Tcl_Obj* src  = objv[3];
+        int srctype;
+
+        static CONST char* types [] = {
+          ":=", "=", "as", "deserialize", NULL
+        };
+        enum types {
+          T_ASSIGN, T_IS, T_AS, T_DESER
+        };
+
+        if (Tcl_GetIndexFromObj (interp, type, types, "type",
+                                 0, &srctype) != TCL_OK) {
+          Tcl_DecrRefCount (fqn);
+          Tcl_ResetResult (interp);
+          Tcl_WrongNumArgs (interp, 1, objv, USAGE);
+          return TCL_ERROR;
+        }
+
+        td = t_new ();
+
+        switch (srctype) {
+        case T_ASSIGN:
+        case T_AS:
+        case T_IS:
+          if (tms_assign (interp, td, src) != TCL_OK) {
+            t_delete (td);
+            Tcl_DecrRefCount (fqn);
+            return TCL_ERROR;
+          }
+          break;
+
+        case T_DESER:
+          if (t_deserialize (td, interp, src) != TCL_OK) {
+            t_delete (td);
+            Tcl_DecrRefCount (fqn);
+            return TCL_ERROR;
+          }
+          break;
+        }
+      } else {
+        td = t_new ();
+      }
+
+      td->cmd = Tcl_CreateObjCommand (interp, Tcl_GetString (fqn),
+                                      tms_objcmd, (ClientData) td,
+                                      TDdeleteCmd);
+
+      Tcl_SetObjResult (interp, fqn);
+      Tcl_DecrRefCount (fqn);
+      return TCL_OK;
+    }
+
+  namespace eval tree {
+    critcl::ccommand prune_critcl {dummy interp objc objv} {
+      return 5;
+    }
+  }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/tree_tcl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/tree_tcl.tcl
new file mode 100644
index 00000000..fbbc3575
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/struct/tree_tcl.tcl
@@ -0,0 +1,2442 @@
+# tree.tcl --
+#
+#	Implementation of a tree data structure for Tcl.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: tree_tcl.tcl,v 1.5 2009/06/22 18:21:59 andreas_kupries Exp $
+
+package require Tcl 8.2
+package require struct::list
+
+namespace eval ::struct::tree {
+    # Data storage in the tree module
+    # -------------------------------
+    #
+    # There's a lot of bits to keep track of for each tree:
+    #	nodes
+    #	node values
+    #	node relationships
+    #
+    # It would quickly become unwieldy to try to keep these in arrays or lists
+    # within the tree namespace itself.  Instead, each tree structure will get
+    # its own namespace.  Each namespace contains:
+    #	children	array mapping nodes to their children list
+    #	parent		array mapping nodes to their parent node
+    #	node:$node	array mapping keys to values for the node $node
+
+    # counter is used to give a unique name for unnamed trees
+    variable counter 0
+
+    # Only export one command, the one used to instantiate a new tree
+    namespace export tree_tcl
+}
+
+# ::struct::tree::tree_tcl --
+#
+#	Create a new tree with a given name; if no name is given, use
+#	treeX, where X is a number.
+#
+# Arguments:
+#	name	Optional name of the tree; if null or not given, generate one.
+#
+# Results:
+#	name	Name of the tree created
+
+proc ::struct::tree::tree_tcl {args} {
+    variable counter
+
+    set src     {}
+    set srctype {}
+
+    switch -exact -- [llength [info level 0]] {
+	1 {
+	    # Missing name, generate one.
+	    incr counter
+	    set name "tree${counter}"
+	}
+	2 {
+	    # Standard call. New empty tree.
+	    set name [lindex $args 0]
+	}
+	4 {
+	    # Copy construction.
+	    foreach {name as src} $args break
+	    switch -exact -- $as {
+		= - := - as {
+		    set srctype tree
+		}
+		deserialize {
+		    set srctype serial
+		}
+		default {
+		    return -code error \
+			    "wrong # args: should be \"tree ?name ?=|:=|as|deserialize source??\""
+		}
+	    }
+	}
+	default {
+	    # Error.
+	    return -code error \
+		    "wrong # args: should be \"tree ?name ?=|:=|as|deserialize source??\""
+	}
+    }
+
+    # FIRST, qualify the name.
+    if {![string match "::*" $name]} {
+        # Get caller's namespace; append :: if not global namespace.
+        set ns [uplevel 1 [list namespace current]]
+        if {"::" != $ns} {
+            append ns "::"
+        }
+
+        set name "$ns$name"
+    }
+    if {[llength [info commands $name]]} {
+	return -code error \
+		"command \"$name\" already exists, unable to create tree"
+    }
+
+    # Set up the namespace for the object,
+    # identical to the object command.
+    namespace eval $name {
+	variable rootname
+	set      rootname root
+
+	# Set up root node's child list
+	variable children
+	set      children(root) [list]
+
+	# Set root node's parent
+	variable parent
+	set      parent(root) [list]
+
+	# Set up the node attribute mapping
+	variable  attribute
+	array set attribute {}
+
+	# Set up a counter for use in creating unique node names
+	variable nextUnusedNode
+	set      nextUnusedNode 1
+
+	# Set up a counter for use in creating node attribute arrays.
+	variable nextAttr
+	set      nextAttr 0
+    }
+
+    # Create the command to manipulate the tree
+    interp alias {} $name {} ::struct::tree::TreeProc $name
+
+    # Automatic execution of assignment if a source
+    # is present.
+    if {$src != {}} {
+	switch -exact -- $srctype {
+	    tree   {
+		set code [catch {_= $name $src} msg]
+		if {$code} {
+		    namespace delete $name
+		    interp alias {} $name {}
+		    return -code $code -errorinfo $::errorInfo -errorcode $::errorCode $msg
+		}
+	    }
+	    serial {
+		set code [catch {_deserialize $name $src} msg]
+		if {$code} {
+		    namespace delete $name
+		    interp alias {} $name {}
+		    return -code $code -errorinfo $::errorInfo -errorcode $::errorCode $msg
+		}
+	    }
+	    default {
+		return -code error \
+			"Internal error, illegal srctype \"$srctype\""
+	    }
+	}
+    }
+
+    # Give object to caller for use.
+    return $name
+}
+
+# ::struct::tree::prune_tcl --
+#
+#	Abort the walk script, and ignore any children of the
+#	node we are currently at.
+#
+# Arguments:
+#	None.
+#
+# Results:
+#	None.
+#
+# Sideeffects:
+#
+#	Stops the execution of the script and throws a signal to the
+#	surrounding walker to go to the next node, and ignore the
+#	children of the current node.
+
+proc ::struct::tree::prune_tcl {} {
+    return -code 5
+}
+
+##########################
+# Private functions follow
+
+# ::struct::tree::TreeProc --
+#
+#	Command that processes all tree object commands.
+#
+# Arguments:
+#	name	Name of the tree object to manipulate.
+#	cmd	Subcommand to invoke.
+#	args	Arguments for subcommand.
+#
+# Results:
+#	Varies based on command to perform
+
+proc ::struct::tree::TreeProc {name {cmd ""} args} {
+    # Do minimal args checks here
+    if { [llength [info level 0]] == 2 } {
+	return -code error "wrong # args: should be \"$name option ?arg arg ...?\""
+    }
+
+    # Split the args into command and args components
+    set sub _$cmd
+    if { [llength [info commands ::struct::tree::$sub]] == 0 } {
+	set optlist [lsort [info commands ::struct::tree::_*]]
+	set xlist {}
+	foreach p $optlist {
+	    set p [namespace tail $p]
+	    lappend xlist [string range $p 1 end]
+	}
+	set optlist [linsert [join $xlist ", "] "end-1" "or"]
+	return -code error \
+		"bad option \"$cmd\": must be $optlist"
+    }
+
+    set code [catch {uplevel 1 [linsert $args 0 ::struct::tree::$sub $name]} result]
+
+    if {$code == 1} {
+	return -errorinfo [ErrorInfoAsCaller uplevel $sub]  \
+		-errorcode $::errorCode -code error $result
+    } elseif {$code == 2} {
+	return -code $code $result
+    }
+    return $result
+}
+
+# ::struct::tree::_:= --
+#
+#	Assignment operator. Copies the source tree into the
+#       destination, destroying the original information.
+#
+# Arguments:
+#	name	Name of the tree object we are copying into.
+#	source	Name of the tree object providing us with the
+#		data to copy.
+#
+# Results:
+#	Nothing.
+
+proc ::struct::tree::_= {name source} {
+    _deserialize $name [$source serialize]
+    return
+}
+
+# ::struct::tree::_--> --
+#
+#	Reverse assignment operator. Copies this tree into the
+#       destination, destroying the original information.
+#
+# Arguments:
+#	name	Name of the tree object to copy
+#	dest	Name of the tree object we are copying to.
+#
+# Results:
+#	Nothing.
+
+proc ::struct::tree::_--> {name dest} {
+    $dest deserialize [_serialize $name]
+    return
+}
+
+# ::struct::tree::_ancestors --
+#
+#	Return the list of all parent nodes of a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to look up.
+#
+# Results:
+#	parents	List of parents of node $node.
+#		Immediate ancestor (parent) first,
+#		Root of tree (ancestor of all) last.
+
+proc ::struct::tree::_ancestors {name node} {
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::parent
+    set a {}
+    while {[info exists parent($node)]} {
+	set node $parent($node)
+	if {$node == {}} break
+	lappend a $node
+    }
+    return $a
+}
+
+# ::struct::tree::_attr --
+#
+#	Return attribute data for one key and multiple nodes, possibly all.
+#
+# Arguments:
+#	name	Name of the tree object.
+#	key	Name of the attribute to retrieve.
+#
+# Results:
+#	children	Dictionary mapping nodes to attribute data.
+
+proc ::struct::tree::_attr {name key args} {
+    # Syntax:
+    #
+    # t attr key
+    # t attr key -nodes {nodelist}
+    # t attr key -glob nodepattern
+    # t attr key -regexp nodepattern
+
+    variable ${name}::attribute
+
+    set usage "wrong # args: should be \"[list $name] attr key ?-nodes list|-glob pattern|-regexp pattern?\""
+    if {([llength $args] != 0) && ([llength $args] != 2)} {
+	return -code error $usage
+    } elseif {[llength $args] == 0} {
+	# This automatically restricts the list
+	# to nodes which can have the attribute
+	# in question.
+
+	set nodes [array names attribute]
+    } else {
+	# Determine a list of nodes to look at
+	# based on the chosen restriction.
+
+	foreach {mode value} $args break
+	switch -exact -- $mode {
+	    -nodes {
+		# This is the only branch where we have to
+		# perform an explicit restriction to the
+		# nodes which have attributes.
+		set nodes {}
+		foreach n $value {
+		    if {![info exists attribute($n)]} continue
+		    lappend nodes $n
+		}
+	    }
+	    -glob {
+		set nodes [array names attribute $value]
+	    }
+	    -regexp {
+		set nodes {}
+		foreach n [array names attribute] {
+		    if {![regexp -- $value $n]} continue
+		    lappend nodes $n
+		}
+	    }
+	    default {
+		return -code error $usage
+	    }
+	}
+    }
+
+    # Without possibly matching nodes
+    # the result has to be empty.
+
+    if {![llength $nodes]} {
+	return {}
+    }
+
+    # Now locate matching keys and their values.
+
+    set result {}
+    foreach n $nodes {
+	upvar ${name}::$attribute($n) data
+	if {[info exists data($key)]} {
+	    lappend result $n $data($key)
+	}
+    }
+
+    return $result
+}
+
+# ::struct::tree::_deserialize --
+#
+#	Assignment operator. Copies a serialization into the
+#       destination, destroying the original information.
+#
+# Arguments:
+#	name	Name of the tree object we are copying into.
+#	serial	Serialized tree to copy from.
+#
+# Results:
+#	Nothing.
+
+proc ::struct::tree::_deserialize {name serial} {
+    # As we destroy the original tree as part of
+    # the copying process we don't have to deal
+    # with issues like node names from the new tree
+    # interfering with the old ...
+
+    # I. Get the serialization of the source tree
+    #    and check it for validity.
+
+    CheckSerialization $serial attr p c rn
+
+    # Get all the relevant data into the scope
+
+    variable ${name}::rootname
+    variable ${name}::children
+    variable ${name}::parent
+    variable ${name}::attribute
+    variable ${name}::nextAttr
+
+    # Kill the existing parent/children information and insert the new
+    # data in their place.
+
+    foreach n [array names parent] {
+	unset parent($n) children($n)
+    }
+    array set parent   [array get p]
+    array set children [array get c]
+    unset p c
+
+    set nextAttr 0
+    foreach a [array names attribute] {
+	unset ${name}::$attribute($a)
+    }
+    foreach n [array names attr] {
+	GenAttributeStorage $name $n
+	array set ${name}::$attribute($n) $attr($n)
+    }
+
+    set rootname $rn
+
+    ## Debug ## Dump internals ...
+    if {0} {
+	puts "___________________________________ $name"
+	puts $rootname
+	parray children
+	parray parent
+	parray attribute
+	puts ___________________________________
+    }
+    return
+}
+
+# ::struct::tree::_children --
+#
+#	Return the list of children for a given node of a tree.
+#
+# Arguments:
+#	name	Name of the tree object.
+#	node	Node to look up.
+#
+# Results:
+#	children	List of children for the node.
+
+proc ::struct::tree::_children {name args} {
+    # args := ?-all? node ?filter cmdprefix?
+
+    # '-all' implies that not only the direct children of the
+    # node, but all their children, and so on, are returned.
+    #
+    # 'filter cmd' implies that only those nodes in the result list
+    # which pass the test 'cmd' are placed into the final result. 
+
+    set usage "wrong # args: should be \"[list $name] children ?-all? node ?filter cmd?\""
+
+    if {([llength $args] < 1) || ([llength $args] > 4)} {
+	return -code error $usage
+    }
+    if {[string equal [lindex $args 0] -all]} {
+	set all 1
+	set args [lrange $args 1 end]
+    } else {
+	set all 0
+    }
+
+    # args := node ?filter cmdprefix?
+
+    if {([llength $args] != 1) && ([llength $args] != 3)} {
+	return -code error $usage
+    }
+    if {[llength $args] == 3} {
+	foreach {node _const_ cmd} $args break
+	if {![string equal $_const_ filter] || ![llength $cmd]} {
+	    return -code error $usage
+	}
+    } else {
+	set node [lindex $args 0]
+	set cmd {}
+    }
+
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    if {$all} {
+	set result [DescendantsCore $name $node]
+    } else {
+	variable ${name}::children
+	set result $children($node)
+    }
+
+    if {[llength $cmd]} {
+	lappend cmd $name
+	set result [uplevel 1 [list ::struct::list filter $result $cmd]]
+    }
+
+    return $result
+}
+
+# ::struct::tree::_cut --
+#
+#	Destroys the specified node of a tree, but not its children.
+#	These children are made into children of the parent of the
+#	destroyed node at the index of the destroyed node.
+#
+# Arguments:
+#	name	Name of the tree object.
+#	node	Node to look up and cut.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_cut {name node} {
+    variable ${name}::rootname
+
+    if { [string equal $node $rootname] } {
+	# Can't delete the special root node
+	return -code error "cannot cut root node"
+    }
+
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::parent
+    variable ${name}::children
+
+    # Locate our parent, children and our location in the parent
+    set parentNode $parent($node)
+    set childNodes $children($node)
+
+    set index [lsearch -exact $children($parentNode) $node]
+
+    # Excise this node from the parent list,
+    set newChildren [lreplace $children($parentNode) $index $index]
+
+    # Put each of the children of $node into the parent's children list,
+    # in the place of $node, and update the parent pointer of those nodes.
+    foreach child $childNodes {
+	set newChildren [linsert $newChildren $index $child]
+	set parent($child) $parentNode
+	incr index
+    }
+    set children($parentNode) $newChildren
+
+    KillNode $name $node
+    return
+}
+
+# ::struct::tree::_delete --
+#
+#	Remove a node from a tree, including all of its values.  Recursively
+#	removes the node's children.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to delete.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_delete {name node} {
+    variable ${name}::rootname
+    if { [string equal $node $rootname] } {
+	# Can't delete the special root node
+	return -code error "cannot delete root node"
+    }
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::children
+    variable ${name}::parent
+
+    # Remove this node from its parent's children list
+    set parentNode $parent($node)
+    set index [lsearch -exact $children($parentNode) $node]
+    ldelete children($parentNode) $index
+
+    # Yes, we could use the stack structure implemented in ::struct::stack,
+    # but it's slower than inlining it.  Since we don't need a sophisticated
+    # stack, don't bother.
+    set st [list]
+    foreach child $children($node) {
+	lappend st $child
+    }
+
+    KillNode $name $node
+
+    while {[llength $st] > 0} {
+	set node [lindex $st end]
+	ldelete           st end
+	foreach child $children($node) {
+	    lappend st $child
+	}
+
+	KillNode $name $node
+    }
+    return
+}
+
+# ::struct::tree::_depth --
+#
+#	Return the depth (distance from the root node) of a given node.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to find.
+#
+# Results:
+#	depth	Number of steps from node to the root node.
+
+proc ::struct::tree::_depth {name node} {
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+    variable ${name}::parent
+    variable ${name}::rootname
+    set depth 0
+    while { ![string equal $node $rootname] } {
+	incr depth
+	set node $parent($node)
+    }
+    return $depth
+}
+
+# ::struct::tree::_descendants --
+#
+#	Return the list containing all descendants of a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to look at.
+#
+# Results:
+#	desc	(filtered) List of nodes descending from 'node'.
+
+proc ::struct::tree::_descendants {name node args} {
+    # children -all sucessor, allows filtering.
+
+    set usage "wrong # args: should be \"[list $name] descendants node ?filter cmd?\""
+
+    if {[llength $args] > 2} {
+	return -code error $usage
+    } elseif {[llength $args] == 2} {
+	foreach {_const_ cmd} $args break
+	if {![string equal $_const_ filter] || ![llength $cmd]} {
+	    return -code error $usage
+	}
+    } else {
+	set cmd {}
+    }
+
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    set result [DescendantsCore $name $node]
+
+    if {[llength $cmd]} {
+	lappend cmd $name
+	set result [uplevel 1 [list ::struct::list filter $result $cmd]]
+    }
+
+    return $result
+}
+
+proc ::struct::tree::DescendantsCore {name node} {
+    # CORE for listing of node descendants.
+    # No checks ...
+    # No filtering ...
+
+    variable ${name}::children
+
+    # New implementation. Instead of keeping a second, and explicit,
+    # list of pending nodes to shift through (= copying of array data
+    # around), we reuse the result list for that, using a counter and
+    # direct access to list elements to keep track of what nodes have
+    # not been handled yet. This eliminates a whole lot of array
+    # copying within the list implementation in the Tcl core. The
+    # result is unchanged, i.e. the nodes are in the same order as
+    # before.
+
+    set result  $children($node)
+    set at      0
+
+    while {$at < [llength $result]} {
+	set n [lindex $result $at]
+	incr at
+	foreach c $children($n) {
+	    lappend result $c
+	}
+    }
+
+    return $result
+}
+
+# ::struct::tree::_destroy --
+#
+#	Destroy a tree, including its associated command and data storage.
+#
+# Arguments:
+#	name	Name of the tree to destroy.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_destroy {name} {
+    namespace delete $name
+    interp alias {} $name {}
+}
+
+# ::struct::tree::_exists --
+#
+#	Test for existence of a given node in a tree.
+#
+# Arguments:
+#	name	Name of the tree to query.
+#	node	Node to look for.
+#
+# Results:
+#	1 if the node exists, 0 else.
+
+proc ::struct::tree::_exists {name node} {
+    return [info exists ${name}::parent($node)]
+}
+
+# ::struct::tree::_get --
+#
+#	Get a keyed value from a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to query.
+#	key	Key to lookup.
+#
+# Results:
+#	value	Value associated with the key given.
+
+proc ::struct::tree::_get {name node key} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# No attribute data for this node, key has to be invalid.
+	return -code error "invalid key \"$key\" for node \"$node\""
+    }
+
+    upvar ${name}::$attribute($node) data
+    if {![info exists data($key)]} {
+	return -code error "invalid key \"$key\" for node \"$node\""
+    }
+    return $data($key)
+}
+
+# ::struct::tree::_getall --
+#
+#	Get a serialized list of key/value pairs from a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to query.
+#
+# Results:
+#	value	A serialized list of key/value pairs.
+
+proc ::struct::tree::_getall {name node {pattern *}} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# No attributes ...
+	return {}
+    }
+
+    upvar ${name}::$attribute($node) data
+    return [array get data $pattern]
+}
+
+# ::struct::tree::_height --
+#
+#	Return the height (distance from the given node to its deepest child)
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node we wish to know the height for..
+#
+# Results:
+#	height	Distance to deepest child of the node.
+
+proc ::struct::tree::_height {name node} {
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::children
+    variable ${name}::parent
+
+    if {[llength $children($node)] == 0} {
+	# No children, is a leaf, height is 0.
+	return 0
+    }
+
+    # New implementation. We iteratively compute the height for each
+    # node under the specified one, from the bottom up. The previous
+    # implementation, using recursion will fail if the encountered
+    # subtree has a height greater than the currently set recursion
+    # limit.
+
+    array set h {}
+
+    # NOTE: Check out if a for loop doing direct access, i.e. without
+    #       list reversal, is faster.
+
+    foreach n [struct::list reverse [DescendantsCore $name $node]] {
+	# Height of leafs
+	if {![llength $children($n)]} {set h($n) 0}
+
+	# Height of our parent is max of our and previous height.
+	set p $parent($n)
+	if {![info exists h($p)] || ($h($n) >= $h($p))} {
+	    set h($p) [expr {$h($n) + 1}]
+	}
+    }
+
+    # NOTE: Check out how much we gain by caching the result.
+    #       For all nodes we have this computed. Use cache here
+    #       as well to cut the inspection of descendants down.
+    #       This may degenerate into a recursive solution again
+    #       however.
+
+    return $h($node)
+}
+
+# ::struct::tree::_keys --
+#
+#	Get a list of keys from a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to query.
+#
+# Results:
+#	value	A serialized list of key/value pairs.
+
+proc ::struct::tree::_keys {name node {pattern *}} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# No attribute data for this node.
+	return {}
+    }
+
+    upvar ${name}::$attribute($node) data
+    return [array names data $pattern]
+}
+
+# ::struct::tree::_keyexists --
+#
+#	Test for existence of a given key for a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to query.
+#	key	Key to lookup.
+#
+# Results:
+#	1 if the key exists, 0 else.
+
+proc ::struct::tree::_keyexists {name node key} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# No attribute data for this node, key cannot exist
+	return 0
+    }
+
+    upvar ${name}::$attribute($node) data
+    return [info exists data($key)]
+}
+
+# ::struct::tree::_index --
+#
+#	Determine the index of node with in its parent's list of children.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to look up.
+#
+# Results:
+#	index	The index of the node in its parent
+
+proc ::struct::tree::_index {name node} {
+    variable ${name}::rootname
+    if { [string equal $node $rootname] } {
+	# The special root node has no parent, thus no index in it either.
+	return -code error "cannot determine index of root node"
+    }
+
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::children
+    variable ${name}::parent
+
+    # Locate the parent and ourself in its list of children
+    set parentNode $parent($node)
+
+    return [lsearch -exact $children($parentNode) $node]
+}
+
+# ::struct::tree::_insert --
+#
+#	Add a node to a tree; if the node(s) specified already exist, they
+#	will be moved to the given location.
+#
+# Arguments:
+#	name		Name of the tree.
+#	parentNode	Parent to add the node to.
+#	index		Index at which to insert.
+#	args		Node(s) to insert.  If none is given, the routine
+#			will insert a single node with a unique name.
+#
+# Results:
+#	nodes		List of nodes inserted.
+
+proc ::struct::tree::_insert {name parentNode index args} {
+    if { [llength $args] == 0 } {
+	# No node name was given; generate a unique one
+	set args [list [GenerateUniqueNodeName $name]]
+    }
+    if { ![_exists $name $parentNode] } {
+	return -code error "parent node \"$parentNode\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::parent
+    variable ${name}::children
+    variable ${name}::rootname
+
+    # Make sure the index is numeric
+
+    if {[string equal $index "end"]} {
+	set index [llength $children($parentNode)]
+    } elseif {[regexp {^end-([0-9]+)$} $index -> n]} {
+	set index [expr {[llength $children($parentNode)] - $n}]
+    }
+
+    foreach node $args {
+	if {[_exists $name $node] } {
+	    # Move the node to its new home
+	    if { [string equal $node $rootname] } {
+		return -code error "cannot move root node"
+	    }
+	
+	    # Cannot make a node its own descendant (I'm my own grandpa...)
+	    set ancestor $parentNode
+	    while { ![string equal $ancestor $rootname] } {
+		if { [string equal $ancestor $node] } {
+		    return -code error "node \"$node\" cannot be its own descendant"
+		}
+		set ancestor $parent($ancestor)
+	    }
+	    # Remove this node from its parent's children list
+	    set oldParent $parent($node)
+	    set ind [lsearch -exact $children($oldParent) $node]
+	    ldelete children($oldParent) $ind
+	
+	    # If the node is moving within its parent, and its old location
+	    # was before the new location, decrement the new location, so that
+	    # it gets put in the right spot
+	    if { [string equal $oldParent $parentNode] && $ind < $index } {
+		incr index -1
+	    }
+	} else {
+	    # Set up the new node
+	    set children($node) [list]
+	}
+
+	# Add this node to its parent's children list
+	set children($parentNode) [linsert $children($parentNode) $index $node]
+
+	# Update the parent pointer for this node
+	set parent($node) $parentNode
+	incr index
+    }
+
+    return $args
+}
+
+# ::struct::tree::_isleaf --
+#
+#	Return whether the given node of a tree is a leaf or not.
+#
+# Arguments:
+#	name	Name of the tree object.
+#	node	Node to look up.
+#
+# Results:
+#	isleaf	True if the node is a leaf; false otherwise.
+
+proc ::struct::tree::_isleaf {name node} {
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::children
+    return [expr {[llength $children($node)] == 0}]
+}
+
+# ::struct::tree::_move --
+#
+#	Move a node (and all its subnodes) from where ever it is to a new
+#	location in the tree.
+#
+# Arguments:
+#	name		Name of the tree
+#	parentNode	Parent to add the node to.
+#	index		Index at which to insert.
+#	node		Node to move; the node must exist in the tree.
+#	args		Additional nodes to move; these nodes must exist
+#			in the tree.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_move {name parentNode index node args} {
+    set args [linsert $args 0 $node]
+
+    # Can only move a node to a real location in the tree
+    if { ![_exists $name $parentNode] } {
+	return -code error "parent node \"$parentNode\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::parent
+    variable ${name}::children
+    variable ${name}::rootname
+
+    # Make sure the index is numeric
+
+    if {[string equal $index "end"]} {
+	set index [llength $children($parentNode)]
+    } elseif {[regexp {^end-([0-9]+)$} $index -> n]} {
+	set index [expr {[llength $children($parentNode)] - $n}]
+    }
+
+    # Validate all nodes to move before trying to move any.
+    foreach node $args {
+	if { [string equal $node $rootname] } {
+	    return -code error "cannot move root node"
+	}
+
+	# Can only move real nodes
+	if { ![_exists $name $node] } {
+	    return -code error "node \"$node\" does not exist in tree \"$name\""
+	}
+
+	# Cannot move a node to be a descendant of itself
+	set ancestor $parentNode
+	while { ![string equal $ancestor $rootname] } {
+	    if { [string equal $ancestor $node] } {
+		return -code error "node \"$node\" cannot be its own descendant"
+	    }
+	    set ancestor $parent($ancestor)
+	}
+    }
+
+    # Remove all nodes from their current parent's children list
+    foreach node $args {
+	set oldParent $parent($node)
+	set ind [lsearch -exact $children($oldParent) $node]
+
+	ldelete children($oldParent) $ind
+
+	# Update the nodes parent value
+	set parent($node) $parentNode
+    }
+
+    # Add all nodes to their new parent's children list
+    set children($parentNode) \
+	[eval [list linsert $children($parentNode) $index] $args]
+
+    return
+}
+
+# ::struct::tree::_next --
+#
+#	Return the right sibling for a given node of a tree.
+#
+# Arguments:
+#	name		Name of the tree object.
+#	node		Node to retrieve right sibling for.
+#
+# Results:
+#	sibling		The right sibling for the node, or null if node was
+#			the rightmost child of its parent.
+
+proc ::struct::tree::_next {name node} {
+    # The 'root' has no siblings.
+    variable ${name}::rootname
+    if { [string equal $node $rootname] } {
+	return {}
+    }
+
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    # Locate the parent and our place in its list of children.
+    variable ${name}::parent
+    variable ${name}::children
+
+    set parentNode $parent($node)
+    set  index [lsearch -exact $children($parentNode) $node]
+
+    # Go to the node to the right and return its name.
+    return [lindex $children($parentNode) [incr index]]
+}
+
+# ::struct::tree::_numchildren --
+#
+#	Return the number of immediate children for a given node of a tree.
+#
+# Arguments:
+#	name		Name of the tree object.
+#	node		Node to look up.
+#
+# Results:
+#	numchildren	Number of immediate children for the node.
+
+proc ::struct::tree::_numchildren {name node} {
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::children
+    return [llength $children($node)]
+}
+
+# ::struct::tree::_nodes --
+#
+#	Return a list containing all nodes known to the tree.
+#
+# Arguments:
+#	name		Name of the tree object.
+#
+# Results:
+#	nodes	List of nodes in the tree.
+
+proc ::struct::tree::_nodes {name} {
+    variable ${name}::children
+    return [array names children]
+}
+
+# ::struct::tree::_parent --
+#
+#	Return the name of the parent node of a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to look up.
+#
+# Results:
+#	parent	Parent of node $node
+
+proc ::struct::tree::_parent {name node} {
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+    # FRINK: nocheck
+    return [set ${name}::parent($node)]
+}
+
+# ::struct::tree::_previous --
+#
+#	Return the left sibling for a given node of a tree.
+#
+# Arguments:
+#	name		Name of the tree object.
+#	node		Node to look up.
+#
+# Results:
+#	sibling		The left sibling for the node, or null if node was
+#			the leftmost child of its parent.
+
+proc ::struct::tree::_previous {name node} {
+    # The 'root' has no siblings.
+    variable ${name}::rootname
+    if { [string equal $node $rootname] } {
+	return {}
+    }
+
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    # Locate the parent and our place in its list of children.
+    variable ${name}::parent
+    variable ${name}::children
+
+    set parentNode $parent($node)
+    set  index [lsearch -exact $children($parentNode) $node]
+
+    # Go to the node to the right and return its name.
+    return [lindex $children($parentNode) [incr index -1]]
+}
+
+# ::struct::tree::_rootname --
+#
+#	Query or change the name of the root node.
+#
+# Arguments:
+#	name	Name of the tree.
+#
+# Results:
+#	The name of the root node
+
+proc ::struct::tree::_rootname {name} {
+    variable ${name}::rootname
+    return $rootname
+}
+
+# ::struct::tree::_rename --
+#
+#	Change the name of any node.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Name of node to be renamed
+#	newname	New name for the node.
+#
+# Results:
+#	The new name of the node.
+
+proc ::struct::tree::_rename {name node newname} {
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+    if {[_exists $name $newname]} {
+	return -code error "unable to rename node to \"$newname\",\
+		node of that name already present in the tree \"$name\""
+    }
+
+    set oldname  $node
+
+    # Perform the rename in the internal
+    # data structures.
+
+    variable ${name}::rootname
+    variable ${name}::children
+    variable ${name}::parent
+    variable ${name}::attribute
+
+    set children($newname) $children($oldname)
+    unset                   children($oldname)
+    set parent($newname)     $parent($oldname)
+    unset                     parent($oldname)
+
+    foreach c $children($newname) {
+	set parent($c) $newname
+    }
+
+    if {[string equal $oldname $rootname]} {
+	set rootname $newname
+    } else {
+	set p $parent($newname)
+	set pos  [lsearch -exact $children($p) $oldname]
+	lset children($p) $pos $newname
+    }
+
+    if {[info exists attribute($oldname)]} {
+	set attribute($newname) $attribute($oldname)
+	unset                    attribute($oldname)
+    }
+
+    return $newname
+}
+
+# ::struct::tree::_serialize --
+#
+#	Serialize a tree object (partially) into a transportable value.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Root node of the serialized tree.
+#
+# Results:
+#	A list structure describing the part of the tree which was serialized.
+
+proc ::struct::tree::_serialize {name args} {
+    if {[llength $args] > 1} {
+	return -code error \
+		"wrong # args: should be \"[list $name] serialize ?node?\""
+    } elseif {[llength $args] == 1} {
+	set node [lindex $args 0]
+
+	if {![_exists $name $node]} {
+	    return -code error "node \"$node\" does not exist in tree \"$name\""
+	}
+    } else {
+	variable ${name}::rootname
+	set node $rootname
+    }
+
+    set                   tree [list]
+    Serialize $name $node tree
+    return               $tree
+}
+
+# ::struct::tree::_set --
+#
+#	Set or get a value for a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to modify or query.
+#	args	Optional argument specifying a value.
+#
+# Results:
+#	val	Value associated with the given key of the given node
+
+proc ::struct::tree::_set {name node key args} {
+    if {[llength $args] > 1} {
+	return -code error "wrong # args: should be \"$name set node key\
+		?value?\""
+    }
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    # Process the arguments ...
+
+    if {[llength $args] > 0} {
+	# Setting the value. This may have to create
+	# the attribute array for this particular
+	# node
+
+	variable ${name}::attribute
+	if {![info exists attribute($node)]} {
+	    # No attribute data for this node,
+	    # so create it as we need it now.
+	    GenAttributeStorage $name $node
+	}
+	upvar ${name}::$attribute($node) data
+
+	return [set data($key) [lindex $args end]]
+    } else {
+	# Getting the value
+
+	return [_get $name $node $key]
+    }
+}
+
+# ::struct::tree::_append --
+#
+#	Append a value for a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to modify.
+#	key	Name of attribute to modify.
+#	value	Value to append
+#
+# Results:
+#	val	Value associated with the given key of the given node
+
+proc ::struct::tree::_append {name node key value} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# No attribute data for this node,
+	# so create it as we need it.
+	GenAttributeStorage $name $node
+    }
+
+    upvar ${name}::$attribute($node) data
+    return [append data($key) $value]
+}
+
+# ::struct::tree::_lappend --
+#
+#	lappend a value for a node in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to modify or query.
+#	key	Name of attribute to modify.
+#	value	Value to append
+#
+# Results:
+#	val	Value associated with the given key of the given node
+
+proc ::struct::tree::_lappend {name node key value} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# No attribute data for this node,
+	# so create it as we need it.
+	GenAttributeStorage $name $node
+    }
+
+    upvar ${name}::$attribute($node) data
+    return [lappend data($key) $value]
+}
+
+# ::struct::tree::_leaves --
+#
+#	Return a list containing all leaf nodes known to the tree.
+#
+# Arguments:
+#	name		Name of the tree object.
+#
+# Results:
+#	nodes	List of leaf nodes in the tree.
+
+proc ::struct::tree::_leaves {name} {
+    variable ${name}::children
+
+    set res {}
+    foreach n [array names children] {
+	if {[llength $children($n)]} continue
+	lappend res $n
+    }
+    return $res
+}
+
+# ::struct::tree::_size --
+#
+#	Return the number of descendants of a given node.  The default node
+#	is the special root node.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Optional node to start counting from (default is root).
+#
+# Results:
+#	size	Number of descendants of the node.
+
+proc ::struct::tree::_size {name args} {
+    variable ${name}::rootname
+    if {[llength $args] > 1} {
+	return -code error \
+		"wrong # args: should be \"[list $name] size ?node?\""
+    } elseif {[llength $args] == 1} {
+	set node [lindex $args 0]
+
+	if { ![_exists $name $node] } {
+	    return -code error "node \"$node\" does not exist in tree \"$name\""
+	}
+    } else {
+	# If the node is the root, we can do the cheap thing and just count the
+	# number of nodes (excluding the root node) that we have in the tree with
+	# array size.
+
+	return [expr {[array size ${name}::parent] - 1}]
+    }
+
+    # If the node is the root, we can do the cheap thing and just count the
+    # number of nodes (excluding the root node) that we have in the tree with
+    # array size.
+
+    if { [string equal $node $rootname] } {
+	return [expr {[array size ${name}::parent] - 1}]
+    }
+
+    # Otherwise we have to do it the hard way and do a full tree search
+    variable ${name}::children
+    set size 0
+    set st [list ]
+    foreach child $children($node) {
+	lappend st $child
+    }
+    while { [llength $st] > 0 } {
+	set node [lindex $st end]
+	ldelete st end
+	incr size
+	foreach child $children($node) {
+	    lappend st $child
+	}
+    }
+    return $size
+}
+
+# ::struct::tree::_splice --
+#
+#	Add a node to a tree, making a range of children from the given
+#	parent children of the new node.
+#
+# Arguments:
+#	name		Name of the tree.
+#	parentNode	Parent to add the node to.
+#	from		Index at which to insert.
+#	to		Optional end of the range of children to replace.
+#			Defaults to 'end'.
+#	args		Optional node name; if given, must be unique.  If not
+#			given, a unique name will be generated.
+#
+# Results:
+#	node		Name of the node added to the tree.
+
+proc ::struct::tree::_splice {name parentNode from {to end} args} {
+
+    if { ![_exists $name $parentNode] } {
+	return -code error "node \"$parentNode\" does not exist in tree \"$name\""
+    }
+
+    if { [llength $args] == 0 } {
+	# No node name given; generate a unique node name
+	set node [GenerateUniqueNodeName $name]
+    } else {
+	set node [lindex $args 0]
+    }
+
+    if { [_exists $name $node] } {
+	return -code error "node \"$node\" already exists in tree \"$name\""
+    }
+
+    variable ${name}::children
+    variable ${name}::parent
+
+    if {[string equal $from "end"]} {
+	set from [expr {[llength $children($parentNode)] - 1}]
+    } elseif {[regexp {^end-([0-9]+)$} $from -> n]} {
+	set from [expr {[llength $children($parentNode)] - 1 - $n}]
+    }
+    if {[string equal $to "end"]} {
+	set to [expr {[llength $children($parentNode)] - 1}]
+    } elseif {[regexp {^end-([0-9]+)$} $to -> n]} {
+	set to   [expr {[llength $children($parentNode)] - 1 - $n}]
+    }
+
+    # Save the list of children that are moving
+    set moveChildren [lrange $children($parentNode) $from $to]
+
+    # Remove those children from the parent
+    ldelete children($parentNode) $from $to
+
+    # Add the new node
+    _insert $name $parentNode $from $node
+
+    # Move the children
+    set children($node) $moveChildren
+    foreach child $moveChildren {
+	set parent($child) $node
+    }
+
+    return $node
+}
+
+# ::struct::tree::_swap --
+#
+#	Swap two nodes in a tree.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node1	First node to swap.
+#	node2	Second node to swap.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_swap {name node1 node2} {
+    # Can't swap the magic root node
+    variable ${name}::rootname
+    if {[string equal $node1 $rootname] || [string equal $node2 $rootname]} {
+	return -code error "cannot swap root node"
+    }
+
+    # Can only swap two real nodes
+    if {![_exists $name $node1]} {
+	return -code error "node \"$node1\" does not exist in tree \"$name\""
+    }
+    if {![_exists $name $node2]} {
+	return -code error "node \"$node2\" does not exist in tree \"$name\""
+    }
+
+    # Can't swap a node with itself
+    if {[string equal $node1 $node2]} {
+	return -code error "cannot swap node \"$node1\" with itself"
+    }
+
+    # Swapping nodes means swapping their labels and values
+    variable ${name}::children
+    variable ${name}::parent
+
+    set parent1 $parent($node1)
+    set parent2 $parent($node2)
+
+    # Replace node1 with node2 in node1's parent's children list, and
+    # node2 with node1 in node2's parent's children list
+    set i1 [lsearch -exact $children($parent1) $node1]
+    set i2 [lsearch -exact $children($parent2) $node2]
+
+    lset children($parent1) $i1 $node2
+    lset children($parent2) $i2 $node1
+
+    # Make node1 the parent of node2's children, and vis versa
+    foreach child $children($node2) {
+	set parent($child) $node1
+    }
+    foreach child $children($node1) {
+	set parent($child) $node2
+    }
+
+    # Swap the children lists
+    set children1 $children($node1)
+    set children($node1) $children($node2)
+    set children($node2) $children1
+
+    if { [string equal $node1 $parent2] } {
+	set parent($node1) $node2
+	set parent($node2) $parent1
+    } elseif { [string equal $node2 $parent1] } {
+	set parent($node1) $parent2
+	set parent($node2) $node1
+    } else {
+	set parent($node1) $parent2
+	set parent($node2) $parent1
+    }
+
+    return
+}
+
+# ::struct::tree::_unset --
+#
+#	Remove a keyed value from a node.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node to modify.
+#	key	Name of attribute to unset.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_unset {name node key} {
+    if {![_exists $name $node]} {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    variable ${name}::attribute
+    if {![info exists attribute($node)]} {
+	# No attribute data for this node,
+	# nothing to do.
+	return
+    }
+
+    upvar ${name}::$attribute($node) data
+    catch {unset data($key)}
+
+    if {[array size data] == 0} {
+	# No attributes stored for this node, squash the whole array.
+	unset attribute($node)
+	unset data
+    }
+    return
+}
+
+# ::struct::tree::_walk --
+#
+#	Walk a tree using a pre-order depth or breadth first
+#	search. Pre-order DFS is the default.  At each node that is visited,
+#	a command will be called with the name of the tree and the node.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Node at which to start.
+#	args	Optional additional arguments specifying the type and order of
+#		the tree walk, and the command to execute at each node.
+#		Format is
+#		    ?-type {bfs|dfs}? ?-order {pre|post|in|both}? a n script
+#
+# Results:
+#	None.
+
+proc ::struct::tree::_walk {name node args} {
+    set usage "$name walk node ?-type {bfs|dfs}? ?-order {pre|post|in|both}? ?--? loopvar script"
+
+    if {[llength $args] > 7 || [llength $args] < 2} {
+	return -code error "wrong # args: should be \"$usage\""
+    }
+
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    set args [WalkOptions $args 2 $usage]
+    # Remainder is 'a n script'
+
+    foreach {loopvariables script} $args break
+
+    if {[llength $loopvariables] > 2} {
+	return -code error "too many loop variables, at most two allowed"
+    } elseif {[llength $loopvariables] == 2} {
+	foreach {avar nvar} $loopvariables break
+    } else {
+	set nvar [lindex $loopvariables 0]
+	set avar {}
+    }
+
+    # Make sure we have a script to run, otherwise what's the point?
+    if { [string equal $script ""] } {
+	return -code error "no script specified, or empty"
+    }
+
+    # Do the walk
+    variable ${name}::children
+    set st [list ]
+    lappend st $node
+
+    # Compute some flags for the possible places of command evaluation
+    set leave [expr {[string equal $order post] || [string equal $order both]}]
+    set enter [expr {[string equal $order pre]  || [string equal $order both]}]
+    set touch [string equal $order in]
+
+    if {$leave} {
+	set lvlabel leave
+    } elseif {$touch} {
+	# in-order does not provide a sense
+	# of nesting for the parent, hence
+	# no enter/leave, just 'visit'.
+	set lvlabel visit
+    }
+
+    set rcode 0
+    set rvalue {}
+
+    if {[string equal $type "dfs"]} {
+	# Depth-first walk, several orders of visiting nodes
+	# (pre, post, both, in)
+
+	array set visited {}
+
+	while { [llength $st] > 0 } {
+	    set node [lindex $st end]
+
+	    if {[info exists visited($node)]} {
+		# Second time we are looking at this 'node'.
+		# Pop it, then evaluate the command (post, both, in).
+
+		ldelete st end
+
+		if {$leave || $touch} {
+		    # Evaluate the script at this node
+		    WalkCall $avar $nvar $name $node $lvlabel $script
+		    # prune stops execution of loop here.
+		}
+	    } else {
+		# First visit of this 'node'.
+		# Do *not* pop it from the stack so that we are able
+		# to visit again after its children
+
+		# Remember it.
+		set visited($node) .
+
+		if {$enter} {
+		    # Evaluate the script at this node (pre, both).
+		    #
+		    # Note: As this is done before the children are
+		    # looked at the script may change the children of
+		    # this node and thus affect the walk.
+
+		    WalkCall $avar $nvar $name $node "enter" $script
+		    # prune stops execution of loop here.
+		}
+
+		# Add the children of this node to the stack.
+		# The exact behaviour depends on the chosen
+		# order. For pre, post, both-order we just
+		# have to add them in reverse-order so that
+		# they will be popped left-to-right. For in-order
+		# we have rearrange the stack so that the parent
+		# is revisited immediately after the first child.
+		# (but only if there is ore than one child,)
+
+		set clist        $children($node)
+		set len [llength $clist]
+
+		if {$touch && ($len > 1)} {
+		    # Pop node from stack, insert into list of children
+		    ldelete st end
+		    set clist [linsert $clist 1 $node]
+		    incr len
+		}
+
+		for {set i [expr {$len - 1}]} {$i >= 0} {incr i -1} {
+		    lappend st [lindex $clist $i]
+		}
+	    }
+	}
+    } else {
+	# Breadth first walk (pre, post, both)
+	# No in-order possible. Already captured.
+
+	if {$leave} {
+	    set backward $st
+	}
+
+	while { [llength $st] > 0 } {
+	    set node [lindex   $st 0]
+	    ldelete st 0
+
+	    if {$enter} {
+		# Evaluate the script at this node
+		WalkCall $avar $nvar $name $node "enter" $script
+		# prune stops execution of loop here.
+	    }
+
+	    # Add this node's children
+	    # And create a mirrored version in case of post/both order.
+
+	    foreach child $children($node) {
+		lappend st $child
+		if {$leave} {
+		    set backward [linsert $backward 0 $child]
+		}
+	    }
+	}
+
+	if {$leave} {
+	    foreach node $backward {
+		# Evaluate the script at this node
+		WalkCall $avar $nvar $name $node "leave" $script
+	    }
+	}
+    }
+
+    if {$rcode != 0} {
+	return -code $rcode $rvalue
+    }
+    return
+}
+
+proc ::struct::tree::_walkproc {name node args} {
+    set usage "$name walkproc node ?-type {bfs|dfs}? ?-order {pre|post|in|both}? ?--? cmdprefix"
+
+    if {[llength $args] > 6 || [llength $args] < 1} {
+	return -code error "wrong # args: should be \"$usage\""
+    }
+
+    if { ![_exists $name $node] } {
+	return -code error "node \"$node\" does not exist in tree \"$name\""
+    }
+
+    set args [WalkOptions $args 1 $usage]
+    # Remainder is 'n cmdprefix'
+
+    set script [lindex $args 0]
+
+    # Make sure we have a script to run, otherwise what's the point?
+    if { ![llength $script] } {
+	return -code error "no script specified, or empty"
+    }
+
+    # Do the walk
+    variable ${name}::children
+    set st [list ]
+    lappend st $node
+
+    # Compute some flags for the possible places of command evaluation
+    set leave [expr {[string equal $order post] || [string equal $order both]}]
+    set enter [expr {[string equal $order pre]  || [string equal $order both]}]
+    set touch [string equal $order in]
+
+    if {$leave} {
+	set lvlabel leave
+    } elseif {$touch} {
+	# in-order does not provide a sense
+	# of nesting for the parent, hence
+	# no enter/leave, just 'visit'.
+	set lvlabel visit
+    }
+
+    set rcode 0
+    set rvalue {}
+
+    if {[string equal $type "dfs"]} {
+	# Depth-first walk, several orders of visiting nodes
+	# (pre, post, both, in)
+
+	array set visited {}
+
+	while { [llength $st] > 0 } {
+	    set node [lindex $st end]
+
+	    if {[info exists visited($node)]} {
+		# Second time we are looking at this 'node'.
+		# Pop it, then evaluate the command (post, both, in).
+
+		ldelete st end
+
+		if {$leave || $touch} {
+		    # Evaluate the script at this node
+		    WalkCallProc $name $node $lvlabel $script
+		    # prune stops execution of loop here.
+		}
+	    } else {
+		# First visit of this 'node'.
+		# Do *not* pop it from the stack so that we are able
+		# to visit again after its children
+
+		# Remember it.
+		set visited($node) .
+
+		if {$enter} {
+		    # Evaluate the script at this node (pre, both).
+		    #
+		    # Note: As this is done before the children are
+		    # looked at the script may change the children of
+		    # this node and thus affect the walk.
+
+		    WalkCallProc $name $node "enter" $script
+		    # prune stops execution of loop here.
+		}
+
+		# Add the children of this node to the stack.
+		# The exact behaviour depends on the chosen
+		# order. For pre, post, both-order we just
+		# have to add them in reverse-order so that
+		# they will be popped left-to-right. For in-order
+		# we have rearrange the stack so that the parent
+		# is revisited immediately after the first child.
+		# (but only if there is ore than one child,)
+
+		set clist        $children($node)
+		set len [llength $clist]
+
+		if {$touch && ($len > 1)} {
+		    # Pop node from stack, insert into list of children
+		    ldelete st end
+		    set clist [linsert $clist 1 $node]
+		    incr len
+		}
+
+		for {set i [expr {$len - 1}]} {$i >= 0} {incr i -1} {
+		    lappend st [lindex $clist $i]
+		}
+	    }
+	}
+    } else {
+	# Breadth first walk (pre, post, both)
+	# No in-order possible. Already captured.
+
+	if {$leave} {
+	    set backward $st
+	}
+
+	while { [llength $st] > 0 } {
+	    set node [lindex   $st 0]
+	    ldelete st 0
+
+	    if {$enter} {
+		# Evaluate the script at this node
+		WalkCallProc $name $node "enter" $script
+		# prune stops execution of loop here.
+	    }
+
+	    # Add this node's children
+	    # And create a mirrored version in case of post/both order.
+
+	    foreach child $children($node) {
+		lappend st $child
+		if {$leave} {
+		    set backward [linsert $backward 0 $child]
+		}
+	    }
+	}
+
+	if {$leave} {
+	    foreach node $backward {
+		# Evaluate the script at this node
+		WalkCallProc $name $node "leave" $script
+	    }
+	}
+    }
+
+    if {$rcode != 0} {
+	return -code $rcode $rvalue
+    }
+    return
+}
+
+proc ::struct::tree::WalkOptions {theargs n usage} {
+    upvar 1 type type order order
+
+    # Set defaults
+    set type dfs
+    set order pre
+
+    while {[llength $theargs]} {
+	set flag [lindex $theargs 0]
+	switch -exact -- $flag {
+	    "-type" {
+		if {[llength $theargs] < 2} {
+		    return -code error "value for \"$flag\" missing"
+		}
+		set type [string tolower [lindex $theargs 1]]
+		set theargs [lrange $theargs 2 end]
+	    }
+	    "-order" {
+		if {[llength $theargs] < 2} {
+		    return -code error "value for \"$flag\" missing"
+		}
+		set order [string tolower [lindex $theargs 1]]
+		set theargs [lrange $theargs 2 end]
+	    }
+	    "--" {
+		set theargs [lrange $theargs 1 end]
+		break
+	    }
+	    default {
+		break
+	    }
+	}
+    }
+
+    if {[llength $theargs] == 0} {
+	return -code error "wrong # args: should be \"$usage\""
+    }
+    if {[llength $theargs] != $n} {
+	return -code error "unknown option \"$flag\""
+    }
+
+    # Validate that the given type is good
+    switch -exact -- $type {
+	"dfs" - "bfs" {
+	    set type $type
+	}
+	default {
+	    return -code error "bad search type \"$type\": must be bfs or dfs"
+	}
+    }
+
+    # Validate that the given order is good
+    switch -exact -- $order {
+	"pre" - "post" - "in" - "both" {
+	    set order $order
+	}
+	default {
+	    return -code error "bad search order \"$order\":\
+		    must be both, in, pre, or post"
+	}
+    }
+
+    if {[string equal $order "in"] && [string equal $type "bfs"]} {
+	return -code error "unable to do a ${order}-order breadth first walk"
+    }
+
+    return $theargs
+}
+
+# ::struct::tree::WalkCall --
+#
+#	Helper command to 'walk' handling the evaluation
+#	of the user-specified command. Information about
+#	the tree, node and current action are substituted
+#	into the command before it evaluation.
+#
+# Arguments:
+#	tree	Tree we are walking
+#	node	Node we are at.
+#	action	The current action.
+#	cmd	The command to call, already partially substituted.
+#
+# Results:
+#	None.
+
+proc ::struct::tree::WalkCall {avar nvar tree node action cmd} {
+
+    if {$avar != {}} {
+	upvar 2 $avar a ; set a $action
+    }
+    upvar 2 $nvar n ; set n $node
+
+    set code [catch {uplevel 2 $cmd} result]
+
+    # decide what to do upon the return code:
+    #
+    #               0 - the body executed successfully
+    #               1 - the body raised an error
+    #               2 - the body invoked [return]
+    #               3 - the body invoked [break]
+    #               4 - the body invoked [continue]
+    #               5 - the body invoked [struct::tree::prune]
+    # everything else - return and pass on the results
+    #
+    switch -exact -- $code {
+	0 {}
+	1 {
+	    return -errorinfo [ErrorInfoAsCaller uplevel WalkCall]  \
+		    -errorcode $::errorCode -code error $result
+	}
+	3 {
+	    # FRINK: nocheck
+	    return -code break
+	}
+	4 {}
+	5 {
+	    upvar order order
+	    if {[string equal $order post] || [string equal $order in]} {
+		return -code error "Illegal attempt to prune ${order}-order walking"
+	    }
+	    return -code continue
+	}
+	default {
+	    upvar 1 rcode rcode rvalue rvalue
+	    set rcode $code
+	    set rvalue $result
+	    return -code break
+	    #return -code $code $result
+	}
+    }
+    return {}
+}
+
+proc ::struct::tree::WalkCallProc {tree node action cmd} {
+
+    lappend cmd $tree $node $action
+    set code [catch {uplevel 2 $cmd} result]
+
+    # decide what to do upon the return code:
+    #
+    #               0 - the body executed successfully
+    #               1 - the body raised an error
+    #               2 - the body invoked [return]
+    #               3 - the body invoked [break]
+    #               4 - the body invoked [continue]
+    #               5 - the body invoked [struct::tree::prune]
+    # everything else - return and pass on the results
+    #
+    switch -exact -- $code {
+	0 {}
+	1 {
+	    return -errorinfo [ErrorInfoAsCaller uplevel WalkCallProc]  \
+		    -errorcode $::errorCode -code error $result
+	}
+	3 {
+	    # FRINK: nocheck
+	    return -code break
+	}
+	4 {}
+	5 {
+	    upvar order order
+	    if {[string equal $order post] || [string equal $order in]} {
+		return -code error "Illegal attempt to prune ${order}-order walking"
+	    }
+	    return -code continue
+	}
+	default {
+	    upvar 1 rcode rcode rvalue rvalue
+	    set rcode $code
+	    set rvalue $result
+	    return -code break
+	}
+    }
+    return {}
+}
+
+proc ::struct::tree::ErrorInfoAsCaller {find replace} {
+    set info $::errorInfo
+    set i [string last "\n    (\"$find" $info]
+    if {$i == -1} {return $info}
+    set result [string range $info 0 [incr i 6]]	;# keep "\n    (\""
+    append result $replace			;# $find -> $replace
+    incr i [string length $find]
+    set j [string first ) $info [incr i]]	;# keep rest of parenthetical
+    append result [string range $info $i $j]
+    return $result
+}
+
+# ::struct::tree::GenerateUniqueNodeName --
+#
+#	Generate a unique node name for the given tree.
+#
+# Arguments:
+#	name	Name of the tree to generate a unique node name for.
+#
+# Results:
+#	node	Name of a node guaranteed to not exist in the tree.
+
+proc ::struct::tree::GenerateUniqueNodeName {name} {
+    variable ${name}::nextUnusedNode
+    while {[_exists $name "node${nextUnusedNode}"]} {
+	incr nextUnusedNode
+    }
+    return "node${nextUnusedNode}"
+}
+
+# ::struct::tree::KillNode --
+#
+#	Delete all data of a node.
+#
+# Arguments:
+#	name	Name of the tree containing the node
+#	node	Name of the node to delete.
+#
+# Results:
+#	none
+
+proc ::struct::tree::KillNode {name node} {
+    variable ${name}::parent
+    variable ${name}::children
+    variable ${name}::attribute
+
+    # Remove all record of $node
+    unset parent($node)
+    unset children($node)
+
+    if {[info exists attribute($node)]} {
+	# FRINK: nocheck
+	unset ${name}::$attribute($node)
+	unset attribute($node)
+    }
+    return
+}
+
+# ::struct::tree::GenAttributeStorage --
+#
+#	Create an array to store the attributes of a node in.
+#
+# Arguments:
+#	name	Name of the tree containing the node
+#	node	Name of the node which got attributes.
+#
+# Results:
+#	none
+
+proc ::struct::tree::GenAttributeStorage {name node} {
+    variable ${name}::nextAttr
+    variable ${name}::attribute
+
+    set   attr "a[incr nextAttr]"
+    set   attribute($node) $attr
+    return
+}
+
+# ::struct::tree::Serialize --
+#
+#	Serialize a tree object (partially) into a transportable value.
+#
+# Arguments:
+#	name	Name of the tree.
+#	node	Root node of the serialized tree.
+#
+# Results:
+#	None
+
+proc ::struct::tree::Serialize {name node tvar} {
+    upvar 1 $tvar tree
+
+    variable ${name}::attribute
+    variable ${name}::parent
+
+    # 'node' is the root of the tree to serialize. The precondition
+    # for the call is that this node is already stored in the list
+    # 'tvar', at index 'rootidx'.
+
+    # The attribute data for 'node' goes immediately after the 'node'
+    # data. the node information is _not_ yet stored, and this command
+    # has to do this.
+
+
+    array set r {}
+    set loc($node) 0
+
+    lappend tree $node {}
+    if {[info exists attribute($node)]} {
+	upvar ${name}::$attribute($node) data
+	lappend tree [array get data]
+    } else {
+	# Encode nodes without attributes.
+	lappend tree {}
+    }
+
+    foreach n [DescendantsCore $name $node] {
+	set loc($n) [llength $tree]
+	lappend tree $n $loc($parent($n))
+
+	if {[info exists attribute($n)]} {
+	    upvar ${name}::$attribute($n) data
+	    lappend tree [array get data]
+	} else {
+	    # Encode nodes without attributes.
+	    lappend tree {}
+	}
+    }
+
+    return $tree
+}
+
+
+proc ::struct::tree::CheckSerialization {ser avar pvar cvar rnvar} {
+    upvar 1 $avar attr $pvar p $cvar ch $rnvar rn
+
+    # Overall length ok ?
+
+    if {[llength $ser] % 3} {
+	return -code error \
+		"error in serialization: list length not a multiple of 3."
+    }
+
+    set rn {}
+    array set p    {}
+    array set ch   {}
+    array set attr {}
+
+    # Basic decoder pass
+
+    foreach {node parent nattr} $ser {
+
+	# Initialize children data, if not already done
+	if {![info exists ch($node)]} {
+	    set ch($node) {}
+	}
+	# Attribute length ok ? Dictionary!
+	if {[llength $nattr] % 2} {
+	    return -code error \
+		    "error in serialization: malformed attribute dictionary."
+	}
+	# Remember attribute data only for non-empty nodes
+	if {[llength $nattr]} {
+	    set attr($node) $nattr
+	}
+	# Remember root
+	if {$parent == {}} {
+	    lappend rn $node
+	    set p($node) {}
+	    continue
+	}
+	# Parent reference ok ?
+	if {
+	    ![string is integer -strict $parent] ||
+	    ($parent % 3) ||
+	    ($parent < 0) ||
+	    ($parent >= [llength $ser])
+	} {
+	    return -code error \
+		    "error in serialization: bad parent reference \"$parent\"."
+	}
+	# Remember parent, and reconstruct children
+
+	set p($node) [lindex $ser $parent]
+	lappend ch($p($node)) $node
+    }
+
+    # Root node information ok ?
+
+    if {[llength $rn] < 1} {
+	return -code error \
+		"error in serialization: no root specified."
+    } elseif {[llength $rn] > 1} {
+	return -code error \
+		"error in serialization: multiple root nodes."
+    }
+    set rn [lindex $rn 0]
+
+    # Duplicate node names ?
+
+    if {[array size ch] < ([llength $ser] / 3)} {
+	return -code error \
+		"error in serialization: duplicate node names."
+    }
+
+    # Cycles in the parent relationship ?
+
+    array set visited {}
+    foreach n [array names p] {
+	if {[info exists visited($n)]} {continue}
+	array set _ {}
+	while {$n != {}} {
+	    if {[info exists _($n)]} {
+		# Node already converted, cycle.
+		return -code error \
+			"error in serialization: cycle detected."
+	    }
+	    set _($n)       .
+	    # root ?
+	    if {$p($n) == {}} {break}
+	    set n $p($n)
+	    if {[info exists visited($n)]} {break}
+	    set visited($n) .
+	}
+	unset _
+    }
+    # Ok. The data is now ready for the caller.
+
+    return
+}
+
+##########################
+# Private functions follow
+#
+# Do a compatibility version of [lset] for pre-8.4 versions of Tcl.
+# This version does not do multi-arg [lset]!
+
+proc ::struct::tree::K { x y } { set x }
+
+if { [package vcompare [package provide Tcl] 8.4] < 0 } {
+    proc ::struct::tree::lset { var index arg } {
+	upvar 1 $var list
+	set list [::lreplace [K $list [set list {}]] $index $index $arg]
+    }
+}
+
+proc ::struct::tree::ldelete {var index {end {}}} {
+    upvar 1 $var list
+    if {$end == {}} {set end $index}
+    set list [lreplace [K $list [set list {}]] $index $end]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::struct {
+    # Put 'tree::tree' into the general structure namespace
+    # for pickup by the main management.
+
+    namespace import -force tree::tree_tcl
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tar/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tar/pkgIndex.tcl
new file mode 100644
index 00000000..aaf0eec6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tar/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded tar 0.11 [list source [file join $dir tar.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tar/tar.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tar/tar.tcl
new file mode 100644
index 00000000..8b5d6fba
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tar/tar.tcl
@@ -0,0 +1,547 @@
+# tar.tcl --
+#
+#       Creating, extracting, and listing posix tar archives
+#
+# Copyright (c) 2004    Aaron Faupell <afaupell@users.sourceforge.net>
+# Copyright (c) 2013    Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#                       (GNU tar @LongLink support).
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: tar.tcl,v 1.17 2012/09/11 17:22:24 andreas_kupries Exp $
+
+package require Tcl 8.4
+package provide tar 0.11
+
+namespace eval ::tar {}
+
+proc ::tar::parseOpts {acc opts} {
+    array set flags $acc
+    foreach {x y} $acc {upvar $x $x}
+    
+    set len [llength $opts]
+    set i 0
+    while {$i < $len} {
+        set name [string trimleft [lindex $opts $i] -]
+        if {![info exists flags($name)]} {
+	    return -errorcode {TAR INVALID OPTION} \
+		-code error "unknown option \"$name\""
+	}
+        if {$flags($name) == 1} {
+            set $name [lindex $opts [expr {$i + 1}]]
+            incr i $flags($name)
+        } elseif {$flags($name) > 1} {
+            set $name [lrange $opts [expr {$i + 1}] [expr {$i + $flags($name)}]]
+            incr i $flags($name)
+        } else {
+            set $name 1
+        }
+        incr i
+    }
+}
+
+proc ::tar::pad {size} {
+    set pad [expr {512 - ($size % 512)}]
+    if {$pad == 512} {return 0}
+    return $pad
+}
+
+proc ::tar::seekorskip {ch off wh} {
+    if {[tell $ch] < 0} {
+	if {$wh!="current"} {
+	    return -code error -errorcode [list TAR INVALID WHENCE $wh] \
+		"WHENCE=$wh not supported on non-seekable channel $ch"
+	}
+	skip $ch $off
+	return
+    }
+    seek $ch $off $wh
+    return
+}
+
+proc ::tar::skip {ch skipover} {
+    while {$skipover > 0} {
+	set requested $skipover
+
+	# Limit individual skips to 64K, as a compromise between speed
+	# of skipping (Number of read requests), and memory usage
+	# (Note how skipped block is read into memory!). While the
+	# read data is immediately discarded it still generates memory
+	# allocation traffic, gets copied, etc. Trying to skip the
+	# block in one go without the limit may cause us to run out of
+	# (virtual) memory, or just induce swapping, for nothing.
+
+	if {$requested > 65536} {
+	    set requested 65536
+	}
+
+	set skipped [string length [read $ch $requested]]
+
+	# Stop in short read into the end of the file.
+	if {!$skipped && [eof $ch]} break
+
+	# Keep track of how much is (not) skipped yet.
+	incr skipover -$skipped
+    }
+    return
+}
+
+proc ::tar::readHeader {data} {
+    binary scan $data a100a8a8a8a12a12a8a1a100a6a2a32a32a8a8a155 \
+                      name mode uid gid size mtime cksum type \
+                      linkname magic version uname gname devmajor devminor prefix
+
+    foreach x {name type linkname} {
+        set $x [string trim [set $x] "\x00"]
+    }
+    foreach x {uid gid size mtime cksum} {
+        set $x [format %d 0[string trim [set $x] " \x00"]]
+    }
+    set mode [string trim $mode " \x00"]
+
+    if {$magic == "ustar "} {
+        # gnu tar
+        # not fully supported
+        foreach x {uname gname prefix} {
+            set $x [string trim [set $x] "\x00"]
+        }
+        foreach x {devmajor devminor} {
+            set $x [format %d 0[string trim [set $x] " \x00"]]
+        }
+    } elseif {$magic == "ustar\x00"} {
+        # posix tar
+        foreach x {uname gname prefix} {
+            set $x [string trim [set $x] "\x00"]
+        }
+        foreach x {devmajor devminor} {
+            set $x [format %d 0[string trim [set $x] " \x00"]]
+        }
+    } else {
+        # old style tar
+        foreach x {uname gname devmajor devminor prefix} { set $x {} }
+        if {$type == ""} {
+            if {[string match */ $name]} {
+                set type 5
+            } else {
+                set type 0
+            }
+        }
+    }
+
+    return [list name $name mode $mode uid $uid gid $gid size $size mtime $mtime \
+                 cksum $cksum type $type linkname $linkname magic $magic \
+                 version $version uname $uname gname $gname devmajor $devmajor \
+                 devminor $devminor prefix $prefix]
+}
+
+proc ::tar::contents {file args} {
+    set chan 0
+    parseOpts {chan 0} $args
+    if {$chan} {
+	set fh $file
+    } else {
+	set fh [::open $file]
+	fconfigure $fh -encoding binary -translation lf -eofchar {}
+    }
+    set ret {}
+    while {![eof $fh]} {
+        array set header [readHeader [read $fh 512]]
+	HandleLongLink $fh header
+        if {$header(name) == ""} break
+	if {$header(prefix) != ""} {append header(prefix) /}
+        lappend ret $header(prefix)$header(name)
+        seekorskip $fh [expr {$header(size) + [pad $header(size)]}] current
+    }
+    if {!$chan} {
+	close $fh
+    }
+    return $ret
+}
+
+proc ::tar::stat {tar {file {}} args} {
+    set chan 0
+    parseOpts {chan 0} $args
+    if {$chan} {
+	set fh $tar
+    } else {
+	set fh [::open $tar]
+	fconfigure $fh -encoding binary -translation lf -eofchar {}
+    }
+    set ret {}
+    while {![eof $fh]} {
+        array set header [readHeader [read $fh 512]]
+	HandleLongLink $fh header
+        if {$header(name) == ""} break
+	if {$header(prefix) != ""} {append header(prefix) /}
+        seekorskip $fh [expr {$header(size) + [pad $header(size)]}] current
+        if {$file != "" && "$header(prefix)$header(name)" != $file} {continue}
+        set header(type) [string map {0 file 5 directory 3 characterSpecial 4 blockSpecial 6 fifo 2 link} $header(type)]
+        set header(mode) [string range $header(mode) 2 end]
+        lappend ret $header(prefix)$header(name) [list mode $header(mode) uid $header(uid) gid $header(gid) \
+                    size $header(size) mtime $header(mtime) type $header(type) linkname $header(linkname) \
+                    uname $header(uname) gname $header(gname) devmajor $header(devmajor) devminor $header(devminor)]
+    }
+    if {!$chan} {
+	close $fh
+    }
+    return $ret
+}
+
+proc ::tar::get {tar file args} {
+    set chan 0
+    parseOpts {chan 0} $args
+    if {$chan} {
+	set fh $tar
+    } else {
+	set fh [::open $tar]
+	fconfigure $fh -encoding binary -translation lf -eofchar {}
+    }
+    while {![eof $fh]} {
+	set data [read $fh 512]
+        array set header [readHeader $data]
+	HandleLongLink $fh header
+        if {$header(name) eq ""} break
+	if {$header(prefix) ne ""} {append header(prefix) /}
+        set name [string trimleft $header(prefix)$header(name) /]
+        if {$name eq $file} {
+            set file [read $fh $header(size)]
+            if {!$chan} {
+		close $fh
+	    }
+            return $file
+        }
+        seekorskip $fh [expr {$header(size) + [pad $header(size)]}] current
+    }
+    if {!$chan} {
+	close $fh
+    }
+    return -code error -errorcode {TAR MISSING FILE} \
+	"Tar \"$tar\": File \"$file\" not found"
+}
+
+proc ::tar::untar {tar args} {
+    set nooverwrite 0
+    set data 0
+    set nomtime 0
+    set noperms 0
+    set chan 0
+    parseOpts {dir 1 file 1 glob 1 nooverwrite 0 nomtime 0 noperms 0 chan 0} $args
+    if {![info exists dir]} {set dir [pwd]}
+    set pattern *
+    if {[info exists file]} {
+        set pattern [string map {* \\* ? \\? \\ \\\\ \[ \\\[ \] \\\]} $file]
+    } elseif {[info exists glob]} {
+        set pattern $glob
+    }
+
+    set ret {}
+    if {$chan} {
+	set fh $tar
+    } else {
+	set fh [::open $tar]
+	fconfigure $fh -encoding binary -translation lf -eofchar {}
+    }
+    while {![eof $fh]} {
+        array set header [readHeader [read $fh 512]]
+	HandleLongLink $fh header
+        if {$header(name) == ""} break
+	if {$header(prefix) != ""} {append header(prefix) /}
+        set name [string trimleft $header(prefix)$header(name) /]
+        if {![string match $pattern $name] || ($nooverwrite && [file exists $name])} {
+            seekorskip $fh [expr {$header(size) + [pad $header(size)]}] current
+            continue
+        }
+
+        set name [file join $dir $name]
+        if {![file isdirectory [file dirname $name]]} {
+            file mkdir [file dirname $name]
+            lappend ret [file dirname $name] {}
+        }
+        if {[string match {[0346]} $header(type)]} {
+            if {[catch {::open $name w+} new]} {
+                # sometimes if we dont have write permission we can still delete
+                catch {file delete -force $name}
+                set new [::open $name w+]
+            }
+            fconfigure $new -encoding binary -translation lf -eofchar {}
+            fcopy $fh $new -size $header(size)
+            close $new
+            lappend ret $name $header(size)
+        } elseif {$header(type) == 5} {
+            file mkdir $name
+            lappend ret $name {}
+        } elseif {[string match {[12]} $header(type)] && $::tcl_platform(platform) == "unix"} {
+            catch {file delete $name}
+            if {![catch {file link [string map {1 -hard 2 -symbolic} $header(type)] $name $header(linkname)}]} {
+                lappend ret $name {}
+            }
+        }
+        seekorskip $fh [pad $header(size)] current
+        if {![file exists $name]} continue
+
+        if {$::tcl_platform(platform) == "unix"} {
+            if {!$noperms} {
+                catch {file attributes $name -permissions 0[string range $header(mode) 2 end]}
+            }
+            catch {file attributes $name -owner $header(uid) -group $header(gid)}
+            catch {file attributes $name -owner $header(uname) -group $header(gname)}
+        }
+        if {!$nomtime} {
+            file mtime $name $header(mtime)
+        }
+    }
+    if {!$chan} {
+	close $fh
+    }
+    return $ret
+}
+
+## 
+ # ::tar::statFile
+ # 
+ # Returns stat info about a filesystem object, in the form of an info 
+ # dictionary like that returned by ::tar::readHeader.
+ # 
+ # The mode, uid, gid, mtime, and type entries are always present. 
+ # The size and linkname entries are present if relevant for this type 
+ # of object. The uname and gname entries are present if the OS supports 
+ # them. No devmajor or devminor entry is present.
+ ##
+
+proc ::tar::statFile {name followlinks} {
+    if {$followlinks} {
+        file stat $name stat
+    } else {
+        file lstat $name stat
+    }
+    
+    set ret {}
+    
+    if {$::tcl_platform(platform) == "unix"} {
+        lappend ret mode 1[file attributes $name -permissions]
+        lappend ret uname [file attributes $name -owner]
+        lappend ret gname [file attributes $name -group]
+        if {$stat(type) == "link"} {
+            lappend ret linkname [file link $name]
+        }
+    } else {
+        lappend ret mode [lindex {100644 100755} [expr {$stat(type) == "directory"}]]
+    }
+    
+    lappend ret  uid $stat(uid)  gid $stat(gid)  mtime $stat(mtime) \
+      type $stat(type)
+    
+    if {$stat(type) == "file"} {lappend ret size $stat(size)}
+    
+    return $ret
+}
+
+## 
+ # ::tar::formatHeader
+ # 
+ # Opposite operation to ::tar::readHeader; takes a file name and info 
+ # dictionary as arguments, returns a corresponding (POSIX-tar) header.
+ # 
+ # The following dictionary entries must be present:
+ #   mode
+ #   type
+ # 
+ # The following dictionary entries are used if present, otherwise 
+ # the indicated default is used:
+ #   uid       0
+ #   gid       0
+ #   size      0
+ #   mtime     [clock seconds]
+ #   linkname  {}
+ #   uname     {}
+ #   gname     {}
+ #   
+ # All other dictionary entries, including devmajor and devminor, are 
+ # presently ignored.
+ ##
+
+proc ::tar::formatHeader {name info} {
+    array set A {
+        linkname ""
+        uname ""
+        gname ""
+        size 0
+        gid  0
+        uid  0
+    }
+    set A(mtime) [clock seconds]
+    array set A $info
+    array set A {devmajor "" devminor ""}
+
+    set type [string map {file 0 directory 5 characterSpecial 3 \
+      blockSpecial 4 fifo 6 link 2 socket A} $A(type)]
+    
+    set osize  [format %o $A(size)]
+    set ogid   [format %o $A(gid)]
+    set ouid   [format %o $A(uid)]
+    set omtime [format %o $A(mtime)]
+    
+    set name [string trimleft $name /]
+    if {[string length $name] > 255} {
+        return -code error -errorcode {TAR BAD PATH LENGTH} \
+	    "path name over 255 chars"
+    } elseif {[string length $name] > 100} {
+	set common [string range $name end-99 154]
+	if {[set splitpoint [string first / $common]] == -1} {
+	    return -code error -errorcode {TAR BAD PATH UNSPLITTABLE} \
+		"path name cannot be split into prefix and name"
+	}
+	set prefix [string range $name 0 end-100][string range $common 0 $splitpoint-1]
+	set name   [string range $common $splitpoint+1 end][string range $name 155 end]
+    } else {
+        set prefix ""
+    }
+
+    set header [binary format a100A8A8A8A12A12A8a1a100A6a2a32a32a8a8a155a12 \
+                              $name $A(mode)\x00 $ouid\x00 $ogid\x00\
+                              $osize\x00 $omtime\x00 {} $type \
+                              $A(linkname) ustar\x00 00 $A(uname) $A(gname)\
+                              $A(devmajor) $A(devminor) $prefix {}]
+
+    binary scan $header c* tmp
+    set cksum 0
+    foreach x $tmp {incr cksum $x}
+
+    return [string replace $header 148 155 [binary format A8 [format %o $cksum]\x00]]
+}
+
+
+proc ::tar::recurseDirs {files followlinks} {
+    foreach x $files {
+        if {[file isdirectory $x] && ([file type $x] != "link" || $followlinks)} {
+            if {[set more [glob -dir $x -nocomplain *]] != ""} {
+                eval lappend files [recurseDirs $more $followlinks]
+            } else {
+                lappend files $x
+            }
+        }
+    }
+    return $files
+}
+
+proc ::tar::writefile {in out followlinks name} {
+     puts -nonewline $out [formatHeader $name [statFile $in $followlinks]]
+     set size 0
+     if {[file type $in] == "file" || ($followlinks && [file type $in] == "link")} {
+         set in [::open $in]
+         fconfigure $in -encoding binary -translation lf -eofchar {}
+         set size [fcopy $in $out]
+         close $in
+     }
+     puts -nonewline $out [string repeat \x00 [pad $size]]
+}
+
+proc ::tar::create {tar files args} {
+    set dereference 0
+    set chan 0
+    parseOpts {dereference 0 chan 0} $args
+
+    if {$chan} {
+	set fh $tar
+    } else {
+	set fh [::open $tar w+]
+	fconfigure $fh -encoding binary -translation lf -eofchar {}
+    }
+    foreach x [recurseDirs $files $dereference] {
+        writefile $x $fh $dereference $x
+    }
+    puts -nonewline $fh [string repeat \x00 1024]
+
+    if {!$chan} {
+	close $fh
+    }
+    return $tar
+}
+
+proc ::tar::add {tar files args} {
+    set dereference 0
+    set prefix ""
+    set quick 0
+    parseOpts {dereference 0 prefix 1 quick 0} $args
+    
+    set fh [::open $tar r+]
+    fconfigure $fh -encoding binary -translation lf -eofchar {}
+    
+    if {$quick} then {
+        seek $fh -1024 end
+    } else {
+        set data [read $fh 512]
+        while {[regexp {[^\0]} $data]} {
+            array set header [readHeader $data]
+            seek $fh [expr {$header(size) + [pad $header(size)]}] current
+            set data [read $fh 512]
+        }
+        seek $fh -512 current
+    }
+
+    foreach x [recurseDirs $files $dereference] {
+        writefile $x $fh $dereference $prefix$x
+    }
+    puts -nonewline $fh [string repeat \x00 1024]
+
+    close $fh
+    return $tar
+}
+
+proc ::tar::remove {tar files} {
+    set n 0
+    while {[file exists $tar$n.tmp]} {incr n}
+    set tfh [::open $tar$n.tmp w]
+    set fh [::open $tar r]
+
+    fconfigure $fh  -encoding binary -translation lf -eofchar {}
+    fconfigure $tfh -encoding binary -translation lf -eofchar {}
+
+    while {![eof $fh]} {
+        array set header [readHeader [read $fh 512]]
+        if {$header(name) == ""} {
+            puts -nonewline $tfh [string repeat \x00 1024]
+            break
+        }
+	if {$header(prefix) != ""} {append header(prefix) /}
+        set name $header(prefix)$header(name)
+        set len [expr {$header(size) + [pad $header(size)]}]
+        if {[lsearch $files $name] > -1} {
+            seek $fh $len current
+        } else {
+            seek $fh -512 current
+            fcopy $fh $tfh -size [expr {$len + 512}]
+        }
+    }
+
+    close $fh
+    close $tfh
+
+    file rename -force $tar$n.tmp $tar
+}
+
+proc ::tar::HandleLongLink {fh hv} {
+    upvar 1 $hv header thelongname thelongname
+
+    # @LongName Part I.
+    if {$header(type) == "L"} {
+	# Size == Length of name. Read it, and pad to full 512
+	# size.  After that is a regular header for the actual
+	# file, where we have to insert the name. This is handled
+	# by the next iteration and the part II below.
+	set thelongname [string trimright [read $fh $header(size)] \000]
+	seekorskip $fh [pad $header(size)] current
+	return -code continue
+    }
+    # Not supported yet: type 'K' for LongLink (long symbolic links).
+
+    # @LongName, part II, get data from previous entry, if defined.
+    if {[info exists thelongname]} {
+	set header(name) $thelongname
+	# Prevent leakage to further entries.
+	unset thelongname
+    }
+
+    return
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/critcl-rt.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/critcl-rt.tcl
new file mode 100644
index 00000000..0622f0ee
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/critcl-rt.tcl
@@ -0,0 +1,381 @@
+#
+#   Critcl - build C extensions on-the-fly
+#
+#   Copyright (c) 2001-2007 Jean-Claude Wippler
+#   Copyright (c) 2002-2007 Steve Landers
+#
+#   See http://wiki.tcl.tk/critcl
+#
+#   This is the Critcl runtime that loads the appropriate
+#   shared library when a package is requested
+#
+
+namespace eval ::critcl::runtime {}
+
+proc ::critcl::runtime::loadlib {dir package version libname initfun tsrc mapping args} {
+    # XXX At least parts of this can be done by the package generator,
+    # XXX like listing the Tcl files to source. The glob here allows
+    # XXX code-injection after-the-fact, by simply adding a .tcl in
+    # XXX the proper place.
+    set path [file join $dir [MapPlatform $mapping]]
+    set ext [info sharedlibextension]
+    set lib [file join $path $libname$ext]
+    set provide [list]
+
+    # Now the runtime equivalent of a series of 'preFetch' commands.
+    if {[llength $args]} {
+	set preload [file join $path preload$ext]
+	foreach p $args {
+	    set prelib [file join $path $p$ext]
+	    if {[file readable $preload] && [file readable $prelib]} {
+		lappend provide [list load $preload];# XXX Move this out of the loop, do only once.
+		lappend provide [list ::critcl::runtime::preload $prelib]
+	    }
+	}
+    }
+
+    lappend provide [list load $lib $initfun]
+    foreach t $tsrc {
+	lappend loadcmd "::critcl::runtime::Fetch \$dir [list $t]"
+    }
+    lappend provide "package provide $package $version"
+    package ifneeded $package $version [join $provide "\n"]
+    return
+}
+
+proc ::critcl::runtime::preFetch {path ext dll} {
+    set preload [file join $path preload$ext]
+    if {![file readable $preload]} return
+
+    set prelib [file join $path $dll$ext]
+    if {![file readable $prelib]} return
+
+    load $preload ; # Defines next command.
+    ::critcl::runtime::preload $prelib
+    return
+}
+
+proc ::critcl::runtime::Fetch {dir t} {
+    # The 'Ignore' disables compile & run functionality.
+
+    # Background: If the regular critcl package is already loaded, and
+    # this prebuilt package uses its defining .tcl file also as a
+    # 'tsources' then critcl might try to collect data and build it
+    # because of the calls to its API, despite the necessary binaries
+    # already being present, just not in the critcl cache. That is
+    # redundant in the best case, and fails in the worst case (no
+    # compiler), preventing the use o a perfectly fine package. The
+    # 'ignore' call now tells critcl that it should ignore any calls
+    # made to it by the sourced files, and thus avoids that trouble.
+
+    # The other case, the regular critcl package getting loaded after
+    # this prebuilt package is irrelevant. At that point the tsources
+    # were already run, and used the dummy procedures defined in the
+    # critcl-rt.tcl, which ignore the calls by definition.
+
+    set t [file join $dir tcl $t]
+    ::critcl::Ignore $t
+    uplevel #0 [list source $t]
+    return
+}
+
+proc ::critcl::runtime::precopy {dll} {
+    # This command is only used on Windows when preloading out of a
+    # VFS that doesn't support direct loading (usually, a Starkit)
+    #   - we preserve the dll name so that dependencies are satisfied
+    #	- The critcl::runtime::preload command is defined in the supporting
+    #     "preload" package, implemented in "critcl/lib/critcl/critcl_c/preload.c"
+
+    global env
+    if {[info exists env(TEMP)]} {
+	set dir $env(TEMP)
+    } elseif {[info exists env(TMP)]} {
+	set dir $env(TMP)
+    } elseif {[info exists ~]} {
+	set dir ~
+    } else {
+	set dir .
+    }
+    set dir [file join $dir TCL[pid]]
+    set i 0
+    while {[file exists $dir]} {
+	append dir [incr i]
+    }
+    set new [file join $dir [file tail $dll]]
+    file mkdir $dir
+    file copy $dll $new
+    return $new
+}
+
+proc ::critcl::runtime::MapPlatform {{mapping {}}} {
+    # A sibling of critcl::platform that applies the platform mapping
+
+    set platform [::platform::generic]
+    set version $::tcl_platform(osVersion)
+    if {[string match "macosx-*" $platform]} {
+	# "normalize" the osVersion to match OSX release numbers
+	set v [split $version .]
+	set v1 [lindex $v 0]
+	set v2 [lindex $v 1]
+	incr v1 -4
+	set version 10.$v1.$v2
+    } else {
+	# Strip trailing non-version info
+	regsub -- {-.*$} $version {} version
+    }
+    foreach {config map} $mapping {
+	if {![string match $config $platform]} continue
+	set minver [lindex $map 1]
+	if {[package vcompare $version $minver] < 0} continue
+	set platform [lindex $map 0]
+	break
+    }
+    return $platform
+}
+
+# Dummy implementation of the critcl package, if not present
+if {![llength [info commands ::critcl::Ignore]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::Ignore {args} {
+		namespace eval ::critcl::v {}
+		set ::critcl::v::ignore([file normalize [lindex $args 0]]) .
+	    }
+}
+if {![llength [info commands ::critcl::api]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::api {args} {}
+}
+if {![llength [info commands ::critcl::at]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::at {args} {}
+}
+if {![llength [info commands ::critcl::cache]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::cache {args} {}
+}
+if {![llength [info commands ::critcl::ccode]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::ccode {args} {}
+}
+if {![llength [info commands ::critcl::ccommand]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::ccommand {args} {}
+}
+if {![llength [info commands ::critcl::cdata]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::cdata {args} {}
+}
+if {![llength [info commands ::critcl::cdefines]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::cdefines {args} {}
+}
+if {![llength [info commands ::critcl::cflags]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::cflags {args} {}
+}
+if {![llength [info commands ::critcl::cheaders]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::cheaders {args} {}
+}
+if {![llength [info commands ::critcl::check]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::check {args} {return 0}
+}
+if {![llength [info commands ::critcl::cinit]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::cinit {args} {}
+}
+if {![llength [info commands ::critcl::clibraries]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::clibraries {args} {}
+}
+if {![llength [info commands ::critcl::compiled]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::compiled {args} {return 1}
+}
+if {![llength [info commands ::critcl::compiling]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::compiling {args} {return 0}
+}
+if {![llength [info commands ::critcl::config]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::config {args} {}
+}
+if {![llength [info commands ::critcl::cproc]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::cproc {args} {}
+}
+if {![llength [info commands ::critcl::csources]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::csources {args} {}
+}
+if {![llength [info commands ::critcl::debug]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::debug {args} {}
+}
+if {![llength [info commands ::critcl::done]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::done {args} {return 1}
+}
+if {![llength [info commands ::critcl::failed]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::failed {args} {return 0}
+}
+if {![llength [info commands ::critcl::framework]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::framework {args} {}
+}
+if {![llength [info commands ::critcl::include]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::include {args} {}
+}
+if {![llength [info commands ::critcl::ldflags]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::ldflags {args} {}
+}
+if {![llength [info commands ::critcl::license]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::license {args} {}
+}
+if {![llength [info commands ::critcl::load]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::load {args} {return 1}
+}
+if {![llength [info commands ::critcl::make]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::make {args} {}
+}
+if {![llength [info commands ::critcl::meta]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::meta {args} {}
+}
+if {![llength [info commands ::critcl::platform]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::platform {args} {}
+}
+if {![llength [info commands ::critcl::preload]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::preload {args} {}
+}
+if {![llength [info commands ::critcl::source]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::source {args} {}
+}
+if {![llength [info commands ::critcl::tcl]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::tcl {args} {}
+}
+if {![llength [info commands ::critcl::tk]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::tk {args} {}
+}
+if {![llength [info commands ::critcl::tsources]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::tsources {args} {}
+}
+if {![llength [info commands ::critcl::userconfig]]} {
+    namespace eval ::critcl {}
+    proc ::critcl::userconfig {args} {}
+}
+
+# Define a clone of platform::generic, if needed
+if {![llength [info commands ::platform::generic]]} {
+    namespace eval ::platform {}
+    proc ::platform::generic {} {
+        global tcl_platform
+    
+        set plat [string tolower [lindex $tcl_platform(os) 0]]
+        set cpu  $tcl_platform(machine)
+    
+        switch -glob -- $cpu {
+    	sun4* {
+    	    set cpu sparc
+    	}
+    	intel -
+    	ia32* -
+    	i*86* {
+    	    set cpu ix86
+    	}
+    	x86_64 {
+    	    if {$tcl_platform(wordSize) == 4} {
+    		# See Example <1> at the top of this file.
+    		set cpu ix86
+    	    }
+    	}
+    	ppc -
+    	"Power*" {
+    	    set cpu powerpc
+    	}
+    	"arm*" {
+    	    set cpu arm
+    	}
+    	ia64 {
+    	    if {$tcl_platform(wordSize) == 4} {
+    		append cpu _32
+    	    }
+    	}
+        }
+    
+        switch -glob -- $plat {
+    	windows {
+    	    if {$tcl_platform(platform) == "unix"} {
+    		set plat cygwin
+    	    } else {
+    		set plat win32
+    	    }
+    	    if {$cpu eq "amd64"} {
+    		# Do not check wordSize, win32-x64 is an IL32P64 platform.
+    		set cpu x86_64
+    	    }
+    	}
+    	sunos {
+    	    set plat solaris
+    	    if {[string match "ix86" $cpu]} {
+    		if {$tcl_platform(wordSize) == 8} {
+    		    set cpu x86_64
+    		}
+    	    } elseif {![string match "ia64*" $cpu]} {
+    		# sparc
+    		if {$tcl_platform(wordSize) == 8} {
+    		    append cpu 64
+    		}
+    	    }
+    	}
+    	darwin {
+    	    set plat macosx
+    	    # Correctly identify the cpu when running as a 64bit
+    	    # process on a machine with a 32bit kernel
+    	    if {$cpu eq "ix86"} {
+    		if {$tcl_platform(wordSize) == 8} {
+    		    set cpu x86_64
+    		}
+    	    }
+    	}
+    	aix {
+    	    set cpu powerpc
+    	    if {$tcl_platform(wordSize) == 8} {
+    		append cpu 64
+    	    }
+    	}
+    	hp-ux {
+    	    set plat hpux
+    	    if {![string match "ia64*" $cpu]} {
+    		set cpu parisc
+    		if {$tcl_platform(wordSize) == 8} {
+    		    append cpu 64
+    		}
+    	    }
+    	}
+    	osf1 {
+    	    set plat tru64
+    	}
+    	default {
+    	    set plat [lindex [split $plat _-] 0]
+    	}
+        }
+    
+        return "${plat}-${cpu}"
+    }
+}
+
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/license.terms b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/license.terms
new file mode 100644
index 00000000..6975e4c9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/license.terms
@@ -0,0 +1 @@
+<<Undefined>>
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/pkgIndex.tcl
new file mode 100644
index 00000000..f714c252
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/pkgIndex.tcl
@@ -0,0 +1,9 @@
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+package ifneeded tcllibc 0.4 [list ::apply {dir {
+    source [file join $dir critcl-rt.tcl]
+    set path [file join $dir [::critcl::runtime::MapPlatform]]
+    set ext [info sharedlibextension]
+    set lib [file join $path "tcllibc$ext"]
+    load $lib Tcllibc
+    package provide tcllibc 0.4
+}} $dir]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/teapot.txt b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/teapot.txt
new file mode 100644
index 00000000..cbac71e9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/teapot.txt
@@ -0,0 +1,27 @@
+Package tcllibc 0.4
+Meta platform win32-x86_64
+Meta build::date 2023-09-05
+Meta generated::by {critcl 3.2} jnoble {critcl 3.2} jnoble {critcl 3.2}
+Meta generated::by jnoble {critcl 3.2} jnoble {critcl 3.2} jnoble
+Meta generated::by {critcl 3.2} jnoble {critcl 3.2} jnoble {critcl 3.2}
+Meta generated::by jnoble {critcl 3.2} jnoble {critcl 3.2} jnoble
+Meta generated::by {critcl 3.2} jnoble {critcl 3.2} jnoble {critcl 3.2}
+Meta generated::by jnoble {critcl 3.2} jnoble {critcl 3.2} jnoble
+Meta generated::by {critcl 3.2} jnoble {critcl 3.2} jnoble {critcl 3.2}
+Meta generated::by jnoble {critcl 3.2} jnoble {critcl 3.2} jnoble
+Meta generated::by {critcl 3.2} jnoble {critcl 3.2} jnoble
+Meta generated::date critcl
+Meta require {Tcl 8.6} {Tcl 8.2} {Tcl 8.4} {Tcl 8.4} {Tcl 8.4} {md5 2}
+Meta require {Tcl 8.5} {Tcl 8.2} {Tcl 8.4} {Tcl 8.4} {Tcl 8.4} {Tcl 8.2}
+Meta require {Tcl 8.2} {Tcl 8.2} {Tcl 8.2} {Tcl 8.4} {Tcl 8.4}
+Meta license BSD licensed.
+Meta author {Andreas Kupries}
+Meta entrytclcommand {eval [list ::apply {dir {
+    source [file join $dir critcl-rt.tcl]
+    set path [file join $dir [::critcl::runtime::MapPlatform]]
+    set ext [info sharedlibextension]
+    set lib [file join $path "tcllibc$ext"]
+    load $lib Tcllibc
+    package provide tcllibc 0.4
+}} $dir]}
+Meta included critcl-rt.tcl win32-x86_64/tcllibc.dll
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/win32-x86_64/tcllibc.dll b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/win32-x86_64/tcllibc.dll
new file mode 100644
index 00000000..1fecd9a8
Binary files /dev/null and b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tcllibc/win32-x86_64/tcllibc.dll differ
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tepam/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tepam/pkgIndex.tcl
new file mode 100644
index 00000000..b5751b7f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tepam/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.3]} {return}
+package ifneeded tepam          0.5.2 [list source [file join $dir tepam.tcl]]
+package ifneeded tepam::doc_gen 0.1.1 [list source [file join $dir tepam_doc_gen.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tepam/tepam.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tepam/tepam.tcl
new file mode 100644
index 00000000..41927b20
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tepam/tepam.tcl
@@ -0,0 +1,2781 @@
+##########################################################################
+# TEPAM - Tcl's Enhanced Procedure and Argument Manager
+##########################################################################
+# tepam.tcl - TEPAM main Tcl package
+# 
+# TEPAM offers an alternative way to declare Tcl procedures. It provides 
+# enhanced argument handling features like automatically generatehd, 
+# graphical entry forms and checkers for the procedure arguments.
+#
+# Copyright (C) 2009/2010/2011 Andreas Drollinger
+# 
+# Id: tepam.tcl
+##########################################################################
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+##########################################################################
+
+package require Tcl 8.3
+
+namespace eval tepam {
+   # Exports the major commands from this package:
+   namespace export procedure argument_dialogbox
+
+##########################################################################
+#                            procedure                                   #
+##########################################################################
+
+   ######## Procedure configuration ########
+   
+   # Set the following variable to 0 (false) prior to the procedure definition, to
+   # use first the unnamed arguments and then the named arguments.
+   set named_arguments_first 1
+   
+   # Setting the following variable to 0 will disable the automatic argument name
+   # extension feature.
+   set auto_argument_name_completion 1
+
+   # Set the following variable prior to the procedure definition to:
+   #   - 0 (false): to disable command logging
+   #   - 1 (true): to log all commands anytime
+   #   - "interactive": to log only interactively called commands
+   set command_log "interactive"
+   
+   # Set the following variable to "short" to generate small interactive dialog boxes.
+   set interactive_display_format "extended"
+
+   # The following variable defines the maximum line length a created help text can have:
+   set help_line_length 80
+
+   ######## Internal variables ########
+
+   if {![info exists ProcedureList]} {
+      set ProcedureList {}
+   }
+
+   ######## PureProcName ########
+
+   # PureProcName purifies the procedure name given by the ProcName variable of the calling 
+   # function and returns it. PureProcName is basically:
+   # * Eliminating the main namespace indicators
+   # * Encapsulating the name into '' if it is a composed name
+   proc PureProcName {args} {
+      upvar ProcName ProcName
+      set Name $ProcName
+      regsub {^::} $Name {} Name; # Eliminate the main namespace indicators
+      if {[lsearch $args -appo]>=0} { # Encapsulate the name into '' if it is a composed name
+         set Name "'$Name'"
+      }
+      return $Name
+   }
+
+   ######## Procedure help text ########
+   
+   set ProcedureHelp {
+      procedure <ProcedureName> <ProcedureAttributes> <ProcedureBody>
+
+      <ProcedureAttributes> = {
+         [-category <Category>] 
+         [-short_description <ShortDescription>]
+         [-description <Description>]
+         [-return <Return_Type>]
+         [-example <Example>]
+         [-named_arguments_first 0|1]
+         [-command_log 0|1|"interactive"]
+         [-auto_argument_name_completion 0|1]
+         [-interactive_display_format]
+         [-validatecommand <ValidateCommand>]
+         [-validatecommand_error_text <ValidateCommandErrorText>]
+         [-args <ArgumentDeclarationList>]
+      }
+
+      <ArgumentDeclarationList> = {<ArgumentDeclaration> [ArgumentDeclaration ...]}
+
+      <ArgumentDeclaration> = {
+         <Argument_Name>
+         [-description <ArgumentDescription>]
+         [-type <ArgumentType>]
+         [-validatecommand <ValidateCommand>]
+         [-validatecommand_error_text <ValidateCommandErrorText>]
+         [-default <DefaultValue>]
+         [-optional | -mandatory]
+         [-choices <ChoiceList>]
+         [-choicelabels <ChoiceLabelList>]
+         [-range {<MinValue> <MaxValue>}
+         [-multiple]
+         [-auxargs <AuxilaryArgumentList>]
+         [-auxargs_commands <AuxilaryArgumentCommandList>]
+      }
+
+      <ArgumentType> = {
+         none double integer alnum alpha ascii control digit graph lower 
+         print punct space upper wordchar xdigit color font boolean ""
+      }
+   }
+
+   # Eliminate leading tabs in the help text and replace eventual tabs through spaces
+   regsub -all -line {^\t\t} $ProcedureHelp "" ProcedureHelp
+   regsub -all -line {\t} $ProcedureHelp "   " ProcedureHelp
+
+   ######## Procedure ########
+
+   # Procedure allows declaring a new procedure in the TEPAM syntax:
+   #
+   #    procedure my_proc {
+   #       -args {message}
+   #    } {
+   #       puts $message; # Procedure body
+   #    }
+   #
+   # Procedure creates in fact a TCL procedure with a patched procedure body. This body calls at 
+   # the beginning an argument parser (ProcedureArgumentEvaluation) that is reading and validating 
+   # the arguments that have been provided to the procedure. The previous lines are for example 
+   # creating the following TCL procedure:
+   #
+   #    proc my_proc {args} {
+   #       ::tepam::ProcedureArgumentEvaluation;
+   #       if {$ProcedureArgumentEvaluationResult!=""} {
+   #          if {$ProcedureArgumentEvaluationResult=="cancel"} return;
+   #          return -code error $ProcedureArgumentEvaluationResult;
+   #       }
+   #       if {$SubProcedure!=""} {return [$SubProcedure]};
+   #
+   #       puts $message; # Procedure body
+   #    }
+   #
+   # ProcedureArgumentEvaluation uses the TCL procedure args argument to read all the provided
+   # arguments. It evaluates first if a sub procedure has to be called. This information and the
+   # argument validation result are provided to the calling procedure respectively via the 
+   # variables SubProcedure and ProcedureArgumentEvaluationResult. In case the result evaluation
+   # was not successful, the calling procedure body will simply return. In case the procedure
+   # call refers to a sub-procedure, this one will be called. Otherwise, if a valid argument set
+   # has been provided to the procedure, and if no sub-procedure has to be called, the original
+   # procedure body is executed.
+   # Procedure behaves slightly differently in case one or multiple sub-procedures have been 
+   # declared without declaring the main procedure itself:
+   #
+   #    procedure {my_func sub_func} {
+   #       -args {message}
+   #    } {
+   #       puts $message; # Procedure body
+   #    }
+   #
+   # Procedure creates in this case for the main procedure a Tcl procedure as well as for the sub
+   # procedure. The main procedure creates an error when it directly called. The sub-procedure
+   # is executed within the main procedure context using the uplevel command.
+   #
+   #    proc my_proc {args} {
+   #       ::tepam::ProcedureArgumentEvaluation;
+   #       if {$ProcedureArgumentEvaluationResult!=""} {
+   #         if {$ProcedureArgumentEvaluationResult=="cancel"} return;
+   #         return -code error $ProcedureArgumentEvaluationResult;
+   #       }
+   #       if {$SubProcedure!=""} {return [$SubProcedure]};
+   #       error "'my_func' requires a subcommand"
+   #    }
+   #
+   #    proc {my_proc sub_func} {args} {
+   #       uplevel 1 {
+   #          puts $message; # Procedure body
+   #       }
+   #    }
+   #
+   # Procedure parses itself the procedure name and attributes and creates the new TCL procedure 
+   # with the modified body. For each declared argument it calls ProcedureArgDef which handles the 
+   # argument definition.
+
+   proc procedure {args} {
+      variable ProcDef
+      variable ProcedureHelp
+      variable named_arguments_first
+      variable command_log
+      variable auto_argument_name_completion
+      variable interactive_display_format
+      variable ProcedureList
+
+      #### Check if help is requested and extract the (sub) procedure name ####
+
+         # Check if help is requested:
+         if {[lsearch -exact $args "-help"]>=0} {
+            puts $ProcedureHelp
+            return
+         }
+
+         # Check that the procedure name, argument list and body has been provided:
+         if {[llength $args]!=3} {
+            return -code error "Missing procedure arguments, correct usage: procedure <ProcedureName>\
+                   <ProcedureAttributes> <ProcedureBody>"
+         }
+      
+         # Evaluate the full qualified procedure name including a leading name space identifier.
+         # Evaluate the current namespace in case the procedure is not defined explicitly with 
+         # a name space:
+         regsub -all {\s+} [lindex $args 0] " " ProcName
+         if {[string range $ProcName 0 1]!="::"} {
+            set NameSpace [uplevel 1 {namespace current}]
+            if {$NameSpace!="::"} {append NameSpace "::"}
+            set ProcName ${NameSpace}${ProcName}
+         }
+
+         # Extract the procedure attributes and the procedure body:
+         set ProcedureAttributes [lindex $args 1]
+         set ProcedureBody [lindex $args 2]
+
+         # Store the procedure name in the procedure list, if it is not already existing:
+         if {[lsearch -exact $ProcedureList $ProcName]<0} {
+            lappend ProcedureList $ProcName
+         }
+
+      #### Initialize the procedure attributes ####
+
+         # Clean the information of an eventual previous procedure definition, and store
+         # the actual configured procedure modes:
+         catch {array unset ProcDef $ProcName,*}
+         set ProcDef($ProcName,-named_arguments_first) $named_arguments_first
+         set ProcDef($ProcName,-command_log) $command_log
+         set ProcDef($ProcName,-auto_argument_name_completion) $auto_argument_name_completion
+         set ProcDef($ProcName,-interactive_display_format) $interactive_display_format
+
+         # The procedure information will be stored in the array variable ProcDef.
+         # The following array members are always defined for each declared procedure:
+         set ProcDef($ProcName,-validatecommand) {}
+         set ProcDef($ProcName,-validatecommand_error_text) {}
+         set ProcDef($ProcName,VarList) {}
+         set ProcDef($ProcName,NamedVarList) {}
+         set ProcDef($ProcName,UnnamedVarList) {}
+         #  ProcDef($ProcName,NbrVars); # 
+         #  ProcDef($ProcName,NbrNamedVars)
+         #  ProcDef($ProcName,NbrUnnamedVars)
+
+         # The following array members are defined optionally in the argument parsing section:
+         #  ProcDef($ProcName,$AttributeName)
+         #                    | AttributeName = {-category -return -short_description 
+         #                    |                  -description -example}
+         #
+         #  ProcDef($ProcName,Arg,$Var,IsNamed)
+         #  ProcDef($ProcName,Arg,$Var,-type)
+         #  ProcDef($ProcName,Arg,$Var,-optional)
+         #  ProcDef($ProcName,Arg,$Var,-validatecommand)
+         #  ProcDef($ProcName,Arg,$Var,-validatecommand_error_text)
+         #  ProcDef($ProcName,Arg,$Var,-default)
+         #  ProcDef($ProcName,Arg,$Var,HasDefault)
+         #  ProcDef($ProcName,Arg,$Var,-multiple)
+         #  ProcDef($ProcName,Arg,$Var,-description)
+         #  ProcDef($ProcName,Arg,$Var,-choices)
+         #                    | Contains the choice list: {<Choice1> ... <ChoiceN>}
+         #  ProcDef($ProcName,Arg,$Var,-choicelabels)
+         #                    | Contains the choice label list: {<ChoiceLabel1> ... <ChoiceLabelN>}
+         #  ProcDef($ProcName,Arg,$Var,-range)
+         #  ProcDef($ProcName,Arg,$Var,SectionComment)
+         #  ProcDef($ProcName,Arg,$Var,Comment)
+
+      #### Parse all procedure attributes ####
+
+         set UnnamedHasToBeOptional 0; # Variable that will be set to '1' if an unnamed argument is optional.
+         set UnnamedWasMultiple 0;     # Variable that will be set to '1' if an unnamed argument has the -multiple option
+      
+         # Loop through the argument definition list:
+         foreach {AttributeName AttributeValue} $ProcedureAttributes {
+            # Evaluate the provided argument attribute
+            switch -exact -- $AttributeName {
+               -help { # Help has been required in the procedure attribute definition list:
+                  puts $ProcedureHelp
+                  return
+               }
+               -category -
+               -return -
+               -short_description -
+               -description -
+               -named_arguments_first -
+               -command_log -
+               -auto_argument_name_completion -
+               -example -
+               -interactive_display_format {
+                  # Save all these information simply in the ProcDef array variable:
+                  set ProcDef($ProcName,$AttributeName) $AttributeValue
+               }
+               -validatecommand -
+               -validatecommand_error_text {
+                  lappend ProcDef($ProcName,$AttributeName) $AttributeValue
+               }
+               -args {
+                  # Read the procedure arguments with ProcedureArgDef
+                  set Comment ""
+                  set SectionComment ""
+                  foreach arg $AttributeValue {
+                     set ErrorMsg [ProcedureArgDef $arg]
+                     if {$ErrorMsg!=""} {
+                        return -code error "Procedure declaration [PureProcName -appo]: $ErrorMsg"
+                     }
+                  }
+               }
+               default {
+                  return -code error "Procedure declaration [PureProcName -appo]: Procedure attribute '$AttributeName' not known"
+               }
+            }
+         }
+
+         # Complete the procedure attributes -
+         # Number of arguments:
+         set ProcDef($ProcName,NbrVars) [llength $ProcDef($ProcName,VarList)]
+         # Number of named arguments
+         set ProcDef($ProcName,NbrNamedVars) [llength $ProcDef($ProcName,NamedVarList)]
+         # Number of unnamed arguments
+         set ProcDef($ProcName,NbrUnnamedVars) [llength $ProcDef($ProcName,UnnamedVarList)]
+
+      #### Create the TCL procedure(s) ####
+      
+         # Create now the TCL procedures. In case a sub procedure is declared, the created TCL 
+         # procedure has not to call the argument evaluator, since this one has already been called 
+         # in the main procedure. An additional main procedure is created if a sub procedure is 
+         # declared and if no main procedure is existing.
+
+         set Body    "::tepam::ProcedureArgumentEvaluation;\n"
+         append Body "if {\$ProcedureArgumentEvaluationResult!=\"\"} \{\n"
+         append Body "  if {\$ProcedureArgumentEvaluationResult==\"cancel\"} return;\n"
+         append Body "  return -code error \$ProcedureArgumentEvaluationResult;\n"
+         append Body "\}\n"
+         append Body "if {\$SubProcedure!=\"\"} {return \[\$SubProcedure\]};\n\n"
+
+         if {[llength $ProcName]==1} {
+            append Body "$ProcedureBody"
+            proc $ProcName {args} $Body
+         } else {
+            proc $ProcName {args} "uplevel 1 \{\n$ProcedureBody\n\}"
+            if {[info commands [lindex $ProcName 0]]==""} {
+               append Body "return -code error \"'[lindex $ProcName 0]' requires a subcommand\""
+               proc [lindex $ProcName 0] {args} $Body
+            }
+         }
+   }
+
+   # ProcedureArgDef reads the definition of a single argument that is provided in form of a list:
+   #
+   #    -mtype -default Warning -choices {Info Warning Error} -description "M. type"
+   #
+   # ProcedureArgDef is executed by 'procedure'. The argument definition is provided via the 
+   # argument 'ArgDef' variable. ProcedureArgDef is recognizing argument comments and section 
+   # comments that can be placed into the argument definitions. ProcedureArgDef is also checking 
+   # the validity of the argument specifications.
+
+   proc ProcedureArgDef {ArgDef} {
+      variable ProcDef
+      variable ProcedureHelp
+      variable named_arguments_first
+      variable command_log
+      variable auto_argument_name_completion
+      variable interactive_display_format
+      variable ProcedureList
+
+      upvar ProcName ProcName
+      upvar Comment Comment
+      upvar SectionComment SectionComment
+      upvar UnnamedHasToBeOptional UnnamedHasToBeOptional
+      upvar UnnamedWasMultiple UnnamedWasMultiple
+
+      # Read the argument name:
+      set Opt [lindex $ArgDef 0]
+         
+      #### Handle section and argument comments, parse the option name ####
+         
+         # Check if the argument definition is a simply argument comment (either -, "" or {})
+         if {$Opt=="" || $Opt=="-"} {
+            # Eliminate the entire first word as well as any leading and tailing white spaces
+            regexp {^\s*[^\s]+\s+(.*)\s*$} $ArgDef {} Comment
+            regsub -all "\"" $Comment "\\\"" Comment
+            return ""
+
+         # Check if the argument definition is an argument section begin
+         } elseif {[string index $Opt 0]=="\#"} {
+            # Eliminate leading and tailing white spaces
+            set SectionComment [string trim [string range $ArgDef 1 end]]
+               
+            # Eliminate the leading and ending #s and white spaces
+            regexp {^\s*\#+\s*(.*?)\s*\#*\s*$} $ArgDef {} SectionComment
+            # regsub -all "\"" $SectionComment "\\\" SectionComment
+               
+            # For an eventual interactive call that requires a GUI, swap to the short 
+            # representation mode, since the frames are used to display the sections:
+            set ProcDef($ProcName,-interactive_display_format) "short"
+            return ""
+
+         # Check if the argument is an option or a flag (named argument), that has with a 
+         # leading '-':
+         } elseif {[string index $Opt 0]=="-"} {
+            set Var [string range $Opt 1 end]
+            lappend ProcDef($ProcName,NamedVarList) $Var
+            set ProcDef($ProcName,Arg,$Var,IsNamed) 1
+   
+         # The argument is an unnamed argument:
+         } else {
+            set Var $Opt
+            lappend ProcDef($ProcName,UnnamedVarList) $Var
+            set ProcDef($ProcName,Arg,$Var,IsNamed) 0
+         }
+         
+         # Assign to the argument an eventually previously defined section or argument comment:
+         if {$SectionComment!=""} {
+            set ProcDef($ProcName,Arg,$Var,SectionComment) $SectionComment
+            set SectionComment ""
+         }
+         if {$Comment!=""} {
+            set ProcDef($ProcName,Arg,$Var,Comment) $Comment
+            set Comment ""
+         }
+
+         # Check that an argument is not declared multiple times:
+         if {[lsearch -exact $ProcDef($ProcName,VarList) $Var]>=0} {
+            return "Argument '$Var' defined multiple times"
+         }
+
+      #### Define the argument attributes ####
+         
+         # Append the argument to the argument list and define the argument attributes with the
+         # default values:
+         lappend ProcDef($ProcName,VarList) $Var
+         set ProcDef($ProcName,Arg,$Var,-type) ""; # Undefined
+         set ProcDef($ProcName,Arg,$Var,-optional) 0
+         set ProcDef($ProcName,Arg,$Var,HasDefault) 0
+         set ProcDef($ProcName,Arg,$Var,-multiple) 0
+
+         # Parse all argument attribute definitions:
+         for {set a 1} {$a<[llength $ArgDef]} {incr a} {
+            set ArgOption [lindex $ArgDef $a]
+            set ArgOptionValue [lindex $ArgDef [expr {$a+1}]]
+            switch -- $ArgOption {
+               -type {
+                  # Argument type definition: Check if the validation command is defined for 
+                  # the used argument type:
+                  if {[catch {Validate($ArgOptionValue) ""}]} {
+                     return "Argument type '$ArgOptionValue' not known"
+                  }
+                     
+                  # Store the attribute type:
+                  set ProcDef($ProcName,Arg,$Var,-type) $ArgOptionValue
+                     
+                  # Flags (argument that have the type 'none') are always optional:
+                  if {$ProcDef($ProcName,Arg,$Var,-type)=="none"} {
+                     set ProcDef($ProcName,Arg,$Var,-optional) 1
+                  }
+                  incr a
+               }
+   
+               -default {
+                  # Arguments that have default values are always optional:
+                  set ProcDef($ProcName,Arg,$Var,-default) $ArgOptionValue
+                  set ProcDef($ProcName,Arg,$Var,HasDefault) 1
+                  set ProcDef($ProcName,Arg,$Var,-optional) 1
+                  incr a
+               }
+   
+               -mandatory {# The -mandatory attribute is already the default behavior}
+   
+               -optional -
+               -multiple {
+                  # These attributes (flags) have just to be stored for future usage:
+                  set ProcDef($ProcName,Arg,$Var,$ArgOption) 1
+               }
+   
+               -range {
+                  # Check that the range is defined by two values and that the min value is 
+                  # smaller than the max value:
+                  if {[llength $ArgOptionValue]!=2 || \
+                      ![Validate(double) [lindex $ArgOptionValue 0]] || \
+                      ![Validate(double) [lindex $ArgOptionValue 1]]} {
+                     return  "Invalid range definition - $ArgOptionValue"
+                  }
+                  set ProcDef($ProcName,Arg,$Var,$ArgOption) $ArgOptionValue
+                  incr a
+               }
+                  
+               -validatecommand -
+               -validatecommand_error_text -
+               -auxargs_commands -
+               -auxargs -
+               -description -
+               -choices -
+               -choicelabels -
+               -widget {
+                  # Also these attributes have just to be stored for future usage:
+                  set ProcDef($ProcName,Arg,$Var,$ArgOption) $ArgOptionValue
+                  incr a
+               }
+   
+               default {
+                  # Generate an error if the provided attribute name doesn't match with a known
+                  # attribute.
+                  return "Argument attribute '$ArgOption' not known"
+               }
+            }
+         }
+
+      #### Perform various argument attribute validation checks ####
+
+         # Unnamed argument attribute checks:
+         if {!$ProcDef($ProcName,Arg,$Var,IsNamed)} {
+            # Check that behind an optional unnamed argumeent there are only other optional 
+            # unnamed arguments:
+            if {$UnnamedHasToBeOptional && !$ProcDef($ProcName,Arg,$Var,-optional)} {
+               return "Argument '$Var' has to be optional"
+            }
+               
+            # Check that only the last unnamed argument can take multiple values:
+            if {$UnnamedWasMultiple} {
+               return "Attribute '-multiple' is only for the last unnamed argument allowed"
+            }
+               
+            # Check the length of an optional -choicelabels list
+            if {[info exists ProcDef($ProcName,Arg,$Var,-choices)] && \
+                [info exists ProcDef($ProcName,Arg,$Var,-choicelabels)]} {
+               if {[llength $ProcDef($ProcName,Arg,$Var,-choices)]!=
+                   [llength $ProcDef($ProcName,Arg,$Var,-choicelabels)]} {
+                  return "Argument '$Var' - Choice label list and choice list have different sizes"
+               }
+            }
+               
+            # Store the information about the argument attributes the check the consistency of 
+            # the following arguments:
+            if {$ProcDef($ProcName,Arg,$Var,-optional)} {
+               set UnnamedHasToBeOptional 1
+            }
+            if {$ProcDef($ProcName,Arg,$Var,-multiple)} {
+               set UnnamedWasMultiple 1
+            }
+         }
+                     
+         # Range checks are only allowed for integers and doubles:
+         if {[info exists ProcDef($ProcName,Arg,$Var,-range)]} {
+            if {[lsearch {integer double} $ProcDef($ProcName,Arg,$Var,-type)]<0} {
+               return "Argument '$Var' - range specification requires type integer or double"
+            }
+         }
+
+      return ""
+   }
+
+   ######## ProcedureArgumentEvaluation ########
+
+   # ProcedureArgumentEvaluation is the argument evaluator that is embedded by the procedure
+   # declaration command 'procedure' into the procedure body in the following way:
+   #
+   #    proc my_proc {args} {
+   #       ::tepam::ProcedureArgumentEvaluation;
+   #       if {$ProcedureArgumentEvaluationResult!=""} {
+   #         if {$ProcedureArgumentEvaluationResult=="cancel"} return;
+   #         return -code error $ProcedureArgumentEvaluationResult;
+   #       }
+   #       if {$SubProcedure!=""} {return [$SubProcedure]};
+   #
+   #       puts $message; # Procedure body
+   #    }
+   #
+   # ProcedureArgumentEvaluation has to define in the calling procedure two variables: 
+   # The first one is ProcedureArgumentEvaluationResult that has to contain the result of the 
+   # evaluation and validation of the argument set. Zero as results means that the provided 
+   # arguments are OK and that the procedure body can be executed. A non-zero value indicates 
+   # that the procedure body has not to be evaluated, typically because help was requested via
+   # the -help option. In case of incorrect arguments an error is generated by 
+   # ProcedureArgumentEvaluation.
+   # The second variable that is created by ProcedureArgumentEvaluation is 'SubProcedure'. This
+   # variable is set to the sub procedure name in case a sub procedure is called. If the main
+   # procedure is called this variable is set to an empty string.
+
+   # Delcare first a tiny helper function: ProcedureArgumentEvaluationReturn will assign the 
+   # provided result string to the ProcedureArgumentEvaluationResult variable in the context
+   # of the calling procedure and will then emulate a return function.
+
+   proc ProcedureArgumentEvaluationReturn {Result} {
+      upvar 2 ProcedureArgumentEvaluationResult ProcedureArgumentEvaluationResult
+      set ProcedureArgumentEvaluationResult $Result
+      return -code return
+   }
+
+   proc ProcedureArgumentEvaluation {} {
+      variable ProcDef
+      upvar args args
+      upvar SubProcedure SubProcedure
+
+      #### Extract the procedure and sub procedure names, call the procedure help if requested ####
+
+         # Evaluate the complete main procedure name that contains the namespace identification:
+         # The procedure name is given by the first element of 'info level':
+         set ProcedureCallLine [info level -1]
+         set ProcName [lindex $ProcedureCallLine 0]
+
+         # Create the full qualified procedure name (procedure name including namespace)
+         regexp {([^:]*)$} $ProcName {} ProcName
+         set NameSpace [uplevel 1 {namespace current}]
+         if {$NameSpace!="::"} {append NameSpace "::"}
+         set ProcName ${NameSpace}${ProcName}
+
+         # Evaluate the sub command names by checking if the first arguments are matching with
+         # a specified sub command name:
+         set SubProcedure ""
+         while {1} {
+            set ProcNameTmp "$ProcName [lindex $args 0]"
+            if {![info exists ProcDef($ProcNameTmp,VarList)] && [array names ProcDef "$ProcNameTmp *"]==""} {
+               # The argument is not matching with a specified sub command name (so it will be a
+               # real argument):
+               break
+            }
+            # Use the argument as sub procedure name:
+            set ProcName $ProcNameTmp
+            set SubProcedure $ProcName
+            set args [lrange $args 1 end]
+         }
+
+         # Check if help has been requested in the procedure call:
+         if {[lindex $args end]=="-help"} {
+            ProcedureHelp $ProcName
+            ProcedureArgumentEvaluationReturn "cancel"
+         }
+
+         # Check if the procedure call is an interactive call
+         set InteractiveCall [string match "-interactive" [lindex $args end]]
+
+         # Return an empty string if the main procedure has been called and if only sub-commands 
+         # have been defined, but not the main procedure itself.
+         if {![info exists ProcDef($ProcName,VarList)]} {
+            ProcedureArgumentEvaluationReturn ""
+         }
+
+      #### Call an argument_dialogbox if the procedure has been called with '-interactive' ####
+         set NewArgs {}
+         if {$InteractiveCall} {
+            # Generate an error if Tk hasn't been loaded
+            if {[catch {package present Tk}]} {
+               ProcedureArgumentEvaluationReturn "[PureProcName]: Interactive calls are only supported if Tk is loaded!"
+            }
+
+            # Start creating the argument_dialogbox argument list with the title attribute:
+            set DialogBoxArguments [list -title $ProcName -context $ProcName]
+
+            # Add eventual global validation commands
+            foreach ValidateCommand $ProcDef($ProcName,-validatecommand) {
+               lappend DialogBoxArguments -validatecommand2 $ValidateCommand
+            }
+            foreach ValidateCommandErrorText $ProcDef($ProcName,-validatecommand_error_text) {
+               lappend DialogBoxArguments -validatecommand2_error_text $ValidateCommandErrorText
+            }
+
+            # Create for each of the procedure arguments an entry for the argument_dialogbox:
+            foreach Var $ProcDef($ProcName,VarList) {
+               # Declare the result variables. These variables refer to the variables in the parent 
+               # procedure (upvar). Attribute to these variables directly the default values that can be 
+               # overwritten later with the new defined values.
+               upvar $Var Variable__$Var
+
+               # Create sections, write section and argument comments:
+               if {$ProcDef($ProcName,-interactive_display_format)=="extended"} {
+                  if {[info exists ProcDef($ProcName,Arg,$Var,SectionComment)]} {
+                     # If a section comment is defined, close an eventual open frame, add the 
+                     # section comment and add an eventually defined arguement comment:
+                     lappend DialogBoxArguments -frame ""; # Close an eventual open frame
+                     lappend DialogBoxArguments \
+                                 -comment [list -text $ProcDef($ProcName,Arg,$Var,SectionComment)]
+                     if {[info exists ProcDef($ProcName,Arg,$Var,Comment)]} {
+                        lappend DialogBoxArguments \
+                                    -comment [list -text $ProcDef($ProcName,Arg,$Var,Comment)]
+                     }
+                  }
+                  # Create a frame around each argument entry in the extended format:
+                  lappend DialogBoxArguments -frame [list -label $Var]
+               } elseif {[info exists ProcDef($ProcName,Arg,$Var,SectionComment)]} {
+                  # If a section is defined, create a section frame in the sort format:
+                  lappend DialogBoxArguments \
+                              -frame [list -label $ProcDef($ProcName,Arg,$Var,SectionComment)]
+               }
+               # If an argument comment is defined but not yet applied, apply it: 
+               if {[info exists ProcDef($ProcName,Arg,$Var,Comment)] &&
+                   !( $ProcDef($ProcName,-interactive_display_format)=="extended" &&
+                     [info exists ProcDef($ProcName,Arg,$Var,SectionComment)] )} {
+                  lappend DialogBoxArguments \
+                              -comment [list -text $ProcDef($ProcName,Arg,$Var,Comment)]
+               }
+
+               # Provide to the argument dialogbox all the argument attributes:
+               set ArgAttributes {}
+               if {$ProcDef($ProcName,Arg,$Var,-type)!=""} {
+                  lappend ArgAttributes -type $ProcDef($ProcName,Arg,$Var,-type)
+               }
+               if {$ProcDef($ProcName,Arg,$Var,-optional)} {
+                  lappend ArgAttributes -optional 1
+               }
+               if {[info exists ProcDef($ProcName,Arg,$Var,-range)] && \
+                   $ProcDef($ProcName,Arg,$Var,-range)!=""} {
+                  lappend ArgAttributes -range $ProcDef($ProcName,Arg,$Var,-range)
+               }
+               if {[info exists ProcDef($ProcName,Arg,$Var,-validatecommand)]} {
+                  lappend ArgAttributes -validatecommand $ProcDef($ProcName,Arg,$Var,-validatecommand)
+               }
+               if {[info exists ProcDef($ProcName,Arg,$Var,-validatecommand_error_text)]} {
+                  lappend ArgAttributes -validatecommand_error_text $ProcDef($ProcName,Arg,$Var,-validatecommand_error_text)
+               }
+               if {[info exists ProcDef($ProcName,Arg,$Var,-auxargs)] && $ProcDef($ProcName,Arg,$Var,-auxargs)!=""} {
+                  set ArgAttributes [concat $ArgAttributes $ProcDef($ProcName,Arg,$Var,-auxargs)]
+               }
+               if {[info exists ProcDef($ProcName,Arg,$Var,-auxargs_commands)]} {
+                  foreach {AuxArg_Name AuxArgCommand} $ProcDef($ProcName,Arg,$Var,-auxargs_commands) {
+                     lappend ArgAttributes $AuxArg_Name [uplevel #1 $AuxArgCommand]
+                  }
+               }
+               if {[info exists ProcDef($ProcName,Arg,$Var,-choicelabels)]} {
+                  lappend ArgAttributes -choicelabels $ProcDef($ProcName,Arg,$Var,-choicelabels)
+               }
+
+               # Set the default values
+               if {[info exists ProcDef($ProcName,Arg,$Var,-default)]} {
+                  lappend ArgAttributes -default $ProcDef($ProcName,Arg,$Var,-default)
+               }
+
+               # Add the variable name, type, description and range as labels and comments:
+               set Label $Var; # Default label
+               if {$ProcDef($ProcName,-interactive_display_format)=="extended"} {
+                  # Add the argument description as comment
+                  if {[info exists ProcDef($ProcName,Arg,$Var,-description)]} {
+                     lappend DialogBoxArguments \
+                                    -comment [list -text $ProcDef($ProcName,Arg,$Var,-description)]
+                  }
+
+                  # Add the type and ranges as comment
+                  if {[lsearch {"" "string" "none"} $ProcDef($ProcName,Arg,$Var,-type)]<0} {
+                     set Comment "Type: $ProcDef($ProcName,Arg,$Var,-type), "
+                     if {[info exists ProcDef($ProcName,Arg,$Var,-range)]} {
+                        append Comment "range: [lindex $ProcDef($ProcName,Arg,$Var,-range) 0] .. \
+                                                [lindex $ProcDef($ProcName,Arg,$Var,-range) 1], "
+                     }
+                     lappend DialogBoxArguments -comment [list -text [string range $Comment 0 end-2]]
+                  }
+               } else {
+                  if {[info exists ProcDef($ProcName,Arg,$Var,-description)]} {
+                     set Label $ProcDef($ProcName,Arg,$Var,-description)
+                  }
+               }
+               
+               # Select the adequate widget for the argument:
+               lappend ArgAttributes -label "$Label:" -variable Variable__$Var
+
+               # A specific entry widget is explicitly specified:
+               if {[info exists ProcDef($ProcName,Arg,$Var,-widget)]} {
+                  lappend DialogBoxArguments -$ProcDef($ProcName,Arg,$Var,-widget) $ArgAttributes
+
+               # A type specific widget exists, so use this one:
+               } elseif {[info procs ad_form($ProcDef($ProcName,Arg,$Var,-type))]!=""} {
+                  lappend DialogBoxArguments -$ProcDef($ProcName,Arg,$Var,-type) $ArgAttributes
+
+               # Use a simple checkbutton for flags:
+               } elseif {$ProcDef($ProcName,Arg,$Var,-type)=="none"} {
+                  lappend DialogBoxArguments -checkbutton $ArgAttributes
+
+               # A choice list is provided with less or equal than 4 options, use radioboxes or checkboxes:
+               } elseif {[info exists ProcDef($ProcName,Arg,$Var,-choices)] && \
+                   [llength $ProcDef($ProcName,Arg,$Var,-choices)]<=4} {
+                  if {$ProcDef($ProcName,Arg,$Var,-multiple)} {
+                     lappend DialogBoxArguments -checkbox [concat [list \
+                                 -choices $ProcDef($ProcName,Arg,$Var,-choices)] $ArgAttributes]
+                  } else {
+                     lappend DialogBoxArguments -radiobox [concat [list \
+                                 -choices $ProcDef($ProcName,Arg,$Var,-choices)] $ArgAttributes]
+                  }
+
+               # A choice list is provided with less than 30 options, use a listbox or a disjointlistbox:
+               } elseif {[info exists ProcDef($ProcName,Arg,$Var,-choices)] && \
+                         [llength $ProcDef($ProcName,Arg,$Var,-choices)]<30} {
+                  if {$ProcDef($ProcName,Arg,$Var,-multiple)} {
+                     lappend DialogBoxArguments -disjointlistbox [concat [list \
+                                 -choicevariable ProcDef($ProcName,Arg,$Var,-choices) -height 3] $ArgAttributes]
+                  } else {
+                     lappend DialogBoxArguments -listbox [concat [list \
+                                 -choicevariable ProcDef($ProcName,Arg,$Var,-choices) -height 3] $ArgAttributes]
+                  }
+
+               # For all other cases, use a simple entry widget:
+               } else {
+                  lappend DialogBoxArguments -entry $ArgAttributes
+               }
+            }
+
+            # Call the argument dialogbox
+            # puts "argument_dialogbox \{$DialogBoxArguments\}"
+            if {[argument_dialogbox $DialogBoxArguments]=="cancel"} {
+               # The argument dialogbox has been canceled, leave the calling procedure without
+               # executing the procedure body:
+               ProcedureArgumentEvaluationReturn cancel
+            }
+
+            # Set the variables of the optional arguments to the default values, if the variables
+            # haven't been defined by the argument dialogbox:
+            foreach Var $ProcDef($ProcName,VarList) {
+               if {![info exists Variable__$Var] && \
+                    [info exists ProcDef($ProcName,Arg,$Var,-default)]} {
+                     set Variable__$Var $ProcDef($ProcName,Arg,$Var,-default)
+               }
+            }
+
+      #### Non interactive call: Parse all arguments and define the argument variables ####
+
+         } else {
+
+            # Result variable declaration and default value definition
+            foreach Var $ProcDef($ProcName,VarList) {
+               # Declare the result variables. These variables refer to the variables in the parent 
+               # procedure (upvar). Attribute to these variables directly the default values that can be 
+               # overwritten later with the new defined values.
+               upvar $Var Variable__$Var
+
+               # Set the flags to the default values only when the procedure is called interactively:
+               if {$ProcDef($ProcName,Arg,$Var,-type)=="none"} {
+                  set Variable__$Var 0
+               } elseif {[info exists ProcDef($ProcName,Arg,$Var,-default)]} {
+                  # Apply an eventually defined default value, in case the argument is not a flag:
+                  set Variable__$Var $ProcDef($ProcName,Arg,$Var,-default)
+               }
+            }
+
+            # Prepare parsing all arguments
+            set NbrArgs [llength $args]; # Number of provided arguments
+            set NumberUnnamedArgs 0
+            set ArgPos 0
+
+            # Parse the unnamed arguments if they are defined first and if some of them have been 
+            # declared:
+            if {!$ProcDef($ProcName,-named_arguments_first)} {
+               # Parse all unnamed arguments. Stop parsing them when:
+               # 1) all unnamed arguments that have been declared have been parsed &&
+               #    the last unnamed argument has not the -multiple option &&
+               # 2) the parsed argument is optional and starts with '-'
+               # 3) the parsed argument has can take multiple values &&
+               #    one value has already been read &&
+               #    the parsed argument starts with '-'
+               
+               # An argument value is optional when it has been declared with the -optional option
+               # or when it is declared with the -multiple option and already one value has been
+               # attributed to the argument:
+               set IsOptional 0
+               
+               # Loop through all arguments (only if unnamed arguments have been declared:
+               for {} {$ArgPos<[llength $args] && $ProcDef($ProcName,NbrUnnamedVars)>0} {incr ArgPos} {
+                  # Get the next provided parameter value:
+                  set arg [lindex $args $ArgPos]
+                  
+                  # The ordered unnamed argument list provides the relevant argument:
+                  set Var [lindex $ProcDef($ProcName,UnnamedVarList) $NumberUnnamedArgs]
+                  
+                  # Stop parsing the unnamed arguments, if the procedure has also named arguments, 
+                  # if the argument to parse is optional, and if it starts with '-':
+                  if {$ProcDef($ProcName,Arg,$Var,-optional)} {
+                     set IsOptional 1
+                  }
+                  if {$ProcDef($ProcName,NbrNamedVars)>0 && $IsOptional && \
+                      [string index $arg 0]=="-"} {
+                     break
+                  }
+
+                  # If the argument can have multiple values: Don't update the unnamed argument 
+                  # counter to attribute the next values to the same argument. Declare the next
+                  # values also as optional
+                  if {$ProcDef($ProcName,Arg,$Var,-multiple)} {
+                     lappend Variable__$Var $arg
+                     set IsOptional 1
+
+                  # Otherwise (the argument cannot have multiple values), assign the value to the
+                  # variable. Exit the unnamed argument loop when the last declared argument has
+                  # been read:
+                  } else {
+                     set Variable__$Var $arg
+                     incr NumberUnnamedArgs
+                     if {$NumberUnnamedArgs==$ProcDef($ProcName,NbrUnnamedVars)} {
+                        incr ArgPos
+                        break
+                     }
+                  }
+               }
+               
+               # Create an error if there are other argument values that are provided, but when no
+               # named arguments are declared:
+               if {$ProcDef($ProcName,NbrNamedVars)==0 && $ArgPos<[llength $args]} {
+                  ProcedureArgumentEvaluationReturn "$ProcName: Too many arguments: [lrange $args $ArgPos end]"
+               }
+            }
+
+            # Parse the named arguments
+            for {} {$ArgPos<[llength $args]} {incr ArgPos} {
+               # Get the argument name:
+               set arg [lindex $args $ArgPos]
+
+               # Ignore the '--' flag. Exit the named argument parsing loop if 'named arguments
+               # first' is configured
+               if {$arg=="--"} {
+                  if {$ProcDef($ProcName,-named_arguments_first)} {
+                     incr ArgPos
+                     break
+                  } else {
+                     continue
+                  }
+               }
+
+               # In case the named arguments are used first: Check if the next argument is not 
+               # anymore a named argument and stop parsing the named arguments if this is the case.
+               if {$ProcDef($ProcName,-named_arguments_first) && [string index $arg 0]!="-"} {
+                  break
+               }
+
+               # Otherwise (especially if the unnamed arguments are used first), check that the
+               # option name starts with '-':
+               if {[string index $arg 0]!="-"} {
+                  ProcedureArgumentEvaluationReturn "[PureProcName]: Argument '$arg' is not an option"
+               }
+
+               # Extract the variable name (eliminate the '-'):
+               set Var [string range $arg 1 end]
+
+               # Check if the variable (name) is known. When it is not known, complete it when the 
+               # name matches with the begin of a known variable name, or generate otherwise an 
+               # error:
+               if {![info exists ProcDef($ProcName,Arg,$Var,-type)]} {
+                  
+                  # Argument completion is disabled - generate an error:
+                  if {!$ProcDef($ProcName,-auto_argument_name_completion)} {
+                     ProcedureArgumentEvaluationReturn "[PureProcName -appr]: Argument '-$Var' not known"
+                  
+                  # Argument completion is enabled - check if the variable name corresponds to the
+                  # begin of a known argument name:
+                  } else {
+                     # set MatchingVarList [lsearch -all -inline -glob $ProcDef($ProcName,VarList) ${Var}*] -> Tcl 8.3 doesn't support the -all and -inline switches!
+                     set MatchingVarList {}
+                     set VarList $ProcDef($ProcName,VarList)
+                     while {[set Pos [lsearch -glob $VarList ${Var}*]]>=0} {
+                        lappend MatchingVarList [lindex $VarList $Pos]
+                        set VarList [lrange $VarList [expr $Pos+1] end]
+                     }
+                     # Complete the argument name if the argument doesn't exist, but if it is the begin of a declared argument.
+                     switch [llength $MatchingVarList] {
+                        1 {set Var $MatchingVarList}
+                        0 {ProcedureArgumentEvaluationReturn "[PureProcName]: Argument '-$Var' not known"}
+                        default {ProcedureArgumentEvaluationReturn "[PureProcName]: Argument '-$Var' may match multiple options: $MatchingVarList"}
+                     }
+                  }
+               }
+                  
+               # Set the variable value to '1' if the argument is a flag (type=='none'). Read 
+               # otherwise the variable value:
+               if {$ProcDef($ProcName,Arg,$Var,-type)=="none"} { # The argument is a flag
+                  set Value 1
+               
+               # No argument value is provided - generate an error:
+               } elseif {$ArgPos==[llength $args]-1} {
+                  ProcedureArgumentEvaluationReturn "[PureProcName]: No value is provided for argument '-$Var'"
+
+               # Read the argument value
+               } else {
+                  set Value [lindex $args [incr ArgPos]]
+               }
+
+               # Define the argument variable. Append the new value to the existing value of the
+               # variable, if the '-multiple' attribute is set for the argument:
+               if {$ProcDef($ProcName,Arg,$Var,-multiple)} {
+                  lappend Variable__$Var $Value
+               } else {
+                  set Variable__$Var $Value
+               }
+            }
+
+            # In case the unnamed arguments are defined last, parse them now:
+            if {$ProcDef($ProcName,-named_arguments_first)} {
+               
+               # Loop through the remaining arguments:
+               for {} {$ArgPos<[llength $args]} {incr ArgPos} {
+                  # Get the next provided parameter value:
+                  set arg [lindex $args $ArgPos]
+                  # Assure that the number of provided arguments is not exceeding the total number
+                  # of declared unnamed arguments:
+                  if {$NumberUnnamedArgs>=$ProcDef($ProcName,NbrUnnamedVars)} {
+                     # Too many unnamed arguments are used, generate an adequate error message:
+                     if {[string index $arg 0]=="-"} {
+                        ProcedureArgumentEvaluationReturn "[PureProcName]: Too many unnamed arguments, or incorrectly used named argument: $arg"
+                     } else {
+                        ProcedureArgumentEvaluationReturn "[PureProcName]: Too many unnamed arguments: $arg"
+                     }
+                  }
+                  
+                  # The ordered unnamed argument list provides the relevant argument:
+                  set Var [lindex $ProcDef($ProcName,UnnamedVarList) $NumberUnnamedArgs]
+
+                  # Assign all remaining parameter values to the last argument if this one can 
+                  # take multiple values:
+                  if {$ProcDef($ProcName,Arg,$Var,-multiple) && \
+                     $NumberUnnamedArgs==$ProcDef($ProcName,NbrUnnamedVars)-1} {
+                     set Variable__$Var [lrange $args $ArgPos end]
+                     # incr NumberUnnamedArgs
+                     set ArgPos [llength $args]
+
+                  # Assign otherwise the parameter value to the actual argument
+                  } else {
+                     set Variable__$Var $arg
+                     incr NumberUnnamedArgs
+                  }
+               }
+            }
+         }
+
+      #### Argument validation ####
+
+         # Check that all mandatory arguments have been defined and that all arguments satisfy the 
+         # defined type:
+
+         # Loop through all named and unnamed arguments:
+         foreach Var $ProcDef($ProcName,VarList) {
+            
+            # An error is created when a variable is not optional and when it is not defined:
+            if {!$ProcDef($ProcName,Arg,$Var,-optional) && ![info exists Variable__$Var]} {
+               ProcedureArgumentEvaluationReturn "[PureProcName]: Required argument is missing: $Var"
+            }
+            
+            # Check the variable value corresponds to the specified type:
+            if {[info exists Variable__$Var]} {
+               # Transform the variable value in a list in case the argument is not multiple 
+               # definable:
+               set ValueList [set Variable__$Var]
+               if {!$ProcDef($ProcName,Arg,$Var,-multiple)} {
+                  set ValueList [list $ValueList]
+               }
+
+               # Loop through all elements of this list and check if each element is valid:
+               foreach Value $ValueList {
+                  # Check the argument type:
+                  if {![Validate($ProcDef($ProcName,Arg,$Var,-type)) $Value]} {
+                     ProcedureArgumentEvaluationReturn "[PureProcName]: Argument '$Var' requires type '$ProcDef($ProcName,Arg,$Var,-type)'. Provided value: '$Value'"
+                  }
+               
+                  # Check the argument with an eventually defined validation command:
+                  if {[info exists ProcDef($ProcName,Arg,$Var,-validatecommand)]} {
+                     regsub {%P} $ProcDef($ProcName,Arg,$Var,-validatecommand) $Value ValidateCommand
+                     if {![uplevel $ValidateCommand]} {
+                        if {[info exists ProcDef($ProcName,Arg,$Var,-validatecommand_error_text)]} {
+                           ProcedureArgumentEvaluationReturn "[PureProcName]: $ProcDef($ProcName,Arg,$Var,-validatecommand_error_text)"
+                        } else {
+                           ProcedureArgumentEvaluationReturn "[PureProcName]: Argument '$Var' is invalid. Provided value: '$Value'. Constraint: '$ProcDef($ProcName,Arg,$Var,-validatecommand)'"
+                        }
+                     }
+                  }
+
+                  # Check if the variable value satisfies an eventually defined range:
+                  if {[info exists ProcDef($ProcName,Arg,$Var,-range)]} {
+                     if {$Value<[lindex $ProcDef($ProcName,Arg,$Var,-range) 0] || \
+                         $Value>[lindex $ProcDef($ProcName,Arg,$Var,-range) 1]} {
+                        ProcedureArgumentEvaluationReturn "[PureProcName]: Argument '$Var' has to be between [lindex $ProcDef($ProcName,Arg,$Var,-range) 0] and [lindex $ProcDef($ProcName,Arg,$Var,-range) 1]"
+                     }
+                  }
+
+                  # Check the variable value is a member of a provided choice list:
+                  if {[info exists ProcDef($ProcName,Arg,$Var,-choices)]} {
+                     if {[lsearch -exact $ProcDef($ProcName,Arg,$Var,-choices) $Value]<0} {
+                        ProcedureArgumentEvaluationReturn "[PureProcName]: Argument '$Var' has to be one of the following elements: [GetChoiceHelpText $ProcName $Var]"
+                     }
+                  }
+               }
+            }
+         }
+
+      #### Procedure level validation ####
+
+         foreach ValidateCommand $ProcDef($ProcName,-validatecommand) ValidateCommandErrorText $ProcDef($ProcName,-validatecommand_error_text) {
+            # regsub {%P} $ProcDef($ProcName,Arg,$Var,-validatecommand) $Value ValidateCommand
+            if {![uplevel $ValidateCommand]} {
+               if {$ValidateCommandErrorText!=""} {
+                  ProcedureArgumentEvaluationReturn "[PureProcName]: $ValidateCommandErrorText"
+               } else {
+                  ProcedureArgumentEvaluationReturn "[PureProcName]: Invalid argument(s) provided. Constraint: '$ValidateCommand'"
+               }
+            }
+         }
+
+      #### Log the procedure call ####
+      
+         variable ProcedureCallLogList
+
+         if {$InteractiveCall && $ProcDef($ProcName,-command_log)=="interactive"} {
+            append ProcedureCallLogList $ProcName
+            if {$ProcDef($ProcName,-named_arguments_first)} {
+               set ParClasses {Named Unnamed}
+            } else {
+               set ParClasses {Unnamed Named}
+            }
+            foreach ParClass $ParClasses {
+               foreach Var $ProcDef($ProcName,${ParClass}VarList) {
+                  if {![info exists Variable__$Var]} continue; # Skip optional arguments that haven't been defined
+                  if {$ProcDef($ProcName,Arg,$Var,-type)!="none"} { # Non flag arguments
+                     if {$ProcDef($ProcName,Arg,$Var,IsNamed)} {
+                        append ProcedureCallLogList " -$Var"
+                     }
+                     append ProcedureCallLogList " \{[set Variable__$Var]\}"
+                  } elseif {[set Variable__$Var]} { # Flags that are set
+                     append ProcedureCallLogList " -$Var"
+                  }
+               }
+            }
+            append ProcedureCallLogList "; \# interactive call\n"
+         } elseif {$ProcDef($ProcName,-command_log)=="1"} {
+            append ProcedureCallLogList "$ProcedureCallLine\n"
+         }
+      
+      ProcedureArgumentEvaluationReturn ""
+   }
+
+   ######## Validation commands ########
+   
+   # For each of the standard argument types supported by TEPAM, the validation command 
+   # 'Validate(<Type>)' specified in the following section. These commands have to return '1' in
+   # case the provided value correspond to the relevant type and '0' if not. Additional user or
+   # application specific types can easily be supported simply by adding a validation command
+   # for the new type into the 'tepam' namespace.
+
+   proc Validate()         {v} {return 1}
+   proc Validate(none)     {v} {return 1}
+   proc Validate(string)   {v} {return 1}
+   proc Validate(text)     {v} {return 1}
+   proc Validate(boolean)  {v} {string is boolean -strict $v}
+   proc Validate(double)   {v} {string is double -strict $v}
+   proc Validate(integer)  {v} {string is integer -strict $v}
+   proc Validate(alnum)    {v} {string is alnum $v}
+   proc Validate(alpha)    {v} {string is alpha $v}
+   proc Validate(ascii)    {v} {string is ascii $v}
+   proc Validate(control)  {v} {string is control $v}
+   proc Validate(digit)    {v} {string is digit $v}
+   proc Validate(graph)    {v} {string is graph $v}
+   proc Validate(lower)    {v} {string is lower $v}
+   proc Validate(print)    {v} {string is print $v}
+   proc Validate(punct)    {v} {string is punct $v}
+   proc Validate(space)    {v} {string is space $v}
+   proc Validate(upper)    {v} {string is upper $v}
+   proc Validate(wordchar) {v} {string is wordchar $v}
+   proc Validate(xdigit)   {v} {string is xdigit $v}
+   proc Validate(char)     {v} {expr [string length $v]==1}
+   proc Validate(color)    {v} {expr ![catch {winfo rgb . $v}]}
+   proc Validate(font)     {v} {expr ![catch {font measure $v ""}]}
+   proc Validate(file)              {v} {expr [string length $v]>0 && ![regexp {[\"*?<>]} $v]}
+   proc Validate(existingfile)      {v} {file exists $v}
+   proc Validate(directory)         {v} {return 1}
+   proc Validate(existingdirectory) {v} {file isdirectory $v}
+
+   ######## Help text generation ########
+
+   # 'ProcedureHelp_Append' appends a piece of text to the existing HelpText variable of the 
+   # calling context (procedure). Tabulator characters are replaced through 3 spaces. Lines are 
+   # reformatted to respect the maximum allowed line length. In case a line is wrapped, the leading
+   # spaces of the first line are added to the begin of the following lines. Multiple lines can be
+   # provided as text piece and these multiple lines are handled independently each to another.
+
+   proc ProcedureHelp_Append {Text} {
+      upvar HelpText HelpText
+      variable help_line_length
+      
+      # Replace tabs through 3 spaces:
+      regsub -all {\t} $Text "   " Text
+      
+      # Extract the initial spaces of the first line:
+      regexp {^(\s*)} $Text {} SpaceStart
+      
+      # Loop through each of the provided help text line:
+      foreach line [split $Text "\n"] {
+         
+         # Eliminate leading spaces of the line:
+         regexp {^\s+'*(.*)$} $line {} line
+         
+         # Cut the line into segments that doesn't exceed the maximum allowed help line length. 
+         # Add in front of each new line the initial spaces of the first line:
+         while {$line!=""} {
+            # Align the leading line spaces to the first line:
+            set line ${SpaceStart}${line}
+            
+            #### Next line cutoff position evaluation ####
+
+            # Select the next line cut position. The default position is set to the line end:
+            set LastPos [string length $line]
+            # Search for the last space inside the line section that is inside the specified 
+            # maximum line length:
+            if {$LastPos>$help_line_length} {
+               set LastPos [string last " " $line $help_line_length]
+            }
+            # If the evaluated line break position is inside the range of the initial line spaces,
+            # something goes wrong and the line should be broken at another adequate character:
+            if {$LastPos<=[string length $SpaceStart]-1} {
+               # Search for other good line break characters (:
+               set LastPos [lindex [lindex \
+                  [regexp -inline -indices {[^,:\.?\)]+$} \
+                  {ProcDef(::ImportTestPointAssignmentsGeneric,Arg_SectionComment,ColumnSeparation}] 0] 0]
+               # No line break position could be found:
+               if {$LastPos=={}} {set LinePos 0}
+            }
+            # Break the line simply at the maximum allowed length in case no break position could 
+            # be found:
+            if {$LastPos<=[string length $SpaceStart]-1} {set LastPos $help_line_length}
+
+            # Add the line segment to the help text:
+            append HelpText [string range $line 0 [expr $LastPos-1]]\n
+            
+            # Eliminate the segment from the actual line:
+            set line [string range $line [expr $LastPos+1] end]
+         }
+      }
+   }
+
+   # GetChoiceHelpText returns a help text for the choice options. The returned string corresponds
+   # to the comma separated choice list in case no choice labels are defined. Otherwise, the 
+   # choice labels are added behind the choice options in paranthesis.
+   
+   proc GetChoiceHelpText {ProcName Var} {
+      variable ProcDef
+      set ChoiceHelpText ""
+      set LabelList {}
+      catch {set LabelList $ProcDef($ProcName,Arg,$Var,-choicelabels)}
+      foreach Choice $ProcDef($ProcName,Arg,$Var,-choices) Label $LabelList {
+         append ChoiceHelpText ", $Choice"
+         if {$Label!=""} {
+            append ChoiceHelpText "($Label)"
+         }
+      }
+      return [string range $ChoiceHelpText 2 end]
+   }
+
+   # 'ProcedureHelp' behaves in different ways, depending the provided argument. Called without any
+   # argument, it summarizes all the declared procedures without explaining details about the 
+   # procedure arguments. Called with a particular procedure name as parameter, it produces for
+   # this procedure a comprehensive help text. And finally, if it is called with the name of a main 
+   # procedure that has multiple sub procedures, it generates for all the sub procedures the 
+   # complete help text.
+
+   proc ProcedureHelp {{ProcName ""} {ReturnHelp 0}} {
+      variable ProcDef
+      variable ProcedureList
+      ProcedureHelp_Append "NAME"
+      
+      # Print a list of available commands when no procedure name has been provided as argument:
+      if {$ProcName==""} {
+         foreach ProcName [lsort -dictionary $ProcedureList] {
+            if {[info exists ProcDef($ProcName,-short_description)]} {
+               ProcedureHelp_Append "      [PureProcName] - $ProcDef($ProcName,-short_description)"
+            } else {
+               ProcedureHelp_Append "      [PureProcName]"
+            }
+         }
+
+      # A procedure name has been provided, generate a detailed help text for this procedure, or
+      # for all sub procedures if only the main procedure names has been provided:
+      } else {
+         # Create the full qualified procedure name (procedure name including namespace).
+         # Check if the procedure name contains already the name space identification:
+         if {[string range $ProcName 0 1]!="::"} {
+            # The namespace is not part of the used procedure name call. Evaluate it explicitly:
+            set NameSpace [uplevel 1 {namespace current}]
+            if {$NameSpace!="::"} {append NameSpace "::"}
+            set ProcName ${NameSpace}${ProcName}
+         }
+         set PureProcName [PureProcName]
+
+         # Add the short description if it exists to the NAME help text section. Please note that
+         # only the short description of a main procedure is used in case the procedure has also
+         # sub procedures.
+         if {[info exists ProcDef($ProcName,-short_description)]} {
+            ProcedureHelp_Append "      $PureProcName - $ProcDef($ProcName,-short_description)"
+         } else {
+            ProcedureHelp_Append "      $PureProcName"
+         }
+
+         # Create the SYNOPSIS section which contains also the synopsis of eventual sub procedures:
+         ProcedureHelp_Append "SYNOPSIS"
+         set NbrDescriptions 0
+         set NbrExamples 0
+         
+         # Loop through all procedures and sub procedures:
+         set ProcNames [lsort -dictionary [concat [list $ProcName] [info procs "$ProcName *"]]]
+         foreach ProcName $ProcNames {
+            # Skip the (sub) procedure if it has not been explicitly declared. This may be the 
+            # case for procedures that are not implemented themselves but which have sub procedures:
+            if {![info exists ProcDef($ProcName,VarList)]} continue
+            set PureProcName [PureProcName]
+
+            # Add to the help text first the procedure name, and then in the following lines its
+            # arguments:
+            ProcedureHelp_Append "      $PureProcName"
+            if {$ProcDef($ProcName,-named_arguments_first)} {
+               set ParClasses {Named Unnamed}
+            } else {
+               set ParClasses {Unnamed Named}
+            }
+            foreach ParClass $ParClasses {
+               foreach Var $ProcDef($ProcName,${ParClass}VarList) {
+                  # Section comment: Create a clean separation of the arguments:
+                  if {[info exists ProcDef($ProcName,Arg,$Var,SectionComment)]} {
+                     ProcedureHelp_Append "         --- $ProcDef($ProcName,Arg,$Var,SectionComment) ---"
+                  }
+
+                  # Argument declaration - put optional arguments into brackets, show the name
+                  # of named arguments, add existing descriptions as well as range, type, choice
+                  # definitions:
+                  set HelpLine "            "
+                  if {$ProcDef($ProcName,Arg,$Var,-optional)} {
+                     append HelpLine "\["
+                  }
+                  if {$ProcDef($ProcName,Arg,$Var,IsNamed)} {
+                     append HelpLine "-$Var "
+                  }
+                  if {$ProcDef($ProcName,Arg,$Var,-type)!="none"} {
+                     append HelpLine "<$Var>"
+                  }
+                  if {$ProcDef($ProcName,Arg,$Var,-optional)} {
+                     append HelpLine "\]"
+                  }
+                  ProcedureHelp_Append $HelpLine
+
+                  set HelpLine "               "
+                  if {[info exists ProcDef($ProcName,Arg,$Var,-description)]} {
+                     append HelpLine "$ProcDef($ProcName,Arg,$Var,-description), "
+                  }
+                  if {[lsearch -exact {"" "none"} $ProcDef($ProcName,Arg,$Var,-type)]<0} {
+                     append HelpLine "type: $ProcDef($ProcName,Arg,$Var,-type), "
+                  }
+                  if {[info exists ProcDef($ProcName,Arg,$Var,-default)]} {
+                     if {[lsearch -exact {"" "string"} $ProcDef($ProcName,Arg,$Var,-type)]>=0 || $ProcDef($ProcName,Arg,$Var,-default)==""} {
+                        append HelpLine "default: \"$ProcDef($ProcName,Arg,$Var,-default)\", "
+                     } else {
+                        append HelpLine "default: $ProcDef($ProcName,Arg,$Var,-default), "
+                     }
+                  }
+                  if {$ProcDef($ProcName,Arg,$Var,-multiple)} {
+                     append HelpLine "multiple: yes, "
+                  }
+                  if {[info exists ProcDef($ProcName,Arg,$Var,-range)]} {
+                     append HelpLine "range: [lindex $ProcDef($ProcName,Arg,$Var,-range) 0]..[lindex $ProcDef($ProcName,Arg,$Var,-range) 1], "
+                  }
+                  if {[info exists ProcDef($ProcName,Arg,$Var,-choices)]} {
+                     append HelpLine "choices: \{[GetChoiceHelpText $ProcName $Var]\}, "
+                  }
+                  # Eliminate the last ", ":
+                  ProcedureHelp_Append [string range $HelpLine 0 end-2]
+               }
+            }
+            # Remember if descriptions and/or examples are provided for the procedure:
+            if {[info exists ProcDef($ProcName,-description)]} {
+               incr NbrDescriptions
+            }
+            if {[info exists ProcDef($ProcName,-example)]} {
+               incr NbrExamples
+            }
+         }
+         # Add for the procedure and sub procedures the descriptions:
+         if {$NbrDescriptions>0} {
+            ProcedureHelp_Append "DESCRIPTION"
+            foreach ProcName $ProcNames {
+               if {[info exists ProcDef($ProcName,-description)]} {
+                  set PureProcName [PureProcName]
+                  if {[llength $ProcNames]>1} {
+                     ProcedureHelp_Append "      $PureProcName"
+                     ProcedureHelp_Append "         $ProcDef($ProcName,-description)"
+                  } else {
+                     ProcedureHelp_Append "      $ProcDef($ProcName,-description)"
+                  }
+               }
+            }
+         }
+         # Add for the procedure and sub procedures the examples:
+         if {$NbrExamples>0} {
+            ProcedureHelp_Append "EXAMPLE"
+            foreach ProcName $ProcNames {
+               if {[info exists ProcDef($ProcName,-example)]} {
+                  set PureProcName [PureProcName]
+                  if {[llength $ProcNames]>1} {
+                     ProcedureHelp_Append "      $PureProcName"
+                     ProcedureHelp_Append "         $ProcDef($ProcName,-example)"
+                  } else {
+                     ProcedureHelp_Append "      $ProcDef($ProcName,-example)"
+                  }
+               }
+            }
+         }
+      }
+      # The created help text is by default printed to stdout.  The text will be returned
+      # as result when 'ReturnHelp' is set to 1:
+      if {$ReturnHelp} {
+         return $HelpText
+      } else {
+         puts $HelpText
+      }
+   }
+
+##########################################################################
+#                        argument_dialogbox                            #
+##########################################################################
+
+   ######## Argument_dialogbox configuration ########
+   
+   # Application specific entry widget procedures can use this array variable to store their own 
+   # data, using as index the widget path provided to the procedure, e.g. 
+   # argument_dialogbox($W,<sub_index>):
+   array set argument_dialogbox {}
+   
+   # Special elements of this array variable can be specified for testing purposes:
+   #
+   # Set to following variable to "ok" to simulate an acknowledge of the dialog box and to 
+   # "cancel" to simulate an activation of the Cancel button:
+   set argument_dialogbox(test,status) ""
+
+   # The following variable can contain a script that is executed for test purposes, before
+   # the argument dialog box waits on user interactions. The script is executed in the context
+   # of the argument dialog box. Entire user interaction actions can be emulated together 
+   # with the previous variable.
+   set argument_dialogbox(test,script) {}
+   
+   # The array variable 'last_parameters' is only used by an argument dialog box when its context 
+   # has been specified via the -context attribute. The argument dialog box position and size as 
+   # well as its entered data are stored inside this variable when the data are acknowledged and 
+   # the form is closed. This allows the form to restore its previous state once it is called 
+   # another time.
+   array set last_parameters {}
+   
+
+   ######## Argument_dialogbox help text ########
+
+   set ArgumentDialogboxHelp {
+      argument_dialogbox \
+         [-title <DialogBoxTitle>]
+         [-window <DialogBoxWindow>]
+         [-context <DialogBoxContext>]
+         [-validatecommand <Script>]
+         [-validatecommand_error_text <Script>]
+         <ArgumentDefinition>|<FrameDefinition>|<Comment>
+         [<ArgumentDefinition>|<FrameDefinition>|<Separation>|<Comment>]
+         [<ArgumentDefinition>|<FrameDefinition>|<Separation>|<Comment>]
+         ...
+
+      <FrameDefinition> = -frame <FrameLabel>
+      
+      <Separation> = -sep {}
+      
+      <Comment> = -comment {-text <text>}
+
+      <ArgumentDefinition> =
+         <ArgumentWidgetType>
+         {
+            [-variable <variable>]
+            [-label <LabelName>]
+            [-choices <ChoiceList>]
+            [-choicelabels <ChoiceLabelList>]
+            [-choicevariable <ChoiceVariable>]
+            [-default <DefaultValue>]
+            [-multiple_selection 0|1]
+            [-height <Height>]
+            [-validatecommand <Script>]
+            [-validatecommand_error_text <Script>]
+            [-validatecommand2 <Script>]
+            [-validatecommand2_error_text <Script>]
+            [<WidgetTypeParameter1> <WidgetTypeParameterValue1>]
+            [<WidgetTypeParameter2> <WidgetTypeParameterValue2>]
+            ...
+         }
+      
+      <ParameterWidgetType> = <StandardParameterWidgetType>|<ApplicationSpecificParameterWidgetType>
+
+      <StandardParameterWidgetType> = {
+         -entry
+         -checkbox -radiobox -checkbutton
+         -listbox -disjointlistbox -combobox
+         -file -existingfile -directory -existingdirectory
+         -color -font
+      }
+   }
+
+   # Eliminate leading tabs in the help text and replace eventual tabs through spaces
+   regsub -all -line {^\t\t} $ArgumentDialogboxHelp "" ArgumentDialogboxHelp
+   regsub -all -line {\t} $ArgumentDialogboxHelp "   " ArgumentDialogboxHelp
+
+   ######## argument_dialogbox ########
+
+   # The argument dialog box allows a very easy generation of complex dialog boxes that can be 
+   # used for tool configuration purposes or to control actions. This command is only available
+   # if Tk has been loaded.
+   # The argument dialog box accepts only named arguments, e.g. all arguments have to be defined 
+   # as argument pairs (-<ArgumentName> <ArgumentValue>). There are some view arguments like -title,
+   # -windows and -context that effect the argument dialog box general attitude and embedding. The
+   # remaining argument block objective is the definition of variables. Except the two arguments 
+   # -frame and -sep that are used to structure graphically the form, all other arguments have to
+   # be assigned either to a local or global variable. The argument dialog box will create in the
+   # procedure from which it has been called a local variable, unless the variable has not been 
+   # defined explicitly as global variable, or as part of a certain namespace.
+   # The argument dialog box requires for each variable that has to be controlled a separate 
+   # parameter pair. The first element is indicating the entry form that will be used to control 
+   # the variable, the second element provides information concerning the variable that has to be
+   # defined and about its validation as well as parameters for the entry form. TEPAM provides
+   # already a lot of available entry forms, but other application specific forms can easily been
+   # added if necessary.
+   # The following lines show an example of the way how the argument dialog box is used:
+   #
+   #   argument_dialogbox \
+   #      -title "System configuration" \
+   #      -window .dialog_box \
+   #      -context test_1 \
+   #      \
+   #      -frame {-label "File definitions"} \
+   #         -comment {-text "Here are two entry fields"} \
+   #         -file {-variable InputFile} \
+   #         -file {-label "Output file" -variable OutputFile} \
+   #      -frame {-label "Frame2"} \
+   #         -entry {-label Offset -variable OffsetValue} \
+   #         -sep {} \
+   #         -listbox {-label MyListBox -variable O(-lb1) -choices {1 2 3 4 5 6 7 8} -choicevariable ::O(-lb1_contents) -multiple_selection 1} \
+   #      -frame {-label "Check and radio boxes"} \
+   #         -checkbox {-label MyCheckBox -variable O(-check1) -choices {bold italic underline} -choicelabels {Bold Italic Underline}} \
+   #         -radiobox {-label MyRadioBox -variable O(-radio1) -choices {bold italic underline} -choicelabels {Bold Italic Underline}} \
+   #         -checkbutton {-label MyCheckButton -variable O(-check2)} \
+   #      -frame {-label "Others"} \
+   #         -color {-label "Background color" -variable MyColor} \
+
+   proc argument_dialogbox {args} {
+      variable argument_dialogbox
+      variable ArgumentDialogboxHelp
+      variable last_parameters
+      
+      # Generate an error if Tk hasn't been loaded
+      if {[catch {package present Tk}]} {
+         return -code error "argument_dialogbox requires Tk!"
+      }
+      
+      # Call an initialization command that generates eventual required images:
+      GuiEnvironmentInit
+
+      #### Basic parameter check ####
+
+         # Use the first element of args as args list if args contains only one element:
+         if {[llength $args]==1} {
+            set args [lindex $args 0]
+         }
+         # Check if arguments are provided and if the number of arguments is even:
+         if {[llength $args]<1} {
+            return -code error "argument_dialogbox: no argument is provided"
+         }
+         if {[llength $args]%2!=0 && $args!="-help"} {
+            return -code error "argument_dialogbox: arguments have to be provided in key/value pairs"
+         }
+
+      #### Global parameter evaluation and top-level window creation ####
+
+         # The following default widget path can be changed with the -window argument:
+         set Wtop .dialog
+         
+         # Initialize the global parameters
+         # YScroll=auto: Scroll is enabled in function of the windows and screen size
+         array set ProcOption {
+            -validatecommand {} -validatecommand2 {}
+            -validatecommand_error_text {} -validatecommand2_error_text {}
+            -parent .
+            -title "Dialog"
+            -yscroll "auto"
+         }
+
+         # Read the global parameters by looping through all arguments to select the relevant 
+         # ones:
+         foreach {ArgName ArgValue} $args {
+            switch -- $ArgName {
+               -help {puts $ArgumentDialogboxHelp; return}
+               -window {set Wtop $ArgValue}
+               -parent -
+               -context -
+               -title -
+               -yscroll -
+               -validatecommand -
+               -validatecommand2 -
+               -validatecommand_error_text -
+               -validatecommand2_error_text {
+                  lappend ProcOption($ArgName) $ArgValue
+               }
+            }
+         }
+
+         # Create the dialog box top-level window. Hide it until the windows has been entirely 
+         # deployed:
+         catch {destroy $Wtop}
+         toplevel $Wtop
+         wm withdraw $Wtop
+         wm title $Wtop $ProcOption(-title)
+         wm transient $Wtop $ProcOption(-parent)
+
+         grid [frame $Wtop.sf] -row 0 -column 0 -sticky news
+         grid columnconfigure $Wtop 0 -weight 1
+         grid rowconfigure $Wtop 0 -weight 1
+         frame $Wtop.sf.f
+         
+         # Delete eventually variables defined by a previous call of the argument dialog box:
+         catch {array unset argument_dialogbox $Wtop,*}
+         catch {array unset argument_dialogbox $Wtop.*}
+
+      #### Argument dependent dialog box generation ####
+
+         # Loop through all arguments and build the dialog box:
+         set ArgNbr -1
+         set Framed 0
+         set W $Wtop.sf.f
+         foreach {ArgName ArgValue} $args {
+            incr ArgNbr
+            
+            # Check that the argument is a named argument:
+            if {[string index $ArgName 0]!="-"} {
+               return -code error "Argument $ArgName not known"
+            }
+
+            # Skip the global parameters that have already been processed
+            if {[lsearch -exact {-window -parent -context -title -help -yscroll
+                                 -validatecommand -validatecommand2
+                                 -validatecommand_error_text -validatecommand2_error_text} $ArgName]>=0} continue
+            
+            # Define the widget path for the new argument:
+            set WChild($ArgNbr) $W.child_$ArgNbr
+            
+            # An argument option array will be created, based on the argument value list:
+            if {$ArgName!="-sep"} {
+               catch  {unset Option}
+               array set Option {-label "" -optional 0}
+               if {[llength $ArgValue]%2!=0} {
+                  return -code error "argument_dialogbox, argument $ArgName: Attribute definition list has to contain an even number of elements"
+               }
+               array set Option $ArgValue
+            }
+            
+            # The leading '-' of the argument name will not be used anymore in the remaining code:
+            set ElementType [string range $ArgName 1 end]
+            switch -- $ElementType {
+               frame {
+                  # Handle frames - close an eventual already open frame first:
+                  if {$Framed} {
+                     set W [winfo parent [winfo parent $W]]
+                     set WChild($ArgNbr) $W.child_$ArgNbr
+                  }
+                  set Framed 0
+                  
+                  # Create only a new frame when the provided argument list is not empty:
+                  if {$ArgValue!=""} {
+                     # Create a labeled frame (for Tk 8.3 that doesn't contain a label frame)
+                     set FontSize 10
+                     pack [frame $WChild($ArgNbr) -bd 0] \
+                        -pady [expr $FontSize/2] -padx 2 -fill both -expand no
+                     pack [frame $WChild($ArgNbr).f -bd 2 -relief groove] \
+                        -pady [expr $FontSize/2] -fill both -expand no
+                     place [label $WChild($ArgNbr).label -text $Option(-label)] \
+                        -x $FontSize -y [expr $FontSize/2] -anchor w
+                     pack [canvas $WChild($ArgNbr).f.space -height [expr $FontSize/4] -width 10] \
+                        -pady 0
+                     set W $WChild($ArgNbr).f
+                     set Framed 1
+                  }
+               }
+
+               sep {
+                  # A separator is nothing else than a frame widget that has 'no height' and a 
+                  # relief structure:
+                  pack [frame $WChild($ArgNbr) -height 2 -borderwidth 1 -relief sunken] \
+                     -fill x -expand no -pady 4
+               }
+
+               comment {
+                  # A simple label widget is used for comments:
+                  pack [label $WChild($ArgNbr) -text $Option(-text) -fg blue -justify left] \
+                     -anchor w -expand no -pady 2
+               }
+               
+               default {
+                  # All other arguments, e.g. the real entries to define the variables, are 
+                  # handled by procedures that provides sub commands for the different usages:
+                  #   ad_form(<EntryType>) create - creates the entry widget
+                  #   ad_form(<EntryType>) set_choice - set the choice constraints
+                  #   ad_form(<EntryType>) set - set the default value
+                  #   ad_form(<EntryType>) get - read the defined value
+
+                  # Create a text in front of the entry widget if the -text attribute is defined:
+                  if {[info exists Option(-text)]} {
+                     pack [label $WChild($ArgNbr)_txt -text $Option(-text) -fg blue \
+                        -justify left] -anchor w -expand no -pady 2
+                  }
+
+                  # Create for the entry a frame and place the label together with a sub frame
+                  # into it:
+                  pack [frame $WChild($ArgNbr)] -fill x -expand yes
+                  pack [label $WChild($ArgNbr).label -text $Option(-label)] -pady 4 -side left
+                  pack [frame $WChild($ArgNbr).f] -fill x -expand yes -side left
+                              
+                  # Delete eventual existing array members related to the new entry:
+                  array unset argument_dialogbox $WChild($ArgNbr),*
+                  
+                  # Create the variable entry form:
+                  ad_form($ElementType) $WChild($ArgNbr).f create
+                  
+                  # Attribute if existing the choice list. This list can either be provided via 
+                  # the -choicevariable or via -choices:
+                  if {[info exists Option(-choicevariable)] && \
+                      [uplevel 1 "info exists \"$Option(-choicevariable)\""]} {
+                     ad_form($ElementType) $WChild($ArgNbr).f set_choice \
+                           [uplevel 1 "set \"$Option(-choicevariable)\""]
+                  } elseif {[info exists Option(-choices)]} {
+                     ad_form($ElementType) $WChild($ArgNbr).f set_choice $Option(-choices)
+                  }
+                  
+                  # Apply the default value. If the variable exists already, use the variable value
+                  # as default value. Otherwise, check if the last_parameter array provides the
+                  # value from a previous usage. And finally, check if a default value is provided
+                  # via the -default option:
+                  if {[info exists Option(-variable)] && \
+                      [uplevel 1 "info exists \"$Option(-variable)\""]} {
+                     ad_form($ElementType) $WChild($ArgNbr).f set \
+                           [uplevel 1 "set \"$Option(-variable)\""]
+                  } elseif {[info exists Option(-variable)] && [info exists ProcOption(-context)] && \
+                            [info exists last_parameters($ProcOption(-context),$Option(-variable))]} {
+                     ad_form($ElementType) $WChild($ArgNbr).f set \
+                              $last_parameters($ProcOption(-context),$Option(-variable))
+                  } elseif {[info exists Option(-default)]} {
+                     ad_form($ElementType) $WChild($ArgNbr).f set $Option(-default)
+                  }
+                  
+                  # Check if the 'Validate' command is defined for the provided variable type:
+                  if {[info exists Option(-type)] && [catch {Validate($Option(-type)) ""}]} {
+                     return -code error "Argument_dialogbox: Argument type '$Option(-default)' not known"
+                  }
+               }
+            }
+         }
+
+      #### Dialog box finalization ####
+
+         # Add the OK and cancel buttons, restore eventually saved geometry data and deiconify finally 
+         # the form:
+         grid [frame $Wtop.buttons] -row 1 -column 0 -columnspan 2 -sticky ew
+         button $Wtop.buttons.ok -text OK -command "set ::tepam::argument_dialogbox($Wtop,status) ok"
+         button $Wtop.buttons.cancel -text Cancel -command "set ::tepam::argument_dialogbox($Wtop,status) cancel"
+         pack $Wtop.buttons.ok $Wtop.buttons.cancel -side left -fill x -expand yes
+
+         update
+         if {$ProcOption(-yscroll)==1 || ($ProcOption(-yscroll)=="auto" && 
+                [winfo reqheight $Wtop.sf.f]+[winfo reqheight $Wtop]>[winfo screenheight $Wtop]*2/3)} {
+            place $Wtop.sf.f -x 0 -y 0 -relwidth 1; # -relheight 1
+            grid [scrollbar $Wtop.scale -orient v -command "tepam::argument_dialogbox_scroll $Wtop"] -row 0 -column 1 -sticky ns
+
+            wm geometry $Wtop [winfo reqwidth $Wtop.sf.f]x[expr [winfo screenheight $Wtop.sf.f]*2/3]
+            update
+            tepam::argument_dialogbox_scroll $Wtop init
+
+            # Add the bindings
+            bind $Wtop.sf <Configure> "tepam::argument_dialogbox_scroll $Wtop config %W %w %h"
+            bind $Wtop <MouseWheel> "if {%D>0} {tepam::argument_dialogbox_scroll $Wtop scroll -1 units} elseif {%D<0} {tepam::argument_dialogbox_scroll $Wtop scroll 1 units}"
+            bind $Wtop <Button-4> "tepam::argument_dialogbox_scroll $Wtop scroll -1 units"
+            bind $Wtop <Button-5> "tepam::argument_dialogbox_scroll $Wtop scroll 1 units"
+         } else {
+            pack $Wtop.sf.f -expand yes -fill both
+         }
+
+         if {[info exists ProcOption(-context)] && [info exists last_parameters($ProcOption(-context),-geometry)]} {
+            ConfigureWindowsGeometry $Wtop $last_parameters($ProcOption(-context),-geometry)
+         }
+
+         wm protocol $Wtop WM_DELETE_WINDOW "set ::tepam::argument_dialogbox($Wtop,status) cancel"
+
+         wm deiconify $Wtop
+
+      #### Wait until the dialog box entries are acknowledged (OK button) or discarded #
+      
+         # Execute a script if required (only for testing purposes)
+         if {$argument_dialogbox(test,script)!={}} {
+            eval $argument_dialogbox(test,script)
+         }
+      
+         # Stay in a loop until all the provided values have been validated:
+         while {1} {
+            # Wait until the OK or cancel button is pressed:
+            set argument_dialogbox($Wtop,status) ""
+            if {$argument_dialogbox(test,status)==""} {
+               vwait ::tepam::argument_dialogbox($Wtop,status)
+               set status $argument_dialogbox($Wtop,status)
+            } else { # Emulate the button activation for test purposes
+               set status $argument_dialogbox(test,status)
+            }
+
+            # Cancel has been pressed - exit the wait loop:
+            if {$status=="cancel"} break
+
+            # Read all the provided values, validate them, and assign them the corresponding 
+            # variables:
+            set ErrorMessage ""
+            set ArgNbr -1
+            foreach {ArgName ArgValue} $args {
+               incr ArgNbr
+               
+               # Extract the element type (eliminate the leading '-') and the parameters to the
+               # Option array:
+               set ElementType [string range $ArgName 1 end]
+               if {[llength $ArgValue]<2 || [llength $ArgValue]%2!=0} continue
+               catch  {unset Option}
+               array set Option {-label "" -optional 0}
+               array set Option $ArgValue
+                # No variable is assigned to the entry, so skip this parameter:
+               if {![info exists Option(-variable)]} continue
+   
+               # Read the result, check it and assign the result variable
+               set Value [ad_form($ElementType) $WChild($ArgNbr).f get]
+   
+               # Validate the provided data:
+               if {$Value!="" || $Option(-optional)==0} {
+                  if {[info exists Option(-type)] && ![Validate($Option(-type)) $Value]} {
+                     append ErrorMessage "$Option(-variable): Required type is $Option(-type)\n"
+                  }
+                  # Apply the validate command if existing:
+                  if {[info exists Option(-validatecommand)]} {
+                     regsub {%P} $Option(-validatecommand) $Value ValidateCommand
+                     if {![uplevel $ValidateCommand]} {
+                        if {[info exists Option(-validatecommand_error_text)]} {
+                           append ErrorMessage "$Option(-validatecommand_error_text)\n"
+                        } else {
+                           append ErrorMessage "$Option(-variable): The value '$Value' is not valid\n"
+                        }
+                     }
+                  }
+                  # Check against a provided range:
+                  if {[info exists Option(-range)]} {
+                     if {$Value<[lindex $Option(-range) 0] || \
+                         $Value>[lindex $Option(-range) 1]} {
+                        append ErrorMessage "$Option(-variable): The value has to be between [lindex $Option(-range) 0] and [lindex $Option(-range) 1]\n"
+                     }
+                  }
+                  # Check that the variable value is a member of a provided choice list. Some 
+                  # flexibility is required for this check, since the specified value may be a list 
+                  # of multiple elements that are matching the choice list.
+                  if {[info exists Option(-choices)]} {
+                     set ChoiceError 0
+                     foreach v $Value {
+                        if {[lsearch -exact $Option(-choices) $v]<0} {
+                        incr ChoiceError
+                        }
+                     }
+                     if {$ChoiceError && [lsearch -exact $Option(-choices) $Value]<0} {
+                        append ErrorMessage "$Option(-variable): The value(s) has(have) to be one of the following elements: $Option(-choices)\n"
+                     }
+                  }
+               }
+               if {[info exists ProcOption(-context)]} {
+                  set last_parameters($ProcOption(-context),$Option(-variable)) $Value
+               }
+            }
+
+            if {$ErrorMessage==""} {
+               #### Assign the values to the variables ####
+               set ArgNbr -1
+               foreach {ArgName ArgValue} $args {
+                  incr ArgNbr
+                  # Extract the element type (eliminate the leading '-') and the parameters to the
+                  # Option array:
+                  set ElementType [string range $ArgName 1 end]
+                  if {[llength $ArgValue]<2 || [llength $ArgValue]%2!=0} continue
+                  catch  {unset Option}
+                  array set Option {-label "" -optional 0}
+                  array set Option $ArgValue
+                   # No variable is assigned to the entry, so skip this parameter:
+                  if {![info exists Option(-variable)]} continue
+   
+                  # Read the result, check it and assign the result variable
+                  set Value [ad_form($ElementType) $WChild($ArgNbr).f get]
+   
+                  # Define the variable in the context of the calling procedure:
+                  if {$Value!="" || $Option(-optional)==0} {
+                     uplevel 1 "set \"$Option(-variable)\" \{$Value\}"
+                  }
+               }
+
+               #### Perform the custom argument validations ####
+               
+               foreach {VCommandO VCommandErrTxtO VLevel} {
+                  -validatecommand -validatecommand_error_text 1
+                  -validatecommand2 -validatecommand2_error_text 2
+               } {
+                  foreach ValidateCommand $ProcOption($VCommandO) ValidateCommandErrTxt $ProcOption($VCommandErrTxtO) {
+                     if {![uplevel $VLevel $ValidateCommand]} {
+                        if {$ValidateCommandErrTxt!=""} {
+                           append ErrorMessage "$ValidateCommandErrTxt\n"
+                        } else {
+                           append ErrorMessage "Validation constraint '$ArgValue' is not satisfied\n"
+                        }
+                     }
+                  }
+               }
+            }
+
+            # Exit the loop if everything could be validated
+            if {$ErrorMessage==""} break
+
+            # Generate otherwise an error message box
+            if {$argument_dialogbox(test,status)==""} {
+               tk_messageBox -icon error -title Error -type ok -parent $Wtop \
+                             -message "The entries could not be successfully validated:\n\n$ErrorMessage\nPlease correct the related entries."
+               raise $Wtop
+            } else { # Return the error message as error for test purposes
+               return -code error "The entries could not be successfully validated:\n\n$ErrorMessage\nPlease correct the related entries."
+            }
+         }
+         
+         #### Save the dialog box geometry and destroy the form ####
+
+         if {[info exists ProcOption(-context)]} {
+            set last_parameters($ProcOption(-context),-geometry) [wm geometry $Wtop]
+         }
+         destroy $Wtop
+         array unset argument_dialogbox $Wtop,*
+         return $status
+   }
+
+   # The procedure 'argument_dialogbox_scroll' is used by the argument dialogbox y-scrollbar to
+   # execute the scroll commands. It implements the Tk typical scroll commands like 'moveto', 
+   # 'scroll x pages/units'. In addition to this it implements also an initialization (used to
+   # initialize the scrolled frame) and a configuragion command that can be executed when a 
+   # configuration event happens.
+   proc argument_dialogbox_scroll {Wtop Command args} {
+      set FrameHeight [winfo reqheight $Wtop.sf.f]
+      set VisibleHeight [expr 1.0*[winfo height $Wtop.sf]/$FrameHeight]
+      set ActualPositionY [lindex [$Wtop.scale get] 0]
+
+      switch -- $Command {
+         init {
+            set ::tepam::argument_dialogbox($Wtop,wsize) ""
+         }
+         config {
+            if {[lindex $args 0]!="$Wtop.sf" || $args==$::tepam::argument_dialogbox($Wtop,wsize)} return
+            set ::tepam::argument_dialogbox($Wtop,wsize) $args
+            argument_dialogbox_scroll $Wtop moveto 0
+         }
+         moveto {
+            # Get the desired scroll position, and keep it within the valid scroll range
+            set NewPositionY [lindex $args 0]
+            if {$NewPositionY<0} {set NewPositionY 0}
+            if {$NewPositionY>1.0-$VisibleHeight} {set NewPositionY [expr 1.0-$VisibleHeight]}
+
+            # Adjust the scrollable frame location
+            place configure $Wtop.sf.f -y [expr -1.0*$NewPositionY*$FrameHeight]
+
+            # Adjust the scrollbar status
+            $Wtop.scale set $NewPositionY [expr $NewPositionY+$VisibleHeight]
+         }
+         scroll {
+            set StepH [expr 30.0/$FrameHeight]; # This defines the scroll unit
+            switch -- $args {
+               "-1 pages" {
+                  argument_dialogbox_scroll $Wtop moveto [expr $ActualPositionY-$VisibleHeight]
+               }
+               "1 pages" {
+                  argument_dialogbox_scroll $Wtop moveto [expr $ActualPositionY+$VisibleHeight]
+               }
+               "-1 units" {
+                  argument_dialogbox_scroll $Wtop moveto [expr $ActualPositionY-$StepH]
+               }
+               "1 units" {
+                  argument_dialogbox_scroll $Wtop moveto [expr $ActualPositionY+$StepH]
+               }
+            }
+         }
+      }
+   }
+
+   # Create the necessary resources when the argument dialog box is called the first time:
+   proc GuiEnvironmentInit {} {
+      if {[lsearch [image names] Tepam_SmallFlashDown]>=0} return
+      image create bitmap Tepam_SmallFlashDown -data {#define down_width 8
+         #define down_height 8
+         static unsigned char down_bits[] = {
+            0x00 0x00 0xff 0x7e 0x3c 0x18 0x00 0x00 }; }
+   }
+
+   # The following procedure defines the geometry (WxH+-X+-Y) of a window. The geometry is provided as
+   # second parameter. The position (X/Y) are verified and corrected if necessary to make the window
+   # entirly visible on the screen.
+   # This position correction is particularly interesting if an application runs within the same user 
+   # environment, but with different screen configurations.
+   proc ConfigureWindowsGeometry {W Geometry} {
+      set Width 200
+      set Height 150
+      regexp {^(\d+)x(\d+)} $Geometry {} Width Height
+
+      set X ""
+      set Y ""
+      if {[regexp {([+-]+\d+)([+-]+\d+)$} $Geometry {} X Y]} {
+         if {$X<0} {set X +0}
+         # if {$X>[winfo screenwidth .]-[winfo reqwidth $W]} {set X +[expr [winfo screenwidth .]-[winfo reqwidth $W]]}
+         if {$X>[winfo screenwidth .]-$Width} {set X +[expr [winfo screenwidth .]-$Width]}
+
+         if {$Y<0} {set Y +0}
+         # if {$Y>[winfo screenheight .]-[winfo reqheight $W]} {set Y +[expr [winfo screenheight .]-[winfo reqheight $W]]}
+         if {$Y>[winfo screenheight .]-$Height} {set Y +[expr [winfo screenheight .]-$Height]}
+      }
+      
+      wm geometry $W ${Width}x${Height}${X}${Y}
+   }
+
+   ######## Standard entry forms for the argument_dialogbox ########
+
+   # A dedicated procedure that handles the geometrical aspects of the argument dialog box is 
+   # required for each argument type. The prototype header of such a procedure is:
+   #
+   #    proc ad_form(<EntryType>) {W Command {Par ""}} <Body>
+   #
+   # The argument 'W' provides the path into which the entry has to be embedded.
+   # The procedures have to provide several sub command. The optional argument 'Par' is only used 
+   # for the 'set' and 'set_choice' sub commands:
+   #
+   #    ad_form(<EntryType>) <W> create
+   #       This sub command has to creates the form for the given entry type.
+   #
+   #    ad_form(<EntryType>) <W> set_choice <ChoiceList>
+   #       This sub command has to define the available selections (choice lists).
+   #
+   #    ad_form(<EntryType>) <W> set <Value>
+   #       This sub command has to set the default value of the form.
+   #
+   #    ad_form(<EntryType>) <W> get
+   #       This sub command has to return the value defined inside the form.
+   #
+   # To support all these sub commands, the procedures are typically structured in the following
+   # way:
+   #
+   #    proc ad_form(<EntryType>) {W Command {Par ""}} {
+   #       upvar Option Option
+   #       switch $Command {
+   #          "create" {<Form creation script>}
+   #          "set" {<Default value setting script>}
+   #          "set_choice" {<Choice list definition script>}
+   #          "get" {return [<Value evaluation script>]}
+   #       }
+   #    }
+   #
+   # The parameter definition list is mapped to the Option array variable when the ad_form
+   # procedures are called. These procedures can access these parameters via the Option variable
+   # of the calling procedure using the upvar statement.
+   # The provided frame into which each ad_form procedure can deploy the argument definition entry
+   # is by default not expandable. To make them expandable, for example for list boxes, the
+   # procedure ad_form(make_expandable) has to be called providing it with the entry path:
+
+   proc ad_form(make_expandable) {W} {
+      upvar 2 Framed Framed  FontSize FontSize
+      # Override the not expanded parent frames:
+      pack $W -fill both -expand yes
+      pack [winfo parent $W] -fill both -expand yes
+      if {$Framed} {
+         # Make the parent frames expandable for that the listbox can also expand
+         pack [winfo parent [winfo parent [winfo parent $W]]] \
+            -pady [expr $FontSize/2] -fill both -expand yes
+         pack [winfo parent [winfo parent $W]] \
+            -pady [expr $FontSize/2] -fill both -expand yes
+      }
+   }
+
+   # Implement now all entries:
+
+   #### Simple text entry ####
+
+   proc ad_form(entry) {W Command {Par ""}} {
+      switch $Command {
+         "create" {
+            pack [entry $W.entry] -fill x -expand yes -pady 4 -side left }
+         "set" {
+            $W.entry delete 0 end; # Clear the existing selection in case the 'set' command is called multiple times
+            $W.entry insert 0 $Par
+         }
+         "get" {
+            return [$W.entry get]
+         }
+      }
+   }
+
+   #### Text (multi line text) ####
+
+   proc ad_form(text) {W Command {Par ""}} {
+      # puts "ad_form(text) $W $Command $Par"
+      upvar Option Option
+      switch $Command {
+         "create" {
+            ad_form(make_expandable) $W
+            grid [text $W.text -yscrollcommand "$W.yscrollbar set"] -column 0 -row 0 -pady 2 -sticky news
+            grid [scrollbar $W.yscrollbar -command "$W.text yview"] -column 1 -row 0 -pady 2 -sticky ns
+
+            # Add a horizontal scroll bar if wrapping is disabled
+            if {[info exists Option(-wrap)] && $Option(-wrap)=="none"} {
+               grid [scrollbar $W.xscrollbar -command "$W.text xview" -orient horizontal] -column 0 -row 1 -sticky ew
+               $W.text config -xscrollcommand "$W.xscrollbar set"
+            }
+            grid columnconfigure $W 0 -weight 1
+            grid rowconfigure $W 0 -weight 1
+            
+            # Apply the text widget parameters
+            $W.text config -wrap word -height 4; # Default parameters
+            foreach Par {-height -wrap} {
+               if {[info exists Option($Par)]} {
+                  $W.text config $Par $Option($Par)
+               }
+            }
+         }
+         "set" {
+            $W.text delete 0.0 end; # Clear the existing selection in case the 'set' command is called multiple times
+            $W.text insert 0.0 $Par
+         }
+         "get" {
+            return [$W.text get 0.0 "end - 1 chars"]
+         }
+      }
+   }
+
+   #### Color entry ####
+
+   # Select_color sets the text and color of the color entry to a new color: 
+   proc select_color {W NewColor} {
+      if {$NewColor!=""} {
+         $W.entry delete 0 end
+         $W.entry insert 0 $NewColor
+      }
+      $W.entry config -background gray80
+      catch {$W.entry config -background [$W.entry get]}
+   }
+
+   proc ad_form(color) {W Command {Par ""}} {
+      upvar Option Option
+      if {![info exists Option(-type)]} {
+         set Option(-type) color
+      }
+      set Title ""
+      catch {set Title $Option(-label)}
+      switch $Command {
+         "create" {
+            pack [entry $W.entry] -fill x -expand yes -pady 4 -side left
+            pack [button $W.button -text Choose -command "::tepam::select_color $W \[tk_chooseColor -parent \{$W\} -title \{$Title\}\]"] -pady 4 -side left
+            bind $W.entry <Key-Return> "tepam::select_color $W {}"
+            bind $W.entry <Leave> "tepam::select_color $W {}"
+         }
+         "set" {
+            select_color $W $Par
+         }
+         "get" {
+            return [$W.entry get]
+         }
+      }
+   }
+
+   #### File and directory entries ####
+
+   # Select_file sets the file or directory entry to a new file name:
+   proc select_file {W NewFile} {
+      if {$NewFile==""} return
+      $W.entry delete 0 end
+      $W.entry insert 0 $NewFile
+   }
+
+   # Ad_form(directory_or_file) is a generic implementation of a file and directory selection
+   # form. It will be used for the different file and directory types:
+   proc ad_form(directory_or_file) {W Type Command {Par ""}} {
+      upvar 2 Option Option
+      if {![info exists Option(-type)]} {
+         set Option(-type) $Type
+      }
+      set Title ""
+      catch {set Title $Option(-label)}
+      switch $Command {
+         "create" {
+            set FileTypes {}
+            if {[info exists Option(-filetypes)]} {
+               set FileTypes $Option(-filetypes)
+            }
+
+            set ActiveDir "\[file dirname \[$W.entry get\]\]";
+            if {[info exists Option(-activedir)]} {
+               set ActiveDir $Option(-activedir)
+            }
+
+            set InitialFile "\[$W.entry get\]";
+            if {[info exists Option(-initialfile)]} {
+               set InitialFile $Option(-initialfile)
+               set ActiveDir [file dirname $Option(-initialfile)]
+            }
+
+            pack [entry $W.entry] -fill x -expand yes -pady 4 -side left
+            if {$Type=="existingdirectory"} {
+               pack [button $W.button -text Browse -command "::tepam::select_file $W \[tk_chooseDirectory -parent $W                         -initialdir \"$ActiveDir\"                               -title \{$Title\}\]"] -pady 4 -side left
+            } elseif {$Type=="directory"} {
+               pack [button $W.button -text Browse -command "::tepam::select_file $W \[tk_chooseDirectory -parent $W                         -initialdir \"$ActiveDir\"                               -title \{$Title\}\]"] -pady 4 -side left
+            } elseif {$Type=="existingfile"} {
+               pack [button $W.button -text Browse -command "::tepam::select_file $W \[tk_getOpenFile   -parent $W -filetypes \{$FileTypes\} -initialdir \"$ActiveDir\" -initialfile \"$InitialFile\" -title \{$Title\}\]"] -pady 4 -side left
+            } else { # file
+               pack [button $W.button -text Browse -command "::tepam::select_file $W \[tk_getSaveFile  -parent $W -filetypes \{$FileTypes\} -initialdir \"$ActiveDir\" -initialfile \"$InitialFile\" -title \{$Title\}\]"] -pady 4 -side left
+            }
+         }
+         "set" {
+            $W.entry delete 0 end; # Clear the existing selection in case the 'set' command is called multiple times
+            $W.entry insert 0 $Par
+         }
+         "get" {
+            return [$W.entry get]
+         }
+      }
+   }
+
+   # The generic file and directory selection command 'ad_form(directory_or_file)' are used to
+   # implement the 4 file and directory selection forms:
+
+   proc ad_form(directory) {W Command {Par ""}} {
+      ad_form(directory_or_file) $W directory $Command $Par
+   }
+
+   proc ad_form(existingdirectory) {W Command {Par ""}} {
+      ad_form(directory_or_file) $W existingdirectory $Command $Par
+   }
+
+   proc ad_form(file) {W Command {Par ""}} {
+      ad_form(directory_or_file) $W file $Command $Par
+   }
+
+   proc ad_form(existingfile) {W Command {Par ""}} {
+      ad_form(directory_or_file) $W existingfile $Command $Par
+   }
+
+   #### Combobox ####
+
+   proc ad_form(combobox) {W Command {Par ""}} {
+      switch $Command {
+         "create" {
+            pack [entry $W.entry -borderwidth 2] -fill x -expand yes -pady 4 -side left
+               pack [button $W.button -relief flat -borderwidth 0 -image Tepam_SmallFlashDown -command "tepam::ad_form(combobox) $W open_selection"] -pady 4 -side left
+
+               toplevel $W.selection -border 1 -background black
+               wm overrideredirect $W.selection 1
+               wm withdraw $W.selection
+            pack [listbox $W.selection.listbox -yscrollcommand "$W.selection.scrollbar set" -exportselection 0] -fill both -expand yes -side left
+            pack [scrollbar $W.selection.scrollbar -command "$W.selection.listbox yview"] -fill y -side left -expand no
+                     
+            bind $W.selection.listbox <<ListboxSelect>> "tepam::ad_form(combobox) $W close_selection"
+            bind $W.selection <FocusOut> "wm withdraw $W.selection"
+         }
+         "set" {
+            $W.entry delete 0 end; # Clear the existing selection in case the 'set' command is called multiple times
+            $W.entry insert 0 $Par
+         }
+         "get" {
+            return [$W.entry get]
+         }
+         "set_choice" {
+            foreach v $Par {
+               $W.selection.listbox insert end $v
+            }
+         }
+         "open_selection" {
+            ConfigureWindowsGeometry $W.selection [expr [winfo width $W.entry]+[winfo width $W.button]]x100+[winfo rootx $W.entry]+[expr [winfo rooty $W.entry]+[winfo height $W.entry]]
+
+            catch {$W.selection.listbox selection clear 0 end}
+            catch {$W.selection.listbox selection set [lsearch -exact [$W.selection.listbox get 0 end] [$W.entry get]]}
+            catch {$W.selection.listbox yview [lsearch -exact [$W.selection.listbox get 0 end] [$W.entry get]]}
+            
+            wm deiconify $W.selection
+            focus $W.selection }
+         "close_selection" {
+            $W.entry delete 0 end
+            $W.entry insert 0 [$W.selection.listbox get [$W.selection.listbox curselection]]
+            wm withdraw $W.selection }
+      }
+   }
+
+   #### Listbox ####
+
+   proc ad_form(listbox) {W Command {Par ""}} {
+      # puts "ad_form(listbox) $W $Command $Par"
+      upvar Option Option
+      switch $Command {
+         "create" {
+            ad_form(make_expandable) $W
+            pack [listbox $W.listbox -yscrollcommand "$W.scrollbar set" -exportselection 0] -fill both -expand yes -pady 4 -side left
+            if {[info exists Option(-multiple_selection)] && $Option(-multiple_selection)} {
+               $W.listbox config -selectmode extended
+            }
+            pack [scrollbar $W.scrollbar -command "$W.listbox yview"] -fill y -pady 4 -side left -expand no
+            if {[info exists Option(-height)]} {
+               $W.listbox config -height $Option(-height)
+            }
+         }
+         "set" {
+            catch {$W.listbox selection clear 0 end}; # Clear the existing selection in case the 'set' command is called multiple times
+            if {[info exists Option(-multiple_selection)] && $Option(-multiple_selection)} {
+               foreach o $Par {
+                  catch {$W.listbox selection set [lsearch -exact [$W.listbox get 0 end] $o]}
+                  catch {$W.listbox yview [lsearch -exact [$W.listbox get 0 end] $o]}
+               }
+            } else {
+                  catch {$W.listbox selection set [lsearch -exact [$W.listbox get 0 end] $Par]}
+                  catch {$W.listbox yview [lsearch -exact [$W.listbox get 0 end] $Par]}
+            }
+            }
+         "get" {
+            set Result {}
+            foreach o [$W.listbox curselection] {
+               lappend Result [$W.listbox get $o]
+            }
+            if {![info exists Option(-multiple_selection)] || !$Option(-multiple_selection)} {
+               set Result [lindex $Result 0]
+            }
+            return $Result
+         }
+         "set_choice" {
+            foreach v $Par {
+               $W.listbox insert end $v
+            }
+            $W.listbox selection set 0
+         }
+      }
+   }
+
+   #### Disjoint listbox ####
+
+   proc disjointlistbox_move {W Move} {
+      switch $Move {
+         "add" {
+            $W.listbox2 selection clear 0 end
+            foreach o [lsort -integer -increasing [$W.listbox1 curselection]] {
+               if {[$W.listbox1 itemcget $o -foreground]=="grey"} continue
+               $W.listbox2 insert end [$W.listbox1 get $o]
+               $W.listbox2 selection set end
+               $W.listbox1 itemconfigure $o -foreground grey
+            }
+            $W.listbox1 selection clear 0 end
+         }
+         "delete" {
+            foreach o [lsort -integer -decreasing [$W.listbox2 curselection]] {
+               for {set o1 0} {$o1<[$W.listbox1 index end]} {incr o1} {
+                  if {[$W.listbox2 get $o]==[$W.listbox1 get $o1]} {
+                     $W.listbox1 itemconfigure $o1 -foreground ""
+                  }
+               }
+               $W.listbox2 delete $o
+            }
+         }
+         "up" {
+            foreach o [$W.listbox2 curselection] {
+               if {$o==0} continue
+               $W.listbox2 insert [expr $o-1] [$W.listbox2 get $o]
+               $W.listbox2 delete [expr $o+1]
+               $W.listbox2 selection set [expr $o-1]
+            }
+         }
+         "down" {
+            foreach o [lsort -integer -decreasing [$W.listbox2 curselection]] {
+               if {$o==[$W.listbox2 index end]-1} continue
+               $W.listbox2 insert [expr $o+2] [$W.listbox2 get $o]
+               $W.listbox2 delete $o
+               $W.listbox2 selection set [expr $o+1]
+            }
+         }
+      }
+   }
+
+   proc ad_form(disjointlistbox) {W Command {Par ""}} {
+      # puts "ad_form(listbox) $W $Command $Par"
+      upvar Option Option
+      switch $Command {
+         "create" {
+            ad_form(make_expandable) $W
+
+            grid [label $W.label1 -text "Available"] -column 1 -row 0 -sticky ew
+            grid [label $W.label2 -text "Selected"] -column 3 -row 0 -sticky ew
+
+            grid [listbox $W.listbox1 -yscrollcommand "$W.scrollbar1 set" -exportselection 0 -selectmode extended] -column 1 -row 1 -rowspan 2 -sticky news
+            grid [scrollbar $W.scrollbar1 -command "$W.listbox1 yview"] -column 2 -row 1 -rowspan 2 -sticky ns
+            grid [listbox $W.listbox2 -yscrollcommand "$W.scrollbar2 set" -exportselection 0 -selectmode extended] -column 3 -row 1 -rowspan 2 -sticky news
+            grid [scrollbar $W.scrollbar2 -command "$W.listbox2 yview"] -column 4 -row 1 -rowspan 2 -sticky ns
+
+            grid [button $W.up -text "^" -command "::tepam::disjointlistbox_move $W up"] -column 5 -row 1 -sticky news
+            grid [button $W.down -text "v" -command "::tepam::disjointlistbox_move $W down"] -column 5 -row 2 -sticky news
+
+            grid [button $W.add -text ">" -command "::tepam::disjointlistbox_move $W add"] -column 1 -row 3 -columnspan 2 -sticky news
+            grid [button $W.remove -text "<" -command "::tepam::disjointlistbox_move $W delete"] -column 3 -row 3 -columnspan 2 -sticky news
+
+            foreach {Col Weight} {0 0  1 1   2 0   3 1   4 0   5 0} {
+               grid columnconfigure $W $Col -weight $Weight
+             }
+            grid rowconfigure $W 1 -weight 1
+            grid rowconfigure $W 2 -weight 1
+            if {[info exists Option(-height)]} {
+               $W.listbox1 config -height $Option(-height)
+               $W.listbox2 config -height $Option(-height)
+            }
+         }
+         "set" {
+            # Delete an eventually previous selection (this should not be required by argument_dialogox)
+            $W.listbox2 selection set 0 end
+            disjointlistbox_move $W delete
+            
+            foreach o $Par {
+               set p [lsearch -exact [$W.listbox1 get 0 end] $o]
+               if {$p>=0} { # Delete the selected item from the available items
+                  $W.listbox1 selection set $p
+                  disjointlistbox_move $W add
+               }
+            }
+         }
+         "get" {
+            return [$W.listbox2 get 0 end]
+         }
+         "set_choice" {
+            foreach v $Par {
+               $W.listbox1 insert end $v
+            }
+         }
+      }
+   }
+
+   #### Checkbox ####
+
+   proc ad_form(checkbox) {W Command {Par ""}} {
+      upvar Option Option
+      variable argument_dialogbox
+      switch $Command {
+         "create" {
+            set argument_dialogbox($W,ButtonsW) {}
+         }
+         "set" {
+            # Delete an eventually previous selection
+            foreach ChoiceIndex [array names argument_dialogbox $W,values,*] {
+               set argument_dialogbox($ChoiceIndex) ""
+            }
+            # Select the check buttons that correspond to the provided values 
+            foreach v $Par {
+               foreach BW $argument_dialogbox($W,ButtonsW) {
+                  if {$v==[$BW cget -onvalue]} {
+                     set [$BW cget -variable] $v
+                  }
+               }
+            }
+         }
+         "get" { # Provide the selected items in the order of the provided choice list
+            set Result {}
+            foreach ChoiceIndex [lsort -dictionary [array names argument_dialogbox $W,values,*]] {
+               if {$argument_dialogbox($ChoiceIndex)!=""} {
+                  lappend Result $argument_dialogbox($ChoiceIndex) }
+               }
+            return $Result
+         }
+         "set_choice" {
+            set ChoiceNumber 0
+            set PackSide left
+            if {[info exists Option(-direction)] && $Option(-direction)=="vertical"} {
+               set PackSide top
+            }
+            foreach v $Par {
+               set label $v
+               catch {set label [lindex $Option(-choicelabels) $ChoiceNumber]}
+               pack [checkbutton $W.choice_$ChoiceNumber -text $label -variable ::tepam::argument_dialogbox($W,values,$ChoiceNumber) -onvalue $v -offvalue ""] -side $PackSide -anchor w
+               lappend argument_dialogbox($W,ButtonsW) $W.choice_$ChoiceNumber
+               incr ChoiceNumber
+            }
+         }
+      }
+   }
+
+   #### Radiobox ####
+
+   proc ad_form(radiobox) {W Command {Par ""}} {
+      upvar Option Option
+      variable argument_dialogbox
+      switch $Command {
+         "create" {
+            set argument_dialogbox($W,values) ""
+         }
+         "set" {
+            set argument_dialogbox($W,values) $Par
+         }
+         "get" {
+            return $argument_dialogbox($W,values)
+         }
+         "set_choice" {
+            set argument_dialogbox($W,values) [lindex [lindex $Par 0] 0]
+            set ChoiceNumber 0
+            set PackSide left
+            if {[info exists Option(-direction)] && $Option(-direction)=="vertical"} {
+               set PackSide top
+            }
+            foreach v $Par {
+               set label $v
+               catch {set label [lindex $Option(-choicelabels) $ChoiceNumber]}
+               pack [radiobutton $W.choice_$ChoiceNumber -text $label -variable ::tepam::argument_dialogbox($W,values) -value $v] -side $PackSide -anchor w
+               incr ChoiceNumber
+            }
+         }
+      }
+   }
+
+   #### Checkbutton ####
+
+   proc ad_form(checkbutton) {W Command {Par ""}} {
+      variable argument_dialogbox
+      switch $Command {
+         "create" {
+            pack [checkbutton $W.checkb -variable ::tepam::argument_dialogbox($W,values)] -pady 4 -side left
+            set argument_dialogbox($W,values) 0
+         }
+         "set" {
+            set argument_dialogbox($W,values) $Par
+         }
+         "get" {
+            return $argument_dialogbox($W,values)
+         }
+      }
+   }
+
+   #### Font selector ####
+
+   proc ChooseFont_Update {W} {
+      catch {$W.text config -font [ChooseFont_Get $W]}
+   }
+
+   proc ChooseFont_Get {W} {
+      set Result {}
+      if {![catch {lappend Result [$W.sels.lb_font get [$W.sels.lb_font curselection]] [$W.sels.lb_size get [$W.sels.lb_size curselection]]}]} {
+         foreach Style {bold italic underline overstrike} {
+            if {$::tepam::ChooseFont($W,$Style)} {
+               lappend Result $Style
+            }
+         }
+      }
+      # puts Font:$Result
+      return $Result
+   }
+
+   procedure ChooseFont {
+      -args {
+         {-title -type string -default "Font browser"}
+         {-parent -type string -default "."}
+         {-font_families -type string -default {}}
+         {-font_sizes -type string -default {}}
+         {-default -type string -optional}
+      }
+   } {
+      regexp {^\.*(\..*)$} $parent.font_selection {} W
+      catch {destroy $W}
+      toplevel $W
+      wm withdraw $W
+      wm transient $W $parent
+      wm group $W $parent
+      wm title $W $title
+
+      pack [label $W.into -text "Please choose a font and its size \nand style, then select OK." -justify left] -expand no -fill x
+
+      pack [frame $W.sels] -expand yes -fill both
+      pack [listbox $W.sels.lb_font -yscrollcommand "$W.sels.sb_font set" -exportselection 0 -height 10] -side left -expand yes -fill both
+         bind $W.sels.lb_font <<ListboxSelect>> "::tepam::ChooseFont_Update $W"
+      pack [scrollbar $W.sels.sb_font -command "$W.sels.lb_font yview"] -side left -expand no -fill both
+      pack [listbox $W.sels.lb_size -yscrollcommand "$W.sels.sb_size set" -width 3 -exportselection 0 -height 10] -side left -expand no -fill both
+         bind $W.sels.lb_size <<ListboxSelect>> "::tepam::ChooseFont_Update $W"
+      pack [scrollbar $W.sels.sb_size -command "$W.sels.lb_size yview"] -side left -expand no -fill both
+
+      set ButtonFont [font actual [[button $W.dummy] cget -font]]
+      pack [frame $W.styles] -expand no -fill x
+      pack [checkbutton $W.styles.bold -text B -indicatoron off -font "$ButtonFont -weight bold" -variable ::tepam::ChooseFont($W,bold) -command "::tepam::ChooseFont_Update $W"] -side left -expand yes -fill x
+      pack [checkbutton $W.styles.italic -text I -indicatoron off -font "$ButtonFont -slant italic" -variable ::tepam::ChooseFont($W,italic) -command "::tepam::ChooseFont_Update $W"] -side left -expand yes -fill x
+      pack [checkbutton $W.styles.underline -text U -indicatoron off -font "$ButtonFont -underline 1" -variable ::tepam::ChooseFont($W,underline) -command "::tepam::ChooseFont_Update $W"] -side left -expand yes -fill x
+      pack [checkbutton $W.styles.overstrike -text O -indicatoron off -font "$ButtonFont -overstrike 1" -variable ::tepam::ChooseFont($W,overstrike) -command "::tepam::ChooseFont_Update $W"] -side left -expand yes -fill x
+
+      pack [label $W.text -text "Test text 1234"] -expand no -fill x
+      
+      pack [frame $W.buttons] -expand no -fill x
+      pack [button $W.buttons.ok -text OK -command "set ::tepam::ChooseFont($W,status) 0"] -side left -expand yes -fill x
+      pack [button $W.buttons.cancel -text Cancel -command "set ::tepam::ChooseFont($W,status) 3"] -side left -expand yes -fill x
+
+      # Create the font size and family lists. Use default lists when no family or sizes
+      # are provided.
+      if {$font_families=={}} {
+         set font_families [font families]
+      }
+      foreach v $font_families {
+         $W.sels.lb_font insert end $v
+      }
+
+      if {$font_sizes=={}} {
+         set font_sizes {6 7 8 9 10 12 14 16 18 20 24 28 32 36 40}
+      }
+      foreach v $font_sizes {
+         $W.sels.lb_size insert end $v
+      }
+
+      # Set the default font selection
+      if {![info exists default]} {
+         set default [$W.text cget -font]
+         # puts "default:$default"
+      }
+      
+      set Index [lsearch -exact $font_families [lindex $default 0]]
+      if {$Index<0} {set Index [lsearch -exact $font_families [font actual $default -family]]}
+      if {$Index<0} {set Index 0}
+      # puts "[font actual $default -family] -> $Index"
+      $W.sels.lb_font selection clear 0 end
+      $W.sels.lb_font selection set $Index
+      $W.sels.lb_font yview $Index
+
+      set Index [lsearch -exact $font_sizes [lindex $default 0]]
+      if {$Index<0} {set Index [lsearch -exact $font_sizes [font actual $default -size]]}
+      if {$Index<0} {set Index 0}
+      # puts "[font actual $default -size] -> $Index"
+      $W.sels.lb_size selection clear 0 end
+      $W.sels.lb_size selection set $Index
+      $W.sels.lb_size yview $Index
+
+      foreach Style {bold italic underline overstrike} {
+         set ::tepam::ChooseFont($W,$Style) 0
+      }
+      foreach Style [lrange $default 2 end] {
+         if {[info exists ::tepam::ChooseFont($W,$Style)]} {
+            set ::tepam::ChooseFont($W,$Style) 1
+         }
+      }
+
+      wm protocol $W WM_DELETE_WINDOW "set ::tepam::ChooseFont($W,status) 3"
+      ConfigureWindowsGeometry $W "+[expr [winfo rootx $parent]+[winfo width $parent]+10]+[expr [winfo rooty $parent]+0]"
+      wm deiconify $W
+
+      # Wait until the OK or cancel button is pressed:
+      set ::tepam::ChooseFont($W,status) ""
+      vwait ::tepam::ChooseFont($W,status)
+      
+      set SelectedFont [ChooseFont_Get $W]
+      destroy $W
+      if {$::tepam::ChooseFont($W,status)==0} {return $SelectedFont}
+      return ""
+   }
+
+   # Select_font sets the text and the font of the font entry to a font color: 
+   proc select_font {W NewFont} {
+      variable argument_dialogbox
+      if {$NewFont!=""} {
+         $W.entry delete 0 end
+         $W.entry insert 0 $NewFont
+      }
+      $W.entry config -bg gray80
+      catch {
+         $W.entry config -font [$W.entry get]
+         $W.entry config -bg $argument_dialogbox($W,DefaultEntryColor)
+      }
+   }
+
+   proc ad_form(font) {W Command {Par ""}} {
+      upvar Option Option
+      variable argument_dialogbox
+      if {![info exists Option(-type)]} {
+         set Option(-type) font
+      }
+      set Title ""
+      catch {set Title $Option(-label)}
+      switch $Command {
+         "create" {
+            # The dedicated attributes -font_families and -font_sizes by this entry widget:
+            set FamilyList [font families]
+            catch {set FamilyList $Option(-font_families)}
+            
+            set SizeList {6 7 8 9 10 12 14 16 18 20 24 28 32 36 40}
+            catch {set SizeList $Option(-font_sizes)}
+
+            # Create the entry widget
+            pack [entry $W.entry] -fill x -expand yes -pady 4 -side left
+            pack [button $W.button -text Choose \
+               -command "::tepam::select_font $W \[::tepam::ChooseFont -parent \{$W\} -title \{$Title\} -font_families \{$FamilyList\} -font_sizes \{$SizeList\} -default \[$W.entry get\]\]"] -pady 4 -side left
+            bind $W.entry <Key-Return> "tepam::select_font $W {}"
+            bind $W.entry <Leave> "tepam::select_font $W {}"
+
+            set argument_dialogbox($W,DefaultEntryColor) [$W.entry cget -bg]
+
+            # Use the default font of the entry widget as default font selection if its font 
+            # family and font size is part of the selection lists. Use otherwise the first 
+            # elements of the family list and the closest size for the default font.
+            set DefaultFont [$W.entry cget -font]
+
+            set DefaultFamily [font actual $DefaultFont -family]
+            if {[lsearch -exact $FamilyList $DefaultFamily]<0} {
+               set DefaultFamily [lindex $FamilyList 0]
+            }
+
+            set DefaultSize [font actual $DefaultFont -size]
+            if {[lsearch -exact $SizeList $DefaultSize]<0} {
+               set SizeList [lsort -real [concat $SizeList $DefaultSize]]
+               set Pos [lsearch -exact $SizeList $DefaultSize]
+               if {$Pos==0} {
+                  set DefaultSize [lindex $SizeList 1]
+               } elseif {$Pos==[llength $SizeList]-1} {
+                  set DefaultSize [lindex $SizeList end-1]
+               } elseif {[lindex $SizeList $Pos]-[lindex $SizeList [expr $Pos-1]] <
+                         [lindex $SizeList [expr $Pos+1]]-[lindex $SizeList $Pos] } {
+                  set DefaultSize [lindex $SizeList [expr $Pos-1]]
+               } else {
+                  set DefaultSize [lindex $SizeList [expr $Pos+1]]
+               }
+            }
+
+            select_font $W [list $DefaultFamily $DefaultSize]
+         }
+         "set" {
+            select_font $W $Par
+         }
+         "get" {
+            return [$W.entry get]
+         }
+      }
+   }
+
+}; # End namespace tepam
+
+# Specify the TEPAM version that is provided by this file:
+package provide tepam 0.5.2
+
+##########################################################################
+# Id: tepam.tcl
+# Modifications:
+#
+# TEPAM version 0.5.1 - 2016/03/05 droll
+# * Help generation
+#   - Correction of bug a0e091b25d (Misformatted description in auto-generated 
+#     help text)
+#
+# TEPAM version 0.5 - 2013/10/14 droll
+# * procedure command
+#   - New procedure attributes: -validatecommand_error_text, -validatecommand
+#   - Updated argument attribute: -validatecommand (the command is now 
+#     executed in the context of the procedure body which allows accessing 
+#     argument variables)
+#   - New argument attribute: -validatecommand_error_text
+#   - Minor bug fix: The TEPAM internal procedure list was incorrect if a 
+#     procedure was defined multiple times.
+#   - Procedure help generation: Indicate if an argument can be used multiple 
+#     times
+# * argument_dialogbox
+#   - New global attributes: -validatecommand_error_text, -validatecommand
+#   - New argument attributes: -validatecommand_error_text, -validatecommand,
+#                              -validatecommand_error_text2, -validatecommand2
+#
+# TEPAM version 0.4.1 - 2013/03/25 droll
+# * Correction of bug 3608952: Help text is incorrectly generated if procedures 
+#   are part of the non-default namespaces
+# * Correction of bug 3608951: Help text shows incorrect argument order if 
+#   procedure is defined in the "unnamed arguments first, named arguments later" 
+#    calling style.
+#
+# TEPAM version 0.4.0 - 2012/05/07 20:24:58  droll
+# * Add the new text procedure argument type and the text multi line data
+#   entry widget.
+#
+# TEPAM version 0.3.0 - 2012/03/26 20:44:10  droll
+# * Add support to log the called procedures inside an array variable.
+# * Simplify the value validation procedures using the 'string is'
+#   procedure's -strict option.
+# * Keep the original value list in the right list of the 'disjointlistbox'.
+# * Add the procedure 'ConfigureWindowsGeometry' to handle window sizes
+#   and positions.
+#
+# TEPAM version 0.2.0 - 2011/01/21 15:56:20  droll
+# * Add the -widget option to the procedure arguments.
+# * Add the -yscroll option to the argument dialog box.
+# * Bug fixes for the following argument dialog box widgets:
+#   - disjointlistbox: Keep always the same element order
+#   - checkbox, radiobox: Handle correctly default values
+#
+# TEPAM version 0.1.0 - 2010/02/11 21:50:55  droll
+# * First TEPAM revision
+##########################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tepam/tepam_doc_gen.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tepam/tepam_doc_gen.tcl
new file mode 100644
index 00000000..d1a62e12
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tepam/tepam_doc_gen.tcl
@@ -0,0 +1,747 @@
+##########################################################################
+# TEPAM - Tcl's Enhanced Procedure and Argument Manager
+##########################################################################
+# tepam_doc.tcl - TEPAM doc generation package
+# 
+# Copyright (C) 2013 Andreas Drollinger
+# 
+# Id: tepam_doc.tcl
+##########################################################################
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+##########################################################################
+
+package require Tcl 8.3
+package require tepam 0.5
+
+namespace eval tepam::doc_gen {
+   # Exports the major commands from this package:
+   namespace export doc_gen
+
+   # Format validation command (checks if a format is defined)
+   proc ::tepam::Validate(tepam_doc_format) {v} {expr {[info proc ::tepam::doc_gen::gen($v,Begin)]!=""}}
+   
+   # get_full_proc_name returns the full qualified procedure name. It takes also into acocunt
+   # sub-procedure names: 'display message' -> '::display message'
+   #
+   proc get_full_proc_name {name} {
+      return [concat [namespace origin [lindex $name 0]] [lrange $name 1 end]]
+   }
+
+
+   ##########################################################################
+   #     generate: Generates the documentation for a procedure in a certain format
+   ##########################################################################
+   
+   # The command 'generate' is the main procedure of the document generation framework. It
+   # calls a set of sub procedures to generate the different document sections. The exact
+   # content of each document segment is specified for each supported document format in 
+   # a later part of this file.
+   #
+   tepam::procedure generate {
+      -named_arguments_first 1
+      -short_description "Get procedure documentation"
+      -description
+         "Generates the documentation for a given procedure in one of the supported\
+         formats (TXT, HTML, POD (Perl Doc), DT (TclLib DocTool), or in an application specific\
+         format).
+         If a file is provided a full document file is generated that includes a proper file\
+         header and file footer, and the file name is returned. Header and footer are otherwise\
+         not generated and the documentation text is returned by doc_gen.
+         The documentation is by default generated in Tcl style\
+         (e.g. command <arg1> <arg2> ...). C-style documentation can be generated by setting\
+         the argument 'style' to 'C' (e.g. command(<arg1>,<arg2>))."
+      -example "generate -format HTML -dest_file my_func_help.html ::my_func"
+      -args {
+         {-format    -type tepam_doc_format -default TXT
+                     -description "Documentation format"}
+         {-style     -type string -default Tcl -choices {Tcl C}
+                     -choicelabels {"Tcl style" "C style"}
+                     -description "Procedure calling style used in the generated documentation"}
+         {-header_footer -type none
+                     -description "If set the header and footer are also generated. This flag is set by default if a file is generated."}
+         {-dest_file -type file -optional
+                     -description "Destination file name"}
+         {name       -type string -validatecommand {expr ![catch {get_full_proc_name "%P"}]}
+                     -validatecommand_error_text "Unknown procedure provided (argument 'name')"
+                     -description "Procedure name for which the documentation has to be generated"}
+      }
+   } {
+      # Create the full qualified procedure name (procedure name including namespace).
+      # Check if the procedure name contains already the name space identification:
+      set ProcName [get_full_proc_name $name]; # Variable name required by 'tepam::PureProcName'
+
+      # Set the doc style to 'Tcl' if the short description starts with 'Property:'
+      if {[info exists ::tepam::ProcDef($ProcName,-short_description)] && 
+          [string first "Property:" $::tepam::ProcDef($ProcName,-short_description)]==0} {
+         set style "Tcl"
+      }
+
+      # Define a function indicator for 'C' style documentation
+      set FuncIndicator [expr {$style=="Tcl" ? "" : "()"}]
+      
+      # Set the header/footer generation flag if a file is generated
+      if {[info exists dest_file]} {
+         set header_footer 1
+      }
+      
+      # Create the list of the main and sub-procedure names. Don't consider
+      # the main procedure that is only used to access the sub procedures
+      foreach pName [lsort [concat [list $ProcName] [info procs "$ProcName *"]]] {
+         if {[info exists ::tepam::ProcDef($pName,VarList)]} { # Check that the procedure has been declared as TEPAM procedure
+            lappend ProcNames $pName
+         }
+      }
+
+      # Initiate the documentation string variable
+      set Doc ""
+
+      # Genrate the header if required
+      if {$header_footer} {
+         append Doc [gen($format,Header) [::tepam::PureProcName]]
+      }
+      
+      # Generate the document prolog (preamble)
+      append Doc [gen($format,Begin)]
+
+      ### Name section ###
+      # Add only the short description of the main procedure (in case sub procedures exist)
+      append Doc [gen($format,SectionTitle) "Name"]
+      if {[info exists ::tepam::ProcDef($ProcName,-short_description)]} { # Add the short description if existing
+         append Doc [gen($format,Name) "[::tepam::PureProcName]$FuncIndicator - $::tepam::ProcDef($ProcName,-short_description)"]
+      } else {
+         append Doc [gen($format,Name) "[::tepam::PureProcName]$FuncIndicator"]
+      }
+      
+      ### Synopsis section ###
+      append Doc [gen($format,SectionTitle) "Synopsis"]
+      set NbrDescriptions 0
+      set NbrExamples 0
+      # Add the synopsis for each main and sub procedures and register if they have a
+      # description or an example
+      foreach ProcName $ProcNames {
+         incr NbrDescriptions [info exists ::tepam::ProcDef($ProcName,-description)]
+         incr NbrExamples [info exists ::tepam::ProcDef($ProcName,-example)]
+         append Doc [doc_gen_Synopsis $ProcName $format $style]
+      }
+   
+      ### Description ###
+      # Generate a description title if necessary (if a procedure has a description, or if
+      # there is a main and sub procedures that are matching
+      if {$NbrDescriptions>0 || [llength $ProcNames]>1} {
+         append Doc [gen($format,SectionTitle) "Description"]
+      }
+   
+      # Loop over all main and sub procedures
+      foreach ProcName $ProcNames {
+         # Add the sub-section title (= procedure name) if multiple procedures are matching
+         if {[llength $ProcNames]>1} {
+            append Doc [gen($format,SubSectionTitle) $ProcName]
+         }
+         
+         # Add (again) the Synopsis line. Some documentation format require this 
+         # synopsis line inside the description section, because the Synopsis is 
+         # automatically derived (eg Tcl DocTools)
+         append Doc [doc_gen_Synopsis $ProcName $format $style 1]
+         
+         # Add the description
+         if {[info exists ::tepam::ProcDef($ProcName,-description)]} {
+            append Doc [doc_gen_Description $ProcName $format $style]
+         }
+   
+         ### Arguments ###
+         # Add the argument section only if only one procedure is matching. The
+         # arguments are otherwise listed in the description section.
+         if {$::tepam::ProcDef($ProcName,VarList)!={}} {
+            if {[llength $ProcNames]==1} {
+               append Doc [gen($format,SectionTitle) "Arguments"]
+            }
+            append Doc [doc_gen_Arguments $ProcName $format $style]
+         }
+      }
+      
+      ### Example ###
+      # Generate a example section if an example exists
+      if {$NbrExamples>0} {
+         append Doc [gen($format,SectionTitle) "Example"]
+      }
+      # Add the examples of each main and sub procedure
+      foreach ProcName $ProcNames {
+         if {[info exists ::tepam::ProcDef($ProcName,-example)]} {
+            # Add the synopsis of the procedure that has an example, in case multiple 
+            # procedures are matching
+            if {[llength $ProcNames]>1} {
+               # Add the sub-section title if multiple procedures are matching
+               append Doc [gen($format,SubSectionTitle) $ProcName]
+            }
+            # Add the example
+            append Doc [doc_gen_Example $ProcName $format $style]
+         }
+      }
+      
+      # Generate the document epilog
+      append Doc [gen($format,End)]
+      
+      # Genrate the footer if required
+      if {$header_footer} {
+         append Doc [gen($format,Footer) ""]
+      }
+
+      # Save the documentation in a file and return the file name if 'dest_file' 
+      # is defined. Return the documentation data otherwise.
+      if {[info exists dest_file]} {
+         set f [open $dest_file w]
+         puts $f $Doc
+         close $f
+         return $dest_file
+      } else {
+         return $Doc
+      }
+   }
+   
+   # GetCleanText removes white spaces and "'" on the line begins.
+   #
+   proc GetCleanText {Text} {
+      regsub -all {\n[\s\t]+'*} $Text "\n" Text
+      return $Text
+   }
+   
+   # doc_gen_Synopsis generates a formatted synopsis line. This string starts with 
+   # the procedure name, followed by the arguments. The arguments are between 
+   # parenthesis if not Tcl style is selected.
+   #
+   proc doc_gen_Synopsis {ProcName format style {DescriptionSynopsis 0}} {
+      # Start the synopsis with the procedure name, followed with '(' if not Tcl style is selected
+      set Synopsis [::tepam::PureProcName]
+      append Synopsis [expr {$style=="Tcl" ? " " : "("}]
+
+      # Add all arguments, separate them depending the style
+      set Sep ""
+      foreach Var $::tepam::ProcDef($ProcName,VarList) {
+         append Synopsis $Sep
+         append Synopsis [gen($format,ArgumentString) \
+                             $Var $::tepam::ProcDef($ProcName,Arg,$Var,-optional) \
+                             $::tepam::ProcDef($ProcName,Arg,$Var,IsNamed) \
+                             $::tepam::ProcDef($ProcName,Arg,$Var,-type)]
+         set Sep [expr {$style=="Tcl" ? " " : ", "}]
+      }
+      # Close the parenthesis if non Tcl style is selected
+      append Synopsis [expr {$style=="Tcl" ? "" : ")"}]
+
+      # Returned the formatted synopsis string
+      if {$DescriptionSynopsis} {
+         return [gen($format,DescriptionSynopsis) $Synopsis]
+      } else {
+         return [gen($format,Synopsis) $Synopsis]
+      }
+   }
+   
+   # doc_gen_Description generates a formatted documentation section. It recognizes
+   # paragraphs and unordered lists in the description text and formats them adequately.
+   #
+   proc doc_gen_Description {ProcName format style} {
+      # Get the cleaned-up description string
+      set Description [GetCleanText $::tepam::ProcDef($ProcName,-description)]
+      
+      # Loop over every paragraph (parts separated with a newline)
+      set ParStyle ""; # Stores the current paragraph style
+      set formattedDescription ""; # Stores the formatted description section
+      foreach Paragraph [split $Description \n] {
+         # Remove eventual leading and tailing white spaces
+         set Paragraph [string trim $Paragraph]
+         
+         # Handle unordered list items (line that starts with '*'). 
+         if {[string index $Paragraph 0]=="*"} {
+            # Add the list begin code if this is the first list item
+            if {$ParStyle!="list"} {
+               append formattedDescription [gen($format,DescriptionListBegin)]
+            }
+            # Add the list item (remove the leading '*')
+            append formattedDescription [gen($format,DescriptionListItem) "[string trim [string range $Paragraph 1 end]]"]
+            set ParStyle "list"
+         
+         # Handle non list paragraphs
+         } else {
+            # Close an eventually opened unordered list
+            if {$ParStyle=="list"} {
+               append formattedDescription [gen($format,DescriptionListEnd)]
+            }
+            # Add the paragraph
+            append formattedDescription [gen($format,Description) $Paragraph]
+            set ParStyle "par"
+         }
+      }
+      
+      # Close an eventually opened unordered list
+      if {$ParStyle=="list"} {
+         append formattedDescription [gen($format,DescriptionListEnd)]
+      }
+      
+      # Return the formatted description
+      return $formattedDescription
+   }
+
+   # doc_gen_Arguments generates the formatted argument section which includes a list of arguments
+   # together with their descriptions and attributes
+   #
+   proc doc_gen_Arguments {ProcName format style} {
+      # Start the section with the argument list prolog
+      set formattedArguments [gen($format,ArgumentListBegin)]
+      
+      # Loop through all arguments
+      foreach Var $::tepam::ProcDef($ProcName,VarList) {
+         # Add the argument line
+         append formattedArguments [gen($format,ArgumentListItem) \
+                                        $Var $::tepam::ProcDef($ProcName,Arg,$Var,-optional) \
+                                        $::tepam::ProcDef($ProcName,Arg,$Var,IsNamed) \
+                                        $::tepam::ProcDef($ProcName,Arg,$Var,-type)]
+
+         # Start the argument detail section, and add an eventual existing 
+         # argument description
+         append formattedArguments [gen($format,ArgumentDetailBegin)]
+         if {[info exists ::tepam::ProcDef($ProcName,Arg,$Var,-description)] && $::tepam::ProcDef($ProcName,Arg,$Var,-description)!=""} {
+            append formattedArguments [gen($format,ArgumentDescription) $::tepam::ProcDef($ProcName,Arg,$Var,-description)]
+         }
+      
+         # Add the argument type if it is known and if it is not a flag (type=none)
+         if {[lsearch -exact {"" "none"} $::tepam::ProcDef($ProcName,Arg,$Var,-type)]<0} {
+            append formattedArguments [gen($format,ArgumentAttribute) "Type: $::tepam::ProcDef($ProcName,Arg,$Var,-type)"]
+         }
+         
+         # Add the default value if existing. Put it in double quotes ("") if the 
+         # type is unknown or a string, or if the default value is an empty string
+         if {[info exists ::tepam::ProcDef($ProcName,Arg,$Var,-default)]} {
+            if {[lsearch -exact {"" "string"} $::tepam::ProcDef($ProcName,Arg,$Var,-type)]>=0 || $::tepam::ProcDef($ProcName,Arg,$Var,-default)==""} {
+               append formattedArguments [gen($format,ArgumentAttribute) "Default: \"$::tepam::ProcDef($ProcName,Arg,$Var,-default)\""]
+            } else {
+               append formattedArguments [gen($format,ArgumentAttribute) "Default: $::tepam::ProcDef($ProcName,Arg,$Var,-default)"]
+            }
+         }
+         
+         # Add the remaining attributes if they exist
+         if {$::tepam::ProcDef($ProcName,Arg,$Var,-multiple)} {
+            append formattedArguments [gen($format,ArgumentAttribute) "Multiple: yes"]
+         }
+         if {[info exists ::tepam::ProcDef($ProcName,Arg,$Var,-range)]} {
+            append formattedArguments [gen($format,ArgumentAttribute) "Range: [lindex $::tepam::ProcDef($ProcName,Arg,$Var,-range) 0]..[lindex $::tepam::ProcDef($ProcName,Arg,$Var,-range) 1]"]
+         }
+         if {[info exists ::tepam::ProcDef($ProcName,Arg,$Var,-choices)]} {
+            append formattedArguments [gen($format,ArgumentAttribute) "Choices: [::tepam::GetChoiceHelpText $ProcName $Var]"]
+         }
+         append formattedArguments [gen($format,OptionDetailEnd)]
+      }
+      
+      # Add the argument section's epilog, and return the optained formatted section string
+      append formattedArguments [gen($format,OptionEnd)]
+      return $formattedArguments
+   }
+
+   # doc_gen_Example generates a formatted example section. It handles every
+   # example line individually and formats it either as a command line, or as
+   # a result line.
+   #
+   proc doc_gen_Example {ProcName format style} {
+      # Cleanup the example paragraph
+      set Example [GetCleanText [string trim $::tepam::ProcDef($ProcName,-example)]]
+      
+      # Generate the example section prolog
+      set formattedExample [gen($format,ExampleBegin)]
+      
+      # Loop through all example lines
+      foreach line [split $Example \n] {
+         # Format the line either as an example command, or as a result
+         if {[string range $line 0 1]=="->"} {
+            append formattedExample [gen($format,ExampleResultLine) $line]
+         } else {
+            append formattedExample [gen($format,ExampleCommandLine) $line]
+         }
+      }
+      
+      # Add the example section's epilog, and return the formatted example section
+      append formattedExample [gen($format,ExampleEnd)]
+      return $formattedExample
+   }
+   
+   ##########################################################################
+   #     patch: Patches an existing documentation by inserting procedure documentations
+   ##########################################################################
+   
+   # Patches an existing master document by inserting procedure documentations. The
+   # command calls 'generate' to get the documentation of for the different procedures.
+   #
+   tepam::procedure patch {
+      -named_arguments_first 1
+      -short_description "Patches an existing master document by inserting procedure documentations"
+      -description
+         "Patch inserts procedure documentations into an existing master document at the\
+         locations indicated by insertion placeholders that are matching the pattern of\
+         'search_pattern'.
+         The existing master document is either provided as string argument (src_string)\
+         or as a file (src_file). The final document is returned by patch if no\
+         destination file is defined (via 'dest_file'). Otherwise, the document is stored\
+         in a file, and the number of insertion placeholders that could be handled\
+         successfully is returned.
+         Any insertion placeholders of the master document are handled by default. By\
+         defining the argument 'name' the documentation insertion will be restricted\
+         to a particular procedure.
+         Patch handles the documentation in one of the supported\
+         formats (TXT, HTML, POD (Perl Doc), DT (TclLib DocTool), or in an application\
+         specific format). The documentation is by default generated in Tcl style\
+         (e.g. command <arg1> <arg2> ...). C-style documentation can be generated by\
+         setting the argument 'style' to 'C' (e.g. command(<arg1>,<arg2>))."
+      -example "patch -format HTML -src_file my_func_help.template -dest_file my_func_help.html"
+      -args {
+         {-format    -type tepam_doc_format -default TXT
+                     -description "Documentation format"}
+         {-style     -type string -default Tcl -choices {Tcl C}
+                     -choicelabels {"Tcl style" "C style"}
+                     -description "Procedure calling style used in the generated documentation"}
+         {-search_pattern -type string -default {\{!(.*?)!\}}
+                     -description "Regular expression search pattern"}
+         {-src_string -type string -optional
+                     -description "Source string"}
+         {-src_file -type existingfile -optional
+                     -description "Source file name"}
+         {-dest_file -type file -optional
+                     -description "Destination file name"}
+         {name       -type string -optional -validatecommand {expr ![catch {get_full_proc_name "%P"}]}
+                     -validatecommand_error_text "Unknown procedure provided (argument 'name')"
+                     -description "Procedure name to which the document generation is restricted"}
+      }
+      -validatecommand {expr {[info exists src_file]!=[info exists src_string]}}
+      -validatecommand_error_text "Either src_string or src_file need to be defined!"
+   } {
+      # In case a procedure name is provided, make sure it is fully qualified
+      if {[info exists name]} {
+         set name [get_full_proc_name $name]
+      }
+
+      # Load the master document data
+      if {[info exists src_file]} {
+         set f [open $src_file r]
+         set Doc [read $f 0x10000000]
+         close $f
+      } else {
+         set Doc $src_string
+      }
+
+      # Get all placeholder locations
+      set AllMatchPos [regexp -all -indices -inline $search_pattern $Doc]
+      
+      # Handle all placeholders, starting at the document end. Don't rely on
+      # 'lreverse' (only available in Tcl8.5)
+      set NbrInsertion 0
+      for {set m [expr [llength $AllMatchPos]-1]} {$m>=0} {incr m -2} {
+         set MatchPos [lindex $AllMatchPos $m-1]
+         set ProcPos [lindex $AllMatchPos $m-0]
+         set ProcName [string range $Doc [lindex $ProcPos 0] [lindex $ProcPos 1]]
+         
+         # Catch any errors: Documentations that cannot be generated for certain procedures
+         # are simply skipped
+         catch {
+            # Make sure a fully qualified procedure name is used
+            set ProcName [get_full_proc_name $ProcName]
+            
+            # Skip the procedure if it is not matching with the defined procedure name
+            if {[info exists name] && $name!=$ProcName} continue
+         
+            # Replace the placeholder with the procedure documentation
+            set ProcHelp [tepam::doc_gen::generate -format $format -style $style $ProcName]
+            set Doc [string replace $Doc [lindex $MatchPos 0] [lindex $MatchPos 1] $ProcHelp]
+            incr NbrInsertion
+         }
+      }
+
+      # Save the patched master document in a file if 'dest_file' is defined. Return 
+      # the document data otherwise.
+      if {[info exists dest_file]} {
+         set f [open $dest_file w]
+         puts $f $Doc
+         close $f
+         return $NbrInsertion
+      } else {
+         return $Doc
+      }
+   }
+
+   
+   ##########################################################################
+   #     Documentation style definitions
+   ##########################################################################
+
+   # Various document generation options will be stored in the array variable 'Option'.
+   array set Option {}
+   
+   ###### Text ######
+   
+   # Text document generation options
+   set Option(TXT,MaxLineLength) 80; # Specifies the word wrap limit
+
+   # TxtFormat formats text in the following way: Tabulator characters are 
+   # replaced by 3 spaces. Lines are reformatted to respect the maximum 
+   # allowed line length. In case a line is wrapped, the leading spaces of the 
+   # first line are added to the begin of the following lines. Multiple lines 
+   # can be provided as text piece and these multiple lines are handled 
+   # independently each to another.
+
+   proc TxtFormat {Text} {
+      variable Option
+      set FormatedText ""
+      
+      # Replace tabs through 3 spaces:
+      regsub -all {\t} $Text "   " Text
+      
+      # Extract the initial spaces of the first line:
+      regexp {^(\s*)} $Text {} SpaceStart
+      
+      # Loop through each of the provided help text line:
+      foreach line [split $Text "\n"] {
+         
+         # Eliminate leading spaces of the line:
+         regexp {^\s+'*(.*)$} $line {} line
+         
+         # Cut the line into segments that doesn't exceed the maximum allowed help line length. 
+         # Add in front of each new line the initial spaces of the first line:
+         while {$line!=""} {
+            # Align the leading line spaces to the first line:
+            set line ${SpaceStart}${line}
+            
+            #### Next line cutoff position evaluation ####
+
+            # Select the next line cut position. The default position is set to the line end:
+            set LastPos [string length $line]
+            # Search for the last space inside the line section that is inside the specified 
+            # maximum line length:
+            if {$LastPos>$Option(TXT,MaxLineLength)} {
+               set LastPos [string last " " $line $Option(TXT,MaxLineLength)]
+            }
+            # If the evaluated line break position is inside the range of the initial line spaces,
+            # something goes wrong and the line should be broken at another adequate character:
+            if {$LastPos<=[string length $SpaceStart]-1} {
+               # Search for other good line break characters (:
+               set LastPos [lindex [lindex \
+                  [regexp -inline -indices {[^,:\.?\)]+$} \
+                  {ProcDef(::ImportTestPointAssignmentsGeneric,Arg_SectionComment,ColumnSeparation}] 0] 0]
+               # No line break position could be found:
+               if {$LastPos=={}} {set LinePos 0}
+            }
+            # Break the line simply at the maximum allowed length in case no break position could 
+            # be found:
+            if {$LastPos<=[string length $SpaceStart]-1} {set LastPos $Option(TXT,MaxLineLength)}
+
+            # Add the line segment to the help text:
+            append FormatedText [string range $line 0 [expr $LastPos-1]]\n
+            
+            # Eliminate the segment from the actual line:
+            set line [string range $line [expr $LastPos+1] end]
+         }
+      }
+      return $FormatedText
+   }
+
+   proc gen(TXT,Header) {Text}                 {return [TxtFormat ""]}
+   proc gen(TXT,Begin) {}                      {return [TxtFormat ""]}
+   proc gen(TXT,End) {}                        {return [TxtFormat ""]}
+   proc gen(TXT,SectionTitle) {Text}           {return [TxtFormat "  [string toupper $Text]\n"]}
+   proc gen(TXT,SubSectionTitle) {Text}        {return [TxtFormat "    $Text\n"]}
+   proc gen(TXT,Name) {Text}                   {return [TxtFormat "      $Text\n"]}
+   proc gen(TXT,Synopsis) {Text}               {return [TxtFormat "      $Text\n"]}
+   proc gen(TXT,Description) {Text}            {return [TxtFormat "      $Text\n"]}
+   proc gen(TXT,DescriptionSynopsis) {Text}    {return ""}
+   proc gen(TXT,DescriptionListBegin) {}       {return [TxtFormat ""]}
+   proc gen(TXT,DescriptionListItem) {Text}    {return [TxtFormat "      * $Text\n"]}
+   proc gen(TXT,DescriptionListEnd)   {}       {return [TxtFormat ""]}
+   proc gen(TXT,ArgumentListBegin) {}          {return [TxtFormat ""]}
+   proc gen(TXT,ArgumentString) {Name IsOptional IsNamed Type} {
+      if {$IsNamed} {set ArgStr "-$Name"}
+      if {$Type!="none"} {append ArgStr " <$Name>"}
+      set ArgStr [string trim $ArgStr]
+      if {$IsOptional} {set ArgStr "\[$ArgStr\]"}
+      return $ArgStr
+   }
+   proc gen(TXT,ArgumentListItem) {Name IsOptional IsNamed Type} {
+      return "      [gen(TXT,ArgumentString) $Name $IsOptional $IsNamed $Type]\n"
+   }
+   proc gen(TXT,ArgumentDetailBegin)  {}       {return [TxtFormat ""]}
+   proc gen(TXT,ArgumentDescription) {Text}    {return [TxtFormat "        $Text\n"]}
+   proc gen(TXT,ArgumentAttribute) {Text}      {return [TxtFormat "        $Text\n"]}
+   proc gen(TXT,OptionDetailEnd)  {}           {return [TxtFormat ""]}
+   proc gen(TXT,OptionEnd)   {}                {return [TxtFormat ""]}
+   proc gen(TXT,ExampleBegin) {}               {return [TxtFormat ""]}
+   proc gen(TXT,ExampleCommandLine) {Text}     {return [TxtFormat "      $Text"]}
+   proc gen(TXT,ExampleResultLine) {Text}      {return [TxtFormat "      $Text"]}
+   proc gen(TXT,ExampleEnd) {}                 {return [TxtFormat ""]}
+   proc gen(TXT,Footer) {Text}                 {return [TxtFormat ""]}
+
+   ###### HTML ######
+
+   # HTML document generation options
+   set Option(HTML,CssFile) "tepam_doc_stylesheet.css"; # Specifies the CSS stylesheet file
+
+   proc Htmlformat {Text} {
+      regsub -all {<} $Text {\&lt;} Text
+      regsub -all {>} $Text {\&gt;} Text
+      return $Text
+   }
+
+   proc gen(HTML,Header) {Text}                {set    s "<html>\n"
+                                                append s "  <head>\n"
+                                                append s "    <title>[Htmlformat $Text]</title>\n"
+                                                append s "    <link rel=\"stylesheet\" href=\"$::tepam::doc_gen::Option(HTML,CssFile)\">\n"
+                                                append s "  </head>\n"
+                                                append s "  <body>\n"
+                                                append s "      <h1 class=\"tepam_page_title\">[Htmlformat $Text]</h1>\n"
+                                                return $s }
+   proc gen(HTML,Begin) {}                     {return "<div class=\"tepam_command_help\">\n"}
+   proc gen(HTML,End) {}                       {return "</div><p></p>\n"}
+   proc gen(HTML,SectionTitle) {Text}          {return "    <p class=\"tepam_section_title\">[Htmlformat $Text]</p>\n"}
+   proc gen(HTML,SubSectionTitle) {Text}       {return "    <p class=\"tepam_sub_section_title\">[Htmlformat $Text]</p>\n"}
+   proc gen(HTML,Name) {Text}                  {return "      <p class=\"tepam_name\">[Htmlformat $Text]</p>\n"}
+   proc gen(HTML,Synopsis) {Text}              {return "      <p class=\"tepam_synopsis\">$Text</p>\n"}
+   proc gen(HTML,Description) {Text}           {return "      <p class=\"tepam_description\">[Htmlformat $Text]</p>\n"}
+   proc gen(HTML,DescriptionSynopsis) {Text}   {return ""}
+   proc gen(HTML,DescriptionListBegin) {}      {return "      <ul class=\"tepam_description_list\">\n"}
+   proc gen(HTML,DescriptionListItem) {Text}   {return "        <li>[Htmlformat $Text]</li>\n"}
+   proc gen(HTML,DescriptionListEnd)   {}      {return "      </ul>\n"}
+   proc gen(HTML,ArgumentListBegin) {}         {return "      <dl>\n"}
+   proc gen(HTML,ArgumentString) {Name IsOptional IsNamed Type} {
+      if {$IsNamed} {set ArgStr "-$Name"}
+      if {$Type!="none"} {append ArgStr " <$Name>"}
+      set ArgStr [string trim $ArgStr]
+      if {$IsOptional} {set ArgStr "\[$ArgStr\]"}
+      return [Htmlformat $ArgStr]
+   }
+   proc gen(HTML,ArgumentListItem) {Name IsOptional IsNamed Type} {
+      return "        <dt class=\"tepam_argument\">[gen(HTML,ArgumentString) $Name $IsOptional $IsNamed $Type]</dt>\n"
+   }
+   proc gen(HTML,ArgumentDetailBegin)  {}      {return "          <dd>\n"}
+   proc gen(HTML,ArgumentDescription) {Text}   {return "            <p class=\"tepam_argument_description\">[Htmlformat $Text]</p>\n"}
+   proc gen(HTML,ArgumentAttribute) {Text}     {return "              <p class=\"tepam_argument_attribute\">[Htmlformat $Text]</p>\n"}
+   proc gen(HTML,OptionDetailEnd)  {}          {return "          </dd>\n"}
+   proc gen(HTML,OptionEnd)   {}               {return "      </dl>\n"}
+   proc gen(HTML,ExampleBegin) {}              {return "    <pre class=\"tepam_example\">"}
+   proc gen(HTML,ExampleCommandLine) {Text}    {return "<strong>[Htmlformat $Text]</strong>\n"}
+   proc gen(HTML,ExampleResultLine) {Text}     {return "<em>[Htmlformat $Text]</em>\n"}
+   proc gen(HTML,ExampleEnd) {}                {return "</pre>\n"}
+   proc gen(HTML,Footer) {Text}                {return "  </body>\n<html>"}
+
+   ###### POD ######
+   
+   proc Podformat {Text} {
+      regsub -all {<} $Text {E<lt>} Text
+      regsub -all {([^E][^<][^l][^t])>} $Text {\1E<gt>} Text
+      regsub -all {\|} $Text {E<verbar>} Text
+      regsub -all {/} $Text {E<sol>} Text
+      return $Text
+   }
+
+   proc gen(POD,Header) {Text}                 {return [Podformat ""]}
+   proc gen(POD,Begin) {}                      {return ""}
+   proc gen(POD,End) {}                        {return ""}
+   proc gen(POD,SectionTitle) {Text}           {return "=head1 [Podformat [string toupper $Text]]\n\n"}
+   proc gen(POD,SubSectionTitle) {Text}        {return "=head2 [Podformat $Text]\n\n"}
+   proc gen(POD,Name) {Text}                   {return "B<[Podformat $Text]>\n\n"}
+   proc gen(POD,Synopsis) {Text}               {return "$Text\n\n"}
+   proc gen(POD,Description) {Text}            {return "[Podformat $Text]\n\n"}
+   proc gen(POD,DescriptionSynopsis) {Text}    {return ""}
+   proc gen(POD,DescriptionListBegin) {}       {return "=over 4\n\n"}
+   proc gen(POD,DescriptionListItem) {Text}    {return "=item * [Podformat $Text]\n\n"}
+   proc gen(POD,DescriptionListEnd)   {}       {return "=back\n\n"}
+   proc gen(POD,ArgumentListBegin) {}          {return "=over 4\n\n"}
+   proc gen(POD,ArgumentString) {Name IsOptional IsNamed Type} {
+      if {$IsNamed} {set ArgStr "-$Name"}
+      if {$Type!="none"} {append ArgStr " <$Name>"}
+      set ArgStr [string trim $ArgStr]
+      if {$IsOptional} {set ArgStr "\[$ArgStr\]"}
+      return [Podformat $ArgStr]
+   }
+   proc gen(POD,ArgumentListItem) {Name IsOptional IsNamed Type} {
+      return "=item [gen(POD,ArgumentString) $Name $IsOptional $IsNamed $Type]\n\n"
+   }
+   proc gen(POD,ArgumentDetailBegin)  {}       {return ""}
+   proc gen(POD,ArgumentDescription) {Text}    {return "[Podformat $Text]\n\n"}
+   proc gen(POD,ArgumentAttribute) {Text}      {return "[Podformat $Text]\n\n"}
+   proc gen(POD,OptionDetailEnd)  {}           {return ""}
+   proc gen(POD,OptionEnd)   {}                {return "=back\n\n"}
+   proc gen(POD,ExampleBegin) {}               {return ""}
+   proc gen(POD,ExampleCommandLine) {Text}     {return "C<B<[Podformat $Text]>>\n\n"}
+   proc gen(POD,ExampleResultLine) {Text}      {return "C<I<[Podformat $Text]>>\n\n"}
+   proc gen(POD,ExampleEnd) {}                 {return ""}
+   proc gen(POD,Footer) {Text}                 {return ""}
+
+   ###### Tcllib doctools ######
+
+   proc Dtformat {Text} {
+      regsub -all {([\[\]])} $Text {\\\1} Text
+      return $Text
+   }
+
+   proc gen(DT,Header) {Text} {
+      upvar ProcName ProcName
+      set    s "\[manpage_begin \"$Text\" n 1.0.3\]\n"
+      if {[info exists ::tepam::ProcDef($ProcName,-short_description)]} {
+         append s "\[moddesc \{[Dtformat $::tepam::ProcDef($ProcName,-short_description)]\}\]\n"
+         append s "\[titledesc \{[Dtformat $::tepam::ProcDef($ProcName,-short_description)]\}\]\n"
+      }
+      append s "\[description\]\n"
+      return $s
+   }
+   proc gen(DT,Begin) {}                       {return ""}
+   proc gen(DT,End) {}                         {return ""}
+   proc gen(DT,SectionTitle) {Text}            {
+      if {[lsearch -exact {Name Synopsis Description} $Text]>=0} return
+      return "\n\[section \"[Dtformat $Text]\"\]\n\n"
+   }
+   proc gen(DT,SubSectionTitle) {Text}            {
+      return "\n\[subsection \"[Dtformat $Text]\"\]\n\n"
+   }
+   proc gen(DT,Name) {Text}                    {return ""}
+   proc gen(DT,Synopsis) {Text}                {return ""}; # DocTools generates automatically the Synopsis
+   proc gen(DT,Description) {Text}             {
+      return "[Dtformat $Text]\[para\]\n"}
+   proc gen(DT,DescriptionSynopsis) {Text}     { # Add the synopsis to the begin of the description. This will generate then also the Synopsis.
+      set    s "\[list_begin definitions\]\n"
+      append s "\[call $Text\]\n"
+      append s "\[list_end\]\n"
+      return $s
+   }
+   proc gen(DT,DescriptionListBegin) {}        {return "\[list_begin itemized\]\n"}
+   proc gen(DT,DescriptionListItem) {Text}     {return "  \[item\][Dtformat $Text]\n"}
+   proc gen(DT,DescriptionListEnd)   {}        {return "\[list_end\]\n"}
+   proc gen(DT,ArgumentListBegin) {}           {return "\[list_begin definitions\]\n\n"}
+   proc gen(DT,ArgumentString) {Name IsOptional IsNamed Type} {
+      if {$IsNamed} {set ArgStr "-$Name"}
+      if {$Type!="none"} {append ArgStr " \[arg $Name\]"}
+      set ArgStr [string trim $ArgStr]
+      if {$IsOptional} {set ArgStr "\[opt \"$ArgStr\"\]"}
+      return $ArgStr
+   }
+   proc gen(DT,ArgumentListItem) {Name IsOptional IsNamed Type} {
+      return "\[def [gen(DT,ArgumentString) $Name $IsOptional $IsNamed $Type]\]\n"
+   }
+   proc gen(DT,ArgumentDetailBegin)  {}        {return ""}
+   proc gen(DT,ArgumentDescription) {Text}     {return "  \[para\][Dtformat $Text]\n"}
+   proc gen(DT,ArgumentAttribute) {Text}       {return "  \[para\][Dtformat $Text]\n"}
+   proc gen(DT,OptionDetailEnd)  {}            {return "\n"}
+   proc gen(DT,OptionEnd)   {}                 {return "\[list_end\]\n"}
+   proc gen(DT,ExampleBegin) {}                {return "\[para\]\n\[example \{\n"}
+   proc gen(DT,ExampleCommandLine) {Text}      {return "[Dtformat $Text]\n"}
+   proc gen(DT,ExampleResultLine) {Text}       {return "[Dtformat $Text]\n"}
+   proc gen(DT,ExampleEnd) {}                  {return "\}\]\n"}
+   proc gen(DT,Footer) {Text}                  {return "\[manpage_end\]"}
+
+}; # End namespace tepam::doc
+
+# Specify the TEPAM version that is provided by this file:
+package provide tepam::doc_gen 0.1.1
+
+##########################################################################
+# Id: tepam_doc.tcl
+# Modifications:
+#
+# Revision 0.1.1  2013/10/18 droll
+# * Correction of bug [66d0effebc]: POD format incorrectly formatted
+#
+# Revision 0.1.0  2013/10/14 droll
+# * First TEPAM doc_gen revision
+##########################################################################
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/code.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/code.tcl
new file mode 100644
index 00000000..a8f7d3e9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/code.tcl
@@ -0,0 +1,56 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Terminal packages - ANSI
+## Generic commands to define commands for code sequences.
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+namespace eval ::term::ansi::code {}
+
+# ### ### ### ######### ######### #########
+## API. Escape clauses, plain and bracket
+##      Used by 'define'd commands.
+
+proc ::term::ansi::code::esc  {str} {return \033$str}
+proc ::term::ansi::code::escb {str} {esc    \[$str}
+
+# ### ### ### ######### ######### #########
+## API. Define command for named control code, or constant.
+##      (Simple definitions without arguments)
+
+proc ::term::ansi::code::define {name escape code} {
+    proc [Qualified $name] {} [list ::term::ansi::code::$escape $code]
+}
+
+proc ::term::ansi::code::const {name code} {
+    proc [Qualified $name] {} [list return $code]
+}
+
+# ### ### ### ######### ######### #########
+## Internal helper to construct fully-qualified names.
+
+proc ::term::ansi::code::Qualified {name} {
+    if {![string match ::* $name]} {
+        # Get the caller's namespace; append :: if it is not the
+	# global namespace, for separation from the actual name.
+        set ns [uplevel 2 [list namespace current]]
+        if {$ns ne "::"} {append ns ::}
+        set name $ns$name
+    }
+    return $name
+}
+
+# ### ### ### ######### ######### #########
+
+namespace eval ::term::ansi::code {
+    namespace export esc escb define const
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide term::ansi::code 0.2
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/code/attr.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/code/attr.tcl
new file mode 100644
index 00000000..d7d062b8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/code/attr.tcl
@@ -0,0 +1,108 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Terminal packages - ANSI - Attribute codes
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require  term::ansi::code ; # Constants
+
+namespace eval ::term::ansi::code::attr {}
+
+# ### ### ### ######### ######### #########
+## API. Symbolic names.
+
+proc ::term::ansi::code::attr::names {} {
+    variable attr
+    return  $attr
+}
+
+proc ::term::ansi::code::attr::import {{ns attr} args} {
+    if {![llength $args]} {set args *}
+    set args ::term::ansi::code::attr::[join $args " ::term::ansi::code::attr::"]
+    uplevel 1 [list namespace eval ${ns} [linsert $args 0 namespace import]]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal - Setup
+
+proc ::term::ansi::code::attr::DEF {name value} {
+    variable  attr
+    const            $name $value
+    lappend   attr   $name
+    namespace export $name
+    return
+}
+
+proc ::term::ansi::code::attr::INIT {} {
+    # ### ### ### ######### ######### #########
+    ##
+
+    # Colors. Foreground <=> Text
+    DEF	fgblack   30	; # Black
+    DEF	fgred     31	; # Red
+    DEF	fggreen   32	; # Green
+    DEF	fgyellow  33	; # Yellow
+    DEF	fgblue    34	; # Blue
+    DEF	fgmagenta 35	; # Magenta
+    DEF	fgcyan    36	; # Cyan
+    DEF	fgwhite   37	; # White
+    DEF	fgdefault 39    ; # Default (Black)
+
+    # Colors. Background.
+    DEF	bgblack   40	; # Black
+    DEF	bgred     41	; # Red
+    DEF	bggreen   42	; # Green
+    DEF	bgyellow  43	; # Yellow
+    DEF	bgblue    44	; # Blue
+    DEF	bgmagenta 45	; # Magenta
+    DEF	bgcyan    46	; # Cyan
+    DEF	bgwhite   47	; # White
+    DEF	bgdefault 49    ; # Default (Transparent)
+
+    # Non-color attributes. Activation.
+    DEF	bold      1	; # Bold
+    DEF	dim       2	; # Dim
+    DEF	italic    3     ; # Italics
+    DEF	underline 4	; # Underscore
+    DEF	blink     5	; # Blink
+    DEF	revers    7	; # Reverse
+    DEF	hidden    8	; # Hidden
+    DEF	strike    9     ; # StrikeThrough
+
+    # Non-color attributes. Deactivation.
+    DEF	nobold      22	; # Bold
+    DEF	nodim       __	; # Dim
+    DEF	noitalic    23  ; # Italics
+    DEF	nounderline 24	; # Underscore
+    DEF	noblink     25	; # Blink
+    DEF	norevers    27	; # Reverse
+    DEF	nohidden    28	; # Hidden
+    DEF	nostrike    29  ; # StrikeThrough
+
+    # Remainder
+    DEF	reset       0   ; # Reset
+
+    ##
+    # ### ### ### ######### ######### #########
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Data structures.
+
+namespace eval ::term::ansi::code::attr {
+    namespace import ::term::ansi::code::const
+    variable attr {}
+}
+
+::term::ansi::code::attr::INIT
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide term::ansi::code::attr 0.1
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/code/ctrl.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/code/ctrl.tcl
new file mode 100644
index 00000000..eb2e3b24
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/code/ctrl.tcl
@@ -0,0 +1,272 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Terminal packages - ANSI - Control codes
+
+## References
+# [0] Google: ansi terminal control
+# [1] http://vt100.net/docs/vt100-ug/chapter3.html
+# [2] http://www.termsys.demon.co.uk/vtansi.htm
+# [3] http://rrbrandt.dyndns.org:60000/docs/tut/redes/ansi.php
+# [4] http://www.dee.ufcg.edu.br/~rrbrandt/tools/ansi.html
+# [5] http://www.ecma-international.org/publications/standards/Ecma-048.htm
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require  term::ansi::code
+package require  term::ansi::code::attr
+
+namespace eval ::term::ansi::code::ctrl {}
+
+# ### ### ### ######### ######### #########
+## API. Symbolic names.
+
+proc ::term::ansi::code::ctrl::names {} {
+    variable ctrl
+    return  $ctrl
+}
+
+proc ::term::ansi::code::ctrl::import {{ns ctrl} args} {
+    if {![llength $args]} {set args *}
+    set args ::term::ansi::code::ctrl::[join $args " ::term::ansi::code::ctrl::"]
+    uplevel 1 [list namespace eval $ns [linsert $args 0 namespace import]]
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+## TODO = symbolic key codes for skd.
+
+# ### ### ### ######### ######### #########
+## Internal - Setup
+
+proc ::term::ansi::code::ctrl::DEF {name esc value} {
+    variable  ctrl
+    define           $name $esc $value
+    lappend   ctrl   $name
+    namespace export $name
+    return
+}
+
+proc ::term::ansi::code::ctrl::DEFC {name arguments script} {
+    variable  ctrl
+    proc             $name $arguments $script
+    lappend   ctrl   $name
+    namespace export $name
+    return
+}
+
+proc ::term::ansi::code::ctrl::INIT {} {
+    # ### ### ### ######### ######### #########
+    ##
+
+    # Erasing
+
+    DEF	eeol    escb K  ; # Erase (to) End Of Line
+    DEF	esol    escb 1K ; # Erase (to) Start Of Line
+    DEF	el      escb 2K ; # Erase (current) Line
+    DEF	ed      escb J  ; # Erase Down (to bottom)
+    DEF	eu      escb 1J ; # Erase Up (to top)
+    DEF	es      escb 2J ; # Erase Screen
+
+    # Scrolling
+
+    DEF	sd      esc D    ; # Scroll Down
+    DEF	su      esc M    ; # Scroll Up
+
+    # Cursor Handling
+
+    DEF	ch      escb H  ; # Cursor Home
+    DEF	sc      escb s  ; # Save Cursor
+    DEF	rc      escb u  ; # Restore Cursor (Unsave)
+    DEF	sca     esc  7  ; # Save Cursor + Attributes
+    DEF	rca     esc  8  ; # Restore Cursor + Attributes
+
+    # Tabbing
+
+    DEF	st      esc  H  ; # Set Tab (@ current position)
+    DEF	ct      escb g  ; # Clear Tab (@ current position)
+    DEF	cat     escb 3g ; # Clear All Tabs
+
+    # Device Introspection
+
+    DEF	qdc     escb c  ; # Query Device Code
+    DEF	qds     escb 5n ; # Query Device Status
+    DEF	qcp     escb 6n ; # Query Cursor Position
+    DEF	rd      esc  c  ; # Reset Device
+
+    # Linewrap on/off
+
+    DEF	elw     escb 7h ; # Enable Line Wrap
+    DEF	dlw     escb 7l ; # Disable Line Wrap
+
+    # Graphics Mode (aka use alternate font on/off)
+
+    DEF eg      esc F   ; # Enter Graphics Mode
+    DEF lg      esc G   ; # Exit Graphics Mode
+
+    ##
+    # ### ### ### ######### ######### #########
+
+    # ### ### ### ######### ######### #########
+    ## Complex, parameterized codes
+
+    # Select Character Set
+    # Choose which char set is used for default and
+    # alternate font. This does not change whether
+    # default or alternate font are used
+
+    DEFC scs0 {tag} {esc  ($tag}  ; # Set default character set
+    DEFC scs1 {tag} {esc  )$tag}  ; # Set alternate character set
+
+    # tags in A : United Kingdom Set
+    #         B : ASCII Set
+    #         0 : Special Graphics
+    #         1 : Alternate Character ROM Standard Character Set
+    #         2 : Alternate Character ROM Special Graphics
+
+    # Set Display Attributes
+
+    DEFC sda {args} {escb [join $args \;]m}
+
+    # Force Cursor Position (aka Go To)
+
+    DEFC fcp {r c}  {escb ${r}\;${c}f}
+
+    # Cursor Up, Down, Forward, Backward
+
+    DEFC cu {{n 1}} {escb [expr {$n == 1 ? "A" : "${n}A"}]}
+    DEFC cd {{n 1}} {escb [expr {$n == 1 ? "B" : "${n}B"}]}
+    DEFC cf {{n 1}} {escb [expr {$n == 1 ? "C" : "${n}C"}]}
+    DEFC cb {{n 1}} {escb [expr {$n == 1 ? "D" : "${n}D"}]}
+
+    # Scroll Screen (entire display, or between rows start end, inclusive).
+
+    DEFC ss {args} {
+	if {[llength $args] == 0} {return [escb r]}
+	if {[llength $args] == 2} {foreach {s e} $args break ; return [escb ${s};${e}r]}
+	return -code error "wrong\#args"
+    }
+
+    # Set Key Definition
+
+    DEFC skd {code str} {escb $code\;\"$str\"p}
+
+    # Terminal title
+
+    DEFC title {str} {esc \]0\;$str\007}
+
+    # Switch to and from character/box graphics.
+
+    DEFC gron  {} {esc (0}
+    DEFC groff {} {esc (B}
+
+    # Character graphics, box symbols
+    # - 4 corners, 4 t-junctions,
+    #   one 4-way junction, 2 lines
+
+    DEFC tlc   {} {return [gron]l[groff]} ; # Top    Left  Corner
+    DEFC trc   {} {return [gron]k[groff]} ; # Top    Right Corner
+    DEFC brc   {} {return [gron]j[groff]} ; # Bottom Right Corner
+    DEFC blc   {} {return [gron]m[groff]} ; # Bottom Left  Corner
+
+    DEFC ltj   {} {return [gron]t[groff]} ; # Left   T Junction
+    DEFC ttj   {} {return [gron]w[groff]} ; # Top    T Junction
+    DEFC rtj   {} {return [gron]u[groff]} ; # Right  T Junction
+    DEFC btj   {} {return [gron]v[groff]} ; # Bottom T Junction
+
+    DEFC fwj   {} {return [gron]n[groff]} ; # Four-Way Junction
+
+    DEFC hl    {} {return [gron]q[groff]} ; # Horizontal Line
+    DEFC vl    {} {return [gron]x[groff]} ; # Vertical   Line
+
+    # Optimize character graphics. The generator commands above create
+    # way to many superfluous commands shifting into and out of the
+    # graphics mode. The command below removes all shifts which are
+    # not needed. To this end it also knows which characters will look
+    # the same in both modes, to handle strings created outside this
+    # package.
+
+    DEFC groptim {string} {
+	variable grforw
+	variable grback
+	set offon [groff][gron]
+	set onoff [gron][groff]
+	while {![string equal $string [set new [string map \
+		[list $offon {} $onoff {}] [string map \
+		$grback [string map \
+		$grforw $string]]]]]} {
+	    set string $new
+	}
+	return $string
+    }
+
+    ##
+    # ### ### ### ######### ######### #########
+
+    # ### ### ### ######### ######### #########
+    ## Higher level operations
+
+    # Clear screen <=> CursorHome + EraseDown
+    # Init (Fonts): Default ASCII, Alternate Graphics
+    # Show a block of text at a specific location.
+
+    DEFC clear {} {return [ch][ed]}
+    DEFC init  {} {return [scs0 B][scs1 0]}
+
+    DEFC showat {r c text} {
+	if {![string length $text]} {return {}}
+	return [fcp $r $c][sca][join \
+		[split $text \n] \
+		[rca][cd][sca]][rca][cd]
+    }
+
+    ##
+    # ### ### ### ######### ######### #########
+
+    # ### ### ### ######### ######### #########
+    ## Attribute control (single attributes)
+
+    foreach a [::term::ansi::code::attr::names] {
+	DEF sda_$a escb [::term::ansi::code::attr::$a]m
+    }
+
+    ##
+    # ### ### ### ######### ######### #########
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Data structures.
+
+namespace eval ::term::ansi::code::ctrl {
+    namespace import ::term::ansi::code::define
+    namespace import ::term::ansi::code::esc
+    namespace import ::term::ansi::code::escb
+
+    variable grforw
+    variable grback
+    variable _
+
+    foreach _ {
+	! \" # $ % & ' ( ) * + , - . /
+	0 1 2 3 4 5 6 7 8 9 : ; < = >
+	? @ A B C D E F G H I J K L M
+	N O P Q R S T U V W X Y Z [ ^
+	\\ ]
+    } {
+	lappend grforw \016$_ $_\016
+	lappend grback $_\017 \017$_
+    }
+    unset _
+}
+
+::term::ansi::code::ctrl::INIT
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide term::ansi::code::ctrl 0.3
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/code/macros.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/code/macros.tcl
new file mode 100644
index 00000000..1f1d47d3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/code/macros.tcl
@@ -0,0 +1,93 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Terminal packages - ANSI - Higher level macros
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require textutil::repeat
+package require textutil::tabify
+package require term::ansi::code::ctrl
+
+namespace eval ::term::ansi::code::macros {}
+
+# ### ### ### ######### ######### #########
+## API. Symbolic names.
+
+proc ::term::ansi::code::macros::import {{ns macros} args} {
+    if {![llength $args]} {set args *}
+    set args ::term::ansi::code::macros::[join $args " ::term::ansi::code::macros::"]
+    uplevel 1 [list namespace eval ${ns} [linsert $args 0 namespace import]]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Higher level operations
+
+# Format a menu / framed block of text
+
+proc ::term::ansi::code::macros::menu {menu} {
+    # Menu = dict (label => char)
+    array set _ {}
+    set shift 0
+    foreach {label c} $menu {
+	if {[string first $c $label] < 0} {
+	    set shift 1
+	    break
+	}
+    }
+    set max 0
+    foreach {label c} $menu {
+	set pos [string first $c $label]
+	if {$shift || ($pos < 0)} {
+	    set xlabel "$c $label"
+	    set pos 0
+	} else {
+	    set xlabel $label
+	}
+	set len [string length $xlabel]
+	if {$len > $max} {set max $len}
+	set _($label) " [string replace $xlabel $pos $pos \
+		[cd::sda_fgred][cd::sda_bold][string index $xlabel $pos][cd::sda_reset]]"
+    }
+
+    append ms [cd::tlc][textutil::repeat::strRepeat [cd::hl] $max][cd::trc]\n
+    foreach {l c} $menu {append ms $_($l)\n}
+    append ms [cd::blc][textutil::repeat::strRepeat [cd::hl] $max][cd::brc]
+
+    return [cd::groptim $ms]
+}
+
+proc ::term::ansi::code::macros::frame {string} {
+    set lines [split [textutil::tabify::untabify2 $string] \n]
+    set max 0
+    foreach l $lines {
+	if {[set len [string length $l]] > $max} {set max $len}
+    }
+    append fs [cd::tlc][textutil::repeat::strRepeat [cd::hl] $max][cd::trc]\n
+    foreach l $lines {
+	append fs [cd::vl]${l}[textutil::repeat::strRepeat " " [expr {$max-[string length $l]}]][cd::vl]\n
+    }
+    append fs [cd::blc][textutil::repeat::strRepeat [cd::hl] $max][cd::brc]
+    return [cd::groptim $fs]
+}
+
+##
+# ### ### ### ######### ######### #########
+
+# ### ### ### ######### ######### #########
+## Data structures.
+
+namespace eval ::term::ansi::code::macros {
+    term::ansi::code::ctrl::import cd
+
+    namespace export menu frame
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide term::ansi::code::macros 0.1
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/ctrlunix.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/ctrlunix.tcl
new file mode 100644
index 00000000..675348c7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/ctrlunix.tcl
@@ -0,0 +1,91 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Terminal packages - ANSI - Control operations
+## (Unix specific implementation).
+
+## This was originally taken from page 11820 (Pure Tcl Console Editor)
+## of the Tcler's Wiki, however page 14693 (Reading a single character
+## ...) is the same in a more self-contained manner.
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+namespace eval ::term::ansi::ctrl::unix {}
+
+# ### ### ### ######### ######### #########
+## Make command easily available
+
+proc ::term::ansi::ctrl::unix::import {{ns ctrl} args} {
+    if {![llength $args]} {set args *}
+    set args ::term::ansi::ctrl::unix::[join $args " ::term::ansi::ctrl::unix::"]
+    uplevel 1 [list namespace eval ${ns} [linsert $args 0 namespace import]]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## API
+
+# We use the <@stdin because stty works out what terminal to work with
+# using standard input on some platforms. On others it prefers
+# /dev/tty instead, but putting in the redirection makes the code more
+# portable
+
+proc ::term::ansi::ctrl::unix::raw {} {
+    variable stty
+    exec $stty raw -echo <@stdin
+    return
+}
+
+proc ::term::ansi::ctrl::unix::cooked {} {
+    variable stty
+    exec $stty -raw echo <@stdin
+    return
+}
+
+proc ::term::ansi::ctrl::unix::columns {} {
+    variable tput
+    return [exec $tput cols <@stdin]
+}
+
+proc ::term::ansi::ctrl::unix::rows {} {
+    variable tput
+    return [exec $tput lines <@stdin]
+}
+
+# ### ### ### ######### ######### #########
+## Package setup
+
+proc ::term::ansi::ctrl::unix::INIT {} {
+    variable tput [auto_execok tput]
+    variable stty [auto_execok stty]
+
+    if {($stty eq "/usr/ucb/stty") &&
+	($::tcl_platform(os) eq "SunOS")} {
+	set stty /usr/bin/stty
+    }
+
+    if {($tput eq "") || ($stty eq "")} {
+	return -code error \
+		"The external requirements for the \
+		use of this package (tput, stty in \
+		\$PATH) are not met."
+    }
+    return
+}
+
+namespace eval ::term::ansi::ctrl::unix {
+    variable tput {}
+    variable stty {}
+
+    namespace export columns rows raw cooked
+}
+
+::term::ansi::ctrl::unix::INIT
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide term::ansi::ctrl::unix 0.1.1
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/send.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/send.tcl
new file mode 100644
index 00000000..d47f834a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ansi/send.tcl
@@ -0,0 +1,92 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Terminal packages - ANSI - Control codes
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.4
+package require term::send
+package require term::ansi::code::ctrl
+
+namespace eval ::term::ansi::send {}
+
+# ### ### ### ######### ######### #########
+## Make command easily available
+
+proc ::term::ansi::send::import {{ns send} args} {
+    if {![llength $args]} {set args *}
+    set args ::term::ansi::send::[join $args " ::term::ansi::send::"]
+    uplevel 1 [list namespace eval ${ns} [linsert $args 0 namespace import]]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal - Setup.
+
+proc ::term::ansi::send::ChName {n} {
+    if {![string match *-* $n]} {
+	return ${n}ch
+    }
+    set nl   [split $n -]
+    set stem [lindex       $nl 0]
+    set sfx  [join [lrange $nl 1 end] -]
+    return ${stem}ch-$sfx
+}
+
+proc ::term::ansi::send::Args {n -> arv achv avv} {
+    upvar 1 $arv a $achv ach $avv av
+    set code ::term::ansi::code::ctrl::$n
+    set a   [info args $code]
+    set av  [expr {
+	[llength $a]
+	? " \$[join $a { $}]"
+	: $a
+    }]
+    foreach a1 $a[set a {}] {
+        if {[info default $code $a1 default]} {
+            lappend a [list $a1 $default]
+        } else {
+            lappend a $a1
+        }
+    }
+    set ach [linsert $a 0 ch]
+    return $code
+}
+
+proc ::term::ansi::send::INIT {} {
+    foreach n [::term::ansi::code::ctrl::names] {
+	set nch  [ChName $n]
+	set code [Args $n -> a ach av]
+
+	if {[lindex $a end] eq "args"} {
+	    # An args argument requires more care, and an eval
+	    set av [lrange $av 0 end-1]
+	    if {$av ne {}} {set av " $av"}
+	    set gen "eval \[linsert \$args 0 $code$av\]"
+	    #8.5: (written for clarity): set gen "$code$av {*}\$args"
+	} else {
+	    set gen $code$av
+	}
+
+	proc $n   $a   "wr        \[$gen\]" ; namespace export $n
+	proc $nch $ach "wrch \$ch \[$gen\]" ; namespace export $nch
+    }
+    return
+}
+
+namespace eval ::term::ansi::send {
+    namespace import ::term::send::wr
+    namespace import ::term::send::wrch
+    namespace export wr wrch
+}
+
+::term::ansi::send::INIT
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide term::ansi::send 0.2
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/bind.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/bind.tcl
new file mode 100644
index 00000000..8342442d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/bind.tcl
@@ -0,0 +1,132 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Terminal packages - string -> action mappings
+## (bind objects). For use with 'receive listen'.
+## In essence a DFA with tree structure.
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require  snit
+package require  term::receive
+namespace eval ::term::receive::bind {}
+
+# ### ### ### ######### ######### #########
+
+snit::type ::term::receive::bind {
+
+    constructor {{dict {}}} {
+	foreach {str cmd} $dict {Register $str $cmd}
+	return
+    }
+
+    method map {str cmd} {
+	Register $str $cmd
+	return
+    }
+
+    method default {cmd} {
+	set default $cmd
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    method listen {{chan stdin}} {
+	#parray dfa
+	::term::receive::listen $self $chan
+	return
+    }
+
+    method unlisten {{chan stdin}} {
+	::term::receive::unlisten $chan
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    variable default {}
+    variable state   {}
+
+    method reset {} {
+	set state {}
+	return
+    }
+
+    method next {c} {Next $c ; return}
+    method process {str} {
+	foreach c [split $str {}] {Next $c}
+	return
+    }
+
+    method eof {} {Eof ; return}
+
+    proc Next {c} {
+	upvar 1 dfa dfa state state default default
+	set key [list $state $c]
+
+	#puts -nonewline stderr "('$state' x '$c')"
+
+	if {![info exists dfa($key)]} {
+	    # Unknown sequence. Reset. Restart.
+	    # Run it through the default action.
+
+	    if {$default ne ""} {
+		uplevel #0 [linsert $default end $state$c]
+	    }
+
+	    #puts stderr =\ RESET
+	    set state {}
+	} else {
+	    foreach {what detail} $dfa($key) break
+	    #puts -nonewline stderr "= $what '$detail'"
+	    if {$what eq "t"} {
+		# Incomplete sequence. Next state.
+		set state $detail
+		#puts stderr " goto ('$state')"
+	    } elseif {$what eq "a"} {
+		# Action, then reset.
+		set state {}
+		#puts stderr " run ($detail)"
+		uplevel #0 [linsert $detail end $state$c]
+	    } else {
+		return -code error \
+			"Internal error. Bad DFA."
+	    }
+	}
+	return
+    }
+
+    proc Eof {} {}
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    proc Register {str cmd} {
+	upvar 1 dfa dfa
+	set prefix {}
+	set last   {{} {}}
+	foreach c [split $str {}] {
+	    set key [list $prefix $c]
+	    set next $prefix$c
+	    set dfa($key) [list t $next]
+	    set last $key
+	    set prefix $next
+	}
+	set dfa($last) [list a $cmd]
+    }
+    variable dfa -array {}
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide term::receive::bind 0.1
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/imenu.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/imenu.tcl
new file mode 100644
index 00000000..42a7fab5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/imenu.tcl
@@ -0,0 +1,202 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Terminal packages - string -> action mappings
+## (menu objects). For use with 'receive listen'.
+## In essence a DFA with tree structure.
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require snit
+package require textutil::repeat
+package require textutil::tabify
+package require term::ansi::send
+package require term::receive::bind
+package require term::ansi::code::ctrl
+
+namespace eval ::term::receive::menu {}
+
+# ### ### ### ######### ######### #########
+
+snit::type ::term::interact::menu {
+
+    option -in          -default stdin
+    option -out         -default stdout
+    option -column      -default 0
+    option -line        -default 0
+    option -height      -default 25
+    option -actions     -default {}
+    option -hilitleft   -default 0
+    option -hilitright  -default end
+    option -framed      -default 0 -readonly 1
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    constructor {dict args} {
+	$self configurelist $args
+	Save $dict
+
+	install bind using ::term::receive::bind \
+	    ${selfns}::bind $options(-actions)
+
+	$bind map [cd::cu] [mymethod Up]
+	$bind map [cd::cd] [mymethod Down]
+	$bind map \n       [mymethod Select]
+	#$bind default [mymethod DEF]
+
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    method interact {} {
+	Show
+	$bind listen   $options(-in)
+	vwait [myvar done]
+	$bind unlisten $options(-in)
+	return $map($done)
+    }
+
+    method done  {} {set done $at ; return}
+    method clear {} {Clear        ; return}
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    component bind
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    variable map -array {}
+    variable header
+    variable labels
+    variable footer
+    variable empty
+
+    proc Save {dict} {
+	upvar 1 header header labels labels footer footer
+	upvar 1 empty empty at at map map top top
+	upvar 1 options(-height) height
+
+	set max 0
+	foreach {l code} $dict {
+	    if {[set len [string length $l]] > $max} {set max $len}
+	}
+
+	set header [cd::groptim [cd::tlc][textutil::repeat::strRepeat [cd::hl] $max][cd::trc]]
+	set footer [cd::groptim [cd::blc][textutil::repeat::strRepeat [cd::hl] $max][cd::brc]]
+
+	set labels {}
+	set at 0
+	foreach {l code} $dict {
+	    set map($at) $code
+	    lappend labels ${l}[textutil::repeat::strRepeat " " [expr {$max-[string length $l]}]]
+	    incr at
+	}
+
+	set h $height
+	if {$h > [llength $labels]} {set h [llength $labels]}
+
+	set eline "  [textutil::repeat::strRepeat {  } $max]"
+	set empty $eline
+	for {set i 0} {$i <= $h} {incr i} {
+	    append empty \n$eline
+	}
+
+	set at  0
+	set top 0
+	return
+    }
+
+    variable top  0
+    variable at   0
+    variable done .
+
+    proc Show {} {
+	upvar 1 header header labels labels footer footer at at
+	upvar 1 options(-in)     in  options(-column) col top top
+	upvar 1 options(-out)    out options(-line)   row
+	upvar 1 options(-height) height options(-framed) framed
+	upvar 1 options(-hilitleft)  left
+	upvar 1 options(-hilitright) right
+
+	set bot [expr {$top + $height - 1}]
+	set fr  [expr {$framed ? [cd::vl] : { }}]
+
+	set text $header\n
+	set i $top
+	foreach l [lrange $labels $top $bot] {
+	    append text $fr
+	    if {$i != $at} {
+		append text $l
+	    } else {
+		append text [string replace $l $left $right \
+			[cd::sda_revers][string range $l $left $right][cd::sda_reset]]
+	    }
+	    append text $fr \n
+	    incr i
+	}
+	append text $footer
+
+	vt::wrch $out [cd::showat $row $col $text]
+	return
+    }
+
+    proc Clear {} {
+	upvar 1 empty         empty options(-column) col
+	upvar 1 options(-out) out   options(-line)   row
+
+	vt::wrch $out [cd::showat $row $col $empty]
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    method Up {str} {
+	if {$at == 0} return
+	incr at -1
+	if {$at < $top} {incr top -1}
+	Show
+	return
+    }
+
+    method Down {str} {
+	upvar 0 options(-height) height
+	if {$at == ([llength $labels]-1)} return
+	incr at
+	set bot [expr {$top + $height - 1}]
+	if {$at > $bot} {incr top}
+	Show
+	return
+    }
+
+    method Select {str} {
+	$self done
+	return
+    }
+
+    method DEF {str} {
+	puts stderr "($str)"
+	exit
+    }
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::term::interact::menu {
+    term::ansi::code::ctrl::import cd
+    term::ansi::send::import       vt
+}
+
+package provide term::interact::menu 0.1
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ipager.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ipager.tcl
new file mode 100644
index 00000000..59c1c580
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/ipager.tcl
@@ -0,0 +1,206 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Terminal packages - string -> action mappings
+## (pager objects). For use with 'receive listen'.
+## In essence a DFA with tree structure.
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require snit
+package require textutil::repeat
+package require textutil::tabify
+package require term::ansi::send
+package require term::receive::bind
+package require term::ansi::code::ctrl
+
+namespace eval ::term::receive::pager {}
+
+# ### ### ### ######### ######### #########
+
+snit::type ::term::interact::pager {
+
+    option -in      -default stdin
+    option -out     -default stdout
+    option -column  -default 0
+    option -line    -default 0
+    option -height  -default 25
+    option -actions -default {}
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    constructor {str args} {
+	$self configurelist $args
+	Save $str
+
+	install bind using ::term::receive::bind \
+	    ${selfns}::bind $options(-actions)
+
+	$bind map [cd::cu] [mymethod Up]
+	$bind map [cd::cd] [mymethod Down]
+	$bind map \033\[5~ [mymethod PageUp]
+	$bind map \033\[6~ [mymethod PageDown]
+	$bind map \n       [mymethod Done]
+	#$bind default [mymethod DEF]
+
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    method interact {} {
+	Show
+	$bind listen   $options(-in)
+	set interacting 1
+	vwait [myvar done]
+	set interacting 0
+	$bind unlisten $options(-in)
+	return
+    }
+
+    method done  {} {set done . ; return}
+    method clear {} {Clear      ; return}
+
+    method text {str} {
+	if {$interacting} {Clear}
+	Save $str
+	if {$interacting} {Show}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    component bind
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    variable header
+    variable text
+    variable footer
+    variable empty
+
+    proc Save {str} {
+	upvar 1 header header text text footer footer maxline maxline
+	upvar 1 options(-height) height empty empty at at
+
+	set lines [split [textutil::tabify::untabify2 $str] \n]
+
+	set max 0
+	foreach l $lines {
+	    if {[set len [string length $l]] > $max} {set max $len}
+	}
+
+	set header [cd::groptim [cd::tlc][textutil::repeat::strRepeat [cd::hl] $max][cd::trc]]
+	set footer [cd::groptim [cd::blc][textutil::repeat::strRepeat [cd::hl] $max][cd::brc]]
+
+	set text {}
+	foreach l $lines {
+	    lappend text [cd::vl]${l}[textutil::repeat::strRepeat " " [expr {$max-[string length $l]}]][cd::vl]
+	}
+
+	set h $height
+	if {$h > [llength $text]} {set h [llength $text]}
+
+	set eline "  [textutil::repeat::strRepeat {  } $max]"
+	set empty $eline
+	for {set i 0} {$i <= $h} {incr i} {
+	    append empty \n$eline
+	}
+
+	set maxline [expr {[llength $text] - $height}]
+	if {$maxline < 0} {set maxline 0}
+	set at 0
+	return
+    }
+
+    variable interacting 0
+    variable at   0
+    variable maxline -1
+    variable done .
+
+    proc Show {} {
+	upvar 1 header header text text footer footer at at
+	upvar 1 options(-in)     in  options(-column) col
+	upvar 1 options(-out)    out options(-line)   row
+	upvar 1 options(-height) height
+
+	set to [expr {$at + $height -1}]
+
+	vt::wrch $out [cd::showat $row $col \
+			   $header\n[join [lrange $text $at $to] \n]\n$footer]
+	return
+    }
+
+    proc Clear {} {
+	upvar 1 empty         empty options(-column) col
+	upvar 1 options(-out) out   options(-line)   row
+
+	vt::wrch $out [cd::showat $row $col $empty]
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    method Up {str} {
+	if {$at == 0} return
+	incr at -1
+	Show
+	return
+    }
+
+    method Down {str} {
+	if {$at >= $maxline} return
+	incr at
+	Show
+	return
+    }
+
+    method PageUp {str} {
+	set newat [expr {$at - $options(-height) + 1}]
+	if {$newat < 0} {set newat 0}
+	if {$newat == $at} return
+	set at $newat
+	Show
+	return
+    }
+
+    method PageDown {str} {
+	set newat [expr {$at + $options(-height) - 1}]
+	if {$newat >= $maxline} {set newat $maxline}
+	if {$newat == $at} return
+	set at $newat
+	Show
+	return
+    }
+
+    method Done {str} {
+	$self done
+	return
+    }
+
+    method DEF {str} {
+	puts stderr "($str)"
+	exit
+    }
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+namespace eval ::term::interact::pager {
+    term::ansi::code::ctrl::import cd
+    term::ansi::send::import       vt
+}
+
+package provide term::interact::pager 0.1
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/pkgIndex.tcl
new file mode 100644
index 00000000..bd06c3a8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/pkgIndex.tcl
@@ -0,0 +1,13 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} return
+package ifneeded term                     0.1 [list source [file join $dir term.tcl]]
+package ifneeded term::ansi::code         0.2 [list source [file join $dir ansi/code.tcl]]
+package ifneeded term::ansi::code::attr   0.1 [list source [file join $dir ansi/code/attr.tcl]]
+package ifneeded term::ansi::code::ctrl   0.3 [list source [file join $dir ansi/code/ctrl.tcl]]
+package ifneeded term::ansi::code::macros 0.1 [list source [file join $dir ansi/code/macros.tcl]]
+package ifneeded term::ansi::ctrl::unix   0.1.1 [list source [file join $dir ansi/ctrlunix.tcl]]
+package ifneeded term::ansi::send         0.2 [list source [file join $dir ansi/send.tcl]]
+package ifneeded term::interact::menu     0.1 [list source [file join $dir imenu.tcl]]
+package ifneeded term::interact::pager    0.1 [list source [file join $dir ipager.tcl]]
+package ifneeded term::receive            0.1 [list source [file join $dir receive.tcl]]
+package ifneeded term::receive::bind      0.1 [list source [file join $dir bind.tcl]]
+package ifneeded term::send               0.1 [list source [file join $dir send.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/receive.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/receive.tcl
new file mode 100644
index 00000000..393549c2
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/receive.tcl
@@ -0,0 +1,60 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Terminal packages - Generic receiver operations
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+namespace eval ::term::receive {}
+
+# ### ### ### ######### ######### #########
+## API. Read character from specific channel,
+##      or default (stdin). Processing of
+##      character sequences.
+
+proc ::term::receive::getch {{chan stdin}} {
+    return [read $chan 1]
+}
+
+proc ::term::receive::listen {cmd {chan stdin}} {
+    fconfigure $chan -blocking 0
+    fileevent  $chan readable \
+	    [list ::term::receive::Foreach $chan $cmd]
+    return
+}
+
+proc ::term::receive::unlisten {{chan stdin}} {
+    fileevent $chan readable {}
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internals
+
+proc ::term::receive::Foreach {chan cmd} {
+    set string [read $chan]
+    if {[string length $string]} {
+	#puts stderr "F($string)"
+	uplevel #0 [linsert $cmd end process $string]
+    }
+    if {[eof $chan]} {
+	close $chan
+	uplevel #0 [linsert $cmd end eof]
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Initialization
+
+namespace eval ::term::receive {
+    namespace export getch listen
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide term::receive 0.1
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/send.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/send.tcl
new file mode 100644
index 00000000..c3e235de
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/send.tcl
@@ -0,0 +1,34 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Terminal packages - Generic sender operations
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+namespace eval ::term::send {}
+
+# ### ### ### ######### ######### #########
+## API. Write to channel, or default (stdout)
+
+proc ::term::send::wr {str} {
+    wrch stdout $str
+    return
+}
+
+proc ::term::send::wrch {ch str} {
+    puts -nonewline $ch $str
+    flush           $ch
+    return
+}
+
+namespace eval ::term::send {
+    namespace export wr wrch
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide term::send 0.1
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/term.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/term.tcl
new file mode 100644
index 00000000..01d4630c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/term/term.tcl
@@ -0,0 +1,19 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Terminal packages - Main :: Generic operations
+
+# Currently we have no generica at all. We make the package, but it
+# provides nothing for now.
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+namespace eval ::term {}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide term 0.1
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/adjust.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/adjust.tcl
new file mode 100644
index 00000000..d47c82f8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/adjust.tcl
@@ -0,0 +1,761 @@
+# trim.tcl --
+#
+#	Various ways of trimming a string.
+#
+# Copyright (c) 2000      by Ajuba Solutions.
+# Copyright (c) 2000      by Eric Melski <ericm@ajubasolutions.com>
+# Copyright (c) 2002-2004 by Johannes-Heinrich Vogeler <vogeler@users.sourceforge.net>
+# Copyright (c) 2001-2006 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: adjust.tcl,v 1.16 2011/12/13 18:12:56 andreas_kupries Exp $
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.2
+package require textutil::repeat
+package require textutil::string
+
+namespace eval ::textutil::adjust {}
+
+# ### ### ### ######### ######### #########
+## API implementation
+
+namespace eval ::textutil::adjust {
+    namespace import -force ::textutil::repeat::strRepeat
+}
+
+proc ::textutil::adjust::adjust {text args} {
+    if {[string length [string trim $text]] == 0} {
+        return ""
+    }
+
+    Configure $args
+    Adjust text newtext
+
+    return $newtext
+}
+
+proc ::textutil::adjust::Configure {args} {
+    variable Justify      left
+    variable Length       72
+    variable FullLine     0
+    variable StrictLength 0
+    variable Hyphenate    0
+    variable HyphPatterns    ; # hyphenation patterns (TeX)
+
+    set args [ lindex $args 0 ]
+    foreach { option value } $args {
+	switch -exact -- $option {
+	    -full {
+		if { ![ string is boolean -strict $value ] } then {
+		    error "expected boolean but got \"$value\""
+		}
+		set FullLine [ string is true $value ]
+	    }
+	    -hyphenate {
+		# the word exceeding the length of line is tried to be
+		# hyphenated; if a word cannot be hyphenated to fit into
+		# the line processing stops! The length of the line should
+		# be set to a reasonable value!
+
+		if { ![ string is boolean -strict $value ] } then {
+		    error "expected boolean but got \"$value\""
+		}
+		set Hyphenate [string is true $value]
+		if { $Hyphenate && ![info exists HyphPatterns(_LOADED_)]} {
+		    error "hyphenation patterns not loaded!"
+		}
+	    }
+	    -justify {
+		set lovalue [ string tolower $value ]
+		switch -exact -- $lovalue {
+		    left -
+		    right -
+		    center -
+		    plain {
+			set Justify $lovalue
+		    }
+		    default {
+			error "bad value \"$value\": should be center, left, plain or right"
+		    }
+		}
+	    }
+	    -length {
+		if { ![ string is integer $value ] } then {
+		    error "expected positive integer but got \"$value\""
+		}
+		if { $value < 1 } then {
+		    error "expected positive integer but got \"$value\""
+		}
+		set Length $value
+	    }
+	    -strictlength {
+		# the word exceeding the length of line is moved to the
+		# next line without hyphenation; words longer than given
+		# line length are cut into smaller pieces
+
+		if { ![ string is boolean -strict $value ] } then {
+		    error "expected boolean but got \"$value\""
+		}
+		set StrictLength [ string is true $value ]
+	    }
+	    default {
+		error "bad option \"$option\": must be -full, -hyphenate, \
+			-justify, -length, or -strictlength"
+	    }
+	}
+    }
+
+    return ""
+}
+
+# ::textutil::adjust::Adjust
+#
+# History:
+#      rewritten on 2004-04-13 for bugfix tcllib-bugs-882402 (jhv)
+
+proc ::textutil::adjust::Adjust { varOrigName varNewName } {
+    variable Length
+    variable FullLine
+    variable StrictLength
+    variable Hyphenate
+
+    upvar $varOrigName orig
+    upvar $varNewName  text
+
+    set pos 0;                                   # Cursor after writing
+    set line ""
+    set text ""
+
+
+    if {!$FullLine} {
+	regsub -all -- "(\n)|(\t)"     $orig   " "  orig
+	regsub -all -- " +"            $orig  " "   orig
+	regsub -all -- "(^ *)|( *\$)"  $orig  ""    orig
+    }
+
+    set words [split $orig]
+    set numWords [llength $words]
+    set numline 0
+
+    for {set cnt 0} {$cnt < $numWords} {incr cnt} {
+
+	set w [lindex $words $cnt]
+	set wLen [string length $w]
+
+	# the word $w doesn't fit into the present line
+	# case #1: we try to hyphenate
+
+	if {$Hyphenate && ($pos+$wLen >= $Length)} {
+	    # Hyphenation instructions
+	    set w2 [textutil::adjust::Hyphenation $w]
+
+	    set iMax [llength $w2]
+	    if {$iMax == 1 && [string length $w] > $Length} {
+		# word cannot be hyphenated and exceeds linesize
+
+		error "Word \"$w2\" can\'t be hyphenated\
+			and exceeds linesize $Length!"
+	    } else {
+		# hyphenating of $w was successfull, but we have to look
+		# that every sylable would fit into the line
+
+		foreach x $w2 {
+		    if {[string length $x] >= $Length} {
+			error "Word \"$w\" can\'t be hyphenated\
+				to fit into linesize $Length!"
+		    }
+		}
+	    }
+
+	    for {set i 0; set w3 ""} {$i < $iMax} {incr i} {
+		set syl [lindex $w2 $i]
+		if {($pos+[string length " $w3$syl-"]) > $Length} {break}
+		append w3 $syl
+	    }
+	    for {set w4 ""} {$i < $iMax} {incr i} {
+		set syl [lindex $w2 $i]
+		append w4 $syl
+	    }
+
+	    if {[string length $w3] && [string length $w4]} {
+		# hyphenation was successfull: redefine
+		# list of words w => {"$w3-" "$w4"}
+
+		set x [lreplace $words $cnt $cnt "$w4"]
+		set words [linsert $x $cnt "$w3-"]
+		set w [lindex $words $cnt]
+		set wLen [string length $w]
+		incr numWords
+	    }
+	}
+
+	# the word $w doesn't fit into the present line
+	# case #2: we try to cut the word into pieces
+
+	if {$StrictLength && ([string length $w] > $Length)} {
+	    # cut word into two pieces
+	    set w2 $w
+
+	    set over [expr {$pos+2+$wLen-$Length}]
+
+	    incr Length -1
+	    set w3   [string range $w2 0 $Length]
+	    incr Length
+	    set w4   [string range $w2 $Length end]
+
+	    set x [lreplace $words $cnt $cnt $w4]
+	    set words [linsert $x $cnt $w3 ]
+	    set w [lindex $words $cnt]
+	    set wLen [string length $w]
+	    incr numWords
+	}
+
+	# continuing with the normal procedure
+
+	if {($pos+$wLen < $Length)} {
+	    # append word to current line
+
+	    if {$pos} {append line " "; incr pos}
+	    append line $w
+	    incr pos $wLen
+	} else {
+	    # line full => write buffer and  begin a new line
+
+	    if {[string length $text]} {append text "\n"}
+	    append text [Justification $line [incr numline]]
+	    set line $w
+	    set pos $wLen
+	}
+    }
+
+    # write buffer and return!
+
+    if {[string length $text]} {append text "\n"}
+    append text [Justification $line end]
+    return $text
+}
+
+# ::textutil::adjust::Justification
+#
+# justify a given line
+#
+# Parameters:
+#      line    text for justification
+#      index   index for line in text
+#
+# Returns:
+#      the justified line
+#
+# Remarks:
+#      Only lines with size not exceeding the max. linesize provided
+#      for text formatting are justified!!!
+
+proc ::textutil::adjust::Justification { line index } {
+    variable Justify
+    variable Length
+    variable FullLine
+
+    set len [string length $line];               # length of current line
+
+    if { $Length <= $len } then {
+	# the length of current line ($len) is equal as or greater than
+	# the value provided for text formatting ($Length) => to avoid
+	# inifinite loops we leave $line unchanged and return!
+
+	return $line
+    }
+
+    # Special case:
+    # for the last line, and if the justification is set to 'plain'
+    # the real justification is 'left' if the length of the line
+    # is less than 90% (rounded) of the max length allowed. This is
+    # to avoid expansion of this line when it is too small: without
+    # it, the added spaces will 'unbeautify' the result.
+    #
+
+    set justify $Justify
+    if { ( "$index" == "end" ) && \
+	    ( "$Justify" == "plain" ) && \
+	    ( $len < round($Length * 0.90) ) } then {
+	set justify left
+    }
+
+    # For a left justification, nothing to do, but to
+    # add some spaces at the end of the line if requested
+
+    if { "$justify" == "left" } then {
+	set jus ""
+	if { $FullLine } then {
+	    set jus [strRepeat " " [ expr { $Length - $len } ]]
+	}
+	return "${line}${jus}"
+    }
+
+    # For a right justification, just add enough spaces
+    # at the beginning of the line
+
+    if { "$justify" == "right" } then {
+	set jus [strRepeat " " [ expr { $Length - $len } ]]
+	return "${jus}${line}"
+    }
+
+    # For a center justification, add half of the needed spaces
+    # at the beginning of the line, and the rest at the end
+    # only if needed.
+
+    if { "$justify" == "center" } then {
+	set mr [ expr { ( $Length - $len ) / 2 } ]
+	set ml [ expr { $Length - $len - $mr } ]
+	set jusl [strRepeat " " $ml]
+	set jusr [strRepeat " " $mr]
+	if { $FullLine } then {
+	    return "${jusl}${line}${jusr}"
+	} else {
+	    return "${jusl}${line}"
+	}
+    }
+
+    # For a plain justification, it's a little bit complex:
+    #
+    # if some spaces are missing, then
+    #
+    # 1) sort the list of words in the current line by decreasing size
+    # 2) foreach word, add one space before it, except if it's the
+    #    first word, until enough spaces are added
+    # 3) rebuild the line
+
+    if { "$justify" == "plain" } then {
+	set miss [ expr { $Length - [ string length $line ] } ]
+
+	# Bugfix tcllib-bugs-860753 (jhv)
+
+	set words [split $line]
+	set numWords [llength $words]
+
+	if {$numWords < 2} {
+	    # current line consists of less than two words - we can't
+	    # insert blanks to achieve a plain justification => leave
+	    # $line unchanged and return!
+
+	    return $line
+	}
+
+	for {set i 0; set totalLen 0} {$i < $numWords} {incr i} {
+	    set w($i) [lindex $words $i]
+	    if {$i > 0} {set w($i) " $w($i)"}
+	    set wLen($i) [string length $w($i)]
+	    set totalLen [expr {$totalLen+$wLen($i)}]
+	}
+
+	set miss [expr {$Length - $totalLen}]
+
+	# len walks through all lengths of words of the line under
+	# consideration
+
+	for {set len 1} {$miss > 0} {incr len} {
+	    for {set i 1} {($i < $numWords) && ($miss > 0)} {incr i} {
+		if {$wLen($i) == $len} {
+		    set w($i) " $w($i)"
+		    incr wLen($i)
+		    incr miss -1
+		}
+	    }
+	}
+
+	set line ""
+	for {set i 0} {$i < $numWords} {incr i} {
+	    set line "$line$w($i)"
+	}
+
+	# End of bugfix
+
+	return "${line}"
+    }
+
+    error "Illegal justification key \"$justify\""
+}
+
+proc ::textutil::adjust::SortList { list dir index } {
+
+    if { [ catch { lsort -integer -$dir -index $index $list } sl ] != 0 } then {
+        error "$sl"
+    }
+
+    return $sl
+}
+
+# Hyphenation utilities based on Knuth's algorithm
+#
+# Copyright (C) 2001-2003 by Dr.Johannes-Heinrich Vogeler (jhv)
+# These procedures may be used as part of the tcllib
+
+# textutil::adjust::Hyphenation
+#
+#      Hyphenate a string using Knuth's algorithm
+#
+# Parameters:
+#      str     string to be hyphenated
+#
+# Returns:
+#      the hyphenated string
+
+proc ::textutil::adjust::Hyphenation { str } {
+
+    # if there are manual set hyphenation marks e.g. "Recht\-schrei\-bung"
+    # use these for hyphenation and return
+
+    if {[regexp {[^\\-]*[\\-][.]*} $str]} {
+	regsub -all {(\\)(-)} $str {-} tmp
+	return [split $tmp -]
+    }
+
+    # Don't hyphenate very short words! Minimum length for hyphenation
+    # is set to 3 characters!
+
+    if { [string length $str] < 4 } then { return $str }
+
+    # otherwise follow Knuth's algorithm
+
+    variable HyphPatterns;                       # hyphenation patterns (TeX)
+
+    set w ".[string tolower $str].";             # transform to lower case
+    set wLen [string length $w];                 # and add delimiters
+
+    # Initialize hyphenation weights
+
+    set s {}
+    for {set i 0} {$i < $wLen} {incr i} {
+	lappend s 0
+    }
+
+    for {set i 0} {$i < $wLen} {incr i} {
+	set kmax [expr {$wLen-$i}]
+	for {set k 1} {$k < $kmax} {incr k} {
+	    set sw [string range $w $i [expr {$i+$k}]]
+	    if {[info exists HyphPatterns($sw)]} {
+		set hw $HyphPatterns($sw)
+		set hwLen [string length $hw]
+		for {set l1 0; set l2 0} {$l1 < $hwLen} {incr l1} {
+		    set c [string index $hw $l1]
+		    if {[string is digit $c]} {
+			set sPos [expr {$i+$l2}]
+			if {$c > [lindex $s $sPos]} {
+			    set s [lreplace $s $sPos $sPos $c]
+			}
+		    } else {
+			incr l2
+		    }
+		}
+	    }
+	}
+    }
+
+    # Replace all even hyphenation weigths by zero
+
+    for {set i 0} {$i < [llength $s]} {incr i} {
+	set c [lindex $s $i]
+	if {!($c%2)} { set s [lreplace $s $i $i 0] }
+    }
+
+    # Don't start with a hyphen! Take also care of words enclosed in quotes
+    # or that someone has forgotten to put a blank between a punctuation
+    # character and the following word etc.
+
+    for {set i 1} {$i < ($wLen-1)} {incr i} {
+	set c [string range $w $i end]
+	if {[regexp {^[:alpha:][.]*} $c]} {
+	    for {set k 1} {$k < ($i+1)} {incr k} {
+		set s [lreplace $s $k $k 0]
+	    }
+	    break
+	}
+    }
+
+    # Don't separate the last character of a word with a hyphen
+
+    set max [expr {[llength $s]-2}]
+    if {$max} {set s [lreplace $s $max end 0]}
+
+    # return the syllabels of the hyphenated word as a list!
+
+    set ret ""
+    set w ".$str."
+    for {set i 1} {$i < ($wLen-1)} {incr i} {
+	if {[lindex $s $i]} { append ret - }
+	append ret [string index $w $i]
+    }
+    return [split $ret -]
+}
+
+# textutil::adjust::listPredefined
+#
+#      Return the names of the hyphenation files coming with the package.
+#
+# Parameters:
+#      None.
+#
+# Result:
+#       List of filenames (without directory)
+
+proc ::textutil::adjust::listPredefined {} {
+    variable here
+    return [glob -type f -directory $here -tails *.tex]
+}
+
+# textutil::adjust::getPredefined
+#
+#      Retrieve the full path for a predefined hyphenation file
+#       coming with the package.
+#
+# Parameters:
+#      name     Name of the predefined file.
+#
+# Results:
+#       Full path to the file, or an error if it doesn't
+#       exist or is matching the pattern *.tex.
+
+proc ::textutil::adjust::getPredefined {name} {
+    variable here
+
+    if {![string match *.tex $name]} {
+        return -code error \
+                "Illegal hyphenation file \"$name\""
+    }
+    set path [file join $here $name]
+    if {![file exists $path]} {
+        return -code error \
+                "Unknown hyphenation file \"$path\""
+    }
+    return $path
+}
+
+# textutil::adjust::readPatterns
+#
+#      Read hyphenation patterns from a file and store them in an array
+#
+# Parameters:
+#      filNam  name of the file containing the patterns
+
+proc ::textutil::adjust::readPatterns { filNam } {
+
+    variable HyphPatterns;                       # hyphenation patterns (TeX)
+
+    # HyphPatterns(_LOADED_) is used as flag for having loaded
+    # hyphenation patterns from the respective file (TeX format)
+
+    if {[info exists HyphPatterns(_LOADED_)]} {
+	unset HyphPatterns(_LOADED_)
+    }
+
+    # the array xlat provides translation from TeX encoded characters
+    # to those of the ISO-8859-1 character set
+
+    set xlat(\"s) \337;  # 223 := sharp s    "
+    set xlat(\`a) \340;  # 224 := a, grave
+    set xlat(\'a) \341;  # 225 := a, acute
+    set xlat(\^a) \342;  # 226 := a, circumflex
+    set xlat(\"a) \344;  # 228 := a, diaeresis "
+    set xlat(\`e) \350;  # 232 := e, grave
+    set xlat(\'e) \351;  # 233 := e, acute
+    set xlat(\^e) \352;  # 234 := e, circumflex
+    set xlat(\`i) \354;  # 236 := i, grave
+    set xlat(\'i) \355;  # 237 := i, acute
+    set xlat(\^i) \356;  # 238 := i, circumflex
+    set xlat(\~n) \361;  # 241 := n, tilde
+    set xlat(\`o) \362;  # 242 := o, grave
+    set xlat(\'o) \363;  # 243 := o, acute
+    set xlat(\^o) \364;  # 244 := o, circumflex
+    set xlat(\"o) \366;  # 246 := o, diaeresis "
+    set xlat(\`u) \371;  # 249 := u, grave
+    set xlat(\'u) \372;  # 250 := u, acute
+    set xlat(\^u) \373;  # 251 := u, circumflex
+    set xlat(\"u) \374;  # 252 := u, diaeresis "
+
+    set fd [open $filNam RDONLY]
+    set status 0
+
+    while {[gets $fd line] >= 0} {
+
+	switch -exact $status {
+	    PATTERNS {
+		if {[regexp {^\}[.]*} $line]} {
+		    # End of patterns encountered: set status
+		    # and ignore that line
+		    set status 0
+		    continue
+		} else {
+		    # This seems to be pattern definition line; to process it
+		    # we have first to do some editing
+		    #
+		    # 1) eat comments in a pattern definition line
+		    # 2) eat braces and coded linefeeds
+
+		    set z [string first "%" $line]
+		    if {$z > 0} { set line [string range $line 0 [expr {$z-1}]] }
+
+		    regsub -all {(\\n|\{|\})} $line {} tmp
+		    set line $tmp
+
+		    # Now $line should consist only of hyphenation patterns
+		    # separated by white space
+
+		    # Translate TeX encoded characters to ISO-8859-1 characters
+		    # using the array xlat defined above
+
+		    foreach x [array names xlat] {
+			regsub -all {$x} $line $xlat($x) tmp
+			set line $tmp
+		    }
+
+		    # split the line and create a lookup array for
+		    # the repective hyphenation patterns
+
+		    foreach item [split $line] {
+			if {[string length $item]} {
+			    if {![string match {\\} $item]} {
+				# create index for hyphenation patterns
+
+				set var $item
+				regsub -all {[0-9]} $var {} idx
+				# store hyphenation patterns as elements of an array
+
+				set HyphPatterns($idx) $item
+			    }
+			}
+		    }
+		}
+	    }
+	    EXCEPTIONS {
+		if {[regexp {^\}[.]*} $line]} {
+		    # End of patterns encountered: set status
+		    # and ignore that line
+		    set status 0
+		    continue
+		} else {
+		    # to be done in the future
+		}
+	    }
+	    default {
+		if {[regexp {^\\endinput[.]*} $line]} {
+		    # end of data encountered, stop processing and
+		    # ignore all the following text ..
+		    break
+		} elseif {[regexp {^\\patterns[.]*} $line]} {
+		    # begin of patterns encountered: set status
+		    # and ignore that line
+		    set status PATTERNS
+		    continue
+		} elseif {[regexp {^\\hyphenation[.]*} $line]} {
+		    # some particular cases to be treated separately
+		    set status EXCEPTIONS
+		    continue
+		} else {
+		    set status 0
+		}
+	    }
+	}
+    }
+
+    close $fd
+    set HyphPatterns(_LOADED_) 1
+
+    return
+}
+
+#######################################################
+
+# @c The specified <a text>block is indented
+# @c by <a prefix>ing each line. The first
+# @c <a hang> lines ares skipped.
+#
+# @a text:   The paragraph to indent.
+# @a prefix: The string to use as prefix for each line
+# @a prefix: of <a text> with.
+# @a skip:   The number of lines at the beginning to leave untouched.
+#
+# @r Basically <a text>, but indented a certain amount.
+#
+# @i indent
+# @n This procedure is not checked by the testsuite.
+
+proc ::textutil::adjust::indent {text prefix {skip 0}} {
+    set text [string trimright $text]
+
+    set res [list]
+    foreach line [split $text \n] {
+	if {[string compare "" [string trim $line]] == 0} {
+	    lappend res {}
+	} else {
+	    set line [string trimright $line]
+	    if {$skip <= 0} {
+		lappend res $prefix$line
+	    } else {
+		lappend res $line
+	    }
+	}
+	if {$skip > 0} {incr skip -1}
+    }
+    return [join $res \n]
+}
+
+# Undent the block of text: Compute LCP (restricted to whitespace!)
+# and remove that from each line. Note that this preverses the
+# shaping of the paragraph (i.e. hanging indent are _not_ flattened)
+# We ignore empty lines !!
+
+proc ::textutil::adjust::undent {text} {
+
+    if {$text == {}} {return {}}
+
+    set lines [split $text \n]
+    set ne [list]
+    foreach l $lines {
+	if {[string length [string trim $l]] == 0} continue
+	lappend ne $l
+    }
+    set lcp [::textutil::string::longestCommonPrefixList $ne]
+
+    if {[string length $lcp] == 0} {return $text}
+
+    regexp "^(\[\t \]*)" $lcp -> lcp
+
+    if {[string length $lcp] == 0} {return $text}
+
+    set len [string length $lcp]
+
+    set res [list]
+    foreach l $lines {
+	if {[string length [string trim $l]] == 0} {
+	    lappend res {}
+	} else {
+	    lappend res [string range $l $len end]
+	}
+    }
+    return [join $res \n]
+}
+
+# ### ### ### ######### ######### #########
+## Data structures
+
+namespace eval ::textutil::adjust {
+    variable here [file dirname [info script]]
+
+    variable Justify      left
+    variable Length       72
+    variable FullLine     0
+    variable StrictLength 0
+    variable Hyphenate    0
+    variable HyphPatterns
+
+    namespace export adjust indent undent
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide textutil::adjust 0.7.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/dehypht.tex b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/dehypht.tex
new file mode 100644
index 00000000..8f1dfb04
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/dehypht.tex
@@ -0,0 +1,902 @@
+% This is `dehypht.tex' as of 03 March 1999.
+%
+% Copyright (C) 1988,1991 Rechenzentrum der Ruhr-Universitaet Bochum
+%               [german hyphen patterns]
+% Copyright (C) 1993,1994,1999 Bernd Raichle/DANTE e.V.
+%               [macros, adaption for TeX 2]
+%
+% -----------------------------------------------------------------
+% IMPORTANT NOTICE:
+%
+% This program can be redistributed and/or modified under the terms
+% of the LaTeX Project Public License Distributed from CTAN
+% archives in directory macros/latex/base/lppl.txt; either
+% version 1 of the License, or any later version.
+% -----------------------------------------------------------------
+%
+%
+% This file contains german hyphen patterns following traditional
+% hyphenation rules and includes umlauts and sharp s, but without
+% `c-k' and triple consonants.  It is based on hyphen patterns
+% containing 5719 german hyphen patterns with umlauts in the
+% recommended version of September 27, 1990.
+%
+% For use with TeX generated by
+%
+%          Norbert Schwarz
+%          Rechenzentrum Ruhr-Universitaet Bochum
+%          Universitaetsstrasse 150
+%          D-44721 Bochum, FRG
+%
+%
+% Adaption of these patterns for TeX, Version 2.x and 3.x and
+% all fonts in T1/`Cork'/EC/DC and/or OT1/CM encoding by
+%
+%          Bernd Raichle
+%          Stettener Str. 73
+%          D-73732 Esslingen, FRG
+%   Email: raichle@Informatik.Uni-Stuttgart.DE
+%
+%
+% Error reports in case of UNCHANGED versions to
+%
+%          DANTE e.V., Koordinator `german.sty'
+%          Postfach 10 18 40
+%          D-69008 Heidelberg, FRG
+%   Email: german@Dante.DE
+%
+% or one of the addresses given above.
+%
+%
+% Changes:
+%  1990-09-27 First version of `ghyphen3.tex' (Norbert Schwarz)
+%  1991-02-13 PC umlauts changed to ^^xx  (Norbert Schwarz)
+%  1993-08-27 Umlauts/\ss changed to "a/\3 macros, added macro
+%             definitions and additional logic to select correct
+%             patterns/encoding  (Bernd Raichle)
+%  1994-02-13 Release of `ghyph31.tex' V3.1a (Bernd Raichle)
+%  1999-03-03 Renamed file to `dehypht.tex' according to the
+%             naming scheme using the ISO country code `de', the
+%             common part `hyph' for all hyphenation patterns files,
+%             and the additional postfix `t' for traditional,
+%             removed wrong catcode change of ^^e (the comment
+%             character %) and ^^f (the character &),
+%             do _not_ change \catcode, \lccode, \uccode to avoid
+%             problems with other hyphenation pattern files,
+%             changed code to distinguish TeX 2.x/3.x,
+%             changed license conditions to LPPL (Bernd Raichle)
+%
+%
+% For more information see the additional documentation
+% at the end of this file.
+%
+% -----------------------------------------------------------------
+%
+\message{German Traditional Hyphenation Patterns %
+         `dehypht' Version 3.2a <1999/03/03>}
+\message{(Formerly known under the name `ghyph31' and `ghyphen'.)}
+%
+%
+% Next we define some commands which are used inside the patterns.
+% To keep them local, we enclose the rest of the file in a group
+% (The \patterns command globally changes the hyphenation trie!).
+%
+\begingroup
+%
+%
+% Make sure that doublequote is not active:
+\catcode`\"=12
+%
+%
+% Because ^^e4 is used in the following macros which is read by
+% TeX 2.x as ^^e or %, the comment character of TeX, some trick
+% has to be found to avoid this problem.  The same is true for the
+% character ^^f or & in the TeX 2.x code.
+% Therefore in the code the exclamationmark ! is used instead of
+% the circumflex ^ and its \catcode is set appropriately
+% (normally \catcode`\!=12, in the code \catcode`\!=7).
+%
+% The following \catcode, \lccode assignments and macro definitions
+% are defined in such a way that the following \pattern{...} list
+% can be used for both, TeX 2.x and TeX 3.x.
+%
+% We first change the \lccode of ^^Y to make sure that we can
+% include this character in the hyphenation patterns.
+%
+\catcode`\^^Y=11 \lccode`\^^Y=`\^^Y
+%
+% Then we have to define some macros depending on the TeX version.
+% Therefore we have to distinguish TeX version 2.x and 3.x:
+%
+\ifnum`\@=`\^^40 % true => TeX 3.x
+  %
+  % For TeX 3:
+  % ----------
+  %
+  % Assign appropriate \catcode and \lccode values for all
+  % accented characters used in the patterns (\uccode changes are
+  % not used within \patterns{...} and thus not necessary):
+  %
+  \catcode"E4=11 \catcode"C4=11 % \"a \"A
+  \catcode"F6=11 \catcode"D6=11 % \"o \"O
+  \catcode"FC=11 \catcode"DC=11 % \"u \"U
+  \catcode"FF=11 \catcode"DF=11 % \ss  SS
+  %
+  \lccode"C4="E4 \uccode"C4="C4  \lccode"E4="E4 \uccode"E4="C4
+  \lccode"D6="F6 \uccode"D6="D6  \lccode"F6="F6 \uccode"F6="D6
+  \lccode"DC="FC \uccode"DC="DC  \lccode"FC="FC \uccode"FC="DC
+  \lccode"DF="FF \uccode"DF="DF  \lccode"FF="FF \uccode"FF="DF
+  %
+  % In the following definitions we use ??xy instead of ^^xy
+  % to avoid errors when reading the following macro definitions
+  % with TeX 2.x (remember ^^e(4) is the comment character):
+  %
+  \catcode`\?=7
+  %
+  % Define the accent macro " in such a way that it
+  % expands to single letters in font encoding T1.
+  \catcode`\"=13
+  \def"#1{\ifx#1a??e4\else \ifx#1o??f6\else \ifx#1u??fc\else
+      \errmessage{Hyphenation pattern file corrupted!}%
+    \fi\fi\fi}
+  %
+  %   - patterns with umlauts are ok
+  \def\n#1{#1}
+  %
+  % For \ss which exists in T1 _and_ OT1 encoded fonts but with
+  % different glyph codes, duplicated patterns for both encodings
+  % are included.  Thus you can use these hyphenation patterns for
+  % T1 and OT1 encoded fonts:
+  %   - define \3 to be code `\^^ff (\ss in font encoding T1)
+  %   - define \9 to be code `\^^Y  (\ss in font encoding OT1)
+  \def\3{??ff}
+  \def\9{??Y}
+  %   - duplicated patterns to support font encoding OT1 are ok
+  \def\c#1{#1}
+  %   >>>>>>  UNCOMMENT the next line, if you do not want
+  %   >>>>>>  to use fonts in font encoding OT1
+  %\def\c#1{}
+  %
+  \catcode`\?=12
+  %
+\else
+  %
+  % For TeX 2:
+  % ----------
+  %
+  % Define the accent macro " to throw an error message.
+  \catcode`\"=13
+  \def"#1{\errmessage{Hyphenation pattern file corrupted!}}
+  %
+  %   - ignore all patterns with umlauts
+  \def\n#1{}
+  %
+  % With TeX 2 fonts in encoding T1 can be used, but all glyphs
+  % in positions > 127 can not be used in hyphenation patterns.
+  % Thus only patterns with glyphs in OT1 positions are included:
+  %   - define \3 to be code ^^Y (\ss in CM font encoding)
+  %   - define \9 to throw an error message
+  \def\3{^^Y}
+  \def\9{\errmessage{Hyphenation pattern file corrupted!}}
+  %   - ignore all duplicated patterns with \ss in T1 encoding
+  \def\c#1{}
+  %
+\fi
+%
+%
+\patterns{%
+.aa6l .ab3a4s .ab3ei .abi2 .ab3it .ab1l .ab1r .ab3u .ad3o4r .alti6
+.ana3c .an5alg .an1e .ang8s .an1s .ap1p .ar6sc .ar6ta .ar6tei .as2z
+.au2f1 .au2s3 .be5erb .be3na .ber6t5r .bie6r5 .bim6s5t .brot3 .bru6s
+.ch6 .che6f5 .da8c .da2r .dar5in .dar5u .den6ka .de5r6en .des6pe
+.de8spo .de3sz .dia3s4 .dien4 .dy2s1 .ehren5 .eine6 .ei6n5eh .ei8nen
+.ein5sa .en6der .en6d5r .en3k4 .en8ta8 .en8tei .en4t3r .epo1 .er6ban
+.er6b5ei .er6bla .er6d5um .er3ei .er5er .er3in .er3o4b .erwi5s .es1p
+.es8t .ex1a2 .ex3em .fal6sc .fe6st5a .flu4g3 .furch8 .ga6ner .ge3n4a
+\n{.ge5r"o} .ges6 .halb5 .halbe6 .hal6br .haup4 .hau4t .heima6 .he4r3e
+.her6za .he5x .hin3 .hir8sc .ho4c .hu3sa .hy5o .ibe5 .ima6ge .in1
+.ini6 .is5chi .jagd5 .kal6k5o .ka6ph .ki4e .kop6f3 .kraf6 \n{.k"u5ra}
+.lab6br .liie6 .lo6s5k \n{.l"o4s3t} .ma5d .mi2t1 .no6th .no6top
+.obe8ri .ob1l .obs2 .ob6st5e .or3c .ort6s5e .ost3a .oste8r .pe4re
+.pe3ts .ph6 .po8str .rau4m3 .re5an .ro8q .ru5the \n{.r"u5be}
+\n{.r"u8stet} .sch8 .se6e .se5n6h .se5ra .si2e .spi6ke .st4 .sy2n
+.tages5 .tan6kl .ta8th .te6e .te8str .to6der .to8nin .to6we .um1
+.umpf4 .un1 .une6 .unge5n .ur1c .ur5en .ve6rin .vora8 .wah6l5 .we8ges
+.wo6r .wor3a .wun4s .zi4e .zuch8 \n{."ande8re} \n{."och8} aa1c aa2gr
+aal5e aa6r5a a5arti aa2s1t aat2s 6aba ab3art 1abdr 6abel aben6dr
+ab5erk ab5err ab5esse 1abf 1abg \n{1abh"a} ab1ir 1abko a1bl ab1la
+5ablag a6bla\3 \c{a6bla\9} ab4ler ab1lu \n{a8bl"a} \n{5a6bl"o} abma5c
+1abn ab1ra ab1re 5a6brec ab1ro ab1s ab8sk abs2z 3abtei ab1ur 1abw
+5abze 5abzu \n{ab1"an} \n{ab"au8} a4ce.  a5chal ach5art ach5au a1che
+a8chent ach6er.  a6ch5erf a1chi ach1l ach3m ach5n a1cho ach3re a1chu
+ach1w a1chy \n{ach5"af} ack1o acks6t ack5sta a1d 8ad.  a6d5ac ad3ant
+ad8ar 5addi a8dein ade5o8 adi5en 1adj 1adle ad1op a2dre 3adres adt1
+1adv \n{a6d"a} a1e2d ae1r a1er.  1aero 8afa a3fal af1an a5far a5fat
+af1au a6fentl a2f1ex af1fr af5rau af1re 1afri af6tent af6tra aft5re
+a6f5um \n{8af"a} ag5abe 5a4gent ag8er ages5e 1aggr ag5las ag1lo a1gn
+ag2ne 1agog a6g5und a1ha a1he ah5ein a4h3erh a1hi ahl1a ah1le ah4m3ar
+ahn1a a5ho ahra6 ahr5ab ah1re ah8rei ahren8s ahre4s3 ahr8ti ah1ru a1hu
+\n{ah8"o} ai3d2s ai1e aif6 a3inse ai4re.  a5isch.  ais8e a3ismu ais6n
+aiso6 a1j 1akad a4kade a1ke a1ki 1akko 5akro1 a5lal al5ans 3al8arm
+al8beb al8berw alb5la 3album al1c a1le a6l5e6be a4l3ein a8lel a8lerb
+a8lerh a6lert 5a6l5eth 1algi al4gli al3int al4lab al8lan al4l3ar
+alle3g a1lo a4l5ob al6schm al4the altist5 al4t3re 8a1lu alu5i a6lur
+alu3ta \n{a1l"a} a6mate 8ame.  5a6meise am6m5ei am6mum am2n ampf3a
+am6schw am2ta a1mu \n{a1m"a} a3nac a1nad anadi5e an3ako an3alp 3analy
+an3ame an3ara a1nas an5asti a1nat anat5s an8dent ande4s3 an1ec an5eis
+an1e2k 4aner.  a6n5erd a8nerf a6n5erke 1anfa 5anfert \n{1anf"a} 3angab
+5angebo an3gli ang6lis an2gn 3angri ang5t6 \n{5anh"a} ani5g ani4ka
+an5i8on an1kl an6kno an4kro 1anl anma5c anmar4 3annah anne4s3 a1no
+5a6n1o2d 5a6n3oma 5a6nord 1anr an1sa 5anschl an4soz an1st 5anstal
+an1s2z 5antenn an1th \n{5anw"a} a5ny an4z3ed 5anzeig 5anzieh 3anzug
+\n{an1"a} \n{5an"as} \n{a1n"o} \n{an"o8d} a1os a1pa 3apfel a2ph1t
+\n{aph5"a6} a1pi 8apl apo1c apo1s a6poste a6poth 1appa ap1pr a1pr
+\n{a5p"a} \n{a3p"u} a1ra a4r3af ar3all 3arbei 2arbt ar1c 2a1re ar3ein
+ar2gl 2a1ri ari5es ar8kers ar6les ar4nan ar5o6ch ar1o2d a1rol ar3ony
+a8ror a3ros ar5ox ar6schl 8artei ar6t5ri a1ru a1ry 1arzt arz1w
+\n{ar8z"a} \n{ar"a8m} \n{ar"o6} \n{ar5"om} \n{ar1"u2} a1sa a6schec
+asch5l asch3m a6schn a3s4hi as1pa asp5l a8steb as5tev 1asth a6stoc
+a1str ast3re 8a1ta ata5c ata3la a6tapf ata5pl a1te a6teli aten5a
+ate5ran 6atf 6atg a1th at3hal 1athl 2a1ti 5atlant 3atlas 8atmus 6atn
+a1to a6t5ops ato6ra a6t5ort.  4a1tr a6t5ru at2t1h \n{at5t6h"a} 6a1tu
+atz1w \n{a1t"a} \n{a1t"u} au1a au6bre auch3a au1e aue4l 5aufent
+\n{3auff"u} 3aufga 1aufn auf1t 3auftr 1aufw 3auge.  au4kle aule8s 6aum
+au8mar aum5p 1ausb 3ausd 1ausf 1ausg au8sin 3auss au4sta 1ausw 1ausz
+aut5eng au1th 1auto au\3e8 \c{au\9e8} a1v ave5r6a aver6i a1w a6wes a1x
+a2xia a6xio a1ya a1z azi5er.  8a\3 \c{8a\9} 1ba 8ba8del ba1la ba1na
+ban6k5r ba5ot bardi6n ba1ro basten6 bau3sp 2b1b bb6le b2bli 2b1c 2b1d
+1be be1a be8at.  be1ch 8becht 8becke.  be5el be1en bee8rei be5eta bef2
+8beff be1g2 \n{beh"o8} bei1s 6b5eisen bei3tr b8el bel8o belu3t be3nac
+bend6o be6ners be6nerw be4nor ben4se6 bens5el \n{be1n"a} \n{be1n"u}
+be1o2 b8er.  be1ra be8rac ber8gab.  ber1r \n{be1r"u} bes8c bes5erh
+bes2p be5tha bet5sc be1un be1ur 8bex be6zwec 2b1f8 bfe6st5e 2b1g2
+bga2s5 bge1 2b1h bhole6 1bi bi1bl b6ie bi1el bi1la \n{bil"a5} bi1na
+bi4nok bi5str bi6stu bi5tr bit4t5r b1j 2b1k2 \n{bk"u6} bl8 b6la.
+6b1lad 6blag 8blam 1blat b8latt 3blau.  b6lav 3ble.  b1leb b1led
+8b1leg 8b1leh 8bleid 8bleih 6b3lein blei3s ble4m3o 4blich b4lind
+8bling b2lio 5blit b4litz b1loh 8b1los 1blu 5blum 2blun blut3a blut5sc
+\n{3bl"a} \n{bl"as5c} \n{5bl"o} \n{3bl"u} \n{bl"u8sc} 2b1m 2b1n 1bo
+bo1ch bo5d6s boe5 8boff 8bonk bo1ra b1ort 2b1p2 b1q 1br brail6 brast8
+bre4a b5red 8bref 8b5riem b6riga bro1s b1rup b2ruz \n{8br"oh}
+\n{br"os5c} 8bs b1sa b8sang b2s1ar b1sc bs3erl bs3erz b8sof b1s2p
+bst1h b3stru \n{b5st"a} b6sun 2b1t b2t1h 1bu bu1ie bul6k b8ure bu6sin
+6b1v 2b1w 1by1 by6te.  8b1z bzi1s \n{1b"a} \n{b5"a6s5} \n{1b"u}
+\n{b6"u5bere} \n{b"uge6} \n{b"ugel5e} \n{b"ur6sc} 1ca cag6 ca5la ca6re
+ca5y c1c 1ce celi4c celich5 ce1ro c8h 2ch.  1chae ch1ah ch3akt cha6mer
+8chanz 5chara 3chari 5chato 6chb 1chef 6chei ch3eil ch3eis 6cherkl
+6chf 4chh 5chiad 5chias 6chins 8chj chl6 5chlor 6ch2m 2chn6 ch8nie
+5cho.  8chob choi8d 6chp ch3ren ch6res \n{ch3r"u} 2chs 2cht cht5ha
+cht3hi 5chthon ch6tin 6chuh chu4la 6ch3unt chut6t 8chw 1ci ci5tr c2k
+2ck.  ck1ei 4ckh ck3l ck3n ck5o8f ck1r 2cks ck5stra ck6s5u c2l 1c8o
+con6ne 8corb cos6t c3q 1c6r 8c1t 1cu 1cy \n{5c"a1} \n{c"o5} 1da.
+8daas 2dabg 8dabr 6dabt 6dabw 1dac da2gr 6d5alk 8d5amt dan6ce.
+dani5er dan8ker 2danl danla6 6dans 8danzi 6danzu d1ap da2r1a8 2d1arb
+d3arc dar6men 4d3art 8darz 1dat 8datm 2d1auf 2d1aus 2d1b 2d1c 2d1d
+d5de d3d2h \n{dd"amme8} 1de 2deal de5an de3cha de1e defe6 6deff 2d1ehr
+5d4eic de5isc de8lar del6s5e del6spr de4mag de8mun de8nep dene6r
+8denge.  8dengen de5o6d 2deol de5ram 8derdb der5ein de1ro der1r d8ers
+der5um de4s3am de4s3an de4sau de6sil de4sin de8sor de4spr de2su 8deul
+de5us.  2d1f df2l 2d1g 2d1h 1di dia5c di5ara dice5 di3chr di5ena di1gn
+di1la dil8s di1na 8dind 6dinf 4d3inh 2d1ins di5o6d di3p4t di8sen dis1p
+di5s8per di6s5to dis5tra di8tan di8tin d1j 6dje 2dju 2d1k 2d1l 2d1m
+2d1n6 dni6 dnje6 1do 6d5obe do6berf 6d5ony do3ran 6dord 2d1org dor4t3h
+do6ste 6doth dott8e 2d1p d5q dr4 1drah 8drak d5rand 6dre.  4drech
+d6reck 4d3reg 8d3reic d5reife 8drem 8d1ren 2drer 8dres.  6d5rh 1dria
+d1ric 8drind droi6 dro5x 1dru 8drut \n{dr"os5c} \n{1dr"u} \n{dr"u5b}
+\n{dr"u8sc} 2ds d1sa d6san dsat6 d1sc 5d6scha.  5dschik dse8e d8serg
+8dsl d1sp d4spak ds2po \n{d8sp"a} d1st \n{d1s"u} 2dt d1ta d1te d1ti
+d1to dt1s6 d1tu \n{d5t"a} 1du du5als du1b6 du1e duf4t3r 4d3uh du5ie
+8duml 8dumw 2d1und du8ni 6d5unt dur2c durch3 6durl 6dursa 8durt du1s
+du8schr 2d1v 2d1w dwa8l 2d1z \n{1d"a} \n{6d"ah} \n{8d"and} \n{d"a6r}
+\n{d"o8bl} \n{d5"ol} \n{d"or6fl} \n{d"o8sc} \n{d5"o4st} \n{d"os3te}
+\n{1d"u} ea4ben e1ac e1ah e1akt e1al.  e5alf e1alg e5a8lin e1alk e1all
+e5alp e1alt e5alw e1am e1and ea6nim e1ar.  e5arf e1ark e5arm e3art
+e5at.  e6ate e6a5t6l e8ats e5att e6au.  e1aus e1b e6b5am ebens5e
+eb4lie eb4ser eb4s3in e1che e8cherz e1chi ech3m 8ech3n ech1r ech8send
+ech4su e1chu eck5an e5cl e1d ee5a ee3e ee5g e1ei ee5isc eei4s3t
+ee6lend e1ell \n{ee5l"o} e1erd ee3r4e ee8reng eere6s5 \n{ee5r"a}
+ee6tat e1ex e1f e6fau e8fe8b 3effek ef3rom ege6ra eglo6si 1egy e1ha
+e6h5ach eh5ans e6hap eh5auf e1he e1hi ehl3a eh1le ehl5ein eh1mu ehn5ec
+e1ho ehr1a eh1re ehre6n eh1ri eh1ru ehr5um e1hu eh1w e1hy \n{e1h"a}
+\n{e1h"o} \n{e3h"ut} ei1a eia6s ei6bar eich3a eich5r ei4dar ei6d5ei
+ei8derf ei3d4sc ei1e 8eifen 3eifri 1eign eil1d ei6mab ei8mag ein1a4
+ei8nat ei8nerh ei8ness ei6nete ein1g e8ini ein1k ei6n5od ei8nok ei4nor
+\n{e3ins"a} ei1o e1irr ei5ru ei8sab ei5schn ei6s5ent ei8sol ei4t3al
+eit3ar eit1h ei6thi ei8tho eit8samt ei6t5um e1j 1ekd e1ke e1ki e1k2l
+e1kn ekni4 e1la e2l1al 6elan e6lanf e8lanl e6l5ans el3arb el3arm
+e6l3art 5e6lasti e6lauge elbst5a e1le 6elef ele6h e6l5ehe e8leif
+e6l5einh 1elek e8lel 3eleme e6lemen e6lente el5epi e4l3err e6l5ersc
+elf2l elg2 e6l5ins ell8er 4e1lo e4l3ofe el8soh el8tent 5eltern e1lu
+elut2 \n{e1l"a} \n{e1l"u} em8dei em8meis 4emo emo5s 1emp1f 1empt 1emto
+e1mu emurk4 emurks5 \n{e1m"a} en5a6ben en5achs en5ack e1nad en5af
+en5all en3alt en1am en3an.  en3ant en3anz en1a6p en1ar en1a6s 6e1nat
+en3auf en3aus en2ce enda6l end5erf end5erg en8dess 4ene.  en5eck
+e8neff e6n5ehr e6n5eim en3eis 6enem.  6enen e4nent 4ener.  e8nerd
+e6n3erf e4nerg 5energi e6n5erla en5ers e6nerst en5erw 6enes e6n5ess
+e2nex en3glo 2eni enni6s5 ennos4 enns8 e1no e6nober eno8f en5opf
+e4n3ord en8sers ens8kl en1sp ens6por en5t6ag enta5go en8terbu en6tid
+3entla ent5ric 5entwic 5entwu 1entz enu5i e3ny en8zan \n{en1"of}
+\n{e1n"os} \n{e1n"ug} eo1c e5o6fe e5okk e1on.  e3onf e5onk e5onl e5onr
+e5opf e5ops e5or.  e1ord e1org eo5r6h eo1t e1pa e8pee e6p5e6g ep5ent
+e1p2f e1pi 5epid e6pidem e1pl 5epos e6pos.  ep4p3a e1pr \n{e1p"a} e1q
+e1ra.  er5aal 8eraba e5rabel er5a6ben e5rabi er3abs er3ach era5e
+era5k6l er3all er3amt e3rand e3rane er3ans e5ranz.  e1rap er3arc
+e3rari er3a6si e1rat erat3s er3auf e3raum 3erbse er1c e1re 4e5re.
+er3eck er5egg er5e2h 2erei e3rei.  e8reine er5einr 6eren.  e4r3enm
+4erer.  e6r5erm er5ero er5erst e4r3erz er3ess \n{5erf"ul} er8gan.
+5ergebn er2g5h \n{5erg"anz} \n{5erh"ohu} 2e1ri eri5ak e6r5iat e4r3ind
+e6r5i6n5i6 er5ins e6r5int er5itio er1kl \n{3erkl"a} \n{5erl"os.}
+ermen6s er6nab 3ernst 6e1ro.  e1rod er1o2f e1rog 6e3roi ero8ide e3rol
+e1rom e1ron e3rop8 e2r1or e1ros e1rot er5ox ersch4 5erstat er6t5ein
+er2t1h er5t6her 2e1ru eruf4s3 e4r3uhr er3ums e5rus 5erwerb e1ry er5zwa
+er3zwu \n{er"a8m} \n{er5"as} \n{er"o8} \n{e3r"os.} \n{e6r1"u2b} e1sa
+esa8b e8sap e6s5a6v e1sc esch4l ese1a es5ebe eserve5 e8sh es5ill
+es3int es4kop e2sl eso8b e1sp espei6s5 es2po es2pu 5essenz e6stabs
+e6staf e6st5ak est3ar e8stob e1str est5res es3ur e2sz \n{e1s"u} e1ta
+et8ag etari5e eta8ta e1te eten6te et5hal e5thel e1ti 1etn e1to e1tr
+et3rec e8tscha et8se et6tei et2th et2t1r e1tu etu1s et8zent et8zw
+\n{e1t"a} \n{e1t"o} \n{e1t"u} eu1a2 eu1e eue8rei eu5fe euin5 euk2
+e1um.  eu6nio e5unter eu1o6 eu5p 3europ eu1sp eu5str eu8zo e1v eval6s
+eve5r6en ever4i e1w e2wig ex1or 1exp 1extr ey3er.  e1z \n{e1"a2}
+\n{e5"o8} \n{e1"u} e8\3es \c{e8\9es} fa6ch5i fade8 fa6del fa5el.
+fal6lo falt8e fa1na fan4gr 6fanl 6fap far6ba far4bl far6r5a 2f1art
+fa1sc fau8str fa3y 2f1b2 6f1c 2f1d 1fe 2f1eck fe6dr feh6lei f6eim
+8feins f5eis fel5en 8feltern 8femp fe5rant 4ferd.  ferri8 fe8stof
+fe6str fe6stum fe8tag fet6ta fex1 2ff f1fa f6f5arm f5fe ffe5in ffe6la
+ffe8ler ff1f f1fla ff3lei ff4lie ff8sa ff6s5ta 2f1g2 fgewen6 4f1h 1fi
+fid4 fi3ds fieb4 fi1la fi8lei fil4m5a f8in.  fi1na 8finf fi8scho fi6u
+6f1j 2f1k2 f8lanz fl8e 4f3lein 8flib 4fling f2lix 6f3lon 5flop 1flor
+\n{5f8l"ac} \n{3fl"ot} 2f1m 2f1n 1fo foh1 f2on fo6na 2f1op fo5ra
+for8mei for8str for8th for6t5r fo5ru 6f5otte 2f1p8 f1q fr6 f5ram
+1f8ran f8ra\3 \c{f8ra\9} f8re.  frei1 5frei.  f3reic f3rest f1rib
+8f1ric 6frig 1fris fro8na \n{fr"as5t} 2fs f1sc f2s1er f5str
+\n{fs3t"at} 2ft f1tak f1te ft5e6h ftere6 ft1h f1ti f5to f1tr ft5rad
+ft1sc ft2so f1tu ftwi3d4 ft1z 1fu 6f5ums 6funf fun4ka fu8\3end
+\c{fu8\9end} 6f1v 2f1w 2f1z \n{1f"a} \n{f"a1c} \n{8f"arm} \n{6f"aug}
+\n{f"a8\3} \n{\c{f"a8\9}} \n{f"ode3} \n{8f"of} \n{3f"or} \n{1f"u}
+\n{f"un4f3u} 1ga ga6bl 6gabw 8gabz g3a4der ga8ho ga5isc 4gak ga1la
+6g5amt ga1na gan5erb gan6g5a ga5nj 6ganl 8gansc 6garb 2g1arc 2g1arm
+ga5ro 6g3arti ga8sa ga8sc ga6stre 2g1atm 6g5auf gau5fr g5aus 2g1b g5c
+6gd g1da 1ge ge1a2 ge6an ge8at.  ge1e2 ge6es gef2 8geff ge1g2l ge1im
+4g3eise geist5r gel8bra gelt8s \n{ge5l"o} ge8nin gen3k 6g5entf
+\n{ge3n"a} ge1or ge1ra ge6rab ger8au \n{8gerh"o} ger8ins ge1ro 6g5erz.
+\n{ge1r"a} \n{ge1r"u} ge1s ges2p ge5unt 4g3ex3 2g1f8 2g1g g1ha 6g1hei
+5ghel.  g5henn 6g1hi g1ho 1ghr \n{g1h"o} 1gi gi5la gi8me.  gi1na
+4g3ins gi3str g1j 2g1k 8gl.  1glad g5lag glan4z3 1glas 6glass 5glaub
+g3lauf 1gle.  g5leb 3gleic g3lein 5gleis 1glem 2gler 8g3leu gli8a
+g2lie 3glied 1g2lik 1g2lim g6lio 1gloa 5glom 1glon 1glop g1los g4loss
+g5luf 1g2ly \n{1gl"u} 2g1m gn8 6gn.  1gna 8gnach 2gnah g1nas g8neu
+g2nie g3nis 1gno 8gnot 1go goe1 8gof 2gog 5gogr 6g5oh goni5e 6gonist
+go1ra 8gord 2g1p2 g1q 1gr4 g5rahm gra8m gra4s3t 6g1rec gre6ge 4g3reic
+g5reit 8grenn gri4e g5riem 5grif 2grig g5ring 6groh 2grot gro6\3
+\c{gro6\9} 4grut 2gs gs1ab g5sah gs1ak gs1an gs8and gs1ar gs1au g1sc
+gs1ef g5seil gs5ein g2s1er gs1in g2s1o gso2r gs1pr g2s1u 2g1t g3te
+g2t1h 1gu gu5as gu2e 2gue.  6gued 4g3uh 8gums 6g5unt gu1s gut3h gu2tu
+4g1v 2g1w gy1n g1z \n{1g"a} \n{8g"a8m} \n{6g"arm} \n{1g"o} \n{1g"u}
+\n{6g"ub} 1haa hab8r ha8del hade4n 8hae ha5el.  haf6tr 2hal.  ha1la
+hal4b5a 6hale 8han.  ha1na han6dr han6ge.  2hani h5anth 6hanz 6harb
+h3arbe h3arme ha5ro ha2t1h h1atm hau6san ha8\3 \c{ha8\9} h1b2 h1c h1d
+he2bl he3cho h3echt he5d6s 5heft h5e6he.  hei8ds h1eif 2hein he3ism
+he5ist.  heit8s3 hek6ta hel8lau 8helt he6mer 1hemm 6h1emp hen5end
+hen5klo hen6tri he2nu 8heo he8q her3ab he5rak her3an 4herap her3au
+h3erbi he1ro he8ro8b he4r3um her6z5er he4spe he1st heta6 het5am he5th
+heu3sc he1xa hey5e h1f2 h1g hgol8 h1h h1iat hie6r5i hi5kt hil1a2
+hil4fr hi5nak hin4ta hi2nu hi5ob hirn5e hir6ner hi1sp hi1th hi5tr
+5hitz h1j h6jo h1k2 hlabb4 hla4ga hla6gr h5lai hl8am h1las h1la\3
+\c{h1la\9} hl1c h1led h3lein h5ler.  h2lif h2lim h8linf hl5int h2lip
+h2lit h4lor h3lose \n{h1l"as} hme5e h2nee h2nei hn3eig h2nel hne8n
+hne4p3f hn8erz h6netz h2nip h2nit h1nol hn5sp h2nuc h2nud h2nul hoch1
+1hoh hoh8lei 2hoi ho4l3ar 1holz h2on ho1ra 6horg 5horn.  ho3sl hos1p
+ho4spi h1p hpi6 h1q 6hr h1rai h8rank h5raum hr1c hrcre8 h1red h3reg
+h8rei.  h4r3erb h8rert hrg2 h1ric hr5ins h2rom hr6t5erl hr2t1h hr6t5ra
+hr8tri h6rum hr1z hs3ach h6s5amt h1sc h6s5ec h6s5erl hs8erle h4sob
+h1sp h8spa\3 \c{h8spa\9} h8spel hs6po h4spun h1str h4s3tum hs3und
+\n{h1s"u} h5ta.  h5tab ht3ac ht1ak ht3ang h5tanz ht1ar ht1at h5taub
+h1te h2t1ec ht3eff ht3ehe h4t3eif h8teim h4t3ein ht3eis h6temp h8tentf
+hte8ren \n{h6terf"u} h8tergr h4t3erh h6t5ersc h8terst h8tese h8tess
+h2t1eu h4t3ex ht1he ht5hu h1ti ht5rak hts3ah ht1sc ht6sex ht8sk ht8so
+h1tu htz8 \n{h5t"um} hub5l hu6b5r huh1l h5uhr.  huld5a6 hu8lent
+\n{hu8l"a} h5up.  h1v h5weib h3weis h1z \n{h"a8kl} \n{h"al8s}
+\n{h"ama8tu8} \n{h"a8sche.} \n{h"at1s} \n{h"au4s3c} \n{2h"o.}
+\n{2h"oe} \n{8h"oi} \n{h"o6s} \n{h"os5c} \n{h"uhne6} \n{h"ul4s3t}
+\n{h"utte8re} i5adn i1af i5ak.  i1al.  i1al1a i1alb i1ald i5alei i1alf
+i1alg i3alh i1alk i1all i1alp i1alr i1als i1alt i1alv i5alw i3alz
+i1an.  ia5na i3and ian8e ia8ne8b i1ang i3ank i5ann i1ant i1anz i6apo
+i1ar.  ia6rab i5arr i1as.  i1asm i1ass i5ast.  i1at.  i5ats i1au i5azz
+i6b5eig i6b5eis ib2le i4blis i6brig i6b5unt \n{i6b"ub} i1che ich5ei
+i6cherb i1chi ich5ins ich1l ich3m ich1n i1cho icht5an icht3r i1chu
+ich1w ick6s5te ic5l i1d id3arm 3ideal ide8na 3ideol \n{ide5r"o} i6diot
+id5rec id1t ie1a ie6b5ar iebe4s3 ie2bl ieb1r ie8bra ie4bre \n{ie8b"a}
+ie2dr ie1e8 ie6f5ad ief5f ie2f1l ie4fro ief1t i1ei ie4l3ec ie8lei
+ie4lek i3ell i1en.  i1end ien6e i3enf i5enn ien6ne.  i1enp i1enr
+i5ensa ien8stal i5env i1enz ie5o ier3a4b ie4rap i2ere ie4rec ie6r5ein
+ie6r5eis ier8er i3ern.  ie8rum ie8rund ie6s5che ie6tau ie8tert ie5the
+ie6t5ri i1ett ie5un iex5 2if i1fa if5ang i6fau if1fr if5lac i5f6lie
+i1fre ift5a if6t5r ig3art 2ige i8gess ig5he i5gla ig2ni i5go ig3rot
+ig3s2p i1ha i8ham i8hans i1he i1hi ih1n ih1r i1hu i8hum ih1w 8i1i ii2s
+ii2t i1j i1k i6kak i8kerz i6kes ik4ler i6k5unt 2il i5lac i1lag il3ans
+i5las i1lau il6auf i1le ile8h i8lel il2fl il3ipp il6l5enn i1lo ilt8e
+i1lu \n{i1l"a} i8mart imb2 i8mele i8mid imme6l5a i1mu \n{i1m"a}
+\n{i5m"o} ina5he i1nat in1au inau8s 8ind.  in4d3an 5index ind2r 3indus
+i5nec i2n1ei i8nerw 3infek 1info 5ingeni ing5s6o 5inhab ini5er.  5inj
+\n{in8k"at} in8nan i1no inoi8d in3o4ku in5sau in1sp 5inspe 5instit
+5instru ins4ze 5intere 5interv in3the in5t2r i5ny \n{in"a2} \n{i1n"ar}
+\n{in1"as} \n{in"o8} \n{in5"od} \n{i1n"os} 2io io1a8 io1c iode4 io2di
+ioi8 i1ol.  i1om.  i1on.  i5onb ion2s1 i1ont i5ops i5o8pt i1or.
+i3oral io3rat i5orc i1os.  i1ot.  i1o8x 2ip i1pa i1pi i1p2l i1pr i1q
+i1ra ir6bl i1re i1ri ir8me8d ir2m1o2 ir8nak i1ro ir5rho ir6schl
+ir6sch5r i5rus i5ry \n{i5r"a} i1sa i8samt i6sar i2s1au i8scheh i8schei
+isch5m isch3r \n{isch"a8} is8ele ise3ra i4s3erh is3err isi6de i8sind
+is4kop ison5e is6por i8s5tum i5sty \n{i5s"o} i1ta it5ab.  i2t1a2m
+i8tax i1te i8tersc i1thi i1tho i5thr \n{it8h"a} i1ti i8ti8d iti6kl
+itmen4 i1to i8tof it3ran it3rau i1tri itri5o it1sc it2se it5spa it8tru
+i1tu it6z5erg it6z1w \n{i1t"a} \n{it"a6r5e} \n{it"at2} \n{it"ats5}
+\n{i1t"u} i1u iu6r 2i1v i6vad iva8tin i8vei i6v5ene i8verh i2vob i8vur
+i1w iwi2 i5xa i1xe i1z ize8n i8zir i6z5w \n{i"a8m} \n{i1"a6r}
+\n{i5"at.} \n{i5"av} \n{i1"o8} \n{i"u8} i6\35ers \c{i6\95ers} ja5la
+je2t3r 6jm 5jo jo5as jo1ra jou6l ju5cha jugen4 jugend5 jung5s6 ju1s
+\n{3j"a} 1ka 8kachs 8kakz ka1la kal5d kam5t ka1na 2kanl 8kapf ka6pl
+ka5r6a 6k3arbe ka1ro kar6p5f 4k3arti 8karz \n{ka1r"a} kasi5e ka6teb
+kat8ta kauf6s kau3t2 2k1b 2k1c 4k1d kehr6s kehrs5a 8keic 2k1eig 6k5ein
+6k5eis ke6lar ke8leis ke8lo 8kemp k5ente.  k3entf 8k5ents 6kentz ke1ra
+k5erlau 2k1f8 2k1g 2k1h ki5fl 8kik king6s5 6kinh ki5os ki5sp ki5th
+\n{8ki8"o} 2k1k2 kl8 1kla 8klac k5lager kle4br k3leib 3kleid kle5isc
+4k3leit k3lek 6k5ler.  5klet 2klic 8klig k2lim k2lin 5klip 5klop k3lor
+\n{1kl"a} 2k1m kmani5e kn8 6kner k2ni \n{kn"a8} 1k2o ko1a2 ko6de.
+ko1i koi8t ko6min ko1op ko1or ko6pht ko3ra kor6d5er ko5ru ko5t6sc k3ou
+3kow 6k5ox 2k1p2 k1q 1kr8 4k3rad 2k1rec 4k3reic kre5ie 2krib 6krig
+2krip 6kroba 2ks k1sa k6sab ksal8s k8samt k6san k1sc k2s1ex k5spat
+k5spe k8spil ks6por k1spr kst8 k2s1uf 2k1t kta8l kt5a6re k8tein kte8re
+k2t1h k8tinf kt3rec kt1s 1ku ku1ch kuck8 k3uhr ku5ie kum2s1 kunfts5
+kun2s kunst3 ku8rau ku4ro kurz1 ku1st 4kusti ku1ta ku8\3 \c{ku8\9}
+6k1v 2k1w ky5n 2k1z \n{1k"a} \n{k"a4m} \n{4k3"ami} \n{k"ase5} \n{1k"o}
+\n{k"o1c} \n{k"o1s} \n{1k"u} \n{k"u1c} \n{k"ur6sc} \n{k"u1s} 1la.
+8labf 8labh lab2r 2l1abs lach3r la8dr 5ladu 8ladv 6laff laf5t la2gn
+5laken 8lamb la6mer 5lampe.  2l1amt la1na 1land lan4d3a lan4d3r lan4gr
+8lanme 6lann 8lanw \n{6lan"a} 8lappa lap8pl lap6pr l8ar.  la5ra lar4af
+la8rag la8ran la6r5a6s l3arbe la8rei 6larm.  la8sa la1sc la8sta lat8i
+6l5atm 4lauss 4lauto 1law 2lb l8bab l8bauf l8bede l4b3ins l5blo
+lbst5an lbst3e 8lc l1che l8chert l1chi lch3m l5cho lch5w 6ld l4d3ei
+ld1re \n{l6d"ub} le2bl le8bre lecht6s5 led2r 6leff le4gas 1lehr lei6br
+le8inf 8leinn 5leistu 4lektr le6l5ers lemo2 8lemp l8en.  8lends
+6lendun le8nend len8erw 6l5ents 4l3entw 4lentz 8lenzy 8leoz 6lepi
+le6pip 8lepo 1ler l6er.  8lerbs 6l5erde le8reis le8rend le4r3er 4l3erg
+l8ergr 6lerkl 6l5erzie \n{8ler"o} 8lesel lesi5e le3sko le3tha let1s
+5leuc 4leuro leu4s3t le5xe 6lexp l1f 2l1g lgend8 l8gh lglie3 lglied6
+6l1h 1li li1ar li1as 2lick li8dr li1en lien6n li8ers li8ert 2lie\3
+\c{2lie\9} 3lig li8ga8b li1g6n li1l8a 8limb li1na 4l3indu lings5
+4l3inh 6linj link4s3 4linkt 2lint 8linv lion5s6t 4lipp 5lipt 4lisam
+livi5e 6l1j 6l1k l8keim l8kj lk2l lko8f lkor8 lk2sa lk2se 6ll l1la
+ll3a4be l8labt ll8anl ll1b ll1c ll1d6 l1le l4l3eim l6l5eise ller3a
+l4leti l5lip l1lo ll3ort ll5ov ll6spr llte8 l1lu ll3urg \n{l1l"a}
+\n{l5l"u} \n{l6l"ub} 2l1m l6m5o6d 6ln l1na l1no 8lobl lo6br 3loch.
+l5o4fen 5loge.  5lohn 4l3ohr 1lok l2on 4l3o4per lo1ra 2l1ord 6lorg
+4lort lo1ru 1los.  lo8sei 3losig lo6ve lowi5 6l1p lp2f l8pho l8pn
+lp4s3te l2pt l1q 8l1r 2ls l1sa l6sarm l1sc l8sec l6s5erg l4s3ers l8sh
+l5s6la l1sp ls4por ls2pu l1str l8suni \n{l1s"u} 2l1t lt5amp l4t3ein
+l5ten l6t5eng l6t5erp l4t3hei lt3her l2t1ho l6t5i6b lti1l \n{l8tr"o}
+lt1sc lt6ser lt4s3o lt5ums lu8br lu2dr lu1en8 8lu8fe luft3a luf8tr
+lu6g5r 2luh l1uhr lu5it 5luk 2l1umf 2l1umw 1lun 6l5u6nio 4l3unte lu5ol
+4lurg 6lurs l3urt lu4sto lu3str lu6st5re lu8su lu6tal lu6t5e6g lu8terg
+lu3the lu6t5or lu2t1r lu6\35 \c{lu6\95} l1v lve5r6u 2l1w 1ly lya6
+6lymp ly1no l8zess l8zo8f l3zwei lz5wu \n{3l"and} \n{l"a5on}
+\n{l"a6sc} \n{l"at1s} \n{5l"auf} \n{2l"aug} \n{l"au6s5c} \n{l"a5v}
+\n{l1"ol} \n{1l"os} \n{l"o1\36t} \n{\c{l"o1\96t}} \n{6l1"ube} 1ma
+8mabg ma5chan mad2 ma5el 4magg mag8n ma1la ma8lau mal5d 8malde mali5e
+malu8 ma8lut 2m1amp 3man mand2 man3ds 8mangr mani5o 8m5anst 6mappa
+4m3arbe mar8kr ma1r4o mar8schm 3mas ma1sc \n{ma1t"o} 4m5auf ma5yo 2m1b
+mb6r 2m1c 2m1d \n{md6s"a} 1me me1ch me5isc 5meld mel8sa 8memp me5nal
+men4dr men8schl men8schw 8mentsp me1ra mer4gl me1ro 3mes me6s5ei me1th
+me8\3 \c{me8\9} 2m1f6 2m1g 2m1h 1mi mi1a mi6ale mi1la 2m1imm mi1na
+\n{mi5n"u} mi4s3an mit1h mi5t6ra 3mitt mitta8 mi6\35 \c{mi6\95} 6mj
+2m1k8 2m1l 2m1m m6mad m6m5ak m8menth m8mentw mme6ra m2mn mm5sp mm5ums
+mmut5s \n{m8m"an} m1n8 m5ni 1mo mo5ar mo4dr 8mof mo8gal mo4kla mol5d
+m2on mon8do mo4n3od mont8a 6m5ony mopa6 mo1ra mor8d5a mo1sc mo1sp 5mot
+moy5 2mp m1pa mpfa6 mpf3l mphe6 m1pi mpin6 m1pl mp2li m2plu mpo8ste
+m1pr \n{mpr"a5} mp8th mput6 mpu5ts \n{m1p"o} 8m1q 2m1r 2ms ms5au m1sc
+msch4l ms6po m3spri m1str 2m1t mt1ar m8tein m2t1h mt6se \n{mt8s"a}
+mu5e 6m5uh mumi1 1mun mun6dr muse5e mu1ta 2m1v mvol2 mvoll3 2m1w 1my
+2m1z \n{m"a6kl} \n{1m"an} \n{m"a1s} \n{m"a5tr} \n{m"au4s3c} \n{3m"a\3}
+\n{\c{3m"a\9}} \n{m"ob2} \n{6m"ol} \n{1m"u} \n{5m"un} \n{3m"ut} 1na.
+n5ab.  8nabn n1abs n1abz \n{na6b"a} na2c nach3e 3nacht 1nae na5el
+n1afr 1nag 1n2ah na8ha na8ho 1nai 6nair na4kol n1akt nal1a 8naly 1nama
+na4mer na1mn n1amp 8n1amt 5nanc nan6ce n1and n6and.  2n1ang 1nani
+1nann n1ans 8nanw 5napf.  1n2ar.  na2ra 2n1arc n8ard 1nari n8ark
+6n1arm 5n6ars 2n1art n8arv 6natm nat6s5e 1naue 4nauf n3aug 5naui n5auk
+na5um 6nausb 6nauto 1nav 2nax 3naz 1na\3 \c{1na\9} n1b2 nbau5s n1c
+nche5e nch5m 2n1d nda8d n2d1ak nd5ans n2d1ei nde8lac ndel6sa n8derhi
+nde4se nde8stal n2dj ndnis5 n6d5or6t nd3rec nd3rot nd8samt nd6sau
+ndt1h n8dumd 1ne ne5as ne2bl 6n5ebn 2nec 5neei ne5en ne1g4l 2negy
+4n1ein 8neis 4n3e4lem 8nemb 2n1emp nen1a 6n5energ nen3k 8nentb
+4n3en3th 8nentl 8n5entn 8n5ents ne1ra ne5r8al ne8ras 8nerbi 6n5erde.
+nere5i6d nerfor6 \n{6n5erh"o} \n{8nerl"o} 2n1err n8ers.  6n5ertra
+2n1erz nesi3e net1h neu4ra neu5sc 8neu\3 \c{8neu\9} n1f nf5f nf2l
+nflei8 nf5lin nft8st n8g5ac ng5d ng8en nge8ram ngg2 ng1h n6glic ng3rip
+ng8ru ng2se4 ng2si n2g1um n1gy \n{n8g"al} n1h nhe6r5e 1ni ni1bl
+\n{ni5ch"a} ni8dee n6ie ni1en nie6s5te niet5h ni8etn 4n3i6gel n6ik
+ni1la 2n1imp ni5na 2n1ind 8ninf 6n5inh ni8nit 6n5inn 2n1ins 4n1int
+n6is ni3str ni1th ni1tr n1j n6ji n8kad nk5ans n1ke n8kerla n1ki nk5inh
+\n{n5kl"o} n1k2n n8k5not nk3rot \n{n8kr"u} nk5spo nk6t5r n8kuh
+\n{n6k"ub} n5l6 nli4mi n1m nmen4s n1na n8nerg nni5o n1no nn4t3ak nnt1h
+nnu1e n1ny \n{n1n"a} \n{n1n"o} \n{n1n"u} no5a no4b3la 4n3obs 2nobt
+noche8 no6die no4dis no8ia no5isc 6n5o6leu no4mal noni6er 2n1onk n1ony
+4n3o4per 6nopf 6nopti no3ra no4ram nor6da 4n1org 2n1ort n6os no1st
+8nost.  no8tan no8ter noty6pe 6n5ox n1p2 n1q n1r \n{nr"os3} 6ns n1sac
+ns3ang n1sc n8self n8s5erf n8serg n6serk ns5erw n8sint n1s2pe n1spr
+n6s5tat.  n5s6te.  n6stob n1str n1ta n4t3a4go nt5anh nt3ark nt3art
+n1te nt3eis nte5n6ar nte8nei nter3a nte6rei nt1ha nt6har n3ther nt5hie
+n3thus n1ti nti1c n8tinh nti1t ntlo6b ntmen8 n1to nt3o4ti n1tr ntra5f
+ntra5ut nt8rea nt3rec nt8rep n4t3rin nt8rop n4t3rot \n{n4tr"u} nt1s
+nts6an nt2sk n1tu nt1z \n{n1t"a} \n{n1t"o} \n{n8t"ol} \n{n1t"u} 1nu
+nu1a nu5el nu5en 4n1uhr nu5ie 8numl 6n5ums 6n5umw 2n1und 6nuni 6n5unr
+2n1unt 2nup 2nu6r n5uri nu3skr nu5ta n1v 8n1w 1nys n1za n6zab n2z1ar
+n6zaus nzi4ga n8zof n6z5unt n1zw n6zwir \n{1n"ac} \n{5n"ae} \n{5n"ai}
+\n{n8"al} \n{n"a6m} \n{n"a6re} \n{n5"arz} \n{5n"aus} \n{n1"ol}
+\n{1n"ot} \n{n5"oz} \n{5n"u.} \n{6n1"u2b} \n{5n"u\3} \n{\c{5n"u\9}}
+o5ab.  oa2l o8ala o1a2m o1an ob1ac obe4ra o6berh 5o4bers o4beru
+obe6ser 1obj o1bl o2bli ob5sk 3obst.  ob8sta obst5re ob5sz o1che
+oche8b o8chec o3chi och1l och3m ocho8f o3chro och3to o3chu och1w o1d
+o2d1ag od2dr ode5i ode6n5e od1tr o5e6b o5e6der.  oe8du o1ef o1e2l
+o1e2p o1er.  o5e8x o1fa of8fan 1offi of8fin of6f5la o5fla o1fr 8o1g
+og2n o1ha o1he o6h5eis o1hi ohl1a oh1le oh4l3er 5ohm.  oh2ni o1ho
+oh1re oh1ru o1hu oh1w o1hy \n{o1h"a} o5ia o1id.  o8idi oi8dr o5ids
+o5isch.  oiset6 o1ism o3ist.  o5i6tu o1j o1k ok2l ok3lau \n{o8kl"a}
+1okta o1la old5am old5r o1le ole5in ole1r ole3u ol6gl ol2kl olk4s1
+ol8lak ol8lauf.  ol6lel ol8less o1lo ol1s ol6sk o1lu oly1e2 5olym
+o2mab om6an o8mau ombe4 o8merz om5sp o1mu o8munt \n{o1m"a} \n{o1m"o}
+o1na ona8m on1ax on8ent o6n5erb 8oni oni5er.  on1k on6n5a6b o1no ono1c
+o4nokt 1ons onts8 \n{o1n"a} oo8f 1oog oo2pe oo2sa o1pa 3o4pera o3pfli
+opf3lo opf3r o1pi o1pl o2pli o5p6n op8pa op6pl o1pr o3p4ter 1opti
+\n{o1p"a} \n{o5p"o} o1q o1ra.  o3rad o8radd 1oram o6rang o5ras o8rauf
+or5cha or4d3a4m or8dei or8deu 1ordn or4dos o1re o5re.  ore2h o8r5ein
+ore5isc or6enn or8fla or8fli 1orga 5orgel.  or2gl o1ri 5o6rient or8nan
+\n{or8n"a} o1ro or1r2h or6t5an or8tau or8tere o1rus o1ry \n{o1r"a}
+\n{or1"u2} o1sa osa3i 6ose o8serk o1sk o6ske o6ski os2kl os2ko os2kr
+osni5e o2s1o2d o3s4per o4stam o6stau o3stra ost3re osu6 o6s5ur o5s6ze
+o1ta ot3auf o6taus o1te o6terw o1th othe5u o2th1r o1ti o1to oto1a
+ot1re o1tri o1tro ot1sc o3tsu ot6t5erg ot2t3h ot2t5r \n{ot8t"o} o1tu
+ou3e ouf1 ou5f6l o5u6gr ou5ie ou6rar ou1t6a o1v o1wa o1we o6wer.  o1wi
+owid6 o1wo o5wu o1xe oy5al.  oy1e oy1i o5yo o1z oza2r 1o2zea ozo3is
+\n{o"o8} o\35elt \c{o\95elt} o\31t \c{o\91t} 3paa pa6ce 5pad pag2 1pak
+pa1la pa8na8t pani5el pa4nor pan1s2 1pap pap8s pa8rei par8kr paro8n
+par5o6ti part8e 5partei 3partn pas6sep pa4tha 1pau 6paug pau3sc p1b
+8p5c 4p1d 1pe 4peic pe5isc 2pek pen3k pen8to8 p8er pe1ra pere6 per5ea
+per5eb pe4rem 2perr per8ran 3pers 4persi \n{pe3r"u} pe4sta pet2s
+p2f1ec p4fei pf1f pf2l 5pflanz pf8leg pf3lei 2pft pf3ta p1g 1ph 2ph.
+2p1haf 6phb 8phd 6p5heit ph5eme 6phg phi6e 8phk 6phn p5holl pht2
+ph3tha 4ph3the phu6 6phz pi1en pi5err pi1la pi1na 5pinse pioni8e 1pis
+pi1s2k pi1th p1k pl8 5pla p2lau 4plei p3lein 2pler 6p5les 2plig p6lik
+6p5ling p2liz plo8min 6p1m p1n 1p2o 8poh 5pol po8lan poly1 po3ny po1ra
+2porn por4t3h \n{po5r"o} 5poti p1pa p6p5ei ppe6la pp5f p2p1h p1pi pp1l
+ppp6 pp5ren pp1s \n{p5p"o} pr6 3preis 1pres 2p3rig 5prinz 1prob 1prod
+5prog pro8pt pro6t5a prote5i 8pro\3 \c{8pro\9} \n{pr"a3l} \n{1pr"as}
+\n{pr"ate4} \n{1pr"uf} p5schl 2pst 1p2sy p1t p8to8d pt1s 5p6ty 1pu
+pu1b2 2puc pu2dr puf8fr 6p5uh pun8s pu8rei pu5s6h pu1ta p1v p3w 5py
+py5l p1z \n{p"a6der} \n{p5"a6m} \n{p"a8nu} \n{8p"ar} \n{p"at5h}
+\n{p"at1s} qu6 1qui 8rabk ra6bla 3rable ra2br r1abt 6rabz ra4dan ra2dr
+5rafal ra4f3er ra5gla ra2g3n 6raha ral5am 5rald 4ralg ra8lins 2rall
+ral5t 8ramei r3anal r6and ran8der ran4dr 8ranf 6ranga 5rangi ran8gli
+r3angr rans5pa 8ranw r8anz.  ra5or 6rapf ra5pl rap6s5er 2r1arb 1rarh
+r1arm ra5ro 2r1art 6r1arz ra8tei ra6t5he 6ratl ra4t3ro r5atta raue4n
+6raus.  r5austa rau8tel raut5s ray1 r1b rb5lass r6bler rb4lie rbon6n
+r8brecht \n{rb6s5t"a} r8ces r1che rch1l rch3m rch3re rch3tr rch1w 8rd
+r1da r8dachs r8dap rda5ro rde5ins rdio5 r8dir rd3ost r1dr r8drau 1re.
+re1ak 3reakt re3als re6am.  re1as 4reben re6bl rech5a r8edi re3er
+8reff 3refl 2reh 5reha r4ei.  reich6s5 8reier 6reign re5imp 4r3eina
+6r3einb 6reing 6r5einn 6reinr 4r3eins r3eint reli3e 8r5elt 6rempf
+2remt ren5a6b ren8gl r3enni 1reno 5rente 4r3enth 8rentl 4r3entw 8rentz
+ren4zw re1on requi5 1rer rer4bl 6rerbs 4r3erd \n{8rerh"o} 8rerkl
+4r3erla \n{8rerl"o} 4r3erns \n{6r5ern"a} rer5o 6r5erreg r5ertr r5erwec
+\n{r5er"o} re2sa re8schm 2ress re5u8ni 6rewo 2r1ex r1f r8ferd rf4lie
+8r1g r8gah rge4bl rge5na rgest4 rg6ne r2gni2 r8gob r4g3ret rg8sel r1h8
+r2hy 5rhyt ri1ar ri5cha rid2g r2ie rieg4s5 ri8ei ri1el ri6ele ri1en
+ri3er.  ri5ers.  ri6fan ri8fer ri8fr 1r2ig ri8kn ri5la \n{rim"a8}
+ri1na r8inde rin4ga rin6gr 1rinn 6rinner rino1 r8insp 4rinst
+\n{ri1n"a} ri5o6ch ri1o2d ri3o6st 2r1ir r2is ri3sko ri8spr \n{ri8st"u}
+ri5sv r2it 6r5i6tal ri5tr ri6ve.  8r1j 6rk r1ke rkehrs5 r1ki r3klin
+r1k2n rk3str rk4t3an rk6to r6kuh \n{rk"a4s3t} r1l r5li rline5a 6r1m
+r6manl rma4p r4m3aph r8minf r8mob rm5sa 2rn r1na rna8be r5ne rn2ei
+r6neif r6nex r6nh rn1k r1no r6n5oc rn1sp \n{r1n"a} \n{r1n"u} ro6bern
+6robs ro1ch 3rock.  ro5de ro1e 4rofe ro8hert 1rohr ro5id ro1in ro5isc
+6rolym r2on 6roog ro6phan r3ort ro1s2p ro5s6w ro4tau ro1tr ro6ts 5rout
+r1p rpe8re rp2f r2ps r2pt r1q 2rr r1ra r1re rrer6 rr6hos \n{r5rh"o}
+r1ri r1ro rro8f rr8or rror5a r1ru r3ry \n{r1r"a} \n{r1r"o} \n{r1r"u}
+2r1s r6sab r4sanf rse6e rse5na r2sh r6ska r6ski rs2kl r8sko r2sl rs2p
+r6stauf r8sterw r8stran rswi3d4 r2sz 2r1t rt3art r8taut r5tei rt5eige
+r8tepe r4t3erh r8terla r4t3hei r5t6hu r4t3int rt5reif rt1sc rt6ser
+rt6s5o rt6s5u rt5und r8turt rube6 ru1en 1r4uf ruf4st ru1ie 2r1umg
+2r1uml 2rums run8der run4d5r 6rundz 6runf 8runs 2r1unt 2r1ur r6us
+ru6sta ru3str ru6tr 1ruts r1v rven1 rvi2c r1w r1x r1za rz5ac r6z5al
+r8z1ar r8zerd r6z5erf rz8erh rz4t3h r8zum \n{r"a4ste} \n{r"au8sc}
+\n{r1"of} \n{5r"ohr} \n{r"o5le} \n{3r"oll} \n{5r"omis} \n{r1"or}
+\n{r"o2sc} \n{3r"ump} 1sa.  1saa s3a4ben sa2bl 2s1abs 6s1abt 6sabw
+3sack.  6s3a4der 1saf sa1fa 4s1aff sa5fr 1sag 1sai sa1i2k1 4s1akt 1sal
+sa1la 4s3alpi 6salter salz3a 1sam s5anb san2c 1sand s5angeh 6sanl
+2s1ans 6s3antr 8s1anw s1ap s6aph 8sapo sap5p6 s8ar.  2s1arb 3sarg
+s1arm sa5ro 2s1art 6s1arz 1sas 1sat sat8a 2s1atl sa8tom 3s8aue s5auff
+sau5i s6aur 2s1aus 5s6ause 2s1b2 2sca s4ce 8sch.  3scha.  5schade
+3schaf 3schal sch5ame 8schanc 8schb 1sche 6schef 8schex 2schf 2schg
+2schh 1schi 2schk 5schlag 5schlu \n{6schm"a\3} \n{\c{6schm"a\9}}
+6schna\3 \c{6schna\9} 1scho 6schord 6schp 3schri 8schric 8schrig
+8schrou 6schs 2scht sch3ta sch3tr 1schu 8schunt 6schv 2schz \n{5sch"o}
+\n{5sch"u} 2sco scre6 6scu 2s1d 1se se5an se1ap se6ben se5ec see5i6g
+se3erl 8seff se6han se8hi \n{se8h"o} 6s5eid.  2s1eig s8eil 5sein.
+sei5n6e 6s5einh 3s8eit 3sel.  se4lar selb4 6s3e4lem se8lerl 2s1emp
+sen3ac se5nec 6s5ents 4sentz s8er.  se8reim ser5inn \n{8serm"a}
+8s5erzi \n{6ser"of} se1um 8sexa 6sexp 2s1f2 sfal8ler 2s3g2 sge5b2 s1h
+s8hew 5s6hip 5s4hop 1si 2siat si1b sicht6s 6s5i6dee siege6s5 si1en
+si5err si1f2 si1g2n si6g5r si8kau sik1i si4kin si2kl \n{si8k"u} si1la
+sil6br si1na 2s1inf sin5gh 2s1inh sinne6s5 2s1ins si5ru si5str 4s1j
+s1k2 6sk.  2skau skel6c skelch5 s6kele 1s2ki.  3s4kin.  s6kiz s8kj
+6skn 2skow 3skrib 3skrip 2sku \n{8sk"u} s1l s8lal slei3t s4low 2s1m
+s1n 6sna 6snot 1so so1ch 2s1odo so4dor 6s5o4fen solo3 s2on so5of 4sope
+so1ra 2s1ord 4sorga sou5c so3un 4s3ox sp2 8spaa 5spal 1span 2spap
+s2pec s4peis 1spek s6perg 4spers s6pes 2s1pf 8sphi \n{1s2ph"a} 1spi
+spi4e 6s5pig 6spinse 2spis 2spla 2spol 5s6pom 6s5pos 6spoti 1spra
+3s8prec 6spreis 5spring 6sprob 1spru s2pul 1s2pur 6spy \n{5sp"an}
+\n{1sp"u} s1q 2s1r 2s1s2 sse8nu ssini6s ssoi6r 2st.  1sta 4stafe 2stag
+sta3la 6stale 4stalg 8stalk 8stamt 6st5anf 4stans 6stanw 6starb sta4te
+6staus 2stb 6stc 6std 1ste 4steil 3s2tel st3elb 8stemb 6steppi 8stese
+8stesse 6stf 2stg 2sth st1ha st3hei s8t1hi st1ho st5hu 1sti sti4el
+4stigm sti3na 6stind 4stinf sti8r 2stk 2stl 2stm 1sto 6stoll.  4st3ope
+6stopf.  6stord 6stp 5stra.  4strai 3s4tral 6s5traum 3stra\3
+\c{3stra\9} 3strec 6s3tref 8streib 5streif 6streno 6stres 6strev
+5s6tria 6strig 5strik 8strisi 3s4troa s8troma st5rose 4struf 3strum
+\n{6str"ag} 2st1s6 2stt 1stu stu5a 4stuc 2stue 8stun.  2stv 2stw s2tyl
+6stz \n{1st"a} \n{8st"ag} \n{1st"o} \n{1st"u} \n{8st"uch} \n{4st"ur.}
+1su su2b1 3suc su1e su2fe su8mar 6sumfa 8sumk 2s1unt sup1p2 6s5u6ran
+6surte 2s1v 2s1w 1sy 8syl.  sy5la syn1 sy2na syne4 s1z s4zend 5s6zene.
+8szu \n{1s"a} \n{6s5"and} \n{6s"augi} \n{6s"au\3} \n{\c{6s"au\9}}
+\n{5s"om} \n{2s1"u2b} \n{1s"uc} \n{s"u8di} \n{1s"un} \n{5s"u\3}
+\n{\c{5s"u\9}} taats3 4tab.  taba6k ta8ban tab2l ta6bre 4tabs t3absc
+8tabz 6t3acht ta6der 6tadr tad6s tad2t 1tafe4 1tag ta6ga6 ta8gei
+tage4s tag6s5t tah8 tahl3 tai6ne.  ta5ir.  tak8ta tal3au 1tale ta8leng
+tal5ert 6t5a6mer 6tamp tampe6 2t1amt tan5d6a tan8dr tands5a tani5e
+6tanl 2tanr t3ans 8t5antr tanu6 t5anw 8tanwa tan8zw ta8rau 6tarbe
+1tari 2tark 2t1arm ta1ro 2tart t3arti 6tarz ta1sc ta6sien ta8stem
+ta8sto t5aufb 4taufn 8taus.  5tause 8tausf 6tausg t5ausl 2t1b2 2t1c
+t6chu 2t1d te2am tea4s te8ben 5techn 4teff te4g3re te6hau 2tehe te4hel
+2t1ehr te5id.  teig5l 6teign tei8gr 1teil 4teinh t5einhe 4teis t5eisen
+8teiw te8lam te4lar 4telek 8telem te6man te6n5ag ten8erw ten5k tens4p
+ten8tro 4t3entw 8tentz te6pli 5teppi ter5a6b te3ral ter5au 8terbar
+t5erbe.  6terben 8terbs 4t3erbt t5erde.  ter5ebe ter5ein te8rers terf4
+\n{8terh"o} \n{6terkl"a} ter8nor ter6re.  t8erscha t5e6sel te8stau
+t3euro te1xa tex3e 8texp tex6ta 2t1f2 2t1g2 2th.  th6a 5tha.  2thaa
+6t1hab 6t5haf t5hah 8thak 3thal.  6thals 6t3hand 2t1hau 1the.  3t4hea
+t1heb t5heil t3heit t3helf 1theo 5therap 5therf 6t5herz 1thes 1thet
+5thi.  2t1hil t3him 8thir 3this t5hj 2th1l 2th1m th1n t5hob t5hof
+4tholz 6thopti 1thr6 4ths t1hum 1thy \n{4t1h"a} \n{2t1h"o} \n{t1h"u}
+ti1a2m ti1b tie6fer ti1en ti8gerz tig3l ti8kin ti5lat 1tilg t1ind
+tin4k3l ti3spa ti5str 5tite ti5tr ti8vel ti8vr 2t1j 2t1k2 2t1l tl8a
+2t1m8 2t1n 3tobe 8tobj to3cha 5tocht 8tock tode4 to8del to8du to1e
+6t5o6fen to1in toi6r 5toll.  to8mene t2ons 2t1ony to4per 5topf.  6topt
+to1ra to1s to6ska tos2l 2toti to1tr t8ou 2t1p2 6t1q tr6 tra5cha
+tra8far traf5t 1trag tra6gl tra6gr t3rahm 1trai t6rans tra3sc tra6st
+3traue t4re.  2trec t3rech t8reck 6t1red t8ree 4t1reg 3treib 4treif
+8t3reis 8trepo tre6t5r t3rev 4t3rez 1trib t6rick tri6er 2trig t8rink
+tri6o5d trizi5 tro1a 3troc trocke6 troi8d tro8man.  tro3ny 5tropf
+6t5rosa t5ro\3 \c{t5ro\9} 5trub 5trup trut5 \n{1tr"ag} \n{6t1r"oh}
+\n{5tr"ub} \n{tr"u3bu} \n{t1r"uc} \n{t1r"us} 2ts ts1ab t1sac tsa8d
+ts1ak t6s5alt ts1an ts1ar ts3auf t3schr \n{t5sch"a} tse6e tsee5i
+tsein6s ts3ent ts1er t8serf t4serk t8sh 5t6sik t4s3int ts5ort.
+t5s6por t6sprei t1st t6s5tanz ts1th t6stit t4s3tor 1t2sua t2s1uf
+t8sum.  t2s1u8n t2s1ur 2t1t tt5eif tte6sa tt1ha tt8ret tt1sc tt8ser
+tt5s6z 1tuc tuch5a 1tu1e 6tuh t5uhr tu1i tu6it 1tumh 6t5umr 1tums
+8tumt 6tund 6tunf 2t1unt tu5ra tu6rau tu6re.  tu4r3er 2t1v 2t1w 1ty1
+ty6a ty8la 8tym 6ty6o 2tz tz5al tz1an tz1ar t8zec tzeh6 tzehn5 t6z5ei.
+t6zor t4z3um \n{t6z"au} \n{5t"ag} \n{6t"ah} \n{t5"alt} \n{t8"an}
+\n{t"are8} \n{8t"a8st} \n{6t"au\3} \n{\c{6t"au\9}} \n{t5"offen}
+\n{8t"o8k} \n{1t"on} \n{4t"ub} \n{t6"u5ber.} \n{5t"uch} \n{1t"ur.}
+u3al.  u5alb u5alf u3alh u5alk u3alp u3an.  ua5na u3and u5ans u5ar.
+ua6th u1au ua1y u2bab ubi5er.  u6b5rit ubs2k \n{u5b"o} \n{u8b"ub} 2uc
+u1che u6ch5ec u1chi uch1l uch3m uch5n uch1r uch5to ucht5re u1chu uch1w
+uck1a uck5in u1d ud4a u1ei u6ela uene8 u6ep u1er uer1a ue8rerl uer5o
+u8esc u2est u8ev u1fa u2f1ei u4f3ent u8ferh uf1fr uf1l uf1ra uf1re
+\n{uf1r"a} \n{uf1r"u} uf1s2p uf1st uft1s u8gabt u8gad u6gap ugeb8 u8gn
+ugo3s4 u1ha u1he u1hi uh1le u1ho uh1re u1hu uh1w \n{u1h"a} \n{u1h"o}
+6ui ui5en u1ig u3ins uin8tes u5isch.  u1j 6uk u1ke u1ki u1kl u8klu
+u1k6n u5ky u1la uld8se u1le ul8lac ul6lau ul6le6l ul6lo ulni8 u1lo
+ulo6i ult6a ult8e u1lu ul2vr \n{u1l"a} \n{u1l"o} 3umfan 5umlau umo8f
+um8pho u1mu umu8s \n{u5m"o} u1n1a un2al un6at unau2 6und.  5undein
+un4d3um 3undzw \n{und"u8} \n{un8d"ub} une2b un1ec une2h un3eis 3unfal
+\n{1unf"a} 5ungea \n{3ungl"u} ung2s1 \n{un8g"a} 1u2nif un4it un8kro
+unk5s u1no unpa2 uns2p unvol4 unvoll5 u5os.  u1pa u1pi u1p2l u1pr
+up4s3t up2t1a u1q u1ra ur5abs ura8d ur5ah u6rak ur3alt u6rana u6r5ans
+u8rap ur5a6ri u8ratt u1re ur3eig ur8gri u1ri ur5ins 3urlau urmen6
+ur8nan u1ro 3ursac ur8sau ur8sei ur4sk 3urtei u1ru uru5i6 uru6r u1ry
+ur2za \n{ur6z"a} \n{ur5"a6m} \n{u5r"o} \n{u1r"u} \n{ur"uck3} u1sa
+usa4gi u2s1ar u2s1au u8schec usch5wi u2s1ei use8kel u8sl u4st3a4b
+us3tau u3s4ter u2s1uf u8surn ut1ac u1tal uta8m u1tan ut1ar u1tas ut1au
+u1te u8teic u4tent u8terf u6terin u4t3hei ut5ho ut1hu u1ti utine5
+uti6q u1to uto5c u1tr ut1sa ut1s6p ut6stro u1tu utz5w u1u u1v uve5n
+\n{uve3r4"a} u1w u1xe u5ya uy5e6 u1yi u2z1eh u8zerh \n{u5"o} u\3e6n
+\c{u\9e6n} u\3en5e \c{u\9en5e} 8vanb 6vang 6varb var8d va6t5a va8tei
+va2t1r 2v1b 6v5c 6vd 1ve 6ve5g6 ver1 ver5b verb8l ve2re2 verg8 ve2ru8
+ve1s ve2s3p ve3xe 2v1f 2v1g 6v5h vi6el vie6w5 vi1g4 vi8leh vil6le.
+8vint vi1ru vi1tr 2v1k 2v1l 2v1m 4v5n 8vo8f voi6le vol8lend vol8li
+v2or1 vo2re vo8rin vo2ro 2v1p 8vra v6re 2v1s 2v1t 2v1v 4v3w 2v1z
+waffe8 wa6g5n 1wah wah8n wa5la wal8din wal6ta wan4dr 5ware wa8ru
+war4za 1was w5c w1d 5wech we6fl 1weg we8geng weg5h weg3l we2g1r
+weh6r5er 5weise weit3r wel2t welt3r we6rat 8werc 5werdu wer4fl 5werk.
+wer4ka wer8ku wer4ta wer8term we2sp we8stend we6steu we8str
+\n{we8st"o} wet8ta wich6s5t 1wid wi2dr wiede4 wieder5 wik6 wim6ma
+win4d3r 5wirt wisch5l 1wj 6wk 2w1l 8w1n wo1c woche6 wol6f wor6t5r 6ws2
+w1sk 6w5t 5wunde.  wun6gr wu1sc wu2t1 6w5w wy5a \n{w"arme5} \n{w"a1sc}
+1xag x1ak x3a4men 8xamt x1an 8x1b x1c 1xe.  x3e4g 1xen xe1ro x1erz
+1xes 8xf x1g 8x1h 1xi 8xid xi8so 4xiste x1k 6x1l x1m 8xn 1xo 8x5o6d
+8x3p2 x1r x1s6 8x1t x6tak x8terf x2t1h 1xu xu1e x5ul 6x3w x1z 5ya.
+y5an.  y5ank y1b y1c y6cha y4chia y1d yen6n y5ern y1g y5h y5in y1j
+y1k2 y1lak yl1al yla8m y5lax y1le y1lo y5lu y8mn ym1p2 y3mu y1na yno2d
+yn1t y1on.  y1o4p y5ou ypo1 y1pr y8ps y1r yri3e yr1r2 y1s ys5iat ys8ty
+y1t y3w y1z \n{y"a8m} z5a6b zab5l 8za6d 1zah za5is 4z3ak 6z1am 5zange.
+8zanl 2z1ara 6z5as z5auf 3zaun 2z1b 6z1c 6z1d 1ze ze4dik 4z3eff 8zein
+zei4ta zei8ters ze6la ze8lec zel8th 4zemp 6z5engel zen8zin \n{8zerg"a}
+zer8i ze1ro zers8 zerta8 zer8tab zer8tag 8zerz ze8ste zeu6gr 2z1ex
+2z1f8 z1g 4z1h 1zi zi1en zi5es.  4z3imp zi1na 6z5inf 6z5inni zin6s5er
+8zinsuf zist5r zi5th zi1tr 6z1j 2z1k 2z1l 2z1m 6z1n 1zo zo6gl 4z3oh
+zo1on zor6na8 4z1p z5q 6z1r 2z1s8 2z1t z4t3end z4t3hei z8thi 1zu zu3al
+zu1b4 zu1f2 6z5uhr zun2a 8zunem zunf8 8zungl zu1o zup8fi zu1s8 zu1z
+2z1v zw8 z1wal 5zweck zwei3s z1wel z1wer z6werg 8z5wes 1zwi zwi1s
+6z1wo 1zy 2z1z zz8a zzi1s \n{1z"a} \n{1z"o} \n{6z"ol.} \n{z"o1le}
+\n{1z"u} \n{2z1"u2b} \n{"a1a6} \n{"ab1l} \n{"a1che} \n{"a3chi}
+\n{"ach8sc} \n{"ach8sp} \n{"a5chu} \n{"ack5a} \n{"ad1a} \n{"ad5era}
+\n{"a6d5ia} \n{"a1e} \n{"a5fa} \n{"af1l} \n{"aft6s} \n{"ag1h}
+\n{"ag3le} \n{"a6g5nan} \n{"ag5str} \n{"a1he} \n{"a1hi} \n{"ah1le}
+\n{"ah5ne} \n{1"ahnl} \n{"ah1re} \n{"ah5ri} \n{"ah1ru} \n{"a1hu}
+\n{"ah1w} \n{6"ai} \n{"a1isc} \n{"a6ische} \n{"a5ism} \n{"a5j}
+\n{"a1k} \n{"al1c} \n{"a1le} \n{"a8lei} \n{"al6schl} \n{"ami1e}
+\n{"am8n} \n{"am8s} \n{"a5na} \n{5"anderu} \n{"ane5i8} \n{"ang3l}
+\n{"ank5l} \n{"a1no} \n{"an6s5c} \n{"a1pa} \n{"ap6s5c} \n{3"aq}
+\n{"ar1c} \n{"a1re} \n{"are8m} \n{5"argern} \n{"ar6gl} \n{"a1ri}
+\n{3"armel} \n{"a1ro} \n{"art6s5} \n{"a1ru} \n{3"arztl} \n{"a5r"o}
+\n{"a6s5chen} \n{"asen8s} \n{"as1th} \n{"ata8b} \n{"a1te} \n{"ateri4}
+\n{"ater5it} \n{"a6thy} \n{"a1ti} \n{3"atk} \n{"a1to} \n{"at8schl}
+\n{"ats1p} \n{"a5tu} \n{"aub1l} \n{"au1e} \n{1"aug} \n{"au8ga}
+\n{"au5i} \n{"a1um.} \n{"a1us.} \n{1"au\3} \n{\c{1"au\9}} \n{"a1z}
+\n{"o1b} \n{"o1che} \n{"o5chi} \n{"och8stei} \n{"och8str} \n{"ocht6}
+\n{5"o6dem} \n{5"offn} \n{"o1he} \n{"oh1l8} \n{"oh1re} \n{"o1hu}
+\n{"o1is} \n{"o1ke} \n{1"o2ko} \n{1"ol.} \n{"ol6k5l} \n{"ol8pl}
+\n{"o1mu} \n{"o5na} \n{"onig6s3} \n{"o1no} \n{"o5o6t} \n{"opf3l}
+\n{"op6s5c} \n{"o1re} \n{"or8gli} \n{"o1ri} \n{"or8tr} \n{"o1ru}
+\n{5"osterr} \n{"o1te} \n{"o5th} \n{"o1ti} \n{"o1tu} \n{"o1v} \n{"o1w}
+\n{"owe8} \n{"o2z} \n{"ub6e2} \n{3"u4ber1} \n{"ub1l} \n{"ub1r}
+\n{5"u2bu} \n{"u1che} \n{"u1chi} \n{"u8ch3l} \n{"uch6s5c} \n{"u8ck}
+\n{"uck1a} \n{"uck5ers} \n{"ud1a2} \n{"u6deu} \n{"udi8t} \n{"u2d1o4}
+\n{"ud5s6} \n{"uge4l5a} \n{"ug1l} \n{"uh5a} \n{"u1he} \n{"u8heh}
+\n{"u6h5erk} \n{"uh1le} \n{"uh1re} \n{"uh1ru} \n{"u1hu} \n{"uh1w}
+\n{"u3k} \n{"u1le} \n{"ul4l5a} \n{"ul8lo} \n{"ul4ps} \n{"ul6s5c}
+\n{"u1lu} \n{"un8da} \n{"un8fei} \n{"unk5l} \n{"un8za} \n{"un6zw}
+\n{"u5pi} \n{"u1re} \n{"u8rei} \n{"ur8fl} \n{"ur8fr} \n{"ur8geng}
+\n{"u1ri} \n{"u1ro} \n{"ur8sta} \n{"ur8ster} \n{"u1ru} \n{"use8n}
+\n{"u8sta} \n{"u8stes} \n{"u6s5tete} \n{"u3ta} \n{"u1te} \n{"u1ti}
+\n{"ut8tr} \n{"u1tu} \n{"ut8zei} \n{"u1v} \31a8 \c{\91a8} 5\3a.
+\c{5\9a.} \38as \c{\98as} \31b8 \c{\91b8} \31c \c{\91c} \31d \c{\91d}
+1\3e \c{1\9e} \35ec \c{\95ec} 8\3e8g \c{8\9e8g} 8\3e8h \c{8\9e8h}
+2\31ei \c{2\91ei} 8\3em \c{8\9em} \31f8 \c{\91f8} \31g \c{\91g} \31h
+\c{\91h} 1\3i \c{1\9i} \31k \c{\91k} \31l \c{\91l} \31m \c{\91m}
+\3mana8 \c{\9mana8} \31n \c{\91n} \31o \c{\91o} \31p8 \c{\91p8} \35q
+\c{\95q} \31r \c{\91r} \31s2 \c{\91s2} \3st8 \c{\9st8} \31ta \c{\91ta}
+\31te \c{\91te} \3t3hei \c{\9t3hei} \31ti \c{\91ti} \35to \c{\95to}
+\31tr \c{\91tr} 1\3u8 \c{1\9u8} 6\35um \c{6\95um} \31v \c{\91v} \31w
+\c{\91w} \31z \c{\91z}
+}%
+\endgroup
+\relax\endinput
+%
+% -----------------------------------------------------------------
+%
+% =============== Additional Documentation ===============
+%
+%
+% Older Versions of German Hyphenation Patterns:
+% ----------------------------------------------
+%
+% All older versions of `ghyphen.tex' distributed as
+%
+%       ghyphen.tex/germhyph.tex   as of 1986/11/01
+%       ghyphen.min/ghyphen.max    as of 1988/10/10
+%       ghyphen3.tex               as of 1990/09/27 & 1991/02/13
+%       ghyph31.tex                as of 1994/02/13
+%
+% are out of date and it is recommended to replace them
+% with the new version `dehypht.tex' as of 1999/03/03.
+%
+% If you are using `ghyphen.min' (a minor version of `ghyphen')
+% because of limited trie memory space, try this version and if
+% the space is exceeded get a newer TeX implementation with
+% larger or configurable trie memory sizes.
+%
+%
+%
+% Trie Memory Requirements/Space for Hyphenation Patterns:
+% --------------------------------------------------------
+%
+% To load this set of german hyphenation patterns the parameters
+% of TeX has to have at least these values:
+%
+% TeX 3.x:
+%    IniTeX:    trie_size >= 9733    trie_op_size >= 207
+%    VirTeX:    trie_size >= 8375    trie_op_size >= 207
+%
+% TeX 2.x:
+%    IniTeX:    trie_size >= 8675    trie_op_size >= 198
+%    VirTeX:    trie_size >= 7560    trie_op_size >= 198
+%
+% If you want to load more than one set of hyphenation patterns
+% (in TeX 3.x), the parameters have to be set to a value larger
+% than or equal to the sum of all required values for each set.
+%
+%
+% Setting Trie Memory Parameters:
+% -------------------------------
+%
+% Some implementations allow the user to change the default value
+% of a set of the internal TeX parameters including the trie memory
+% size parameter specifying the used memory for the hyphenation
+% patterns.
+% 
+% Web2c 7.x (Source), teTeX 0.9 (Unix, Amiga), fpTeX (Win32)
+% and newer:
+%   The used memory size of the true is usually set high enough.
+%   If needed set the size of the trie using the keyword `trie_size'
+%   in the configuration file `texmf/web2c/texmf.cnf'.  For details
+%   see the included documentation.
+%
+% emTeX (OS/2, MS-DOS, Windows 3.x/9x/NT):
+%   You can set the used memory size of the trie using the
+%   `-mt<number>' option on the command line or in the
+%   TEXOPTIONS environment variable.
+%
+% PasTeX (Amiga):
+%   The values for the parameters can be set using the keywords
+%   `triesize', `itriesize' and `trieopsize' in the configuration
+%   file.
+%
+% others (binaries only):
+%   See the documentation of the implementation if it is possible
+%   and how to change these values without recompilation.
+%
+% others (with sources)
+%   If the trie memory is too small, you have to recompile TeX
+%   using larger values for `trie_size' and `trie_op_size'.
+%   Modify the change file `tex.ch' and recompile TeX.
+%   For details see the documentation included in the sources.
+%
+%
+%
+% Necessary Settings in TeX macro files:
+% --------------------------------------
+%
+% \lefthyphenmin, \righthyphenmin:
+%   You can set both parameters to 2.
+%
+% \lccode <char>:
+%   To get correct hyphenation points within words containing
+%   umlauts or \ss, it's necessary to assign values > 0 to the
+%   appropriate \lccode <char> positions.
+%
+% These changes are _not_ done when reading this file and have to
+% be included in the language switching mechanism as is done in,
+% for example, `german.sty' (\lccode change for ^^Y = \ss in OT1,
+% \left-/\righthyphenmin settings).
+%
+%
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+%%
+\endinput
+%% 
+%% End of file `dehypht.tex'.
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/eshyph_vo.tex b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/eshyph_vo.tex
new file mode 100644
index 00000000..e15bdc38
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/eshyph_vo.tex
@@ -0,0 +1,1104 @@
+.\'a2
+.\'aa2
+.\'ae2
+.\'ai2
+.\'ao2
+.\'au2
+.\'e2
+.\'ea2
+.\'ee2
+.\'ei2
+.\'eo2
+.\'eu2
+.\'i2
+.\'ia2
+.\'ie2
+.\'ii2
+.\'io2
+.\'iu2
+.\'o2
+.\'oa2
+.\'oe2
+.\'oi2
+.\'oo2
+.\'ou2
+.\'u2
+.\'ua2
+.\'ue2
+.\'ui2
+.\'uo2
+.\'uu2
+.a2
+.a\'a2
+.a\'e2
+.a\'i2
+.a\'o2
+.a\'u2
+.aa2
+.ae2
+.ai2
+.ao2
+.au2
+.e2
+.e\'a2
+.e\'e2
+.e\'i2
+.e\'o2
+.e\'u2
+.ea2
+.ee2
+.ei2
+.eo2
+.eu2
+.i2
+.i\'a2
+.i\'e2
+.i\'i2
+.i\'o2
+.i\'u2
+.ia2
+.ie2
+.ii2
+.io2
+.iu2
+.o2
+.o\'a2
+.o\'e2
+.o\'i2
+.o\'o2
+.o\'u2
+.oa2
+.oe2
+.oi2
+.oo2
+.ou2
+.u2
+.u\'a2
+.u\'e2
+.u\'i2
+.u\'o2
+.u\'u2
+.ua2
+.ue2
+.ui2
+.uo2
+.uu2
+2\'a.
+2\'aa.
+2\'ae.
+2\'ai.
+2\'ao.
+2\'au.
+2\'e.
+2\'ea.
+2\'ee.
+2\'ei.
+2\'eo.
+2\'eu.
+2\'i.
+2\'ia.
+2\'ie.
+2\'ii.
+2\'io.
+2\'iu.
+2\'o.
+2\'oa.
+2\'oe.
+2\'oi.
+2\'oo.
+2\'ou.
+2\'u.
+2\'ua.
+2\'ue.
+2\'ui.
+2\'uo.
+2\'uu.
+2\~n1\~n
+2\~n1b
+2\~n1c
+2\~n1d
+2\~n1f
+2\~n1g
+2\~n1h
+2\~n1j
+2\~n1k
+2\~n1m
+2\~n1n
+2\~n1p
+2\~n1q
+2\~n1s
+2\~n1t
+2\~n1v
+2\~n1w
+2\~n1x
+2\~n1y
+2\~n1z
+2a.
+2a\'a.
+2a\'e.
+2a\'i.
+2a\'o.
+2a\'u.
+2aa.
+2ae.
+2ai.
+2ao.
+2au.
+2b1\~n
+2b1b
+2b1c
+2b1d
+2b1f
+2b1g
+2b1h
+2b1j
+2b1k
+2b1m
+2b1n
+2b1p
+2b1q
+2b1s
+2b1t
+2b1v
+2b1w
+2b1x
+2b1y
+2b1z
+2c1\~n
+2c1b
+2c1c
+2c1d
+2c1f
+2c1g
+2c1j
+2c1k
+2c1m
+2c1n
+2c1p
+2c1q
+2c1s
+2c1t
+2c1v
+2c1w
+2c1x
+2c1y
+2c1z
+2d1\~n
+2d1b
+2d1c
+2d1d
+2d1f
+2d1g
+2d1h
+2d1j
+2d1k
+2d1m
+2d1n
+2d1p
+2d1q
+2d1s
+2d1t
+2d1v
+2d1w
+2d1x
+2d1y
+2d1z
+2e.
+2e\'a.
+2e\'e.
+2e\'i.
+2e\'o.
+2e\'u.
+2ea.
+2ee.
+2ei.
+2eo.
+2eu.
+2f1\~n
+2f1b
+2f1c
+2f1d
+2f1f
+2f1g
+2f1h
+2f1j
+2f1k
+2f1m
+2f1n
+2f1p
+2f1q
+2f1s
+2f1t
+2f1v
+2f1w
+2f1x
+2f1y
+2f1z
+2g1\~n
+2g1b
+2g1c
+2g1d
+2g1f
+2g1g
+2g1h
+2g1j
+2g1k
+2g1m
+2g1n
+2g1p
+2g1q
+2g1s
+2g1t
+2g1v
+2g1w
+2g1x
+2g1y
+2g1z
+2h1\~n
+2h1b
+2h1c
+2h1d
+2h1f
+2h1g
+2h1h
+2h1j
+2h1k
+2h1m
+2h1n
+2h1p
+2h1q
+2h1s
+2h1t
+2h1v
+2h1w
+2h1x
+2h1y
+2h1z
+2i.
+2i\'a.
+2i\'e.
+2i\'i.
+2i\'o.
+2i\'u.
+2ia.
+2ie.
+2ii.
+2io.
+2iu.
+2j1\~n
+2j1b
+2j1c
+2j1d
+2j1f
+2j1g
+2j1h
+2j1j
+2j1k
+2j1m
+2j1n
+2j1p
+2j1q
+2j1s
+2j1t
+2j1v
+2j1w
+2j1x
+2j1y
+2j1z
+2k1\~n
+2k1b
+2k1c
+2k1d
+2k1f
+2k1g
+2k1h
+2k1j
+2k1k
+2k1m
+2k1n
+2k1p
+2k1q
+2k1s
+2k1t
+2k1v
+2k1w
+2k1x
+2k1y
+2k1z
+2l1\~n
+2l1b
+2l1c
+2l1d
+2l1f
+2l1g
+2l1h
+2l1j
+2l1k
+2l1m
+2l1n
+2l1p
+2l1q
+2l1s
+2l1t
+2l1v
+2l1w
+2l1x
+2l1y
+2l1z
+2m1\~n
+2m1b
+2m1c
+2m1d
+2m1f
+2m1g
+2m1h
+2m1j
+2m1k
+2m1l
+2m1m
+2m1n
+2m1p
+2m1q
+2m1r
+2m1s
+2m1t
+2m1v
+2m1w
+2m1x
+2m1y
+2m1z
+2n1\~n
+2n1b
+2n1c
+2n1d
+2n1f
+2n1g
+2n1h
+2n1j
+2n1k
+2n1l
+2n1m
+2n1n
+2n1p
+2n1q
+2n1r
+2n1s
+2n1t
+2n1v
+2n1w
+2n1x
+2n1y
+2n1z
+2o.
+2o\'a.
+2o\'e.
+2o\'i.
+2o\'o.
+2o\'u.
+2oa.
+2oe.
+2oi.
+2oo.
+2ou.
+2p1\~n
+2p1b
+2p1c
+2p1d
+2p1f
+2p1g
+2p1h
+2p1j
+2p1k
+2p1m
+2p1n
+2p1p
+2p1q
+2p1s
+2p1t
+2p1v
+2p1w
+2p1x
+2p1y
+2p1z
+2q1\~n
+2q1b
+2q1c
+2q1d
+2q1f
+2q1g
+2q1h
+2q1j
+2q1k
+2q1m
+2q1n
+2q1p
+2q1q
+2q1s
+2q1t
+2q1v
+2q1w
+2q1x
+2q1y
+2q1z
+2r1\~n
+2r1b
+2r1c
+2r1d
+2r1f
+2r1g
+2r1h
+2r1j
+2r1k
+2r1m
+2r1n
+2r1p
+2r1q
+2r1s
+2r1t
+2r1v
+2r1w
+2r1x
+2r1y
+2r1z
+2s1\~n
+2s1b
+2s1c
+2s1d
+2s1f
+2s1g
+2s1h
+2s1j
+2s1k
+2s1m
+2s1n
+2s1p
+2s1q
+2s1s
+2s1t
+2s1v
+2s1w
+2s1x
+2s1y
+2s1z
+2t1\~n
+2t1b
+2t1c
+2t1d
+2t1f
+2t1g
+2t1h
+2t1j
+2t1k
+2t1m
+2t1n
+2t1p
+2t1q
+2t1s
+2t1t
+2t1v
+2t1w
+2t1x
+2t1y
+2t1z
+2u.
+2u\'a.
+2u\'e.
+2u\'i.
+2u\'o.
+2u\'u.
+2ua.
+2ue.
+2ui.
+2uo.
+2uu.
+2v1\~n
+2v1b
+2v1c
+2v1d
+2v1f
+2v1g
+2v1h
+2v1j
+2v1k
+2v1m
+2v1n
+2v1p
+2v1q
+2v1s
+2v1t
+2v1v
+2v1w
+2v1x
+2v1y
+2v1z
+2w1\~n
+2w1b
+2w1c
+2w1d
+2w1f
+2w1g
+2w1h
+2w1j
+2w1k
+2w1m
+2w1n
+2w1p
+2w1q
+2w1s
+2w1t
+2w1v
+2w1w
+2w1x
+2w1y
+2w1z
+2x1\~n
+2x1b
+2x1c
+2x1d
+2x1f
+2x1g
+2x1h
+2x1j
+2x1k
+2x1m
+2x1n
+2x1p
+2x1q
+2x1s
+2x1t
+2x1v
+2x1w
+2x1x
+2x1y
+2x1z
+2y1\~n
+2y1b
+2y1c
+2y1d
+2y1f
+2y1g
+2y1h
+2y1j
+2y1k
+2y1m
+2y1n
+2y1p
+2y1q
+2y1s
+2y1t
+2y1v
+2y1w
+2y1x
+2y1y
+2y1z
+2z1\~n
+2z1b
+2z1c
+2z1d
+2z1f
+2z1g
+2z1h
+2z1j
+2z1k
+2z1m
+2z1n
+2z1p
+2z1q
+2z1s
+2z1t
+2z1v
+2z1w
+2z1x
+2z1y
+2z1z
+\'a1\'i
+\'a1\'u
+\'a1\~n
+\'a1a
+\'a1b
+\'a1c
+\'a1d
+\'a1e
+\'a1f
+\'a1g
+\'a1h
+\'a1j
+\'a1k
+\'a1l
+\'a1m
+\'a1n
+\'a1o
+\'a1p
+\'a1q
+\'a1r
+\'a1s
+\'a1t
+\'a1v
+\'a1w
+\'a1x
+\'a1y
+\'a1z
+\'a2\~n.
+\'a2b.
+\'a2c.
+\'a2d.
+\'a2f.
+\'a2g.
+\'a2h.
+\'a2j.
+\'a2k.
+\'a2l.
+\'a2m.
+\'a2n.
+\'a2p.
+\'a2q.
+\'a2r.
+\'a2s.
+\'a2t.
+\'a2v.
+\'a2w.
+\'a2x.
+\'a2y.
+\'a2z.
+\'e1\'i
+\'e1\'u
+\'e1\~n
+\'e1a
+\'e1b
+\'e1c
+\'e1d
+\'e1e
+\'e1f
+\'e1g
+\'e1h
+\'e1j
+\'e1k
+\'e1l
+\'e1m
+\'e1n
+\'e1o
+\'e1p
+\'e1q
+\'e1r
+\'e1s
+\'e1t
+\'e1v
+\'e1w
+\'e1x
+\'e1y
+\'e1z
+\'e2\~n.
+\'e2b.
+\'e2c.
+\'e2d.
+\'e2f.
+\'e2g.
+\'e2h.
+\'e2j.
+\'e2k.
+\'e2l.
+\'e2m.
+\'e2n.
+\'e2p.
+\'e2q.
+\'e2r.
+\'e2s.
+\'e2t.
+\'e2v.
+\'e2w.
+\'e2x.
+\'e2y.
+\'e2z.
+\'i1\'a
+\'i1\'e
+\'i1\'o
+\'i1\~n
+\'i1a
+\'i1b
+\'i1c
+\'i1d
+\'i1e
+\'i1f
+\'i1g
+\'i1h
+\'i1j
+\'i1k
+\'i1l
+\'i1m
+\'i1n
+\'i1o
+\'i1p
+\'i1q
+\'i1r
+\'i1s
+\'i1t
+\'i1v
+\'i1w
+\'i1x
+\'i1y
+\'i1z
+\'i2\~n.
+\'i2b.
+\'i2c.
+\'i2d.
+\'i2f.
+\'i2g.
+\'i2h.
+\'i2j.
+\'i2k.
+\'i2l.
+\'i2m.
+\'i2n.
+\'i2p.
+\'i2q.
+\'i2r.
+\'i2s.
+\'i2t.
+\'i2v.
+\'i2w.
+\'i2x.
+\'i2y.
+\'i2z.
+\'o1\'i
+\'o1\'u
+\'o1\~n
+\'o1a
+\'o1b
+\'o1c
+\'o1d
+\'o1e
+\'o1f
+\'o1g
+\'o1h
+\'o1j
+\'o1k
+\'o1l
+\'o1m
+\'o1n
+\'o1o
+\'o1p
+\'o1q
+\'o1r
+\'o1s
+\'o1t
+\'o1v
+\'o1w
+\'o1x
+\'o1y
+\'o1z
+\'o2\~n.
+\'o2b.
+\'o2c.
+\'o2d.
+\'o2f.
+\'o2g.
+\'o2h.
+\'o2j.
+\'o2k.
+\'o2l.
+\'o2m.
+\'o2n.
+\'o2p.
+\'o2q.
+\'o2r.
+\'o2s.
+\'o2t.
+\'o2v.
+\'o2w.
+\'o2x.
+\'o2y.
+\'o2z.
+\'u1\'a
+\'u1\'e
+\'u1\'o
+\'u1\~n
+\'u1a
+\'u1b
+\'u1c
+\'u1d
+\'u1e
+\'u1f
+\'u1g
+\'u1h
+\'u1j
+\'u1k
+\'u1l
+\'u1m
+\'u1n
+\'u1o
+\'u1p
+\'u1q
+\'u1r
+\'u1s
+\'u1t
+\'u1v
+\'u1w
+\'u1x
+\'u1y
+\'u1z
+\'u2\~n.
+\'u2b.
+\'u2c.
+\'u2d.
+\'u2f.
+\'u2g.
+\'u2h.
+\'u2j.
+\'u2k.
+\'u2l.
+\'u2m.
+\'u2n.
+\'u2p.
+\'u2q.
+\'u2r.
+\'u2s.
+\'u2t.
+\'u2v.
+\'u2w.
+\'u2x.
+\'u2y.
+\'u2z.
+a1\'a
+a1\'e
+a1\'i
+a1\'o
+a1\'u
+a1\~n
+a1a
+a1b
+a1c
+a1d
+a1e
+a1f
+a1g
+a1h
+a1j
+a1k
+a1l
+a1m
+a1n
+a1o
+a1p
+a1q
+a1r
+a1s
+a1t
+a1v
+a1w
+a1x
+a1y
+a1z
+a2\~n.
+a2b.
+a2c.
+a2d.
+a2f.
+a2g.
+a2h.
+a2j.
+a2k.
+a2l.
+a2m.
+a2n.
+a2p.
+a2q.
+a2r.
+a2s.
+a2t.
+a2v.
+a2w.
+a2x.
+a2y.
+a2z.
+e1\'a
+e1\'e
+e1\'i
+e1\'o
+e1\'u
+e1\~n
+e1a
+e1b
+e1c
+e1d
+e1e
+e1f
+e1g
+e1h
+e1j
+e1k
+e1l
+e1m
+e1n
+e1o
+e1p
+e1q
+e1r
+e1s
+e1t
+e1v
+e1w
+e1x
+e1y
+e1z
+e2\~n.
+e2b.
+e2c.
+e2d.
+e2f.
+e2g.
+e2h.
+e2j.
+e2k.
+e2l.
+e2m.
+e2n.
+e2p.
+e2q.
+e2r.
+e2s.
+e2t.
+e2v.
+e2w.
+e2x.
+e2y.
+e2z.
+i1\~n
+i1b
+i1c
+i1d
+i1f
+i1g
+i1h
+i1j
+i1k
+i1l
+i1m
+i1n
+i1p
+i1q
+i1r
+i1s
+i1t
+i1v
+i1w
+i1x
+i1y
+i1z
+i2\~n.
+i2b.
+i2c.
+i2d.
+i2f.
+i2g.
+i2h.
+i2j.
+i2k.
+i2l.
+i2m.
+i2n.
+i2p.
+i2q.
+i2r.
+i2s.
+i2t.
+i2v.
+i2w.
+i2x.
+i2y.
+i2z.
+o1\'a
+o1\'e
+o1\'i
+o1\'o
+o1\'u
+o1\~n
+o1a
+o1b
+o1c
+o1d
+o1e
+o1f
+o1g
+o1h
+o1j
+o1k
+o1l
+o1m
+o1n
+o1o
+o1p
+o1q
+o1r
+o1s
+o1t
+o1v
+o1w
+o1x
+o1y
+o1z
+o2\~n.
+o2b.
+o2c.
+o2d.
+o2f.
+o2g.
+o2h.
+o2j.
+o2k.
+o2l.
+o2m.
+o2n.
+o2p.
+o2q.
+o2r.
+o2s.
+o2t.
+o2v.
+o2w.
+o2x.
+o2y.
+o2z.
+u1\~n
+u1b
+u1c
+u1d
+u1f
+u1g
+u1h
+u1j
+u1k
+u1l
+u1m
+u1n
+u1p
+u1q
+u1r
+u1s
+u1t
+u1v
+u1w
+u1x
+u1y
+u1z
+u2\~n.
+u2b.
+u2c.
+u2d.
+u2f.
+u2g.
+u2h.
+u2j.
+u2k.
+u2l.
+u2m.
+u2n.
+u2p.
+u2q.
+u2r.
+u2s.
+u2t.
+u2v.
+u2w.
+u2x.
+u2y.
+u2z.
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/expander.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/expander.tcl
new file mode 100644
index 00000000..9ce76d84
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/expander.tcl
@@ -0,0 +1,1122 @@
+#---------------------------------------------------------------------
+# TITLE:
+#	expander.tcl
+#
+# AUTHOR:
+#	Will Duquette
+#
+# DESCRIPTION:
+#
+# An expander is an object that takes as input text with embedded
+# Tcl code and returns text with the embedded code expanded.  The
+# text can be provided all at once or incrementally.
+#
+# See  expander.[e]html for usage info.
+# Also expander.n
+#
+# LICENSE:
+#       Copyright (C) 2001 by William H. Duquette.  See expander_license.txt,
+#       distributed with this file, for license information.
+#
+# CHANGE LOG:
+#
+#       10/31/01: V0.9 code is complete.
+#       11/23/01: Added "evalcmd"; V1.0 code is complete.
+
+# Provide the package.
+
+# Create the package's namespace.
+
+namespace eval ::textutil {
+    namespace eval expander {
+	# All indices are prefixed by "$exp-".
+	#
+	# lb		    The left bracket sequence
+	# rb		    The right bracket sequence
+	# errmode	    How to handle macro errors: 
+	#		    nothing, macro, error, fail.
+        # evalcmd           The evaluation command.
+	# textcmd           The plain text processing command.
+	# level		    The context level
+	# output-$level     The accumulated text at this context level.
+	# name-$level       The tag name of this context level
+	# data-$level-$var  A variable of this context level     
+	
+	variable Info
+    
+	# In methods, the current object:
+	variable This ""
+	
+	# Export public commands
+	namespace export expander
+    }
+
+    #namespace import expander::*
+    namespace export expander
+
+    proc expander {name} {uplevel ::textutil::expander::expander [list $name]}
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	expander name
+#
+# INPUTS:
+#	name		A proc name for the new object.  If not
+#                       fully-qualified, it is assumed to be relative
+#                       to the caller's namespace.
+#
+# RETURNS:
+#	nothing
+#
+# DESCRIPTION:
+#	Creates a new expander object.
+
+proc ::textutil::expander::expander {name} {
+    variable Info
+
+    # FIRST, qualify the name.
+    if {![string match "::*" $name]} {
+        # Get caller's namespace; append :: if not global namespace.
+        set ns [uplevel 1 namespace current]
+        if {"::" != $ns} {
+            append ns "::"
+        }
+        
+        set name "$ns$name"
+    }
+
+    # NEXT, Check the name
+    if {"" != [info commands $name]} {
+        return -code error "command name \"$name\" already exists"
+    }
+
+    # NEXT, Create the object.
+    proc $name {method args} [format {
+        if {[catch {::textutil::expander::Methods %s $method $args} result]} {
+            return -code error $result
+        } else {
+            return $result
+        }
+    } $name]
+
+    # NEXT, Initialize the object
+    Op_reset $name
+    
+    return $name
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Methods name method argList
+#
+# INPUTS:
+#	name		The object's fully qualified procedure name.
+#			This argument is provided by the object command
+#			itself.
+#	method		The method to call.
+#	argList		Arguments for the specific method.
+#
+# RETURNS:
+#	Depends on the method
+#
+# DESCRIPTION:
+#	Handles all method dispatch for a expander object.
+#       The expander's object command merely passes its arguments to
+#	this function, which dispatches the arguments to the
+#	appropriate method procedure.  If the method raises an error,
+#	the method procedure's name in the error message is replaced
+#	by the object and method names.
+
+proc ::textutil::expander::Methods {name method argList} {
+    variable Info
+    variable This
+
+    switch -exact -- $method {
+        expand -
+        lb -
+        rb -
+        setbrackets -
+        errmode -
+        evalcmd -
+	textcmd -
+        cpush -
+	ctopandclear -
+        cis -
+        cname -
+        cset -
+        cget -
+        cvar -
+        cpop -
+        cappend -
+	where -
+        reset {
+            # FIRST, execute the method, first setting This to the object
+            # name; then, after the method has been called, restore the
+            # old object name.
+            set oldThis $This
+            set This $name
+
+            set retval [catch "Op_$method $name $argList" result]
+
+            set This $oldThis
+
+            # NEXT, handle the result based on the retval.
+            if {$retval} {
+                regsub -- "Op_$method" $result "$name $method" result
+                return -code error $result
+            } else {
+                return $result
+            }
+        }
+        default {
+            return -code error "\"$name $method\" is not defined"
+        }
+    }
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Get key
+#
+# INPUTS:
+#	key		A key into the Info array, excluding the
+#	                object name.  E.g., "lb"
+#
+# RETURNS:
+#	The value from the array
+#
+# DESCRIPTION:
+#	Gets the value of an entry from Info for This.
+
+proc ::textutil::expander::Get {key} {
+    variable Info
+    variable This
+
+    return $Info($This-$key)
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Set key value
+#
+# INPUTS:
+#	key		A key into the Info array, excluding the
+#	                object name.  E.g., "lb"
+#
+#	value		A Tcl value
+#
+# RETURNS:
+#	The value
+#
+# DESCRIPTION:
+#	Sets the value of an entry in Info for This.
+
+proc ::textutil::expander::Set {key value} {
+    variable Info
+    variable This
+
+    return [set Info($This-$key) $value]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Var key
+#
+# INPUTS:
+#	key		A key into the Info array, excluding the
+#	                object name.  E.g., "lb"
+#
+# RETURNS:
+#	The full variable name, suitable for setting or lappending
+
+proc ::textutil::expander::Var {key} {
+    variable Info
+    variable This
+
+    return ::textutil::expander::Info($This-$key)
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Contains list value
+#
+# INPUTS:
+#       list		any list
+#	value		any value
+#
+# RETURNS:
+#	TRUE if the list contains the value, and false otherwise.
+
+proc ::textutil::expander::Contains {list value} {
+    if {[lsearch -exact $list $value] == -1} {
+        return 0
+    } else {
+        return 1
+    }
+}
+
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_lb ?newbracket?
+#
+# INPUTS:
+#	newbracket		If given, the new bracket token.
+#
+# RETURNS:
+#	The current left bracket
+#
+# DESCRIPTION:
+#	Returns the current left bracket token.
+
+proc ::textutil::expander::Op_lb {name {newbracket ""}} {
+    if {[string length $newbracket] != 0} {
+        Set lb $newbracket
+    }
+    return [Get lb]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_rb ?newbracket?
+#
+# INPUTS:
+#	newbracket		If given, the new bracket token.
+#
+# RETURNS:
+#	The current left bracket
+#
+# DESCRIPTION:
+#	Returns the current left bracket token.
+
+proc ::textutil::expander::Op_rb {name {newbracket ""}} {
+    if {[string length $newbracket] != 0} {
+        Set rb $newbracket
+    }
+    return [Get rb]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_setbrackets lbrack rbrack
+#
+# INPUTS:
+#	lbrack		The new left bracket
+#	rbrack		The new right bracket
+#
+# RETURNS:
+#	nothing
+#
+# DESCRIPTION:
+#	Sets the brackets as a pair.
+
+proc ::textutil::expander::Op_setbrackets {name lbrack rbrack} {
+    Set lb $lbrack
+    Set rb $rbrack
+    return
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_errmode ?newErrmode?
+#
+# INPUTS:
+#	newErrmode		If given, the new error mode.
+#
+# RETURNS:
+#	The current error mode
+#
+# DESCRIPTION:
+#	Returns the current error mode.
+
+proc ::textutil::expander::Op_errmode {name {newErrmode ""}} {
+    if {[string length $newErrmode] != 0} {
+        if {![Contains "macro nothing error fail" $newErrmode]} {
+            error "$name errmode: Invalid error mode: $newErrmode"
+        }
+
+        Set errmode $newErrmode
+    }
+    return [Get errmode]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_evalcmd ?newEvalCmd?
+#
+# INPUTS:
+#	newEvalCmd		If given, the new eval command.
+#
+# RETURNS:
+#	The current eval command
+#
+# DESCRIPTION:
+#	Returns the current eval command.  This is the command used to
+#	evaluate macros; it defaults to "uplevel #0".
+
+proc ::textutil::expander::Op_evalcmd {name {newEvalCmd ""}} {
+    if {[string length $newEvalCmd] != 0} {
+        Set evalcmd $newEvalCmd
+    }
+    return [Get evalcmd]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_textcmd ?newTextCmd?
+#
+# INPUTS:
+#	newTextCmd		If given, the new text command.
+#
+# RETURNS:
+#	The current text command
+#
+# DESCRIPTION:
+#	Returns the current text command.  This is the command used to
+#	process plain text. It defaults to {}, meaning identity.
+
+proc ::textutil::expander::Op_textcmd {name args} {
+    switch -exact [llength $args] {
+	0 {}
+	1 {Set textcmd [lindex $args 0]}
+	default {
+	    return -code error "wrong#args for textcmd: name ?newTextcmd?"
+	}
+    }
+    return [Get textcmd]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_reset
+#
+# INPUTS:
+#	none
+#
+# RETURNS:
+#	nothing
+#
+# DESCRIPTION:
+#	Resets all object values, as though it were brand new.
+
+proc ::textutil::expander::Op_reset {name} {
+    variable Info 
+
+    if {[info exists Info($name-lb)]} {
+        foreach elt [array names Info "$name-*"] {
+            unset Info($elt)
+        }
+    }
+
+    set Info($name-lb) "\["
+    set Info($name-rb) "\]"
+    set Info($name-errmode) "fail"
+    set Info($name-evalcmd) "uplevel #0"
+    set Info($name-textcmd) ""
+    set Info($name-level) 0
+    set Info($name-output-0) ""
+    set Info($name-name-0) ":0"
+
+    return
+}
+
+#-------------------------------------------------------------------------
+# Context: Every expansion takes place in its own context; however, 
+# a macro can push a new context, causing the text it returns and all
+# subsequent text to be saved separately.  Later, a matching macro can
+# pop the context, acquiring all text saved since the first command,
+# and use that in its own output.
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_cpush cname
+#
+# INPUTS:
+#	cname		The context name
+#
+# RETURNS:
+#	nothing
+#
+# DESCRIPTION:
+#       Pushes an empty macro context onto the stack.  All expanded text
+#       will be added to this context until it is popped.
+
+proc ::textutil::expander::Op_cpush {name cname} {
+    # FRINK: nocheck
+    incr [Var level]
+    # FRINK: nocheck
+    set [Var output-[Get level]] {}
+    # FRINK: nocheck
+    set [Var name-[Get level]] $cname
+
+    # The first level is init'd elsewhere (Op_expand)
+    if {[set [Var level]] < 2} return
+
+    # Initialize the location information, inherit from the outer
+    # context.
+
+    LocInit $cname
+    catch {LocSet $cname [LocGet $name]}
+    return    
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_cis cname
+#
+# INPUTS:
+#	cname		A context name
+#
+# RETURNS:
+#	true or false
+#
+# DESCRIPTION:
+#       Returns true if the current context has the specified name, and
+#	false otherwise.
+
+proc ::textutil::expander::Op_cis {name cname} {
+    return [expr {[string compare $cname [Op_cname $name]] == 0}]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_cname
+#
+# INPUTS:
+#	none
+#
+# RETURNS:
+#	The context name
+#
+# DESCRIPTION:
+#       Returns the name of the current context.
+
+proc ::textutil::expander::Op_cname {name} {
+    return [Get name-[Get level]]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_cset varname value
+#
+# INPUTS:
+#	varname		The name of a context variable
+#	value		The new value for the context variable
+#
+# RETURNS:
+#	The value
+#
+# DESCRIPTION:
+#       Sets a variable in the current context.
+
+proc ::textutil::expander::Op_cset {name varname value} {
+    Set data-[Get level]-$varname $value
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_cget varname
+#
+# INPUTS:
+#	varname		The name of a context variable
+#
+# RETURNS:
+#	The value
+#
+# DESCRIPTION:
+#       Returns the value of a context variable.  It's an error if
+#	the variable doesn't exist.
+
+proc ::textutil::expander::Op_cget {name varname} {
+    if {![info exists [Var data-[Get level]-$varname]]} {
+        error "$name cget: $varname doesn't exist in this context ([Get level])"
+    }
+    return [Get data-[Get level]-$varname]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_cvar varname
+#
+# INPUTS:
+#	varname		The name of a context variable
+#
+# RETURNS:
+#	The index to the variable
+#
+# DESCRIPTION:
+#       Returns the index to a context variable, for use with set, 
+#	lappend, etc.
+
+proc ::textutil::expander::Op_cvar {name varname} {
+    if {![info exists [Var data-[Get level]-$varname]]} {
+        error "$name cvar: $varname doesn't exist in this context"
+    }
+
+    return [Var data-[Get level]-$varname]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_cpop cname
+#
+# INPUTS:
+#	cname		The expected context name.
+#
+# RETURNS:
+#	The accumulated output in this context
+#
+# DESCRIPTION:
+#       Returns the accumulated output for the current context, first
+#	popping the context from the stack.  The expected context name
+#	must match the real name, or an error occurs.
+
+proc ::textutil::expander::Op_cpop {name cname} {
+    variable Info
+
+    if {[Get level] == 0} {
+        error "$name cpop underflow on '$cname'"
+    }
+
+    if {[string compare [Op_cname $name] $cname] != 0} {
+        error "$name cpop context mismatch: expected [Op_cname $name], got $cname"
+    }
+
+    set result [Get output-[Get level]]
+    # FRINK: nocheck
+    set [Var output-[Get level]] ""
+    # FRINK: nocheck
+    set [Var name-[Get level]] ""
+
+    foreach elt [array names "Info data-[Get level]-*"] {
+        unset Info($elt)
+    }
+
+    # FRINK: nocheck
+    incr [Var level] -1
+    return $result
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_ctopandclear
+#
+# INPUTS:
+#	None.
+#
+# RETURNS:
+#	The accumulated output in the topmost context, clears the context,
+#	but does not pop it.
+#
+# DESCRIPTION:
+#       Returns the accumulated output for the current context, first
+#	popping the context from the stack.  The expected context name
+#	must match the real name, or an error occurs.
+
+proc ::textutil::expander::Op_ctopandclear {name} {
+    variable Info
+
+    if {[Get level] == 0} {
+        error "$name cpop underflow on '[Op_cname $name]'"
+    }
+
+    set result [Get output-[Get level]]
+    Set output-[Get level] ""
+    return $result
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_cappend text
+#
+# INPUTS:
+#	text		Text to add to the output
+#
+# RETURNS:
+#	The accumulated output
+#
+# DESCRIPTION:
+#       Appends the text to the accumulated output in the current context.
+
+proc ::textutil::expander::Op_cappend {name text} {
+    # FRINK: nocheck
+    append [Var output-[Get level]] $text
+}
+
+#-------------------------------------------------------------------------
+# Macro-expansion:  The following code is the heart of the module.
+# Given a text string, and the current variable settings, this code
+# returns an expanded string, with all macros replaced.
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_expand inputString ?brackets?
+#
+# INPUTS:
+#	inputString		The text to expand.
+#	brackets		A list of two bracket tokens.
+#
+# RETURNS:
+#	The expanded text.
+#
+# DESCRIPTION:
+#	Finds all embedded macros in the input string, and expands them.
+#	If ?brackets? is given, it must be list of length 2, containing
+#	replacement left and right macro brackets; otherwise the default
+#	brackets are used.
+
+proc ::textutil::expander::Op_expand {name inputString {brackets ""}} {
+    # FIRST, push a new context onto the stack, and save the current
+    # brackets.
+
+    Op_cpush $name expand
+    Op_cset $name lb [Get lb]
+    Op_cset $name rb [Get rb]
+
+    # Keep position information in context variables as well.
+    # Line we are in, counting from 1; column we are at,
+    # counting from 0, and index of character we are at,
+    # counting from 0. Tabs counts as '1' when computing
+    # the column.
+
+    LocInit $name
+
+    # SF Tcllib Bug #530056.
+    set start_level [Get level] ; # remember this for check at end
+
+    # NEXT, use the user's brackets, if given.
+    if {[llength $brackets] == 2} {
+        Set lb [lindex $brackets 0]
+        Set rb [lindex $brackets 1]
+    }
+
+    # NEXT, loop over the string, finding and expanding macros.
+    while {[string length $inputString] > 0} {
+        set plainText [ExtractToToken inputString [Get lb] exclude]
+
+        # FIRST, If there was plain text, append it to the output, and 
+        # continue.
+        if {$plainText != ""} {
+	    set input $plainText
+	    set tc [Get textcmd]
+	    if {[string length $tc] > 0} {
+		lappend tc $plainText
+
+		if {![catch "[Get evalcmd] [list $tc]" result]} {
+		    set plainText $result
+		} else {
+		    HandleError $name {plain text} $tc $result
+		}
+	    }
+            Op_cappend $name $plainText
+	    LocUpdate  $name $input
+
+            if {[string length $inputString] == 0} {
+                break
+            }
+        }
+
+        # NEXT, A macro is the next thing; process it.
+        if {[catch {GetMacro inputString} macro]} {
+	    # SF tcllib bug 781973 ... Do not throw a regular
+	    # error. Use HandleError to give the user control of the
+	    # situation, via the defined error mode. The continue
+	    # intercepts if the user allows the expansion to run on,
+	    # yet we must not try to run the non-existing macro.
+
+	    HandleError $name {reading macro} $inputString $macro
+	    continue
+        }
+
+        # Expand the macro, and output the result, or
+        # handle an error.
+        if {![catch "[Get evalcmd] [list $macro]" result]} {
+            Op_cappend $name $result 
+
+	    # We have to advance the location by the length of the
+	    # macro, plus the two brackets. They were stripped by
+	    # GetMacro, so we have to add them here again to make
+	    # computation correct.
+
+	    LocUpdate $name [Get lb]${macro}[Get rb]
+            continue
+        } 
+
+	HandleError $name macro $macro $result
+    }
+
+    # SF Tcllib Bug #530056.
+    if {[Get level] > $start_level} {
+	# The user macros pushed additional contexts, but forgot to
+	# pop them all. The main work here is to place all the still
+	# open contexts into the error message, and to produce
+	# syntactically correct english.
+
+	set c [list]
+	set n [expr {[Get level] - $start_level}]
+	if {$n == 1} {
+	    set ctx  context
+	    set verb was
+	} else {
+	    set ctx  contexts
+	    set verb were
+	}
+	for {incr n -1} {$n >= 0} {incr n -1} {
+	    lappend c [Get name-[expr {[Get level]-$n}]]
+	}
+	return -code error \
+		"The following $ctx pushed by the macros $verb not popped: [join $c ,]."
+    } elseif {[Get level] < $start_level} {
+	set n [expr {$start_level - [Get level]}]
+	if {$n == 1} {
+	    set ctx  context
+	} else {
+	    set ctx  contexts
+	}
+	return -code error \
+		"The macros popped $n more $ctx than they had pushed."
+    }
+
+    Op_lb $name [Op_cget $name lb]
+    Op_rb $name [Op_cget $name rb]
+
+    return [Op_cpop $name expand]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	Op_where
+#
+# INPUTS:
+#	None.
+#
+# RETURNS:
+#	The current location in the input.
+#
+# DESCRIPTION:
+#	Retrieves the current location the expander
+#	is at during processing.
+
+proc ::textutil::expander::Op_where {name} {
+    return [LocGet $name]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION
+#	HandleError name title command errmsg
+#
+# INPUTS:
+#	name		The name of the expander object in question.
+#	title		A title text
+#	command		The command which caused the error.
+#	errmsg		The error message to report
+#
+# RETURNS:
+#	Nothing
+#
+# DESCRIPTIONS
+#	Is executed when an error in a macro or the plain text handler
+#	occurs. Generates an error message according to the current
+#	error mode.
+
+proc ::textutil::expander::HandleError {name title command errmsg} {
+    switch [Get errmode] {
+	nothing { }
+	macro {
+	    # The location is irrelevant here.
+	    Op_cappend $name "[Get lb]$command[Get rb]" 
+	}
+	error {
+	    foreach {ch line col} [LocGet $name] break
+	    set display [DisplayOf $command]
+
+	    Op_cappend $name "\n=================================\n"
+	    Op_cappend $name "*** Error in $title at line $line, column $col:\n"
+	    Op_cappend $name "*** [Get lb]$display[Get rb]\n--> $errmsg\n"
+	    Op_cappend $name "=================================\n"
+	}
+	fail   { 
+	    foreach {ch line col} [LocGet $name] break
+	    set display [DisplayOf $command]
+
+	    return -code error "Error in $title at line $line,\
+		    column $col:\n[Get lb]$display[Get rb]\n-->\
+		    $errmsg"
+	}
+	default {
+	    return -code error "Unknown error mode: [Get errmode]"
+	}
+    }
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	ExtractToToken string token mode
+#
+# INPUTS:
+#	string		The text to process.
+#	token		The token to look for
+#	mode		include or exclude
+#
+# RETURNS:
+#	The extracted text
+#
+# DESCRIPTION:
+# 	Extract text from a string, up to or including a particular
+# 	token.  Remove the extracted text from the string.
+# 	mode determines whether the found token is removed;
+# 	it should be "include" or "exclude".  The string is
+# 	modified in place, and the extracted text is returned.
+
+proc ::textutil::expander::ExtractToToken {string token mode} {
+    upvar $string theString
+
+    # First, determine the offset
+    switch $mode {
+        include { set offset [expr {[string length $token] - 1}] }
+        exclude { set offset -1 }
+        default { error "::expander::ExtractToToken: unknown mode $mode" }
+    }
+
+    # Next, find the first occurrence of the token.
+    set tokenPos [string first $token $theString]
+
+    # Next, return the entire string if it wasn't found, or just
+    # the part upto or including the character.
+    if {$tokenPos == -1} {
+        set theText $theString
+        set theString ""
+    } else {
+        set newEnd    [expr {$tokenPos + $offset}]
+        set newBegin  [expr {$newEnd + 1}]
+        set theText   [string range $theString 0 $newEnd]
+        set theString [string range $theString $newBegin end]
+    }
+
+    return $theText
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	GetMacro string
+#
+# INPUTS:
+#	string		The text to process.
+#
+# RETURNS:
+#	The macro, stripped of its brackets.
+#
+# DESCRIPTION:
+
+proc ::textutil::expander::GetMacro {string} {
+    upvar $string theString
+
+    # FIRST, it's an error if the string doesn't begin with a
+    # bracket.
+    if {[string first [Get lb] $theString] != 0} {
+        error "::expander::GetMacro: assertion failure, next text isn't a command! '$theString'"
+    }
+
+    # NEXT, extract a full macro
+    set macro [ExtractToToken theString [Get lb] include]
+    while {[string length $theString] > 0} {
+        append macro [ExtractToToken theString [Get rb] include]
+
+        # Verify that the command really ends with the [rb] characters,
+        # whatever they are.  If not, break because of unexpected
+        # end of file.
+        if {![IsBracketed $macro]} {
+            break;
+        }
+
+        set strippedMacro [StripBrackets $macro]
+
+        if {[info complete "puts \[$strippedMacro\]"]} {
+            return $strippedMacro
+        }
+    }
+
+    if {[string length $macro] > 40} {
+        set macro "[string range $macro 0 39]...\n"
+    }
+    error "Unexpected EOF in macro:\n$macro"
+}
+
+# Strip left and right bracket tokens from the ends of a macro,
+# provided that it's properly bracketed.
+proc ::textutil::expander::StripBrackets {macro} {
+    set llen [string length [Get lb]]
+    set rlen [string length [Get rb]]
+    set tlen [string length $macro]
+
+    return [string range $macro $llen [expr {$tlen - $rlen - 1}]]
+}
+
+# Return 1 if the macro is properly bracketed, and 0 otherwise.
+proc ::textutil::expander::IsBracketed {macro} {
+    set llen [string length [Get lb]]
+    set rlen [string length [Get rb]]
+    set tlen [string length $macro]
+
+    set leftEnd  [string range $macro 0       [expr {$llen - 1}]]
+    set rightEnd [string range $macro [expr {$tlen - $rlen}] end]
+
+    if {$leftEnd != [Get lb]} {
+        return 0
+    } elseif {$rightEnd != [Get rb]} {
+        return 0
+    } else {
+        return 1
+    }
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	LocInit name
+#
+# INPUTS:
+#	name		The expander object to use.
+#
+# RETURNS:
+#	No result.
+#
+# DESCRIPTION:
+#	A convenience wrapper around LocSet. Initializes the location
+#	to the start of the input (char 0, line 1, column 0).
+
+proc ::textutil::expander::LocInit {name} {
+    LocSet $name {0 1 0}
+    return
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	LocSet name loc
+#
+# INPUTS:
+#	name		The expander object to use.
+#	loc		Location, list containing character position,
+#			line number and column, in this order.
+#
+# RETURNS:
+#	No result.
+#
+# DESCRIPTION:
+#	Sets the current location in the expander to 'loc'.
+
+proc ::textutil::expander::LocSet {name loc} {
+    foreach {ch line col} $loc break
+    Op_cset  $name char $ch
+    Op_cset  $name line $line
+    Op_cset  $name col  $col
+    return
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	LocGet name
+#
+# INPUTS:
+#	name		The expander object to use.
+#
+# RETURNS:
+#	A list containing the current character position, line number
+#	and column, in this order.
+#
+# DESCRIPTION:
+#	Returns the current location as stored in the expander.
+
+proc ::textutil::expander::LocGet {name} {
+    list [Op_cget $name char] [Op_cget $name line] [Op_cget $name col]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	LocUpdate name text
+#
+# INPUTS:
+#	name		The expander object to use.
+#	text		The text to process.
+#
+# RETURNS:
+#	No result.
+#
+# DESCRIPTION:
+#	Takes the current location as stored in the expander, computes
+#	a new location based on the string (its length and contents
+#	(number of lines)), and makes that new location the current
+#	location.
+
+proc ::textutil::expander::LocUpdate {name text} {
+    foreach {ch line col} [LocGet $name] break
+    set numchars [string length $text]
+    #8.4+ set numlines [regexp -all "\n" $text]
+    set numlines [expr {[llength [split $text \n]]-1}]
+
+    incr ch   $numchars
+    incr line $numlines
+    if {$numlines} {
+	set col [expr {$numchars - [string last \n $text] - 1}]
+    } else {
+	incr col $numchars
+    }
+
+    LocSet $name [list $ch $line $col]
+    return
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	LocRange name text
+#
+# INPUTS:
+#	name		The expander object to use.
+#	text		The text to process.
+#
+# RETURNS:
+#	A text range description, compatible with the 'location' data
+#	used in the tcl debugger/checker.
+#
+# DESCRIPTION:
+#	Takes the current location as stored in the expander object
+#	and the length of the text to generate a character range.
+
+proc ::textutil::expander::LocRange {name text} {
+    # Note that the structure is compatible with
+    # the ranges uses by tcl debugger and checker.
+    # {line {charpos length}}
+
+    foreach {ch line col} [LocGet $name] break
+    return [list $line [list $ch [string length $text]]]
+}
+
+#---------------------------------------------------------------------
+# FUNCTION:
+# 	DisplayOf text
+#
+# INPUTS:
+#	text		The text to process.
+#
+# RETURNS:
+#	The text, cut down to at most 30 bytes.
+#
+# DESCRIPTION:
+#	Cuts the incoming text down to contain no more than 30
+#	characters of the input. Adds an ellipsis (...) if characters
+#	were actually removed from the input.
+
+proc ::textutil::expander::DisplayOf {text} {
+    set ellip ""
+    while {[string bytelength $text] > 30} {
+	set ellip ...
+	set text [string range $text 0 end-1]
+    }
+    set display $text$ellip
+}
+
+#---------------------------------------------------------------------
+# Provide the package only if the code above was read and executed
+# without error.
+
+package provide textutil::expander 1.3.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/ithyph.tex b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/ithyph.tex
new file mode 100644
index 00000000..755e1085
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/ithyph.tex
@@ -0,0 +1,223 @@
+
+%%%%%%%%%%%%%%%%%%%% file ithyph.tex
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%  file ithyph.tex  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Prepared by Claudio Beccari   e-mail  beccari@polito.it
+%
+%                                       Dipartimento di Elettronica
+%                                       Politecnico di Torino
+%                                       Corso Duca degli Abruzzi, 24
+%                                       10129 TORINO
+%
+% Copyright  1998, 2001 Claudio Beccari
+%
+% This program can be redistributed and/or modified under the terms
+% of the LaTeX Project Public License Distributed from CTAN
+% archives in directory macros/latex/base/lppl.txt; either
+% version 1 of the License, or any later version.
+%
+% \versionnumber{4.8d}   \versiondate{2001/11/21}
+%
+% These hyphenation patterns for the Italian language are supposed to comply
+% with the Reccomendation UNI 6461 on hyphenation issued by the Italian
+% Standards Institution (Ente Nazionale di Unificazione UNI).  No guarantee
+% or declaration of fitness to any particular purpose is given and any
+% liability is disclaimed.
+%
+% See comments and loading instructions at the end of the file after the
+% \endinput line
+%
+{\lccode`\'=`\'      % Apostrophe has its own lccode so that it is treated
+                     % as a letter
+                     %>> 1998/04/14 inserted grouping
+                     %
+%\lccode23=23        % Compound word mark is a letter in encoding T1
+%\def\W{^^W}         % ^^W =\char23 = \char"17 =\char'27
+%
+\patterns{
+.a3p2n               % After the Garzanti dictionary: a-pnea, a-pnoi-co,...
+.anti1  .anti3m2n
+.bio1
+.ca4p3s
+.circu2m1
+.di2s3cine
+%.e2x
+.fran2k3
+.free3
+.narco1
+.opto1
+.orto3p2
+.para1
+.poli3p2
+.pre1
+.p2s
+%.ri1a2   .ri1e2    .re1i2  .ri1o2  .ri1u2
+.sha2re3
+.tran2s3c .tran2s3d .tran2s3f .tran2s3l .tran2s3n .tran2s3p .tran2s3r .tran2s3t
+.su2b3lu   .su2b3r
+.wa2g3n
+.wel2t1
+a1ia a1ie  a1io  a1iu a1uo a1ya 2at.
+e1iu e2w
+o1ia o1ie  o1io  o1iu
+%u1u
+%
+%1\W0a2 1\W0e2 1\W0i2 1\W0o2 1\W0u2
+'2
+1b   2bb   2bc   2bd  2bf  2bm  2bn  2bp  2bs  2bt  2bv
+     b2l   b2r   2b.  2b'. 2b''
+1c   2cb   2cc   2cd  2cf  2ck  2cm  2cn  2cq  2cs  2ct  2cz
+     2chh  c2h   2chb ch2r 2chn c2l  c2r  2c.  2c'. 2c'' .c2
+1d   2db   2dd   2dg  2dl  2dm  2dn  2dp  d2r  2ds  2dt  2dv  2dw
+     2d.   2d'.  2d'' .d2
+1f   2fb   2fg   2ff  2fn  f2l  f2r  2fs  2ft  2f.  2f'. 2f''
+1g   2gb   2gd   2gf  2gg  g2h  g2l  2gm  g2n  2gp  g2r  2gs  2gt
+     2gv   2gw   2gz  2gh2t     2g.  2g'. 2g''
+1h   2hb   2hd   2hh  hi3p2n    h2l  2hm  2hn  2hr  2hv  2h.  2h'.  2h''
+1j   2j.   2j'.  2j''
+1k   2kg   2kf   k2h  2kk  k2l  2km  k2r  2ks  2kt  2k.  2k'. 2k''
+1l   2lb   2lc   2ld  2l3f2     2lg  l2h  2lk  2ll  2lm  2ln  2lp
+     2lq   2lr   2ls  2lt  2lv  2lw  2lz  2l.  2l'. 2l''
+1m   2mb   2mc   2mf  2ml  2mm  2mn  2mp  2mq  2mr  2ms  2mt  2mv  2mw
+     2m.   2m'.  2m''
+1n   2nb   2nc   2nd  2nf  2ng  2nk  2nl  2nm  2nn  2np  2nq  2nr
+     2ns   2nt   2nv  2nz  n2g3n     2nheit.   2n.  2n'  2n''
+1p   2pd   p2h   p2l  2pn  3p2ne 2pp p2r  2ps  3p2sic 2pt  2pz  2p.  2p'. 2p''
+1q   2qq   2q.   2q'. 2q''
+1r   2rb   2rc   2rd  2rf  r2h  2rg  2rk  2rl  2rm  2rn  2rp
+     2rq   2rr   2rs  2rt  rt2s3 2rv 2rx  2rw  2rz  2r.  2r'. 2r''
+1s2  2shm  2s3s  s4s3m 2s3p2n   2stb 2stc 2std 2stf 2stg 2stm 2stn
+     2stp  2sts  2stt 2stv 2sz  4s.  4s'. 4s''
+1t   2tb   2tc   2td  2tf  2tg  t2h  t2l  2tm  2tn  2tp  t2r  2ts
+     3t2sch      2tt  2tv  2tw  t2z  2tzk 2tzs 2t.  2t'. 2t''
+1v   2vc   v2l   v2r  2vv  2v.  2v'. 2v''
+1w   w2h   wa2r  2w1y 2w.  2w'. 2w''
+1x   2xt   2xw   2x.   2x'. 2x''
+y1ou y1i
+1z   2zb   2zd   2zl  2zn  2zp  2zt  2zs  2zv  2zz  2z.  2z'. 2z''  .z2
+}}                          % Pattern end
+
+\endinput
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Information %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+                           LOADING THESE PATTERNS
+
+These patterns, as well  as  those  for  any  other  language, do not become
+effective until they are loaded in a special form into a format  file;  this
+task  is  performed  by  the  TeX  initializer;  any  TeX system has its own
+initializer with its special way  of  being activated.  Before loading these
+patterns, then, it is necessary to read very carefully the instructions that
+come with your TeX system.
+
+Here I describe how to load the  patterns with the freeware TeX system named
+MiKTeX version 2.x for Windows 9x, NT, 2000,  XP;  with  minor  changes  the
+whole  procedure  is applicable with other TeX systems, but the details must
+be deduced from your TeX system documentation at the section/chapter "How to
+build or to rebuild a format file".
+
+With MikTeX:
+
+a) copy this file and replace  the existing file ithyph.tex in the directory
+   \texmf\tex\generic\hyphen if the existing one has an older  version  date
+   and number.
+b) select Start|Programs|MiKTeX|MiKTeX options.
+c) in  the  Language tab add a check mark to the line concerning the Italian
+   language.
+d) in the Geneal tab click "Update format files".
+e) That's all!  
+
+For the activation of these  patterns  with the specific Italian typesetting
+features, use the babel package as this:
+
+\documentclass{article} % Or whatever other class
+\usepackage[italian]{babel}
+...
+\begin{document}
+...
+\end{document}
+
+
+                           ON ITALIAN HYPHENATION
+
+I have been working on patterns for the Italian language since 1987; in 1992
+I published
+
+C. Beccari, "Computer aided hyphenation for Italian and Modern
+      Latin", TUG vol. 13, n. 1, pp. 23-33 (1992)
+
+which contained a set of patterns that allowed hyphenation for both  Italian
+and  Latin;  a  slightly  modified  version of the patterns published in the
+above paper is contained in LAHYPH.TEX available on the CTAN archives.
+
+From  the  above  patterns  I  extracted  the  minimum  set  necessary   for
+hyphenating  Italian  that  was made available on the CTAN archives with the
+name ITHYPH.tex the version number  3.5  on  the  16th of August 1994.  
+
+The  original  pattern  set  required  37  ops;  being interested in a local
+version of TeX/LaTeX  capable  of  dealing  with  half  a dozen languages, I
+wanted to reduce memory occupation and therefore the number of ops.
+
+Th new version (4.0 released  in  1996)  of  ITHYPH.TEX is much simpler than
+version 3.5 and requires just 29 ops while  it  retains  all  the  power  of
+version  3.5;  it  contains  many  more new patterns that allow to hyphenate
+unusual words that generally have  a  root borrowed from a foreign language.
+Updated versions 4.x contain minor  additions  and  the  number  of  ops  is
+increased to 30 (version 4.7 of 1998/06/01).
+
+This new pattern set has been tested  with the same set of difficult Italian
+words that was used to test version 3.5 and it yields the  same  results  (a
+part  a  minor  change  that was deliberately introduced so as to reduce the
+typographical hyphenation  with  hyathi,  since  hyphenated  hyathi  are not
+appreciated by Italian readers).   A  new  enlarged  word  set  for  testing
+purposes  gets correct hyphen points that were missed or wrongly placed with
+version 3.5, although no error had  been reported, because such words are of
+very specialized nature and are seldom used.
+
+As the previous version, this new set  of  patterns  does  not  contain  any
+accented  character  so  that  the hyphenation algorithm behaves properly in
+both cases, that is with cm  and  with dc/ec fonts.  With LaTeXe terminology
+the difference is between OT1 and T1 encodings;  with  the  former  encoding
+fonts  do  not  contain  accented characters, while with the latter accented
+characters are present and sequences  such  as  \`a map directly to slot "E0
+that contains "agrave".
+
+Of course if you use dc/ec fonts (or any other real or virtual font with  T1
+encoding)  you get the full power of the hyphenation algorithm, while if you
+use cm fonts (or any other real or virtual font with OT1 encoding) you  miss
+some  possible  break  points;  this  is  not a big inconvenience in Italian
+because:
+
+1) The Regulation UNI 6015 on  accents  specifies  that  compulsory  accents
+   appear  only  on the ending vowel of oxitone words; this means that it is
+   almost indifferent to have or  to  miss  the dc/ec fonts because the only
+   difference consists in how TeX evaluates the end of the word; in practice
+   if you have these special facilities you get "qua-li-t\`a", while if  you
+   miss them, you get "qua-lit\`a" (assuming that \righthyphenmin > 1).
+
+2)  Optional  accents are so rare in Italian, that if you absolutely want to
+   use  them  in  those  rare  instances,  and  you  miss  the  T1  encoding
+   facilities, you should also provide  explicit discretionary hyphens as in
+   "s\'e\-gui\-to".
+
+There is no explicit  hyphenation  exception  list  because  these  patterns
+proved  to  hyphenate correctly a very large set of words suitably chosen in
+order to test them in the most heavy circumstances; these patterns were used
+in the preparation of a number of books and no errors were discovered.
+
+Nevertheless if you frequently use  technical terms that you want hyphenated
+differently  from  what  is  normally  done  (for  example  if  you   prefer
+etymological  hyphenation  of  prefixed  and/or  suffixed  words) you should
+insert a specific hyphenation  list  in  the  preamble of your document, for
+example:
+
+\hyphenation{su-per-in-dut-to-re su-per-in-dut-to-ri}
+
+Should you find any word that gets hyphenated in a wrong way, please, AFTER
+CHECKING ON A RELIABLE MODERN DICTIONARY, report to the author, preferably
+by e-mail.
+
+
+                       Happy multilingual typesetting !
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/patch.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/patch.tcl
new file mode 100644
index 00000000..cf68959d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/patch.tcl
@@ -0,0 +1,180 @@
+# patch.tcl --
+#
+#	Application of a diff -ruN patch to a directory tree.
+#
+# Copyright (c) 2019 Christian Gollwitzer <auriocus@gmx.de>
+# with tweaks by Andreas Kupries
+# - Factored patch parsing into a helper
+# - Replaced `puts` with report callback.
+
+package require Tcl 8.5
+package provide textutil::patch 0.1
+
+# # ## ### ##### ######## ############# #####################
+
+namespace eval ::textutil::patch {
+    namespace export apply
+    namespace ensemble create
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::textutil::patch::apply {dir striplevel patch reportcmd} {
+    set patchdict [Parse $dir $striplevel $patch]
+
+    # Apply, now that we have parsed the patch.
+    dict for {fn hunks} $patchdict {
+	Report apply $fn
+	if {[catch {open $fn} fd]} {
+	    set orig {}
+	} else {
+	    set orig [split [read $fd] \n]
+	}
+	close $fd
+
+	set patched $orig
+
+	set fail false
+	set already_applied false
+	set hunknr 1
+	foreach hunk $hunks {
+	    dict with hunk {
+		set oldend [expr {$oldstart+[llength $oldcode]-1}]
+		set newend [expr {$newstart+[llength $newcode]-1}]
+		# check if the hunk matches
+		set origcode [lrange $orig $oldstart $oldend]
+		if {$origcode ne $oldcode} {
+		    set fail true
+		    # check if the patch is already applied
+		    set origcode_applied [lrange $orig $newstart $newend]
+		    if {$origcode_applied eq $newcode} {
+			set already_applied true
+			Report fail-already $fn $hunknr
+		    } else {
+			Report fail $fn $hunknr $oldcode $origcode
+		    }
+		    break
+		}
+		# apply patch
+		set patched [list \
+				 {*}[lrange $patched 0 $newstart-1] \
+				 {*}$newcode \
+				 {*}[lrange $orig $oldend+1 end]]
+	    }
+	    incr hunknr
+	}
+
+	if {!$fail} {
+	    # success - write the result back
+	    set fd [open $fn w]
+	    puts -nonewline $fd [join $patched \n]
+	    close $fd
+	}
+    }
+
+    return
+}
+
+# # ## ### ##### ######## ############# #####################
+
+proc ::textutil::patch::Report args {
+    upvar 1 reportcmd reportcmd
+    uplevel #0 [list {*}$reportcmd {*}$args]
+    ##
+    # apply        $fname
+    # fail-already $fname $hunkno
+    # fail         $fname $hunkno $expected $seen
+    ##
+}
+
+proc ::textutil::patch::Parse {dir striplevel patch} {
+    set patchlines [split $patch \n]
+    set inhunk false
+    set oldcode {}
+    set newcode {}
+    set n [llength $patchlines]
+
+    set patchdict {}
+    for {set lineidx 0} {$lineidx < $n} {incr lineidx} {
+	set line [lindex $patchlines $lineidx]
+	if {[string match ---* $line]} {
+	    # a diff block starts. Current line should be
+	    # --- oldfile date time TZ
+	    # Next line should be
+	    # +++ newfile date time TZ
+	    set in $line
+	    incr lineidx
+	    set out [lindex $patchlines $lineidx]
+
+	    if {![string match ---* $in] || ![string match +++* $out]} {
+		#puts $in
+		#puts $out
+		return -code error "Patch not in unified diff format, line $lineidx $in $out"
+	    }
+
+	    # the quoting is compatible with list
+	    lassign $in  -> oldfile
+	    lassign $out -> newfile
+
+	    set fntopatch [file join $dir {*}[lrange [file split $oldfile] $striplevel end]]
+	    set inhunk false
+	    #puts "Found diffline for $fntopatch"
+	    continue
+	}
+
+	# state machine for parsing the hunks
+	set typechar [string index $line 0]
+	set codeline [string range $line 1 end]
+	switch $typechar {
+	    @ {
+		if {![regexp {@@\s+\-(\d+),(\d+)\s+\+(\d+),(\d+)\s+@@} $line \
+			  -> oldstart oldlen newstart newlen]} {
+		    return code -error "Erroneous hunk in line $lindeidx, $line"
+		}
+		# adjust line numbers for 0-based indexing
+		incr oldstart -1
+		incr newstart -1
+		#puts "New hunk"
+		set newcode {}
+		set oldcode {}
+		set inhunk true
+	    }
+	    - { # line only in old code
+		if {$inhunk} {
+		    lappend oldcode $codeline
+		}
+	    }
+	    + { # line only in new code
+		if {$inhunk} {
+		    lappend newcode $codeline
+		}
+	    }
+	    " " { # common line
+		if {$inhunk} {
+		    lappend oldcode $codeline
+		    lappend newcode $codeline
+		}
+	    }
+	    default {
+		# puts "Junk: $codeline";
+		continue
+	    }
+	}
+	# test if the hunk is complete
+	if {[llength $oldcode]==$oldlen && [llength $newcode]==$newlen} {
+	    set hunk [dict create \
+			  oldcode $oldcode \
+			  newcode $newcode \
+			  oldstart $oldstart \
+			  newstart $newstart]
+	    #puts "hunk complete: $hunk"
+	    set inhunk false
+	    dict lappend patchdict $fntopatch $hunk
+	}
+    }
+
+    return $patchdict
+}
+
+# # ## ### ##### ######## ############# #####################
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/pkgIndex.tcl
new file mode 100644
index 00000000..60609b0c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/pkgIndex.tcl
@@ -0,0 +1,17 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {
+    # FRINK: nocheck
+    return
+}
+package ifneeded textutil           0.9   [list source [file join $dir textutil.tcl]]
+package ifneeded textutil::adjust   0.7.3 [list source [file join $dir adjust.tcl]]
+package ifneeded textutil::split    0.8   [list source [file join $dir split.tcl]]
+package ifneeded textutil::trim     0.7   [list source [file join $dir trim.tcl]]
+package ifneeded textutil::tabify   0.7   [list source [file join $dir tabify.tcl]]
+package ifneeded textutil::repeat   0.7   [list source [file join $dir repeat.tcl]]
+package ifneeded textutil::string   0.8   [list source [file join $dir string.tcl]]
+package ifneeded textutil::expander 1.3.1 [list source [file join $dir expander.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.5]} { return }
+
+package ifneeded textutil::patch     0.1  [list source [file join $dir patch.tcl]]
+package ifneeded textutil::wcswidth 35.2  [list source [file join $dir wcswidth.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/repeat.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/repeat.tcl
new file mode 100644
index 00000000..24f8693c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/repeat.tcl
@@ -0,0 +1,91 @@
+# repeat.tcl --
+#
+#	Emulation of string repeat for older
+#	revisions of Tcl.
+#
+# Copyright (c) 2000      by Ajuba Solutions.
+# Copyright (c) 2001-2006 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: repeat.tcl,v 1.1 2006/04/21 04:42:28 andreas_kupries Exp $
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.2
+
+namespace eval ::textutil::repeat {}
+
+# ### ### ### ######### ######### #########
+
+namespace eval ::textutil::repeat {
+    variable HaveBuiltin [expr {![catch {string repeat a 1}]}]
+}
+
+if {0} {
+    # Problems with the deactivated code:
+    # - Linear in 'num'.
+    # - Tests for 'string repeat' in every call!
+    #   (Ok, just the variable, still a test every call)
+    # - Fails for 'num == 0' because of undefined 'str'.
+
+    proc textutil::repeat::StrRepeat { char num } {
+	variable HaveBuiltin
+	if { $HaveBuiltin == 0 } then {
+	    for { set i 0 } { $i < $num } { incr i } {
+		append str $char
+	    }
+	} else {
+	    set str [ string repeat $char $num ]
+	}
+	return $str
+    }
+}
+
+if {$::textutil::repeat::HaveBuiltin} {
+    proc ::textutil::repeat::strRepeat {char num} {
+	return [string repeat $char $num]
+    }
+
+    proc ::textutil::repeat::blank {n} {
+	return [string repeat " " $n]
+    }
+} else {
+    proc ::textutil::repeat::strRepeat {char num} {
+	if {$num <= 0} {
+	    # No replication required
+	    return ""
+	} elseif {$num == 1} {
+	    # Quick exit for recursion
+	    return $char
+	} elseif {$num == 2} {
+	    # Another quick exit for recursion
+	    return $char$char
+	} elseif {0 == ($num % 2)} {
+	    # Halving the problem results in O (log n) complexity.
+	    set result [strRepeat $char [expr {$num / 2}]]
+	    return "$result$result"
+	} else {
+	    # Uneven length, reduce problem by one
+	    return "$char[strRepeat $char [incr num -1]]"
+	}
+    }
+
+    proc ::textutil::repeat::blank {n} {
+	return [strRepeat " " $n]
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Data structures
+
+namespace eval ::textutil::repeat {
+    namespace export strRepeat blank
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide textutil::repeat 0.7
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/split.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/split.tcl
new file mode 100644
index 00000000..18ee13b5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/split.tcl
@@ -0,0 +1,176 @@
+# split.tcl --
+#
+#	Various ways of splitting a string.
+#
+# Copyright (c) 2000      by Ajuba Solutions.
+# Copyright (c) 2000      by Eric Melski <ericm@ajubasolutions.com>
+# Copyright (c) 2001      by Reinhard Max <max@suse.de>
+# Copyright (c) 2003      by Pat Thoyts <patthoyts@users.sourceforge.net>
+# Copyright (c) 2001-2006 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: split.tcl,v 1.7 2006/04/21 04:42:28 andreas_kupries Exp $
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.2
+
+namespace eval ::textutil::split {}
+
+########################################################################
+# This one was written by Bob Techentin (RWT in Tcl'ers Wiki):
+# http://www.techentin.net
+# mailto:techentin.robert@mayo.edu
+#
+# Later, he send me an email stated that I can use it anywhere, because
+# no copyright was added, so the code is defacto in the public domain.
+#
+# You can found it in the Tcl'ers Wiki here:
+# http://mini.net/cgi-bin/wikit/460.html
+#
+# Bob wrote:
+# If you need to split string into list using some more complicated rule
+# than builtin split command allows, use following function. It mimics
+# Perl split operator which allows regexp as element separator, but,
+# like builtin split, it expects string to split as first arg and regexp
+# as second (optional) By default, it splits by any amount of whitespace. 
+# Note that if you add parenthesis into regexp, parenthesed part of separator
+# would be added into list as additional element. Just like in Perl. -- cary 
+#
+# Speed improvement by Reinhard Max:
+# Instead of repeatedly copying around the not yet matched part of the
+# string, I use [regexp]'s -start option to restrict the match to that
+# part. This reduces the complexity from something like O(n^1.5) to
+# O(n). My test case for that was:
+# 
+# foreach i {1 10 100 1000 10000} {
+#     set s [string repeat x $i]
+#     puts [time {splitx $s .}]
+# }
+#
+
+if {[package vsatisfies [package provide Tcl] 8.3]} {
+
+    proc ::textutil::split::splitx {str {regexp {[\t \r\n]+}}} {
+        # Bugfix 476988
+        if {[string length $str] == 0} {
+            return {}
+        }
+        if {[string length $regexp] == 0} {
+            return [::split $str ""]
+        }
+	if {[regexp $regexp {}]} {
+	    return -code error \
+		"splitting on regexp \"$regexp\" would cause infinite loop"
+	}
+
+        set list  {}
+        set start 0
+        while {[regexp -start $start -indices -- $regexp $str match submatch]} {
+            foreach {subStart subEnd} $submatch break
+            foreach {matchStart matchEnd} $match break
+            incr matchStart -1
+            incr matchEnd
+            lappend list [string range $str $start $matchStart]
+            if {$subStart >= $start} {
+                lappend list [string range $str $subStart $subEnd]
+            }
+            set start $matchEnd
+        }
+        lappend list [string range $str $start end]
+        return $list
+    }
+
+} else {    
+    # For tcl <= 8.2 we do not have regexp -start...
+    proc ::textutil::split::splitx [list str [list regexp "\[\t \r\n\]+"]] {
+
+        if {[string length $str] == 0} {
+            return {}
+        }
+        if {[string length $regexp] == 0} {
+            return [::split $str {}]
+        }
+	if {[regexp $regexp {}]} {
+	    return -code error \
+		"splitting on regexp \"$regexp\" would cause infinite loop"
+	}
+
+        set list  {}
+        while {[regexp -indices -- $regexp $str match submatch]} {
+            lappend list [string range $str 0 [expr {[lindex $match 0] -1}]]
+            if {[lindex $submatch 0] >= 0} {
+                lappend list [string range $str [lindex $submatch 0] \
+                                  [lindex $submatch 1]]
+            }
+            set str [string range $str [expr {[lindex $match 1]+1}] end]
+        }
+        lappend list $str
+        return $list
+    }
+    
+}
+
+#
+# splitn --
+#
+# splitn splits the string $str into chunks of length $len.  These
+# chunks are returned as a list.
+#
+# If $str really contains a ByteArray object (as retrieved from binary
+# encoded channels) splitn must honor this by splitting the string
+# into chunks of $len bytes.
+#
+# It is an error to call splitn with a nonpositive $len.
+#
+# If splitn is called with an empty string, it returns the empty list.
+#
+# If the length of $str is not an entire multiple of the chunk length,
+# the last chunk in the generated list will be shorter than $len.
+#
+# The implementation presented here was given by Bryan Oakley, as
+# part of a ``contest'' I staged on c.l.t in July 2004.  I selected
+# this version, as it does not rely on runtime generated code, is
+# very fast for chunk size one, not too bad in all the other cases,
+# and uses [split] or [string range] which have been around for quite
+# some time.
+#
+# -- Robert Suetterlin (robert@mpe.mpg.de)
+#
+proc ::textutil::split::splitn {str {len 1}} {
+
+    if {$len <= 0} {
+        return -code error "len must be > 0"
+    }
+
+    if {$len == 1} {
+        return [split $str {}]
+    }
+
+    set result [list]
+    set max [string length $str]
+    set i 0
+    set j [expr {$len -1}]
+    while {$i < $max} {
+        lappend result [string range $str $i $j]
+        incr i $len
+        incr j $len
+    }
+
+    return $result
+}
+
+# ### ### ### ######### ######### #########
+## Data structures
+
+namespace eval ::textutil::split {
+    namespace export splitx splitn
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide textutil::split 0.8
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/string.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/string.tcl
new file mode 100644
index 00000000..f1ad5a46
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/string.tcl
@@ -0,0 +1,144 @@
+# string.tcl --
+#
+#	Utilities for manipulating strings, words, single lines,
+#	paragraphs, ...
+#
+# Copyright (c) 2000      by Ajuba Solutions.
+# Copyright (c) 2000      by Eric Melski <ericm@ajubasolutions.com>
+# Copyright (c) 2002      by Joe English <jenglish@users.sourceforge.net>
+# Copyright (c) 2001-2014 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: string.tcl,v 1.2 2008/03/22 16:03:11 mic42 Exp $
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.2
+
+namespace eval ::textutil::string {}
+
+# ### ### ### ######### ######### #########
+## API implementation
+
+# @c Removes the last character from the given <a string>.
+#
+# @a string: The string to manipulate.
+#
+# @r The <a string> without its last character.
+#
+# @i chopping
+
+proc ::textutil::string::chop {string} {
+    return [string range $string 0 [expr {[string length $string]-2}]]
+}
+
+# @c Removes the first character from the given <a string>.
+# @c Convenience procedure.
+#
+# @a string: string to manipulate.
+#
+# @r The <a string> without its first character.
+#
+# @i tail
+
+proc ::textutil::string::tail {string} {
+    return [string range $string 1 end]
+}
+
+# @c Capitalizes first character of the given <a string>.
+# @c Complementary procedure to <p ::textutil::uncap>.
+#
+# @a string: string to manipulate.
+#
+# @r The <a string> with its first character capitalized.
+#
+# @i capitalize
+
+proc ::textutil::string::cap {string} {
+    return [string toupper [string index $string 0]][string range $string 1 end]
+}
+
+# @c unCapitalizes first character of the given <a string>.
+# @c Complementary procedure to <p ::textutil::cap>.
+#
+# @a string: string to manipulate.
+#
+# @r The <a string> with its first character uncapitalized.
+#
+# @i uncapitalize
+
+proc ::textutil::string::uncap {string} {
+    return [string tolower [string index $string 0]][string range $string 1 end]
+}
+
+# @c Capitalizes first character of each word of the given <a sentence>.
+#
+# @a sentence: string to manipulate.
+#
+# @r The <a sentence> with the first character of each word capitalized.
+#
+# @i capitalize
+
+proc ::textutil::string::capEachWord {sentence} {
+    regsub -all {\S+} [string map {\\ \\\\ \$ \\$} $sentence] {[string toupper [string index & 0]][string range & 1 end]} cmd
+    return [subst -nobackslashes -novariables $cmd]
+}
+
+# Compute the longest string which is common to all strings given to
+# the command, and at the beginning of said strings, i.e. a prefix. If
+# only one argument is specified it is treated as a list of the
+# strings to look at. If more than one argument is specified these
+# arguments are the strings to be looked at. If only one string is
+# given, in either form, the string is returned, as it is its own
+# longest common prefix.
+
+proc ::textutil::string::longestCommonPrefix {args} {
+    return [longestCommonPrefixList $args]
+}
+
+proc ::textutil::string::longestCommonPrefixList {list} {
+    if {[llength $list] <= 1} {
+	return [lindex $list 0]
+    }
+
+    set list [lsort $list]
+    set min [lindex $list 0]
+    set max [lindex $list end]
+
+    # Min and max are the two strings which are most different. If
+    # they have a common prefix, it will also be the common prefix for
+    # all of them.
+
+    # Fast bailouts for common cases.
+
+    set n [string length $min]
+    if {$n == 0} {return ""}
+    if {0 == [string compare $min $max]} {return $min}
+
+    set prefix ""
+    set i 0
+    while {[string index $min $i] == [string index $max $i]} {
+	append prefix [string index $min $i]
+	if {[incr i] > $n} {break}
+    }
+    set prefix
+}
+
+# ### ### ### ######### ######### #########
+## Data structures
+
+namespace eval ::textutil::string {
+    # Export the imported commands
+
+    namespace export chop tail cap uncap capEachWord
+    namespace export longestCommonPrefix
+    namespace export longestCommonPrefixList
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide textutil::string 0.8
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/tabify.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/tabify.tcl
new file mode 100644
index 00000000..543b96cc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/tabify.tcl
@@ -0,0 +1,289 @@
+#
+# As the author of the procs 'tabify2' and 'untabify2' I suggest that the
+# comments explaining their behaviour be kept in this file.
+# 1) Beginners in any programming language (I am new to Tcl so I know what I
+#    am talking about) can profit enormously from studying 'correct' code.
+#    Of course comments will help a lot in this regard.
+# 2) Many problems newbies face can be solved by directing them towards
+#    available libraries - after all, libraries have been written to solve
+#    recurring problems. Then they can just use them, or have a closer look
+#    to see and to discover how things are done the 'Tcl way'.
+# 3) And if ever a proc from a library should be less than perfect, having
+#    comments explaining the behaviour of the code will surely help.
+#
+# This said, I will welcome any error reports or suggestions for improvements
+# (especially on the 'doing things the Tcl way' aspect).
+#
+# Use of these sources is licensed under the same conditions as is Tcl.
+#
+# June 2001, Helmut Giese (hgiese@ratiosoft.com)
+#
+# ----------------------------------------------------------------------------
+#
+# The original procs 'tabify' and 'untabify' each work with complete blocks
+# of $num spaces ('num' holding the tab size). While this is certainly useful
+# in some circumstances, it does not reflect the way an editor works:
+# 	Counting columns from 1, assuming a tab size of 8 and entering '12345'
+#   followed by a tab, you expect to advance to column 9. Your editor might
+#   put a tab into the file or 3 spaces, depending on its configuration.
+#	Now, on 'tabifying' you will expect to see those 3 spaces converted to a
+#	tab (and on the other hand expect the tab *at this position* to be
+#	converted to 3 spaces).
+#
+#	This behaviour is mimicked by the new procs 'tabify2' and 'untabify2'.
+#   Both have one feature in common: They accept multi-line strings (a whole
+#   file if you want to) but in order to make life simpler for the programmer,
+#   they split the incoming string into individual lines and hand each line to
+#   a proc that does the real work.
+#
+#   One design decision worth mentioning here:
+#      A single space is never converted to a tab even if its position would
+#      allow to do so.
+#   Single spaces occur very often, say in arithmetic expressions like
+#   [expr (($a + $b) * $c) < $d]. If we didn't follow the above rule we might
+#   need to replace one or more of them to tabs. However if the tab size gets
+#   changed, this expression would be formatted quite differently - which is
+#   probably not a good idea.
+#
+#   'untabifying' on the other hand might need to replace a tab with a single
+#   space: If the current position requires it, what else to do?
+#   As a consequence those two procs are unsymmetric in this aspect, but I
+#   couldn't think of a better solution. Could you?
+#
+# ----------------------------------------------------------------------------
+#
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.2
+package require textutil::repeat
+
+namespace eval ::textutil::tabify {}
+
+# ### ### ### ######### ######### #########
+## API implementation
+
+namespace eval ::textutil::tabify {
+    namespace import -force ::textutil::repeat::strRepeat
+}
+
+proc ::textutil::tabify::tabify { string { num 8 } } {
+    return [string map [list [MakeTabStr $num] \t] $string]
+}
+
+proc ::textutil::tabify::untabify { string { num 8 } } {
+    return [string map [list \t [MakeTabStr $num]] $string]
+}
+
+proc ::textutil::tabify::MakeTabStr { num } {
+    variable TabStr
+    variable TabLen
+
+    if { $TabLen != $num } then {
+	set TabLen $num
+	set TabStr [strRepeat " " $num]
+    }
+
+    return $TabStr
+}
+
+# ----------------------------------------------------------------------------
+#
+# tabifyLine: Works on a single line of text, replacing 'spaces at correct
+# 		positions' with tabs. $num is the requested tab size.
+#		Returns the (possibly modified) line.
+#
+# 'spaces at correct positions': Only spaces which 'fill the space' between
+# an arbitrary position and the next tab stop can be replaced. 
+# Example: With tab size 8, spaces at positions 11 - 13 will *not* be replaced,
+#          because an expansion of a tab at position 11 will jump up to 16.
+# See also the comment at the beginning of this file why single spaces are
+# *never* replaced by a tab.
+#
+# The proc works backwards, from the end of the string up to the beginning:
+#	- Set the position to start the search from ('lastPos') to 'end'.
+#	- Find the last occurrence of ' ' in 'line' with respect to 'lastPos'
+#         ('currPos' below). This is a candidate for replacement.
+#       - Find to 'currPos' the following tab stop using the expression
+#           set nextTab [expr ($currPos + $num) - ($currPos % $num)]
+#         and get the previous tab stop as well (this will be the starting 
+#         point for the next iteration).
+#	- The ' ' at 'currPos' is only a candidate for replacement if
+#	  1) it is just one position before a tab stop *and*
+#	  2) there is at least one space at its left (see comment above on not
+#	     touching an isolated space).
+#	  Continue, if any of these conditions is not met.
+#	- Determine where to put the tab (that is: how many spaces to replace?)
+#	  by stepping up to the beginning until
+#		-- you hit a non-space or
+#		-- you are at the previous tab position
+#	- Do the replacement and continue.
+#
+# This algorithm only works, if $line does not contain tabs. Otherwise our 
+# interpretation of any position beyond the tab will be wrong. (Imagine you 
+# find a ' ' at position 4 in $line. If you got 3 leading tabs, your *real*
+# position might be 25 (tab size of 8). Since in real life some strings might 
+# already contain tabs, we test for it (and eventually call untabifyLine).
+#
+
+proc ::textutil::tabify::tabifyLine { line num } {
+    if { [string first \t $line] != -1 } { 		
+	# assure array 'Spaces' is set up 'comme il faut'
+	checkArr $num
+	# remove existing tabs
+	set line [untabifyLine $line $num]
+    }
+
+    set lastPos end
+
+    while { $lastPos > 0 } {
+	set currPos [string last " " $line $lastPos]
+	if { $currPos == -1 } {
+	    # no more spaces
+	    break;
+	}
+
+	set nextTab [expr {($currPos + $num) - ($currPos % $num)}]
+	set prevTab [expr {$nextTab - $num}]
+
+	# prepare for next round: continue at 'previous tab stop - 1'
+	set lastPos [expr {$prevTab - 1}]
+
+	if { ($currPos + 1) != $nextTab } {
+	    continue			;# crit. (1)
+	}
+
+	if { [string index $line [expr {$currPos - 1}]] != " " } {
+	    continue			;# crit. (2)
+	}
+
+	# now step backwards while there are spaces
+	for {set pos [expr {$currPos - 2}]} {$pos >= $prevTab} {incr pos -1} {
+	    if { [string index $line $pos] != " " } {
+		break;
+	    }
+	}
+
+	# ... and replace them
+	set line [string replace $line [expr {$pos + 1}] $currPos \t]
+    }
+    return $line
+}
+
+#
+# Helper proc for 'untabifyLine': Checks if all needed elements of array
+# 'Spaces' exist and creates the missing ones if needed.
+#
+
+proc ::textutil::tabify::checkArr { num } {
+    variable TabLen2
+    variable Spaces
+
+    if { $num > $TabLen2 } {
+	for { set i [expr {$TabLen2 + 1}] } { $i <= $num } { incr i } {
+	    set Spaces($i) [strRepeat " " $i]
+	}
+	set TabLen2 $num
+    }
+}
+
+
+# untabifyLine: Works on a single line of text, replacing tabs with enough
+#		spaces to get to the next tab position.
+#		Returns the (possibly modified) line.
+#
+# The procedure is straight forward:
+#	- Find the next tab.
+#	- Calculate the next tab position following it.
+#	- Delete the tab and insert as many spaces as needed to get there.
+#
+
+proc ::textutil::tabify::untabifyLine { line num } {
+    variable Spaces
+
+    set currPos 0
+    while { 1 } {
+	set currPos [string first \t $line $currPos]
+	if { $currPos == -1 } {
+	    # no more tabs
+	    break
+	}
+
+	# how far is the next tab position ?
+	set dist [expr {$num - ($currPos % $num)}]
+	# replace '\t' at $currPos with $dist spaces
+	set line [string replace $line $currPos $currPos $Spaces($dist)]
+
+	# set up for next round (not absolutely necessary but maybe a trifle
+	# more efficient)
+	incr currPos $dist
+    }
+    return $line
+}
+
+# tabify2: Replace all 'appropriate' spaces as discussed above with tabs.
+#	'string' might hold any number of lines, 'num' is the requested tab size.
+#	Returns (possibly modified) 'string'.
+#
+proc ::textutil::tabify::tabify2 { string { num 8 } } {
+
+    # split string into individual lines
+    set inLst [split $string \n]
+
+    # now work on each line
+    set outLst [list]
+    foreach line $inLst {
+	lappend outLst [tabifyLine $line $num]
+    }
+
+    # return all as one string
+    return [join $outLst \n]
+}
+
+
+# untabify2: Replace all tabs with the appropriate number of spaces.
+#	'string' might hold any number of lines, 'num' is the requested tab size.
+#	Returns (possibly modified) 'string'.
+#
+proc ::textutil::tabify::untabify2 { string { num 8 } } {
+
+    # assure array 'Spaces' is set up 'comme il faut'
+    checkArr $num
+
+    set inLst [split $string \n]
+
+    set outLst [list]
+    foreach line $inLst {
+	lappend outLst [untabifyLine $line $num]
+    }
+
+    return [join $outLst \n]
+}
+
+
+
+# ### ### ### ######### ######### #########
+## Data structures
+
+namespace eval ::textutil::tabify {
+    variable TabLen  8
+    variable TabStr  [strRepeat " " $TabLen]
+
+    namespace export tabify untabify tabify2 untabify2
+    
+    # The proc 'untabify2' uses the following variables for efficiency.
+    # Since a tab can be replaced by one up to 'tab size' spaces, it is handy
+    # to have the appropriate 'space strings' available. This is the use of
+    # the array 'Spaces', where 'Spaces(n)' contains just 'n' spaces.
+    # The variable 'TabLen2' remembers the biggest tab size used.
+
+    variable  TabLen2 0
+    variable  Spaces
+    array set Spaces {0 ""}
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide textutil::tabify 0.7
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/textutil.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/textutil.tcl
new file mode 100644
index 00000000..59258514
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/textutil.tcl
@@ -0,0 +1,80 @@
+# textutil.tcl --
+#
+#	Utilities for manipulating strings, words, single lines,
+#	paragraphs, ...
+#
+# Copyright (c) 2000      by Ajuba Solutions.
+# Copyright (c) 2000      by Eric Melski <ericm@ajubasolutions.com>
+# Copyright (c) 2002      by Joe English <jenglish@users.sourceforge.net>
+# Copyright (c) 2001-2006 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: textutil.tcl,v 1.17 2006/09/21 06:46:24 andreas_kupries Exp $
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.2
+
+namespace eval ::textutil {}
+
+# ### ### ### ######### ######### #########
+## API implementation
+## All through sub-packages imported here.
+
+package require textutil::string
+package require textutil::repeat
+package require textutil::adjust
+package require textutil::split
+package require textutil::tabify
+package require textutil::trim
+package require textutil::wcswidth
+
+namespace eval ::textutil {
+    # Import the miscellaneous string command for public export
+
+    namespace import -force string::chop string::tail
+    namespace import -force string::cap string::uncap string::capEachWord
+    namespace import -force string::longestCommonPrefix
+    namespace import -force string::longestCommonPrefixList
+
+    # Import the repeat commands for public export
+
+    namespace import -force repeat::strRepeat repeat::blank
+
+    # Import the adjust commands for public export
+
+    namespace import -force adjust::adjust adjust::indent adjust::undent
+
+    # Import the split commands for public export
+
+    namespace import -force split::splitx split::splitn
+
+    # Import the trim commands for public export
+
+    namespace import -force trim::trim trim::trimleft trim::trimright
+    namespace import -force trim::trimPrefix trim::trimEmptyHeading
+
+    # Import the tabify commands for public export
+
+    namespace import -force tabify::tabify tabify::untabify
+    namespace import -force tabify::tabify2 tabify::untabify2
+
+    # Re-export all the imported commands
+
+    namespace export chop tail cap uncap capEachWord
+    namespace export longestCommonPrefix longestCommonPrefixList
+    namespace export strRepeat blank
+    namespace export adjust indent undent
+    namespace export splitx splitn
+    namespace export trim trimleft trimright trimPrefix trimEmptyHeading
+    namespace export tabify untabify tabify2 untabify2
+}
+
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide textutil 0.9
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/trim.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/trim.tcl
new file mode 100644
index 00000000..4aab0765
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/trim.tcl
@@ -0,0 +1,112 @@
+# trim.tcl --
+#
+#	Various ways of trimming a string.
+#
+# Copyright (c) 2000      by Ajuba Solutions.
+# Copyright (c) 2000      by Eric Melski <ericm@ajubasolutions.com>
+# Copyright (c) 2001-2006 by Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: trim.tcl,v 1.5 2006/04/21 04:42:28 andreas_kupries Exp $
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.2
+
+namespace eval ::textutil::trim {}
+
+# ### ### ### ######### ######### #########
+## API implementation
+
+proc ::textutil::trim::trimleft {text {trim "[ \t]+"}} {
+    regsub -line -all -- [MakeStr $trim left] $text {} text
+    return $text
+}
+
+proc ::textutil::trim::trimright {text {trim "[ \t]+"}} {
+    regsub -line -all -- [MakeStr $trim right] $text {} text
+    return $text
+}
+
+proc ::textutil::trim::trim {text {trim "[ \t]+"}} {
+    regsub -line -all -- [MakeStr $trim left]  $text {} text
+    regsub -line -all -- [MakeStr $trim right] $text {} text
+    return $text
+}
+
+
+
+# @c Strips <a prefix> from <a text>, if found at its start.
+#
+# @a text: The string to check for <a prefix>.
+# @a prefix: The string to remove from <a text>.
+#
+# @r The <a text>, but without <a prefix>.
+#
+# @i remove, prefix
+
+proc ::textutil::trim::trimPrefix {text prefix} {
+    if {[string first $prefix $text] == 0} {
+	return [string range $text [string length $prefix] end]
+    } else {
+	return $text
+    }
+}
+
+
+# @c Removes the Heading Empty Lines of <a text>.
+#
+# @a text: The text block to manipulate.
+#
+# @r The <a text>, but without heading empty lines.
+#
+# @i remove, empty lines
+
+proc ::textutil::trim::trimEmptyHeading {text} {
+    regsub -- "^(\[ \t\]*\n)*" $text {} text
+    return $text
+}
+
+# ### ### ### ######### ######### #########
+## Helper commands. Internal
+
+proc ::textutil::trim::MakeStr { string pos }  {
+    variable StrU
+    variable StrR
+    variable StrL
+
+    if { "$string" != "$StrU" } {
+        set StrU $string
+        set StrR "(${StrU})\$"
+        set StrL "^(${StrU})"
+    }
+    if { "$pos" == "left" } {
+        return $StrL
+    }
+    if { "$pos" == "right" } {
+        return $StrR
+    }
+
+    return -code error "Panic, illegal position key \"$pos\""
+}
+
+# ### ### ### ######### ######### #########
+## Data structures
+
+namespace eval ::textutil::trim {	    
+    variable StrU "\[ \t\]+"
+    variable StrR "(${StrU})\$"
+    variable StrL "^(${StrU})"
+
+    namespace export \
+	    trim trimright trimleft \
+	    trimPrefix trimEmptyHeading
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide textutil::trim 0.7
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/wcswidth.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/wcswidth.tcl
new file mode 100644
index 00000000..a8afafeb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/textutil/wcswidth.tcl
@@ -0,0 +1,2252 @@
+###
+# This file is automatically generated by the build/build.tcl file
+# based on information in the following database:
+# http://www.unicode.org/Public/UCD/latest/ucd/EastAsianWidth.txt
+#
+# (This is the 35th edition, thus version 35 for our package)
+#
+# Author: Sean Woods <yoda@etoyoc.com>
+# Author: Andreas Kupries <andreas.kupries@gmail.com>
+###
+package require Tcl 8.5
+package provide textutil::wcswidth 35.2
+namespace eval ::textutil {}
+
+proc ::textutil::wcswidth_type c {
+  if {$c <= 9734} {
+    if {$c <= 8318} {
+      if {$c <= 465} {
+	if {$c <= 252} {
+	  if {$c <= 208} {
+	    if {$c <= 175} {
+	      if {$c <= 168} {
+		if {$c <= 164} {
+		  if {$c <= 163} {
+		    if {$c <= 161} {
+		      if {$c <= 160} { return N } else { return A }
+		    } else {
+		      return N
+		    }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 166} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 172} {
+		  if {$c <= 170} {
+		    if {$c <= 169} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 174} { return A } else { return N }
+		}
+	      }
+	    } else {
+	      if {$c <= 191} {
+		if {$c <= 186} {
+		  if {$c <= 181} {
+		    if {$c <= 180} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 187} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 207} {
+		  if {$c <= 198} {
+		    if {$c <= 197} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return A
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 237} {
+	      if {$c <= 230} {
+		if {$c <= 225} {
+		  if {$c <= 221} {
+		    if {$c <= 216} {
+		      if {$c <= 214} { return N } else { return A }
+		    } else {
+		      return N
+		    }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 229} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 235} {
+		  if {$c <= 234} {
+		    if {$c <= 231} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return A
+		}
+	      }
+	    } else {
+	      if {$c <= 246} {
+		if {$c <= 241} {
+		  if {$c <= 240} {
+		    if {$c <= 239} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 243} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 251} {
+		  if {$c <= 250} { return A } else { return N }
+		} else {
+		  return A
+		}
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 318} {
+	    if {$c <= 283} {
+	      if {$c <= 273} {
+		if {$c <= 257} {
+		  if {$c <= 256} {
+		    if {$c <= 254} {
+		      if {$c <= 253} { return N } else { return A }
+		    } else {
+		      return N
+		    }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 272} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 282} {
+		  if {$c <= 275} {
+		    if {$c <= 274} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return A
+		}
+	      }
+	    } else {
+	      if {$c <= 304} {
+		if {$c <= 298} {
+		  if {$c <= 295} {
+		    if {$c <= 293} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 299} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 312} {
+		  if {$c <= 311} {
+		    if {$c <= 307} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 357} {
+	      if {$c <= 332} {
+		if {$c <= 327} {
+		  if {$c <= 324} {
+		    if {$c <= 323} {
+		      if {$c <= 322} { return A } else { return N }
+		    } else {
+		      return A
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 331} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 339} {
+		  if {$c <= 337} {
+		    if {$c <= 333} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 462} {
+		if {$c <= 363} {
+		  if {$c <= 362} {
+		    if {$c <= 359} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 461} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 464} {
+		  if {$c <= 463} { return N } else { return A }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  }
+	}
+      } else {
+	if {$c <= 944} {
+	  if {$c <= 712} {
+	    if {$c <= 476} {
+	      if {$c <= 471} {
+		if {$c <= 469} {
+		  if {$c <= 468} {
+		    if {$c <= 467} {
+		      if {$c <= 466} { return A } else { return N }
+		    } else {
+		      return A
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 470} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 474} {
+		  if {$c <= 473} {
+		    if {$c <= 472} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 475} { return N } else { return A }
+		}
+	      }
+	    } else {
+	      if {$c <= 707} {
+		if {$c <= 608} {
+		  if {$c <= 593} {
+		    if {$c <= 592} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 609} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 711} {
+		  if {$c <= 710} {
+		    if {$c <= 708} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 734} {
+	      if {$c <= 727} {
+		if {$c <= 719} {
+		  if {$c <= 717} {
+		    if {$c <= 716} {
+		      if {$c <= 715} { return A } else { return N }
+		    } else {
+		      return A
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 720} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 733} {
+		  if {$c <= 732} {
+		    if {$c <= 731} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 929} {
+		if {$c <= 879} {
+		  if {$c <= 767} {
+		    if {$c <= 735} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 912} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 937} {
+		  if {$c <= 930} { return N } else { return A }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 8221} {
+	    if {$c <= 4351} {
+	      if {$c <= 1039} {
+		if {$c <= 1024} {
+		  if {$c <= 969} {
+		    if {$c <= 962} {
+		      if {$c <= 961} { return A } else { return N }
+		    } else {
+		      return A
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 1025} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 1105} {
+		  if {$c <= 1104} {
+		    if {$c <= 1103} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 8214} {
+		if {$c <= 8208} {
+		  if {$c <= 8207} {
+		    if {$c <= 4447} { return W } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 8210} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 8219} {
+		  if {$c <= 8217} {
+		    if {$c <= 8215} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return A
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 8244} {
+	      if {$c <= 8239} {
+		if {$c <= 8227} {
+		  if {$c <= 8226} {
+		    if {$c <= 8223} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 8231} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 8243} {
+		  if {$c <= 8241} {
+		    if {$c <= 8240} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 8254} {
+		if {$c <= 8251} {
+		  if {$c <= 8250} {
+		    if {$c <= 8245} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 8253} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 8308} {
+		  if {$c <= 8307} { return N } else { return A }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  }
+	}
+      }
+    } else {
+      if {$c <= 8775} {
+	if {$c <= 8657} {
+	  if {$c <= 8485} {
+	    if {$c <= 8453} {
+	      if {$c <= 8363} {
+		if {$c <= 8360} {
+		  if {$c <= 8324} {
+		    if {$c <= 8320} {
+		      if {$c <= 8319} { return A } else { return N }
+		    } else {
+		      return A
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 8361} { return H } else { return N }
+		}
+	      } else {
+		if {$c <= 8451} {
+		  if {$c <= 8450} {
+		    if {$c <= 8364} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 8452} { return N } else { return A }
+		}
+	      }
+	    } else {
+	      if {$c <= 8469} {
+		if {$c <= 8466} {
+		  if {$c <= 8457} {
+		    if {$c <= 8456} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 8467} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 8482} {
+		  if {$c <= 8480} {
+		    if {$c <= 8470} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 8559} {
+	      if {$c <= 8538} {
+		if {$c <= 8530} {
+		  if {$c <= 8491} {
+		    if {$c <= 8490} {
+		      if {$c <= 8486} { return A } else { return N }
+		    } else {
+		      return A
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 8532} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 8555} {
+		  if {$c <= 8543} {
+		    if {$c <= 8542} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 8601} {
+		if {$c <= 8585} {
+		  if {$c <= 8584} {
+		    if {$c <= 8569} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 8591} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 8633} {
+		  if {$c <= 8631} { return N } else { return A }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 8725} {
+	    if {$c <= 8710} {
+	      if {$c <= 8703} {
+		if {$c <= 8678} {
+		  if {$c <= 8660} {
+		    if {$c <= 8659} {
+		      if {$c <= 8658} { return A } else { return N }
+		    } else {
+		      return A
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 8679} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 8707} {
+		  if {$c <= 8705} {
+		    if {$c <= 8704} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 8719} {
+		if {$c <= 8715} {
+		  if {$c <= 8714} {
+		    if {$c <= 8712} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 8718} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 8724} {
+		  if {$c <= 8721} {
+		    if {$c <= 8720} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return A
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 8742} {
+	      if {$c <= 8738} {
+		if {$c <= 8732} {
+		  if {$c <= 8730} {
+		    if {$c <= 8729} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 8736} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 8741} {
+		  if {$c <= 8740} {
+		    if {$c <= 8739} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 8759} {
+		if {$c <= 8750} {
+		  if {$c <= 8749} {
+		    if {$c <= 8748} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 8755} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 8765} {
+		  if {$c <= 8763} { return N } else { return A }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  }
+	}
+      } else {
+	if {$c <= 9203} {
+	  if {$c <= 8853} {
+	    if {$c <= 8809} {
+	      if {$c <= 8799} {
+		if {$c <= 8785} {
+		  if {$c <= 8780} {
+		    if {$c <= 8779} {
+		      if {$c <= 8776} { return A } else { return N }
+		    } else {
+		      return A
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 8786} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 8807} {
+		  if {$c <= 8803} {
+		    if {$c <= 8801} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 8835} {
+		if {$c <= 8815} {
+		  if {$c <= 8813} {
+		    if {$c <= 8811} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 8833} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 8852} {
+		  if {$c <= 8839} {
+		    if {$c <= 8837} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return A
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 8987} {
+	      if {$c <= 8895} {
+		if {$c <= 8869} {
+		  if {$c <= 8868} {
+		    if {$c <= 8857} {
+		      if {$c <= 8856} { return N } else { return A }
+		    } else {
+		      return N
+		    }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 8894} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 8985} {
+		  if {$c <= 8978} {
+		    if {$c <= 8977} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return W
+		}
+	      }
+	    } else {
+	      if {$c <= 9199} {
+		if {$c <= 9192} {
+		  if {$c <= 9002} {
+		    if {$c <= 9000} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 9196} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 9202} {
+		  if {$c <= 9200} { return W } else { return N }
+		} else {
+		  return W
+		}
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 9659} {
+	    if {$c <= 9621} {
+	      if {$c <= 9587} {
+		if {$c <= 9547} {
+		  if {$c <= 9450} {
+		    if {$c <= 9449} {
+		      if {$c <= 9311} { return N } else { return A }
+		    } else {
+		      return N
+		    }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 9551} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 9617} {
+		  if {$c <= 9615} {
+		    if {$c <= 9599} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return A
+		}
+	      }
+	    } else {
+	      if {$c <= 9649} {
+		if {$c <= 9634} {
+		  if {$c <= 9633} {
+		    if {$c <= 9631} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 9641} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 9655} {
+		  if {$c <= 9653} {
+		    if {$c <= 9651} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 9681} {
+	      if {$c <= 9672} {
+		if {$c <= 9665} {
+		  if {$c <= 9663} {
+		    if {$c <= 9661} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 9669} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 9677} {
+		  if {$c <= 9675} {
+		    if {$c <= 9674} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return A
+		}
+	      }
+	    } else {
+	      if {$c <= 9724} {
+		if {$c <= 9710} {
+		  if {$c <= 9701} {
+		    if {$c <= 9697} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 9711} { return A } else { return N }
+		}
+	      } else {
+		if {$c <= 9732} {
+		  if {$c <= 9726} { return W } else { return N }
+		} else {
+		  return A
+		}
+	      }
+	    }
+	  }
+	}
+      }
+    }
+  } else {
+    if {$c <= 65497} {
+      if {$c <= 10070} {
+	if {$c <= 9918} {
+	  if {$c <= 9829} {
+	    if {$c <= 9791} {
+	      if {$c <= 9749} {
+		if {$c <= 9743} {
+		  if {$c <= 9741} {
+		    if {$c <= 9737} {
+		      if {$c <= 9736} { return N } else { return A }
+		    } else {
+		      return N
+		    }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 9747} { return N } else { return W }
+		}
+	      } else {
+		if {$c <= 9757} {
+		  if {$c <= 9756} {
+		    if {$c <= 9755} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 9758} { return A } else { return N }
+		}
+	      }
+	    } else {
+	      if {$c <= 9811} {
+		if {$c <= 9794} {
+		  if {$c <= 9793} {
+		    if {$c <= 9792} { return A } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 9799} { return N } else { return W }
+		}
+	      } else {
+		if {$c <= 9826} {
+		  if {$c <= 9825} {
+		    if {$c <= 9823} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return A
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 9875} {
+	      if {$c <= 9839} {
+		if {$c <= 9837} {
+		  if {$c <= 9835} {
+		    if {$c <= 9834} {
+		      if {$c <= 9830} { return N } else { return A }
+		    } else {
+		      return N
+		    }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 9838} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 9874} {
+		  if {$c <= 9855} {
+		    if {$c <= 9854} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return W
+		}
+	      }
+	    } else {
+	      if {$c <= 9897} {
+		if {$c <= 9888} {
+		  if {$c <= 9887} {
+		    if {$c <= 9885} { return N } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 9889} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 9916} {
+		  if {$c <= 9899} { return W } else { return N }
+		} else {
+		  return W
+		}
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 9978} {
+	    if {$c <= 9955} {
+	      if {$c <= 9939} {
+		if {$c <= 9933} {
+		  if {$c <= 9925} {
+		    if {$c <= 9923} {
+		      if {$c <= 9919} { return A } else { return N }
+		    } else {
+		      return W
+		    }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 9934} { return W } else { return A }
+		}
+	      } else {
+		if {$c <= 9954} {
+		  if {$c <= 9953} {
+		    if {$c <= 9940} { return W } else { return A }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return A
+		}
+	      }
+	    } else {
+	      if {$c <= 9971} {
+		if {$c <= 9962} {
+		  if {$c <= 9961} {
+		    if {$c <= 9959} { return N } else { return A }
+		  } else {
+		    return W
+		  }
+		} else {
+		  if {$c <= 9969} { return A } else { return W }
+		}
+	      } else {
+		if {$c <= 9977} {
+		  if {$c <= 9973} {
+		    if {$c <= 9972} { return A } else { return W }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return W
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 10044} {
+	      if {$c <= 9993} {
+		if {$c <= 9988} {
+		  if {$c <= 9983} {
+		    if {$c <= 9981} {
+		      if {$c <= 9980} { return A } else { return W }
+		    } else {
+		      return A
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 9989} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 10024} {
+		  if {$c <= 10023} {
+		    if {$c <= 9995} { return W } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 10062} {
+		if {$c <= 10060} {
+		  if {$c <= 10059} {
+		    if {$c <= 10045} { return A } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  if {$c <= 10061} { return N } else { return W }
+		}
+	      } else {
+		if {$c <= 10069} {
+		  if {$c <= 10066} { return N } else { return W }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  }
+	}
+      } else {
+	if {$c <= 12771} {
+	  if {$c <= 11930} {
+	    if {$c <= 11034} {
+	      if {$c <= 10159} {
+		if {$c <= 10132} {
+		  if {$c <= 10111} {
+		    if {$c <= 10101} {
+		      if {$c <= 10071} { return W } else { return N }
+		    } else {
+		      return A
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 10135} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 10175} {
+		  if {$c <= 10174} {
+		    if {$c <= 10160} { return W } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 11093} {
+		if {$c <= 11088} {
+		  if {$c <= 11087} {
+		    if {$c <= 11036} { return W } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  if {$c <= 11092} { return N } else { return W }
+		}
+	      } else {
+		if {$c <= 11929} {
+		  if {$c <= 11903} {
+		    if {$c <= 11097} { return A } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 12438} {
+	      if {$c <= 12287} {
+		if {$c <= 12271} {
+		  if {$c <= 12245} {
+		    if {$c <= 12031} {
+		      if {$c <= 12019} { return W } else { return N }
+		    } else {
+		      return W
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 12283} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 12352} {
+		  if {$c <= 12350} {
+		    if {$c <= 12288} { return F } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return W
+		}
+	      }
+	    } else {
+	      if {$c <= 12592} {
+		if {$c <= 12548} {
+		  if {$c <= 12543} {
+		    if {$c <= 12440} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 12591} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 12687} {
+		  if {$c <= 12686} { return W } else { return N }
+		} else {
+		  return W
+		}
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 65039} {
+	    if {$c <= 42182} {
+	      if {$c <= 19903} {
+		if {$c <= 12871} {
+		  if {$c <= 12831} {
+		    if {$c <= 12830} {
+		      if {$c <= 12783} { return N } else { return W }
+		    } else {
+		      return N
+		    }
+		  } else {
+		    return W
+		  }
+		} else {
+		  if {$c <= 12879} { return A } else { return W }
+		}
+	      } else {
+		if {$c <= 42127} {
+		  if {$c <= 42124} {
+		    if {$c <= 19967} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return W
+		}
+	      }
+	    } else {
+	      if {$c <= 57343} {
+		if {$c <= 44031} {
+		  if {$c <= 43388} {
+		    if {$c <= 43359} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 55203} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 65023} {
+		  if {$c <= 64255} {
+		    if {$c <= 63743} { return A } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return A
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 65376} {
+	      if {$c <= 65126} {
+		if {$c <= 65106} {
+		  if {$c <= 65071} {
+		    if {$c <= 65049} { return W } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  if {$c <= 65107} { return N } else { return W }
+		}
+	      } else {
+		if {$c <= 65280} {
+		  if {$c <= 65131} {
+		    if {$c <= 65127} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return F
+		}
+	      }
+	    } else {
+	      if {$c <= 65487} {
+		if {$c <= 65479} {
+		  if {$c <= 65473} {
+		    if {$c <= 65470} { return H } else { return N }
+		  } else {
+		    return H
+		  }
+		} else {
+		  if {$c <= 65481} { return N } else { return H }
+		}
+	      } else {
+		if {$c <= 65495} {
+		  if {$c <= 65489} { return N } else { return H }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  }
+	}
+      }
+    } else {
+      if {$c <= 127991} {
+	if {$c <= 127247} {
+	  if {$c <= 110580} {
+	    if {$c <= 94193} {
+	      if {$c <= 65532} {
+		if {$c <= 65511} {
+		  if {$c <= 65510} {
+		    if {$c <= 65503} {
+		      if {$c <= 65500} { return H } else { return N }
+		    } else {
+		      return F
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 65518} { return H } else { return N }
+		}
+	      } else {
+		if {$c <= 94180} {
+		  if {$c <= 94175} {
+		    if {$c <= 65533} { return A } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  if {$c <= 94191} { return N } else { return W }
+		}
+	      }
+	    } else {
+	      if {$c <= 101631} {
+		if {$c <= 100351} {
+		  if {$c <= 100343} {
+		    if {$c <= 94207} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 101589} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 110579} {
+		  if {$c <= 110575} {
+		    if {$c <= 101640} { return W } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 110959} {
+	      if {$c <= 110927} {
+		if {$c <= 110591} {
+		  if {$c <= 110590} {
+		    if {$c <= 110588} {
+		      if {$c <= 110587} { return W } else { return N }
+		    } else {
+		      return W
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 110882} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 110951} {
+		  if {$c <= 110947} {
+		    if {$c <= 110930} { return W } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 127183} {
+		if {$c <= 126980} {
+		  if {$c <= 126979} {
+		    if {$c <= 111355} { return W } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  if {$c <= 127182} { return N } else { return W }
+		}
+	      } else {
+		if {$c <= 127242} {
+		  if {$c <= 127231} { return N } else { return A }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 127589} {
+	    if {$c <= 127487} {
+	      if {$c <= 127374} {
+		if {$c <= 127343} {
+		  if {$c <= 127337} {
+		    if {$c <= 127279} {
+		      if {$c <= 127277} { return A } else { return N }
+		    } else {
+		      return A
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 127373} { return A } else { return W }
+		}
+	      } else {
+		if {$c <= 127404} {
+		  if {$c <= 127386} {
+		    if {$c <= 127376} { return A } else { return W }
+		  } else {
+		    return A
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 127560} {
+		if {$c <= 127547} {
+		  if {$c <= 127503} {
+		    if {$c <= 127490} { return W } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  if {$c <= 127551} { return N } else { return W }
+		}
+	      } else {
+		if {$c <= 127583} {
+		  if {$c <= 127569} {
+		    if {$c <= 127567} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return W
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 127903} {
+	      if {$c <= 127798} {
+		if {$c <= 127788} {
+		  if {$c <= 127776} {
+		    if {$c <= 127743} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 127797} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 127891} {
+		  if {$c <= 127869} {
+		    if {$c <= 127868} { return W } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 127984} {
+		if {$c <= 127955} {
+		  if {$c <= 127950} {
+		    if {$c <= 127946} { return W } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  if {$c <= 127967} { return N } else { return W }
+		}
+	      } else {
+		if {$c <= 127988} {
+		  if {$c <= 127987} { return N } else { return W }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  }
+	}
+      } else {
+	if {$c <= 129008} {
+	  if {$c <= 128591} {
+	    if {$c <= 128335} {
+	      if {$c <= 128254} {
+		if {$c <= 128065} {
+		  if {$c <= 128064} {
+		    if {$c <= 128063} {
+		      if {$c <= 128062} { return W } else { return N }
+		    } else {
+		      return W
+		    }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 128252} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 128334} {
+		  if {$c <= 128330} {
+		    if {$c <= 128317} { return W } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 128406} {
+		if {$c <= 128378} {
+		  if {$c <= 128377} {
+		    if {$c <= 128359} { return W } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  if {$c <= 128404} { return N } else { return W }
+		}
+	      } else {
+		if {$c <= 128506} {
+		  if {$c <= 128420} {
+		    if {$c <= 128419} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return W
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 128735} {
+	      if {$c <= 128722} {
+		if {$c <= 128716} {
+		  if {$c <= 128715} {
+		    if {$c <= 128709} {
+		      if {$c <= 128639} { return N } else { return W }
+		    } else {
+		      return N
+		    }
+		  } else {
+		    return W
+		  }
+		} else {
+		  if {$c <= 128719} { return N } else { return W }
+		}
+	      } else {
+		if {$c <= 128732} {
+		  if {$c <= 128727} {
+		    if {$c <= 128724} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return W
+		}
+	      }
+	    } else {
+	      if {$c <= 128991} {
+		if {$c <= 128755} {
+		  if {$c <= 128748} {
+		    if {$c <= 128746} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 128764} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 129007} {
+		  if {$c <= 129003} { return W } else { return N }
+		} else {
+		  return W
+		}
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 129733} {
+	    if {$c <= 129660} {
+	      if {$c <= 129535} {
+		if {$c <= 129349} {
+		  if {$c <= 129339} {
+		    if {$c <= 129338} {
+		      if {$c <= 129291} { return N } else { return W }
+		    } else {
+		      return N
+		    }
+		  } else {
+		    return W
+		  }
+		} else {
+		  if {$c <= 129350} { return N } else { return W }
+		}
+	      } else {
+		if {$c <= 129655} {
+		  if {$c <= 129652} {
+		    if {$c <= 129647} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  return W
+		}
+	      }
+	    } else {
+	      if {$c <= 129711} {
+		if {$c <= 129679} {
+		  if {$c <= 129670} {
+		    if {$c <= 129663} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 129708} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 129727} {
+		  if {$c <= 129722} { return W } else { return N }
+		} else {
+		  return W
+		}
+	      }
+	    }
+	  } else {
+	    if {$c <= 196607} {
+	      if {$c <= 129775} {
+		if {$c <= 129759} {
+		  if {$c <= 129753} {
+		    if {$c <= 129743} { return N } else { return W }
+		  } else {
+		    return N
+		  }
+		} else {
+		  if {$c <= 129767} { return W } else { return N }
+		}
+	      } else {
+		if {$c <= 196605} {
+		  if {$c <= 131071} {
+		    if {$c <= 129782} { return W } else { return N }
+		  } else {
+		    return W
+		  }
+		} else {
+		  return N
+		}
+	      }
+	    } else {
+	      if {$c <= 1048573} {
+		if {$c <= 917999} {
+		  if {$c <= 917759} {
+		    if {$c <= 262141} { return W } else { return N }
+		  } else {
+		    return A
+		  }
+		} else {
+		  if {$c <= 983039} { return N } else { return A }
+		}
+	      } else {
+		if {$c <= 1114109} {
+		  if {$c <= 1048575} { return N } else { return A }
+		} else {
+		  return N
+		}
+	      }
+	    }
+	  }
+	}
+      }
+    }
+  }
+}
+
+proc ::textutil::wcswidth_char c {
+  if {$c <= 94193} {
+    if {$c <= 10160} {
+      if {$c <= 9934} {
+	if {$c <= 9799} {
+	  if {$c <= 9199} {
+	    if {$c <= 9000} {
+	      if {$c <= 8985} {
+		if {$c <= 4447} {
+		  if {$c <= 4351} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+		if {$c <= 8987} { return 2 } else { return 1 }
+	      }
+	    } else {
+	      if {$c <= 9196} {
+		if {$c <= 9192} {
+		  if {$c <= 9002} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+	        return 1
+	      }
+	    }
+	  } else {
+	    if {$c <= 9726} {
+	      if {$c <= 9203} {
+		if {$c <= 9202} {
+		  if {$c <= 9200} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+		if {$c <= 9724} { return 1 } else { return 2 }
+	      }
+	    } else {
+	      if {$c <= 9749} {
+		if {$c <= 9747} { return 1 } else { return 2 }
+	      } else {
+	        return 1
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 9897} {
+	    if {$c <= 9875} {
+	      if {$c <= 9855} {
+		if {$c <= 9854} {
+		  if {$c <= 9811} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+		if {$c <= 9874} { return 1 } else { return 2 }
+	      }
+	    } else {
+	      if {$c <= 9889} {
+		if {$c <= 9888} { return 1 } else { return 2 }
+	      } else {
+	        return 1
+	      }
+	    }
+	  } else {
+	    if {$c <= 9923} {
+	      if {$c <= 9918} {
+		if {$c <= 9916} {
+		  if {$c <= 9899} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+	        return 1
+	      }
+	    } else {
+	      if {$c <= 9933} {
+		if {$c <= 9925} { return 2 } else { return 1 }
+	      } else {
+	        return 2
+	      }
+	    }
+	  }
+	}
+      } else {
+	if {$c <= 9995} {
+	  if {$c <= 9977} {
+	    if {$c <= 9969} {
+	      if {$c <= 9961} {
+		if {$c <= 9940} {
+		  if {$c <= 9939} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+		if {$c <= 9962} { return 2 } else { return 1 }
+	      }
+	    } else {
+	      if {$c <= 9973} {
+		if {$c <= 9972} {
+		  if {$c <= 9971} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+	        return 1
+	      }
+	    }
+	  } else {
+	    if {$c <= 9988} {
+	      if {$c <= 9981} {
+		if {$c <= 9980} {
+		  if {$c <= 9978} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+	        return 1
+	      }
+	    } else {
+	      if {$c <= 9993} {
+		if {$c <= 9989} { return 2 } else { return 1 }
+	      } else {
+	        return 2
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 10069} {
+	    if {$c <= 10061} {
+	      if {$c <= 10059} {
+		if {$c <= 10024} {
+		  if {$c <= 10023} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+		if {$c <= 10060} { return 2 } else { return 1 }
+	      }
+	    } else {
+	      if {$c <= 10066} {
+		if {$c <= 10062} { return 2 } else { return 1 }
+	      } else {
+	        return 2
+	      }
+	    }
+	  } else {
+	    if {$c <= 10135} {
+	      if {$c <= 10132} {
+		if {$c <= 10071} {
+		  if {$c <= 10070} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+	        return 2
+	      }
+	    } else {
+	      if {$c <= 10159} { return 1 } else { return 2 }
+	    }
+	  }
+	}
+      }
+    } else {
+      if {$c <= 12831} {
+	if {$c <= 12283} {
+	  if {$c <= 11903} {
+	    if {$c <= 11087} {
+	      if {$c <= 11034} {
+		if {$c <= 10175} {
+		  if {$c <= 10174} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+		if {$c <= 11036} { return 2 } else { return 1 }
+	      }
+	    } else {
+	      if {$c <= 11093} {
+		if {$c <= 11092} {
+		  if {$c <= 11088} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+	        return 1
+	      }
+	    }
+	  } else {
+	    if {$c <= 12031} {
+	      if {$c <= 12019} {
+		if {$c <= 11930} {
+		  if {$c <= 11929} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+	        return 1
+	      }
+	    } else {
+	      if {$c <= 12271} {
+		if {$c <= 12245} { return 2 } else { return 1 }
+	      } else {
+	        return 2
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 12591} {
+	    if {$c <= 12440} {
+	      if {$c <= 12352} {
+		if {$c <= 12350} {
+		  if {$c <= 12287} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+		if {$c <= 12438} { return 2 } else { return 1 }
+	      }
+	    } else {
+	      if {$c <= 12548} {
+		if {$c <= 12543} { return 2 } else { return 1 }
+	      } else {
+	        return 2
+	      }
+	    }
+	  } else {
+	    if {$c <= 12771} {
+	      if {$c <= 12687} {
+		if {$c <= 12686} {
+		  if {$c <= 12592} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+	        return 2
+	      }
+	    } else {
+	      if {$c <= 12830} {
+		if {$c <= 12783} { return 1 } else { return 2 }
+	      } else {
+	        return 1
+	      }
+	    }
+	  }
+	}
+      } else {
+	if {$c <= 65049} {
+	  if {$c <= 43359} {
+	    if {$c <= 42124} {
+	      if {$c <= 19903} {
+		if {$c <= 12879} {
+		  if {$c <= 12871} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+		if {$c <= 19967} { return 1 } else { return 2 }
+	      }
+	    } else {
+	      if {$c <= 42182} {
+		if {$c <= 42127} { return 1 } else { return 2 }
+	      } else {
+	        return 1
+	      }
+	    }
+	  } else {
+	    if {$c <= 63743} {
+	      if {$c <= 55203} {
+		if {$c <= 44031} {
+		  if {$c <= 43388} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+	        return 1
+	      }
+	    } else {
+	      if {$c <= 65039} {
+		if {$c <= 64255} { return 2 } else { return 1 }
+	      } else {
+	        return 2
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 65376} {
+	    if {$c <= 65127} {
+	      if {$c <= 65107} {
+		if {$c <= 65106} {
+		  if {$c <= 65071} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+		if {$c <= 65126} { return 2 } else { return 1 }
+	      }
+	    } else {
+	      if {$c <= 65280} {
+		if {$c <= 65131} { return 2 } else { return 1 }
+	      } else {
+	        return 2
+	      }
+	    }
+	  } else {
+	    if {$c <= 94180} {
+	      if {$c <= 94175} {
+		if {$c <= 65510} {
+		  if {$c <= 65503} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+	        return 2
+	      }
+	    } else {
+	      if {$c <= 94191} { return 1 } else { return 2 }
+	    }
+	  }
+	}
+      }
+    }
+  } else {
+    if {$c <= 128254} {
+      if {$c <= 127503} {
+	if {$c <= 110930} {
+	  if {$c <= 110580} {
+	    if {$c <= 101631} {
+	      if {$c <= 100351} {
+		if {$c <= 100343} {
+		  if {$c <= 94207} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+		if {$c <= 101589} { return 2 } else { return 1 }
+	      }
+	    } else {
+	      if {$c <= 110579} {
+		if {$c <= 110575} {
+		  if {$c <= 101640} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+	        return 1
+	      }
+	    }
+	  } else {
+	    if {$c <= 110591} {
+	      if {$c <= 110590} {
+		if {$c <= 110588} {
+		  if {$c <= 110587} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+	        return 1
+	      }
+	    } else {
+	      if {$c <= 110927} {
+		if {$c <= 110882} { return 2 } else { return 1 }
+	      } else {
+	        return 2
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 127183} {
+	    if {$c <= 126979} {
+	      if {$c <= 110959} {
+		if {$c <= 110951} {
+		  if {$c <= 110947} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+		if {$c <= 111355} { return 2 } else { return 1 }
+	      }
+	    } else {
+	      if {$c <= 127182} {
+		if {$c <= 126980} { return 2 } else { return 1 }
+	      } else {
+	        return 2
+	      }
+	    }
+	  } else {
+	    if {$c <= 127386} {
+	      if {$c <= 127376} {
+		if {$c <= 127374} {
+		  if {$c <= 127373} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+	        return 2
+	      }
+	    } else {
+	      if {$c <= 127490} {
+		if {$c <= 127487} { return 1 } else { return 2 }
+	      } else {
+	        return 1
+	      }
+	    }
+	  }
+	}
+      } else {
+	if {$c <= 127903} {
+	  if {$c <= 127776} {
+	    if {$c <= 127569} {
+	      if {$c <= 127560} {
+		if {$c <= 127551} {
+		  if {$c <= 127547} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+		if {$c <= 127567} { return 1 } else { return 2 }
+	      }
+	    } else {
+	      if {$c <= 127743} {
+		if {$c <= 127589} {
+		  if {$c <= 127583} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+	        return 2
+	      }
+	    }
+	  } else {
+	    if {$c <= 127868} {
+	      if {$c <= 127798} {
+		if {$c <= 127797} {
+		  if {$c <= 127788} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+	        return 2
+	      }
+	    } else {
+	      if {$c <= 127891} {
+		if {$c <= 127869} { return 1 } else { return 2 }
+	      } else {
+	        return 1
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 127991} {
+	    if {$c <= 127984} {
+	      if {$c <= 127955} {
+		if {$c <= 127950} {
+		  if {$c <= 127946} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+		if {$c <= 127967} { return 1 } else { return 2 }
+	      }
+	    } else {
+	      if {$c <= 127988} {
+		if {$c <= 127987} { return 1 } else { return 2 }
+	      } else {
+	        return 1
+	      }
+	    }
+	  } else {
+	    if {$c <= 128065} {
+	      if {$c <= 128064} {
+		if {$c <= 128063} {
+		  if {$c <= 128062} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+	        return 1
+	      }
+	    } else {
+	      if {$c <= 128252} { return 2 } else { return 1 }
+	    }
+	  }
+	}
+      }
+    } else {
+      if {$c <= 129008} {
+	if {$c <= 128715} {
+	  if {$c <= 128406} {
+	    if {$c <= 128359} {
+	      if {$c <= 128334} {
+		if {$c <= 128330} {
+		  if {$c <= 128317} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+		if {$c <= 128335} { return 1 } else { return 2 }
+	      }
+	    } else {
+	      if {$c <= 128404} {
+		if {$c <= 128378} {
+		  if {$c <= 128377} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+	        return 2
+	      }
+	    }
+	  } else {
+	    if {$c <= 128591} {
+	      if {$c <= 128506} {
+		if {$c <= 128420} {
+		  if {$c <= 128419} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+	        return 2
+	      }
+	    } else {
+	      if {$c <= 128709} {
+		if {$c <= 128639} { return 1 } else { return 2 }
+	      } else {
+	        return 1
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 128746} {
+	    if {$c <= 128727} {
+	      if {$c <= 128722} {
+		if {$c <= 128719} {
+		  if {$c <= 128716} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+		if {$c <= 128724} { return 1 } else { return 2 }
+	      }
+	    } else {
+	      if {$c <= 128735} {
+		if {$c <= 128732} { return 1 } else { return 2 }
+	      } else {
+	        return 1
+	      }
+	    }
+	  } else {
+	    if {$c <= 128991} {
+	      if {$c <= 128764} {
+		if {$c <= 128755} {
+		  if {$c <= 128748} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+	        return 1
+	      }
+	    } else {
+	      if {$c <= 129007} {
+		if {$c <= 129003} { return 2 } else { return 1 }
+	      } else {
+	        return 2
+	      }
+	    }
+	  }
+	}
+      } else {
+	if {$c <= 129711} {
+	  if {$c <= 129652} {
+	    if {$c <= 129350} {
+	      if {$c <= 129339} {
+		if {$c <= 129338} {
+		  if {$c <= 129291} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+		if {$c <= 129349} { return 2 } else { return 1 }
+	      }
+	    } else {
+	      if {$c <= 129647} {
+		if {$c <= 129535} { return 2 } else { return 1 }
+	      } else {
+	        return 2
+	      }
+	    }
+	  } else {
+	    if {$c <= 129670} {
+	      if {$c <= 129663} {
+		if {$c <= 129660} {
+		  if {$c <= 129655} { return 1 } else { return 2 }
+		} else {
+		  return 1
+		}
+	      } else {
+	        return 2
+	      }
+	    } else {
+	      if {$c <= 129708} {
+		if {$c <= 129679} { return 1 } else { return 2 }
+	      } else {
+	        return 1
+	      }
+	    }
+	  }
+	} else {
+	  if {$c <= 129775} {
+	    if {$c <= 129753} {
+	      if {$c <= 129733} {
+		if {$c <= 129727} {
+		  if {$c <= 129722} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+		if {$c <= 129743} { return 1 } else { return 2 }
+	      }
+	    } else {
+	      if {$c <= 129767} {
+		if {$c <= 129759} { return 1 } else { return 2 }
+	      } else {
+	        return 1
+	      }
+	    }
+	  } else {
+	    if {$c <= 196607} {
+	      if {$c <= 196605} {
+		if {$c <= 131071} {
+		  if {$c <= 129782} { return 2 } else { return 1 }
+		} else {
+		  return 2
+		}
+	      } else {
+	        return 1
+	      }
+	    } else {
+	      if {$c <= 262141} { return 2 } else { return 1 }
+	    }
+	  }
+	}
+      }
+    }
+  }
+}
+
+proc ::textutil::wcswidth {string} {
+    set width 0
+    set len [string length $string]
+    foreach c [split $string {}] {
+	scan $c %c char
+	set n [::textutil::wcswidth_char $char]
+	if {$n < 0} {
+	    return -1
+	}
+	incr width $n
+    }
+    return $width
+}
+
+# This file is automatically generated by the build/build.tcl file
+# based on information in the following database:
+# http://www.unicode.org/Public/UCD/latest/ucd/EastAsianWidth.txt
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/pkgIndex.tcl
new file mode 100644
index 00000000..1bb2b4ed
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/pkgIndex.tcl
@@ -0,0 +1,9 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded tie                1.2 [list source [file join $dir tie.tcl]]
+package ifneeded tie::std::file     1.1 [list source [file join $dir tie_file.tcl]]
+package ifneeded tie::std::growfile 1.1 [list source [file join $dir tie_growfile.tcl]]
+package ifneeded tie::std::log      1.1 [list source [file join $dir tie_log.tcl]]
+package ifneeded tie::std::array    1.1 [list source [file join $dir tie_array.tcl]]
+package ifneeded tie::std::rarray   1.1 [list source [file join $dir tie_rarray.tcl]]
+package ifneeded tie::std::dsource  1.1 [list source [file join $dir tie_dsource.tcl]]
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie.tcl
new file mode 100644
index 00000000..40279702
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie.tcl
@@ -0,0 +1,510 @@
+# tie.tcl --
+#
+#	Tie arrays to persistence engines.
+#
+# Copyright (c) 2004-2021 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require cmdline
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+# ### ### ### ######### ######### #########
+## Public API
+
+namespace eval ::tie {}
+
+proc ::tie::tie {avar args} {
+    # Syntax : avar ?-open? ?-save? ?-merge? dstype dsargs...?
+
+    variable registry
+
+    upvar 1 $avar thearray
+
+    if {![array exists thearray]} {
+	return -code error "can't tie to \"$avar\": no such array variable"
+    }
+
+    # Create shortcuts for the options, and initialize them.
+    foreach k {open save merge} {upvar 0 opts($k) $k}
+    set open  0
+    set save  0
+    set merge 0
+
+    # Option processing ...
+
+    array set opts [GetOptions args]
+
+    # Basic validation ...
+
+    if {$open && $save} {
+	return -code error "-open and -save exclude each other"
+    } elseif {!$open && !$save} {
+	set open 1
+    }
+
+    if {![llength $args]} {
+	return -code error "dstype and type arguments missing"
+    }
+    set type [lindex $args 0]
+    set args [lrange $args 1 end]
+
+    # Create DS object from type (DS class) and args.
+    if {[::info exists registry($type)]} {
+	set type $registry($type)
+    }
+    set dso [eval [concat $type %AUTO% $args]]
+
+    Connect thearray $open $merge $dso
+    return [NewToken thearray $dso]
+}
+
+proc ::tie::untie {avar args} {
+    # Syntax : arrayvarname ?token?
+
+    variable mgr
+    variable tie
+
+    upvar 1 $avar thearray
+
+    switch -exact -- [llength $args] {
+	0 {
+	    # Remove all ties for the variable. Do nothing if there
+	    # are no ties in place.
+
+	    set mid [TraceManager thearray]
+	    if {$mid eq ""} return
+	}
+	1 {
+	    # Remove a specific tie.
+
+	    set tid [lindex $args 0]
+	    if {![::info exists tie($tid)]} {
+		return -code error "Unknown tie \"$tid\""
+	    }
+
+	    foreach {mid dso} $tie($tid) break
+	    set midvar [TraceManager thearray]
+
+	    if {$mid ne $midvar} {
+		return -code error "Tie \"$tid\" not associated with variable \"$avar\""
+	    }
+
+	    set pos       [lsearch -exact $mgr($mid) $tid]
+	    set mgr($mid) [lreplace $mgr($mid) $pos $pos]
+
+	    unset tie($tid)
+	    $dso destroy
+
+	    # Leave the manager in place if there still ties
+	    # associated with the variable.
+	    if {[llength $mgr($mid)]} return
+	}
+	default {
+	    return -code error "wrong#args: array ?token?"	    
+	}
+    }
+
+    # Delegate full removal to common code.
+    Untie $mid thearray
+    return
+}
+
+proc ::tie::info {cmd args} {
+    variable mgr
+    if {$cmd eq "ties"} {
+	if {[llength $args] != 1} {
+	    return -code error "wrong#args: should be \"tie::info ties avar\""
+	}
+	upvar 1 [lindex $args 0] thearray
+	set mid [TraceManager thearray]
+	if {$mid eq ""} {return {}}
+
+	return $mgr($mid)
+    } elseif {$cmd eq "types"} {
+	if {[llength $args] != 0} {
+	    return -code error "wrong#args: should be \"tie::info types\""
+	}
+	variable registry
+	return [array get registry]
+    } elseif {$cmd eq "type"} {
+	if {[llength $args] != 1} {
+	    return -code error "wrong#args: should be \"tie::info type dstype\""
+	}
+	variable registry
+	set type [lindex $args 0]
+	if {![::info exists registry($type)]} {
+	    return -code error "Unknown type \"$type\""
+	}
+	return $registry($type)
+    } else {
+	return -code error "Unknown command \"$cmd\", should be ties, type, or types"
+    }
+}
+
+proc ::tie::register {dsclasscmd _as_ dstype} {
+    variable registry
+    if {$_as_ ne "as"} {
+	return -code error "wrong#args: should be \"tie::register command 'as' type\""
+    }
+
+    # Resolve a chain of type definitions right now.
+    while {[::info exists registry($dsclasscmd)]} {
+	set dsclasscmd $registry($dsclasscmd)
+    }
+
+    set registry($dstype) $dsclasscmd
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Internal : Framework state
+
+namespace eval ::tie {
+    # Registry of short names and their associated class commands
+
+    variable  registry
+    array set registry {}
+
+    # Management databases for the ties.
+    #
+    #    mgr   : mgr id  -> list (tie id)
+    #    tie   : tie id  -> (mgr id, dso cmd)
+    #
+    #    array  ==> mgr -1---n-> tie
+    #                ^           |
+    #                +-1-------n-+
+    #
+    #    lock  : mgr id x key -> 1/exists 0/!exists
+
+    # Database of managers for arrays.
+    # Also counter for the generation of mgr ids.
+
+    variable mgrcount 0
+    variable mgr ; array set mgr {}
+
+
+    # Database of ties (and their tokens).
+    # Also counter for the generation of tie ids.
+
+    variable  tiecount 0
+    variable  tie ; array set tie {}
+
+    # Database of locked arrays, keys, and data sources.
+
+    variable  lock ; array set lock {}
+
+    # Key	| Meaning
+    # ---	+ -------
+    # $mid,$idx	| Propagation for index $idx is in progress.
+}
+
+# ### ### ### ######### ######### #########
+## Internal : Option processor
+
+proc ::tie::GetOptions {arglistVar} {
+    upvar 1 $arglistVar argv
+
+    set opts [lrange [::cmdline::GetOptionDefaults {
+	{open        {}}
+	{save        {}}
+	{merge       {}}
+    } result] 2 end] ;# Remove ? and help.
+
+    set argc [llength $argv]
+    while {[set err [::cmdline::getopt argv $opts opt arg]]} {
+	if {$err < 0} {
+	    set olist ""
+	    foreach o [lsort $opts] {
+		if {[string match *.arg $o]} {
+		    set o [string range $o 0 end-4]
+		}
+		lappend olist -$o
+	    }
+	    return -code error "bad option \"$opt\",\
+		    should be one of\
+		    [linsert [join $olist ", "] end-1 or]"
+	}
+	set result($opt) $arg
+    }
+    return [array get result]
+}
+
+# ### ### ### ######### ######### #########
+## Internal : Token generator
+
+proc ::tie::NewToken {avar dso} {
+    variable tiecount
+    variable tie
+    variable mgr
+
+    upvar 1 $avar thearray
+
+    set     mid         [NewTraceManager thearray]
+    set     tid         tie[incr tiecount]
+    set     tie($tid)   [list $mid $dso]
+    lappend mgr($mid)   $tid
+    return $tid
+}
+
+# ### ### ### ######### ######### #########
+## Internal : Trace Management
+
+proc ::tie::TraceManager {avar} {
+    upvar 1 $avar thearray
+
+    set traces [trace info variable thearray]
+
+    foreach t $traces {
+	foreach {op cmd} $t break
+	if {
+	    ([llength $cmd] == 2) &&
+	    ([lindex $cmd 0] eq "::tie::Trace")
+	} {
+	    # Our internal manager id is the first argument of the
+	    # trace command we attached to the array.
+	    return [lindex $cmd 1]
+	}
+    }
+    # No framework trace was found, there is no manager.
+    return {}
+}
+
+proc ::tie::NewTraceManager {avar} {
+    variable mgrcount
+    variable mgr
+
+    upvar 1 $avar thearray
+
+    set mid [TraceManager thearray]
+    if {$mid ne ""} {return $mid}
+
+    # No manager was found, we have to create a new one for the
+    # variable.
+
+    set mid [incr mgrcount]
+    set mgr($mid) [list]
+
+    trace add variable thearray \
+	    {write unset} \
+	    [list ::tie::Trace $mid]
+
+    return $mid
+}
+
+proc ::tie::Trace {mid avar idx op} {
+    #puts "[pid] Trace $mid $avar ($idx) $op"
+
+    variable mgr
+    variable tie
+    variable lock
+
+    upvar $avar thearray
+
+    if {($op eq "unset") && ($idx eq "")} {
+	# The variable as a whole is unset. This
+	# destroys all the ties placed on it.
+	# Note: The traces are already gone!
+
+	Untie $mid thearray
+	return
+    }
+
+    if {[::info exists lock($mid,$idx)]} {
+	#puts "%% locked $mid,$idx"
+	return
+    }
+    set lock($mid,$idx) .
+    #puts "%% lock $mid,$idx"
+
+    if {$op eq "unset"} {
+	foreach tid $mgr($mid) {
+	    set dso [lindex $tie($tid) 1]
+	    $dso unsetv $idx
+	}
+    } elseif {$op eq "write"} {
+	set value $thearray($idx)
+	foreach tid $mgr($mid) {
+	    set dso [lindex $tie($tid) 1]
+	    $dso setv $idx $value
+	}
+    } else {
+	#puts "%% unlock/1 $mid,$idx"
+	unset -nocomplain lock($mid,$idx)
+	return -code error "Bad trace call, unexpected operation \"$op\""
+    }
+
+    #puts "%% unlock/2 $mid,$idx"
+    unset -nocomplain lock($mid,$idx)
+    return
+}
+
+proc ::tie::Connect {avar open merge dso} {
+    upvar 1 $avar thearray
+
+    # Doing this as first operation is a convenient check that the ds
+    # object command exists.
+    set dsdata [$dso get]
+ 
+    if {$open} {
+	# Open DS and load data from it.
+
+	# Save current contents of array, for restoration in case of
+	# trouble.
+	set save [array get thearray]
+
+	if {$merge} {
+	    # merge -> Remember the existing keys, so that we
+	    # save their contents after loading the DS as well.
+	    set wback [array names thearray]
+	} else {
+	    # not merge -> Replace existing content.
+	    array unset thearray *
+	}
+
+	if {[set code [catch {
+	    array set thearray $dsdata
+	    # ! Propagation through other ties.
+	} msg]]} {
+	    # Errors found. Reset bogus contents, then reinsert the
+	    # saved information to restore the previous state.
+	    array unset thearray *
+	    array set thearray $save
+
+	    return -code $code \
+		    -errorcode $::errorCode \
+		    -errorinfo $::errorInfo $msg
+	}
+
+	if {$merge} {
+	    # Now save everything we had before the tie was added into
+	    # the DS. This may save data which came from the DS.
+	    foreach idx $wback {
+		$dso setv $idx $thearray($idx)
+	    }
+	}
+    } else {
+	# Save array data to DS.
+
+	# Save current contents of DS, for restoration in case of
+	# trouble.
+	# set save $dsdata
+
+	set source [array get thearray]
+
+	if {$merge} {
+	    # merge -> Remember the existing keys, so that we
+	    # read their contents after saving the array as well.
+	    set rback [$dso names]
+	} else {
+	    # not merge -> Replace existing content.
+	    $dso unset
+	}
+
+	if {[set code [catch {
+	    $dso set $source
+	} msg]]} {
+	    $dso unset
+	    $dso set $dsdata
+
+	    return -code $code \
+		    -errorcode $::errorCode \
+		    -errorinfo $::errorInfo $msg
+	}
+
+	if {$merge} {
+	    # Now read everything we had before the tie was added from
+	    # the DS. This may read data which came from the array.
+	    foreach idx $rback {
+		set thearray($idx) [$dso getv $idx]
+		# ! Propagation through other ties.
+	    }
+	}
+    }
+    return
+}
+
+proc ::tie::Untie {mid avar} {
+    variable mgr
+    variable tie
+    variable lock
+
+    upvar 1 $avar thearray
+
+    trace remove variable thearray \
+	    {write unset} \
+	    [list ::tie::Trace $mid]
+
+    foreach tid $mgr($mid) {
+	foreach {mid dso} $tie($tid) break
+	# ASSERT: mid == mid
+
+	unset tie($tid)
+	$dso destroy
+    }
+
+    unset mgr($mid)
+    array unset lock ${mid},*
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Test helper, peek into internals
+## Returns a serialized representation.
+
+proc ::tie::Peek {} {
+    variable mgr
+    variable tie
+
+    variable mgrcount
+    variable tiecount
+
+    list \
+	    $mgrcount $tiecount \
+	    mgr [Dictsort [array get mgr]] \
+	    tie [Dictsort [array get tie]]
+}
+
+proc ::tie::Reset {} {
+    variable mgrcount 0
+    variable tiecount 0
+    return
+}
+
+proc ::tie::Dictsort {dict} {
+    array set a $dict
+    set out [list]
+    foreach key [lsort [array names a]] {
+	lappend out $key $a($key)
+    }
+    return $out
+}
+
+# ### ### ### ######### ######### #########
+## Standard DS classes
+# @mdgen NODEP: tie::std::log
+# @mdgen NODEP: tie::std::dsource
+# @mdgen NODEP: tie::std::array
+# @mdgen NODEP: tie::std::rarray
+# @mdgen NODEP: tie::std::file
+# @mdgen NODEP: tie::std::growfile
+
+::tie::register {package require tie::std::log      ; ::tie::std::log}      as log
+::tie::register {package require tie::std::dsource  ; ::tie::std::dsource}  as dsource
+::tie::register {package require tie::std::array    ; ::tie::std::array}    as array
+::tie::register {package require tie::std::rarray   ; ::tie::std::rarray}   as remotearray
+::tie::register {package require tie::std::file     ; ::tie::std::file}     as file
+::tie::register {package require tie::std::growfile ; ::tie::std::growfile} as growfile
+
+# ### ### ### ######### ######### #########
+## Ready to go
+
+package provide tie 1.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_array.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_array.tcl
new file mode 100644
index 00000000..6bedeea0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_array.tcl
@@ -0,0 +1,123 @@
+# tie_array.tcl --
+#
+#	Data source: Tcl array.
+#
+# Copyright (c) 2004-2021 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require tie
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::tie::std::array {
+
+    # ### ### ### ######### ######### #########
+    ## Specials
+
+    pragma -hastypemethods no
+    pragma -hasinfo        no
+    pragma -simpledispatch yes
+
+    # ### ### ### ######### ######### #########
+    ## API : Construction & Destruction
+
+    constructor {rvar} {
+	# Bring reference to the array into the object scope,
+	# i.e. namespace of the object. This will fail for proc local
+	# variables. This latter is enforced by the core, to prevent
+	# the existence of dangling references to the variable when
+	# the procedure goes away.
+
+	# upvar 3, because we have to skip 3 snit internal levels to
+	# access the callers level.
+
+	if {[catch {
+	    upvar 3 $rvar ${selfns}::thesource
+	}]} {
+	    return -code error "Illegal use of proc local array variable \"$rvar\""
+	}
+
+	# Now bring the variable into method scope as well, to check
+	# for its existence.
+
+	variable ${selfns}::thesource
+
+	if {![array exists thesource]} {
+	    return -code error "Undefined source array variable \"$rvar\""
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## API : Data source methods
+
+    method get {} {
+	variable ${selfns}::thesource
+	return [array get thesource]
+    }
+
+    method set {dict} {
+	variable ${selfns}::thesource
+	return [array set thesource $dict]
+    }
+
+    method unset {{pattern *}} {
+	variable ${selfns}::thesource
+	array unset thesource $pattern
+	return
+    }
+
+    method names {} {
+	variable ${selfns}::thesource
+	return [array names thesource]
+    }
+
+    method size {} {
+	variable ${selfns}::thesource
+	return [array size thesource]
+    }
+
+    method getv {index} {
+	variable ${selfns}::thesource
+	return $thesource($index)
+    }
+
+    method setv {index value} {
+	variable ${selfns}::thesource
+	set thesource($index) $value
+	return
+    }
+
+    method unsetv {index} {
+	variable ${selfns}::thesource
+	unset thesource($index)
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal : Instance data
+
+    ## During construction the source array variable is imported into
+    ## the namespace of the object, for direct access through a
+    ## constant name. This also allows a direct reference without
+    ## having to deal with changing stack scopes. This is possible if
+    ## and only if the imported array is a namespaced variable. Proc
+    ## local variables cannot be imported into a namespace in this
+    ## manner. Trying to do so results in an error.
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready to go
+
+::tie::register ::tie::std::array as array
+package provide   tie::std::array 1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_dsource.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_dsource.tcl
new file mode 100644
index 00000000..6019d399
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_dsource.tcl
@@ -0,0 +1,53 @@
+# tie_dsource.tcl --
+#
+#	Data source: Data source object. I.e. here we implement a proxy.
+#
+# Copyright (c) 2004-2021 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require tie
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::tie::std::dsource {
+
+    # ### ### ### ######### ######### #########
+    ## Specials
+
+    pragma -hastypemethods no
+    pragma -hasinfo        no
+
+    # ### ### ### ######### ######### #########
+    ## API : Construction & Destruction
+
+    constructor {args} {
+	set delegate $args
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## API : Data source methods
+
+    delegate method * to delegate
+
+    # ### ### ### ######### ######### #########
+    ## Internal : Instance data
+
+    variable delegate ; # The object to delegate to.
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready to go
+
+::tie::register ::tie::std::dsource as dsource
+package provide   tie::std::dsource 1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_file.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_file.tcl
new file mode 100644
index 00000000..1667b175
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_file.tcl
@@ -0,0 +1,272 @@
+# tie_file.tcl --
+#
+#	Data source: Files.
+#
+# Copyright (c) 2004-2021 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require tie
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::tie::std::file {
+    # ### ### ### ######### ######### #########
+    ## Notes
+
+    ## This data source maintains an internal cache for higher
+    ## efficiency, i.e. to avoid having to go out to the slow file.
+
+    ## This cache is handled as follows
+    ##
+    ## - All write operations invalidate the cache and write directly
+    ##   to the file.
+    ##
+    ## - All read operations load from the file if the cache is
+    ##   invalid, and from the cache otherwise
+
+    ## This scheme works well in the following situations:
+
+    ## (a) The data source is created, and then only read from.
+    ## (b) The data source is created, and then only written to.
+    ## (c) The data source is created, read once, and then only
+    ##     written to.
+
+    ## This scheme works badly if the data source is opened and then
+    ## randomly read from and written to. The cache is useless, as it
+    ## is continuously invalidated and reloaded.
+
+    ## This no problem from this developers POV of view however.
+    ## Consider the context. If you have this situation just tie the
+    ## DS to an array A after creation. The tie framework operates on
+    ## the DS in mode (c) and A becomes an explicit cache for the DS
+    ## which is not invalidated by writing to it. IOW this covers
+    ## exactly the situation the DS by itself is not working well for.
+
+    # ### ### ### ######### ######### #########
+    ## Specials
+
+    pragma -hastypemethods no
+    pragma -hasinfo        no
+    pragma -simpledispatch yes
+
+    # ### ### ### ######### ######### #########
+    ## API : Construction & Destruction
+
+    constructor {thepath} {
+	# Locate and open the journal file.
+
+	set path [::file normalize $thepath]
+	if {[::file exists $path]} {
+	    set chan [open $path {RDWR EXCL APPEND}]
+	} else {
+	    set chan [open $path {RDWR EXCL CREAT APPEND}]
+	}
+	fconfigure $chan -buffering none -encoding utf-8
+	return
+    }
+
+    destructor {
+	# Release the channel to the journal file, should it be open.
+	if {$chan ne ""} {close $chan}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## API : Data source methods
+
+    method get {} {
+	if {![::file size $path]} {return {}}
+	$self LoadJournal
+	return [array get cache]
+    }
+
+    method set {dict} {
+	puts $chan [list array set $dict]
+	$self Invalidate
+	return
+    }
+
+    method unset {{pattern *}} {
+	puts $chan [list array unset $pattern]
+	$self Invalidate
+	return
+    }
+
+    method names {} {
+	if {![::file size $path]} {return {}}
+	$self LoadJournal
+	return [array names cache]
+    }
+
+    method size {} {
+	if {![::file size $path]} {return 0}
+	$self LoadJournal
+	return [array size cache]
+    }
+
+    method getv {index} {
+	if {![::file size $path]} {
+	    return -code error "can't read \"$index\": no such variable"
+	}
+	$self LoadJournal
+	return $cache($index)
+    }
+
+    method setv {index value} {
+	puts $chan [list set $index $value]
+	$self Invalidate
+	return
+    }
+
+    method unsetv {index} {
+	puts $chan [list unset $index]
+	$self Invalidate
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal : Instance data
+
+    variable chan {} ; # Channel to write the journal.
+    variable path {} ; # Path to journal file.
+
+    # Journal loading, and cache.
+
+    variable count 0         ; # #Operations in the journal.
+    variable cvalid 0        ; # Validity of the cache.
+    variable cache -array {} ; # Cache for journal
+
+    # Management of the cache: See notes at beginning.
+
+    # ### ### ### ######### ######### #########
+    ## Internal: Loading from the journal.
+
+    method LoadJournal {} {
+	if {$cvalid} return
+	$self Replay
+	$self Compact
+	return
+    }
+
+    method Replay {} {
+	# Use a safe interp for the evaluation of the journal file.
+	# (Empty safe for the hidden commands and the aliases we insert).
+
+	# Called for !cvalid, implies cache does not exist
+
+	set ip [interp create -safe]
+	foreach c [$ip eval {info commands}] {
+	    if {$c eq "rename"} continue
+	    $ip eval [list rename $c {}]
+	}
+	$ip eval {rename rename {}}
+
+	interp alias $ip set   {} $self Set
+	interp alias $ip unset {} $self Unset
+	interp alias $ip array {} $self Array
+
+	array set cache {}
+	set       count 0
+
+	set jchan [open $path r]
+	fconfigure $jchan -encoding utf-8
+	set data [read $jchan]
+	close $jchan
+
+	$ip eval $data
+	interp delete $ip
+
+	set cvalid 1
+	return
+    }
+
+    method Compact {} {
+	# Compact the journal
+
+	#puts @@/2*$count/3*[array size temp]/=/[expr {2*$count >= 3*[array size temp]}]
+
+	# ASSERT cvalid
+
+	# do not compact <=>
+	# 2*ops < 3*size <=>
+	# ops < 3/2*size <=>
+	# ops < 1.5*size
+
+	if {(2*$count) < (3*[array size cache])} return
+
+	::file delete -force ${path}.new
+	set new [open ${path}.new {RDWR EXCL CREAT APPEND}]
+	fconfigure $new -buffering none -encoding utf-8
+
+	# Compress current contents into a single multi-key load operation.
+	puts $new [list array set [array get cache]]
+
+	if {$::tcl_platform(platform) eq "windows"} {
+	    # For windows the open channels prevent us from
+	    # overwriting the old file. We have to leave
+	    # attackers a (small) window of opportunity for
+	    # replacing the file with something they own :(
+	    close $chan
+	    close $new
+	    ::file rename -force ${path}.new $path
+	    set chan [open ${path} {RDWR EXCL APPEND}]
+	    fconfigure $chan -buffering none -encoding utf-8
+	} else {
+	    # Copy compacted journal over the existing one.
+	    ::file rename -force ${path}.new $path
+	    close $chan
+	    set    chan $new
+	}
+	return
+    }
+
+    method Set {index value} {
+	set cache($index) $value
+	incr count
+	return
+    }
+
+    method Unset {index} {
+	unset cache($index)
+	incr count
+	return
+    }
+
+    method Array {cmd detail} {
+	# syntax : set   dict
+	# ...... : unset pattern
+
+	if {$cmd eq "set"} {
+	    array set cache $detail
+	} elseif {$cmd eq "unset"} {
+	    array unset cache $detail
+	} else {
+	    return -code error "Illegal command \"$cmd\""
+	}
+	incr count
+	return
+    }
+
+    method Invalidate {} {
+	if {!$cvalid} return
+	set cvalid 0
+	unset cache
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready to go
+
+::tie::register ::tie::std::file as file
+package provide   tie::std::file 1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_growfile.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_growfile.tcl
new file mode 100644
index 00000000..8339971f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_growfile.tcl
@@ -0,0 +1,146 @@
+# tie_growfile.tcl --
+#
+#	Data source: Files.
+#
+# Copyright (c) 2006-2021 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require tie
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::tie::std::growfile {
+    # ### ### ### ######### ######### #########
+    ## Notes
+
+    ## This data source is geared towards the storage of arrays which
+    ## will never shrink over time. Data is always appended to the
+    ## files associated with this driver. Nothing is ever
+    ## removed. Compaction does not happen either, so modification of
+    ## array entries will keep the old information around in the history.
+
+    # ### ### ### ######### ######### #########
+    ## Specials
+
+    pragma -hastypemethods no
+    pragma -hasinfo        no
+    pragma -simpledispatch yes
+
+    # ### ### ### ######### ######### #########
+    ## API : Construction & Destruction
+
+    constructor {thepath} {
+	# Locate and open the journal file.
+
+	set path [file normalize $thepath]
+	if {[file exists $path]} {
+	    set chan [open $path {RDWR EXCL APPEND}]
+	} else {
+	    set chan [open $path {RDWR EXCL CREAT APPEND}]
+	}
+	fconfigure $chan -buffering none -encoding utf-8
+	return
+    }
+
+    destructor {
+	# Release the channel to the journal file, should it be open.
+	if {$chan ne ""} {close $chan}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## API : Data source methods
+
+    method get {} {
+	if {![file size $path]} {return {}}
+	$self LoadJournal
+	return [array get cache]
+    }
+
+    method names {} {
+	if {![file size $path]} {return {}}
+	$self LoadJournal
+	return [array names cache]
+    }
+
+    method size {} {
+	if {![file size $path]} {return 0}
+	$self LoadJournal
+	return [array size cache]
+    }
+
+    method getv {index} {
+	if {![file size $path]} {
+	    return -code error "can't read \"$index\": no such variable"
+	}
+	$self LoadJournal
+	return $cache($index)
+    }
+
+    method set {dict} {
+	puts  -nonewline $chan $dict
+	puts  -nonewline $chan { }
+	flush            $chan
+	return
+    }
+
+    method setv {index value} {
+	puts  -nonewline $chan [list $index $value]
+	puts  -nonewline $chan { }
+	flush            $chan
+	return
+    }
+
+    method unset {{pattern *}} {
+	return -code error \
+		"Deletion of entries is not allowed by this data source"
+    }
+
+    method unsetv {index} {
+	return -code error \
+		"Deletion of entries is not allowed by this data source"
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal : Instance data
+
+    variable chan {} ; # Channel to write the journal.
+    variable path {} ; # Path to journal file.
+
+    # Journal loading, and cache.
+
+    variable count 0         ; # #Operations in the journal.
+    variable cvalid 0        ; # Validity of the cache.
+    variable cache -array {} ; # Cache for journal
+
+    # Management of the cache: See notes at beginning.
+
+    # ### ### ### ######### ######### #########
+    ## Internal: Loading from the journal.
+
+    method LoadJournal {} {
+	if {$cvalid} return
+	set cvalid 1
+
+	set in [open $path r]
+	array set cache [read $in]
+	close $in
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready to go
+
+::tie::register ::tie::std::growfile as growfile
+package provide   tie::std::growfile 1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_log.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_log.tcl
new file mode 100644
index 00000000..d03635ef
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_log.tcl
@@ -0,0 +1,94 @@
+# tie_log.tcl --
+#
+#	Data source: /dev/null. Just log changes.
+#
+# Copyright (c) 2004-2021 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require log
+package require tie
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+package require snit
+snit::type ::tie::std::log {
+
+    # ### ### ### ######### ######### #########
+    ## Specials
+
+    pragma -hastypemethods no
+    pragma -hasinfo        no
+    pragma -simpledispatch yes
+
+    # ### ### ### ######### ######### #########
+    ## API : Construction & Destruction
+
+    constructor {} {
+	::log::log debug "$self construction"
+	return
+    }
+
+    destructor {
+	::log::log debug "$self destruction"
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## API : Data source methods
+
+    method get {} {
+	::log::log debug "$self get (nothing)"
+	return {}
+    }
+
+    method set {dict} {
+	::log::log debug "$self set [list $dict]"
+	return
+    }
+
+    method unset {{pattern *}} {
+	::log::log debug "$self unset $pattern"
+	return
+    }
+
+    method names {} {
+	::log::log debug "$self names (nothing)"
+	return {}
+    }
+
+    method size {} {
+	::log::log debug "$self size (0)"
+	return 0
+    }
+
+    method getv {index} {
+	::log::log debug "$self get ($index)"
+	return {}
+    }
+
+    method setv {index value} {
+	::log::log debug "$self set ($index) = \[$value\]"
+	return
+    }
+
+    method unsetv {index} {
+	::log::log debug "$self unset ($index)"
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready to go
+
+::tie::register ::tie::std::log as log
+package provide   tie::std::log 1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_rarray.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_rarray.tcl
new file mode 100644
index 00000000..066e7914
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tie/tie_rarray.tcl
@@ -0,0 +1,117 @@
+# tie_rarray.tcl --
+#
+#	Data source: Remote Tcl array.
+#
+# Copyright (c) 2004-2021 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require tie
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::tie::std::rarray {
+
+    # ### ### ### ######### ######### #########
+    ## Specials
+
+    pragma -hastypemethods no
+    pragma -hasinfo        no
+    pragma -simpledispatch yes
+
+    # ### ### ### ######### ######### #########
+    ## API : Construction & Destruction
+
+    constructor {rvar cmdpfx id} {
+	set remotevar $rvar
+	set cmd       $cmdpfx
+	set rid       $id
+
+	if {![$self Call array exists $rvar]} {
+	    return -code error "Undefined source array variable \"$rvar\""
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## API : Data source methods
+
+    method get {} {
+	return [$self Call array get $remotevar]
+    }
+
+    method set {dict} {
+	$self Call array set $remotevar $dict
+	return
+    }
+
+    method unset {{pattern *}} {
+	$self Call array unset $remotevar $pattern
+	return
+    }
+
+    method names {} {
+	return [$self Call array names $remotevar]
+    }
+
+    method size {} {
+	return [$self Call array size $remotevar]
+    }
+
+    method getv {index} {
+	return [$self Call set ${remotevar}($index)]
+    }
+
+    method setv {index value} {
+	$self Call set ${remotevar}($index) $value
+	return
+    }
+
+    method unsetv {index} {
+	$self Call unset -nocomplain ${remotevar}($index)
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal : Instance data
+
+    variable remotevar {} ; # Name of rmeote array
+    variable cmd       {} ; # Send command prefix
+    variable rid       {} ; # Id of entity hosting the array.
+
+    # ### ### ### ######### ######### #########
+    ## Internal: Calling to the remote entity.
+
+    ## All calls are synchronous. Asynchronous operations would
+    ## created problems with circular ties. Because the operation may
+    ## came back so much later that the origin is already in a
+    ## completely new state. This is avoied in synchronous mode as the
+    ## origin waits for the change to be acknowledged, and the
+    ## operation came back in this time. The change made by it is no
+    ## problem. The trace is still running, thus any write does _not_
+    ## re-invoke our trace. The only possible problem is an unset for
+    ## an element already gone. This was solved by using -nocomplain
+    ## when propagating this type of change.
+
+    method Call {args} {
+	set     c $cmd
+	lappend c $rid
+	lappend c $args
+	return [uplevel #0 $c]
+    }
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready to go
+
+::tie::register ::tie::std::rarray as remotearray
+package provide   tie::std::rarray 1.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tiff/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tiff/pkgIndex.tcl
new file mode 100644
index 00000000..6e908d2f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tiff/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded tiff 0.2.1 [list source [file join $dir tiff.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tiff/tiff.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tiff/tiff.tcl
new file mode 100644
index 00000000..bcc8cbae
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tiff/tiff.tcl
@@ -0,0 +1,787 @@
+# tiff.tcl --
+#
+#       Querying and modifying TIFF image files.
+#
+# Copyright (c) 2004    Aaron Faupell <afaupell@users.sourceforge.net>
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: @(#) $Id: tiff.tcl,v 1.5 2008/03/24 03:48:59 andreas_kupries Exp $
+
+package provide tiff 0.2.1
+
+namespace eval ::tiff {}
+
+proc ::tiff::openTIFF {file {mode r}} {
+    variable byteOrder
+    set fh [open $file $mode]
+    fconfigure $fh -encoding binary -translation binary -eofchar {}
+    binary scan [read $fh 2] H4 byteOrder
+    if {$byteOrder == "4949"} {
+        set byteOrder little
+    } elseif {$byteOrder == "4d4d"} {
+        set byteOrder big
+    } else {
+        close $fh
+        return -code error "not a tiff file"
+    }
+    _scan $byteOrder [read $fh 6] si version offset
+    if {$version != "42"} {
+        close $fh
+        return -code error "not a tiff file"
+    }
+    seek $fh $offset start
+    return $fh
+}
+
+proc ::tiff::isTIFF {file} {
+    set is [catch {openTIFF $file} fh]
+    catch {close $fh}
+    return [expr {!$is}]
+}
+
+proc ::tiff::byteOrder {file} {
+    variable byteOrder
+    set fh [openTIFF $file]
+    close $fh
+    return $byteOrder
+}
+
+proc ::tiff::nametotag {names} {
+    variable tiff_sgat
+    set out {}
+    foreach x $names {
+        set y [lindex $x 0]
+        if {[info exists tiff_sgat($y)]} {
+            set y $tiff_sgat($y)
+        } elseif {![string match {[0-9a-f][0-9a-f][0-9a-f][0-9a-f]} $x]} {
+            error "unknown tag $y"
+        }
+        lappend out [lreplace $x 0 0 $y]
+    }
+    return $out
+}
+
+proc ::tiff::tagtoname {tags} {
+    variable tiff_tags
+    set out {}
+    foreach x $tags {
+        set y [lindex $x 0]
+        if {[info exists tiff_tags($y)]} { set y $tiff_tags($y) }
+        lappend out [lreplace $x 0 0 $y]
+    }
+    return $out
+}
+
+proc ::tiff::numImages {file} {
+    variable byteOrder
+    set fh [openTIFF $file]
+    set images [llength [_ifds $fh]]
+    close $fh
+    return $images
+}
+
+proc ::tiff::dimensions {file {image 0}} {
+    array set tmp [getEntry $file {0100 0101} $image]
+    return [list $tmp(0100) $tmp(0101)]
+}
+
+proc ::tiff::imageInfo {file {image 0}} {
+    return [getEntry $file {ImageWidth ImageLength BitsPerSample Compression \
+          PhotometricInterpretation ImageDescription Orientation XResolution \
+          YResolution ResolutionUnit DateTime Artist HostComputer} $image]
+}
+
+proc ::tiff::entries {file {image 0}} {
+    variable byteOrder
+    set fh [openTIFF $file]
+    set ret {}
+    if {[set ifd [lindex [_ifds $fh] $image]] != ""} {
+        seek $fh $ifd
+        foreach e [tagtoname [_entries $fh]] {
+            lappend ret [lindex $e 0]
+        }
+    }
+    close $fh
+    return $ret
+}
+
+proc ::tiff::getEntry {file entry {image 0}} {
+    variable byteOrder
+    set fh [openTIFF $file]
+    set ret {}
+    if {[set ifd [lindex [_ifds $fh] $image]] != ""} {
+        seek $fh $ifd 
+        set ent [_entries $fh]
+        foreach e $entry {
+            if {[set x [lsearch -inline $ent "[nametotag $e] *"]] != ""} {
+                seek $fh [lindex $x 1]
+                lappend ret $e [lindex [_getEntry $fh] 1]
+            } else {
+                lappend ret $e {}
+            }
+        }
+    }
+    close $fh
+    return $ret
+}
+
+proc ::tiff::addEntry {file entry {image 0}} {
+    variable byteOrder
+    set fh [openTIFF $file]
+    set new [_new $file.tmp $byteOrder]
+    set ifds [_ifds $fh]
+    for {set i 0} {$i < [llength $ifds]} {incr i} {
+        seek $fh [lindex $ifds $i]
+        _readifd $fh ifd
+        if {$i == $image || $image == "all"} {
+            foreach e [nametotag $entry] {
+                set ifd($e) [eval [linsert $e 0 _unformat $byteOrder]]
+            }
+        }
+        _copyData $fh $new ifd
+    }
+    close $fh
+    close $new
+    file rename -force $file.tmp $file
+}
+
+proc ::tiff::deleteEntry {file entry {image 0}} {
+    variable byteOrder
+    set fh [openTIFF $file]
+    set new [_new $file.tmp $byteOrder]
+    set ifds [_ifds $fh]
+    for {set i 0} {$i < [llength $ifds]} {incr i} {
+        seek $fh [lindex $ifds $i]
+        _readifd $fh ifd
+        if {$i == $image || $image == "all"} {
+            foreach e [nametotag $entry] { unset -nocomplain ifd($e) }
+        }
+        _copyData $fh $new ifd
+    }
+    close $fh
+    close $new
+    file rename -force $file.tmp $file
+}
+
+proc ::tiff::writeImage {image file {entry {}}} {
+    variable byteOrder
+    set byteOrder big
+    set fh [_new $file $byteOrder]
+    set w [$image cget -width]
+    set h [$image cget -height]
+    set ifd(0100) [_unformat $byteOrder 0100 4 $w]      ;# width
+    set ifd(0101) [_unformat $byteOrder 0101 4 $h]      ;# height
+    set ifd(0102) [_unformat $byteOrder 0102 3 {8 8 8}] ;# color depth
+    set ifd(0103) [_unformat $byteOrder 0103 3 1]       ;# compression = none
+    set ifd(0106) [_unformat $byteOrder 0106 3 2]       ;# photometric interpretation = rgb
+    set ifd(0115) [_unformat $byteOrder 0115 3 3]       ;# 3 samples per pixel r, g, and b
+    set ifd(011c) [_unformat $byteOrder 011c 3 1]       ;# planar configuration = rgb
+    foreach {tag format value} $entry {
+        set ifd($tag) [_unformat $byteOrder $tag $format $value]
+    }
+
+    set rowsPerStrip 2
+    while {$w * 3 * $rowsPerStrip < 8000} { incr rowsPerStrip }
+    incr rowsPerStrip -1
+    set strips [expr {int(ceil($h / double($rowsPerStrip)))}]
+    set stripSize [expr {$w * $rowsPerStrip * 3}]
+    set lastStripSize [expr {3 * $w * ($h - (($strips - 1) * $rowsPerStrip))}]
+    
+    for {set i $strips} {$i > 1} {incr i -1} { lappend sizes $stripSize }
+    lappend sizes $lastStripSize
+    
+    set ifd(0116) [_unformat $byteOrder 0116 4 $rowsPerStrip]
+    set ifd(0111) [_unformat $byteOrder 0111 4 $sizes]
+    # dummy data, to get ifd size, real value inserted later
+    set ifd(0117) [_unformat $byteOrder 0117 4 $sizes]
+    
+    # add 8 bytes for file header
+    set start [expr {[_ifdsize ifd] + 8}]
+    for {set i $strips} {$i > 0} {incr i -1} {
+        lappend offsets $start
+        incr start $stripSize
+    }
+    set ifd(0111) [_unformat $byteOrder 0111 4 $offsets]
+    
+    _writeifd $fh ifd
+
+    for {set y 0} {$y < $h} {incr y} {
+        for {set x 0} {$x < $w} {incr x} {
+            foreach {r g b} [$image get $x $y] {
+                puts -nonewline $fh [_unscan $byteOrder ccc [expr {$r & 0xFF}] [expr {$g & 0xFF}] [expr {$b & 0xFF}]]
+            }
+        }
+    }
+    
+    close $fh
+}
+
+proc ::tiff::getImage {file {image 0}} {
+    array set tags [getEntry $file {0100 0101 0102 0103 0106 011c 0115 0111 0117 0140} $image]
+    if {$tags(0102) == "8 8 8" && $tags(0103) == 1 && $tags(0106) == 2 && $tags(0115) == 3 && $tags(011c) == 1} {
+        set w $tags(0100)
+        set h $tags(0101)
+        set i [image create photo -height $h -width $w]
+        set fh [open $file]
+        fconfigure $fh -translation binary -encoding binary -eofchar {}
+
+        set y 0
+        set x 0
+        set row {}
+        set block {}
+        foreach offset $tags(0111) len $tags(0117) {
+            seek $fh $offset start
+            binary scan [read $fh $len] c* buf
+            foreach {r g b} $buf {
+                lappend row [format "#%02X%02X%02X" [expr {$r & 0xFF}] [expr {$g & 0xFF}] [expr {$b & 0xFF}]]
+                incr x
+                if {$x == $w} { lappend block $row; set row {}; set x 0 }
+            }
+            $i put $block -to 0 $y
+            incr y [llength $block]
+            set block {}
+        }
+        close $fh
+    } elseif {$tags(0102) == 8 && $tags(0103) == 1 && $tags(0106) == 3 && $tags(0115) == 1 && $tags(011c) == 1} {
+        set w $tags(0100)
+        set h $tags(0101)
+        set i [image create photo -height $h -width $w]
+        set fh [open $file]
+        fconfigure $fh -translation binary -encoding binary -eofchar {}
+
+        set map {}
+        set third [expr {[llength $tags(0140)] / 3}]
+        set rs [lrange $tags(0140) 0 [expr {$third - 1}]]
+        set gs [lrange $tags(0140) $third [expr {($third * 2) - 1}]]
+        set bs [lrange $tags(0140) [expr {$third * 2}] end]
+        foreach r $rs g $gs b $bs {
+            set r [expr {int($r / 256) & 0xFF}]
+            set g [expr {int($g / 256) & 0xFF}]
+            set b [expr {int($b / 256) & 0xFF}]
+            lappend map [format "#%02X%02X%02X" $r $g $b]
+        }
+        
+        set y 0
+        set x 0
+        set row {}
+        set block {}
+        
+        foreach offset $tags(0111) len $tags(0117) {
+            seek $fh $offset start
+            binary scan [read $fh $len] c* buf
+            foreach index $buf {
+                lappend row [lindex $map [expr {$index & 0xFF}]]
+                incr x
+                if {$x == $w} { lappend block $row; set row {}; set x 0 }
+            }
+            $i put $block -to 0 $y
+            incr y [llength $block]
+            set block {}
+        }
+        close $fh
+    } else {
+        error "I cant read that image format"
+    }
+    return $i
+}
+
+proc ::tiff::_copyData {fh new var} {
+    variable byteOrder
+    upvar $var ifd
+
+    set fix {}
+    #       strips, free bytes, tiles,   and their sizes     
+    foreach f_off {0111 0120 0143} f_len {0117 0121 0144} {
+        if {![info exists ifd($f_len)] || ![info exists ifd($f_off)]} { continue }
+        set n 0
+        # put everything into a list
+        foreach x [_value $ifd($f_len)] y [_value $ifd($f_off)] {
+            lappend fix [list $n $f_len $x $f_off $y]
+            incr n
+        }
+    }
+    set offset [expr {[tell $new] + [_ifdsize ifd]}]
+    set new_fix {}
+    # sort the list by offset
+    foreach x [lsort -integer -index 4 $fix] {
+        lappend new_fix [lreplace $x 4 4 $offset]
+        incr offset [lindex $x 2]
+    }
+    foreach x [lsort -integer -index 0 $new_fix] {
+        lappend blah([lindex $x 3]) [lindex $x 4]
+    }
+    foreach x [array names blah] {
+        _scan $byteOrder [lindex $ifd($x) 0] x2s format
+        set ifd($x) [_unformat $byteOrder $x $format $blah($x)]
+    }
+    if {[info exists ifd(8769)]} {
+        seek $fh [_value $ifd(8769)]
+        _readifd $fh exif
+        _scan $byteOrder [lindex $ifd($x) 0] x2s format
+        set ifd(8769) [_unformat $byteOrder 8769 $format $offset]
+    }
+    _writeifd $new ifd
+        
+    foreach x $fix {
+        seek $fh [lindex $x 4] start
+        fcopy $fh $new -size [lindex $x 2]
+    }
+    if {[info exists ifd(8769)]} {
+        _writeifd $new exif
+    }
+}
+
+# returns a list of offsets of all the IFDs
+proc ::tiff::_ifds {fh} {
+    variable byteOrder
+
+    # number of entries in this ifd
+    _scan $byteOrder [read $fh 2] s num
+    # subract 2 to account for reading the number
+    set ret [list [expr {[tell $fh] - 2}]]
+    # skip the entries, 12 bytes each
+    seek $fh [expr {$num * 12}] current
+    # 4 byte offset to next ifd after entries
+    _scan $byteOrder [read $fh 4] i next
+
+    while {$next > 0} {
+        seek $fh $next start
+        _scan $byteOrder [read $fh 2] s num
+        lappend ret [expr {[tell $fh] - 2}]
+        seek $fh [expr {$num * 12}] current
+        _scan $byteOrder [read $fh 4] i next
+    }
+    return $ret
+}
+
+# takes fh at start of IFD and returns entries, offset, and size
+proc ::tiff::_entries {fh} {
+    variable byteOrder
+    variable formats
+    set ret {}
+    _scan $byteOrder [read $fh 2] s num
+    for {} {$num > 0} {incr num -1} {
+        set offset [tell $fh]
+        binary scan [read $fh 2] H2H2 t1 t2
+        _scan $byteOrder [read $fh 6] si format components
+        seek $fh 4 current
+        if {$byteOrder == "big"} {
+            set tag $t1$t2
+        } else {
+            set tag $t2$t1
+        }
+        #puts "$tag $format $components"
+        set size [expr {$formats($format) * $components}]
+        lappend ret [list $tag $offset $size]
+    }
+    return $ret
+}
+
+# takes fh at start of dir entry and returns tag and value(s)
+proc ::tiff::_getEntry {fh} {
+    variable byteOrder
+    variable formats
+    binary scan [read $fh 2] H2H2 t1 t2
+    _scan $byteOrder [read $fh 6] si format components
+    if {$byteOrder == "big"} {
+        set tag $t1$t2
+    } else {
+        set tag $t2$t1
+    }
+    set value [read $fh 4]
+    set size [expr {$formats($format) * $components}]
+    #puts "entry $tag $format $components $size"
+    # if the data is over 4 bytes, its stored later in the file
+    if {$size > 4} {
+        set pos [tell $fh]
+        _scan $byteOrder $value i value
+        seek $fh $value start
+        set value [read $fh $size]
+        seek $fh $pos start
+    }
+    return [list $tag [_format $byteOrder $value $format $components]]
+}
+
+proc ::tiff::_value {data} {
+    variable byteOrder
+    _scan $byteOrder [lindex $data 0] x2si format components
+    return [_format $byteOrder [lindex $data 1] $format $components]
+}
+
+proc ::tiff::_new {file byteOrder} {
+    set fh [open $file w]
+    fconfigure $fh -encoding binary -translation binary -eofchar {}
+    if {$byteOrder == "big"} {
+        puts -nonewline $fh [binary format H4 4d4d]
+    } else {
+        puts -nonewline $fh [binary format H4 4949]
+    }
+    puts -nonewline $fh [_unscan $byteOrder si 42 8]
+    return $fh
+}
+
+proc ::tiff::_readifd {fh var} {
+    variable byteOrder
+    variable formats
+    upvar $var ifd
+    array set ifd {}
+    _scan $byteOrder [read $fh 2] s num
+    for {} {$num > 0} {incr num -1} {
+        set one [read $fh 8]
+        binary scan $one H2H2 t1 t2
+        _scan $byteOrder $one x2si format components
+        if {$byteOrder == "big"} {
+            set tag $t1$t2
+        } else {
+            set tag $t2$t1
+        }
+        set ifd($tag) [list $one]
+        set value [read $fh 4]
+        set size [expr {$formats($format) * $components}]
+        if {$size > 4} {
+            set pos [tell $fh]
+            _scan $byteOrder $value i value
+            seek $fh $value start
+            lappend ifd($tag) [read $fh $size]
+            seek $fh $pos start
+        } else {
+            lappend ifd($tag) $value
+        }
+    }
+}
+
+proc ::tiff::_writeifd {new var} {
+    variable byteOrder
+    upvar $var ifd
+    set num [llength [array names ifd]]
+    puts -nonewline $new [_unscan $byteOrder s $num]
+    set dataOffset [expr {[tell $new] + ($num * 12) + 4}]
+    set data {}
+    foreach tag [lsort [array names ifd]] {
+        set entry $ifd($tag)
+        puts -nonewline $new [lindex $entry 0]
+        if {[string length [lindex $entry 1]] > 4} {
+            puts -nonewline $new [_unscan $byteOrder i $dataOffset]
+            append data [lindex $entry 1]
+            incr dataOffset [string length [lindex $entry 1]]
+        } else {
+            puts -nonewline $new [lindex $entry 1]
+        }
+    }
+    set next [tell $new]
+    puts -nonewline $new [binary format i 0]
+    puts -nonewline $new $data
+    return $next
+}
+
+proc ::tiff::_ifdsize {var} {
+    upvar $var ifd
+    # 2 bytes for number of entries and 4 bytes for pointer to next ifd
+    set size 6
+    foreach x [array names ifd] {
+        incr size 12
+        # include data that doesnt fit in entry
+        if {[string length [lindex $ifd($x) 1]] > 4} {
+            incr size [string length [lindex $ifd($x) 1]]
+        }
+    }
+    return $size
+}
+
+proc ::tiff::debug {file} {
+    variable byteOrder
+    variable tiff_tags
+    set fh [openTIFF $file]
+    set n 0
+    foreach ifd [_ifds $fh] {
+        seek $fh $ifd start
+        set entries [_entries $fh]
+        puts "IFD $n ([llength $entries] entries)"
+        foreach ent $entries {
+            if {[info exists tiff_tags([lindex $ent 0])]} {
+                puts -nonewline "  $tiff_tags([lindex $ent 0])"
+            } else {
+                puts -nonewline "  [lindex $ent 0]"
+            }
+            if {[lindex $ent 2] < 200} {
+                seek $fh [lindex $ent 1] start
+                puts ": [lindex [_getEntry $fh] 1]"
+            } else {
+                puts " offset [lindex $ent 1] size [lindex $ent 2] bytes"
+            }
+            if {[lindex $ent 0] == "8769"} {
+                seek $fh [lindex $ent 1] start
+                seek $fh [lindex [_getEntry $fh] 1]
+                foreach x [_entries $fh] {
+                    seek $fh [lindex $x 1]
+                    puts "    [_getEntry $fh]"
+                }
+            }
+        }
+        incr n
+    }
+}
+
+array set ::tiff::tiff_tags {
+    00fe NewSubfileType
+    00ff SubfileType 
+    0100 ImageWidth 
+    0101 ImageLength
+    0102 BitsPerSample 
+    0103 Compression
+    0106 PhotometricInterpretation
+    0107 Threshholding 
+    0108 CellWidth  
+    0109 CellLength 
+    010a FillOrder
+    010e ImageDescription
+    010f Make
+    0110 Model
+    0111 StripOffsets
+    0112 Orientation   
+    0115 SamplesPerPixel
+    0116 RowsPerStrip
+    0117 StripByteCounts
+    0118 MinSampleValue
+    0119 MaxSampleValue
+    011a XResolution 
+    011b YResolution
+    011c PlanarConfiguration
+    0120 FreeOffsets
+    0121 FreeByteCounts
+    0122 GrayResponseUnit
+    0123 GrayResponseCurve
+    0128 ResolutionUnit
+    0131 Software
+    0132 DateTime
+    013b Artist
+    013c HostComputer
+    0140 ColorMap
+    0152 ExtraSamples
+    8298 Copyright
+
+    010d DocumentName 
+    011d PageName   
+    011e XPosition  
+    011f YPosition   
+    0124 T4Options
+    0125 T6Options
+    0129 PageNumber
+    012d TransferFunction
+    013d Predictor
+    013e WhitePoint
+    013f PrimaryChromaticities
+    0141 HalftoneHints
+    0142 TileWidth   
+    0143 TileLength  
+    0144 TileOffsets
+    0145 TileByteCounts  
+    0146 BadFaxLines
+    0147 CleanFaxData
+    0148 ConsecutiveBadFaxLines
+    014a SubIFDs
+    014c InkSet
+    014d InkNames
+    014e NumberOfInks
+    0150 DotRange
+    0151 TargetPrinter
+    0153 SampleFormat
+    0154 SMinSampleValue
+    0155 SMaxSampleValue
+    0156 TransferRange
+    0157 ClipPath
+    0158 XClipPathUnits
+    0159 YClipPathUnits
+    015a Indexed
+    015b JPEGTables
+    015f OPIProxy
+    0190 GlobalParametersIFD
+    0191 ProfileType
+    0192 FaxProfile
+    0193 CodingMethods
+    0194 VersionYear
+    0195 ModeNumber
+    01b1 Decode
+    01b2 DefaultImageColor
+    0200 JPEGProc
+    0201 JPEGInterchangeFormat
+    0202 JPEGInterchangeFormatLength
+    0203 JPEGRestartInterval
+    0205 JPEGLosslessPredictors
+    0206 JPEGPointTransforms
+    0207 JPEGQTables
+    0208 JPEGDCTables
+    0209 JPEGACTables
+    0211 YCbCrCoefficients
+    0212 YCbCrSubSampling
+    0213 YCbCrPositioning
+    0214 ReferenceBlackWhite
+    022f StripRowCounts
+    02bc XMP
+    800d ImageID
+    87ac ImageLayer
+
+    8649 Photoshop
+    8769 ExifIFD
+    8773 ICCProfile
+}
+
+if {![info exists ::tiff::tiff_sgat]} {
+    foreach {x y} [array get ::tiff::tiff_tags] {
+        set ::tiff::tiff_sgat($y) $x
+    }
+}
+
+array set ::tiff::data_types {
+    1 BYTE
+    2 ASCII
+    3 SHORT
+    4 LONG
+    5 RATIONAL
+    6 SBYTE
+    7 UNDEFINED
+    8 SSHORT
+    9 SLONG
+    10 SRATIONAL
+    11 FLOAT
+    12 DOUBLE
+    BYTE 1
+    ASCII 2
+    SHORT 3
+    LONG 4
+    RATIONAL 5
+    SBYTE 6 
+    UNDEFINED 7
+    SSHORT 8
+    SLONG 9
+    SRATIONAL 10
+    FLOAT 11
+    DOUBLE 12
+}
+
+# for mapping the format types to byte lengths
+array set ::tiff::formats [list 1 1 2 1 3 2 4 4 5 8 6 1 7 1 8 2 9 4 10 8 11 4 12 8]
+
+proc ::tiff::_seek {chan offset {origin start}} {
+    if {$origin == "start"} {
+        variable start
+        seek $chan [expr {$offset + $start}] start
+    } else {
+        seek $chan $offset $origin
+    }
+}
+
+# [binary scan], in the byte order indicated by $e
+proc ::tiff::_scan {e v f args} {
+     foreach x $args { upvar 1 $x $x }
+     if {$e == "big"} {
+          eval [list binary scan $v [string map {b B h H s S i I} $f]] $args
+     } else {
+         eval [list binary scan $v $f] $args
+     }
+}
+
+# [binary format], in the byte order indicated by $e
+proc ::tiff::_unscan {e f args} {
+     if {$e == "big"} {
+         return [eval [list binary format [string map {b B h H s S i I} $f]] $args]
+     } else {
+         return [eval [list binary format $f] $args]
+     }
+}
+
+# formats values, the numbers correspond to data types
+# values may be either byte order, as indicated by $end
+# see the tiff spec for more info
+proc ::tiff::_format {end value type num} {
+    if {$num > 1 && $type != 2 && $type != 7} {
+        variable formats
+        set r {}
+        for {set i 0} {$i < $num} {incr i} {
+            set len $formats($type)
+            lappend r [_format $end [string range $value [expr {$len * $i}] [expr {($len * $i) + $len - 1}]] $type 1]
+        }
+        #return [join $r ,]
+        return $r
+    }
+    switch -exact -- $type {
+        1 { _scan $end $value c value }
+        2 { set value [string trimright $value \x00] }
+        3 {
+            _scan $end $value s value
+            set value [format %u $value]
+        }
+        4 {
+            _scan $end $value i value
+            set value [format %u $value]
+        }
+        5 {
+            _scan $end $value ii n d
+            set n [format %u $n]
+            set d [format %u $d]
+            if {$d == 0} {set d 1}
+            #set value [string trimright [string trimright [format %5.4f [expr {double($n) / $d}]] 0] .]
+            set value [string trimright [string trimright [expr {double($n) / $d}] 0] .]
+            #set value "$n/$d"
+        }
+        6 { _scan $end $value c value }
+        8 { _scan $end $value s value }
+        9 { _scan $end $value i value }
+        10 {
+            _scan $end $value ii n d
+            if {$d == 0} {set d 1}
+            #set value [string trimright [string trimright [format %5.4f [expr {double($n) / $d}]] 0] .]
+            set value [string trimright [string trimright [expr {double($n) / $d}] 0] .]
+            #set value "$n/$d"
+        }
+        11 { _scan $end $value i value }
+        12 { _scan $end $value w value }
+    }
+    return $value
+}
+
+proc ::tiff::_unformat {end tag type value} {
+    set packed_val {}
+    set count [llength $value]
+    if {$type == 2 || $type == 7} { set value [list $value] }
+    foreach val $value {
+        switch -exact -- $type {
+            1 { set val [_unscan $end c $val] }
+            2 {
+                append val \x00
+                set count [string length $val]
+            }
+            3 { set val [_unscan $end s $val] }
+            4 { set val [_unscan $end i $val] }
+            5 {
+                set val [split $val /]
+                set val [_unscan $end i [lindex $val 0]][_unscan $end i [lindex $val 1]]
+            }
+            6 { set val [_unscan $end c $val] }
+            7 { set count [string length $val] }
+            8 { set val [_unscan $end s $val] }
+            9 { set val [_unscan $end i $val] }
+            10 {
+                set val [split $val /]
+                set val [_unscan $end i [lindex $val 0]][_unscan $end i [lindex $val 1]]
+            }
+            11 { set val [_unscan $end $value i value] }
+            12 { set val [_unscan $end $value w value] }
+            default { error "unknown data type $type" }
+        }
+        append packed_val $val
+    }
+    if {$tag != ""} {
+        if {$end == "big"} {
+            set tag [binary format H2H2 [string range $tag 0 1] [string range $tag 2 3]]
+        } else {
+            set tag [binary format H2H2 [string range $tag 2 3] [string range $tag 0 1]]
+        }
+    }
+    if {[string length $packed_val] < 4} { set packed_val [binary format a4 $packed_val] }
+    return [list $tag[_unscan $end si $type $count] $packed_val]
+}
+        
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tool/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tool/pkgIndex.tcl
new file mode 100644
index 00000000..73765a71
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tool/pkgIndex.tcl
@@ -0,0 +1,13 @@
+# Tcl package index file, version 1.1
+# This file is generated by the "pkg_mkIndex" command
+# and sourced either when an application starts up or
+# by a "package unknown" script.  It invokes the
+# "package ifneeded" command to set up package-related
+# information so that packages will be loaded automatically
+# in response to "package require" commands.  When this
+# script is sourced, the variable $dir must contain the
+# full path name of this file's directory.
+
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+package ifneeded tool 0.7 [list source [file join $dir tool.tcl]]
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tool/tool.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tool/tool.tcl
new file mode 100644
index 00000000..0d2c54f4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/tool/tool.tcl
@@ -0,0 +1,1849 @@
+###
+# Amalgamated package for tool
+# Do not edit directly, tweak the source in src/ and rerun
+# build.tcl
+###
+package provide tool 0.7
+namespace eval ::tool {}
+
+###
+# START: core.tcl
+###
+package require Tcl 8.6 ;# try in pipeline.tcl. Possibly other things.
+package require dicttool
+package require TclOO
+package require sha1
+#package require cron 2.0
+package require oo::meta 0.5.1
+package require oo::dialect
+
+::oo::dialect::create ::tool
+::namespace eval ::tool {}
+set ::tool::trace 0
+
+proc ::tool::script_path {} {
+  set path [file dirname [file join [pwd] [info script]]]
+  return $path
+}
+
+proc ::tool::module {cmd args} {
+  ::variable moduleStack
+  ::variable module
+
+  switch $cmd {
+    push {
+      set module [lindex $args 0]
+      lappend moduleStack $module
+      return $module
+    }
+    pop {
+      set priormodule      [lindex $moduleStack end]
+      set moduleStack [lrange $moduleStack 0 end-1]
+      set module [lindex $moduleStack end]
+      return $priormodule
+    }
+    peek {
+      set module      [lindex $moduleStack end]
+      return $module
+    }
+    default {
+      error "Invalid command \"$cmd\". Valid: peek, pop, push"
+    }
+  }
+}
+::tool::module push core
+
+proc ::tool::pathload {path {order {}} {skip {}}} {
+  ###
+  # On windows while running under a VFS, the system sometimes
+  # gets confused about the volume we are running under
+  ###
+  if {$::tcl_platform(platform) eq "windows"} {
+    if {[string range $path 1 6] eq ":/zvfs"} {
+      set path [string range $path 2 end]
+    }
+  }
+  set loaded {pkgIndex.tcl index.tcl}
+  foreach item $skip {
+    lappend loaded [file tail $skip]
+  }
+  if {[file exists [file join $path metaclass.tcl]]} {
+    lappend loaded metaclass.tcl
+    uplevel #0 [list source [file join $path metaclass.tcl]]
+  }
+  if {[file exists [file join $path baseclass.tcl]]} {
+    lappend loaded baseclass.tcl
+    uplevel #0 [list source [file join $path baseclass.tcl]]
+  }
+  foreach file $order {
+    set file [file tail $file]
+    if {$file in $loaded} continue
+    if {![file exists [file join $path $file]]} {
+      puts "WARNING [file join $path $file] does not exist in [info script]"
+    } else {
+      uplevel #0 [list source [file join $path $file]]
+    }
+    lappend loaded $file
+  }
+  foreach file [lsort -dictionary [glob -nocomplain [file join $path *.tcl]]] {
+    if {[file tail $file] in $loaded} continue
+    uplevel #0 [list source $file]
+    lappend loaded [file tail $file]
+  }
+}
+
+###
+# END: core.tcl
+###
+###
+# START: uuid.tcl
+###
+::namespace eval ::tool {}
+
+proc ::tool::is_null value {
+  return [expr {$value in {{} NULL}}]
+}
+
+
+proc ::tool::uuid_seed args {
+  if {[llength $args]==0 || ([llength $args]==1 && [is_null [lindex $args 0]])} {
+    if {[info exists ::env(USERNAME)]} {
+      set user $::env(USERNAME)
+    } elseif {[info exists ::env(USER)]} {
+      set user $::env(USER)
+    } else {
+      set user $::env(user)
+    }
+    incr ::tool::nextuuid $::tool::globaluuid
+    set ::tool::UUID_Seed [list user@[info hostname] [clock format [clock seconds]]]
+  } else {
+    incr ::tool::globaluuid $::tool::nextuuid
+    set ::tool::nextuuid 0
+    set ::tool::UUID_Seed $args
+  }
+}
+
+###
+# topic: 0a19b0bfb98162a8a37c1d3bbfb8bc3d
+# description:
+#    Because the tcllib version of uuid generate requires
+#    network port access (which can be slow), here's a fast
+#    and dirty rendition
+###
+proc ::tool::uuid_generate args {
+  if {![llength $args]} {
+    set block [list [incr ::tool::nextuuid] {*}$::tool::UUID_Seed]
+  } else {
+    set block $args
+  }
+  return [::sha1::sha1 -hex [join $block ""]]
+}
+
+###
+# topic: ee3ec43cc2cc2c7d6cf9a4ef1c345c19
+###
+proc ::tool::uuid_short args {
+  if {![llength $args]} {
+    set block [list [incr ::tool::nextuuid] {*}$::tool::UUID_Seed]
+  } else {
+    set block $args
+  }
+  return [string range [::sha1::sha1 -hex [join $block ""]] 0 16]
+}
+
+###
+# topic: b14c505537274904578340ec1bc12af1
+# description:
+#    Implementation the uses a compiled in ::md5 implementation
+#    commonly used by embedded application developers
+###
+namespace eval ::tool {
+  namespace export *
+}
+###
+# Cache the bits of the UUID seed that aren't likely to change
+# once the software is loaded, but which can be expensive to
+# generate
+###
+set ::tool::nextuuid 0
+set ::tool::globaluuid 0
+::tool::uuid_seed
+
+###
+# END: uuid.tcl
+###
+###
+# START: ensemble.tcl
+###
+::namespace eval ::tool::define {}
+
+if {![info exists ::tool::dirty_classes]} {
+  set ::tool::dirty_classes {}
+}
+
+###
+# Monkey patch oometa's rebuild function to
+# include a notifier to tool
+###
+proc ::oo::meta::rebuild args {
+  foreach class $args {
+    if {$class ni $::oo::meta::dirty_classes} {
+      lappend ::oo::meta::dirty_classes $class
+    }
+    if {$class ni $::tool::dirty_classes} {
+      lappend ::tool::dirty_classes $class
+    }
+  }
+}
+
+proc ::tool::ensemble_build_map args {
+  set emap {}
+  foreach thisclass $args {
+    foreach {ensemble einfo} [::oo::meta::info $thisclass getnull method_ensemble] {
+      foreach {submethod subinfo} $einfo {
+        dict set emap $ensemble $submethod $subinfo
+      }
+    }
+  }
+  return $emap
+}
+
+proc ::tool::ensemble_methods emap {
+  set result {}
+  foreach {ensemble einfo} $emap {
+    #set einfo [dict getnull $einfo method_ensemble $ensemble]
+    set eswitch {}
+    set default standard
+    if {[dict exists $einfo default:]} {
+      set emethodinfo [dict get $einfo default:]
+      set arglist     [lindex $emethodinfo 0]
+      set realbody    [lindex $emethodinfo 1]
+      if {[llength $arglist]==1 && [lindex $arglist 0] in {{} args arglist}} {
+        set body {}
+      } else {
+        set body "\n      ::tool::dynamic_arguments $ensemble \$method [list $arglist] {*}\$args"
+      }
+      append body "\n      " [string trim $realbody] "      \n"
+      set default $body
+      dict unset einfo default:
+    }
+    set methodlist {}
+    foreach item [dict keys $einfo] {
+      lappend methodlist [string trimright $item :]
+    }
+    set methodlist  [lsort -dictionary -unique $methodlist]
+    foreach {submethod esubmethodinfo} [lsort -dictionary -stride 2 $einfo] {
+      if {$submethod in {"_preamble:" "default:"}} continue
+      set submethod [string trimright $submethod :]
+      lassign $esubmethodinfo arglist realbody
+      if {[string length [string trim $realbody]] eq {}} {
+        dict set eswitch $submethod {}
+      } else {
+        if {[llength $arglist]==1 && [lindex $arglist 0] in {{} args arglist}} {
+          set body {}
+        } else {
+          set body "\n      ::tool::dynamic_arguments $ensemble \$method [list $arglist] {*}\$args"
+        }
+        append body "\n      " [string trim $realbody] "      \n"
+        dict set eswitch $submethod $body
+      }
+    }
+    if {![dict exists $eswitch <list>]} {
+      dict set eswitch <list> {return $methodlist}
+    }
+    if {$default=="standard"} {
+      set default "error \"unknown method $ensemble \$method. Valid: \$methodlist\""
+    }
+    dict set eswitch default $default
+    set mbody {}    
+    if {[dict exists $einfo _preamble:]} {
+      append mbody [lindex [dict get $einfo _preamble:] 1] \n
+    }
+    append mbody \n [list set methodlist $methodlist]
+    append mbody \n "set code \[catch {switch -- \$method [list $eswitch]} result opts\]"
+    append mbody \n {return -options $opts $result}
+    append result \n [list method $ensemble {{method default} args} $mbody]    
+  }
+  return $result
+}
+
+###
+# topic: fb8d74e9c08db81ee6f1275dad4d7d6f
+###
+proc ::tool::dynamic_object_ensembles {thisobject thisclass} {
+  variable trace
+  set ensembledict {}
+  foreach dclass $::tool::dirty_classes {
+    foreach {cclass cancestors} [array get ::oo::meta::cached_hierarchy] {
+      if {$dclass in $cancestors} {
+        unset -nocomplain ::tool::obj_ensemble_cache($cclass)
+      }
+    }
+  }
+  set ::tool::dirty_classes {}
+  ###
+  # Only go through the motions for classes that have a locally defined
+  # ensemble method implementation
+  ###
+  foreach aclass [::oo::meta::ancestors $thisclass] {
+    if {[info exists ::tool::obj_ensemble_cache($aclass)]} continue
+    set emap [::tool::ensemble_build_map $aclass]
+    set body [::tool::ensemble_methods $emap]
+    oo::define $aclass $body
+    # Define a property for this ensemble for introspection
+    foreach {ensemble einfo} $emap {
+      ::oo::meta::info $aclass set ensemble_methods $ensemble: [lsort -dictionary [dict keys $einfo]]
+    }
+    set ::tool::obj_ensemble_cache($aclass) 1
+  }
+}
+
+###
+# topic: ec9ca249b75e2667ad5bcb2f7cd8c568
+# title: Define an ensemble method for this agent
+###
+::proc ::tool::define::method {rawmethod args} {
+  set class [current_class]
+  set mlist [split $rawmethod "::"]
+  if {[llength $mlist]==1} {
+    ###
+    # Simple method, needs no parsing
+    ###
+    set method $rawmethod
+    ::oo::define $class method $rawmethod {*}$args
+    return
+  }
+  set ensemble [lindex $mlist 0]
+  set method [join [lrange $mlist 2 end] "::"]
+  switch [llength $args] {
+    1 {
+      ::oo::meta::info $class set method_ensemble $ensemble $method: [list dictargs [lindex $args 0]]
+    }
+    2 {
+      ::oo::meta::info $class set method_ensemble $ensemble $method: $args
+    }
+    default {
+      error "Usage: method NAME ARGLIST BODY"
+    }
+  }
+}
+
+###
+# topic: 354490e9e9708425a6662239f2058401946e41a1
+# description: Creates a method which exports access to an internal dict
+###
+proc ::tool::define::dictobj args {
+  dict_ensemble {*}$args
+}
+proc ::tool::define::dict_ensemble {methodname varname {cases {}}} {
+  set class [current_class]
+  set CASES [string map [list %METHOD% $methodname %VARNAME% $varname] $cases]
+  
+  set methoddata [::oo::meta::info $class getnull method_ensemble $methodname]
+  set initial [dict getnull $cases initialize]
+  variable $varname $initial
+  foreach {name body} $CASES {
+    dict set methoddata $name: [list args $body]
+  }
+  set template [string map [list %CLASS% $class %INITIAL% $initial %METHOD% $methodname %VARNAME% $varname] {
+    _preamble {} {
+      my variable %VARNAME%
+    }
+    add args {
+      set field [string trimright [lindex $args 0] :]
+      set data [dict getnull $%VARNAME% $field]
+      foreach item [lrange $args 1 end] {
+        if {$item ni $data} {
+          lappend data $item
+        }
+      }
+      dict set %VARNAME% $field $data
+    }
+    remove args {
+      set field [string trimright [lindex $args 0] :]
+      set data [dict getnull $%VARNAME% $field]
+      set result {}
+      foreach item $data {
+        if {$item in $args} continue
+        lappend result $item
+      }
+      dict set %VARNAME% $field $result
+    }
+    initial {} {
+      return [dict rmerge [my meta branchget %VARNAME%] {%INITIAL%}]
+    }
+    reset {} {
+      set %VARNAME% [dict rmerge [my meta branchget %VARNAME%] {%INITIAL%}]
+      return $%VARNAME%
+    }
+    dump {} {
+      return $%VARNAME%
+    }
+    append args {
+      return [dict $method %VARNAME% {*}$args]
+    }
+    incr args {
+      return [dict $method %VARNAME% {*}$args]
+    }
+    lappend args {
+      return [dict $method %VARNAME% {*}$args]
+    }
+    set args {
+      return [dict $method %VARNAME% {*}$args]
+    }
+    unset args {
+      return [dict $method %VARNAME% {*}$args]
+    }
+    update args {
+      return [dict $method %VARNAME% {*}$args]
+    }
+    branchset args {
+      foreach {field value} [lindex $args end] {
+        dict set %VARNAME% {*}[lrange $args 0 end-1] [string trimright $field :]: $value
+      }
+    }
+    rmerge args {
+      set %VARNAME% [dict rmerge $%VARNAME% {*}$args]
+      return $%VARNAME%  
+    }
+    merge args {
+      set %VARNAME% [dict rmerge $%VARNAME% {*}$args]
+      return $%VARNAME%
+    }
+    replace args {
+      set %VARNAME% [dict rmerge $%VARNAME% {%INITIAL%} {*}$args]
+    }
+    default args {
+      return [dict $method $%VARNAME% {*}$args]
+    }
+  }]
+  foreach {name arglist body} $template {
+    if {[dict exists $methoddata $name:]} continue
+    dict set methoddata $name: [list $arglist $body]
+  }
+  ::oo::meta::info $class set method_ensemble $methodname $methoddata
+}
+
+proc ::tool::define::arrayobj args {
+  array_ensemble {*}$args
+}
+
+###
+# topic: 354490e9e9708425a6662239f2058401946e41a1
+# description: Creates a method which exports access to an internal array
+###
+proc ::tool::define::array_ensemble {methodname varname {cases {}}} {
+  set class [current_class]
+  set CASES [string map [list %METHOD% $methodname %VARNAME% $varname] $cases]
+  set initial [dict getnull $cases initialize]
+  array $varname $initial
+
+  set map [list %CLASS% $class %METHOD% $methodname %VARNAME% $varname %CASES% $CASES %INITIAL% $initial]
+
+  ::oo::define $class method _${methodname}Get {field} [string map $map {
+    my variable %VARNAME%
+    if {[info exists %VARNAME%($field)]} {
+      return $%VARNAME%($field)
+    }
+    return [my meta getnull %VARNAME% $field:]
+  }]
+  ::oo::define $class method _${methodname}Exists {field} [string map $map {
+    my variable %VARNAME%
+    if {[info exists %VARNAME%($field)]} {
+      return 1
+    }
+    return [my meta exists %VARNAME% $field:]
+  }]
+  set methoddata [::oo::meta::info $class set array_ensemble $methodname: $varname]
+  
+  set methoddata [::oo::meta::info $class getnull method_ensemble $methodname]
+  foreach {name body} $CASES {
+    dict set methoddata $name: [list args $body]
+  } 
+  set template  [string map [list %CLASS% $class %INITIAL% $initial %METHOD% $methodname %VARNAME% $varname] {
+    _preamble {} {
+      my variable %VARNAME%
+    }
+    reset {} {
+      ::array unset %VARNAME% *
+      foreach {field value} [my meta getnull %VARNAME%] {
+        set %VARNAME%([string trimright $field :]) $value
+      }
+      ::array set %VARNAME% {%INITIAL%}
+      return [array get %VARNAME%]
+    }
+    ni value {
+      set field [string trimright [lindex $args 0] :]
+      set data [my _%METHOD%Get $field]
+      return [expr {$value ni $data}]
+    }
+    in value {
+      set field [string trimright [lindex $args 0] :]
+      set data [my _%METHOD%Get $field]
+      return [expr {$value in $data}]
+    }
+    add args {
+      set field [string trimright [lindex $args 0] :]
+      set data [my _%METHOD%Get $field]
+      foreach item [lrange $args 1 end] {
+        if {$item ni $data} {
+          lappend data $item
+        }
+      }
+      set %VARNAME%($field) $data
+    }
+    remove args {
+      set field [string trimright [lindex $args 0] :]
+      set data [my _%METHOD%Get $field]
+      set result {}
+      foreach item $data {
+        if {$item in $args} continue
+        lappend result $item
+      }
+      set %VARNAME%($field) $result
+    }
+    dump {} {
+      set result {}
+      foreach {var val} [my meta getnull %VARNAME%] {
+        dict set result [string trimright $var :] $val
+      }
+      foreach {var val} [lsort -dictionary -stride 2 [array get %VARNAME%]] {
+        dict set result [string trimright $var :] $val
+      }
+      return $result
+    }
+    exists args {
+      set field [string trimright [lindex $args 0] :]
+      set data [my _%METHOD%Exists $field]
+    }
+    getnull args {
+      set field [string trimright [lindex $args 0] :]
+      set data [my _%METHOD%Get $field]      
+    }
+    get field {
+      set field [string trimright $field :]
+      set data [my _%METHOD%Get $field]
+    }
+    set args {
+      set field [string trimright [lindex $args 0] :]
+      ::set %VARNAME%($field) {*}[lrange $args 1 end]        
+    }
+    append args {
+      set field [string trimright [lindex $args 0] :]
+      set data [my _%METHOD%Get $field]
+      ::append data {*}[lrange $args 1 end]
+      set %VARNAME%($field) $data
+    }
+    incr args {
+      set field [string trimright [lindex $args 0] :]
+      ::incr %VARNAME%($field) {*}[lrange $args 1 end]
+    }
+    lappend args {
+      set field [string trimright [lindex $args 0] :]
+      set data [my _%METHOD%Get $field]
+      $method data {*}[lrange $args 1 end]
+      set %VARNAME%($field) $data
+    }
+    branchset args {
+      foreach {field value} [lindex $args end] {
+        set %VARNAME%([string trimright $field :]) $value
+      }
+    }
+    rmerge args {
+      foreach arg $args {
+        my %VARNAME% branchset $arg
+      }
+    }
+    merge args {
+      foreach arg $args {
+        my %VARNAME% branchset $arg
+      }
+    }
+    default args {
+      return [array $method %VARNAME% {*}$args]
+    }
+  }]
+  foreach {name arglist body} $template {
+    if {[dict exists $methoddata $name:]} continue
+    dict set methoddata $name: [list $arglist $body]
+  }
+  ::oo::meta::info $class set method_ensemble $methodname $methoddata
+}
+
+
+###
+# END: ensemble.tcl
+###
+###
+# START: metaclass.tcl
+###
+#-------------------------------------------------------------------------
+# TITLE: 
+#    tool.tcl
+#
+# PROJECT:
+#    tool: TclOO Helper Library
+#
+# DESCRIPTION:
+#    tool(n): Implementation File
+#
+#-------------------------------------------------------------------------
+
+namespace eval ::tool {}
+
+###
+# New OO Keywords for TOOL
+###
+namespace eval ::tool::define {}
+proc ::tool::define::array {name {values {}}} {
+  set class [current_class]
+  set name [string trimright $name :]:
+  if {![::oo::meta::info $class exists array $name]} {
+    ::oo::meta::info $class set array $name {}
+  }
+  foreach {var val} $values {
+    ::oo::meta::info $class set array $name: $var $val
+  }
+}
+
+###
+# topic: 710a93168e4ba7a971d3dbb8a3e7bcbc
+###
+proc ::tool::define::component {name info} {
+  set class [current_class]
+  ::oo::meta::info $class branchset component $name $info
+}
+
+###
+# topic: 2cfc44a49f067124fda228458f77f177
+# title: Specify the constructor for a class
+###
+proc ::tool::define::constructor {arglist rawbody} {
+  set body {
+::tool::object_create [self] [info object class [self]]
+# Initialize public variables and options
+my InitializePublic
+  }
+  append body $rawbody
+  append body {
+# Run "initialize"
+my initialize
+  }
+  set class [current_class]
+  ::oo::define $class constructor $arglist $body
+}
+
+###
+# topic: 7a5c7e04989704eef117ff3c9dd88823
+# title: Specify the a method for the class object itself, instead of for objects of the class
+###
+proc ::tool::define::class_method {name arglist body} {
+  set class [current_class]
+  ::oo::meta::info $class set class_typemethod $name: [list $arglist $body]
+}
+
+###
+# topic: 4cb3696bf06d1e372107795de7fe1545
+# title: Specify the destructor for a class
+###
+proc ::tool::define::destructor rawbody {
+  set body {
+# Run the destructor once and only once
+set self [self]
+my variable DestroyEvent
+if {$DestroyEvent} return
+set DestroyEvent 1
+::tool::object_destroy $self
+}
+  append body $rawbody
+  ::oo::define [current_class] destructor $body
+}
+
+###
+# topic: 8bcae430f1eda4ccdb96daedeeea3bd409c6bb7a
+# description: Add properties and option handling
+###
+proc ::tool::define::property args {
+  set class [current_class]
+  switch [llength $args] {
+    2 {
+      set type const
+      set property [string trimleft [lindex $args 0] :]
+      set value [lindex $args 1]
+      ::oo::meta::info $class set $type $property: $value
+      return
+    }
+    3 {
+      set type     [lindex $args 0]
+      set property [string trimleft [lindex $args 1] :]
+      set value    [lindex $args 2]
+      ::oo::meta::info $class set $type $property: $value
+      return
+    }
+    default {
+      error "Usage:
+property name type valuedict
+OR property name value"
+    }
+  }
+  ::oo::meta::info $class set {*}$args
+}
+
+###
+# topic: 615b7c43b863b0d8d1f9107a8d126b21
+# title: Specify a variable which should be initialized in the constructor
+# description:
+#    This keyword can also be expressed:
+#    [example {property variable NAME {default DEFAULT}}]
+#    [para]
+#    Variables registered in the variable property are also initialized
+#    (if missing) when the object changes class via the [emph morph] method.
+###
+proc ::tool::define::variable {name {default {}}} {
+  set class [current_class]
+  set name [string trimright $name :]
+  ::oo::meta::info $class set variable $name: $default
+  ::oo::define $class variable $name
+}
+
+###
+# Utility Procedures
+###
+
+# topic: 643efabec4303b20b66b760a1ad279bf
+###
+proc ::tool::args_to_dict args {
+  if {[llength $args]==1} {
+    return [lindex $args 0]
+  }
+  return $args
+}
+
+###
+# topic: b40970b0d9a2525990b9105ec8c96d3d
+###
+proc ::tool::args_to_options args {
+  set result {}
+  foreach {var val} [args_to_dict {*}$args] {
+    lappend result [string trimright [string trimleft $var -] :] $val
+  }
+  return $result
+}
+
+###
+# topic: a92cd258900010f656f4c6e7dbffae57
+###
+proc ::tool::dynamic_methods class {
+  ::oo::meta::rebuild $class
+  set metadata [::oo::meta::metadata $class]
+  foreach command [info commands [namespace current]::dynamic_methods_*] {
+    $command $class $metadata
+  }
+}
+
+###
+# topic: 4969d897a83d91a230a17f166dbcaede
+###
+proc ::tool::dynamic_arguments {ensemble method arglist args} {
+  set idx 0
+  set len [llength $args]
+  if {$len > [llength $arglist]} {
+    ###
+    # Catch if the user supplies too many arguments
+    ###
+    set dargs 0
+    if {[lindex $arglist end] ni {args dictargs}} {
+      return -code error -level 2 "Usage: $ensemble $method [string trim [dynamic_wrongargs_message $arglist]]"
+    }
+  }
+  foreach argdef $arglist {
+    if {$argdef eq "args"} {
+      ###
+      # Perform args processing in the style of tcl
+      ###
+      uplevel 1 [list set args [lrange $args $idx end]]
+      break
+    }
+    if {$argdef eq "dictargs"} {
+      ###
+      # Perform args processing in the style of tcl
+      ###
+      uplevel 1 [list set args [lrange $args $idx end]]
+      ###
+      # Perform args processing in the style of tool
+      ###
+      set dictargs [::tool::args_to_options {*}[lrange $args $idx end]]
+      uplevel 1 [list set dictargs $dictargs]
+      break
+    }
+    if {$idx > $len} {
+      ###
+      # Catch if the user supplies too few arguments
+      ###
+      if {[llength $argdef]==1} {
+        return -code error -level 2 "Usage: $ensemble $method [string trim [dynamic_wrongargs_message $arglist]]"
+      } else {
+        uplevel 1 [list set [lindex $argdef 0] [lindex $argdef 1]]
+      }
+    } else {
+      uplevel 1 [list set [lindex $argdef 0] [lindex $args $idx]]
+    }
+    incr idx
+  }
+}
+
+###
+# topic: b88add196bb63abccc44639db5e5eae1
+###
+proc ::tool::dynamic_methods_class {thisclass metadata} {
+  foreach {method info} [dict getnull $metadata class_typemethod] {
+    lassign $info arglist body
+    set method [string trimright $method :]
+    ::oo::objdefine $thisclass method $method $arglist $body
+  }
+}
+
+###
+# topic: 53ab28ac5c6ee601fe1fe07b073be88e
+###
+proc ::tool::dynamic_wrongargs_message {arglist} {
+  set result ""
+  set dargs 0
+  foreach argdef $arglist {
+    if {$argdef in {args dictargs}} {
+      set dargs 1
+      break
+    }
+    if {[llength $argdef]==1} {
+      append result " $argdef"
+    } else {
+      append result " ?[lindex $argdef 0]?"
+    }
+  }
+  if { $dargs } {
+    append result " ?option value?..."
+  }
+  return $result
+}
+
+proc ::tool::object_create {objname {class {}}} {
+  foreach varname {
+    object_info
+    object_signal
+    object_subscribe
+  } {
+    variable $varname
+    set ${varname}($objname) {}
+  }
+  if {$class eq {}} {
+    set class [info object class $objname]
+  }
+   set object_info($objname) [list class $class]
+  if {$class ne {}} {
+    $objname graft class $class
+    foreach command [info commands [namespace current]::dynamic_object_*] {
+      $command $objname $class
+    }
+  }
+}
+
+
+proc ::tool::object_rename {object newname} {
+  foreach varname {
+    object_info
+    object_signal
+    object_subscribe
+  } {
+    variable $varname
+    if {[info exists ${varname}($object)]} {
+      set ${varname}($newname) [set ${varname}($object)]
+      unset ${varname}($object)
+    }
+  }
+  variable coroutine_object
+  foreach {coro coro_objname} [array get coroutine_object] {
+    if { $object eq $coro_objname } {
+      set coroutine_object($coro) $newname
+    }
+  }
+  rename $object ::[string trimleft $newname]
+  ::tool::event::generate $object object_rename [list newname $newname]
+}
+
+proc ::tool::object_destroy objname {
+  ::tool::event::generate $objname object_destroy [list objname $objname]
+  ::tool::event::cancel $objname *
+  ::cron::object_destroy $objname
+  variable coroutine_object
+  foreach varname {
+    object_info
+    object_signal
+    object_subscribe
+  } {
+    variable $varname
+    unset -nocomplain ${varname}($objname)
+  }
+}
+
+#-------------------------------------------------------------------------
+# Option Handling Mother of all Classes
+
+# tool::object
+#
+# This class is inherited by all classes that have options.
+#
+
+::tool::define ::tool::object {
+  # Put MOACish stuff in here
+  variable signals_pending create
+  variable organs {}
+  variable mixins {}
+  variable mixinmap {}
+  variable DestroyEvent 0
+
+  constructor args {
+    my Config_merge [::tool::args_to_options {*}$args]
+  }
+  
+  destructor {}
+    
+  method ancestors {{reverse 0}} {
+    set result [::oo::meta::ancestors [info object class [self]]]
+    if {$reverse} {
+      return [lreverse $result]
+    }
+    return $result
+  }
+  
+  method DestroyEvent {} {
+    my variable DestroyEvent
+    return $DestroyEvent
+  }
+  
+  ###
+  # title: Forward a method
+  ###
+  method forward {method args} {
+    oo::objdefine [self] forward $method {*}$args
+  }
+  
+  ###
+  # title: Direct a series of sub-functions to a seperate object
+  ###
+  method graft args {
+    my variable organs
+    if {[llength $args] == 1} {
+      error "Need two arguments"
+    }
+    set object {}
+    foreach {stub object} $args {
+      if {$stub eq "class"} {
+        # Force class to always track the object's current class
+        set obj [info object class [self]]
+      }
+      dict set organs $stub $object
+      oo::objdefine [self] forward <${stub}> $object
+      oo::objdefine [self] export <${stub}>
+    }
+    return $object
+  }
+  
+  # Called after all options and public variables are initialized
+  method initialize {} {}
+  
+  ###
+  # topic: 3c4893b65a1c79b2549b9ee88f23c9e3
+  # description:
+  #    Provide a default value for all options and
+  #    publically declared variables, and locks the
+  #    pipeline mutex to prevent signal processing
+  #    while the contructor is still running.
+  #    Note, by default an odie object will ignore
+  #    signals until a later call to <i>my lock remove pipeline</i>
+  ###
+  ###
+  # topic: 3c4893b65a1c79b2549b9ee88f23c9e3
+  # description:
+  #    Provide a default value for all options and
+  #    publically declared variables, and locks the
+  #    pipeline mutex to prevent signal processing
+  #    while the contructor is still running.
+  #    Note, by default an odie object will ignore
+  #    signals until a later call to <i>my lock remove pipeline</i>
+  ###
+  method InitializePublic {} {
+    my variable config meta
+    if {![info exists meta]} {
+      set meta {}
+    }
+    if {![info exists config]} {
+      set config {}
+    }
+    my ClassPublicApply {}
+  }
+  
+  class_method info {which} {
+    my variable cache
+    if {![info exists cache($which)]} {
+      set cache($which) {}
+      switch $which {
+        public {
+          dict set cache(public) variable [my meta branchget variable]
+          dict set cache(public) array [my meta branchget array]
+          set optinfo [my meta getnull option]
+          dict set cache(public) option_info $optinfo
+          foreach {var info} [dict getnull $cache(public) option_info] {
+            if {[dict exists $info aliases:]} {
+              foreach alias [dict exists $info aliases:] {
+                dict set cache(public) option_canonical $alias $var
+              }
+            }
+            set getcmd [dict getnull $info default-command:]
+            if {$getcmd ne {}} {
+              dict set cache(public) option_default_command $var $getcmd
+            } else {
+              dict set cache(public) option_default_value $var [dict getnull $info default:]
+            }
+            dict set cache(public) option_canonical $var $var
+          }
+        }
+      }
+    }
+    return $cache($which)
+  }
+  
+  ###
+  # Incorporate the class's variables, arrays, and options
+  ###
+  method ClassPublicApply class {
+    my variable config
+    set integrate 0
+    if {$class eq {}} {
+      set class [info object class [self]]      
+    } else {
+      set integrate 1
+    }
+    set public [$class info public]
+    foreach {var value} [dict getnull $public variable] {
+      if { $var in {meta config} } continue
+      my variable $var
+      if {![info exists $var]} {
+        set $var $value
+      }
+    }
+    foreach {var value} [dict getnull $public array] {
+      if { $var eq {meta config} } continue
+      my variable $var
+      foreach {f v} $value {
+        if {![array exists ${var}($f)]} {
+          set ${var}($f) $v
+        }
+      }
+    }
+    set dat [dict getnull $public option_info]
+    if {$integrate} {
+      my meta rmerge [list option $dat]
+    }
+    my variable option_canonical
+    array set option_canonical [dict getnull $public option_canonical]
+    set dictargs {}
+    foreach {var getcmd} [dict getnull $public option_default_command] {
+      if {[dict getnull $dat $var class:] eq "organ"} {
+        if {[my organ $var] ne {}} continue
+      }
+      if {[dict exists $config $var]} continue
+      dict set dictargs $var [{*}[string map [list %field% $var %self% [namespace which my]] $getcmd]]
+    }
+    foreach {var value} [dict getnull $public option_default_value] {
+      if {[dict getnull $dat $var class:] eq "organ"} {
+        if {[my organ $var] ne {}} continue
+      }
+      if {[dict exists $config $var]} continue
+      dict set dictargs $var $value
+    }
+    ###
+    # Apply all inputs with special rules
+    ###
+    foreach {field val} $dictargs {
+      if {[dict exists $config $field]} continue
+      set script [dict getnull $dat $field set-command:]
+      dict set config $field $val
+      if {$script ne {}} {
+        {*}[string map [list %field% [list $field] %value% [list $val] %self% [namespace which my]] $script]
+      }
+    }
+  }
+  
+  ###
+  # topic: 3c4893b65a1c79b2549b9ee88f23c9e3
+  # description:
+  #    Provide a default value for all options and
+  #    publically declared variables, and locks the
+  #    pipeline mutex to prevent signal processing
+  #    while the contructor is still running.
+  #    Note, by default an odie object will ignore
+  #    signals until a later call to <i>my lock remove pipeline</i>
+  ###
+  method mixin args {
+    ###
+    # Mix in the class
+    ###
+    my variable mixins
+    set prior $mixins
+
+    set mixins $args
+    ::oo::objdefine [self] mixin {*}$args
+    ###
+    # Build a compsite map of all ensembles defined by the object's current
+    # class as well as all of the classes being mixed in
+    ###
+    set emap [::tool::ensemble_build_map [::info object class [self]] {*}[lreverse $args]]
+    set body [::tool::ensemble_methods $emap]
+    oo::objdefine [self] $body
+    foreach class $args {
+      if {$class ni $prior} {
+        my meta mixin $class
+      }
+      my ClassPublicApply $class
+    }
+    foreach class $prior {
+      if {$class ni $mixins } { 
+        my meta mixout $class
+      }
+    }
+  }
+
+  method mixinmap args { 
+    my variable mixinmap
+    set priorlist {}
+    foreach {slot classes} $args {
+      if {[dict exists $mixinmap $slot]} {
+        lappend priorlist {*}[dict get $mixinmap $slot]  
+        foreach class [dict get $mixinmap $slot] {
+          if {$class ni $classes && [$class meta exists mixin unmap-script:]} {
+            if {[catch [$class meta get mixin unmap-script:] err errdat]} {
+              puts stderr "[self] MIXIN ERROR POPPING $class:\n[dict get $errdat -errorinfo]"
+            }
+          }
+        }
+      }
+      dict set mixinmap $slot $classes
+    }
+    my Recompute_Mixins
+    foreach {slot classes} $args {
+      foreach class $classes {
+        if {$class ni $priorlist && [$class meta exists mixin map-script:]} {
+          if {[catch [$class meta get mixin map-script:] err errdat]} {
+            puts stderr "[self] MIXIN ERROR PUSHING $class:\n[dict get $errdat -errorinfo]"
+          }
+        }
+      }
+    }
+    foreach {slot classes} $mixinmap {
+      foreach class $classes {
+        if {[$class meta exists mixin react-script:]} {
+          if {[catch [$class meta get mixin react-script:] err errdat]} {
+            puts stderr "[self] MIXIN ERROR REACTING $class:\n[dict get $errdat -errorinfo]"
+          }
+        }
+      }
+    }
+  }
+
+  method debug_mixinmap {} {
+    my variable mixinmap
+    return $mixinmap
+  }
+
+  method Recompute_Mixins {} {
+    my variable mixinmap
+    set classlist {}
+    foreach {item class} $mixinmap {
+      if {$class ne {}} {
+        lappend classlist $class
+      }
+    }
+    my mixin {*}$classlist
+  }
+  
+  method morph newclass {
+    if {$newclass eq {}} return
+    set class [string trimleft [info object class [self]]]
+    set newclass [string trimleft $newclass :]
+    if {[info command ::$newclass] eq {}} {
+      error "Class $newclass does not exist"
+    }
+    if { $class ne $newclass } {
+      my Morph_leave
+      my variable mixins
+      oo::objdefine [self] class ::${newclass}
+      my graft class ::${newclass}
+      # Reapply mixins
+      my mixin {*}$mixins
+      my InitializePublic
+      my Morph_enter
+    }
+  }
+
+  ###
+  # Commands to perform as this object transitions out of the present class
+  ###
+  method Morph_leave {} {}
+  ###
+  # Commands to perform as this object transitions into this class as a new class
+  ###
+  method Morph_enter {} {}
+  
+  ###
+  # title: List which objects are forwarded as organs
+  ###
+  method organ {{stub all}} {
+    my variable organs
+    if {![info exists organs]} {
+      return {}
+    }
+    if { $stub eq "all" } {
+      return $organs
+    }
+    return [dict getnull $organs $stub]
+  }
+}
+
+
+
+###
+# END: metaclass.tcl
+###
+###
+# START: option.tcl
+###
+###
+# topic: 68aa446005235a0632a10e2a441c0777
+# title: Define an option for the class
+###
+proc ::tool::define::option {name args} {
+  set class [current_class]
+  set dictargs {default: {}}
+  foreach {var val} [::oo::meta::args_to_dict {*}$args] {
+    dict set dictargs [string trimright [string trimleft $var -] :]: $val
+  }
+  set name [string trimleft $name -]
+
+  ###
+  # Option Class handling
+  ###
+  set optclass [dict getnull $dictargs class:]
+  if {$optclass ne {}} {
+    foreach {f v} [::oo::meta::info $class getnull option_class $optclass] {
+      if {![dict exists $dictargs $f]} {
+        dict set dictargs $f $v
+      }
+    }
+    if {$optclass eq "variable"} {
+      variable $name [dict getnull $dictargs default:]
+    }
+  }
+  ::oo::meta::info $class branchset option $name $dictargs
+}
+
+###
+# topic: 827a3a331a2e212a6e301f59c1eead59
+# title: Define a class of options
+# description:
+#    Option classes are a template of properties that other
+#    options can inherit.
+###
+proc ::tool::define::option_class {name args} {
+  set class [current_class]
+  set dictargs {default {}}
+  foreach {var val} [::oo::meta::args_to_dict {*}$args] {
+    dict set dictargs [string trimleft $var -] $val
+  }
+  set name [string trimleft $name -]
+  ::oo::meta::info $class branchset option_class $name $dictargs
+}
+
+::tool::define ::tool::object {
+  property options_strict 0
+  variable organs {}
+
+  option_class organ {
+    widget label
+    set-command {my graft %field% %value%}
+    get-command {my organ %field%}
+  }
+
+  option_class variable {
+    widget entry
+    set-command {my variable %field% ; set %field% %value%}
+    get-command {my variable %field% ; set %field%}
+  }
+  
+  dict_ensemble config config {
+    get {
+      return [my Config_get {*}$args]
+    }
+    merge {
+      return [my Config_merge {*}$args]
+    }
+    set {
+      my Config_set {*}$args
+    }
+  }
+
+  ###
+  # topic: 86a1b968cea8d439df87585afdbdaadb
+  ###
+  method cget args {
+    return [my Config_get {*}$args]
+  }
+
+  ###
+  # topic: 73e2566466b836cc4535f1a437c391b0
+  ###
+  method configure args {
+    # Will be removed at the end of "configurelist_triggers"
+    set dictargs [::oo::meta::args_to_options {*}$args]
+    if {[llength $dictargs] == 1} {
+      return [my cget [lindex $dictargs 0]]
+    }
+    set dat [my Config_merge $dictargs]
+    my Config_triggers $dat
+  }
+
+  method Config_get {field args} {
+    my variable config option_canonical option_getcmd
+    set field [string trimleft $field -]
+    if {[info exists option_canonical($field)]} {
+      set field $option_canonical($field)
+    }
+    if {[info exists option_getcmd($field)]} {
+      return [eval $option_getcmd($field)]
+    }
+    if {[dict exists $config $field]} {
+      return [dict get $config $field]
+    }
+    if {[llength $args]} {
+      return [lindex $args 0]
+    }
+    return [my meta cget $field] 
+  }
+  
+  ###
+  # topic: dc9fba12ec23a3ad000c66aea17135a5
+  ###
+  method Config_merge dictargs {
+    my variable config option_canonical
+    set rawlist $dictargs
+    set dictargs {}
+    set dat [my meta getnull option]
+    foreach {field val} $rawlist {
+      set field [string trimleft $field -]
+      set field [string trimright $field :]
+      if {[info exists option_canonical($field)]} {
+        set field $option_canonical($field)
+      }
+      dict set dictargs $field $val
+    }
+    ###
+    # Validate all inputs
+    ###
+    foreach {field val} $dictargs {
+      set script [dict getnull $dat $field validate-command:]
+      if {$script ne {}} {
+        dict set dictargs $field [eval [string map [list %field% [list $field] %value% [list $val] %self% [namespace which my]] $script]]
+      }
+    }
+    ###
+    # Apply all inputs with special rules
+    ###
+    foreach {field val} $dictargs {
+      set script [dict getnull $dat $field set-command:]
+      dict set config $field $val
+      if {$script ne {}} {
+        {*}[string map [list %field% [list $field] %value% [list $val] %self% [namespace which my]] $script]
+      }
+    }
+    return $dictargs
+  }
+  
+  method Config_set args {
+    set dictargs [::tool::args_to_options {*}$args]
+    set dat [my Config_merge $dictargs]
+    my Config_triggers $dat
+  }
+  
+  ###
+  # topic: 543c936485189593f0b9ed79b5d5f2c0
+  ###
+  method Config_triggers dictargs {
+    set dat [my meta getnull option]
+    foreach {field val} $dictargs {
+      set script [dict getnull $dat $field post-command:]
+      if {$script ne {}} {
+        {*}[string map [list %field% [list $field] %value% [list $val] %self% [namespace which my]] $script]
+      }
+    }
+  }
+
+  method Option_Default field {
+    set info [my meta getnull option $field]
+    set getcmd [dict getnull $info default-command:]
+    if {$getcmd ne {}} {
+      return [{*}[string map [list %field% $field %self% [namespace which my]] $getcmd]]
+    } else {
+      return [dict getnull $info default:]
+    }
+  }
+}
+
+package provide tool::option 0.1
+
+###
+# END: option.tcl
+###
+###
+# START: event.tcl
+###
+###
+# This file implements the Tool event manager
+###
+
+::namespace eval ::tool {}
+
+::namespace eval ::tool::event {}
+
+###
+# topic: f2853d380a732845610e40375bcdbe0f
+# description: Cancel a scheduled event
+###
+proc ::tool::event::cancel {self {task *}} {
+  variable timer_event
+  variable timer_script
+
+  foreach {id event} [array get timer_event $self:$task] {
+    ::after cancel $event
+    set timer_event($id) {}
+    set timer_script($id) {}
+  }
+}
+
+###
+# topic: 8ec32f6b6ba78eaf980524f8dec55b49
+# description:
+#    Generate an event
+#    Adds a subscription mechanism for objects
+#    to see who has recieved this event and prevent
+#    spamming or infinite recursion
+###
+proc ::tool::event::generate {self event args} {
+  set wholist [Notification_list $self $event]
+  if {$wholist eq {}} return
+  set dictargs [::oo::meta::args_to_options {*}$args]
+  set info $dictargs
+  set strict 0
+  set debug 0
+  set sender $self
+  dict with dictargs {}
+  dict set info id     [::tool::event::nextid]
+  dict set info origin $self
+  dict set info sender $sender
+  dict set info rcpt   {}
+  foreach who $wholist {
+    catch {::tool::event::notify $who $self $event $info}
+  }
+}
+
+###
+# topic: 891289a24b8cc52b6c228f6edb169959
+# title: Return a unique event handle
+###
+proc ::tool::event::nextid {} {
+  return "event#[format %0.8x [incr ::tool::event_count]]"
+}
+
+###
+# topic: 1e53e8405b4631aec17f98b3e8a5d6a4
+# description:
+#    Called recursively to produce a list of
+#    who recieves notifications
+###
+proc ::tool::event::Notification_list {self event {stackvar {}}} {
+  set notify_list {}
+  foreach {obj patternlist} [array get ::tool::object_subscribe] {
+    if {$obj eq $self} continue
+    if {$obj in $notify_list} continue
+    set match 0
+    foreach {objpat eventlist} $patternlist {
+      if {![string match $objpat $self]} continue
+      foreach eventpat $eventlist {
+        if {![string match $eventpat $event]} continue
+        set match 1
+        break
+      }
+      if {$match} {
+        break
+      }
+    }
+    if {$match} {
+      lappend notify_list $obj
+    }
+  }
+  return $notify_list
+}
+
+###
+# topic: b4b12f6aed69f74529be10966afd81da
+###
+proc ::tool::event::notify {rcpt sender event eventinfo} {
+  if {[info commands $rcpt] eq {}} return 
+  if {$::tool::trace} {
+    puts [list event notify rcpt $rcpt sender $sender event $event info $eventinfo]
+  }
+  $rcpt notify $event $sender $eventinfo
+}
+
+###
+# topic: 829c89bda736aed1c16bb0c570037088
+###
+proc ::tool::event::process {self handle script} {
+  variable timer_event
+  variable timer_script
+
+  array unset timer_event $self:$handle
+  array unset timer_script $self:$handle
+
+  set err [catch {uplevel #0 $script} result errdat]
+  if $err {
+    puts "BGError: $self $handle $script
+ERR: $result
+[dict get $errdat -errorinfo]
+***"
+  }
+}
+
+###
+# topic: eba686cffe18cd141ac9b4accfc634bb
+# description: Schedule an event to occur later
+###
+proc ::tool::event::schedule {self handle interval script} {
+  variable timer_event
+  variable timer_script
+  if {$::tool::trace} {
+    puts [list $self schedule $handle $interval]
+  }
+  if {[info exists timer_event($self:$handle)]} {
+    if {$script eq $timer_script($self:$handle)} {
+      return
+    }
+    ::after cancel $timer_event($self:$handle)
+  }
+  set timer_script($self:$handle) $script
+  set timer_event($self:$handle) [::after $interval [list ::tool::event::process $self $handle $script]]
+}
+
+proc ::tool::event::sleep msec {
+  ::cron::sleep $msec
+}
+
+###
+# topic: e64cff024027ee93403edddd5dd9fdde
+###
+proc ::tool::event::subscribe {self who event} {
+  upvar #0 ::tool::object_subscribe($self) subscriptions
+  if {![info exists subscriptions]} {
+    set subscriptions {}
+  }
+  set match 0
+  foreach {objpat eventlist} $subscriptions {
+    if {![string match $objpat $who]} continue      
+    foreach eventpat $eventlist {
+      if {[string match $eventpat $event]} {
+        # This rule already exists
+        return
+      }
+    }
+  }
+  dict lappend subscriptions $who $event
+}
+
+###
+# topic: 5f74cfd01735fb1a90705a5f74f6cd8f
+###
+proc ::tool::event::unsubscribe {self args} {
+  upvar #0 ::tool::object_subscribe($self) subscriptions
+  if {![info exists subscriptions]} {
+    return
+  }  
+  switch [llength $args] {
+    1 {
+      set event [lindex $args 0]
+      if {$event eq "*"} {
+        # Shortcut, if the 
+        set subscriptions {}
+      } else {
+        set newlist {}
+        foreach {objpat eventlist} $subscriptions {
+          foreach eventpat $eventlist {
+            if {[string match $event $eventpat]} continue
+            dict lappend newlist $objpat $eventpat
+          }
+        }
+        set subscriptions $newlist
+      }
+    }
+    2 {
+      set who [lindex $args 0]
+      set event [lindex $args 1]
+      if {$who eq "*" && $event eq "*"} {
+        set subscriptions {}
+      } else {
+        set newlist {}
+        foreach {objpat eventlist} $subscriptions {
+          if {[string match $who $objpat]} {
+            foreach eventpat $eventlist {
+              if {[string match $event $eventpat]} continue
+              dict lappend newlist $objpat $eventpat
+            }
+          }
+        }
+        set subscriptions $newlist
+      }
+    }
+  }
+}
+
+::tool::define ::tool::object {
+  ###
+  # topic: 20b4a97617b2b969b96997e7b241a98a
+  ###
+  method event {submethod args} {
+    ::tool::event::$submethod [self] {*}$args
+  }
+}
+
+###
+# topic: 37e7bd0be3ca7297996da2abdf5a85c7
+# description: The event manager for Tool
+###
+namespace eval ::tool::event {
+  variable nextevent {}
+  variable nexteventtime 0
+}
+
+
+###
+# END: event.tcl
+###
+###
+# START: pipeline.tcl
+###
+::namespace eval ::tool::signal {}
+::namespace eval ::tao {}
+
+# Provide a backward compatible hook
+proc ::tool::main {} {
+  ::cron::main
+}
+
+proc ::tool::do_events {} {
+  ::cron::do_events
+}
+
+proc ::tao::do_events {} {
+  ::cron::do_events
+}
+
+proc ::tao::main {} {
+  ::cron::main
+}
+
+
+package provide tool::pipeline 0.1
+
+
+###
+# END: pipeline.tcl
+###
+###
+# START: coroutine.tcl
+###
+proc ::tool::define::coroutine {name corobody} {
+  set class [current_class]
+  ::oo::meta::info $class set method_ensemble ${name} _preamble: [list {} [string map [list %coroname% $name] {
+    my variable coro_queue coro_lock
+    set coro %coroname%
+    set coroname [info object namespace [self]]::%coroname%
+  }]]
+  ::oo::meta::info $class set method_ensemble ${name} coroutine: {{} {
+    return $coroutine
+  }}
+  ::oo::meta::info $class set method_ensemble ${name} restart: {{} {
+    # Don't allow a coroutine to kill itself
+    if {[info coroutine] eq $coroname} return
+    if {[info commands $coroname] ne {}} {
+      rename $coroname {}
+    }
+    set coro_lock($coroname) 0
+    ::coroutine $coroname {*}[namespace code [list my $coro main]]
+    ::cron::object_coroutine [self] $coroname
+  }}
+  ::oo::meta::info $class set method_ensemble ${name} kill: {{} {
+    # Don't allow a coroutine to kill itself
+    if {[info coroutine] eq $coroname} return
+    if {[info commands $coroname] ne {}} {
+      rename $coroname {}
+    }
+  }}
+
+  ::oo::meta::info $class set method_ensemble ${name} main: [list {} $corobody]
+
+  ::oo::meta::info $class set method_ensemble ${name} clear: {{} {
+    set coro_queue($coroname) {}
+  }}
+  ::oo::meta::info $class set method_ensemble ${name} next: {{eventvar} {
+    upvar 1 [lindex $args 0] event
+    if {![info exists coro_queue($coroname)]} {
+      return 1
+    }
+    if {[llength $coro_queue($coroname)] == 0} {
+      return 1
+    }
+    set event [lindex $coro_queue($coroname) 0]
+    set coro_queue($coroname) [lrange $coro_queue($coroname) 1 end]
+    return 0
+  }}
+  
+  ::oo::meta::info $class set method_ensemble ${name} peek: {{eventvar} {
+    upvar 1 [lindex $args 0] event
+    if {![info exists coro_queue($coroname)]} {
+      return 1
+    }
+    if {[llength $coro_queue($coroname)] == 0} {
+      return 1
+    }
+    set event [lindex $coro_queue($coroname) 0]
+    return 0
+  }}
+
+  ::oo::meta::info $class set method_ensemble ${name} running: {{} {
+    if {[info commands $coroname] eq {}} {
+      return 0
+    }
+    if {[::cron::task exists $coroname]} {
+      set info [::cron::task info $coroname]
+      if {[dict exists $info running]} {
+        return [dict get $info running]
+      }
+    }
+    return 0
+  }}
+  
+  ::oo::meta::info $class set method_ensemble ${name} send: {args {
+    lappend coro_queue($coroname) $args
+    if {[info coroutine] eq $coroname} {
+      return
+    }
+    if {[info commands $coroname] eq {}} {
+      ::coroutine $coroname {*}[namespace code [list my $coro main]]
+      ::cron::object_coroutine [self] $coroname
+    }
+    if {[info coroutine] eq {}} {
+      ::cron::do_one_event $coroname
+    } else {
+      yield
+    }
+  }}
+  ::oo::meta::info $class set method_ensemble ${name} default: {args {my [self method] send $method {*}$args}}
+
+}
+
+###
+# END: coroutine.tcl
+###
+###
+# START: organ.tcl
+###
+###
+# A special class of objects that
+# stores no meta data of its own
+# Instead it vampires off of the master object
+###
+tool::class create ::tool::organelle {
+  
+  constructor {master} {
+    my entangle $master
+    set final_class [my select]
+    if {[info commands $final_class] ne {}} {
+      # Safe to switch class here, we haven't initialized anything
+      oo::objdefine [self] class $final_class
+    }
+    my initialize
+  }
+
+  method entangle {master} {
+    my graft master $master
+    my forward meta $master meta
+    foreach {stub organ} [$master organ] {
+      my graft $stub $organ
+    }
+    foreach {methodname variable} [my meta branchget array_ensemble] {
+      my forward $methodname $master $methodname
+    }
+  }
+  
+  method select {} {
+    return {}
+  }
+}
+
+###
+# END: organ.tcl
+###
+###
+# START: script.tcl
+###
+###
+# Add configure by script facilities to TOOL
+###
+::tool::define ::tool::object {
+
+  ###
+  # Allows for a constructor to accept a psuedo-code
+  # initialization script which exercise the object's methods
+  # sans "my" in front of every command
+  ###
+  method Eval_Script script {
+    set buffer {}
+    set thisline {}
+    foreach line [split $script \n] {
+      append thisline $line
+      if {![info complete $thisline]} {
+        append thisline \n
+        continue
+      }
+      set thisline [string trim $thisline]
+      if {[string index $thisline 0] eq "#"} continue
+      if {[string length $thisline]==0} continue
+      if {[lindex $thisline 0] eq "my"} {
+        # Line already calls out "my", accept verbatim
+        append buffer $thisline \n
+      } elseif {[string range $thisline 0 2] eq "::"} {
+        # Fully qualified commands accepted verbatim
+        append buffer $thisline \n
+      } elseif {
+        append buffer "my $thisline" \n
+      }
+      set thisline {}
+    }
+    eval $buffer
+  }
+}
+###
+# END: script.tcl
+###
+
+namespace eval ::tool {
+  namespace export *
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/connect.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/connect.tcl
new file mode 100644
index 00000000..c496be58
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/connect.tcl
@@ -0,0 +1,97 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+##
+
+# Class for handling of active/passive connectivity.
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require snit
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::transfer::connect {
+
+    # ### ### ### ######### ######### #########
+    ## API
+
+    option -host        -default localhost
+    option -port        -default 0
+    option -mode        -default active    -type {snit::enum -values {active passive}}
+    option -socketcmd   -default ::socket
+
+    option -translation -default {}
+    option -encoding    -default {}
+    option -eofchar     -default {}
+
+    method connect {command} {}
+
+    # active:
+    # - connect to host/port
+    #
+    # passive:
+    # - listen on port for connection
+
+    # ### ### ### ######### ######### #########
+    ## Implementation
+
+    method connect {command} {
+	if {$options(-mode) eq "active"} {
+	    set sock [Socket $options(-host) $options(-port)]
+
+	    $self ConfigureTheOpenedSocket $sock $command
+	    return
+	} else {
+	    set mysock [Socket -server [mymethod IsConnected $command] \
+			    $options(-port)]
+
+	    # Return port the server socket is listening on for the
+	    # connection.
+	    return [lindex [fconfigure $mysock -sockname] 2]
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal helper commands.
+
+    method IsConnected {command sock peerhost peerport} {
+	# Accept only a one connection.
+	close $mysock
+	$self ConfigureTheOpenedSocket $sock $command
+	return
+    }
+
+    method ConfigureTheOpenedSocket {sock command} {
+	foreach o {-translation -encoding -eofchar} {
+	    if {$options($o) eq ""} continue
+	    fconfigure $sock $o $options($o)
+	}
+
+	after 0 [linsert $command end $self $sock]
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal helper commands.
+
+    proc Socket {args} {
+	upvar 1 options(-socketcmd) socketcmd
+	return [eval [linsert $args 0 $socketcmd]]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Data structures
+
+    variable mysock {}
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide transfer::connect 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/copyops.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/copyops.tcl
new file mode 100644
index 00000000..39f64f66
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/copyops.tcl
@@ -0,0 +1,389 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+##
+# Basic byte transfer facilities. Essentially fcopy with a different
+# API, hopefully better (progress and completion are separate). Also
+# equivalent facilities to transfer an explicitly given string instead
+# of reading the data to be transfered from a channel.
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.4
+
+namespace eval ::transfer::copy {
+    namespace export do chan string options
+    namespace export doChan doString
+}
+
+# ### ### ### ######### ######### #########
+## API commands
+
+proc ::transfer::copy::do {type in out args} {
+    switch -exact -- $type {
+	chan - string {}
+	default {
+	    return -code error \
+		    "Unknown type \"$type\",\
+		    expected chan, or string"
+	}
+    }
+
+    options $out $args settings
+
+    switch -exact -- $type {
+	chan   {doChan   $in $out settings}
+	string {doString $in $out settings}
+    }
+    return
+}
+
+proc ::transfer::copy::chan {in out args} {
+    # Options: -size n
+    #          -blocksize n
+    #          -progress cmd, (cmd n)       - feedback
+    #          -command cmd,  (cmd n ?err?) - completion
+
+    options     $out $args settings
+    doChan  $in $out       settings
+    return
+}
+
+proc ::transfer::copy::string {string out args} {
+    # Options: -size n
+    #          -blocksize n
+    #          -progress cmd, (cmd n)       - feedback
+    #          -command cmd,  (cmd n ?err?) - completion
+
+    options          $out $args settings
+    doString $string $out       settings
+    return
+}
+
+proc ::transfer::copy::options {chan alist optv {defaults {}}} {
+    upvar 1 $optv settings
+
+    # Prepare defaults, hardwired, output channel, and caller
+
+    array set settings {
+	-size     -1
+	-progress {}
+	-command  {}
+    }
+
+    array set settings [CGet $chan]
+    array set settings $defaults
+
+    # Process the options
+
+    set capture 0
+    foreach o $alist {
+	# Store argument to previous option
+	if {$capture} {
+	    set settings($key) $o
+	    set capture 0
+	    continue
+	}
+	# Dispatch & process the option
+	switch -exact -- $o {
+	    -blocksize -
+	    -command -
+	    -encoding -
+	    -eofchar -
+	    -progress -
+	    -size -
+	    -translation {
+		set key $o
+		set capture 1
+	    }
+	    default {
+		return -code error \
+			"Unknown option \"$o\",\
+			expected one of -size,\
+			-blocksize, -progress,\
+			or -command"
+	    }
+	}
+    }
+    if {$capture} {
+	return -code error \
+		"wrong\#args, option \"$o\" \
+		is without argument"
+    }
+
+    if {![llength $settings(-command)]} {
+	return -code error \
+		"Completion callback is missing"
+    }
+
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Implementation. Transfer from a channel.
+
+proc ::transfer::copy::doChan {in out ov} {
+    upvar 1 $ov settings
+
+    upvar 0 settings(-size)    size
+    upvar 0 settings(-command) command
+
+    if {$size == 0} {
+	# Nothing to transfer. Is that an error, or mildy ok ?
+	# For now: Ok.
+
+	Run command 0
+	return
+    }
+
+    set state [CGet $out]
+    Configure $out [array get settings]
+    upvar 0 settings(-progress) progress
+    upvar 0 settings(-blocksize) blocksize
+
+    if {$size > 0} {
+	if {$blocksize < $size} {
+	    set n $blocksize
+	} else {
+	    set n $size
+	}
+
+	fcopy $in $out -size $n -command \
+		[list \
+		     ::transfer::copy::HandlerChan \
+		     $n $size $size 0 \
+		     $progress $command \
+		     $in $out $state]
+    } else {
+	fcopy $in $out -size $blocksize -command \
+	    [list \
+		 ::transfer::copy::HandlerChan \
+		 $blocksize $size $size 0 \
+		 $progress $command \
+		 $in $out $state]
+    }
+    return
+}
+
+proc ::transfer::copy::HandlerChan {
+    blocksize remainder size total
+    progress command
+    in out state
+    transfered args
+} {
+    incr total $transfered
+
+    # Progress
+    if {[llength $progress]} {
+	Run progress $total
+    }
+
+    # Error signaled ?
+    if {[llength $args]} {
+	# Restore channel state and then propagate the problem
+	# forward.
+	Configure $out $state
+	Run command $total [lindex $args 0]
+	return
+    }
+
+    # How much transfered, have we transfered everything ?
+
+    if {($remainder >= 0) && ($size <= $total)} {
+	# Everything has been transfered, trigger completion
+	# callback. The caller has to close the output channel!
+
+	Configure $out $state
+	Run command $total
+	return
+    }
+
+    if {[eof $in]} {
+	# Input has closed, action depends on the specified size. -1
+	# signals transfer to eof, so we are now done. Otherwise we
+	# have transfered less than we wanted, and that is an error.
+
+	Configure $out $state
+	if {$size < 0} {
+	    Run command $total
+	} else {
+	    Run command $total \
+		"Transfer aborted, not enough input"
+	}
+	return
+    }
+
+    # Restart, for next chunk.
+    if {$size > 0} {
+	incr remainder -$blocksize
+	if {$blocksize < $remainder} {
+	    set n $blocksize
+	} else {
+	    set n $remainder
+	}
+	puts \tnext=$n
+
+	fcopy $in $out -size $n -command \
+	    [list \
+		 ::transfer::copy::HandlerChan \
+		 $blocksize $remainder $size $total \
+		 $progress $command \
+		 $in $out $state]
+    } else {
+	fcopy $in $out -size $blocksize -command \
+	    [list \
+		 ::transfer::copy::HandlerChan \
+		 $blocksize $remainder $size $total \
+		 $progress $command \
+		 $in $out $state]
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Implementation. Transfer from a string.
+
+proc ::transfer::copy::doString {str out ov} {
+    upvar 1 $ov settings
+
+    upvar 0 settings(-size)    size
+    upvar 0 settings(-command) command
+
+    if {$size == 0} {
+	# Nothing to transfer. Is that an error, or mildy ok ?
+	# For now: Ok
+
+	Run command 0
+	return
+    }
+
+    set length [::string length $str]
+    if {$size > 0} {
+	if {$length < $size} {
+	    Run command 0 \
+		    "Transfer impossible,\
+		    not enough data for size"
+	    return
+	}
+	set last $size
+    } else {
+	# size < 0 (Note size == 0 already captured)
+	set last $length
+	set size $last
+    }
+
+    # We transfer the string in chunks of -blocksize. We cannot use
+    # fcopy for this, so do our own event processing.
+
+    set state [CGet $out]
+    Configure $out [array get settings]
+
+    upvar 0 settings(-blocksize) blocksize
+    upvar 0 settings(-progress)  progress
+
+    fileevent $out writable [list \
+	    ::transfer::copy::HandlerString \
+	    $size 0 $last \
+	    $blocksize 0 [expr {$blocksize - 1}] \
+	    $progress $command \
+	    $str $out $state]
+    return
+}
+
+proc ::transfer::copy::HandlerString {
+    pending transfered last
+    block from to
+    progress command
+    str out state
+} {
+    # pending + transfered = last. from/to is chunk to transfer.
+
+    if {$to > $last} {
+	set  to         end
+	incr transfered $pending
+	set  pending    0
+    }
+
+    set code [catch {
+	puts -nonewline $out \
+		[::string range $str $from $to]
+    } res]
+    if {$code} {
+	Configure $out $state
+	fileevent $out writable {}
+	Run command $transfered $res
+	return
+    }
+
+    if {[llength $progress]} {
+	Run progress $transfered
+    }
+
+    if {$pending == 0} {
+	# Done
+	Configure $out $state
+	fileevent $out writable {}
+	Run command $transfered
+    }
+
+    # Prepare for next chunk
+
+    incr transfered $block
+    incr pending   -$block
+    incr from       $block
+    incr to         $block
+
+    fileevent $out writable [list \
+		  ::transfer::copy::HandlerString \
+		  $pending $transfered $last \
+		  $block $from $to \
+		  $progress $command \
+		  $str $out $state]
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Implementation. Support commands.
+
+proc ::transfer::copy::Run {cmdv args} {
+    upvar 1 $cmdv c
+    set command $c
+    foreach a $args {lappend command $a}
+    return [uplevel #0 $command]
+
+    # 8.5: {*}$c {*}$args
+}
+
+proc ::transfer::copy::CGet {chan} {
+    array set settings {}
+
+    foreach o {
+	-buffersize -encoding -translation -eofchar -blocking
+    } {
+	set settings($o) [fconfigure $chan $o]
+    }
+
+    set   settings(-blocksize) $settings(-buffersize)
+    unset settings(-buffersize)
+    return [array get settings]
+}
+
+proc ::transfer::copy::Configure {chan settings} {
+    array set tmp $settings
+
+    set   tmp(-buffersize) $tmp(-blocksize)
+    unset tmp(-blocksize)
+    unset -nocomplain tmp(-progress)
+    unset -nocomplain tmp(-command)
+    unset -nocomplain tmp(-size)
+
+    foreach o [array names tmp] {
+	fconfigure $chan $o $tmp($o)
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide transfer::copy 0.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/ddest.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/ddest.tcl
new file mode 100644
index 00000000..d60f2299
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/ddest.tcl
@@ -0,0 +1,169 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+##
+
+# Class for the handling of stream destinations.
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require snit
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::transfer::data::destination {
+
+    # ### ### ### ######### ######### #########
+    ## API
+
+    #                                                        Destination is ...
+    option -channel  -default {} -configuremethod C-chan ; # an open & writable channel.
+    option -file     -default {} -configuremethod C-file ; # a writable file.
+    option -variable -default {} -configuremethod C-var  ; # the named variable.
+    option -progress -default {}
+
+    method put   {chunk} {}
+    method done  {}      {}
+    method valid {mv}    {}
+
+    method receive {sock done} {}
+
+    # ### ### ### ######### ######### #########
+    ## Implementation
+
+    method put {chunk} {
+	if {$myxtype eq "file"} {
+	    set mydest  [open $mydest w]
+	    set myxtype channel
+	    set myclose 1
+	}
+
+	switch -exact -- $myxtype {
+	    variable {
+		upvar \#0 $mydest var
+		append var $chunk
+	    }
+	    channel {
+		puts -nonewline $mydest $chunk
+	    }
+	}
+	return
+    }
+
+    method done {} {
+	switch -exact -- $myxtype {
+	    file - variable {}
+	    channel {
+		if {$myclose} {
+		    close $mydest
+		}
+	    }
+	}
+    }
+
+    method valid {mv} {
+	upvar 1 $mv message
+	switch -exact -- $myxtype {
+	    undefined {
+		set message "Data destination is undefined"
+		return 0
+	    }
+	    default {}
+	}
+	return 1
+    }
+
+    method receive {sock done} {
+	set myntransfered 0
+	set old [fconfigure $sock -blocking]
+	fconfigure $sock -blocking 0
+	fileevent $sock readable \
+		[mymethod Read $sock $old $done]
+	return
+    }
+
+    method Read {sock oldblock done} {
+	set chunk [read $sock]
+	if {[set l [string length $chunk]]} {
+	    $self put $chunk
+	    incr myntransfered $l
+	    if {[llength $options(-progress)]} {
+		uplevel #0 [linsert $options(-progress) end $myntransfered]
+	    }
+	}
+	if {[eof $sock]} {
+	    $self done
+	    fileevent  $sock readable {}
+	    fconfigure $sock -blocking $oldblock
+
+	    uplevel #0 [linsert $done end $myntransfered]
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal helper commands.
+
+    method C-var {o newvalue} {
+	set myetype variable
+	set myxtype string
+
+	if {![uplevel \#0 {info exists $newvalue}]} {
+	    return -code error "Bad variable \"$newvalue\", does not exist"
+	}
+
+	set mydest $newvalue
+	return
+    }
+
+    method C-chan {o newvalue} {
+	if {![llength [file channels $newvalue]]} {
+	    return -code error "Bad channel handle \"$newvalue\", does not exist"
+	}
+	set myetype channel
+	set myxtype channel
+	set mydest  $newvalue
+	return
+    }
+
+    method C-file {o newvalue} {
+	if {![file exists $newvalue]} {
+	    set d [file dirname $newvalue]
+	    if {![file writable $d]} {
+		return -code error "File \"$newvalue\" not creatable"
+	    }
+	    if {![file isdirectory $d]} {
+		return -code error "File \"$newvalue\" not creatable"
+	    }
+	} else {
+	    if {![file writable $newvalue]} {
+		return -code error "File \"$newvalue\" not writable"
+	    }
+	    if {![file isfile $newvalue]} {
+		return -code error "File \"$newvalue\" not a file"
+	    }
+	}
+	set myetype channel
+	set myxtype file
+	set mydest  $newvalue
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Data structures
+
+    variable myetype  undefined
+    variable myxtype  undefined
+    variable mydest   {}
+    variable myclose  0
+    variable myntransfered
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide transfer::data::destination 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/dsource.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/dsource.tcl
new file mode 100644
index 00000000..83f4519e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/dsource.tcl
@@ -0,0 +1,183 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+##
+
+# Class for the handling of stream sources.
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require transfer::copy ; # Data transmission core
+package require snit
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::transfer::data::source {
+
+    # ### ### ### ######### ######### #########
+    ## API
+
+    #                                                        Source is ...
+    option -string   -default {} -configuremethod C-str  ; # a string.
+    option -channel  -default {} -configuremethod C-chan ; # an open & readable channel.
+    option -file     -default {} -configuremethod C-file ; # a file.
+    option -variable -default {} -configuremethod C-var  ; # a string held by the named variable.
+
+    option -size     -default -1 ; # number of characters to transfer.
+    option -progress -default {}
+
+    method type  {} {}
+    method data  {} {}
+    method size  {} {}
+    method valid {mv} {}
+
+    method transmit {sock blocksize done} {}
+
+    # ### ### ### ######### ######### #########
+    ## Implementation
+
+    method type {} {
+	return $myxtype
+    }
+
+    method data {} {
+	switch -exact -- $myetype {
+	    undefined {
+		return -code error "Data source is undefined"
+	    }
+	    string - chan {
+		return $mysrc
+	    }
+	    variable {
+		upvar \#0 $mysrc thevalue
+		return $thevalue
+	    }
+	    file {
+		return [open $mysrc r]
+	    }
+	}
+    }
+
+    method size {} {
+	if {$options(-size) < 0} {
+	    switch -exact -- $myetype {
+		undefined {
+		    return -code error "Data source is undefined"
+		}
+		string {
+		    return [string length $mysrc]
+		}
+		variable {
+		    upvar \#0 $mysrc thevalue
+		    return [string length $thevalue]
+		}
+		chan - file {
+		    # Nothing, -1 passes through
+		    # We do not use [file size] for a file, as a
+		    # user-specified encoding may distort the
+		    # counting.
+		}
+	    }
+	}
+
+	return $options(-size)
+    }
+
+    method valid {mv} {
+	upvar 1 $mv message
+
+	switch -exact -- $myetype {
+	    undefined {
+		set message "Data source is undefined"
+		return 0
+	    }
+	    string - variable {
+		if {[$self size] > [string length [$self data]]} {
+		    set message "Not enough data to transmit"
+		    return 0
+		}
+	    }
+	    chan {
+		# Additional check of option ?
+	    }
+	    file {
+		# Additional check of option ?
+	    }
+	}
+	return 1
+    }
+
+    method transmit {sock blocksize done} {
+	::transfer::copy::do \
+	    [$self type] [$self data] $sock \
+	    -size      [$self size] \
+	    -blocksize $blocksize \
+	    -command   $done \
+	    -progress  $options(-progress)
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal helper commands.
+
+    method C-str {o newvalue} {
+	set myetype string
+	set myxtype string
+	set mysrc   $newvalue
+	return
+    }
+
+    method C-var {o newvalue} {
+	set myetype variable
+	set myxtype string
+
+	if {![uplevel \#0 {info exists $newvalue}]} {
+	    return -code error "Bad variable \"$newvalue\", does not exist"
+	}
+
+	set mysrc $newvalue
+	return
+    }
+
+    method C-chan {o newvalue} {
+	if {![llength [file channels $newvalue]]} {
+	    return -code error "Bad channel handle \"$newvalue\", does not exist"
+	}
+	set myetype chan
+	set myxtype chan
+	set mysrc   $newvalue
+	return
+    }
+
+    method C-file {o newvalue} {
+	if {![file exists $newvalue]} {
+	    return -code error "File \"$newvalue\" does not exist"
+	}
+	if {![file readable $newvalue]} {
+	    return -code error "File \"$newvalue\" not readable"
+	}
+	if {![file isfile $newvalue]} {
+	    return -code error "File \"$newvalue\" not a file"
+	}
+	set myetype file
+	set myxtype chan
+	set mysrc   $newvalue
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Data structures
+
+    variable myetype undefined
+    variable myxtype undefined
+    variable mysrc
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide transfer::data::source 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/pkgIndex.tcl
new file mode 100644
index 00000000..a18fa1b3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/pkgIndex.tcl
@@ -0,0 +1,8 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} return
+package ifneeded transfer::copy              0.3 [list source [file join $dir copyops.tcl]]
+package ifneeded transfer::copy::queue       0.1 [list source [file join $dir tqueue.tcl]]
+package ifneeded transfer::data::source      0.2 [list source [file join $dir dsource.tcl]]
+package ifneeded transfer::data::destination 0.2 [list source [file join $dir ddest.tcl]]
+package ifneeded transfer::connect           0.2 [list source [file join $dir connect.tcl]]
+package ifneeded transfer::transmitter       0.2 [list source [file join $dir transmitter.tcl]]
+package ifneeded transfer::receiver          0.2 [list source [file join $dir receiver.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/receiver.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/receiver.tcl
new file mode 100644
index 00000000..4460941a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/receiver.tcl
@@ -0,0 +1,188 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+##
+# Transfer class. Reception of data.
+##
+# Utilizes data destination and connect components to handle the
+# general/common parts.
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require snit
+package require transfer::data::destination ; # Data destination
+package require transfer::connect           ; # Connection startup
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::transfer::receiver {
+
+    # ### ### ### ######### ######### #########
+    ## Convenient fire and forget file/channel reception operations.
+
+    typemethod {stream channel} {chan host port args} {
+	# Select stream configuration ( host => active, otherwise
+	# passive)
+	if {$host eq {}} {
+	    set cmd [linsert $args 0 $type %AUTO% \
+			 -channel $chan -port $port \
+			 -mode passive -translation binary]
+	} else {
+	    set cmd [linsert $args 0 $type %AUTO% \
+			 -channel $chan -host $host -port $port \
+			 -mode active -translation binary]
+	}
+
+	# Create a transient transmitter controller, and wrap our own
+	# internal completion handling around the user supplied
+	# callback.
+
+	set receiver [eval $cmd]
+	$receiver configure \
+	    -command [mytypemethod Done \
+			  [$receiver cget -command]]
+
+	# Begin transmission (or wait for other side to connect).
+	return [$receiver start]
+    }
+
+    typemethod {stream file} {file host port args} {
+	set chan [open $file w]
+	fconfigure $chan -translation binary
+
+	set receiver [eval [linsert $args 0 $type stream channel $chan $host $port]]
+
+	# Redo completion command callback.
+	$receiver configure \
+	    -command [mytypemethod DoneFile $chan \
+			  [lindex [$receiver cget -command] end]]
+	return $receiver
+    }
+
+    typemethod Done {command receiver n {err {}}} {
+	$receiver destroy
+
+	if {![llength $command]} return
+
+	after 0 [linsert $command end $n $err]
+	return
+    }
+
+    typemethod DoneFile {chan command receiver n {err {}}} {
+	close $chan
+	$receiver destroy
+
+	if {![llength $command]} return
+
+	after 0 [linsert $command end $n $err]
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## API
+
+    ## Data destination sub component
+
+    delegate option -channel  to mydestination
+    delegate option -file     to mydestination
+    delegate option -variable to mydestination
+    delegate option -progress to mydestination
+
+    ## Connection management sub component
+
+    delegate option -host        to myconnect
+    delegate option -port        to myconnect
+    delegate option -mode        to myconnect
+    delegate option -translation to myconnect
+    delegate option -encoding    to myconnect
+    delegate option -eofchar     to myconnect
+    delegate option -socketcmd   to myconnect
+
+    ## Receiver configuration, and API
+
+    option -command -default {}
+
+    constructor {args} {}
+
+    method start {} {}
+    method busy  {} {}
+
+    # ### ### ### ######### ######### #########
+    ## Implementation
+
+    constructor {args} {
+	set mybusy 0
+	install mydestination using ::transfer::data::destination ${selfns}::dest
+	install myconnect     using ::transfer::connect           ${selfns}::conn
+
+	$self configurelist $args
+	return
+    }
+
+    method start {} {
+	if {$mybusy} {
+	    return -code error "Object is busy"
+	}
+
+	if {![$mydestination valid msg]} {
+	    return -code error $msg
+	}
+
+	if {$options(-command) eq ""} {
+	    return -code error "Completion callback is missing"
+	}
+
+	set mybusy 1
+	return [$myconnect connect [mymethod Begin]]
+    }
+
+    method busy {} {
+	return $mybusy
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal helper commands.
+
+    method Begin {__ sock} {
+	# __ == myconnect
+	$mydestination receive $sock \
+		[mymethod Done $sock]
+	return
+    }
+
+    method Done {sock args} {
+	# args is either (n),
+	#             or (n errormessage)
+
+	set mybusy 0
+	close $sock
+	$self Complete $args
+	return
+    }
+
+    method Complete {arguments} {
+	# 8.5: {*}$options(-command) $self {*}$arguments
+	set     cmd $options(-command)
+	lappend cmd $self
+	foreach a $arguments {lappend cmd $a}
+
+	uplevel #0 $cmd
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Data structures
+
+    component mydestination   ; # Data destination the transfered bytes are delivered to
+    component myconnect	      ; # Connector controlling where to get the data from.
+    variable  mybusy        0 ; # Transfer status.
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide transfer::receiver 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/tqueue.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/tqueue.tcl
new file mode 100644
index 00000000..7cab0876
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/tqueue.tcl
@@ -0,0 +1,223 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+##
+# Transfer class built on top of the basic facilities. Accepts many
+# transfer requests, any time, and executes them serially. Each
+# request has its own progress and completion commands.
+#
+# Note: The output channel used is part of the queue, and not
+#       contained in the transfer requests themselves. Otherwise
+#       we would not need a queue and serialized execution.
+#
+# Instances also have a general callback to report the instance status
+# (#pending transfer requests, busy).
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require transfer::copy ; # Basic transfer facilities
+package require struct::queue  ; # Request queue
+package require snit           ; # OO system
+package require Tcl 8.4
+
+namespace eval ::transfer::copy::queue {
+    namespace import ::transfer::copy::options
+    namespace import ::transfer::copy::doChan
+    namespace import ::transfer::copy::doString
+}
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::transfer::copy::queue {
+    # ### ### ### ######### ######### #########
+    ## API
+
+    option -on-status-change {}
+
+    constructor {thechan args} {}
+    method put     {request} {}
+    method busy    {} {}
+    method pending {} {}
+
+    # ### ### ### ######### ######### #########
+    ## Implementation
+
+    constructor {thechan args} {
+	if {![llength [file channels $chan]]} {
+	    return -code error "Channel \"$chan\" does not exist"
+	}
+
+	set chan  $thechan
+	set queue [struct::queue ${selfns}::queue]
+	set busy  0
+
+	$self configurelist $args
+	return
+    }
+
+    destructor {
+	if {$queue eq ""} return
+	$queue destroy
+	return
+    }
+
+    method put {request} {
+	# Request syntax: type dataref ?options?
+	# Accepted options are those of 'transfer::transmit::copy',
+	# etc.
+
+	# We parse out the completion callback so that we can use it
+	# directly. This also checks the request for basic validity.
+
+	if {[llength $request] < 2} {
+	    return -code error "Bad request: Not enough elements"
+	}
+
+	set type [lindex $request 0]
+	switch -exact -- $type {
+	    chan - string {}
+	    default {
+		return -code error "Bad request: Unknown type \"$type\", expected chan, or string"
+	    }
+	}
+
+	set options [lrange $request 2 end]
+	if {[catch {
+	    options $chan $options opts
+	} res]} {
+	    return -code error "Bad request: $res"
+	}
+
+	set ref [lindex $request 1]
+
+	# We store the fully parsed request. Later
+	# we call lower-level copy functionality
+	# which avoids a reparsing.
+
+	$queue put [list $type $ref [array get opts]]
+
+	# Start the engine executing transfers in the background, if
+	# it is not already running.
+
+	if {!$busy} {
+	    after 0 [mymethod Transfer]
+	}
+
+	$self ReportStatus
+	return
+    }
+
+    method busy {} {
+	return $busy
+    }
+
+    method pending {} {
+	return [$queue size]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal helper commands
+
+    method Transfer {} {
+	# Get the next pending request. It is already fully-parsed.
+
+	foreach {type ref o} [$queue get] break
+	array set opts $o
+
+	# Save the actual completion callback and redirect the
+	# completion of the copy operation to ourselves for proper
+	# management.
+
+	set opts(-command) [mymethod \
+		Done $opts(-command)]
+
+	# Start the transfer. We catch this as it can fail immediately
+	# (example: string-type copy and not enough data). We go
+	# through 'Done' for the reporting of such errors to avoid
+	# forgetting all the other management stuff (like the engine
+	# forced to stop).
+
+	set busy 1
+	$self ReportStatus
+
+	switch -exact -- $type {
+	    chan {
+		set code [catch {
+		    doChan $ref $chan opts
+		} res]
+	    }
+	    string {
+		set code [catch {
+		    doString $ref $chan opts
+		} res]
+	    }
+	}
+
+	if {$code} {
+	    $self Done $command 0 $res
+	}
+
+	return
+    }
+
+    method Done {command args} {
+	# args is either (n)
+	#             or (n errormessage)
+
+	# A transfer ending in an error causes the instance to stop
+	# processing requests. I.e. all requests waiting after the
+	# failed one are not executed anymore.
+
+	if {[llength $args] == 2} {
+	    set busy 0
+	    $self ReportStatus
+	    $self Notify $command $args
+	    return
+	}
+
+	# Depending on the status of the queue of pending requests we
+	# either trigger the start of the next transfer, or stop the
+	# engine. The completion of the current transfer however is
+	# unconditionally reported through its completion callback.
+
+	if {[$queue size]} {
+	    after 0 [mymethod Transfer]
+	} else {
+	    set busy 0
+	    $self ReportStatus
+	}
+
+	$self Notify $command $args
+	return
+    }
+
+    method ReportStatus {} {
+	if {![llength $options(-on-status-change)]} return
+	uplevel #0 [linsert $options(-on-status-change) end $self [$queue size] $busy]
+	return
+    }
+
+    method Notify {cmd alist} {
+	foreach a $args {lappend cmd $a}
+	uplevel #0 $cmd
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Data structures
+    ## - Channel the transfered data is written to
+    ## - Queue of pending requests.
+
+    variable chan  {}
+    variable queue {}
+    variable busy  0
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide transfer::copy::queue 0.1
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/transmitter.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/transmitter.tcl
new file mode 100644
index 00000000..900401cc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/transfer/transmitter.tcl
@@ -0,0 +1,176 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+##
+# Transfer class. Sending of data.
+##
+# Utilizes data source and connect components to handle the
+# general/common parts.
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require snit
+package require transfer::data::source ; # Data source
+package require transfer::connect      ; # Connection startup
+
+# ### ### ### ######### ######### #########
+## Implementation
+
+snit::type ::transfer::transmitter {
+
+    # ### ### ### ######### ######### #########
+    ## Convenient fire and forget file/channel transmission operations.
+
+    typemethod {stream channel} {chan host port args} {
+	# Select stream configuration ( host => active, otherwise
+	# passive)
+	if {$host eq {}} {
+	    set cmd [linsert $args 0 $type %AUTO% \
+			 -channel $chan -port $port \
+			 -mode passive -translation binary]
+	} else {
+	    set cmd [linsert $args 0 $type %AUTO% \
+			 -channel $chan -host $host -port $port \
+			 -mode active -translation binary]
+	}
+
+	# Create a transient transmitter controller, and wrap our own
+	# internal completion handling around the user supplied
+	# callback.
+
+	set transmitter [eval $cmd]
+	$transmitter configure \
+	    -command [mytypemethod Done \
+			  $chan [$transmitter cget -command]]
+
+	# Begin transmission (or wait for other side to connect).
+	return [$transmitter start]
+    }
+
+    typemethod {stream file} {file host port args} {
+	set chan [open $file r]
+	fconfigure $chan -translation binary
+
+	return [eval [linsert $args 0 $type stream channel $chan $host $port]]
+    }
+
+    typemethod Done {chan command transmitter n {err {}}} {
+	close $chan
+	$transmitter destroy
+
+	if {![llength $command]} return
+
+	after 0 [linsert $command end $n $err]
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## API
+
+    ## Data source sub component
+
+    delegate option -string   to mysource
+    delegate option -channel  to mysource
+    delegate option -file     to mysource
+    delegate option -variable to mysource
+    delegate option -size     to mysource
+    delegate option -progress to mysource
+
+    ## Connection management sub component
+
+    delegate option -host        to myconnect
+    delegate option -port        to myconnect
+    delegate option -mode        to myconnect
+    delegate option -translation to myconnect
+    delegate option -encoding    to myconnect
+    delegate option -eofchar     to myconnect
+    delegate option -socketcmd   to myconnect
+
+    ## Transmitter configuration, and API
+
+    option -command   -default {}
+    option -blocksize -default 1024 -type {snit::integer -min 1}
+
+    constructor {args} {}
+
+    method start {} {}
+    method busy  {} {}
+
+    # ### ### ### ######### ######### #########
+    ## Implementation
+
+    constructor {args} {
+	set mybusy 0
+	install mysource  using ::transfer::data::source ${selfns}::source
+	install myconnect using ::transfer::connect      ${selfns}::conn
+	$self configurelist $args
+	return
+    }
+
+    method start {} {
+	if {$mybusy} {
+	    return -code error "Object is busy"
+	}
+
+	if {![$mysource valid msg]} {
+	    return -code error $msg
+	}
+
+	if {$options(-command) eq ""} {
+	    return -code error "Completion callback is missing"
+	}
+
+	set mybusy 1
+	return [$myconnect connect [mymethod Begin]]
+    }
+
+    method busy {} {
+	return $mybusy
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal helper commands.
+
+    method Begin {__ sock} {
+	# __ <=> myconnect
+	$mysource transmit $sock \
+		$options(-blocksize) \
+		[mymethod Done $sock]
+	return
+    }
+
+    method Done {sock args} {
+	# args is either (n),
+	#             or (n errormessage)
+
+	set mybusy 0
+	close $sock
+	$self Complete $args
+	return
+    }
+
+    method Complete {arguments} {
+	# 8.5: {*}$options(-command) $self {*}$arguments
+	set     cmd $options(-command)
+	lappend cmd $self
+	foreach a $arguments {lappend cmd $a}
+
+	uplevel #0 $cmd
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Data structures
+
+    component mysource    ; # Data source providing the bytes to transfer
+    component myconnect   ; # Connector controlling where to the data transfered to.
+    variable  mybusy    0 ; # Transfer status.
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide transfer::transmitter 0.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/treeql/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/treeql/pkgIndex.tcl
new file mode 100644
index 00000000..ab966b3e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/treeql/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {
+    # PRAGMA: returnok
+    return
+}
+package ifneeded treeql 1.3.1 [list source [file join $dir treeql.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/treeql/treeql.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/treeql/treeql.tcl
new file mode 100644
index 00000000..e2490536
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/treeql/treeql.tcl
@@ -0,0 +1,24 @@
+# treeql.tcl
+# A generic tree query language in snit
+#
+# Copyright 2004 Colin McCormack.
+# You are permitted to use this code under the same license as tcl.
+#
+# 20040930 Colin McCormack - initial release to tcllib
+#
+# RCS: @(#) $Id: treeql.tcl,v 1.10 2006/09/19 23:36:18 andreas_kupries Exp $
+
+package require Tcl 8.4
+
+# Select the implementation based on the version of the Tcl core
+# executing this code. For 8.5 we are using features like
+# word-expansion to simplify the various evaluations.
+
+set dir [file dirname [info script]]
+if {[package vsatisfies [package provide Tcl] 8.5]} {
+    source [file join $dir treeql85.tcl]
+} else {
+    source [file join $dir treeql84.tcl]
+}
+
+package provide treeql 1.3.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/treeql/treeql84.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/treeql/treeql84.tcl
new file mode 100644
index 00000000..552792fc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/treeql/treeql84.tcl
@@ -0,0 +1,734 @@
+# treeql.tcl
+# A generic tree query language in snit
+#
+# Copyright 2004 Colin McCormack.
+# You are permitted to use this code under the same license as tcl.
+#
+# 20040930 Colin McCormack - initial release to tcllib
+#
+# RCS: @(#) $Id: treeql84.tcl,v 1.10 2007/06/23 03:39:34 andreas_kupries Exp $
+
+package require Tcl 8.4
+package require snit
+package require struct::list
+package require struct::set
+
+snit::type ::treeql {
+    variable nodes	;# set of all nodes
+    variable tree	;# tree over which nodes are defined
+    variable query	;# full query - ie: 'parent' of this treeql object
+
+    # low level accessor to tree
+    method treeObj {} {
+	return $tree
+    }
+
+    # apply the [$tree cmd {*}$args] form to each node
+    # returns the list of results of application
+    method apply {cmd args} {
+	set result {}
+	foreach node $nodes {
+	    if {[catch {
+		eval [list $tree] $cmd [list $node] $args
+	    } application]} {
+		upvar ::errorInfo eo
+		puts stderr "apply: $tree $cmd $node $args -> $application - $eo"
+	    } else {
+		#puts stderr "Apply: $tree $cmd $node $args -> $application"
+		foreach a $application {lappend result $a}
+	    }
+	}
+
+	return $result
+    }
+
+    # filter nodes by [$tree cmd {*}$args]
+    # returns the list of results of application when application is non nil
+    method filter {cmd args} {
+	set result {}
+	foreach node $nodes {
+	    if {[catch {
+		eval [list $tree] $cmd [list $node] $args
+	    } application]} {
+		upvar ::errorInfo eo
+		puts stderr "filter: $tree $cmd $node $args -> $application - $eo"
+	    } else {
+		#puts stderr "Filter: $tree $cmd $node $args -> $application"
+		if {$application != {}} {
+		    lappend result $application
+		}
+	    }
+	}
+	return $result
+    }
+
+    # filter nodes by the predicate [$tree cmd {*}$args]
+    # returns the list of results of application when application is true
+    method bool {cmd args} {
+
+	#puts stderr "Bool: $tree $cmd - $args"
+	#set result [::struct::list filter $nodes [list $tree $cmd {*}$args]]
+	#puts stderr "Bool: $tree $cmd - $nodes - $args -> $result"
+	#return $result
+
+	# replaced by tcllib's list filter
+	set result {}
+	foreach node $nodes {
+	    if {[catch {
+		eval [list $tree] $cmd [list $node] $args
+	    } application]} {
+		upvar ::errorInfo eo
+		puts stderr "filter: $tree $cmd $node $args -> $application - $eo"
+	    } else {
+		#puts stderr "bool: $tree $cmd $node $args -> $application - [$tree dump $node]"
+		if {$application} {
+		    lappend result $node
+		}
+	    }
+	}
+
+	return $result
+    }
+
+    # applyself - map cmd on $self to each node, discarding null results
+    method applyself {cmd args} {
+
+	set result {}
+	foreach node $nodes {
+	    if {[catch {
+		eval [list $query] $cmd [list $node] $args
+	    } application]} {
+		upvar ::errorInfo eo
+		puts stderr "applyself: $tree $cmd $node $args -> $application - $eo"
+	    } else {
+		if {[llength $application]} {
+		    foreach a $application {lappend result $a}
+		}
+	    }
+	}
+
+	return $result
+    }
+
+    # mapself - map cmd on $self to each node
+    method mapself {cmd args} {
+
+	set result {}
+	foreach node $nodes {
+	    if {[catch {
+		eval [list $query] $cmd [list $node] $args
+	    } application]} {
+		upvar ::errorInfo eo
+		puts stderr "mapself: $tree $cmd $node $args -> $application - $eo"
+	    } else {
+		#puts stderr "Mapself: $query $cmd $node $args -> $application"
+		lappend result $application
+	    }
+	}
+
+	return $result
+    }
+
+    # shim to perform operation $op on attribute $attr of $node
+    method do_attr {node op attr} {
+	set attrv [$tree get $node $attr]
+	#puts stderr "$self do_attr node:'$node' op:'$op' attr:'$attr' attrv:'$attrv'"
+	return [eval [linsert $op end $attrv]]
+    }
+
+    # filter nodes by predicate [string $op] over attribute $attr
+    method stringP {op attr args} {
+	set n {}
+	set map [$self mapself do_attr [linsert $op 0 string] $attr]
+	foreach result $map node $nodes {
+	    #puts stderr "$self stringP $op $attr -> $result - $node"
+	    if {$result} {
+		lappend n $node
+	    }
+	}
+	set nodes $n
+	return $args
+    }
+
+    # filter nodes by negated predicate [string $op] over attribute $attr
+    method stringNP {op attr args} {
+	set n {}
+	set map [$self mapself do_attr [linsert $op 0 string] $attr]
+	foreach result $map node $nodes {
+	    if {!$result} {
+		lappend n $node
+	    }
+	}
+	set nodes $n
+	return $args
+    }
+
+    # filter nodes by predicate [expr {*}$op] over attribute $attr
+    method exprP {op attr args} {
+	set n {}
+	set map [$self mapself do_attr [linsert $op 0 expr] $attr]
+	foreach result $map node $nodes {
+	    if {$result} {
+		lappend n $node
+	    }
+	}
+	set nodes $n
+	return $args
+    }
+
+    # filter nodes by predicate ![expr {*}$op] over attribute $attr
+    method exprNP {op attr args} {
+	set n {}
+	set map [$self mapself do_attr [linsert $op 0 expr] $attr]
+	foreach result $map node $nodes {
+	    if {!$result} {
+		lappend n $node
+	    }
+	}
+	set nodes $n
+	return $args
+    }
+
+    # shim to return string values of attributes matching $pattern of a given $node
+    method do_get {node pattern} {
+	set result {}
+	foreach key [$tree keys $node $pattern] {
+	    set result [concat $result [$tree get $node $key]]
+	}
+	return $result
+    }
+
+    # Returns list of attribute values of attributes matching $pattern -
+    method get {pattern} {
+	set nodes [$self mapself do_get $pattern]
+	return {}	;# terminate query
+    }
+
+    # Returns list of attribute values of the current node, in an unspecified order.
+    method attlist {} {
+	$self get *
+	return {}	;# terminate query
+    }
+
+    # Returns list of lists of attributes of each node
+    method attrs {glob} {
+	set nodes [$self apply keys $glob]
+	return {}	;# terminate query
+    }
+
+    # shim to find node ancestors by repetitive [parent]
+    # as tcllib tree lacks this
+    method do_ancestors {node} {
+	set ancestors {}
+	set rootname [$tree rootname]
+	while {$node ne $rootname} {
+	    lappend ancestors $node
+	    set node [$tree parent $node]
+	}
+	lappend ancestors $rootname
+	return $ancestors
+    }
+
+    # path from node to root
+    method ancestors {args} {
+	set nodes [$self applyself do_ancestors]
+	return $args
+   }
+
+    # shim to find $node rootpath by repetitive [parent]
+    # as tcllib tree lacks this
+    method do_rootpath {node} {
+	set ancestors {}
+	set rootname [$tree rootname]
+	while {$node ne $rootname} {
+	    lappend ancestors $node
+	    set node [$tree parent $node]
+	}
+	lappend ancestors $rootname
+	return [::struct::list reverse $ancestors]
+    }
+
+    # path from root to node
+    method rootpath {args} {
+	set nodes [$self applyself do_rootpath]
+	return $args
+    }
+
+    # node parent
+    method parent {args} {
+	set nodes [$self apply parent]
+	return $args
+    }
+
+    # node children
+    method children {args} {
+	set nodes [$self apply children]
+	return $args
+    }
+
+    # previous sibling
+    method left {args} {
+	set nodes [$self apply previous]
+	return $args
+    }
+
+    # next sibling
+    method right {args} {
+	set nodes [$self apply next]
+	return $args
+    }
+
+    # shim to find left siblings of node, in order of occurrence
+    method do_previous* {node} {
+	if {$node == [$tree rootname]} {
+	    set children $node
+	} else {
+	    set children [$tree children [$tree parent $node]]
+	}
+	set index [expr {[lsearch $children $node] - 1}]
+	return [lrange $children 0 $index]
+    }
+
+    # previous siblings in reverse order
+    method prev {args} {
+	set nodes [::struct::list reverse [$self applyself do_previous*]]
+	return $args
+    }
+
+    # previous siblings in tree order
+    method esib {args} {
+	set nodes [$self applyself do_previous*]
+	return $args
+    }
+
+    # shim to find next siblings in tree order
+    method do_next* {node} {
+	if {$node == [$tree rootname]} {
+	    set children $node
+	} else {
+	    set children [$tree children [$tree parent $node]]
+	}
+	set index [expr {[lsearch $children $node] + 1}]
+	return [lrange $children $index end]
+    }
+
+    # next siblings in tree order
+    method next {args} {
+	set nodes [$self applyself do_next*]
+	return $args
+    }
+
+    # generates the tree root
+    method root {args} {
+	set nodes [$tree rootname]
+	return $args
+    }
+
+    # shim to calculate descendants
+    method do_subtree {node} {
+	set nodeset $node
+	set children [$tree children $node]
+	foreach child $children {
+	    foreach d [$self do_subtree $child] {lappend nodeset $d}
+	}
+	#puts stderr "do_subtree $node -> $nodeset"
+	return $nodeset
+    }
+
+    # generates proper-descendants of nodes
+    method descendants {args} {
+	set desc {}
+	set nodeset {}
+	foreach node $nodes {
+	    foreach d [lrange [$self do_subtree $node] 1 end] {lappend nodeset $d}
+	}
+	set nodes $nodeset
+	return $args
+    }
+
+    # generates all subtrees rooted at node
+    method subtree {args} {
+	set nodeset {}
+	foreach node $nodes {
+	    foreach d [$self do_subtree $node] {lappend nodeset $d}
+	}
+	set nodes $nodeset
+	return $args
+    }
+
+    # generates all nodes in the tree
+    method tree {args} {
+	set nodes [$self do_subtree [$tree rootname]]
+	return $args
+    }
+
+    # generates all subtrees rooted at node
+    #method descendants {args} {
+    #	set nodes [$tree apply descendants]
+    #	return $args
+    #}
+
+    # flattened next subtrees
+    method forward {args} {
+	set nodes [$self applyself do_next*]	;# next siblings
+	$self descendants	;# their proper descendants
+	return $args
+    }
+
+    # synonym for [forward]
+    method later {args} {
+	$self forward
+	return $args
+    }
+
+    # flattened previous subtrees in tree order
+    method earlier {args} {
+	set nodes [$self applyself do_previous*]	;# all earlier siblings
+	$self descendants	;# their proper descendants
+	return $args
+    }
+
+    # flattened previous subtrees in reverse tree order
+    # FIXME - this isn't going to return things in the correct order
+    method backward {args} {
+	set nodes [$self applyself do_previous*]	;# all earlier siblings
+	$self subtree	;# their subtrees
+	set nodes [::struct::list reverse $nodes]	;# reverse order
+	return $args
+    }
+
+    # Returns the node type of nodes
+    method nodetype {} {
+	set nodes [$self apply get @type]
+	return {}	;# terminate query
+    }
+
+    # Reduce to nodes of @type $t
+    method oftype {t args} {
+	return [eval [linsert $args 0 $self stringP [list equal -nocase $t] @type]]
+    }
+
+    # Reduce to nodes not of @type $t
+    method nottype {t args} {
+	return [eval [linsert $args 0 $self stringNP [list equal -nocase $t] @type]]
+    }
+
+    # Reduce to nodes whose @type is one of $attrs
+    # @type values are assumed to be simple strings
+    method oftypes {attrs args} {
+	set n {}
+	foreach result [$self mapself do_attr list @type] node $nodes {
+	    if {[lsearch $attrs $result] > -1} {
+		#puts stderr "$self oftypes '$attrs' -> $result - $node"
+		lappend n $node
+	    }
+	}
+	set nodes $n
+	return $args
+    }
+
+    # Reduce to nodes with attribute $attr (can be a glob)
+    method hasatt {attr args} {
+	set nodes [$self bool keyexists $attr]
+	return $args
+    }
+
+    # Returns values of attribute attname
+    method attval {attname} {
+	$self hasatt $attname	;# only nodes with attribute
+	set nodes [$self apply get $attname]	;# get the attribute nodes
+	return {}	;# terminate query
+    }
+
+    # Reduce to nodes with attribute $attr of $value
+    method withatt {attr value args} {
+	$self hasatt $attr	;# only nodes with attribute
+	return [eval [linsert $args 0 $self stringP [list equal -nocase $value] $attr]]
+    }
+
+    # Reduce to nodes with attribute $attr of $value
+    method withatt! {attr val args} {
+	return [eval [linsert $args 0 $self stringP [list equal $val] $attr]]
+    }
+
+    # Reduce to nodes with attribute $attr value one of $vals
+    method attof {attr vals args} {
+
+	set result {}
+	foreach node $nodes {
+	    set x [string tolower [[$self treeObj] get $node $attr]]
+	    if {[lsearch $vals $x] != -1} {
+		lappend result $node
+	    }
+	}
+
+	set nodes $result
+	return $args
+    }
+
+    # Reduce to nodes whose attribute $attr string matches $match
+    method attmatch {attr match args} {
+	$self stringP [linsert $match 0 match] $attr
+	return $args
+    }
+
+    # Side Effect: set attribute $attr to $val
+    method set {attr val args} {
+	$self apply set $attr $val
+	return $args
+    }
+
+    # Side Effect: unset attribute $attr
+    method unset {attr args} {
+	$self apply unset $attr
+	return $args
+    }
+
+    # apply string operation $op to attribute $attr on each node
+    method string {op attr} {
+	set nodes [$self mapself do_attr [linsert $op 0 string] $attr]
+	return {}	;# terminate query
+    }
+
+    # remove duplicate nodes, preserving order
+    method unique {args} {
+	set all {}
+	array set keys {}
+	foreach node $nodes {
+	    if {![info exists keys($node)]} {
+		set keys($node) 1
+		lappend all $node
+	    }
+	}
+	set nodes $all
+	return $args
+    }
+
+    # construct the set of nodes present in both $nodes and node set $and
+    method and {and args} {
+	set nodes [::struct::set intersect $and $nodes]
+	return $args
+    }
+
+    # return result of new query $query, preserving current node set
+    method subquery {args} {
+	set org $nodes	;# save current node set
+	set new [uplevel 1 [linsert $args 0 $query query]]
+	set nodes $org	;# restore old node set
+
+	return $new
+    }
+
+    # perform a subquery and and in the result
+    method andq {q args} {
+	$self and [uplevel 1 [linsert $q 0 $self subquery]]
+	return $args
+    }
+
+    # construct the set of nodes present in $nodes or node set $or
+    method or {or args} {
+	set nodes [::struct::set union $nodes $or]
+	$self unique
+	return $args
+    }
+
+    # perform a subquery and or in the result
+    method orq {q args} {
+	$self or [uplevel 1 [linsert $q 0 $self subquery]]
+	return $args
+    }
+
+    # construct the set of nodes present in $nodes but not node set $not
+    method not {not args} {
+	set nodes [::struct::set difference $nodes $not]
+	return $args
+    }
+
+    # perform a subquery and return the set of nodes not in the result
+    method notq {q args} {
+	$self not [uplevel 1 [linsert $q 0 $self subquery]]
+	return $args
+    }
+
+    # select the first of the nodes
+    method select {args} {
+	set nodes [lindex $nodes 0]
+	return $args
+    }
+
+    # perform a subquery then replace the nodeset
+    method transform {q var body args} {
+	upvar 1 $var iter
+	set new {}
+	foreach n [uplevel 1 [linsert $q 0 $self subquery]] {
+	    set iter $n
+	    switch -exact -- [catch {uplevel 1 $body} result] {
+		0 {
+		    # ok
+		    lappend new $result
+		}
+		1 {
+		    # pass errors up
+		    return -code error $result
+		}
+		2 {
+		    # return
+		    set nodes $result
+		    return
+		}
+		3 {
+		    # break
+		    break
+		}
+		4 {
+		    # continue
+		    continue
+		}
+	    }
+	}
+
+	set nodes $new
+
+	return $args
+    }
+
+    # replace the nodeset
+    method map {var body args} {
+	upvar 1 $var iter
+	set new {}
+	foreach n $nodes {
+	    set iter $n
+	    switch -exact -- [catch {uplevel 1 $body} result] {
+		0 {
+		    # ok
+		    lappend new $result
+		}
+		1 {
+		    # pass errors up
+		    return -code error $result
+		}
+		2 {
+		    # return
+		    set nodes $result
+		    return
+		}
+		3 {
+		    # break
+		    break
+		}
+		4 {
+		    # continue
+		    continue
+		}
+	    }
+	}
+
+	set nodes $new
+
+	return $args
+    }
+
+    # perform a subquery $query then map $body over results
+    method foreach {q var body args} {
+	upvar 1 $var iter
+	foreach n [uplevel 1 [linsert $q 0 $self subquery]] {
+	    set iter $n
+	    uplevel 1 $body
+	}
+	return $args
+    }
+
+    # perform a query, then evaluate $body
+    method with {q body args} {
+	# save current node set, implied reset
+	set org $nodes; set nodes {}
+
+	uplevel 1 [linsert $q 0 $self query]
+	set result [uplevel 1 $body]
+
+	# restore old node set
+	set new $nodes; set nodes $org
+
+	return $args
+    }
+
+    # map $body over $nodes
+    method over {var body args} {
+	upvar 1 $var iter
+	set result {}
+	foreach n $nodes {
+	    set iter $n
+	    uplevel 1 $body
+	}
+	return $args
+    }
+
+    # perform the query
+    method query {args} {
+	# iterate over the args, treating each as a method invocation
+	while {$args != {}} {
+	    #puts stderr "query $self $args"
+	    set args [uplevel 1 [linsert $args 0 $query]]
+	    #puts stderr "-> $nodes"
+	}
+
+	return $nodes
+    }
+
+    # append the literal $val to node set
+    method quote {val args} {
+	lappend nodes $val
+	return $args
+    }
+
+    # replace the node set with the literal
+    method replace {val args} {
+	set nodes $val
+	return $args
+    }
+
+    # set nodeset to empty
+    method reset {args} {
+	set nodes {}
+	return $args
+    }
+
+    # delete all nodes in node set
+    method delete {args} {
+
+	foreach node $nodes {
+	    $tree cut $node
+	}
+
+	set nodes {}
+	return $args
+    }
+
+    # return the node set
+    method result {} {
+	return $nodes
+    }
+
+    constructor {args} {
+	set query [from args -query ""]
+	if {$query == ""} {
+	    set query $self
+	}
+
+	set nodes [from args -nodes {}]
+
+	set tree [from args -tree ""]
+
+	uplevel 1 [linsert $args 0 $self query]
+    }
+
+    # Return result, and destroy this query
+    # useful in constructing a sub-query
+    method discard {args} {
+	return [K [$self result] [$self destroy]]
+    }
+
+    proc K {x y} {
+	set x
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/treeql/treeql85.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/treeql/treeql85.tcl
new file mode 100644
index 00000000..24575460
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/treeql/treeql85.tcl
@@ -0,0 +1,737 @@
+# treeql.tcl
+# A generic tree query language in snit
+#
+# Copyright 2004 Colin McCormack.
+# You are permitted to use this code under the same license as tcl.
+#
+# 20040930 Colin McCormack - initial release to tcllib
+#
+# RCS: @(#) $Id: treeql85.tcl,v 1.2 2007/05/01 17:00:25 andreas_kupries Exp $
+
+package require Tcl 8.5
+package require snit
+package require struct::list
+package require struct::set
+
+snit::type ::treeql {
+    variable nodes	;# set of all nodes
+    variable tree	;# tree over which nodes are defined
+    variable query	;# full query - ie: 'parent' of this treeql object
+
+    # low level accessor to tree
+    method treeObj {} {
+	return $tree
+    }
+
+    # apply the [$tree cmd {*}$args] form to each node
+    # returns the list of results of application
+    method apply {cmd args} {
+	set result {}
+	foreach node $nodes {
+	    if {[catch {
+		$tree {*}$cmd $node {*}$args
+	    } application eo]} {
+		puts stderr "apply ERROR: $tree $cmd $node $args -> $application - $eo"
+	    } else {
+		#puts stderr "Apply: $tree $cmd $node $args -> $application"
+		lappend result {*}$application
+	    }
+	}
+
+	return $result
+    }
+
+    # filter nodes by [$tree cmd {*}$args]
+    # returns the list of results of application when application is non nil
+    method filter {cmd args} {
+	set result {}
+	foreach node $nodes {
+	    if {[catch {
+		$tree {*}$cmd $node {*}$args
+	    } application eo]} {
+		puts stderr "filter ERROR: $tree $cmd $node $args -> $application - $eo"
+	    } else {
+		#puts stderr "Filter: $tree $cmd $node $args -> $application"
+		if {$application != {}} {
+		    lappend result $application
+		}
+	    }
+	}
+	return $result
+    }
+
+    # filter nodes by the predicate [$tree cmd {*}$args]
+    # returns the list of results of application when application is true
+    method bool {cmd args} {
+
+	#puts stderr "Bool: $tree $cmd - $args"
+	#set result [::struct::list filter $nodes [list $tree $cmd {*}$args]]
+	#puts stderr "Bool: $tree $cmd - $nodes - $args -> $result"
+	#return $result
+
+	# replaced by tcllib's list filter
+	set result {}
+	foreach node $nodes {
+	    if {[catch {
+		$tree {*}$cmd $node {*}$args
+	    } application eo]} {
+		puts stderr "bool ERROR: $tree $cmd $node $args -> $application - $eo"
+	    } else {
+		#puts stderr "Bool: $tree $cmd $node $args -> $application - [$tree dump $node]"
+		if {$application} {
+		    lappend result $node
+		}
+	    }
+	}
+
+	return $result
+    }
+
+    # applyself - map cmd on $self to each node, discarding null results
+    method applyself {cmd args} {
+
+	set result {}
+	foreach node $nodes {
+	    if {[catch {
+		$query {*}$cmd $node {*}$args
+	    } application eo]} {
+		puts stderr "applyself ERROR: $tree $cmd $node $args -> $application - $eo"
+	    } else {
+		if {[llength $application]} {
+		    lappend result {*}$application
+		}
+	    }
+	}
+
+	return $result
+    }
+
+    # mapself - map cmd on $self to each node
+    method mapself {cmd args} {
+
+	set result {}
+	foreach node $nodes {
+	    if {[catch {
+		$query {*}$cmd $node {*}$args
+	    } application eo]} {
+		puts stderr "mapself ERROR: $tree $cmd $node $args -> $application - $eo"
+	    } else {
+		#puts stderr "Mapself: $query $cmd $node $args -> $application"
+		lappend result $application
+	    }
+	}
+
+	return $result
+    }
+
+    # shim to perform operation $op on attribute $attr of $node
+    method do_attr {node op attr} {
+	set attrv [$tree get $node $attr]
+	#puts stderr "$self do_attr node:'$node' op:'$op' attr:'$attr' attrv:'$attrv'"
+	return [{*}$op $attrv]
+    }
+
+    # filter nodes by predicate [string $op] over attribute $attr
+    method stringP {op attr args} {
+	set n {}
+	set map [$self mapself do_attr [list string {*}$op] $attr]
+	foreach result $map node $nodes {
+	    #puts stderr "$self stringP $op $attr -> $result - $node"
+	    if {$result} {
+		lappend n $node
+	    }
+	}
+	set nodes $n
+	return $args
+    }
+
+    # filter nodes by negated predicate [string $op] over attribute $attr
+    method stringNP {op attr args} {
+	set n {}
+	set map [$self mapself do_attr [list string {*}$op] $attr]
+	foreach result $map node $nodes {
+	    if {!$result} {
+		lappend n $node
+	    }
+	}
+	set nodes $n
+	return $args
+    }
+
+    # filter nodes by predicate [expr {*}$op] over attribute $attr
+    method exprP {op attr args} {
+	set n {}
+	set map [$self mapself do_attr [list expr {*}$op] $attr]
+	foreach result $map node $nodes {
+	    if {$result} {
+		lappend n $node
+	    }
+	}
+	set nodes $n
+	return $args
+    }
+
+    # filter nodes by predicate ![expr {*}$op] over attribute $attr
+    method exprNP {op attr args} {
+	set n {}
+	set map [$self mapself do_attr [list expr {*}$op] $attr]
+	foreach result $map node $nodes {
+	    if {!$result} {
+		lappend n $node
+	    }
+	}
+	set nodes $n
+	return $args
+    }
+
+    # shim to return string values of attributes matching $pattern of a given $node
+    method do_get {node pattern} {
+	set result {}
+	foreach key [$tree keys $node $pattern] {
+	    set result [concat $result [$tree get $node $key]]
+	}
+	return $result
+    }
+
+    # Returns list of attribute values of attributes matching $pattern -
+    method get {pattern} {
+	set nodes [$self mapself do_get $pattern]
+	return {}	;# terminate query
+    }
+
+    # Returns list of attribute values of the current node, in an unspecified order.
+    method attlist {} {
+	$self get *
+	return {}	;# terminate query
+    }
+
+    # Returns list of lists of attributes of each node
+    method attrs {glob} {
+	set nodes [$self apply keys $glob]
+	return {}	;# terminate query
+    }
+
+    # shim to find node ancestors by repetitive [parent]
+    # as tcllib tree lacks this
+    method do_ancestors {node} {
+	set ancestors {}
+	set rootname [$tree rootname]
+	while {$node ne $rootname} {
+	    lappend ancestors $node
+	    set node [$tree parent $node]
+	}
+	lappend ancestors $rootname
+	return $ancestors
+    }
+
+    # path from node to root
+    method ancestors {args} {
+	set nodes [$self applyself do_ancestors]
+	return $args
+   }
+
+    # shim to find $node rootpath by repetitive [parent]
+    # as tcllib tree lacks this
+    method do_rootpath {node} {
+	set ancestors {}
+	set rootname [$tree rootname]
+	while {$node ne $rootname} {
+	    lappend ancestors $node
+	    set node [$tree parent $node]
+	}
+	lappend ancestors $rootname
+	return [::struct::list reverse $ancestors]
+    }
+
+    # path from root to node
+    method rootpath {args} {
+	set nodes [$self applyself do_rootpath]
+	return $args
+    }
+
+    # node parent
+    method parent {args} {
+	set nodes [$self apply parent]
+	return $args
+    }
+
+    # node children
+    method children {args} {
+	set nodes [$self apply children]
+	return $args
+    }
+
+    # previous sibling
+    method left {args} {
+	set nodes [$self apply previous]
+	return $args
+    }
+
+    # next sibling
+    method right {args} {
+	set nodes [$self apply next]
+	return $args
+    }
+
+    # shim to find left siblings of node, in order of occurrence
+    method do_previous* {node} {
+	if {$node == [$tree rootname]} {
+	    set children $node
+	} else {
+	    set children [$tree children [$tree parent $node]]
+	}
+	set index [expr {[lsearch $children $node] - 1}]
+	return [lrange $children 0 $index]
+    }
+
+    # previous siblings in reverse order
+    method prev {args} {
+	set nodes [::struct::list reverse [$self applyself do_previous*]]
+	return $args
+    }
+
+    # previous siblings in tree order
+    method esib {args} {
+	set nodes [$self applyself do_previous*]
+	return $args
+    }
+
+    # shim to find next siblings in tree order
+    method do_next* {node} {
+	if {$node == [$tree rootname]} {
+	    set children $node
+	} else {
+	    set children [$tree children [$tree parent $node]]
+	}
+	set index [expr {[lsearch $children $node] + 1}]
+	return [lrange $children $index end]
+    }
+
+    # next siblings in tree order
+    method next {args} {
+	set nodes [$self applyself do_next*]
+	return $args
+    }
+
+    # generates the tree root
+    method root {args} {
+	set nodes [$tree rootname]
+	return $args
+    }
+
+    # shim to calculate descendants
+    method do_subtree {node} {
+	set nodeset $node
+	set children [$tree children $node]
+	foreach child $children {
+	    set descendants [$self do_subtree $child]
+	    lappend nodeset {*}$descendants
+	}
+	#puts stderr "do_subtree $node -> $nodeset"
+	return $nodeset
+    }
+
+    # generates proper-descendants of nodes
+    method descendants {args} {
+	set desc {}
+	set nodeset {}
+	foreach node $nodes {
+	    set subtree [$self do_subtree $node]
+	    set descendants [lrange $subtree 1 end]
+	    lappend nodeset {*}$descendants
+	}
+	set nodes $nodeset
+	return $args
+    }
+
+    # generates all subtrees rooted at node
+    method subtree {args} {
+	set nodeset {}
+	foreach node $nodes {
+	    set descendants [$self do_subtree $node]
+	    lappend nodeset {*}$descendants
+	}
+	set nodes $nodeset
+	return $args
+    }
+
+    # generates all nodes in the tree
+    method tree {args} {
+	set nodes [$self do_subtree [$tree rootname]]
+	return $args
+    }
+
+    # generates all subtrees rooted at node
+    #method descendants {args} {
+    #	set nodes [$tree apply descendants]
+    #	return $args
+    #}
+
+    # flattened next subtrees
+    method forward {args} {
+	set nodes [$self applyself do_next*]	;# next siblings
+	$self descendants	;# their proper descendants
+	return $args
+    }
+
+    # synonym for [forward]
+    method later {args} {
+	$self forward
+	return $args
+    }
+
+    # flattened previous subtrees in tree order
+    method earlier {args} {
+	set nodes [$self applyself do_previous*]	;# all earlier siblings
+	$self descendants	;# their proper descendants
+	return $args
+    }
+
+    # flattened previous subtrees in reverse tree order
+    # FIXME - this isn't going to return things in the correct order
+    method backward {args} {
+	set nodes [$self applyself do_previous*]	;# all earlier siblings
+	$self subtree	;# their subtrees
+	set nodes [::struct::list reverse $nodes]	;# reverse order
+	return $args
+    }
+
+    # Returns the node type of nodes
+    method nodetype {} {
+	set nodes [$self apply get @type]
+	return {}	;# terminate query
+    }
+
+    # Reduce to nodes of @type $t
+    method oftype {t args} {
+	return [$self stringP [list equal -nocase $t] @type {*}$args]
+    }
+
+    # Reduce to nodes not of @type $t
+    method nottype {t args} {
+	return [$self stringNP [list equal -nocase $t] @type {*}$args]
+    }
+
+    # Reduce to nodes whose @type is one of $attrs
+    # @type values are assumed to be simple strings
+    method oftypes {attrs args} {
+	set n {}
+	foreach result [$self mapself do_attr list @type] node $nodes {
+	    if {[lsearch $attrs $result] > -1} {
+		#puts stderr "$self oftypes '$attrs' -> $result - $node"
+		lappend n $node
+	    }
+	}
+	set nodes $n
+	return $args
+    }
+
+    # Reduce to nodes with attribute $attr (can be a glob)
+    method hasatt {attr args} {
+	set nodes [$self bool keyexists $attr]
+	return $args
+    }
+
+    # Returns values of attribute attname
+    method attval {attname} {
+	$self hasatt $attname	;# only nodes with attribute
+	set nodes [$self apply get $attname]	;# get the attribute nodes
+	return {}	;# terminate query
+    }
+
+    # Reduce to nodes with attribute $attr of $value
+    method withatt {attr value args} {
+	$self hasatt $attr	;# only nodes with attribute
+	return [$self stringP [list equal -nocase $value] $attr {*}$args]
+    }
+
+    # Reduce to nodes with attribute $attr of $value
+    method withatt! {attr val args} {
+	return [$self stringP [list equal $val] $attr {*}$args]
+    }
+
+    # Reduce to nodes with attribute $attr value one of $vals
+    method attof {attr vals args} {
+
+	set result {}
+	foreach node $nodes {
+	    set x [string tolower [[$self treeObj] get $node $attr]]
+	    if {[lsearch $vals $x] != -1} {
+		lappend result $node
+	    }
+	}
+
+	set nodes $result
+	return $args
+    }
+
+    # Reduce to nodes whose attribute $attr string matches $match
+    method attmatch {attr match args} {
+	$self stringP [list match {*}$match] $attr
+	return $args
+    }
+
+    # Side Effect: set attribute $attr to $val
+    method set {attr val args} {
+	$self apply set $attr $val
+	return $args
+    }
+
+    # Side Effect: unset attribute $attr
+    method unset {attr args} {
+	$self apply unset $attr
+	return $args
+    }
+
+    # apply string operation $op to attribute $attr on each node
+    method string {op attr} {
+	set nodes [$self mapself do_attr [list string {*}$op] $attr]
+	return {}	;# terminate query
+    }
+
+    # remove duplicate nodes, preserving order
+    method unique {args} {
+	set all {}
+	array set keys {}
+	foreach node $nodes {
+	    if {![info exists keys($node)]} {
+		set keys($node) 1
+		lappend all $node
+	    }
+	}
+	set nodes $all
+	return $args
+    }
+
+    # construct the set of nodes present in both $nodes and node set $and
+    method and {and args} {
+	set nodes [::struct::set intersect $and $nodes]
+	return $args
+    }
+
+    # return result of new query $query, preserving current node set
+    method subquery {args} {
+	set org $nodes	;# save current node set
+	set new [uplevel 1 [list $query query {*}$args]]
+	set nodes $org	;# restore old node set
+
+	return $new
+    }
+
+    # perform a subquery and and in the result
+    method andq {q args} {
+	$self and [uplevel 1 [list $self subquery {*}$q]]
+	return $args
+    }
+
+    # construct the set of nodes present in $nodes or node set $or
+    method or {or args} {
+	set nodes [::struct::set union $nodes $or]
+	$self unique
+	return $args
+    }
+
+    # perform a subquery and or in the result
+    method orq {q args} {
+	$self or [uplevel 1 [list $self subquery {*}$q]]
+	return $args
+    }
+
+    # construct the set of nodes present in $nodes but not node set $not
+    method not {not args} {
+	set nodes [::struct::set difference $nodes $not]
+	return $args
+    }
+
+    # perform a subquery and return the set of nodes not in the result
+    method notq {q args} {
+	$self not [uplevel 1 [list $self subquery {*}$q]]
+	return $args
+    }
+
+    # select the first of the nodes
+    method select {args} {
+	set nodes [lindex $nodes 0]
+	return $args
+    }
+
+    # perform a subquery then replace the nodeset
+    method transform {q var body args} {
+	upvar 1 $var iter
+	set new {}
+	foreach n [uplevel 1 [list $self subquery {*}$q]] {
+	    set iter $n
+	    switch -exact -- [catch {
+		uplevel 1 $body
+	    } result eo] {
+		0 {
+		    # ok
+		    lappend new $result
+		}
+		1 {
+		    # pass errors up
+		    return -code error $result
+		}
+		2 {
+		    # return
+		    set nodes $result
+		    return
+		}
+		3 {
+		    # break
+		    break
+		}
+		4 {
+		    # continue
+		    continue
+		}
+	    }
+	}
+
+	set nodes $new
+
+	return $args
+    }
+
+    # replace the nodeset
+    method map {var body args} {
+	upvar 1 $var iter
+	set new {}
+	foreach n $nodes {
+	    set iter $n
+	    switch -exact -- [catch {
+		uplevel 1 $body
+	    } result eo] {
+		0 {
+		    # ok
+		    lappend new $result
+		}
+		1 {
+		    # pass errors up
+		    return -code error $result
+		}
+		2 {
+		    # return
+		    set nodes $result
+		    return
+		}
+		3 {
+		    # break
+		    break
+		}
+		4 {
+		    # continue
+		    continue
+		}
+	    }
+	}
+
+	set nodes $new
+
+	return $args
+    }
+
+    # perform a subquery $query then map $body over results
+    method foreach {q var body args} {
+	upvar 1 $var iter
+	foreach n [uplevel 1 [list $self subquery {*}$q]] {
+	    set iter $n
+	    uplevel 1 $body
+	}
+	return $args
+    }
+
+    # perform a query, then evaluate $body
+    method with {q body args} {
+	# save current node set, implied reset
+	set org $nodes; set nodes {}
+
+	uplevel 1 [list $self query {*}$q]
+	set result [uplevel 1 $body]
+
+	# restore old node set
+	set new $nodes; set nodes $org
+
+	return $args
+    }
+
+    # map $body over $nodes
+    method over {var body args} {
+	upvar 1 $var iter
+	set result {}
+	foreach n $nodes {
+	    set iter $n
+	    uplevel 1 $body
+	}
+	return $args
+    }
+
+    # perform the query
+    method query {args} {
+	# iterate over the args, treating each as a method invocation
+	while {$args != {}} {
+	    #puts stderr "query $self $args"
+	    set args [uplevel 1 [list $query {*}$args]]
+	    #puts stderr "-> $nodes"
+	}
+
+	return $nodes
+    }
+
+    # append the literal $val to node set
+    method quote {val args} {
+	lappend nodes $val
+	return $args
+    }
+
+    # replace the node set with the literal
+    method replace {val args} {
+	set nodes $val
+	return $args
+    }
+
+    # set nodeset to empty
+    method reset {args} {
+	set nodes {}
+	return $args
+    }
+
+    # delete all nodes in node set
+    method delete {args} {
+
+	foreach node $nodes {
+	    $tree cut $node
+	}
+
+	set nodes {}
+	return $args
+    }
+
+    # return the node set
+    method result {} {
+	return $nodes
+    }
+
+    constructor {args} {
+	set query [from args -query ""]
+	if {$query == ""} {
+	    set query $self
+	}
+
+	set nodes [from args -nodes {}]
+
+	set tree [from args -tree ""]
+
+	uplevel 1 [list $self query {*}$args]
+    }
+
+    # Return result, and destroy this query
+    # useful in constructing a sub-query
+    method discard {args} {
+	return [K [$self result] [$self destroy]]
+    }
+
+    proc K {x y} {
+	set x
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/try/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/try/pkgIndex.tcl
new file mode 100644
index 00000000..5e7f896f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/try/pkgIndex.tcl
@@ -0,0 +1,13 @@
+#checker -scope global exclude warnUndefinedVar
+# var in question is 'dir'.
+if {![package vsatisfies [package provide Tcl] 8.5]} {
+    # PRAGMA: returnok
+    return
+}
+# The package below is a backward compatible implementation of
+# try/catch/finally, for use by Tcl 8.5 only. On 8.6 it does nothing.
+package ifneeded try   1 [list source [file join $dir try.tcl]]
+
+# The package below is a backward compatible implementation of
+# "throw", for use by Tcl 8.5 only. On 8.6 it does nothing.
+package ifneeded throw 1 [list source [file join $dir throw.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/try/throw.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/try/throw.tcl
new file mode 100644
index 00000000..132ab3d1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/try/throw.tcl
@@ -0,0 +1,18 @@
+# # ## ### ##### ######## ############# ####################
+## -*- tcl -*-
+## (C) 2015 Miguel Martínez López, BSD licensed.
+
+# The code here is a forward-compatibility implementation of Tcl 8.6's
+# throw command (TIP 329), for Tcl 8.5.
+
+# # ## ### ##### ######## ############# ####################
+
+package provide throw 1
+package require Tcl 8.5
+
+# Do nothing if the "throw" command exists already (8.6 and higher).
+if {[llength [info commands throw]]} return
+
+proc throw {code msg} {
+    return -code error -errorcode $code $msg
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/try/try.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/try/try.tcl
new file mode 100644
index 00000000..3119587b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/try/try.tcl
@@ -0,0 +1,205 @@
+# # ## ### ##### ######## ############# ####################
+## -*- tcl -*-
+## (C) 2008-2011 Donal K. Fellows, Andreas Kupries, BSD licensed.
+
+# The code here is a forward-compatibility implementation of Tcl 8.6's
+# try/finally command (TIP 329), for Tcl 8.5. It was directly pulled
+# from Tcl 8.6 revision ?, when try/finally was implemented as Tcl
+# procedure instead of in C.
+
+# It makes use of the following Tcl 8.5 features:
+# lassign, dict, {*}.
+
+# # ## ### ##### ######## ############# ####################
+
+package provide try 1
+package require Tcl 8.5
+# Do nothing if the "try" command exists already (8.6 and higher).
+if {[llength [info commands try]]} return
+
+# # ## ### ##### ######## ############# ####################
+
+namespace eval ::tcl::control {
+    # These are not local, since this allows us to [uplevel] a [catch] rather
+    # than [catch] the [uplevel]ing of something, resulting in a cleaner
+    # -errorinfo:
+    variable em {}
+    variable opts {}
+
+    variable magicCodes { ok 0 error 1 return 2 break 3 continue 4 }
+
+    namespace export try
+
+    # ::tcl::control::try --
+    #
+    #	Advanced error handling construct.
+    #
+    # Arguments:
+    #	See try(n) for details
+    proc try {args} {
+	variable magicCodes
+
+	# ----- Parse arguments -----
+
+	set trybody [lindex $args 0]
+	set finallybody {}
+	set handlers [list]
+	set i 1
+
+	while {$i < [llength $args]} {
+	    switch -- [lindex $args $i] {
+		"on" {
+		    incr i
+		    set code [lindex $args $i]
+		    if {[dict exists $magicCodes $code]} {
+			set code [dict get $magicCodes $code]
+		    } elseif {![string is integer -strict $code]} {
+			set msgPart [join [dict keys $magicCodes] {", "}]
+			error "bad code '[lindex $args $i]': must be\
+			    integer or \"$msgPart\""
+		    }
+		    lappend handlers [lrange $args $i $i] \
+			[format %d $code] {} {*}[lrange $args $i+1 $i+2]
+		    incr i 3
+		}
+		"trap" {
+		    incr i
+		    if {![string is list [lindex $args $i]]} {
+			error "bad prefix '[lindex $args $i]':\
+			    must be a list"
+		    }
+		    lappend handlers [lrange $args $i $i] 1 \
+			{*}[lrange $args $i $i+2]
+		    incr i 3
+		}
+		"finally" {
+		    incr i
+		    set finallybody [lindex $args $i]
+		    incr i
+		    break
+		}
+		default {
+		    error "bad handler '[lindex $args $i]': must be\
+			\"on code varlist body\", or\
+			\"trap prefix varlist body\""
+		}
+	    }
+	}
+
+	if {($i != [llength $args]) || ([lindex $handlers end] eq "-")} {
+	    error "wrong # args: should be\
+		\"try body ?handler ...? ?finally body?\""
+	}
+
+	# ----- Execute 'try' body -----
+
+	variable em
+	variable opts
+	set EMVAR  [namespace which -variable em]
+	set OPTVAR [namespace which -variable opts]
+	set code [uplevel 1 [list ::catch $trybody $EMVAR $OPTVAR]]
+
+	if {$code == 1} {
+	    set line [dict get $opts -errorline]
+	    dict append opts -errorinfo \
+		"\n    (\"[lindex [info level 0] 0]\" body line $line)"
+	}
+
+	# Keep track of the original error message & options
+	set _em $em
+	set _opts $opts
+
+	# ----- Find and execute handler -----
+
+	set errorcode {}
+	if {[dict exists $opts -errorcode]} {
+	    set errorcode [dict get $opts -errorcode]
+	}
+	set found false
+	foreach {descrip oncode pattern varlist body} $handlers {
+	    if {!$found} {
+		if {
+		    ($code != $oncode) || ([lrange $pattern 0 end] ne
+					   [lrange $errorcode 0 [llength $pattern]-1] )
+		} then {
+		    continue
+		}
+	    }
+	    set found true
+	    if {$body eq "-"} {
+		continue
+	    }
+
+	    # Handler found ...
+
+	    # Assign trybody results into variables
+	    lassign $varlist resultsVarName optionsVarName
+	    if {[llength $varlist] >= 1} {
+		upvar 1 $resultsVarName resultsvar
+		set resultsvar $em
+	    }
+	    if {[llength $varlist] >= 2} {
+		upvar 1 $optionsVarName optsvar
+		set optsvar $opts
+	    }
+
+	    # Execute the handler
+	    set code [uplevel 1 [list ::catch $body $EMVAR $OPTVAR]]
+
+	    if {$code == 1} {
+		set line [dict get $opts -errorline]
+		dict append opts -errorinfo \
+		    "\n    (\"[lindex [info level 0] 0] ... $descrip\"\
+		    body line $line)"
+		# On error chain to original outcome
+		dict set opts -during $_opts
+	    }
+
+	    # Handler result replaces the original result (whether success or
+	    # failure); capture context of original exception for reference.
+	    set _em $em
+	    set _opts $opts
+
+	    # Handler has been executed - stop looking for more
+	    break
+	}
+
+	# No catch handler found -- error falls through to caller
+	# OR catch handler executed -- result falls through to caller
+
+	# ----- If we have a finally block then execute it -----
+
+	if {$finallybody ne {}} {
+	    set code [uplevel 1 [list ::catch $finallybody $EMVAR $OPTVAR]]
+
+	    # Finally result takes precedence except on success
+
+	    if {$code == 1} {
+		set line [dict get $opts -errorline]
+		dict append opts -errorinfo \
+		    "\n    (\"[lindex [info level 0] 0] ... finally\"\
+		    body line $line)"
+		# On error chain to original outcome
+		dict set opts -during $_opts
+	    }
+	    if {$code != 0} {
+		set _em $em
+		set _opts $opts
+	    }
+
+	    # Otherwise our result is not affected
+	}
+
+	# Propagate the error or the result of the executed catch body to the
+	# caller.
+	dict incr _opts -level
+	return -options $_opts $_em
+    }
+}
+
+# # ## ### ##### ######## ############# ####################
+
+namespace import ::tcl::control::try
+
+# # ## ### ##### ######## ############# ####################
+## Ready
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/udpcluster/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/udpcluster/pkgIndex.tcl
new file mode 100644
index 00000000..c3969cf1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/udpcluster/pkgIndex.tcl
@@ -0,0 +1,4 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+# Backward compatible alias
+package ifneeded nameserv::cluster 0.2.5  {package require udpcluster ; package provide nameserv::cluster 0.2.5}
+package ifneeded udpcluster        0.3.3  [list source [file join $dir udpcluster.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/udpcluster/udpcluster.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/udpcluster/udpcluster.tcl
new file mode 100644
index 00000000..72a72e1f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/udpcluster/udpcluster.tcl
@@ -0,0 +1,661 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Name Service - Cluster
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.5
+package require comm             ; # Generic message transport
+package require interp           ; # Interpreter helpers.
+package require logger           ; # Tracing internal activity
+package require uuid
+package require cron 2.0
+package require nettool 0.5.2
+package require udp
+package require dicttool
+
+namespace eval ::comm {}
+::namespace eval ::cluster {}
+
+###
+# This package implements an ad/hoc zero configuration
+# like network of comm (and other) network connections
+###
+
+###
+# topic: 5cffdc91e554c923ebe43df13fac77d5
+###
+proc ::cluster::broadcast {args} {
+  if {$::cluster::config(debug)} {
+    puts [list $::cluster::local_pid SEND $args]
+  }
+  variable discovery_port
+  listen
+  while {[catch {
+    foreach net [::nettool::broadcast_list] {
+      if {$::cluster::config(debug)} {
+        puts [list BROADCAST -> $net $args]
+      }
+      set s [udp_open]
+      udp_conf $s $net $discovery_port
+      chan puts -nonewline $s [list [pid] {*}$args]
+      chan flush $s
+      chan close $s
+    }
+  } error]} {
+    set ::cluster::broadcast_sock {}
+    if {$::cluster::config(debug)} {
+      puts "Broadcast ERR: $error - Reopening Socket"
+      ::cron::sleep 2000
+    } else {
+      # Double the delay
+      ::cron::sleep 250
+    }
+  }
+}
+
+###
+# topic: 963e24601d0dc61580c9727a74cdba67
+###
+proc ::cluster::cname rawname {
+  # Convert rawname to a canonical name
+  if {[string first @ $rawname] < 0 } {
+    return $rawname
+  }
+  lassign [split $rawname @] service host
+  if {$host eq {}} {
+    set host *
+  }
+  if {$host in {local localhost}} {
+    set host [::cluster::self]
+  }
+  return $service@$host
+}
+
+proc ::cluster::Directory args {
+  # Fullfill locally
+  switch [lindex $args 0] {
+    alloc_port {
+      return [Get_free_port [lindex $args 1]]
+    }
+    port_busy {
+      return [::nettool::port_busy [lindex $args 1]]
+    }
+    pid {
+      return [pid]
+    }
+  }
+  error "UNKNOWN COMMAND [lindex $args 0]"
+}
+
+
+proc ::cluster::directory args {
+  ::cluster::listen
+  variable directory_sock
+  if {$directory_sock ne {}} {
+    return [Directory {*}$args]
+  }
+  # We are not acting as the directory, query who is
+  variable directory_port
+  set sock [socket localhost $directory_port]
+  chan configure $sock -translation crlf -buffering line -blocking 1
+  chan puts $sock $args
+  chan flush $sock
+  update
+  set reply {}
+  while {[chan gets $sock line]>0} {
+    append reply \n $line
+    if {[::info complete $reply]} break
+  }
+  catch {chan close $sock}
+  lassign $reply result errdat
+  return $result {*}$errdat
+}
+
+###
+# topic: 3f5f9e197cc9666dd7953d97fef34019
+###
+proc ::cluster::ipaddr macid {
+  # Convert rawname to a canonical name
+  if {$macid eq [::cluster::self]} {
+    return 127.0.0.1
+  }
+  foreach {servname dat} [search [cname *@$macid]] {
+    if {[dict exists $dat ipaddr]} {
+      return [dict get $dat ipaddr]
+    }
+  }
+  ###
+  # Do a lookup
+  ###
+  error "Could not locate $macid"
+}
+
+###
+# topic: e57db306f0e931d7febb5ad1f9cb2247
+###
+proc ::cluster::listen {} {
+  variable broadcast_sock
+  if {$broadcast_sock != {}} {
+    return $broadcast_sock
+  }
+
+  variable discovery_port
+  # Open a local discovery port to catch non-IP traffic
+  variable discovery_group
+  set broadcast_sock [udp_open $discovery_port reuse]
+  fconfigure $broadcast_sock -buffering none -blocking 0 \
+    -broadcast 1 \
+    -mcastadd $discovery_group \
+    -remote [list $discovery_group $discovery_port]
+  chan event $broadcast_sock readable [list [namespace current]::UDPPacket $broadcast_sock]
+  ::cron::every cluster_heartbeat 30 ::cluster::heartbeat
+
+  variable directory_sock
+  variable directory_pid
+  if {$directory_sock eq {} && $directory_pid eq {}} {
+    variable directory_port
+    # Nobody is acting as the directory. Have this process step on
+    if {![catch {socket -server ::cluster::TCPAccept $directory_port} newsock]} {
+      set directory_sock $newsock
+      set directory_pid [pid]
+    } else {
+      set directory_sock {}
+      set directory_pid {}
+    }
+  }
+  return $broadcast_sock
+}
+
+proc ::cluster::sleep args {
+  ::cron::sleep {*}$args
+}
+
+proc ::cluster::TCPAccept {sock host port} {
+  chan configure $sock -translation {crlf crlf} -buffering line -blocking 1
+  set packet [chan gets $sock]
+  if {![string is ascii $packet]} return
+  if {![::info complete $packet]} return
+  if {[catch {Directory {*}$packet} reply errdat]} {
+    chan puts $sock [list $reply $errdat]
+  } else {
+    chan puts $sock [list $reply {}]
+  }
+  chan flush $sock
+  chan close $sock
+}
+###
+# topic: 2a33c825920162b0791e2cdae62e6164
+###
+proc ::cluster::UDPPacket sock {
+  variable ptpdata
+  set pid [pid]
+  set packet [string trim [read $sock]]
+  set peer [fconfigure $sock -peer]
+
+  if {![string is ascii $packet]} return
+  if {![::info complete $packet]} return
+
+  set sender  [lindex $packet 0]
+  if {$::cluster::config(debug)} {
+    puts [list $::cluster::local_pid RECV $peer $packet]
+  }
+  if { $sender eq [pid] } {
+    # Ignore messages from myself
+    return
+  }
+  set ipaddr [lindex $peer 0]
+  set messagetype [string toupper [lindex $packet 1]]
+
+  # These two message types are not associated with a service
+  switch -- $messagetype {
+    DISCOVERY {
+      variable config
+      ::cluster::heartbeat
+      return
+    }
+    ?WHOIS {
+      set wmacid [lindex $messageinfo 0]
+      if { $wmacid eq [::cluster::self] } {
+        broadcast +WHOIS [::cluster::self]
+      }
+      return
+    }
+  }
+
+  set now [clock seconds]
+  set serviceurl  [lindex $packet 2]
+  set serviceinfo [lindex $packet 3]
+  set ::cluster::ping_recv($serviceurl) $now
+  UDPPortInfo $serviceurl $messagetype $serviceinfo
+
+  if {[dict exists $serviceinfo pid] && [dict get $serviceinfo pid] eq [pid] } {
+    # Ignore attempts to overwrite locally managed services from the network
+    return
+  }
+  # Always update the IP of the service info
+  dict set ptpdata($serviceurl) ipaddr $ipaddr
+  dict set ptpdata($serviceurl) updated $now
+  dict set serviceinfo ipaddr [lindex $peer 0]
+  dict set serviceinfo updated $now
+  set messageinfo [lrange $packet 4 end]
+
+  switch -- $messagetype {
+    -SERVICE {
+      if {![::info exists ptpdata($serviceurl)]} {
+        set result $serviceinfo
+      } else {
+        set result [dict merge $ptpdata($serviceurl) $serviceinfo]
+      }
+      dict set result closed 1
+      if {[dict exists $result pid] && [dict get $result pid] eq [pid] } {
+        # Ignore attempts to overwrite locally managed services from the network
+        return
+      }
+      set ptpdata($serviceurl) $result
+      Service_Remove $serviceurl $result
+    }
+    PONG -
+    ~SERVICE {
+      set ::cluster::recv_message 1
+
+      if {[::info exists ptpdata($serviceurl)]} {
+        set ptpinfo $ptpdata($serviceurl)
+      } else {
+        set ptpinfo {}
+      }
+      set delta {}
+      foreach {field value} $serviceinfo {
+        if {![dict exists $ptpinfo $field] || [dict get $ptpinfo $field] ne $value} {
+          dict set ptpdata($serviceurl) $field $value
+          dict set delta $field $value
+        }
+      }
+      dict set ptpdata($serviceurl) closed 0
+      Service_Modified $serviceurl $serviceinfo $delta
+    }
+    +SERVICE {
+      set ::cluster::recv_message 1
+      # Code to register the presence of a service
+      variable ptpdata
+      set ptpdata($serviceurl) $serviceinfo
+      dict set ptpdata($serviceurl) closed 0
+      Service_Add $serviceurl $serviceinfo
+    }
+    LOG {
+      Service_Log $serviceurl $serviceinfo
+    }
+    PING {
+      foreach {url info} [search_local $serviceurl] {
+        broadcast PONG $url $info
+      }
+    }
+  }
+}
+
+proc ::cluster::UDPPortInfo {serviceurl msgtype newinfo} {
+  variable ptpdata
+  # We only care about port changes on the local machine
+  if {[dict exists $newinfo macid]} {
+    set macid [dict get $newinfo macid]
+    if {$macid ne [::cluster::self]} {
+      return
+    }
+  } elseif {[::info exists ptpdata($serviceurl)] && [dict exists $ptpdata($serviceurl) macid]} {
+    set macid [dict get $ptpdata($serviceurl) macid]
+    if {$macid ne [::cluster::self]} {
+      return
+    }
+  } else {
+    return
+  }
+  set newport {}
+  set oldport {}
+  if {[dict exists $newinfo port]} {
+    set newport [dict get $newinfo port]
+  }
+  if {[::info exists ptpdata($serviceurl)] && [dict exists $ptpdata($serviceurl) port]} {
+    set oldport [dict get $ptpdata($serviceurl) port]
+  }
+  switch -- $msgtype {
+    -SERVICE {
+      if {$oldport ne {}} {
+        ::nettool::release_port $oldport
+      }
+      if {$newport ne {}} {
+        ::nettool::release_port $newport
+      }
+    }
+    default {
+      if {$oldport ne {}} {
+        ::nettool::release_port $oldport
+      }
+      if {$newport ne {}} {
+        ::nettool::claim_port $newport
+      }
+    }
+  }
+}
+
+proc ::cluster::ping {rawname {timeout -1}} {
+  set rcpt [cname $rawname]
+  variable ptpdata
+  set starttime [clock seconds]
+
+  set ::cluster::ping_recv($rcpt) 0
+  broadcast PING $rcpt
+  update
+  if {$timeout <= 0} {
+    set timeout $::cluster::config(ping_timeout)
+  }
+  while 1 {
+    if {$::cluster::ping_recv($rcpt)} break
+    if {([clock seconds] - $starttime) > $timeout} {
+      error "Could not locate $rcpt on the network"
+    }
+    broadcast PING $rcpt
+    ::cron::sleep $::cluster::config(ping_sleep)
+  }
+  if {[::info exists ptpdata($rcpt)]} {
+    return [dict getnull $ptpdata($rcpt) ipaddr]
+  }
+}
+
+proc ::cluster::publish {url infodict} {
+  variable local_data
+  dict set infodict macid [self]
+  dict set infodict pid [pid]
+  set local_data($url) [dict merge $infodict {ipaddr 127.0.0.1}]
+  broadcast +SERVICE $url $infodict
+}
+
+proc ::cluster::heartbeat {} {
+  variable ptpdata
+  variable config
+
+  _Winnow
+  ###
+  # Broadcast the status of our local services
+  ###
+  variable local_data
+  foreach {url info} [array get local_data] {
+    broadcast ~SERVICE $url $info
+  }
+  ###
+  # Trigger any cluster events that haven't fired off
+  ###
+  foreach {eventid info} [array get ::cluster::events] {
+    if {$info eq "-1"} {
+      unset ::cluster::events($eventid)
+    } else {
+      lassign $info seconds ms
+      if {$seconds < $now} {
+        set ::cluster::events($eventid) -1
+      }
+    }
+  }
+}
+
+proc ::cluster::info url {
+  variable local_data
+  return [array get local_data $url]
+}
+
+proc ::cluster::unpublish {url infodict} {
+  variable local_data
+  foreach {field value} $infodict {
+    dict set local_data($url) $field $value
+  }
+  set info [lindex [array get local_data $url] 1]
+  broadcast -SERVICE $url $info
+  dict set local_data($url) closed 1
+}
+
+proc ::cluster::configure {url infodict {send 1}} {
+  variable local_data
+  if {![::info exists local_data($url)]} return
+  dict set local_data($url) closed 0
+  foreach {field value} $infodict {
+    dict set local_data($url) $field $value
+  }
+  if {$send} {
+    broadcast ~SERVICE $url $local_data($url)
+    update
+  }
+}
+
+proc ::cluster::Get_free_port {{port 50000}} {
+  if {$port in {{} 0 -1}} {
+    set port 50000
+  }
+  set conflict 1
+  while {$conflict} {
+    set conflict 0
+    set port [::nettool::find_port $port]
+    foreach {url info} [search *@[macid]] {
+      if {[dict exists $info port] && [dict get $info port] eq $port} {
+        incr port
+        set conflict 1
+        break
+      }
+    }
+    if {$port >= 65336 } {
+      error "All ports consumed"
+    }
+  }
+  ::nettool::claim_port $port
+  return $port
+}
+
+proc ::cluster::get_free_port {{startport 50000}} {
+  return [directory alloc_port $startport]
+}
+
+proc ::cluster::log args {
+  broadcast LOG {*}$args
+}
+
+###
+# topic: 2c04e58c7f93798f9a5ed31a7f5779ab
+###
+proc ::cluster::resolve {rawname} {
+  variable ptpdata
+  set self [self]
+  set rcpt [cname $rawname]
+  set ipaddr {}
+  if {[::info exists ptpdata($rcpt)] && [dict exists $ptpdata($rcpt) macid] && [dict get $ptpdata($rcpt) macid] eq $self} {
+    set ipaddr 127.0.0.1
+  } elseif {[::info exists ptpdata($rcpt)] && [dict exists $ptpdata($rcpt) ipaddr] && [dict exists $ptpdata($rcpt) updated]} {
+    # Try Pull the info from cache
+    set updatetm [dict get $ptpdata($rcpt) updated]
+    if {([clock seconds] - $updatetm) < 30} {
+      set ipaddr [dict get $ptpdata($rcpt) ipaddr]
+    }
+  }
+  if {$ipaddr eq {}} {
+    ping $rcpt
+    if {![::info exists ptpdata($rcpt)]} {
+      error "Could not locate $rcpt on the network"
+    }
+    if {[dict exists $ptpdata($rcpt) macid] && [dict get $ptpdata($rcpt) macid] eq $self} {
+      set ipaddr 127.0.0.1
+    } else {
+      if {![dict exists $ptpdata($rcpt) ipaddr]} {
+        error "Could not locate $rcpt on the network"
+      }
+      set ipaddr [dict getnull $ptpdata($rcpt) ipaddr]
+      if {$ipaddr eq {}} {
+        error "Could not locate $rcpt on the network"
+      }
+    }
+  }
+  set port [dict getnull $ptpdata($rcpt) port]
+  if {$port eq {}} {
+    error "Could not locate $rcpt on the network"
+  }
+  return [list $port $ipaddr]
+}
+
+###
+# topic: 6c7a0a3a8cb2a7ae98ff0dba960c37a7
+###
+proc ::cluster::pid {} {
+  variable local_pid
+  return $local_pid
+}
+
+proc ::cluster::macid {} {
+  variable local_macid
+  return $local_macid
+}
+
+proc ::cluster::self {} {
+  variable local_macid
+  return $local_macid
+}
+
+###
+# topic: f1b71ff12a8ac10373c67ac5d973cd81
+###
+proc ::cluster::send {service command args} {
+  set commid [resolve $service]
+  return [::comm::comm send $commid $command {*}$args]
+}
+
+proc ::cluster::throw {service command args} {
+  if {[catch {resolve $service} commid]} {
+    return
+  }
+  if [catch {::comm::comm send -async $commid $command {*}$args} reply] {
+    puts $stderr "ERR: SEND $service $reply"
+  }
+}
+
+###
+# topic: c8475e832c912e962f238c61580b669e
+###
+proc ::cluster::search pattern {
+  _Winnow
+  set result {}
+  variable ptpdata
+  foreach {service dat} [array get ptpdata $pattern] {
+    foreach {field value} $dat {
+      dict set result $service $field $value
+    }
+  }
+
+  variable local_data
+  foreach {service dat} [array get local_data $pattern] {
+    foreach {field value} $dat {
+      dict set result $service $field $value
+    }
+  }
+  return $result
+}
+
+proc ::cluster::is_local pattern {
+  variable local_data
+  if {[array exists local_data $pattern]} {
+    return 1
+  }
+  if {[array exists local_data [cname $pattern]]} {
+    return 1
+  }
+  return 0
+}
+
+proc ::cluster::search_local pattern {
+  set result {}
+  variable local_data
+  foreach {service dat} [array get local_data $pattern] {
+    foreach {field value} $dat {
+      dict set result $service $field $value
+    }
+  }
+  return $result
+}
+
+proc ::cluster::Service_Add {serviceurl serviceinfo} {
+  # Code to register the emergencs of a new service
+}
+
+proc ::cluster::Service_Remove {serviceurl serviceinfo} {
+  # Code to register the loss of a service
+}
+
+proc ::cluster::Service_Modified {serviceurl serviceinfo {delta {}}} {
+  # Code to register an update to a service
+}
+
+proc ::cluster::Service_Log {service data delta} {
+  # Code to register an event
+}
+
+###
+# Clean out closed and expired entries
+# Performed immediately before searches
+# and heartbeats
+###
+proc ::cluster::_Winnow {} {
+  variable ptpdata
+  variable config
+  variable local_data
+
+  set now [clock seconds]
+  foreach {item info} [array get ptpdata] {
+    set remove 0
+    if {[dict exists $info closed] && [dict get $info closed]} {
+      set remove 1
+    }
+    if {[dict exists $info updated] && ($now - [dict get $info updated])>$config(discovery_ttl)} {
+      set remove 1
+    }
+    if {$remove} {
+      unset ptpdata($item)
+    }
+  }
+  foreach {item info} [array get local_data] {
+    set remove 0
+    if {[dict exists $info closed] && [dict get $info closed]} {
+      set remove 1
+    }
+    if {$remove} {
+      unset local_data($item)
+    }
+  }
+}
+
+###
+# topic: d3e48e31cc4baf81395179f4097fee1b
+###
+namespace eval ::cluster {
+  # Number of seconds to "remember" data
+  variable config
+  array set config {
+    debug 0
+    discovery_ttl 300
+    local_registry 0
+    ping_timeout 120
+    ping_sleep   250
+  }
+  variable eventcount 0
+  variable cache {}
+  variable broadcast_sock {}
+  variable directory_sock {}
+
+  variable cache_maxage 500
+  variable discovery_port 38573
+  variable directory_port 38574
+  variable directory_pid {}
+
+  # Currently an unassigned group in the
+  # Local Network Control Block (224.0.0/24)
+  # See: RFC3692 and http://www.iana.org
+  variable discovery_group 224.0.0.200
+  variable local_port {}
+  variable local_macid [lindex [lsort [::nettool::mac_list]] 0]
+  variable local_pid   [::uuid::uuid generate]
+}
+
+package provide udpcluster 0.3.3
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uev/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uev/pkgIndex.tcl
new file mode 100644
index 00000000..aa845504
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uev/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded uevent         0.3.1 [list source [file join $dir uevent.tcl]]
+package ifneeded uevent::onidle 0.1   [list source [file join $dir uevent_onidle.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uev/uevent.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uev/uevent.tcl
new file mode 100644
index 00000000..41717c41
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uev/uevent.tcl
@@ -0,0 +1,470 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## UEvent - User Event Service - Tcl-level general Event Handling
+
+# ### ### ### ######### ######### #########
+## Requirements
+
+package require Tcl 8.4
+package require logger
+
+namespace eval ::uevent               {}
+namespace eval ::uevent::token        {}
+namespace eval ::uevent::watch::tag   {}
+namespace eval ::uevent::watch::event {}
+
+# ### ### ### ######### ######### #########
+## API: bind, unbind, generate
+
+proc ::uevent::bind {tag event command} {
+    # Register command (prefix!) as observer for events on the tag.
+    # Command will take 3 arguments: tag, event, and dictionary of
+    # detail information. Result is token by which the observer can
+    # be removed.
+
+    variable db
+    variable dt
+    variable tk
+    variable ex
+
+    log::debug [::list bind: $tag $event -> $command]
+
+    set tec [::list $tag $event $command]
+
+    # Same combination as before, same token
+    if {[info exists ex($tec)]} {
+	log::debug [::list known! $ex($tec)]
+	return $ex($tec)
+    }
+
+    # New token, and enter everything ...
+
+    set te [::list $tag $event]
+    set t  [NewToken]
+
+    set     tk($t) $tec
+    set     ex($tec) $t
+    lappend db($te)  $t
+    lappend dt($tag) $t
+
+    if {[llength $dt($tag)] == 1} {
+	# Notify any watchers that at least one observers is now bound
+	# to the tag
+	watch::tag::Invoke bound $tag
+    }
+    if {[llength $db($te)] == 1} {
+	# Notify any watchers that at least one observers is now bound
+	# to the tag/event combination.
+	watch::event::Invoke bound $tag $event
+    }
+
+    log::debug [::list new! $t]
+    return $t
+}
+
+proc ::uevent::unbind {token} {
+    # Removes the event binding represented by the token.
+
+    variable db
+    variable dt
+    variable tk
+    variable ex
+
+    log::debug [::list unbind: $token]
+
+    if {![info exists tk($token)]} return
+
+    set tec $tk($token)
+    set te [lrange $tec 0 1]
+
+    log::debug [linsert [linsert $tec 0 =] end-1 ->]
+
+    unset ex($tec)
+    unset tk($token)
+
+    set pos [lsearch -exact $db($te) $token]
+    if {$pos < 0} return
+
+    foreach {tag event} $te break
+
+    if {[llength $db($te)] == 1} {
+	# Last observer for this tag,event combination is gone.
+	log::debug [linsert $te 0 last!]
+	unset db($te)
+
+	# Notify any watchers that no observers are bound to the
+	# tag/event combination anymore.
+	watch::event::Invoke unbound $tag $event
+    } else {
+	# Shrink list of observers
+	log::debug [linsert [linsert $te 0 shrink!] end @ $pos]
+	set db($te) [lreplace $db($te) $pos $pos]
+    }
+
+    if {[llength $dt($tag)] == 1} {
+	# Last observer for this tag in itself
+	log::debug [linsert $tag 0 last!]
+	unset dt($tag)
+
+	# Notify any watchers that no observers are bound to the tag
+	# anymore.
+	watch::tag::Invoke unbound $tag
+    } else {
+	# Shrink list of observers
+	log::debug [linsert [linsert $tag 0 shrink!] end @ $pos]
+	set dt($tag) [lreplace $dt($tag) $pos $pos]
+    }
+
+    return
+}
+
+proc ::uevent::generate {tag event {details {}}} {
+    # Generates the event on the tag, with detail information (a
+    # dictionary). This notifies all registered observers.  The
+    # notifications are put into the Tcl event queue via 'after 0'
+    # events, decoupling them in time from the issueing code.
+
+    variable db
+    variable tk
+
+    log::debug [::list generate: $tag $event $details]
+
+    set key [::list $tag $event]
+    if {![info exists db($key)]} return
+
+    foreach t $db($key) {
+	set cmd [lindex $tk($t) 2]
+	log::debug [::list trigger! $t = $cmd]
+	after 0 [linsert $cmd end $tag $event $details]
+    }
+
+    return
+}
+
+proc ::uevent::list {args} {
+    # list           - Return all known tags
+    # list tag       - Return all events bound to the tag
+    # list tag event - Return commands bound to event in tag
+
+    switch -- [llength $args] {
+	0 {
+	    variable db
+	    # Return all known tags.
+	    set res {}
+	    foreach te [array names db] {
+		lappend res [lindex $te 0]
+	    }
+	    return [lsort -uniq $res]
+	}
+	1 {
+	    variable db
+	    # Return all known events for a specific tag
+	    set res {}
+	    set tag [lindex $args 0]
+	    foreach te [array names db [::list $tag *]] {
+		lappend res [lindex $te 1]
+	    }
+	    if {![llength $res]} {
+		return -code error "Tag \"$tag\" is not known"
+	    }
+	    return $res
+	}
+	2 {
+	    variable db
+	    variable tk
+	    # Return all commands bound to a tag/event combination
+	    if {![info exists db($args)]} {
+		foreach {tag event} $args break
+		return -code error "Tag/Event \"$tag\"/\"$event\" is not known"
+	    }
+	    set res {}
+	    foreach t $db($args) {
+		lappend res [lindex $tk($t) 2]
+	    }
+	    return $res
+	}
+	default {
+	    return -code error "wrong#args: expected ?tag? ?event?"
+	}
+    }
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::uevent::watch::tag::add {pattern cmdprefix} {
+    variable db
+    variable tk
+    variable ex
+
+    set token [Place uevmt $pattern $cmdprefix new]
+    if {!$new} { return $token }
+
+    # Check if there are already bindings on tags matching the
+    # specified pattern. If yes, we have to invoke the command for
+    # them all.
+
+    # Situation: Part of the application binds to events on the tag
+    # before the system genrating these events on the tag is
+    # present. Thus watching is adding at a time when bindings already
+    # exist.
+
+    upvar \#0 ::uevent::dt map
+
+    foreach tag [array names map] {
+	if {![string match $pattern $tag]} continue
+	uplevel \#0 [linsert $cmdprefix end bound $tag]
+    }
+
+    return $token
+}
+
+proc ::uevent::watch::tag::remove {token} {
+    variable db
+    variable tk
+    variable ex
+
+    Remove $token
+    return
+}
+
+proc ::uevent::watch::tag::Invoke {action tag} {
+    variable db
+    variable tk
+
+    foreach pattern [array names db] {
+	if {![string match $pattern $tag]} continue
+
+	foreach token $db($pattern) {
+	    set cmd [lindex $tk($token) end]
+	    uplevel \#0 [linsert $cmd end $action $tag]
+	}
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::uevent::watch::event::add {tpattern epattern cmdprefix} {
+    set key [list $tpattern $epattern]
+
+    variable db
+    variable tk
+    variable ex
+
+    set token [Place uevme $key $cmdprefix new]
+    if {!$new} { return $token }
+
+    # Check if there are already bindings on tag/event combinations
+    # matching the specified pattern. If yes, we have to invoke the
+    # command for them all.
+
+    # Situation: Part of the application binds to events on the tag
+    # before the system genrating these events on the tag is
+    # present. Thus watching is adding at a time when bindings already
+    # exist.
+
+    upvar \#0 ::uevent::db map
+
+    foreach key [array names map] {
+	foreach {tag event} $key break
+	if {![string match $tpattern $tag]}   continue
+	if {![string match $epattern $event]} continue
+	uplevel \#0 [linsert $cmdprefix end bound $tag $event]
+    }
+
+    return $token
+}
+
+proc ::uevent::watch::event::remove {token} {
+    variable db
+    variable tk
+    variable ex
+
+    Remove $token
+    return
+}
+
+proc ::uevent::watch::event::Invoke {action tag event} {
+    variable db
+    variable tk
+
+    foreach key [array names db] {
+	foreach {tpattern epattern} $key break
+	if {![string match $tpattern $tag]} continue
+	if {![string match $epattern $event]} continue
+
+	foreach token $db($key) {
+	    set cmd [lindex $tk($token) end]
+	    uplevel \#0 [linsert $cmd end $action $tag $event]
+	}
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Initialization - Tracing, System state
+
+logger::initNamespace ::uevent
+namespace eval        ::uevent {
+    # ### ### ### ######### ######### #########
+    # Information needed:
+    # (1)  Per <tag,event> the commands bound to it.
+    # (1a) Per <tag>      the commands bound to it.
+    # (2)  Per <tag,event,command> a token representing it.
+    # (3)  For all <tag,event,command> a quick way to check their existence
+
+    # (Ad 1)  db : array (list (tag, event) -> list (token))
+    # (Ad 1a) dt : array (tag               -> list (token))
+    # (Ad 2)  tk : array (token -> list (tag, event, command))
+    # (Ad 3)  ex : array (list (tag, event, command) -> token)
+
+    variable db ; array set db {}
+    variable dt ; array set dt {}
+    variable tk ; array set tk {}
+    variable ex ; array set ex {}
+
+    # (1a) is for bind watching.
+
+    # ### ### ### ######### ######### #########
+
+    namespace export bind unbind generate list
+}
+
+# ### ### ### ######### ######### #########
+namespace eval ::uevent::watch::tag {
+    # ### ### ### ######### ######### #########
+    # Information needed for (un)bind monitoring (tags).
+
+    # (1) Per <tag> (patterns) the commands bound to it.
+    # (2) Per <tag,command> a token representing it.
+    # (3) For all <tag,command> a quick way to check their existence
+
+    # (Ad 1) db : array (tagp -> list (token))
+    # (Ad 2) tk : array (token -> list (tagp, command))
+    # (Ad 3) ex : array (list (tagp, command) -> token)
+
+    variable db ; array set db {}
+    variable tk ; array set tk {}
+    variable ex ; array set ex {}
+
+    namespace export add remove
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+namespace eval ::uevent::watch::event {
+    # ### ### ### ######### ######### #########
+    # Information needed for (un)bind monitoring (tag/events).
+
+    # (1) Per <tag,event> (patterns) the commands bound to it.
+    # (2) Per <<tag,event>,command> a token representing it.
+    # (3) For all <<tag,event>,command> a quick way to check their existence
+
+    # (Ad 1) db : array (list (tagp, eventp) -> list (token))
+    # (Ad 2) tk : array (token -> list ((atgp, eventp), command))
+    # (Ad 3) ex : array (list ((tagp, eventp), command) -> token)
+
+    namespace export add remove
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Internals: Token Generator, and general DB management
+## (same structure)
+
+proc ::uevent::token::NewToken {{type uev}} {
+    variable tcounter
+    return ${type}[incr tcounter]
+}
+
+proc ::uevent::token::Place {type key command nv} {
+    upvar 1 db db tk tk ex ex $nv new
+
+    set kc [::list $key $command]
+
+    # Same key/command combination as before => same token
+    if {[info exists ex($kc)]} {
+	set new 0
+	return $ex($kc)
+    }
+
+    # New token, and enter everything ...
+    set token [NewToken $type]
+
+    set     tk($token) $kc
+    set     ex($kc)    $token
+    lappend db($key)   $token
+
+    set new 1
+    return $token
+}
+
+proc ::uevent::token::Remove {token} {
+    upvar 1 db db tk tk ex ex
+
+    if {![info exists tk($token)]} return
+
+    set kc  $tk($token)
+    set key [lindex $kc 0]
+
+    unset ex($kc)
+    unset tk($token)
+
+    set pos [lsearch -exact $db($key) $token]
+    if {$pos < 0} return
+
+    if {[llength $db($key)] == 1} {
+	unset db($key)
+    } else {
+	set db($key) [lreplace $db($key) $pos $pos]
+    }
+    return
+}
+
+namespace eval ::uevent::token {
+    variable tcounter 0
+    namespace export NewToken Place Remove
+}
+
+# ### ### ### ######### ######### #########
+## Link general internal parts to their users.
+
+namespace eval ::uevent {
+    namespace import ::uevent::token::*
+}
+
+namespace eval ::uevent::watch::tag {
+    namespace import ::uevent::token::*
+}
+
+namespace eval ::uevent::watch::event {
+    namespace import ::uevent::token::*
+}
+
+# ### ### ### ######### ######### #########
+## Ensemblify the system when running under Tcl 8.5 or higher.
+
+if {[package vsatisfies [package present Tcl] 8.5]} {
+    namespace eval ::uevent {
+	namespace eval watch {
+	    namespace eval tag {
+		namespace ensemble create
+	    }
+	    namespace eval event {
+		namespace ensemble create
+	    }
+	    namespace export tag event
+	    namespace ensemble create
+	}
+	namespace export watch
+	namespace ensemble create
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide uevent 0.3.1
+
+##
+# ### ### ### ######### ######### #########
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uev/uevent_onidle.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uev/uevent_onidle.tcl
new file mode 100644
index 00000000..b43ab310
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uev/uevent_onidle.tcl
@@ -0,0 +1,51 @@
+## -*- tcl -*-
+# ### ### ### ######### ######### #########
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4 ; #
+package require snit    ; # 
+
+# ### ### ### ######### ######### #########
+##
+
+snit::type uevent::onidle {
+    # ### ### ### ######### ######### #########
+    ## API 
+
+    constructor {cmd} {
+	set mycmd $cmd
+	return
+    }
+
+    method request {} {
+	if {$myhasrequest} return
+	after idle [mymethod RunAction]
+	set myhasrequest 1
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Internal commands
+
+    method RunAction {} {
+	set myhasrequest 0
+	uplevel \#0 $mycmd
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## State
+
+    variable mycmd        {} ; # Command prefix of the action to perform
+    variable myhasrequest 0  ; # Boolean flag, set when the action has
+    #                        ; # been requested
+
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide uevent::onidle 0.1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/units/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/units/pkgIndex.tcl
new file mode 100644
index 00000000..ec25964c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/units/pkgIndex.tcl
@@ -0,0 +1,4 @@
+# Tcl package index file, version 1.1
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded units 2.2.1 [list source [file join $dir units.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/units/units.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/units/units.tcl
new file mode 100644
index 00000000..33a44c8a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/units/units.tcl
@@ -0,0 +1,694 @@
+#----------------------------------------------*-TCL-*------------
+#
+#  units.tcl
+#
+#  The units package provides a conversion facility from a variety of
+#  scientific and engineering shorthand notations into floating point
+#  numbers.
+#
+#  Sean Woods
+#  November 4, 2016
+#  Test and Evaluation Solutions, LLC
+#
+#  Robert W. Techentin
+#  November 1, 2000
+#  Copyright (C) Mayo Foundation.  All Rights Reserved.
+#
+#-----------------------------------------------------------------
+package provide units 2.2.1
+
+package require Tcl 8.5
+
+namespace eval ::units {
+
+    namespace export new
+    namespace export convert
+    namespace export reduce
+
+    variable UnitList
+    variable PrefixTable
+}
+
+
+#-----------------------------------------------------------------
+#
+# ::units::new --
+#
+#  Add a new unit to the units table.  The new unit is defined
+#  in terms of its baseUnits.  If baseUnits is "-primitive",
+#  then it is assumed to be some magical new kind of quantity.
+#  Otherwise, it must reduce to units already defined.
+#
+#-----------------------------------------------------------------
+proc ::units::new {name baseUnits} {
+    variable UnitList
+
+    # check for duplicates
+    if { [dict exists $UnitList $name] } {
+	error "unit '$name' is already defined"
+    }
+
+    # check for valid characters
+    if { [regexp {[^a-zA-Z_]} $name] } {
+	error "non-alphabetic characters in unit name '$name'"
+    }
+
+    # Compute reduced units
+    if { [catch {::units::reduce $baseUnits} reducedUnits] } {
+	error "'$baseUnits' cannot be reduced to primitive units"
+    }
+
+    # add the unit, but don't return a value
+    dict set UnitList $name $reducedUnits
+    return
+}
+
+#-----------------------------------------------------------------
+#
+# ::units::convert --
+#
+#  Convert a value to the target units.
+#
+#  If units are specified for the value, then they must
+#  be compatible with the target units.  (i.e., you can 
+#  convert "newtons" to "kg-m/s^2", but not to "sieverts".
+#
+# Arguments:
+#  value  A value can be a floating point number, either with or
+#         without units.  
+#  targetUnits  A units string which  may also include a scale factor.  
+#
+# Results:
+#  The return value is a scaled floating point number.
+#
+#-----------------------------------------------------------------
+
+proc ::units::convert {value targetUnits} {
+    #  Reduce each of value and target
+    #  to primitive units
+    set reducedValue [::units::reduce $value]
+    set reducedTarget [::units::reduce $targetUnits]
+    
+    set operation {}
+    if {[llength $reducedValue]==4 && [lindex $reducedValue 1] in {+ -}} {
+	if {[lindex $reducedValue 1] eq "+"} {
+	    lappend operation ( [lindex $reducedValue 0] - [lindex $reducedValue 2] )
+	} else {
+	    lappend operation ( [lindex $reducedValue 0] + [lindex $reducedValue 2] )
+	}
+	set reducedValue [reduce [lindex $reducedValue 3]]
+	lappend operation * [lindex $reducedValue 0] /
+    } else {
+	lappend operation [lindex $reducedValue 0] /
+    }
+    if {[llength $reducedTarget]==4 && [lindex $reducedTarget 1] in {+ -}} {
+	set postop [lrange $reducedTarget 0 2]
+	set reducedTarget  [reduce [lindex $reducedTarget 3]]
+	lappend operation  [lindex $reducedTarget 0] * {*}$postop
+    } else {
+	lappend operation [lindex $reducedTarget 0]
+    }
+    #  If the value has units, it must be compatible with
+    #  the target.  (If it is unitless, then compatibility
+    #  is not required.)
+    if { [llength $reducedValue] > 1} {
+	if {[lrange $reducedValue 1 end]!=[lrange $reducedTarget 1 end]} {
+	    error "'$value' and '$targetUnits' have incompatible units"
+	}
+    }
+    #  Compute and return scaled and transformed value
+    return [expr $operation]
+}
+
+
+#-----------------------------------------------------------------
+#
+# ::units::reduce --
+#
+#  Reduce a string of numbers, prefixes, units, exponents into a
+#  single multiplicitive factor and sorted list of primitive units.
+#  For example, the unit string for "newton", which is "m-kg/s^2"
+#  would reduce to the list {1000.0 gram meter / second second}
+#
+#  Unit String Syntax
+#
+#  This procedure defines a valid unit string that may
+#  be reduced to primitive units, so it is reasonable to
+#  document valid unit string syntax here.
+#
+#  A unit string consists of an optional scale factor followed
+#  by zero or more subunit strings.  The scale factor must be
+#  a valid floating point number.  
+#
+#  Subunits are separated by unit separator characters, which are 
+#  " ", "-", "*", and "/".  It is not necessary to separate
+#  the leading scale factor from the rest of the subunits.
+#
+#  The forward slash seperator "/" indicates that following
+#  subunits are in the denominator.  There can be at most
+#  one "/" separator.
+#
+#  Subunits can be floating point scale factors, but they
+#  must be surrounded by valid separators.
+#
+#  Subunits can be valid units or abbreviations from the
+#  UnitsTable.  They may include a prefix from the PrefixTable.
+#  They may include a plural suffix "s" or "es".  They may
+#  also include a power string "^", followed by an integer,
+#  after the unit name (or plural suffix, if there is one.)
+#
+#  Examples of valid unit strings:  "meter", "/s", "kg-m/s^2",
+#  "30second" "30 second", "30 seconds" "200*meter/20.5*second"
+#
+# Arguments:
+#  unitString  string of units characters
+#
+# Results:
+#  The return value is a list, the first element of which 
+#  is the multiplicitive factor, and the remaining elements are
+#  sorted reduced primitive units, possibly including the "/"
+#  operator, which separates the numerator from the denominator.
+#-----------------------------------------------------------------
+#
+
+proc ::units::reduce unitString {
+    #  Check number of arguments
+
+    # check for primitive unit - may already be reduced
+    #  This gets excercised by new units
+    if { "$unitString" == "-primitive" } {
+	return $unitString
+    }
+    if { [string range $unitString 0 1] == "+ " } {
+	return $unitString
+    }
+    if { [string range $unitString 0 1] == "- " } {
+	return $unitString
+    }
+
+    # trim leading and trailing white space
+    set unitString [string trim $unitString]
+
+    # Check cache of unitStrings
+   if { [info exists ::units::cache($unitString)] } {
+	return $::units::cache($unitString)
+    }
+
+    # Verify syntax of unit string
+    #  It may contain, at most, one "/"
+    if { [regexp {/.*/} $unitString] } {
+	error "invalid unit string '$unitString':  only one '/' allowed"
+    }
+    #  It may contain only letters, digits, the powerstring ("^"),
+    #  decimal points, and separators 
+    if { [regexp {[^a-zA-Z0-9. \t*^/+-]} $unitString] } {
+	error "invalid characters in unit string '$unitString'"
+    }
+
+    #  Check for leading scale factor
+    #  If the leading characters are in floating point
+    #  format, then extract and save them (including any
+    #  minus signs) before handling subunit separators.
+    #  This is based on a regexp from Roland B. Roberts which
+    #  allows leading +/-, digits, decimals, and exponents.
+    regexp {(^[-+]?(?:[0-9]+\.?[0-9]*|\.[0-9]+)(?:[eE][-+]?[0-9]+)?)?(.*)} \
+	    $unitString matchvar scaleFactor subunits
+    #  Ensure that scale factor is a nice floating point number
+    if { "$scaleFactor" == "" } {
+	set scaleFactor 1.0
+    } else {
+	# convert to floating point, forcing leading
+	# zeros to NOT mean octal. (bug 758702)
+	scan $scaleFactor "%f" scaleFactor
+    }
+
+    #  replace all separators with spaces.
+    regsub -all {[\t\-\*]} $subunits " " subunits
+    #  add spaces around "/" character.
+    regsub {/} $subunits " / " subunits
+
+    #  The unitString is now essentially a well structured list
+    #  of subunits, which may be processed as a list, and it
+    #  may be necessary to process it recursively, without
+    #  performing the string syntax checks again.  But check
+    #  for errors.
+    if { [catch {ReduceList $scaleFactor $subunits} result errdat] } {
+	#puts [dict get $errdat -errorinfo]
+	error "$result in '$unitString'"
+    }
+
+    #  Store the reduced unit in a cache, so future lookups
+    #  are much quicker.
+    set ::units::cache($unitString) $result
+}
+
+
+# Utility Function - Reduce factor/numerator/denominator
+proc ::units::_ReduceList_term {factor numerator denominator} {
+
+    #  Sort both numerator and denominator
+    set numerator [lsort $numerator]
+    set denominator [lsort $denominator]
+
+    #  Cancel any duplicate units.
+    #  Foreach and for loops don't work well for this.
+    #  (We keep changing list length).
+    set i 0
+    while {$i < [llength $numerator]} {
+	set u [lindex $numerator $i]
+	set index [lsearch $denominator $u]
+	if { $index >= 0 } {
+	    set numerator [lreplace $numerator $i $i]
+	    set denominator [lreplace $denominator $index $index]
+	} else {
+	    incr i
+	}
+    }
+
+    #  Now we've got numerator, denominator, and factors.
+    #  Assemble the result into a single list.
+    if { [llength $denominator] > 0 } {
+	set result [eval ::list $factor $numerator "/" $denominator]
+    } else {
+	set result [eval ::list $factor $numerator]
+    }
+
+    #  Now return the result
+    return $result
+}
+#-----------------------------------------------------------------
+#
+# ::units::ReduceList --
+#
+#  Reduce a list of subunits to primitive units and a single
+#  scale factor.
+#
+# Arguments:
+#  factor      A scale factor, which is multiplied and divided
+#              by subunit prefix values and constants.
+#  unitString  A unit string which is syntactically correct
+#              and includes only space separators.  This
+#              string can be treated as a Tcl list.
+#
+# Results:
+#  A valid unit string list, consisting of a single floating
+#  point factor, followed by sorted primitive units.  If the 
+#  forward slash separator "/" is included, then each of the
+#  numerator and denominator is sorted, and common units have
+#  been cancelled.
+#
+#-----------------------------------------------------------------
+#
+proc ::units::ReduceList { factor unitString } {
+  variable UnitList
+  variable PrefixTable
+
+  # process each subunit in turn, starting in the numerator
+  #
+  #  Note that we're going to use a boolean flag to switch
+  #  between numerator and denominator if we encounter a "/".
+  #  This same style is used for processing recursively
+  #  reduced subunits
+  set numerflag 1
+  set numerator [::list]
+  set denominator [::list]
+  
+  set operations {}
+  
+  foreach subunit $unitString {
+    #  Check for "/"
+    if { "$subunit" == "/" } {
+      set numerflag [expr {$numerflag?0:1}]
+      continue
+    }
+
+    #  Constant factor
+    if { [string is double -strict $subunit] } {
+      if { $subunit == 0.0 } {
+        error "illegal zero factor"
+      } else {
+        if { $numerflag } {
+          set factor [expr {$factor * $subunit}]
+        } else {
+          set factor [expr {$factor / $subunit}]
+        }
+        continue
+      }
+    }
+  
+    #  Check for power string (e.g. "s^2")
+    #  We could use regexp to match and split in one operation,
+    #  like {([^\^]*)\^(.*)} but that seems to be pretty durn
+    #  slow, so we'll just using [string] operations.
+    if { [set index [string first "^" $subunit]] >= 0 } {
+      set subunitname [string range $subunit 0 [expr {$index-1}]]
+      set exponent [string range $subunit [expr {$index+1}] end]
+      if { ! [string is integer -strict $exponent] } {
+        error "invalid integer exponent"
+      }
+      #  This is a good test and error message, but it won't
+      #  happen, because the negative sign (hypen) has already
+      #  been interpreted as a unit separator.  Negative
+      #  exponents will trigger the 'invalid integer' message,
+      #  because there is no exponent. :-)
+      if { $exponent < 1 } {
+        error "invalid non-positive exponent"
+      }
+    } else {
+        set subunitname $subunit
+        set exponent 1
+    }
+
+    # Check subunit name syntax
+    if { ! [string is alpha -strict $subunitname] } {
+        error "invalid non-alphabetic unit name"
+    }
+
+    #  Try looking up the subunitname.  
+    #
+    #  Start with the unit name.  But if the unit ends in "s"
+    #  or "es", then we want to try shortened (singular)
+    #  versions of the subunit as well.
+    set unitValue ""
+
+    set subunitmatchlist [::list $subunitname]
+    if { [string range $subunitname end end] == "s" } {
+        lappend subunitmatchlist [string range $subunitname 0 end-1]
+    }
+    if { [string range $subunitname end-1 end] == "es" } {
+        lappend subunitmatchlist [string range $subunitname 0 end-2]
+    }
+
+    foreach singularunit $subunitmatchlist {
+
+      set len [string length $singularunit]
+
+      #  Search the unit list in order, because we 
+      #  wouldn't want to accidentally match the "m" 
+      #  at the end of "gram" and conclude that we 
+      #  have "meter".  
+      foreach {name value} $UnitList {
+    
+        #  Try to match the string starting at the
+        #  at the end, just in case there is a prefix.
+        #  We only have a match if both the prefix and
+        #  unit name are exact matches.
+        set pos [expr {$len - [string length $name]}]
+        #set pos [expr {$len-1}]
+        if { [string range $singularunit $pos end] == $name } {
+
+          set prefix [string range $singularunit 0 [expr {$pos-1}]]
+          set matchsubunit $name
+  
+          #  If we have no prefix or a valid prefix, 
+          #  then we've got an actual match.
+          if { ("$prefix" == "") || \
+            [info exists PrefixTable($prefix)] } {
+            #  Set the unit value string
+            set unitValue $value
+            # done searching UnitList
+            break
+          }
+        }
+        # check for done 
+        if { $unitValue != "" } {
+            break
+        }
+      }
+    }
+
+    # Check for not-found
+    if { "$unitValue" == "" } {
+      error "invalid unit name '$subunitname'"
+    }
+  
+    #  Multiply the factor by the prefix value
+    if { "$prefix" != "" } { 
+      #  Look up prefix value recursively, so abbreviations
+      #  like "k" for "kilo" will work.  Note that we
+      #  don't need error checking here (as we do for
+      #  unit lookup) because we have total control over
+      #  the prefix table.
+      while { ! [string is double -strict $prefix] } {
+        set prefix $PrefixTable($prefix)
+      }
+      # Save prefix multiple in factor
+      set multiple [expr {pow($prefix,$exponent)}]
+      if { $numerflag } {
+        set factor [expr {$factor * $multiple}]
+      } else {
+        set factor [expr {$factor / $multiple}]
+      }
+    }
+
+  
+    # Is this a primitive subunit?
+    if { "$unitValue" == "-primitive" } {
+        # just append the matching subunit to the result
+        # (this doesn't have prefix or trailing "s")
+        for {set i 0} {$i<$exponent} {incr i} {
+          if { $numerflag } {
+            lappend numerator $matchsubunit
+          } else {
+            lappend denominator $matchsubunit
+          }
+        }
+    } else {
+      #  Recursively reduce, unless it is in the cache
+      if { [info exists ::units::cache($unitValue)] } {
+        set reducedUnit $::units::cache($unitValue)
+      } else {
+        set reducedUnit [::units::reduce $unitValue]
+        set ::units::cache($unitValue) $reducedUnit
+      }
+      set opcode [lindex $reducedUnit 0]
+      if {$opcode in {+ -}} {
+        lappend operations {*}[_ReduceList_term $factor $numerator $denominator]
+        if {$opcode eq "+"} {
+          lappend operations -
+        } else {
+          lappend operations +  
+        }
+        set numerflag 1
+        set numerator [::list]
+        set denominator [::list]
+        set factor 1.0
+        set reducedUnit [lrange $reducedUnit 1 end]
+      }     
+      #  Include multiple factor from reduced unit
+      set multiple [expr {pow([lindex $reducedUnit 0],$exponent)}]
+      if { $numerflag } {
+        set factor [expr {$factor * $multiple}]
+      } else {
+        set factor [expr {$factor / $multiple}]
+      }
+
+      #  Add primitive subunits to numerator/denominator
+      #
+      #  Note that we're use a nested boolean flag to switch
+      #  between numerator and denominator.  Subunits in
+      #  the numerator of the unitString are processed
+      #  normally, but subunits in the denominator of
+      #  unitString must be inverted.
+      set numerflag2 $numerflag
+      foreach u [lrange $reducedUnit 1 end] {
+        if { "$u" == "/" } {
+          set numerflag2 [expr {$numerflag2?0:1}]
+          continue
+        }
+        #  Append the reduced units "exponent" times
+        for {set i 0} {$i<$exponent} {incr i} {
+          if { $numerflag2 } {
+            lappend numerator $u
+          } else {
+            lappend denominator $u
+          }
+        }
+      }
+      
+    }
+  }
+  lappend operations {*}[_ReduceList_term $factor $numerator $denominator]
+  return $operations
+}
+
+
+#-----------------------------------------------------------------
+#
+#  Initialize namespace variables
+#
+#-----------------------------------------------------------------
+namespace eval ::units {
+
+    set PrefixList {
+	yotta        1e24
+	zetta        1e21
+	exa          1e18
+	peta         1e15
+	tera         1e12
+	giga         1e9
+	mega         1e6
+	kilo         1e3
+	hecto        1e2
+	deka         1e1
+	deca         1e1
+	deci         1e-1
+	centi        1e-2
+	milli        1e-3
+	micro        1e-6
+	nano         1e-9
+	pico         1e-12
+	femto        1e-15
+	atto         1e-18
+	zepto        1e-21
+	yocto        1e-24
+	Y            yotta
+	Z            zetta
+	E            exa
+	P            peta
+	T            tera
+	G            giga
+	M            mega
+	k            kilo
+	h            hecto
+	da           deka
+	d            deci
+	c            centi
+	m            milli
+	u            micro
+	n            nano
+	p            pico
+	f            femto
+	a            atto
+	z            zepto
+	y            yocto
+    }
+
+    array set PrefixTable $PrefixList
+
+    set SIunits {
+	meter        -primitive
+	gram         -primitive
+	second       -primitive
+	ampere       -primitive
+	kelvin       -primitive
+	mole         -primitive
+	candela      -primitive
+	radian       meter/meter
+	steradian    meter^2/meter^2
+	hertz        /second
+	newton       meter-kilogram/second^2
+	pascal       kilogram/meter-second^2
+	joule        meter^2-kilogram/second^2
+	watt         meter^2-kilogram/second^3
+	coulomb      second-ampere
+	volt         meter^2-kilogram/second^3-ampere
+	farad        second^4-ampere^2/meter^2-kilogram
+	ohm	     meter^2-kilogram/second^3-ampere^2
+	siemens      second^3-ampere^2/meter^2-kilogram
+	weber        meter^2-kilogram/second^2-ampere
+	tesla        kilogram/second^2-ampere
+	henry        meter^2-kilogram/second^2-ampere^2
+	lumen        candela-steradian
+	lux          candela-steradian/meter^2
+	becquerel    /second
+	gray         meter^2/second^2
+	sievert      meter^2/second^2
+    }
+    set SIabbrevs {
+	m            meter
+	g            gram
+	s            second
+	A            ampere
+	K            kelvin
+	mol          mole
+	cd           candela
+	rad          radian
+	sr           steradian
+	Hz           hertz
+	N            newton
+	Pa           pascal
+	J            joule
+	W            watt
+	C            coulomb
+	V            volt
+	F            farad
+	S            siemens
+	Wb           weber
+	T            tesla
+	H            henry
+	lm           lumen
+	lx           lux
+	Bq           becquerel
+	Gy           gray
+	Sv           sievert
+    }
+
+    #  Selected non-SI units from Appendix B of the Guide for
+    #  the use of the International System of Units
+    set nonSIunits {
+	angstrom              1.0E-10meter
+	astronomicalUnit      1.495979E11meter
+	atmosphere            1.01325E5pascal
+	bar                   1.0E5pascal
+	calorie               4.1868joule
+	curie                 3.7E10becquerel
+	day                   8.64E4second
+	degree                1.745329E-2radian
+	erg                   1.0E-7joule
+	faraday               9.648531coulomb
+	fermi                 1.0E-15meter
+        foot                  3.048E-1meter
+	gauss                 1.0E-4tesla
+	gilbert               7.957747E-1ampere
+	grain                 6.479891E-5kilogram
+	hectare               1.0E4meter^2
+	hour                  3.6E3second
+	inch                  2.54E-2meter
+	lightYear             9.46073E15meter
+	liter                 1.0E-3meter^3
+	maxwell               1.0E-8weber
+	mho                   1.0siemens
+	micron                1.0E-6meter
+	mil                   2.54E-5meter
+	mile                  1.609344E3meter
+	minute                6.0E1second
+	parsec                3.085E16meter
+	pica                  4.233333E-3meter
+	pound                 4.535924E-1kilogram
+	revolution            6.283185radian
+	revolutionPerMinute   1.047198E-1radian/second
+	yard                  9.144E-1meter
+	year                  3.1536E7second
+    }
+    set nonSIabbrevs {
+	AU           astronomicalUnit
+	ft           foot
+	gr           grain
+	ha           hectare
+	h            hour
+	in           inch
+	L            liter
+	Mx           maxwell
+	mi           mile
+	min          minute
+	pc           parsec
+	lb           pound
+	r            revolution
+	rpm          revolutionPerMinute
+	yd           yard
+    }
+
+    foreach {name value} $SIunits {
+	dict set UnitList $name $value
+    }
+    foreach {name value} $nonSIunits {
+	dict set UnitList $name $value
+    }
+    foreach {name value} $SIabbrevs {
+	dict set UnitList $name $value
+    }
+    foreach {name value} $nonSIabbrevs {
+	dict set UnitList $name $value
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uri/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uri/pkgIndex.tcl
new file mode 100644
index 00000000..5118cc49
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uri/pkgIndex.tcl
@@ -0,0 +1,6 @@
+if {![package vsatisfies [package provide Tcl] 8.2]} {
+    # FRINK: nocheck
+    return
+}
+package ifneeded uri      1.2.7 [list source [file join $dir uri.tcl]]
+package ifneeded uri::urn 1.0.3 [list source [file join $dir urn-scheme.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uri/uri.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uri/uri.tcl
new file mode 100644
index 00000000..6b6b35e5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uri/uri.tcl
@@ -0,0 +1,1444 @@
+# uri.tcl --
+#
+#	URI parsing and fetch
+#
+# Copyright (c) 2000 Zveno Pty Ltd
+# Copyright (c) 2006 Pierre DAVID <Pierre.David@crc.u-strasbg.fr>
+# Copyright (c) 2006 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# Copyright (c) 2017 Keith Nash <kjnash@users.sourceforge.net>
+# Steve Ball, http://www.zveno.com/
+# Derived from urls.tcl by Andreas Kupries
+#
+# CVS: $Id: uri.tcl,v 1.36 2011/03/23 04:39:54 andreas_kupries Exp $
+
+package require Tcl 8.2
+
+namespace eval ::uri {
+
+    namespace export split join
+    namespace export resolve isrelative
+    namespace export geturl
+    namespace export canonicalize
+    namespace export register
+    namespace export setQuirkOption
+
+    variable file:counter 0
+
+    variable Quirks
+    set Quirks(NoInitialSlash)      1
+    set Quirks(NoExtraKeys)         0
+    set Quirks(HostAsDriveLetter)   0
+    set Quirks(RemoveDoubleSlashes) 1
+    # Defaults for v1.2.7: {1 0 0 1}
+
+    # --------------------------------------------------------------------------
+    # These variables are used by uri::register and are a repository of
+    # scheme-related pattern information that may be accessed by external code.
+    # None is used by the other commands of this package.
+    # --------------------------------------------------------------------------
+    variable schemes       {}
+    variable schemePattern ""
+    variable url           ""
+    variable url2part
+    array set url2part     {}
+
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # basic regular expressions used in URL syntax.
+
+    namespace eval basic {
+	# ----------------------------------------------------------------------
+	# These variables are used to construct the variables used by commands.
+	# ----------------------------------------------------------------------
+	variable	digit		{[0-9]}
+	variable	hex		{[0-9A-Fa-f]}
+	variable	alphaDigit	{[A-Za-z0-9]}
+	variable	alphaDigitMinus	{[A-Za-z0-9-]}
+	variable	escape		"%${hex}${hex}"
+	variable	digits		"${digit}+"
+
+	variable	toplabel	\
+		"(${alphaDigit}${alphaDigitMinus}*${alphaDigit}\\.?|${alphaDigit}\\.?)"
+	variable	domainlabel	\
+		"(${alphaDigit}${alphaDigitMinus}*${alphaDigit}|${alphaDigit})"
+
+	variable	hostname	\
+		"((${domainlabel}\\.)*${toplabel})"
+	variable	hostnumber4	\
+		"(?:${digits}\\.${digits}\\.${digits}\\.${digits})"
+	variable	hostnumber6	{(?:\[[^]]*\])}
+	variable	hostnumber	"(${hostnumber4}|${hostnumber6})"
+
+	variable	usrCharN	{[a-zA-Z0-9$_.+!*'(,);?&=-]}
+	variable	usrChar		"(${usrCharN}|${escape})"
+
+	# ----------------------------------------------------------------------
+	# >>> THESE VARIABLES ARE THE ONLY ONES USED BY COMMANDS <<<
+	# ----------------------------------------------------------------------
+
+	variable	hostspec	"${hostname}|${hostnumber}"
+	variable	port		"${digit}*"
+	variable	user		"${usrChar}*"
+	variable	password	$user
+
+	# ----------------------------------------------------------------------
+	# This variable (and escape, hostname, hostnumber, port, user, password
+	# from above) are used to construct the variables in the block below.
+	# ----------------------------------------------------------------------
+
+	variable	xCharN		{[a-zA-Z0-9$_.+!*'(,);/?:@&=-]}
+
+	# ----------------------------------------------------------------------
+	# These variables (and "escape") are used in the patterns defined in the
+	# calls to uri::register at the end of the file.  They are not used by
+	# any commands.
+	# ----------------------------------------------------------------------
+
+	variable	xChar		"(${xCharN}|${escape})"
+	variable	host		"(${hostname}|${hostnumber})"
+	variable	hostOrPort	"${host}(:${port})?"
+	variable	login		"(${user}(:${password})?@)?${hostOrPort}"
+	variable	alpha		{[a-zA-Z]}
+
+	# ----------------------------------------------------------------------
+	# These variables are not used by anything in this file.
+	# ----------------------------------------------------------------------
+
+	variable	loAlpha		{[a-z]}
+	variable	hiAlpha		{[A-Z]}
+	variable	safe		{[$_.+-]}
+	variable	extra		{[!*'(,)]}
+	# danger in next pattern, order important for []
+	variable	national	{[][|\}\{\^~`]}
+	variable	punctuation	{[<>#%"]}	;#" fake emacs hilit
+	variable	reserved	{[;/?:@&=]}
+
+	# next is <national | punctuation>
+	variable	unsafe		{[][<>"#%\{\}|\\^~`]} ;#" emacs hilit
+
+	#	unreserved	= alpha | digit | safe | extra
+	#	xchar		= unreserved | reserved | escape
+
+	variable	unreserved	{[a-zA-Z0-9$_.+!*'(,)-]}
+	variable	uChar		"(${unreserved}|${escape})"
+
+    } ;# basic {}
+}
+
+# ::uri::setQuirkOption
+#
+#	Accessor command for quirk options; uses "set" semantics.
+#
+#	Quirk options allow deviations from RFC 3986, and are fully documented
+#	in the man page uri(n).
+#
+#	Currently defined quirk options are:
+#	    NoInitialSlash
+#	    NoExtraKeys
+#	    RemoveDoubleSlashes
+#	    HostAsDriveLetter
+#
+# Arguments:
+#	key	name of a quirk option
+#       value	(optional, boolean) new value
+#
+# Results:
+#	The value of the quirk option.
+
+proc ::uri::setQuirkOption {key args} {
+    variable Quirks
+
+    if {![info exists Quirks($key)]} {
+	return -code error {unknown key}
+    }
+
+    set lenny [llength $args]
+    if {$lenny == 0} {
+	return $Quirks($key)
+    } elseif {$lenny == 1} {
+	set value [lindex $args 0]
+	if {![string is boolean -strict $value]} {
+	    return -code error {boolean value required}
+	}
+	set Quirks($key) [expr {$value && $value}]
+	return $value
+    } else {
+        return -code error {wrong # args: should be "::uri::setQuirkOption\
+		key ?newBooleanValue?"}
+    }
+}
+
+
+# ::uri::register --
+#
+#	Register a scheme (and aliases) in the package. The command
+#	creates a namespace below "::uri" with the same name as the
+#	scheme and executes the script declaring the pattern variables
+#	for this scheme in the new namespace. At last it updates the
+#	uri variables keeping track of overall scheme information.
+#
+#	The script has to declare at least the variable "schemepart",
+#	the pattern for an url of the registered scheme after the
+#	scheme declaration. Not declaring this variable is an error.
+#
+#	Registration provides a number of pattern variables for use by external
+#	code.  It is unconnected to the commands provided by the uri package.
+#	See the warnings near the end of this file where uri::register is
+#	called.
+#
+# Arguments:
+#	schemeList	Name of the scheme to register, plus aliases
+#       script		Script declaring the scheme patterns
+#
+# Results:
+#	None.
+
+proc ::uri::register {schemeList script} {
+    variable schemes
+    variable schemePattern
+    variable url
+    variable url2part
+
+    # Check scheme and its aliases for existence.
+    foreach scheme $schemeList {
+	if {[lsearch -exact $schemes $scheme] >= 0} {
+	    return -code error \
+		    "trying to register scheme (\"$scheme\") which is already known"
+	}
+    }
+
+    # Get the main scheme
+    set scheme  [lindex $schemeList 0]
+
+    if {[catch {namespace eval $scheme $script} msg]} {
+	catch {namespace delete $scheme}
+	return -code error \
+	    "error while evaluating scheme script: $msg"
+    }
+
+    if {![info exists ${scheme}::schemepart]} {
+	namespace delete $scheme
+	return -code error \
+	    "Variable \"schemepart\" is missing."
+    }
+
+    # Now we can extend the variables which keep track of the registered schemes.
+
+    eval [linsert $schemeList 0 lappend schemes]
+    set schemePattern	"([::join $schemes |]):"
+
+    foreach s $schemeList {
+	# FRINK: nocheck
+	set url2part($s) "${s}:[set ${scheme}::schemepart]"
+	# FRINK: nocheck
+	append url "(${s}:[set ${scheme}::schemepart])|"
+    }
+    set url [string trimright $url |]
+    return
+}
+
+# ::uri::split --
+#
+#	Splits the given <a url> into its constituents.
+#
+# Arguments:
+#	url	the URL to split
+#
+# Results:
+#	Tcl list containing constituents, suitable for 'array set'.
+
+proc ::uri::split {url {defaultscheme http}} {
+
+    set url [string trim $url]
+    set scheme {}
+
+    # RFC 3986 Sec 3.1: scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+    regexp -- {^([A-Za-z][A-Za-z0-9+.-]*):} $url dummy scheme
+
+    if {$scheme == {}} {
+	set scheme $defaultscheme
+	switch -- $scheme {
+	    http - https - ftp {
+		# x/y     -> //x/y    PREPEND //
+		# /x/y    -> ///x/y   PREPEND //
+		# //x/y   -> //x/y
+		# ///x/y  -> ///x/y
+		# ////x/y -> ////x/y
+		if {[string range $url 0 1] != "//"} {
+		    set url //$url
+		}
+	    }
+	}
+    }
+
+    # ease maintenance: dynamic dispatch, able to handle all schemes
+    # added in future!
+
+    if {[::info procs Split[string totitle $scheme]] == {}} {
+	error "unknown scheme '$scheme' in '$url'"
+    }
+
+    regsub -- "^${scheme}:" $url {} url
+
+    # Pass url without scheme: to the per-scheme handler.
+    set       parts(scheme) [string tolower $scheme]
+    array set parts [Split[string totitle $scheme] $url]
+
+    # Does not decode encoded characters.
+
+    return [array get parts]
+}
+
+proc ::uri::SplitFtp {url} {
+    # @c Splits the given ftp-<a url> into its constituents.
+    # @a url: The url to split, without! scheme specification.
+    # @r List containing the constituents, suitable for 'array set'.
+
+    # general syntax:
+    # //<user>:<password>@<host>:<port>/<cwd1>/.../<cwdN>/<name>;type=<typecode>
+    #
+    # additional rules:
+    #
+    # <user>:<password> are optional, detectable by presence of @.
+    # <password> is optional too.
+    #
+    # "//" [ <user> [":" <password> ] "@"] <host> [":" <port>] "/"
+    #	<cwd1> "/" ..."/" <cwdN> "/" <name> [";type=" <typecode>]
+
+    upvar \#0 [namespace current]::ftp::typepart ftptype
+
+    array set parts {user {} pwd {} host {} port {} path {} type {} scheme ftp}
+
+    # slash off possible type specification
+
+    if {[regexp -indices -- "${ftptype}$" $url dummy ftype]} {
+
+	set from	[lindex $ftype 0]
+	set to		[lindex $ftype 1]
+
+	set parts(type)	[string range   $url $from $to]
+
+	set from	[lindex $dummy 0]
+	set url		[string replace $url $from end]
+    }
+
+    # Handle user, password, host and port
+
+    if {[string match "//*" $url]} {
+	set url [string range $url 2 end]
+
+	array set parts [GetUPHP url]
+	# (also removes UPHP from url)
+    }
+
+    set parts(path) $url
+    AddQuirk3986 parts
+
+    return [array get parts]
+}
+
+proc ::uri::JoinFtp args {
+    set uphp [eval [linsert $args 0 ComposeUPHP {}]]
+
+    array set components {
+	pbare 0 path {} type {}
+    }
+    array set components $args
+
+    set type {}
+    if {[string length $components(type)]} {
+	set type \;type=$components(type)
+    }
+
+    RemoveQuirk3986 components
+
+    # Botches to accept certain invalid arguments instead of raising an error.
+
+    set PathFirst [string index $components(path) 0]
+    if {($PathFirst != {}) && ($PathFirst != {/})} {
+	# The path is invalid: if it is not empty it must begin with "/".
+	# This botch allows the command nevertheless to return a valid URI.
+	set components(path) "/$components(path)"
+    }
+
+    if {($components(path) == {}) && ($components(type) != "")} {
+	set components(path) "/"
+	# FTP requires a non-empty path if $type is non-empty.
+	# RFC 1738 Sec. 5, 
+	# This botch enforces that.
+    }
+
+    return ftp://${uphp}$components(path)$type
+}
+
+proc ::uri::SplitHttps {url} {
+    return [SplitHttpInner https $url]
+}
+
+proc ::uri::SplitHttp {url} {
+    return [SplitHttpInner http $url]
+}
+
+proc ::uri::SplitHttpInner {scheme url} {
+    # @c Splits the given http-<a url> into its constituents.
+    # @a url: The url to split, without! scheme specification.
+    # @r List containing the constituents, suitable for 'array set'.
+
+    # general syntax:
+    # //<host>:<port>/<path>?<searchpart>
+    #
+    #   where <host> and <port> are as described in Section 3.1. If :<port>
+    #   is omitted, the port defaults to 80.  No user name or password is
+    #   allowed.  <path> is an HTTP selector, and <searchpart> is a query
+    #   string. The <path> is optional, as is the <searchpart> and its
+    #   preceding "?". If neither <path> nor <searchpart> is present, the "/"
+    #   may also be omitted.
+    #
+    #   Within the <path> and <searchpart> components, "/", ";", "?" are
+    #   reserved.  The "/" character may be used within HTTP to designate a
+    #   hierarchical structure.
+    #
+    # path == <cwd1> "/" ..."/" <cwdN> "/" <name> ["#" <fragment>]
+
+    array set parts {host {} port {} path {} query {} fragment {}}
+    array set parts [list scheme $scheme]
+
+    set fragmentPattern "#(.*)\$"
+
+    # slash off possible fragment.
+
+    # NOTE: This must be done before the query, because a fragment can
+    # follow a query, and slashing off the query first will take the
+    # fragment with it. Bug #3235340.
+
+    if {[regexp -indices -- $fragmentPattern $url match fragment]} {
+	set from [lindex $fragment 0]
+	set to   [lindex $fragment 1]
+
+	set parts(fragment) [string range $url $from $to]
+
+	set url [string replace $url [lindex $match 0] end]
+    }
+
+    # slash off possible query. the 'search' regexp, while official,
+    # is not good enough. We have apparently lots of urls in the wild
+    # which contain unquoted urls with queries in a query. The RE
+    # finds the embedded query, not the actual one. Using string first
+    # now instead of a RE
+
+    if {[set pos [string first ? $url]] >= 0} {
+	incr pos
+	set parts(query) [string range   $url $pos end]
+	incr pos -1
+	set url          [string replace $url $pos end]
+    }
+
+    if {[string match "//*" $url]} {
+	set url [string range $url 2 end]
+
+	array set parts [GetUPHP url]
+	# (also removes UPHP from url)
+    }
+
+    set parts(path) $url
+    AddQuirk3986 parts
+
+    return [array get parts]
+}
+
+proc ::uri::JoinHttp {args} {
+    return [eval [linsert $args 0 ::uri::JoinHttpInner http 80]]
+}
+
+proc ::uri::JoinHttps {args} {
+    return [eval [linsert $args 0 ::uri::JoinHttpInner https 443]]
+}
+
+proc ::uri::JoinHttpInner {scheme defport args} {
+    set uphp [eval [linsert $args 0 ComposeUPHP $defport]]
+
+    array set components {pbare 0 path {} query {} fragment {}}
+    array set components $args
+
+    set query {}
+    if {[string length $components(query)]} {
+	set query ?$components(query)
+    }
+
+    if { $components(fragment) != "" } {
+	set components(fragment) "#$components(fragment)"
+    } else {
+	set components(fragment) ""
+    }
+
+    RemoveQuirk3986 components
+
+    # Botch to accept certain invalid arguments instead of raising an error.
+
+    set PathFirst [string index $components(path) 0]
+    if {($PathFirst != {}) && ($PathFirst != {/})} {
+	# The path is invalid: if it is not empty it must begin with "/".
+	# This botch allows the command nevertheless to return a valid URI.
+	set components(path) "/$components(path)"
+    }
+
+    return $scheme://$uphp$components(path)$query$components(fragment)
+}
+
+proc ::uri::SplitFile {url} {
+    # @c Splits the given file-<a url> into its constituents.
+    # @a url: The url to split, without! scheme specification.
+    # @r List containing the constituents, suitable for 'array set'.
+    variable Quirks
+
+    upvar #0 [namespace current]::basic::hostspec	hostspec
+
+    if {[string match "//*" $url]} {
+	set url [string range $url 2 end]
+
+	set hostPattern "^($hostspec)"
+
+	if {    $Quirks(HostAsDriveLetter)
+	     && ($::tcl_platform(platform) == "windows")
+	} {
+	    # Catch drive letter
+	    append hostPattern :?
+	} else {
+	    # Proceed as usual
+	}
+
+	if {[regexp -indices -- $hostPattern $url match host]} {
+	    set fh	[lindex $host 0]
+	    set th	[lindex $host 1]
+
+	    set parts(host)	[string range $url $fh $th]
+
+	    set  matchEnd   [lindex $match 1]
+	    incr matchEnd
+
+	    set url	[string range $url $matchEnd end]
+	}
+    }
+
+    # This always begins with "/" if $url is a valid absolute file:// URL.
+    set parts(path) $url
+
+    return [array get parts]
+}
+
+proc ::uri::JoinFile args {
+    variable Quirks
+    array set components {
+	host {} port {} path {}
+    }
+    array set components $args
+
+    if {    $Quirks(HostAsDriveLetter)
+	 && ($::tcl_platform(platform) == "windows")
+    } {
+	# This misfeature is kept for compatibility with legacy code.
+	if {[string length $components(host)]} {
+	    return file://$components(host):$components(path)
+	} else {
+	    return file://$components(path)
+	}
+    } else {
+        # Botch to accept certain invalid arguments instead of raising an error.
+	if {[string index $components(path) 0] != "/"} {
+	    # The path argument is invalid: it must begin with "/" (an empty
+	    # path is not allowed for the scheme "file", RFC 1738 Sec. 5).
+	    # This botch allows the command nevertheless to return a valid URI.
+	    set components(path) "/$components(path)"
+	} else {
+	}
+
+	return file://$components(host)$components(path)
+    }
+}
+
+proc ::uri::SplitMailto {url} {
+    # @c Splits the given mailto-<a url> into its constituents.
+    # @a url: The url to split, without! scheme specification.
+    # @r List containing the constituents, suitable for 'array set'.
+
+    if {[string match "*@*" $url]} {
+	set url [::split $url @]
+	return [list user [lindex $url 0] host [lindex $url 1]]
+    } else {
+	return [list user $url]
+    }
+}
+
+proc ::uri::JoinMailto args {
+    array set components {
+	user {} host {}
+    }
+    array set components $args
+
+    return mailto:$components(user)@$components(host)
+}
+
+proc ::uri::SplitNews {url} {
+    if { [string first @ $url] >= 0 } {
+	return [list message-id $url]
+    } else {
+	return [list newsgroup-name $url]
+    }
+}
+
+proc ::uri::JoinNews args {
+    array set components {
+	message-id {} newsgroup-name {}
+    }
+    array set components $args
+    return news:$components(message-id)$components(newsgroup-name)
+}
+
+proc ::uri::SplitLdaps {url} {
+    ::uri::SplitLdap $url
+}
+
+proc ::uri::SplitLdap {url} {
+    # @c Splits the given Ldap-<a url> into its constituents.
+    # @a url: The url to split, without! scheme specification.
+    # @r List containing the constituents, suitable for 'array set'.
+
+    # general syntax:
+    # //<host>:<port>/<dn>?<attrs>?<scope>?<filter>?<extensions>
+    #
+    #   where <host> and <port> are as described in Section 5 of RFC 1738.
+    #   No user name or password is allowed.
+    #   If omitted, the port defaults to 389 for ldap, 636 for ldaps
+    #   <dn> is the base DN for the search
+    #   <attrs> is a comma separated list of attributes description
+    #   <scope> is either "base", "one" or "sub".
+    #   <filter> is a RFC 2254 filter specification
+    #   <extensions> are documented in RFC 2255
+    #
+
+    array set parts {host {} port {} dn {} attrs {} scope {} filter {} extensions {}}
+
+    #          host        port           dn          attrs       scope               filter     extns
+    set re {//((?:[^:?/]+)|(?:\[[^\]]*\]))(?::([0-9]+))?(?:/([^?]+)(?:\?([^?]*)(?:\?(base|one|sub)?(?:\?([^?]*)(?:\?(.*))?)?)?)?)?}
+
+    if {! [regexp $re $url match parts(host) parts(port) \
+		parts(dn) parts(attrs) parts(scope) parts(filter) \
+		parts(extensions)]} then {
+	return -code error "unable to match URL \"$url\""
+    }
+
+    set parts(attrs) [::split $parts(attrs) ","]
+
+    return [array get parts]
+}
+
+proc ::uri::JoinLdap {args} {
+    return [eval [linsert $args 0 ::uri::JoinLdapInner ldap 389]]
+}
+
+proc ::uri::JoinLdaps {args} {
+    return [eval [linsert $args 0 ::uri::JoinLdapInner ldaps 636]]
+}
+
+proc ::uri::JoinLdapInner {scheme defport args} {
+    array set components {host {} port {} dn {} attrs {} scope {} filter {} extensions {}}
+    set       components(port) $defport
+    array set components $args
+
+    set port {}
+    if {[string length $components(port)] && $components(port) != $defport} {
+	set port :$components(port)
+    }
+
+    set url "$scheme://$components(host)$port"
+
+    set components(attrs) [::join $components(attrs) ","]
+
+    set s ""
+    foreach c {dn attrs scope filter extensions} {
+	if {[string equal $c "dn"]} then {
+	    append s "/"
+	} else {
+	    append s "?"
+	}
+	if {! [string equal $components($c) ""]} then {
+	    append url "${s}$components($c)"
+	    set s ""
+	}
+    }
+
+    return $url
+}
+
+proc ::uri::ComposeUPHP {defport args} {
+    # user:pwd@host:port
+
+    array set components {
+	user {} pwd {} host {} port {}
+    }
+    set       components(port) $defport
+    array set components $args
+
+    set userPwd {}
+    if {[string length $components(user)] || [string length $components(pwd)]} {
+	set userPwd $components(user)[expr {[string length $components(pwd)] ? ":$components(pwd)" : {}}]@
+    }
+
+    set port {}
+    if {[string length $components(port)] && $components(port) != $defport} {
+	set port :$components(port)
+    }
+
+    return ${userPwd}$components(host)${port}
+}
+
+proc ::uri::GetUPHP {urlvar} {
+    # @c Parse user, password host and port out of the url stored in
+    # @c variable <a urlvar>.
+    # @d Side effect: The extracted information is removed from the given url.
+    # @r List containing the extracted information in a format suitable for
+    # @r 'array set'.
+    # @a urlvar: Name of the variable containing the url to parse.
+
+    upvar \#0 [namespace current]::basic::user		user
+    upvar \#0 [namespace current]::basic::password	password
+    upvar \#0 [namespace current]::basic::hostspec	hostspec
+    upvar \#0 [namespace current]::basic::port		port
+
+    upvar $urlvar url
+    set url_save $url
+
+    array set parts {user {} pwd {} host {} port {}}
+
+    # syntax
+    # "//" [ <user> [":" <password> ] "@"] <host> [":" <port>] "/"
+    # "//" already cut off by caller
+
+    set upPattern "^(${user})(:(${password}))?@"
+
+    if {[regexp -indices -- $upPattern $url match theUser c d thePassword]} {
+	set fu	[lindex $theUser 0]
+	set tu	[lindex $theUser 1]
+
+	set fp	[lindex $thePassword 0]
+	set tp	[lindex $thePassword 1]
+
+	set parts(user)	[string range $url $fu $tu]
+	set parts(pwd)	[string range $url $fp $tp]
+
+	set  matchEnd   [lindex $match 1]
+	incr matchEnd
+
+	set url	[string range $url $matchEnd end]
+    }
+
+    set hpPattern "^($hostspec)(:($port))?"
+
+    if {[regexp -indices -- $hpPattern $url match theHost c d e f g h thePort]} {
+	set fh	[lindex $theHost 0]
+	set th	[lindex $theHost 1]
+
+	set fp	[lindex $thePort 0]
+	set tp	[lindex $thePort 1]
+
+	set parts(host)	[string range $url $fh $th]
+	set parts(port)	[string range $url $fp $tp]
+
+	set  matchEnd   [lindex $match 1]
+	incr matchEnd
+
+	set url	[string range $url $matchEnd end]
+    }
+    
+    if {(![string match /* $url]) && ($url ne {})} {
+	error [list {invalid url} $url $url_save]
+    }
+
+    return [array get parts]
+}
+
+# ::uri::resolve --
+#
+#	Resolve an arbitrary URL, given a base URL
+#
+# This code depends on the ability of uri::split to process relative URIs.
+# N.B. http(s): and ftp: path does not begin with "/" and may be empty.
+# The file: path (unix or win) always begins "/", even if a host is specified.
+#
+# RFC 3986 Sec. 5.2 defines how URI relative resolution should proceed.
+# This command is a "strict parser" in the sense of Sec. 5.2.2: it does not
+# allow a relative URI such as "http:foo/bar.html".  See also the last example
+# in Sec. 5.4.2 and uri-rfc2396.test test uri-rfc2396-11.19.
+#
+# Arguments:
+#	base	base URL (absolute)
+#	url	arbitrary URL
+#
+# Results:
+#	Returns a URL
+
+proc ::uri::resolve {base url} {
+    if {[isrelative $url]} {
+	set canon 1
+	array set baseparts [split $base]
+
+	switch -- $baseparts(scheme) {
+	    http -
+	    https -
+	    ftp -
+	    file {
+		set changed 0
+		array set relparts [split $baseparts(scheme):$url]
+		if {[array names relparts path] != {path}} {
+		    set relparts(path) {}
+		}
+		if { [string match /* $url] } {
+		    set baseparts(path)  $relparts(path)
+		    if {    [info exists baseparts(pbare)]
+		         && [info exists relparts(pbare)]
+		    } {
+			# This test and action are sufficient to make
+			# uri::resolve work for all schemes and quirk options.
+			set baseparts(pbare) $relparts(pbare)
+		    }
+		    catch {
+			if {$relparts(host) != ""} {
+			    # RFC 3986 section 4.2 and 5.2.2.
+			    # url has no scheme, but has authority
+			    # ("UPHP" or User,Password,Host,Port). Use that
+			    # authority. Do not transfer credentials or port
+			    # number from the base authority.
+			    set baseparts(host) $relparts(host)
+			    set baseparts(user) {}
+			    set baseparts(pwd)  {}
+			    set baseparts(port) {}
+			    set baseparts(user) $relparts(user)
+			    set baseparts(pwd)  $relparts(pwd)
+			    set baseparts(port) $relparts(port)
+			}
+		    }
+		    set changed 1
+		} elseif {    [string match */ $baseparts(path)]
+			   && ([string length $relparts(path)] > 0)
+		} {
+		    set baseparts(path) "$baseparts(path)$relparts(path)"
+		    set changed 1
+		} elseif { [string length $relparts(path)] > 0 } {
+		    set path [lreplace [::split $baseparts(path) /] end end]
+		    set baseparts(path) "[::join $path /]/$relparts(path)"
+		    set changed 1
+		} else {
+		    # Do not overwrite baseparts(path).  In this case,
+		    # RFC 3986 Sec. 5.2.2 does not demand canonicalization.
+		    # FIXME check whether the RFC assumes the base URI is
+		    # already canonical.
+		    set canon 0
+		}
+	    }
+	    default {
+		return -code error "unable to resolve relative URL \"$url\""
+	    }
+	}
+
+	# query and fragment are defined for http, https; not for file, ftp
+	# Fragment is useful in HTML documents that are accessed by file or ftp,
+	# but this is not supported by the RFCs.
+	switch -- $baseparts(scheme) {
+	    http -
+	    https {
+		if {[array names relparts query] != {query}} {
+		    set relparts(query) {}
+		}
+		if {[array names relparts fragment] != {fragment}} {
+		    set relparts(fragment) {}
+		}
+
+		if {$changed || ($relparts(query) != {})} {
+		    set baseparts(query) $relparts(query)
+		    set changed 1
+		} else {
+		    # Keep base query.
+		    # FIXME error if url has empty query "?".
+		    # FIXME (in split/join) empty query "?".
+		}
+
+		# RFC 3986 section 5.2.2 requires that the base fragment
+		# is always discarded.
+		set baseparts(fragment) $relparts(fragment)
+		# FIXME error if url has empty fragment "#".
+		# FIXME (in split/join) empty fragment "#".
+	    }
+	    ftp -
+	    file -
+	    default {
+	    }
+	}
+
+	set url [eval [linsert [array get baseparts] 0 join]]
+	if {$canon} {
+	    # RFC 3986 section 5.2.2 requires us to canonicalize the path.
+	    set url [canonicalize $url]
+	} else {
+	}
+	return $url
+    } else {
+	# RFC 3986 section 5.2.2 requires us to canonicalize the path.
+	set url [canonicalize $url]
+	return $url
+    }
+}
+
+# ::uri::isrelative --
+#
+#	Determines whether a URL is absolute or relative
+#
+# Arguments:
+#	url	URL to check
+#
+# Results:
+#	Returns 1 if the URL is relative, 0 otherwise
+
+proc ::uri::isrelative url {
+    return [expr {![regexp -- {^[A-Za-z][A-Za-z0-9+.-]*:} $url]}]
+}
+
+# ::uri::geturl --
+#
+#	Fetch the data from an arbitrary URL.
+#
+#	This package provides a handler for the file:
+#	scheme, since this conflicts with the file command.
+#
+# Arguments:
+#	url	address of data resource
+#	args	configuration options
+#
+# Results:
+#	Depends on scheme
+
+proc ::uri::geturl {url args} {
+    array set urlparts [split $url]
+
+    switch -- $urlparts(scheme) {
+	file {
+	    return [eval [linsert $args 0 file_geturl $url]]
+	}
+	default {
+	    # Load a geturl package for the scheme first and only if
+	    # that fails the scheme package itself. This prevents
+	    # cyclic dependencies between packages.
+	    if {[catch {package require $urlparts(scheme)::geturl}]} {
+		package require $urlparts(scheme)
+	    }
+	    return [eval [linsert $args 0 $urlparts(scheme)::geturl $url]]
+	}
+    }
+}
+
+# ::uri::file_geturl --
+#
+#	geturl implementation for file: scheme
+#
+# TODO:
+#	This is an initial, basic implementation.
+#	Eventually want to support all options for geturl.
+#
+# Arguments:
+#	url	URL to fetch
+#	args	configuration options
+#
+# Results:
+#	Returns data from file
+
+proc ::uri::file_geturl {url args} {
+    variable file:counter
+
+    set var [namespace current]::file[incr file:counter]
+    upvar #0 $var state
+    array set state {data {}}
+
+    array set parts [split $url]
+
+    set ch [open $parts(path)]
+    # Could determine text/binary from file extension,
+    # except on Macintosh
+    # fconfigure $ch -translation binary
+    set state(data) [read $ch]
+    close $ch
+
+    return $var
+}
+
+# ::uri::join --
+#
+#	Format a URL
+#
+# Arguments:
+#	args	components, key-value format
+#
+# Results:
+#	A URL
+
+proc ::uri::join args {
+    array set components $args
+
+    return [eval [linsert $args 0 Join[string totitle $components(scheme)]]]
+}
+
+# ::uri::canonicalize --
+#
+#	Canonicalize a URL
+#
+# Acknowledgements:
+#	Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#	Keith Nash <kjnash@users.sourceforge.net>
+#
+# Arguments:
+#	uri	URI (which contains a path component)
+#
+# Results:
+#	The URI with the filename path in its canonical form.
+#	This is not full URI "normalization" which may require further
+#	processing.
+
+proc ::uri::canonicalize uri {
+    # Make uri canonical with respect to dots (path changing commands)
+    #
+    # Remove single dots (.)  => pwd not changing
+    # Remove double dots (..) => gobble previous segment of path
+    #
+    # Fixes for this command:
+    #
+    # * Ignore any url which cannot be split into components by this
+    #   module. Just assume that such urls do not have a path to
+    #   canonicalize.
+    #
+    # * Ignore any url which could be split into components, but does
+    #   not have a path component.
+    #
+    # In the text above 'ignore' means
+    # 'return the url unchanged to the caller'.
+
+    if {[catch {array set u [::uri::split $uri]}]} {
+	return $uri
+    }
+    if {![info exists u(path)]} {
+	return $uri
+    }
+
+    # RemoveDotSegments works perfectly well on paths without a leading "/", but
+    # removing and re-adding the quirks ensures RFC 3986 conformance in a few
+    # corner cases.
+    RemoveQuirk3986 u
+    set u(path) [RemoveDotSegments $u(path)]
+    AddQuirk3986 u
+
+    set uri [eval [linsert [array get u] 0 ::uri::join]]
+
+    return $uri
+}
+
+
+# ::uri::RemoveDotSegments --
+#
+#	Remove any segments "." and ".." from a URI path.
+#	Optionally remove empty segments {}.
+#
+#	Intended to implement the "remove_dot_segments" routine
+#	defined in RFC 3986 Sec. 5.2.4.
+#
+# Acknowledgements:
+#	Andreas Kupries <andreas_kupries@users.sourceforge.net>
+#	Keith Nash <kjnash@users.sourceforge.net>
+#
+# Arguments:
+#	path	path component of a URI
+#
+# Results:
+#	The URI path in its canonical form.
+
+proc ::uri::RemoveDotSegments path {
+    variable Quirks
+
+    set oldList [::split $path /]
+
+    if {[lindex $oldList 0] == {}} {
+	set lead 1
+    } else {
+	set lead 0
+    }
+
+    set end [llength $oldList]
+    incr end -1
+
+    # i - index of element seg in oldList
+    # j - index of last element written to newList
+    set i 0
+    set j -1
+    set newList {}
+    foreach seg $oldList {
+	if {    $Quirks(RemoveDoubleSlashes)
+	     && ($seg == {}) && ($i != 0) && ($i != $end)
+	} {
+	    # Throw away this empty segment.
+	    # This merges adjacent "/".
+	    # If the first or last segment is empty, it is handled at "else".
+	    # Other empty segments are also handled at "else" if this quirk has
+	    # not been requested.
+	} elseif {($seg == {.}) && ($i == $end)} {
+	    # Replace "." with {} to keep a trailing "/" in path.
+	    lappend newList {}
+	    incr j
+	} elseif {$seg == {.}} {
+	    # Throw away this "." segment.
+	} elseif {($seg == {..}) && ($j > $lead - 1) && ($i == $end)} {
+	    # Remove the element previously added to newList, and
+	    # replace it with {} to keep a trailing "/" in path.
+	    set newList [lreplace $newList $j $j {}]
+	} elseif {($seg == {..}) && ($j > $lead - 1)} {
+	    # Remove the element previously added to newList.
+	    set newList [lreplace $newList $j $j]
+	    incr j -1
+	} elseif {($seg == {..}) && ($i == $end)} {
+	    # Can't go any deeper in newList, but this path needs a
+	    # leading "/".
+	    lappend newList {}
+	    incr j
+	} elseif {$seg == {..}} {
+	    # Can't go any deeper in newList.
+	} else {
+	    # A "normal" path segment!
+	    lappend newList $seg
+	    incr j
+	}
+
+	incr i
+    }
+
+    return [::join $newList /]
+}
+
+
+# ::uri::RemoveQuirk3986
+#
+#	Work on an array produced by uri::split. Read the path and pbare
+#	elements, and convert the path element to RFC 3986 compliance from
+#	NoInitialSlash and NoExtraKeys quirks modes IF the caller has requested
+#	these quirks AND they are used by the array's scheme.
+#
+#	Full RFC 3986 compliance is not possible if the caller has set both the
+#	quirks NoInitialSlash and NoExtraKeys.  This mode is offered for
+#	backward compatibility.  See documentation uri(n).
+#
+# Arguments:
+#	arrName	    Name of array in the caller's stack frame that holds the
+#		    results of uri::split.
+# Results:
+#	No return value.  The array is modified as a side effect.
+
+proc ::uri::RemoveQuirk3986 {arrName} {
+    variable Quirks
+    upvar 1 $arrName u
+
+    if {    $Quirks(NoInitialSlash)
+	 && ([lsearch {http https ftp} $u(scheme)] != -1)
+    } {
+        if {$Quirks(NoExtraKeys)} {
+	    array set u {pbare 0}
+	} else {
+	    # Keep existing value of u(pbare).
+	}
+
+	set PathFirst [string index $u(path) 0]
+	if {($PathFirst != {}) && ($PathFirst != {/})} {
+	    # If the quirk is set and used, then the leading "/" of the path has
+	    # been stripped.  Put it back.
+	    set u(path) "/$u(path)"
+	} elseif {($PathFirst != {}) && ($PathFirst == {/})} {
+	    # In principle we should prepend "/" to u(path) here too, but this
+	    # leads to perverse results, e.g. uri::join with path "/" becomes
+	    # path "//".
+	} elseif {($PathFirst == {}) && (!$u(pbare))} {
+	    # This is how {} and / are distinguished for the value of the
+	    # 3986-defined path, when the quirk is set and used, i.e. when the
+	    # leading "/" of the path has been stripped.
+	    set u(path) "/"
+	} else {
+	    # Leave u(path) unchanged.
+	}
+    }
+
+    if {$Quirks(NoInitialSlash) && (!$Quirks(NoExtraKeys))} {
+	# pbare is required
+    } else {
+	array unset u pbare
+    }
+
+    return
+}
+
+# ::uri::AddQuirk3986
+#
+#	Work on an array produced by uri::split. Read the path element, and
+#	convert the path and pbare elements from RFC 3986 compliance to
+#	NoInitialSlash and NoExtraKeys quirks modes IF the caller has requested
+#	these quirks AND they are used by the array's scheme.
+#
+# Arguments:
+#	arrName	    Name of array in the caller's stack frame that holds the
+#		    results of uri::split.
+# Results:
+#	No return value.  The array is modified as a side effect.
+
+proc ::uri::AddQuirk3986 arrName {
+    variable Quirks
+    upvar 1 $arrName u
+
+    array unset u pbare
+
+    if {    $Quirks(NoInitialSlash)
+	 && ([lsearch {http https ftp} $u(scheme)] != -1)
+    } {
+	if {$Quirks(NoExtraKeys)} {
+	    # u(pbare) is refused
+	} elseif {($u(path) == {})} {
+	    set u(pbare) 1
+	} else {
+	    set u(pbare) 0
+	}
+	# In principle we should remove only the first "/", not all
+	# of them, but it in this quirk regime it is cleaner to keep the
+	# rule that the path never begins with "/".
+	set u(path) [string trimleft $u(path) /]
+    } else {
+    }
+
+    return
+}
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# regular expressions covering various url schemes
+
+# Currently known URL schemes:
+#
+# (RFC 1738)
+# ------------------------------------------------
+# scheme	basic syntax of scheme specific part
+# ------------------------------------------------
+# ftp		//<user>:<password>@<host>:<port>/<cwd1>/.../<cwdN>/<name>;type=<typecode>
+#    		//<user>:<password>@<host>:<port>/fpath;type=<typecode>
+#
+# http		//<host>:<port>/<hpath>?<searchpart>
+#
+# gopher	//<host>:<port>/<gophertype><selector>
+#				<gophertype><selector>%09<search>
+#		<gophertype><selector>%09<search>%09<gopher+_string>
+#
+# mailto	<rfc822-addr-spec>
+# news		<newsgroup-name>
+#		<message-id>
+# nntp		//<host>:<port>/<newsgroup-name>/<article-number>
+# telnet	//<user>:<password>@<host>:<port>/
+# wais		//<host>:<port>/<database>
+#		//<host>:<port>/<database>?<search>
+#		//<host>:<port>/<database>/<wtype>/<wpath>
+# file		//<host>/<fpath>
+# prospero	//<host>:<port>/<hsoname>;<field>=<value>
+# ------------------------------------------------
+#
+# (RFC 2111)
+# ------------------------------------------------
+# scheme	basic syntax of scheme specific part
+# ------------------------------------------------
+# mid	message-id
+#		message-id/content-id
+# cid	content-id
+# ------------------------------------------------
+#
+# (RFC 2255)
+# ------------------------------------------------
+# scheme	basic syntax of scheme specific part
+# ------------------------------------------------
+# ldap		//<host>:<port>/<dn>?<attrs>?<scope>?<filter>?<extensions>
+# ------------------------------------------------
+
+
+# ------------------------------------------------------------------------------
+#     IMPORTANT WARNINGS
+# ------------------------------------------------------------------------------
+# (1) THE PATTERNS DEFINED BELOW (with one exception) ARE NOT USED FOR PARSING
+#     URLs BY ANY OF THIS PACKAGE'S COMMANDS.
+# (2) THAT EXCEPTION IS THE VARIABLE ::uri::ftp::typepart
+# (3) AS LONG AS THAT VARIABLE IS ASSIGNED THE CORRECT VALUE, ALL THE
+#     uri::register CALLS CAN BE DELETED WITHOUT AFFECTING THE uri::* COMMANDS.
+# (2) REGISTRATION OF A SCHEME DOES NOT IMPLEMENT COMMANDS FOR THAT SCHEME.
+# (3) REGISTRATION OF A SCHEME IS NOT NECESSARY TO IMPLEMENT COMMANDS FOR THAT
+#     SCHEME.
+#     Instead:
+# (4) THE PATTERNS ARE FOR REFERENCE, AND CAN BE ACCESSED VIA THESE NAMESPACE
+#     VARIABLES, OR IN SOME CASES VIA VARIABLES MAINTAINED BY uri::register.
+# (5) THE VARIABLES schemepart AND url ARE MENTIONED IN THE DOCUMENTATION.
+# (6) UNDOCUMENTED VARIABLES MIGHT BE ACCESSED BY THIRD-PARTY CODE.
+# (7) THEREFORE EVERYTHING IS RETAINED FOR BACKWARD COMPATIBILITY.
+# ------------------------------------------------------------------------------
+
+# FTP
+uri::register ftp {
+    # Please read the warnings above.
+    variable escape [set [namespace parent [namespace current]]::basic::escape]
+    variable login  [set [namespace parent [namespace current]]::basic::login]
+
+    variable	charN	{[a-zA-Z0-9$_.+!*'(,)?:@&=-]}
+    variable	char	"(${charN}|${escape})"
+    variable	segment	"${char}*"
+    variable	path	"${segment}(/${segment})*"
+
+    variable	type		{[AaDdIi]}
+    variable	typepart	";type=(${type})"
+    # Used elsewhere: typepart
+
+    variable	schemepart	\
+		    "//${login}(/${path}(${typepart})?)?"
+
+    variable	url		"ftp:${schemepart}"
+}
+
+# FILE
+uri::register file {
+    # Please read the warnings above.
+    variable	host [set [namespace parent [namespace current]]::basic::host]
+    variable	path [set [namespace parent [namespace current]]::ftp::path]
+
+    variable	schemepart	"//(${host}|localhost)?/${path}"
+    variable	url		"file:${schemepart}"
+}
+
+# HTTP
+uri::register {http https} {
+    # Please read the warnings above.
+    variable	escape \
+        [set [namespace parent [namespace current]]::basic::escape]
+    variable	hostOrPort	\
+        [set [namespace parent [namespace current]]::basic::hostOrPort]
+
+    variable	charN		{[a-zA-Z0-9$_.+!*'(,);:@&=-]}
+    variable	char		"($charN|${escape})"
+    variable	segment		"${char}*"
+
+    variable	path		"${segment}(/${segment})*"
+    variable	search		$segment
+    variable	schemepart	\
+	    "//${hostOrPort}(/${path}(\\?${search})?)?"
+
+    variable	url		"http:${schemepart}"
+}
+
+# GOPHER
+uri::register gopher {
+    # Please read the warnings above.
+    variable	xChar \
+        [set [namespace parent [namespace current]]::basic::xChar]
+    variable	hostOrPort \
+        [set [namespace parent [namespace current]]::basic::hostOrPort]
+    variable	search \
+        [set [namespace parent [namespace current]]::http::search]
+
+    variable	type		$xChar
+    variable	selector	"$xChar*"
+    variable	string		$selector
+    variable	schemepart	\
+	    "//${hostOrPort}(/(${type}(${selector}(%09${search}(%09${string})?)?)?)?)?"
+    variable	url		"gopher:${schemepart}"
+}
+
+# MAILTO
+uri::register mailto {
+    # Please read the warnings above.
+    variable xChar [set [namespace parent [namespace current]]::basic::xChar]
+    variable host  [set [namespace parent [namespace current]]::basic::host]
+
+    variable schemepart	"$xChar+(@${host})?"
+    variable url	"mailto:${schemepart}"
+}
+
+# NEWS
+uri::register news {
+    # Please read the warnings above.
+    variable escape [set [namespace parent [namespace current]]::basic::escape]
+    variable alpha  [set [namespace parent [namespace current]]::basic::alpha]
+    variable host   [set [namespace parent [namespace current]]::basic::host]
+
+    variable	aCharN		{[a-zA-Z0-9$_.+!*'(,);/?:&=-]}
+    variable	aChar		"($aCharN|${escape})"
+    variable	gChar		{[a-zA-Z0-9$_.+-]}
+    variable	newsgroup-name	"${alpha}${gChar}*"
+    variable	message-id	"${aChar}+@${host}"
+    variable	schemepart	"\\*|${newsgroup-name}|${message-id}"
+    variable	url		"news:${schemepart}"
+}
+
+# WAIS
+uri::register wais {
+    # Please read the warnings above.
+    variable	uChar \
+        [set [namespace parent [namespace current]]::basic::xChar]
+    variable	hostOrPort \
+        [set [namespace parent [namespace current]]::basic::hostOrPort]
+    variable	search \
+        [set [namespace parent [namespace current]]::http::search]
+
+    variable	db		"${uChar}*"
+    variable	type		"${uChar}*"
+    variable	path		"${uChar}*"
+
+    variable	database	"//${hostOrPort}/${db}"
+    variable	index		"//${hostOrPort}/${db}\\?${search}"
+    variable	doc		"//${hostOrPort}/${db}/${type}/${path}"
+
+    #variable	schemepart	"${doc}|${index}|${database}"
+
+    variable	schemepart \
+	    "//${hostOrPort}/${db}((\\?${search})|(/${type}/${path}))?"
+
+    variable	url		"wais:${schemepart}"
+}
+
+# PROSPERO
+uri::register prospero {
+    # Please read the warnings above.
+    variable	escape \
+        [set [namespace parent [namespace current]]::basic::escape]
+    variable	hostOrPort \
+        [set [namespace parent [namespace current]]::basic::hostOrPort]
+    variable	path \
+        [set [namespace parent [namespace current]]::ftp::path]
+
+    variable	charN		{[a-zA-Z0-9$_.+!*'(,)?:@&-]}
+    variable	char		"(${charN}|$escape)"
+
+    variable	fieldname	"${char}*"
+    variable	fieldvalue	"${char}*"
+    variable	fieldspec	";${fieldname}=${fieldvalue}"
+
+    variable	schemepart	"//${hostOrPort}/${path}(${fieldspec})*"
+    variable	url		"prospero:$schemepart"
+}
+
+# LDAP
+uri::register {ldap ldaps} {
+    # Please read the warnings above.
+    variable	hostOrPort \
+        [set [namespace parent [namespace current]]::basic::hostOrPort]
+
+    # very crude parsing
+    variable	dn		{[^?]*}
+    variable	attrs		{[^?]*}
+    variable	scope		"base|one|sub"
+    variable	filter		{[^?]*}
+    # extensions are not handled yet
+
+    variable	schemepart	"//${hostOrPort}(/${dn}(\?${attrs}(\?(${scope})(\?${filter})?)?)?)?"
+    variable	url		"ldap:$schemepart"
+}
+
+package provide uri 1.2.7
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uri/urn-scheme.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uri/urn-scheme.tcl
new file mode 100644
index 00000000..2ebcf430
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uri/urn-scheme.tcl
@@ -0,0 +1,143 @@
+# urn-scheme.tcl - Copyright (C) 2001 Pat Thoyts <patthoyts@users.sf.net>
+#
+# extend the uri package to deal with URN (RFC 2141)
+# see http://www.normos.org/ietf/rfc/rfc2141.txt
+#
+# Released under the tcllib license.
+#
+# $Id: urn-scheme.tcl,v 1.11 2005/09/28 04:51:24 andreas_kupries Exp $
+# -------------------------------------------------------------------------
+
+package require uri      1.1.2
+
+namespace eval ::uri {}
+namespace eval ::uri::urn {}
+
+# -------------------------------------------------------------------------
+
+# Description:
+#   Called by uri::split with a url to split into its parts.
+#
+proc ::uri::SplitUrn {uri} {
+    #@c Split the given uri into then URN component parts
+    #@a uri: the URI to split without it's scheme part.
+    #@r List of the component parts suitable for 'array set'
+
+    upvar \#0 [namespace current]::urn::URNpart pattern
+    array set parts {nid {} nss {}}
+    if {[regexp -- ^$pattern $uri -> parts(nid) parts(nss)]} {
+        return [array get parts]
+    } else {
+        error "invalid urn syntax: \"$uri\" could not be parsed"
+    }
+}
+
+
+# -------------------------------------------------------------------------
+
+proc ::uri::JoinUrn args {
+    #@c Join the parts of a URN scheme URI
+    #@a list of nid value nss value
+    #@r a valid string representation for your URI
+    variable urn::NIDpart
+
+    array set parts [list nid {} nss {}]
+    array set parts $args
+    if {! [regexp -- ^$NIDpart$ $parts(nid)]} {
+        error "invalid urn: nid is invalid"
+    }
+    set url "urn:$parts(nid):[urn::quote $parts(nss)]"
+    return $url
+}
+
+# -------------------------------------------------------------------------
+
+# Quote the disallowed characters according to the RFC for URN scheme.
+# ref: RFC2141 sec2.2
+proc ::uri::urn::quote {url} {
+    variable trans
+    
+    set ndx 0
+    set result ""
+    while {[regexp -indices -- "\[^$trans\]" $url r]} {
+        set ndx [lindex $r 0]
+
+        set ch [string index $url $ndx]
+        if {$ch eq "\0"} {
+            error "invalid character: character $chr is not allowed"
+        }
+
+        # Decode into UTF-8 bytes.
+        set rep {}
+        foreach ch [split [encoding convertto utf-8 $ch] {}] {
+            scan $ch %c chr
+            append rep %[format %.2X $chr]
+        }
+        
+        incr ndx -1
+        append result [string range $url 0 $ndx] $rep
+        incr ndx 2
+        set url [string range $url $ndx end]
+    }
+    append result $url
+    return $result
+}
+
+# -------------------------------------------------------------------------
+# Perform the reverse of urn::quote.
+
+if { [package vcompare [package provide Tcl] 8.3] < 0 } {
+    # Before Tcl 8.3 we do not have 'regexp -start'. We simulate it by
+    # using 'string range' and adjusting the match results.
+
+    proc ::uri::urn::unquote {url} {
+        set result ""
+        set start 0
+        while {[regexp -indices {%[0-9a-fA-F]{2}} [string range $url $start end] match]} {
+            foreach {first last} $match break
+            incr first $start ; # Make the indices relative to the true string.
+            incr last  $start ; # I.e. undo the effect of the 'string range' on match results.
+            append result [string range $url $start [expr {$first - 1}]]
+            append result [format %c 0x[string range $url [incr first] $last]]
+            set start [incr last]
+        }
+        append result [string range $url $start end]
+        # Recode the array of utf-8 bytes to the proper internal rep.
+        return [encoding convertfrom utf-8 $result]
+    }
+} else {
+    proc ::uri::urn::unquote {url} {
+        set result ""
+        set start 0
+        while {[regexp -start $start -indices {%[0-9a-fA-F]{2}} $url match]} {
+            foreach {first last} $match break
+            append result [string range $url $start [expr {$first - 1}]]
+            append result [format %c 0x[string range $url [incr first] $last]]
+            set start [incr last]
+        }
+        append result [string range $url $start end]
+        # Recode the array of utf-8 bytes to the proper internal rep.
+        return [encoding convertfrom utf-8 $result]
+    }
+}
+
+# -------------------------------------------------------------------------
+
+::uri::register {urn URN} {
+	variable NIDpart {[a-zA-Z0-9][a-zA-Z0-9-]{0,31}}
+        variable esc {%[0-9a-fA-F]{2}}
+        variable trans {a-zA-Z0-9$_.+!*'(,):=@;-}
+        variable NSSpart "($esc|\[$trans\])+"
+        variable URNpart "($NIDpart):($NSSpart)"
+        variable schemepart $URNpart
+	variable url "urn:$NIDpart:$NSSpart"
+}
+
+# -------------------------------------------------------------------------
+
+package provide uri::urn 1.0.3
+
+# -------------------------------------------------------------------------
+# Local Variables:
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uuid/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uuid/pkgIndex.tcl
new file mode 100644
index 00000000..e10698ab
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uuid/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded uuid 1.0.7 [list source [file join $dir uuid.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uuid/uuid.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uuid/uuid.tcl
new file mode 100644
index 00000000..fbd43f3d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/uuid/uuid.tcl
@@ -0,0 +1,245 @@
+# uuid.tcl - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# UUIDs are 128 bit values that attempt to be unique in time and space.
+#
+# Reference:
+#   http://www.opengroup.org/dce/info/draft-leach-uuids-guids-01.txt
+#
+# uuid: scheme:
+# http://www.globecom.net/ietf/draft/draft-kindel-uuid-uri-00.html
+#
+# Usage: uuid::uuid generate
+#        uuid::uuid equal $idA $idB
+
+package require Tcl 8.5
+
+namespace eval uuid {
+    variable accel
+    array set accel {critcl 0}
+
+    namespace export uuid
+
+    variable uid
+    if {![info exists uid]} {
+        set uid 1
+    }
+
+    proc K {a b} {set a}
+}
+
+###
+# Optimization
+# Caches machine info after the first pass
+###
+
+proc ::uuid::generate_tcl_machinfo {} {
+  variable machinfo
+  if {[info exists machinfo]} {
+    return $machinfo
+  }
+  lappend machinfo [clock seconds]; # timestamp
+  lappend machinfo [clock clicks];  # system incrementing counter
+  lappend machinfo [info hostname]; # spatial unique id (poor)
+  lappend machinfo [pid];           # additional entropy
+  lappend machinfo [array get ::tcl_platform]
+
+  ###
+  # If we have /dev/urandom just stream 128 bits from that
+  ###
+  if {[file exists /dev/urandom]} {
+    set fin [open /dev/urandom r]
+    binary scan [read $fin 128] H* machinfo
+    close $fin
+  } elseif {[catch {package require nettool}]} {
+    # More spatial information -- better than hostname.
+    # bug 1150714: opening a server socket may raise a warning messagebox
+    #   with WinXP firewall, using ipconfig will return all IP addresses
+    #   including ipv6 ones if available. ipconfig is OK on win98+
+    if {[string equal $::tcl_platform(platform) "windows"]} {
+      catch {exec ipconfig} config
+      lappend machinfo $config
+    } else {
+      catch {
+          set s [socket -server void -myaddr [info hostname] 0]
+          K [fconfigure $s -sockname] [close $s]
+      } r
+      lappend machinfo $r
+    }
+
+    if {[package provide Tk] != {}} {
+      lappend machinfo [winfo pointerxy .]
+      lappend machinfo [winfo id .]
+    }
+  } else {
+    ###
+    # If the nettool package works on this platform
+    # use the stream of hardware ids from it
+    ###
+    lappend machinfo {*}[::nettool::hwid_list]
+  }
+  return $machinfo
+}
+
+# Generates a binary UUID as per the draft spec. We generate a pseudo-random
+# type uuid (type 4). See section 3.4
+#
+proc ::uuid::generate_tcl {} {
+    package require md5 2
+    variable uid
+
+    set tok [md5::MD5Init]
+    md5::MD5Update $tok [incr uid];      # package incrementing counter
+    foreach string [generate_tcl_machinfo] {
+      md5::MD5Update $tok $string
+    }
+    set r [md5::MD5Final $tok]
+    binary scan $r c* r
+
+    # 3.4: set uuid versioning fields
+    lset r 8 [expr {([lindex $r 8] & 0x3F) | 0x80}]
+    lset r 6 [expr {([lindex $r 6] & 0x0F) | 0x40}]
+
+    return [binary format c* $r]
+}
+
+if {[string equal $tcl_platform(platform) "windows"]
+        && [package provide critcl] != {}} {
+    namespace eval uuid {
+        critcl::ccode {
+            #define WIN32_LEAN_AND_MEAN
+            #define STRICT
+            #include <windows.h>
+            #include <ole2.h>
+            typedef long (__stdcall *LPFNUUIDCREATE)(UUID *);
+            typedef const unsigned char cu_char;
+        }
+        critcl::cproc generate_c {Tcl_Interp* interp} ok {
+            HRESULT hr = S_OK;
+            int r = TCL_OK;
+            UUID uuid = {0};
+            HMODULE hLib;
+            LPFNUUIDCREATE lpfnUuidCreate = NULL;
+            hLib = LoadLibraryA(("rpcrt4.dll"));
+            if (hLib)
+                lpfnUuidCreate = (LPFNUUIDCREATE)
+                    GetProcAddress(hLib, "UuidCreate");
+            if (lpfnUuidCreate) {
+                Tcl_Obj *obj;
+                lpfnUuidCreate(&uuid);
+                obj = Tcl_NewByteArrayObj((cu_char *)&uuid, sizeof(uuid));
+                Tcl_SetObjResult(interp, obj);
+            } else {
+                Tcl_SetResult(interp, "error: failed to create a guid",
+                              TCL_STATIC);
+                r = TCL_ERROR;
+            }
+            return r;
+        }
+    }
+}
+
+# Convert a binary uuid into its string representation.
+#
+proc ::uuid::tostring {uuid} {
+    binary scan $uuid H* s
+    foreach {a b} {0 7 8 11 12 15 16 19 20 end} {
+        append r [string range $s $a $b] -
+    }
+    return [string tolower [string trimright $r -]]
+}
+
+# Convert a string representation of a uuid into its binary format.
+#
+proc ::uuid::fromstring {uuid} {
+    return [binary format H* [string map {- {}} $uuid]]
+}
+
+# Compare two uuids for equality.
+#
+proc ::uuid::equal {left right} {
+    set l [fromstring $left]
+    set r [fromstring $right]
+    return [string equal $l $r]
+}
+
+# Call our generate uuid implementation
+proc ::uuid::generate {} {
+    variable accel
+    if {$accel(critcl)} {
+        return [generate_c]
+    } else {
+        return [generate_tcl]
+    }
+}
+
+# uuid generate -> string rep of a new uuid
+# uuid equal uuid1 uuid2
+#
+proc uuid::uuid {cmd args} {
+    switch -exact -- $cmd {
+        generate {
+            if {[llength $args] != 0} {
+                return -code error "wrong # args:\
+                    should be \"uuid generate\""
+            }
+            return [tostring [generate]]
+        }
+        equal {
+            if {[llength $args] != 2} {
+                return -code error "wrong \# args:\
+                    should be \"uuid equal uuid1 uuid2\""
+            }
+            return [eval [linsert $args 0 equal]]
+        }
+        default {
+            return -code error "bad option \"$cmd\":\
+                must be generate or equal"
+        }
+    }
+}
+
+# -------------------------------------------------------------------------
+
+# LoadAccelerator --
+#
+#	This package can make use of a number of compiled extensions to
+#	accelerate the digest computation. This procedure manages the
+#	use of these extensions within the package. During normal usage
+#	this should not be called, but the test package manipulates the
+#	list of enabled accelerators.
+#
+proc ::uuid::LoadAccelerator {name} {
+    variable accel
+    set r 0
+    switch -exact -- $name {
+        critcl {
+            if {![catch {package require tcllibc}]} {
+                set r [expr {[info commands ::uuid::generate_c] != {}}]
+            }
+        }
+        default {
+            return -code error "invalid accelerator package:\
+                must be one of [join [array names accel] {, }]"
+        }
+    }
+    set accel($name) $r
+}
+
+# -------------------------------------------------------------------------
+
+# Try and load a compiled extension to help.
+namespace eval ::uuid {
+    variable e {}
+    foreach e {critcl} {
+        if {[LoadAccelerator $e]} break
+    }
+    unset e
+}
+
+package provide uuid 1.0.7
+
+# -------------------------------------------------------------------------
+# Local variables:
+#   mode: tcl
+#   indent-tabs-mode: nil
+# End:
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/cc_amex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/cc_amex.tcl
new file mode 100644
index 00000000..4741e23a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/cc_amex.tcl
@@ -0,0 +1,68 @@
+# # ## ### ##### ######## ############# ######################
+## Verify AMEX credit card number
+#
+## Reference
+##	http://wiki.cdyne.com/wiki/index.php?title=Credit_Card_Verification
+
+# # ## ### ##### ######## ############# ######################
+
+# The code below implements the interface of a snit validation type,
+# making it directly usable with snit's -type option in option
+# specifications.
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require valtype::luhn
+package require valtype::common
+
+# # ## ### ##### ######## ############# ######################
+## Implementation
+
+namespace eval ::valtype::creditcard::amex {
+    namespace import ::valtype::common::*
+}
+
+snit::type ::valtype::creditcard::amex {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+	if {[string length $value] != 15} {
+	    badlength {CREDITCARD AMEX} 15 "CREDITCARD AMEX number"
+	} elseif {[string range $value 0 1] ni {34 37}} {
+	    badprefix {CREDITCARD AMEX} {34 37} "CREDITCARD AMEX number"
+	}
+
+	return [valtype::luhn validate $value {CREDITCARD AMEX}]
+    }
+
+    typemethod checkdigit {value} {
+	if {[string length $value] != 14} {
+	    badlength {CREDITCARD AMEX} 14 "CREDITCARD AMEX number without checkdigit"
+	} elseif {[string range $value 0 1] ni {34 37}} {
+	    badprefix {CREDITCARD AMEX} {34 37} "CREDITCARD AMEX number without checkdigit"
+	}
+
+	return [valtype::luhn checkdigit $value {CREDITCARD AMEX}]
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide valtype::creditcard::amex 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/cc_discover.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/cc_discover.tcl
new file mode 100644
index 00000000..764a8a5a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/cc_discover.tcl
@@ -0,0 +1,70 @@
+# # ## ### ##### ######## ############# ######################
+## Verify DISCOVER credit card number
+#
+## Reference
+##	http://wiki.cdyne.com/wiki/index.php?title=Credit_Card_Verification
+
+# # ## ### ##### ######## ############# ######################
+
+# The code below implements the interface of a snit validation type,
+# making it directly usable with snit's -type option in option
+# specifications.
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require valtype::luhn
+package require valtype::common
+
+namespace eval ::valtype::creditcard::discover {
+    namespace import ::valtype::common::*
+}
+
+# # ## ### ##### ######## ############# ######################
+## Implementation
+
+snit::type ::valtype::creditcard::discover {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+	if {[string length $value] != 16} {
+	    badlength {CREDITCARD DISCOVER} 16 "CREDITCARD DISCOVER number"
+	} elseif {![string match 6011* $value] &&
+		  ![string match 65* $value]} {
+	    badprefix {CREDITCARD DISCOVER} {6011 65} "CREDITCARD DISCOVER number"
+	}
+
+	return [valtype::luhn validate $value {CREDITCARD DISCOVER}]
+    }
+
+    typemethod checkdigit {value} {
+	if {[string length $value] != 15} {
+	    badlength {CREDITCARD DISCOVER} 15 "CREDITCARD DISCOVER number without checkdigit"
+	} elseif {![string match 6011* $value] &&
+		  ![string match 65* $value]} {
+	    badprefix {CREDITCARD DISCOVER} {6011 65} "CREDITCARD DISCOVER number without checkdigit"
+	}
+
+	return [valtype::luhn checkdigit $value {CREDITCARD DISCOVER}]
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide valtype::creditcard::discover 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/cc_mastercard.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/cc_mastercard.tcl
new file mode 100644
index 00000000..551da50f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/cc_mastercard.tcl
@@ -0,0 +1,68 @@
+# # ## ### ##### ######## ############# ######################
+## Verify MASTERCARD MASTERCARD credit card number
+#
+## Reference
+##	http://wiki.cdyne.com/wiki/index.php?title=Credit_Card_Verification
+
+# # ## ### ##### ######## ############# ######################
+
+# The code below implements the interface of a snit validation type,
+# making it directly usable with snit's -type option in option
+# specifications.
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require valtype::luhn
+package require valtype::common
+
+# # ## ### ##### ######## ############# ######################
+## Implementation
+
+namespace eval ::valtype::creditcard::mastercard {
+    namespace import ::valtype::common::*
+}
+
+snit::type ::valtype::creditcard::mastercard {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+	if {[string length $value] != 16} {
+	    badlength {CREDITCARD MASTERCARD} 16 "CREDITCARD MASTERCARD number"
+	} elseif {[string index $value 0] ne "5"} {
+	    badprefix {CREDITCARD MASTERCARD} 5 "CREDITCARD MASTERCARD number"
+	}
+
+	return [valtype::luhn validate $value {CREDITCARD MASTERCARD}]
+    }
+
+    typemethod checkdigit {value} {
+	if {[string length $value] != 15} {
+	    badlength {CREDITCARD MASTERCARD} 15 "CREDITCARD MASTERCARD number without checkdigit"
+	} elseif {[string index $value 0] ne "5"} {
+	    badprefix {CREDITCARD MASTERCARD} 5 "CREDITCARD MASTERCARD number without checkdigit"
+	}
+
+	return [valtype::luhn checkdigit $value {CREDITCARD MASTERCARD}]
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide valtype::creditcard::mastercard 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/cc_visa.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/cc_visa.tcl
new file mode 100644
index 00000000..16dcf505
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/cc_visa.tcl
@@ -0,0 +1,69 @@
+# # ## ### ##### ######## ############# ######################
+## Verify VISA credit card number
+#
+## Reference
+##	http://wiki.cdyne.com/wiki/index.php?title=Credit_Card_Verification
+##	http://www.beachnet.com/~hstiles/cardtype.html
+
+# # ## ### ##### ######## ############# ######################
+
+# The code below implements the interface of a snit validation type,
+# making it directly usable with snit's -type option in option
+# specifications.
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require valtype::luhn
+package require valtype::common
+
+# # ## ### ##### ######## ############# ######################
+## Implementation
+
+namespace eval ::valtype::creditcard::visa {
+    namespace import ::valtype::common::*
+}
+
+snit::type ::valtype::creditcard::visa {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+	if {[string length $value] ni {13 16}} {
+	    badlength {CREDITCARD VISA} {13 16} "CREDITCARD VISA number"
+	} elseif {[string index $value 0] ne "4"} {
+	    badprefix {CREDITCARD VISA} 4 "CREDITCARD VISA number"
+	}
+
+	return [valtype::luhn validate $value {CREDITCARD VISA}]
+    }
+
+    typemethod checkdigit {value} {
+	if {[string length $value] ni {12 15}} {
+	    badlength {CREDITCARD VISA} {12 15} "CREDITCARD VISA number without checkdigit"
+	} elseif {[string index $value 0] ne "4"} {
+	    badprefix {CREDITCARD VISA} 4 "CREDITCARD VISA number without checkdigit"
+	}
+
+	return [valtype::luhn checkdigit $value {CREDITCARD VISA}]
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide valtype::creditcard::visa 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/ean13.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/ean13.tcl
new file mode 100644
index 00000000..3fc0671f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/ean13.tcl
@@ -0,0 +1,99 @@
+# # ## ### ##### ######## ############# ######################
+## Validation of EAN13 numbers.
+## EAN = European Article Number
+## now   International Article Number, without changing the acronym.
+#
+# References
+#	http://www.cut-the-knot.org/Curriculum/Arithmetic/EAN13.shtml
+#	http://www.barcodeisland.com/ean13.phtml
+#	http://en.wikipedia.org/wiki/EAN-13
+
+# # ## ### ##### ######## ############# ######################
+
+# The code below implements the interface of a snit validation type,
+# making it directly usable with snit's -type option in option
+# specifications.
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require valtype::common
+
+# # ## ### ##### ######## ############# ######################
+## Implementation
+
+namespace eval ::valtype::gs1::ean13 {
+    namespace import ::valtype::common::*
+}
+
+snit::type ::valtype::gs1::ean13 {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+	if {![regexp {^[0-9]+[Xx]?$} $value]} {
+	    badchar EAN13 "EAN13 number, expected only digits, and possibly 'X' or 'x' as checkdigit"
+	} elseif {[string length $value] != 13} {
+	    badlength EAN13 13 "EAN13 number"
+	}
+
+	# FUTURE: Check that the first 3 digits are a valid GS1
+	# FUTURE: country code (numeric). See also the ISO 3166-1
+	# FUTURE: country codes. Same purpose, different codings (alpha2
+	# FUTURE: alpha3, numeric3).
+
+	set sum [Sum $value]
+	if {($sum % 10) != 0} {
+	    badcheck EAN13 "EAN13 number"
+	}
+
+	return $value
+    }
+
+    typemethod checkdigit {value} {
+	if {![regexp {^[0-9]+[Xx]?$} $value]} {
+	    badchar EAN13 "EAN13 number (without checkdigit), expected only digits"
+	} elseif {[string length $value] != 12} {
+	    badlength EAN13 12 "EAN13 number (without checkdigit)"
+	}
+
+	set c [expr {10 - ([Sum $value] % 10)}]
+	if {$c == 10} { set c 0 }
+
+	return $c
+    }
+
+    proc Sum {value} {
+	#  i| 0 1 2 3  4  5  6  7  8  9
+	# *3| 0 3 6 9 12 15 18 21 24 27
+
+	set sum 0
+	set flip 1
+	foreach d [string map {x 10 X 10} [split $value {}]] {
+	    incr sum [lindex {
+		{0 1 2 3 4 5 6 7 8 9 10}
+		{0 3 6 9 12 15 18 21 24 27 30}
+	    } [expr {[incr flip] & 1}] $d]
+	}
+	return $sum
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide valtype::gs1::ean13 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/iban.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/iban.tcl
new file mode 100644
index 00000000..1563ac52
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/iban.tcl
@@ -0,0 +1,92 @@
+# # ## ### ##### ######## ############# ######################
+## Validation of IBAN numbers.
+#
+# Reference:
+#    http://en.wikipedia.org/wiki/International_Bank_Account_Number
+#
+# # ## ### ##### ######## ############# ######################
+
+# The code below implements the interface of a snit validation type,
+# making it directly usable with snit's -type option in option
+# specifications.
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require valtype::common
+
+# # ## ### ##### ######## ############# ######################
+## Implementation
+
+namespace eval ::valtype::iban {
+    namespace import ::valtype::common::*
+}
+
+snit::type ::valtype::iban {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typevariable cclen -array {
+	AL 28 AD 24 AT 20 BH 22 BE 16 BA 20 BG 22 BR 29 CR 21 HR 21 CY 28 CZ 24 DK 18 FO 18 GL 18 DO 28 EE 20 FI 18
+	FR 27 GF 27 GP 27 MQ 27 RE 27 PF 27 TF 27 YT 27 NC 27 PM 27 WF 27 GE 22 DE 22 GI 23 GR 27 HU 28 SV 28
+	IS 26 IE 22 IL 23 IT 27 KZ 20 KW 30 LV 21 LB 28 LI 21 LT 20 LU 20 MK 19 MT 31 MR 27 MU 30 MC 27
+	ME 22 NL 18 NO 15 PL 28 PS 29 PT 25 RO 24 SM 27 SA 24 RS 22 SK 24 SI 19 ST 25 ES 24 SE 24 CH 21 TN 24 TR 26
+	AE 23 GB 22 AZ 28 MD 24 PK 24 VG 24 GT 28 QA 29 JO 30 TL 23 XK 20 UA 29 SC 31 LC 32 BY 28 IQ 23
+	BI 27 DJ 27 EG 29 LY 25 RU 33 SD 18 VA 22
+	}
+
+    typevariable charmap {
+	A 10 B 11 C 12 D 13 E 14 F 15 G 16 H 17 I 18 J 19 K 20 L 21 M 22
+	N 23 O 24 P 25 Q 26 R 27 S 28 T 29 U 30 V 31 W 32 X 33 Y 34 Z 35
+    }
+
+    typemethod cclen {cc} {
+	return $cclen($cc)
+    }
+
+    typemethod validate {value} {
+        set value [string toupper $value]
+
+	if {![regexp {^[A-Z]{2}[0-9A-Z]+$} $value]} {
+	    badchar IBAN "IBAN number, expected country code followed by alphanumerics"
+	}
+
+	set country [string range $value 0 1]
+
+	if {![info exists cclen($country)]} {
+	    badprefix IBAN "" "IBAN number, unknown country code"
+	}
+	if {[string length $value] != $cclen($country)} {
+	    badlength IBAN $cclen($country) "IBAN number"
+	}
+
+	set number [string range $value 4 end][string range $value 0 3]
+	set number [string map $charmap $number]
+	set number [string trimleft $number 0]
+
+	if {($number % 97) != 1} {
+	    badcheck IBAN "IBAN number"
+	}
+
+	return $value
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide valtype::iban 1.8
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/imei.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/imei.tcl
new file mode 100644
index 00000000..2747e745
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/imei.tcl
@@ -0,0 +1,66 @@
+# # ## ### ##### ######## ############# ######################
+## IMEI (International Mobile Equipment Identity)
+## References
+##	http://en.wikipedia.org/wiki/IMEI
+##	http://www.3gpp.org/ftp/Specs/html-info/23003.htm
+## Short notes
+##	14-digit number + check digit.
+##	Embeds information on origin, model, and serial number of the device.
+##	Passes Luhn test as is.
+
+# # ## ### ##### ######## ############# ######################
+
+# The code below implements the interface of a snit validation type,
+# making it directly usable with snit's -type option in option
+# specifications.
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require valtype::luhn
+package require valtype::common
+
+# # ## ### ##### ######## ############# ######################
+## Implementation
+
+namespace eval ::valtype::imei {
+    namespace import ::valtype::common::*
+}
+
+snit::type ::valtype::imei {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+	if {[string length $value] != 15} {
+	    badlength IMEI 15 "IMEI number"
+	}
+	return [valtype::luhn validate $value IMEI]
+    }
+
+    typemethod checkdigit {value} {
+	if {[string length $value] != 14} {
+	    badlength IMEI 14 "IMEI number (without checkdigit)"
+	}
+	return [valtype::luhn checkdigit $value IMEI]
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide valtype::imei 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/isbn.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/isbn.tcl
new file mode 100644
index 00000000..37df531f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/isbn.tcl
@@ -0,0 +1,176 @@
+# # ## ### ##### ######## ############# ######################
+## Validation of ISBN numbers.
+#
+## ISBN-10 and -13 numbers are handled. The later are issued since
+## Jan 1, 2007. ISBN-10 numbers indicate books issued before that date.
+## I.e. Books after the date do not have ISBN-10 numbers any longer.
+## Books with an ISBN-10 have a canconical ISBN-13 equivalent
+## number. See method '13of'.
+
+## Note that ISBN-13 numbers are essentially EAN-13 numbers with
+## country codes 'Bookland' and 'Musicland', i.e. 978 and 979.
+#
+# References
+#	http://www.augustana.ab.ca/~mohrj/algorithms/checkdigit.html
+#	http://en.wikipedia.org/wiki/International_Standard_Book_Number
+
+# # ## ### ##### ######## ############# ######################
+
+# The code below implements the interface of a snit validation type,
+# making it directly usable with snit's -type option in option
+# specifications.
+
+# The result of the validation is always a proper isbn13 code, even if
+# the input was isbn10. In this manner inputs are normalized to the
+# canonical format.
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require valtype::common
+
+# # ## ### ##### ######## ############# ######################
+## Implementation
+
+namespace eval ::valtype::isbn {
+    namespace import ::valtype::common::*
+}
+
+snit::type ::valtype::isbn {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+	if {![regexp {^[0-9]+[Xx]?$} $value]} {
+	    badchar ISBN "ISBN number, expected only digits, and possibly 'X' or 'x' as checkdigit"
+	}
+
+	switch -exact -- [string length $value] {
+	    10 {
+		set sum 0
+		foreach \
+		    d [string map {x 10 X 10} [lreverse [split $value {}]]] \
+		    w {1 2 3 4 5 6 7 8 9 10} {
+			incr sum [expr {$d * $w}]
+		    }
+		if {($sum % 11) != 0} {
+		    badcheck ISBN "ISBN number"
+		}
+
+		# Normalize isbn10 to its isbn13 equivalent.
+
+		set n 978[string range $value 0 end-1]
+		return $n[$type checkdigit $n]
+	    }
+	    13 {
+		if {![string match 978* $value] &&
+		    ![string match 979* $value]} {
+		    badprefix ISBN {978 979} "ISBN number"
+		}
+
+		set sum [Sum $value]
+		if {($sum % 10) != 0} {
+		    badcheck ISBN "ISBN number"
+		}
+	    }
+	    default {
+		badlength ISBN {10 13} "ISBN number"
+	    }
+	}
+
+	return $value
+    }
+
+    typemethod checkdigit {value} {
+	if {![regexp {^[0-9]+[Xx]?$} $value]} {
+	    badchar ISBN "ISBN number (without checkdigit), expected only digits"
+	}
+
+	switch -exact -- [string length $value] {
+	    9 {
+		set sum 0
+		foreach \
+		    d [lreverse [split $value {}]] \
+		    w {2 3 4 5 6 7 8 9 10} {
+			incr sum [expr {$d * $w}]
+		    }
+
+		set c [expr {11 - ($sum % 11)}]
+		if {$c == 11} { set c 0 }
+		if {$c == 10} { set c X }
+	    }
+	    12 {
+		if {![string match 978* $value] &&
+		    ![string match 979* $value]} {
+		    badprefix ISBN {978 979} "ISBN number (without checkdigit)"
+		}
+
+		set c [expr {10 - ([Sum $value] % 10)}]
+		if {$c == 10} { set c 0 }
+	    }
+	    default {
+		badlength ISBN {9 12} "ISBN number (without checkdigit)"
+	    }
+	}
+
+	return $c
+    }
+
+    # Convert isbn10 to isbn13.
+
+    # Note that isbn13 numbers are valid ean13 codes with 'country
+    # code' 978, aka 'bookland'. As space has run out the country code
+    # 979 'Musicland' (see ISMN) is repurposed and phased in. This
+    # however does not affect the conversion of isbn10 numbers, their
+    # equivalents are all in the 978 region.
+
+    typemethod 13of {value} {
+	if {![regexp {^[0-9]+[Xx]?$} $value]} {
+	    badchar ISBN "ISBN-10 number, expected only digits, and possibly 'X' or 'x' as checkdigit"
+	} elseif {[string length $value] != 10} {
+	    badlength ISBN 10 "ISBN-10 number"
+	}
+
+	# Strip the -10 check digit, prefix the remainder with the
+	# bookland country code and recalculate the check digit, via
+	# -13.
+
+	set n 978[string range $value 0 end-1]
+	return $n[$type checkdigit $n]
+    }
+
+    # NOTE: Same as EAN13
+    proc Sum {value} {
+	#  i| 0 1 2 3  4  5  6  7  8  9
+	# *3| 0 3 6 9 12 15 18 21 24 27
+
+	set sum 0
+	set flip 1
+	foreach d [string map {x 10 X 10} [split $value {}]] {
+	    incr sum [lindex {
+		{0 1 2 3 4 5 6 7 8 9 10}
+		{0 3 6 9 12 15 18 21 24 27 30}
+	    } [expr {[incr flip] & 1}] $d]
+	}
+	return $sum
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide valtype::isbn 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/luhn.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/luhn.tcl
new file mode 100644
index 00000000..0ef57d85
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/luhn.tcl
@@ -0,0 +1,128 @@
+# # ## ### ##### ######## ############# ######################
+## Luhn test of numbers
+## From Rosetta Code
+##	http://rosettacode.org/wiki/Luhn_test#Tcl
+## Author Donal K. Fellows
+## See also
+##	http://en.wikipedia.org/wiki/Luhn_algorithm
+## ISO/IEC 7812-1
+##	http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=39698
+## US Patent 2,950,048 (Aug 23, 1960): expired.
+##	http://www.google.com/patents?q=2950048
+## Public Domain.
+#
+# The Luhn test is used by some credit card companies to distinguish
+# valid credit card numbers from what could be a random selection of
+# digits.
+#
+# Those companies using credit card numbers that can be validated by
+# the Luhn test have numbers that pass the following test:
+##
+#   1. Reverse the order of the digits in the number.
+#
+#   2. Take the first, third, ... and every other odd digit in the
+#      reversed digits and sum them to form the partial sum s1
+#
+#   3. Taking the second, fourth ... and every other even digit in the
+#      reversed digits:
+#
+#      a. Multiply each digit by two and sum the digits if the answer
+#         is greater than nine to form partial sums for the even digits
+#      b. Sum the partial sums of the even digits to form s2
+#
+#      Note that the steps above induce a simple permutation on digits
+#      0-9 which can be handled through a lookup table instead of doing
+#      the doubling and summing explicitly.
+#
+#   4. If s1 + s2 ends in zero then the original number is in the form
+#      of a valid credit card number as verified by the Luhn test.
+
+# 3.a/3.b lookup table
+#   i|0  1  2  3  4  5  6  7  8  9
+#  *2|0  2  4  6  8 10 12 14 16 18
+# sum|0  2  4  6  8  1  3  5  7  9 (butterfly)
+
+# # ## ### ##### ######## ############# ######################
+
+# The code below implements the interface of a snit validation type,
+# making it directly usable with snit's -type option in option
+# specifications.
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require valtype::common
+
+# # ## ### ##### ######## ############# ######################
+## Implementation
+
+namespace eval ::valtype::luhn {
+    namespace import ::valtype::common::*
+}
+
+snit::type ::valtype::luhn {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value {code LUHN}} {
+	if {[regexp {[^0-9]} $value]} {
+	    badchar $code "$code number, expected only digits"
+	}
+
+	# Luhn test. 8.5 required for lreverse.
+
+	set sum [Sum $value 1]
+	if {($sum % 10) != 0} {
+	    badcheck $code "$code number"
+	}
+	return $value
+    }
+
+    typemethod checkdigit {value {code LUHN}} {
+	if {[regexp {[^0-9]} $value]} {
+	    badchar LUHN "$code number, expected only digits"
+	}
+
+	set c [expr {10 - ([Sum $value 0] % 10)}]
+	if {$c == 10} { set c 0 }
+	return $c
+    }
+
+    proc Sum {value flip} {
+	# 8.5 required for lreverse.
+	# Check digit computation starts with flip == 0!
+	#
+	# In the validation (see above) the check-digit is the last
+	# digit, and flip initialized to 1. The next-to-last digit is
+	# our last here and processed with the bit flipped. Hence our
+	# different, pre-flipped, starting point.
+
+	set sum 0
+	foreach ch [lreverse [split $value {}]] {
+	    incr sum [lindex {
+		{0 1 2 3 4 5 6 7 8 9}
+		{0 2 4 6 8 1 3 5 7 9}
+	    } [expr {[incr flip] & 1}] $ch]
+	}
+	return $sum
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide valtype::luhn 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/luhn5.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/luhn5.tcl
new file mode 100644
index 00000000..3975704d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/luhn5.tcl
@@ -0,0 +1,140 @@
+# # ## ### ##### ######## ############# ######################
+## Luhn test of numbers - 10+5 variant
+## From Rosetta Code
+##	http://rosettacode.org/wiki/Luhn_test#Tcl
+## Author Donal K. Fellows
+## See also
+##	http://en.wikipedia.org/wiki/Luhn_algorithm
+## ISO/IEC 7812-1
+##	http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=39698
+## US Patent 2,950,048 (Aug 23, 1960): expired.
+##	http://www.google.com/patents?q=2950048
+## Public Domain.
+#
+# The 10+5 variant of the Luhn test is used by some credit card
+# companies to distinguish valid credit card numbers from what could
+# be a random selection of digits.
+#
+# Those companies using credit card numbers that can be validated by
+# the Luhn test have numbers that pass the following test:
+##
+#   1. Reverse the order of the digits in the number.
+#
+#   2. Take the first, third, ... and every other odd digit in the
+#      reversed digits and sum them to form the partial sum s1
+#
+#   3. Taking the second, fourth ... and every other even digit in the
+#      reversed digits:
+#
+#      a. Multiply each digit by two and sum the digits if the answer
+#         is greater than nine to form partial sums for the even digits
+#      b. Sum the partial sums of the even digits to form s2
+#
+#      Note that the steps above induce a simple permutation on digits
+#      0-9 which can be handled through a lookup table instead of doing
+#      the doubling and summing explicitly.
+#
+#   4. If s1 + s2 ends in zero or five then the original number is in
+#      the form of a valid credit card number as verified by the Luhn test.
+
+# 3.a/3.b lookup table
+#   i|0  1  2  3  4  5  6  7  8  9
+#  *2|0  2  4  6  8 10 12 14 16 18
+# sum|0  2  4  6  8  1  3  5  7  9 (butterfly)
+
+# # ## ### ##### ######## ############# ######################
+
+# The code below implements the interface of a snit validation type,
+# making it directly usable with snit's -type option in option
+# specifications.
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require valtype::common
+
+# # ## ### ##### ######## ############# ######################
+## Implementation
+
+namespace eval ::valtype::luhn5 {
+    namespace import ::valtype::common::*
+}
+
+snit::type ::valtype::luhn5 {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value {code LUHN5}} {
+	if {[regexp {[^0-9]} $value]} {
+	    badchar $code "$code number, expected only digits"
+	}
+
+	# Luhn test.
+
+	set sum [Sum $value 1]
+	if {($sum % 10) ni {0 5}} {
+	    badcheck $code "$code number"
+	}
+	return $value
+    }
+
+    typemethod checkdigit0 {value {code LUHN5}} {
+	if {[regexp {[^0-9]} $value]} {
+	    badchar LUHN "$code number, expected only digits"
+	}
+
+	# Compute the luhn5 checkdigit 0 % 10.
+
+	set c [expr {10 - ([Sum $value 0] % 10)}]
+	if {$c == 10} { set c 0 }
+	return $c
+    }
+
+    typemethod checkdigit5 {value {code LUHN5}} {
+	if {[regexp {[^0-9]} $value]} {
+	    badchar LUHN "$code number, expected only digits"
+	}
+
+	# Compute the luhn5 checkdigit 5 % 10 (the alternate).
+	set c [expr {10 - (([Sum $value 0] + 5) % 10)}]
+	if {$c == 10} { set c 0 }
+	return $c
+    }
+
+    proc Sum {value flip} {
+	# Check digit computation starts with flip == 0!
+	#
+	# In the validation (see above) the check-digit is the last
+	# digit, and flip initialized to 1. The next-to-last digit is
+	# our last here and processed with the bit flipped. Hence our
+	# different, pre-flipped, starting point.
+
+	set sum 0
+	foreach ch [lreverse [split $value {}]] {
+	    incr sum [lindex {
+		{0 1 2 3 4 5 6 7 8 9}
+		{0 2 4 6 8 1 3 5 7 9}
+	    } [expr {[incr flip] & 1}] $ch]
+	}
+	return $sum
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide valtype::luhn5 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/pkgIndex.tcl
new file mode 100644
index 00000000..4b4796e4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/pkgIndex.tcl
@@ -0,0 +1,13 @@
+package ifneeded valtype::common                 1 [list source [file join $dir valtype.tcl]]
+package ifneeded valtype::creditcard::amex       1 [list source [file join $dir cc_amex.tcl]]
+package ifneeded valtype::creditcard::discover   1 [list source [file join $dir cc_discover.tcl]]
+package ifneeded valtype::creditcard::mastercard 1 [list source [file join $dir cc_mastercard.tcl]]
+package ifneeded valtype::creditcard::visa       1 [list source [file join $dir cc_visa.tcl]]
+package ifneeded valtype::gs1::ean13             1 [list source [file join $dir ean13.tcl]]
+package ifneeded valtype::imei                   1 [list source [file join $dir imei.tcl]]
+package ifneeded valtype::isbn                   1 [list source [file join $dir isbn.tcl]]
+package ifneeded valtype::luhn                   1 [list source [file join $dir luhn.tcl]]
+package ifneeded valtype::luhn5                  1 [list source [file join $dir luhn5.tcl]]
+package ifneeded valtype::usnpi                  1 [list source [file join $dir usnpi.tcl]]
+package ifneeded valtype::verhoeff               1 [list source [file join $dir verhoeff.tcl]]
+package ifneeded valtype::iban                 1.7 [list source [file join $dir iban.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/usnpi.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/usnpi.tcl
new file mode 100644
index 00000000..62f70279
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/usnpi.tcl
@@ -0,0 +1,65 @@
+# # ## ### ##### ######## ############# ######################
+## US NPI (National Provider Identifier) for Medicare services.
+## Reference
+##	http://en.wikipedia.org/wiki/National_Provider_Identifier
+## Short notes
+##	10-digit number. No embedded information.
+##	Passes Luhn test when prefixed with '80480'.
+
+# # ## ### ##### ######## ############# ######################
+
+# The code below implements the interface of a snit validation type,
+# making it directly usable with snit's -type option in option
+# specifications.
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require valtype::luhn
+package require valtype::common
+
+# # ## ### ##### ######## ############# ######################
+## Implementation
+
+namespace eval ::valtype::usnpi {
+    namespace import ::valtype::common::*
+}
+
+snit::type ::valtype::usnpi {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value} {
+	if {[string length $value] != 10} {
+	    badlength US-NPI 10 "US-NPI number"
+	}
+	valtype::luhn validate 80480$value US-NPI
+	return $value
+    }
+
+    typemethod checkdigit {value} {
+	if {[string length $value] != 9} {
+	    badlength US-NPI 9 "US-NPI number (without checkdigit)"
+	}
+	return [valtype::luhn checkdigit 80480$value US-NPI]
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide valtype::usnpi 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/valtype.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/valtype.tcl
new file mode 100644
index 00000000..d585ca15
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/valtype.tcl
@@ -0,0 +1,77 @@
+# # ## ### ##### ######## ############# ######################
+## (C) 2011 Andreas Kupries. BSD licensed.
+#
+## Common helper commands for the validation types in this
+## module.
+
+# # ## ### ##### ######## ############# ######################
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5
+namespace eval ::valtype::common {}
+
+# # ## ### ##### ######## ############# ######################
+## Implementation
+
+proc ::valtype::common::reject {code text} {
+    if {[string match {[aeiouAEIOU]*} $text]} {
+	set prefix "Not an "
+    } else {
+	set prefix "Not a "
+    }
+
+    return -code error \
+	-errorcode [list INVALID {*}$code] \
+	$prefix$text
+}
+
+proc ::valtype::common::badchar {code {text {}}} {
+    reject [list {*}$code CHAR] $text
+}
+
+proc ::valtype::common::badcheck {code {text {}}} {
+    if {$text ne {}} { append text ", " }
+    append text "the check digit is incorrect"
+    reject [list {*}$code CHECK-DIGIT] $text
+}
+
+proc ::valtype::common::badlength {code lengths {text {}}} {
+    set ln [llength $lengths]
+    if {$text ne {}} { append text ", " }
+    append text "incorrect length"
+    if {$ln} {
+	if {$ln == 1} {
+	    append text ", expected [lindex $lengths 0] characters"
+	} else {
+	    append text ", expected one of [linsert [join $lengths {, }] end-1 or] characters"
+	}
+    }
+    reject [list {*}$code LENGTH] $text
+}
+
+proc ::valtype::common::badprefix {code prefixes {text {}}} {
+    set ln [llength $prefixes]
+    if {$text ne {}} { append text ", " }
+    append text "incorrect prefix"
+    if {$ln} {
+	if {$ln == 1} {
+	    append text ", expected [lindex $prefixes 0]"
+	} else {
+	    append text ", expected one of [linsert [join $prefixes {, }] end-1 or]"
+	}
+    }
+    reject [list {*}$code PREFIX] $text
+}
+
+# # ## ### ##### ######## ############# ######################
+
+namespace eval ::valtype::common {
+    namespace export reject badchar badcheck badlength badprefix
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide valtype::common 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/verhoeff.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/verhoeff.tcl
new file mode 100644
index 00000000..8040d76a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/valtype/verhoeff.tcl
@@ -0,0 +1,128 @@
+# # ## ### ##### ######## ############# ######################
+## Verhoeff test of numbers
+#
+# The Verhoeff test is similar to the Luhn test to compute and verify
+# check digits of identifier numbers, albeit quite a bit stronger,
+# i.e. detecting more possible keying errors.
+#
+# References
+#	
+
+# # ## ### ##### ######## ############# ######################
+
+# The code below implements the interface of a snit validation type,
+# making it directly usable with snit's -type option in option
+# specifications.
+
+# # ## ### ##### ######## ############# ######################
+## Requisites
+
+package require Tcl 8.5
+package require snit
+package require valtype::common
+
+# # ## ### ##### ######## ############# ######################
+## Implementation
+
+namespace eval ::valtype::verhoeff {
+    namespace import ::valtype::common::*
+}
+
+snit::type ::valtype::verhoeff {
+    #-------------------------------------------------------------------
+    # Type Methods
+
+    typemethod validate {value {code VERHOEFF}} {
+	if {[regexp {[^0-9]} $value]} {
+	    badchar $code "$code number, expected only digits"
+	}
+
+	# Verhoeff test.
+
+	set sum [Sum $value 0]
+	if {$sum != 0} {
+	    badcheck $code "$code number"
+	}
+	return $value
+    }
+
+    typemethod checkdigit {value {code VERHOEFF}} {
+	if {[regexp {[^0-9]} $value]} {
+	    badchar $code "$code number, expected only digits"
+	}
+
+	# Compute the verhoeff checkdigit. First sum the digits as
+	# usual. Note that we start with position 1, as the check
+	# digit will go into position 0.
+
+	#return [INVERS [Sum $value 1]]
+	return [lindex $ourinv [Sum $value 1]]
+    }
+
+    proc Sum {value step} {
+	# 8.5 required for lreverse.
+	#
+	# Compute the verhoeff checkdigit. First sum the digits as
+	# usual. Note that we start with position 1 for checkdigit
+	# calculation, as the check digit will go into position 0.
+
+	set sum 0
+	foreach ch [lreverse [split $value {}]] {
+	    #set sum [OP $sum [F step $ch]]
+	    # inlined below:
+	    set sum [lindex $ourop $sum [lindex $ourf $step $ch]]
+	    incr step ; if {$step == 8} { set step 0}
+	}
+	return $sum
+    }
+
+    #-------------------------------------------------------------------
+    # Constructor
+
+    # None needed; no options
+
+    #-------------------------------------------------------------------
+    # Public Methods
+
+    method validate {value} {
+        $type validate $value
+    }
+
+    #-------------------------------------------------------------------
+    # Operations in D5, and the helper permutations F^k, k in {0,...,7}.
+
+    #proc OP     {a b} { return [lindex $ourop $a $b] }
+    #proc INVERS {a}   { return [lindex $ourinv $a] }
+    #proc F      {k x} { return [lindex $ourf $k $x] }
+
+    typevariable ourop {
+	{0 1 2 3 4 5 6 7 8 9}
+	{1 2 3 4 0 6 7 8 9 5}
+	{2 3 4 0 1 7 8 9 5 6}
+	{3 4 0 1 2 8 9 5 6 7}
+	{4 0 1 2 3 9 5 6 7 8}
+	{5 9 8 7 6 0 4 3 2 1}
+	{6 5 9 8 7 1 0 4 3 2}
+	{7 6 5 9 8 2 1 0 4 3}
+	{8 7 6 5 9 3 2 1 0 4}
+	{9 8 7 6 5 4 3 2 1 0} 
+    }
+
+    typevariable ourinv {0 4 3 2 1 5 6 7 8 9}
+
+    typevariable ourf {
+	{0 1 2 3 4 5 6 7 8 9}
+	{1 5 7 6 2 8 3 0 9 4}
+	{5 8 0 3 7 9 6 1 4 2}
+	{8 9 1 6 0 4 3 5 2 7}
+	{9 4 5 3 1 2 6 8 7 0}
+	{4 2 8 6 5 7 3 9 0 1}
+	{2 7 9 3 8 0 6 4 1 5}
+	{7 0 4 6 9 1 3 2 5 8}
+    }
+}
+
+# # ## ### ##### ######## ############# ######################
+## Ready
+
+package provide valtype::verhoeff 1
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/cat.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/cat.tcl
new file mode 100644
index 00000000..e76c2c60
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/cat.tcl
@@ -0,0 +1,135 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2011,2019 Andreas Kupries
+
+# Facade concatenating the contents of the channels it was constructed
+# with. Owns the sub-ordinate channels and closes them on exhaustion and/or
+# when closed itself.
+
+# @@ Meta Begin
+# Package tcl::chan::cat 1.0.3
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2011
+# Meta as::license BSD
+# Meta description Facade concatenating the contents of the channels it
+# Meta description was constructed with. Owns the sub-ordinate channels
+# Meta description and closes them on exhaustion and/or when closed itself.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::core
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+package require tcl::chan::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+proc ::tcl::chan::cat {args} {
+    return [::chan create {read} [cat::implementation new {*}$args]]
+}
+
+oo::class create ::tcl::chan::cat::implementation {
+    superclass ::tcl::chan::core ; # -> initialize, finalize.
+
+    # We are not using the standard event handling class, because here
+    # it will not be timer-driven. We propagate anything related to
+    # events to catin and catout instead and let them handle things.
+
+    constructor {args} {
+	set channels $args
+	# Disable translation (and hence encoding) in the wrapped channels.
+	# This will happen in our generic layer instead.
+	foreach c $channels {
+	    fconfigure $c -translation binary
+	}
+	set delay 10
+	set watching 0
+	return
+    }
+
+    destructor {
+	foreach c $channels {
+	    ::close $c
+	}
+	return
+    }
+
+    variable channels timer delay watching
+
+    method watch {c requestmask} {
+	if {"read" in $requestmask} {
+	    # Activate event handling.  Either drive an eof home via
+	    # timers, or activate things in the foremost sub-ordinate.
+
+	    set watching 1
+	    if {![llength $channels]} {
+		set timer [after $delay [namespace code [list my Post $c]]]
+	    } else {
+		chan event [lindex $channels 0] readable [list chan postevent $c read]
+	    }
+	} else {
+	    # Stop events. Either kill timer, or disable in the
+	    # foremost sub-ordinate.
+
+	    set watching 0
+	    if {![llength $channels]} {
+		catch { after cancel $timer }
+	    } else {
+		chan event [lindex $channels 0] readable {}
+	    }
+	}
+	return
+    }
+
+    method read {c n} {
+	if {![llength $channels]} {
+	    # This signals EOF higher up.
+	    return {}
+	}
+
+	set buf {}
+	while {([string length $buf] < $n) &&
+	       [llength $channels]} {
+
+	    set in     [lindex $channels 0]
+	    set toread [expr {$n - [string length $buf]}]
+	    append buf [::read $in $toread]
+
+	    if {[eof $in]} {
+		close $in
+		set channels [lrange $channels 1 end]
+
+		# The close of the exhausted subordinate killed any
+		# fileevent handling we may have had attached to this
+		# channel. Update the settings (i.e. move to the next
+		# subordinate, or to timer-based, to drive the eof
+		# home).
+
+		if {$watching} {
+		    my watch $c read
+		}
+	    }
+	}
+
+	# When `buf` is empty, all channels have been exhausted and
+	# closed, therefore returning this empty string will cause an
+	# EOF higher up.
+	return $buf
+    }
+
+    method Post {c} {
+	set timer [after $delay [namespace code [list my Post $c]]]
+	chan postevent $c read
+	return
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::cat 1.0.3
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/facade.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/facade.tcl
new file mode 100644
index 00000000..d37f5c3d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/facade.tcl
@@ -0,0 +1,234 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2011 Andreas Kupries
+
+# Facade wrapping around some other channel. All operations on the
+# facade are delegated to the wrapped channel. This makes it useful
+# for debugging of Tcl's activity on a channel. While a transform can
+# be used for that as well it does not have access to some things of
+# the base-channel, i.e. all the event managment is not visible to it,
+# whereas the facade has access to even this.
+
+# @@ Meta Begin
+# Package tcl::chan::facade 1.0.1
+# Meta as::author {Colin McCormack}
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2011
+# Meta as::license BSD
+# Meta description Facade wrapping around some other channel. All
+# Meta description operations on the facade are delegated to the
+# Meta description wrapped channel. This makes it useful for debugging
+# Meta description of Tcl's activity on a channel. While a transform
+# Meta description can be used for that as well it does not have
+# Meta description access to some things of the base-channel, i.e. all
+# Meta description the event managment is not visible to it, whereas
+# Meta description the facade has access to even this.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::core
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+## TODO document the special options of the facade
+## TODO log integration.
+## TODO document that facada takes ownership of the channel.
+
+package require Tcl 8.5
+package require TclOO
+package require logger
+package require tcl::chan::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+logger::initNamespace ::tcl::chan::facade
+proc ::tcl::chan::facade {args} {
+    return [::chan create {read} [facade::implementation new {*}$args]]
+}
+
+# # ## ### ##### ######## #############
+
+oo::class create ::tcl::chan::facade::implementation {
+    superclass ::tcl::chan::core ; # -> initialize, finalize.
+
+    # # ## ### ##### ######## #############
+
+    # We are not using the standard event handling class, because here
+    # it will not be timer-driven. We propagate anything related to
+    # events to the wrapped channel instead and let it handle things.
+
+    constructor {thechan} {
+	# Access to the log(ger) commands.
+	namespace path [list {*}[namespace path] ::tcl::chan::facade]
+
+	set chan $thechan
+
+	# set some configuration data
+	set created [clock milliseconds]
+	set used 0
+	set user ""	;# user data - freeform
+
+	# validate args
+	if {$chan eq [self]} {
+	    return -code error "recursive chan!  No good."
+	} elseif {$chan eq ""} {
+	    return -code error "Needs a chan argument"
+	}
+
+	set blocking [::chan configure $chan -blocking]
+	return
+    }
+
+    destructor {
+	log::debug {[self] destroyed}
+	if {[catch { ::chan close $chan } e o]} {
+	    log::debug {failed to close $chan [self] because "$e" ($o)}
+	}
+	return
+    }
+
+    variable chan used user created blocking
+
+    method initialize {myself mode} {
+	log::debug {$myself initialize $chan $mode}
+	log::debug {$chan configured: ([::chan configure $chan])}
+	return [next $chan $mode]
+    }
+
+    method finalize {myself} {
+	log::debug {$myself finalize $chan}
+	catch {::chan close $chan}
+	catch {next $myself}
+	catch {my destroy}
+	return
+    }
+
+    method blocking {myself mode} {
+	if {[catch {
+	    ::chan configure $chan -blocking $mode
+	    set blocking $mode
+	} e o]} {
+	    log::debug {$myself blocking $chan $mode -> error $e ($o)}
+	} else {
+	    log::debug {$myself blocking $chan $mode -> $e}
+	}
+	return
+    }
+
+    method watch {myself requestmask} {
+	log::debug {$myself watch $chan $requestmask}
+
+	if {"read" in $requestmask} {
+	    fileevent readable $chan [my Callback Readable $myself]
+	} else {
+	    fileevent readable $chan {}
+	}
+
+	if {"write" in $requestmask} {
+	    fileevent writable $chan [my Callback Writable $myself]
+	} else {
+	    fileevent writable $chan {}
+	}
+	return
+    }
+
+    method read {myself n} {
+	log::debug {$myself read $chan begin eof: [::chan eof $chan], blocked: [::chan blocked $chan]}
+	set used [clock milliseconds]
+
+	if {[catch {
+	    set data [::chan read $chan $n]
+	} e o]} {
+	    log::error {$myself read $chan $n -> error $e ($o)}
+	} else {
+	    log::debug {$myself read $chan $n -> [string length $data] bytes: [string map {\n \\n} "'[string range $data 0 20]...[string range $data end-20 end]"]'}
+	    log::debug {$myself read $chan eof     = [::chan eof     $chan]}
+	    log::debug {$myself read $chan blocked = [::chan blocked $chan]}
+	    log::debug {$chan configured: ([::chan configure $chan])}
+
+	    set gone [catch {chan eof $chan} eof]
+	    if {
+		($data eq {}) &&
+		!$gone && !$eof && !$blocking
+	    } {
+		log::error {$myself EAGAIN}
+		return -code error EAGAIN
+	    }
+	}
+
+	log::debug {$myself read $chan result: [string length $data] bytes}
+	return $data
+    }
+
+    method write {myself data} {
+	log::debug {$myself write $chan [string length $data] / [::chan pending output $chan] / [::chan pending output $myself]}
+	set used [clock milliseconds]
+	::chan puts -nonewline $chan $data
+	return [string length $data]
+    }
+
+    method configure {myself option value} {
+	log::debug {[self] configure $myself $option -> $value}
+
+	if {$option eq "-user"} {
+	    set user $value
+	    return
+	}
+
+	::chan configure $fd $option $value
+	return
+    }
+
+    method cget {myself option} {
+	switch -- $option {
+	    -self    { return [self]   }
+	    -fd      { return $chan    }
+	    -used    { return $used    }
+	    -created { return $created }
+	    -user    { return $user    }
+	    default  {
+		return [::chan configure $chan $option]
+	    }
+	}
+    }
+
+    method cgetall {myself} {
+	set result [::chan configure $chan]
+	lappend result \
+	    -self    [self] \
+	    -fd      $chan \
+	    -used    $used \
+	    -created $created \
+	    -user $user
+
+	log::debug {[self] cgetall $myself -> $result}
+	return $result
+    }
+
+    # # ## ### ##### ######## #############
+
+    # Internals. Methods. Event generation.
+    method Readable {myself} {
+	log::debug {$myself readable $chan - [::chan pending input $chan]}
+	::chan postevent $myself read
+	return
+    }
+
+    method Writable {myself} {
+	log::debug {$myself writable $chan - [::chan pending output $chan]}
+	::chan postevent $myself write
+	return
+    }
+
+    method Callback {method args} {
+	list [uplevel 1 {namespace which my}] $method {*}$args
+    }
+
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::facade 1.0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/fifo.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/fifo.tcl
new file mode 100644
index 00000000..35e24127
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/fifo.tcl
@@ -0,0 +1,138 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::chan::fifo 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Re-implementation of Memchan's fifo
+# Meta description channel. Based on Tcl 8.5's channel
+# Meta description reflection support. Exports a single
+# Meta description command for the creation of new
+# Meta description channels. No arguments. Result is the
+# Meta description handle of the new channel.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::events
+# Meta require {Tcl 8.5}
+# @@ Meta End
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+package require tcl::chan::events
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+proc ::tcl::chan::fifo {} {
+    return [::chan create {read write} [fifo::implementation new]]
+}
+
+oo::class create ::tcl::chan::fifo::implementation {
+    superclass ::tcl::chan::events ; # -> initialize, finalize, watch
+
+    method initialize {args} {
+	my allow write
+	next {*}$args
+    }
+
+    method read {c n} {
+	set max  [string length $read]
+	set last [expr {$at + $n - 1}]
+	set result {}
+
+	#    last+1 <= max
+	# <=> at+n <= max
+	# <=> n <= max-at
+
+	if {$n <= ($max - $at)} {
+	    # The request is less than what we have left in the read
+	    # buffer, we take it, and move the read pointer forward.
+
+	    append result [string range $read $at $last]
+	    incr at $n
+	    incr $size -$n
+	} else {
+	    # We need the whole remaining read buffer, and more. For
+	    # the latter we shift the write buffer contents over into
+	    # the read buffer, and then read from the latter again.
+
+	    append result  [string range $read $at end]
+	    incr n -[string length $result]
+
+	    set at    0
+	    set read  $write
+	    set write {}
+	    set size  [string length $read]
+	    set max   $size
+
+	    # at == 0
+	    if {$n <= $max} {
+		# The request is less than what we have in the updated
+		# read buffer, we take it, and move the read pointer
+		# forward.
+
+		append result [string range $read 0 $last]
+		set at $n
+		incr $size -$n
+	    } else {
+		# We need the whole remaining read buffer, and
+		# more. As we took the data from write already we have
+		# nothing left, and update accordingly.
+
+		append result $read
+
+		set at   0
+		set read {}
+		set size 0
+	    }
+	}
+
+	my Readable
+
+	if {$result eq {}} {
+	    return -code error EAGAIN
+	}
+
+	return $result
+    }
+
+    method write {c bytes} {
+	append write $bytes
+	set n [string length $bytes]
+	incr size $n
+	my Readable
+	return $n
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable at read write size
+
+    # # ## ### ##### ######## #############
+
+    constructor {} {
+	set at    0
+	set read  {}
+	set write {}
+	set size  0
+	next
+    }
+
+    method Readable {} {
+	if {$size} {
+	    my allow read
+	} else {
+	    my disallow read
+	}
+	return
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::fifo 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/fifo2.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/fifo2.tcl
new file mode 100644
index 00000000..95ddc407
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/fifo2.tcl
@@ -0,0 +1,113 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::chan::fifo2 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta as::notes   This fifo2 command does not have to
+# Meta as::notes   deal with the pesky details of
+# Meta as::notes   threading for cross-thread
+# Meta as::notes   communication. That is hidden in the
+# Meta as::notes   implementation of reflected
+# Meta as::notes   channels. It is less optimal as the
+# Meta as::notes   command provided by Memchan as this
+# Meta as::notes   fifo2 may involve three threads when
+# Meta as::notes   sending data around: The threads the
+# Meta as::notes   two endpoints are in, and the thread
+# Meta as::notes   holding this code. Memchan's C
+# Meta as::notes   implementation does not need this last
+# Meta as::notes   intermediary thread.
+# Meta description Re-implementation of Memchan's fifo2
+# Meta description channel. Based on Tcl 8.5's channel
+# Meta description reflection support. Exports a single
+# Meta description command for the creation of new
+# Meta description channels. No arguments. Result are the
+# Meta description handles of the two new channels.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::halfpipe
+# Meta require {Tcl 8.5}
+# @@ Meta End
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+package require tcl::chan::halfpipe
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+proc ::tcl::chan::fifo2 {} {
+
+    set coordinator [fifo2::implementation new]
+
+    lassign [halfpipe \
+	       -write-command [list $coordinator froma] \
+	       -close-command [list $coordinator closeda]] \
+	a ha
+
+    lassign [halfpipe \
+	       -write-command [list $coordinator fromb] \
+	       -close-command [list $coordinator closedb]] \
+	b hb
+
+    $coordinator connect $a $ha $b $hb
+
+    return [list $a $b]
+}
+
+oo::class create ::tcl::chan::fifo2::implementation {
+    method connect {thea theha theb thehb} {
+	set a $thea
+	set b $theb
+	set ha $theha
+	set hb $thehb
+	return
+    }
+
+    method closeda {c} {
+	set a {}
+	if {$b ne {}} {
+	    close $b
+	    set b {}
+	} else {
+	    my destroy
+	}
+	return
+    }
+
+    method closedb {c} {
+	set b {}
+	if {$a ne {}} {
+	    close $a
+	    set a {}
+	} else {
+	    my destroy
+	}
+	return
+    }
+
+    method froma {c bytes} {
+	$hb put $bytes
+	return
+    }
+
+    method fromb {c bytes} {
+	$ha put $bytes
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable a b ha hb
+
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::fifo2 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/halfpipe.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/halfpipe.tcl
new file mode 100644
index 00000000..b7348aae
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/halfpipe.tcl
@@ -0,0 +1,194 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009, 2019 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::chan::halfpipe 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009,2019
+# Meta as::license BSD
+# Meta description Implementation of one half of a pipe
+# Meta description channel. Based on Tcl 8.5's channel
+# Meta description reflection support. Exports a single
+# Meta description command for the creation of new
+# Meta description channels. Option arguments. Result is the
+# Meta description handle of the new channel, and the object
+# Meta description command of the handler object.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::events
+# Meta require {Tcl 8.5}
+# @@ Meta End
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+package require tcl::chan::events
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+proc ::tcl::chan::halfpipe {args} {
+    set handler [halfpipe::implementation new {*}$args]
+    return [list [::chan create {read write} $handler] $handler]
+}
+
+oo::class create ::tcl::chan::halfpipe::implementation {
+    superclass ::tcl::chan::events ; # -> initialize, finalize, watch
+
+    method initialize {args} {
+	my allow write
+	set eof 0
+	next {*}$args
+    }
+
+    method finalize {c} {
+	my Call -close-command $c
+	next $c
+    }
+
+    method read {c n} {
+	set max  [string length $read]
+	set last [expr {$at + $n - 1}]
+	set result {}
+	
+	#    last+1 <= max
+	# <=> at+n <= max
+	# <=> n <= max-at
+
+	if {$n <= ($max - $at)} {
+	    # There is enough data in the buffer to fill the request, so take
+	    # it from there and move the read pointer forward.
+
+	    append result [string range $read $at $last]
+	    incr at $n
+	    incr $size -$n
+	} else {
+	    # We need the whole remaining read buffer, and more. For
+	    # the latter we make the write buffer the new read buffer,
+	    # and then read from it again.
+
+	    append result [string range $read $at end]
+	    incr n -[string length $result]
+
+	    set at    0
+            set last  [expr {$n - 1}]
+	    set read  $write
+	    set write {}
+	    set size  [string length $read]
+	    set max   $size
+
+	    # at == 0 simplifies expressions
+	    if {$n <= $max} {
+		# The request is less than what we have in the new
+		# read buffer, we take it, and move the read pointer
+		# forward.
+
+		append result [string range $read 0 $last]
+		set at $n
+		incr $size -$n
+	    } else {
+		# We need the whole remaining read buffer, and
+		# more. As we took the data from write already we have
+		# nothing left, and update accordingly.
+
+		append result $read
+
+		set at   0
+		set read {}
+		set size 0
+	    }
+	}
+	my Readable
+	if {$result eq {} && !$eof} {
+	    return -code error EAGAIN
+	}
+	return $result
+    }
+
+    method write {c bytes} {
+	my Call -write-command $c $bytes
+	return [string length $bytes]
+    }
+
+    # # ## ### ##### ######## #############
+
+    method put bytes {
+	append write $bytes
+	set n [string length $bytes]
+	if {$n == 0} {
+	    my variable eof
+	    set eof 1
+	} else {
+	    incr size $n
+	}
+	my Readable
+	return $n
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable at eof read write size options
+    # at      : first location in read buffer not yet read
+    # eof     : indicates whether the end of the data has been reached 
+    # read    : read buffer
+    # write   : buffer for received data, i.e.
+    #           written into the halfpipe from
+    #           the other side.
+    # size    : combined length of receive and read buffers
+    #           == amount of stored data
+    # options : configuration array
+
+    # The halpipe uses a pointer (`at`) into the data buffer to
+    # extract the characters read by the user, while not shifting the
+    # data down in memory. Doing such a shift would cause a large
+    # performance hit (O(n**2) operation vs O(n)). This however comes
+    # with the danger of the buffer growing out of bounds as ever more
+    # data is appended by the receiver while the reader is not
+    # catching up, preventing a release. The solution to this in turn
+    # is to split the buffer into two. An append-only receive buffer
+    # (`write`) for incoming data, and a `read` buffer with the
+    # pointer. When the current read buffer is entirely consumed the
+    # current receive buffer becomes the new read buffer and a new
+    # empty receive buffer is started.
+    
+    # # ## ### ##### ######## #############
+
+    constructor {args} {
+	array set options {
+	    -write-command {}
+	    -empty-command {}
+	    -close-command {}
+	}
+	# todo: validity checking of options (legal names, legal
+	# values, etc.)
+	array set options $args
+	set at    0
+	set read  {}
+	set write {}
+	set size  0
+	next
+    }
+
+    method Readable {} {
+	if {$size || $eof} {
+	    my allow read
+	} else {
+	    my variable channel
+	    my disallow read
+	    my Call -empty-command $channel
+	}
+	return
+    }
+
+    method Call {o args} {
+	if {![llength $options($o)]} return
+	uplevel \#0 [list {*}$options($o) {*}$args]
+	return
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::halfpipe 1.0.2
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/memchan.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/memchan.tcl
new file mode 100644
index 00000000..8c0191e0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/memchan.tcl
@@ -0,0 +1,169 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# Variable string channel (in-memory r/w file, internal variable).
+# Seekable beyond the end of the data, implies appending of 0x00
+# bytes.
+
+# @@ Meta Begin
+# Package tcl::chan::memchan 1.0.4
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Re-implementation of Memchan's memchan
+# Meta description channel. Based on Tcl 8.5's channel
+# Meta description reflection support. Exports a single
+# Meta description command for the creation of new
+# Meta description channels. No arguments. Result is the
+# Meta description handle of the new channel. Essentially
+# Meta description an in-memory read/write random-access
+# Meta description file. Similar to -> tcl::chan::variable,
+# Meta description except the content variable is internal,
+# Meta description part of the channel. Further similar to
+# Meta description -> tcl::chan::string, except that the
+# Meta description content is here writable, and
+# Meta description extendable.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::events
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+package require tcl::chan::events
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+proc ::tcl::chan::memchan {} {
+    return [::chan create {read write} [memchan::implementation new]]
+}
+
+oo::class create ::tcl::chan::memchan::implementation {
+    superclass ::tcl::chan::events ; # -> initialize, finalize, watch
+
+    constructor {} {
+	set content {}
+	set at 0
+	next
+    }
+
+    method initialize {args} {
+	my allow write
+	my Events
+	next {*}$args
+    }
+
+    variable content at 
+
+    method read {c n} {
+	# First determine the location of the last byte to read,
+	# relative to the current location, and limited by the maximum
+	# location we are allowed to access per the size of the
+	# content.
+
+	set last [expr {min($at + $n,[string length $content])-1}]
+
+	# Then extract the relevant range from the content, move the
+	# seek location behind it, and return the extracted range. Not
+	# to forget, switch readable events based on the seek
+	# location.
+
+	set res [string range $content $at $last]
+	set at $last
+	incr at
+
+	my Events
+	return $res
+    }
+
+    method write {c newbytes} {
+	# Return immediately if there is nothing is to write.
+	set n [string length $newbytes]
+	if {$n == 0} {
+	    return $n
+	}
+
+	# Determine where and how to write. There are three possible cases.
+	# (1) Append at/after the end.
+	# (2) Starting in the middle, but extending beyond the end.
+	# (3) Replace in the middle.
+
+	set max [string length $content]
+	if {$at >= $max} {
+	    # Ad 1.
+	    append content $newbytes
+	    set at [string length $content]
+	} else {
+	    set last [expr {$at + $n - 1}]
+	    if {$last >= $max} {
+		# Ad 2.
+		set content [string replace $content $at end $newbytes]
+		set at [string length $content]
+	    } else {
+		# Ad 3.
+		set content [string replace $content $at $last $newbytes]
+		set at $last
+		incr at
+	    }
+	}
+
+	my Events
+	return $n
+    }
+
+    method seek {c offset base} {
+	# offset == 0 && base == current
+	# <=> Seek nothing relative to current
+	# <=> Report current location.
+
+	if {!$offset && ($base eq "current")} {
+	    return $at
+	}
+
+	# Compute the new location per the arguments.
+
+	set max [string length $content]
+	switch -exact -- $base {
+	    start   { set newloc $offset}
+	    current { set newloc [expr {$at  + $offset }] }
+	    end     { set newloc [expr {$max + $offset }] }
+	}
+
+	# Check if the new location is beyond the range given by the
+	# content.
+
+	if {$newloc < 0} {
+	    return -code error "Cannot seek before the start of the channel"
+	} elseif {$newloc > $max} {
+	    # We can seek beyond the end of the current contents, add
+	    # a block of zeros.
+	    #puts XXX.PAD.[expr {$newloc - $max}]
+	    append content [binary format @[expr {$newloc - $max}]]
+	}
+
+	# Commit to new location, switch readable events, and report.
+	set at $newloc
+
+	my Events
+	return $at
+    }
+
+    method Events {} {
+	# Always readable -- Even if the seek location is at the end
+	# (or beyond).  In that case the readable events are fired
+	# endlessly until the eof indicated by the seek location is
+	# properly processed by the event handler. Like for regular
+	# files -- Ticket [864a0c83e3].
+	my allow read
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::memchan 1.0.4
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/null.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/null.tcl
new file mode 100644
index 00000000..66feb77e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/null.tcl
@@ -0,0 +1,54 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::chan::null 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Re-implementation of Memchan's null
+# Meta description channel. Based on Tcl 8.5's channel
+# Meta description reflection support. Exports a single
+# Meta description command for the creation of new
+# Meta description channels. No arguments. Result is the
+# Meta description handle of the new channel.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::events
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+package require tcl::chan::events
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+proc ::tcl::chan::null {} {
+    return [::chan create {write} [null::implementation new]]
+}
+
+oo::class create ::tcl::chan::null::implementation {
+    superclass ::tcl::chan::events ; # -> initialize, finalize, watch
+
+    method initialize {args} {
+	my allow write
+	next {*}$args
+    }
+
+    # Ignore the data in most particulars. We do count it so that we
+    # can tell the caller that everything was written. Null device.
+
+    method write {c data} {
+	return [string length $data]
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::null 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/nullzero.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/nullzero.tcl
new file mode 100644
index 00000000..a21cd5b3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/nullzero.tcl
@@ -0,0 +1,62 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::chan::nullzero 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Implementation of a channel combining
+# Meta description Memchan's null and zero channels in a
+# Meta description single device. Based on Tcl 8.5's channel
+# Meta description reflection support. Exports a single
+# Meta description command for the creation of new
+# Meta description channels. No arguments. Result is the
+# Meta description handle of the new channel.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::events
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+package require tcl::chan::events
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+proc ::tcl::chan::nullzero {} {
+    return [::chan create {read write} [nullzero::implementation new]]
+}
+
+oo::class create ::tcl::chan::nullzero::implementation {
+    superclass ::tcl::chan::events ; # -> initialize, finalize, watch
+
+    method initialize {args} {
+	my allow read write
+	next {*}$args
+    }
+
+    # Ignore the data in most particulars. We do count it so that we
+    # can tell the caller that everything was written. Null device.
+
+    method write {c data} {
+	return [string length $data]
+    }
+
+    # Generate and return a block of N null bytes, as requested. Zero
+    # device.
+
+    method read {c n} {
+	return [binary format @$n]
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::nullzero 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/pkgIndex.tcl
new file mode 100644
index 00000000..a4c6033d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/pkgIndex.tcl
@@ -0,0 +1,17 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+
+package ifneeded tcl::chan::cat 1.0.3      [list source [file join $dir cat.tcl]]
+package ifneeded tcl::chan::facade 1.0.1   [list source [file join $dir facade.tcl]]
+package ifneeded tcl::chan::fifo 1         [list source [file join $dir fifo.tcl]]
+package ifneeded tcl::chan::fifo2 1        [list source [file join $dir fifo2.tcl]]
+package ifneeded tcl::chan::halfpipe 1.0.2 [list source [file join $dir halfpipe.tcl]]
+package ifneeded tcl::chan::memchan 1.0.4  [list source [file join $dir memchan.tcl]]
+package ifneeded tcl::chan::null 1         [list source [file join $dir null.tcl]]
+package ifneeded tcl::chan::nullzero 1     [list source [file join $dir nullzero.tcl]]
+package ifneeded tcl::chan::random 1       [list source [file join $dir random.tcl]]
+package ifneeded tcl::chan::std 1.0.1      [list source [file join $dir std.tcl]]
+package ifneeded tcl::chan::string 1.0.3   [list source [file join $dir string.tcl]]
+package ifneeded tcl::chan::textwindow 1   [list source [file join $dir textwindow.tcl]]
+package ifneeded tcl::chan::variable 1.0.4 [list source [file join $dir variable.tcl]]
+package ifneeded tcl::chan::zero 1         [list source [file join $dir zero.tcl]]
+package ifneeded tcl::randomseed 1         [list source [file join $dir randseed.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/random.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/random.tcl
new file mode 100644
index 00000000..ccb82675
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/random.tcl
@@ -0,0 +1,80 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::chan::random 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Implementation of a channel similar to
+# Meta description Memchan's random channel. Based on Tcl
+# Meta description 8.5's channel reflection support. Exports
+# Meta description a single command for the creation of new
+# Meta description channels. One argument, a list of
+# Meta description numbers to initialize the feedback
+# Meta description register of the internal random number
+# Meta description generator. Result is the handle of the
+# Meta description new channel.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::events
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require tcl::chan::events
+package require Tcl 8.5
+package require TclOO
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+proc ::tcl::chan::random {seed} {
+    return [::chan create {read} [random::implementation new $seed]]
+}
+
+oo::class create ::tcl::chan::random::implementation {
+    superclass tcl::chan::events ; # -> initialize, finalize, watch
+
+    constructor {theseed} {
+	my variable seed next
+	set seed $theseed
+	set next [expr "([join $seed +]) & 0xff"]
+	next
+    }
+
+    method initialize {args} {
+	my allow read
+	next {*}$args
+    }
+
+    # Generate and return a block of N randomly selected bytes, as
+    # requested. Random device.
+
+    method read {c n} {
+	set buffer {}
+	while {$n} {
+	    append buffer [binary format c [my Next]]
+	    incr n -1
+	}
+	return $buffer
+    }
+
+    variable seed
+    variable next
+
+    method Next {} {
+	my variable seed next
+	set result $next
+	set next [expr {(2*$next - [lindex $seed 0]) & 0xff}]
+	set seed [linsert [lrange $seed 1 end] end $result]
+	return $result
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::random 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/randseed.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/randseed.tcl
new file mode 100644
index 00000000..48bf96d9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/randseed.tcl
@@ -0,0 +1,58 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::randomseed 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Generate and combine seed lists for the
+# Meta description random number generator inside of the
+# Meta description tcl::chan::random channel. Sources of
+# Meta description randomness are process id, time in two
+# Meta description granularities, and Tcl's random number
+# Meta description generator.
+# Meta platform tcl
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl {}
+
+proc ::tcl::randomseed {} {
+    set result {}
+    foreach v [list \
+		   [pid] \
+		   [clock seconds] \
+		   [expr {int(256*rand())}] \
+		   [clock clicks -milliseconds]] \
+	{
+	    lappend result [expr {$v % 256}]
+	}
+    return $result
+}
+
+proc ::tcl::combine {a b} {
+    while {[llength $a] < [llength $b]} {
+	lappend a 0
+    }
+    while {[llength $b] < [llength $a]} {
+	lappend b 0
+    }
+
+    set result {}
+    foreach x $a y $b {
+	lappend result [expr {($x ^ $y) % 256}]
+    }
+    return $result
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::randomseed 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/std.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/std.tcl
new file mode 100644
index 00000000..c058d247
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/std.tcl
@@ -0,0 +1,97 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2011 Andreas Kupries
+
+# Facade wrapping the separate channels for stdin and stdout into a
+# single read/write channel for all regular standard i/o. Not
+# seekable. Fileevent handling is propagated to the regular channels
+# the facade wrapped about. Only one instance of the class is
+# ever created.
+
+# @@ Meta Begin
+# Package tcl::chan::std 1.0.1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2011
+# Meta as::license BSD
+# Meta description Facade wrapping the separate channels for stdin
+# Meta description and stdout into a single read/write channel for
+# Meta description all regular standard i/o. Not seekable. Only one
+# Meta description instance of the class is ever created.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::core
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+package require tcl::chan::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+proc ::tcl::chan::std {} {
+    ::variable std
+    if {$std eq {}} {
+	set std [::chan create {read write} [std::implementation new]]
+    }
+    return $std
+}
+
+oo::class create ::tcl::chan::std::implementation {
+    superclass ::tcl::chan::core ; # -> initialize, finalize.
+
+    # We are not using the standard event handling class, because here
+    # it will not be timer-driven. We propagate anything related to
+    # events to stdin and stdout instead and let them handle things.
+
+    constructor {} {
+	# Disable encoding and translation processing in the wrapped channels.
+	# This will happen in our generic layer instead.
+	fconfigure stdin  -translation binary
+	fconfigure stdout -translation binary
+	return
+    }
+
+    method watch {c requestmask} {
+
+	if {"read" in $requestmask} {
+	    fileevent readable stdin [list chan postevent $c read]
+	} else {
+	    fileevent readable stdin {}
+	}
+
+	if {"write" in $requestmask} {
+	    fileevent readable stdin [list chan postevent $c write]
+	} else {
+	    fileevent readable stdout {}
+	}
+
+	return
+    }
+
+    method read {c n} {
+	# Read is redirected to stdin.
+	return [::read stdin $n]
+    }
+
+    method write {c newbytes} {
+	# Write is redirected to stdout.
+	puts -nonewline stdout $newbytes
+	flush stdout
+	return [string length $newbytes]
+    }
+}
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {
+    ::variable std {}
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::std 1.0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/string.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/string.tcl
new file mode 100644
index 00000000..332e1a4d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/string.tcl
@@ -0,0 +1,124 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::chan::string 1.0.3
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Implementation of a channel representing
+# Meta description an in-memory read-only random-access
+# Meta description file. Based on using Tcl 8.5's channel
+# Meta description reflection support. Exports a single
+# Meta description command for the creation of new channels.
+# Meta description One argument, the contents of the file.
+# Meta description Result is the  handle of the new channel.
+# Meta description Similar to -> tcl::chan::memchan, except
+# Meta description that the content is read-only. Seekable
+# Meta description only within the bounds of the content.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::events
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+package require tcl::chan::events
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+proc ::tcl::chan::string {content} {
+    return [::chan create {read} [string::implementation new $content]]
+}
+
+oo::class create ::tcl::chan::string::implementation {
+    superclass ::tcl::chan::events ; # -> initialize, finalize, watch
+
+    constructor {thecontent} {
+	set content $thecontent
+	set at 0
+	next
+    }
+
+    method initialize {args} {
+	my Events
+	next {*}$args
+    }
+
+    variable content at 
+
+    method read {c n} {
+
+	# First determine the location of the last byte to read,
+	# relative to the current location, and limited by the maximum
+	# location we are allowed to access per the size of the
+	# content.
+
+	set last [expr {min($at + $n,[string length $content])-1}]
+
+	# Then extract the relevant range from the content, move the
+	# seek location behind it, and return the extracted range. Not
+	# to forget, switch readable events based on the seek
+	# location.
+
+	set res [string range $content $at $last]
+	set at $last
+	incr at
+
+	my Events
+	return $res
+    }
+
+    method seek {c offset base} {
+	# offset == 0 && base == current
+	# <=> Seek nothing relative to current
+	# <=> Report current location.
+
+	if {!$offset && ($base eq "current")} {
+	    return $at
+	}
+
+	# Compute the new location per the arguments.
+
+	set max [string length $content]
+	switch -exact -- $base {
+	    start   { set newloc $offset}
+	    current { set newloc [expr {$at  + $offset }] }
+	    end     { set newloc [expr {$max + $offset }] }
+	}
+
+	# Check if the new location is beyond the range given by the
+	# content.
+
+	if {$newloc < 0} {
+	    return -code error "Cannot seek before the start of the channel"
+	} elseif {$newloc > $max} {
+	    return -code error "Cannot seek after the end of the channel"
+	}
+
+	# Commit to new location, switch readable events, and report.
+	set at $newloc
+
+	my Events
+	return $at
+    }
+
+    method Events {} {
+	# Always readable -- Even if the seek location is at the end
+	# (or beyond).  In that case the readable events are fired
+	# endlessly until the eof indicated by the seek location is
+	# properly processed by the event handler. Like for regular
+	# files -- Ticket [864a0c83e3].
+	my allow read
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::string 1.0.3
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/textwindow.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/textwindow.tcl
new file mode 100644
index 00000000..85231bf1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/textwindow.tcl
@@ -0,0 +1,74 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::chan::textwindow 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta as::credit  To Bryan Oakley for rotext, see
+# Meta as::credit  http://wiki.tcl.tk/22036. His code was
+# Meta as::credit  used here as template for the text
+# Meta as::credit  widget portions of the channel.
+# Meta description Implementation of a text window
+# Meta description channel, using Tcl 8.5's channel
+# Meta description reflection support. Exports a single
+# Meta description command for the creation of new
+# Meta description channels. No arguments. Result is the
+# Meta description handle of the new channel.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::events
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+package require tcl::chan::events
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+proc ::tcl::chan::textwindow {w} {
+    set chan [::chan create {write} [textwindow::implementation new $w]]
+    fconfigure $chan -encoding utf-8 -buffering none
+    return $chan
+}
+
+oo::class create ::tcl::chan::textwindow::implementation {
+    superclass ::tcl::chan::events ; # -> initialize, finalize, watch
+
+    constructor {w} {
+	set widget $w
+	next
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable widget
+
+    # # ## ### ##### ######## #############
+
+    method initialize {args} {
+	my allow write
+	next {*}$args
+    }
+
+    method write {c data} {
+	# NOTE: How is encoding convertfrom dealing with a partial
+	# utf-8 character at the end of the buffer ? Should be saved
+	# up for the next buffer. No idea if we can.
+
+	$widget insert end [encoding convertfrom utf-8 $data]
+	$widget see end
+	return [string length $data]
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::textwindow 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/variable.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/variable.tcl
new file mode 100644
index 00000000..ac313674
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/variable.tcl
@@ -0,0 +1,181 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::chan::variable 1.0.4
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Implementation of a channel representing
+# Meta description an in-memory read-write random-access
+# Meta description file. Based on Tcl 8.5's channel reflection
+# Meta description support. Exports a single command for the
+# Meta description creation of new channels. No arguments.
+# Meta description Result is the handle of the new channel.
+# Meta description Similar to -> tcl::chan::memchan, except
+# Meta description that the variable holding the content
+# Meta description exists outside of the channel itself, in
+# Meta description some namespace, and as such is not a part
+# Meta description of the channel. Seekable beyond the end
+# Meta description of the data, implies appending of 0x00
+# Meta description bytes.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::events
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+package require tcl::chan::events
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+proc ::tcl::chan::variable {varname} {
+    return [::chan create {read write} [variable::implementation new $varname]]
+}
+
+oo::class create ::tcl::chan::variable::implementation {
+    superclass ::tcl::chan::events ; # -> initialize, finalize, watch
+
+    constructor {thevarname} {
+	set varname $thevarname
+	set at 0
+
+	upvar #0 $varname content
+	if {![info exists content]} {
+	    set content {}
+	}
+	next
+    }
+
+    method initialize {args} {
+	my allow write
+	my Events
+	next {*}$args
+    }
+
+    variable varname at 
+
+    method read {c n} {
+	# Bring connected variable for content into scope.
+
+	upvar #0 $varname content
+
+	# First determine the location of the last byte to read,
+	# relative to the current location, and limited by the maximum
+	# location we are allowed to access per the size of the
+	# content.
+
+	set last [expr {min($at + $n,[string length $content])-1}]
+
+	# Then extract the relevant range from the content, move the
+	# seek location behind it, and return the extracted range. Not
+	# to forget, switch readable events based on the seek
+	# location.
+
+	set res [string range $content $at $last]
+	set at $last
+	incr at
+
+	my Events
+	return $res
+    }
+
+    method write {c newbytes} {
+	# Bring connected variable for content into scope.
+
+	upvar #0 $varname content
+
+	# Return immediately if there is nothing is to write.
+	set n [string length $newbytes]
+	if {$n == 0} {
+	    return $n
+	}
+
+	# Determine where and how to write. There are three possible cases.
+	# (1) Append at/after the end.
+	# (2) Starting in the middle, but extending beyond the end.
+	# (3) Replace in the middle.
+
+	set max [string length $content]
+	if {$at >= $max} {
+	    # Ad 1.
+	    append content $newbytes
+	    set at [string length $content]
+	} else {
+	    set last [expr {$at + $n - 1}]
+	    if {$last >= $max} {
+		# Ad 2.
+		set content [string replace $content $at end $newbytes]
+		set at [string length $content]
+	    } else {
+		# Ad 3.
+		set content [string replace $content $at $last $newbytes]
+		set at $last
+		incr at
+	    }
+	}
+
+	my Events
+	return $n
+    }
+
+    method seek {c offset base} {
+	# offset == 0 && base == current
+	# <=> Seek nothing relative to current
+	# <=> Report current location.
+
+	if {!$offset && ($base eq "current")} {
+	    return $at
+	}
+
+	# Bring connected variable for content into scope.
+
+	upvar #0 $varname content
+
+	# Compute the new location per the arguments.
+
+	set max [string length $content]
+	switch -exact -- $base {
+	    start   { set newloc $offset}
+	    current { set newloc [expr {$at  + $offset }] }
+	    end     { set newloc [expr {$max + $offset }] }
+	}
+
+	# Check if the new location is beyond the range given by the
+	# content.
+
+	if {$newloc < 0} {
+	    return -code error "Cannot seek before the start of the channel"
+	} elseif {$newloc > $max} {
+	    # We can seek beyond the end of the current contents, add
+	    # a block of zeros.
+	    append content [binary format @[expr {$newloc - $max}]]
+	}
+
+	# Commit to new location, switch readable events, and report.
+	set at $newloc
+
+	my Events
+	return $at
+    }
+
+    method Events {} {
+	# Always readable -- Even if the seek location is at the end
+	# (or beyond).  In that case the readable events are fired
+	# endlessly until the eof indicated by the seek location is
+	# properly processed by the event handler. Like for regular
+	# files -- Ticket [864a0c83e3].
+	my allow read
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::variable 1.0.4
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/zero.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/zero.tcl
new file mode 100644
index 00000000..fae27f34
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_base/zero.tcl
@@ -0,0 +1,54 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::chan::zero 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Re-implementation of Memchan's zero
+# Meta description channel. Based on Tcl 8.5's channel
+# Meta description reflection support. Exports a single
+# Meta description command for the creation of new
+# Meta description channels. No arguments. Result is the
+# Meta description handle of the new channel.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require tcl::chan::events
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+package require tcl::chan::events
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::chan {}
+
+proc ::tcl::chan::zero {} {
+    return [::chan create {read} [zero::implementation new]]
+}
+
+oo::class create ::tcl::chan::zero::implementation {
+    superclass tcl::chan::events ; # -> initialize, finalize, watch
+
+    method initialize {args} {
+	my allow read
+	next {*}$args
+    }
+
+    # Generate and return a block of N null bytes, as requested.
+    # Zero device.
+
+    method read {c n} {
+	return [binary format @$n]
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::chan::zero 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_core/core.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_core/core.tcl
new file mode 100644
index 00000000..76f1e5e4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_core/core.tcl
@@ -0,0 +1,73 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::chan::core 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Support package handling a core
+# Meta description aspect of reflected base channels
+# Meta description (initialization, finalization).
+# Meta description It is expected that this class
+# Meta description is used as either one superclass of the
+# Meta description class C for a specific channel, or is
+# Meta description mixed into C.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+
+# # ## ### ##### ######## #############
+
+oo::class create ::tcl::chan::core {
+    destructor {
+	if {$channel eq {}} return
+	close $channel
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    method initialize {thechannel mode} {
+	set methods [info object methods [self] -all]
+
+	# Note: Checking of the mode against the supported methods is
+	#       done by the caller.
+
+	set channel $thechannel
+	set supported {}
+	foreach m {
+	    initialize finalize watch read write seek configure cget
+	    cgetall blocking
+	} {
+	    if {$m in $methods} {
+		lappend supported $m
+	    }
+	}
+	return $supported
+    }
+
+    method finalize {c} {
+	set channel {} ; # Prevent destroctor from calling close.
+	my destroy
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable channel
+
+    # channel The channel the handler belongs to.
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### #####
+package provide tcl::chan::core 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_core/events.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_core/events.tcl
new file mode 100644
index 00000000..ce7bbc5b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_core/events.tcl
@@ -0,0 +1,154 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::chan::events 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Support package handling a core
+# Meta description aspect of reflected base channels
+# Meta description (timer
+# Meta description driven file event support). Controls a
+# Meta description timer generating the expected read/write
+# Meta description events. It is expected that this class
+# Meta description is used as either one superclass of the
+# Meta description class C for a specific channel, or is
+# Meta description mixed into C.
+# Meta platform tcl
+# Meta require tcl::chan::core
+# Meta require TclOO
+# Meta require {Tcl 8.5}
+# @@ Meta End
+
+# TODO :: set/get accessor methods for the timer delay
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.5
+package require TclOO
+package require tcl::chan::core
+
+# # ## ### ##### ######## #############
+
+oo::class create ::tcl::chan::events {
+    superclass ::tcl::chan::core ; # -> initialize, finalize, destructor
+
+    constructor {} {
+	array set allowed {
+	    read  0
+	    write 0
+	}
+	set requested {}
+	set delay     10
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    method finalize {c} {
+	my disallow read write
+	next $c
+    }
+
+    # Allow/disallow the posting of events based on the
+    # events requested by Tcl's IO system, and the mask of
+    # events the instance's channel can handle, per all
+    # preceding calls of allow and disallow.
+
+    method watch {c requestmask} {
+	if {$requestmask eq $requested} return
+	set requested $requestmask
+	my Update
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    # Declare that the named events are handled by the
+    # channel. This may start a timer to periodically post
+    # these events to the instance's channel.
+
+    method allow {args} {
+	my Allowance $args yes
+	return
+    }
+
+    # Declare that the named events are not handled by the
+    # channel. This may stop the periodic posting of events
+    # to the instance's channel.
+
+    method disallow {args} {
+	my Allowance $args no
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    # Event System State - Timer driven
+
+    variable timer allowed requested posting delay    
+
+    # channel   = The channel to post events to - provided by superclass
+    # timer     = Timer controlling the posting.
+    # allowed   = Set of events allowed to post.
+    # requested = Set of events requested by core.
+    # posting   = Set of events we are posting.
+    # delay     = Millisec interval between posts.
+
+    # 'allowed' is an Array (event name -> boolean). The
+    # value is true if the named event is allowed to be
+    # posted.
+
+    # Common code used by both allow and disallow to enter
+    # the state change.
+
+    method Allowance {events enable} {
+	set changed no
+	foreach event $events {
+	    if {$allowed($event) == $enable} continue
+	    set allowed($event) $enable
+	    set changed yes
+	}
+	if {!$changed} return
+	my Update
+	return
+    }
+
+    # Merge the current event allowance and the set of
+    # requested events into one datum, the set of events to
+    # post. From that then derive whether we need a timer or
+    # not and act accordingly.
+
+    method Update {} {
+	catch { after cancel $timer }
+	set posting {}
+	foreach event $requested {
+	    if {!$allowed($event)} continue
+	    lappend posting $event
+	}
+	if {[llength $posting]} {
+	    set timer [after $delay \
+			   [namespace code [list my Post]]]
+	} else {
+	    catch { unset timer }
+	}
+	return
+    }
+
+    # Post the current set of events, then reschedule to
+    # make this periodic.
+
+    method Post {} {
+	my variable channel
+	set timer [after $delay \
+		       [namespace code [list my Post]]]
+	chan postevent $channel $posting
+	return
+    }
+}
+
+# # ## ### #####
+package provide tcl::chan::events 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_core/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_core/pkgIndex.tcl
new file mode 100644
index 00000000..e4e656d4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_core/pkgIndex.tcl
@@ -0,0 +1,8 @@
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+
+package ifneeded tcl::chan::core 1   [list source [file join $dir core.tcl]]
+package ifneeded tcl::chan::events 1 [list source [file join $dir events.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+
+package ifneeded tcl::transform::core 1 [list source [file join $dir transformcore.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_core/transformcore.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_core/transformcore.tcl
new file mode 100644
index 00000000..9e974169
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_core/transformcore.tcl
@@ -0,0 +1,71 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::transform::core 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Support package handling a core
+# Meta description aspect of reflected transform channels
+# Meta description (initialization, finalization).
+# Meta description It is expected that this class
+# Meta description is used as either one superclass of the
+# Meta description class C for a specific channel, or is
+# Meta description mixed into C.
+# Meta platform tcl
+# Meta require TclOO
+# Meta require {Tcl 8.6}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.6
+
+# # ## ### ##### ######## #############
+
+oo::class create ::tcl::transform::core {
+    destructor {
+	if {$channel eq {}} return
+	close $channel
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    method initialize {thechannel mode} {
+	set methods [info object methods [self] -all]
+
+	# Note: Checking of the mode against the supported methods is
+	#       done by the caller.
+
+	set channel $thechannel
+	set supported {}
+	foreach m {
+	    initialize finalize read write drain flush limit?
+	} {
+	    if {$m in $methods} {
+		lappend supported $m
+	    }
+	}
+	return $supported
+    }
+
+    method finalize {c} {
+	set channel {} ; # Prevent destroctor from calling close.
+	my destroy
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable channel
+
+    # channel The channel the handler belongs to.
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### #####
+package provide tcl::transform::core 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/adler32.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/adler32.tcl
new file mode 100644
index 00000000..441ea8ef
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/adler32.tcl
@@ -0,0 +1,103 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::transform::adler32 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta as::notes   For other observers see crc32, counter,
+# Meta as::notes   identity, and observer (stream copy).
+# Meta description Implementation of an adler32 checksum
+# Meta description transformation. Based on Tcl 8.6's
+# Meta description transformation reflection support (TIP
+# Meta description 230), and its zlib support (TIP 234) for
+# Meta description the adler32 functionality. An observer
+# Meta description instead of a transformation. For details
+# Meta description on the adler checksum see
+# Meta description http://en.wikipedia.org/wiki/Adler-32 .
+# Meta description The observer saves the checksums into two
+# Meta description namespaced external variables specified
+# Meta description at construction time. Exports a single
+# Meta description command adding a new transformation of
+# Meta description this type to a channel. One argument,
+# Meta description the channel to extend, plus options to
+# Meta description specify the variables for the checksums.
+# Meta description No result.
+# Meta platform tcl
+# Meta require tcl::transform::core
+# Meta require {Tcl 8.6}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.6
+package require tcl::transform::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::transform {}
+
+proc ::tcl::transform::adler32 {chan args} {
+    ::chan push $chan [adler32::implementation new {*}$args]
+}
+
+oo::class create ::tcl::transform::adler32::implementation {
+    superclass tcl::transform::core ;# -> initialize, finalize, destructor
+
+    # This transformation continuously computes a checksum from the
+    # data it sees. This data may be arbitrary parts of the input or
+    # output if the channel is seeked while the transform is
+    # active. This may not be what is wanted and the desired behaviour
+    # may require the destruction of the transform before seeking.
+
+    method write {c data} {
+	my Adler32 -write-variable $data
+	return $data
+    }
+
+    method read {c data} {
+	my Adler32 -read-variable $data
+	return $data
+    }
+
+    # # ## ### ##### ######## #############
+
+    constructor {args} {
+	array set options {
+	    -read-variable  {}
+	    -write-variable {}
+	}
+	# todo: validity checking of options (legal names, legal
+	# values, etc.)
+	array set options $args
+	my Init -read-variable
+	my Init -write-variable
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable options
+
+    # # ## ### ##### ######## #############
+
+    method Init {o} {
+	if {$options($o) eq ""} return
+	upvar #0 $options($o) adler
+	set adler 1
+	return
+    }
+
+    method Adler32 {o data} {
+	if {$options($o) eq ""} return
+	upvar #0 $options($o) adler
+	set adler [zlib adler32 $data $adler]
+	return
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::transform::adler32 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/base64.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/base64.tcl
new file mode 100644
index 00000000..bad2b683
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/base64.tcl
@@ -0,0 +1,111 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::transform::base64 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta as::notes   Possibilities for extension: Currently
+# Meta as::notes   the mapping between read/write and
+# Meta as::notes   decode/encode is fixed. Allow it to be
+# Meta as::notes   configured at construction time.
+# Meta description Implementation of a base64
+# Meta description transformation (RFC 4648). Based on Tcl
+# Meta description 8.6's transformation reflection support
+# Meta description (TIP 230) and binary en/decode (TIP 317).
+# Meta description Exports a single command adding a new
+# Meta description transformation of this type to a channel.
+# Meta description One argument, the channel to extend. No
+# Meta description result.
+# Meta platform tcl
+# Meta require tcl::transform::core
+# Meta require {Tcl 8.6}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.6
+package require tcl::transform::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::transform {}
+
+proc ::tcl::transform::base64 {chan} {
+    ::chan push $chan [base64::implementation new]
+    return
+}
+
+oo::class create ::tcl::transform::base64::implementation {
+    superclass tcl::transform::core ;# -> initialize, finalize, destructor
+
+    method write {c data} {
+	my Code encodebuf encode $data 3
+    }
+
+    method read {c data} {
+	my Code decodebuf decode $data 4
+    }
+
+    method flush {c} {
+	set data [binary encode base64 $encodebuf]
+	set encodebuf {}
+	return $data
+    }
+
+    method drain {c} {
+	set data [binary decode base64 $decodebuf]
+	set decodebuf {}
+	return $data
+    }
+
+    method clear {c} {
+	set decodebuf {}
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    constructor {} {
+	set encodebuf {}
+	set decodebuf {}
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable encodebuf decodebuf
+
+    # # ## ### ##### ######## #############
+
+    method Code {bufvar op data n} {
+	upvar 1 $bufvar buffer
+
+	append buffer $data
+
+	set n [my Complete $buffer $n]
+	if {$n < 0} {
+	    return {}
+	}
+
+	set result \
+	    [binary $op base64 \
+		 [string range $buffer 0 $n]]
+	incr n
+	set buffer \
+	    [string range $buffer $n end]
+
+	return $result
+    }
+
+    method Complete {buffer n} {
+	set len [string length $buffer]
+	return [expr {(($len / $n) * $n)-1}]
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::transform::base64 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/counter.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/counter.tcl
new file mode 100644
index 00000000..73bb9fdb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/counter.tcl
@@ -0,0 +1,94 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::transform::counter 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta as::notes   For other observers see adler32, crc32,
+# Meta as::notes   identity, and observer (stream copy).
+# Meta as::notes   Possibilities for extension: Separate
+# Meta as::notes   counters per byte value. Count over
+# Meta as::notes   fixed time-intervals = channel speed.
+# Meta as::notes   Use callbacks or traces to save changes
+# Meta as::notes   in the counters, etc. as time-series.
+# Meta as::notes   Compute statistics over the time-series.
+# Meta description Implementation of a counter
+# Meta description transformation. Based on Tcl 8.6's
+# Meta description transformation reflection support (TIP
+# Meta description 230). An observer instead of a
+# Meta description transformation, it counts the number of
+# Meta description bytes read and written. The observer
+# Meta description saves the counts into two external
+# Meta description namespaced variables specified at
+# Meta description construction time. Exports a single
+# Meta description command adding a new transformation of
+# Meta description this type to a channel. One argument,
+# Meta description the channel to extend, plus options to
+# Meta description specify the variables for the counters.
+# Meta description No result.
+# Meta platform tcl
+# Meta require tcl::transform::core
+# Meta require {Tcl 8.6}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.6
+package require tcl::transform::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::transform {}
+
+proc ::tcl::transform::counter {chan args} {
+    ::chan push $chan [counter::implementation new {*}$args]
+}
+
+oo::class create ::tcl::transform::counter::implementation {
+    superclass tcl::transform::core ;# -> initialize, finalize, destructor
+
+    method write {c data} {
+	my Count -write-variable $data
+	return $data
+    }
+
+    method read {c data} {
+	my Count -read-variable $data
+	return $data
+    }
+
+    # No partial data, nor state => no flush, drain, nor clear needed.
+
+    # # ## ### ##### ######## #############
+
+    constructor {args} {
+	array set options {
+	    -read-variable  {}
+	    -write-variable {}
+	}
+	# todo: validity checking of options (legal names, legal
+	# values, etc.)
+	array set options $args
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable options
+
+    # # ## ### ##### ######## #############
+
+    method Count {o data} {
+	if {$options($o) eq ""} return
+	upvar #0 $options($o) counter
+	incr counter [string length $data]
+	return
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::transform::counter 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/crc32.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/crc32.tcl
new file mode 100644
index 00000000..83e72240
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/crc32.tcl
@@ -0,0 +1,103 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::transform::crc32 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta as::notes   For other observers see adler32, counter,
+# Meta as::notes   identity, and observer (stream copy).
+# Meta description Implementation of a crc32 checksum
+# Meta description transformation. Based on Tcl 8.6's
+# Meta description transformation reflection support (TIP
+# Meta description 230), and its zlib support (TIP 234) for
+# Meta description the crc32 functionality. An observer
+# Meta description instead of a transformation. For details
+# Meta description on the crc checksum see
+# Meta description http://en.wikipedia.org/wiki/Cyclic_redundancy_check#Commonly_used_and_standardised_CRCs .
+# Meta description The observer saves the checksums into two
+# Meta description namespaced external variables specified
+# Meta description at construction time. Exports a single
+# Meta description command adding a new transformation of
+# Meta description this type to a channel. One argument,
+# Meta description the channel to extend, plus options to
+# Meta description specify the variables for the checksums.
+# Meta description No result.
+# Meta platform tcl
+# Meta require tcl::transform::core
+# Meta require {Tcl 8.6}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.6
+package require tcl::transform::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::transform {}
+
+proc ::tcl::transform::crc32 {chan args} {
+    ::chan push $chan [crc32::implementation new {*}$args]
+}
+
+oo::class create ::tcl::transform::crc32::implementation {
+    superclass tcl::transform::core ;# -> initialize, finalize, destructor
+
+    # This transformation continuously computes a checksum from the
+    # data it sees. This data may be arbitrary parts of the input or
+    # output if the channel is seeked while the transform is
+    # active. This may not be what is wanted and the desired behaviour
+    # may require the destruction of the transform before seeking.
+
+    method write {c data} {
+	my Crc32 -write-variable $data
+	return $data
+    }
+
+    method read {c data} {
+	my Crc32 -read-variable $data
+	return $data
+    }
+
+    # # ## ### ##### ######## #############
+
+    constructor {args} {
+	array set options {
+	    -read-variable  {}
+	    -write-variable {}
+	}
+	# todo: validity checking of options (legal names, legal
+	# values, etc.)
+	array set options $args
+	my Init -read-variable
+	my Init -write-variable
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable options
+
+    # # ## ### ##### ######## #############
+
+    method Init {o} {
+	if {$options($o) eq ""} return
+	upvar #0 $options($o) crc
+	set crc 0
+	return
+    }
+
+    method Crc32 {o data} {
+	if {$options($o) eq ""} return
+	upvar #0 $options($o) crc
+	set crc [zlib crc32 $data $crc]
+	return
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::transform::crc32 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/hex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/hex.tcl
new file mode 100644
index 00000000..f3be1046
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/hex.tcl
@@ -0,0 +1,58 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::transform::hex 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Implementation of a hex transformation,
+# Meta description using Tcl 8.6's transformation
+# Meta description reflection support. Uses the binary
+# Meta description command to implement the transformation.
+# Meta description Exports a single command adding a new
+# Meta description transform of this type to a channel. One
+# Meta description argument, the channel to extend. No
+# Meta description result.
+# Meta platform tcl
+# Meta require tcl::transform::core
+# Meta require {Tcl 8.6}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.6
+package require tcl::transform::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::transform {}
+
+proc ::tcl::transform::hex {chan} {
+    ::chan push $chan [hex::implementation new]
+    return
+}
+
+oo::class create ::tcl::transform::hex::implementation {
+    superclass tcl::transform::core ;# -> initialize, finalize, destructor
+
+    method write {c data} {
+	# bytes -> hex
+	binary scan $data H* hex
+	return $hex
+    }
+
+    method read {c data} {
+	# hex -> bytes
+	return [binary format H* $data]
+    }
+
+    # No partial data, nor state => no flush, drain, nor clear needed.
+
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::transform::hex 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/identity.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/identity.tcl
new file mode 100644
index 00000000..9ad80b7b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/identity.tcl
@@ -0,0 +1,59 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::transform::identity 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta as::notes   The prototypical observer transformation.
+# Meta as::notes   To observers what null is to reflected
+# Meta as::notes   base channels. For other observers see
+# Meta as::notes   adler32, crc32, counter, and observer
+# Meta as::notes   (stream copy).
+# Meta description Implementation of an identity
+# Meta description transformation, i.e one which does not
+# Meta description change the data in any way, shape, or
+# Meta description form. Based on Tcl 8.6's transformation
+# Meta description reflection support. Exports a single
+# Meta description command adding a new transform of this
+# Meta description type to a channel. One argument, the
+# Meta description channel to extend. No result.
+# Meta platform tcl
+# Meta require tcl::transform::core
+# Meta require {Tcl 8.6}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.6
+package require tcl::transform::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::transform {}
+
+proc ::tcl::transform::identity {chan} {
+    ::chan push $chan [identity::implementation new]
+}
+
+oo::class create ::tcl::transform::identity::implementation {
+    superclass tcl::transform::core ;# -> initialize, finalize, destructor
+
+    method write {c data} {
+	return $data
+    }
+
+    method read {c data} {
+	return $data
+    }
+
+    # No partial data, nor state => no flush, drain, nor clear needed.
+
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::transform::identity 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/limitsize.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/limitsize.tcl
new file mode 100644
index 00000000..72d79efc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/limitsize.tcl
@@ -0,0 +1,88 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::transform::limitsize 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta as::notes   Possibilities for extension: Trigger the
+# Meta as::notes   EOF when finding specific patterns in
+# Meta as::notes   the input. Trigger the EOF based on some
+# Meta as::notes   external signal routed into the limiter.
+# Meta as::notes   Make the limit reconfigurable.
+# Meta description Implementation of a transformation
+# Meta description limiting the number of bytes read
+# Meta description from its channel. An observer instead of
+# Meta description a transformation, forcing an artificial
+# Meta description EOF marker. Based on Tcl 8.6's
+# Meta description transformation reflection support.
+# Meta description Exports a single command adding a new
+# Meta description transform of this type to a channel. One
+# Meta description argument, the channel to extend, and the
+# Meta description number of bytes to allowed to be read.
+# Meta description No result.
+# Meta platform tcl
+# Meta require tcl::transform::core
+# Meta require {Tcl 8.6}
+# @@ Meta End
+
+# This may help with things like zlib compression of messages. Have
+# the message format a length at the front, followed by a payload of
+# that size. Now we may compress messages. On the read side we can use
+# the limiter to EOF on a message, then reset the limit for the
+# next. This is a half-baked idea.
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.6
+package require tcl::transform::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::transform {}
+
+proc ::tcl::transform::limitsize {chan max} {
+    ::chan push $chan [limitsize::implementation new $max]
+}
+
+oo::class create ::tcl::transform::limitsize::implementation {
+    superclass tcl::transform::core ;# -> initialize, finalize, destructor
+
+    method write {c data} {
+	return $data
+    }
+
+    method read {c data} {
+	# Reduce the limit of bytes allowed in the future according to
+	# the number of bytes we have seen already.
+
+	if {$max > 0} {
+	    incr max -[string length $data]
+	    if {$max < 0} {
+		set max 0
+	    }
+	}
+	return $data
+    }
+
+    method limit? {c} {
+	return $max
+    }
+
+    # # ## ### ##### ######## #############
+
+    constructor {themax} {
+	set max $themax
+	return
+    }
+
+    variable max
+
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::transform::limitsize 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/observe.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/observe.tcl
new file mode 100644
index 00000000..65f5754a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/observe.tcl
@@ -0,0 +1,80 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::transform::observe 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta as::notes   For other observers see adler32, crc32,
+# Meta as::notes   identity, and counter.
+# Meta as::notes   Possibilities for extension: Save the
+# Meta as::notes   observed bytes to variables instead of
+# Meta as::notes   channels. Use callbacks to save the
+# Meta as::notes   observed bytes.
+# Meta description Implementation of an observer
+# Meta description transformation copying the bytes going
+# Meta description through it into two channels configured
+# Meta description at construction time. Based on Tcl 8.6's
+# Meta description transformation reflection support.
+# Meta description Exports a single command adding a new
+# Meta description transformation of this type to a channel.
+# Meta description Three arguments, the channel to extend,
+# Meta description plus the channels to write the bytes to.
+# Meta description No result.
+# Meta platform tcl
+# Meta require tcl::transform::core
+# Meta require {Tcl 8.6}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.6
+package require tcl::transform::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::transform {}
+
+proc ::tcl::transform::observe {chan logw logr} {
+    ::chan push $chan [observe::implementation new $logw $logr]
+}
+
+oo::class create ::tcl::transform::observe::implementation {
+    superclass tcl::transform::core ;# -> initialize, finalize, destructor
+
+    method write {c data} {
+	if {$logw ne {}} {
+	    puts -nonewline $logw $data
+	}
+	return $data
+    }
+
+    method read {c data} {
+	if {$logr ne {}} {
+	    puts -nonewline $logr $data
+	}
+	return $data
+    }
+
+    # No partial data, nor state => no flush, drain, nor clear needed.
+
+    # # ## ### ##### ######## #############
+
+    constructor {lw lr} {
+	set logr $lr
+	set logw $lw
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable logr logw
+
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::transform::observe 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/otp.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/otp.tcl
new file mode 100644
index 00000000..e955ddd7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/otp.tcl
@@ -0,0 +1,98 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::transform::otp 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Implementation of an onetimepad
+# Meta description encryption transformation. Based on Tcl
+# Meta description 8.6's transformation reflection support.
+# Meta description The key bytes are read from two channels
+# Meta description configured at construction time. Exports
+# Meta description a single command adding a new
+# Meta description transformation of this type to a channel.
+# Meta description Three arguments, the channel to extend,
+# Meta description plus the channels to read the keys from.
+# Meta description No result.
+# Meta platform tcl
+# Meta require tcl::transform::core
+# Meta require {Tcl 8.6}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.6
+package require tcl::transform::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::transform {}
+
+proc ::tcl::transform::otp {chan keychanw keychanr} {
+    ::chan push $chan [otp::implementation new $keychanw $keychanr]
+}
+
+oo::class create ::tcl::transform::otp::implementation {
+    superclass tcl::transform::core ;# -> initialize, finalize, destructor
+
+    # This transformation is intended for streaming operation. Seeking
+    # the channel while it is active may cause undesirable
+    # output. Proper behaviour may require the destruction of the
+    # transform before seeking.
+
+    method write {c data} {
+	return [my Xor $data $keychanw]
+    }
+
+    method read {c data} {
+	return [my Xor $data $keychanr]
+    }
+
+    # # ## ### ##### ######## #############
+
+    constructor {keyw keyr} {
+	set keychanr $keyr
+	set keychanw $keyw
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable keychanr keychanw
+
+    # # ## ### ##### ######## #############
+
+    # A very convoluted way to perform the XOR would be to use TIP
+    # #317's hex encoding to convert the bytes into strings, then zip
+    # key and data into an interleaved string (nibble wise), then
+    # perform the xor as a 'string map' of the whole thing, and at
+    # last 'binary decode hex' the string back into bytes. Even so
+    # most ops would run on the whole message at C level. Except for
+    # the interleave. :(
+
+    method Xor {data keychan} {
+	# xor is done byte-wise. to keep IO down we read the key bytes
+	# once, before the loop handling the bytes. Note that we are
+	# having binary data at this point, making it necessary to
+	# convert into numbers (scan), and back (binary format).
+
+	set keys [read $keychan [string length $data]]
+	set result {}
+	foreach d [split $data {}] k [split $keys {}] {
+	    append result \
+		[binary format c \
+		     [expr {
+			    [scan $d %c] ^
+			    [scan $k %c]
+			}]]
+	}
+	return $result
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::transform::otp 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/pkgIndex.tcl
new file mode 100644
index 00000000..604f1afa
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/pkgIndex.tcl
@@ -0,0 +1,14 @@
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+
+package ifneeded tcl::transform::adler32 1     [list source [file join $dir adler32.tcl]]
+package ifneeded tcl::transform::base64 1      [list source [file join $dir base64.tcl]]
+package ifneeded tcl::transform::counter 1     [list source [file join $dir counter.tcl]]
+package ifneeded tcl::transform::crc32 1       [list source [file join $dir crc32.tcl]]
+package ifneeded tcl::transform::hex 1         [list source [file join $dir hex.tcl]]
+package ifneeded tcl::transform::identity 1    [list source [file join $dir identity.tcl]]
+package ifneeded tcl::transform::limitsize 1   [list source [file join $dir limitsize.tcl]]
+package ifneeded tcl::transform::observe 1     [list source [file join $dir observe.tcl]]
+package ifneeded tcl::transform::otp 1         [list source [file join $dir otp.tcl]]
+package ifneeded tcl::transform::rot 1         [list source [file join $dir rot.tcl]]
+package ifneeded tcl::transform::spacer 1      [list source [file join $dir spacer.tcl]]
+package ifneeded tcl::transform::zlib 1.0.1    [list source [file join $dir zlib.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/rot.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/rot.tcl
new file mode 100644
index 00000000..c184da85
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/rot.tcl
@@ -0,0 +1,95 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::transform::rot 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Implementation of a rot
+# Meta description encryption transformation. Based on Tcl
+# Meta description 8.6's transformation reflection support.
+# Meta description The key byte is
+# Meta description configured at construction time. Exports
+# Meta description a single command adding a new
+# Meta description transformation of this type to a channel.
+# Meta description Two arguments, the channel to extend,
+# Meta description plus the key byte.
+# Meta description No result.
+# Meta platform tcl
+# Meta require tcl::transform::core
+# Meta require {Tcl 8.6}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.6
+package require tcl::transform::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::transform {}
+
+proc ::tcl::transform::rot {chan key} {
+    ::chan push $chan [rot::implementation new $key]
+}
+
+oo::class create ::tcl::transform::rot::implementation {
+    superclass tcl::transform::core ;# -> initialize, finalize, destructor
+
+    # This transformation is intended for streaming operation. Seeking
+    # the channel while it is active may cause undesirable
+    # output. Proper behaviour may require the destruction of the
+    # transform before seeking.
+
+    method write {c data} {
+	return [my Rot $data $key]
+    }
+
+    method read {c data} {
+	return [my Rot $data $ikey]
+    }
+
+    # # ## ### ##### ######## #############
+
+    constructor {thekey} {
+	set key [expr {$thekey % 26}]
+	set ikey [expr {26 - $key}]
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable key ikey
+
+    # # ## ### ##### ######## #############
+
+    method Rot {data key} {
+	# rot'ation is done byte-wise. Note that we are having binary
+	# data at this point, making it necessary to convert into
+	# numbers (scan), and back (binary format).
+
+	set result {}
+	foreach d [split $data {}] {
+	    set dx [scan $d %c]
+	    if {(65 <= $dx)  && ($dx <= 90)} {
+		set n [binary format c \
+			   [expr { (($dx - 65 + $key) % 26) + 65 }]]
+	    } elseif {(97 <= $dx) && ($dx <= 122)} {
+		set n [binary format c \
+			   [expr { (($dx - 97 + $key) % 26) + 97 }]]
+	    } else {
+		set n $d
+	    }
+
+	    append result $n
+		
+	}
+	return $result
+    }
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::transform::rot 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/spacer.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/spacer.tcl
new file mode 100644
index 00000000..5bcf4c0e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/spacer.tcl
@@ -0,0 +1,151 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::transform::spacer 1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta description Implementation of a spacer
+# Meta description transformation, using Tcl 8.6's
+# Meta description transformation reflection support. Uses
+# Meta description counters to implement the transformation,
+# Meta description i.e. decide where to insert the spacing.
+# Meta description Exports a single command adding a new
+# Meta description transform of this type to a channel. One
+# Meta description argument, the channel to extend. No
+# Meta description result.
+# Meta platform tcl
+# Meta require tcl::transform::core
+# Meta require {Tcl 8.6}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.6
+package require tcl::transform::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::transform {}
+
+proc ::tcl::transform::spacer {chan n {space { }}} {
+    ::chan push $chan [spacer::implementation new $n $space]
+    return
+}
+
+oo::class create ::tcl::transform::spacer::implementation {
+    superclass tcl::transform::core ;# -> initialize, finalize, destructor
+
+    # This transformation is intended for streaming operation. Seeking
+    # the channel while it is active may cause undesirable
+    # output. Proper behaviour may require the destruction of the
+    # transform before seeking.
+
+    method write {c data} {
+	# add spacing, data is split into groups of delta chars.
+	set result {}
+	set len [string length $data]
+
+	if {$woffset} {
+	    # The beginning of the buffer is the remainder of the
+	    # partial group found at the end of the buffer in the last
+	    # call.  It may still be partial, if the current buffer is
+	    # short enough.
+
+	    if {($woffset + $len) < $delta} {
+		# Yes, the group is still not fully covered.
+		# Move the offset forward, and return the whole
+		# buffer. spacing is not needed yet.
+		incr woffset $len
+		return $data
+	    }
+
+	    # The buffer completes the group. Add it and the following
+	    # spacing, then fix the offset to start the processing of
+	    # the groups coming after at the proper location.
+
+	    set stop [expr {$delta - $woffset - 1}]
+
+	    append result [string range $data 0 $stop]
+	    append result $spacing
+
+	    set  woffset $stop
+	    incr woffset
+	}
+
+	# Process full groups in the middle of the incoming buffer.
+
+	set at   $woffset
+	set stop [expr {$at + $delta - 1}]
+	while {$stop < $len} {
+	    append result [string range $data $at $stop]
+	    append result $spacing
+	    incr at   $delta
+	    incr stop $delta
+	}
+
+	# Process partial group at the end of the buffer and remember
+	# the offset, for the processing of the group remainder in the
+	# next call.
+
+	if {($at < $len) && ($stop >= $len)} {
+	    append result [string range $data $at end]
+	}
+	set woffset [expr {$len - $at}]
+	return $result
+    }
+
+    method read {c data} {
+	# remove spacing from groups of delta+sdelta chars, keeping
+	# the first delta in each group.
+	set result {}
+	set iter [expr {$delta + $sdelta}]
+	set at 0
+	if {$roffset} {
+	    if {$roffset < $delta} {
+		append result [string range $data 0 ${roffset}-1]
+	    }
+	    incr at [expr {$iter - $roffset}]
+	}
+	set len  [string length $data]
+	set end  [expr {$at + $delta - 1}]
+	set stop [expr {$at + $iter - 1}]
+	while {$stop < $len} {
+	    append result [string range $data $at $end]
+	    incr at   $iter
+	    incr end  $iter
+	    incr stop $iter
+	}
+	if {$end < $len} {
+	    append result [string range $data $at $end]
+	    set roffset [expr {$len - $end + 1}]
+	} elseif {$at < $len} {
+	    append result [string range $data $at end]
+	    set roffset [expr {$len - $at}]
+	}
+	return [list $result $roffset]
+    }
+
+    # # ## ### ##### ######## #############
+
+    constructor {n space} {
+	set roffset 0
+	set woffset 0
+	set delta   $n
+	set spacing $space
+	set sdelta [string length $spacing]
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable roffset woffset delta spacing sdelta
+
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::transform::spacer 1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/zlib.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/zlib.tcl
new file mode 100644
index 00000000..d7c244d2
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/virtchannel_transform/zlib.tcl
@@ -0,0 +1,100 @@
+# -*- tcl -*-
+# # ## ### ##### ######## #############
+# (C) 2009 Andreas Kupries
+
+# @@ Meta Begin
+# Package tcl::transform::zlib 1.0.1
+# Meta as::author {Andreas Kupries}
+# Meta as::copyright 2009
+# Meta as::license BSD
+# Meta as::notes   Possibilities for extension: Currently
+# Meta as::notes   the mapping between read/write and
+# Meta as::notes   de/compression is fixed. Allow it to be
+# Meta as::notes   configured at construction time.
+# Meta description Implementation of a zlib (de)compressor.
+# Meta description Based on Tcl 8.6's transformation
+# Meta description reflection support (TIP 230) and zlib
+# Meta description support (TIP 234). Compresses on write.
+# Meta description Exports a single command adding a new
+# Meta description transformation of this type to a channel.
+# Meta description Two arguments, the channel to extend,
+# Meta description and the compression level. No result.
+# Meta platform tcl
+# Meta require tcl::transform::core
+# Meta require {Tcl 8.6}
+# @@ Meta End
+
+# # ## ### ##### ######## #############
+
+package require Tcl 8.6
+package require tcl::transform::core
+
+# # ## ### ##### ######## #############
+
+namespace eval ::tcl::transform {}
+
+proc ::tcl::transform::zlib {chan {level 4}} {
+    ::chan push $chan [zlib::implementation new $level]
+    return
+}
+
+oo::class create ::tcl::transform::zlib::implementation {
+    superclass tcl::transform::core ;# -> initialize, finalize, destructor
+
+    # This transformation is intended for streaming operation. Seeking
+    # the channel while it is active may cause undesirable
+    # output. Proper behaviour may require the destruction of the
+    # transform before seeking.
+
+    method initialize {c mode} {
+	set compressor   [zlib stream deflate -level $level]
+	set decompressor [zlib stream inflate]
+
+	next $c $mode
+    }
+
+    method finalize {c} {
+	$compressor   close
+	$decompressor close
+
+	next $c
+    }
+
+    method write {c data} {
+	$compressor put $data
+	return [$compressor get]
+    }
+
+    method read {c data} {
+	$decompressor put $data
+	return [$decompressor get]
+    }
+
+    method flush {c} {
+	$compressor flush
+	return [$compressor get]
+    }
+
+    method drain {c} {
+	$decompressor flush
+	return [$decompressor get]
+    }
+
+    # # ## ### ##### ######## #############
+
+    constructor {thelevel} {
+	# Should validate input (level in (0 ...9))
+	set level $thelevel
+	return
+    }
+
+    # # ## ### ##### ######## #############
+
+    variable level compressor decompressor
+
+    # # ## ### ##### ######## #############
+}
+
+# # ## ### ##### ######## #############
+package provide tcl::transform::zlib 1.0.1
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/websocket/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/websocket/pkgIndex.tcl
new file mode 100644
index 00000000..100438f8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/websocket/pkgIndex.tcl
@@ -0,0 +1,2 @@
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+package ifneeded websocket 1.5 [list source [file join $dir websocket.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/websocket/websocket.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/websocket/websocket.tcl
new file mode 100644
index 00000000..5a621d48
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/websocket/websocket.tcl
@@ -0,0 +1,1798 @@
+##################
+## Module Name     --  websocket
+## Original Author --  Emmanuel Frecon - emmanuel@sics.se
+## Patches         --  Adrián Medraño Calvo - amcalvo@prs.de
+## Description:
+##
+##    This library implements a WebSocket client library on top of the
+##    existing http package.  The library implements the HTTP-like
+##    handshake and the necessary framing of messages on sending and
+##    reception.  The library is also server-aware, i.e. implementing
+##    the slightly different framing when communicating from a server
+##    to a client.  Part of the code comes (with modifications) from
+##    the following Wiki page: http://wiki.tcl.tk/26556
+
+##
+##################
+
+package require Tcl 8.6
+
+package require http 2.7;  # Need keepalive!
+package require logger
+package require sha1
+package require base64
+
+
+# IMPLEMENTATION NOTES:
+#
+# The rough idea behind this library is to misuse the standard HTTP
+# package so as to benefit from all its handshaking and the solid
+# implementation of the HTTP protocol that it provides.  "Misusing"
+# means requiring the HTTP package to keep the socket alive, which
+# giving away the opened socket to the library once all initial HTTP
+# handshaking has been performed.  From that point and onwards, the
+# library is responsible for the framing of fragments of messages on
+# the socket according to the RFC.
+#
+# The library almost solely uses the standard API of the HTTP package,
+# thus being future-proof as much as possible as long as the HTTP
+# package is kept backwards compatible. HOWEVER, it requires to
+# extract the identifier of the socket towards the server from the
+# state array. This extraction is not officially specified in the man
+# page of the library and could therefor be subject to change in the
+# future.
+
+namespace eval ::websocket {
+    namespace export {[a-z]*}
+    namespace ensemble create
+
+    variable WS
+}
+
+# ::websocket::loglevel -- Set or query loglevel
+#
+#       Set or query the log level of the library, which defaults to
+#       warn.  The library provides much more debugging help when set
+#       to debug.
+#
+# Arguments:
+#	loglvl	New loglevel, empty for no change
+#
+# Results:
+#       Return the (changed?) log level of the library
+#
+# Side Effects:
+#       Increasing the loglevel of the library will output an
+#       increased number of messages via the logger package.
+proc ::websocket::loglevel { { loglvl "" } } {
+    variable WS
+    variable log
+
+    if { $loglvl != "" } {
+	if { [catch "${log}::setlevel $loglvl"] == 0 } {
+	    set WS(loglevel) $loglvl
+	}
+    }
+
+    return $WS(loglevel)
+}
+
+
+# ::websocket::Disconnect -- Disconnect from remote end
+#
+#       Disconnects entirely from remote end, providing an event in
+#       the handler associated to the socket.  This event is of type
+#       "disconnect".  Upon disconnection, the socket is closed and
+#       all state concerning that WebSocket is forgotten.
+#
+# Arguments:
+#	sock	WebSocket that was taken over or created by this library
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       None.
+proc ::websocket::Disconnect { sock } {
+    variable WS
+
+    set varname [namespace current]::Connection_$sock
+    upvar \#0 $varname Connection
+
+    if { [info exists Connection(liveness)] } {
+	after cancel $Connection(liveness)
+    }
+    catch {::close $sock}
+    Push $sock disconnect "Disconnected from remote end"
+    unset $varname
+}
+
+
+# ::websocket::close -- Close a WebSocket
+#
+#       Close a WebSocket, while sending the remote end a close frame
+#       to describe the reason for the closure.
+#
+# Arguments:
+#	sock	WebSocket that was taken over or created by this library
+#	code	Reason code, as suggested by the RFC
+#	reason	Descriptive message, empty to rely on builtin messages.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Will eventually disconnect the socket and loose connection to
+#       the remote end.
+proc ::websocket::close { sock { code 1000 } { reason "" } } {
+    variable WS
+    variable log
+
+    set varname [namespace current]::Connection_$sock
+    if { ! [info exists $varname] } {
+	${log}::warn "$sock is not a WebSocket connection anymore"
+	ThrowError "$sock is not a WebSocket"
+    }
+    upvar \#0 $varname Connection
+
+    if { $Connection(state) eq "CLOSED" } {
+	${log}::notice "Connection already closed"
+	return
+    }
+    set Connection(state) CLOSED
+
+    if { $code == "" || ![string is integer $code] } {
+	send $sock 8
+	${log}::info "Closing web socket"
+	Push $sock close {}
+    } else {
+	if { $reason eq "" } {
+	    set reason [string map \
+			    { 1000 "Normal closure" \
+			      1001 "Endpoint going away" \
+			      1002 "Protocol error" \
+			      1003 "Received incompatible data type" \
+			      1006 "Abnormal closure" \
+			      1007 "Received data not consistent with type" \
+			      1008 "Policy violation" \
+			      1009 "Received message too big" \
+			      1010 "Missing extension" \
+			      1011 "Unexpected condition" \
+			      1015 "TLS handshake error" } $code]
+	}
+	set msg [binary format Su $code]
+	append msg [encoding convertto utf-8 $reason]
+	set msg [string range $msg 0 124];  # Cut answer to make sure it fits!
+	send $sock 8 $msg
+	${log}::info "Closing web socket: $code ($reason)"
+	Push $sock close [list $code $reason]
+    }
+
+    Disconnect $sock
+}
+
+
+# ::websocket::Push -- Push event or data to handler
+#
+#       Every WebSocket is associated to a handler that will be
+#       notified upon reception of data, but also upon important
+#       events within the library or events resulting from control
+#       messages sent by the remote end.  This procedure calls this
+#       handler, catching all errors that might occur within the
+#       handler.  The types that the library pushes out via this
+#       callback are:
+#
+#       text       Text complete message.
+#       binary     Binary complete message.
+#       ping       Ping complete message.
+#       pong       Pong complete message.
+#       connect    Notification of successful connection.
+#       disconnect Disconnection from remote end.
+#       close      Pending closure of connection
+#       timeout    Notification of connection timeout.
+#       error      Notification of error conditions.
+#
+#       The handler is expected to be a command prefix, and the values
+#       of parameters sock, type and msg are appended as arguments
+#       when evaluating it.
+#
+# Arguments:
+#	sock	WebSocket that was taken over or created by this library
+#	type	Type of the event
+#	msg	Data of the event.
+#       handler Use this command to push back instead of handler at WebSocket
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       None.
+proc ::websocket::Push { sock type msg { handler "" } } {
+    variable WS
+    variable log
+
+    # If we have not specified a handler, which is in most cases, pick
+    # up the handler from the array that contains all WS-relevant
+    # information.
+    if { $handler eq "" } {
+	set varname [namespace current]::Connection_$sock
+	if { ! [info exists $varname] } {
+	    ${log}::warn "$sock is not a WebSocket connection anymore"
+	    ThrowError "$sock is not a WebSocket"
+	}
+	upvar \#0 $varname Connection
+	set handler $Connection(handler)
+    }
+
+    if { [catch [list {*}$handler $sock $type $msg] res] } {
+	${log}::error "Error when executing WebSocket reception handler: $res"
+    }
+}
+
+
+# ::websocket::Ping -- Send a ping
+#
+#       Sends a ping at regular intervals to keep the connection alive
+#       and prevent equipment to close it due to inactivity.
+#
+# Arguments:
+#	sock	WebSocket that was taken over or created by this library
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       None.
+proc ::websocket::Ping { sock } {
+    variable WS
+    variable log
+
+    set varname [namespace current]::Connection_$sock
+    if { ! [info exists $varname] } {
+	${log}::warn "$sock is not a WebSocket connection anymore"
+	ThrowError "$sock is not a WebSocket"
+    }
+    upvar \#0 $varname Connection
+
+    # Reschedule at once to get around any possible problem with ping
+    # sending.
+    Liveness $sock
+
+    # Now send a ping, which will trigger a pong from the
+    # (well-behaved) client.
+    ${log}::debug "Sending ping to keep connection alive"
+    send $sock ping $Connection(-ping)
+}
+
+
+# ::websocket::Liveness -- Keep connections alive
+#
+#       Keep connections alive (from the server side by construction),
+#       as suggested by the specification.  This procedure arranges to
+#       send pings after a given period of inactivity within the
+#       socket.  This ties to ensure that all equipment keep the
+#       connection open.
+#
+# Arguments:
+#	sock	Existing Web socket
+#
+# Results:
+#       Return the time to next ping, negative or zero if not relevant.
+#
+# Side Effects:
+#       None.
+proc ::websocket::Liveness { sock } {
+    variable WS
+    variable log
+
+    set varname [namespace current]::Connection_$sock
+    if { ! [info exists $varname] } {
+	${log}::warn "$sock is not a WebSocket connection anymore"
+	ThrowError "$sock is not a WebSocket"
+    }
+    upvar \#0 $varname Connection
+
+    # Keep connection alive by issuing pings.
+    if { [info exists Connection(liveness)] } {
+	after cancel $Connection(liveness)
+    }
+    set when [expr {$Connection(-keepalive)*1000}]
+    if { $when > 0 } {
+	set Connection(liveness) [after $when [namespace current]::Ping $sock]
+    } else {
+	set Connection(liveness) ""
+    }
+    return $when
+}
+
+
+proc ::websocket::Type { opcode } {
+    variable WS
+    variable log
+
+    array set TYPES {1 text 2 binary 8 close 9 ping 10 pong}
+    if { [info exists TYPES($opcode)] } {
+	set type $TYPES($opcode)
+    } else {
+	set type <opcode-$opcode>
+    }
+
+    return $type
+}
+
+
+# ::websocket::validate -- Validate incoming client connections for WebSocket
+#
+#       This procedure checks whether a set of headers form a valid
+#       WebSocket opening handshake. If so, it returns values
+#       important for constructing the closing handshake.
+#
+#       The following aspects are checked:
+#         - A valid Connection header
+#         - A valid Upgrade header
+#         - A valid Sec-Websocket-Version header
+#         - A valid Sec-Websocket-Key header
+#
+#       These other are left to the invoker to check:
+#         - Host contains server's authority.
+#         - Origin is allowed.
+#         - Sec-Websocket-Protocols contains a supported protocol.
+#
+# Arguments:
+#	hdrs	Dictionary with HTTP header field names and their values.
+#
+# Results:
+#       An empty list if the headers do not constitute a valid WebSocket opening
+#       handshake. Otherwise, a dictionary with keys 'key', 'version'
+#       and a (possibly empty) list 'protocols'.
+#
+# Side Effects:
+#       None.
+proc ::websocket::validate {hdrs} {
+    variable WS
+    set res [dict create]
+
+    set upgrading 0;
+    set websocket 0;
+    foreach {k v} $hdrs {
+	switch -exact -- [ASCIILowercase $k] {
+	    connection {
+		foreach v [SplitCommaSeparated $v] {
+		    if {"upgrade" eq [ASCIILowercase $v]} {
+			set upgrading 1
+			break
+		    }
+		}
+	    }
+	    upgrade {
+		# May be a list, see
+		# <http://tools.ietf.org/html/rfc7230#section-6.7> and
+		# <http://tools.ietf.org/html/rfc6455#section-4.1>.
+		foreach v [SplitCommaSeparated $v] {
+		    # The protocol-name may be followed by a slash and a
+		    # protocol-version. Ignore the version, look only at the
+		    # protocol-name. See
+		    # <http://tools.ietf.org/html/rfc7230#section-6.7>.
+		    regexp {^[^/]+$} $v v
+		    if { "websocket" eq [ASCIILowercase $v] } {
+			set websocket 1
+			break
+		    }
+		}
+		if {!$websocket} {
+		    ThrowError "No 'Upgrade' header with 'websocket' token found" HANDSHAKE UPGRADE
+		}
+	    }
+	    sec-websocket-version {
+		set version [string trim $v $WS(whitespace)]
+		if {$version ne $WS(ws_version)} {
+		    ThrowError "Invalid WebSocket version '${version}'" HANDSHAKE VERSION
+		} else {
+		    dict set res version $version
+		}
+	    }
+	    sec-websocket-key {
+		set key [string trim $v $WS(whitespace)]
+		if {24 != [string length $key]} {
+		    ThrowError "Invalid WebSocket key length" HANDSHAKE KEY
+		} elseif {![regexp {^[a-zA-Z0-9+/]*={0,2}$} $key]} {
+		    ThrowError "Invalid WebSocket key: not base64" HANDSHAKE KEY
+		}
+		dict set res key $key
+	    }
+	    sec-websocket-protocol {
+		# There might be multiple "sec-websocket-protocol" headers.
+		# See <http://tools.ietf.org/html/rfc6455#section-11.3.4>.
+		set protocols [SplitCommaSeparated $v]
+		# Must be valid tokens.
+		foreach protocol $protocols {
+		    foreach c [split $protocol ""] {
+			if {$c in $WS(tchar)} {
+			    ThrowError "Invalid protocol name '${protocol}'" HANDSHAKE PROTOCOL;
+			}
+		    }
+		}
+		dict lappend res protocols {*}$protocols;
+	    }
+	}
+    }
+    if {!$upgrading} {
+	ThrowError "No 'Connect' header with 'upgrade' token found" HANDSHAKE CONNECTION
+    }
+    if {![dict exists $res version]} {
+	ThrowError "No WebSocket version specified" HANDSHAKE VERSION
+    }
+    if {![dict exists $res key]} {
+	ThrowError "No WebSocket key specified" HANDSHAKE KEY
+    }
+    if {![dict exists $res protocols]} {
+        dict set res protocols [list]
+    }
+    return $res
+}
+
+# ::websocket::test -- Test incoming client connections for WebSocket
+#
+#       This procedure will test if the connection from an incoming
+#       client is the opening of a WebSocket stream.  The socket is
+#       not upgraded at once, instead a (temporary) context for the
+#       incoming connection is created.  This allows server code to
+#       perform a number of actions, if necessary before the WebSocket
+#       stream connection goes live.  The test is made by analysing
+#       the content of the headers.  Additionally, the procedure
+#       checks that there exist a valid handler for the path
+#       requested.
+#
+# Arguments:
+#	srvSock	Socket to WebSocket compliant HTTP server
+#	cliSock	Socket to incoming connected client.
+#	path	Path requested by client at server
+#	hdrs	Dictionary list of the HTTP headers.
+#	qry	Dictionary list of the HTTP query (if applicable).
+#
+# Results:
+#       1 if this is an incoming WebSocket upgrade request for a
+#       recognised path, 0 otherwise.
+#
+# Side Effects:
+#       None.
+proc ::websocket::test { srvSock cliSock path { hdrs {} } { qry {} } } {
+    variable WS
+    variable log
+
+    if { [llength $hdrs] <= 0 } {
+	return 0
+    }
+
+    set varname [namespace current]::Server_$srvSock
+    if { ! [info exists $varname] } {
+	${log}::warn "$srvSock is not a WebSocket server anymore"
+	ThrowError "$srvSock is not a WebSocket"
+    }
+    upvar \#0 $varname Server
+
+    if {[catch {validate $hdrs} res]} {
+	return 0
+    }
+    set protos [dict get $res protocols];
+    set key [dict get $res key];
+
+    # Search amongst existing WS handlers for one that responds to
+    # that URL and implement one of the protocols.
+    foreach { ptn cb proto } $Server(live) {
+	set idx [lsearch -glob $protos $proto]
+	# URL paths comparison should be case-sensitive. See
+	# <http://tools.ietf.org/html/rfc2616#section-3.2.3>.
+ 	if { [string match $ptn $path] \
+		 && ( ![llength $protos] || $idx >= 0 ) } {
+	    set found(protocol) [expr {$idx >= 0? [lindex $protos $idx] : ""}]
+	    set found(live) $cb
+	    break
+	}
+    }
+
+    # Stop if cannot agree on subprotocol.
+    if {![info exists found]} {
+	${log}::warn "Cannot find any handler for $path"
+	return 0
+    }
+
+    # Create a context for the incoming client
+    set varname [namespace current]::Client_${srvSock}_${cliSock}
+    upvar \#0 $varname Client
+
+    set Client(server) $srvSock
+    set Client(sock) $cliSock
+    set Client(key) $key
+    set Client(accept) ""
+    set Client(path) $path
+    set Client(query) $qry
+    set Client(accept) [sec-websocket-accept $key]
+    set Client(protos) $protos
+    set Client(live) $found(live)
+    set Client(protocol) $found(protocol)
+
+    # Return the context for the incoming client.
+    return 1
+}
+
+
+# ::websocket::upgrade -- Upgrade socket to WebSocket in servers
+#
+#       Upgrade a socket that had been deemed to be an incoming
+#       WebSocket connection request (see ::websocket::test) to a true
+#       WebSocket.  This procedure will send the necessary connection
+#       handshake to the client, arrange for the relevant callbacks to
+#       be made during the life of the WebSocket and mediate of the
+#       incoming request via a special "request" message.
+#
+# Arguments:
+#	sock	Socket to client.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The socket is kept open and becomes a WebSocket, pushing out
+#       callbacks as explained in ::websocket::takeover and accepting
+#       messages as explained in ::websocket::send.
+proc ::websocket::upgrade { sock } {
+    variable WS
+    variable log
+
+    set clients [info vars [namespace current]::Client_*_${sock}]
+    if { [llength $clients] == 0 } {
+	${log}::warn "$sock does not point to a client WebSocket"
+	ThrowError "$sock is not a WebSocket client"
+    }
+
+    set c [lindex $clients 0];   # Should only be one really...
+    upvar \#0 $c Client
+
+    # Write client response header, this is the last time we speak
+    # "http"...
+    puts $sock "HTTP/1.1 101 Switching Protocols"
+    puts $sock "Upgrade: websocket"
+    puts $sock "Connection: Upgrade"
+    puts $sock "Sec-WebSocket-Accept: $Client(accept)"
+    if { $Client(protocol) != "" } {
+	puts $sock "Sec-WebSocket-Protocol: $Client(protocol)"
+    }
+    puts $sock ""
+    flush $sock
+
+    # Make the socket a server websocket
+    #
+    # Tell the websocket handler that we have a new incoming
+    # request. We mediate this through the "message" part, which in
+    # this case is composed of a list containing the URL and the query
+    # (itself as a list).
+    takeover $sock $Client(live) 1 [list $Client(path) $Client(query)]
+
+    # Get rid of the temporary client state
+    unset $c
+}
+
+
+# ::websocket::live -- Register WebSocket callbacks for servers
+#
+#       This procedure registers callbacks that will be performed on a
+#       WebSocket compliant server whenever a client connects to a
+#       matching path and protocol.
+#
+# Arguments:
+#	sock	Socket to known WebSocket compliant HTTP server.
+#	path	glob-style path to match in client.
+#	cb	command to callback (same args as ::websocket::takeover)
+#	proto	Application protocol
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       None.
+proc ::websocket::live { sock path cb { proto "*" } } {
+    variable WS
+    variable log
+
+    set varname [namespace current]::Server_$sock
+    if { ! [info exists $varname] } {
+	${log}::warn "$sock is not a WebSocket server anymore"
+	ThrowError "$sock is not a WebSocket"
+    }
+    upvar \#0 $varname Server
+
+    lappend Server(live) $path $cb $proto
+}
+
+
+# ::webserver::server -- Declare WebSocket server
+#
+#       This procedure registers the (accept) socket passed as an
+#       argument as the identifier for an HTTP server that is capable
+#       of doing WebSocket.
+#
+# Arguments:
+#	sock	Socket on which the server accepts incoming connections.
+#
+# Results:
+#       Return the socket.
+#
+# Side Effects:
+#       None.
+proc ::websocket::server { sock } {
+    variable WS
+    variable log
+
+    set varname [namespace current]::Server_$sock
+    upvar \#0 $varname Server
+    set Server(sock) $sock
+    set Server(live) {}
+
+    return $sock
+}
+
+
+# ::websocket::send -- Send message or fragment to remote end.
+#
+#       Sends a fragment or a control message to the remote end of the
+#       WebSocket. The type of the message is passed as a parameter
+#       and can either be an integer according to the specification or
+#       one of the following strings: text, binary, ping.  When
+#       fragmenting, it is not allowed to change the type of the
+#       message between fragments.
+#
+# Arguments:
+#	sock	WebSocket that was taken over or created by this library
+#	type	Type of the message (see above)
+#	msg	Data of the fragment.
+#	final	True if final fragment
+#
+# Results:
+#       Returns the number of bytes sent, or -1 on error.  Serious
+#       errors will trigger errors that must be catched.
+#
+# Side Effects:
+#       None.
+proc ::websocket::send { sock type {msg ""} {final 1}} {
+    variable WS
+    variable log
+
+    set varname [namespace current]::Connection_$sock
+    if { ! [info exists $varname] } {
+	${log}::warn "$sock is not a WebSocket connection anymore"
+	ThrowError "$sock is not a WebSocket"
+    }
+    upvar \#0 $varname Connection
+
+    # Refuse to send if not connected
+    if { $Connection(state) ne "CONNECTED" } {
+	${log}::warn "Cannot send along WS $sock, not connected"
+	return -1
+    }
+
+    # Determine opcode from type, i.e. text, binary or ping. Accept
+    # integer opcodes for internal use or for future extensions of the
+    # protocol.
+    set opcode -1;
+    if { [string is integer $type] } {
+	set opcode $type
+    } else {
+	switch -glob -nocase -- $type {
+	    t* {
+		# text
+		set opcode 1
+	    }
+	    b* {
+		# binary
+		set opcode 2
+	    }
+	    p* {
+		# ping
+		set opcode 9
+	    }
+	}
+    }
+
+    if { $opcode < 0 } {
+	ThrowError \
+	    "Unrecognised type, should be one of text, binary, ping or\
+             a protocol valid integer"
+    }
+
+    # Refuse to continue if different from last type of message.
+    if { $Connection(write:opcode) > 0 } {
+	if { $opcode != $Connection(write:opcode) } {
+	    ThrowError \
+		"Cannot change type of message under continuation!"
+	}
+	set opcode 0;    # Continuation
+    } else {
+	set Connection(write:opcode) $opcode
+    }
+
+    # Encode text
+    set type [Type $Connection(write:opcode)]
+    if { $Connection(write:opcode) == 1 } {
+	set msg [encoding convertto utf-8 $msg]
+    }
+
+    # Reset continuation state once sending last fragment of message.
+    if { $final } {
+	set Connection(write:opcode) -1
+    }
+
+    # Start assembling the header.
+    set header [binary format c [expr {!!$final << 7 | $opcode}]]
+
+    # Append the length of the message to the header. Small lengths
+    # fit directly, larger ones use the markers 126 or 127.  We need
+    # also to take into account the direction of the socket, since
+    # clients shall randomly mask data.
+    set mlen [string length $msg]
+    if { $mlen < 126 } {
+	set plen [string length $msg]
+    } elseif { $mlen < 65536 } {
+	set plen 126
+    } else {
+	set plen 127
+    }
+
+    # Set mask bit and push regular length into header.
+    if { [string is true $Connection(server)] } {
+	append header [binary format c $plen]
+	set dst "client"
+    } else {
+	append header [binary format c [expr {1 << 7 | $plen}]]
+	set dst "server"
+    }
+
+    # Appends "longer" length when the message is longer than 125 bytes
+    if { $mlen > 125 } {
+	if { $mlen < 65536 } {
+	    append header [binary format Su $mlen]
+	} else {
+	    append header [binary format Wu $mlen]
+	}
+    }
+
+    # Add the masking key and perform client masking whenever relevant
+    if { [string is false $Connection(server)] } {
+	set mask [expr {int(rand()*(1<<32))}]
+	append header [binary format Iu $mask]
+	set msg [Mask $mask $msg]
+    }
+
+    # Send the (masked) frame
+    if { [catch {
+	puts -nonewline $sock $header$msg;
+	flush $sock;} err]} {
+	${log}::error "Could not send to remote end, closed socket? ($err)"
+	close $sock 1001
+	return -1
+    }
+
+    # Keep socket alive at all times.
+    Liveness $sock
+
+    if { [string is true $final] } {
+	${log}::debug "Sent $mlen bytes long $type final fragment to $dst"
+    } else {
+	${log}::debug "Sent $mlen bytes long $type fragment to $dst"
+    }
+    return [string length $header$msg]
+}
+
+
+# ::websocket::Mask -- Mask data according to RFC
+#
+#       XOR mask data with the provided mask as described in the RFC.
+#
+# Arguments:
+#	mask	Mask to use to mask the data
+#	dta	Bytes to mask
+#
+# Results:
+#       Return the mask bytes, i.e. as many bytes as the data that was
+#       given to this procedure, though XOR masked.
+#
+# Side Effects:
+#       None.
+proc ::websocket::Mask { mask dta } {
+    variable WS
+    variable log
+
+    # Format data as a list of 32-bit integer
+    # words and list of 8-bit integer byte leftovers.  Then unmask
+    # data, recombine the words and bytes, and return
+    binary scan $dta I*c* words bytes
+
+    set masked_words {}
+    set masked_bytes {}
+    for {set i 0} {$i < [llength $words]} {incr i} {
+	lappend masked_words [expr {[lindex $words $i] ^ $mask}]
+    }
+    for {set i 0} {$i < [llength $bytes]} {incr i} {
+	lappend masked_bytes [expr {[lindex $bytes $i] ^
+				    ($mask >> (24 - 8 * $i))}]
+    }
+
+    return [binary format I*c* $masked_words $masked_bytes]
+}
+
+
+# ::websocket::Receiver -- Receive (framed) data from WebSocket
+#
+#       Received framed data from a WebSocket, recontruct all
+#       fragments to a complete message whenever the final fragment is
+#       received and calls the handler associated to the WebSocket
+#       with the content of the message once it has been
+#       reconstructed.  Interleaved control frames are also passed
+#       further to the handler.  This procedure also automatically
+#       responds to ping by pongs.
+#
+# Arguments:
+#	sock	WebSocket that was taken over or created by this library
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Read a frame from the socket, possibly blocking while reading.
+proc ::websocket::Receiver { sock } {
+    variable WS
+    variable log
+
+    set varname [namespace current]::Connection_$sock
+    if { ! [info exists $varname] } {
+	${log}::warn "$sock is not a WebSocket connection anymore"
+	ThrowError "$sock is not a WebSocket"
+    }
+    upvar \#0 $varname Connection
+
+    # Keep connection alive by issuing pings.
+    Liveness $sock
+
+    # Get basic header.  Abort if reserved bits are set, unexpected
+    # continuation frame, fragmented or oversized control frame, or
+    # the opcode is unrecognised.
+    if { [catch {read $sock 2} dta] || [string length $dta] != 2 } {
+	if {[chan eof $sock]} {
+	    set dta "Socket closed."
+	}
+	${log}::error "Cannot read header from socket: $dta"
+	close $sock 1001
+	return
+    }
+    binary scan $dta Su header
+    set opcode [expr {$header >> 8 & 0xf}]
+    set mask [expr {$header >> 7 & 0x1}]
+    set len [expr {$header & 0x7f}]
+    set reserved [expr {$header >> 12 & 0x7}]
+    if { $reserved \
+	     || ($opcode == 0 && $Connection(read:mode) eq "") \
+	     || ($opcode > 7 && (!($header & 0x8000) || $len > 125)) \
+	     || [lsearch {0 1 2 8 9 10} $opcode] < 0 } {
+	# Send close frame, reason 1002: protocol error
+	close $sock 1002
+	return
+    }
+    # Determine the opcode for this frame, i.e. handle continuation of
+    # frames. Control frames must not be split/continued (RFC6455 5.5).
+    # No multiplexing here!
+    if { $Connection(read:mode) eq "" } {
+	set Connection(read:mode) $opcode
+    } elseif { $opcode == 0 } {
+	set opcode $Connection(read:mode)
+    }
+
+
+    # Get the extended length, if present
+    if { $len == 126 } {
+	if { [catch {read $sock 2} dta] || [string length $dta] != 2 } {
+	    ${log}::error "Cannot read length from socket: $dta"
+	    close $sock 1001
+	    return
+	}
+	binary scan $dta Su len
+    } elseif { $len == 127 } {
+	if { [catch {read $sock 8} dta] || [string length $dta] != 8 } {
+	    ${log}::error "Cannot read length from socket: $dta"
+	    close $sock 1001
+	    return
+	}
+	binary scan $dta Wu len
+    }
+
+
+    # Control frames use a separate buffer, since they can be
+    # interleaved in fragmented messages.
+    if { $opcode > 7 } {
+	# Control frames should be shorter than 125 bytes
+	if { $len > 125 } {
+	    close $sock 1009
+	    return
+	}
+	set oldmsg $Connection(read:msg)
+	set Connection(read:msg) ""
+    } else {
+	# Limit the maximum message length
+	if { [string length $Connection(read:msg)] + $len > $WS(maxlength) } {
+	    # Send close frame, reason 1009: frame too big
+	    close $sock 1009 "Limit $WS(maxlength) exceeded"
+	    return
+	}
+    }
+
+    if { $mask } {
+	# Get mask and data.  Format data as a list of 32-bit integer
+        # words and list of 8-bit integer byte leftovers.  Then unmask
+	# data, recombine the words and bytes, and append to the buffer.
+	if { [catch {read $sock 4} dta] || [string length $dta] != 4 } {
+	    ${log}::error "Cannot read mask from socket: $dta"
+	    close $sock 1001
+	    return
+	}
+	binary scan $dta Iu mask
+	if { [catch {read $sock $len} bytes] } {
+	    ${log}::error "Cannot read fragment content from socket: $bytes"
+	    close $sock 1001
+	    return
+	}
+	append Connection(read:msg) [Mask $mask $bytes]
+    } else {
+	if { [catch {read $sock $len} bytes] \
+		 || [string length $bytes] != $len } {
+	    ${log}::error "Cannot read fragment content from socket: $bytes"
+	    close $sock 1001
+	    return
+	}
+	append Connection(read:msg) $bytes
+    }
+
+    if { [string is true $Connection(server)] } {
+	set dst "client"
+    } else {
+	set dst "server"
+    }
+    set type [Type $Connection(read:mode)]
+
+    # If the FIN bit is set, process the frame.
+    if { $header & 0x8000 } {
+	${log}::debug "Received $len bytes long $type final fragment from $dst"
+
+    set msgToPush $Connection(read:msg)
+	# Prepare for next frame.
+	if { $opcode < 8 } {
+	    # Reinitialise
+	    set Connection(read:msg) ""
+	    set Connection(read:mode) ""
+	} else {
+	    set Connection(read:msg) $oldmsg
+	    if {$Connection(read:mode) eq $opcode} {
+		# non-interjected control frame, clear mode
+		set Connection(read:mode) ""
+	    }
+	}
+
+    switch $opcode {
+	    1 {
+		# Text: decode and notify handler
+		Push $sock text \
+		    [encoding convertfrom utf-8 $msgToPush]
+	    }
+	    2 {
+		# Binary: notify handler, no decoding
+		Push $sock binary $msgToPush
+	    }
+	    8 {
+		# Close: decode, notify handler and close frame.
+		if { [string length $msgToPush] >= 2 } {
+		    binary scan [string range $msgToPush) 0 1] Su \
+			reason
+		    set msg [encoding convertfrom utf-8 \
+				 [string range $msgToPush 2 end]]
+		    close $sock $reason $msg
+		} else {
+		    close $sock
+		}
+		return
+	    }
+	    9 {
+		# Ping: send pong back and notify handler since this
+		# might contain some data.
+		send $sock 10 $msgToPush
+		Push $sock ping $msgToPush
+	    }
+	    10 {
+		Push $sock pong $msgToPush
+	    }
+	}
+
+    } else {
+	${log}::debug "Received $len long $type fragment from $dst"
+    }
+}
+
+
+# ::websocket::New -- Create new websocket connection context
+#
+#       Create a blank new websocket connection context array, the
+#       connection is placed in the state "CONNECTING" meaning that it
+#       is not ready for action yet.
+#
+# Arguments:
+#	sock	Socket to remote end
+#	handler	Handler callback
+#	server	Is this a server or a client socket
+#
+# Results:
+#       Return the internal name of the array storing connection
+#       details.
+#
+# Side Effects:
+#       This procedure will reinitialise the connection information
+#       for the socket if it was already known.  This is on purpose
+#       and by design, but worth noting.
+proc ::websocket::New { sock handler { server 0 } } {
+    variable WS
+    variable log
+
+    set varname [namespace current]::Connection_$sock
+    upvar \#0 $varname Connection
+
+    set Connection(sock) $sock
+    set Connection(handler) $handler
+    set Connection(server) $server
+
+    set Connection(peername) 0.0.0.0
+    set Connection(sockname) 127.0.0.1
+
+    set Connection(read:mode) ""
+    set Connection(read:msg) ""
+    set Connection(write:opcode) -1
+    set Connection(state) CONNECTING
+    set Connection(liveness) ""
+
+    # Arrange for keepalive to be zero, i.e. no pings, when we are
+    # within a client.  When in servers, take the default from the
+    # library.  In any case, this can be configured, which means that
+    # even clients can start sending pings when nothing has happened
+    # on the line if necessary.
+    if { [string is true $server] } {
+	set Connection(-keepalive) $WS(-keepalive)
+    } else {
+	set Connection(-keepalive) 0
+    }
+    set Connection(-ping) $WS(-ping)
+
+    return $varname
+}
+
+
+# ::websocket::takeover -- Take over an existing socket.
+#
+#       Take over an existing opened socket to implement sending and
+#       receiving WebSocket framing on top of the socket.  The
+#       procedure takes a handler, i.e. a command that will be called
+#       whenever messages, control messages or other important
+#       internal events are received or occur.
+#
+#       The handler should be a command prefix, to be evaluated with
+#       socket handle, the message type and the message appended.
+#
+# Arguments:
+#	sock	Existing opened socket.
+#	handler	Command to call on events and incoming messages.
+#	server	Is this a socket within a server, i.e. towards a client.
+#	info	Additional information to pass to the handler upon successful
+#		connection.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       The handler is invoked with type 'connect' on successful connection.
+proc ::websocket::takeover { sock handler { server 0 } { info {} }} {
+    variable WS
+    variable log
+
+    # Create (or update) connection
+    set varname [New $sock $handler $server]
+    upvar \#0 $varname Connection
+    set Connection(state) CONNECTED
+
+    # Gather information about local and remote peer.
+    if { [catch {fconfigure $sock -peername} sockinfo] == 0 } {
+	set Connection(peername) [lindex $sockinfo 1]
+	if { $Connection(peername) eq "" } {
+	    set Connection(peername) [lindex $sockinfo 0]
+	}
+    } else {
+	${log}::warn "Cannot get remote information from socket: $sockinfo"
+    }
+    if { [catch {fconfigure $sock -sockname} sockinfo] == 0 } {
+	set Connection(sockname) [lindex $sockinfo 1]
+	if { $Connection(sockname) eq "" } {
+	    set Connection(sockname) [lindex $sockinfo 0]
+	}
+    } else {
+	${log}::warn "Cannot get local information from socket: $sockinfo"
+    }
+
+    # Listen to incoming traffic on socket and make sure we ping if
+    # necessary.
+    fconfigure $sock -translation binary -blocking on
+    fileevent $sock readable [list [namespace current]::Receiver $sock]
+    Liveness $sock
+
+    # Tell the WebSocket handler that the connection is now open.
+    Push $sock connect $info;
+
+    ${log}::debug "$sock has been registered as a\
+                   [expr $server?\"server\":\"client\"] WebSocket"
+}
+
+
+# ::websocket::Connected -- Handshake and framing initialisation
+#
+#       Performs the security handshake once connection to a remote
+#       WebSocket server has been established and handshake properly.
+#       On success, start listening to framed data on the socket, and
+#       mediate the callers about the connection and the application
+#       protocol that was chosen by the server.
+#
+# Arguments:
+#	opener	Temporary HTTP connection opening object.
+#	sock	Socket connection to server, empty to pick from HTTP state array
+#	token	HTTP state array.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       None.
+proc ::websocket::Connected { opener sock token } {
+    variable WS
+    variable log
+
+    upvar \#0 $opener OPEN
+
+    # Dig into the internals of the HTTP library for the socket if
+    # none present as part of the arguments (ugly...)
+    if { $sock eq "" } {
+	set sock [HTTPSocket $token $opener]
+	if { $sock eq "" } {
+	    ${log}::warn "Cannot extract sock from HTTP token $token, aborting"
+	    return 0
+	}
+    }
+
+    set ncode [::http::ncode $token]
+    if { $ncode == 101 } {
+	array set HDR [::http::meta $token]
+
+	# Extact security handshake, check against what was expected
+	# and abort in case of mismatch.
+	if { [info exists HDR(Sec-WebSocket-Accept)] } {
+	    # Compute security handshake
+	    set accept [sec-websocket-accept $OPEN(nonce)]
+	    if { $accept ne $HDR(Sec-WebSocket-Accept) } {
+		${log}::error "Security handshake failed"
+		::http::reset $token error
+		unset $opener
+		Disconnect $sock
+		return 0
+	    }
+	}
+
+	# Extract application protocol information to pass further to
+	# handler.
+	set proto ""
+	if { [info exists HDR(Sec-WebSocket-Protocol)] } {
+	    set proto $HDR(Sec-WebSocket-Protocol)
+	}
+
+	# Remove the socket from the socketmap inside the http
+	# library.  THIS IS UGLY, but the only way to make sure we
+	# really can take over the socket and make sure the library
+	# will open A NEW socket, even towards the same host, at a
+	# later time.
+	if {[package vsatisfies [package require http] 2.9.8-]} {
+	    # Versions 2.9.8 of http and above, including production versions
+	    # of http 2.10 and development versions from 2022-06-20 or later,
+	    # process an upgrade request by opening a new socket
+	    # that is outside the (renamed) socketmap.
+	} elseif { [info vars ::http::socketmap] ne "" } {
+	    foreach k [array names ::http::socketmap] {
+		if { $::http::socketmap($k) eq $sock } {
+		    ${log}::debug "Removed socket $sock from internal state\
+                                   of http library"
+		    unset ::http::socketmap($k)
+		}
+	    }
+	} else {
+	    ${log}::warn "Could not remove socket $sock from socket map, future\
+                          connections to same host and port are likely not to\
+                          work.  Upgrade http to version 2.9.8 or 2.10."
+	}
+
+	# Takeover the socket to create a connection and mediate about
+	# connection via the handler. Tell the handler which protocol was
+	# chosen.
+	takeover $sock $OPEN(handler) 0 $proto
+    } else {
+	Push \
+	    $sock \
+	    error \
+	    "HTTP error code $ncode when establishing WebSocket connection with $OPEN(url)" \
+	    $OPEN(handler)
+    }
+
+    # Comment out this line when debugging the http connection.
+    ::http::cleanup $token
+    unset $opener;   # Always unset the temporary connection opening
+		     # array
+    return 0
+}
+
+
+# ::websocket::Finished -- Pass further on HTTP connection finalisation
+#
+#       Pass further to Connected whenever the HTTP operation has
+#       been finished as implemented by the HTTP package.
+#
+# Arguments:
+#	opener	Temporary HTTP connection opening object.
+#	token	HTTP state array.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       None.
+proc ::websocket::Finished { opener token } {
+    if {[::http::status $token] ne "timeout"} {
+	upvar \#0 $opener OPEN
+	if { [info exists OPEN(timeout)] } {
+	    ::after cancel $OPEN(timeout);
+	    unset OPEN(timeout);
+	}
+    }
+
+    Connected $opener "" $token
+}
+
+
+# ::websocket::Timeout -- Timeout an HTTP connection
+#
+#       Reimplementation of the timeout facility from the HTTP package
+#       to be able to cleanup internal state properly and mediate to
+#       the handler.
+#
+# Arguments:
+#	opener	Temporary HTTP connection opening object.
+#	token	HTTP state array.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       Reset the HTTP connection, which will (probably) close the
+#       socket.
+proc ::websocket::Timeout { opener token } {
+    variable WS
+    variable log
+
+    if { [info exists $opener] } {
+	upvar \#0 $opener OPEN
+
+	set sock [HTTPSocket $token $opener]
+	Push $sock timeout \
+	    "Timeout when connecting to $OPEN(url)" $OPEN(handler)
+	::http::reset $token "timeout";
+	::http::cleanup $token
+
+	# Destroy connection state, which will also attempt to close
+	# the socket.
+	if { $sock ne "" } {
+	    Disconnect $sock
+	}
+    }
+}
+
+
+# ::websocket::HTTPSocket -- Get socket from HTTP token
+#
+#       Extract the socket used for a given (existing) HTTP
+#       connection.  This uses the undocumented index called "sock" in
+#       the HTTP state array.
+#
+# Arguments:
+#	token	HTTP token, as returned by http::geturl
+#
+# Results:
+#       The socket to the remote server, or an empty string on errors.
+#
+# Side Effects:
+#       None.
+proc ::websocket::HTTPSocket { token opener } {
+    variable log
+
+    upvar \#0 $token htstate
+    upvar \#0 $opener OPEN
+    set timeoutVal $OPEN(timeoutVal)
+
+    if {$timeoutVal < 1000} {
+        # This timeout value is used only here.  It is for socket creation
+        # including DNS lookup, which from http 2.10 are background events.
+        set timeoutVal 30000
+    }
+
+    if {     [info exists htstate(sock)]
+         && ([string range $htstate(sock) 0 16] eq {HTTP_PLACEHOLDER_})
+    } {
+        # sock is not opened synchronously.  DNS lookup etc are done in the
+        # background.
+        after $timeoutVal [list set ${token}(sock) $htstate(sock)]
+        vwait ${token}(sock)
+	return $htstate(sock)
+    } elseif {[info exists htstate(sock)]} {
+	return $htstate(sock)
+    } else {
+	${log}::error "No socket associated to HTTP token $token!"
+	return ""
+    }
+}
+
+
+# ::websocket::open -- Open connection to remote WebSocket server
+#
+#       Open a WebSocket connection to a remote server.  This
+#       procedure takes a number of options, which mostly are the
+#       options that are supported by the http::geturl procedure.
+#       However, there are a few differences described below:
+#       -headers  Is supported, but additional headers will be added internally
+#       -validate Is not supported, it has no point.
+#       -handler  Is used internally, so cannot be specified.
+#       -command  Is used internally, so cannot be specified.
+#       -protocol Contains a list of app. protocols to handshake with server
+#
+# Arguments:
+#	url	WebSocket URL, i.e. led by ws: or wss:
+#	handler	Command prefix to invoke on data reception or event occurrence
+#	args	List of dashled options with their values, as explained above.
+#
+# Results:
+#       Return the socket for use with the rest of the WebSocket
+#       library, or an empty string on errors.
+#
+# Side Effects:
+#       None.
+proc ::websocket::open { url handler args } {
+    variable WS
+    variable log
+
+    # Fool the http library by replacing the ws: (websocket) scheme
+    # with the http, so we can use the http library to handle all the
+    # initial handshake.
+    set hturl [regsub -nocase {^ws} $url "http"]
+
+    # Start creating a command to call the http library.
+    set cmd [list ::http::geturl $hturl]
+
+    # Control the geturl options that we can blindly pass to the
+    # http::geturl call. We basically remove -validate, which has no
+    # point and stop -handler which we will be using internally.  We
+    # restrain the use of -timeout, implementing the timeout ourselves
+    # to avoid the library to close the socket to the server.  We also
+    # intercept the headers since we will be adding WebSocket protocol
+    # information as part of the headers.
+    set protos {}
+    set timeout -1
+    array set HDR {}
+    foreach { k v } $args {
+	set allowed 0
+	foreach opt {bi* bl* ch* he* k* m* prog* prot* qu* s* ti* ty*} {
+	    if { [string match -nocase $opt [string trimleft $k -]] } {
+		set allowed 1
+	    }
+	}
+	if { ! $allowed } {
+	    ThrowError "$k is not a recognised option"
+	}
+	switch -nocase -glob -- [string trimleft $k -] {
+	    he* {
+		# Catch the headers, since we will be adding a few
+		# ones by hand.
+		array set HDR $v
+	    }
+	    prot* {
+		# New option -protocol to support the list of
+		# application protocols that the client accepts.
+		# -protocol should be a list.
+		set protos $v
+	    }
+	    ti* {
+		# We implement the timeout ourselves to be able to
+		# properly cleanup.
+		if { [string is integer $v] && $v > 0 } {
+		    set timeout $v
+		}
+	    }
+	    default {
+		# Any other allowed option will simply be passed
+		# further to the http::geturl call, to benefit from
+		# all its facilities.
+		lappend cmd $k $v
+	    }
+	}
+    }
+
+    # Create an HTTP connection object that will contain all necessary
+    # internal data until the connection has been a success or until
+    # it failed.
+    set varname [namespace current]::opener_[incr WS(id_gene)]
+    upvar \#0 $varname OPEN
+    set OPEN(url) $url
+    set OPEN(handler) $handler
+    set OPEN(nonce) ""
+    set OPEN(timeoutVal) $timeout
+
+    # Construct the WebSocket part of the header according to RFC6455.
+    # The NONCE should be randomly chosen for each new connection
+    # established
+    AddToken HDR Connection "Upgrade"
+    AddToken HDR Upgrade "websocket"
+    for { set i 0 } { $i < 4 } { incr i } {
+        append OPEN(nonce) [binary format Iu [expr {int(rand()*4294967296)}]]
+    }
+    set OPEN(nonce) [::base64::encode -maxlen 0 $OPEN(nonce)]
+    set HDR(Sec-WebSocket-Key) $OPEN(nonce)
+    set HDR(Sec-WebSocket-Protocol) [join $protos ", "]
+    set HDR(Sec-WebSocket-Version) $WS(ws_version)
+    lappend cmd -headers [array get HDR]
+
+    # Adding our own handler to intercept the socket once connection
+    # has been opened and established properly would be logical, but
+    # does not work in practice since this forces the HTTP library to
+    # perform a HTTP 1.0 request. Instead, we arrange to be called
+    # back via -command. We force -keepalive to make sure the HTTP
+    # library does not insert a "Connection: close" directive in the
+    # headers, and really make sure to do whatever we can to have a
+    # HTTP 1.1 connection.
+    lappend cmd \
+	-command [list [namespace current]::Finished $varname] \
+	-keepalive 1 \
+	-protocol 1.1
+
+    # Now open the connection to the remote server using the HTTP
+    # package...
+    set sock ""
+    if { [catch $cmd token] } {
+	unset $varname;    # Free opening context, we won't need it!
+	ThrowError "Error while opening WebSocket connection to $url: $token"
+    } else {
+	set sock [HTTPSocket $token $varname]
+	if { $sock ne "" } {
+	    # Create connection context.
+	    New $sock $handler
+	    if { $timeout > 0 } {
+		set OPEN(timeout) \
+		    [after $timeout [list [namespace current]::Timeout $varname $token]]
+	    }
+	} else {
+	    ${log}::warn "Cannot extract socket from HTTP token, failure"
+	    # Call the timeout to get rid of internal states
+	    Timeout $varname $token
+	}
+    }
+    return $sock
+}
+
+
+# ::websocket::conninfo -- Connection information
+#
+#       Provide callers with some introspection facilities in order to
+#       get some semi-internal data about an existing websocket.  It
+#       returns the following pieces of information:
+#       peername   - name or IP of remote end
+#       (sock)name - name or IP of local end
+#       closed     - 1 if closed, 0 otherwise
+#       client     - 1 if client websocket
+#       server     - 1 if server websocket
+#       type       - the string "server" or "client", depending on the type.
+#       handler    - callback registered from websocket.
+#       state      - current state of websocket, one of CONNECTING, CONNECTED or
+#                    CLOSED.
+#
+# Arguments:
+#	sock	WebSocket that was taken over or created by this library
+#	what	What piece of information to get, see above for details.
+#
+# Results:
+#       Return the value of the information or an empty string.
+#
+# Side Effects:
+#       None.
+proc ::websocket::conninfo { sock what } {
+    variable WS
+    variable log
+
+    set varname [namespace current]::Connection_$sock
+    if { ! [::info exists $varname] } {
+        ${log}::warn "$sock is not a WebSocket connection anymore"
+        ThrowError "$sock is not a WebSocket"
+    }
+    upvar \#0 $varname Connection
+
+    switch -glob -nocase -- $what {
+        "peer*" {
+            return $Connection(peername)
+        }
+        "sockname" -
+        "name" {
+            return $Connection(sockname)
+        }
+        "close*" {
+            return [expr {$Connection(state) eq "CLOSED"}]
+        }
+        "client" {
+            return [string is false $Connection(server)]
+        }
+        "server" {
+            return [string is true $Connection(server)]
+        }
+        "type" {
+            return [expr {[string is true $Connection(server)]?\
+			      "server":"client"}]
+        }
+        "handler" {
+            return $Connection(handler)
+        }
+	"state" {
+	    return $Connection(state)
+	}
+        default {
+            ThrowError "$what is not a known information piece for a websocket"
+        }
+    }
+    return "";  # Never reached
+}
+
+
+# ::websocket::find -- Find an existing websocket
+#
+#       Look among existing websockets for the ones that match the
+#       hostname and port number filters passed as parameters.  This
+#       lookup takes the remote end into account.
+#
+# Arguments:
+#	host	hostname filter, will also be tried against IP.
+#	port	port filter
+#
+# Results:
+#       List of matching existing websockets.
+#
+# Side Effects:
+#       None.
+proc ::websocket::find { { host * } { port * } } {
+    variable WS
+    variable log
+
+    set socks [list]
+    foreach varname [::info vars [namespace current]::Connection_*] {
+        upvar \#0 $varname Connection
+        foreach {ip hst prt} $Connection(peername) break
+        if { ([string match $host $ip] || [string match $host $hst]) \
+                 && [string match $port $prt] } {
+            lappend socks $Connection(sock)
+        }
+    }
+
+    return $socks
+}
+
+
+# ::websocket::configure -- Configure an existing websocket.
+#
+#       Takes a number of dash-led options to configure the behaviour
+#       of an existing websocket.  The recognised options are:
+#       -keepalive  The frequency of the keepalive pings.
+#       -ping       The text sent during pings.
+#
+# Arguments:
+#	sock	WebSocket that was taken over or created by this library
+#	args	Dash-led options and their (new) value.
+#
+# Results:
+#       None.
+#
+# Side Effects:
+#       None.
+proc ::websocket::configure { sock args } {
+    variable WS
+    variable log
+
+    set varname [namespace current]::Connection_$sock
+    if { ! [info exists $varname] } {
+	${log}::warn "$sock is not a WebSocket connection anymore"
+	ThrowError "$sock is not a WebSocket"
+    }
+    upvar \#0 $varname Connection
+
+    foreach { k v } $args {
+	set allowed 0
+	foreach opt {k* p*} {
+	    if { [string match -nocase $opt [string trimleft $k -]] } {
+		set allowed 1
+	    }
+	}
+	if { ! $allowed } {
+	    ThrowError "$k is not a recognised option"
+	}
+	switch -nocase -glob -- [string trimleft $k -] {
+	    k* {
+		# Change keepalive
+		set Connection(-keepalive) $v
+		Liveness $sock;  # Change at once.
+	    }
+	    p* {
+		# Change ping, i.e. text used during the automated pings.
+		set Connection(-ping) $v
+	    }
+	}
+    }
+}
+
+# ::websocket::sec-websocket-accept -- Construct Sec-Websocket-Accept field value.
+#
+#       Construct the value for the Sec-Websocket-Accept header field, as
+#       defined by (RFC6455 4.2.2.5.4).
+#
+#       See <http://tools.ietf.org/html/rfc6455#section-4.2.2>.
+#
+# Arguments:
+#       key     The value of the Sec-Websocket-Key header field in the client's
+#               handshake.
+#
+# Results:
+#       The value for the Sec-Websocket-Accept header field.
+#
+# Side Effects:
+#       None.
+proc ::websocket::sec-websocket-accept { key } {
+    variable WS
+    set sec ${key}$WS(ws_magic)
+    return [::base64::encode -maxlen 0 [sha1::sha1 -bin $sec]]
+}
+
+# ::websocket::SplitCommaSeparated -- Extract elements from comma-separated headers
+#
+#       Extract elements from a comma separated header's value, ignoring empty
+#       elements and linear whitespace.
+#
+#       See <http://tools.ietf.org/html/rfc7230#section-7>.
+#
+# Arguments:
+#       value   A header's value, consisting of a comma separated list of
+#               elements.
+#
+# Results:
+#       A list of values.
+#
+# Side Effects:
+#       None.
+proc ::websocket::SplitCommaSeparated { csl } {
+    variable WS
+    set r [list]
+    foreach e [split $csl ,] {
+	# Trim OWS.
+	set v [string trim $e $WS(whitespace)]
+	# There might be empty elements.
+	if {"" ne $v} {
+	    lappend r $v
+	}
+    }
+    return $r
+}
+
+# ::websocket::ASCIILowercase
+#
+#       Convert a string to ASCII lowercase.
+#
+#       See <http://tools.ietf.org/html/rfc6455#section-2.1>.
+#
+# Arguments:
+#       str   The string to convert
+#
+# Results:
+#       The string converted to ASCII lowercase.
+#
+# Side Effects:
+#       None.
+proc ::websocket::ASCIILowercase { str } {
+    variable WS
+    return [string map $WS(lowercase) $str]
+}
+
+
+# ::websocket::AddToken
+#
+#       Ensures a token is included in hdr's header field value.
+#
+# Arguments:
+#       hdrsName Name of an array variable on caller's scope whose
+#                keys are header names and values are header values.
+#       hdr      Header name, matched case-insensitively.
+#       token    Token to include.
+#
+# Results:
+#       Nothing.
+#
+# Side Effects:
+#       Modifies variable named hdrsName in caller's scope.
+proc ::websocket::AddToken { hdrsName hdr token } {
+    ::upvar 1 $hdrsName hdrs;
+    set hdrname [lsearch -exact -nocase -inline [array names hdrs] $hdr]
+    if {"" ne $hdrname} {
+	append hdrs($hdrname) ", $token"
+    } else {
+	set hdrs($hdr) $token
+    }
+}
+
+# ::websocket::ThrowError
+#
+#       Consistent error reporting. All errors from the WebSocket
+#       library have the word WEBSOCKET as the first element in the
+#       -errorcode list.
+#
+# Arguments:
+#       msg             Error message.
+#       ?errorcodes...? Optional. Additional error codes.
+#
+# Results:
+#       An error return value to the caller of the caller.
+#
+# Side Effects:
+#       None.
+proc ::websocket::ThrowError {msg args} {
+    return \
+	-level 2 \
+	-code error \
+	-errorcode [list WEBSOCKET {*}$args] \
+	$msg;
+}
+
+##################
+
+apply {{infoscript} {
+    variable  libdir [file dirname [file normalize $infoscript]]
+    variable  log    [::logger::init [string trimleft [namespace current] ::]]
+    variable  WS
+    array set WS {
+	loglevel       "error"
+	maxlength      16777216
+	ws_magic       "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
+	ws_version     13
+	id_gene        0
+	whitespace     " \t"
+	tchar          {!#$%&'*+-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz|~}
+	-keepalive     30
+	-ping          ""
+    }
+
+    # Build ASCII case-insensitive mapping table. See
+    # <http://tools.ietf.org/html/rfc6455#section-2.1>.
+
+    for {set i 0x41} {$i <= 0x5A} {incr i} {
+	lappend WS(lowercase) [format %c $i] [format %c [expr {$i + 0x20}]]
+    }
+
+    ${log}::setlevel $WS(loglevel)
+
+} ::websocket} [info script]
+
+##################
+package provide websocket 1.5
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/wip/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/wip/pkgIndex.tcl
new file mode 100644
index 00000000..7968ea11
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/wip/pkgIndex.tcl
@@ -0,0 +1,5 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+package ifneeded wip 1.2 [list source [file join $dir wip.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+package ifneeded wip 2.2 [list source [file join $dir wip2.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/wip/wip.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/wip/wip.tcl
new file mode 100644
index 00000000..881a6a42
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/wip/wip.tcl
@@ -0,0 +1,463 @@
+# ### ### ### ######### ######### #########
+##
+# (c) 2008-2009 Andreas Kupries.
+
+# WIP = Word Interpreter (Also a Work In Progress :). Especially while
+# it is running :P
+
+# Micro interpreter for lists of words. Domain specific languages
+# based on this will have a bit of a Forth feel, with the input stream
+# segmented into words and any other structuring left to whatever
+# language. Note that we have here in essence only the core dispatch
+# loop, and no actual commands whatsoever, making this definitely only
+# a Forth feel and not an actual Forth.
+
+# The idea is derived from Colin McCormack's treeql processor,
+# modified to require less boiler plate within the command
+# implementations, at the expense of, likely, execution speed. In
+# addition the interface between processor core and commands is more
+# complex too.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.4
+
+# For Tcl 8.{3,4} only snit1 of a suitable patchlevel is possible.
+package require snit 1.3
+
+# The run_next_* methods use set operations (x in set)
+package require struct::set
+
+# ### ### ### ######### ######### #########
+## API & Implementation
+
+snit::type ::wip {
+
+    # ### ### ### ######### ######### #########
+    ## API
+
+    constructor           {e args}       {} ; # create processor
+
+    # Defining commands and where they dispatch to.
+    method def            {name {cp {}}} {} ; # Define a DSL command.
+    method def/           {name arity {cp {}}} {} ; # Ditto, with explicit arity.
+    method defl           {names}        {} ; # Def many, simple names (cp = name)
+    method defd           {dict}         {} ; # s.a. name/cp dict
+    method deflva         {args}         {} ; # s.a. defl, var arg form
+    method defdva         {args}         {} ; # s.a. defd, var arg form
+
+    method undefva        {args}         {} ; # Remove DSL commands from the map.
+    method undefl         {names}        {} ; # Ditto, names given as list.
+
+    # Execution of word lists.
+    method runl           {alist}   {} ; # execute list of words
+    method run            {args}    {} ; # ditto, words as varargs
+    method run_next       {}        {} ; # run the next command in the input.
+    method run_next_while {accept}  {} ; # s.a., while acceptable command
+    method run_next_until {reject}  {} ; # s.a., until rejectable command
+    method run_next_if    {accept}  {} ; # s.a., if acceptable command
+    method run_next_ifnot {reject}  {} ; # s.a., if not rejectable command
+
+    # Manipulation of the input word list.
+    method peek           {}        {} ; # peek at next word in input
+    method next           {}        {} ; # pull next word from input
+    method insert         {at args} {} ; # insert words back into the input
+    method push           {args}    {} ; # ditto, at == 0
+
+    # ### ### ### ######### ######### #########
+    ## Processor construction.
+
+    constructor {e args} {
+	if {$e eq ""} {
+	    return -code error "No engine specified"
+	}
+	set engine $e
+	$self unknown [mymethod ErrorForUnknown]
+	$self Definitions $args
+	return
+    }
+
+    method Definitions {alist} {
+	# args = series of 'def name' and 'def name cp' statements.
+	# The code to handle them is in essence a WIP too, just
+	# hardcoded, as state machine.
+
+	set state expect-def
+	set n  {}
+	set cp {}
+	foreach a $alist {
+	    if {$state eq "expect-def"} {
+		if {$a ne "def"} {
+		    return -code error "Expected \"def\", got \"$a\""
+		}
+		set state get-name
+	    } elseif {$state eq "get-name"} {
+		set name $a
+		set state get-cp-or-def
+	    } elseif {$state eq "get-cp-or-def"} {
+		# This means that 'def' cannot be a command prefix for
+		# DSL command.
+		if {$a eq "def"} {
+		    # Short definition, name only, completed.
+		    $self def $name
+		    # We already have the first word of the next
+		    # definition here, name is coming up next.
+		    set state get-name
+		} else {
+		    # Long definition, name + cp, completed.
+		    $self def $name $a
+		    # Must be followed by the next definition.
+		    set state expect-def
+		}
+	    }
+	}
+	if {$state eq "get-cp-or-def"} {
+	    # Had a short definition last, now complete.
+	    $self def $name
+	} elseif {$state eq "get-name"} {
+	    # Incomplete definition at the end, bogus
+	    return -code error "Incomplete definition at end, name missing."
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Processor state
+    ## Handle of the object incoming commands are dispatched to.
+    ## The currently active DSL code, i.e. word list.
+
+    variable unknown {}      ; # command prefix invoked when
+			       # encountering unknown command words.
+    variable engine  {}      ; # command
+    variable program {}      ; # list (string)
+    variable arity -array {} ; # array (command name -> command arity)
+    variable cmd   -array {} ; # array (command name -> method cmd prefix)
+
+    # ### ### ### ######### ######### #########
+    ## API: DSL definition
+
+    ## DSL words map to method-prefixes, i.e. method names + fixed
+    ## arguments. We store them with the engine already added in front
+    ## to make them regular command prefixes. No 'mymethod' however,
+    ## that works only in engine code itself, not form the outside.
+
+    method def {name {mp {}}} {
+	if {$mp eq {}} {
+	    # Derive method-prefix from DSL word.
+	    set mp [list $name]
+	    set m  $name
+	    set n 0
+
+	} else {
+	    # No need to check for an empty method-prefix. That cannot
+	    # happen, as it is diverted, see above.
+
+	    set m [lindex $mp 0]
+	    set n [expr {[llength $mp]-1}]
+	}
+
+	# Get method arguments, check for problems.
+	set a [$engine info args $m]
+	if {[lindex $a end] eq "args"} {
+	    return -code error "Unable to handle Tcl varargs"
+	}
+
+	# The arity of the command is number of required arguments,
+	# with compensation for those already covered by the
+	# method-prefix.
+
+	set cmd($name)   [linsert $mp 0 $engine]
+	set arity($name) [expr {[llength $a] - $n}]
+	return
+    }
+
+    method def/ {name ay {mp {}}} {
+	# Like def, except that the arity is specified
+	# explicitly. This is for methods with a variable number of
+	# arguments in their definition, possibly dependent on the
+	# fixed parts of the prefix.
+
+	if {$mp eq {}} {
+	    # Derive method-prefix from DSL word.
+	    set mp [list $name]
+	    set m  $name
+
+	} else {
+	    # No need to check for an empty method-prefix. That cannot
+	    # happen, as it is diverted, see above.
+
+	    set m [lindex $mp 0]
+	}
+
+	# The arity of the command is specified by the caller.
+
+	set cmd($name)   [linsert $mp 0 $engine]
+	set arity($name) $ay
+	return
+    }
+
+    method deflva {args}  { $self defl $args ; return }
+    method defdva {args}  { $self defd $args ; return }
+    method defl   {names} { foreach n $names { $self def $n } ; return }
+    method defd   {dict}  {
+	if {[llength $dict]%2==1} {
+	    return -code error "Expected a dictionary, got \"$dict\""
+	}
+	foreach {name mp} $dict {
+	    $self def $name $mp
+	}
+	return
+    }
+
+    method undefva {args} { $self undefl $args ; return }
+    method undefl {names} {
+	foreach name $names {
+	    unset -nocomplain cmd($name)
+	    unset -nocomplain arity($name)
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## API: DSL execution
+    #
+    ## Consider moving the core implementation into procs, to reduce
+    ## call overhead
+
+    method run {args} {
+	return [$self runl $args]
+    }
+
+    method runl {alist} {
+	# Note: We are saving the current program and restore it
+	# afterwards, this handles the possibility that this is a
+	# recursive call into the dispatcher.
+	set saved $program
+	set program $alist
+	set r {}
+	while {[llength $program]} {
+	    set r [$self run_next]
+	}
+	set program $saved
+	return $r
+    }
+
+    method run_next_while {accept} {
+	set r {}
+	while {[llength $program] && [struct::set contains $accept [$self peek]]} {
+	    set r [$self run_next]
+	}
+	return $r
+    }
+
+    method run_next_until {reject} {
+	set r {}
+	while {[llength $program] && ![struct::set contains $reject [$self peek]]} {
+	    set r [$self run_next]
+	}
+	return $r
+    }
+
+    method run_next_if {accept} {
+	set r {}
+	if {[llength $program] && [struct::set contains $accept [$self peek]]} {
+	    set r [$self run_next]
+	}
+	return $r
+    }
+
+    method run_next_ifnot {reject} {
+	set r {}
+	if {[llength $program] && ![struct::set contains $reject [$self peek]]} {
+	    set r [$self run_next]
+	}
+	return $r
+    }
+
+    method run_next {} {
+	# The first word in the list is the current command. Determine
+	# the number of its fixed arguments. This also checks command
+	# validity in general.
+
+	set c [lindex $program 0]
+	if {![info exists arity($c)]} {
+	    # Invoke the unknown handler
+	    return [uplevel #0 [linsert $unknown end $c]]
+	}
+
+	set n $arity($c)
+	set m $cmd($c)
+
+	# Take the fixed arguments from the input as well.
+
+	if {[llength $program] <= $n} {
+	    return -code error -errorcode WIP \
+		"Not enough arguments for command \"$c\""
+	}
+
+	set cargs [lrange $program 1 $n]
+	incr n
+
+	# Remove the command to dispatch, and its fixed arguments from
+	# the program. This is done before the dispatch so that the
+	# command has access to the true current state of the input.
+
+	set program [lrange $program $n end]
+
+	# Now run the command with its arguments. Commands needing
+	# more than the declared fixed number of arguments are
+	# responsible for reading them from input via the method
+	# 'next' provided by the processor core.
+
+	# Note: m already has the engine at the front, it was stored
+	# that way, see 'def'.
+
+	if {![llength $cargs]} {
+	    return [eval $m]
+	} else {
+	    # Explanation: First linsert constructs 'linsert $m end {*}$cargs',
+	    # which the inner eval transforms into '{*}$m {*}$cargs', which at
+	    # last is run by the outer eval.
+	    return [eval [eval [linsert $cargs 0 linsert $m end]]]
+	}
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Input manipulation
+
+    # Get next word from the input (shift)
+    method next {} {
+	set w       [lindex $program 0]
+	set program [lrange $program 1 end]
+	return $w
+    }
+
+    # Peek at the next word in the input
+    method peek {} {
+	return [lindex $program 0]
+    }
+
+    # Retrieve the whole current program
+    method peekall {} {
+	return $program
+    }
+
+    # Replace the current programm
+    method replace {args} {
+	set program $args
+	return
+    }
+    method replacel {alist} {
+	set program $alist
+	return
+    }
+
+    # Insert words into the input stream.
+    method insert {at args} {
+	set program [eval [linsert $args 0 linsert $program $at]]
+	return
+    }
+    method insertl {at alist} {
+	set program [eval [linsert $alist 0 linsert $program $at]]
+	return
+    }
+
+    # <=> insert 0
+    method push {args} {
+	set program [eval [linsert $args 0 linsert $program 0]]
+	return
+    }
+    method pushl {alist} {
+	set program [eval [linsert $alist 0 linsert $program 0]]
+	return
+    }
+
+    # <=> insert end
+    method add {args} {
+	set program [eval [linsert $args 0 linsert $program end]]
+	return
+    }
+    method addl {alist} {
+	set program [eval [linsert $alist 0 linsert $program end]]
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method unknown {cmdprefix} {
+	set unknown $cmdprefix
+	return
+    }
+
+    method ErrorForUnknown {word} {
+	return -code error -errorcode WIP \
+	    "Unknown command \"$word\""
+    }
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+##
+
+# Macro to declare the method of a component as proc. We use this
+# later to make access to a WIP processor simpler (no need to write
+# the component reference on our own). And no, this is not the same as
+# the standard delegation. Doing that simply replaces the component
+# name in the call with '$self'. We remove the need to have this
+# written in the call.
+
+snit::macro wip::methodasproc {var method suffix} {
+    proc $method$suffix {args} [string map [list @v@ $var @m@ $method] {
+	upvar 1 {@v@} dst
+	return [eval [linsert $args 0 $dst {@m@}]]
+    }]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+# ### ### ### ######### ######### #########
+##
+
+# Macro to install most of the boilerplate needed to setup and use a
+# WIP. The only thing left is to call the method 'wip_setup' in the
+# constructor of the class using WIP. This macro allows the creation
+# of multiple wip's, through custom suffices.
+
+snit::macro wip::dsl {{suffix {}}} {
+    if {$suffix ne ""} {set suffix _$suffix}
+
+    # Instance state, wip processor used to run the language
+    component mywip$suffix
+
+    # Standard method to create the processor component. The user has
+    # to manually add a call of this method to the constructor.
+
+    method wip${suffix}_setup {} [string map [list @@ $suffix] {
+	install {mywip@@} using ::wip "${selfns}::mywip@@" $self
+    }]
+
+    # Procedures for easy access to the processor methods, without
+    # having to use self and wip. I.e. special delegation.
+
+    foreach {p} {
+	add	addl	def     undefva undefl
+	defd	defdva	defl	deflva  def/
+	insert	insertl	replace	replacel
+	push	pushl	run	runl
+	next	peek	peekall	run_next
+	run_next_until	run_next_while
+	run_next_ifnot	run_next_if
+    } {
+	wip::methodasproc mywip$suffix $p $suffix
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide wip 1.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/wip/wip2.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/wip/wip2.tcl
new file mode 100644
index 00000000..9cd5a19c
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/wip/wip2.tcl
@@ -0,0 +1,464 @@
+# ### ### ### ######### ######### #########
+##
+# (c) 2008-2010 Andreas Kupries.
+
+# WIP = Word Interpreter (Also a Work In Progress :). Especially while
+# it is running :P
+
+# Micro interpreter for lists of words. Domain specific languages
+# based on this will have a bit of a Forth feel, with the input stream
+# segmented into words and any other structuring left to whatever
+# language. Note that we have here in essence only the core dispatch
+# loop, and no actual commands whatsoever, making this definitely only
+# a Forth feel and not an actual Forth.
+
+# The idea is derived from Colin McCormack's treeql processor,
+# modified to require less boiler plate within the command
+# implementations, at the expense of, likely, execution speed. In
+# addition the interface between processor core and commands is more
+# complex too.
+
+# ### ### ### ######### ######### #########
+## Requisites
+
+package require Tcl 8.5
+
+# Use new Tcl 8.5a6+ features for specification of allowed packages.
+# We can use snit 1.3 and anything above (incl. v2+).
+package require snit 1.3-
+
+# The run_next_* methods use set operations (x in set)
+package require struct::set
+
+# For 8.5 we are using features like word-expansion to simplify the
+# various evaluations. Otherwise this is identical to v1.
+
+# ### ### ### ######### ######### #########
+## API & Implementation
+
+snit::type ::wip {
+
+    # ### ### ### ######### ######### #########
+    ## API
+
+    constructor           {e args}       {} ; # create processor
+
+    # Defining commands and where they dispatch to.
+    method def            {name {cp {}}} {} ; # Define a DSL command.
+    method def/           {name arity {cp {}}} {} ; # Ditto, with explicit arity.
+    method defl           {names}        {} ; # Def many, simple names (cp = name)
+    method defd           {dict}         {} ; # s.a. name/cp dict
+    method deflva         {args}         {} ; # s.a. defl, var arg form
+    method defdva         {args}         {} ; # s.a. defd, var arg form
+
+    method undefva        {args}         {} ; # Remove DSL commands from the map.
+    method undefl         {names}        {} ; # Ditto, names given as list.
+
+    # Execution of word lists.
+    method runl           {alist}   {} ; # execute list of words
+    method run            {args}    {} ; # ditto, words as varargs
+    method run_next       {}        {} ; # run the next command in the input.
+    method run_next_while {accept}  {} ; # s.a., while acceptable command
+    method run_next_until {reject}  {} ; # s.a., until rejectable command
+    method run_next_if    {accept}  {} ; # s.a., if acceptable command
+    method run_next_ifnot {reject}  {} ; # s.a., if not rejectable command
+
+    # Manipulation of the input word list.
+    method peek           {}        {} ; # peek at next word in input
+    method next           {}        {} ; # pull next word from input
+    method insert         {at args} {} ; # insert words back into the input
+    method push           {args}    {} ; # ditto, at == 0
+
+    # Set callback for unknown command words.
+    method unknown {commandprefix} {}
+
+    # ### ### ### ######### ######### #########
+    ## Processor construction.
+
+    constructor {e args} {
+	if {$e eq ""} {
+	    return -code error "No engine specified"
+	}
+	set engine $e
+	$self unknown [mymethod ErrorForUnknown]
+	$self Definitions $args
+	return
+    }
+
+    method Definitions {alist} {
+	# args = series of 'def name' and 'def name cp' statements.
+	# The code to handle them is in essence a WIP too, just
+	# hardcoded, as state machine.
+
+	set state expect-def
+	set n  {}
+	set cp {}
+	foreach a $alist {
+	    if {$state eq "expect-def"} {
+		if {$a ne "def"} {
+		    return -code error "Expected \"def\", got \"$a\""
+		}
+		set state get-name
+	    } elseif {$state eq "get-name"} {
+		set name $a
+		set state get-cp-or-def
+	    } elseif {$state eq "get-cp-or-def"} {
+		# This means that 'def' cannot be a command prefix for
+		# DSL command.
+		if {$a eq "def"} {
+		    # Short definition, name only, completed.
+		    $self def $name
+		    # We already have the first word of the next
+		    # definition here, name is coming up next.
+		    set state get-name
+		} else {
+		    # Long definition, name + cp, completed.
+		    $self def $name $a
+		    # Must be followed by the next definition.
+		    set state expect-def
+		}
+	    }
+	}
+	if {$state eq "get-cp-or-def"} {
+	    # Had a short definition last, now complete.
+	    $self def $name
+	} elseif {$state eq "get-name"} {
+	    # Incomplete definition at the end, bogus
+	    return -code error "Incomplete definition at end, name missing."
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Processor state
+    ## Handle of the object incoming commands are dispatched to.
+    ## The currently active DSL code, i.e. word list.
+
+    variable unknown {}      ; # command prefix invoked when
+			       # encountering unknown command words.
+    variable engine  {}      ; # command
+    variable program {}      ; # list (string)
+    variable arity -array {} ; # array (command name -> command arity)
+    variable cmd   -array {} ; # array (command name -> method cmd prefix)
+
+    # ### ### ### ######### ######### #########
+    ## API: DSL definition
+
+    ## DSL words map to method-prefixes, i.e. method names + fixed
+    ## arguments. We store them with the engine already added in front
+    ## to make them regular command prefixes. No 'mymethod' however,
+    ## that works only in engine code itself, not from the outside.
+
+    method def {name {mp {}}} {
+	if {$mp eq {}} {
+	    # Derive method-prefix from DSL word.
+	    set mp [list $name]
+	    set m  $name
+	    set n 0
+
+	} else {
+	    # No need to check for an empty method-prefix. That cannot
+	    # happen, as it is diverted, see above.
+
+	    set m [lindex $mp 0]
+	    set n [expr {[llength $mp]-1}]
+	}
+
+	# Get method arguments, check for problems.
+	set a [$engine info args $m]
+	if {[lindex $a end] eq "args"} {
+	    return -code error "Unable to handle Tcl varargs"
+	}
+
+	# The arity of the command is the number of required
+	# arguments, with compensation for those already covered by
+	# the method-prefix.
+
+	set cmd($name)   [linsert $mp 0 $engine]
+	set arity($name) [expr {[llength $a] - $n}]
+	return
+    }
+
+    method def/ {name ay {mp {}}} {
+	# Like def, except that the arity is specified
+	# explicitly. This is for methods with a variable number of
+	# arguments in their definition, possibly dependent on the
+	# fixed parts of the prefix.
+
+	if {$mp eq {}} {
+	    # Derive method-prefix from DSL word.
+	    set mp [list $name]
+	    set m  $name
+
+	} else {
+	    # No need to check for an empty method-prefix. That cannot
+	    # happen, as it is diverted, see above.
+
+	    set m [lindex $mp 0]
+	}
+
+	# The arity of the command is specified by the caller.
+
+	set cmd($name)   [linsert $mp 0 $engine]
+	set arity($name) $ay
+	return
+    }
+
+    method deflva {args}  { $self defl $args ; return }
+    method defdva {args}  { $self defd $args ; return }
+    method defl   {names} { foreach n $names { $self def $n } ; return }
+    method defd   {dict}  {
+	if {[llength $dict]%2==1} {
+	    return -code error "Expected a dictionary, got \"$dict\""
+	}
+	foreach {name mp} $dict {
+	    $self def $name $mp
+	}
+	return
+    }
+
+    method undefva {args} { $self undefl $args ; return }
+    method undefl {names} {
+	foreach name $names {
+	    unset -nocomplain cmd($name)
+	    unset -nocomplain arity($name)
+	}
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ## API: DSL execution
+    #
+    ## Consider moving the core implementation into procs, to reduce
+    ## call overhead
+
+    method run {args} {
+	return [$self runl $args]
+    }
+
+    method runl {alist} {
+	# Note: We are saving the current program and restore it
+	# afterwards, this handles the possibility that this is a
+	# recursive call into the dispatcher.
+	set saved $program
+	set program $alist
+	set r {}
+	while {[llength $program]} {
+	    set r [$self run_next]
+	}
+	set program $saved
+	return $r
+    }
+
+    method run_next_while {accept} {
+	set r {}
+	while {[llength $program] && [struct::set contains $accept [$self peek]]} {
+	    set r [$self run_next]
+	}
+	return $r
+    }
+
+    method run_next_until {reject} {
+	set r {}
+	while {[llength $program] && ![struct::set contains $reject [$self peek]]} {
+	    set r [$self run_next]
+	}
+	return $r
+    }
+
+    method run_next_if {accept} {
+	set r {}
+	if {[llength $program] && [struct::set contains $accept [$self peek]]} {
+	    set r [$self run_next]
+	}
+	return $r
+    }
+
+    method run_next_ifnot {reject} {
+	set r {}
+	if {[llength $program] && ![struct::set contains $reject [$self peek]]} {
+	    set r [$self run_next]
+	}
+	return $r
+    }
+
+    method run_next {} {
+	# The first word in the list is the current command. Determine
+	# the number of its fixed arguments. This also checks command
+	# validity in general.
+
+	set c [lindex $program 0]
+	if {![info exists arity($c)]} {
+	    # Invoke the unknown handler
+	    set program [lrange $program 1 end]
+	    return [uplevel #0 [list {*}$unknown $c]]
+	}
+
+	set n $arity($c)
+	set m $cmd($c)
+
+	# Take the fixed arguments from the input as well.
+
+	if {[llength $program] <= $n} {
+	    return -code error -errorcode WIP \
+		"Not enough arguments for command \"$c\""
+	}
+
+	set cargs [lrange $program 1 $n]
+	incr n
+
+	# Remove the command to dispatch, and its fixed arguments from
+	# the program. This is done before the dispatch so that the
+	# command has access to the true current state of the input.
+
+	set program [lrange $program $n end]
+
+	# Now run the command with its arguments. Commands needing
+	# more than the declared fixed number of arguments are
+	# responsible for reading them from input via the method
+	# 'next' provided by the processor core.
+
+	# Note: m already has the engine at the front, it was stored
+	# that way, see 'def'.
+
+	return [{*}$m {*}$cargs]
+    }
+
+    # ### ### ### ######### ######### #########
+    ## Input manipulation
+
+    # Get next word from the input (shift)
+    method next {} {
+	set w       [lindex $program 0]
+	set program [lrange $program 1 end]
+	return $w
+    }
+
+    # Peek at the next word in the input
+    method peek {} {
+	return [lindex $program 0]
+    }
+
+    # Retrieve the whole current program
+    method peekall {} {
+	return $program
+    }
+
+    # Replace the current programm
+    method replace {args} {
+	set program $args
+	return
+    }
+    method replacel {alist} {
+	set program $alist
+	return
+    }
+
+    # Insert words into the input stream.
+    method insert {at args} {
+	set program [linsert $program $at {*}$args]
+	return
+    }
+    method insertl {at alist} {
+	set program [linsert $program $at {*}$alist]
+	return
+    }
+
+    # <=> insert 0
+    method push {args} {
+	set program [linsert $program 0 {*}$args]
+	return
+    }
+    method pushl {alist} {
+	set program [linsert $program 0 {*}$alist]
+	return
+    }
+
+    # <=> insert end
+    method add {args} {
+	set program [linsert $program end {*}$args]
+	return
+    }
+    method addl {alist} {
+	set program [linsert $program end {*}$alist]
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+
+    method unknown {cmdprefix} {
+	set unknown $cmdprefix
+	return
+    }
+
+    method ErrorForUnknown {word} {
+	return -code error -errorcode WIP \
+	    "Unknown command \"$word\""
+    }
+
+    ##
+    # ### ### ### ######### ######### #########
+}
+
+# ### ### ### ######### ######### #########
+##
+
+# Macro to declare the method of a component as proc. We use this
+# later to make access to a WIP processor simpler (no need to write
+# the component reference on our own). And no, this is not the same as
+# the standard delegation. Doing that simply replaces the component
+# name in the call with '$self'. We remove the need to have this
+# written in the call.
+
+snit::macro wip::methodasproc {var method suffix} {
+    proc $method$suffix {args} [string map [list @v@ $var @m@ $method] {
+	upvar 1 {@v@} dst
+	return [$dst {@m@} {*}$args]
+    }]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+# ### ### ### ######### ######### #########
+##
+
+# Macro to install most of the boilerplate needed to setup and use a
+# WIP. The only thing left is to call the method 'wip_setup' in the
+# constructor of the class using WIP. This macro allows the creation
+# of multiple wip's, through custom suffices.
+
+snit::macro wip::dsl {{suffix {}}} {
+    if {$suffix ne ""} {set suffix _$suffix}
+
+    # Instance state, wip processor used to run the language
+    component mywip$suffix
+
+    # Standard method to create the processor component. The user has
+    # to manually add a call of this method to the constructor.
+
+    method wip${suffix}_setup {} [string map [list @@ $suffix] {
+	install {mywip@@} using ::wip "${selfns}::mywip@@" $self
+    }]
+
+    # Procedures for easy access to the processor methods, without
+    # having to use self and wip. I.e. special delegation.
+
+    foreach {p} {
+	add	addl	def     undefva undefl
+	defd	defdva	defl	deflva  def/
+	insert	insertl	replace	replacel
+	push	pushl	run	runl
+	next	peek	peekall	run_next
+	run_next_until	run_next_while
+	run_next_ifnot	run_next_if
+    } {
+	wip::methodasproc mywip$suffix $p $suffix
+    }
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+
+package provide wip 2.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/huddle.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/huddle.tcl
new file mode 100644
index 00000000..248b4d76
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/huddle.tcl
@@ -0,0 +1,646 @@
+# huddle.tcl (working title)
+#
+# huddle.tcl 0.1.5 2011-08-23 14:46:47 KATO Kanryu(kanryu6@users.sourceforge.net)
+#
+#   It is published with the terms of tcllib's BSD-style license.
+#   See the file named license.terms.
+#
+# This library provide functions to differentinate string/list/dict in multi-ranks.
+#
+# Copyright (c) 2008-2011 KATO Kanryu <kanryu6@users.sourceforge.net>
+# Copyright (c) 2015 Miguel Martínez López <aplicacionamedida@gmail.com>
+
+package require Tcl 8.5
+package provide huddle 0.4
+
+namespace eval ::huddle {
+    namespace export huddle wrap unwrap isHuddle strip_node are_equal_nodes \
+	argument_to_node get_src
+
+    variable types
+
+    # Some subcommands conflict with Tcl builtin commands. So, we make
+    # the convention of using the first letter in uppercase for
+    # private procs (e.g. from "set" to "Set")
+
+    namespace ensemble create -map {
+        set                ::huddle::Set
+        append            ::huddle::Append
+        get                ::huddle::Get
+        get_stripped    ::huddle::get_stripped
+        unset            ::huddle::Unset
+        combine            ::huddle::combine
+        combine_relaxed    ::huddle::combine_relaxed
+        type            ::huddle::type
+        remove            ::huddle::remove
+        equal            ::huddle::equal
+        exists            ::huddle::exists
+        clone            ::huddle::clone
+        isHuddle        ::huddle::isHuddle
+        wrap            ::huddle::wrap
+        unwrap            ::huddle::unwrap
+        addType            ::huddle::addType
+        jsondump        ::huddle::jsondump
+        compile            ::huddle::compile
+    }
+}
+
+proc ::huddle::addType {typeNamespace} {
+    variable types
+
+    set typeName [namespace tail $typeNamespace]
+    set typeCommand ::huddle::Type_$typeName
+
+    namespace upvar $typeNamespace settings settings
+
+    if {[dict exists $settings map]} {
+        set ensemble_map_of_type [dict get $settings map]
+        set renamed_subcommands [dict values $ensemble_map_of_type]
+    } else {
+        set renamed_subcommands [list]
+    }
+
+    dict set ensemble_map_of_type settings ${typeNamespace}::settings
+
+    foreach path_to_subcommand [info procs ${typeNamespace}::*] {
+        set subcommand [namespace tail $path_to_subcommand]
+
+        if {$subcommand ni $renamed_subcommands} {
+            dict set ensemble_map_of_type $subcommand ${typeNamespace}::$subcommand
+        }
+    }
+
+    namespace eval $typeNamespace "
+        namespace import ::huddle::wrap ::huddle::unwrap ::huddle::isHuddle ::huddle::strip_node ::huddle::are_equal_nodes ::huddle::argument_to_node ::huddle::get_src
+
+        namespace ensemble create -unknown ::huddle::unknown_subcommand -command $typeCommand -prefixes false -map {$ensemble_map_of_type}
+
+        proc settings {} {
+            variable settings
+            return \$settings
+        }
+    "
+
+    set huddle_map [namespace ensemble configure ::huddle -map]
+
+    dict with settings {
+        foreach subcommand $publicMethods {
+            dict set huddle_map $subcommand [list $typeCommand $subcommand]
+        }
+
+        if {[info exists superclass]} {
+            set types(superclass:$tag) $superclass
+        }
+
+        set types(type:$tag) $typeName
+        set types(callback:$tag) $typeCommand
+        set types(isContainer:$tag) $isContainer
+        set types(tagOfType:$typeName) $tag
+    }
+
+    namespace ensemble configure ::huddle -map $huddle_map
+    return
+}
+
+proc ::huddle::is_superclass_of {tag1 tag2} {
+    variable types
+
+    if {![info exists types(list_of_superclasses:$tag1)]} {
+        set types(list_of_superclasses:$tag1) [list]
+
+        set superclass_tag $tag1
+
+        while {true} {
+            if {[info exists types(superclass:$superclass_tag)]} {
+                set superclass $types(superclass:$superclass_tag)
+                set superclass_tag $types(tagOfType:$superclass)
+
+                lappend types(list_of_superclasses:$tag1) $superclass_tag
+            } else {
+                break
+            }
+        }
+    }
+
+    if {$tag2 in $types(list_of_superclasses:$tag1) } {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+proc ::huddle::unknown_subcommand {ensembleCmd subcommand args} {
+    set settings [$ensembleCmd settings]
+
+    if {[dict exists $settings superclass]} {
+        set superclass [dict get $settings superclass]
+
+        set map [namespace ensemble configure $ensembleCmd -map]
+        dict set map $subcommand [list ::huddle::Type_$superclass $subcommand]
+
+        namespace ensemble configure $ensembleCmd -map $map
+        return ""
+    } else {
+        error "Invalid subcommand '$subcommand' for type '$ensembleCmd'"
+    }
+}
+
+proc ::huddle::isHuddle {obj} {
+    if {[lindex $obj 0] ne "HUDDLE" || [llength $obj] != 2} {
+        return 0
+    }
+    
+    variable types
+    set node [lindex $obj 1]
+    set tag [lindex $node 0]
+    
+    if { [array get types "type:$tag"] == ""} {
+        return 0
+    }
+
+    return 1
+}
+
+proc ::huddle::strip_node {node} {
+    variable types
+    foreach {head src} $node break
+    if {[info exists types(type:$head)]} {
+        if {$types(isContainer:$head)} {
+            return [$types(callback:$head) strip $src]
+        } else {
+            return $src
+        }
+    } else {
+        error "This head '$head' doesn't exists."
+    }
+}
+
+proc ::huddle::call {tag cmd arguments} {
+    variable types
+    return [$types(callback:$tag) $cmd {*}$arguments]
+}
+
+proc ::huddle::combine {args} {
+    variable types
+
+    foreach {obj} $args {
+        checkHuddle $obj
+    }
+
+    set first_object [lindex $args 0]
+    set tag_of_group [lindex [unwrap $first_object] 0]
+
+    foreach {obj} $args {
+        set node [unwrap  $obj]
+    
+        foreach {tag src} $node break
+
+        if {$tag_of_group ne $tag} {
+            if {[is_superclass_of $tag $tag_of_group]} {
+                set tag_of_group $tag
+            } else {
+                if {![is_superclass_of $tag_of_group $tag]} {
+                    error "unmatched types are given or one type is not a superclass of the other."
+                }
+            }
+        }
+        
+        lappend result {*}$src
+    }
+
+    set src [$types(callback:$tag_of_group) append_subnodes "" {} $result]
+    return [wrap [list $tag $src]]
+}
+
+proc ::huddle::checkHuddle {huddle_object} {
+    if {![isHuddle $huddle_object]} {
+        error "\{$huddle_object\} is not a huddle."
+    }
+}
+
+proc ::huddle::argument_to_node {src {default_tag s}} {
+    if {[isHuddle $src]} {
+        return [unwrap $src]
+    } else {
+        return [list $default_tag $src]
+    }
+}
+
+proc ::huddle::wrap { node } {
+    return [list HUDDLE $node]
+}
+
+proc ::huddle::unwrap { huddle_object } {
+    return [lindex $huddle_object 1]
+}
+
+proc ::huddle::get_src { huddle_object } {
+    return [lindex [unwrap $huddle_object] 1]
+}
+
+proc ::huddle::Get {huddle_object args} {
+    return [retrieve_huddle $huddle_object $args 0]
+}
+
+proc ::huddle::get_stripped {huddle_object args} {
+    return [retrieve_huddle $huddle_object $args 1]
+}
+
+proc ::huddle::retrieve_huddle {huddle_object path stripped} {
+    checkHuddle $huddle_object
+
+    set target_node [Find_node [unwrap $huddle_object] $path]
+
+    if {$stripped} {
+        return [strip_node $target_node]
+    } else {
+        return [wrap $target_node]
+    }
+}
+
+proc ::huddle::type {huddle_object args} {
+    variable types
+
+    checkHuddle $huddle_object
+
+    set target_node [Find_node [unwrap $huddle_object] $args]
+
+    foreach {tag src} $target_node break
+
+    return $types(type:$tag)
+}
+
+proc ::huddle::Find_node {node path} {
+    variable types
+
+    set subnode $node
+
+    foreach subpath $path {
+        foreach {tag src} $subnode break
+        set subnode [$types(callback:$tag) get_subnode $src $subpath]
+    }
+
+    return $subnode
+}
+
+proc ::huddle::exists {huddle_object args} {
+    variable types
+
+    checkHuddle $huddle_object
+
+    set subnode [unwrap $huddle_object]
+
+    foreach key $args {
+        foreach {tag src} $subnode break
+        if {$types(isContainer:$tag) && [$types(callback:$tag) exists $src $key] } {
+            set subnode [$types(callback:$tag) get_subnode $src $key]
+        } else {
+            return 0
+        }
+    }
+
+    return 1
+}
+
+proc ::huddle::equal {obj1 obj2} {
+    checkHuddle $obj1
+    checkHuddle $obj2
+    return [::huddle::are_equal_nodes [unwrap $obj1] [unwrap $obj2]]
+}
+
+proc ::huddle::are_equal_nodes {node1 node2} {
+    variable types
+
+    foreach {tag1 src1} $node1 break
+    foreach {tag2 src2} $node2 break
+    if {$tag1 ne $tag2} {return 0}
+    return [$types(callback:$tag1) equal $src1 $src2]
+}
+
+proc ::huddle::Append {objvar args} {
+    variable types
+    upvar 1 $objvar obj
+
+    checkHuddle $obj
+    
+    foreach {tag src} [unwrap $obj] break
+    set src [$types(callback:$tag) append_subnodes $tag $src $args]
+    set obj [wrap [list $tag $src]]
+    return $obj
+}
+
+proc ::huddle::Set {objvar args} {
+    upvar 1 $objvar obj
+
+    checkHuddle $obj
+    set path [lrange $args 0 end-1]
+
+    set new_subnode [argument_to_node [lindex $args end]]
+
+    set root_node [unwrap $obj]
+
+    # We delete the internal reference of $obj to $root_node
+    # Now refcount of $root_node is 1
+    unset obj
+
+    Apply_to_subnode set root_node [llength $path] $path $new_subnode
+    set obj [wrap $root_node]
+}
+
+proc ::huddle::remove {obj args} {
+    checkHuddle $obj
+
+    set modified_node [remove_node [unwrap $obj] [llength $args] $args]
+
+    set obj [wrap $modified_node]
+}
+
+proc ::huddle::remove_node {node len path} {
+    variable types
+
+    foreach {tag src} $node break
+
+    set first_key_to_removed_subnode [lindex $path 0]
+
+    if {$len > 1} {
+        if { $types(isContainer:$tag) } {
+
+            set subpath_to_removed_subnode [lrange $path 1 end]
+
+            incr len -1
+
+            set new_src ""
+
+            foreach item [$types(callback:$tag) items $src] {
+                foreach {key subnode} $item break
+                if {$key eq $first_key_to_removed_subnode} {
+                    set modified_subnode [::huddle::remove_node $subnode $len $subpath_to_removed_subnode]
+                    $types(callback:$tag) set new_src $key $modified_subnode
+                } else {
+                    set cloned_subnode [Clone_node $subnode]
+                    $types(callback:$tag) set new_src $key $cloned_subnode
+                }
+            }
+        
+            return [list $tag $new_src]
+        } else {
+            error "\{$src\} don't have any child node."
+        }
+    } else {
+        $types(callback:$tag) remove src $first_key_to_removed_subnode
+        return [list $tag $src]
+    }
+}
+
+proc ::huddle::Unset {objvar args} {
+    upvar 1 $objvar obj
+    checkHuddle $obj
+
+    set root_node [unwrap $obj]
+
+    # We delete the internal reference of $obj to $root_node
+    # Now refcount of $root_node is 1
+    unset obj
+
+    Apply_to_subnode remove root_node [llength $args] $args
+
+    set obj [wrap $root_node]
+}
+
+proc ::huddle::clone {obj} {
+    set cloned_node [Clone_node [unwrap $obj]]
+
+    return [wrap $cloned_node]
+}
+
+proc ::huddle::Clone_node {node} {
+    variable types
+
+    foreach {tag src} $node break
+
+    if { $types(isContainer:$tag) } {
+        set cloned_src ""
+
+        foreach item [$types(callback:$tag) items $src] {
+            foreach {key subnode} $item break
+            set cloned_subnode [Clone_node $subnode]
+            $types(callback:$tag) set cloned_src $key $cloned_subnode
+        }
+        return [list $tag $cloned_src]
+    } else {
+        return $node
+    }
+}
+
+proc ::huddle::Apply_to_subnode {subcommand node_var len path {subcommand_arguments ""}} {
+    variable types
+    upvar 1 $node_var node
+
+    foreach {tag src} $node break
+
+    # We delete $src from $node.
+    # In that position there is only an empty string.
+    # This way, the refcount of $src is 1
+    lset node 1 ""
+
+    # We get the fist key. This information is used in the recursive case ($len>1) and in the base case ($len==1).
+    set key [lindex $path 0]
+
+    if {$len > 1} {
+
+        set subpath [lrange $path 1 end]
+
+        incr len -1
+
+        if { $types(isContainer:$tag) } {
+
+            set subnode [$types(callback:$tag) get_subnode $src $key]
+
+            # We delete the internal reference of $src to $subnode.
+            # Now refcount of $subnode is 1
+            $types(callback:$tag) delete_subnode_but_not_key src $key
+
+            ::huddle::Apply_to_subnode $subcommand subnode $len $subpath $subcommand_arguments
+
+            # We add again the new $subnode to the original $src
+            $types(callback:$tag) set src $key $subnode
+
+            # We add again the new $src to the parent node
+            lset node 1 $src
+
+        } else {
+            error "\{$src\} don't have any child node."
+        }
+    } else {
+        if {![info exists types(type:$tag)]} {error "\{$src\} is not a huddle node."}
+
+        $types(callback:$tag) $subcommand src $key $subcommand_arguments
+        lset node 1 $src
+    }
+}
+
+proc ::huddle::jsondump {huddle_object {offset "  "} {newline "\n"} {begin ""}} {
+    variable types
+    set nextoff "$begin$offset"
+    set nlof "$newline$nextoff"
+    set sp " "
+    if {[string equal $offset ""]} {set sp ""}
+
+    set type [huddle type $huddle_object]
+
+    switch -- $type {
+        boolean -
+        number {
+            return [huddle get_stripped $huddle_object]
+        }
+	null {
+	    return null
+	}
+        string {
+            set data [huddle get_stripped $huddle_object]
+
+            # JSON permits only oneline string
+            set data [string map {
+                    \n \\n
+                    \t \\t
+                    \r \\r
+                    \b \\b
+                    \f \\f
+                    \\ \\\\
+                    \" \\\"
+                    / \\/
+                } $data
+            ]
+	    return "\"$data\""
+        }
+        list {
+            set inner {}
+            set len [huddle llength $huddle_object]
+            for {set i 0} {$i < $len} {incr i} {
+                set subobject [huddle get $huddle_object $i]
+                lappend inner [jsondump $subobject $offset $newline $nextoff]
+            }
+            if {[llength $inner] == 1} {
+                return "\[[lindex $inner 0]\]"
+            }
+            return "\[$nlof[join $inner ,$nlof]$newline$begin\]"
+        }
+        dict {
+            set inner {}
+            foreach {key} [huddle keys $huddle_object] {
+                lappend inner [subst {"$key":$sp[jsondump [huddle get $huddle_object $key] $offset $newline $nextoff]}]
+            }
+            if {[llength $inner] == 1} {
+                return $inner
+            }
+            return "\{$nlof[join $inner ,$nlof]$newline$begin\}"
+        }
+        default {
+	    set node [unwrap $huddle_object]
+	    foreach {tag src} $node break
+	    return [$types(callback:$tag) jsondump $huddle_object $offset $newline $nextoff]
+        }
+    }
+}
+
+# data is plain old tcl values
+# spec is defined as follows:
+# {string} - data is simply a string, "quote" it if it's not a number
+# {list} - data is a tcl list of strings, convert to JSON arrays
+# {list list} - data is a tcl list of lists
+# {list dict} - data is a tcl list of dicts
+# {dict} - data is a tcl dict of strings
+# {dict xx list} - data is a tcl dict where the value of key xx is a tcl list
+# {dict * list} - data is a tcl dict of lists
+# etc..
+
+proc ::huddle::compile {spec data} {
+    while {[llength $spec]} {
+        set type [lindex $spec 0]
+        set spec [lrange $spec 1 end]
+
+        switch -- $type {
+            dict {
+                if {![llength $spec]} {
+                    lappend spec * string
+                }
+
+                set result [huddle create]
+                foreach {key value} $data {
+                    foreach {matching_key subspec} $spec {
+                        if {[string match $matching_key $key]} {
+                            Append result $key [compile $subspec $value]
+                            break
+                        }
+                    }
+                }
+                
+                return $result
+            }
+            
+            list {
+                if {![llength $spec]} {
+                    set spec string
+                } else {
+                    set spec [lindex $spec 0]
+                }
+                
+                set result [huddle list]
+                foreach list_item $data {
+                    Append result [compile $spec $list_item]
+                }
+            
+                return $result
+            }
+        
+            string {
+                return [wrap [list s $data]]
+            }
+        
+            number {
+                if {[string is double -strict $data]} {
+                    return [wrap [list num $data]]
+                } else {
+                    error "Bad number: $data"
+                }
+            }
+        
+            bool {
+                if {$data} {
+                    return [wrap [list bool true]]
+                } else {
+                    return [wrap [list bool false]]
+                }
+            }
+        
+            null {
+                if {$data eq ""} {
+                    return [wrap [list null]]
+                } else {
+                    error "Data must be an empty string: '$data'"
+                }
+            }
+        
+            huddle {
+                if {[isHuddle $data]} {
+                    return $data
+                } else {
+                    error "Data is not a huddle object: $data"
+                }
+            }
+        
+            default {error "Invalid type: '$type'"}
+        }
+    }
+}
+
+apply {{selfdir} {
+    source [file join $selfdir huddle_types.tcl]
+
+    foreach typeNamespace [namespace children ::huddle::types] {
+        addType $typeNamespace
+    }
+
+    return
+} ::huddle} [file dirname [file normalize [info script]]]
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/huddle_types.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/huddle_types.tcl
new file mode 100644
index 00000000..3fd23a32
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/huddle_types.tcl
@@ -0,0 +1,296 @@
+namespace eval ::huddle::types {
+    namespace export *
+    
+    namespace eval dict {
+        variable settings 
+        
+        # type definition
+        set settings {
+                        publicMethods {create keys} 
+                        tag D 
+                        isContainer yes
+                        map {set Set} }
+
+
+        proc get_subnode {src key} { 
+            # get a sub-node specified by "key" from the tagged-content
+            return [dict get $src $key]
+        }
+        
+        # strip from the tagged-content
+        proc strip {src} {
+            foreach {key subnode} $src {
+                lappend result $key [strip_node $subnode]
+            }
+            return $result
+        }
+        
+        # set a sub-node from the tagged-content
+        proc Set {src_var key value} {
+            upvar 1 $src_var src
+
+            ::dict set src $key $value
+        }
+        
+        proc items {src} {
+            set result {}
+            dict for {key subnode} $src {
+                lappend result [list $key $subnode]
+            }
+            return $result
+        }
+        
+        
+        # remove a sub-node from the tagged-content
+        proc remove {src_var key} {
+            upvar 1 $src_var src
+            dict unset src $key
+        }
+        
+
+        proc delete_subnode_but_not_key {src_var key} { 
+            upvar 1 $src_var src
+            return [dict set src $key ""]
+        }
+        
+        # check equal for each node
+        proc equal {src1 src2} {
+            if {[llength $src1] != [llength $src2]} {return 0}
+            foreach {key1 subnode1} $src1 {
+                if {![dict exists $src2 $key1]} {return 0}
+                if {![are_equal_nodes $subnode1 [dict get $src2 $key1]]} {return 0}
+            }
+            return 1
+        }
+        
+        proc append_subnodes {tag src list} { 
+            if {[llength $list] % 2} {error {wrong # args: should be "huddle append objvar ?key value ...?"}}
+            set resultL $src
+            foreach {key value} $list {
+                if {$tag ne ""} {
+                    lappend resultL $key [argument_to_node $value $tag]
+                } else {
+                    lappend resultL $key $value
+                }
+            }
+            return [dict create {*}$resultL]
+        }
+        
+        # $args: all arguments after "huddle create"
+        proc create {args} {
+            if {[llength $args] % 2} {error {wrong # args: should be "huddle create ?key value ...?"}}
+            set resultL [dict create]
+            
+            foreach {key value} $args {
+                if {[isHuddle $key]} {
+                    foreach {tag src} [unwrap $key] break
+                    if {$tag ne "string"} {error "The key '$key' must a string literal or huddle string" }
+                    set key $src    
+                }
+                dict set resultL $key [argument_to_node $value]
+            }
+            return [wrap [list D $resultL]]
+        }
+        
+        proc keys {huddle_object} {
+            return [dict keys [get_src $huddle_object]]
+        }
+        
+        proc exists {src key} {
+            return [dict exists $src $key]
+        }
+    }
+    
+    
+    namespace eval list {
+        variable settings 
+        
+        # type definition
+        set settings {
+                        publicMethods {list llength} 
+                        tag L 
+                        isContainer yes 
+                        map {list List set Set llength Llength} }
+        
+        proc get_subnode {src index} {
+            return [lindex $src $index]
+        }
+        
+        proc items {src} {
+            set result {}
+            for {set i 0} {$i < [llength $src]} {incr i} {
+                lappend result [list $i [lindex $src $i]]
+            }
+            return $result
+        }
+        
+        proc strip {src} {
+            set result {}
+            foreach {subnode} $src {
+                lappend result [strip_node $subnode]
+            }
+            return $result
+        }
+        
+        if {[package vcompare [package present Tcl] 8.6] > 0} {
+            proc Set {src_var index value} {
+                upvar 1 $src_var src
+                lset src $index $value
+            }
+        } else {
+            proc Set {src_var index value} {
+                upvar 1 $src_var src
+                # Manual handling of lset at end of list.
+                if {$index == [llength $src]} {
+                    lappend src $value
+                } else {
+                    lset src $index $value
+                }
+            }
+        }
+        
+        proc remove {src_var index} {
+            upvar 1 $src_var src
+            set src [lreplace $src $index $index]
+        }
+        
+        
+        proc delete_subnode_but_not_key {src_var index} {
+            upvar 1 $src_var src
+            return [lset src $index ""]            
+        }
+        
+        proc equal {src1 src2} {
+            if {[llength $src1] != [llength $src2]} {return 0}
+            
+            for {set i 0} {$i < [llength $src1]} {incr i} {
+                if {![are_equal_nodes [lindex $src1 $i] [lindex $src2 $i]]} {
+                    return 0
+                }
+            }
+
+            return 1
+        }
+        
+        proc append_subnodes {tag src list} {
+            set resultL $src
+            foreach {value} $list {
+                if {$tag ne ""} {
+                    lappend resultL [argument_to_node $value $tag]
+                } else {
+                    lappend resultL $value
+                }
+            }
+            return $resultL
+        }
+        
+        proc List {args} {
+
+            set resultL {}
+            foreach {value} $args {
+                lappend resultL [argument_to_node $value]
+            }
+            return [wrap [list L $resultL]]
+        }
+        
+        proc Llength {huddle_object} {
+            return [llength [get_src $huddle_object] ]
+        }
+        
+        proc exists {src key} {
+            return [expr {$key >=0 && $key < [llength $src]}]
+        }
+    }
+    
+    namespace eval string {
+        variable settings 
+        
+        # type definition
+        set settings {
+                        publicMethods {string}
+                        tag s
+                        isContainer no
+                        map {string String} }
+        
+        proc String {src} {
+            return [wrap [list s $src]]
+        }
+        
+        proc equal {string1 string2} {
+            return [expr {$string1 eq $string2}]
+        }
+    }
+    
+    
+    namespace eval number {
+        variable settings 
+        
+        # type definition
+        set settings {
+                        publicMethods {number}
+                        tag num
+                        isContainer no }
+            
+        proc number {src} {
+            if {[string is double -strict $src]} {
+                return [wrap [list num $src]]
+            } else {
+                error "Argument '$src' is not a number"
+            }
+        }
+        
+        proc equal {number1 number2} {
+            return [expr {$number1 == $number2}]
+        }
+    }
+    
+    namespace eval boolean {
+        variable settings 
+        
+        # type definition
+        set settings {
+                        publicMethods {boolean true false}
+                        tag b
+                        isContainer no }
+        
+        proc boolean {boolean_expresion} {
+            
+            if {$boolean_expresion} {
+                return [wrap [list b true]]
+            } else {
+                return [wrap [list b false]]
+            }
+        }
+        
+        proc true {} {
+            return [::huddle::wrap [list b true]]
+        }
+        
+        proc false {} {
+            return [wrap [list b false]]
+        }
+
+        
+        proc equal {bool1 bool2} {
+            return [expr {$bool1 eq $bool2}]
+        }
+    }
+    
+    namespace eval null {
+        variable settings 
+        
+        # type definition
+        set settings {
+                        publicMethods {null}
+                        tag null
+                        isContainer no }
+            
+        proc null {} {
+            return [wrap [list null]]
+        }
+        
+        proc equal {null1 null2} {
+            return 1
+        }        
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/json2huddle.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/json2huddle.tcl
new file mode 100644
index 00000000..111c36dc
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/json2huddle.tcl
@@ -0,0 +1,389 @@
+# -*- tcl -*-
+# (c) 2015 Miguel Martínez López
+
+package require Tcl 8.5
+package require TclOO       ; # For 8.5. Integrated with 8.6
+package require try         ; # For 8.5. Integrated with 8.6. Tcllib.
+package require huddle 0.1.7
+
+package provide huddle::json 0.1
+
+
+namespace eval ::huddle {
+    namespace export json2huddle
+
+    proc json2huddle {jsonText} {
+        set huddle_object [::huddle::json::json2huddle parse $jsonText]
+        return $huddle_object
+    }
+}
+
+    
+namespace eval ::huddle::json {
+    
+    oo::class create Json2huddle {
+        
+        variable cursor jsonText EndOfTextException numberRE
+        
+        constructor {} {
+
+            if {[package vcompare [package present Tcl] 8.6] == 0} {
+                proc throw {code msg} {
+                    return -code error -errorcode $code $msg
+                }
+            }
+            
+            set positiveRE {[1-9][[:digit:]]*}
+            set cardinalRE "-?(?:$positiveRE|0)"
+            set fractionRE {[.][[:digit:]]+}
+            set exponentialRE {[eE][+-]?[[:digit:]]+}
+            set numberRE "${cardinalRE}(?:$fractionRE)?(?:$exponentialRE)?"
+        
+            # Exception code for "End of Text" signal
+            set EndOfTextException 5
+        }        
+            
+        method parse {json_to_parse} {
+            set cursor -1
+            set jsonText $json_to_parse
+            
+            my parse_next_json_data
+        }
+            
+        method peekChar { {increment 1} } {
+            return [string index $jsonText [expr {$cursor+$increment}]]
+        }
+
+        method advanceCursor { {increment 1} } {
+            incr cursor $increment
+        }
+        
+        method nextChar {} {
+            if {$cursor + 1 < [string length $jsonText] } {
+                incr cursor
+                return [string index $jsonText $cursor]    
+            } else {
+                return -code $EndOfTextException
+            }
+        }
+    
+        method assertNext {ch {target ""}} {
+            incr cursor
+            
+            if {[string index $jsonText $cursor] != $ch} {
+                if {$target == ""} {
+                    set target $ch
+                }
+                throw {HUDDLE JSONparser} "Trying to read the string $target at index $cursor."
+            }
+        }
+    
+    
+        method parse_next_json_data {} {
+            
+            my eatWhitespace
+            
+            set ch [my peekChar]
+            
+            if {$ch eq ""} {
+                throw {HUDDLE JSONparser} {Nothing to read}
+            }
+            
+                        
+            switch -exact -- $ch {
+                "\{" {
+                    return [my readObject]
+                } 
+                "\[" {
+                    return [my readArray]
+                } 
+                "\"" {
+                    return [my readString]
+                } 
+
+                "t" {
+                    return [my readTrue]
+                }
+                "f" {
+                    return [my readFalse]
+                }
+                "n" {
+                    return [my readNull]
+                } 
+                "/" {
+                    my readComment
+                    return [my parse_next_json_data]
+                }
+                "-" -
+                "0" -
+                "1" -
+                "2" -
+                "3" -
+                "4" -
+                "5" -
+                "6" -
+                "7" -
+                "8" -
+                "9" {
+                    return [my readNumber]
+                } 
+                default {
+                    throw {HUDDLE JSONparser} "Input is not valid JSON: '$jsonText'" 
+                }
+            }
+        }
+        
+        method eatWhitespace {} {
+
+            while {true} {
+                set ch [my peekChar]
+                
+                if {[string is space -strict $ch]} {
+                    my advanceCursor
+                } elseif {$ch eq "/"} {
+                    my readComment
+                } else {
+                    break
+                }
+            }
+        }
+
+        
+        method readTrue {} {
+            my assertNext t true
+            my assertNext r true
+            my assertNext u true
+            my assertNext e true
+            return [::huddle true]
+        }
+    
+        
+        method readFalse {} {
+            my assertNext f false
+            my assertNext a false
+            my assertNext l false
+            my assertNext s false
+            my assertNext e false
+            return [::huddle false]
+        }
+    
+        
+        method readNull {} {
+            my assertNext n null
+            my assertNext u null
+            my assertNext l null
+            my assertNext l null
+            return [::huddle null]
+        }
+        
+        method readComment {} {
+
+            switch -exact -- [my peekChar 1][my peekChar 2] {
+                "//" {
+                    my readDoubleSolidusComment
+                }
+                "/*" {
+                    my readCStyleComment
+                }
+                default {
+                    throw {HUDDLE JSONparser} "Not a valid JSON comment: $jsonText"
+                }
+            }
+        }
+        
+        method readCStyleComment {} {
+            my assertNext "/" "/*"
+            my assertNext "*" "/*"
+            
+            try {
+                
+                while {true} {
+                    set ch [my nextChar]
+                    
+                    switch -exact -- $ch {
+                        "*" {
+                            if { [my peekChar] eq "/"} {
+                                my advanceCursor
+                                break
+                            }
+                        }
+                        "/" {
+                            if { [my peekChar] eq "*"} {
+                                throw {HUDDLE JSONparser} "Not a valid JSON comment: $jsonText, '/*' cannot be embedded in the comment at index $cursor." 
+                            }
+                        }
+
+                    } 
+                }
+                
+            } on $EndOfTextException {} {
+                throw {HUDDLE JSONparser} "not a valid JSON comment: $jsonText, expected */"
+            }
+        }
+
+        
+        method readDoubleSolidusComment {} {
+            my assertNext "/" "//"
+            my assertNext "/" "//"
+            
+            try {
+                set ch [my nextChar]
+                while { $ch ne "\r" && $ch ne "\n"} {
+                    set ch [my nextChar]
+                }
+            } on $EndOfTextException {} {}
+        }
+                
+        method readArray {} {
+            my assertNext "\["
+            my eatWhitespace
+
+            if { [my peekChar] eq "\]"} {
+                my advanceCursor
+                return [huddle list]
+            }
+                
+            try {        
+                while {true} {
+                    
+                    lappend result [my parse_next_json_data]
+                
+                    my eatWhitespace
+                        
+                    set ch [my nextChar]
+            
+                    if {$ch eq "\]"} {
+                        break
+                    } else {
+                        if {$ch ne ","} {
+                            throw {HUDDLE JSONparser} "Not a valid JSON array: '$jsonText' due to: '$ch' at index $cursor."
+                        }
+                        
+                        my eatWhitespace
+                    }
+                }
+            } on $EndOfTextException {} {
+                throw {HUDDLE JSONparser} "Not a valid JSON string: '$jsonText'"
+            }
+                
+            return [huddle list {*}$result]
+        }
+            
+        
+        
+        method readObject {} {
+
+            my assertNext "\{"
+            my eatWhitespace
+
+            if { [my peekChar] eq "\}"} {
+                my advanceCursor
+                return [huddle create]
+            }
+            
+            try {        
+                while {true} {
+                    set key [my readStringLiteral]
+                
+                    my eatWhitespace
+                    
+                    set ch [my nextChar]
+            
+                    if { $ch ne ":"} {
+                        throw {HUDDLE JSONparser} "Not a valid JSON object: '$jsonText' due to: '$ch' at index $cursor."
+                    }
+            
+                    my eatWhitespace
+            
+                    lappend result $key [my parse_next_json_data]
+            
+                    my eatWhitespace
+            
+                    set ch [my nextChar]
+            
+                    if {$ch eq "\}"} {
+                        break
+                    } else {
+                        if {$ch ne ","} {
+                            throw {HUDDLE JSONparser} "Not a valid JSON array: '$jsonText' due to: '$ch' at index $cursor."
+                        }
+                        
+                        my eatWhitespace
+                    }
+                }
+            } on $EndOfTextException {} {
+                throw {HUDDLE JSONparser} "Not a valid JSON string: '$jsonText'"
+            }
+                    
+            return [huddle create {*}$result]
+        }
+        
+        
+        method readNumber {} {
+            regexp -start $cursor -- $numberRE $jsonText number
+            my advanceCursor [string length $number]
+            
+            return [huddle number $number]
+        }    
+        
+        method readString {} {
+            set string [my readStringLiteral]
+            return [huddle string $string]
+        }
+                
+
+        method readStringLiteral {} {
+            
+            my assertNext "\""
+            
+            set result ""
+            try {
+                while {true} {
+                    set ch [my nextChar]
+                    
+                    if {$ch eq "\""} break
+                    
+                    if {$ch eq "\\"} {
+                        set ch [my nextChar]
+                        switch -exact -- $ch {
+                            "b" {
+                                set ch "\b"
+                            }
+                            "r" {
+                                set ch "\r"
+                            }
+                            "n" {
+                                set ch "\n"
+                            }
+                            "f" {
+                                set ch "\f"
+                            }
+                            "t" {
+                                set ch "\t"
+                            }
+                            "u" {
+                                set ch [format "%c" 0x[my nextChar][my nextChar][my nextChar][my nextChar]]
+                            }
+                            "\"" {}
+                            "/"  {}
+                            "\\" {}
+                            default {
+                                throw {HUDDLE JSONparser} "Not a valid escaped JSON character: '$ch' in $jsonText"
+                            }
+                        }
+                    }
+                    append result $ch
+                }
+            } on $EndOfTextException {} {
+                throw {HUDDLE JSONparser} "Not a valid JSON string: '$jsonText'"
+            }
+
+            return $result
+        }
+    
+    }    
+    
+    Json2huddle create json2huddle
+}
+    
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/pkgIndex.tcl
new file mode 100644
index 00000000..e81246fb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/pkgIndex.tcl
@@ -0,0 +1,6 @@
+
+if {![package vsatisfies [package provide Tcl] 8.5]} {return}
+
+package ifneeded yaml         0.4.1 [list source [file join $dir yaml.tcl]]
+package ifneeded huddle       0.4   [list source [file join $dir huddle.tcl]]
+package ifneeded huddle::json 0.1   [list source [file join $dir json2huddle.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/yaml.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/yaml.tcl
new file mode 100644
index 00000000..58f819de
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/yaml/yaml.tcl
@@ -0,0 +1,1297 @@
+#
+#   YAML parser for Tcl.
+#
+#   See http://www.yaml.org/spec/1.1/
+#
+#   yaml.tcl,v 0.3.6 2011-08-23 15:06:25 KATO Kanryu(kanryu6@users.sourceforge.net)
+#
+#   It is published with the terms of tcllib's BSD-style license.
+#   See the file named license.terms.
+#
+# It currently supports a very limited subsection of the YAML spec.
+#
+#
+
+package require Tcl 8.5
+package provide yaml 0.4.1
+package require cmdline
+package require huddle 0.1.7
+
+namespace eval ::yaml {
+    namespace export load setOptions dict2dump list2dump
+    variable data
+    array set data {}
+
+    # fixed value groups for some yaml-types.
+    variable fixed
+
+    # a plane scalar is worked for matching and converting to the specific type.
+    # proc some_command {value} {
+    #   return [list !!type $treatmented-value]
+    #     or
+    #   return ""
+    # }
+    variable parsers
+
+    # scalar/collection treatment for matched specific yaml-tag
+    # proc some_composer {type value} {
+    #   return [list 1 $result-type $treatmented-value]
+    #     or
+    #   return ""
+    # }
+    variable composer
+
+    variable defaults
+    array set defaults {
+        isfile   0
+        validate 0
+        types {timestamp int float null true false}
+        composer {
+            !!binary ::yaml::_composeBinary
+	    !!float  ::yaml::_composeFloat
+        }
+        parsers {
+            timestamp ::yaml::_parseTimestamp
+        }
+        shorthands {
+            !! {tag:yaml.org,2002:}
+        }
+        fixed {
+            null:Value  ""
+            null:Group  {null "" ~}
+            true:Value  1
+            true:Group  {true on + yes y}
+            false:Value 0
+            false:Group {false off - no n}
+        }
+    }
+
+    variable _dumpIndent   2
+    variable _dumpWordWrap 40
+
+    variable result
+    variable opts [lrange [::cmdline::GetOptionDefaults {
+        {file             {input is filename}}
+        {stream           {input is stream}}
+        {m.arg        ""  {fixed-modifiers bulk settings(null/true/false)}}
+        {m:null.arg   ""  {null modifier settings(default {"" {null "" ~}})}}
+        {m:true.arg   ""  {true modifier settings(default {1 {true on + yes y}})}}
+        {m:false.arg  ""  {false modifier settings(default {0 {false off - no n}})}}
+        {types.arg    ""  {modifier list settings(default {nop timestamp integer null true false})}}
+        {validate         {to validate the input(not dumped tcl content)}}
+    } result] 2 end] ;# Remove ? and help.
+
+    variable errors
+    array set errors {
+        TAB_IN_PLAIN        {Tabs can be used only in comments, and in quoted "..." '...'.}
+        AT_IN_PLAIN         {Reserved indicators {@} can't start a plain scalar.}
+        BT_IN_PLAIN         {Reserved indicators {`} can't start a plain scalar.}
+        SEQEND_NOT_IN_SEQ   {There is a flow-sequence end '\]' not in flow-sequence [v, ...].}
+        MAPEND_NOT_IN_MAP   {There is a flow-mapping end '\}' not in flow-mapping {k: v, ...}.}
+        ANCHOR_NOT_FOUND    {Could not find the anchor-name(current-version, "after refering" is not supported)}
+        MALFORM_D_QUOTE     {Double quote "..." parsing error. end of quote is missing?}
+        MALFORM_S_QUOTE     {Single quote '...' parsing error. end of quote is missing?}
+        TAG_NOT_FOUND       {The "$p1" handle wasn't declared.}
+        INVALID_MERGE_KEY   {merge-key "<<" is not impremented in not mapping scope(e.g. in sequence).}
+        MALFORMED_MERGE_KEY {malformed merge-key "<<" using.}
+    }
+}
+
+####################
+# Public APIs
+####################
+
+proc ::yaml::yaml2dict {args} {
+    variable data
+    _getOption $args
+
+    set result [_parseBlockNode]
+
+    set a [huddle get_stripped $result]
+
+    if {$data(validate)} {
+        set result [string map "{\n} {\\n}" $result]
+    }
+
+    return [huddle get_stripped $result]
+}
+
+proc ::yaml::yaml2huddle {args} {
+    variable data
+    _getOption $args
+
+    set result [_parseBlockNode]
+    if {$data(validate)} {
+        set result [string map "{\n} {\\n}" $result]
+    }
+    return $result
+}
+
+proc ::yaml::setOptions {argv} {
+    variable defaults
+    array set options [_imp_getOptions argv]
+    array set defaults [array get options]
+}
+
+# Dump TCL List to YAML
+#
+
+proc ::yaml::list2yaml {list {indent 2} {wordwrap 40}} {
+    return [huddle2yaml [huddle list {*}$list] $indent $wordwrap]
+}
+
+proc ::yaml::dict2yaml {dict {indent 2} {wordwrap 40}} {
+    return [huddle2yaml [huddle create {*}$dict] $indent $wordwrap]
+}
+
+proc ::yaml::huddle2yaml {huddle {indent 2} {wordwrap 40}} {
+    set yaml::_dumpIndent   $indent
+    set yaml::_dumpWordWrap $wordwrap
+
+    # Start at the base of the array and move through it.
+    set out [join [list "---\n" [_imp_huddle2yaml $huddle] "\n"] ""]
+    return $out
+}
+
+
+####################
+# Option settings
+####################
+
+proc ::yaml::_getOption {argv} {
+    variable data
+    variable parsers
+    variable fixed
+    variable composer
+
+    # default settings
+    array set options [_imp_getOptions argv]
+
+    array set fixed    $options(fixed)
+    array set parsers  $options(parsers)
+    array set composer $options(composer)
+    array set data [list validate $options(validate) types $options(types)]
+    set isfile $options(isfile)
+
+    foreach {buffer} $argv break
+    if {$isfile} {
+        set fd [open $buffer r]
+        set buffer [read $fd]
+        close $fd
+    }
+    set data(buffer) $buffer
+    set data(start)  0
+    set data(length) [string length $buffer]
+    set data(current) 0
+    set data(finished) 0
+}
+
+proc ::yaml::_imp_getOptions {{argvvar argv}} {
+    upvar 1 $argvvar argv
+
+    variable defaults
+    variable opts
+    array set options [array get defaults]
+
+    # default settings
+    array set fixed $options(fixed)
+
+    # parse argv
+    set argc [llength $argv]
+    while {[set err [::cmdline::getopt argv $opts opt arg]]} {
+        if {$err eq -1} break
+        switch -- $opt {
+            "file" {
+                set options(isfile) 1
+            }
+            "stream" {
+                set options(isfile) 0
+            }
+            "m" {
+                array set options(fixed) $arg
+            }
+            "validate" {
+                set options(validate) 1
+            }
+            "types" {
+                set options(types) $arg
+            }
+            default {
+                if {[regexp {m:(\w+)} $opt nop type]} {
+                    if {$arg eq ""} {
+                        set fixed(${type}:Group) ""
+                    } else {
+                        foreach {value group} $arg {
+                            set fixed(${type}:Value) $value
+                            set fixed(${type}:Group) $group
+                        }
+                    }
+                }
+            }
+        }
+    }
+    set options(fixed) [array get fixed]
+    return [array get options]
+}
+
+#########################
+# Scalar/Block Composers
+#########################
+proc ::yaml::_composeTags {tag value} {
+    variable composer
+    if {$tag eq ""} {return $value}
+    set value [huddle get_stripped $value]
+    if {$tag eq "!!str"} {
+        set pair [list $tag $value]
+    } elseif {[info exists composer($tag)]} {
+        set pair [$composer($tag) $value]
+    } else {
+        error [_getErrorMessage TAG_NOT_FOUND $tag]
+    }
+    return  [huddle wrap $pair]
+}
+
+proc ::yaml::_composeFloat {value} {
+    return [list !!float [expr {double($value)}]]
+}
+
+proc ::yaml::_composeBinary {value} {
+    package require base64
+    return [list !!binary [::base64::decode $value]]
+}
+
+proc ::yaml::_composePlain {value} {
+    if {$value ne ""} {
+        if {[huddle type $value] ne "plain"} {return $value}
+        set value [huddle get_stripped $value]
+    }
+    set pair [_toType $value]
+    return  [huddle wrap $pair]
+}
+
+proc ::yaml::_toType {value} {
+    variable data
+    variable parsers
+    variable fixed
+    if {$value eq ""} {return [list !!str ""]}
+
+    set lowerval [string tolower $value]
+    foreach {type} $data(types) {
+        if {[info exists parsers($type)]} {
+            set pair [$parsers($type) $value]
+            if {$pair ne ""} {return $pair}
+            continue
+        }
+        switch -- $type {
+            int {
+                # YAML 1.1
+                if {[regexp {^-?\d[\d,]*\d$|^\d$} $value]} {
+                    regsub -all "," $value "" integer
+                    return [list !!int $integer]
+                }
+            }
+            float {
+                # don't run before "integer"
+                regsub -all "," $value "" val
+                if {[string is double $val]} {
+                    return [list !!float $val]
+                }
+            }
+            default {
+                # !!null !!true !!false
+                if {[info exists fixed($type:Group)] \
+                 && [lsearch $fixed($type:Group) $lowerval] >= 0} {
+                    set value $fixed($type:Value)
+                    return [list !!$type $value]
+                }
+            }
+        }
+    }
+
+    # the others
+    return [list !!str $value]
+}
+
+####################
+# Block Node parser
+####################
+proc ::yaml::_parseBlockNode {{status ""} {indent -1}} {
+    variable data
+    set prev {}
+    set result {}
+    set scalar 0
+    set pos 0
+    set tag ""
+    while {1} {
+        if {$data(finished) == 1} {
+            break
+        }
+        _skipSpaces 1
+        set type [_getc]
+        set current [_getCurrent]
+        if {$type eq "-"} {
+            set cc "[_getc][_getc]"
+            if {"$type$cc" eq "---" && $current == 0} {
+                set result {}
+                continue
+            } else {
+                _ungetc 2
+
+                # [Spec]
+                # Since people perceive the "-" indicator as indentation,
+                # nested block sequences may be indented by one less space
+                # to compensate, except, of course,
+                # if nested inside another block sequence.
+                incr current
+            }
+        }
+        if {$type eq "."} {
+            set cc "[_getc][_getc]"
+            if {"$type$cc" eq "..." && $current == 0} {
+                set data(finished) 1
+                break
+            } else {
+                _ungetc 2
+
+#                 # [Spec]
+#                 # Since people perceive the "-" indicator as indentation,
+#                 # nested block sequences may be indented by one less space
+#                 # to compensate, except, of course,
+#                 # if nested inside another block sequence.
+#                 incr current
+            }
+        }
+        if {$type eq ""  || $current <= $indent} { ; # end document
+            _ungetc
+            break
+        }
+        switch -- $type {
+            "-" { ; # block sequence entry
+                set pos $current
+                # [196]      l-block-seq-entry(n,c)
+                foreach {scalar value} [_parseSubBlock $pos "SEQUENCE"] break
+            }
+            "?" { ; # mapping key
+                foreach {scalar nop} [_parseSubBlock $pos ""] break
+            }
+            ":" { ; # mapping value
+                if {$current < $pos} {set pos [expr {$current+1}]}
+                foreach {scalar value} [_parseSubBlock $pos "MAPPING"] break
+            }
+            "|" { ; # literal block scalar
+                set value [_parseBlockScalar $indent "\n"]
+            }
+            ">" { ; # folded block scalar
+                set value [_parseBlockScalar $indent " "]
+            }
+            "<" { ; # mergeing
+                set c [_getc]
+                if {"$type$c" eq "<<"} {
+                    set pos [_getCurrent]
+                    _skipSpaces 1
+                    set c [_getc]
+                    if {$c ne ":"} {error [_getErrorMessage INVALID_MERGE_KEY]}
+                    if {$status ne "" && $status ne "MAPPING"} {error [_getErrorMessage INVALID_MERGE_KEY]}
+                    set status "MAPPING"
+                    foreach {result prev} [_mergeExpandedAliases $result $pos $prev] break
+                } else {
+                    _ungetc
+                    set scalar 1
+                }
+            }
+            "&" { ; # node's anchor property
+                set anchor [_getToken]
+            }
+            "*" { ; # alias node
+                set alias [_getToken]
+                if {$data(validate)} {
+                    set status "ALIAS"
+                    set value *$alias
+                } else {
+                    set value [_getAnchor $alias]
+                }
+            }
+            "!" { ; # node's tag
+                _ungetc
+                set tag [_getToken]
+            }
+            "%" { ; # directive line
+                _getLine
+            }
+            default {
+                if {[regexp {^[\[\]\{\}\"']$} $type]} {
+                    set pos [expr {1 + $current}]
+                    _ungetc
+                    set value [_parseFlowNode]
+                } else {
+                    set scalar 1
+                }
+            }
+        }
+        if {$scalar} {
+            set pos [_getCurrent]
+            _ungetc
+            set value [_parseScalarNode $type "BLOCK" $pos]
+            set value [_composeTags $tag $value]
+            set tag ""
+            set scalar 0
+        }
+        if {[info exists value]} {
+            if {$status eq "NODE"} {return $value}
+            foreach {result prev} [_pushValue $result $prev $status $value "BLOCK"] break
+            unset value
+        }
+    }
+    if {$status eq "SEQUENCE"} {
+        set result [huddle sequence {*}$result]
+    } elseif {$status eq "MAPPING"} {
+        if {[llength $prev] == 2} {
+            set result [_set_huddle_mapping $result $prev]
+        }
+    } else {
+        if {[info exists prev]} {
+            set result $prev
+        }
+        set result [lindex $result 0]
+        set result [_composePlain $result]
+        if {![huddle isHuddle $result]} {
+            set result [huddle wrap [list !!str $result]]
+        }
+    }
+    if {$tag ne ""} {
+        set result [_composeTags $tag $result]
+        unset tag
+    }
+    if {[info exists anchor]} {
+        _setAnchor $anchor $result
+        unset anchor
+    }
+    return $result
+}
+
+proc ::yaml::_mergeExpandedAliases {result pos prev} {
+    if {$result eq ""} {set result [huddle mapping]}
+    if {$prev ne ""} {
+        if {[llength $prev] < 2} {error [_getErrorMessage MALFORMED_MERGE_KEY]}
+        set result [_set_huddle_mapping $result $prev]
+        set prev {}
+    }
+
+    set value [_parseBlockNode "" $pos]
+    set type_name [huddle type $value]
+
+    if {$type_name eq "list" || $type_name  eq "sequence"} {
+        set len [huddle llength $value]
+        for {set i 0} {$i < $len} {incr i} {
+            set sub [huddle get $value $i]
+            set result [huddle combine $result $sub]
+        }
+
+    } else {
+        set result [huddle combine $result $value]
+    }
+    return [list $result $prev]
+}
+
+proc ::yaml::_parseSubBlock {pos statusnew} {
+    upvar 1 status status
+    set scalar 0
+    set value ""
+    if {[_next_is_blank]} {
+        if {$statusnew ne ""} {
+            set status $statusnew
+            set value [_parseBlockNode "" $pos]
+        }
+    } else {
+        _ungetc
+        set scalar 1
+    }
+    return [list $scalar $value]
+}
+
+proc ::yaml::_set_huddle_mapping {result prev} {
+
+    foreach {key val} $prev break
+
+    set val [_composePlain $val]
+    if {[huddle isHuddle $key]} {
+        set key [huddle get_stripped $key]
+    }
+
+
+    if {$result eq ""} {
+        set result [huddle mapping $key $val]
+    } else {
+        huddle append result $key $val
+    }
+    return $result
+}
+
+
+# remove duplications with saving key order
+proc ::yaml::_remove_duplication {dict} {
+    array set tmp $dict
+    array set tmp2 {}
+    foreach {key nop} $dict {
+        if {[info exists tmp2($key)]} continue
+        lappend result $key $tmp($key)
+        set tmp2($key) 1
+    }
+    return $result
+}
+
+
+# literal "|" (line separator is "\n")
+# folding ">" (line separator is " ")
+proc ::yaml::_parseBlockScalar {base separator} {
+    foreach {explicit chomping} [_parseBlockIndicator] break
+
+    set idch [string repeat " " $explicit]
+    set sep $separator
+    foreach {indent c line} [_getLine] break
+    if {$indent < $base} {return ""}
+    # the first line, NOT ignored comment (as a normal-string)
+    set first $indent
+    set value $line
+    set stop 0
+
+    while {![_eof]} {
+        set pos [_getpos]
+        foreach {indent c line} [_getLine] break
+        if {$line eq ""} {
+            regsub " " $sep "" sep
+            append sep "\n"
+            continue
+        }
+        if {$c eq "#"} {
+            # skip comments
+            continue
+        }
+        if {$indent <= $base} {
+            set stop 1
+            break
+        }
+        append value $sep[string repeat " " [expr {$indent - $first}]]$line
+        set sep $separator
+    }
+    if {[info exists pos] && $stop} {_setpos $pos}
+    switch -- $chomping {
+        "strip" {
+        }
+        "keep" {
+            append value $sep
+        }
+        "clip" {
+            append value "\n"
+        }
+	default {
+	    error "Should not be reached (chomping = $chomping)"
+	}
+    }
+    return [huddle wrap [list !!str $value]]
+}
+
+# in {> |}
+proc ::yaml::_parseBlockIndicator {} {
+    set chomping "clip"
+    set explicit 0
+    while {1} {
+        set type [_getc]
+        if {[regexp {[1-9]} $type digit]} { ; # block indentation
+            set explicit $digit
+        } elseif {$type eq "-"} {   ; # strip chomping
+            set chomping "strip"
+        } elseif {$type eq "+"} {   ; # keep chomping
+            set chomping "keep"
+        } else {
+            _ungetc
+            break
+        }
+    }
+    # Note: skipped after the indicator
+    _getLine
+    return [list $explicit $chomping]
+}
+
+# [162]    ns-plain-multi(n,c)
+proc ::yaml::_parsePlainScalarInBlock {base {loop 0}} {
+    if {$loop == 5} { return }
+    variable data
+    set start $data(start)
+    set reStr {(?:[^:#\t \n]*(?::[^\t \n]+)*(?:#[^\t \n]+)* *)*[^:#\t \n]*}
+    set result [_getFoldedString $reStr]
+
+    set result [string trim $result]
+    set c [_getc 0]
+    if {$c eq "\n" || $c eq "#"} { ; # multi-line
+        set lb ""
+        while {1} {
+            set fpos [_getpos]
+            foreach {indent nop line} [_getLine] break
+            if {[_eof]} {break}
+
+            if {$line ne "" && [string index $line 0] ne "#"} {
+                break
+            }
+            append lb "\n"
+        }
+        set lb [string range $lb 1 end]
+        if {!$data(finished)} {
+            _setpos $fpos
+        }
+        if {$start == $data(start)} {
+            return $result
+        }
+        if {$base <= $indent} {
+            if {$lb eq ""} {
+                set lb " "
+            }
+            set subs [_parsePlainScalarInBlock $base [expr {$loop+1}]]
+           if {$subs ne ""} {
+                append result "$lb$subs"
+            }
+        }
+    }
+    return $result
+}
+
+####################
+# Flow Node parser
+####################
+proc ::yaml::_parseFlowNode {{status ""}} {
+    set scalar 0
+    set result {}
+    set tag ""
+    set prev {}
+    while {1} {
+        _skipSpaces 1
+        set type [_getc]
+        switch -- $type {
+            "" {
+                break
+            }
+            "?" -
+            ":" { ; # mapping value
+                if {[_next_is_blank]} {
+                    set value [_parseFlowNode "NODE"]
+                } else {
+                    set scalar 1
+                }
+            }
+            "," { ; # ends a flow collection entry
+                if {$status eq"NODE"} {
+                    _ungetc
+                    return $value
+                }
+            }
+            "\{" { ; # starts a flow mapping
+                set value [_parseFlowNode "MAPPING"]
+            }
+            "\}" { ; # ends a flow mapping
+                if {$status ne "MAPPING"}  {error [_getErrorMessage MAPEND_NOT_IN_MAP] }
+                return $result
+            }
+            "\[" { ; # starts a flow sequence
+                 set value [_parseFlowNode "SEQUENCE"]
+            }
+            "\]" { ; # ends a flow sequence
+                if {$status ne "SEQUENCE"} {error [_getErrorMessage SEQEND_NOT_IN_SEQ] }
+                set result [huddle sequence {*}$result]
+                return $result
+            }
+            "&" { ; # node's anchor property
+                set anchor [_getToken]
+            }
+            "*" { ; # alias node
+                set alias [_getToken]
+                set value [_getAnchor $alias]
+            }
+            "!" { ; # node's tag
+                _ungetc
+                set tag [_getToken]
+            }
+            "%" { ; # directive line
+                _ungetc
+                _parseDirective
+            }
+            default {
+                set scalar 1
+            }
+        }
+        if {$scalar} {
+            _ungetc
+            set value [_parseScalarNode $type "FLOW"]
+            set value [_composeTags $tag $value]
+            set tag ""
+            set scalar 0
+        }
+        if {[info exists value]} {
+            if {[info exists anchor]} {
+                _setAnchor $anchor $value
+                unset anchor
+            }
+            if {$status eq "" || $status eq "NODE"} {return $value}
+            foreach {result prev} [_pushValue $result $prev $status $value "FLOW"] break
+            unset value
+        }
+    }
+    return $result
+}
+
+proc ::yaml::_pushValue {result prev status value scope} {
+    switch -- $status {
+        "SEQUENCE" {
+            lappend result [_composePlain $value]
+        }
+        "MAPPING" {
+            if {$scope eq "BLOCK"} {
+                if {[llength $prev] == 2} {
+                    set result [_set_huddle_mapping $result $prev]
+                    set prev [list $value]
+                } else {
+                    lappend prev $value
+                }
+            } else {
+                lappend prev $value
+                if {[llength $prev] == 2} {
+                    set result [_set_huddle_mapping $result $prev]
+                    set prev ""
+                }
+            }
+        }
+        default {
+            if {$scope eq "BLOCK"} {lappend prev $value}
+        }
+    }
+    return [list $result $prev]
+}
+
+proc ::yaml::_parseScalarNode {type scope {pos 0}} {
+    set tag !!str
+    switch -- $type {
+        \" { ; # surrounds a double-quoted flow scalar
+            set value [_parseDoubleQuoted]
+        }
+        {'} { ; # surrounds a single-quoted flow scalar
+            set value [_parseSingleQuoted]
+        }
+        "\t" {error [_getErrorMessage TAB_IN_PLAIN] }
+        "@"  {error [_getErrorMessage AT_IN_PLAIN] }
+        "`"  {error [_getErrorMessage BT_IN_PLAIN] }
+        default {
+            # Plane Scalar
+            if       {$scope eq "FLOW"} {
+                set value [_parsePlainScalarInFlow]
+            } elseif {$scope eq "BLOCK"} {
+                set value [_parsePlainScalarInBlock $pos]
+            }
+            set tag !!plain
+        }
+    }
+    return [huddle wrap [list $tag $value]]
+}
+
+# [time scanning at JST]
+# 2001-12-15T02:59:43.1Z       => 1008385183
+# 2001-12-14t21:59:43.10-05:00 => 1008385183
+# 2001-12-14 21:59:43.10 -5    => 1008385183
+# 2001-12-15 2:59:43.10        => 1008352783
+# 2002-12-14                   => 1039791600
+proc ::yaml::_parseTimestamp {scalar} {
+    if {![regexp {^\d\d\d\d-\d\d-\d\d} $scalar]} {return ""}
+    set datestr  {\d\d\d\d-\d\d-\d\d}
+    set timestr  {\d\d?:\d\d:\d\d}
+    set timezone {Z|[-+]\d\d?(?::\d\d)?}
+
+    set canonical [subst -nobackslashes -nocommands {^($datestr)[Tt ]($timestr)\.\d+ ?($timezone)?$}]
+    set dttm [subst -nobackslashes -nocommands {^($datestr)(?:[Tt ]($timestr))?$}]
+    if {$::tcl_version < 8.5} {
+        if {[regexp $canonical $scalar nop dt tm zone]} {
+            # Canonical
+            if {$zone eq ""} {
+                return [list !!timestamp [clock scan "$dt $tm"]]
+            } elseif {$zone eq "Z"} {
+                return [list !!timestamp [clock scan "$dt $tm" -gmt 1]]
+            }
+            if {[regexp {^([-+])(\d\d?)$} $zone nop sign d]} {set zone [format "$sign%02d:00" $d]}
+            regexp {^([-+]\d\d):(\d\d)} $zone nop h m
+            set m [expr {$h > 0 ? $h*60 + $m : $h*60 - $m}]
+            return [list !!timestamp [clock scan "[expr {-$m}] minutes" -base [clock scan "$dt $tm" -gmt 1]]]
+        } elseif {[regexp $dttm $scalar nop dt tm]} {
+            if {$tm ne ""} {
+                return [list !!timestamp [clock scan "$dt $tm"]]
+            } else {
+                return [list !!timestamp [clock scan $dt]]
+            }
+        }
+    } else {
+        if {[regexp $canonical $scalar nop dt tm zone]} {
+            # Canonical
+            if {$zone ne ""} {
+                if {[regexp {^([-+])(\d\d?)$} $zone nop sign d]} {set zone [format "$sign%02d:00" $d]}
+                return [list !!timestamp [clock scan "$dt $tm $zone" -format {%Y-%m-%d %k:%M:%S %Z}]]
+            } else {
+                return [list !!timestamp [clock scan "$dt $tm"       -format {%Y-%m-%d %k:%M:%S}]]
+            }
+        } elseif {[regexp $dttm $scalar nop dt tm]} {
+            if {$tm ne ""} {
+                return [list !!timestamp [clock scan "$dt $tm" -format {%Y-%m-%d %k:%M:%S}]]
+            } else {
+                return [list !!timestamp [clock scan $dt       -format {%Y-%m-%d}]]
+            }
+        }
+    }
+    return ""
+}
+
+
+proc ::yaml::_parseDirective {} {
+    variable data
+    variable shorthands
+
+    set directive [_getToken]
+
+    if {[regexp {^%YAML} $directive]} {
+        # YAML directive
+        _skipSpaces
+        set version [_getToken]
+        set data(YAMLVersion) $version
+        if {![regexp {^\d\.\d$} $version]}   { error [_getErrorMessage ILLEGAL_YAML_DIRECTIVE] }
+    } elseif {[regexp {^%TAG} $directive]} {
+        # TAG directive
+        _skipSpaces
+        set handle [_getToken]
+        if {![regexp {^!$|^!\w*!$} $handle]} { error [_getErrorMessage ILLEGAL_YAML_DIRECTIVE] }
+
+        _skipSpaces
+        set prefix [_getToken]
+        if {![regexp {^!$|^!\w*!$} $prefix]} { error [_getErrorMessage ILLEGAL_YAML_DIRECTIVE] }
+        set shorthands(handle) $prefix
+    }
+}
+
+proc ::yaml::_parseTagHandle {} {
+    set token [_getToken]
+
+    if {[regexp {^(!|!\w*!)(.*)} $token nop handle named]} {
+        # shorthand or non-specific Tags
+        switch -- $handle {
+            ! { ;       # local or non-specific Tags
+            }
+            !! { ;      # yaml Tags
+            }
+            default { ; # shorthand Tags
+
+            }
+        }
+        if {![info exists prefix($handle)]} { error [_getErrorMessage TAG_NOT_FOUND] }
+    } elseif {[regexp {^!<(.+)>} $token nop uri]} {
+        # Verbatim Tags
+        if {![regexp {^[\w:/]$} $token nop uri]} { error [_getErrorMessage ILLEGAL_TAG_HANDLE] }
+    } else {
+        error [_getErrorMessage ILLEGAL_TAG_HANDLE]
+    }
+
+    return "!<$prefix($handle)$named>"
+}
+
+
+proc ::yaml::_parseDoubleQuoted {} {
+    # capture quoted string with backslash sequences
+    set reStr {(?:(?:\")(?:[^\\\"]*(?:\\.[^\\\"]*)*)(?:\"))}
+    set result [_getFoldedString $reStr]
+    if {$result eq ""} { error [_getErrorMessage MALFORM_D_QUOTE] }
+
+    # [116] nb-double-multi-line
+    regsub -all {[ \t]*\n[\t ]*} $result "\r" result
+    regsub -all {([^\r])\r} $result {\1 } result
+    regsub -all { ?\r} $result "\n" result
+    # [112] s-s-double-escaped(n)
+    # is not impremented.(specification ???)
+
+    # chop off outer ""s and substitute backslashes
+    # This does more than the RFC-specified backslash sequences,
+    # but it does cover them all
+    set chopped [subst -nocommands -novariables \
+        [string range $result 1 end-1]]
+    return $chopped
+}
+
+proc ::yaml::_parseSingleQuoted {} {
+    set reStr {(?:(?:')(?:[^']*(?:''[^']*)*)(?:'))}
+    set result [_getFoldedString $reStr]
+    if {$result eq ""} { error [_getErrorMessage MALFORM_S_QUOTE] }
+
+    # [126] nb-single-multi-line
+    regsub -all {[ \t]*\n[\t ]*} $result "\r" result
+    regsub -all {([^\r])\r} $result {\1 } result
+    regsub -all { ?\r} $result "\n" result
+
+    regsub -all {''} [string range $result 1 end-1] {'} chopped
+
+    return $chopped
+}
+
+
+# [155]     nb-plain-char-in
+proc ::yaml::_parsePlainScalarInFlow {} {
+    set sep {\t \n,\[\]\{\}}
+    set reStr {(?:[^$sep:#]*(?::[^$sep]+)*(?:#[^$sep]+)* *)*[^$sep:#]*}
+    set reStr [subst -nobackslashes -nocommands $reStr]
+    set result [_getFoldedString $reStr]
+    set result [string trim $result]
+
+    if {[_getc 0] eq "#"} {
+        _getLine
+        set result "$result [_parsePlainScalarInFlow]"
+    }
+    return $result
+}
+
+####################
+# Generic parser
+####################
+proc ::yaml::_getFoldedString {reStr} {
+    variable data
+
+    set buff [string range $data(buffer) $data(start) end]
+    regexp $reStr $buff token
+    if {![info exists token]} {return}
+
+    set len [string length $token]
+    if {[string first "\n" $token] >= 0} { ; # multi-line
+        set data(current) [expr {$len - [string last "\n" $token]}]
+    } else {
+        incr data(current) $len
+    }
+    incr data(start) $len
+
+    return $token
+}
+
+# get a space separated token
+proc ::yaml::_getToken {} {
+    variable data
+
+    set reStr {^[^ \t\n,\]]+}
+    set result [_getFoldedString $reStr]
+    return $result
+}
+
+proc ::yaml::_skipSpaces {{commentSkip 0}} {
+    variable data
+
+    while {1} {
+        set ch [string index $data(buffer) $data(start)]
+        incr data(start)
+        switch -- $ch {
+            " " {
+                incr data(current)
+                continue
+            }
+            "\n" {
+                set data(current) 0
+                continue
+            }
+            "\#" {
+                if {$commentSkip} {
+                    _getLine
+                    continue
+                }
+            }
+	    default {
+		# Any other character, do nothing
+	    }
+        }
+        break
+    }
+    incr data(start) -1
+}
+
+# get a line of stream(line-end trimed)
+# (cannot _ungetc)
+proc ::yaml::_getLine {{scrolled 1}} {
+    variable data
+
+    set pos [string first "\n" $data(buffer) $data(start)]
+    if {$pos == -1} {
+        set pos $data(length)
+    }
+    set line [string range $data(buffer) $data(start) [expr {$pos-1}]]
+    if {$line eq "..." && $data(current) == 0} {
+        set data(finished) 1
+    }
+    regexp {^( *)(.*)} $line nop space result
+    if {$scrolled} {
+        set data(start) [expr {$pos + 1}]
+        set data(current) 0
+    }
+    if {$line == "" && $data(start) == $data(length)} {
+        set data(finished) 1
+    }
+    return [list [string length $space] [string index $result 0] $result]
+}
+
+proc ::yaml::_getCurrent {} {
+    variable data
+    return [expr {$data(current) ? $data(current)-1 : 0}]
+}
+
+proc ::yaml::_getLineNum {} {
+    variable data
+    set prev [string range $data(buffer) 0 $data(start)]
+    return [llength [split $prev "\n"]]
+}
+
+proc ::yaml::_getc {{scrolled 1}} {
+    variable data
+
+    set result [string index $data(buffer) $data(start)]
+    if {$scrolled} {
+        incr data(start)
+        if {$result eq "\n"} {
+            set data(current) 0
+        } else {
+            incr data(current)
+        }
+    }
+    return $result
+}
+
+proc ::yaml::_eof {} {
+    variable data
+    return [expr {$data(finished) || $data(start) == $data(length)}]
+}
+
+
+proc ::yaml::_getpos {} {
+    variable data
+    return $data(start)
+}
+
+proc ::yaml::_setpos {pos} {
+    variable data
+    set data(start) $pos
+}
+
+proc ::yaml::_ungetc {{len 1}} {
+    variable data
+    incr data(start) [expr {-$len}]
+    incr data(current) [expr {-$len}]
+    if {$data(current) < 0} {
+        set prev [string range $data(buffer) 0 $data(start)]
+        if {[string index $prev end] eq "\n"} {set prev [string replace $prev end end a]}
+        set data(current) [expr {$data(start) - [string last "\n" $prev] - 1}]
+    }
+}
+
+proc ::yaml::_next_is_blank {} {
+    set c [_getc 0]
+    if {$c eq " " || $c eq "\n"} {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+proc ::yaml::_setAnchor {anchor value} {
+    variable data
+    set data(anchor:$anchor) $value
+}
+
+proc ::yaml::_getAnchor {anchor} {
+    variable data
+    if {![info exists data(anchor:$anchor)]} {error [_getErrorMessage ANCHOR_NOT_FOUND]}
+    return  $data(anchor:$anchor)
+}
+
+proc ::yaml::_getErrorMessage {ID {p1 ""}} {
+    variable errors
+    set num [_getLineNum]
+    if {$p1 != ""} {
+        return "line($num): [subst -nobackslashes -nocommands $errors($ID)]"
+    } else {
+        return "line($num): $errors($ID)"
+    }
+}
+
+# Finds and returns the indentation of a YAML line
+proc ::yaml::_getIndent {line} {
+    set match [regexp -inline -- {^\s{1,}} " $line"]
+    return [expr {[string length $match] - 3}]
+}
+
+
+################
+## Dumpers    ##
+################
+
+proc ::yaml::_imp_huddle2yaml {data {offset ""}} {
+    variable _dumpIndent
+    set nextoff "$offset[string repeat { } $_dumpIndent]"
+    switch -- [huddle type $data] {
+        "string" {
+            set data [huddle get_stripped $data]
+            return [_dumpScalar $data $offset]
+        }
+        "list" {
+            set inner {}
+            set len [huddle llength $data]
+            for {set i 0} {$i < $len} {incr i} {
+                set sub [huddle get $data $i]
+                set sep [expr {[huddle type $sub] eq "string" ? " " : "\n"}]
+                lappend inner [join [list $offset - $sep [_imp_huddle2yaml $sub $nextoff]] ""]
+            }
+            return [join $inner "\n"]
+        }
+        "dict" {
+            set inner {}
+            foreach {key} [huddle keys $data] {
+                set sub [huddle get $data $key]
+                set sep [expr {[huddle type $sub] eq "string" ? " " : "\n"}]
+                lappend inner [join [list $offset $key: $sep [_imp_huddle2yaml $sub $nextoff]] ""]
+            }
+            return [join $inner "\n"]
+        }
+        default {
+            return $data
+        }
+    }
+}
+
+proc ::yaml::_dumpScalar {value offset} {
+    if {   [string first "\n" $value] >= 0
+        || [string first ": " $value] >= 0
+        || [string first "- " $value] >= 0} {
+        return [_doLiteralBlock $value $offset]
+    } else {
+        return [_doFolding $value $offset]
+    }
+}
+
+# Creates a literal block for dumping
+proc ::yaml::_doLiteralBlock {value offset} {
+    if {[string index $value end] eq "\n"} {
+        set newValue "|"
+        set value [string range $value 0 end-1]
+    } else {
+        set newValue "|-"
+    }
+    set exploded [split $value "\n"]
+
+    set value [string trimright $value]
+    foreach {line} $exploded {
+        set newValue "$newValue\n$offset[string trim $line]"
+    }
+    return $newValue
+}
+
+# Folds a string of text, if necessary
+proc ::yaml::_doFolding {value offset} {
+    variable _dumpWordWrap
+    # Don't do anything if wordwrap is set to 0
+    if {$_dumpWordWrap == 0} {
+        return $value
+    }
+
+    if {[string length $value] > $_dumpWordWrap} {
+        set wrapped [_simple_justify $value $_dumpWordWrap "\n$offset"]
+        set value ">\n$offset$wrapped"
+    }
+    return $value
+}
+
+# http://wiki.tcl.tk/1774
+proc ::yaml::_simple_justify {text width {wrap \n} {cut 0}} {
+    set brk ""
+    for {set result {}} {[string length $text] > $width} {
+                set text [string range $text [expr {$brk+1}] end]
+            } {
+        set brk [string last " " $text $width]
+        if { $brk < 0 } {
+            if {$cut == 0} {
+                append result $text
+                return $result
+            } else {
+                set brk $width
+            }
+        }
+        append result [string range $text 0 $brk] $wrap
+    }
+    return $result$text
+}
+
+########################
+##    YAML TYPES      ##
+########################
+
+namespace eval ::yaml::types {
+    namespace eval mapping {
+    variable settings
+        set settings {
+        superclass dict
+        publicMethods {mapping}
+        tag !!map
+        isContainer yes }
+
+        proc mapping {args} {
+            if {[llength $args] % 2} {error {wrong # args: should be "huddle mapping ?key value ...?"}}
+            set resultL {}
+            foreach {key value} $args {
+                lappend resultL $key [argument_to_node $value !!str]
+            }
+            return [huddle wrap [list !!map $resultL]]
+        }
+
+    }
+
+    namespace eval sequence {
+	variable settings
+
+        set settings {
+	    superclass list
+	    publicMethods {sequence}
+	    isContainer yes
+	    tag !!seq
+	}
+
+        proc sequence {args} {
+            set resultL {}
+            foreach {value} $args {
+                lappend resultL [argument_to_node $value !!str]
+            }
+            return [wrap [list !!seq $resultL]]
+        }
+
+    }
+}
+
+proc ::yaml::_makeChildType {type tag} {
+    set full_path_to_type ::yaml::types::$type
+    namespace eval $full_path_to_type [string map [list @TYPE@ $type @TAG@ $tag] {
+	variable settings
+	set settings {
+	    superClass string
+	    publicMethods {}
+	    isContainer no
+	    tag @TAG@
+	}
+    }]
+
+    return $full_path_to_type
+}
+
+huddle addType ::yaml::types::mapping
+huddle addType ::yaml::types::sequence
+
+huddle addType [::yaml::_makeChildType str !!str]
+huddle addType [::yaml::_makeChildType timestamp !!timestamp]
+huddle addType [::yaml::_makeChildType float !!float]
+huddle addType [::yaml::_makeChildType int !!int]
+huddle addType [::yaml::_makeChildType null !!null]
+huddle addType [::yaml::_makeChildType true !!true]
+huddle addType [::yaml::_makeChildType false !!false]
+huddle addType [::yaml::_makeChildType binary !!binary]
+huddle addType [::yaml::_makeChildType plain !!plain]
+
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/zip/decode.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/zip/decode.tcl
new file mode 100644
index 00000000..ebb4da0b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/zip/decode.tcl
@@ -0,0 +1,751 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Copyright (c) 2008-2012 ActiveState Software Inc., Andreas Kupries
+##               2016-2022 Andreas Kupries
+## BSD License
+##
+# Package providing commands for the decoding of basic zip-file
+# structures.
+
+package require Tcl 8.4
+package require fileutil::decode 0.2.1    ; # Framework for easy decoding of files.
+namespace eval ::zipfile::decode {}
+if {[package vcompare $tcl_patchLevel "8.6"] < 0} {
+  # Only needed pre-8.6
+  package require Trf                       ; # Wrapper to zlib
+  package require zlibtcl                   ; # Zlib usage. No commands, access through Trf
+  set ::zipfile::decode::native_zip_functs 0
+} else {
+  set ::zipfile::decode::native_zip_functs 1
+}
+namespace eval ::zipfile::decode {
+    namespace import ::fileutil::decode::*
+}
+
+# ### ### ### ######### ######### #########
+## Convenience command, decode and copy to dir
+
+proc ::zipfile::decode::unzipfile {in out} {
+    zipfile::decode::open  $in
+    set                     zd [zipfile::decode::archive]
+    zipfile::decode::unzip $zd $out
+    zipfile::decode::close
+    return
+}
+
+## Convenience command, decode and return list of contained paths.
+proc ::zipfile::decode::content {in} {
+    zipfile::decode::open $in
+    set zd [zipfile::decode::archive]
+    set f [files $zd]
+    zipfile::decode::close
+    return $f
+}
+
+# ### ### ### ######### ######### #########
+##
+
+proc ::zipfile::decode::iszip {fname} {
+    if {[catch {
+	LocateEnd $fname
+    } msg]} {
+	return 0
+    }
+    return 1
+}
+
+proc ::zipfile::decode::open {fname} {
+    variable eoa
+    if {[catch {
+	set eoa [LocateEnd $fname]
+    } msg]} {
+	Error "\"$fname\" is not a zip file" BAD ARCHIVE
+    }
+    fileutil::decode::open $fname
+    return
+}
+
+proc ::zipfile::decode::close {} {
+    variable eoa
+    unset eoa
+    fileutil::decode::close
+    return
+}
+
+# ### ### ### ######### ######### #########
+##
+
+proc ::zipfile::decode::comment {zdict} {
+    array set _ $zdict
+    return $_(comment)
+}
+
+proc ::zipfile::decode::files {zdict} {
+    array set _ $zdict
+    array set f $_(files)
+    return [array names f]
+}
+
+
+proc ::zipfile::decode::filelocations zdict {
+    set res {}
+    foreach {fname finfo} [dict get $zdict files] {
+	set start [dict get $finfo fileloc]
+	set size [dict get $finfo csize]
+	lappend res $start $size $fname
+    }
+    set res [lsort -stride 3 -index 0 -integer $res[set res {}]]
+    return $res
+}
+
+proc ::zipfile::decode::hasfile {zdict fname} {
+    array set _ $zdict
+    array set f $_(files)
+    return [info exists f($fname)]
+}
+
+proc ::zipfile::decode::copyfile {zdict src dst} {
+    array set _ $zdict
+    array set f $_(files)
+
+    if {![info exists f($src)]} {
+	Error "File \"$src\" not known" BAD PATH
+    }
+
+    array set     fd $f($src)
+    CopyFile $src fd $dst
+    return
+}
+
+proc ::zipfile::decode::getfile {zdict src} {
+    array set _ $zdict
+    array set f $_(files)
+
+    if {![info exists f($src)]} {
+	Error "File \"$src\" not known" BAD PATH
+    }
+
+    array set fd $f($src)
+    return [GetFile $src fd]
+}
+
+proc ::zipfile::decode::filesize {zdict src} {
+    array set _ $zdict
+    array set f $_(files)
+
+    if {![info exists f($src)]} {
+	Error "File \"$src\" not known" BAD PATH
+    }
+
+    array set fd $f($src)
+    return $fd(ucsize)
+}
+
+proc ::zipfile::decode::filecomment {zdict src} {
+    array set _ $zdict
+    array set f $_(files)
+
+    if {![info exists f($src)]} {
+	Error "File \"$src\" not known" BAD PATH
+    }
+
+    array set fd $f($src)
+    return $fd(comment)
+}
+
+proc ::zipfile::decode::unzip {zdict dst} {
+    array set _ $zdict
+    array set f $_(files)
+
+    foreach src [array names f] {
+	array set     fd $f($src)
+	CopyFile $src fd [file join $dst $src]
+
+	unset fd
+    }
+    return
+}
+
+proc ::zipfile::decode::CopyFile {src fdv dst} {
+    upvar 1 $fdv fd
+
+    file mkdir [file dirname $dst]
+
+    if {[string match */ $src]} {
+	# Entry is a directory. Just create.
+	file mkdir $dst
+	return
+    }
+
+    # Create files. Empty files are a special case, we have
+    # nothing to decompress.
+
+    if {$fd(ucsize) == 0} {
+	::close [::open $dst w] ; # touch
+	return
+    }
+
+    # non-empty files, work depends on type of compression.
+
+    switch -exact -- $fd(cm) {
+	uncompressed {
+	    go     $fd(fileloc)
+	    nbytes $fd(csize)
+
+	    set out [::open $dst w]
+	    fconfigure $out -translation binary -encoding binary -eofchar {}
+	    puts -nonewline $out [getval]
+	    ::close $out
+	}
+	deflate {
+	    go     $fd(fileloc)
+	    nbytes $fd(csize)
+
+	    set out [::open $dst w]
+	    fconfigure $out -translation binary -encoding binary -eofchar {}
+            if {$::zipfile::decode::native_zip_functs} {
+              puts -nonewline $out \
+		[zlib inflate [getval]]
+            } else {
+              puts -nonewline $out \
+		[zip -mode decompress -nowrap 1 -- \
+		     [getval]]
+            }
+	    ::close $out
+	}
+	default {
+	    Error "Unable to handle file \"$src\" compressed with method \"$fd(cm)\"" \
+		BAD COMPRESSION
+	}
+    }
+
+    if {
+	($::tcl_platform(platform) ne "windows") &&
+	($fd(efattr) != 0)
+    } {
+	# On unix take the permissions encoded in the external
+	# attributes and apply them to the new file. If there are
+	# permission. A value of 0 indicates an older teabag where
+	# the encoder did not yet support permissions. These we do not
+	# change from the sustem defaults. Permissions are in the
+	# lower 9 bits of the MSW.
+
+	file attributes $dst -permissions \
+	    [string map {0 --- 1 --x 2 -w- 3 -wx 4 r-- 5 r-x 6 rw- 7 rwx} \
+		 [format %03o [expr {($fd(efattr) >> 16) & 0x1ff}]]]
+    }
+
+    # FUTURE: Run crc checksum on created file and compare to the
+    # ......: stored information.
+
+    return
+}
+
+proc ::zipfile::decode::GetFile {src fdv} {
+    # See also CopyFile for similar code.
+    # TODO: Check with CopyFile for refactoring opportunity
+
+    upvar 1 $fdv fd
+
+    # Entry is a directory.
+    if {[string match */ $src]} {return {}}
+
+    # Empty files are a special case, we have
+    # nothing to decompress.
+
+    if {$fd(ucsize) == 0} {return {}}
+
+    # non-empty files, work depends on type of compression.
+
+    switch -exact -- $fd(cm) {
+	uncompressed {
+	    go     $fd(fileloc)
+	    nbytes $fd(csize)
+	    return [getval]
+	}
+	deflate {
+	    go     $fd(fileloc)
+	    nbytes $fd(csize)
+	    if {$::zipfile::decode::native_zip_functs} {
+		return [zlib inflate [getval]]
+	    } else {
+		return [zip -mode decompress -nowrap 1 -- [getval]]
+	    }
+	}
+	default {
+	    Error "Unable to handle file \"$src\" compressed with method \"$fd(cm)\"" \
+		BAD COMPRESSION
+	}
+    }
+
+    # FUTURE: Run crc checksum on created file and compare to the
+    # ......: stored information.
+
+    return {}
+}
+
+# ### ### ### ######### ######### #########
+##
+
+proc ::zipfile::decode::tag {etag} {
+    mark
+    long-le
+    return [match 0x${etag}4b50] ; # 'PK x y', little-endian integer.
+}
+
+proc ::zipfile::decode::localfileheader {} {
+    clear
+    putloc @
+    if {![tag 0403]} {clear ; return 0}
+
+    short-le ; unsigned ; recode VER ; put vnte      ; # version needed to extract
+    short-le ; unsigned ;              put gpbf      ; # general purpose bitflag
+    short-le ; unsigned ; recode CM  ; put cm        ; # compression method
+    short-le ; unsigned ;              put lmft      ; # last mod file time
+    short-le ; unsigned ;              put lmfd      ; # last mod file date
+    long-le  ; unsigned ;              put crc       ; # crc32                  | zero's here imply non-seekable,
+    long-le  ; unsigned ;              put csize     ; # compressed file size   | data is in a DDS behind the stored
+    long-le  ; unsigned ;              put ucsize    ; # uncompressed file size | file.
+    short-le ; unsigned ;              put fnamelen  ; # file name length
+    short-le ; unsigned ;              put efieldlen ; # extra field length
+
+    array set hdr [get]
+    clear
+
+    nbytes $hdr(fnamelen) ; put fname
+    putloc                      efieldloc
+    skip $hdr(efieldlen)
+    putloc                      fileloc
+
+    array set hdr [get]
+    clear
+
+    set hdr(gpbf) [GPBF $hdr(gpbf) $hdr(cm)]
+    setbuf [array get hdr]
+    return 1
+}
+
+proc ::zipfile::decode::centralfileheader {} {
+    clear
+    putloc @
+    if {![tag 0201]} {clear ; return 0}
+
+    # The items marked with ++ do not exist in the local file
+    # header. Everything else exists in the local file header as well,
+    # and has to match that information.
+
+    clear
+    short-le ; unsigned ; recode VER ; put vmb         ; # ++ version made by
+    short-le ; unsigned ; recode VER ; put vnte        ; #    version needed to extract
+    short-le ; unsigned ;              put gpbf        ; #    general purpose bitflag
+    short-le ; unsigned ; recode CM  ; put cm          ; #    compression method
+    short-le ; unsigned ;              put lmft        ; #    last mod file time
+    short-le ; unsigned ;              put lmfd        ; #    last mod file date
+    long-le  ; unsigned ;              put crc         ; #    crc32                  | zero's here imply non-seekable,
+    long-le  ; unsigned ;              put csize       ; #    compressed file size   | data is in a DDS behind the stored
+    long-le  ; unsigned ;              put ucsize      ; #    uncompressed file size | file.
+    short-le ; unsigned ;              put fnamelen    ; #    file name length
+    short-le ; unsigned ;              put efieldlen2  ; #    extra field length
+    short-le ; unsigned ;              put fcommentlen ; # ++ file comment length
+    short-le ; unsigned ;              put dns         ; # ++ disk number start
+    short-le ; unsigned ; recode IFA ; put ifattr      ; # ++ internal file attributes
+    long-le  ; unsigned ;              put efattr      ; # ++ external file attributes
+    long-le  ; unsigned ;              put localloc    ; # ++ relative offset of local file header
+
+    array set hdr [get]
+    clear
+
+    nbytes $hdr(fnamelen)    ; put fname
+    putloc                         efieldloc2
+    skip $hdr(efieldlen2)
+    nbytes $hdr(fcommentlen) ; put comment
+
+    array set hdr [get]
+    clear
+
+    set hdr(gpbf) [GPBF $hdr(gpbf) $hdr(cm)]
+    setbuf [array get hdr]
+    return 1
+}
+
+## NOT USED
+proc ::zipfile::decode::datadescriptor {} {
+    if {![tag 0807]} {return 0}
+
+    clear
+    long-le  ; unsigned ; put crc    ; # crc32
+    long-le  ; unsigned ; put csize  ; # compressed file size
+    long-le  ; unsigned ; put ucsize ; # uncompressed file size
+
+    return 1
+}
+
+proc ::zipfile::decode::endcentralfiledir {} {
+    clear
+    putloc ecdloc
+    if {![tag 0605]} {clear ; return 0}
+
+    short-le ; unsigned ; put nd         ; #
+    short-le ; unsigned ; put ndscd      ; #
+    short-le ; unsigned ; put tnecdd     ; #
+    short-le ; unsigned ; put tnecd      ; #
+    long-le  ; unsigned ; put sizecd     ; #
+    long-le  ; unsigned ; put ocd        ; #
+    short-le ; unsigned ; put commentlen ; # archive comment length
+
+    array set hdr [get] ; clear
+
+    nbytes $hdr(commentlen) ; put comment
+
+    array set hdr [get] ; clear
+
+    setbuf [array get hdr]
+    return 1
+}
+
+## NOT USED
+proc ::zipfile::decode::afile {} {
+    if {![localfileheader]} {return 0}
+
+    array set hdr [get]
+    if {($hdr(ucsize) == 0) || ($hdr(csize) > 0)} {
+	# The header entry specifies either
+	# 1. A zero-length file (possibly a directory entry), or
+	# 2. a non-empty file (compressed size > 0).
+	# In both cases we can skip the file contents directly.
+	# In both cases there should be no data descriptor behind
+	# we contents, but we check nevertheless. If there is its
+	# data overrides the current size and crc info.
+
+	skip $hdr(csize)
+
+	if {[datadescriptor]} {
+	    array set hdr [get]
+	    set hdr(ddpresent) 1
+	    setbuf [array get hdr]
+	}
+    } else {
+	Error "Search data descriptor. Not Yet Implemented" INCOMPLETE
+    }
+    return 1
+}
+
+proc ::zipfile::decode::archive {} {
+    variable eoa
+    array set cb $eoa
+
+    # Position us at the beginning of CFH, using the data provided to
+    # us by 'LocateEnd', called during 'open'.
+
+    go [expr {$cb(base) + $cb(coff)}]
+
+    array set fn {}
+
+    set nentries 0
+    while {[centralfileheader]} {
+	array set _ [set data [get]] ; clear
+
+	#parray _
+
+	# Use the information found in the CFH entry to locate and
+	# read the associated LFH. We explicitly remember where we are
+	# in the file because mark/rewind is only one level and the
+	# LFH command already used that up.
+
+	set here [at]
+	go [expr {$cb(base) + $_(localloc)}]
+	if {![localfileheader]} {
+	    ArchiveError "Directory entry without file." DIR WITHOUT FILE
+	}
+
+	array set lh [get] ; clear
+	go $here
+
+	# Compare the information in the CFH entry and associated
+	# LFH. Should match.
+
+	if {![hdrmatch lh _]} {
+	    ArchiveError "File/Dir Header mismatch." HEADER MISMATCH FILE/DIR
+	}
+
+	# Merge local and central data.
+	array set lh $data
+
+	set fn($_(fname)) [array get lh]
+	unset lh _
+	incr nentries
+    }
+
+    if {![endcentralfiledir]} {
+	ArchiveError "Bad closure." BAD CLOSURE
+    }
+
+    array set _ [get] ; clear
+
+    #parray _
+    #puts \#$nentries
+
+    if {$nentries != $_(tnecd)} {
+	ArchiveError "\#Files ($_(tnecd)) does not match \#Actual files ($nentries)" \
+	    MISMATCH COUNTS
+    }
+
+    set _(files) [array get fn]
+    return [array get _]
+}
+
+proc ::zipfile::decode::hdrmatch {lhv chv} {
+    upvar 1 $lhv lh $chv ch
+
+    #puts ______________________________________________
+    #parray lh
+    #parray ch
+
+    foreach key {
+	vnte gpbf cm lmft lmfd fnamelen fname
+    } {
+	if {$lh($key) != $ch($key)} {return 0}
+    }
+
+    if {[lsearch -exact $lh(gpbf) dd] < 0} {
+	# Compare the central and local size information only if the
+	# latter is not provided by a DDS. Which we haven't read.
+	# Because in that case the LFH information is uniformly 0, not
+	# known at the time of writing.
+
+	foreach key {
+	    crc csize ucsize
+	} {
+	    if {$lh($key) != $ch($key)} {return 0}
+	}
+    }
+
+    return 1
+}
+
+
+# ### ### ### ######### ######### #########
+##
+
+proc ::zipfile::decode::IFA {v} {
+    if {$v & 0x1} {
+	return text
+    } else {
+	return binary
+    }
+}
+
+# ### ### ### ######### ######### #########
+##
+
+namespace eval ::zipfile::decode {
+    variable  vhost
+    array set vhost {
+	0  FAT		1  Amiga
+	2  VMS		3  Unix
+	4  VM/CMS	5  Atari
+	6  HPFS		7  Macintosh
+	8  Z-System	9  CP/M
+	10 TOPS-20	11 NTFS
+	12 SMS/QDOS	13 {Acorn RISC OS}
+	14 VFAT		15 MVS
+	16 BeOS		17 Tandem
+    }
+}
+
+proc ::zipfile::decode::VER {v} {
+    variable vhost
+    set u [expr {($v & 0xff00) >> 16}]
+    set l [expr {($v & 0x00ff)}]
+
+    set major [expr {$l / 10}]
+    set minor [expr {$l % 10}]
+
+    return [list $vhost($u) ${major}.$minor]
+}
+
+# ### ### ### ######### ######### #########
+##
+
+namespace eval ::zipfile::decode {
+    variable  cm
+    array set cm {
+	0  uncompressed	1  shrink
+	2  {reduce 1}	3  {reduce 2}
+	4  {reduce 3}	5  {reduce 4}
+	6  implode	7  reserved
+	8  deflate	9  reserved
+	10 implode-pkware-dcl
+    }
+}
+
+proc ::zipfile::decode::CM {v} {
+    variable cm
+    return $cm($v)
+}
+
+# ### ### ### ######### ######### #########
+##
+
+namespace eval ::zipfile::decode {
+    variable  gbits
+    array set gbits {
+	0,1         encrypted
+	1,0,implode 4k-window
+	1,1,implode 8k-window
+	2,0,implode 2fano
+	2,1,implode 3fano
+	3,1         dd
+	5,1         patched
+
+	deflate,0 normal
+	deflate,1 maximum
+	deflate,2 fast
+	deflate,3 superfast
+   }
+}
+
+proc ::zipfile::decode::GPBF {v cm} {
+    variable gbits
+    set res {}
+
+    if {$cm eq "deflate"} {
+	# bit 1, 2 are treated together for deflate
+
+	lappend res $gbits($cm,[expr {($v >> 1) & 0x3}])
+    }
+
+    set bit 0
+    while {$v > 0} {
+	set odd [expr {$v % 2 == 1}]
+	if {[info exists gbits($bit,$odd,$cm)]} {
+	    lappend res $gbits($bit,$odd,$cm)
+	} elseif {[info exists gbits($bit,$odd)]} {
+	    lappend res $gbits($bit,$odd)
+	}
+	set v [expr {$v >> 1}]
+	incr bit
+    }
+
+    return $res
+}
+
+# ### ### ### ######### ######### #########
+
+proc ::zipfile::decode::ArchiveError {msg args} {
+    # Inlined "Error" -- Avoided eval/linsert dance
+    set code [linsert $args 0 ZIP DECODE BAD ARCHIVE]
+    return -code error -errorcode $code  "Bad zip file. $msg"
+}
+
+proc ::zipfile::decode::Error {msg args} {
+    set code [linsert $args 0 ZIP DECODE]
+    return -code error -errorcode $code $msg
+}
+
+# ### ### ### ######### ######### #########
+
+## Decode the zip file by locating its end (of the central file
+## header). The higher levels will then use the information
+## inside to locate and read the CFH. No scanning from the beginning
+## This piece of code lifted from tclvs/library/zipvfs (v 1.0.3).
+
+proc ::zipfile::decode::LocateEnd {path} {
+    if {[set code [catch {
+	LocateEndCore $path fd
+    } result]]} {
+	::close $fd
+	return -code $code $result
+    }
+    return $result
+}
+
+proc ::zipfile::decode::LocateEndCore {path fdv} {
+    upvar 1 $fdv fd
+    set fd [::open $path r]
+    fconfigure $fd -translation binary ;#-buffering none
+
+    array set cb {}
+
+    # [SF Tclvfs Bug 1003574]. Do not seek over beginning of file.
+    seek $fd 0 end
+
+    # Just looking in the last 512 bytes may be enough to handle zip
+    # archives without comments, however for archives which have
+    # comments the chunk may start at an arbitrary distance from the
+    # end of the file. So if we do not find the header immediately we
+    # have to extend the range of our search, possibly until we have a
+    # large part of the archive in memory. We can fail only after the
+    # whole file has been searched.
+
+    set sz  [tell $fd]
+    set len 512
+    set at  512
+    while {1} {
+	if {$sz < $at} {set n -$sz} else {set n -$at}
+
+	seek $fd $n end
+	set hdr [read $fd $len]
+
+	# We are using 'string last' as we are searching the first
+	# from the end, which is the last from the beginning. See [SF
+	# Bug 2256740]. A zip archive stored in a zip archive can
+	# confuse the unmodified code, triggering on the magic
+	# sequence for the inner, uncompressed archive.
+
+	set pos [string last "PK\05\06" $hdr]
+	if {$pos == -1} {
+	    if {$at >= $sz} {
+		ArchiveError "No header found" HEADER MISSING
+	    }
+
+	    # after the 1st iteration we force an overlap with last
+	    # buffer to ensure that the pattern we look for is not
+	    # split at a buffer boundary, nor the header itself
+
+	    set len 540
+	    incr at 512
+	} else {
+	    break
+	}
+    }
+
+    set hdrlen [string length $hdr]
+    set hdr    [string range $hdr [expr {$pos + 4}] [expr {$pos + 21}]]
+    set pos    [expr {wide([tell $fd]) + $pos - $hdrlen}]
+
+    if {$pos < 0} {
+	set pos 0
+    }
+
+    binary scan $hdr ssssiis _ _ _ _ cb(csize) cb(coff) _
+
+    # Compute base for situations where ZIP file has been appended to
+    # another media (e.g. EXE). We can do this because
+    # (a) The expected location is stored in ECFH.   (-> cb(coff))
+    # (b) We know the actual location of EFCH.       (-> pos)
+    # (c) We know the size of CFH                    (-> cb(csize))
+    # (d) The CFH comes directly before the EFCH.
+    # (e) Items b...d provide us with the actual location of CFH, as (b)-(c).
+    # Thus the difference between (e) and (d) is the base in question.
+
+    set base [expr { $pos - $cb(csize) - $cb(coff) }]
+    if {$base < 0} {
+        set base 0
+    }
+    set cb(base) $base
+
+    if {$cb(coff) < 0} {
+	set cb(base) [expr {wide($cb(base)) - 4294967296}]
+	set cb(coff) [expr {wide($cb(coff)) + 4294967296}]
+    }
+
+    #--------------
+    ::close $fd
+    return [array get cb]
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide zipfile::decode 0.9
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/zip/encode.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/zip/encode.tcl
new file mode 100644
index 00000000..ad9b9bb1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/zip/encode.tcl
@@ -0,0 +1,372 @@
+# -*- tcl -*-
+# ### ### ### ######### ######### #########
+## Copyright (c) 2008-2009 ActiveState Software Inc.
+##                         Andreas Kupries
+## BSD License
+##
+# Package providing commands for the generation of a zip archive.
+
+# FUTURE: Write convenience command to zip up a whole directory.
+
+package require Tcl 8.4
+package require logger   ; # Tracing
+package require Trf      ; # Wrapper to zlib
+package require crc32    ; # Tcllib, crc calculation
+package require snit     ; # Tcllib, OO core
+package require zlibtcl  ; # Zlib usage. No commands, access through Trf
+package require fileutil ; # zipdir convenience method
+
+# ### ### ### ######### ######### #########
+##
+
+logger::initNamespace ::zipfile::encode
+snit::type            ::zipfile::encode {
+
+    constructor {} {}
+    destructor {}
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    method comment: {text} {
+	set comment $text
+	return
+    }
+
+    method file: {dst owned src {noCompress 0}} {
+	if {[info exists files($dst)]} {
+	    return -code error -errorcode {ZIP ENCODE DUPLICATE PATH} \
+		"Duplicate destination path \"$dst\""
+	}
+	if {![string is boolean -strict $owned]} {
+	    return -code error -errorcode {ZIP ENCODE OWNED VALUE BOOLEAN} \
+		"Expected boolean, got \"$owned\""
+	}
+
+	if {[catch {
+	    file stat $src s
+	} msg]} {
+	    # Unreadable file or directory, or broken link. Ignore.
+	    # TODO: Make handling configurable.
+	    return
+	}
+
+	if {$::tcl_platform(platform) ne "windows"} {
+	    file stat $src x
+	    set attr $x(mode)
+	    unset x
+	} else {
+	    set attr 33279 ; # 0o777 = rwxrwxrwx
+	}
+
+	if {[file isdirectory $src]} {
+	    set files($dst/) [list 0 {} 0 $s(ctime) $attr $noCompress]
+	} else {
+	    set files($dst) [list $owned $src [file size $src] $s(ctime) $attr $noCompress]
+	    log::debug "file: files($dst) = \{$files($dst)\}"
+	}
+	lappend files_ordering $dst
+	return
+    }
+
+    method write {archive} {
+	set ch [setbinary [open $archive w]]
+
+	set dstsorted $files_ordering
+
+	# Archive = <
+	#  afile ...
+	#  centralfileheader ...
+	#  endofcentraldir
+	# >
+
+	foreach dst $dstsorted {
+	    $self writeAFile $ch $dst
+	}
+
+	set cfh [tell $ch]
+
+	foreach dst $dstsorted {
+	    $self writeCentralFileHeader $ch $dst
+	}
+
+	set cfhsize [expr {[tell $ch] - $cfh}]
+
+	$self writeEndOfCentralDir $ch $cfh $cfhsize
+	close $ch
+	return
+    }
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    variable comment        {}
+    variable files -array   {}
+    variable files_ordering {}
+
+    # ### ### ### ######### ######### #########
+    ##
+
+    method writeAFile {ch dst} {
+	# AFile = <
+	#  localfileheader
+	#  file data
+	# >
+
+	foreach {owned src size ctime attr noCompress} $files($dst) break
+	log::debug "write-a-file: $dst = $owned $size $src noCompress = $noCompress"
+
+	# Determine if compression of the file to store will save us
+	# some space. Also compute the crc checksum of the file to put
+	# into the archive.
+
+	if {$src ne ""} {
+	    set c   [setbinary [open $src r]]
+	    set crc [crc::crc32 -chan $c]
+	    close $c
+	} else {
+	    set crc 0
+	}
+
+	if {($size == 0) || $noCompress} {
+	    set csize $size ; # compressed size is uncompressed
+	    set cm    0     ; # uncompressed
+	    set gpbf  0     ; # No flags
+	} else {
+	    set temp [fileutil::tempfile]
+	    set in   [setbinary [open $src r]]
+	    set out  [setbinary [open $temp w]]
+
+	    # Go for maximum compression
+
+	    zip -mode compress -nowrap 1 -level 9 -attach $out
+	    fcopy $in $out
+	    close $in
+	    close $out
+
+	    set csize [file size $temp]
+	    if {$csize < $size} {
+		# Compression is good. Throw away the incoming file,
+		# should we own it, then switch the upcoming copy
+		# operation over to the compressed file. Which we do
+		# own.
+
+		if {$owned} {
+		    file delete -force $src
+		}
+		set src   $temp ; # Copy the compressed temp file.
+		set owned 1     ; # We own the source file now.
+		set cm    8     ; # deflated
+		set gpbf  2     ; # flags - deflated maximum
+	    } else {
+		# No space savings through compression. Throw away the
+		# temp file and keep working with the original.
+
+		file delete -force $temp
+
+		set cm   0       ; # uncompressed
+		set gpbf 0       ; # No flags
+		set csize $size
+	    }
+	}
+
+	# Write the local file header
+
+	set fnlen  [string bytelength $dst]
+	set offset [tell $ch] ; # location local header, needed for central header
+
+	tag      $ch 4 3
+	byte     $ch 20     ; # vnte/lsb/version = 2.0 (deflate needed)
+	byte     $ch 3      ; # vnte/msb/host    = UNIX (file attributes = mode).
+	short-le $ch $gpbf  ; # gpbf /deflate info
+	short-le $ch $cm    ; # cm
+	short-le $ch [Time $ctime] ; # lmft
+	short-le $ch [Date $ctime] ; # lmfd
+	long-le  $ch $crc   ; # crc32 of uncompressed file
+	long-le  $ch $csize ; # compressed file size
+	long-le  $ch $size  ; # uncompressed file size
+	short-le $ch $fnlen ; # file name length
+	short-le $ch 0      ; # extra field length, none
+	str      $ch $dst   ; # file name
+	# No extra field.
+
+	if {$csize > 0} {
+	    # Copy file data over. Maybe a compressed temp. file.
+
+	    set    in [setbinary [open $src r]]
+	    fcopy $in $ch
+	    close $in
+	}
+
+	# Write a data descriptor repeating crc & size info, if
+	# necessary.
+
+	if {$crc == 0} {
+	    tag     $ch 8 7
+	    long-le $ch $crc   ; # crc32
+	    long-le $ch $csize ; # compressed file size
+	    long-le $ch $size  ; # uncompressed file size
+	}
+
+	# Done ... We are left with admin work ...
+	#
+	# Throwing away a source file we own, and recording much of
+	# the data computed here for a file, for use when writing the
+	# central file header.
+
+	if {$owned} {
+	    file delete -force $src
+	}
+
+	lappend files($dst) $cm $gpbf $csize $offset $crc
+	return
+    }
+
+    method writeCentralFileHeader {ch dst} {
+	foreach {owned src size ctime attr noCompress cm gpbf csize offset crc} $files($dst) break
+
+	set fnlen [string bytelength $dst]
+
+	tag      $ch 2 1
+	byte     $ch 20      ; # vmb/lsb/version  = 2.0
+	byte     $ch 3       ; # vmb/msb/host     = UNIX (file attributes = mode).
+	byte     $ch 20      ; # vnte/lsb/version = 2.0
+	byte     $ch 3       ; # vnte/msb/host    = UNIX (file attributes = mode).
+	short-le $ch $gpbf   ; # gpbf /deflate info
+	short-le $ch $cm     ; # cm
+	short-le $ch [Time $ctime] ; # lmft
+	short-le $ch [Date $ctime] ; # lmfd
+	long-le  $ch $crc    ; # crc32 checksum of uncompressed file.
+	long-le  $ch $csize  ; # compressed file size
+	long-le  $ch $size   ; # uncompressed file size
+	short-le $ch $fnlen  ; # file name length
+	short-le $ch 0       ; # extra field length, none
+	short-le $ch 0       ; # file comment length, none
+	short-le $ch 0       ; # disk number start
+	short-le $ch 0       ; # int. file attr., claim all as binary
+
+	long-le  $ch [encode_permissions $attr] ; # ext. file attr: unix permissions.
+
+	long-le  $ch $offset ; # relative offset of local file header
+	str      $ch $dst    ; # file name
+	# no extra field
+
+	return
+    }
+
+    method writeEndOfCentralDir {ch cfhoffset cfhsize} {
+
+	set clen   [string bytelength $comment]
+	set nfiles [array size files]
+
+	tag      $ch 6 5
+	short-le $ch 0          ; # number of this disk
+	short-le $ch 0          ; # number of disk with central directory
+	short-le $ch $nfiles    ; # number of files in archive
+	short-le $ch $nfiles    ; # number of files in archive
+	long-le  $ch $cfhsize   ; # size central directory
+	long-le  $ch $cfhoffset ; # offset central dir
+	short-le $ch $clen      ; # archive comment length
+	if {$clen} {
+	    str  $ch $comment
+	}
+	return
+    }
+
+    proc tag {ch x y} {
+	byte $ch 80 ; # 'P'
+	byte $ch 75 ; # 'K'
+	byte $ch $y ; # \ swapped! intentional!
+	byte $ch $x ; # / little-endian number.
+	return
+    }
+
+    proc byte {ch x} {
+	puts -nonewline $ch [binary format c $x]
+    }
+
+    proc short-le {ch x} {
+	puts -nonewline $ch [binary format s $x]
+    }
+
+    proc long-le {ch x} {
+	puts -nonewline $ch [binary format i $x]
+    }
+
+    proc str {ch text} {
+	fconfigure $ch -encoding utf-8
+	# write the string as utf-8 to keep its bytes, exactly.
+	puts -nonewline $ch $text
+	fconfigure $ch -encoding binary
+	return
+    }
+
+    proc setbinary {ch} {
+	fconfigure $ch \
+	    -encoding    binary \
+	    -translation binary \
+	    -eofchar     {}
+	return $ch
+    }
+
+    # time = fedcba9876543210
+    #        HHHHHmmmmmmSSSSS (sec/2 actually)
+
+    proc Time {ctime} {
+	foreach {h m s} [clock format $ctime -format {%H %M %S}] break
+	# Remove leading zeros, i.e. prevent octal interpretation.
+	deoctal h
+	deoctal m
+	deoctal s
+	return [expr {(($h & 0x1f) << 11)|
+		      (($m & 0x3f) << 5)|
+		      (($s/2) & 0x1f)}]
+    }
+
+    # data = fedcba9876543210
+    #        yyyyyyyMMMMddddd
+
+    proc Date {ctime} {
+	foreach {y m d} [clock format $ctime -format {%Y %m %d}] break
+	deoctal y
+	deoctal m
+	deoctal d
+	incr y -1980
+	return [expr {(($y & 0xff) << 9)|
+		      (($m & 0xf) << 5)|
+		      ($d & 0x1f)}]
+    }
+
+    proc deoctal {nv} {
+	upvar 1 $nv n
+	set n [string trimleft $n 0]
+	if {$n eq ""} {set n 0}
+	return
+    }
+
+    proc encode_permissions {attr} {
+	return [expr {$attr << 16}]
+    }
+
+
+    typemethod zipdir {path dst} {
+	set z [$type create %AUTO%]
+
+	set path [file dirname [file normalize [file join $path ___]]]
+
+	foreach f [fileutil::find $path] {
+	    set fx [fileutil::stripPath $path $f]
+	    $z file: $fx 0 $f
+	}
+
+	file mkdir [file dirname $dst]
+	$z write $dst
+	$z destroy
+	return
+    }
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide zipfile::encode 0.4
+return
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/zip/mkzip.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/zip/mkzip.tcl
new file mode 100644
index 00000000..cb979c27
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/zip/mkzip.tcl
@@ -0,0 +1,299 @@
+# -*- tcl -*-
+# mkzip.tcl -- Copyright (C) 2009 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+#        Create ZIP archives in Tcl.
+#
+# Create a zipkit using mkzip filename.zkit -zipkit -directory xyz.vfs
+# or a zipfile using mkzip filename.zip -directory dirname -exclude "*~"
+#
+## BSD License
+##
+# Package providing commands for the generation of a zip archive.
+# version 1.2.2
+
+package require Tcl 8.6
+
+namespace eval ::zipfile {}
+namespace eval ::zipfile::decode {}
+namespace eval ::zipfile::encode {}
+namespace eval ::zipfile::mkzip {}
+
+proc ::zipfile::mkzip::setbinary chan {
+  fconfigure $chan \
+      -encoding    binary \
+      -translation binary \
+      -eofchar     {}
+
+}
+
+# zip::timet_to_dos
+#
+#        Convert a unix timestamp into a DOS timestamp for ZIP times.
+#
+#   DOS timestamps are 32 bits split into bit regions as follows:
+#                  24                16                 8                 0
+#   +-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+
+#   |Y|Y|Y|Y|Y|Y|Y|m| |m|m|m|d|d|d|d|d| |h|h|h|h|h|m|m|m| |m|m|m|s|s|s|s|s|
+#   +-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+
+#
+proc ::zipfile::mkzip::timet_to_dos {time_t} {
+    set s [clock format $time_t -format {%Y %m %e %k %M %S}]
+    scan $s {%d %d %d %d %d %d} year month day hour min sec
+    expr {(($year-1980) << 25) | ($month << 21) | ($day << 16)
+          | ($hour << 11) | ($min << 5) | ($sec >> 1)}
+}
+
+# zip::pop --
+#
+#        Pop an element from a list
+#
+proc ::zipfile::mkzip::pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+
+# zip::walk --
+#
+#        Walk a directory tree rooted at 'path'. The excludes list can be
+#        a set of glob expressions to match against files and to avoid.
+#        The match arg is internal.
+#        eg: walk library {CVS/* *~ .#*} to exclude CVS and emacs cruft.
+#
+proc ::zipfile::mkzip::walk {base {excludes ""} {match *} {path {}}} {
+    set result {}
+    set imatch [file join $path $match]
+    set files [glob -nocomplain -tails -types f -directory $base -- $imatch]
+    foreach file $files {
+        set excluded 0
+        foreach glob $excludes {
+            if {[string match $glob $file]} {
+                set excluded 1
+                break
+            }
+        }
+        if {!$excluded} {lappend result $file}
+    }
+    foreach dir [glob -nocomplain -tails -types d -directory $base -- $imatch] {
+        set subdir [walk $base $excludes $match $dir]
+        if {[llength $subdir]>0} {
+            set result [concat $result [list $dir] $subdir]
+        }
+    }
+    return $result
+}
+
+# zipfile::encode::add_file_to_archive --
+#
+#        Add a single file to a zip archive. The zipchan channel should
+#        already be open and binary. You may provide a comment for the
+#        file The return value is the central directory record that
+#        will need to be used when finalizing the zip archive.
+#
+# FIX ME: should  handle the current offset for non-seekable channels
+#
+proc ::zipfile::mkzip::add_file_to_archive {zipchan base path {comment ""}} {
+    set fullpath [file join $base $path]
+    set mtime [timet_to_dos [file mtime $fullpath]]
+    if {[file isdirectory $fullpath]} {
+        append path /
+    }
+    set utfpath [encoding convertto utf-8 $path]
+    set utfcomment [encoding convertto utf-8 $comment]
+    set flags [expr {(1<<11)}] ;# utf-8 comment and path
+    set method 0               ;# store 0, deflate 8
+    set attr 0                 ;# text or binary (default binary)
+    set version 20             ;# minumum version req'd to extract
+    set extra ""
+    set crc 0
+    set size 0
+    set csize 0
+    set data ""
+    set seekable [expr {[tell $zipchan] != -1}]
+    if {[file isdirectory $fullpath]} {
+        set attrex 0x41ff0010  ;# 0o040777 (drwxrwxrwx)
+    } elseif {[file executable $fullpath]} {
+        set attrex 0x81ff0080  ;# 0o100777 (-rwxrwxrwx)
+    } else {
+        set attrex 0x81b60020  ;# 0o100666 (-rw-rw-rw-)
+        if {[file extension $fullpath] in {".tcl" ".txt" ".c"}} {
+            set attr 1         ;# text
+        }
+    }
+
+    if {[file isfile $fullpath]} {
+        set size [file size $fullpath]
+        if {!$seekable} {set flags [expr {$flags | (1 << 3)}]}
+    }
+
+    set offset [tell $zipchan]
+    set local [binary format a4sssiiiiss PK\03\04 \
+                   $version $flags $method $mtime $crc $csize $size \
+                   [string length $utfpath] [string length $extra]]
+    append local $utfpath $extra
+    puts -nonewline $zipchan $local
+
+    if {[file isfile $fullpath]} {
+        # If the file is under 2MB then zip in one chunk, otherwize we use
+        # streaming to avoid requiring excess memory. This helps to prevent
+        # storing re-compressed data that may be larger than the source when
+        # handling PNG or JPEG or nested ZIP files.
+        if {$size < 0x00200000} {
+            set fin [::open $fullpath rb]
+            setbinary $fin
+            set data [::read $fin]
+            set crc [::zlib crc32 $data]
+            set cdata [::zlib deflate $data]
+            if {[string length $cdata] < $size} {
+                set method 8
+                set data $cdata
+            }
+            close $fin
+            set csize [string length $data]
+            puts -nonewline $zipchan $data
+        } else {
+            set method 8
+            set fin [::open $fullpath rb]
+            setbinary $fin
+            set zlib [::zlib stream deflate]
+            while {![eof $fin]} {
+                set data [read $fin 4096]
+                set crc [zlib crc32 $data $crc]
+                $zlib put $data
+                if {[string length [set zdata [$zlib get]]]} {
+                    incr csize [string length $zdata]
+                    puts -nonewline $zipchan $zdata
+                }
+            }
+            close $fin
+            $zlib finalize
+            set zdata [$zlib get]
+            incr csize [string length $zdata]
+            puts -nonewline $zipchan $zdata
+            $zlib close
+        }
+
+        if {$seekable} {
+            # update the header if the output is seekable
+            set local [binary format a4sssiiii PK\03\04 \
+                           $version $flags $method $mtime $crc $csize $size]
+            set current [tell $zipchan]
+            seek $zipchan $offset
+            puts -nonewline $zipchan $local
+            seek $zipchan $current
+        } else {
+            # Write a data descriptor record
+            set ddesc [binary format a4iii PK\7\8 $crc $csize $size]
+            puts -nonewline $zipchan $ddesc
+        }
+    }
+
+    set hdr [binary format a4ssssiiiisssssii PK\01\02 0x0317 \
+                 $version $flags $method $mtime $crc $csize $size \
+                 [string length $utfpath] [string length $extra]\
+                 [string length $utfcomment] 0 $attr $attrex $offset]
+    append hdr $utfpath $extra $utfcomment
+    return $hdr
+}
+
+# zipfile::encode::mkzip --
+#
+#        Create a zip archive in 'filename'. If a file already exists it will be
+#        overwritten by a new file. If '-directory' is used, the new zip archive
+#        will be rooted in the provided directory.
+#        -runtime can be used to specify a prefix file. For instance,
+#        zip myzip -runtime unzipsfx.exe -directory subdir
+#        will create a self-extracting zip archive from the subdir/ folder.
+#        The -comment parameter specifies an optional comment for the archive.
+#
+#        eg: zip my.zip -directory Subdir -runtime unzipsfx.exe *.txt
+#
+proc ::zipfile::mkzip::mkzip {filename args} {
+    array set opts {
+	-zipkit 0
+	-runtime ""
+	-comment ""
+	-directory ""
+	-exclude {CVS/* */CVS/* *~ ".#*" "*/.#*"}
+	-verbose 0
+	-prepend-base-directory 0
+    }
+
+    while {[string match -* [set option [lindex $args 0]]]} {
+	switch -exact -- $option {
+	    -verbose               { set opts(-verbose) 1}
+	    -zipkit                { set opts(-zipkit) 1 }
+	    -comment               { set opts(-comment) [encoding convertto utf-8 [pop args 1]] }
+	    -runtime               { set opts(-runtime) [pop args 1] }
+	    -directory             { set opts(-directory) [file normalize [pop args 1]] }
+	    -exclude               { set opts(-exclude) [pop args 1] }
+	    -prepend-base-directory { set opts(-prepend-base-directory) 1 }
+	    -- { pop args ; break }
+	    default {
+		break
+	    }
+	}
+	pop args
+    }
+
+    set zf [::open $filename wb]
+    setbinary $zf
+    if {$opts(-runtime) ne ""} {
+	set rt [::open $opts(-runtime) rb]
+	setbinary $rt
+	fcopy $rt $zf
+	close $rt
+    } elseif {$opts(-zipkit)} {
+	set zkd "#!/usr/bin/env tclkit\n\# This is a zip-based Tcl Module\n"
+	append zkd "package require vfs::zip\n"
+	append zkd "vfs::zip::Mount \[info script\] \[info script\]\n"
+	append zkd "if {\[file exists \[file join \[info script\] main.tcl\]\]} \{\n"
+	append zkd "    source \[file join \[info script\] main.tcl\]\n"
+	append zkd "\}\n"
+	append zkd \x1A
+	puts -nonewline $zf $zkd
+    }
+
+    set count 0
+    set cd ""
+
+    if {$opts(-directory) ne ""} {
+	set paths [walk $opts(-directory) $opts(-exclude)]
+
+	if {$opts(-prepend-base-directory) } {
+
+	    set directory_tail [file tail $opts(-directory)]
+
+	    set paths [lmap path $paths {
+		file join $directory_tail $path
+	    }]
+	    set paths [linsert $paths 0 $directory_tail]
+
+	    set opts(-directory) [file dirname $opts(-directory)]
+	}
+    } else {
+	set paths [glob -nocomplain {*}$args]
+    }
+    foreach path $paths {
+	if {[string is true $opts(-verbose)]} {
+	    puts $path
+	}
+	append cd [add_file_to_archive $zf $opts(-directory) $path]
+	incr count
+    }
+    set cdoffset [tell $zf]
+    set endrec [binary format a4ssssiis PK\05\06 0 0 \
+		    $count $count [string length $cd] $cdoffset\
+		    [string length $opts(-comment)]]
+    append endrec $opts(-comment)
+    puts -nonewline $zf $cd
+    puts -nonewline $zf $endrec
+    close $zf
+
+    return
+}
+
+# ### ### ### ######### ######### #########
+## Ready
+package provide zipfile::mkzip 1.2.2
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/zip/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/zip/pkgIndex.tcl
new file mode 100644
index 00000000..c3c132e8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tcllib1.21/zip/pkgIndex.tcl
@@ -0,0 +1,8 @@
+if {![package vsatisfies [package provide Tcl] 8.4]} {return}
+
+package ifneeded zipfile::decode 0.9 [list source [file join $dir decode.tcl]]
+package ifneeded zipfile::encode 0.4 [list source [file join $dir encode.tcl]]
+
+if {![package vsatisfies [package provide Tcl] 8.6]} {return}
+
+package ifneeded zipfile::mkzip 1.2.2 [list source [file join $dir mkzip.tcl]]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/libtdbcstub115.a b/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/libtdbcstub115.a
new file mode 100644
index 00000000..95173fb0
Binary files /dev/null and b/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/libtdbcstub115.a differ
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/pkgIndex.tcl
new file mode 100644
index 00000000..19a11599
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/pkgIndex.tcl
@@ -0,0 +1,26 @@
+# -*- tcl -*-
+# Tcl package index file, version 1.1
+#
+# Make sure that TDBC is running in a compatible version of Tcl, and
+# that TclOO is available.
+
+if {![package vsatisfies [package provide Tcl] 8.6-]} {
+    return
+}
+apply {{dir} {
+    set libraryfile [file join $dir tdbc.tcl]
+    if {![file exists $libraryfile] && [info exists ::env(TDBC_LIBRARY)]} {
+	set libraryfile [file join $::env(TDBC_LIBRARY) tdbc.tcl]
+    }
+    if {[package vsatisfies [package provide Tcl] 9.0-]} {
+	package ifneeded tdbc 1.1.5 \
+		"package require TclOO;\
+		[list load [file join $dir tcl9tdbc115.dll] [string totitle tdbc]]\;\
+		[list source $libraryfile]"
+    } else {
+	package ifneeded tdbc 1.1.5 \
+		"package require TclOO;\
+		[list load [file join $dir tdbc115.dll] [string totitle tdbc]]\;\
+		[list source $libraryfile]"
+    }
+}} $dir
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/tdbc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/tdbc.tcl
new file mode 100644
index 00000000..f536131e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/tdbc.tcl
@@ -0,0 +1,922 @@
+# tdbc.tcl --
+#
+#	Definitions of base classes from which TDBC drivers' connections,
+#	statements and result sets may inherit.
+#
+# Copyright (c) 2008 by Kevin B. Kenny
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id$
+#
+#------------------------------------------------------------------------------
+
+package require TclOO
+
+namespace eval ::tdbc {
+    namespace export connection statement resultset
+    variable generalError [list TDBC GENERAL_ERROR HY000 {}]
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::ParseConvenienceArgs --
+#
+#	Parse the convenience arguments to a TDBC 'execute',
+#	'executewithdictionary', or 'foreach' call.
+#
+# Parameters:
+#	argv - Arguments to the call
+#	optsVar -- Name of a variable in caller's scope that will receive
+#		   a dictionary of the supplied options
+#
+# Results:
+#	Returns any args remaining after parsing the options.
+#
+# Side effects:
+#	Sets the 'opts' dictionary to the options.
+#
+#------------------------------------------------------------------------------
+
+proc tdbc::ParseConvenienceArgs {argv optsVar} {
+
+    variable generalError
+    upvar 1 $optsVar opts
+
+    set opts [dict create -as dicts]
+    set i 0
+
+    # Munch keyword options off the front of the command arguments
+
+    foreach {key value} $argv {
+	if {[string index $key 0] eq {-}} {
+	    switch -regexp -- $key {
+		-as? {
+		    if {$value ne {dicts} && $value ne {lists}} {
+			set errorcode $generalError
+			lappend errorcode badVarType $value
+			return -code error \
+			    -errorcode $errorcode \
+			    "bad variable type \"$value\":\
+                             must be lists or dicts"
+		    }
+		    dict set opts -as $value
+		}
+		-c(?:o(?:l(?:u(?:m(?:n(?:s(?:v(?:a(?:r(?:i(?:a(?:b(?:le?)?)?)?)?)?)?)?)?)?)?)?)?) {
+		    dict set opts -columnsvariable $value
+		}
+		-- {
+		    incr i
+		    break
+		}
+		default {
+		    set errorcode $generalError
+		    lappend errorcode badOption $key
+		    return -code error \
+			-errorcode $errorcode \
+			"bad option \"$key\":\
+                             must be -as or -columnsvariable"
+		}
+	    }
+	} else {
+	    break
+	}
+	incr i 2
+    }
+
+    return [lrange $argv[set argv {}] $i end]
+
+}
+
+
+
+#------------------------------------------------------------------------------
+#
+# tdbc::connection --
+#
+#	Class that represents a generic connection to a database.
+#
+#-----------------------------------------------------------------------------
+
+oo::class create ::tdbc::connection {
+
+    # statementSeq is the sequence number of the last statement created.
+    # statementClass is the name of the class that implements the
+    #	'statement' API.
+    # primaryKeysStatement is the statement that queries primary keys
+    # foreignKeysStatement is the statement that queries foreign keys
+
+    variable statementSeq primaryKeysStatement foreignKeysStatement
+
+    # The base class constructor accepts no arguments.  It sets up the
+    # machinery to do the bookkeeping to keep track of what statements
+    # are associated with the connection.  The derived class constructor
+    # is expected to set the variable, 'statementClass' to the name
+    # of the class that represents statements, so that the 'prepare'
+    # method can invoke it.
+
+    constructor {} {
+	set statementSeq 0
+	namespace eval Stmt {}
+    }
+
+    # The 'close' method is simply an alternative syntax for destroying
+    # the connection.
+
+    method close {} {
+	my destroy
+    }
+
+    # The 'prepare' method creates a new statement against the connection,
+    # giving its constructor the current statement and the SQL code to
+    # prepare.  It uses the 'statementClass' variable set by the constructor
+    # to get the class to instantiate.
+
+    method prepare {sqlcode} {
+	return [my statementCreate Stmt::[incr statementSeq] [self] $sqlcode]
+    }
+
+    # The 'statementCreate' method delegates to the constructor
+    # of the class specified by the 'statementClass' variable. It's
+    # intended for drivers designed before tdbc 1.0b10. Current ones
+    # should forward this method to the constructor directly.
+
+    method statementCreate {name instance sqlcode} {
+	my variable statementClass
+	return [$statementClass create $name $instance $sqlcode]
+    }
+
+    # Derived classes are expected to implement the 'prepareCall' method,
+    # and have it call 'prepare' as needed (or do something else and
+    # install the resulting statement)
+
+    # The 'statements' method lists the statements active against this
+    # connection.
+
+    method statements {} {
+	info commands Stmt::*
+    }
+
+    # The 'resultsets' method lists the result sets active against this
+    # connection.
+
+    method resultsets {} {
+	set retval {}
+	foreach statement [my statements] {
+	    foreach resultset [$statement resultsets] {
+		lappend retval $resultset
+	    }
+	}
+	return $retval
+    }
+
+    # The 'transaction' method executes a block of Tcl code as an
+    # ACID transaction against the database.
+
+    method transaction {script} {
+	my begintransaction
+	set status [catch {uplevel 1 $script} result options]
+	if {$status in {0 2 3 4}} {
+	    set status2 [catch {my commit} result2 options2]
+	    if {$status2 == 1} {
+		set status 1
+		set result $result2
+		set options $options2
+	    }
+	}
+	switch -exact -- $status {
+	    0 {
+		# do nothing
+	    }
+	    2 - 3 - 4 {
+		set options [dict merge {-level 1} $options[set options {}]]
+		dict incr options -level
+	    }
+	    default {
+		my rollback
+	    }
+	}
+	return -options $options $result
+    }
+
+    # The 'allrows' method prepares a statement, then executes it with
+    # a given set of substituents, returning a list of all the rows
+    # that the statement returns. Optionally, it stores the names of
+    # the columns in '-columnsvariable'.
+    # Usage:
+    #     $db allrows ?-as lists|dicts? ?-columnsvariable varName? ?--?
+    #	      sql ?dictionary?
+
+    method allrows args {
+
+	variable ::tdbc::generalError
+
+	# Grab keyword-value parameters
+
+	set args [::tdbc::ParseConvenienceArgs $args[set args {}] opts]
+
+	# Check postitional parameters
+
+	set cmd [list [self] prepare]
+	if {[llength $args] == 1} {
+	    set sqlcode [lindex $args 0]
+	} elseif {[llength $args] == 2} {
+	    lassign $args sqlcode dict
+	} else {
+	    set errorcode $generalError
+	    lappend errorcode wrongNumArgs
+	    return -code error -errorcode $errorcode \
+		"wrong # args: should be [lrange [info level 0] 0 1]\
+                 ?-option value?... ?--? sqlcode ?dictionary?"
+	}
+	lappend cmd $sqlcode
+
+	# Prepare the statement
+
+	set stmt [uplevel 1 $cmd]
+
+	# Delegate to the statement to accumulate the results
+
+	set cmd [list $stmt allrows {*}$opts --]
+	if {[info exists dict]} {
+	    lappend cmd $dict
+	}
+	set status [catch {
+	    uplevel 1 $cmd
+	} result options]
+
+	# Destroy the statement
+
+	catch {
+	    $stmt close
+	}
+
+	return -options $options $result
+    }
+
+    # The 'foreach' method prepares a statement, then executes it with
+    # a supplied set of substituents.  For each row of the result,
+    # it sets a variable to the row and invokes a script in the caller's
+    # scope.
+    #
+    # Usage:
+    #     $db foreach ?-as lists|dicts? ?-columnsVariable varName? ?--?
+    #         varName sql ?dictionary? script
+
+    method foreach args {
+
+	variable ::tdbc::generalError
+
+	# Grab keyword-value parameters
+
+	set args [::tdbc::ParseConvenienceArgs $args[set args {}] opts]
+
+	# Check postitional parameters
+
+	set cmd [list [self] prepare]
+	if {[llength $args] == 3} {
+	    lassign $args varname sqlcode script
+	} elseif {[llength $args] == 4} {
+	    lassign $args varname sqlcode dict script
+	} else {
+	    set errorcode $generalError
+	    lappend errorcode wrongNumArgs
+	    return -code error -errorcode $errorcode \
+		"wrong # args: should be [lrange [info level 0] 0 1]\
+                 ?-option value?... ?--? varname sqlcode ?dictionary? script"
+	}
+	lappend cmd $sqlcode
+
+	# Prepare the statement
+
+	set stmt [uplevel 1 $cmd]
+
+	# Delegate to the statement to iterate over the results
+
+	set cmd [list $stmt foreach {*}$opts -- $varname]
+	if {[info exists dict]} {
+	    lappend cmd $dict
+	}
+	lappend cmd $script
+	set status [catch {
+	    uplevel 1 $cmd
+	} result options]
+
+	# Destroy the statement
+
+	catch {
+	    $stmt close
+	}
+
+	# Adjust return level in the case that the script [return]s
+
+	if {$status == 2} {
+	    set options [dict merge {-level 1} $options[set options {}]]
+	    dict incr options -level
+	}
+	return -options $options $result
+    }
+
+    # The 'BuildPrimaryKeysStatement' method builds a SQL statement to
+    # retrieve the primary keys from a database. (It executes once the
+    # first time the 'primaryKeys' method is executed, and retains the
+    # prepared statement for reuse.)
+
+    method BuildPrimaryKeysStatement {} {
+
+	# On some databases, CONSTRAINT_CATALOG is always NULL and
+	# JOINing to it fails. Check for this case and include that
+	# JOIN only if catalog names are supplied.
+
+	set catalogClause {}
+	if {[lindex [set count [my allrows -as lists {
+	    SELECT COUNT(*)
+            FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS
+            WHERE CONSTRAINT_CATALOG IS NOT NULL}]] 0 0] != 0} {
+	    set catalogClause \
+		{AND xtable.CONSTRAINT_CATALOG = xcolumn.CONSTRAINT_CATALOG}
+	}
+	set primaryKeysStatement [my prepare "
+	     SELECT xtable.TABLE_SCHEMA AS \"tableSchema\",
+                 xtable.TABLE_NAME AS \"tableName\",
+                 xtable.CONSTRAINT_CATALOG AS \"constraintCatalog\",
+                 xtable.CONSTRAINT_SCHEMA AS \"constraintSchema\",
+                 xtable.CONSTRAINT_NAME AS \"constraintName\",
+                 xcolumn.COLUMN_NAME AS \"columnName\",
+                 xcolumn.ORDINAL_POSITION AS \"ordinalPosition\"
+             FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS xtable
+             INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE xcolumn
+                     ON xtable.CONSTRAINT_SCHEMA = xcolumn.CONSTRAINT_SCHEMA
+                    AND xtable.TABLE_NAME = xcolumn.TABLE_NAME
+                    AND xtable.CONSTRAINT_NAME = xcolumn.CONSTRAINT_NAME
+	            $catalogClause
+             WHERE xtable.TABLE_NAME = :tableName
+               AND xtable.CONSTRAINT_TYPE = 'PRIMARY KEY'
+  	"]
+    }
+
+    # The default implementation of the 'primarykeys' method uses the
+    # SQL INFORMATION_SCHEMA to retrieve primary key information. Databases
+    # that might not have INFORMATION_SCHEMA must overload this method.
+
+    method primarykeys {tableName} {
+	if {![info exists primaryKeysStatement]} {
+	    my BuildPrimaryKeysStatement
+	}
+	tailcall $primaryKeysStatement allrows [list tableName $tableName]
+    }
+
+    # The 'BuildForeignKeysStatements' method builds a SQL statement to
+    # retrieve the foreign keys from a database. (It executes once the
+    # first time the 'foreignKeys' method is executed, and retains the
+    # prepared statements for reuse.)
+
+    method BuildForeignKeysStatement {} {
+
+	# On some databases, CONSTRAINT_CATALOG is always NULL and
+	# JOINing to it fails. Check for this case and include that
+	# JOIN only if catalog names are supplied.
+
+	set catalogClause1 {}
+	set catalogClause2 {}
+	if {[lindex [set count [my allrows -as lists {
+	    SELECT COUNT(*)
+            FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS
+            WHERE CONSTRAINT_CATALOG IS NOT NULL}]] 0 0] != 0} {
+	    set catalogClause1 \
+		{AND fkc.CONSTRAINT_CATALOG = rc.CONSTRAINT_CATALOG}
+	    set catalogClause2 \
+		{AND pkc.CONSTRAINT_CATALOG = rc.CONSTRAINT_CATALOG}
+	}
+
+	foreach {exists1 clause1} {
+	    0 {}
+	    1 { AND pkc.TABLE_NAME = :primary}
+	} {
+	    foreach {exists2 clause2} {
+		0 {}
+		1 { AND fkc.TABLE_NAME = :foreign}
+	    } {
+		set stmt [my prepare "
+	     SELECT rc.CONSTRAINT_CATALOG AS \"foreignConstraintCatalog\",
+                    rc.CONSTRAINT_SCHEMA AS \"foreignConstraintSchema\",
+                    rc.CONSTRAINT_NAME AS \"foreignConstraintName\",
+                    rc.UNIQUE_CONSTRAINT_CATALOG
+                        AS \"primaryConstraintCatalog\",
+                    rc.UNIQUE_CONSTRAINT_SCHEMA AS \"primaryConstraintSchema\",
+                    rc.UNIQUE_CONSTRAINT_NAME AS \"primaryConstraintName\",
+                    rc.UPDATE_RULE AS \"updateAction\",
+		    rc.DELETE_RULE AS \"deleteAction\",
+                    pkc.TABLE_CATALOG AS \"primaryCatalog\",
+                    pkc.TABLE_SCHEMA AS \"primarySchema\",
+                    pkc.TABLE_NAME AS \"primaryTable\",
+                    pkc.COLUMN_NAME AS \"primaryColumn\",
+                    fkc.TABLE_CATALOG AS \"foreignCatalog\",
+                    fkc.TABLE_SCHEMA AS \"foreignSchema\",
+                    fkc.TABLE_NAME AS \"foreignTable\",
+                    fkc.COLUMN_NAME AS \"foreignColumn\",
+                    pkc.ORDINAL_POSITION AS \"ordinalPosition\"
+             FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS rc
+             INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE fkc
+                     ON fkc.CONSTRAINT_NAME = rc.CONSTRAINT_NAME
+                    AND fkc.CONSTRAINT_SCHEMA = rc.CONSTRAINT_SCHEMA
+                    $catalogClause1
+             INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE pkc
+                     ON pkc.CONSTRAINT_NAME = rc.UNIQUE_CONSTRAINT_NAME
+                     AND pkc.CONSTRAINT_SCHEMA = rc.UNIQUE_CONSTRAINT_SCHEMA
+                     $catalogClause2
+                     AND pkc.ORDINAL_POSITION = fkc.ORDINAL_POSITION
+             WHERE 1=1
+                 $clause1
+                 $clause2
+             ORDER BY \"foreignConstraintCatalog\", \"foreignConstraintSchema\", \"foreignConstraintName\", \"ordinalPosition\"
+"]
+		dict set foreignKeysStatement $exists1 $exists2 $stmt
+	    }
+	}
+    }
+
+    # The default implementation of the 'foreignkeys' method uses the
+    # SQL INFORMATION_SCHEMA to retrieve primary key information. Databases
+    # that might not have INFORMATION_SCHEMA must overload this method.
+
+    method foreignkeys {args} {
+
+	variable ::tdbc::generalError
+
+	# Check arguments
+
+	set argdict {}
+	if {[llength $args] % 2 != 0} {
+	    set errorcode $generalError
+	    lappend errorcode wrongNumArgs
+	    return -code error -errorcode $errorcode \
+		"wrong # args: should be [lrange [info level 0] 0 1]\
+                 ?-option value?..."
+	}
+	foreach {key value} $args {
+	    if {$key ni {-primary -foreign}} {
+		set errorcode $generalError
+		lappend errorcode badOption
+		return -code error -errorcode $errorcode \
+		    "bad option \"$key\", must be -primary or -foreign"
+	    }
+	    set key [string range $key 1 end]
+	    if {[dict exists $argdict $key]} {
+		set errorcode $generalError
+		lappend errorcode dupOption
+		return -code error -errorcode $errorcode \
+		    "duplicate option \"$key\" supplied"
+	    }
+	    dict set argdict $key $value
+	}
+
+	# Build the statements that query foreign keys. There are four
+	# of them, one for each combination of whether -primary
+	# and -foreign is specified.
+
+	if {![info exists foreignKeysStatement]} {
+	    my BuildForeignKeysStatement
+	}
+	set stmt [dict get $foreignKeysStatement \
+		      [dict exists $argdict primary] \
+		      [dict exists $argdict foreign]]
+	tailcall $stmt allrows $argdict
+    }
+
+    # Derived classes are expected to implement the 'begintransaction',
+    # 'commit', and 'rollback' methods.
+
+    # Derived classes are expected to implement 'tables' and 'columns' method.
+
+}
+
+#------------------------------------------------------------------------------
+#
+# Class: tdbc::statement
+#
+#	Class that represents a SQL statement in a generic database
+#
+#------------------------------------------------------------------------------
+
+oo::class create tdbc::statement {
+
+    # resultSetSeq is the sequence number of the last result set created.
+    # resultSetClass is the name of the class that implements the 'resultset'
+    #	API.
+
+    variable resultSetClass resultSetSeq
+
+    # The base class constructor accepts no arguments.  It initializes
+    # the machinery for tracking the ownership of result sets. The derived
+    # constructor is expected to invoke the base constructor, and to
+    # set a variable 'resultSetClass' to the fully-qualified name of the
+    # class that represents result sets.
+
+    constructor {} {
+	set resultSetSeq 0
+	namespace eval ResultSet {}
+    }
+
+    # The 'execute' method on a statement runs the statement with
+    # a particular set of substituted variables.  It actually works
+    # by creating the result set object and letting that objects
+    # constructor do the work of running the statement.  The creation
+    # is wrapped in an [uplevel] call because the substitution proces
+    # may need to access variables in the caller's scope.
+
+    # WORKAROUND: Take out the '0 &&' from the next line when
+    # Bug 2649975 is fixed
+    if {0 && [package vsatisfies [package provide Tcl] 8.6]} {
+	method execute args {
+	    tailcall my resultSetCreate \
+		[namespace current]::ResultSet::[incr resultSetSeq]  \
+		[self] {*}$args
+	}
+    } else {
+	method execute args {
+	    return \
+		[uplevel 1 \
+		     [list \
+			  [self] resultSetCreate \
+			  [namespace current]::ResultSet::[incr resultSetSeq] \
+			  [self] {*}$args]]
+	}
+    }
+
+    # The 'ResultSetCreate' method is expected to be a forward to the
+    # appropriate result set constructor. If it's missing, the driver must
+    # have been designed for tdbc 1.0b9 and earlier, and the 'resultSetClass'
+    # variable holds the class name.
+
+    method resultSetCreate {name instance args} {
+	return [uplevel 1 [list $resultSetClass create \
+			       $name $instance {*}$args]]
+    }
+
+    # The 'resultsets' method returns a list of result sets produced by
+    # the current statement
+
+    method resultsets {} {
+	info commands ResultSet::*
+    }
+
+    # The 'allrows' method executes a statement with a given set of
+    # substituents, and returns a list of all the rows that the statement
+    # returns.  Optionally, it stores the names of columns in
+    # '-columnsvariable'.
+    #
+    # Usage:
+    #	$statement allrows ?-as lists|dicts? ?-columnsvariable varName? ?--?
+    #		?dictionary?
+
+
+    method allrows args {
+
+	variable ::tdbc::generalError
+
+	# Grab keyword-value parameters
+
+	set args [::tdbc::ParseConvenienceArgs $args[set args {}] opts]
+
+	# Check postitional parameters
+
+	set cmd [list [self] execute]
+	if {[llength $args] == 0} {
+	    # do nothing
+	} elseif {[llength $args] == 1} {
+	    lappend cmd [lindex $args 0]
+	} else {
+	    set errorcode $generalError
+	    lappend errorcode wrongNumArgs
+	    return -code error -errorcode $errorcode \
+		"wrong # args: should be [lrange [info level 0] 0 1]\
+                 ?-option value?... ?--? ?dictionary?"
+	}
+
+	# Get the result set
+
+	set resultSet [uplevel 1 $cmd]
+
+	# Delegate to the result set's [allrows] method to accumulate
+	# the rows of the result.
+
+	set cmd [list $resultSet allrows {*}$opts]
+	set status [catch {
+	    uplevel 1 $cmd
+	} result options]
+
+	# Destroy the result set
+
+	catch {
+	    rename $resultSet {}
+	}
+
+	# Adjust return level in the case that the script [return]s
+
+	if {$status == 2} {
+	    set options [dict merge {-level 1} $options[set options {}]]
+	    dict incr options -level
+	}
+	return -options $options $result
+    }
+
+    # The 'foreach' method executes a statement with a given set of
+    # substituents.  It runs the supplied script, substituting the supplied
+    # named variable. Optionally, it stores the names of columns in
+    # '-columnsvariable'.
+    #
+    # Usage:
+    #	$statement foreach ?-as lists|dicts? ?-columnsvariable varName? ?--?
+    #		variableName ?dictionary? script
+
+    method foreach args {
+
+	variable ::tdbc::generalError
+
+	# Grab keyword-value parameters
+
+	set args [::tdbc::ParseConvenienceArgs $args[set args {}] opts]
+
+	# Check positional parameters
+
+	set cmd [list [self] execute]
+	if {[llength $args] == 2} {
+	    lassign $args varname script
+	} elseif {[llength $args] == 3} {
+	    lassign $args varname dict script
+	    lappend cmd $dict
+	} else {
+	    set errorcode $generalError
+	    lappend errorcode wrongNumArgs
+	    return -code error -errorcode $errorcode \
+		"wrong # args: should be [lrange [info level 0] 0 1]\
+                 ?-option value?... ?--? varName ?dictionary? script"
+	}
+
+	# Get the result set
+
+	set resultSet [uplevel 1 $cmd]
+
+	# Delegate to the result set's [foreach] method to evaluate
+	# the script for each row of the result.
+
+	set cmd [list $resultSet foreach {*}$opts -- $varname $script]
+	set status [catch {
+	    uplevel 1 $cmd
+	} result options]
+
+	# Destroy the result set
+
+	catch {
+	    rename $resultSet {}
+	}
+
+	# Adjust return level in the case that the script [return]s
+
+	if {$status == 2} {
+	    set options [dict merge {-level 1} $options[set options {}]]
+	    dict incr options -level
+	}
+	return -options $options $result
+    }
+
+    # The 'close' method is syntactic sugar for invoking the destructor
+
+    method close {} {
+	my destroy
+    }
+
+    # Derived classes are expected to implement their own constructors,
+    # plus the following methods:
+
+    # paramtype paramName ?direction? type ?scale ?precision??
+    #     Declares the type of a parameter in the statement
+
+}
+
+#------------------------------------------------------------------------------
+#
+# Class: tdbc::resultset
+#
+#	Class that represents a result set in a generic database.
+#
+#------------------------------------------------------------------------------
+
+oo::class create tdbc::resultset {
+
+    constructor {} { }
+
+    # The 'allrows' method returns a list of all rows that a given
+    # result set returns.
+
+    method allrows args {
+
+	variable ::tdbc::generalError
+
+	# Parse args
+
+	set args [::tdbc::ParseConvenienceArgs $args[set args {}] opts]
+	if {[llength $args] != 0} {
+	    set errorcode $generalError
+	    lappend errorcode wrongNumArgs
+	    return -code error -errorcode $errorcode \
+		"wrong # args: should be [lrange [info level 0] 0 1]\
+                 ?-option value?... ?--? varName script"
+	}
+
+	# Do -columnsvariable if requested
+
+	if {[dict exists $opts -columnsvariable]} {
+	    upvar 1 [dict get $opts -columnsvariable] columns
+	}
+
+	# Assemble the results
+
+	if {[dict get $opts -as] eq {lists}} {
+	    set delegate nextlist
+	} else {
+	    set delegate nextdict
+	}
+	set results [list]
+	while {1} {
+	    set columns [my columns]
+	    while {[my $delegate row]} {
+		lappend results $row
+	    }
+	    if {![my nextresults]} break
+	}
+	return $results
+
+    }
+
+    # The 'foreach' method runs a script on each row from a result set.
+
+    method foreach args {
+
+	variable ::tdbc::generalError
+
+	# Grab keyword-value parameters
+
+	set args [::tdbc::ParseConvenienceArgs $args[set args {}] opts]
+
+	# Check positional parameters
+
+	if {[llength $args] != 2} {
+	    set errorcode $generalError
+	    lappend errorcode wrongNumArgs
+	    return -code error -errorcode $errorcode \
+		"wrong # args: should be [lrange [info level 0] 0 1]\
+                 ?-option value?... ?--? varName script"
+	}
+
+	# Do -columnsvariable if requested
+
+	if {[dict exists $opts -columnsvariable]} {
+	    upvar 1 [dict get $opts -columnsvariable] columns
+	}
+
+	# Iterate over the groups of results
+	while {1} {
+
+	    # Export column names to caller
+
+	    set columns [my columns]
+
+	    # Iterate over the rows of one group of results
+
+	    upvar 1 [lindex $args 0] row
+	    if {[dict get $opts -as] eq {lists}} {
+		set delegate nextlist
+	    } else {
+		set delegate nextdict
+	    }
+	    while {[my $delegate row]} {
+		set status [catch {
+		    uplevel 1 [lindex $args 1]
+		} result options]
+		switch -exact -- $status {
+		    0 - 4 {	# OK or CONTINUE
+		    }
+		    2 {		# RETURN
+			set options \
+			    [dict merge {-level 1} $options[set options {}]]
+			dict incr options -level
+			return -options $options $result
+		    }
+		    3 {		# BREAK
+			set broken 1
+			break
+		    }
+		    default {	# ERROR or unknown status
+			return -options $options $result
+		    }
+		}
+	    }
+
+	    # Advance to the next group of results if there is one
+
+	    if {[info exists broken] || ![my nextresults]} {
+		break
+	    }
+	}
+
+	return
+    }
+
+
+    # The 'nextrow' method retrieves a row in the form of either
+    # a list or a dictionary.
+
+    method nextrow {args} {
+
+	variable ::tdbc::generalError
+
+	set opts [dict create -as dicts]
+	set i 0
+
+	# Munch keyword options off the front of the command arguments
+
+	foreach {key value} $args {
+	    if {[string index $key 0] eq {-}} {
+		switch -regexp -- $key {
+		    -as? {
+			dict set opts -as $value
+		    }
+		    -- {
+			incr i
+			break
+		    }
+		    default {
+			set errorcode $generalError
+			lappend errorcode badOption $key
+			return -code error -errorcode $errorcode \
+			    "bad option \"$key\":\
+                             must be -as or -columnsvariable"
+		    }
+		}
+	    } else {
+		break
+	    }
+	    incr i 2
+	}
+
+	set args [lrange $args $i end]
+	if {[llength $args] != 1} {
+	    set errorcode $generalError
+	    lappend errorcode wrongNumArgs
+	    return -code error -errorcode $errorcode \
+		"wrong # args: should be [lrange [info level 0] 0 1]\
+                 ?-option value?... ?--? varName"
+	}
+	upvar 1 [lindex $args 0] row
+	if {[dict get $opts -as] eq {lists}} {
+	    set delegate nextlist
+	} else {
+	    set delegate nextdict
+	}
+	return [my $delegate row]
+    }
+
+    # Derived classes must override 'nextresults' if a single
+    # statement execution can yield multiple sets of results
+
+    method nextresults {} {
+	return 0
+    }
+
+    # Derived classes must override 'outputparams' if statements can
+    # have output parameters.
+
+    method outputparams {} {
+	return {}
+    }
+
+    # The 'close' method is syntactic sugar for destroying the result set.
+
+    method close {} {
+	my destroy
+    }
+
+    # Derived classes are expected to implement the following methods:
+
+    # constructor and destructor.
+    #        Constructor accepts a statement and an optional
+    #        a dictionary of substituted parameters  and
+    #        executes the statement against the database. If
+    #	     the dictionary is not supplied, then the default
+    #	     is to get params from variables in the caller's scope).
+    # columns
+    #     -- Returns a list of the names of the columns in the result.
+    # nextdict variableName
+    #     -- Stores the next row of the result set in the given variable
+    #        in caller's scope, in the form of a dictionary that maps
+    #	     column names to values.
+    # nextlist variableName
+    #     -- Stores the next row of the result set in the given variable
+    #        in caller's scope, in the form of a list of cells.
+    # rowcount
+    #     -- Returns a count of rows affected by the statement, or -1
+    #        if the count of rows has not been determined.
+
+}
\ No newline at end of file
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/tdbc115.dll b/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/tdbc115.dll
new file mode 100644
index 00000000..b7aacb1b
Binary files /dev/null and b/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/tdbc115.dll differ
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/tdbcConfig.sh b/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/tdbcConfig.sh
new file mode 100644
index 00000000..23d40af3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tdbc1.1.5/tdbcConfig.sh
@@ -0,0 +1,81 @@
+# tdbcConfig.sh --
+#
+# This shell script (for sh) is generated automatically by TDBC's configure
+# script. It will create shell variables for most of the configuration options
+# discovered by the configure script. This script is intended to be included
+# by the configure scripts for TDBC extensions so that they don't have to
+# figure this all out for themselves.
+#
+# The information in this file is specific to a single platform.
+#
+# RCS: @(#) $Id$
+
+# TDBC's version number
+tdbc_VERSION=1.1.5
+TDBC_VERSION=1.1.5
+
+# Name of the TDBC library - may be either a static or shared library
+tdbc_LIB_FILE=tdbc115.dll
+TDBC_LIB_FILE=tdbc115.dll
+
+# String to pass to the linker to pick up the TDBC library from its build dir
+tdbc_BUILD_LIB_SPEC="-LC:/buildtcl/BawtBuild/Windows/x64/Release/Build/Tcl/pkgs/tdbc1.1.5 -ltdbc115"
+TDBC_BUILD_LIB_SPEC="-LC:/buildtcl/BawtBuild/Windows/x64/Release/Build/Tcl/pkgs/tdbc1.1.5 -ltdbc115"
+
+# String to pass to the linker to pick up the TDBC library from its installed
+# dir.
+tdbc_LIB_SPEC="-LC:/buildtcl/BawtBuild/Windows/x64/Release/Install/Tcl/lib/tdbc1.1.5 -ltdbc115"
+TDBC_LIB_SPEC="-LC:/buildtcl/BawtBuild/Windows/x64/Release/Install/Tcl/lib/tdbc1.1.5 -ltdbc115"
+
+# Name of the TBDC stub library
+tdbc_STUB_LIB_FILE="libtdbcstub115.a"
+TDBC_STUB_LIB_FILE="libtdbcstub115.a"
+
+# String to pass to the linker to pick up the TDBC stub library from its
+# build directory
+tdbc_BUILD_STUB_LIB_SPEC="-LC:/buildtcl/BawtBuild/Windows/x64/Release/Build/Tcl/pkgs/tdbc1.1.5 -ltdbcstub115"
+TDBC_BUILD_STUB_LIB_SPEC="-LC:/buildtcl/BawtBuild/Windows/x64/Release/Build/Tcl/pkgs/tdbc1.1.5 -ltdbcstub115"
+
+# String to pass to the linker to pick up the TDBC stub library from its
+# installed directory
+tdbc_STUB_LIB_SPEC="-LC:/buildtcl/BawtBuild/Windows/x64/Release/Install/Tcl/lib/tdbc1.1.5 -ltdbcstub115"
+TDBC_STUB_LIB_SPEC="-LC:/buildtcl/BawtBuild/Windows/x64/Release/Install/Tcl/lib/tdbc1.1.5 -ltdbcstub115"
+
+# Path name of the TDBC stub library in its build directory
+tdbc_BUILD_STUB_LIB_PATH="C:/buildtcl/BawtBuild/Windows/x64/Release/Build/Tcl/pkgs/tdbc1.1.5/libtdbcstub115.a"
+TDBC_BUILD_STUB_LIB_PATH="C:/buildtcl/BawtBuild/Windows/x64/Release/Build/Tcl/pkgs/tdbc1.1.5/libtdbcstub115.a"
+
+# Path name of the TDBC stub library in its installed directory
+tdbc_STUB_LIB_PATH="C:/buildtcl/BawtBuild/Windows/x64/Release/Install/Tcl/lib/tdbc1.1.5/libtdbcstub115.a"
+TDBC_STUB_LIB_PATH="C:/buildtcl/BawtBuild/Windows/x64/Release/Install/Tcl/lib/tdbc1.1.5/libtdbcstub115.a"
+
+# Location of the top-level source directories from which TDBC was built.
+# This is the directory that contains doc/, generic/ and so on.  If TDBC
+# was compiled in a directory other than the source directory, this still
+# points to the location of the sources, not the location where TDBC was
+# compiled.
+tdbc_SRC_DIR="C:/buildtcl/BawtBuild/Windows/x64/Release/Build/Tcl/pkgs/tdbc1.1.5"
+TDBC_SRC_DIR="C:/buildtcl/BawtBuild/Windows/x64/Release/Build/Tcl/pkgs/tdbc1.1.5"
+
+# String to pass to the compiler so that an extension can find installed TDBC
+# headers
+tdbc_INCLUDE_SPEC="-I/C/buildtcl/BawtBuild/Windows/x64/Release/Install/Tcl/include"
+TDBC_INCLUDE_SPEC="-I/C/buildtcl/BawtBuild/Windows/x64/Release/Install/Tcl/include"
+
+# String to pass to the compiler so that an extension can find TDBC headers
+# in the source directory
+tdbc_BUILD_INCLUDE_SPEC="-IC:/buildtcl/BawtBuild/Windows/x64/Release/Build/Tcl/pkgs/tdbc1.1.5/generic"
+TDBC_BUILD_INCLUDE_SPEC="-IC:/buildtcl/BawtBuild/Windows/x64/Release/Build/Tcl/pkgs/tdbc1.1.5/generic"
+
+# Path name where .tcl files in the tdbc package appear at run time.
+tdbc_LIBRARY_PATH="/C/buildtcl/BawtBuild/Windows/x64/Release/Install/Tcl/lib/tdbc1.1.5"
+TDBC_LIBRARY_PATH="/C/buildtcl/BawtBuild/Windows/x64/Release/Install/Tcl/lib/tdbc1.1.5"
+
+# Path name where .tcl files in the tdbc package appear at build time.
+tdbc_BUILD_LIBRARY_PATH="C:/buildtcl/BawtBuild/Windows/x64/Release/Build/Tcl/pkgs/tdbc1.1.5/library"
+TDBC_BUILD_LIBRARY_PATH="C:/buildtcl/BawtBuild/Windows/x64/Release/Build/Tcl/pkgs/tdbc1.1.5/library"
+
+# Additional flags that must be passed to the C compiler to use tdbc
+tdbc_CFLAGS=
+TDBC_CFLAGS=
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbcmysql1.1.5/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tdbcmysql1.1.5/pkgIndex.tcl
new file mode 100644
index 00000000..1630e7a2
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tdbcmysql1.1.5/pkgIndex.tcl
@@ -0,0 +1,14 @@
+# Index file to load the TDBC MySQL package.
+
+if {![package vsatisfies [package provide Tcl] 8.6-]} {
+    return
+}
+if {[package vsatisfies [package provide Tcl] 9.0-]} {
+    package ifneeded tdbc::mysql 1.1.5 \
+	    "[list source [file join $dir tdbcmysql.tcl]]\;\
+	    [list load [file join $dir tcl9tdbcmysql115.dll] [string totitle tdbcmysql]]"
+} else {
+    package ifneeded tdbc::mysql 1.1.5 \
+	    "[list source [file join $dir tdbcmysql.tcl]]\;\
+	    [list load [file join $dir tdbcmysql115.dll] [string totitle tdbcmysql]]"
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbcmysql1.1.5/tdbcmysql.tcl b/src/vfs/punk86.vfs/lib_tcl8/tdbcmysql1.1.5/tdbcmysql.tcl
new file mode 100644
index 00000000..caa334c4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tdbcmysql1.1.5/tdbcmysql.tcl
@@ -0,0 +1,193 @@
+# tdbcmysql.tcl --
+#
+#	Class definitions and Tcl-level methods for the tdbc::mysql bridge.
+#
+# Copyright (c) 2008 by Kevin B. Kenny
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: tdbcmysql.tcl,v 1.47 2008/02/27 02:08:27 kennykb Exp $
+#
+#------------------------------------------------------------------------------
+
+package require tdbc
+
+::namespace eval ::tdbc::mysql {
+
+    namespace export connection datasources drivers
+
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::mysql::connection --
+#
+#	Class representing a connection to a database through MYSQL.
+#
+#-------------------------------------------------------------------------------
+
+::oo::class create ::tdbc::mysql::connection {
+
+    superclass ::tdbc::connection
+
+    # The constructor is written in C. It takes alternating keywords
+    # and values pairs as its argumenta.  (See the manual page for the
+    # available options.)
+
+    variable foreignKeysStatement
+
+    # The 'statementCreate' method delegates to the constructor of the
+    # statement class
+
+    forward statementCreate ::tdbc::mysql::statement create
+
+    # The 'columns' method returns a dictionary describing the tables
+    # in the database
+
+    method columns {table {pattern %}} {
+
+	# To return correct lengths of CHARACTER and BINARY columns,
+	# we need to know the maximum lengths of characters in each
+	# collation. We cache this information only once, on the first
+	# call to 'columns'.
+
+	if {[my NeedCollationInfo]} {
+	    my SetCollationInfo {*}[my allrows -as lists {
+		SELECT coll.id, cs.maxlen
+		FROM INFORMATION_SCHEMA.COLLATIONS coll,
+		     INFORMATION_SCHEMA.CHARACTER_SETS cs
+		WHERE cs.CHARACTER_SET_NAME = coll.CHARACTER_SET_NAME
+		ORDER BY coll.id DESC
+	    }]
+	}
+
+	return [my Columns $table $pattern]
+    }
+
+    # The 'preparecall' method gives a portable interface to prepare
+    # calls to stored procedures.  It delegates to 'prepare' to do the
+    # actual work.
+
+    method preparecall {call} {
+	regexp {^[[:space:]]*(?:([A-Za-z_][A-Za-z_0-9]*)[[:space:]]*=)?(.*)} \
+	    $call -> varName rest
+	if {$varName eq {}} {
+	    my prepare "CALL $rest"
+	} else {
+	    my prepare \\{:$varName=$rest\\}
+	}
+    }
+
+    # The 'init', 'begintransaction', 'commit, 'rollback', 'tables'
+    # 'NeedCollationInfo', 'SetCollationInfo', and 'Columns' methods
+    # are implemented in C.
+
+    # The 'BuildForeignKeysStatements' method builds a SQL statement to
+    # retrieve the foreign keys from a database. (It executes once the
+    # first time the 'foreignKeys' method is executed, and retains the
+    # prepared statements for reuse.)  It is slightly nonstandard because
+    # MYSQL doesn't name the PRIMARY constraints uniquely.
+
+    method BuildForeignKeysStatement {} {
+
+	foreach {exists1 clause1} {
+	    0 {}
+	    1 { AND fkc.REFERENCED_TABLE_NAME = :primary}
+	} {
+	    foreach {exists2 clause2} {
+		0 {}
+		1 { AND fkc.TABLE_NAME = :foreign}
+	    } {
+		set stmt [my prepare "
+	     SELECT rc.CONSTRAINT_SCHEMA AS \"foreignConstraintSchema\",
+                    rc.CONSTRAINT_NAME AS \"foreignConstraintName\",
+                    rc.UPDATE_RULE AS \"updateAction\",
+		    rc.DELETE_RULE AS \"deleteAction\",
+		    fkc.REFERENCED_TABLE_SCHEMA AS \"primarySchema\",
+                    fkc.REFERENCED_TABLE_NAME AS \"primaryTable\",
+                    fkc.REFERENCED_COLUMN_NAME AS \"primaryColumn\",
+                    fkc.TABLE_SCHEMA AS \"foreignSchema\",
+                    fkc.TABLE_NAME AS \"foreignTable\",
+                    fkc.COLUMN_NAME AS \"foreignColumn\",
+                    fkc.ORDINAL_POSITION AS \"ordinalPosition\"
+             FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS rc
+             INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE fkc
+                     ON fkc.CONSTRAINT_NAME = rc.CONSTRAINT_NAME
+                    AND fkc.CONSTRAINT_SCHEMA = rc.CONSTRAINT_SCHEMA
+             WHERE 1=1
+                 $clause1
+                 $clause2
+"]
+		dict set foreignKeysStatement $exists1 $exists2 $stmt
+	    }
+	}
+    }
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::mysql::statement --
+#
+#	The class 'tdbc::mysql::statement' models one statement against a
+#       database accessed through an MYSQL connection
+#
+#------------------------------------------------------------------------------
+
+::oo::class create ::tdbc::mysql::statement {
+
+    superclass ::tdbc::statement
+
+    # The 'resultSetCreate' method forwards to the constructor of the
+    # result set.
+
+    forward resultSetCreate ::tdbc::mysql::resultset create
+
+    # Methods implemented in C:
+    #
+    # constructor connection SQLCode
+    #	The constructor accepts the handle to the connection and the SQL code
+    #	for the statement to prepare.  It creates a subordinate namespace to
+    #	hold the statement's active result sets, and then delegates to the
+    #	'init' method, written in C, to do the actual work of preparing the
+    #	statement.
+    # params
+    #   Returns descriptions of the parameters of a statement.
+    # paramtype paramname ?direction? type ?precision ?scale??
+    #   Declares the type of a parameter in the statement
+
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::mysql::resultset --
+#
+#	The class 'tdbc::mysql::resultset' models the result set that is
+#	produced by executing a statement against an MYSQL database.
+#
+#------------------------------------------------------------------------------
+
+::oo::class create ::tdbc::mysql::resultset {
+
+    superclass ::tdbc::resultset
+
+    # Methods implemented in C include:
+
+    # constructor statement ?dictionary?
+    #     -- Executes the statement against the database, optionally providing
+    #        a dictionary of substituted parameters (default is to get params
+    #        from variables in the caller's scope).
+    # columns
+    #     -- Returns a list of the names of the columns in the result.
+    # nextdict
+    #     -- Stores the next row of the result set in the given variable in
+    #        the caller's scope as a dictionary whose keys are
+    #        column names and whose values are column values, or else
+    #        as a list of cells.
+    # nextlist
+    #     -- Stores the next row of the result set in the given variable in
+    #        the caller's scope as a list of cells.
+    # rowcount
+    #     -- Returns a count of rows affected by the statement, or -1
+    #        if the count of rows has not been determined.
+
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbcmysql1.1.5/tdbcmysql115.dll b/src/vfs/punk86.vfs/lib_tcl8/tdbcmysql1.1.5/tdbcmysql115.dll
new file mode 100644
index 00000000..3b28986a
Binary files /dev/null and b/src/vfs/punk86.vfs/lib_tcl8/tdbcmysql1.1.5/tdbcmysql115.dll differ
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbcodbc1.1.5/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tdbcodbc1.1.5/pkgIndex.tcl
new file mode 100644
index 00000000..48c49c68
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tdbcodbc1.1.5/pkgIndex.tcl
@@ -0,0 +1,14 @@
+# Index file to load the TDBC ODBC package.
+
+if {![package vsatisfies [package provide Tcl] 8.6-]} {
+    return
+}
+if {[package vsatisfies [package provide Tcl] 9.0-]} {
+    package ifneeded tdbc::odbc 1.1.5 \
+	    "[list source [file join $dir tdbcodbc.tcl]]\;\
+	    [list load [file join $dir tcl9tdbcodbc115.dll] [string totitle tdbcodbc]]"
+} else {
+    package ifneeded tdbc::odbc 1.1.5 \
+	    "[list source [file join $dir tdbcodbc.tcl]]\;\
+	    [list load [file join $dir tdbcodbc115.dll] [string totitle tdbcodbc]]"
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbcodbc1.1.5/tdbcodbc.tcl b/src/vfs/punk86.vfs/lib_tcl8/tdbcodbc1.1.5/tdbcodbc.tcl
new file mode 100644
index 00000000..7bc68ba3
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tdbcodbc1.1.5/tdbcodbc.tcl
@@ -0,0 +1,554 @@
+# tdbcodbc.tcl --
+#
+#	Class definitions and Tcl-level methods for the tdbc::odbc bridge.
+#
+# Copyright (c) 2008 by Kevin B. Kenny
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: tdbcodbc.tcl,v 1.47 2008/02/27 02:08:27 kennykb Exp $
+#
+#------------------------------------------------------------------------------
+
+package require tdbc
+
+::namespace eval ::tdbc::odbc {
+
+    namespace export connection datasources drivers
+
+    # Data types that are predefined in ODBC
+
+    variable sqltypes [dict create \
+			   1 char \
+			   2 numeric \
+			   3 decimal \
+			   4 integer \
+			   5 smallint \
+			   6 float \
+			   7 real \
+			   8 double \
+			   9 datetime \
+			   12 varchar \
+			   91 date \
+			   92 time \
+			   93 timestamp \
+			   -1 longvarchar \
+			   -2 binary \
+			   -3 varbinary \
+			   -4 longvarbinary \
+			   -5 bigint \
+			   -6 tinyint \
+			   -7 bit \
+			   -8 wchar \
+			   -9 wvarchar \
+			   -10 wlongvarchar \
+			   -11 guid]
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::odbc::connection --
+#
+#	Class representing a connection to a database through ODBC.
+#
+#-------------------------------------------------------------------------------
+
+::oo::class create ::tdbc::odbc::connection {
+
+    superclass ::tdbc::connection
+
+    variable statementSeq typemap
+
+    # The constructor is written in C. It takes the connection string
+    # as its argument It sets up a namespace to hold the statements
+    # associated with the connection, and then delegates to the 'init'
+    # method (written in C) to do the actual work of attaching to the
+    # database. When that comes back, it sets up a statement to query
+    # the support types, makes a dictionary to enumerate them, and
+    # calls back to set a flag if WVARCHAR is seen (If WVARCHAR is
+    # seen, the database supports Unicode.)
+
+    # The 'statementCreate' method forwards to the constructor of the
+    # statement class
+
+    forward statementCreate ::tdbc::odbc::statement create
+
+    # The 'tables' method returns a dictionary describing the tables
+    # in the database
+
+    method tables {{pattern %}} {
+	set stmt [::tdbc::odbc::tablesStatement create \
+		      Stmt::[incr statementSeq] [self] $pattern]
+       	set status [catch {
+	    set retval {}
+	    $stmt foreach -as dicts row {
+		if {[dict exists $row TABLE_NAME]} {
+		    dict set retval [dict get $row TABLE_NAME] $row
+		}
+	    }
+	    set retval
+	} result options]
+	catch {rename $stmt {}}
+	return -level 0 -options $options $result
+    }
+
+    # The 'columns' method returns a dictionary describing the tables
+    # in the database
+
+    method columns {table {pattern %}} {
+	# Make sure that the type map is initialized
+	my typemap
+
+	# Query the columns from the database
+
+	set stmt [::tdbc::odbc::columnsStatement create \
+		      Stmt::[incr statementSeq] [self] $table $pattern]
+	set status [catch {
+	    set retval {}
+	    $stmt foreach -as dicts origrow {
+
+		# Map the type, precision, scale and nullable indicators
+		# to tdbc's notation
+
+		set row {}
+		dict for {key value} $origrow {
+		    dict set row [string tolower $key] $value
+		}
+		if {[dict exists $row column_name]} {
+		    if {[dict exists $typemap \
+			     [dict get $row data_type]]} {
+			dict set row type \
+			    [dict get $typemap \
+				 [dict get $row data_type]]
+		    } else {
+			dict set row type [dict get $row type_name]
+		    }
+		    if {[dict exists $row column_size]} {
+			dict set row precision \
+			    [dict get $row column_size]
+		    }
+		    if {[dict exists $row decimal_digits]} {
+			dict set row scale \
+			    [dict get $row decimal_digits]
+		    }
+		    if {![dict exists $row nullable]} {
+			dict set row nullable \
+			    [expr {!![string trim [dict get $row is_nullable]]}]
+		    }
+		    dict set retval [dict get $row column_name] $row
+		}
+	    }
+	    set retval
+	} result options]
+	catch {rename $stmt {}}
+	return -level 0 -options $options $result
+    }
+
+    # The 'primarykeys' method returns a dictionary describing the primary
+    # keys of a table
+
+    method primarykeys {tableName} {
+	set stmt [::tdbc::odbc::primarykeysStatement create \
+		      Stmt::[incr statementSeq] [self] $tableName]
+       	set status [catch {
+	    set retval {}
+	    $stmt foreach -as dicts row {
+		foreach {odbcKey tdbcKey} {
+		    TABLE_CAT		tableCatalog
+		    TABLE_SCHEM		tableSchema
+		    TABLE_NAME		tableName
+		    COLUMN_NAME		columnName
+		    KEY_SEQ		ordinalPosition
+		    PK_NAME		constraintName
+		} {
+		    if {[dict exists $row $odbcKey]} {
+			dict set row $tdbcKey [dict get $row $odbcKey]
+			dict unset row $odbcKey
+		    }
+		}
+		lappend retval $row
+	    }
+	    set retval
+	} result options]
+	catch {rename $stmt {}}
+	return -level 0 -options $options $result
+    }
+
+    # The 'foreignkeys' method returns a dictionary describing the foreign
+    # keys of a table
+
+    method foreignkeys {args} {
+	set stmt [::tdbc::odbc::foreignkeysStatement create \
+		      Stmt::[incr statementSeq] [self] {*}$args]
+       	set status [catch {
+	    set fkseq 0
+	    set retval {}
+	    $stmt foreach -as dicts row {
+		foreach {odbcKey tdbcKey} {
+		    PKTABLE_CAT		primaryCatalog
+		    PKTABLE_SCHEM	primarySchema
+		    PKTABLE_NAME	primaryTable
+		    PKCOLUMN_NAME	primaryColumn
+		    FKTABLE_CAT		foreignCatalog
+		    FKTABLE_SCHEM	foreignSchema
+		    FKTABLE_NAME	foreignTable
+		    FKCOLUMN_NAME	foreignColumn
+		    UPDATE_RULE		updateRule
+		    DELETE_RULE		deleteRule
+		    DEFERRABILITY	deferrable
+		    KEY_SEQ		ordinalPosition
+		    FK_NAME		foreignConstraintName
+		} {
+		    if {[dict exists $row $odbcKey]} {
+			dict set row $tdbcKey [dict get $row $odbcKey]
+			dict unset row $odbcKey
+		    }
+		}
+		# Horrible kludge: If the driver doesn't report FK_NAME,
+		# make one up.
+		if {![dict exists $row foreignConstraintName]} {
+		    if {![dict exists $row ordinalPosition]
+			|| [dict get $row ordinalPosition] == 1} {
+			set fkname ?[dict get $row foreignTable]?[incr fkseq]
+		    }
+		    dict set row foreignConstraintName $fkname
+		}
+		lappend retval $row
+	    }
+	    set retval
+	} result options]
+	catch {rename $stmt {}}
+	return -level 0 -options $options $result
+    }
+
+    # The 'evaldirect' evaluates driver-native SQL code without preparing it,
+    # and returns a list of dicts (similar to '$connection allrows -as dicts').
+
+    method evaldirect {sqlStatement} {
+	set stmt [::tdbc::odbc::evaldirectStatement create \
+		      Stmt::[incr statementSeq] [self] $sqlStatement]
+       	set status [catch {
+	    $stmt allrows -as dicts
+	} result options]
+	catch {rename $stmt {}}
+	return -level 0 -options $options $result
+    }
+
+    # The 'prepareCall' method gives a portable interface to prepare
+    # calls to stored procedures.  It delegates to 'prepare' to do the
+    # actual work.
+
+    method preparecall {call} {
+
+	regexp {^[[:space:]]*(?:([A-Za-z_][A-Za-z_0-9]*)[[:space:]]*=)?(.*)} \
+	    $call -> varName rest
+	if {$varName eq {}} {
+	    my prepare \\{CALL $rest\\}
+	} else {
+	    my prepare \\{:$varName=CALL $rest\\}
+	}
+
+	if 0 {
+	# Kevin thinks this is going to be
+
+	if {![regexp -expanded {
+	    ^\s*				   # leading whitespace
+	    (?::([[:alpha:]_][[:alnum:]_]*)\s*=\s*) # possible variable name
+	    (?:(?:([[:alpha:]_][[:alnum:]_]*)\s*[.]\s*)?   # catalog
+	       ([[:alpha:]_][[:alnum:]_]*)\s*[.]\s*)?      # schema
+	    ([[:alpha:]_][[:alnum:]_]*)\s*		   # procedure
+	    (.*)$					   # argument list
+	} $call -> varName catalog schema procedure arglist]} {
+	    return -code error \
+		-errorCode [list TDBC \
+				SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATION \
+				42000 ODBC -1] \
+		"Syntax error in stored procedure call"
+	} else {
+	    my PrepareCall $varName $catalog $schema $procedure $arglist
+	}
+
+	# at least if making all parameters 'inout' doesn't work.
+
+        }
+
+    }
+
+    # The 'typemap' method returns the type map
+
+    method typemap {} {
+	if {![info exists typemap]} {
+	    set typemap $::tdbc::odbc::sqltypes
+	    set typesStmt [tdbc::odbc::typesStatement new [self]]
+	    $typesStmt foreach row {
+		set typeNum [dict get $row DATA_TYPE]
+		if {![dict exists $typemap $typeNum]} {
+		    dict set typemap $typeNum [string tolower \
+						   [dict get $row TYPE_NAME]]
+		}
+		switch -exact -- $typeNum {
+		    -9 {
+			[self] HasWvarchar 1
+		    }
+		    -5 {
+			[self] HasBigint 1
+		    }
+		}
+	    }
+	    rename $typesStmt {}
+	}
+	return $typemap
+    }
+
+    # The 'begintransaction', 'commit' and 'rollback' methods are
+    # implemented in C.
+
+}
+
+#-------------------------------------------------------------------------------
+#
+# tdbc::odbc::statement --
+#
+#	The class 'tdbc::odbc::statement' models one statement against a
+#       database accessed through an ODBC connection
+#
+#-------------------------------------------------------------------------------
+
+::oo::class create ::tdbc::odbc::statement {
+
+    superclass ::tdbc::statement
+
+    # The constructor is implemented in C. It accepts the handle to
+    # the connection and the SQL code for the statement to prepare.
+    # It creates a subordinate namespace to hold the statement's
+    # active result sets, and then delegates to the 'init' method,
+    # written in C, to do the actual work of preparing the statement.
+
+    # The 'resultSetCreate' method forwards to the result set constructor
+
+    forward resultSetCreate ::tdbc::odbc::resultset create
+
+    # The 'params' method describes the parameters to the statement
+
+    method params {} {
+	set typemap [[my connection] typemap]
+	set result {}
+	foreach {name flags typeNum precision scale nullable} [my ParamList] {
+	    set lst [dict create \
+			 name $name \
+			 direction [lindex {unknown in out inout} \
+					[expr {($flags & 0x06) >> 1}]] \
+			 type [dict get $typemap $typeNum] \
+			 precision $precision \
+			 scale $scale]
+	    if {$nullable in {0 1}} {
+		dict set list nullable $nullable
+	    }
+	    dict set result $name $lst
+	}
+	return $result
+    }
+
+    # Methods implemented in C:
+    # init statement ?dictionary?
+    #     Does the heavy lifting for the constructor
+    # connection
+    #	Returns the connection handle to which this statement belongs
+    # paramtype paramname ?direction? type ?precision ?scale??
+    #     Declares the type of a parameter in the statement
+
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::odbc::tablesStatement --
+#
+#	The class 'tdbc::odbc::tablesStatement' represents the special
+#	statement that queries the tables in a database through an ODBC
+#	connection.
+#
+#------------------------------------------------------------------------------
+
+oo::class create ::tdbc::odbc::tablesStatement {
+
+    superclass ::tdbc::statement
+
+    # The constructor is written in C. It accepts the handle to the
+    # connection and a pattern to match table names.  It works in all
+    # ways like the constructor of the 'statement' class except that
+    # its 'init' method sets up to enumerate tables and not run a SQL
+    # query.
+
+    # The 'resultSetCreate' method forwards to the result set constructor
+
+    forward resultSetCreate ::tdbc::odbc::resultset create
+
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::odbc::columnsStatement --
+#
+#	The class 'tdbc::odbc::tablesStatement' represents the special
+#	statement that queries the columns of a table or view
+#	in a database through an ODBC connection.
+#
+#------------------------------------------------------------------------------
+
+oo::class create ::tdbc::odbc::columnsStatement {
+
+    superclass ::tdbc::statement
+
+    # The constructor is written in C. It accepts the handle to the
+    # connection, a table name, and a pattern to match column
+    # names. It works in all ways like the constructor of the
+    # 'statement' class except that its 'init' method sets up to
+    # enumerate tables and not run a SQL query.
+
+    # The 'resultSetCreate' class forwards to the constructor of the
+    # result set
+
+    forward resultSetCreate ::tdbc::odbc::resultset create
+
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::odbc::primarykeysStatement --
+#
+#	The class 'tdbc::odbc::primarykeysStatement' represents the special
+#	statement that queries the primary keys on a table through an ODBC
+#	connection.
+#
+#------------------------------------------------------------------------------
+
+oo::class create ::tdbc::odbc::primarykeysStatement {
+
+    superclass ::tdbc::statement
+
+    # The constructor is written in C. It accepts the handle to the
+    # connection and a table name.  It works in all
+    # ways like the constructor of the 'statement' class except that
+    # its 'init' method sets up to enumerate primary keys and not run a SQL
+    # query.
+
+    # The 'resultSetCreate' method forwards to the result set constructor
+
+    forward resultSetCreate ::tdbc::odbc::resultset create
+
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::odbc::foreignkeysStatement --
+#
+#	The class 'tdbc::odbc::foreignkeysStatement' represents the special
+#	statement that queries the foreign keys on a table through an ODBC
+#	connection.
+#
+#------------------------------------------------------------------------------
+
+oo::class create ::tdbc::odbc::foreignkeysStatement {
+
+    superclass ::tdbc::statement
+
+    # The constructor is written in C. It accepts the handle to the
+    # connection and the -primary and -foreign options.  It works in all
+    # ways like the constructor of the 'statement' class except that
+    # its 'init' method sets up to enumerate foreign keys and not run a SQL
+    # query.
+
+    # The 'resultSetCreate' method forwards to the result set constructor
+
+    forward resultSetCreate ::tdbc::odbc::resultset create
+
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::odbc::evaldirectStatement --
+#
+#	The class 'tdbc::odbc::evaldirectStatement' provides a mechanism to
+#	execute driver-name SQL code through an ODBC connection.  The SQL code
+#	is not prepared and no tokenization or variable substitution is done.
+#
+#------------------------------------------------------------------------------
+
+oo::class create ::tdbc::odbc::evaldirectStatement {
+
+    superclass ::tdbc::statement
+
+    # The constructor is written in C. It accepts the handle to the
+    # connection and a SQL statement.  It works in all
+    # ways like the constructor of the 'statement' class except that
+    # its 'init' method does not tokenize or prepare the SQL statement, and
+    # sets up to run the SQL query without performing variable substitution.
+
+    # The 'resultSetCreate' method forwards to the result set constructor
+
+    forward resultSetCreate ::tdbc::odbc::resultset create
+
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::odbc::typesStatement --
+#
+#	The class 'tdbc::odbc::typesStatement' represents the special
+#	statement that queries the types available in a database through
+#	an ODBC connection.
+#
+#------------------------------------------------------------------------------
+
+
+oo::class create ::tdbc::odbc::typesStatement {
+
+    superclass ::tdbc::statement
+
+    # The constructor is written in C. It accepts the handle to the
+    # connection, and (optionally) a data type number. It works in all
+    # ways like the constructor of the 'statement' class except that
+    # its 'init' method sets up to enumerate types and not run a SQL
+    # query.
+
+    # The 'resultSetCreate' method forwards to the constructor of result sets
+
+    forward resultSetCreate ::tdbc::odbc::resultset create
+
+    # The C code contains a variant implementation of the 'init' method.
+
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::odbc::resultset --
+#
+#	The class 'tdbc::odbc::resultset' models the result set that is
+#	produced by executing a statement against an ODBC database.
+#
+#------------------------------------------------------------------------------
+
+::oo::class create ::tdbc::odbc::resultset {
+
+    superclass ::tdbc::resultset
+
+    # Methods implemented in C include:
+
+    # constructor statement ?dictionary?
+    #     -- Executes the statement against the database, optionally providing
+    #        a dictionary of substituted parameters (default is to get params
+    #        from variables in the caller's scope).
+    # columns
+    #     -- Returns a list of the names of the columns in the result.
+    # nextdict
+    #     -- Stores the next row of the result set in the given variable in
+    #        the caller's scope as a dictionary whose keys are
+    #        column names and whose values are column values.
+    # nextlist
+    #     -- Stores the next row of the result set in the given variable in
+    #        the caller's scope as a list of cells.
+    # rowcount
+    #     -- Returns a count of rows affected by the statement, or -1
+    #        if the count of rows has not been determined.
+
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbcodbc1.1.5/tdbcodbc115.dll b/src/vfs/punk86.vfs/lib_tcl8/tdbcodbc1.1.5/tdbcodbc115.dll
new file mode 100644
index 00000000..5d99afec
Binary files /dev/null and b/src/vfs/punk86.vfs/lib_tcl8/tdbcodbc1.1.5/tdbcodbc115.dll differ
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbcpostgres1.1.5/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tdbcpostgres1.1.5/pkgIndex.tcl
new file mode 100644
index 00000000..96b6ab57
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tdbcpostgres1.1.5/pkgIndex.tcl
@@ -0,0 +1,14 @@
+# Index file to load the TDBC Postgres package.
+
+if {![package vsatisfies [package provide Tcl] 8.6-]} {
+    return
+}
+if {[package vsatisfies [package provide Tcl] 9.0-]} {
+    package ifneeded tdbc::postgres 1.1.5 \
+	    "[list source [file join $dir tdbcpostgres.tcl]]\;\
+	    [list load [file join $dir tcl9tdbcpostgres115.dll] [string totitle tdbcpostgres]]"
+} else {
+    package ifneeded tdbc::postgres 1.1.5 \
+	    "[list source [file join $dir tdbcpostgres.tcl]]\;\
+	    [list load [file join $dir tdbcpostgres115.dll] [string totitle tdbcpostgres]]"
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbcpostgres1.1.5/tdbcpostgres.tcl b/src/vfs/punk86.vfs/lib_tcl8/tdbcpostgres1.1.5/tdbcpostgres.tcl
new file mode 100644
index 00000000..c5c4ef0f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tdbcpostgres1.1.5/tdbcpostgres.tcl
@@ -0,0 +1,135 @@
+# tdbcpostgres.tcl --
+#
+#	Class definitions and Tcl-level methods for the tdbc::postgres bridge.
+#
+# Copyright (c) 2009 by Slawomir Cygan
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+#------------------------------------------------------------------------------
+
+package require tdbc
+
+::namespace eval ::tdbc::mypostgres {
+
+    namespace export connection datasources drivers
+
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::postgres::connection --
+#
+#	Class representing a connection to a Postgres database.
+#
+#-------------------------------------------------------------------------------
+
+::oo::class create ::tdbc::postgres::connection {
+
+    superclass ::tdbc::connection
+
+    # The constructor is written in C. It takes alternating keywords
+    # and values pairs as its arguments.  (See the manual page for the
+    # available options.)
+
+    # The 'statementCreate' method delegates to the constructor of the
+    # statement class
+
+    forward statementCreate ::tdbc::postgres::statement create
+
+
+    # The 'prepareCall' method gives a portable interface to prepare
+    # calls to stored procedures.  It delegates to 'prepare' to do the
+    # actual work.
+
+    method preparecall {call} {
+	regexp {^[[:space:]]*(?:([A-Za-z_][A-Za-z_0-9]*)[[:space:]]*=)?(.*)} \
+	    $call -> varName rest
+	if {$varName eq {}} {
+	    my prepare \\{$rest\\}
+	} else {
+	    my prepare \\{:$varName=$rest\\}
+	}
+    }
+
+    # The 'init', 'begintransaction', 'commit, 'rollback', 'tables'
+    #  and 'columns' methods are implemented in C.
+
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::postgres::statement --
+#
+#	The class 'tdbc::postgres::statement' models one statement against a
+#       database accessed through a Postgres connection
+#
+#------------------------------------------------------------------------------
+
+::oo::class create ::tdbc::postgres::statement {
+
+    superclass ::tdbc::statement
+
+    # The 'resultSetCreate' method forwards to the constructor of the
+    # result set.
+
+    forward resultSetCreate ::tdbc::postgres::resultset create
+
+    # Methods implemented in C:
+    #
+    # constructor connection SQLCode
+    #	The constructor accepts the handle to the connection and the SQL code
+    #	for the statement to prepare.  It creates a subordinate namespace to
+    #	hold the statement's active result sets, and then delegates to the
+    #	'init' method, written in C, to do the actual work of preparing the
+    #	statement.
+    # params
+    #   Returns descriptions of the parameters of a statement.
+    # paramtype paramname ?direction? type ?precision ?scale??
+    #   Declares the type of a parameter in the statement
+
+}
+
+#------------------------------------------------------------------------------
+#
+# tdbc::postgres::resultset --
+#
+#	The class 'tdbc::postgres::resultset' models the result set that is
+#	produced by executing a statement against a Postgres database.
+#
+#------------------------------------------------------------------------------
+
+::oo::class create ::tdbc::postgres::resultset {
+
+    superclass ::tdbc::resultset
+
+    # The 'nextresults' method is stubbed out; tdbcpostgres does not
+    # allow a single call to return multiple results.
+
+    method nextresults {} {
+	while {[my nextdict rubbish]} {}
+	return 0
+    }
+
+    # Methods implemented in C include:
+
+    # constructor statement ?dictionary?
+    #     -- Executes the statement against the database, optionally providing
+    #        a dictionary of substituted parameters (default is to get params
+    #        from variables in the caller's scope).
+    # columns
+    #     -- Returns a list of the names of the columns in the result.
+    # nextdict
+    #     -- Stores the next row of the result set in the given variable in
+    #        the caller's scope as a dictionary whose keys are
+    #        column names and whose values are column values, or else
+    #        as a list of cells.
+    # nextlist
+    #     -- Stores the next row of the result set in the given variable in
+    #        the caller's scope as a list of cells.
+    # rowcount
+    #     -- Returns a count of rows affected by the statement, or -1
+    #        if the count of rows has not been determined.
+
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdbcpostgres1.1.5/tdbcpostgres115.dll b/src/vfs/punk86.vfs/lib_tcl8/tdbcpostgres1.1.5/tdbcpostgres115.dll
new file mode 100644
index 00000000..dcb1f25d
Binary files /dev/null and b/src/vfs/punk86.vfs/lib_tcl8/tdbcpostgres1.1.5/tdbcpostgres115.dll differ
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdom0.9.3/libtdomstub093.a b/src/vfs/punk86.vfs/lib_tcl8/tdom0.9.3/libtdomstub093.a
new file mode 100644
index 00000000..1bd0d3ff
Binary files /dev/null and b/src/vfs/punk86.vfs/lib_tcl8/tdom0.9.3/libtdomstub093.a differ
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdom0.9.3/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/tdom0.9.3/pkgIndex.tcl
new file mode 100644
index 00000000..65f9e7c6
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tdom0.9.3/pkgIndex.tcl
@@ -0,0 +1,6 @@
+#
+# Tcl package index file
+#
+package ifneeded tdom 0.9.3 \
+    "[list load [file join $dir tdom093.dll]];
+     [list source [file join $dir tdom.tcl]]"
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdom0.9.3/tdom.tcl b/src/vfs/punk86.vfs/lib_tcl8/tdom0.9.3/tdom.tcl
new file mode 100644
index 00000000..148c24fd
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/tdom0.9.3/tdom.tcl
@@ -0,0 +1,1014 @@
+#----------------------------------------------------------------------------
+#   Copyright (c) 1999 Jochen Loewer (loewerj@hotmail.com)
+#----------------------------------------------------------------------------
+#
+#   $Id$
+#
+#
+#   The higher level functions of tDOM written in plain Tcl.
+#
+#
+#   The contents of this file are subject to the Mozilla Public License
+#   Version 2.0 (the "License"); you may not use this file except in
+#   compliance with the License. You may obtain a copy of the License at
+#   http://www.mozilla.org/MPL/
+#
+#   Software distributed under the License is distributed on an "AS IS"
+#   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+#   License for the specific language governing rights and limitations
+#   under the License.
+#
+#   The Original Code is tDOM.
+#
+#   The Initial Developer of the Original Code is Jochen Loewer
+#   Portions created by Jochen Loewer are Copyright (C) 1998, 1999
+#   Jochen Loewer. All Rights Reserved.
+#
+#   Contributor(s):
+#       Rolf Ade (rolf@pointsman.de):   'fake' nodelists/live childNodes
+#
+#   written by Jochen Loewer
+#   April, 1999
+#
+#----------------------------------------------------------------------------
+
+package require tdom 
+
+#----------------------------------------------------------------------------
+#   setup namespaces for additional Tcl level methods, etc.
+#
+#----------------------------------------------------------------------------
+namespace eval ::dom {
+    namespace eval  domDoc {
+    }
+    namespace eval  domNode {
+    }
+    namespace eval  DOMImplementation {
+    }
+    namespace eval  xpathFunc {
+    }
+    namespace eval  xpathFuncHelper {
+    }
+}
+
+namespace eval ::tdom { 
+    variable extRefHandlerDebug 0
+    variable useForeignDTD ""
+
+    namespace export xmlOpenFile xmlReadFile xmlReadFileForSimple \
+        extRefHandler baseURL
+}
+
+#----------------------------------------------------------------------------
+#   hasFeature (DOMImplementation method)
+#
+#
+#   @in  url    the URL, where to get the XML document
+#
+#   @return     document object
+#   @exception  XML parse errors, ...
+#
+#----------------------------------------------------------------------------
+proc ::dom::DOMImplementation::hasFeature { dom feature {version ""} } {
+
+    switch $feature {
+        xml -
+        XML {
+            if {($version == "") || ($version == "1.0")} {
+                return 1
+            }
+        }
+    }
+    return 0
+
+}
+
+#----------------------------------------------------------------------------
+#   load (DOMImplementation method)
+#
+#       requests a XML document via http using the given URL and
+#       builds up a DOM tree in memory returning the document object
+#
+#
+#   @in  url    the URL, where to get the XML document
+#
+#   @return     document object
+#   @exception  XML parse errors, ...
+#
+#----------------------------------------------------------------------------
+proc ::dom::DOMImplementation::load { dom url } {
+
+    error "Sorry, load method not implemented yet!"
+
+}
+
+#----------------------------------------------------------------------------
+#   isa (docDoc method, for [incr tcl] compatibility)
+#
+#
+#   @in  className
+#
+#   @return         1 iff inherits from the given class
+#
+#----------------------------------------------------------------------------
+proc ::dom::domDoc::isa { doc className } {
+
+    if {$className == "domDoc"} {
+        return 1
+    }
+    return 0
+}
+
+#----------------------------------------------------------------------------
+#   info (domDoc method, for [incr tcl] compatibility)
+#
+#
+#   @in  subcommand
+#   @in  args
+#
+#----------------------------------------------------------------------------
+proc ::dom::domDoc::info { doc subcommand args } {
+
+    switch $subcommand {
+        class {
+            return "domDoc"
+        }
+        inherit {
+            return ""
+        }
+        heritage {
+            return "domDoc {}"
+        }
+        default {
+            error "domDoc::info subcommand $subcommand not yet implemented!"
+        }
+    }
+}
+
+#----------------------------------------------------------------------------
+#   importNode (domDoc method)
+#
+#       Document Object Model (Core) Level 2 method
+#
+#
+#   @in  subcommand
+#   @in  args
+#
+#----------------------------------------------------------------------------
+proc ::dom::domDoc::importNode { doc importedNode deep } {
+
+    if {$deep || ($deep == "-deep")} {
+        set node [$importedNode cloneNode -deep]
+    } else {
+        set node [$importedNode cloneNode]
+    }
+    return $node
+}
+
+#----------------------------------------------------------------------------
+#   isa (domNode method, for [incr tcl] compatibility)
+#
+#
+#   @in  className
+#
+#   @return         1 iff inherits from the given class
+#
+#----------------------------------------------------------------------------
+proc ::dom::domNode::isa { doc className } {
+
+    if {$className == "domNode"} {
+        return 1
+    }
+    return 0
+}
+
+#----------------------------------------------------------------------------
+#   info (domNode method, for [incr tcl] compatibility)
+#
+#
+#   @in  subcommand
+#   @in  args
+#
+#----------------------------------------------------------------------------
+proc ::dom::domNode::info { doc subcommand args } {
+
+    switch $subcommand {
+        class {
+            return "domNode"
+        }
+        inherit {
+            return ""
+        }
+        heritage {
+            return "domNode {}"
+        }
+        default {
+            error "domNode::info subcommand $subcommand not yet implemented!"
+        }
+    }
+}
+
+#----------------------------------------------------------------------------
+#   isWithin (domNode method)
+#
+#       tests, whether a node object is nested below another tag
+#
+#
+#   @in  tagName  the nodeName of an elment node
+#
+#   @return       1 iff node is nested below a element with nodeName tagName
+#                 0 otherwise
+#
+#----------------------------------------------------------------------------
+proc ::dom::domNode::isWithin { node tagName } {
+
+    while {[$node parentNode] != ""} {
+        set node [$node parentNode]
+        if {[$node nodeName] == $tagName} {
+            return 1
+        }
+    }
+    return 0
+}
+
+#----------------------------------------------------------------------------
+#   tagName (domNode method)
+#
+#       same a nodeName for element interface
+#
+#----------------------------------------------------------------------------
+proc ::dom::domNode::tagName { node } {
+
+    if {[$node nodeType] == "ELEMENT_NODE"} {
+        return [$node nodeName]
+    }
+    return -code error "NOT_SUPPORTED_ERR not an element!"
+}
+
+#----------------------------------------------------------------------------
+#   simpleTranslate (domNode method)
+#
+#       applies simple translation rules similar to Cost's simple
+#       translations to a node
+#
+#
+#   @in  output_var
+#   @in  trans_specs
+#
+#----------------------------------------------------------------------------
+proc ::dom::domNode::simpleTranslate { node output_var trans_specs } {
+
+    upvar $output_var output
+
+    if {[$node nodeType] == "TEXT_NODE"} {
+        append output [cgiQuote [$node nodeValue]]
+        return
+    }
+    set found 0
+
+    foreach {match action} $trans_specs {
+
+        if {[catch {
+            if {!$found && ([$node selectNode self::$match] != "") } {
+              set found 1
+            }
+        } err]} {
+            if {![string match "NodeSet expected for parent axis!" $err]} {
+                error $err
+            }
+        }
+        if {$found && ($action != "-")} {
+            set stop 0
+            foreach {type value} $action {
+                switch $type {
+                    prefix { append output [subst $value] }
+                    tag    { append output <$value>       }
+                    start  { append output [eval $value]  }
+                    stop   { set stop 1                   }
+                }
+            }
+            if {!$stop} {
+                foreach child [$node childNodes] {
+                    simpleTranslate  $child output $trans_specs
+                }
+            }
+            foreach {type value} $action {
+                switch $type {
+                    suffix { append output [subst $value] }
+                    end    { append output [eval $value]  }
+                    tag    { append output </$value>      }
+                }
+            }
+            return
+        }
+    }
+    foreach child [$node childNodes] {
+        simpleTranslate $child output $trans_specs
+    }
+}
+
+#----------------------------------------------------------------------------
+#   a DOM conformant 'live' childNodes
+#
+#   @return   a 'nodelist' object (it is just the normal node)
+#
+#----------------------------------------------------------------------------
+proc ::dom::domNode::childNodesLive { node } {
+
+    return $node
+}
+
+#----------------------------------------------------------------------------
+#   item method on a 'nodelist' object
+#
+#   @return   a 'nodelist' object (it is just a normal
+#
+#----------------------------------------------------------------------------
+proc ::dom::domNode::item { nodeListNode index } {
+
+    return [lindex [$nodeListNode childNodes] $index]
+}
+
+#----------------------------------------------------------------------------
+#   length method on a 'nodelist' object
+#
+#   @return   a 'nodelist' object (it is just a normal
+#
+#----------------------------------------------------------------------------
+proc ::dom::domNode::length { nodeListNode } {
+
+    return [llength [$nodeListNode childNodes]]
+}
+
+#----------------------------------------------------------------------------
+#   appendData on a 'CharacterData' object
+#
+#----------------------------------------------------------------------------
+proc ::dom::domNode::appendData { node  arg } {
+
+    set type [$node nodeType]
+    if {($type != "TEXT_NODE") && ($type != "CDATA_SECTION_NODE") &&
+        ($type != "COMMENT_NODE")
+    } {
+        return -code error "NOT_SUPPORTED_ERR: node is not a cdata node"
+    }
+    set oldValue [$node nodeValue]
+    $node nodeValue [append oldValue $arg]
+}
+
+#----------------------------------------------------------------------------
+#   deleteData on a 'CharacterData' object
+#
+#----------------------------------------------------------------------------
+proc ::dom::domNode::deleteData { node offset count } {
+
+    set type [$node nodeType]
+    if {($type != "TEXT_NODE") && ($type != "CDATA_SECTION_NODE") &&
+        ($type != "COMMENT_NODE")
+    } {
+        return -code error "NOT_SUPPORTED_ERR: node is not a cdata node"
+    }
+    incr offset -1
+    set before [string range [$node nodeValue] 0 $offset]
+    incr offset
+    incr offset $count
+    set after  [string range [$node nodeValue] $offset end]
+    $node nodeValue [append before $after]
+}
+
+#----------------------------------------------------------------------------
+#   insertData on a 'CharacterData' object
+#
+#----------------------------------------------------------------------------
+proc ::dom::domNode::insertData { node  offset arg } {
+
+    set type [$node nodeType]
+    if {($type != "TEXT_NODE") && ($type != "CDATA_SECTION_NODE") &&
+        ($type != "COMMENT_NODE")
+    } {
+        return -code error "NOT_SUPPORTED_ERR: node is not a cdata node"
+    }
+    incr offset -1
+    set before [string range [$node nodeValue] 0 $offset]
+    incr offset
+    set after  [string range [$node nodeValue] $offset end]
+    $node nodeValue [append before $arg $after]
+}
+
+#----------------------------------------------------------------------------
+#   replaceData on a 'CharacterData' object
+#
+#----------------------------------------------------------------------------
+proc ::dom::domNode::replaceData { node offset count arg } {
+
+    set type [$node nodeType]
+    if {($type != "TEXT_NODE") && ($type != "CDATA_SECTION_NODE") &&
+        ($type != "COMMENT_NODE")
+    } {
+        return -code error "NOT_SUPPORTED_ERR: node is not a cdata node"
+    }
+    incr offset -1
+    set before [string range [$node nodeValue] 0 $offset]
+    incr offset
+    incr offset $count
+    set after  [string range [$node nodeValue] $offset end]
+    $node nodeValue [append before $arg $after]
+}
+
+#----------------------------------------------------------------------------
+#   substringData on a 'CharacterData' object
+#
+#   @return   part of the node value (text)
+#
+#----------------------------------------------------------------------------
+proc ::dom::domNode::substringData { node offset count } {
+
+    set type [$node nodeType]
+    if {($type != "TEXT_NODE") && ($type != "CDATA_SECTION_NODE") &&
+        ($type != "COMMENT_NODE")
+    } {
+        return -code error "NOT_SUPPORTED_ERR: node is not a cdata node"
+    }
+    set endOffset [expr $offset + $count - 1]
+    return [string range [$node nodeValue] $offset $endOffset]
+}
+
+#----------------------------------------------------------------------------
+#   coerce2number
+#
+#----------------------------------------------------------------------------
+proc ::dom::xpathFuncHelper::coerce2number { type value } {
+    switch $type {
+        empty      { return 0 }
+        number -
+        string     { return $value }
+        attrvalues { return [lindex $value 0] }
+        nodes      { return [[lindex $value 0] selectNodes number()] }
+        attrnodes  { return [lindex $value 1] }
+    }
+}
+
+#----------------------------------------------------------------------------
+#   coerce2string
+#
+#----------------------------------------------------------------------------
+proc ::dom::xpathFuncHelper::coerce2string { type value } {
+    switch $type {
+        empty      { return "" }
+        number -
+        string     { return $value }
+        attrvalues { return [lindex $value 0] }
+        nodes      { return [[lindex $value 0] selectNodes string()] }
+        attrnodes  { return [lindex $value 1] }
+    }
+}
+
+#----------------------------------------------------------------------------
+#   function-available
+#
+#----------------------------------------------------------------------------
+proc ::dom::xpathFunc::function-available { ctxNode pos
+                                            nodeListType nodeList args} {
+
+    if {[llength $args] != 2} {
+        error "function-available(): wrong # of args!"
+    }
+    foreach { arg1Typ arg1Value } $args break
+    set str [::dom::xpathFuncHelper::coerce2string $arg1Typ $arg1Value ]
+    switch $str {
+        boolean -
+        ceiling -
+        concat -
+        contains -
+        count -
+        current -
+        document -
+        element-available -
+        false -
+        floor -
+        format-number -
+        generate-id -
+        id -
+        key -
+        last -
+        lang -
+        local-name -
+        name -
+        namespace-uri -
+        normalize-space -
+        not -
+        number -
+        position -
+        round -
+        starts-with -
+        string -
+        string-length -
+        substring -
+        substring-after -
+        substring-before -
+        sum -
+        translate -
+        true -
+        unparsed-entity-uri {
+            return [list bool true]
+        }
+        default {
+            set TclXpathFuncs [info procs ::dom::xpathFunc::*]
+            if {[lsearch -exact $TclXpathFuncs $str] != -1} {
+                return [list bool true]
+            } else {
+                return [list bool false]
+            }
+        }
+    }
+}
+
+#----------------------------------------------------------------------------
+#   element-available
+#
+#   This is not strictly correct. The XSLT namespace may be bound
+#   to another prefix (and the prefix 'xsl' may be bound to another
+#   namespace). Since the expression context isn't available at the
+#   moment at tcl coded XPath functions, this couldn't be done better
+#   than this "works in the 'normal' cases" version.
+#----------------------------------------------------------------------------
+proc ::dom::xpathFunc::element-available { ctxNode pos
+                                            nodeListType nodeList args} {
+
+    if {[llength $args] != 2} {
+        error "element-available(): wrong # of args!"
+    }
+    foreach { arg1Typ arg1Value } $args break
+    set str [::dom::xpathFuncHelper::coerce2string $arg1Typ $arg1Value ]
+    # The XSLT recommendation says: "The element-available
+    # function returns true if and only if the expanded-name
+    # is the name of an instruction." The following xsl
+    # elements are not in the category instruction.
+    # xsl:attribute-set 
+    # xsl:decimal-format 
+    # xsl:include
+    # xsl:key 
+    # xsl:namespace-alias
+    # xsl:output
+    # xsl:param
+    # xsl:strip-space
+    # xsl:preserve-space
+    # xsl:template
+    # xsl:import
+    # xsl:otherwise
+    # xsl:sort
+    # xsl:stylesheet
+    # xsl:transform
+    # xsl:with-param
+    # xsl:when
+    switch $str {
+        xsl:apply-templates -
+        xsl:apply-imports -
+        xsl:call-template -
+        xsl:element -
+        xsl:attribute -
+        xsl:text -
+        xsl:processing-instruction -
+        xsl:comment -
+        xsl:copy -
+        xsl:value-of -
+        xsl:number -
+        xsl:for-each -
+        xsl:if -
+        xsl:choose -
+        xsl:variable -
+        xsl:copy-of -
+        xsl:message -
+        xsl:fallback {
+            return [list bool true]
+        }
+        default {
+            return [list bool false]
+        }
+    }
+}
+
+#----------------------------------------------------------------------------
+#   system-property
+#
+#   This is not strictly correct. The XSLT namespace may be bound
+#   to another prefix (and the prefix 'xsl' may be bound to another
+#   namespace). Since the expression context isn't available at the
+#   moment at tcl coded XPath functions, this couldn't be done better
+#   than this "works in the 'normal' cases" version.
+#----------------------------------------------------------------------------
+proc ::dom::xpathFunc::system-property { ctxNode pos
+                                         nodeListType nodeList args } {
+
+    if {[llength $args] != 2} {
+        error "system-property(): wrong # of args!"
+    }
+    foreach { arg1Typ arg1Value } $args break
+    set str [::dom::xpathFuncHelper::coerce2string $arg1Typ $arg1Value ]
+    switch $str {
+        xsl:version {
+            return [list number 1.0]
+        }
+        xsl:vendor {
+            return [list string "Jochen Loewer (loewerj@hotmail.com), Rolf Ade (rolf@pointsman.de) et. al."]
+        }
+        xsl:vendor-url {
+            return [list string "http://www.tdom.org"]
+        }
+        default {
+            return [list string ""]
+        }
+    }
+}
+
+#----------------------------------------------------------------------------
+#   IANAEncoding2TclEncoding
+#
+#----------------------------------------------------------------------------
+
+# As of version 8.3.4 tcl supports 
+# cp860 cp861 cp862 cp863 tis-620 cp864 cp865 cp866 gb12345 cp949
+# cp950 cp869 dingbats ksc5601 macCentEuro cp874 macUkraine jis0201
+# gb2312 euc-cn euc-jp iso8859-10 macThai jis0208 iso2022-jp
+# macIceland iso2022 iso8859-13 iso8859-14 jis0212 iso8859-15 cp737
+# iso8859-16 big5 euc-kr macRomania macTurkish gb1988 iso2022-kr
+# macGreek ascii cp437 macRoman iso8859-1 iso8859-2 iso8859-3 ebcdic
+# macCroatian koi8-r iso8859-4 iso8859-5 cp1250 macCyrillic iso8859-6
+# cp1251 koi8-u macDingbats iso8859-7 cp1252 iso8859-8 cp1253
+# iso8859-9 cp1254 cp1255 cp850 cp1256 cp932 identity cp1257 cp852
+# macJapan cp1258 shiftjis utf-8 cp855 cp936 symbol cp775 unicode
+# cp857
+# 
+# Just add more mappings (and mail them to the tDOM mailing list, please).
+
+proc ::tdom::IANAEncoding2TclEncoding {IANAName} {
+    
+    # First the most widespread encodings with there
+    # preferred MIME name, to speed lookup in this
+    # usual cases. Later the official names and the
+    # aliases.
+    #
+    # For "official names for character sets that may be
+    # used in the Internet" see 
+    # http://www.iana.org/assignments/character-sets
+    # (that's the source for the encoding names below)
+    # 
+    # Matching is case-insensitive
+
+    switch [string tolower $IANAName] {
+        "us-ascii"    {return ascii}
+        "utf-8"       {return utf-8}
+        "utf-16"      {return unicode}
+        "iso-8859-1"  {return iso8859-1}
+        "iso-8859-2"  {return iso8859-2}
+        "iso-8859-3"  {return iso8859-3}
+        "iso-8859-4"  {return iso8859-4}
+        "iso-8859-5"  {return iso8859-5}
+        "iso-8859-6"  {return iso8859-6}
+        "iso-8859-7"  {return iso8859-7}
+        "iso-8859-8"  {return iso8859-8}
+        "iso-8859-9"  {return iso8859-9}
+        "iso-8859-10" {return iso8859-10}
+        "iso-8859-13" {return iso8859-13}
+        "iso-8859-14" {return iso8859-14}
+        "iso-8859-15" {return iso8859-15}
+        "iso-8859-16" {return iso8859-16}
+        "iso-2022-kr" {return iso2022-kr}
+        "euc-kr"      {return euc-kr}
+        "iso-2022-jp" {return iso2022-jp}
+        "koi8-r"      {return koi8-r}
+        "shift_jis"   {return shiftjis}
+        "euc-jp"      {return euc-jp}
+        "gb2312"      {return gb2312}
+        "big5"        {return big5}
+        "cp866"       {return cp866}
+        "cp1250"      {return cp1250}
+        "cp1253"      {return cp1253}
+        "cp1254"      {return cp1254}
+        "cp1255"      {return cp1255}
+        "cp1256"      {return cp1256}
+        "cp1257"      {return cp1257}
+
+        "windows-1251" -
+        "cp1251"      {return cp1251}
+
+        "windows-1252" -
+        "cp1252"      {return cp1252}    
+
+        "iso_8859-1:1987" -
+        "iso-ir-100" -
+        "iso_8859-1" -
+        "latin1" -
+        "l1" -
+        "ibm819" -
+        "cp819" -
+        "csisolatin1" {return iso8859-1}
+        
+        "iso_8859-2:1987" -
+        "iso-ir-101" -
+        "iso_8859-2" -
+        "iso-8859-2" -
+        "latin2" -
+        "l2" -
+        "csisolatin2" {return iso8859-2}
+
+        "iso_8859-5:1988" -
+        "iso-ir-144" -
+        "iso_8859-5" -
+        "iso-8859-5" -
+        "cyrillic" -
+        "csisolatincyrillic" {return iso8859-5}
+
+        "ms_kanji" -
+        "csshiftjis"  {return shiftjis}
+        
+        "csiso2022kr" {return iso2022-kr}
+
+        "ibm866" -
+        "csibm866"    {return cp866}
+        
+        default {
+            # There are much more encoding names out there
+            # It's only laziness, that let me stop here.
+            error "Unrecognized encoding name '$IANAName'"
+        }
+    }
+}
+
+#----------------------------------------------------------------------------
+#   xmlOpenFileWorker
+#
+#----------------------------------------------------------------------------
+proc ::tdom::xmlOpenFileWorker {filename {encodingString {}} {forSimple 0} {forRead 0}} {
+
+    # This partly (mis-)use the encoding of a channel handed to [dom
+    # parse -channel ..] as a marker: if the channel encoding is utf-8
+    # then behind the scene Tcl_Read() is used, otherwise
+    # Tcl_ReadChars(). This is used for the encodings understood (and
+    # checked) by the used expat implementation: utf-8 and utf-16 (in
+    # either byte order).
+    
+    set fd [open $filename]
+
+    if {$encodingString != {}} {
+        upvar $encodingString encString
+    }
+
+    # The autodetection of the encoding follows
+    # XML Recomendation, Appendix F
+
+    fconfigure $fd -encoding binary
+    if {![binary scan [read $fd 4] "H8" firstBytes]} {
+        # very short (< 4 Bytes) file
+        seek $fd 0 start
+        set encString UTF-8
+        return $fd
+    }
+    
+    # First check for BOM
+    switch [string range $firstBytes 0 3] {
+        "feff" {
+            # feff: UTF-16, big-endian BOM
+            if {$forSimple || $forRead} {
+                error "UTF-16be is not supported"
+            }
+            seek $fd 0 start
+            set encString UTF-16be
+            fconfigure $fd -encoding utf-8
+            return $fd
+        }
+        "fffe" {
+            # ffef: UTF-16, little-endian BOM
+            set encString UTF-16le          
+            if {$forSimple || $forRead} {
+                seek $fd 2 start
+                fconfigure $fd -encoding unicode
+            } else {
+                seek $fd 0 start
+                fconfigure $fd -encoding utf-8
+            }
+            return $fd
+        }
+    }
+    
+    
+    # If the entity has a XML Declaration, the first four characters
+    # must be "<?xm".
+    switch $firstBytes {
+        "3c3f786d" {
+            # UTF-8, ISO 646, ASCII, some part of ISO 8859, Shift-JIS,
+            # EUC, or any other 7-bit, 8-bit, or mixed-width encoding which 
+            # ensures that the characters of ASCII have their normal positions,
+            # width and values; the actual encoding declaration must be read to
+            # detect which of these applies, but since all of these encodings
+            # use the same bit patterns for the ASCII characters, the encoding
+            # declaration itself be read reliably.
+
+            # First 300 bytes should be enough for a XML Declaration
+            # This is of course not 100 percent bullet-proof.
+            set head [read $fd 296]
+
+            # Try to find the end of the XML Declaration
+            set closeIndex [string first ">" $head]
+            if {$closeIndex == -1} {
+                error "Weird XML data or not XML data at all"
+            }
+
+            seek $fd 0 start
+            set xmlDeclaration [read $fd [expr {$closeIndex + 5}]]
+            # extract the encoding information
+            set pattern {^[^>]+encoding=[\x20\x9\xd\xa]*["']([^ "']+)['"]}
+            # emacs: "
+            if {![regexp $pattern $head - encStr]} {
+                # Probably something like <?xml version="1.0"?>. 
+                # Without encoding declaration this must be UTF-8
+                set encoding utf-8
+                set encString UTF-8
+            } else {
+                set encoding [IANAEncoding2TclEncoding $encStr]
+                set encString $encStr
+            }
+        }
+        "0000003c" -
+        "0000003c" -
+        "3c000000" -
+        "00003c00" {
+            # UCS-4
+            error "UCS-4 not supported"
+        }
+            "003c003f" {
+            # UTF-16, big-endian, no BOM
+            if {$forSimple} {
+                error "UTF-16be is not supported by the simple parser"
+            }
+            seek $fd 0 start
+            set encoding utf-8
+            set encString UTF-16be
+        }
+        "3c003f00" {
+            # UTF-16, little-endian, no BOM
+            if {$forSimple} {
+                seek $fd 2 start
+                set encoding unicode
+            } else {
+                seek $fd 0 start
+                set encoding utf-8
+            }
+            set encString UTF-16le          
+        }
+        "4c6fa794" {
+            # EBCDIC in some flavor
+            error "EBCDIC not supported"
+        }
+        default {
+            # UTF-8 without an encoding declaration
+            seek $fd 0 start
+            set encoding utf-8
+            set encString "UTF-8"
+        }
+    }
+    fconfigure $fd -encoding $encoding
+    return $fd
+}
+
+#----------------------------------------------------------------------------
+#   xmlOpenFile
+#
+#----------------------------------------------------------------------------
+proc ::tdom::xmlOpenFile {filename {encodingString {}}} {
+
+    if {$encodingString != {}} {
+        upvar $encodingString encString
+    }
+    
+    set fd [xmlOpenFileWorker $filename encString]
+    return $fd
+}
+
+#----------------------------------------------------------------------------
+#   xmlReadFile
+#
+#----------------------------------------------------------------------------
+proc ::tdom::xmlReadFile {filename {encodingString {}}} {
+
+    if {$encodingString != {}} {
+        upvar $encodingString encString
+    }
+    
+    set fd [xmlOpenFileWorker $filename encString 0 1]
+    set data [read $fd [file size $filename]]
+    close $fd 
+    return $data
+}
+
+#----------------------------------------------------------------------------
+#   xmlReadFileForSimple
+#
+#----------------------------------------------------------------------------
+proc ::tdom::xmlReadFileForSimple {filename {encodingString {}}} {
+
+    if {$encodingString != {}} {
+        upvar $encodingString encString
+    }
+    
+    set fd [xmlOpenFileWorker $filename encString 1]
+    set data [read $fd [file size $filename]]
+    close $fd 
+    return $data
+}
+
+#----------------------------------------------------------------------------
+#   extRefHandler
+#   
+#   A very simple external entity resolver, included for convenience.
+#   Depends on the tcllib package uri and resolves only file URLs. 
+#
+#----------------------------------------------------------------------------
+
+if {![catch {package require uri}]} {
+    proc ::tdom::extRefHandler {base systemId publicId} {
+        variable extRefHandlerDebug
+        variable useForeignDTD
+
+        if {$extRefHandlerDebug} {
+            puts stderr "::tdom::extRefHandler called with:"
+            puts stderr "\tbase:     '$base'"
+            puts stderr "\tsystemId: '$systemId'"
+            puts stderr "\tpublicId: '$publicId'"
+        }
+        if {$systemId == ""} {
+            if {$useForeignDTD != ""} {
+                set systemId $useForeignDTD
+            } else {
+                error "::tdom::useForeignDTD does\
+                        not point to the foreign DTD"
+            }
+        }
+        set absolutURI [uri::resolve $base $systemId]
+        array set uriData [uri::split $absolutURI]
+        switch $uriData(scheme) {
+            file {
+                if {$::tcl_platform(platform) eq "windows"} {
+                    # Strip leading / for drive based paths
+                    if {[string match /?:* $uriData(path)]} {
+                        set uriData(path) [string range $uriData(path) 1 end]
+                    }
+                }
+                # FIXME - path should be URL-decoded
+                return [list string $absolutURI [xmlReadFile $uriData(path)]]
+            }
+            default {
+                error "can only handle file URI's"
+            }
+        }
+    }
+}
+
+#----------------------------------------------------------------------------
+#   baseURL
+#   
+#   A simple convenience proc which returns an absolute URL for a given
+#   filename.
+#
+#----------------------------------------------------------------------------
+proc ::tdom::baseURL {path} {
+    # FIXME - path components need to be URL-encoded
+
+    # Note [file join] will return path as is if it is already absolute.
+    # Also on Windows, it will change \ -> /. This is necessary because
+    # file URIs must always use /, never \.
+    set path [file join [pwd] $path]
+
+    if {$::tcl_platform(platform) ne "windows"} {
+        return "file://$path"
+    } else {
+        if {[string match //* $path]} {
+            # UNC path
+            return "file:$path"
+        } else {
+            # Drive based path
+            return "file:///$path"
+        }
+    }
+}
+
+namespace eval ::tDOM { 
+    variable extRefHandlerDebug 0
+    variable useForeignDTD ""
+
+    namespace export xmlOpenFile xmlReadFile xmlReadFileForSimple \
+        extRefHandler baseURL
+}
+
+foreach ::tdom::cmd {
+    xmlOpenFile
+    xmlReadFile
+    xmlReadFileForSimple
+    extRefHandler
+    baseURL
+    IANAEncoding2TclEncoding
+} {
+    interp alias {} tDOM::$::tdom::cmd {} tdom::$::tdom::cmd
+}
+
+# EOF
diff --git a/src/vfs/punk86.vfs/lib_tcl8/tdom0.9.3/tdom093.dll b/src/vfs/punk86.vfs/lib_tcl8/tdom0.9.3/tdom093.dll
new file mode 100644
index 00000000..85933e5f
Binary files /dev/null and b/src/vfs/punk86.vfs/lib_tcl8/tdom0.9.3/tdom093.dll differ
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/LICENSE b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/LICENSE
new file mode 100644
index 00000000..fcfc79f8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2003-2012, Ashok P. Nadkarni
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.  
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- The name of the copyright holder and any other contributors may not
+be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/account.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/account.tcl
new file mode 100644
index 00000000..2b87b35d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/account.tcl
@@ -0,0 +1,1160 @@
+#
+# Copyright (c) 2009-2015, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+package require twapi_security
+
+namespace eval twapi {
+    record USER_INFO_0 {-name}
+    record USER_INFO_1 [concat [USER_INFO_0] {
+        -password -password_age -priv -home_dir -comment -flags -script_path
+    }]
+    record USER_INFO_2 [concat [USER_INFO_1] {
+        -auth_flags -full_name -usr_comment -parms 
+        -workstations -last_logon -last_logoff -acct_expires -max_storage
+        -units_per_week -logon_hours -bad_pw_count -num_logons
+        -logon_server -country_code -code_page
+    }]
+    record USER_INFO_3 [concat [USER_INFO_2] {
+        -user_id -primary_group_id -profile -home_dir_drive -password_expired
+    }]
+    record USER_INFO_4 [concat [USER_INFO_2] {
+        -sid -primary_group_id -profile -home_dir_drive -password_expired
+    }]
+
+    record GROUP_INFO_0 {-name}
+    record GROUP_INFO_1 {-name -comment}
+    record GROUP_INFO_2 {-name -comment -group_id -attributes}
+    record GROUP_INFO_3 {-name -comment -sid -attributes}
+
+    record NetEnumResult {moredata hresume totalentries entries}
+
+}
+
+# Add a new user account
+proc twapi::new_user {username args} {
+    array set opts [parseargs args [list \
+                                        system.arg \
+                                        password.arg \
+                                        comment.arg \
+                                        [list priv.arg "user" [array names twapi::priv_level_map]] \
+                                        home_dir.arg \
+                                        script_path.arg \
+                                       ] \
+                        -nulldefault]
+
+    if {$opts(priv) ne "user"} {
+        error "Option -priv is deprecated and values other than 'user' are not allowed"
+    }
+
+    # 1 -> priv level 'user'. NetUserAdd mandates this as only allowed value
+    NetUserAdd $opts(system) $username $opts(password) 1 \
+        $opts(home_dir) $opts(comment) 0 $opts(script_path)
+
+
+    # Backward compatibility - add to 'Users' local group
+    # but only if -system is local
+    if {$opts(system) eq "" ||
+        ([info exists ::env(COMPUTERNAME)] &&
+         [string equal -nocase $opts(system) $::env(COMPUTERNAME)])} {
+        trap {
+            _set_user_priv_level $username $opts(priv) -system $opts(system)
+        } onerror {} {
+            # Remove the previously created user account
+            catch {delete_user $username -system $opts(system)}
+            rethrow
+        }
+    }
+}
+
+
+# Delete a user account
+proc twapi::delete_user {username args} {
+    array set opts [parseargs args {system.arg} -nulldefault]
+
+    # Remove the user from the LSA rights database.
+    _delete_rights $username $opts(system)
+
+    NetUserDel $opts(system) $username
+}
+
+
+# Define various functions to set various user account fields
+foreach twapi::_field_ {
+    {name  0}
+    {password  1003}
+    {home_dir  1006}
+    {comment  1007}
+    {script_path  1009}
+    {full_name  1011}
+    {country_code  1024}
+    {profile  1052}
+    {home_dir_drive  1053}
+} {
+    proc twapi::set_user_[lindex $::twapi::_field_ 0] {username fieldval args} "
+        array set opts \[parseargs args {
+            system.arg
+        } -nulldefault \]
+        Twapi_NetUserSetInfo [lindex $::twapi::_field_ 1] \$opts(system) \$username \$fieldval"
+}
+unset twapi::_field_
+
+# Set account expiry time
+proc twapi::set_user_expiration {username time args} {
+    array set opts [parseargs args {system.arg} -nulldefault]
+
+    if {![string is integer -strict $time]} {
+        if {[string equal $time "never"]} {
+            set time -1
+        } else {
+            set time [clock scan $time]
+        }
+    }
+    Twapi_NetUserSetInfo 1017 $opts(system) $username $time
+}
+
+# Unlock a user account
+proc twapi::unlock_user {username args} {
+    # UF_LOCKOUT -> 0x10
+    _change_user_info_flags $username 0x10 0 {*}$args
+}
+
+# Enable a user account
+proc twapi::enable_user {username args} {
+    # UF_ACCOUNTDISABLE -> 0x2
+    _change_user_info_flags $username 0x2 0 {*}$args
+}
+
+# Disable a user account
+proc twapi::disable_user {username args} {
+    # UF_ACCOUNTDISABLE -> 0x2
+    _change_user_info_flags $username 0x2 0x2 {*}$args
+}
+
+
+# Return the specified fields for a user account
+proc twapi::get_user_account_info {account args} {
+    # Define each option, the corresponding field, and the 
+    # information level at which it is returned
+    array set fields {
+        comment 1
+        password_expired 4
+        full_name 2
+        parms 2
+        units_per_week 2
+        primary_group_id 4
+        flags 1
+        logon_server 2
+        country_code 2
+        home_dir 1
+        password_age 1
+        home_dir_drive 4
+        num_logons 2
+        acct_expires 2
+        last_logon 2
+        usr_comment 2
+        bad_pw_count 2
+        code_page 2
+        logon_hours 2
+        workstations 2
+        last_logoff 2
+        name 0
+        script_path 1
+        profile 4
+        max_storage 2
+    }
+    # Left out - auth_flags 2
+    # Left out (always returned as NULL) - password {usri3_password 1}
+    # Note sid is available at level 4 as well but don't want to set
+    # level 4 just for that since we can get it by other means. Hence
+    # not listed above
+
+    array set opts [parseargs args \
+                        [concat [array names fields] sid \
+                             internet_identity \
+                             status type password_attrs \
+                             [list local_groups global_groups system.arg all]] \
+                        -nulldefault]
+
+    if {$opts(all)} {
+        set level 4
+        set opts(local_groups) 1
+        set opts(global_groups) 1
+    } else {
+        # Based on specified fields, figure out what level info to ask for
+        set level -1
+        foreach {opt optval} [array get opts] {
+            if {[info exists fields($opt)] &&
+                $optval &&
+                $fields($opt) > $level
+            } {
+                set level $fields($opt)
+            }
+        }                
+        if {$opts(status) || $opts(type) || $opts(password_attrs)} {
+            # These fields are based on the flags field
+            if {$level < 1} {
+                set level 1
+            }
+        }
+    }
+    
+    array set result [list ]
+
+    if {$level > -1} {
+        set rawdata [NetUserGetInfo $opts(system) $account $level]
+        array set data [USER_INFO_$level $rawdata]
+
+        # Extract the requested data
+        foreach opt [array names fields] {
+            if {$opts(all) || $opts($opt)} {
+                set result(-$opt) $data(-$opt)
+            }
+        }
+        if {$level == 4 && ($opts(all) || $opts(sid))} {
+            set result(-sid) $data(-sid)
+        }
+
+        # Map internal values to more friendly formats
+        if {$opts(all) || $opts(status) || $opts(type) || $opts(password_attrs)} {
+            array set result [_map_userinfo_flags $data(-flags)]
+            if {! $opts(all)} {
+                if {! $opts(status)} {unset result(-status)}
+                if {! $opts(type)} {unset result(-type)}
+                if {! $opts(password_attrs)} {unset result(-password_attrs)}
+            }
+        }
+
+        if {[info exists result(-logon_hours)]} {
+            binary scan $result(-logon_hours) b* result(-logon_hours)
+        }
+
+        foreach time_field {-acct_expires -last_logon -last_logoff} {
+            if {[info exists result($time_field)]} {
+                if {$result($time_field) == -1 || $result($time_field) == 4294967295} {
+                    set result($time_field) "never"
+                } elseif {$result($time_field) == 0} {
+                    set result($time_field) "unknown"
+                }
+            }
+        }
+    }
+
+    if {$opts(all) || $opts(internet_identity)} {
+        set result(-internet_identity) {}
+        if {[min_os_version 6 2]} {
+            set inet_ident [NetUserGetInfo $opts(system) $account 24]
+            if {[llength $inet_ident]} {
+                set result(-internet_identity) [twine {
+                    internet_provider_name internet_principal_name sid
+                } [lrange $inet_ident 1 end]]
+            }
+        }
+    }
+
+    # The Net* calls always return structures as lists even when the struct
+    # contains only one field so we need to lpick to extract the field
+
+    if {$opts(local_groups)} {
+        set result(-local_groups) [lpick [NetEnumResult entries [NetUserGetLocalGroups $opts(system) $account 0 0]] 0]
+    }
+
+    if {$opts(global_groups)} {
+        set result(-global_groups) [lpick [NetEnumResult entries [NetUserGetGroups $opts(system) $account 0]] 0]
+    }
+
+    if {$opts(sid)  && ! [info exists result(-sid)]} {
+        set result(-sid) [lookup_account_name $account -system $opts(system)]
+    }
+
+    return [array get result]
+}
+
+proc twapi::get_user_global_groups {account args} {
+    parseargs args {
+        system.arg
+        denyonly
+        all
+    } -nulldefault -maxleftover 0 -setvars
+
+    set groups {}
+    foreach elem [NetEnumResult entries [NetUserGetGroups $system [map_account_to_name $account -system $system] 1]] {
+        # 0x10 -> SE_GROUP_USE_FOR_DENY_ONLY
+        set marked_denyonly [expr {[lindex $elem 1] & 0x10}]
+        if {$all || ($denyonly && $marked_denyonly) || !($denyonly || $marked_denyonly)} {
+            lappend groups [lindex $elem 0]
+        }
+    }
+    return $groups
+}
+
+proc twapi::get_user_local_groups {account args} {
+    parseargs args {
+        system.arg
+        {recurse.bool 0}
+    } -nulldefault -maxleftover 0 -setvars
+
+    # The Net* calls always return structures as lists even when the struct
+    # contains only one field so we need to lpick to extract the field
+    return [lpick [NetEnumResult entries [NetUserGetLocalGroups $system [map_account_to_name $account -system $system] 0 $recurse]] 0]
+}
+
+proc twapi::get_user_local_groups_recursive {account args} {
+    return [get_user_local_groups $account {*}$args -recurse 1]
+}
+
+
+# Set the specified fields for a user account
+proc twapi::set_user_account_info {account args} {
+
+    # Define each option, the corresponding field, and the 
+    # information level at which it is returned
+    array set opts [parseargs args {
+        {system.arg ""}
+        comment.arg
+        full_name.arg
+        country_code.arg
+        home_dir.arg
+        home_dir.arg
+        acct_expires.arg
+        name.arg
+        script_path.arg
+        profile.arg
+    }]
+
+    # TBD - rewrite this to be atomic
+
+    if {[info exists opts(comment)]} {
+        set_user_comment $account $opts(comment) -system $opts(system)
+    }
+
+    if {[info exists opts(full_name)]} {
+        set_user_full_name $account $opts(full_name) -system $opts(system)
+    }
+
+    if {[info exists opts(country_code)]} {
+        set_user_country_code $account $opts(country_code) -system $opts(system)
+    }
+
+    if {[info exists opts(home_dir)]} {
+        set_user_home_dir $account $opts(home_dir) -system $opts(system)
+    }
+
+    if {[info exists opts(home_dir_drive)]} {
+        set_user_home_dir_drive $account $opts(home_dir_drive) -system $opts(system)
+    }
+
+    if {[info exists opts(acct_expires)]} {
+        set_user_expiration $account $opts(acct_expires) -system $opts(system)
+    }
+
+    if {[info exists opts(name)]} {
+        set_user_name $account $opts(name) -system $opts(system)
+    }
+
+    if {[info exists opts(script_path)]} {
+        set_user_script_path $account $opts(script_path) -system $opts(system)
+    }
+
+    if {[info exists opts(profile)]} {
+        set_user_profile $account $opts(profile) -system $opts(system)
+    }
+}
+                    
+
+proc twapi::get_global_group_info {grpname args} {
+    array set opts [parseargs args {
+        {system.arg ""}
+        comment
+        name
+        members
+        sid
+        attributes
+        all
+    } -maxleftover 0]
+
+    set result {}
+    if {[expr {$opts(comment) || $opts(name) || $opts(sid) || $opts(attributes) || $opts(all)}]} {
+        # 3 -> GROUP_INFO level 3
+        lassign [NetGroupGetInfo $opts(system) $grpname 3] name comment sid attributes
+        if {$opts(all) || $opts(sid)} {
+            lappend result -sid $sid
+        }
+        if {$opts(all) || $opts(name)} {
+            lappend result -name $name
+        }
+        if {$opts(all) || $opts(comment)} {
+            lappend result -comment $comment
+        }
+        if {$opts(all) || $opts(attributes)} {
+            lappend result -attributes [map_token_group_attr $attributes]
+        }
+    }
+
+    if {$opts(all) || $opts(members)} {
+        lappend result -members [get_global_group_members $grpname -system $opts(system)]
+    }
+
+    return $result
+}
+
+# Get info about a local or global group
+proc twapi::get_local_group_info {name args} {
+    array set opts [parseargs args {
+        {system.arg ""}
+        comment
+        name
+        members
+        sid
+        all
+    } -maxleftover 0]
+
+    set result [list ]
+    if {$opts(all) || $opts(sid)} {
+        lappend result -sid [lookup_account_name $name -system $opts(system)]
+    }
+    if {$opts(all) || $opts(comment) || $opts(name)} {
+        lassign [NetLocalGroupGetInfo $opts(system) $name 1] name comment
+        if {$opts(all) || $opts(name)} {
+            lappend result -name $name
+        }
+        if {$opts(all) || $opts(comment)} {
+            lappend result -comment $comment
+        }
+    }
+    if {$opts(all) || $opts(members)} {
+        lappend result -members [get_local_group_members $name -system $opts(system)]
+    }
+    return $result
+}
+
+# Get list of users on a system
+proc twapi::get_users {args} {
+    parseargs args {
+        level.int
+    } -setvars -ignoreunknown
+
+    # TBD -allow user to specify filter
+    lappend args -filter 0
+    if {[info exists level]} {
+        lappend args -level $level -fields [USER_INFO_$level]
+    }
+    return [_net_enum_helper NetUserEnum $args]
+}
+
+proc twapi::get_global_groups {args} {
+    parseargs args {
+        level.int
+    } -setvars -ignoreunknown
+
+    # TBD - level 3 returns an ERROR_INVALID_LEVEL even though
+    # MSDN says its valid for NetGroupEnum
+
+    if {[info exists level]} {
+        lappend args -level $level -fields [GROUP_INFO_$level]
+    }
+    return [_net_enum_helper NetGroupEnum $args]
+}
+
+proc twapi::get_local_groups {args} {
+    parseargs args {
+        level.int
+    } -setvars -ignoreunknown
+
+    if {[info exists level]} {
+        lappend args -level $level -fields [dict get {0 {-name} 1 {-name -comment}} $level]
+    }
+    return [_net_enum_helper NetLocalGroupEnum $args]
+}
+
+# Create a new global group
+proc twapi::new_global_group {grpname args} {
+    array set opts [parseargs args {
+        system.arg
+        comment.arg
+    } -nulldefault]
+
+    NetGroupAdd $opts(system) $grpname $opts(comment)
+}
+
+# Create a new local group
+proc twapi::new_local_group {grpname args} {
+    array set opts [parseargs args {
+        system.arg
+        comment.arg
+    } -nulldefault]
+
+    NetLocalGroupAdd $opts(system) $grpname $opts(comment)
+}
+
+
+# Delete a global group
+proc twapi::delete_global_group {grpname args} {
+    array set opts [parseargs args {system.arg} -nulldefault]
+
+    # Remove the group from the LSA rights database.
+    _delete_rights $grpname $opts(system)
+
+    NetGroupDel $opts(system) $grpname
+}
+
+# Delete a local group
+proc twapi::delete_local_group {grpname args} {
+    array set opts [parseargs args {system.arg} -nulldefault]
+
+    # Remove the group from the LSA rights database.
+    _delete_rights $grpname $opts(system)
+
+    NetLocalGroupDel $opts(system) $grpname
+}
+
+
+# Enumerate members of a global group
+proc twapi::get_global_group_members {grpname args} {
+    parseargs args {
+        level.int
+    } -setvars -ignoreunknown
+
+    if {[info exists level]} {
+        lappend args -level $level -fields [dict! {0 {-name} 1 {-name -attributes}} $level]
+    }
+
+    lappend args -preargs [list $grpname] -namelevel 1
+    return [_net_enum_helper NetGroupGetUsers $args]
+}
+
+# Enumerate members of a local group
+proc twapi::get_local_group_members {grpname args} {
+    parseargs args {
+        level.int
+    } -setvars -ignoreunknown
+
+    if {[info exists level]} {
+        lappend args -level $level -fields [dict! {0 {-sid} 1 {-sid -sidusage -name} 2 {-sid -sidusage -domainandname} 3 {-domainandname}} $level]
+    }
+
+    lappend args -preargs [list $grpname] -namelevel 1 -namefield 2
+    return [_net_enum_helper NetLocalGroupGetMembers $args]
+}
+
+# Add a user to a global group
+proc twapi::add_user_to_global_group {grpname username args} {
+    array set opts [parseargs args {system.arg} -nulldefault]
+
+    # No error if already member of the group
+    trap {
+        NetGroupAddUser $opts(system) $grpname $username
+    } onerror {TWAPI_WIN32 1320} {
+        # Ignore
+    }
+}
+
+
+# Remove a user from a global group
+proc twapi::remove_user_from_global_group {grpname username args} {
+    array set opts [parseargs args {system.arg} -nulldefault]
+
+    trap {
+        NetGroupDelUser $opts(system) $grpname $username
+    } onerror {TWAPI_WIN32 1321} {
+        # Was not in group - ignore
+    }
+}
+
+
+# Add a user to a local group
+proc twapi::add_member_to_local_group {grpname username args} {
+    array set opts [parseargs args {
+        system.arg
+        {type.arg name}
+    } -nulldefault]
+
+    # No error if already member of the group
+    trap {
+        Twapi_NetLocalGroupMembers 0 $opts(system) $grpname [expr {$opts(type) eq "sid" ? 0 : 3}] [list $username]
+    } onerror {TWAPI_WIN32 1378} {
+        # Ignore
+    }
+}
+
+proc twapi::add_members_to_local_group {grpname accts args} {
+    array set opts [parseargs args {
+        system.arg
+        {type.arg name}
+    } -nulldefault]
+
+    Twapi_NetLocalGroupMembers 0 $opts(system) $grpname [expr {$opts(type) eq "sid" ? 0 : 3}] $accts
+}
+
+
+# Remove a user from a local group
+proc twapi::remove_member_from_local_group {grpname username args} {
+    array set opts [parseargs args {
+        system.arg
+        {type.arg name}
+    } -nulldefault]
+
+    trap {
+        Twapi_NetLocalGroupMembers 1 $opts(system) $grpname [expr {$opts(type) eq "sid" ? 0 : 3}] [list $username]
+    } onerror {TWAPI_WIN32 1377} {
+        # Was not in group - ignore
+    }
+}
+
+proc twapi::remove_members_from_local_group {grpname accts args} {
+    array set opts [parseargs args {
+        system.arg
+        {type.arg name}
+    } -nulldefault]
+
+    Twapi_NetLocalGroupMembers 1 $opts(system) $grpname [expr {$opts(type) eq "sid" ? 0 : 3}] $accts
+}
+
+
+# Get rights for an account
+proc twapi::get_account_rights {account args} {
+    array set opts [parseargs args {
+        {system.arg ""}
+    } -maxleftover 0]
+
+    set sid [map_account_to_sid $account -system $opts(system)]
+
+    trap {
+        set lsah [get_lsa_policy_handle -system $opts(system) -access policy_lookup_names]
+        return [Twapi_LsaEnumerateAccountRights $lsah $sid]
+    } onerror {TWAPI_WIN32 2} {
+        # No specific rights for this account
+        return [list ]
+    } finally {
+        if {[info exists lsah]} {
+            close_lsa_policy_handle $lsah
+        }
+    }
+}
+
+# Get accounts having a specific right
+proc twapi::find_accounts_with_right {right args} {
+    array set opts [parseargs args {
+        {system.arg ""}
+        name
+    } -maxleftover 0]
+
+    trap {
+        set lsah [get_lsa_policy_handle \
+                      -system $opts(system) \
+                      -access {
+                          policy_lookup_names
+                          policy_view_local_information
+                      }]
+        set accounts [list ]
+        foreach sid [Twapi_LsaEnumerateAccountsWithUserRight $lsah $right] {
+            if {$opts(name)} {
+                if {[catch {lappend accounts [lookup_account_sid $sid -system $opts(system)]}]} {
+                    # No mapping for SID - can happen if account has been
+                    # deleted but LSA policy not updated accordingly
+                    lappend accounts $sid
+                }
+            } else {
+                lappend accounts $sid
+            }
+        }
+        return $accounts
+    } onerror {TWAPI_WIN32 259} {
+        # No accounts have this right
+        return [list ]
+    } finally {
+        if {[info exists lsah]} {
+            close_lsa_policy_handle $lsah
+        }
+    }
+
+}
+
+# Add/remove rights to an account
+proc twapi::_modify_account_rights {operation account rights args} {
+    set switches {
+        system.arg
+        handle.arg
+    }    
+
+    switch -exact -- $operation {
+        add {
+            # Nothing to do
+        }
+        remove {
+            lappend switches all
+        }
+        default {
+            error "Invalid operation '$operation' specified"
+        }
+    }
+
+    array set opts [parseargs args $switches -maxleftover 0]
+
+    if {[info exists opts(system)] && [info exists opts(handle)]} {
+        error "Options -system and -handle may not be specified together"
+    }
+
+    if {[info exists opts(handle)]} {
+        set lsah $opts(handle)
+        set sid $account
+    } else {
+        if {![info exists opts(system)]} {
+            set opts(system) ""
+        }
+
+        set sid [map_account_to_sid $account -system $opts(system)]
+        # We need to open a policy handle ourselves. First try to open
+        # with max privileges in case the account needs to be created
+        # and then retry with lower privileges if that fails
+        catch {
+            set lsah [get_lsa_policy_handle \
+                          -system $opts(system) \
+                          -access {
+                              policy_lookup_names
+                              policy_create_account
+                          }]
+        }
+        if {![info exists lsah]} {
+            set lsah [get_lsa_policy_handle \
+                          -system $opts(system) \
+                          -access policy_lookup_names]
+        }
+    }
+
+    trap {
+        if {$operation == "add"} {
+            LsaAddAccountRights $lsah $sid $rights
+        } else {
+            LsaRemoveAccountRights $lsah $sid $opts(all) $rights
+        }
+    } finally {
+        # Close the handle if we opened it
+        if {! [info exists opts(handle)]} {
+            close_lsa_policy_handle $lsah
+        }
+    }
+}
+
+interp alias {} twapi::add_account_rights {} twapi::_modify_account_rights add
+interp alias {} twapi::remove_account_rights {} twapi::_modify_account_rights remove
+
+# Return list of logon sesionss
+proc twapi::find_logon_sessions {args} {
+    array set opts [parseargs args {
+        user.arg
+        type.arg
+        tssession.arg
+    } -maxleftover 0]
+
+    set luids [LsaEnumerateLogonSessions]
+    if {! ([info exists opts(user)] || [info exists opts(type)] ||
+           [info exists opts(tssession)])} {
+        return $luids
+    }
+
+
+    # Need to get the data for each session to see if it matches
+    set result [list ]
+    if {[info exists opts(user)]} {
+        set sid [map_account_to_sid $opts(user)]
+    }
+    if {[info exists opts(type)]} {
+        set logontypes [list ]
+        foreach logontype $opts(type) {
+            lappend logontypes [_logon_session_type_code $logontype]
+        }
+    }
+
+    foreach luid $luids {
+        trap {
+            unset -nocomplain session
+            array set session [LsaGetLogonSessionData $luid]
+
+            # For the local system account, no data is returned on some
+            # platforms
+            if {[array size session] == 0} {
+                set session(Sid) S-1-5-18; # SYSTEM
+                set session(Session) 0
+                set session(LogonType) 0
+            }
+            if {[info exists opts(user)] && $session(Sid) ne $sid} {
+                continue;               # User id does not match
+            }
+
+            if {[info exists opts(type)] && [lsearch -exact $logontypes $session(LogonType)] < 0} {
+                continue;               # Type does not match
+            }
+
+            if {[info exists opts(tssession)] && $session(Session) != $opts(tssession)} {
+                continue;               # Term server session does not match
+            }
+
+            lappend result $luid
+
+        } onerror {TWAPI_WIN32 1312} {
+            # Session no longer exists. Just skip
+            continue
+        }
+    }
+
+    return $result
+}
+
+
+# Return data for a logon session
+proc twapi::get_logon_session_info {luid args} {
+    array set opts [parseargs args {
+        all
+        authpackage
+        dnsdomain
+        logondomain
+        logonid
+        logonserver
+        logontime
+        type
+        usersid
+        user
+        tssession
+        userprincipal
+    } -maxleftover 0]
+
+    array set session [LsaGetLogonSessionData $luid]
+
+    # Some fields may be missing on Win2K
+    foreach fld {LogonServer DnsDomainName Upn} {
+        if {![info exists session($fld)]} {
+            set session($fld) ""
+        }
+    }
+
+    array set result [list ]
+    foreach {opt index} {
+        authpackage AuthenticationPackage
+        dnsdomain   DnsDomainName
+        logondomain LogonDomain
+        logonid     LogonId
+        logonserver LogonServer
+        logontime   LogonTime
+        type        LogonType
+        usersid         Sid
+        user        UserName
+        tssession   Session
+        userprincipal Upn
+    } {
+        if {$opts(all) || $opts($opt)} {
+            set result(-$opt) $session($index)
+        }
+    }
+
+    if {[info exists result(-type)]} {
+        set result(-type) [_logon_session_type_symbol $result(-type)]
+    }
+
+    return [array get result]
+}
+
+
+
+
+# Set/reset the given bits in the usri3_flags field for a user account
+# mask indicates the mask of bits to set. values indicates the values
+# of those bits
+proc twapi::_change_user_info_flags {username mask values args} {
+    array set opts [parseargs args {
+        system.arg
+    } -nulldefault -maxleftover 0]
+
+    # Get current flags
+    set flags [USER_INFO_1 -flags [NetUserGetInfo $opts(system) $username 1]]
+
+    # Turn off mask bits and write flags back
+    set flags [expr {$flags & (~ $mask)}]
+    # Set the specified bits
+    set flags [expr {$flags | ($values & $mask)}]
+
+    # Write new flags back
+    Twapi_NetUserSetInfo 1008 $opts(system) $username $flags
+}
+
+# Returns the logon session type value for a symbol
+twapi::proc* twapi::_logon_session_type_code {type} {
+    variable _logon_session_type_map
+    # Variable that maps logon session type codes to integer values
+    # Position of each symbol gives its corresponding type value
+    # See ntsecapi.h for definitions
+    set _logon_session_type_map {
+        0
+        1
+        interactive
+        network
+        batch
+        service
+        proxy
+        unlockworkstation
+        networkclear
+        newcredentials
+        remoteinteractive
+        cachedinteractive
+        cachedremoteinteractive
+        cachedunlockworkstation
+    }
+} {
+    variable _logon_session_type_map
+
+    # Type may be an integer or a token
+    set code [lsearch -exact $_logon_session_type_map $type]
+    if {$code >= 0} {
+        return $code
+    }
+
+    if {![string is integer -strict $type]} {
+        badargs! "Invalid logon session type '$type' specified" 3
+    }
+    return $type
+}
+
+# Returns the logon session type symbol for an integer value
+proc twapi::_logon_session_type_symbol {code} {
+    variable _logon_session_type_map
+    _logon_session_type_code interactive; # Just to init _logon_session_type_map
+    set symbol [lindex $_logon_session_type_map $code]
+    if {$symbol eq ""} {
+        return $code
+    } else {
+        return $symbol
+    }
+}
+
+proc twapi::_set_user_priv_level {username priv_level args} {
+
+    array set opts [parseargs args {system.arg} -nulldefault]
+
+    if {0} {
+        # FOr some reason NetUserSetInfo cannot change priv level
+        # Tried it separately with a simple C program. So this code
+        # is commented out and we use group membership to achieve
+        # the desired result
+        # Note: - latest MSDN confirms above
+        if {![info exists twapi::priv_level_map($priv_level)]} {
+            error "Invalid privilege level value '$priv_level' specified. Must be one of [join [array names twapi::priv_level_map] ,]"
+        }
+        set priv $twapi::priv_level_map($priv_level)
+
+        Twapi_NetUserSetInfo_priv $opts(system) $username $priv
+    } else {
+        # Don't hardcode group names - reverse map SID's instead for 
+        # non-English systems. Also note that since
+        # we might be lowering privilege level, we have to also
+        # remove from higher privileged groups
+
+        switch -exact -- $priv_level {
+            guest {
+                # administrators users
+                set outgroups {S-1-5-32-544 S-1-5-32-545}
+                # guests
+                set ingroup S-1-5-32-546
+            }
+            user  {
+                # administrators
+                set outgroups {S-1-5-32-544}
+                # users
+                set ingroup S-1-5-32-545
+            }
+            admin {
+                set outgroups {}
+                set ingroup S-1-5-32-544
+            }
+            default {error "Invalid privilege level '$priv_level'. Must be one of 'guest', 'user' or 'admin'"}
+        }
+        # Remove from higher priv groups
+        foreach outgroup $outgroups {
+            # Get the potentially localized name of the group
+            set group [lookup_account_sid $outgroup -system $opts(system)]
+            # Catch since may not be member of that group
+            catch {remove_member_from_local_group $group $username -system $opts(system)}
+        }
+
+        # Get the potentially localized name of the group to be added
+        set group [lookup_account_sid $ingroup -system $opts(system)]
+        add_member_to_local_group $group $username -system $opts(system)
+    }
+}
+
+proc twapi::_map_userinfo_flags {flags} {
+    # UF_LOCKOUT -> 0x10, UF_ACCOUNTDISABLE -> 0x2
+    if {$flags & 0x2} {
+        set status disabled
+    } elseif {$flags & 0x10} {
+        set status locked
+    } else {
+        set status enabled
+    }
+
+    #define UF_TEMP_DUPLICATE_ACCOUNT       0x0100
+    #define UF_NORMAL_ACCOUNT               0x0200
+    #define UF_INTERDOMAIN_TRUST_ACCOUNT    0x0800
+    #define UF_WORKSTATION_TRUST_ACCOUNT    0x1000
+    #define UF_SERVER_TRUST_ACCOUNT         0x2000
+    if {$flags & 0x0200} {
+        set type normal
+    } elseif {$flags & 0x0100} {
+        set type duplicate
+    } elseif {$flags & 0x0800} {
+        set type interdomain_trust
+    } elseif {$flags & 0x1000} {
+        set type workstation_trust
+    } elseif {$flags & 0x2000} {
+        set type server_trust
+    } else {
+        set type unknown
+    }
+
+    set pw {}
+    #define UF_PASSWD_NOTREQD                  0x0020
+    if {$flags & 0x0020} {
+        lappend pw not_required
+    }
+    #define UF_PASSWD_CANT_CHANGE              0x0040
+    if {$flags & 0x0040} {
+        lappend pw cannot_change
+    }
+    #define UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED 0x0080
+    if {$flags & 0x0080} {
+        lappend pw encrypted_text_allowed
+    }
+    #define UF_DONT_EXPIRE_PASSWD                         0x10000
+    if {$flags & 0x10000} {
+        lappend pw no_expiry
+    }
+    #define UF_SMARTCARD_REQUIRED                         0x40000
+    if {$flags & 0x40000} {
+        lappend pw smartcard_required
+    }
+    #define UF_PASSWORD_EXPIRED                          0x800000
+    if {$flags & 0x800000} {
+        lappend pw expired
+    }
+
+    return [list -status $status -type $type -password_attrs $pw]
+}
+
+twapi::proc* twapi::_define_user_modals {} {
+    struct _USER_MODALS_INFO_0 {
+        DWORD min_passwd_len;
+        DWORD max_passwd_age;
+        DWORD min_passwd_age;
+        DWORD force_logoff;
+        DWORD password_hist_len;
+    }
+    struct _USER_MODALS_INFO_1 {
+        DWORD  role;
+        LPWSTR primary;
+    }
+    struct _USER_MODALS_INFO_2 {
+        LPWSTR domain_name;
+        PSID   domain_id;
+    }
+    struct _USER_MODALS_INFO_3 {
+        DWORD lockout_duration;
+        DWORD lockout_observation_window;
+        DWORD lockout_threshold;
+    }
+    struct _USER_MODALS_INFO_1001 {
+        DWORD min_passwd_len;
+    }
+    struct _USER_MODALS_INFO_1002 {
+        DWORD max_passwd_age;
+    }
+    struct _USER_MODALS_INFO_1003 {
+        DWORD min_passwd_age;
+    }
+    struct _USER_MODALS_INFO_1004 {
+        DWORD force_logoff;
+    }
+    struct _USER_MODALS_INFO_1005 {
+        DWORD password_hist_len;
+    }
+    struct _USER_MODALS_INFO_1006 {
+        DWORD role;
+    }
+    struct _USER_MODALS_INFO_1007 {
+        LPWSTR primary;
+    }
+} {
+}
+
+twapi::proc* twapi::get_password_policy {{server_name ""}} {
+    _define_user_modals
+} {
+    set result [NetUserModalsGet $server_name 0 [_USER_MODALS_INFO_0]]
+    dict with result {
+        if {$force_logoff == 4294967295 || $force_logoff == -1} {
+            set force_logoff never
+        }
+        if {$max_passwd_age == 4294967295 || $max_passwd_age == -1} {
+            set max_passwd_age none
+        }
+    }
+    return $result
+}
+
+# TBD - doc & test
+twapi::proc* twapi::get_system_role {{server_name ""}} {
+    _define_user_modals
+} {
+    set result [NetUserModalsGet $server_name 1 [_USER_MODALS_INFO_1]]
+    dict set result role [dict* {
+        0 standalone 1 member 2 backup 3 primary
+    } [dict get $result role]]
+    return $result
+}
+
+# TBD - doc & test
+twapi::proc* twapi::get_system_domain {{server_name ""}} {
+    _define_user_modals
+} {
+    return [NetUserModalsGet $server_name 2 [_USER_MODALS_INFO_2]]
+}
+
+twapi::proc* twapi::get_lockout_policy {{server_name ""}} {
+    _define_user_modals
+} {
+    return [NetUserModalsGet $server_name 3 [_USER_MODALS_INFO_3]]
+}
+
+twapi::proc* twapi::set_password_policy {name val {server_name ""}} {
+    _define_user_modals
+} {
+    switch -exact $name {
+        min_passwd_len {
+            NetUserModalsSet $server_name 1001 [_USER_MODALS_INFO_1001 $val]
+        }
+        max_passwd_age {
+            if {$val eq "none"} {
+                set val 4294967295
+            }
+            NetUserModalsSet $server_name 1002 [_USER_MODALS_INFO_1002 $val]
+        }
+        min_passwd_age {
+            NetUserModalsSet $server_name 1003 [_USER_MODALS_INFO_1003 $val]
+        }
+        force_logoff {
+            if {$val eq "never"} {
+                set val 4294967295
+            }
+            NetUserModalsSet $server_name 1004 [_USER_MODALS_INFO_1004 $val]
+        }
+        password_hist_len {
+            NetUserModalsSet $server_name 1005 [_USER_MODALS_INFO_1005 $val]
+        }
+    }
+}
+
+twapi::proc* twapi::set_lockout_policy {duration observe_window threshold {server_name ""}} {
+    _define_user_modals
+} {
+    NetUserModalsSet $server_name 3 [_USER_MODALS_INFO_3 $duration $observe_window $threshold]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/adsi.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/adsi.tcl
new file mode 100644
index 00000000..77dd5122
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/adsi.tcl
@@ -0,0 +1,28 @@
+#
+# Copyright (c) 2010-2012, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# ADSI routines
+
+# TBD - document
+proc twapi::adsi_translate_name {name to {from 0}} {
+    set map {
+        unknown 0 fqdn 1 samcompatible 2 display 3 uniqueid 6
+        canonical 7 userprincipal 8 canonicalex 9 serviceprincipal 10
+        dnsdomain 12
+    }
+    if {! [string is integer -strict $to]} {
+        set to [dict get $map $to]
+        if {$to == 0} {
+            error "'unknown' is not a valid target format."
+        }
+    }
+
+    if {! [string is integer -strict $from]} {
+        set from [dict get $map $from]
+    }
+        
+    return [TranslateName $name $from $to]
+}
\ No newline at end of file
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/apputil.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/apputil.tcl
new file mode 100644
index 00000000..db008b66
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/apputil.tcl
@@ -0,0 +1,114 @@
+#
+# Copyright (c) 2003-2012, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {}
+
+# Get the command line
+proc twapi::get_command_line {} {
+    return [GetCommandLineW]
+}
+
+# Parse the command line
+proc twapi::get_command_line_args {cmdline} {
+    # Special check for empty line. CommandLinetoArgv returns process
+    # exe name in this case.
+    if {[string length $cmdline] == 0} {
+        return [list ]
+    }
+    return [CommandLineToArgv $cmdline]
+}
+
+# Read an ini file int
+proc twapi::read_inifile_key {section key args} {
+    array set opts [parseargs args {
+        {default.arg ""}
+        inifile.arg
+    } -maxleftover 0]
+
+    if {[info exists opts(inifile)]} {
+        set values [read_inifile_section $section -inifile $opts(inifile)]
+    } else {
+        set values [read_inifile_section $section]
+    }
+
+    # Cannot use kl_get or arrays here because we want case insensitive compare
+    foreach {k val} $values {
+        if {[string equal -nocase $key $k]} {
+            return $val
+        }
+    }
+    return $opts(default)
+}
+
+# Write an ini file string
+proc twapi::write_inifile_key {section key value args} {
+    array set opts [parseargs args {
+        inifile.arg
+    } -maxleftover 0]
+
+    if {[info exists opts(inifile)]} {
+        WritePrivateProfileString $section $key $value $opts(inifile)
+    } else {
+        WriteProfileString $section $key $value
+    }
+}
+
+# Delete an ini file string
+proc twapi::delete_inifile_key {section key args} {
+    array set opts [parseargs args {
+        inifile.arg
+    } -maxleftover 0]
+
+    if {[info exists opts(inifile)]} {
+        WritePrivateProfileString $section $key $twapi::nullptr $opts(inifile)
+    } else {
+        WriteProfileString $section $key $twapi::nullptr
+    }
+}
+
+# Get names of the sections in an inifile
+proc twapi::read_inifile_section_names {args} {
+    array set opts [parseargs args {
+        inifile.arg
+    } -nulldefault -maxleftover 0]
+
+    return [GetPrivateProfileSectionNames $opts(inifile)]
+}
+
+# Get keys and values in a section in an inifile
+proc twapi::read_inifile_section {section args} {
+    array set opts [parseargs args {
+        inifile.arg
+    } -nulldefault -maxleftover 0]
+
+    set result [list ]
+    foreach line [GetPrivateProfileSection $section $opts(inifile)] {
+        set pos [string first "=" $line]
+        if {$pos >= 0} {
+            lappend result [string range $line 0 [expr {$pos-1}]] [string range $line [incr pos] end]
+        }
+    }
+    return $result
+}
+
+
+# Delete an ini file section
+proc twapi::delete_inifile_section {section args} {
+    variable nullptr
+
+    array set opts [parseargs args {
+        inifile.arg
+    }]
+
+    if {[info exists opts(inifile)]} {
+        WritePrivateProfileString $section $nullptr $nullptr $opts(inifile)
+    } else {
+        WriteProfileString $section $nullptr $nullptr
+    }
+}
+
+
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/base.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/base.tcl
new file mode 100644
index 00000000..b227d2c0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/base.tcl
@@ -0,0 +1,1873 @@
+#
+# Copyright (c) 2012-2014, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# Commands in twapi_base module
+
+namespace eval twapi {
+    # Map of Sid integer type to Sid type name
+    array set sid_type_names {
+        1 user 
+        2 group
+        3 domain 
+        4 alias 
+        5 wellknowngroup
+        6 deletedaccount
+        7 invalid
+        8 unknown
+        9 computer
+        10 label
+        11 logonsession
+    }
+
+    # Cache mapping account names to SIDs. Dict keyed by system and name
+    variable _name_to_sid_cache {}
+
+    # Cache mapping SIDs to account names. Dict keyed by system and SID
+    variable _sid_to_name_cache {}
+
+    # Dictionary of FFI libraries to handles and back
+    variable _ffi_paths {}
+    variable _ffi_handles {}
+}
+
+
+
+# Return major minor servicepack as a quad list
+proc twapi::get_os_version {} {
+    array set verinfo [GetVersionEx]
+    return [list $verinfo(dwMajorVersion) $verinfo(dwMinorVersion) \
+                $verinfo(wServicePackMajor) $verinfo(wServicePackMinor)]
+}
+
+# Returns true if the OS version is at least $major.$minor.$sp
+proc twapi::min_os_version {major {minor 0} {spmajor 0} {spminor 0}} {
+    lassign  [twapi::get_os_version]  osmajor osminor osspmajor osspminor
+
+    if {$osmajor > $major} {return 1}
+    if {$osmajor < $major} {return 0}
+    if {$osminor > $minor} {return 1}
+    if {$osminor < $minor} {return 0}
+    if {$osspmajor > $spmajor} {return 1}
+    if {$osspmajor < $spmajor} {return 0}
+    if {$osspminor > $spminor} {return 1}
+    if {$osspminor < $spminor} {return 0}
+
+    # Same version, ok
+    return 1
+}
+
+# Convert a LARGE_INTEGER time value (100ns since 1601) to a formatted date
+# time
+interp alias {} twapi::large_system_time_to_secs {} twapi::large_system_time_to_secs_since_1970
+proc twapi::large_system_time_to_secs_since_1970 {ns100 {fraction false}} {
+    # No. 100ns units between 1601 to 1970 = 116444736000000000
+    set ns100_since_1970 [expr {$ns100-116444736000000000}]
+
+    set secs_since_1970 [expr {$ns100_since_1970/10000000}]
+    if {$fraction} {
+        append secs_since_1970 .[string range $ns100 end-6 end]
+    }
+    return $secs_since_1970
+}
+
+proc twapi::secs_since_1970_to_large_system_time {secs} {
+    # No. 100ns units between 1601 to 1970 = 116444736000000000
+    return [expr {($secs * 10000000) + 116444736000000000}]
+}
+
+# Map a Windows error code to a string
+proc twapi::map_windows_error {code} {
+    # Trim trailing CR/LF
+    return [string trimright [twapi::Twapi_MapWindowsErrorToString $code] "\r\n"]
+}
+
+# Load given library
+proc twapi::load_library {path args} {
+    array set opts [parseargs args {
+        dontresolverefs
+        datafile
+        alteredpath
+    }]
+
+    set flags 0
+    if {$opts(dontresolverefs)} {
+        setbits flags 1;                # DONT_RESOLVE_DLL_REFERENCES
+    }
+    if {$opts(datafile)} {
+        setbits flags 2;                # LOAD_LIBRARY_AS_DATAFILE
+    }
+    if {$opts(alteredpath)} {
+        setbits flags 8;                # LOAD_WITH_ALTERED_SEARCH_PATH
+    }
+
+    # LoadLibrary always wants backslashes
+    set path [file nativename $path]
+    return [LoadLibraryEx $path $flags]
+}
+
+# Free library opened with load_library
+proc twapi::free_library {libh} {
+    FreeLibrary $libh
+}
+
+# Format message string - will raise exception if insufficient number
+# of arguments
+proc twapi::_unsafe_format_message {args} {
+    array set opts [parseargs args {
+        module.arg
+        fmtstring.arg
+        messageid.arg
+        langid.arg
+        params.arg
+        includesystem
+        ignoreinserts
+        width.int
+    } -nulldefault -maxleftover 0]
+
+    set flags 0
+
+    if {$opts(module) == ""} {
+        if {$opts(fmtstring) == ""} {
+            # If neither -module nor -fmtstring specified, message is formatted
+            # from the system
+            set opts(module) NULL
+            setbits flags 0x1000;       # FORMAT_MESSAGE_FROM_SYSTEM
+        } else {
+            setbits flags 0x400;        # FORMAT_MESSAGE_FROM_STRING
+            if {$opts(includesystem) || $opts(messageid) != "" || $opts(langid) != ""} {
+                error "Options -includesystem, -messageid and -langid cannot be used with -fmtstring"
+            }
+        }
+    } else {
+        if {$opts(fmtstring) != ""} {
+            error "Options -fmtstring and -module cannot be used together"
+        }
+        setbits flags 0x800;        # FORMAT_MESSAGE_FROM_HMODULE
+        if {$opts(includesystem)} {
+            # Also include system in search
+            setbits flags 0x1000;       # FORMAT_MESSAGE_FROM_SYSTEM
+        }
+    }
+
+    if {$opts(ignoreinserts)} {
+        setbits flags 0x200;            # FORMAT_MESSAGE_IGNORE_INSERTS
+    }
+
+    if {$opts(width) > 254} {
+        error "Invalid value for option -width. Must be -1, 0, or a positive integer less than 255"
+    }
+    if {$opts(width) < 0} {
+        # Negative width means no width restrictions
+        set opts(width) 255;                  # 255 -> no restrictions
+    }
+    incr flags $opts(width);                  # Width goes in low byte of flags
+
+    if {$opts(fmtstring) != ""} {
+        return [FormatMessageFromString $flags $opts(fmtstring) $opts(params)]
+    } else {
+        if {![string is integer -strict $opts(messageid)]} {
+            error "Unspecified or invalid value for -messageid option. Must be an integer value"
+        }
+        if {$opts(langid) == ""} { set opts(langid) 0 }
+        if {![string is integer -strict $opts(langid)]} {
+            error "Unspecfied or invalid value for -langid option. Must be an integer value"
+        }
+
+        # Check if $opts(module) is a file or module handle (pointer)
+        if {[pointer? $opts(module)]} {
+            return  [FormatMessageFromModule $flags $opts(module) \
+                         $opts(messageid) $opts(langid) $opts(params)]
+        } else {
+            set hmod [load_library $opts(module) -datafile]
+            trap {
+                set message  [FormatMessageFromModule $flags $hmod \
+                                  $opts(messageid) $opts(langid) $opts(params)]
+            } finally {
+                free_library $hmod
+            }
+            return $message
+        }
+    }
+}
+
+# Format message string
+proc twapi::format_message {args} {
+    array set opts [parseargs args {
+        params.arg
+        fmtstring.arg
+        width.int
+        ignoreinserts
+    } -ignoreunknown]
+
+    # TBD - document - if no params specified, different from params = {}
+
+    # If a format string is specified, other options do not matter
+    # except for -width. In that case, we do not call FormatMessage
+    # at all
+    if {[info exists opts(fmtstring)]} {
+        # If -width specifed, call FormatMessage
+        if {[info exists opts(width)] && $opts(width)} {
+            set msg [_unsafe_format_message -ignoreinserts -fmtstring $opts(fmtstring) -width $opts(width) {*}$args]
+        } else {
+            set msg $opts(fmtstring)
+        }
+    } else {
+        # Not -fmtstring, retrieve from message file
+        if {[info exists opts(width)]} {
+            set msg [_unsafe_format_message -ignoreinserts -width $opts(width) {*}$args]
+        } else {
+            set msg [_unsafe_format_message -ignoreinserts {*}$args]
+        }
+    }
+
+    # If we are told to ignore inserts, all done. Else replace them except
+    # that if no param list, do not replace placeholder. This is NOT
+    # the same as empty param list
+    if {$opts(ignoreinserts) || ![info exists opts(params)]} {
+        return $msg
+    }
+
+    # TBD - cache fmtstring -> indices for performance
+    set placeholder_indices [regexp -indices -all -inline {%(?:.|(?:[1-9][0-9]?(?:![^!]+!)?))} $msg]
+
+    if {[llength $placeholder_indices] == 0} {
+        # No placeholders.
+        return $msg
+    }
+
+    # Use of * in format specifiers will change where the actual parameters
+    # are positioned
+    set num_asterisks 0
+    set msg2 ""
+    set prev_end 0
+    foreach placeholder $placeholder_indices {
+        lassign $placeholder start end
+        # Append the stuff between previous placeholder and this one
+        append msg2 [string range $msg $prev_end [expr {$start-1}]]
+        set spec [string range $msg $start+1 $end]
+        switch -exact -- [string index $spec 0] {
+            % { append msg2 % }
+            r { append msg2 \r }
+            n { append msg2 \n }
+            t { append msg2 \t }
+            0 { 
+                # No-op - %0 means to not add trailing newline
+            }
+            default {
+                if {! [string is integer -strict [string index $spec 0]]} {
+                    # Not a insert parameter. Just append the character
+                    append msg2 $spec
+                } else {
+                    # Insert parameter
+                    set fmt ""
+                    scan $spec %d%s param_index fmt
+                    # Note params are numbered starting with 1
+                    incr param_index -1
+                    # Format spec, if present, is enclosed in !. Get rid of them
+                    set fmt [string trim $fmt "!"]
+                    if {$fmt eq ""} {
+                        # No fmt spec
+                    } else {
+                        # Since everything is a string in Tcl, we happily
+                        # do not have to worry about type. However, the
+                        # format spec could have * specifiers which will
+                        # change the parameter indexing for subsequent
+                        # arguments
+                        incr num_asterisks [expr {[llength [split $fmt *]]-1}]
+                        incr param_index $num_asterisks
+                    }
+                    # TBD - we ignore the actual format type
+                    append msg2 [lindex $opts(params) $param_index]
+                }                        
+            }
+        }                    
+        set prev_end [incr end]
+    }
+    append msg2 [string range $msg $prev_end end]
+    return $msg2
+}
+
+# Revert to process token. In base package because used across many modules
+proc twapi::revert_to_self {{opt ""}} {
+    RevertToSelf
+}
+
+# For backward compatibility
+interp alias {} twapi::expand_environment_strings {} twapi::expand_environment_vars
+
+proc twapi::_init_security_defs {} {
+    variable security_defs
+
+    # NOTE : the access definitions for those types that are included here
+    # have been updated as of Windows 8.
+    array set security_defs {
+
+        TOKEN_ASSIGN_PRIMARY           0x00000001
+        TOKEN_DUPLICATE                0x00000002
+        TOKEN_IMPERSONATE              0x00000004
+        TOKEN_QUERY                    0x00000008
+        TOKEN_QUERY_SOURCE             0x00000010
+        TOKEN_ADJUST_PRIVILEGES        0x00000020
+        TOKEN_ADJUST_GROUPS            0x00000040
+        TOKEN_ADJUST_DEFAULT           0x00000080
+        TOKEN_ADJUST_SESSIONID         0x00000100
+
+        TOKEN_ALL_ACCESS_WINNT         0x000F00FF
+        TOKEN_ALL_ACCESS_WIN2K         0x000F01FF
+        TOKEN_ALL_ACCESS               0x000F01FF
+        TOKEN_READ                     0x00020008
+        TOKEN_WRITE                    0x000200E0
+        TOKEN_EXECUTE                  0x00020000
+
+        SYSTEM_MANDATORY_LABEL_NO_WRITE_UP         0x1
+        SYSTEM_MANDATORY_LABEL_NO_READ_UP          0x2
+        SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP       0x4
+
+        ACL_REVISION     2
+        ACL_REVISION_DS  4
+
+        ACCESS_MAX_MS_V2_ACE_TYPE               0x3
+        ACCESS_MAX_MS_V3_ACE_TYPE               0x4
+        ACCESS_MAX_MS_V4_ACE_TYPE               0x8
+        ACCESS_MAX_MS_V5_ACE_TYPE               0x11
+
+        STANDARD_RIGHTS_REQUIRED       0x000F0000
+        STANDARD_RIGHTS_READ           0x00020000
+        STANDARD_RIGHTS_WRITE          0x00020000
+        STANDARD_RIGHTS_EXECUTE        0x00020000
+        STANDARD_RIGHTS_ALL            0x001F0000
+        SPECIFIC_RIGHTS_ALL            0x0000FFFF
+
+        GENERIC_READ                   0x80000000
+        GENERIC_WRITE                  0x40000000
+        GENERIC_EXECUTE                0x20000000
+        GENERIC_ALL                    0x10000000
+
+        SERVICE_QUERY_CONFIG           0x00000001
+        SERVICE_CHANGE_CONFIG          0x00000002
+        SERVICE_QUERY_STATUS           0x00000004
+        SERVICE_ENUMERATE_DEPENDENTS   0x00000008
+        SERVICE_START                  0x00000010
+        SERVICE_STOP                   0x00000020
+        SERVICE_PAUSE_CONTINUE         0x00000040
+        SERVICE_INTERROGATE            0x00000080
+        SERVICE_USER_DEFINED_CONTROL   0x00000100
+        SERVICE_ALL_ACCESS             0x000F01FF
+
+        SC_MANAGER_CONNECT             0x00000001
+        SC_MANAGER_CREATE_SERVICE      0x00000002
+        SC_MANAGER_ENUMERATE_SERVICE   0x00000004
+        SC_MANAGER_LOCK                0x00000008
+        SC_MANAGER_QUERY_LOCK_STATUS   0x00000010
+        SC_MANAGER_MODIFY_BOOT_CONFIG  0x00000020
+        SC_MANAGER_ALL_ACCESS          0x000F003F
+
+        KEY_QUERY_VALUE                0x00000001
+        KEY_SET_VALUE                  0x00000002
+        KEY_CREATE_SUB_KEY             0x00000004
+        KEY_ENUMERATE_SUB_KEYS         0x00000008
+        KEY_NOTIFY                     0x00000010
+        KEY_CREATE_LINK                0x00000020
+        KEY_WOW64_32KEY                0x00000200
+        KEY_WOW64_64KEY                0x00000100
+        KEY_WOW64_RES                  0x00000300
+        KEY_READ                       0x00020019
+        KEY_WRITE                      0x00020006
+        KEY_EXECUTE                    0x00020019
+        KEY_ALL_ACCESS                 0x000F003F
+
+        POLICY_VIEW_LOCAL_INFORMATION   0x00000001
+        POLICY_VIEW_AUDIT_INFORMATION   0x00000002
+        POLICY_GET_PRIVATE_INFORMATION  0x00000004
+        POLICY_TRUST_ADMIN              0x00000008
+        POLICY_CREATE_ACCOUNT           0x00000010
+        POLICY_CREATE_SECRET            0x00000020
+        POLICY_CREATE_PRIVILEGE         0x00000040
+        POLICY_SET_DEFAULT_QUOTA_LIMITS 0x00000080
+        POLICY_SET_AUDIT_REQUIREMENTS   0x00000100
+        POLICY_AUDIT_LOG_ADMIN          0x00000200
+        POLICY_SERVER_ADMIN             0x00000400
+        POLICY_LOOKUP_NAMES             0x00000800
+        POLICY_NOTIFICATION             0x00001000
+        POLICY_READ                     0X00020006
+        POLICY_WRITE                    0X000207F8
+        POLICY_EXECUTE                  0X00020801
+        POLICY_ALL_ACCESS               0X000F0FFF
+
+        DESKTOP_READOBJECTS         0x0001
+        DESKTOP_CREATEWINDOW        0x0002
+        DESKTOP_CREATEMENU          0x0004
+        DESKTOP_HOOKCONTROL         0x0008
+        DESKTOP_JOURNALRECORD       0x0010
+        DESKTOP_JOURNALPLAYBACK     0x0020
+        DESKTOP_ENUMERATE           0x0040
+        DESKTOP_WRITEOBJECTS        0x0080
+        DESKTOP_SWITCHDESKTOP       0x0100
+
+        WINSTA_ENUMDESKTOPS         0x0001
+        WINSTA_READATTRIBUTES       0x0002
+        WINSTA_ACCESSCLIPBOARD      0x0004
+        WINSTA_CREATEDESKTOP        0x0008
+        WINSTA_WRITEATTRIBUTES      0x0010
+        WINSTA_ACCESSGLOBALATOMS    0x0020
+        WINSTA_EXITWINDOWS          0x0040
+        WINSTA_ENUMERATE            0x0100
+        WINSTA_READSCREEN           0x0200
+        WINSTA_ALL_ACCESS           0x37f
+
+        PROCESS_TERMINATE              0x0001
+        PROCESS_CREATE_THREAD          0x0002
+        PROCESS_SET_SESSIONID          0x0004
+        PROCESS_VM_OPERATION           0x0008
+        PROCESS_VM_READ                0x0010
+        PROCESS_VM_WRITE               0x0020
+        PROCESS_DUP_HANDLE             0x0040
+        PROCESS_CREATE_PROCESS         0x0080
+        PROCESS_SET_QUOTA              0x0100
+        PROCESS_SET_INFORMATION        0x0200
+        PROCESS_QUERY_INFORMATION      0x0400
+        PROCESS_SUSPEND_RESUME         0x0800
+
+        THREAD_TERMINATE               0x00000001
+        THREAD_SUSPEND_RESUME          0x00000002
+        THREAD_GET_CONTEXT             0x00000008
+        THREAD_SET_CONTEXT             0x00000010
+        THREAD_SET_INFORMATION         0x00000020
+        THREAD_QUERY_INFORMATION       0x00000040
+        THREAD_SET_THREAD_TOKEN        0x00000080
+        THREAD_IMPERSONATE             0x00000100
+        THREAD_DIRECT_IMPERSONATION    0x00000200
+        THREAD_SET_LIMITED_INFORMATION   0x00000400
+        THREAD_QUERY_LIMITED_INFORMATION 0x00000800
+
+        EVENT_MODIFY_STATE             0x00000002
+        EVENT_ALL_ACCESS               0x001F0003
+
+        SEMAPHORE_MODIFY_STATE         0x00000002
+        SEMAPHORE_ALL_ACCESS           0x001F0003
+
+        MUTANT_QUERY_STATE             0x00000001
+        MUTANT_ALL_ACCESS              0x001F0001
+
+        MUTEX_MODIFY_STATE             0x00000001
+        MUTEX_ALL_ACCESS               0x001F0001
+
+        TIMER_QUERY_STATE              0x00000001
+        TIMER_MODIFY_STATE             0x00000002
+        TIMER_ALL_ACCESS               0x001F0003
+
+        FILE_READ_DATA                 0x00000001
+        FILE_LIST_DIRECTORY            0x00000001
+        FILE_WRITE_DATA                0x00000002
+        FILE_ADD_FILE                  0x00000002
+        FILE_APPEND_DATA               0x00000004
+        FILE_ADD_SUBDIRECTORY          0x00000004
+        FILE_CREATE_PIPE_INSTANCE      0x00000004
+        FILE_READ_EA                   0x00000008
+        FILE_WRITE_EA                  0x00000010
+        FILE_EXECUTE                   0x00000020
+        FILE_TRAVERSE                  0x00000020
+        FILE_DELETE_CHILD              0x00000040
+        FILE_READ_ATTRIBUTES           0x00000080
+        FILE_WRITE_ATTRIBUTES          0x00000100
+
+        FILE_ALL_ACCESS                0x001F01FF
+        FILE_GENERIC_READ              0x00120089
+        FILE_GENERIC_WRITE             0x00120116
+        FILE_GENERIC_EXECUTE           0x001200A0
+
+        DELETE                         0x00010000
+        READ_CONTROL                   0x00020000
+        WRITE_DAC                      0x00040000
+        WRITE_OWNER                    0x00080000
+        SYNCHRONIZE                    0x00100000
+
+        MAXIMUM_ALLOWED                0x02000000
+
+        COM_RIGHTS_EXECUTE 1
+        COM_RIGHTS_EXECUTE_LOCAL 2
+        COM_RIGHTS_EXECUTE_REMOTE 4
+        COM_RIGHTS_ACTIVATE_LOCAL 8
+        COM_RIGHTS_ACTIVATE_REMOTE 16
+    }
+
+    if {[min_os_version 6]} {
+        array set security_defs {
+            PROCESS_QUERY_LIMITED_INFORMATION      0x00001000
+            PROCESS_ALL_ACCESS             0x001fffff
+            THREAD_ALL_ACCESS              0x001fffff
+        }
+    } else {
+        array set security_defs {
+            PROCESS_ALL_ACCESS             0x001f0fff
+            THREAD_ALL_ACCESS              0x001f03ff
+        }
+    }
+
+    # Make next call a no-op
+    proc _init_security_defs {} {}
+}
+
+# Map a set of access right symbols to a flag. Concatenates
+# all the arguments, and then OR's the individual elements. Each
+# element may either be a integer or one of the access rights
+proc twapi::_access_rights_to_mask {args} {
+    _init_security_defs
+
+    proc _access_rights_to_mask args {
+        variable security_defs
+        set rights 0
+        foreach right [concat {*}$args] {
+            # The mandatory label access rights are not in security_defs
+            # because we do not want them to mess up the int->name mapping
+            # for DACL's
+            set right [dict* {
+                no_write_up 1
+                system_mandatory_label_no_write_up 1
+                no_read_up 2
+                system_mandatory_label_no_read_up  2
+                no_execute_up 4
+                system_mandatory_label_no_execute_up 4
+            } $right]
+            if {![string is integer $right]} {
+                if {[catch {set right $security_defs([string toupper $right])}]} {
+                    error "Invalid access right symbol '$right'"
+                }
+            }
+            set rights [expr {$rights | $right}]
+        }
+        return $rights
+    }
+    return [_access_rights_to_mask {*}$args]
+}
+
+
+# Map an access mask to a set of rights
+proc twapi::_access_mask_to_rights {access_mask {type ""}} {
+    _init_security_defs
+
+    proc _access_mask_to_rights {access_mask {type ""}} {
+        variable security_defs
+
+        set rights [list ]
+
+        if {$type eq "mandatory_label"} {
+            if {$access_mask & 1} {
+                lappend rights system_mandatory_label_no_write_up
+            }
+            if {$access_mask & 2} {
+                lappend rights system_mandatory_label_no_read_up
+            }
+            if {$access_mask & 4} {
+                lappend rights system_mandatory_label_no_execute_up
+            }
+            return $rights
+        }
+
+        # The returned list will include rights that map to multiple bits
+        # as well as the individual bits. We first add the multiple bits
+        # and then the individual bits (since we clear individual bits
+        # after adding)
+
+        #
+        # Check standard multiple bit masks
+        #
+        foreach x {STANDARD_RIGHTS_REQUIRED STANDARD_RIGHTS_READ STANDARD_RIGHTS_WRITE STANDARD_RIGHTS_EXECUTE STANDARD_RIGHTS_ALL SPECIFIC_RIGHTS_ALL} {
+            if {($security_defs($x) & $access_mask) == $security_defs($x)} {
+                lappend rights [string tolower $x]
+            }
+        }
+
+        #
+        # Check type specific multiple bit masks.
+        #
+        
+        set type_mask_map {
+            file {FILE_ALL_ACCESS FILE_GENERIC_READ FILE_GENERIC_WRITE FILE_GENERIC_EXECUTE}
+            process {PROCESS_ALL_ACCESS}
+            pipe {FILE_ALL_ACCESS}
+            policy {POLICY_READ POLICY_WRITE POLICY_EXECUTE POLICY_ALL_ACCESS}
+            registry {KEY_READ KEY_WRITE KEY_EXECUTE KEY_ALL_ACCESS}
+            service {SERVICE_ALL_ACCESS}
+            thread {THREAD_ALL_ACCESS}
+            token {TOKEN_READ TOKEN_WRITE TOKEN_EXECUTE TOKEN_ALL_ACCESS}
+            desktop {}
+            winsta {WINSTA_ALL_ACCESS}
+        }
+        if {[dict exists $type_mask_map $type]} {
+            foreach x [dict get $type_mask_map $type] {
+                if {($security_defs($x) & $access_mask) == $security_defs($x)} {
+                    lappend rights [string tolower $x]
+                }
+            }
+        }
+
+        #
+        # OK, now map individual bits
+
+        # First map the common bits
+        foreach x {DELETE READ_CONTROL WRITE_DAC WRITE_OWNER SYNCHRONIZE} {
+            if {$security_defs($x) & $access_mask} {
+                lappend rights [string tolower $x]
+                resetbits access_mask $security_defs($x)
+            }
+        }
+
+        # Then the generic bits
+        foreach x {GENERIC_READ GENERIC_WRITE GENERIC_EXECUTE GENERIC_ALL} {
+            if {$security_defs($x) & $access_mask} {
+                lappend rights [string tolower $x]
+                resetbits access_mask $security_defs($x)
+            }
+        }
+
+        # Then the type specific
+        set type_mask_map {
+            file { FILE_READ_DATA FILE_WRITE_DATA FILE_APPEND_DATA
+                FILE_READ_EA FILE_WRITE_EA FILE_EXECUTE
+                FILE_DELETE_CHILD FILE_READ_ATTRIBUTES
+                FILE_WRITE_ATTRIBUTES }
+            pipe { FILE_READ_DATA FILE_WRITE_DATA FILE_CREATE_PIPE_INSTANCE
+                FILE_READ_ATTRIBUTES FILE_WRITE_ATTRIBUTES }
+            service { SERVICE_QUERY_CONFIG SERVICE_CHANGE_CONFIG
+                SERVICE_QUERY_STATUS SERVICE_ENUMERATE_DEPENDENTS
+                SERVICE_START SERVICE_STOP SERVICE_PAUSE_CONTINUE
+                SERVICE_INTERROGATE SERVICE_USER_DEFINED_CONTROL }
+            registry { KEY_QUERY_VALUE KEY_SET_VALUE KEY_CREATE_SUB_KEY
+                KEY_ENUMERATE_SUB_KEYS KEY_NOTIFY KEY_CREATE_LINK
+                KEY_WOW64_32KEY KEY_WOW64_64KEY KEY_WOW64_RES }
+            policy { POLICY_VIEW_LOCAL_INFORMATION POLICY_VIEW_AUDIT_INFORMATION
+                POLICY_GET_PRIVATE_INFORMATION POLICY_TRUST_ADMIN
+                POLICY_CREATE_ACCOUNT POLICY_CREATE_SECRET
+                POLICY_CREATE_PRIVILEGE POLICY_SET_DEFAULT_QUOTA_LIMITS
+                POLICY_SET_AUDIT_REQUIREMENTS POLICY_AUDIT_LOG_ADMIN
+                POLICY_SERVER_ADMIN POLICY_LOOKUP_NAMES }
+            process { PROCESS_TERMINATE PROCESS_CREATE_THREAD
+                PROCESS_SET_SESSIONID PROCESS_VM_OPERATION
+                PROCESS_VM_READ PROCESS_VM_WRITE PROCESS_DUP_HANDLE
+                PROCESS_CREATE_PROCESS PROCESS_SET_QUOTA
+                PROCESS_SET_INFORMATION PROCESS_QUERY_INFORMATION
+                PROCESS_SUSPEND_RESUME} 
+            thread { THREAD_TERMINATE THREAD_SUSPEND_RESUME
+                THREAD_GET_CONTEXT THREAD_SET_CONTEXT
+                THREAD_SET_INFORMATION THREAD_QUERY_INFORMATION
+                THREAD_SET_THREAD_TOKEN THREAD_IMPERSONATE
+                THREAD_DIRECT_IMPERSONATION
+                THREAD_SET_LIMITED_INFORMATION
+                THREAD_QUERY_LIMITED_INFORMATION }
+            token { TOKEN_ASSIGN_PRIMARY TOKEN_DUPLICATE TOKEN_IMPERSONATE
+                TOKEN_QUERY TOKEN_QUERY_SOURCE TOKEN_ADJUST_PRIVILEGES
+                TOKEN_ADJUST_GROUPS TOKEN_ADJUST_DEFAULT TOKEN_ADJUST_SESSIONID }
+            desktop { DESKTOP_READOBJECTS DESKTOP_CREATEWINDOW
+                DESKTOP_CREATEMENU DESKTOP_HOOKCONTROL
+                DESKTOP_JOURNALRECORD DESKTOP_JOURNALPLAYBACK
+                DESKTOP_ENUMERATE DESKTOP_WRITEOBJECTS DESKTOP_SWITCHDESKTOP }
+            windowstation { WINSTA_ENUMDESKTOPS WINSTA_READATTRIBUTES
+                WINSTA_ACCESSCLIPBOARD WINSTA_CREATEDESKTOP
+                WINSTA_WRITEATTRIBUTES WINSTA_ACCESSGLOBALATOMS
+                WINSTA_EXITWINDOWS WINSTA_ENUMERATE WINSTA_READSCREEN }
+            winsta { WINSTA_ENUMDESKTOPS WINSTA_READATTRIBUTES
+                WINSTA_ACCESSCLIPBOARD WINSTA_CREATEDESKTOP
+                WINSTA_WRITEATTRIBUTES WINSTA_ACCESSGLOBALATOMS
+                WINSTA_EXITWINDOWS WINSTA_ENUMERATE WINSTA_READSCREEN }
+            com { COM_RIGHTS_EXECUTE COM_RIGHTS_EXECUTE_LOCAL 
+                COM_RIGHTS_EXECUTE_REMOTE COM_RIGHTS_ACTIVATE_LOCAL 
+                COM_RIGHTS_ACTIVATE_REMOTE 
+            }
+        }
+
+        if {[min_os_version 6]} {
+            dict lappend type_mask_map process PROCESS_QUERY_LIMITED_INFORMATION
+        }
+
+        if {[dict exists $type_mask_map $type]} {
+            foreach x [dict get $type_mask_map $type] {
+                if {$security_defs($x) & $access_mask} {
+                    lappend rights [string tolower $x]
+                    # Reset the bit so is it not included in unknown bits below
+                    resetbits access_mask $security_defs($x)
+                }
+            }
+        }
+
+        # Finally add left over bits if any
+        for {set i 0} {$i < 32} {incr i} {
+            set x [expr {1 << $i}]
+            if {$access_mask & $x} {
+                lappend rights [hex32 $x]
+            }
+        }
+
+        return $rights
+    }
+
+    return [_access_mask_to_rights $access_mask $type]
+}
+
+# Map the symbolic CreateDisposition parameter of CreateFile to integer values
+proc twapi::_create_disposition_to_code {sym} {
+    if {[string is integer -strict $sym]} {
+        return $sym
+    }
+    # CREATE_NEW          1
+    # CREATE_ALWAYS       2
+    # OPEN_EXISTING       3
+    # OPEN_ALWAYS         4
+    # TRUNCATE_EXISTING   5
+    return [dict get {
+        create_new 1
+        create_always 2
+        open_existing 3
+        open_always 4
+        truncate_existing 5} $sym]
+}
+
+# Wrapper around CreateFile
+proc twapi::create_file {path args} {
+    array set opts [parseargs args {
+        {access.arg {generic_read}}
+        {share.arg {read write delete}}
+        {inherit.bool 0}
+        {secd.arg ""}
+        {createdisposition.arg open_always}
+        {flags.int 0}
+        {templatefile.arg NULL}
+    } -maxleftover 0]
+
+    set access_mode [_access_rights_to_mask $opts(access)]
+    set share_mode [_share_mode_to_mask $opts(share)]
+    set create_disposition [_create_disposition_to_code $opts(createdisposition)]
+    return [CreateFile $path \
+                $access_mode \
+                $share_mode \
+                [_make_secattr $opts(secd) $opts(inherit)] \
+                $create_disposition \
+                $opts(flags) \
+                $opts(templatefile)]
+}
+
+# Map a set of share mode symbols to a flag. Concatenates
+# all the arguments, and then OR's the individual elements. Each
+# element may either be a integer or one of the share modes
+proc twapi::_share_mode_to_mask {modelist} {
+    # Values correspond to FILE_SHARE_* defines
+    return [_parse_symbolic_bitmask $modelist {read 1 write 2 delete 4}]
+}
+
+# Construct a security attributes structure out of a security descriptor
+# and inheritance. The command is here because we do not want to
+# have to load the twapi_security package for the common case of
+# null security attributes.
+proc twapi::_make_secattr {secd inherit} {
+    if {$inherit} {
+        set sec_attr [list $secd 1]
+    } else {
+        if {[llength $secd] == 0} {
+            # If a security descriptor not specified, keep
+            # all security attributes as an empty list (ie. NULL)
+            set sec_attr [list ]
+        } else {
+            set sec_attr [list $secd 0]
+        }
+    }
+    return $sec_attr
+}
+
+# Returns the sid, domain and type for an account
+proc twapi::lookup_account_name {name args} {
+    variable _name_to_sid_cache
+
+    # Fast path - no options specified and cached
+    if {[llength $args] == 0 && [dict exists $_name_to_sid_cache "" $name]} {
+        return [lindex [dict get $_name_to_sid_cache "" $name] 0]
+    }
+
+    array set opts [parseargs args \
+                        [list all \
+                             sid \
+                             domain \
+                             type \
+                             [list system.arg ""]\
+                            ]]
+
+    if {! [dict exists $_name_to_sid_cache $opts(system) $name]} {
+        dict set _name_to_sid_cache $opts(system) $name [LookupAccountName $opts(system) $name]
+    }    
+    lassign [dict get $_name_to_sid_cache $opts(system) $name] sid domain type
+
+    set result [list ]
+    if {$opts(all) || $opts(domain)} {
+        lappend result -domain $domain
+    }
+    if {$opts(all) || $opts(type)} {
+        if {[info exists twapi::sid_type_names($type)]} {
+            lappend result -type $twapi::sid_type_names($type)
+        } else {
+            # Could be the "logonid" dummy type we added above
+            lappend result -type $type
+        }
+    }
+
+    if {$opts(all) || $opts(sid)} {
+        lappend result -sid $sid
+    }
+
+    # If no options specified, only return the sid/name
+    if {[llength $result] == 0} {
+        return $sid
+    }
+
+    return $result
+}
+
+
+# Returns the name, domain and type for an account
+proc twapi::lookup_account_sid {sid args} {
+    variable _sid_to_name_cache
+
+    # Fast path - no options specified and cached
+    if {[llength $args] == 0 && [dict exists $_sid_to_name_cache "" $sid]} {
+        return [lindex [dict get $_sid_to_name_cache "" $sid] 0]
+    }
+
+    array set opts [parseargs args \
+                        [list all \
+                             name \
+                             domain \
+                             type \
+                             [list system.arg ""]\
+                            ]]
+
+    if {[dict exists $_sid_to_name_cache $opts(system) $sid]} {
+        lassign [dict get $_sid_to_name_cache $opts(system) $sid] name domain type
+    } else {
+        # Not in cache. Need to look up
+
+        trap {
+            set data [LookupAccountSid $opts(system) $sid]
+            lassign $data name domain type
+        } onerror {TWAPI_WIN32 1332} {
+            # Win10 resolves this, Win7 does not. Emulate Win10
+            if {![string match -nocase "S-1-5-5-*" $sid]} {
+                rethrow
+            }
+            # Name is formed similar to how Win10 does it
+            set name "LogonSessionId_[string map {- _} [string range $sid 8 end]]"
+            set domain "NT AUTHORITY"
+            set type 11
+            set data [list $name $domain $type]
+        }
+        dict set _sid_to_name_cache $opts(system) $sid $data
+    }
+
+
+    set result [list ]
+    if {$opts(all) || $opts(domain)} {
+        lappend result -domain $domain
+    }
+    if {$opts(all) || $opts(type)} {
+        if {[info exists twapi::sid_type_names($type)]} {
+            lappend result -type $twapi::sid_type_names($type)
+        } else {
+            lappend result -type $type
+        }
+    }
+
+    if {$opts(all) || $opts(name)} {
+        lappend result -name $name
+    }
+
+    # If no options specified, only return the sid/name
+    if {[llength $result] == 0} {
+        return $name
+    }
+
+    return $result
+}
+
+# Returns the sid for a account - may be given as a SID or name
+proc twapi::map_account_to_sid {account args} {
+    array set opts [parseargs args {system.arg} -nulldefault]
+
+    # Treat empty account as null SID (self)
+    if {[string length $account] == ""} {
+        return ""
+    }
+
+    if {[is_valid_sid_syntax $account]} {
+        return $account
+    } else {
+        return [lookup_account_name $account -system $opts(system)]
+    }
+}
+
+
+# Returns the name for a account - may be given as a SID or name
+proc twapi::map_account_to_name {account args} {
+    array set opts [parseargs args {system.arg} -nulldefault]
+
+    if {[is_valid_sid_syntax $account]} {
+        return [lookup_account_sid $account -system $opts(system)]
+    } else {
+        # Verify whether a valid account by mapping to an sid
+        if {[catch {map_account_to_sid $account -system $opts(system)}]} {
+            # As a special case, change LocalSystem to SYSTEM. Some Windows
+            # API's (such as services) return LocalSystem which cannot be
+            # resolved by the security functions. This name is really the
+            # same a the built-in SYSTEM
+            if {$account == "LocalSystem"} {
+                return "SYSTEM"
+            }
+            error "Unknown account '$account'"
+        } 
+        return $account
+    }
+}
+
+# Return the user account for the current process
+proc twapi::get_current_user {{format -samcompatible}} {
+
+    set return_sid false
+    switch -exact -- $format {
+        -fullyqualifieddn {set format 1}
+        -samcompatible {set format 2}
+        -display {set format 3}
+        -uniqueid {set format 6}
+        -canonical {set format 7}
+        -userprincipal {set format 8}
+        -canonicalex {set format 9}
+        -serviceprincipal {set format 10}
+        -dnsdomain {set format 12}
+        -sid {set format 2 ; set return_sid true}
+        default {
+            error "Unknown user name format '$format'"
+        }
+    }
+
+    set user [GetUserNameEx $format]
+
+    if {$return_sid} {
+        return [map_account_to_sid $user]
+    } else {
+        return $user
+    }
+}
+
+# Get a new uuid
+proc twapi::new_uuid {{opt ""}} {
+    if {[string length $opt]} {
+        if {[string equal $opt "-localok"]} {
+            set local_ok 1
+        } else {
+            error "Invalid or unknown argument '$opt'"
+        }
+    } else {
+        set local_ok 0
+    }
+    return [UuidCreate $local_ok] 
+}
+proc twapi::nil_uuid {} {
+    return [UuidCreateNil]
+}
+
+proc twapi::new_guid {} {
+    return [canonicalize_guid [new_uuid]]
+}
+
+# Get a handle to a LSA policy. TBD - document
+proc twapi::get_lsa_policy_handle {args} {
+    array set opts [parseargs args {
+        {system.arg ""}
+        {access.arg policy_read}
+    } -maxleftover 0]
+
+    set access [_access_rights_to_mask $opts(access)]
+    return [Twapi_LsaOpenPolicy $opts(system) $access]
+}
+
+# Close a LSA policy handle. TBD - document
+proc twapi::close_lsa_policy_handle {h} {
+    LsaClose $h
+    return
+}
+
+# Eventlog stuff in the base package
+
+namespace eval twapi {
+    # Keep track of event log handles - values are "r" or "w"
+    variable eventlog_handles
+    array set eventlog_handles {}
+}
+
+# Open an eventlog for reading or writing
+proc twapi::eventlog_open {args} {
+    variable eventlog_handles
+
+    array set opts [parseargs args {
+        system.arg
+        source.arg
+        file.arg
+        write
+    } -nulldefault -maxleftover 0]
+    if {$opts(source) == ""} {
+        # Source not specified
+        if {$opts(file) == ""} {
+            # No source or file specified, default to current event log 
+            # using executable name as source
+            set opts(source) [file rootname [file tail [info nameofexecutable]]]
+        } else {
+            if {$opts(write)} {
+                error "Option -file may not be used with -write"
+            }
+        }
+    } else {
+        # Source explicitly specified
+        if {$opts(file) != ""} {
+            error "Option -file may not be used with -source"
+        }
+    }
+
+    if {$opts(write)} {
+        set handle [RegisterEventSource $opts(system) $opts(source)]
+        set mode write
+    } else {
+        if {$opts(source) != ""} {
+            set handle [OpenEventLog $opts(system) $opts(source)]
+        } else {
+            set handle [OpenBackupEventLog $opts(system) $opts(file)]
+        }
+        set mode read
+    }
+
+    set eventlog_handles($handle) $mode
+    return $handle
+}
+
+# Close an event log opened for writing
+proc twapi::eventlog_close {hevl} {
+    variable eventlog_handles
+
+    if {[_eventlog_valid_handle $hevl read]} {
+        CloseEventLog $hevl
+    } else {
+        DeregisterEventSource $hevl
+    }
+
+    unset eventlog_handles($hevl)
+}
+
+
+# Log an event
+proc twapi::eventlog_write {hevl id args} {
+    _eventlog_valid_handle $hevl write raise
+
+    array set opts [parseargs args {
+        {type.arg information {success error warning information auditsuccess auditfailure}}
+        {category.int 1}
+        loguser
+        params.arg
+        data.arg
+    } -nulldefault]
+
+
+    switch -exact -- $opts(type) {
+        success          {set opts(type) 0}
+        error            {set opts(type) 1}
+        warning          {set opts(type) 2}
+        information      {set opts(type) 4}
+        auditsuccess     {set opts(type) 8}
+        auditfailure     {set opts(type) 16}
+        default {error "Invalid value '$opts(type)' for option -type"}
+    }
+    
+    if {$opts(loguser)} {
+        set user [get_current_user -sid]
+    } else {
+        set user ""
+    }
+
+    ReportEvent $hevl $opts(type) $opts(category) $id \
+        $user $opts(params) $opts(data)
+}
+
+
+# Log a message 
+proc twapi::eventlog_log {message args} {
+    array set opts [parseargs args {
+        system.arg
+        source.arg
+        {type.arg information}
+        {category.int 0}
+    } -nulldefault]
+
+    set hevl [eventlog_open -write -source $opts(source) -system $opts(system)]
+
+    trap {
+        eventlog_write $hevl 1 -params [list $message] -type $opts(type) -category $opts(category)
+    } finally {
+        eventlog_close $hevl
+    }
+    return
+}
+
+proc twapi::make_logon_identity {username password domain} {
+    if {[concealed? $password]} {
+        return [list $username $domain $password]
+    } else {
+        return [list $username $domain [conceal $password]]
+    }
+}
+
+proc twapi::read_credentials {args} {
+    # DEPRECATED
+    array set opts [parseargs args {
+        target.arg
+        winerror.int
+        username.arg
+        password.arg
+        persist.bool
+        {type.sym generic {domain 0 generic 0x40000 runas 0x80000}}
+        {forceui.bool 0 0x80}
+        {showsaveoption.bool true}
+        {expectconfirmation.bool 0 0x20000}
+    } -maxleftover 0 -nulldefault]
+
+    if {$opts(persist) && ! $opts(expectconfirmation)} {
+        badargs! "Option -expectconfirmation must be specified as true if -persist is true"
+    }
+
+    # 0x8 -> CREDUI_FLAGS_EXCLUDE_CERTIFICATES (needed for console)
+    set flags [expr {0x8 | $opts(forceui) | $opts(expectconfirmation)}]
+
+    if {$opts(persist)} {
+        if {! $opts(showsaveoption)} {
+            incr flags 0x1000;  # CREDUI_FLAGS_PERSIST
+        }
+    } else {
+        incr flags 0x2;         # CREDUI_FLAGS_DO_NOT_PERSIST
+        if {$opts(showsaveoption)} {
+            incr flags 0x40;    # CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX
+        }
+    }
+
+    incr flags $opts(type)
+
+    return [CredUICmdLinePromptForCredentials $opts(target) NULL $opts(winerror) $opts(username) $opts(password) $opts(persist) $flags]
+}
+
+proc twapi::credentials_dialog {args} {
+    # DEPRECATED
+    array set opts [parseargs args {
+        target.arg
+        winerror.int
+        username.arg
+        password.arg
+        persist.bool
+        {type.sym generic {domain 0 generic 0x40000 runas 0x80000}}
+        {forceui.bool 0 0x80}
+        {showsaveoption.bool true}
+        {expectconfirmation.bool 0 0x20000}
+        {fillusername.bool 0 0x800}
+        {filllocaladmins.bool 0 0x4}
+        {notifyfail.bool 0 0x1}
+        {passwordonly.bool 0 0x200}
+        {requirecertificate.bool 0 0x10}
+        {requiresmartcard.bool 0 0x100}
+        {validateusername.bool 0 0x400}
+        {parent.arg NULL}
+        message.arg
+        caption.arg
+        {bitmap.arg NULL}
+    } -maxleftover 0 -nulldefault]
+
+    if {$opts(persist) && ! $opts(expectconfirmation)} {
+        badargs! "Option -willconfirm must be specified as true if -persist is true"
+    }
+
+    set flags [expr { 0x8 | $opts(forceui) | $opts(notifyfail) | $opts(expectconfirmation) | $opts(fillusername) | $opts(filllocaladmins)}]
+
+    if {$opts(persist)} {
+        if {! $opts(showsaveoption)} {
+            incr flags 0x1000;  # CREDUI_FLAGS_PERSIST
+        }
+    } else {
+        incr flags 0x2;         # CREDUI_FLAGS_DO_NOT_PERSIST
+        if {$opts(showsaveoption)} {
+            incr flags 0x40;    # CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX
+        }
+    }
+
+    incr flags $opts(type)
+
+    return [CredUIPromptForCredentials [list $opts(parent) $opts(message) $opts(caption) $opts(bitmap)] $opts(target) NULL $opts(winerror) $opts(username) $opts(password) $opts(persist) $flags]
+}
+
+proc twapi::confirm_credentials {target valid} {
+    # DEPRECATED
+    return [CredUIConfirmCredentials $target $valid]
+}
+
+
+proc twapi::_make_cred_persist_flags {persist showsave} {
+    # Use cases -
+    #  (1) credentials to be persisted WITHOUT showing save option to user
+    #  (2) credentials to be persisted AFTER showing save option to user
+    #  (3) credentials NOT to be persisted, user not shown save option
+    #  (4) credentials NOT to be persisted, but user shown save option
+    # In case (4), caller has to decide what to do with the credentials if
+    # user selects to save (e.g. save elsewhere)
+    # If credentials are to be persisted, caller MUST call cred_confirm later
+    
+    if {$persist} {
+        # Note CREDUI_FLAGS_EXPECT_CONFIRMATION (0x20000) must be specified
+        # whenever CREDUI_FLAGS_DO_NOT_PERSIST is not specified
+        if {$showsave} {
+            # (2) CREDUI_FLAGS_EXPECT_CONFIRMATION
+            return 0x20000
+        } else {
+            # (1) CREDUI_FLAGS_PERSIST | CREDUI_FLAGS_EXPECT_CONFIRMATION
+            return 0x21000
+        }
+    } else {
+        if {$showsave} {
+            # (4) CREDUI_FLAGS_DO_NOT_PERSIST | CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX
+            return 0x42
+        } else {
+            # (3) CREDUI_FLAGS_DO_NOT_PERSIST
+            return 0x02
+        }
+    }
+}
+
+proc twapi::cred_prompt_console {target args} {
+    # Not documented because Windows seems to ignore on Win10 at least -
+    #  -password, -winerror
+    array set opts [parseargs args {
+        {forceui.bool 0 0x80}
+        password.arg
+        persist.bool
+        {showsaveoption.bool 0}
+        {type.sym generic {domain 0 generic 0x40000 runas 0x80000}}
+        username.arg
+        winerror.int
+    } -maxleftover 0 -nulldefault]
+
+    if {$target eq ""} {
+        error "Target must not be an empty string."
+    }
+
+    if {$opts(forceui) && $opts(type) != 0x40000} {
+        error "The -forceui option can only be set if -type is \"generic\"."
+    }
+
+    if {$opts(type) == 0x80000 && $opts(username) eq ""} {
+        # CredUIPromptForCredentials crashes
+        error "The -username option must not be an empty string if -type is \"runas\"."
+    }
+
+    set flags [_make_cred_persist_flags $opts(persist) $opts(showsaveoption)]
+
+    # 0x8 -> CREDUI_FLAGS_EXCLUDE_CERTIFICATES (needed for console)
+    set flags [expr {0x8 | $flags | $opts(type) | $opts(forceui)}]
+
+    return [CredUICmdLinePromptForCredentials $target NULL $opts(winerror) $opts(username) $opts(password) $opts(persist) $flags]
+}
+
+proc twapi::cred_prompt_gui {target args} {
+    # Not documented because Windows seems to ignore on Win10 at least -
+    #  -passwordonly, -notifyfail, -winerror
+    array set opts [parseargs args {
+        {bitmap.arg NULL}
+        caption.arg
+        {excludecertificates.bool 0 0x8}
+        {filllocaladmins.bool 0 0x4}
+        {completeusername.bool 0 0x800}
+        {forceui.bool 0 0x80}
+        {keepusername.bool 0 0x100000}
+        message.arg
+        {notifyfail.bool 0 0x1}
+        {parent.arg NULL}
+        password.arg
+        {passwordonly.bool 0 0x200}
+        persist.bool
+        {requirecertificate.bool 0 0x10}
+        {requiresmartcard.bool 0 0x100}
+        {showsaveoption.bool 0}
+        {type.sym generic {domain 0 generic 0x40000 runas 0x80000}}
+        username.arg
+        {validateusername.bool 0 0x400}
+        winerror.int
+    } -maxleftover 0 -nulldefault]
+
+    if {$target eq ""} {
+        error "Target must not be an empty string."
+    }
+
+    if {$opts(forceui) && $opts(type) != 0x40000} {
+        error "The -forceui option can only be set if -type is \"generic\"."
+    }
+
+    if {$opts(type) == 0x80000 && $opts(username) eq ""} {
+        # CredUIPromptForCredentials crashes
+        error "The -username option must not be an empty string if -type is \"runas\"."
+    }
+
+    set flags [_make_cred_persist_flags $opts(persist) $opts(showsaveoption)]
+    set flags [expr {
+                     $flags |
+                     $opts(excludecertificates) |
+                     $opts(filllocaladmins) |
+                     $opts(completeusername) |
+                     $opts(forceui) |
+                     $opts(keepusername) |
+                     $opts(notifyfail) |
+                     $opts(passwordonly) |
+                     $opts(requirecertificate) |
+                     $opts(requiresmartcard) |
+                     $opts(type) |
+                     $opts(validateusername)
+                 }]
+
+    return [CredUIPromptForCredentials [list $opts(parent) $opts(message) $opts(caption) $opts(bitmap)] $target NULL $opts(winerror) $opts(username) $opts(password) $opts(persist) $flags]
+}
+
+proc twapi::cred_confirm {target valid} {
+    return [CredUIConfirmCredentials $target $valid]
+}
+
+# Validate a handle for a mode. Always raises error if handle is invalid
+# If handle valid but not for that mode, will raise error iff $raise_error
+# is non-empty. Returns 1 if valid, 0 otherwise
+proc twapi::_eventlog_valid_handle {hevl mode {raise_error ""}} {
+    variable eventlog_handles
+    if {![info exists eventlog_handles($hevl)]} {
+        error "Invalid event log handle '$hevl'"
+    }
+
+    if {[string compare $eventlog_handles($hevl) $mode]} {
+        if {$raise_error != ""} {
+            error "Eventlog handle '$hevl' not valid for $mode"
+        }
+        return 0
+    } else {
+        return 1
+    }
+}
+
+### Common disk related
+
+# Map bit mask to list of drive letters
+proc twapi::_drivemask_to_drivelist {drivebits} {
+    set drives [list ]
+    set i 0
+    foreach drive {A B C D E F G H I J K L M N O P Q R S T U V W X Y Z} {
+        if {$drivebits == 0} break
+        set drivemask [expr {1 << $i}]
+        if {[expr {$drivebits & $drivemask}]} {
+            lappend drives $drive:
+            set drivebits [expr {$drivebits & ~ $drivemask}]
+        }
+        incr i
+    }
+    return $drives
+}
+
+### Type casts
+proc twapi::tclcast {type val} {
+    # Only permit these because wideInt, for example, cannot be reliably
+    # converted -> it can return an int instead.
+    set types {"" empty null bstr int boolean double string list dict}
+    if {$type ni $types} {
+        badargs! "Bad cast to \"$type\". Must be one of: $types"
+    }
+    return [Twapi_InternalCast $type $val]
+}
+
+if {[info commands ::lmap] eq "::lmap"} {
+    proc twapi::safearray {type l} {
+        set type [dict! {
+            variant ""
+            boolean boolean
+            bool boolean
+            int  int
+            i4   int
+            double double
+            r8   double
+            string string
+            bstr string
+        } $type]
+        return [lmap val $l {tclcast $type $val}]
+    }
+} else {
+    proc twapi::safearray {type l} {
+        set type [dict! {
+            variant ""
+            boolean boolean
+            bool boolean
+            int  int
+            i4   int
+            double double
+            r8   double
+            string string
+            bstr string
+        } $type]
+        set l2 {}
+        foreach val $l {
+            lappend l2 [tclcast $type $val]
+        }
+        return $l2
+    }
+}
+
+namespace eval twapi::recordarray {}
+
+proc twapi::recordarray::size {ra} {
+    return [llength [lindex $ra 1]]
+}
+
+proc twapi::recordarray::fields {ra} {
+    return [lindex $ra 0]
+}
+
+proc twapi::recordarray::index {ra row args} {
+    set r [lindex $ra 1 $row]
+    if {[llength $r] == 0} {
+        return $r
+    }
+    ::twapi::parseargs args {
+        {format.arg list {list dict}}
+        slice.arg
+    } -setvars -maxleftover 0
+
+    set fields [lindex $ra 0]
+    if {[info exists slice]} {
+        set new_fields {}        
+        set new_r {}
+        foreach field $slice {
+            set i [twapi::enum $fields $field]
+            lappend new_r [lindex $r $i]
+            lappend new_fields [lindex $fields $i]
+        }
+        set r $new_r
+        set fields $new_fields
+    }
+
+    if {$format eq "list"} {
+        return $r
+    } else {
+        return [::twapi::twine $fields $r]
+    }
+}
+
+proc twapi::recordarray::range {ra low high} {
+    return [list [lindex $ra 0] [lrange [lindex $ra 1] $low $high]]
+}
+
+proc twapi::recordarray::column {ra field args} {
+    # TBD - time to see if a script loop would be faster
+    ::twapi::parseargs args {
+        filter.arg
+    } -nulldefault -maxleftover 0 -setvars
+    _recordarray -slice [list $field] -filter $filter -format flat $ra
+}
+
+proc twapi::recordarray::cell {ra row field} {
+    return [lindex [lindex $ra 1 $row] [twapi::enum [lindex $ra 0] $field]]
+}
+
+proc twapi::recordarray::get {ra args} {
+    ::twapi::parseargs args {
+        {format.arg list {list dict flat}}
+        key.arg
+    } -ignoreunknown -setvars
+
+    # format & key are options just to stop them flowing down to _recordarray
+    # We do not pass it in
+
+    return [_recordarray {*}$args $ra]
+}
+
+proc twapi::recordarray::getlist {ra args} {
+    # key is an option just to stop in flowing down to _recordarray
+    # We do not pass it in
+
+    if {[llength $args] == 0} {
+        return [lindex $ra 1]
+    }
+
+    ::twapi::parseargs args {
+        {format.arg list {list dict flat}}
+        key.arg
+    } -ignoreunknown -setvars
+
+
+    return [_recordarray {*}$args -format $format $ra]
+}
+
+proc twapi::recordarray::getdict {ra args} {
+    ::twapi::parseargs args {
+        {format.arg list {list dict}}
+        key.arg
+    } -ignoreunknown -setvars
+
+    if {![info exists key]} {
+        set key [lindex $ra 0 0]
+    }
+
+    # Note _recordarray has different (putting it politely) semantics
+    # of how -format and -key option are handled so the below might
+    # look a bit strange in that we pass -format as list and get
+    # back a dict
+    return [_recordarray {*}$args -format $format -key $key $ra]
+}
+
+proc twapi::recordarray::iterate {arrayvarname ra args} {
+
+    if {[llength $args] == 0} {
+        badargs! "No script supplied"
+    }
+
+    set body [lindex $args end]
+    set args [lrange $args 0 end-1]
+
+    upvar 1 $arrayvarname var
+
+    # TBD - Can this be optimized by prepending a ::foreach to body
+    # and executing that in uplevel 1 ?
+
+    foreach rec [getlist $ra {*}$args -format dict] {
+        array set var $rec
+        set code [catch {uplevel 1 $body} result]
+        switch -exact -- $code {
+            0 {}
+            1 {
+                return -errorinfo $::errorInfo -errorcode $::errorCode -code error $result
+            }
+            3 {
+                return;          # break
+            }
+            4 {
+                # continue
+            }
+            default {
+                return -code $code $result
+            }
+        }
+    }
+    return
+}
+
+proc twapi::recordarray::rename {ra renames} {
+    set new_fields {}
+    foreach field [lindex $ra 0] {
+        if {[dict exists $renames $field]} {
+            lappend new_fields [dict get $renames $field]
+        } else {
+            lappend new_fields $field
+        }
+    }
+    return [list $new_fields [lindex $ra 1]]
+}
+
+proc twapi::recordarray::concat {args} {
+    if {[llength $args] == 0} {
+        return {}
+    }
+    set args [lassign $args ra]
+    set fields [lindex $ra 0]
+    set values [list [lindex $ra 1]]
+    set width [llength $fields]
+    foreach ra $args {
+        foreach fld1 $fields fld2 [lindex $ra 0] {
+            if {$fld1 ne $fld2} {
+                twapi::badargs! "Attempt to concat record arrays with different fields ([join $fields ,] versus [join [lindex $ra 0] ,])"
+            }
+        }
+        lappend values [lindex $ra 1]
+    }
+
+    return [list $fields [::twapi::lconcat {*}$values]]
+}
+
+namespace eval twapi::recordarray {
+    namespace export cell column concat fields get getdict getlist index iterate range rename size
+    namespace ensemble create
+}
+
+proc twapi::_parse_ctype {def parse_mode} {
+    variable _struct_defs
+    
+    # parse_mode is "struct", "param" or "function"
+
+    if {![regexp -expanded {
+        ^
+        \s*
+        (.+[^[:alnum:]_]) # type
+        ([[:alnum:]_]+)   # name
+        \s*
+        (\[.+\])?         # array size
+        \s*$
+    } $def ->  type name array]} {
+        error "Invalid C type definition $def"
+    }
+        
+    set child {}
+    switch -regexp -matchvar matchvar -- [string trim $type] {
+        {^void$} {
+            if {$parse_mode ne "function"} {
+                error "Type void cannot be used for structs and parameters."
+            }
+            set type void
+        }
+        {^char$} {set type i1}
+        {^BYTE$} -
+        {^unsigned char$} {set type ui1}
+        {^short$} {set type i2}
+        {^WORD$} -
+        {^unsigned\s+short$} {set type ui2}
+        {^BOOLEAN$} {set type bool}
+        {^LONG$} -
+        {^int$} {set type i4}
+        {^UINT$} -
+        {^ULONG$} -
+        {^DWORD$} -
+        {^unsigned\s+int$} {set type ui4}
+        {^__int64$} {set type i8}
+        {^unsigned\s+__int64$} {set type ui8}
+        {^double$} {set type r8}
+        {^float$} {set type r4}
+        {^LPCSTR$} -
+        {^LPSTR$} -
+        {^char\s*\*$} {set type lpstr}
+        {^LPCWSTR$} -
+        {^LPWSTR$} -
+        {^WCHAR\s*\*$} {set type lpwstr}
+        {^HANDLE$} {set type handle}
+        {^PSID$} {set type psid}
+        {^struct\s+([[:alnum:]_]+)$} {
+            if {$parse_mode ne "struct"} {
+                error "Structure types not allowed for parameters and return values."
+            }
+            # Embedded struct. It should be defined already. Calling
+            # it with no args returns its definition but doing that
+            # to retrieve the definition could be a security hole
+            # (could be passed any Tcl command!) if unwary apps
+            # pass in input from unknown sources. So we explicitly
+            # remember definitions instead.
+            set child_name [lindex $matchvar 1]
+            if {![info exists _struct_defs($child_name)]} {
+                error "Unknown struct $child_name"
+            }
+            set child $_struct_defs($child_name)
+            set type struct
+        }
+        default {error "Unknown type $type"}
+    }
+    set count 0
+    if {$array ne ""} {
+        set count [string trim [string range $array 1 end-1]]
+        if {![string is integer -strict $count]} {
+            error "Non-integer array size"
+        }
+        if {$parse_mode ne "struct"} {
+            error "Arrays not allowed for parameters and return values."
+        }
+    }
+
+    if {[string equal -nocase $name "cbSize"] &&
+        $type in {i4 ui4} && $count == 0} {
+        set type cbsize
+    }
+
+    return [list $name $type $count $child]
+}
+
+proc twapi::_parse_cproto {s} {
+    variable _struct_defs
+    
+    # Get rid of comments
+    regsub -all {(/\*.* \*/){1,1}?} $s {} s
+    regsub -line -all {//.*$} $s { } s
+
+    if {![regexp -expanded {
+        ^
+        \s*
+        (?:(_cdecl|_stdcall)\s+)?
+        ([[:alnum:]_][[:space:][:alnum:]_]*) # Function type and name
+        \s*
+        \(              # Beginning of parameters
+        ([^\)]*)        # Parameter definition string
+        \)              # End of parameters
+        \s*$            # End of prototype
+    } $s -> callconv fntypeandname paramstr]} {
+        error "Invalid C prototype \"$s\""
+    }
+
+    regsub -all {\s+} $fntypeandname " "
+    set fntype [_parse_ctype $fntypeandname function]
+    set params {}
+    foreach def [split $paramstr ","] {
+        lappend params [_parse_ctype $def param]
+    }
+
+    return [list $callconv $fntype [lindex $fntype 0] $params]
+}
+
+# Return a suitable cstruct definition based on a C definition
+proc twapi::struct {struct_name s} {
+    variable _struct_defs
+
+    if {0} {
+        TBD - Commented out because nested structs do not currently
+        handle namespaces. However this means structs are effectively
+        global even if the corresponding command is not.
+        set struct_name [callerns $struct_name]
+    }
+    
+    regsub -all {(/\*.* \*/){1,1}?} $s {} s
+    regsub -line -all {//.*$} $s { } s
+    set l {}
+    foreach def [split $s ";"] {
+        set def [string trim $def]
+        if {$def eq ""} continue
+        lappend l [_parse_ctype $def struct]
+    }
+
+    set proc_body [format {
+        set def %s
+        if {[llength $args] == 0} {
+            return $def
+        } else {
+            return [list $def $args]
+        }
+    } [list $l]]
+    uplevel 1 [list proc $struct_name args $proc_body]
+    set _struct_defs($struct_name) $l
+    return
+}
+
+
+proc twapi::ffi_load {path} {
+    variable _ffi_paths
+    variable _ffi_handles
+
+    # Note we do NOT normalize path as we leave it to the OS to do so.
+    # We also do not canonicalize it (e.g. all lower case).
+    # This means there may be multiple handles for a single shared lib
+    # but that's ok.
+    
+    if {[dict exists $_ffi_paths $path]} {
+        set h [dict get $_ffi_paths $path]
+        if {![dict exists $_ffi_handles $h]} {
+            error "Internal error: Handle $h not found in FFI table."
+        }
+        dict with _ffi_handles $h {
+            if {$Path ne $path} {
+                error "Internal error: Handle $h not assigned to $path"
+            }
+            incr NRefs
+        }
+    } else {
+        set h [load_library $path]
+        dict set _ffi_paths $path $h
+        dict set _ffi_handles $h Path $path
+        dict set _ffi_handles $h NRefs 1
+    }
+    return $h
+}
+
+proc twapi::ffi_unload {h} {
+    variable _ffi_handles
+    variable _ffi_paths
+
+    if {![dict exists $_ffi_handles $h]} {
+        error "FFI handle $h does not exist."
+    }
+
+    dict with _ffi_handles $h {
+        if {[incr NRefs -1] <= 0} {
+            dict unset _ffi_paths $Path
+            dict unset _ffi_handles $h
+        }
+    }
+
+    return
+}
+
+proc twapi::ffi_cfuncs {dllh cprotos {ns ::}} {
+    variable _ffi_handles
+
+    if {![dict exists $_ffi_handles $dllh]} {
+    #    error "Unknown FFI handle \"$dllh\"."
+    }
+
+    set l {}
+    foreach cproto [split $cprotos ";"] {
+        set cproto [string trim $cproto]
+        if {$cproto eq ""} continue
+        lappend l [_parse_cproto $cproto]
+    }
+    set cprotos $l
+
+    set def {
+        proc %NAME% {%PARAMNAMES%} {
+            if {![dict exists $%TWAPINS%::_ffi_handles %DLLH%]} {
+                error "Attempt to call function in unloaded library."
+            }
+            %TWAPINS%::%CALL% %FNADDR% %FNTYPE% %PARAMS% [list %PARAMREFS%]
+        }
+    }
+
+    if {$::tcl_platform(pointerSize) == 8} {
+        # Win64 has single calling convention
+        set callmap {"" ffi_call _cdecl ffi_call _stdcall ffi_call}
+    } else {
+        set callmap {"" ffi_call _cdecl ffi_call _stdcall ffi_stdcall}
+    } 
+
+    foreach cproto $cprotos {
+        lassign $cproto callconv fntype fnname params
+        set call [dict get $callmap $callconv]
+            
+        set fnaddr [GetProcAddress $dllh $fnname]
+        if {[pointer_null? $fnaddr]} {
+            error "Entry point $fnname not found in shared library."
+        }
+        set paramnames {}
+        set paramrefs {}
+        foreach arg $params {
+            set name [lindex $arg 0]
+            lappend paramnames $name
+            lappend paramrefs \$$name
+        }
+
+        # Note that fntype is doubly listified because the C ffi expects
+        # it in same format as params, ie. a list of type definitions
+        # _parse_cproto however returns it as a single type definition
+        append defs [string map [list \
+                                     %CALL%    $call \
+                                     %DLLH%    [list $dllh] \
+                                     %NAME%    ${ns}::$fnname \
+                                     %PARAMNAMES% [join $paramnames { }] \
+                                     %PARAMREFS% [join $paramrefs { }] \
+                                     %TWAPINS% [namespace current] \
+                                     %FNADDR%  [list $fnaddr] \
+                                     %FNTYPE%  [list [list $fntype]] \
+                                     %PARAMS%  [list $params]] \
+                         $def] \n
+    }
+    
+    uplevel 1 $defs 
+}
+
+
+if {[twapi::min_os_version 6]} {
+    twapi::ffi_cfuncs [twapi::ffi_load kernel32.dll] {
+        UINT GetErrorMode();
+        UINT SetErrorMode(UINT mode);
+    } ::twapi
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/clipboard.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/clipboard.tcl
new file mode 100644
index 00000000..9fee98f8
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/clipboard.tcl
@@ -0,0 +1,254 @@
+#
+# Copyright (c) 2004, 2008 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# Clipboard related commands
+
+namespace eval twapi {}
+
+# Open the clipboard
+# TBD - why no mechanism to pass window handle to OpenClipboard?
+proc twapi::open_clipboard {} {
+    OpenClipboard 0
+}
+
+# Close the clipboard
+proc twapi::close_clipboard {} {
+    catch {CloseClipboard}
+    return
+}
+
+# Empty the clipboard
+proc twapi::empty_clipboard {} {
+    EmptyClipboard
+}
+
+proc twapi::_read_clipboard {fmt} {
+    # Always catch errors and close clipboard before passing exception on
+    # Also ensure memory unlocked
+    trap {
+        set h [GetClipboardData $fmt]
+        set p [GlobalLock $h]
+        set data [Twapi_ReadMemory 1 $p 0 [GlobalSize $h]]
+    } onerror {} {
+        catch {close_clipboard}
+        rethrow
+    } finally {
+        # If p exists, then we must have locked the handle
+        if {[info exists p]} {
+            GlobalUnlock $h
+        }
+    }
+    return $data
+}
+
+proc twapi::read_clipboard {fmt} {
+    trap {
+        set data [_read_clipboard $fmt]
+    } onerror {TWAPI_WIN32 1418} {
+        # Caller did not have clipboard open. Do it on its behalf
+        open_clipboard
+        trap {
+            set data [_read_clipboard $fmt]
+        } finally {
+            catch {close_clipboard}
+        }
+    }
+    return $data
+}
+
+# Read text data from the clipboard
+proc twapi::read_clipboard_text {args} {
+    array set opts [parseargs args {
+        {raw.bool 0}
+    }]
+
+    set bin [read_clipboard 13]; # 13 -> Unicode
+    # Decode Unicode and discard trailing nulls
+    set data [string trimright [encoding convertfrom unicode $bin] \0]
+    if {! $opts(raw)} {
+        set data [string map {"\r\n" "\n"} $data]
+    }
+
+    return $data
+}
+
+proc twapi::_write_clipboard {fmt data} {
+    # Always catch errors and close
+    # clipboard before passing exception on
+    trap {
+        # For byte arrays, string length does return correct size
+        # (DO NOT USE string bytelength - see Tcl docs!)
+        set len [string length $data]
+
+        # Allocate global memory
+        set mem_h [GlobalAlloc 2 $len]
+        set mem_p [GlobalLock $mem_h]
+
+        Twapi_WriteMemory 1 $mem_p 0 $len $data
+
+        # The rest of this code just to ensure we do not free
+        # memory beyond this point irrespective of error/success
+        set h $mem_h
+        unset mem_p mem_h
+        GlobalUnlock $h
+        SetClipboardData $fmt $h
+    } onerror {} {
+        catch close_clipboard
+        rethrow
+    } finally {
+        if {[info exists mem_p]} {
+            GlobalUnlock $mem_h
+        }
+        if {[info exists mem_h]} {
+            GlobalFree $mem_h
+        }
+    }
+    return
+}
+
+proc twapi::write_clipboard {fmt data} {
+    trap {
+        _write_clipboard $fmt $data
+    } onerror {TWAPI_WIN32 1418} {
+        # Caller did not have clipboard open. Do it on its behalf
+        open_clipboard
+        empty_clipboard
+        trap {
+            _write_clipboard $fmt $data
+        } finally {
+            catch close_clipboard
+        }
+    }
+    return
+}
+
+# Write text to the clipboard
+proc twapi::write_clipboard_text {data args} {
+    array set opts [parseargs args {
+        {raw.bool 0}
+    }]
+
+    # Convert \n to \r\n leaving existing \r\n alone
+    if {! $opts(raw)} {
+        set data [regsub -all {(^|[^\r])\n} $data[set data ""] \\1\r\n]
+    }
+    append data \0
+    write_clipboard 13 [encoding convertto unicode $data]; # 13 -> Unicode
+    return
+}
+
+# Get current clipboard formats
+proc twapi::get_clipboard_formats {} {
+    return [Twapi_EnumClipboardFormats]
+}
+
+# Get registered clipboard format name. Clipboard does not have to be open
+proc twapi::get_registered_clipboard_format_name {fmt} {
+    return [GetClipboardFormatName $fmt]
+}
+
+# Register a clipboard format
+proc twapi::register_clipboard_format {fmt_name} {
+    RegisterClipboardFormat $fmt_name
+}
+
+# Returns 1/0 depending on whether a format is on the clipboard. Clipboard
+# does not have to be open
+proc twapi::clipboard_format_available {fmt} {
+    return [IsClipboardFormatAvailable $fmt]
+}
+
+proc twapi::read_clipboard_paths {} { 
+    set bin [read_clipboard 15]
+    # Extract the DROPFILES header 
+    if {[binary scan $bin iiiii offset - - - unicode] != 5} { 
+        error "Invalid or unsupported clipboard CF_DROP data." 
+    } 
+    # Sanity check 
+    if {$offset >= [string length $bin]} { 
+        error "Truncated clipboard data." 
+    } 
+    if {$unicode} { 
+        set paths [encoding convertfrom unicode [string range $bin $offset end]] 
+    } else { 
+        set paths [encoding convertfrom ascii [string range $bin $offset end]] 
+    } 
+    set ret {}
+    foreach path [split $paths \0] { 
+        if {[string length $path] == 0} break; # Empty string -> end of list 
+        lappend ret [file join $path]
+    }
+    return $ret
+} 
+
+proc twapi::write_clipboard_paths {paths} { 
+    # The header for a DROPFILES path list in hex 
+    set fheader "1400000000000000000000000000000001000000" 
+    set bin [binary format H* $fheader] 
+    foreach path $paths { 
+        # Note explicit \0 so the encoded binary includes the null terminator 
+        append bin [encoding convertto unicode "[file nativename [file normalize $path]]\0"] 
+    } 
+    # A Unicode null char to terminate the list of paths 
+    append bin [encoding convertto unicode \0] 
+    write_clipboard 15 $bin 
+}
+
+# Start monitoring of the clipboard
+proc twapi::_clipboard_handler {} {
+    variable _clipboard_monitors
+
+    if {![info exists _clipboard_monitors] ||
+        [llength $_clipboard_monitors] == 0} {
+        return; # Not an error, could have deleted while already queued
+    }
+
+    foreach {id script} $_clipboard_monitors {
+        set code [catch {uplevel #0 $script} msg]
+        if {$code == 1} {
+            # Error - put in background but we do not abort
+            after 0 [list error $msg $::errorInfo $::errorCode]
+        }
+    }
+    return
+}
+
+proc twapi::start_clipboard_monitor {script} {
+    variable _clipboard_monitors
+
+    set id "clip#[TwapiId]"
+    if {![info exists _clipboard_monitors] ||
+        [llength $_clipboard_monitors] == 0} {
+        # No clipboard monitoring in progress. Start it
+        Twapi_ClipboardMonitorStart
+    }
+
+    lappend _clipboard_monitors $id $script
+    return $id
+}
+
+
+
+# Stop monitoring of the clipboard
+proc twapi::stop_clipboard_monitor {clipid} {
+    variable _clipboard_monitors
+
+    if {![info exists _clipboard_monitors]} {
+        return;                 # Should we raise an error instead?
+    }
+
+    set new_monitors {}
+    foreach {id script} $_clipboard_monitors {
+        if {$id ne $clipid} {
+            lappend new_monitors $id $script
+        }
+    }
+
+    set _clipboard_monitors $new_monitors
+    if {[llength $_clipboard_monitors] == 0} {
+        Twapi_ClipboardMonitorStop
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/com.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/com.tcl
new file mode 100644
index 00000000..128a3458
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/com.tcl
@@ -0,0 +1,4238 @@
+#
+# Copyright (c) 2006-2018 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# TBD - tests  comobj? works with derived classes of Automation
+
+# TBD - object identity comparison
+#   - see http://blogs.msdn.com/ericlippert/archive/2005/04/26/412199.aspx
+# TBD - we seem to resolve UDT's every time a COM method is actually invoked.
+# Optimize by doing it when prototype is stored or only the first time it
+# is called.
+# TBD - optimize by caching UDT's within a type library when the library
+# is read.
+
+# TBD - optimize comobj unknown by caching previously resolved names
+#
+
+
+namespace eval twapi {
+    # Maps TYPEKIND data values to symbols
+    variable _typekind_map
+    array set _typekind_map {
+        0 enum
+        1 record
+        2 module
+        3 interface
+        4 dispatch
+        5 coclass
+        6 alias
+        7 union
+    }
+
+    # Cache of Interface names - IID mappings
+    variable _name_to_iid_cache
+    array set _name_to_iid_cache {
+        iunknown  {{00000000-0000-0000-C000-000000000046}}
+        idispatch {{00020400-0000-0000-C000-000000000046}}
+        idispatchex {{A6EF9860-C720-11D0-9337-00A0C90DCAA9}}
+        itypeinfo {{00020401-0000-0000-C000-000000000046}}
+        itypecomp {{00020403-0000-0000-C000-000000000046}}
+        ienumvariant {{00020404-0000-0000-C000-000000000046}}
+        iprovideclassinfo {{B196B283-BAB4-101A-B69C-00AA00341D07}}
+
+        ipersist  {{0000010c-0000-0000-C000-000000000046}}
+        ipersistfile {{0000010b-0000-0000-C000-000000000046}}
+
+        iprovidetaskpage {{4086658a-cbbb-11cf-b604-00c04fd8d565}}
+        itasktrigger {{148BD52B-A2AB-11CE-B11F-00AA00530503}}
+        ischeduleworkitem {{a6b952f0-a4b1-11d0-997d-00aa006887ec}}
+        itask {{148BD524-A2AB-11CE-B11F-00AA00530503}}
+        ienumworkitems {{148BD528-A2AB-11CE-B11F-00AA00530503}}
+        itaskscheduler {{148BD527-A2AB-11CE-B11F-00AA00530503}}
+        imofcompiler {{6daf974e-2e37-11d2-aec9-00c04fb68820}}
+    }
+}
+
+proc twapi::IUnknown_QueryInterface {ifc iid} {
+    set iidname void
+    catch {set iidname [registry get HKEY_CLASSES_ROOT\\Interface\\$iid ""]}
+    return [Twapi_IUnknown_QueryInterface $ifc $iid $iidname]
+}
+
+proc twapi::CoGetObject {name bindopts iid} {
+    set iidname void
+    catch {set iidname [registry get HKEY_CLASSES_ROOT\\Interface\\$iid ""]}
+    return [Twapi_CoGetObject $name $bindopts $iid $iidname]
+}
+
+proc twapi::progid_to_clsid {progid} { return [CLSIDFromProgID $progid] }
+proc twapi::clsid_to_progid {progid} { return [ProgIDFromCLSID $progid] }
+
+proc twapi::com_security_blanket {args} {
+    # mutualauth.bool - docs for EOLE_AUTHENTICATION_CAPABILITIES. Learning
+    # DCOM says it is only for CoInitializeSecurity. Either way, 
+    # that option is not applicable here
+    parseargs args {
+        {authenticationservice.arg default}
+        serverprincipal.arg
+        {authenticationlevel.arg default}
+        {impersonationlevel.arg default}
+        credentials.arg
+        cloaking.arg
+    } -maxleftover 0 -setvars
+
+    set authenticationservice [_com_name_to_authsvc $authenticationservice]
+    set authenticationlevel [_com_name_to_authlevel $authenticationlevel]
+    set impersonationlevel [_com_name_to_impersonation $impersonationlevel]
+
+    if {![info exists cloaking]} {
+        set eoac 0x800;         # EOAC_DEFAULT
+    } else {
+        set eoac [dict! {none 0 static 0x20 dynamic 0x40} $cloaking]
+    }
+
+    if {[info exists credentials]} {
+        # Credentials specified. Empty list -> NULL, ie use thread token
+        set creds_tag 1
+    } else {
+        # Credentials not to be changed
+        set creds_tag 0
+        set credentials {};     # Ignored
+    }
+
+    if {[info exists serverprincipal]} {
+        if {$serverprincipal eq ""} {
+            set serverprincipaltag 0; # Default based on com_initialize_security
+        } else {
+            set serverprincipaltag 2
+        }
+    } else {
+        set serverprincipaltag 1; # Unchanged server principal
+        set serverprincipal ""
+    }
+
+    return [list $authenticationservice 0 $serverprincipaltag $serverprincipal $authenticationlevel $impersonationlevel $creds_tag $credentials $eoac]
+}
+
+proc twapi::com_query_client_blanket {} {
+    lassign [CoQueryClientBlanket] authn authz server authlevel implevel client capabilities
+    if {$capabilities & 0x20} {
+        # EOAC_STATIC_CLOAKING
+        set cloaking static
+    } elseif {$capabilities & 0x40} {
+        set cloaking dynamic
+    } else {
+        set cloaking none
+    }
+
+    # Note there is no implevel set as CoQueryClientBlanket does
+    # not return that information and implevel is a dummy value
+    return [list \
+                -authenticationservice [_com_authsvc_to_name $authn] \
+                -authorizationservice [dict* {0 none 1 name 2 dce} $authz] \
+                -serverprincipal $server \
+                -authenticationlevel [_com_authlevel_to_name $authlevel] \
+                -clientprincipal $client \
+                -cloaking $cloaking \
+               ]
+}
+
+# TBD - document
+proc twapi::com_query_proxy_blanket {ifc} {
+    lassign [CoQueryProxyBlanket [lindex $args 0]] authn authz server authlevel implevel client capabilities
+    if {$capabilities & 0x20} {
+        # EOAC_STATIC_CLOAKING
+        set cloaking static
+    } elseif {$capabilities & 0x40} {
+        set cloaking dynamic
+    } else {
+        set cloaking none
+    }
+
+    return [list \
+                -authenticationservice [_com_authsvc_to_name $authn] \
+                -authorizationservice [dict* {0 none 1 name 2 dce} $authz] \
+                -serverprincipal $server \
+                -authenticationlevel [_com_authlevel_to_name $authlevel] \
+                -impersonationlevel [_com_impersonation_to_name $implevel] \
+                -clientprincipal $client \
+                -cloaking $cloaking \
+               ]
+
+}
+
+proc twapi::com_initialize_security {args} {
+    # TBD - mutualauth?
+    # TBD - securerefs?
+    parseargs args {
+        {authenticationlevel.arg default}
+        {impersonationlevel.arg impersonate}
+        {cloaking.sym none {none 0 static 0x20 dynamic 0x40}}
+        secd.arg
+        appid.arg
+        authenticationservices.arg
+    } -maxleftover 0 -setvars
+
+    if {[info exists secd] && [info exists appid]} {
+        badargs! "Only one of -secd and -appid can be specified."
+    }
+
+    set impersonationlevel [_com_name_to_impersonation $impersonationlevel]
+    set authenticationlevel [_com_name_to_authlevel $authenticationlevel]
+
+    set eoac $cloaking
+    if {[info exists appid]} {
+        incr eoac 8;     # 8 -> EOAC_APPID
+        set secarg $appid
+    } else {
+        if {[info exists secd]} {
+            set secarg $secd
+        } else {
+            set secarg {}
+        }
+    }
+
+    set authlist {}
+    if {[info exists authenticationservices]} {
+        foreach authsvc $authenticationservices {
+            lappend authlist [list [_com_name_to_authsvc [lindex $authsvc 0]] 0 [lindex $authsvc 1]]
+        }
+    }
+
+    CoInitializeSecurity $secarg "" "" $authenticationlevel $impersonationlevel $authlist $eoac ""
+}
+
+interp alias {} twapi::com_make_credentials {} twapi::make_logon_identity
+
+# TBD - document
+proc twapi::com_create_instance {clsid args} {
+    array set opts [parseargs args {
+        {model.arg any}
+        download.bool
+        {disablelog.bool false}
+        enableaaa.bool
+        {nocustommarshal.bool false 0x1000}
+        {interface.arg IUnknown}
+        {authenticationservice.arg none}
+        {impersonationlevel.arg impersonate}
+        {credentials.arg {}}
+        {serverprincipal.arg {}}
+        {authenticationlevel.arg default}
+        {mutualauth.bool 0 0x1}
+        securityblanket.arg
+        system.arg
+        raw
+    } -maxleftover 0]
+
+    set opts(authenticationservice) [_com_name_to_authsvc $opts(authenticationservice)]
+    set opts(authenticationlevel) [_com_name_to_authlevel $opts(authenticationlevel)]
+    set opts(impersonationlevel) [_com_name_to_impersonation $opts(impersonationlevel)]
+
+    # CLSCTX_NO_CUSTOM_MARSHAL ?
+    set flags $opts(nocustommarshal)
+
+    set model 0
+    if {[info exists opts(model)]} {
+        foreach m $opts(model) {
+            switch -exact -- $m {
+                any           {setbits model 23}
+                inprocserver  {setbits model 1}
+                inprochandler {setbits model 2}
+                localserver   {setbits model 4}
+                remoteserver  {setbits model 16}
+            }
+        }
+    }
+
+    setbits flags $model
+
+    if {[info exists opts(download)]} {
+        if {$opts(download)} {
+            setbits flags 0x2000;       # CLSCTX_ENABLE_CODE_DOWNLOAD
+        } else {
+            setbits flags 0x400;       # CLSCTX_NO_CODE_DOWNLOAD
+        }
+    }
+
+    if {$opts(disablelog)} {
+        setbits flags 0x4000;           # CLSCTX_NO_FAILURE_LOG
+    }
+
+    if {[info exists opts(enableaaa)]} {
+        if {$opts(enableaaa)} {
+            setbits flags 0x10000;       # CLSCTX_ENABLE_AAA
+        } else {
+            setbits flags 0x8000;       # CLSCTX_DISABLE_AAA
+        }
+    }
+
+    if {[info exists opts(system)]} {
+        set coserverinfo [list 0 $opts(system) \
+                              [list $opts(authenticationservice) \
+                                   0 \
+                                   $opts(serverprincipal) \
+                                   $opts(authenticationlevel) \
+                                   $opts(impersonationlevel) \
+                                   $opts(credentials) \
+                                   $opts(mutualauth) \
+                                   ] \
+                              0]
+        set activation_blanket \
+            [com_security_blanket \
+                 -authenticationservice $opts(authenticationservice) \
+                 -serverprincipal $opts(serverprincipal) \
+                 -authenticationlevel $opts(authenticationlevel) \
+                 -impersonationlevel $opts(impersonationlevel) \
+                 -credentials $opts(credentials)]
+    } else {
+        set coserverinfo {}
+    }
+
+    # If remote, set the specified security blanket on the proxy. Note
+    # that the blanket settings passed to CoCreateInstanceEx are used
+    # only for activation and do NOT get passed down to method calls
+    # If a remote component is activated with specific identity, we
+    # assume method calls require the same security settings.
+
+    if {([info exists activation_blanket] || [llength $opts(credentials)]) &&
+        ![info exists opts(securityblanket)]} {
+        if {[info exists activation_blanket]} {
+            set opts(securityblanket) $activation_blanket
+        } else {
+            set opts(securityblanket) [com_security_blanket -credentials $opts(credentials)]
+        }
+    }
+
+    lassign [_resolve_iid $opts(interface)] iid iid_name
+
+    # TBD - is all this OleRun still necessary or is there a check we can make
+    # before going down that path ?
+    # Microsoft Office (and maybe others) have some, uhhm, quirks.
+    # If they are loaded as inproc, all calls to retrieve an interface other 
+    # than IUnknown fails. We have to get the IUnknown interface,
+    # call OleRun and then retrieve the desired interface.
+    # This does not happen if the localserver model was requested.
+    # We could check for a specific error code but no guarantee that
+    # the error is same in all versions so we catch and retry on all errors.
+    # 3rd element of each sublist is status. Non-0 -> Failure code
+    if {[catch {set ifcs [CoCreateInstanceEx $clsid NULL $flags $coserverinfo [list $iid]]}] || [lindex $ifcs 0 2] != 0} {
+        # Try through IUnknown
+        set ifcs [CoCreateInstanceEx $clsid NULL $flags $coserverinfo [list [_iid_iunknown]]]
+
+        if {[lindex $ifcs 0 2] != 0} {
+            win32_error [lindex $ifcs 0 2]
+        }
+        set iunk [lindex $ifcs 0 1]
+
+        # Need to set security blanket if specified before invoking any method
+        # else will get access denied
+        if {[info exists opts(securityblanket)]} {
+            trap {
+                CoSetProxyBlanket $iunk {*}$opts(securityblanket)
+            } onerror {} {
+                IUnknown_Release $iunk
+                rethrow
+            }
+        }
+
+        trap {
+            # Wait for it to run, then get desired interface from it
+            twapi::OleRun $iunk
+            set ifc [Twapi_IUnknown_QueryInterface $iunk $iid $iid_name]
+        } finally {
+            IUnknown_Release $iunk
+        }
+    } else {
+        set ifc [lindex $ifcs 0 1]
+    }
+
+    # All interfaces are returned typed as IUnknown by the C level
+    # even though they are actually the requested type.
+    set ifc [cast_handle $ifc $iid_name]
+
+    if {[info exists activation_blanket]} {
+        # In order for servers to release objects properly, the IUnknown
+        # interface must have the same security settings as were used in
+        # the object creation
+        _com_set_iunknown_proxy $ifc $activation_blanket
+    }
+
+    if {$opts(raw)} {
+        if {[info exists opts(securityblanket)]} {
+            trap {
+                CoSetProxyBlanket $ifc {*}$opts(securityblanket)
+            } onerror {} {
+                IUnknown_Release $ifc
+                rethrow
+            }
+        }
+        return $ifc
+    } else {
+        set proxy [make_interface_proxy $ifc]
+        if {[info exists opts(securityblanket)]} {
+            trap {
+                $proxy @SetSecurityBlanket $opts(securityblanket)
+            } onerror {} {
+                catch {$proxy Release}
+                rethrow
+            }
+        }
+        return $proxy
+    }
+}
+
+
+proc twapi::comobj_idispatch {ifc {addref 0} {objclsid ""} {lcid 0}} {
+    if {[pointer_null? $ifc]} {
+        return ::twapi::comobj_null
+    }
+
+    if {[pointer? $ifc IDispatch]} {
+        if {$addref} { IUnknown_AddRef $ifc }
+        set proxyobj [IDispatchProxy new $ifc $objclsid]
+    } elseif {[pointer? $ifc IDispatchEx]} {
+        if {$addref} { IUnknown_AddRef $ifc }
+        set proxyobj [IDispatchExProxy new $ifc $objclsid]
+    } else {
+        error "'$ifc' does not reference an IDispatch interface"
+    }
+
+    return [Automation new $proxyobj $lcid]
+}
+
+#
+# Create an object command for a COM object from a name
+proc twapi::comobj_object {path args} {
+    array set opts [parseargs args {
+        progid.arg
+        {interface.arg IDispatch {IDispatch IDispatchEx}}
+        {lcid.int 0}
+    } -maxleftover 0]
+
+    set clsid ""
+    if {[info exists opts(progid)]} {
+        # TBD - document once we have a test case for this
+        # Specify which app to use to open the file.
+        # See "Mapping Visual Basic to Automation" in SDK help
+        set clsid [_convert_to_clsid $opts(progid)]
+        set ipersistfile [com_create_instance $clsid -interface IPersistFile]
+        trap {
+            IPersistFile_Load $ipersistfile $path 0
+            set idisp [Twapi_IUnknown_QueryInterface $ipersistfile [_iid_idispatch] IDispatch]
+        } finally {
+            IUnknown_Release $ipersistfile
+        }
+    } else {
+        # TBD - can we get the CLSID for this case
+        set idisp [::twapi::Twapi_CoGetObject $path {} [name_to_iid $opts(interface)] $opts(interface)]
+    }
+
+    return [comobj_idispatch $idisp 0 $clsid $opts(lcid)]
+}
+
+#
+# Create a object command for a COM object IDispatch interface
+# comid is either a CLSID or a PROGID
+proc twapi::comobj {comid args} {
+    array set opts [parseargs args {
+        {interface.arg IDispatch {IDispatch IDispatchEx}}
+        active
+        {lcid.int 0}
+    } -ignoreunknown]
+    set clsid [_convert_to_clsid $comid]
+    if {$opts(active)} {
+        set iunk [GetActiveObject $clsid]
+        twapi::trap {
+            # TBD - do we need to deal with security blanket here? How do
+            # know what blanket is to be used on an already active object?
+            # Get the IDispatch interface
+            set idisp [IUnknown_QueryInterface $iunk {{00020400-0000-0000-C000-000000000046}}]
+            return [comobj_idispatch $idisp 0 $clsid $opts(lcid)]
+        } finally {
+            IUnknown_Release $iunk
+        }
+    } else {
+        set proxy [com_create_instance $clsid -interface $opts(interface) {*}$args]
+        $proxy @SetCLSID $clsid
+        return [Automation new $proxy $opts(lcid)]
+    }
+}
+
+proc twapi::comobj_destroy args {
+    foreach arg $args {
+        catch {$arg -destroy}
+    }
+}
+
+# Return an interface to a typelib
+proc twapi::ITypeLibProxy_from_path {path args} {
+    array set opts [parseargs args {
+        {registration.arg none {none register default}}
+    } -maxleftover 0]
+
+    return [make_interface_proxy [LoadTypeLibEx $path [kl_get {default 0 register 1 none 2} $opts(registration) $opts(registration)]]]
+}
+
+#
+# Return an interface to a typelib from the registry
+proc twapi::ITypeLibProxy_from_guid {uuid major minor args} {
+    array set opts [parseargs args {
+        lcid.int
+    } -maxleftover 0 -nulldefault]
+
+    return [make_interface_proxy [LoadRegTypeLib $uuid $major $minor $opts(lcid)]]
+}
+
+#
+# Unregister a typelib
+proc twapi::unregister_typelib {uuid major minor args} {
+    array set opts [parseargs args {
+        lcid.int
+    } -maxleftover 0 -nulldefault]
+
+    UnRegisterTypeLib $uuid $major $minor $opts(lcid) 1
+}
+
+#
+# Returns the path to the typelib based on a guid
+proc twapi::get_typelib_path_from_guid {guid major minor args} {
+    array set opts [parseargs args {
+        lcid.int
+    } -maxleftover 0 -nulldefault]
+
+
+    set path [variant_value [QueryPathOfRegTypeLib $guid $major $minor $opts(lcid)] 0 0 $opts(lcid)]
+    # At least some versions have a bug in that there is an extra \0
+    # at the end.
+    if {[string equal [string index $path end] \0]} {
+        set path [string range $path 0 end-1]
+    }
+    return $path
+}
+
+#
+# Map interface name to IID
+proc twapi::name_to_iid {iname} {
+    set iname [string tolower $iname]
+
+    if {[info exists ::twapi::_name_to_iid_cache($iname)]} {
+        return $::twapi::_name_to_iid_cache($iname)
+    }
+
+    # Look up the registry
+    set iids {}
+    foreach iid [registry keys HKEY_CLASSES_ROOT\\Interface] {
+        if {![catch {
+            set val [registry get HKEY_CLASSES_ROOT\\Interface\\$iid ""]
+        }]} {
+            if {[string equal -nocase $iname $val]} {
+                lappend iids $iid
+            }
+        }
+    }
+
+    if {[llength $iids] == 1} {
+        return [set ::twapi::_name_to_iid_cache($iname) [lindex $iids 0]]
+    } elseif {[llength $iids]} {
+        error "Multiple interfaces found matching name $iname: [join $iids ,]"
+    } else {
+        return [set ::twapi::_name_to_iid_cache($iname) ""]
+    }
+}
+
+
+#
+# Map interface IID to name
+proc twapi::iid_to_name {iid} {
+    set iname ""
+    catch {set iname [registry get HKEY_CLASSES_ROOT\\Interface\\$iid ""]}
+    return $iname
+}
+
+#
+# Convert a variant time to a time list
+proc twapi::variant_time_to_timelist {double} {
+    return [VariantTimeToSystemTime $double]
+}
+
+#
+# Convert a time list time to a variant time
+proc twapi::timelist_to_variant_time {timelist} {
+    return [SystemTimeToVariantTime $timelist]
+}
+
+
+proc twapi::typelib_print {path args} {
+    array set opts [parseargs args {
+        type.arg
+        name.arg
+        output.arg
+    } -maxleftover 0 -nulldefault]
+
+    
+    if {$opts(output) ne ""} {
+        if {[file exists $opts(output)]} {
+            error "File $opts(output) already exists."
+        }
+        set outfd [open $opts(output) a]
+    } else {
+        set outfd stdout
+    }
+
+    trap {
+        set tl [ITypeLibProxy_from_path $path -registration none]
+        puts $outfd [$tl @Text -type $opts(type) -name $opts(name)]
+    } finally {
+        if {[info exists tl]} {
+            $tl Release
+        }
+        if {$outfd ne "stdout"} {
+            close $outfd
+        }
+    }        
+
+    return
+}
+
+proc twapi::generate_code_from_typelib {path args} {
+    array set opts [parseargs args {
+        output.arg
+    } -ignoreunknown]
+
+    if {[info exists opts(output)]} {
+        if {$opts(output) ne "stdout"} {
+            if {[file exists $opts(output)]} {
+                error "File $opts(output) already exists."
+            }
+            set outfd [open $opts(output) a]
+        } else {
+            set outfd stdout
+        }
+    }
+
+    trap {
+        set tl [ITypeLibProxy_from_path $path -registration none]
+        set code [$tl @GenerateCode {*}$args]
+        if {[info exists outfd]} {
+            set libattr [$tl @GetLibAttr -all]
+            puts $outfd "# Automatically generated type library interface"
+            puts $outfd "# File:    [file tail $path]"
+            puts $outfd "# Name:    [$tl @GetName]"
+            puts $outfd "# GUID:    [dict get $libattr -guid]"
+            puts $outfd "# Version: [dict get $libattr -majorversion].[dict get $libattr -minorversion]"
+            puts $outfd "# LCID:    [dict get $libattr -lcid]"
+            
+            puts $outfd "\npackage require twapi_com"
+            puts $outfd $code
+            return
+        } else {
+            return $code
+        }
+    } finally {
+        if {[info exists tl]} {
+            $tl Release
+        }
+        if {[info exists outfd] && $outfd ne "stdout"} {
+            close $outfd
+        }
+    }        
+}
+
+
+
+
+proc twapi::_interface_text {ti} {
+    # ti must be TypeInfo for an interface or module (or enum?) - TBD
+    set desc ""
+    array set attrs [$ti @GetTypeAttr -all]
+    set desc "Functions:\n"
+    for {set j 0} {$j < $attrs(-fncount)} {incr j} {
+        array set funcdata [$ti @GetFuncDesc $j -all]
+        if {$funcdata(-funckind) eq "dispatch"} {
+            set funckind "(dispid $funcdata(-memid))"
+        } else {
+            set funckind "(vtable $funcdata(-vtbloffset))"
+        }
+        append desc "\t$funckind [::twapi::_resolve_com_type_text $ti $funcdata(-datatype)] $funcdata(-name) $funcdata(-invkind) [::twapi::_resolve_com_params_text $ti $funcdata(-params) $funcdata(-paramnames)]\n"
+    }
+    append desc "Variables:\n"
+    for {set j 0} {$j < $attrs(-varcount)} {incr j} {
+        array set vardata [$ti @GetVarDesc $j -all]
+        set vardesc "($vardata(-memid)) $vardata(-varkind) [::twapi::_flatten_com_type [::twapi::_resolve_com_type_text $ti $vardata(-datatype)]] $vardata(-name)"
+        if {$attrs(-typekind) eq "enum" || $vardata(-varkind) eq "const"} {
+            append vardesc " = $vardata(-value)"
+        } else {
+            append vardesc " (offset $vardata(-value))"
+        }
+        append desc "\t$vardesc\n"
+    }
+    return $desc
+}
+
+#
+# Print methods in an interface, including inherited names
+proc twapi::dispatch_print {di args} {
+    array set opts [parseargs args {
+        output.arg
+    } -maxleftover 0 -nulldefault]
+
+    if {$opts(output) ne ""} {
+        if {[file exists $opts(output)]} {
+            error "File $opts(output) already exists."
+        }
+        set outfd [open $opts(output) a]
+    } else {
+        set outfd stdout
+    }
+
+    trap {
+        set ti [$di @GetTypeInfo]
+        twapi::_dispatch_print_helper $ti $outfd
+    } finally {
+        if {[info exists ti]} {
+            $ti Release
+        }
+        if {$outfd ne "stdout"} {
+            close $outfd
+        }
+    }
+
+    return
+}
+
+proc twapi::_dispatch_print_helper {ti outfd {names_already_done ""}} {
+    set name [$ti @GetName]
+    if {$name in $names_already_done} {
+        # Already printed this
+        return $names_already_done
+    }
+    lappend names_already_done $name
+
+    # Check for dual interfaces - we want to print both vtable and disp versions
+    set tilist [list $ti]
+    if {![catch {set ti2 [$ti @GetRefTypeInfoFromIndex $ti -1]}]} {
+        lappend tilist $ti2
+    }
+
+    trap {
+        foreach tifc $tilist {
+            puts $outfd $name
+            puts $outfd [_interface_text $tifc]
+        }
+    } finally {
+        if {[info exists ti2]} {
+            $ti2 Release
+        }
+    }
+
+    # Now get any referenced typeinfos and print them
+    array set tiattrs [$ti GetTypeAttr]
+    for {set j 0} {$j < $tiattrs(cImplTypes)} {incr j} {
+        set ti2 [$ti @GetRefTypeInfoFromIndex $j]
+        trap {
+            set names_already_done [_dispatch_print_helper $ti2 $outfd $names_already_done]
+        } finally {
+            $ti2 Release
+        }
+    }
+
+    return $names_already_done
+}
+
+
+
+#
+# Resolves references to parameter definition
+proc twapi::_resolve_com_params_text {ti params paramnames} {
+    set result [list ]
+    foreach param $params paramname $paramnames {
+        set paramdesc [_flatten_com_type [_resolve_com_type_text $ti [lindex $param 0]]]
+        if {[llength $param] > 1 && [llength [lindex $param 1]] > 0} {
+            set paramdesc "\[[lindex $param 1]\] $paramdesc"
+        }
+        if {[llength $param] > 2} {
+            append paramdesc " [lrange $param 2 end]"
+        }
+        append paramdesc " $paramname"
+        lappend result $paramdesc
+    }
+    return "([join $result {, }])"
+}
+
+# Flattens the output of _resolve_com_type_text
+proc twapi::_flatten_com_type {com_type_desc} {
+    if {[llength $com_type_desc] < 2} {
+        return $com_type_desc
+    }
+
+    if {[lindex $com_type_desc 0] eq "ptr"} {
+        return "[_flatten_com_type [lindex $com_type_desc 1]]*"
+    } else {
+        return "([lindex $com_type_desc 0] [_flatten_com_type [lindex $com_type_desc 1]])"
+    }
+}
+
+#
+# Resolves typedefs
+proc twapi::_resolve_com_type_text {ti typedesc} {
+    
+    switch -exact -- [lindex $typedesc 0] {
+        26 -
+        ptr {
+            # Recurse to resolve any inner types
+            set typedesc [list ptr [_resolve_com_type_text $ti [lindex $typedesc 1]]]
+        }
+        29 -
+        userdefined {
+            set hreftype [lindex $typedesc 1]
+            set ti2 [$ti @GetRefTypeInfo $hreftype]
+            set typedesc "[$ti2 @GetName]"
+            $ti2 Release
+        }
+        default {
+            set typedesc [_vttype_to_string $typedesc]
+        }
+    }
+
+    return $typedesc
+}
+
+
+#
+# Given a COM type descriptor, resolved all user defined types (UDT) in it
+# The descriptor must be in raw form as returned by the C code
+proc twapi::_resolve_comtype {ti typedesc} {
+    
+    if {[lindex $typedesc 0] == 26} {
+        # VT_PTR - {26 INNER_TYPEDESC}
+        # If pointing to a UDT, convert to appropriate base type if possible
+        set inner [_resolve_comtype $ti [lindex $typedesc 1]]
+        set inner_type [lindex $inner 0]
+        if {$inner_type == 29} {
+            # When the referenced type is a UDT (29) which is actually
+            # a dispatch or other interface, replace the
+            # "pointer to UDT" with VT_DISPATCH/VT_INTERFACE
+            switch -exact -- [lindex $inner 1] {
+                dispatch  {set typedesc [list 9]}
+                interface {set typedesc [list 13]}
+                coclass {
+                    # Replace pointers to a user defined type that is
+                    # a coclass having a default dispatch interface with
+                    # the type for a dispatch interface
+                    set idispatch_guid [coclass_idispatch_guid [lindex $inner 2]]
+                    if {$idispatch_guid eq ""} {
+                        # Coclass has no default dispatch interface
+                        set typedesc [list 26 $inner]
+                    } else {
+                        # TBD - can we store idispatch_guid in param def so
+                        # for return values we automatically convert to correct
+                        # comobj type?
+                        set typedesc [list 9]; # VT_DISPATCH
+                    }
+                }
+                default {
+                    # TBD - need to decode all the other types (record etc.)
+                    set typedesc [list 26 $inner]
+                }
+            }
+        } else {
+            set typedesc [list 26 $inner]
+        }
+    } elseif {[lindex $typedesc 0] == 29} {
+        # VT_USERDEFINED - {29 HREFTYPE}
+        set ti2 [$ti @GetRefTypeInfo [lindex $typedesc 1]]
+        array set tattr [$ti2 @GetTypeAttr -guid -typekind]
+        switch -exact -- $tattr(-typekind) {
+            enum { 
+                set typedesc [list 3]; # 3 -> i4 
+            }
+            alias {
+                set typedesc [_resolve_comtype $ti2 [kl_get [$ti2 GetTypeAttr] tdescAlias]]
+            }
+            default {
+                set typedesc [list 29 $tattr(-typekind) $tattr(-guid)]
+            }
+        }
+        $ti2 Release
+    }
+
+    return $typedesc
+}
+
+proc twapi::_resolve_params_for_prototype {ti paramdescs} {
+    set params {}
+    foreach paramdesc $paramdescs {
+        lappend params \
+            [lreplace $paramdesc 0 0 [::twapi::_resolve_comtype $ti [lindex $paramdesc 0]]]
+    }
+    return $params
+}
+
+proc twapi::_variant_values_from_safearray {sa ndims {raw false} {addref false} {lcid 0}} {
+    set result {}
+    if {[incr ndims -1] > 0} {
+	foreach elem $sa {
+	    lappend result [_variant_values_from_safearray $elem $ndims $raw $addref $lcid]
+	}
+    } else {
+	foreach elem $sa {
+	    lappend result [twapi::variant_value $elem $raw $addref $lcid]
+	}
+    }
+    return $result
+}
+
+proc twapi::outvar {varname} { return [Twapi_InternalCast outvar $varname] }
+
+proc twapi::variant_value {variant raw addref {lcid 0}} {
+    # TBD - format appropriately depending on variant type for dates and
+    # currency
+    if {[llength $variant] == 0} {
+        return ""
+    }
+    set vt [lindex $variant 0]
+
+    if {$vt & 0x2000} {
+        # VT_ARRAY - second element is {dimensions value}
+        if {[llength $variant] < 2} {
+            return [list ]
+        }
+        lassign [lindex $variant 1] dimensions values
+        set vt [expr {$vt & ~ 0x2000}]
+        if {$vt == 12} {
+            # Array of variants. Recursively convert values
+            return [_variant_values_from_safearray \
+                        $values \
+                        [expr {[llength $dimensions] / 2}] \
+                        $raw $addref $lcid]
+        } else {
+            return $values
+        }
+    } else {
+        if {$vt == 9} {
+            set idisp [lindex $variant 1]; # May be NULL!
+            if {$addref && ! [pointer_null? $idisp]} {
+                IUnknown_AddRef $idisp
+            }
+            if {$raw} {
+                return $idisp
+            } else {
+                # Note comobj_idispatch takes care of NULL
+                return [comobj_idispatch $idisp 0 "" $lcid]
+            }
+        } elseif {$vt == 13} {
+            set iunk [lindex $variant 1]; # May be NULL!
+            if {$addref && ! [pointer_null? $iunk]} {
+                IUnknown_AddRef $iunk
+            }
+            if {$raw} {
+                return $iunk
+            } else {
+                return [make_interface_proxy $iunk]
+            }
+        }
+    }
+    return [lindex $variant 1]
+}
+
+proc twapi::variant_type {variant} {
+    return [lindex $variant 0]
+}
+
+proc twapi::vt_null {} {
+    return [tclcast null ""]
+}
+
+proc twapi::vt_empty {} {
+    return [tclcast empty ""]
+}
+
+#
+# General dispatcher for callbacks from event sinks. Invokes the actual
+# registered script after mapping dispid's
+proc twapi::_eventsink_callback {comobj script callee args} {
+    # Check if the comobj is still active
+    if {[llength [info commands $comobj]] == 0} {
+        if {$::twapi::log_config(twapi_com)} {
+            debuglog "COM event received for inactive object"
+        }
+        return;                         # Object has gone away, ignore
+    }
+
+    set retcode [catch {
+        # We are invoked with cooked values so no need to call variant_value
+        uplevel #0 $script [list $callee] $args
+    } result]
+
+    if {$::twapi::log_config(twapi_com) && $retcode} {
+        debuglog "Event sink callback error ($retcode): $result\n$::errorInfo"
+    }
+
+    # $retcode is returned as HRESULT by the Invoke
+    return -code $retcode $result
+}
+
+#
+# Return clsid from a string. If $clsid is a valid CLSID - returns as is
+# else tries to convert it from progid. An error is generated if neither
+# works
+proc twapi::_convert_to_clsid {comid} {
+    if {! [Twapi_IsValidGUID $comid]} {
+        return [progid_to_clsid $comid]
+    }
+    return $comid
+}
+
+#
+# Format a prototype definition for human consumption
+# Proto is in the form {DISPID LCID INVOKEFLAGS RETTYPE PARAMTYPES PARAMNAMES}
+proc twapi::_format_prototype {name proto} {
+    set dispid_lcid [lindex $proto 0]/[lindex $proto 1]
+    set ret_type [_vttype_to_string [lindex $proto 3]]
+    set invkind [_invkind_to_string [lindex $proto 2]]
+    # Distinguish between no parameters and parameters not known
+    set paramstr ""
+    if {[llength $proto] > 4} {
+        set params {}
+        foreach param [lindex $proto 4] paramname [lindex $proto 5] {
+            if {[string length $paramname]} {
+                set paramname " $paramname"
+            }
+            lassign $param type paramdesc
+            set type [_vttype_to_string $type]
+            set parammods [_paramflags_to_tokens [lindex $paramdesc 0]]
+            if {[llength [lindex $paramdesc 1]]} {
+                # Default specified
+                lappend parammods "default:[lindex [lindex $paramdesc 1] 1]"
+            }
+            lappend params "\[$parammods\] $type$paramname"
+        }
+        set paramstr " ([join $params {, }])"
+    }
+    return "$dispid_lcid $invkind $ret_type ${name}${paramstr}"
+}
+
+# Convert parameter modifiers to string tokens.
+# modifiers is list of integer flags or tokens.
+proc twapi::_paramflags_to_tokens {modifiers} {
+    array set tokens {}
+    foreach mod $modifiers {
+        if {! [string is integer -strict $mod]} {
+            # mod is a token itself
+            set tokens($mod) ""
+        } else {
+            foreach tok [_make_symbolic_bitmask $mod {
+                in 1
+                out 2
+                lcid 4
+                retval 8
+                optional 16
+                hasdefault 32
+                hascustom  64
+            }] {
+                set tokens($tok) ""
+            }
+        }
+    }
+
+    # For cosmetic reasons, in/out should be first and remaining sorted
+    # Also (in,out) -> inout
+    if {[info exists tokens(in)]} {
+        if {[info exists tokens(out)]} {
+            set inout [list inout]
+            unset tokens(in)
+            unset tokens(out)
+        } else {
+            set inout [list in]
+            unset tokens(in)
+        }
+    } else {
+        if {[info exists tokens(out)]} {
+            set inout [list out]
+            unset tokens(out)
+        }
+    }
+
+    if {[info exists inout]} {
+        return [linsert [lsort [array names tokens]] 0 $inout]
+    } else {
+        return [lsort [array names tokens]]
+    }
+}
+
+#
+# Map method invocation code to string
+# Return code itself if no match
+proc twapi::_invkind_to_string {code} {
+    return [kl_get {
+        1  func
+        2  propget
+        4  propput
+        8  propputref
+    } $code $code]
+}
+
+#
+# Map string method invocation symbol to code
+# Error if no match and not an integer
+proc twapi::_string_to_invkind {s} {
+    if {[string is integer $s]} { return $s }
+    return [kl_get {
+        func    1
+        propget 2
+        propput 4
+        propputref 8
+    } $s]
+}
+
+
+#
+# Convert a VT typedef to a string
+# vttype may be nested
+proc twapi::_vttype_to_string {vttype} {
+    set vts [_vtcode_to_string [lindex $vttype 0]]
+    if {[llength $vttype] < 2} {
+        return $vts
+    }
+
+    return [list $vts [_vttype_to_string [lindex $vttype 1]]]
+}
+
+#
+# Convert VT codes to strings
+proc twapi::_vtcode_to_string {vt} {
+    return [kl_get {
+        2        i2
+        3        i4
+        4       r4
+        5       r8
+        6       cy
+        7       date
+        8       bstr
+        9       idispatch
+        10       error
+        11       bool
+        12       variant
+        13       iunknown
+        14       decimal
+        16       i1
+        17       ui1
+        18       ui2
+        19       ui4
+        20       i8
+        21       ui8
+        22       int
+        23       uint
+        24       void
+        25       hresult
+        26       ptr
+        27       safearray
+        28       carray
+        29       userdefined
+        30       lpstr
+        31       lpwstr
+        36       record
+    } $vt $vt]
+}
+
+proc twapi::_string_to_base_vt {tok} {
+    # Only maps base VT tokens to numeric value
+    # TBD - record and userdefined?
+    return [dict get {
+        i2 2
+        i4 3
+        r4 4
+        r8 5
+        cy 6
+        date 7
+        bstr 8
+        idispatch 9
+        error 10
+        bool 11
+        iunknown 13
+        decimal 14
+        i1 16
+        ui1 17
+        ui2 18
+        ui4 19
+        i8 20
+        ui8 21
+        int 22
+        uint 23
+        hresult 25
+        userdefined 29
+        record 36
+    } [string tolower $tok]]
+
+}
+
+#
+# Get ADSI provider service
+proc twapi::_adsi {{prov WinNT} {path {//.}}} {
+    return [comobj_object "${prov}:$path"]
+}
+
+# Get cached IDispatch and IUNknown IID's
+proc twapi::_iid_iunknown {} {
+    return $::twapi::_name_to_iid_cache(iunknown)
+}
+proc twapi::_iid_idispatch {} {
+    return $::twapi::_name_to_iid_cache(idispatch)
+}
+
+#
+# Return IID and name given a IID or name
+proc twapi::_resolve_iid {name_or_iid} {
+
+    # IID -> name mapping is more efficient so first assume it is
+    # an IID else we will unnecessarily trundle through the whole
+    # registry area looking for an IID when we already have it
+    # Assume it is a name
+    set other [iid_to_name $name_or_iid]
+    if {$other ne ""} {
+        # It was indeed the IID. Return the pair
+        return [list $name_or_iid $other]
+    }
+
+    # Else resolve as a name
+    set other [name_to_iid $name_or_iid]
+    if {$other ne ""} {
+        # Yep
+        return [list $other $name_or_iid]
+    }
+
+    win32_error 0x80004002 "Could not find IID $name_or_iid"
+}
+
+
+namespace eval twapi {
+    # Enable use of TclOO for new Tcl versions. To override setting
+    # applications should define and set before sourcing this file.
+    variable use_tcloo_for_com 
+    if {![info exists use_tcloo_for_com]} {
+        set use_tcloo_for_com [package vsatisfies [package require Tcl] 8.6b2]
+    }
+    if {$use_tcloo_for_com} {
+        interp alias {} ::twapi::class {} ::oo::class
+        proc ::oo::define::twapi_exportall {} {
+            uplevel 1 export [info class methods [lindex [info level -1] 1] -private]
+        }
+        proc comobj? {cobj} {
+            # We do not want change the internal type so
+            # do not check for some types that
+            # could not be a comobj. In particular,
+            # if a list type, we do not even check
+            # because it cannot be a comobj and even checking
+            # will result in nested list types being
+            # destroyed which affects safearray type detection
+            # TBD - would it be faster to keep explicit track through
+            # a dictionary ?
+            if {[twapi::tcltype $cobj] in {bstr empty null bytecode TwapiOpaque list int double bytearray dict wideInt booleanString}} {
+                return 0
+            }
+            set cobj [uplevel 1 [list namespace which -command $cobj]]
+            if {[info object isa object $cobj] &&
+                [info object isa typeof $cobj ::twapi::Automation]} {
+                return 1
+            } else {
+                return 0
+            }
+        }
+        proc comobj_instances {} {
+            set comobj_classes [list ::twapi::Automation]
+            set objs {}
+            while {[llength $comobj_classes]} {
+                set comobj_classes [lassign $comobj_classes class]
+                lappend objs {*}[info class instances $class]
+                lappend comobj_classes {*}[info class subclasses $class]
+            }
+            # Get rid of dups which may occur if subclasses use
+            # multiple (diamond type) inheritance
+            return [lsort -unique $objs]
+        }
+    } else {
+        package require metoo
+        interp alias {} ::twapi::class {} ::metoo::class
+        namespace eval ::metoo::define {
+            proc twapi_exportall {args} {
+                # args is dummy to match metoo's class definition signature
+                # Nothing to do, all methods are metoo are public
+            }
+        }
+        proc comobj? {cobj} {
+            set cobj [uplevel 1 [list namespace which -command $cobj]]
+            return [metoo::introspect object isa $cobj ::twapi::Automation]
+        }
+        proc comobj_instances {} {
+            return [metoo::introspect object list ::twapi::Automation]
+        }
+    }
+
+    # The prototype cache is indexed a composite key consisting of
+    #  - the GUID of the interface,
+    #  - the name of the function
+    #  - the LCID
+    #  - the invocation kind (as an integer)
+    # Each value contains the full prototype in a form
+    # that can be passed to IDispatch_Invoke. This is a list with the
+    # elements {DISPID LCID INVOKEFLAGS RETTYPE PARAMTYPES PARAMNAMES}
+    # Here PARAMTYPES is a list each element of which describes a
+    # parameter in the following format:
+    #     {TYPE {FLAGS DEFAULT} NAMEDARGVALUE} where DEFAULT is optional
+    # and NAMEDARGVALUE only appears (optionally) when the prototype is
+    # passed to Invoke, not in the cached prototype itself.
+    # PARAMNAMES is list of parameter names in order and is
+    # only present if PARAMTYPES is also present.
+    
+    variable _dispatch_prototype_cache
+    array set _dispatch_prototype_cache {}
+}
+
+
+interp alias {} twapi::_dispatch_prototype_get {} twapi::dispatch_prototype_get
+proc twapi::dispatch_prototype_get {guid name lcid invkind vproto} {
+    variable _dispatch_prototype_cache
+    set invkind [::twapi::_string_to_invkind $invkind]
+    if {[info exists _dispatch_prototype_cache($guid,$name,$lcid,$invkind)]} {
+        # Note this may be null if that name does not exist in the interface
+        upvar 1 $vproto proto
+        set proto $_dispatch_prototype_cache($guid,$name,$lcid,$invkind)
+        return 1
+    }
+    return 0
+}
+
+# Update a prototype in cache. Note lcid and invkind cannot be
+# picked up from prototype since it might be empty.
+interp alias {} twapi::_dispatch_prototype_set {} twapi::dispatch_prototype_set
+proc twapi::dispatch_prototype_set {guid name lcid invkind proto} {
+    # If the prototype does not contain the 5th element (params)
+    # it is a constructed prototype and we do NOT cache it as the
+    # disp id can change. Note empty prototypes are cached so
+    # we don't keep looking up something that does not exist
+    # Bug 130
+
+    if {[llength $proto] == 4} {
+        return
+    }
+
+    variable _dispatch_prototype_cache
+    set invkind [_string_to_invkind $invkind]
+    set _dispatch_prototype_cache($guid,$name,$lcid,$invkind) $proto
+    return
+}
+
+# Explicitly set prototypes for a guid 
+# protolist is a list of alternating name and prototype pairs.
+# Each prototype must contain the LCID and invkind fields
+proc twapi::_dispatch_prototype_load {guid protolist} {
+    foreach {name proto} $protolist {
+        dispatch_prototype_set $guid $name [lindex $proto 1] [lindex $proto 2] $proto
+    }
+}
+
+proc twapi::coclass_idispatch_guid {coclass_guid} {
+    variable _coclass_idispatch_guids
+    if {[info exists _coclass_idispatch_guids($coclass_guid)]} {
+        return $_coclass_idispatch_guids($coclass_guid)
+    }
+    return ""
+}
+
+proc twapi::_parse_dispatch_paramdef {paramdef} {
+    set errormsg "Invalid parameter or return type declaration '$paramdef'"
+
+    set paramregex {^(\[[^\]]*\])?\s*(\w+)\s*(\[\s*\])?\s*([*]?)\s*(\w+)?$}
+    if {![regexp $paramregex [string trim $paramdef] def attrs paramtype safearray ptr paramname]} {
+        error $errormsg
+    }
+
+    if {[string length $paramname]} {
+        lappend paramnames $paramname
+    }
+    # attrs can be in, out, opt separated by spaces
+    set paramflags 0
+    foreach attr [string range $attrs 1 end-1] {
+        switch -exact -- $attr {
+            in {set paramflags [expr {$paramflags | 1}]}
+            out {set paramflags [expr {$paramflags | 2}]}
+            inout {set paramflags [expr {$paramflags | 3}]}
+            opt -
+            optional {set paramflags [expr {$paramflags | 16}]}
+            default {error "Unknown parameter attribute $attr"}
+        }
+    }
+    if {($paramflags & 3) == 0} {
+        set paramflags [expr {$paramflags | 1}]; # in param if unspecified
+    }
+    # Resolve parameter type. It can be 
+    #  - a safearray of base types or "variant"s (not pointers)
+    #  - a pointer to a base type
+    #  - a pointer to a safearray
+    #  - a base type or "variant"
+    switch -exact -- $paramtype {
+        variant { set paramtype 12 }
+        void    { set paramtype 24 }
+        default { set paramtype [_string_to_base_vt $paramtype] }
+    }
+    if {[string length $safearray]} {
+        if {$paramtype == 24} {
+            # Safearray of type void is an invalid type decl
+            error $errormsg
+        }
+        set paramtype [list 27 $paramtype]
+    }
+    if {[string length $ptr]} {
+        if {$paramtype == 24} {
+            # Pointer to type void is an invalid type
+            error $errormsg
+        }
+        set paramtype [list 26 $paramtype]
+    }
+
+    return [list $paramflags $paramtype $paramname]
+}
+
+proc twapi::define_dispatch_prototypes {guid protos args} {
+    array set opts [parseargs args {
+        {lcid.int 0}
+    } -maxleftover 0]
+
+    set guid [canonicalize_guid $guid]
+
+    set defregx {^\s*(\w+)\s+(\d+)\s+(\w[^\(]*)\(([^\)]*)\)(.*)$}
+    set parsed_protos {}
+    # Loop picking out one prototype in each interation
+    while {[regexp $defregx $protos -> membertype memid rettype paramstring protos]} {
+        set params {}
+        set paramnames {}
+        foreach paramdef [split $paramstring ,] {
+            lassign [_parse_dispatch_paramdef $paramdef] paramflags paramtype paramname
+            if {[string length $paramname]} {
+                lappend paramnames $paramname
+            }
+            lappend params [list $paramtype [list $paramflags]]
+        }
+        if {[llength $paramnames] &&
+            [llength $params] != [llength $paramnames]} {
+            error "Missing parameter name in '$paramstring'. All parameter names must be specified or none at all."
+        }
+
+        lassign [_parse_dispatch_paramdef $rettype] _ rettype name 
+        set invkind [_string_to_invkind $membertype]
+        set proto [list $memid $opts(lcid) $invkind $rettype $params $paramnames]
+        lappend parsed_protos $name $proto
+    }
+
+    set protos [string trim $protos]
+    if {[string length $protos]} {
+        error "Invalid dispatch prototype: '$protos'"
+    }
+    
+    _dispatch_prototype_load $guid $parsed_protos
+}
+
+# Used to track when interface proxies are renamed/deleted
+proc twapi::_interface_proxy_tracer {ifc oldname newname op} {
+    variable _interface_proxies
+    if {$op eq "rename"} {
+        if {$oldname eq $newname} return
+        set _interface_proxies($ifc) $newname
+    } else {
+        unset _interface_proxies($ifc)
+    }
+}
+
+
+# Return a COM interface proxy object for the specified interface.
+# If such an object already exists, it is returned. Otherwise a new one
+# is created. $ifc must be a valid COM Interface pointer for which
+# the caller is holding a reference. Caller relinquishes ownership
+# of the interface and must solely invoke operations through the
+# returned proxy object. When done with the object, call the Release
+# method on it, NOT destroy.
+# TBD - how does this interact with security blankets ?
+proc twapi::make_interface_proxy {ifc} {
+    variable _interface_proxies
+
+    if {[info exists _interface_proxies($ifc)]} {
+        set proxy $_interface_proxies($ifc)
+        $proxy AddRef
+        if {! [pointer_null? $ifc]} {
+            # Release the caller's ref to the interface since we are holding
+            # one in the proxy object
+            ::twapi::IUnknown_Release $ifc
+        }
+    } else {
+        if {[pointer_null? $ifc]} {
+            set proxy [INullProxy new $ifc]
+        } else {
+            set ifcname [pointer_type $ifc]
+            set proxy [${ifcname}Proxy new $ifc]
+        }
+        set _interface_proxies($ifc) $proxy
+        trace add command $proxy {rename delete} [list ::twapi::_interface_proxy_tracer $ifc]
+    }
+    return $proxy
+}
+
+# "Null" object - clones IUnknownProxy but will raise error on method calls
+# We could have inherited but IUnknownProxy assumes non-null ifc so it
+# and its inherited classes do not have to check for null in every method.
+twapi::class create ::twapi::INullProxy {
+    constructor {ifc} {
+        my variable _ifc
+        # We keep the interface pointer because it encodes type information
+        if {! [::twapi::pointer_null? $ifc]} {
+            error "Attempt to create a INullProxy with non-NULL interface"
+        }
+
+        set _ifc $ifc
+
+        my variable _nrefs;   # Internal ref count (held by app)
+        set _nrefs 1
+    }
+
+    method @Null? {} { return 1 }
+    method @Type {} {
+        my variable _ifc
+        return [::twapi::pointer_type $_ifc]
+    }
+    method @Type? {type} {
+        my variable _ifc
+        return [::twapi::pointer? $_ifc $type]
+    }
+    method AddRef {} {
+        my variable _nrefs
+        # We maintain our own ref counts. _ifc is null so do not
+        # call the COM AddRef !
+        incr _nrefs
+    }
+
+    method Release {} {
+        my variable _nrefs
+        if {[incr _nrefs -1] == 0} {
+            my destroy
+        }
+    }
+
+    method DebugRefCounts {} {
+        my variable _nrefs
+
+        # Return out internal ref as well as the COM ones
+        # Note latter is always 0 since _ifc is always NULL.
+        return [list $_nrefs 0]
+    }
+
+    method QueryInterface {name_or_iid} {
+        error "Attempt to call QueryInterface called on NULL pointer"
+    }
+
+    method @QueryInterface {name_or_iid} {
+        error "Attempt to call QueryInterface called on NULL pointer"
+    }
+
+    # Parameter is for compatibility with IUnknownProxy
+    method @Interface {{addref 1}} {
+        my variable _ifc
+        return $_ifc
+    }
+
+    twapi_exportall
+}
+
+twapi::class create ::twapi::IUnknownProxy {
+    # Note caller must hold ref on the ifc. This ref is passed to
+    # the proxy object and caller must not make use of that ref
+    # unless it does an AddRef on it.
+    constructor {ifc {objclsid ""}} {
+        if {[::twapi::pointer_null? $ifc]} {
+            error "Attempt to register a NULL interface"
+        }
+
+        my variable _ifc
+        set _ifc $ifc
+
+        my variable _clsid
+        set _clsid $objclsid
+
+        my variable _blanket;   # Security blanket
+        set _blanket [list ]
+
+        # We keep an internal reference count instead of explicitly
+        # calling out to the object's AddRef/Release every time.
+        # When the internal ref count goes to 0, we will invoke the 
+        # object's "native" Release.
+        #
+        # Note the primary purpose of maintaining our internal reference counts
+        # is not efficiency by shortcutting the "native" AddRefs. It is to
+        # prevent crashes by bad application code; we can just generate an
+        # error instead by having the command go away.
+        my variable _nrefs;   # Internal ref count (held by app)
+
+        set _nrefs 1
+    }
+
+    destructor {
+        my variable _ifc
+        ::twapi::IUnknown_Release $_ifc
+    }
+
+    method AddRef {} {
+        my variable _nrefs
+        # We maintain our own ref counts. Not pass it on to the actual object
+        incr _nrefs
+    }
+
+    method Release {} {
+        my variable _nrefs
+        if {[incr _nrefs -1] == 0} {
+            my destroy
+        }
+    }
+
+    method DebugRefCounts {} {
+        my variable _nrefs
+        my variable _ifc
+
+        # Return out internal ref as well as the COM ones
+        # Note latter are unstable and only to be used for
+        # debugging
+        twapi::IUnknown_AddRef $_ifc
+        return [list $_nrefs [twapi::IUnknown_Release $_ifc]]
+    }
+
+    method QueryInterface {name_or_iid} {
+        my variable _ifc
+        lassign [::twapi::_resolve_iid $name_or_iid] iid name
+        return [::twapi::Twapi_IUnknown_QueryInterface $_ifc $iid $name]
+    }
+
+    # Same as QueryInterface except return "" instead of exception
+    # if interface not found and returns proxy object instead of interface
+    method @QueryInterface {name_or_iid {set_blanket 0}} {
+        my variable _blanket
+        ::twapi::trap {
+            set proxy [::twapi::make_interface_proxy [my QueryInterface $name_or_iid]]
+            if {$set_blanket && [llength $_blanket]} {
+                $proxy @SetSecurityBlanket $_blanket
+            }
+            return $proxy
+        } onerror {TWAPI_WIN32 0x80004002} {
+            # No such interface, return "", don't generate error
+            return ""
+        } onerror {} {
+            if {[info exists proxy]} {
+                catch {$proxy Release}
+            }
+            rethrow
+        }
+    }
+
+    method @Type {} {
+        my variable _ifc
+        return [::twapi::pointer_type $_ifc]
+    }
+
+    method @Type? {type} {
+        my variable _ifc
+        return [::twapi::pointer? $_ifc $type]
+    }
+
+    method @Null? {} {
+        my variable _ifc
+        return [::twapi::pointer_null? $_ifc]
+    }
+
+    # Returns raw interface. Caller must call IUnknown_Release on it
+    # iff addref is passed as true (default)
+    method @Interface {{addref 1}} {
+        my variable _ifc
+        if {$addref} {
+            ::twapi::IUnknown_AddRef $_ifc
+        }
+        return $_ifc
+    }
+
+    # Returns out class id - old deprecated - use GetCLSID
+    method @Clsid {} {
+        my variable _clsid
+        return $_clsid
+    }
+
+    method @GetCLSID {} {
+        my variable _clsid
+        return $_clsid
+    }
+
+    method @SetCLSID {clsid} {
+        my variable _clsid
+        set _clsid $clsid
+        return
+    }
+
+    method @SetSecurityBlanket blanket {
+        my variable _ifc _blanket
+        # In-proc components will not support IClientSecurity interface
+        # and will raise an error. That's the for the caller to be careful
+        # about.
+        twapi::CoSetProxyBlanket $_ifc {*}$blanket
+        set _blanket $blanket
+        return
+    }
+
+    method @GetSecurityBlanket {} {
+        my variable _blanket
+        return $_blanket
+    }
+    
+
+    twapi_exportall
+}
+
+twapi::class create ::twapi::IDispatchProxy {
+    superclass ::twapi::IUnknownProxy
+
+    destructor {
+        my variable _typecomp
+        if {[info exists _typecomp] && $_typecomp ne ""} {
+            $_typecomp Release
+        }
+        next
+    }
+
+    method GetTypeInfoCount {} {
+        my variable _ifc
+        return [::twapi::IDispatch_GetTypeInfoCount $_ifc]
+    }
+
+    # names is list - method name followed by parameter names
+    # Returns list of name dispid pairs
+    method GetIDsOfNames {names {lcid 0}} {
+        my variable _ifc
+        return [::twapi::IDispatch_GetIDsOfNames $_ifc $names $lcid]
+    }
+
+    # Get dispid of a method (without parameter names)
+    method @GetIDOfOneName {name {lcid 0}} {
+        return [lindex [my GetIDsOfNames [list $name] $lcid] 1]
+    }
+
+    method GetTypeInfo {{infotype 0} {lcid 0}} {
+        my variable _ifc
+        if {$infotype != 0} {error "Parameter infotype must be 0"}
+        return [::twapi::IDispatch_GetTypeInfo $_ifc $infotype $lcid]
+    }
+
+    method @GetTypeInfo {{lcid 0}} {
+        return [::twapi::make_interface_proxy [my GetTypeInfo 0 $lcid]]
+    }
+
+    method Invoke {prototype args} {
+        my variable _ifc
+        if {[llength $prototype] == 0 && [llength $args] == 0} {
+            # Treat as a property get DISPID_VALUE (default value)
+            # {dispid=0, lcid=0 cmd=propget(2) ret type=bstr(8) {} (no params)}
+            set prototype {0 0 2 8 {}}
+        } else {
+            # TBD - optimize by precomputing if a prototype needs this processing
+            # If any arguments are comobjs, may need to replace with the 
+            # IDispatch interface.
+            # Moreover, we have to manage the reference counts for both
+            # IUnknown and IDispatch - 
+            #  - If the parameter is an IN parameter, ref counts do not need
+            #    to change.
+            #  - If the parameter is an OUT parameter, we are not passing
+            #    an interface in, so nothing to do
+            #  - If the parameter is an INOUT, we need to AddRef it since
+            #    the COM method will Release it when storing a replacement
+            # HERE WE ONLY DO THE CHECK FOR COMOBJ. The AddRef checks are
+            # DONE IN THE C CODE (if necessary)
+
+            set iarg -1
+            set args2 {}
+            foreach arg $args {
+                incr iarg
+                # TBD - optimize this loop
+                set argtype  [lindex $prototype 4 $iarg 0]
+                set argflags 0
+                if {[llength [lindex $prototype 4 $iarg 1]]} {
+                    set argflags [lindex $prototype 4 $iarg 1 0]
+                }
+                if {$argflags & 1} {
+                    # IN param
+                    if {$argflags & 2} {
+                        # IN/OUT
+                        # We currently do NOT handle a In/Out - skip for now TBD
+                        # In the future we will have to check contents of
+                        # the passed arg as a variable in the CALLER's context
+                    } else {
+                        # Pure IN param. Check if it is VT_DISPATCH or
+                        # VT_VARIANT. Else nothing
+                        # to do
+                        if {[lindex $argtype 0] == 26} {
+                            # Pointer, get base type
+                            set argtype [lindex $argtype 1]
+                        }
+                        if {[lindex $argtype 0] == 9 || [lindex $argtype 0] == 12} {
+                            # If a comobj was passed, need to extract the
+                            # dispatch pointer.
+                            if {[twapi::comobj? $arg]} {
+                                # Note we do not addref when getting the interface
+                                # (last param 0) because not necessary for IN
+                                # params, AND it is the C code's responsibility
+                                # anyways
+                                set arg [$arg -interface 0]
+                            }
+                        }
+                    }
+
+                } else {
+                    # Not an IN param. Nothing to be done
+                }
+                
+                lappend args2 $arg
+            }
+            set args $args2
+        }
+
+        # The uplevel is so that if some parameters are output, the varnames
+        # are resolved in caller
+        uplevel 1 [list ::twapi::IDispatch_Invoke $_ifc $prototype] $args
+    }
+
+    # Methods are tried in the order specified by invkinds.
+    method @Invoke {name invkinds lcid params {namedargs {}}} {
+        if {$name eq ""} {
+            # Default method
+            return [uplevel 1 [list [self] Invoke {}] $params]
+        }
+        set nparams [llength $params]
+
+        # We will try for each invkind to match. matches can be of
+        # different degrees, in descending priority -
+        # 1. prototype has parameter info and num params match exactly
+        # 2. prototype has parameter info and num params is greater
+        #    than supplied arguments (assumes others have defaults)
+        # 3. prototype has no parameter information
+        # Within these classes, the order of invkinds determines
+        # priority
+
+        if {$name eq "_NewEnum"} {
+            # Special case property to retrieve iterator. Some objects
+            # call it _NewEnum, others NewEnum. The disp id must always
+            # be -4 so we hard code that instead
+            # DISPID=-4 LCID=0 INVOKE=2(propget) RETTYPE=13(IUnknown) no parameters
+            set class1 [list {-4 0 2 13 {} {}}]
+        } else {
+            foreach invkind $invkinds {
+                set proto [my @Prototype $name $invkind $lcid]
+                if {[llength $proto]} {
+                    if {[llength $proto] < 5} {
+                        # No parameter information
+                        lappend class3 $proto
+                    } else {
+                        if {[llength [lindex $proto 4]] == $nparams} {
+                            lappend class1 $proto
+                            break; # Class 1 match, no need to try others
+                        } elseif {[llength [lindex $proto 4]] > $nparams} {
+                            lappend class2 $proto
+                        } else {
+                            # Ignore - proto has fewer than supplied params
+                            # Could not be a match
+                        }
+                    }
+                }
+            }
+        }
+        # For exact match (class1), we do not need the named
+        # arguments as positional arguments take priority. When
+        # number of passed parameters is fewer than those in
+        # prototype, check named arguments and use those
+        # values. If no parameter information, we can't use named
+        # arguments anyways.
+        
+        if {[info exists class1]} {
+            set matched_proto [lindex $class1 0]
+        } elseif {[info exists class2]} {
+            set matched_proto [lindex $class2 0]
+            # If we are passed named arguments AND the prototype also
+            # has parameter name information, replace the default values
+            # in the parameter definitions with the named arg value if
+            # it exists.
+            if {[llength $namedargs] &&
+                [llength [set paramnames [lindex $matched_proto 5]]]} {
+                foreach {paramname paramval} $namedargs {
+                    set paramindex [lsearch -nocase $paramnames $paramname]
+                    if {$paramindex < 0} {
+                        twapi::win32_error 0x80020004 "No parameter with name '$paramname' found for method '$name'"
+                    }
+
+                    # Set the default value field of the
+                    # appropriate parameter to the named arg value
+                    set paramtype [lindex $matched_proto 4 $paramindex 0]
+
+                    # If parameter is VT_DISPATCH or VT_VARIANT, 
+                    # convert from comobj if necessary.
+                    if {$paramtype == 9 || $paramtype == 12} {
+                        if {[::twapi::comobj? $paramval]} {
+                            # Note no AddRef when getting the interface
+                            # (last param 0) because it is the C code's
+                            # responsibility based on in/out direction
+                            set paramval [$paramval -interface 0]
+                        }
+                    }
+
+                    # Replace the default value field for that param def
+                    lset matched_proto 4 $paramindex [linsert [lrange [lindex $matched_proto 4 $paramindex] 0 1] 2 $paramval]
+                }
+            }
+        } elseif {[info exists class3]} {
+            set matched_proto [lindex $class3 0]
+        }
+
+        if {[info exists matched_proto]} {
+            # Need uplevel so by-ref param vars are resolved correctly
+            return [uplevel 1 [list [self] Invoke $matched_proto] $params]
+        }
+
+        # No prototype via typecomp / typeinfo available.
+        # No lcid worked.
+        # We have to use the last resort of GetIDsOfNames
+        set dispid [my @GetIDOfOneName [list $name] 0]
+        # TBD - should we cache result ? Probably not.
+        if {$dispid eq ""} {
+            twapi::win32_error 0x80020003 "No property or method found with name '$name'."
+        }
+
+        # Try all invocation types except last in turn. If error is "Member not
+        # found" try the next prototype.
+        foreach invkind [lrange $invkinds 0 end-1] {
+            # Note params field (last) is missing signifying we do not
+            # know prototypes
+            set matched_proto [list $dispid 0 $invkind 8]
+            if {![catch {
+                uplevel 1 [list [self] Invoke $matched_proto] $params
+            } result ropts]} {
+                return $result
+            }
+            # If member not found error, keep going. Other errors, throw
+            lassign [dict get $ropts -errorcode] fac winerror
+            if {$fac ne "TWAPI_WIN32" && $winerror != -2147352573} {
+                # Some other error.
+                return -options $ropts $result
+            }
+        }
+        # Try the last one and hope for the best
+        set matched_proto [list $dispid 0 [lindex $invkinds end] 8]
+        return [uplevel 1 [list [self] Invoke $matched_proto] $params]
+    }
+
+    # Get prototype that match the specified name
+    method @Prototype {name invkind lcid} {
+        my variable  _ifc  _guid  _typecomp
+
+        # Always need the GUID so get it we have not done so already
+        if {![info exists _guid]} {
+            my @InitTypeCompAndGuid
+        }
+        # Note above call may still have failed to init _guid
+
+        # If we have been through here before and have our guid,
+        # check if a prototype exists and return it. 
+        if {[info exists _guid] && $_guid ne "" &&
+            [::twapi::_dispatch_prototype_get $_guid $name $lcid $invkind proto]} {
+            return $proto
+        }
+
+        # Not in cache, have to look for it
+        # Use the ITypeComp for this interface if we do not
+        # already have it. We trap any errors because we will retry with
+        # different LCID's below.
+        set proto {}
+        if {![info exists _typecomp]} {
+            my @InitTypeCompAndGuid
+        }
+        if {$_typecomp ne ""} {
+            ::twapi::trap {
+
+                set invkind [::twapi::_string_to_invkind $invkind]
+                set lhash   [::twapi::LHashValOfName $lcid $name]
+
+                if {![catch {$_typecomp Bind $name $lhash $invkind} binddata] &&
+                    [llength $binddata]} {
+                    lassign $binddata type data ifc
+                    if {$type eq "funcdesc" ||
+                        ($type eq "vardesc" && [::twapi::kl_get $data varkind] == 3)} {
+                        set params {}
+                        set bindti [::twapi::make_interface_proxy $ifc]
+                        ::twapi::trap {
+                            set params [::twapi::_resolve_params_for_prototype $bindti [::twapi::kl_get $data lprgelemdescParam]]
+                            # Param names are needed for named arguments. Index 0 is method name so skip it
+                            if {[catch {lrange [$bindti GetNames [twapi::kl_get $data memid]] 1 end} paramnames]} {
+                                set paramnames {}
+                            }
+                        } finally {
+                            $bindti Release
+                        }
+                        set proto [list [::twapi::kl_get $data memid] \
+                                       $lcid \
+                                       $invkind \
+                                       [::twapi::kl_get $data elemdescFunc.tdesc] \
+                                       $params $paramnames]
+                    } else {
+                        ::twapi::IUnknown_Release $ifc; # Don't need ifc but must release
+                        twapi::debuglog "IDispatchProxy::@Prototype: Unexpected Bind type: $type, data: $data"
+                    }
+                }
+            } onerror {} {
+                # Ignore and retry with other LCID's below
+            }
+        }
+
+
+        # If we do not have a guid return because even if we do not
+        # have a proto yet,  falling through to try another lcid will not
+        # help and in fact will cause infinite recursion.
+        
+        if {$_guid eq ""} {
+            return $proto
+        }
+
+        # We do have a guid, store the proto in cache (even if negative)
+        ::twapi::dispatch_prototype_set $_guid $name $lcid $invkind $proto
+
+        # If we have the proto return it
+        if {[llength $proto]} {
+            return $proto
+        }
+
+        # Could not find a matching prototype from the typeinfo/typecomp.
+        # We are not done yet. We will try and fall back to other lcid's
+        # Note we do this AFTER setting the prototype in the cache. That
+        # way we prevent (infinite) mutual recursion between lcid fallbacks.
+        # The fallback sequence is $lcid -> 0 -> 1033
+        # (1033 is US English). Note lcid could itself be 1033
+        # default and land up being checked twice times but that's
+        # ok since that's a one-time thing, and not very expensive either
+        # since the second go-around will hit the cache (negative). 
+        # Note the time this is really useful is when the cache has
+        # been populated explicitly from a type library since in that
+        # case many interfaces land up with a US ENglish lcid (MSI being
+        # just one example)
+
+        if {$lcid == 0} {
+            # Note this call may further recurse and return either a
+            # proto or empty (fail)
+            set proto [my @Prototype $name $invkind 1033]
+        } else {
+            set proto [my @Prototype $name $invkind 0]
+        }
+        
+        # Store it as *original* lcid.
+        ::twapi::dispatch_prototype_set $_guid $name $lcid $invkind $proto
+        
+        return $proto
+    }
+
+
+    # Initialize _typecomp and _guid. Not in constructor because may
+    # not always be required. Raises error if not available
+    method @InitTypeCompAndGuid {} {
+        my variable   _guid   _typecomp
+        
+        if {[info exists _typecomp]} {
+            # Based on code below, if _typecomp exists
+            # _guid also exists so no need to check for that
+            return
+        }
+
+        ::twapi::trap {
+            set ti [my @GetTypeInfo 0]
+        } onerror {} {
+            # We do not raise an error because
+            # even without the _typecomp we can try invoking
+            # methods via IDispatch::GetIDsOfNames
+            twapi::debuglog "Could not ITypeInfo: [twapi::trapresult]"
+            if {![info exists _guid]} {
+                # Do not overwrite if already set thru @SetGuid or constructor
+                # Set to empty otherwise so we know we tried and failed
+                set _guid ""
+            }
+            set _typecomp ""
+            return
+        }
+
+        ::twapi::trap {
+            # In case of dual interfaces, we need the typeinfo for the 
+            # dispatch. Again, errors handled in try handlers
+            set attr [$ti GetTypeAttr]
+            switch -exact -- [::twapi::kl_get $attr typekind] {
+                4 {
+                    # Dispatch type, fine, just what we want
+                }
+                3 {
+                    # Interface type, Get the dispatch interface. If that fails,
+                    # don't raise an error for the same reason as above
+                    # if the interface itself is marked dispatchable
+                    if {[catch {
+                        $ti @GetRefTypeInfo [$ti GetRefTypeOfImplType -1]
+                    } ti2 eropts]} {
+                        # 4096 -> TYPEFLAG_FDISPATCHABLE
+                        if {[::twapi::kl_get $attr wTypeFlags] & 4096} {
+                            if {![info exists _guid]} {
+                                # Do not overwrite if already set thru @SetGuid or constructor
+                                # Set to empty otherwise so we know we tried and failed
+                                # TBD - should we set _guid to [kl_get $attr guid] ?
+                                set _guid ""
+                            }
+                            set _typecomp ""
+                            return; # Note the finally clause will release $ti
+                        } else {
+                            # TBD - should we ignore errors even if dispatchable flag is not set?
+                            return -options $eropts $ti2
+                        }
+                    }
+                    $ti Release
+                    set ti $ti2
+                }
+                default {
+                    error "Interface is not a dispatch interface"
+                }
+            }
+            if {![info exists _guid]} {
+                # _guid might have already been valid, do not overwrite
+                set _guid [::twapi::kl_get [$ti GetTypeAttr] guid]
+            }
+            set _typecomp [$ti @GetTypeComp]; # ITypeComp
+        } finally {
+            $ti Release
+        }
+    }            
+
+    # Some COM objects like MSI do not have TypeInfo interfaces from
+    # where the GUID and TypeComp can be extracted. So we allow caller
+    # to explicitly set the GUID so we can look up methods in the
+    # dispatch prototype cache if it was populated directly by the
+    # application. If guid is not a valid GUID, an attempt is made
+    # to look it up as an IID name.
+    method @SetGuid {guid} {
+        my variable _guid
+        if {$guid eq ""} {
+            if {![info exists _guid]} {
+                my @InitTypeCompAndGuid
+            }
+        } else {
+            if {![::twapi::Twapi_IsValidGUID $guid]} {
+                set resolved_guid [::twapi::name_to_iid $guid]
+                if {$resolved_guid eq ""} {
+                    error "Could not resolve $guid to a Interface GUID."
+                }
+                set guid $resolved_guid
+            }
+
+            if {[info exists _guid] && $_guid ne ""} {
+                if {[string compare -nocase $guid $_guid]} {
+                    error "Attempt to set the GUID to $guid when the dispatch proxy has already been initialized to $_guid"
+                }
+            } else {
+                set _guid $guid
+            }
+        }
+
+        return $_guid
+    }
+
+    method @GetCoClassTypeInfo {} {
+        my variable _ifc
+
+        # We can get the typeinfo for the coclass in one of two ways:
+        # If the object supports IProvideClassInfo, we use it. Else
+        # we try the following:
+        #   - from the idispatch, we get its typeinfo
+        #   - from the typeinfo, we get the containing typelib
+        #   - then we search the typelib for the coclass clsid
+
+        ::twapi::trap {
+            set pci_ifc [my QueryInterface IProvideClassInfo]
+            set ti_ifc [::twapi::IProvideClassInfo_GetClassInfo $pci_ifc]
+            return [::twapi::make_interface_proxy $ti_ifc]
+        } onerror {} {
+            # Ignore - try the longer route if we were given the coclass clsid
+        } finally {
+            if {[info exists pci_ifc]} {
+                ::twapi::IUnknown_Release $pci_ifc
+            }
+            # Note - do not do anything with ti_ifc here, EVEN on error
+        }
+
+        set co_clsid [my @Clsid]
+        if {$co_clsid eq ""} {
+            # E_FAIL
+            twapi::win32_error 0x80004005 "Could not get ITypeInfo for coclass: object does not support IProvideClassInfo and clsid not specified."
+        }
+
+        set ti [my @GetTypeInfo]
+        ::twapi::trap {
+            set tl [lindex [$ti @GetContainingTypeLib] 0]
+            if {0} {
+                $tl @Foreach -guid $co_clsid -type coclass coti {
+                    break
+                }
+                if {[info exists coti]} {
+                    return $coti
+                }
+            } else {
+                return [$tl @GetTypeInfoOfGuid $co_clsid]
+            }
+            twapi::win32_error 0x80004005 "Could not find coclass."; # E_FAIL
+        } finally {
+            if {[info exists ti]} {
+                $ti Release
+            }
+            if {[info exists tl]} {
+                $tl Release
+            }
+        }
+    }
+
+    twapi_exportall
+}
+
+
+twapi::class create ::twapi::IDispatchExProxy {
+    superclass ::twapi::IDispatchProxy
+
+    method DeleteMemberByDispID {dispid} {
+        my variable _ifc
+        return [::twapi::IDispatchEx_DeleteMemberByDispID $_ifc $dispid]
+    }
+
+    method DeleteMemberByName {name {lcid 0}} {
+        my variable _ifc
+        return [::twapi::IDispatchEx_DeleteMemberByName $_ifc $name $lcid]
+    }
+
+    method GetDispID {name flags} {
+        my variable _ifc
+        return [::twapi::IDispatchEx_GetDispID $_ifc $name $flags]
+    }
+
+    method GetMemberName {dispid} {
+        my variable _ifc
+        return [::twapi::IDispatchEx_GetMemberName $_ifc $dispid]
+    }
+
+    method GetMemberProperties {dispid flags} {
+        my variable _ifc
+        return [::twapi::IDispatchEx_GetMemberProperties $_ifc $dispid $flags]
+    }
+
+    # For some reason, order of args is different for this call!
+    method GetNextDispID {flags dispid} {
+        my variable _ifc
+        return [::twapi::IDispatchEx_GetNextDispID $_ifc $flags $dispid]
+    }
+
+    method GetNameSpaceParent {} {
+        my variable _ifc
+        return [::twapi::IDispatchEx_GetNameSpaceParent $_ifc]
+    }
+
+    method @GetNameSpaceParent {} {
+        return [::twapi::make_interface_proxy [my GetNameSpaceParent]]
+    }
+
+    method @Prototype {name invkind {lcid 0}} {
+        set invkind [::twapi::_string_to_invkind $invkind]
+
+        # First try IDispatch
+        ::twapi::trap {
+            set proto [next $name $invkind $lcid]
+            if {[llength $proto]} {
+                return $proto
+            }
+            # Note negative results ignored, as new members may be added/deleted
+            # to an IDispatchEx at any time. We will try below another way.
+
+        } onerror {} {
+            # Ignore the error - we will try below using another method
+        }
+
+        # Not a simple dispatch interface method. Could be expando
+        # type which is dynamically created. NOTE: The member is NOT
+        # created until the GetDispID call is made.
+
+        # 10 -> case insensitive, create if required
+        set dispid [my GetDispID $name 10]
+
+        # IMPORTANT : prototype retrieval results MUST NOT be cached since
+        # underlying object may add/delete members at any time.
+
+        # No type information is available for dynamic members.
+        # TBD - is that really true?
+        
+        # Invoke kind - 1 (method), 2 (propget), 4 (propput)
+        if {$invkind == 1} {
+            # method
+            set flags 0x100
+        } elseif {$invkind == 2} {
+            # propget
+            set flags 0x1
+        } elseif {$invkind == 4} {
+            # propput
+            set flags 0x4
+        } elseif {$invkind == 8 } {
+            # propputref
+            set flags 0x10
+        } else {
+            error "Internal error: Invalid invkind value $invkind"
+        }
+
+        # Try at least getting the invocation type but even that is not
+        # supported by all objects in which case we assume it can be invoked.
+        # TBD - in that case, why even bother doing GetMemberProperties?
+        if {! [catch {
+            set flags [expr {[my GetMemberProperties 0x115] & $flags}]
+        }]} {
+            if {! $flags} {
+                return {};      # EMpty proto -> no valid name for this invkind
+            }
+        }
+
+        # Valid invkind or object does not support GetMemberProperties
+        # Return type is 8 (BSTR) but does not really matter as 
+        # actual type will be set based on what is returned.
+        return [list $dispid $lcid $invkind 8]
+    }
+
+    twapi_exportall
+}
+
+
+# ITypeInfo 
+#-----------
+
+twapi::class create ::twapi::ITypeInfoProxy {
+    superclass ::twapi::IUnknownProxy
+
+    method GetRefTypeOfImplType {index} {
+        my variable _ifc
+        return [::twapi::ITypeInfo_GetRefTypeOfImplType $_ifc $index]
+    }
+
+    method GetDocumentation {memid} {
+        my variable _ifc
+        return [::twapi::ITypeInfo_GetDocumentation $_ifc $memid]
+    }
+
+    method GetImplTypeFlags {index} {
+        my variable _ifc
+        return [::twapi::ITypeInfo_GetImplTypeFlags $_ifc $index]
+    }
+
+    method GetNames {index} {
+        my variable _ifc
+        return [::twapi::ITypeInfo_GetNames $_ifc $index]
+    }
+
+    method GetTypeAttr {} {
+        my variable _ifc
+        return [::twapi::ITypeInfo_GetTypeAttr $_ifc]
+    }
+
+    method GetFuncDesc {index} {
+        my variable _ifc
+        return [::twapi::ITypeInfo_GetFuncDesc $_ifc $index]
+    }
+
+    method GetVarDesc {index} {
+        my variable _ifc
+        return [::twapi::ITypeInfo_GetVarDesc $_ifc $index]
+    }
+
+    method GetIDsOfNames {names} {
+        my variable _ifc
+        return [::twapi::ITypeInfo_GetIDsOfNames $_ifc $names]
+    }
+
+    method GetRefTypeInfo {hreftype} {
+        my variable _ifc
+        return [::twapi::ITypeInfo_GetRefTypeInfo $_ifc $hreftype]
+    }
+
+    method @GetRefTypeInfo {hreftype} {
+        return [::twapi::make_interface_proxy [my GetRefTypeInfo $hreftype]]
+    }
+
+    method GetTypeComp {} {
+        my variable _ifc
+        return [::twapi::ITypeInfo_GetTypeComp $_ifc]
+    }
+
+    method @GetTypeComp {} {
+        return [::twapi::make_interface_proxy [my GetTypeComp]]
+    }
+
+    method GetContainingTypeLib {} {
+        my variable _ifc
+        return [::twapi::ITypeInfo_GetContainingTypeLib $_ifc]
+    }
+
+    method @GetContainingTypeLib {} {
+        lassign [my GetContainingTypeLib] itypelib index
+        return [list [::twapi::make_interface_proxy $itypelib] $index]
+    }
+
+    method @GetRefTypeInfoFromIndex {index} {
+        return [my @GetRefTypeInfo [my GetRefTypeOfImplType $index]]
+    }
+
+    # Friendlier version of GetTypeAttr
+    method @GetTypeAttr {args} {
+
+        array set opts [::twapi::parseargs args {
+            all
+            guid
+            lcid
+            constructorid
+            destructorid
+            schema
+            instancesize
+            typekind
+            fncount
+            varcount
+            interfacecount
+            vtblsize
+            alignment
+            majorversion
+            minorversion
+            aliasdesc
+            flags
+            idldesc
+            memidmap
+        } -maxleftover 0]
+
+        array set data [my GetTypeAttr]
+        set result [list ]
+        foreach {opt key} {
+            guid guid
+            lcid lcid
+            constructorid memidConstructor
+            destructorid  memidDestructor
+            schema lpstrSchema
+            instancesize cbSizeInstance
+            fncount cFuncs
+            varcount cVars
+            interfacecount cImplTypes
+            vtblsize cbSizeVft
+            alignment cbAlignment
+            majorversion wMajorVerNum
+            minorversion wMinorVerNum
+            aliasdesc tdescAlias
+        } {
+            if {$opts(all) || $opts($opt)} {
+                lappend result -$opt $data($key)
+            }
+        }
+
+        if {$opts(all) || $opts(typekind)} {
+            set typekind $data(typekind)
+            if {[info exists ::twapi::_typekind_map($typekind)]} {
+                set typekind $::twapi::_typekind_map($typekind)
+            }
+            lappend result -typekind $typekind
+        }
+
+        if {$opts(all) || $opts(flags)} {
+            lappend result -flags [::twapi::_make_symbolic_bitmask $data(wTypeFlags) {
+                appobject       1
+                cancreate       2
+                licensed        4
+                predeclid       8
+                hidden         16
+                control        32
+                dual           64
+                nonextensible 128
+                oleautomation 256
+                restricted    512
+                aggregatable 1024
+                replaceable  2048
+                dispatchable 4096
+                reversebind  8192
+                proxy       16384
+            }]
+        }
+
+        if {$opts(all) || $opts(idldesc)} {
+            lappend result -idldesc [::twapi::_make_symbolic_bitmask $data(idldescType) {
+                in 1
+                out 2
+                lcid 4
+                retval 8
+            }]
+        }
+
+        if {$opts(all) || $opts(memidmap)} {
+            set memidmap [list ]
+            for {set i 0} {$i < $data(cFuncs)} {incr i} {
+                array set fninfo [my @GetFuncDesc $i -memid -name]
+                lappend memidmap $fninfo(-memid) $fninfo(-name)
+            }
+            lappend result -memidmap $memidmap
+        }
+
+        return $result
+    }
+
+    #
+    # Get a variable description associated with a type
+    method @GetVarDesc {index args} {
+        # TBD - add support for retrieving elemdescVar.paramdesc fields
+
+        array set opts [::twapi::parseargs args {
+            all
+            name
+            memid
+            schema
+            datatype
+            value
+            valuetype
+            varkind
+            flags
+        } -maxleftover 0]
+
+        array set data [my GetVarDesc $index]
+        
+        set result [list ]
+        foreach {opt key} {
+            memid memid
+            schema lpstrSchema
+            datatype elemdescVar.tdesc
+        } {
+            if {$opts(all) || $opts($opt)} {
+                lappend result -$opt $data($key)
+            }
+        }
+
+
+        if {$opts(all) || $opts(value)} {
+            if {[info exists data(lpvarValue)]} {
+                # Const value
+                lappend result -value [lindex $data(lpvarValue) 1]
+            } else {
+                lappend result -value $data(oInst)
+            }
+        }
+
+        if {$opts(all) || $opts(valuetype)} {
+            if {[info exists data(lpvarValue)]} {
+                lappend result -valuetype [lindex $data(lpvarValue) 0]
+            } else {
+                lappend result -valuetype int
+            }
+        }
+
+        if {$opts(all) || $opts(varkind)} {
+            lappend result -varkind [::twapi::kl_get {
+                0 perinstance
+                1 static
+                2 const
+                3 dispatch
+            } $data(varkind) $data(varkind)]
+        }
+
+        if {$opts(all) || $opts(flags)} {
+            lappend result -flags [::twapi::_make_symbolic_bitmask $data(wVarFlags) {
+                readonly       1
+                source       2
+                bindable        4
+                requestedit       8
+                displaybind         16
+                defaultbind        32
+                hidden           64
+                restricted 128
+                defaultcollelem 256
+                uidefault    512
+                nonbrowsable 1024
+                replaceable  2048
+                immediatebind 4096
+            }]
+        }
+        
+        if {$opts(all) || $opts(name)} {
+            set result [concat $result [my @GetDocumentation $data(memid) -name]]
+        }    
+
+        return $result
+    }
+
+    method @GetFuncDesc {index args} {
+        array set opts [::twapi::parseargs args {
+            all
+            name
+            memid
+            funckind
+            invkind
+            callconv
+            params
+            paramnames
+            flags
+            datatype
+            resultcodes
+            vtbloffset
+        } -maxleftover 0]
+
+        array set data [my GetFuncDesc $index]
+        set result [list ]
+
+        if {$opts(all) || $opts(paramnames)} {
+            lappend result -paramnames [lrange [my GetNames $data(memid)] 1 end]
+        }
+        foreach {opt key} {
+            memid       memid
+            vtbloffset  oVft
+            datatype    elemdescFunc.tdesc
+            resultcodes lprgscode
+        } {
+            if {$opts(all) || $opts($opt)} {
+                lappend result -$opt $data($key)
+            }
+        }
+
+        if {$opts(all) || $opts(funckind)} {
+            lappend result -funckind [::twapi::kl_get {
+                0 virtual
+                1 purevirtual
+                2 nonvirtual
+                3 static
+                4 dispatch
+            } $data(funckind) $data(funckind)]
+        }
+
+        if {$opts(all) || $opts(invkind)} {
+            lappend result -invkind [::twapi::_string_to_invkind $data(invkind)]
+        }
+
+        if {$opts(all) || $opts(callconv)} {
+            lappend result -callconv [::twapi::kl_get {
+                0 fastcall
+                1 cdecl
+                2 pascal
+                3 macpascal
+                4 stdcall
+                5 fpfastcall
+                6 syscall
+                7 mpwcdecl
+                8 mpwpascal
+            } $data(callconv) $data(callconv)]
+        }
+
+        if {$opts(all) || $opts(flags)} {
+            lappend result -flags [::twapi::_make_symbolic_bitmask $data(wFuncFlags) {
+                restricted   1
+                source       2
+                bindable     4
+                requestedit  8
+                displaybind  16
+                defaultbind  32
+                hidden       64
+                usesgetlasterror  128
+                defaultcollelem 256
+                uidefault    512
+                nonbrowsable 1024
+                replaceable  2048
+                immediatebind 4096
+            }]
+        }
+
+        if {$opts(all) || $opts(params)} {
+            set params [list ]
+            foreach param $data(lprgelemdescParam) {
+                lassign $param paramtype paramdesc
+                set paramflags [::twapi::_paramflags_to_tokens [lindex $paramdesc 0]]
+                if {[llength $paramdesc] > 1} {
+                    # There is a default value associated with the parameter
+                    lappend params [list $paramtype $paramflags [lindex $paramdesc 1]]
+                } else {
+                    lappend params [list $paramtype $paramflags]
+                }
+            }
+            lappend result -params $params
+        }
+
+        if {$opts(all) || $opts(name)} {
+            set result [concat $result [my @GetDocumentation $data(memid) -name]]
+        }    
+
+        return $result
+    }
+
+    #
+    # Get documentation for a element of a type
+    method @GetDocumentation {memid args} {
+        array set opts [::twapi::parseargs args {
+            all
+            name
+            docstring
+            helpctx
+            helpfile
+        } -maxleftover 0]
+
+        lassign [my GetDocumentation $memid] name docstring helpctx helpfile
+
+        set result [list ]
+        foreach opt {name docstring helpctx helpfile} {
+            if {$opts(all) || $opts($opt)} {
+                lappend result -$opt [set $opt]
+            }
+        }
+        return $result
+    }
+
+    method @GetName {{memid -1}} {
+        return [lindex [my @GetDocumentation $memid -name] 1]
+    }
+
+    method @GetImplTypeFlags {index} {
+        return [::twapi::_make_symbolic_bitmask \
+                    [my GetImplTypeFlags $index] \
+                    {
+                        default      1
+                        source       2
+                        restricted   4
+                        defaultvtable 8
+                    }]  
+    }
+
+    #
+    # Get the typeinfo for the default source interface of a coclass
+    # This object must be the typeinfo of the coclass
+    method @GetDefaultSourceTypeInfo {} {
+        set count [lindex [my @GetTypeAttr -interfacecount] 1]
+        for {set i 0} {$i < $count} {incr i} {
+            set flags [my GetImplTypeFlags $i]
+            # default 0x1, source 0x2
+            if {($flags & 3) == 3} {
+                # Our source interface implementation can only handle IDispatch
+                # so check if the source interface is that else keep looking.
+                # We even ignore dual interfaces because we cannot then
+                # assume caller will use the dispatch version
+                set ti [my @GetRefTypeInfoFromIndex $i]
+                array set typeinfo [$ti GetTypeAttr]
+                # typekind == 4 -> IDispatch,
+                # flags - 0x1000 -> dispatchable, 0x40 -> dual
+                if {$typeinfo(typekind) == 4 &&
+                    ($typeinfo(wTypeFlags) & 0x1000) &&
+                    !($typeinfo(wTypeFlags) & 0x40)} {
+                    return $ti
+                }
+                $ti destroy
+            }
+        }
+        return ""
+    }
+
+    twapi_exportall
+}
+
+
+# ITypeLib
+#----------
+
+twapi::class create ::twapi::ITypeLibProxy {
+    superclass ::twapi::IUnknownProxy
+
+    method GetDocumentation {index} {
+        my variable _ifc
+        return [::twapi::ITypeLib_GetDocumentation $_ifc $index]
+    }
+    method GetTypeInfoCount {} {
+        my variable _ifc
+        return [::twapi::ITypeLib_GetTypeInfoCount $_ifc]
+    }
+    method GetTypeInfoType {index} {
+        my variable _ifc
+        return [::twapi::ITypeLib_GetTypeInfoType $_ifc $index]
+    }
+    method GetLibAttr {} {
+        my variable _ifc
+        return [::twapi::ITypeLib_GetLibAttr $_ifc]
+    }
+    method GetTypeInfo {index} {
+        my variable _ifc
+        return [::twapi::ITypeLib_GetTypeInfo $_ifc $index]
+    }
+    method @GetTypeInfo {index} {
+        return [::twapi::make_interface_proxy [my GetTypeInfo $index]]
+    }
+    method GetTypeInfoOfGuid {guid} {
+        my variable _ifc
+        return [::twapi::ITypeLib_GetTypeInfoOfGuid $_ifc $guid]
+    }
+    method @GetTypeInfoOfGuid {guid} {
+        return [::twapi::make_interface_proxy [my GetTypeInfoOfGuid $guid]]
+    }
+    method @GetTypeInfoType {index} {
+        set typekind [my GetTypeInfoType $index]
+        if {[info exists ::twapi::_typekind_map($typekind)]} {
+            set typekind $::twapi::_typekind_map($typekind)
+        }
+        return $typekind
+    }
+
+    method @GetDocumentation {id args} {
+        array set opts [::twapi::parseargs args {
+            all
+            name
+            docstring
+            helpctx
+            helpfile
+        } -maxleftover 0]
+
+        lassign [my GetDocumentation $id] name docstring helpctx helpfile
+        set result [list ]
+        foreach opt {name docstring helpctx helpfile} {
+            if {$opts(all) || $opts($opt)} {
+                lappend result -$opt [set $opt]
+            }
+        }
+        return $result
+    }
+
+    method @GetName {} {
+        return [lindex [my GetDocumentation -1] 0]
+    }
+
+    method @GetLibAttr {args} {
+        array set opts [::twapi::parseargs args {
+            all
+            guid
+            lcid
+            syskind
+            majorversion
+            minorversion
+            flags
+        } -maxleftover 0]
+
+        array set data [my GetLibAttr]
+        set result [list ]
+        foreach {opt key} {
+            guid guid
+            lcid lcid
+            majorversion wMajorVerNum
+            minorversion wMinorVerNum
+        } {
+            if {$opts(all) || $opts($opt)} {
+                lappend result -$opt $data($key)
+            }
+        }
+
+        if {$opts(all) || $opts(flags)} {
+            lappend result -flags [::twapi::_make_symbolic_bitmask $data(wLibFlags) {
+                restricted      1
+                control         2
+                hidden          4
+                hasdiskimage    8
+            }]
+        }
+
+        if {$opts(all) || $opts(syskind)} {
+            lappend result -syskind [::twapi::kl_get {
+                0 win16
+                1 win32
+                2 mac
+            } $data(syskind) $data(syskind)]
+        }
+
+        return $result
+    }
+
+    #
+    # Iterate through a typelib. Caller is responsible for releasing
+    # each ITypeInfo passed to it
+    # 
+    method @Foreach {args} {
+
+        array set opts [::twapi::parseargs args {
+            type.arg
+            name.arg
+            guid.arg
+        } -maxleftover 2 -nulldefault]
+
+        if {[llength $args] != 2} {
+            error "Syntax error: Should be '[self] @Foreach ?options? VARNAME SCRIPT'"
+        }
+
+        lassign $args varname script
+        upvar $varname varti
+
+        set count [my GetTypeInfoCount]
+        for {set i 0} {$i < $count} {incr i} {
+            if {$opts(type) ne "" && $opts(type) ne [my @GetTypeInfoType $i]} {
+                continue;                   # Type does not match
+            }
+            if {$opts(name) ne "" &&
+                [string compare -nocase $opts(name) [lindex [my @GetDocumentation $i -name] 1]]} {
+                continue;                   # Name does not match
+            }
+            set ti [my @GetTypeInfo $i]
+            if {$opts(guid) ne ""} {
+                if {[string compare -nocase [lindex [$ti @GetTypeAttr -guid] 1] $opts(guid)]} {
+                    $ti Release
+                    continue
+                }
+            }
+            set varti $ti
+            set ret [catch {uplevel 1 $script} result]
+            switch -exact -- $ret {
+                1 {
+                    error $result $::errorInfo $::errorCode
+                }
+                2 {
+                    return -code return $result; # TCL_RETURN
+                }
+                3 {
+                    set i $count; # TCL_BREAK
+                }
+            }
+        }
+        return
+    }
+
+    method @Register {path {helppath ""}} {
+        my variable _ifc
+        ::twapi::RegisterTypeLib $_ifc $path $helppath
+    }
+
+    method @LoadDispatchPrototypes {} {
+        set data [my @Read -type dispatch]
+        if {![dict exists $data dispatch]} {
+            return
+        }
+
+        dict for {guid guiddata} [dict get $data dispatch] {
+            foreach type {methods properties} {
+                if {[dict exists $guiddata -$type]} {
+                    dict for {name namedata} [dict get $guiddata -$type] {
+                        dict for {lcid lciddata} $namedata {
+                            dict for {invkind proto} $lciddata {
+                                ::twapi::dispatch_prototype_set \
+                                    $guid $name $lcid $invkind $proto
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    method @Text {args} {
+        array set opts [::twapi::parseargs args {
+            type.arg
+            name.arg
+        } -maxleftover 0 -nulldefault]
+
+        set text {}
+        my @Foreach -type $opts(type) -name $opts(name) ti {
+            ::twapi::trap {
+                array set attrs [$ti @GetTypeAttr -all]
+                set docs [$ti @GetDocumentation -1 -name -docstring]
+                set desc "[string totitle $attrs(-typekind)] [::twapi::kl_get $docs -name] $attrs(-guid) - [::twapi::kl_get $docs -docstring]\n"
+                switch -exact -- $attrs(-typekind) {
+                    record -
+                    union  -
+                    enum {
+                        for {set j 0} {$j < $attrs(-varcount)} {incr j} {
+                            array set vardata [$ti @GetVarDesc $j -all]
+                            set vardesc "$vardata(-varkind) [::twapi::_resolve_com_type_text $ti $vardata(-datatype)] $vardata(-name)"
+                            if {$attrs(-typekind) eq "enum"} {
+                                append vardesc " = $vardata(-value) ([::twapi::_resolve_com_type_text $ti $vardata(-valuetype)])"
+                            } else {
+                                append vardesc " (offset $vardata(-value))"
+                            }
+                            append desc "\t$vardesc\n"
+                        }
+                    }
+                    alias {
+                        append desc "\ttypedef $attrs(-aliasdesc)\n"
+                    }
+                    module -
+                    dispatch -
+                    interface {
+                        append desc [::twapi::_interface_text $ti]
+                    }
+                    coclass {
+                        for {set j 0} {$j < $attrs(-interfacecount)} {incr j} {
+                            set ti2 [$ti @GetRefTypeInfoFromIndex $j]
+                            set idesc [$ti2 @GetName]
+                            set iflags [$ti @GetImplTypeFlags $j]
+                            if {[llength $iflags]} {
+                                append idesc " ([join $iflags ,])"
+                            }
+                            append desc \t$idesc
+                            $ti2 Release
+                            unset ti2
+                        }
+                    }
+                    default {
+                        append desc "Unknown typekind: $attrs(-typekind)\n"
+                    }
+                }
+                append text \n$desc
+            } finally {
+                $ti Release
+                if {[info exists ti2]} {
+                    $ti2 Release
+                }
+            }
+        }
+        return $text
+    }
+
+    method @GenerateCode {args} {
+        array set opts [twapi::parseargs args {
+            namespace.arg
+        } -ignoreunknown]
+
+        if {![info exists opts(namespace)]} {
+            set opts(namespace) [string tolower [my @GetName]]
+        }
+
+        set data [my @Read {*}$args]
+        
+        set code {}
+
+        # If namespace specfied as empty string (as opposed to unspecified)
+        # do not output a namespace
+        if {$opts(namespace) ne "" &&
+            ([dict exists $data enum] ||
+             [dict exists $data module] ||
+             [dict exists $data coclass])
+        } {
+            append code "\nnamespace eval $opts(namespace) \{\n"
+            append code "\n    # Array mapping coclass names to their guids\n"
+            append code "    variable _coclass_guids\n"
+            append code "\n    # Array mapping dispatch interface names to their guids\n"
+            append code "    variable _dispatch_guids\n"
+            append code {
+    # Returns the GUID for a coclass or empty string if not found
+    proc coclass_guid {coclass_name} {
+        variable _coclass_guids
+        if {[info exists _coclass_guids($coclass_name)]} {
+            return $_coclass_guids($coclass_name)
+        }
+        return ""
+    }
+    # Returns the GUID for a dispatch name or empty string if not found
+    proc dispatch_guid {dispatch_name} {
+        variable _dispatch_guids
+        if {[info exists _dispatch_guids($dispatch_name)]} {
+            return $_dispatch_guids($dispatch_name)
+        }
+        return ""
+    }
+    # Marks the specified object to be of a specific dispatch/coclass type
+    proc declare {typename comobj} {
+        # First check if it is the name of a dispatch interface
+        set guid [dispatch_guid $typename]
+        if {$guid ne ""} {
+            $comobj -interfaceguid $guid
+            return
+        }
+
+        # If not, check if it is the name of a coclass with a dispatch interface
+        set guid [coclass_guid $typename]
+        if {$guid ne ""} {
+            if {[info exists ::twapi::_coclass_idispatch_guids($guid)]} {
+                $comobj -interfaceguid $::twapi::_coclass_idispatch_guids($guid)
+                return
+            }
+        }
+
+        error "Could not resolve interface for $typename."
+    }
+            }
+        }; # append code...
+
+        if {[dict exists $data module]} {
+            dict for {guid guiddata} [dict get $data module] {
+                # Some modules may not have constants (-values).
+                # We currently only output constants from modules, not functions
+                if {[dict exists $guiddata -values]} {
+                    set module_name [dict get $guiddata -name]
+                    append code "\n    # Module $module_name ($guid)\n"
+                    append code "    [list array set $module_name [dict get $guiddata -values]]"
+                    append code \n
+                }
+            }
+        }
+
+        if {[dict exists $data enum]} {
+            dict for {name def} [dict get $data enum] {
+                append code "\n    # Enum $name\n"
+                append code "    [list array set $name [dict get $def -values]]"
+                append code \n
+            }
+        }
+
+        if {[dict exists $data coclass]} {
+            dict for {guid def} [dict get $data coclass] {
+                append code "\n    # Coclass [dict get $def -name]"
+                # Look for the default interface so we can remember its GUID.
+                # This is necessary for the cases where the Dispatch interface
+                # GUID is not available via a TypeInfo interface (e.g.
+                # a 64-bit COM component not registered with the 32-bit
+                # COM registry)
+                if {[dict exists $def -defaultdispatch]} {
+                    set default_dispatch_guid [dict get $def -defaultdispatch]
+                    append code "\n    set ::twapi::_coclass_idispatch_guids($guid) \"$default_dispatch_guid\"\n"
+                } else {
+                    set default_dispatch_guid ""
+                }
+                
+                # We assume here that coclass has a default interface
+                # which is dispatchable. Else an error will be generated
+                # at runtime.
+                append code [format {
+    set _coclass_guids(%1$s) "%2$s"
+    twapi::class create %1$s {
+        superclass ::twapi::Automation
+        constructor {args} {
+            set ifc [twapi::com_create_instance "%2$s" -interface IDispatch -raw {*}$args]
+            next [twapi::IDispatchProxy new $ifc "%2$s"]
+            if {[string length "%3$s"]} {
+                my -interfaceguid "%3$s"
+            }
+        }
+    }} [dict get $def -name] $guid $default_dispatch_guid]
+                append code \n
+            }
+        }
+
+        if {$opts(namespace) ne "" &&
+            ([dict exists $data enum] ||
+             [dict exists $data module] ||
+             [dict exists $data coclass])
+        } {
+            append code "\}"
+            append code \n
+        }
+
+        if {[dict exists $data dispatch]} {
+            dict for {guid guiddata} [dict get $data dispatch] {
+                set dispatch_name [dict get $guiddata -name]
+                append code "\n# Dispatch Interface $dispatch_name\n"
+                append code "set [set opts(namespace)]::_dispatch_guids($dispatch_name) \"$guid\"\n"
+                foreach type {methods properties} {
+                    if {[dict exists $guiddata -$type]} {
+                        append code "# $dispatch_name [string totitle $type]\n"
+                        dict for {name namedata} [dict get $guiddata -$type] {
+                            dict for {lcid lciddata} $namedata {
+                                dict for {invkind proto} $lciddata {
+                                    append code [list ::twapi::dispatch_prototype_set \
+                                                     $guid $name $lcid $invkind $proto]
+                                    append code \n
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return $code
+    }
+
+    method @Read {args} {
+        array set opts [::twapi::parseargs args {
+            type.arg
+            name.arg
+        } -maxleftover 0 -nulldefault]
+
+        # Dictionary to contain result
+        set data [dict create]
+
+        # Entries for coclasses and dispatch interfaces have a mutual
+        # dependency. Generation of dispatch interface method
+        # prototypes need to (potentially) resolve coclass names
+        # that map to dispatch interfaces.
+        # Conversely, that resolution requires a list of dispatch
+        # interface guids so gather that first.
+
+        # List of dispatch guids
+        array set dispatch_guids {}
+        if {$opts(type) in {{} coclass dispatch}} {
+            # Collect dispatch guids. Note we do not collect other
+            # dispatch details since prototypes will need the coclass
+            # information which we do not have yet
+            my @Foreach -type dispatch ti {
+                ::twapi::trap {
+                    set dispatch_guids([dict get [$ti GetTypeAttr] guid]) ""
+                } finally {
+                    $ti Release
+                }
+            }
+            # Now that we have dispatch guids, collect coclass information
+            my @Foreach -type coclass ti {
+                ::twapi::trap {
+                    array set attrs [$ti @GetTypeAttr -guid -lcid -varcount -fncount -interfacecount -typekind]
+                    set name [lindex [$ti @GetDocumentation -1 -name] 1]
+                    dict set data "coclass" $attrs(-guid) -name $name
+                    for {set j 0} {$j < $attrs(-interfacecount)} {incr j} {
+                        set ti2 [$ti @GetRefTypeInfoFromIndex $j]
+                        set iflags [$ti GetImplTypeFlags $j]
+                        set iguid [twapi::kl_get [$ti2 GetTypeAttr] guid]
+                        set iname [$ti2 @GetName]
+                        $ti2 Release
+                        unset ti2; # So finally clause does not release again on error
+                        
+                        dict set data "coclass" $attrs(-guid) -interfaces $iguid -name $iname
+                        dict set data "coclass" $attrs(-guid) -interfaces $iguid -flags $iflags
+
+                        # If this is a dispatch interface and the default interface
+                        # for the coclass, add it to coclass default dispatch database.
+                        # This will be used to resolve dispatch prototypes
+                        if {$iflags == 1 && [info exists dispatch_guids($iguid)]} {
+                            # This is used by the parameter resolution code in
+                            # _resolve_comtype while building prototypes
+                            set ::twapi::_coclass_idispatch_guids($attrs(-guid)) $iguid
+                            dict set data "coclass" $attrs(-guid) -defaultdispatch $iguid
+                        }
+                    }
+                } finally {
+                    if {[info exists ti2]} {
+                        $i2 Release
+                    }
+                    $ti Release
+                }
+            }
+        }
+
+        # If we were only looking for coclass information, we already have it
+        if {$opts(type) eq "coclass"} {
+            return $data
+        }
+
+        my @Foreach -type $opts(type) -name $opts(name) ti {
+            ::twapi::trap {
+                array set attrs [$ti @GetTypeAttr -guid -lcid -varcount -fncount -interfacecount -typekind]
+                set name [lindex [$ti @GetDocumentation -1 -name] 1]
+                # dict set data $attrs(-typekind) $name {}
+                switch -exact -- $attrs(-typekind) {
+                    record -
+                    union  -
+                    enum {
+                        # For consistency with the coclass and dispatch dict structure
+                        # we have a separate key for 'name' even though it is the same
+                        # as the dict key
+                        dict set data $attrs(-typekind) $name -name $name
+                        for {set j 0} {$j < $attrs(-varcount)} {incr j} {
+                            array set vardata [$ti @GetVarDesc $j -name -value]
+                            dict set data $attrs(-typekind) $name -values $vardata(-name) $vardata(-value)
+                        }
+                    }
+                    alias {
+                        # TBD - anything worth importing ?
+                    }
+                    dispatch {
+                        # Load up the functions
+                        dict set data $attrs(-typekind) $attrs(-guid) -name $name
+                        for {set j 0} {$j < $attrs(-fncount)} {incr j} {
+                            array set funcdata [$ti GetFuncDesc $j]
+                            if {$funcdata(funckind) != 4} {
+                                # Not a dispatch function (4), ignore
+                                # TBD - what else could it be if already filtering
+                                # typeinfo on dispatch
+                                # Vtable set funckind "(vtable $funcdata(-oVft))"
+                                ::twapi::debuglog "Unexpected funckind value '$funcdata(funckind)' ignored. funcdata: [array get funcdata]"
+                                continue;
+                            }
+                            
+                            set proto [list $funcdata(memid) \
+                                           $attrs(-lcid) \
+                                           $funcdata(invkind) \
+                                           $funcdata(elemdescFunc.tdesc) \
+                                           [::twapi::_resolve_params_for_prototype $ti $funcdata(lprgelemdescParam)]]
+                            # Param names are needed for named arguments. Index 0 is method name so skip it
+                            if {[catch {lappend proto [lrange [$ti GetNames $funcdata(memid)] 1 end]}]} {
+                                # Could not get param names
+                                lappend proto {}
+                            }
+
+                            dict set data "$attrs(-typekind)" \
+                                $attrs(-guid) \
+                                -methods \
+                                [$ti @GetName $funcdata(memid)] \
+                                $attrs(-lcid) \
+                                $funcdata(invkind) \
+                                $proto
+                        }
+                        # Load up the properties
+                        for {set j 0} {$j < $attrs(-varcount)} {incr j} {
+                            array set vardata [$ti GetVarDesc $j]
+                            # We will add both propput and propget.
+                            # propget:
+                            dict set data "$attrs(-typekind)" \
+                                $attrs(-guid) \
+                                -properties \
+                                [$ti @GetName $vardata(memid)] \
+                                $attrs(-lcid) \
+                                2 \
+                                [list $vardata(memid) $attrs(-lcid) 2 $vardata(elemdescVar.tdesc) {} {}]
+
+                            # TBD - mock up the parameters for the property set
+                            # Single parameter corresponding to return type of
+                            # property. Param list is of the form
+                            # {PARAM1 PARAM2} where PARAM is {TYPE {FLAGS ?DEFAULT}}
+                            # So param list with one param is
+                            # {{TYPE {FLAGS ?DEFAULT?}}}
+                            # propput:
+                            if {! ($vardata(wVarFlags) & 1)} {
+                                # Not read-only
+                                dict set data "$attrs(-typekind)" \
+                                    $attrs(-guid) \
+                                    -properties \
+                                    [$ti @GetName $vardata(memid)] \
+                                    $attrs(-lcid) \
+                                    4 \
+                                    [list $vardata(memid) $attrs(-lcid) 4 24 [list [list $vardata(elemdescVar.tdesc) [list 1]]] {}]
+                            }
+                        }
+                    }
+
+                    module {
+                        dict set data $attrs(-typekind) $attrs(-guid) -name $name
+                        # TBD - Load up the functions
+
+                        # Now load up the variables
+                        for {set j 0} {$j < $attrs(-varcount)} {incr j} {
+                            array set vardata [$ti @GetVarDesc $j -name -value]
+                            dict set data $attrs(-typekind) $attrs(-guid) -values $vardata(-name) $vardata(-value)
+                        }
+                    }
+
+                    interface {
+                        # TBD
+                    }
+                    
+                    coclass {
+                        # We have already collected this information before this loop
+                        continue
+                    }
+                    default {
+                        # TBD
+                    }
+                }
+            } finally {
+                $ti Release
+                if {[info exists ti2]} {
+                    $ti2 Release
+                }
+            }
+        }
+
+        # Unless we are collecting coclass info, remove any related info
+        # that we might have gathered for dispatch prototypes
+        if {$opts(type) ni {{} coclass}} {
+            dict unset data "coclass"
+        }
+        return $data
+    }
+
+    twapi_exportall
+}
+
+# ITypeComp
+#----------
+twapi::class create ::twapi::ITypeCompProxy {
+    superclass ::twapi::IUnknownProxy
+
+    method Bind {name lhash flags} {
+        my variable _ifc
+        return [::twapi::ITypeComp_Bind $_ifc $name $lhash $flags]
+    }
+
+    # Returns empty list if bind not found
+    method @Bind {name flags {lcid 0}} {
+        ::twapi::trap {
+            set binding [my Bind $name [::twapi::LHashValOfName $lcid $name] $flags]
+        } onerror {TWAPI_WIN32 0x80028ca0} {
+            # Found but type mismatch (flags not correct)
+            return {}
+        }
+
+        lassign $binding type data tifc
+        return [list $type $data [::twapi::make_interface_proxy $tifc]]
+    }
+
+    twapi_exportall
+}
+
+# IEnumVARIANT
+#-------------
+
+twapi::class create ::twapi::IEnumVARIANTProxy {
+    superclass ::twapi::IUnknownProxy
+
+    method Next {count {value_only 0}} {
+        my variable _ifc
+        return [::twapi::IEnumVARIANT_Next $_ifc $count $value_only]
+    }
+    method Clone {} {
+        my variable _ifc
+        return [::twapi::IEnumVARIANT_Clone $_ifc]
+    }
+    method @Clone {} {
+        return [::twapi::make_interface_proxy [my Clone]]
+    }
+    method Reset {} {
+        my variable _ifc
+        return [::twapi::IEnumVARIANT_Reset $_ifc]
+    }
+    method Skip {count} {
+        my variable _ifc
+        return [::twapi::IEnumVARIANT_Skip $_ifc $count]
+    }
+
+    twapi_exportall
+}
+
+# Automation
+#-----------
+twapi::class create ::twapi::Automation {
+
+    # Caller gives up ownership of proxy in all cases, even errors.
+    # $proxy will eventually be Release'ed. If caller wants to keep
+    # a reference to it, it must do an *additional* AddRef on it to
+    # keep it from going away when the Automation object releases it.
+    constructor {proxy {lcid 0}} {
+        my variable _proxy _lcid  _sinks _connection_pts
+
+        set type [$proxy @Type]
+        if {$type ne "IDispatch" && $type ne "IDispatchEx"} {
+            $proxy Release;     # Even on error, responsible for releasing
+            error "Automation objects do not support interfaces of type '$type'"
+        }
+        if {$type eq "IDispatchEx"} {
+            my variable _have_dispex
+            # If _have_dispex variable
+            #   - does not exist, have not tried to get IDispatchEx yet
+            #   - is 0, have tried but failed
+            #   - is 1, already have IDispatchEx
+            set _have_dispex 1
+        }
+
+        set _proxy $proxy
+        set _lcid $lcid
+        array set _sinks {}
+        array set _connection_pts {}
+    }
+
+    destructor {
+        my variable _proxy  _sinks
+
+        # Release sinks, connection points
+        foreach sinkid [array names _sinks] {
+            my -unbind $sinkid
+        }
+
+        if {[info exists _proxy]} {
+            $_proxy Release
+        }
+        return
+    }
+
+    # Intended to be called only from another method. Not directly.
+    # Does an uplevel 2 to get to application context.
+    # On failures, retries with IDispatchEx interface
+    # TBD - get rid of this uplevel business by having internal
+    # callers to equivalent of "uplevel 1 my _invoke ...
+    method _invoke {name invkinds params args} {
+        my variable  _proxy  _lcid
+
+        if {[$_proxy @Null?]} {
+            error "Attempt to invoke method $name on NULL COM object"
+        }
+
+        array set opts [twapi::parseargs args {
+            raw.bool
+            namedargs.arg
+        } -nulldefault -maxleftover 0]
+
+        ::twapi::trap {
+            set vtval [uplevel 2 [list $_proxy @Invoke $name $invkinds $_lcid $params $opts(namedargs)]]
+            if {$opts(raw)} {
+                return $vtval
+            } else {
+                return [::twapi::variant_value $vtval 0 0 $_lcid]
+            }
+        } onerror {} {
+            # TBD - should we only drop down below to check for IDispatchEx
+            # for specific error codes. Right now we do it for all.
+            set erinfo $::errorInfo
+            set ercode $::errorCode
+            set ermsg [::twapi::trapresult]
+        }
+
+        # We plan on trying to get a IDispatchEx interface in case
+        # the method/property is the "expando" type
+        my variable  _have_dispex
+        if {[info exists _have_dispex]} {
+            # We have already tried for IDispatchEx, either successfully
+            # or not. Either way, no need to try again
+            error $ermsg $erinfo $ercode
+        }
+
+        # Try getting a IDispatchEx interface
+        if {[catch {$_proxy @QueryInterface IDispatchEx 1} proxy_ex] ||
+            $proxy_ex eq ""} {
+            set _have_dispex 0
+            error $ermsg $erinfo $ercode
+        }
+
+        set _have_dispex 1
+        $_proxy Release
+        set _proxy $proxy_ex
+        
+        # Retry with the IDispatchEx interface
+        set vtval [uplevel 2 [list $_proxy @Invoke $name $invkinds $_lcid $params $opts(namedargs)]]
+        if {$opts(raw)} {
+            return $vtval
+        } else {
+            return [::twapi::variant_value $vtval 0 0 $_lcid]
+        }
+    }
+
+    method -get {name args} {
+        return [my _invoke $name [list 2] $args]
+    }
+
+    method -put {name args} {
+        return [my _invoke $name [list 4] $args]
+    }
+    forward -set my -put
+
+    method -putref {name args} {
+        return [my _invoke $name [list 8] $args]
+    }
+
+    method -call {name args} {
+        return [my _invoke $name [list 1] $args]
+    }
+
+    method -callnamedargs {name args} {
+        return [my _invoke $name [list 1] {} -namedargs $args]
+    }
+
+    # Need a wrapper around _invoke in order for latter's uplevel 2
+    # to work correctly
+    # TBD - document, test
+    method -invoke {name invkinds params args} {
+        return [my _invoke $name $invkinds $params {*}$args]
+    }
+
+    method -destroy {} {
+        my destroy
+    }
+
+    method -isnull {} {
+        my variable _proxy
+        return [$_proxy @Null?]
+    }
+
+    method -default {} {
+        my variable _proxy _lcid
+        return [::twapi::variant_value [$_proxy Invoke ""] 0 0 $_lcid]
+    }
+
+    # Caller must call release on the proxy
+    method -proxy {} {
+        my variable _proxy
+        $_proxy AddRef
+        return $_proxy
+    }
+
+    # Only for debugging
+    method -proxyrefcounts {} {
+        my variable _proxy
+        return [$_proxy DebugRefCounts]
+    }
+
+    # Returns the raw interface. Caller must call IUnknownRelease on it
+    # iff addref is passed as true (default)
+    method -interface {{addref 1}} {
+        my variable _proxy
+        return [$_proxy @Interface $addref]
+    }
+
+    # Validates internal structures
+    method -validate {} {
+        twapi::ValidateIUnknown [my -interface 0]
+    }
+
+    # Set/return the GUID for the interface
+    method -interfaceguid {{guid ""}} {
+        my variable _proxy
+        return [$_proxy @SetGuid $guid]
+    }
+
+    # Sets the idispatch or coclass of the object
+    method -instanceof {coclass} {
+        # The coclass may be a GUID or the Tcl name
+        if {[::twapi::Twapi_IsValidGUID $coclass]} {
+            if {[info exists ::twapi::_coclass_idispatch_guids($coclass)]} {
+                $comobj -interfaceguid $::twapi::_coclass_idispatch_guids($coclass)
+            }
+            error "Could not resolve interface for coclass GUID $coclass." 
+        }
+        # Check for corresponding Tcl class name generated from a type
+        # library
+        set ns [namespace qualifiers $coclass]
+        if {$ns eq ""} {
+            error "Coclass name must be qualified with name of containing namespace."
+        }
+        uplevel 1 [list ${ns}::declare [namespace tail $coclass] [self]]
+    }
+
+    # Return the disp id for a method/property
+    method -dispid {name} {
+        my variable _proxy
+        return [$_proxy @GetIDOfOneName $name]
+    }
+
+    # Prints methods in an interface
+    method -print {} {
+        my variable _proxy
+        ::twapi::dispatch_print $_proxy
+    }
+
+    method -with {subobjlist args} {
+        # $obj -with SUBOBJECTPATHLIST arguments
+        # where SUBOBJECTPATHLIST is list each element of which is
+        # either a property or a method of the previous element in
+        # the list. The element may itself be a list in which case
+        # the first element is the property/method and remaining
+        # are passed to it
+        #
+        # Note that 'arguments' may themselves be comobj subcommands!
+        set next [self]
+        set releaselist [list ]
+        ::twapi::trap {
+            while {[llength $subobjlist]} {
+                set nextargs [lindex $subobjlist 0]
+                set subobjlist [lrange $subobjlist 1 end]
+                set next [uplevel 1 [list $next] $nextargs]
+                lappend releaselist $next
+            }
+            # We use uplevel here because again we want to run in caller
+            # context 
+            return [uplevel 1 [list $next] $args]
+        } finally {
+            foreach next $releaselist {
+                $next -destroy
+            }
+        }
+    }
+
+    method -iterate {args} {
+        my variable _lcid
+
+        array set opts [::twapi::parseargs args {
+            cleanup
+        }]
+
+        if {[llength $args] < 2} {
+            error "Syntax: COMOBJ -iterate ?options? VARNAME SCRIPT"
+        }
+        upvar 1 [lindex $args 0] var
+        set script [lindex $args 1]
+
+        # First get IEnumVariant iterator using the _NewEnum method
+        # TBD - As per MS OLE Automation spec, it appears _NewEnum
+        # MUST have dispid -4. Can we use this information when
+        # this object does not have an associated interface guid or
+        # when no prototype is available ?
+        set enumerator [my -get _NewEnum]
+        # This gives us an IUnknown.
+        ::twapi::trap {
+            # Convert the IUnknown to IEnumVARIANT
+            set iter [$enumerator @QueryInterface IEnumVARIANT]
+            if {! [$iter @Null?]} {
+                set more 1
+                while {$more} {
+                    # Get the next item from iterator
+                    set next [$iter Next 1]
+                    lassign $next more values
+                    if {[llength $values]} {
+                        set var [::twapi::variant_value [lindex $values 0] 0 0 $_lcid]
+                        set ret [catch {uplevel 1 $script} msg options]
+                        switch -exact -- $ret {
+                            0 -
+                            4 {
+                                # Body executed successfully, or invoked continue
+                                if {$opts(cleanup)} {
+                                    $var destroy
+                                }
+                            }
+                            3 {
+                                if {$opts(cleanup)} {
+                                    $var destroy
+                                }
+                                set more 0; # TCL_BREAK
+                            }
+                            1 -
+                            2 -
+                            default {
+                                if {$opts(cleanup)} {
+                                    $var destroy
+                                }
+                                dict incr options -level
+                                return -options $options $msg
+                            }
+
+                        }
+                    }
+                }
+            }
+        } finally {
+            $enumerator Release
+            if {[info exists iter] && ![$iter @Null?]} {
+                $iter Release
+            }
+        }
+        return
+    }
+
+    method -bind {script} {
+        my variable   _proxy   _sinks    _connection_pts
+
+        # Get the coclass typeinfo and  locate the source interface
+        # within it and retrieve disp id mappings
+        ::twapi::trap {
+            set coti [$_proxy @GetCoClassTypeInfo]
+
+            # $coti is the coclass information. Get dispids for the default
+            # source interface for events and its guid
+            set srcti [$coti @GetDefaultSourceTypeInfo]
+            array set srcinfo [$srcti @GetTypeAttr -memidmap -guid]
+
+            # TBD - implement IConnectionPointContainerProxy
+            # Now we need to get the actual connection point itself
+            set container [$_proxy QueryInterface IConnectionPointContainer]
+            set connpt_ifc [::twapi::IConnectionPointContainer_FindConnectionPoint $container $srcinfo(-guid)]
+
+            # Finally, create our sink object
+            # TBD - need to make sure Automation object is not deleted or
+            # should the callback itself check?
+            # TBD - what guid should we be passing? CLSID or IID ?
+            set sink_ifc [::twapi::Twapi_ComServer $srcinfo(-guid) $srcinfo(-memidmap) [list ::twapi::_eventsink_callback [self] $script]]
+
+            # OK, we finally have everything we need. Tell the event source
+            set sinkid [::twapi::IConnectionPoint_Advise $connpt_ifc $sink_ifc]
+            
+            set _sinks($sinkid) $sink_ifc
+            set _connection_pts($sinkid) $connpt_ifc
+            return $sinkid
+        } onerror {} {
+            # These are released only on error as otherwise they have
+            # to be kept until unbind time
+            foreach ifc {connpt_ifc sink_ifc} {
+                if {[info exists $ifc] && [set $ifc] ne ""} {
+                    ::twapi::IUnknown_Release [set $ifc]
+                }
+            }
+            twapi::rethrow
+        } finally {
+            # In all cases, release any interfaces we created
+            # Note connpt_ifc and sink_ifc are released at unbind time except
+            # on error
+            foreach obj {coti srcti} {
+                if {[info exists $obj]} {
+                    [set $obj] Release
+                }
+            }
+            if {[info exists container]} {
+                ::twapi::IUnknown_Release $container
+            }
+        }
+    }
+
+    method -unbind {sinkid} {
+        my variable   _proxy   _sinks    _connection_pts
+
+        if {[info exists _connection_pts($sinkid)]} {
+            ::twapi::IConnectionPoint_Unadvise $_connection_pts($sinkid) $sinkid
+            unset _connection_pts($sinkid)
+        }
+
+        if {[info exists _sinks($sinkid)]} {
+            ::twapi::IUnknown_Release $_sinks($sinkid)
+            unset _sinks($sinkid)
+        }
+        return
+    }
+
+    method -securityblanket {args} {
+        my variable _proxy
+        if {[llength $args]} {
+            $_proxy @SetSecurityBlanket [lindex $args 0]
+            return
+        } else {
+            return [$_proxy @GetSecurityBlanket]
+        }
+    }
+
+    method -lcid {{lcid ""}} {
+        my variable _lcid
+        if {$lcid ne ""} {
+            if {![string is integer -strict $lcid]} {
+                error "Invalid LCID $lcid"
+            }
+            set _lcid $lcid
+        }
+        return $_lcid
+    }
+
+    method unknown {name args} {
+        # We have to figure out if it is a property get, property put
+        # or a method. We make a guess based on number of parameters.
+        # We specify an order to try based on this. The invoke will try
+        # all invocations in that order.
+        set nargs [llength $args]
+        if {$nargs == 0} {
+            # No arguments, cannot be propput*. Try propget and method
+            set invkinds [list 2 1]
+        } elseif {$nargs == 1} {
+            # One argument, likely propput, method, propget, propputref
+            # propputref is last as least likely
+            set invkinds [list 4 1 2 8]
+        } else {
+            # Multiple arguments, likely method, propput, propget, propputref
+            # propputref is last as least likely
+            set invkinds [list 1 4 2 8]
+        }
+
+        return [my _invoke $name $invkinds $args]
+    }
+
+    twapi_exportall
+}
+
+#
+# Singleton NULL comobj object. We want to override default destroy methods
+# to prevent object from being destroyed. This is a backward compatibility
+# hack and not fool proof since the command could just be renamed away.
+twapi::class create twapi::NullAutomation {
+    superclass twapi::Automation
+    constructor {} {
+        next [twapi::make_interface_proxy {0 IDispatch}]
+    }
+    method -destroy {}  {
+        # Silently ignore
+    }
+    method destroy {}  {
+        # Silently ignore
+    }
+    twapi_exportall
+}
+
+twapi::NullAutomation create twapi::comobj_null
+# twapi::Automation create twapi::comobj_null [twapi::make_interface_proxy {0 IDispatch}]
+
+proc twapi::_comobj_cleanup {} {
+    foreach obj [comobj_instances] {
+        $obj destroy
+    }
+}
+
+# In order for servers to release objects properly, the IUnknown interface
+# must have the same security settings as were used in the object creation
+# call. This is a helper for that.
+proc twapi::_com_set_iunknown_proxy {ifc blanket} {
+    set iunk [Twapi_IUnknown_QueryInterface $ifc [_iid_iunknown] IUnknown]
+    trap {
+        CoSetProxyBlanket $iunk {*}$blanket
+    } finally {
+        IUnknown_Release $iunk
+    }
+}
+
+
+twapi::proc* twapi::_init_authnames {} {
+    variable _com_authsvc_to_name 
+    variable _com_name_to_authsvc
+    variable _com_impersonation_to_name
+    variable _com_name_to_impersonation
+    variable _com_authlevel_to_name
+    variable _com_name_to_authlevel
+
+    set _com_authsvc_to_name {0 none 9 negotiate 10 ntlm 14 schannel 16 kerberos 0xffffffff default}
+    set _com_name_to_authsvc [swapl $_com_authsvc_to_name]
+    set _com_name_to_impersonation {default 0 anonymous 1 identify 2 impersonate 3 delegate 4}
+    set _com_impersonation_to_name [swapl $_com_name_to_impersonation]
+    set _com_name_to_authlevel {default 0 none 1 connect 2 call 3 packet 4 packetintegrity 5 privacy 6}
+    set _com_authlevel_to_name [swapl $_com_name_to_authlevel]
+} {
+}
+
+twapi::proc* twapi::_com_authsvc_to_name {authsvc} {
+    _init_authnames
+} {
+    variable _com_authsvc_to_name
+    return [dict* $_com_authsvc_to_name $authsvc]
+}
+
+twapi::proc* twapi::_com_name_to_authsvc {name} {
+    _init_authnames
+} {
+    variable _com_name_to_authsvc
+    if {[string is integer -strict $name]} {
+        return $name
+    }
+    return [dict! $_com_name_to_authsvc $name]
+}
+
+twapi::proc* twapi::_com_authlevel_to_name {authlevel} {
+    _init_authnames
+} {
+    variable _com_authlevel_to_name
+    return [dict* $_com_authlevel_to_name $authlevel]
+}
+
+twapi::proc* twapi::_com_name_to_authlevel {name} {
+    _init_authnames
+} {
+    variable _com_name_to_authlevel
+    if {[string is integer -strict $name]} {
+        return $name
+    }
+    return [dict! $_com_name_to_authlevel $name]
+}
+
+
+twapi::proc* twapi::_com_impersonation_to_name {imp} {
+    _init_authnames
+} {
+    variable _com_impersonation_to_name
+    return [dict* $_com_impersonation_to_name $imp]
+}
+
+twapi::proc* twapi::_com_name_to_impersonation {name} {
+    _init_authnames
+} {
+    variable _com_name_to_impersonation
+    if {[string is integer -strict $name]} {
+        return $name
+    }
+    return [dict! $_com_name_to_impersonation $name]
+}
+
+#################################################################
+# COM server implementation
+# WARNING: do not use any fancy TclOO features because it has to
+# run under 8.5/metoo as well
+# TBD - test scripts?
+
+twapi::class create twapi::ComFactory {
+    constructor {clsid member_map create_command_prefix} {
+        my variable _clsid _create_command_prefix _member_map _ifc
+
+        set _clsid $clsid
+        set _member_map $member_map
+        set _create_command_prefix $create_command_prefix
+
+        set _ifc [twapi::Twapi_ClassFactory $_clsid [list [self] _create_instance]]
+    }
+
+    destructor {
+        # TBD - what happens if factory is destroyed while objects still
+        # exist ?
+        # App MUST explicitly destroy objects before exiting
+        my variable _class_registration_id
+        if {[info exists _class_registration_id]} {
+            twapi::CoRevokeClassObject $_class_registration_id
+        }
+    }
+
+    # Called from Twapi_ClassFactory_CreateInstance to create a new object
+    # Should not be called from elsewhere
+    method _create_instance {iid} {
+        my variable _create_command_prefix _member_map
+        # Note [list {*}$foo] != $foo - consider when foo contains a ";"
+        set obj_prefix [uplevel #0 [list {*}$_create_command_prefix]]
+        twapi::trap {
+            # Since we are not holding on to this interface ourselves,
+            # we can pass it on without AddRef'ing it
+            return [twapi::Twapi_ComServer $iid $_member_map $obj_prefix]
+        } onerror {} {
+            $obj_prefix destroy
+            twapi::rethrow
+        }
+    }
+
+    method register {args} {
+        my variable _clsid _create_command_prefix _member_map _ifc _class_registration_id
+        twapi::parseargs args {
+            {model.arg any}
+        } -setvars -maxleftover 0
+        set model_flags 0
+        foreach m $model {
+            switch -exact -- $m {
+                any           {twapi::setbits model_flags 20}
+                localserver   {twapi::setbits model_flags 4}
+                remoteserver  {twapi::setbits model_flags 16}
+                default {twapi::badargs! "Invalid COM class model '$m'"}
+            }
+        }
+        
+        # 0x6 -> REGCLS_MULTI_SEPARATE | REGCLS_SUSPENDED
+        set _class_registration_id [twapi::CoRegisterClassObject $_clsid $_ifc $model_flags 0x6]
+        return
+    }
+    
+    export _create_instance
+}
+
+proc twapi::comserver_factory {clsid member_map command_prefix {name {}}} {
+    if {$name ne ""} {
+        uplevel 1 [list [namespace current]::ComFactory create $name $clsid $member_map $command_prefix]
+    } else {
+        uplevel 1 [list [namespace current]::ComFactory new $clsid $member_map $command_prefix]
+    }
+}
+
+proc twapi::start_factories {{cmd {}}} {
+    # TBD - what if no class objects ?
+    CoResumeClassObjects
+
+    if {[llength $cmd]} {
+        # TBD - normalize $cmd so to run in right namespace etc.
+        trace add variable [namspace current]::com_shutdown_signal write $cmd
+        return
+    }
+
+    # This is set from the C code when we are not serving up any
+    # COM objects (either event callbacks or com servers)
+    vwait [namespace current]::com_shutdown_signal
+}
+
+proc twapi::suspend_factories {} {
+    CoSuspendClassObjects
+}
+
+proc twapi::resume_factories {} {
+    CoResumeClassObjects
+}
+
+proc twapi::install_coclass_script {progid clsid version script_path args} {
+    # Need to extract params so we can prefix script name
+    set saved_args $args
+    array set opts [parseargs args {
+        params.arg
+    } -ignoreunknown]
+
+    set script_path [file normalize $script_path]
+
+    # Try to locate the wish executable to run the component
+    if {[info commands wm] eq ""} {
+        set dir [file dirname [info nameofexecutable]]
+        set wishes [glob -nocomplain -directory $dir wish*.exe]
+        if {[llength $wishes] == 0} {
+            error "Could not locate wish program."
+        }
+        set wish [lindex $wishes 0]
+    } else {
+        # We are running wish already
+        set wish [info nameofexecutable]
+    }
+
+    set exe_path [file nativename [file attributes $wish -shortname]]
+
+    set params "\"$script_path\""
+    if {[info exists opts(params)]} {
+        append params " $params"
+    }
+    return [install_coclass $progid $clsid $version $exe_path {*}$args -outproc -params $params]
+}
+
+proc twapi::install_coclass {progid clsid version path args} {
+    array set opts [twapi::parseargs args {
+        {scope.arg user {user system}}
+        appid.arg
+        appname.arg
+        inproc
+        outproc
+        service
+        params.arg
+        name.arg
+    } -maxleftover 0]
+
+    switch [tcl::mathop::+ $opts(inproc) $opts(outproc) $opts(service)] {
+        0 {
+            # Need to figure out the type
+            switch [file extension $path] {
+                .exe { set opts(outproc) 1 }
+                .ocx -
+                .dll { set opts(inproc) 1 }
+                default { set opts(service) 1 }
+            }
+        }
+        1 {}
+        default {
+            badargs! "Only one of -inproc, -outproc or -service may be specified"
+        }
+    }
+
+    if {(! [string is integer -strict $version]) || $version <= 0} {
+        twapi::badargs! "Invalid version '$version'. Must be a positive integer"
+    }
+    if {![regexp {^[[:alpha:]][[:alnum:]]*\.[[:alpha:]][[:alnum:]]*$} $progid]} {
+        badargs! "Invalid PROGID syntax '$progid'"
+    }
+    set clsid [canonicalize_guid $clsid]
+    if {![info exists opts(appid)]} {
+        # This is what dcomcnfg and oleview do - default to the CLSID
+        set opts(appid) $clsid
+    } else {
+        set opts(appid) [canonicalize_guid $opts(appid)]
+    }
+
+    if {$opts(scope) eq "user"} {
+        if {$opts(service)} {
+            twapi::badargs! "Option -service cannot be specified if -scope is \"user\""
+        }
+        set regtop HKEY_CURRENT_USER
+    } else {
+        set regtop HKEY_LOCAL_MACHINE
+    }
+
+    set progid_path "$regtop\\Software\\Classes\\$progid"
+    set clsid_path "$regtop\\Software\\Classes\\CLSID\\$clsid"
+    set appid_path "$regtop\\Software\\Classes\\AppID\\$opts(appid)"
+
+    if {$opts(service)} {
+        # TBD
+        badargs! "Option -service is not implemented"
+    } elseif {$opts(outproc)} {
+        if {[info exists opts(params)]} {
+            registry set "$clsid_path\\LocalServer32" "" "\"[file nativename [file normalize $path]]\" $opts(params)"
+        } else {
+            registry set "$clsid_path\\LocalServer32" "" "\"[file nativename [file normalize $path]]\""
+        }
+        # TBD - We do not quote path for ServerExecutable, should we ?
+        registry set "$clsid_path\\LocalServer32" "ServerExecutable" [file nativename [file normalize $path]]
+    } else {
+        # TBD - We do not quote path here either, should we ?
+        registry set "$clsid_path\\InprocServer32" "" [file nativename [file normalize $path]]
+    }
+    
+    registry set "$clsid_path\\ProgID" "" "$progid.$version"
+    registry set "$clsid_path\\VersionIndependentProgID" "" $progid
+
+    # Set the registry under the progid and progid.version
+    registry set "$progid_path\\CLSID" "" $clsid
+    registry set "$progid_path\\CurVer" "" "$progid.$version"
+    if {[info exists opts(name)]} {
+        registry set $progid_path "" $opts(name)
+    }
+
+    append progid_path ".$version"
+    registry set "$progid_path\\CLSID" "" $clsid
+    if {[info exists opts(name)]} {
+        registry set $progid_path "" $opts(name)
+    }
+    
+    registry set $clsid_path "AppID" $opts(appid)
+    registry set $appid_path;   # Always create the key even if nothing below
+    if {[info exists opts(appname)]} {
+        registry set $appid_path "" $opts(appname)
+    }
+    
+    if {$opts(service)} {
+        registry set $appid_path "LocalService" $path
+        if {[info exists opts(params)]} {
+            registry set $appid_path "ServiceParameters" $opts(params)
+        }
+    }
+
+    return
+}
+
+proc twapi::uninstall_coclass {progid args} {
+    # Note "CLSID" itself is a valid ProgID (it has a CLSID key below it)
+    # Also we want to protect against horrible errors that blow away
+    # entire branches if progid is empty, wrong value, etc.
+    # So only work with keys of the form X.X
+    if {![regexp {^[[:alpha:]][[:alnum:]]*\.[[:alpha:]][[:alnum:]]*$} $progid]} {
+        badargs! "Invalid PROGID syntax '$progid'"
+    }
+
+    # Do NOT want to delete the CLSID key by mistake. Note below checks
+    # will not protect against this since they will return a valid value 
+    # if progid is "CLSID" since that has a CLSID key below it as well.
+    if {[string equal -nocase $progid CLSID]} {
+        badargs! "Attempt to delete protected key 'CLSID'"
+    }
+
+    array set opts [twapi::parseargs args {
+        {scope.arg user {user system}}
+        keepappid
+    } -maxleftover 0]
+
+    switch -exact -- $opts(scope) {
+        user { set regtop HKEY_CURRENT_USER }
+        system { set regtop HKEY_LOCAL_MACHINE }
+        default {
+            badargs! "Invalid class registration scope '$opts(scope)'. Must be 'user' or 'system'"
+        }
+    }
+
+    if {0} {
+        # Do NOT use this. If running under elevated, it will ignore
+        # HKEY_CURRENT_USER.
+        set clsid [progid_to_clsid $progid]; # Also protects against bogus progids
+    } else {
+        set clsid [registry get "$regtop\\Software\\Classes\\$progid\\CLSID" ""]
+    }
+
+    # Should not be empty at this point but do not want to delete the 
+    # whole Classes tree in case progid or clsid are empty strings
+    # because of some bug! That would be an epic disaster so try and
+    # protect.
+    if {$clsid eq ""} {
+        badargs! "CLSID corresponding to PROGID '$progid' is empty"
+    }
+    
+    # See if we need to delete the linked current version
+    if {! [catch {
+        registry get "$regtop\\Software\\Classes\\$progid\\CurVer" ""
+    } curver]} {
+        if {[string match -nocase ${progid}.* $curver]} {
+            registry delete "$regtop\\Software\\Classes\\$curver"
+        }
+    }
+
+    # See if we need to delete the APPID
+    if {! $opts(keepappid)} {
+        if {! [catch {
+            registry get "$regtop\\Software\\Classes\\CLSID\\$clsid" "AppID"
+        } appid]} {
+            # Validate it is a real GUID
+            if {![catch {canonicalize_guid $appid}]} {
+                registry delete "$regtop\\Software\\Classes\\AppID\\$appid"
+            }
+        }
+    }
+
+    # Finally delete the keys and hope we have not trashed the system
+    registry delete "$regtop\\Software\\Classes\\CLSID\\$clsid"
+    registry delete "$regtop\\Software\\Classes\\$progid"
+
+    return
+}
+
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/console.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/console.tcl
new file mode 100644
index 00000000..3f503040
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/console.tcl
@@ -0,0 +1,736 @@
+#
+# Copyright (c) 2004-2014, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {
+}
+
+# Allocate a new console
+proc twapi::allocate_console {} {
+    AllocConsole
+}
+
+# Free a console
+proc twapi::free_console {} {
+    FreeConsole
+}
+
+# Get a console handle
+proc twapi::get_console_handle {type} {
+    switch -exact -- $type {
+        0 -
+        stdin { set fn "CONIN\$" }
+        1 -
+        stdout -
+        2 -
+        stderr { set fn "CONOUT\$" }
+        default {
+            error "Unknown console handle type '$type'"
+        }
+    }
+
+    # 0xC0000000 -> GENERIC_READ | GENERIC_WRITE
+    # 3 -> FILE_SHARE_READ | FILE_SHARE_WRITE
+    # 3 -> OPEN_EXISTING
+    return [CreateFile $fn \
+                0xC0000000 \
+                3 \
+                {{} 1} \
+                3 \
+                0 \
+                NULL]
+}
+
+proc twapi::_standard_handle_type {type} {
+    if {[string is integer -strict $type]} {
+        set type [format %d $type] ; # Convert hex etc.
+    }
+    switch -exact -- $type {
+        0 -
+        -10 -
+        stdin { set type -10 }
+        1 -
+        -11 -
+        stdout { set type -11 }
+        2 -
+        -12 -
+        stderr { set type -12 }
+        default {
+            error "Unknown console handle type '$type'"
+        }
+    }
+    return $type
+}
+
+# Get a console handle
+proc twapi::get_standard_handle {type} {
+    return [GetStdHandle [_standard_handle_type $type]]
+}
+
+# Set a console handle
+proc twapi::set_standard_handle {type handle} {
+    return [SetStdHandle [_standard_handle_type $type] $handle]
+}
+
+proc twapi::_console_output_attr_to_flags {attrs} {
+    set flags 0
+    foreach {attr bool} $attrs {
+        if {$bool} {
+            set flags [expr {$flags | [_console_output_attr $attr]}]
+        }
+    }
+    return $flags
+}
+
+proc twapi::_flags_to_console_output_attr {flags} {
+    # Check for multiple bit attributes first, in order
+    set attrs {}
+    foreach attr {
+        -fgwhite -bgwhite -fggray -bggray
+        -fgturquoise -bgturquoise -fgpurple -bgpurple -fgyellow -bgyellow
+        -fgred -bgred -fggreen -bggreen -fgblue -bgblue
+        -fgbright -bgbright
+    } {
+        if {($flags & [_console_output_attr $attr]) == [_console_output_attr $attr]} {
+            lappend attrs $attr 1
+            set flags [expr {$flags & ~ [_console_output_attr $attr]}]
+            if {$flags == 0} {
+                break
+            }
+        }
+    }
+        
+    return $attrs
+}
+
+
+# Get the current mode settings for the console
+proc twapi::_get_console_input_mode {conh} {
+    set mode [GetConsoleMode $conh]
+    return [_bitmask_to_switches $mode [_console_input_mode_syms]]
+}
+interp alias {} twapi::get_console_input_mode {} twapi::_do_console_proc twapi::_get_console_input_mode stdin
+
+# Get the current mode settings for the console
+proc twapi::_get_console_output_mode {conh} {
+    set mode [GetConsoleMode $conh]
+    return [_bitmask_to_switches $mode [_console_output_mode_syms]]
+}
+interp alias {} twapi::get_console_output_mode {} twapi::_do_console_proc twapi::_get_console_output_mode stdout
+
+# Set console input mode
+proc twapi::_set_console_input_mode {conh args} {
+    set mode [_switches_to_bitmask $args [_console_input_mode_syms]]
+    # If insertmode or quickedit mode are set, make sure to set extended bit
+    if {$mode & 0x60} {
+        setbits mode 0x80;              # ENABLE_EXTENDED_FLAGS
+    }
+
+    SetConsoleMode $conh $mode
+}
+interp alias {} twapi::set_console_input_mode {} twapi::_do_console_proc twapi::_set_console_input_mode stdin
+
+# Modify console input mode
+proc twapi::_modify_console_input_mode {conh args} {
+    set prev [GetConsoleMode $conh]
+    set mode [_switches_to_bitmask $args [_console_input_mode_syms] $prev]
+    # If insertmode or quickedit mode are set, make sure to set extended bit
+    if {$mode & 0x60} {
+        setbits mode 0x80;              # ENABLE_EXTENDED_FLAGS
+    }
+
+    SetConsoleMode $conh $mode
+    # Returns the old modes
+    return [_bitmask_to_switches $prev [_console_input_mode_syms]]
+}
+interp alias {} twapi::modify_console_input_mode {} twapi::_do_console_proc twapi::_modify_console_input_mode stdin
+
+#
+# Set console output mode
+proc twapi::_set_console_output_mode {conh args} {
+    set mode [_switches_to_bitmask $args [_console_output_mode_syms]]
+
+    SetConsoleMode $conh $mode
+
+}
+interp alias {} twapi::set_console_output_mode {} twapi::_do_console_proc twapi::_set_console_output_mode stdout
+
+# Set console output mode
+proc twapi::_modify_console_output_mode {conh args} {
+    set prev [GetConsoleMode $conh]
+    set mode [_switches_to_bitmask $args [_console_output_mode_syms] $prev]
+
+    SetConsoleMode $conh $mode
+    # Returns the old modes
+    return [_bitmask_to_switches $prev [_console_output_mode_syms]]
+}
+interp alias {} twapi::modify_console_output_mode {} twapi::_do_console_proc twapi::_modify_console_output_mode stdout
+
+
+# Create and return a handle to a screen buffer
+proc twapi::create_console_screen_buffer {args} {
+    array set opts [parseargs args {
+        {inherit.bool 0}
+        {mode.arg readwrite {read write readwrite}}
+        {secd.arg ""}
+        {share.arg readwrite {none read write readwrite}}
+    } -maxleftover 0]
+
+    switch -exact -- $opts(mode) {
+        read       { set mode [_access_rights_to_mask generic_read] }
+        write      { set mode [_access_rights_to_mask generic_write] }
+        readwrite  {
+            set mode [_access_rights_to_mask {generic_read generic_write}]
+        }
+    }
+    switch -exact -- $opts(share) {
+        none {
+            set share 0
+        }
+        read       {
+            set share 1 ;# FILE_SHARE_READ
+        }
+        write      {
+            set share 2 ;# FILE_SHARE_WRITE
+        }
+        readwrite  {
+            set share 3
+        }
+    }
+    
+    return [CreateConsoleScreenBuffer \
+                $mode \
+                $share \
+                [_make_secattr $opts(secd) $opts(inherit)] \
+                1]
+}
+
+# Retrieve information about a console screen buffer
+proc twapi::_get_console_screen_buffer_info {conh args} {
+    array set opts [parseargs args {
+        all
+        textattr
+        cursorpos
+        maxwindowsize
+        size
+        windowlocation
+        windowpos
+        windowsize
+    } -maxleftover 0]
+
+    lassign [GetConsoleScreenBufferInfo $conh] size cursorpos textattr windowlocation maxwindowsize
+
+    set result [list ]
+    foreach opt {size cursorpos maxwindowsize windowlocation} {
+        if {$opts($opt) || $opts(all)} {
+            lappend result -$opt [set $opt]
+        }
+    }
+
+    if {$opts(windowpos) || $opts(all)} {
+        lappend result -windowpos [lrange $windowlocation 0 1]
+    }
+
+    if {$opts(windowsize) || $opts(all)} {
+        lassign $windowlocation left top right bot
+        lappend result -windowsize [list [expr {$right-$left+1}] [expr {$bot-$top+1}]]
+    }
+
+    if {$opts(textattr) || $opts(all)} {
+        lappend result -textattr [_flags_to_console_output_attr $textattr]
+    }
+
+    return $result
+}
+interp alias {} twapi::get_console_screen_buffer_info {} twapi::_do_console_proc twapi::_get_console_screen_buffer_info stdout
+
+# Set the cursor position
+proc twapi::_set_console_cursor_position {conh pos} {
+    SetConsoleCursorPosition $conh $pos
+}
+interp alias {} twapi::set_console_cursor_position {} twapi::_do_console_proc twapi::_set_console_cursor_position stdout
+
+# Get the cursor position
+proc twapi::get_console_cursor_position {conh} {
+    return [lindex [get_console_screen_buffer_info $conh -cursorpos] 1]
+}
+
+# Write the specified string to the console
+proc twapi::_console_write {conh s args} {
+    # Note writes are always in raw mode, 
+    # TBD - support for  scrolling
+    # TBD - support for attributes
+
+    array set opts [parseargs args {
+        position.arg
+        {newlinemode.arg column {line column}}
+        {restoreposition.bool 0}
+    } -maxleftover 0]
+
+    # Get screen buffer info including cursor position
+    array set csbi [get_console_screen_buffer_info $conh -cursorpos -size]
+
+    # Get current console mode for later restoration
+    # If console is in processed mode, set it to raw mode
+    set oldmode [get_console_output_mode $conh]
+    set processed_index [lsearch -exact $oldmode "processed"]
+    if {$processed_index >= 0} {
+        # Console was in processed mode. Set it to raw mode
+        set newmode [lreplace $oldmode $processed_index $processed_index]
+        set_console_output_mode $conh $newmode
+    }
+    
+    trap {
+        # x,y are starting position to write
+        if {[info exists opts(position)]} {
+            lassign [_parse_integer_pair $opts(position)] x y
+        } else {
+            # No position specified, get current cursor position
+            lassign $csbi(-cursorpos) x y
+        }
+        
+        set startx [expr {$opts(newlinemode) == "column" ? $x : 0}]
+
+        # Get screen buffer limits
+        lassign  $csbi(-size)  width height
+
+        # Ensure line terminations are just \n
+        set s [string map [list \r\n \n] $s]
+
+        # Write out each line at ($x,$y)
+        # Either \r or \n is considered a newline
+        foreach line [split $s \r\n] {
+            if {$y >= $height} break
+            set_console_cursor_position $conh [list $x $y]
+            if {$x < $width} {
+                # Write the characters - do not write more than buffer width
+                set num_chars [expr {$width-$x}]
+                if {[string length $line] < $num_chars} {
+                    set num_chars [string length $line]
+                }
+                WriteConsole $conh $line $num_chars
+            }
+            
+            
+            # Calculate starting position of next line
+            incr y
+            set x $startx
+        }
+
+    } finally {
+        # Restore cursor if requested
+        if {$opts(restoreposition)} {
+            set_console_cursor_position $conh $csbi(-cursorpos)
+        }
+        # Restore output mode if changed
+        if {[info exists newmode]} {
+            set_console_output_mode $conh $oldmode
+        }
+    }
+
+    return
+}
+interp alias {} twapi::write_console {} twapi::_do_console_proc twapi::_console_write stdout
+interp alias {} twapi::console_write {} twapi::_do_console_proc twapi::_console_write stdout
+
+# Fill an area of the console with the specified attribute
+proc twapi::_fill_console {conh args} {
+    array set opts [parseargs args {
+        position.arg
+        numlines.int
+        numcols.int
+        {mode.arg column {line column}}
+        window.bool
+        fillchar.arg
+    } -ignoreunknown]
+
+    # args will now contain attribute switches if any
+    set attr [_console_output_attr_to_flags $args]
+
+    # Get screen buffer info for window and size of buffer
+    array set csbi [get_console_screen_buffer_info $conh -windowpos -windowsize -size]
+    # Height and width of the console
+    lassign $csbi(-size) conx cony
+
+    # Figure out what area we want to fill
+    # startx,starty are starting position to write
+    # sizex, sizey are the number of rows/lines
+    if {[info exists opts(window)]} {
+        if {[info exists opts(numlines)] || [info exists opts(numcols)]
+            || [info exists opts(position)]} {
+            error "Option -window cannot be used togther with options -position, -numlines or -numcols"
+        }
+        lassign  [_parse_integer_pair $csbi(-windowpos)] startx starty
+        lassign  [_parse_integer_pair $csbi(-windowsize)] sizex sizey
+    } else {
+        if {[info exists opts(position)]} {
+            lassign [_parse_integer_pair $opts(position)] startx starty
+        } else {
+            set startx 0
+            set starty 0
+        }
+        if {[info exists opts(numlines)]} {
+            set sizey $opts(numlines)
+        } else {
+            set sizey $cony
+        }
+        if {[info exists opts(numcols)]} {
+            set sizex $opts(numcols)
+        } else {
+            set sizex [expr {$conx - $startx}]
+        }
+    }
+    
+    set firstcol [expr {$opts(mode) == "column" ? $startx : 0}]
+
+    # Fill attribute at ($x,$y)
+    set x $startx
+    set y $starty
+    while {$y < $cony && $y < ($starty + $sizey)} {
+        if {$x < $conx} {
+            # Write the characters - do not write more than buffer width
+            set max [expr {$conx-$x}]
+            if {[info exists attr]} {
+                FillConsoleOutputAttribute $conh $attr [expr {$sizex > $max ? $max : $sizex}] [list $x $y]
+            }
+            if {[info exists opts(fillchar)]} {
+                FillConsoleOutputCharacter $conh $opts(fillchar) [expr {$sizex > $max ? $max : $sizex}] [list $x $y]
+            }
+        }
+        
+        # Calculate starting position of next line
+        incr y
+        set x $firstcol
+    }
+    
+    return
+}
+interp alias {} twapi::fill_console {} twapi::_do_console_proc twapi::_fill_console stdout
+
+# Clear the console
+proc twapi::_clear_console {conh args} {
+    # I support we could just call fill_console but this code was already
+    # written and is faster
+    array set opts [parseargs args {
+        {fillchar.arg " "}
+        {windowonly.bool 0}
+    } -maxleftover 0]
+
+    array set cinfo [get_console_screen_buffer_info $conh -size -windowpos -windowsize]
+    lassign  $cinfo(-size) width height
+    if {$opts(windowonly)} {
+        # Only clear portion visible in the window. We have to do this
+        # line by line since we do not want to erase text scrolled off
+        # the window either in the vertical or horizontal direction
+        lassign $cinfo(-windowpos) x y
+        lassign $cinfo(-windowsize) w h
+        for {set i 0} {$i < $h} {incr i} {
+            FillConsoleOutputCharacter \
+                $conh \
+                $opts(fillchar)  \
+                $w \
+                [list $x [expr {$y+$i}]]
+        }
+    } else {
+        FillConsoleOutputCharacter \
+            $conh \
+            $opts(fillchar)  \
+            [expr {($width*$height) }] \
+            [list 0 0]
+    }
+    return
+}
+interp alias {} twapi::clear_console {} twapi::_do_console_proc twapi::_clear_console stdout
+#
+# Flush console input
+proc twapi::_flush_console_input {conh} {
+    FlushConsoleInputBuffer $conh
+}
+interp alias {} twapi::flush_console_input {} twapi::_do_console_proc twapi::_flush_console_input stdin
+
+# Return number of pending console input events
+proc twapi::_get_console_pending_input_count {conh} {
+    return [GetNumberOfConsoleInputEvents $conh]
+}
+interp alias {} twapi::get_console_pending_input_count {} twapi::_do_console_proc twapi::_get_console_pending_input_count stdin
+
+# Generate a console control event
+proc twapi::generate_console_control_event {event {procgrp 0}} {
+    switch -exact -- $event {
+        ctrl-c {set event 0}
+        ctrl-break {set event 1}
+        default {error "Invalid event definition '$event'"}
+    }
+    GenerateConsoleCtrlEvent $event $procgrp
+}
+
+# Get number of mouse buttons
+proc twapi::num_console_mouse_buttons {} {
+    return [GetNumberOfConsoleMouseButtons]
+}
+
+# Get console title text
+proc twapi::get_console_title {} {
+    return [GetConsoleTitle]
+}
+
+# Set console title text
+proc twapi::set_console_title {title} {
+    return [SetConsoleTitle $title]
+}
+
+# Get the handle to the console window
+proc twapi::get_console_window {} {
+    return [GetConsoleWindow]
+}
+
+# Get the largest console window size
+proc twapi::_get_console_window_maxsize {conh} {
+    return [GetLargestConsoleWindowSize $conh]
+}
+interp alias {} twapi::get_console_window_maxsize {} twapi::_do_console_proc twapi::_get_console_window_maxsize stdout
+
+proc twapi::_set_console_active_screen_buffer {conh} {
+    SetConsoleActiveScreenBuffer $conh
+}
+interp alias {} twapi::set_console_active_screen_buffer {} twapi::_do_console_proc twapi::_set_console_active_screen_buffer stdout
+
+# Set the size of the console screen buffer
+proc twapi::_set_console_screen_buffer_size {conh size} {
+    SetConsoleScreenBufferSize $conh [_parse_integer_pair $size]
+}
+interp alias {} twapi::set_console_screen_buffer_size {} twapi::_do_console_proc twapi::_set_console_screen_buffer_size stdout
+
+# Set the default text attribute
+proc twapi::_set_console_default_attr {conh args} {
+    SetConsoleTextAttribute $conh [_console_output_attr_to_flags $args]
+}
+interp alias {} twapi::set_console_default_attr {} twapi::_do_console_proc twapi::_set_console_default_attr stdout
+
+# Set the console window position
+proc twapi::_set_console_window_location {conh rect args} {
+    array set opts [parseargs args {
+        {absolute.bool true}
+    } -maxleftover 0]
+
+    SetConsoleWindowInfo $conh $opts(absolute) $rect
+}
+interp alias {} twapi::set_console_window_location {} twapi::_do_console_proc twapi::_set_console_window_location stdout
+
+proc twapi::get_console_window_location {conh} {
+    return [lindex [get_console_screen_buffer_info $conh -windowlocation] 1]
+}
+
+# Get the console code page
+proc twapi::get_console_output_codepage {} {
+    return [GetConsoleOutputCP]
+}
+
+# Set the console code page
+proc twapi::set_console_output_codepage {cp} {
+    SetConsoleOutputCP $cp
+}
+
+# Get the console input code page
+proc twapi::get_console_input_codepage {} {
+    return [GetConsoleCP]
+}
+
+# Set the console input code page
+proc twapi::set_console_input_codepage {cp} {
+    SetConsoleCP $cp
+}
+
+# Read a line of input
+proc twapi::_console_read {conh args} {
+    if {[llength $args]} {
+        set oldmode [modify_console_input_mode $conh {*}$args]
+    }
+    trap {
+        return [ReadConsole $conh 1024]
+    } finally {
+        if {[info exists oldmode]} {
+            set_console_input_mode $conh {*}$oldmode
+        }
+    }
+}
+interp alias {} twapi::console_read {} twapi::_do_console_proc twapi::_console_read stdin
+
+proc twapi::_map_console_controlkeys {control} {
+    return [_make_symbolic_bitmask $control {
+        capslock 0x80
+        enhanced 0x100
+        leftalt 0x2
+        leftctrl 0x8
+        numlock 0x20
+        rightalt 0x1
+        rightctrl 4
+        scrolllock 0x40
+        shift 0x10
+    } 0]
+}
+
+proc twapi::_console_read_input_records {conh args} {
+    parseargs args {
+        {count.int 1}
+        peek
+    } -setvars -maxleftover 0
+    set recs {}
+    if {$peek} {
+        set input [PeekConsoleInput $conh $count]
+    } else {
+        set input [ReadConsoleInput $conh $count]
+    }
+    foreach rec $input {
+        switch [format %d [lindex $rec 0]] {
+            1 {
+                lassign [lindex $rec 1] keydown repeat keycode scancode char controlstate
+                lappend recs \
+                    [list key [list \
+                                   keystate [expr {$keydown ? "down" : "up"}] \
+                                   repeat $repeat keycode $keycode \
+                                   scancode $scancode char $char \
+                                   controls [_map_console_controlkeys $controlstate]]]
+            }
+            2 {
+                lassign [lindex $rec 1] position buttonstate controlstate flags
+                set buttons {}
+                if {[expr {$buttonstate & 0x1}]} {lappend buttons left}
+                if {[expr {$buttonstate & 0x2}]} {lappend buttons right}
+                if {[expr {$buttonstate & 0x4}]} {lappend buttons left2}
+                if {[expr {$buttonstate & 0x8}]} {lappend buttons left3}
+                if {[expr {$buttonstate & 0x10}]} {lappend buttons left4}
+                if {$flags & 0x8} {
+                    set horizontalwheel [expr {$buttonstate >> 16}]
+                } else {
+                    set horizontalwheel 0
+                }
+                if {$flags & 0x4} {
+                    set verticalwheel [expr {$buttonstate >> 16}]
+                } else {
+                    set verticalwheel 0
+                }
+                lappend recs \
+                    [list mouse [list \
+                                     position $position \
+                                     buttons $buttons \
+                                     controls [_map_console_controlkeys $controlstate] \
+                                     doubleclick [expr {$flags & 0x2}] \
+                                     horizontalwheel $horizontalwheel \
+                                     moved [expr {$flags & 0x1}] \
+                                     verticalwheel $verticalwheel]]
+            }
+            default {
+                lappend recs [list \
+                                  [dict* {4 buffersize 8 menu 16 focus} [lindex $rec 0]] \
+                                  [lindex $rec 1]]
+            }
+        }
+    }
+    return $recs
+}
+interp alias {} twapi::console_read_input_records {} twapi::_do_console_proc twapi::_console_read_input_records stdin
+
+# Set up a console handler
+proc twapi::_console_ctrl_handler {ctrl} {
+    variable _console_control_script
+    if {[info exists _console_control_script]} {
+        return [uplevel #0 [linsert $_console_control_script end $ctrl]]
+    }
+    return 0;                   # Not handled
+}
+proc twapi::set_console_control_handler {script} {
+    variable _console_control_script
+    if {[string length $script]} {
+        if {![info exists _console_control_script]} {
+            Twapi_ConsoleEventNotifier 1
+        }
+        set _console_control_script $script
+    } else {
+        if {[info exists _console_control_script]} {
+            Twapi_ConsoleEventNotifier 0
+            unset _console_control_script
+        }
+    }
+}
+
+# 
+# Utilities
+#
+
+# Helper to call a proc after doing a stdin/stdout/stderr -> handle
+# mapping. The handle is closed after calling the proc. The first
+# arg in $args must be the console handle if $args is not an empty list
+proc twapi::_do_console_proc {proc default args} {
+    if {[llength $args] == 0} {
+        set args [list $default]
+    }
+    set conh [lindex $args 0]
+    switch -exact -- [string tolower $conh] {
+        stdin  -
+        stdout -
+        stderr {
+            set real_handle [get_console_handle $conh]
+            trap {
+                lset args 0 $real_handle
+                return [uplevel 1 [list $proc] $args]
+            } finally {
+                CloseHandle $real_handle
+            }
+        }
+    }
+    
+    return [uplevel 1 [list $proc] $args]
+}
+
+proc twapi::_console_input_mode_syms {} {
+    return {
+        -processedinput 0x0001
+        -lineinput      0x0002
+        -echoinput      0x0004
+        -windowinput    0x0008
+        -mouseinput     0x0010
+        -insertmode     0x0020
+        -quickeditmode  0x0040
+        -extendedmode   0x0080
+        -autoposition   0x0100
+    }
+}
+
+proc twapi::_console_output_mode_syms {} {
+    return { -processedoutput 1 -wrapoutput 2 }
+}
+
+twapi::proc* twapi::_console_output_attr {sym} {
+    variable _console_output_attr_syms
+    array set _console_output_attr_syms {
+        -fgblue 1
+        -fggreen 2
+        -fgturquoise 3
+        -fgred 4
+        -fgpurple 5
+        -fgyellow 6
+        -fggray 7
+        -fgbright 8
+        -fgwhite 15
+        -bgblue 16
+        -bggreen 32
+        -bgturquoise 48
+        -bgred 64
+        -bgpurple 80
+        -bgyellow 96
+        -bggray 112
+        -bgbright 128
+        -bgwhite 240
+    }
+} {
+    variable _console_output_attr_syms
+    if {[info exists _console_output_attr_syms($sym)]} {
+        return $_console_output_attr_syms($sym)
+    }
+
+    badargs! "Invalid console output attribute '$sym'" 3
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/crypto.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/crypto.tcl
new file mode 100644
index 00000000..b7cc9c32
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/crypto.tcl
@@ -0,0 +1,3457 @@
+#
+# Copyright (c) 2007-2021, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {
+    variable wintrust_guids
+    # Array key names match those in softpub.h in SDK
+    array set wintrust_guids {
+        action_generic_verify_v2    00AAC56B-CD44-11d0-8CC2-00C04FC295EE
+        action_trust_provider_test  573E31F8-DDBA-11d0-8CCB-00C04FC295EE
+        action_generic_cert_verify  189A3842-3041-11d1-85E1-00C04FC295EE
+        action_generic_chain_verify fc451c16-ac75-11d1-b4b8-00c04fb66ea0
+        httpsprov_action            573E31F8-AABA-11d0-8CCB-00C04FC295EE
+        driver_action_verify        F750E6C3-38EE-11d1-85E5-00C04FC295EE
+    }
+
+    # Dictionaries used by capi_encrypt|decrypt_bytes to store partial blocks of data
+    # First level key is Crypto key handle
+    # Second level keys are Blocklen (block size in bytes) and Data (data bytes left over)
+    variable _capi_encrypt_partials
+    variable _capi_decrypt_partials
+    set _capi_encrypt_partials {}
+    set _capi_decrypt_partials {}
+}
+
+### Hash functions
+
+proc twapi::capi_hash_create {hcrypt algid {hkey NULL}} {
+    return [CryptCreateHash $hcrypt [capi_algid $algid] $hkey]
+}
+
+proc twapi::capi_hash_string {hhash s {enc utf-8}} {
+    return [capi_hash_bytes $hhash [encoding convertto $enc $s] 0]
+}
+
+proc twapi::capi_hash_value {hhash} {
+    return [CryptGetHashParam $hhash 2]; # HP_HASHVAL
+}
+
+proc twapi::capi_hash_sign {hhash keyspec args} {
+    # -pad not documented because new Windows version do not support X.931
+    # and there are some openssl incompatibilities I cannot figure out
+    parseargs args {
+        {nohashoid.bool 0 1}
+        {pad.arg pkcs1 {pkcs1 x931}}
+    } -maxleftover 0 -setvars
+    set flags [expr {[dict get {pkcs1 0 x931 4} $pad] | $nohashoid}]
+    return [CryptSignHash $hhash [_crypt_keyspec $keyspec] "" $flags]
+}
+
+proc twapi::capi_hash_verify {hhash sig hkey args} {
+    # -pad not documented because new Windows version do not support X.931
+    # and there are some openssl incompatibilities I cannot figure out
+    parseargs args {
+        {nohashoid.bool 0 1}
+        {pad.arg pkcs1 {pkcs1 x931}}
+    } -maxleftover 0 -setvars
+    set flags [expr {[dict get {pkcs1 0 x931 4} $pad] | $nohashoid}]
+    return [CryptVerifySignature $hhash $sig $hkey "" $flags]
+}
+
+proc twapi::_do_hash {csptype alg s {enc ""}} {
+    if {$enc ne ""} {
+        set s [encoding convertto $enc $s]
+    }
+    set hcrypt [crypt_acquire -csptype $csptype]
+    trap {
+        set hhash [capi_hash_create $hcrypt $alg]
+        capi_hash_bytes $hhash $s
+        return [capi_hash_value $hhash]
+    } finally {
+        if {[info exists hhash]} {
+            capi_hash_free $hhash
+        }
+        crypt_free $hcrypt
+    }
+}
+
+interp alias {} twapi::md5 {} twapi::_do_hash prov_rsa_full md5
+interp alias {} twapi::sha1 {} twapi::_do_hash prov_rsa_full sha1
+interp alias {} twapi::sha256 {} twapi::_do_hash prov_rsa_aes sha_256
+interp alias {} twapi::sha384 {} twapi::_do_hash prov_rsa_aes sha_384
+interp alias {} twapi::sha512 {} twapi::_do_hash prov_rsa_aes sha_512
+
+proc twapi::hmac {data key {prf sha1} {charset {}}} {
+    if {$charset ne ""} {
+        set data [encoding convertto $charset $data]
+    }
+
+    # Choose prov_rsa_aes because older CSP's do not support sha256
+    set hcrypt [crypt_acquire -csptype prov_rsa_aes]
+    try {
+        # The algorithm specified for importing the key actually is not
+        # executed at all. It's only used for importing the key.
+        # However it has to be something that will accept any key size.
+        # On Windows 8 at least, RC4 seems to require at least 5 byte keys.
+        # RC2 on the other hand, if the -ipsechmac flag is specifie
+        # will accept any number. TBD - the pbkdf2 source code implies
+        # on Win8.1 single byte keys will not be accepted by rc2 and
+        # keys need to be padded with 0's. Need to check that.
+        set hkey [crypt_import_key $hcrypt [capi_keyblob_concealed rc2 $key] -ipsechmac 1]
+        set hhash [capi_hash_create $hcrypt hmac $hkey]
+        # 5 -> HP_HMAC_INFO
+        CryptSetHashParam $hhash 5 [list [capi_algid $prf] "" ""]
+        capi_hash_bytes $hhash $data
+        return [capi_hash_value $hhash]
+    } finally {
+        if {[info exists hhash]} {
+            capi_hash_free $hhash
+        }
+        if {[info exists hkey]} {
+            capi_key_free $hkey
+        }
+        crypt_free $hcrypt
+    }
+}
+
+                  
+### Data protection
+
+proc twapi::protect_data {data args} {
+
+    # Not used because doesn't seem to have any effect 
+    # {promptonunprotect.bool 0 0x1}
+    parseargs args {
+        {description.arg ""}
+        {localmachine.bool 0 0x4}
+        {noui.bool 0 0x1}
+        {audit.bool 0 0x10}
+        {hwnd.arg NULL}
+        prompt.arg
+    } -setvars -maxleftover 0
+
+    if {[info exists prompt]} {
+        # 2 -> PROMPTONPROTECT
+        set prompt [list 2 $hwnd $prompt]
+    } else {
+        set prompt {}
+    }
+
+    return [CryptProtectData $data $description "" "" $prompt [expr {$localmachine | $noui | $audit}]]
+}
+
+proc twapi::unprotect_data {data args} {
+    # Do not seem to have any effect
+    # {promptonunprotect.bool 0 0x1}
+    # {promptonprotect.bool 0 0x2}
+    parseargs args {
+        {withdescription.bool 0}
+        {noui.bool 0 0x1}
+        {hwnd.arg NULL}
+        prompt.arg
+    } -setvars -maxleftover 0
+
+    if {[info exists prompt]} {
+        # 2 -> PROMPTONPROTECT
+        set prompt [list 2 $hwnd $prompt]
+    } else {
+        set prompt {}
+    }
+
+    set data [CryptUnprotectData $data "" "" $prompt $noui]
+    if {$withdescription} {
+        return $data
+    } else {
+        return [lindex $data 0]
+    }
+}
+
+
+
+################################################################
+# Certificate Stores
+
+# Close a certificate store
+proc twapi::cert_store_release {hstore} {
+    CertCloseStore $hstore 0
+    return
+}
+
+proc twapi::cert_temporary_store {args} {
+    # TBD - add support for PKCS12_NO_PERSIST_KEY post-XP. If not
+    # specified and on XP document a means of getting rid of the key
+    # containers. See https://msdn.microsoft.com/en-us/library/ms867088.aspx#pk_topic6
+    # Also CryptAcquireCertificatePrivateKey and GetCryptProvFromCert
+    # might be useful in this regard
+    parseargs args {
+        {encoding.arg {} {der pem {}}}
+        serialized.arg
+        pkcs7.arg
+        {password.arg ""}
+        pfx.arg
+        pkcs12.arg
+        {exportableprivatekeys.bool 0 1}
+        {userprotected.bool 0 2}
+        keysettype.arg
+    } -setvars -maxleftover 0
+    
+    set nformats 0
+    foreach format {serialized pkcs7 pfx pkcs12} {
+        if {[info exists $format]} {
+            set data [set $format]
+            incr nformats
+        }
+    }
+    if {$nformats > 1} {
+        badargs! "At most one of -pfx, -pkcs12, -pkcs7 or -serialized may be specified."
+    }
+    if {$nformats == 0} {
+        # 2 -> CERT_STORE_PROV_MEMORY 
+        return [CertOpenStore 2 0 NULL 0 ""]
+    }
+    
+    # 0x10001 -> PKCS_7_ASN_ENCODING|X509_ASN_ENCODING
+
+    if {[info exists serialized]} {
+        # 6 -> CERT_STORE_PROV_SERIALIZED
+        return [CertOpenStore 6 0x10001 NULL 0 $data]
+    }
+
+    if {[info exists pkcs7]} {
+        # 5 -> CERT_STORE_PROV_PKCS7
+        return [CertOpenStore 5 0x10001 NULL 0 [_pem_decode $data $encoding]]
+    }
+
+    # PFX/PKCS12
+    if {[string length $password] == 0} {
+        set password [conceal ""]
+    }
+    set flags 0
+    if {[info exists keysettype]} {
+        set flags [dict! {user 0x1000 machine 0x20} $keysettype]
+    }
+
+    set flags [tcl::mathop::| $flags $exportableprivatekeys $userprotected]
+    return [PFXImportCertStore $data $password $flags]
+}
+
+proc twapi::cert_file_store_open {path args} {
+    set flags [_parse_store_open_opts $args]
+
+    if {! ($flags & 0x00008000)} {
+        # If not readonly, set commitenable
+        set flags [expr {$flags | 0x00010000}]
+    }
+
+    # 0x10001 -> PKCS_7_ASN_ENCODING|X509_ASN_ENCODING
+    # 8 -> CERT_STORE_PROV_FILENAME_W
+    return [CertOpenStore 8 0x10001 NULL $flags [file nativename [file normalize $path]]]
+}
+
+proc twapi::cert_serialized_store_open {data args} {
+    set flags [_parse_store_open_opts $args]
+
+    # 0x10001 -> PKCS_7_ASN_ENCODING|X509_ASN_ENCODING
+    # 6 -> CERT_STORE_PROV_SERIALIZED
+    return [CertOpenStore 6 0x10001 NULL $flags $data]
+}
+
+proc twapi::cert_physical_store_open {name location args} {
+    variable _system_stores
+
+    set flags [_parse_store_open_opts $args]
+    incr flags [_system_store_id $location]
+    # 14 -> CERT_STORE_PROV_PHYSICAL_W
+    return [CertOpenStore 14 0 NULL $flags $name]
+}
+
+proc twapi::cert_physical_store_delete {name location} {
+    set flags 0x10;             # CERT_STORE_DELETE_FLAG
+    incr flags [_system_store_id $location]
+ 
+    # 14 -> CERT_STORE_PROV_PHYSICAL_W
+    return [CertOpenStore 14 0 NULL $flags $name]
+}
+
+# TBD - document and figure out what format to return data in
+proc twapi::cert_physical_stores {system_store_name location} {
+    return [CertEnumPhysicalStore $system_store_name [_system_store_id $location]]
+}
+
+proc twapi::cert_system_store_open {name args} {
+    variable _system_stores
+
+    if {[llength $args] == 0} {
+        return [CertOpenSystemStore $name]
+    }
+
+    set flags [_parse_store_open_opts [lassign $args location]]
+    incr flags [_system_store_id $location]
+    return [CertOpenStore 10 0 NULL $flags $name]
+}
+
+proc twapi::cert_system_store_delete {name location} {
+    set flags 0x10;             # CERT_STORE_DELETE_FLAG
+    incr flags [_system_store_id $location]
+    return [CertOpenStore 10 0 NULL $flags $name]
+}
+
+proc twapi::cert_system_store_locations {} {
+    set l {}
+    foreach e [CertEnumSystemStoreLocation 0] {
+        lappend l [lindex $e 0]
+    }
+    return $l
+}
+
+proc twapi::cert_system_stores {location} {
+    set l {}
+    foreach e [CertEnumSystemStore [_system_store_id $location] ""] {
+        lappend l [lindex $e 0]
+    }
+    return $l
+}
+
+proc twapi::cert_store_iterate {hstore varname script {type any} {term {}}} {
+    upvar 1 $varname cert
+    set cert NULL
+    while {1} {
+        set cert [cert_store_find_certificate $hstore $type $term $cert]
+        if {$cert eq ""} break
+        switch [catch {uplevel 1 $script} result options] {
+            0 -
+            4 {
+                # Normal execution or continue. Keep $cert to get next cert
+                # from store
+            }
+            3 {
+                # break - get out of loop so free the last cert
+                cert_release $cert
+                set cert ""
+                return
+            }
+            1 -
+            default {
+                cert_release $cert
+                set cert ""
+                return -options $options $result
+            }
+        }
+    }
+    return
+}
+
+proc twapi::cert_store_find_certificate {hstore {type any} {term {}} {hcert NULL}} {
+
+    # TBD subject_cert 11<<16
+    # TBD key_spec 9<<16
+
+    set term_types {
+        any 0
+        existing 13<<16
+        key_identifier 15<<16
+        md5_hash 4<<16
+        subject_public_key_md5_hash 18<<16
+        sha1_hash 1<<16
+        signature_hash 14<<16
+        issuer_name (2<<16)|4
+        subject_name  (2<<16)|7
+        issuer_substring (8<<16)|4
+        subject_substring (8<<16)|7
+        property 5<<16
+        public_key 6<<16
+    }
+
+    if {$type eq "property"} {
+        set term [_cert_prop_id $term]
+    }
+    set type [expr [dict! $term_types $type 1]]
+
+    # 0x10001 -> PKCS_7_ASN_ENCODING|X509_ASN_ENCODING
+    return [CertFindCertificateInStore $hstore 0x10001 0 $type $term $hcert]
+}
+
+proc twapi::cert_store_enum_contents {hstore {hcert NULL}} {
+    return [CertEnumCertificatesInStore $hstore $hcert]
+}
+
+proc twapi::cert_store_add_certificate {hstore hcert args} {
+    array set opts [_cert_add_parseargs args]
+    return [CertAddCertificateContextToStore $hstore $hcert $opts(disposition)]
+}
+
+proc twapi::cert_store_add_encoded_certificate {hstore enccert args} {
+    parseargs args {
+        {encoding.arg {} {der pem {}}}
+    } -ignoreunknown -setvars
+    array set opts [_cert_add_parseargs args]
+    return [CertAddEncodedCertificateToStore $hstore 0x10001 [_pem_decode $enccert $encoding] $opts(disposition)]
+}
+
+proc twapi::cert_store_export_pem {hstore} {
+    set pem {}
+    cert_store_iterate $hstore c {append pem [cert_export $c]\n}
+    return $pem
+}
+
+proc twapi::cert_store_export_pfx {hstore password args} {
+    parseargs args {
+        {exportprivatekeys.bool 0 0x4}
+        {failonmissingkey.bool 0 0x1}
+        {failonunexportablekey.bool 0 0x2}
+    } -maxleftover 0 -setvars
+
+    if {[string length $password] == 0} {
+        set password [conceal ""]
+    }
+
+    # NOTE: the -fail* flags only take effect iff the certificate in the store
+    # claims to have a private key but does not actually have one. It will
+    # not fail if the cert does not actually claim to have a private key
+
+    set flags [tcl::mathop::| $exportprivatekeys $failonunexportablekey $failonmissingkey]
+
+    return [PFXExportCertStoreEx $hstore $password {} $flags]
+}
+interp alias {} twapi::cert_store_export_pkcs12 {} twapi::cert_store_export_pfx
+
+proc twapi::cert_store_commit {hstore args} {
+    array set opts [parseargs args {
+        {force.bool 0}
+    } -maxleftover 0]
+    
+    return [Twapi_CertStoreCommit $hstore $opts(force)]
+}
+
+proc twapi::cert_store_serialize {hstore} {
+    return [Twapi_CertStoreSerialize $hstore 1]
+}
+
+proc twapi::cert_store_export_pkcs7 {hstore args} {
+    parseargs args {
+        {encoding.arg pem {der pem}}
+    } -setvars -maxleftover 0
+    
+    return [_as_pem_or_der [Twapi_CertStoreSerialize $hstore 2] "PKCS7" $encoding]
+}
+
+################################################################
+# Certificates
+
+interp alias {} twapi::cert_subject_name {} twapi::_cert_get_name subject
+interp alias {} twapi::cert_issuer_name {} twapi::_cert_get_name issuer
+proc twapi::_cert_get_name {field hcert args} {
+
+    switch $field {
+        subject { set field 0 }
+        issuer  { set field 1 }
+        default { badargs! "Invalid name type '$field': must be \"subject\" or \"issuer\"."
+        }
+    }
+    array set opts [parseargs args {
+        {name.arg oid_common_name}
+        {separator.arg comma {comma semicolon newline}}
+        {reverse.bool 0 0x02000000}
+        {noquote.bool 0 0x10000000}
+        {noplus.bool  0 0x20000000}
+        {format.arg x500 {x500 oid simple}}
+    } -maxleftover 0]
+
+    set arg ""
+    switch $opts(name) {
+        email { set what 1 }
+        simpledisplay { set what 4 }
+        friendlydisplay {set what 5 }
+        dns { set what 6 }
+        url { set what 7 }
+        upn { set what 8 }
+        rdn {
+            set what 2
+            switch $opts(format) {
+                simple {set arg 1}
+                oid {set arg 2}
+                x500 -
+                default {set arg 3}
+            }
+            set arg [expr {$arg | $opts(reverse) | $opts(noquote) | $opts(noplus)}]
+            switch $opts(separator) {
+                semicolon    { set arg [expr {$arg | 0x40000000}] }
+                newline { set arg [expr {$arg | 0x08000000}] }
+            }
+        }
+        default {
+            set what 3;         # Assume OID
+            set arg [oid $opts(name)]
+        }
+    }
+
+    return [CertGetNameString $hcert $what $field $arg]
+
+}
+
+proc twapi::cert_blob_to_name {blob args} {
+    array set opts [parseargs args {
+        {format.arg x500 {x500 oid simple}}
+        {separator.arg comma {comma semi newline}}
+        {reverse.bool 0 0x02000000}
+        {noquote.bool 0 0x10000000}
+        {noplus.bool  0 0x20000000}
+    } -maxleftover 0]
+
+    switch $opts(format) {
+        x500   {set arg 3}
+        simple {set arg 1}
+        oid    {set arg 2}
+    }
+
+    set arg [expr {$arg | $opts(reverse) | $opts(noquote) | $opts(noplus)}]
+    switch $opts(separator) {
+        semi    { set arg [expr {$arg | 0x40000000}] }
+        newline { set arg [expr {$arg | 0x08000000}] }
+    }
+
+    return [CertNameToStr $blob $arg]
+}
+
+proc twapi::cert_name_to_blob {name args} {
+    array set opts [parseargs args {
+        {format.arg x500 {x500 oid simple}}
+        {separator.arg any {any comma semicolon newline}}
+        {reverse.bool 0 0x02000000}
+        {noquote.bool 0 0x10000000}
+        {noplus.bool  0 0x20000000}
+    } -maxleftover 0]
+
+    switch $opts(format) {
+        x500   {set arg 3}
+        simple {set arg 1}
+        oid    {set arg 2}
+    }
+
+    set arg [expr {$arg | $opts(reverse) | $opts(noquote) | $opts(noplus)}]
+    switch $opts(separator) {
+        comma   { set arg [expr {$arg | 0x04000000}] }
+        semicolon    { set arg [expr {$arg | 0x40000000}] }
+        newline { set arg [expr {$arg | 0x08000000}] }
+    }
+
+    return [CertStrToName $name $arg]
+}
+
+proc twapi::cert_enum_properties {hcert args} {
+    parseargs args {
+        names
+    } -setvars -maxleftover 0
+    
+    set id 0
+    set ids {}
+    while {[set id [CertEnumCertificateContextProperties $hcert $id]]} {
+        if {$names} {
+            lappend ids [_cert_prop_name $id]
+        } else {
+            lappend ids $id
+        }
+    }
+    return $ids
+}
+
+proc twapi::cert_property {hcert prop} {
+    # TBD - need to cook some properties - enhkey_usage
+
+    if {[string is integer -strict $prop]} {
+        return [CertGetCertificateContextProperty $hcert $prop]
+    } else {
+        return [CertGetCertificateContextProperty $hcert [_cert_prop_id $prop] 1]
+    }
+}
+
+proc twapi::cert_property_set {hcert prop propval} {
+    switch $prop {
+        pvk_file -
+        friendly_name -
+        description {
+            set val [encoding convertto unicode "${propval}\0"]
+        }
+        enhkey_usage {
+            set val [::twapi::CryptEncodeObjectEx 2.5.29.37 [_get_enhkey_usage_oids $propval]]
+        }
+        default {
+            badargs! "Invalid or unsupported property name \"$prop\". Must be one of [join $unicode_props {, }]."
+        }
+    }
+
+    CertSetCertificateContextProperty $hcert [_cert_prop_id $prop] 0 $val
+}
+
+proc twapi::cert_property_delete {hcert prop} {
+    CertSetCertificateContextProperty $hcert [_cert_prop_id $prop] 0
+}
+
+# TBD - Also add cert_set_key_prov_from_crypt_context
+proc twapi::cert_set_key_prov {hcert keycontainer keyspec args} {
+    parseargs args {
+        csp.arg
+        {csptype.arg prov_rsa_full}
+        {keysettype.arg user {user machine}}
+        {silent.bool 0 0x40}
+    } -maxleftover 0 -nulldefault -setvars
+
+    set flags $silent
+    if {$keysettype eq "machine"} {
+        incr flags 0x20;        # CRYPT_KEYSET_MACHINE
+    }
+
+    # 2 -> CERT_KEY_PROV_INFO_PROP_ID
+    # TBD - the provider param is hardcoded as {}. Should that be an option ?
+    CertSetCertificateContextProperty $hcert 2 0 \
+        [list $keycontainer $csp [_csp_type_name_to_id $csptype] $flags {} [_crypt_keyspec $keyspec]]
+    return
+}
+
+proc twapi::cert_export {hcert args} {
+    parseargs args {
+        {encoding.arg pem {der pem}}
+    } -maxleftover 0 -setvars
+
+    return [_as_pem_or_der [lindex [Twapi_CertGetEncoded $hcert] 1] CERTIFICATE $encoding]
+}
+
+proc twapi::cert_import {enccert args} {
+    parseargs args {
+        {encoding.arg {} {der pem {}}}
+    } -maxleftover 0 -setvars
+    return [CertCreateCertificateContext 0x10001 [_pem_decode $enccert $encoding]]
+}
+
+proc twapi::cert_enhkey_usage {hcert {loc both}} {
+    return [_cert_decode_enhkey [CertGetEnhancedKeyUsage $hcert [dict! {property 4 extension 2 both 0} $loc 1]]]
+}
+
+proc twapi::cert_key_usage {hcert} {
+    # 0x10001 -> PKCS_7_ASN_ENCODING|X509_ASN_ENCODING
+    return [_cert_decode_keyusage [Twapi_CertGetIntendedKeyUsage 0x10001 $hcert]]
+}
+
+proc twapi::cert_thumbprint {hcert} {
+    binary scan [cert_property $hcert sha1_hash] H* hash
+    return $hash
+}
+
+proc twapi::cert_info {hcert} {
+    # TBD - add option to cook extensions using _cert_decode_extension
+    # instead of returning the raw form
+    set info [twine {
+        -version -serialnumber -signaturealgorithm -issuer
+        -start -end -subject -publickey -issuerid -subjectid -extensions} \
+                [Twapi_CertGetInfo $hcert]]
+    dict set info -start \
+        [clock format \
+             [large_system_time_to_secs_since_1970 [dict get $info -start]] \
+             -timezone :UTC \
+             -format "%Y-%m-%d %H:%M:%S"]
+    dict set info -end \
+        [clock format \
+             [large_system_time_to_secs_since_1970 [dict get $info -end]] \
+             -timezone :UTC \
+             -format "%Y-%m-%d %H:%M:%S"]
+
+    return $info
+}
+
+proc twapi::cert_extension {hcert oid} {
+    set ext [CertFindExtension $hcert [oid $oid]]
+    if {[llength $ext] == 0} {
+        return $ext
+    }
+    lassign $ext oid critical val
+    return [list $critical [_cert_decode_extension $oid $val]]
+}
+
+proc twapi::cert_create_self_signed {subject keycontainer keyspec args} {
+    set args [_cert_create_parse_options $args opts]
+
+    array set opts [parseargs args {
+        {keysettype.arg user {machine user}}
+        {silent.bool 0 0x40}
+        {csp.arg {}}
+        {csptype.arg {prov_rsa_full}}
+        {signaturealgorithm.arg {}}
+    } -maxleftover 0 -ignoreunknown]
+
+    set name_blob [cert_name_to_blob $subject]
+
+    set kiflags $opts(silent)
+    if {$opts(keysettype) eq "machine"} {
+        incr kiflags 0x20;  # CRYPT_MACHINE_KEYSET
+    }
+    set keyinfo [list \
+                     $keycontainer \
+                     $opts(csp) \
+                     [_csp_type_name_to_id $opts(csptype)] \
+                     $kiflags \
+                     {} \
+                     [_crypt_keyspec $keyspec]]
+    
+    set flags 0;                # Always 0 for now
+    return [CertCreateSelfSignCertificate NULL $name_blob $flags $keyinfo \
+                [_make_algorithm_identifier $opts(signaturealgorithm)] \
+                $opts(start) $opts(end) $opts(extensions)]
+}
+
+proc twapi::cert_create_self_signed_from_crypt_context {subject hprov args} {
+    set args [_cert_create_parse_options $args opts]
+
+    array set opts [parseargs args {
+        {signaturealgorithm.arg {}}
+    } -maxleftover 0]
+
+    set name_blob [cert_name_to_blob $subject]
+
+    set flags 0;                # Always 0 for now
+    return [CertCreateSelfSignCertificate $hprov $name_blob $flags {} \
+                [_make_algorithm_identifier $opts(signaturealgorithm)] \
+                $opts(start) $opts(end) $opts(extensions)]
+}
+
+proc twapi::cert_create {subject pubkey cissuer args} {
+    set args [_cert_create_parse_options $args opts]
+
+    parseargs args {
+        {encoding.arg pem {der pem}}
+    } -maxleftover 0 -setvars
+
+    # TBD - check that issuer is a CA - but then what about self-signed?
+
+    set issuer_info [cert_info $cissuer]
+    set issuer_blob [cert_name_to_blob [dict get $issuer_info -subject] -format x500]
+    set sigalgo [dict get $issuer_info -signaturealgorithm]
+
+    # If issuer cert has altnames, use they as issuer altnames for new cert
+    set issuer_altnames [lindex [cert_extension $cissuer 2.5.29.17] 1]
+    if {[llength $issuer_altnames]} {
+        lappend opts(extensions) [_make_altnames_ext $issuer_altnames 0 1]
+    }
+
+    # The subject key id in issuer's cert will become the
+    # authority key id in the new cert
+    # TBD - if fail, get the CERT_KEY_IDENTIFIER_PROP_ID
+    # 2.5.29.14 -> oid_subject_key_identifier
+    set issuer_subject_key_id [cert_extension $cissuer 2.5.29.14]
+    if {[string length [lindex $issuer_subject_key_id 1]] } {
+        # 2.5.29.35 -> oid_authority_key_identifier
+        lappend opts(extensions) [list 2.5.29.35 0 [list [lindex $issuer_subject_key_id 1] {} {}]]
+    }
+
+    # Generate a subject key identifier for this cert based on a hash
+    # of the public key
+    set subject_key_id [Twapi_HashPublicKeyInfo $pubkey]
+    lappend opts(extensions) [list 2.5.29.14 0 $subject_key_id]
+
+    set start [timelist_to_large_system_time $opts(start)]
+    set end [timelist_to_large_system_time $opts(end)]
+
+    # 2 -> CERT_V3
+    # issuer_id and subject_id for the certificate are left empty
+    # as recommended by gutman's X.509 paper
+    set cert_info [list 2 $opts(serialnumber) $sigalgo $issuer_blob \
+                       $start $end \
+                       [cert_name_to_blob $subject] \
+                       $pubkey {} {} \
+                       $opts(extensions)]
+
+    # We need to get the crypt provider for the issuer cert since
+    # that is what will sign the new cert
+    lassign [cert_property $cissuer key_prov_info] issuer_container issuer_provname issuer_provtype issuer_flags dontcare issuer_keyspec
+    set hissuerprov [crypt_acquire $issuer_container -csp $issuer_provname -csptype $issuer_provtype -keysettype [expr {$issuer_flags & 0x20 ? "machine" : "user"}]]
+    trap {
+        # 0x10001 -> X509_ASN_ENCODING, 2 -> X509_CERT_TO_BE_SIGNED
+        return [_as_pem_or_der [CryptSignAndEncodeCertificate $hissuerprov \
+                             $issuer_keyspec \
+                             0x10001 2 $cert_info $sigalgo] \
+                    CERTIFICATE $encoding]
+    } finally {
+        # TBD - test to make sure ok to close this if caller had
+        # it open
+        crypt_free $hissuerprov
+    }
+}
+
+# TBD - test
+proc twapi::cert_chain_build {hcert args} {
+    # -timestamp not documented because not clear exactly how it behaves
+    # -disablepass1*, -returnlower* not documented because not clear how
+    # useful.
+    # TBD - what about CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT 
+    parseargs args {
+        {cacheendcert.bool 0 0x1}
+        {disableauthrootautoupdate.bool 0 0x100}
+        {disablepass1qualityfiltering.bool 0 0x40}
+        {engine.arg user {user machine}}
+        {hstore.arg NULL}
+        {returnlowerqualitycontexts.bool 0 0x80}
+        {revocationcheck.arg all {none all leaf excluderoot}}
+        {revocationcheckcacheonly.bool 0 0x80000000}
+        {timestamp.arg ""}
+        {urlretrievalcacheonly.bool 0 0x4}
+        usageall.arg
+        usageany.arg 
+    } -setvars -maxleftover 0
+
+    set flags [dict! {none 0 all 0x20000000 leaf 0x10000000 excluderoot 0x40000000} $revocationcheck]
+    set flags [tcl::mathop::| $flags $cacheendcert $revocationcheckcacheonly $urlretrievalcacheonly $disablepass1qualityfiltering $returnlowerqualitycontexts $disableauthrootautoupdate]
+
+    set usage_op 1;             # USAGE_MATCH_TYPE_OR
+    if {[info exists usageall]} {
+        if {[info exists usageany]} {
+            error "Only one of -usageall and -usageany may be specified"
+        }
+        set usage_op 0;         # USAGE_MATCH_TYPE_AND
+        set usage [_get_enhkey_usage_oids $usageall]
+    } elseif {[info exists usageany]} {
+        set usage [_get_enhkey_usage_oids $usageany]
+    } else {
+        set usage {}
+    }
+
+    return [CertGetCertificateChain \
+                [dict* {user NULL machine {1 HCERTCHAINENGINE}} $engine] \
+                $hcert $timestamp $hstore \
+                [list [list $usage_op $usage]] $flags]
+}
+
+proc twapi::cert_ancestors {hcert args} {
+    # Note - does not care if certs are valid or not
+    set certs {}
+    set hchain [cert_chain_build $hcert {*}$args]
+    trap {
+        set simple_chain [twapi::Twapi_CertChainSimpleChain $hchain 0]
+    } finally {
+        cert_chain_release $hchain
+    }
+    foreach elem [dict get $simple_chain chain] {
+        lappend certs [dict get $elem hcert]
+    }
+    return $certs
+}
+
+proc twapi::cert_chain_simple_chain {hchain index} {
+    set simple_chain [twapi::Twapi_CertChainSimpleChain $hchain $index]
+    set errors [_map_trust_error [dict get $simple_chain trust_errors]]
+    dict set simple_chain trust_errors $errors
+    if {[llength $errors]} {
+        dict set simple_chain status fail
+    } else {
+        dict set simple_chain status ok
+    }
+    dict set simple_chain trust_info [_map_trust_info [dict get $simple_chain trust_info]]
+    set chain_elements {}
+    foreach elem [dict get $simple_chain chain] {
+        set errors [_map_trust_error [dict get $elem trust_errors]]
+        dict set elem trust_errors $errors
+        if {[llength $errors]} {
+            dict set elem status fail
+        } else {
+            dict set elem status ok
+        }
+        dict set elem trust_info [_map_trust_info [dict get $elem trust_info]]
+        if {[dict exists $elem revocation]} {
+            set revocation [dict get $elem revocation]
+            if {$revocation == 0} {
+                dict unset elem revocation
+            } else {
+                dict set elem revocation [_map_cert_verify_error $revocation]
+            }
+        }
+        if {[dict exists $elem application_usage]} {
+            dict set elem application_usage [_cert_decode_enhkey [dict get $elem application_usage]]
+        }
+        lappend chain_elements $elem
+    }
+    dict set simple_chain chain $chain_elements
+    return $simple_chain
+}
+
+# TBD - test
+proc twapi::cert_chain_trust_info {hchain} {
+    return [_map_trust_info [Twapi_CertChainInfo $hchain]]
+}
+
+proc twapi::_map_trust_info {info} {
+    return [_make_symbolic_bitmask $info {
+        hasexactmatchissuer               0x00000001
+        haskeymatchissuer                 0x00000002
+        hasnamematchissuer                0x00000004
+        isselfsigned                       0x00000008
+        haspreferredissuer                 0x00000100
+        hasissuancechainpolicy            0x00000200
+        hasvalidnameconstraints           0x00000400
+        ispeertrusted                      0x00000800
+        hascrlvalidityextended            0x00001000
+        isfromexclusivetruststore        0x00002000
+        iscomplexchain                     0x00010000
+    }]
+}
+
+# TBD - test
+proc twapi::cert_chain_trust_errors {hchain} {
+    return [_map_trust_error [Twapi_CertChainError $hchain]]
+}
+
+proc twapi::_map_trust_error {errbits} {
+    return [_make_symbolic_bitmask $errbits {
+        time 1
+        revoked 4
+        signature 8
+        wrongusage 0x10
+        untrustedroot 0x20
+        revocationunknown 0x40
+        trustcycle 0x80
+        extension 0x100
+        policy 0x200
+        basiconstraints 0x400
+        nameconstraints 0x800
+        unsupportednameconstraint 0x1000
+        undefinednameconstraint 0x2000
+        unpermittednameconstraint 0x4000
+        excludednameconstraint 0x8000
+        revocationoffline 0x01000000
+        noissuancechainpolicy 0x02000000
+        distrust 0x04000000
+        criticalextension 0x08000000
+        weaksignature 0x00100000
+        partialchain 0x00010000
+        ctltime 0x00020000
+        ctlsignature 0x00040000
+        ctlusage 0x00080000
+    }]
+}
+
+proc twapi::cert_verify {hcert policy args} {
+    # TBD - should we explicitly look for nulls in the subject name?
+    # The Chrome source at
+    # https://src.chromium.org/svn/branches/455/src/net/base/x509_certificate_win.cc
+    # does this though it also uses the same calls as below. See
+    # CertSubjectCommonNameHasNull in that code.
+    set policy_id [dict! {
+        authenticode 2   authenticodets 3   base 1   basicconstraints 5
+        extendedvalidation 8   microsoftroot 7   ntauth 6
+        ssl 4   tls 4
+    } $policy]
+
+    # Construct policy specific options
+    set optdefs {
+        {ignoreerrors.arg {}}
+        policyparams.arg
+        {trustedroots.arg}
+    }
+    switch -exact -- $policy_id {
+        4 {
+            # SSL/TLS
+            lappend optdefs server.arg
+        }
+        5 {
+            # basicconstraints
+            lappend optdefs isa.arg
+        }
+        6 {
+            # ntauth also accepts -isa as it includes basic constraints checks
+            lappend optdefs isa.arg
+        }
+        7 {
+            # microsoftroot
+            lappend optdefs enabletestroot.bool
+        }
+    }
+
+    array set opts [parseargs args $optdefs -ignoreunknown -setvars]
+
+    if {![dict exists $args -usageall] && ![dict exists $args -usageany]} {
+        switch -exact -- $policy {
+            authenticodets -
+            authenticode {
+                dict lappend args -usageany code_signing
+            }
+            ssl -
+            tls {
+                if {[info exists server]} {
+                    dict lappend args -usageany server_auth
+                } else {
+                    dict lappend args -usageany client_auth
+                }
+            }
+        }
+    }
+
+    set verify_flags 0
+    if {[info exists isa]} {
+        switch -exact -- $isa {
+            ca { set verify_flags [expr {$verify_flags | 0x80000000}] }
+            endentity { set verify_flags [expr {$verify_flags | 0x40000000}] }
+            default {
+                error "Invalid value \"$isa\" specified for option -isa."
+            }
+        }
+    }
+    if {[info exists enabletestroot]} {
+        set verify_flags [expr {$verify_flags | 0x00010000}]
+    }
+
+    if {$policy eq "basicconstraints"} {
+        # TBD - peertrust 0x1000, see below
+        set ignore_options {}
+    } else {
+        # Any other policy
+        # TBD - the meaning of these is not clear. Are they ignore
+        # error flags or options?
+        #    peertrust        0x1000
+        #    trusttestroot    0x4000
+        #    allowtestroot    0x8000
+        set ignore_options {
+            time             0x07
+            basicconstraints 0x08
+            unknownca        0x10
+            usage            0x20
+            name             0x40
+            policy           0x80
+            revocation       0xf00
+            criticalextensions 0x2000
+        }
+    }
+
+    foreach ignore $ignoreerrors {
+        if {![dict exists $ignore_options $ignore]} {
+            error "Value $ignore for option -ignoreerrors cannot be used with policy $policy."
+        }
+        set verify_flags [expr {$verify_flags | [dict get $ignore_options $ignore]}]
+    }
+
+    if {![info exists policyparams]} {
+        switch -exact -- $policy_id {
+            4 {
+                # ssl/tls
+                if {[info exists server]} {
+                    set policyparams [cert_policy_params_tls -ignoreerrors $ignoreerrors -server $server]
+                } else {
+                    set policyparams [cert_policy_params_tls -ignoreerrors $ignoreerrors]
+                }
+            }
+            default {
+                set policyparams {}
+            }
+        }
+    }
+
+    if {[info exists ignoreerrors] && "revocation" in $ignoreerrors} {
+        lappend args -revocationcheck none
+    }
+    set chainh [cert_chain_build $hcert {*}$args]
+
+    trap {
+        # Actually verification is a bit tricky because the caller might
+        # have asked for certain errors to be ignored. 
+        # Note that CertVerifyChainPolicy below does NOT check for revocation 
+        # of certificates in the certificate chain as per Microsoft docs.
+        # We therefore check for revocation errors here and abort if present.
+        set chain_errors [cert_chain_trust_errors $chainh]
+        if {[llength $chain_errors]} {
+            if {"revoked" in $chain_errors} {
+                return revoked
+            }
+            if {"revocationoffline" in $chain_errors} {
+                return revocationoffline
+            }
+            if {"revocationunknown" in $chain_errors} {
+                return revocationunknown
+            }
+
+            if {0} {
+                # For other kind of errors, caller might have indicated
+                # some types are to be ignored. In that case we will proceed
+                # to use CertVerifyTrustPolicy since that will allow
+                # control of which errors are to be ignored. As a
+                # special case, if caller has specified additional trusted
+                # roots, we will proceed to call CertVerifyTrustPolicy
+                # even when caller is not ignoring errors but only if
+                # there are no errors indicated.
+                if {[llength $chain_errors] > 1 ||
+                    [lindex $chain_errors 0] ne "untrustedroot" ||
+                    ![info exists trustedroots]} {
+                    return $chain_errors
+                }
+            }
+        }
+
+        set status [Twapi_CertVerifyChainPolicy $policy_id $chainh [list $verify_flags $policyparams]]
+
+        # If caller had provided additional trusted roots that are not
+        # in the Windows trusted store, and the error is that the root is
+        # untrusted, see if the root cert is one of the passed trusted ones
+        # We will only deal when there is a single possible chain else
+        # the recheck becomes very complicated as we are not sure if
+        # the recheck will employ the same chain or not.
+        if {$status == 0x800B0109 &&
+            [info exists trustedroots] && [llength $trustedroots] &&
+            [cert_chain_simple_chain_count $chainh] == 1} {
+            set simple_chain [cert_chain_simple_chain $chainh 0]
+            # Double check no errors listed for this chain
+            set trust_errors [dict get $simple_chain trust_errors]
+            if {[llength $trust_errors] == 1 &&
+                [lindex $trust_errors 0] eq "untrustedroot"} {
+                set certs_in_chain [dict get $simple_chain chain]
+                set root_cert [dict get [lindex $certs_in_chain end] hcert]
+                set thumbprint [cert_thumbprint $root_cert]
+                # Match against each trusted root
+                set trusted 0
+                foreach trusted_cert $trustedroots {
+                    if {$thumbprint eq [cert_thumbprint $trusted_cert]} {
+                        set trusted 1
+                        break
+                    }
+                }
+                if {$trusted} {
+                    # Yes, the root is trusted. It is not enough to
+                    # say validation is ok because even if root
+                    # is trusted, other errors might show up
+                    # once untrusted roots are ignored. So we have
+                    # to call the verification again.
+                    # 0x10 -> CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG
+                    set verify_flags [expr {$verify_flags | 0x10}]
+                    if {0} {
+                        TBD - need to redo the policy params?
+                        # 0x100 -> SECURITY_FLAG_IGNORE_UNKNOWN_CA
+                        set checks [expr {$checks | 0x100}]
+                    }
+                    # Retry the call ignoring root errors
+                    set status [Twapi_CertVerifyChainPolicy $policy_id $chainh [list $verify_flags $policyparams]]
+                }
+            }
+        }
+
+        return [_map_cert_verify_error $status]
+    } finally {
+        if {[info exists simple_chain]} {
+            foreach cert [dict get $simple_chain chain] {
+                cert_release [dict get $cert hcert]
+            }
+        }
+        cert_chain_release $chainh
+    }
+
+    return $status
+}
+
+proc twapi::_map_cert_verify_error {err} {
+    if {![string is integer -strict $err]} {
+        return $err
+    }
+    return [dict*  {
+        0x00000000 ok
+        0x80096004 signature
+        0x80092010 revoked
+        0x800b0109 untrustedroot
+        0x800b010d untrustedtestroot
+        0x800b010a partialchain
+        0x800b0110 wrongusage
+        0x800b0101 time
+        0x800b0114 name
+        0x800b0113 policy
+        0x80096019 basicconstraints
+        0x800b0105 criticalextension
+        0x800b0102 validityperiodnesting
+        0x80092011 norevocationdll
+        0x80092012 norevocationcheck
+        0x80092013 revocationoffline
+        0x800b010f cnmatch
+        0x800b0106 purpose
+        0x800b010e revocationunknown
+        0x800b0103 carole
+    } [format 0x%8.8x $err]]
+}
+
+# TBD - document
+proc twapi::cert_policy_params_tls {args} {
+
+    parseargs args {
+        ignoreerrors.arg
+        server.arg
+    } -maxleftover 0 -setvars -ignoreunknown
+
+    if {[info exists server]} {
+        set role 2;         # AUTHTYPE_SERVER
+    } else {
+        set role 1;         # AUTHTYPE_CLIENT
+        set server ""
+    }
+
+    set ignore_options {
+        time             0x2000
+        unknownca        0x100
+        usage            0x200
+        name             0x1000
+        revocation       0x80
+    }
+    set checks 0
+    foreach ignore $ignoreerrors {
+        # Note we use dict*, not dict! so we can skip any ignore tokens
+        # that we don't know
+        set checks [expr {$checks | [dict* $ignore_options $ignore 0]}]
+    }
+    return [list $role $checks $server]
+}
+
+proc twapi::cert_tls_verify {hcert args} {
+    return [cert_verify $hcert tls {*}$args]
+}
+
+# TBD - provide a -peersubject option
+proc twapi::cert_fetch {addr {port 443}} {
+    set so [tls_socket $addr $port]
+    trap {
+        set sspi_ctx [chan configure $so -context]
+        return [sspi_remote_cert $sspi_ctx]
+    } finally {
+        close $so
+    }
+}
+
+proc twapi::cert_locate_private_key {hcert args} {
+    parseargs args {
+        {keysettype.arg any {any user machine}}
+        {silent 0 0x40}
+    } -maxleftover 0 -setvars
+
+    return [CryptFindCertificateKeyProvInfo $hcert \
+                [expr {$silent | [dict get {any 0 user 1 machine 2} $keysettype]}]]
+}
+
+proc twapi::cert_request_parse {req args} {
+    parseargs args {
+        {encoding.arg {} {der pem {}}}
+    } -setvars -maxleftover 0
+
+    # 3 -> CRYPT_STRING_BASE64REQUESTHEADER 
+    # 4 -> X509_CERT_REQUEST_TO_BE_SIGNED 
+    lassign [::twapi::CryptDecodeObjectEx 4 [_pem_decode $req $encoding 3]] ver subject pubkey attrs
+    lappend reqdict version $ver pubkey $pubkey attributes $attrs
+    lappend reqdict subject [cert_blob_to_name $subject]
+    foreach attr $attrs {
+        lassign $attr oid values
+        if {$oid eq "1.2.840.113549.1.9.14"} {
+            # ...1.9.14 -> oid_rsa_certextensions
+            set extensions {}
+            foreach ext [lindex $values 0] {
+                lassign $ext oid critical value
+                set value [_cert_decode_extension $oid $value]
+                lappend extensions $oid [list $value $critical]
+                # Also add "option keyed" values
+                switch -exact -- $oid {
+                    2.5.29.15 {
+                        lappend extensions -keyusage [list $value $critical]
+                    }
+                    2.5.29.17 {
+                        lappend extensions -altnames [list $value $critical]
+                    }
+                    2.5.29.19 {
+                        lappend extensions -basicconstraints [list $value $critical]
+                    }
+                    2.5.29.37 {
+                        lappend extensions -enhkeyusage [list $value $critical]
+                    }
+                }
+            }
+            lappend reqdict extensions $extensions
+        }
+    }
+
+    return $reqdict
+}
+
+
+proc twapi::cert_request_create {subject hprov keyspec args} {
+    set args [_cert_create_parse_options $args opts]
+    # TBD - barf if any elements other than extensions is set
+    # TBD - document signaturealgorithmid
+    parseargs args {
+        {signaturealgorithmid.arg oid_rsa_sha1rsa}
+        {encoding.arg pem {der pem}}
+    } -setvars -maxleftover 0
+    
+    set sigoid [oid $signaturealgorithmid]
+    if {$sigoid ni [list [oid oid_rsa_sha1rsa] [oid oid_rsa_md5rsa] [oid oid_x957_sha1dsa]]} {
+        badargs! "Invalid signature algorithm '$sigalg'"
+    }
+    set keyspec [twapi::_crypt_keyspec $keyspec]
+    # 0x10001 -> PKCS_7_ASN_ENCODING|X509_ASN_ENCODING
+    # Pass oid_rsa_rsa as that seems to be what OPENSSL understands in
+    # a CSR
+    set pubkeyinfo [crypt_public_key $hprov $keyspec oid_rsa_rsa]
+    set attrs [list 0 [cert_name_to_blob $subject] $pubkeyinfo]
+    if {[llength $opts(extensions)]} {
+        lappend attrs [list [list [oid oid_rsa_certextensions] [list $opts(extensions)]]]
+    } else {
+        lappend attrs {}
+    }
+    return [_as_pem_or_der [CryptSignAndEncodeCertificate $hprov $keyspec 0x10001 4 $attrs $sigoid] "NEW CERTIFICATE REQUEST" $encoding]
+}
+
+
+################################################################
+# Cryptographic context commands
+
+proc twapi::crypt_acquire {args} {
+    # Backward compatibility - keycontainer can be specified as first arg
+    if {[llength $args] &  1} {
+        set args [lassign $args keycontainer]
+    } else {
+        set keycontainer ""
+    }
+    
+    parseargs args {
+        {csp.arg {}}
+        {csptype.arg prov_rsa_full}
+        keycontainer.arg
+        {keysettype.arg user {user machine}}
+        {create.bool 0 0x8}
+        {silent.bool 0 0x40}
+        verifycontext.bool
+    } -maxleftover 0 -setvars
+
+    # The defaults for verifycontext are a little confusing. For a named
+    # key container, at least the MS CSP's require -verifycontext to be 0.
+    # For the frequent case where private keys are not required, MS recommends
+    # using the null key container with -verifycontext 1. So accordingly,
+    # if the keycontainer is empty (or unspecified), then it 
+    # defaults to 1, else defaults to 0.
+    if {![info exists verifycontext]} {
+        if {$keycontainer eq ""} {
+            set verifycontext 1
+        } else {
+            set verifycontext 0
+        }
+    }
+
+    if {$verifycontext} {
+        set verifycontext 0xf0000000
+    }
+
+    set flags [expr {$silent | $verifycontext}]
+    if {$keysettype eq "machine"} {
+        incr flags 0x20;        # CRYPT_KEYSET_MACHINE
+    }
+
+    trap {
+        return [CryptAcquireContext $keycontainer $csp [_csp_type_name_to_id $csptype] $flags]
+    } onerror {TWAPI_WIN32 0x80090016} {
+        # NTE_BAD_KEYSET - does not exist. Try to create it.
+        if {$create} {
+            set flags [expr {$flags | $create}]
+            return [CryptAcquireContext $keycontainer $csp [_csp_type_name_to_id $csptype] $flags]            
+        } else {
+            rethrow
+        }
+    }
+}
+
+proc twapi::crypt_free {hcrypt} {
+    twapi::CryptReleaseContext $hcrypt
+}
+
+proc twapi::crypt_key_container_delete {keycontainer args} {
+    parseargs args {
+        csp.arg
+        {csptype.arg prov_rsa_full}
+        {keysettype.arg user {machine user}}
+        force
+    } -maxleftover 0 -nulldefault -setvars
+
+    if {$keycontainer eq "" && ! $force} {
+        error "Default container cannot be deleted unless the -force option is specified"
+    }
+
+    set flags 0x10;             # CRYPT_DELETEKEYSET
+    if {$keysettype eq "machine"} {
+        incr flags 0x20;        # CRYPT_MACHINE_KEYSET
+    }
+
+    return [CryptAcquireContext $keycontainer $csp [_csp_type_name_to_id $csptype] $flags]
+}
+
+proc twapi::crypt_generate_key {hprov algid args} {
+
+    array set opts [parseargs args {
+        {archivable.bool 0 0x4000}
+        {salt.bool 0 4}
+        {exportable.bool 0 1}
+        {pregen.bool 0x40}
+        {userprotected.bool 0 2}
+        {nosalt40.bool 0 0x10}
+        {size.int 0}
+    } -maxleftover 0]
+
+    set algid [capi_algid $algid]
+
+    if {$opts(size) < 0 || $opts(size) > 65535} {
+        badargs! "Bad key size value '$size':  must be positive integer less than 65536"
+    }
+
+    return [CryptGenKey $hprov $algid [expr {($opts(size) << 16) | $opts(archivable) | $opts(salt) | $opts(exportable) | $opts(pregen) | $opts(userprotected) | $opts(nosalt40)}]]
+}
+
+proc twapi::crypt_keypair {hprov keyspec} {
+    return [CryptGetUserKey $hprov [dict! {keyexchange 1 signature 2} $keyspec]]
+}
+
+proc twapi::crypt_public_key_import {hprov key args} {
+    parseargs args {
+        {algid.arg 0}
+        {encoding.arg {} {native pem der {}}}
+    } -setvars
+
+    if {$encoding eq "native"} {
+        set pub $key
+    } elseif {$encoding eq "der"} {
+        set pub [CryptDecodeObjectEx 8 $key]
+    } elseif {$encoding eq "pem" ||
+              ($encoding eq "" && [string match -nocase "-----BEGIN*" $key])} {
+        set pub [CryptDecodeObjectEx 8 [CryptStringToBinary $key 0]]
+    } else {
+        # encoding is unspecified and is either der or native
+        if {[catch {set pub [CryptDecodeObjectEx 8 $key]}]} {
+            # Not DER, assume native
+            set pub $key
+        }
+    }
+
+    return [CryptImportPublicKeyInfoEx $hprov 0x10001 $pub [capi_algid $algid]]
+}
+
+proc twapi::crypt_public_key_export {hprov keyspec args} {
+    parseargs args {
+        algoid.arg
+        {encoding.arg pem {pem der native}}
+    } -setvars -nulldefault
+
+    if {$algoid ne ""} {
+        set algoid [oid $algoid]
+    }
+    set pubkey [CryptExportPublicKeyInfoEx $hprov \
+                    [_crypt_keyspec $keyspec] \
+                    0x10001 \
+                    $algoid \
+                    0]
+    if {$encoding eq "native"} {
+        return $pubkey
+    }
+    # Generate SubjectPublicKeyInfo
+    set der [CryptEncodeObjectEx 8 $pubkey]
+    if {$encoding eq "der"} {
+        return $der
+    }
+    # 0x80000001 -> No CR (only LF) and headers
+    return "-----BEGIN PUBLIC KEY-----\n[CryptBinaryToString $der 0x80000001]-----END PUBLIC KEY-----\n"
+}
+
+# For back compat - undocumented
+proc twapi::crypt_public_key {hcrypt algid oid} {
+    return [crypt_public_key_export $hcrypt $algid -encoding native -algoid $oid]
+}
+
+proc twapi::crypt_get_security_descriptor {hprov} {
+    return [CryptGetProvParam $hprov 8 7]
+}
+
+proc twapi::crypt_set_security_descriptor {hprov secd} {
+    CryptSetProvParam $hprov 8 $secd
+}
+
+proc twapi::crypt_key_container_name {hprov} {
+    return [CryptGetProvParam $hprov 6 0]
+}
+
+proc twapi::crypt_key_container_unique_name {hprov} {
+    return [CryptGetProvParam $hprov 36 0]
+}
+
+proc twapi::crypt_csp {hprov} {
+    return [CryptGetProvParam $hprov 4 0]
+}
+
+proc twapi::csps {} {
+    set i 0
+    set result {}
+    while {[llength [set csp [::twapi::CryptEnumProviders $i]]]} {
+        lappend result [lreplace $csp 0 0 [_csp_type_id_to_name [lindex $csp 0]]]
+        incr i
+    }
+    return $result
+}
+interp alias {} twapi::crypt_csps {} twapi::csps
+
+proc twapi::crypt_csp_type {hprov} {
+    return [_csp_type_id_to_name [CryptGetProvParam $hprov 16 0]]
+}
+
+proc twapi::csp_types {} {
+    set i 0
+    set result {}
+    while {[llength [set csptype [::twapi::CryptEnumProviderTypes $i]]]} {
+        lappend result [lreplace $csptype 0 0 [_csp_type_id_to_name [lindex $csptype 0]]]
+        incr i
+    }
+    return $result
+}
+interp alias {} twapi::crypt_csptypes {} twapi::csp_types
+
+proc twapi::crypt_key_container_names {hcrypt} {
+    return [CryptGetProvParam $hcrypt 2 0]
+}
+
+proc twapi::crypt_session_key_size {hcrypt} {
+    return [CryptGetProvParam $hcrypt 20 0]
+}
+
+proc twapi::crypt_keyx_keysize_increment {hcrypt} {
+    return [CryptGetProvParam $hcrypt 35 0]
+}
+
+proc twapi::crypt_sig_keysize_increment {hcrypt} {
+    return [CryptGetProvParam $hcrypt 34 0]
+}
+
+# TBD - Doc and test
+proc twapi::crypt_admin_pin {hcrypt} {
+    return [CryptGetProvParam $hcrypt 31 0]
+}
+
+# TBD - Doc and test
+proc twapi::crypt_keyx_pin {hcrypt} {
+    return [CryptGetProvParam $hcrypt 32 0]
+}
+
+# TBD - Doc and test
+proc twapi::crypt_sig_pin {hcrypt} {
+    return [CryptGetProvParam $hcrypt 33 0]
+}
+
+proc twapi::crypt_csp_version {hcrypt} {
+    set ver [CryptGetProvParam $hcrypt 5 0]
+    return [format %d.%d [expr {($ver & 0xff00)>>8}] [expr {$ver & 0xff}]]
+}
+
+proc twapi::crypt_keyset_type {hcrypt} {
+    return [expr {[CryptGetProvParam $hcrypt 27 0] & 0x20 ? "machine" : "user"}]
+}
+
+proc twapi::crypt_key_specifiers {hcrypt} {
+    set keyspec [CryptGetProvParam $hcrypt 39 0]
+    set keyspecs {}
+    if {$keyspec & 1} {
+        lappend keyspecs keyexchange
+    }
+    if {$keyspec & 2} {
+        lappend keyspecs signature
+    }
+    return $keyspecs
+}
+
+proc twapi::crypt_symmetric_key_size {hcrypt} {
+    return [CryptGetProvParam $hcrypt 19 0]
+}
+
+proc twapi::capi_key_export {hkey blob_type args} {
+    parseargs args {
+        {wrapper.arg NULL}
+        {v3.bool 0 0x80}
+        {oeap.bool 0 0x40}
+        {destroy.bool 0 0x04}
+    } -setvars -maxleftover 0
+
+    return [CryptExportKey $hkey $wrapper [_capi_keyblob_type_id $blob_type] [expr {$v3|$oeap}]]
+}
+interp alias {} twapi::crypt_export_key {} twapi::capi_key_export
+
+
+proc twapi::crypt_import_key {hcrypt keyblob args} {
+    parseargs args {
+        {wrapper.arg NULL}
+        {exportable.bool 1 0x01}
+        {oaep.bool 0 0x40}
+        {userprotected.bool 0 0x02}
+        {ipsechmac.bool 0 0x100}
+    } -setvars -maxleftover 0
+    return [CryptImportKey $hcrypt $keyblob $wrapper \
+                [expr {$exportable|$oaep|$userprotected|$ipsechmac}]]
+}
+interp alias {} twapi::capi_key_import {} twapi::crypt_import_key
+
+proc twapi::crypt_derive_key {hcrypt algid passphrase args} {
+    parseargs args {
+        {size.int 0}
+        {exportable.bool 1 0x01}
+        {prf.arg sha1}
+        {method.arg pbkdf2}
+        {iterations.int 100000}
+        {salt.arg ""}
+    } -maxleftover 0 -setvars
+
+    if {$method eq "pbkdf2"} {
+        set algnum [capi_algid $algid]
+        if {$size == 0} {
+            # Need to figure out the default key size for the algorithm
+            # The loop below does not work for des/3des/3des_112 because
+            # it will get the actual key size whereas CryptImportKey
+            # wants key size with pad/parity bits. So hardcode these
+            if {$algnum == 0x6601} {
+                set size 64;    #
+            } elseif {$algnum == 0x6603} {
+                set size 192;   # 3des
+            } elseif {$algnum == 0x6609} {
+                set size 128;   # 3des_112
+            } else {
+                foreach alg [crypt_algorithms $hcrypt] {
+                    if {[dict get $alg algid] == $algnum} {
+                        set size [dict get $alg defkeylen]
+                        break
+                    }
+                }
+            }
+            if {$size == 0} {
+                error "Could not figure out default key size for algorithm $algid. Please use the -size option."
+            }
+        }
+        set pbkdf2 [PBKDF2 $passphrase $size [capi_algid $prf] $salt $iterations]
+        set keyblob [list 0 2 0 $algnum $pbkdf2]
+        return [crypt_import_key $hcrypt $keyblob -exportable $exportable]
+    } else {
+        if {$size < 0 || $size > 65535} {
+            # Key size of 0 is default. Else it must be within 1-65535
+            badargs! "Option -size value \"$size\" is not between 0 and 65535."
+        }
+        set hhash [capi_hash_create $hcrypt [capi_algid $method]]
+        twapi::trap {
+            capi_hash_password $hhash $passphrase
+            return [CryptDeriveKey $hcrypt [capi_algid $algid] $hhash \
+                        [expr {($size << 16) | $exportable}]]
+        } finally {
+            capi_hash_free $hhash
+        }
+    }
+}
+
+proc twapi::pbkdf2 {pass nbits alg_id salt niters} {
+    return [PBKDF2 $pass $nbits [capi_algid $alg_id] $salt $niters]
+}
+                    
+
+proc twapi::capi_encrypt_bytes {bytes hkey args} {
+    variable _capi_encrypt_partials
+    parseargs args {
+        {hhash.arg NULL}
+        {final.bool 1}
+        {pad.arg oaep {oaep pkcs1}}
+    } -setvars -maxleftover 0
+        
+    if {[dict exists $_capi_encrypt_partials $hkey Data]} {
+        append plaintext \
+            [dict get $_capi_encrypt_partials $hkey Data] \
+            $bytes
+    } else {
+        set plaintext $bytes
+    }
+
+    if {$final} {
+        dict unset _capi_encrypt_partials $hkey
+        return [CryptEncrypt $hkey $hhash $final [dict! {pkcs1 0 oaep 0x40} $pad] $plaintext]
+    }
+
+    # If not the final segment, we have to split it up into the block size multiple.
+    if {[dict exists $_capi_encrypt_partials $hkey Blocklen]} {
+        set blocklen [dict get $_capi_encrypt_partials $hkey Blocklen]
+    } else {
+        set blocklen [expr {[capi_key_blocklen $hkey] / 8}]; # Bits -> bytes
+    }
+    
+    # len is largest multiple of block size less than data length
+    set len [expr {([string length $plaintext] / $blocklen) * $blocklen}]
+    set enc [CryptEncrypt $hkey $hhash $final [dict! {pkcs1 0 oaep 0x40} $pad] [string range $plaintext 0 $len-1]]
+    # Note following will not happen if CryptEncrypt throws an error. As desired
+    set remain [string range $plaintext $len end]
+    if {[string length $remain]} {
+        # Remember additional data 
+        dict set _capi_encrypt_partials $hkey Data $remain
+        dict set _capi_encrypt_partials $hkey Blocklen $blocklen
+    } else {
+        dict unset _capi_encrypt_partials $hkey
+    }
+    
+    return $enc
+}
+
+proc twapi::capi_encrypt_string {s hkey args} {
+    # Explicitly parse args, not just pass on because this command
+    # does not support -final for symmetry with capi_decrypt_string
+    parseargs args {
+        {hhash.arg NULL}
+        {pad.arg oaep {oaep pkcs1}}
+    } -setvars -maxleftover 0
+    return [capi_encrypt_bytes [encoding convertto utf-8 $s] $hkey -hhash $hhash -pad $pad]
+}
+
+proc twapi::capi_decrypt_bytes {bytes hkey args} {
+    variable _capi_decrypt_partials
+    parseargs args {
+        {pad.arg oaep {oaep pkcs1 nopadcheck}}
+        {final.bool 1}
+        {hhash.arg NULL}
+    } -setvars -maxleftover 0
+
+    if {[dict exists $_capi_decrypt_partials $hkey Data]} {
+        append enc \
+            [dict get $_capi_decrypt_partials $hkey Data] \
+            $bytes
+    } else {
+        set enc $bytes
+    }
+
+    if {$final} {
+        dict unset _capi_decrypt_partials $hkey
+        return [CryptDecrypt $hkey $hhash $final [dict! {pkcs1 0 oaep 0x40 nopadcheck 0x20} $pad] $enc]
+    }
+
+    # If not the final segment, we have to split it up into the block size multiple.
+    if {[dict exists $_capi_decrypt_partials $hkey Blocklen]} {
+        set blocklen [dict get $_capi_decrypt_partials $hkey Blocklen]
+    } else {
+        set blocklen [expr {[capi_key_blocklen $hkey] / 8}]; # Bits -> bytes
+    }
+
+    # len is largest multiple of block size less than data length
+    set len [expr {([string length $enc] / $blocklen) * $blocklen}]
+    set plaintext [CryptDecrypt $hkey $hhash $final [dict! {pkcs1 0 oaep 0x40} $pad] [string range $enc 0 $len-1]]
+    # Note following will not happen if CryptDecrypt throws an error. As desired
+    set remain [string range $enc $len end]
+    if {[string length $remain]} {
+        # Remember additional data 
+        dict set _capi_decrypt_partials $hkey Data $remain
+        dict set _capi_decrypt_partials $hkey Blocklen $blocklen
+    } else {
+        dict unset _capi_decrypt_partials $hkey
+    }
+
+    return $plaintext
+}
+
+proc twapi::capi_decrypt_string {s hkey args} {
+    # Explicitly parse args, not just pass on because this command
+    # does not support -final for symmetry with capi_decrypt_string
+    parseargs args {
+        {hhash.arg NULL}
+        {pad.arg oaep {oaep pkcs1}}
+    } -setvars -maxleftover 0
+    return [encoding convertfrom utf-8 [capi_decrypt_bytes $s $hkey -hhash $hhash -pad $pad]]
+}
+
+# Returns the most capable CSP
+proc twapi::_crypt_acquire_default {} {
+    if {[catch {crypt_acquire -csptype prov_rsa_aes} hcrypt] &&
+        [catch {crypt_acquire -csptype prov_rsa_full -csp {Microsoft Enhanced Cryptographic Provider v1.0}} hcrypt]} {
+        set hcrypt [crypt_acquire]
+    }
+    set cspname [crypt_csp $hcrypt]
+    set csptype [crypt_csp_type $hcrypt]
+    # Redefine ourselves for next call
+    proc [namespace current]::_crypt_acquire_default {} "crypt_acquire -csp {$cspname} -csptype $csptype"
+    return $hcrypt
+}
+
+proc twapi::_block_cipher {algo direction bytes keybytes args} {
+
+    # Note: padding mode is not documented since MS providers only support
+    # one mode anyway
+    parseargs args {
+        mode.arg
+        iv.arg
+        padding.arg
+    } -setvars -maxleftover 0
+    
+    set hcrypt [_crypt_acquire_default]
+    try {
+        set hkey [crypt_import_key $hcrypt [capi_keyblob_concealed $algo $keybytes]]
+        if {[info exists mode]} {
+            capi_key_mode $hkey $mode
+        }
+        if {[info exists iv]} {
+            capi_key_iv $hkey $iv
+        }
+        if {$direction eq "encrypt"} {
+            if {[info exists padding]} {
+                capi_key_padding $hkey $padding
+            }
+            set ciphertext [capi_encrypt_bytes $bytes $hkey]
+        } else {
+            set ciphertext [capi_decrypt_bytes $bytes $hkey]
+        }
+    } finally {
+        if {[info exists hkey]} {
+            capi_key_free $hkey
+        }
+        crypt_free $hcrypt
+    }
+    return $ciphertext
+}
+
+# apply to avoid global variable pollution
+apply {{} {
+    foreach {algo blocklen} {des 8 3des 8 aes_128 16 aes_192 16 aes_256 16} {
+        namespace eval twapi::$algo {}
+        interp alias {} twapi::${algo}::encrypt {} twapi::_block_cipher $algo encrypt
+        interp alias {} twapi::${algo}::decrypt {} twapi::_block_cipher $algo decrypt
+        interp alias {} twapi::${algo}::iv {} twapi::random_bytes $blocklen
+        namespace eval twapi::$algo {
+            namespace export encrypt decrypt iv
+            namespace ensemble create
+        }
+    }
+}}
+
+###
+# PKCS7 commands
+
+proc twapi::pkcs7_encrypt {bytes recipients encalg args} {
+    parseargs args {
+        {encoding.arg pem {pem der}}
+        {innertype.arg 0}
+    } -setvars -maxleftover 0
+
+    # TBD - add support for the following
+    set flags 0
+    set encauxinfo {}
+
+    set params [list \
+                    0x10001 \
+                    NULL \
+                    [_make_algorithm_identifier $encalg] \
+                    $encauxinfo \
+                    $flags \
+                    $innertype]
+    return [_as_pem_or_der [CryptEncryptMessage $params $recipients $bytes] PKCS7 $encoding]
+}
+
+proc twapi::pkcs7_decrypt {bytes stores args} {
+    parseargs args {
+        {encoding.arg {} {der pem {}}}
+        {silent.bool 0 0x40}
+        {certvar.arg ""}
+    } -maxleftover 0 -setvars
+
+    set params [list \
+                    0x10001 \
+                    $stores \
+                    $silent]
+    if {$certvar ne ""} {
+        upvar 1 $certvar hcert
+        set certvar hcert
+    }
+    
+    return [CryptDecryptMessage $params [_pem_decode $bytes $encoding] $certvar]
+}
+ 
+proc twapi::pkcs7_sign {bytes hcert hashalg args} {
+    # TBD - document crls?
+    parseargs args {
+        {detached.bool 0}
+        {encoding.arg pem {pem der}}
+        {includecerts.arg all {none leaf all}}
+        {silent.bool 0 0x40}
+        {usesignerkeyid.bool 0 0x4}
+        {crls.arg {}}
+        {innercontenttype.arg 0}
+    } -setvars -maxleftover 0
+
+    set flags [expr {$usesignerkeyid | $silent}]
+
+    switch -exact -- $includecerts {
+        leaf { set certs [list [cert_duplicate $hcert]] }
+        none { set certs {} }
+        all { set certs [cert_ancestors $hcert] }
+    }
+    # TBD - add support for the following
+    set hashaux {}
+    set authattrs {}
+    set unauthattrs {}
+    set encalg ""
+    set hashencaux ""
+    # 0x10001 -> PKCS_7_ASN_ENCODING|X509_ASN_ENCODING
+    set params [list \
+                    0x10001 \
+                    $hcert \
+                    [_make_algorithm_identifier $hashalg] \
+                    $hashaux \
+                    $certs \
+                    $crls \
+                    $authattrs \
+                    $unauthattrs \
+                    $flags \
+                    $innercontenttype \
+                    $encalg \
+                    $hashencaux]
+    trap {
+        return [_as_pem_or_der [CryptSignMessage $params $detached [list $bytes]] PKCS7 $encoding]
+    } finally {
+        foreach c $certs {
+            cert_release $c
+        }
+    }
+}
+
+proc twapi::pkcs7_verify {bytes args} {
+    parseargs args {
+        {encoding.arg {} {der pem {}}}
+        {contentvar.arg ""}
+        {certvar.arg ""}
+    } -maxleftover 0 -setvars -ignoreunknown
+
+    if {$contentvar ne ""} {
+        upvar 1 $contentvar content
+        set contentvar content
+    }
+    set status [CryptVerifyMessageSignature [list 0x10001 NULL] 0 [_pem_decode $bytes $encoding] $contentvar hcert]
+    if {$status == 0} {
+        trap {
+            set status [cert_verify $hcert base {*}$args]
+            if {$status eq "ok"} {
+                if {$certvar ne ""} {
+                    upvar 1 $certvar cert
+                    set cert $hcert
+                    unset hcert;    # So we do not release it below
+                }
+                if {$contentvar ne ""} {
+                    upvar 1 $contentvar con
+                    set con content
+                }
+            }
+        } finally {
+            if {[info exists hcert]} {
+                cert_release $hcert
+            }
+        }
+    } else {
+        # Note these codes are different from those in _map_cert_verify_error
+        if {$status == 0x80090006} {
+            set status "signature"
+        } elseif {$status == 0x80090008} {
+            set status "invalidalgorithm"
+        }
+    }
+        
+    return $status
+}
+
+
+# For backwards compat - deprecated
+interp alias {} twapi::crypt_key_free {} twapi::capi_key_free
+
+proc twapi::crypt_algorithms {hcrypt} {
+    set algs {}
+    foreach alg [CryptGetProvParam $hcrypt 22 0] {
+        lassign $alg algid defaultlen minlen maxlen protos name description
+        set protos [_make_symbolic_bitmask $protos {
+            ipsec 0x10 pct1 0x01 signing 0x20 ssl2 0x02 ssl3 0x04 tls1 0x08
+        }]
+        lappend algs [list algid $algid defkeylen $defaultlen minkeylen $minlen maxkeylen $maxlen protocols $protos name $name description $description]
+    }
+    return $algs
+}
+
+proc twapi::crypt_implementation_type {hcrypt} {
+    return [dict* {1 hardware 2 software 3 mixed 4 unknown 8 removable} [CryptGetProvParam $hcrypt 3 0]]
+}
+
+proc twapi::capi_algid {s} {
+    if {[string is integer -strict $s]} {
+        return [expr {$s}];     # Return in decimal form
+    }
+    set algid [dict* {
+        3des 0x00006603
+        3des_112 0x00006609
+        aes 0x00006611
+        aes_128 0x0000660e
+        aes_192 0x0000660f
+        aes_256 0x00006610
+        agreedkey_any 0x0000aa03
+        keyexchange 1
+        signature 2
+        cylink_mek 0x0000660c
+        des 0x00006601
+        desx 0x00006604
+        dh_ephem 0x0000aa02
+        dh_sf 0x0000aa01
+        dss_sign 0x00002200
+        ecdh 0x0000aa05
+        ecdsa 0x00002203
+        ecmqv 0x0000a001
+        hash_replace_owf 0x0000800b
+        hughes_md5 0x0000a003
+        hmac 0x00008009
+        kea_keyx 0x0000aa04
+        mac 0x00008005
+        md2 0x00008001
+        md4 0x00008002
+        md5 0x00008003
+        no_sign 0x00002000
+        pct1_master 0x00004c04
+        rc2 0x00006602
+        rc4 0x00006801
+        rc5 0x0000660d
+        rsa_keyx 0x0000a400
+        rsa_sign 0x00002400
+        schannel_enc_key 0x00004c07
+        schannel_mac_key 0x00004c03
+        schannel_master_hash 0x00004c02
+        sha 0x00008004
+        sha1 0x00008004
+        sha_256 0x0000800c
+        sha_384 0x0000800d
+        sha_512 0x0000800e
+        ssl2_master 0x00004c05
+        ssl3_master 0x00004c01
+        ssl3_shamd5 0x00008008
+        tls1_master 0x00004c06
+        tls1prf 0x0000800a
+    } $s ""]
+
+    if {$algid eq ""} {
+        set oid [oid $s]
+        set algid [CertOIDToAlgId $oid]
+        if {$algid == 0} {
+            error "Could not map \"$s\" to algorithm id"
+        }
+    }
+    # Return the decimal form
+    return [expr {$algid}]
+}
+
+# TBD - document
+proc twapi::crypt_find_oid_info {key args} {
+    array set opts [parseargs args {
+        {restrict.arg any {sign encrypt any}}
+        keylen.int
+        {searchds.bool 0}
+        {oidgroup.arg  0}
+    } -maxleftover 0]
+
+    # We will try key to be an OID, Alg Id, sign id or a simple
+    # name in turn
+    if {[catch {
+        set key [oid $key]
+        set keytype 1;          # OID
+    }]} {
+        if {[catch {
+            set key [capi_algid $key]
+            set keytype 3;      # Alg Id
+        }]} {
+            if {[catch {
+                # Sign - list of two alg id's
+                if {[llength $key] == 2} {
+                    set key [list [capi_algid [lindex $key 0]] [capi_algid [lindex $key 1]]]
+                    set keytype 4
+                } else {
+                    set keytype 2 ;# Name
+                }
+            }]} {
+                set keytype 2 ;# Name
+            }
+        }
+    }
+
+    set oidgroup [oidgroup $opts(oidgroup)]
+    if {$opts(restrict) ne "any"} {
+        if {$oidgroup != 0 && $oidgroup != 3} {
+            error "The -restrict option can only be used with the oidgroup_pubkey_alg OID group"
+        }
+        if {$opts(restrict) eq "sign"} {
+            set keytype [expr {$keytype | 0x80000000}]
+        } else {
+            set keytype [expr {$keytype | 0x40000000}]
+        }
+    }
+    
+    if {[info exists opts(keylen)]} {
+        set oidgroup [expr {$oidgroup | ($opts(keylen) << 16)}]
+    }
+
+    # Because search of active dir can be slow, turn it off unless
+    # caller explicitly requests it
+    if {! $opts(searchds)} {
+        set oidgroup [expr {$oidgroup | 0x80000000}]
+    }
+
+    return [CryptFindOIDInfo $keytype $key $oidgroup]
+}
+
+# TBD - document
+proc twapi::crypt_enumerate_oid_info {{oidgroup 0}} {
+    # TBD - parse extra based on OID group
+    set ret {}
+    foreach info [CryptEnumOIDInfo [oidgroup $oidgroup]] {
+        lappend ret [twine {oid name oidgroup value extra} $info]
+    }
+    return $ret
+}
+
+# TBD - test
+proc twapi::_capi_parse {type arg args} {
+    parseargs args {
+        {contenttype.arg any}
+        {formattype.arg any}
+        {typesonly.bool 0}
+    } -setvars -maxleftover 0
+        
+    # First try the formats not supported by CryptQueryObject
+    if {$contenttype in {any rsapublickey subjectpublickeyinfo}} {
+        if {$formattype eq "binary"} {
+            set encoding der
+        } elseif {$formattype eq "base64"} {
+            set encoding pem
+        } else {
+            set encoding ""
+        }
+        if {$type == 1} {
+            # arg is a file
+            set fd [open $arg]
+            trap {
+                fconfigure $fd -translation binary
+                set content [_pem_decode [read $fd] $encoding]
+                set is_pem  [_is_pem $content]
+            } finally {
+                close $fd
+            }
+        }
+        if {$contenttype in {any subjectpublickeyinfo}} {
+            trap {
+                set data [CryptDecodeObjectEx 8 $content]
+                dict set ret contenttype subjectpublickeyinfo
+                dict set ret formattype [lindex {binary base64} $is_pem]
+                if {! $typesonly} {
+                    dict set ret subjectpublickeyinfo $data
+                }
+                return $ret
+            } onerror {} {
+                if {$contenttype eq "subjectpublickeyinfo"} {
+                    rethrow
+                }
+                # Go on to try other types
+            }
+        }
+        if {$contenttype in {any rsapublickey}} {
+            trap {
+                set data [CryptDecodeObjectEx 19 $content]
+                dict set ret contenttype rsapublickey
+                dict set ret formattype [lindex {binary base64} $is_pem]
+                if {! $typesonly} {
+                    dict set ret rsapublickey $data
+                }
+                return $ret
+            } onerror {} {
+                if {$contenttype eq "rsapublickey"} {
+                    rethrow
+                }
+                # Go on to try other types
+            }
+        }
+    }
+
+    # No joy. Go on to try CryptQueryObject
+
+    # Note - CERT_QUERY_CONTENT_FLAG_PFX_AND_LOAD not supported
+    # on XP/2k3 hence not included in expected_content_type
+    set contenttype [dict! {
+        cert 2
+        ctl  4
+        crl  8
+        serializedstore 16
+        serializedcert 32
+        serializedctl 64
+        serializedcrl 128
+        pkcs7signed   256
+        pkcs7unsigned 512
+        pkcs7signedembed 1024
+        pkcs10 2048
+        pfx 4096
+        certpair 8192
+        any 0x3FFE
+    } $contenttype]
+    
+    set formattype [dict! {
+        binary 2
+        base64 4
+        asn1hex 8
+        any    14
+    } $formattype]
+
+    set ret [CryptQueryObject $type $arg \
+                 $contenttype $formattype 0 $typesonly]
+    # We don't mention PKCS7_ASN v/s X509_ASN anywhere and use encoding
+    # to refer to PEM/DER so leave it off for now
+    dict unset ret encoding
+    dict set ret formattype [dict* {
+        1 binary
+        2 base64
+        3 asn1hex
+    } [dict get $ret formattype]]
+    dict set ret contenttype [dict* {
+        1 cert
+        2 ctl 
+        3 crl 
+        4 serializedstore 
+        5 serializedcert 
+        6 serializedctl 
+        7 serializedcrl
+        8 pkcs7signed  
+        9 pkcs7unsigned
+        10 pkcs7signedembed 
+        11 pkcs10 
+        12 pfx 
+        13 certpair 
+    } [dict get $ret contenttype]]
+
+    return $ret
+}
+interp alias {} twapi::capi_parse_file {} twapi::_capi_parse 1
+interp alias {} twapi::capi_parse {} twapi::_capi_parse 2
+
+###
+# ASN.1 procs
+
+# TBD - document
+proc twapi::asn1_decode_string {bin} {
+    # 24 -> X509_UNICODE_ANY_STRING
+    return [lindex [twapi::CryptDecodeObjectEx 24 $bin] 1]
+}
+
+# TBD - document
+proc twapi::asn1_encode_string {s {encformat utf8}} {
+    # 24 -> X509_UNICODE_ANY_STRING
+    return [twapi::CryptEncodeObjectEx 24 [list [dict! {
+        numeric 3 printable 4 teletex 5 t61 5 videotex 6 ia5 7 graphic 8
+        visible 9 iso646 9 general 10 universal 11 int4 11
+        bmp 12 unicode 12 utf8 13
+    } $encformat] $s]]
+}
+
+###
+# Key procs
+
+proc twapi::_capi_key_param {param_id hkey args} {
+    if {[llength $args] == 0} {
+        return [CryptGetKeyParam $hkey $param_id]
+    }
+    if {[llength $args] == 1} {
+        return [CryptSetKeyParam $hkey $param_id [lindex $args 0]]
+    }
+    badargs! "Invalid syntax. Should be [lindex [info level -1] 0] HKEY ?VALUE?" 3
+}
+
+proc twapi::capi_key_iv {args} {return [_capi_key_param 1 {*}$args]} 
+proc twapi::capi_key_mode_bits {args} {return [_capi_key_param 5 {*}$args]} 
+proc twapi::capi_key_dss_p {args} {return [_capi_key_param 11 {*}$args]} 
+proc twapi::capi_key_dss_q {args} {return [_capi_key_param 13 {*}$args]} 
+proc twapi::capi_key_dss_g {args} {return [_capi_key_param 12 {*}$args]} 
+proc twapi::capi_key_effective_keylen {args} {return [_capi_key_param 19 {*}$args]} 
+
+proc twapi::capi_key_blocklen {hkey} {return [CryptGetKeyParam $hkey 8]}
+proc twapi::capi_key_certificate {hkey} {return [CryptGetKeyParam $hkey 26]}
+proc twapi::capi_key_keylen {hkey} {return [CryptGetKeyParam $hkey 9]}
+
+proc twapi::capi_key_algid {hkey args} {
+    if {[llength $args] == 0} {
+        return [CryptGetKeyParam $hkey 7]
+    }
+    set args [lassign $args algid]
+    set algid [capi_algid $algid]
+    array set opts [parseargs args {
+        {archivable.bool 0 0x4000}
+        {salt.bool 0 4}
+        {exportable.bool 0 1}
+        {pregen.bool 0x40}
+        {userprotected.bool 0 2}
+        {nosalt40.bool 0 0x10}
+        {size.int 0}
+    } -maxleftover 0]
+    if {$opts(size) < 0 || $opts(size) > 65535} {
+        badargs! "Bad key size value '$size':  must be positive integer less than 65536"
+    }
+    set flags [expr {($opts(size) << 16) | $opts(archivable) | $opts(salt) | $opts(exportable) | $opts(pregen) | $opts(userprotected) | $opts(nosalt40)}]
+    return [CryptSetKeyParam $hkey 7 $algid $flags]
+}
+
+proc twapi::capi_key_mode {hkey args} {
+    if {[llength $args] == 0} {
+        return [dict* {1 cbc 2 ecb 3 ofb 4 cfb 5 cts} [CryptGetKeyParam $hkey 4]]
+    }
+    if {[llength $args] == 1} {
+        set val [dict* {cbc 1 ecb 2 ofb 3 cfb 4 cts 5} [lindex $args 0]]
+        return [CryptSetKeyParam $hkey 4 $val]
+    }
+    badargs! "Invalid syntax. Should be [lindex [info level 0] 0] HKEY ?VALUE?"
+}
+
+proc twapi::capi_key_padding {hkey args} {
+    if {[llength $args] == 0} {
+        return [dict* {1 pkcs5 2 random 3 zeroes} [CryptGetKeyParam $hkey 3]]
+    }
+    if {[llength $args] == 1} {
+        set val [dict* {pkcs5 1 random 2 zeroes 3} [lindex $args 0]]
+        return [CryptSetKeyParam $hkey 3 $val]
+    }
+    badargs! "Invalid syntax. Should be [lindex [info level 0] 0] HKEY ?VALUE?"
+}
+
+proc twapi::capi_key_permissions {hkey args} {
+    set bitmasks {
+        encrypt 0x01 decrypt 0x02 export 0x04 read 0x08 write 0x10
+        mac 0x20 export_key 0x40 import_key 0x80 archive 0x100
+    }
+    if {[llength $args] == 0} {
+        return [_make_symbolic_bitmask [CryptGetKeyParam $hkey 6] $bitmasks]
+    }
+    if {[llength $args] == 1} {
+        set val [_parse_symbolic_bitmask [lindex $args 0] $bitmasks]
+        return [CryptSetKeyParam $hkey 6 $val]
+    }
+    badargs! "Invalid syntax. Should be [lindex [info level 0] 0] HKEY ?VALUE?"
+}
+
+proc twapi::capi_key_salt {hkey args} {
+    if {[llength $args] == 0} {
+        # 2 -> KP_SALT
+        return [CryptGetKeyParam $hkey 2]
+    }
+    if {[llength $args] == 1} {
+        # 10 -> KP_SALT_EX
+        return [CryptSetKeyParam $hkey 10 [lindex $args 0]]
+    } 
+    badargs! "Invalid syntax. Should be [lindex [info level 0] 0] HKEY ?VALUE?"
+}
+
+proc twapi::capi_keyblob_create {ver algid blob_type key} {
+    # 0 -> reserved field
+    return [list [_capi_keyblob_type_id $blob_type] $ver 0 [capi_algid $algid] $key]
+}
+
+proc twapi::capi_keyblob_concealed {algid concealed_key} {
+    # 2 -> bVersion
+    # 0 -> concealed plaintextkeyblob
+    # Note: for our own home grown concealed type there is no
+    # BLOBHEADER
+    return [capi_keyblob_create 2 $algid concealed $concealed_key]
+}
+
+proc twapi::capi_keyblob_plaintext {algid binkey} {
+    # typedef struct _PUBLICKEYSTRUC {
+    #   BYTE   bType;
+    #   BYTE   bVersion;
+    #   WORD   reserved;
+    #   ALG_ID aiKeyAlg;
+    # } BLOBHEADER;
+    # 2 -> bVersion
+    set algnum [capi_algid $algid]
+    set blob_type [_capi_keyblob_type_id plaintext]
+    set len [string length $binkey]
+    set blob "[binary format ccsii $blob_type 2 0 $algnum $len]$binkey"
+    return [capi_keyblob_create 2 $algid plaintext $blob]
+}
+
+proc twapi::capi_keyblob_version {kblob} {
+    return [lindex $kblob 1]
+}
+
+proc twapi::capi_keyblob_algid {kblob} {
+    return [lindex $kblob 3]
+}
+
+proc twapi::capi_keyblob_type {kblob} {
+    return [_capi_keyblob_type_name [lindex $kblob 0]]
+}
+
+proc twapi::capi_keyblob_blob {kblob} {
+    return [lindex $kblob 4]
+}
+
+proc twapi::_capi_keyblob_type_id {name} {
+    set blob_type [dict* {
+        concealed    0
+        keystate    12
+        opaque       9
+        plaintext    8
+        privatekey   7
+        publickey    6
+        publickeyex 10
+        rfc3217     11
+        simple       1
+    } $name]
+}
+
+proc twapi::_capi_keyblob_type_name {id} {
+    set blob_type [dict* {
+        0  concealed
+        1  simple
+        6  publickey
+        7  privatekey
+        8  plaintext
+        9  opaque
+        10 publickeyex
+        11 rfc3217
+        12 keystate
+    } [incr id 0]];              # incr to convert hex etc. to decimal
+    
+}
+
+###
+# Utility procs
+
+proc twapi::_make_algorithm_identifier {oid {param {}}} {
+    if {[string length $oid] == 0} {
+        return ""
+    }
+    if {0} {
+        # TBD - what modes to default to ?
+        switch -exact -- $oid {
+#define szOID_NIST_AES128_CBC        "2.16.840.1.101.3.4.1.2"
+#define szOID_NIST_AES192_CBC        "2.16.840.1.101.3.4.1.22"
+#define szOID_NIST_AES256_CBC        "2.16.840.1.101.3.4.1.42"
+
+#// For the above Algorithms, the AlgorithmIdentifier parameters must be
+#// present and the parameters field MUST contain an AES-IV:
+#//
+#//  AES-IV ::= OCTET STRING (SIZE(16))
+
+#// NIST AES WRAP Algorithms
+#define szOID_NIST_AES128_WRAP       "2.16.840.1.101.3.4.1.5"
+#define szOID_NIST_AES192_WRAP       "2.16.840.1.101.3.4.1.25"
+#define szOID_NIST_AES256_WRAP       "2.16.840.1.101.3.4.1.45"
+            des { set oid "oid_rsa_des_ede3_cbc" }
+            des { set oid "oid_oiwsec_descbc" }
+            aes128 { TBD }
+            aes192 { TBD }
+            aes256 { TBD }
+            rc2 { set oid "oid_rsa_rc2cbc" }
+            rc4 { set oid "oid_rsa_rc4" }
+        }
+    }
+    set oid [oid $oid]
+    if {[string length $param]} {
+        return [list $oid $param]
+    } else {
+        return [list $oid]
+    }
+}
+
+twapi::proc* twapi::_cert_prop_id {prop} {
+    # Certificate property menomics
+    variable _cert_prop_name_id_map
+    array set _cert_prop_name_id_map {
+        key_prov_handle        1
+        key_prov_info          2
+        sha1_hash              3
+        hash                   3
+        md5_hash               4
+        key_context            5
+        key_spec               6
+        ie30_reserved          7
+        pubkey_hash_reserved   8
+        enhkey_usage           9
+        ctl_usage              9
+        next_update_location   10
+        friendly_name          11
+        pvk_file               12
+        description            13
+        access_state           14
+        signature_hash         15
+        smart_card_data        16
+        efs                    17
+        fortezza_data          18
+        archived               19
+        key_identifier         20
+        auto_enroll            21
+        pubkey_alg_para        22
+        cross_cert_dist_points 23
+        issuer_public_key_md5_hash     24
+        subject_public_key_md5_hash    25
+        id             26
+        date_stamp             27
+        issuer_serial_number_md5_hash  28
+        subject_name_md5_hash  29
+        extended_error_info    30
+
+        renewal                64
+        archived_key_hash      65
+        auto_enroll_retry      66
+        aia_url_retrieved      67
+        authority_info_access  68
+        backed_up              69
+        ocsp_response          70
+        request_originator     71
+        source_location        72
+        source_url             73
+        new_key                74
+        ocsp_cache_prefix      75
+        smart_card_root_info   76
+        no_auto_expire_check   77
+        ncrypt_key_handle      78
+        hcryptprov_or_ncrypt_key_handle   79
+
+        subject_info_access    80
+        ca_ocsp_authority_info_access  81
+        ca_disable_crl         82
+        root_program_cert_policies    83
+        root_program_name_constraints 84
+        subject_ocsp_authority_info_access  85
+        subject_disable_crl    86
+        cep                    87
+
+        sign_hash_cng_alg      89
+
+        scard_pin_id           90
+        scard_pin_info         91
+    }
+} {
+    variable _cert_prop_name_id_map
+
+    if {[string is integer -strict $prop]} {
+        return $prop
+    }
+    if {![info exists _cert_prop_name_id_map($prop)]} {
+        badargs! "Unknown certificate property id '$prop'" 3
+    }
+
+    return $_cert_prop_name_id_map($prop)
+}
+
+twapi::proc* twapi::_cert_prop_name {id} {
+    variable _cert_prop_name_id_map
+    variable _cert_prop_id_name_map
+
+    _cert_prop_id key_prov_handle; # Just to init _cert_prop_name_id_map
+    array set _cert_prop_id_name_map [swapl [array get _cert_prop_name_id_map]]
+} {
+    variable _cert_prop_id_name_map
+    if {[info exists _cert_prop_id_name_map($id)]} {
+        return $_cert_prop_id_name_map($id)
+    }
+    if {[string is integer -strict $id]} {
+        return $id
+    }
+    badargs! "Unknown certificate property id '$id'" 3
+}
+
+twapi::proc* twapi::_system_store_id {name} {
+    variable _system_store_locations
+    
+    set _system_store_locations {
+        service          0x40000
+        ""               0x10000
+        user             0x10000
+        usergrouppolicy  0x70000
+        localmachine     0x20000
+        localmachineenterprise  0x90000
+        localmachinegrouppolicy 0x80000
+        services 0x50000
+        users    0x60000
+    }
+
+    foreach loc [CertEnumSystemStoreLocation 0] {
+        dict set _system_store_locations {*}$loc
+    }
+} {
+    variable _system_store_locations
+
+    if {[string is integer -strict $name]} {
+        if {$name < 65536} {
+            badargs! "Invalid system store name $name" 3
+        }
+        return $name
+    }
+
+    return [dict! $_system_store_locations $name 2]
+}
+
+twapi::proc* twapi::_csp_type_name_to_id prov {
+    variable _csp_type_name_id_map
+
+    array set _csp_type_name_id_map {
+        prov_rsa_full           1
+        prov_rsa_sig            2
+        prov_dss                3
+        prov_fortezza           4
+        prov_ms_exchange        5
+        prov_ssl                6
+        prov_rsa_schannel       12
+        prov_dss_dh             13
+        prov_ec_ecdsa_sig       14
+        prov_ec_ecnra_sig       15
+        prov_ec_ecdsa_full      16
+        prov_ec_ecnra_full      17
+        prov_dh_schannel        18
+        prov_spyrus_lynks       20
+        prov_rng                21
+        prov_intel_sec          22
+        prov_replace_owf        23
+        prov_rsa_aes            24
+    }
+} {
+    variable _csp_type_name_id_map
+
+    set key [string tolower $prov]
+
+    if {[info exists _csp_type_name_id_map($key)]} {
+        return $_csp_type_name_id_map($key)
+    }
+
+    if {[string is integer -strict $prov]} {
+        return $prov
+    }
+
+    badargs! "Invalid or unknown provider type '$prov'" 3
+}
+
+twapi::proc* twapi::_csp_type_id_to_name prov {
+    variable _csp_type_name_id_map
+    variable _csp_id_type_name_map
+
+    _csp_type_name_to_id prov_rsa_full; # Just to ensure _csp_type_name_id_map exists
+    array set _csp_id_type_name_map [swapl [array get _csp_type_name_id_map]]
+} {
+    variable _csp_id_type_name_map
+    if {[info exists _csp_id_type_name_map($prov)]} {
+        return $_csp_id_type_name_map($prov)
+    }
+
+    if {[string is integer -strict $prov]} {
+        return $prov
+    }
+
+    badargs! "Invalid or unknown CSP type id '$prov'" 3
+}
+
+twapi::proc* twapi::oid {name} {
+    variable _name_oid_map
+    if {![info exists _name_oid_map]} {
+        oids;                       # To init the map
+    }
+} {
+    variable _name_oid_map
+
+    if {[regexp {^\d+\.\d+(\.\d+)*$} $name]} {
+        return $name;           # OID literal n.n...
+    }
+    if {[info exists _name_oid_map($name)]} {
+        return $_name_oid_map($name)
+    }
+    # Try by adding oid_
+    if {[info exists _name_oid_map(oid_$name)]} {
+        return $_name_oid_map(oid_$name)
+    }
+
+    badargs! "Invalid OID '$name'"
+
+}
+
+twapi::proc* twapi::oidname {oid} {
+    variable _oid_name_map
+    if {![info exists _oid_name_map]} {
+        oids;                       # To init the map
+    }
+} {
+    variable _oid_name_map
+
+    if {[info exists _oid_name_map($oid)]} {
+        return $_oid_name_map($oid)
+    }
+    if {[regexp {^\d([\d\.]*\d)?$} $oid]} {
+        return $oid
+    } else {
+        badargs! "Invalid OID '$oid'"
+    }
+}
+
+# TBD - change OID mnemonics to those in RFC (see pki.tcl in tcllib)
+twapi::proc* twapi::oids {{pattern *}} {
+    variable _oid_name_map
+    variable _name_oid_map
+
+    # TBD - clean up table for rarely used OIDs
+    array set _name_oid_map {
+        oid_common_name                   "2.5.4.3"
+        oid_sur_name                      "2.5.4.4"
+        oid_device_serial_number          "2.5.4.5"
+        oid_country_name                  "2.5.4.6"
+        oid_locality_name                 "2.5.4.7"
+        oid_state_or_province_name        "2.5.4.8"
+        oid_street_address                "2.5.4.9"
+        oid_organization_name             "2.5.4.10"
+        oid_organizational_unit_name      "2.5.4.11"
+        oid_title                         "2.5.4.12"
+        oid_description                   "2.5.4.13"
+        oid_search_guide                  "2.5.4.14"
+        oid_business_category             "2.5.4.15"
+        oid_postal_address                "2.5.4.16"
+        oid_postal_code                   "2.5.4.17"
+        oid_post_office_box               "2.5.4.18"
+        oid_physical_delivery_office_name "2.5.4.19"
+        oid_telephone_number              "2.5.4.20"
+        oid_telex_number                  "2.5.4.21"
+        oid_teletext_terminal_identifier  "2.5.4.22"
+        oid_facsimile_telephone_number    "2.5.4.23"
+        oid_x21_address                   "2.5.4.24"
+        oid_international_isdn_number     "2.5.4.25"
+        oid_registered_address            "2.5.4.26"
+        oid_destination_indicator         "2.5.4.27"
+        oid_user_password                 "2.5.4.35"
+        oid_user_certificate              "2.5.4.36"
+        oid_ca_certificate                "2.5.4.37"
+        oid_authority_revocation_list     "2.5.4.38"
+        oid_certificate_revocation_list   "2.5.4.39"
+        oid_cross_certificate_pair        "2.5.4.40"
+
+        oid_rsa               "1.2.840.113549"
+        oid_pkcs              "1.2.840.113549.1"
+        oid_rsa_hash          "1.2.840.113549.2"
+        oid_rsa_encrypt       "1.2.840.113549.3"
+
+        oid_pkcs_1            "1.2.840.113549.1.1"
+        oid_pkcs_2            "1.2.840.113549.1.2"
+        oid_pkcs_3            "1.2.840.113549.1.3"
+        oid_pkcs_4            "1.2.840.113549.1.4"
+        oid_pkcs_5            "1.2.840.113549.1.5"
+        oid_pkcs_6            "1.2.840.113549.1.6"
+        oid_pkcs_7            "1.2.840.113549.1.7"
+        oid_pkcs_8            "1.2.840.113549.1.8"
+        oid_pkcs_9            "1.2.840.113549.1.9"
+        oid_pkcs_10           "1.2.840.113549.1.10"
+        oid_pkcs_12           "1.2.840.113549.1.12"
+
+        oid_rsa_rsa           "1.2.840.113549.1.1.1"
+        oid_rsa_md2rsa        "1.2.840.113549.1.1.2"
+        oid_rsa_md4rsa        "1.2.840.113549.1.1.3"
+        oid_rsa_md5rsa        "1.2.840.113549.1.1.4"
+        oid_rsa_sha1rsa       "1.2.840.113549.1.1.5"
+        oid_rsa_setoaep_rsa   "1.2.840.113549.1.1.6"
+
+        oid_rsa_dh            "1.2.840.113549.1.3.1"
+
+        oid_rsa_data          "1.2.840.113549.1.7.1"
+        oid_rsa_signeddata    "1.2.840.113549.1.7.2"
+        oid_rsa_envelopeddata "1.2.840.113549.1.7.3"
+        oid_rsa_signenvdata   "1.2.840.113549.1.7.4"
+        oid_rsa_digesteddata  "1.2.840.113549.1.7.5"
+        oid_rsa_hasheddata    "1.2.840.113549.1.7.5"
+        oid_rsa_encrypteddata "1.2.840.113549.1.7.6"
+
+        oid_rsa_emailaddr     "1.2.840.113549.1.9.1"
+        oid_rsa_unstructname  "1.2.840.113549.1.9.2"
+        oid_rsa_contenttype   "1.2.840.113549.1.9.3"
+        oid_rsa_messagedigest "1.2.840.113549.1.9.4"
+        oid_rsa_signingtime   "1.2.840.113549.1.9.5"
+        oid_rsa_countersign   "1.2.840.113549.1.9.6"
+        oid_rsa_challengepwd  "1.2.840.113549.1.9.7"
+        oid_rsa_unstructaddr  "1.2.840.113549.1.9.8"
+        oid_rsa_extcertattrs  "1.2.840.113549.1.9.9"
+        oid_rsa_certextensions "1.2.840.113549.1.9.14"
+        oid_rsa_smimecapabilities "1.2.840.113549.1.9.15"
+        oid_rsa_prefersigneddata "1.2.840.113549.1.9.15.1"
+
+        oid_rsa_smimealg              "1.2.840.113549.1.9.16.3"
+        oid_rsa_smimealgesdh          "1.2.840.113549.1.9.16.3.5"
+        oid_rsa_smimealgcms3deswrap   "1.2.840.113549.1.9.16.3.6"
+        oid_rsa_smimealgcmsrc2wrap    "1.2.840.113549.1.9.16.3.7"
+
+        oid_rsa_md2           "1.2.840.113549.2.2"
+        oid_rsa_md4           "1.2.840.113549.2.4"
+        oid_rsa_md5           "1.2.840.113549.2.5"
+
+        oid_rsa_rc2cbc        "1.2.840.113549.3.2"
+        oid_rsa_rc4           "1.2.840.113549.3.4"
+        oid_rsa_des_ede3_cbc  "1.2.840.113549.3.7"
+        oid_rsa_rc5_cbcpad    "1.2.840.113549.3.9"
+
+
+        oid_ansi_x942         "1.2.840.10046"
+        oid_ansi_x942_dh      "1.2.840.10046.2.1"
+
+        oid_x957              "1.2.840.10040"
+        oid_x957_dsa          "1.2.840.10040.4.1"
+        oid_x957_sha1dsa      "1.2.840.10040.4.3"
+
+        oid_ds                "2.5"
+        oid_dsalg             "2.5.8"
+        oid_dsalg_crpt        "2.5.8.1"
+        oid_dsalg_hash        "2.5.8.2"
+        oid_dsalg_sign        "2.5.8.3"
+        oid_dsalg_rsa         "2.5.8.1.1"
+
+        oid_pkix_kp_server_auth "1.3.6.1.5.5.7.3.1"
+        oid_pkix_kp_client_auth "1.3.6.1.5.5.7.3.2"
+        oid_pkix_kp_code_signing   "1.3.6.1.5.5.7.3.3"
+        oid_pkix_kp_email_protection      "1.3.6.1.5.5.7.3.4"
+        oid_pkix_kp_ipsec_end_system "1.3.6.1.5.5.7.3.5"
+        oid_pkix_kp_ipsec_tunnel "1.3.6.1.5.5.7.3.6"
+        oid_pkix_kp_ipsec_user "1.3.6.1.5.5.7.3.7"
+        oid_pkix_kp_timestamp_signing "1.3.6.1.5.5.7.3.8"
+        oid_pkix_kp_ocsp_signing      "1.3.6.1.5.5.7.3.9"
+
+        oid_oiw               "1.3.14"
+
+        oid_oiwsec            "1.3.14.3.2"
+        oid_oiwsec_md4rsa     "1.3.14.3.2.2"
+        oid_oiwsec_md5rsa     "1.3.14.3.2.3"
+        oid_oiwsec_md4rsa2    "1.3.14.3.2.4"
+        oid_oiwsec_desecb     "1.3.14.3.2.6"
+        oid_oiwsec_descbc     "1.3.14.3.2.7"
+        oid_oiwsec_desofb     "1.3.14.3.2.8"
+        oid_oiwsec_descfb     "1.3.14.3.2.9"
+        oid_oiwsec_desmac     "1.3.14.3.2.10"
+        oid_oiwsec_rsasign    "1.3.14.3.2.11"
+        oid_oiwsec_dsa        "1.3.14.3.2.12"
+        oid_oiwsec_shadsa     "1.3.14.3.2.13"
+        oid_oiwsec_mdc2rsa    "1.3.14.3.2.14"
+        oid_oiwsec_sharsa     "1.3.14.3.2.15"
+        oid_oiwsec_dhcommmod  "1.3.14.3.2.16"
+        oid_oiwsec_desede     "1.3.14.3.2.17"
+        oid_oiwsec_sha        "1.3.14.3.2.18"
+        oid_oiwsec_mdc2       "1.3.14.3.2.19"
+        oid_oiwsec_dsacomm    "1.3.14.3.2.20"
+        oid_oiwsec_dsacommsha "1.3.14.3.2.21"
+        oid_oiwsec_rsaxchg    "1.3.14.3.2.22"
+        oid_oiwsec_keyhashseal "1.3.14.3.2.23"
+        oid_oiwsec_md2rsasign "1.3.14.3.2.24"
+        oid_oiwsec_md5rsasign "1.3.14.3.2.25"
+        oid_oiwsec_sha1       "1.3.14.3.2.26"
+        oid_oiwsec_dsasha1    "1.3.14.3.2.27"
+        oid_oiwsec_dsacommsha1 "1.3.14.3.2.28"
+        oid_oiwsec_sha1rsasign "1.3.14.3.2.29"
+
+        oid_oiwdir            "1.3.14.7.2"
+        oid_oiwdir_crpt       "1.3.14.7.2.1"
+        oid_oiwdir_hash       "1.3.14.7.2.2"
+        oid_oiwdir_sign       "1.3.14.7.2.3"
+        oid_oiwdir_md2        "1.3.14.7.2.2.1"
+        oid_oiwdir_md2rsa     "1.3.14.7.2.3.1"
+
+        oid_infosec                       "2.16.840.1.101.2.1"
+        oid_infosec_sdnssignature         "2.16.840.1.101.2.1.1.1"
+        oid_infosec_mosaicsignature       "2.16.840.1.101.2.1.1.2"
+        oid_infosec_sdnsconfidentiality   "2.16.840.1.101.2.1.1.3"
+        oid_infosec_mosaicconfidentiality "2.16.840.1.101.2.1.1.4"
+        oid_infosec_sdnsintegrity         "2.16.840.1.101.2.1.1.5"
+        oid_infosec_mosaicintegrity       "2.16.840.1.101.2.1.1.6"
+        oid_infosec_sdnstokenprotection   "2.16.840.1.101.2.1.1.7"
+        oid_infosec_mosaictokenprotection "2.16.840.1.101.2.1.1.8"
+        oid_infosec_sdnskeymanagement     "2.16.840.1.101.2.1.1.9"
+        oid_infosec_mosaickeymanagement   "2.16.840.1.101.2.1.1.10"
+        oid_infosec_sdnskmandsig          "2.16.840.1.101.2.1.1.11"
+        oid_infosec_mosaickmandsig        "2.16.840.1.101.2.1.1.12"
+        oid_infosec_suiteasignature       "2.16.840.1.101.2.1.1.13"
+        oid_infosec_suiteaconfidentiality "2.16.840.1.101.2.1.1.14"
+        oid_infosec_suiteaintegrity       "2.16.840.1.101.2.1.1.15"
+        oid_infosec_suiteatokenprotection "2.16.840.1.101.2.1.1.16"
+        oid_infosec_suiteakeymanagement   "2.16.840.1.101.2.1.1.17"
+        oid_infosec_suiteakmandsig        "2.16.840.1.101.2.1.1.18"
+        oid_infosec_mosaicupdatedsig      "2.16.840.1.101.2.1.1.19"
+        oid_infosec_mosaickmandupdsig     "2.16.840.1.101.2.1.1.20"
+        oid_infosec_mosaicupdatedinteg    "2.16.840.1.101.2.1.1.21"
+    }
+
+    # OIDs for certificate extensions
+    array set _name_oid_map {
+        oid_authority_key_identifier_old  "2.5.29.1"
+        oid_key_attributes            "2.5.29.2"
+        oid_cert_policies_95          "2.5.29.3"
+        oid_key_usage_restriction     "2.5.29.4"
+        oid_subject_alt_name_old          "2.5.29.7"
+        oid_issuer_alt_name_old           "2.5.29.8"
+        oid_basic_constraints_old     "2.5.29.10"
+        oid_key_usage                 "2.5.29.15"
+        oid_privatekey_usage_period   "2.5.29.16"
+        oid_basic_constraints        "2.5.29.19"
+
+        oid_cert_policies             "2.5.29.32"
+        oid_any_cert_policy           "2.5.29.32.0"
+        oid_inhibit_any_policy        "2.5.29.54"
+
+        oid_authority_key_identifier "2.5.29.35"
+        oid_subject_key_identifier    "2.5.29.14"
+        oid_subject_alt_name2         "2.5.29.17"
+        oid_issuer_alt_name          "2.5.29.18"
+        oid_crl_reason_code           "2.5.29.21"
+        oid_reason_code_hold          "2.5.29.23"
+        oid_crl_dist_points           "2.5.29.31"
+        oid_enhanced_key_usage        "2.5.29.37"
+
+        oid_any_enhanced_key_usage    "2.5.29.37.0"
+
+        oid_crl_number                "2.5.29.20"
+        oid_delta_crl_indicator       "2.5.29.27"
+        oid_issuing_dist_point        "2.5.29.28"
+        oid_freshest_crl              "2.5.29.46"
+        oid_name_constraints          "2.5.29.30"
+
+        oid_policy_mappings           "2.5.29.33"
+        oid_legacy_policy_mappings    "2.5.29.5"
+        oid_policy_constraints        "2.5.29.36"
+    }
+
+    array set _oid_name_map [swapl [array get _name_oid_map]]
+} {
+    variable _name_oid_map
+    return [array get _name_oid_map $pattern]
+}
+
+# TBD - document
+proc twapi::oidgroup {oidgroup} {
+    if {[string is integer -strict $oidgroup]} {
+        return $oidgroup
+    }
+    return [dict! {
+        oidgroup_hash_alg             1
+        oidgroup_encrypt_alg          2
+        oidgroup_pubkey_alg           3
+        oidgroup_sign_alg             4
+        oidgroup_rdn_attr             5
+        oidgroup_ext_or_attr          6
+        oidgroup_enhkey_usage         7
+        oidgroup_policy               8
+        oidgroup_template             9
+    } $oidgroup]
+}
+
+# TBD - document
+proc twapi::oidgroup_token {oidgroup} {
+    return [lindex {
+        {}
+        oidgroup_hash_alg
+        oidgroup_encrypt_alg
+        oidgroup_pubkey_alg
+        oidgroup_sign_alg
+        oidgroup_rdn_attr
+        oidgroup_ext_or_attr
+        oidgroup_enhkey_usage
+        oidgroup_policy
+        oidgroup_template
+    } $oidgroup]
+}
+
+proc twapi::_make_altnames_ext {altnames {critical 0} {issuer 0}} {
+    set names {}
+    foreach pair $altnames {
+        lassign $pair alttype altname
+        lappend names [list \
+                           [dict get {
+                               other 1
+                               email 2
+                               dns   3
+                               directory 5
+                               url 7
+                               ip  8
+                               registered 9
+                           } $alttype] $altname]
+    }
+
+    return [list [expr {$issuer ? "2.5.29.18" : "2.5.29.17"}] $critical $names]
+}
+
+proc twapi::_get_enhkey_usage_oids {names} {
+    array set map [oids oid_pkix_kp_*]
+
+    # We use an array to remove duplicates
+    array set oids {}
+    foreach name $names {
+        if {[info exists map($name)]} {
+            set oids($map($name)) 1
+        } elseif {[info exists map(oid_pkix_kp_$name)]} {
+            set oids($map(oid_pkix_kp_$name)) 1
+        } elseif {[regexp {^\d([\d\.]*\d)?$} $name]} {
+            # Any OID will do
+            set oids($name) 1
+        } else {
+            error "Invalid Enhanced Key Usage OID \"$name\""
+        }
+    }
+    return [array names oids]
+}
+
+proc twapi::_make_enhkeyusage_ext {enhkeyusage {critical 0}} {
+    return [list "2.5.29.37" $critical [_get_enhkey_usage_oids $enhkeyusage]]
+}
+
+twapi::proc* twapi::_init_keyusage_names {} {
+    variable _keyusage_byte1
+    variable _keyusage_byte2
+    set _keyusage_byte1 {
+        digital_signature     0x80
+        non_repudiation       0x40
+        key_encipherment      0x20
+        data_encipherment     0x10
+        key_agreement         0x08
+        key_cert_sign         0x04
+        crl_sign              0x02
+        encipher_only         0x01
+    }
+    set _keyusage_byte2 {
+        decipher_only         0x80
+    }
+} {}
+
+proc twapi::_make_basic_constraints_ext {basicconstraints {critical 1}} {
+    lassign $basicconstraints isca capathlenvalid capathlen
+    if {[string is boolean $isca] && [string is boolean $capathlenvalid] &&
+        [string is integer -strict $capathlen] && $capathlen >= 0} {
+        return [list "2.5.29.19" $critical [list $isca $capathlenvalid $capathlen]]
+    }
+    error "Invalid basicconstraints value"
+}
+
+proc twapi::_make_keyusage_ext {keyusage {critical 0}} {
+    variable _keyusage_byte1
+    variable _keyusage_byte2
+
+    _init_keyusage_names
+    set byte1 0
+    set byte2 0
+    foreach usage $keyusage {
+        if {[dict exists $_keyusage_byte1 $usage]} {
+            set byte1 [expr {$byte1 | [dict get $_keyusage_byte1 $usage]}]
+        } elseif {[dict exists $_keyusage_byte2 $usage]} {
+            set byte2 [expr {$byte2 | [dict get $_keyusage_byte2 $usage]}]
+        } else {
+            error "Invalid key usage value \"$keyusage\""
+        }
+    }
+
+    set bin [binary format cc $byte1 $byte2]
+    # 7 -> # unused bits in last byte
+    return [list "2.5.29.15" $critical [list $bin 7]]
+}
+
+# Given a byte array, decode to key usage flags
+proc twapi::_cert_decode_keyusage {bin} {
+    variable _keyusage_byte1
+    variable _keyusage_byte2
+    
+    _init_keyusage_names
+
+    binary scan $bin c* bytes
+
+    if {[llength $bytes] == 0} {
+        return *;               # Field not present, TBD
+    }
+
+    set usages {}
+    set byte [lindex $bytes 0]
+    dict for {key val} $_keyusage_byte1 {
+        if {$byte & $val} {
+            lappend usages $key
+        }
+    } 
+
+    set byte [lindex $bytes 1]
+    dict for {key val} $_keyusage_byte2 {
+        if {$byte & $val} {
+            lappend usages $key
+            set byte [expr {$byte & ~$val}]
+        }
+    } 
+
+    if {0} {
+        # Commented out because some certificates seem to contain
+        # bits not defined by RF5280. Do not barf on these
+
+        # For the second byte, not all bits are defined. Error if any
+        # that we do not understand
+        if {$byte} {
+            error "Key usage sequence $bytes includes unsupported bits"
+        }
+
+        # If there are more bytes, they should all be 0 as well
+        foreach byte [lrange $bytes 2 end] {
+            if {$byte} {
+                error "Key usage sequence $bytes includes unsupported bits"
+            }
+        }
+    }
+
+    return $usages
+}
+
+proc twapi::_cert_decode_enhkey {vals} {
+    set result {}
+    set symmap [swapl [oids oid_pkix_kp_*]]
+    foreach val $vals {
+        if {[dict exists $symmap $val]} {
+            lappend result [string range [dict get $symmap $val] 12 end]
+        } else {
+            lappend result $val
+        }
+    }
+    return $result
+}
+
+proc twapi::_cert_decode_extension {oid val} {
+    # TBD - see what other types need to be decoded
+    # 2.5.29.19 - basic constraints
+    # 
+    switch $oid {
+        2.5.29.15 { return [_cert_decode_keyusage $val] }
+        2.5.29.37 { return [_cert_decode_enhkey $val] }
+        2.5.29.17 -
+        2.5.29.18 {
+            # TBD - replace with lmap for 8.6
+            set names {}
+            foreach elem $val {
+                lappend names [list [dict* {
+                    1 other 2 email 3 dns 5 directory 7 url 8 ip 9 registered
+                } [lindex $elem 0]] [lindex $elem 1]]
+            }
+            return $names
+        }
+    }
+    return $val
+}
+
+proc twapi::_crypt_keyspec {keyspec} {
+    return [dict* {keyexchange 1 signature 2} $keyspec]
+}
+
+proc twapi::_cert_create_parse_options {optvals optsvar} {
+    upvar 1 $optsvar opts
+
+    # TBD - add -issueraltnames
+    parseargs optvals {
+        start.arg
+        end.arg
+        serialnumber.arg
+        altnames.arg
+        enhkeyusage.arg
+        keyusage.arg
+        basicconstraints.arg
+        {purpose.arg {}}
+        {capathlen.int -1}
+    } -ignoreunknown -setvars
+
+    set ca [expr {"ca" in $purpose}]
+    if {$ca} {
+        if {[info exists basicconstraints]} {
+            badargs! "Option -basicconstraints cannot be specified if \"ca\" is included in the -purpose option"
+        }
+        if {$capathlen < 0} {
+            set basicconstraints {{1 0 0} 1};  # No path length constraint
+        } else {
+            set basicconstraints [list [list 1 1 $capathlen] 1]
+        }
+    } else {
+        if {![info exists basicconstraints]} {
+            set basicconstraints {{0 0 0} 1}
+        }
+    }
+    set sslserver [expr {"server" in $purpose}]
+    set sslclient [expr {"client" in $purpose}]
+
+    if {[info exists serialnumber]} {
+        if {$serialnumber <= 0 || $serialnumber > 0x7fffffffffffffff} {
+            badargs! "Serial number must be specified as a positive wide integer."
+        }
+        # Format as little endian
+        set opts(serialnumber) [binary format w $serialnumber]
+    } else {
+        # Generate 15 byte random and add high byte (little endian)
+        # to 0x01 to ensure it is treated as positive
+        set opts(serialnumber) "[random_bytes 15]\x01"
+    }
+    
+    # Validity period
+    if {[info exists start]} {
+        set opts(start) $start
+    } else {
+        set opts(start) [_seconds_to_timelist [clock seconds] 1]
+    }
+    if {[info exists end]} {
+        set opts(end) $end
+    } else {
+        set opts(end) $opts(start)
+        lset opts(end) 0 [expr {[lindex $opts(end) 0] + 1}]
+        # Ensure valid date (Feb 29 leap year -> non-leap year for example)
+        set opts(end) [clock format [clock scan [lrange $opts(end) 0 2] -format "%Y %N %e"] -format "%Y %N %e"]
+        lappend opts(end) 23 59 59 0
+    }
+
+    # Generate the extensions list
+    set exts {}
+    lappend exts [_make_basic_constraints_ext {*}$basicconstraints ]
+    if {$ca} {
+        lappend extra_keyusage key_cert_sign crl_sign
+    }
+    if {$sslserver || $sslclient} {
+        # TBD - not clear key_agreement is needed for SSL certs for
+        # either client or server. See
+        # https://access.redhat.com/documentation/en-us/red_hat_certificate_system/10/html/administration_guide/standard_x.509_v3_certificate_extensions
+        lappend extra_keyusage digital_signature key_encipherment key_agreement
+        if {$sslserver} { 
+           lappend extra_enhkeyusage oid_pkix_kp_server_auth
+        }
+        if {$sslclient} {
+            lappend extra_enhkeyusage oid_pkix_kp_client_auth
+        }
+    }
+
+    if {[info exists extra_keyusage]} {
+        if {[info exists keyusage]} {
+            # TBD - should it be marked critical or not ?
+            lset keyusage 0 [concat [lindex $keyusage 0] $extra_keyusage]
+        } else {
+            # TBD - should it be marked critical or not ?
+            set keyusage [list $extra_keyusage 1]
+        }
+    }
+
+    if {[info exists keyusage]} {
+        lappend exts [_make_keyusage_ext {*}$keyusage]
+    }
+
+    if {[info exists extra_enhkeyusage]} {
+        if {[info exists enhkeyusage]} {
+            # TBD - should it be marked critical or not ?
+            lset enhkeyusage 0 [concat [lindex $enhkeyusage 0] $extra_enhkeyusage]
+        } else {
+            # TBD - should it be marked critical or not ?
+            set enhkeyusage [list $extra_enhkeyusage 1]
+        }
+    }
+    if {[info exists enhkeyusage]} {
+        lappend exts [_make_enhkeyusage_ext {*}$enhkeyusage]
+    }
+
+    if {[info exists altnames]} {
+        lappend exts [_make_altnames_ext {*}$altnames]
+    }
+
+    set opts(extensions) $exts
+
+    return $optvals
+}
+
+proc twapi::_cert_add_parseargs {vargs} {
+    upvar 1 $vargs optvals
+    parseargs optvals {
+        {disposition.arg preserve {overwrite duplicate update preserve}}
+    } -maxleftover 0 -setvars
+
+    # 4 -> CERT_STORE_ADD_ALWAYS
+    # 3 -> CERT_STORE_ADD_REPLACE_EXISTING
+    # 6 -> CERT_STORE_ADD_NEWER
+    # 1 -> CERT_STORE_ADD_NEW
+
+    return [list disposition \
+                [dict get {
+                    duplicate 4
+                    overwrite 3
+                    update 6
+                    preserve 1
+                } $disposition]]
+}
+
+proc twapi::_parse_store_open_opts {optvals} {
+    array set opts [parseargs optvals  {
+        {commitenable.bool    0 0x00010000}
+        {readonly.bool        0 0x00008000}
+        {existing.bool        0 0x00004000}
+        {create.bool          0 0x00002000}
+        {includearchived.bool 0 0x00000200}
+        {maxpermissions.bool  0 0x00001000}
+        {deferclose.bool      0 0x00000004}
+        {backupprivilege.bool 0 0x00000800}
+    } -maxleftover 0 -nulldefault]
+
+    set flags 0
+    foreach {opt val} [array get opts] {
+        incr flags $val
+    }
+    return $flags
+}
+
+# Helper to return as der/pem based on encoding option
+proc twapi::_as_pem_or_der {bin tag encoding} {
+    if {$encoding eq "pem"} {
+        # 1 -> CRYPT_STRING_BASE64
+        # 0x80000000 -> LF-only, not CRLF
+        return "-----BEGIN $tag-----\n[CryptBinaryToString $bin 0x80000001]-----END $tag-----\n"
+    } else {
+        return $bin
+    }
+}
+
+# Helper for converting input parameters if they are in PEM format
+# pem_or_der is the data
+# enc specifies the type of pem_or_der. If empty, we guess.
+# pemtype should generally be
+# 0 -> CRYPT_STRING_BASE64HEADER for certificates
+# 1 -> CRYPT_STRING_BASE64 (no header)
+# 3 -> CRYPT_STRING_BASE64REQUESTHEADER
+# 6 -> CRYPT_STRING_BASE64_ANY (actually same as 0 or 1)
+proc twapi::_pem_decode {pem_or_der enc {pemtype 6}} {
+    if {$enc eq "der"} {
+        return $pem_or_der
+    }
+    if {$enc eq "pem" || 
+        [regexp -nocase {^\s*-----\s*BEGIN\s+} $pem_or_der]} {
+        return [CryptStringToBinary $pem_or_der $pemtype]
+    }
+    return $pem_or_der
+}
+
+proc twapi::_is_pem {pem_or_der} {
+    return [regexp -nocase {^\s*-----\s*BEGIN\s+} $pem_or_der]
+}
+
+# Utility proc to generate certs in a memory store - 
+# one self signed which is used to sign a client and a server cert
+proc twapi::make_test_certs {{hstore {}} args} {
+    crypt_test_container_cleanup
+
+    parseargs args {
+        {csp.arg {Microsoft Strong Cryptographic Provider}}
+        {csptype.arg prov_rsa_full}
+        unique
+        {duration.int 5}
+    } -maxleftover 0 -setvars
+
+    set enddate [clock format [clock seconds] -format "%Y %N %e"]
+    lset enddate 0 [expr {[lindex $enddate 0]+$duration}]
+    # Ensure valid date e.g. Feb 29 non-leap year
+    set enddate [clock format [clock scan $enddate -format "%Y %N %e"] -format "%Y %N %e"]
+
+    if {$unique} {
+        set uuid [twapi::new_uuid]
+    } else {
+        set uuid ""
+    }
+
+    # Create the self signed CA cert
+    set container twapitestca$uuid
+    set crypt [twapi::crypt_acquire $container -csp $csp -csptype $csptype -create 1]
+    twapi::crypt_key_free [twapi::crypt_generate_key $crypt signature -exportable 1]
+    set ca_altnames [list [list [list email ${container}@twapitest.com] [list dns ${container}.twapitest.com] [list url http://${container}.twapitest.com] [list directory [cert_name_to_blob "CN=${container}altname"]] [list ip [binary format c4 {127 0 0 2}]]]]
+    set cert [twapi::cert_create_self_signed_from_crypt_context "CN=$container, C=IN, O=Tcl, OU=twapi" $crypt -purpose {ca} -altnames $ca_altnames -end $enddate]
+    if {[llength $hstore] == 0} {
+        set hstore [twapi::cert_temporary_store]
+    }
+    set ca_certificate [twapi::cert_store_add_certificate $hstore $cert]
+    twapi::cert_release $cert
+    twapi::cert_set_key_prov $ca_certificate $container signature -csp $csp -csptype $csptype
+    crypt_free $crypt
+
+    # Create the client and server certs
+    foreach cert_type {intermediate server client altserver full min} {
+        set container twapitest${cert_type}$uuid
+        set subject $container
+        set crypt [twapi::crypt_acquire $container -csp $csp -csptype $csptype -create 1]
+        twapi::crypt_key_free [twapi::crypt_generate_key $crypt keyexchange -exportable 1]
+        switch $cert_type {
+            intermediate {
+                set req [cert_request_create "CN=$container, C=IN, O=Tcl, OU=twapi" $crypt keyexchange -purpose ca]
+                set signing_cert $ca_certificate
+            }
+            altserver {
+                # No COMMON name. Used for testing use of DNS altname
+                set altnames [list [list [list dns ${cert_type}.twapitest.com] [list dns ${cert_type}2.twapitest.com]]]
+                set req [cert_request_create "C=IN, O=Tcl, OU=twapi, OU=$container" $crypt keyexchange -purpose $cert_type -altnames $altnames]
+                set signing_cert $ca_certificate
+            }
+            client -
+            server {
+                set req [cert_request_create "CN=$container, C=IN, O=Tcl, OU=twapi" $crypt keyexchange -purpose $cert_type]
+                set signing_cert $intermediate_certificate
+            }
+            full {
+                set altnames [list [list [list email ${container}@twapitest.com] [list dns ${cert_type}.twapitest.com] [list url http://${container}.twapitest.com] [list directory [cert_name_to_blob "CN=${container}altname"]] [list ip [binary format c4 {127 0 0 1}]]]]
+                set req [cert_request_create \
+                             "CN=$container, C=IN, O=Tcl, OU=twapi" \
+                             $crypt keyexchange \
+                             -keyusage [list {crl_sign data_encipherment digital_signature key_agreement key_cert_sign key_encipherment non_repudiation} 1]\
+                             -enhkeyusage [list {client_auth code_signing email_protection ipsec_end_system  ipsec_tunnel ipsec_user server_auth timestamp_signing ocsp_signing} 1] \
+                             -altnames $altnames]
+                set signing_cert $ca_certificate
+            }
+            min {
+                set req [cert_request_create "CN=$container" $crypt keyexchange]
+                set signing_cert $ca_certificate
+            }
+        }
+        crypt_free $crypt
+        set parsed_req [cert_request_parse $req]
+        set subject [dict get $parsed_req subject]
+        set pubkey [dict get $parsed_req pubkey]
+        set opts {}
+        foreach optname {-basicconstraints -keyusage -enhkeyusage -altnames} {
+            if {[dict exists $parsed_req extensions $optname]} {
+                lappend opts $optname [dict get $parsed_req extensions $optname]
+            }
+        }
+        set encoded_cert [cert_create $subject $pubkey $signing_cert {*}$opts -end $enddate]
+        set certificate [twapi::cert_store_add_encoded_certificate $hstore $encoded_cert]
+        twapi::cert_set_key_prov $certificate $container keyexchange -csp $csp -csptype $csptype
+        if {$cert_type eq "intermediate"} {
+            set intermediate_certificate $certificate
+        } else {
+            cert_release $certificate
+        }
+    }
+
+    cert_release $ca_certificate
+    cert_release $intermediate_certificate
+    return $hstore
+}
+
+proc twapi::dump_test_certs {hstore dir {pfxfile twapitest.pfx}} {
+    set fd [open [file join $dir $pfxfile] wb]
+    puts -nonewline $fd [cert_store_export_pfx $hstore "" -exportprivatekeys 1]
+    close $fd
+    cert_store_iterate $hstore c {
+        set fd [open [file join $dir [cert_subject_name $c -name simpledisplay].cer] wb]
+        puts -nonewline $fd [cert_export $c]
+        close $fd
+    }
+}
+
+proc twapi::crypt_test_containers {} {
+    set crypt [crypt_acquire "" -verifycontext 1]
+    twapi::trap {
+        set names {}
+        foreach name [crypt_key_container_names $crypt] {
+            if {[string match -nocase twapitest* $name]} {
+                lappend names $name
+            }
+        }
+    } finally {
+        crypt_free $crypt
+    }
+    return $names
+}
+
+proc twapi::crypt_test_container_cleanup {} {
+    foreach c [crypt_test_containers] {
+        crypt_key_container_delete $c
+    }
+}
+
+
+# If we are not being sourced from a executable resource, need to
+# source the remaining support files. In the former case, they are
+# automatically combined into one so the sourcing is not needed.
+if {![info exists twapi::twapi_crypto_rc_sourced]} {
+    source [file join [file dirname [info script]] sspi.tcl]
+    source [file join [file dirname [info script]] tls.tcl]
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/device.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/device.tcl
new file mode 100644
index 00000000..3daf681e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/device.tcl
@@ -0,0 +1,624 @@
+#
+# Copyright (c) 2008-2014 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {
+    struct _PREVENT_MEDIA_REMOVAL {
+            BOOLEAN PreventMediaRemoval;
+    }
+    record device_element { class_guid device_instance reserved }
+}
+
+interp alias {} close_devinfoset {} devinfoset_close
+
+proc twapi::rescan_devices {} {
+    CM_Reenumerate_DevNode_Ex [CM_Locate_DevNode_Ex "" 0] 0
+}
+
+
+# Callback invoked for device changes.
+# Does some processing of passed data and then invokes the
+# real callback script
+proc twapi::_device_notification_handler {id args} {
+    variable _device_notifiers
+    set idstr "devnotifier#$id"
+    if {![info exists _device_notifiers($idstr)]} {
+        # Notifications that expect a response default to "true"
+        return 1
+    }
+    set script [lindex $_device_notifiers($idstr) 1]
+
+    # For volume notifications, change drive bitmask to
+    # list of drives before passing back to script
+    set event [lindex $args 0]
+    if {[lindex $args 1] eq "volume" &&
+        ($event eq "deviceremovecomplete" || $event eq "devicearrival")} {
+        lset args 2 [_drivemask_to_drivelist [lindex $args 2]]
+
+        # Also indicate whether network volume and whether change is a media
+        # change or physical change
+        set attrs [list ]
+        set flags [lindex $args 3]
+        if {$flags & 1} {
+            lappend attrs mediachange
+        }
+        if {$flags & 2} {
+            lappend attrs networkvolume
+        }
+        lset args 3 $attrs
+    }
+
+    return [uplevel #0 [linsert $script end $idstr {*}$args]]
+}
+
+proc twapi::start_device_notifier {script args} {
+    variable _device_notifiers
+
+    set script [lrange $script 0 end]; # Verify syntactically a list
+
+    array set opts [parseargs args {
+        deviceinterface.arg
+        handle.arg
+    } -maxleftover 0]
+
+    # For reference - some common device interface classes
+    # NOTE: NOT ALL HAVE BEEN VERIFIED!
+    # Network Card      {ad498944-762f-11d0-8dcb-00c04fc3358c}
+    # Human Interface Device (HID)      {4d1e55b2-f16f-11cf-88cb-001111000030}
+    # GUID_DEVINTERFACE_DISK          - {53f56307-b6bf-11d0-94f2-00a0c91efb8b}
+    # GUID_DEVINTERFACE_CDROM         - {53f56308-b6bf-11d0-94f2-00a0c91efb8b}
+    # GUID_DEVINTERFACE_PARTITION     - {53f5630a-b6bf-11d0-94f2-00a0c91efb8b}
+    # GUID_DEVINTERFACE_TAPE          - {53f5630b-b6bf-11d0-94f2-00a0c91efb8b}
+    # GUID_DEVINTERFACE_WRITEONCEDISK - {53f5630c-b6bf-11d0-94f2-00a0c91efb8b}
+    # GUID_DEVINTERFACE_VOLUME        - {53f5630d-b6bf-11d0-94f2-00a0c91efb8b}
+    # GUID_DEVINTERFACE_MEDIUMCHANGER - {53f56310-b6bf-11d0-94f2-00a0c91efb8b}
+    # GUID_DEVINTERFACE_FLOPPY        - {53f56311-b6bf-11d0-94f2-00a0c91efb8b}
+    # GUID_DEVINTERFACE_CDCHANGER     - {53f56312-b6bf-11d0-94f2-00a0c91efb8b}
+    # GUID_DEVINTERFACE_STORAGEPORT   - {2accfe60-c130-11d2-b082-00a0c91efb8b}
+    # GUID_DEVINTERFACE_KEYBOARD      - {884b96c3-56ef-11d1-bc8c-00a0c91405dd}
+    # GUID_DEVINTERFACE_MOUSE         - {378de44c-56ef-11d1-bc8c-00a0c91405dd}
+    # GUID_DEVINTERFACE_PARALLEL      - {97F76EF0-F883-11D0-AF1F-0000F800845C}
+    # GUID_DEVINTERFACE_COMPORT       - {86e0d1e0-8089-11d0-9ce4-08003e301f73}
+    # GUID_DEVINTERFACE_DISPLAY_ADAPTER - {5b45201d-f2f2-4f3b-85bb-30ff1f953599}
+    # GUID_DEVINTERFACE_USB_HUB       - {f18a0e88-c30c-11d0-8815-00a0c906bed8}
+    # GUID_DEVINTERFACE_USB_DEVICE    - {A5DCBF10-6530-11D2-901F-00C04FB951ED}
+    # GUID_DEVINTERFACE_USB_HOST_CONTROLLER - {3abf6f2d-71c4-462a-8a92-1e6861e6af27}
+
+
+    if {[info exists opts(deviceinterface)] && [info exists opts(handle)]} {
+        error "Options -deviceinterface and -handle are mutually exclusive."
+    }
+
+    if {![info exists opts(deviceinterface)]} {
+        set opts(deviceinterface) ""
+    }
+    if {[info exists opts(handle)]} {
+        set type 6
+    } else {
+        set opts(handle) NULL
+        switch -exact -- $opts(deviceinterface) {
+            port            { set type 3 ; set opts(deviceinterface) "" }
+            volume          { set type 2 ; set opts(deviceinterface) "" }
+            default {
+                # device interface class guid or empty string (for all device interfaces)
+                set type 5
+            }
+        }
+    }
+
+    set id [Twapi_RegisterDeviceNotification $type $opts(deviceinterface) $opts(handle)]
+    set idstr "devnotifier#$id"
+
+    set _device_notifiers($idstr) [list $id $script]
+    return $idstr
+}
+
+proc twapi::stop_device_notifier {idstr} {
+    variable _device_notifiers
+
+    if {![info exists _device_notifiers($idstr)]} {
+        return;
+    }
+
+    Twapi_UnregisterDeviceNotification [lindex $_device_notifiers($idstr) 0]
+    unset _device_notifiers($idstr)
+}
+
+proc twapi::devinfoset {args} {
+    array set opts [parseargs args {
+        {guid.arg ""}
+        {classtype.arg setup {interface setup}}
+        {presentonly.bool false 0x2}
+        {currentprofileonly.bool false 0x8}
+        {deviceinfoset.arg NULL}
+        {hwin.int 0}
+        {system.arg ""}
+        {pnpenumerator.arg ""}
+    } -maxleftover 0]
+
+    # DIGCF_ALLCLASSES is bitmask 4
+    set flags [expr {$opts(guid) eq "" ? 0x4 : 0}]
+    if {$opts(classtype) eq "interface"} {
+        if {$opts(pnpenumerator) ne ""} {
+            error "The -pnpenumerator option cannot be used when -classtype interface is specified."
+        }
+        # DIGCF_DEVICEINTERFACE
+        set flags [expr {$flags | 0x10}]
+    }
+
+    # DIGCF_PRESENT
+    set flags [expr {$flags | $opts(presentonly)}]
+
+    # DIGCF_PRESENT
+    set flags [expr {$flags | $opts(currentprofileonly)}]
+
+    return [SetupDiGetClassDevsEx \
+                $opts(guid) \
+                $opts(pnpenumerator) \
+                $opts(hwin) \
+                $flags \
+                $opts(deviceinfoset) \
+                $opts(system)]
+}
+
+
+# Given a device information set, returns the device elements within it
+proc twapi::devinfoset_elements {hdevinfo} {
+    set result [list ]
+    set i 0
+    trap {
+        while {true} {
+            lappend result [SetupDiEnumDeviceInfo $hdevinfo $i]
+            incr i
+        }
+    } onerror {TWAPI_WIN32 0x103} {
+        # Fine, Just means no more items
+    } onerror {TWAPI_WIN32 0x80070103} {
+        # Fine, Just means no more items (HRESULT version of above code)
+    }
+
+    return $result
+}
+
+# Given a device information set, returns the device elements within it
+proc twapi::devinfoset_instance_ids {hdevinfo} {
+    set result [list ]
+    set i 0
+    trap {
+        while {true} {
+            lappend result [device_element_instance_id $hdevinfo [SetupDiEnumDeviceInfo $hdevinfo $i]]
+            incr i
+        }
+    } onerror {TWAPI_WIN32 0x103} {
+        # Fine, Just means no more items
+    } onerror {TWAPI_WIN32 0x80070103} {
+        # Fine, Just means no more items (HRESULT version of above code)
+    }
+
+    return $result
+}
+
+# Returns a device instance element from a devinfoset
+proc twapi::devinfoset_element {hdevinfo instance_id} {
+    return [SetupDiOpenDeviceInfo $hdevinfo $instance_id 0 0]
+}
+
+# Get the registry property for a devinfoset element
+proc twapi::devinfoset_element_registry_property {hdevinfo develem prop} {
+    Twapi_SetupDiGetDeviceRegistryProperty $hdevinfo $develem [_device_registry_sym_to_code $prop]
+}
+
+# Given a device information set, returns a list of specified registry
+# properties for all elements of the set
+# args is list of properties to retrieve
+proc twapi::devinfoset_registry_properties {hdevinfo args} {
+    set result [list ]
+    trap {
+        # Keep looping until there is an error saying no more items
+        set i 0
+        while {true} {
+
+            # First element is the DEVINFO_DATA element
+            set devinfo_data [SetupDiEnumDeviceInfo $hdevinfo $i]
+            set item [list -deviceelement $devinfo_data ]
+
+            # Get all specified property values
+            foreach prop $args {
+                set intprop [_device_registry_sym_to_code $prop]
+                trap {
+                    lappend item $prop \
+                        [list success \
+                             [Twapi_SetupDiGetDeviceRegistryProperty \
+                                  $hdevinfo $devinfo_data $intprop]]
+                } onerror {} {
+                    lappend item $prop [list fail [list [trapresult] $::errorCode]]
+                }
+            }
+            lappend result $item
+
+            incr i
+        }
+    } onerror {TWAPI_WIN32 0x103} {
+        # Fine, Just means no more items
+    } onerror {TWAPI_WIN32 0x80070103} {
+        # Fine, Just means no more items (HRESULT version of above code)
+    }
+
+    return $result
+}
+
+
+# Given a device information set, returns specified device interface
+# properties
+# TBD - document ?
+proc twapi::devinfoset_interface_details {hdevinfo guid args} {
+    set result [list ]
+
+    array set opts [parseargs args {
+        {matchdeviceelement.arg {}}
+        interfaceclass
+        flags
+        devicepath
+        deviceelement
+        ignoreerrors
+    } -maxleftover 0]
+
+    trap {
+        # Keep looping until there is an error saying no more items
+        set i 0
+        while {true} {
+            set interface_data [SetupDiEnumDeviceInterfaces $hdevinfo \
+                                    $opts(matchdeviceelement) $guid $i]
+            set item [list ]
+            if {$opts(interfaceclass)} {
+                lappend item -interfaceclass [lindex $interface_data 0]
+            }
+            if {$opts(flags)} {
+                set flags    [lindex $interface_data 1]
+                set symflags [_make_symbolic_bitmask $flags {active 1 default 2 removed 4} false]
+                lappend item -flags [linsert $symflags 0 $flags]
+            }
+
+            if {$opts(devicepath) || $opts(deviceelement)} {
+                # Need to get device interface detail.
+                trap {
+                    foreach {devicepath deviceelement} \
+                        [SetupDiGetDeviceInterfaceDetail \
+                             $hdevinfo \
+                             $interface_data \
+                             $opts(matchdeviceelement)] \
+                        break
+
+                    if {$opts(deviceelement)} {
+                        lappend item -deviceelement $deviceelement
+                    }
+                    if {$opts(devicepath)} {
+                        lappend item -devicepath $devicepath
+                    }
+                } onerror {} {
+                    if {! $opts(ignoreerrors)} {
+                        rethrow
+                    }
+                }
+            }
+            lappend result $item
+
+            incr i
+        }
+    } onerror {TWAPI_WIN32 0x103} {
+        # Fine, Just means no more items
+    } onerror {TWAPI_WIN32 0x80070103} {
+        # Fine, Just means no more items (HRESULT version of above code)
+    }
+
+    return $result
+}
+
+
+# Return the guids associated with a device class set name. Note
+# the latter is not unique so multiple guids may be associated.
+proc twapi::device_setup_class_name_to_guids {name args} {
+    array set opts [parseargs args {
+        system.arg
+    } -maxleftover 0 -nulldefault]
+
+    return [twapi::SetupDiClassGuidsFromNameEx $name $opts(system)]
+}
+
+# Utility functions
+
+proc twapi::_init_device_registry_code_maps {} {
+    variable _device_registry_syms
+    variable _device_registry_codes
+
+    # Note this list is ordered based on the corresponding integer codes
+    set _device_registry_code_syms {
+        devicedesc hardwareid compatibleids unused0 service unused1
+        unused2 class classguid driver configflags mfg friendlyname
+        location_information physical_device_object_name capabilities
+        ui_number upperfilters lowerfilters
+        bustypeguid legacybustype busnumber enumerator_name security
+        security_sds devtype exclusive characteristics address
+        ui_number_desc_format device_power_data
+        removal_policy removal_policy_hw_default removal_policy_override
+        install_state location_paths base_containerid
+    }
+
+    set i 0
+    foreach sym $_device_registry_code_syms {
+        set _device_registry_codes($sym) $i
+        incr i
+    }
+}
+
+# Map a device registry property to a symbol
+proc twapi::_device_registry_code_to_sym {code} {
+    _init_device_registry_code_maps
+
+    # Once we have initialized, redefine ourselves so we do not do so
+    # every time. Note define at global ::twapi scope!
+    proc ::twapi::_device_registry_code_to_sym {code} {
+        variable _device_registry_code_syms
+        if {$code >= [llength $_device_registry_code_syms]} {
+            return $code
+        } else {
+            return [lindex $_device_registry_code_syms $code]
+        }
+    }
+    # Call the redefined proc
+    return [_device_registry_code_to_sym $code]
+}
+
+# Map a device registry property symbol to a numeric code
+proc twapi::_device_registry_sym_to_code {sym} {
+    _init_device_registry_code_maps
+
+    # Once we have initialized, redefine ourselves so we do not do so
+    # every time. Note define at global ::twapi scope!
+    proc ::twapi::_device_registry_sym_to_code {sym} {
+        variable _device_registry_codes
+        # Return the value. If non-existent, an error will be raised
+        if {[info exists _device_registry_codes($sym)]} {
+            return $_device_registry_codes($sym)
+        } elseif {[string is integer -strict $sym]} {
+            return $sym
+        } else {
+            error "Unknown or unsupported device registry property symbol '$sym'"
+        }
+    }
+    # Call the redefined proc
+    return [_device_registry_sym_to_code $sym]
+}
+
+# Do a device ioctl, returning result as a binary
+# TBD - document that caller has to handle errors 122 (ERROR_INSUFFICIENT_BUFFER) and (ERROR_MORE_DATA)
+proc twapi::device_ioctl {h code args} {
+    array set opts [parseargs args {
+        {input.arg {}}
+        {outputcount.int 0}
+    } -maxleftover 0]
+
+    return [DeviceIoControl $h $code $opts(input) $opts(outputcount)]
+}
+
+
+# Return a list of physical disks. Note CD-ROMs and floppies not included
+proc twapi::find_physical_disks {} {
+    # Disk interface class guid
+    set guid {{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}}
+    set hdevinfo [devinfoset \
+                      -guid $guid \
+                      -presentonly true \
+                      -classtype interface]
+    trap {
+        return [kl_flatten [devinfoset_interface_details $hdevinfo $guid -devicepath] -devicepath]
+    } finally {
+        devinfoset_close $hdevinfo
+    }
+}
+
+# Return information about a physical disk
+proc twapi::get_physical_disk_info {disk args} {
+    set result [list ]
+
+    array set opts [parseargs args {
+        geometry
+        layout
+        all
+    } -maxleftover 0]
+
+    if {$opts(all) || $opts(geometry) || $opts(layout)} {
+        set h [create_file $disk -createdisposition open_existing]
+    }
+
+    trap {
+        if {$opts(all) || $opts(geometry)} {
+            # IOCTL_DISK_GET_DRIVE_GEOMETRY - 0x70000
+            if {[binary scan [device_ioctl $h 0x70000 -outputcount 24] "wiiii" geom(-cylinders) geom(-mediatype) geom(-trackspercylinder) geom(-sectorspertrack) geom(-bytespersector)] != 5} {
+                error "DeviceIoControl 0x70000 on disk '$disk' returned insufficient data."
+            }
+            lappend result -geometry [array get geom]
+        }
+
+        if {$opts(all) || $opts(layout)} {
+            # XP and later - IOCTL_DISK_GET_DRIVE_LAYOUT_EX
+            set data [device_ioctl $h 0x70050 -outputcount 624]
+            if {[binary scan $data "i i" partstyle layout(-partitioncount)] != 2} {
+                error "DeviceIoControl 0x70050 on disk '$disk' returned insufficient data."
+            }
+            set layout(-partitionstyle) [_partition_style_sym $partstyle]
+            switch -exact -- $layout(-partitionstyle) {
+                mbr {
+                    if {[binary scan $data "@8 i" layout(-signature)] != 1} {
+                        error "DeviceIoControl 0x70050 on disk '$disk' returned insufficient data."
+                    }
+                }
+                gpt {
+                    set pi(-diskid) [_binary_to_guid $data 32]
+                    if {[binary scan $data "@8 w w i" layout(-startingusableoffset) layout(-usablelength) layout(-maxpartitioncount)] != 3} {
+                        error "DeviceIoControl 0x70050 on disk '$disk' returned insufficient data."
+                    }
+                }
+                raw -
+                unknown {
+                    # No fields to add
+                }
+            }
+
+            set layout(-partitions) [list ]
+            for {set i 0} {$i < $layout(-partitioncount)} {incr i} {
+                # Decode each partition in turn. Sizeof of PARTITION_INFORMATION_EX is 144
+                lappend layout(-partitions) [_decode_PARTITION_INFORMATION_EX_binary $data [expr {48 + (144*$i)}]]
+            }
+            lappend result -layout [array get layout]
+        }
+
+    } finally {
+        if {[info exists h]} {
+            CloseHandle $h
+        }
+    }
+
+    return $result
+}
+
+# Given a Tcl binary and offset, decode the PARTITION_INFORMATION_EX record
+proc twapi::_decode_PARTITION_INFORMATION_EX_binary {bin off} {
+    if {[binary scan $bin "@$off i x4 w w i c" \
+             pi(-partitionstyle) \
+             pi(-startingoffset) \
+             pi(-partitionlength) \
+             pi(-partitionnumber) \
+             pi(-rewritepartition)] != 5} {
+        error "Truncated partition structure."
+    }
+
+    set pi(-partitionstyle) [_partition_style_sym $pi(-partitionstyle)]
+
+    # MBR/GPT are at offset 32 in the structure
+    switch -exact -- $pi(-partitionstyle) {
+        mbr {
+            if {[binary scan $bin "@$off x32 c c c x i" pi(-partitiontype) pi(-bootindicator) pi(-recognizedpartition) pi(-hiddensectors)] != 4} {
+                error "Truncated partition structure."
+            }
+            # Show partition type in hex, not negative number
+            set pi(-partitiontype) [format 0x%2.2x [expr {0xff & $pi(-partitiontype)}]]
+        }
+        gpt {
+            set pi(-partitiontype) [_binary_to_guid $bin [expr {$off+32}]]
+            set pi(-partitionif)   [_binary_to_guid $bin [expr {$off+48}]]
+            if {[binary scan $bin "@$off x64 w" pi(-attributes)] != 1} {
+                error "Truncated partition structure."
+            }
+            set pi(-name) [_ucs16_binary_to_string [string range $bin [expr {$off+72}] end]]
+        }
+        raw -
+        unknown {
+            # No fields to add
+        }
+
+    }
+
+    return [array get pi]
+}
+
+#  IOCTL_STORAGE_EJECT_MEDIA
+interp alias {} twapi::eject {} twapi::eject_media
+proc twapi::eject_media device {
+    # http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q165721&
+    set h [_open_disk_device $device]
+    trap {
+        device_ioctl $h 0x90018; # FSCTL_LOCK_VOLUME
+        device_ioctl $h 0x90020; # FSCTL_DISMOUNT_VOLUME
+        #  IOCTL_STORAGE_MEDIA_REMOVAL (0)
+        device_ioctl $h 0x2d4804 -input [_PREVENT_MEDIA_REMOVAL 0]
+        device_ioctl $h 0x2d4808; # IOCTL_STORAGE_EJECT_MEDIA
+    } finally {
+        close_handle $h
+    }
+}
+
+# IOCTL_DISK_LOAD_MEDIA
+# TBD - should we use IOCTL_DISK_LOAD_MEDIA2 instead (0x2d080c) see
+# SDK, faster if read / write access not necessary. We are closing
+# the handle right away anyway but would that stop other apps from
+# acessing the file system on the CD ? Need to try (note device
+# has to be opened with FILE_READ_ATTRIBUTES only in that case)
+
+interp alias {} twapi::load_media {} twapi::_issue_disk_ioctl 0x2d480c
+
+#  FSCTL_LOCK_VOLUME
+# TBD - interp alias {} twapi::lock_volume {} twapi::_issue_disk_ioctl 0x90018
+#  FSCTL_LOCK_VOLUME
+# TBD - interp alias {} twapi::unlock_volume {} twapi::_issue_disk_ioctl 0x9001c
+
+proc twapi::_lock_media {lock device} {
+    # IOCTL_STORAGE_MEDIA_REMOVAL
+    _issue_disk_ioctl 0x2d4804 $device -input [_PREVENT_MEDIA_REMOVAL $lock]
+}
+interp alias {} twapi::lock_media {} twapi::_lock_media 1
+interp alias {} twapi::unlock_media {} twapi::_lock_media 0
+
+proc twapi::_issue_disk_ioctl {ioctl device args} {
+    set h [_open_disk_device $device]
+    trap {
+        device_ioctl $h $ioctl {*}$args
+    } finally {
+        close_handle $h
+    }
+}
+
+twapi::proc* twapi::_open_disk_device {device} {
+    package require twapi_storage
+} {
+    # device must be "cdrom", X:, X:\\, X:/, a volume or a physical disk as 
+    # returned from find_physical_disks
+    switch -regexp -nocase -- $device {
+        {^cdrom$} {
+            foreach drive [find_logical_drives] {
+                if {![catch {get_drive_type $drive} drive_type]} {
+                    if {$drive_type eq "cdrom"} {
+                        set device "\\\\.\\$drive"
+                        break
+                    }
+                }
+            }
+            if {$device eq "cdrom"} {
+                error "Could not find a CD-ROM device."
+            }
+        }
+        {^[[:alpha:]]:(/|\\)?$} { 
+            set device "\\\\.\\[string range $device 0 1]"
+        }
+        {^\\\\\?\\.*#\{[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}\}$} {
+            # Device name ok
+        }
+        {^\\\\\?\\Volume\{[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}\}\\?$} {
+            # Volume name ok. But make sure we trim off any trailing 
+            # \ since create_file will open the root dir instead of the device
+            set device [string trimright $device \\]
+        }
+        default {
+            # Just to prevent us from opening some file instead
+            error "Invalid device name '$device'"
+        }
+    }
+
+    # http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q165721&
+    return [create_file $device -access {generic_read generic_write} \
+                -createdisposition open_existing \
+                -share {read write}]
+}
+
+
+# Map a partition style code to a symbol
+proc twapi::_partition_style_sym {partstyle} {
+    set partstyle [lindex {mbr gpt raw} $partstyle]
+    if {$partstyle ne ""} {
+        return $partstyle
+    }
+    return "unknown"
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/etw.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/etw.tcl
new file mode 100644
index 00000000..df8d60a0
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/etw.tcl
@@ -0,0 +1,1390 @@
+#
+# Copyright (c) 2012-2014 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {
+    # GUID's and event types for ETW.
+    variable _etw_mof
+    array set _etw_mof {
+        provider_name "TwapiETWProvider"
+        provider_guid "{B358E9D9-4D82-4A82-A129-BAC098C54746}"
+        eventclass_name "TwapiETWEventClass"
+        eventclass_guid "{D5B52E95-8447-40C1-B316-539894449B36}"
+    }
+
+    # So we don't pollute namespace with temp vars
+    apply [list defs {
+        foreach {key val} $defs {
+            proc etw_twapi_$key {} "return $val"
+        }
+    } [namespace current]] [array get _etw_mof]
+
+    # Cache of event definitions for parsing MOF  events. Nested dictionary
+    # with the following structure (uppercase keys are variables,
+    # lower case are constant/tokens, "->" is nested dict, "-" is scalar):
+    #  EVENTCLASSGUID ->
+    #    classname - name of the class
+    #    definitions ->
+    #      VERSION ->
+    #        EVENTTYPE ->
+    #          eventtype - same as EVENTTYPE
+    #          eventtypename - name / description for the event type
+    #          fieldtypes - ordered list of field types for that event
+    #          fields ->
+    #            FIELDINDEX ->
+    #              type - the field type in string format
+    #              fieldtype - the corresponding field type numeric value
+    #              extension - the MoF extension qualifier for the field
+    #
+    # The cache assumes that MOF event definitions are globally identical
+    # (ie. same on local and remote systems)
+    variable _etw_event_defs
+    set _etw_event_defs [dict create]
+
+    # Keeps track of open trace handles for reading
+    variable _etw_trace_consumers
+    array set _etw_trace_consumers {}
+
+    # Keep track of trace controller handles. Note we do not always
+    # need a handle for controller actions. We can also control based
+    # on name, for example if some other process has started the trace
+    variable _etw_trace_controllers
+    array set _etw_trace_controllers {}
+
+    #
+    # These record definitions match the lists constructed in the ETW C code
+    # Note these are purposely formatted on single line so the record fieldnames
+    # print better.
+
+    # Buffer header (EVENT_TRACE_LOGFILE)
+    record etw_event_trace_logfile {logfile logger_name current_time buffers_read trace_logfile_header buffer_size filled kernel_trace}
+
+    # TRACE_LOGFILE_HEADER
+    record etw_trace_logfile_header {buffer_size version_major version_minor version_submajor version_subminor provider_version processor_count end_time timer_resolution max_file_size logfile_mode buffers_written pointer_size events_lost cpu_mhz time_zone boot_time perf_frequency start_time reserved_flags buffers_lost }
+
+    # TDH based event definitions
+
+    record tdh_event { header buffer_context extended_data data }
+
+    record tdh_event_header { flags event_property tid pid timestamp
+        kernel_time user_time processor_time activity_id descriptor provider_guid}
+    record tdh_event_buffer_context { processor logger_id }
+    record tdh_event_data {provider_guid event_guid decoder provider_name level_name channel_name keyword_names task_name opcode_name message localized_provider_name activity_id related_activity_id properties flags}
+
+    record tdh_event_data_descriptor {id version channel level opcode task keywords}
+
+    # Definitions for EVENT_TRACE_LOGFILE
+    record tdh_buffer { logfile logger current_time buffers_read header buffer_size filled kernel_trace }
+
+    record tdh_logfile_header { size major_version minor_version sub_version subminor_version provider_version processor_count end_time resolution max_file_size logfile_mode buffers_written pointer_size events_lost cpu_mhz timezone boot_time perf_frequency start_time reserved_flags buffers_lost }
+
+    # MOF based event definitions
+    record mof_event {header instance_id parent_instance_id parent_guid data}
+    record mof_event_header {type level version tid pid timestamp guid kernel_time user_time processor_time}
+
+    # Standard app visible event definitions. These are made
+    # compatible with the evt_* routines
+    record etw_event {-eventid -version -channel -level -opcode -task -keywordmask -timecreated -tid -pid -providerguid -usertime -kerneltime -providername -eventguid -channelname -levelname -opcodename -taskname -keywords -properties -message -sid}
+
+    # Record for EVENT_TRACE_PROPERTIES
+    # TBD - document
+    record etw_trace_properties {logfile trace_name trace_guid buffer_size min_buffers max_buffers max_file_size logfile_mode flush_timer enable_flags clock_resolution age_limit buffer_count free_buffers events_lost buffers_written log_buffers_lost real_time_buffers_lost logger_tid}
+}
+
+
+proc twapi::etw_get_traces {args} {
+    parseargs args {detail} -setvars -maxleftover 0
+    set sessions {}
+    foreach sess [QueryAllTraces] {
+        set name [etw_trace_properties trace_name $sess]
+        if {$detail} {
+            lappend sessions [etw_trace_properties $sess]
+        } else {
+            lappend sessions $name
+        }
+    }
+    return $sessions
+}
+
+if {[twapi::min_os_version 6]} {
+    proc twapi::etw_get_provider_guid {name} {
+        return [lindex [Twapi_TdhEnumerateProviders $name] 0]
+    }
+    proc twapi::etw_get_providers {args} {
+        parseargs args {
+            detail
+            {types.arg {mof xml}}
+        } -setvars -maxleftover 0
+        set providers {}
+        foreach rec [Twapi_TdhEnumerateProviders] {
+            lassign $rec guid type name
+            set type [dict* {0 xml 1 mof} $type]
+            if {$type in $types} {
+                if {$detail} {
+                    lappend providers [list guid $guid type $type name $name]
+                } else {
+                    lappend providers $name
+                }
+            }
+        }
+        return $providers
+    }
+} else {
+    twapi::proc* twapi::etw_get_provider_guid {lookup_name} {
+        package require twapi_wmi
+    } {
+        set wmi [wmi_root -root wmi]
+        set oclasses {}
+        set providers {}
+        # TBD - check if ExecQuery would be faster
+        trap {
+            # All providers are direct subclasses of the EventTrace class
+            set oclasses [wmi_collect_classes $wmi -ancestor EventTrace -shallow]
+            foreach ocls $oclasses {
+                set quals [$ocls Qualifiers_]
+                trap {
+                    set name [$quals -with {{Item Description}} -invoke Value 2 {}]
+                    if {[string equal -nocase $name $lookup_name]} {
+                        return [$quals -with {{Item Guid}} -invoke Value 2 {}]
+                    }
+                } finally {
+                    $quals -destroy
+                }
+            }
+        } finally {
+            foreach ocls $oclasses {$ocls -destroy}
+            $wmi -destroy
+        }
+        return ""
+    }
+
+    twapi::proc* twapi::etw_get_providers {args} {
+        package require twapi_wmi
+    } {
+        parseargs args { detail {types.arg {mof xml}} } -setvars -maxleftover 0
+        if {"mof" ni $types} {
+            return {};          # Older systems do not have xml based providers
+        }
+        set wmi [wmi_root -root wmi]
+        set oclasses {}
+        set providers {}
+        # TBD - check if ExecQuery would be faster
+        trap {
+            # All providers are direct subclasses of the EventTrace class
+            set oclasses [wmi_collect_classes $wmi -ancestor EventTrace -shallow]
+            foreach ocls $oclasses {
+                set quals [$ocls Qualifiers_]
+                trap {
+                    set name [$quals -with {{Item Description}} -invoke Value 2 {}]
+                    set guid [$quals -with {{Item Guid}} -invoke Value 2 {}]
+                    if {$detail} {
+                        lappend providers [list guid $guid type mof name $name]
+                    } else {
+                        lappend providers $name
+                    }
+                } finally {
+                    $quals -destroy
+                }
+            }
+        } finally {
+            foreach ocls $oclasses {$ocls -destroy}
+            $wmi -destroy
+        }
+        return $providers
+    }
+}
+
+twapi::proc* twapi::etw_install_twapi_mof {} {
+    package require twapi_wmi
+} {
+    variable _etw_mof
+    
+    # MOF definition for our ETW trace event. This is loaded into
+    # the system WMI registry so event readers can decode our events
+    #
+    # Note all strings are NullTerminated and not Counted so embedded nulls
+    # will not be handled correctly. The problem with using Counted strings
+    # is that the MSDN docs are inconsistent as to whether the count
+    # is number of *bytes* or number of *characters* and the existing tools
+    # are similarly confused. We avoid this by choosing null terminated
+    # strings despite the embedded nulls drawback.
+    # TBD - revisit this and see if counted can always be treated as
+    # bytes and not characters.
+
+    # We do not want the pure binary builds think #pragma is a comment
+    # and remove the line! Bug 170
+    #createtmfile-disable-compaction
+    set mof_template {
+        #pragma namespace("\\\\.\\root\\wmi")
+
+        // Keep Description same as provider_name as that is how
+        // TDH library identifies it. Else there will be a mismatch
+        // between TdhEnumerateProviders and how we internally assume is
+        // the provider name
+        [dynamic: ToInstance, Description("@provider_name"),
+         Guid("@provider_guid")]
+        class @provider_name : EventTrace
+        {
+        };
+
+        [dynamic: ToInstance, Description("TWAPI ETW event class"): Amended,
+         Guid("@eventclass_guid")]
+        class @eventclass_name : @provider_name
+        {
+        };
+
+        // NOTE: The EventTypeName is REQUIRED else the MS LogParser app
+        // crashes (even though it should not)
+
+        [dynamic: ToInstance, Description("TWAPI log message"): Amended,
+         EventType(1), EventTypeName("Message")]
+        class @eventclass_name_Message : @eventclass_name
+        {
+            [WmiDataId(1), Description("Log message"): Amended, read, StringTermination("NullTerminated"), Format("w")] string Message;
+        };
+
+        [dynamic: ToInstance, Description("TWAPI variable trace"): Amended,
+         EventType(2), EventTypeName("VariableTrace")]
+        class @eventclass_name_VariableTrace : @eventclass_name
+        {
+            [WmiDataId(1), Description("Operation"): Amended, read, StringTermination("NullTerminated"), Format("w")] string Operation;
+            [WmiDataId(2), Description("Variable name"): Amended, read, StringTermination("NullTerminated"), Format("w")] string Name;
+            [WmiDataId(3), Description("Array index"): Amended, read, StringTermination("NullTerminated"), Format("w")] string Index;
+            [WmiDataId(4), Description("Value"): Amended, read, StringTermination("NullTerminated"), Format("w")] string Value;
+            [WmiDataId(5), Description("Context"): Amended, read, StringTermination("NullTerminated"), Format("w")] string Context;
+        };
+
+        [dynamic: ToInstance, Description("TWAPI execution trace"): Amended,
+         EventType(3), EventTypeName("ExecutionTrace")]
+        class @eventclass_name_ExecutionTrace : @eventclass_name
+        {
+            [WmiDataId(1), Description("Operation"): Amended, read, StringTermination("NullTerminated"), Format("w")] string Operation;
+            [WmiDataId(2), Description("Executed command"): Amended, read, StringTermination("NullTerminated"), Format("w")] string Command;
+            [WmiDataId(3), Description("Status code"): Amended, read, StringTermination("NullTerminated"), Format("w")] string Code;
+            [WmiDataId(4), Description("Result"): Amended, read, StringTermination("NullTerminated"), Format("w")] string Result;
+            [WmiDataId(5), Description("Context"): Amended, read, StringTermination("NullTerminated"), Format("w")] string Context;
+        };
+
+        [dynamic: ToInstance, Description("TWAPI command trace"): Amended,
+         EventType(4), EventTypeName("CommandTrace")]
+        class @eventclass_name_CommandTrace : @eventclass_name
+        {
+            [WmiDataId(1), Description("Operation"): Amended, read, StringTermination("NullTerminated"), Format("w")] string Operation;
+            [WmiDataId(2), Description("Old command name"): Amended, read, StringTermination("NullTerminated"), Format("w")] string OldName;
+            [WmiDataId(3), Description("New command name"): Amended, read, StringTermination("NullTerminated"), Format("w")] string NewName;
+            [WmiDataId(4), Description("Context"): Amended, read, StringTermination("NullTerminated"), Format("w")] string Context;
+        };
+    }
+
+    #createtmfile-enable-compaction
+
+    set mof [string map \
+                 [list @provider_name $_etw_mof(provider_name) \
+                      @provider_guid $_etw_mof(provider_guid) \
+                      @eventclass_name $_etw_mof(eventclass_name) \
+                      @eventclass_guid $_etw_mof(eventclass_guid) \
+                     ] $mof_template]
+
+    set mofc [twapi::IMofCompilerProxy new]
+    twapi::trap {
+        $mofc CompileBuffer $mof
+    } finally {
+        $mofc Release
+    }
+}
+
+proc twapi::etw_uninstall_twapi_mof {} {
+    variable _etw_mof
+
+    set wmi [twapi::_wmi wmi]
+    trap {
+        set omof [$wmi Get $_etw_mof(provider_name)]
+        $omof Delete_
+    } finally {
+        if {[info exists omof]} {
+            $omof destroy
+        }
+        $wmi destroy
+    }
+}
+
+proc twapi::etw_twapi_provider_register {} {
+    variable _etw_mof
+    return [twapi::RegisterTraceGuids $_etw_mof(provider_guid) $_etw_mof(eventclass_guid)]
+}
+
+proc twapi::etw_log_message {htrace message {level 4}} {
+    set level [_etw_level_to_int $level]
+    if {[etw_provider_enable_level] >= $level} {
+        # Must match Message event type in MoF definition
+        # 1 -> event type for Message
+        TraceEvent $htrace 1 $level  [encoding convertto unicode "$message\0"]
+    }
+}
+
+proc twapi::etw_variable_tracker {htrace name1 name2 op} {
+    switch -exact -- $op {
+        array -
+        unset { set var "" }
+        default {
+            if {$name2 eq ""} {
+                upvar 1 $name1 var
+            } else {
+                upvar 1 $name1($name2) var
+            }
+        }
+    }
+
+    if {[info level] > 1} {
+        set context [info level -1]
+    } else {
+        set context ""
+    }
+
+    # Must match VariableTrace event type in MoF definition
+    TraceEvent $htrace 2 0 \
+        [encoding convertto unicode "$op\0$name1\0$name2\0$var\0"] \
+        [_etw_encode_limited_unicode $context]
+}
+
+
+proc twapi::etw_execution_tracker {htrace command args} {
+    set op [lindex $args end]
+
+    switch -exact -- $op {
+        enter -
+        enterstep {
+            set code ""
+            set result ""
+        }
+        leave -
+        leavestep {
+            lassign $args code result
+        }
+    }
+
+    if {[info level] > 1} {
+        set context [info level -1]
+    } else {
+        set context ""
+    }
+
+    # Must match Execution event type in MoF definition
+    TraceEvent $htrace 3 0 \
+        [encoding convertto unicode "$op\0"] \
+        [_etw_encode_limited_unicode $command] \
+        [encoding convertto unicode "$code\0"] \
+        [_etw_encode_limited_unicode $result] \
+        [_etw_encode_limited_unicode $context]
+}
+
+
+proc twapi::etw_command_tracker {htrace oldname newname op} {
+    if {[info level] > 1} {
+        set context [info level -1]
+    } else {
+        set context ""
+    }
+    # Must match CommandTrace event type in MoF definition
+    TraceEvent $htrace 4 0 \
+        [encoding convertto unicode "$op\0$oldname\0$newname\0"] \
+        [_etw_encode_limited_unicode $context]
+}
+
+proc twapi::etw_parse_mof_event_class {ocls} {
+    # Returns a dict 
+    # First level key - event type (integer)
+    # See description of _etw_event_defs for rest of the structure
+
+    set result [dict create]
+
+    # Iterate over the subclasses, collecting the event metadata
+    # Create a forward only enumerator for efficiency
+    # wbemFlagUseAmendedQualifiers|wbemFlagReturnImmediately|wbemFlagForwardOnly
+    # wbemQueryFlagsShallow
+    # -> 0x20031
+    $ocls -with {{SubClasses_ 0x20031}} -iterate -cleanup osub {
+        # The subclass must have the eventtype property
+        # We fetch as a raw value so we can tell the
+        # original type
+        if {![catch {
+            $osub -with {
+                Qualifiers_
+                {Item EventType}
+            } -invoke Value 2 {} -raw 1
+        } event_types]} {
+
+            # event_types is a raw value with a type descriptor as elem 0
+            if {[variant_type $event_types] & 0x2000} {
+                # It is VT_ARRAY so value is already a list
+                set event_types [variant_value $event_types 0 0 0]
+            } else {
+                set event_types [list [variant_value $event_types 0 0 0]]
+            }
+
+            set event_type_names {}
+            catch {
+                set event_type_names [$osub -with {
+                    Qualifiers_
+                    {Item EventTypeName}
+                } -invoke Value 2 {} -raw 1]
+                # event_type_names is a raw value with a type descriptor as elem 0
+                # It is IMPORTANT to check this else we cannot distinguish
+                # between a array (list) and a string with spaces
+                if {[variant_type $event_type_names] & 0x2000} {
+                    # It is VT_ARRAY so value is already a list
+                    set event_type_names [variant_value $event_type_names 0 0 0]
+                } else {
+                    # Scalar value. Make into a list
+                    set event_type_names [list [variant_value $event_type_names 0 0 0]]
+                }
+            }
+
+            # The subclass has a EventType property. Pick up the
+            # field definitions.
+            set fields [dict create]
+            $osub -with Properties_ -iterate -cleanup oprop {
+                set quals [$oprop Qualifiers_]
+                # Event fields will have a WmiDataId qualifier
+                if {![catch {$quals -with {{Item WmiDataId}} Value} wmidataid]} {
+                    # Yep this is a field, figure out its type
+                    set type [_etw_decipher_mof_event_field_type $oprop $quals]
+                    dict set type -fieldname [$oprop -get Name]
+                    dict set fields $wmidataid $type
+                }
+                $quals destroy
+            }
+
+            # Process the records to put the fields in order based on
+            # their wmidataid. If any info is missing or inconsistent
+            # we will mark the whole event type class has undecodable.
+            # Ids begin from 1.
+            set fieldtypes {}
+            for {set id 1} {$id <= [dict size $fields]} {incr id} {
+                if {![dict exists $fields $id]} {
+                    # Discard all type info - missing type info
+                    debuglog "Missing id $id for event type(s) $event_types for  EventTrace Mof Class [$ocls -with {{SystemProperties_} {Item __CLASS}} Value]"
+                    set fieldtypes {}
+                    break;
+                }
+                lappend fieldtypes [dict get $fields $id -fieldname] [dict get $fields $id -fieldtype]
+            }
+
+            foreach event_type $event_types event_type_name $event_type_names {
+                dict set result -definitions $event_type [dict create -eventtype $event_type -eventtypename $event_type_name -fields $fields -fieldtypes $fieldtypes]
+            }
+        }
+    }
+
+    if {[dict size $result] == 0} {
+        return {}
+    } else {
+        dict set result -classname [$ocls -with {SystemProperties_ {Item __CLASS}} Value]
+        return $result
+    }
+}
+
+# Deciphers an event  field type
+
+proc twapi::_etw_decipher_mof_event_field_type {oprop oquals} {
+    # Maps event field type strings to enums to pass to the C code
+    # 0 should be unmapped. Note some are duplicates because they
+    # are the same format. Some are legacy formats not explicitly documented
+    # in MSDN but found in the sample code.
+    # Reference - Event Tracing MOF Qualifiers http://msdn.microsoft.com/en-us/library/windows/desktop/aa363800(v=vs.85).aspx
+    set etw_fieldtypes {
+        string  1
+        stringnullterminated 1
+        wstring 2
+        wstringnullterminated 2
+        stringcounted 3
+        stringreversecounted 4
+        wstringcounted 5
+        wstringreversecounted 6
+        boolean 7
+        sint8 8
+        uint8 9
+        csint8 10
+        cuint8 11
+        sint16 12
+        uint16 13
+        uint32 14
+        sint32 15
+        sint64 16
+        uint64 17
+        xsint16 18
+        xuint16 19
+        xsint32 20
+        xuint32 21
+        xsint64 22
+        xuint64 23
+        real32 24
+        real64 25
+        object 26
+        char16 27
+        uint8guid 28
+        objectguid 29
+        objectipaddrv4 30
+        uint32ipaddr 30
+        objectipaddr 30
+        objectipaddrv6 31
+        objectvariant 32
+        objectsid 33
+        uint64wmitime 34
+        objectwmitime 35
+        uint16port 38
+        objectport 39
+        datetime 40
+        stringnotcounted 41
+        wstringnotcounted 42
+        pointer 43
+        sizet   43
+    }
+
+    # On any errors, we will set type to unknown or unsupported
+    set type unknown
+    set quals(extension)  "";   # Hint for formatting for display
+
+    if {![catch {
+        $oquals -with {{Item Pointer}} Value
+    }]} {
+        # Actual value does not matter
+        # If the Pointer qualifier exists, ignore everything else
+        set type pointer
+    } elseif {![catch {
+        $oquals -with {{Item PointerType}} Value
+    }]} {
+        # Actual value does not matter
+        # Some apps mistakenly use PointerType instead of Pointer
+        set type pointer
+    } else {
+        catch {
+            set type [string tolower [$oquals -with {{Item CIMTYPE}} Value]]
+
+            # The following qualifiers may or may not exist
+            # TBD - not all may be required to be retrieved
+            # NOTE: MSDN says some qualifiers are case sensitive!
+            foreach qual {BitMap BitValues Extension Format Pointer StringTermination ValueMap Values ValueType XMLFragment} {
+                # catch in case it does not exist
+                set lqual [string tolower $qual]
+                set quals($lqual) ""
+                catch {
+                    set quals($lqual) [$oquals -with [list [list Item $qual]] Value]
+                }
+            }
+            set type [string tolower "$quals(format)${type}$quals(stringtermination)"]
+            set quals(extension) [string tolower $quals(extension)]
+            # Not all extensions affect how the event field is extracted
+            # e.g. the noprint value
+            if {$quals(extension) in {ipaddr ipaddrv4 ipaddrv6 port variant wmitime guid sid}} {
+                append type $quals(extension)
+            } elseif {$quals(extension) eq "sizet"} {
+                set type sizet
+            }
+        }
+    }
+
+    # Cannot handle arrays yet - TBD
+    if {[$oprop -get IsArray]} {
+        set type "arrayof$type"
+    }
+
+    if {![dict exists $etw_fieldtypes $type]} {
+        set fieldtype 0
+    } else {
+        set fieldtype [dict get $etw_fieldtypes $type]
+    }
+
+    return [dict create -type $type -fieldtype $fieldtype -extension $quals(extension)]
+}
+
+proc twapi::etw_find_mof_event_classes {oswbemservices args} {
+    # Return all classes where a GUID or name matches
+
+    # To avoid iterating the tree multiple times, separate out the guids
+    # and the names and use separator comparators
+
+    set guids {}
+    set names {}
+
+    foreach arg $args {
+        if {[Twapi_IsValidGUID $arg]} {
+            # GUID's can be multiple format, canonicalize for lsearch
+            lappend guids [canonicalize_guid $arg]
+        } else {
+            lappend names $arg
+        }
+    }
+
+    # Note there can be multiple versions sharing a single guid so
+    # we cannot use the wmi_collect_classes "-first" option to stop the
+    # search when one is found.
+
+    set name_matcher [lambda* {names val} {
+        ::tcl::mathop::>= [lsearch -exact -nocase $names $val] 0
+    } :: $names]
+    set guid_matcher [lambda* {guids val} {
+        ::tcl::mathop::>= [lsearch -exact -nocase $guids $val] 0
+    } :: $guids]
+
+    set named_classes {}
+    if {[llength $names]} {
+        foreach name $names {
+            catch {lappend named_classes [$oswbemservices Get $name]}
+        }
+    }
+
+    if {[llength $guids]} {
+        set guid_classes [wmi_collect_classes $oswbemservices -ancestor EventTrace -matchqualifiers [list Guid $guid_matcher]]
+    } else {
+        set guid_classes {}
+    }
+
+    return [concat $guid_classes $named_classes]
+}
+
+proc twapi::etw_get_all_mof_event_classes {oswbemservices} {
+    return [twapi::wmi_collect_classes $oswbemservices -ancestor EventTrace -matchqualifiers [list Guid ::twapi::true]]
+}
+
+proc twapi::etw_load_mof_event_class_obj {oswbemservices ocls} {
+    variable _etw_event_defs
+    set quals [$ocls Qualifiers_]
+    trap {
+        set guid [$quals -with {{Item Guid}} Value]
+        set vers ""
+        catch {set vers [$quals -with {{Item EventVersion}} Value]}
+        set def [etw_parse_mof_event_class $ocls]
+        # Class may be a provider, not a event class in which case
+        # def will be empty
+        if {[dict size $def]} {
+            dict set _etw_event_defs [canonicalize_guid $guid] $vers $def
+        }
+    } finally {
+        $quals destroy
+    }
+}
+
+proc twapi::etw_load_mof_event_classes {oswbemservices args} {
+    if {[llength $args] == 0} {
+        set oclasses [etw_get_all_mof_event_classes $oswbemservices]
+    } else {
+        set oclasses [etw_find_mof_event_classes $oswbemservices {*}$args]
+    }
+
+    foreach ocls $oclasses {
+        trap {
+            etw_load_mof_event_class_obj $oswbemservices $ocls
+        } finally {
+            $ocls destroy
+        }
+    }
+}
+
+proc twapi::etw_open_file {path} {
+# TBD - PROCESS_TRACE_MODE_RAW_TIMESTAMP
+    variable _etw_trace_consumers
+
+    set path [file normalize $path]
+
+    set htrace [OpenTrace $path 0]
+    set _etw_trace_consumers($htrace) $path
+    return $htrace
+}
+
+proc twapi::etw_open_session {sessionname} {
+# TBD - PROCESS_TRACE_MODE_RAW_TIMESTAMP
+    variable _etw_trace_consumers
+
+    set htrace [OpenTrace $sessionname 1]
+    set _etw_trace_consumers($htrace) $sessionname
+    return $htrace
+}
+
+proc twapi::etw_close_session {htrace} {
+    variable _etw_trace_consumers
+
+    if {! [info exists _etw_trace_consumers($htrace)]} {
+        badargs! "Cannot find trace session with handle $htrace"
+    }
+
+    CloseTrace $htrace
+    unset _etw_trace_consumers($htrace)
+    return
+}
+
+
+proc twapi::etw_process_events {args} {
+    array set opts [parseargs args {
+        callback.arg
+        start.arg
+        end.arg
+    } -nulldefault]
+
+    if {[llength $args] == 0} {
+        error "At least one trace handle must be specified."
+    }
+
+    return [ProcessTrace $args $opts(callback) $opts(start) $opts(end)]
+}
+
+proc twapi::etw_open_formatter {} {
+    variable _etw_formatters
+
+    if {[etw_force_mof] || ![twapi::min_os_version 6 0]} {
+        uplevel #0 package require twapi_wmi
+        # Need WMI MOF definitions
+        set id mof[TwapiId]
+        dict set _etw_formatters $id OSWBemServices [wmi_root -root wmi]
+    } else {
+        # Just a dummy if using a TDH based api
+        set id tdh[TwapiId]
+        # Nothing to set as yet but for consistency with MOF implementation
+        dict set _etw_formatters $id {}
+    }
+    return $id
+}
+
+proc twapi::etw_close_formatter {formatter} {
+    variable _etw_formatters
+    if {[dict exists $_etw_formatters $formatter OSWBemServices]} {
+        [dict get $_etw_formatters $formatter OSWBemServices] -destroy
+    }
+
+    dict unset _etw_formatters $formatter
+    if {[dict size $_etw_formatters] == 0} {
+        variable _etw_event_defs
+        # No more formatters
+        # Clear out event defs cache which can be quite large
+        # Really only needed for mof but doesn't matter
+        set _etw_event_defs {}
+    }
+
+    return
+}
+
+proc twapi::etw_format_events {formatter args} {
+    variable _etw_formatters
+
+    if {![dict exists $_etw_formatters $formatter]} {
+        # We could actually just init ourselves but we want to force
+        # consistency and caller to release wmi COM object
+        badargs! "Invalid ETW formatter id \"$formatter\""
+    }
+
+    set events {}
+    if {[dict exists $_etw_formatters $formatter OSWBemServices]} {
+        set oswbemservices [dict get $_etw_formatters $formatter OSWBemServices]
+        foreach {bufd rawevents} $args {
+            lappend events [_etw_format_mof_events $oswbemservices $bufd $rawevents]
+        }
+    } else {
+        foreach {bufd rawevents} $args {
+            lappend events [_etw_format_tdh_events $bufd $rawevents]
+        }
+    }
+
+    # Return as a recordarray
+    return [list [etw_event] [lconcat {*}$events]]
+}
+
+proc twapi::_etw_format_tdh_events {bufdesc events} {
+
+    set bufhdr [etw_event_trace_logfile trace_logfile_header $bufdesc]
+    set timer_resolution [etw_trace_logfile_header timer_resolution $bufhdr]
+    set private_session [expr {0x800 & [etw_trace_logfile_header logfile_mode $bufhdr]}]
+    set pointer_size [etw_trace_logfile_header pointer_size $bufhdr]
+
+    set formatted_events {}
+    foreach event $events {
+        array set fields [tdh_event $event]
+        set formatted_event [tdh_event_header descriptor $fields(header)]
+        # Do not select provider_guid from header as for TDH it needs to come
+        # from the provider_guid in the data portion.
+        lappend formatted_event {*}[tdh_event_header select $fields(header) {timestamp tid pid}]
+        lappend formatted_event {*}[tdh_event_data select $fields(data) provider_guid]
+        if {$private_session} {
+            lappend formatted_event [expr {[tdh_event_header processor_time $fields(header)] * $timer_resolution}] 0
+        } else {
+            lappend formatted_event [expr {[tdh_event_header user_time $fields(header)] * $timer_resolution}] [expr {[tdh_event_header kernel_time $fields(header)] * $timer_resolution}]
+        }
+        lappend formatted_event {*}[tdh_event_data select $fields(data) {provider_name event_guid channel_name level_name opcode_name task_name keyword_names properties message}] [dict* $fields(extended_data) sid ""]
+
+        lappend formatted_events $formatted_event
+    }
+    return $formatted_events
+}
+
+proc twapi::_etw_format_mof_events {oswbemservices bufdesc events} {
+    variable _etw_event_defs
+
+    # TBD - it may be faster to special case NT kernel events as per
+    # the structures defined in http://msdn.microsoft.com/en-us/library/windows/desktop/aa364083(v=vs.85).aspx
+    # However, the MSDN warns that structures should not be created from
+    # MOF classes as alignment restrictions might be different
+    array set missing {}
+    foreach event $events {
+        set guid [mof_event_header guid [mof_event header $event]]
+        if {! [dict exists $_etw_event_defs $guid]} {
+            set missing($guid) ""
+        }
+    }
+
+    if {[array size missing]} {
+        etw_load_mof_event_classes $oswbemservices {*}[array names missing]
+    }
+
+    set bufhdr [etw_event_trace_logfile trace_logfile_header $bufdesc]
+    set timer_resolution [etw_trace_logfile_header timer_resolution $bufhdr]
+    set private_session [expr {0x800 & [etw_trace_logfile_header logfile_mode $bufhdr]}]
+    set pointer_size [etw_trace_logfile_header pointer_size $bufhdr]
+
+    # TBD - what should provider_guid be for each event?
+    set provider_guid ""
+
+    set formatted_events {}
+    foreach event $events {
+        array set hdr [mof_event_header [mof_event header $event]]
+
+        # Formatted event must match field sequence in etw_event record
+        set formatted_event [list 0 $hdr(version) 0 $hdr(level) $hdr(type) 0 0 \
+                                 $hdr(timestamp) $hdr(tid) $hdr(pid) $provider_guid]
+
+        if {$private_session} {
+            lappend formatted_event [expr {$hdr(processor_time) * $timer_resolution}] 0
+        } else {
+            lappend formatted_event [expr {$hdr(user_time) * $timer_resolution}] [expr {$hdr(kernel_time) * $timer_resolution}]
+        }
+
+        if {[dict exists $_etw_event_defs $hdr(guid) $hdr(version) -definitions $hdr(type)]} {
+            set eventclass [dict get $_etw_event_defs $hdr(guid) $hdr(version) -classname]
+            set mof [dict get $_etw_event_defs $hdr(guid) $hdr(version) -definitions $hdr(type)]
+            set eventtypename [dict get $mof -eventtypename]
+            set properties [Twapi_ParseEventMofData \
+                                [mof_event data $event] \
+                                [dict get $mof -fieldtypes] \
+                                $pointer_size]
+        } elseif {[dict exists $_etw_event_defs $hdr(guid) "" -definitions $hdr(type)]} {
+            # If exact version not present, use one without
+            # a version
+            set eventclass [dict get $_etw_event_defs $hdr(guid) "" -classname]
+            set mof [dict get $_etw_event_defs $hdr(guid) "" -definitions $hdr(type)]
+            set eventtypename [dict get $mof -eventtypename]
+            set properties [Twapi_ParseEventMofData \
+                                [mof_event data $event] \
+                                [dict get $mof -fieldtypes] \
+                                $pointer_size]
+        } else {
+            # No definition. Create an entry so we know we already tried
+            # looking this up and don't keep retrying later
+            dict set _etw_event_defs $hdr(guid) {}
+
+            # Nothing we can add to the event. Pass on with defaults
+            set eventtypename $hdr(type)
+            # Try to get at least the class name
+            if {[dict exists $_etw_event_defs $hdr(guid) $hdr(version) -classname]} {
+                set eventclass [dict get $_etw_event_defs $hdr(guid) $hdr(version) -classname]
+            } elseif {[dict exists $_etw_event_defs $hdr(guid) "" -classname]} {
+                set eventclass [dict get $_etw_event_defs $hdr(guid) "" -classname]
+            } else {
+                set eventclass ""
+            }
+            set properties [list _mofdata [mof_event data $event]]
+        }
+
+        # eventclass -> provider_name
+        # TBD - should we get the Provider qualifier from Mof as provider_name? (Does it even exist?)
+        # mofformatteddata -> properties
+        # level name is not localized. Oh well, too bad
+        set level_name [dict* {0 {Log Always} 1 Critical 2 Error 3 Warning 4 Informational 5 Debug} $hdr(level)]
+        lappend formatted_event $eventclass $hdr(guid) "" $level_name $eventtypename "" "" $properties "" ""
+
+        lappend formatted_events $formatted_event
+    }
+
+    return $formatted_events
+}
+
+proc twapi::etw_format_event_message {message properties} {
+    if {$message ne ""} {
+        set params {}
+        foreach {propname propval} $properties {
+            # Properties are always a list, even when scalars because
+            # there is no way of distinguishing between a scalar and
+            # an array of size 1 in the return values from TDH
+            lappend params [join $propval {, }]
+        }
+        catch {set message [format_message -fmtstring $message -params $params]}
+    }
+    return $message
+}
+
+
+proc twapi::etw_dump_to_file {args} {
+    array set opts [parseargs args {
+        {output.arg stdout}
+        {limit.int -1}
+        {format.arg csv {csv list}}
+        {separator.arg ,}
+        {fields.arg {-timecreated -levelname -providername -pid -taskname -opcodename -message}}
+        {filter.arg {}}
+    }]
+
+    if {$opts(format) eq "csv"} {
+        package require csv
+    }
+    if {$opts(output) in [chan names]} {
+        # Writing to a channel
+        set outfd $opts(output)
+        set do_close 0
+    } else {
+        if {[file exists $opts(output)]} {
+            error "File $opts(output) already exists."
+        }
+        set outfd [open $opts(output) a]
+        set do_close 1
+    }
+
+    set formatter [etw_open_formatter]
+    trap {
+        set varname ::twapi::_etw_dump_ctr[TwapiId]
+        set $varname 0;         # Yes, set $varname, not set varname
+        set htraces {}
+        foreach arg $args {
+            if {[file exists $arg]} {
+                lappend htraces [etw_open_file $arg]
+            } else {
+                lappend htraces [etw_open_session $arg]
+            }
+        }
+
+        if {$opts(format) eq "csv"} {
+            puts $outfd [csv::join $opts(fields) $opts(separator)]
+        }
+        if {[llength $htraces] == 0} {
+            return
+        }
+        # This is written using a callback to basically test the callback path
+        set callback [list apply {
+            {options outfd counter_varname max formatter bufd events}
+            {
+                array set opts $options
+                set events [etw_format_events $formatter $bufd $events]
+                foreach event [recordarray getlist $events -format dict -filter $opts(filter)] {
+                    if {$max >= 0 && [set $counter_varname] >= $max} {
+                        return -code break
+                    }
+                    array set fields $event
+                    if {"-message" in $opts(fields)} {
+                        if {$fields(-message) ne ""} {
+                            set fields(-message) [etw_format_event_message $fields(-message) $fields(-properties)]
+                        } else {
+                            set fields(-message) "Properties: $fields(-properties)"
+                        }
+                    }
+                    if {"-properties" in $opts(fields)} {
+                        set fmtdata $fields(-properties)
+                        if {[dict exists $fmtdata mofdata]} {
+                            # Only show 32 bytes
+                            binary scan [string range [dict get $fmtdata mofdata] 0 31] H* hex
+                            dict set fmtdata mofdata [regsub -all (..) $hex {\1 }]
+                        }
+                        set fields(-properties) $fmtdata
+                    }
+                    set fmtlist {}
+                    foreach field $opts(fields) {
+                        lappend fmtlist $fields($field)
+                    }
+                    if {$opts(format) eq "csv"} {
+                        puts $outfd [csv::join $fmtlist $opts(separator)]
+                    } else {
+                        puts $outfd $fmtlist
+                    }
+                    incr $counter_varname
+                }
+            }
+        } [array get opts] $outfd $varname $opts(limit) $formatter]
+
+        # Process the events using the callback
+        etw_process_events -callback $callback {*}$htraces
+
+    } finally {
+        unset -nocomplain $varname
+        foreach htrace $htraces {
+            etw_close_session $htrace
+        }
+        if {$do_close} {
+            close $outfd
+        } else {
+            flush $outfd
+        }
+        etw_close_formatter $formatter
+    }
+}
+
+proc twapi::etw_dump_to_list {args} {
+    set htraces {}
+    set formatter [etw_open_formatter]
+    trap {
+        foreach arg $args {
+            if {[file exists $arg]} {
+                lappend htraces [etw_open_file $arg]
+            } else {
+                lappend htraces [etw_open_session $arg]
+            }
+        }
+        return [recordarray getlist [etw_format_events $formatter {*}[etw_process_events {*}$htraces]]]
+    } finally {
+        foreach htrace $htraces {
+            etw_close_session $htrace
+        }
+        etw_close_formatter $formatter
+    }
+}
+
+proc twapi::etw_dump {args} {
+    set htraces {}
+    set formatter [etw_open_formatter]
+    trap {
+        foreach arg $args {
+            if {[file exists $arg]} {
+                lappend htraces [etw_open_file $arg]
+            } else {
+                lappend htraces [etw_open_session $arg]
+            }
+        }
+        return [recordarray get [etw_format_events $formatter {*}[etw_process_events {*}$htraces]]]
+    } finally {
+        foreach htrace $htraces {
+            etw_close_session $htrace
+        }
+        etw_close_formatter $formatter
+    }
+}
+
+
+proc twapi::etw_start_trace {session_name args} {
+    variable _etw_trace_controllers
+    
+    # Specialized for kernel debugging - {bufferingmode {} 0x400}
+    # Not supported until Win7 {noperprocessorbuffering {} 0x10000000}
+    # Not clear what conditions it can be used {usekbytesforsize {} 0x2000}
+    array set opts [parseargs args {
+        traceguid.arg
+        logfile.arg
+        buffersize.int
+        minbuffers.int
+        maxbuffers.int
+        maxfilesize.int
+        flushtimer.int
+        enableflags.int
+        {filemode.arg circular {sequential append rotate circular}}
+        {clockresolution.sym system {qpc 1  system 2 cpucycle 3}}
+        {private.bool 0 0x800}
+        {realtime.bool 0 0x100}
+        {secure.bool 0 0x80}
+        {privateinproc.bool 0 0x20800}
+        {sequence.sym none {none 0 local 0x8000 global 0x4000}}
+        {paged.bool 0 0x01000000}
+        {preallocate.bool 0 0x20}
+    } -maxleftover 0]
+
+    if {!$opts(realtime) && (![info exists opts(logfile)] || $opts(logfile) eq "")} {
+        badargs! "Log file name must be specified if real time mode is not in effect"
+    }
+
+    if {[string equal -nocase $session_name "NT Kernel Logger"] &&
+        $opts(filemode) eq "rotate"} {
+        error "Option -filemode cannot have value \"rotate\" for NT Kernel Logger"
+    }
+
+    set logfilemode 0
+    switch -exact $opts(filemode) {
+        sequential {
+            if {[info exists opts(maxfilesize)]} {
+                # 1 -> EVENT_TRACE_FILE_MODE_SEQUENTIAL 
+                set logfilemode [expr {$logfilemode | 1}]
+            } else {
+                # 0 -> EVENT_TRACE_FILE_MODE_NONE
+                # set logfilemode [expr {$logfilemode | 0}]
+            }
+        }
+        circular {
+            # 2 -> EVENT_TRACE_FILE_MODE_CIRCULAR
+            set logfilemode [expr {$logfilemode | 2}]
+            if {![info exists opts(maxfilesize)]} {
+                set opts(maxfilesize) 1; # 1MB default
+            }
+        }
+        rotate {
+            if {$opts(private) || $opts(privateinproc)} {
+                if {![min_os_version 6 2]} {
+                    badargs! "Option -filemode must not be \"rotate\" for private traces"
+                }
+            }
+
+            # 8 -> EVENT_TRACE_FILE_MODE_NEWFILE
+            set logfilemode [expr {$logfilemode | 8}]
+            if {![info exists opts(maxfilesize)]} {
+                set opts(maxfilesize) 1; # 1MB default
+            }
+        }
+        append {
+            if {$opts(private) || $opts(privateinproc) || $opts(realtime)} {
+                badargs! "Option -filemode must not be \"append\" for private or realtime traces"
+            }
+            # 4 -> EVENT_TRACE_FILE_MODE_APPEND
+            # Not clear what to do about maxfilesize. Keep as is for now
+            set logfilemode [expr {$logfilemode | 4}]
+        }
+    }
+
+    if {![info exists opts(maxfilesize)]} {
+        set opts(maxfilesize) 0
+    }
+
+    if {$opts(realtime) && ($opts(private) || $opts(privateinproc))} {
+        badargs! "Option -realtime is incompatible with options -private and -privateinproc"
+    }
+
+    foreach opt {traceguid logfile buffersize minbuffers maxbuffers flushtimer enableflags maxfilesize} {
+        if {[info exists opts($opt)]} {
+            lappend params -$opt $opts($opt)
+        }
+    }
+
+    set logfilemode [expr {$logfilemode | $opts(sequence)}]
+
+    set logfilemode [tcl::mathop::| $logfilemode $opts(realtime) $opts(private) $opts(privateinproc) $opts(secure) $opts(paged) $opts(preallocate)]
+
+    lappend params -logfilemode $logfilemode
+
+    if {$opts(filemode) eq "append" && $opts(clockresolution) != 2} {
+        error "Option -clockresolution must be set to 'system' if -filemode is append"
+    }
+
+    if {($opts(filemode) eq "rotate" || $opts(preallocate)) &&
+        $opts(maxfilesize) == 0} {
+        error "Option -maxfilesize must also be specified with -preallocate or -filemodenewfile."
+    }
+
+    lappend params -clockresolution $opts(clockresolution)
+
+    trap {
+        set h [StartTrace $session_name $params]
+        set _etw_trace_controllers($h) $session_name
+        return $h
+    } onerror {TWAPI_WIN32 5} {
+        return -options [trapoptions] "Access denied. This may be because the process does not have permission to create the specified logfile or because it is not running under an account permitted to control ETW traces."
+    }
+}
+
+proc twapi::etw_start_kernel_trace {events args} {
+    
+    set enableflags 0
+
+    # Note sysconfig is a dummy event. It is always logged.
+    set eventmap {
+        process 0x00000001
+        thread 0x00000002
+        imageload 0x00000004
+        diskio 0x00000100
+        diskfileio 0x00000200
+        pagefault 0x00001000
+        hardfault 0x00002000
+        tcpip 0x00010000
+        registry 0x00020000
+        dbgprint 0x00040000
+        sysconfig 0x00000000
+    }
+
+    if {"diskfileio" in $events} {
+        lappend events diskio;  # Required by diskfileio
+    }
+
+    if {[min_os_version 6]} {
+        lappend eventmap {*}{
+            processcounter 0x00000008
+            contextswitch 0x00000010
+            dpc 0x00000020
+            interrupt 0x00000040
+            systemcall 0x00000080
+            diskioinit 0x00000400
+            alpc 0x00100000
+            splitio 0x00200000
+            driver 0x00800000
+            profile 0x01000000
+            fileio 0x02000000
+            fileioinit 0x04000000
+        }
+
+        if {"diskio" in $events} {
+            lappend events diskioinit
+        }
+    }
+
+    if {[min_os_version 6 1]} {
+        lappend eventmap {*}{
+            dispatcher 0x00000800
+            virtualalloc 0x00004000
+        }
+    }
+
+    if {[min_os_version 6 2]} {
+        lappend eventmap {*}{
+            vamap 0x00008000
+        }
+        if {"sysconfig" ni $events} {
+            # EVENT_TRACE_FLAG_NO_SYSCONFIG 
+            set enableflags [expr {$enableflags | 0x10000000}]
+        }
+    }
+
+    foreach event $events {
+        set enableflags [expr {$enableflags | [dict! $eventmap $event]}]
+    }
+
+    # Name "NT Kernel Logger" is hardcoded in Windows
+    # GUID is 9e814aad-3204-11d2-9a82-006008a86939 but does not need to be
+    # specified. Note kernel logger cannot use paged memory so 
+    # -paged 0 is required
+    return [etw_start_trace "NT Kernel Logger" -enableflags $enableflags {*}$args -paged 0]
+}
+
+proc twapi::etw_enable_provider {htrace guid enableflags level} {
+    set guid [_etw_provider_guid $guid]
+    return [EnableTrace 1 $enableflags [_etw_level_to_int $level] $guid $htrace]
+}
+
+proc twapi::etw_disable_provider {htrace guid} {
+    set guid [_etw_provider_guid $guid]
+    return [EnableTrace 0 -1 5 $guid $htrace]
+}
+
+proc twapi::etw_control_trace {action session args} {
+    variable _etw_trace_controllers
+
+    if {[info exists _etw_trace_controllers($session)]} {
+        set sessionhandle $session
+    } else {
+        set sessionhandle 0
+        set sessionname $session
+    }
+
+    set action [dict get {
+        query  0
+        stop   1
+        update 2
+        flush  3
+    } $action]
+
+    array set opts [parseargs args {
+        traceguid.arg
+        logfile.arg
+        maxbuffers.int
+        flushtimer.int
+        enableflags.int
+        realtime.bool
+    } -maxleftover 0]
+
+    set params {}
+
+    if {[info exists opts(realtime)]} {
+        if {$opts(realtime)} {
+            lappend params -logfilemode 0x100; # EVENT_TRACE_REAL_TIME_MODE 
+        } else {
+            lappend params -logfilemode 0
+        }
+    }
+
+    if {[info exists opts(traceguid)]} {
+        append params -traceguid $opts(traceguid)
+    }
+
+    if {[info exists sessionname]} {
+        lappend params -sessionname $sessionname
+    }
+
+    if {$action == 2} {
+        # update
+        foreach opt {logfile flushtimer enableflags maxbuffers} {
+            if {[info exists opts($opt)]} {
+                lappend params -$opt $opts($opt)
+            }
+        }
+    }
+
+    return [etw_trace_properties [ControlTrace $action $sessionhandle $params]]
+}
+
+interp alias {} twapi::etw_update_trace {} twapi::etw_control_trace update
+
+proc twapi::etw_stop_trace {trace} {
+    variable _etw_trace_controllers
+    set stats [etw_control_trace stop $trace]
+    unset -nocomplain _etw_trace_controllers($trace)
+    return $stats
+}
+
+proc twapi::etw_flush_trace {trace} {
+    return [etw_control_trace flush $trace]
+}
+
+proc twapi::etw_query_trace {trace} {
+    set d [etw_control_trace query $trace]
+    set cres [lindex  {{} qpc system cpucycle} [dict get $d clock_resolution]]
+    if {$cres ne ""} {
+        dict set d clock_resolution $cres
+    }
+
+    #TBD - check whether -maxfilesize needs to be massaged
+
+    return $d
+}
+
+
+
+#
+# Helper functions
+#
+
+
+# Return binary unicode with truncation if necessary
+proc twapi::_etw_encode_limited_unicode {s {max 80}} {
+    if {[string length $s] > $max} {
+        set s "[string range $s 0 $max-3]..."
+    }
+    return [encoding convertto unicode "$s\0"]
+}
+
+# Used for development/debug to see what all types are in use
+proc twapi::_etw_get_types {} {
+    dict for {g gval} $::twapi::_etw_event_defs {
+        dict for {ver verval} $gval {
+            dict for {eventtype eval} [dict get $verval -definitions] {
+                dict for {id idval} [dict get $eval -fields] {
+                    dict set types [dict get $idval -type] [dict get $verval -classname] $eventtype $id
+                }
+            }
+        }
+    }
+    return $types
+}
+
+proc twapi::_etw_level_to_int {level} {
+    return [dict* {verbose 5 information 4 info 4 informational 4 warning 3 error 2 fatal 1 critical 1} [string tolower $level]]
+}
+
+# Map provider guid/name to guid
+proc twapi::_etw_provider_guid {lookup} {
+    if {[Twapi_IsValidGUID $lookup]} {
+        return $lookup
+    }
+    set guid [etw_get_provider_guid $lookup]
+    if {$guid eq ""} {
+        badargs! "Provider \"$lookup\" not found."
+    }
+    return $guid
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/eventlog.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/eventlog.tcl
new file mode 100644
index 00000000..205784fd
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/eventlog.tcl
@@ -0,0 +1,391 @@
+#
+# Copyright (c) 2004-2012, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+package require registry
+
+namespace eval twapi {
+    # We maintain caches so we do not do lookups all the time
+    # TBD - have a means of clearing this out
+    variable _eventlog_message_cache
+    set _eventlog_message_cache {}
+}
+
+
+# Read the event log
+proc twapi::eventlog_read {hevl args} {
+    _eventlog_valid_handle $hevl read raise
+
+    array set opts [parseargs args {
+        seek.int
+        {direction.arg forward}
+    }]
+
+    if {[info exists opts(seek)]} {
+        set flags 2;                    # Seek
+        set offset $opts(seek)
+    } else {
+        set flags 1;                    # Sequential read
+        set offset 0
+    }
+
+    switch -glob -- $opts(direction) {
+        ""    -
+        forw* {
+            setbits flags 4
+        }
+        back* {
+            setbits flags 8
+        }
+        default {
+            error "Invalid value '$opts(direction)' for -direction option"
+        }
+    }
+
+    set results [list ]
+
+    trap {
+        set recs [ReadEventLog $hevl $flags $offset]
+    } onerror {TWAPI_WIN32 38} {
+        # EOF - no more
+        set recs [list ]
+    }
+    foreach event $recs {
+        dict set event -type [string map {0 success 1 error 2 warning 4 information 8 auditsuccess 16 auditfailure} [dict get $event -level]]
+        lappend results $event
+    }
+
+    return $results
+}
+
+
+# Get the oldest event log record index. $hevl must be read handle
+proc twapi::eventlog_oldest {hevl} {
+    _eventlog_valid_handle $hevl read raise
+    return [GetOldestEventLogRecord $hevl]
+}
+
+# Get the event log record count. $hevl must be read handle
+proc twapi::eventlog_count {hevl} {
+    _eventlog_valid_handle $hevl read raise
+    return [GetNumberOfEventLogRecords $hevl]
+}
+
+# Check if the event log is full. $hevl may be either read or write handle
+# (only win2k plus)
+proc twapi::eventlog_is_full {hevl} {
+    # Does not matter if $hevl is read or write, but verify it is a handle
+    _eventlog_valid_handle $hevl read
+    return [Twapi_IsEventLogFull $hevl]
+}
+
+# Backup the event log
+proc twapi::eventlog_backup {hevl file} {
+    _eventlog_valid_handle $hevl read raise
+    BackupEventLog $hevl $file
+}
+
+# Clear the event log
+proc twapi::eventlog_clear {hevl args} {
+    _eventlog_valid_handle $hevl read raise
+    array set opts [parseargs args {backup.arg} -nulldefault]
+    ClearEventLog $hevl $opts(backup)
+}
+
+
+# Formats the given event log record message
+# 
+proc twapi::eventlog_format_message {rec args} {
+    variable _eventlog_message_cache
+
+    array set opts [parseargs args {
+        width.int
+        langid.int
+    } -nulldefault]
+
+    set source  [dict get $rec -source]
+    set eventid [dict get $rec -eventid]
+
+    if {[dict exists $_eventlog_message_cache $source fmtstring $opts(langid) $eventid]} {
+        set fmtstring [dict get $_eventlog_message_cache $source fmtstring $opts(langid) $eventid]
+        dict incr _eventlog_message_cache __fmtstring_hits
+    } else {
+        dict incr _eventlog_message_cache __fmtstring_misses
+
+        # Find the registry key if we do not have it already
+        if {[dict exists $_eventlog_message_cache $source regkey]} {
+            dict incr _eventlog_message_cache __regkey_hits
+            set regkey [dict get $_eventlog_message_cache $source regkey]
+        } else {
+            set regkey [_find_eventlog_regkey $source]
+            dict set _eventlog_message_cache $source regkey $regkey
+            dict incr _eventlog_message_cache __regkey_misses
+        }
+
+        # Get the message file, if there is one
+        if {! [catch {registry get $regkey "EventMessageFile"} path]} {
+            # Try each file listed in turn
+            foreach dll [split $path \;] {
+                set dll [expand_environment_strings $dll]
+                if {! [catch {
+                    set fmtstring [format_message -module $dll -messageid $eventid -width $opts(width) -langid $opts(langid)]
+                } msg]} {
+                    dict set _eventlog_message_cache $source fmtstring $opts(langid) $eventid $fmtstring
+                    break
+                }
+            }
+        }
+    }
+
+    if {! [info exists fmtstring]} {
+        dict incr _eventlog_message_cache __notfound
+
+        set fmt "The message file or event definition for event id [dict get $rec -eventid] from source [dict get $rec -source] was not found. The following information was part of the event: "
+        set flds [list ]
+        for {set i 1} {$i <= [llength [dict get $rec -params]]} {incr i} {
+            lappend flds %$i
+        }
+        append fmt [join $flds ", "]
+        return [format_message -fmtstring $fmt  \
+                    -params [dict get $rec -params] -width $opts(width)]
+    }
+
+    set msg [format_message -fmtstring $fmtstring -params [dict get $rec -params]]
+
+    # We'd found a message from the message file and replaced the string
+    # parameters. Now fill in the parameter file values if any. Note these are
+    # separate from the string parameters passed in through rec(-params)
+
+    # First check if the formatted string itself still has placeholders
+    # Place holder for the parameters file are supposed to start
+    # with two % chars. Unfortunately, not all apps, even Microsoft's own
+    # DCOM obey this. So check for both % and %%
+    set placeholder_indices [regexp -indices -all -inline {%?%\d+} $msg]
+    if {[llength $placeholder_indices] == 0} {
+        # No placeholders.
+        return $msg
+    }
+
+    # Loop through to replace placeholders.
+    set msg2 "";                # Holds result after param replacement
+    set prev_end 0
+    foreach placeholder $placeholder_indices {
+        lassign $placeholder start end
+        # Append the stuff between previous placeholder and this one
+        append msg2 [string range $msg $prev_end [expr {$start-1}]]
+        set repl [string range $msg $start $end]; # Default if not found
+        set paramid [string trimleft $repl %];     # Skip "%"
+        if {[dict exists $_eventlog_message_cache $source paramstring $opts(langid) $paramid]} {
+            dict incr _eventlog_message_cache __paramstring_hits
+            set repl [format_message -fmtstring [dict get $_eventlog_message_cache $source paramstring $opts(langid) $paramid] -params [dict get $rec -params]]
+        } else {
+            dict incr _eventlog_message_cache __paramstring_misses
+            # Not in cache, need to look up
+            if {![info exists paramfiles]} {
+                # Construct list of parameter string files
+
+                # TBD - cache registry key results?
+                # Find the registry key if we do not have it already
+                if {![info exists regkey]} {
+                    if {[dict exists $_eventlog_message_cache $source regkey]} {
+                        dict incr _eventlog_message_cache __regkey_hits
+                        set regkey [dict get $_eventlog_message_cache $source regkey]
+                    } else {
+                        dict incr _eventlog_message_cache __regkey_misses
+                        set regkey [_find_eventlog_regkey $source]
+                        dict set _eventlog_message_cache $source regkey $regkey
+                    }
+                }
+                set paramfiles {}
+                if {! [catch {registry get $regkey "ParameterMessageFile"} path]} {
+                    # Loop through every placeholder, look for the entry in the
+                    # parameters file and replace it if found
+                    foreach paramfile [split $path \;] {
+                        lappend paramfiles [expand_environment_strings $paramfile]
+                    }
+                }
+            }
+            # Try each file listed in turn
+            foreach paramfile $paramfiles {
+                if {! [catch {
+                    set paramstring [string trimright [format_message -module $paramfile -messageid $paramid -langid $opts(langid)] \r\n]
+                } ]} {
+                    # Found the replacement
+                    dict set _eventlog_message_cache $source paramstring $opts(langid) $paramid $paramstring
+                    set repl [format_message -fmtstring $paramstring -params [dict get $rec -params]]
+                    break
+                }
+            }
+        }
+        append msg2 $repl
+        set prev_end [incr end]
+    }
+    
+    # Tack on tail after last placeholder
+    append msg2 [string range $msg $prev_end end]
+    return $msg2
+}
+
+# Format the category
+proc twapi::eventlog_format_category {rec args} {
+
+    array set opts [parseargs args {
+        width.int
+        langid.int
+    } -nulldefault]
+
+    set category [dict get $rec -category]
+    if {$category == 0} {
+        return ""
+    }
+
+    variable _eventlog_message_cache
+
+    set source  [dict get $rec -source]
+
+    # Get the category string from cache, if there is one
+    if {[dict exists $_eventlog_message_cache $source category $opts(langid) $category]} {
+        dict incr _eventlog_message_cache __category_hits
+        set fmtstring [dict get $_eventlog_message_cache $source category $opts(langid) $category]
+    } else {
+        dict incr _eventlog_message_cache __category_misses
+
+        # Find the registry key if we do not have it already
+        if {[dict exists $_eventlog_message_cache $source regkey]} {
+            dict incr _eventlog_message_cache __regkey_hits
+            set regkey [dict get $_eventlog_message_cache $source regkey]
+        } else {
+            set regkey [_find_eventlog_regkey $source]
+            dict set _eventlog_message_cache $source regkey $regkey
+            dict incr _eventlog_message_cache __regkey_misses
+        }
+
+        if {! [catch {registry get $regkey "CategoryMessageFile"} path]} {
+            # Try each file listed in turn
+            foreach dll [split $path \;] {
+                set dll [expand_environment_strings $dll]
+                if {! [catch {
+                    set fmtstring [format_message -module $dll -messageid $category -width $opts(width) -langid $opts(langid)]
+                } msg]} {
+                    dict set _eventlog_message_cache $source category $opts(langid) $category $fmtstring
+                    break
+                }
+            }
+        }
+    }
+
+    if {![info exists fmtstring]} {
+        set fmtstring "Category $category"
+        dict set _eventlog_message_cache $source category $opts(langid) $category $fmtstring
+    }
+
+    return [format_message -fmtstring $fmtstring -params [dict get $rec -params]]
+}
+
+proc twapi::eventlog_monitor_start {hevl script} {
+    variable _eventlog_notification_scripts
+
+    set hevent [lindex [CreateEvent [_make_secattr {} 0] 0 0 ""] 0]
+    if {[catch {NotifyChangeEventLog $hevl $hevent} msg]} {
+        CloseHandle $hevent
+        error $msg $::errorInfo $::errorCode
+    }
+
+    wait_on_handle $hevent -async twapi::_eventlog_notification_handler
+    set _eventlog_notification_scripts($hevent) $script
+
+    # We do not want the application mistakenly closing the event
+    # while being waited on by the thread pool. That would be a big NO-NO
+    # so change the handle type so it cannot be passed to close_handle.
+    return [list evl $hevent]
+}
+
+# Stop any notifications. Note these will stop even if the event log
+# handle is closed but leave the event dangling.
+proc twapi::eventlog_monitor_stop {hevent} {
+    variable _eventlog_notification_scripts
+    set hevent [lindex $hevent 1]
+    if {[info exists _eventlog_notification_scripts($hevent)]} {
+        unset _eventlog_notification_scripts($hevent)
+        cancel_wait_on_handle $hevent
+        CloseHandle $hevent
+    }
+}
+
+proc twapi::_eventlog_notification_handler {hevent event} {
+    variable _eventlog_notification_scripts
+    if {[info exists _eventlog_notification_scripts($hevent)] &&
+        $event eq "signalled"} {
+        uplevel #0 $_eventlog_notification_scripts($hevent) [list [list evl $hevent]]
+    }
+}
+
+# TBD - document
+proc twapi::eventlog_subscribe {source} {
+    set hevl [eventlog_open -source $source]
+    set hevent [lindex [CreateEvent [_make_secattr {} 0] 0 0 ""] 0]
+    if {[catch {NotifyChangeEventLog $hevl $hevent} msg]} {
+        set erinfo $::errorInfo
+        set ercode $::errorCode
+        CloseHandle $hevent
+        error $hsubscribe $erinfo $ercode
+    }
+
+    return [list $hevl $hevent]
+}
+
+# Utility procs
+
+# Find the registry key corresponding the given event log source
+proc twapi::_find_eventlog_regkey {source} {
+    set topkey {HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Eventlog}
+
+    # Set a default list of children to work around an issue in
+    # the Tcl [registry keys] command where a ERROR_MORE_DATA is returned
+    # instead of a retry with a larger buffer.
+    set keys {Application Security System}
+    catch {set keys [registry keys $topkey]}
+    # Get all keys under this key and look for a source under that
+    foreach key $keys {
+        # See above Tcl issue
+        set srckeys {}
+        catch {set srckeys [registry keys "${topkey}\\$key"]}
+        foreach srckey $srckeys {
+            if {[string equal -nocase $srckey $source]} {
+                return "${topkey}\\${key}\\$srckey"
+            }
+        }
+    }
+
+    # Default to Application - TBD
+    return "${topkey}\\Application"
+}
+
+proc twapi::_eventlog_dump {source chan} {
+    set hevl [eventlog_open -source $source]
+    while {[llength [set events [eventlog_read $hevl]]]} {
+        # print out each record
+        foreach eventrec $events {
+            array set event $eventrec
+            set timestamp [clock format $event(-timewritten) -format "%x %X"]
+            set source   $event(-source)
+            set category [twapi::eventlog_format_category $eventrec -width -1]
+            set message  [twapi::eventlog_format_message $eventrec -width -1]
+            puts $chan "$timestamp  $source  $category  $message"
+        }
+    }
+    eventlog_close $hevl
+}
+
+
+
+
+# If we are not being sourced from a executable resource, need to
+# source the remaining support files. In the former case, they are
+# automatically combined into one so the sourcing is not needed.
+if {![info exists twapi::twapi_eventlog_rc_sourced]} {
+    source [file join [file dirname [info script]] evt.tcl]
+    source [file join [file dirname [info script]] winlog.tcl]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/evt.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/evt.tcl
new file mode 100644
index 00000000..61d19bc1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/evt.tcl
@@ -0,0 +1,718 @@
+#
+# Copyright (c) 2012-2014, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# Event log handling for Vista and later
+
+namespace eval twapi {
+    variable _evt;              # See _evt_init
+
+    # System event fields in order returned by _evt_decode_event_system_fields
+    twapi::record evt_system_fields  {
+        -providername -providerguid -eventid -qualifiers -level -task
+        -opcode -keywordmask -timecreated -eventrecordid -activityid
+        -relatedactivityid -pid -tid -channel
+        -computer -sid -version
+    }
+
+    proc _evt_init {} {
+        variable _evt
+
+        # Various structures that we maintain / cache for efficiency as they
+        # are commonly used are kept in the _evt array with the following keys:
+
+        # system_render_context_handle - is the handle to a rendering
+        #    context for the system portion of an event
+        set _evt(system_render_context_handle) [evt_render_context_system]
+
+        # user_render_context_handle - is the handle to a rendering
+        #    context for the user data portion of an event
+        set _evt(user_render_context_handle) [evt_render_context_user]
+
+        # render_buffer - is NULL or holds a pointer to the buffer used to
+        #    retrieve values so does not have to be reallocated every time.
+        set _evt(render_buffer) NULL
+
+        # publisher_handles - caches publisher names to their meta information.
+        #    This is a dictionary indexed with nested keys - 
+        #     publisher, session, lcid. TBD - need a mechanism to clear ?
+        set _evt(publisher_handles) [dict create]
+
+        # -levelname - dict of publisher name / level number to level names
+        set _evt(-levelname) {}
+
+        # -taskname - dict of publisher name / task number to task name
+        set _evt(-taskname) {}
+
+        # -opcodename - dict of publisher name / opcode number to opcode name
+        set _evt(-opcodename) {}
+
+        # No-op the proc once init is done
+        proc _evt_init {} {}
+    }
+}
+
+# TBD - document
+proc twapi::evt_local_session {} {
+    return NULL
+}
+
+# TBD - document
+proc twapi::evt_local_session? {hsess} {
+    return [pointer_null? $hsess]
+}
+
+# TBD - document
+proc twapi::evt_open_session {server args} {
+    array set opts [parseargs args {
+        user.arg
+        domain.arg
+        password.arg
+        {authtype.arg 0}
+    } -nulldefault -maxleftover 0]
+
+    if {![string is integer -strict $opts(authtype)]} {
+        set opts(authtype) [dict get {default 0 negotiate 1 kerberos 2 ntlm 3} [string tolower $opts(authtype)]]
+    }
+
+    return [EvtOpenSession 1 [list $server $opts(user) $opts(domain) $opts(password) $opts(authtype)] 0 0]
+}
+
+# TBD - document
+proc twapi::evt_close_session {hsess} {
+    if {![evt_local_session? $hsess]} {
+        evt_close $hsess
+    }
+}
+
+proc twapi::evt_channels {{hevtsess NULL}} {
+    # TBD - document hevtsess
+    set chnames {}
+    set hevt [EvtOpenChannelEnum $hevtsess 0]
+    trap {
+        while {[set chname [EvtNextChannelPath $hevt]] ne ""} {
+            lappend chnames $chname
+        }
+    } finally {
+        evt_close $hevt
+    }
+
+    return $chnames
+}
+
+proc twapi::evt_clear_log {chanpath args} {
+    # TBD - document -session
+    array set opts [parseargs args {
+        {session.arg NULL}
+        {backup.arg ""}
+    } -maxleftover 0]
+
+    return [EvtClearLog $opts(session) $chanpath [_evt_normalize_path $opts(backup)] 0]
+}
+
+# TBD - document
+proc twapi::evt_archive_exported_log {logpath args} {
+    array set opts [parseargs args {
+        {session.arg NULL}
+        {lcid.int 0}
+    } -maxleftover 0]
+
+    return [EvtArchiveExportedLog $opts(session) [_evt_normalize_path $logpath] $opts(lcid) 0]
+}
+
+proc twapi::evt_export_log {outfile args} {
+    # TBD - document -session
+    array set opts [parseargs args {
+        {session.arg NULL}
+        file.arg
+        channel.arg
+        {query.arg *}
+        {ignorequeryerrors 0 0x1000}
+    } -maxleftover 0]
+
+    if {([info exists opts(file)] && [info exists opts(channel)]) ||
+        ! ([info exists opts(file)] || [info exists opts(channel)])} {
+        error "Exactly one of -file or -channel must be specified."
+    }
+
+    if {[info exists opts(file)]} {
+        set path [_evt_normalize_path $opts(file)]
+        incr opts(ignorequeryerrors) 2
+    } else {
+        set path $opts(channel)
+        incr opts(ignorequeryerrors) 1
+    }
+
+    return [EvtExportLog $opts(session) $path $opts(query) [_evt_normalize_path $outfile] $opts(ignorequeryerrors)]
+}
+
+# TBD - document
+proc twapi::evt_create_bookmark {{mark ""}} {
+    return [EvtCreateBookmark $mark]
+}
+
+# TBD - document
+proc twapi::evt_render_context_xpaths {xpaths} {
+    return [EvtCreateRenderContext $xpaths 0]
+}
+
+# TBD - document
+proc twapi::evt_render_context_system {} {
+    return [EvtCreateRenderContext {} 1]
+}
+
+# TBD - document
+proc twapi::evt_render_context_user {} {
+    return [EvtCreateRenderContext {} 2]
+}
+
+# TBD - document
+proc twapi::evt_open_channel_config {chanpath args} {
+    array set opts [parseargs args {
+        {session.arg NULL}
+    } -maxleftover 0]
+
+    return [EvtOpenChannelConfig $opts(session) $chanpath 0]
+}
+
+# TBD - document
+proc twapi::evt_get_channel_config {hevt args} {
+    set result {}
+    foreach opt $args {
+        lappend result $opt \
+            [EvtGetChannelConfigProperty $hevt \
+                 [_evt_map_channel_config_property $hevt $propid]]
+    }
+    return $result
+}
+
+# TBD - document
+proc twapi::evt_set_channel_config {hevt propid val} {
+    return [EvtSetChannelConfigProperty $hevt [_evt_map_channel_config_property $propid 0 $val]]
+}
+
+
+# TBD - document
+proc twapi::_evt_map_channel_config_property {propid} {
+    if {[string is integer -strict $propid]} {
+        return $propid
+    }
+    
+    # Note: values are from winevt.h, Win7 SDK has typos for last few
+    return [dict get {
+        -enabled                  0
+        -isolation                1
+        -type                     2
+        -owningpublisher          3
+        -classiceventlog          4
+        -access                   5
+        -loggingretention         6
+        -loggingautobackup        7
+        -loggingmaxsize           8
+        -logginglogfilepath       9
+        -publishinglevel          10
+        -publishingkeywords       11
+        -publishingcontrolguid    12
+        -publishingbuffersize     13
+        -publishingminbuffers     14
+        -publishingmaxbuffers     15
+        -publishinglatency        16
+        -publishingclocktype      17
+        -publishingsidtype        18
+        -publisherlist            19
+        -publishingfilemax        20
+    } $propid]
+}
+
+# TBD - document
+proc twapi::evt_event_info {hevt args} {
+    set result {}
+    foreach opt $args {
+        lappend result $opt [EvtGetEventInfo $hevt \
+                                 [dict get {-queryids 0 -path 1} $opt]]
+    }
+    return $result
+}
+
+
+# TBD - document
+proc twapi::evt_event_metadata_property {hevt args} {
+    set result {}
+    foreach opt $args {
+        lappend result $opt \
+            [EvtGetEventMetadataProperty $hevt \
+                 [dict get {
+                     -id 0 -version 1 -channel 2 -level 3
+                     -opcode 4 -task 5 -keyword 6 -messageid 7 -template 8
+                 } $opt]]
+    }
+    return $result
+}
+
+
+# TBD - document
+proc twapi::evt_open_log_info {args} {
+    array set opts [parseargs args {
+        {session.arg NULL}
+        file.arg
+        channel.arg
+    } -maxleftover 0]
+
+    if {([info exists opts(file)] && [info exists opts(channel)]) ||
+        ! ([info exists opts(file)] || [info exists opts(channel)])} {
+        error "Exactly one of -file or -channel must be specified."
+    }
+    
+    if {[info exists opts(file)]} {
+        set path [_evt_normalize_path $opts(file)]
+        set flags 0x2
+    } else {
+        set path $opts(channel)
+        set flags 0x1
+    }
+
+    return [EvtOpenLog $opts(session) $path $flags]
+}
+
+# TBD - document
+proc twapi::evt_log_info {hevt args} {
+    set result {}
+    foreach opt $args {
+        lappend result $opt  [EvtGetLogInfo $hevt [dict get {
+            -creationtime 0 -lastaccesstime 1 -lastwritetime 2
+            -filesize 3 -attributes 4 -numberoflogrecords 5
+            -oldestrecordnumber 6 -full 7
+        } $opt]]
+    }
+    return $result
+}
+
+# TBD - document
+proc twapi::evt_publisher_metadata_property {hpub args} {
+    set result {}
+    foreach opt $args {
+        set val [EvtGetPublisherMetadataProperty $hpub [dict get {
+            -publisherguid 0  -resourcefilepath 1 -parameterfilepath 2
+            -messagefilepath 3 -helplink 4 -publishermessageid 5
+            -channelreferences 6 -levels 12 -tasks 16
+            -opcodes 21 -keywords 25
+        } $opt] 0]
+        if {$opt ni {-channelreferences -levels -tasks -opcodes -keywords}} {
+            lappend result $opt $val
+            continue
+        }
+        set n [EvtGetObjectArraySize $val]
+        set val2 {}
+        for {set i 0} {$i < $n} {incr i} {
+            set rec {}
+            foreach {opt2 iopt} [dict get {
+                -channelreferences { -channelreferencepath 7
+                    -channelreferenceindex 8 -channelreferenceid 9
+                    -channelreferenceflags 10 -channelreferencemessageid 11}
+                -levels { -levelname 13 -levelvalue 14 -levelmessageid 15 }
+                -tasks { -taskname 17 -taskeventguid 18 -taskvalue 19
+                    -taskmessageid 20}
+                -opcodes {-opcodename 22 -opcodevalue 23 -opcodemessageid 24}
+                -keywords {-keywordname 26 -keywordvalue 27
+                    -keywordmessageid 28}
+            } $opt] {
+                lappend rec $opt2 [EvtGetObjectArrayProperty $val $iopt $i]
+            }
+            lappend val2 $rec
+        }
+
+        evt_close $val
+        lappend result $opt $val2
+    }
+    return $result
+}
+
+# TBD - document
+proc twapi::evt_query_info {hq args} {
+    set result {}
+    foreach opt $args {
+        lappend result $opt  [EvtGetQueryInfo $hq [dict get {
+            -names 1 statuses 2
+        } $opt]]
+    }
+    return $result
+}
+
+# TBD - document
+proc twapi::evt_object_array_size {hevt} {
+    return [EvtGetObjectArraySize $hevt]
+}
+
+# TBD - document
+proc twapi::evt_object_array_property {hevt index args} {
+    set result {}
+
+    foreach opt $args {
+        lappend result $opt \
+            [EvtGetObjectArrayProperty $hevt [dict get {
+                -channelreferencepath 7
+                -channelreferenceindex 8 -channelreferenceid 9
+                -channelreferenceflags 10 -channelreferencemessageid 11
+                -levelname 13 -levelvalue 14 -levelmessageid 15
+                -taskname 17 -taskeventguid 18 -taskvalue 19
+                -taskmessageid 20 -opcodename 22
+                -opcodevalue 23 -opcodemessageid 24
+                -keywordname 26 -keywordvalue 27 -keywordmessageid 28
+            }] $index]
+    }
+    return $result
+}
+
+proc twapi::evt_publishers {{hsess NULL}} {
+    set pubs {}
+    set hevt [EvtOpenPublisherEnum $hsess 0]
+    trap {
+        while {[set pub [EvtNextPublisherId $hevt]] ne ""} {
+            lappend pubs $pub
+        }
+    } finally {
+        evt_close $hevt
+    }
+
+    return $pubs
+}
+
+# TBD - document
+proc twapi::evt_open_publisher_metadata {pub args} {
+    array set opts [parseargs args {
+        {session.arg NULL}
+        logfile.arg
+        lcid.int
+    } -nulldefault -maxleftover 0]
+
+    return [EvtOpenPublisherMetadata $opts(session) $pub $opts(logfile) $opts(lcid) 0]
+}
+
+# TBD - document
+proc twapi::evt_publisher_events_metadata {hpub args} {
+    set henum [EvtOpenEventMetadataEnum $hpub]
+
+    # It is faster to build a list and then have Tcl shimmer to a dict when
+    # required
+    set meta {}
+    trap {
+        while {[set hmeta [EvtNextEventMetadata $henum 0]] ne ""} {
+            lappend meta [evt_event_metadata_property $hmeta {*}$args]
+            evt_close $hmeta
+        }
+    } finally {
+        evt_close $henum
+    }
+    
+    return $meta
+}
+
+proc twapi::evt_query {args} {
+    array set opts [parseargs args {
+        {session.arg NULL}
+        file.arg
+        channel.arg
+        {query.arg *}
+        {ignorequeryerrors 0 0x1000}
+        {direction.sym forward {forward 0x100 reverse 0x200 backward 0x200}}
+    } -maxleftover 0]
+
+    if {([info exists opts(file)] && [info exists opts(channel)]) ||
+        ! ([info exists opts(file)] || [info exists opts(channel)])} {
+        error "Exactly one of -file or -channel must be specified."
+    }
+    
+    set flags $opts(ignorequeryerrors)
+    incr flags $opts(direction)
+
+    if {[info exists opts(file)]} {
+        set path [_evt_normalize_path $opts(file)]
+        incr flags 0x2
+    } else {
+        set path $opts(channel)
+        incr flags 0x1
+    }
+
+    return [EvtQuery $opts(session) $path $opts(query) $flags]
+}
+
+proc twapi::evt_next {hresultset args} {
+    array set opts [parseargs args {
+        {timeout.int -1}
+        {count.int 1}
+        {status.arg}
+    } -maxleftover 0]
+
+    if {[info exists opts(status)]} {
+        upvar 1 $opts(status) status
+        return [EvtNext $hresultset $opts(count) $opts(timeout) 0 status]
+    } else {
+        return [EvtNext $hresultset $opts(count) $opts(timeout) 0]
+    }
+}
+
+twapi::proc* twapi::_evt_decode_event_system_fields {hevt} {
+    _evt_init
+} {
+    variable _evt
+    set _evt(render_buffer) [Twapi_EvtRenderValues $_evt(system_render_context_handle) $hevt $_evt(render_buffer)]
+    set rec [Twapi_ExtractEVT_RENDER_VALUES $_evt(render_buffer)]
+    return [evt_system_fields set $rec \
+                -providername [atomize [evt_system_fields -providername $rec]] \
+                -providerguid [atomize [evt_system_fields -providerguid $rec]] \
+                -channel [atomize [evt_system_fields -channel $rec]] \
+                -computer [atomize [evt_system_fields -computer $rec]]]
+}
+
+# TBD - document. Returns a list of user data values
+twapi::proc* twapi::evt_decode_event_userdata {hevt} {
+    _evt_init
+} {
+    variable _evt
+    set _evt(render_buffer) [Twapi_EvtRenderValues $_evt(user_render_context_handle) $hevt $_evt(render_buffer)]
+    return [Twapi_ExtractEVT_RENDER_VALUES $_evt(render_buffer)]
+}
+
+twapi::proc* twapi::evt_decode_events {hevts args} {
+    _evt_init
+} {
+    variable _evt
+
+    array set opts [parseargs args {
+        {values.arg NULL}
+        {session.arg NULL}
+        {logfile.arg ""}
+        {lcid.int 0}
+        ignorestring.arg
+        message
+        levelname
+        taskname
+        opcodename
+        keywords
+        xml
+    } -ignoreunknown -hyphenated]
+        
+    # SAME ORDER AS _evt_decode_event_system_fields
+    set decoded_fields [evt_system_fields]
+    set decoded_events {}
+    
+    # ORDER MUST BE SAME AS order in which values are appended below
+    foreach opt {-levelname -taskname -opcodename -keywords -xml -message} {
+        if {$opts($opt)} {
+            lappend decoded_fields $opt
+        }
+    }
+
+    foreach hevt $hevts {
+        set decoded [_evt_decode_event_system_fields $hevt]
+        # Get publisher from hevt
+        set publisher [evt_system_fields -providername $decoded]
+
+        if {! [dict exists $_evt(publisher_handles) $publisher $opts(-session) $opts(-lcid)]} {
+            if {[catch {
+                dict set _evt(publisher_handles) $publisher $opts(-session) $opts(-lcid) [EvtOpenPublisherMetadata $opts(-session) $publisher $opts(-logfile) $opts(-lcid) 0]
+            }]} {
+                # TBD - debug log
+                dict set _evt(publisher_handles) $publisher $opts(-session) $opts(-lcid) NULL
+            }
+        }
+        set hpub [dict get $_evt(publisher_handles) $publisher $opts(-session) $opts(-lcid)]
+
+        # See if cached values are present for -levelname -taskname
+        # and -opcodename. TBD - can -keywords be added to this ?
+        foreach {intopt opt callflag} {-level -levelname 2 -task -taskname 3 -opcode -opcodename 4} {
+            if {$opts($opt)} {
+                set ival [evt_system_fields $intopt $decoded]
+                if {[dict exists $_evt($opt) $publisher $ival]} {
+                    lappend decoded [dict get $_evt($opt) $publisher $ival]
+                } else {
+                    # Not cached. Look it up. Value of 0 -> null so
+                    # just use ignorestring if specified.
+                    if {$ival == 0 && [info exists opts(-ignorestring)]} {
+                        set optval $opts(-ignorestring)
+                    } else {
+                        if {[info exists opts(-ignorestring)]} {
+                            if {[EvtFormatMessage $hpub $hevt 0 $opts(-values) $callflag optval]} {
+                                dict set _evt($opt) $publisher $ival $optval
+                            } else {
+                                # Note result not cached if not found since
+                                # ignorestring may be different on every call
+                                set optval $opts(-ignorestring)
+                            }
+                        } else {
+                            # -ignorestring not specified so
+                            # will raise error if not found
+                            set optval [EvtFormatMessage $hpub $hevt 0 $opts(-values) $callflag]
+                            dict set _evt($opt) $publisher $ival [atomize $optval]
+                        }
+                    }
+                    lappend decoded $optval
+                }
+            }
+        }
+
+        # Non-cached fields
+        # ORDER MUST BE SAME AS decoded_fields ABOVE
+        foreach {opt callflag} {
+            -keywords 5
+            -xml 9
+        } {
+            if {$opts($opt)} {
+                if {[info exists opts(-ignorestring)]} {
+                    if {! [EvtFormatMessage $hpub $hevt 0 $opts(-values) $callflag optval]} {
+                        set optval $opts(-ignorestring)
+                    }
+                } else {
+                    set optval [EvtFormatMessage $hpub $hevt 0 $opts(-values) $callflag]
+                }
+                lappend decoded $optval
+            }
+        }
+
+        # We treat -message differently because on failure we want
+        # to extract the user data. -ignorestring is not used for this
+        # unless user data extraction also fails
+        if {$opts(-message)} {
+            if {[EvtFormatMessage $hpub $hevt 0 $opts(-values) 1 message]} {
+                lappend decoded $message
+            } else {
+                # TBD - make sure we have a test for this case.
+                # TBD - log
+                if {[catch {
+                    lappend decoded "Message for event could not be found. Event contained user data: [join [evt_decode_event_userdata $hevt] ,]"
+                } message]} {
+                    if {[info exists opts(-ignorestring)]} {
+                        lappend decoded $opts(-ignorestring)
+                    } else {
+                        error $message
+                    }
+                }
+            }
+        }
+        
+        lappend decoded_events $decoded
+    }
+
+    return [list $decoded_fields $decoded_events]
+}
+
+proc twapi::evt_decode_event {hevt args} {
+    return [recordarray index [evt_decode_events [list $hevt] {*}$args] 0 -format dict]
+}
+
+# TBD - document
+proc twapi::evt_format_publisher_message {hpub msgid args} {
+
+    array set opts [parseargs args {
+        {values.arg NULL}
+    } -maxleftover 0]
+        
+    return [EvtFormatMessage $hpub NULL $msgid $opts(values) 8]
+}
+
+# TBD - document
+# Where is this used?
+proc twapi::evt_free_EVT_VARIANT_ARRAY {p} {
+    evt_free $p
+}
+
+# TBD - document
+# Where is this used?
+proc twapi::evt_free_EVT_RENDER_VALUES {p} {
+    evt_free $p
+}
+
+# TBD - document
+proc twapi::evt_seek {hresults pos args} {
+    array set opts [parseargs args {
+        {origin.arg first {first last current}}
+        bookmark.arg
+        {strict 0 0x10000}
+    } -maxleftover 0]
+
+    if {[info exists opts(bookmark)]} {
+        set flags 4
+    } else {
+        set flags [lsearch -exact {first last current} $opts(origin)]
+        incr flags;             # 1 -> first, 2 -> last, 3 -> current
+        set opts(bookmark) NULL
+    }
+        
+    incr flags $opts(strict)
+
+    EvtSeek $hresults $pos $opts(bookmark) 0 $flags
+}
+
+proc twapi::evt_subscribe {path args} {
+    # TBD - document -session and -bookmark and -strict
+    array set opts [parseargs args {
+        {session.arg NULL}
+        {query.arg *}
+        bookmark.arg
+        includeexisting
+        {ignorequeryerrors 0 0x1000}
+        {strict 0 0x10000}
+    } -maxleftover 0]
+
+    set flags [expr {$opts(ignorequeryerrors) | $opts(strict)}]
+    if {[info exists opts(bookmark)]} {
+        set flags [expr {$flags | 3}]
+        set bookmark $opts(origin)
+    } else {
+        set bookmark NULL
+        if {$opts(includeexisting)} {
+            set flags [expr {$flags | 2}]
+        } else {
+            set flags [expr {$flags | 1}]
+        }
+    }
+
+    set hevent [lindex [CreateEvent [_make_secattr {} 0] 0 0 ""] 0]
+    if {[catch {
+        EvtSubscribe $opts(session) $hevent $path $opts(query) $bookmark $flags
+    } hsubscribe]} {
+        set erinfo $::errorInfo
+        set ercode $::errorCode
+        CloseHandle $hevent
+        error $hsubscribe $erinfo $ercode
+    }
+
+    return [list $hsubscribe $hevent]
+}
+
+proc twapi::_evt_normalize_path {path} {
+    # Do not want to rely on [file normalize] returning "" for ""
+    if {$path eq ""} {
+        return ""
+    } else {
+        return [file nativename [file normalize $path]]
+    }
+}
+
+proc twapi::_evt_dump {args} {
+    array set opts [parseargs args {
+        {outfd.arg stdout}
+        count.int
+    } -ignoreunknown]
+
+    set hq [evt_query {*}$args]
+    trap {
+        while {[llength [set hevts [evt_next $hq]]]} {
+            trap {
+                foreach ev [recordarray getlist [evt_decode_events $hevts -message -ignorestring None.] -format dict] {
+                    if {[info exists opts(count)] &&
+                        [incr opts(count) -1] < 0} {
+                        return
+                    }
+                    puts $opts(outfd) "[dict get $ev -timecreated] [dict get $ev -eventrecordid] [dict get $ev -providername]: [dict get $ev -eventrecordid] [dict get $ev -message]"
+                }
+            } finally {
+                evt_close {*}$hevts
+            }
+        }
+    } finally {
+        evt_close $hq
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/handle.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/handle.tcl
new file mode 100644
index 00000000..223608ac
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/handle.tcl
@@ -0,0 +1,236 @@
+#
+# Copyright (c) 2010, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {
+    # Array maps handles we are waiting on to the ids of the registered waits
+    variable _wait_handle_ids
+    # Array maps id of registered wait to the corresponding callback scripts
+    variable _wait_handle_scripts
+    
+}
+
+proc twapi::cast_handle {h type} {
+    # TBD - should this use pointer_from_address:
+    #    return [pointer_from_address [address_from_pointer $h] $type]
+    return [list [lindex $h 0] $type]
+}
+
+proc twapi::close_handle {h} {
+
+    # Cancel waits on the handle, if any
+    cancel_wait_on_handle $h
+    
+    # Then close it
+    CloseHandle $h
+}
+
+# Close multiple handles. In case of errors, collects them but keeps
+# closing remaining handles and only raises the error at the end.
+proc twapi::close_handles {args} {
+    # The original definition for this was broken in that it would
+    # gracefully accept non list parameters as a list of one. In 3.0
+    # the handle format has changed so this does not happen
+    # naturally. We have to try and decipher whether it is a list
+    # of handles or a single handle.
+
+    foreach arg $args {
+        if {[pointer? $arg]} {
+            # Looks like a single handle
+            if {[catch {close_handle $arg} msg]} {
+                set erinfo $::errorInfo
+                set ercode $::errorCode
+                set ermsg $msg
+            }
+        } else {
+            # Assume a list of handles
+            foreach h $arg {
+                if {[catch {close_handle $h} msg]} {
+                    set erinfo $::errorInfo
+                    set ercode $::errorCode
+                    set ermsg $msg
+                }
+            }
+        }
+    }
+
+    if {[info exists erinfo]} {
+        error $msg $erinfo $ercode
+    }
+}
+
+#
+# Wait on a handle
+proc twapi::wait_on_handle {hwait args} {
+    variable _wait_handle_ids
+    variable _wait_handle_scripts
+
+    # When we are invoked from callback, handle is always typed as HANDLE
+    # so convert it so lookups succeed
+    set h [cast_handle $hwait HANDLE]
+
+    # 0x00000008 ->   # WT_EXECUTEONCEONLY
+    array set opts [parseargs args {
+        {wait.int -1}
+        async.arg
+        {executeonce.bool false 0x00000008}
+    }]
+
+    if {![info exists opts(async)]} {
+        if {[info exists _wait_handle_ids($h)]} {
+            error "Attempt to synchronously wait on handle that is registered for an asynchronous wait."
+        }
+
+        set ret [WaitForSingleObject $h $opts(wait)]
+        if {$ret == 0x80} {
+            return abandoned
+        } elseif {$ret == 0} {
+            return signalled
+        } elseif {$ret == 0x102} {
+            return timeout
+        } else {
+            error "Unexpected value $ret returned from WaitForSingleObject"
+        }
+    }
+
+    # async option specified
+
+    # Do not wait on manual reset events as cpu will spin continuously
+    # queueing events
+    if {[pointer? $hwait HANDLE_MANUALRESETEVENT] &&
+        ! $opts(executeonce)
+    } {
+        error "A handle to a manual reset event cannot be waited on asynchronously unless -executeonce is specified."
+    }
+
+    # If handle already registered, cancel previous registration.
+    if {[info exists _wait_handle_ids($h)]} {
+        cancel_wait_on_handle $h
+    }
+
+
+    set id [Twapi_RegisterWaitOnHandle $h $opts(wait) $opts(executeonce)]
+
+    # Set now that successfully registered
+    set _wait_handle_scripts($id) $opts(async)
+    set _wait_handle_ids($h) $id
+
+    return
+}
+
+#
+# Cancel an async wait on a handle
+proc twapi::cancel_wait_on_handle {h} {
+    variable _wait_handle_ids
+    variable _wait_handle_scripts
+
+    if {[info exists _wait_handle_ids($h)]} {
+        Twapi_UnregisterWaitOnHandle $_wait_handle_ids($h)
+        unset _wait_handle_scripts($_wait_handle_ids($h))
+        unset _wait_handle_ids($h)
+    }
+}
+
+#
+# Called from C when a handle is signalled or times out
+proc twapi::_wait_handler {id h event} {
+    variable _wait_handle_ids
+    variable _wait_handle_scripts
+
+    # We ignore the following stale event cases -
+    #  - _wait_handle_ids($h) does not exist : the wait was canceled while
+    #    and event was queued
+    #  - _wait_handle_ids($h) exists but is different from $id - same
+    #    as prior case, except that a new wait has since been initiated
+    #    on the same handle value (which might have be for a different
+    #    resource
+
+    if {[info exists _wait_handle_ids($h)] &&
+        $_wait_handle_ids($h) == $id} {
+        uplevel #0 [linsert $_wait_handle_scripts($id) end $h $event]
+    }
+
+    return
+}
+
+# Get the handle for a Tcl channel
+proc twapi::get_tcl_channel_handle {chan direction} {
+    set direction [expr {[string equal $direction "write"] ? 1 : 0}]
+    return [Tcl_GetChannelHandle $chan $direction]
+}
+
+# Duplicate a OS handle
+proc twapi::duplicate_handle {h args} {
+    variable my_process_handle
+
+    array set opts [parseargs args {
+        sourcepid.int
+        targetpid.int
+        access.arg
+        inherit
+        closesource
+    } -maxleftover 0]
+
+    # Assume source and target processes are us
+    set source_ph $my_process_handle
+    set target_ph $my_process_handle
+
+    if {[string is wideinteger $h]} {
+        set h [pointer_from_address $h HANDLE]
+    }
+
+    trap {
+        set me [pid]
+        # If source pid specified and is not us, get a handle to the process
+        if {[info exists opts(sourcepid)] && $opts(sourcepid) != $me} {
+            set source_ph [get_process_handle $opts(sourcepid) -access process_dup_handle]
+        }
+
+        # Ditto for target process...
+        if {[info exists opts(targetpid)] && $opts(targetpid) != $me} {
+            set target_ph [get_process_handle $opts(targetpid) -access process_dup_handle]
+        }
+
+        # Do we want to close the original handle (DUPLICATE_CLOSE_SOURCE)
+        set flags [expr {$opts(closesource) ? 0x1: 0}]
+
+        if {[info exists opts(access)]} {
+            set access [_access_rights_to_mask $opts(access)]
+        } else {
+            # If no desired access is indicated, we want the same access as
+            # the original handle
+            set access 0
+            set flags [expr {$flags | 0x2}]; # DUPLICATE_SAME_ACCESS
+        }
+
+
+        set dup [DuplicateHandle $source_ph $h $target_ph $access $opts(inherit) $flags]
+
+        # IF targetpid specified, return handle else literal
+        # (even if targetpid is us)
+        if {[info exists opts(targetpid)]} {
+            set dup [pointer_to_address $dup]
+        }
+    } finally {
+        if {$source_ph != $my_process_handle} {
+            CloseHandle $source_ph
+        }
+        if {$target_ph != $my_process_handle} {
+            CloseHandle $source_ph
+        }
+    }
+
+    return $dup
+}
+
+proc twapi::set_handle_inheritance {h inherit} {
+    # 1 -> HANDLE_FLAG_INHERIT
+    SetHandleInformation $h 0x1 [expr {$inherit ? 1 : 0}]
+}
+
+proc twapi::get_handle_inheritance {h} {
+    # 1 -> HANDLE_FLAG_INHERIT
+    return [expr {[GetHandleInformation $h] & 1}]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/input.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/input.tcl
new file mode 100644
index 00000000..cdae8cea
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/input.tcl
@@ -0,0 +1,623 @@
+#
+# Copyright (c) 2012 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+package require twapi_ui;       # SetCursorPos etc.
+
+# Enable window input
+proc twapi::enable_window_input {hwin} {
+    return [expr {[EnableWindow $hwin 1] != 0}]
+}
+
+# Disable window input
+proc twapi::disable_window_input {hwin} {
+    return [expr {[EnableWindow $hwin 0] != 0}]
+}
+
+# CHeck if window input is enabled
+proc twapi::window_input_enabled {hwin} {
+    return [IsWindowEnabled $hwin]
+}
+
+# Simulate user input
+proc twapi::send_input {inputlist} {
+    array set input_defs {
+        MOUSEEVENTF_MOVE        0x0001
+        MOUSEEVENTF_LEFTDOWN    0x0002
+        MOUSEEVENTF_LEFTUP      0x0004
+        MOUSEEVENTF_RIGHTDOWN   0x0008
+        MOUSEEVENTF_RIGHTUP     0x0010
+        MOUSEEVENTF_MIDDLEDOWN  0x0020
+        MOUSEEVENTF_MIDDLEUP    0x0040
+        MOUSEEVENTF_XDOWN       0x0080
+        MOUSEEVENTF_XUP         0x0100
+        MOUSEEVENTF_WHEEL       0x0800
+        MOUSEEVENTF_VIRTUALDESK 0x4000
+        MOUSEEVENTF_ABSOLUTE    0x8000
+        
+        KEYEVENTF_EXTENDEDKEY 0x0001
+        KEYEVENTF_KEYUP       0x0002
+        KEYEVENTF_UNICODE     0x0004
+        KEYEVENTF_SCANCODE    0x0008
+
+        XBUTTON1      0x0001
+        XBUTTON2      0x0002
+    }
+
+    set inputs [list ]
+    foreach input $inputlist {
+        if {[string equal [lindex $input 0] "mouse"]} {
+            lassign $input mouse xpos ypos
+            set mouseopts [lrange $input 3 end]
+            array unset opts
+            array set opts [parseargs mouseopts {
+                relative moved
+                ldown lup rdown rup mdown mup x1down x1up x2down x2up
+                wheel.int
+            }]
+            set flags 0
+            if {! $opts(relative)} {
+                set flags $input_defs(MOUSEEVENTF_ABSOLUTE)
+            }
+
+            if {[info exists opts(wheel)]} {
+                if {($opts(x1down) || $opts(x1up) || $opts(x2down) || $opts(x2up))} {
+                    error "The -wheel input event attribute may not be specified with -x1up, -x1down, -x2up or -x2down events"
+                }
+                set mousedata $opts(wheel)
+                set flags $input_defs(MOUSEEVENTF_WHEEL)
+            } else {
+                if {$opts(x1down) || $opts(x1up)} {
+                    if {$opts(x2down) || $opts(x2up)} {
+                        error "The -x1down, -x1up mouse input attributes are mutually exclusive with -x2down, -x2up attributes"
+                    }
+                    set mousedata $input_defs(XBUTTON1)
+                } else {
+                    if {$opts(x2down) || $opts(x2up)} {
+                        set mousedata $input_defs(XBUTTON2)
+                    } else {
+                        set mousedata 0
+                    }
+                }
+            }
+            foreach {opt flag} {
+                moved MOVE
+                ldown LEFTDOWN
+                lup   LEFTUP
+                rdown RIGHTDOWN
+                rup   RIGHTUP
+                mdown MIDDLEDOWN
+                mup   MIDDLEUP
+                x1down XDOWN
+                x1up   XUP
+                x2down XDOWN
+                x2up   XUP
+            } {
+                if {$opts($opt)} {
+                    set flags [expr {$flags | $input_defs(MOUSEEVENTF_$flag)}]
+                }
+            }
+
+            lappend inputs [list mouse $xpos $ypos $mousedata $flags]
+
+        } else {
+            lassign $input inputtype vk scan keyopts
+            if {"-extended" ni $keyopts} {
+                set extended 0
+            } else {
+                set extended $input_defs(KEYEVENTF_EXTENDEDKEY)
+            }
+            if {"-usescan" ni $keyopts} {
+                set usescan 0
+            } else {
+                set usescan $input_defs(KEYEVENTF_SCANCODE)
+            }
+            switch -exact -- $inputtype {
+                keydown {
+                    lappend inputs [list key $vk $scan [expr {$extended|$usescan}]]
+                }
+                keyup {
+                    lappend inputs [list key $vk $scan \
+                                        [expr {$extended
+                                               | $usescan
+                                               | $input_defs(KEYEVENTF_KEYUP)
+                                           }]]
+                }
+                key {
+                    lappend inputs [list key $vk $scan [expr {$extended|$usescan}]]
+                    lappend inputs [list key $vk $scan \
+                                        [expr {$extended
+                                               | $usescan
+                                               | $input_defs(KEYEVENTF_KEYUP)
+                                           }]]
+                }
+                unicode {
+                    lappend inputs [list key 0 $scan $input_defs(KEYEVENTF_UNICODE)]
+                    lappend inputs [list key 0 $scan \
+                                        [expr {$input_defs(KEYEVENTF_UNICODE)
+                                               | $input_defs(KEYEVENTF_KEYUP)
+                                           }]]
+                }
+                default {
+                    error "Unknown input type '$inputtype'"
+                }
+            }
+        }
+    }
+
+    SendInput $inputs
+}
+
+# Block the input
+proc twapi::block_input {} {
+    return [BlockInput 1]
+}
+
+# Unblock the input
+proc twapi::unblock_input {} {
+    return [BlockInput 0]
+}
+
+# Send the given set of characters to the input queue
+proc twapi::send_input_text {s} {
+    return [Twapi_SendUnicode $s]
+}
+
+# send_keys - uses same syntax as VB SendKeys function
+proc twapi::send_keys {keys} {
+    set inputs [_parse_send_keys $keys]
+    send_input $inputs
+}
+
+
+# Handles a hotkey notification
+proc twapi::_hotkey_handler {msg atom key msgpos ticks} {
+    variable _hotkeys
+
+    # Note it is not an error if a hotkey does not exist since it could
+    # have been deregistered in the time between hotkey input and receiving it.
+    set code 0
+    if {[info exists _hotkeys($atom)]} {
+        foreach handler $_hotkeys($atom) {
+            set code [catch {uplevel #0 $handler} msg]
+            switch -exact -- $code {
+                0 {
+                    # Normal, keep going
+                }
+                1 {
+                    # Error - put in background and abort
+                    after 0 [list error $msg $::errorInfo $::errorCode]
+                    break
+                }
+                3 {
+                    break;      # Ignore remaining handlers
+                }
+                default {
+                    # Keep going
+                }
+            }
+        }
+    }
+    return -code $code ""
+}
+
+proc twapi::register_hotkey {hotkey script args} {
+    variable _hotkeys
+
+    # 0x312 -> WM_HOTKEY
+    _register_script_wm_handler 0x312 [list [namespace current]::_hotkey_handler] 1
+
+    array set opts [parseargs args {
+        append
+    } -maxleftover 0]
+
+#    set script [lrange $script 0 end]; # Ensure a valid list
+
+    lassign  [_hotkeysyms_to_vk $hotkey]  modifiers vk
+    set hkid "twapi_hk_${vk}_$modifiers"
+    set atom [GlobalAddAtom $hkid]
+    if {[info exists _hotkeys($atom)]} {
+        GlobalDeleteAtom $atom; # Undo above AddAtom since already there
+        if {$opts(append)} {
+            lappend _hotkeys($atom) $script
+        } else {
+            set _hotkeys($atom) [list $script]; # Replace previous script
+        }
+        return $atom
+    }
+    trap {
+        RegisterHotKey $atom $modifiers $vk
+    } onerror {} {
+        GlobalDeleteAtom $atom; # Undo above AddAtom
+        rethrow
+    }
+    set _hotkeys($atom) [list $script]; # Replace previous script
+    return $atom
+}
+
+proc twapi::unregister_hotkey {atom} {
+    variable _hotkeys
+    if {[info exists _hotkeys($atom)]} {
+        UnregisterHotKey $atom
+        GlobalDeleteAtom $atom
+        unset _hotkeys($atom)
+    }
+}
+
+
+# Simulate clicking a mouse button
+proc twapi::click_mouse_button {button} {
+    switch -exact -- $button {
+        1 -
+        left { set down -ldown ; set up -lup}
+        2 -
+        right { set down -rdown ; set up -rup}
+        3 -
+        middle { set down -mdown ; set up -mup}
+        x1     { set down -x1down ; set up -x1up}
+        x2     { set down -x2down ; set up -x2up}
+        default {error "Invalid mouse button '$button' specified"}
+    }
+
+    send_input [list \
+                    [list mouse 0 0 $down] \
+                    [list mouse 0 0 $up]]
+    return
+}
+
+# Simulate mouse movement
+proc twapi::move_mouse {xpos ypos {mode ""}} {
+    # If mouse trails are enabled, it leaves traces when the mouse is
+    # moved and does not clear them until mouse is moved again. So
+    # we temporarily disable mouse trails if we can
+
+    if {[llength [info commands ::twapi::get_system_parameters_info]] != 0} {
+        set trail [get_system_parameters_info SPI_GETMOUSETRAILS]
+        set_system_parameters_info SPI_SETMOUSETRAILS 0
+    }
+    switch -exact -- $mode {
+        -relative {
+            lappend cmd -relative
+            lassign [GetCursorPos] curx cury
+            incr xpos $curx
+            incr ypos $cury
+        }
+        -absolute -
+        ""        { }
+        default   { error "Invalid mouse movement mode '$mode'" }
+    }
+
+    SetCursorPos $xpos $ypos
+
+    # Restore trail setting if we had disabled it and it was originally enabled
+    if {[info exists trail] && $trail} {
+        set_system_parameters_info SPI_SETMOUSETRAILS $trail
+    }
+}
+
+# Simulate turning of the mouse wheel
+proc twapi::turn_mouse_wheel {wheelunits} {
+    send_input [list [list mouse 0 0 -relative -wheel $wheelunits]]
+    return
+}
+
+# Get the mouse/cursor position
+proc twapi::get_mouse_location {} {
+    return [GetCursorPos]
+}
+
+proc twapi::get_input_idle_time {} {
+    # The formats are to convert wrapped 32bit signed to unsigned
+    set last_event [format 0x%x [GetLastInputInfo]]
+    set now [format 0x%x [GetTickCount]]
+
+    # Deal with wrap around
+    if {$now >= $last_event} {
+        return [expr {$now - $last_event}]
+    } else {
+        return [expr {$now + (0xffffffff - $last_event) + 1}]
+    }
+}
+
+# Initialize the virtual key table
+proc twapi::_init_vk_map {} {
+    variable vk_map
+
+    if {![info exists vk_map]} {
+        # Map tokens to VK_* key codes
+        array set vk_map {
+            BACK {0x08 0}
+            BACKSPACE {0x08 0}   BS {0x08 0}   BKSP {0x08 0}   TAB {0x09 0}
+            CLEAR {0x0C 0}   RETURN {0x0D 0}   ENTER {0x0D 0}   SHIFT {0x10 0}
+            CONTROL {0x11 0}   MENU {0x12 0}   ALT {0x12 0}   PAUSE {0x13 0}
+            BREAK {0x13 0}   CAPITAL {0x14 0}   CAPSLOCK {0x14 0}
+            KANA {0x15 0}   HANGEUL {0x15 0}   HANGUL {0x15 0}   JUNJA {0x17 0}
+            FINAL {0x18 0}   HANJA {0x19 0}   KANJI {0x19 0}   ESCAPE {0x1B 0}
+            ESC {0x1B 0}   CONVERT {0x1C 0}   NONCONVERT {0x1D 0}
+            ACCEPT {0x1E 0}   MODECHANGE {0x1F 0}   SPACE {0x20 0}
+            PRIOR {0x21 0}   PGUP {0x21 0}   NEXT {0x22 0}   PGDN {0x22 0}
+            END {0x23 0}   HOME {0x24 0}   LEFT {0x25 0}   UP {0x26 0}
+            RIGHT {0x27 0}   DOWN {0x28 0}   SELECT {0x29 0}
+            PRINT {0x2A 0}   PRTSC {0x2C 0}   EXECUTE {0x2B 0}
+            SNAPSHOT {0x2C 0}   INSERT {0x2D 0}   INS {0x2D 0}
+            DELETE {0x2E 0}   DEL {0x2E 0}   HELP {0x2F 0}   LWIN {0x5B 0}
+            RWIN {0x5C 0}   APPS {0x5D 0}   SLEEP {0x5F 0}   NUMPAD0 {0x60 0}
+            NUMPAD1 {0x61 0}   NUMPAD2 {0x62 0}   NUMPAD3 {0x63 0}
+            NUMPAD4 {0x64 0}   NUMPAD5 {0x65 0}   NUMPAD6 {0x66 0}
+            NUMPAD7 {0x67 0}   NUMPAD8 {0x68 0}   NUMPAD9 {0x69 0}
+            MULTIPLY {0x6A 0}   ADD {0x6B 0}   SEPARATOR {0x6C 0}
+            SUBTRACT {0x6D 0}   DECIMAL {0x6E 0}   DIVIDE {0x6F 0}
+            F1 {0x70 0}   F2 {0x71 0}   F3 {0x72 0}   F4 {0x73 0}
+            F5 {0x74 0}   F6 {0x75 0}   F7 {0x76 0}   F8 {0x77 0}
+            F9 {0x78 0}   F10 {0x79 0}   F11 {0x7A 0}   F12 {0x7B 0}
+            F13 {0x7C 0}   F14 {0x7D 0}   F15 {0x7E 0}   F16 {0x7F 0}
+            F17 {0x80 0}   F18 {0x81 0}   F19 {0x82 0}   F20 {0x83 0}
+            F21 {0x84 0}   F22 {0x85 0}   F23 {0x86 0}   F24 {0x87 0}
+            NUMLOCK {0x90 0}   SCROLL {0x91 0}   SCROLLLOCK {0x91 0}
+            LSHIFT {0xA0 0}   RSHIFT {0xA1 0 -extended}   LCONTROL {0xA2 0}
+            RCONTROL {0xA3 0 -extended}   LMENU {0xA4 0}   LALT {0xA4 0}
+            RMENU {0xA5 0 -extended}   RALT {0xA5 0 -extended}
+            BROWSER_BACK {0xA6 0}   BROWSER_FORWARD {0xA7 0}
+            BROWSER_REFRESH {0xA8 0}   BROWSER_STOP {0xA9 0}
+            BROWSER_SEARCH {0xAA 0}   BROWSER_FAVORITES {0xAB 0}
+            BROWSER_HOME {0xAC 0}   VOLUME_MUTE {0xAD 0}
+            VOLUME_DOWN {0xAE 0}   VOLUME_UP {0xAF 0}
+            MEDIA_NEXT_TRACK {0xB0 0}   MEDIA_PREV_TRACK {0xB1 0}
+            MEDIA_STOP {0xB2 0}   MEDIA_PLAY_PAUSE {0xB3 0}
+            LAUNCH_MAIL {0xB4 0}   LAUNCH_MEDIA_SELECT {0xB5 0}
+            LAUNCH_APP1 {0xB6 0}   LAUNCH_APP2 {0xB7 0}
+        }
+    }
+}
+
+# Find the next token from a send_keys argument
+# Returns pair token,position after token
+proc twapi::_parse_send_key_token {keys start} {
+    set char [string index $keys $start]
+    if {$char ne "\{"} {
+        return [list $char [incr start]]
+    }
+    # Need to find the matching end brace. Note special case of
+    # start/end brace enclosed within braces
+    set n [string length $keys]
+    # Jump past brace and succeeding character (which may be end brace)
+    set terminator [string first "\}" $keys $start+2]
+    if {$terminator < 0} {
+        error "Unterminated or empty braced key token."
+    }
+    return [list [string range $keys $start $terminator] [incr terminator]]
+}
+
+# Appends to inputs the trailer in reverse order. trailer is reset
+proc twapi::_flush_send_keys_trailer {vinputs vtrailer} {
+    upvar 1 $vinputs inputs
+    upvar 1 $vtrailer trailer
+
+    lappend inputs {*}[lreverse $trailer]
+    set trailer {}
+}
+
+# Constructs a list of input events by parsing a string in the format
+# used by Visual Basic's SendKeys function. See that documentation
+# for syntax.
+proc twapi::_parse_send_keys {keys} {
+    variable vk_map
+
+    _init_vk_map
+    array set modifier_vk {+ 0x10 ^ 0x11 % 0x12}
+
+    # Array state holds state of the parse. An atom refers to a single
+    # character or a () group.
+    #  modifiers - list of current modifiers in order they were added including
+    #     those coming from containing groups.
+    #  group_modifiers - stack of modifiers state when parsing groups.
+    #     When a group begins, state(modifiers) is pushed on this stack.
+    #     The top of the stack is used to initialize state(modifiers)
+    #     for every atom within the group. When the group ends,
+    #     the top of the stack is popped and discarded and state(modifiers)
+    #     is reinitialized to new top of stack.
+    #  trailer - list of trailing input records to add after next atom. Note
+    #    these are stored in order of occurence but need to be reversed
+    #    when emitted
+    #  group_trailers - stack of trailers to add after group ends. Each
+    #    element is a trailer which is a list of input records.
+    #  cleanup_trailer - to be emitted right at the end if we have to
+    #    reset CAPSLOCK/NUMLOCK/SCROLL
+    set state(modifiers) {}
+    set state(group_modifiers) [list $state(modifiers)]; # "Global" group
+    set state(trailer) {}
+    set state(group_trailers) {}
+    set state(cleanup_trailer) {}
+
+    set inputs {}
+
+    # If {CAPS,NUM,SCROLL}LOCK are set, need to reset them and then
+    # set them back
+    foreach vk {20 144 145} {
+        if {[GetKeyState $vk]} {
+            lappend inputs [list key $vk 0]
+            lappend state(cleanup_trailer) [list key $vk 0]
+        }
+    }
+
+    set keyslen [string length $keys]
+    set pos 0;                  # Current parse position
+    while {$pos < $keyslen} {
+        lassign [_parse_send_key_token $keys $pos] token pos
+        switch -exact -- $token {
+            + -
+            ^ -
+            % {
+                if {$token in $state(modifiers)} {
+                    # Following VB SendKeys
+                    error "Modifier state for $token already set."
+                }
+                lappend state(modifiers) $token
+                lappend inputs [list keydown $modifier_vk($token) 0]
+                lappend state(trailer) [list keyup $modifier_vk($token) 0]
+            }
+            "(" {
+                # Start a group
+                lappend state(group_modifiers) $state(modifiers)
+                lappend state(group_trailers) $state(trailer)
+                set state(trailer) {}
+            }
+            ")" {
+                # Terminates group. Illegal if no group collection in progress
+                if {[llength $state(group_trailers)] == 0} {
+                    error "Unmatched \")\" in send_keys string."
+                }
+                # If there is a live trailer inside group, emit it e.g. +(ab^)
+                _flush_send_keys_trailer inputs state(trailer)
+                # Now emit the group trailer
+                set trailer [lpop state(group_trailers)]
+                _flush_send_keys_trailer inputs trailer
+                # Discard the initial modifier state for this group
+                lpop state(group_modifiers)
+                # Set the current modifiers to outer group state
+                set state(modifiers) [lindex $state(group_modifiers) end]
+            }
+            default {
+                if {$token eq "~"} {
+                    set token "{ENTER}"
+                }
+                # May be a single character to send, a braced virtual key
+                # or a braced single char with count
+                if {[string length $token] == 1} {
+                    # Single character.
+                    set key $token
+                    set nch 1
+                } elseif {[string index $token 0] eq "\{"} {
+                    # NOTE: a ~ inside a brace is treated as a literal ~
+                    # and not the ENTER key
+                    # Look for space skipping the starting brace and following
+                    # character which may be itself a space (to be repeated)
+                    set space_pos [string first " " $token 2]
+                    if {$space_pos < 0} {
+                        # No space found
+                        set nch 1
+                        set key [string range $token 1 end-1]
+                    } else {
+                        # A key followed by a count
+                        # Note space_pos >= 2
+                        set key [string range $token 1 $space_pos-1]
+                        set nch [string trim [string range $token $space_pos+1 end-1]]
+                        if {![string is integer -strict $nch] || $nch < 0} {
+                            error "Invalid count \"$nch\" in send_keys."
+                        } 
+                    }
+                } else {
+                    # Problem in token parsing. Would be a bug.
+                    error "Internal error: invalid token \"$token\" parsing send_keys string."
+                }
+
+                set vk_leader  {}
+                set vk_trailer {}
+                if {[string length $key] == 1} {
+                    # Single character
+                    lassign [VkKeyScan $key] modifiers vk
+                    if {$modifiers == -1 || $vk == -1} {
+                        scan $key %c code_point
+                        set vk_rec [list unicode 0 $code_point]
+                    } else {
+                        # Generates input records for modifiers that are set
+                        # unless they are already set. NOTE: Do NOT set the
+                        # state(modifier) state since they will be in effect
+                        # only for the current character. This is for correctly
+                        # showing A-Z with shift and Ctrl-A etc. with control.
+                        if {($modifiers & 0x1) && ("+" ni $state(modifiers))} {
+                            lappend vk_leader  [list keydown 0x10 0]
+                            lappend vk_trailer [list keyup 0x10 0]
+                        }
+                        if {($modifiers & 0x2) && ("^" ni $state(modifiers))} {
+                            lappend vk_leader  [list keydown 0x11 0]
+                            lappend vk_trailer [list keyup 0x11 0]
+                        }
+
+                        if {($modifiers & 0x4) && ("%" ni $state(modifiers))} {
+                            lappend vk_leader  [list keydown 0x12 0]
+                            lappend vk_trailer [list keyup 0x12 0]
+                        }
+                        set vk_rec [list key $vk 0]
+                    }
+                } else {
+                    # Virtual key string. Note modifiers ignored here
+                    # as for VB SendKeys
+                    if {[info exists vk_map($key)]} {
+                        # Virtual key
+                        set vk_rec [list key {*}$vk_map($key)]
+                    } else {
+                        error "Unknown braced virtual key \"$token\"."
+                    }
+                }
+                lappend inputs {*}$vk_leader
+                lappend inputs {*}[lrepeat $nch $vk_rec]
+                # vk_trailer arises from the character itself, e.g. A
+                # has shift set, Ctrl-A has control set.
+                _flush_send_keys_trailer inputs vk_trailer
+                # state(trailer) arises from preceding +,^,% This is also
+                # emitted and reset as it applied only to this character
+                _flush_send_keys_trailer inputs state(trailer)
+                set state(modifiers) [lindex $state(group_modifiers) end]
+            }
+        }
+    }
+    # Emit left over trailer
+    _flush_send_keys_trailer inputs state(trailer)
+
+    # Restore capslock/numlock
+    _flush_send_keys_trailer inputs state(cleanup_trailer)
+
+    return $inputs
+}
+
+# utility procedure to map symbolic hotkey to {modifiers virtualkey}
+# We allow modifier map to be passed in because different api's use
+# different bits for key modifiers
+proc twapi::_hotkeysyms_to_vk {hotkey {modifier_map {ctrl 2 control 2 alt 1 menu 1 shift 4 win 8}}} {
+    variable vk_map
+
+    _init_vk_map
+
+    set keyseq [split [string tolower $hotkey] -]
+    set key [lindex $keyseq end]
+
+    # Convert modifiers to bitmask
+    set modifiers 0
+    foreach modifier [lrange $keyseq 0 end-1] {
+        setbits modifiers [dict! $modifier_map [string tolower $modifier]]
+    }
+    # Map the key to a virtual key code
+    if {[string length $key] == 1} {
+        # Single character
+        scan $key %c unicode
+
+        # Only allow alphanumeric keys and a few punctuation symbols
+        # since keyboard layouts are not standard
+        if {$unicode >= 0x61 && $unicode <= 0x7A} {
+            # Lowercase letters - change to upper case virtual keys
+            set vk [expr {$unicode-32}]
+        } elseif {($unicode >= 0x30 && $unicode <= 0x39)
+                  || ($unicode >= 0x41 && $unicode <= 0x5A)} {
+            # Digits or upper case
+            set vk $unicode
+        } else {
+            error "Only alphanumeric characters may be specified for the key. For non-alphanumeric characters, specify the virtual key code"
+        }
+    } elseif {[info exists vk_map($key)]} {
+        # It is a virtual key name
+        set vk [lindex $vk_map($key) 0]
+    } elseif {[info exists vk_map([string toupper $key])]} {
+        # It is a virtual key name
+        set vk [lindex $vk_map([string toupper $key]) 0]
+    } elseif {[string is integer -strict $key]} {
+        # Actual virtual key specification
+        set vk $key
+    } else {
+        error "Unknown or invalid key specifier '$key'"
+    }
+
+    return [list $modifiers $vk]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/metoo.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/metoo.tcl
new file mode 100644
index 00000000..91a32e5a
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/metoo.tcl
@@ -0,0 +1,605 @@
+# MeTOO stands for "MeTOO Emulates TclOO" (at a superficial syntactic level)
+#
+# Implements a *tiny*, but useful, subset of TclOO, primarily for use 
+# with Tcl 8.4. Intent is that if you write code using MeToo, it should work 
+# unmodified with TclOO in 8.5/8.6. Obviously, don't try going the other way!
+#
+# Emulation is superficial, don't try to be too clever in usage.
+# Doing funky, or even non-funky, things with object namespaces will
+# not work as you would expect.
+#
+# See the metoo::demo proc for sample usage. Calling this proc
+# with parameter "oo" will use the TclOO commands. Else the metoo::
+# commands. Note the demo code remains the same for both.
+#
+# The following fragment uses MeToo only if TclOO is not available:
+#   if {[llength [info commands oo::*]]} {
+#       namespace import oo::*
+#   } else {
+#       source metoo.tcl
+#       namespace import metoo::class
+#   }
+#   class create C {...}
+#
+# Summary of the TclOO subset implemented - see TclOO docs for detail :
+#
+# Creating a new class: 
+#   metoo::class create CLASSNAME CLASSDEFINITION
+#
+# Destroying a class:
+#   CLASSNAME destroy
+#    - this also destroys objects of that class and recursively destroys
+#      child classes. NOTE: deleting the class namespace or renaming 
+#      the CLASSNAME command to "" will NOT call object destructors.
+#
+# CLASSDEFINITION: Following may appear in CLASSDEFINTION
+#   method METHODNAME params METHODBODY
+#    - same as TclOO
+#   constructor params METHODBODY
+#    - same syntax as TclOO
+#   destructor METHODBODY
+#    - same syntax as TclOO
+#   unknown METHODNAME ARGS
+#    - if defined, called when an undefined method is invoked
+#   superclass SUPER
+#    - inherits from SUPER. Unlike TclOO, only single inheritance. Also
+#      no checks for inheritance loops. You'll find out quickly enough!
+#   All other commands within a CLASSDEFINITION will either raise error or
+#   work differently from TclOO. Actually you can use pretty much any
+#   Tcl command inside CLASSDEFINITION but the results may not be what you
+#   expect. Best to avoid this.
+#
+# METHODBODY: The following method-internal TclOO commands are available:
+#   my METHODNAME ARGS
+#    - to call another method METHODNAME
+#   my variable VAR1 ?VAR2...?
+#    - brings object-specific variables into scope
+#   next ?ARGS?
+#    - calls the superclass method of the same name
+#   self
+#   self object
+#    - returns the object name (usable as a command)
+#   self class
+#    - returns class of this object
+#   self namespace
+#    - returns namespace of this object
+#
+# Creating objects:
+#   CLASSNAME create OBJNAME ?ARGS?
+#    - creates object OBJNAME of class CLASSNAME, passing ARGS to constructor
+#      Returns the fully qualified object name that can be used as a command.
+#   CLASSNAME new ?ARGS?
+#    - creates a new object with an auto-generated name
+#
+# Destroying objects
+#   OBJNAME destroy
+#    - destroys the object calling destructors
+#   rename OBJNAME ""
+#    - same as above
+#
+# Renaming an object
+#   rename OBJNAME NEWNAME
+#    - the object can now be invoked using the new name. Note this is unlike
+#      classes which should not be renamed.
+#
+#
+# Introspection (though different from TclOO)
+#   metoo::introspect object isa OBJECT ?CLASSNAME?
+#    - returns 1 if OBJECT is a metoo object and is of the specified class
+#      if CLASSNAME is specified. Returns 0 otherwise.
+#   metoo::introspect object list
+#    - returns list of all objects
+#   metoo::introspect class ancestors CLASSNAME
+#    - returns list of ancestors for a class
+#
+# Differences and missing features from TclOO: Everything not listed above
+# is missing. Some notable differences:
+# - MeTOO is class-based, not object based like TclOO, thus class instances
+#   (objects) cannot be modified by adding instance-specific methods etc..
+#   Also a class is not itself an object.
+# - Renaming classes does not work and will fail in mysterious ways
+# - does not support class refinement/definition
+# - no variable command at class level for automatically bringing variables
+#   into scope
+# - no filters, forwarding, multiple-inheritance
+# - no private methods (all methods are exported).
+
+# NOTE: file must be sourced at global level since metoo namespace is expected
+# to be top level namespace
+
+# DO NOT DO THIS. ELSE TESTS FAIL BECAUSE they define tests in the
+# metoo namespace which then get deleted by the line below when
+# the package is lazy auto-loaded
+# catch {namespace delete metoo}
+
+# TBD - variable ("my variable" is done, "variable" in method or
+# class definition is not)
+# TBD - default constructor and destructor to "next" (or maybe that
+# is already taken care of by the inheritance code
+
+namespace eval metoo {
+    variable next_id 0
+
+    variable _objects;          # Maps objects to its namespace
+    array set _objects {}
+    
+}
+
+# Namespace in which commands in a class definition block are called
+namespace eval metoo::define {
+    proc method {class_ns name params body} {
+        # Methods are defined in the methods subspace of the class namespace.
+        # We prefix with _m_ to prevent them from being directly called
+        # as procs, for example if the method is a Tcl command like "set"
+        # The first parameter to a method is always the object namespace
+        # denoted as the paramter "_this"
+        namespace eval ${class_ns}::methods [list proc _m_$name [concat [list _this] $params] $body]
+
+    }
+    proc superclass {class_ns superclass} {
+        if {[info exists ${class_ns}::super]} {
+            error "Only one superclass allowed for a class"
+        }
+        set sup [uplevel 3 "namespace eval $superclass {namespace current}"]
+        set ${class_ns}::super $sup
+        # We store the subclass in the super so it can be destroyed
+        # if the super is destroyed.
+        set ${sup}::subclasses($class_ns) 1
+    }
+    proc constructor {class_ns params body} {
+        method $class_ns constructor $params $body
+    }
+    proc destructor {class_ns body} {
+        method $class_ns destructor {} $body
+    }
+    proc export {args} {
+        # Nothing to do, all methods are exported anyways
+        # Command is here for compatibility only
+    }
+}
+
+# Namespace in which commands used in objects methods are defined
+# (self, my etc.)
+namespace eval metoo::object {
+    proc next {args} {
+        upvar 1 _this this;     # object namespace
+
+        # Figure out what class context this is executing in. Note
+        # we cannot use _this in caller since that is the object namespace
+        # which is not necessarily related to the current class namespace.
+        set class_ns [namespace parent [uplevel 1 {namespace current}]]
+        
+        # Figure out the current method being called
+        set methodname [namespace tail [lindex [uplevel 1 {info level 0}] 0]]
+        
+        # Find the next method in the class hierarchy and call it
+        while {[info exists ${class_ns}::super]} {
+            set class_ns [set ${class_ns}::super]
+            if {[llength [info commands ${class_ns}::methods::$methodname]]} {
+                return [uplevel 1 [list ${class_ns}::methods::$methodname $this] $args]
+            }
+        }
+        
+        error "'next' command has no receiver in the hierarchy for method $methodname"
+    }
+
+    proc self {{what object}} {
+        upvar 1 _this this
+        switch -exact -- $what {
+            class { return [namespace parent $this] }
+            namespace { return $this }
+            object { return [set ${this}::_(name)] }
+            default {
+                error "Argument '$what' not understood by self method"
+            }
+        }
+    }
+
+    proc my {methodname args} {
+        # We insert the object namespace as the first parameter to the command.
+        # This is passed as the first parameter "_this" to methods. Since
+        # "my" can be only called from methods, we can retrieve it fro
+        # our caller.
+        upvar 1 _this this;     # object namespace
+
+        set class_ns [namespace parent $this]
+
+        set meth [::metoo::_locate_method $class_ns $methodname]
+        if {$meth ne ""} {
+            # We need to invoke in the caller's context so upvar etc. will
+            # not be affected by this intermediate method dispatcher
+            return [uplevel 1 [list $meth $this] $args]
+        }
+
+        # It is ok for constructor or destructor to be undefined. For
+        # the others, invoke "unknown" if it exists
+        if {$methodname eq "constructor" || $methodname eq "destructor"} {
+            return
+        }
+
+        set meth [::metoo::_locate_method $class_ns "unknown"]
+        if {$meth ne ""} {
+            # We need to invoke in the caller's context so upvar etc. will
+            # not be affected by this intermediate method dispatcher
+            return [uplevel 1 [list $meth $this $methodname] $args]
+        }
+
+        error "Unknown method $methodname"
+    }
+}
+
+# Given a method name, locate it in the class hierarchy. Returns
+# fully qualified method if found, else an empty string
+proc metoo::_locate_method {class_ns methodname} {
+    # See if there is a method defined in this class.
+    # Breakage if method names with wildcard chars. Too bad
+    if {[llength [info commands ${class_ns}::methods::_m_$methodname]]} {
+        # We need to invoke in the caller's context so upvar etc. will
+        # not be affected by this intermediate method dispatcher
+        return ${class_ns}::methods::_m_$methodname
+    }
+
+    # No method here, check for super class.
+    while {[info exists ${class_ns}::super]} {
+        set class_ns [set ${class_ns}::super]
+        if {[llength [info commands ${class_ns}::methods::_m_$methodname]]} {
+            return ${class_ns}::methods::_m_$methodname
+        }
+    }
+
+    return "";                  # Not found
+}
+
+proc metoo::_new {class_ns cmd args} {
+    # class_ns expected to be fully qualified
+    variable next_id
+
+    # IMPORTANT:
+    # object namespace *must* be child of class namespace. 
+    # Saves a bit of bookkeeping. Putting it somewhere else will require
+    # changes to many other places in the code.
+    set objns ${class_ns}::o#[incr next_id]
+
+    switch -exact -- $cmd {
+        create {
+            if {[llength $args] < 1} {
+                error "Insufficient args, should be: class create CLASSNAME ?args?"
+            }
+            # TBD - check if command already exists
+            # Note objname must always be fully qualified. Note cannot
+            # use namespace which here because the commmand does not
+            # yet exist.
+            set args [lassign $args objname]
+            if {[string compare :: [string range $objname 0 1]]} {
+                # Not fully qualified. Qualify based on caller namespace
+                set objname [uplevel 1 "namespace current"]::$objname
+            }
+            # Trip excess ":" - can happen in both above cases
+            set objname ::[string trimleft $objname :]
+        }
+        new {
+            set objname $objns
+        }
+        default {
+            error "Unknown command '$cmd'. Should be create or new."
+        }
+    }
+
+    # Create the namespace. The array _ is used to hold private information
+    namespace eval $objns {
+        variable _
+    }
+    set ${objns}::_(name) $objname
+
+    # When invoked by its name, call the dispatcher.
+    interp alias {} $objname {} ${class_ns}::_call $objns
+
+    # Register the object. We do this BEFORE running the constructor
+    variable _objects
+    set _objects($objname) $objns
+
+    # Invoke the constructor
+    if {[catch {
+        $objname constructor {*}$args
+    } msg]} {
+        # Undo what we did
+        set erinfo $::errorInfo
+        set ercode $::errorCode
+        rename $objname ""
+        namespace delete $objns
+        error $msg $erinfo $ercode
+    }
+
+    # TBD - does tracing cause a slowdown ?
+    # Set up trace to track when the object is renamed/destroyed
+    trace add command $objname {rename delete} [list [namespace current]::_trace_object_renames $objns]
+
+    return $objname
+}
+
+proc metoo::_trace_object_renames {objns oldname newname op} {
+    # Note the trace command fully qualifies oldname and newname
+    if {$op eq "rename"} {
+        variable _objects
+        set _objects($newname) $_objects($oldname)
+        unset _objects($oldname)
+        set ${objns}::_(name) $newname
+    } else {
+        $oldname destroy
+    }
+}
+
+proc metoo::_class_cmd {class_ns cmd args} {
+    switch -exact -- $cmd {
+        create -
+        new {
+            return [uplevel 1 [list [namespace current]::_new $class_ns $cmd] $args]
+        }
+        destroy {
+            # Destroy all objects belonging to this class
+            foreach objns [namespace children ${class_ns} o#*] {
+                [set ${objns}::_(name)] destroy
+            }
+            # Destroy all classes that inherit from this
+            foreach child_ns [array names ${class_ns}::subclasses] {
+                # Child namespace is also subclass command
+                $child_ns destroy
+            }
+            trace remove command $class_ns {rename delete} [list ::metoo::_trace_class_renames]
+            namespace delete ${class_ns}
+            rename ${class_ns} ""
+        }
+        default {
+            error "Unknown command '$cmd'. Should be create, new or destroy."
+        }
+    }
+}
+
+proc metoo::class {cmd cname definition} {
+    variable next_id
+
+    if {$cmd ne "create"} {
+        error "Syntax: class create CLASSNAME DEFINITION"
+    }
+
+    if {[uplevel 1 "namespace exists $cname"]} {
+        error "can't create class '$cname': namespace already exists with that name."
+    }
+
+    # Resolve cname into a namespace in the caller's context
+    set class_ns [uplevel 1 "namespace eval $cname {namespace current}"]
+    
+    if {[llength [info commands $class_ns]]} {
+        # Delete the namespace we just created
+        namespace delete $class_ns
+        error "can't create class '$cname': command already exists with that name."
+    }
+
+    # Define the commands/aliases that are used inside a class definition
+    foreach procname [info commands [namespace current]::define::*] {
+        interp alias {} ${class_ns}::[namespace tail $procname] {} $procname $class_ns
+    }
+
+    # Define the built in commands callable within class instance methods
+    foreach procname [info commands [namespace current]::object::*] {
+        interp alias {} ${class_ns}::methods::[namespace tail $procname] {} $procname
+    }
+
+    # Define the destroy method for the class object instances
+    namespace eval $class_ns {
+        method destroy {} {
+            set retval [my destructor]
+            # Remove trace on command rename/deletion.
+            # ${_this}::_(name) contains the object's current name on
+            # which the trace is set.
+            set me [set ${_this}::_(name)]
+            trace remove command $me {rename delete} [list ::metoo::_trace_object_renames $_this]
+            rename $me  ""
+            unset -nocomplain ::metoo::_objects($me)
+            namespace delete $_this
+            return $retval
+        }
+        method variable {args} {
+            if {[llength $args]} {
+                set cmd [list upvar 0]
+                foreach varname $args {
+                    lappend cmd ${_this}::$varname $varname
+                }
+                uplevel 1 $cmd
+            }
+        }
+    }
+
+    # Define the class. Note we do this *after* the standard
+    # definitions (destroy etc.) above so that they can
+    # be overridden by the class definition.
+    if {[catch {
+        namespace eval $class_ns $definition
+    } msg ]} {
+        namespace delete $class_ns
+        error $msg $::errorInfo $::errorCode
+    }
+
+    # Also define the call dispatcher within the class.
+    # TBD - not sure this is actually necessary any more
+    namespace eval ${class_ns} {
+        proc _call {objns methodname args} {
+            # Note this duplicates the "my" code but cannot call that as
+            # it adds another frame level which interferes with uplevel etc.
+
+            set class_ns [namespace parent $objns]
+
+            # We insert the object namespace as the first param to the command.
+            # This is passed as the first parameter "_this" to methods.
+
+            set meth [::metoo::_locate_method $class_ns $methodname]
+            if {$meth ne ""} {
+                # We need to invoke in the caller's context so upvar etc. will
+                # not be affected by this intermediate method dispatcher
+                return [uplevel 1 [list $meth $objns] $args]
+            }
+
+            # It is ok for constructor or destructor to be undefined. For
+            # the others, invoke "unknown" if it exists
+
+            if {$methodname eq "constructor" || $methodname eq "destructor"} {
+                return
+            }
+
+            set meth [::metoo::_locate_method $class_ns "unknown"]
+            if {$meth ne ""} {
+                # We need to invoke in the caller's context so upvar etc. will
+                # not be affected by this intermediate method dispatcher
+                return [uplevel 1 [list $meth $objns $methodname] $args]
+            }
+
+            error "Unknown method $methodname"
+        }
+    }
+
+    # The namespace is also a command used to create class instances
+    # TBD - check if command of that name already exists
+    interp alias {} $class_ns {} [namespace current]::_class_cmd $class_ns
+    # Set up trace to track when the class command is renamed/destroyed
+    trace add command $class_ns [list rename delete] ::metoo::_trace_class_renames
+
+    return $class_ns
+}
+
+proc metoo::_trace_class_renames {oldname newname op} {
+    if {$op eq "rename"} {
+        # TBD - this does not actually work. The rename succeeds anyways
+        error "MetOO classes may not be renamed"
+    } else {
+        $oldname destroy
+    }
+}
+
+proc metoo::introspect {type info args} {
+    switch -exact -- $type {
+        "object" {
+            variable _objects
+            switch -exact -- $info {
+                "isa" {
+                    if {[llength $args] == 0 || [llength $args] > 2} {
+                        error "wrong # args: should be \"metoo::introspect $type $info OBJNAME ?CLASS?\""
+                    }
+                    set objname [uplevel 1 [list namespace which -command [lindex $args 0]]]
+                    if {![info exists _objects($objname)]} {
+                        return 0
+                    }
+                    if {[llength $args] == 1} {
+                        # No class specified
+                        return 1
+                    }
+                    # passed classname assumed to be fully qualified
+                    set objclass [namespace parent $_objects($objname)]
+                    if {[string equal $objclass [lindex $args 1]]} {
+                        # Direct hit
+                        return 1
+                    }
+
+                    # No direct hit, check ancestors
+                    if {[lindex $args 1] in [ancestors $objclass]} {
+                        return 1
+                    }
+
+                    return 0
+                }
+
+                "list" {
+                    if {[llength $args] > 1} {
+                        error "wrong # args: should be \"metoo::introspect $type $info ?CLASS?"
+                    }
+                    variable _objects
+                    if {[llength $args] == 0} {
+                        return [array names _objects]
+                    }
+                    set objs {}
+                    foreach obj [array names _objects] {
+                        if {[introspect object isa $obj [lindex $args 0]]} {
+                            lappend objs $obj
+                        }
+                    }
+                    return $objs
+                }
+                default {
+                    error "$info subcommand not supported for $type introspection"
+                }
+            }
+        }
+
+        "class" {
+            switch -exact -- $info {
+                "ancestors" {
+                    if {[llength $args] != 1} {
+                        error "wrong # args: should be \"metoo::introspect $type $info CLASSNAME"
+                    }
+                    return [ancestors [lindex $args 0]]
+                }
+                default {
+                    error "$info subcommand not supported for $type introspection"
+                }
+            }
+        }
+        default {
+            error "$type introspection not supported"
+        }
+    }
+}
+
+proc metoo::ancestors {class_ns} {
+    # Returns ancestors of a class
+
+    set ancestors [list ]
+    while {[info exists ${class_ns}::super]} {
+        lappend ancestors [set class_ns [set ${class_ns}::super]]
+    }
+
+    return $ancestors
+}
+
+namespace eval metoo { namespace export class }
+
+# Simple sample class showing all capabilities. Anything not shown here will
+# probably not work. Call as "demo" to use metoo, or "demo oo" to use TclOO.
+# Output should be same in both cases.
+proc ::metoo::demo {{ns metoo}} {
+    ${ns}::class create Base {
+        constructor {x y} { puts "Base constructor ([self object]): $x, $y"
+        }
+        method m {} { puts "Base::m called" }
+        method n {args} { puts "Base::n called: [join $args {, }]"; my m }
+        method unknown {methodname args} { puts "Base::unknown called for $methodname [join $args {, }]"}
+        destructor { puts "Base::destructor ([self object])" }
+    }
+
+    ${ns}::class create Derived {
+        superclass Base
+        constructor {x y} { puts "Derived constructor ([self object]): $x, $y" ; next $x $y }
+        destructor { puts "Derived::destructor called ([self object])" ; next }
+        method n {args} { puts "Derived::n ([self object]): [join $args {, }]";  next {*}$args}
+        method put {val} {my variable var ; set var $val}
+        method get {varname} {my variable var ; upvar 1 $varname retvar; set retvar $var}
+    }
+
+    Base create b dum dee;      # Create named object
+    Derived create d fee fi;    # Create derived object
+    set o [Derived new fo fum]; # Create autonamed object
+    $o put 10;                  # Use of instance variable
+    $o get v;                   # Verify correct frame level ...
+    puts "v:$v";                # ...when calling methods
+    b m;                        # Direct method
+    b n;                        # Use of my to call another method
+    $o m;                       # Inherited method
+    $o n;                       # Overridden method chained to inherited
+    $o nosuchmethod arg1 arg2;  # Invoke unknown
+    $o destroy;                 # Explicit destroy
+    rename b "";                # Destroy through rename
+    Base destroy;               # Should destroy object d, Derived, Base
+}
+
+# Hack to work with the various build configuration.
+if {[info commands ::twapi::get_version] ne ""} {
+    package provide metoo [::twapi::get_version -patchlevel]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/msi.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/msi.tcl
new file mode 100644
index 00000000..f50cea2e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/msi.tcl
@@ -0,0 +1,403 @@
+#
+# Copyright (c) 2003-2018, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# Hack to work with the various build configuration.
+if {[info commands ::twapi::get_version] ne ""} {
+    package provide twapi_msi [::twapi::get_version -patchlevel]
+}
+
+# Rest of this file auto-generated
+
+
+# Automatically generated type library interface
+# File:    msi.dll
+# Name:    WindowsInstaller
+# GUID:    {000C1092-0000-0000-C000-000000000046}
+# Version: 1.0
+# LCID:    1033
+package require twapi_com
+
+namespace eval windowsinstaller {
+
+    # Array mapping coclass names to their guids
+    variable _coclass_guids
+
+    # Array mapping dispatch interface names to their guids
+    variable _dispatch_guids
+
+    # Returns the GUID for a coclass or empty string if not found
+    proc coclass_guid {coclass_name} {
+        variable _coclass_guids
+        if {[info exists _coclass_guids($coclass_name)]} {
+            return $_coclass_guids($coclass_name)
+        }
+        return ""
+    }
+    # Returns the GUID for a dispatch name or empty string if not found
+    proc dispatch_guid {dispatch_name} {
+        variable _dispatch_guids
+        if {[info exists _dispatch_guids($dispatch_name)]} {
+            return $_dispatch_guids($dispatch_name)
+        }
+        return ""
+    }
+    # Marks the specified object to be of a specific dispatch/coclass type
+    proc declare {typename comobj} {
+        # First check if it is the name of a dispatch interface
+        set guid [dispatch_guid $typename]
+        if {$guid ne ""} {
+            $comobj -interfaceguid $guid
+            return
+        }
+
+        # If not, check if it is the name of a coclass with a dispatch interface
+        set guid [coclass_guid $typename]
+        if {$guid ne ""} {
+            if {[info exists ::twapi::_coclass_idispatch_guids($guid)]} {
+                $comobj -interfaceguid $::twapi::_coclass_idispatch_guids($guid)
+                return
+            }
+        }
+
+        error "Could not resolve interface for $coclass_name."
+    }
+            
+    # Enum MsiUILevel
+    array set MsiUILevel {msiUILevelNoChange 0 msiUILevelDefault 1 msiUILevelNone 2 msiUILevelBasic 3 msiUILevelReduced 4 msiUILevelFull 5 msiUILevelHideCancel 32 msiUILevelProgressOnly 64 msiUILevelEndDialog 128 msiUILevelSourceResOnly 256}
+
+    # Enum MsiReadStream
+    array set MsiReadStream {msiReadStreamInteger 0 msiReadStreamBytes 1 msiReadStreamAnsi 2 msiReadStreamDirect 3}
+
+    # Enum MsiRunMode
+    array set MsiRunMode {msiRunModeAdmin 0 msiRunModeAdvertise 1 msiRunModeMaintenance 2 msiRunModeRollbackEnabled 3 msiRunModeLogEnabled 4 msiRunModeOperations 5 msiRunModeRebootAtEnd 6 msiRunModeRebootNow 7 msiRunModeCabinet 8 msiRunModeSourceShortNames 9 msiRunModeTargetShortNames 10 msiRunModeWindows9x 12 msiRunModeZawEnabled 13 msiRunModeScheduled 16 msiRunModeRollback 17 msiRunModeCommit 18}
+
+    # Enum MsiDatabaseState
+    array set MsiDatabaseState {msiDatabaseStateRead 0 msiDatabaseStateWrite 1}
+
+    # Enum MsiViewModify
+    array set MsiViewModify {msiViewModifySeek -1 msiViewModifyRefresh 0 msiViewModifyInsert 1 msiViewModifyUpdate 2 msiViewModifyAssign 3 msiViewModifyReplace 4 msiViewModifyMerge 5 msiViewModifyDelete 6 msiViewModifyInsertTemporary 7 msiViewModifyValidate 8 msiViewModifyValidateNew 9 msiViewModifyValidateField 10 msiViewModifyValidateDelete 11}
+
+    # Enum MsiColumnInfo
+    array set MsiColumnInfo {msiColumnInfoNames 0 msiColumnInfoTypes 1}
+
+    # Enum MsiTransformError
+    array set MsiTransformError {msiTransformErrorNone 0 msiTransformErrorAddExistingRow 1 msiTransformErrorDeleteNonExistingRow 2 msiTransformErrorAddExistingTable 4 msiTransformErrorDeleteNonExistingTable 8 msiTransformErrorUpdateNonExistingRow 16 msiTransformErrorChangeCodePage 32 msiTransformErrorViewTransform 256}
+
+    # Enum MsiEvaluateCondition
+    array set MsiEvaluateCondition {msiEvaluateConditionFalse 0 msiEvaluateConditionTrue 1 msiEvaluateConditionNone 2 msiEvaluateConditionError 3}
+
+    # Enum MsiTransformValidation
+    array set MsiTransformValidation {msiTransformValidationNone 0 msiTransformValidationLanguage 1 msiTransformValidationProduct 2 msiTransformValidationPlatform 4 msiTransformValidationMajorVer 8 msiTransformValidationMinorVer 16 msiTransformValidationUpdateVer 32 msiTransformValidationLess 64 msiTransformValidationLessOrEqual 128 msiTransformValidationEqual 256 msiTransformValidationGreaterOrEqual 512 msiTransformValidationGreater 1024 msiTransformValidationUpgradeCode 2048}
+
+    # Enum MsiDoActionStatus
+    array set MsiDoActionStatus {msiDoActionStatusNoAction 0 msiDoActionStatusSuccess 1 msiDoActionStatusUserExit 2 msiDoActionStatusFailure 3 msiDoActionStatusSuspend 4 msiDoActionStatusFinished 5 msiDoActionStatusWrongState 6 msiDoActionStatusBadActionData 7}
+
+    # Enum MsiMessageStatus
+    array set MsiMessageStatus {msiMessageStatusError -1 msiMessageStatusNone 0 msiMessageStatusOk 1 msiMessageStatusCancel 2 msiMessageStatusAbort 3 msiMessageStatusRetry 4 msiMessageStatusIgnore 5 msiMessageStatusYes 6 msiMessageStatusNo 7}
+
+    # Enum MsiMessageType
+    array set MsiMessageType {msiMessageTypeFatalExit 0 msiMessageTypeError 16777216 msiMessageTypeWarning 33554432 msiMessageTypeUser 50331648 msiMessageTypeInfo 67108864 msiMessageTypeFilesInUse 83886080 msiMessageTypeResolveSource 100663296 msiMessageTypeOutOfDiskSpace 117440512 msiMessageTypeActionStart 134217728 msiMessageTypeActionData 150994944 msiMessageTypeProgress 167772160 msiMessageTypeCommonData 184549376 msiMessageTypeOk 0 msiMessageTypeOkCancel 1 msiMessageTypeAbortRetryIgnore 2 msiMessageTypeYesNoCancel 3 msiMessageTypeYesNo 4 msiMessageTypeRetryCancel 5 msiMessageTypeDefault1 0 msiMessageTypeDefault2 256 msiMessageTypeDefault3 512}
+
+    # Enum MsiInstallState
+    array set MsiInstallState {msiInstallStateNotUsed -7 msiInstallStateBadConfig -6 msiInstallStateIncomplete -5 msiInstallStateSourceAbsent -4 msiInstallStateInvalidArg -2 msiInstallStateUnknown -1 msiInstallStateBroken 0 msiInstallStateAdvertised 1 msiInstallStateRemoved 1 msiInstallStateAbsent 2 msiInstallStateLocal 3 msiInstallStateSource 4 msiInstallStateDefault 5}
+
+    # Enum MsiCostTree
+    array set MsiCostTree {msiCostTreeSelfOnly 0 msiCostTreeChildren 1 msiCostTreeParents 2}
+
+    # Enum MsiReinstallMode
+    array set MsiReinstallMode {msiReinstallModeFileMissing 2 msiReinstallModeFileOlderVersion 4 msiReinstallModeFileEqualVersion 8 msiReinstallModeFileExact 16 msiReinstallModeFileVerify 32 msiReinstallModeFileReplace 64 msiReinstallModeMachineData 128 msiReinstallModeUserData 256 msiReinstallModeShortcut 512 msiReinstallModePackage 1024}
+
+    # Enum MsiInstallType
+    array set MsiInstallType {msiInstallTypeDefault 0 msiInstallTypeNetworkImage 1 msiInstallTypeSingleInstance 2}
+
+    # Enum MsiInstallMode
+    array set MsiInstallMode {msiInstallModeNoSourceResolution -3 msiInstallModeNoDetection -2 msiInstallModeExisting -1 msiInstallModeDefault 0}
+
+    # Enum MsiSignatureInfo
+    array set MsiSignatureInfo {msiSignatureInfoCertificate 0 msiSignatureInfoHash 1}
+
+    # Enum MsiInstallContext
+    array set MsiInstallContext {msiInstallContextFirstVisible 0 msiInstallContextUserManaged 1 msiInstallContextUser 2 msiInstallContextMachine 4 msiInstallContextAllUserManaged 8}
+
+    # Enum MsiInstallSourceType
+    array set MsiInstallSourceType {msiInstallSourceTypeUnknown 0 msiInstallSourceTypeNetwork 1 msiInstallSourceTypeURL 2 msiInstallSourceTypeMedia 4}
+
+    # Enum MsiAssemblyType
+    array set MsiAssemblyType {msiProvideAssemblyNet 0 msiProvideAssemblyWin32 1}
+
+    # Enum MsiProductScriptInfo
+    array set MsiProductScriptInfo {msiProductScriptInfoProductCode 0 msiProductScriptInfoProductLanguage 1 msiProductScriptInfoProductVersion 2 msiProductScriptInfoProductName 3 msiProductScriptInfoPackageName 4}
+
+    # Enum MsiAdvertiseProductContext
+    array set MsiAdvertiseProductContext {msiAdvertiseProductMachine 0 msiAdvertiseProductUser 1}
+
+    # Enum Constants
+    array set Constants {msiDatabaseNullInteger -2147483648}
+
+    # Enum MsiOpenDatabaseMode
+    array set MsiOpenDatabaseMode {msiOpenDatabaseModeReadOnly 0 msiOpenDatabaseModeTransact 1 msiOpenDatabaseModeDirect 2 msiOpenDatabaseModeCreate 3 msiOpenDatabaseModeCreateDirect 4 msiOpenDatabaseModePatchFile 32}
+
+    # Enum MsiSignatureOption
+    array set MsiSignatureOption {msiSignatureOptionInvalidHashFatal 1}
+
+    # Enum MsiAdvertiseProductPlatform
+    array set MsiAdvertiseProductPlatform {msiAdvertiseCurrentPlatform 0 msiAdvertiseX86Platform 1 msiAdvertiseIA64Platform 2 msiAdvertiseX64Platform 4}
+
+    # Enum MsiAdvertiseProductOptions
+    array set MsiAdvertiseProductOptions {msiAdvertiseDefault 0 msiAdvertiseSingleInstance 1}
+
+    # Enum MsiAdvertiseScriptFlags
+    array set MsiAdvertiseScriptFlags {msiAdvertiseScriptCacheInfo 1 msiAdvertiseScriptShortcuts 4 msiAdvertiseScriptMachineAssign 8 msiAdvertiseScriptConfigurationRegistration 32 msiAdvertiseScriptValidateTransformsList 64 msiAdvertiseScriptClassInfoRegistration 128 msiAdvertiseScriptExtensionInfoRegistration 256 msiAdvertiseScriptAppInfo 384 msiAdvertiseScriptRegData 416}
+}
+
+# Dispatch Interface Installer
+set windowsinstaller::_dispatch_guids(Installer) "{000C1090-0000-0000-C000-000000000046}"
+# Installer Methods
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} CreateRecord 1033 1 {1 1033 1 {26 {29 256}} {{3 1}} Count}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} OpenPackage 1033 1 {2 1033 1 {26 {29 512}} {{12 1} {3 {49 {3 0}}}} {PackagePath Options}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} OpenProduct 1033 1 {3 1033 1 {26 {29 512}} {{8 1}} ProductCode}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} OpenDatabase 1033 1 {4 1033 1 {26 {29 768}} {{8 1} {12 1}} {DatabasePath OpenMode}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} SummaryInformation 1033 2 {5 1033 2 {26 {29 1024}} {{8 1} {3 {49 {3 0}}}} {PackagePath UpdateCount}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} EnableLog 1033 1 {7 1033 1 24 {{8 1} {8 1}} {LogMode LogFile}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} InstallProduct 1033 1 {8 1033 1 24 {{8 1} {8 {49 {8 0}}}} {PackagePath PropertyValues}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} Version 1033 2 {9 1033 2 8 {} {}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} LastErrorRecord 1033 1 {10 1033 1 {26 {29 256}} {} {}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} RegistryValue 1033 1 {11 1033 1 8 {{12 1} {8 1} {12 17}} {Root Key Value}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} FileAttributes 1033 1 {13 1033 1 3 {{8 1}} FilePath}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} FileSize 1033 1 {15 1033 1 3 {{8 1}} FilePath}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} FileVersion 1033 1 {16 1033 1 8 {{8 1} {12 17}} {FilePath Language}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} Environment 1033 2 {12 1033 2 8 {{8 1}} Variable}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} Environment 1033 4 {12 1033 4 24 {{8 1} {8 1}} Variable}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ProductState 1033 2 {17 1033 2 {29 2432} {{8 1}} Product}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ProductInfo 1033 2 {18 1033 2 8 {{8 1} {8 1}} {Product Attribute}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ConfigureProduct 1033 1 {19 1033 1 24 {{8 1} {3 1} {3 1}} {Product InstallLevel InstallState}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ReinstallProduct 1033 1 {20 1033 1 24 {{8 1} {3 1}} {Product ReinstallMode}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} CollectUserInfo 1033 1 {21 1033 1 24 {{8 1}} Product}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ApplyPatch 1033 1 {22 1033 1 24 {{8 1} {8 1} {3 1} {8 1}} {PatchPackage InstallPackage InstallType CommandLine}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} FeatureParent 1033 2 {23 1033 2 8 {{8 1} {8 1}} {Product Feature}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} FeatureState 1033 2 {24 1033 2 {29 2432} {{8 1} {8 1}} {Product Feature}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} UseFeature 1033 1 {25 1033 1 24 {{8 1} {8 1} {3 1}} {Product Feature InstallMode}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} FeatureUsageCount 1033 2 {26 1033 2 3 {{8 1} {8 1}} {Product Feature}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} FeatureUsageDate 1033 2 {27 1033 2 7 {{8 1} {8 1}} {Product Feature}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ConfigureFeature 1033 1 {28 1033 1 24 {{8 1} {8 1} {3 1}} {Product Feature InstallState}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ReinstallFeature 1033 1 {29 1033 1 24 {{8 1} {8 1} {3 1}} {Product Feature ReinstallMode}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ProvideComponent 1033 1 {30 1033 1 8 {{8 1} {8 1} {8 1} {3 1}} {Product Feature Component InstallMode}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ComponentPath 1033 2 {31 1033 2 8 {{8 1} {8 1}} {Product Component}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ProvideQualifiedComponent 1033 1 {32 1033 1 8 {{8 1} {8 1} {3 1}} {Category Qualifier InstallMode}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} QualifierDescription 1033 2 {33 1033 2 8 {{8 1} {8 1}} {Category Qualifier}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ComponentQualifiers 1033 2 {34 1033 2 {26 {29 3328}} {{8 1}} Category}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} Products 1033 2 {35 1033 2 {26 {29 3328}} {} {}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} Features 1033 2 {36 1033 2 {26 {29 3328}} {{8 1}} Product}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} Components 1033 2 {37 1033 2 {26 {29 3328}} {} {}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ComponentClients 1033 2 {38 1033 2 {26 {29 3328}} {{8 1}} Component}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} Patches 1033 2 {39 1033 2 {26 {29 3328}} {{8 1}} Product}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} RelatedProducts 1033 2 {40 1033 2 {26 {29 3328}} {{8 1}} UpgradeCode}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} PatchInfo 1033 2 {41 1033 2 8 {{8 1} {8 1}} {Patch Attribute}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} PatchTransforms 1033 2 {42 1033 2 8 {{8 1} {8 1}} {Product Patch}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} AddSource 1033 1 {43 1033 1 24 {{8 1} {8 1} {8 1}} {Product User Source}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ClearSourceList 1033 1 {44 1033 1 24 {{8 1} {8 1}} {Product User}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ForceSourceListResolution 1033 1 {45 1033 1 24 {{8 1} {8 1}} {Product User}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} GetShortcutTarget 1033 2 {46 1033 2 {26 {29 256}} {{8 1}} ShortcutPath}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} FileHash 1033 1 {47 1033 1 {26 {29 256}} {{8 1} {3 1}} {FilePath Options}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} FileSignatureInfo 1033 1 {48 1033 1 {27 17} {{8 1} {3 1} {3 1}} {FilePath Options Format}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} RemovePatches 1033 1 {49 1033 1 24 {{8 1} {8 1} {3 1} {8 {49 {8 0}}}} {PatchList Product UninstallType PropertyList}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ApplyMultiplePatches 1033 1 {51 1033 1 24 {{8 1} {8 1} {8 1}} {PatchPackage Product PropertiesList}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} Product 1033 2 {53 1033 2 25 {{8 1} {8 1} {3 1} {{26 9} 10}} {Product UserSid iContext retval}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} Patch 1033 2 {56 1033 2 25 {{8 1} {8 1} {8 1} {3 1} {{26 9} 10}} {PatchCode ProductCode UserSid iContext retval}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ProductsEx 1033 2 {52 1033 2 {26 {29 2816}} {{8 1} {8 1} {3 1}} {Product UserSid Contexts}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} PatchesEx 1033 2 {55 1033 2 {26 {29 2816}} {{8 1} {8 1} {3 1} {3 1}} {Product UserSid Contexts filter}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ExtractPatchXMLData 1033 1 {57 1033 1 8 {{8 1}} PatchPath}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ProductCode 1033 2 {58 1033 2 8 {{8 1}} Component}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ProductElevated 1033 2 {59 1033 2 11 {{8 1}} Product}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ProvideAssembly 1033 1 {60 1033 1 8 {{8 1} {8 1} {3 1} {3 1}} {Assembly Context InstallMode AssemblyInfo}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ProductInfoFromScript 1033 2 {61 1033 2 12 {{8 1} {3 1}} {ScriptFile ProductInfo}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} AdvertiseProduct 1033 1 {62 1033 1 24 {{8 1} {3 1} {8 {49 {8 0}}} {3 {49 {3 0}}} {3 {49 {3 0}}}} {PackagePath iContext Transforms Language Options}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} CreateAdvertiseScript 1033 1 {63 1033 1 24 {{8 1} {8 1} {8 {49 {8 0}}} {3 {49 {3 0}}} {3 {49 {3 0}}} {3 {49 {3 0}}}} {PackagePath ScriptFilePath Transforms Language Platform Options}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} AdvertiseScript 1033 1 {64 1033 1 24 {{8 1} {3 1} {11 1}} {ScriptPath ScriptFlags RemoveItems}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} PatchFiles 1033 2 {65 1033 2 {26 {29 3328}} {{8 1} {8 1}} {Product PatchPackages}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ComponentsEx 1033 2 {66 1033 2 {26 {29 2816}} {{8 1} {3 1}} {UserSid Context}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ComponentClientsEx 1033 2 {67 1033 2 {26 {29 2816}} {{8 1} {8 1} {3 1}} {ComponentCode UserSid Context}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} ComponentPathEx 1033 2 {9068 1033 2 {26 {29 4480}} {{8 1} {8 1} {8 1} {3 1}} {ProductCode ComponentCode UserSid Context}}
+# Installer Properties
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} UILevel 1033 2 {6 1033 2 {29 128} {} {}}
+::twapi::dispatch_prototype_set {{000C1090-0000-0000-C000-000000000046}} UILevel 1033 4 {6 1033 4 24 {{{29 128} 1}} {}}
+
+# Dispatch Interface Record
+set windowsinstaller::_dispatch_guids(Record) "{000C1093-0000-0000-C000-000000000046}"
+# Record Methods
+::twapi::dispatch_prototype_set {{000C1093-0000-0000-C000-000000000046}} StringData 1033 2 {1 1033 2 8 {{3 1}} Field}
+::twapi::dispatch_prototype_set {{000C1093-0000-0000-C000-000000000046}} StringData 1033 4 {1 1033 4 24 {{3 1} {8 1}} Field}
+::twapi::dispatch_prototype_set {{000C1093-0000-0000-C000-000000000046}} IntegerData 1033 2 {2 1033 2 3 {{3 1}} Field}
+::twapi::dispatch_prototype_set {{000C1093-0000-0000-C000-000000000046}} IntegerData 1033 4 {2 1033 4 24 {{3 1} {3 1}} Field}
+::twapi::dispatch_prototype_set {{000C1093-0000-0000-C000-000000000046}} SetStream 1033 1 {3 1033 1 24 {{3 1} {8 1}} {Field FilePath}}
+::twapi::dispatch_prototype_set {{000C1093-0000-0000-C000-000000000046}} ReadStream 1033 1 {4 1033 1 8 {{3 1} {3 1} {3 1}} {Field Length Format}}
+::twapi::dispatch_prototype_set {{000C1093-0000-0000-C000-000000000046}} FieldCount 1033 2 {0 1033 2 3 {} {}}
+::twapi::dispatch_prototype_set {{000C1093-0000-0000-C000-000000000046}} IsNull 1033 2 {6 1033 2 11 {{3 1}} Field}
+::twapi::dispatch_prototype_set {{000C1093-0000-0000-C000-000000000046}} DataSize 1033 2 {5 1033 2 3 {{3 1}} Field}
+::twapi::dispatch_prototype_set {{000C1093-0000-0000-C000-000000000046}} ClearData 1033 1 {7 1033 1 24 {} {}}
+::twapi::dispatch_prototype_set {{000C1093-0000-0000-C000-000000000046}} FormatText 1033 1 {8 1033 1 8 {} {}}
+
+# Dispatch Interface Session
+set windowsinstaller::_dispatch_guids(Session) "{000C109E-0000-0000-C000-000000000046}"
+# Session Methods
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} Installer 1033 2 {1 1033 2 {26 {29 0}} {} {}}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} Property 1033 2 {2 1033 2 8 {{8 1}} Name}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} Property 1033 4 {2 1033 4 24 {{8 1} {8 1}} Name}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} Language 1033 2 {3 1033 2 3 {} {}}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} Mode 1033 2 {4 1033 2 11 {{3 1}} Flag}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} Mode 1033 4 {4 1033 4 24 {{3 1} {11 1}} Flag}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} Database 1033 2 {5 1033 2 {26 {29 768}} {} {}}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} SourcePath 1033 2 {6 1033 2 8 {{8 1}} Folder}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} TargetPath 1033 2 {7 1033 2 8 {{8 1}} Folder}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} TargetPath 1033 4 {7 1033 4 24 {{8 1} {8 1}} Folder}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} DoAction 1033 1 {8 1033 1 {29 2048} {{8 1}} Action}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} Sequence 1033 1 {9 1033 1 {29 2048} {{8 1} {12 17}} {Table Mode}}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} EvaluateCondition 1033 1 {10 1033 1 {29 1792} {{8 1}} Expression}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} FormatRecord 1033 1 {11 1033 1 8 {{9 1}} Record}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} Message 1033 1 {12 1033 1 {29 2176} {{3 1} {9 1}} {Kind Record}}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} FeatureCurrentState 1033 2 {13 1033 2 {29 2432} {{8 1}} Feature}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} FeatureRequestState 1033 2 {14 1033 2 {29 2432} {{8 1}} Feature}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} FeatureRequestState 1033 4 {14 1033 4 24 {{8 1} {3 1}} Feature}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} FeatureValidStates 1033 2 {15 1033 2 3 {{8 1}} Feature}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} FeatureCost 1033 2 {16 1033 2 3 {{8 1} {3 1} {3 1}} {Feature CostTree State}}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} ComponentCurrentState 1033 2 {17 1033 2 {29 2432} {{8 1}} Component}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} ComponentRequestState 1033 2 {18 1033 2 {29 2432} {{8 1}} Component}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} ComponentRequestState 1033 4 {18 1033 4 24 {{8 1} {3 1}} Component}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} SetInstallLevel 1033 1 {19 1033 1 24 {{3 1}} Level}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} VerifyDiskSpace 1033 2 {20 1033 2 11 {} {}}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} ProductProperty 1033 2 {21 1033 2 8 {{8 1}} Property}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} FeatureInfo 1033 2 {22 1033 2 {26 {29 2688}} {{8 1}} Feature}
+::twapi::dispatch_prototype_set {{000C109E-0000-0000-C000-000000000046}} ComponentCosts 1033 2 {23 1033 2 {26 {29 2816}} {{8 1} {3 1}} {Component State}}
+
+# Dispatch Interface Database
+set windowsinstaller::_dispatch_guids(Database) "{000C109D-0000-0000-C000-000000000046}"
+# Database Methods
+::twapi::dispatch_prototype_set {{000C109D-0000-0000-C000-000000000046}} DatabaseState 1033 2 {1 1033 2 {29 896} {} {}}
+::twapi::dispatch_prototype_set {{000C109D-0000-0000-C000-000000000046}} SummaryInformation 1033 2 {2 1033 2 {26 {29 1024}} {{3 {49 {3 0}}}} UpdateCount}
+::twapi::dispatch_prototype_set {{000C109D-0000-0000-C000-000000000046}} OpenView 1033 1 {3 1033 1 {26 {29 1152}} {{8 1}} Sql}
+::twapi::dispatch_prototype_set {{000C109D-0000-0000-C000-000000000046}} Commit 1033 1 {4 1033 1 24 {} {}}
+::twapi::dispatch_prototype_set {{000C109D-0000-0000-C000-000000000046}} PrimaryKeys 1033 2 {5 1033 2 {26 {29 256}} {{8 1}} Table}
+::twapi::dispatch_prototype_set {{000C109D-0000-0000-C000-000000000046}} Import 1033 1 {6 1033 1 24 {{8 1} {8 1}} {Folder File}}
+::twapi::dispatch_prototype_set {{000C109D-0000-0000-C000-000000000046}} Export 1033 1 {7 1033 1 24 {{8 1} {8 1} {8 1}} {Table Folder File}}
+::twapi::dispatch_prototype_set {{000C109D-0000-0000-C000-000000000046}} Merge 1033 1 {8 1033 1 11 {{9 1} {8 {49 {8 0}}}} {Database ErrorTable}}
+::twapi::dispatch_prototype_set {{000C109D-0000-0000-C000-000000000046}} GenerateTransform 1033 1 {9 1033 1 11 {{9 1} {8 {49 {8 0}}}} {ReferenceDatabase TransformFile}}
+::twapi::dispatch_prototype_set {{000C109D-0000-0000-C000-000000000046}} ApplyTransform 1033 1 {10 1033 1 24 {{8 1} {3 1}} {TransformFile ErrorConditions}}
+::twapi::dispatch_prototype_set {{000C109D-0000-0000-C000-000000000046}} EnableUIPreview 1033 1 {11 1033 1 {26 {29 1664}} {} {}}
+::twapi::dispatch_prototype_set {{000C109D-0000-0000-C000-000000000046}} TablePersistent 1033 2 {12 1033 2 {29 1792} {{8 1}} Table}
+::twapi::dispatch_prototype_set {{000C109D-0000-0000-C000-000000000046}} CreateTransformSummaryInfo 1033 1 {13 1033 1 24 {{9 1} {8 1} {3 1} {3 1}} {ReferenceDatabase TransformFile ErrorConditions Validation}}
+
+# Dispatch Interface SummaryInfo
+set windowsinstaller::_dispatch_guids(SummaryInfo) "{000C109B-0000-0000-C000-000000000046}"
+# SummaryInfo Methods
+::twapi::dispatch_prototype_set {{000C109B-0000-0000-C000-000000000046}} Property 1033 2 {1 1033 2 12 {{3 1}} Pid}
+::twapi::dispatch_prototype_set {{000C109B-0000-0000-C000-000000000046}} Property 1033 4 {1 1033 4 24 {{3 1} {12 1}} Pid}
+::twapi::dispatch_prototype_set {{000C109B-0000-0000-C000-000000000046}} PropertyCount 1033 2 {2 1033 2 3 {} {}}
+::twapi::dispatch_prototype_set {{000C109B-0000-0000-C000-000000000046}} Persist 1033 1 {3 1033 1 24 {} {}}
+
+# Dispatch Interface View
+set windowsinstaller::_dispatch_guids(View) "{000C109C-0000-0000-C000-000000000046}"
+# View Methods
+::twapi::dispatch_prototype_set {{000C109C-0000-0000-C000-000000000046}} Execute 1033 1 {1 1033 1 24 {{9 {49 {3 0}}}} Params}
+::twapi::dispatch_prototype_set {{000C109C-0000-0000-C000-000000000046}} Fetch 1033 1 {2 1033 1 {26 {29 256}} {} {}}
+::twapi::dispatch_prototype_set {{000C109C-0000-0000-C000-000000000046}} Modify 1033 1 {3 1033 1 24 {{3 1} {9 0}} {Mode Record}}
+::twapi::dispatch_prototype_set {{000C109C-0000-0000-C000-000000000046}} ColumnInfo 1033 2 {5 1033 2 {26 {29 256}} {{3 1}} Info}
+::twapi::dispatch_prototype_set {{000C109C-0000-0000-C000-000000000046}} Close 1033 1 {4 1033 1 24 {} {}}
+::twapi::dispatch_prototype_set {{000C109C-0000-0000-C000-000000000046}} GetError 1033 1 {6 1033 1 8 {} {}}
+
+# Dispatch Interface UIPreview
+set windowsinstaller::_dispatch_guids(UIPreview) "{000C109A-0000-0000-C000-000000000046}"
+# UIPreview Methods
+::twapi::dispatch_prototype_set {{000C109A-0000-0000-C000-000000000046}} Property 1033 2 {1 1033 2 8 {{8 1}} Name}
+::twapi::dispatch_prototype_set {{000C109A-0000-0000-C000-000000000046}} Property 1033 4 {1 1033 4 24 {{8 1} {8 1}} Name}
+::twapi::dispatch_prototype_set {{000C109A-0000-0000-C000-000000000046}} ViewDialog 1033 1 {2 1033 1 24 {{8 1}} Dialog}
+::twapi::dispatch_prototype_set {{000C109A-0000-0000-C000-000000000046}} ViewBillboard 1033 1 {3 1033 1 24 {{8 1} {8 1}} {Control Billboard}}
+
+# Dispatch Interface FeatureInfo
+set windowsinstaller::_dispatch_guids(FeatureInfo) "{000C109F-0000-0000-C000-000000000046}"
+# FeatureInfo Methods
+::twapi::dispatch_prototype_set {{000C109F-0000-0000-C000-000000000046}} Title 1033 2 {1 1033 2 8 {} {}}
+::twapi::dispatch_prototype_set {{000C109F-0000-0000-C000-000000000046}} Description 1033 2 {2 1033 2 8 {} {}}
+# FeatureInfo Properties
+::twapi::dispatch_prototype_set {{000C109F-0000-0000-C000-000000000046}} Attributes 1033 2 {3 1033 2 3 {} {}}
+::twapi::dispatch_prototype_set {{000C109F-0000-0000-C000-000000000046}} Attributes 1033 4 {3 1033 4 24 {{3 1}} {}}
+
+# Dispatch Interface RecordList
+set windowsinstaller::_dispatch_guids(RecordList) "{000C1096-0000-0000-C000-000000000046}"
+# RecordList Methods
+::twapi::dispatch_prototype_set {{000C1096-0000-0000-C000-000000000046}} _NewEnum 1033 1 {-4 1033 1 13 {} {}}
+::twapi::dispatch_prototype_set {{000C1096-0000-0000-C000-000000000046}} Item 1033 2 {0 1033 2 {26 {29 256}} {{3 0}} Index}
+::twapi::dispatch_prototype_set {{000C1096-0000-0000-C000-000000000046}} Count 1033 2 {1 1033 2 3 {} {}}
+
+# Dispatch Interface StringList
+set windowsinstaller::_dispatch_guids(StringList) "{000C1095-0000-0000-C000-000000000046}"
+# StringList Methods
+::twapi::dispatch_prototype_set {{000C1095-0000-0000-C000-000000000046}} _NewEnum 1033 1 {-4 1033 1 13 {} {}}
+::twapi::dispatch_prototype_set {{000C1095-0000-0000-C000-000000000046}} Item 1033 2 {0 1033 2 8 {{3 0}} Index}
+::twapi::dispatch_prototype_set {{000C1095-0000-0000-C000-000000000046}} Count 1033 2 {1 1033 2 3 {} {}}
+
+# Dispatch Interface Product
+set windowsinstaller::_dispatch_guids(Product) "{000C10A0-0000-0000-C000-000000000046}"
+# Product Methods
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} ProductCode 1033 2 {1 1033 2 25 {{{26 8} 10}} retval}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} UserSid 1033 2 {2 1033 2 25 {{{26 8} 10}} retval}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} Context 1033 2 {3 1033 2 25 {{{26 3} 10}} retval}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} State 1033 2 {4 1033 2 25 {{{26 3} 10}} retval}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} InstallProperty 1033 2 {5 1033 2 25 {{8 1} {{26 8} 10}} {Name retval}}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} ComponentState 1033 2 {6 1033 2 25 {{8 1} {{26 3} 10}} {Component retval}}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} FeatureState 1033 2 {7 1033 2 25 {{8 1} {{26 3} 10}} {Feature retval}}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} Sources 1033 2 {14 1033 2 25 {{3 1} {{26 9} 10}} {SourceType retval}}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} MediaDisks 1033 2 {15 1033 2 25 {{{26 9} 10}} retval}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} SourceListAddSource 1033 1 {8 1033 1 25 {{3 1} {8 1} {3 1}} {iSourceType Source dwIndex}}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} SourceListAddMediaDisk 1033 1 {9 1033 1 25 {{3 1} {8 1} {8 1}} {dwDiskId VolumeLabel DiskPrompt}}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} SourceListClearSource 1033 1 {10 1033 1 25 {{3 1} {8 1}} {iSourceType Source}}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} SourceListClearMediaDisk 1033 1 {11 1033 1 25 {{3 1}} iDiskId}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} SourceListClearAll 1033 1 {12 1033 1 25 {{3 1}} iSourceType}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} SourceListForceResolution 1033 1 {13 1033 1 25 {} {}}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} SourceListInfo 1033 2 {16 1033 2 25 {{8 1} {{26 8} 10}} {Property retval}}
+::twapi::dispatch_prototype_set {{000C10A0-0000-0000-C000-000000000046}} SourceListInfo 1033 4 {16 1033 4 25 {{8 1} {8 1}} {Property retval}}
+
+# Dispatch Interface Patch
+set windowsinstaller::_dispatch_guids(Patch) "{000C10A1-0000-0000-C000-000000000046}"
+# Patch Methods
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} PatchCode 1033 2 {1 1033 2 25 {{{26 8} 10}} retval}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} ProductCode 1033 2 {2 1033 2 25 {{{26 8} 10}} retval}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} UserSid 1033 2 {3 1033 2 25 {{{26 8} 10}} retval}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} Context 1033 2 {4 1033 2 25 {{{26 3} 10}} retval}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} State 1033 2 {5 1033 2 25 {{{26 3} 10}} retval}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} Sources 1033 2 {12 1033 2 25 {{3 1} {{26 9} 10}} {SourceType retval}}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} MediaDisks 1033 2 {13 1033 2 25 {{{26 9} 10}} retval}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} SourceListAddSource 1033 1 {6 1033 1 25 {{3 1} {8 1} {3 1}} {iSourceType Source dwIndex}}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} SourceListAddMediaDisk 1033 1 {7 1033 1 25 {{3 1} {8 1} {8 1}} {dwDiskId VolumeLabel DiskPrompt}}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} SourceListClearSource 1033 1 {8 1033 1 25 {{3 1} {8 1}} {iSourceType Source}}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} SourceListClearMediaDisk 1033 1 {9 1033 1 25 {{3 1}} iDiskId}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} SourceListClearAll 1033 1 {10 1033 1 25 {{3 1}} iSourceType}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} SourceListForceResolution 1033 1 {11 1033 1 25 {} {}}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} SourceListInfo 1033 2 {14 1033 2 25 {{8 1} {{26 8} 10}} {Property retval}}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} SourceListInfo 1033 4 {14 1033 4 25 {{8 1} {8 1}} {Property retval}}
+::twapi::dispatch_prototype_set {{000C10A1-0000-0000-C000-000000000046}} PatchProperty 1033 2 {15 1033 2 25 {{8 1} {{26 8} 10}} {Property Value}}
+
+# Dispatch Interface ComponentPath
+set windowsinstaller::_dispatch_guids(ComponentPath) "{000C1099-0000-0000-C000-000000000046}"
+# ComponentPath Methods
+::twapi::dispatch_prototype_set {{000C1099-0000-0000-C000-000000000046}} ComponentCode 1033 2 {1 1033 2 25 {{{26 8} 10}} retval}
+::twapi::dispatch_prototype_set {{000C1099-0000-0000-C000-000000000046}} Path 1033 2 {2 1033 2 25 {{{26 8} 10}} retval}
+::twapi::dispatch_prototype_set {{000C1099-0000-0000-C000-000000000046}} State 1033 2 {3 1033 2 25 {{{26 3} 10}} retval}
+
+# Dispatch Interface Component
+set windowsinstaller::_dispatch_guids(Component) "{000C1097-0000-0000-C000-000000000046}"
+# Component Methods
+::twapi::dispatch_prototype_set {{000C1097-0000-0000-C000-000000000046}} ComponentCode 1033 2 {1 1033 2 25 {{{26 8} 10}} retval}
+::twapi::dispatch_prototype_set {{000C1097-0000-0000-C000-000000000046}} UserSid 1033 2 {2 1033 2 25 {{{26 8} 10}} retval}
+::twapi::dispatch_prototype_set {{000C1097-0000-0000-C000-000000000046}} Context 1033 2 {3 1033 2 25 {{{26 3} 10}} retval}
+
+# Dispatch Interface ComponentClient
+set windowsinstaller::_dispatch_guids(ComponentClient) "{000C1098-0000-0000-C000-000000000046}"
+# ComponentClient Methods
+::twapi::dispatch_prototype_set {{000C1098-0000-0000-C000-000000000046}} ProductCode 1033 2 {2 1033 2 25 {{{26 8} 10}} retval}
+::twapi::dispatch_prototype_set {{000C1098-0000-0000-C000-000000000046}} ComponentCode 1033 2 {1 1033 2 25 {{{26 8} 10}} retval}
+::twapi::dispatch_prototype_set {{000C1098-0000-0000-C000-000000000046}} UserSid 1033 2 {3 1033 2 25 {{{26 8} 10}} retval}
+::twapi::dispatch_prototype_set {{000C1098-0000-0000-C000-000000000046}} Context 1033 2 {4 1033 2 25 {{{26 3} 10}} retval}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/mstask.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/mstask.tcl
new file mode 100644
index 00000000..d1e37686
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/mstask.tcl
@@ -0,0 +1,745 @@
+#
+# Copyright (c) 2006-2013 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# Task scheduler API
+
+package require twapi_com
+
+namespace eval twapi {
+    variable CLSID_ITaskScheduler {{148BD52A-A2AB-11CE-B11F-00AA00530503}}
+    variable CLSID_ITask          {{148BD520-A2AB-11CE-B11F-00AA00530503}}
+}
+
+# Return an instance of the task scheduler
+proc twapi::itaskscheduler_new {args} {
+    array set opts [parseargs args {
+        system.arg
+    } -maxleftover 0]
+
+    # Get ITaskScheduler interface
+    set its [com_create_instance $::twapi::CLSID_ITaskScheduler -model inprocserver -interface ITaskScheduler -raw]
+    if {![info exists opts(system)]} {
+        return $its
+    }
+    trap {
+        itaskscheduler_set_target_system $its $opts(system)
+    } onerror {} {
+        IUnknown_Release $its
+        rethrow
+    }
+    return $its
+}
+
+interp alias {} ::twapi::itaskscheduler_release {} ::twapi::IUnknown_Release
+
+# Return a new task interface
+proc twapi::itaskscheduler_new_itask {its taskname} {
+    set iid_itask [name_to_iid ITask]
+    set iunk [ITaskScheduler_NewWorkItem $its $taskname $::twapi::CLSID_ITask $iid_itask]
+    trap {
+        set itask [Twapi_IUnknown_QueryInterface $iunk $iid_itask ITask]
+    } finally {
+        IUnknown_Release $iunk
+    }
+    return $itask
+}
+
+# Get an existing task
+proc twapi::itaskscheduler_get_itask {its taskname} {
+    set iid_itask [name_to_iid ITask]
+    set iunk [ITaskScheduler_Activate $its $taskname $iid_itask]
+    trap {
+        set itask [Twapi_IUnknown_QueryInterface $iunk $iid_itask ITask]
+    } finally {
+        IUnknown_Release $iunk
+    }
+    return $itask
+}
+
+# Check if an itask exists
+proc twapi::itaskscheduler_task_exists {its taskname} {
+    return [expr {[ITaskScheduler_IsOfType $its $taskname [name_to_iid ITask]] == 0 ? true : false}]
+}
+
+# Return list of tasks
+proc twapi::itaskscheduler_get_tasks {its} {
+    set ienum [ITaskScheduler_Enum $its]
+    trap {
+        set result [list ]
+        set more 1
+        while {$more} {
+            lassign [IEnumWorkItems_Next $ienum 20] more items
+            set result [concat $result $items]
+        }
+    } finally {
+        IUnknown_Release $ienum
+    }
+    return $result
+}
+
+# Sets the specified properties of the ITask
+proc twapi::itask_configure {itask args} {
+
+    array set opts [parseargs args {
+        application.arg
+        maxruntime.int
+        params.arg
+        priority.arg
+        workingdir.arg
+        account.arg
+        password.arg
+        comment.arg
+        creator.arg
+        data.arg
+        idlewait.int
+        idlewaitdeadline.int
+        interactive.bool
+        deletewhendone.bool
+        disabled.bool
+        hidden.bool
+        runonlyifloggedon.bool
+        startonlyifidle.bool
+        resumesystem.bool
+        killonidleend.bool
+        restartonidleresume.bool
+        dontstartonbatteries.bool
+        killifonbatteries.bool
+    } -maxleftover 0]
+
+    if {[info exists opts(priority)]} {
+        switch -exact -- $opts(priority) {
+            normal      {set opts(priority) 0x00000020}
+            abovenormal {set opts(priority) 0x00008000}
+            belownormal {set opts(priority) 0x00004000}
+            high        {set opts(priority) 0x00000080}
+            realtime    {set opts(priority) 0x00000100}
+            idle        {set opts(priority) 0x00000040}
+            default     {error "Unknown priority '$opts(priority)'. Must be one of 'normal', 'high', 'idle' or 'realtime'"}
+        }
+    }
+
+    foreach {opt fn} {
+        application ITask_SetApplicationName
+        maxruntime  ITask_SetMaxRunTime
+        params      ITask_SetParameters
+        workingdir  ITask_SetWorkingDirectory
+        priority    ITask_SetPriority
+        comment            IScheduledWorkItem_SetComment
+        creator            IScheduledWorkItem_SetCreator
+        data               IScheduledWorkItem_SetWorkItemData
+        errorretrycount    IScheduledWorkItem_SetErrorRetryCount
+        errorretryinterval IScheduledWorkItem_SetErrorRetryInterval
+    } {
+        if {[info exists opts($opt)]} {
+            $fn  $itask $opts($opt)
+        }
+    }
+
+    if {[info exists opts(account)]} {
+        if {$opts(account) ne ""} {
+            if {![info exists opts(password)]} {
+                error "Option -password must be specified if -account is specified"
+            }
+        } else {
+            # System account. Set password to NULL pointer indicated
+            # by magic null pointer
+            set opts(password) $::twapi::nullptr
+        }
+        IScheduledWorkItem_SetAccountInformation $itask $opts(account) $opts(password)
+    }
+
+    if {[info exists opts(idlewait)] || [info exists opts(idlewaitdeadline)]} {
+        # If either one is not specified, get the current settings
+        if {! ([info exists opts(idlewait)] &&
+               [info exists opts(idlewaitdeadline)]) } {
+            lassign [IScheduledWorkItem_GetIdleWait $itask] idle dead
+            if {![info exists opts(idlewait)]} {
+                set opts(idlewait) $idle
+            }
+            if {![info exists opts(idlewaitdeadline)]} {
+                set opts(idlewaitdeadline) $dead
+            }
+        }
+        IScheduledWorkItem_SetIdleWait $itask $opts(idlewait) $opts(idlewaitdeadline)
+    }
+
+    # Finally figure out and set the flags if needed
+    if {[info exists opts(interactive)] ||
+        [info exists opts(deletewhendone)] ||
+        [info exists opts(disabled)] ||
+        [info exists opts(hidden)] ||
+        [info exists opts(runonlyifloggedon)] ||
+        [info exists opts(startonlyifidle)] ||
+        [info exists opts(resumesystem)] ||
+        [info exists opts(killonidleend)] ||
+        [info exists opts(restartonidleresume)] ||
+        [info exists opts(dontstartonbatteries)] ||
+        [info exists opts(killifonbatteries)]} {
+
+        # First, get the current flags
+        set flags [IScheduledWorkItem_GetFlags $itask]
+        foreach {opt val} {
+            interactive         0x1
+            deletewhendone      0x2
+            disabled            0x4
+            startonlyifidle     0x10
+            hidden              0x200
+            runonlyifloggedon   0x2000
+            resumesystem        0x1000
+            killonidleend       0x20
+            restartonidleresume 0x800
+            dontstartonbatteries 0x40
+            killifonbatteries   0x80
+        } {
+            # Set / reset the bit if specified
+            if {[info exists opts($opt)]} {
+                if {$opts($opt)} {
+                    setbits flags $val
+                } else {
+                    resetbits flags $val
+                }
+            }
+        }
+
+        # Now set the new value of flags
+        IScheduledWorkItem_SetFlags $itask $flags
+    }
+
+
+    return
+}
+
+proc twapi::itask_get_info {itask args} {
+    # Note options errorretrycount and errorretryinterval are not implemented
+    # by the OS so left out
+    array set opts [parseargs args {
+        all
+        application
+        maxruntime
+        params
+        priority
+        workingdir
+        account
+        comment
+        creator
+        data
+        idlewait
+        idlewaitdeadline
+        interactive
+        deletewhendone
+        disabled
+        hidden
+        runonlyifloggedon
+        startonlyifidle
+        resumesystem
+        killonidleend
+        restartonidleresume
+        dontstartonbatteries
+        killifonbatteries
+        lastruntime
+        nextruntime
+        status
+    } -maxleftover 0]
+
+    set result [list ]
+    if {$opts(all) || $opts(priority)} {
+        switch -exact -- [twapi::ITask_GetPriority $itask] {
+            32    { set priority normal }
+            64    { set priority idle }
+            128   { set priority high }
+            256   { set priority realtime }
+            16384 { set priority belownormal }
+            32768 { set priority abovenormal }
+            default { set priority unknown }
+        }
+        lappend result -priority $priority
+    }
+
+    foreach {opt fn} {
+        application ITask_GetApplicationName
+        maxruntime  ITask_GetMaxRunTime
+        params      ITask_GetParameters
+        workingdir  ITask_GetWorkingDirectory
+        account            IScheduledWorkItem_GetAccountInformation
+        comment            IScheduledWorkItem_GetComment
+        creator            IScheduledWorkItem_GetCreator
+        data               IScheduledWorkItem_GetWorkItemData
+    } {
+        if {$opts(all) || $opts($opt)} {
+            trap {
+                lappend result -$opt [$fn  $itask]
+            } onerror {TWAPI_WIN32 -2147216625} {
+                # THe information is empty in the scheduler database
+                lappend result -$opt {}
+            }
+        }
+    }
+
+    if {$opts(all) || $opts(lastruntime)} {
+        trap {
+            lappend result -lastruntime [_timelist_to_timestring [IScheduledWorkItem_GetMostRecentRunTime $itask]]
+        } onerror {TWAPI_WIN32 267011} {
+            # Not run yet at all
+            lappend result -lastruntime {}
+        }
+    }
+
+    if {$opts(all) || $opts(nextruntime)} {
+        trap {
+            lappend result -nextruntime [_timelist_to_timestring [IScheduledWorkItem_GetNextRunTime $itask]]
+        } onerror {TWAPI_WIN32 267010} {
+            # Task is disabled
+            lappend result -nextruntime disabled
+        } onerror {TWAPI_WIN32 267015} {
+            # No triggers set
+            lappend result -nextruntime notriggers
+        } onerror {TWAPI_WIN32 267016} {
+            # No triggers set
+            lappend result -nextruntime oneventonly
+        }
+    }
+
+    if {$opts(all) || $opts(status)} {
+        set status [IScheduledWorkItem_GetStatus $itask]
+        if {$status == 0x41300} {
+            set status ready
+        } elseif {$status == 0x41301} {
+            set status running
+        } elseif {$status == 0x41302} {
+            set status disabled
+        } elseif {$status == 0x41305} {
+            set status partiallydefined
+        } else {
+            set status unknown
+        }
+        lappend result -status $status
+    }
+
+
+    if {$opts(all) || $opts(idlewait) || $opts(idlewaitdeadline)} {
+        lassign [IScheduledWorkItem_GetIdleWait $itask] idle dead
+        if {$opts(all) || $opts(idlewait)} {
+            lappend result -idlewait $idle
+        }
+        if {$opts(all) || $opts(idlewaitdeadline)} {
+            lappend result -idlewaitdeadline $dead
+        }
+    }
+
+    # Finally figure out and set the flags if needed
+    if {$opts(all) ||
+        $opts(interactive) ||
+        $opts(deletewhendone) ||
+        $opts(disabled) ||
+        $opts(hidden) ||
+        $opts(runonlyifloggedon) ||
+        $opts(startonlyifidle) ||
+        $opts(resumesystem) ||
+        $opts(killonidleend) ||
+        $opts(restartonidleresume) ||
+        $opts(dontstartonbatteries) ||
+        $opts(killifonbatteries)} {
+
+        # First, get the current flags
+        set flags [IScheduledWorkItem_GetFlags $itask]
+        foreach {opt val} {
+            interactive         0x1
+            deletewhendone      0x2
+            disabled            0x4
+            startonlyifidle     0x10
+            hidden              0x200
+            runonlyifloggedon   0x2000
+            resumesystem        0x1000
+            killonidleend       0x20
+            restartonidleresume 0x800
+            dontstartonbatteries 0x40
+            killifonbatteries   0x80
+        } {
+            if {$opts(all) || $opts($opt)} {
+                lappend result -$opt [expr {($flags & $val) ? true : false}]
+            }
+        }
+    }
+
+
+    return $result
+}
+
+# Get the runtimes for a task within an interval
+proc twapi::itask_get_runtimes_within_interval {itask args} {
+    array set opts [parseargs args {
+        start.arg
+        end.arg
+        {count.int 1}
+        statusvar.arg
+    } -maxleftover 0]
+
+    if {[info exists opts(start)]} {
+        set start [_timestring_to_timelist $opts(start)]
+    } else {
+        set start [_seconds_to_timelist [clock seconds]]
+    }
+    if {[info exists opts(end)]} {
+        set end [_timestring_to_timelist $opts(end)]
+    } else {
+        set end {2038 1 1 0 0 0 0}
+    }
+
+    set result [list ]
+    if {[info exists opts(statusvar)]} {
+        upvar $opts(statusvar) status
+    }
+    lassign [IScheduledWorkItem_GetRunTimes $itask $start $end $opts(count)] status timelist
+
+    foreach time $timelist {
+        lappend result [_timelist_to_timestring $time]
+    }
+
+
+    return $result
+}
+
+# Saves the specified ITask
+proc twapi::itask_save {itask} {
+    set ipersist [Twapi_IUnknown_QueryInterface $itask [name_to_iid IPersistFile] IPersistFile]
+    trap {
+        IPersistFile_Save $ipersist "" 1
+    } finally {
+        IUnknown_Release $ipersist
+    }
+    return
+}
+
+# Show property editor for a task
+proc twapi::itask_edit_dialog {itask args} {
+    array set opts [parseargs args {
+        {hwin.arg 0}
+    } -maxleftover 0]
+
+    return [twapi::IScheduledWorkItem_EditWorkItem $itask $opts(hwin) 0]
+}
+
+
+interp alias {} ::twapi::itask_release {} ::twapi::IUnknown_Release
+
+# Get information about a trigger
+proc twapi::itasktrigger_get_info {itt} {
+    array set data [ITaskTrigger_GetTrigger $itt]
+
+    set result(-begindate) [format %04d-%02d-%02d $data(wBeginYear) $data(wBeginMonth) $data(wBeginDay)]
+
+    set result(-starttime) [format %02d:%02d $data(wStartHour) $data(wStartMinute)]
+
+    if {$data(rgFlags) & 1} {
+        set result(-enddate) [format %04d-%02d-%02d $data(wEndYear) $data(wEndMonth) $data(wEndDay)]
+    } else {
+        set result(-enddate) ""
+    }
+
+    set result(-duration) $data(MinutesDuration)
+    set result(-interval) $data(MinutesInterval)
+    if {$data(rgFlags) & 2} {
+        set result(-killatdurationend) true
+    } else {
+        set result(-killatdurationend) false
+    }
+
+    if {$data(rgFlags) & 4} {
+        set result(-disabled) true
+    } else {
+        set result(-disabled) false
+    }
+
+    switch -exact -- [lindex $data(type) 0] {
+        0 {
+            set result(-type) once
+        }
+        1 {
+            set result(-type) daily
+            set result(-period) [lindex $data(type) 1]
+        }
+        2 {
+            set result(-type) weekly
+            set result(-period) [lindex $data(type) 1]
+            set result(-weekdays) [format 0x%x [lindex $data(type) 2]]
+        }
+        3 {
+            set result(-type) monthlydate
+            set result(-daysofmonth) [format 0x%x [lindex $data(type) 1]]
+            set result(-months) [format 0x%x [lindex $data(type) 2]]
+        }
+        4 {
+            set result(-type) monthlydow
+            set result(-weekofmonth) [lindex {first second third fourth last} [lindex $data(type) 2]]
+            set result(-weekdays) [format 0x%x [lindex $data(type) 2]]
+            set result(-months) [format 0x%x [lindex $data(type) 3]]
+        }
+        5 {
+            set result(-type) onidle
+        }
+        6 {
+            set result(-type) atsystemstart
+        }
+        7 {
+            set result(-type) atlogon
+        }
+    }
+    return [array get result]
+}
+
+
+# Configure a task trigger
+proc twapi::itasktrigger_configure {itt args} {
+    array set opts [parseargs args {
+        begindate.arg
+        enddate.arg
+        starttime.arg
+        interval.int
+        duration.int
+        killatdurationend.bool
+        disabled.bool
+        type.arg
+        weekofmonth.int
+        {period.int 1}
+        {weekdays.int 0x7f}
+        {daysofmonth.int 0x7fffffff}
+        {months.int 0xfff}
+    } -maxleftover 0]
+
+
+    array set data [ITaskTrigger_GetTrigger $itt]
+
+    if {[info exists opts(begindate)]} {
+        lassign  [split $opts(begindate) -]  year month day
+        # Note we trim leading zeroes else Tcl thinks its octal
+        set data(wBeginYear) [scan $year %d]
+        set data(wBeginMonth) [scan $month %d]
+        set data(wBeginDay) [scan $day %d]
+    }
+
+    if {[info exists opts(starttime)]} {
+        lassign [split $opts(starttime) :] hour minute
+        # Note we trim leading zeroes else Tcl thinks its octal
+        set data(wStartHour) [scan $hour %d]
+        set data(wStartMinute) [scan $minute %d]
+    }
+
+    if {[info exists opts(enddate)]} {
+        if {$opts(enddate) ne ""} {
+            setbits data(rgFlags) 1;        # Indicate end date is present
+            lassign  [split $opts(enddate) -] year month day
+            # Note we trim leading zeroes else Tcl thinks its octal
+            set data(wEndYear) [scan $year %d]
+            set data(wEndMonth) [scan $month %d]
+            set data(wEndDay) [scan $day %d]
+        } else {
+            resetbits data(rgFlags) 1;  # Indicate no end date
+        }
+    }
+
+
+    if {[info exists opts(duration)]} {
+        set data(MinutesDuration) $opts(duration)
+    }
+
+    if {[info exists opts(interval)]} {
+        set data(MinutesInterval) $opts(interval)
+    }
+
+    if {[info exists opts(killatdurationend)]} {
+        if {$opts(killatdurationend)} {
+            setbits data(rgFlags) 2
+        } else {
+            resetbits data(rgFlags) 2
+        }
+    }
+
+    if {[info exists opts(disabled)]} {
+        if {$opts(disabled)} {
+            setbits data(rgFlags) 4
+        } else {
+            resetbits data(rgFlags) 4
+        }
+    }
+
+    # Note the type specific options are only used if -type is specified
+    if {[info exists opts(type)]} {
+        switch -exact -- $opts(type) {
+            once {
+                set data(type) [list 0]
+            }
+            daily {
+                set data(type) [list 1 $opts(period)]
+            }
+            weekly {
+                set data(type) [list 2 $opts(period) $opts(weekdays)]
+            }
+            monthlydate {
+                set data(type) [list 3 $opts(daysofmonth) $opts(months)]
+            }
+            monthlydow {
+                set data(type) [list 4 $opts(weekofmonth) $opts(weekdays) $opts(months)]
+            }
+            onidle {
+                set data(type) [list 5]
+            }
+            atsystemstart {
+                set data(type) [list 6]
+            }
+            atlogon {
+                set data(type) [list 7]
+            }
+        }
+    }
+
+    ITaskTrigger_SetTrigger $itt [array get data]
+    return
+}
+
+interp alias {} ::twapi::itasktrigger_release {} ::twapi::IUnknown_Release
+
+# Create a new task from scratch. Basically a wrapper around the
+# corresponding itaskscheduler, itask and itasktrigger calls
+proc twapi::mstask_create {taskname args} {
+
+    # The options are a combination of itask_configure and
+    # itasktrigger_configure.
+    # Note the disabled option default to false explicitly. This is because
+    # the task trigger will default to disabled unless specifically set.
+    array set opts [parseargs args {
+        system.arg
+        application.arg
+        maxruntime.int
+        params.arg
+        priority.arg
+        workingdir.arg
+        account.arg
+        password.arg
+        comment.arg
+        creator.arg
+        data.arg
+        idlewait.int
+        idlewaitdeadline.int
+        interactive.bool
+        deletewhendone.bool
+        {disabled.bool false}
+        hidden.bool
+        runonlyifloggedon.bool
+        startonlyifidle.bool
+        resumesystem.bool
+        killonidleend.bool
+        restartonidleresume.bool
+        dontstartonbatteries.bool
+        killifonbatteries.bool
+        begindate.arg
+        enddate.arg
+        starttime.arg
+        interval.int
+        duration.int
+        killatdurationend.bool
+        type.arg
+        period.int
+        weekdays.int
+        daysofmonth.int
+        months.int
+    } -maxleftover 0]
+
+    set its [itaskscheduler_new]
+    trap {
+        if {[info exists opts(system)]} {
+            itaskscheduler_set_target_system $opts(system)
+        }
+
+        set itask [itaskscheduler_new_itask $its $taskname]
+        # Construct the command line for configuring the task
+        set cmd [list itask_configure $itask]
+        foreach opt {
+            application
+            maxruntime
+            params
+            priority
+            workingdir
+            account
+            password
+            comment
+            creator
+            data
+            idlewait
+            idlewaitdeadline
+            interactive
+            deletewhendone
+            disabled
+            hidden
+            runonlyifloggedon
+            startonlyifidle
+            resumesystem
+            killonidleend
+            restartonidleresume
+            dontstartonbatteries
+            killifonbatteries
+        } {
+            if {[info exists opts($opt)]} {
+                lappend cmd -$opt $opts($opt)
+            }
+        }
+        eval $cmd
+
+        # Now get a trigger and configure it
+        set itt [lindex [itask_new_itasktrigger $itask] 1]
+        set cmd [list itasktrigger_configure $itt]
+        foreach opt {
+            begindate
+            enddate
+            interval
+            starttime
+            duration
+            killatdurationend
+            type
+            period
+            weekdays
+            daysofmonth
+            months
+            disabled
+        } {
+            if {[info exists opts($opt)]} {
+                lappend cmd -$opt $opts($opt)
+            }
+        }
+        eval $cmd
+
+        # Save the task
+        itask_save $itask
+
+    } finally {
+        IUnknown_Release $its
+        if {[info exists itask]} {
+            IUnknown_Release $itask
+        }
+        if {[info exists itt]} {
+            IUnknown_Release $itt
+        }
+    }
+    return
+}
+
+# Delete a task
+proc twapi::mstask_delete {taskname args} {
+    # The options are a combination of itask_configure and
+    # itasktrigger_configure
+    array set opts [parseargs args {
+        system.arg
+    } -maxleftover 0]
+    set its [itaskscheduler_new]
+    trap {
+        if {[info exists opts(system)]} {
+            itaskscheduler_set_target_system $opts(system)
+        }
+        itaskscheduler_delete_task $its $taskname
+    } finally {
+        IUnknown_Release $its
+    }
+    return
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/multimedia.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/multimedia.tcl
new file mode 100644
index 00000000..57665197
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/multimedia.tcl
@@ -0,0 +1,75 @@
+#
+# Copyright (c) 2012 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# Generate sound for the specified duration
+proc twapi::beep {args} {
+    array set opts [parseargs args {
+        {frequency.int 1000}
+        {duration.int 100}
+        {type.arg}
+    }]
+
+    if {[info exists opts(type)]} {
+        switch -exact -- $opts(type) {
+            ok           {MessageBeep 0}
+            hand         {MessageBeep 0x10}
+            question     {MessageBeep 0x20}
+            exclaimation {MessageBeep 0x30}
+            exclamation {MessageBeep 0x30}
+            asterisk     {MessageBeep 0x40}
+            default      {error "Unknown sound type '$opts(type)'"}
+        }
+        return
+    }
+    Beep $opts(frequency) $opts(duration)
+    return
+}
+
+# Play the specified sound
+proc twapi::play_sound {name args} {
+    array set opts [parseargs args {
+        alias
+        async
+        loop
+        nodefault
+        wait
+        nostop
+    }]
+
+    if {$opts(alias)} {
+        set flags 0x00010000; #SND_ALIAS
+    } else {
+        set flags 0x00020000; #SND_FILENAME
+    }
+    if {$opts(loop)} {
+        # Note LOOP requires ASYNC
+        setbits flags 0x9; #SND_LOOP | SND_ASYNC
+    } else {
+        if {$opts(async)} {
+            setbits flags 0x0001; #SND_ASYNC
+        } else {
+            setbits flags 0x0000; #SND_SYNC
+        }
+    }
+
+    if {$opts(nodefault)} {
+        setbits flags 0x0002; #SND_NODEFAULT
+    }
+
+    if {! $opts(wait)} {
+        setbits flags 0x00002000; #SND_NOWAIT
+    }
+
+    if {$opts(nostop)} {
+        setbits flags 0x0010; #SND_NOSTOP
+    }
+
+    return [PlaySound $name 0 $flags]
+}
+
+proc twapi::stop_sound {} {
+    PlaySound "" 0 0x0040; #SND_PURGE
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/namedpipe.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/namedpipe.tcl
new file mode 100644
index 00000000..7e222f13
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/namedpipe.tcl
@@ -0,0 +1,103 @@
+#
+# Copyright (c) 2010-2011, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# Implementation of named pipes
+
+proc twapi::namedpipe_server {name args} {
+    set name [file nativename $name]
+
+    # Only byte mode currently supported. Message mode does
+    # not mesh well with Tcl channel infrastructure.
+    # readmode.arg
+    # writemode.arg
+
+    array set opts [twapi::parseargs args {
+        {access.arg {read write}}
+        {writedacl    0  0x00040000}
+        {writeowner   0  0x00080000}
+        {writesacl    0  0x01000000}
+        {writethrough 0  0x80000000}
+        denyremote
+        {timeout.int 50}
+        {maxinstances.int 255}
+        {secd.arg {}}
+        {inherit.bool 0}
+    } -maxleftover 0]
+
+    # 0x40000000 -> OVERLAPPED I/O
+    set open_mode [expr {
+                         [twapi::_parse_symbolic_bitmask $opts(access) {read 1 write 2}] |
+                         $opts(writedacl) | $opts(writeowner) |
+                         $opts(writesacl) | $opts(writethrough) |
+                         0x40000000
+                      }]
+        
+    set pipe_mode 0
+    if {$opts(denyremote)} {
+        if {! [twapi::min_os_version 6]} {
+            error "Option -denyremote not supported on this operating system."
+        }
+        set pipe_mode [expr {$pipe_mode | 8}]
+    }
+
+    return [twapi::Twapi_NPipeServer $name $open_mode $pipe_mode \
+                $opts(maxinstances) 4000 4000 $opts(timeout) \
+                [_make_secattr $opts(secd) $opts(inherit)]]
+}
+
+proc twapi::namedpipe_client {name args} {
+    set name [file nativename $name]
+
+    # Only byte mode currently supported. Message mode does
+    # not mesh well with Tcl channel infrastructure.
+    # readmode.arg
+    # writemode.arg
+
+    array set opts [twapi::parseargs args {
+        {access.arg {read write}}
+        impersonationlevel.arg
+        {impersonateeffectiveonly.bool false 0x00080000}
+        {impersonatecontexttracking.bool false 0x00040000}
+    } -maxleftover 0]
+
+    # FILE_READ_DATA              0x00000001
+    # FILE_WRITE_DATA             0x00000002
+    # Note - use _parse_symbolic_bitmask because we allow user to specify
+    # numeric masks as well
+    set desired_access [twapi::_parse_symbolic_bitmask $opts(access) {
+        read  1
+        write 2
+    }]
+        
+    set flags 0
+    if {[info exists opts(impersonationlevel)]} {
+        switch -exact -- $opts(impersonationlevel) {
+            anonymous      { set flags 0x00100000 }
+            identification { set flags 0x00110000 }
+            impersonation  { set flags 0x00120000 }
+            delegation     { set flags 0x00130000 }
+            default {
+                # ERROR_BAD_IMPERSONATION_LEVEL
+                win32_error 1346 "Invalid impersonation level '$opts(impersonationlevel)'."
+            }
+        }
+        set flags [expr {$flags | $opts(impersonateeffectiveonly) |
+                         $opts(impersonatecontexttracking)}]
+    }
+
+    set share_mode 0;           # Share none
+    set secattr {};             # At some point use this for "inherit" flag
+    set create_disposition 3;   # OPEN_EXISTING
+    return [twapi::Twapi_NPipeClient $name $desired_access $share_mode \
+                $secattr $create_disposition $flags]
+}
+
+# Impersonate a named pipe client
+proc twapi::impersonate_namedpipe_client {chan} {
+    set h [get_tcl_channel_handle $chan read]
+    ImpersonateNamedPipeClient $h
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/network.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/network.tcl
new file mode 100644
index 00000000..4cdbba87
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/network.tcl
@@ -0,0 +1,1124 @@
+#
+# Copyright (c) 2004-2014, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {
+    record IP_ADAPTER_ADDRESSES_XP {
+        -ipv4ifindex -adaptername -unicastaddresses -anycastaddresses
+        -multicastaddresses -dnsservers -dnssuffix -description
+        -friendlyname -physicaladdress -flags -mtu -type -operstatus
+        -ipv6ifindex -zoneindices -prefixes
+    }
+
+    if {[min_os_version 6]} {
+        record IP_ADAPTER_ADDRESSES [list {*}[IP_ADAPTER_ADDRESSES_XP] -transmitspeed -receivespeed -winsaddresses -gatewayaddresses -ipv4metric -ipv6metric -luid -dhcpv4server -compartmentid -networkguid -connectiontype -tunneltype -dhcpv6server -dhcpv6clientduid -dhcpv6iaid -dnssuffixes]
+    } else {
+        record IP_ADAPTER_ADDRESSES [IP_ADAPTER_ADDRESSES_XP]
+    }
+
+    record IP_ADAPTER_UNICAST_ADDRESS {
+        -flags -address -prefixorigin -suffixorigin -dadstate -validlifetime -preferredlifetime -leaselifetime 
+    }
+
+    record IP_ADAPTER_ANYCAST_ADDRESS {-flags -address}
+    record IP_ADAPTER_MULTICAST_ADDRESS [IP_ADAPTER_ANYCAST_ADDRESS]
+    record IP_ADAPTER_DNS_SERVER_ADDRESS [IP_ADAPTER_ANYCAST_ADDRESS]
+}
+
+proc twapi::get_network_adapters {} {
+    # 0x20 -> SKIP_FRIENDLYNAME
+    # 0x0f -> SKIP_DNS_SERVER, SKIP_UNICAST/MULTICAST/ANYCAST
+    return [lpick [GetAdaptersAddresses 0 0x2f] [enum [IP_ADAPTER_ADDRESSES] -adaptername]]
+}
+
+proc twapi::get_network_adapters_detail {} {
+    set recs {}
+    # We only return fields common to all platforms
+    set fields [IP_ADAPTER_ADDRESSES_XP]
+    foreach rec [GetAdaptersAddresses 0 0] {
+        set rec [IP_ADAPTER_ADDRESSES set $rec \
+                     -physicaladdress [_hwaddr_binary_to_string [IP_ADAPTER_ADDRESSES -physicaladdress $rec]] \
+                     -unicastaddresses [ntwine [IP_ADAPTER_UNICAST_ADDRESS] [IP_ADAPTER_ADDRESSES -unicastaddresses $rec]] \
+                     -multicastaddresses [ntwine [IP_ADAPTER_MULTICAST_ADDRESS] [IP_ADAPTER_ADDRESSES -multicastaddresses $rec]] \
+                     -anycastaddresses [ntwine [IP_ADAPTER_ANYCAST_ADDRESS] [IP_ADAPTER_ADDRESSES -anycastaddresses $rec]] \
+                     -dnsservers [ntwine [IP_ADAPTER_DNS_SERVER_ADDRESS] [IP_ADAPTER_ADDRESSES -dnsservers $rec]]]
+
+        lappend recs [IP_ADAPTER_ADDRESSES select $rec $fields]
+    }
+    return [list $fields $recs]
+}
+
+# Get the list of local IP addresses
+proc twapi::get_system_ipaddrs {args} {
+    array set opts [parseargs args {
+        {ipversion.arg 0}
+        {types.arg unicast}
+        adaptername.arg
+    } -maxleftover 0]
+
+    # 0x20 -> SKIP_FRIENDLYNAME
+    # 0x08 -> SKIP_DNS_SERVER
+    set flags 0x2f
+    if {"all" in $opts(types)} {
+        set flags 0x20
+    } else {
+        if {"unicast" in $opts(types)} {incr flags -1}
+        if {"anycast" in $opts(types)} {incr flags -2}
+        if {"multicast" in $opts(types)} {incr flags -4}
+    }
+
+    set addrs {}
+    trap {
+        set entries [GetAdaptersAddresses [_ipversion_to_af $opts(ipversion)] $flags]
+    } onerror {TWAPI_WIN32 232} {
+        # Not installed, so no addresses
+        return {}
+    }
+
+    foreach entry $entries {
+        if {[info exists opts(adaptername)] &&
+            [string compare -nocase [IP_ADAPTER_ADDRESSES -adaptername $entry] $opts(adaptername)]} {
+            continue
+        }
+
+        foreach rec [IP_ADAPTER_ADDRESSES -unicastaddresses $entry] {
+            lappend addrs [IP_ADAPTER_UNICAST_ADDRESS -address $rec]
+        }
+        foreach rec [IP_ADAPTER_ADDRESSES -anycastaddresses $entry] {
+            lappend addrs [IP_ADAPTER_ANYCAST_ADDRESS -address $rec]
+        }
+        foreach rec [IP_ADAPTER_ADDRESSES -multicastaddresses $entry] {
+            lappend addrs [IP_ADAPTER_MULTICAST_ADDRESS -address $rec]
+        }
+    }
+
+    return [lsort -unique $addrs]
+}
+
+# Get network related information
+proc twapi::get_network_info {args} {
+    # Map options into the positions in result of GetNetworkParams
+    array set getnetworkparams_opts {
+        hostname     0
+        domain       1
+        dnsservers   2
+        dhcpscopeid  4
+        routingenabled  5
+        arpproxyenabled 6
+        dnsenabled      7
+    }
+
+    array set opts [parseargs args \
+                        [concat [list all] \
+                             [array names getnetworkparams_opts]]]
+    set result [list ]
+    foreach opt [array names getnetworkparams_opts] {
+        if {!$opts(all) && !$opts($opt)} continue
+        if {![info exists netparams]} {
+            set netparams [GetNetworkParams]
+        }
+        lappend result -$opt [lindex $netparams $getnetworkparams_opts($opt)]
+    }
+
+    return $result
+}
+
+
+proc twapi::get_network_adapter_info {interface args} {
+    array set opts [parseargs args {
+        all
+        adaptername
+        anycastaddresses
+        description
+        dhcpenabled
+        dnsservers
+        dnssuffix
+        friendlyname
+        ipv4ifindex
+        ipv6ifindex
+        multicastaddresses
+        mtu
+        operstatus
+        physicaladdress
+        prefixes
+        type
+        unicastaddresses
+        zoneindices
+
+        {ipversion.arg 0}
+    } -maxleftover 0 -hyphenated]
+    
+    set ipversion [_ipversion_to_af $opts(-ipversion)]
+
+    set flags 0
+    if {! $opts(-all)} {
+        # If not asked for some fields, don't bother getting them
+        if {! $opts(-unicastaddresses)} { incr flags 0x1 }
+        if {! $opts(-anycastaddresses)} { incr flags 0x2 }
+        if {! $opts(-multicastaddresses)} { incr flags 0x4 }
+        if {! $opts(-dnsservers)} { incr flags 0x8 }
+        if {! $opts(-friendlyname)} { incr flags 0x20 }
+
+        if {$opts(-prefixes)} { incr flags 0x10 }
+    } else {
+        incr flags 0x10;        # Want prefixes also
+    }
+    
+    set entries [GetAdaptersAddresses $ipversion $flags]
+    set nameindex [enum [IP_ADAPTER_ADDRESSES] -adaptername]
+    set entry [lsearch -nocase -exact -inline -index $nameindex $entries $interface]
+    if {[llength $entry] == 0} {
+        error "No interface matching '$interface'."
+    }
+
+    array set result [IP_ADAPTER_ADDRESSES $entry]
+    if {$opts(-all) || $opts(-dhcpenabled)} {
+        set result(-dhcpenabled) [expr {($result(-flags) & 0x4) != 0}]
+    }
+    # Note even if -all is specified, we still loop through because
+    # the fields of IP_ADAPTER_ADDRESSES are a superset of options
+    foreach opt [IP_ADAPTER_ADDRESSES] {
+        # Select only those fields that have an option defined
+        # and that option is selected
+        if {!([info exists opts($opt)] && ($opts(-all) || $opts($opt)))} {
+            unset result($opt)
+        }
+    }
+    if {[info exists result(-physicaladdress)]} {
+        set result(-physicaladdress) [_hwaddr_binary_to_string $result(-physicaladdress)]
+    }
+    if {[info exists result(-unicastaddresses)]} {
+        set result(-unicastaddresses) [ntwine [IP_ADAPTER_UNICAST_ADDRESS] $result(-unicastaddresses)]
+    }
+    if {[info exists result(-multicastaddresses)]} {
+        set result(-multicastaddresses) [ntwine [IP_ADAPTER_MULTICAST_ADDRESS] $result(-multicastaddresses)]
+    }
+    if {[info exists result(-anycastaddresses)]} {
+        set result(-anycastaddresses) [ntwine [IP_ADAPTER_ANYCAST_ADDRESS] $result(-anycastaddresses)]
+    }
+    if {[info exists result(-dnsservers)]} {
+        set result(-dnsservers) [ntwine [IP_ADAPTER_DNS_SERVER_ADDRESS] $result(-dnsservers)]
+    }
+
+    return [array get result]
+}
+
+# Get the address->h/w address table
+proc twapi::get_arp_table {args} {
+    array set opts [parseargs args {
+        sort
+    }]
+
+    set arps [list ]
+
+    foreach arp [GetIpNetTable $opts(sort)] {
+        lassign $arp  ifindex hwaddr ipaddr type
+        # Token for enry   0     1      2      3        4
+        set type [lindex {other other invalid dynamic static} $type]
+        if {$type == ""} {
+            set type other
+        }
+        lappend arps [list $ifindex [_hwaddr_binary_to_string $hwaddr] $ipaddr $type]
+    }
+    return [list [list ifindex hwaddr ipaddr type] $arps]
+}
+
+# Return IP address for a hw address
+proc twapi::ipaddr_to_hwaddr {ipaddr {varname ""}} {
+    if {![Twapi_IPAddressFamily $ipaddr]} {
+        error "$ipaddr is not a valid IP V4 address"
+    }
+
+    foreach arp [GetIpNetTable 0] {
+        if {[lindex $arp 3] == 2} continue;       # Invalid entry type
+        if {[string equal $ipaddr [lindex $arp 2]]} {
+            set result [_hwaddr_binary_to_string [lindex $arp 1]]
+            break
+        }
+    }
+
+    # If could not get from ARP table, see if it is one of our own
+    # Ignore errors
+    if {![info exists result]} {
+        foreach ifc [get_network_adapters] {
+            catch {
+                array set netifinfo [get_network_adapter_info $ifc -unicastaddresses -physicaladdress]
+                if {$netifinfo(-physicaladdress) eq ""} continue
+                foreach elem $netifinfo(-unicastaddresses) {
+                    if {[dict get $elem -address] eq $ipaddr} {
+                        set result $netifinfo(-physicaladdress)
+                        break
+                    }
+                }
+            }
+            if {[info exists result]} {
+                break
+            }
+        }
+    }
+
+    if {[info exists result]} {
+        if {$varname == ""} {
+            return $result
+        }
+        upvar $varname var
+        set var $result
+        return 1
+    } else {
+        if {$varname == ""} {
+            error "Could not map IP address $ipaddr to a hardware address"
+        }
+        return 0
+    }
+}
+
+# Return hw address for a IP address
+proc twapi::hwaddr_to_ipaddr {hwaddr {varname ""}} {
+    set hwaddr [string map {- "" : ""} $hwaddr]
+    foreach arp [GetIpNetTable 0] {
+        if {[lindex $arp 3] == 2} continue;       # Invalid entry type
+        if {[string equal $hwaddr [_hwaddr_binary_to_string [lindex $arp 1] ""]]} {
+            set result [lindex $arp 2]
+            break
+        }
+    }
+
+    # If could not get from ARP table, see if it is one of our own
+    # Ignore errors
+    if {![info exists result]} {
+        foreach ifc [get_network_adapters] {
+            catch {
+                array set netifinfo [get_network_adapter_info $ifc -unicastaddresses -physicaladdress]
+                if {$netifinfo(-physicaladdress) eq ""} continue
+                set ifhwaddr [string map {- ""} $netifinfo(-physicaladdress)]
+                if {[string equal -nocase $hwaddr $ifhwaddr]} {
+                    foreach elem $netifinfo(-unicastaddresses) {
+                        if {[dict get $elem -address] ne ""} {
+                            set result [dict get $elem -address]
+                            break
+                        }
+                    }
+                }
+            }
+            if {[info exists result]} {
+                break
+            }
+        }
+    }
+
+    if {[info exists result]} {
+        if {$varname == ""} {
+            return $result
+        }
+        upvar $varname var
+        set var $result
+        return 1
+    } else {
+        if {$varname == ""} {
+            error "Could not map hardware address $hwaddr to an IP address"
+        }
+        return 0
+    }
+}
+
+# Flush the arp table for a given interface
+proc twapi::flush_arp_tables {args} {
+    if {[llength $args] == 0} {
+        set args [get_network_adapters]
+    }
+    foreach arg $args {
+        array set ifc [get_network_adapter_info $arg -type -ipv4ifindex]
+        if {$ifc(-type) != 24} {
+            trap {
+                FlushIpNetTable $ifc(-ipv4ifindex)
+            } onerror {} {
+                # Ignore - flush not supported for that interface type
+            }
+        }
+    }
+}
+
+# Return the list of TCP connections
+twapi::proc* twapi::get_tcp_connections {args} {
+    variable tcp_statenames
+    variable tcp_statevalues
+
+    array set tcp_statevalues {
+        closed            1
+        listen            2
+        syn_sent          3
+        syn_rcvd          4
+        estab             5
+        fin_wait1         6
+        fin_wait2         7
+        close_wait        8
+        closing           9
+        last_ack         10
+        time_wait        11
+        delete_tcb       12
+    }
+    foreach {name val} [array get tcp_statevalues] {
+        set tcp_statenames($val) $name
+    }
+} {
+    variable tcp_statenames
+    variable tcp_statevalues
+
+    array set opts [parseargs args {
+        state
+        {ipversion.arg 0}
+        localaddr
+        remoteaddr
+        localport
+        remoteport
+        pid
+        modulename
+        modulepath
+        bindtime
+        all
+        matchstate.arg
+        matchlocaladdr.arg
+        matchremoteaddr.arg
+        matchlocalport.int
+        matchremoteport.int
+        matchpid.int
+    } -maxleftover 0]
+
+    set opts(ipversion) [_ipversion_to_af $opts(ipversion)]
+
+    if {! ($opts(state) || $opts(localaddr) || $opts(remoteaddr) || $opts(localport) || $opts(remoteport) || $opts(pid) || $opts(modulename) || $opts(modulepath) || $opts(bindtime))} {
+        set opts(all) 1
+    }
+
+    # Convert state to appropriate symbol if necessary
+    if {[info exists opts(matchstate)]} {
+        set matchstates [list ]
+        foreach stateval $opts(matchstate) {
+            if {[info exists tcp_statevalues($stateval)]} {
+                lappend matchstates $stateval
+                continue
+            }
+            if {[info exists tcp_statenames($stateval)]} {
+                lappend matchstates $tcp_statenames($stateval)
+                continue
+            }
+            error "Unrecognized connection state '$stateval' specified for option -matchstate"
+        }
+    }
+
+    foreach opt {matchlocaladdr matchremoteaddr} {
+        if {[info exists opts($opt)]} {
+            # Note this also normalizes the address format
+            set $opt [_hosts_to_ip_addrs $opts($opt)]
+            if {[llength [set $opt]] == 0} {
+                return [list ]; # No addresses, so no connections will match
+            }
+        }
+    }
+
+    # Get the complete list of connections
+    if {$opts(modulename) || $opts(modulepath) || $opts(bindtime) || $opts(all)} {
+        set level 8
+    } else {
+        set level 5
+    }
+
+    # See if any matching needs to be done
+    if {[info exists opts(matchlocaladdr)] || [info exists opts(matchlocalport)] ||
+        [info exist opts(matchremoteaddr)] || [info exists opts(matchremoteport)] ||
+        [info exists opts(matchpid)] || [info exists opts(matchstate)]} {
+        set need_matching 1
+    } else {
+        set need_matching 0
+    }
+        
+
+    set conns [list ]
+    foreach entry [_get_all_tcp 0 $level $opts(ipversion)] {
+        lassign $entry state localaddr localport remoteaddr remoteport pid bindtime modulename modulepath
+
+        if {[string equal $remoteaddr 0.0.0.0]} {
+            # Socket not connected. WIndows passes some random value
+            # for remote port in this case. Set it to 0
+            set remoteport 0
+        }
+
+        if {[info exists tcp_statenames($state)]} {
+            set state $tcp_statenames($state)
+        }
+        if {$need_matching} {
+            if {[info exists opts(matchpid)]} {
+                # See if this platform even returns the PID
+                if {$pid == ""} {
+                    error "Connection process id not available on this system."
+                }
+                if {$pid != $opts(matchpid)} {
+                    continue
+                }
+            }
+            if {[info exists matchlocaladdr] &&
+                [lsearch -exact $matchlocaladdr $localaddr] < 0} {
+                # Not in match list
+                continue
+            }
+            if {[info exists matchremoteaddr] &&
+                [lsearch -exact $matchremoteaddr $remoteaddr] < 0} {
+                # Not in match list
+                continue
+            }
+            if {[info exists opts(matchlocalport)] &&
+                $opts(matchlocalport) != $localport} {
+                continue
+            }
+            if {[info exists opts(matchremoteport)] &&
+                $opts(matchremoteport) != $remoteport} {
+                continue
+            }
+            if {[info exists matchstates] && [lsearch -exact $matchstates $state] < 0} {
+                continue
+            }
+        }
+
+        # OK, now we have matched. Include specified fields in the result
+        set conn [list ]
+        foreach opt {localaddr localport remoteaddr remoteport state pid bindtime modulename modulepath} {
+            if {$opts(all) || $opts($opt)} {
+                lappend conn [set $opt]
+            }
+        }
+        lappend conns $conn
+    }
+
+    # ORDER MUST MATCH ORDER ABOVE
+    set fields [list ]
+    foreach opt {localaddr localport remoteaddr remoteport state pid bindtime modulename modulepath} {
+        if {$opts(all) || $opts($opt)} {
+            lappend fields -$opt
+        }
+    }
+
+    return [list $fields $conns]
+}
+
+
+# Return the list of UDP connections
+proc twapi::get_udp_connections {args} {
+    array set opts [parseargs args {
+        {ipversion.arg 0}
+        localaddr
+        localport
+        pid
+        modulename
+        modulepath
+        bindtime
+        all
+        matchlocaladdr.arg
+        matchlocalport.int
+        matchpid.int
+    } -maxleftover 0]
+
+    set opts(ipversion) [_ipversion_to_af $opts(ipversion)]
+
+    if {! ($opts(localaddr) || $opts(localport) || $opts(pid) || $opts(modulename) || $opts(modulepath) || $opts(bindtime))} {
+        set opts(all) 1
+    }
+
+    if {[info exists opts(matchlocaladdr)]} {
+        # Note this also normalizes the address format
+        set matchlocaladdr [_hosts_to_ip_addrs $opts(matchlocaladdr)]
+        if {[llength $matchlocaladdr] == 0} {
+            return [list ]; # No addresses, so no connections will match
+        }
+    }
+
+    # Get the complete list of connections
+    # Get the complete list of connections
+    if {$opts(modulename) || $opts(modulepath) || $opts(bindtime) || $opts(all)} {
+        set level 2
+    } else {
+        set level 1
+    }
+    set conns [list ]
+    foreach entry [_get_all_udp 0 $level $opts(ipversion)] {
+        foreach {localaddr localport pid bindtime modulename modulepath} $entry {
+            break
+        }
+        if {[info exists opts(matchpid)]} {
+            # See if this platform even returns the PID
+            if {$pid == ""} {
+                error "Connection process id not available on this system."
+            }
+            if {$pid != $opts(matchpid)} {
+                continue
+            }
+        }
+        if {[info exists matchlocaladdr] &&
+            [lsearch -exact $matchlocaladdr $localaddr] < 0} {
+            continue
+        }
+        if {[info exists opts(matchlocalport)] &&
+            $opts(matchlocalport) != $localport} {
+            continue
+        }
+
+        # OK, now we have matched. Include specified fields in the result
+        set conn [list ]
+        foreach opt {localaddr localport pid bindtime modulename modulepath} {
+            if {$opts(all) || $opts($opt)} {
+                lappend conn [set $opt]
+            }
+        }
+        lappend conns $conn
+    }
+
+    # ORDER MUST MATCH THAT ABOVE
+    set fields [list ]
+    foreach opt {localaddr localport pid bindtime modulename modulepath} {
+        if {$opts(all) || $opts($opt)} {
+            lappend fields -$opt
+        }
+    }
+
+    return [list $fields $conns]
+}
+
+# Terminates a TCP connection. Does not generate an error if connection
+# does not exist
+proc twapi::terminate_tcp_connections {args} {
+    array set opts [parseargs args {
+        matchstate.arg
+        matchlocaladdr.arg
+        matchremoteaddr.arg
+        matchlocalport.int
+        matchremoteport.int
+        matchpid.int
+    } -maxleftover 0]
+
+    # TBD - ignore 'no such connection' errors
+
+    # If local and remote endpoints fully specified, just directly call
+    # SetTcpEntry. Note pid must NOT be specified since we must then
+    # fall through and check for that pid
+    if {[info exists opts(matchlocaladdr)] && [info exists opts(matchlocalport)] &&
+        [info exists opts(matchremoteaddr)] && [info exists opts(matchremoteport)] &&
+        ! [info exists opts(matchpid)]} {
+        # 12 is "delete" code
+        catch {
+            SetTcpEntry [list 12 $opts(matchlocaladdr) $opts(matchlocalport) $opts(matchremoteaddr) $opts(matchremoteport)]
+        }
+        return
+    }
+
+    # Get connection list and go through matching on each
+    # TBD - optimize by precalculating if *ANY* matching is to be done
+    # and if not, skip the whole matching sequence
+    foreach conn [twapi::recordarray getlist [get_tcp_connections {*}[_get_array_as_options opts]] -format dict] {
+        array set aconn $conn
+        # TBD - should we handle integer values of opts(state) ?
+        if {[info exists opts(matchstate)] &&
+            $opts(matchstate) != $aconn(-state)} {
+            continue
+        }
+        if {[info exists opts(matchlocaladdr)] &&
+            $opts(matchlocaladdr) != $aconn(-localaddr)} {
+            continue
+        }
+        if {[info exists opts(matchlocalport)] &&
+            $opts(matchlocalport) != $aconn(-localport)} {
+            continue
+        }
+        if {[info exists opts(matchremoteaddr)] &&
+            $opts(matchremoteaddr) != $aconn(-remoteaddr)} {
+            continue
+        }
+        if {[info exists opts(remoteport)] &&
+            $opts(matchremoteport) != $aconn(-remoteport)} {
+            continue
+        }
+        if {[info exists opts(matchpid)] &&
+            $opts(matchpid) != $aconn(-pid)} {
+            continue
+        }
+        # Matching conditions fulfilled
+        # 12 is "delete" code
+        catch {
+            SetTcpEntry [list 12 $aconn(-localaddr) $aconn(-localport) $aconn(-remoteaddr) $aconn(-remoteport)]
+        }
+    }
+    return
+}
+
+# Flush cache of host names and ports.
+# Backward compatibility - no op since we no longer have a cache
+proc twapi::flush_network_name_cache {} {}
+
+# IP addr -> hostname
+proc twapi::resolve_address {addr args} {
+
+    # flushcache is ignored (for backward compatibility only)
+    array set opts [parseargs args {
+        flushcache
+        async.arg
+    } -maxleftover 0]
+
+    # Note as a special case, we treat 0.0.0.0 explicitly since
+    # win32 getnameinfo translates this to the local host name which
+    # is completely bogus.
+    if {$addr eq "0.0.0.0"} {
+        if {[info exists opts(async)]} {
+            after idle [list after 0 $opts(async) [list $addr success $addr]]
+            return ""
+        } else {
+            return $addr
+        }
+    }
+
+    # If async option, we will call back our internal function which
+    # will update the cache and then invoke the caller's script
+    if {[info exists opts(async)]} {
+        variable _address_handler_scripts
+        set id [Twapi_ResolveAddressAsync $addr]
+        set _address_handler_scripts($id) [list $addr $opts(async)]
+        return ""
+    }
+
+    # Synchronous
+    set name [lindex [twapi::getnameinfo [list $addr] 8] 0]
+    if {$name eq $addr} {
+        # Could not resolve.
+        set name ""
+    }
+
+    return $name
+}
+
+# host name -> IP addresses
+proc twapi::resolve_hostname {name args} {
+    set name [string tolower $name]
+
+    # -flushcache option ignored (for backward compat only)
+    array set opts [parseargs args {
+        flushcache
+        async.arg
+        {ipversion.arg 0}
+    } -maxleftover 0]
+
+    # NOTE: we do not pass the IP version to getaddrinfo but always
+    # give it 0 and then filter the results based on IP version ourselves
+    # if necessary. This is because of some confusion over behaviour
+    # with various combination of flags.
+    
+    set opts(ipversion) [_ipversion_to_af $opts(ipversion)]
+    set flags 0
+    if {[min_os_version 6]} {
+        # 0x100 -> AI_ALL. By default, Windows enables the AI_ADDRCONFIG
+        # flat which will hide IPv6 addresses if the local system does
+        # not have an *global* IPv6 addr configured. We don't want that
+        # so set AI_ALL to override it and get back all addresses.
+        set flags 0x100;        # AI_ALL
+    }
+
+    # If async option, we will call back our internal function which
+    # will update the cache and then invoke the caller's script
+    if {[info exists opts(async)]} {
+        variable _hostname_handler_scripts
+        set id [Twapi_ResolveHostnameAsync $name 0 $flags]
+        set _hostname_handler_scripts($id) [list $opts(ipversion) $name $opts(async)]
+        return ""
+    }
+
+    # Resolve address synchronously
+    set addrs [list ]
+    trap {
+        foreach endpt [twapi::getaddrinfo $name 0 0 0 0 $flags] {
+            # endpt is {family address port}
+            if {$opts(ipversion) == 0 || $opts(ipversion) == [lindex $endpt 0]} {
+                lappend addrs [lindex $endpt 1]
+            }
+        }
+    } onerror {TWAPI_WIN32 11001} {
+        # Ignore - 11001 -> no such host, so just return empty list
+    } onerror {TWAPI_WIN32 11002} {
+        # Ignore - 11002 -> no such host, non-authoritative
+    } onerror {TWAPI_WIN32 11003} {
+        # Ignore - 11001 -> no such host, non recoverable
+    } onerror {TWAPI_WIN32 11004} {
+        # Ignore - 11004 -> no such host, though valid syntax
+    }
+
+    return $addrs
+}
+
+# Look up a port name
+proc twapi::port_to_service {port} {
+    set name ""
+    trap {
+        set name [lindex [twapi::getnameinfo [list 0.0.0.0 $port] 2] 1]
+	if {[string is integer $name] && $name == $port} {
+	    # Some platforms return the port itself if no name exists
+	    set name ""
+	}
+    } onerror {TWAPI_WIN32 11001} {
+        # Ignore - 11001 -> no such host, so just return empty list
+    } onerror {TWAPI_WIN32 11002} {
+        # Ignore - 11002 -> no such host, non-authoritative
+    } onerror {TWAPI_WIN32 11003} {
+        # Ignore - 11001 -> no such host, non recoverable
+    } onerror {TWAPI_WIN32 11004} {
+        # Ignore - 11004 -> no such host, though valid syntax
+    }
+
+    # If we did not get a name back, check for some well known names
+    # that windows does not translate. Note some of these are names
+    # that windows does translate in the reverse direction!
+    if {$name eq ""} {
+        foreach {p n} {
+            123 ntp
+            137 netbios-ns
+            138 netbios-dgm
+            500 isakmp
+            1900 ssdp
+            4500 ipsec-nat-t
+        } {
+            if {$port == $p} {
+                set name $n
+                break
+            }
+        }
+    }
+
+    return $name
+}
+
+
+# Port name -> number
+proc twapi::service_to_port {name} {
+
+    # TBD - add option for specifying protocol
+    set protocol 0
+
+    if {[string is integer $name]} {
+        return $name
+    }
+
+    if {[catch {
+        # Return the first port
+        set port [lindex [lindex [twapi::getaddrinfo "" $name $protocol] 0] 2]
+    }]} {
+        set port ""
+    }
+    return $port
+}
+
+# Get the routing table
+proc twapi::get_routing_table {args} {
+    array set opts [parseargs args {
+        sort
+    } -maxleftover 0]
+
+    set routes [list ]
+    foreach route [twapi::GetIpForwardTable $opts(sort)] {
+        lappend routes [_format_route $route]
+    }
+
+    return $routes
+}
+
+# Get the best route for given destination
+proc twapi::get_route {args} {
+    array set opts [parseargs args {
+        {dest.arg 0.0.0.0}
+        {source.arg 0.0.0.0}
+    } -maxleftover 0]
+    return [_format_route [GetBestRoute $opts(dest) $opts(source)]]
+}
+
+# Get the interface for a destination
+proc twapi::get_outgoing_interface {{dest 0.0.0.0}} {
+    return [GetBestInterfaceEx $dest]
+}
+
+proc twapi::get_ipaddr_version {addr} {
+    set af [Twapi_IPAddressFamily $addr]
+    if {$af == 2} {
+        return 4
+    } elseif {$af == 23} {
+        return 6
+    } else {
+        return 0
+    }
+}
+
+################################################################
+# Utility procs
+
+# Convert a route as returned by C code to Tcl format route
+proc twapi::_format_route {route} {
+    foreach fld {
+        addr
+        mask
+        policy
+        nexthop
+        ifindex
+        type
+        protocol
+        age
+        nexthopas
+        metric1
+        metric2
+        metric3
+        metric4
+        metric5
+    } val $route {
+        set r(-$fld) $val
+    }
+
+    switch -exact -- $r(-type) {
+        2       { set r(-type) invalid }
+        3       { set r(-type) local }
+        4       { set r(-type) remote }
+        1       -
+        default { set r(-type) other }
+    }
+
+    switch -exact -- $r(-protocol) {
+        2 { set r(-protocol) local }
+        3 { set r(-protocol) netmgmt }
+        4 { set r(-protocol) icmp }
+        5 { set r(-protocol) egp }
+        6 { set r(-protocol) ggp }
+        7 { set r(-protocol) hello }
+        8 { set r(-protocol) rip }
+        9 { set r(-protocol) is_is }
+        10 { set r(-protocol) es_is }
+        11 { set r(-protocol) cisco }
+        12 { set r(-protocol) bbn }
+        13 { set r(-protocol) ospf }
+        14 { set r(-protocol) bgp }
+        1       -
+        default { set r(-protocol) other }
+    }
+
+    return [array get r]
+}
+
+
+# Convert binary hardware address to string format
+proc twapi::_hwaddr_binary_to_string {b {joiner -}} {
+    if {[binary scan $b H* str]} {
+        set s ""
+        foreach {x y} [split $str ""] {
+            lappend s $x$y
+        }
+        return [join $s $joiner]
+    } else {
+        error "Could not convert binary hardware address"
+    }
+}
+
+# Callback for address resolution
+proc twapi::_address_resolve_handler {id status hostname} {
+    variable _address_handler_scripts
+
+    if {![info exists _address_handler_scripts($id)]} {
+        # Queue a background error
+        after 0 [list error "Error: No entry found for id $id in address request table"]
+        return
+    }
+    lassign  $_address_handler_scripts($id)  addr script
+    unset _address_handler_scripts($id)
+
+    # Before invoking the callback, store result if available
+    uplevel #0 [linsert $script end $addr $status $hostname]
+    return
+}
+
+# Callback for hostname resolution
+proc twapi::_hostname_resolve_handler {id status addrandports} {
+    variable _hostname_handler_scripts
+
+    if {![info exists _hostname_handler_scripts($id)]} {
+        # Queue a background error
+        after 0 [list error "Error: No entry found for id $id in hostname request table"]
+        return
+    }
+    lassign  $_hostname_handler_scripts($id) ipver name script
+    unset _hostname_handler_scripts($id)
+
+    set addrs {}
+    if {$status eq "success"} {
+        foreach addr $addrandports {
+            lassign $addr ver addr
+            if {$ipver == 0 || $ipver == $ver} { 
+                lappend addrs $addr
+            }
+        }
+    } elseif {$addrandports == 11001 || $addrandports == 11004} {
+        # For compatibility with the sync version and address resolution,
+        # We return an success if empty list if in fact the failure was
+        # that no name->address mapping exists
+        set status success
+    }
+
+    uplevel #0 [linsert $script end $name $status $addrs]
+    return
+}
+
+# Return list of all TCP connections
+# Uses GetExtendedTcpTable if available, else AllocateAndGetTcpExTableFromStack
+# $level is passed to GetExtendedTcpTable and dtermines format of returned
+# data. Level 5 (default) matches what AllocateAndGetTcpExTableFromStack
+# returns. Note level 6 and higher is two orders of magnitude more expensive
+# to get for IPv4 and crashes in Windows for IPv6 (silently downgraded to
+# level 5 for IPv6)
+twapi::proc* twapi::_get_all_tcp {sort level address_family} {
+    variable _tcp_buf
+    set _tcp_buf(ptr) NULL
+    set _tcp_buf(size) 0
+} {
+    variable _tcp_buf
+
+    if {$address_family == 0} {
+        return [concat [_get_all_tcp $sort $level 2] [_get_all_tcp $sort $level 23]]
+    }
+
+    if {$address_family == 23 && $level > 5} {
+        set level 5;            # IPv6 crashes for levels > 5 - Windows bug
+    }
+
+    # Get required size of buffer. This also verifies that the
+    # GetExtendedTcpTable API exists on this system
+    # TBD - modify to do this check only once and not on every call
+
+    if {[catch {twapi::GetExtendedTcpTable $_tcp_buf(ptr) $_tcp_buf(size) $sort $address_family $level} bufsz]} {
+        # No workee, try AllocateAndGetTcpExTableFromStack
+        # Note if GetExtendedTcpTable is not present, ipv6 is not
+        # available
+        if {$address_family == 2} {
+            return [AllocateAndGetTcpExTableFromStack $sort 0]
+        } else {
+            return {}
+        }
+    }
+
+    # The required buffer size might change as connections
+    # are added or deleted. So we sit in a loop.
+    # Non-0 value indicates buffer was not large enough
+    # For safety, we only retry 10 times
+    set i 0
+    while {$bufsz && [incr i] <= 10} {
+        if {! [pointer_null? $_tcp_buf(ptr)]} {
+            free $_tcp_buf(ptr)
+            set _tcp_buf(ptr) NULL
+            set _tcp_buf(size) 0
+        }
+        
+        set _tcp_buf(ptr) [malloc $bufsz]
+        set _tcp_buf(size) $bufsz
+
+        set bufsz [GetExtendedTcpTable $_tcp_buf(ptr) $_tcp_buf(size) $sort $address_family $level]
+    }
+
+    if ($bufsz) {
+        # Repeated attempts failed
+        win32_error 122
+    }
+
+    return [Twapi_FormatExtendedTcpTable $_tcp_buf(ptr) $address_family $level]
+}
+
+# See comments for _get_all_tcp above except this is for _get_all_udp
+twapi::proc* twapi::_get_all_udp {sort level address_family} {
+    variable _udp_buf
+    set _udp_buf(ptr) NULL
+    set _udp_buf(size) 0
+} {
+    variable _udp_buf
+
+    if {$address_family == 0} {
+        return [concat [_get_all_udp $sort $level 2] [_get_all_udp $sort $level 23]]
+    }
+
+    if {$address_family == 23 && $level > 5} {
+        set level 5;            # IPv6 crashes for levels > 5 - Windows bug
+    }
+
+    # Get required size of buffer. This also verifies that the
+    # GetExtendedTcpTable API exists on this system
+    if {[catch {twapi::GetExtendedUdpTable $_udp_buf(ptr) $_udp_buf(size) $sort $address_family $level} bufsz]} {
+        # No workee, try AllocateAndGetUdpExTableFromStack
+        if {$address_family == 2} {
+            return [AllocateAndGetUdpExTableFromStack $sort 0]
+        } else {
+            return {}
+        }
+    }
+
+    # The required buffer size might change as connections
+    # are added or deleted. So we sit in a loop.
+    # Non-0 value indicates buffer was not large enough
+    # For safety, we only retry 10 times
+    set i 0
+    while {$bufsz && [incr i] <= 10} {
+        if {! [pointer_null? $_udp_buf(ptr)]} {
+            free $_udp_buf(ptr)
+            set _udp_buf(ptr) NULL
+            set _udp_buf(size) 0
+        }
+        
+        set _udp_buf(ptr) [malloc $bufsz]
+        set _udp_buf(size) $bufsz
+
+        set bufsz [GetExtendedUdpTable $_udp_buf(ptr) $_udp_buf(size) $sort $address_family $level]
+    }
+
+    if ($bufsz) {
+        # Repeated attempts failed
+        win32_error 122
+    }
+
+    return [Twapi_FormatExtendedUdpTable $_udp_buf(ptr) $address_family $level]
+}
+
+
+# valid IP address
+proc twapi::_valid_ipaddr_format {ipaddr} {
+    return [expr {[Twapi_IPAddressFamily $ipaddr] != 0}]
+}
+
+# Given lists of IP addresses and DNS names, returns
+# a list purely of IP addresses in normalized form
+proc twapi::_hosts_to_ip_addrs hosts {
+    set addrs [list ]
+    foreach host $hosts {
+        if {[_valid_ipaddr_format $host]} {
+            lappend addrs [Twapi_NormalizeIPAddress $host]
+        } else {
+            # Not IP address. Try to resolve, ignoring errors
+            if {![catch {resolve_hostname $host} hostaddrs]} {
+                foreach addr $hostaddrs {
+                    lappend addrs [Twapi_NormalizeIPAddress $addr]
+                }
+            }
+        }
+    }
+    return $addrs
+}
+
+proc twapi::_ipversion_to_af {opt} {
+    if {[string is integer -strict $opt]} {
+        incr opt 0;             # Normalize ints for switch
+    }
+    switch -exact -- [string tolower $opt] {
+        4 -
+        inet  { return 2 }
+        6 -
+        inet6 { return 23 }
+        0 -
+        any -
+        all   { return 0 }
+    }
+    error "Invalid IP version '$opt'"
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/nls.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/nls.tcl
new file mode 100644
index 00000000..66b51db9
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/nls.tcl
@@ -0,0 +1,467 @@
+#
+# Copyright (c) 2003-2013, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {}
+
+# Compatibility alias
+interp alias {} twapi::get_user_default_langid {} twapi::get_user_langid
+interp alias {} twapi::get_system_default_langid {} twapi::get_system_langid
+
+#
+# Format a number
+proc twapi::format_number {number lcid args} {
+
+    set number [_verify_number_format $number]
+
+    set lcid [_map_default_lcid_token $lcid]
+
+    # If no options specified, format according to the passed locale
+    if {[llength $args] == 0} {
+        return [GetNumberFormat 1 $lcid 0 $number 0 0 0 . "" 0]
+    }
+
+    array set opts [parseargs args {
+        idigits.int
+        ilzero.bool
+        sgrouping.int
+        sdecimal.arg
+        sthousand.arg
+        inegnumber.int
+    }]
+
+    # Check the locale for unspecified options
+    foreach opt {idigits ilzero sgrouping sdecimal sthousand inegnumber} {
+        if {![info exists opts($opt)]} {
+            set opts($opt) [lindex [get_locale_info $lcid -$opt] 1]
+        }
+    }
+        
+    # If number of decimals is -1, see how many decimal places
+    # in passed string
+    if {$opts(idigits) == -1} {
+        lassign   [split $number .]  whole frac
+        set opts(idigits) [string length $frac]
+    }
+
+    # Convert Locale format for grouping to integer calue
+    if {![string is integer $opts(sgrouping)]} {
+        # Format assumed to be of the form "N;M;....;0"
+        set grouping 0
+        foreach n [split $opts(sgrouping) {;}] {
+            if {$n == 0} break
+            set grouping [expr {$n + 10*$grouping}]
+        }
+        set opts(sgrouping) $grouping
+    }
+
+    set flags 0
+    if {[info exists opts(nouseroverride)] && $opts(nouseroverride)} {
+        setbits flags 0x80000000
+    }
+    return [GetNumberFormat 0 $lcid $flags $number $opts(idigits) \
+                $opts(ilzero) $opts(sgrouping) $opts(sdecimal) \
+                $opts(sthousand) $opts(inegnumber)]
+}
+
+
+#
+# Format currency
+proc twapi::format_currency {number lcid args} {
+
+    set number [_verify_number_format $number]
+
+    # Get semi-canonical form (get rid of preceding "+" etc.)
+    # Also verifies number syntax
+    set number [expr {$number+0}];
+
+    set lcid [_map_default_lcid_token $lcid]
+
+    # If no options specified, format according to the passed locale
+    if {[llength $args] == 0} {
+        return [GetCurrencyFormat 1 $lcid 0 $number 0 0 0 . "" 0 0 ""]
+    }
+
+    array set opts [parseargs args {
+        idigits.int
+        ilzero.bool
+        sgrouping.int
+        sdecimal.arg
+        sthousand.arg
+        inegcurr.int
+        icurrency.int
+        scurrency.arg
+    }]
+
+    # Check the locale for unspecified options
+    foreach opt {idigits ilzero sgrouping sdecimal sthousand inegcurr icurrency scurrency} {
+        if {![info exists opts($opt)]} {
+            set opts($opt) [lindex [get_locale_info $lcid -$opt] 1]
+        }
+    }
+
+    # If number of decimals is -1, see how many decimal places
+    # in passed string
+    if {$opts(idigits) == -1} {
+        lassign  [split $number .]  whole frac
+        set opts(idigits) [string length $frac]
+    }
+
+    # Convert Locale format for grouping to integer calue
+    if {![string is integer $opts(sgrouping)]} {
+        # Format assumed to be of the form "N;M;....;0"
+        set grouping 0
+        foreach n [split $opts(sgrouping) {;}] {
+            if {$n == 0} break
+            set grouping [expr {$n + 10*$grouping}]
+        }
+        set opts(sgrouping) $grouping
+    }
+
+    set flags 0
+    if {[info exists opts(nouseroverride)] && $opts(nouseroverride)} {
+        setbits flags 0x80000000
+    }
+
+    return [GetCurrencyFormat 0 $lcid $flags $number $opts(idigits) \
+                $opts(ilzero) $opts(sgrouping) $opts(sdecimal) \
+                $opts(sthousand) $opts(inegcurr) \
+                $opts(icurrency) $opts(scurrency)]
+}
+
+
+#
+# Get various info about a locale
+proc twapi::get_locale_info {lcid args} {
+
+    set lcid [_map_default_lcid_token $lcid]
+
+    variable locale_info_class_map
+    if {![info exists locale_info_class_map]} {
+        # TBD - ilanguage not recommended for Vista. Remove it?
+        array set locale_info_class_map {
+            ilanguage              0x00000001
+            slanguage              0x00000002
+            senglanguage           0x00001001
+            sabbrevlangname        0x00000003
+            snativelangname        0x00000004
+            icountry               0x00000005
+            scountry               0x00000006
+            sengcountry            0x00001002
+            sabbrevctryname        0x00000007
+            snativectryname        0x00000008
+            idefaultlanguage       0x00000009
+            idefaultcountry        0x0000000A
+            idefaultcodepage       0x0000000B
+            idefaultansicodepage   0x00001004
+            idefaultmaccodepage    0x00001011
+            slist                  0x0000000C
+            imeasure               0x0000000D
+            sdecimal               0x0000000E
+            sthousand              0x0000000F
+            sgrouping              0x00000010
+            idigits                0x00000011
+            ilzero                 0x00000012
+            inegnumber             0x00001010
+            snativedigits          0x00000013
+            scurrency              0x00000014
+            sintlsymbol            0x00000015
+            smondecimalsep         0x00000016
+            smonthousandsep        0x00000017
+            smongrouping           0x00000018
+            icurrdigits            0x00000019
+            iintlcurrdigits        0x0000001A
+            icurrency              0x0000001B
+            inegcurr               0x0000001C
+            sdate                  0x0000001D
+            stime                  0x0000001E
+            sshortdate             0x0000001F
+            slongdate              0x00000020
+            stimeformat            0x00001003
+            idate                  0x00000021
+            ildate                 0x00000022
+            itime                  0x00000023
+            itimemarkposn          0x00001005
+            icentury               0x00000024
+            itlzero                0x00000025
+            idaylzero              0x00000026
+            imonlzero              0x00000027
+            s1159                  0x00000028
+            s2359                  0x00000029
+            icalendartype          0x00001009
+            ioptionalcalendar      0x0000100B
+            ifirstdayofweek        0x0000100C
+            ifirstweekofyear       0x0000100D
+            sdayname1              0x0000002A
+            sdayname2              0x0000002B
+            sdayname3              0x0000002C
+            sdayname4              0x0000002D
+            sdayname5              0x0000002E
+            sdayname6              0x0000002F
+            sdayname7              0x00000030
+            sabbrevdayname1        0x00000031
+            sabbrevdayname2        0x00000032
+            sabbrevdayname3        0x00000033
+            sabbrevdayname4        0x00000034
+            sabbrevdayname5        0x00000035
+            sabbrevdayname6        0x00000036
+            sabbrevdayname7        0x00000037
+            smonthname1            0x00000038
+            smonthname2            0x00000039
+            smonthname3            0x0000003A
+            smonthname4            0x0000003B
+            smonthname5            0x0000003C
+            smonthname6            0x0000003D
+            smonthname7            0x0000003E
+            smonthname8            0x0000003F
+            smonthname9            0x00000040
+            smonthname10           0x00000041
+            smonthname11           0x00000042
+            smonthname12           0x00000043
+            smonthname13           0x0000100E
+            sabbrevmonthname1      0x00000044
+            sabbrevmonthname2      0x00000045
+            sabbrevmonthname3      0x00000046
+            sabbrevmonthname4      0x00000047
+            sabbrevmonthname5      0x00000048
+            sabbrevmonthname6      0x00000049
+            sabbrevmonthname7      0x0000004A
+            sabbrevmonthname8      0x0000004B
+            sabbrevmonthname9      0x0000004C
+            sabbrevmonthname10     0x0000004D
+            sabbrevmonthname11     0x0000004E
+            sabbrevmonthname12     0x0000004F
+            sabbrevmonthname13     0x0000100F
+            spositivesign          0x00000050
+            snegativesign          0x00000051
+            ipossignposn           0x00000052
+            inegsignposn           0x00000053
+            ipossymprecedes        0x00000054
+            ipossepbyspace         0x00000055
+            inegsymprecedes        0x00000056
+            inegsepbyspace         0x00000057
+            fontsignature          0x00000058
+            siso639langname        0x00000059
+            siso3166ctryname       0x0000005A
+            idefaultebcdiccodepage 0x00001012
+            ipapersize             0x0000100A
+            sengcurrname           0x00001007
+            snativecurrname        0x00001008
+            syearmonth             0x00001006
+            ssortname              0x00001013
+            idigitsubstitution     0x00001014
+        }
+    }
+
+    #    array set opts [parseargs args [array names locale_info_class_map]]
+
+    set result [list ]
+    foreach opt $args {
+        lappend result $opt [GetLocaleInfo $lcid $locale_info_class_map([string range $opt 1 end])]
+    }
+    return $result
+}
+
+
+proc twapi::map_code_page_to_name {cp} {
+    set code_page_names {
+        0   "System ANSI default"
+        1   "System OEM default"
+        37 "IBM EBCDIC - U.S./Canada"
+        437 "OEM - United States"
+        500 "IBM EBCDIC - International"
+        708 "Arabic - ASMO 708"
+        709 "Arabic - ASMO 449+, BCON V4"
+        710 "Arabic - Transparent Arabic"
+        720 "Arabic - Transparent ASMO"
+        737 "OEM - Greek (formerly 437G)"
+        775 "OEM - Baltic"
+        850 "OEM - Multilingual Latin I"
+        852 "OEM - Latin II"
+        855 "OEM - Cyrillic (primarily Russian)"
+        857 "OEM - Turkish"
+        858 "OEM - Multlingual Latin I + Euro symbol"
+        860 "OEM - Portuguese"
+        861 "OEM - Icelandic"
+        862 "OEM - Hebrew"
+        863 "OEM - Canadian-French"
+        864 "OEM - Arabic"
+        865 "OEM - Nordic"
+        866 "OEM - Russian"
+        869 "OEM - Modern Greek"
+        870 "IBM EBCDIC - Multilingual/ROECE (Latin-2)"
+        874 "ANSI/OEM - Thai (same as 28605, ISO 8859-15)"
+        875 "IBM EBCDIC - Modern Greek"
+        932 "ANSI/OEM - Japanese, Shift-JIS"
+        936 "ANSI/OEM - Simplified Chinese (PRC, Singapore)"
+        949 "ANSI/OEM - Korean (Unified Hangeul Code)"
+        950 "ANSI/OEM - Traditional Chinese (Taiwan; Hong Kong SAR, PRC)"
+        1026 "IBM EBCDIC - Turkish (Latin-5)"
+        1047 "IBM EBCDIC - Latin 1/Open System"
+        1140 "IBM EBCDIC - U.S./Canada (037 + Euro symbol)"
+        1141 "IBM EBCDIC - Germany (20273 + Euro symbol)"
+        1142 "IBM EBCDIC - Denmark/Norway (20277 + Euro symbol)"
+        1143 "IBM EBCDIC - Finland/Sweden (20278 + Euro symbol)"
+        1144 "IBM EBCDIC - Italy (20280 + Euro symbol)"
+        1145 "IBM EBCDIC - Latin America/Spain (20284 + Euro symbol)"
+        1146 "IBM EBCDIC - United Kingdom (20285 + Euro symbol)"
+        1147 "IBM EBCDIC - France (20297 + Euro symbol)"
+        1148 "IBM EBCDIC - International (500 + Euro symbol)"
+        1149 "IBM EBCDIC - Icelandic (20871 + Euro symbol)"
+        1200 "Unicode UCS-2 Little-Endian (BMP of ISO 10646)"
+        1201 "Unicode UCS-2 Big-Endian"
+        1250 "ANSI - Central European"
+        1251 "ANSI - Cyrillic"
+        1252 "ANSI - Latin I"
+        1253 "ANSI - Greek"
+        1254 "ANSI - Turkish"
+        1255 "ANSI - Hebrew"
+        1256 "ANSI - Arabic"
+        1257 "ANSI - Baltic"
+        1258 "ANSI/OEM - Vietnamese"
+        1361 "Korean (Johab)"
+        10000 "MAC - Roman"
+        10001 "MAC - Japanese"
+        10002 "MAC - Traditional Chinese (Big5)"
+        10003 "MAC - Korean"
+        10004 "MAC - Arabic"
+        10005 "MAC - Hebrew"
+        10006 "MAC - Greek I"
+        10007 "MAC - Cyrillic"
+        10008 "MAC - Simplified Chinese (GB 2312)"
+        10010 "MAC - Romania"
+        10017 "MAC - Ukraine"
+        10021 "MAC - Thai"
+        10029 "MAC - Latin II"
+        10079 "MAC - Icelandic"
+        10081 "MAC - Turkish"
+        10082 "MAC - Croatia"
+        12000 "Unicode UCS-4 Little-Endian"
+        12001 "Unicode UCS-4 Big-Endian"
+        20000 "CNS - Taiwan"
+        20001 "TCA - Taiwan"
+        20002 "Eten - Taiwan"
+        20003 "IBM5550 - Taiwan"
+        20004 "TeleText - Taiwan"
+        20005 "Wang - Taiwan"
+        20105 "IA5 IRV International Alphabet No. 5 (7-bit)"
+        20106 "IA5 German (7-bit)"
+        20107 "IA5 Swedish (7-bit)"
+        20108 "IA5 Norwegian (7-bit)"
+        20127 "US-ASCII (7-bit)"
+        20261 "T.61"
+        20269 "ISO 6937 Non-Spacing Accent"
+        20273 "IBM EBCDIC - Germany"
+        20277 "IBM EBCDIC - Denmark/Norway"
+        20278 "IBM EBCDIC - Finland/Sweden"
+        20280 "IBM EBCDIC - Italy"
+        20284 "IBM EBCDIC - Latin America/Spain"
+        20285 "IBM EBCDIC - United Kingdom"
+        20290 "IBM EBCDIC - Japanese Katakana Extended"
+        20297 "IBM EBCDIC - France"
+        20420 "IBM EBCDIC - Arabic"
+        20423 "IBM EBCDIC - Greek"
+        20424 "IBM EBCDIC - Hebrew"
+        20833 "IBM EBCDIC - Korean Extended"
+        20838 "IBM EBCDIC - Thai"
+        20866 "Russian - KOI8-R"
+        20871 "IBM EBCDIC - Icelandic"
+        20880 "IBM EBCDIC - Cyrillic (Russian)"
+        20905 "IBM EBCDIC - Turkish"
+        20924 "IBM EBCDIC - Latin-1/Open System (1047 + Euro symbol)"
+        20932 "JIS X 0208-1990 & 0121-1990"
+        20936 "Simplified Chinese (GB2312)"
+        21025 "IBM EBCDIC - Cyrillic (Serbian, Bulgarian)"
+        21027 "Extended Alpha Lowercase"
+        21866 "Ukrainian (KOI8-U)"
+        28591 "ISO 8859-1 Latin I"
+        28592 "ISO 8859-2 Central Europe"
+        28593 "ISO 8859-3 Latin 3"
+        28594 "ISO 8859-4 Baltic"
+        28595 "ISO 8859-5 Cyrillic"
+        28596 "ISO 8859-6 Arabic"
+        28597 "ISO 8859-7 Greek"
+        28598 "ISO 8859-8 Hebrew"
+        28599 "ISO 8859-9 Latin 5"
+        28605 "ISO 8859-15 Latin 9"
+        29001 "Europa 3"
+        38598 "ISO 8859-8 Hebrew"
+        50220 "ISO 2022 Japanese with no halfwidth Katakana"
+        50221 "ISO 2022 Japanese with halfwidth Katakana"
+        50222 "ISO 2022 Japanese JIS X 0201-1989"
+        50225 "ISO 2022 Korean"
+        50227 "ISO 2022 Simplified Chinese"
+        50229 "ISO 2022 Traditional Chinese"
+        50930 "Japanese (Katakana) Extended"
+        50931 "US/Canada and Japanese"
+        50933 "Korean Extended and Korean"
+        50935 "Simplified Chinese Extended and Simplified Chinese"
+        50936 "Simplified Chinese"
+        50937 "US/Canada and Traditional Chinese"
+        50939 "Japanese (Latin) Extended and Japanese"
+        51932 "EUC - Japanese"
+        51936 "EUC - Simplified Chinese"
+        51949 "EUC - Korean"
+        51950 "EUC - Traditional Chinese"
+        52936 "HZ-GB2312 Simplified Chinese"
+        54936 "Windows XP: GB18030 Simplified Chinese (4 Byte)"
+        57002 "ISCII Devanagari"
+        57003 "ISCII Bengali"
+        57004 "ISCII Tamil"
+        57005 "ISCII Telugu"
+        57006 "ISCII Assamese"
+        57007 "ISCII Oriya"
+        57008 "ISCII Kannada"
+        57009 "ISCII Malayalam"
+        57010 "ISCII Gujarati"
+        57011 "ISCII Punjabi"
+        65000 "Unicode UTF-7"
+        65001 "Unicode UTF-8"
+    }
+
+    # TBD - isn't there a Win32 function to do this ?
+    set cp [expr {0+$cp}]
+    if {[dict exists $code_page_names $cp]} {
+        return [dict get $code_page_names $cp]
+    } else {
+        return "Code page $cp"
+    }
+}
+
+#
+# Get the name of a language
+interp alias {} twapi::map_langid_to_name {} twapi::VerLanguageName
+
+#
+# Extract language and sublanguage values
+proc twapi::extract_primary_langid {langid} {
+    return [expr {$langid & 0x3ff}]
+}
+proc twapi::extract_sublanguage_langid {langid} {
+    return [expr {($langid >> 10) & 0x3f}]
+}
+
+#
+# Utility functions
+
+proc twapi::_map_default_lcid_token {lcid} {
+    if {$lcid == "systemdefault"} {
+        return 2048
+    } elseif {$lcid == "userdefault"} {
+        return 1024
+    }
+    return $lcid
+}
+
+proc twapi::_verify_number_format {n} {
+    set n [string trimleft $n 0]
+    if {[regexp {^[+-]?[[:digit:]]*(\.)?[[:digit:]]*$} $n]} {
+        return $n
+    } else {
+        error "Invalid numeric format. Must be of a sequence of digits with an optional decimal point and leading plus/minus sign"
+    }
+}
+
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/os.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/os.tcl
new file mode 100644
index 00000000..87939756
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/os.tcl
@@ -0,0 +1,1213 @@
+#
+# Copyright (c) 2003-2012, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {}
+
+# Returns an keyed list with the following elements:
+#   os_major_version
+#   os_minor_version
+#   os_build_number
+#   platform - currently always NT
+#   sp_major_version
+#   sp_minor_version
+#   suites - one or more from backoffice, blade, datacenter, enterprise,
+#            smallbusiness, smallbusiness_restricted, terminal, personal
+#   system_type - workstation, server
+proc twapi::get_os_info {} {
+    variable _osinfo
+
+    if {[info exists _osinfo]} {
+        return [array get _osinfo]
+    }
+
+    array set verinfo [GetVersionEx]
+    set _osinfo(os_major_version) $verinfo(dwMajorVersion)
+    set _osinfo(os_minor_version) $verinfo(dwMinorVersion)
+    set _osinfo(os_build_number)  $verinfo(dwBuildNumber)
+    set _osinfo(platform)         "NT"
+
+    set _osinfo(sp_major_version) $verinfo(wServicePackMajor)
+    set _osinfo(sp_minor_version) $verinfo(wServicePackMinor)
+
+    set _osinfo(suites) [list ]
+    set suites $verinfo(wSuiteMask)
+    foreach {suite def} {
+        backoffice 0x4 blade 0x400 communications 0x8 compute_server 0x4000
+        datacenter 0x80 embeddednt 0x40 embedded_restricted 0x800
+        enterprise 0x2 personal 0x200 security_appliance 0x1000
+        singleuserts 0x100 smallbusiness 0x1 
+        smallbusiness_restricted 0x20 storage_server 0x2000
+        terminal 0x10 wh_server 0x8000
+    } {
+        if {$suites & $def} {
+            lappend _osinfo(suites) $suite
+        }
+    }
+
+    set system_type $verinfo(wProductType)
+    if {$system_type == 1} {
+        set _osinfo(system_type) "workstation";         # VER_NT_WORKSTATION
+    } elseif {$system_type == 3} {
+        set _osinfo(system_type) "server";         # VER_NT_SERVER
+    } elseif {$system_type == 2} {
+        set _osinfo(system_type) "domain_controller"; # VER_NT_DOMAIN_CONTROLLER
+    } else {
+        set _osinfo(system_type) "unknown"
+    }
+
+    return [array get _osinfo]
+}
+
+# Return a text string describing the OS version and options
+# If specified, osinfo should be a keyed list containing
+# data returned by get_os_info
+proc twapi::get_os_description {} {
+
+    array set osinfo [get_os_info]
+
+    # Assume not terminal server
+    set tserver ""
+
+    # Version
+    set osversion "$osinfo(os_major_version).$osinfo(os_minor_version)"
+
+    set systype ""
+
+    # Base OS name
+    switch -exact -- $osversion {
+        "5.0" {
+            set osname "Windows 2000"
+            if {[string equal $osinfo(system_type) "workstation"]} {
+                set systype "Professional"
+            } else {
+                if {"datacenter" in $osinfo(suites)} {
+                    set systype "Datacenter Server"
+                } elseif {"enterprise" in $osinfo(suites)} {
+                    set systype "Advanced Server"
+                } else {
+                    set systype "Server"
+                }
+            }
+        }
+        "5.1" {
+            set osname "Windows XP"
+            if {"personal" in $osinfo(suites)} {
+                set systype "Home Edition"
+            } else {
+                set systype "Professional"
+            }
+        }
+        "5.2" {
+            set osname "Windows Server 2003"
+            if {[GetSystemMetrics 89]} {
+                append osname " R2"
+            }
+            if {"datacenter" in $osinfo(suites)} {
+                set systype "Datacenter Edition"
+            } elseif {"enterprise" in  $osinfo(suites)} {
+                set systype "Enterprise Edition"
+            } elseif {"blade" in  $osinfo(suites)} {
+                set systype "Web Edition"
+            } else {
+                set systype "Standard Edition"
+            }
+        }
+        "6.0" {
+            set prodtype [GetProductInfo]
+            if {$osinfo(system_type) eq "workstation"} {
+                set osname "Windows Vista"
+            } else {
+                set osname "Windows Server 2008"
+            }
+        }
+        "6.1" {
+            set prodtype [GetProductInfo]
+            if {$osinfo(system_type) eq "workstation"} {
+                set osname "Windows 7"
+            } else {
+                set osname "Windows Server 2008 R2"
+            }
+        }
+        "6.2" {
+            if {$osinfo(system_type) eq "workstation"} {
+                # Win8 does not follow the systype table below
+                switch -exact -- [format %x [GetProductInfo]] {
+                    3 {set systype ""}
+                    6 {set systype Pro}
+                    default {set systype Enterprise}
+                }
+                set osname "Windows 8"
+            } else {
+                set prodtype [GetProductInfo]
+
+                set osname "Windows Server 2012"
+            }
+            
+        }
+        "6.3" {
+            if {$osinfo(system_type) eq "workstation"} {
+                # Win8.1 probably (TBD) does not follow the systype table below
+                switch -exact -- [format %x [GetProductInfo]] {
+                    3 {set systype ""}
+                    6 {set systype Pro}
+                    default {set systype Enterprise}
+                }
+                set osname "Windows 8.1"
+            } else {
+                set prodtype [GetProductInfo]
+                set osname "Windows Server 2012 R2"
+            }
+        }
+        default {
+            # Future release - can't really name, just make something up
+            catch {set prodtype [GetProductInfo]}
+            set osname "Windows"
+        }
+    }
+
+    if {[info exists prodtype] && $prodtype} {
+        catch {
+            set systype [dict get {
+                1 "Ultimate"
+                2 "Home Basic"
+                3 "Home Premium"
+                4 "Enterprise"
+                5 "Home Basic N"
+                6 "Business"
+                7 "Standard"
+                8 "Datacenter"
+                9 "Small Business Server"
+                a "Enterprise Server"
+                b "Starter"
+                c "Datacenter Server Core"
+                d "Standard Server Core"
+                e "Enterprise Server Core"
+                f "Enterprise Server Ia64"
+                10 "Business N"
+                11 "Web Server"
+                12 "HPC Edition"
+                13 "Home Server"
+                14 "Storage Server Express"
+                15 "Storage Server Standard"
+                16 "Storage Server Workgroup"
+                17 "Storage Server Enterprise"
+                18 "Essential Server Solutions"
+                19 "Small Business Server Premium"
+                1a "Home Premium N"
+                1b "Enterprise N"
+                1c "Ultimate N"
+                1d "Web Server Core"
+                1e "Essential Business Server Management Server"
+                1f "Essential Business Server Security Server"
+                20 "Essential Business Server Messaging Server"
+                21 "Server Foundation"
+                22 "Home Premium Server"
+                23 "Essential Server Solutions without Hyper-V"
+                24 "Standard without Hyper-V"
+                25 "Datacenter without Hyper-V"
+                26 "Enterprise without Hyper-V"
+                26 "Enterprise Server V"
+                27 "Datacenter Server Core without Hyper-V"
+                28 "Standard Core without Hyper-V"
+                29 "Enterprise Server Core without Hyper-V"
+                2a "Hyper-V Server"
+                2b "Storage Express Server Core"
+                2c "Storage Standard Server Core"
+                2d "Storage Workgroup Server Core"
+                2e "Storage Enterprise Server Core"
+                2f "Starter N"
+                30 "Professional"
+                31 "Professional N"
+                32 "Small Business Server 2011 Essentials"
+                33 "Server For SB Solutions"
+                34 "Standard Server Solutions"
+                35 "Standard Server Solutions Core"
+                36 "Server For SB Solutions EM"
+                37 "Server For SB Solutions EM"
+                38 "Windows MultiPoint Server"
+                39 "Solution Embeddedserver Core"
+                3a "Professional Embedded"
+                3b "Windows Essential Server Solution Management"
+                3c "Windows Essential Server Solution Additional"
+                3d "Windows Essential Server Solution SVC"
+                3e "Windows Essential Server Solution Additional SVC"
+                3f "Small Business Premium Server Core"
+                40 "Hyper Core V"
+                41 "Embedded"
+                42 "Starter E"
+                43 "Home Basic E"
+                44 "Home Premium E"
+                45 "Professional E"
+                46 "Enterprise E"
+                47 "Ultimate E"
+                48 "Enterprise Evaluation"
+                4c "Multipoint Standard Server"
+                4d "Multipoint Premium Server"
+                4f "Standard Evaluation Server"
+                50 "Datacenter Evaluation"
+                54 "Enterprise N Evaluation"
+                55 "Embedded Automotive"
+                56 "Embedded Industry A"
+                57 "Thin PC"
+                58 "Embedded A"
+                59 "Embedded Industry"
+                5a "Embedded E"
+                5b "Embedded Industry E"
+                5c "Embedded Industry A E"
+                5f "Storage Workgroup Evaluation Server"
+                60 "Storage Standard Evaluation Server"
+                61 "Core Arm"
+                62 "N"
+                63 "China"
+                64 "Single Language"
+                65 ""
+                67 "Professional Wmc"
+                68 "Mobile Core"
+                69 "Embedded Industry Eval"
+                6a "Embedded Industry E Eval"
+                6b "Embedded Eval"
+                6c "Embedded E Eval"
+                6d "Core Server"
+                6e "Cloud Storage Server"
+                abcdabcd "unlicensed"
+            } [format %x $prodtype]]
+        }
+    }
+
+    if {"terminal" in  $osinfo(suites)} {
+        set tserver " with Terminal Services"
+    }
+
+    # Service pack
+    if {$osinfo(sp_major_version) != 0} {
+        set spver " Service Pack $osinfo(sp_major_version)"
+    } else {
+        set spver ""
+    }
+
+    if {$systype ne ""} {
+        return "$osname $systype ${osversion} (Build $osinfo(os_build_number))${spver}${tserver}"
+    } else {
+        return "$osname ${osversion} (Build $osinfo(os_build_number))${spver}${tserver}"
+    }
+}
+
+proc twapi::get_processor_group_config {} {
+    trap {
+        set info [GetLogicalProcessorInformationEx 4]
+        if {[llength $info]} {
+            set maxgroupcount [lindex $info 0 1 0]
+            set groups {}
+            set num -1
+            foreach group [lindex $info 0 1 1] {
+                lappend groups [incr num] [twine {-maxprocessorcount -activeprocessorcount -processormask} $group]
+            }
+        }
+        return [list -maxgroupcount $maxgroupcount -activegroups $groups]
+    } onerror {TWAPI_WIN32 127} {
+        # Just try older APIs
+        set processor_count [lindex [GetSystemInfo] 5]
+        return [list -maxgroupcount 1 -activegroups [list 0 [list -maxprocessorcount $processor_count -activeprocessorcount $processor_count -processormask [expr {(1 << $processor_count) - 1}]]]]
+    }
+
+}
+
+proc twapi::get_numa_config {} {
+    trap {
+        set result {}
+        foreach rec [GetLogicalProcessorInformationEx 1] {
+            lappend result [lindex $rec 1 0] [twine {-processormask -group} [lindex $rec 1 1]]
+        }
+        return $result
+    } onerror {TWAPI_WIN32 127} {
+        # Use older APIs below
+    }
+
+    # If GetLogicalProcessorInformation is available, records of type "1"
+    # indicate NUMA information. Use it.
+    trap {
+        set result {}
+        foreach rec [GetLogicalProcessorInformation] {
+            if {[lindex $rec 1] == 1} {
+                lappend result [lindex $rec 2] [list -processormask [lindex $rec 0] -group 0]
+            }
+        }
+        return $result
+    } onerror {TWAPI_WIN32 127} {
+        # API not present, fake it
+    }
+
+    return $result
+}
+
+# Returns proc information
+#  $processor should be processor number or "" for "total"
+proc twapi::get_processor_info {processor args} {
+
+    if {![string is integer $processor]} {
+        error "Invalid processor number \"$processor\". Should be a processor identifier or the empty string to signify all processors"
+    }
+
+    if {![info exists ::twapi::get_processor_info_base_opts]} {
+        array set ::twapi::get_processor_info_base_opts {
+            idletime    IdleTime
+            privilegedtime  KernelTime
+            usertime    UserTime
+            dpctime     DpcTime
+            interrupttime InterruptTime
+            interrupts    InterruptCount
+        }
+    }
+
+    set sysinfo_opts {
+        arch
+        processorlevel
+        processorrev
+        processorname
+        processormodel
+        processorspeed
+    }
+
+    array set opts [parseargs args \
+                        [concat all \
+                             [array names ::twapi::get_processor_info_base_opts] \
+                             $sysinfo_opts] -maxleftover 0]
+
+    # Registry lookup for processor description
+    # If no processor specified, use 0 under the assumption all processors
+    # are the same
+    set reg_hwkey "HKEY_LOCAL_MACHINE\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\[expr {$processor == "" ? 0 : $processor}]"
+
+    set results [list ]
+
+    set processordata [Twapi_SystemProcessorTimes]
+    if {$processor ne ""} {
+        if {[llength $processordata] <= $processor} {
+            error "Invalid processor number '$processor'"
+        }
+        array set times [lindex $processordata $processor]
+        foreach {opt field} [array get ::twapi::get_processor_info_base_opts] {
+            if {$opts(all) || $opts($opt)} {
+                lappend results -$opt $times($field)
+            }
+        }
+    } else {
+        # Need information across all processors
+        foreach instancedata $processordata {
+            foreach {opt field} [array get ::twapi::get_processor_info_base_opts] {
+                incr times($field) [kl_get $instancedata $field]
+            }
+            foreach {opt field} [array get ::twapi::get_processor_info_base_opts] {
+                if {$opts(all) || $opts($opt)} {
+                    lappend results -$opt $times($field)
+                }
+            }
+        }
+    }
+
+    if {$opts(all) || $opts(arch) || $opts(processorlevel) || $opts(processorrev)} {
+        set sysinfo [GetSystemInfo]
+        if {$opts(all) || $opts(arch)} {
+            lappend results -arch [dict* {
+                0 intel
+                5 arm
+                6 ia64
+                9 amd64
+                10 ia32_win64
+                65535 unknown
+            } [lindex $sysinfo 0]]
+        }
+
+        if {$opts(all) || $opts(processorlevel)} {
+            lappend results -processorlevel [lindex $sysinfo 8]
+        }
+
+        if {$opts(all) || $opts(processorrev)} {
+            lappend results -processorrev [format %x [lindex $sysinfo 9]]
+        }
+    }
+
+    if {$opts(all) || $opts(processorname)} {
+        if {[catch {registry get $reg_hwkey "ProcessorNameString"} val]} {
+            set val "unknown"
+        }
+        lappend results -processorname $val
+    }
+
+    if {$opts(all) || $opts(processormodel)} {
+        if {[catch {registry get $reg_hwkey "Identifier"} val]} {
+            set val "unknown"
+        }
+        lappend results -processormodel $val
+    }
+
+    if {$opts(all) || $opts(processorspeed)} {
+        if {[catch {registry get $reg_hwkey "~MHz"} val]} {
+            set val "unknown"
+        }
+        lappend results -processorspeed $val
+    }
+
+    return $results
+}
+
+# Get mask of active processors
+# TBD - handle processor groups
+proc twapi::get_active_processor_mask {} {
+    return [format 0x%x [lindex [GetSystemInfo] 4]]
+}
+
+
+# Get number of active processors
+proc twapi::get_processor_count {} {
+    trap {
+        set info [GetLogicalProcessorInformationEx 4]
+        if {[llength $info]} {
+            set count 0
+            foreach group [lindex $info 0 1 1] {
+                incr count [lindex $group 1]
+            }
+        }
+        return $count
+    } onerror {TWAPI_WIN32 127} {
+        # GetLogicalProcessorInformationEx call does not exist
+        # so system does not support processor groups
+        return [lindex [GetSystemInfo] 5]
+    }
+}
+
+# Get system memory information
+proc twapi::get_memory_info {args} {
+    array set opts [parseargs args {
+        all
+        allocationgranularity
+        availcommit
+        availphysical
+        kernelpaged
+        kernelnonpaged
+        minappaddr
+        maxappaddr
+        pagesize
+        peakcommit
+        physicalmemoryload
+        processavailcommit
+        processcommitlimit
+        processtotalvirtual
+        processavailvirtual
+        swapfiles
+        swapfiledetail
+        systemcache
+        totalcommit
+        totalphysical
+        usedcommit
+    } -maxleftover 0]
+
+
+    set results [list ]
+    set mem [GlobalMemoryStatus]
+    foreach {opt fld} {
+        physicalmemoryload     dwMemoryLoad
+        totalphysical  ullTotalPhys
+        availphysical  ullAvailPhys
+        processcommitlimit    ullTotalPageFile
+        processavailcommit    ullAvailPageFile
+        processtotalvirtual   ullTotalVirtual
+        processavailvirtual   ullAvailVirtual
+    } {
+        if {$opts(all) || $opts($opt)} {
+            lappend results -$opt [kl_get $mem $fld]
+        }
+    }
+
+    if {$opts(all) || $opts(swapfiles) || $opts(swapfiledetail)} {
+        set swapfiles [list ]
+        set swapdetail [list ]
+
+        foreach item [Twapi_SystemPagefileInformation] {
+            lassign $item current_size total_used peak_used path
+            set path [_normalize_path $path]
+            lappend swapfiles $path
+            lappend swapdetail $path [list $current_size $total_used $peak_used]
+        }
+        if {$opts(all) || $opts(swapfiles)} {
+            lappend results -swapfiles $swapfiles
+        }
+        if {$opts(all) || $opts(swapfiledetail)} {
+            lappend results -swapfiledetail $swapdetail
+        }
+    }
+
+    if {$opts(all) || $opts(allocationgranularity) ||
+        $opts(minappaddr) || $opts(maxappaddr) || $opts(pagesize)} {
+        set sysinfo [twapi::GetSystemInfo]
+        foreach {opt fmt index} {
+            pagesize %u 1 minappaddr 0x%lx 2 maxappaddr 0x%lx 3 allocationgranularity %u 7} {
+            if {$opts(all) || $opts($opt)} {
+                lappend results -$opt [format $fmt [lindex $sysinfo $index]]
+            }
+        }
+    }
+
+    # This call is slightly expensive so check if it is really needed 
+    if {$opts(all) || $opts(totalcommit) || $opts(usedcommit) ||
+        $opts(availcommit) ||
+        $opts(kernelpaged) || $opts(kernelnonpaged)
+    } {
+        set mem [GetPerformanceInformation]
+        set page_size [kl_get $mem PageSize]
+        foreach {opt fld} {
+            totalcommit CommitLimit
+            usedcommit  CommitTotal
+            peakcommit  CommitPeak
+            systemcache SystemCache
+            kernelpaged KernelPaged
+            kernelnonpaged KernelNonpaged
+        } {
+            if {$opts(all) || $opts($opt)} {
+                lappend results -$opt [expr {[kl_get $mem $fld] * $page_size}]
+            }
+        }
+        if {$opts(all) || $opts(availcommit)} {
+            lappend results -availcommit [expr {$page_size * ([kl_get $mem CommitLimit]-[kl_get $mem CommitTotal])}]
+        }
+    }
+        
+    return $results
+}
+
+# Get the netbios name
+proc twapi::get_computer_netbios_name {} {
+    return [GetComputerName]
+}
+
+# Get the computer name
+proc twapi::get_computer_name {{typename netbios}} {
+    if {[string is integer $typename]} {
+        set type $typename
+    } else {
+        set type [lsearch -exact {netbios dnshostname dnsdomain dnsfullyqualified physicalnetbios physicaldnshostname physicaldnsdomain physicaldnsfullyqualified} $typename]
+        if {$type < 0} {
+            error "Unknown computer name type '$typename' specified"
+        }
+    }
+    return [GetComputerNameEx $type]
+}
+
+# Suspend system
+proc twapi::suspend_system {args} {
+    array set opts [parseargs args {
+        {state.arg standby {standby hibernate}}
+        force.bool
+        disablewakeevents.bool
+    } -maxleftover 0 -nulldefault]
+
+    eval_with_privileges {
+        SetSuspendState [expr {$opts(state) eq "hibernate"}] $opts(force) $opts(disablewakeevents)
+    } SeShutdownPrivilege
+}
+
+# Shut down the system
+proc twapi::shutdown_system {args} {
+    array set opts [parseargs args {
+        system.arg
+        {message.arg "System shutdown has been initiated"}
+        {timeout.int 60}
+        force
+        restart
+    } -nulldefault]
+
+    eval_with_privileges {
+        InitiateSystemShutdown $opts(system) $opts(message) \
+            $opts(timeout) $opts(force) $opts(restart)
+    } SeShutdownPrivilege
+}
+
+# Abort a system shutdown
+proc twapi::abort_system_shutdown {args} {
+    array set opts [parseargs args {system.arg} -nulldefault]
+    eval_with_privileges {
+        AbortSystemShutdown $opts(system)
+    } SeShutdownPrivilege
+}
+
+twapi::proc* twapi::get_system_uptime {} {
+    package require twapi_pdh
+    variable _system_start_time    
+    set ctr_path [pdh_counter_path System "System Up Time"]
+    set uptime [pdh_counter_path_value $ctr_path -format double]
+    set now [clock seconds]
+    set _system_start_time [expr {$now - round($uptime+0.5)}]
+} {
+    variable _system_start_time
+    return [expr {[clock seconds] - $_system_start_time}]
+}
+
+proc twapi::get_system_sid {} {
+    set lsah [get_lsa_policy_handle -access policy_view_local_information]
+    trap {
+        return [lindex [LsaQueryInformationPolicy $lsah 5] 1]
+    } finally {
+        close_lsa_policy_handle $lsah
+    }
+}
+
+# Get the primary domain controller
+proc twapi::get_primary_domain_controller {args} {
+    array set opts [parseargs args {system.arg domain.arg} -nulldefault -maxleftover 0]
+    return [NetGetDCName $opts(system) $opts(domain)]
+}
+
+# Get a domain controller for a domain
+proc twapi::find_domain_controller {args} {
+    array set opts [parseargs args {
+        system.arg
+        avoidself.bool
+        domain.arg
+        domainguid.arg
+        site.arg
+        rediscover.bool
+        allowstale.bool
+        require.arg
+        prefer.arg
+        justldap.bool
+        {inputnameformat.arg any {dns flat netbios any}}
+        {outputnameformat.arg any {dns flat netbios any}}
+        {outputaddrformat.arg any {ip netbios any}}
+        getdetails
+    } -maxleftover 0 -nulldefault]
+
+
+    set flags 0
+
+    if {$opts(outputaddrformat) eq "ip"} {
+        setbits flags 0x200
+    }
+
+    # Set required bits.
+    foreach req $opts(require) {
+        if {[string is integer $req]} {
+            setbits flags $req
+        } else {
+            switch -exact -- $req {
+                directoryservice { setbits flags 0x10 }
+                globalcatalog    { setbits flags 0x40 }
+                pdc              { setbits flags 0x80 }
+                kdc              { setbits flags 0x400 }
+                timeserver       { setbits flags 0x800 }
+                writable         { setbits flags 0x1000 }
+                default {
+                    error "Invalid token '$req' specified in value for option '-require'"
+                }
+            }
+        }
+    }
+
+    # Set preferred bits.
+    foreach req $opts(prefer) {
+        if {[string is integer $req]} {
+            setbits flags $req
+        } else {
+            switch -exact -- $req {
+                directoryservice {
+                    # If required flag is already set, don't set this
+                    if {! ($flags & 0x10)} {
+                        setbits flags 0x20
+                    }
+                }
+                timeserver {
+                    # If required flag is already set, don't set this
+                    if {! ($flags & 0x800)} {
+                        setbits flags 0x2000
+                    }
+                }
+                default {
+                    error "Invalid token '$req' specified in value for option '-prefer'"
+                }
+            }
+        }
+    }
+
+    if {$opts(rediscover)} {
+        setbits flags 0x1
+    } else {
+        # Only look at this option if rediscover is not set
+        if {$opts(allowstale)} {
+            setbits flags 0x100
+        }
+    }
+
+    if {$opts(avoidself)} {
+        setbits flags 0x4000
+    }
+
+    if {$opts(justldap)} {
+        setbits flags 0x8000
+    }
+
+    switch -exact -- $opts(inputnameformat) {
+        any  { }
+        netbios -
+        flat { setbits flags 0x10000 }
+        dns  { setbits flags 0x20000 }
+        default {
+            error "Invalid value '$opts(inputnameformat)' for option '-inputnameformat'"
+        }
+    }
+
+    switch -exact -- $opts(outputnameformat) {
+        any  { }
+        netbios -
+        flat { setbits flags 0x80000000 }
+        dns  { setbits flags 0x40000000 }
+        default {
+            error "Invalid value '$opts(outputnameformat)' for option '-outputnameformat'"
+        }
+    }
+
+    array set dcinfo [DsGetDcName $opts(system) $opts(domain) $opts(domainguid) $opts(site) $flags]
+
+    if {! $opts(getdetails)} {
+        return $dcinfo(DomainControllerName)
+    }
+
+    set result [list \
+                    -dcname $dcinfo(DomainControllerName) \
+                    -dcaddr [string trimleft $dcinfo(DomainControllerAddress) \\] \
+                    -domainguid $dcinfo(DomainGuid) \
+                    -domain $dcinfo(DomainName) \
+                    -dnsforest $dcinfo(DnsForestName) \
+                    -dcsite $dcinfo(DcSiteName) \
+                    -clientsite $dcinfo(ClientSiteName) \
+                   ]
+
+
+    if {$dcinfo(DomainControllerAddressType) == 1} {
+        lappend result -dcaddrformat ip
+    } else {
+        lappend result -dcaddrformat netbios
+    }
+
+    if {$dcinfo(Flags) & 0x20000000} {
+        lappend result -dcnameformat dns
+    } else {
+        lappend result -dcnameformat netbios
+    }
+
+    if {$dcinfo(Flags) & 0x40000000} {
+        lappend result -domainformat dns
+    } else {
+        lappend result -domainformat netbios
+    }
+
+    if {$dcinfo(Flags) & 0x80000000} {
+        lappend result -dnsforestformat dns
+    } else {
+        lappend result -dnsforestformat netbios
+    }
+
+    set features [list ]
+    foreach {flag feature} {
+        0x1    pdc
+        0x4    globalcatalog
+        0x8    ldap
+        0x10   directoryservice
+        0x20   kdc
+        0x40   timeserver
+        0x80   closest
+        0x100  writable
+        0x200  goodtimeserver
+    } {
+        if {$dcinfo(Flags) & $flag} {
+            lappend features $feature
+        }
+    }
+
+    lappend result -features $features
+
+    return $result
+}
+
+# Get the primary domain info
+proc twapi::get_primary_domain_info {args} {
+    array set opts [parseargs args {
+        all
+        name
+        dnsdomainname
+        dnsforestname
+        domainguid
+        sid
+        type
+    } -maxleftover 0]
+
+    set result [list ]
+    set lsah [get_lsa_policy_handle -access policy_view_local_information]
+    trap {
+        lassign  [LsaQueryInformationPolicy $lsah 12]  name dnsdomainname dnsforestname domainguid sid
+        if {[string length $sid] == 0} {
+            set type workgroup
+            set domainguid ""
+        } else {
+            set type domain
+        }
+        foreach opt {name dnsdomainname dnsforestname domainguid sid type} {
+            if {$opts(all) || $opts($opt)} {
+                lappend result -$opt [set $opt]
+            }
+        }
+    } finally {
+        close_lsa_policy_handle $lsah
+    }
+
+    return $result
+}
+
+# Get a element from SystemParametersInfo
+proc twapi::get_system_parameters_info {uiaction} {
+    variable SystemParametersInfo_uiactions_get
+    # Format of an element is
+    #  uiaction_indexvalue uiparam binaryscanstring malloc_size modifiers
+    # uiparam may be an int or "sz" in which case the malloc size
+    # is substituted for it.
+    # If modifiers contains "cbsize" the first dword is initialized
+    # with malloc_size
+    if {![info exists SystemParametersInfo_uiactions_get]} {
+        array set SystemParametersInfo_uiactions_get {
+            SPI_GETDESKWALLPAPER {0x0073 2048 unicode 4096}
+            SPI_GETBEEP  {0x0001 0 i 4}
+            SPI_GETMOUSE {0x0003 0 i3 12}
+            SPI_GETBORDER {0x0005 0 i 4}
+            SPI_GETKEYBOARDSPEED {0x000A 0 i 4}
+            SPI_ICONHORIZONTALSPACING {0x000D 0 i 4}
+            SPI_GETSCREENSAVETIMEOUT {0x000E 0 i 4}
+            SPI_GETSCREENSAVEACTIVE {0x0010 0 i 4}
+            SPI_GETKEYBOARDDELAY {0x0016 0 i 4}
+            SPI_ICONVERTICALSPACING {0x0018 0 i 4}
+            SPI_GETICONTITLEWRAP {0x0019 0 i 4}
+            SPI_GETMENUDROPALIGNMENT {0x001B 0 i 4}
+            SPI_GETDRAGFULLWINDOWS {0x0026 0 i 4}
+            SPI_GETNONCLIENTMETRICS {0x0029 sz {i6 i5 cu8 A64 i2 i5 cu8 A64 i2 i5 cu8 A64 i5 cu8 A64 i5 cu8 A64} 500 cbsize}
+            SPI_GETMINIMIZEDMETRICS {0x002B sz i5 20 cbsize}
+            SPI_GETWORKAREA {0x0030 0 i4 16}
+            SPI_GETKEYBOARDPREF {0x0044 0 i 4 }
+            SPI_GETSCREENREADER {0x0046 0 i 4}
+            SPI_GETANIMATION {0x0048 sz i2 8 cbsize}
+            SPI_GETFONTSMOOTHING {0x004A 0 i 4}
+            SPI_GETLOWPOWERTIMEOUT {0x004F 0 i 4}
+            SPI_GETPOWEROFFTIMEOUT {0x0050 0 i 4}
+            SPI_GETLOWPOWERACTIVE {0x0053 0 i 4}
+            SPI_GETPOWEROFFACTIVE {0x0054 0 i 4}
+            SPI_GETMOUSETRAILS {0x005E 0 i 4}
+            SPI_GETSCREENSAVERRUNNING {0x0072 0 i 4}
+            SPI_GETFILTERKEYS {0x0032 sz i6 24 cbsize}
+            SPI_GETTOGGLEKEYS {0x0034 sz i2 8 cbsize}
+            SPI_GETMOUSEKEYS {0x0036 sz i7 28 cbsize}
+            SPI_GETSHOWSOUNDS {0x0038 0 i 4}
+            SPI_GETSTICKYKEYS {0x003A sz i2 8 cbsize}
+            SPI_GETACCESSTIMEOUT {0x003C 12 i3 12 cbsize}
+            SPI_GETSNAPTODEFBUTTON {0x005F 0 i 4}
+            SPI_GETMOUSEHOVERWIDTH {0x0062 0 i 4}
+            SPI_GETMOUSEHOVERHEIGHT {0x0064 0 i 4 }
+            SPI_GETMOUSEHOVERTIME {0x0066 0 i 4}
+            SPI_GETWHEELSCROLLLINES {0x0068 0 i 4}
+            SPI_GETMENUSHOWDELAY {0x006A 0 i 4}
+            SPI_GETSHOWIMEUI {0x006E 0 i 4}
+            SPI_GETMOUSESPEED {0x0070 0 i 4}
+            SPI_GETACTIVEWINDOWTRACKING {0x1000 0 i 4}
+            SPI_GETMENUANIMATION {0x1002 0 i 4}
+            SPI_GETCOMBOBOXANIMATION {0x1004 0 i 4}
+            SPI_GETLISTBOXSMOOTHSCROLLING {0x1006 0 i 4}
+            SPI_GETGRADIENTCAPTIONS {0x1008 0 i 4}
+            SPI_GETKEYBOARDCUES {0x100A 0 i 4}
+            SPI_GETMENUUNDERLINES            {0x100A 0 i 4}
+            SPI_GETACTIVEWNDTRKZORDER {0x100C 0 i 4}
+            SPI_GETHOTTRACKING {0x100E 0 i 4}
+            SPI_GETMENUFADE {0x1012 0 i 4}
+            SPI_GETSELECTIONFADE {0x1014 0 i 4}
+            SPI_GETTOOLTIPANIMATION {0x1016 0 i 4}
+            SPI_GETTOOLTIPFADE {0x1018 0 i 4}
+            SPI_GETCURSORSHADOW {0x101A 0 i 4}
+            SPI_GETMOUSESONAR {0x101C 0 i 4 }
+            SPI_GETMOUSECLICKLOCK {0x101E 0 i 4}
+            SPI_GETMOUSEVANISH {0x1020 0 i 4}
+            SPI_GETFLATMENU {0x1022 0 i 4}
+            SPI_GETDROPSHADOW {0x1024 0 i 4}
+            SPI_GETBLOCKSENDINPUTRESETS {0x1026 0 i 4}
+            SPI_GETUIEFFECTS {0x103E 0 i 4}
+            SPI_GETFOREGROUNDLOCKTIMEOUT {0x2000 0 i 4}
+            SPI_GETACTIVEWNDTRKTIMEOUT {0x2002 0 i 4}
+            SPI_GETFOREGROUNDFLASHCOUNT {0x2004 0 i 4}
+            SPI_GETCARETWIDTH {0x2006 0 i 4}
+            SPI_GETMOUSECLICKLOCKTIME {0x2008 0 i 4}
+            SPI_GETFONTSMOOTHINGTYPE {0x200A 0 i 4}
+            SPI_GETFONTSMOOTHINGCONTRAST {0x200C 0 i 4}
+            SPI_GETFOCUSBORDERWIDTH {0x200E 0 i 4}
+            SPI_GETFOCUSBORDERHEIGHT {0x2010 0 i 4}
+        }
+        if {$::tcl_platform(pointerSize) == 4} {
+            set hc_struct_size 12
+            set bfmt i3
+        } else {
+            set hc_struct_size 16
+            set bfmt i4
+        }
+        set SystemParametersInfo_uiactions_get(SPI_GETHIGHCONTRAST) [list 0x0042 sz $bfmt $hc_struct_size cbsize]
+    }
+
+    set key [string toupper $uiaction]
+
+    # TBD -
+    # SPI_GETSOUNDSENTRY {0x0040 }
+    # SPI_GETICONMETRICS {0x002D }
+    # SPI_GETICONTITLELOGFONT {0x001F }
+    # SPI_GETDEFAULTINPUTLANG {0x0059 }
+    # SPI_GETFONTSMOOTHINGORIENTATION {0x2012}
+
+    if {![info exists SystemParametersInfo_uiactions_get($key)]} {
+        set key SPI_$key
+        if {![info exists SystemParametersInfo_uiactions_get($key)]} {
+            error "Unknown SystemParametersInfo index symbol '$uiaction'"
+        }
+    }
+
+    lassign  $SystemParametersInfo_uiactions_get($key) index uiparam fmt sz modifiers
+    if {$uiparam eq "sz"} {
+        set uiparam $sz
+    }
+    set mem [malloc $sz]
+    trap {
+        if {[lsearch -exact $modifiers cbsize] >= 0} {
+            # A structure that needs first field set to its size
+            Twapi_WriteMemory 1 $mem 0 $sz [binary format i $sz]
+        }
+        SystemParametersInfo $index $uiparam $mem 0
+        if {$fmt eq "unicode"} {
+            return [Twapi_ReadMemory 3 $mem 0 $sz 1]
+        } else {
+            set n [binary scan [Twapi_ReadMemory 1 $mem 0 $sz] $fmt {*}[lrange {val0 val1 val2 val3 val4 val5 val6 val7 val8 val9 val10 val11 val12 val13 val14 val15 val16 val17 val17} 0 [llength $fmt]-1]]
+            if {$n == 1} {
+                return $val0
+            } else {
+                set result {}
+                for {set i 0} {$i < $n} {incr i} {
+                    lappend result {*}[set val$i]
+                }
+                return $result
+            }
+        }
+    } finally {
+        free $mem
+    }
+}
+
+proc twapi::set_system_parameters_info {uiaction val args} {
+    variable SystemParametersInfo_uiactions_set
+
+    # Format of an element is
+    #  uiaction_indexvalue uiparam binaryscanstring malloc_size modifiers
+    # uiparam may be an int or "sz" in which case the malloc size
+    # is substribnuted for it.
+    # If modifiers contains "cbsize" the first dword is initialized
+    # with malloc_size
+    if {![info exists SystemParametersInfo_uiactions_set]} {
+        array set SystemParametersInfo_uiactions_set {
+            SPI_SETBEEP                 {0x0002 bool}
+            SPI_SETMOUSE                {0x0004 unsupported}
+            SPI_SETBORDER               {0x0006 int}
+            SPI_SETKEYBOARDSPEED        {0x000B int}
+            SPI_ICONHORIZONTALSPACING   {0x000D int}
+            SPI_SETSCREENSAVETIMEOUT    {0x000F int}
+            SPI_SETSCREENSAVEACTIVE     {0x0011 bool}
+            SPI_SETDESKWALLPAPER        {0x0014 unsupported}
+            SPI_SETDESKPATTERN          {0x0015 int}
+            SPI_SETKEYBOARDDELAY        {0x0017 int}
+            SPI_ICONVERTICALSPACING     {0x0018 int}
+            SPI_SETICONTITLEWRAP        {0x001A bool}
+            SPI_SETMENUDROPALIGNMENT    {0x001C bool}
+            SPI_SETDOUBLECLKWIDTH       {0x001D int}
+            SPI_SETDOUBLECLKHEIGHT      {0x001E int}
+            SPI_SETDOUBLECLICKTIME      {0x0020 int}
+            SPI_SETMOUSEBUTTONSWAP      {0x0021 bool}
+            SPI_SETICONTITLELOGFONT     {0x0022 LOGFONT}
+            SPI_SETDRAGFULLWINDOWS      {0x0025 bool}
+            SPI_SETNONCLIENTMETRICS     {0x002A NONCLIENTMETRICS}
+            SPI_SETMINIMIZEDMETRICS     {0x002C MINIMIZEDMETRICS}
+            SPI_SETICONMETRICS          {0x002E ICONMETRICS}
+            SPI_SETWORKAREA             {0x002F RECT}
+            SPI_SETPENWINDOWS           {0x0031}
+            SPI_SETHIGHCONTRAST         {0x0043 HIGHCONTRAST}
+            SPI_SETKEYBOARDPREF         {0x0045 bool}
+            SPI_SETSCREENREADER         {0x0047 bool}
+            SPI_SETANIMATION            {0x0049 ANIMATIONINFO}
+            SPI_SETFONTSMOOTHING        {0x004B bool}
+            SPI_SETDRAGWIDTH            {0x004C int}
+            SPI_SETDRAGHEIGHT           {0x004D int}
+            SPI_SETHANDHELD             {0x004E}
+            SPI_SETLOWPOWERTIMEOUT      {0x0051 int}
+            SPI_SETPOWEROFFTIMEOUT      {0x0052 int}
+            SPI_SETLOWPOWERACTIVE       {0x0055 bool}
+            SPI_SETPOWEROFFACTIVE       {0x0056 bool}
+            SPI_SETCURSORS              {0x0057 int}
+            SPI_SETICONS                {0x0058 int}
+            SPI_SETDEFAULTINPUTLANG     {0x005A HKL}
+            SPI_SETLANGTOGGLE           {0x005B int}
+            SPI_SETMOUSETRAILS          {0x005D int}
+            SPI_SETFILTERKEYS          {0x0033 FILTERKEYS}
+            SPI_SETTOGGLEKEYS          {0x0035 TOGGLEKEYS}
+            SPI_SETMOUSEKEYS           {0x0037 MOUSEKEYS}
+            SPI_SETSHOWSOUNDS          {0x0039 bool}
+            SPI_SETSTICKYKEYS          {0x003B STICKYKEYS}
+            SPI_SETACCESSTIMEOUT       {0x003D ACCESSTIMEOUT}
+            SPI_SETSERIALKEYS          {0x003F SERIALKEYS}
+            SPI_SETSOUNDSENTRY         {0x0041 SOUNDSENTRY}
+            SPI_SETSNAPTODEFBUTTON     {0x0060 bool}
+            SPI_SETMOUSEHOVERWIDTH     {0x0063 int}
+            SPI_SETMOUSEHOVERHEIGHT    {0x0065 int}
+            SPI_SETMOUSEHOVERTIME      {0x0067 int}
+            SPI_SETWHEELSCROLLLINES    {0x0069 int}
+            SPI_SETMENUSHOWDELAY       {0x006B int}
+            SPI_SETSHOWIMEUI          {0x006F bool}
+            SPI_SETMOUSESPEED         {0x0071 castint}
+            SPI_SETACTIVEWINDOWTRACKING         {0x1001 castbool}
+            SPI_SETMENUANIMATION                {0x1003 castbool}
+            SPI_SETCOMBOBOXANIMATION            {0x1005 castbool}
+            SPI_SETLISTBOXSMOOTHSCROLLING       {0x1007 castbool}
+            SPI_SETGRADIENTCAPTIONS             {0x1009 castbool}
+            SPI_SETKEYBOARDCUES                 {0x100B castbool}
+            SPI_SETMENUUNDERLINES               {0x100B castbool}
+            SPI_SETACTIVEWNDTRKZORDER           {0x100D castbool}
+            SPI_SETHOTTRACKING                  {0x100F castbool}
+            SPI_SETMENUFADE                     {0x1013 castbool}
+            SPI_SETSELECTIONFADE                {0x1015 castbool}
+            SPI_SETTOOLTIPANIMATION             {0x1017 castbool}
+            SPI_SETTOOLTIPFADE                  {0x1019 castbool}
+            SPI_SETCURSORSHADOW                 {0x101B castbool}
+            SPI_SETMOUSESONAR                   {0x101D castbool}
+            SPI_SETMOUSECLICKLOCK               {0x101F bool}
+            SPI_SETMOUSEVANISH                  {0x1021 castbool}
+            SPI_SETFLATMENU                     {0x1023 castbool}
+            SPI_SETDROPSHADOW                   {0x1025 castbool}
+            SPI_SETBLOCKSENDINPUTRESETS         {0x1027 bool}
+            SPI_SETUIEFFECTS                    {0x103F castbool}
+            SPI_SETFOREGROUNDLOCKTIMEOUT        {0x2001 castint}
+            SPI_SETACTIVEWNDTRKTIMEOUT          {0x2003 castint}
+            SPI_SETFOREGROUNDFLASHCOUNT         {0x2005 castint}
+            SPI_SETCARETWIDTH                   {0x2007 castint}
+            SPI_SETMOUSECLICKLOCKTIME           {0x2009 int}
+            SPI_SETFONTSMOOTHINGTYPE            {0x200B castint}
+            SPI_SETFONTSMOOTHINGCONTRAST        {0x200D unsupported}
+            SPI_SETFOCUSBORDERWIDTH             {0x200F castint}
+            SPI_SETFOCUSBORDERHEIGHT            {0x2011 castint}
+        }
+    }
+
+
+    array set opts [parseargs args {
+        persist
+        notify
+    } -nulldefault]
+
+    set flags 0
+    if {$opts(persist)} {
+        setbits flags 1
+    }
+
+    if {$opts(notify)} {
+        # Note that actually the notify flag has no effect if persist
+        # is not set.
+        setbits flags 2
+    }
+
+    set key [string toupper $uiaction]
+
+    if {![info exists SystemParametersInfo_uiactions_set($key)]} {
+        set key SPI_$key
+        if {![info exists SystemParametersInfo_uiactions_set($key)]} {
+            error "Unknown SystemParametersInfo index symbol '$uiaction'"
+        }
+    }
+
+    lassign $SystemParametersInfo_uiactions_set($key) index fmt
+
+    switch -exact -- $fmt {
+        int  { SystemParametersInfo $index $val NULL $flags }
+        bool {
+            set val [expr {$val ? 1 : 0}]
+            SystemParametersInfo $index $val NULL $flags
+        }
+        castint {
+            # We have to pass the value as a cast pointer
+            SystemParametersInfo $index 0 [Twapi_AddressToPointer $val] $flags
+        }
+        castbool {
+            # We have to pass the value as a cast pointer
+            set val [expr {$val ? 1 : 0}]
+            SystemParametersInfo $index 0 [Twapi_AddressToPointer $val] $flags
+        }
+        default {
+            error "The data format for $uiaction is not currently supported"
+        }
+    }
+
+    return
+}
+
+namespace eval twapi {
+    variable _wts_session_monitors
+    set _wts_session_monitors [dict create]
+}
+
+proc twapi::start_wts_session_monitor {script args} {
+    variable _wts_session_monitors
+
+    parseargs args {
+        all
+    } -maxleftover 0 -setvars
+    set script [lrange $script 0 end]; # Verify syntactically a list
+
+    set id "wts#[TwapiId]"
+    if {[dict size $_wts_session_monitors] == 0} {
+        # No monitoring in progress. Start it
+        # 0x2B1 -> WM_WTSSESSION_CHANGE
+        Twapi_WTSRegisterSessionNotification $all
+        _register_script_wm_handler 0x2B1 [list [namespace current]::_wts_session_change_handler] 0
+    }
+
+    dict set  _wts_session_monitors $id $script
+    return $id
+}
+
+
+proc twapi::stop_wts_session_monitor {id} {
+    variable _wts_session_monitors
+
+    if {![dict exists $_wts_session_monitors $id]} {
+        return
+    }
+
+    dict unset _wts_session_monitors $id
+    if {[dict size $_wts_session_monitors] == 0} {
+        # 0x2B1 -> WM_WTSSESSION_CHANGE
+        _unregister_script_wm_handler 0x2B1 [list [namespace current]::_wts_session_handler]
+        Twapi_WTSUnRegisterSessionNotification
+    }
+}
+
+proc twapi::_wts_session_change_handler {msg change session_id msgpos ticks} {
+    variable _wts_session_monitors
+
+    if {[dict size $_wts_session_monitors] == 0} {
+        return; # Not an error, could have deleted while already queued
+    }
+
+    dict for {id script} $_wts_session_monitors {
+        set code [catch {uplevel #0 [linsert $script end $change $session_id]} msg]
+        if {$code == 1} {
+            # Error - put in background but we do not abort
+            after 0 [list error $msg $::errorInfo $::errorCode]
+        }
+    }
+    return
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/pdh.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/pdh.tcl
new file mode 100644
index 00000000..fadf8817
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/pdh.tcl
@@ -0,0 +1,984 @@
+#
+# Copyright (c) 2003-2014, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {
+}
+
+#
+# Return list of toplevel performance objects
+proc twapi::pdh_enumerate_objects {args} {
+
+    array set opts [parseargs args {
+        datasource.arg
+        machine.arg
+        {detail.arg wizard}
+        refresh
+    } -nulldefault]
+    
+    # TBD - PdhEnumObjects enables the SeDebugPrivilege the first time it
+    # is called. Should we reset it if it was not already enabled?
+    # This seems to only happen on the first call
+
+    return [PdhEnumObjects $opts(datasource) $opts(machine) \
+                [_perf_detail_sym_to_val $opts(detail)] \
+                $opts(refresh)]
+}
+
+proc twapi::_pdh_enumerate_object_items_helper {selector objname args} {
+    array set opts [parseargs args {
+        datasource.arg
+        machine.arg
+        {detail.arg wizard}
+        refresh
+    } -nulldefault]
+    
+    if {$opts(refresh)} {
+        _refresh_perf_objects $opts(machine) $opts(datasource)
+    }
+
+    return [PdhEnumObjectItems $opts(datasource) $opts(machine) \
+                $objname \
+                [_perf_detail_sym_to_val $opts(detail)] \
+                $selector]
+}
+
+interp alias {} twapi::pdh_enumerate_object_items {} twapi::_pdh_enumerate_object_items_helper 0
+interp alias {} twapi::pdh_enumerate_object_counters {} twapi::_pdh_enumerate_object_items_helper 1
+interp alias {} twapi::pdh_enumerate_object_instances {} twapi::_pdh_enumerate_object_items_helper 2
+
+
+#
+# Construct a counter path
+proc twapi::pdh_counter_path {object counter args} {
+    array set opts [parseargs args {
+        machine.arg
+        instance.arg
+        parent.arg
+        {instanceindex.int -1}
+        {localized.bool false}
+    } -nulldefault]
+    
+    if {$opts(instanceindex) == 0} {
+        # For XP. For first instance (index 0), the path should not contain
+        # "#0" but on XP it does. Reset it to -1 for Vista+ consistency
+        set opts(instanceindex) -1
+    }
+
+
+    if {! $opts(localized)} {
+        # Need to localize the counter names
+        set object [_pdh_localize $object]
+        set counter [_pdh_localize $counter]
+        # TBD - not sure we need to localize parent
+        set opts(parent) [_pdh_localize $opts(parent)]
+    }
+
+    # TBD - add options PDH_PATH_WBEM as documented in PdhMakeCounterPath
+    return [PdhMakeCounterPath $opts(machine) $object $opts(instance) \
+                $opts(parent) $opts(instanceindex) $counter 0]
+
+}
+
+#
+# Parse a counter path and return the individual elements
+proc twapi::pdh_parse_counter_path {counter_path} {
+    return [twine {machine object instance parent instanceindex counter} [PdhParseCounterPath $counter_path 0]]
+}
+
+
+interp alias {} twapi::pdh_get_scalar {} twapi::_pdh_get 1
+interp alias {} twapi::pdh_get_array {} twapi::_pdh_get 0
+
+proc twapi::_pdh_get {scalar hcounter args} {
+
+    array set opts [parseargs args {
+        {format.arg large {long large double}}
+        {scale.arg {} {{} none x1000 nocap100}}
+        var.arg
+    } -ignoreunknown -nulldefault]
+    
+    set flags [_pdh_fmt_sym_to_val $opts(format)]
+
+    if {$opts(scale) ne ""} {
+        set flags [expr {$flags | [_pdh_fmt_sym_to_val $opts(scale)]}]
+    }
+
+    set status 1
+    set result ""
+    trap {
+        if {$scalar} {
+            set result [PdhGetFormattedCounterValue $hcounter $flags]
+        } else {
+            set result [PdhGetFormattedCounterArray $hcounter $flags]
+        }
+    } onerror {TWAPI_WIN32 0x800007d1} {
+        # Error is that no such instance exists.
+        # If result is being returned in a variable, then
+        # we will not generate an error but pass back a return value
+        # of 0
+        if {[string length $opts(var)] == 0} {
+            rethrow
+        }
+        set status 0
+    }
+    
+    if {[string length $opts(var)]} {
+        uplevel [list set $opts(var) $result]
+        return $status
+    } else {
+        return $result
+    }
+}
+
+#
+# Get the value of a counter identified by the path.
+# Should not be used to collect
+# rate based options.
+# TBD - document
+proc twapi::pdh_counter_path_value {counter_path args} {
+
+    array set opts [parseargs args {
+        {format.arg long}
+        scale.arg
+        datasource.arg
+        var.arg
+        full.bool
+    } -nulldefault]
+    
+    # Open the query
+    set hquery [pdh_query_open -datasource $opts(datasource)]
+    trap {
+        set hcounter [pdh_add_counter $hquery $counter_path]
+        pdh_query_refresh $hquery
+        if {[string length $opts(var)]} {
+            # Need to pass up value in a variable if so requested
+            upvar $opts(var) myvar
+            set opts(var) myvar
+        }
+        set value [pdh_get_scalar $hcounter -format $opts(format) \
+                       -scale $opts(scale) -full $opts(full) \
+                       -var $opts(var)]
+    } finally {
+        pdh_query_close $hquery
+    }
+
+    return $value
+}
+
+
+#
+# Constructs one or more counter paths for getting process information. 
+# Returned as a list of sublists. Each sublist corresponds to a counter path 
+# and has the form {counteroptionname datatype counterpath rate}
+# datatype is the recommended format when retrieving counter value (eg. double)
+# rate is 0 or 1 depending on whether the counter is a rate based counter or 
+# not (requires at least two readings when getting the value)
+proc twapi::get_perf_process_counter_paths {pids args} {
+    variable _process_counter_opt_map
+
+    if {![info exists _counter_opt_map]} {
+        #  "descriptive string" format rate
+        array set _process_counter_opt_map {
+            privilegedutilization {"% Privileged Time"   double 1}
+            processorutilization  {"% Processor Time"    double 1}
+            userutilization       {"% User Time"         double 1}
+            parent                {"Creating Process ID" long   0}
+            elapsedtime           {"Elapsed Time"        large  0}
+            handlecount           {"Handle Count"        long   0}
+            pid                   {"ID Process"          long   0}
+            iodatabytesrate       {"IO Data Bytes/sec"   large  1}
+            iodataopsrate         {"IO Data Operations/sec"  large 1}
+            iootherbytesrate      {"IO Other Bytes/sec"      large 1}
+            iootheropsrate        {"IO Other Operations/sec" large 1}
+            ioreadbytesrate       {"IO Read Bytes/sec"       large 1}
+            ioreadopsrate         {"IO Read Operations/sec"  large 1}
+            iowritebytesrate      {"IO Write Bytes/sec"      large 1}
+            iowriteopsrate        {"IO Write Operations/sec" large 1}
+            pagefaultrate         {"Page Faults/sec"         large 1}
+            pagefilebytes         {"Page File Bytes"         large 0}
+            pagefilebytespeak     {"Page File Bytes Peak"    large 0}
+            poolnonpagedbytes     {"Pool Nonpaged Bytes"     large 0}
+            poolpagedbytes        {"Pool Paged Bytes"        large 1}
+            basepriority          {"Priority Base"           large 1}
+            privatebytes          {"Private Bytes"           large 1}
+            threadcount           {"Thread Count"            large 1}
+            virtualbytes          {"Virtual Bytes"           large 1}
+            virtualbytespeak      {"Virtual Bytes Peak"      large 1}
+            workingset            {"Working Set"             large 1}
+            workingsetpeak        {"Working Set Peak"        large 1}
+        }
+    }
+
+    set optdefs {
+        machine.arg
+        datasource.arg
+        all
+        refresh
+    }
+
+    # Add counter names to option list
+    foreach cntr [array names _process_counter_opt_map] {
+        lappend optdefs $cntr
+    }
+
+    # Parse options
+    array set opts [parseargs args $optdefs -nulldefault]
+
+    # Force a refresh of object items
+    if {$opts(refresh)} {
+        # Silently ignore. The above counters are predefined and refreshing
+        # is just a time-consuming no-op. Keep the option for backward
+        # compatibility
+        if {0} {
+            _refresh_perf_objects $opts(machine) $opts(datasource)
+        }
+    }
+
+    # TBD - could we not use get_perf_instance_counter_paths instead of rest of this code
+
+    # Get the path to the process.
+    set pid_paths [get_perf_counter_paths \
+                       [_pdh_localize "Process"] \
+                       [list [_pdh_localize "ID Process"]] \
+                       $pids \
+                       -machine $opts(machine) -datasource $opts(datasource) \
+                       -all]
+
+    if {[llength $pid_paths] == 0} {
+        # No thread
+        return [list ]
+    }
+
+    # Construct the requested counter paths
+    set counter_paths [list ]
+    foreach {pid pid_path} $pid_paths {
+
+        # We have to filter out an entry for _Total which might be present
+        # if pid includes "0"
+        # TBD - does _Total need to be localized?
+        if {$pid == 0 && [string match -nocase *_Total\#0* $pid_path]} {
+            continue
+        }
+
+        # Break it down into components and store in array
+        array set path_components [pdh_parse_counter_path $pid_path]
+
+        # Construct counter paths for this pid
+        foreach {opt counter_info} [array get _process_counter_opt_map] {
+            if {$opts(all) || $opts($opt)} {
+                lappend counter_paths \
+                    [list -$opt $pid [lindex $counter_info 1] \
+                         [pdh_counter_path $path_components(object) \
+                              [_pdh_localize [lindex $counter_info 0]] \
+                              -localized true \
+                              -machine $path_components(machine) \
+                              -parent $path_components(parent) \
+                              -instance $path_components(instance) \
+                              -instanceindex $path_components(instanceindex)] \
+                         [lindex $counter_info 2] \
+                        ]
+            }
+        }                        
+    }
+
+    return $counter_paths
+}
+
+
+# Returns the counter path for the process with the given pid. This includes
+# the pid counter path element
+proc twapi::get_perf_process_id_path {pid args} {
+    return [get_unique_counter_path \
+                [_pdh_localize "Process"] \
+                [_pdh_localize "ID Process"] $pid]
+}
+
+
+#
+# Constructs one or more counter paths for getting thread information. 
+# Returned as a list of sublists. Each sublist corresponds to a counter path 
+# and has the form {counteroptionname datatype counterpath rate}
+# datatype is the recommended format when retrieving counter value (eg. double)
+# rate is 0 or 1 depending on whether the counter is a rate based counter or 
+# not (requires at least two readings when getting the value)
+proc twapi::get_perf_thread_counter_paths {tids args} {
+    variable _thread_counter_opt_map
+
+    if {![info exists _thread_counter_opt_map]} {
+        array set _thread_counter_opt_map {
+            privilegedutilization {"% Privileged Time"       double 1}
+            processorutilization  {"% Processor Time"        double 1}
+            userutilization       {"% User Time"             double 1}
+            contextswitchrate     {"Context Switches/sec"    long 1}
+            elapsedtime           {"Elapsed Time"            large 0}
+            pid                   {"ID Process"              long 0}
+            tid                   {"ID Thread"               long 0}
+            basepriority          {"Priority Base"           long 0}
+            priority              {"Priority Current"        long 0}
+            startaddress          {"Start Address"           large 0}
+            state                 {"Thread State"            long 0}
+            waitreason            {"Thread Wait Reason"      long 0}
+        }
+    }
+
+    set optdefs {
+        machine.arg
+        datasource.arg
+        all
+        refresh
+    }
+
+    # Add counter names to option list
+    foreach cntr [array names _thread_counter_opt_map] {
+        lappend optdefs $cntr
+    }
+
+    # Parse options
+    array set opts [parseargs args $optdefs -nulldefault]
+
+    # Force a refresh of object items
+    if {$opts(refresh)} {
+        # Silently ignore. The above counters are predefined and refreshing
+        # is just a time-consuming no-op. Keep the option for backward
+        # compatibility
+        if {0} {
+            _refresh_perf_objects $opts(machine) $opts(datasource)
+        }
+    }
+
+    # TBD - could we not use get_perf_instance_counter_paths instead of rest of this code
+
+    # Get the path to the thread
+    set tid_paths [get_perf_counter_paths \
+                       [_pdh_localize "Thread"] \
+                       [list [_pdh_localize "ID Thread"]] \
+                       $tids \
+                      -machine $opts(machine) -datasource $opts(datasource) \
+                      -all]
+    
+    if {[llength $tid_paths] == 0} {
+        # No thread
+        return [list ]
+    }
+
+    # Now construct the requested counter paths
+    set counter_paths [list ]
+    foreach {tid tid_path} $tid_paths {
+        # Break it down into components and store in array
+        array set path_components [pdh_parse_counter_path $tid_path]
+        foreach {opt counter_info} [array get _thread_counter_opt_map] {
+            if {$opts(all) || $opts($opt)} {
+                lappend counter_paths \
+                    [list -$opt $tid [lindex $counter_info 1] \
+                         [pdh_counter_path $path_components(object) \
+                              [_pdh_localize [lindex $counter_info 0]] \
+                              -localized true \
+                              -machine $path_components(machine) \
+                              -parent $path_components(parent) \
+                              -instance $path_components(instance) \
+                              -instanceindex $path_components(instanceindex)] \
+                         [lindex $counter_info 2]
+                    ]
+            }
+        }                            
+    }
+
+    return $counter_paths
+}
+
+
+# Returns the counter path for the thread with the given tid. This includes
+# the tid counter path element
+proc twapi::get_perf_thread_id_path {tid args} {
+
+    return [get_unique_counter_path [_pdh_localize"Thread"] [_pdh_localize "ID Thread"] $tid]
+}
+
+
+#
+# Constructs one or more counter paths for getting processor information. 
+# Returned as a list of sublists. Each sublist corresponds to a counter path 
+# and has the form {counteroptionname datatype counterpath rate}
+# datatype is the recommended format when retrieving counter value (eg. double)
+# rate is 0 or 1 depending on whether the counter is a rate based counter or 
+# not (requires at least two readings when getting the value)
+# $processor should be the processor number or "" to get total
+proc twapi::get_perf_processor_counter_paths {processor args} {
+    variable _processor_counter_opt_map
+
+    if {![string is integer -strict $processor]} {
+        if {[string length $processor]} {
+            error "Processor id must be an integer or null to retrieve information for all processors"
+        }
+        set processor "_Total"
+    }
+
+    if {![info exists _processor_counter_opt_map]} {
+        array set _processor_counter_opt_map {
+            dpcutilization        {"% DPC Time"              double 1}
+            interruptutilization  {"% Interrupt Time"        double 1}
+            privilegedutilization {"% Privileged Time"       double 1}
+            processorutilization  {"% Processor Time"        double 1}
+            userutilization       {"% User Time"             double 1}
+            dpcrate               {"DPC Rate"                double 1}
+            dpcqueuerate          {"DPCs Queued/sec"         double 1}
+            interruptrate         {"Interrupts/sec"          double 1}
+        }
+    }
+
+    set optdefs {
+        machine.arg
+        datasource.arg
+        all
+        refresh
+    }
+
+    # Add counter names to option list
+    foreach cntr [array names _processor_counter_opt_map] {
+        lappend optdefs $cntr
+    }
+
+    # Parse options
+    array set opts [parseargs args $optdefs -nulldefault -maxleftover 0]
+
+    # Force a refresh of object items
+    if {$opts(refresh)} {
+        # Silently ignore. The above counters are predefined and refreshing
+        # is just a time-consuming no-op. Keep the option for backward
+        # compatibility
+        if {0} {
+            _refresh_perf_objects $opts(machine) $opts(datasource)
+        }
+    }
+
+    # Now construct the requested counter paths
+    set counter_paths [list ]
+    foreach {opt counter_info} [array get _processor_counter_opt_map] {
+        if {$opts(all) || $opts($opt)} {
+            lappend counter_paths \
+                [list $opt $processor [lindex $counter_info 1] \
+                     [pdh_counter_path \
+                          [_pdh_localize "Processor"] \
+                          [_pdh_localize [lindex $counter_info 0]] \
+                          -localized true \
+                          -machine $opts(machine) \
+                          -instance $processor] \
+                     [lindex $counter_info 2] \
+                    ]
+        }
+    }
+
+    return $counter_paths
+}
+
+
+
+#
+# Returns a list comprising of the counter paths for counters with
+# names in the list $counters from those instance(s) whose counter
+# $key_counter matches the specified $key_counter_value
+proc twapi::get_perf_instance_counter_paths {object counters
+                                             key_counter key_counter_values
+                                             args} {
+    # Parse options
+    array set opts [parseargs args {
+        machine.arg
+        datasource.arg
+        {matchop.arg "exact"}
+        skiptotal.bool
+        refresh
+    } -nulldefault]
+
+    # Force a refresh of object items
+    if {$opts(refresh)} {
+        _refresh_perf_objects $opts(machine) $opts(datasource)
+    }
+
+    # Get the list of instances that have the specified value for the
+    # key counter
+    set instance_paths [get_perf_counter_paths $object \
+                            [list $key_counter] $key_counter_values \
+                            -machine $opts(machine) \
+                            -datasource $opts(datasource) \
+                            -matchop $opts(matchop) \
+                            -skiptotal $opts(skiptotal) \
+                            -all]
+
+    # Loop through all instance paths, and all counters to generate 
+    # We store in an array to get rid of duplicates
+    array set counter_paths {}
+    foreach {key_counter_value instance_path} $instance_paths {
+        # Break it down into components and store in array
+        array set path_components [pdh_parse_counter_path $instance_path]
+
+        # Now construct the requested counter paths
+        # TBD - what should -localized be here ?
+        foreach counter $counters {
+            set counter_path \
+                [pdh_counter_path $path_components(object) \
+                     $counter \
+                     -localized true \
+                     -machine $path_components(machine) \
+                     -parent $path_components(parent) \
+                     -instance $path_components(instance) \
+                     -instanceindex $path_components(instanceindex)]
+            set counter_paths($counter_path) ""
+        }                            
+    }
+
+    return [array names counter_paths]
+
+
+}
+
+
+#
+# Returns a list comprising of the counter paths for all counters
+# whose values match the specified criteria
+proc twapi::get_perf_counter_paths {object counters counter_values args} {
+    array set opts [parseargs args {
+        machine.arg
+        datasource.arg
+        {matchop.arg "exact"}
+        skiptotal.bool
+        all
+        refresh
+    } -nulldefault]
+
+    if {$opts(refresh)} {
+        _refresh_perf_objects $opts(machine) $opts(datasource)
+    }
+
+    set items [pdh_enum_object_items $object \
+                   -machine $opts(machine) \
+                   -datasource $opts(datasource)]
+    lassign $items object_counters object_instances
+
+    if {[llength $counters]} {
+        set object_counters $counters
+    }
+    set paths [_make_counter_path_list \
+                   $object $object_instances $object_counters \
+                   -skiptotal $opts(skiptotal) -machine $opts(machine)]
+    set result_paths [list ]
+    trap {
+        # Set up the query with the process id for all processes
+        set hquery [pdh_query_open -datasource $opts(datasource)]
+        foreach path $paths {
+            set hcounter [pdh_add_counter $hquery $path]
+            set lookup($hcounter) $path
+        }
+
+        # Now collect the info
+        pdh_query_refresh $hquery
+        
+        # Now lookup each counter value to find a matching one
+        foreach hcounter [array names lookup] {
+            if {! [pdh_get_scalar $hcounter -var value]} {
+                # Counter or instance no longer exists
+                continue
+            }
+
+            set match_pos [lsearch -$opts(matchop) $counter_values $value]
+            if {$match_pos >= 0} {
+                lappend result_paths \
+                    [lindex $counter_values $match_pos] $lookup($hcounter)
+                if {! $opts(all)} {
+                    break
+                }
+            }
+        }
+    } finally {
+        # TBD - should we have a catch to throw errors?
+        pdh_query_close $hquery
+    }
+
+    return $result_paths
+}
+
+
+#
+# Returns the counter path for counter $counter with a value $value
+# for object $object. Returns "" on no matches but exception if more than one
+proc twapi::get_unique_counter_path {object counter value args} {
+    set matches [get_perf_counter_paths $object [list $counter ] [list $value] {*}$args -all]
+    if {[llength $matches] > 1} {
+        error "Multiple counter paths found matching criteria object='$object' counter='$counter' value='$value"
+    }
+    return [lindex $matches 0]
+}
+
+
+
+#
+# Utilities
+# 
+proc twapi::_refresh_perf_objects {machine datasource} {
+    pdh_enumerate_objects -refresh
+    return
+}
+
+
+#
+# Return the localized form of a counter name
+# TBD - assumes machine is local machine!
+proc twapi::_pdh_localize {name} {
+    variable _perf_counter_ids
+    variable _localized_perf_counter_names
+    
+    set name_index [string tolower $name]
+
+    # If we already have a translation, return it
+    if {[info exists _localized_perf_counter_names($name_index)]} {
+        return $_localized_perf_counter_names($name_index)
+    }
+
+    # Didn't already have it. Go generate the mappings
+
+    # Get the list of counter names in English if we don't already have it
+    if {![info exists _perf_counter_ids]} {
+        foreach {id label} [registry get {HKEY_PERFORMANCE_DATA} {Counter 009}] {
+            set _perf_counter_ids([string tolower $label]) $id
+        }
+    }
+
+    # If we have do not have id for the given name, we will just use
+    # the passed name as the localized version
+    if {! [info exists _perf_counter_ids($name_index)]} {
+        # Does not seem to exist. Just set localized name to itself
+        return [set _localized_perf_counter_names($name_index) $name]
+    }
+
+    # We do have an id. THen try to get a translated name
+    if {[catch {PdhLookupPerfNameByIndex "" $_perf_counter_ids($name_index)} xname]} {
+        set _localized_perf_counter_names($name_index) $name
+    } else {
+        set _localized_perf_counter_names($name_index) $xname
+    }
+
+    return $_localized_perf_counter_names($name_index)
+}
+
+
+# Given a list of instances and counters, return a cross product of the 
+# corresponding counter paths.
+# The list is expected to be already localized
+# Example: _make_counter_path_list "Process" (instance list) {{ID Process} {...}}
+# TBD - bug - does not handle -parent in counter path
+proc twapi::_make_counter_path_list {object instance_list counter_list args} {
+    array set opts [parseargs args {
+        machine.arg
+        skiptotal.bool
+    } -nulldefault]
+
+    array set instances {}
+    foreach instance $instance_list {
+        if {![info exists instances($instance)]} {
+            set instances($instance) 1
+        } else {
+            incr instances($instance)
+        }
+    }
+
+    if {$opts(skiptotal)} {
+        catch {array unset instances "*_Total"}
+    }
+
+    set counter_paths [list ]
+    foreach {instance count} [array get instances] {
+        while {$count} {
+            incr count -1
+            foreach counter $counter_list {
+                lappend counter_paths [pdh_counter_path \
+                                           $object $counter \
+                                           -localized true \
+                                           -machine $opts(machine) \
+                                           -instance $instance \
+                                           -instanceindex $count]
+            }
+        }
+    }
+
+    return $counter_paths
+}
+
+
+#
+# Given a set of counter paths in the format returned by 
+# get_perf_thread_counter_paths, get_perf_processor_counter_paths etc.
+# return the counter information as a flat list of field value pairs
+proc twapi::get_perf_values_from_metacounter_info {metacounters args} {
+    array set opts [parseargs args {{interval.int 100}}]
+
+    set result [list ]
+    set counters [list ]
+    if {[llength $metacounters]} {
+        set hquery [pdh_query_open]
+        trap {
+            set counter_info [list ]
+            set need_wait 0
+            foreach counter_elem $metacounters {
+                lassign $counter_elem pdh_opt key data_type counter_path wait
+                incr need_wait $wait
+                set hcounter [pdh_add_counter $hquery $counter_path]
+                lappend counters $hcounter
+                lappend counter_info $pdh_opt $key $counter_path $data_type $hcounter
+            }
+            
+            pdh_query_refresh $hquery
+            if {$need_wait} {
+                after $opts(interval)
+                pdh_query_refresh $hquery
+            }
+            
+            foreach {pdh_opt key counter_path data_type hcounter} $counter_info {
+                if {[pdh_get_scalar $hcounter -format $data_type -var value]} {
+                    lappend result $pdh_opt $key $value
+                }
+            }
+        } onerror {} {
+            #puts "Error: $msg"
+        } finally {
+            pdh_query_close $hquery
+        }
+    }
+
+    return $result
+
+}
+
+proc twapi::pdh_query_open {args} {
+    variable _pdh_queries
+
+    array set opts [parseargs args {
+        datasource.arg
+        cookie.int
+    } -nulldefault]
+
+    set qh [PdhOpenQuery $opts(datasource) $opts(cookie)]
+    set id pdh[TwapiId]
+    dict set _pdh_queries($id) Qh $qh
+    dict set _pdh_queries($id) Counters {}
+    dict set _pdh_queries($id) Meta {}
+    return $id
+}
+
+proc twapi::pdh_query_refresh {qid args} {
+    variable _pdh_queries
+    _pdh_query_check $qid
+    PdhCollectQueryData [dict get $_pdh_queries($qid) Qh]
+    return
+}
+
+proc twapi::pdh_query_close {qid} {
+    variable _pdh_queries
+    _pdh_query_check $qid
+
+    dict for {ctrh -} [dict get $_pdh_queries($qid) Counters] {
+        PdhRemoveCounter $ctrh
+    }
+
+    PdhCloseQuery [dict get $_pdh_queries($qid) Qh]
+    unset _pdh_queries($qid)
+}
+
+proc twapi::pdh_add_counter {qid ctr_path args} {
+    variable _pdh_queries
+
+    _pdh_query_check $qid
+
+    parseargs args {
+        {format.arg large {long large double}}
+        {scale.arg {} {{} none x1000 nocap100}}
+        name.arg
+        cookie.int
+        array.bool
+    } -nulldefault -maxleftover 0 -setvars
+    
+    if {$name eq ""} {
+        set name $ctr_path
+    }
+
+    if {[dict exists $_pdh_queries($qid) Meta $name]} {
+        error "A counter with name \"$name\" already present in the query."
+    }
+
+    set flags [_pdh_fmt_sym_to_val $format]
+
+    if {$scale ne ""} {
+        set flags [expr {$flags | [_pdh_fmt_sym_to_val $scale]}]
+    }
+
+    set hctr [PdhAddCounter [dict get $_pdh_queries($qid) Qh] $ctr_path $flags]
+    dict set _pdh_queries($qid) Counters $hctr 1
+    dict set _pdh_queries($qid) Meta $name [list Counter $hctr FmtFlags $flags Array $array]
+
+    return $hctr
+}
+
+proc twapi::pdh_remove_counter {qid ctrname} {
+    variable _pdh_queries
+    _pdh_query_check $qid
+    if {![dict exists $_pdh_queries($qid) Meta $ctrname]} {
+        badargs! "Counter \"$ctrname\" not present in query."
+    }
+    set hctr [dict get $_pdh_queries($qid) Meta $ctrname Counter]
+    dict unset _pdh_queries($qid) Counters $hctr
+    dict unset _pdh_queries($qid) Meta $ctrname
+    PdhRemoveCounter $hctr
+    return
+}
+
+proc twapi::pdh_query_get {qid args} {
+    variable _pdh_queries
+
+    _pdh_query_check $qid
+
+    # Refresh the data
+    PdhCollectQueryData [dict get $_pdh_queries($qid) Qh]
+
+    set meta [dict get $_pdh_queries($qid) Meta]
+
+    if {[llength $args] != 0} {
+        set names $args
+    } else {
+        set names [dict keys $meta]
+    }        
+
+    set result {}
+    foreach name $names {
+        if {[dict get $meta $name Array]} {
+		lappend result $name [PdhGetFormattedCounterArray [dict get $meta $name Counter] [dict get $meta $name FmtFlags]]
+	} else {
+		lappend result $name [PdhGetFormattedCounterValue [dict get $meta $name Counter] [dict get $meta $name FmtFlags]]
+	}
+    }
+
+    return $result
+}
+
+twapi::proc* twapi::pdh_system_performance_query args {
+    variable _sysperf_defs
+
+    set _sysperf_defs {
+        event_count { {Objects Events} {} }
+        mutex_count { {Objects Mutexes} {} }
+        process_count { {Objects Processes} {} }
+        section_count { {Objects Sections} {} }
+        semaphore_count { {Objects Semaphores} {} }
+        thread_count { {Objects Threads} {} }
+        handle_count { {Process "Handle Count" -instance _Total} {-format long} }
+        commit_limit { {Memory "Commit Limit"} {} }
+        committed_bytes { {Memory "Committed Bytes"} {} }
+        committed_percent { {Memory "% Committed Bytes In Use"} {-format double} }
+        memory_free_mb { {Memory "Available MBytes"} {} }
+        memory_free_kb { {Memory "Available KBytes"} {} }
+        page_fault_rate { {Memory "Page Faults/sec"} {} }
+        page_input_rate { {Memory "Pages Input/sec"} {} }
+        page_output_rate { {Memory "Pages Output/sec"} {} }
+
+        disk_bytes_rate { {PhysicalDisk "Disk Bytes/sec" -instance _Total} {} }
+        disk_readbytes_rate { {PhysicalDisk "Disk Read Bytes/sec" -instance _Total} {} }
+        disk_writebytes_rate { {PhysicalDisk "Disk Write Bytes/sec" -instance _Total} {} }
+        disk_transfer_rate { {PhysicalDisk "Disk Transfers/sec" -instance _Total} {} }
+        disk_read_rate { {PhysicalDisk "Disk Reads/sec" -instance _Total} {} }
+        disk_write_rate { {PhysicalDisk "Disk Writes/sec" -instance _Total} {} }
+        disk_idle_percent { {PhysicalDisk "% Idle Time" -instance _Total} {-format double} }
+    }
+
+    # Per-processor counters are based on above but the object name depends
+    # on the system in order to support > 64 processors
+    set obj_name [expr {[min_os_version 6 1] ? "Processor Information" : "Processor"}]
+    dict for {key ctr_name} {
+        interrupt_utilization "% Interrupt Time"
+        privileged_utilization "% Privileged Time"
+        processor_utilization  "% Processor Time"
+        user_utilization "% User Time"
+        idle_utilization "% Idle Time"
+    } {
+        lappend _sysperf_defs $key \
+            [list \
+                 [list $obj_name $ctr_name -instance _Total] \
+                 [list -format double]]
+
+        lappend _sysperf_defs ${key}_per_cpu \
+            [list \
+                 [list $obj_name $ctr_name -instance *] \
+                 [list -format double -array 1]]
+    }
+} {
+    variable _sysperf_defs
+
+    if {[llength $args] == 0} {
+        return [lsort -dictionary [dict keys $_sysperf_defs]]
+    }
+
+    set qid [pdh_query_open]
+    trap {
+        foreach arg $args {
+            set def [dict! $_sysperf_defs $arg]
+            set ctr_path [pdh_counter_path {*}[lindex $def 0]]
+            pdh_add_counter $qid $ctr_path -name $arg {*}[lindex $def 1]
+        }
+        pdh_query_refresh $qid
+    } onerror {} {
+        pdh_query_close $qid
+        rethrow
+    }
+
+    return $qid
+}
+
+#
+# Internal utility procedures
+proc twapi::_pdh_query_check {qid} {
+    variable _pdh_queries 
+
+    if {![info exists _pdh_queries($qid)]} {
+        error "Invalid query id $qid"
+    }
+}
+
+proc twapi::_perf_detail_sym_to_val {sym} {
+    # PERF_DETAIL_NOVICE          100
+    # PERF_DETAIL_ADVANCED        200
+    # PERF_DETAIL_EXPERT          300
+    # PERF_DETAIL_WIZARD          400
+    # PERF_DETAIL_COSTLY   0x00010000
+    # PERF_DETAIL_STANDARD 0x0000FFFF
+
+    return [dict get {novice 100 advanced 200 expert 300 wizard 400 costly 0x00010000 standard 0x0000ffff } $sym]
+}
+
+
+proc twapi::_pdh_fmt_sym_to_val {sym} {
+    # PDH_FMT_RAW     0x00000010
+    # PDH_FMT_ANSI    0x00000020
+    # PDH_FMT_UNICODE 0x00000040
+    # PDH_FMT_LONG    0x00000100
+    # PDH_FMT_DOUBLE  0x00000200
+    # PDH_FMT_LARGE   0x00000400
+    # PDH_FMT_NOSCALE 0x00001000
+    # PDH_FMT_1000    0x00002000
+    # PDH_FMT_NODATA  0x00004000
+    # PDH_FMT_NOCAP100 0x00008000
+
+    return [dict get {
+        raw     0x00000010
+        ansi    0x00000020
+        unicode 0x00000040
+        long    0x00000100
+        double  0x00000200
+        large   0x00000400
+        noscale 0x00001000
+        none    0x00001000
+        1000     0x00002000
+        x1000    0x00002000
+        nodata  0x00004000
+        nocap100 0x00008000
+        nocap 0x00008000
+    } $sym]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/pkgIndex.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/pkgIndex.tcl
new file mode 100644
index 00000000..1fc7471d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/pkgIndex.tcl
@@ -0,0 +1,119 @@
+#
+# Tcl package index file
+#
+
+namespace eval twapi {
+    variable scriptdir
+    proc set_scriptdir dir {variable scriptdir ; set scriptdir $dir}
+}
+
+package ifneeded twapi_base 4.7.2 \
+  [list load [file join $dir twapi472.dll] twapi_base]
+package ifneeded twapi_com 4.7.2 \
+  {load {} twapi_com}
+package ifneeded metoo 4.7.2 \
+  [list source [file join $dir metoo.tcl]]
+package ifneeded twapi_com 4.7.2 \
+  {load {} twapi_com}
+package ifneeded twapi_msi 4.7.2 \
+  [list source [file join $dir msi.tcl]]
+package ifneeded twapi_power 4.7.2 \
+  [list source [file join $dir power.tcl]]
+package ifneeded twapi_printer 4.7.2 \
+  [list source [file join $dir printer.tcl]]
+package ifneeded twapi_synch 4.7.2 \
+  [list source [file join $dir synch.tcl]]
+package ifneeded twapi_security 4.7.2 \
+  {load {} twapi_security}
+package ifneeded twapi_account 4.7.2 \
+  {load {} twapi_account}
+package ifneeded twapi_apputil 4.7.2 \
+  {load {} twapi_apputil}
+package ifneeded twapi_clipboard 4.7.2 \
+  {load {} twapi_clipboard}
+package ifneeded twapi_console 4.7.2 \
+  {load {} twapi_console}
+package ifneeded twapi_crypto 4.7.2 \
+  {load {} twapi_crypto}
+package ifneeded twapi_device 4.7.2 \
+  {load {} twapi_device}
+package ifneeded twapi_etw 4.7.2 \
+  {load {} twapi_etw}
+package ifneeded twapi_eventlog 4.7.2 \
+  {load {} twapi_eventlog}
+package ifneeded twapi_mstask 4.7.2 \
+  {load {} twapi_mstask}
+package ifneeded twapi_multimedia 4.7.2 \
+  {load {} twapi_multimedia}
+package ifneeded twapi_namedpipe 4.7.2 \
+  {load {} twapi_namedpipe}
+package ifneeded twapi_network 4.7.2 \
+  {load {} twapi_network}
+package ifneeded twapi_nls 4.7.2 \
+  {load {} twapi_nls}
+package ifneeded twapi_os 4.7.2 \
+  {load {} twapi_os}
+package ifneeded twapi_pdh 4.7.2 \
+  {load {} twapi_pdh}
+package ifneeded twapi_process 4.7.2 \
+  {load {} twapi_process}
+package ifneeded twapi_rds 4.7.2 \
+  {load {} twapi_rds}
+package ifneeded twapi_resource 4.7.2 \
+  {load {} twapi_resource}
+package ifneeded twapi_service 4.7.2 \
+  {load {} twapi_service}
+package ifneeded twapi_share 4.7.2 \
+  {load {} twapi_share}
+package ifneeded twapi_shell 4.7.2 \
+  {load {} twapi_shell}
+package ifneeded twapi_storage 4.7.2 \
+  {load {} twapi_storage}
+package ifneeded twapi_ui 4.7.2 \
+  {load {} twapi_ui}
+package ifneeded twapi_input 4.7.2 \
+  {load {} twapi_input}
+package ifneeded twapi_winsta 4.7.2 \
+  {load {} twapi_winsta}
+package ifneeded twapi_wmi 4.7.2 \
+  {load {} twapi_wmi}
+
+package ifneeded twapi 4.7.2 [subst {
+  twapi::set_scriptdir [list $dir]
+  package require twapi_base 4.7.2
+  source [list [file join $dir twapi_entry.tcl]]
+  package require metoo 4.7.2
+  package require twapi_com 4.7.2
+  package require twapi_msi 4.7.2
+  package require twapi_power 4.7.2
+  package require twapi_printer 4.7.2
+  package require twapi_synch 4.7.2
+  package require twapi_security 4.7.2
+  package require twapi_account 4.7.2
+  package require twapi_apputil 4.7.2
+  package require twapi_clipboard 4.7.2
+  package require twapi_console 4.7.2
+  package require twapi_crypto 4.7.2
+  package require twapi_device 4.7.2
+  package require twapi_etw 4.7.2
+  package require twapi_eventlog 4.7.2
+  package require twapi_mstask 4.7.2
+  package require twapi_multimedia 4.7.2
+  package require twapi_namedpipe 4.7.2
+  package require twapi_network 4.7.2
+  package require twapi_nls 4.7.2
+  package require twapi_os 4.7.2
+  package require twapi_pdh 4.7.2
+  package require twapi_process 4.7.2
+  package require twapi_rds 4.7.2
+  package require twapi_resource 4.7.2
+  package require twapi_service 4.7.2
+  package require twapi_share 4.7.2
+  package require twapi_shell 4.7.2
+  package require twapi_storage 4.7.2
+  package require twapi_ui 4.7.2
+  package require twapi_input 4.7.2
+  package require twapi_winsta 4.7.2
+  package require twapi_wmi 4.7.2
+  package provide twapi 4.7.2
+}]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/power.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/power.tcl
new file mode 100644
index 00000000..f8a793c1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/power.tcl
@@ -0,0 +1,136 @@
+#
+# Copyright (c) 2003-2012 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {
+    variable _power_monitors
+    set _power_monitors [dict create]
+}
+
+# Get the power status of the system
+proc twapi::get_power_status {} {
+    lassign  [GetSystemPowerStatus] ac battery lifepercent reserved lifetime fulllifetime
+
+    set acstatus unknown
+    if {$ac == 0} {
+        set acstatus off
+    } elseif {$ac == 1} {
+        # Note only value 1 is "on", not just any non-0 value
+        set acstatus on
+    }
+
+    set batterycharging unknown
+    if {$battery == -1} {
+        set batterystate unknown
+    } elseif {$battery & 128} {
+        set batterystate notpresent;  # No battery
+    } else {
+        if {$battery & 8} {
+            set batterycharging true
+        } else {
+            set batterycharging false
+        }
+        if {$battery & 4} {
+            set batterystate critical
+        } elseif {$battery & 2} {
+            set batterystate low
+        } else {
+            set batterystate high
+        }
+    }
+
+    set batterylifepercent unknown
+    if {$lifepercent >= 0 && $lifepercent <= 100} {
+        set batterylifepercent $lifepercent
+    }
+
+    set batterylifetime $lifetime
+    if {$lifetime == -1} {
+        set batterylifetime unknown
+    }
+
+    set batteryfulllifetime $fulllifetime
+    if {$fulllifetime == -1} {
+        set batteryfulllifetime unknown
+    }
+
+    return [kl_create2 {
+        -acstatus
+        -batterystate
+        -batterycharging
+        -batterylifepercent
+        -batterylifetime
+        -batteryfulllifetime
+    } [list $acstatus $batterystate $batterycharging $batterylifepercent $batterylifetime $batteryfulllifetime]]
+}
+
+
+# Power notification callback
+proc twapi::_power_handler {msg power_event lparam msgpos ticks} {
+    variable _power_monitors
+
+    if {[dict size $_power_monitors] == 0} {
+        return; # Not an error, could have deleted while already queued
+    }
+
+    if {![kl_vget {
+        0 apmquerysuspend
+        2 apmquerysuspendfailed
+        4 apmsuspend
+        6 apmresumecritical
+        7 apmresumesuspend
+        9 apmbatterylow
+        10 apmpowerstatuschange
+        11 apmoemevent
+        18 apmresumeautomatic
+    } $power_event power_event]} {
+        return;                 # Do not support this event
+    }
+
+    dict for {id script} $_power_monitors {
+        set code [catch {uplevel #0 [linsert $script end $power_event $lparam]} msg]
+        if {$code == 1} {
+            # Error - put in background but we do not abort
+            after 0 [list error $msg $::errorInfo $::errorCode]
+        }
+    }
+    return
+}
+
+proc twapi::start_power_monitor {script} {
+    variable _power_monitors
+
+    set script [lrange $script 0 end]; # Verify syntactically a list
+
+    set id "power#[TwapiId]"
+    if {[dict size $_power_monitors] == 0} {
+        # No power monitoring in progress. Start it
+        # 0x218 -> WM_POWERBROADCAST
+        _register_script_wm_handler 0x218 [list [namespace current]::_power_handler] 1
+    }
+
+    dict set  _power_monitors $id $script
+    return $id
+}
+
+
+# Stop monitoring of the power
+proc twapi::stop_power_monitor {id} {
+    variable _power_monitors
+
+    if {![dict exists $_power_monitors $id]} {
+        return
+    }
+
+    dict unset _power_monitors $id
+    if {[dict size $_power_monitors] == 0} {
+        _unregister_script_wm_handler 0x218 [list [namespace current]::_power_handler]
+    }
+}
+
+# Hack to work with the various build configuration.
+if {[info commands ::twapi::get_version] ne ""} {
+    package provide twapi_power [::twapi::get_version -patchlevel]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/printer.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/printer.tcl
new file mode 100644
index 00000000..d73af00d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/printer.tcl
@@ -0,0 +1,58 @@
+#
+# Copyright (c) 2004-2006 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {}
+
+proc twapi::enumerate_printers {args} {
+    array set opts [parseargs args {
+        {proximity.arg all {local remote all any}}
+    } -maxleftover 0]
+
+    set result [list ]
+    foreach elem [Twapi_EnumPrinters_Level4 \
+                      [string map {all 6 any 6 local 2 remote 4} $opts(proximity)] \
+                     ] {
+        lappend result [list [lindex $elem 0] [lindex $elem 1] \
+                            [_symbolize_printer_attributes [lindex $elem 2]]]
+    }
+    return [list {-name -server -attrs} $result]
+}
+
+
+# Utilities
+# 
+proc twapi::_symbolize_printer_attributes {attr} {
+    return [_make_symbolic_bitmask $attr {
+        queued         0x00000001
+        direct         0x00000002
+        default        0x00000004
+        shared         0x00000008
+        network        0x00000010
+        hidden         0x00000020
+        local          0x00000040
+        enabledevq      0x00000080
+        keepprintedjobs 0x00000100
+        docompletefirst 0x00000200
+        workoffline    0x00000400
+        enablebidi     0x00000800
+        rawonly        0x00001000
+        published      0x00002000
+        fax            0x00004000
+        ts             0x00008000
+        pusheduser     0x00020000
+        pushedmachine  0x00040000
+        machine        0x00080000
+        friendlyname   0x00100000
+        tsgenericdriver 0x00200000
+        peruser        0x00400000
+        enterprisecloud 0x00800000
+    }]
+}
+
+# Hack to work with the various build configuration.
+if {[info commands ::twapi::get_version] ne ""} {
+    package provide twapi_printer [::twapi::get_version -patchlevel]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/process.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/process.tcl
new file mode 100644
index 00000000..5f37800b
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/process.tcl
@@ -0,0 +1,2028 @@
+#
+# Copyright (c) 2003-2020, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {}
+
+
+# Create a process
+# TBD Use https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/
+# to construct -cmdline value
+proc twapi::create_process {path args} {
+    array set opts [parseargs args {
+        {debugchildtree.bool  0 0x1}
+        {debugchild.bool      0 0x2}
+        {createsuspended.bool 0 0x4}
+        {detached.bool        0 0x8}
+        {newconsole.bool      0 0x10}
+        {newprocessgroup.bool 0 0x200}
+        {separatevdm.bool     0 0x800}
+        {sharedvdm.bool       0 0x1000}
+        {inheriterrormode.bool 1 0x04000000}
+        {noconsole.bool       0 0x08000000}
+        {priority.arg normal {normal abovenormal belownormal high realtime idle}}
+
+        {feedbackcursoron.bool  0 0x40}
+        {feedbackcursoroff.bool 0 0x80}
+        {fullscreen.bool        0 0x20}
+
+        {cmdline.arg ""}
+        {inheritablechildprocess.bool 0}
+        {inheritablechildthread.bool 0}
+        {childprocesssecd.arg ""}
+        {childthreadsecd.arg ""}
+        {inherithandles.bool 0}
+        {env.arg ""}
+        {startdir.arg ""}
+        {desktop.arg __null__}
+        {title.arg ""}
+        windowpos.arg
+        windowsize.arg
+        screenbuffersize.arg
+        background.arg
+        foreground.arg
+        {showwindow.arg ""}
+        {stdhandles.arg ""}
+        {stdchannels.arg ""}
+        {returnhandles.bool 0}
+
+        token.arg
+    } -maxleftover 0]
+
+    set process_sec_attr [_make_secattr $opts(childprocesssecd) $opts(inheritablechildprocess)]
+    set thread_sec_attr [_make_secattr $opts(childthreadsecd) $opts(inheritablechildthread)]
+
+    # Check incompatible options
+    if {$opts(newconsole) && $opts(detached)} {
+        error "Options -newconsole and -detached cannot be specified together"
+    }
+    if {$opts(sharedvdm) && $opts(separatevdm)} {
+        error "Options -sharedvdm and -separatevdm cannot be specified together"
+    }
+
+    # Create the start up info structure
+    set si_flags 0
+    if {[info exists opts(windowpos)]} {
+        lassign [_parse_integer_pair $opts(windowpos)] xpos ypos
+        setbits si_flags 0x4
+    } else {
+        set xpos 0
+        set ypos 0
+    }
+    if {[info exists opts(windowsize)]} {
+        lassign [_parse_integer_pair $opts(windowsize)] xsize ysize
+        setbits si_flags 0x2
+    } else {
+        set xsize 0
+        set ysize 0
+    }
+    if {[info exists opts(screenbuffersize)]} {
+        lassign [_parse_integer_pair $opts(screenbuffersize)] xscreen yscreen
+        setbits si_flags 0x8
+    } else {
+        set xscreen 0
+        set yscreen 0
+    }
+
+    set fg 7;                           # Default to white
+    set bg 0;                           # Default to black
+    if {[info exists opts(foreground)]} {
+        set fg [_map_console_color $opts(foreground) 0]
+        setbits si_flags 0x10
+    }
+    if {[info exists opts(background)]} {
+        set bg [_map_console_color $opts(background) 1]
+        setbits si_flags 0x10
+    }
+
+    set si_flags [expr {$si_flags |
+                        $opts(feedbackcursoron) | $opts(feedbackcursoroff) |
+                        $opts(fullscreen)}]
+
+    switch -exact -- $opts(showwindow) {
+        ""        {set opts(showwindow) 1 }
+        hidden    {set opts(showwindow) 0}
+        normal    {set opts(showwindow) 1}
+        minimized {set opts(showwindow) 2}
+        maximized {set opts(showwindow) 3}
+        default   {error "Invalid value '$opts(showwindow)' for -showwindow option"}
+    }
+    if {[string length $opts(showwindow)]} {
+        setbits si_flags 0x1
+    }
+
+    if {[llength $opts(stdhandles)] && [llength $opts(stdchannels)]} {
+        error "Options -stdhandles and -stdchannels cannot be used together"
+    }
+
+    if {[llength $opts(stdhandles)]} {
+        if {! $opts(inherithandles)} {
+            error "Cannot specify -stdhandles option if option -inherithandles is specified as 0"
+        }
+
+        setbits si_flags 0x100
+    }
+
+    # Figure out process creation flags
+    # 0x400 -> CREATE_UNICODE_ENVIRONMENT
+    set flags [expr {0x00000400 |
+                     $opts(createsuspended) | $opts(debugchildtree) |
+                     $opts(debugchild) | $opts(detached) | $opts(newconsole) |
+                     $opts(newprocessgroup) | $opts(separatevdm) |
+                     $opts(sharedvdm) | $opts(inheriterrormode) |
+                     $opts(noconsole) }]
+
+    switch -exact -- $opts(priority) {
+        normal      {set priority 0x00000020}
+        abovenormal {set priority 0x00008000}
+        belownormal {set priority 0x00004000}
+        ""          {set priority 0}
+        high        {set priority 0x00000080}
+        realtime    {set priority 0x00000100}
+        idle        {set priority 0x00000040}
+        default     {error "Unknown priority '$priority'"}
+    }
+    set flags [expr {$flags | $priority}]
+
+    # Create the environment strings
+    if {[llength $opts(env)]} {
+        set child_env [list ]
+        foreach {envvar envval} $opts(env) {
+            lappend child_env "$envvar=$envval"
+        }
+    } else {
+        set child_env "__null__"
+    }
+
+    trap {
+        # This is inside the trap because duplicated handles have
+        # to be closed.
+        if {[llength $opts(stdchannels)]} {
+            if {! $opts(inherithandles)} {
+                error "Cannot specify -stdhandles option if option -inherithandles is specified as 0"
+            }
+            if {[llength $opts(stdchannels)] != 3} {
+                error "Must specify 3 channels for -stdchannels option corresponding stdin, stdout and stderr"
+            }
+
+            setbits si_flags 0x100
+
+            # Convert the channels to handles
+            lappend opts(stdhandles) [duplicate_handle [get_tcl_channel_handle [lindex $opts(stdchannels) 0] read] -inherit]
+            lappend opts(stdhandles) [duplicate_handle [get_tcl_channel_handle [lindex $opts(stdchannels) 1] write] -inherit]
+            lappend opts(stdhandles) [duplicate_handle [get_tcl_channel_handle [lindex $opts(stdchannels) 2] write] -inherit]
+        }
+
+        set startup [list $opts(desktop) $opts(title) $xpos $ypos \
+                         $xsize $ysize $xscreen $yscreen \
+                         [expr {$fg|$bg}] $si_flags $opts(showwindow) \
+                         $opts(stdhandles)]
+
+        if {[info exists opts(token)]} {
+            lassign [CreateProcessAsUser $opts(token) [file nativename $path] \
+                         $opts(cmdline) \
+                         $process_sec_attr $thread_sec_attr \
+                         $opts(inherithandles) $flags $child_env \
+                         [file normalize $opts(startdir)] $startup \
+                        ]   ph   th   pid   tid
+
+        } else {
+            lassign [CreateProcess [file nativename $path] \
+                         $opts(cmdline) \
+                         $process_sec_attr $thread_sec_attr \
+                         $opts(inherithandles) $flags $child_env \
+                         [file normalize $opts(startdir)] $startup \
+                        ]   ph   th   pid   tid
+        }
+    } finally {
+        # If opts(stdchannels) is not an empty list, we duplicated the handles
+        # into opts(stdhandles) ourselves so free them
+        if {[llength $opts(stdchannels)]} {
+            # Free corresponding handles in opts(stdhandles)
+            close_handles $opts(stdhandles)
+        }
+    }
+
+    # From the Tcl source code - (tclWinPipe.c)
+    #     /*
+    #      * "When an application spawns a process repeatedly, a new thread
+    #      * instance will be created for each process but the previous
+    #      * instances may not be cleaned up.  This results in a significant
+    #      * virtual memory loss each time the process is spawned.  If there
+    #      * is a WaitForInputIdle() call between CreateProcess() and
+    #      * CloseHandle(), the problem does not occur." PSS ID Number: Q124121
+    #      */
+    # WaitForInputIdle $ph 5000 -- Apparently this is only needed for NT 3.5
+
+
+    if {$opts(returnhandles)} {
+        return [list $pid $tid $ph $th]
+    } else {
+        CloseHandle $th
+        CloseHandle $ph
+        return [list $pid $tid]
+    }
+}
+
+# Wait until the process is ready
+proc twapi::process_waiting_for_input {pid args} {
+    array set opts [parseargs args {
+        {wait.int 0}
+    } -maxleftover 0]
+
+    if {$pid == [pid]} {
+        variable my_process_handle
+        return [WaitForInputIdle $my_process_handle $opts(wait)]
+    }
+
+    set hpid [get_process_handle $pid]
+    trap {
+        return [WaitForInputIdle $hpid $opts(wait)]
+    } finally {
+        CloseHandle $hpid
+    }
+}
+
+
+
+# Get a handle to a process
+proc twapi::get_process_handle {pid args} {
+    # OpenProcess masks off the bottom two bits thereby converting
+    # an invalid pid to a real one.
+    if {(![string is integer -strict $pid]) || ($pid & 3)} {
+        win32_error 87 "Invalid PID '$pid'.";  # "The parameter is incorrect"
+    }
+    array set opts [parseargs args {
+        {access.arg process_query_information}
+        {inherit.bool 0}
+    } -maxleftover 0]
+    return [OpenProcess [_access_rights_to_mask $opts(access)] $opts(inherit) $pid]
+}
+
+# Return true if passed pid is system
+proc twapi::is_system_pid {pid} {
+    # Note Windows 2000 System PID was 8 but we no longer support it.
+    return [expr {$pid == 4}]
+}
+
+# Return true if passed pid is of idle process
+proc twapi::is_idle_pid {pid} {
+    return [expr {$pid == 0}]
+}
+
+# Get my process id
+proc twapi::get_current_process_id {} {
+    return [::pid]
+}
+
+# Get my thread id
+proc twapi::get_current_thread_id {} {
+    return [GetCurrentThreadId]
+}
+
+# Get the exit code for a process. Returns "" if still running.
+proc twapi::get_process_exit_code {hpid} {
+    set code [GetExitCodeProcess $hpid]
+    return [expr {$code == 259 ? "" : $code}]
+}
+
+# Return list of process ids
+# Note if -path or -name is specified, then processes for which this
+# information cannot be obtained are skipped
+proc twapi::get_process_ids {args} {
+
+    set save_args $args;                # Need to pass to process_exists
+    array set opts [parseargs args {
+        user.arg
+        path.arg
+        name.arg
+        logonsession.arg
+        glob} -maxleftover 0]
+
+    if {[info exists opts(path)] && [info exists opts(name)]} {
+        error "Options -path and -name are mutually exclusive"
+    }
+
+    if {$opts(glob)} {
+        set match_op ~
+    } else {
+        set match_op eq
+    }
+
+    # If we do not care about user or path, Twapi_GetProcessList
+    # is faster than EnumProcesses or the WTS functions
+    if {[info exists opts(user)] == 0 &&
+        [info exists opts(logonsession)] == 0 &&
+        [info exists opts(path)] == 0} {
+        if {[info exists opts(name)] == 0} {
+            return [Twapi_GetProcessList -1 0]
+        }
+        # We need to match against the name
+        return [recordarray column [Twapi_GetProcessList -1 2] -pid \
+                    -filter [list [list "-name" $match_op $opts(name) -nocase]]]
+    }
+
+    # Only want pids with a specific user or path or logon session
+
+    # If is the name we are looking for, try using the faster WTS
+    # API's first. If they are not available, we try a slower method
+    # If we need to match paths or logon sessions, we don't try this
+    # at all as the wts api's don't provide that info
+    if {[info exists opts(path)] == 0 &&
+        [info exists opts(logonsession)] == 0} {
+        if {![info exists opts(user)]} {
+            # How did we get here?
+            error "Internal error - option -user not specified where expected"
+        }
+        if {[catch {map_account_to_sid $opts(user)} sid]} {
+            # No such user. Return empty list (no processes)
+            return [list ]
+        }
+
+        if {[info exists opts(name)]} {
+            set filter_expr [list [list pUserSid eq $sid -nocase] [list pProcessName $match_op $opts(name) -nocase]]
+        } else {
+            set filter_expr [list [list pUserSid eq $sid -nocase]]
+        }
+
+        # Catch failures so we can try other means
+        if {! [catch {recordarray column [WTSEnumerateProcesses NULL] \
+                          ProcessId -filter $filter_expr} wtslist]} {
+            return $wtslist
+        }
+    }
+
+    set process_pids [list ]
+
+
+    # Either we are matching on path/logonsession, or the WTS call failed
+    # Try yet another way.
+
+    # Note that in the code below, we use "file join" with a single arg
+    # to convert \ to /. Do not use file normalize as that will also
+    # land up converting relative paths to full paths
+    if {[info exists opts(path)]} {
+        set opts(path) [file join $opts(path)]
+    }
+
+    set process_pids [list ]
+    if {[info exists opts(name)]} {
+        # Note we may reach here if the WTS call above failed
+        set all_pids [recordarray column [Twapi_GetProcessList -1 2] ProcessId -filter [list [list ProcessName $match_op $opts(name) -nocase]]]
+    } else {
+        set all_pids [Twapi_GetProcessList -1 0]
+    }
+
+    set filter_expr {}
+    set popts [list ]
+    if {[info exists opts(path)]} {
+        lappend popts -path
+        lappend filter_expr [list -path $match_op $opts(path) -nocase]
+    }
+
+    if {[info exists opts(user)]} {
+        lappend popts -user
+        lappend filter_expr [list -user eq $opts(user) -nocase]
+    }
+    if {[info exists opts(logonsession)]} {
+        lappend popts -logonsession
+        lappend filter_expr [list -logonsession eq $opts(logonsession) -nocase]
+    }
+
+
+    set matches [recordarray get [get_multiple_process_info -matchpids $all_pids {*}$popts] -filter $filter_expr]
+    return [recordarray column $matches -pid]
+}
+
+proc twapi::get_process_memory_info {{pid {}}} {
+    variable my_process_handle
+
+    if {$pid eq "" || $pid == [pid]} {
+        set hpid $my_process_handle
+    } else {
+        set hpid [get_process_handle $pid -access {process_query_information process_vm_read}]
+    }
+
+    try {
+        # Note: -pagefileusage and -privateusage are same according to SDK.
+        # However for Win7 and earlier, -pagefileusage is always set to 0.
+        # We return what was given and not try to fix it up.
+        return [twine {
+            -pagefaults -workingsetpeak -workingset
+            -poolpagedbytespeak -poolpagedbytes
+            -poolnonpagedbytespeak -poolnonpagedbytes
+            -pagefilebytes -pagefilebytespeak -privatebytes
+        } [GetProcessMemoryInfo $hpid]]
+    } finally {
+        if {$hpid != $my_process_handle} {
+            CloseHandle $hpid
+        }
+    }
+}
+
+# Return list of modules handles for a process
+proc twapi::get_process_modules {pid args} {
+    variable my_process_handle
+
+    array set opts [parseargs args {handle name path base size entry all}]
+
+    if {$opts(all)} {
+        foreach opt {handle name path base size entry} {
+            set opts($opt) 1
+        }
+    }
+    set noopts [expr {($opts(name) || $opts(path) || $opts(base) || $opts(size) || $opts(entry) || $opts(handle)) == 0}]
+
+    if {! $noopts} {
+        # Returning a record array
+        set fields {}
+        # ORDER MUST be same a value order below
+        foreach opt {handle name path base size entry} {
+            if {$opts($opt)} {
+                lappend fields -$opt
+            }
+        }
+
+    }
+
+    if {$pid == [pid]} {
+        set hpid $my_process_handle
+    } else {
+        set hpid [get_process_handle $pid -access {process_query_information process_vm_read}]
+    }
+
+    set results [list ]
+    trap {
+        foreach module [EnumProcessModules $hpid] {
+            if {$noopts} {
+                lappend results $module
+                continue
+            }
+            set rec {}
+            if {$opts(handle)} {
+                lappend rec $module
+            }
+            if {$opts(name)} {
+                if {[catch {GetModuleBaseName $hpid $module} name]} {
+                    set name ""
+                }
+                lappend rec $name
+            }
+            if {$opts(path)} {
+                if {[catch {GetModuleFileNameEx $hpid $module} path]} {
+                    set path ""
+                }
+                lappend rec [_normalize_path $path]
+            }
+            if {$opts(base) || $opts(size) || $opts(entry)} {
+                if {[catch {GetModuleInformation $hpid $module} imagedata]} {
+                    set base ""
+                    set size ""
+                    set entry ""
+                } else {
+                    lassign $imagedata base size entry
+                }
+                foreach opt {base size entry} {
+                    if {$opts($opt)} {
+                        lappend rec [set $opt]
+                    }
+                }
+            }
+            lappend results $rec
+        }
+    } finally {
+        if {$hpid != $my_process_handle} {
+            CloseHandle $hpid
+        }
+    }
+
+    if {$noopts} {
+        return $results
+    } else {
+        return [list $fields $results]
+    }
+}
+
+
+# Kill a process
+# Returns 1 if process was ended, 0 if not ended within timeout
+proc twapi::end_process {pid args} {
+
+    if {$pid == [pid]} {
+        error "The passed PID is the PID of the current process. end_process cannot be used to commit suicide."
+    }
+
+    array set opts [parseargs args {
+        {exitcode.int 1}
+        force
+        {wait.int 0}
+    }]
+
+    # In order to verify the process is really gone, we open the process
+    # if possible and then wait on its handle. If access restrictions prevent
+    # us from doing so, we ignore the issue and will simply check for the
+    # the PID later (which is not a sure check since PID's can be reused
+    # immediately)
+    catch {set hproc [get_process_handle $pid -access synchronize]}
+
+    # First try to close nicely. We need to send messages to toplevels
+    # as well as message-only windows. We could make use of get_toplevel_windows
+    # and find_windows but those would require pulling in the whole 
+    # twapi_ui package so do it ourselves.
+    set toplevels {}
+    foreach toplevel [EnumWindows] {
+        # Check if it belongs to pid. Errors are ignored, we simply
+        # will not send a message to that window
+        catch {
+            if {[lindex [GetWindowThreadProcessId $toplevel] 1] == $pid} {
+                lappend toplevels $toplevel
+            }
+        }
+    }
+    # Repeat for message only windows as EnumWindows skips them
+    set prev 0
+    while {1} {
+        # Again, errors are ignored
+        # -3 -> HWND_MESSAGE windows
+        if {[catch {
+            set toplevel [FindWindowEx [list -3 HWND] $prev "" ""]
+        }]} {
+            break
+        }
+        if {[pointer_null? $toplevel]} break
+        catch {
+            if {[lindex [GetWindowThreadProcessId $toplevel] 1] == $pid} {
+                lappend toplevels $toplevel
+            }
+        }
+        set prev $toplevel
+    }
+    
+    if {[llength $toplevels]} {
+        # Try and close by sending them a message. WM_CLOSE is 0x10
+        foreach toplevel $toplevels {
+            # Send a message but come back right away
+            # See Bug #139 as to why PostMessage instead of SendNotifyMessage
+            catch {PostMessage $toplevel 0x10 0 0}
+        }
+
+        # Wait for the specified time to verify process has gone away
+        if {[info exists hproc]} {
+            set status [WaitForSingleObject $hproc $opts(wait)]
+            CloseHandle $hproc
+            set gone [expr {! $status}]
+        } else {
+            # We could not get a process handle to wait on, just check if
+            # PID still exists. This COULD be a false positive...
+            set gone [twapi::wait {process_exists $pid} 0 $opts(wait)]
+        }
+        if {$gone || ! $opts(force)} {
+            # Succeeded or do not want to force a kill
+            return $gone
+        }
+
+        # Only wait 10 ms since we have already waited above
+        if {$opts(wait)} {
+            set opts(wait) 10
+        }
+    }
+
+    # Open the process for terminate access. IF access denied (5), retry after
+    # getting the required privilege
+    trap {
+        set hproc [get_process_handle $pid -access {synchronize process_terminate}]
+    } onerror {TWAPI_WIN32 5} {
+        # Retry - if still fail, then just throw the error
+        eval_with_privileges {
+            set hproc [get_process_handle $pid -access {synchronize process_terminate}]
+        } SeDebugPrivilege
+    } onerror {TWAPI_WIN32 87} {
+        # Process does not exist, we must have succeeded above but just
+        # took a bit longer for it to exit
+        return 1
+    }
+
+    trap {
+        TerminateProcess $hproc $opts(exitcode)
+        set status [WaitForSingleObject $hproc $opts(wait)]
+        if {$status == 0} {
+            return 1
+        }
+    } finally {
+        CloseHandle $hproc
+    }
+
+    return 0
+}
+
+# Get the path of a process
+proc twapi::get_process_path {pid args} {
+    return [twapi::_get_process_name_path_helper $pid path {*}$args]
+}
+
+# Get the path of a process
+proc twapi::get_process_name {pid args} {
+    return [twapi::_get_process_name_path_helper $pid name {*}$args]
+}
+
+
+# Return list of device drivers
+proc twapi::get_device_drivers {args} {
+    array set opts [parseargs args {name path base all}]
+
+    set fields {}
+    # Order MUST be same as order of values below
+    foreach opt {base name path} {
+        if {$opts($opt) || $opts(all)} {
+            lappend fields -$opt
+        }
+    }
+
+    set results [list ]
+    foreach module [EnumDeviceDrivers] {
+        unset -nocomplain rec
+        if {$opts(base) || $opts(all)} {
+            lappend rec $module
+        }
+        if {$opts(name) || $opts(all)} {
+            if {[catch {GetDeviceDriverBaseName $module} name]} {
+                    set name ""
+            }
+            lappend rec $name
+        }
+        if {$opts(path) || $opts(all)} {
+            if {[catch {GetDeviceDriverFileName $module} path]} {
+                set path ""
+            }
+            lappend rec [_normalize_path $path]
+        }
+        if {[info exists rec]} {
+            lappend results $rec
+        }
+    }
+
+    return [list $fields $results]
+}
+
+# Check if the given process exists
+# 0 - does not exist or exists but paths/names do not match,
+# 1 - exists and matches path (or no -path or -name specified)
+# -1 - exists but do not know path and cannot compare
+proc twapi::process_exists {pid args} {
+    array set opts [parseargs args { path.arg name.arg glob}]
+
+    # Simplest case - don't care about name or path
+    if {! ([info exists opts(path)] || [info exists opts(name)])} {
+        if {$pid == [pid]} {
+            return 1
+        }
+        # TBD - would it be faster to do OpenProcess ? If success or 
+        # access denied, process exists.
+
+        if {[llength [Twapi_GetProcessList $pid 0]] == 0} {
+            return 0
+        } else {
+            return 1
+        }
+    }
+
+    # Can't specify both name and path
+    if {[info exists opts(path)] && [info exists opts(name)]} {
+        error "Options -path and -name are mutually exclusive"
+    }
+
+    if {$opts(glob)} {
+        set string_cmd match
+    } else {
+        set string_cmd equal
+    }
+    
+    if {[info exists opts(name)]} {
+        # Name is specified
+        set pidlist [Twapi_GetProcessList $pid 2]
+        if {[llength $pidlist] == 0} {
+            return 0
+        }
+        return [string $string_cmd -nocase $opts(name) [lindex $pidlist 1 0 1]]
+    }
+
+    # Need to match on the path
+    set process_path [get_process_path $pid -noexist "" -noaccess "(unknown)"]
+    if {[string length $process_path] == 0} {
+        # No such process
+        return 0
+    }
+
+    # Process with this pid exists
+    # Path still has to match
+    if {[string equal $process_path "(unknown)"]} {
+        # Exists but cannot check path/name
+        return -1
+    }
+
+    # Note we do not use file normalize here since that will tack on
+    # absolute paths which we do not want for glob matching
+
+    # We use [file join ] to convert \ to / to avoid special
+    # interpretation of \ in string match command
+    return [string $string_cmd -nocase [file join $opts(path)] [file join $process_path]]
+}
+
+# Get the parent process of a thread. Return "" if no such thread
+proc twapi::get_thread_parent_process_id {tid} {
+    set status [catch {
+        set th [get_thread_handle $tid]
+        trap {
+            set pid [lindex [lindex [Twapi_NtQueryInformationThreadBasicInformation $th] 2] 0]
+        } finally {
+            CloseHandle $th
+        }
+    }]
+
+    if {$status == 0} {
+        return $pid
+    }
+
+
+    # Could not use undocumented function. Try slooooow perf counter method
+    set pid_paths [get_perf_thread_counter_paths $tid -pid]
+    if {[llength $pid_paths] == 0} {
+        return ""
+    }
+
+    if {[pdh_counter_path_value [lindex [lindex $pid_paths 0] 3] -var pid]} {
+        return $pid
+    } else {
+        return ""
+    }
+}
+
+# Get the thread ids belonging to a process
+proc twapi::get_process_thread_ids {pid} {
+    return [recordarray cell [get_multiple_process_info -matchpids [list $pid] -tids] 0 -tids]
+}
+
+
+# Get process information
+proc twapi::get_process_info {pid args} {
+    # To avert a common mistake where pid is unspecified, use current pid
+    # so [get_process_info -name] becomes [get_process_info [pid] -name]
+    # TBD - should this be documented ?
+
+    if {![string is integer -strict $pid]} {
+        set args [linsert $args 0 $pid]
+        set pid [pid]
+    }
+
+    set rec [recordarray index [get_multiple_process_info {*}$args -matchpids [list $pid]] 0 -format dict]
+    if {"-pid" ni $args && "-all" ni $args} {
+        dict unset rec -pid
+    }
+    return $rec
+}
+
+
+# Get multiple process information
+# TBD - document and write tests
+proc twapi::get_multiple_process_info {args} {
+
+    # Options that are directly available from Twapi_GetProcessList
+    # Dict value is the flags to pass to Twapi_GetProcessList
+    set base_opts {
+        basepriority       1
+        parent             1        tssession          1
+        name               2
+        createtime         4        usertime           4
+        privilegedtime     4        handlecount        4
+        threadcount        4
+        pagefaults         8        pagefilebytes      8
+        pagefilebytespeak  8        poolnonpagedbytes  8
+        poolnonpagedbytespeak  8    poolpagedbytes     8
+        poolpagedbytespeak 8        virtualbytes       8
+        virtualbytespeak   8        workingset         8
+        workingsetpeak     8
+        ioreadops         16        iowriteops        16
+        iootherops        16        ioreadbytes       16
+        iowritebytes      16        iootherbytes      16
+    }
+    # Options that also dependent on Twapi_GetProcessList but not
+    # directly available
+    set base_calc_opts { elapsedtime 4   tids 32 }
+
+    # Note -user is also a potential token opt but not listed below
+    # because it can be gotten by other means
+    set token_opts {
+        disabledprivileges elevation enabledprivileges groupattrs groups groupsids
+        integrity integritylabel logonsession  primarygroup primarygroupsid
+        privileges restrictedgroupattrs restrictedgroups virtualized
+    }
+
+    set optdefs [lconcat {all pid user path commandline priorityclass {noexist.arg {(no such process)}} {noaccess.arg {(unknown)}} matchpids.arg} \
+                     [dict keys $base_opts] \
+                     [dict keys $base_calc_opts] \
+                     $token_opts]
+    array set opts [parseargs args $optdefs -maxleftover 0]
+    set opts(pid) 1; # Always return pid, -pid option is for backward compat
+
+    if {[info exists opts(matchpids)]} {
+        set pids $opts(matchpids)
+    } else {
+        set pids [Twapi_GetProcessList -1 0]
+    }
+
+    set now [get_system_time]
+
+    # We will return a record array. $records tracks a dict of record
+    # values keyed by pid, $fields tracks the names in the list elements
+    # [llength $fields] == [llength [lindex $records *]]
+    set records {}
+    set fields {}
+
+    # If user is requested, try getting it through terminal services
+    # if possible since the token method fails on some newer platforms
+    if {$opts(all) || $opts(user)} {
+        _get_wts_pids wtssids wtsnames
+    }
+
+    # See if any Twapi_GetProcessList options are requested and if
+    # so, calculate the appropriate flags
+    set baseflags 0
+    set basenoexistvals {}
+    dict for {opt flag} $base_opts {
+        if {$opts($opt) || $opts(all)} {
+            set baseflags [expr {$baseflags | $flag}]
+            lappend basefields -$opt
+            lappend basenoexistvals $opts(noexist)
+        }
+    }
+    dict for {opt flag} $base_calc_opts {
+        if {$opts($opt) || $opts(all)} {
+            set baseflags [expr {$baseflags | $flag}]
+        }
+    }
+
+    # See if we need to retrieve any base options
+    if {$baseflags} {
+        set pidarg [expr {[llength $pids] == 1 ? [lindex $pids 0] : -1}]
+        set data [twapi::Twapi_GetProcessList $pidarg [expr {$baseflags|1}]]
+        if {$opts(all) || $opts(elapsedtime) || $opts(tids)} {
+            array set baserawdata [recordarray getdict $data -key "-pid" -format dict]
+        }
+        if {[info exists basefields]} {
+            set fields $basefields
+            set records [recordarray getdict $data -slice $basefields -key "-pid"]
+        }
+    }
+    if {$opts(pid)} {
+        lappend fields -pid
+    }
+    foreach pid $pids {
+        # If base values were requested, but this pid does not exist
+        # use the "noexist" values
+        if {![dict exists $records $pid]} {
+            dict set records $pid $basenoexistvals
+        }
+        if {$opts(pid)} {
+            dict lappend records $pid $pid
+        }
+    }
+
+    # If all we need are baseline options, and no massaging is required
+    # (as for elapsedtime, for example), we can return what we have
+    # without looping through below. Saves significant time.
+    set done 1
+    foreach opt [list all user elapsedtime tids path commandline priorityclass \
+                     {*}$token_opts] {
+        if {$opts($opt)} {
+            set done 0
+            break
+        }
+    }
+
+    if {$done} {
+        set return_data {}
+        foreach pid $pids {
+            lappend return_data [dict get $records $pid]
+        }
+        return [list $fields $return_data]
+    }
+
+    set requested_token_opts {}
+    foreach opt $token_opts {
+        if {$opts(all) || $opts($opt)} {
+            lappend requested_token_opts -$opt
+        }
+    }
+
+    if {$opts(elapsedtime) || $opts(all)} {
+        lappend fields -elapsedtime
+        foreach pid $pids {
+            if {[info exists baserawdata($pid)]} {
+                set elapsed [twapi::kl_get $baserawdata($pid) -createtime]
+                if {$elapsed} {
+                    # 100ns -> seconds
+                    dict lappend records $pid [expr {($now-$elapsed)/10000000}]
+                } else {
+                    # For some processes like, System and Idle, kernel
+                    # returns start time of 0. Just use system uptime
+                    if {![info exists system_uptime]} {
+                        # Store locally so no refetch on each iteration
+                        set system_uptime [get_system_uptime]
+                    }
+                    dict lappend records $pid $system_uptime
+                }
+            } else {
+                dict lappend records $pid $opts(noexist)
+            }
+        }
+    }
+
+    if {$opts(tids) || $opts(all)} {
+        lappend fields -tids
+        foreach pid $pids {
+            if {[info exists baserawdata($pid)]} {
+                dict lappend records $pid [recordarray column [kl_get $baserawdata($pid) Threads] -tid]
+            } else {
+                dict lappend records $pid $opts(noexist)
+            }
+        }
+    }
+
+    if {$opts(all) || $opts(path)} {
+        lappend fields -path
+        foreach pid $pids {
+            dict lappend records $pid [get_process_path $pid -noexist $opts(noexist) -noaccess $opts(noaccess)]
+        }
+    }
+
+    if {$opts(all) || $opts(priorityclass)} {
+        lappend fields -priorityclass
+        foreach pid $pids {
+            trap {
+                set prioclass [get_priority_class $pid]
+            } onerror {TWAPI_WIN32 5} {
+                set prioclass $opts(noaccess)
+            } onerror {TWAPI_WIN32 87} {
+                set prioclass $opts(noexist)
+            }
+            dict lappend records $pid $prioclass
+        }
+    }
+
+    if {$opts(all) || $opts(commandline)} {
+        lappend fields -commandline
+        foreach pid $pids {
+            dict lappend records $pid [get_process_commandline $pid -noexist $opts(noexist) -noaccess $opts(noaccess)]
+        }
+    }
+
+
+    if {$opts(all) || $opts(user) || [llength $requested_token_opts]} {
+        foreach pid $pids {
+            # Now get token related info, if any requested
+            # For returning as a record array, we have to be careful that
+            # each field is added in a specific order for every pid
+            # keeping in mind a different method might be used for different
+            # pids. So we collect the data in dictionary token_records and add 
+            # at the end in a fixed order
+            set token_records {}
+            set requested_opts $requested_token_opts
+            unset -nocomplain user
+            if {$opts(all) || $opts(user)} {
+                # See if we already have the user. Note sid of system idle
+                # will be empty string
+                if {[info exists wtssids($pid)]} {
+                    if {$wtssids($pid) == ""} {
+                        # Put user as System
+                        set user SYSTEM
+                    } else {
+                        # We speed up account lookup by caching sids
+                        if {[info exists sidcache($wtssids($pid))]} {
+                            set user $sidcache($wtssids($pid))
+                        } else {
+                            set user [lookup_account_sid $wtssids($pid)]
+                            set sidcache($wtssids($pid)) $user
+                        }
+                    }
+                } else {
+                    lappend requested_opts -user
+                }
+            }
+
+            if {[llength $requested_opts]} {
+                trap {
+                    dict set token_records $pid [_token_info_helper -pid $pid {*}$requested_opts]
+                } onerror {TWAPI_WIN32 5} {
+                    foreach opt $requested_opts {
+                        dict set token_records $pid $opt $opts(noaccess)
+                    }
+                    # The NETWORK SERVICE and LOCAL SERVICE processes cannot
+                    # be accessed. If we are looking for the logon session for
+                    # these, try getting it from the witssid if we have it
+                    # since the logon session is hardcoded for these accounts
+                    if {"-logonsession" in  $requested_opts} {
+                        if {![info exists wtssids]} {
+                            _get_wts_pids wtssids wtsnames
+                        }
+                        if {[info exists wtssids($pid)]} {
+                            # Map user SID to logon session
+                            switch -exact -- $wtssids($pid) {
+                                S-1-5-18 {
+                                    # SYSTEM
+                                    dict set token_records $pid -logonsession 00000000-000003e7
+                                }
+                                S-1-5-19 {
+                                    # LOCAL SERVICE
+                                    dict set token_records $pid -logonsession 00000000-000003e5
+                                }
+                                S-1-5-20 {
+                                    # LOCAL SERVICE
+                                    dict set token_records $pid -logonsession 00000000-000003e4
+                                }
+                            }
+                        }
+                    }
+
+                    # Similarly, if we are looking for user account, special case
+                    # system and system idle processes
+                    if {"-user" in  $requested_opts} {
+                        if {[is_idle_pid $pid] || [is_system_pid $pid]} {
+                            set user SYSTEM
+                        } else {
+                            set user $opts(noaccess)
+                        }
+                    }
+
+                } onerror {TWAPI_WIN32 87} {
+                    foreach opt $requested_opts {
+                        if {$opt eq "-user"} {
+                            if {[is_idle_pid $pid] || [is_system_pid $pid]} {
+                                set user SYSTEM
+                            } else {
+                                set user $opts(noexist)
+                            }
+                        } else {
+                            dict set token_records $pid $opt $opts(noexist)
+                        }
+                    }
+                }
+            }
+            # Now add token values in a specific order - MUST MATCH fields BELOW
+            if {$opts(all) || $opts(user)} {
+                # TBD - BUG - user is supposed to be set to *something* by this
+                # point but WiTS throws error every blue moon on this line that
+                # user is not defined. Workaround.
+                if {![info exists user]} {
+                   set user $opts(noaccess) 
+                }
+                dict lappend records $pid $user
+            }
+            foreach opt $requested_token_opts {
+                if {[dict exists $token_records $pid $opt]} {
+                    dict lappend records $pid [dict get $token_records $pid $opt]
+                }
+            }
+        }
+        # Now add token field names in a specific order - MUST MATCH ABOVE
+        if {$opts(all) || $opts(user)} {
+            lappend fields -user
+        }
+        foreach opt $requested_token_opts {
+            if {[dict exists $token_records $pid $opt]} {
+                lappend fields $opt
+            }
+        }
+    }
+
+    set return_data {}
+    foreach pid $pids {
+        lappend return_data [dict get $records $pid]
+    }
+    return [list $fields $return_data]
+}
+
+
+
+# Get thread information
+# TBD - add info from GetGUIThreadInfo
+proc twapi::get_thread_info {tid args} {
+    # TBD - modify so tid is optional like for get_process_info
+
+    # Options that are directly available from Twapi_GetProcessList
+    if {![info exists ::twapi::get_thread_info_base_opts]} {
+        # Array value is the flags to pass to Twapi_GetProcessList
+        array set ::twapi::get_thread_info_base_opts {
+            pid 32
+            elapsedtime 96
+            waittime 96
+            usertime 96
+            createtime 96
+            privilegedtime 96
+            contextswitches 96
+            basepriority 160
+            priority 160
+            startaddress 160
+            state 160
+            waitreason 160
+        }
+    }
+
+    set token_opts {
+        user
+        primarygroup
+        primarygroupsid
+        groups
+        groupsids
+        restrictedgroups
+        groupattrs
+        restrictedgroupattrs
+        privileges
+        enabledprivileges
+        disabledprivileges
+    }
+
+    array set opts [parseargs args \
+                        [concat [list all \
+                                     relativepriority \
+                                     tid \
+                                     [list noexist.arg "(no such thread)"] \
+                                     [list noaccess.arg "(unknown)"]] \
+                             [array names ::twapi::get_thread_info_base_opts] \
+                             $token_opts ]]
+
+    set requested_opts [_array_non_zero_switches opts $token_opts $opts(all)]
+    # Now get token info, if any
+    if {[llength $requested_opts]} {
+        trap {
+            trap {
+                set results [_token_info_helper -tid $tid {*}$requested_opts]
+            } onerror {TWAPI_WIN32 1008} {
+                # Thread does not have its own token. Use it's parent process
+                set results [_token_info_helper -pid [get_thread_parent_process_id $tid] {*}$requested_opts]
+            }
+        } onerror {TWAPI_WIN32 5} {
+            # No access
+            foreach opt $requested_opts {
+                lappend results $opt $opts(noaccess)
+            }
+        } onerror {TWAPI_WIN32 87} {
+            # Thread does not exist
+            foreach opt $requested_opts {
+                lappend results $opt $opts(noexist)
+            }
+        }
+
+    } else {
+        set results [list ]
+    }
+
+    # Now get the base options
+    set flags 0
+    foreach opt [array names ::twapi::get_thread_info_base_opts] {
+        if {$opts($opt) || $opts(all)} {
+            set flags [expr {$flags | $::twapi::get_thread_info_base_opts($opt)}]
+        }
+    }
+
+    if {$flags} {
+        # We need at least one of the base options
+        foreach tdata [recordarray column [twapi::Twapi_GetProcessList -1 $flags] Threads] {
+            set tdict [recordarray getdict $tdata -key "-tid" -format dict]
+            if {[dict exists $tdict $tid]} {
+                array set threadinfo [dict get $tdict $tid]
+                break
+            }
+        }
+        # It is possible that we looped through all the processes without
+        # a thread match. Hence we check again that we have threadinfo for
+        # each option value
+        foreach opt {
+            pid            
+            waittime
+            usertime
+            createtime
+            privilegedtime
+            basepriority
+            priority
+            startaddress
+            state
+            waitreason
+            contextswitches
+        } {
+            if {$opts($opt) || $opts(all)} {
+                if {[info exists threadinfo]} {
+                    lappend results -$opt $threadinfo(-$opt)
+                } else {
+                    lappend results -$opt $opts(noexist)
+                }
+            }
+        }
+
+        if {$opts(elapsedtime) || $opts(all)} {
+            if {[info exists threadinfo(-createtime)]} {
+                lappend results -elapsedtime [expr {[clock seconds]-[large_system_time_to_secs $threadinfo(-createtime)]}]
+            } else {
+                lappend results -elapsedtime $opts(noexist)
+            }
+        }
+    }
+
+
+    if {$opts(all) || $opts(relativepriority)} {
+        trap {
+            lappend results -relativepriority [get_thread_relative_priority $tid]
+        } onerror {TWAPI_WIN32 5} {
+            lappend results -relativepriority $opts(noaccess)
+        } onerror {TWAPI_WIN32 87} {
+            lappend results -relativepriority $opts(noexist)
+        }
+    }
+
+    if {$opts(all) || $opts(tid)} {
+        lappend results -tid $tid
+    }
+
+    return $results
+}
+
+# Get a handle to a thread
+proc twapi::get_thread_handle {tid args} {
+    # OpenThread masks off the bottom two bits thereby converting
+    # an invalid tid to a real one. We do not want this.
+    if {$tid & 3} {
+        win32_error 87;         # "The parameter is incorrect"
+    }
+
+    array set opts [parseargs args {
+        {access.arg thread_query_information}
+        {inherit.bool 0}
+    }]
+    return [OpenThread [_access_rights_to_mask $opts(access)] $opts(inherit) $tid]
+}
+
+# Suspend a thread
+proc twapi::suspend_thread {tid} {
+    set htid [get_thread_handle $tid -access thread_suspend_resume]
+    trap {
+        set status [SuspendThread $htid]
+    } finally {
+        CloseHandle $htid
+    }
+    return $status
+}
+
+# Resume a thread
+proc twapi::resume_thread {tid} {
+    set htid [get_thread_handle $tid -access thread_suspend_resume]
+    trap {
+        set status [ResumeThread $htid]
+    } finally {
+        CloseHandle $htid
+    }
+    return $status
+}
+
+# Get the command line for a process
+proc twapi::get_process_commandline {pid args} {
+
+    if {[is_system_pid $pid] || [is_idle_pid $pid]} {
+        return ""
+    }
+
+    array set opts [parseargs args {
+        {noexist.arg "(no such process)"}
+        {noaccess.arg "(unknown)"}
+    }]
+
+    trap {
+        # Assume max command line len is 1024 chars (2048 bytes)
+        trap {
+            set hpid [get_process_handle $pid -access {process_query_information process_vm_read}]
+        } onerror {TWAPI_WIN32 87} {
+            # Process does not exist
+            return $opts(noexist)
+        }
+
+        # Get the address where the PEB is stored - see Nebbett
+        set peb_addr [lindex [Twapi_NtQueryInformationProcessBasicInformation $hpid] 1]
+
+        # Read the PEB as binary
+        # The pointer to the process parameter block is the 5th pointer field.
+        # The struct looks like:
+        # 32 bit -
+        # typedef struct _PEB {
+        # BYTE                          Reserved1[2];
+        # BYTE                          BeingDebugged;
+        # BYTE                          Reserved2[1];
+        # PVOID                         Reserved3[2];
+        # PPEB_LDR_DATA                 Ldr;
+        # PRTL_USER_PROCESS_PARAMETERS  ProcessParameters;
+        # BYTE                          Reserved4[104];
+        # PVOID                         Reserved5[52];
+        # PPS_POST_PROCESS_INIT_ROUTINE PostProcessInitRoutine;
+        # BYTE                          Reserved6[128];
+        # PVOID                         Reserved7[1];
+        # ULONG                         SessionId;
+        # } PEB, *PPEB;
+        # 64 bit -
+        # typedef struct _PEB {
+        #   BYTE Reserved1[2];
+        #   BYTE BeingDebugged;
+        #   BYTE Reserved2[21];
+        #   PPEB_LDR_DATA LoaderData;
+        #   PRTL_USER_PROCESS_PARAMETERS ProcessParameters;
+        #   BYTE Reserved3[520];
+        #   PPS_POST_PROCESS_INIT_ROUTINE PostProcessInitRoutine;
+        #   BYTE Reserved4[136];
+        #   ULONG SessionId;
+        # } PEB;
+        # So in both cases the pointer is 4 pointers from the start
+
+        if {[info exists ::tcl_platform(pointerSize)]} {
+            set pointer_size $::tcl_platform(pointerSize)
+        } else {
+            set pointer_size 4
+        }
+        if {$pointer_size == 4} {
+            set pointer_scanner n
+        } else {
+            set pointer_scanner m
+        }
+        set mem [ReadProcessMemory $hpid [expr {$peb_addr+(4*$pointer_size)}] $pointer_size]
+        if {![binary scan $mem $pointer_scanner proc_param_addr]} {
+            error "Could not read PEB of process $pid"
+        }
+
+        # Now proc_param_addr contains the address of the Process parameter
+        # structure which looks like:
+        # typedef struct _RTL_USER_PROCESS_PARAMETERS {
+        #                      Offsets:     x86  x64
+        #    BYTE           Reserved1[16];   0    0
+        #    PVOID          Reserved2[10];  16   16
+        #    UNICODE_STRING ImagePathName;  56   96
+        #    UNICODE_STRING CommandLine;    64  112
+        # } RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS;
+        # UNICODE_STRING is defined as
+        # typedef struct _UNICODE_STRING {
+        #  USHORT Length;
+        #  USHORT MaximumLength;
+        #  PWSTR  Buffer;
+        # } UNICODE_STRING;
+
+        # Note - among twapi supported builds, tcl_platform(pointerSize)
+        # not existing implies 32-bits
+        if {[info exists ::tcl_platform(pointerSize)] &&
+            $::tcl_platform(pointerSize) == 8} {
+            # Read the CommandLine field
+            set mem [ReadProcessMemory $hpid [expr {$proc_param_addr + 112}] 16]
+            if {![binary scan $mem tutunum cmdline_bytelen cmdline_bufsize unused cmdline_addr]} {
+                error "Could not get address of command line"
+            }
+        } else {
+            # Read the CommandLine field
+            set mem [ReadProcessMemory $hpid [expr {$proc_param_addr + 64}] 8]
+            if {![binary scan $mem tutunu cmdline_bytelen cmdline_bufsize cmdline_addr]} {
+                error "Could not get address of command line"
+            }
+        }
+
+        if {1} {
+            if {$cmdline_bytelen == 0} {
+                set cmdline ""
+            } else {
+                trap {
+                    set mem [ReadProcessMemory $hpid $cmdline_addr $cmdline_bytelen]
+                } onerror {TWAPI_WIN32 299} {
+                    # ERROR_PARTIAL_COPY
+                    # Rumour has it this can be a transient error if the
+                    # process is initializing, so try once more
+                    Sleep 0;    # Relinquish control to OS to run other process
+                    # Retry
+                    set mem [ReadProcessMemory $hpid $cmdline_addr $cmdline_bytelen]
+                }
+            }
+        } else {
+            THIS CODE NEEDS TO BE MODIFIED IF REINSTATED. THE ReadProcessMemory
+            parameters have changed
+            # Old pre-2.3 code
+            # Now read the command line itself. We do not know the length
+            # so assume MAX_PATH (1024) chars (2048 bytes). However, this may
+            # fail if the memory beyond the command line is not allocated in the
+            # target process. So we have to check for this error and retry with
+            # smaller read sizes
+            set max_len 2048
+            while {$max_len > 128} {
+                trap {
+                    ReadProcessMemory $hpid $cmdline_addr $pgbl $max_len
+                    break
+                } onerror {TWAPI_WIN32 299} {
+                    # Reduce read size
+                    set max_len [expr {$max_len / 2}]
+                }
+            }
+            # OK, got something. It's in Unicode format, may not be null terminated
+            # or may have multiple null terminated strings. THe command line
+            # is the first string.
+        }
+        set cmdline [encoding convertfrom unicode $mem]
+        set null_offset [string first "\0" $cmdline]
+        if {$null_offset >= 0} {
+            set cmdline [string range $cmdline 0 [expr {$null_offset-1}]]
+        }
+
+    } onerror {TWAPI_WIN32 5} {
+        # Access denied
+        set cmdline $opts(noaccess)
+    } onerror {TWAPI_WIN32 299} {
+        # Only part of the Read* could be completed
+        # Access denied
+        set cmdline $opts(noaccess)
+    } onerror {TWAPI_WIN32 87} {
+        # The parameter is incorrect
+        # Access denied (or should it be noexist?)
+        set cmdline $opts(noaccess)
+    } finally {
+        if {[info exists hpid]} {
+            CloseHandle $hpid
+        }
+    }
+
+    return $cmdline
+}
+
+
+# Get process parent - can return ""
+proc twapi::get_process_parent {pid args} {
+    array set opts [parseargs args {
+        {noexist.arg "(no such process)"}
+        {noaccess.arg "(unknown)"}
+    }]
+
+    if {[is_system_pid $pid] || [is_idle_pid $pid]} {
+        return ""
+    }
+
+    trap {
+        set parent [recordarray cell [twapi::Twapi_GetProcessList $pid 1] 0 InheritedFromProcessId]
+        if {$parent ne ""} {
+            return $parent
+        }
+    } onerror {} {
+        # Just try the other methods below
+    }
+
+    trap {
+        set hpid [get_process_handle $pid]
+        return [lindex [Twapi_NtQueryInformationProcessBasicInformation $hpid] 5]
+
+    } onerror {TWAPI_WIN32 5} {
+        set error noaccess
+    } onerror {TWAPI_WIN32 87} {
+        set error noexist
+    } finally {
+        if {[info exists hpid]} {
+            CloseHandle $hpid
+        }
+    }
+
+    return $opts($error)
+}
+
+# Get the base priority class of a process
+proc twapi::get_priority_class {pid} {
+    set ph [get_process_handle $pid]
+    trap {
+        return [GetPriorityClass $ph]
+    } finally {
+        CloseHandle $ph
+    }
+}
+
+# Get the base priority class of a process
+proc twapi::set_priority_class {pid priority} {
+    if {$pid == [pid]} {
+        variable my_process_handle
+        SetPriorityClass $my_process_handle $priority
+        return
+    }
+
+    set ph [get_process_handle $pid -access process_set_information]
+    trap {
+        SetPriorityClass $ph $priority
+    } finally {
+        CloseHandle $ph
+    }
+}
+
+# Get the priority of a thread
+proc twapi::get_thread_relative_priority {tid} {
+    set h [get_thread_handle $tid]
+    trap {
+        return [GetThreadPriority $h]
+    } finally {
+        CloseHandle $h
+    }
+}
+
+# Set the priority of a thread
+proc twapi::set_thread_relative_priority {tid priority} {
+    switch -exact -- $priority {
+        abovenormal { set priority 1 }
+        belownormal { set priority -1 }
+        highest     { set priority 2 }
+        idle        { set priority -15 }
+        lowest      { set priority -2 }
+        normal      { set priority 0 }
+        timecritical { set priority 15 }
+        default {
+            if {![string is integer -strict $priority]} {
+                error "Invalid priority value '$priority'."
+            }
+        }
+    }
+
+    set h [get_thread_handle $tid -access thread_set_information]
+    trap {
+        SetThreadPriority $h $priority
+    } finally {
+        CloseHandle $h
+    }
+}
+
+# Return type of process elevation
+proc twapi::get_process_elevation {args} {
+    lappend args -elevation
+    return [lindex [_token_info_helper $args] 1]
+}
+
+# Return integrity level of process
+proc twapi::get_process_integrity {args} {
+    lappend args -integrity
+    return [lindex [_token_info_helper $args] 1]
+}
+
+# Return whether a process is running under WoW64
+proc twapi::wow64_process {args} {
+    array set opts [parseargs args {
+        pid.arg
+        hprocess.arg
+    } -maxleftover 0]
+
+    if {[info exists opts(hprocess)]} {
+        if {[info exists opts(pid)]} {
+            error "Options -pid and -hprocess cannot be used together."
+        }
+        return [IsWow64Process $opts(hprocess)]
+    }
+
+    if {[info exists opts(pid)] && $opts(pid) != [pid]} {
+        trap {
+            set hprocess [get_process_handle $opts(pid)]
+            return [IsWow64Process $hprocess]
+        } finally {
+            if {[info exists hprocess]} {
+                CloseHandle $hprocess
+            }
+        }
+    }
+
+    # Common case - checking about ourselves
+    variable my_process_handle
+    return [IsWow64Process $my_process_handle]
+}
+
+# Check whether a process is virtualized
+proc twapi::virtualized_process {args} {
+    lappend args -virtualized
+    return [lindex [_token_info_helper $args] 1]
+}
+
+proc twapi::set_process_integrity {level args} {
+    lappend args -integrity $level
+    _token_set_helper $args
+}
+
+proc twapi::set_process_virtualization {enable args} {
+    lappend args -virtualized $enable
+    _token_set_helper $args
+}
+
+# Map a process handle to its pid
+proc twapi::get_pid_from_handle {hprocess} {
+    return [lindex [Twapi_NtQueryInformationProcessBasicInformation $hprocess] 4]
+}
+
+# Check if current process is an administrative process or not
+proc twapi::process_in_administrators {} {
+
+    # Administrators group SID - S-1-5-32-544
+
+    if {[get_process_elevation] ne "limited"} {
+        return [CheckTokenMembership NULL S-1-5-32-544]
+    }
+
+    # When running as with a limited token under UAC, we cannot check
+    # if the process is in administrators group or not since the group
+    # will be disabled in the token. Rather, we need to get the linked
+    # token (which is unfiltered) and check that.
+    set tok [lindex [_token_info_helper -linkedtoken] 1]
+    trap {
+        return [CheckTokenMembership $tok S-1-5-32-544]
+    } finally {
+        close_token $tok
+    }
+}
+
+# Get a module handle
+proc twapi::get_module_handle {args} {
+    array set opts [parseargs args {
+        path.arg
+        pin.bool
+    } -nulldefault -maxleftover 0]
+
+    return [GetModuleHandleEx $opts(pin) [file nativename $opts(path)]]
+}
+
+# Get a module handle from an address
+proc twapi::get_module_handle_from_address {addr args} {
+    array set opts [parseargs args {
+        pin.bool
+    } -nulldefault -maxleftover 0]
+
+    return [GetModuleHandleEx [expr {$opts(pin) ? 5 : 4}] $addr]
+}
+
+
+proc twapi::load_user_profile {token args} {
+    # PI_NOUI -> 0x1
+    parseargs args {
+        username.arg
+        {noui.bool 0 0x1}
+        defaultuserpath.arg
+        servername.arg
+        roamingprofilepath.arg
+    } -maxleftover 0 -setvars -nulldefault
+
+    if {$username eq ""} {
+        set username [get_token_user $token -name]
+    }
+
+    return [eval_with_privileges {
+        LoadUserProfile [list $token $noui $username $roamingprofilepath $defaultuserpath $servername]
+    } {SeRestorePrivilege SeBackupPrivilege}]
+}
+
+# TBD - document
+proc twapi::get_profile_type {} {
+    return [dict* {0 local 1 temporary 2 roaming 4 mandatory} [GetProfileType]]
+}
+
+
+proc twapi::_env_block_to_dict {block normalize} {
+    set env_dict {}
+    foreach env_str $block {
+        set pos [string first = $env_str]
+        set key [string range $env_str 0 $pos-1]
+        if {$normalize} {
+            set key [string toupper $key]
+        }
+        lappend env_dict $key [string range $env_str $pos+1 end]
+    }
+    return $env_dict
+}
+
+proc twapi::get_system_environment_vars {args} {
+    parseargs args {normalize.bool} -nulldefault -setvars -maxleftover 0
+    return [_env_block_to_dict [CreateEnvironmentBlock 0 0] $normalize]
+}
+
+proc twapi::get_user_environment_vars {token args} {
+    parseargs args {inherit.bool normalize.bool} -nulldefault -setvars -maxleftover 0
+    return [_env_block_to_dict [CreateEnvironmentBlock $token $inherit] $normalize]
+}
+
+proc twapi::expand_system_environment_vars {s} {
+    return [ExpandEnvironmentStringsForUser 0 $s]
+}
+
+proc twapi::expand_user_environment_vars {tok s} {
+    return [ExpandEnvironmentStringsForUser $tok $s]
+}
+
+#
+# Utility procedures
+
+# Get the path of a process
+proc twapi::_get_process_name_path_helper {pid {type name} args} {
+
+    if {$pid == [pid]} {
+        # It is our process!
+        set exe [info nameofexecutable]
+        if {$type eq "name"} {
+            return [file tail $exe]
+        } else {
+            return $exe
+        }
+    }
+
+    array set opts [parseargs args {
+        {noexist.arg "(no such process)"}
+        {noaccess.arg "(unknown)"}
+    } -maxleftover 0]
+
+    if {![string is integer $pid]} {
+        error "Invalid non-numeric pid $pid"
+    }
+    if {[is_system_pid $pid]} {
+        return "System"
+    }
+    if {[is_idle_pid $pid]} {
+        return "System Idle Process"
+    }
+
+    # Try the quicker way if looking for a name
+    if {$type eq "name" &&
+        ![catch {
+            Twapi_GetProcessList $pid 2
+        } plist]} {
+        set name [lindex $plist 1 0 1]
+        if {$name ne ""} {
+            return $name
+        }
+    }
+
+    # We first try using GetProcessImageFileName as that does not require
+    # the PROCESS_VM_READ privilege
+    if {[min_os_version 6 0]} {
+        set privs [list process_query_limited_information]
+    } else {
+        set privs [list process_query_information]
+    }
+
+    trap {
+        set hprocess [get_process_handle $pid -access $privs]
+        set path [GetProcessImageFileName $hprocess]
+        if {$type eq "name"} {
+            return [file tail $path]
+        }
+        # Returned path is in native format, convert to win32
+        return [normalize_device_rooted_path $path]
+    } onerror {TWAPI_WIN32 87} {
+        return $opts(noexist)
+    } onerror {} {
+        # Other errors, continue on to other methods
+    } finally {
+        if {[info exists hprocess]} {
+            twapi::close_handle $hprocess
+        }
+    }
+
+    trap {
+        set hprocess [get_process_handle $pid -access {process_query_information process_vm_read}]
+    } onerror {TWAPI_WIN32 87} {
+        return $opts(noexist)
+    } onerror {TWAPI_WIN32 5} {
+        # Access denied
+        # If it is the name we want, first try WTS and if that
+        # fails try getting it from PDH (slowest)
+
+        if {[string equal $type "name"]} {
+            if {! [catch {WTSEnumerateProcesses NULL} precords]} {
+                
+                return [lindex [recordarray column $precords pProcessName -filter [list [list ProcessId == $pid]]] 0]
+            }
+
+            # That failed as well, try PDH. TBD - get rid of PDH
+            set pdh_path [lindex [lindex [twapi::get_perf_process_counter_paths [list $pid] -pid] 0] 3]
+            array set pdhinfo [pdh_parse_counter_path $pdh_path]
+            return $pdhinfo(instance)
+        }
+        return $opts(noaccess)
+    }
+
+    trap {
+        set module [lindex [EnumProcessModules $hprocess] 0]
+        if {[string equal $type "name"]} {
+            set path [GetModuleBaseName $hprocess $module]
+        } else {
+            set path [_normalize_path [GetModuleFileNameEx $hprocess $module]]
+        }
+    } onerror {TWAPI_WIN32 5} {
+        # Access denied
+        # On win2k (and may be Win2k3), if the process has exited but some
+        # app still has a handle to the process, the OpenProcess succeeds
+        # but the EnumProcessModules call returns access denied. So
+        # check for this case
+        if {[min_os_version 5 0]} {
+            # Try getting exit code. 259 means still running.
+            # Anything else means process has terminated
+            if {[GetExitCodeProcess $hprocess] == 259} {
+                return $opts(noaccess)
+            } else {
+                return $opts(noexist)
+            }
+        } else {
+            rethrow
+        }
+    } onerror {TWAPI_WIN32 299} {
+        # Partial read - usually means either we are WOW64 and target
+        # is 64bit, or process is exiting / starting and not all mem is
+        # reachable yet
+        return $opts(noaccess)
+    } finally {
+        CloseHandle $hprocess
+    }
+    return $path
+}
+
+# Fill in arrays with result from WTSEnumerateProcesses if available
+proc twapi::_get_wts_pids {v_sids v_names} {
+    # Note this call is expected to fail on NT 4.0 without terminal server
+    if {! [catch {WTSEnumerateProcesses NULL} precords]} {
+        upvar $v_sids wtssids
+        upvar $v_names wtsnames
+        array set wtssids [recordarray getlist $precords -slice {ProcessId pUserSid} -format flat]
+        array set wtsnames [recordarray getlist $precords -slice {ProcessId pUserSid} -format flat]
+    }
+}
+
+# Return various information from a process token
+proc twapi::_token_info_helper {args} {
+    package require twapi_security
+    proc _token_info_helper {args} {
+        if {[llength $args] == 1} {
+            # All options specified as one argument
+            set args [lindex $args 0]
+        }
+
+        if {0} {
+            Following options are passed on to get_token_info:
+            elevation
+            virtualized
+            restrictedgroups
+            primarygroup
+            primarygroupsid
+            privileges
+            enabledprivileges
+            disabledprivileges
+            logonsession
+            linkedtoken
+            Option -integrity is not passed on because it has to deal with
+            -raw and -label options
+        }
+
+        array set opts [parseargs args {
+            pid.arg
+            hprocess.arg
+            tid.arg
+            hthread.arg
+            integrity
+            raw
+            label
+            user
+            groups
+            groupsids
+        } -ignoreunknown]
+
+        if {[expr {[info exists opts(pid)] + [info exists opts(hprocess)] +
+                   [info exists opts(tid)] + [info exists opts(hthread)]}] > 1} {
+            error "At most one option from -pid, -tid, -hprocess, -hthread can be specified."
+        }
+
+        if {$opts(user)} {
+            lappend args -usersid
+        }
+
+        if {$opts(groups) || $opts(groupsids)} {
+            lappend args -groupsids
+        }
+
+        if {[info exists opts(hprocess)]} {
+            set tok [open_process_token -hprocess $opts(hprocess)]
+        } elseif {[info exists opts(pid)]} {
+            set tok [open_process_token -pid $opts(pid)]
+        } elseif {[info exists opts(hthread)]} {
+            set tok [open_thread_token -hthread $opts(hthread)]
+        } elseif {[info exists opts(tid)]} {
+            set tok [open_thread_token -tid $opts(tid)]
+        } else {
+            # Default is current process
+            set tok [open_process_token]
+        }
+
+        trap {
+            array set result [get_token_info $tok {*}$args]
+            if {[info exists result(-usersid)]} {
+                set result(-user) [lookup_account_sid $result(-usersid)]
+                unset result(-usersid)
+            }
+            if {[info exists result(-groupsids)]} {
+                if {$opts(groups)} {
+                    set result(-groups) {}
+                    foreach sid $result(-groupsids) {
+                        if {[catch {lookup_account_sid $sid} gname]} {
+                            lappend result(-groups) $sid
+                        } else {
+                            lappend result(-groups) $gname
+                        }
+                    }
+                }
+                if {!$opts(groupsids)} {
+                    unset result(-groupsids)
+                }
+            }
+            if {$opts(integrity)} {
+                if {$opts(raw)} {
+                    set integrity [get_token_integrity $tok -raw]
+                } elseif {$opts(label)} {
+                    set integrity [get_token_integrity $tok -label]
+                } else {
+                    set integrity [get_token_integrity $tok]
+                }
+                set result(-integrity) $integrity
+            }
+        } finally {
+            close_token $tok
+        }
+
+        return [array get result]
+    }
+
+    return [_token_info_helper {*}$args]
+}
+
+# Set various information for a process token
+# Caller assumed to have enabled appropriate privileges
+proc twapi::_token_set_helper {args} {
+    package require twapi_security
+
+    proc _token_set_helper {args} {
+        if {[llength $args] == 1} {
+            # All options specified as one argument
+            set args [lindex $args 0]
+        }
+
+        array set opts [parseargs args {
+            virtualized.bool
+            integrity.arg
+            {noexist.arg "(no such process)"}
+            {noaccess.arg "(unknown)"}
+            pid.arg
+            hprocess.arg
+        } -maxleftover 0]
+
+        if {[info exists opts(pid)] && [info exists opts(hprocess)]} {
+            error "Options -pid and -hprocess cannot be specified together."
+        }
+
+        # Open token with appropriate access rights depending on request.
+        set access [list token_adjust_default]
+
+        if {[info exists opts(hprocess)]} {
+            set tok [open_process_token -hprocess $opts(hprocess) -access $access]
+        } elseif {[info exists opts(pid)]} {
+            set tok [open_process_token -pid $opts(pid) -access $access]
+        } else {
+            # Default is current process
+            set tok [open_process_token -access $access]
+        }
+
+        set result [list ]
+        trap {
+            if {[info exists opts(integrity)]} {
+                set_token_integrity $tok $opts(integrity)
+            }
+            if {[info exists opts(virtualized)]} {
+                set_token_virtualization $tok $opts(virtualized)
+            }
+        } finally {
+            close_token $tok
+        }
+
+        return $result
+    }
+    return [_token_set_helper {*}$args]
+}
+
+# Map console color name to integer attribute
+proc twapi::_map_console_color {colors background} {
+    set attr 0
+    foreach color $colors {
+        switch -exact -- $color {
+            blue   {setbits attr 1}
+            green  {setbits attr 2}
+            red    {setbits attr 4}
+            white  {setbits attr 7}
+            bright {setbits attr 8}
+            black  { }
+            default {error "Unknown color name $color"}
+        }
+    }
+    if {$background} {
+        set attr [expr {$attr << 4}]
+    }
+    return $attr
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/rds.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/rds.tcl
new file mode 100644
index 00000000..9f2757a1
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/rds.tcl
@@ -0,0 +1,191 @@
+#
+# Copyright (c) 2010, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# Remote Desktop Services - TBD - document and test
+
+namespace eval twapi {}
+
+proc twapi::rds_enumerate_sessions {args} {
+    array set opts [parseargs args {
+        {hserver.arg 0}
+        state.arg
+    } -maxleftover 0]
+
+    set states {active connected connectquery shadow disconnected idle listen reset down init}
+    if {[info exists opts(state)]} {
+        if {[string is integer -strict $opts(state)]} {
+            set state $opts(state)
+        } else {
+            set state [lsearch -exact $states $opts(state)]
+            if {$state < 0} {
+                error "Invalid value '$opts(state)' specified for -state option."
+            }
+        }
+    }
+
+    set sessions [WTSEnumerateSessions $opts(hserver)]
+
+    if {[info exists state]} {
+        set sessions [recordarray get $sessions -filter [list [list State == $state]]]
+    }
+
+    set result {}
+    foreach {sess rec} [recordarray getdict $sessions -key SessionId -format dict] {
+        set state [lindex $states [kl_get $rec State]]
+        if {$state eq ""} {
+            set state [kl_get $rec State]
+        }
+        lappend result $sess [list -tssession [kl_get $rec SessionId] \
+                                  -winstaname [kl_get $rec pWinStationName] \
+                                  -state $state]
+    }
+    return $result
+}
+
+proc twapi::rds_disconnect_session args {
+    array set opts [parseargs args {
+        {hserver.arg 0}
+        {tssession.int -1}
+        {async.bool false}
+    } -maxleftover 0]
+
+    WTSDisconnectSession $opts(hserver) $opts(tssession) [expr {! $opts(async)}]
+
+}
+
+proc twapi::rds_logoff_session args {
+    array set opts [parseargs args {
+        {hserver.arg 0}
+        {tssession.int -1}
+        {async.bool false}
+    } -maxleftover 0]
+
+    WTSLogoffSession $opts(hserver) $opts(tssession) [expr {! $opts(async)}]
+}
+
+proc twapi::rds_query_session_information {infoclass args} {
+    array set opts [parseargs args {
+        {hserver.arg 0}
+        {tssession.int -1}
+    } -maxleftover 0]
+
+    return [WTSQuerySessionInformation $opts(hserver) $opts(tssession) $infoclass]
+}
+
+interp alias {} twapi::rds_get_session_appname {} twapi::rds_query_session_information 1
+interp alias {} twapi::rds_get_session_clientdir {} twapi::rds_query_session_information 11
+interp alias {} twapi::rds_get_session_clientname {} twapi::rds_query_session_information 10
+interp alias {} twapi::rds_get_session_userdomain {} twapi::rds_query_session_information 7
+interp alias {} twapi::rds_get_session_initialprogram {} twapi::rds_query_session_information 0
+interp alias {} twapi::rds_get_session_oemid {} twapi::rds_query_session_information 3
+interp alias {} twapi::rds_get_session_user {} twapi::rds_query_session_information 5
+interp alias {} twapi::rds_get_session_winsta {} twapi::rds_query_session_information 6
+interp alias {} twapi::rds_get_session_intialdir {} twapi::rds_query_session_information 2
+interp alias {} twapi::rds_get_session_clientbuild {} twapi::rds_query_session_information 9
+interp alias {} twapi::rds_get_session_clienthwid {} twapi::rds_query_session_information 13
+interp alias {} twapi::rds_get_session_state {} twapi::rds_query_session_information 8
+interp alias {} twapi::rds_get_session_id {} twapi::rds_query_session_information 4
+interp alias {} twapi::rds_get_session_productid {} twapi::rds_query_session_information 12
+interp alias {} twapi::rds_get_session_protocol {} twapi::rds_query_session_information 16
+
+
+proc twapi::rds_send_message {args} {
+
+    array set opts [parseargs args {
+        {hserver.arg 0}
+        tssession.int
+        title.arg
+        message.arg
+        {buttons.arg ok}
+        {icon.arg information}
+        defaultbutton.arg
+        {modality.arg task {task appl application system}}
+        {justify.arg left {left right}}
+        rtl.bool
+        foreground.bool
+        topmost.bool
+        showhelp.bool
+        service.bool
+        timeout.int
+        async.bool
+    } -maxleftover 0 -nulldefault]
+
+    if {![kl_vget {
+        ok             {0 {ok}}
+        okcancel       {1 {ok cancel}}
+        abortretryignore {2 {abort retry ignore}}
+        yesnocancel    {3 {yes no cancel}}
+        yesno          {4 {yes no}}
+        retrycancel    {5 {retry cancel}}
+        canceltrycontinue {6 {cancel try continue}}
+    } $opts(buttons) buttons]} {
+        error "Invalid value '$opts(buttons)' specified for option -buttons."
+    }
+
+    set style [lindex $buttons 0]
+    switch -exact -- $opts(icon) {
+        warning -
+        exclamation {setbits style 0x30}
+        asterisk -
+        information {setbits style 0x40}
+        question    {setbits style 0x20}
+        error -
+        hand  -
+        stop        {setbits style 0x10}
+        default {
+            error "Invalid value '$opts(icon)' specified for option -icon."
+        }
+    }
+
+    # Map the default button
+    switch -exact -- [lsearch -exact [lindex $buttons 1] $opts(defaultbutton)] {
+        1 {setbits style 0x100 }
+        2 {setbits style 0x200 }
+        3 {setbits style 0x300 }
+        default {
+            # First button,
+            # setbits style 0x000
+        }
+    }
+
+    switch -exact -- $opts(modality) {
+        system { setbits style 0x1000 }
+        task   { setbits style 0x2000 }
+        appl -
+        application -
+        default {
+            # setbits style 0x0000
+        }
+    }
+
+    if {$opts(showhelp)} { setbits style 0x00004000 }
+    if {$opts(rtl)} { setbits style 0x00100000 }
+    if {$opts(justify) eq "right"} { setbits style 0x00080000 }
+    if {$opts(topmost)} { setbits style 0x00040000 }
+    if {$opts(foreground)} { setbits style 0x00010000 }
+    if {$opts(service)} { setbits style 0x00200000 }
+
+    set response [WTSSendMessage $opts(hserver) $opts(tssession) $opts(title) \
+                      $opts(message) $style $opts(timeout) \
+                      [expr {!$opts(async)}]]
+    
+    switch -exact -- $response {
+        1 { return ok }
+        2 { return cancel }
+        3 { return abort }
+        4 { return retry }
+        5 { return ignore }
+        6 { return yes }
+        7 { return no }
+        8 { return close }
+        9 { return help }
+        10 { return tryagain }
+        11 { return continue }
+        32000 { return timeout }
+        32001 { return async }
+        default { return $response }
+    }
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/registry.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/registry.tcl
new file mode 100644
index 00000000..9cb3403d
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/registry.tcl
@@ -0,0 +1,490 @@
+#
+# Copyright (c) 2020 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {}
+
+#
+# TBD -32bit and -64bit options are not documented
+# pending test cases
+
+proc twapi::reg_key_copy {hkey to_hkey args} {
+    parseargs args {
+        subkey.arg
+        copysecd.bool
+    } -setvars -maxleftover 0 -nulldefault
+
+    if {$copysecd} {
+        RegCopyTree $hkey $subkey $to_hkey
+    } else {
+        SHCopyKey $hkey $subkey $to_hkey
+    }
+}
+
+proc twapi::reg_key_create {hkey subkey args} {
+    # TBD - document -link
+    # [opt_def [cmd -link] [arg BOOL]] If [const true], [arg SUBKEY] is stored as the
+    # value of the [const SymbolicLinkValue] value under [arg HKEY]. Default is
+    # [const false].
+    parseargs args {
+        {access.arg generic_read}
+        {inherit.bool 0}
+        {secd.arg ""}
+        {volatile.bool 0 0x1}
+        {link.bool 0 0x2}
+        {backup.bool 0 0x4}
+        32bit
+        64bit
+        disposition.arg
+    } -maxleftover 0 -setvars
+
+    set access [_access_rights_to_mask $access]
+    # Note: Following might be set via -access as well. The -32bit and -64bit
+    # options just make it a little more convenient for caller
+    if {$32bit} {
+        set access [expr {$access | 0x200}]
+    }
+    if {$64bit} {
+        set access [expr {$access | 0x100}]
+    }
+    lassign [RegCreateKeyEx \
+                 $hkey \
+                 $subkey \
+                 0 \
+                 "" \
+                 [expr {$volatile | $backup}] \
+                 $access \
+                 [_make_secattr $secd $inherit] \
+                ] hkey disposition_value
+    if {[info exists disposition]} {
+        upvar 1 $disposition created_or_existed
+        if {$disposition_value == 1} {
+            set created_or_existed created
+        } else {
+            # disposition_value == 2
+            set created_or_existed existed
+        }
+    }
+    return $hkey
+}
+
+proc twapi::reg_key_delete {hkey subkey args} {
+    parseargs args {
+        32bit
+        64bit
+    } -maxleftover 0 -setvars
+
+    # TBD - document options after adding tests
+    set access 0
+    if {$32bit} {
+        set access [expr {$access | 0x200}]
+    }
+    if {$64bit} {
+        set access [expr {$access | 0x100}]
+    }
+
+    RegDeleteKeyEx $hkey $subkey $access
+}
+
+proc twapi::reg_keys {hkey {subkey {}}} {
+    if {$subkey ne ""} {
+        set hkey [reg_key_open $hkey $subkey]
+    }
+    try {
+        return [RegEnumKeyEx $hkey 0]
+    } finally {
+        if {$subkey ne ""} {
+            reg_key_close $hkey
+        }
+    }
+}
+
+proc twapi::reg_key_open {hkey subkey args} {
+    # Not documented: -link, -32bit, -64bit
+    # [opt_def [cmd -link] [arg BOOL]] If [const true], specifies the key is a
+    # symbolic link. Defaults to [const false].
+    parseargs args {
+        {link.bool 0}
+        {access.arg generic_read}
+        32bit
+        64bit
+    } -maxleftover 0 -setvars
+
+    set access [_access_rights_to_mask $access]
+    # Note: Following might be set via -access as well. The -32bit and -64bit
+    # options just make it a little more convenient for caller
+    if {$32bit} {
+        set access [expr {$access | 0x200}]
+    }
+    if {$64bit} {
+        set access [expr {$access | 0x100}]
+    }
+    return [RegOpenKeyEx $hkey $subkey $link $access]
+}
+
+proc twapi::reg_value_delete {hkey args} {
+    if {[llength $args] == 1} {
+        RegDeleteValue $hkey [lindex $args 0]
+    } elseif {[llength $args] == 2} {
+        RegDeleteKeyValue $hkey {*}$args
+    } else {
+        error "Wrong # args: should be \"reg_value_delete ?SUBKEY? VALUENAME\""
+    }
+}
+
+proc twapi::reg_key_current_user {args} {
+    parseargs args {
+        {access.arg generic_read}
+        32bit
+        64bit
+    } -maxleftover 0 -setvars
+
+    set access [_access_rights_to_mask $access]
+    # Note: Following might be set via -access as well. The -32bit and -64bit
+    # options just make it a little more convenient for caller
+    if {$32bit} {
+        set access [expr {$access | 0x200}]
+    }
+    if {$64bit} {
+        set access [expr {$access | 0x100}]
+    }
+    return [RegOpenCurrentUser $access]
+}
+
+proc twapi::reg_key_user_classes_root {usertoken args} {
+    parseargs args {
+        {access.arg generic_read}
+        32bit
+        64bit
+    } -maxleftover 0 -setvars
+
+    set access [_access_rights_to_mask $access]
+    # Note: Following might be set via -access as well. The -32bit and -64bit
+    # options just make it a little more convenient for caller
+    if {$32bit} {
+        set access [expr {$access | 0x200}]
+    }
+    if {$64bit} {
+        set access [expr {$access | 0x100}]
+    }
+    return [RegOpenUserClassesRoot $usertoken 0 $access]
+}
+
+proc twapi::reg_key_export {hkey filepath args} {
+    parseargs args {
+        {secd.arg {}}
+        {format.arg xp {win2k xp}}
+        {compress.bool 1}
+    } -setvars
+
+    set format [dict get {win2k 1 xp 2} $format]
+    if {! $compress} {
+        set format [expr {$format | 4}]
+    }
+    twapi::eval_with_privileges {
+        RegSaveKeyEx $hkey $filepath [_make_secattr $secd 0] $format
+    } SeBackupPrivilege
+}
+
+proc twapi::reg_key_import {hkey filepath args} {
+    parseargs args {
+        {volatile.bool 0 0x1}
+        {force.bool 0 0x8}
+    } -setvars
+    twapi::eval_with_privileges {
+        RegRestoreKey $hkey $filepath [expr {$force | $volatile}]
+    } {SeBackupPrivilege SeRestorePrivilege}
+}
+
+proc twapi::reg_key_load {hkey hivename filepath} {
+    twapi::eval_with_privileges {
+        RegLoadKey $hkey $subkey $filepath
+    } {SeBackupPrivilege SeRestorePrivilege}
+}
+
+proc twapi::reg_key_unload {hkey hivename} {
+    twapi::eval_with_privileges {
+        RegUnLoadKey $hkey $subkey
+    } {SeBackupPrivilege SeRestorePrivilege}
+}
+
+proc twapi::reg_key_monitor {hkey hevent args} {
+    parseargs args {
+        {keys.bool 0 0x1}
+        {attr.bool 0 0x2}
+        {values.bool 0 0x4}
+        {secd.bool 0 0x8}
+        {subtree.bool 0}
+    } -setvars
+
+    set filter [expr {$keys | $attr | $values | $secd}]
+    if {$filter == 0} {
+        set filter 0xf
+    }
+
+    RegNotifyChangeKeyValue $hkey $subtree $filter $hevent 1
+}
+
+proc twapi::reg_value_names {hkey {subkey {}}} {
+    if {$subkey eq ""} {
+        # 0 - value names only
+        return [RegEnumValue $hkey 0]
+    }
+    set hkey [reg_key_open $hkey $subkey]
+    try {
+        # 0 - value names only
+        return [RegEnumValue $hkey 0]
+    } finally {
+        reg_key_close $hkey
+    }
+}
+
+proc twapi::reg_values {hkey {subkey {}}} {
+    if {$subkey eq ""} {
+        #  3 -> 0x1 - return data values, 0x2 - cooked data
+        return [RegEnumValue $hkey 3]
+    }
+    set hkey [reg_key_open $hkey $subkey]
+    try {
+        #  3 -> 0x1 - return data values, 0x2 - cooked data
+        return [RegEnumValue $hkey 3]
+    } finally {
+        reg_key_close $hkey
+    }
+}
+
+proc twapi::reg_values_raw {hkey {subkey {}}} {
+    if {$subkey eq ""} {
+        #  0x1 - return data values
+        return [RegEnumValue $hkey 1]
+    }
+    set hkey [reg_key_open $hkey $subkey]
+    try {
+        return [RegEnumValue $hkey 1]
+    } finally {
+        reg_key_close $hkey
+    }
+}
+
+proc twapi::reg_value_raw {hkey args} {
+    if {[llength $args] == 1} {
+        return [RegQueryValueEx $hkey [lindex $args 0] false]
+    } elseif {[llength $args] == 2} {
+        return [RegGetValue $hkey {*}$args 0x1000ffff false]
+    } else {
+        error "wrong # args: should be \"reg_value_get HKEY ?SUBKEY? VALUENAME\""
+    }
+}
+
+proc twapi::reg_value {hkey args} {
+    if {[llength $args] == 1} {
+        return [RegQueryValueEx $hkey [lindex $args 0] true]
+    } elseif {[llength $args] == 2} {
+        return [RegGetValue $hkey {*}$args 0x1000ffff true]
+    } else {
+        error "wrong # args: should be \"reg_value_get HKEY ?SUBKEY? VALUENAME\""
+    }
+}
+
+if {[twapi::min_os_version 6]} {
+    proc twapi::reg_value_set {hkey args} {
+        if {[llength $args] == 3} {
+            return [RegSetValueEx $hkey {*}$args]
+        } elseif {[llength $args] == 4} {
+            return [RegSetKeyValue $hkey {*}$args]
+        } else {
+            error "wrong # args: should be \"reg_value_set HKEY ?SUBKEY? VALUENAME TYPE VALUE\""
+        }
+    }
+} else {
+    proc twapi::reg_value_set {hkey args} {
+        if {[llength $args] == 3} {
+            lassign $args value_name value_type value
+        } elseif {[llength $args] == 4} {
+            lassign $args subkey value_name value_type value
+            set hkey [reg_key_open $hkey $subkey -access key_set_value]
+        } else {
+            error "wrong # args: should be \"reg_value_set HKEY ?SUBKEY? VALUENAME TYPE VALUE\""
+        }
+        try {
+            RegSetValueEx $hkey $value_name $value_type $value
+        } finally {
+            if {[info exists subkey]} {
+                # We opened hkey
+                reg_close_key $hkey
+            }
+        }
+    }
+}
+
+proc twapi::reg_key_override_undo {hkey} {
+    RegOverridePredefKey $hkey 0
+}
+
+proc twapi::_reg_walker {hkey path callback cbdata} {
+    # Callback for the key
+    set code [catch {
+        {*}$callback $cbdata $hkey $path
+    } cbdata ropts]
+    if {$code != 0} {
+        if {$code == 4} {
+            # Continue - skip children, continue with siblings
+            return $cbdata
+        } elseif {$code == 3} {
+            # Skip siblings as well
+            return -code break $cbdata
+        } elseif {$code == 2} {
+            # Stop complete iteration
+            return -code return $cbdata
+        } else {
+            return -options $ropts $cbdata
+        }
+    }
+
+    # Iterate over child keys
+    foreach child_key [reg_keys $hkey] {
+        set child_hkey [reg_key_open $hkey $child_key]
+        try {
+            # Recurse to call into children
+            set code [catch {
+                _reg_walker $child_hkey [linsert $path end $child_key] $callback $cbdata
+            } cbdata ropts]
+            if {$code != 0 && $code != 4} {
+                if {$code == 3} {
+                    # break - skip remaining child keys
+                    return $cbdata
+                } elseif {$code == 2} {
+                    # return - stop all iteration all up the tree
+                    return -code return $cbdata
+                } else {
+                    return -options $ropts $cbdata
+                }
+            }
+        } finally {
+            reg_key_close $child_hkey
+        }
+    }
+
+    return $cbdata
+}
+
+proc twapi::reg_walk {hkey args} {
+    parseargs args {
+        {subkey.arg {}}
+        callback.arg
+        {cbdata.arg ""}
+    } -maxleftover 0 -setvars
+
+
+    if {$subkey ne ""} {
+        set hkey [reg_key_open $hkey $subkey]
+        set path [list $subkey]
+    } else {
+        set path [list ]
+    }
+
+    if {![info exists callback]} {
+        set callback [lambda {cbdata hkey path} {puts [join $path \\]}]
+    }
+    try {
+        set code [catch {_reg_walker $hkey $path $callback $cbdata } result ropts]
+        # Codes 2 (return), 3 (break) and 4 (continue) are just early terminations
+        if {$code == 1} {
+            return -options $ropts $result
+        }
+    } finally {
+        if {$subkey ne ""} {
+            reg_key_close $hkey
+        }
+    }
+    return $result
+}
+
+proc twapi::_reg_iterator_callback {cbdata hkey path args} {
+    set cmd [yield [list $hkey $path {*}$args]]
+    # Loop until valid argument
+    while {1} {
+        switch -exact -- $cmd {
+            "" -
+            next { return $cbdata }
+            stop { return -code return $cbdata }
+            parentsibling { return -code break $cbdata }
+            sibling { return -code continue $cbdata }
+            default {
+                set ret [yieldto return -level 0 -code error "Invalid argument \"$cmd\"."]
+            }
+        }
+    }
+}
+
+proc twapi::_reg_iterator_coro {hkey subkey} {
+    set cmd [yield [info coroutine]]
+    switch -exact -- $cmd {
+        "" -
+        next {
+            # Drop into reg_walk
+        }
+        stop -
+        parentsibling -
+        sibling {
+            return {}
+        }
+        default {
+            error "Invalid argument \"$cmd\"."
+        }
+    }
+    if {$subkey ne ""} {
+        set hkey [reg_key_open $hkey $subkey]
+    }
+    try {
+        reg_walk $hkey -callback [namespace current]::_reg_iterator_callback
+    } finally {
+        if {$subkey ne ""} {
+            reg_key_close $hkey
+        }
+    }
+    return
+}
+
+proc twapi::reg_iterator {hkey {subkey {}}} {
+    variable reg_walk_counter
+
+    return [coroutine "regwalk#[incr reg_walk_counter]" _reg_iterator_coro $hkey $subkey]
+}
+
+proc twapi::reg_tree {hkey {subkey {}}} {
+
+    set iter [reg_iterator $hkey $subkey]
+
+    set paths {}
+    while {[llength [set item [$iter next]]]} {
+        lappend paths [join [lindex $item 1] \\]
+    }
+    return $paths
+}
+
+proc twapi::reg_tree_values {hkey {subkey {}}} {
+
+    set iter [reg_iterator $hkey $subkey]
+
+    set tree {}
+    # Note here we cannot ignore the first empty node corresponding
+    # to the root because we have to return any values it contains.
+    while {[llength [set item [$iter next]]]} {
+        dict set tree [join [lindex $item 1] \\] [reg_values [lindex $item 0]]
+    }
+    return $tree
+}
+
+proc twapi::reg_tree_values_raw {hkey {subkey {}}} {
+    set iter [reg_iterator $hkey $subkey]
+
+    set tree {}
+    while {[llength [set item [$iter next]]]} {
+        dict set tree [join [lindex $item 1] \\] [reg_values_raw [lindex $item 0]]
+    }
+    return $tree
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/resource.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/resource.tcl
new file mode 100644
index 00000000..fea6cdda
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/resource.tcl
@@ -0,0 +1,458 @@
+# Commands related to resource manipulation
+#
+# Copyright (c) 2003-2012 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+package require twapi_nls
+
+# Retrieve version info for a file
+proc twapi::get_file_version_resource {path args} {
+    array set opts [parseargs args {
+        all
+        datetime
+        signature
+        structversion
+        fileversion
+        productversion
+        flags
+        fileos
+        filetype
+        foundlangid
+        foundcodepage
+        langid.arg
+        codepage.arg
+    }]
+
+
+    set ver [Twapi_GetFileVersionInfo $path]
+
+    trap {
+        array set verinfo [Twapi_VerQueryValue_FIXEDFILEINFO $ver]
+
+        set result [list ]
+        if {$opts(all) || $opts(signature)} {
+            lappend result -signature [format 0x%x $verinfo(dwSignature)]
+        }
+
+        if {$opts(all) || $opts(structversion)} {
+            lappend result -structversion "[expr {0xffff & ($verinfo(dwStrucVersion) >> 16)}].[expr {0xffff & $verinfo(dwStrucVersion)}]"
+        }
+
+        if {$opts(all) || $opts(fileversion)} {
+            lappend result -fileversion "[expr {0xffff & ($verinfo(dwFileVersionMS) >> 16)}].[expr {0xffff & $verinfo(dwFileVersionMS)}].[expr {0xffff & ($verinfo(dwFileVersionLS) >> 16)}].[expr {0xffff & $verinfo(dwFileVersionLS)}]"
+        }
+
+        if {$opts(all) || $opts(productversion)} {
+            lappend result -productversion "[expr {0xffff & ($verinfo(dwProductVersionMS) >> 16)}].[expr {0xffff & $verinfo(dwProductVersionMS)}].[expr {0xffff & ($verinfo(dwProductVersionLS) >> 16)}].[expr {0xffff & $verinfo(dwProductVersionLS)}]"
+        }
+
+        if {$opts(all) || $opts(flags)} {
+            set flags [expr {$verinfo(dwFileFlags) & $verinfo(dwFileFlagsMask)}]
+            lappend result -flags \
+                [_make_symbolic_bitmask \
+                     [expr {$verinfo(dwFileFlags) & $verinfo(dwFileFlagsMask)}] \
+                     {
+                         debug 1
+                         prerelease 2
+                         patched 4
+                         privatebuild 8
+                         infoinferred 16
+                         specialbuild 32
+                     } \
+                     ]
+        }
+
+        if {$opts(all) || $opts(fileos)} {
+            switch -exact -- [format %08x $verinfo(dwFileOS)] {
+                00010000 {set os dos}
+                00020000 {set os os216}
+                00030000 {set os os232}
+                00040000 {set os nt}
+                00050000 {set os wince}
+                00000001 {set os windows16}
+                00000002 {set os pm16}
+                00000003 {set os pm32}
+                00000004 {set os windows32}
+                00010001 {set os dos_windows16}
+                00010004 {set os dos_windows32}
+                00020002 {set os os216_pm16}
+                00030003 {set os os232_pm32}
+                00040004 {set os nt_windows32}
+                default {set os $verinfo(dwFileOS)}
+            }
+            lappend result -fileos $os
+        }
+
+        if {$opts(all) || $opts(filetype)} {
+            switch -exact -- [expr {0+$verinfo(dwFileType)}] {
+                1 {set type application}
+                2 {set type dll}
+                3 {
+                    set type "driver."
+                    switch -exact -- [expr {0+$verinfo(dwFileSubtype)}] {
+                        1 {append type printer}
+                        2 {append type keyboard}
+                        3 {append type language}
+                        4 {append type display}
+                        5 {append type mouse}
+                        6 {append type network}
+                        7 {append type system}
+                        8 {append type installable}
+                        9  {append type sound}
+                        10 {append type comm}
+                        11 {append type inputmethod}
+                        12 {append type versionedprinter}
+                        default {append type $verinfo(dwFileSubtype)}
+                    }
+                }
+                4 {
+                    set type "font."
+                    switch -exact -- [expr {0+$verinfo(dwFileSubtype)}] {
+                        1 {append type raster}
+                        2 {append type vector}
+                        3 {append type truetype}
+                        default {append type $verinfo(dwFileSubtype)}
+                    }
+                }
+                5 { set type "vxd.$verinfo(dwFileSubtype)" }
+                7 {set type staticlib}
+                default {
+                    set type "$verinfo(dwFileType).$verinfo(dwFileSubtype)"
+                }
+            }
+            lappend result -filetype $type
+        }
+
+        if {$opts(all) || $opts(datetime)} {
+            lappend result -datetime [expr {($verinfo(dwFileDateMS) << 32) + $verinfo(dwFileDateLS)}]
+        }
+
+        # Any remaining arguments are treated as string names
+
+        if {[llength $args] || $opts(foundlangid) || $opts(foundcodepage) || $opts(all)} {
+            # Find list of langid's and codepages and do closest match
+            set langid [expr {[info exists opts(langid)] ? $opts(langid) : [get_user_ui_langid]}]
+            set primary_langid [extract_primary_langid $langid]
+            set sub_langid     [extract_sublanguage_langid $langid]
+            set cp [expr {[info exists opts(codepage)] ? $opts(codepage) : 0}]
+
+            # Find a match in the following order:
+            # 0 Exact match for both langid and codepage
+            # 1 Exact match for langid
+            # 2 Primary langid matches (sublang does not) and exact codepage
+            # 3 Primary langid matches (sublang does not)
+            # 4 Language neutral
+            # 5 English
+            # 6 First langcp in list or "00000000"
+            set match(7) "00000000";    # In case list is empty
+            foreach langcp [Twapi_VerQueryValue_TRANSLATIONS $ver] {
+                set verlangid 0x[string range $langcp 0 3]
+                set vercp 0x[string range $langcp 4 7]
+                if {$verlangid == $langid && $vercp == $cp} {
+                    set match(0) $langcp
+                    break;              # No need to look further
+                }
+                if {[info exists match(1)]} continue
+                if {$verlangid == $langid} {
+                    set match(1) $langcp
+                    continue;           # Continue to look for match(0)
+                }
+                if {[info exists match(2)]} continue
+                set verprimary [extract_primary_langid $verlangid]
+                if {$verprimary == $primary_langid && $vercp == $cp} {
+                    set match(2) $langcp
+                    continue;       # Continue to look for match(1) or better
+                }
+                if {[info exists match(3)]} continue
+                if {$verprimary == $primary_langid} {
+                    set match(3) $langcp
+                    continue;       # Continue to look for match(2) or better
+                }
+                if {[info exists match(4)]} continue
+                if {$verprimary == 0} {
+                    set match(4) $langcp; # LANG_NEUTRAL
+                    continue;       # Continue to look for match(3) or better
+                }
+                if {[info exists match(5)]} continue
+                if {$verprimary == 9} {
+                    set match(5) $langcp; # English
+                    continue;       # Continue to look for match(4) or better
+                }
+                if {![info exists match(6)]} {
+                    set match(6) $langcp
+                }
+            }
+
+            # Figure out what is the best match we have
+            for {set i 0} {$i <= 7} {incr i} {
+                if {[info exists match($i)]} {
+                    break
+                }
+            }
+
+            if {$opts(foundlangid) || $opts(all)} {
+                set langid 0x[string range $match($i) 0 3] 
+                lappend result -foundlangid [list $langid [VerLanguageName $langid]]
+            }
+
+            if {$opts(foundcodepage) || $opts(all)} {
+                lappend result -foundcodepage 0x[string range $match($i) 4 7]
+            }
+
+            foreach sname $args {
+                lappend result $sname [Twapi_VerQueryValue_STRING $ver $match($i) $sname]
+            }
+
+        }
+
+    } finally {
+        Twapi_FreeFileVersionInfo $ver
+    }
+
+    return $result
+}
+
+proc twapi::begin_resource_update {path args} {
+    array set opts [parseargs args {
+        deleteall
+    } -maxleftover 0]
+
+    return [BeginUpdateResource $path $opts(deleteall)]
+}
+
+# Note this is not an alias because we want to control arguments
+# to UpdateResource (which can take more args that specified here)
+proc twapi::delete_resource {hmod restype resname langid} {
+    UpdateResource $hmod $restype $resname $langid
+}
+
+
+# Note this is not an alias because we want to make sure $bindata is specified
+# as an argument else it will have the effect of deleting a resource
+proc twapi::update_resource {hmod restype resname langid bindata} {
+    UpdateResource $hmod $restype $resname $langid $bindata
+}
+
+proc twapi::end_resource_update {hmod args} {
+    array set opts [parseargs args {
+        discard
+    } -maxleftover 0]
+
+    return [EndUpdateResource $hmod $opts(discard)]
+}
+
+proc twapi::read_resource {hmod restype resname langid} {
+    return [Twapi_LoadResource $hmod [FindResourceEx $hmod $restype $resname $langid]]
+}
+
+proc twapi::read_resource_string {hmod resname langid} {
+    # As an aside, note that we do not use a LoadString call
+    # because it does not allow for specification of a langid
+    
+    # For a reference to how strings are stored, see
+    # http://blogs.msdn.com/b/oldnewthing/archive/2004/01/30/65013.aspx
+    # or http://support.microsoft.com/kb/196774
+
+    if {![string is integer -strict $resname]} {
+        error "String resources must have an integer id"
+    }
+
+    lassign [resource_stringid_to_stringblockid $resname]  block_id index_within_block
+
+    return [lindex \
+                [resource_stringblock_to_strings \
+                     [read_resource $hmod 6 $block_id $langid] ] \
+                $index_within_block]
+}
+
+# Give a list of strings, formats it as a string block. Number of strings
+# must not be greater than 16. If less than 16 strings, remaining are
+# treated as empty.
+proc twapi::strings_to_resource_stringblock {strings} {
+    if {[llength $strings] > 16} {
+        error "Cannot have more than 16 strings in a resource string block."
+    }
+
+    for {set i 0} {$i < 16} {incr i} {
+        set s [lindex $strings $i]
+        set n [string length $s]
+        append bin [binary format sa* $n [encoding convertto unicode $s]]
+    }
+
+    return $bin
+}
+
+proc twapi::resource_stringid_to_stringblockid {id} {
+    # Strings are stored in blocks of 16, with block id's beginning at 1, not 0
+    return [list [expr {($id / 16) + 1}] [expr {$id & 15}]]
+}
+
+proc twapi::extract_resources {hmod {withdata 0}} {
+    set result [dict create]
+    foreach type [enumerate_resource_types $hmod] {
+        set typedict [dict create]
+        foreach name [enumerate_resource_names $hmod $type] {
+            set namedict [dict create]
+            foreach lang [enumerate_resource_languages $hmod $type $name] {
+                if {$withdata} {
+                    dict set namedict $lang [read_resource $hmod $type $name $lang]
+                } else {
+                    dict set namedict $lang {}
+                }
+            }
+            dict set typedict $name $namedict
+        }
+        dict set result $type $typedict
+    }
+    return $result
+}
+
+# TBD - test
+proc twapi::write_bmp_file {filename bmp} {
+    # Assumes $bmp is clipboard content in format 8 (CF_DIB)
+
+    # First parse the bitmap data to collect header information
+    binary scan $bmp "iiissiiiiii" size width height planes bitcount compression sizeimage xpelspermeter ypelspermeter clrused clrimportant
+
+    # We only handle BITMAPINFOHEADER right now (size must be 40)
+    if {$size != 40} {
+        error "Unsupported bitmap format. Header size=$size"
+    }
+
+    # We need to figure out the offset to the actual bitmap data
+    # from the start of the file header. For this we need to know the
+    # size of the color table which directly follows the BITMAPINFOHEADER
+    if {$bitcount == 0} {
+        error "Unsupported format: implicit JPEG or PNG"
+    } elseif {$bitcount == 1} {
+        set color_table_size 2
+    } elseif {$bitcount == 4} {
+        # TBD - Not sure if this is the size or the max size
+        set color_table_size 16
+    } elseif {$bitcount == 8} {
+        # TBD - Not sure if this is the size or the max size
+        set color_table_size 256
+    } elseif {$bitcount == 16 || $bitcount == 32} {
+        if {$compression == 0} {
+            # BI_RGB
+            set color_table_size $clrused
+        } elseif {$compression == 3} {
+            # BI_BITFIELDS
+            set color_table_size 3
+        } else {
+            error "Unsupported compression type '$compression' for bitcount value $bitcount"
+        }
+    } elseif {$bitcount == 24} {
+        set color_table_size $clrused
+    } else {
+        error "Unsupported value '$bitcount' in bitmap bitcount field"
+    }
+
+    set filehdr_size 14;                # sizeof(BITMAPFILEHEADER)
+    set bitmap_file_offset [expr {$filehdr_size+$size+($color_table_size*4)}]
+    set filehdr [binary format "a2 i x2 x2 i" "BM" [expr {$filehdr_size + [string length $bmp]}] $bitmap_file_offset]
+
+    set fd [open $filename w]
+    fconfigure $fd -translation binary
+
+    puts -nonewline $fd $filehdr
+    puts -nonewline $fd $bmp
+
+    close $fd
+}
+
+proc twapi::_load_image {flags type hmod path args} {
+    # The flags arg is generally 0x10 (load from file), or 0 (module)
+    # or'ed with 0x8000 (shared). The latter can be overridden by
+    # the -shared option but should not be except when loading from module.
+    array set opts [parseargs args {
+        {createdibsection.bool 0 0x2000}
+        {defaultsize.bool  0  0x40}
+        height.int
+        {loadtransparent.bool 0 0x20}
+        {monochrome.bool  0  0x1}
+        {shared.bool  0  0x8000}
+        {vgacolor.bool  0  0x80}
+        width.int
+    } -maxleftover 0 -nulldefault]
+
+    set flags [expr {$flags | $opts(defaultsize) | $opts(loadtransparent) | $opts(monochrome) | $opts(shared) | $opts(vgacolor)}]
+
+    set h [LoadImage $hmod $path $type $opts(width) $opts(height) $flags]
+    # Cast as _SHARED if required to offer some protection against
+    # being freed using DestroyIcon etc.
+    set type [lindex {HGDIOBJ HICON HCURSOR} $type]
+    if {$flags & 0x8000} {
+        append type _SHARED
+    }
+    return [cast_handle $h $type]
+}
+
+
+proc twapi::_load_image_from_system {type id args} {
+    variable _oem_image_syms
+
+    if {![string is integer -strict $id]} {
+        if {![info exists _oem_image_syms]} {
+            # Bitmap symbols (type 0)
+            dict set _oem_image_syms 0 {
+                CLOSE           32754            UPARROW         32753
+                DNARROW         32752            RGARROW         32751
+                LFARROW         32750            REDUCE          32749
+                ZOOM            32748            RESTORE         32747
+                REDUCED         32746            ZOOMD           32745
+                RESTORED        32744            UPARROWD        32743
+                DNARROWD        32742            RGARROWD        32741
+                LFARROWD        32740            MNARROW         32739
+                COMBO           32738            UPARROWI        32737
+                DNARROWI        32736            RGARROWI        32735
+                LFARROWI        32734            SIZE            32766
+                BTSIZE          32761            CHECK           32760
+                CHECKBOXES      32759            BTNCORNERS      32758
+            }            
+            # Icon symbols (type 1)
+            dict set _oem_image_syms 1 {
+                SAMPLE          32512            HAND            32513
+                QUES            32514            BANG            32515
+                NOTE            32516            WINLOGO         32517
+                WARNING         32515            ERROR           32513
+                INFORMATION     32516            SHIELD          32518
+            }
+            # Cursor symbols (type 2)
+            dict set _oem_image_syms 2 {
+                NORMAL          32512            IBEAM           32513
+                WAIT            32514            CROSS           32515
+                UP              32516            SIZENWSE        32642
+                SIZENESW        32643            SIZEWE          32644
+                SIZENS          32645            SIZEALL         32646
+                NO              32648            HAND            32649
+                APPSTARTING     32650
+            }
+
+        }
+    }
+        
+    set id [dict get $_oem_image_syms $type [string toupper $id]]
+    # Built-in system images must always be loaded shared (0x8000)
+    return [_load_image 0x8000 $type NULL $id {*}$args]
+}
+
+
+# 0x10 -> LR_LOADFROMFILE. Also 0x8000 not set (meaning unshared)
+interp alias {} twapi::load_bitmap_from_file {} twapi::_load_image 0x10 0 NULL
+interp alias {} twapi::load_icon_from_file {} twapi::_load_image 0x10 1 NULL
+interp alias {} twapi::load_cursor_from_file {} twapi::_load_image 0x10 2 NULL
+
+interp alias {} twapi::load_bitmap_from_module {} twapi::_load_image 0 0
+interp alias {} twapi::load_icon_from_module {} twapi::_load_image   0 1
+interp alias {} twapi::load_cursor_from_module {} twapi::_load_image 0 2
+
+interp alias {} twapi::load_bitmap_from_system {} twapi::_load_image_from_system 0
+interp alias {} twapi::load_icon_from_system {} twapi::_load_image_from_system   1
+interp alias {} twapi::load_cursor_from_system {} twapi::_load_image_from_system 2
+
+interp alias {} twapi::free_icon {} twapi::DestroyIcon
+interp alias {} twapi::free_bitmap {} twapi::DeleteObject
+interp alias {} twapi::free_cursor {} twapi::DestroyCursor
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/security.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/security.tcl
new file mode 100644
index 00000000..a0a799b5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/security.tcl
@@ -0,0 +1,2385 @@
+#
+# Copyright (c) 2003-2014, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# TBD - allow SID and account name to be used interchangeably in various
+# functions
+# TBD - ditto for LUID v/s privilege names
+
+namespace eval twapi {
+    # Map privilege level mnemonics to priv level
+    array set priv_level_map {guest 0 user 1 admin 2}
+
+    # TBD - the following are not used, enhancements needed ?
+    # OBJECT_INHERIT_ACE                0x1
+    # CONTAINER_INHERIT_ACE             0x2
+    # NO_PROPAGATE_INHERIT_ACE          0x4
+    # INHERIT_ONLY_ACE                  0x8
+    # INHERITED_ACE                     0x10
+    # VALID_INHERIT_FLAGS               0x1F
+
+    # Cache of privilege names to LUID's
+    variable _privilege_to_luid_map
+    set _privilege_to_luid_map {}
+    variable _luid_to_privilege_map {}
+
+}
+
+
+# Returns token for a process
+proc twapi::open_process_token {args} {
+    array set opts [parseargs args {
+        pid.int
+        hprocess.arg
+        {access.arg token_query}
+    } -maxleftover 0]
+
+    set access [_access_rights_to_mask $opts(access)]
+
+    # Get a handle for the process
+    if {[info exists opts(hprocess)]} {
+        if {[info exists opts(pid)]} {
+            error "Options -pid and -hprocess cannot be used together."
+        }
+        set ph $opts(hprocess)
+    } elseif {[info exists opts(pid)]} {
+        set ph [get_process_handle $opts(pid)]
+    } else {
+        variable my_process_handle
+        set ph $my_process_handle
+    }
+    trap {
+        # Get a token for the process
+        set ptok [OpenProcessToken $ph $access]
+    } finally {
+        # Close handle only if we did an OpenProcess
+        if {[info exists opts(pid)]} {
+            CloseHandle $ph
+        }
+    }
+
+    return $ptok
+}
+
+# Returns token for a process
+proc twapi::open_thread_token {args} {
+    array set opts [parseargs args {
+        tid.int
+        hthread.arg
+        {access.arg token_query}
+        {self.bool  false}
+    } -maxleftover 0]
+
+    set access [_access_rights_to_mask $opts(access)]
+
+    # Get a handle for the thread
+    if {[info exists opts(hthread)]} {
+        if {[info exists opts(tid)]} {
+            error "Options -tid and -hthread cannot be used together."
+        }
+        set th $opts(hthread)
+    } elseif {[info exists opts(tid)]} {
+        set th [get_thread_handle $opts(tid)]
+    } else {
+        set th [GetCurrentThread]
+    }
+
+    trap {
+        # Get a token for the thread
+        set tok [OpenThreadToken $th $access $opts(self)]
+    } finally {
+        # Close handle only if we did an OpenProcess
+        if {[info exists opts(tid)]} {
+            CloseHandle $th
+        }
+    }
+
+    return $tok
+}
+
+proc twapi::close_token {tok} {
+    CloseHandle $tok
+}
+
+# TBD - document and test
+proc twapi::duplicate_token {tok args} {
+    parseargs args {
+        access.arg
+        {inherit.bool 0}
+        {secd.arg ""}
+        {impersonationlevel.sym impersonation {anonymous 0 identification 1 impersonation 2 delegation 3}}
+        {type.sym primary {primary 1 impersonation 2}}
+    } -maxleftover 0 -setvars
+
+    if {[info exists access]} {
+        set access [_access_rights_to_mask $access]
+    } else {
+        # If no desired access is indicated, we want the same access as
+        # the original handle
+        set access 0
+    }
+
+    return [DuplicateTokenEx $tok $access \
+                [_make_secattr $secd $inherit] \
+                $impersonationlevel $type]
+}
+
+proc twapi::get_token_info {tok args} {
+    array set opts [parseargs args {
+        defaultdacl
+        disabledprivileges
+        elevation
+        enabledprivileges
+        groupattrs
+        groups
+        groupsids
+        integrity
+        integritylabel
+        linkedtoken
+        logonsession
+        logonsessionsid
+        origin
+        primarygroup
+        primarygroupsid
+        privileges
+        restrictedgroupattrs
+        restrictedgroups
+        tssession
+        usersid
+        virtualized
+    } -maxleftover 0]
+
+    # Do explicit check so we return error if no args specified
+    # and $tok is invalid
+    if {![pointer? $tok]} {
+        error "Invalid token handle '$tok'"
+    }
+
+    # TBD - add an -ignorerrors option
+
+    set result [dict create]
+    trap {
+        if {$opts(privileges) || $opts(disabledprivileges) || $opts(enabledprivileges)} {
+            lassign [GetTokenInformation $tok 13] gtigroups gtirestrictedgroups privs gtilogonsession
+            set privs [_map_luids_and_attrs_to_privileges $privs]
+            if {$opts(privileges)} {
+                lappend result -privileges $privs
+            }
+            if {$opts(enabledprivileges)} {
+                lappend result -enabledprivileges [lindex $privs 0]
+            }
+            if {$opts(disabledprivileges)} {
+                lappend result -disabledprivileges [lindex $privs 1]
+            }
+        }
+        if {$opts(defaultdacl)} {
+            lappend result -defaultdacl [get_token_default_dacl $tok]
+        }
+        if {$opts(origin)} {
+            lappend result -origin [get_token_origin $tok]
+        }
+        if {$opts(linkedtoken)} {
+            lappend result -linkedtoken [get_token_linked_token $tok]
+        }
+        if {$opts(elevation)} {
+            lappend result -elevation [get_token_elevation $tok]
+        }
+        if {$opts(integrity)} {
+            lappend result -integrity [get_token_integrity $tok]
+        }
+        if {$opts(integritylabel)} {
+            lappend result -integritylabel [get_token_integrity $tok -label]
+        }
+        if {$opts(virtualized)} {
+            lappend result -virtualized [get_token_virtualization $tok]
+        }
+        if {$opts(tssession)} {
+            lappend result -tssession [get_token_tssession $tok]
+        }
+        if {$opts(usersid)} {
+            # First element of groups is user sid
+            if {[info exists gtigroups]} {
+                lappend result -usersid [lindex $gtigroups 0 0 0]
+            } else {
+                lappend result -usersid [get_token_user $tok]
+            }
+        }
+        if {$opts(groups) || $opts(groupsids)} {
+            if {[info exists gtigroups]} {
+                set gsids {}
+                # First element of groups is user sid, skip it
+                foreach item [lrange $gtigroups 1 end] {
+                    lappend gsids [lindex $item 0]
+                }
+            } else {
+                set gsids [get_token_groups $tok]
+            }
+            if {$opts(groupsids)} {
+                lappend result -groupsids $gsids
+            }
+            if {$opts(groups)} {
+                set items {}
+                foreach gsid $gsids {
+                    lappend items [lookup_account_sid $gsid]
+                }
+                lappend result -groups $items
+            }
+        }
+        if {[min_os_version 6] && $opts(logonsessionsid)} {
+            # Only possible on Vista+
+	    lappend result -logonsessionsid [lindex [GetTokenInformation $tok 28] 0 0]
+            set opts(logonsessionsid) 0; # So we don't try second method below
+        }
+        if {$opts(groupattrs) || $opts(logonsessionsid)} {
+            if {[info exists gtigroups]} {
+                set items {}
+                # First element of groups is user sid, skip it
+                foreach item [lrange $gtigroups 1 end] {
+                    set gattrs [map_token_group_attr [lindex $item 1]]
+                    if {$opts(groupattrs)} {
+                        lappend items [lindex $item 0] $gattrs
+                    }
+                    if {$opts(logonsessionsid) && "logon_id" in $gattrs} {
+                        set logonsessionsid [lindex $item 0]
+                    }
+                }
+                if {$opts(groupattrs)} {
+                    lappend result -groupattrs $items
+                }
+            } else {
+                set groupattrs [get_token_groups_and_attrs $tok]
+                if {$opts(logonsessionsid)} {
+                    foreach {sid gattrs} $groupattrs {
+                        if {"logon_id" in $gattrs} {
+                            set logonsessionsid $sid
+                            break
+                        }
+                    }
+                }
+                if {$opts(groupattrs)} {
+                    lappend result -groupattrs $groupattrs
+                }
+            }
+            if {$opts(logonsessionsid)} {
+                if {[info exists logonsessionsid]} {
+                    lappend result -logonsessionsid $logonsessionsid
+                } else {
+                    error "No logon session id found in token"
+                }
+            }
+        }
+        if {$opts(restrictedgroups)} {
+            if {![info exists gtirestrictedgroups]} {
+                set gtirestrictedgroups [get_token_restricted_groups_and_attrs $tok]
+            }
+            set items {}
+            foreach item $gtirestrictedgroups {
+                lappend items [lookup_account_sid [lindex $item 0]]
+            }
+            lappend result -restrictedgroups $items
+        }
+        if {$opts(restrictedgroupattrs)} {
+            if {[info exists gtirestrictedgroups]} {
+                set items {}
+                foreach item $gtirestrictedgroups {
+                    lappend items [lindex $item 0] [map_token_group_attr [lindex $item 1]]
+                }
+                lappend result -restrictedgroupattrs $items
+            } else {
+                lappend result -restrictedgroupattrs [get_token_restricted_groups_and_attrs $tok]
+            }
+        }
+        if {$opts(primarygroupsid)} {
+            lappend result -primarygroupsid [get_token_primary_group $tok]
+        }
+        if {$opts(primarygroup)} {
+            lappend result -primarygroup [get_token_primary_group $tok -name]
+        }
+        if {$opts(logonsession)} {
+            if {[info exists gtilogonsession]} {
+                lappend result -logonsession $gtilogonsession
+            } else {
+                array set stats [get_token_statistics $tok]
+                lappend result -logonsession $stats(authluid)
+            }
+        }
+    }
+
+    return $result
+}
+
+proc twapi::get_token_tssession {tok} {
+    return [GetTokenInformation $tok 12]
+}
+
+# TBD - document and test
+proc twapi::set_token_tssession {tok tssession} {
+    Twapi_SetTokenSessionId $tok $tssession
+    return
+}
+
+# Procs that differ between Vista and prior versions
+if {[twapi::min_os_version 6]} {
+    proc twapi::get_token_elevation {tok} {
+        set elevation [GetTokenInformation $tok 18]; #TokenElevationType
+        switch -exact -- $elevation {
+            1 { set elevation default }
+            2 { set elevation full }
+            3 { set elevation limited }
+        }
+        return $elevation
+    }
+
+    proc twapi::get_token_virtualization {tok} {
+        return [GetTokenInformation $tok 24]; # TokenVirtualizationEnabled
+    }
+
+    proc twapi::set_token_virtualization {tok enabled} {
+        # tok must have TOKEN_ADJUST_DEFAULT access
+        Twapi_SetTokenVirtualizationEnabled $tok [expr {$enabled ? 1 : 0}]
+    }
+
+    # Get the integrity level associated with a token
+    proc twapi::get_token_integrity {tok args} {
+        # TokenIntegrityLevel -> 25
+        lassign [GetTokenInformation $tok 25]  integrity attrs
+        if {$attrs != 96} {
+            # TBD - is this ok?
+        }
+        return [_sid_to_integrity $integrity {*}$args]
+    }
+
+    # Get the integrity level associated with a token
+    proc twapi::set_token_integrity {tok integrity} {
+        # SE_GROUP_INTEGRITY attribute - 0x20
+        Twapi_SetTokenIntegrityLevel $tok [list [_integrity_to_sid $integrity] 0x20]
+    }
+
+    proc twapi::get_token_integrity_policy {tok} {
+        set policy [GetTokenInformation $tok 27]; #TokenMandatoryPolicy
+        set result {}
+        if {$policy & 1} {
+            lappend result no_write_up
+        }
+        if {$policy & 2} {
+            lappend result new_process_min
+        }
+        return $result
+    }
+
+
+    proc twapi::set_token_integrity_policy {tok args} {
+        set policy [_parse_symbolic_bitmask $args {
+            no_write_up     0x1
+            new_process_min 0x2
+        }]
+
+        Twapi_SetTokenMandatoryPolicy $tok $policy
+    }
+} else {
+    # Versions for pre-Vista
+    proc twapi::get_token_elevation {tok} {
+        # Older OS versions have no concept of elevation.
+        return "default"
+    }
+
+    proc twapi::get_token_virtualization {tok} {
+        # Older OS versions have no concept of elevation.
+        return 0
+    }
+
+    proc twapi::set_token_virtualization {tok enabled} {
+        # Older OS versions have no concept of elevation, so only disable
+        # allowed
+        if {$enabled} {
+            error "Virtualization not available on this platform."
+        }
+        return
+    }
+
+    # Get the integrity level associated with a token
+    proc twapi::get_token_integrity {tok args} {
+        # Older OS versions have no concept of elevation.
+        # For future consistency in label mapping, fall through to mapping
+        # below instead of directly returning mapped value
+        set integrity S-1-16-8192
+
+        return [_sid_to_integrity $integrity {*}$args]
+    }
+
+    # Get the integrity level associated with a token
+    proc twapi::set_token_integrity {tok integrity} {
+        # Old platforms have a "default" of medium that cannot be changed.
+        if {[_integrity_to_sid $integrity] ne "S-1-16-8192"} {
+            error "Invalid integrity level value '$integrity' for this platform."
+        }
+        return
+    }
+
+    proc twapi::get_token_integrity_policy {tok} {
+        # Old platforms - no integrity
+        return 0
+    }
+
+    proc twapi::set_token_integrity_policy {tok args} {
+        # Old platforms - no integrity
+        return 0
+    }
+}
+
+proc twapi::well_known_sid {sidname args} {
+    parseargs args {
+        {domainsid.arg {}}
+    } -maxleftover 0 -setvars
+
+    return [CreateWellKnownSid [_map_well_known_sid_name $sidname] $domainsid]
+}
+
+proc twapi::is_well_known_sid {sid sidname} {
+    return [IsWellKnownSid $sid [_map_well_known_sid_name $sidname]]
+}
+
+# Get the user account associated with a token
+proc twapi::get_token_user {tok args} {
+
+    array set opts [parseargs args [list name]]
+    # TokenUser -> 1
+    set user [lindex [GetTokenInformation $tok 1] 0]
+    if {$opts(name)} {
+        set user [lookup_account_sid $user]
+    }
+    return $user
+}
+
+# Get the groups associated with a token
+proc twapi::get_token_groups {tok args} {
+    array set opts [parseargs args [list name] -maxleftover 0]
+
+    set groups [list ]
+    # TokenGroups -> 2
+    foreach group [GetTokenInformation $tok 2] {
+        if {$opts(name)} {
+            lappend groups [lookup_account_sid [lindex $group 0]]
+        } else {
+            lappend groups [lindex $group 0]
+        }
+    }
+
+    return $groups
+}
+
+# Get the groups associated with a token along with their attributes
+# These are returned as a flat list of the form "sid attrlist sid attrlist..."
+# where the attrlist is a list of attributes
+proc twapi::get_token_groups_and_attrs {tok} {
+
+    set sids_and_attrs [list ]
+    # TokenGroups -> 2
+    foreach {group} [GetTokenInformation $tok 2] {
+        lappend sids_and_attrs [lindex $group 0] [map_token_group_attr [lindex $group 1]]
+    }
+
+    return $sids_and_attrs
+}
+
+# Get the groups associated with a token along with their attributes
+# These are returned as a flat list of the form "sid attrlist sid attrlist..."
+# where the attrlist is a list of attributes
+proc twapi::get_token_restricted_groups_and_attrs {tok} {
+    set sids_and_attrs [list ]
+    # TokenRestrictedGroups -> 11
+    foreach {group} [GetTokenInformation $tok 11] {
+        lappend sids_and_attrs [lindex $group 0] [map_token_group_attr [lindex $group 1]]
+    }
+
+    return $sids_and_attrs
+}
+
+
+# Get list of privileges that are currently enabled for the token
+# If -all is specified, returns a list {enabled_list disabled_list}
+proc twapi::get_token_privileges {tok args} {
+
+    set all [expr {[lsearch -exact $args -all] >= 0}]
+    # TokenPrivileges -> 3
+    set privs [_map_luids_and_attrs_to_privileges [GetTokenInformation $tok 3]]
+    if {$all} {
+        return $privs
+    } else {
+        return [lindex $privs 0]
+    }
+}
+
+# Return true if the token has the given privilege
+proc twapi::check_enabled_privileges {tok privlist args} {
+    set all_required [expr {[lsearch -exact $args "-any"] < 0}]
+
+    set luid_attr_list [list ]
+    foreach priv $privlist {
+        lappend luid_attr_list [list [map_privilege_to_luid $priv] 0]
+    }
+    return [Twapi_PrivilegeCheck $tok $luid_attr_list $all_required]
+}
+
+
+# Enable specified privileges. Returns "" if the given privileges were
+# already enabled, else returns the privileges that were modified
+proc twapi::enable_privileges {privlist} {
+    variable my_process_handle
+
+    # Get our process token
+    set tok [OpenProcessToken $my_process_handle 0x28]; # QUERY + ADJUST_PRIVS
+    trap {
+        return [enable_token_privileges $tok $privlist]
+    } finally {
+        close_token $tok
+    }
+}
+
+
+# Disable specified privileges. Returns "" if the given privileges were
+# already enabled, else returns the privileges that were modified
+proc twapi::disable_privileges {privlist} {
+    variable my_process_handle
+
+    # Get our process token
+    set tok [OpenProcessToken $my_process_handle 0x28]; # QUERY + ADJUST_PRIVS
+    trap {
+        return [disable_token_privileges $tok $privlist]
+    } finally {
+        close_token $tok
+    }
+}
+
+
+# Execute the given script with the specified privileges.
+# After the script completes, the original privileges are restored
+proc twapi::eval_with_privileges {script privs args} {
+    array set opts [parseargs args {besteffort} -maxleftover 0]
+
+    if {[catch {enable_privileges $privs} privs_to_disable]} {
+        if {! $opts(besteffort)} {
+            return -code error -errorinfo $::errorInfo \
+                -errorcode $::errorCode $privs_to_disable
+        }
+        set privs_to_disable [list ]
+    }
+
+    set code [catch {uplevel $script} result]
+    switch $code {
+        0 {
+            disable_privileges $privs_to_disable
+            return $result
+        }
+        1 {
+            # Save error info before calling disable_privileges
+            set erinfo $::errorInfo
+            set ercode $::errorCode
+            disable_privileges $privs_to_disable
+            return -code error -errorinfo $::errorInfo \
+                -errorcode $::errorCode $result
+        }
+        default {
+            disable_privileges $privs_to_disable
+            return -code $code $result
+        }
+    }
+}
+
+
+# Get the privilege associated with a token and their attributes
+proc twapi::get_token_privileges_and_attrs {tok} {
+    set privs_and_attrs [list ]
+    # TokenPrivileges -> 3
+    foreach priv [GetTokenInformation $tok 3] {
+        lassign $priv luid attr
+        lappend privs_and_attrs [map_luid_to_privilege $luid -mapunknown] \
+            [map_token_privilege_attr $attr]
+    }
+
+    return $privs_and_attrs
+
+}
+
+
+# Get the sid that will be used as the owner for objects created using this
+# token. Returns name instead of sid if -name options specified
+proc twapi::get_token_owner {tok args} {
+    # TokenOwner -> 4
+    return [ _get_token_sid_field $tok 4 $args]
+}
+
+
+# Get the sid that will be used as the primary group for objects created using
+# this token. Returns name instead of sid if -name options specified
+proc twapi::get_token_primary_group {tok args} {
+    # TokenPrimaryGroup -> 5
+    return [ _get_token_sid_field $tok 5 $args]
+}
+
+proc twapi::get_token_default_dacl {tok} {
+    # TokenDefaultDacl -> 6
+    return [GetTokenInformation $tok 6]
+}
+
+proc twapi::get_token_origin {tok} {
+    # TokenOrigin -> 17
+    return [GetTokenInformation $tok 17]
+}
+
+# Return the source of an access token
+proc twapi::get_token_source {tok} {
+    return [GetTokenInformation $tok 7]; # TokenSource
+}
+
+
+# Return the token type of an access token
+proc twapi::get_token_type {tok} {
+    # TokenType -> 8
+    set type [GetTokenInformation $tok 8]
+    if {$type == 1} {
+        return "primary"
+    } elseif {$type == 2} {
+        return "impersonation"
+    } else {
+        return $type
+    }
+}
+
+# Return the token type of an access token
+proc twapi::get_token_impersonation_level {tok} {
+    # TokenImpersonationLevel -> 9
+    return [_map_impersonation_level [GetTokenInformation $tok 9]]
+}
+
+# Return the linked token when a token is filtered
+proc twapi::get_token_linked_token {tok} {
+    # TokenLinkedToken -> 19
+    return [GetTokenInformation $tok 19]
+}
+
+# Return token statistics
+proc twapi::get_token_statistics {tok} {
+    array set stats {}
+    set labels {luid authluid expiration type impersonationlevel
+        dynamiccharged dynamicavailable groupcount
+        privilegecount modificationluid}
+    # TokenStatistics -> 10
+    set statinfo [GetTokenInformation $tok 10]
+    foreach label $labels val $statinfo {
+        set stats($label) $val
+    }
+    set stats(type) [expr {$stats(type) == 1 ? "primary" : "impersonation"}]
+    set stats(impersonationlevel) [_map_impersonation_level $stats(impersonationlevel)]
+
+    return [array get stats]
+}
+
+
+# Enable the privilege state of a token. Generates an error if
+# the specified privileges do not exist in the token (either
+# disabled or enabled), or cannot be adjusted
+proc twapi::enable_token_privileges {tok privs} {
+    set luid_attrs [list]
+    foreach priv $privs {
+        # SE_PRIVILEGE_ENABLED -> 2
+        lappend luid_attrs [list [map_privilege_to_luid $priv] 2]
+    }
+
+    set privs [list ]
+    foreach {item} [Twapi_AdjustTokenPrivileges $tok 0 $luid_attrs] {
+        lappend privs [map_luid_to_privilege [lindex $item 0] -mapunknown]
+    }
+    return $privs
+
+    
+
+}
+
+# Disable the privilege state of a token. Generates an error if
+# the specified privileges do not exist in the token (either
+# disabled or enabled), or cannot be adjusted
+proc twapi::disable_token_privileges {tok privs} {
+    set luid_attrs [list]
+    foreach priv $privs {
+        lappend luid_attrs [list [map_privilege_to_luid $priv] 0]
+    }
+
+    set privs [list ]
+    foreach {item} [Twapi_AdjustTokenPrivileges $tok 0 $luid_attrs] {
+        lappend privs [map_luid_to_privilege [lindex $item 0] -mapunknown]
+    }
+    return $privs
+}
+
+# Disable all privs in a token
+proc twapi::disable_all_token_privileges {tok} {
+    set privs [list ]
+    foreach {item} [Twapi_AdjustTokenPrivileges $tok 1 [list ]] {
+        lappend privs [map_luid_to_privilege [lindex $item 0] -mapunknown]
+    }
+    return $privs
+}
+
+
+# Map a privilege given as a LUID
+proc twapi::map_luid_to_privilege {luid args} {
+    variable _luid_to_privilege_map
+    
+    array set opts [parseargs args [list system.arg mapunknown] -nulldefault]
+
+    if {[dict exists $_luid_to_privilege_map $opts(system) $luid]} {
+        return [dict get $_luid_to_privilege_map $opts(system) $luid]
+    }
+
+    # luid may in fact be a privilege name. Check for this
+    if {[is_valid_luid_syntax $luid]} {
+        trap {
+            set name [LookupPrivilegeName $opts(system) $luid]
+            dict set _luid_to_privilege_map $opts(system) $luid $name
+        } onerror {TWAPI_WIN32 1313} {
+            if {! $opts(mapunknown)} {
+                rethrow
+            }
+            set name "Privilege-$luid"
+            # Do not put in cache as privilege name might change?
+        }
+    } else {
+        # Not a valid LUID syntax. Check if it's a privilege name
+        if {[catch {map_privilege_to_luid $luid -system $opts(system)}]} {
+            error "Invalid LUID '$luid'"
+        }
+        return $luid;                   # $luid is itself a priv name
+    }
+
+    return $name
+}
+
+
+# Map a privilege to a LUID
+proc twapi::map_privilege_to_luid {priv args} {
+    variable _privilege_to_luid_map
+
+    array set opts [parseargs args [list system.arg] -nulldefault]
+
+    if {[dict exists $_privilege_to_luid_map $opts(system) $priv]} {
+        return [dict get $_privilege_to_luid_map $opts(system) $priv]
+    }
+
+    # First check for privilege names we might have generated
+    if {[string match "Privilege-*" $priv]} {
+        set priv [string range $priv 10 end]
+    }
+
+    # If already a LUID format, return as is, else look it up
+    if {[is_valid_luid_syntax $priv]} {
+        return $priv
+    }
+
+    set luid [LookupPrivilegeValue $opts(system) $priv]
+    # This is an expensive call so stash it unless cache too big
+    if {[dict size $_privilege_to_luid_map] < 100} {
+        dict set _privilege_to_luid_map $opts(system) $priv $luid
+    }
+
+    return $luid
+}
+
+
+# Return 1/0 if in LUID format
+proc twapi::is_valid_luid_syntax {luid} {
+    return [regexp {^[[:xdigit:]]{8}-[[:xdigit:]]{8}$} $luid]
+}
+
+
+################################################################
+# Functions related to ACE's and ACL's
+
+# Create a new ACE
+proc twapi::new_ace {type account rights args} {
+    array set opts [parseargs args {
+        {self.bool 1}
+        {recursecontainers.bool 0 2}
+        {recurseobjects.bool 0 1}
+        {recurseonelevelonly.bool 0 4}
+        {auditsuccess.bool 1 0x40}
+        {auditfailure.bool 1 0x80}
+    }]
+
+    set sid [map_account_to_sid $account]
+
+    set access_mask [_access_rights_to_mask $rights]
+
+    switch -exact -- $type {
+        mandatory_label -
+        allow -
+        deny  -
+        audit {
+            set typecode [_ace_type_symbol_to_code $type]
+        }
+        default {
+            error "Invalid or unsupported ACE type '$type'"
+        }
+    }
+
+    set inherit_flags [expr {$opts(recursecontainers) | $opts(recurseobjects) |
+                             $opts(recurseonelevelonly)}]
+    if {! $opts(self)} {
+        incr inherit_flags 8; #INHERIT_ONLY_ACE
+    }
+
+    if {$type eq "audit"} {
+        set inherit_flags [expr {$inherit_flags | $opts(auditsuccess) | $opts(auditfailure)}]
+    }
+
+    return [list $typecode $inherit_flags $access_mask $sid]
+}
+
+# Get the ace type (allow, deny etc.)
+proc twapi::get_ace_type {ace} {
+    return [_ace_type_code_to_symbol [lindex $ace 0]]
+}
+
+
+# Set the ace type (allow, deny etc.)
+proc twapi::set_ace_type {ace type} {
+    return [lreplace $ace 0 0 [_ace_type_symbol_to_code $type]]
+}
+
+# Get the access rights in an ACE
+proc twapi::get_ace_rights {ace args} {
+    array set opts [parseargs args {
+        {type.arg ""}
+        resourcetype.arg
+        raw
+    } -maxleftover 0]
+
+    if {$opts(raw)} {
+        return [format 0x%x [lindex $ace 2]]
+    }
+
+    if {[lindex $ace 0] == 0x11} {
+        # MANDATORY_LABEL -> 0x11
+        # Resource type is immaterial
+        return [_access_mask_to_rights [lindex $ace 2] mandatory_label]
+    }
+
+    # Backward compatibility - in 2.x -type was documented instead
+    # of -resourcetype
+    if {[info exists opts(resourcetype)]} {
+        return [_access_mask_to_rights [lindex $ace 2] $opts(resourcetype)]
+    } else {
+        return [_access_mask_to_rights [lindex $ace 2] $opts(type)]
+    }
+}
+
+# Set the access rights in an ACE
+proc twapi::set_ace_rights {ace rights} {
+    return [lreplace $ace 2 2 [_access_rights_to_mask $rights]]
+}
+
+
+# Get the ACE sid
+proc twapi::get_ace_sid {ace} {
+    return [lindex $ace 3]
+}
+
+# Set the ACE sid
+proc twapi::set_ace_sid {ace account} {
+    return [lreplace $ace 3 3 [map_account_to_sid $account]]
+}
+
+
+# Get audit flags - TBD document and test
+proc twapi::get_ace_audit {ace} {
+    set audit {}
+    set mask [lindex $ace 1]
+    if {$mask & 0x40} {
+        lappend audit "success"
+    }
+    if {$mask & 0x80} {
+        lappend audit "failure"
+    }
+    return $audit
+}
+
+# Get the inheritance options
+proc twapi::get_ace_inheritance {ace} {
+    
+    set inherit_opts [list ]
+    set inherit_mask [lindex $ace 1]
+
+    lappend inherit_opts -self \
+        [expr {($inherit_mask & 8) == 0}]
+    lappend inherit_opts -recursecontainers \
+        [expr {($inherit_mask & 2) != 0}]
+    lappend inherit_opts -recurseobjects \
+        [expr {($inherit_mask & 1) != 0}]
+    lappend inherit_opts -recurseonelevelonly \
+        [expr {($inherit_mask & 4) != 0}]
+    lappend inherit_opts -inherited \
+        [expr {($inherit_mask & 16) != 0}]
+
+    return $inherit_opts
+}
+
+# Set the inheritance options. Unspecified options are not set
+proc twapi::set_ace_inheritance {ace args} {
+
+    array set opts [parseargs args {
+        self.bool
+        recursecontainers.bool
+        recurseobjects.bool
+        recurseonelevelonly.bool
+    }]
+    
+    set inherit_flags [lindex $ace 1]
+    if {[info exists opts(self)]} {
+        if {$opts(self)} {
+            resetbits inherit_flags 0x8; #INHERIT_ONLY_ACE -> 0x8
+        } else {
+            setbits   inherit_flags 0x8; #INHERIT_ONLY_ACE -> 0x8
+        }
+    }
+
+    foreach {
+        opt                 mask
+    } {
+        recursecontainers   2
+        recurseobjects      1
+        recurseonelevelonly 4
+    } {
+        if {[info exists opts($opt)]} {
+            if {$opts($opt)} {
+                setbits inherit_flags $mask
+            } else {
+                resetbits inherit_flags $mask
+            }
+        }
+    }
+
+    return [lreplace $ace 1 1 $inherit_flags]
+}
+
+
+# Sort ACE's in the standard recommended Win2K order
+proc twapi::sort_aces {aces} {
+
+    _init_ace_type_symbol_to_code_map
+
+    foreach type [array names twapi::_ace_type_symbol_to_code_map] {
+        set direct_aces($type) [list ]
+        set inherited_aces($type) [list ]
+    }
+    
+    # Sort order is as follows: all direct (non-inherited) ACEs come
+    # before all inherited ACEs. Within these groups, the order should be
+    # access denied ACEs, access denied ACEs for objects/properties,
+    # access allowed ACEs, access allowed ACEs for objects/properties,
+    # TBD - check this ordering against http://msdn.microsoft.com/en-us/library/windows/desktop/aa379298%28v=vs.85%29.aspx
+    foreach ace $aces {
+        set type [get_ace_type $ace]
+        # INHERITED_ACE -> 0x10
+        if {[lindex $ace 1] & 0x10} {
+            lappend inherited_aces($type) $ace
+        } else {
+            lappend direct_aces($type) $ace
+        }
+    }
+
+    # TBD - check this order ACE's, especially audit and mandatory label
+    return [concat \
+                $direct_aces(deny) \
+                $direct_aces(deny_object) \
+                $direct_aces(deny_callback) \
+                $direct_aces(deny_callback_object) \
+                $direct_aces(allow) \
+                $direct_aces(allow_object) \
+                $direct_aces(allow_compound) \
+                $direct_aces(allow_callback) \
+                $direct_aces(allow_callback_object) \
+                $direct_aces(audit) \
+                $direct_aces(audit_object) \
+                $direct_aces(audit_callback) \
+                $direct_aces(audit_callback_object) \
+                $direct_aces(mandatory_label) \
+                $direct_aces(alarm) \
+                $direct_aces(alarm_object) \
+                $direct_aces(alarm_callback) \
+                $direct_aces(alarm_callback_object) \
+                $inherited_aces(deny) \
+                $inherited_aces(deny_object) \
+                $inherited_aces(deny_callback) \
+                $inherited_aces(deny_callback_object) \
+                $inherited_aces(allow) \
+                $inherited_aces(allow_object) \
+                $inherited_aces(allow_compound) \
+                $inherited_aces(allow_callback) \
+                $inherited_aces(allow_callback_object) \
+                $inherited_aces(audit) \
+                $inherited_aces(audit_object) \
+                $inherited_aces(audit_callback) \
+                $inherited_aces(audit_callback_object) \
+                $inherited_aces(mandatory_label) \
+                $inherited_aces(alarm) \
+                $inherited_aces(alarm_object) \
+                $inherited_aces(alarm_callback) \
+                $inherited_aces(alarm_callback_object)]
+}
+
+# Pretty print an ACL
+proc twapi::get_acl_text {acl args} {
+    array set opts [parseargs args {
+        {resourcetype.arg raw}
+        {offset.arg ""}
+    } -maxleftover 0]
+
+    set count 0
+    set result "$opts(offset)Rev: [get_acl_rev $acl]\n"
+    foreach ace [get_acl_aces $acl] {
+        append result "$opts(offset)ACE #[incr count]\n"
+        append result [get_ace_text $ace -offset "$opts(offset)  " -resourcetype $opts(resourcetype)]
+    }
+    return $result
+}
+
+# Pretty print an ACE
+proc twapi::get_ace_text {ace args} {
+    array set opts [parseargs args {
+        {resourcetype.arg raw}
+        {offset.arg ""}
+    } -maxleftover 0]
+
+    if {$ace eq "null"} {
+        return "Null"
+    }
+
+    set offset $opts(offset)
+    array set bools {0 No 1 Yes}
+    array set inherit_flags [get_ace_inheritance $ace]
+    append inherit_text "${offset}Inherited: $bools($inherit_flags(-inherited))\n"
+    append inherit_text "${offset}Include self: $bools($inherit_flags(-self))\n"
+    append inherit_text "${offset}Recurse containers: $bools($inherit_flags(-recursecontainers))\n"
+    append inherit_text "${offset}Recurse objects: $bools($inherit_flags(-recurseobjects))\n"
+    append inherit_text "${offset}Recurse single level only: $bools($inherit_flags(-recurseonelevelonly))\n"
+    
+    set rights [get_ace_rights $ace -type $opts(resourcetype)]
+    if {[lsearch -glob $rights *_all_access] >= 0} {
+        set rights "All"
+    } else {
+        set rights [join $rights ", "]
+    }
+
+    set acetype [get_ace_type $ace]
+    append result "${offset}Type: [string totitle $acetype]\n"
+    set user [get_ace_sid $ace]
+    catch {append user " ([map_account_to_name [get_ace_sid $ace]])"}
+    append result "${offset}User: $user\n"
+    append result "${offset}Rights: $rights\n"
+    if {$acetype eq "audit"} {
+        append result "${offset}Audit conditions: [join [get_ace_audit $ace] {, }]\n"
+    }
+    append result $inherit_text
+
+    return $result
+}
+
+# Create a new ACL
+proc twapi::new_acl {{aces ""}} {
+    # NOTE: we ALWAYS set aclrev to 2. This may not be correct for the
+    # supplied ACEs but that's ok. The C level code calculates the correct
+    # acl rev level and overwrites anyways.
+    return [list 2 $aces]
+}
+
+# Creates an ACL that gives the specified rights to specified trustees
+proc twapi::new_restricted_dacl {accounts rights args} {
+    set access_mask [_access_rights_to_mask $rights]
+
+    set aces {}
+    foreach account $accounts {
+        lappend aces [new_ace allow $account $access_mask {*}$args]
+    }
+
+    return [new_acl $aces]
+
+}
+
+# Return the list of ACE's in an ACL
+proc twapi::get_acl_aces {acl} {
+    return [lindex $acl 1]
+}
+
+# Set the ACE's in an ACL
+proc twapi::set_acl_aces {acl aces} {
+    # Note, we call new_acl since when ACEs change, the rev may also change
+    return [new_acl $aces]
+}
+
+# Append to the ACE's in an ACL
+proc twapi::append_acl_aces {acl aces} {
+    return [set_acl_aces $acl [concat [get_acl_aces $acl] $aces]]
+}
+
+# Prepend to the ACE's in an ACL
+proc twapi::prepend_acl_aces {acl aces} {
+    return [set_acl_aces $acl [concat $aces [get_acl_aces $acl]]]
+}
+
+# Arrange the ACE's in an ACL in a standard order
+proc twapi::sort_acl_aces {acl} {
+    return [set_acl_aces $acl [sort_aces [get_acl_aces $acl]]]
+}
+
+# Return the ACL revision of an ACL
+proc twapi::get_acl_rev {acl} {
+    return [lindex $acl 0]
+}
+
+
+# Create a new security descriptor
+proc twapi::new_security_descriptor {args} {
+    array set opts [parseargs args {
+        owner.arg
+        group.arg
+        dacl.arg
+        sacl.arg
+    } -maxleftover 0]
+
+    set secd [Twapi_InitializeSecurityDescriptor]
+
+    # TBD - where are the control bits set? THe set_security_descrip[tor_*
+    # don't seem to set the control bits for related fields either.
+    foreach field {owner group dacl sacl} {
+        if {[info exists opts($field)]} {
+            set secd [set_security_descriptor_$field $secd $opts($field)]
+        }
+    }
+
+    return $secd
+}
+
+# Return the control bits in a security descriptor
+# TBD - update for new Windows versions
+proc twapi::get_security_descriptor_control {secd} {
+    if {[_null_secd $secd]} {
+        error "Attempt to get control field from NULL security descriptor."
+    }
+
+    set control [lindex $secd 0]
+    
+    set retval [list ]
+    if {$control & 0x0001} {
+        lappend retval owner_defaulted
+    }
+    if {$control & 0x0002} {
+        lappend retval group_defaulted
+    }
+    if {$control & 0x0004} {
+        lappend retval dacl_present
+    }
+    if {$control & 0x0008} {
+        lappend retval dacl_defaulted
+    }
+    if {$control & 0x0010} {
+        lappend retval sacl_present
+    }
+    if {$control & 0x0020} {
+        lappend retval sacl_defaulted
+    }
+    if {$control & 0x0100} {
+        # Not documented because should not actually appear when reading a secd
+        lappend retval dacl_auto_inherit_req
+    }
+    if {$control & 0x0200} {
+        # Not documented because should not actually appear when reading a secd
+        lappend retval sacl_auto_inherit_req
+    }
+    if {$control & 0x0400} {
+        lappend retval dacl_auto_inherited
+    }
+    if {$control & 0x0800} {
+        lappend retval sacl_auto_inherited
+    }
+    if {$control & 0x1000} {
+        lappend retval dacl_protected
+    }
+    if {$control & 0x2000} {
+        lappend retval sacl_protected
+    }
+    if {$control & 0x4000} {
+        lappend retval rm_control_valid
+    }
+    if {$control & 0x8000} {
+        lappend retval self_relative
+    }
+    return $retval
+}
+
+# Return the owner in a security descriptor
+proc twapi::get_security_descriptor_owner {secd} {
+    if {[_null_secd $secd]} {
+        win32_error 87 "Attempt to get owner field from NULL security descriptor."
+    }
+    return [lindex $secd 1]
+}
+
+# Set the owner in a security descriptor
+proc twapi::set_security_descriptor_owner {secd account {defaulted 0}} {
+    if {[_null_secd $secd]} {
+        set secd [new_security_descriptor]
+    }
+    lassign $secd control - group dacl sacl
+    set sid [map_account_to_sid $account]
+    if {$defaulted} {
+        set control [expr {$control | 0x1}]; # SE_OWNER_DEFAULTED
+    } else {
+        set control [expr {$control & ~0x1}]; # ! SE_OWNER_DEFAULTED
+    }
+    return [list $control $sid $group $dacl $sacl]
+}
+
+# Return the group in a security descriptor
+proc twapi::get_security_descriptor_group {secd} {
+    if {[_null_secd $secd]} {
+        win32_error 87 "Attempt to get group field from NULL security descriptor."
+    }
+    return [lindex $secd 2]
+}
+
+# Set the group in a security descriptor
+proc twapi::set_security_descriptor_group {secd account {defaulted 0}} {
+    if {[_null_secd $secd]} {
+        set secd [new_security_descriptor]
+    }
+    lassign $secd control owner - dacl sacl
+    set sid [map_account_to_sid $account]
+    if {$defaulted} {
+        set control [expr {$control | 0x2}]; # SE_GROUP_DEFAULTED
+    } else {
+        set control [expr {$control & ~0x2}]; # ! SE_GROUP_DEFAULTED
+    }
+    return [list $control $owner $sid $dacl $sacl]
+}
+
+# Return the DACL in a security descriptor
+proc twapi::get_security_descriptor_dacl {secd} {
+    if {[_null_secd $secd]} {
+        win32_error 87 "Attempt to get DACL field from NULL security descriptor."
+    }
+    return [lindex $secd 3]
+}
+
+# Set the dacl in a security descriptor
+proc twapi::set_security_descriptor_dacl {secd acl {defaulted 0}} {
+    if {![_is_valid_acl $acl]} {
+        error "Invalid ACL <$acl>."
+    }
+    if {[_null_secd $secd]} {
+        set secd [new_security_descriptor]
+    }
+    lassign $secd control owner group - sacl
+    if {$acl eq "null"} {
+        set control [expr {$control & ~0x4}]; # ! SE_DACL_PRESENT
+    } else {
+        set control [expr {$control | 0x4}]; # SE_DACL_PRESENT
+    }
+    if {$defaulted} {
+        set control [expr {$control | 0x8}]; # SE_DACL_DEFAULTED
+    } else {
+        set control [expr {$control & ~0x8}]; # ! SE_DACL_DEFAULTED
+    }
+    return [list $control $owner $group $acl $sacl]
+}
+
+# Return the SACL in a security descriptor
+proc twapi::get_security_descriptor_sacl {secd} {
+    if {[_null_secd $secd]} {
+        win32_error 87 "Attempt to get SACL field from NULL security descriptor."
+    }
+    return [lindex $secd 4]
+}
+
+# Set the sacl in a security descriptor
+proc twapi::set_security_descriptor_sacl {secd acl {defaulted 0}} {
+    if {![_is_valid_acl $acl]} {
+        error "Invalid ACL <$acl>."
+    }
+    if {[_null_secd $secd]} {
+        set secd [new_security_descriptor]
+    }
+    lassign $secd control owner group dacl -
+    if {$acl eq "null"} {
+        set control [expr {$control & ~0x10}]; # ! SE_SACL_PRESENT
+    } else {
+        set control [expr {$control | 0x10}]; # SE_SACL_PRESENT
+    }
+    if {$defaulted} {
+        set control [expr {$control | 0x20}]; # SE_SACL_DEFAULTED
+    } else {
+        set control [expr {$control & ~0x20}]; # ! SE_SACL_DEFAULTED
+    }
+    return [list $control $owner $group $dacl $acl]
+}
+
+# Get the specified security information for the given object
+proc twapi::get_resource_security_descriptor {restype name args} {
+
+    # -mandatory_label field is not documented. Should we ? TBD
+    array set opts [parseargs args {
+        owner
+        group
+        dacl
+        sacl
+        mandatory_label
+        all
+        handle
+    }]
+
+    set wanted 0
+
+    # OWNER_SECURITY_INFORMATION 1
+    # GROUP_SECURITY_INFORMATION 2
+    # DACL_SECURITY_INFORMATION  4
+    # SACL_SECURITY_INFORMATION  8
+    foreach {field mask} {owner 1 group 2 dacl 4 sacl 8} {
+        if {$opts($field) || $opts(all)} {
+            incr wanted $mask;  # Equivalent to OR operation
+        }
+    }
+
+    # LABEL_SECURITY_INFORMATION 0x10
+    if {[min_os_version 6]} {
+        if {$opts(mandatory_label) || $opts(all)} {
+            incr wanted 16;     # OR with 0x10
+        }
+    }
+
+    # Note if no options specified, we ask for everything except
+    # SACL's which require special privileges
+    if {! $wanted} {
+        set wanted 0x7
+        if {[min_os_version 6]} {
+            incr wanted 0x10
+        }
+    }
+
+    if {$opts(handle)} {
+        set restype [_map_resource_symbol_to_type $restype false]
+        if {$restype == 5} {
+            # GetSecurityInfo crashes if a handles is passed in for
+            # SE_LMSHARE (even erroneously). It expects a string name
+            # even though the prototype says HANDLE. Protect against this.
+            error "Share resource type (share or 5) cannot be used with -handle option"
+        }
+        set secd [GetSecurityInfo \
+                      [CastToHANDLE $name] \
+                      $restype \
+                      $wanted]
+    } else {
+        # GetNamedSecurityInfo seems to fail with a overlapped i/o
+        # in progress error under some conditions. If this happens
+        # try getting with resource-specific API's if possible.
+        trap {
+            set secd [GetNamedSecurityInfo \
+                          $name \
+                          [_map_resource_symbol_to_type $restype true] \
+                          $wanted]
+        } onerror {} {
+            # TBD - see what other resource-specific API's there are
+            if {$restype eq "share"} {
+                set secd [lindex [get_share_info $name -secd] 1]
+            } else {
+                # Throw the same error
+                rethrow
+            }
+        }
+    }
+
+    return $secd
+}
+
+
+# Set the specified security information for the given object
+# See http://search.cpan.org/src/TEVERETT/Win32-Security-0.50/README
+# for a good discussion even though that applies to Perl
+proc twapi::set_resource_security_descriptor {restype name secd args} {
+
+    # PROTECTED_DACL_SECURITY_INFORMATION     0x80000000
+    # PROTECTED_SACL_SECURITY_INFORMATION     0x40000000
+    # UNPROTECTED_DACL_SECURITY_INFORMATION   0x20000000
+    # UNPROTECTED_SACL_SECURITY_INFORMATION   0x10000000
+    array set opts [parseargs args {
+        all
+        handle
+        owner
+        group
+        dacl
+        sacl
+        mandatory_label
+        {protect_dacl   {} 0x80000000}
+        {unprotect_dacl {} 0x20000000}
+        {protect_sacl   {} 0x40000000}
+        {unprotect_sacl {} 0x10000000}
+    }]
+
+
+    if {![min_os_version 6]} {
+        if {$opts(mandatory_label)} {
+            error "Option -mandatory_label not supported by this version of Windows"
+        }
+    }
+
+    if {$opts(protect_dacl) && $opts(unprotect_dacl)} {
+        error "Cannot specify both -protect_dacl and -unprotect_dacl."
+    }
+
+    if {$opts(protect_sacl) && $opts(unprotect_sacl)} {
+        error "Cannot specify both -protect_sacl and -unprotect_sacl."
+    }
+
+    set mask [expr {$opts(protect_dacl) | $opts(unprotect_dacl) |
+                    $opts(protect_sacl) | $opts(unprotect_sacl)}]
+
+    if {$opts(owner) || $opts(all)} {
+        set opts(owner) [get_security_descriptor_owner $secd]
+        setbits mask 1; # OWNER_SECURITY_INFORMATION
+    } else {
+        set opts(owner) ""
+    }
+
+    if {$opts(group) || $opts(all)} {
+        set opts(group) [get_security_descriptor_group $secd]
+        setbits mask 2; # GROUP_SECURITY_INFORMATION
+    } else {
+        set opts(group) ""
+    }
+
+    if {$opts(dacl) || $opts(all)} {
+        set opts(dacl) [get_security_descriptor_dacl $secd]
+        setbits mask 4; # DACL_SECURITY_INFORMATION
+    } else {
+        set opts(dacl) null
+    }
+
+    if {$opts(sacl) || $opts(mandatory_label) || $opts(all)} {
+        set sacl [get_security_descriptor_sacl $secd]
+        if {$opts(sacl) || $opts(all)} {
+            setbits mask 0x8; # SACL_SECURITY_INFORMATION
+        }
+        if {[min_os_version 6]} {
+            if {$opts(mandatory_label) || $opts(all)} {
+                setbits mask 0x10; # LABEL_SECURITY_INFORMATION
+            }
+        }
+        set opts(sacl) $sacl
+    } else {
+        set opts(sacl) null
+    }
+
+    if {$mask == 0} {
+	error "Must specify at least one of the options -all, -dacl, -sacl, -owner, -group or -mandatory_label"
+    }
+
+    if {$opts(handle)} {
+        set restype [_map_resource_symbol_to_type $restype false]
+        if {$restype == 5} {
+            # GetSecurityInfo crashes if a handles is passed in for
+            # SE_LMSHARE (even erroneously). It expects a string name
+            # even though the prototype says HANDLE. Protect against this.
+            error "Share resource type (share or 5) cannot be used with -handle option"
+        }
+
+        SetSecurityInfo \
+            [CastToHANDLE $name] \
+            [_map_resource_symbol_to_type $restype false] \
+            $mask \
+            $opts(owner) \
+            $opts(group) \
+            $opts(dacl) \
+            $opts(sacl)
+    } else {
+        SetNamedSecurityInfo \
+            $name \
+            [_map_resource_symbol_to_type $restype true] \
+            $mask \
+            $opts(owner) \
+            $opts(group) \
+            $opts(dacl) \
+            $opts(sacl)
+    }
+}
+
+# Get integrity level from a security descriptor
+proc twapi::get_security_descriptor_integrity {secd args} {
+    if {[min_os_version 6]} {
+        foreach ace [get_acl_aces [get_security_descriptor_sacl $secd]] {
+            if {[get_ace_type $ace] eq "mandatory_label"} {
+                if {! [dict get [get_ace_inheritance $ace] -self]} continue; # Does not apply to itself
+                set integrity [_sid_to_integrity [get_ace_sid $ace] {*}$args]
+                set rights [get_ace_rights $ace -resourcetype mandatory_label]
+                return [list $integrity $rights]
+            }
+        }
+    }
+    return {}
+}
+
+# Get integrity level for a resource
+proc twapi::get_resource_integrity {restype name args} {
+    # Note label and raw options are simply passed on
+
+    if {![min_os_version 6]} {
+        return ""
+    }
+    set saved_args $args
+    array set opts [parseargs args {
+        label
+        raw
+        handle
+    }]
+
+    if {$opts(handle)} {
+        set secd [get_resource_security_descriptor $restype $name -mandatory_label -handle]
+    } else {
+        set secd [get_resource_security_descriptor $restype $name -mandatory_label]
+    }
+
+    return [get_security_descriptor_integrity $secd {*}$saved_args]
+}
+
+
+proc twapi::set_security_descriptor_integrity {secd integrity rights args} {
+    # Not clear from docs whether this can
+    # be done without interfering with SACL fields. Nevertheless
+    # we provide this proc because we might want to set the
+    # integrity level on new objects create thru CreateFile etc.
+    # TBD - need to test under vista and win 7
+    
+    array set opts [parseargs args {
+        {recursecontainers.bool 0}
+        {recurseobjects.bool 0}
+    } -maxleftover 0]
+
+    # We preserve any non-integrity aces in the sacl.
+    set sacl [get_security_descriptor_sacl $secd]
+    set aces {}
+    foreach ace [get_acl_aces $sacl] {
+        if {[get_ace_type $ace] ne "mandatory_label"} {
+            lappend aces $ace
+        }
+    }
+
+    # Now create and attach an integrity ace. Note placement does not
+    # matter
+    lappend aces [new_ace mandatory_label \
+                      [_integrity_to_sid $integrity] \
+                      [_access_rights_to_mask $rights] \
+                      -self 1 \
+                      -recursecontainers $opts(recursecontainers) \
+                      -recurseobjects $opts(recurseobjects)]
+                  
+    return [set_security_descriptor_sacl $secd [new_acl $aces]]
+}
+
+proc twapi::set_resource_integrity {restype name integrity rights args} {
+    array set opts [parseargs args {
+        {recursecontainers.bool 0}
+        {recurseobjects.bool 0}
+        handle
+    } -maxleftover 0]
+    
+    set secd [set_security_descriptor_integrity \
+                  [new_security_descriptor] \
+                  $integrity \
+                  $rights \
+                  -recurseobjects $opts(recurseobjects) \
+                  -recursecontainers $opts(recursecontainers)]
+
+    if {$opts(handle)} {
+        set_resource_security_descriptor $restype $name $secd -mandatory_label -handle
+    } else {
+        set_resource_security_descriptor $restype $name $secd -mandatory_label
+    }
+}
+
+
+# Convert a security descriptor to SDDL format
+proc twapi::security_descriptor_to_sddl {secd} {
+    return [twapi::ConvertSecurityDescriptorToStringSecurityDescriptor $secd 1 0x1f]
+}
+
+# Convert SDDL to a security descriptor
+proc twapi::sddl_to_security_descriptor {sddl} {
+    return [twapi::ConvertStringSecurityDescriptorToSecurityDescriptor $sddl 1]
+}
+
+# Return the text for a security descriptor
+proc twapi::get_security_descriptor_text {secd args} {
+    if {[_null_secd $secd]} {
+        return "null"
+    }
+
+    array set opts [parseargs args {
+        {resourcetype.arg raw}
+    } -maxleftover 0]
+
+    append result "Flags:\t[get_security_descriptor_control $secd]\n"
+    set name [get_security_descriptor_owner $secd]
+    if {$name eq ""} {
+        set name Undefined
+    } else {
+        catch {set name [map_account_to_name $name]}
+    }
+    append result "Owner:\t$name\n"
+    set name [get_security_descriptor_group $secd]
+    if {$name eq ""} {
+        set name Undefined
+    } else {
+        catch {set name [map_account_to_name $name]}
+    }
+    append result "Group:\t$name\n"
+
+    if {0} {
+        set acl [get_security_descriptor_dacl $secd]
+        append result "DACL Rev: [get_acl_rev $acl]\n"
+        set index 0
+        foreach ace [get_acl_aces $acl] {
+            append result "\tDACL Entry [incr index]\n"
+            append result "[get_ace_text $ace -offset "\t    " -resourcetype $opts(resourcetype)]"
+        }
+        set acl [get_security_descriptor_sacl $secd]
+        append result "SACL Rev: [get_acl_rev $acl]\n"
+        set index 0
+        foreach ace [get_acl_aces $acl] {
+            append result "\tSACL Entry $index\n"
+            append result [get_ace_text $ace -offset "\t    " -resourcetype $opts(resourcetype)]
+        }
+    } else {
+        append result "DACL:\n"
+        append result [get_acl_text [get_security_descriptor_dacl $secd] -offset "  " -resourcetype $opts(resourcetype)]
+        append result "SACL:\n"
+        append result [get_acl_text [get_security_descriptor_sacl $secd] -offset "  " -resourcetype $opts(resourcetype)]
+    }
+
+    return $result
+}
+
+
+# Log off
+proc twapi::logoff {args} {
+    array set opts [parseargs args {
+        {force {} 0x4}
+        {forceifhung {} 0x10}
+    } -maxleftover 0]
+    ExitWindowsEx [expr {$opts(force) | $opts(forceifhung)}]  0
+}
+
+# Lock the workstation
+proc twapi::lock_workstation {} {
+    LockWorkStation
+}
+
+
+# Get a new LUID
+proc twapi::new_luid {} {
+    return [AllocateLocallyUniqueId]
+}
+
+
+# Get the description of a privilege
+proc twapi::get_privilege_description {priv} {
+    if {[catch {LookupPrivilegeDisplayName "" $priv} desc]} {
+        # The above function will only return descriptions for
+        # privileges, not account rights. Hard code descriptions
+        # for some account rights
+        set desc [dict* {
+            SeBatchLogonRight "Log on as a batch job" 
+            SeDenyBatchLogonRight "Deny logon as a batch job"
+            SeDenyInteractiveLogonRight "Deny interactive logon"
+            SeDenyNetworkLogonRight "Deny access to this computer from the network"
+            SeRemoteInteractiveLogonRight "Remote interactive logon"
+            SeDenyRemoteInteractiveLogonRight "Deny interactive remote logon"
+            SeDenyServiceLogonRight "Deny logon as a service"
+            SeInteractiveLogonRight "Log on locally"
+            SeNetworkLogonRight "Access this computer from the network"
+            SeServiceLogonRight "Log on as a service"
+        } $priv]
+    }
+    return $desc
+}
+
+
+
+# For backward compatibility, emulate GetUserName using GetUserNameEx
+proc twapi::GetUserName {} {
+    return [file tail [GetUserNameEx 2]]
+}
+
+
+################################################################
+# Utility and helper functions
+
+
+
+# Returns an sid field from a token
+proc twapi::_get_token_sid_field {tok field options} {
+    array set opts [parseargs options {name}]
+    set owner [GetTokenInformation $tok $field]
+    if {$opts(name)} {
+        set owner [lookup_account_sid $owner]
+    }
+    return $owner
+}
+
+# Map token group attributes
+# TBD - write a test for this
+proc twapi::map_token_group_attr {attr} {
+    # SE_GROUP_MANDATORY              0x00000001
+    # SE_GROUP_ENABLED_BY_DEFAULT     0x00000002
+    # SE_GROUP_ENABLED                0x00000004
+    # SE_GROUP_OWNER                  0x00000008
+    # SE_GROUP_USE_FOR_DENY_ONLY      0x00000010
+    # SE_GROUP_LOGON_ID               0xC0000000
+    # SE_GROUP_RESOURCE               0x20000000
+    # SE_GROUP_INTEGRITY              0x00000020
+    # SE_GROUP_INTEGRITY_ENABLED      0x00000040
+
+    return [_make_symbolic_bitmask $attr {
+        mandatory              0x00000001
+        enabled_by_default     0x00000002
+        enabled                0x00000004
+        owner                  0x00000008
+        use_for_deny_only      0x00000010
+        logon_id               0xC0000000
+        resource               0x20000000
+        integrity              0x00000020
+        integrity_enabled      0x00000040
+    }]
+}
+
+# Map token privilege attributes
+# TBD - write a test for this
+proc twapi::map_token_privilege_attr {attr} {
+    # SE_PRIVILEGE_ENABLED_BY_DEFAULT 0x00000001
+    # SE_PRIVILEGE_ENABLED            0x00000002
+    # SE_PRIVILEGE_USED_FOR_ACCESS    0x80000000
+
+    return [_make_symbolic_bitmask $attr {
+        enabled_by_default 0x00000001
+        enabled            0x00000002
+        used_for_access    0x80000000
+    }]
+}
+
+
+
+# Map an ace type symbol (eg. allow) to the underlying ACE type code
+proc twapi::_ace_type_symbol_to_code {type} {
+    _init_ace_type_symbol_to_code_map
+    return $::twapi::_ace_type_symbol_to_code_map($type)
+}
+
+
+# Map an ace type code to an ACE type symbol
+proc twapi::_ace_type_code_to_symbol {type} {
+    _init_ace_type_symbol_to_code_map
+    return $::twapi::_ace_type_code_to_symbol_map($type)
+}
+
+
+# Init the arrays used for mapping ACE type symbols to codes and back
+proc twapi::_init_ace_type_symbol_to_code_map {} {
+
+    if {[info exists ::twapi::_ace_type_symbol_to_code_map]} {
+        return
+    }
+
+    # ACCESS_ALLOWED_ACE_TYPE                 0x0
+    # ACCESS_DENIED_ACE_TYPE                  0x1
+    # SYSTEM_AUDIT_ACE_TYPE                   0x2
+    # SYSTEM_ALARM_ACE_TYPE                   0x3
+    # ACCESS_ALLOWED_COMPOUND_ACE_TYPE        0x4
+    # ACCESS_ALLOWED_OBJECT_ACE_TYPE          0x5
+    # ACCESS_DENIED_OBJECT_ACE_TYPE           0x6
+    # SYSTEM_AUDIT_OBJECT_ACE_TYPE            0x7
+    # SYSTEM_ALARM_OBJECT_ACE_TYPE            0x8
+    # ACCESS_ALLOWED_CALLBACK_ACE_TYPE        0x9
+    # ACCESS_DENIED_CALLBACK_ACE_TYPE         0xA
+    # ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE 0xB
+    # ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE  0xC
+    # SYSTEM_AUDIT_CALLBACK_ACE_TYPE          0xD
+    # SYSTEM_ALARM_CALLBACK_ACE_TYPE          0xE
+    # SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE   0xF
+    # SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE   0x10
+    # SYSTEM_MANDATORY_LABEL_ACE_TYPE         0x11
+
+    # Define the array.
+    array set ::twapi::_ace_type_symbol_to_code_map {
+        allow 0    deny 1     audit 2     alarm 3     allow_compound 4
+        allow_object 5    deny_object 6    audit_object 7
+        alarm_object 8    allow_callback 9    deny_callback 10
+        allow_callback_object 11     deny_callback_object 12
+        audit_callback 13    alarm_callback 14    audit_callback_object 15
+        alarm_callback_object 16    mandatory_label 17
+    }
+
+    # Now define the array in the other direction
+    foreach {sym code} [array get ::twapi::_ace_type_symbol_to_code_map] {
+        set ::twapi::_ace_type_code_to_symbol_map($code) $sym
+    }
+}
+
+# Map a resource symbol type to value
+proc twapi::_map_resource_symbol_to_type {sym {named true}} {
+    if {[string is integer $sym]} {
+        return $sym
+    }
+
+    # Note "window" is not here because window stations and desktops
+    # do not have unique names and cannot be used with Get/SetNamedSecurityInfo
+    switch -exact -- $sym {
+        file      { return 1 }
+        service   { return 2 }
+        printer   { return 3 }
+        registry  { return 4 }
+        share     { return 5 }
+        kernelobj { return 6 }
+    }
+    if {$named} {
+        error "Resource type '$sym' not valid for named resources."
+    }
+
+    switch -exact -- $sym {
+        windowstation    { return 7 }
+        directoryservice { return 8 }
+        directoryserviceall { return 9 }
+        providerdefined { return 10 }
+        wmiguid { return 11 }
+        registrywow6432key { return 12 }
+    }
+
+    error "Resource type '$sym' not valid"
+}
+
+# Valid LUID syntax
+proc twapi::_is_valid_luid_syntax luid {
+    return [regexp {^[[:xdigit:]]{8}-[[:xdigit:]]{8}$} $luid]
+}
+
+
+# Delete rights for an account
+proc twapi::_delete_rights {account system} {
+    # Remove the user from the LSA rights database. Ignore any errors
+    catch {
+        remove_account_rights $account {} -all -system $system
+
+        # On Win2k SP1 and SP2, we need to delay a bit for notifications
+        # to complete before deleting the account.
+        # See http://support.microsoft.com/?id=316827
+        lassign [get_os_version] major minor sp dontcare
+        if {($major == 5) && ($minor == 0) && ($sp < 3)} {
+            after 1000
+        }
+    }
+}
+
+
+# Get a token for a user
+proc twapi::open_user_token {username password args} {
+
+    array set opts [parseargs args {
+        domain.arg
+        {type.arg batch {interactive network batch service unlock network_cleartext new_credentials}}
+        {provider.arg default {default winnt35 winnt40 winnt50}}
+    } -nulldefault]
+
+    # LOGON32_LOGON_INTERACTIVE       2
+    # LOGON32_LOGON_NETWORK           3
+    # LOGON32_LOGON_BATCH             4
+    # LOGON32_LOGON_SERVICE           5
+    # LOGON32_LOGON_UNLOCK            7
+    # LOGON32_LOGON_NETWORK_CLEARTEXT 8
+    # LOGON32_LOGON_NEW_CREDENTIALS   9
+    set type [dict get {interactive 2 network 3 batch 4 service 5
+        unlock 7 network_cleartext 8 new_credentials 9} $opts(type)]
+
+    # LOGON32_PROVIDER_DEFAULT    0
+    # LOGON32_PROVIDER_WINNT35    1
+    # LOGON32_PROVIDER_WINNT40    2
+    # LOGON32_PROVIDER_WINNT50    3
+    set provider [dict get {default 0 winnt35 1 winnt40 2 winnt50 3} $opts(provider)]
+
+    # If username is of the form user@domain, then domain must not be specified
+    # If username is not of the form user@domain, then domain is set to "."
+    # if it is empty
+    if {[regexp {^([^@]+)@(.+)} $username dummy user domain]} {
+        if {[string length $opts(domain)] != 0} {
+            error "The -domain option must not be specified when the username is in UPN format (user@domain)"
+        }
+    } else {
+        if {[string length $opts(domain)] == 0} {
+            set opts(domain) "."
+        }
+    }
+
+    return [LogonUser $username $opts(domain) $password $type $provider]
+}
+
+
+# Impersonate a user given a token
+proc twapi::impersonate_token {token} {
+    ImpersonateLoggedOnUser $token
+}
+
+
+# Impersonate a user
+proc twapi::impersonate_user {args} {
+    set token [open_user_token {*}$args]
+    trap {
+        impersonate_token $token
+    } finally {
+        close_token $token
+    }
+}
+
+# Impersonate self
+proc twapi::impersonate_self {level} {
+    switch -exact -- $level {
+        anonymous      { set level 0 }
+        identification { set level 1 }
+        impersonation  { set level 2 }
+        delegation     { set level 3 }
+        default {
+            error "Invalid impersonation level $level"
+        }
+    }
+    ImpersonateSelf $level
+}
+
+# Set a thread token - currently only for current thread
+proc twapi::set_thread_token {token} {
+    SetThreadToken NULL $token
+}
+
+# Reset a thread token - currently only for current thread
+proc twapi::reset_thread_token {} {
+    SetThreadToken NULL NULL
+}
+
+proc twapi::_cred_cook {cred} {
+    set rec [twine {flags type target comment lastwritten credblob persist attributes targetalias username} $cred]
+    dict with rec {
+        set type [dict* {
+            1 generic 2 domain_password 3 domain_certificate 4 domain_visible_password 5 generic_certificate 6 domain_extended} $type]
+        set persist [dict* {
+            1 session 2 local_machine 3 enterprise
+        } $persist]
+    }
+    return $rec
+}
+
+proc twapi::credentials {{pattern {}}} {
+    trap {
+        set raw [CredEnumerate  $pattern 0]
+    } onerror {TWAPI_WIN32 1168} {
+        # Not found / no entries
+        return {}
+    }
+
+    return [lmap cred $raw { _cred_cook $cred }]
+}
+
+proc twapi::cred_delete {target {type generic}} {
+    if {[string is integer -strict $type]} {
+        set type_flags $type
+    } else {
+        set type_flags [dict get {
+            generic 1
+            domain_password 2
+            domain_certificate 3
+            domain_visible_password 4
+            generic_certificate 5
+            domain_extended 6
+        } $type]
+    }
+    CredDelete $target $type_flags 0
+    return
+}
+
+proc twapi::cred_get {target {type generic}} {
+    if {[string is integer -strict $type]} {
+        set type_flags $type
+    } else {
+        set type_flags [dict get {
+            generic 1
+            domain_password 2
+            domain_certificate 3
+            domain_visible_password 4
+            generic_certificate 5
+            domain_extended 6
+        } $type]
+    }
+    return [_cred_cook [CredRead $target $type_flags 0]]
+}
+
+
+# TBD - document after implementing AuditQuerySystemPolicy and friends
+# for Vista & later
+proc twapi::get_audit_policy {lsah} {
+    lassign [LsaQueryInformationPolicy $lsah 2] enabled audit_masks
+    set settings {}
+    foreach name {
+        system  logon  object_access  privilege_use  detailed_tracking
+        policy_change  account_management  directory_service_access
+        account_logon
+    } mask $audit_masks {
+        # Copied from the Perl Win32 book.
+        set setting {}
+        if {$mask == 0 || ($mask & 4)} {
+            set setting {}
+        } elseif {$mask & 3} {
+            if {$mask & 1} { lappend setting log_on_success }
+            if {$mask & 2} { lappend setting log_on_failure }
+        } else {
+            error "Unexpected audit mask value $mask"
+        }
+        lappend settings $name $setting
+    }
+
+    return [list $enabled $settings]
+}
+
+
+# TBD - document after implementing AuditQuerySystemPolicy and friends
+# for Vista & later
+proc twapi::set_audit_policy {lsah enable settings} {
+    set audit_masks {}
+    # NOTE: the order here MUST match the enum definition for 
+    # POLICY_AUDIT_EVENT_TYPE  (see SDK docs)
+    foreach name {
+        system  logon  object_access  privilege_use  detailed_tracking
+        policy_change  account_management  directory_service_access
+        account_logon
+    } {
+        set mask 0; # POLICY_AUDIT_EVENT_UNCHANGED
+        if {[dict exists $settings $name]} {
+            set setting [dict get $settings $name]
+            # 4 -> POLICY_AUDIT_EVENT_NONE resets existing FAILURE|SUCCESS
+            set mask 4
+            if {"log_on_success" in $setting} {
+                set mask [expr {$mask | 1}]; # POLICY_AUDIT_EVENT_SUCCESS
+            }
+            if {"log_on_failure" in $setting} {
+                set mask [expr {$mask | 2}]; # POLICY_AUDIT_EVENT_FAILURE
+            }
+        }
+        lappend audit_masks $mask
+    }
+
+    Twapi_LsaSetInformationPolicy_AuditEvents $lsah $enable $audit_masks
+}
+
+# Returns true if null security descriptor
+proc twapi::_null_secd {secd} {
+    if {[llength $secd] == 0} {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+# Returns true if a valid ACL
+proc twapi::_is_valid_acl {acl} {
+    if {$acl eq "null"} {
+        return 1
+    } else {
+        return [IsValidAcl $acl]
+    }
+}
+
+# Returns true if a valid ACL
+proc twapi::_is_valid_security_descriptor {secd} {
+    if {[_null_secd $secd]} {
+        return 1
+    } else {
+        return [IsValidSecurityDescriptor $secd]
+    }
+}
+
+# Maps a integrity SID to integer or label
+proc twapi::_sid_to_integrity {sid args} {
+    # Note - to make it simpler for callers, additional options are ignored
+    array set opts [parseargs args {
+        label
+        raw
+    }]
+
+    if {$opts(raw) && $opts(label)} {
+        error "Options -raw and -label may not be specified together."
+    }
+
+    if {![string equal -length 7 S-1-16-* $sid]} {
+        error "Unexpected integrity level value '$sid' returned by GetTokenInformation."
+    }
+
+    if {$opts(raw)} {
+        return $sid
+    }
+
+    set integrity [string range $sid 7 end]
+
+    if {! $opts(label)} {
+        # Return integer level
+        return $integrity
+    }
+
+    # Map to a label
+    if {$integrity < 4096} {
+        return untrusted
+    } elseif {$integrity < 8192} {
+        return low
+    } elseif {$integrity < 8448} {
+        return medium
+    } elseif {$integrity < 12288} {
+        return mediumplus
+    } elseif {$integrity < 16384} {
+        return high
+    } else {
+        return system
+    }
+
+}
+
+proc twapi::_integrity_to_sid {integrity} {
+    # Integrity level must be either a number < 65536 or a valid string
+    # or a SID. Check for the first two and convert to SID. Anything else
+    # will be trapped by the actual call as an invalid format.
+    if {[string is integer -strict $integrity]} {
+        set integrity S-1-16-[format %d $integrity]; # In case in hex
+    } else {
+        switch -glob -- $integrity {
+            untrusted { set integrity S-1-16-0 }
+            low { set integrity S-1-16-4096 }
+            medium { set integrity S-1-16-8192 }
+            mediumplus { set integrity S-1-16-8448 }
+            high { set integrity S-1-16-12288 }
+            system { set integrity S-1-16-16384 }
+            S-1-16-* {
+                if {![string is integer -strict [string range $integrity 7 end]]} {
+                    error "Invalid integrity level '$integrity'"
+                }
+                # Format in case level component was in hex/octal
+                set integrity S-1-16-[format %d [string range $integrity 7 end]]
+            }
+            default {
+                error "Invalid integrity level '$integrity'"
+            }
+        }
+    }
+    return $integrity
+}
+
+proc twapi::_map_luids_and_attrs_to_privileges {luids_and_attrs} {
+    set enabled_privs [list ]
+    set disabled_privs [list ]
+    foreach item $luids_and_attrs {
+        set priv [map_luid_to_privilege [lindex $item 0] -mapunknown]
+        # SE_PRIVILEGE_ENABLED -> 0x2
+        if {[lindex $item 1] & 2} {
+            lappend enabled_privs $priv
+        } else {
+            lappend disabled_privs $priv
+        }
+    }
+
+    return [list $enabled_privs $disabled_privs]
+}
+
+# Map impersonation level to symbol
+proc twapi::_map_impersonation_level ilevel {
+    set map {
+        0 anonymous
+        1 identification
+        2 impersonation
+        3 delegation
+    }
+    if {[dict exists $map [incr ilevel 0]]} {
+        return [dict get $map $ilevel]
+    } else {
+        return $ilevel
+    }
+}
+
+proc twapi::_map_well_known_sid_name {sidname} {
+    if {[string is integer -strict $sidname]} {
+        return $sidname
+    }
+
+    set sidname [string tolower $sidname]
+    set sidname [dict* {
+         administrator accountadministrator
+         {cert publishers} accountcertadmins
+         {domain computers} accountcomputers
+         {domain controllers} accountcontrollers
+         {domain admins} accountdomainadmins
+         {domain guests} accountdomainguests
+         {domain users} accountdomainusers
+         {enterprise admins} accountenterpriseadmins
+         guest accountguest
+         krbtgt accountkrbtgt
+         {read-only domain controllers} accountreadonlycontrollers
+         {schema admins} accountschemaadmins
+         {anonymous logon} anonymous
+         {authenticated users} authenticateduser
+         batch batch
+         administrators builtinadministrators
+         {all application packages} builtinanypackage
+         {backup operators} builtinbackupoperators
+         {distributed com users} builtindcomusers
+         builtin builtindomain
+         {event log readers} builtineventlogreadersgroup
+         guests builtinguests
+         {performance log users} builtinperfloggingusers
+         {performance monitor users} builtinperfmonitoringusers
+         {power users} builtinpowerusers
+         {remote desktop users} builtinremotedesktopusers
+         replicator builtinreplicator
+         users builtinusers
+         {console logon} consolelogon
+         {creator group} creatorgroup
+         {creator group server} creatorgroupserver
+         {creator owner} creatorowner
+         {owner rights} creatorownerrights
+         {creator owner server} creatorownerserver
+         dialup dialup
+         {digest authentication} digestauthentication
+         {enterprise domain controllers} enterprisecontrollers
+         {enterprise read-only domain controllers beta} enterprisereadonlycontrollers
+         {high mandatory level} highlabel
+         interactive interactive
+         local local
+         {local service} localservice
+         system localsystem
+         {low mandatory level} lowlabel
+         {medium mandatory level} mediumlabel
+         {medium plus mandatory level} mediumpluslabel
+         network network
+         {network service} networkservice
+         {enterprise read-only domain controllers} newenterprisereadonlycontrollers
+         {ntlm authentication} ntlmauthentication
+         {null sid} null
+         proxy proxy
+         {remote interactive logon} remotelogonid
+         restricted restrictedcode
+         {schannel authentication} schannelauthentication
+         self self
+         service service
+         {system mandatory level} systemlabel
+         {terminal server user} terminalserver
+         {untrusted mandatory level} untrustedlabel
+         everyone world
+         {write restricted} writerestrictedcode
+    } $sidname]
+
+    return [dict! {
+        null 0
+        world 1
+        local 2
+        creatorowner 3
+        creatorgroup 4
+        creatorownerserver 5
+        creatorgroupserver 6
+        ntauthority 7
+        dialup 8
+        network 9
+        batch 10
+        interactive 11
+        service 12
+        anonymous 13
+        proxy 14
+        enterprisecontrollers 15
+        self 16
+        authenticateduser 17
+        restrictedcode 18
+        terminalserver 19
+        remotelogonid 20
+        logonids 21
+        localsystem 22
+        localservice 23
+        networkservice 24
+        builtindomain 25
+        builtinadministrators 26
+        builtinusers 27
+        builtinguests 28
+        builtinpowerusers 29
+        builtinaccountoperators 30
+        builtinsystemoperators 31
+        builtinprintoperators 32
+        builtinbackupoperators 33
+        builtinreplicator 34
+        builtinprewindows2000compatibleaccess 35
+        builtinremotedesktopusers 36
+        builtinnetworkconfigurationoperators 37
+        accountadministrator 38
+        accountguest 39
+        accountkrbtgt 40
+        accountdomainadmins 41
+        accountdomainusers 42
+        accountdomainguests 43
+        accountcomputers 44
+        accountcontrollers 45
+        accountcertadmins 46
+        accountschemaadmins 47
+        accountenterpriseadmins 48
+        accountpolicyadmins 49
+        accountrasandiasservers 50
+        ntlmauthentication 51
+        digestauthentication 52
+        schannelauthentication 53
+        thisorganization 54
+        otherorganization 55
+        builtinincomingforesttrustbuilders 56
+        builtinperfmonitoringusers 57
+        builtinperfloggingusers 58
+        builtinauthorizationaccess 59
+        builtinterminalserverlicenseservers 60
+        builtindcomusers 61
+        builtiniusers 62
+        iuser 63
+        builtincryptooperators 64
+        untrustedlabel 65
+        lowlabel 66
+        mediumlabel 67
+        highlabel 68
+        systemlabel 69
+        writerestrictedcode 70
+        creatorownerrights 71
+        cacheableprincipalsgroup 72
+        noncacheableprincipalsgroup 73
+        enterprisereadonlycontrollers 74
+        accountreadonlycontrollers 75
+        builtineventlogreadersgroup 76
+        newenterprisereadonlycontrollers 77
+        builtincertsvcdcomaccessgroup 78
+        mediumpluslabel 79
+        locallogon 80
+        consolelogon 81
+        thisorganizationcertificate 82
+        applicationpackageauthority 83
+        builtinanypackage 84
+        capabilityinternetclient 85
+        capabilityinternetclientserver 86
+        capabilityprivatenetworkclientserver 87
+        capabilitypictureslibrary 88
+        capabilityvideoslibrary 89
+        capabilitymusiclibrary 90
+        capabilitydocumentslibrary 91
+        capabilitysharedusercertificates 92
+        capabilityenterpriseauthentication 93
+        capabilityremovablestorage 94
+    } $sidname]
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/service.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/service.tcl
new file mode 100644
index 00000000..649b480f
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/service.tcl
@@ -0,0 +1,1187 @@
+#
+# Copyright (c) 2003-2007, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {
+    # When the process hosts Windows services, service_state
+    # is used to keep state of each service. The variable
+    # is indexed by NAME,FIELD where NAME is the name
+    # of the service and FIELD is one of "state", "script",
+    # "checkpoint", "waithint", "exitcode", "servicecode",
+    # "seq", "seqack"
+    variable service_state
+
+    # Map service state names to integers
+    variable service_state_values
+    array set service_state_values {
+        stopped       1
+        start_pending 2
+        stop_pending  3
+        running       4
+        continue_pending 5
+        pause_pending 6
+        paused        7
+    }
+}
+
+
+# Return 1/0 depending on whether the given service exists
+# $name may be either the internal or display name
+proc twapi::service_exists {name args} {
+    array set opts [parseargs args {system.arg database.arg} -nulldefault]
+    # 0x00020000 -> STANDARD_RIGHTS_READ
+    set scm [OpenSCManager $opts(system) $opts(database) 0x00020000]
+
+    trap {
+        GetServiceKeyName $scm $name
+        set exists 1
+    } onerror {TWAPI_WIN32 1060} {
+        # "no such service" error for internal name.
+        # Try display name
+        trap {
+            GetServiceDisplayName $scm $name
+            set exists 1
+        } onerror {TWAPI_WIN32 1060} {
+            set exists 0
+        }
+    } finally {
+        CloseServiceHandle $scm
+    }
+
+    return $exists
+}
+
+
+# Create a service of the specified name
+proc twapi::create_service {name command args} {
+    array set opts [parseargs args {
+        displayname.arg
+        {servicetype.arg     win32_own_process {win32_own_process win32_share_process file_system_driver kernel_driver}}
+        {interactive.bool    0}
+        {starttype.arg       auto_start {auto_start boot_start demand_start disabled system_start}}
+        {errorcontrol.arg    normal {ignore normal severe critical}}
+        loadordergroup.arg
+        dependencies.arg
+        account.arg
+        password.arg
+        system.arg
+        database.arg
+    } -nulldefault]
+
+
+    if {[string length $opts(displayname)] == 0} {
+        set opts(displayname) $name
+    }
+
+    if {[string length $command] == 0} {
+        error "The executable path must not be null when creating a service"
+    }
+    set opts(command) $command
+
+    switch -exact -- $opts(servicetype) {
+        file_system_driver -
+        kernel_driver {
+            if {$opts(interactive)} {
+                error "Option -interactive cannot be specified when -servicetype is $opts(servicetype)."
+            }
+        }
+        default {
+            if {$opts(interactive) && [string length $opts(account)]} {
+                error "Option -interactive cannot be specified with the -account option as interactive services must run under the LocalSystem account."
+            }
+            if {[string equal $opts(starttype) "boot_start"]
+                || [string equal $opts(starttype) "system_start"]} {
+                error "Option -starttype value must be one of auto_start, demand_start or disabled when -servicetype is '$opts(servicetype)'."
+            }
+        }
+    }
+
+    # Map keywords to integer values
+    set opts(servicetype)  [_map_servicetype_sym $opts(servicetype)]
+    set opts(starttype)    [_map_starttype_sym $opts(starttype)]
+    set opts(errorcontrol) [_map_errorcontrol_sym $opts(errorcontrol)]
+
+    # If interactive, add the flag to the service type
+    if {$opts(interactive)} {
+        setbits opts(servicetype) 0x100; # SERVICE_INTERACTIVE_PROCESS
+    }
+
+    # Ignore password if username not specified
+    if {[string length $opts(account)] == 0} {
+        set opts(password) ""
+    } else {
+        # If domain/system not specified, tack on ".\" for local system
+        if {[string first \\ $opts(account)] < 0} {
+            set opts(account) ".\\$opts(account)"
+        }
+    }
+
+    # 2 -> SC_MANAGER_CREATE_SERVICE
+    set scm [OpenSCManager $opts(system) $opts(database) 2]
+    trap {
+        # 0x000F01FF -> SERVICE_ALL_ACCESS
+        set svch [CreateService \
+                      $scm \
+                      $name \
+                      $opts(displayname) \
+                      0x000F01FF \
+                      $opts(servicetype) \
+                      $opts(starttype) \
+                      $opts(errorcontrol) \
+                      $opts(command) \
+                      $opts(loadordergroup) \
+                      "" \
+                      $opts(dependencies) \
+                      $opts(account) \
+                      $opts(password)]
+
+        CloseServiceHandle $svch
+
+    } finally {
+        CloseServiceHandle $scm
+    }
+
+    return
+}
+
+
+# Delete the given service
+proc twapi::delete_service {name args} {
+
+    array set opts [parseargs args {system.arg database.arg} -nulldefault]
+
+    # 0x00010000 -> DELETE access
+    set opts(scm_priv) 0x00010000 
+    set opts(svc_priv) 0x00010000 
+    set opts(proc)     twapi::DeleteService
+
+    _service_fn_wrapper $name opts
+
+    return
+}
+
+
+# Get the internal name of a service
+proc twapi::get_service_internal_name {name args} {
+    array set opts [parseargs args {system.arg database.arg} -nulldefault]
+    # 0x00020000 -> STANDARD_RIGHTS_READ
+    set scm [OpenSCManager $opts(system) $opts(database) 0x00020000]
+
+    trap {
+        if {[catch {GetServiceKeyName $scm $name} internal_name]} {
+            # Maybe this is an internal name itself
+            GetServiceDisplayName $scm $name; # Will throw an error if not internal name
+            set internal_name $name
+        }
+    } finally {
+        CloseServiceHandle $scm
+    }
+
+    return $internal_name
+}
+
+proc twapi::get_service_display_name {name args} {
+    array set opts [parseargs args {system.arg database.arg} -nulldefault]
+    # 0x00020000 -> STANDARD_RIGHTS_READ
+    set scm [OpenSCManager $opts(system) $opts(database) 0x00020000]
+
+    trap {
+        if {[catch {GetServiceDisplayName $scm $name} display_name]} {
+            # Maybe this is an display name itself
+            GetServiceKeyName $scm $name; # Will throw an error if not display name
+            set display_name $name
+        }
+    } finally {
+        CloseServiceHandle $scm
+    }
+
+    return $display_name
+}
+
+proc twapi::start_service {name args} {
+    array set opts [parseargs args {
+        system.arg
+        database.arg
+        params.arg
+        wait.int
+    } -nulldefault]
+    set opts(svc_priv) 0x10;    # SERVICE_START
+    set opts(proc)     twapi::StartService
+    set opts(args)     [list $opts(params)]
+    unset opts(params)
+
+    trap {
+        _service_fn_wrapper $name opts
+    } onerror {TWAPI_WIN32 1056} {
+        # Error 1056 means service already running
+    }
+
+    return [wait {twapi::get_service_state $name -system $opts(system) -database $opts(database)} running $opts(wait)]
+}
+
+# TBD - test
+proc twapi::notify_service {name code args} {
+    array set opts [parseargs args {
+        system.arg
+        database.arg
+        ignorecodes.arg
+    } -nulldefault]
+
+    if {[string is integer -strict $code] && $code >= 128 && $code <= 255} {
+        # 0x100 -> SERVICE_USER_DEFINED_CONTROL 
+        set access 0x100
+    } elseif {$code eq "paramchange"} {
+        # 0x40 -> SERVICE_PAUSE_CONTINUE
+        set access 0x40
+        set code 6;             # PARAMCHANGE
+    } else {
+        badargs! "Invalid service notification code \"$code\"."
+    }
+
+    set scm [OpenSCManager $opts(system) $opts(database) 0x00020000]
+    trap {
+        set svch [OpenService $scm $name $access]
+    } finally {
+        CloseServiceHandle $scm
+    }
+
+    trap {
+        ControlService $svch $code
+    } onerror {TWAPI_WIN32} {
+        if {[lsearch -exact -integer $opts(ignorecodes) [lindex $::errorCode 1]] < 0} {
+            # Not one of the error codes we can ignore. 
+            rethrow
+        }
+    } finally {
+        CloseServiceHandle $svch
+    }
+    return
+}
+
+proc twapi::control_service {name code access finalstate args} {
+    array set opts [parseargs args {
+        system.arg
+        database.arg
+        ignorecodes.arg
+        wait.int
+    } -nulldefault]
+    # 0x00020000 -> STANDARD_RIGHTS_READ
+    set scm [OpenSCManager $opts(system) $opts(database) 0x00020000]
+    trap {
+        set svch [OpenService $scm $name $access]
+    } finally {
+        CloseServiceHandle $scm
+    }
+
+    trap {
+        ControlService $svch $code
+    } onerror {TWAPI_WIN32} {
+        if {[lsearch -exact -integer $opts(ignorecodes) [lindex $::errorCode 1]] < 0} {
+            # Not one of the error codes we can ignore. 
+            rethrow
+        }
+    } finally {
+        CloseServiceHandle $svch
+    }
+
+    if {[string length $finalstate]} {
+        # Wait until service is in specified state
+        return [wait {twapi::get_service_state $name -system $opts(system) -database $opts(database)} $finalstate $opts(wait)]
+    } else {
+        return 0
+    }
+}
+
+proc twapi::stop_service {name args} {
+    # 1 -> SERVICE_CONTROL_STOP
+    # 0x20 -> SERVICE_STOP
+    control_service $name 1 0x20 stopped -ignorecodes 1062 {*}$args
+}
+
+proc twapi::pause_service {name args} {
+    # 2 -> SERVICE_CONTROL_PAUSE
+    # 0x40 -> SERVICE_PAUSE_CONTINUE
+    control_service $name 2 0x40 paused {*}$args
+}
+
+proc twapi::continue_service {name args} {
+    # 3 -> SERVICE_CONTROL_CONTINUE
+    # 0x40 -> SERVICE_PAUSE_CONTINUE
+    control_service $name 3 0x40 running {*}$args
+}
+
+proc twapi::interrogate_service {name args} {
+    # 4 -> SERVICE_CONTROL_INTERROGATE
+    # 0x80 -> SERVICE_INTERROGATE
+    control_service $name 4 0x80 "" {*}$args
+    return
+}
+
+
+# Retrieve status information for a service
+proc twapi::get_service_status {name args} {
+    array set opts [parseargs args {system.arg database.arg} -nulldefault]
+    # 0x00020000 -> STANDARD_RIGHTS_READ
+    set scm [OpenSCManager $opts(system) $opts(database) 0x00020000]
+    trap {
+        # 4 -> SERVICE_QUERY_STATUS
+        set svch [OpenService $scm $name 4]
+    } finally {
+        # Do not need SCM anymore
+        CloseServiceHandle $scm
+    }
+
+    trap {
+        return [QueryServiceStatusEx $svch 0]
+    } finally {
+        CloseServiceHandle $svch
+    }
+}
+
+
+# Get the state of the service
+proc twapi::get_service_state {name args} {
+    return [kl_get [get_service_status $name {*}$args] state]
+}
+
+
+# Get the current configuration for a service
+proc twapi::get_service_configuration {name args} {
+    array set opts [parseargs args {
+        system.arg
+        database.arg
+        all
+        servicetype
+        interactive
+        errorcontrol
+        starttype
+        command
+        loadordergroup
+        account
+        displayname
+        dependencies
+        description
+        scm_handle.arg
+        tagid
+        failureactions
+        delayedstart
+    } -nulldefault -hyphenated]
+
+    if {$opts(-scm_handle) eq ""} {
+        # Use 0x00020000 -> STANDARD_RIGHTS_READ for SCM 
+        set scmh [OpenSCManager $opts(-system) $opts(-database) 0x00020000]
+        trap {
+            set svch [OpenService $scmh $name 1]; # 1 -> SERVICE_QUERY_CONFIG
+        } finally {
+            CloseServiceHandle $scmh
+        }
+    } else {
+        set svch [OpenService $opts(-scm_handle) $name 1]; # 1 -> SERVICE_QUERY_CONFIG
+    }
+
+    trap {
+        set result [QueryServiceConfig $svch]
+        if {$opts(-all) || $opts(-description)} {
+            dict set result -description {}
+            # For backwards compatibility, ignore errors if description
+            # cannot be obtained
+            catch {
+                dict set result -description [QueryServiceConfig2 $svch 1]; # 1 -> SERVICE_CONFIG_DESCRIPTION
+            }
+        }
+
+        if {$opts(-all) || $opts(-failureactions)} {
+            # 2 -> SERVICE_CONFIG_FAILURE_ACTIONS
+            lassign  [QueryServiceConfig2 $svch 2] resetperiod rebootmsg command failure_actions
+            set actions {}
+            foreach action $failure_actions {
+                lappend actions [list [dict* {0 none 1 restart 2 reboot 3 run} [lindex $action 0]] [lindex $action 1]]
+            }
+            dict set result -failureactions [list -resetperiod $resetperiod -rebootmsg $rebootmsg -command $command -actions $actions]
+        }
+        if {$opts(-all) || $opts(-delayedstart)} {
+            if {[min_os_version 6]} {
+                # 3 -> SERVICE_CONFIG_DELAYED_AUTO_START_INFO
+                dict set result -delayedstart [QueryServiceConfig2 $svch 3]
+            } else {
+                dict set result -delayedstart 0
+            }
+        }
+    } finally {
+        CloseServiceHandle $svch
+    }
+
+    if {! $opts(-all)} {
+        set result [dict filter $result script {k val} {set opts($k)}]
+    }
+
+    if {[dict exists $result -errorcontrol]} {
+        dict set result -errorcontrol [_map_errorcontrol_code [dict get $result -errorcontrol]]
+    }
+
+    if {[dict exists $result -starttype]} {
+        dict set result -starttype [_map_starttype_code [dict get $result -starttype]]
+    }
+
+    return $result
+}
+
+# Sets a service configuration
+proc twapi::set_service_configuration {name args} {
+    # Get the current values - we will need these for validation
+    # with the new values
+    array set current [get_service_configuration $name -all]
+    set current(-password) ""; # This is not returned by get_service_configuration
+
+    # Now parse arguments, filling in defaults
+    array set opts [parseargs args {
+        displayname.arg
+        servicetype.arg
+        interactive.bool
+        starttype.arg
+        errorcontrol.arg
+        command.arg
+        loadordergroup.arg
+        dependencies.arg
+        account.arg
+        password.arg
+        {system.arg ""}
+        {database.arg ""}
+    }]
+
+    if {[info exists opts(account)] && ! [info exists opts(password)]} {
+        error "Option -password must also be specified when -account is specified."
+    }
+
+    # Merge current configuration with specified options
+    foreach opt {
+        displayname
+        servicetype
+        interactive
+        starttype
+        errorcontrol
+        command
+        loadordergroup
+        dependencies
+        account
+        password
+    } {
+        if {[info exists opts($opt)]} {
+            set winparams($opt) $opts($opt)
+        } else {
+            set winparams($opt) $current(-$opt)
+        }
+    }
+
+    # Validate the new configuration
+    switch -exact -- $winparams(servicetype) {
+        file_system_driver -
+        kernel_driver {
+            if {$winparams(interactive)} {
+                error "Option -interactive cannot be specified when -servicetype is $winparams(servicetype)."
+            }
+        }
+        default {
+            if {$winparams(interactive) &&
+                [string length $winparams(account)] &&
+                [string compare -nocase $winparams(account) "LocalSystem"]
+            } {
+                error "Option -interactive cannot be specified with the -account option as interactive services must run under the LocalSystem account."
+            }
+            if {[string equal $winparams(starttype) "boot_start"]
+                || [string equal $winparams(starttype) "system_start"]} {
+                error "Option -starttype value must be one of auto_start, demand_start or disabled when -servicetype is '$winparams(servicetype)'."
+            }
+        }
+    }
+
+    # Map keywords to integer values
+    set winparams(servicetype)  [_map_servicetype_sym $winparams(servicetype)]
+    set winparams(starttype)    [_map_starttype_sym $winparams(starttype)]
+    set winparams(errorcontrol) [_map_errorcontrol_sym $winparams(errorcontrol)]
+
+    # Merge the interactive setting
+    # 0x100 -> SERVICE_INTERACTIVE_PROCESS
+    if {$winparams(interactive)} {
+        setbits winparams(servicetype) 0x100
+    } else {
+        resetbits winparams(servicetype) 0x100 
+    }
+
+    # If domain/system not specified, tack on ".\" for local system
+    if {[string length $winparams(account)]} {
+        if {[string first \\ $winparams(account)] < 0} {
+            set winparams(account) ".\\$winparams(account)"
+        }
+    }
+
+    # Now replace any options that were not specified with "no change"
+    # tokens.
+    foreach opt {servicetype starttype errorcontrol} {
+        if {![info exists opts($opt)]} {
+            set winparams($opt) 0xffffffff;  # SERVICE_NO_CHANGE
+        }
+    }
+    # -servicetype and -interactive go in same field
+    if {![info exists opts(servicetype)] && ![info exists opts(interactive)]} {
+        set winparams(servicetype) 0xffffffff; # SERVICE_NO_CHANGE
+    }
+
+    foreach opt {command loadordergroup dependencies account password displayname} {
+        if {![info exists opts($opt)]} {
+            set winparams($opt) $twapi::nullptr
+        }
+    }
+
+    set opts(scm_priv) 0x00020000; # 0x00020000 -> STANDARD_RIGHTS_READ
+    set opts(svc_priv) 2;    # 2 -> SERVICE_CHANGE_CONFIG
+
+    set opts(proc)     twapi::ChangeServiceConfig
+    set opts(args) \
+        [list \
+             $winparams(servicetype) \
+             $winparams(starttype) \
+             $winparams(errorcontrol) \
+             $winparams(command) \
+             $winparams(loadordergroup) \
+             "" \
+             $winparams(dependencies) \
+             $winparams(account) \
+             $winparams(password) \
+             $winparams(displayname)]
+
+    _service_fn_wrapper $name opts
+
+    return
+}
+
+proc twapi::set_service_delayed_start {name delay args} {
+    array set opts [parseargs args {
+        {system.arg ""}
+        {database.arg ""}
+    } -maxleftover 0]
+
+    set opts(scm_priv) 0x00020000; # 0x00020000 -> STANDARD_RIGHTS_READ
+    set opts(svc_priv) 2;    # 2 -> SERVICE_CHANGE_CONFIG
+
+    set opts(proc) twapi::ChangeServiceConfig2
+    set opts(args) [list 3 $delay]
+
+    _service_fn_wrapper $name opts
+    return
+}
+
+proc twapi::set_service_description {name description args} {
+    array set opts [parseargs args {
+        {system.arg ""}
+        {database.arg ""}
+    } -maxleftover 0]
+
+    set opts(scm_priv) 0x00020000; # 0x00020000 -> STANDARD_RIGHTS_READ
+    set opts(svc_priv) 2;    # 2 -> SERVICE_CHANGE_CONFIG
+
+    set opts(proc) twapi::ChangeServiceConfig2
+    set opts(args) [list 1 $description]
+
+    _service_fn_wrapper $name opts
+    return
+}
+
+proc twapi::set_service_failure_actions {name args} {
+    array set opts [parseargs args {
+        {system.arg ""}
+        {database.arg ""}
+        resetperiod.arg
+        {rebootmsg.arg __null__}
+        {command.arg __null__}
+        actions.arg
+    } -maxleftover 0]
+
+    set opts(scm_priv) 0x00020000; # 0x00020000 -> STANDARD_RIGHTS_READ
+    set opts(svc_priv) 2;    # 2 -> SERVICE_CHANGE_CONFIG
+
+    # If option actions is not specified, actions for the service
+    # are left unchanged.
+    if {[info exists opts(actions)]} {
+        set actions {}
+        foreach action $opts(actions) {
+            if {[llength $action] != 2} {
+                error "Invalid format for failure action"
+            }
+            set action_code [dict* {none 0 restart 1 reboot 2 run 3} [lindex $action 0]]
+            if {$action_code == 1} {
+                # Also need SERVICE_START access right for restart action
+                set opts(svc_priv) [expr {$opts(svc_priv) | 0x10}]
+            }
+            lappend actions [list $action_code [lindex $action 1]]
+        }
+        if {![info exists opts(resetperiod)] || $opts(resetperiod) eq "infinite"} {
+            set opts(resetperiod) 0xffffffff
+        }
+        set fail_params [list $opts(resetperiod) $opts(rebootmsg) $opts(command) $actions]
+    } else {
+        if {[info exists opts(resetperiod)]} {
+            badargs! "Option -resetperiod can only be used if the -actions option is also specified."
+        }
+        set fail_params [list 0 $opts(rebootmsg) $opts(command)]
+    }
+
+    set opts(proc) twapi::ChangeServiceConfig2
+    set opts(args) [list 2 $fail_params]; # 2 -> SERVICE_CONFIG_FAILURE_ACTIONS
+    _service_fn_wrapper $name opts
+    return
+}
+
+# Get status for the specified service types
+proc twapi::get_multiple_service_status {args} {
+    set service_types [list \
+                           kernel_driver \
+                           file_system_driver \
+                           adapter \
+                           recognizer_driver \
+                           user_own_process \
+                           user_share_process \
+                           win32_own_process \
+                           win32_share_process]
+    set switches [concat $service_types \
+                      [list active inactive] \
+                      [list system.arg database.arg]]
+    array set opts [parseargs args $switches -nulldefault]
+
+    set servicetype 0
+    foreach type $service_types {
+        if {$opts($type)} {
+            set servicetype [expr { $servicetype | [_map_servicetype_sym $type]}]
+        }
+    }
+    if {$servicetype == 0} {
+        # No type specified, return all
+        set servicetype 0x3f
+    }
+
+    set servicestate 0
+    if {$opts(active)} {
+        set servicestate 1;     # 1 -> SERVICE_ACTIVE
+    }
+    if {$opts(inactive)} {
+        set servicestate [expr {$servicestate | 2}]; # 2 -> SERVICE_INACTIVE
+    }
+    if {$servicestate == 0} {
+        # No state specified, include all
+        set servicestate 3
+    }
+
+    # 4 -> SC_MANAGER_ENUMERATE_SERVICE
+    set scm [OpenSCManager $opts(system) $opts(database) 4]
+    trap {
+        set fields {
+            servicetype state controls_accepted  exitcode service_code
+            checkpoint wait_hint pid serviceflags name displayname interactive 
+        }
+        return [list $fields [EnumServicesStatusEx $scm 0 $servicetype $servicestate __null__]]
+    } finally {
+        CloseServiceHandle $scm
+    }
+}
+
+
+# Get status for the dependents of the specified service
+proc twapi::get_dependent_service_status {name args} {
+    array set opts [parseargs args \
+                        [list active inactive system.arg database.arg] \
+                        -nulldefault]
+
+    set servicestate 0
+    if {$opts(active)} {
+        set servicestate 1;     # 1 -> SERVICE_ACTIVE
+    }
+    if {$opts(inactive)} {
+        set servicestate [expr {$servicestate | 2}]; # SERVICE_INACTIVE
+    }
+    if {$servicestate == 0} {
+        # No state specified, include all
+        set servicestate 3
+    }
+
+    set opts(svc_priv) 8; # SERVICE_ENUMERATE_DEPENDENTS
+    set opts(proc)     twapi::EnumDependentServices
+    set opts(args)     [list $servicestate]
+
+    set fields {
+        servicetype state controls_accepted  exitcode service_code
+        checkpoint wait_hint name displayname interactive 
+    }
+
+    return [list $fields [_service_fn_wrapper $name opts]]
+
+
+}
+
+
+################################################################
+# Commands for running as a service
+
+proc twapi::run_as_service {services args} {
+    variable service_state
+
+    if {[llength $services] == 0} {
+        win32_error 87 "No services specified"
+    }
+
+    array set opts [parseargs args {
+        interactive.bool
+        {controls.arg {stop shutdown}}
+    } -nulldefault -maxleftover 0]
+
+    # Currently service controls are per process, not per service and
+    # are fixed for the duration of the process.
+    # TBD - C code actually allows for per service controls. Expose?
+    set service_state(controls) [_parse_service_accept_controls $opts(controls)]
+    if {![min_os_version 5 1]} {
+        # Not accepted on Win2k
+        if {$service_state(controls) & 0x80} {
+            error "Service control type 'sessionchange' is not valid on this platform"
+        }
+    }
+
+    if {[llength $services] == 1} {
+        set type 0x10;          # WIN32_OWN_PROCESS
+    } else {
+        set type 0x20;          # WIN32_SHARE_PROCESS
+    }
+    if {$opts(interactive)} {
+        setbits type 0x100;     # INTERACTIVE_PROCESS
+    }
+
+    set service_defs [list ]
+    foreach service $services {
+        lassign $service name script
+        set name [string tolower $name]
+        lappend service_defs [list $name $service_state(controls)]
+        set service_state($name,state)       stopped
+        set service_state($name,script)      $script
+        set service_state($name,checkpoint)  0
+        set service_state($name,waithint)    2000; # 2 seconds
+        set service_state($name,exitcode)    0
+        set service_state($name,servicecode) 0
+        set service_state($name,seq)         0
+        set service_state($name,seqack)      0
+    }
+
+    twapi::Twapi_BecomeAService $type {*}$service_defs
+
+    # Turn off console events by installing our own handler,
+    # else tclsh will exit when a user logs off even if it is running
+    # as a service
+    # COMMENTED OUT because now done in C code itself
+    # proc ::twapi::_service_console_handler args { return 1 }
+    # set_console_control_handler ::twapi::_service_console_handler
+
+    # Redefine ourselves as we should not be called again
+    proc ::twapi::run_as_service args {
+        error "Already running as a service"
+    }
+}
+
+
+# Callback that handles requests from the service control manager
+proc twapi::_service_handler {name service_status_handle control args} {
+    # TBD - should we catch the error or let the C code see it ?
+    if {[catch {
+        _service_handler_unsafe $name $service_status_handle $control $args
+    } msg]} {
+        # TBD - log error message
+        catch {eventlog_log "Error in service handler for service $name. $msg Stack: $::errorInfo" -type error}
+    }
+}
+
+# Can raise an error
+proc twapi::_service_handler_unsafe {name service_status_handle control extra_args} {
+    variable service_state
+
+    set name [string tolower $name]
+
+    # The service handler will receive control codes from the service
+    # control manager and modify the state of a service accordingly.
+    # It also calls the script registered by the application for
+    # the service. The caller is expected to complete the state change
+    # by calling service_change_state_complete either inside the
+    # callback or at some later point.
+
+    set tell_app true;          # Does app need to be notified ?
+    set report_status true;     # Whether we should update status
+    set need_response true;     # App should report status back
+
+    switch -glob -- "$service_state($name,state),$control" {
+        stopped,start {
+            set service_state($name,state) start_pending
+            set service_state($name,checkpoint) 1
+        }
+        start_pending,shutdown -
+        paused,shutdown        -
+        pause_pending,shutdown -
+        continue_pending,shutdown -
+        running,shutdown -
+        start_pending,stop -
+        paused,stop        -
+        pause_pending,stop -
+        continue_pending,stop -
+        running,stop {
+            set service_state($name,state) stop_pending
+            set service_state($name,checkpoint) 1
+        }
+        running,pause {
+            set service_state($name,state) pause_pending
+            set service_state($name,checkpoint) 1
+        }
+        pause_pending,continue -
+        paused,continue {
+            set service_state($name,state) continue_pending
+            set service_state($name,checkpoint) 1
+        }
+        *,interrogate {
+            # No state change, we will simply report status below
+            set tell_app false; # No need to bother the application
+        }
+        *,userdefined -
+        *,paramchange -
+        *,netbindadd -
+        *,netbindremove -
+        *,netbindenable -
+        *,netbinddisable -
+        *,deviceevent -
+        *,hardwareprofilechange -
+        *,powerevent -
+        *,sessionchange {
+            # Notifications, should not report status.
+            set report_status false
+            set need_response false
+        }
+        default {
+            # All other cases are no-ops (e.g. paused,pause) or
+            # don't make logical sense (e.g. stop_pending,continue)
+            # For now, we simply ignore them but not sure
+            # if we should just update service status anyways
+            return
+        }
+    }
+
+    if {$report_status} {
+        _report_service_status $name
+    }
+
+    set result 0
+    if {$tell_app} {
+        if {[catch {
+            if {$need_response} {
+                set seq [incr service_state($name,seq)]
+            } else {
+                set seq -1
+            }
+            set result [uplevel #0 [linsert $service_state($name,script) end $control $name $seq {*}$extra_args]]
+            # Note that if the above script may call back into us,
+            # via update_service_status for example, the service
+            # state may be updated at this point
+        } msg]} {
+            # TBD - report if the script throws errors
+        }
+    }
+
+    if {$result eq "allow"} {
+        set result 0
+    } elseif {$result eq "deny"} {
+        set result  0x424D5144; # BROADCAST_QUERY_DENY
+    }
+
+    return $result
+}
+
+# Called by the application to update it's status
+# status should be one of "running", "paused" or "stopped"
+# seq is 0 or the sequence number of a previous callback to
+# the application to which this is the response.
+proc twapi::update_service_status {name seq state args} {
+    variable service_state
+
+    if {$state ni {running paused stopped}} {
+        error "Invalid state token $state"
+    }
+
+    if {$seq == -1} {
+        # This was a notification. App should not have responded.
+        # Just ignore it
+        return ignored
+    }
+
+    array set opts [parseargs args {
+        exitcode.int
+        servicecode.int
+        waithint.int
+    } -maxleftover 0]
+
+    set name [string tolower $name]
+
+    # Depending on the current state of the application,
+    # we may or may not be able to change state. For
+    # example, if the current state is "running" and
+    # the new state is "stopped", that is ok. But the
+    # converse is not allowed since we cannot
+    # transition from stopped to running unless
+    # the SCM has sent us a start signal.
+
+    # If the seq is greater than the last one we sent, bug somewhere
+    if {$service_state($name,seq) < $seq} {
+        error "Invalid sequence number $seq (too large) for service status update."
+    }
+
+    # If we have a request outstanding (to the app) that the app
+    # has not yet responded to, then all calls from the app with
+    # no seq number (i.e. 0) or calls with an older sequence number
+    # are ignored.
+    if {($service_state($name,seq) > $service_state($name,seqack)) &&
+        ($seq == 0 || $seq < $service_state($name,seq))} {
+        # Ignore this request
+        return ignored
+    }
+
+    set service_state($name,seqack) $seq; # last responded sequence number
+
+    # If state specified as stopped, store the exit codes
+    if {$state eq "stopped"} {
+        if {[info exists opts(exitcode)]} {
+            set service_state($name,exitcode) $opts(exitcode)
+        }
+        if {[info exists opts(servicecode)]} {
+            set service_state($name,servicecode) $opts(servicecode)
+        }
+    }
+
+    upvar 0 service_state($name,state) current_state
+
+    # If there is no state change, nothing to do
+    if {$state eq $current_state} {
+        return nochange
+    }
+
+    switch -exact -- $state {
+        stopped {
+            # Application can stop at any time from any other state.
+            # No questions asked.
+        }
+        running {
+            if {$current_state eq "stopped" || $current_state eq "paused"} {
+                # This should not happen if all the rules are followed by the
+                # application code.
+                #error "Service $name attempted to transition directly from stopped or paused state to running state without an intermediate pending state"
+                return invalidchange
+            }
+        }
+        paused {
+            if {$current_state ne "pause_pending" &&
+                $current_state ne "continue_pending"} {
+                # This should not happen if all the rules are followed by the
+                # application code.
+                #error "Service $name attempted to transition from $current_state state to paused state"
+                return invalidchange
+            }
+        }
+    }
+
+    set current_state $state
+    _report_service_status $name
+
+    if {$state eq "stopped"} {
+        # If all services have stopped, tell the app
+        set all_stopped true
+        foreach {entry val} [array get service_state *,state] {
+            if {$val ne "stopped"} {
+                set all_stopped false
+                break
+            }
+        }
+        if {$all_stopped} {
+            uplevel #0 [linsert $service_state($name,script) end all_stopped $name 0]
+        }
+    }
+
+    return changed;             # State changed
+}
+
+
+# Report the status of a service back to the SCM
+proc twapi::_report_service_status {name} {
+    variable service_state
+    upvar 0 service_state($name,state) current_state
+
+    # If the state is a pending state, then make sure we
+    # increment the checkpoint value
+    if {[string match *pending $current_state]} {
+        incr service_state($name,checkpoint)
+        set waithint $service_state($name,waithint)
+    } else {
+        set service_state($name,checkpoint) 0
+        set waithint 0
+    }
+
+    # Currently service controls are per process, not per service and
+    # are fixed for the duration of the process. So we always pass
+    # service_state(controls). Applications has to ensure it can handle
+    # all control signals in all states (ignoring them as desired)
+    if {[catch {
+        Twapi_SetServiceStatus $name $::twapi::service_state_values($current_state) $service_state($name,exitcode) $service_state($name,servicecode) $service_state($name,checkpoint) $waithint $service_state(controls)
+    } msg]} {
+        # TBD - report error - but how ? bgerror?
+        catch {twapi::eventlog_log "Error setting service status: $msg"}
+    }
+
+    # If we had supplied a wait hint, we are telling the SCM, we will call
+    # it back within that period of time, so schedule ourselves.
+    if {$waithint} {
+        set delay [expr {($waithint*3)/4}]
+        after $delay ::twapi::_call_scm_within_waithint $name $current_state $service_state($name,checkpoint)
+    }
+
+    return
+}
+
+
+# Queued to regularly update the SCM when we are in any of the pending states
+proc ::twapi::_call_scm_within_waithint {name orig_state orig_checkpoint} {
+    variable service_state
+
+    # We only call to update staus if the state and checkpoint have
+    # not changed since the routine was queued
+    if {($service_state($name,state) eq $orig_state) &&
+        ($service_state($name,checkpoint) == $orig_checkpoint)} {
+        _report_service_status $name
+    }
+}
+
+
+################################################################
+# Utility procedures
+
+# Map an integer service type code into a list consisting of
+# {SERVICETYPESYMBOL BOOLEAN}. If there is not symbolic service type
+# for the service, just the integer code is returned. The BOOLEAN
+# is 1/0 depending on whether the service type code is interactive
+proc twapi::_map_servicetype_code {servicetype} {
+    # 0x100 -> SERVICE_INTERACTIVE_PROCESS
+    set interactive [expr {($servicetype & 0x100) != 0}]
+    set servicetype [expr {$servicetype & (~ 0x100)}]
+    set servicetype [kl_get [list \
+                                 16 win32_own_process \
+                                 32 win32_share_process \
+                                 80 user_own_process \
+                                 96 user_share_process \
+                                 1 kernel_driver \
+                                 2 file_system_driver \
+                                 4 adapter \
+                                 8 recognizer_driver \
+                                 ] $servicetype $servicetype]
+    return [list $servicetype $interactive]
+}
+
+# Map service type sym to int code
+proc twapi::_map_servicetype_sym {sym} {
+    return [dict get {kernel_driver 1 file_system_driver 2 adapter 4 recognizer_driver 8 win32_own_process 16 win32_share_process 32 user_own_process 80 user_share_process 96} $sym]
+}
+
+# Map a start type code into a symbol. Returns the integer code if
+# no mapping possible
+proc twapi::_map_starttype_code {code} {
+    incr code 0;                # Make canonical int
+    set type [lindex {boot_start system_start auto_start demand_start disabled} $code]
+    if {$type eq ""} {
+        return $code
+    } else {
+        return $type
+    }
+}
+
+# Map starttype sym to int code
+proc twapi::_map_starttype_sym {sym} {
+    return [dict get {boot_start 0 system_start 1 auto_start 2 demand_start 3 disabled 4} $sym]
+}
+
+# Map a error control code into a symbol. Returns the integer code if
+# no mapping possible
+proc twapi::_map_errorcontrol_code {code} {
+    incr code 0;                # Make canonical int
+    set error [lindex {ignore normal severe critical} $code]
+    if {$error eq ""} {
+        return $code
+    } else {
+        return $error
+    }
+}
+
+# Map error control sym to int code
+proc twapi::_map_errorcontrol_sym {sym} {
+    return [dict get {ignore 0 normal 1 severe 2 critical 3} $sym]
+}
+
+# Standard template for calling a service function. v_opts should refer
+# to an array with the following elements:
+# opts(system) - target system. Must be specified
+# opts(database) - target database. Must be specified
+# opts(scm_priv) - requested privilege when opening SCM. STANDARD_RIGHTS_READ
+#   is used if unspecified. Not used if scm_handle is specified
+# opts(scm_handle) - handle to service control manager. Optional
+# opts(svc_priv) - requested privilege when opening service. Must be present
+# opts(proc) - proc/function to call. The first arg is the service handle
+# opts(args) - additional arguments to pass to the function.
+#   Empty if unspecified
+proc twapi::_service_fn_wrapper {name v_opts} {
+    upvar $v_opts opts
+
+    # Use 0x00020000 -> STANDARD_RIGHTS_READ for SCM if not specified
+    set scm_priv [expr {[info exists opts(scm_priv)] ? $opts(scm_priv) : 0x00020000}]
+
+    if {[info exists opts(scm_handle)] &&
+        $opts(scm_handle) ne ""} {
+        set scm $opts(scm_handle)
+    } else {
+        set scm [OpenSCManager $opts(system) $opts(database) $scm_priv]             }
+    trap {
+        set svch [OpenService $scm $name $opts(svc_priv)]
+    } finally {
+        # No need for scm handle anymore. Close it unless it was
+        # passed to us
+        if {(![info exists opts(scm_handle)]) ||
+            ($opts(scm_handle) eq "")} {
+            CloseServiceHandle $scm
+        }
+    }
+
+    set proc_args [expr {[info exists opts(args)] ? $opts(args) : ""}]
+    trap {
+        set results [eval [list $opts(proc) $svch] $proc_args]
+    } finally {
+        CloseServiceHandle $svch
+    }
+
+    return $results
+}
+
+# Called back for reporting background errors. Note this is called
+# from the C++ services code, not from scripts.
+proc twapi::_service_background_error {winerror msg} {
+    twapi::win32_error $winerror $msg
+}
+
+# Parse symbols for controls accepted by a service
+proc twapi::_parse_service_accept_controls {controls} {
+    return [_parse_symbolic_bitmask $controls {
+        stop                    0x00000001
+        pause_continue          0x00000002
+        shutdown                0x00000004
+        paramchange             0x00000008
+        netbindchange           0x00000010
+        hardwareprofilechange   0x00000020
+        powerevent              0x00000040
+        sessionchange           0x00000080
+    }]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/share.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/share.tcl
new file mode 100644
index 00000000..76809064
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/share.tcl
@@ -0,0 +1,966 @@
+#
+# Copyright (c) 2003-2014, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {
+    # Win SDK based structure definitions
+
+    record SHARE_INFO_0 {-name}
+    record SHARE_INFO_1 {-name -type -comment}
+    record SHARE_INFO_2 {-name -type -comment -permissions -max_conn -current_conn -path -passwd}
+    record SHARE_INFO_502 {-name -type -comment -permissions -max_conn -current_conn -path -passwd -reserved -secd}
+
+    record USE_INFO_0 {-localdevice -remoteshare}
+    record USE_INFO_1 {-localdevice -remoteshare -password -status -type -opencount -usecount}
+    record USE_INFO_2 {-localdevice -remoteshare -password -status -type -opencount -usecount -user -domain}
+
+    record SESSION_INFO_0 {-clientname}
+    record SESSION_INFO_1 {-clientname -user -opencount -activeseconds -idleseconds -attrs}
+    record SESSION_INFO_2 {-clientname -user -opencount -activeseconds -idleseconds -attrs -clienttype}
+    record SESSION_INFO_502 {-clientname -user -opencount -activeseconds -idleseconds -attrs -clienttype -transport}
+    record SESSION_INFO_10 {-clientname -user -activeseconds -idleseconds}
+
+    record FILE_INFO_2 {-id}
+    record FILE_INFO_3 {-id -permissions -lockcount -path -user}
+
+    record CONNECTION_INFO_0 {-id}
+    record CONNECTION_INFO_1 {-id -type -opencount -usercount -activeseconds -user -netname}
+
+    struct NETRESOURCE {
+        DWORD  dwScope;
+        DWORD  dwType;
+        DWORD  dwDisplayType;
+        DWORD  dwUsage;
+        LPCWSTR lpLocalName;
+        LPCWSTR lpRemoteName;
+        LPCWSTR lpComment;
+        LPCWSTR lpProvider;
+    };
+
+    struct NETINFOSTRUCT {
+        DWORD     cbStructure;
+        DWORD     dwProviderVersion;
+        DWORD     dwStatus;
+        DWORD     dwCharacteristics;
+        HANDLE    dwHandle;
+        WORD      wNetType;
+        DWORD     dwPrinters;
+        DWORD     dwDrives;
+    }
+}
+
+# TBD - is there a Tcl wrapper around NetShareCheck?
+
+# Create a network share
+proc twapi::new_share {sharename path args} {
+    array set opts [parseargs args {
+        {system.arg ""}
+        {type.arg "file"}
+        {comment.arg ""}
+        {max_conn.int -1}
+        secd.arg
+    } -maxleftover 0]
+
+    # If no security descriptor specified, default to "Everyone,
+    # read permission". Levaing it empty will give everyone all permissions
+    # which is probably not a good idea!
+    if {![info exists opts(secd)]} {
+        set opts(secd) [new_security_descriptor -dacl [new_acl [list [new_ace allow S-1-1-0 1179817]]]]
+    }
+    
+    NetShareAdd $opts(system) \
+        $sharename \
+        [_share_type_symbols_to_code $opts(type)] \
+        $opts(comment) \
+        $opts(max_conn) \
+        [file nativename $path] \
+        $opts(secd)
+}
+
+# Delete a network share
+proc twapi::delete_share {sharename args} {
+    array set opts [parseargs args {system.arg} -nulldefault]
+    NetShareDel $opts(system) $sharename 0
+}
+
+# Enumerate network shares
+proc twapi::get_shares {args} {
+
+    array set opts [parseargs args {
+        {system.arg ""}
+        {type.arg ""}
+        excludespecial
+        level.int
+    } -maxleftover 0]
+
+    if {$opts(type) != ""} {
+        set type_filter [_share_type_symbols_to_code $opts(type) 1]
+    }
+
+    if {[info exists opts(level)] && $opts(level) > 0} {
+        set level $opts(level)
+    } else {
+        # Either -level not specified or specified as 0
+        # We need at least level 1 to filter on type
+        set level 1
+    }
+
+    set record_proc SHARE_INFO_$level
+    set raw_data [_net_enum_helper NetShareEnum -system $opts(system) -level $level -fields [$record_proc]]
+    set recs [list ]
+    foreach rec [recordarray getlist $raw_data] {
+        # 0xC0000000 -> 0x80000000 (STYPE_SPECIAL), 0x40000000 (STYPE_TEMPORARY)
+        set special [expr {[$record_proc -type $rec] & 0xC0000000}]
+        if {$special && $opts(excludespecial)} {
+            continue
+        }
+        # We need the special cast to int because else operands get promoted
+        # to 64 bits as the hex is treated as an unsigned value
+        set share_type [$record_proc -type $rec]
+        if {[info exists type_filter] && [expr {int($share_type & ~ $special)}] != $type_filter} {
+            continue
+        }
+        set rec [$record_proc set $rec -type [_share_type_code_to_symbols $share_type]]
+        if {[info exists opts(level)]} {
+            lappend recs $rec
+        } else {
+            lappend recs [$record_proc -name $rec]
+        }
+    }
+
+    if {[info exists opts(level)]} {
+        set ra [list [$record_proc] $recs]
+        if {$opts(level) == 0} {
+            # We actually need only a level 0 subset
+            return [recordarray get $ra -slice [SHARE_INFO_0]]
+        }
+        return $ra
+    } else {
+        return $recs
+    }
+}
+
+
+# Get details about a share
+proc twapi::get_share_info {sharename args} {
+    array set opts [parseargs args {
+        system.arg
+        all
+        name
+        type
+        path
+        comment
+        max_conn
+        current_conn
+        secd
+    } -nulldefault -hyphenated]
+
+    set level 0
+
+    if {$opts(-all) || $opts(-name) || $opts(-type) || $opts(-comment)} {
+        set level 1
+        set record_proc SHARE_INFO_1
+    }
+
+    if {$opts(-all) || $opts(-max_conn) || $opts(-current_conn) || $opts(-path)} {
+        set level 2
+        set record_proc SHARE_INFO_2
+    }
+
+    if {$opts(-all) || $opts(-secd)} {
+        set level 502
+        set record_proc SHARE_INFO_502
+    }
+
+    if {! $level} {
+        return
+    }
+
+    set rec [NetShareGetInfo $opts(-system) $sharename $level]
+    set result [list ]
+    foreach opt {-name -comment -max_conn -current_conn -path -secd} {
+        if {$opts(-all) || $opts($opt)} {
+            lappend result $opt [$record_proc $opt $rec]
+        }
+    }
+    if {$opts(-all) || $opts(-type)} {
+        lappend result -type [_share_type_code_to_symbols [$record_proc -type $rec]]
+    }
+
+    return $result
+}
+
+
+# Set a share configuration
+proc twapi::set_share_info {sharename args} {
+    array set opts [parseargs args {
+        {system.arg ""}
+        comment.arg
+        max_conn.int
+        secd.arg
+    }]
+
+    # First get the current config so we can change specified fields
+    # and write back
+    array set shareinfo [get_share_info $sharename -system $opts(system) \
+                             -comment -max_conn -secd]
+    foreach field {comment max_conn secd} {
+        if {[info exists opts($field)]} {
+            set shareinfo(-$field) $opts($field)
+        }
+    }
+
+    NetShareSetInfo $opts(system) $sharename $shareinfo(-comment) \
+        $shareinfo(-max_conn) $shareinfo(-secd)
+}
+
+
+# Get list of remote shares
+proc twapi::get_client_shares {args} {
+    array set opts [parseargs args {
+        {system.arg ""}
+        level.int
+    } -maxleftover 0]
+
+    if {[info exists opts(level)]} {
+        set rec_proc USE_INFO_$opts(level)
+        set ra [_net_enum_helper NetUseEnum -system $opts(system) -level $opts(level) -fields [$rec_proc]]
+        set fields [$rec_proc]
+        set have_status [expr {"-status" in $fields}]
+        set have_type [expr {"-type" in $fields}]
+        if {! ($have_status || $have_type)} {
+            return $ra
+        }
+        set recs {}
+        foreach rec [recordarray getlist $ra] {
+            if {$have_status} {
+                set rec [$rec_proc set $rec -status [_map_useinfo_status [$rec_proc -status $rec]]]
+            }
+            if {$have_type} {
+                set rec [$rec_proc set $rec -type [_map_useinfo_type [$rec_proc -type $rec]]]
+            }
+            lappend recs $rec
+        }
+        return [list $fields $recs]
+    }
+
+    # -level not specified. Just return a list of the remote share names
+    return [recordarray column [_net_enum_helper NetUseEnum -system $opts(system) -level 0 -fields [USE_INFO_0]] -remoteshare]
+}
+
+
+# Connect to a share
+proc twapi::connect_share {remoteshare args} {
+    array set opts [parseargs args {
+        {type.arg  "disk"} 
+        localdevice.arg
+        provider.arg
+        password.arg
+        nopassword
+        defaultpassword
+        user.arg
+        {window.arg 0}
+        {interactive {} 0x8}
+        {prompt      {} 0x10}
+        {updateprofile {} 0x1}
+        {commandline {} 0x800}
+    } -nulldefault]
+
+    set flags 0
+
+    switch -exact -- $opts(type) {
+        "any"       {set type 0}
+        "disk"      -
+        "file"      {set type 1}
+        "printer"   {set type 2}
+        default {
+            error "Invalid network share type '$opts(type)'"
+        }
+    }
+
+    # localdevice - "" means no local device, * means pick any, otherwise
+    # it's a local device to be mapped
+    if {$opts(localdevice) == "*"} {
+        set opts(localdevice) ""
+        setbits flags 0x80;             # CONNECT_REDIRECT
+    }
+
+    if {$opts(defaultpassword) && $opts(nopassword)} {
+        error "Options -defaultpassword and -nopassword may not be used together"
+    }
+    if {$opts(nopassword)} {
+        set opts(password) ""
+        set ignore_password 1
+    } else {
+        set ignore_password 0
+        if {$opts(defaultpassword)} {
+            set opts(password) ""
+        }
+    }
+
+    set flags [expr {$flags | $opts(interactive) | $opts(prompt) |
+                     $opts(updateprofile) | $opts(commandline)}]
+
+    return [Twapi_WNetUseConnection $opts(window) $type $opts(localdevice) \
+                $remoteshare $opts(provider) $opts(user) $ignore_password \
+                $opts(password) $flags]
+}
+
+# Disconnects an existing share
+proc twapi::disconnect_share {sharename args} {
+    array set opts [parseargs args {updateprofile force}]
+
+    set flags [expr {$opts(updateprofile) ? 0x1 : 0}]
+    WNetCancelConnection2 $sharename $flags $opts(force)
+}
+
+
+# Get information about a connected share
+proc twapi::get_client_share_info {sharename args} {
+    if {$sharename eq ""} {
+        error "A share name cannot be the empty string"
+    }
+
+    # We have to use a combination of NetUseGetInfo and 
+    # WNetGetResourceInformation as neither gives us the full information
+    # THe former takes the local device name if there is one and will
+    # only accept a UNC if there is an entry for the UNC with
+    # no local device mapped. The latter
+    # always wants the UNC. So we need to figure out exactly if there
+    # is a local device mapped to the sharename or not
+    # TBD _ see if this is really the case. Also, NetUse only works with
+    # LANMAN, not WebDAV. So see if there is a way to only use WNet*
+    # variants
+    
+    # There may be multiple entries for the same UNC
+    # If there is an entry for the UNC with no device mapped, select
+    # that else select any of the local devices mapped to it
+    # TBD - any better way of finding out a mapping than calling
+    # get_client_shares?
+    # TBD - use wnet_connected_resources
+    foreach {elem_device elem_unc} [recordarray getlist [get_client_shares -level 0] -format flat] {
+        if {[string equal -nocase $sharename $elem_unc]} {
+            if {$elem_device eq ""} {
+                # Found an entry without a local device. Use it
+                set unc $elem_unc
+                unset -nocomplain local; # In case we found a match earlier
+                break
+            } else {
+                # Found a matching device
+                set local $elem_device
+                set unc $elem_unc
+                # Keep looping in case we find an entry with no local device
+                # (which we will prefer)
+            }
+        } else {
+            # See if the sharename is actually a local device name
+            if {[string equal -nocase [string trimright $elem_device :] [string trimright $sharename :]]} {
+                # Device name matches. Use it
+                set local $elem_device
+                set unc $elem_unc
+                break
+            }
+        }
+    }
+
+    if {![info exists unc]} {
+        win32_error 2250 "Share '$sharename' not found."
+    }
+
+    # At this point $unc is the UNC form of the share and
+    # $local is either undefined or the local mapped device if there is one
+
+    array set opts [parseargs args {
+        user
+        localdevice
+        remoteshare
+        status
+        type
+        opencount
+        usecount
+        domain
+        provider
+        comment
+        all
+    } -maxleftover 0 -hyphenated]
+
+
+    # Call Twapi_NetGetInfo always to get status. If we are not connected,
+    # we will not call WNetGetResourceInformation as that will time out
+    if {[info exists local]} {
+        set share [NetUseGetInfo "" $local 2]
+    } else {
+        set share [NetUseGetInfo "" $unc 2]
+    }
+    array set shareinfo [USE_INFO_2 $share]
+    unset shareinfo(-password)
+    if {[info exists shareinfo(-status)]} {
+        set shareinfo(-status) [_map_useinfo_status $shareinfo(-status)]
+    }
+    if {[info exists shareinfo(-type)]} {
+        set shareinfo(-type) [_map_useinfo_type $shareinfo(-type)]
+    }
+
+    if {$opts(-all) || $opts(-comment) || $opts(-provider)} {
+        # Only get this information if we are connected
+        if {$shareinfo(-status) eq "connected"} {
+            set wnetinfo [lindex [Twapi_WNetGetResourceInformation $unc "" 0] 0]
+            set shareinfo(-comment) [lindex $wnetinfo 6]
+            set shareinfo(-provider) [lindex $wnetinfo 7]
+        } else {
+            set shareinfo(-comment) ""
+            set shareinfo(-provider) ""
+        }
+    }
+
+    if {$opts(-all)} {
+        return [array get shareinfo]
+    }
+
+    # Get rid of unwanted fields
+    foreach opt {
+        -user
+        -localdevice
+        -remoteshare
+        -status
+        -type
+        -opencount
+        -usecount
+        -domain
+        -provider
+        -comment
+    } {
+        if {! $opts($opt)} {
+            unset -nocomplain shareinfo($opt)
+        }
+    }
+
+    return [array get shareinfo]
+}
+
+
+# Enumerate sessions
+proc twapi::find_lm_sessions args {
+    array set opts [parseargs args {
+        all
+        {matchclient.arg ""}
+        {system.arg ""}
+        {matchuser.arg ""}
+        transport
+        clientname
+        user
+        clienttype
+        opencount
+        idleseconds
+        activeseconds
+        attrs
+    } -maxleftover 0]
+
+    set level [_calc_minimum_session_info_level opts]
+    
+    # On all platforms, client must be in UNC format
+    set opts(matchclient) [_make_unc_computername $opts(matchclient)]
+
+    trap {
+        set sessions [_net_enum_helper NetSessionEnum -system $opts(system) -preargs [list $opts(matchclient) $opts(matchuser)] -level $level -fields [SESSION_INFO_$level]]
+    } onerror {TWAPI_WIN32 2312} {
+        # No session matching the specified client
+        set sessions {}
+    } onerror {TWAPI_WIN32 2221} {
+        # No session matching the user
+        set sessions {}
+    }
+
+    return [_format_lm_sessions $sessions opts]
+}
+
+
+# Get information about a session 
+proc twapi::get_lm_session_info {client user args} {
+    array set opts [parseargs args {
+        all
+        {system.arg ""}
+        transport
+        clientname
+        user
+        clienttype
+        opencount
+        idleseconds
+        activeseconds
+        attrs
+    } -maxleftover 0]
+
+    set level [_calc_minimum_session_info_level opts]
+    if {$level == -1} {
+        # No data requested so return empty list
+        return [list ]
+    }
+
+    if {![min_os_version 5]} {
+        # System name is specified. If NT, make sure it is UNC form
+        set opts(system) [_make_unc_computername $opts(system)]
+    }
+    
+    # On all platforms, client must be in UNC format
+    set client [_make_unc_computername $client]
+
+    # Note an error is generated if no matching session exists
+    set sess [NetSessionGetInfo $opts(system) $client $user $level]
+
+    return [recordarray index [_format_lm_sessions [list [SESSION_INFO_$level] [list $sess]] opts] 0 -format dict]
+}
+
+# Delete sessions
+proc twapi::end_lm_sessions args {
+    array set opts [parseargs args {
+        {client.arg ""}
+        {system.arg ""}
+        {user.arg ""}
+    } -maxleftover 0]
+
+    if {![min_os_version 5]} {
+        # System name is specified. If NT, make sure it is UNC form
+        set opts(system) [_make_unc_computername $opts(system)]
+    }
+
+    if {$opts(client) eq "" && $opts(user) eq ""} {
+        win32_error 87 "At least one of -client and -user must be specified."
+    }
+
+    # On all platforms, client must be in UNC format
+    set opts(client) [_make_unc_computername $opts(client)]
+
+    trap {
+        NetSessionDel $opts(system) $opts(client) $opts(user)
+    } onerror {TWAPI_WIN32 2312} {
+        # No session matching the specified client - ignore error
+    } onerror {TWAPI_WIN32 2221} {
+        # No session matching the user - ignore error
+    }
+    return
+}
+
+# Enumerate open files
+proc twapi::find_lm_open_files args {
+    array set opts [parseargs args {
+        {basepath.arg ""}
+        {system.arg ""}
+        {matchuser.arg ""}
+        all
+        permissions
+        id
+        lockcount
+        path
+        user
+    } -maxleftover 0]
+
+    set level 3
+    if {! ($opts(all) || $opts(permissions) || $opts(lockcount) ||
+           $opts(path) || $opts(user))} {
+        # Only id's required
+        set level 2
+    }
+
+    # TBD - change to use -resume option to _net_enum_helper as there
+    # might be a lot of files
+    trap {
+        set files [_net_enum_helper NetFileEnum -system $opts(system) -preargs [list [file nativename $opts(basepath)] $opts(matchuser)] -level $level -fields [FILE_INFO_$level]]
+    } onerror {TWAPI_WIN32 2221} {
+        # No files matching the user
+        set files [list [FILE_INFO_$level] {}]
+    }
+
+    return [_format_lm_open_files $files opts]
+}
+
+# Get information about an open LM file
+proc twapi::get_lm_open_file_info {fid args} {
+    array set opts [parseargs args {
+        {system.arg ""}
+        all
+        permissions
+        id
+        lockcount
+        path
+        user
+    } -maxleftover 0]
+
+    # System name is specified. If NT, make sure it is UNC form
+    if {![min_os_version 5]} {
+        set opts(system) [_make_unc_computername $opts(system)]
+    }
+    
+    set level 3
+    if {! ($opts(all) || $opts(permissions) || $opts(lockcount) ||
+           $opts(path) || $opts(user))} {
+        # Only id's required. We actually already have this but don't
+        # return it since we want to go ahead and make the call in case
+        # the id does not exist
+        set level 2
+    }
+
+    return [recordarray index [_format_lm_open_files [list [FILE_INFO_$level] [list [NetFileGetInfo $opts(system) $fid $level]]] opts] 0 -format dict]
+}
+
+# Close an open LM file
+proc twapi::close_lm_open_file {fid args} {
+    array set opts [parseargs args {
+        {system.arg ""}
+    } -maxleftover 0]
+    trap {
+        NetFileClose $opts(system) $fid
+    } onerror {TWAPI_WIN32 2314} {
+        # No such fid. Ignore, perhaps it was closed in the meanwhile
+    }
+}
+
+
+# Enumerate open connections
+proc twapi::find_lm_connections args {
+    array set opts [parseargs args {
+        client.arg
+        {system.arg ""}
+        share.arg
+        all
+        id
+        type
+        opencount
+        usercount
+        activeseconds
+        user
+        clientname
+        sharename
+    } -maxleftover 0]
+
+    if {! ([info exists opts(client)] || [info exists opts(share)])} {
+        win32_error 87 "Must specify either -client or -share option."
+    }
+
+    if {[info exists opts(client)] && [info exists opts(share)]} {
+        win32_error 87 "Must not specify both -client and -share options."
+    }
+
+    if {[info exists opts(client)]} {
+        set qualifier [_make_unc_computername $opts(client)]
+    } else {
+        set qualifier $opts(share)
+    }
+
+    set level 0
+    if {$opts(all) || $opts(type) || $opts(opencount) ||
+        $opts(usercount) || $opts(user) ||
+        $opts(activeseconds) || $opts(clientname) || $opts(sharename)} {
+        set level 1
+    }
+
+    # TBD - change to use -resume option to _net_enum_helper since
+    # there might be a log of connections
+    set conns [_net_enum_helper NetConnectionEnum -system $opts(system) -preargs [list $qualifier] -level $level -fields [CONNECTION_INFO_$level]]
+
+    # NOTE fields MUST BE IN SAME ORDER AS VALUES BELOW
+    if {! $opts(all)} {
+        set fields {}
+        foreach opt {id opencount usercount activeseconds user type} {
+            if {$opts(all) || $opts($opt)} {
+                lappend fields -$opt
+            }
+        }
+        if {$opts(all) || $opts(clientname) || $opts(sharename)} {
+            lappend fields -netname
+        }
+        set conns [recordarray get $conns -slice $fields]
+    }    
+    set fields [recordarray fields $conns]
+    if {"-type" in $fields} {
+        set type_enum [enum $fields -type]
+    }
+    if {"-netname" in $fields} {
+        set netname_enum [enum $fields -netname]
+    }
+
+    if {! ([info exists type_enum] || [info exists netname_enum])} {
+        # No need to massage any data
+        return $conns
+    }
+
+    set recs {}
+    foreach rec [recordarray getlist $conns] {
+        if {[info exists type_enum]} {
+            lset rec $type_enum [_share_type_code_to_symbols [lindex $rec $type_enum]]
+        }
+        if {[info exists netname_enum]} {
+            # What's returned in the netname field depends on what we
+            # passed as the qualifier
+            if {[info exists opts(client)]} {
+                set sharename [lindex $rec $netname_enum]
+                set clientname [_make_unc_computername $opts(client)]
+            } else {
+                set sharename $opts(share)
+                set clientname [_make_unc_computername [lindex $rec $netname_enum]]
+            }
+            if {$opts(all) || $opts(clientname)} {
+                lappend rec $clientname
+            }
+            if {$opts(all) || $opts(sharename)} {
+                lappend rec $sharename
+            }
+        }
+        lappend recs $rec
+    }
+    if {$opts(all) || $opts(clientname)} {
+        lappend fields -clientname
+    }
+    if {$opts(all) || $opts(sharename)} {
+        lappend fields -sharename
+    }
+
+    return [list $fields $recs]
+}
+
+proc twapi::wnet_connected_resources {args} {
+    # Accept both file/disk and print/printer for historical reasons
+    # file and printer are official to match get_client_share_info
+    parseargs args {
+        {type.sym any {any 0 file 1 disk 1 print 2 printer 2}}
+    } -maxleftover 0 -setvars
+    set h [WNetOpenEnum 1 $type 0 ""]
+    trap {
+        set resources {}
+        set structdef [twapi::NETRESOURCE]
+        while {[llength [set rs [WNetEnumResource $h 100 $structdef]]]} {
+            foreach r $rs {
+                lappend resources [lrange $r 4 5]
+            }
+        }
+    } finally {
+        WNetCloseEnum $h
+    }
+    return $resources
+}
+
+################################################################
+# Utility functions
+
+# Common code to figure out what SESSION_INFO level is required
+# for the specified set of requested fields. v_opts is name
+# of array indicating which fields are required
+proc twapi::_calc_minimum_session_info_level {v_opts} {
+    upvar $v_opts opts
+
+    # Set the information level requested based on options specified.
+    # We set the level to the one that requires the lowest possible
+    # privilege level and still includes the data requested.
+    if {$opts(all) || $opts(transport)} {
+        return 502
+    } elseif {$opts(clienttype)} {
+        return 2
+    } elseif {$opts(opencount) || $opts(attrs)} {
+        return 1
+    } elseif {$opts(clientname) || $opts(user) ||
+        $opts(idleseconds) || $opts(activeseconds)} {
+        return 10
+    } else {
+        return 0
+    }
+}
+
+# Common code to format a session record. v_opts is name of array
+# that controls which fields are returned
+# sessions is a record array
+proc twapi::_format_lm_sessions {sessions v_opts} {
+    upvar $v_opts opts
+
+    if {! $opts(all)} {
+        set fields {}
+        foreach opt {
+            transport user opencount idleseconds activeseconds
+            clienttype clientname attrs
+        } {
+            if {$opts(all) || $opts($opt)} {
+                lappend fields -$opt
+            }
+        }
+        set sessions [recordarray get $sessions -slice $fields]
+    }
+
+    set fields [recordarray fields $sessions]
+    if {"-clientname" in $fields} {
+        set client_enum [enum $fields -clientname]
+    }
+    if {"-attrs" in $fields} {
+        set attrs_enum [enum $fields -attrs]
+    }
+
+    if {! ([info exists client_enum] || [info exists attrs_enum])} {
+        return $sessions
+    }
+
+    # Need to map client name and attrs fields
+    set recs {}
+    foreach rec [recordarray getlist $sessions] {
+        if {[info exists client_enum]} {
+            lset rec $client_enum [_make_unc_computername [lindex $rec $client_enum]]
+        }
+        if {[info exists attrs_enum]} {
+            set attrs {}
+            set flags [lindex $rec $attrs_enum]
+            if {$flags & 1} {
+                lappend attrs guest
+            }
+            if {$flags & 2} {
+                lappend attrs noencryption
+            }
+            lset rec $attrs_enum $attrs
+        }
+        lappend recs $rec
+    }
+    return [list $fields $recs]
+}
+
+# Common code to format a lm open file record. v_opts is name of array
+# that controls which fields are returned
+proc twapi::_format_lm_open_files {files v_opts} {
+    upvar $v_opts opts
+
+    if {! $opts(all)} {
+        set fields {}
+        foreach opt {
+            id lockcount path user permissions
+        } {
+            if {$opts(all) || $opts($opt)} {
+                lappend fields -$opt
+            }
+        }
+        set files [recordarray get $files -slice $fields]
+    }
+
+    set fields [recordarray fields $files]
+
+    if {"-permissions" ni $fields} {
+        return $files
+    }
+
+    # Need to massage permissions
+    set enum [enum $fields -permissions]
+
+    set recs {}
+    foreach rec [recordarray getlist $files] {
+        set permissions [list ]
+        set perms [lindex $rec $enum]
+        foreach {flag perm} {1 read 2 write 4 create} {
+            if {$perms & $flag} {
+                lappend permissions $perm
+            }
+        }
+        lset rec $enum $permissions
+        lappend recs $rec
+    }
+
+    return [list $fields $recs]
+}
+
+# NOTE: THIS ONLY MAPS FOR THE Net* functions, NOT THE WNet*
+proc twapi::_share_type_symbols_to_code {typesyms {basetypeonly 0}} {
+
+    # STYPE_DISKTREE          0
+    # STYPE_PRINTQ            1
+    # STYPE_DEVICE            2
+    # STYPE_IPC               3
+    switch -exact -- [lindex $typesyms 0] {
+        file    { set code 0 }
+        printer { set code 1 }
+        device  { set code 2 }
+        ipc     { set code 3 }
+        default {
+            error "Unknown type network share type symbol [lindex $typesyms 0]"
+        }
+    }
+
+    if {$basetypeonly} {
+        return $code
+    }
+
+    # STYPE_TEMPORARY         0x40000000
+    # STYPE_SPECIAL           0x80000000
+    set special 0
+    foreach sym [lrange $typesyms 1 end] {
+        switch -exact -- $sym {
+            special   { setbits special 0x80000000 }
+            temporary { setbits special 0x40000000 }
+            file    -
+            printer -
+            device  -
+            ipc     {
+                error "Base share type symbol '$sym' cannot be used as a share attribute type"
+            }
+            default {
+                error "Unknown type network share type symbol '$sym'"
+            }
+        }
+    }
+
+    return [expr {$code | $special}]
+}
+
+
+# First element is always the base type of the share
+# NOTE: THIS ONLY MAPS FOR THE Net* functions, NOT THE WNet*
+proc twapi::_share_type_code_to_symbols {type} {
+
+    # STYPE_DISKTREE          0
+    # STYPE_PRINTQ            1
+    # STYPE_DEVICE            2
+    # STYPE_IPC               3
+    # STYPE_TEMPORARY         0x40000000
+    # STYPE_SPECIAL           0x80000000
+
+    set special [expr {$type & 0xC0000000}]
+
+    # We need the special cast to int because else operands get promoted
+    # to 64 bits as the hex is treated as an unsigned value
+    switch -exact -- [expr {int($type & ~ $special)}] {
+        0  {set sym "file"}
+        1  {set sym "printer"}
+        2  {set sym "device"}
+        3  {set sym "ipc"} 
+        default {set sym $type}
+    }
+
+    set typesyms [list $sym]
+
+    if {$special & 0x80000000} {
+        lappend typesyms special
+    }
+
+    if {$special & 0x40000000} {
+        lappend typesyms temporary
+    }
+    
+    return $typesyms
+}
+
+# Make sure a computer name is in unc format unless it is an empty
+# string (local computer)
+proc twapi::_make_unc_computername {name} {
+    if {$name eq ""} {
+        return ""
+    } else {
+        return "\\\\[string trimleft $name \\]"
+    }
+}
+
+proc twapi::_map_useinfo_status {status} {
+    set sym [lindex {connected paused lostsession disconnected networkerror connecting reconnecting} $status]
+    if {$sym ne ""} {
+        return $sym
+    } else {
+        return $status
+    }
+}
+
+proc twapi::_map_useinfo_type {type} {
+    # Note share type and use info types are different
+    return [_share_type_code_to_symbols [expr {$type & 0x3fffffff}]]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/shell.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/shell.tcl
new file mode 100644
index 00000000..b471e2e7
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/shell.tcl
@@ -0,0 +1,627 @@
+#
+# Copyright (c) 2004-2011 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {}
+
+
+# Get the specified shell folder
+proc twapi::get_shell_folder {csidl args} {
+    variable csidl_lookup
+
+    array set opts [parseargs args {create} -maxleftover 0]
+
+    # Following are left out because they refer to virtual folders
+    # and will return error if used here
+    #    CSIDL_BITBUCKET - 0xa
+    if {![info exists csidl_lookup]} {
+        array set csidl_lookup {
+            CSIDL_ADMINTOOLS 0x30
+            CSIDL_COMMON_ADMINTOOLS 0x2f
+            CSIDL_APPDATA 0x1a
+            CSIDL_COMMON_APPDATA 0x23
+            CSIDL_COMMON_DESKTOPDIRECTORY 0x19
+            CSIDL_COMMON_DOCUMENTS 0x2e
+            CSIDL_COMMON_FAVORITES 0x1f
+            CSIDL_COMMON_MUSIC 0x35
+            CSIDL_COMMON_PICTURES 0x36
+            CSIDL_COMMON_PROGRAMS 0x17
+            CSIDL_COMMON_STARTMENU 0x16
+            CSIDL_COMMON_STARTUP 0x18
+            CSIDL_COMMON_TEMPLATES 0x2d
+            CSIDL_COMMON_VIDEO 0x37
+            CSIDL_COOKIES 0x21
+            CSIDL_DESKTOPDIRECTORY 0x10
+            CSIDL_FAVORITES 0x6
+            CSIDL_HISTORY 0x22
+            CSIDL_INTERNET_CACHE 0x20
+            CSIDL_LOCAL_APPDATA 0x1c
+            CSIDL_MYMUSIC 0xd
+            CSIDL_MYPICTURES 0x27
+            CSIDL_MYVIDEO 0xe
+            CSIDL_NETHOOD 0x13
+            CSIDL_PERSONAL 0x5
+            CSIDL_PRINTHOOD 0x1b
+            CSIDL_PROFILE 0x28
+            CSIDL_PROFILES 0x3e
+            CSIDL_PROGRAMS 0x2
+            CSIDL_PROGRAM_FILES 0x26
+            CSIDL_PROGRAM_FILES_COMMON 0x2b
+            CSIDL_RECENT 0x8
+            CSIDL_SENDTO 0x9
+            CSIDL_STARTMENU 0xb
+            CSIDL_STARTUP 0x7
+            CSIDL_SYSTEM 0x25
+            CSIDL_TEMPLATES 0x15
+            CSIDL_WINDOWS 0x24
+            CSIDL_CDBURN_AREA 0x3b
+        }
+    }
+
+    if {![string is integer $csidl]} {
+        set csidl_key [string toupper $csidl]
+        if {![info exists csidl_lookup($csidl_key)]} {
+            # Try by adding a CSIDL prefix
+            set csidl_key "CSIDL_$csidl_key"
+            if {![info exists csidl_lookup($csidl_key)]} {
+                error "Invalid CSIDL value '$csidl'"
+            }
+        }
+        set csidl $csidl_lookup($csidl_key)
+    }
+
+    trap {
+        set path [SHGetSpecialFolderPath 0 $csidl $opts(create)]
+    } onerror {} {
+        # Try some other way to get the information
+        switch -exact -- [format %x $csidl] {
+            1a { catch {set path $::env(APPDATA)} }
+            2b { catch {set path $::env(CommonProgramFiles)} }
+            26 { catch {set path $::env(ProgramFiles)} }
+            24 { catch {set path $::env(windir)} }
+            25 { catch {set path [file join $::env(systemroot) system32]} }
+        }
+        if {![info exists path]} {
+            return ""
+        }
+    }
+
+    return $path
+}
+
+# Displays a shell property dialog for the given object
+proc twapi::shell_object_properties_dialog {path args} {
+    array set opts [parseargs args {
+        {type.arg file {file printer volume}}
+        {hwin.int 0}
+        {page.arg ""}
+    } -maxleftover 0]
+
+
+    if {$opts(type) eq "file"} {
+        set path [file nativename [file normalize $path]]
+    }
+
+    SHObjectProperties $opts(hwin) \
+        [string map {printer 1 file 2 volume 4} $opts(type)] \
+        $path \
+        $opts(page)
+}
+
+# Writes a shell shortcut
+proc twapi::write_shortcut {link args} {
+    
+    array set opts [parseargs args {
+        path.arg
+        idl.arg
+        args.arg
+        desc.arg
+        hotkey.arg
+        iconpath.arg
+        iconindex.int
+        {showcmd.arg normal}
+        workdir.arg
+        relativepath.arg
+        runas.bool
+    } -nulldefault -maxleftover 0]
+
+    # Map hot key to integer if needed
+    if {![string is integer -strict $opts(hotkey)]} {
+        if {$opts(hotkey) eq ""} {
+            set opts(hotkey) 0
+        } else {
+            # Try treating it as symbolic
+            lassign [_hotkeysyms_to_vk $opts(hotkey)]  modifiers vk
+            set opts(hotkey) $vk
+            if {$modifiers & 1} {
+                set opts(hotkey) [expr {$opts(hotkey) | (4<<8)}]
+            }
+            if {$modifiers & 2} {
+                set opts(hotkey) [expr {$opts(hotkey) | (2<<8)}]
+            }
+            if {$modifiers & 4} {
+                set opts(hotkey) [expr {$opts(hotkey) | (1<<8)}]
+            }
+            if {$modifiers & 8} {
+                set opts(hotkey) [expr {$opts(hotkey) | (8<<8)}]
+            }
+        }
+    }
+
+    # IF a known symbol translate it. Note caller can pass integer
+    # values as well which will be kept as they are. Bogus valuse and
+    # symbols will generate an error on the actual call so we don't
+    # check here.
+    switch -exact -- $opts(showcmd) {
+        minimized { set opts(showcmd) 7 }
+        maximized { set opts(showcmd) 3 }
+        normal    { set opts(showcmd) 1 }
+    }
+
+    Twapi_WriteShortcut $link $opts(path) $opts(idl) $opts(args) \
+        $opts(desc) $opts(hotkey) $opts(iconpath) $opts(iconindex) \
+        $opts(relativepath) $opts(showcmd) $opts(workdir) $opts(runas)
+}
+
+
+# Read a shortcut
+proc twapi::read_shortcut {link args} {
+    array set opts [parseargs args {
+        timeout.int
+        {hwin.int 0}
+
+        {_comment {Path format flags}}
+        {shortnames {} 1}
+        {uncpath    {} 2}
+        {rawpath    {} 4}
+
+        {_comment {Resolve flags}}
+        {install {} 128}
+        {nolinkinfo {} 64}
+        {notrack {} 32}
+        {nosearch {} 16}
+        {anymatch {} 2}
+        {noui {} 1}
+    } -maxleftover 0]
+
+    set pathfmt [expr {$opts(shortnames) | $opts(uncpath) | $opts(rawpath)}]
+
+    # 4 -> SLR_UPDATE
+    set resolve_flags [expr {4 | $opts(install) | $opts(nolinkinfo) |
+                             $opts(notrack) | $opts(nosearch) |
+                             $opts(anymatch) | $opts(noui)}]
+
+    array set shortcut [twapi::Twapi_ReadShortcut $link $pathfmt $opts(hwin) $resolve_flags]
+
+    switch -exact -- $shortcut(-showcmd) {
+        1 { set shortcut(-showcmd) normal }
+        3 { set shortcut(-showcmd) maximized }
+        7 { set shortcut(-showcmd) minimized }
+    }
+
+    return [array get shortcut]
+}
+
+
+
+# Writes a url shortcut
+proc twapi::write_url_shortcut {link url args} {
+    
+    array set opts [parseargs args {
+        {missingprotocol.arg 0}
+    } -nulldefault -maxleftover 0]
+
+    switch -exact -- $opts(missingprotocol) {
+        guess {
+            set opts(missingprotocol) 1; # IURL_SETURL_FL_GUESS_PROTOCOL
+        }
+        usedefault {
+            # 3 -> IURL_SETURL_FL_GUESS_PROTOCOL | IURL_SETURL_FL_USE_DEFAULT_PROTOCOL
+            # The former must also be specified (based on experimentation)
+            set opts(missingprotocol) 3
+        }
+        default {
+            if {![string is integer -strict $opts(missingprotocol)]} {
+                error "Invalid value '$opts(missingprotocol)' for -missingprotocol option."
+            }
+        }
+    }
+
+    Twapi_WriteUrlShortcut $link $url $opts(missingprotocol)
+}
+
+# Read a url shortcut
+proc twapi::read_url_shortcut {link} {
+    return [Twapi_ReadUrlShortcut $link]
+}
+
+# Invoke a url shortcut
+proc twapi::invoke_url_shortcut {link args} {
+    
+    array set opts [parseargs args {
+        verb.arg
+        {hwin.int 0}
+        allowui
+    } -maxleftover 0]
+
+    set flags 0
+    if {$opts(allowui)} {setbits flags 1}
+    if {! [info exists opts(verb)]} {
+        setbits flags 2
+        set opts(verb) ""
+    }
+
+    Twapi_InvokeUrlShortcut $link $opts(verb) $flags $opts(hwin)
+}
+
+# Send a file to the recycle bin
+proc twapi::recycle_file {fn args} {
+    return [recycle_files [list $fn] {*}$args]
+}
+
+# Send multiple files to the recycle bin - from Alexandru
+# This is much faster than "recycle_file"!
+proc twapi::recycle_files {fns args} {
+    array set opts [parseargs args {
+        confirm.bool
+        showerror.bool
+    } -maxleftover 0 -nulldefault]
+
+    if {$opts(confirm)} {
+        set flags 0x40;         # FOF_ALLOWUNDO
+    } else {
+        set flags 0x50;         # FOF_ALLOWUNDO | FOF_NOCONFIRMATION
+    }
+
+    if {! $opts(showerror)} {
+        set flags [expr {$flags | 0x0400}]; # FOF_NOERRORUI
+    }
+
+    set fns [lmap fn $fns {
+        file nativename [file normalize $fn]
+    }]
+
+    return [expr {[lindex [Twapi_SHFileOperation 0 3 $fns __null__ $flags ""] 0] ? false : true}]
+}
+
+proc twapi::shell_execute args {
+    # TBD - Document following shell_execute options after testing.
+    # [opt_def [cmd -connect] [arg BOOLEAN]]
+    # [opt_def [cmd -hicon] [arg HANDLE]]
+    # [opt_def [cmd -hkeyclass] [arg BOOLEAN]]
+    # [opt_def [cmd -hotkey] [arg HOTKEY]]
+    # [opt_def [cmd -nozonechecks] [arg BOOLEAN]]
+
+    array set opts [parseargs args {
+        class.arg
+        dir.arg
+        {hicon.arg NULL}
+        {hkeyclass.arg NULL}
+        {hmonitor.arg NULL}
+        hotkey.arg
+        hwin.int
+        idl.arg
+        params.arg
+        path.arg
+        {show.arg 1}
+        verb.arg
+
+        {getprocesshandle.bool 0 0x00000040}
+        {connect.bool 0 0x00000080}
+        {wait.bool 0x00000100 0x00000100}
+        {substenv.bool 0 0x00000200}
+        {noui.bool 0 0x00000400}
+        {unicode.bool 0 0x00004000}
+        {noconsole.bool 0 0x00008000}
+        {asyncok.bool 0 0x00100000}
+        {nozonechecks.bool 0 0x00800000}
+        {waitforinputidle.bool 0 0x02000000}
+        {logusage.bool 0 0x04000000}
+        {invokeidlist.bool 0 0x0000000C}
+    } -maxleftover 0 -nulldefault]
+
+    set fmask 0
+
+    foreach {opt mask} {
+        class     1
+        idl       4
+    } {
+        if {$opts($opt) ne ""} {
+            setbits fmask $mask
+        }
+    }
+
+    if {$opts(hkeyclass) ne "NULL"} {
+        setbits fmask 3
+    }
+
+    set fmask [expr {$fmask |
+                     $opts(getprocesshandle) | $opts(connect) | $opts(wait) |
+                     $opts(substenv) | $opts(noui) | $opts(unicode) |
+                     $opts(noconsole) | $opts(asyncok) | $opts(nozonechecks) |
+                     $opts(waitforinputidle) | $opts(logusage) |
+                     $opts(invokeidlist)}]
+
+    if {$opts(hicon) ne "NULL" && $opts(hmonitor) ne "NULL"} {
+        error "Cannot specify -hicon and -hmonitor options together."
+    }
+
+    set hiconormonitor NULL
+    if {$opts(hicon) ne "NULL"} {
+        set hiconormonitor $opts(hicon)
+        set flags [expr {$flags | 0x00000010}]
+    } elseif {$opts(hmonitor) ne "NULL"} {
+        set hiconormonitor $opts(hmonitor)
+        set flags [expr {$flags | 0x00200000}]
+    }
+
+    if {![string is integer -strict $opts(show)]} {
+        set opts(show) [dict get {
+            hide             0
+            shownormal       1
+            normal           1
+            showminimized    2
+            showmaximized    3
+            maximize         3
+            shownoactivate   4
+            show             5
+            minimize         6
+            showminnoactive  7
+            showna           8
+            restore          9
+            showdefault      10
+            forceminimize    11
+        } $opts(show)]
+    }
+
+    if {$opts(hotkey) eq ""} {
+        set hotkey 0
+    } else {
+        lassign [_hotkeysyms_to_vk $opts(hotkey) {
+            shift 1
+            ctrl 2
+            control 2
+            alt 4
+            menu 4
+            ext 8
+        }] modifiers vk
+        set hotkey [expr {($modifiers << 16) | $vk}]
+    }
+    if {$hotkey != 0} {
+        setbits fmask 0x00000020
+    }
+    return [Twapi_ShellExecuteEx \
+                $fmask \
+                $opts(hwin) \
+                $opts(verb) \
+                $opts(path) \
+                $opts(params) \
+                $opts(dir) \
+                $opts(show) \
+                $opts(idl) \
+                $opts(class) \
+                $opts(hkeyclass) \
+                $hotkey \
+                $hiconormonitor]
+}
+
+
+namespace eval twapi::systemtray {
+
+    namespace path [namespace parent]
+
+    # Dictionary mapping id->handler, hicon
+    variable _icondata
+    set _icondata [dict create]
+
+    variable _icon_id_ctr
+
+    variable _message_map
+    array set _message_map {
+        123 contextmenu
+        512 mousemove
+        513 lbuttondown
+        514 lbuttonup
+        515 lbuttondblclk
+        516 rbuttondown
+        517 rbuttonup
+        518 rbuttondblclk
+        519 mbuttondown
+        520 mbuttonup
+        521 mbuttondblclk
+        522 mousewheel
+        523 xbuttondown
+        524 xbuttonup
+        525 xbuttondblclk
+        1024 select
+        1025 keyselect
+        1026 balloonshow
+        1027 balloonhide
+        1028 balloontimeout
+        1029 balloonuserclick
+    }
+
+    proc _make_NOTIFYICONW {id args} {
+        # TBD - implement -hiddenicon and -sharedicon using
+        # dwState and dwStateMask
+        set state     0
+        set statemask 0
+        array set opts [parseargs args {
+            hicon.arg
+            tip.arg
+            balloon.arg
+            timeout.int
+            version.int
+            balloontitle.arg
+            {balloonicon.arg none {info warning error user none}}
+            {silent.bool 0}
+        } -maxleftover 0]
+
+        set timeout_or_version 0
+        if {[info exists opts(version)]} {
+            if {[info exists opts(timeout)]} {
+                error "Cannot simultaneously specify -timeout and -version."
+            }
+            set timeout_or_version $opts(version)
+        } else {
+            if {[info exists opts(timeout)]} {
+                set timeout_or_version $opts(timeout)
+            }
+        }
+
+        set flags 0x1;          # uCallbackMessage member is valid
+        if {[info exists opts(hicon)]} {
+            incr flags 0x2;     # hIcon member is valid
+        } else {
+            set opts(hicon) NULL
+        }
+
+        if {[info exists opts(tip)]} {
+            incr flags 0x4
+            # Truncate if necessary to 127 chars
+            set opts(tip) [string range $opts(tip) 0 127]
+        } else {
+            set opts(tip) ""
+        }
+
+        if {[info exists opts(balloon)] || [info exists opts(balloontitle)]} {
+            incr flags 0x10
+        }
+
+        if {[info exists opts(balloon)]} {
+            set opts(balloon) [string range $opts(balloon) 0 255]
+        } else {
+            set opts(balloon) ""
+        }
+
+        if {[info exists opts(balloontitle)]} {
+            set opts(balloontitle) [string range $opts(balloontitle) 0 63]
+        } else {
+            set opts(balloontitle) ""
+        }
+
+        # Calculate padding for text fields (in bytes so 2*num padchars)
+        set tip_padcount [expr {2*(128 - [string length $opts(tip)])}]
+        set balloon_padcount [expr {2*(256 - [string length $opts(balloon)])}]
+        set balloontitle_padcount [expr {2 * (64 - [string length $opts(balloontitle)])}]
+        if {$opts(balloonicon) eq "user"} {
+            if {![min_os_version 5 1 2]} {
+                # 'user' not supported before XP SP2
+                set opts(balloonicon) none
+            }
+        }
+
+        set balloonflags [dict get {
+            none 0
+            info 1
+            warning 2
+            error 3
+            user 4
+        } $opts(balloonicon)]
+        
+        if {$balloonflags == 4} {
+            if {![info exists opts(hicon)]} {
+                error "Option -hicon must be specified if value of -balloonicon option is 'user'"
+            }
+        }
+
+        if {$opts(silent)} {
+            incr balloonflags 0x10
+        }
+
+        if {$::tcl_platform(pointerSize) == 8} {
+            set addrfmt m
+            set alignment x4
+        } else {
+            set addrfmt n
+            set alignment x0
+        }
+
+        set hwnd  [pointer_to_address [Twapi_GetNotificationWindow]]
+        set opts(hicon) [pointer_to_address $opts(hicon)]
+
+        set bin [binary format "${alignment}${addrfmt}nnn" $hwnd $id $flags [_get_script_wm NOTIFY_ICON_CALLBACK]]
+        append bin \
+            [binary format ${alignment}${addrfmt} $opts(hicon)] \
+            [encoding convertto unicode $opts(tip)] \
+            [binary format "x${tip_padcount}nn" $state $statemask] \
+            [encoding convertto unicode $opts(balloon)] \
+            [binary format "x${balloon_padcount}n" $timeout_or_version] \
+            [encoding convertto unicode $opts(balloontitle)] \
+            [binary format "x${balloontitle_padcount}nx16" $balloonflags]
+        return "[binary format n [expr {4+[string length $bin]}]]$bin"
+    }
+
+    proc addicon {hicon {cmdprefix ""}} {
+        variable _icon_id_ctr
+        variable _icondata
+
+        _register_script_wm_handler [_get_script_wm NOTIFY_ICON_CALLBACK] [list [namespace current]::_icon_handler] 1
+        _register_script_wm_handler [_get_script_wm TASKBAR_RESTART] [list [namespace current]::_taskbar_restart_handler] 1
+
+        set id [incr _icon_id_ctr]
+
+        # 0 -> Add
+        Shell_NotifyIcon 0 [_make_NOTIFYICONW $id -hicon $hicon]
+
+        # 4 -> set version (controls notification behaviour) to 3 (Win2K+)
+        if {[catch {
+            Shell_NotifyIcon 4 [_make_NOTIFYICONW $id -version 3]
+        } ermsg]} {
+            set ercode $::errorCode
+            set erinfo $::errorInfo
+            removeicon $id
+            error $ermsg $erinfo $ercode
+        }
+
+        if {[llength $cmdprefix]} {
+            dict set _icondata $id handler $cmdprefix
+        }
+        dict set _icondata $id hicon   $hicon
+
+        return $id
+    }
+
+    proc removeicon {id} {
+        variable _icondata
+
+        # Ignore errors in case dup call
+        catch {Shell_NotifyIcon 2 [_make_NOTIFYICONW $id]}
+        dict unset _icondata $id
+    }
+
+    proc modifyicon {id args} {
+        # TBD - do we need to [dict set _icondata hicon ...] ?
+        Shell_NotifyIcon 1 [_make_NOTIFYICONW $id {*}$args]
+    }
+
+    proc _icon_handler {msg id notification msgpos ticks} {
+        variable _icondata
+        variable _message_map
+
+        if {![dict  exists $_icondata $id handler]} {
+            return;             # Stale or no handler specified
+        }
+
+        # Translate the notification into text
+        if {[info exists _message_map($notification)]} {
+            set notification $_message_map($notification)
+        }
+        
+        uplevel #0 [linsert [dict get $_icondata $id handler] end $id $notification $msgpos $ticks]
+    }
+
+    proc _taskbar_restart_handler {args} {
+        variable _icondata
+        # Need to add icons back into taskbar
+        dict for {id icodata} $_icondata {
+            # 0 -> Add
+            Shell_NotifyIcon 0 [_make_NOTIFYICONW $id -hicon [dict get $icodata hicon]]
+        }
+    }
+
+    namespace export addicon modifyicon removeicon
+    namespace ensemble create
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/sspi.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/sspi.tcl
new file mode 100644
index 00000000..aa4ec70e
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/sspi.tcl
@@ -0,0 +1,801 @@
+#
+# Copyright (c) 2007-2013, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+namespace eval twapi {
+
+
+    # Holds SSPI security contexts indexed by a handle
+    # Each element is a dict with the following keys:
+    #   State - state of the security context - see sspi_step
+    #   Handle - the Win32 SecHandle for the context
+    #   Input - Pending input from remote end to be passed in to
+    #    SSPI provider (only valid for streams)
+    #   Output - list of SecBuffers that contain data to be sent
+    #    to remote end during a SSPI negotiation
+    #   Inattr - requested context attributes
+    #   Outattr - context attributes returned from service provider
+    #    (currently not used)
+    #   Expiration - time when context will expire
+    #   Ctxtype - client, server
+    #   Target -
+    #   Datarep - data representation format
+    #   Credentials - handle for credentials to pass to sspi provider
+    variable _sspi_state
+    array set _sspi_state {}
+
+    proc* _init_security_context_syms {} {
+        variable _server_security_context_syms
+        variable _client_security_context_syms
+        variable _secpkg_capability_syms
+
+
+        # Symbols used for mapping server security context flags
+        array set _server_security_context_syms {
+            confidentiality      0x10
+            connection           0x800
+            delegate             0x1
+            extendederror        0x8000
+            identify             0x80000
+            integrity            0x20000
+            mutualauth           0x2
+            replaydetect         0x4
+            sequencedetect       0x8
+            stream               0x10000
+        }
+
+        # Symbols used for mapping client security context flags
+        array set _client_security_context_syms {
+            confidentiality      0x10
+            connection           0x800
+            delegate             0x1
+            extendederror        0x4000
+            identify             0x20000
+            integrity            0x10000
+            manualvalidation     0x80000
+            mutualauth           0x2
+            replaydetect         0x4
+            sequencedetect       0x8
+            stream               0x8000
+            usesessionkey        0x20
+            usesuppliedcreds     0x80
+        }
+
+        # Symbols used for mapping security package capabilities
+        array set _secpkg_capability_syms {
+            integrity                   0x00000001
+            privacy                     0x00000002
+            tokenonly                  0x00000004
+            datagram                    0x00000008
+            connection                  0x00000010
+            multirequired              0x00000020
+            clientonly                 0x00000040
+            extendederror              0x00000080
+            impersonation               0x00000100
+            acceptwin32name           0x00000200
+            stream                      0x00000400
+            negotiable                  0x00000800
+            gsscompatible              0x00001000
+            logon                       0x00002000
+            asciibuffers               0x00004000
+            fragment                    0x00008000
+            mutualauth                 0x00010000
+            delegation                  0x00020000
+            readonlywithchecksum      0x00040000
+            restrictedtokens           0x00080000
+            negoextender               0x00100000
+            negotiable2                 0x00200000
+            appcontainerpassthrough  0x00400000
+            appcontainerchecks  0x00800000
+        }
+    } {}
+}
+
+# Return list of security packages
+proc twapi::sspi_enumerate_packages {args} {
+    set pkgs [EnumerateSecurityPackages]
+    if {[llength $args] == 0} {
+        set names [list ]
+        foreach pkg $pkgs {
+            lappend names [kl_get $pkg Name]
+        }
+        return $names
+    }
+
+    # TBD - why is this hyphenated ?
+    array set opts [parseargs args {
+        all capabilities version rpcid maxtokensize name comment
+    } -maxleftover 0 -hyphenated]
+
+    _init_security_context_syms
+    variable _secpkg_capability_syms
+    set retdata {}
+    foreach pkg $pkgs {
+        set rec {}
+        if {$opts(-all) || $opts(-capabilities)} {
+            lappend rec -capabilities [_make_symbolic_bitmask [kl_get $pkg fCapabilities] _secpkg_capability_syms]
+        }
+        foreach {opt field} {-version wVersion -rpcid wRPCID -maxtokensize cbMaxToken -name Name -comment Comment} {
+            if {$opts(-all) || $opts($opt)} {
+                lappend rec $opt [kl_get $pkg $field]
+            }
+        }
+        dict set recdata [kl_get $pkg Name] $rec
+    }
+    return $recdata
+}
+
+proc twapi::sspi_schannel_credentials args {
+    # TBD - do all these options work ? Check before documenting
+    # since they seem to be duplicated in InitializeSecurityContext
+    parseargs args {
+        certificates.arg
+        {rootstore.arg NULL}
+        sessionlifespan.int
+        usedefaultclientcert.bool
+        {disablereconnects.bool 0 0x80}
+        {revocationcheck.arg none {full endonly excluderoot none}}
+        {ignoreerrorrevocationoffline.bool 0 0x1000}
+        {ignoreerrornorevocationcheck.bool 0 0x800}
+        {validateservercert.bool 1}
+        cipherstrength.arg
+        protocols.arg
+    } -setvars -nulldefault -maxleftover 0
+
+    set flags [expr {$disablereconnects | $ignoreerrornorevocationcheck | $ignoreerrorrevocationoffline}]
+    incr flags [dict get {
+        none 0 full 0x200 excluderoot 0x400 endonly 0x100
+    } $revocationcheck]
+        
+    if {$validateservercert} {
+        incr flags 0x20;        # SCH_CRED_AUTO_CRED_VALIDATION
+    } else {
+        incr flags 0x8;         # SCH_CRED_MANUAL_CRED_VALIDATION
+    }
+    if {$usedefaultclientcert} {
+        incr flags 0x40;         # SCH_CRED_USE_DEFAULT_CREDS
+    } else {
+        incr flags 0x10;         # SCH_CRED_NO_DEFAULT_CREDS 
+    }
+
+    set protbits 0
+    foreach prot $protocols {
+        set protbits [expr {
+                            $protbits | [dict! {
+                                ssl2 0xc ssl3 0x30 tls1 0xc0 tls1.1 0x300 tls1.2 0xc00
+                            } $prot]
+                        }]
+    }
+
+    switch [llength $cipherstrength] {
+        0 { set minbits 0 ; set maxbits 0 }
+        1 { set minbits [lindex $cipherstrength 0] ; set maxbits $minbits }
+        2 {
+            set minbits [lindex $cipherstrength 0]
+            set maxbits [lindex $cipherstrength 1]
+        }
+        default {
+            error "Invalid value '$cipherstrength' for option -cipherstrength"
+        }
+    }
+
+    # 4 -> SCHANNEL_CRED_VERSION
+    return [list 4 $certificates $rootstore {} {} $protbits $minbits $maxbits $sessionlifespan $flags 0]
+}
+
+proc twapi::sspi_winnt_identity_credentials {user domain password} {
+    return [list $user $domain $password]
+}
+
+proc twapi::sspi_acquire_credentials {args} {
+    parseargs args {
+        {credentials.arg {}}
+        principal.arg
+        {package.arg NTLM}
+        {role.arg both {client server inbound outbound both}}
+        getexpiration
+    } -maxleftover 0 -setvars -nulldefault
+
+    set creds [AcquireCredentialsHandle $principal \
+                   [dict* {
+                       unisp {Microsoft Unified Security Protocol Provider}
+                       ssl {Microsoft Unified Security Protocol Provider}
+                       tls {Microsoft Unified Security Protocol Provider}
+                   } $package] \
+                   [kl_get {inbound 1 server 1 outbound 2 client 2 both 3} $role] \
+                   "" $credentials]
+
+    if {$getexpiration} {
+        return [kl_create2 {-handle -expiration} $creds]
+    } else {
+        return [lindex $creds 0]
+    }
+}
+
+# Frees credentials
+proc twapi::sspi_free_credentials {cred} {
+    FreeCredentialsHandle $cred
+}
+
+# Return a client context
+proc twapi::sspi_client_context {cred args} {
+    _init_security_context_syms
+    variable _client_security_context_syms
+
+    parseargs args {
+        target.arg
+        {datarep.arg network {native network}}
+        confidentiality.bool
+        connection.bool
+        delegate.bool
+        extendederror.bool
+        identify.bool
+        integrity.bool
+        manualvalidation.bool
+        mutualauth.bool
+        replaydetect.bool
+        sequencedetect.bool
+        stream.bool
+        usesessionkey.bool
+        usesuppliedcreds.bool
+    } -maxleftover 0 -nulldefault -setvars
+
+    set context_flags 0
+    foreach {opt flag} [array get _client_security_context_syms] {
+        if {[set $opt]} {
+            set context_flags [expr {$context_flags | $flag}]
+        }
+    }
+
+    set drep [kl_get {native 0x10 network 0} $datarep]
+    return [_construct_sspi_security_context \
+                sspiclient#[TwapiId] \
+                [InitializeSecurityContext \
+                     $cred \
+                     "" \
+                     $target \
+                     $context_flags \
+                     0 \
+                     $drep \
+                     [list ] \
+                     0] \
+                client \
+                $context_flags \
+                $target \
+                $cred \
+                $drep \
+               ]
+}
+
+# Delete a security context
+proc twapi::sspi_delete_context {ctx} {
+    variable _sspi_state
+    set h [_sspi_context_handle $ctx]
+    if {[llength $h]} {
+        DeleteSecurityContext $h
+    }
+    unset _sspi_state($ctx)
+}
+
+# Shuts down a security context in orderly fashion
+# Caller should start sspi_step
+proc twapi::sspi_shutdown_context {ctx} {
+    variable _sspi_state
+
+    _sspi_context_handle $ctx;  # Verify handle
+    dict with _sspi_state($ctx) {
+        switch -nocase -- [lindex [QueryContextAttributes $Handle 10] 4] {
+            schannel - 
+            "Microsoft Unified Security Protocol Provider" {}
+            default { return }
+        }
+
+        # Signal to security provider we want to shutdown
+        Twapi_ApplyControlToken_SCHANNEL_SHUTDOWN $Handle
+
+        if {$Ctxtype eq "client"} {
+            set rawctx [InitializeSecurityContext \
+                            $Credentials \
+                            $Handle \
+                            $Target \
+                            $Inattr \
+                            0 \
+                            $Datarep \
+                            [list ] \
+                            0]
+        } else {
+            set rawctx [AcceptSecurityContext \
+                            $Credentials \
+                            $Handle \
+                            [list ] \
+                            $Inattr \
+                            $Datarep]
+        }
+        lassign $rawctx State Handle out Outattr Expiration extra
+        if {$State in {ok expired}} {
+            return [list done [_gather_secbuf_data $out]]
+        } else {
+            return [list continue [_gather_secbuf_data $out]]
+        }
+    }
+}
+
+# Take the next step in an SSPI negotiation
+# Returns
+#   {done data extradata}
+#   {continue data}
+#   {expired data}
+proc twapi::sspi_step {ctx {received ""}} {
+    variable _sspi_state
+    variable _client_security_context_syms
+
+    _sspi_validate_handle $ctx
+
+    dict with _sspi_state($ctx) {
+        # Note the dictionary content variables are
+        #   State, Handle, Output, Outattr, Expiration,
+        #   Ctxtype, Inattr, Target, Datarep, Credentials
+
+        # Append new input to existing input
+        append Input $received
+        switch -exact -- $State {
+            ok {
+                set data [_gather_secbuf_data $Output]
+                set Output {}
+
+                # $Input at this point contains left over input that is
+                # actually application data (streaming case).
+                # Application should pass this to decrypt commands
+                return [list done $data $Input[set Input ""]]
+            }
+            continue {
+                # Continue with the negotiation
+                if {[string length $Input] != 0} {
+                    # Pass in received data to SSPI.
+                    # Most providers take only the first buffer
+                    # but SChannel/UNISP need the second. Since
+                    # others don't seem to mind the second buffer
+                    # we always always include it
+                    # 2 -> SECBUFFER_TOKEN, 0 -> SECBUFFER_EMPTY
+                    set inbuflist [list [list 2 $Input] [list 0]]
+                    if {$Ctxtype eq "client"} {
+                        set rawctx [InitializeSecurityContext \
+                                        $Credentials \
+                                        $Handle \
+                                        $Target \
+                                        $Inattr \
+                                        0 \
+                                        $Datarep \
+                                        $inbuflist \
+                                        0]
+                    } else {
+                        set rawctx [AcceptSecurityContext \
+                                        $Credentials \
+                                        $Handle \
+                                        $inbuflist \
+                                        $Inattr \
+                                        $Datarep]
+                    }
+                    lassign $rawctx State Handle out Outattr Expiration extra
+                    lappend Output {*}$out
+                    # When the error is incomplete_credentials, we will retry
+                    # with the SEC_I_INCOMPLETE_CREDENTIALS flag set. For
+                    # this the Input should remain the same. Otherwise set it
+                    # to whatever remains to be processed in the buffer.
+                    if {$State ne "incomplete_credentials"} {
+                        set Input $extra
+                    }
+                    # Will recurse at proc end
+                } else {
+                    # There was no received data. Return any data
+                    # to be sent to remote end
+                    set data [_gather_secbuf_data $Output]
+                    set Output {}
+                    return [list continue $data ""]
+                }
+            }
+            incomplete_message {
+                # Caller has to get more data from remote end
+                set State continue
+                return [list continue "" ""]
+            }
+            expired {
+                # Remote end closed in middle of negotiation
+                return [list disconnected "" ""]
+            }
+            incomplete_credentials {
+                # In this state, the remote has asked for an client certificate.
+                # In this case, we ask Schannel to limit itself to whatever
+                # the user supplied and retry. Servers that ask for a cert
+                # but do not mandate it will then proceed. However, we only
+                # do this if we have not already tried this route. If we have,
+                # then generate an error. The real solution would be to attempt
+                # to look up new credentials by retrieving a certificate
+                # from the certificate store (possibly by asking the user) but
+                # this is not implemented.
+                # TBD - get client cert from user. See
+                # https://github.com/david-maw/StreamSSL and
+                # https://www.codeproject.com/Articles/1094525/Configuring-SSL-and-Client-Certificate-Validation
+                if {$Inattr & $_client_security_context_syms(usesuppliedcreds)} {
+                    # Already tried with this. Give up.
+                    set ermsg "Handling of incomplete credentials not implemented. If using TLS, specify the -credentials option to tls_socket to provide credentials."
+                    error $ermsg "" [list TWAPI SSPI UNSUPPORTED $ermsg]
+                }
+                set Inattr [expr {$Inattr | $_client_security_context_syms(usesuppliedcreds)}]
+                set State continue
+                # Fall to bottom to recurse one more time
+            }
+            complete -
+            complete_and_continue {
+                # Should not actually occur as sspi.c no longer returns
+                # these codes
+                error "State $State handling not implemented."
+            }
+        }
+    }
+
+    # Recurse to return next state.
+    # This has to be OUTSIDE the [dict with] above else it will not
+    # see the updated values
+    return [sspi_step $ctx]
+}
+
+# Return a server context
+proc twapi::sspi_server_context {cred clientdata args} {
+    _init_security_context_syms
+    variable _server_security_context_syms
+
+    parseargs args {
+        {datarep.arg network {native network}}
+        confidentiality.bool
+        connection.bool
+        delegate.bool
+        extendederror.bool
+        identify.bool
+        integrity.bool
+        mutualauth.bool
+        replaydetect.bool
+        sequencedetect.bool
+        stream.bool
+    } -maxleftover 0 -nulldefault -setvars
+
+    set context_flags 0
+    foreach {opt flag} [array get _server_security_context_syms] {
+        if {[set $opt]} {
+            set context_flags [expr {$context_flags | $flag}]
+        }
+    }
+
+    set drep [kl_get {native 0x10 network 0} $datarep]
+    return [_construct_sspi_security_context \
+                sspiserver#[TwapiId] \
+                [AcceptSecurityContext \
+                     $cred \
+                     "" \
+                     [list [list 2 $clientdata]] \
+                     $context_flags \
+                     $drep] \
+                server \
+                $context_flags \
+                "" \
+                $cred \
+                $drep \
+               ]
+}
+
+
+# Get the security context flags after completion of request
+proc ::twapi::sspi_context_features {ctx} {
+    variable _sspi_state
+
+    set ctxh [_sspi_context_handle $ctx]
+
+    _init_security_context_syms
+
+    # We could directly look in the context itself but intead we make
+    # an explicit call, just in case they change after initial setup
+    set flags [QueryContextAttributes $ctxh 14]
+
+        # Mapping of symbols depends on whether it is a client or server
+        # context
+    if {[dict get $_sspi_state($ctx) Ctxtype] eq "client"} {
+        upvar 0 [namespace current]::_client_security_context_syms syms
+    } else {
+        upvar 0 [namespace current]::_server_security_context_syms syms
+    }
+
+    set result [list -raw $flags]
+    foreach {sym flag} [array get syms] {
+        lappend result -$sym [expr {($flag & $flags) != 0}]
+    }
+
+    return $result
+}
+
+# Get the user name for a security context
+proc twapi::sspi_context_username {ctx} {
+    return [QueryContextAttributes [_sspi_context_handle $ctx] 1]
+}
+
+# Get the field size information for a security context
+# TBD - update for SSL
+proc twapi::sspi_context_sizes {ctx} {
+    set sizes [QueryContextAttributes [_sspi_context_handle $ctx] 0]
+    return [twine {-maxtoken -maxsig -blocksize -trailersize} $sizes]
+}
+
+proc twapi::sspi_remote_cert {ctx} {
+    return [QueryContextAttributes [_sspi_context_handle $ctx] 0x53]
+}
+
+proc twapi::sspi_local_cert {ctx} {
+    return [QueryContextAttributes [_sspi_context_handle $ctx] 0x54]
+}
+
+proc twapi::sspi_issuers_accepted_by_peer {ctx} {
+    return [QueryContextAttributes [_sspi_context_handle $ctx] 0x59]
+}
+
+# Returns a signature
+proc twapi::sspi_sign {ctx data args} {
+    parseargs args {
+        {seqnum.int 0}
+        {qop.int 0}
+    } -maxleftover 0 -setvars
+
+    return [MakeSignature \
+                [_sspi_context_handle $ctx] \
+                $qop \
+                $data \
+                $seqnum]
+}
+
+# Verify signature
+proc twapi::sspi_verify_signature {ctx sig data args} {
+    parseargs args {
+        {seqnum.int 0}
+    } -maxleftover 0 -setvars
+
+    # Buffer type 2 - Token, 1- Data
+    return [VerifySignature \
+                [_sspi_context_handle $ctx] \
+                [list [list 2 $sig] [list 1 $data]] \
+                $seqnum]
+}
+
+# Encrypts a data as per a context
+# Returns {securitytrailer encrypteddata padding}
+proc twapi::sspi_encrypt {ctx data args} {
+    parseargs args {
+        {seqnum.int 0}
+        {qop.int 0}
+    } -maxleftover 0 -setvars
+
+    return [EncryptMessage \
+                [_sspi_context_handle $ctx] \
+                $qop \
+                $data \
+                $seqnum]
+}
+
+proc twapi::sspi_encrypt_stream {ctx data args} {
+    variable _sspi_state
+    
+    set h [_sspi_context_handle $ctx]
+
+    # TBD - docment options
+    parseargs args {
+        {qop.int 0}
+    } -maxleftover 0 -setvars
+
+    set enc ""
+    while {[string length $data]} {
+        lassign [EncryptStream $h $qop $data] fragment data
+        lappend enc $fragment
+    }
+
+    return [join $enc ""]
+}
+
+# chan must be in binary mode
+proc twapi::sspi_encrypt_and_write {ctx data chan args} {
+    variable _sspi_state
+    
+    set h [_sspi_context_handle $ctx]
+
+    parseargs args {
+        {qop.int 0}
+        {flush.bool 1}
+    } -maxleftover 0 -setvars
+
+    while {[string length $data]} {
+        lassign [EncryptStream $h $qop $data] fragment data
+        puts -nonewline $chan $fragment
+    }
+
+    if {$flush} {
+        chan flush $chan
+    }
+}
+
+
+# Decrypts a message
+# TBD - why does this not return a status like sspi_decrypt_stream ?
+proc twapi::sspi_decrypt {ctx sig data padding args} {
+    variable _sspi_state
+    _sspi_validate_handle $ctx
+
+    parseargs args {
+        {seqnum.int 0}
+    } -maxleftover 0 -setvars
+
+    # Buffer type 2 - Token, 1- Data, 9 - padding
+    set decrypted [DecryptMessage \
+                       [dict get $_sspi_state($ctx) Handle] \
+                       [list [list 2 $sig] [list 1 $data] [list 9 $padding]] \
+                       $seqnum]
+    set plaintext {}
+    # Pick out only the data buffers, ignoring pad buffers and signature
+    # Optimize copies by keeping as a list so in the common case of a 
+    # single buffer can return it as is. Multiple buffers are expensive
+    # because Tcl will shimmer each byte array into a list and then
+    # incur additional copies during joining
+    foreach buf $decrypted {
+        # SECBUFFER_DATA -> 1
+        if {[lindex $buf 0] == 1} {
+            lappend plaintext [lindex $buf 1]
+        }
+    }
+
+    if {[llength $plaintext] < 2} {
+        return [lindex $plaintext 0]
+    } else {
+        return [join $plaintext ""]
+    }
+}
+
+# Decrypts a stream
+proc twapi::sspi_decrypt_stream {ctx data} {
+    variable _sspi_state
+    set hctx [_sspi_context_handle $ctx]
+
+    # SSL decryption is done in max size chunks.
+    # We will loop collecting as much data as possible. Collecting
+    # as a list and joining at end minimizes internal byte copies
+    set plaintext {}
+    lassign [DecryptStream $hctx [dict get $_sspi_state($ctx) Input] $data] status decrypted extra
+    lappend plaintext $decrypted
+    
+    # TBD - handle renegotiate status
+    while {$status eq "ok" && [string length $extra]} {
+        # See if additional data and loop again
+        lassign [DecryptStream $hctx $extra] status decrypted extra
+        lappend plaintext $decrypted
+    }
+
+    dict set _sspi_state($ctx) Input $extra
+    if {$status eq "incomplete_message"} {
+        set status ok
+    }
+    return [list $status [join $plaintext ""]]
+}
+
+
+################################################################
+# Utility procs
+
+
+# Construct a high level SSPI security context structure
+# rawctx is context as returned from C level code
+proc twapi::_construct_sspi_security_context {id rawctx ctxtype inattr target credentials datarep} {
+    variable _sspi_state
+    
+    set _sspi_state($id) [dict merge [dict create Ctxtype $ctxtype \
+                                          Inattr $inattr \
+                                          Target $target \
+                                          Datarep $datarep \
+                                          Credentials $credentials] \
+                              [twine \
+                                   {State Handle Output Outattr Expiration Input} \
+                                   $rawctx]]
+
+    return $id
+}
+
+proc twapi::_sspi_validate_handle {ctx} {
+    variable _sspi_state
+
+    if {![info exists _sspi_state($ctx)]} {
+        badargs! "Invalid SSPI security context handle $ctx" 3
+    }
+}
+
+proc twapi::_sspi_context_handle {ctx} {
+    variable _sspi_state
+
+    if {![info exists _sspi_state($ctx)]} {
+        badargs! "Invalid SSPI security context handle $ctx" 3
+    }
+
+    return [dict get $_sspi_state($ctx) Handle]
+}
+
+proc twapi::_gather_secbuf_data {bufs} {
+    if {[llength $bufs] == 1} {
+        return [lindex [lindex $bufs 0] 1]
+    } else {
+        set data {}
+        foreach buf $bufs {
+            # First element is buffer type, which we do not care
+            # Second element is actual data
+            lappend data [lindex $buf 1]
+        }
+        return [join $data {}]
+    }
+}
+
+if {0} {
+    TBD - delete
+    set cred [sspi_acquire_credentials -package ssl -role client]
+    set client [sspi_client_context $cred -stream 1 -manualvalidation 1]
+    set out [sspi_step $client]
+    set so [socket 192.168.1.127 443]
+    fconfigure $so -blocking 0 -buffering none -translation binary
+    puts -nonewline $so [lindex $out 1]
+    
+    set data [read $so]
+    set out [sspi_step $client $data]
+    puts -nonewline $so [lindex $out 1]
+
+    set data [read $so]
+    set out [sspi_step $client $data]
+    
+    set out [sspi_encrypt_stream $client "GET / HTTP/1.0\r\n\r\n"]
+    puts -nonewline $so $out
+    set data [read $so]
+    set d [sspi_decrypt_stream $client $data]
+    sspi_shutdown_context $client
+    close $so ; sspi_free_credentials $cred ; sspi_free_context $client
+    sspi_context_free $client
+    sspi_shutdown_context $client
+
+    # INTERNAL client-server
+    proc 'sslsetup {} {
+        uplevel #0 {
+            twapi
+            source ../tests/testutil.tcl
+            set ca [make_test_certs]
+            set cacert [cert_store_find_certificate $ca subject_substring twapitestca]
+            set scert [cert_store_find_certificate $ca subject_substring twapitestserver]
+            set scred [sspi_acquire_credentials -package ssl -role server -credentials [sspi_schannel_credentials -certificates [list $scert]]]
+            set ccert [cert_store_find_certificate $ca subject_substring twapitestclient]
+            set ccred [sspi_acquire_credentials -package ssl -role client -credentials [sspi_schannel_credentials]]
+            set cctx [sspi_client_context $ccred -stream 1 -manualvalidation 1]
+            set cstep [sspi_step $cctx]
+
+            set sctx [sspi_server_context $scred [lindex $cstep 1] -stream 1]
+            set sstep [sspi_step $sctx]
+            set cstep [sspi_step $cctx [lindex $sstep 1]]
+            set sstep [sspi_step $sctx [lindex $cstep 1]]
+            set cstep [sspi_step $cctx [lindex $sstep 1]]
+        }
+    }
+    set out [sspi_encrypt_stream $cctx "This is a test"]
+
+    sspi_decrypt_stream $sctx $out
+    sspi_decrypt_stream $sctx ""
+    set out [sspi_encrypt_stream $sctx "This is a testx"]
+    sspi_decrypt_stream $cctx $out
+
+    proc 'ccred {} {
+        set store [cert_system_store_open twapitest user]
+        set ccert [cert_store_find_certificate $store subject_substring twapitestclient]
+        set ccred [sspi_acquire_credentials -package ssl -role client -credentials [sspi_schannel_credentials -certificates [list $ccert]]]
+        cert_store_release $store
+        cert_release $ccert
+        return $ccred
+    }
+
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/storage.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/storage.tcl
new file mode 100644
index 00000000..72bd2d73
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/storage.tcl
@@ -0,0 +1,616 @@
+#
+# Copyright (c) 2003, 2008 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# TBD - convert file spec to drive root path
+
+# Get info associated with a drive
+proc twapi::get_volume_info {drive args} {
+
+    set drive [_drive_rootpath $drive]
+
+    array set opts [parseargs args {
+        all size freespace used useravail type serialnum label maxcomponentlen fstype attr device extents
+    } -maxleftover 0]
+
+    if {$opts(all)} {
+        # -all option does not cover -type, -extents and -device
+        foreach opt {
+            all size freespace used useravail serialnum label maxcomponentlen fstype attr
+        } {
+            set opts($opt) 1
+        }
+    }
+
+    set result [list ]
+    if {$opts(size) || $opts(freespace) || $opts(used) || $opts(useravail)} {
+        lassign  [GetDiskFreeSpaceEx $drive] useravail size freespace
+        foreach opt {size freespace useravail}  {
+            if {$opts($opt)} {
+                lappend result -$opt [set $opt]
+            }
+        }
+        if {$opts(used)} {
+            lappend result -used [expr {$size - $freespace}]
+        }
+    }
+
+    if {$opts(type)} {
+        set drive_type [get_drive_type $drive]
+        lappend result -type $drive_type
+    }
+    if {$opts(device)} {
+        if {[_is_unc $drive]} {
+            # UNC paths cannot be used with QueryDosDevice
+            lappend result -device ""
+        } else {
+            lappend result -device [QueryDosDevice [string range $drive 0 1]]
+        }
+    }
+
+    if {$opts(extents)} {
+        set extents {}
+        if {! [_is_unc $drive]} {
+            trap {
+                set device_handle [create_file "\\\\.\\[string range $drive 0 1]" -createdisposition open_existing]
+                set bin [device_ioctl $device_handle 0x560000 -outputcount 32]
+                if {[binary scan $bin i nextents] != 1} {
+                    error "Truncated information returned from ioctl 0x560000"
+                }
+                set off 8
+                for {set i 0} {$i < $nextents} {incr i} {
+                    if {[binary scan $bin "@$off i x4 w w" extent(-disknumber) extent(-startingoffset) extent(-extentlength)] != 3} {
+                        error "Truncated information returned from ioctl 0x560000"
+                    }
+                    lappend extents [array get extent]
+                    incr off 24; # Size of one extent element
+                }
+            } onerror {} {
+                # Do nothing, device does not support extents or access denied
+                # Empty list is returned
+            } finally {
+                if {[info exists device_handle]} {
+                    CloseHandle $device_handle
+                }
+            }
+        }
+
+        lappend result -extents $extents
+    }
+
+    if {$opts(serialnum) || $opts(label) || $opts(maxcomponentlen)
+        || $opts(fstype) || $opts(attr)} {
+        foreach {label serialnum maxcomponentlen attr fstype} \
+            [GetVolumeInformation $drive] { break }
+        foreach opt {label maxcomponentlen fstype}  {
+            if {$opts($opt)} {
+                lappend result -$opt [set $opt]
+            }
+        }
+        if {$opts(serialnum)} {
+            set low [expr {$serialnum & 0x0000ffff}]
+            set high [expr {($serialnum >> 16) & 0x0000ffff}]
+            lappend result -serialnum [format "%.4X-%.4X" $high $low]
+        }
+        if {$opts(attr)} {
+            set attrs [list ]
+            foreach {sym val} {
+                case_preserved_names 2
+                unicode_on_disk 4
+                persistent_acls 8
+                file_compression 16
+                volume_quotas 32
+                supports_sparse_files 64
+                supports_reparse_points 128
+                supports_remote_storage 256
+                volume_is_compressed 0x8000
+                supports_object_ids 0x10000
+                supports_encryption 0x20000
+                named_streams 0x40000
+                read_only_volume 0x80000
+                sequential_write_once          0x00100000  
+                supports_transactions          0x00200000  
+                supports_hard_links            0x00400000  
+                supports_extended_attributes   0x00800000  
+                supports_open_by_file_id       0x01000000  
+                supports_usn_journal           0x02000000  
+            } {
+                if {$attr & $val} {
+                    lappend attrs $sym
+                }
+            }
+            lappend result -attr $attrs
+        }
+    }
+
+    return $result
+}
+interp alias {} twapi::get_drive_info {} twapi::get_volume_info
+
+
+# Check if disk has at least n bytes available for the user (NOT total free)
+proc twapi::user_drive_space_available {drv space} {
+    return [expr {$space <= [lindex [get_drive_info $drv -useravail] 1]}]
+}
+
+# Get the drive type
+proc twapi::get_drive_type {drive} {
+    # set type [GetDriveType "[string trimright $drive :/\\]:\\"]
+    set type [GetDriveType [_drive_rootpath $drive]]
+    switch -exact -- $type {
+        0 { return unknown}
+        1 { return invalid}
+        2 { return removable}
+        3 { return fixed}
+        4 { return remote}
+        5 { return cdrom}
+        6 { return ramdisk}
+    }
+}
+
+# Get list of drives
+proc twapi::find_logical_drives {args} {
+    array set opts [parseargs args {type.arg}]
+
+    set drives [list ]
+    foreach drive [_drivemask_to_drivelist [GetLogicalDrives]] {
+        if {(![info exists opts(type)]) ||
+            [lsearch -exact $opts(type) [get_drive_type $drive]] >= 0} {
+            lappend drives $drive
+        }
+    }
+    return $drives
+}
+
+twapi::proc* twapi::drive_ready {drive} {
+    uplevel #0 package require twapi_device
+} {
+    set drive [string trimright $drive "/\\"]
+    if {[string length $drive] != 2 || [string index $drive 1] ne ":"} {
+        error "Invalid drive specification"
+    }
+    set drive "\\\\.\\$drive"
+
+    # Do our best to avoid the Windows "Drive not ready" dialog
+    # 1 -> SEM_FAILCRITICALERRORS
+    if {[min_os_version 6]} {
+        set old_mode [SetErrorMode 1]
+    }
+    trap {
+
+        # We will first try using IOCTL_STORAGE_CHECK_VERIFY2 as that is
+        # much faster and only needs FILE_READ_ATTRIBUTES access.
+        set error [catch {
+            set h [create_file $drive -access file_read_attributes \
+                   -createdisposition open_existing -share {read write}]
+            device_ioctl $h 0x2d0800; # IOCTL_STORAGE_CHECK_VERIFY2
+        }]
+        if {[info exists h]} {
+            close_handle $h
+        }
+        if {! $error} {
+            return 1;               # Device is ready
+        }
+
+        # On error, try the older slower method. Note we now need
+        # GENERIC_READ access. (NOTE: FILE_READ_DATA will not work with some
+        # volume types)
+        unset -nocomplain h
+        set error [catch {
+            set h [create_file $drive -access generic_read \
+                       -createdisposition open_existing -share {read write}]
+            device_ioctl $h 0x2d4800; # IOCTL_STORAGE_CHECK_VERIFY
+        }]
+        if {[info exists h]} {
+            close_handle $h
+        }
+        if {! $error} {
+            return 1;           # Device is ready
+        }
+
+        # Remote shares sometimes return access denied with the above
+        # even when actually available. Try with good old file exists
+        # on root directory
+        return [file exists "[string range $drive end-1 end]\\"]
+    } finally {
+        if {[min_os_version 6]} {
+            SetErrorMode $old_mode
+        }
+    }
+}
+
+
+# Set the drive label
+proc twapi::set_drive_label {drive label} {
+    SetVolumeLabel [_drive_rootpath $drive] $label
+}
+
+# Maps a drive letter to the given path
+proc twapi::map_drive_local {drive path args} {
+    array set opts [parseargs args {raw}]
+
+    set drive [string range [_drive_rootpath $drive] 0 1]
+    DefineDosDevice $opts(raw) $drive [file nativename $path]
+}
+
+
+# Unmaps a drive letter
+proc twapi::unmap_drive_local {drive args} {
+    array set opts [parseargs args {
+        path.arg
+        raw
+    } -nulldefault]
+
+    set drive [string range [_drive_rootpath $drive] 0 1]
+
+    set flags $opts(raw)
+    setbits flags 0x2;                  # DDD_REMOVE_DEFINITION
+    if {$opts(path) ne ""} {
+        setbits flags 0x4;              # DDD_EXACT_MATCH_ON_REMOVE
+    }
+    DefineDosDevice $flags $drive [file nativename $opts(path)]
+}
+
+
+# Callback from C code
+proc twapi::_filesystem_monitor_handler {id changes} {
+    variable _filesystem_monitor_scripts
+    if {[info exists _filesystem_monitor_scripts($id)]} {
+        return [uplevel #0 [linsert $_filesystem_monitor_scripts($id) end $id $changes]]
+    } else {
+        # Callback queued after close. Ignore
+    }
+}
+
+# Monitor file changes
+proc twapi::begin_filesystem_monitor {path script args} {
+    variable _filesystem_monitor_scripts
+
+    array set opts [parseargs args {
+        {subtree.bool  0}
+        {filename.bool 0 0x1}
+        {dirname.bool  0 0x2}
+        {attr.bool     0 0x4}
+        {size.bool     0 0x8}
+        {write.bool    0 0x10}
+        {access.bool   0 0x20}
+        {create.bool   0 0x40}
+        {secd.bool     0 0x100}
+        {pattern.arg ""}
+        {patterns.arg ""}
+    } -maxleftover 0]
+
+    if {[string length $opts(pattern)] &&
+        [llength $opts(patterns)]} {
+        error "Options -pattern and -patterns are mutually exclusive. Note option -pattern is deprecated."
+    }
+
+    if {[string length $opts(pattern)]} {
+        # Old style single pattern. Convert to new -patterns
+        set opts(patterns) [list "+$opts(pattern)"]
+    }
+
+    # Change to use \ style path separator as that is what the file monitoring functions return
+    if {[llength $opts(patterns)]} {
+        foreach pat $opts(patterns) {
+            # Note / is replaced by \\ within the pattern
+            # since \ needs to be escaped with another \ within
+            # string match patterns
+            lappend pats [string map [list / \\\\] $pat]
+        }
+        set opts(patterns) $pats
+    }
+
+    set flags [expr { $opts(filename) | $opts(dirname) | $opts(attr) |
+                      $opts(size) | $opts(write) | $opts(access) |
+                      $opts(create) | $opts(secd)}]
+
+    if {! $flags} {
+        # If no options specified, default to all
+        set flags 0x17f
+    }
+
+    set id [Twapi_RegisterDirectoryMonitor $path $opts(subtree) $flags $opts(patterns)]
+    set _filesystem_monitor_scripts($id) $script
+    return $id
+}
+
+# Stop monitoring of files
+proc twapi::cancel_filesystem_monitor {id} {
+    variable _filesystem_monitor_scripts
+    if {[info exists _filesystem_monitor_scripts($id)]} {
+        Twapi_UnregisterDirectoryMonitor $id
+        unset _filesystem_monitor_scripts($id)
+    }
+}
+
+
+# Get list of volumes
+proc twapi::find_volumes {} {
+    set vols [list ]
+    set found 1
+    # Assumes there has to be at least one volume
+    lassign [FindFirstVolume] handle vol
+    while {$found} {
+        lappend vols $vol
+        lassign [FindNextVolume $handle] found vol
+    }
+    FindVolumeClose $handle
+    return $vols
+}
+
+# Get list of volume mount points
+proc twapi::find_volume_mount_points {vol} {
+    set mntpts [list ]
+    set found 1
+    trap {
+        lassign  [FindFirstVolumeMountPoint $vol] handle mntpt
+    } onerror {TWAPI_WIN32 18} {
+        # ERROR_NO_MORE_FILES
+        # No volume mount points
+        return [list ]
+    } onerror {TWAPI_WIN32 3} {
+        # Volume does not support them
+        return [list ]
+    }
+
+    # At least one volume found
+    while {$found} {
+        lappend mntpts $mntpt
+        lassign  [FindNextVolumeMountPoint $handle] found mntpt
+    }
+    FindVolumeMountPointClose $handle
+    return $mntpts
+}
+
+# Set volume mount point
+proc twapi::mount_volume {volpt volname} {
+    # Note we don't use _drive_rootpath for trimming since may not be root path
+    SetVolumeMountPoint "[string trimright $volpt /\\]\\" "[string trimright $volname /\\]\\"
+}
+
+# Delete volume mount point
+proc twapi::unmount_volume {volpt} {
+    # Note we don't use _drive_rootpath for trimming since may not be root path
+    DeleteVolumeMountPoint "[string trimright $volpt /\\]\\"
+}
+
+# Get the volume mounted at a volume mount point
+proc twapi::get_mounted_volume_name {volpt} {
+    # Note we don't use _drive_rootpath for trimming since may not be root path
+    return [GetVolumeNameForVolumeMountPoint "[string trimright $volpt /\\]\\"]
+}
+
+# Get the mount point corresponding to a given path
+proc twapi::get_volume_mount_point_for_path {path} {
+    return [GetVolumePathName [file nativename $path]]
+}
+
+
+# Return the times associated with a file
+proc twapi::get_file_times {fd args} {
+    array set opts [parseargs args {
+        all
+        mtime
+        ctime
+        atime
+    } -maxleftover 0]
+
+    # Figure out if fd is a file path, Tcl channel or a handle
+    set close_handle false
+    if {[file exists $fd]} {
+        # It's a file name
+        # 0x02000000 -> FILE_FLAG_BACKUP_SEMANTICS, always required in case 
+        # opening a directory (even if SeBackupPrivilege is not held
+        set h [create_file $fd -createdisposition open_existing -flags 0x02000000]
+        set close_handle true
+    } elseif {[catch {fconfigure $fd}]} {
+        # Not a Tcl channel, See if handle
+        if {[pointer? $fd]} {
+            set h $fd
+        } else {
+            error "$fd is not an existing file, handle or Tcl channel."
+        }
+    } else {
+        # Tcl channel
+        set h [get_tcl_channel_handle $fd read]
+    }
+
+    set result [list ]
+
+    foreach opt {ctime atime mtime} time [GetFileTime $h] {
+        if {$opts(all) || $opts($opt)} {
+            lappend result -$opt $time
+        }
+    }
+
+    if {$close_handle} {
+        CloseHandle $h
+    }
+
+    return $result
+}
+
+
+# Set the times associated with a file
+proc twapi::set_file_times {fd args} {
+
+    array set opts [parseargs args {
+        mtime.arg
+        ctime.arg
+        atime.arg
+        preserveatime
+    } -maxleftover 0 -nulldefault]
+
+    if {$opts(atime) ne "" && $opts(preserveatime)} {
+        win32_error 87 "Cannot specify -atime and -preserveatime at the same time."
+    }
+    if {$opts(preserveatime)} {
+        set opts(atime) -1;             # Meaning preserve access to original
+    }
+
+    # Figure out if fd is a file path, Tcl channel or a handle
+    set close_handle false
+    if {[file exists $fd]} {
+        if {$opts(preserveatime)} {
+            win32_error 87 "Cannot specify -preserveatime unless file is specified as a Tcl channel or a Win32 handle."
+        }
+
+        # It's a file name
+        # 0x02000000 -> FILE_FLAG_BACKUP_SEMANTICS, always required in case 
+        # opening a directory (even if SeBackupPrivilege is not held
+        set h [create_file $fd -access {generic_write} -createdisposition open_existing -flags 0x02000000]
+        set close_handle true
+    } elseif {[catch {fconfigure $fd}]} {
+        # Not a Tcl channel, assume a handle
+        set h $fd
+    } else {
+        # Tcl channel
+        set h [get_tcl_channel_handle $fd read]
+    }
+
+    SetFileTime $h $opts(ctime) $opts(atime) $opts(mtime)
+
+    if {$close_handle} {
+        CloseHandle $h
+    }
+
+    return
+}
+
+# Convert a device based path to a normalized Win32 path with drive letters
+proc twapi::normalize_device_rooted_path {path args} {
+    # TBD - keep a cache ?
+    # For example, we need to map \Device\HarddiskVolume1 to C:
+    # Can only do that by enumerating logical drives
+    set npath [file nativename $path]
+    if {![string match -nocase {\\Device\\*} $npath]} {
+        error "$path is not a valid device based path."
+    }
+    array set device_map {}
+    foreach drive [find_logical_drives] {
+        set device_path [lindex [lindex [get_volume_info $drive -device] 1] 0]
+        if {$device_path ne ""} {
+            set len [string length $device_path]
+            if {[string equal -nocase -length $len $path $device_path]} {
+                # Prefix matches, must be terminated by end or path separator
+                set ch [string index $npath $len]
+                if {$ch eq "" || $ch eq "\\"} {
+                    set path ${drive}[string range $npath $len end]
+                    if {[llength $args]} {
+                        upvar [lindex $args 0] retvar
+                        set retvar $path
+                        return 1
+                    } else {
+                        return $path
+                    }
+                }
+            }
+        }
+    }
+
+    if {[llength $args]} {
+        return 0
+    } else {
+        error "Could not map device based path '$path'"
+    }
+}
+
+proc twapi::flush_channel {chan} {
+    flush $chan
+    FlushFileBuffers [get_tcl_channel_handle $chan write]
+}
+
+proc twapi::find_file_open {path args} {
+    variable _find_tokens
+    variable _find_counter
+    parseargs args {
+        {detail.arg basic {basic full}}
+    } -setvars -maxleftover 0
+
+    set detail_level [expr {$detail eq "basic" ? 1 : 0}]
+    if {[min_os_version 6 1]} {
+        set flags 2;            # FIND_FIRST_EX_LARGE_FETCH - Win 7
+    } else {
+        set flags 0
+    }
+    # 0 -> search op. Could be specified as 1 to limit search to
+    # directories but that is only advisory and does not seem to work
+    # in many cases. So don't bother making it an option.
+    lassign [FindFirstFileEx $path $detail_level 0 "" $flags] handle entry
+    set token ff#[incr _find_counter]
+    set _find_tokens($token) [list Handle $handle Entry $entry]
+    return $token
+}
+
+proc twapi::find_file_close {token} {
+    variable _find_tokens
+    if {[info exists _find_tokens($token)]} {
+        FindClose [dict get $_find_tokens($token) Handle]
+        unset _find_tokens($token)
+    }
+    return
+}
+
+proc twapi::decode_file_attributes {attrs} {
+    return [_make_symbolic_bitmask $attrs {
+        archive               0x20
+        compressed            0x800
+        device                0x40
+        directory             0x10
+        encrypted             0x4000
+        hidden                0x2
+        integrity_stream      0x8000
+        normal                0x80
+        not_content_indexed   0x2000
+        no_scrub_data         0x20000
+        offline               0x1000
+        readonly              0x1
+        recall_on_data_access 0x400000
+        recall_on_open        0x40000
+        reparse_point         0x400
+        sparse_file           0x200
+        system                0x4
+        temporary             0x100
+        virtual               0x10000
+    }]
+}
+
+proc twapi::find_file_next {token varname} {
+    variable _find_tokens
+    if {![info exists _find_tokens($token)]} {
+        return false
+    }
+    if {[dict exists $_find_tokens($token) Entry]} {
+        set entry [dict get $_find_tokens($token) Entry]
+        dict unset _find_tokens($token) Entry
+    } else {
+        set entry [FindNextFile [dict get $_find_tokens($token) Handle]]
+    }
+    if {[llength $entry]} {
+        upvar 1 $varname result
+        set result [twine {attrs ctime atime mtime size reserve0 reserve1 name altname} $entry]
+        return true
+    } else {
+        return false
+    }
+}
+
+# Utility functions
+
+proc twapi::_drive_rootpath {drive} {
+    if {[_is_unc $drive]} {
+        # UNC
+        return "[string trimright $drive ]\\"
+    } else {
+        return "[string trimright $drive :/\\]:\\"
+    }
+}
+
+proc twapi::_is_unc {path} {
+    return [expr {[string match {\\\\*} $path] || [string match //* $path]}]
+}
+
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/synch.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/synch.tcl
new file mode 100644
index 00000000..eabf5a71
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/synch.tcl
@@ -0,0 +1,94 @@
+#
+# Copyright (c) 2004, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+#
+# TBD - tcl wrappers for semaphores
+
+namespace eval twapi {
+}
+
+#
+# Create and return a handle to a mutex
+proc twapi::create_mutex {args} {
+    array set opts [parseargs args {
+        name.arg
+        secd.arg
+        inherit.bool
+        lock.bool
+    } -nulldefault -maxleftover 0]
+
+    if {$opts(name) ne "" && $opts(lock)} {
+        # TBD - remove this mutex limitation
+        # This is not a Win32 limitation but ours. Would need to change the C
+        # implementation and our return format
+        error "Option -lock must not be specified as true if mutex is named"
+    }
+
+    return [CreateMutex [_make_secattr $opts(secd) $opts(inherit)] $opts(lock) $opts(name)]
+}
+
+# Get handle to an existing mutex
+proc twapi::open_mutex {name args} {
+    array set opts [parseargs args {
+        {inherit.bool 0}
+        {access.arg {mutex_all_access}}
+    } -maxleftover 0]
+    
+    return [OpenMutex [_access_rights_to_mask $opts(access)] $opts(inherit) $name]
+}
+
+# Lock the mutex
+proc twapi::lock_mutex {h args} {
+    array set opts [parseargs args {
+        {wait.int -1}
+    }]
+
+    return [wait_on_handle $h -wait $opts(wait)]
+}
+
+
+# Unlock the mutex
+proc twapi::unlock_mutex {h} {
+    ReleaseMutex $h
+}
+
+#
+# Create and return a handle to a event
+proc twapi::create_event {args} {
+    array set opts [parseargs args {
+        name.arg
+        secd.arg
+        inherit.bool
+        signalled.bool
+        manualreset.bool
+        existvar.arg
+    } -nulldefault -maxleftover 0]
+
+    if {$opts(name) ne "" && $opts(signalled)} {
+        # Not clear whether event will be signalled state if it already
+        # existed but was not signalled
+        error "Option -signalled must not be specified as true if event is named."
+    }
+
+    lassign [CreateEvent [_make_secattr $opts(secd) $opts(inherit)] $opts(manualreset) $opts(signalled) $opts(name)]  h preexisted
+    if {$opts(manualreset)} {
+        # We want to catch attempts to wait on manual reset handles
+        set h [cast_handle $h HANDLE_MANUALRESETEVENT]
+    }
+    if {$opts(existvar) ne ""} {
+        upvar 1 $opts(existvar) existvar
+        set existvar $preexisted
+    }
+
+    return $h
+}
+
+interp alias {} twapi::set_event {} twapi::SetEvent
+interp alias {} twapi::reset_event {} twapi::ResetEvent
+
+# Hack to work with the various build configuration.
+if {[info commands ::twapi::get_version] ne ""} {
+    package provide twapi_synch [::twapi::get_version -patchlevel]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/tls.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/tls.tcl
new file mode 100644
index 00000000..977ac751
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/tls.tcl
@@ -0,0 +1,1296 @@
+#
+# Copyright (c) 2012-2020, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+namespace eval twapi::tls {
+    # Each element of _channels is dictionary with the following keys
+    #  Socket - the underlying socket. This key will not exist if
+    #   socket has been closed.
+    #  State - SERVERINIT, CLIENTINIT, LISTENERINIT, OPEN, NEGOTIATING, CLOSED
+    #  Type - SERVER, CLIENT, LISTENER
+    #  Blocking - 0/1 indicating whether blocking or non-blocking channel
+    #  WatchMask - list of {read write} indicating what events to post
+    #  Target - Name for server cert
+    #  Credentials - credentials handle to use for local end of connection
+    #  FreeCredentials - if credentials should be freed on connection cleanup
+    #  AcceptCallback - application callback on a listener and server socket.
+    #    On listener, it is the accept command prefix. On a server 
+    #    (accepted socket) it is the prefix plus arguments passed to
+    #    accept callback. On client and on servers sockets initialized
+    #    with starttls, this key must NOT be present
+    #  SspiContext - SSPI context for the connection
+    #  Input  - plaintext data to pass to app
+    #  Output - plaintext data to encrypt and output
+    #  ReadEventPosted - if this key exists, a chan postevent for read
+    #    is already in progress and a second one should not be posted
+    #  WriteEventPosted - if this key exists, a chan postevent for write
+    #    is already in progress and a second one should not be posted
+    #  WriteDisabled - 0 normally. Set to 1 on a half-close
+
+    variable _channels
+    array set _channels {}
+
+    # Socket command - Tcl socket by default.
+    variable _socket_cmd ::socket
+
+    namespace path [linsert [namespace path] 0 [namespace parent]]
+
+}
+
+proc twapi::tls_socket_command {args} {
+    set orig_command $tls::_socket_cmd
+    if {[llength $args] == 1} {
+        set tls::_socket_cmd [lindex $args 0]
+    } elseif {[llength $args] != 0} {
+        error "wrong # args: should be \"tls_socket_command ?cmd?\""
+    }
+    return $orig_command
+}
+
+interp alias {} twapi::tls_socket {} twapi::tls::_socket
+proc twapi::tls::_socket {args} {
+    variable _channels
+    variable _socket_cmd
+
+    debuglog [info level 0]
+
+    parseargs args {
+        myaddr.arg
+        myport.int
+        async
+        socketcmd.arg
+        server.arg
+        peersubject.arg
+        requestclientcert
+        {credentials.arg {}}
+        {verifier.arg {}}
+    } -setvars
+
+    set chan [chan create {read write} [list [namespace current]]]
+    # NOTE: We were originally using badargs! instead of error to raise
+    # exceptions. However that lands up bypassing the trap because of
+    # the way badargs! is implemented. So stick to error.
+    trap {
+        set socket_args {}
+        foreach opt {myaddr myport} {
+            if {[info exists $opt]} {
+                lappend socket_args -$opt [set $opt]
+            }
+        }
+        if {$async} {
+            lappend socket_args -async
+        }
+
+        if {[info exists server]} {
+            if {$server eq ""} {
+                error "Cannot specify an empty value for -server."
+            }
+
+            if {[info exists peersubject]} {
+                error "Option -peersubject cannot be specified for with -server"
+            }
+            set peersubject ""
+            set type LISTENER
+            lappend socket_args -server [list [namespace current]::_accept $chan]
+            if {[llength $credentials] == 0} {
+                error "Option -credentials must be specified for server sockets"
+            }
+        } else {
+            if {![info exists peersubject]} {
+                set peersubject [lindex $args 0]
+            }
+            set requestclientcert 0; #  Not valid for client side
+            set server ""
+            set type CLIENT
+        }
+
+        if {[info exists socketcmd]} {
+            if {$socketcmd eq ""} {
+                set socketcmd ::socket
+            }
+        } else {
+            set socketcmd $_socket_cmd
+        }
+    } onerror {} {
+        catch {chan close $chan}
+        rethrow
+    }
+    trap {
+        set so [$socketcmd {*}$socket_args {*}$args]
+        _init $chan $type $so $credentials $peersubject $requestclientcert [lrange $verifier 0 end] $server
+
+        if {$type eq "CLIENT"} {
+            if {$async} {
+                chan event $so writable [list [namespace current]::_so_write_handler $chan]
+            } else {
+                _client_blocking_negotiate $chan
+                if {(![info exists _channels($chan)]) ||
+                    [dict get $_channels($chan) State] ne "OPEN"} {
+                    if {[info exists _channels($chan)] &&
+                        [dict exists $_channels($chan) ErrorResult]} {
+                        error [dict get $_channels($chan) ErrorResult]
+                    } else {
+                        error "TLS negotiation aborted"
+                    }
+                }
+            }
+        }
+    } onerror {} {
+        # If _init did not even go as far initializing _channels($chan),
+        # close socket ourselves. If it was initialized, the socket
+        # would have been closed even on error
+        if {![info exists _channels($chan)]} {
+            catch {chan close $so}
+        }
+        catch {chan close $chan}
+        # DON'T ACCESS _channels HERE ON
+        if {[string match "wrong # args*" [trapresult]]} {
+            badargs! "wrong # args: should be \"tls_socket ?-credentials creds? ?-verifier command? ?-peersubject peer? ?-myaddr addr? ?-myport myport? ?-async? host port\" or \"tls_socket ?-credentials creds? ?-verifier command? -server command ?-myaddr addr? port\""
+        } else {
+            rethrow
+        }
+    }
+
+    return $chan
+}
+
+interp alias {} twapi::starttls {} twapi::tls::_starttls
+proc twapi::tls::_starttls {so args} {
+    variable _channels
+
+    debuglog [info level 0]
+
+    trap {
+        parseargs args {
+            server
+            requestclientcert
+            peersubject.arg
+            {credentials.arg {}}
+            {verifier.arg {}}
+        } -setvars -maxleftover 0
+
+        if {$server} {
+            if {[info exists peersubject]} {
+                badargs! "Option -peersubject cannot be specified with -server."
+            }
+            if {[llength $credentials] == 0} {
+                error "Option -credentials must be specified for server sockets."
+            }
+            set peersubject ""
+            set type SERVER
+        } else {
+            set requestclientcert 0; # Ignored for client side
+            if {![info exists peersubject]} {
+                # TBD - even if verifier is specified ?
+                badargs! "Option -peersubject must be specified for client connections."
+            }
+            set type CLIENT
+        }
+        set chan [chan create {read write} [list [namespace current]]]
+    } onerror {} {
+        chan close $so
+        rethrow
+    }
+    trap {
+        # Get config from the wrapped socket and reset its handlers
+        # Do not get all options because that results in reverse name
+        # lookups for -peername and -sockname causing a stall.
+        foreach opt {
+            -blocking -buffering -buffersize -encoding -eofchar -translation
+        } {
+            lappend so_opts $opt [chan configure $so $opt]
+        }
+
+        # NOTE: we do NOT save read and write handlers and attach
+        # them to the new channel because the channel name is different.
+        # Thus in most cases the callbacks, which often are passed the
+        # channel name as an arg, would not be valid. It is up
+        # to the caller to reestablish handlers
+        # TBD - maybe keep handlers but replace $so with $chan in them ?
+        chan event $so readable {}
+        chan event $so writable {}
+        _init $chan $type $so $credentials $peersubject $requestclientcert [lrange $verifier 0 end] ""
+        # Copy saved config to wrapper channel
+        chan configure $chan {*}$so_opts
+        if {$type eq "CLIENT"} {
+            if {[dict get $_channels($chan) Blocking]} {
+                _client_blocking_negotiate $chan
+                if {(![info exists _channels($chan)]) ||
+                    [dict get $_channels($chan) State] ne "OPEN"} {
+                    if {[info exists _channels($chan)] &&
+                        [dict exists $_channels($chan) ErrorResult]} {
+                        error [dict get $_channels($chan) ErrorResult]
+                    } else {
+                        error "TLS negotiation aborted"
+                    }
+                }
+            } else {
+                _negotiate $chan
+            }
+        } else {
+            # Note: unlike the tls_socket server case, here we
+            # do not need to switch a blocking socket to non-blocking
+            # and then switch back, primarily because the socket
+            # is already open and there is no need for a callback
+            # when connection opens.
+            if {! [dict get $_channels($chan) Blocking]} {
+                chan configure $so -blocking 0
+                chan event $so readable [list [namespace current]::_so_read_handler $chan]
+            }
+            _negotiate $chan
+        }
+    } onerror {} {
+        # If _init did not even go as far initializing _channels($chan),
+        # close socket ourselves. If it was initialized, the socket
+        # would have been closed even on error
+        if {![info exists _channels($chan)]} {
+            catch {chan close $so}
+        }
+        catch {chan close $chan}
+        # DON'T ACCESS _channels HERE ON
+        if {[string match "wrong # args*" [trapresult]]} {
+            badargs! "wrong # args: should be \"tls_socket ?-credentials creds? ?-verifier command? ?-peersubject peer? ?-myaddr addr? ?-myport myport? ?-async? host port\" or \"tls_socket ?-credentials creds? ?-verifier command? -server command ?-myaddr addr? port\""
+        } else {
+            rethrow
+        }
+    }
+
+    return $chan
+}
+
+interp alias {} twapi::tls_state {} twapi::tls::_state
+proc twapi::tls::_state {chan} {
+    variable _channels
+    if {![info exists _channels($chan)]} {
+       twapi::badargs! "Not a valid TLS channel." 
+    }
+    return [dict get $_channels($chan) State]
+}
+
+interp alias {} twapi::tls_handshake {} twapi::tls::_handshake
+proc twapi::tls::_handshake {chan} {
+    variable _channels
+    if {![info exists _channels($chan)]} {
+       twapi::badargs "Not a valid TLS channel." 
+    }
+
+    dict with _channels($chan) {}
+
+    # For a blocking channel, complete the handshake before returning
+    if {$Blocking} {
+        switch -exact $State {
+            NEGOTIATING - CLIENTINIT - SERVERINIT {
+                _negotiate2 $chan
+            }
+            OPEN {}
+            LISTERNERINIT {
+                error "Cannot do a TLS handshake on a listening socket."
+            }
+            CLOSED -
+            default {
+                error "Channel has been closed or in error state."
+            }
+        }
+    } else {
+        # For non-blocking channels, simply return the state
+        switch -exact -- $State {
+            OPEN {}
+            CLIENTINIT - SERVERINIT - LISTENERINIT - NEGOTIATING {
+                return 0
+            }
+            CLOSED - default {
+                error "Channel has been closed or in error state."
+            }
+        }
+    }
+    return 1
+}
+
+proc twapi::tls::_accept {listener so raddr raport} {
+    variable _channels
+
+    debuglog [info level 0]
+
+    trap {
+        set chan [chan create {read write} [list [namespace current]]]
+        _init $chan SERVER $so [dict get $_channels($listener) Credentials] "" [dict get $_channels($listener) RequestClientCert] [dict get $_channels($listener) Verifier] [linsert [dict get $_channels($listener) AcceptCallback] end $chan $raddr $raport]
+        # If we negotiate the connection, the socket is blocking so
+        # will hang the whole operation. Instead we mark it non-blocking
+        # and the switch back to blocking when the connection gets opened.
+        # For accepts to work, the event loop has to be running anyways.
+        chan configure $so -blocking 0
+        chan event $so readable [list [namespace current]::_so_read_handler $chan]
+        _negotiate $chan
+    } onerror {} {
+        catch {_cleanup $chan}
+        rethrow
+    }
+    return
+}
+
+proc twapi::tls::initialize {chan mode} {
+    debuglog [info level 0]
+
+    # All init is done in chan creation routine after base socket is created
+    return {initialize finalize watch blocking read write configure cget cgetall}
+}
+
+proc twapi::tls::finalize {chan} {
+    debuglog [info level 0]
+    _cleanup $chan
+    return
+}
+
+proc twapi::tls::blocking {chan mode} {
+    debuglog [info level 0]
+
+    variable _channels
+
+    dict set _channels($chan) Blocking $mode
+
+    if {![dict exists $_channels($chan) Socket]} {
+        # We do not currently generate an error because the Tcl socket
+        # command does not either on a fconfigure when remote has
+        # closed connection
+        return
+    }
+    set so [dict get $_channels($chan) Socket]
+    fconfigure $so -blocking $mode
+
+    # There is an issue with Tcl sockets created with -async switching
+    # from blocking->non-blocking->blocking and writing to the socket
+    # before connection is fully open. The internal buffers containing
+    # data that was written before the connection was open do not get
+    # flushed even if there was an explicit flush call by the application.
+    # Doing a flush after changing blocking mode seems to fix this
+    # problem. TBD - check if still the case
+    flush $so
+
+    # TBD - Should we change handlers BEFORE flushing?
+
+    # The flush may recursively call event handler (possibly) which
+    # may change state so have to retrieve values from _channels again.
+    if {![dict exists $_channels($chan) Socket]} {
+        return
+    }
+    set so [dict get $_channels($chan) Socket]
+
+    if {[dict get $_channels($chan) Blocking] == 0} {
+        # Non-blocking
+        # Since we need to negotiate TLS we always have socket event
+        # handlers irrespective of the state of the watch mask
+        chan event $so readable [list [namespace current]::_so_read_handler $chan]
+        chan event $so writable [list [namespace current]::_so_write_handler $chan]
+    } else {
+        # TBD - is this right? Application may have file event handlers even
+        # on blocking sockets
+        chan event $so readable {}
+        chan event $so writable {}
+    }
+    return
+}
+
+proc twapi::tls::watch {chan watchmask} {
+    debuglog [info level 0]
+    variable _channels
+
+    dict set _channels($chan) WatchMask $watchmask
+
+    if {"read" in $watchmask} {
+        # Post a read even if we already have input or if the
+        # underlying socket has gone away.
+        # TBD - do we have a mechanism for continuously posting
+        # events when socket has gone away ? Do we even post once
+        # when socket is closed (on error for example)
+        if {[string length [dict get $_channels($chan) Input]] || ![dict exists $_channels($chan) Socket]} {
+            _post_read_event $chan
+        }
+        # Turn read handler back on in case it had been turned off.
+        chan event [dict get $_channels($chan) Socket] readable [list [namespace current]::_so_read_handler $chan]
+    }
+
+    if {"write" in [dict get $_channels($chan) WatchMask]} {
+        if {[dict get $_channels($chan) State] in {OPEN NEGOTIATING CLOSED} } {
+            _post_write_event $chan
+        }
+        # TBD - do we need to turn write handler back on?
+    }
+
+    return
+}
+
+proc twapi::tls::read {chan nbytes} {
+    variable _channels
+
+    debuglog [info level 0]
+
+    if {$nbytes == 0} {
+        return {}
+    }
+
+    # This is not inside the dict with because _negotiate will update the dict
+    if {[dict get $_channels($chan) State] in {SERVERINIT CLIENTINIT NEGOTIATING}} {
+        _negotiate $chan
+        if {[dict get $_channels($chan) State] in {SERVERINIT CLIENTINIT NEGOTIATING}} {
+            # If a blocking channel, should have come back with negotiation
+            # complete. If non-blocking, return EAGAIN to indicate no
+            # data yet
+            if {[dict get $_channels($chan) Blocking]} {
+                error "TLS negotiation failed on blocking channel" 
+            } else {
+                return -code error EAGAIN
+            }
+        }
+    }
+
+    dict with _channels($chan) {
+        # Either in OPEN or CLOSED state. For the latter, if an error is
+        # present, immediately raise it else go on to return any pending data.
+        if {$State eq "CLOSED" && [info exists ErrorResult]} {
+            error $ErrorResult
+        }
+        # Try to read more bytes if don't have enough AND conn is open
+        set status ok
+        if {[string length $Input] < $nbytes && $State eq "OPEN"} {
+            if {$Blocking} {
+                # For blocking channels, we do not want to block if some
+                # bytes are already available. The refchan will call us
+                # with number of bytes corresponding to its buffer size,
+                # not what app's read call has asked. It expects us
+                # to return whatever we have (but at least one byte)
+                # and block only if nothing is available
+                while {[string length $Input] == 0 && $status eq "ok"} {
+                    # The channel does not compress so we need to read in
+                    # at least $needed bytes. Because of TLS overhead, we may
+                    # actually need even more
+                    set status ok
+                    set data [_blocking_read $Socket]
+                    if {[string length $data]} {
+                        lassign [sspi_decrypt_stream $SspiContext $data] status plaintext
+                        # Note plaintext might be "" if complete cipher block
+                        # was not received
+                        append Input $plaintext
+                    } else {
+                        set status eof
+                    }
+                }
+            } else {
+                # Non-blocking - read all that we can
+                set status ok
+                set data [chan read $Socket]
+                if {[string length $data]} {
+                    lassign [sspi_decrypt_stream $SspiContext $data] status plaintext
+                    append Input $plaintext
+                } else {
+                    if {[chan eof $Socket]} {
+                        set status eof
+                    }
+                }
+                if {[string length $Input] == 0} {
+                    # Do not have enough data. See if connection closed
+                    # TBD - also handle status == renegotiate
+                    if {$status eq "ok"} {
+                        # Not closed, just waiting for data
+                        return -code error EAGAIN
+                    }
+                }
+            }
+        }
+
+        # TBD - use inline K operator to make this faster? Probably no use
+        # since Input is also referred to from _channels($chan)
+        set ret [string range $Input 0 $nbytes-1]
+        set Input [string range $Input $nbytes end]
+        if {"read" in [dict get $_channels($chan) WatchMask] && [string length $Input]} {
+            _post_read_event $chan
+        }
+        if {$status ne "ok"} {
+            # TBD - handle renegotiate
+            debuglog "read: setting State CLOSED"
+
+            # Need a EOF event even if read event posted. See Bug #203
+            _post_eof_event $chan
+            set State CLOSED
+            lassign [sspi_shutdown_context $SspiContext] _ outdata
+            if {[info exists Socket]} {
+                if {[string length $outdata] && $status ne "eof"} {
+                    puts -nonewline $Socket $outdata
+                }
+                catch {close $Socket}
+                unset Socket
+            }
+        }
+        return $ret;            # Note ret may be ""
+    }
+}
+
+proc twapi::tls::write {chan data} {
+    variable _channels
+
+    set datalen [string length $data]
+    debuglog "twapi::tls::write: $chan, $datalen bytes"
+
+    # This is not inside the dict with below because _negotiate will update the dict
+    if {[dict get $_channels($chan) State] in {SERVERINIT CLIENTINIT NEGOTIATING}} {
+        _negotiate $chan
+        if {[dict get $_channels($chan) State] in {SERVERINIT CLIENTINIT NEGOTIATING}} {
+            if {[dict get $_channels($chan) Blocking]} {
+                # If a blocking channel, negotiation should have completed
+                error "TLS negotiation failed on blocking channel" 
+            } else {
+                # TBD - which of the following alternatives to use?
+                if {1} {
+                    # Store for later output once connection is open
+                    debuglog "twapi::tls::write conn not open, appending $datalen bytes to pending output"
+                    dict append _channels($chan) Output $data
+                    return $datalen
+                } else {
+                    # If non-blocking, return EAGAIN to indicate channel
+                    # not open yet.
+                    debuglog "twapi::tls::write returning EAGAIN"
+                    return -code error EAGAIN
+                }
+            }
+        }
+    }
+
+    dict with _channels($chan) {
+        debuglog "twapi::tls::write state $State"
+        switch $State {
+            CLOSED {
+                # Just like a Tcl socket, we do not raise an error on a
+                # write to a closed socket. Simply throw away the data/
+                # However, if an error already exists (negotiation fail)
+                # raise it.
+                if {[info exists ErrorResult]} {
+                    error $ErrorResult
+                }
+            }
+            OPEN {
+                if {$WriteDisabled} {
+                    error "Channel closed for output."
+                }
+                # There might be pending output if channel has just
+                # transitioned to OPEN state
+                _flush_pending_output $chan
+                # TBD - use sspi_encrypt_and_write instead
+                chan puts -nonewline $Socket [sspi_encrypt_stream $SspiContext $data]
+                flush $Socket
+            }
+            default {
+                append Output $data
+            }
+        }
+    }
+    debuglog "twapi::tls::write returning $datalen"
+    return $datalen
+}
+
+proc twapi::tls::configure {chan opt val} {
+    debuglog [info level 0]
+    # Does not make sense to change creds and verifier after creation
+    switch $opt {
+        -context -
+        -verifier -
+        -credentials {
+            error "$opt is a read-only option."
+        }
+        default {
+            chan configure [_chansocket $chan] $opt $val
+        }
+    }
+
+    return
+}
+
+proc twapi::tls::cget {chan opt} {
+    debuglog [info level 0]
+    variable _channels
+
+    switch $opt {
+        -credentials {
+            return [dict get $_channels($chan) Credentials]
+        }
+        -verifier {
+            return [dict get $_channels($chan) Verifier]
+        }
+        -context {
+            return [dict get $_channels($chan) SspiContext]
+        }
+        -error {
+            if {[dict exists $_channels($chan) ErrorResult]} {
+                set result "[dict get $_channels($chan) ErrorResult]"
+                if {$result ne ""} {
+                    return $result
+                }
+            }
+            # Get -error from underlying socket
+            # -error should not raise an error but return the error as result
+            catch {chan configure [_chansocket $chan] -error} result
+            return $result
+        }
+        default {
+            return [chan configure [_chansocket $chan] $opt]
+        }
+    }
+}
+
+proc twapi::tls::cgetall {chan} {
+    debuglog [info level 0]
+    variable _channels
+    dict with _channels($chan) {
+        if {[info exists Socket]} {
+            # First get all options underlying socket supports. Note this may
+            # or may not a Tcl native socket.
+            array set so_config [chan configure $Socket]
+            # Only return options that are not owned by the core channel code
+            # and apply to the $chan itself.
+            foreach {opt val} [chan configure $Socket] {
+                if {$opt ni {-blocking -buffering -buffersize -encoding -eofchar -translation}} {
+                    lappend config $opt $val
+                }
+            }
+        }
+        lappend config -credentials $Credentials \
+        -verifier $Verifier \
+        -context $SspiContext
+    }
+    return $config
+}
+
+# Implement a half-close command since Tcl does not support it for
+# reflected channels.
+interp alias {} twapi::tls_close {} twapi::tls::_close
+proc twapi::tls::_close {chan {direction ""}} {
+
+    if {$direction in {read r re rea}} {
+        error "Half close of input side not currently supported for TLS sockets."
+    }
+
+    # We handle write-side half-closes. Let Tcl close handle everything else.
+    if {$direction ni {write w wr wri writ}} {
+        return [close $chan]
+    }
+
+    # Closing the write side of the channel
+
+    variable _channels
+
+    dict with _channels($chan) {}
+    if {$State eq "CLOSED"} return
+    if {$State ne "OPEN"} {
+        error "Connection not in OPEN state."
+    }
+    flush $chan
+    # Note state may have changed
+    if {[dict get $_channels($chan) State] ne "OPEN"} {
+        return
+    }
+    # Flush internally buffered, if any. Can happen if we buffered
+    # data before TLS negotiation was complete.
+    _flush_pending_output $chan
+    close $Socket write
+    dict set _channels($chan) WriteDisabled 1
+    return
+}
+
+proc twapi::tls::_chansocket {chan} {
+    debuglog [info level 0]
+    variable _channels
+    if {![info exists _channels($chan)]} {
+        error "Channel $chan not found."
+    }
+    if {![dict exists $_channels($chan) Socket]} {
+        set error "Socket not connected."
+        if {[dict exists $_channels($chan) ErrorResult]} {
+            append error " [dict get $_channels($chan) ErrorResult]"
+        }
+        error $error
+    }
+    return [dict get $_channels($chan) Socket]
+}
+
+proc twapi::tls::_init {chan type so creds peersubject requestclientcert verifier {accept_callback {}}} {
+    debuglog [info level 0]
+    variable _channels
+
+    # TBD - verify that -buffering none is the right thing to do
+    # as the scripted channel interface takes care of this itself
+    chan configure $so -translation binary -buffering none
+    set _channels($chan) [list Socket $so \
+                              State ${type}INIT \
+                              Type $type \
+                              Blocking [chan configure $so -blocking] \
+                              WatchMask {} \
+                              WriteDisabled 0 \
+                              RequestClientCert $requestclientcert \
+                              Verifier $verifier \
+                              SspiContext {} \
+                              PeerSubject $peersubject \
+                              Input {} Output {}]
+
+    if {[llength $creds]} {
+        set free_creds 0
+    } else {
+        set creds [sspi_acquire_credentials -package tls -role client -credentials [sspi_schannel_credentials]]
+        set free_creds 1
+    }
+    dict set _channels($chan) Credentials $creds
+    dict set _channels($chan) FreeCredentials $free_creds
+
+    # See SF issue #178. Need to supply -usesuppliedcreds to sspi_client_context
+    # else servers that request (even optionally) client certs might fail since
+    # we do not currently implement incomplete credentials handling. This
+    # option will prevent schannel from trying to automatically look up client
+    # certificates.
+    dict set _channels($chan) UseSuppliedCreds 0; # TBD - make this use settable option
+
+    if {[string length $accept_callback] &&
+        ($type eq "LISTENER" || $type eq "SERVER")} {
+        dict set _channels($chan) AcceptCallback $accept_callback
+    }
+}
+
+proc twapi::tls::_cleanup {chan} {
+    debuglog [info level 0]
+    variable _channels
+    if {[info exists _channels($chan)]} {
+        # Note _cleanup can be called in inconsistent state so not all
+        # keys may be set up
+        dict with _channels($chan) {
+            if {[info exists SspiContext]} {
+                if {$State eq "OPEN"} {
+                    lassign [sspi_shutdown_context $SspiContext] _ outdata
+                    if {[string length $outdata] && [info exists Socket]} {
+                        if {[catch {puts -nonewline $Socket $outdata} msg]} {
+                            # TBD - debug log
+                        }
+                    }
+                }
+                if {[catch {sspi_delete_context $SspiContext} msg]} {
+                    # TBD - debug log
+                }
+            }
+            if {[info exists Socket]} {
+                if {[catch {chan close $Socket} msg]} {
+                    # TBD - debug log socket close error
+                }
+            }
+            if {[info exists Credentials] && $FreeCredentials} {
+                if {[catch {sspi_free_credentials $Credentials} msg]} {
+                    # TBD - debug log
+                }
+            }
+        }
+        unset _channels($chan)
+    }
+}
+
+proc twapi::tls::_cleanup_failed_accept {chan} {
+    debuglog [info level 0]
+    variable _channels
+    # This proc is called from the event loop when negotiation fails
+    # on a server TLS channel that is not yet open (and hence not
+    # known to the application). For some protection against
+    # channel name re-use (which does not happen as of 8.6)
+    # check the state before cleaning up.
+    if {[info exists _channels($chan)] &&
+        [dict get $_channels($chan) Type] eq "SERVER" &&
+        [dict get $_channels($chan) State] eq "CLOSED"} {
+        close $chan;            # Really close
+    }
+}
+
+if {[llength [info commands ::twapi::tls_background_error]] == 0} {
+    proc twapi::tls_background_error {result ropts} {
+        return -options $ropts $result
+    }
+}
+
+proc twapi::tls::_negotiate_from_handler {chan} {
+    # Called from socket read / write handlers if
+    # negotiation is still in progress.
+    # Returns the error code from next step of
+    # negotiation.
+    # 1 -> ok,
+    # 0 -> some error occured, most likely negotiation failure
+    variable _channels
+    if {[catch {_negotiate $chan} result ropts]} {
+        if {![dict exists $_channels($chan) ErrorResult]} {
+            dict set _channels($chan) ErrorResult $result
+        }
+        if {"read" in [dict get $_channels($chan) WatchMask]} {
+            _post_read_event $chan
+        }
+        if {"write" in [dict get $_channels($chan) WatchMask]} {
+            _post_write_event $chan
+        }
+        # For SERVER sockets, force error because no other way
+        # to record some error happened.
+        if {[dict get $_channels($chan) Type] eq "SERVER"} {
+            ::twapi::tls_background_error $result $ropts
+            # Above should raise an error, else do it ourselves
+            # since stack needs to be rewound
+            return -options $ropts $result
+        }
+        return 0
+    }
+    return 1
+}
+
+proc twapi::tls::_so_read_handler {chan} {
+    debuglog [info level 0]
+    variable _channels
+
+    if {[info exists _channels($chan)]} {
+        if {[dict get $_channels($chan) State] in {SERVERINIT CLIENTINIT NEGOTIATING}} {
+            if {![_negotiate_from_handler $chan]} {
+                return
+            }
+        }
+
+        if {"read" in [dict get $_channels($chan) WatchMask]} {
+            _post_read_event $chan
+        } else {
+            # We are not asked to generate read events, turn off the read
+            # event handler unless we are negotiating
+            if {[dict get $_channels($chan) State] ni {SERVERINIT CLIENTINIT NEGOTIATING}} {
+                if {[dict exists $_channels($chan) Socket]} {
+                    chan event [dict get $_channels($chan) Socket] readable {}
+                }
+            }
+        }
+    }
+    return
+}
+
+proc twapi::tls::_so_write_handler {chan} {
+    debuglog [info level 0]
+    variable _channels
+
+    if {[info exists _channels($chan)]} {
+        dict with _channels($chan) {}
+
+        # If we are not actually asked to generate write events,
+        # the only time we want a write handler is on a client -async
+        # Once it runs, we never want it again else it will keep triggering
+        # as sockets are always writable
+        if {"write" ni $WatchMask} {
+            if {[info exists Socket]} {
+                chan event $Socket writable {}
+            }
+        }
+
+        if {$State in {SERVERINIT CLIENTINIT NEGOTIATING}} {
+            if {![_negotiate_from_handler $chan]} {
+                # TBD - should we throw so bgerror gets run?
+                return
+            }
+        }
+
+        # Do not use local var $State because _negotiate might have updated it
+        if {"write" in $WatchMask && [dict get $_channels($chan) State] eq "OPEN"} {
+            _post_write_event $chan
+        }
+    }
+    return
+}
+
+proc twapi::tls::_negotiate chan {
+    debuglog [info level 0]
+    trap {
+        _negotiate2 $chan
+    } onerror {} {
+        variable _channels
+        if {[info exists _channels($chan)]} {
+            if {[dict get $_channels($chan) Type] eq "SERVER" &&
+                [dict get $_channels($chan) State] in {SERVERINIT NEGOTIATING}} {
+                # There is no one to clean up accepted sockets (server) that
+                # fail verification (or error out) since application does
+                # not know about them. So queue some garbage
+                # cleaning.
+                after 0 [namespace current]::_cleanup_failed_accept $chan
+            }
+            dict set _channels($chan) State CLOSED
+            dict set _channels($chan) ErrorOptions [trapoptions]
+            dict set _channels($chan) ErrorResult [trapresult]
+            if {[dict exists $_channels($chan) Socket]} {
+                catch {close [dict get $_channels($chan) Socket]}
+                dict unset _channels($chan) Socket
+            }
+        }
+        rethrow
+    }
+}
+
+proc twapi::tls::_negotiate2 {chan} {
+    variable _channels
+        
+    dict with _channels($chan) {}; # dict -> local vars
+
+    debuglog [info level 0]
+    switch $State {
+        NEGOTIATING {
+            if {$Blocking && ![info exists AcceptCallback]} {
+                return [_blocking_negotiate_loop $chan]
+            }
+
+            set data [chan read $Socket]
+            if {[string length $data] == 0} {
+                if {[chan eof $Socket]} {
+                    throw {TWAPI TLS NEGOTIATE EOF} "Unexpected EOF during TLS negotiation (NEGOTIATING)"
+                } else {
+                    # No data yet, just keep waiting
+                    debuglog "Waiting (chan $chan) for more data on Socket $Socket"
+                    return
+                }
+            } else {
+                lassign [sspi_step $SspiContext $data] status outdata leftover
+                debuglog "sspi_step returned status $status with [string length $outdata] bytes"
+                if {[string length $outdata]} {
+                    chan puts -nonewline $Socket $outdata
+                    chan flush $Socket
+                }
+                switch $status {
+                    done {
+                        if {[string length $leftover]} {
+                            lassign [sspi_decrypt_stream $SspiContext $leftover] status plaintext
+                            dict append _channels($chan) Input $plaintext
+                            if {$status ne "ok"} {
+                                # TBD - shutdown channel or let _cleanup do it?
+                            }
+                        }
+                        _open $chan
+                    }
+                    continue {
+                        # Keep waiting for next input
+                    }
+                    default {
+                        debuglog "sspi_step returned $status"
+                        error "Unexpected status $status from sspi_step"
+                    }
+                }
+            }
+        }
+
+        CLIENTINIT {
+            if {$Blocking} {
+                _client_blocking_negotiate $chan
+            } else {
+                dict set _channels($chan) State NEGOTIATING
+                set SspiContext [sspi_client_context $Credentials -usesuppliedcreds $UseSuppliedCreds -stream 1 -target $PeerSubject -manualvalidation [expr {[llength $Verifier] > 0}]]
+                dict set _channels($chan) SspiContext $SspiContext
+                lassign [sspi_step $SspiContext] status outdata
+                if {[string length $outdata]} {
+                    chan puts -nonewline $Socket $outdata
+                    chan flush $Socket
+                }
+                if {$status ne "continue"} {
+                    error "Unexpected status $status from sspi_step"
+                }
+            }
+        }
+        
+        SERVERINIT {
+            # For server sockets created from tls_socket, we
+            # always take the non-blocking path as we set the socket
+            # to be non-blocking so as to not hold up the whole app
+            # For server sockets created with starttls 
+            # (AcceptCallback will not exist), we can do a blocking
+            # negotiate.
+            if {$Blocking && ![info exists AcceptCallback]} {
+                _server_blocking_negotiate $chan
+            } else {
+                set data [chan read $Socket]
+                if {[string length $data] == 0} {
+                    if {[chan eof $Socket]} {
+                        throw {TWAPI TLS NEGOTIATE EOF} "Unexpected EOF during TLS negotiation (SERVERINIT)"
+                    } else {
+                        # No data yet, just keep waiting
+                        debuglog "$chan: no data from socket $Socket. Waiting..."
+                        return
+                    }
+                } else {
+                    debuglog "Setting $chan State=NEGOTIATING"
+
+                    dict set _channels($chan) State NEGOTIATING
+                    set SspiContext [sspi_server_context $Credentials $data -stream 1 -mutualauth $RequestClientCert]
+                    dict set _channels($chan) SspiContext $SspiContext
+                    lassign [sspi_step $SspiContext] status outdata leftover
+                    debuglog "sspi_step returned status $status with [string length $outdata] bytes"
+                    if {[string length $outdata]} {
+                        debuglog "Writing [string length $outdata] bytes to socket $Socket"
+                        chan puts -nonewline $Socket $outdata
+                        chan flush $Socket
+                    }
+                    switch $status {
+                        done {
+                            if {[string length $leftover]} {
+                                lassign [sspi_decrypt_stream $SspiContext $leftover] status plaintext
+                                dict append _channels($chan) Input $plaintext
+                                if {$status ne "ok"} {
+                                    # TBD - shut down channel
+                                }
+                            }
+                            debuglog "Marking channel $chan open"
+                            _open $chan
+                        }
+                        continue {
+                            # Keep waiting for next input
+                        }
+                        default {
+                            error "Unexpected status $status from sspi_step"
+                        }
+                    }
+                }
+            }
+        }
+
+        default {
+            error "Internal error: _negotiate called in state [dict get $_channels($chan) State]"
+        }
+    }
+
+    return
+}
+
+proc twapi::tls::_client_blocking_negotiate {chan} {
+    debuglog [info level 0]
+    variable _channels
+    dict with _channels($chan) {
+        set State NEGOTIATING
+        set SspiContext [sspi_client_context $Credentials -usesuppliedcreds $UseSuppliedCreds -stream 1 -target $PeerSubject -manualvalidation [expr {[llength $Verifier] > 0}]]
+    }
+    return [_blocking_negotiate_loop $chan]
+}
+
+proc twapi::tls::_server_blocking_negotiate {chan} {
+    debuglog [info level 0]
+    variable _channels
+    dict set _channels($chan) State NEGOTIATING
+    set so [dict get $_channels($chan) Socket]
+    set indata [_blocking_read $so]
+    if {[chan eof $so]} {
+        throw {TWAPI TLS NEGOTIATE EOF} "Unexpected EOF during TLS negotiation (server)."
+    }
+    dict set _channels($chan) SspiContext [sspi_server_context [dict get $_channels($chan) Credentials] $indata -stream 1 -mutualauth [dict get $_channels($chan) RequestClientCert]]
+    return [_blocking_negotiate_loop $chan]
+}
+
+proc twapi::tls::_blocking_negotiate_loop {chan} {
+    debuglog [info level 0]
+    variable _channels
+
+    dict with _channels($chan) {}; # dict -> local vars
+
+    lassign [sspi_step $SspiContext] status outdata
+    debuglog "sspi_step status $status"
+    # Keep looping as long as the SSPI state machine tells us to 
+    while {$status eq "continue"} {
+        # If the previous step had any output, send it out
+        if {[string length $outdata]} {
+            debuglog "Writing [string length $outdata] to socket $Socket"
+            chan puts -nonewline $Socket $outdata
+            chan flush $Socket
+        }
+
+        set indata [_blocking_read $Socket]
+        debuglog "Read [string length $indata] from socket $Socket"
+        if {[chan eof $Socket]} {
+            throw {TWAPI TLS NEGOTIATE EOF} "Unexpected EOF during TLS negotiation."
+        }
+        trap {
+            lassign [sspi_step $SspiContext $indata] status outdata leftover
+        } onerror {} {
+            debuglog "sspi_step returned error: [trapresult]"
+            close $Socket
+            unset Socket
+            rethrow
+        }
+        debuglog "sspi_step status $status"
+    }
+
+    # Send output irrespective of status
+    if {[string length $outdata]} {
+        chan puts -nonewline $Socket $outdata
+        chan flush $Socket
+    }
+
+    if {$status eq "done"} {
+        if {[string length $leftover]} {
+            lassign [sspi_decrypt_stream $SspiContext $leftover] status plaintext
+            dict append _channels($chan) Input $plaintext
+            if {$status ne "ok"} {
+                error "Error status $status decrypting data"
+            }
+        }
+        _open $chan
+    } else {
+        # Should not happen. Negotiation failures will raise an error,
+        # not return a value
+        error "TLS negotiation failed: status $status."
+    }
+
+    return
+}
+
+proc twapi::tls::_blocking_read {so} {
+    debuglog [info level 0]
+    # Read from a blocking socket. We do not know how much data is needed
+    # so read a single byte and then read any pending
+    set input [chan read $so 1]
+    if {[string length $input]} {
+        set more [chan pending input $so]
+        if {$more > 0} {
+            append input [chan read $so $more]
+        }
+    }    
+    return $input
+}
+
+proc twapi::tls::_flush_pending_output {chan} {
+    variable _channels
+
+    dict with _channels($chan) {
+        if {[string length $Output]} {
+            debuglog "_flush_pending_output: flushing output"
+            puts -nonewline $Socket [sspi_encrypt_stream $SspiContext $Output]
+            set Output ""
+	}
+    }
+    return
+}
+
+# Transitions connection to OPEN or throws error if verifier returns false
+# or fails
+proc twapi::tls::_open {chan} {
+    debuglog [info level 0]
+    variable _channels
+
+    dict with _channels($chan) {}; # dict -> local vars
+
+    if {[llength $Verifier] == 0} {
+        # No verifier specified. In this case, we would not have specified
+        # -manualvalidation in creating the context and the system would
+        # have done the verification already for client. For servers,
+        # there is no verification of clients to be done by default
+
+        # For compatibility with TLS we call accept callbacks AFTER verification
+        dict set _channels($chan) State OPEN
+        if {[info exists AcceptCallback]} {
+            # Server sockets are set up to be non-blocking during negotiation
+            # Change them back to original state before notifying app
+            chan configure $Socket -blocking [dict get $_channels($chan) Blocking]
+            chan event $Socket readable {}
+            after 0 $AcceptCallback
+        }
+        # If there is any pending output waiting for the connection to
+        # open, write it out
+        _flush_pending_output $chan
+
+        return
+    }
+
+    # TBD - what if verifier closes the channel
+    if {[{*}$Verifier $chan $SspiContext]} {
+        dict set _channels($chan) State OPEN
+        # For compatibility with TLS we call accept callbacks AFTER verification
+        if {[info exists AcceptCallback]} {
+            # Server sockets are set up to be non-blocking during 
+            # negotiation. Change them back to original state
+            # before notifying app
+            chan configure $Socket -blocking [dict get $_channels($chan) Blocking]
+            chan event $Socket readable {}
+            after 0 $AcceptCallback
+        }
+        _flush_pending_output $chan
+        return
+    } else {
+        error "SSL/TLS negotiation failed. Verifier callback returned false." "" [list TWAPI TLS VERIFYFAIL]
+    }
+}
+
+# Calling [chan postevent] results in filevent handlers being called right
+# away which can recursively call back into channel code making things
+# more than a bit messy. So we always schedule them through the event loop
+proc twapi::tls::_post_read_event_callback {chan} {
+    debuglog [info level 0]
+    variable _channels
+    if {[info exists _channels($chan)]} {
+        dict unset _channels($chan) ReadEventPosted
+        if {"read" in [dict get $_channels($chan) WatchMask]} {
+            chan postevent $chan read
+        }
+    }
+}
+proc twapi::tls::_post_read_event {chan} {
+    debuglog [info level 0]
+    variable _channels
+    if {![dict exists $_channels($chan) ReadEventPosted]} {
+        # Note after 0 after idle does not work - (never get called)
+        # not sure why so just do after 0
+        dict set _channels($chan) ReadEventPosted \
+            [after 0 [namespace current]::_post_read_event_callback $chan]
+    }
+}
+proc twapi::tls::_post_eof_event_callback {chan} {
+    debuglog [info level 0]
+    variable _channels
+    if {[info exists _channels($chan)]} {
+        if {"read" in [dict get $_channels($chan) WatchMask]} {
+            chan postevent $chan read
+        }
+    }
+}
+proc twapi::tls::_post_eof_event {chan} {
+    # EOF events are always generated event if a read event is already posted.
+    # See Bug #203
+    debuglog [info level 0]
+    after 0 [namespace current]::_post_eof_event_callback $chan
+}
+
+
+proc twapi::tls::_post_write_event_callback {chan} {
+    debuglog [info level 0]
+    variable _channels
+    if {[info exists _channels($chan)]} {
+        dict unset _channels($chan) WriteEventPosted
+        if {"write" in [dict get $_channels($chan) WatchMask]} {
+            # NOTE: we do not check state here as we should generate an event
+            # even in the CLOSED state - see Bug #206
+            chan postevent $chan write
+        }
+    }
+}
+proc twapi::tls::_post_write_event {chan} {
+    debuglog [info level 0]
+    variable _channels
+    if {![dict exists $_channels($chan) WriteEventPosted]} {
+        # Note after 0 after idle does not work - (never get called)
+        # not sure why so just do after 0
+        dict set _channels($chan) WriteEventPosted \
+            [after 0 [namespace current]::_post_write_event_callback $chan]
+    }
+}
+
+namespace eval twapi::tls {
+    namespace ensemble create -subcommands {
+        initialize finalize blocking watch read write configure cget cgetall
+    }
+}
+
+proc twapi::tls::sample_server_creds pfxFile {
+    set fd [open $pfxFile rb]
+    set pfx [read $fd]
+    close $fd
+    # Set up the store containing the certificates
+    set certStore [twapi::cert_temporary_store -pfx $pfx]
+    # Set up the client and server credentials
+    set serverCert [twapi::cert_store_find_certificate $certStore subject_substring twapitestserver]
+    # TBD - check if certs can be released as soon as we obtain credentials
+    set creds [twapi::sspi_acquire_credentials -credentials [twapi::sspi_schannel_credentials -certificates [list $serverCert]] -package unisp -role server]
+    twapi::cert_release $serverCert
+    twapi::cert_store_release $certStore
+    return $creds
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/twapi.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/twapi.tcl
new file mode 100644
index 00000000..20a5f179
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/twapi.tcl
@@ -0,0 +1,858 @@
+#
+# Copyright (c) 2003-2018, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# General definitions and procs used by all TWAPI modules
+
+package require Tcl 8.5
+package require registry
+
+namespace eval twapi {
+    # Get rid of this ugliness  -  TBD
+    # Note this is different from NULL or {0 VOID} etc. It is more like
+    # a null token passed to functions that expect ptr to strings and
+    # allow the ptr to be NULL.
+    variable nullptr "__null__"
+
+    variable scriptdir [file dirname [info script]]
+
+    # Name of the var holding log messages in reflected in the C
+    # code, don't change it!
+    variable log_messages {}
+
+    ################################################################
+    # Following procs are used early in init process so defined here
+
+    # Throws a bad argument error that appears to come from caller's invocation
+    # (if default level is 2)
+    proc badargs! {msg {level 2}} {
+        return -level $level -code error -errorcode [list TWAPI BADARGS $msg] $msg
+    }
+
+    proc lambda {arglist body {ns {}}} {
+        return [list ::apply [list $arglist $body $ns]]
+    }
+
+    # Similar to lambda but takes additional parameters to be passed
+    # to the anonymous functin
+    proc lambda* {arglist body {ns {}} args} {
+        return [list ::apply [list $arglist $body $ns] {*}$args]
+    }
+
+    # Rethrow original exception from inside a trap
+    proc rethrow {} {
+        return -code error -level 0 -options [twapi::trapoptions] [twapi::trapresult]
+    }
+
+    # Dict lookup, returns default (from args) if not in dict and
+    # key itself if no defaults specified
+    proc dict* {d key args} {
+        if {[dict exists $d $key]} {
+            return [dict get $d $key]
+        } elseif {[llength $args]} {
+            return [lindex $args 0]
+        } else {
+            return $key
+        }
+    }
+
+    proc dict! {d key {frame 0}} {
+        if {[dict exists $d $key]} {
+            return [dict get $d $key]
+        } else {
+            # frame is how must above the caller errorInfo must appear
+            return [badargs! "Bad value \"$key\". Must be one of [join [dict keys $d] {, }]" [incr frame 2]]
+        }
+    }
+
+
+    # Defines a proc with some initialization code
+    proc proc* {procname arglist initcode body} {
+        if {![string match ::* $procname]} {
+            set ns [uplevel 1 {namespace current}]
+            set procname ${ns}::$procname
+        }
+        set proc_def [format {proc %s {%s} {%s ; proc %s {%s} {%s} ; uplevel 1 [list %s] [lrange [info level 0] 1 end]}} $procname $arglist $initcode $procname $arglist $body $procname]
+        uplevel 1 $proc_def
+    }
+
+    # Swap keys and values
+    proc swapl {l} {
+        set swapped {}
+        foreach {a b} $l {
+            lappend swapped $b $a
+        }
+        return $swapped
+    }
+
+    # TBD - see if C would make faster
+    # Returns a list consisting of n'th index within each sublist element
+    # Should we allow n to be a nested index ? C impl may be harder
+    proc lpick {l {n 0}} {
+        set result {}
+        foreach e $l {
+            lappend result [lindex $e $n]
+        }
+        return $result
+    }
+
+    # Simple helper to treat lists as a stack
+    proc lpop {vl} {
+        upvar 1 $vl l
+        set top [lindex $l end]
+        # K combinator trick to reset l to allow lreplace to work in place
+        set l [lreplace $l [set l end] end]
+        return $top
+    }
+
+    # twine list of n items
+    proc ntwine {fields l} {
+        set ntwine {}
+        foreach e $l {
+            lappend ntwine [twine $fields $e]
+        }
+        return $ntwine
+    }
+
+    # Qualifies a name in context of caller's caller
+    proc callerns {name} {
+        if {[string match "::*" $name]} {
+            return $name
+        }
+        if {[info level] > 2} {
+            return [uplevel 2 namespace current]::$name
+        } else {
+            return ::$name
+        }
+    }
+}
+
+# Make twapi versions the same as the base module versions
+set twapi::version(twapi) $::twapi::version(twapi_base)
+
+#
+# log for tracing / debug messages.
+proc twapi::debuglog_clear {} {
+    variable log_messages
+    set log_messages {}
+}
+
+proc twapi::debuglog_enable {} {
+    catch {rename [namespace current]::debuglog {}}
+    interp alias {} [namespace current]::debuglog {} [namespace current]::Twapi_AppendLog
+}
+
+proc twapi::debuglog_disable {} {
+    proc [namespace current]::debuglog {args} {}
+}
+
+proc twapi::debuglog_get {} {
+    variable log_messages
+    return $log_messages
+}
+
+# Logging disabled by default
+twapi::debuglog_disable
+
+proc twapi::get_build_config {{key ""}} {
+    variable build_ids
+    array set config [GetTwapiBuildInfo]
+
+    # This is actually a runtime config and might not have been initialized
+    if {[info exists ::twapi::use_tcloo_for_com]} {
+        if {$::twapi::use_tcloo_for_com} {
+            set config(comobj_ootype) tcloo
+        } else {
+            set config(comobj_ootype) metoo
+        }
+    } else {
+        set config(comobj_ootype) uninitialized
+    }
+
+    if {$key eq ""} {
+        return [array get config]
+    } else {
+        if {![info exists config($key)]} {
+            error "key not known"; # Matches tcl::pkgconfig error message
+        }
+        return $config($key)
+    }
+}
+
+# This matches the pkgconfig command as defined by Tcl_RegisterConfig
+# TBD - Doc and test
+proc twapi::pkgconfig {subcommand {arg {}}} {
+    if {$subcommand eq "list"} {
+        if {$arg ne ""} {
+            error {wrong # args: should be "twapi::pkgconfig list"}
+        }
+        return [dict keys [get_build_config]]
+    } elseif {$subcommand eq "get"} {
+        if {$arg eq ""} {
+            error {wrong # args: should be "twapi::pkgconfig get key"}
+        }
+        return [get_build_config $arg]
+    } else {
+        error {wrong # args: should be "tcl::pkgconfig subcommand ?arg?"}
+    }
+}
+
+# TBD - document
+proc twapi::support_report {} {
+    set report "Operating system: [get_os_description]\n"
+    append report "Processors: [get_processor_count]\n"
+    append report "WOW64: [wow64_process]\n"
+    append report "Virtualized: [virtualized_process]\n"
+    append report "System locale: [get_system_default_lcid], [get_system_default_langid]\n"
+    append report "User locale: [get_user_default_lcid], [get_user_default_langid]\n"
+    append report "Tcl version: [info patchlevel]\n"
+    append report "tcl_platform:\n"
+    foreach k [lsort -dictionary [array names ::tcl_platform]] {
+        append report "  $k = $::tcl_platform($k)\n"
+    }
+    append report "TWAPI version: [get_version -patchlevel]\n"
+    array set a [get_build_config]
+    append report "TWAPI config:\n"
+    foreach k [lsort -dictionary [array names a]] {
+        append report "  $k = $a($k)\n"
+    }
+    append report "\nDebug log:\n[join [debuglog_get] \n]\n"
+}
+
+
+# Returns a list of raw Windows API functions supported
+proc twapi::list_raw_api {} {
+    set rawapi [list ]
+    foreach fn [info commands ::twapi::*] {
+         if {[regexp {^::twapi::([A-Z][^_]*)$} $fn ignore fn]} {
+             lappend rawapi $fn
+         }
+    }
+    return $rawapi
+}
+
+
+# Wait for $wait_ms milliseconds or until $script returns $guard. $gap_ms is
+# time between retries to call $script
+# TBD - write a version that will allow other events to be processed
+proc twapi::wait {script guard wait_ms {gap_ms 10}} {
+    if {$gap_ms == 0} {
+        set gap_ms 10
+    }
+    set end_ms [expr {[clock clicks -milliseconds] + $wait_ms}]
+    while {[clock clicks -milliseconds] < $end_ms} {
+        set script_result [uplevel $script]
+        if {[string equal $script_result $guard]} {
+            return 1
+        }
+        after $gap_ms
+    }
+    # Reached limit, one last try
+    return [string equal [uplevel $script] $guard]
+}
+
+# Get twapi version
+proc twapi::get_version {args} {
+    variable version
+    array set opts [parseargs args {patchlevel}]
+    if {$opts(patchlevel)} {
+        return $version(twapi)
+    } else {
+        # Only return major, minor
+        set ver $version(twapi)
+        regexp {^([[:digit:]]+\.[[:digit:]]+)[.ab]} $version(twapi) - ver
+        return $ver
+    }
+}
+
+# Set all elements of the array to specified value
+proc twapi::_array_set_all {v_arr val} {
+    upvar $v_arr arr
+    foreach e [array names arr] {
+        set arr($e) $val
+    }
+}
+
+# Check if any of the specified array elements are non-0
+proc twapi::_array_non_zero_entry {v_arr indices} {
+    upvar $v_arr arr
+    foreach i $indices {
+        if {$arr($i)} {
+            return 1
+        }
+    }
+    return 0
+}
+
+# Check if any of the specified array elements are non-0
+# and return them as a list of options (preceded with -)
+proc twapi::_array_non_zero_switches {v_arr indices all} {
+    upvar $v_arr arr
+    set result [list ]
+    foreach i $indices {
+        if {$all || ([info exists arr($i)] && $arr($i))} {
+            lappend result -$i
+        }
+    }
+    return $result
+}
+
+
+# Bitmask operations on 32bit values
+# The int() casts are to deal with hex-decimal sign extension issues
+proc twapi::setbits {v_bits mask} {
+    upvar $v_bits bits
+    set bits [expr {int($bits) | int($mask)}]
+    return $bits
+}
+proc twapi::resetbits {v_bits mask} {
+    upvar $v_bits bits
+    set bits [expr {int($bits) & int(~ $mask)}]
+    return $bits
+}
+
+# Return a bitmask corresponding to a list of symbolic and integer values
+# If symvals is a single item, it is an array else a list of sym bitmask pairs
+proc twapi::_parse_symbolic_bitmask {syms symvals} {
+    if {[llength $symvals] == 1} {
+        upvar $symvals lookup
+    } else {
+        array set lookup $symvals
+    }
+    set bits 0
+    foreach sym $syms {
+        if {[info exists lookup($sym)]} {
+            set bits [expr {$bits | $lookup($sym)}]
+        } else {
+            set bits [expr {$bits | $sym}]
+        }
+    }
+    return $bits
+}
+
+# Return a list of symbols corresponding to a bitmask
+proc twapi::_make_symbolic_bitmask {bits symvals {append_unknown 1}} {
+    if {[llength $symvals] == 1} {
+        upvar $symvals lookup
+        set map [array get lookup]
+    } else {
+        set map $symvals
+    }
+    set symbits 0
+    set symmask [list ]
+    foreach {sym val} $map {
+        if {$bits & $val} {
+            set symbits [expr {$symbits | $val}]
+            lappend symmask $sym
+        }
+    }
+
+    # Get rid of bits that mapped to symbols
+    set bits [expr {$bits & ~$symbits}]
+    # If any left over, add them
+    if {$bits && $append_unknown} {
+        lappend symmask $bits
+    }
+    return $symmask
+}
+
+# Return a bitmask corresponding to a list of symbolic and integer values
+# If symvals is a single item, it is an array else a list of sym bitmask pairs
+# Ditto for switches - an array or flat list of switch boolean pairs
+proc twapi::_switches_to_bitmask {switches symvals {bits 0}} {
+    if {[llength $symvals] == 1} {
+        upvar $symvals lookup
+    } else {
+        array set lookup $symvals
+    }
+    if {[llength $switches] == 1} {
+        upvar $switches swtable
+    } else {
+        array set swtable $switches
+    }
+
+    foreach {switch bool} [array get swtable] {
+        if {$bool} {
+            set bits [expr {$bits | $lookup($switch)}]
+        } else {
+            set bits [expr {$bits & ~ $lookup($switch)}]
+        }
+    }
+    return $bits
+}
+
+# Return a list of switche bool pairs corresponding to a bitmask
+proc twapi::_bitmask_to_switches {bits symvals} {
+    if {[llength $symvals] == 1} {
+        upvar $symvals lookup
+        set map [array get lookup]
+    } else {
+        set map $symvals
+    }
+    set symbits 0
+    set symmask [list ]
+    foreach {sym val} $map {
+        if {$bits & $val} {
+            set symbits [expr {$symbits | $val}]
+            lappend symmask $sym 1
+        } else {
+            lappend symmask $sym 0
+        }
+    }
+
+    return $symmask
+}
+
+# Make and return a keyed list
+proc twapi::kl_create {args} {
+    if {[llength $args] & 1} {
+        error "No value specified for keyed list field [lindex $args end]. A keyed list must have an even number of elements."
+    }
+    return $args
+}
+
+# Make a keyed list given fields and values
+interp alias {} twapi::kl_create2 {} twapi::twine
+
+# Set a key value
+proc twapi::kl_set {kl field newval} {
+   set i 0
+   foreach {fld val} $kl {
+        if {[string equal $fld $field]} {
+            incr i
+            return [lreplace $kl $i $i $newval]
+        }
+        incr i 2
+    }
+    lappend kl $field $newval
+    return $kl
+}
+
+# Check if a field exists in the keyed list
+proc twapi::kl_vget {kl field varname} {
+    upvar $varname var
+    return [expr {! [catch {set var [kl_get $kl $field]}]}]
+}
+
+# Remote/unset a key value
+proc twapi::kl_unset {kl field} {
+    array set arr $kl
+    unset -nocomplain arr($field)
+    return [array get arr]
+}
+
+# Compare two keyed lists
+proc twapi::kl_equal {kl_a kl_b} {
+    array set a $kl_a
+    foreach {kb valb} $kl_b {
+        if {[info exists a($kb)] && ($a($kb) == $valb)} {
+            unset a($kb)
+        } else {
+            return 0
+        }
+    }
+    if {[array size a]} {
+        return 0
+    } else {
+        return 1
+    }
+}
+
+# Return the field names in a keyed list in the same order that they
+# occured
+proc twapi::kl_fields {kl} {
+    set fields [list ]
+    foreach {fld val} $kl {
+        lappend fields $fld
+    }
+    return $fields
+}
+
+# Returns a flat list of the $field fields from a list
+# of keyed lists
+proc twapi::kl_flatten {list_of_kl args} {
+    set result {}
+    foreach kl $list_of_kl {
+        foreach field $args {
+            lappend result [kl_get $kl $field]
+        }
+    }
+    return $result
+}
+
+
+# Return an array as a list of -index value pairs
+proc twapi::_get_array_as_options {v_arr} {
+    upvar $v_arr arr
+    set result [list ]
+    foreach {index value} [array get arr] {
+        lappend result -$index $value
+    }
+    return $result
+}
+
+# Parse a list of two integers or a x,y pair and return a list of two integers
+# Generate exception on format error using msg
+proc twapi::_parse_integer_pair {pair {msg "Invalid integer pair"}} {
+    if {[llength $pair] == 2} {
+        lassign $pair first second
+        if {[string is integer -strict $first] &&
+            [string is integer -strict $second]} {
+            return [list $first $second]
+        }
+    } elseif {[regexp {^([[:digit:]]+),([[:digit:]]+)$} $pair dummy first second]} {
+        return [list $first $second]
+    }
+
+    error "$msg: '$pair'. Should be a list of two integers or in the form 'x,y'"
+}
+
+
+# Convert file names by substituting \SystemRoot and \??\ sequences
+proc twapi::_normalize_path {path} {
+    # Get rid of \??\ prefixes
+    regsub {^[\\/]\?\?[\\/](.*)} $path {\1} path
+
+    # Replace leading \SystemRoot with real system root
+    if {[string match -nocase {[\\/]Systemroot*} $path] &&
+        ([string index $path 11] in [list "" / \\])} {
+        return [file join [twapi::GetSystemWindowsDirectory] [string range $path 12 end]]
+    } else {
+        return [file normalize $path]
+    }
+}
+
+
+# Convert seconds to a list {Year Month Day Hour Min Sec Ms}
+# (Ms will always be zero).
+proc twapi::_seconds_to_timelist {secs {gmt 0}} {
+    # For each field, we need to trim the leading zeroes
+    set result [list ]
+    foreach x [clock format $secs -format "%Y %m %e %k %M %S 0" -gmt $gmt] {
+        lappend result [scan $x %d]
+    }
+    return $result
+}
+
+# Convert local time list {Year Month Day Hour Min Sec Ms} to seconds
+# (Ms field is ignored)
+# TBD - fix this gmt issue - not clear whether caller expects gmt time
+proc twapi::_timelist_to_seconds {timelist} {
+    return [clock scan [_timelist_to_timestring $timelist] -gmt false]
+}
+
+# Convert local time list {Year Month Day Hour Min Sec Ms} to a time string
+# (Ms field is ignored)
+proc twapi::_timelist_to_timestring {timelist} {
+    if {[llength $timelist] < 6} {
+        error "Invalid time list format"
+    }
+
+    return "[lindex $timelist 0]-[lindex $timelist 1]-[lindex $timelist 2] [lindex $timelist 3]:[lindex $timelist 4]:[lindex $timelist 5]"
+}
+
+# Convert a time string to a time list
+proc twapi::_timestring_to_timelist {timestring} {
+    return [_seconds_to_timelist [clock scan $timestring -gmt false]]
+}
+
+# Parse raw memory like binary scan command
+proc twapi::mem_binary_scan {mem off mem_sz args} {
+    uplevel [list binary scan [Twapi_ReadMemory 1 $mem $off $mem_sz]] $args
+}
+
+
+# Validate guid syntax
+proc twapi::_validate_guid {guid} {
+    if {![Twapi_IsValidGUID $guid]} {
+        error "Invalid GUID syntax: '$guid'"
+    }
+}
+
+# Validate uuid syntax
+proc twapi::_validate_uuid {uuid} {
+    if {![regexp {^[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}$} $uuid]} {
+        error "Invalid UUID syntax: '$uuid'"
+    }
+}
+
+# Extract a UCS-16 string from a binary. Cannot directly use
+# encoding convertfrom because that will not stop at the terminating
+# null. The UCS-16 assumed to be little endian.
+proc twapi::_ucs16_binary_to_string {bin {off 0}} {
+    set bin [string range $bin $off end]
+
+    # Find the terminating null.
+    set off [string first \0\0 $bin]
+    while {$off > 0 && ($off & 1)} {
+        # Offset off is odd and so crosses a char boundary, so not the
+        # terminating null. Step to the char boundary and start search again
+        incr off
+        set off [string first \0\0 $bin $off]
+    }
+    # off is offset of terminating UCS-16 null, or -1 if not found
+    if {$off < 0} {
+        # No terminator
+        return [encoding convertfrom unicode $bin]
+    } else {
+        return [encoding convertfrom unicode [string range $bin 0 $off-1]]
+    }
+}
+
+# Extract a string from a binary. Cannot directly use
+# encoding convertfrom because that will not stop at the terminating
+# null.
+proc twapi::_ascii_binary_to_string {bin {off 0}} {
+    set bin [string range $bin $off end]
+
+    # Find the terminating null.
+    set off [string first \0 $bin]
+
+    # off is offset of terminating null, or -1 if not found
+    if {$off < 0} {
+        # No terminator
+        return [encoding convertfrom ascii $bin]
+    } else {
+        return [encoding convertfrom ascii [string range $bin 0 $off-1]]
+    }
+}
+
+
+# Given a binary, return a GUID. The formatting is done as per the
+# Windows StringFromGUID2 convention used by COM
+proc twapi::_binary_to_guid {bin {off 0}} {
+    if {[binary scan $bin "@$off i s s H4 H12" g1 g2 g3 g4 g5] != 5} {
+        error "Invalid GUID binary"
+    }
+
+    return [format "{%8.8X-%2.2hX-%2.2hX-%s}" $g1 $g2 $g3 [string toupper "$g4-$g5"]]
+}
+
+# Given a guid string, return a GUID in binary form
+proc twapi::_guid_to_binary {guid} {
+    _validate_guid $guid
+    lassign [split [string range $guid 1 end-1] -] g1 g2 g3 g4 g5
+    return [binary format "i s s H4 H12" 0x$g1 0x$g2 0x$g3 $g4 $g5]
+}
+
+# Return a guid from raw memory
+proc twapi::_decode_mem_guid {mem {off 0}} {
+    return [_binary_to_guid [Twapi_ReadMemory 1 $mem $off 16]]
+}
+
+# Convert a Windows registry value to Tcl form. mem is a raw
+# memory object. off is the offset into the memory object to read.
+# $type is a integer corresponding
+# to the registry types
+proc twapi::_decode_mem_registry_value {type mem len {off 0}} {
+    set type [expr {$type}];    # Convert hex etc. to decimal form
+    switch -exact -- $type {
+        1 -
+        2 {
+            return [list [expr {$type == 2 ? "expand_sz" : "sz"}] \
+                        [Twapi_ReadMemory 3 $mem $off $len 1]]
+        }
+        7 {
+            # Collect strings until we come across an empty string
+            # Note two nulls right at the start will result in
+            # an empty list. Should it result in a list with
+            # one empty string element? Most code on the web treats
+            # it as the former so we do too.
+           set multi [list ]
+            while {1} {
+                set str [Twapi_ReadMemory 3 $mem $off -1]
+                set n [string length $str]
+                # Check for out of bounds. Cannot check for this before
+                # actually reading the string since we do not know size
+                # of the string.
+                if {($len != -1) && ($off+$n+1) > $len} {
+                    error "Possible memory corruption: read memory beyond specified memory size."
+                }
+                if {$n == 0} {
+                    return [list multi_sz $multi]
+                }
+                lappend multi $str
+                # Move offset by length of the string and terminating null
+                # (times 2 since unicode and we want byte offset)
+                incr off [expr {2*($n+1)}]
+            }
+        }
+        4 {
+            if {$len < 4} {
+                error "Insufficient number of bytes to convert to integer."
+            }
+            return [list dword [Twapi_ReadMemory 0 $mem $off]]
+        }
+        5 {
+            if {$len < 4} {
+                error "Insufficient number of bytes to convert to big-endian integer."
+            }
+            set type "dword_big_endian"
+            set scanfmt "I"
+            set len 4
+        }
+        11 {
+            if {$len < 8} {
+                error "Insufficient number of bytes to convert to wide integer."
+            }
+            set type "qword"
+            set scanfmt "w"
+            set len 8
+        }
+        0 { set type "none" }
+        6 { set type "link" }
+        8 { set type "resource_list" }
+        3 { set type "binary" }
+        default {
+            error "Unsupported registry value type '$type'"
+        }
+    }
+
+    set val [Twapi_ReadMemory 1 $mem $off $len]
+    if {[info exists scanfmt]} {
+        if {[binary scan $val $scanfmt val] != 1} {
+            error "Could not convert from binary value using scan format $scanfmt"
+        }
+    }
+
+    return [list $type $val]
+}
+
+
+proc twapi::_log_timestamp {} {
+    return [clock format [clock seconds] -format "%a %T"]
+}
+
+
+# Helper for Net*Enum type functions taking a common set of arguments
+proc twapi::_net_enum_helper {function args} {
+    if {[llength $args] == 1} {
+        set args [lindex $args 0]
+    }
+
+    # -namelevel is used internally to indicate what level is to be used
+    # to retrieve names. -preargs and -postargs are used internally to
+    # add additional arguments at specific positions in the generic call.
+    array set opts [parseargs args {
+        {system.arg ""}
+        level.int
+        resume.int
+        filter.int
+        {namelevel.int 0}
+        {preargs.arg {}}
+        {postargs.arg {}}
+        {namefield.int 0}
+        fields.arg
+    } -maxleftover 0]
+
+    if {[info exists opts(level)]} {
+        set level $opts(level)
+        if {! [info exists opts(fields)]} {
+            badargs! "Option -fields must be specified if -level is specified"
+        }
+    } else {
+        set level $opts(namelevel)
+    }
+
+    # Note later we need to know if opts(resume) was specified so
+    # don't change this to just default -resume to 0 above
+    if {[info exists opts(resume)]} {
+        set resumehandle $opts(resume)
+    } else {
+        set resumehandle 0
+    }
+
+    set moredata 1
+    set result {}
+    while {$moredata} {
+        if {[info exists opts(filter)]} {
+            lassign  [$function $opts(system) {*}$opts(preargs) $level $opts(filter) {*}$opts(postargs) $resumehandle] moredata resumehandle totalentries entries
+        } else {
+            lassign [$function $opts(system) {*}$opts(preargs) $level {*}$opts(postargs) $resumehandle] moredata resumehandle totalentries entries
+        }
+        # If caller does not want all data in one lump stop here
+        if {[info exists opts(resume)]} {
+            if {[info exists opts(level)]} {
+                return [list $moredata $resumehandle $totalentries [list $opts(fields) $entries]]
+            } else {
+                # Return flat list of names
+                return [list $moredata $resumehandle $totalentries [lpick $entries $opts(namefield)]]
+            }
+        }
+
+        lappend result {*}$entries
+    }
+
+    # Return what we have. Format depend on caller options.
+    if {[info exists opts(level)]} {
+        return [list $opts(fields) $result]
+    } else {
+        return [lpick $result $opts(namefield)]
+    }
+}
+
+# If we are not being sourced from a executable resource, need to
+# source the remaining support files. In the former case, they are
+# automatically combined into one so the sourcing is not needed.
+if {![info exists twapi::twapi_base_rc_sourced]} {
+    apply {{filelist} {
+        set dir [file dirname [info script]]
+        foreach f $filelist {
+            uplevel #0 [list source [file join $dir $f]]
+        }
+    }} {base.tcl handle.tcl win.tcl adsi.tcl}
+}
+
+# Used in various matcher callbacks to signify always include etc.
+# TBD - document
+proc twapi::true {args} {
+    return true
+}
+
+
+namespace eval twapi {
+    # Get a handle to ourselves. This handle never need be closed
+    variable my_process_handle [GetCurrentProcess]
+}
+
+# Only used internally for test validation.
+# NOT the same as export_public_commands
+proc twapi::_get_public_commands {} {
+    variable exports;           # Populated via pkgIndex.tcl
+    if {[info exists exports]} {
+        return [concat {*}[dict values $exports]]
+    } else {
+        set cmds {}
+        foreach cmd [lsearch -regexp -inline -all [info commands [namespace current]::*] {::twapi::[a-z].*}] {
+            lappend cmds [namespace tail $cmd]
+        }
+        return $cmds
+    }
+}
+
+proc twapi::export_public_commands {} {
+    variable exports;           # Populated via pkgIndex.tcl
+    if {[info exists exports]} {
+        # Only export commands under twapi (e.g. not metoo)
+        dict for {ns cmds} $exports {
+            if {[regexp {^::twapi($|::)} $ns]} {
+                uplevel #0 [list namespace eval $ns [list namespace export {*}$cmds]
+] 
+            }
+        }
+    } else {
+        set cmds {}
+        foreach cmd [lsearch -regexp -inline -all [info commands [namespace current]::*] {::twapi::[a-z].*}] {
+            lappend cmds [namespace tail $cmd]
+        }
+        namespace eval [namespace current] "namespace export {*}$cmds"
+    }
+}
+
+proc twapi::import_commands {} {
+    export_public_commands
+    uplevel namespace import twapi::*
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/twapi472.dll b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/twapi472.dll
new file mode 100644
index 00000000..c423d73b
Binary files /dev/null and b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/twapi472.dll differ
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/twapi_entry.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/twapi_entry.tcl
new file mode 100644
index 00000000..a30dc5eb
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/twapi_entry.tcl
@@ -0,0 +1,11 @@
+# -*- tcl -*-
+namespace eval twapi {
+    variable version
+    set version(twapi)     4.7.2
+    variable patchlevel    4.7.2
+    variable package_name  twapi
+    variable dll_base_name twapi[string map {. {}} 4.7.2]
+    variable scriptdir     [file dirname [info script]]
+}
+
+source [file join $twapi::scriptdir twapi.tcl]
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/ui.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/ui.tcl
new file mode 100644
index 00000000..bfced989
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/ui.tcl
@@ -0,0 +1,1430 @@
+#
+# Copyright (c) 2003-2012 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# TBD - define a C function and way to implement window callback so
+# that SetWindowLong(GWL_WNDPROC) can be implemente
+#
+
+
+# TBD  - document the following class names
+#  SciCalc            CALC.EXE
+#  CalWndMain         CALENDAR.EXE
+#  Cardfile           CARDFILE.EXE
+#  Clipboard          CLIPBOARD.EXE
+#  Clock              CLOCK.EXE
+#  CtlPanelClass      CONTROL.EXE
+#  XLMain             EXCEL.EXE
+#  Session            MS-DOS.EXE
+#  Notepad            NOTEPAD.EXE
+#  pbParent           PBRUSH.EXE
+#  Pif                PIFEDIT.EXE
+#  PrintManager       PRINTMAN.EXE
+#  Progman            PROGMAN.EXE   (Windows Program Manager)
+#  Recorder           RECORDER.EXE
+#  Reversi            REVERSI.EXE
+#  #32770             SETUP.EXE
+#  Solitaire          SOL.EXE
+#  Terminal           TERMINAL.EXE
+#  WFS_Frame          WINFILE.EXE
+#  MW_WINHELP         WINHELP.EXE
+#  #32770             WINVER.EXE
+#  OpusApp            WINWORD.EXE
+#  MSWRITE_MENU       WRITE.EXE
+#  OMain  Microsoft Access
+#  XLMAIN  Microsoft Excel
+#  rctrl_renwnd32  Microsoft Outlook
+#  PP97FrameClass  Microsoft PowerPoint
+#  OpusApp  Microsoft Word
+
+namespace eval twapi {
+    struct POINT {LONG x;  LONG y;}
+    struct RECT { LONG left; LONG top; LONG right; LONG bottom; }
+    struct WINDOWPLACEMENT {
+        UINT   cbSize;
+        UINT   flags;
+        UINT  showCmd;
+        struct POINT ptMinPosition;
+        struct POINT ptMaxPosition;
+        struct RECT  rcNormalPosition;
+    }
+}
+
+proc twapi::get_window_placement {hwin} {
+    GetWindowPlacement $hwin [WINDOWPLACEMENT]
+}
+
+# Set the focus to the given window
+proc twapi::set_focus {hwin} {
+    return [_return_window [_attach_hwin_and_eval $hwin {SetFocus $hwin}]]
+}
+
+# Enumerate toplevel windows
+proc twapi::get_toplevel_windows {args} {
+
+    array set opts [parseargs args {
+        {pid.arg}
+        {pids.arg}
+    }]
+
+    set toplevels [twapi::EnumWindows]
+
+    if {[info exists opts(pids)]} {
+        set pids $opts(pids)
+    } elseif {[info exists opts(pid)]} {
+        set pids [list $opts(pid)]
+    } else {
+        return $toplevels
+    }
+
+    set process_toplevels [list ]
+    foreach toplevel $toplevels {
+        set pid [get_window_process $toplevel]
+        if {[lsearch -exact -integer $pids $pid] >= 0} {
+            lappend process_toplevels $toplevel
+        }
+    }
+
+    return $process_toplevels
+}
+
+
+# Find a window based on given criteria
+proc twapi::find_windows {args} {
+    # TBD - would incorporating FindWindowEx be faster
+    # TBD - apparently on Windows 8, you need to use FindWindowEx to
+    # get non-toplevel Metro windows
+
+    array set opts [parseargs args {
+        ancestor.arg
+        caption.bool
+        child.bool
+        class.arg
+        {match.arg string {string glob regexp}}
+        maximize.bool
+        maximizebox.bool
+        messageonlywindow.bool
+        minimize.bool
+        minimizebox.bool
+        overlapped.bool
+        pids.arg
+        popup.bool
+        single
+        style.arg
+        text.arg
+        toplevel.bool
+        visible.bool
+    } -maxleftover 0]
+
+    if {[info exists opts(style)]
+        ||[info exists opts(overlapped)]
+        || [info exists opts(popup)]
+        || [info exists opts(child)]
+        || [info exists opts(minimizebox)]
+        || [info exists opts(maximizebox)]
+        || [info exists opts(minimize)]
+        || [info exists opts(maximize)]
+        || [info exists opts(visible)]
+        || [info exists opts(caption)]
+    } {
+        set need_style 1
+    } else {
+        set need_style 0
+    }
+
+    # Figure out the type of match if -text specified
+    if {[info exists opts(text)]} {
+        switch -exact -- $opts(match) {
+            glob {
+                set text_compare [list string match -nocase $opts(text)]
+            }
+            string {
+                set text_compare [list string equal -nocase $opts(text)]
+            }
+            regexp {
+                set text_compare [list regexp -nocase $opts(text)]
+            }
+            default {
+                error "Invalid value '$opts(match)' specified for -match option"
+            }
+        }
+    }
+
+    # First build a list of potential candidates. There are two main
+    # categories we have to look at - ordinary windows and message-only
+    # windows. Normally, both are included. However, if -messageonlywindow
+    # is specified, then we only include the former or the latter
+    # depending on the value of the -messageonlywindow option
+
+    set include_ordinary true
+    if {[info exists opts(messageonlywindow)]} {
+        if {$opts(messageonlywindow)} {
+            if {[info exists opts(toplevel)] && $opts(toplevel)} {
+                error "Options -toplevel and -messageonlywindow cannot be both specified as true"
+            }
+            if {[info exists opts(text)]} {
+                # See bug 3213001
+                error "Option -text cannot be specified if -messageonlywindow is specified as true"
+            }
+            if {[info exists opts(ancestor)]} {
+                error "Option -ancestor cannot be specified if -messageonlywindow is specified as true"
+            }
+            set include_ordinary false
+        }
+        set include_messageonly $opts(messageonlywindow)
+    } else {
+        # -messageonlywindow not specified at all. Only include
+        # messageonly windows if toplevel is not specified as true
+        # Also, if opts(text) is specified, will never match messageonly
+        # so set it to false to we do not pick up messageonly windows
+        # (which will hang if we go looking for them with -text : see
+        # bug 3213001).
+        if {([info exists opts(toplevel)] && $opts(toplevel)) ||
+            [info exists opts(ancestor)] || [info exists opts(text)]
+        } {
+            set include_messageonly false
+        } else {
+            set include_messageonly true
+        }
+    }
+
+    if {$include_messageonly} {
+        set class ""
+        if {[info exists opts(class)]} {
+            set class $opts(class)
+        }
+        set text ""
+        if {[info exists opts(text)] &&
+            $opts(match) eq "string"} {
+            set text $opts(text)
+        }
+        set messageonly_candidates [_get_message_only_windows]
+    } else {
+        set messageonly_candidates [list ]
+    }
+
+    if {$include_ordinary} {
+        # TBD - make use of FindWindowEx function if possible
+
+        # If only interested in toplevels, just start from there
+        if {[info exists opts(toplevel)]} {
+            if {$opts(toplevel)} {
+                set ordinary_candidates [get_toplevel_windows]
+                if {[info exists opts(ancestor)]} {
+                    error "Option -ancestor may not be specified together with -toplevel true"
+                }
+            } else {
+                # We do not want windows to be toplevels. Remember list
+                # so we can check below.
+                set toplevels [get_toplevel_windows]
+            }
+        }
+
+        if {![info exists ordinary_candidates]} {
+            # -toplevel TRuE not specified.
+            # If ancestor is not specified, we start from the desktop window
+            # Note ancestor, if specified, is never included in the search
+            if {[info exists opts(ancestor)] && ![pointer_null? $opts(ancestor)]} {
+                set ordinary_candidates [get_descendent_windows $opts(ancestor)]
+            } else {
+                set desktop [get_desktop_window]
+                set ordinary_candidates [concat [list $desktop] [get_descendent_windows $desktop]]
+            }
+        }
+    } else {
+        set ordinary_candidates [list ]
+    }
+
+
+    set matches [list ]
+    foreach win [concat $messageonly_candidates $ordinary_candidates] {
+        # Why are we not using a trap here instead of catch ? TBD
+        set status [catch {
+            if {[info exists toplevels]} {
+                # We do NOT want toplevels
+                if {[lsearch -exact $toplevels $win] >= 0} {
+                    # This is toplevel, which we don't want
+                    continue
+                }
+            }
+
+            # TBD - what is the right order to check from a performance
+            # point of view
+
+            if {$need_style} {
+                set win_styles [get_window_style $win]
+                set win_style [lindex $win_styles 0]
+                set win_exstyle [lindex $win_styles 1]
+                set win_styles [lrange $win_styles 2 end]
+            }
+
+            if {[info exists opts(style)] && [llength $opts(style)]} {
+                lassign $opts(style)  style exstyle
+                if {[string length $style] && ($style != $win_style)} continue
+                if {[string length $exstyle] && ($exstyle != $win_exstyle)} continue
+            }
+
+            set match 1
+            foreach opt {visible overlapped popup child minimizebox
+                maximizebox minimize maximize caption
+            } {
+                if {[info exists opts($opt)]} {
+                    if {(! $opts($opt)) == ([lsearch -exact $win_styles $opt] >= 0)} {
+                        set match 0
+                        break
+                    }
+                }
+            }
+            if {! $match} continue
+
+            # TBD - should we use get_window_class or get_window_real_class
+            if {[info exists opts(class)] &&
+                [string compare -nocase $opts(class) [get_window_class $win]]} {
+                continue
+            }
+
+            if {[info exists opts(pids)]} {
+                set pid [get_window_process $win]
+                if {[lsearch -exact -integer $opts(pids) $pid] < 0} continue
+            }
+
+            if {[info exists opts(text)]} {
+                set text [get_window_text $win]
+                if {![eval $text_compare [list [get_window_text $win]]]} continue
+            }
+            # Matches all criteria. If we only want one, return it, else
+            # add to match list
+            if {$opts(single)} {
+                return $win
+            }
+            lappend matches $win
+        } result ]
+
+        switch -exact -- $status {
+            0 {
+                # No error, just keep going
+            }
+            1 {
+                # Error, see if error code is no window and if so, ignore
+                lassign $::errorCode subsystem code msg
+                if {$subsystem == "TWAPI_WIN32"} {
+                    # Window has disappeared so just do not include it
+                    # Cannot just actual code since many different codes
+                    # might be returned in this case
+                } else {
+                    error $result $::errorInfo $::errorCode
+                }
+            }
+            2 {
+                return $result;         # Block executed a return
+            }
+            3 {
+                break;                  # Block executed a break
+            }
+            4 {
+                continue;               # Block executed a continue
+            }
+        }
+    }
+
+    return $matches
+
+}
+
+
+# Return all descendent windows
+proc twapi::get_descendent_windows {parent_hwin} {
+    return [EnumChildWindows $parent_hwin]
+}
+
+# Return the parent window
+proc twapi::get_parent_window {hwin} {
+    # Note - we use GetAncestor and not GetParent because the latter
+    # will return the owner in the case of a toplevel window
+    # 1 -> GA_PARENT -> 1
+    return [_return_window [GetAncestor $hwin 1]]
+}
+
+# Return owner window
+proc twapi::get_owner_window {hwin} {
+    # GW_OWNER -> 4
+    return [_return_window [twapi::GetWindow $hwin 4]]
+}
+
+# Return immediate children of a window (not all children)
+proc twapi::get_child_windows {hwin} {
+    set children [list ]
+    # TBD - maybe get_first_child/get_next_child would be more efficient
+    foreach w [get_descendent_windows $hwin] {
+        if {[_same_window $hwin [get_parent_window $w]]} {
+            lappend children $w
+        }
+    }
+    return $children
+}
+
+# Return first child in z-order
+proc twapi::get_first_child {hwin} {
+    # GW_CHILD -> 5
+    return [_return_window [twapi::GetWindow $hwin 5]]
+}
+
+
+# Return the next sibling window in z-order
+proc twapi::get_next_sibling_window {hwin} {
+    # GW_HWNDNEXT -> 2
+    return [_return_window [twapi::GetWindow $hwin 2]]
+}
+
+# Return the previous sibling window in z-order
+proc twapi::get_prev_sibling_window {hwin} {
+    # GW_HWNDPREV -> 3
+    return [_return_window [twapi::GetWindow $hwin 3]]
+}
+
+# Return the sibling window that is highest in z-order
+proc twapi::get_first_sibling_window {hwin} {
+    # GW_HWNDFIRST -> 0
+    return [_return_window [twapi::GetWindow $hwin 0]]
+}
+
+# Return the sibling window that is lowest in z-order
+proc twapi::get_last_sibling_window {hwin} {
+    # GW_HWNDLAST -> 1
+    return [_return_window [twapi::GetWindow $hwin 1]]
+}
+
+# Return the desktop window
+proc twapi::get_desktop_window {} {
+    return [_return_window [twapi::GetDesktopWindow]]
+}
+
+# Return the shell window
+proc twapi::get_shell_window {} {
+    return [_return_window [twapi::GetShellWindow]]
+}
+
+# Return the pid for a window
+proc twapi::get_window_process {hwin} {
+    return [lindex [GetWindowThreadProcessId $hwin] 1]
+}
+
+# Return the thread for a window
+proc twapi::get_window_thread {hwin} {
+    return [lindex [GetWindowThreadProcessId $hwin] 0]
+}
+
+# Return the style of the window. Returns a list of two integers
+# the first contains the style bits, the second the extended style bits
+proc twapi::get_window_style {hwin} {
+    # GWL_STYLE -> -16, GWL_EXSTYLE -20
+    set style   [GetWindowLongPtr $hwin -16]
+    set exstyle [GetWindowLongPtr $hwin -20]
+    return [concat [list $style $exstyle] [_style_mask_to_symbols $style $exstyle]]
+}
+
+
+# Set the style of the window. Returns a list of two integers
+# the first contains the original style bits, the second the
+# original extended style bits
+proc twapi::set_window_style {hwin style exstyle} {
+    # GWL_STYLE -> -16, GWL_EXSTYLE -20
+    set style [SetWindowLongPtr $hwin -16 $style]
+    set exstyle [SetWindowLongPtr $hwin -20 $exstyle]
+
+    redraw_window_frame $hwin
+    return
+}
+
+
+# Return the class of the window
+proc twapi::get_window_class {hwin} {
+    return [GetClassName $hwin]
+}
+
+# Return the real class of the window
+proc twapi::get_window_real_class {hwin} {
+    return [RealGetWindowClass $hwin]
+}
+
+# Return the identifier corrpsonding to the application instance
+proc twapi::get_window_application {hwin} {
+    # GWL_HINSTANCE -> -6
+    return [GetWindowLongPtr $hwin -6]
+}
+
+# Return the window id (this is different from the handle!)
+proc twapi::get_window_id {hwin} {
+    # GWL_ID -> -12
+    return [GetWindowLongPtr $hwin -12]
+}
+
+# Return the user data associated with a window
+proc twapi::get_window_userdata {hwin} {
+    # GWL_USERDATA -> -21
+    return [GetWindowLongPtr $hwin -21]
+}
+
+
+# Get the foreground window
+proc twapi::get_foreground_window {} {
+    return [_return_window [GetForegroundWindow]]
+}
+
+# Set the foreground window - returns 1/0 on success/fail
+proc twapi::set_foreground_window {hwin} {
+    return [SetForegroundWindow $hwin]
+}
+
+
+# Activate a window - this is only brought the foreground if its application
+# is in the foreground
+proc twapi::set_active_window_for_thread {hwin} {
+    return [_return_window [_attach_hwin_and_eval $hwin {SetActiveWindow $hwin}]]
+}
+
+# Get active window for an application
+proc twapi::get_active_window_for_thread {tid} {
+    return [_return_window [_get_gui_thread_info $tid hwndActive]]
+}
+
+
+# Get focus window for an application
+proc twapi::get_focus_window_for_thread {tid} {
+    return [_get_gui_thread_info $tid hwndFocus]
+}
+
+# Get active window for current thread
+proc twapi::get_active_window_for_current_thread {} {
+    return [_return_window [GetActiveWindow]]
+}
+
+# Update the frame - needs to be called after setting certain style bits
+proc twapi::redraw_window_frame {hwin} {
+    # 0x4037 -> SWP_ASYNCWINDOWPOS | SWP_NOACTIVATE |
+    #    SWP_NOMOVE | SWP_NOSIZE |
+    #    SWP_NOZORDER | SWP_FRAMECHANGED
+    SetWindowPos $hwin 0 0 0 0 0 0x4037
+}
+
+# Redraw the window
+proc twapi::redraw_window {hwin {opt ""}} {
+    if {[string length $opt]} {
+        if {[string compare $opt "-force"]} {
+            error "Invalid option '$opt'"
+        }
+        invalidate_screen_region -hwin $hwin -rect [list ] -bgerase
+    }
+
+    UpdateWindow $hwin
+    return
+}
+
+# Set the window position
+proc twapi::move_window {hwin x y args} {
+    array set opts [parseargs args {
+        {sync}
+    }]
+
+    # Not using MoveWindow because that will require knowing the width
+    # and height (or retrieving it)
+    # 0x15 -> SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER
+    set flags 0x15
+    if {! $opts(sync)} {
+        setbits flags 0x4000; # SWP_ASYNCWINDOWPOS
+    }
+    SetWindowPos $hwin 0 $x $y 0 0 $flags
+}
+
+# Resize window
+proc twapi::resize_window {hwin w h args} {
+    array set opts [parseargs args {
+        {sync}
+    }]
+
+
+    # Not using MoveWindow because that will require knowing the x and y pos
+    # (or retrieving them)
+    # 0x16 -> SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER
+    set flags 0x16
+    if {! $opts(sync)} {
+        setbits flags 0x4000; # SWP_ASYNCWINDOWPOS
+    }
+    SetWindowPos $hwin 0 0 0 $w $h $flags
+}
+
+# Sets the window's z-order position
+# pos is either window handle or a symbol
+proc twapi::set_window_zorder {hwin pos} {
+    switch -exact -- $pos {
+        top       {
+            set pos [pointer_from_address 0 HWND];          #HWND_TOP
+        }
+        bottom    {
+            set pos [pointer_from_address 1 HWND];          #HWND_BOTTOM
+        }   
+        toplayer   {
+            set pos [pointer_from_address -1 HWND];         #HWND_TOPMOST
+        }
+        bottomlayer {
+            set pos [pointer_from_address -2 HWND];         #HWND_NOTOPMOST
+        }
+    }
+
+    # 0x4013 -> SWP_ASYNCWINDOWPOS|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE
+    SetWindowPos $hwin $pos 0 0 0 0 0x4013
+}
+
+
+# Show the given window. Returns 1 if window was previously visible, else 0
+proc twapi::show_window {hwin args} {
+    array set opts [parseargs args {sync activate normal startup}]
+
+    set show 0
+    if {$opts(startup)} {
+        set show 10; #SW_SHOWDEFAULT
+    } else {
+        if {$opts(activate)} {
+            if {$opts(normal)} {
+                set show 1; #SW_SHOWNORMAL
+            } else {
+                set show 5; #SW_SHOW
+            }
+        } else {
+            if {$opts(normal)} {
+                set show 4; #SW_SHOWNOACTIVATE
+            } else {
+                set show 8; #SW_SHOWNA
+            }
+        }
+    }
+
+    _show_window $hwin $show $opts(sync)
+}
+
+# Hide the given window. Returns 1 if window was previously visible, else 0
+proc twapi::hide_window {hwin args} {
+    array set opts [parseargs args {sync}]
+    _show_window $hwin 0 $opts(sync); # 0 -> SW_HIDE
+}
+
+# Restore the given window. Returns 1 if window was previously visible, else 0
+proc twapi::restore_window {hwin args} {
+    array set opts [parseargs args {sync activate}]
+    if {$opts(activate)} {
+        _show_window $hwin 9 $opts(sync); # 9 -> SW_RESTORE
+    } else {
+        OpenIcon $hwin
+    }
+}
+
+# Maximize the given window. Returns 1 if window was previously visible, else 0
+proc twapi::maximize_window {hwin args} {
+    array set opts [parseargs args {sync}]
+    _show_window $hwin 3 $opts(sync); # 3 -> SW_SHOWMAXIMIZED
+}
+
+
+# Minimize the given window. Returns 1 if window was previously visible, else 0
+proc twapi::minimize_window {hwin args} {
+    array set opts [parseargs args {sync activate shownext}]
+
+    # TBD - when should we use SW_FORCEMINIMIZE ?
+    # TBD - do we need to attach to the window's thread?
+    # TBD - when should we use CloseWindow instead?
+
+    if $opts(activate) {
+        set show 2; #SW_SHOWMINIMIZED
+    } else {
+        if {$opts(shownext)} {
+            set show 6; #SW_MINIMIZE
+        } else {
+            set show 7; #SW_SHOWMINNOACTIVE
+        }
+    }
+
+    _show_window $hwin $show $opts(sync)
+}
+
+
+# Hides popup windows
+proc twapi::hide_owned_popups {hwin} {
+    ShowOwnedPopups $hwin 0
+}
+
+# Show hidden popup windows
+proc twapi::show_owned_popups {hwin} {
+    ShowOwnedPopups $hwin 1
+}
+
+# Close a window
+proc twapi::close_window {hwin args} {
+    array set opts [parseargs args {
+        block
+        {wait.int 10}
+    } -maxleftover 0]
+
+    if {0} {
+        Cannot close Explorer windows using SendMessage*
+        if {$opts(block)} {
+            set block 3; #SMTO_BLOCK|SMTO_ABORTIFHUNG
+        } else {
+            set block 2; #SMTO_NORMAL|SMTO_ABORTIFHUNG
+        }
+
+        # WM_CLOSE -> 0x10
+        if {[catch {SendMessageTimeout $hwin 0x10 0 0 $block $opts(wait)} msg]} {
+            # Do no treat timeout as an error
+            set erCode $::errorCode
+            set erInfo $::errorInfo
+            if {[lindex $erCode 0] != "TWAPI_WIN32" ||
+                ([lindex $erCode 1] != 0 && [lindex $erCode 1] != 1460)} {
+                error $msg $erInfo $erCode
+            }
+        }
+    } else {
+        # Implement using PostMessage since that allows closing of
+        # Explorer windows
+
+        # Note - opts(block) is ignored here
+
+        # 0x10 -> WM_CLOSE
+        PostMessage $hwin 0x10 0 0
+        if {$opts(wait)} {
+            wait [list ::twapi::window_exists $hwin] 0 $opts(wait)
+        }
+    }
+    return [twapi::window_exists $hwin]
+}
+
+# CHeck if window is minimized
+proc twapi::window_minimized {hwin} {
+    return [IsIconic $hwin]
+}
+
+# CHeck if window is maximized
+proc twapi::window_maximized {hwin} {
+    return [IsZoomed $hwin]
+}
+
+# Check if window is visible
+proc twapi::window_visible {hwin} {
+    return [IsWindowVisible $hwin]
+}
+
+# Check if a window exists
+proc twapi::window_exists {hwin} {
+    return [IsWindow $hwin]
+}
+
+# CHeck if window input is enabled
+proc twapi::window_unicode_enabled {hwin} {
+    return [IsWindowUnicode $hwin]
+}
+
+# Check if child is a child of parent
+proc twapi::window_is_child {parent child} {
+    return [IsChild $parent $child]
+}
+
+# Flash the given window
+proc twapi::flash_window_caption {hwin args} {
+    array set opts [parseargs args {toggle}]
+
+    return [FlashWindow $hwin $opts(toggle)]
+}
+
+# FlashWindow not in binary any more, emulate it
+proc twapi::FlashWindow {hwin toggle} {
+    FlashWindowEx [list $hwin 1 $toggle 0]
+}
+
+# Flash the given window and/or the taskbar icon
+proc twapi::flash_window {hwin args} {
+    array set opts [parseargs args {
+        period.int
+        count.int
+        nocaption
+        notaskbar
+        start
+        stop
+        untilforeground
+    } -maxleftover 0 -nulldefault]
+
+    set flags 0
+
+    if {! $opts(stop)} {
+        # Flash title bar?
+        if {! $opts(nocaption)} {
+            incr flags 1;           # FLASHW_CAPTION
+        }
+
+        # Flash taskbar icon ?
+        if {! $opts(notaskbar)} {
+            incr flags 2;           # FLASHW_TRAY
+        }
+
+        # Continuous modes ?
+        if {$opts(untilforeground)} {
+            # Continuous until foreground window
+            # NOTE : FLASHW_TIMERNOFG is no implemented because it seems to be
+            # broken - it only flashes once, at least on Windows XP. Keep
+            # it in case other platforms work correctly.
+            incr flags 0xc;         # FLASHW_TIMERNOFG
+        } elseif {$opts(start)} {
+            # Continuous until stopped
+            incr flags 4;           # FLASHW_TIMER
+        } elseif {$opts(count) == 0} {
+            set opts(count) 1
+        }
+    }
+
+    return [FlashWindowEx [list $hwin $flags $opts(count) $opts(period)]]
+}
+
+
+# Show/hide window caption buttons. hwin must be a toplevel
+proc twapi::configure_window_titlebar {hwin args} {
+
+    array set opts [parseargs args {
+        visible.bool
+        sysmenu.bool
+        minimizebox.bool
+        maximizebox.bool
+        contexthelp.bool
+    } -maxleftover 0]
+
+    # Get the current style setting
+    lassign [get_window_style $hwin] style exstyle
+
+    # See if each option is specified. Else use current setting
+    # 0x00080000 -> WS_SYSMENU
+    # 0x00020000 -> WS_MINIMIZEBOX
+    # 0x00010000 -> WS_MAXIMIZEBOX
+    # 0x00C00000 -> WS_CAPTION
+    foreach {opt def} {
+        sysmenu     0x00080000
+        minimizebox 0x00020000
+        maximizebox 0x00010000
+        visible     0x00C00000
+    } {
+        if {[info exists opts($opt)]} {
+            set $opt [expr {$opts($opt) ? $def : 0}]
+        } else {
+            set $opt [expr {$style & $def}]
+        }
+    }
+
+    # Ditto for extended style and context help
+    if {[info exists opts(contexthelp)]} {
+        # WS_EX_CONTEXTHELP -> 0x00000400
+        set contexthelp [expr {$opts(contexthelp) ? 0x00000400 : 0}]
+    } else {
+        set contexthelp [expr {$exstyle & 0x00000400}]
+    }
+
+    # The min/max/help buttons all depend on sysmenu being set.
+    if {($minimizebox || $maximizebox || $contexthelp) && ! $sysmenu} {
+        # Don't bother raising error, since the underlying API allows it
+        #error "Cannot enable minimize, maximize and context help buttons unless system menu is present"
+    }
+
+    # Reset existing sysmenu,minimizebox,maximizebox,caption
+    set style [expr {$style & 0xff34ffff}]
+    ; # Add back new settings
+    set style [expr {$style | $sysmenu | $minimizebox | $maximizebox | $visible}]
+
+    # Reset contexthelp and add new setting back
+    set exstyle [expr {$exstyle & 0xfffffbff}]
+    set exstyle [expr {$exstyle | $contexthelp}]
+
+    set_window_style $hwin $style $exstyle
+}
+
+# Arrange window icons
+proc twapi::arrange_icons {{hwin ""}} {
+    if {$hwin == ""} {
+        set hwin [get_desktop_window]
+    }
+    ArrangeIconicWindows $hwin
+}
+
+# Get the window text/caption
+proc twapi::get_window_text {hwin} {
+    # TBD - see https://devblogs.microsoft.com/oldnewthing/20030821-00/?p=42833
+    twapi::GetWindowText $hwin
+}
+
+# Set the window text/caption
+proc twapi::set_window_text {hwin text} {
+    twapi::SetWindowText $hwin $text
+}
+
+# Get size of client area
+proc twapi::get_window_client_area_size {hwin} {
+    return [lrange [GetClientRect $hwin] 2 3]
+}
+
+# Get window coordinates
+proc twapi::get_window_coordinates {hwin} {
+    return [GetWindowRect $hwin]
+}
+
+# Get the window under the point
+proc twapi::get_window_at_location {x y} {
+    return [WindowFromPoint [list $x $y]]
+}
+
+# Marks a screen region as invalid forcing a redraw
+proc twapi::invalidate_screen_region {args} {
+    array set opts [parseargs args {
+        {hwin.arg 0}
+        rect.arg
+        bgerase
+    } -nulldefault -maxleftover 0]
+
+    InvalidateRect $opts(hwin) $opts(rect) $opts(bgerase)
+}
+
+# Get the caret blink time
+proc twapi::get_caret_blink_time {} {
+    return [GetCaretBlinkTime]
+}
+
+# Set the caret blink time
+proc twapi::set_caret_blink_time {ms} {
+    return [SetCaretBlinkTime $ms]
+}
+
+# Hide the caret
+proc twapi::hide_caret {} {
+    HideCaret 0
+}
+
+# Show the caret
+proc twapi::show_caret {} {
+    ShowCaret 0
+}
+
+# Get the caret position
+proc twapi::get_caret_location {} {
+    return [GetCaretPos]
+}
+
+# Get the caret position
+proc twapi::set_caret_location {point} {
+    return [SetCaretPos [lindex $point 0] [lindex $point 1]]
+}
+
+
+# Get display size
+proc twapi::get_display_size {} {
+    return [lrange [get_window_coordinates [get_desktop_window]] 2 3]
+}
+
+
+# Get path to the desktop wallpaper
+interp alias {} twapi::get_desktop_wallpaper {} twapi::get_system_parameters_info SPI_GETDESKWALLPAPER
+
+
+# Set desktop wallpaper
+proc twapi::set_desktop_wallpaper {path args} {
+
+    array set opts [parseargs args {
+        persist
+    }]
+
+    if {$opts(persist)} {
+        set flags 3;                    # Notify all windows + persist
+    } else {
+        set flags 2;                    # Notify all windows
+    }
+
+    if {$path == "default"} {
+        SystemParametersInfo 0x14 0 NULL 0
+        return
+    }
+
+    if {$path == "none"} {
+        set path ""
+    }
+
+    set mem_size [expr {2 * ([string length $path] + 1)}]
+    set mem [malloc $mem_size]
+    trap {
+        twapi::Twapi_WriteMemory 3 $mem 0 $mem_size $path
+        SystemParametersInfo 0x14 0 $mem $flags
+    } finally {
+        free $mem
+    }
+}
+
+# Get desktop work area
+interp alias {} twapi::get_desktop_workarea {} twapi::get_system_parameters_info SPI_GETWORKAREA
+
+
+
+# Get the color depth of the display
+proc twapi::get_color_depth {{hwin 0}} {
+    set h [GetDC $hwin]
+    trap {
+        return [GetDeviceCaps $h 12]
+    } finally {
+        ReleaseDC $hwin $h
+    }
+}
+
+
+# Enumerate the display adapters in a system
+proc twapi::get_display_devices {} {
+    set devs [list ]
+    for {set i 0} {true} {incr i} {
+        trap {
+            set dev [EnumDisplayDevices "" $i 0]
+        } onerror {TWAPI_WIN32} {
+            # We don't check for a specific error since experimentation
+            # shows the error code returned at the end of enumeration
+            # is not fixed - can be 2, 18, 87 and maybe others
+            break
+        }
+        lappend devs [_format_display_device $dev]
+    }
+
+    return $devs
+}
+
+# Enumerate the display monitors for an display device
+proc twapi::get_display_monitors {args} {
+    array set opts [parseargs args {
+        device.arg
+        activeonly
+    } -maxleftover 0]
+
+    if {[info exists opts(device)]} {
+        set devs [list $opts(device)]
+    } else {
+        set devs [list ]
+        foreach dev [get_display_devices] {
+            lappend devs [kl_get $dev -name]
+        }
+    }
+
+    set monitors [list ]
+    foreach dev $devs {
+        for {set i 0} {true} {incr i} {
+            trap {
+                set monitor [EnumDisplayDevices $dev $i 0]
+            } onerror {} {
+                # We don't check for a specific error since experimentation
+                # shows the error code returned at the end of enumeration
+                # is not fixed - can be 2, 18, 87 and maybe others
+                break
+            }
+            if {(! $opts(activeonly)) ||
+                ([lindex $monitor 2] & 1)} {
+                lappend monitors [_format_display_monitor $monitor]
+            }
+        }
+    }
+
+    return $monitors
+}
+
+# Return the monitor corresponding to a window
+proc twapi::get_display_monitor_from_window {hwin args} {
+    array set opts [parseargs args {
+        default.arg
+    } -maxleftover 0]
+
+    # hwin may be a window id or a Tk window. On error we assume it is
+    # a window id
+    catch {
+        set hwin [pointer_from_address [winfo id $hwin] HWND]
+    }
+
+    set flags 0
+    if {[info exists opts(default)]} {
+        switch -exact -- $opts(default) {
+            primary { set flags 1 }
+            nearest { set flags 2 }
+            default { error "Invalid value '$opts(default)' for -default option" }
+        }
+    }
+
+    trap {
+        return [MonitorFromWindow $hwin $flags]
+    } onerror {TWAPI_WIN32 0} {
+        win32_error 1461 "Window does not map to a monitor."
+    }
+}
+
+# Return the monitor corresponding to a screen cocordinates
+proc twapi::get_display_monitor_from_point {x y args} {
+    array set opts [parseargs args {
+        default.arg
+    } -maxleftover 0]
+
+    set flags 0
+    if {[info exists opts(default)]} {
+        switch -exact -- $opts(default) {
+            primary { set flags 1 }
+            nearest { set flags 2 }
+            default { error "Invalid value '$opts(default)' for -default option" }
+        }
+    }
+
+    trap {
+        return [MonitorFromPoint [list $x $y] $flags]
+    } onerror {TWAPI_WIN32 0} {
+        win32_error 1461 "Virtual screen coordinates ($x,$y) do not map to a monitor."
+    }
+}
+
+
+# Return the monitor corresponding to a screen rectangle
+proc twapi::get_display_monitor_from_rect {rect args} {
+    array set opts [parseargs args {
+        default.arg
+    } -maxleftover 0]
+
+    set flags 0
+    if {[info exists opts(default)]} {
+        switch -exact -- $opts(default) {
+            primary { set flags 1 }
+            nearest { set flags 2 }
+            default { error "Invalid value '$opts(default)' for -default option" }
+        }
+    }
+
+    trap {
+        return [MonitorFromRect $rect $flags]
+    } onerror {TWAPI_WIN32 0} {
+        win32_error 1461 "Virtual screen rectangle <[join $rect ,]> does not map to a monitor."
+    }
+}
+
+proc twapi::get_display_monitor_info {hmon} {
+    return [_format_monitor_info [GetMonitorInfo $hmon]]
+}
+
+proc twapi::get_multiple_display_monitor_info {} {
+    set result [list ]
+    foreach elem [EnumDisplayMonitors NULL ""] {
+        lappend result [get_display_monitor_info [lindex $elem 0]]
+    }
+    return $result
+}
+
+
+proc twapi::tkpath_to_hwnd {tkpath} {
+    return [cast_handle [winfo id $tkpath] HWND]
+}
+
+# TBD - document
+proc twapi::high_contrast_on {} {
+    set hc [lindex [get_system_parameters_info SPI_GETHIGHCONTRAST] 1]
+    return [expr {$hc & 1}]
+}
+
+################################################################
+# Utility routines
+
+# Helper function to wrap GetGUIThreadInfo
+# Returns the value of the given fields. If a single field is requested,
+# returns it as a scalar else returns a flat list of FIELD VALUE pairs
+proc twapi::_get_gui_thread_info {tid args} {
+    array set gtinfo [GetGUIThreadInfo $tid]
+    set result [list ]
+    foreach field $args {
+        set value $gtinfo($field)
+        switch -exact -- $field {
+            cbSize { }
+            rcCaret {
+                set value [list $value(left) \
+                               $value(top) \
+                               $value(right) \
+                               $value(bottom)]
+            }
+        }
+        lappend result $value
+    }
+
+    if {[llength $args] == 1} {
+        return [lindex $result 0]
+    } else {
+        return $result
+    }
+}
+
+
+# if $hwin corresponds to a null window handle, returns an empty string
+proc twapi::_return_window {hwin} {
+    if {[pointer_null? $hwin HWND]} {
+        return $twapi::null_hwin
+    }
+    return $hwin
+}
+
+# Return 1 if same window
+proc twapi::_same_window {hwin1 hwin2} {
+    # If either is a empty/null handle, no match, even if both empty/null
+    if {[string length $hwin1] == 0 || [string length $hwin2] == 0} {
+        return 0
+    }
+    if {[pointer_null? $hwin1] || [pointer_null? $hwin2]} {
+        return 0
+    }
+
+    # Need integer compare
+    return [pointer_equal? $hwin1 $hwin2]
+}
+
+# Helper function for showing/hiding windows
+proc twapi::_show_window {hwin cmd {wait 0}} {
+    # If either our thread owns the window or we want to wait for it to
+    # process the command, use the synchrnous form of the function
+    if {$wait || ([get_window_thread $hwin] == [GetCurrentThreadId])} {
+        ShowWindow $hwin $cmd
+    } else {
+        ShowWindowAsync $hwin $cmd
+    }
+}
+
+
+
+# Map style bits to a style symbol list
+proc twapi::_style_mask_to_symbols {style exstyle} {
+    set attrs [list ]
+    if {$style & 0x80000000} {
+        lappend attrs popup
+        if {$style & 0x00020000} { lappend attrs group }
+        if {$style & 0x00010000} { lappend attrs tabstop }
+    } else {
+        if {$style & 0x40000000} {
+            lappend attrs child
+        } else {
+            lappend attrs overlapped
+        }
+        if {$style & 0x00020000} { lappend attrs minimizebox }
+        if {$style & 0x00010000} { lappend attrs maximizebox }
+    }
+
+    # Note WS_BORDER, WS_DLGFRAME and WS_CAPTION use same bits
+    if {$style & 0x00C00000} {
+        lappend attrs caption
+    } else {
+        if {$style & 0x00800000} { lappend attrs border }
+        if {$style & 0x00400000} { lappend attrs dlgframe }
+    }
+
+    foreach {sym mask} {
+        minimize 0x20000000
+        visible 0x10000000
+        disabled 0x08000000
+        clipsiblings 0x04000000
+        clipchildren 0x02000000
+        maximize 0x01000000
+        vscroll 0x00200000
+        hscroll 0x00100000
+        sysmenu 0x00080000
+        thickframe 0x00040000
+    } {
+        if {$style & $mask} {
+            lappend attrs $sym
+        }
+    }
+
+    if {$exstyle & 0x00001000} {
+        lappend attrs right
+    } else {
+        lappend attrs left
+    }
+    if {$exstyle & 0x00002000} {
+        lappend attrs rtlreading
+    } else {
+        lappend attrs ltrreading
+    }
+    if {$exstyle & 0x00004000} {
+        lappend attrs leftscrollbar
+    } else {
+        lappend attrs rightscrollbar
+    }
+
+    foreach {sym mask} {
+        dlgmodalframe 0x00000001
+        noparentnotify 0x00000004
+        topmost 0x00000008
+        acceptfiles 0x00000010
+        transparent 0x00000020
+        mdichild 0x00000040
+        toolwindow 0x00000080
+        windowedge 0x00000100
+        clientedge 0x00000200
+        contexthelp 0x00000400
+        controlparent 0x00010000
+        staticedge 0x00020000
+        appwindow 0x00040000
+    } {
+        if {$exstyle & $mask} {
+            lappend attrs $sym
+        }
+    }
+
+    return $attrs
+}
+
+
+# Test proc for displaying all colors for a class
+proc twapi::_show_theme_colors {class part {state ""}} {
+    set w [toplevel .themetest$class$part$state]
+
+    set h [OpenThemeData [tkpath_to_hwnd $w] $class]
+    wm title $w "$class Colors"
+
+    label $w.title -text "$class, $part, $state" -bg white
+    grid $w.title -
+
+    if {![string is integer -strict $part]} {
+        set part [TwapiGetThemeDefine $part]
+    }
+
+    if {![string is integer -strict $state]} {
+        set state [TwapiGetThemeDefine $state]
+    }
+
+    foreach x {BORDERCOLOR FILLCOLOR TEXTCOLOR EDGELIGHTCOLOR EDGESHADOWCOLOR EDGEFILLCOLOR TRANSPARENTCOLOR GRADIENTCOLOR1 GRADIENTCOLOR2 GRADIENTCOLOR3 GRADIENTCOLOR4 GRADIENTCOLOR5 SHADOWCOLOR GLOWCOLOR TEXTBORDERCOLOR TEXTSHADOWCOLOR GLYPHTEXTCOLOR FILLCOLORHINT BORDERCOLORHINT ACCENTCOLORHINT BLENDCOLOR} {
+        set prop [TwapiGetThemeDefine TMT_$x]
+        if {![catch {GetThemeColor $h $part $state $prop} color]} {
+            label $w.l-$x -text $x
+            label $w.c-$x -text $color -bg $color
+            grid $w.l-$x $w.c-$x
+        } else {
+            label $w.l-$x -text $x
+            label $w.c-$x -text "Not defined"
+            grid $w.l-$x $w.c-$x
+        }
+    }
+    CloseThemeData $h
+}
+
+# Test proc for displaying all sys colors for a class
+# class might be "WINDOW"
+proc twapi::_show_theme_syscolors {class} {
+    destroy .themetest$class
+    set w [toplevel .themetest$class]
+
+    set h [OpenThemeData [tkpath_to_hwnd $w] $class]
+    wm title $w "$class SysColors"
+
+    label $w.title -text "$class" -bg white
+    grid $w.title -
+
+
+    for {set x 0} {$x <= 30} {incr x} {
+        if {![catch {GetThemeSysColor $h $x} color]} {
+            set color #[format %6.6x $color]
+            label $w.l-$x -text $x
+            label $w.c-$x -text $color -bg $color
+            grid $w.l-$x $w.c-$x
+        } else {
+            label $w.l-$x -text $x
+            label $w.c-$x -text "Not defined"
+            grid $w.l-$x $w.c-$x
+        }
+    }
+    CloseThemeData $h
+}
+
+# Test proc for displaying all fonts for a class
+proc twapi::_show_theme_fonts {class part {state ""}} {
+    set w [toplevel .themetest$class$part$state]
+
+    set h [OpenThemeData [tkpath_to_hwnd $w] $class]
+    wm title $w "$class fonts"
+
+    label $w.title -text "$class, $part, $state" -bg white
+    grid $w.title -
+
+    set part [TwapiGetThemeDefine $part]
+    set state [TwapiGetThemeDefine $state]
+
+    foreach x {GLYPHTYPE FONT} {
+        set prop [TwapiGetThemeDefine TMT_$x]
+        if {![catch {GetThemeFont $h NULL $part $state $prop} font]} {
+            label $w.l-$x -text $x
+            label $w.c-$x -text $font
+            grid $w.l-$x $w.c-$x
+        }
+    }
+    CloseThemeData $h
+}
+
+
+
+# Formats a display device as returned by C into a keyed list
+proc twapi::_format_display_device {dev} {
+
+    # Field names - SAME ORDER AS IN $dev!!
+    set fields {-name -description -flags -id -key}
+
+    set flags [lindex $dev 2]
+    foreach {opt flag} {
+        desktop         0x00000001
+        multidriver     0x00000002
+        primary         0x00000004
+        mirroring       0x00000008
+        vgacompatible   0x00000010
+        removable       0x00000020
+        modespruned         0x08000000
+        remote              0x04000000
+        disconnect          0x02000000
+    } {
+        lappend fields -$opt
+        lappend dev [expr { $flags & $flag ? true : false }]
+    }
+
+    return [kl_create2 $fields $dev]
+}
+
+# Formats a display monitor as returned by C into a keyed list
+proc twapi::_format_display_monitor {dev} {
+
+    # Field names - SAME ORDER AS IN $dev!!
+    set fields {-name -description -flags -id -key}
+
+    set flags [lindex $dev 2]
+    foreach {opt flag} {
+        active         0x00000001
+        attached       0x00000002
+    } {
+        lappend fields -$opt
+        lappend dev [expr { $flags & $flag ? true : false }]
+    }
+
+    return [kl_create2 $fields $dev]
+}
+
+# Format a monitor info struct
+proc twapi::_format_monitor_info {hmon} {
+    return [kl_create2 {-extent -workarea -primary -name} $hmon]
+}
+
+# Get message-only windows
+proc twapi::_get_message_only_windows {} {
+
+    set wins [list ]
+    set prev 0
+    # -3 -> HWND_MESSAGE windows
+
+    while true {
+        set win [FindWindowEx [list -3 HWND] $prev "" ""]
+        if {[pointer_null? $win]} break
+        lappend wins $win
+        set prev $win
+    }
+
+    return $wins
+}
+
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/win.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/win.tcl
new file mode 100644
index 00000000..d0b62170
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/win.tcl
@@ -0,0 +1,131 @@
+#
+# Copyright (c) 2012 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# Contains common windowing and notification infrastructure
+
+namespace eval twapi {
+    variable null_hwin ""
+
+    # Windows messages that are directly accessible from script. These
+    # are handled by the default notifications window and passed to
+    # the twapi::_script_wm_handler. These messages must be in the
+    # range (1056 = 1024+32) - (1024+32+31) (see twapi_wm.h)
+    variable _wm_script_msgs
+    array set _wm_script_msgs {
+        TASKBAR_RESTART      1031
+        NOTIFY_ICON_CALLBACK 1056
+    }
+    proc _get_script_wm {tok} {
+        variable _wm_script_msgs
+        return $_wm_script_msgs($tok)
+    }
+}
+
+# Backward compatibility aliases
+interp alias {} twapi::GetWindowLong {} twapi::GetWindowLongPtr
+interp alias {} twapi::SetWindowLong {} twapi::SetWindowLongPtr
+
+# Return the long value at the given index
+# This is a raw function, and should generally be used only to get
+# non-system defined indices
+proc twapi::get_window_long {hwin index} {
+    return [GetWindowLongPtr $hwin $index]
+}
+
+# Set the long value at the given index and return the previous value
+# This is a raw function, and should generally be used only to get
+# non-system defined indices
+proc twapi::set_window_long {hwin index val} {
+    set oldval [SetWindowLongPtr $hwin $index $val]
+}
+
+# Set the user data associated with a window. Returns the previous value
+proc twapi::set_window_userdata {hwin val} {
+    # GWL_USERDATA -> -21
+    return [SetWindowLongPtr $hwin -21 $val]
+}
+
+# Attaches to the thread queue of the thread owning $hwin and executes
+# script in the caller's scope
+proc twapi::_attach_hwin_and_eval {hwin script} {
+    set me [GetCurrentThreadId]
+    set hwin_tid [lindex [GetWindowThreadProcessId $hwin] 0]
+    if {$hwin_tid == 0} {
+        error "Window $hwin does not exist or could not get its thread owner"
+    }
+
+    # Cannot (and no need to) attach to oneself so just exec script directly
+    if {$me == $hwin_tid} {
+        return [uplevel 1 $script]
+    }
+
+    trap {
+        if {![AttachThreadInput $me $hwin_tid 1]} {
+            error "Could not attach to thread input for window $hwin"
+        }
+        set result [uplevel 1 $script]
+    } finally {
+        AttachThreadInput $me $hwin_tid 0
+    }
+
+    return $result
+}
+
+proc twapi::_register_script_wm_handler {msg cmdprefix {overwrite 0}} {
+    variable _wm_registrations
+
+    # Ensure notification window exists
+    twapi::Twapi_GetNotificationWindow
+
+    # The incr ensures decimal format
+    # The lrange ensure proper list format
+    if {$overwrite} {
+        set _wm_registrations([incr msg 0]) [list [lrange $cmdprefix 0 end]]
+    } else {
+        lappend _wm_registrations([incr msg 0]) [lrange $cmdprefix 0 end]
+    }
+}
+
+proc twapi::_unregister_script_wm_handler {msg cmdprefix} {
+    variable _wm_registrations
+
+    # The incr ensures decimal format
+    incr msg 0
+    # The lrange ensure proper list format
+    if {[info exists _wm_registrations($msg)]} {
+        set _wm_registrations($msg) [lsearch -exact -inline -not -all $_wm_registrations($msg) [lrange $cmdprefix 0 end]]
+    }                                 
+}
+
+# Handles notifications from the common window for script level windows
+# messages (see win.c)
+proc twapi::_script_wm_handler {msg wparam lparam msgpos ticks} {
+    variable _wm_registrations
+
+    set code 0
+    if {[info exists _wm_registrations($msg)]} {
+        foreach handler $_wm_registrations($msg) {
+            set code [catch {uplevel #0 [linsert $handler end $msg $wparam $lparam $msgpos $ticks]} msg]
+            switch -exact -- $code {
+                1 {
+                    # TBD - should remaining handlers be called even on error ?
+                    after 0 [list error $msg $::errorInfo $::errorCode]
+                    break
+                }
+                3 {
+                    break;      # Ignore remaining handlers
+                }
+                default {
+                    # Keep going
+                }
+            }
+        }
+    } else {
+        # TBD - debuglog - no handler for $msg
+    }
+
+    return
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/winlog.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/winlog.tcl
new file mode 100644
index 00000000..d48d6cd5
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/winlog.tcl
@@ -0,0 +1,304 @@
+#
+# Copyright (c) 2012, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+# Routines to unify old and new Windows event log APIs
+
+namespace eval twapi {
+    # Dictionary to map eventlog consumer handles to various related info
+    # The primary key is the read handle to the event channel/source.
+    # Nested keys depend on OS version
+    variable _winlog_handles
+}
+
+proc twapi::winlog_open {args} {
+    variable _winlog_handles
+
+    # TBD - document -authtype
+    array set opts [parseargs args {
+        {system.arg ""}
+        channel.arg
+        file.arg
+        {authtype.arg 0}
+        {direction.arg forward {forward backward}}
+    } -maxleftover 0]
+
+    if {[info exists opts(file)] &&
+        ($opts(system) ne "" || [info exists opts(channel)])} {
+        error "Option '-file' cannot be used with '-channel' or '-system'"
+    } else {
+        if {![info exists opts(channel)]} {
+            set opts(channel) "Application"
+        }
+    }
+    
+    if {[min_os_version 6]} {
+        # Use new Vista APIs
+        if {[info exists opts(file)]} {
+            set hsess NULL
+            set hq [evt_query -file $opts(file) -ignorequeryerrors]
+        } else {
+            if {$opts(system) eq ""} {
+                set hsess [twapi::evt_local_session]
+            } else {
+                set hsess [evt_open_session $opts(system) -authtype $opts(authtype)]
+            }
+            # evt_query will not read new events from a channel once
+            # eof is reached. So if reading in forward direction, we use
+            # evt_subscribe. Backward it does not matter.
+            if {$opts(direction) eq "forward"} {
+                lassign [evt_subscribe $opts(channel) -session $hsess -ignorequeryerrors -includeexisting] hq signal
+                dict set _winlog_handles $hq signal $signal
+            } else {
+                set hq [evt_query -session $hsess -channel $opts(channel) -ignorequeryerrors -direction $opts(direction)]
+            }
+        }
+        
+        dict set _winlog_handles $hq session $hsess
+    } else {
+        if {[info exists opts(file)]} {
+            set hq [eventlog_open -file $opts(file)]
+            dict set _winlog_handles $hq channel $opts(file)
+        } else {
+            set hq [eventlog_open -system $opts(system) -source $opts(channel)]
+            dict set _winlog_handles $hq channel $opts(channel)
+        }
+        dict set _winlog_handles $hq direction $opts(direction)
+    }
+    return $hq
+}
+
+proc twapi::winlog_close {hq} {
+    variable _winlog_handles
+
+    if {! [dict exists $_winlog_handles $hq]} {
+        error "Invalid event consumer handler '$hq'"
+    }
+
+    if {[dict exists $_winlog_handles $hq signal]} {
+        # Catch in case app has closed event directly, for
+        # example when returned through winlog_subscribe
+        catch {close_handle [dict get $_winlog_handles $hq signal]}
+    }
+    if {[min_os_version 6]} {
+        set hsess [dict get $_winlog_handles $hq session]
+        evt_close $hq
+        evt_close_session $hsess
+    } else {
+        eventlog_close $hq
+    }
+
+    dict unset _winlog_handles $hq
+    return
+}
+
+proc twapi::winlog_event_count {args} {
+    # TBD - document and -authtype
+    array set opts [parseargs args {
+        {system.arg ""}
+        channel.arg
+        file.arg
+        {authtype.arg 0}
+    } -maxleftover 0]
+
+    if {[info exists opts(file)] &&
+        ($opts(system) ne "" || [info exists opts(channel)])} {
+        error "Option '-file' cannot be used with '-channel' or '-system'"
+    } else {
+        if {![info exists opts(channel)]} {
+            set opts(channel) "Application"
+        }
+    }
+
+    if {[min_os_version 6]} {
+        # Use new Vista APIs
+        trap {
+            if {[info exists opts(file)]} {
+                set hsess NULL
+                set hevl [evt_open_log_info -file $opts(file)]
+            } else {
+                if {$opts(system) eq ""} {
+                    set hsess [twapi::evt_local_session]
+                } else {
+                    set hsess [evt_open_session $opts(system) -authtype $opts(authtype)]
+                }
+                set hevl [evt_open_log_info -session $hsess -channel $opts(channel)]
+            }
+            return [lindex [evt_log_info $hevl -numberoflogrecords] 1]
+        } finally {
+            if {[info exists hsess]} {
+                evt_close_session $hsess
+            }
+            if {[info exists hevl]} {
+                evt_close $hevl
+            }
+        }
+    } else {
+        if {[info exists opts(file)]} {
+            set hevl [eventlog_open -file $opts(file)]
+        } else {
+            set hevl [eventlog_open -system $opts(system) -source $opts(channel)]
+        }
+
+        trap {
+            return [eventlog_count $hevl]
+        } finally {
+            eventlog_close $hevl
+        }
+    }
+}
+
+if {[twapi::min_os_version 6]} {
+
+    proc twapi::winlog_read {hq args} {
+        parseargs args {
+            {lcid.int 0}
+        } -setvars -maxleftover 0
+
+        # TBD - is 10 an appropriate number of events to read?
+        set events [evt_next $hq -timeout 0 -count 10 -status status]
+        if {[llength $events]} {
+            trap {
+                set result [evt_decode_events $events -lcid $lcid -ignorestring "" -message -levelname -taskname]
+            } finally {
+                evt_close {*}$events
+            }
+            return $result
+        }
+
+        # No events were returned. Check status whether it is fatal error
+        # or not. SUCCESS, NO_MORE_ITEMS, TIMEOUT, INVALID_OPERATION
+        # are acceptable. This last happens when another EvtNext is done
+        # after an NO_MORE_ITEMS is already returned.
+        if {$status == 0 || $status == 259 || $status == 1460 || $status == 4317} {
+            # Even though $events is empty, still pass it in so it returns
+            # an empty record array in the correct format.
+            return [evt_decode_events $events -lcid $lcid -ignorestring "" -message -levelname -taskname]
+        } else {
+            win32_error $status
+        }
+    }
+
+    proc twapi::winlog_subscribe {channelpath} {
+        variable _winlog_handles
+        lassign [evt_subscribe $channelpath -ignorequeryerrors] hq signal
+        dict set _winlog_handles $hq signal $signal
+        dict set _winlog_handles $hq session NULL; # local session
+        return [list $hq $signal]
+    }
+
+    interp alias {} twapi::winlog_clear {} twapi::evt_clear_log
+
+    proc twapi::winlog_backup {channel outpath} {
+        evt_export_log $outpath -channel $channel
+        return
+    }
+
+} else {
+
+    proc twapi::winlog_read {hq args} {
+        parseargs args {
+            {lcid.int 0}
+        } -setvars -maxleftover 0
+
+        variable _winlog_handles
+        set fields {-channel -taskname -message -providername -eventid -level -levelname -eventrecordid -computer -sid -timecreated}
+        set values {}
+        set channel [dict get $_winlog_handles $hq channel]
+        foreach evl [eventlog_read $hq -direction [dict get $_winlog_handles $hq direction]] {
+            # Note order must be same as fields above
+            lappend values \
+                [list \
+                     $channel \
+                     [eventlog_format_category $evl -langid $lcid] \
+                     [eventlog_format_message $evl -langid $lcid -width -1] \
+                     [dict get $evl -source] \
+                     [dict get $evl -eventid] \
+                     [dict get $evl -level] \
+                     [dict get $evl -type] \
+                     [dict get $evl -recordnum] \
+                     [dict get $evl -system] \
+                     [dict get $evl -sid] \
+                     [secs_since_1970_to_large_system_time [dict get $evl -timewritten]]]
+        }
+        return [list $fields $values]
+    }
+
+    proc twapi::winlog_subscribe {source} {
+        variable _winlog_handles
+        lassign [eventlog_subscribe $source] hq hevent
+        dict set _winlog_handles $hq channel $source
+        dict set _winlog_handles $hq direction forward
+        dict set _winlog_handles $hq signal $hevent
+        return [list $hq $hevent]
+    }
+
+    proc twapi::winlog_clear {source args} {
+        set hevl [eventlog_open -source $source]
+        trap {
+            eventlog_clear $hevl {*}$args
+        } finally {
+            eventlog_close $hevl
+        }
+        return
+    }
+
+    proc twapi::winlog_backup {source outpath} {
+        set hevl [eventlog_open -source $source]
+        trap {
+            eventlog_backup $hevl $outpath
+        } finally {
+            eventlog_close $hevl
+        }
+        return
+    }
+
+}
+
+
+proc twapi::_winlog_dump_list {{channels {Application System Security}} {atomize 0}} {
+    set evlist {}
+    foreach channel $channels {
+        set hevl [winlog_open -channel $channel]
+        trap {
+            while {[llength [set events [winlog_read $hevl]]]} {
+                foreach e [recordarray getlist $events -format dict] {
+                    if {$atomize} {
+                        dict set ev -message [atomize [dict get $e -message]]
+                        dict set ev -levelname [atomize [dict get $e -levelname]]
+                        dict set ev -channel [atomize [dict get $e -channel]]
+                        dict set ev -providername [atomize [dict get $e -providername]]
+                        dict set ev -taskname [atomize [dict get $e -taskname]]
+                        dict set ev -eventid [atomize [dict get $e -eventid]]
+                        dict set ev -account [atomize [dict get $e -userid]]
+                    } else {
+                        dict set ev -message [dict get $e -message]
+                        dict set ev -levelname [dict get $e -levelname]
+                        dict set ev -channel [dict get $e -channel]
+                        dict set ev -providername [dict get $e -providername]
+                        dict set ev -taskname [dict get $e -taskname]
+                        dict set ev -eventid [dict get $e -eventid]
+                        dict set ev -account [dict get $e -userid]
+                    }
+                    lappend evlist $ev
+                }
+            }
+        } finally {
+            winlog_close $hevl
+        }
+    }
+    return $evlist
+}
+
+proc twapi::_winlog_dump {{channel Application} {fd stdout}} {
+    set hevl [winlog_open -channel $channel]
+    while {[llength [set events [winlog_read $hevl]]]} {
+        # print out each record
+        foreach ev [recordarray getlist $events -format dict] {
+            puts $fd "[dict get $ev -timecreated] [dict get $ev -providername]: [dict get $ev -message]"
+        }
+    }
+    winlog_close $hevl
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/winsta.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/winsta.tcl
new file mode 100644
index 00000000..3383e414
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/winsta.tcl
@@ -0,0 +1,113 @@
+#
+# Copyright (c) 2004-2012, Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+
+# TBD - document and test
+proc twapi::get_active_console_tssession {} {
+    return [WTSGetActiveConsoleSessionId]
+}
+
+proc twapi::get_current_window_station_handle {} {
+    return [GetProcessWindowStation]
+}
+
+# Get the handle to a window station
+proc twapi::get_window_station_handle {winsta args} {
+    array set opts [parseargs args {
+        inherit.bool
+        {access.arg  generic_read}
+    } -nulldefault]
+
+    set access_rights [_access_rights_to_mask $opts(access)]
+    
+    return [OpenWindowStation $winsta $opts(inherit) $access_rights]
+}
+
+
+# Close a window station handle
+proc twapi::close_window_station_handle {hwinsta} {
+    # Trying to close our window station handle will generate an error
+    if {$hwinsta != [get_current_window_station_handle]} {
+        CloseWindowStation $hwinsta
+    }
+    return
+}
+
+# List all window stations
+proc twapi::find_window_stations {} {
+    return [EnumWindowStations]
+}
+
+
+# Enumerate desktops in a window station
+proc twapi::find_desktops {args} {
+    array set opts [parseargs args {winsta.arg}]
+
+    if {[info exists opts(winsta)]} {
+        set hwinsta [get_window_station_handle $opts(winsta)]
+    } else {
+        set hwinsta [get_current_window_station_handle]
+    }
+
+    trap {
+        return [EnumDesktops $hwinsta]
+    } finally {
+        # Note close_window_station_handle protects against
+        # hwinsta being the current window station handle so 
+        # we do not need to do that check here
+        close_window_station_handle $hwinsta
+    }
+}
+
+
+# Get the handle to a desktop
+proc twapi::get_desktop_handle {desk args} {
+    array set opts [parseargs args {
+        inherit.bool
+        allowhooks.bool
+        {access.arg  generic_read}
+    } -nulldefault]
+
+    set access_mask [_access_rights_to_mask $opts(access)]
+    
+    # If certain access rights are specified, we must add certain other
+    # access rights. See OpenDesktop SDK docs
+    set access_rights [_access_mask_to_rights $access_mask]
+    if {"read_control" in $access_rights ||
+        "write_dacl" in $access_rights ||
+        "write_owner" in  $access_rights} {
+        lappend access_rights desktop_readobject desktop_writeobjects
+        set access_mask [_access_rights_to_mask $opts(access)]
+    }
+
+    return [OpenDesktop $desk $opts(allowhooks) $opts(inherit) $access_mask]
+}
+
+# Close the desktop handle
+proc twapi::close_desktop_handle {hdesk} {
+    CloseDesktop $hdesk
+}
+
+# Set the process window station
+proc twapi::set_process_window_station {hwinsta} {
+    SetProcessWindowStation $hwinsta
+}
+
+proc twapi::get_desktop_user_sid {hdesk} {
+    return [GetUserObjectInformation $hdesk 4]
+}
+
+proc twapi::get_window_station_user_sid {hwinsta} {
+    return [GetUserObjectInformation $hwinsta 4]
+}
+
+proc twapi::get_desktop_name {hdesk} {
+    return [GetUserObjectInformation $hdesk 2]
+}
+
+proc twapi::get_window_station_name {hwinsta} {
+    return [GetUserObjectInformation $hwinsta 2]
+}
diff --git a/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/wmi.tcl b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/wmi.tcl
new file mode 100644
index 00000000..e31debb4
--- /dev/null
+++ b/src/vfs/punk86.vfs/lib_tcl8/twapi4.7.2/wmi.tcl
@@ -0,0 +1,223 @@
+#
+# Copyright (c) 2012 Ashok P. Nadkarni
+# All rights reserved.
+#
+# See the file LICENSE for license
+
+package require twapi_com
+
+# TBD - document?
+
+twapi::class create ::twapi::IMofCompilerProxy {
+    superclass ::twapi::IUnknownProxy
+
+    constructor {args} {
+        if {[llength $args] == 0} {
+            set args [list [::twapi::com_create_instance "{6daf9757-2e37-11d2-aec9-00c04fb68820}" -interface IMofCompiler -raw]]
+        }
+        next {*}$args
+    }
+
+    method CompileBuffer args {
+        my variable _ifc
+        return [::twapi::IMofCompiler_CompileBuffer $_ifc {*}$args]
+    }
+
+    method CompileFile args {
+        my variable _ifc
+        return [::twapi::IMofCompiler_CompileFile $_ifc {*}$args]
+    }
+
+    method CreateBMOF args {
+        my variable _ifc
+        return [::twapi::IMofCompiler_CreateBMOF $_ifc {*}$args]
+    }
+
+    twapi_exportall
+}
+
+
+#
+# Get WMI service - TBD document
+proc twapi::wmi_root {args} {
+    array set opts [parseargs args {
+        {root.arg cimv2}
+        {impersonationlevel.arg impersonate {default anonymous identify delegate impersonate} }
+    } -maxleftover 0]
+
+    # TBD - any injection attacks possible ? Need to quote ?
+    return [comobj_object "winmgmts:{impersonationLevel=$opts(impersonationlevel)}!//./root/$opts(root)"]
+}
+# Backwards compat
+proc twapi::_wmi {{top cimv2}} {
+    return [wmi_root -root $top]
+}
+
+# TBD - see if using ExecQuery would be faster if it supports all the options
+proc twapi::wmi_collect_classes {swbemservices args} {
+    array set opts [parseargs args {
+        {ancestor.arg {}}
+        shallow
+        first
+        matchproperties.arg
+        matchsystemproperties.arg
+        matchqualifiers.arg
+        {collector.arg {lindex}}
+    } -maxleftover 0]
+    
+    
+    # Create a forward only enumerator for efficiency
+    # wbemFlagUseAmendedQualifiers | wbemFlagReturnImmediately | wbemFlagForwardOnly
+    set flags 0x20030
+    if {$opts(shallow)} {
+        incr flags 1;           # 0x1 -> wbemQueryFlagShallow
+    }
+
+    set classes [$swbemservices SubclassesOf $opts(ancestor) $flags]
+    set matches {}
+    set delete_on_error {}
+    twapi::trap {
+        $classes -iterate class {
+            set matched 1
+            foreach {opt fn} {
+                matchproperties Properties_
+                matchsystemproperties SystemProperties_
+                matchqualifiers Qualifiers_
+            } {
+                if {[info exists opts($opt)]} {
+                    foreach {name matcher} $opts($opt) {
+                        if {[catch {
+                            if {! [{*}$matcher [$class -with [list [list -get $fn] [list Item $name]] Value]]} {
+                                set matched 0
+                                break; # Value does not match
+                            }
+                        } msg ]} {
+                            # TBD - log debug error if not property found
+                            # No such property or no access
+                            set matched 0
+                            break
+                        }
+                    }
+                }
+                if {! $matched} {
+                    # Already failed to match, no point continuing looping
+                    break
+                }
+            }
+
+            if {$matched} {
+                # Note collector code is responsible for disposing
+                # of $class as appropriate. But we take care of deleting
+                # when an error occurs after some accumulation has
+                # already occurred.
+                lappend delete_on_error $class
+                if {$opts(first)} {
+                    return [{*}$opts(collector) $class]
+                } else {
+                    lappend matches [{*}$opts(collector) $class]
+                }
+            } else {
+                $class destroy
+            }
+        }
+    } onerror {} {
+        foreach class $delete_on_error {
+            if {[comobj? $class]} {
+                $class destroy
+            }
+        }
+        rethrow
+    } finally {
+        $classes destroy
+    }
+
+    return $matches
+}
+
+proc twapi::wmi_extract_qualifier {qual} {
+    foreach prop {name value isamended propagatestoinstance propagatestosubclass isoverridable} {
+        dict set result $prop [$qual -get $prop]
+    }
+    return $result
+}
+
+proc twapi::wmi_extract_property {propobj} {
+    foreach prop {name value cimtype isarray islocal origin} {
+        dict set result $prop [$propobj -get $prop]
+    }
+
+    $propobj -with Qualifiers_ -iterate -cleanup qual {
+        set rec [wmi_extract_qualifier $qual]
+        dict set result qualifiers [string tolower [dict get $rec name]] $rec
+    }
+
+    return $result
+}
+
+proc twapi::wmi_extract_systemproperty {propobj} {
+    # Separate from wmi_extract_property because system properties do not
+    # have Qualifiers_
+    foreach prop {name value cimtype isarray islocal origin} {
+        dict set result $prop [$propobj -get $prop]
+    }
+
+    return $result
+}
+
+
+proc twapi::wmi_extract_method {mobj} {
+    foreach prop {name origin} {
+        dict set result $prop [$mobj -get $prop]
+    }
+
+    # The InParameters and OutParameters properties are SWBEMObjects
+    # the properties of which describe the parameters.
+    foreach inout {inparameters outparameters} {
+        set paramsobj [$mobj -get $inout]
+        if {[$paramsobj -isnull]} {
+            dict set result $inout {}
+        } else {
+            $paramsobj -with Properties_ -iterate -cleanup pobj {
+                set rec [wmi_extract_property $pobj]
+                dict set result $inout [string tolower [dict get $rec name]] $rec
+            }
+        }
+    }
+
+    $mobj -with Qualifiers_ -iterate qual {
+        set rec [wmi_extract_qualifier $qual]
+        dict set result qualifiers [string tolower [dict get $rec name]] $rec
+        $qual destroy
+    }
+
+    return $result
+}
+
+
+proc twapi::wmi_extract_class {obj} {
+    
+    set result [dict create]
+
+    # Class qualifiers
+    $obj -with Qualifiers_ -iterate -cleanup qualobj {
+        set rec [wmi_extract_qualifier $qualobj]
+        dict set result qualifiers [string tolower [dict get $rec name]] $rec
+    }
+
+    $obj -with Properties_ -iterate -cleanup propobj {
+        set rec [wmi_extract_property $propobj]
+        dict set result properties [string tolower [dict get $rec name]] $rec
+    }
+
+    $obj -with SystemProperties_ -iterate -cleanup propobj {
+        set rec [wmi_extract_systemproperty $propobj]
+        dict set result systemproperties [string tolower [dict get $rec name]] $rec
+    }
+    
+    $obj -with Methods_ -iterate -cleanup mobj {
+        set rec [wmi_extract_method $mobj]
+        dict set result methods [string tolower [dict get $rec name]] $rec
+    }
+
+    return $result
+}
diff --git a/src/vfs/punk86.vfs/modules_tcl8/Thread-2.8.9.tm b/src/vfs/punk86.vfs/modules_tcl8/Thread-2.8.9.tm
new file mode 100644
index 00000000..45c8b5c6
Binary files /dev/null and b/src/vfs/punk86.vfs/modules_tcl8/Thread-2.8.9.tm differ
diff --git a/src/vfs/punk86.vfs/modules_tcl8/Thread/platform/win32_x86_64_tcl8-2.8.9.tm b/src/vfs/punk86.vfs/modules_tcl8/Thread/platform/win32_x86_64_tcl8-2.8.9.tm
new file mode 100644
index 00000000..d50bcf4a
Binary files /dev/null and b/src/vfs/punk86.vfs/modules_tcl8/Thread/platform/win32_x86_64_tcl8-2.8.9.tm differ
diff --git a/src/vfs/punk9win.vfs/main.tcl b/src/vfs/punk9win.vfs/main.tcl
index 9e46f08b..21813708 100644
--- a/src/vfs/punk9win.vfs/main.tcl
+++ b/src/vfs/punk9win.vfs/main.tcl
@@ -8,6 +8,15 @@
 
 
 apply { args {
+    set has_zipfs [expr {[info commands tcl::zipfs::root] ne ""}] 
+    if {$has_zipfs} {
+        set has_zipfs_attached [expr {[llength [tcl::zipfs::mount]]}] 
+    } else {
+        set has_zipfs_attached
+    }
+    set tclmajorv [lindex [split [info tclversion] .] 0]
+
+
     #here we make an attempt to avoid premature (costly) auto_path/tcl::tm::list scanning caused by our initial 'package require starkit'.
     #we will first look for a starkit.tcl in an expected location and try to load that, then fallback to package require. 
 
@@ -33,9 +42,9 @@ apply { args {
         set found_starkit_tcl 1
     }
     if {!$found_starkit_tcl} {
-        #our internal search for starkit failed.
-        #either we are in a pure zipfs system - or the starkit package is somewhere unexpected
-        #for pure zipfs - it's wasteful to perform exhaustive search for starkit 
+        #our internal 'quick' search for starkit failed.
+        #either we are in a pure zipfs system - or the starkit package is somewhere more devious 
+        #for pure zipfs - it's a little wasteful to perform exhaustive search for starkit 
         #review - only keep searching if not 'dev' first arg?
 
         #Initially we've done no scans of auto_path/tcl::tm::list - but there will already be a core set of packages known by the kit
@@ -44,7 +53,6 @@ apply { args {
         puts stderr [join [package names] \n]
         set original_packages [package names]
 
-
         if {![catch {package require starkit}]} {
             #known side-effects of starkit::startup
             #sets the ::starkit::mode variable to the way in which it was launched. One of: {starpack starkit unwrapped tclhttpd plugin service sourced}
@@ -67,20 +75,21 @@ apply { args {
 
 
 
-
     # -- --- --- 
-    #when run as a tclkit - the exe is mounted as a dir and Tcl's auto_execok doesn't find it
+    #when run as a tclkit - the exe is mounted as a dir and Tcl's auto_execok doesn't find it. review - for what versions of Tcl does this apply?
+    #known to occur in old 8.6.8 kits as well as 8.7
     #review - do we want $normexe or [info nameofexecutable] for $thisexe here? Presumably [info nameofexecutable] (possible symlink) ok
+    #we want to be able to launch a process from the interactive shell using the same name this one was launched with.
     set thisexe [file tail [info nameofexecutable]]  ;#e.g punk86.exe
     set thisexeroot [file rootname $thisexe]         ;#e.g punk86
     set ::auto_execs($thisexeroot) [info nameofexecutable]
     if {$thisexe ne $thisexeroot} {
+        #on windows make the .exe point there too
         set ::auto_execs($thisexe) [info nameofexecutable]
     }
     # -- --- --- 
-    set tclmajorv [lindex [split [info tclversion] .] 0]
 
-    if {[info exists ::tcl::kitpath]} {
+    if {[info exists ::tcl::kitpath] && $::tcl::kitpath ne ""} {
         set kp $::tcl::kitpath
         set existing_module_paths [string tolower [tcl::tm::list]]
         foreach p [list modules modules_tcl$tclmajorv] {
@@ -94,9 +103,10 @@ apply { args {
             }
         }
     }
-    if {[info commands tcl::zipfs::root] ne ""} {
-        #review build option may be different - tclZipFs.c ZIPFS_APP_MOUNT defaults to ZIPFS_VOLUME/app - but it could be something else.
-        set zipbase [file join [tcl::zipfs::root] app] ;#zipfs root has trailing slash - but file join does the right thing
+    if {$has_zipfs_attached} {
+        #review build option may be different - tclZipFs.c ZIPFS_APP_MOUNT defaults to ZIPFS_VOLUME/app - but it could be something else. (why?)
+        #default 'zipfs root' has trailing slash (//zipfs:/) - but file join does the right thing
+        set zipbase [file join [tcl::zipfs::root] app] 
         if {"$zipbase" in [tcl::zipfs::mount]} {
             set existing_module_paths [string tolower [tcl::tm::list]]
             foreach p [list modules modules_tcl$tclmajorv] {
@@ -111,12 +121,15 @@ apply { args {
             }
         }
     }
+
+
+
     set internal_paths [list]
-    if {[info commands tcl::zipfs::root] ne ""} {
+    if {$has_zipfs} {
         set ziproot [tcl::zipfs::root] ;#root is enough to determine internal zipkit path
         lappend internal_paths $ziproot
     }
-    if {[info exists ::tcl::kitpath]} {
+    if {[info exists ::tcl::kitpath] && $::tcl::kitpath ne ""} {
         lappend internal_paths $::tcl::kitpath
     }
 
@@ -438,16 +451,28 @@ apply { args {
                 }
             }
         }
-
         #force rescan
         #catch {package require flobrudder666_nonexistant}
         set arglist $args
     }
 
-    if {[llength $arglist]} {
+    #assert arglist has had 'dev' first arg removed if it was present.
+    if {[llength $arglist] == 1 && [lindex $arglist 0] eq "tclsh"} {
+        #called as <executable> dev tclsh  or <executable> tclsh
+        #we would like to drop through to standard tclsh repl without launching another process? how?
+        #tclMain.c doesn't seem to allow it.
+
+        puts "tcl_interactive: $::tcl_interactive"
+        set ::tcl_interactive 1
+        puts "stdin: [chan configure stdin]"
+        set ::tclsh(dorepl) 1
+
+    } elseif {[llength $arglist]} {
+        #pass through to shellspy commandline processor
         #puts stdout "main.tcl launching app-shellspy"
         package require app-shellspy
     } else {
+        #punk shell
         puts stdout "main.tcl launching app-punk. pkg names count:[llength [package names]]"
         package require app-punk
         #app-punk starts repl
diff --git a/src/vfs/punk9win.vfs/main1.tcl b/src/vfs/punk9win.vfs/main1.tcl
deleted file mode 100644
index 79d07850..00000000
--- a/src/vfs/punk9win.vfs/main1.tcl
+++ /dev/null
@@ -1,279 +0,0 @@
-
-if {![catch {package require starkit}]} {
-    starkit::startup
-}
-
-
-apply { args {
-    # -- --- --- 
-    #when run as a tclkit - the exe is mounted as a dir and Tcl's auto_execok doesn't find it
-    set thisexe [file tail [info nameofexecutable]]
-    set thisexeroot [file rootname $thisexe]
-    set ::auto_execs($thisexeroot) [info nameofexecutable]
-    if {$thisexe ne $thisexeroot} {
-        set ::auto_execs($thisexe) [info nameofexecutable]
-    }
-    # -- --- --- 
-    set tclmajorv [lindex [split [info tclversion] .] 0]
-
-    if {[info exists ::tcl::kitpath]} {
-        set kp $::tcl::kitpath
-        set existing_module_paths [string tolower [tcl::tm::list]]
-        foreach p [list modules modules_tcl$tclmajorv] {
-            if {[string tolower [file join $kp $p]] ni $existing_module_paths} {
-                tcl::tm::add [file join $kp $p] 
-            }
-        }
-        foreach l [list lib lib_tcl$tclmajorv] {
-            if {[string  tolower [file join $kp $l]] ni [string tolower $::auto_path]} {
-                lappend ::auto_path [file join $kp $l]
-            }
-        }
-    }
-    if {[info commands tcl::zipfs::root] ne ""} {
-        #review build option may be different - tclZipFs.c ZIPFS_APP_MOUNT defaults to ZIPFS_VOLUME/app - but it could be something else.
-        set zipbase [file join [tcl::zipfs::root] app] ;#zipfs root has trailing slash - but file join does the right thing
-        if {"$zipbase" in [tcl::zipfs::mount]} {
-            set existing_module_paths [string tolower [tcl::tm::list]]
-            foreach p [list modules modules_tcl$tclmajorv] {
-                if {[string tolower [file join $zipbase $p]] ni $existing_module_paths} {
-                    tcl::tm::add [file join $zipbase $p] 
-                }
-            }
-            foreach l [list lib lib_tcl$tclmajorv] {
-                if {[string  tolower [file join $zipbase $l]] ni [string tolower $::auto_path]} {
-                    lappend ::auto_path [file join $zipbase $l]
-                }
-            }
-        }
-    }
-
-    set internal_paths [list]
-    if {[info commands tcl::zipfs::root] ne ""} {
-        set ziproot [tcl::zipfs::root] ;#root is enough to determine internal zipkit path
-        lappend internal_paths $ziproot
-    }
-    if {[info exists ::tcl::kitpath]} {
-        lappend internal_paths $::tcl::kitpath
-    }
-
-    if {[lindex $args 0] in {dev devquiet}} {
-        set arglist [lassign $args devmode]
-        set ::argv $arglist
-        set ::argc [llength $arglist]
-        if {$devmode ne "devquiet"} {
-            puts stderr "DEV MODE - preferencing external libraries and modules"
-        }
-        #Note regarding the use of package forget and binary packages
-        #If the package has loaded a binary component - then a package forget and a subsequent package require can result in both binaries being present, as seen in 'info loaded' result - potentially resulting in anomalous behaviour
-        #In general package forget after a package has already been required may need special handling and should be avoided where possible.
-        #Only a limited set of package support unloading a binary component
-        #We limit the use of 'package forget' here to packages that have not been loaded (whether pure-tcl or not)
-        #ie in this context it is used only for manipulating preferences of which packages are loaded in the first place
-
-        #Unintuitive preferencing can occur if the same package version is for example present in a tclkit and in a module or lib folder external to the kit.
-        #It may be desired for performance or testing reasons to preference the library outside of the kit - and raising the version number may not always be possible/practical.
-
-        #If the executable is a kit - we don't know what packages it contains or whether it allows loading from env based external paths. 
-        #For app-punk projects - the lib/module paths based on the project being run should take preference, even if the version number is the same.
-        #(these are the 'info nameofexecutable' or 'info script' or 'pwd' relative paths that are added here)
-        #Some kits will remove lib/module paths (from auto_path & tcl::tm::list) that have been added via TCLLIBPATH / TCLX_Y_TM_PATH environment variables
-        #Some kits will remove those env-provided lib paths but fail to remove the env-provided module paths
-        #(differences in boot.tcl in the kits)
-
-        #------------------------------------------------------------------------------
-        #Module loading
-        #------------------------------------------------------------------------------
-        #If the current directory contains .tm files when the punk repl starts - then it will attempt to preference them
-        # - but first add our other known relative modules paths - as it won't make sense to use current directory as a modulepath if it's an ancestor of one of these..
-
-        set original_tm_list [tcl::tm::list]
-        tcl::tm::remove {*}$original_tm_list
-
-        set module_folders [list]
-
-        #tm list first added end up later in the list - and then override earlier ones if version the same - so add pwd-relative 1st to give higher priority
-        #(only if Tcl has scanned all paths - see below bogus package load)
-        #1
-        if {[file isdirectory [pwd]/modules]} {
-            catch {tcl::tm::add [pwd]/modules}
-        }
-
-
-        #2)
-        if {[string match "*.vfs/*" [file normalize [info script]]]} {
-            #src/xxx.vfs/lib/app-punk/repl.tcl
-            # assume if calling directly into .vfs that the user would prefer to use src/modules - so go up 4 levels
-            #set srcmodulefolder [file dirname [file dirname [file dirname [file dirname [file normalize [info script]]]]]]/modules
-            # - the src/modules folder doesn't contain important modules such as vendormodules - so the above probably isn't that useful 
-            set srcfolder [file dirname [file dirname [file dirname [file dirname [file normalize [info script]]]]]]
-            lappend module_folders [file join [file dirname $srcfolder] modules] ;#modules folder at same level as src folder
-            lappend module_folders [file join [file dirname $srcfolder] modules_tcl$tclmajorv]
-        } else {
-            #  .../bin/punkXX.exe  look for ../modules  (i.e modules folder at same level as bin folder)
-            lappend module_folders [file dirname [file dirname [info nameofexecutable]]]/modules
-            lappend module_folders [file dirname [file dirname [info nameofexecutable]]]/modules_tcl$tclmajorv
-        }
-        foreach modulefolder $module_folders {
-            if {[file isdirectory $modulefolder]} {
-                tcl::tm::add $modulefolder
-            } else {
-                puts stderr "Warning unable to find module folder at: $modulefolder"
-            }
-        }
-
-
-
-        #add lib and lib_tcl8 lib_tcl9 etc based on tclmajorv
-        #libs are appended to end - so add higher priority libraries last (opposite to modules)
-        #auto_path - add exe-relative after exe-relative path
-        if {"windows" eq $::tcl_platform(platform)} {
-            #case differences dont matter - but can stop us finding path in auto_path
-            foreach libsub [list lib_tcl$tclmajorv lib] {
-                set libfolder [file dirname [file dirname [info nameofexecutable]]]/$libsub
-                if {[string tolower $libfolder] ni [string tolower $::auto_path]} {
-                    if {[file isdirectory $libfolder]} {
-                        lappend ::auto_path $libfolder
-                    }
-                }
-                set libfolder [pwd]/$libsub
-                if {[string tolower $libfolder] ni [string tolower $::auto_path]} {
-                    if {[file isdirectory $libfolder]} {
-                        lappend ::auto_path $libfolder 
-                    }
-                }
-            }
-        } else {
-            #on other platforms, case differences could represent different paths
-            foreach libsub [list lib_tcl$tclmajorv lib] {
-                set libfolder [file dirname [file dirname [info nameofexecutable]]]/$libsub
-                if {$libfolder ni $::auto_path} {
-                    if {[file isdirectory $libfolder]} {
-                        lappend ::auto_path $libfolder
-                    }
-                }
-                set libfolder [pwd]/$libsub
-                if {$libfolder ni $::auto_path} {
-                    if {[file isdirectory $libfolder]} {
-                        lappend ::auto_path $libfolder 
-                    }
-                }
-            }
-        }
-
-
-        #2)
-        set currentdir_modules [glob -nocomplain -dir [pwd] -type f -tail *.tm]
-        if {[llength $currentdir_modules]} {
-            #now add current dir (if no conflict with above)
-            catch {tcl::tm::add [pwd]}
-        }
-
-        #restore module paths 
-        set tm_list_now [tcl::tm::list]
-        foreach p [lreverse $original_tm_list] {
-            if {$p ni $tm_list_now} {
-                #the prior tm paths go to the head of the list.
-                #They are processed first.. but an item of same version later in the list will override one at the head. (depending on when list was scanned)
-                tcl::tm::add $p
-            }
-        }
-        #------------------------------------------------------------------------------
-        #package require a bogus package to ensure Tcl scans the whole auto_path/tm list - otherwise a lower-versioned module earlier in the path may be loaded
-        #This seems to take not insignificant time depending on size of auto_path and tcl::tm::list (e.g 2023 i9 ssd 100ms) - but seems unavoidable for now
-        catch {package require flobrudder666_nonexistant}
-        #------------------------------------------------------------------------------
-
-
-    } else {
-        #Tcl_Init will most likely have set up some external paths 
-        #As our app has been started without the 'dev' first arg - we will prune paths that are not zipfs or tclkit
-        set new_auto_path [list]
-        #review - case insensitive ok for windows - but could cause issues on other platforms?
-        foreach ap $::auto_path {
-            set aplower [string tolower $ap]
-            foreach okprefix $internal_paths {
-                if {[string match "[string tolower $okprefix]*" $aplower]} {
-                    lappend new_auto_path $ap
-                    break
-                }
-            }
-        }
-        set ::auto_path $new_auto_path
-
-        set new_tm_list [list]
-        foreach tm [tcl::tm::list] {
-            set tmlower [string tolower $tm] 
-            foreach okprefix $internal_paths {
-                if {[string match "[string tolower $okprefix]*" $tmlower]} {
-                    lappend new_tm_list $tm
-                    break
-                }
-            }
-        }
-        tcl::tm::remove {*}[tcl::tm::list]
-        tcl::tm::add {*}[lreverse $new_tm_list]
-
-
-        #If it looks like we are running the vfs/xxx.vfs/main.tcl from an external tclsh - try to use vfs folders to simulate kit state 
-        #set script_relative_lib [file normalize [file join [file dirname [info script]] lib]]
-        set scriptdir [file dirname [info script]]
-        if {![string match //zipfs:/* $scriptdir] && ![info exists ::tcl::kitpath]} {
-            #presumably running the vfs/xxx.vfs/main.tcl script using a non-kit tclsh that doesn't have starkit lib available.. lets see if we can move forward anyway
-            set vfscontainer [file normalize [file dirname $scriptdir]]
-            set vfscommon [file join $vfscontainer _vfscommon]
-            set vfsdir [file normalize $scriptdir]
-            set projectroot [file dirname [file dirname $vfscontainer]] ;#back below src/vfs/xxx.vfs/main.tcl
-            puts stdout "no starkit. projectroot?: $projectroot"
-            puts stdout "info lib: [info library]"
-
-            #add back the info lib reported by the executable.. as we can't access the one built into a kit
-            if {[file exists [info library]]} {
-                lappend ::auto_path [info library]
-            }
-
-            set lib_types [list lib lib_tcl$tclmajorv]
-            foreach l $lib_types {
-                set lib [file join $vfsdir $l]
-                if {[file exists $lib] && [string tolower $lib] ni [string tolower $::auto_path]} {
-                    lappend ::auto_path $lib
-                }
-            }
-            foreach l $lib_types {
-                set lib [file join $vfscommon $l]
-                if {[file exists $lib] && [string tolower $lib] ni [string tolower $::auto_path]} {
-                    lappend ::auto_path $lib
-                }
-            }
-            set mod_types [list modules modules_tcl$tclmajorv] 
-            foreach m $mod_types {
-                set modpath [file join $vfsdir $m]
-                if {[file exists $modpath] && [string tolower $modpath] ni [string tolower [tcl::tm::list]]} {
-                    tcl::tm::add $modpath
-                }
-            }
-            foreach m $mod_types {
-                set modpath [file join $vfscommon $m]
-                if {[file exists $modpath] && [string tolower $modpath] ni [string tolower [tcl::tm::list]]} {
-                    tcl::tm::add $modpath
-                }
-            }
-        }
-
-        #force rescan
-        catch {package require flobrudder666_nonexistant}
-        set arglist $args
-    }
-
-    if {[llength $arglist]} {
-        puts stdout "main.tcl launching app-shellspy"
-        package require app-shellspy
-    } else {
-        puts stdout "main.tcl launching app-punk"
-        package require app-punk
-        #app-punk starts repl
-        #repl::start stdin -title "main.tcl"
-    }
-    puts stderr "main.tcl done"
-    flush stderr
-}} {*}$::argv
diff --git a/src/vfs/punk9win.vfs/main2.tcl b/src/vfs/punk9win.vfs/main2.tcl
deleted file mode 100644
index 7fcadc73..00000000
--- a/src/vfs/punk9win.vfs/main2.tcl
+++ /dev/null
@@ -1,338 +0,0 @@
-
-#main.tcl - we expect to be in the context of a zipkit or tclkit vfs attached to a tcl executable.
-#review - what happens if both are somehow attached and both vfs and zipfs are available? 
-# - if that's even possible - we have no control here over which main.tcl was selected as we're already here
-#The logic below will add appropriate package paths from starkit and zipfs vfs paths 
-# - and restrict package paths to those coming from a vfs (if not launched with 'dev' first arg which allows external paths to remain)
-
-
-
-apply { args {
-    #here we make an attempt to avoid premature (costly) auto_path/tcl::tm::list scanning caused by our initial 'package require starkit'.
-    #we will first look for a starkit.tcl in an expected location and try to load that, then fallback to package require. 
-
-    set normscript [file dirname [file normalize [file join [info script] __dummy__]]]
-    set topdir [file dirname $normscript]
-    set found_starkit_tcl 0
-    set possible_lib_vfs_folders [glob -dir [file join $topdir lib] -type d vfs*]
-    foreach test_folder $possible_lib_vfs_folders {
-        #e.g <name_of_exe>/lib/vfs1.4.1
-        #we don't expect multiple vfs* folders - but we will process any found and load the pkgIndex.tcl from these folders.
-        #order of folder processing shouldn't matter (rely on order returned by 'package versions' - review)
-        if {[file exists $test_folder/starkit.tcl] && [file exists $test_folder/pkgIndex.tcl]} {
-            set dir $test_folder
-            source $test_folder/pkgIndex.tcl
-        }
-    }
-    if {[set starkitv [lindex [package versions starkit] end]] ne ""} {
-        #run the ifneeded script for the latest found (assuming package versions ordering is correct)
-        eval [package ifneeded starkit $starkitv]
-        set found_starkit_tcl 1
-    }
-    if {!$found_starkit_tcl} {
-        #our internal search for starkit failed.
-        #either we are in a pure zipfs system - or the starkit package is somewhere unexpected
-        #for pure zipfs - it's wasteful to perform exhaustive search for starkit 
-        #review - only keep searching if not 'dev' first arg?
-
-        #Initially we've done no scans of auto_path/tcl::tm::list - but there will already be a core set of packages known by the kit
-        #retain it so we can 'forget' the difference after our first 'package require' forces a full scan which includes some paths we may not wish to include or at least include with different preferences
-        puts "main.tcl 1)--> package name count: [llength [package names]]"
-        puts stderr [join [package names] \n]
-        set original_packages [package names]
-
-
-        if {![catch {package require starkit}]} {
-            #known side-effects of starkit::startup
-            #sets the ::starkit::mode variable to the way in which it was launched. One of: {starpack starkit unwrapped tclhttpd plugin service sourced}
-            #set the ::starkit::topdir variable
-            #if mode not starpack, then:
-            #   - adds $::starkit::topdir/lib to the auto_path if not already present
-            #
-            #In this context (vfs attached to tcl kit executable - we expect the launch mode to be 'starkit'
-            set starkit_startmode [starkit::startup]
-            puts stderr "STARKIT MODE: $starkit_startmode"
-        }
-        puts "main.tcl 2)--> package name count: [llength [package names]]"
-        foreach pkg [package names] {
-            if {$pkg ni $original_packages} {
-                package forget $pkg
-            }
-        }
-        puts "main.tcl 3)--> package name count: [llength [package names]]"
-    }
-
-
-
-
-    # -- --- --- 
-    #when run as a tclkit - the exe is mounted as a dir and Tcl's auto_execok doesn't find it
-    set thisexe [file tail [info nameofexecutable]]
-    set thisexeroot [file rootname $thisexe]
-    set ::auto_execs($thisexeroot) [info nameofexecutable]
-    if {$thisexe ne $thisexeroot} {
-        set ::auto_execs($thisexe) [info nameofexecutable]
-    }
-    # -- --- --- 
-    set tclmajorv [lindex [split [info tclversion] .] 0]
-
-    if {[info exists ::tcl::kitpath]} {
-        set kp $::tcl::kitpath
-        set existing_module_paths [string tolower [tcl::tm::list]]
-        foreach p [list modules modules_tcl$tclmajorv] {
-            if {[string tolower [file join $kp $p]] ni $existing_module_paths} {
-                tcl::tm::add [file join $kp $p] 
-            }
-        }
-        foreach l [list lib lib_tcl$tclmajorv] {
-            if {[string  tolower [file join $kp $l]] ni [string tolower $::auto_path]} {
-                lappend ::auto_path [file join $kp $l]
-            }
-        }
-    }
-    if {[info commands tcl::zipfs::root] ne ""} {
-        #review build option may be different - tclZipFs.c ZIPFS_APP_MOUNT defaults to ZIPFS_VOLUME/app - but it could be something else.
-        set zipbase [file join [tcl::zipfs::root] app] ;#zipfs root has trailing slash - but file join does the right thing
-        if {"$zipbase" in [tcl::zipfs::mount]} {
-            set existing_module_paths [string tolower [tcl::tm::list]]
-            foreach p [list modules modules_tcl$tclmajorv] {
-                if {[string tolower [file join $zipbase $p]] ni $existing_module_paths} {
-                    tcl::tm::add [file join $zipbase $p] 
-                }
-            }
-            foreach l [list lib lib_tcl$tclmajorv] {
-                if {[string  tolower [file join $zipbase $l]] ni [string tolower $::auto_path]} {
-                    lappend ::auto_path [file join $zipbase $l]
-                }
-            }
-        }
-    }
-    set internal_paths [list]
-    if {[info commands tcl::zipfs::root] ne ""} {
-        set ziproot [tcl::zipfs::root] ;#root is enough to determine internal zipkit path
-        lappend internal_paths $ziproot
-    }
-    if {[info exists ::tcl::kitpath]} {
-        lappend internal_paths $::tcl::kitpath
-    }
-
-    if {[lindex $args 0] in {dev devquiet}} {
-        set arglist [lassign $args devmode]
-        set ::argv $arglist
-        set ::argc [llength $arglist]
-        if {$devmode ne "devquiet"} {
-            puts stderr "DEV MODE - preferencing external libraries and modules"
-        }
-        #Note regarding the use of package forget and binary packages
-        #If the package has loaded a binary component - then a package forget and a subsequent package require can result in both binaries being present, as seen in 'info loaded' result - potentially resulting in anomalous behaviour
-        #In general package forget after a package has already been required may need special handling and should be avoided where possible.
-        #Only a limited set of package support unloading a binary component
-        #We limit the use of 'package forget' here to packages that have not been loaded (whether pure-tcl or not)
-        #ie in this context it is used only for manipulating preferences of which packages are loaded in the first place
-
-        #Unintuitive preferencing can occur if the same package version is for example present in a tclkit and in a module or lib folder external to the kit.
-        #It may be desired for performance or testing reasons to preference the library outside of the kit - and raising the version number may not always be possible/practical.
-
-        #If the executable is a kit - we don't know what packages it contains or whether it allows loading from env based external paths. 
-        #For app-punk projects - the lib/module paths based on the project being run should take preference, even if the version number is the same.
-        #(these are the 'info nameofexecutable' or 'info script' or 'pwd' relative paths that are added here)
-        #Some kits will remove lib/module paths (from auto_path & tcl::tm::list) that have been added via TCLLIBPATH / TCLX_Y_TM_PATH environment variables
-        #Some kits will remove those env-provided lib paths but fail to remove the env-provided module paths
-        #(differences in boot.tcl in the kits)
-
-        #------------------------------------------------------------------------------
-        #Module loading
-        #------------------------------------------------------------------------------
-        #If the current directory contains .tm files when the punk repl starts - then it will attempt to preference them
-        # - but first add our other known relative modules paths - as it won't make sense to use current directory as a modulepath if it's an ancestor of one of these..
-
-        set original_tm_list [tcl::tm::list]
-        tcl::tm::remove {*}$original_tm_list
-
-        set module_folders [list]
-
-        #tm list first added end up later in the list - and then override earlier ones if version the same - so add pwd-relative 1st to give higher priority
-        #(only if Tcl has scanned all paths - see below bogus package load)
-        #1
-        if {[file isdirectory [pwd]/modules]} {
-            catch {tcl::tm::add [pwd]/modules}
-        }
-
-
-        #2)
-        if {[string match "*.vfs/*" [file normalize [info script]]]} {
-            #src/xxx.vfs/lib/app-punk/repl.tcl
-            # assume if calling directly into .vfs that the user would prefer to use src/modules - so go up 4 levels
-            #set srcmodulefolder [file dirname [file dirname [file dirname [file dirname [file normalize [info script]]]]]]/modules
-            # - the src/modules folder doesn't contain important modules such as vendormodules - so the above probably isn't that useful 
-            set srcfolder [file dirname [file dirname [file dirname [file dirname [file normalize [info script]]]]]]
-            lappend module_folders [file join [file dirname $srcfolder] modules] ;#modules folder at same level as src folder
-            lappend module_folders [file join [file dirname $srcfolder] modules_tcl$tclmajorv]
-        } else {
-            #  .../bin/punkXX.exe  look for ../modules  (i.e modules folder at same level as bin folder)
-            lappend module_folders [file dirname [file dirname [info nameofexecutable]]]/modules
-            lappend module_folders [file dirname [file dirname [info nameofexecutable]]]/modules_tcl$tclmajorv
-        }
-        foreach modulefolder $module_folders {
-            if {[file isdirectory $modulefolder]} {
-                tcl::tm::add $modulefolder
-            } else {
-                puts stderr "Warning unable to find module folder at: $modulefolder"
-            }
-        }
-
-
-
-        #add lib and lib_tcl8 lib_tcl9 etc based on tclmajorv
-        #libs are appended to end - so add higher priority libraries last (opposite to modules)
-        #auto_path - add exe-relative after exe-relative path
-        if {"windows" eq $::tcl_platform(platform)} {
-            #case differences dont matter - but can stop us finding path in auto_path
-            foreach libsub [list lib_tcl$tclmajorv lib] {
-                set libfolder [file dirname [file dirname [info nameofexecutable]]]/$libsub
-                if {[string tolower $libfolder] ni [string tolower $::auto_path]} {
-                    if {[file isdirectory $libfolder]} {
-                        lappend ::auto_path $libfolder
-                    }
-                }
-                set libfolder [pwd]/$libsub
-                if {[string tolower $libfolder] ni [string tolower $::auto_path]} {
-                    if {[file isdirectory $libfolder]} {
-                        lappend ::auto_path $libfolder 
-                    }
-                }
-            }
-        } else {
-            #on other platforms, case differences could represent different paths
-            foreach libsub [list lib_tcl$tclmajorv lib] {
-                set libfolder [file dirname [file dirname [info nameofexecutable]]]/$libsub
-                if {$libfolder ni $::auto_path} {
-                    if {[file isdirectory $libfolder]} {
-                        lappend ::auto_path $libfolder
-                    }
-                }
-                set libfolder [pwd]/$libsub
-                if {$libfolder ni $::auto_path} {
-                    if {[file isdirectory $libfolder]} {
-                        lappend ::auto_path $libfolder 
-                    }
-                }
-            }
-        }
-
-
-        #2)
-        set currentdir_modules [glob -nocomplain -dir [pwd] -type f -tail *.tm]
-        if {[llength $currentdir_modules]} {
-            #now add current dir (if no conflict with above)
-            catch {tcl::tm::add [pwd]}
-        }
-
-        #restore module paths 
-        set tm_list_now [tcl::tm::list]
-        foreach p [lreverse $original_tm_list] {
-            if {$p ni $tm_list_now} {
-                #the prior tm paths go to the head of the list.
-                #They are processed first.. but an item of same version later in the list will override one at the head. (depending on when list was scanned)
-                tcl::tm::add $p
-            }
-        }
-        #------------------------------------------------------------------------------
-        #package require a bogus package to ensure Tcl scans the whole auto_path/tm list - otherwise a lower-versioned module earlier in the path may be loaded
-        #This seems to take not insignificant time depending on size of auto_path and tcl::tm::list (e.g 2023 i9 ssd 100ms) - but seems unavoidable for now
-        catch {package require flobrudder666_nonexistant}
-        #------------------------------------------------------------------------------
-
-
-    } else {
-        #Tcl_Init will most likely have set up some external paths 
-        #As our app has been started without the 'dev' first arg - we will prune paths that are not zipfs or tclkit
-        set new_auto_path [list]
-        #review - case insensitive ok for windows - but could cause issues on other platforms?
-        foreach ap $::auto_path {
-            set aplower [string tolower $ap]
-            foreach okprefix $internal_paths {
-                if {[string match "[string tolower $okprefix]*" $aplower]} {
-                    lappend new_auto_path $ap
-                    break
-                }
-            }
-        }
-        set ::auto_path $new_auto_path
-
-        set new_tm_list [list]
-        foreach tm [tcl::tm::list] {
-            set tmlower [string tolower $tm] 
-            foreach okprefix $internal_paths {
-                if {[string match "[string tolower $okprefix]*" $tmlower]} {
-                    lappend new_tm_list $tm
-                    break
-                }
-            }
-        }
-        tcl::tm::remove {*}[tcl::tm::list]
-        tcl::tm::add {*}[lreverse $new_tm_list]
-
-
-        #If it looks like we are running the vfs/xxx.vfs/main.tcl from an external tclsh - try to use vfs folders to simulate kit state 
-        #set script_relative_lib [file normalize [file join [file dirname [info script]] lib]]
-        set scriptdir [file dirname [info script]]
-        if {![string match //zipfs:/* $scriptdir] && ![info exists ::tcl::kitpath]} {
-            #presumably running the vfs/xxx.vfs/main.tcl script using a non-kit tclsh that doesn't have starkit lib available.. lets see if we can move forward anyway
-            set vfscontainer [file normalize [file dirname $scriptdir]]
-            set vfscommon [file join $vfscontainer _vfscommon]
-            set vfsdir [file normalize $scriptdir]
-            set projectroot [file dirname [file dirname $vfscontainer]] ;#back below src/vfs/xxx.vfs/main.tcl
-            puts stdout "no starkit. projectroot?: $projectroot"
-            puts stdout "info lib: [info library]"
-
-            #add back the info lib reported by the executable.. as we can't access the one built into a kit
-            if {[file exists [info library]]} {
-                lappend ::auto_path [info library]
-            }
-
-            set lib_types [list lib lib_tcl$tclmajorv]
-            foreach l $lib_types {
-                set lib [file join $vfsdir $l]
-                if {[file exists $lib] && [string tolower $lib] ni [string tolower $::auto_path]} {
-                    lappend ::auto_path $lib
-                }
-            }
-            foreach l $lib_types {
-                set lib [file join $vfscommon $l]
-                if {[file exists $lib] && [string tolower $lib] ni [string tolower $::auto_path]} {
-                    lappend ::auto_path $lib
-                }
-            }
-            set mod_types [list modules modules_tcl$tclmajorv] 
-            foreach m $mod_types {
-                set modpath [file join $vfsdir $m]
-                if {[file exists $modpath] && [string tolower $modpath] ni [string tolower [tcl::tm::list]]} {
-                    tcl::tm::add $modpath
-                }
-            }
-            foreach m $mod_types {
-                set modpath [file join $vfscommon $m]
-                if {[file exists $modpath] && [string tolower $modpath] ni [string tolower [tcl::tm::list]]} {
-                    tcl::tm::add $modpath
-                }
-            }
-        }
-
-        #force rescan
-        catch {package require flobrudder666_nonexistant}
-        set arglist $args
-    }
-
-    if {[llength $arglist]} {
-        puts stdout "main.tcl launching app-shellspy"
-        package require app-shellspy
-    } else {
-        puts stdout "main.tcl launching app-punk. pkg names count:[llength [package names]]"
-        package require app-punk
-        #app-punk starts repl
-        #repl::start stdin -title "main.tcl"
-    }
-    puts stderr "main.tcl done"
-    flush stderr
-}} {*}$::argv